From c4722f7025d8162f51903151153e098cbc7b5d2f Mon Sep 17 00:00:00 2001
From: x7z4w <x7z4w@noreply.codeberg.org>
Date: Sat, 9 Aug 2025 18:16:58 +0000
Subject: [PATCH 001/302] [ci] Fix Github CI

Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>
---
 .github/workflows/android-check.yaml | 5 +++++
 .github/workflows/ios-check.yaml     | 1 +
 2 files changed, 6 insertions(+)

diff --git a/.github/workflows/android-check.yaml b/.github/workflows/android-check.yaml
index 0e8146026..f87bfea69 100644
--- a/.github/workflows/android-check.yaml
+++ b/.github/workflows/android-check.yaml
@@ -23,6 +23,10 @@ jobs:
         shell: bash
         run: git submodule update --depth 1 --init --recursive --jobs=$(($(nproc) * 20))
 
+      - name: Configure repository
+        shell: bash
+        run: SKIP_GENERATE_SYMBOLS=1 ./configure.sh
+
       - name: Lint
         shell: bash
         working-directory: android
@@ -62,6 +66,7 @@ jobs:
           libxinerama-dev \
           libxcursor-dev \
           libxi-dev \
+          python3-protobuf \
           zlib1g-dev
 
       - name: Checkout sources
diff --git a/.github/workflows/ios-check.yaml b/.github/workflows/ios-check.yaml
index b644403c6..295e28632 100644
--- a/.github/workflows/ios-check.yaml
+++ b/.github/workflows/ios-check.yaml
@@ -30,6 +30,7 @@ jobs:
         run: |
           brew install qt \
           optipng
+          pip3 install "protobuf<3.21" --break-system-packages
       - name: Checkout sources
         uses: actions/checkout@v4
 

From c9cbb64f1242a57da5ff5c995c307f29465432f6 Mon Sep 17 00:00:00 2001
From: x7z4w <x7z4w@noreply.codeberg.org>
Date: Thu, 14 Aug 2025 08:56:23 +0000
Subject: [PATCH 002/302] [search] Follow-up fix for synonyms

Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>
---
 search/query_params.cpp | 66 ++++++++++-------------------------------
 1 file changed, 16 insertions(+), 50 deletions(-)

diff --git a/search/query_params.cpp b/search/query_params.cpp
index 3a2b242f5..9246d0527 100644
--- a/search/query_params.cpp
+++ b/search/query_params.cpp
@@ -48,7 +48,6 @@ map<string, vector<string>> const kSynonyms = {
     {"alam", {"alameda"}},
     {"alea", {"aleea"}},
     {"ale", {"aleea"}},
-    {"aleea", {"aleea"}},
     {"alf", {"alferes"}},
     {"all", {"alley", "allées", "allée"}},
     {"ally", {"alley"}},
@@ -76,7 +75,6 @@ map<string, vector<string>> const kSynonyms = {
     {"apts", {"apartments"}},
     {"arb", {"arboleda"}},
     {"arc", {"arcade", "arcades"}},
-    {"arm. gen", {"armádneho generála"}},
     {"arq", {"arquiteto", "arquitecto"}},
     {"arqº", {"arquiteto", "arquitecto"}},
     {"arral", {"arrabal"}},
@@ -90,7 +88,7 @@ map<string, vector<string>> const kSynonyms = {
     {"asz", {"altstoffsammelzentrum"}},
     {"àt", {"àtic"}},
     {"ato", {"ambato"}},
-    {"atr'", {"ambohitr'"}},
+    {"atr", {"ambohitr"}},
     {"auk", {"aukio"}},
     {"aut", {"autoroute"}},
     {"auto", {"autopista"}},
@@ -163,7 +161,6 @@ map<string, vector<string>> const kSynonyms = {
     {"bri", {"bridge"}},
     {"brk", {"break", "brook"}},
     {"bro", {"brother"}},
-    {"brow", {"brow"}},
     {"brw", {"brow"}},
     {"bsn", {"basin"}},
     {"bstd", {"bastide"}},
@@ -191,7 +188,6 @@ map<string, vector<string>> const kSynonyms = {
     {"cale", {"cale"}},
     {"callej", {"callejón"}},
     {"cam", {"caminho"}},
-    {"camp", {"camp"}},
     {"campg", {"camping"}},
     {"cant", {"cantón", "cantonada"}},
     {"canti", {"cantina"}},
@@ -228,7 +224,6 @@ map<string, vector<string>> const kSynonyms = {
     {"ch", {"church", "chaussee", "chemin", "chairman", "chase"}},
     {"che", {"chemins", "chemin"}},
     {"chem", {"cheminements", "cheminement"}},
-    {"chez", {"chez"}},
     {"chi", {"charmille"}},
     {"chl", {"chalet"}},
     {"chor", {"chorążego", "chorąży"}},
@@ -283,9 +278,7 @@ map<string, vector<string>> const kSynonyms = {
     {"cote", {"côteau", "côte"}},
     {"cott", {"cottage", "cottages"}},
     {"cotts", {"cottages"}},
-    {"cour", {"cour"}},
     {"cov", {"cove"}},
-    {"cove", {"cove"}},
     {"cowy", {"crossway"}},
     {"cp", {"codi postal", "col·legi públic"}},
     {"cpd", {"compound"}},
@@ -344,10 +337,8 @@ map<string, vector<string>> const kSynonyms = {
     {"cyd", {"courtyard"}},
     {"czada", {"calzada"}},
     {"dª", {"dona"}},
-    {"dale", {"dale"}},
     {"dars", {"darse"}},
     {"dav", {"deutscher alpenverein"}},
-    {"d'", {"de"}},
     {"d´", {"de"}},
     {"d", {"dom", "dona"}},
     {"đ", {"đường"}},
@@ -362,7 +353,6 @@ map<string, vector<string>> const kSynonyms = {
     {"dhsa", {"dehesa"}},
     {"diag", {"diagonal"}},
     {"dig", {"digues", "digue"}},
-    {"dip", {"dip"}},
     {"disem", {"diseminado"}},
     {"distr", {"districte"}},
     {"divers", {"diversion"}},
@@ -400,7 +390,6 @@ map<string, vector<string>> const kSynonyms = {
     {"ed", {"edifício"}},
     {"edf", {"edifício"}},
     {"edg", {"edge"}},
-    {"edge", {"edge"}},
     {"edif", {"edificio"}},
     {"e", {"east"}},
     {"egl", {"église"}},
@@ -411,7 +400,6 @@ map<string, vector<string>> const kSynonyms = {
     {"em", {"estrada municipal"}},
     {"empr", {"empresa"}},
     {"enc", {"enclos"}},
-    {"end", {"end"}},
     {"en", {"estrada nacional", "enceinte"}},
     {"enf", {"enfermeiro"}},
     {"enfo", {"enfermeiro"}},
@@ -474,7 +462,6 @@ map<string, vector<string>> const kSynonyms = {
     {"folw", {"follow"}},
     {"fon", {"fontaine"}},
     {"form", {"forum", "formation"}},
-    {"fort", {"fort"}},
     {"fos", {"fosses", "fosse"}},
     {"foyr", {"foyer"}},
     {"fr", {"father", "frontage", "frei"}},
@@ -492,8 +479,6 @@ map<string, vector<string>> const kSynonyms = {
     {"ga", {"gates", "gate"}},
     {"gale", {"galería"}},
     {"gal", {"galerie", "general", "galeries"}},
-    {"gap", {"gap"}},
-    {"gare", {"gare"}},
     {"garn", {"garenne"}},
     {"gbd", {"grand boulevard"}},
     {"gde", {"gemeinde"}},
@@ -547,8 +532,7 @@ map<string, vector<string>> const kSynonyms = {
     {"hghlds", {"highlands"}},
     {"hgts", {"heights"}},
     {"h", {"höhle", "hohes", "hotel", "hohe", "hoher"}},
-    {"hill", {"hill"}},
-    {"hint", {"hinteres", "hinterer", "hinter…", "hintere"}},
+    {"hint", {"hinteres", "hinterer", "hinter", "hintere"}},
     {"hip", {"hippodrome"}},
     {"hipód", {"hipódromo"}},
     {"hird", {"highroad"}},
@@ -578,7 +562,6 @@ map<string, vector<string>> const kSynonyms = {
     {"iii", {"terza", "trzecie", "trzeci", "trzecia", "terzo"}},
     {"ii", {"seconda", "drugi", "druga", "secondo", "segundo", "drugie"}},
     {"ile", {"île"}},
-    {"île", {"île"}},
     {"ima", {"irmã"}},
     {"imª", {"irmã"}},
     {"im", {"irmã", "irmão"}},
@@ -588,7 +571,7 @@ map<string, vector<string>> const kSynonyms = {
     {"imp", {"impasse", "impasses"}},
     {"ind", {"industrial"}},
     {"inf", {"infante"}},
-    {"ing", {"inžiniera/inžinierky", "ingenieur"}},
+    {"ing", {"inžiniera", "inžinierky", "ingenieur"}},
     {"inst", {"instituto"}},
     {"intg", {"interchange"}},
     {"int", {"interior", "internationaler", "intrarea", "internationales", "internationale"}},
@@ -627,7 +610,6 @@ map<string, vector<string>> const kSynonyms = {
     {"kdl", {"khu du lịch"}},
     {"kec", {"kecamatan"}},
     {"kel", {"kelurahan"}},
-    {"key", {"key"}},
     {"kga", {"kleingartenanlage"}},
     {"kgg", {"kagalang-galang"}},
     {"kg", {"katastralgemeinde", "…kogel", "kampong", "kogel"}},
@@ -645,21 +627,17 @@ map<string, vector<string>> const kSynonyms = {
     {"kpr", {"kaprala", "kapral"}},
     {"kpt", {"kapitana", "kapitan", "kapitána"}},
     {"kri", {"kaari"}},
-    {"k/s", {"khách sạn"}},
     {"ks", {"księdza", "ksiądz", "księcia", "książe", "khách sạn"}},
     {"kte", {"kort"}},
     {"kz", {"kreuz", "konzentrationslager"}},
     {"la", {"lane"}},
     {"landng", {"landing"}},
-    {"lane", {"lane"}},
     {"lda", {"limitada"}},
     {"ldg", {"landing", "lodge"}},
     {"ld", {"lieu-dit"}},
     {"leve", {"levée"}},
     {"lg", {"largo", "lugar"}},
     {"lgn", {"lagoon"}},
-    {"line", {"line"}},
-    {"link", {"link"}},
     {"lit", {"little"}},
     {"lj", {"loja"}},
     {"lkh", {"landeskrankenhaus"}},
@@ -669,13 +647,10 @@ map<string, vector<string>> const kSynonyms = {
     {"l", {"lange", "lakes", "lilla"}},
     {"ll", {"lille"}},
     {"llnra", {"llanura"}},
-    {"l.mare", {"lungomare"}},
     {"lmts", {"limits"}},
-    {"ln", {"laan"}},
     {"ln", {"line", "laan", "lane"}},
     {"lnwy", {"laneway"}},
     {"loc", {"località"}},
-    {"loop", {"loop"}},
     {"lor", {"lorong"}},
     {"loteam", {"loteamento"}},
     {"lot", {"lotissement", "lotissements"}},
@@ -691,14 +666,12 @@ map<string, vector<string>> const kSynonyms = {
     {"mah", {"mahalle"}},
     {"maj", {"major"}},
     {"malec", {"malecón"}},
-    {"mall", {"mall"}},
     {"mal", {"marechal", "maréchal"}},
     {"ma", {"maria", "magistratsabteilung"}},
     {"man", {"manoir"}},
     {"mans", {"mansions"}},
     {"mar", {"marche", "marches"}},
     {"marsz", {"marszałka (marszałek)"}},
-    {"mas", {"mas"}},
     {"maz", {"mazowiecka", "mazowiecki", "mazowieckie"}},
     {"md", {"mead"}},
     {"mdr", {"meander"}},
@@ -712,7 +685,6 @@ map<string, vector<string>> const kSynonyms = {
     {"met", {"métro"}},
     {"mét", {"métro"}},
     {"mevr", {"mevrouw"}},
-    {"mews", {"mews"}},
     {"mf", {"maison forestière"}},
     {"mgr", {"monseigneur"}},
     {"mgr", {"monseigneur"}},
@@ -740,7 +712,6 @@ map<string, vector<string>> const kSynonyms = {
     {"mr", {"meester"}},
     {"mr", {"meester", "meander"}},
     {"ms", {"middle school"}},
-    {"m-tele", {"muntele"}},
     {"mte", {"montée", "montées"}},
     {"mtir", {"monestir"}},
     {"mt", {"mount", "mont", "muntele"}},
@@ -759,7 +730,6 @@ map<string, vector<string>> const kSynonyms = {
     {"nám", {"námestie", "náměstí"}},
     {"n:a", {"norra"}},
     {"nª", {"nossa"}},
-    {"nat'l", {"national"}},
     {"nd", {"niedere", "niederes", "niederer"}},
     {"ndr", {"nordre"}},
     {"ne", {"northeast"}},
@@ -783,8 +753,6 @@ map<string, vector<string>> const kSynonyms = {
     {"nte", {"nouvelle route"}},
     {"nt", {"nhà thờ"}},
     {"ntra", {"nuestra"}},
-    {"ntra. sra", {"nuestra señora"}},
-    {"ntr.ª sr.ª", {"nuestra señora"}},
     {"núm", {"número"}},
     {"nw", {"nowy", "nowa", "nowe", "northwest"}},
     {"nwra", {"national wildlife refuge area"}},
@@ -841,7 +809,6 @@ map<string, vector<string>> const kSynonyms = {
     {"pe", {"padre"}},
     {"peri", {"périphérique"}},
     {"pgd", {"prostovoljno gasilsko društvo"}},
-    {"pg. ind", {"polígono industrial"}},
     {"pg", {"pengiran", "passeig"}},
     {"pgr", {"penger"}},
     {"phil", {"philippines"}},
@@ -851,7 +818,6 @@ map<string, vector<string>> const kSynonyms = {
     {"piată", {"piața"}},
     {"piaţa", {"piața"}},
     {"piaţă", {"piața"}},
-    {"piața", {"piața"}},
     {"piață", {"piața"}},
     {"piaz", {"piazza"}},
     {"pim", {"petite impasse"}},
@@ -901,7 +867,6 @@ map<string, vector<string>> const kSynonyms = {
     {"pque", {"parque"}},
     {"pral", {"principal"}},
     {"pre", {"pré"}},
-    {"pré", {"pré"}},
     {"presid", {"presidente"}},
     {"pres", {"president"}},
     {"prk", {"purok"}},
@@ -1024,8 +989,6 @@ map<string, vector<string>> const kSynonyms = {
     {"rt", {"ranta", "retreat", "route"}},
     {"rtt", {"retreat"}},
     {"rty", {"rotary"}},
-    {"rue", {"rue"}},
-    {"run", {"run"}},
     {"rvra", {"riviera"}},
     {"rvr", {"river"}},
     {"rvwy", {"riverway"}},
@@ -1089,7 +1052,6 @@ map<string, vector<string>> const kSynonyms = {
     {"splaiul", {"splaiul"}},
     {"spl", {"splaiul"}},
     {"sp", {"strada provinciale", "szkoła podstawowa", "splaiul", "spodnja", "spodnji", "spitze", "spodnje"}},
-    {"spur", {"spur"}},
     {"sq", {"square", "superquadra"}},
     {"srª", {"senhora"}},
     {"sra", {"senhora", "senora", "señora"}},
@@ -1113,7 +1075,6 @@ map<string, vector<string>> const kSynonyms = {
     {"stos", {"santos"}},
     {"strada", {"strada"}},
     {"stra", {"strand", "strada"}},
-    {"str-la", {"stradela"}},
     {"strp", {"strip"}},
     {"str", {"strasse", "stary", "stara", "strada", "straat", "stare", "straße"}},
     {"strwy", {"stairway"}},
@@ -1221,7 +1182,7 @@ map<string, vector<string>> const kSynonyms = {
     {"vf", {"vârful"}},
     {"vge", {"village", "villages"}},
     {"viad", {"viaduct"}},
-    {"via", {"via", "viaduct"}},
+    {"via", {"viaduct"}},
     {"view", {"view"}},
     {"viii", {"ottavo", "ottava"}},
     {"vii", {"settima", "settimo"}},
@@ -1286,7 +1247,6 @@ map<string, vector<string>> const kSynonyms = {
     {"xx", {"venti"}},
     {"xxv", {"venticinque"}},
     {"xxx", {"trenta"}},
-    {"yard", {"yard"}},
     {"yd", {"yard"}},
     {"zac", {"zone d'aménagement concerté"}},
     {"zad", {"zone d'aménagement différé"}},
@@ -1295,7 +1255,6 @@ map<string, vector<string>> const kSynonyms = {
     {"zg", {"zgornja", "zgornji", "zgornje"}},
     {"zi", {"zone industrielle"}},
     {"zn", {"zona"}},
-    {"zone", {"zone"}},
     {"zr", {"zuster"}},
     {"zup", {"zone à urbaniser en priorité"}},
     {"z", {"zum"}},
@@ -1315,11 +1274,7 @@ map<string, vector<string>> const kSynonyms = {
     {"εθν", {"εθνάρχου", "εθνική", "εθνικής"}},
     {"ελ", {"ελευθέριος", "ελευθερίου"}},
     {"ελτα", {"ταχυδρομείο", "ελληνικά ταχυδρομεία"}},
-    {"θεσ/νίκης", {"θεσσαλονίκης"}},
-    {"ι.μ", {"ιερά μονή"}},
-    {"ι.ν", {"ιερός ναός"}},
     {"κτ", {"κτίριο"}},
-    {"κων/νου", {"κωνσταντίνου"}},
     {"λεωφ", {"λεωφόρος"}},
     {"λ", {"λίμνη", "λεωφόρος"}},
     {"ν", {"νέο", "νέος", "νέα", "νέες", "νησί", "νέοι", "νομός"}},
@@ -1399,7 +1354,9 @@ map<string, vector<string>> const kSynonyms = {
     {"ط", {"طريق"}},
     {"م", {"ميدان"}}
     /*
-    These synonyms are currently not working per https://codeberg.org/comaps/comaps/issues/1242
+    These synonyms are currently unreachable per https://codeberg.org/comaps/comaps/issues/1242
+    {"arm. gen", {"armádneho generála"}},
+    {"atr'", {"ambohitr'"}},
     {"a. v", {"asociación vecinal", "asociación veciñal"}},
     {"a. vv", {"asociación de vecinos", "asociación de veciños"}},
     {"b-dul", {"bulevardul"}},
@@ -1420,6 +1377,7 @@ map<string, vector<string>> const kSynonyms = {
     {"c.so", {"corso"}},
     {"c.te", {"corte"}},
     {"c. v", {"camino viejo"}},
+    {"d'", {"de"}},
     {"e. b", {"escola básica"}},
     {"e.b", {"escola básica"}},
     {"e.p", {"empresa pública"}},
@@ -1431,8 +1389,10 @@ map<string, vector<string>> const kSynonyms = {
     {"g.n.r", {"guarda nacional republicana"}},
     {"g. v", {"gran vía"}},
     {"i.d", {"in der"}},
+    {"k/s", {"khách sạn"}},
     {"l.go", {"largo"}},
     {"m-te", {"muntele"}},
+    {"nat'l", {"national"}},
     {"n.ª s.ª", {"nuestra señora"}},
     {"n z", {"noordzijde"}},
     {"n. z", {"noordzijde"}},
@@ -1440,6 +1400,7 @@ map<string, vector<string>> const kSynonyms = {
     {"o.l.v", {"onze-lieve-vrouw"}},
     {"o z", {"oostzijde"}},
     {"o. z", {"oostzijde"}},
+    {"pg. ind", {"polígono industrial"}},
     {"p.j", {"polícia judiciária"}},
     {"p.le", {"piazzale"}},
     {"p. k", {"punto kilométrico"}},
@@ -1466,6 +1427,7 @@ map<string, vector<string>> const kSynonyms = {
     {"ss.me", {"santissime"}},
     {"ss.mi", {"santissimi"}},
     {"ss.mo", {"santissimo"}},
+    {"str-la", {"stradela"}},
     {"v.co", {"vico"}},
     {"v. d.", {"van de", "van den", "van der"}},
     {"v.d", {"von der", "vor der"}},
@@ -1474,6 +1436,10 @@ map<string, vector<string>> const kSynonyms = {
     {"w. z", {"westzijde"}},
     {"z z", {"zuidzijde"}},
     {"z. z", {"zuidzijde"}},
+    {"ι.μ", {"ιερά μονή"}},
+    {"ι.ν", {"ιερός ναός"}},
+    {"θεσ/νίκης", {"θεσσαλονίκης"}},
+    {"κων/νου", {"κωνσταντίνου"}},
     {"δημ. σχ", {"δημοτικό σχολείο"}},
     {"д-р", {"доктор"}},
     {"ж.к", {"жилищен комплекс"}},

From 76ffc99abd714d84dc719c7bf549c54173a739b5 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Thu, 17 Jul 2025 22:35:52 +0300
Subject: [PATCH 003/302] New cpp folder structure

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 CMakeLists.txt                                |  37 +--
 cmake/OmimTesting.cmake                       |   2 +-
 dev_sandbox/CMakeLists.txt                    |   2 +-
 libs/CMakeLists.txt                           |  22 ++
 {base => libs/base}/CMakeLists.txt            |   0
 {base => libs/base}/array_adapters.hpp        |   0
 {base => libs/base}/assert.hpp                |   0
 {base => libs/base}/atomic_shared_ptr.hpp     |   0
 {base => libs/base}/base.cpp                  |   0
 {base => libs/base}/base.hpp                  |   0
 {base => libs/base}/base_tests/CMakeLists.txt |   0
 .../base}/base_tests/assert_test.cpp          |   0
 {base => libs/base}/base_tests/beam_tests.cpp |   0
 .../base_tests/bidirectional_map_tests.cpp    |   0
 {base => libs/base}/base_tests/bits_test.cpp  |   0
 .../base}/base_tests/buffer_vector_test.cpp   |   0
 {base => libs/base}/base_tests/cache_test.cpp |   0
 .../base}/base_tests/cancellable_tests.cpp    |   0
 .../base}/base_tests/checked_cast_tests.cpp   |   0
 .../base}/base_tests/clustering_map_tests.cpp |   0
 .../base}/base_tests/collection_cast_test.cpp |   0
 .../base}/base_tests/containers_test.cpp      |   0
 .../base}/base_tests/control_flow_tests.cpp   |   0
 .../base}/base_tests/exception_tests.cpp      |   0
 .../base}/base_tests/fifo_cache_test.cpp      |   0
 .../base_tests/file_name_utils_tests.cpp      |   0
 .../base}/base_tests/geo_object_id_tests.cpp  |   0
 .../base}/base_tests/levenshtein_dfa_test.cpp |   0
 .../base}/base_tests/linked_map_tests.cpp     |   0
 .../base}/base_tests/logging_test.cpp         |   0
 .../base}/base_tests/lru_cache_tests.cpp      |   0
 {base => libs/base}/base_tests/math_test.cpp  |   0
 .../base}/base_tests/matrix_test.cpp          |   0
 .../base}/base_tests/mem_trie_test.cpp        |   0
 .../base}/base_tests/message_test.cpp         |   0
 .../base}/base_tests/newtype_test.cpp         |   0
 .../non_intersecting_intervals_tests.cpp      |   0
 .../base}/base_tests/observer_list_test.cpp   |   0
 .../base}/base_tests/range_iterator_test.cpp  |   0
 .../base}/base_tests/ref_counted_tests.cpp    |   0
 .../base}/base_tests/regexp_test.cpp          |   0
 .../base}/base_tests/rolling_hash_test.cpp    |   0
 .../base}/base_tests/scope_guard_test.cpp     |   0
 .../base}/base_tests/small_set_test.cpp       |   0
 .../base}/base_tests/stl_helpers_tests.cpp    |   0
 .../base}/base_tests/string_utils_test.cpp    |   0
 .../base}/base_tests/suffix_array_tests.cpp   |   0
 .../base}/base_tests/sunrise_sunset_test.cpp  |   0
 .../thread_pool_computational_tests.cpp       |   0
 .../base_tests/thread_pool_delayed_tests.cpp  |   0
 .../base}/base_tests/thread_pool_tests.cpp    |   0
 .../base_tests/thread_safe_queue_tests.cpp    |   0
 .../base}/base_tests/threaded_list_test.cpp   |   0
 .../base}/base_tests/threads_test.cpp         |   0
 .../base}/base_tests/timegm_test.cpp          |   0
 {base => libs/base}/base_tests/timer_test.cpp |   0
 .../base}/base_tests/uni_string_dfa_test.cpp  |   0
 .../base}/base_tests/visitor_tests.cpp        |   0
 {base => libs/base}/beam.hpp                  |   0
 {base => libs/base}/bidirectional_map.hpp     |   0
 {base => libs/base}/bits.hpp                  |   0
 {base => libs/base}/buffer_vector.hpp         |   0
 {base => libs/base}/cache.hpp                 |   0
 {base => libs/base}/cancellable.cpp           |   0
 {base => libs/base}/cancellable.hpp           |   0
 {base => libs/base}/checked_cast.hpp          |   0
 {base => libs/base}/clustering_map.hpp        |   0
 {base => libs/base}/collection_cast.hpp       |   0
 {base => libs/base}/control_flow.hpp          |   0
 {base => libs/base}/deferred_task.cpp         |   0
 {base => libs/base}/deferred_task.hpp         |   0
 {base => libs/base}/dfa_helpers.hpp           |   0
 {base => libs/base}/exception.cpp             |   0
 {base => libs/base}/exception.hpp             |   0
 {base => libs/base}/fast_math.cpp             |   0
 {base => libs/base}/fifo_cache.hpp            |   0
 {base => libs/base}/file_name_utils.cpp       |   0
 {base => libs/base}/file_name_utils.hpp       |   0
 {base => libs/base}/geo_object_id.cpp         |   0
 {base => libs/base}/geo_object_id.hpp         |   0
 {base => libs/base}/gmtime.cpp                |   0
 {base => libs/base}/gmtime.hpp                |   0
 {base => libs/base}/internal/message.cpp      |   0
 {base => libs/base}/internal/message.hpp      |   0
 {base => libs/base}/levenshtein_dfa.cpp       |   0
 {base => libs/base}/levenshtein_dfa.hpp       |   0
 .../base}/limited_priority_queue.hpp          |   0
 {base => libs/base}/linked_map.hpp            |   0
 {base => libs/base}/logging.cpp               |   0
 {base => libs/base}/logging.hpp               |   0
 {base => libs/base}/lower_case.cpp            |   0
 {base => libs/base}/lru_cache.hpp             |   0
 {base => libs/base}/macros.hpp                |   0
 {base => libs/base}/math.cpp                  |   0
 {base => libs/base}/math.hpp                  |   0
 {base => libs/base}/matrix.hpp                |   0
 {base => libs/base}/mem_trie.hpp              |   0
 {base => libs/base}/newtype.hpp               |   0
 .../base}/non_intersecting_intervals.hpp      |   0
 {base => libs/base}/normalize_unicode.cpp     |   0
 {base => libs/base}/observer_list.hpp         |   0
 {base => libs/base}/pprof.cpp                 |   0
 {base => libs/base}/pprof.hpp                 |   0
 {base => libs/base}/random.hpp                |   0
 {base => libs/base}/range_iterator.hpp        |   0
 {base => libs/base}/ref_counted.hpp           |   0
 {base => libs/base}/rolling_hash.hpp          |   0
 {base => libs/base}/scope_guard.hpp           |   0
 {base => libs/base}/set_operations.hpp        |   0
 {base => libs/base}/shared_buffer_manager.cpp |   0
 {base => libs/base}/shared_buffer_manager.hpp |   0
 {base => libs/base}/small_map.hpp             |   0
 {base => libs/base}/small_set.hpp             |   0
 {base => libs/base}/src_point.cpp             |   0
 {base => libs/base}/src_point.hpp             |   0
 {base => libs/base}/stats.hpp                 |   0
 {base => libs/base}/std_serialization.hpp     |   0
 {base => libs/base}/stl_helpers.hpp           |   0
 {base => libs/base}/stl_iterator.hpp          |   0
 {base => libs/base}/string_utils.cpp          |   0
 {base => libs/base}/string_utils.hpp          |   0
 {base => libs/base}/strings_bundle.cpp        |   0
 {base => libs/base}/strings_bundle.hpp        |   0
 {base => libs/base}/suffix_array.cpp          |   0
 {base => libs/base}/suffix_array.hpp          |   0
 {base => libs/base}/sunrise_sunset.cpp        |   0
 {base => libs/base}/sunrise_sunset.hpp        |   0
 {base => libs/base}/task_loop.hpp             |   0
 {base => libs/base}/thread.cpp                |   0
 {base => libs/base}/thread.hpp                |   0
 {base => libs/base}/thread_checker.cpp        |   0
 {base => libs/base}/thread_checker.hpp        |   0
 {base => libs/base}/thread_pool.cpp           |   0
 {base => libs/base}/thread_pool.hpp           |   0
 .../base}/thread_pool_computational.hpp       |   0
 {base => libs/base}/thread_pool_delayed.cpp   |   0
 {base => libs/base}/thread_pool_delayed.hpp   |   0
 {base => libs/base}/thread_safe_queue.hpp     |   0
 {base => libs/base}/thread_utils.hpp          |   0
 {base => libs/base}/threaded_container.cpp    |   0
 {base => libs/base}/threaded_container.hpp    |   0
 {base => libs/base}/threaded_list.hpp         |   0
 {base => libs/base}/timegm.cpp                |   0
 {base => libs/base}/timegm.hpp                |   0
 {base => libs/base}/timer.cpp                 |   0
 {base => libs/base}/timer.hpp                 |   0
 {base => libs/base}/uni_string_dfa.cpp        |   0
 {base => libs/base}/uni_string_dfa.hpp        |   0
 {base => libs/base}/visitor.hpp               |   0
 {base => libs/base}/waiter.hpp                |   0
 {coding => libs/coding}/CMakeLists.txt        |   0
 {coding => libs/coding}/base64.cpp            |   0
 {coding => libs/coding}/base64.hpp            |   0
 {coding => libs/coding}/bit_streams.hpp       |   0
 {coding => libs/coding}/buffer_reader.hpp     |   0
 .../coding}/buffered_file_writer.cpp          |   0
 .../coding}/buffered_file_writer.hpp          |   0
 {coding => libs/coding}/bwt.cpp               |   0
 {coding => libs/coding}/bwt.hpp               |   0
 {coding => libs/coding}/bwt_coder.hpp         |   0
 {coding => libs/coding}/byte_stream.hpp       |   0
 .../coding}/coding_tests/CMakeLists.txt       |   0
 .../coding}/coding_tests/base64_test.cpp      |   0
 .../coding}/coding_tests/bit_streams_test.cpp |   0
 .../coding}/coding_tests/bwt_coder_tests.cpp  |   0
 .../coding}/coding_tests/bwt_tests.cpp        |   0
 .../compressed_bit_vector_test.cpp            |   0
 .../coding}/coding_tests/csv_reader_test.cpp  |   0
 .../coding}/coding_tests/dd_vector_test.cpp   |   0
 .../coding}/coding_tests/diff_test.cpp        |   0
 .../coding}/coding_tests/elias_coder_test.cpp |   0
 .../coding}/coding_tests/endianness_test.cpp  |   0
 .../coding}/coding_tests/file_data_test.cpp   |   0
 .../coding}/coding_tests/file_sort_test.cpp   |   0
 .../coding_tests/files_container_tests.cpp    |   0
 .../coding_tests/fixed_bits_ddvector_test.cpp |   0
 .../coding_tests/geometry_coding_test.cpp     |   0
 .../geometry_serialization_test.cpp           |   0
 .../coding}/coding_tests/hex_test.cpp         |   0
 .../coding}/coding_tests/huffman_test.cpp     |   0
 .../coding_tests/map_uint32_to_val_tests.cpp  |   0
 .../coding_tests/mem_file_reader_test.cpp     |   0
 .../coding_tests/mem_file_writer_test.cpp     |   0
 .../coding_tests/move_to_front_tests.cpp      |   0
 .../coding}/coding_tests/png_decoder_test.cpp |   0
 .../coding_tests/point_coding_tests.cpp       |   0
 .../coding_tests/reader_cache_test.cpp        |   0
 .../coding}/coding_tests/reader_test.cpp      |   0
 .../coding}/coding_tests/reader_test.hpp      |   0
 .../coding_tests/reader_writer_ops_test.cpp   |   0
 .../coding}/coding_tests/serdes_json_test.cpp |   0
 .../coding}/coding_tests/sha1_test.cpp        |   0
 .../coding_tests/simple_dense_coding_test.cpp |   0
 .../coding_tests/sparse_vector_tests.cpp      |   0
 .../string_utf8_multilang_tests.cpp           |   0
 .../coding}/coding_tests/succinct_ef_test.cpp |   0
 .../coding_tests/succinct_mapper_test.cpp     |   0
 .../coding}/coding_tests/test_polylines.cpp   |   0
 .../coding}/coding_tests/test_polylines.hpp   |   0
 .../coding_tests/text_storage_tests.cpp       |   0
 .../coding}/coding_tests/traffic_test.cpp     |   0
 .../coding}/coding_tests/url_tests.cpp        |   0
 .../coding_tests/value_opt_string_test.cpp    |   0
 .../coding_tests/var_record_reader_test.cpp   |   0
 .../coding_tests/var_serial_vector_test.cpp   |   0
 .../coding}/coding_tests/varint_test.cpp      |   0
 .../coding}/coding_tests/writer_test.cpp      |   0
 .../coding}/coding_tests/xml_parser_tests.cpp |   0
 .../coding}/coding_tests/zip_creator_test.cpp |   0
 .../coding}/coding_tests/zip_reader_test.cpp  |   0
 .../coding}/coding_tests/zlib_test.cpp        |   0
 .../coding}/compressed_bit_vector.cpp         |   0
 .../coding}/compressed_bit_vector.hpp         |   0
 {coding => libs/coding}/constants.hpp         |   0
 {coding => libs/coding}/csv_reader.cpp        |   0
 {coding => libs/coding}/csv_reader.hpp        |   0
 {coding => libs/coding}/dd_vector.hpp         |   0
 {coding => libs/coding}/diff.hpp              |   0
 {coding => libs/coding}/elias_coder.hpp       |   0
 {coding => libs/coding}/endianness.hpp        |   0
 {coding => libs/coding}/file_reader.cpp       |   0
 {coding => libs/coding}/file_reader.hpp       |   0
 {coding => libs/coding}/file_sort.hpp         |   0
 {coding => libs/coding}/file_writer.cpp       |   0
 {coding => libs/coding}/file_writer.hpp       |   0
 {coding => libs/coding}/files_container.cpp   |   0
 {coding => libs/coding}/files_container.hpp   |   0
 .../coding}/fixed_bits_ddvector.hpp           |   0
 {coding => libs/coding}/geometry_coding.cpp   |   0
 {coding => libs/coding}/geometry_coding.hpp   |   0
 {coding => libs/coding}/hex.cpp               |   0
 {coding => libs/coding}/hex.hpp               |   0
 {coding => libs/coding}/huffman.cpp           |   0
 {coding => libs/coding}/huffman.hpp           |   0
 .../coding}/internal/file64_api.hpp           |   0
 .../coding}/internal/file_data.cpp            |   0
 .../coding}/internal/file_data.hpp            |   0
 .../coding}/internal/xmlparser.hpp            |   0
 {coding => libs/coding}/map_uint32_to_val.hpp |   0
 {coding => libs/coding}/memory_region.hpp     |   0
 {coding => libs/coding}/mmap_reader.cpp       |   0
 {coding => libs/coding}/mmap_reader.hpp       |   0
 {coding => libs/coding}/move_to_front.cpp     |   0
 {coding => libs/coding}/move_to_front.hpp     |   0
 {coding => libs/coding}/parse_xml.hpp         |   0
 {coding => libs/coding}/point_coding.cpp      |   0
 {coding => libs/coding}/point_coding.hpp      |   0
 {coding => libs/coding}/read_write_utils.hpp  |   0
 {coding => libs/coding}/reader.cpp            |   0
 {coding => libs/coding}/reader.hpp            |   0
 {coding => libs/coding}/reader_cache.hpp      |   0
 {coding => libs/coding}/reader_streambuf.cpp  |   0
 {coding => libs/coding}/reader_streambuf.hpp  |   0
 {coding => libs/coding}/reader_wrapper.hpp    |   0
 {coding => libs/coding}/reader_writer_ops.cpp |   0
 {coding => libs/coding}/reader_writer_ops.hpp |   0
 .../coding}/serdes_binary_header.hpp          |   0
 {coding => libs/coding}/serdes_json.hpp       |   0
 {coding => libs/coding}/sha1.cpp              |   0
 {coding => libs/coding}/sha1.hpp              |   0
 .../coding}/simple_dense_coding.cpp           |   0
 .../coding}/simple_dense_coding.hpp           |   0
 {coding => libs/coding}/sparse_vector.hpp     |   0
 {coding => libs/coding}/streams.hpp           |   0
 {coding => libs/coding}/streams_common.hpp    |   0
 {coding => libs/coding}/streams_sink.hpp      |   0
 .../coding}/string_utf8_multilang.cpp         |   0
 .../coding}/string_utf8_multilang.hpp         |   0
 {coding => libs/coding}/succinct_mapper.hpp   |   0
 {coding => libs/coding}/tesselator_decl.hpp   |   0
 {coding => libs/coding}/text_storage.hpp      |   0
 {coding => libs/coding}/traffic.cpp           |   0
 {coding => libs/coding}/traffic.hpp           |   0
 {coding => libs/coding}/transliteration.cpp   |   0
 {coding => libs/coding}/transliteration.hpp   |   0
 {coding => libs/coding}/url.cpp               |   0
 {coding => libs/coding}/url.hpp               |   0
 {coding => libs/coding}/value_opt_string.hpp  |   0
 {coding => libs/coding}/var_record_reader.hpp |   0
 {coding => libs/coding}/var_serial_vector.hpp |   0
 {coding => libs/coding}/varint.hpp            |   0
 {coding => libs/coding}/write_to_sink.hpp     |   0
 {coding => libs/coding}/writer.hpp            |   0
 {coding => libs/coding}/zip_creator.cpp       |   0
 {coding => libs/coding}/zip_creator.hpp       |   0
 {coding => libs/coding}/zip_reader.cpp        |   0
 {coding => libs/coding}/zip_reader.hpp        |   0
 {coding => libs/coding}/zlib.cpp              |   0
 {coding => libs/coding}/zlib.hpp              |   0
 .../cppjansson}/CMakeLists.txt                |   0
 .../cppjansson}/cppjansson.cpp                |   0
 .../cppjansson}/cppjansson.hpp                |   0
 .../cppjansson}/jansson_handle.cpp            |   0
 .../cppjansson}/jansson_handle.hpp            |   0
 .../descriptions}/CMakeLists.txt              |   0
 .../descriptions_tests/CMakeLists.txt         |   0
 .../descriptions_tests/descriptions_tests.cpp |   0
 .../descriptions}/header.hpp                  |   0
 .../descriptions}/loader.cpp                  |   0
 .../descriptions}/loader.hpp                  |   0
 .../descriptions}/serdes.hpp                  |   0
 {drape => libs/drape}/CMakeLists.txt          |   0
 .../drape}/attribute_buffer_mutator.cpp       |   0
 .../drape}/attribute_buffer_mutator.hpp       |   0
 {drape => libs/drape}/attribute_provider.cpp  |   0
 {drape => libs/drape}/attribute_provider.hpp  |   0
 {drape => libs/drape}/batcher.cpp             |   0
 {drape => libs/drape}/batcher.hpp             |   0
 {drape => libs/drape}/batcher_helpers.cpp     |   0
 {drape => libs/drape}/batcher_helpers.hpp     |   0
 {drape => libs/drape}/binding_info.cpp        |   0
 {drape => libs/drape}/binding_info.hpp        |   0
 {drape => libs/drape}/buffer_base.cpp         |   0
 {drape => libs/drape}/buffer_base.hpp         |   0
 {drape => libs/drape}/color.hpp               |   0
 {drape => libs/drape}/constants.hpp           |   0
 {drape => libs/drape}/cpu_buffer.cpp          |   0
 {drape => libs/drape}/cpu_buffer.hpp          |   0
 {drape => libs/drape}/data_buffer.cpp         |   0
 {drape => libs/drape}/data_buffer.hpp         |   0
 {drape => libs/drape}/data_buffer_impl.hpp    |   0
 {drape => libs/drape}/debug_renderer.hpp      |   0
 {drape => libs/drape}/drape_diagnostics.hpp   |   0
 {drape => libs/drape}/drape_global.hpp        |   0
 {drape => libs/drape}/drape_routine.hpp       |   0
 .../drape}/drape_tests/CMakeLists.txt         |   2 +-
 .../drape_tests/attribute_provides_tests.cpp  |   0
 .../drape}/drape_tests/batcher_tests.cpp      |   0
 .../drape}/drape_tests/bingind_info_tests.cpp |   0
 .../drape}/drape_tests/buffer_tests.cpp       |   0
 .../drape}/drape_tests/dummy_texture.hpp      |   0
 .../drape}/drape_tests/font_texture_tests.cpp |   0
 .../drape}/drape_tests/gl_functions.cpp       |   0
 .../drape}/drape_tests/gl_mock_functions.cpp  |   0
 .../drape}/drape_tests/gl_mock_functions.hpp  |   0
 .../drape}/drape_tests/glyph_mng_tests.cpp    |   0
 .../drape}/drape_tests/glyph_packer_test.cpp  |   0
 .../drape_tests/harfbuzz_shaping_test.cpp     |   0
 {drape => libs/drape}/drape_tests/img.cpp     |   0
 {drape => libs/drape}/drape_tests/img.hpp     |   0
 .../drape}/drape_tests/memory_comparer.hpp    |   0
 .../drape}/drape_tests/object_pool_tests.cpp  |   0
 .../drape}/drape_tests/pointers_tests.cpp     |   0
 .../drape_tests/static_texture_tests.cpp      |   0
 .../drape}/drape_tests/stipple_pen_tests.cpp  |   0
 .../drape_tests/testing_graphics_context.hpp  |   0
 .../drape_tests/texture_of_colors_tests.cpp   |   0
 .../drape_tests/uniform_value_tests.cpp       |   0
 .../drape_tests/vertex_buffer_tests.cpp       |   0
 {drape => libs/drape}/dynamic_texture.hpp     |   0
 {drape => libs/drape}/font_constants.hpp      |   0
 {drape => libs/drape}/font_texture.cpp        |   0
 {drape => libs/drape}/font_texture.hpp        |   0
 .../drape}/fonts_tool/CMakeLists.txt          |   0
 .../drape}/fonts_tool/fonts_tool.cpp          |   0
 {drape => libs/drape}/framebuffer.cpp         |   0
 {drape => libs/drape}/framebuffer.hpp         |   0
 {drape => libs/drape}/gl_constants.cpp        |   0
 {drape => libs/drape}/gl_constants.hpp        |   0
 {drape => libs/drape}/gl_extensions_list.cpp  |   0
 {drape => libs/drape}/gl_extensions_list.hpp  |   0
 {drape => libs/drape}/gl_functions.cpp        |   0
 {drape => libs/drape}/gl_functions.hpp        |   0
 {drape => libs/drape}/gl_gpu_program.cpp      |   0
 {drape => libs/drape}/gl_gpu_program.hpp      |   0
 {drape => libs/drape}/gl_includes.hpp         |   0
 {drape => libs/drape}/glsl_func.hpp           |   0
 {drape => libs/drape}/glsl_types.hpp          |   0
 {drape => libs/drape}/glyph.hpp               |   0
 {drape => libs/drape}/glyph_manager.cpp       |   0
 {drape => libs/drape}/glyph_manager.hpp       |   0
 {drape => libs/drape}/gpu_buffer.cpp          |   0
 {drape => libs/drape}/gpu_buffer.hpp          |   0
 {drape => libs/drape}/gpu_program.hpp         |   0
 {drape => libs/drape}/graphics_context.hpp    |   0
 .../drape}/graphics_context_factory.cpp       |   0
 .../drape}/graphics_context_factory.hpp       |   0
 {drape => libs/drape}/harfbuzz_shaping.cpp    |   0
 {drape => libs/drape}/harfbuzz_shaping.hpp    |   0
 {drape => libs/drape}/hw_texture.cpp          |   0
 {drape => libs/drape}/hw_texture.hpp          |   0
 {drape => libs/drape}/hw_texture_ios.hpp      |   0
 {drape => libs/drape}/hw_texture_ios.mm       |   0
 {drape => libs/drape}/index_buffer.cpp        |   0
 {drape => libs/drape}/index_buffer.hpp        |   0
 .../drape}/index_buffer_mutator.cpp           |   0
 .../drape}/index_buffer_mutator.hpp           |   0
 {drape => libs/drape}/index_storage.cpp       |   0
 {drape => libs/drape}/index_storage.hpp       |   0
 {drape => libs/drape}/mesh_object.cpp         |   0
 {drape => libs/drape}/mesh_object.hpp         |   0
 .../drape}/metal/metal_base_context.hpp       |   0
 .../drape}/metal/metal_base_context.mm        |   0
 {drape => libs/drape}/metal/metal_cleaner.hpp |   0
 {drape => libs/drape}/metal/metal_cleaner.mm  |   0
 .../drape}/metal/metal_gpu_buffer_impl.hpp    |   0
 .../drape}/metal/metal_gpu_buffer_impl.mm     |   0
 .../drape}/metal/metal_gpu_program.hpp        |   0
 .../drape}/metal/metal_mesh_object_impl.mm    |   0
 {drape => libs/drape}/metal/metal_states.hpp  |   0
 {drape => libs/drape}/metal/metal_states.mm   |   0
 {drape => libs/drape}/metal/metal_texture.hpp |   0
 {drape => libs/drape}/metal/metal_texture.mm  |   0
 .../metal/metal_vertex_array_buffer_impl.mm   |   0
 .../drape}/metal/render_state_metal.mm        |   0
 {drape => libs/drape}/object_pool.hpp         |   0
 {drape => libs/drape}/oglcontext.cpp          |   0
 {drape => libs/drape}/oglcontext.hpp          |   0
 {drape => libs/drape}/overlay_handle.cpp      |   0
 {drape => libs/drape}/overlay_handle.hpp      |   0
 {drape => libs/drape}/overlay_tree.cpp        |   0
 {drape => libs/drape}/overlay_tree.hpp        |   0
 {drape => libs/drape}/pointers.cpp            |   0
 {drape => libs/drape}/pointers.hpp            |   0
 {drape => libs/drape}/render_bucket.cpp       |   0
 {drape => libs/drape}/render_bucket.hpp       |   0
 {drape => libs/drape}/render_state.cpp        |   0
 {drape => libs/drape}/render_state.hpp        |   0
 {drape => libs/drape}/shader.cpp              |   0
 {drape => libs/drape}/shader.hpp              |   0
 {drape => libs/drape}/static_texture.cpp      |   0
 {drape => libs/drape}/static_texture.hpp      |   0
 .../drape}/stipple_pen_resource.cpp           |   0
 .../drape}/stipple_pen_resource.hpp           |   0
 {drape => libs/drape}/support_manager.cpp     |   0
 {drape => libs/drape}/support_manager.hpp     |   0
 {drape => libs/drape}/symbols_texture.cpp     |   0
 {drape => libs/drape}/symbols_texture.hpp     |   0
 {drape => libs/drape}/texture.cpp             |   0
 {drape => libs/drape}/texture.hpp             |   0
 {drape => libs/drape}/texture_manager.cpp     |   0
 {drape => libs/drape}/texture_manager.hpp     |   0
 {drape => libs/drape}/texture_of_colors.cpp   |   0
 {drape => libs/drape}/texture_of_colors.hpp   |   0
 {drape => libs/drape}/texture_types.hpp       |   0
 {drape => libs/drape}/tm_read_resources.hpp   |   0
 {drape => libs/drape}/uniform_value.cpp       |   0
 {drape => libs/drape}/uniform_value.hpp       |   0
 .../drape}/utils/glyph_usage_tracker.cpp      |   0
 .../drape}/utils/glyph_usage_tracker.hpp      |   0
 .../drape}/utils/gpu_mem_tracker.cpp          |   0
 .../drape}/utils/gpu_mem_tracker.hpp          |   0
 {drape => libs/drape}/utils/profiler.hpp      |   0
 {drape => libs/drape}/utils/projection.cpp    |   0
 {drape => libs/drape}/utils/projection.hpp    |   0
 {drape => libs/drape}/utils/vertex_decl.cpp   |   0
 {drape => libs/drape}/utils/vertex_decl.hpp   |   0
 {drape => libs/drape}/vertex_array_buffer.cpp |   0
 {drape => libs/drape}/vertex_array_buffer.hpp |   0
 {drape => libs/drape}/viewport.cpp            |   0
 {drape => libs/drape}/viewport.hpp            |   0
 {drape => libs/drape}/visual_scale.hpp        |   0
 .../drape}/vulkan/vulkan_base_context.cpp     |   0
 .../drape}/vulkan/vulkan_base_context.hpp     |   0
 .../drape}/vulkan/vulkan_context_factory.cpp  |   0
 .../drape}/vulkan/vulkan_context_factory.hpp  |   0
 .../drape}/vulkan/vulkan_gpu_buffer_impl.cpp  |   0
 .../drape}/vulkan/vulkan_gpu_buffer_impl.hpp  |   0
 .../drape}/vulkan/vulkan_gpu_program.hpp      |   0
 .../drape}/vulkan/vulkan_layers.cpp           |   0
 .../drape}/vulkan/vulkan_layers.hpp           |   0
 .../drape}/vulkan/vulkan_memory_manager.cpp   |   0
 .../drape}/vulkan/vulkan_memory_manager.hpp   |   0
 .../drape}/vulkan/vulkan_mesh_object_impl.cpp |   0
 .../drape}/vulkan/vulkan_object_manager.cpp   |   0
 .../drape}/vulkan/vulkan_object_manager.hpp   |   0
 .../drape}/vulkan/vulkan_param_descriptor.cpp |   0
 .../drape}/vulkan/vulkan_param_descriptor.hpp |   0
 .../drape}/vulkan/vulkan_pipeline.cpp         |   0
 .../drape}/vulkan/vulkan_pipeline.hpp         |   0
 .../drape}/vulkan/vulkan_staging_buffer.cpp   |   0
 .../drape}/vulkan/vulkan_staging_buffer.hpp   |   0
 .../drape}/vulkan/vulkan_texture.cpp          |   0
 .../drape}/vulkan/vulkan_texture.hpp          |   0
 {drape => libs/drape}/vulkan/vulkan_utils.cpp |   0
 {drape => libs/drape}/vulkan/vulkan_utils.hpp |   0
 .../vulkan_vertex_array_buffer_impl.cpp       |   0
 .../drape_frontend}/CMakeLists.txt            |   0
 .../drape_frontend}/animation/animation.cpp   |   0
 .../drape_frontend}/animation/animation.hpp   |   0
 .../animation/arrow_animation.cpp             |   0
 .../animation/arrow_animation.hpp             |   0
 .../animation/base_interpolator.cpp           |   0
 .../animation/base_interpolator.hpp           |   0
 .../animation/follow_animation.cpp            |   0
 .../animation/follow_animation.hpp            |   0
 .../animation/interpolation_holder.cpp        |   0
 .../animation/interpolation_holder.hpp        |   0
 .../animation/interpolations.cpp              |   0
 .../animation/interpolations.hpp              |   0
 .../animation/interpolators.cpp               |   0
 .../animation/interpolators.hpp               |   0
 .../animation/linear_animation.cpp            |   0
 .../animation/linear_animation.hpp            |   0
 .../animation/opacity_animation.cpp           |   0
 .../animation/opacity_animation.hpp           |   0
 .../animation/parallel_animation.cpp          |   0
 .../animation/parallel_animation.hpp          |   0
 .../animation/scale_animation.cpp             |   0
 .../animation/scale_animation.hpp             |   0
 .../animation/sequence_animation.cpp          |   0
 .../animation/sequence_animation.hpp          |   0
 .../animation/show_hide_animation.cpp         |   0
 .../animation/show_hide_animation.hpp         |   0
 .../animation/value_mapping.hpp               |   0
 .../drape_frontend}/animation_constants.hpp   |   0
 .../drape_frontend}/animation_system.cpp      |   0
 .../drape_frontend}/animation_system.hpp      |   0
 .../drape_frontend}/animation_utils.cpp       |   0
 .../drape_frontend}/animation_utils.hpp       |   0
 .../apply_feature_functors.cpp                |   0
 .../apply_feature_functors.hpp                |   0
 .../drape_frontend}/area_shape.cpp            |   0
 .../drape_frontend}/area_shape.hpp            |   0
 .../drape_frontend}/arrow3d.cpp               |   0
 .../drape_frontend}/arrow3d.hpp               |   0
 .../drape_frontend}/backend_renderer.cpp      |   0
 .../drape_frontend}/backend_renderer.hpp      |   0
 .../drape_frontend}/base_renderer.cpp         |   0
 .../drape_frontend}/base_renderer.hpp         |   0
 .../drape_frontend}/batcher_bucket.hpp        |   0
 .../drape_frontend}/batchers_pool.hpp         |   0
 .../drape_frontend}/circles_pack_shape.cpp    |   0
 .../drape_frontend}/circles_pack_shape.hpp    |   0
 .../drape_frontend}/color_constants.cpp       |   0
 .../drape_frontend}/color_constants.hpp       |   0
 .../drape_frontend}/colored_symbol_shape.cpp  |   0
 .../drape_frontend}/colored_symbol_shape.hpp  |   0
 .../custom_features_context.hpp               |   0
 .../drape_frontend}/debug_rect_renderer.cpp   |   0
 .../drape_frontend}/debug_rect_renderer.hpp   |   0
 .../drape_frontend}/drape_api.cpp             |   0
 .../drape_frontend}/drape_api.hpp             |   0
 .../drape_frontend}/drape_api_builder.cpp     |   0
 .../drape_frontend}/drape_api_builder.hpp     |   0
 .../drape_frontend}/drape_api_renderer.cpp    |   0
 .../drape_frontend}/drape_api_renderer.hpp    |   0
 .../drape_frontend}/drape_engine.cpp          |   0
 .../drape_frontend}/drape_engine.hpp          |   0
 .../drape_frontend}/drape_engine_params.hpp   |   0
 .../drape_frontend}/drape_engine_safe_ptr.hpp |   0
 .../drape_frontend_tests/CMakeLists.txt       |   0
 .../frame_values_tests.cpp                    |   0
 .../drape_frontend_tests/navigator_test.cpp   |   0
 .../drape_frontend_tests/path_text_test.cpp   |   0
 .../drape_frontend_tests/stylist_tests.cpp    |   0
 .../user_event_stream_tests.cpp               |   0
 .../drape_frontend}/drape_hints.hpp           |   0
 .../drape_frontend}/drape_measurer.cpp        |   0
 .../drape_frontend}/drape_measurer.hpp        |   0
 .../drape_frontend}/drape_notifier.cpp        |   0
 .../drape_frontend}/drape_notifier.hpp        |   0
 .../drape_frontend}/engine_context.cpp        |   0
 .../drape_frontend}/engine_context.hpp        |   0
 .../drape_frontend}/frame_values.hpp          |   0
 .../drape_frontend}/frontend_renderer.cpp     |   0
 .../drape_frontend}/frontend_renderer.hpp     |   0
 .../drape_frontend}/gps_track_point.hpp       |   0
 .../drape_frontend}/gps_track_renderer.cpp    |   0
 .../drape_frontend}/gps_track_renderer.hpp    |   0
 .../gui/choose_position_mark.cpp              |   0
 .../gui/choose_position_mark.hpp              |   0
 .../drape_frontend}/gui/compass.cpp           |   0
 .../drape_frontend}/gui/compass.hpp           |   0
 .../drape_frontend}/gui/copyright_label.cpp   |   0
 .../drape_frontend}/gui/copyright_label.hpp   |   0
 .../drape_frontend}/gui/debug_label.cpp       |   0
 .../drape_frontend}/gui/debug_label.hpp       |   0
 .../drape_frontend}/gui/drape_gui.cpp         |   0
 .../drape_frontend}/gui/drape_gui.hpp         |   0
 .../drape_frontend}/gui/gui_text.cpp          |   0
 .../drape_frontend}/gui/gui_text.hpp          |   0
 .../drape_frontend}/gui/layer_render.cpp      |   0
 .../drape_frontend}/gui/layer_render.hpp      |   0
 .../drape_frontend}/gui/ruler.cpp             |   0
 .../drape_frontend}/gui/ruler.hpp             |   0
 .../drape_frontend}/gui/ruler_helper.cpp      |   0
 .../drape_frontend}/gui/ruler_helper.hpp      |   0
 .../drape_frontend}/gui/scale_fps_helper.hpp  |   0
 .../drape_frontend}/gui/shape.cpp             |   0
 .../drape_frontend}/gui/shape.hpp             |   0
 .../drape_frontend}/gui/skin.cpp              |   0
 .../drape_frontend}/gui/skin.hpp              |   0
 .../drape_frontend}/kinetic_scroller.cpp      |   0
 .../drape_frontend}/kinetic_scroller.hpp      |   0
 .../drape_frontend}/line_shape.cpp            |   0
 .../drape_frontend}/line_shape.hpp            |   0
 .../drape_frontend}/line_shape_helper.cpp     |   0
 .../drape_frontend}/line_shape_helper.hpp     |   0
 .../drape_frontend}/map_data_provider.cpp     |   0
 .../drape_frontend}/map_data_provider.hpp     |   0
 .../drape_frontend}/map_shape.hpp             |   0
 .../drape_frontend}/message.cpp               |   0
 .../drape_frontend}/message.hpp               |   0
 .../drape_frontend}/message_acceptor.cpp      |   0
 .../drape_frontend}/message_acceptor.hpp      |   0
 .../drape_frontend}/message_queue.cpp         |   0
 .../drape_frontend}/message_queue.hpp         |   0
 .../drape_frontend}/message_subclasses.hpp    |   0
 .../drape_frontend}/metaline_manager.cpp      |   0
 .../drape_frontend}/metaline_manager.hpp      |   0
 .../drape_frontend}/my_position.cpp           |   0
 .../drape_frontend}/my_position.hpp           |   0
 .../my_position_controller.cpp                |   0
 .../my_position_controller.hpp                |   0
 .../drape_frontend}/navigator.cpp             |   0
 .../drape_frontend}/navigator.hpp             |   0
 .../drape_frontend}/overlay_batcher.cpp       |   0
 .../drape_frontend}/overlay_batcher.hpp       |   0
 .../drape_frontend}/overlays_tracker.cpp      |   0
 .../drape_frontend}/overlays_tracker.hpp      |   0
 .../drape_frontend}/path_symbol_shape.cpp     |   0
 .../drape_frontend}/path_symbol_shape.hpp     |   0
 .../drape_frontend}/path_text_handle.cpp      |   0
 .../drape_frontend}/path_text_handle.hpp      |   0
 .../drape_frontend}/path_text_shape.cpp       |   0
 .../drape_frontend}/path_text_shape.hpp       |   0
 .../drape_frontend}/poi_symbol_shape.cpp      |   0
 .../drape_frontend}/poi_symbol_shape.hpp      |   0
 .../drape_frontend}/postprocess_renderer.cpp  |   0
 .../drape_frontend}/postprocess_renderer.hpp  |   0
 .../drape_frontend}/read_manager.cpp          |   0
 .../drape_frontend}/read_manager.hpp          |   0
 .../drape_frontend}/read_metaline_task.cpp    |   0
 .../drape_frontend}/read_metaline_task.hpp    |   0
 .../drape_frontend}/read_mwm_task.cpp         |   0
 .../drape_frontend}/read_mwm_task.hpp         |   0
 .../drape_frontend}/render_group.cpp          |   0
 .../drape_frontend}/render_group.hpp          |   0
 .../drape_frontend}/render_node.hpp           |   0
 .../render_state_extension.cpp                |   0
 .../render_state_extension.hpp                |   0
 .../drape_frontend}/requested_tiles.cpp       |   0
 .../drape_frontend}/requested_tiles.hpp       |   0
 .../drape_frontend}/route_builder.cpp         |   0
 .../drape_frontend}/route_builder.hpp         |   0
 .../drape_frontend}/route_renderer.cpp        |   0
 .../drape_frontend}/route_renderer.hpp        |   0
 .../drape_frontend}/route_shape.cpp           |   0
 .../drape_frontend}/route_shape.hpp           |   0
 .../drape_frontend}/rule_drawer.cpp           |   0
 .../drape_frontend}/rule_drawer.hpp           |   0
 .../drape_frontend}/scenario_manager.cpp      |   0
 .../drape_frontend}/scenario_manager.hpp      |   0
 .../drape_frontend}/screen_animations.cpp     |   0
 .../drape_frontend}/screen_animations.hpp     |   0
 .../drape_frontend}/screen_operations.cpp     |   0
 .../drape_frontend}/screen_operations.hpp     |   0
 .../drape_frontend}/screen_quad_renderer.cpp  |   0
 .../drape_frontend}/screen_quad_renderer.hpp  |   0
 .../drape_frontend}/selection_shape.cpp       |   0
 .../drape_frontend}/selection_shape.hpp       |   0
 .../selection_shape_generator.cpp             |   0
 .../selection_shape_generator.hpp             |   0
 .../drape_frontend}/shape_view_params.hpp     |   0
 .../drape_frontend}/stylist.cpp               |   0
 .../drape_frontend}/stylist.hpp               |   0
 .../drape_frontend}/text_handle.cpp           |   0
 .../drape_frontend}/text_handle.hpp           |   0
 .../drape_frontend}/text_layout.cpp           |   0
 .../drape_frontend}/text_layout.hpp           |   0
 .../drape_frontend}/text_shape.cpp            |   0
 .../drape_frontend}/text_shape.hpp            |   0
 .../drape_frontend}/threads_commutator.cpp    |   0
 .../drape_frontend}/threads_commutator.hpp    |   0
 .../drape_frontend}/tile_info.cpp             |   0
 .../drape_frontend}/tile_info.hpp             |   0
 .../drape_frontend}/tile_key.cpp              |   0
 .../drape_frontend}/tile_key.hpp              |   0
 .../drape_frontend}/tile_utils.cpp            |   0
 .../drape_frontend}/tile_utils.hpp            |   0
 .../drape_frontend}/traffic_generator.cpp     |   0
 .../drape_frontend}/traffic_generator.hpp     |   0
 .../drape_frontend}/traffic_renderer.cpp      |   0
 .../drape_frontend}/traffic_renderer.hpp      |   0
 .../transit_scheme_builder.cpp                |   0
 .../transit_scheme_builder.hpp                |   0
 .../transit_scheme_renderer.cpp               |   0
 .../transit_scheme_renderer.hpp               |   0
 .../drape_frontend}/user_event_stream.cpp     |   0
 .../drape_frontend}/user_event_stream.hpp     |   0
 .../drape_frontend}/user_mark_generator.cpp   |   0
 .../drape_frontend}/user_mark_generator.hpp   |   0
 .../drape_frontend}/user_mark_shapes.cpp      |   0
 .../drape_frontend}/user_mark_shapes.hpp      |   0
 .../drape_frontend}/user_marks_provider.cpp   |   0
 .../drape_frontend}/user_marks_provider.hpp   |   0
 .../drape_frontend}/visual_params.cpp         |   0
 .../drape_frontend}/visual_params.hpp         |   0
 {editor => libs/editor}/CMakeLists.txt        |   0
 {editor => libs/editor}/changeset_wrapper.cpp |   0
 {editor => libs/editor}/changeset_wrapper.hpp |   0
 {editor => libs/editor}/config_loader.cpp     |   0
 {editor => libs/editor}/config_loader.hpp     |   0
 .../editor}/editable_data_source.hpp          |   0
 .../editor}/editable_feature_source.cpp       |   0
 .../editor}/editable_feature_source.hpp       |   0
 {editor => libs/editor}/editor_config.cpp     |   0
 {editor => libs/editor}/editor_config.hpp     |   0
 {editor => libs/editor}/editor_notes.cpp      |   0
 {editor => libs/editor}/editor_notes.hpp      |   0
 {editor => libs/editor}/editor_storage.cpp    |   0
 {editor => libs/editor}/editor_storage.hpp    |   0
 .../editor}/editor_tests/CMakeLists.txt       |   0
 .../editor_tests/config_loader_test.cpp       |   0
 .../editor_tests/editor_config_test.cpp       |   0
 .../editor_tests/editor_notes_test.cpp        |   0
 .../editor_tests/feature_matcher_test.cpp     |   0
 .../editor_tests/match_by_geometry_test.cpp   |   0
 .../new_feature_categories_test.cpp           |   0
 .../editor_tests/opening_hours_ui_test.cpp    |   0
 .../editor}/editor_tests/osm_editor_test.cpp  |   0
 .../editor}/editor_tests/osm_editor_test.hpp  |   0
 .../editor}/editor_tests/ui2oh_test.cpp       |   0
 .../editor}/editor_tests/xml_feature_test.cpp |   0
 .../editor_tests_support/CMakeLists.txt       |   0
 .../editor}/editor_tests_support/helpers.cpp  |   0
 .../editor}/editor_tests_support/helpers.hpp  |   0
 {editor => libs/editor}/edits_migration.cpp   |   0
 {editor => libs/editor}/edits_migration.hpp   |   0
 {editor => libs/editor}/feature_matcher.cpp   |   0
 {editor => libs/editor}/feature_matcher.hpp   |   0
 {editor => libs/editor}/module.modulemap      |   0
 .../editor}/new_feature_categories.cpp        |   0
 .../editor}/new_feature_categories.hpp        |   0
 {editor => libs/editor}/opening_hours_ui.cpp  |   0
 {editor => libs/editor}/opening_hours_ui.hpp  |   0
 {editor => libs/editor}/osm_auth.cpp          |   0
 {editor => libs/editor}/osm_auth.hpp          |   0
 .../editor}/osm_auth_tests/CMakeLists.txt     |   0
 .../editor}/osm_auth_tests/osm_auth_tests.cpp |   0
 .../osm_auth_tests/server_api_test.cpp        |   0
 {editor => libs/editor}/osm_editor.cpp        |   0
 {editor => libs/editor}/osm_editor.hpp        |   0
 {editor => libs/editor}/server_api.cpp        |   0
 {editor => libs/editor}/server_api.hpp        |   0
 {editor => libs/editor}/ui2oh.cpp             |   0
 {editor => libs/editor}/ui2oh.hpp             |   0
 {editor => libs/editor}/xml_feature.cpp       |   0
 {editor => libs/editor}/xml_feature.hpp       |   0
 {editor => libs/editor}/yes_no_unknown.hpp    |   0
 {ge0 => libs/ge0}/CMakeLists.txt              |   0
 {ge0 => libs/ge0}/ge0.php                     |   0
 {ge0 => libs/ge0}/ge0_tests/CMakeLists.txt    |   0
 {ge0 => libs/ge0}/ge0_tests/geo_url_tests.cpp |   0
 {ge0 => libs/ge0}/ge0_tests/parser_tests.cpp  |   0
 .../ge0}/ge0_tests/url_generator_tests.cpp    |   0
 {ge0 => libs/ge0}/geo_url_parser.cpp          |   0
 {ge0 => libs/ge0}/geo_url_parser.hpp          |   0
 {ge0 => libs/ge0}/parser.cpp                  |   0
 {ge0 => libs/ge0}/parser.hpp                  |   0
 {ge0 => libs/ge0}/url_generator.cpp           |   0
 {ge0 => libs/ge0}/url_generator.hpp           |   0
 {geometry => libs/geometry}/CMakeLists.txt    |   0
 {geometry => libs/geometry}/algorithm.cpp     |   0
 {geometry => libs/geometry}/algorithm.hpp     |   0
 {geometry => libs/geometry}/angles.cpp        |   0
 {geometry => libs/geometry}/angles.hpp        |   0
 {geometry => libs/geometry}/any_rect2d.hpp    |   0
 {geometry => libs/geometry}/area_on_earth.cpp |   0
 {geometry => libs/geometry}/area_on_earth.hpp |   0
 {geometry => libs/geometry}/avg_vector.hpp    |   0
 {geometry => libs/geometry}/bounding_box.cpp  |   0
 {geometry => libs/geometry}/bounding_box.hpp  |   0
 {geometry => libs/geometry}/calipers_box.cpp  |   0
 {geometry => libs/geometry}/calipers_box.hpp  |   0
 {geometry => libs/geometry}/cellid.hpp        |   0
 .../geometry}/circle_on_earth.cpp             |   0
 .../geometry}/circle_on_earth.hpp             |   0
 {geometry => libs/geometry}/clipping.cpp      |   0
 {geometry => libs/geometry}/clipping.hpp      |   0
 {geometry => libs/geometry}/convex_hull.cpp   |   0
 {geometry => libs/geometry}/convex_hull.hpp   |   0
 {geometry => libs/geometry}/covering.hpp      |   0
 .../geometry}/covering_utils.hpp              |   0
 {geometry => libs/geometry}/diamond_box.cpp   |   0
 {geometry => libs/geometry}/diamond_box.hpp   |   0
 .../geometry}/distance_on_sphere.cpp          |   0
 .../geometry}/distance_on_sphere.hpp          |   0
 .../geometry}/geometry_tests/CMakeLists.txt   |   0
 .../geometry_tests/algorithm_test.cpp         |   0
 .../geometry}/geometry_tests/angle_test.cpp   |   0
 .../geometry}/geometry_tests/anyrect_test.cpp |   0
 .../geometry_tests/area_on_earth_tests.cpp    |   0
 .../geometry_tests/bounding_box_tests.cpp     |   0
 .../geometry_tests/calipers_box_tests.cpp     |   0
 .../geometry}/geometry_tests/cellid_test.cpp  |   0
 .../geometry_tests/circle_on_earth_tests.cpp  |   0
 .../geometry_tests/clipping_test.cpp          |   0
 .../geometry}/geometry_tests/common_test.cpp  |   0
 .../geometry_tests/convex_hull_tests.cpp      |   0
 .../geometry_tests/covering_test.cpp          |   0
 .../geometry_tests/diamond_box_tests.cpp      |   0
 .../distance_on_sphere_test.cpp               |   0
 .../geometry}/geometry_tests/equality.hpp     |   0
 .../geometry_tests/intersect_test.cpp         |   0
 .../intersection_score_tests.cpp              |   0
 .../geometry_tests/large_polygon.hpp          |   0
 .../geometry}/geometry_tests/latlon_test.cpp  |   0
 .../geometry}/geometry_tests/line2d_tests.cpp |   0
 .../geometry_tests/mercator_test.cpp          |   0
 .../nearby_points_sweeper_test.cpp            |   0
 .../geometry_tests/oblate_spheroid_tests.cpp  |   0
 .../geometry}/geometry_tests/packer_test.cpp  |   0
 .../parametrized_segment_tests.cpp            |   0
 .../geometry_tests/point3d_tests.cpp          |   0
 .../geometry}/geometry_tests/point_test.cpp   |   0
 .../geometry}/geometry_tests/polygon_test.cpp |   0
 .../geometry_tests/polyline_tests.cpp         |   0
 .../geometry}/geometry_tests/rect_test.cpp    |   0
 .../region2d_binary_op_test.cpp               |   0
 .../geometry}/geometry_tests/region_tests.cpp |   0
 .../geometry}/geometry_tests/robust_test.cpp  |   0
 .../geometry}/geometry_tests/screen_test.cpp  |   0
 .../geometry_tests/segment2d_tests.cpp        |   0
 .../geometry_tests/simplification_test.cpp    |   0
 .../geometry}/geometry_tests/spline_test.cpp  |   0
 .../geometry}/geometry_tests/test_regions.hpp |   0
 .../geometry_tests/transformations_test.cpp   |   0
 .../geometry}/geometry_tests/tree_test.cpp    |   0
 .../geometry}/geometry_tests/vector_test.cpp  |   0
 .../geometry}/intersection_score.hpp          |   0
 {geometry => libs/geometry}/latlon.cpp        |   0
 {geometry => libs/geometry}/latlon.hpp        |   0
 {geometry => libs/geometry}/line2d.cpp        |   0
 {geometry => libs/geometry}/line2d.hpp        |   0
 {geometry => libs/geometry}/mercator.cpp      |   0
 {geometry => libs/geometry}/mercator.hpp      |   0
 {geometry => libs/geometry}/meter.hpp         |   0
 .../geometry}/nearby_points_sweeper.cpp       |   0
 .../geometry}/nearby_points_sweeper.hpp       |   0
 .../geometry}/oblate_spheroid.cpp             |   0
 .../geometry}/oblate_spheroid.hpp             |   0
 {geometry => libs/geometry}/packer.cpp        |   0
 {geometry => libs/geometry}/packer.hpp        |   0
 .../geometry}/parametrized_segment.hpp        |   0
 {geometry => libs/geometry}/point2d.hpp       |   0
 {geometry => libs/geometry}/point3d.hpp       |   0
 .../geometry}/point_with_altitude.cpp         |   0
 .../geometry}/point_with_altitude.hpp         |   0
 {geometry => libs/geometry}/polygon.hpp       |   0
 {geometry => libs/geometry}/polyline2d.hpp    |   0
 {geometry => libs/geometry}/rect2d.hpp        |   0
 .../geometry}/rect_intersect.hpp              |   0
 {geometry => libs/geometry}/region2d.hpp      |   0
 .../geometry}/region2d/binary_operators.cpp   |   0
 .../geometry}/region2d/binary_operators.hpp   |   0
 .../geometry}/region2d/boost_concept.hpp      |   0
 .../geometry}/robust_orientation.cpp          |   0
 .../geometry}/robust_orientation.hpp          |   0
 {geometry => libs/geometry}/screenbase.cpp    |   0
 {geometry => libs/geometry}/screenbase.hpp    |   0
 {geometry => libs/geometry}/segment2d.cpp     |   0
 {geometry => libs/geometry}/segment2d.hpp     |   0
 .../geometry}/simplification.hpp              |   0
 {geometry => libs/geometry}/smoothing.cpp     |   0
 {geometry => libs/geometry}/smoothing.hpp     |   0
 {geometry => libs/geometry}/spline.cpp        |   0
 {geometry => libs/geometry}/spline.hpp        |   0
 .../geometry}/transformations.hpp             |   0
 {geometry => libs/geometry}/tree4d.hpp        |   0
 {geometry => libs/geometry}/triangle2d.cpp    |   0
 {geometry => libs/geometry}/triangle2d.hpp    |   0
 {indexer => libs/indexer}/CMakeLists.txt      |   0
 {indexer => libs/indexer}/altitude_loader.cpp |   0
 {indexer => libs/indexer}/altitude_loader.hpp |   0
 {indexer => libs/indexer}/brands_holder.cpp   |   0
 {indexer => libs/indexer}/brands_holder.hpp   |   0
 .../indexer}/caching_rank_table_loader.cpp    |   0
 .../indexer}/caching_rank_table_loader.hpp    |   0
 .../indexer}/categories_holder.cpp            |   0
 .../indexer}/categories_holder.hpp            |   0
 .../indexer}/categories_holder_loader.cpp     |   0
 .../indexer}/categories_index.cpp             |   0
 .../indexer}/categories_index.hpp             |   0
 {indexer => libs/indexer}/cell_coverer.hpp    |   0
 {indexer => libs/indexer}/cell_id.hpp         |   0
 {indexer => libs/indexer}/cell_value_pair.hpp |   0
 {indexer => libs/indexer}/centers_table.cpp   |   0
 {indexer => libs/indexer}/centers_table.hpp   |   0
 .../indexer}/cities_boundaries_serdes.hpp     |   0
 {indexer => libs/indexer}/city_boundary.hpp   |   0
 {indexer => libs/indexer}/classificator.cpp   |   0
 {indexer => libs/indexer}/classificator.hpp   |   0
 .../indexer}/classificator_loader.cpp         |   0
 .../indexer}/classificator_loader.hpp         |   0
 {indexer => libs/indexer}/complex/serdes.cpp  |   0
 {indexer => libs/indexer}/complex/serdes.hpp  |   0
 .../indexer}/complex/serdes_utils.hpp         |   0
 .../indexer}/complex/tree_node.hpp            |   0
 {indexer => libs/indexer}/cuisines.cpp        |   0
 {indexer => libs/indexer}/cuisines.hpp        |   0
 {indexer => libs/indexer}/custom_keyvalue.cpp |   0
 {indexer => libs/indexer}/custom_keyvalue.hpp |   0
 .../indexer}/dat_section_header.hpp           |   0
 {indexer => libs/indexer}/data_factory.cpp    |   0
 {indexer => libs/indexer}/data_factory.hpp    |   0
 {indexer => libs/indexer}/data_header.cpp     |   0
 {indexer => libs/indexer}/data_header.hpp     |   0
 {indexer => libs/indexer}/data_source.cpp     |   0
 {indexer => libs/indexer}/data_source.hpp     |   0
 .../indexer}/data_source_helpers.cpp          |   0
 .../indexer}/data_source_helpers.hpp          |   0
 .../indexer}/displacement_manager.hpp         |   0
 .../indexer}/drawing_rule_def.cpp             |   0
 .../indexer}/drawing_rule_def.hpp             |   0
 {indexer => libs/indexer}/drawing_rules.cpp   |   0
 {indexer => libs/indexer}/drawing_rules.hpp   |   0
 {indexer => libs/indexer}/drules_include.hpp  |   0
 {indexer => libs/indexer}/drules_selector.cpp |   0
 {indexer => libs/indexer}/drules_selector.hpp |   0
 .../indexer}/drules_selector_parser.cpp       |   0
 .../indexer}/drules_selector_parser.hpp       |   0
 {indexer => libs/indexer}/drules_struct.pb.cc |   0
 {indexer => libs/indexer}/drules_struct.pb.h  |   0
 {indexer => libs/indexer}/drules_struct.proto |   0
 {indexer => libs/indexer}/edit_journal.cpp    |   0
 {indexer => libs/indexer}/edit_journal.hpp    |   0
 .../indexer}/editable_map_object.cpp          |   0
 .../indexer}/editable_map_object.hpp          |   0
 .../indexer}/fake_feature_ids.cpp             |   0
 .../indexer}/fake_feature_ids.hpp             |   0
 {indexer => libs/indexer}/feature.cpp         |   0
 {indexer => libs/indexer}/feature.hpp         |   0
 {indexer => libs/indexer}/feature_algo.cpp    |   0
 {indexer => libs/indexer}/feature_algo.hpp    |   0
 .../indexer}/feature_altitude.hpp             |   0
 .../indexer}/feature_covering.cpp             |   0
 .../indexer}/feature_covering.hpp             |   0
 {indexer => libs/indexer}/feature_data.cpp    |   0
 {indexer => libs/indexer}/feature_data.hpp    |   0
 {indexer => libs/indexer}/feature_decl.cpp    |   0
 {indexer => libs/indexer}/feature_decl.hpp    |   0
 {indexer => libs/indexer}/feature_impl.cpp    |   0
 {indexer => libs/indexer}/feature_impl.hpp    |   0
 {indexer => libs/indexer}/feature_meta.cpp    |   0
 {indexer => libs/indexer}/feature_meta.hpp    |   0
 .../indexer}/feature_processor.hpp            |   0
 {indexer => libs/indexer}/feature_source.cpp  |   0
 {indexer => libs/indexer}/feature_source.hpp  |   0
 {indexer => libs/indexer}/feature_to_osm.cpp  |   0
 {indexer => libs/indexer}/feature_to_osm.hpp  |   0
 {indexer => libs/indexer}/feature_utils.cpp   |   0
 {indexer => libs/indexer}/feature_utils.hpp   |   0
 .../indexer}/feature_visibility.cpp           |   0
 .../indexer}/feature_visibility.hpp           |   0
 .../indexer}/features_offsets_table.cpp       |   0
 .../indexer}/features_offsets_table.hpp       |   0
 {indexer => libs/indexer}/features_vector.cpp |   0
 {indexer => libs/indexer}/features_vector.hpp |   0
 {indexer => libs/indexer}/ftraits.hpp         |   0
 {indexer => libs/indexer}/ftypes_mapping.hpp  |   0
 {indexer => libs/indexer}/ftypes_matcher.cpp  |   0
 {indexer => libs/indexer}/ftypes_matcher.hpp  |   0
 .../indexer}/house_to_street_iface.hpp        |   0
 {indexer => libs/indexer}/index_builder.cpp   |   0
 {indexer => libs/indexer}/index_builder.hpp   |   0
 .../indexer}/indexer_tests/CMakeLists.txt     |   0
 .../indexer}/indexer_tests/bounds.hpp         |   0
 .../indexer}/indexer_tests/brands_tests.cpp   |   0
 .../indexer_tests/categories_test.cpp         |   0
 .../indexer_tests/cell_coverer_test.cpp       |   0
 .../indexer}/indexer_tests/cell_id_test.cpp   |   0
 .../indexer_tests/centers_table_test.cpp      |   0
 .../indexer}/indexer_tests/checker_test.cpp   |   0
 .../cities_boundaries_serdes_tests.cpp        |   0
 .../indexer_tests/classificator_tests.cpp     |   0
 .../indexer_tests/complex_serdes_tests.cpp    |   0
 .../complex_serdes_utils_tests.cpp            |   0
 .../indexer_tests/custom_keyvalue_tests.cpp   |   0
 .../indexer_tests/data_source_test.cpp        |   0
 .../drules_selector_parser_test.cpp           |   0
 .../editable_map_object_test.cpp              |   0
 .../indexer_tests/feature_metadata_test.cpp   |   0
 .../indexer_tests/feature_names_test.cpp      |   0
 .../indexer_tests/feature_to_osm_tests.cpp    |   0
 .../indexer_tests/feature_types_test.cpp      |   0
 .../features_offsets_table_test.cpp           |   0
 .../indexer_tests/features_vector_test.cpp    |   0
 .../indexer_tests/index_builder_test.cpp      |   0
 .../indexer_tests/interval_index_test.cpp     |   0
 .../indexer_tests/metadata_serdes_tests.cpp   |   0
 .../indexer}/indexer_tests/mwm_set_test.cpp   |   0
 .../indexer_tests/postcodes_matcher_tests.cpp |   0
 .../indexer_tests/rank_table_test.cpp         |   0
 .../indexer_tests/read_features_tests.cpp     |   0
 .../road_shields_parser_tests.cpp             |   0
 .../scale_index_reading_tests.cpp             |   0
 .../search_string_utils_test.cpp              |   0
 .../sort_and_merge_intervals_test.cpp         |   0
 .../indexer_tests/string_slice_tests.cpp      |   0
 .../indexer_tests/succinct_trie_test.cpp      |   0
 .../indexer}/indexer_tests/test_mwm_set.hpp   |   0
 .../indexer}/indexer_tests/test_type.cpp      |   0
 .../indexer_tests/tree_node_tests.cpp         |   0
 .../indexer}/indexer_tests/trie_test.cpp      |   0
 .../validate_and_format_contacts_test.cpp     |   0
 .../indexer_tests/visibility_test.cpp         |   0
 .../indexer_tests/wheelchair_tests.cpp        |   0
 {indexer => libs/indexer}/interval_index.hpp  |   0
 .../indexer}/interval_index_builder.hpp       |   0
 {indexer => libs/indexer}/isolines_info.cpp   |   0
 {indexer => libs/indexer}/isolines_info.hpp   |   0
 {indexer => libs/indexer}/map_object.cpp      |   0
 {indexer => libs/indexer}/map_object.hpp      |   0
 {indexer => libs/indexer}/map_style.cpp       |   0
 {indexer => libs/indexer}/map_style.hpp       |   0
 .../indexer}/map_style_reader.cpp             |   0
 .../indexer}/map_style_reader.hpp             |   0
 {indexer => libs/indexer}/metadata_serdes.cpp |   0
 {indexer => libs/indexer}/metadata_serdes.hpp |   0
 {indexer => libs/indexer}/mwm_set.cpp         |   0
 {indexer => libs/indexer}/mwm_set.hpp         |   0
 .../indexer}/postcodes_matcher.cpp            |   0
 .../indexer}/postcodes_matcher.hpp            |   0
 {indexer => libs/indexer}/rank_table.cpp      |   0
 {indexer => libs/indexer}/rank_table.hpp      |   0
 .../indexer}/road_shields_parser.cpp          |   0
 .../indexer}/road_shields_parser.hpp          |   0
 {indexer => libs/indexer}/scale_index.hpp     |   0
 .../indexer}/scale_index_builder.hpp          |   0
 {indexer => libs/indexer}/scales.cpp          |   0
 {indexer => libs/indexer}/scales.hpp          |   0
 {indexer => libs/indexer}/scales_patch.hpp    |   0
 .../indexer}/search_delimiters.cpp            |   0
 .../indexer}/search_delimiters.hpp            |   0
 .../indexer}/search_string_utils.cpp          |   0
 .../indexer}/search_string_utils.hpp          |   0
 .../indexer}/shared_load_info.cpp             |   0
 .../indexer}/shared_load_info.hpp             |   0
 {indexer => libs/indexer}/string_set.hpp      |   0
 {indexer => libs/indexer}/string_slice.cpp    |   0
 {indexer => libs/indexer}/string_slice.hpp    |   0
 .../indexer}/succinct_trie_builder.hpp        |   0
 .../indexer}/succinct_trie_reader.hpp         |   0
 .../indexer}/transliteration_loader.cpp       |   0
 .../indexer}/transliteration_loader.hpp       |   0
 {indexer => libs/indexer}/tree_structure.hpp  |   0
 {indexer => libs/indexer}/trie.hpp            |   0
 {indexer => libs/indexer}/trie_builder.hpp    |   0
 {indexer => libs/indexer}/trie_reader.hpp     |   0
 {indexer => libs/indexer}/types_mapping.cpp   |   0
 {indexer => libs/indexer}/types_mapping.hpp   |   0
 {indexer => libs/indexer}/unique_index.hpp    |   0
 {indexer => libs/indexer}/utils.cpp           |   0
 {indexer => libs/indexer}/utils.hpp           |   0
 .../indexer}/validate_and_format_contacts.cpp |   0
 .../indexer}/validate_and_format_contacts.hpp |   0
 {indexer => libs/indexer}/yes_no_unknown.hpp  |   0
 {kml => libs/kml}/CMakeLists.txt              |   0
 {kml => libs/kml}/header_binary.hpp           |   0
 {kml => libs/kml}/kmb_to_kml/CMakeLists.txt   |   0
 {kml => libs/kml}/kmb_to_kml/kmb_to_kml.cpp   |   0
 {kml => libs/kml}/kml_tests/CMakeLists.txt    |   0
 {kml => libs/kml}/kml_tests/gpx_tests.cpp     |   0
 .../kml}/kml_tests/minzoom_quadtree_tests.cpp |   0
 {kml => libs/kml}/kml_tests/serdes_tests.cpp  |   0
 {kml => libs/kml}/kml_tests/tests_data.hpp    |   0
 {kml => libs/kml}/kml_to_kmb/CMakeLists.txt   |   0
 {kml => libs/kml}/kml_to_kmb/kml_to_kmb.cpp   |   0
 {kml => libs/kml}/minzoom_quadtree.hpp        |   0
 {kml => libs/kml}/pykmlib/CMakeLists.txt      |   0
 {kml => libs/kml}/pykmlib/bindings.cpp        |   0
 {kml => libs/kml}/pykmlib/bindings_test.py    |   0
 {kml => libs/kml}/pykmlib/setup.py            |   0
 {kml => libs/kml}/serdes.cpp                  |   0
 {kml => libs/kml}/serdes.hpp                  |   0
 {kml => libs/kml}/serdes_binary.cpp           |   0
 {kml => libs/kml}/serdes_binary.hpp           |   0
 {kml => libs/kml}/serdes_binary_v8.hpp        |   0
 {kml => libs/kml}/serdes_common.cpp           |   0
 {kml => libs/kml}/serdes_common.hpp           |   0
 {kml => libs/kml}/serdes_gpx.cpp              |   0
 {kml => libs/kml}/serdes_gpx.hpp              |   0
 {kml => libs/kml}/type_utils.cpp              |   0
 {kml => libs/kml}/type_utils.hpp              |   0
 {kml => libs/kml}/types.cpp                   |   0
 {kml => libs/kml}/types.hpp                   |   0
 {kml => libs/kml}/types_v3.hpp                |   0
 {kml => libs/kml}/types_v6.hpp                |   0
 {kml => libs/kml}/types_v7.hpp                |   0
 {kml => libs/kml}/types_v8.hpp                |   0
 {kml => libs/kml}/types_v8mm.hpp              |   0
 {kml => libs/kml}/types_v9.hpp                |   0
 {kml => libs/kml}/types_v9mm.hpp              |   0
 {kml => libs/kml}/visitors.hpp                |   0
 {map => libs/map}/CMakeLists.txt              |   0
 {map => libs/map}/api_mark_point.cpp          |   0
 {map => libs/map}/api_mark_point.hpp          |   0
 .../map}/benchmark_tool/CMakeLists.txt        |   0
 {map => libs/map}/benchmark_tool/api.cpp      |   0
 {map => libs/map}/benchmark_tool/api.hpp      |   0
 .../map}/benchmark_tool/features_loading.cpp  |   0
 {map => libs/map}/benchmark_tool/main.cpp     |   0
 {map => libs/map}/benchmark_tools.cpp         |   0
 {map => libs/map}/benchmark_tools.hpp         |   0
 {map => libs/map}/bookmark.cpp                |   0
 {map => libs/map}/bookmark.hpp                |   0
 {map => libs/map}/bookmark_helpers.cpp        |   0
 {map => libs/map}/bookmark_helpers.hpp        |   0
 {map => libs/map}/bookmark_manager.cpp        |   0
 {map => libs/map}/bookmark_manager.hpp        |   0
 {map => libs/map}/bookmarks_search_params.hpp |   0
 {map => libs/map}/chart_generator.cpp         |   0
 {map => libs/map}/chart_generator.hpp         |   0
 {map => libs/map}/elevation_info.cpp          |   0
 {map => libs/map}/elevation_info.hpp          |   0
 .../map}/everywhere_search_callback.cpp       |   0
 .../map}/everywhere_search_callback.hpp       |   0
 .../map}/everywhere_search_params.hpp         |   0
 .../map}/extrapolation/extrapolator.cpp       |   0
 .../map}/extrapolation/extrapolator.hpp       |   0
 .../extrapolation_benchmark/CMakeLists.txt    |   0
 .../extrapolation_benchmark.cpp               |   0
 {map => libs/map}/features_fetcher.cpp        |   0
 {map => libs/map}/features_fetcher.hpp        |   0
 {map => libs/map}/framework.cpp               |   0
 {map => libs/map}/framework.hpp               |   0
 {map => libs/map}/framework_visualize.cpp     |   0
 {map => libs/map}/gps_track.cpp               |   0
 {map => libs/map}/gps_track.hpp               |   0
 {map => libs/map}/gps_track_collection.cpp    |   0
 {map => libs/map}/gps_track_collection.hpp    |   0
 {map => libs/map}/gps_track_filter.cpp        |   0
 {map => libs/map}/gps_track_filter.hpp        |   0
 {map => libs/map}/gps_track_storage.cpp       |   0
 {map => libs/map}/gps_track_storage.hpp       |   0
 {map => libs/map}/gps_tracker.cpp             |   0
 {map => libs/map}/gps_tracker.hpp             |   0
 {map => libs/map}/isolines_manager.cpp        |   0
 {map => libs/map}/isolines_manager.hpp        |   0
 .../map}/map_integration_tests/CMakeLists.txt |   0
 .../interactive_search_test.cpp               |   0
 {map => libs/map}/map_tests/CMakeLists.txt    |   0
 {map => libs/map}/map_tests/address_tests.cpp |   0
 .../map}/map_tests/bookmarks_test.cpp         |   0
 .../map}/map_tests/chart_generator_tests.cpp  |   0
 {map => libs/map}/map_tests/check_mwms.cpp    |   0
 .../map}/map_tests/countries_names_tests.cpp  |   0
 .../map}/map_tests/elevation_info_tests.cpp   |   0
 .../map}/map_tests/extrapolator_tests.cpp     |   0
 .../map}/map_tests/feature_getters_tests.cpp  |   0
 .../map_tests/gps_track_collection_test.cpp   |   0
 .../map}/map_tests/gps_track_storage_test.cpp |   0
 .../map}/map_tests/gps_track_test.cpp         |   0
 .../map}/map_tests/kmz_unarchive_test.cpp     |   0
 {map => libs/map}/map_tests/mwm_set_test.cpp  |   0
 {map => libs/map}/map_tests/mwm_url_tests.cpp |   0
 .../map}/map_tests/power_manager_tests.cpp    |   0
 .../map}/map_tests/search_api_tests.cpp       |   0
 .../map}/map_tests/track_statistics_tests.cpp |   0
 .../map}/map_tests/transliteration_test.cpp   |   0
 {map => libs/map}/mwm_tests/CMakeLists.txt    |   0
 .../map}/mwm_tests/multithread_mwm_test.cpp   |   0
 .../map}/mwm_tests/mwm_foreach_test.cpp       |   0
 .../map}/mwm_tests/mwm_index_test.cpp         |   0
 .../map}/mwm_tests/world_map_test.cpp         |   0
 {map => libs/map}/mwm_tree.hpp                |   0
 {map => libs/map}/mwm_url.cpp                 |   0
 {map => libs/map}/mwm_url.hpp                 |   0
 {map => libs/map}/place_page_info.cpp         |   0
 {map => libs/map}/place_page_info.hpp         |   0
 {map => libs/map}/position_provider.hpp       |   0
 .../power_management_schemas.cpp              |   0
 .../power_management_schemas.hpp              |   0
 .../map}/power_management/power_manager.cpp   |   0
 .../map}/power_management/power_manager.hpp   |   0
 {map => libs/map}/routing_manager.cpp         |   0
 {map => libs/map}/routing_manager.hpp         |   0
 {map => libs/map}/routing_mark.cpp            |   0
 {map => libs/map}/routing_mark.hpp            |   0
 {map => libs/map}/search_api.cpp              |   0
 {map => libs/map}/search_api.hpp              |   0
 {map => libs/map}/search_mark.cpp             |   0
 {map => libs/map}/search_mark.hpp             |   0
 {map => libs/map}/search_product_info.hpp     |   0
 {map => libs/map}/style_tests/CMakeLists.txt  |   0
 .../map}/style_tests/classificator_tests.cpp  |   0
 {map => libs/map}/style_tests/dashes_test.cpp |   0
 {map => libs/map}/style_tests/helpers.hpp     |   0
 .../style_symbols_consistency_test.cpp        |   0
 {map => libs/map}/track.cpp                   |   0
 {map => libs/map}/track.hpp                   |   0
 {map => libs/map}/track_mark.cpp              |   0
 {map => libs/map}/track_mark.hpp              |   0
 {map => libs/map}/track_statistics.cpp        |   0
 {map => libs/map}/track_statistics.hpp        |   0
 {map => libs/map}/traffic_manager.cpp         |   0
 {map => libs/map}/traffic_manager.hpp         |   0
 {map => libs/map}/transit/transit_display.cpp |   0
 {map => libs/map}/transit/transit_display.hpp |   0
 {map => libs/map}/transit/transit_reader.cpp  |   0
 {map => libs/map}/transit/transit_reader.hpp  |   0
 {map => libs/map}/user_mark.cpp               |   0
 {map => libs/map}/user_mark.hpp               |   0
 {map => libs/map}/user_mark_id_storage.cpp    |   0
 {map => libs/map}/user_mark_id_storage.hpp    |   0
 {map => libs/map}/user_mark_layer.cpp         |   0
 {map => libs/map}/user_mark_layer.hpp         |   0
 .../map}/viewport_search_callback.cpp         |   0
 .../map}/viewport_search_callback.hpp         |   0
 {map => libs/map}/viewport_search_params.hpp  |   0
 {generator => libs}/mwm_diff/CMakeLists.txt   |   0
 {generator => libs}/mwm_diff/diff.cpp         |   2 +-
 {generator => libs}/mwm_diff/diff.hpp         |   0
 .../mwm_diff/mwm_diff_tests/CMakeLists.txt    |   0
 .../mwm_diff/mwm_diff_tests/diff_tests.cpp    |   2 +-
 .../mwm_diff/mwm_diff_tool/CMakeLists.txt     |   0
 .../mwm_diff/mwm_diff_tool/mwm_diff_tool.cpp  |   2 +-
 {platform => libs/platform}/CMakeLists.txt    |   2 +-
 .../platform}/background_downloader_ios.h     |   0
 .../platform}/background_downloader_ios.mm    |   0
 .../platform}/battery_tracker.cpp             |   0
 .../platform}/battery_tracker.hpp             |   0
 .../platform}/chunks_download_strategy.cpp    |   0
 .../platform}/chunks_download_strategy.hpp    |   0
 {platform => libs/platform}/constants.hpp     |   0
 .../platform}/country_defines.cpp             |   0
 .../platform}/country_defines.hpp             |   0
 {platform => libs/platform}/country_file.cpp  |   0
 {platform => libs/platform}/country_file.hpp  |   0
 {platform => libs/platform}/distance.cpp      |   0
 {platform => libs/platform}/distance.hpp      |   0
 .../platform}/downloader_defines.hpp          |   0
 .../platform}/downloader_utils.cpp            |   0
 .../platform}/downloader_utils.hpp            |   0
 {platform => libs/platform}/duration.cpp      |   0
 {platform => libs/platform}/duration.hpp      |   0
 .../platform}/get_text_by_id.cpp              |   0
 .../platform}/get_text_by_id.hpp              |   0
 {platform => libs/platform}/gui_thread.hpp    |   0
 .../platform}/gui_thread_apple.mm             |   0
 {platform => libs/platform}/gui_thread_qt.cpp |   0
 {platform => libs/platform}/http_client.cpp   |   0
 {platform => libs/platform}/http_client.hpp   |   0
 .../platform}/http_client_apple.mm            |   0
 .../platform}/http_client_curl.cpp            |   0
 {platform => libs/platform}/http_payload.cpp  |   0
 {platform => libs/platform}/http_payload.hpp  |   0
 {platform => libs/platform}/http_request.cpp  |   0
 {platform => libs/platform}/http_request.hpp  |   0
 .../platform}/http_session_manager.h          |   0
 .../platform}/http_session_manager.mm         |   0
 .../platform}/http_thread_apple.h             |   0
 .../platform}/http_thread_apple.mm            |   0
 .../platform}/http_thread_callback.hpp        |   0
 .../platform}/http_thread_qt.cpp              |   0
 .../platform}/http_thread_qt.hpp              |   0
 {platform => libs/platform}/http_uploader.hpp |   0
 .../platform}/http_uploader_apple.mm          |   0
 .../platform}/http_uploader_background.hpp    |   0
 .../platform}/http_uploader_background.mm     |   0
 .../http_uploader_background_dummy.cpp        |   0
 .../platform}/http_uploader_dummy.cpp         |   0
 {platform => libs/platform}/languages.hpp     |   0
 .../platform}/local_country_file.cpp          |   0
 .../platform}/local_country_file.hpp          |   0
 .../platform}/local_country_file_utils.cpp    |   0
 .../platform}/local_country_file_utils.hpp    |   0
 {platform => libs/platform}/locale.hpp        |   0
 {platform => libs/platform}/locale.mm         |   0
 {platform => libs/platform}/locale_std.cpp    |   0
 {platform => libs/platform}/localization.cpp  |   0
 {platform => libs/platform}/localization.hpp  |   0
 {platform => libs/platform}/localization.mm   |   0
 .../platform}/localization_dummy.cpp          |   0
 {platform => libs/platform}/location.hpp      |   0
 .../platform}/location_service/CMakeLists.txt |   0
 .../apple_location_service.mm                 |   0
 .../location_service/location_service.cpp     |   0
 .../location_service/location_service.hpp     |   0
 .../location_service/qt_location_service.cpp  |   0
 .../location_service/qt_location_service.hpp  |   0
 .../platform}/measurement_utils.cpp           |   0
 .../platform}/measurement_utils.hpp           |   0
 {platform => libs/platform}/mwm_traits.cpp    |   0
 {platform => libs/platform}/mwm_traits.hpp    |   0
 {platform => libs/platform}/mwm_version.cpp   |   0
 {platform => libs/platform}/mwm_version.hpp   |   0
 .../platform}/network_policy.hpp              |   0
 .../platform}/network_policy_dummy.cpp        |   0
 .../platform}/network_policy_ios.h            |   0
 .../platform}/network_policy_ios.mm           |   0
 {platform => libs/platform}/platform.cpp      |   0
 {platform => libs/platform}/platform.hpp      |   0
 .../platform}/platform_android.cpp            |   0
 {platform => libs/platform}/platform_ios.h    |   0
 {platform => libs/platform}/platform_ios.mm   |   0
 .../platform}/platform_linux.cpp              |   0
 {platform => libs/platform}/platform_mac.mm   |   0
 {platform => libs/platform}/platform_qt.cpp   |   0
 .../platform}/platform_qt_version.cpp.in      |   0
 .../platform}/platform_tests/CMakeLists.txt   |   0
 .../platform_tests/country_file_tests.cpp     |   0
 .../platform_tests/distance_tests.cpp         |   0
 .../downloader_tests/downloader_test.cpp      |   0
 .../platform_tests/downloader_utils_tests.cpp |   0
 .../platform_tests/duration_tests.cpp         |   0
 .../platform_tests/get_text_by_id_tests.cpp   |   0
 .../platform}/platform_tests/jansson_test.cpp |   0
 .../platform_tests/language_test.cpp          |   0
 .../local_country_file_tests.cpp              |   0
 .../platform_tests/location_test.cpp          |   0
 .../platform_tests/measurement_tests.cpp      |   0
 .../platform_tests/meta_config_tests.cpp      |   0
 .../platform_tests/platform_test.cpp          |   0
 .../platform_tests/products_tests.cpp         |   0
 .../platform_tests/utm_mgrs_utils_tests.cpp   |   0
 .../platform_tests_support/CMakeLists.txt     |   0
 .../async_gui_thread.hpp                      |   0
 .../platform_tests_support/helpers.hpp        |   0
 .../platform_tests_support/scoped_dir.cpp     |   0
 .../platform_tests_support/scoped_dir.hpp     |   0
 .../platform_tests_support/scoped_file.cpp    |   0
 .../platform_tests_support/scoped_file.hpp    |   0
 .../platform_tests_support/scoped_mwm.cpp     |   0
 .../platform_tests_support/scoped_mwm.hpp     |   0
 .../platform_tests_support/test_socket.cpp    |   0
 .../platform_tests_support/test_socket.hpp    |   0
 .../writable_dir_changer.cpp                  |   0
 .../writable_dir_changer.hpp                  |   0
 .../platform}/platform_unix_impl.cpp          |   0
 .../platform}/platform_unix_impl.hpp          |   0
 {platform => libs/platform}/platform_win.cpp  |   0
 .../platform}/preferred_languages.cpp         |   0
 .../platform}/preferred_languages.hpp         |   0
 {platform => libs/platform}/products.cpp      |   0
 {platform => libs/platform}/products.hpp      |   0
 {platform => libs/platform}/remote_file.cpp   |   0
 {platform => libs/platform}/remote_file.hpp   |   0
 {platform => libs/platform}/safe_callback.hpp |   0
 .../platform}/secure_storage.hpp              |   0
 .../platform}/secure_storage_dummy.cpp        |   0
 .../platform}/secure_storage_ios.mm           |   0
 .../platform}/secure_storage_qt.cpp           |   0
 {platform => libs/platform}/servers_list.cpp  |   0
 {platform => libs/platform}/servers_list.hpp  |   0
 {platform => libs/platform}/settings.cpp      |   0
 {platform => libs/platform}/settings.hpp      |   0
 {platform => libs/platform}/socket.hpp        |   0
 {platform => libs/platform}/socket_apple.mm   |   0
 .../platform}/string_storage_base.cpp         |   0
 .../platform}/string_storage_base.hpp         |   0
 {platform => libs/platform}/style_utils.hpp   |   0
 {platform => libs/platform}/trace.hpp         |   0
 {platform => libs/platform}/trace_android.cpp |   0
 .../platform}/utm_mgrs_utils.cpp              |   0
 .../platform}/utm_mgrs_utils.hpp              |   0
 {pyhelpers => libs/pyhelpers}/CMakeLists.txt  |   0
 {pyhelpers => libs/pyhelpers}/__init__.py     |   0
 .../pyhelpers}/module_version.hpp.in          |   0
 {pyhelpers => libs/pyhelpers}/pair.hpp        |   0
 {pyhelpers => libs/pyhelpers}/setup.py        |   0
 {pyhelpers => libs/pyhelpers}/specs/build.sh  |   0
 .../specs/python35-mapsme-modules.spec        |   0
 .../pyhelpers}/vector_list_conversion.hpp     |   0
 .../pyhelpers}/vector_uint8.hpp               |   0
 {qt_tstfrm => libs/qt_tstfrm}/CMakeLists.txt  |   0
 .../qt_tstfrm}/test_main_loop.cpp             |   0
 .../qt_tstfrm}/test_main_loop.hpp             |   0
 {routing => libs/routing}/CMakeLists.txt      |   0
 .../routing}/absent_regions_finder.cpp        |   0
 .../routing}/absent_regions_finder.hpp        |   0
 {routing => libs/routing}/async_router.cpp    |   0
 {routing => libs/routing}/async_router.hpp    |   0
 .../routing}/base/astar_algorithm.hpp         |   0
 .../routing}/base/astar_graph.hpp             |   0
 .../routing}/base/astar_progress.cpp          |   0
 .../routing}/base/astar_progress.hpp          |   0
 .../routing}/base/astar_vertex_data.hpp       |   0
 .../routing}/base/astar_weight.hpp            |   0
 {routing => libs/routing}/base/bfs.hpp        |   0
 .../routing}/base/followed_polyline.cpp       |   0
 .../routing}/base/followed_polyline.hpp       |   0
 .../routing}/base/routing_result.hpp          |   0
 {routing => libs/routing}/base/small_list.cpp |   0
 {routing => libs/routing}/base/small_list.hpp |   0
 {routing => libs/routing}/car_directions.cpp  |   0
 {routing => libs/routing}/car_directions.hpp  |   0
 .../routing}/checkpoint_predictor.cpp         |   0
 .../routing}/checkpoint_predictor.hpp         |   0
 {routing => libs/routing}/checkpoints.cpp     |   0
 {routing => libs/routing}/checkpoints.hpp     |   0
 {routing => libs/routing}/city_roads.cpp      |   0
 {routing => libs/routing}/city_roads.hpp      |   0
 .../routing}/city_roads_serialization.hpp     |   0
 {routing => libs/routing}/coding.hpp          |   0
 .../routing}/cross_border_graph.cpp           |   0
 .../routing}/cross_border_graph.hpp           |   0
 .../routing}/cross_mwm_connector.cpp          |   0
 .../routing}/cross_mwm_connector.hpp          |   0
 .../cross_mwm_connector_serialization.hpp     |   0
 {routing => libs/routing}/cross_mwm_graph.cpp |   0
 {routing => libs/routing}/cross_mwm_graph.hpp |   0
 {routing => libs/routing}/cross_mwm_ids.hpp   |   0
 .../routing}/cross_mwm_index_graph.hpp        |   0
 {routing => libs/routing}/data_source.hpp     |   0
 .../routing}/directions_engine.cpp            |   0
 .../routing}/directions_engine.hpp            |   0
 .../routing}/directions_engine_helpers.cpp    |   0
 .../routing}/directions_engine_helpers.hpp    |   0
 .../routing}/dummy_world_graph.hpp            |   0
 {routing => libs/routing}/edge_estimator.cpp  |   0
 {routing => libs/routing}/edge_estimator.hpp  |   0
 .../routing}/fake_edges_container.hpp         |   0
 {routing => libs/routing}/fake_ending.cpp     |   0
 {routing => libs/routing}/fake_ending.hpp     |   0
 .../routing}/fake_feature_ids.hpp             |   0
 {routing => libs/routing}/fake_graph.cpp      |   0
 {routing => libs/routing}/fake_graph.hpp      |   0
 {routing => libs/routing}/fake_vertex.hpp     |   0
 .../routing}/features_road_graph.cpp          |   0
 .../routing}/features_road_graph.hpp          |   0
 {routing => libs/routing}/following_info.hpp  |   0
 {routing => libs/routing}/geometry.cpp        |   0
 {routing => libs/routing}/geometry.hpp        |   0
 .../routing}/guides_connections.cpp           |   0
 .../routing}/guides_connections.hpp           |   0
 {routing => libs/routing}/guides_graph.cpp    |   0
 {routing => libs/routing}/guides_graph.hpp    |   0
 {routing => libs/routing}/index_graph.cpp     |   0
 {routing => libs/routing}/index_graph.hpp     |   0
 .../routing}/index_graph_loader.cpp           |   0
 .../routing}/index_graph_loader.hpp           |   0
 .../routing}/index_graph_serialization.cpp    |   0
 .../routing}/index_graph_serialization.hpp    |   0
 .../routing}/index_graph_starter.cpp          |   0
 .../routing}/index_graph_starter.hpp          |   0
 .../routing}/index_graph_starter_joints.hpp   |   0
 .../routing}/index_road_graph.cpp             |   0
 .../routing}/index_road_graph.hpp             |   0
 {routing => libs/routing}/index_router.cpp    |   0
 {routing => libs/routing}/index_router.hpp    |   0
 {routing => libs/routing}/joint.cpp           |   0
 {routing => libs/routing}/joint.hpp           |   0
 {routing => libs/routing}/joint_index.cpp     |   0
 {routing => libs/routing}/joint_index.hpp     |   0
 {routing => libs/routing}/joint_segment.cpp   |   0
 {routing => libs/routing}/joint_segment.hpp   |   0
 .../routing}/junction_visitor.cpp             |   0
 .../routing}/junction_visitor.hpp             |   0
 .../routing}/latlon_with_altitude.cpp         |   0
 .../routing}/latlon_with_altitude.hpp         |   0
 {routing => libs/routing}/leaps_graph.cpp     |   0
 {routing => libs/routing}/leaps_graph.hpp     |   0
 .../routing}/leaps_postprocessor.cpp          |   0
 .../routing}/leaps_postprocessor.hpp          |   0
 .../routing}/loaded_path_segment.hpp          |   0
 {routing => libs/routing}/maxspeeds.cpp       |   0
 {routing => libs/routing}/maxspeeds.hpp       |   0
 .../routing}/maxspeeds_serialization.cpp      |   0
 .../routing}/maxspeeds_serialization.hpp      |   0
 .../routing}/mwm_hierarchy_handler.cpp        |   0
 .../routing}/mwm_hierarchy_handler.hpp        |   0
 .../routing}/nearest_edge_finder.cpp          |   0
 .../routing}/nearest_edge_finder.hpp          |   0
 .../routing}/opening_hours_serdes.cpp         |   0
 .../routing}/opening_hours_serdes.hpp         |   0
 .../routing}/pedestrian_directions.cpp        |   0
 .../routing}/pedestrian_directions.hpp        |   0
 .../routing}/position_accumulator.cpp         |   0
 .../routing}/position_accumulator.hpp         |   0
 {routing => libs/routing}/regions_decl.hpp    |   0
 {routing => libs/routing}/regions_router.cpp  |   0
 {routing => libs/routing}/regions_router.hpp  |   0
 .../routing}/regions_sparse_graph.cpp         |   0
 .../routing}/regions_sparse_graph.hpp         |   0
 .../routing}/restriction_loader.cpp           |   0
 .../routing}/restriction_loader.hpp           |   0
 .../routing}/restrictions_serialization.cpp   |   0
 .../routing}/restrictions_serialization.hpp   |   0
 {routing => libs/routing}/road_access.cpp     |   0
 {routing => libs/routing}/road_access.hpp     |   0
 .../routing}/road_access_serialization.cpp    |   0
 .../routing}/road_access_serialization.hpp    |   0
 {routing => libs/routing}/road_graph.cpp      |   0
 {routing => libs/routing}/road_graph.hpp      |   0
 {routing => libs/routing}/road_index.cpp      |   0
 {routing => libs/routing}/road_index.hpp      |   0
 {routing => libs/routing}/road_point.hpp      |   0
 {routing => libs/routing}/route.cpp           |   0
 {routing => libs/routing}/route.hpp           |   0
 {routing => libs/routing}/route_point.hpp     |   0
 {routing => libs/routing}/route_weight.cpp    |   0
 {routing => libs/routing}/route_weight.hpp    |   0
 {routing => libs/routing}/router.cpp          |   0
 {routing => libs/routing}/router.hpp          |   0
 {routing => libs/routing}/router_delegate.cpp |   0
 {routing => libs/routing}/router_delegate.hpp |   0
 .../routing}/routes_builder/CMakeLists.txt    |   0
 .../routes_builder/data_source_storage.cpp    |   0
 .../routes_builder/data_source_storage.hpp    |   0
 .../routes_builder/routes_builder.cpp         |   0
 .../routes_builder/routes_builder.hpp         |   0
 .../routes_builder_tool/CMakeLists.txt        |   0
 .../routes_builder_tool.cpp                   |   0
 .../routes_builder_tool/utils.cpp             |   0
 .../routes_builder_tool/utils.hpp             |   0
 .../routing_benchmarks/CMakeLists.txt         |   0
 .../bicycle_routing_tests.cpp                 |   0
 .../routing_benchmarks/car_routing_tests.cpp  |   0
 .../routing}/routing_benchmarks/helpers.cpp   |   0
 .../routing}/routing_benchmarks/helpers.hpp   |   0
 .../pedestrian_routing_tests.cpp              |   0
 .../routing}/routing_callbacks.hpp            |   0
 .../routing_consistency_tests/CMakeLists.txt  |   0
 .../routing_consistency_tests.cpp             |   0
 .../routing}/routing_exceptions.hpp           |   0
 {routing => libs/routing}/routing_helpers.cpp |   0
 {routing => libs/routing}/routing_helpers.hpp |   0
 .../routing_integration_tests/CMakeLists.txt  |   0
 .../absent_regions_finder_tests.cpp           |   0
 .../archival_reporter_tests.cpp               |   0
 .../bicycle_route_test.cpp                    |   0
 .../bicycle_turn_test.cpp                     |   0
 .../concurrent_feature_parsing_test.cpp       |   0
 .../cross_country_routing_tests.cpp           |   0
 .../get_altitude_test.cpp                     |   0
 .../guides_tests.cpp                          |   0
 .../pedestrian_route_test.cpp                 |   0
 .../road_graph_tests.cpp                      |   0
 .../roundabouts_tests.cpp                     |   0
 .../routing_integration_tests/route_test.cpp  |   0
 .../routing_test_tools.cpp                    |   0
 .../routing_test_tools.hpp                    |   0
 .../small_routes.cpp                          |   0
 .../speed_camera_notifications_tests.cpp      |   0
 .../street_names_test.cpp                     |   0
 .../transit_route_test.cpp                    |   0
 .../routing_integration_tests/turn_test.cpp   |   0
 {routing => libs/routing}/routing_options.cpp |   0
 {routing => libs/routing}/routing_options.hpp |   0
 .../routing}/routing_quality/CMakeLists.txt   |   0
 .../routing_quality/api/CMakeLists.txt        |   0
 .../routing}/routing_quality/api/api.cpp      |   0
 .../routing}/routing_quality/api/api.hpp      |   0
 .../routing_quality/api/google/google_api.cpp |   0
 .../routing_quality/api/google/google_api.hpp |   0
 .../routing_quality/api/google/types.cpp      |   0
 .../routing_quality/api/google/types.hpp      |   0
 .../routing_quality/api/mapbox/mapbox_api.cpp |   0
 .../routing_quality/api/mapbox/mapbox_api.hpp |   0
 .../routing_quality/api/mapbox/types.hpp      |   0
 .../routing_quality_tests/CMakeLists.txt      |   0
 .../routing_quality_tests/barriers_tests.cpp  |   0
 .../bigger_roads_tests.cpp                    |   0
 .../routing_quality_tests/ferry_tests.cpp     |   0
 .../routing_quality_tests/is_built_tests.cpp  |   0
 .../leaps_postprocessing_tests.cpp            |   0
 .../passby_roads_tests.cpp                    |   0
 .../routing_quality_tests/waypoints_tests.cpp |   0
 .../routing_quality_tool/CMakeLists.txt       |   0
 .../benchmark_results.cpp                     |   0
 .../benchmark_results.hpp                     |   0
 .../routing_quality_tool/benchmark_stat.cpp   |   0
 .../routing_quality_tool/benchmark_stat.hpp   |   0
 .../error_type_counter.cpp                    |   0
 .../error_type_counter.hpp                    |   0
 .../routing_quality_tool.cpp                  |   0
 .../routing_quality_tool/utils.cpp            |   0
 .../routing_quality_tool/utils.hpp            |   0
 .../routing}/routing_quality/waypoints.cpp    |   0
 .../routing}/routing_quality/waypoints.hpp    |   0
 .../routing}/routing_result_graph.hpp         |   0
 {routing => libs/routing}/routing_session.cpp |   0
 {routing => libs/routing}/routing_session.hpp |   0
 .../routing}/routing_settings.cpp             |   0
 .../routing}/routing_settings.hpp             |   0
 .../routing}/routing_tests/CMakeLists.txt     |   0
 .../routing_tests/applying_traffic_test.cpp   |   0
 .../routing_tests/astar_algorithm_test.cpp    |   0
 .../routing_tests/astar_progress_test.cpp     |   0
 .../routing_tests/astar_router_test.cpp       |   0
 .../routing_tests/async_router_test.cpp       |   0
 .../routing}/routing_tests/bfs_tests.cpp      |   0
 .../checkpoint_predictor_test.cpp             |   0
 .../routing}/routing_tests/coding_test.cpp    |   0
 .../cross_border_graph_tests.cpp              |   0
 .../cross_mwm_connector_test.cpp              |   0
 .../cumulative_restriction_test.cpp           |   0
 .../routing_tests/edge_estimator_tests.cpp    |   0
 .../routing_tests/fake_graph_test.cpp         |   0
 .../routing_tests/followed_polyline_test.cpp  |   0
 .../routing}/routing_tests/guides_tests.cpp   |   0
 .../routing_tests/index_graph_test.cpp        |   0
 .../routing_tests/index_graph_tools.cpp       |   0
 .../routing_tests/index_graph_tools.hpp       |   0
 .../routing_tests/maxspeeds_tests.cpp         |   0
 .../routing_tests/mwm_hierarchy_test.cpp      |   0
 .../nearest_edge_finder_tests.cpp             |   0
 .../opening_hours_serdes_tests.cpp            |   0
 .../position_accumulator_tests.cpp            |   0
 .../routing_tests/restriction_test.cpp        |   0
 .../routing_tests/road_access_test.cpp        |   0
 .../routing_tests/road_graph_builder.cpp      |   0
 .../routing_tests/road_graph_builder.hpp      |   0
 .../road_graph_nearest_edges_test.cpp         |   0
 .../routing}/routing_tests/route_tests.cpp    |   0
 .../routing_tests/routing_algorithm.cpp       |   0
 .../routing_tests/routing_algorithm.hpp       |   0
 .../routing_tests/routing_helpers_tests.cpp   |   0
 .../routing_tests/routing_options_tests.cpp   |   0
 .../routing_tests/routing_session_test.cpp    |   0
 .../routing_tests/speed_cameras_tests.cpp     |   0
 .../routing}/routing_tests/tools.cpp          |   0
 .../routing}/routing_tests/tools.hpp          |   0
 .../routing_tests/turns_generator_test.cpp    |   0
 .../routing_tests/turns_sound_test.cpp        |   0
 .../routing_tests/turns_tts_text_tests.cpp    |   0
 .../routing_tests/uturn_restriction_tests.cpp |   0
 .../routing_tests/world_graph_builder.cpp     |   0
 .../routing_tests/world_graph_builder.hpp     |   0
 {routing => libs/routing}/ruler_router.cpp    |   0
 {routing => libs/routing}/ruler_router.hpp    |   0
 {routing => libs/routing}/segment.cpp         |   0
 {routing => libs/routing}/segment.hpp         |   0
 {routing => libs/routing}/segmented_route.cpp |   0
 {routing => libs/routing}/segmented_route.hpp |   0
 .../routing}/single_vehicle_world_graph.cpp   |   0
 .../routing}/single_vehicle_world_graph.hpp   |   0
 {routing => libs/routing}/speed_camera.cpp    |   0
 {routing => libs/routing}/speed_camera.hpp    |   0
 .../routing}/speed_camera_manager.cpp         |   0
 .../routing}/speed_camera_manager.hpp         |   0
 .../routing}/speed_camera_prohibition.cpp     |   0
 .../routing}/speed_camera_prohibition.hpp     |   0
 .../routing}/speed_camera_ser_des.cpp         |   0
 .../routing}/speed_camera_ser_des.hpp         |   0
 {routing => libs/routing}/traffic_stash.cpp   |   0
 {routing => libs/routing}/traffic_stash.hpp   |   0
 {routing => libs/routing}/transit_graph.cpp   |   0
 {routing => libs/routing}/transit_graph.hpp   |   0
 .../routing}/transit_graph_loader.cpp         |   0
 .../routing}/transit_graph_loader.hpp         |   0
 {routing => libs/routing}/transit_info.hpp    |   0
 .../routing}/transit_world_graph.cpp          |   0
 .../routing}/transit_world_graph.hpp          |   0
 {routing => libs/routing}/turn_candidate.hpp  |   0
 {routing => libs/routing}/turns.cpp           |   0
 {routing => libs/routing}/turns.hpp           |   0
 {routing => libs/routing}/turns_generator.cpp |   0
 {routing => libs/routing}/turns_generator.hpp |   0
 .../routing}/turns_generator_utils.cpp        |   0
 .../routing}/turns_generator_utils.hpp        |   0
 .../routing}/turns_notification_manager.cpp   |   0
 .../routing}/turns_notification_manager.hpp   |   0
 .../routing}/turns_sound_settings.cpp         |   0
 .../routing}/turns_sound_settings.hpp         |   0
 {routing => libs/routing}/turns_tts_text.cpp  |   0
 {routing => libs/routing}/turns_tts_text.hpp  |   0
 .../routing}/turns_tts_text_i18n.cpp          |   0
 .../routing}/turns_tts_text_i18n.hpp          |   0
 {routing => libs/routing}/vehicle_mask.cpp    |   0
 {routing => libs/routing}/vehicle_mask.hpp    |   0
 {routing => libs/routing}/world_graph.cpp     |   0
 {routing => libs/routing}/world_graph.hpp     |   0
 .../routing_common}/CMakeLists.txt            |   0
 .../routing_common}/bicycle_model.cpp         |   0
 .../routing_common}/bicycle_model.hpp         |   0
 .../routing_common}/car_model.cpp             |   0
 .../routing_common}/car_model.hpp             |   0
 .../routing_common}/car_model_coefs.hpp       |   0
 .../routing_common}/maxspeed_conversion.cpp   |   0
 .../routing_common}/maxspeed_conversion.hpp   |   0
 .../routing_common}/num_mwm_id.hpp            |   0
 .../routing_common}/pedestrian_model.cpp      |   0
 .../routing_common}/pedestrian_model.hpp      |   0
 .../routing_common_tests/CMakeLists.txt       |   0
 .../bicycle_model_test.cpp                    |   0
 .../vehicle_model_for_country_test.cpp        |   0
 .../vehicle_model_test.cpp                    |   0
 .../routing_common}/vehicle_model.cpp         |   0
 .../routing_common}/vehicle_model.hpp         |   0
 {search => libs/search}/CMakeLists.txt        |   0
 {search => libs/search}/algos.hpp             |   0
 .../search}/approximate_string_match.cpp      |   0
 .../search}/approximate_string_match.hpp      |   0
 .../search}/base/inverted_list.hpp            |   0
 .../search}/base/mem_search_index.hpp         |   0
 .../search}/base/text_index/dictionary.hpp    |   0
 .../search}/base/text_index/header.cpp        |   0
 .../search}/base/text_index/header.hpp        |   0
 .../search}/base/text_index/mem.cpp           |   0
 .../search}/base/text_index/mem.hpp           |   0
 .../search}/base/text_index/merger.cpp        |   0
 .../search}/base/text_index/merger.hpp        |   0
 .../search}/base/text_index/postings.hpp      |   0
 .../search}/base/text_index/reader.hpp        |   0
 .../search}/base/text_index/text_index.cpp    |   0
 .../search}/base/text_index/text_index.hpp    |   0
 .../search}/base/text_index/utils.hpp         |   0
 {search => libs/search}/bookmarks/data.cpp    |   0
 {search => libs/search}/bookmarks/data.hpp    |   0
 .../search}/bookmarks/processor.cpp           |   0
 .../search}/bookmarks/processor.hpp           |   0
 {search => libs/search}/bookmarks/results.hpp |   0
 {search => libs/search}/bookmarks/types.cpp   |   0
 {search => libs/search}/bookmarks/types.hpp   |   0
 {search => libs/search}/cancel_exception.hpp  |   0
 {search => libs/search}/categories_cache.cpp  |   0
 {search => libs/search}/categories_cache.hpp  |   0
 {search => libs/search}/categories_set.hpp    |   0
 {search => libs/search}/cbv.cpp               |   0
 {search => libs/search}/cbv.hpp               |   0
 .../search}/cities_boundaries_table.cpp       |   0
 .../search}/cities_boundaries_table.hpp       |   0
 {search => libs/search}/city_finder.cpp       |   0
 {search => libs/search}/city_finder.hpp       |   0
 {search => libs/search}/common.hpp            |   0
 {search => libs/search}/cuisine_filter.cpp    |   0
 {search => libs/search}/cuisine_filter.hpp    |   0
 .../search}/displayed_categories.cpp          |   0
 .../search}/displayed_categories.hpp          |   0
 {search => libs/search}/doc_vec.cpp           |   0
 {search => libs/search}/doc_vec.hpp           |   0
 .../search}/downloader_search_callback.cpp    |   0
 .../search}/downloader_search_callback.hpp    |   0
 {search => libs/search}/dummy_rank_table.cpp  |   0
 {search => libs/search}/dummy_rank_table.hpp  |   0
 {search => libs/search}/editor_delegate.cpp   |   0
 {search => libs/search}/editor_delegate.hpp   |   0
 {search => libs/search}/emitter.hpp           |   0
 {search => libs/search}/engine.cpp            |   0
 {search => libs/search}/engine.hpp            |   0
 {search => libs/search}/feature_loader.cpp    |   0
 {search => libs/search}/feature_loader.hpp    |   0
 .../search}/feature_offset_match.hpp          |   0
 {search => libs/search}/features_filter.cpp   |   0
 {search => libs/search}/features_filter.hpp   |   0
 {search => libs/search}/features_layer.cpp    |   0
 {search => libs/search}/features_layer.hpp    |   0
 .../search}/features_layer_matcher.cpp        |   0
 .../search}/features_layer_matcher.hpp        |   0
 .../search}/features_layer_path_finder.cpp    |   0
 .../search}/features_layer_path_finder.hpp    |   0
 {search => libs/search}/filtering_params.hpp  |   0
 {search => libs/search}/geocoder.cpp          |   0
 {search => libs/search}/geocoder.hpp          |   0
 {search => libs/search}/geocoder_context.cpp  |   0
 {search => libs/search}/geocoder_context.hpp  |   0
 {search => libs/search}/geocoder_locality.cpp |   0
 {search => libs/search}/geocoder_locality.hpp |   0
 {search => libs/search}/geometry_cache.cpp    |   0
 {search => libs/search}/geometry_cache.hpp    |   0
 {search => libs/search}/geometry_utils.cpp    |   0
 {search => libs/search}/geometry_utils.hpp    |   0
 {search => libs/search}/highlighting.cpp      |   0
 {search => libs/search}/highlighting.hpp      |   0
 {search => libs/search}/house_detector.cpp    |   0
 {search => libs/search}/house_detector.hpp    |   0
 .../search}/house_numbers_matcher.cpp         |   0
 .../search}/house_numbers_matcher.hpp         |   0
 .../search}/house_to_street_table.cpp         |   0
 .../search}/house_to_street_table.hpp         |   0
 {search => libs/search}/idf_map.cpp           |   0
 {search => libs/search}/idf_map.hpp           |   0
 .../search}/intermediate_result.cpp           |   0
 .../search}/intermediate_result.hpp           |   0
 .../search}/intersection_result.cpp           |   0
 .../search}/intersection_result.hpp           |   0
 {search => libs/search}/interval_set.hpp      |   0
 .../search}/keyword_lang_matcher.cpp          |   0
 .../search}/keyword_lang_matcher.hpp          |   0
 {search => libs/search}/keyword_matcher.cpp   |   0
 {search => libs/search}/keyword_matcher.hpp   |   0
 {search => libs/search}/latlon_match.cpp      |   0
 {search => libs/search}/latlon_match.hpp      |   0
 .../search}/lazy_centers_table.cpp            |   0
 .../search}/lazy_centers_table.hpp            |   0
 {search => libs/search}/localities_source.cpp |   0
 {search => libs/search}/localities_source.hpp |   0
 {search => libs/search}/locality_finder.cpp   |   0
 {search => libs/search}/locality_finder.hpp   |   0
 {search => libs/search}/locality_scorer.cpp   |   0
 {search => libs/search}/locality_scorer.hpp   |   0
 {search => libs/search}/mode.cpp              |   0
 {search => libs/search}/mode.hpp              |   0
 {search => libs/search}/model.cpp             |   0
 {search => libs/search}/model.hpp             |   0
 {search => libs/search}/mwm_context.cpp       |   0
 {search => libs/search}/mwm_context.hpp       |   0
 .../search}/nested_rects_cache.cpp            |   0
 .../search}/nested_rects_cache.hpp            |   0
 .../search}/point_rect_matcher.hpp            |   0
 {search => libs/search}/postcode_points.cpp   |   0
 {search => libs/search}/postcode_points.hpp   |   0
 {search => libs/search}/pre_ranker.cpp        |   0
 {search => libs/search}/pre_ranker.hpp        |   0
 {search => libs/search}/pre_ranking_info.cpp  |   0
 {search => libs/search}/pre_ranking_info.hpp  |   0
 {search => libs/search}/processor.cpp         |   0
 {search => libs/search}/processor.hpp         |   0
 .../search}/projection_on_street.cpp          |   0
 .../search}/projection_on_street.hpp          |   0
 .../search}/pysearch/CMakeLists.txt           |   0
 {search => libs/search}/pysearch/README.txt   |   0
 {search => libs/search}/pysearch/bindings.cpp |   0
 .../search}/pysearch/run_search_engine.py     |   0
 .../search}/pysearch/run_search_server.py     |   0
 {search => libs/search}/pysearch/setup.py     |   0
 {search => libs/search}/query_params.cpp      |   0
 {search => libs/search}/query_params.hpp      |   0
 {search => libs/search}/query_saver.cpp       |   0
 {search => libs/search}/query_saver.hpp       |   0
 {search => libs/search}/ranker.cpp            |   0
 {search => libs/search}/ranker.hpp            |   0
 {search => libs/search}/ranking_info.cpp      |   0
 {search => libs/search}/ranking_info.hpp      |   0
 {search => libs/search}/ranking_utils.cpp     |   0
 {search => libs/search}/ranking_utils.hpp     |   0
 .../search}/region_address_getter.cpp         |   0
 .../search}/region_address_getter.hpp         |   0
 .../search}/region_info_getter.cpp            |   0
 .../search}/region_info_getter.hpp            |   0
 {search => libs/search}/result.cpp            |   0
 {search => libs/search}/result.hpp            |   0
 {search => libs/search}/retrieval.cpp         |   0
 {search => libs/search}/retrieval.hpp         |   0
 {search => libs/search}/reverse_geocoder.cpp  |   0
 {search => libs/search}/reverse_geocoder.hpp  |   0
 .../search}/search_index_header.hpp           |   0
 .../search}/search_index_values.hpp           |   0
 .../search_integration_tests/CMakeLists.txt   |   0
 .../downloader_search_test.cpp                |   0
 .../generate_tests.cpp                        |   0
 .../postcode_points_tests.cpp                 |   0
 .../pre_ranker_test.cpp                       |   0
 .../processor_test.cpp                        |   0
 .../search_integration_tests/ranker_test.cpp  |   0
 .../search_edited_features_test.cpp           |   0
 .../search_integration_tests/smoke_test.cpp   |   0
 .../search_integration_tests/tracer_tests.cpp |   0
 .../search_integration_tests/utils_test.cpp   |   0
 {search => libs/search}/search_params.cpp     |   0
 {search => libs/search}/search_params.hpp     |   0
 .../search}/search_quality/CMakeLists.txt     |   0
 .../search}/search_quality/README.txt         |   0
 .../assessment_tool/CMakeLists.txt            |   0
 .../assessment_tool}/Info.plist               |   0
 .../assessment_tool/assessment_tool.cpp       |   0
 .../assessment_tool/context.cpp               |   0
 .../assessment_tool/context.hpp               |   0
 .../search_quality/assessment_tool/edits.cpp  |   0
 .../search_quality/assessment_tool/edits.hpp  |   0
 .../assessment_tool/feature_info_dialog.cpp   |   0
 .../assessment_tool/feature_info_dialog.hpp   |   0
 .../assessment_tool/helpers.cpp               |   0
 .../assessment_tool/helpers.hpp               |   0
 .../assessment_tool/main_model.cpp            |   0
 .../assessment_tool/main_model.hpp            |   0
 .../assessment_tool/main_view.cpp             |   0
 .../assessment_tool/main_view.hpp             |   0
 .../search_quality/assessment_tool/model.hpp  |   0
 .../assessment_tool/result_view.cpp           |   0
 .../assessment_tool/result_view.hpp           |   0
 .../assessment_tool/results_view.cpp          |   0
 .../assessment_tool/results_view.hpp          |   0
 .../assessment_tool/sample_view.cpp           |   0
 .../assessment_tool/sample_view.hpp           |   0
 .../assessment_tool/samples_view.cpp          |   0
 .../assessment_tool/samples_view.hpp          |   0
 .../assessment_tool/search_request_runner.cpp |   0
 .../assessment_tool/search_request_runner.hpp |   0
 .../search_quality/assessment_tool/view.hpp   |   0
 .../search_quality/clusterize-tag-values.lisp |   0
 .../search}/search_quality/download-maps.sh   |   0
 .../features_collector_tool/CMakeLists.txt    |   0
 .../features_collector_tool.cpp               |   0
 .../search}/search_quality/gen-samples.lisp   |   0
 .../search}/search_quality/helpers.cpp        |   0
 .../search}/search_quality/helpers.hpp        |   0
 .../search}/search_quality/helpers_json.cpp   |   0
 .../search}/search_quality/helpers_json.hpp   |   0
 .../search}/search_quality/matcher.cpp        |   0
 .../search}/search_quality/matcher.hpp        |   0
 .../search}/search_quality/merge_samples.py   |   0
 .../search}/search_quality/sample.cpp         |   0
 .../search}/search_quality/sample.hpp         |   0
 .../samples_generation_tool/CMakeLists.txt    |   0
 .../samples_generation_tool.cpp               |   0
 .../search}/search_quality/scoring_model.py   |   0
 .../search_quality_tests/CMakeLists.txt       |   0
 .../search_quality_tests/benchmark_tests.cpp  |   0
 .../search_quality_tests/real_mwm_tests.cpp   |   0
 .../search_quality_tests/sample_test.cpp      |   0
 .../search_quality_tool/CMakeLists.txt        |   0
 .../search_quality_tool/queries.txt           |   0
 .../search_quality_tool.cpp                   |   0
 .../search}/search_tests/CMakeLists.txt       |   0
 .../search}/search_tests/algos_tests.cpp      |   0
 .../bookmarks_processor_tests.cpp             |   0
 .../feature_offset_match_tests.cpp            |   0
 .../search_tests/highlighting_tests.cpp       |   0
 .../search_tests/house_detector_tests.cpp     |   0
 .../house_numbers_matcher_test.cpp            |   0
 .../search_tests/interval_set_test.cpp        |   0
 .../keyword_lang_matcher_test.cpp             |   0
 .../search_tests/keyword_matcher_test.cpp     |   0
 .../search_tests/latlon_match_test.cpp        |   0
 .../search_tests/localities_source_tests.cpp  |   0
 .../search_tests/locality_finder_test.cpp     |   0
 .../search_tests/locality_scorer_test.cpp     |   0
 .../search_tests/locality_selector_test.cpp   |   0
 .../search_tests/mem_search_index_tests.cpp   |   0
 .../search_tests/point_rect_matcher_tests.cpp |   0
 .../search_tests/query_saver_tests.cpp        |   0
 .../search}/search_tests/ranking_tests.cpp    |   0
 .../search_tests/region_info_getter_tests.cpp |   0
 .../search}/search_tests/results_tests.cpp    |   0
 .../search_tests/segment_tree_tests.cpp       |   0
 .../search_tests/string_match_test.cpp        |   0
 .../search}/search_tests/suggest_tests.cpp    |   0
 .../search}/search_tests/text_index_tests.cpp |   0
 .../utm_mgrs_coords_match_test.cpp            |   0
 .../search_tests_support/CMakeLists.txt       |   0
 .../search}/search_tests_support/helpers.cpp  |   0
 .../search}/search_tests_support/helpers.hpp  |   0
 .../test_results_matching.cpp                 |   0
 .../test_results_matching.hpp                 |   0
 .../test_search_engine.cpp                    |   0
 .../test_search_engine.hpp                    |   0
 .../test_search_request.cpp                   |   0
 .../test_search_request.hpp                   |   0
 .../test_with_custom_mwms.hpp                 |   0
 {search => libs/search}/search_trie.hpp       |   0
 {search => libs/search}/segment_tree.cpp      |   0
 {search => libs/search}/segment_tree.hpp      |   0
 {search => libs/search}/stats_cache.hpp       |   0
 .../search}/street_vicinity_loader.cpp        |   0
 .../search}/street_vicinity_loader.hpp        |   0
 {search => libs/search}/streets_matcher.cpp   |   0
 {search => libs/search}/streets_matcher.hpp   |   0
 {search => libs/search}/string_utils.cpp      |   0
 {search => libs/search}/string_utils.hpp      |   0
 {search => libs/search}/suggest.cpp           |   0
 {search => libs/search}/suggest.hpp           |   0
 {search => libs/search}/token_range.hpp       |   0
 {search => libs/search}/token_slice.cpp       |   0
 {search => libs/search}/token_slice.hpp       |   0
 {search => libs/search}/tracer.cpp            |   0
 {search => libs/search}/tracer.hpp            |   0
 {search => libs/search}/types_skipper.cpp     |   0
 {search => libs/search}/types_skipper.hpp     |   0
 {search => libs/search}/utils.cpp             |   0
 {search => libs/search}/utils.hpp             |   0
 .../search}/utm_mgrs_coords_match.cpp         |   0
 .../search}/utm_mgrs_coords_match.hpp         |   0
 {shaders => libs/shaders}/.gitignore          |   0
 {shaders => libs/shaders}/CMakeLists.txt      |   0
 {shaders => libs/shaders}/GL/area.vsh.glsl    |   0
 {shaders => libs/shaders}/GL/area3d.vsh.glsl  |   0
 .../shaders}/GL/area3d_outline.vsh.glsl       |   0
 {shaders => libs/shaders}/GL/arrow3d.fsh.glsl |   0
 {shaders => libs/shaders}/GL/arrow3d.vsh.glsl |   0
 .../shaders}/GL/arrow3d_outline.fsh.glsl      |   0
 .../shaders}/GL/arrow3d_shadow.fsh.glsl       |   0
 .../shaders}/GL/arrow3d_shadow.vsh.glsl       |   0
 .../shaders}/GL/arrow3d_textured.fsh.glsl     |   0
 .../shaders}/GL/arrow3d_textured.vsh.glsl     |   0
 {shaders => libs/shaders}/GL/circle.fsh.glsl  |   0
 {shaders => libs/shaders}/GL/circle.vsh.glsl  |   0
 .../shaders}/GL/circle_point.fsh.glsl         |   0
 .../shaders}/GL/circle_point.vsh.glsl         |   0
 .../shaders}/GL/colored_symbol.fsh.glsl       |   0
 .../shaders}/GL/colored_symbol.vsh.glsl       |   0
 .../GL/colored_symbol_billboard.vsh.glsl      |   0
 .../shaders}/GL/dashed_line.fsh.glsl          |   0
 .../shaders}/GL/dashed_line.vsh.glsl          |   0
 .../shaders}/GL/debug_rect.fsh.glsl           |   0
 .../shaders}/GL/debug_rect.vsh.glsl           |   0
 .../shaders}/GL/hatching_area.fsh.glsl        |   0
 .../shaders}/GL/hatching_area.vsh.glsl        |   0
 {shaders => libs/shaders}/GL/imgui.fsh.glsl   |   0
 {shaders => libs/shaders}/GL/imgui.vsh.glsl   |   0
 {shaders => libs/shaders}/GL/line.fsh.glsl    |   0
 {shaders => libs/shaders}/GL/line.vsh.glsl    |   0
 .../shaders}/GL/masked_texturing.fsh.glsl     |   0
 .../shaders}/GL/masked_texturing.vsh.glsl     |   0
 .../GL/masked_texturing_billboard.vsh.glsl    |   0
 .../shaders}/GL/my_position.vsh.glsl          |   0
 .../shaders}/GL/path_symbol.vsh.glsl          |   0
 .../shaders}/GL/position_accuracy3d.vsh.glsl  |   0
 {shaders => libs/shaders}/GL/route.fsh.glsl   |   0
 {shaders => libs/shaders}/GL/route.vsh.glsl   |   0
 .../shaders}/GL/route_arrow.fsh.glsl          |   0
 .../shaders}/GL/route_arrow.vsh.glsl          |   0
 .../shaders}/GL/route_dash.fsh.glsl           |   0
 .../shaders}/GL/route_marker.fsh.glsl         |   0
 .../shaders}/GL/route_marker.vsh.glsl         |   0
 {shaders => libs/shaders}/GL/ruler.vsh.glsl   |   0
 .../shaders}/GL/screen_quad.vsh.glsl          |   0
 .../shaders}/GL/selection_line.fsh.glsl       |   0
 .../shaders}/GL/selection_line.vsh.glsl       |   0
 {shaders => libs/shaders}/GL/shader_index.txt |   0
 {shaders => libs/shaders}/GL/shaders_lib.glsl |   0
 .../shaders}/GL/smaa_blending_weight.fsh.glsl |   0
 .../shaders}/GL/smaa_blending_weight.vsh.glsl |   0
 .../shaders}/GL/smaa_edges.fsh.glsl           |   0
 .../shaders}/GL/smaa_edges.vsh.glsl           |   0
 .../shaders}/GL/smaa_final.fsh.glsl           |   0
 .../shaders}/GL/smaa_final.vsh.glsl           |   0
 .../shaders}/GL/solid_color.fsh.glsl          |   0
 {shaders => libs/shaders}/GL/text.fsh.glsl    |   0
 {shaders => libs/shaders}/GL/text.vsh.glsl    |   0
 .../shaders}/GL/text_billboard.vsh.glsl       |   0
 .../shaders}/GL/text_outlined.vsh.glsl        |   0
 .../GL/text_outlined_billboard.vsh.glsl       |   0
 .../shaders}/GL/text_outlined_gui.vsh.glsl    |   0
 .../shaders}/GL/texturing.fsh.glsl            |   0
 .../shaders}/GL/texturing.vsh.glsl            |   0
 .../shaders}/GL/texturing3d.fsh.glsl          |   0
 .../shaders}/GL/texturing_billboard.vsh.glsl  |   0
 .../shaders}/GL/texturing_gui.vsh.glsl        |   0
 {shaders => libs/shaders}/GL/traffic.fsh.glsl |   0
 {shaders => libs/shaders}/GL/traffic.vsh.glsl |   0
 .../shaders}/GL/traffic_circle.fsh.glsl       |   0
 .../shaders}/GL/traffic_circle.vsh.glsl       |   0
 .../shaders}/GL/traffic_line.fsh.glsl         |   0
 .../shaders}/GL/traffic_line.vsh.glsl         |   0
 {shaders => libs/shaders}/GL/transit.fsh.glsl |   0
 {shaders => libs/shaders}/GL/transit.vsh.glsl |   0
 .../shaders}/GL/transit_circle.fsh.glsl       |   0
 .../shaders}/GL/transit_circle.vsh.glsl       |   0
 .../shaders}/GL/transit_marker.fsh.glsl       |   0
 .../shaders}/GL/transit_marker.vsh.glsl       |   0
 .../shaders}/GL/user_mark.fsh.glsl            |   0
 .../shaders}/GL/user_mark.vsh.glsl            |   0
 .../shaders}/GL/user_mark_billboard.vsh.glsl  |   0
 {shaders => libs/shaders}/Metal/arrow3d.metal |   0
 .../shaders}/Metal/debug_rect.metal           |   0
 {shaders => libs/shaders}/Metal/gui.metal     |   0
 {shaders => libs/shaders}/Metal/imgui.metal   |   0
 {shaders => libs/shaders}/Metal/map.metal     |   0
 {shaders => libs/shaders}/Metal/route.metal   |   0
 .../shaders}/Metal/screen_quad.metal          |   0
 {shaders => libs/shaders}/Metal/shaders_lib.h |   0
 .../shaders}/Metal/shaders_lib.metal          |   0
 {shaders => libs/shaders}/Metal/shapes.metal  |   0
 {shaders => libs/shaders}/Metal/smaa.metal    |   0
 {shaders => libs/shaders}/Metal/system.metal  |   0
 {shaders => libs/shaders}/Metal/traffic.metal |   0
 {shaders => libs/shaders}/Metal/transit.metal |   0
 {shaders => libs/shaders}/gl_program_info.hpp |   0
 .../shaders}/gl_program_params.cpp            |   0
 .../shaders}/gl_program_params.hpp            |   0
 {shaders => libs/shaders}/gl_program_pool.cpp |   0
 {shaders => libs/shaders}/gl_program_pool.hpp |   0
 .../shaders}/gl_shaders_preprocessor.py       |   0
 .../shaders}/metal_program_params.hpp         |   0
 .../shaders}/metal_program_params.mm          |   0
 .../shaders}/metal_program_pool.hpp           |   0
 .../shaders}/metal_program_pool.mm            |   0
 {shaders => libs/shaders}/program_manager.cpp |   0
 {shaders => libs/shaders}/program_manager.hpp |   0
 .../shaders}/program_manager_metal.mm         |   0
 {shaders => libs/shaders}/program_params.cpp  |   0
 {shaders => libs/shaders}/program_params.hpp  |   0
 {shaders => libs/shaders}/program_pool.hpp    |   0
 {shaders => libs/shaders}/programs.hpp        |   0
 .../shaders}/shaders_tests/CMakeLists.txt     |   0
 .../shaders_tests/gl_program_params_tests.cpp |   0
 .../gl_shaders_desktop_compile_tests.cpp      |   0
 .../gl_shaders_mobile_compile_test.cpp        |   0
 .../shaders}/vulkan_program_params.cpp        |   0
 .../shaders}/vulkan_program_params.hpp        |   0
 .../shaders}/vulkan_program_pool.cpp          |   0
 .../shaders}/vulkan_program_pool.hpp          |   0
 .../shaders}/vulkan_shaders_preprocessor.py   |   0
 {std => libs/std}/boost_container_hash.hpp    |   0
 {std => libs/std}/boost_geometry.hpp          |   0
 {std => libs/std}/glm_gtx_rotate_vector.hpp   |   0
 {std => libs/std}/target_os.hpp               |   0
 {std => libs/std}/windows.hpp                 |   0
 {storage => libs/storage}/CMakeLists.txt      |   0
 .../downloader_adapter_ios.h                  |   0
 .../downloader_adapter_ios.mm                 |   0
 .../downloader_queue.hpp                      |   0
 {storage => libs/storage}/country.hpp         |   0
 {storage => libs/storage}/country_decl.cpp    |   0
 {storage => libs/storage}/country_decl.hpp    |   0
 .../storage}/country_info_getter.cpp          |   0
 .../storage}/country_info_getter.hpp          |   0
 .../storage}/country_info_reader_light.cpp    |   0
 .../storage}/country_info_reader_light.hpp    |   0
 .../storage}/country_name_getter.cpp          |   0
 .../storage}/country_name_getter.hpp          |   0
 .../storage}/country_parent_getter.cpp        |   0
 .../storage}/country_parent_getter.hpp        |   0
 {storage => libs/storage}/country_tree.cpp    |   0
 {storage => libs/storage}/country_tree.hpp    |   0
 .../storage}/country_tree_helpers.cpp         |   0
 .../storage}/country_tree_helpers.hpp         |   0
 .../storage}/diff_scheme/apply_diff.cpp       |   0
 .../storage}/diff_scheme/apply_diff.hpp       |   2 +-
 .../diff_scheme/diff_scheme_loader.cpp        |   0
 .../diff_scheme/diff_scheme_loader.hpp        |   0
 .../storage}/diff_scheme/diff_types.hpp       |   0
 .../diff_scheme/diffs_data_source.cpp         |   0
 .../diff_scheme/diffs_data_source.hpp         |   0
 {storage => libs/storage}/downloader.hpp      |   0
 .../storage}/downloader_queue_interface.hpp   |   0
 .../storage}/downloader_queue_universal.cpp   |   0
 .../storage}/downloader_queue_universal.hpp   |   0
 .../storage}/downloader_search_params.hpp     |   0
 .../storage}/downloading_policy.cpp           |   0
 .../storage}/downloading_policy.hpp           |   0
 .../storage}/http_map_files_downloader.cpp    |   0
 .../storage}/http_map_files_downloader.hpp    |   0
 .../storage}/map_files_downloader.cpp         |   0
 .../storage}/map_files_downloader.hpp         |   0
 .../map_files_downloader_with_ping.cpp        |   0
 .../map_files_downloader_with_ping.hpp        |   0
 {storage => libs/storage}/pinger.cpp          |   0
 {storage => libs/storage}/pinger.hpp          |   0
 {storage => libs/storage}/queued_country.cpp  |   0
 {storage => libs/storage}/queued_country.hpp  |   0
 {storage => libs/storage}/routing_helpers.cpp |   0
 {storage => libs/storage}/routing_helpers.hpp |   0
 {storage => libs/storage}/storage.cpp         |   0
 {storage => libs/storage}/storage.hpp         |   0
 {storage => libs/storage}/storage_defines.cpp |   0
 {storage => libs/storage}/storage_defines.hpp |   0
 {storage => libs/storage}/storage_helpers.cpp |   0
 {storage => libs/storage}/storage_helpers.hpp |   0
 .../storage_integration_tests/CMakeLists.txt  |   0
 .../download_calc_size_test.cpp               |   0
 .../lightweight_matching_tests.cpp            |   0
 .../storage_3levels_tests.cpp                 |   0
 .../storage_downloading_tests.cpp             |   0
 .../storage_group_download_tests.cpp          |   0
 .../storage_http_tests.cpp                    |   0
 .../storage_update_tests.cpp                  |   0
 .../test_defines.cpp                          |   0
 .../test_defines.hpp                          |   0
 .../storage}/storage_tests/CMakeLists.txt     |   0
 .../storage_tests/countries_tests.cpp         |   0
 .../country_info_getter_tests.cpp             |   0
 .../country_name_getter_tests.cpp             |   0
 .../storage_tests/downloader_tests.cpp        |   0
 .../fake_map_files_downloader.cpp             |   0
 .../fake_map_files_downloader.hpp             |   0
 .../storage}/storage_tests/helpers.cpp        |   0
 .../storage}/storage_tests/helpers.hpp        |   0
 .../storage_tests/simple_tree_test.cpp        |   0
 .../storage}/storage_tests/storage_tests.cpp  |   0
 .../storage}/storage_tests/task_runner.cpp    |   0
 .../storage}/storage_tests/task_runner.hpp    |   0
 .../test_map_files_downloader.cpp             |   0
 .../test_map_files_downloader.hpp             |   0
 {testing => libs/testing}/benchmark.hpp       |   0
 {testing => libs/testing}/testing.hpp         |   0
 {testing => libs/testing}/testingmain.cpp     |   0
 {testing => libs/testing}/testregister.hpp    |   0
 {tracking => libs/tracking}/CMakeLists.txt    |   0
 {tracking => libs/tracking}/archival_file.cpp |   0
 {tracking => libs/tracking}/archival_file.hpp |   0
 .../tracking}/archival_manager.cpp            |   0
 .../tracking}/archival_manager.hpp            |   0
 .../tracking}/archival_reporter.cpp           |   0
 .../tracking}/archival_reporter.hpp           |   0
 {tracking => libs/tracking}/archive.cpp       |   0
 {tracking => libs/tracking}/archive.hpp       |   0
 {tracking => libs/tracking}/connection.cpp    |   0
 {tracking => libs/tracking}/connection.hpp    |   0
 {tracking => libs/tracking}/protocol.cpp      |   0
 {tracking => libs/tracking}/protocol.hpp      |   0
 .../tracking}/pytracking/CMakeLists.txt       |   0
 .../tracking}/pytracking/bindings.cpp         |   0
 .../tracking}/pytracking/setup.py             |   0
 {tracking => libs/tracking}/reporter.cpp      |   0
 {tracking => libs/tracking}/reporter.hpp      |   0
 .../tracking_fuzz_tests/CMakeLists.txt        |   0
 .../tracking_fuzz_tests.cpp                   |   0
 .../tracking}/tracking_tests/CMakeLists.txt   |   0
 .../archival_reporter_tests.cpp               |   0
 .../tracking_tests/protocol_test.cpp          |   0
 .../tracking_tests/reporter_test.cpp          |   0
 {traffic => libs/traffic}/CMakeLists.txt      |   0
 .../traffic}/pytraffic/CMakeLists.txt         |   0
 .../traffic}/pytraffic/bindings.cpp           |   0
 .../traffic}/pytraffic/example.py             |   0
 {traffic => libs/traffic}/pytraffic/setup.py  |   0
 {traffic => libs/traffic}/speed_groups.cpp    |   0
 {traffic => libs/traffic}/speed_groups.hpp    |   0
 {traffic => libs/traffic}/traffic_cache.cpp   |   0
 {traffic => libs/traffic}/traffic_cache.hpp   |   0
 {traffic => libs/traffic}/traffic_info.cpp    |   0
 {traffic => libs/traffic}/traffic_info.hpp    |   0
 .../traffic}/traffic_tests/CMakeLists.txt     |   0
 .../traffic_tests/traffic_info_test.cpp       |   0
 {transit => libs/transit}/CMakeLists.txt      |   0
 .../transit}/experimental/transit_data.cpp    |   0
 .../transit}/experimental/transit_data.hpp    |   0
 .../transit_types_experimental.cpp            |   0
 .../transit_types_experimental.hpp            |   0
 .../transit}/transit_display_info.hpp         |   0
 .../transit}/transit_entities.hpp             |   0
 .../transit_experimental_tests/CMakeLists.txt |   0
 .../parse_transit_from_json_tests.cpp         |   0
 .../transit_serdes_tests.cpp                  |   0
 .../transit}/transit_graph_data.cpp           |   0
 .../transit}/transit_graph_data.hpp           |   0
 .../transit}/transit_schedule.cpp             |   0
 .../transit}/transit_schedule.hpp             |   0
 {transit => libs/transit}/transit_serdes.hpp  |   0
 .../transit}/transit_tests/CMakeLists.txt     |   0
 .../transit_tests/transit_graph_test.cpp      |   0
 .../transit_json_parsing_test.cpp             |   0
 .../transit_tests/transit_schedule_tests.cpp  |   0
 .../transit}/transit_tests/transit_test.cpp   |   0
 .../transit}/transit_tests/transit_tools.hpp  |   0
 {transit => libs/transit}/transit_types.cpp   |   0
 {transit => libs/transit}/transit_types.hpp   |   0
 {transit => libs/transit}/transit_version.cpp |   0
 {transit => libs/transit}/transit_version.hpp |   0
 .../transit}/world_feed/CMakeLists.txt        |   0
 .../transit}/world_feed/color_picker.cpp      |   0
 .../transit}/world_feed/color_picker.hpp      |   0
 .../transit}/world_feed/date_time_helpers.cpp |   0
 .../transit}/world_feed/date_time_helpers.hpp |   0
 .../transit}/world_feed/feed_helpers.cpp      |   0
 .../transit}/world_feed/feed_helpers.hpp      |   0
 .../world_feed/gtfs_converter/CMakeLists.txt  |   0
 .../gtfs_converter/gtfs_converter.cpp         |   0
 .../transit}/world_feed/subway_converter.cpp  |   0
 .../transit}/world_feed/subway_converter.hpp  |   0
 .../transit}/world_feed/world_feed.cpp        |   0
 .../transit}/world_feed/world_feed.hpp        |   0
 .../CMakeLists.txt                            |   0
 .../world_feed_integration_tests.cpp          |   0
 .../world_feed_tests/CMakeLists.txt           |   0
 .../subway_converter_tests.cpp                |   0
 .../world_feed_tests/world_feed_tests.cpp     |   0
 tools/CMakeLists.txt                          |  11 +
 .../category_consistency/check_consistency.rb |   0
 .../category_consistency/omim_parsers.rb      |   0
 .../feature_list}/CMakeLists.txt              |   0
 .../feature_list}/feature_list.cpp            |   0
 {openlr => tools/openlr}/CMakeLists.txt       |   0
 {openlr => tools/openlr}/cache_line_size.hpp  |   0
 .../openlr}/candidate_paths_getter.cpp        |   0
 .../openlr}/candidate_paths_getter.hpp        |   0
 .../openlr}/candidate_points_getter.cpp       |   0
 .../openlr}/candidate_points_getter.hpp       |   0
 {openlr => tools/openlr}/decoded_path.cpp     |   0
 {openlr => tools/openlr}/decoded_path.hpp     |   0
 {openlr => tools/openlr}/graph.cpp            |   0
 {openlr => tools/openlr}/graph.hpp            |   0
 {openlr => tools/openlr}/helpers.cpp          |   0
 {openlr => tools/openlr}/helpers.hpp          |   0
 {openlr => tools/openlr}/openlr_decoder.cpp   |   0
 {openlr => tools/openlr}/openlr_decoder.hpp   |   0
 .../openlr_match_quality/CMakeLists.txt       |   0
 .../openlr_assessment_tool/CMakeLists.txt     |   0
 .../openlr_assessment_tool}/Info.plist        |   0
 .../openlr_assessment_tool/main.cpp           |   0
 .../openlr_assessment_tool/mainwindow.cpp     |   0
 .../openlr_assessment_tool/mainwindow.hpp     |   0
 .../openlr_assessment_tool/map_widget.cpp     |   0
 .../openlr_assessment_tool/map_widget.hpp     |   0
 .../points_controller_delegate_base.hpp       |   0
 .../segment_correspondence.cpp                |   0
 .../segment_correspondence.hpp                |   0
 .../traffic_drawer_delegate_base.hpp          |   0
 .../openlr_assessment_tool/traffic_mode.cpp   |   0
 .../openlr_assessment_tool/traffic_mode.hpp   |   0
 .../openlr_assessment_tool/traffic_panel.cpp  |   0
 .../openlr_assessment_tool/traffic_panel.hpp  |   0
 .../trafficmodeinitdlg.cpp                    |   0
 .../trafficmodeinitdlg.h                      |   0
 .../trafficmodeinitdlg.ui                     |   0
 {openlr => tools/openlr}/openlr_model.cpp     |   0
 {openlr => tools/openlr}/openlr_model.hpp     |   0
 {openlr => tools/openlr}/openlr_model_xml.cpp |   0
 {openlr => tools/openlr}/openlr_model_xml.hpp |   0
 .../openlr}/openlr_stat/CMakeLists.txt        |   0
 .../openlr}/openlr_stat/openlr_stat.cpp       |   0
 .../openlr}/openlr_tests/CMakeLists.txt       |   0
 .../openlr_tests/decoded_path_test.cpp        |   0
 {openlr => tools/openlr}/paths_connector.cpp  |   0
 {openlr => tools/openlr}/paths_connector.hpp  |   0
 {openlr => tools/openlr}/road_info_getter.cpp |   0
 {openlr => tools/openlr}/road_info_getter.hpp |   0
 {openlr => tools/openlr}/router.cpp           |   0
 {openlr => tools/openlr}/router.hpp           |   0
 .../openlr}/score_candidate_paths_getter.cpp  |   0
 .../openlr}/score_candidate_paths_getter.hpp  |   0
 .../openlr}/score_candidate_points_getter.cpp |   0
 .../openlr}/score_candidate_points_getter.hpp |   0
 .../openlr}/score_paths_connector.cpp         |   0
 .../openlr}/score_paths_connector.hpp         |   0
 {openlr => tools/openlr}/score_types.hpp      |   0
 {openlr => tools/openlr}/stats.hpp            |   0
 {openlr => tools/openlr}/way_point.hpp        |   0
 .../poly_borders}/CMakeLists.txt              |   0
 .../poly_borders}/borders_data.cpp            |   0
 .../poly_borders}/borders_data.hpp            |   0
 .../poly_borders}/help_structures.cpp         |   0
 .../poly_borders}/help_structures.hpp         |   0
 .../poly_borders_tests/CMakeLists.txt         |   0
 .../poly_borders_tests/mark_points_tests.cpp  |   0
 .../remove_empty_spaces_tests.cpp             |   0
 .../poly_borders_tests/tools.cpp              |   0
 .../poly_borders_tests/tools.hpp              |   0
 .../poly_borders_tool/CMakeLists.txt          |   0
 .../poly_borders_tool/poly_borders_tool.cpp   |   0
 .../skin_generator}/CMakeLists.txt            |   0
 .../skin_generator}/generator.cpp             |   0
 .../skin_generator}/generator.hpp             |   0
 .../skin_generator}/main.cpp                  |   0
 .../topography_generator}/CMakeLists.txt      |   0
 .../topography_generator}/filters_impl.cpp    |   0
 .../topography_generator}/filters_impl.hpp    |   0
 .../topography_generator}/generator.cpp       |   0
 .../topography_generator}/generator.hpp       |   0
 .../isolines_profile.hpp                      |   0
 .../topography_generator}/isolines_utils.hpp  |   0
 .../topography_generator}/main.cpp            |   0
 .../marching_squares/contours_builder.cpp     |   0
 .../marching_squares/contours_builder.hpp     |   0
 .../marching_squares/marching_squares.hpp     |   0
 .../marching_squares/square.hpp               |   0
 .../topography_generator}/tile_filter.hpp     |   0
 .../topography_generator}/utils/contours.hpp  |   0
 .../utils/contours_serdes.hpp                 |   0
 .../utils/values_provider.hpp                 |   0
 .../track_analyzing}/CMakeLists.txt           |   0
 .../track_analyzing}/exceptions.hpp           |   0
 .../track_analyzing}/log_parser.cpp           |   0
 .../track_analyzing}/log_parser.hpp           |   0
 .../track_analyzing}/serialization.hpp        |   0
 .../track_analyzing}/temporary_file.cpp       |   0
 .../track_analyzing}/temporary_file.hpp       |   0
 .../track_analyzing}/track.cpp                |   0
 .../track_analyzing}/track.hpp                |   0
 .../track_analyzer/CMakeLists.txt             |   0
 .../track_analyzer/cmd_balance_csv.cpp        |   0
 .../track_analyzer/cmd_balance_csv.hpp        |   0
 .../track_analyzer/cmd_cpp_track.cpp          |   0
 .../track_analyzer/cmd_gpx.cpp                |   0
 .../track_analyzer/cmd_match.cpp              |   0
 .../track_analyzer/cmd_table.cpp              |   0
 .../track_analyzer/cmd_track.cpp              |   0
 .../track_analyzer/cmd_tracks.cpp             |   0
 .../track_analyzer/cmd_unmatched_tracks.cpp   |   0
 .../track_analyzer/crossroad_checker.cpp      |   0
 .../track_analyzer/crossroad_checker.hpp      |   0
 .../track_analyzer/track_analyzer.cpp         |   0
 .../track_analyzing}/track_analyzer/utils.cpp |   0
 .../track_analyzing}/track_analyzer/utils.hpp |   0
 .../track_analyzing_tests/CMakeLists.txt      |   0
 .../track_analyzing_tests/balance_tests.cpp   |   0
 .../statistics_tests.cpp                      |   0
 .../track_archive_reader_tests.cpp            |   0
 .../track_analyzing}/track_archive_reader.cpp |   0
 .../track_analyzing}/track_archive_reader.hpp |   0
 .../track_analyzing}/track_matcher.cpp        |   0
 .../track_analyzing}/track_matcher.hpp        |   0
 .../track_analyzing}/utils.cpp                |   0
 .../track_analyzing}/utils.hpp                |   0
 .../track_generator}/CMakeLists.txt           |   0
 .../track_generator}/track_generator_tool.cpp |   0
 .../track_generator}/utils.cpp                |   0
 .../track_generator}/utils.hpp                |   0
 tools/unix/generate_symbols.sh                |  25 +--
 .../contents.xcworkspacedata                  |  14 +-
 xcode/base/base.xcodeproj/project.pbxproj     |   6 +-
 xcode/coding/coding.xcodeproj/project.pbxproj |   6 +-
 xcode/common.xcconfig                         |   2 +-
 .../cppjansson.xcodeproj/project.pbxproj      |   2 +-
 .../descriptions.xcodeproj/project.pbxproj    |   2 +-
 xcode/drape/drape.xcodeproj/project.pbxproj   |   2 +-
 .../drape_frontend.xcodeproj/project.pbxproj  |   2 +-
 xcode/editor/editor.xcodeproj/project.pbxproj |   8 +-
 xcode/ge0/ge0.xcodeproj/project.pbxproj       |  63 +++---
 .../geometry.xcodeproj/project.pbxproj        |   6 +-
 .../indexer/indexer.xcodeproj/project.pbxproj |   6 +-
 xcode/kml/kml.xcodeproj/project.pbxproj       |   6 +-
 xcode/map/map.xcodeproj/project.pbxproj       |   8 +-
 .../mwm_diff.xcodeproj/project.pbxproj        |   2 +-
 xcode/openlr/openlr.xcodeproj/project.pbxproj |   2 +-
 .../platform.xcodeproj/project.pbxproj        |   8 +-
 .../routing/routing.xcodeproj/project.pbxproj | 212 +++++++++---------
 .../routing_common.xcodeproj/project.pbxproj  |   6 +-
 xcode/search/search.xcodeproj/project.pbxproj |  10 +-
 .../shaders/shaders.xcodeproj/project.pbxproj | 174 +++++++-------
 .../storage/storage.xcodeproj/project.pbxproj |   8 +-
 .../tracking.xcodeproj/project.pbxproj        |   8 +-
 .../traffic/traffic.xcodeproj/project.pbxproj |   8 +-
 .../transit/transit.xcodeproj/project.pbxproj |   2 +-
 2390 files changed, 345 insertions(+), 339 deletions(-)
 create mode 100644 libs/CMakeLists.txt
 rename {base => libs/base}/CMakeLists.txt (100%)
 rename {base => libs/base}/array_adapters.hpp (100%)
 rename {base => libs/base}/assert.hpp (100%)
 rename {base => libs/base}/atomic_shared_ptr.hpp (100%)
 rename {base => libs/base}/base.cpp (100%)
 rename {base => libs/base}/base.hpp (100%)
 rename {base => libs/base}/base_tests/CMakeLists.txt (100%)
 rename {base => libs/base}/base_tests/assert_test.cpp (100%)
 rename {base => libs/base}/base_tests/beam_tests.cpp (100%)
 rename {base => libs/base}/base_tests/bidirectional_map_tests.cpp (100%)
 rename {base => libs/base}/base_tests/bits_test.cpp (100%)
 rename {base => libs/base}/base_tests/buffer_vector_test.cpp (100%)
 rename {base => libs/base}/base_tests/cache_test.cpp (100%)
 rename {base => libs/base}/base_tests/cancellable_tests.cpp (100%)
 rename {base => libs/base}/base_tests/checked_cast_tests.cpp (100%)
 rename {base => libs/base}/base_tests/clustering_map_tests.cpp (100%)
 rename {base => libs/base}/base_tests/collection_cast_test.cpp (100%)
 rename {base => libs/base}/base_tests/containers_test.cpp (100%)
 rename {base => libs/base}/base_tests/control_flow_tests.cpp (100%)
 rename {base => libs/base}/base_tests/exception_tests.cpp (100%)
 rename {base => libs/base}/base_tests/fifo_cache_test.cpp (100%)
 rename {base => libs/base}/base_tests/file_name_utils_tests.cpp (100%)
 rename {base => libs/base}/base_tests/geo_object_id_tests.cpp (100%)
 rename {base => libs/base}/base_tests/levenshtein_dfa_test.cpp (100%)
 rename {base => libs/base}/base_tests/linked_map_tests.cpp (100%)
 rename {base => libs/base}/base_tests/logging_test.cpp (100%)
 rename {base => libs/base}/base_tests/lru_cache_tests.cpp (100%)
 rename {base => libs/base}/base_tests/math_test.cpp (100%)
 rename {base => libs/base}/base_tests/matrix_test.cpp (100%)
 rename {base => libs/base}/base_tests/mem_trie_test.cpp (100%)
 rename {base => libs/base}/base_tests/message_test.cpp (100%)
 rename {base => libs/base}/base_tests/newtype_test.cpp (100%)
 rename {base => libs/base}/base_tests/non_intersecting_intervals_tests.cpp (100%)
 rename {base => libs/base}/base_tests/observer_list_test.cpp (100%)
 rename {base => libs/base}/base_tests/range_iterator_test.cpp (100%)
 rename {base => libs/base}/base_tests/ref_counted_tests.cpp (100%)
 rename {base => libs/base}/base_tests/regexp_test.cpp (100%)
 rename {base => libs/base}/base_tests/rolling_hash_test.cpp (100%)
 rename {base => libs/base}/base_tests/scope_guard_test.cpp (100%)
 rename {base => libs/base}/base_tests/small_set_test.cpp (100%)
 rename {base => libs/base}/base_tests/stl_helpers_tests.cpp (100%)
 rename {base => libs/base}/base_tests/string_utils_test.cpp (100%)
 rename {base => libs/base}/base_tests/suffix_array_tests.cpp (100%)
 rename {base => libs/base}/base_tests/sunrise_sunset_test.cpp (100%)
 rename {base => libs/base}/base_tests/thread_pool_computational_tests.cpp (100%)
 rename {base => libs/base}/base_tests/thread_pool_delayed_tests.cpp (100%)
 rename {base => libs/base}/base_tests/thread_pool_tests.cpp (100%)
 rename {base => libs/base}/base_tests/thread_safe_queue_tests.cpp (100%)
 rename {base => libs/base}/base_tests/threaded_list_test.cpp (100%)
 rename {base => libs/base}/base_tests/threads_test.cpp (100%)
 rename {base => libs/base}/base_tests/timegm_test.cpp (100%)
 rename {base => libs/base}/base_tests/timer_test.cpp (100%)
 rename {base => libs/base}/base_tests/uni_string_dfa_test.cpp (100%)
 rename {base => libs/base}/base_tests/visitor_tests.cpp (100%)
 rename {base => libs/base}/beam.hpp (100%)
 rename {base => libs/base}/bidirectional_map.hpp (100%)
 rename {base => libs/base}/bits.hpp (100%)
 rename {base => libs/base}/buffer_vector.hpp (100%)
 rename {base => libs/base}/cache.hpp (100%)
 rename {base => libs/base}/cancellable.cpp (100%)
 rename {base => libs/base}/cancellable.hpp (100%)
 rename {base => libs/base}/checked_cast.hpp (100%)
 rename {base => libs/base}/clustering_map.hpp (100%)
 rename {base => libs/base}/collection_cast.hpp (100%)
 rename {base => libs/base}/control_flow.hpp (100%)
 rename {base => libs/base}/deferred_task.cpp (100%)
 rename {base => libs/base}/deferred_task.hpp (100%)
 rename {base => libs/base}/dfa_helpers.hpp (100%)
 rename {base => libs/base}/exception.cpp (100%)
 rename {base => libs/base}/exception.hpp (100%)
 rename {base => libs/base}/fast_math.cpp (100%)
 rename {base => libs/base}/fifo_cache.hpp (100%)
 rename {base => libs/base}/file_name_utils.cpp (100%)
 rename {base => libs/base}/file_name_utils.hpp (100%)
 rename {base => libs/base}/geo_object_id.cpp (100%)
 rename {base => libs/base}/geo_object_id.hpp (100%)
 rename {base => libs/base}/gmtime.cpp (100%)
 rename {base => libs/base}/gmtime.hpp (100%)
 rename {base => libs/base}/internal/message.cpp (100%)
 rename {base => libs/base}/internal/message.hpp (100%)
 rename {base => libs/base}/levenshtein_dfa.cpp (100%)
 rename {base => libs/base}/levenshtein_dfa.hpp (100%)
 rename {base => libs/base}/limited_priority_queue.hpp (100%)
 rename {base => libs/base}/linked_map.hpp (100%)
 rename {base => libs/base}/logging.cpp (100%)
 rename {base => libs/base}/logging.hpp (100%)
 rename {base => libs/base}/lower_case.cpp (100%)
 rename {base => libs/base}/lru_cache.hpp (100%)
 rename {base => libs/base}/macros.hpp (100%)
 rename {base => libs/base}/math.cpp (100%)
 rename {base => libs/base}/math.hpp (100%)
 rename {base => libs/base}/matrix.hpp (100%)
 rename {base => libs/base}/mem_trie.hpp (100%)
 rename {base => libs/base}/newtype.hpp (100%)
 rename {base => libs/base}/non_intersecting_intervals.hpp (100%)
 rename {base => libs/base}/normalize_unicode.cpp (100%)
 rename {base => libs/base}/observer_list.hpp (100%)
 rename {base => libs/base}/pprof.cpp (100%)
 rename {base => libs/base}/pprof.hpp (100%)
 rename {base => libs/base}/random.hpp (100%)
 rename {base => libs/base}/range_iterator.hpp (100%)
 rename {base => libs/base}/ref_counted.hpp (100%)
 rename {base => libs/base}/rolling_hash.hpp (100%)
 rename {base => libs/base}/scope_guard.hpp (100%)
 rename {base => libs/base}/set_operations.hpp (100%)
 rename {base => libs/base}/shared_buffer_manager.cpp (100%)
 rename {base => libs/base}/shared_buffer_manager.hpp (100%)
 rename {base => libs/base}/small_map.hpp (100%)
 rename {base => libs/base}/small_set.hpp (100%)
 rename {base => libs/base}/src_point.cpp (100%)
 rename {base => libs/base}/src_point.hpp (100%)
 rename {base => libs/base}/stats.hpp (100%)
 rename {base => libs/base}/std_serialization.hpp (100%)
 rename {base => libs/base}/stl_helpers.hpp (100%)
 rename {base => libs/base}/stl_iterator.hpp (100%)
 rename {base => libs/base}/string_utils.cpp (100%)
 rename {base => libs/base}/string_utils.hpp (100%)
 rename {base => libs/base}/strings_bundle.cpp (100%)
 rename {base => libs/base}/strings_bundle.hpp (100%)
 rename {base => libs/base}/suffix_array.cpp (100%)
 rename {base => libs/base}/suffix_array.hpp (100%)
 rename {base => libs/base}/sunrise_sunset.cpp (100%)
 rename {base => libs/base}/sunrise_sunset.hpp (100%)
 rename {base => libs/base}/task_loop.hpp (100%)
 rename {base => libs/base}/thread.cpp (100%)
 rename {base => libs/base}/thread.hpp (100%)
 rename {base => libs/base}/thread_checker.cpp (100%)
 rename {base => libs/base}/thread_checker.hpp (100%)
 rename {base => libs/base}/thread_pool.cpp (100%)
 rename {base => libs/base}/thread_pool.hpp (100%)
 rename {base => libs/base}/thread_pool_computational.hpp (100%)
 rename {base => libs/base}/thread_pool_delayed.cpp (100%)
 rename {base => libs/base}/thread_pool_delayed.hpp (100%)
 rename {base => libs/base}/thread_safe_queue.hpp (100%)
 rename {base => libs/base}/thread_utils.hpp (100%)
 rename {base => libs/base}/threaded_container.cpp (100%)
 rename {base => libs/base}/threaded_container.hpp (100%)
 rename {base => libs/base}/threaded_list.hpp (100%)
 rename {base => libs/base}/timegm.cpp (100%)
 rename {base => libs/base}/timegm.hpp (100%)
 rename {base => libs/base}/timer.cpp (100%)
 rename {base => libs/base}/timer.hpp (100%)
 rename {base => libs/base}/uni_string_dfa.cpp (100%)
 rename {base => libs/base}/uni_string_dfa.hpp (100%)
 rename {base => libs/base}/visitor.hpp (100%)
 rename {base => libs/base}/waiter.hpp (100%)
 rename {coding => libs/coding}/CMakeLists.txt (100%)
 rename {coding => libs/coding}/base64.cpp (100%)
 rename {coding => libs/coding}/base64.hpp (100%)
 rename {coding => libs/coding}/bit_streams.hpp (100%)
 rename {coding => libs/coding}/buffer_reader.hpp (100%)
 rename {coding => libs/coding}/buffered_file_writer.cpp (100%)
 rename {coding => libs/coding}/buffered_file_writer.hpp (100%)
 rename {coding => libs/coding}/bwt.cpp (100%)
 rename {coding => libs/coding}/bwt.hpp (100%)
 rename {coding => libs/coding}/bwt_coder.hpp (100%)
 rename {coding => libs/coding}/byte_stream.hpp (100%)
 rename {coding => libs/coding}/coding_tests/CMakeLists.txt (100%)
 rename {coding => libs/coding}/coding_tests/base64_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/bit_streams_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/bwt_coder_tests.cpp (100%)
 rename {coding => libs/coding}/coding_tests/bwt_tests.cpp (100%)
 rename {coding => libs/coding}/coding_tests/compressed_bit_vector_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/csv_reader_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/dd_vector_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/diff_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/elias_coder_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/endianness_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/file_data_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/file_sort_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/files_container_tests.cpp (100%)
 rename {coding => libs/coding}/coding_tests/fixed_bits_ddvector_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/geometry_coding_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/geometry_serialization_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/hex_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/huffman_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/map_uint32_to_val_tests.cpp (100%)
 rename {coding => libs/coding}/coding_tests/mem_file_reader_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/mem_file_writer_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/move_to_front_tests.cpp (100%)
 rename {coding => libs/coding}/coding_tests/png_decoder_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/point_coding_tests.cpp (100%)
 rename {coding => libs/coding}/coding_tests/reader_cache_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/reader_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/reader_test.hpp (100%)
 rename {coding => libs/coding}/coding_tests/reader_writer_ops_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/serdes_json_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/sha1_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/simple_dense_coding_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/sparse_vector_tests.cpp (100%)
 rename {coding => libs/coding}/coding_tests/string_utf8_multilang_tests.cpp (100%)
 rename {coding => libs/coding}/coding_tests/succinct_ef_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/succinct_mapper_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/test_polylines.cpp (100%)
 rename {coding => libs/coding}/coding_tests/test_polylines.hpp (100%)
 rename {coding => libs/coding}/coding_tests/text_storage_tests.cpp (100%)
 rename {coding => libs/coding}/coding_tests/traffic_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/url_tests.cpp (100%)
 rename {coding => libs/coding}/coding_tests/value_opt_string_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/var_record_reader_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/var_serial_vector_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/varint_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/writer_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/xml_parser_tests.cpp (100%)
 rename {coding => libs/coding}/coding_tests/zip_creator_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/zip_reader_test.cpp (100%)
 rename {coding => libs/coding}/coding_tests/zlib_test.cpp (100%)
 rename {coding => libs/coding}/compressed_bit_vector.cpp (100%)
 rename {coding => libs/coding}/compressed_bit_vector.hpp (100%)
 rename {coding => libs/coding}/constants.hpp (100%)
 rename {coding => libs/coding}/csv_reader.cpp (100%)
 rename {coding => libs/coding}/csv_reader.hpp (100%)
 rename {coding => libs/coding}/dd_vector.hpp (100%)
 rename {coding => libs/coding}/diff.hpp (100%)
 rename {coding => libs/coding}/elias_coder.hpp (100%)
 rename {coding => libs/coding}/endianness.hpp (100%)
 rename {coding => libs/coding}/file_reader.cpp (100%)
 rename {coding => libs/coding}/file_reader.hpp (100%)
 rename {coding => libs/coding}/file_sort.hpp (100%)
 rename {coding => libs/coding}/file_writer.cpp (100%)
 rename {coding => libs/coding}/file_writer.hpp (100%)
 rename {coding => libs/coding}/files_container.cpp (100%)
 rename {coding => libs/coding}/files_container.hpp (100%)
 rename {coding => libs/coding}/fixed_bits_ddvector.hpp (100%)
 rename {coding => libs/coding}/geometry_coding.cpp (100%)
 rename {coding => libs/coding}/geometry_coding.hpp (100%)
 rename {coding => libs/coding}/hex.cpp (100%)
 rename {coding => libs/coding}/hex.hpp (100%)
 rename {coding => libs/coding}/huffman.cpp (100%)
 rename {coding => libs/coding}/huffman.hpp (100%)
 rename {coding => libs/coding}/internal/file64_api.hpp (100%)
 rename {coding => libs/coding}/internal/file_data.cpp (100%)
 rename {coding => libs/coding}/internal/file_data.hpp (100%)
 rename {coding => libs/coding}/internal/xmlparser.hpp (100%)
 rename {coding => libs/coding}/map_uint32_to_val.hpp (100%)
 rename {coding => libs/coding}/memory_region.hpp (100%)
 rename {coding => libs/coding}/mmap_reader.cpp (100%)
 rename {coding => libs/coding}/mmap_reader.hpp (100%)
 rename {coding => libs/coding}/move_to_front.cpp (100%)
 rename {coding => libs/coding}/move_to_front.hpp (100%)
 rename {coding => libs/coding}/parse_xml.hpp (100%)
 rename {coding => libs/coding}/point_coding.cpp (100%)
 rename {coding => libs/coding}/point_coding.hpp (100%)
 rename {coding => libs/coding}/read_write_utils.hpp (100%)
 rename {coding => libs/coding}/reader.cpp (100%)
 rename {coding => libs/coding}/reader.hpp (100%)
 rename {coding => libs/coding}/reader_cache.hpp (100%)
 rename {coding => libs/coding}/reader_streambuf.cpp (100%)
 rename {coding => libs/coding}/reader_streambuf.hpp (100%)
 rename {coding => libs/coding}/reader_wrapper.hpp (100%)
 rename {coding => libs/coding}/reader_writer_ops.cpp (100%)
 rename {coding => libs/coding}/reader_writer_ops.hpp (100%)
 rename {coding => libs/coding}/serdes_binary_header.hpp (100%)
 rename {coding => libs/coding}/serdes_json.hpp (100%)
 rename {coding => libs/coding}/sha1.cpp (100%)
 rename {coding => libs/coding}/sha1.hpp (100%)
 rename {coding => libs/coding}/simple_dense_coding.cpp (100%)
 rename {coding => libs/coding}/simple_dense_coding.hpp (100%)
 rename {coding => libs/coding}/sparse_vector.hpp (100%)
 rename {coding => libs/coding}/streams.hpp (100%)
 rename {coding => libs/coding}/streams_common.hpp (100%)
 rename {coding => libs/coding}/streams_sink.hpp (100%)
 rename {coding => libs/coding}/string_utf8_multilang.cpp (100%)
 rename {coding => libs/coding}/string_utf8_multilang.hpp (100%)
 rename {coding => libs/coding}/succinct_mapper.hpp (100%)
 rename {coding => libs/coding}/tesselator_decl.hpp (100%)
 rename {coding => libs/coding}/text_storage.hpp (100%)
 rename {coding => libs/coding}/traffic.cpp (100%)
 rename {coding => libs/coding}/traffic.hpp (100%)
 rename {coding => libs/coding}/transliteration.cpp (100%)
 rename {coding => libs/coding}/transliteration.hpp (100%)
 rename {coding => libs/coding}/url.cpp (100%)
 rename {coding => libs/coding}/url.hpp (100%)
 rename {coding => libs/coding}/value_opt_string.hpp (100%)
 rename {coding => libs/coding}/var_record_reader.hpp (100%)
 rename {coding => libs/coding}/var_serial_vector.hpp (100%)
 rename {coding => libs/coding}/varint.hpp (100%)
 rename {coding => libs/coding}/write_to_sink.hpp (100%)
 rename {coding => libs/coding}/writer.hpp (100%)
 rename {coding => libs/coding}/zip_creator.cpp (100%)
 rename {coding => libs/coding}/zip_creator.hpp (100%)
 rename {coding => libs/coding}/zip_reader.cpp (100%)
 rename {coding => libs/coding}/zip_reader.hpp (100%)
 rename {coding => libs/coding}/zlib.cpp (100%)
 rename {coding => libs/coding}/zlib.hpp (100%)
 rename {cppjansson => libs/cppjansson}/CMakeLists.txt (100%)
 rename {cppjansson => libs/cppjansson}/cppjansson.cpp (100%)
 rename {cppjansson => libs/cppjansson}/cppjansson.hpp (100%)
 rename {cppjansson => libs/cppjansson}/jansson_handle.cpp (100%)
 rename {cppjansson => libs/cppjansson}/jansson_handle.hpp (100%)
 rename {descriptions => libs/descriptions}/CMakeLists.txt (100%)
 rename {descriptions => libs/descriptions}/descriptions_tests/CMakeLists.txt (100%)
 rename {descriptions => libs/descriptions}/descriptions_tests/descriptions_tests.cpp (100%)
 rename {descriptions => libs/descriptions}/header.hpp (100%)
 rename {descriptions => libs/descriptions}/loader.cpp (100%)
 rename {descriptions => libs/descriptions}/loader.hpp (100%)
 rename {descriptions => libs/descriptions}/serdes.hpp (100%)
 rename {drape => libs/drape}/CMakeLists.txt (100%)
 rename {drape => libs/drape}/attribute_buffer_mutator.cpp (100%)
 rename {drape => libs/drape}/attribute_buffer_mutator.hpp (100%)
 rename {drape => libs/drape}/attribute_provider.cpp (100%)
 rename {drape => libs/drape}/attribute_provider.hpp (100%)
 rename {drape => libs/drape}/batcher.cpp (100%)
 rename {drape => libs/drape}/batcher.hpp (100%)
 rename {drape => libs/drape}/batcher_helpers.cpp (100%)
 rename {drape => libs/drape}/batcher_helpers.hpp (100%)
 rename {drape => libs/drape}/binding_info.cpp (100%)
 rename {drape => libs/drape}/binding_info.hpp (100%)
 rename {drape => libs/drape}/buffer_base.cpp (100%)
 rename {drape => libs/drape}/buffer_base.hpp (100%)
 rename {drape => libs/drape}/color.hpp (100%)
 rename {drape => libs/drape}/constants.hpp (100%)
 rename {drape => libs/drape}/cpu_buffer.cpp (100%)
 rename {drape => libs/drape}/cpu_buffer.hpp (100%)
 rename {drape => libs/drape}/data_buffer.cpp (100%)
 rename {drape => libs/drape}/data_buffer.hpp (100%)
 rename {drape => libs/drape}/data_buffer_impl.hpp (100%)
 rename {drape => libs/drape}/debug_renderer.hpp (100%)
 rename {drape => libs/drape}/drape_diagnostics.hpp (100%)
 rename {drape => libs/drape}/drape_global.hpp (100%)
 rename {drape => libs/drape}/drape_routine.hpp (100%)
 rename {drape => libs/drape}/drape_tests/CMakeLists.txt (90%)
 rename {drape => libs/drape}/drape_tests/attribute_provides_tests.cpp (100%)
 rename {drape => libs/drape}/drape_tests/batcher_tests.cpp (100%)
 rename {drape => libs/drape}/drape_tests/bingind_info_tests.cpp (100%)
 rename {drape => libs/drape}/drape_tests/buffer_tests.cpp (100%)
 rename {drape => libs/drape}/drape_tests/dummy_texture.hpp (100%)
 rename {drape => libs/drape}/drape_tests/font_texture_tests.cpp (100%)
 rename {drape => libs/drape}/drape_tests/gl_functions.cpp (100%)
 rename {drape => libs/drape}/drape_tests/gl_mock_functions.cpp (100%)
 rename {drape => libs/drape}/drape_tests/gl_mock_functions.hpp (100%)
 rename {drape => libs/drape}/drape_tests/glyph_mng_tests.cpp (100%)
 rename {drape => libs/drape}/drape_tests/glyph_packer_test.cpp (100%)
 rename {drape => libs/drape}/drape_tests/harfbuzz_shaping_test.cpp (100%)
 rename {drape => libs/drape}/drape_tests/img.cpp (100%)
 rename {drape => libs/drape}/drape_tests/img.hpp (100%)
 rename {drape => libs/drape}/drape_tests/memory_comparer.hpp (100%)
 rename {drape => libs/drape}/drape_tests/object_pool_tests.cpp (100%)
 rename {drape => libs/drape}/drape_tests/pointers_tests.cpp (100%)
 rename {drape => libs/drape}/drape_tests/static_texture_tests.cpp (100%)
 rename {drape => libs/drape}/drape_tests/stipple_pen_tests.cpp (100%)
 rename {drape => libs/drape}/drape_tests/testing_graphics_context.hpp (100%)
 rename {drape => libs/drape}/drape_tests/texture_of_colors_tests.cpp (100%)
 rename {drape => libs/drape}/drape_tests/uniform_value_tests.cpp (100%)
 rename {drape => libs/drape}/drape_tests/vertex_buffer_tests.cpp (100%)
 rename {drape => libs/drape}/dynamic_texture.hpp (100%)
 rename {drape => libs/drape}/font_constants.hpp (100%)
 rename {drape => libs/drape}/font_texture.cpp (100%)
 rename {drape => libs/drape}/font_texture.hpp (100%)
 rename {drape => libs/drape}/fonts_tool/CMakeLists.txt (100%)
 rename {drape => libs/drape}/fonts_tool/fonts_tool.cpp (100%)
 rename {drape => libs/drape}/framebuffer.cpp (100%)
 rename {drape => libs/drape}/framebuffer.hpp (100%)
 rename {drape => libs/drape}/gl_constants.cpp (100%)
 rename {drape => libs/drape}/gl_constants.hpp (100%)
 rename {drape => libs/drape}/gl_extensions_list.cpp (100%)
 rename {drape => libs/drape}/gl_extensions_list.hpp (100%)
 rename {drape => libs/drape}/gl_functions.cpp (100%)
 rename {drape => libs/drape}/gl_functions.hpp (100%)
 rename {drape => libs/drape}/gl_gpu_program.cpp (100%)
 rename {drape => libs/drape}/gl_gpu_program.hpp (100%)
 rename {drape => libs/drape}/gl_includes.hpp (100%)
 rename {drape => libs/drape}/glsl_func.hpp (100%)
 rename {drape => libs/drape}/glsl_types.hpp (100%)
 rename {drape => libs/drape}/glyph.hpp (100%)
 rename {drape => libs/drape}/glyph_manager.cpp (100%)
 rename {drape => libs/drape}/glyph_manager.hpp (100%)
 rename {drape => libs/drape}/gpu_buffer.cpp (100%)
 rename {drape => libs/drape}/gpu_buffer.hpp (100%)
 rename {drape => libs/drape}/gpu_program.hpp (100%)
 rename {drape => libs/drape}/graphics_context.hpp (100%)
 rename {drape => libs/drape}/graphics_context_factory.cpp (100%)
 rename {drape => libs/drape}/graphics_context_factory.hpp (100%)
 rename {drape => libs/drape}/harfbuzz_shaping.cpp (100%)
 rename {drape => libs/drape}/harfbuzz_shaping.hpp (100%)
 rename {drape => libs/drape}/hw_texture.cpp (100%)
 rename {drape => libs/drape}/hw_texture.hpp (100%)
 rename {drape => libs/drape}/hw_texture_ios.hpp (100%)
 rename {drape => libs/drape}/hw_texture_ios.mm (100%)
 rename {drape => libs/drape}/index_buffer.cpp (100%)
 rename {drape => libs/drape}/index_buffer.hpp (100%)
 rename {drape => libs/drape}/index_buffer_mutator.cpp (100%)
 rename {drape => libs/drape}/index_buffer_mutator.hpp (100%)
 rename {drape => libs/drape}/index_storage.cpp (100%)
 rename {drape => libs/drape}/index_storage.hpp (100%)
 rename {drape => libs/drape}/mesh_object.cpp (100%)
 rename {drape => libs/drape}/mesh_object.hpp (100%)
 rename {drape => libs/drape}/metal/metal_base_context.hpp (100%)
 rename {drape => libs/drape}/metal/metal_base_context.mm (100%)
 rename {drape => libs/drape}/metal/metal_cleaner.hpp (100%)
 rename {drape => libs/drape}/metal/metal_cleaner.mm (100%)
 rename {drape => libs/drape}/metal/metal_gpu_buffer_impl.hpp (100%)
 rename {drape => libs/drape}/metal/metal_gpu_buffer_impl.mm (100%)
 rename {drape => libs/drape}/metal/metal_gpu_program.hpp (100%)
 rename {drape => libs/drape}/metal/metal_mesh_object_impl.mm (100%)
 rename {drape => libs/drape}/metal/metal_states.hpp (100%)
 rename {drape => libs/drape}/metal/metal_states.mm (100%)
 rename {drape => libs/drape}/metal/metal_texture.hpp (100%)
 rename {drape => libs/drape}/metal/metal_texture.mm (100%)
 rename {drape => libs/drape}/metal/metal_vertex_array_buffer_impl.mm (100%)
 rename {drape => libs/drape}/metal/render_state_metal.mm (100%)
 rename {drape => libs/drape}/object_pool.hpp (100%)
 rename {drape => libs/drape}/oglcontext.cpp (100%)
 rename {drape => libs/drape}/oglcontext.hpp (100%)
 rename {drape => libs/drape}/overlay_handle.cpp (100%)
 rename {drape => libs/drape}/overlay_handle.hpp (100%)
 rename {drape => libs/drape}/overlay_tree.cpp (100%)
 rename {drape => libs/drape}/overlay_tree.hpp (100%)
 rename {drape => libs/drape}/pointers.cpp (100%)
 rename {drape => libs/drape}/pointers.hpp (100%)
 rename {drape => libs/drape}/render_bucket.cpp (100%)
 rename {drape => libs/drape}/render_bucket.hpp (100%)
 rename {drape => libs/drape}/render_state.cpp (100%)
 rename {drape => libs/drape}/render_state.hpp (100%)
 rename {drape => libs/drape}/shader.cpp (100%)
 rename {drape => libs/drape}/shader.hpp (100%)
 rename {drape => libs/drape}/static_texture.cpp (100%)
 rename {drape => libs/drape}/static_texture.hpp (100%)
 rename {drape => libs/drape}/stipple_pen_resource.cpp (100%)
 rename {drape => libs/drape}/stipple_pen_resource.hpp (100%)
 rename {drape => libs/drape}/support_manager.cpp (100%)
 rename {drape => libs/drape}/support_manager.hpp (100%)
 rename {drape => libs/drape}/symbols_texture.cpp (100%)
 rename {drape => libs/drape}/symbols_texture.hpp (100%)
 rename {drape => libs/drape}/texture.cpp (100%)
 rename {drape => libs/drape}/texture.hpp (100%)
 rename {drape => libs/drape}/texture_manager.cpp (100%)
 rename {drape => libs/drape}/texture_manager.hpp (100%)
 rename {drape => libs/drape}/texture_of_colors.cpp (100%)
 rename {drape => libs/drape}/texture_of_colors.hpp (100%)
 rename {drape => libs/drape}/texture_types.hpp (100%)
 rename {drape => libs/drape}/tm_read_resources.hpp (100%)
 rename {drape => libs/drape}/uniform_value.cpp (100%)
 rename {drape => libs/drape}/uniform_value.hpp (100%)
 rename {drape => libs/drape}/utils/glyph_usage_tracker.cpp (100%)
 rename {drape => libs/drape}/utils/glyph_usage_tracker.hpp (100%)
 rename {drape => libs/drape}/utils/gpu_mem_tracker.cpp (100%)
 rename {drape => libs/drape}/utils/gpu_mem_tracker.hpp (100%)
 rename {drape => libs/drape}/utils/profiler.hpp (100%)
 rename {drape => libs/drape}/utils/projection.cpp (100%)
 rename {drape => libs/drape}/utils/projection.hpp (100%)
 rename {drape => libs/drape}/utils/vertex_decl.cpp (100%)
 rename {drape => libs/drape}/utils/vertex_decl.hpp (100%)
 rename {drape => libs/drape}/vertex_array_buffer.cpp (100%)
 rename {drape => libs/drape}/vertex_array_buffer.hpp (100%)
 rename {drape => libs/drape}/viewport.cpp (100%)
 rename {drape => libs/drape}/viewport.hpp (100%)
 rename {drape => libs/drape}/visual_scale.hpp (100%)
 rename {drape => libs/drape}/vulkan/vulkan_base_context.cpp (100%)
 rename {drape => libs/drape}/vulkan/vulkan_base_context.hpp (100%)
 rename {drape => libs/drape}/vulkan/vulkan_context_factory.cpp (100%)
 rename {drape => libs/drape}/vulkan/vulkan_context_factory.hpp (100%)
 rename {drape => libs/drape}/vulkan/vulkan_gpu_buffer_impl.cpp (100%)
 rename {drape => libs/drape}/vulkan/vulkan_gpu_buffer_impl.hpp (100%)
 rename {drape => libs/drape}/vulkan/vulkan_gpu_program.hpp (100%)
 rename {drape => libs/drape}/vulkan/vulkan_layers.cpp (100%)
 rename {drape => libs/drape}/vulkan/vulkan_layers.hpp (100%)
 rename {drape => libs/drape}/vulkan/vulkan_memory_manager.cpp (100%)
 rename {drape => libs/drape}/vulkan/vulkan_memory_manager.hpp (100%)
 rename {drape => libs/drape}/vulkan/vulkan_mesh_object_impl.cpp (100%)
 rename {drape => libs/drape}/vulkan/vulkan_object_manager.cpp (100%)
 rename {drape => libs/drape}/vulkan/vulkan_object_manager.hpp (100%)
 rename {drape => libs/drape}/vulkan/vulkan_param_descriptor.cpp (100%)
 rename {drape => libs/drape}/vulkan/vulkan_param_descriptor.hpp (100%)
 rename {drape => libs/drape}/vulkan/vulkan_pipeline.cpp (100%)
 rename {drape => libs/drape}/vulkan/vulkan_pipeline.hpp (100%)
 rename {drape => libs/drape}/vulkan/vulkan_staging_buffer.cpp (100%)
 rename {drape => libs/drape}/vulkan/vulkan_staging_buffer.hpp (100%)
 rename {drape => libs/drape}/vulkan/vulkan_texture.cpp (100%)
 rename {drape => libs/drape}/vulkan/vulkan_texture.hpp (100%)
 rename {drape => libs/drape}/vulkan/vulkan_utils.cpp (100%)
 rename {drape => libs/drape}/vulkan/vulkan_utils.hpp (100%)
 rename {drape => libs/drape}/vulkan/vulkan_vertex_array_buffer_impl.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/CMakeLists.txt (100%)
 rename {drape_frontend => libs/drape_frontend}/animation/animation.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/animation/animation.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/animation/arrow_animation.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/animation/arrow_animation.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/animation/base_interpolator.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/animation/base_interpolator.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/animation/follow_animation.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/animation/follow_animation.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/animation/interpolation_holder.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/animation/interpolation_holder.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/animation/interpolations.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/animation/interpolations.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/animation/interpolators.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/animation/interpolators.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/animation/linear_animation.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/animation/linear_animation.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/animation/opacity_animation.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/animation/opacity_animation.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/animation/parallel_animation.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/animation/parallel_animation.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/animation/scale_animation.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/animation/scale_animation.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/animation/sequence_animation.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/animation/sequence_animation.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/animation/show_hide_animation.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/animation/show_hide_animation.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/animation/value_mapping.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/animation_constants.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/animation_system.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/animation_system.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/animation_utils.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/animation_utils.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/apply_feature_functors.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/apply_feature_functors.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/area_shape.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/area_shape.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/arrow3d.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/arrow3d.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/backend_renderer.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/backend_renderer.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/base_renderer.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/base_renderer.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/batcher_bucket.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/batchers_pool.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/circles_pack_shape.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/circles_pack_shape.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/color_constants.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/color_constants.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/colored_symbol_shape.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/colored_symbol_shape.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/custom_features_context.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/debug_rect_renderer.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/debug_rect_renderer.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/drape_api.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/drape_api.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/drape_api_builder.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/drape_api_builder.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/drape_api_renderer.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/drape_api_renderer.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/drape_engine.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/drape_engine.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/drape_engine_params.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/drape_engine_safe_ptr.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/drape_frontend_tests/CMakeLists.txt (100%)
 rename {drape_frontend => libs/drape_frontend}/drape_frontend_tests/frame_values_tests.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/drape_frontend_tests/navigator_test.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/drape_frontend_tests/path_text_test.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/drape_frontend_tests/stylist_tests.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/drape_frontend_tests/user_event_stream_tests.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/drape_hints.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/drape_measurer.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/drape_measurer.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/drape_notifier.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/drape_notifier.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/engine_context.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/engine_context.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/frame_values.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/frontend_renderer.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/frontend_renderer.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/gps_track_point.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/gps_track_renderer.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/gps_track_renderer.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/gui/choose_position_mark.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/gui/choose_position_mark.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/gui/compass.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/gui/compass.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/gui/copyright_label.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/gui/copyright_label.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/gui/debug_label.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/gui/debug_label.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/gui/drape_gui.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/gui/drape_gui.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/gui/gui_text.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/gui/gui_text.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/gui/layer_render.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/gui/layer_render.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/gui/ruler.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/gui/ruler.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/gui/ruler_helper.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/gui/ruler_helper.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/gui/scale_fps_helper.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/gui/shape.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/gui/shape.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/gui/skin.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/gui/skin.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/kinetic_scroller.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/kinetic_scroller.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/line_shape.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/line_shape.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/line_shape_helper.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/line_shape_helper.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/map_data_provider.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/map_data_provider.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/map_shape.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/message.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/message.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/message_acceptor.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/message_acceptor.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/message_queue.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/message_queue.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/message_subclasses.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/metaline_manager.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/metaline_manager.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/my_position.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/my_position.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/my_position_controller.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/my_position_controller.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/navigator.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/navigator.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/overlay_batcher.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/overlay_batcher.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/overlays_tracker.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/overlays_tracker.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/path_symbol_shape.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/path_symbol_shape.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/path_text_handle.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/path_text_handle.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/path_text_shape.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/path_text_shape.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/poi_symbol_shape.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/poi_symbol_shape.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/postprocess_renderer.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/postprocess_renderer.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/read_manager.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/read_manager.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/read_metaline_task.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/read_metaline_task.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/read_mwm_task.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/read_mwm_task.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/render_group.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/render_group.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/render_node.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/render_state_extension.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/render_state_extension.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/requested_tiles.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/requested_tiles.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/route_builder.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/route_builder.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/route_renderer.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/route_renderer.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/route_shape.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/route_shape.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/rule_drawer.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/rule_drawer.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/scenario_manager.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/scenario_manager.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/screen_animations.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/screen_animations.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/screen_operations.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/screen_operations.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/screen_quad_renderer.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/screen_quad_renderer.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/selection_shape.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/selection_shape.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/selection_shape_generator.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/selection_shape_generator.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/shape_view_params.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/stylist.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/stylist.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/text_handle.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/text_handle.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/text_layout.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/text_layout.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/text_shape.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/text_shape.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/threads_commutator.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/threads_commutator.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/tile_info.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/tile_info.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/tile_key.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/tile_key.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/tile_utils.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/tile_utils.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/traffic_generator.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/traffic_generator.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/traffic_renderer.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/traffic_renderer.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/transit_scheme_builder.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/transit_scheme_builder.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/transit_scheme_renderer.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/transit_scheme_renderer.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/user_event_stream.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/user_event_stream.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/user_mark_generator.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/user_mark_generator.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/user_mark_shapes.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/user_mark_shapes.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/user_marks_provider.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/user_marks_provider.hpp (100%)
 rename {drape_frontend => libs/drape_frontend}/visual_params.cpp (100%)
 rename {drape_frontend => libs/drape_frontend}/visual_params.hpp (100%)
 rename {editor => libs/editor}/CMakeLists.txt (100%)
 rename {editor => libs/editor}/changeset_wrapper.cpp (100%)
 rename {editor => libs/editor}/changeset_wrapper.hpp (100%)
 rename {editor => libs/editor}/config_loader.cpp (100%)
 rename {editor => libs/editor}/config_loader.hpp (100%)
 rename {editor => libs/editor}/editable_data_source.hpp (100%)
 rename {editor => libs/editor}/editable_feature_source.cpp (100%)
 rename {editor => libs/editor}/editable_feature_source.hpp (100%)
 rename {editor => libs/editor}/editor_config.cpp (100%)
 rename {editor => libs/editor}/editor_config.hpp (100%)
 rename {editor => libs/editor}/editor_notes.cpp (100%)
 rename {editor => libs/editor}/editor_notes.hpp (100%)
 rename {editor => libs/editor}/editor_storage.cpp (100%)
 rename {editor => libs/editor}/editor_storage.hpp (100%)
 rename {editor => libs/editor}/editor_tests/CMakeLists.txt (100%)
 rename {editor => libs/editor}/editor_tests/config_loader_test.cpp (100%)
 rename {editor => libs/editor}/editor_tests/editor_config_test.cpp (100%)
 rename {editor => libs/editor}/editor_tests/editor_notes_test.cpp (100%)
 rename {editor => libs/editor}/editor_tests/feature_matcher_test.cpp (100%)
 rename {editor => libs/editor}/editor_tests/match_by_geometry_test.cpp (100%)
 rename {editor => libs/editor}/editor_tests/new_feature_categories_test.cpp (100%)
 rename {editor => libs/editor}/editor_tests/opening_hours_ui_test.cpp (100%)
 rename {editor => libs/editor}/editor_tests/osm_editor_test.cpp (100%)
 rename {editor => libs/editor}/editor_tests/osm_editor_test.hpp (100%)
 rename {editor => libs/editor}/editor_tests/ui2oh_test.cpp (100%)
 rename {editor => libs/editor}/editor_tests/xml_feature_test.cpp (100%)
 rename {editor => libs/editor}/editor_tests_support/CMakeLists.txt (100%)
 rename {editor => libs/editor}/editor_tests_support/helpers.cpp (100%)
 rename {editor => libs/editor}/editor_tests_support/helpers.hpp (100%)
 rename {editor => libs/editor}/edits_migration.cpp (100%)
 rename {editor => libs/editor}/edits_migration.hpp (100%)
 rename {editor => libs/editor}/feature_matcher.cpp (100%)
 rename {editor => libs/editor}/feature_matcher.hpp (100%)
 rename {editor => libs/editor}/module.modulemap (100%)
 rename {editor => libs/editor}/new_feature_categories.cpp (100%)
 rename {editor => libs/editor}/new_feature_categories.hpp (100%)
 rename {editor => libs/editor}/opening_hours_ui.cpp (100%)
 rename {editor => libs/editor}/opening_hours_ui.hpp (100%)
 rename {editor => libs/editor}/osm_auth.cpp (100%)
 rename {editor => libs/editor}/osm_auth.hpp (100%)
 rename {editor => libs/editor}/osm_auth_tests/CMakeLists.txt (100%)
 rename {editor => libs/editor}/osm_auth_tests/osm_auth_tests.cpp (100%)
 rename {editor => libs/editor}/osm_auth_tests/server_api_test.cpp (100%)
 rename {editor => libs/editor}/osm_editor.cpp (100%)
 rename {editor => libs/editor}/osm_editor.hpp (100%)
 rename {editor => libs/editor}/server_api.cpp (100%)
 rename {editor => libs/editor}/server_api.hpp (100%)
 rename {editor => libs/editor}/ui2oh.cpp (100%)
 rename {editor => libs/editor}/ui2oh.hpp (100%)
 rename {editor => libs/editor}/xml_feature.cpp (100%)
 rename {editor => libs/editor}/xml_feature.hpp (100%)
 rename {editor => libs/editor}/yes_no_unknown.hpp (100%)
 rename {ge0 => libs/ge0}/CMakeLists.txt (100%)
 rename {ge0 => libs/ge0}/ge0.php (100%)
 rename {ge0 => libs/ge0}/ge0_tests/CMakeLists.txt (100%)
 rename {ge0 => libs/ge0}/ge0_tests/geo_url_tests.cpp (100%)
 rename {ge0 => libs/ge0}/ge0_tests/parser_tests.cpp (100%)
 rename {ge0 => libs/ge0}/ge0_tests/url_generator_tests.cpp (100%)
 rename {ge0 => libs/ge0}/geo_url_parser.cpp (100%)
 rename {ge0 => libs/ge0}/geo_url_parser.hpp (100%)
 rename {ge0 => libs/ge0}/parser.cpp (100%)
 rename {ge0 => libs/ge0}/parser.hpp (100%)
 rename {ge0 => libs/ge0}/url_generator.cpp (100%)
 rename {ge0 => libs/ge0}/url_generator.hpp (100%)
 rename {geometry => libs/geometry}/CMakeLists.txt (100%)
 rename {geometry => libs/geometry}/algorithm.cpp (100%)
 rename {geometry => libs/geometry}/algorithm.hpp (100%)
 rename {geometry => libs/geometry}/angles.cpp (100%)
 rename {geometry => libs/geometry}/angles.hpp (100%)
 rename {geometry => libs/geometry}/any_rect2d.hpp (100%)
 rename {geometry => libs/geometry}/area_on_earth.cpp (100%)
 rename {geometry => libs/geometry}/area_on_earth.hpp (100%)
 rename {geometry => libs/geometry}/avg_vector.hpp (100%)
 rename {geometry => libs/geometry}/bounding_box.cpp (100%)
 rename {geometry => libs/geometry}/bounding_box.hpp (100%)
 rename {geometry => libs/geometry}/calipers_box.cpp (100%)
 rename {geometry => libs/geometry}/calipers_box.hpp (100%)
 rename {geometry => libs/geometry}/cellid.hpp (100%)
 rename {geometry => libs/geometry}/circle_on_earth.cpp (100%)
 rename {geometry => libs/geometry}/circle_on_earth.hpp (100%)
 rename {geometry => libs/geometry}/clipping.cpp (100%)
 rename {geometry => libs/geometry}/clipping.hpp (100%)
 rename {geometry => libs/geometry}/convex_hull.cpp (100%)
 rename {geometry => libs/geometry}/convex_hull.hpp (100%)
 rename {geometry => libs/geometry}/covering.hpp (100%)
 rename {geometry => libs/geometry}/covering_utils.hpp (100%)
 rename {geometry => libs/geometry}/diamond_box.cpp (100%)
 rename {geometry => libs/geometry}/diamond_box.hpp (100%)
 rename {geometry => libs/geometry}/distance_on_sphere.cpp (100%)
 rename {geometry => libs/geometry}/distance_on_sphere.hpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/CMakeLists.txt (100%)
 rename {geometry => libs/geometry}/geometry_tests/algorithm_test.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/angle_test.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/anyrect_test.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/area_on_earth_tests.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/bounding_box_tests.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/calipers_box_tests.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/cellid_test.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/circle_on_earth_tests.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/clipping_test.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/common_test.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/convex_hull_tests.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/covering_test.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/diamond_box_tests.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/distance_on_sphere_test.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/equality.hpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/intersect_test.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/intersection_score_tests.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/large_polygon.hpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/latlon_test.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/line2d_tests.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/mercator_test.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/nearby_points_sweeper_test.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/oblate_spheroid_tests.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/packer_test.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/parametrized_segment_tests.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/point3d_tests.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/point_test.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/polygon_test.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/polyline_tests.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/rect_test.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/region2d_binary_op_test.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/region_tests.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/robust_test.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/screen_test.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/segment2d_tests.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/simplification_test.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/spline_test.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/test_regions.hpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/transformations_test.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/tree_test.cpp (100%)
 rename {geometry => libs/geometry}/geometry_tests/vector_test.cpp (100%)
 rename {geometry => libs/geometry}/intersection_score.hpp (100%)
 rename {geometry => libs/geometry}/latlon.cpp (100%)
 rename {geometry => libs/geometry}/latlon.hpp (100%)
 rename {geometry => libs/geometry}/line2d.cpp (100%)
 rename {geometry => libs/geometry}/line2d.hpp (100%)
 rename {geometry => libs/geometry}/mercator.cpp (100%)
 rename {geometry => libs/geometry}/mercator.hpp (100%)
 rename {geometry => libs/geometry}/meter.hpp (100%)
 rename {geometry => libs/geometry}/nearby_points_sweeper.cpp (100%)
 rename {geometry => libs/geometry}/nearby_points_sweeper.hpp (100%)
 rename {geometry => libs/geometry}/oblate_spheroid.cpp (100%)
 rename {geometry => libs/geometry}/oblate_spheroid.hpp (100%)
 rename {geometry => libs/geometry}/packer.cpp (100%)
 rename {geometry => libs/geometry}/packer.hpp (100%)
 rename {geometry => libs/geometry}/parametrized_segment.hpp (100%)
 rename {geometry => libs/geometry}/point2d.hpp (100%)
 rename {geometry => libs/geometry}/point3d.hpp (100%)
 rename {geometry => libs/geometry}/point_with_altitude.cpp (100%)
 rename {geometry => libs/geometry}/point_with_altitude.hpp (100%)
 rename {geometry => libs/geometry}/polygon.hpp (100%)
 rename {geometry => libs/geometry}/polyline2d.hpp (100%)
 rename {geometry => libs/geometry}/rect2d.hpp (100%)
 rename {geometry => libs/geometry}/rect_intersect.hpp (100%)
 rename {geometry => libs/geometry}/region2d.hpp (100%)
 rename {geometry => libs/geometry}/region2d/binary_operators.cpp (100%)
 rename {geometry => libs/geometry}/region2d/binary_operators.hpp (100%)
 rename {geometry => libs/geometry}/region2d/boost_concept.hpp (100%)
 rename {geometry => libs/geometry}/robust_orientation.cpp (100%)
 rename {geometry => libs/geometry}/robust_orientation.hpp (100%)
 rename {geometry => libs/geometry}/screenbase.cpp (100%)
 rename {geometry => libs/geometry}/screenbase.hpp (100%)
 rename {geometry => libs/geometry}/segment2d.cpp (100%)
 rename {geometry => libs/geometry}/segment2d.hpp (100%)
 rename {geometry => libs/geometry}/simplification.hpp (100%)
 rename {geometry => libs/geometry}/smoothing.cpp (100%)
 rename {geometry => libs/geometry}/smoothing.hpp (100%)
 rename {geometry => libs/geometry}/spline.cpp (100%)
 rename {geometry => libs/geometry}/spline.hpp (100%)
 rename {geometry => libs/geometry}/transformations.hpp (100%)
 rename {geometry => libs/geometry}/tree4d.hpp (100%)
 rename {geometry => libs/geometry}/triangle2d.cpp (100%)
 rename {geometry => libs/geometry}/triangle2d.hpp (100%)
 rename {indexer => libs/indexer}/CMakeLists.txt (100%)
 rename {indexer => libs/indexer}/altitude_loader.cpp (100%)
 rename {indexer => libs/indexer}/altitude_loader.hpp (100%)
 rename {indexer => libs/indexer}/brands_holder.cpp (100%)
 rename {indexer => libs/indexer}/brands_holder.hpp (100%)
 rename {indexer => libs/indexer}/caching_rank_table_loader.cpp (100%)
 rename {indexer => libs/indexer}/caching_rank_table_loader.hpp (100%)
 rename {indexer => libs/indexer}/categories_holder.cpp (100%)
 rename {indexer => libs/indexer}/categories_holder.hpp (100%)
 rename {indexer => libs/indexer}/categories_holder_loader.cpp (100%)
 rename {indexer => libs/indexer}/categories_index.cpp (100%)
 rename {indexer => libs/indexer}/categories_index.hpp (100%)
 rename {indexer => libs/indexer}/cell_coverer.hpp (100%)
 rename {indexer => libs/indexer}/cell_id.hpp (100%)
 rename {indexer => libs/indexer}/cell_value_pair.hpp (100%)
 rename {indexer => libs/indexer}/centers_table.cpp (100%)
 rename {indexer => libs/indexer}/centers_table.hpp (100%)
 rename {indexer => libs/indexer}/cities_boundaries_serdes.hpp (100%)
 rename {indexer => libs/indexer}/city_boundary.hpp (100%)
 rename {indexer => libs/indexer}/classificator.cpp (100%)
 rename {indexer => libs/indexer}/classificator.hpp (100%)
 rename {indexer => libs/indexer}/classificator_loader.cpp (100%)
 rename {indexer => libs/indexer}/classificator_loader.hpp (100%)
 rename {indexer => libs/indexer}/complex/serdes.cpp (100%)
 rename {indexer => libs/indexer}/complex/serdes.hpp (100%)
 rename {indexer => libs/indexer}/complex/serdes_utils.hpp (100%)
 rename {indexer => libs/indexer}/complex/tree_node.hpp (100%)
 rename {indexer => libs/indexer}/cuisines.cpp (100%)
 rename {indexer => libs/indexer}/cuisines.hpp (100%)
 rename {indexer => libs/indexer}/custom_keyvalue.cpp (100%)
 rename {indexer => libs/indexer}/custom_keyvalue.hpp (100%)
 rename {indexer => libs/indexer}/dat_section_header.hpp (100%)
 rename {indexer => libs/indexer}/data_factory.cpp (100%)
 rename {indexer => libs/indexer}/data_factory.hpp (100%)
 rename {indexer => libs/indexer}/data_header.cpp (100%)
 rename {indexer => libs/indexer}/data_header.hpp (100%)
 rename {indexer => libs/indexer}/data_source.cpp (100%)
 rename {indexer => libs/indexer}/data_source.hpp (100%)
 rename {indexer => libs/indexer}/data_source_helpers.cpp (100%)
 rename {indexer => libs/indexer}/data_source_helpers.hpp (100%)
 rename {indexer => libs/indexer}/displacement_manager.hpp (100%)
 rename {indexer => libs/indexer}/drawing_rule_def.cpp (100%)
 rename {indexer => libs/indexer}/drawing_rule_def.hpp (100%)
 rename {indexer => libs/indexer}/drawing_rules.cpp (100%)
 rename {indexer => libs/indexer}/drawing_rules.hpp (100%)
 rename {indexer => libs/indexer}/drules_include.hpp (100%)
 rename {indexer => libs/indexer}/drules_selector.cpp (100%)
 rename {indexer => libs/indexer}/drules_selector.hpp (100%)
 rename {indexer => libs/indexer}/drules_selector_parser.cpp (100%)
 rename {indexer => libs/indexer}/drules_selector_parser.hpp (100%)
 rename {indexer => libs/indexer}/drules_struct.pb.cc (100%)
 rename {indexer => libs/indexer}/drules_struct.pb.h (100%)
 rename {indexer => libs/indexer}/drules_struct.proto (100%)
 rename {indexer => libs/indexer}/edit_journal.cpp (100%)
 rename {indexer => libs/indexer}/edit_journal.hpp (100%)
 rename {indexer => libs/indexer}/editable_map_object.cpp (100%)
 rename {indexer => libs/indexer}/editable_map_object.hpp (100%)
 rename {indexer => libs/indexer}/fake_feature_ids.cpp (100%)
 rename {indexer => libs/indexer}/fake_feature_ids.hpp (100%)
 rename {indexer => libs/indexer}/feature.cpp (100%)
 rename {indexer => libs/indexer}/feature.hpp (100%)
 rename {indexer => libs/indexer}/feature_algo.cpp (100%)
 rename {indexer => libs/indexer}/feature_algo.hpp (100%)
 rename {indexer => libs/indexer}/feature_altitude.hpp (100%)
 rename {indexer => libs/indexer}/feature_covering.cpp (100%)
 rename {indexer => libs/indexer}/feature_covering.hpp (100%)
 rename {indexer => libs/indexer}/feature_data.cpp (100%)
 rename {indexer => libs/indexer}/feature_data.hpp (100%)
 rename {indexer => libs/indexer}/feature_decl.cpp (100%)
 rename {indexer => libs/indexer}/feature_decl.hpp (100%)
 rename {indexer => libs/indexer}/feature_impl.cpp (100%)
 rename {indexer => libs/indexer}/feature_impl.hpp (100%)
 rename {indexer => libs/indexer}/feature_meta.cpp (100%)
 rename {indexer => libs/indexer}/feature_meta.hpp (100%)
 rename {indexer => libs/indexer}/feature_processor.hpp (100%)
 rename {indexer => libs/indexer}/feature_source.cpp (100%)
 rename {indexer => libs/indexer}/feature_source.hpp (100%)
 rename {indexer => libs/indexer}/feature_to_osm.cpp (100%)
 rename {indexer => libs/indexer}/feature_to_osm.hpp (100%)
 rename {indexer => libs/indexer}/feature_utils.cpp (100%)
 rename {indexer => libs/indexer}/feature_utils.hpp (100%)
 rename {indexer => libs/indexer}/feature_visibility.cpp (100%)
 rename {indexer => libs/indexer}/feature_visibility.hpp (100%)
 rename {indexer => libs/indexer}/features_offsets_table.cpp (100%)
 rename {indexer => libs/indexer}/features_offsets_table.hpp (100%)
 rename {indexer => libs/indexer}/features_vector.cpp (100%)
 rename {indexer => libs/indexer}/features_vector.hpp (100%)
 rename {indexer => libs/indexer}/ftraits.hpp (100%)
 rename {indexer => libs/indexer}/ftypes_mapping.hpp (100%)
 rename {indexer => libs/indexer}/ftypes_matcher.cpp (100%)
 rename {indexer => libs/indexer}/ftypes_matcher.hpp (100%)
 rename {indexer => libs/indexer}/house_to_street_iface.hpp (100%)
 rename {indexer => libs/indexer}/index_builder.cpp (100%)
 rename {indexer => libs/indexer}/index_builder.hpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/CMakeLists.txt (100%)
 rename {indexer => libs/indexer}/indexer_tests/bounds.hpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/brands_tests.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/categories_test.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/cell_coverer_test.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/cell_id_test.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/centers_table_test.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/checker_test.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/cities_boundaries_serdes_tests.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/classificator_tests.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/complex_serdes_tests.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/complex_serdes_utils_tests.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/custom_keyvalue_tests.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/data_source_test.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/drules_selector_parser_test.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/editable_map_object_test.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/feature_metadata_test.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/feature_names_test.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/feature_to_osm_tests.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/feature_types_test.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/features_offsets_table_test.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/features_vector_test.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/index_builder_test.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/interval_index_test.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/metadata_serdes_tests.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/mwm_set_test.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/postcodes_matcher_tests.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/rank_table_test.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/read_features_tests.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/road_shields_parser_tests.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/scale_index_reading_tests.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/search_string_utils_test.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/sort_and_merge_intervals_test.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/string_slice_tests.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/succinct_trie_test.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/test_mwm_set.hpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/test_type.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/tree_node_tests.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/trie_test.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/validate_and_format_contacts_test.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/visibility_test.cpp (100%)
 rename {indexer => libs/indexer}/indexer_tests/wheelchair_tests.cpp (100%)
 rename {indexer => libs/indexer}/interval_index.hpp (100%)
 rename {indexer => libs/indexer}/interval_index_builder.hpp (100%)
 rename {indexer => libs/indexer}/isolines_info.cpp (100%)
 rename {indexer => libs/indexer}/isolines_info.hpp (100%)
 rename {indexer => libs/indexer}/map_object.cpp (100%)
 rename {indexer => libs/indexer}/map_object.hpp (100%)
 rename {indexer => libs/indexer}/map_style.cpp (100%)
 rename {indexer => libs/indexer}/map_style.hpp (100%)
 rename {indexer => libs/indexer}/map_style_reader.cpp (100%)
 rename {indexer => libs/indexer}/map_style_reader.hpp (100%)
 rename {indexer => libs/indexer}/metadata_serdes.cpp (100%)
 rename {indexer => libs/indexer}/metadata_serdes.hpp (100%)
 rename {indexer => libs/indexer}/mwm_set.cpp (100%)
 rename {indexer => libs/indexer}/mwm_set.hpp (100%)
 rename {indexer => libs/indexer}/postcodes_matcher.cpp (100%)
 rename {indexer => libs/indexer}/postcodes_matcher.hpp (100%)
 rename {indexer => libs/indexer}/rank_table.cpp (100%)
 rename {indexer => libs/indexer}/rank_table.hpp (100%)
 rename {indexer => libs/indexer}/road_shields_parser.cpp (100%)
 rename {indexer => libs/indexer}/road_shields_parser.hpp (100%)
 rename {indexer => libs/indexer}/scale_index.hpp (100%)
 rename {indexer => libs/indexer}/scale_index_builder.hpp (100%)
 rename {indexer => libs/indexer}/scales.cpp (100%)
 rename {indexer => libs/indexer}/scales.hpp (100%)
 rename {indexer => libs/indexer}/scales_patch.hpp (100%)
 rename {indexer => libs/indexer}/search_delimiters.cpp (100%)
 rename {indexer => libs/indexer}/search_delimiters.hpp (100%)
 rename {indexer => libs/indexer}/search_string_utils.cpp (100%)
 rename {indexer => libs/indexer}/search_string_utils.hpp (100%)
 rename {indexer => libs/indexer}/shared_load_info.cpp (100%)
 rename {indexer => libs/indexer}/shared_load_info.hpp (100%)
 rename {indexer => libs/indexer}/string_set.hpp (100%)
 rename {indexer => libs/indexer}/string_slice.cpp (100%)
 rename {indexer => libs/indexer}/string_slice.hpp (100%)
 rename {indexer => libs/indexer}/succinct_trie_builder.hpp (100%)
 rename {indexer => libs/indexer}/succinct_trie_reader.hpp (100%)
 rename {indexer => libs/indexer}/transliteration_loader.cpp (100%)
 rename {indexer => libs/indexer}/transliteration_loader.hpp (100%)
 rename {indexer => libs/indexer}/tree_structure.hpp (100%)
 rename {indexer => libs/indexer}/trie.hpp (100%)
 rename {indexer => libs/indexer}/trie_builder.hpp (100%)
 rename {indexer => libs/indexer}/trie_reader.hpp (100%)
 rename {indexer => libs/indexer}/types_mapping.cpp (100%)
 rename {indexer => libs/indexer}/types_mapping.hpp (100%)
 rename {indexer => libs/indexer}/unique_index.hpp (100%)
 rename {indexer => libs/indexer}/utils.cpp (100%)
 rename {indexer => libs/indexer}/utils.hpp (100%)
 rename {indexer => libs/indexer}/validate_and_format_contacts.cpp (100%)
 rename {indexer => libs/indexer}/validate_and_format_contacts.hpp (100%)
 rename {indexer => libs/indexer}/yes_no_unknown.hpp (100%)
 rename {kml => libs/kml}/CMakeLists.txt (100%)
 rename {kml => libs/kml}/header_binary.hpp (100%)
 rename {kml => libs/kml}/kmb_to_kml/CMakeLists.txt (100%)
 rename {kml => libs/kml}/kmb_to_kml/kmb_to_kml.cpp (100%)
 rename {kml => libs/kml}/kml_tests/CMakeLists.txt (100%)
 rename {kml => libs/kml}/kml_tests/gpx_tests.cpp (100%)
 rename {kml => libs/kml}/kml_tests/minzoom_quadtree_tests.cpp (100%)
 rename {kml => libs/kml}/kml_tests/serdes_tests.cpp (100%)
 rename {kml => libs/kml}/kml_tests/tests_data.hpp (100%)
 rename {kml => libs/kml}/kml_to_kmb/CMakeLists.txt (100%)
 rename {kml => libs/kml}/kml_to_kmb/kml_to_kmb.cpp (100%)
 rename {kml => libs/kml}/minzoom_quadtree.hpp (100%)
 rename {kml => libs/kml}/pykmlib/CMakeLists.txt (100%)
 rename {kml => libs/kml}/pykmlib/bindings.cpp (100%)
 rename {kml => libs/kml}/pykmlib/bindings_test.py (100%)
 rename {kml => libs/kml}/pykmlib/setup.py (100%)
 rename {kml => libs/kml}/serdes.cpp (100%)
 rename {kml => libs/kml}/serdes.hpp (100%)
 rename {kml => libs/kml}/serdes_binary.cpp (100%)
 rename {kml => libs/kml}/serdes_binary.hpp (100%)
 rename {kml => libs/kml}/serdes_binary_v8.hpp (100%)
 rename {kml => libs/kml}/serdes_common.cpp (100%)
 rename {kml => libs/kml}/serdes_common.hpp (100%)
 rename {kml => libs/kml}/serdes_gpx.cpp (100%)
 rename {kml => libs/kml}/serdes_gpx.hpp (100%)
 rename {kml => libs/kml}/type_utils.cpp (100%)
 rename {kml => libs/kml}/type_utils.hpp (100%)
 rename {kml => libs/kml}/types.cpp (100%)
 rename {kml => libs/kml}/types.hpp (100%)
 rename {kml => libs/kml}/types_v3.hpp (100%)
 rename {kml => libs/kml}/types_v6.hpp (100%)
 rename {kml => libs/kml}/types_v7.hpp (100%)
 rename {kml => libs/kml}/types_v8.hpp (100%)
 rename {kml => libs/kml}/types_v8mm.hpp (100%)
 rename {kml => libs/kml}/types_v9.hpp (100%)
 rename {kml => libs/kml}/types_v9mm.hpp (100%)
 rename {kml => libs/kml}/visitors.hpp (100%)
 rename {map => libs/map}/CMakeLists.txt (100%)
 rename {map => libs/map}/api_mark_point.cpp (100%)
 rename {map => libs/map}/api_mark_point.hpp (100%)
 rename {map => libs/map}/benchmark_tool/CMakeLists.txt (100%)
 rename {map => libs/map}/benchmark_tool/api.cpp (100%)
 rename {map => libs/map}/benchmark_tool/api.hpp (100%)
 rename {map => libs/map}/benchmark_tool/features_loading.cpp (100%)
 rename {map => libs/map}/benchmark_tool/main.cpp (100%)
 rename {map => libs/map}/benchmark_tools.cpp (100%)
 rename {map => libs/map}/benchmark_tools.hpp (100%)
 rename {map => libs/map}/bookmark.cpp (100%)
 rename {map => libs/map}/bookmark.hpp (100%)
 rename {map => libs/map}/bookmark_helpers.cpp (100%)
 rename {map => libs/map}/bookmark_helpers.hpp (100%)
 rename {map => libs/map}/bookmark_manager.cpp (100%)
 rename {map => libs/map}/bookmark_manager.hpp (100%)
 rename {map => libs/map}/bookmarks_search_params.hpp (100%)
 rename {map => libs/map}/chart_generator.cpp (100%)
 rename {map => libs/map}/chart_generator.hpp (100%)
 rename {map => libs/map}/elevation_info.cpp (100%)
 rename {map => libs/map}/elevation_info.hpp (100%)
 rename {map => libs/map}/everywhere_search_callback.cpp (100%)
 rename {map => libs/map}/everywhere_search_callback.hpp (100%)
 rename {map => libs/map}/everywhere_search_params.hpp (100%)
 rename {map => libs/map}/extrapolation/extrapolator.cpp (100%)
 rename {map => libs/map}/extrapolation/extrapolator.hpp (100%)
 rename {map => libs/map}/extrapolation_benchmark/CMakeLists.txt (100%)
 rename {map => libs/map}/extrapolation_benchmark/extrapolation_benchmark.cpp (100%)
 rename {map => libs/map}/features_fetcher.cpp (100%)
 rename {map => libs/map}/features_fetcher.hpp (100%)
 rename {map => libs/map}/framework.cpp (100%)
 rename {map => libs/map}/framework.hpp (100%)
 rename {map => libs/map}/framework_visualize.cpp (100%)
 rename {map => libs/map}/gps_track.cpp (100%)
 rename {map => libs/map}/gps_track.hpp (100%)
 rename {map => libs/map}/gps_track_collection.cpp (100%)
 rename {map => libs/map}/gps_track_collection.hpp (100%)
 rename {map => libs/map}/gps_track_filter.cpp (100%)
 rename {map => libs/map}/gps_track_filter.hpp (100%)
 rename {map => libs/map}/gps_track_storage.cpp (100%)
 rename {map => libs/map}/gps_track_storage.hpp (100%)
 rename {map => libs/map}/gps_tracker.cpp (100%)
 rename {map => libs/map}/gps_tracker.hpp (100%)
 rename {map => libs/map}/isolines_manager.cpp (100%)
 rename {map => libs/map}/isolines_manager.hpp (100%)
 rename {map => libs/map}/map_integration_tests/CMakeLists.txt (100%)
 rename {map => libs/map}/map_integration_tests/interactive_search_test.cpp (100%)
 rename {map => libs/map}/map_tests/CMakeLists.txt (100%)
 rename {map => libs/map}/map_tests/address_tests.cpp (100%)
 rename {map => libs/map}/map_tests/bookmarks_test.cpp (100%)
 rename {map => libs/map}/map_tests/chart_generator_tests.cpp (100%)
 rename {map => libs/map}/map_tests/check_mwms.cpp (100%)
 rename {map => libs/map}/map_tests/countries_names_tests.cpp (100%)
 rename {map => libs/map}/map_tests/elevation_info_tests.cpp (100%)
 rename {map => libs/map}/map_tests/extrapolator_tests.cpp (100%)
 rename {map => libs/map}/map_tests/feature_getters_tests.cpp (100%)
 rename {map => libs/map}/map_tests/gps_track_collection_test.cpp (100%)
 rename {map => libs/map}/map_tests/gps_track_storage_test.cpp (100%)
 rename {map => libs/map}/map_tests/gps_track_test.cpp (100%)
 rename {map => libs/map}/map_tests/kmz_unarchive_test.cpp (100%)
 rename {map => libs/map}/map_tests/mwm_set_test.cpp (100%)
 rename {map => libs/map}/map_tests/mwm_url_tests.cpp (100%)
 rename {map => libs/map}/map_tests/power_manager_tests.cpp (100%)
 rename {map => libs/map}/map_tests/search_api_tests.cpp (100%)
 rename {map => libs/map}/map_tests/track_statistics_tests.cpp (100%)
 rename {map => libs/map}/map_tests/transliteration_test.cpp (100%)
 rename {map => libs/map}/mwm_tests/CMakeLists.txt (100%)
 rename {map => libs/map}/mwm_tests/multithread_mwm_test.cpp (100%)
 rename {map => libs/map}/mwm_tests/mwm_foreach_test.cpp (100%)
 rename {map => libs/map}/mwm_tests/mwm_index_test.cpp (100%)
 rename {map => libs/map}/mwm_tests/world_map_test.cpp (100%)
 rename {map => libs/map}/mwm_tree.hpp (100%)
 rename {map => libs/map}/mwm_url.cpp (100%)
 rename {map => libs/map}/mwm_url.hpp (100%)
 rename {map => libs/map}/place_page_info.cpp (100%)
 rename {map => libs/map}/place_page_info.hpp (100%)
 rename {map => libs/map}/position_provider.hpp (100%)
 rename {map => libs/map}/power_management/power_management_schemas.cpp (100%)
 rename {map => libs/map}/power_management/power_management_schemas.hpp (100%)
 rename {map => libs/map}/power_management/power_manager.cpp (100%)
 rename {map => libs/map}/power_management/power_manager.hpp (100%)
 rename {map => libs/map}/routing_manager.cpp (100%)
 rename {map => libs/map}/routing_manager.hpp (100%)
 rename {map => libs/map}/routing_mark.cpp (100%)
 rename {map => libs/map}/routing_mark.hpp (100%)
 rename {map => libs/map}/search_api.cpp (100%)
 rename {map => libs/map}/search_api.hpp (100%)
 rename {map => libs/map}/search_mark.cpp (100%)
 rename {map => libs/map}/search_mark.hpp (100%)
 rename {map => libs/map}/search_product_info.hpp (100%)
 rename {map => libs/map}/style_tests/CMakeLists.txt (100%)
 rename {map => libs/map}/style_tests/classificator_tests.cpp (100%)
 rename {map => libs/map}/style_tests/dashes_test.cpp (100%)
 rename {map => libs/map}/style_tests/helpers.hpp (100%)
 rename {map => libs/map}/style_tests/style_symbols_consistency_test.cpp (100%)
 rename {map => libs/map}/track.cpp (100%)
 rename {map => libs/map}/track.hpp (100%)
 rename {map => libs/map}/track_mark.cpp (100%)
 rename {map => libs/map}/track_mark.hpp (100%)
 rename {map => libs/map}/track_statistics.cpp (100%)
 rename {map => libs/map}/track_statistics.hpp (100%)
 rename {map => libs/map}/traffic_manager.cpp (100%)
 rename {map => libs/map}/traffic_manager.hpp (100%)
 rename {map => libs/map}/transit/transit_display.cpp (100%)
 rename {map => libs/map}/transit/transit_display.hpp (100%)
 rename {map => libs/map}/transit/transit_reader.cpp (100%)
 rename {map => libs/map}/transit/transit_reader.hpp (100%)
 rename {map => libs/map}/user_mark.cpp (100%)
 rename {map => libs/map}/user_mark.hpp (100%)
 rename {map => libs/map}/user_mark_id_storage.cpp (100%)
 rename {map => libs/map}/user_mark_id_storage.hpp (100%)
 rename {map => libs/map}/user_mark_layer.cpp (100%)
 rename {map => libs/map}/user_mark_layer.hpp (100%)
 rename {map => libs/map}/viewport_search_callback.cpp (100%)
 rename {map => libs/map}/viewport_search_callback.hpp (100%)
 rename {map => libs/map}/viewport_search_params.hpp (100%)
 rename {generator => libs}/mwm_diff/CMakeLists.txt (100%)
 rename {generator => libs}/mwm_diff/diff.cpp (99%)
 rename {generator => libs}/mwm_diff/diff.hpp (100%)
 rename {generator => libs}/mwm_diff/mwm_diff_tests/CMakeLists.txt (100%)
 rename {generator => libs}/mwm_diff/mwm_diff_tests/diff_tests.cpp (98%)
 rename {generator => libs}/mwm_diff/mwm_diff_tool/CMakeLists.txt (100%)
 rename {generator => libs}/mwm_diff/mwm_diff_tool/mwm_diff_tool.cpp (96%)
 rename {platform => libs/platform}/CMakeLists.txt (98%)
 rename {platform => libs/platform}/background_downloader_ios.h (100%)
 rename {platform => libs/platform}/background_downloader_ios.mm (100%)
 rename {platform => libs/platform}/battery_tracker.cpp (100%)
 rename {platform => libs/platform}/battery_tracker.hpp (100%)
 rename {platform => libs/platform}/chunks_download_strategy.cpp (100%)
 rename {platform => libs/platform}/chunks_download_strategy.hpp (100%)
 rename {platform => libs/platform}/constants.hpp (100%)
 rename {platform => libs/platform}/country_defines.cpp (100%)
 rename {platform => libs/platform}/country_defines.hpp (100%)
 rename {platform => libs/platform}/country_file.cpp (100%)
 rename {platform => libs/platform}/country_file.hpp (100%)
 rename {platform => libs/platform}/distance.cpp (100%)
 rename {platform => libs/platform}/distance.hpp (100%)
 rename {platform => libs/platform}/downloader_defines.hpp (100%)
 rename {platform => libs/platform}/downloader_utils.cpp (100%)
 rename {platform => libs/platform}/downloader_utils.hpp (100%)
 rename {platform => libs/platform}/duration.cpp (100%)
 rename {platform => libs/platform}/duration.hpp (100%)
 rename {platform => libs/platform}/get_text_by_id.cpp (100%)
 rename {platform => libs/platform}/get_text_by_id.hpp (100%)
 rename {platform => libs/platform}/gui_thread.hpp (100%)
 rename {platform => libs/platform}/gui_thread_apple.mm (100%)
 rename {platform => libs/platform}/gui_thread_qt.cpp (100%)
 rename {platform => libs/platform}/http_client.cpp (100%)
 rename {platform => libs/platform}/http_client.hpp (100%)
 rename {platform => libs/platform}/http_client_apple.mm (100%)
 rename {platform => libs/platform}/http_client_curl.cpp (100%)
 rename {platform => libs/platform}/http_payload.cpp (100%)
 rename {platform => libs/platform}/http_payload.hpp (100%)
 rename {platform => libs/platform}/http_request.cpp (100%)
 rename {platform => libs/platform}/http_request.hpp (100%)
 rename {platform => libs/platform}/http_session_manager.h (100%)
 rename {platform => libs/platform}/http_session_manager.mm (100%)
 rename {platform => libs/platform}/http_thread_apple.h (100%)
 rename {platform => libs/platform}/http_thread_apple.mm (100%)
 rename {platform => libs/platform}/http_thread_callback.hpp (100%)
 rename {platform => libs/platform}/http_thread_qt.cpp (100%)
 rename {platform => libs/platform}/http_thread_qt.hpp (100%)
 rename {platform => libs/platform}/http_uploader.hpp (100%)
 rename {platform => libs/platform}/http_uploader_apple.mm (100%)
 rename {platform => libs/platform}/http_uploader_background.hpp (100%)
 rename {platform => libs/platform}/http_uploader_background.mm (100%)
 rename {platform => libs/platform}/http_uploader_background_dummy.cpp (100%)
 rename {platform => libs/platform}/http_uploader_dummy.cpp (100%)
 rename {platform => libs/platform}/languages.hpp (100%)
 rename {platform => libs/platform}/local_country_file.cpp (100%)
 rename {platform => libs/platform}/local_country_file.hpp (100%)
 rename {platform => libs/platform}/local_country_file_utils.cpp (100%)
 rename {platform => libs/platform}/local_country_file_utils.hpp (100%)
 rename {platform => libs/platform}/locale.hpp (100%)
 rename {platform => libs/platform}/locale.mm (100%)
 rename {platform => libs/platform}/locale_std.cpp (100%)
 rename {platform => libs/platform}/localization.cpp (100%)
 rename {platform => libs/platform}/localization.hpp (100%)
 rename {platform => libs/platform}/localization.mm (100%)
 rename {platform => libs/platform}/localization_dummy.cpp (100%)
 rename {platform => libs/platform}/location.hpp (100%)
 rename {platform => libs/platform}/location_service/CMakeLists.txt (100%)
 rename {platform => libs/platform}/location_service/apple_location_service.mm (100%)
 rename {platform => libs/platform}/location_service/location_service.cpp (100%)
 rename {platform => libs/platform}/location_service/location_service.hpp (100%)
 rename {platform => libs/platform}/location_service/qt_location_service.cpp (100%)
 rename {platform => libs/platform}/location_service/qt_location_service.hpp (100%)
 rename {platform => libs/platform}/measurement_utils.cpp (100%)
 rename {platform => libs/platform}/measurement_utils.hpp (100%)
 rename {platform => libs/platform}/mwm_traits.cpp (100%)
 rename {platform => libs/platform}/mwm_traits.hpp (100%)
 rename {platform => libs/platform}/mwm_version.cpp (100%)
 rename {platform => libs/platform}/mwm_version.hpp (100%)
 rename {platform => libs/platform}/network_policy.hpp (100%)
 rename {platform => libs/platform}/network_policy_dummy.cpp (100%)
 rename {platform => libs/platform}/network_policy_ios.h (100%)
 rename {platform => libs/platform}/network_policy_ios.mm (100%)
 rename {platform => libs/platform}/platform.cpp (100%)
 rename {platform => libs/platform}/platform.hpp (100%)
 rename {platform => libs/platform}/platform_android.cpp (100%)
 rename {platform => libs/platform}/platform_ios.h (100%)
 rename {platform => libs/platform}/platform_ios.mm (100%)
 rename {platform => libs/platform}/platform_linux.cpp (100%)
 rename {platform => libs/platform}/platform_mac.mm (100%)
 rename {platform => libs/platform}/platform_qt.cpp (100%)
 rename {platform => libs/platform}/platform_qt_version.cpp.in (100%)
 rename {platform => libs/platform}/platform_tests/CMakeLists.txt (100%)
 rename {platform => libs/platform}/platform_tests/country_file_tests.cpp (100%)
 rename {platform => libs/platform}/platform_tests/distance_tests.cpp (100%)
 rename {platform => libs/platform}/platform_tests/downloader_tests/downloader_test.cpp (100%)
 rename {platform => libs/platform}/platform_tests/downloader_utils_tests.cpp (100%)
 rename {platform => libs/platform}/platform_tests/duration_tests.cpp (100%)
 rename {platform => libs/platform}/platform_tests/get_text_by_id_tests.cpp (100%)
 rename {platform => libs/platform}/platform_tests/jansson_test.cpp (100%)
 rename {platform => libs/platform}/platform_tests/language_test.cpp (100%)
 rename {platform => libs/platform}/platform_tests/local_country_file_tests.cpp (100%)
 rename {platform => libs/platform}/platform_tests/location_test.cpp (100%)
 rename {platform => libs/platform}/platform_tests/measurement_tests.cpp (100%)
 rename {platform => libs/platform}/platform_tests/meta_config_tests.cpp (100%)
 rename {platform => libs/platform}/platform_tests/platform_test.cpp (100%)
 rename {platform => libs/platform}/platform_tests/products_tests.cpp (100%)
 rename {platform => libs/platform}/platform_tests/utm_mgrs_utils_tests.cpp (100%)
 rename {platform => libs/platform}/platform_tests_support/CMakeLists.txt (100%)
 rename {platform => libs/platform}/platform_tests_support/async_gui_thread.hpp (100%)
 rename {platform => libs/platform}/platform_tests_support/helpers.hpp (100%)
 rename {platform => libs/platform}/platform_tests_support/scoped_dir.cpp (100%)
 rename {platform => libs/platform}/platform_tests_support/scoped_dir.hpp (100%)
 rename {platform => libs/platform}/platform_tests_support/scoped_file.cpp (100%)
 rename {platform => libs/platform}/platform_tests_support/scoped_file.hpp (100%)
 rename {platform => libs/platform}/platform_tests_support/scoped_mwm.cpp (100%)
 rename {platform => libs/platform}/platform_tests_support/scoped_mwm.hpp (100%)
 rename {platform => libs/platform}/platform_tests_support/test_socket.cpp (100%)
 rename {platform => libs/platform}/platform_tests_support/test_socket.hpp (100%)
 rename {platform => libs/platform}/platform_tests_support/writable_dir_changer.cpp (100%)
 rename {platform => libs/platform}/platform_tests_support/writable_dir_changer.hpp (100%)
 rename {platform => libs/platform}/platform_unix_impl.cpp (100%)
 rename {platform => libs/platform}/platform_unix_impl.hpp (100%)
 rename {platform => libs/platform}/platform_win.cpp (100%)
 rename {platform => libs/platform}/preferred_languages.cpp (100%)
 rename {platform => libs/platform}/preferred_languages.hpp (100%)
 rename {platform => libs/platform}/products.cpp (100%)
 rename {platform => libs/platform}/products.hpp (100%)
 rename {platform => libs/platform}/remote_file.cpp (100%)
 rename {platform => libs/platform}/remote_file.hpp (100%)
 rename {platform => libs/platform}/safe_callback.hpp (100%)
 rename {platform => libs/platform}/secure_storage.hpp (100%)
 rename {platform => libs/platform}/secure_storage_dummy.cpp (100%)
 rename {platform => libs/platform}/secure_storage_ios.mm (100%)
 rename {platform => libs/platform}/secure_storage_qt.cpp (100%)
 rename {platform => libs/platform}/servers_list.cpp (100%)
 rename {platform => libs/platform}/servers_list.hpp (100%)
 rename {platform => libs/platform}/settings.cpp (100%)
 rename {platform => libs/platform}/settings.hpp (100%)
 rename {platform => libs/platform}/socket.hpp (100%)
 rename {platform => libs/platform}/socket_apple.mm (100%)
 rename {platform => libs/platform}/string_storage_base.cpp (100%)
 rename {platform => libs/platform}/string_storage_base.hpp (100%)
 rename {platform => libs/platform}/style_utils.hpp (100%)
 rename {platform => libs/platform}/trace.hpp (100%)
 rename {platform => libs/platform}/trace_android.cpp (100%)
 rename {platform => libs/platform}/utm_mgrs_utils.cpp (100%)
 rename {platform => libs/platform}/utm_mgrs_utils.hpp (100%)
 rename {pyhelpers => libs/pyhelpers}/CMakeLists.txt (100%)
 rename {pyhelpers => libs/pyhelpers}/__init__.py (100%)
 rename {pyhelpers => libs/pyhelpers}/module_version.hpp.in (100%)
 rename {pyhelpers => libs/pyhelpers}/pair.hpp (100%)
 rename {pyhelpers => libs/pyhelpers}/setup.py (100%)
 rename {pyhelpers => libs/pyhelpers}/specs/build.sh (100%)
 rename {pyhelpers => libs/pyhelpers}/specs/python35-mapsme-modules.spec (100%)
 rename {pyhelpers => libs/pyhelpers}/vector_list_conversion.hpp (100%)
 rename {pyhelpers => libs/pyhelpers}/vector_uint8.hpp (100%)
 rename {qt_tstfrm => libs/qt_tstfrm}/CMakeLists.txt (100%)
 rename {qt_tstfrm => libs/qt_tstfrm}/test_main_loop.cpp (100%)
 rename {qt_tstfrm => libs/qt_tstfrm}/test_main_loop.hpp (100%)
 rename {routing => libs/routing}/CMakeLists.txt (100%)
 rename {routing => libs/routing}/absent_regions_finder.cpp (100%)
 rename {routing => libs/routing}/absent_regions_finder.hpp (100%)
 rename {routing => libs/routing}/async_router.cpp (100%)
 rename {routing => libs/routing}/async_router.hpp (100%)
 rename {routing => libs/routing}/base/astar_algorithm.hpp (100%)
 rename {routing => libs/routing}/base/astar_graph.hpp (100%)
 rename {routing => libs/routing}/base/astar_progress.cpp (100%)
 rename {routing => libs/routing}/base/astar_progress.hpp (100%)
 rename {routing => libs/routing}/base/astar_vertex_data.hpp (100%)
 rename {routing => libs/routing}/base/astar_weight.hpp (100%)
 rename {routing => libs/routing}/base/bfs.hpp (100%)
 rename {routing => libs/routing}/base/followed_polyline.cpp (100%)
 rename {routing => libs/routing}/base/followed_polyline.hpp (100%)
 rename {routing => libs/routing}/base/routing_result.hpp (100%)
 rename {routing => libs/routing}/base/small_list.cpp (100%)
 rename {routing => libs/routing}/base/small_list.hpp (100%)
 rename {routing => libs/routing}/car_directions.cpp (100%)
 rename {routing => libs/routing}/car_directions.hpp (100%)
 rename {routing => libs/routing}/checkpoint_predictor.cpp (100%)
 rename {routing => libs/routing}/checkpoint_predictor.hpp (100%)
 rename {routing => libs/routing}/checkpoints.cpp (100%)
 rename {routing => libs/routing}/checkpoints.hpp (100%)
 rename {routing => libs/routing}/city_roads.cpp (100%)
 rename {routing => libs/routing}/city_roads.hpp (100%)
 rename {routing => libs/routing}/city_roads_serialization.hpp (100%)
 rename {routing => libs/routing}/coding.hpp (100%)
 rename {routing => libs/routing}/cross_border_graph.cpp (100%)
 rename {routing => libs/routing}/cross_border_graph.hpp (100%)
 rename {routing => libs/routing}/cross_mwm_connector.cpp (100%)
 rename {routing => libs/routing}/cross_mwm_connector.hpp (100%)
 rename {routing => libs/routing}/cross_mwm_connector_serialization.hpp (100%)
 rename {routing => libs/routing}/cross_mwm_graph.cpp (100%)
 rename {routing => libs/routing}/cross_mwm_graph.hpp (100%)
 rename {routing => libs/routing}/cross_mwm_ids.hpp (100%)
 rename {routing => libs/routing}/cross_mwm_index_graph.hpp (100%)
 rename {routing => libs/routing}/data_source.hpp (100%)
 rename {routing => libs/routing}/directions_engine.cpp (100%)
 rename {routing => libs/routing}/directions_engine.hpp (100%)
 rename {routing => libs/routing}/directions_engine_helpers.cpp (100%)
 rename {routing => libs/routing}/directions_engine_helpers.hpp (100%)
 rename {routing => libs/routing}/dummy_world_graph.hpp (100%)
 rename {routing => libs/routing}/edge_estimator.cpp (100%)
 rename {routing => libs/routing}/edge_estimator.hpp (100%)
 rename {routing => libs/routing}/fake_edges_container.hpp (100%)
 rename {routing => libs/routing}/fake_ending.cpp (100%)
 rename {routing => libs/routing}/fake_ending.hpp (100%)
 rename {routing => libs/routing}/fake_feature_ids.hpp (100%)
 rename {routing => libs/routing}/fake_graph.cpp (100%)
 rename {routing => libs/routing}/fake_graph.hpp (100%)
 rename {routing => libs/routing}/fake_vertex.hpp (100%)
 rename {routing => libs/routing}/features_road_graph.cpp (100%)
 rename {routing => libs/routing}/features_road_graph.hpp (100%)
 rename {routing => libs/routing}/following_info.hpp (100%)
 rename {routing => libs/routing}/geometry.cpp (100%)
 rename {routing => libs/routing}/geometry.hpp (100%)
 rename {routing => libs/routing}/guides_connections.cpp (100%)
 rename {routing => libs/routing}/guides_connections.hpp (100%)
 rename {routing => libs/routing}/guides_graph.cpp (100%)
 rename {routing => libs/routing}/guides_graph.hpp (100%)
 rename {routing => libs/routing}/index_graph.cpp (100%)
 rename {routing => libs/routing}/index_graph.hpp (100%)
 rename {routing => libs/routing}/index_graph_loader.cpp (100%)
 rename {routing => libs/routing}/index_graph_loader.hpp (100%)
 rename {routing => libs/routing}/index_graph_serialization.cpp (100%)
 rename {routing => libs/routing}/index_graph_serialization.hpp (100%)
 rename {routing => libs/routing}/index_graph_starter.cpp (100%)
 rename {routing => libs/routing}/index_graph_starter.hpp (100%)
 rename {routing => libs/routing}/index_graph_starter_joints.hpp (100%)
 rename {routing => libs/routing}/index_road_graph.cpp (100%)
 rename {routing => libs/routing}/index_road_graph.hpp (100%)
 rename {routing => libs/routing}/index_router.cpp (100%)
 rename {routing => libs/routing}/index_router.hpp (100%)
 rename {routing => libs/routing}/joint.cpp (100%)
 rename {routing => libs/routing}/joint.hpp (100%)
 rename {routing => libs/routing}/joint_index.cpp (100%)
 rename {routing => libs/routing}/joint_index.hpp (100%)
 rename {routing => libs/routing}/joint_segment.cpp (100%)
 rename {routing => libs/routing}/joint_segment.hpp (100%)
 rename {routing => libs/routing}/junction_visitor.cpp (100%)
 rename {routing => libs/routing}/junction_visitor.hpp (100%)
 rename {routing => libs/routing}/latlon_with_altitude.cpp (100%)
 rename {routing => libs/routing}/latlon_with_altitude.hpp (100%)
 rename {routing => libs/routing}/leaps_graph.cpp (100%)
 rename {routing => libs/routing}/leaps_graph.hpp (100%)
 rename {routing => libs/routing}/leaps_postprocessor.cpp (100%)
 rename {routing => libs/routing}/leaps_postprocessor.hpp (100%)
 rename {routing => libs/routing}/loaded_path_segment.hpp (100%)
 rename {routing => libs/routing}/maxspeeds.cpp (100%)
 rename {routing => libs/routing}/maxspeeds.hpp (100%)
 rename {routing => libs/routing}/maxspeeds_serialization.cpp (100%)
 rename {routing => libs/routing}/maxspeeds_serialization.hpp (100%)
 rename {routing => libs/routing}/mwm_hierarchy_handler.cpp (100%)
 rename {routing => libs/routing}/mwm_hierarchy_handler.hpp (100%)
 rename {routing => libs/routing}/nearest_edge_finder.cpp (100%)
 rename {routing => libs/routing}/nearest_edge_finder.hpp (100%)
 rename {routing => libs/routing}/opening_hours_serdes.cpp (100%)
 rename {routing => libs/routing}/opening_hours_serdes.hpp (100%)
 rename {routing => libs/routing}/pedestrian_directions.cpp (100%)
 rename {routing => libs/routing}/pedestrian_directions.hpp (100%)
 rename {routing => libs/routing}/position_accumulator.cpp (100%)
 rename {routing => libs/routing}/position_accumulator.hpp (100%)
 rename {routing => libs/routing}/regions_decl.hpp (100%)
 rename {routing => libs/routing}/regions_router.cpp (100%)
 rename {routing => libs/routing}/regions_router.hpp (100%)
 rename {routing => libs/routing}/regions_sparse_graph.cpp (100%)
 rename {routing => libs/routing}/regions_sparse_graph.hpp (100%)
 rename {routing => libs/routing}/restriction_loader.cpp (100%)
 rename {routing => libs/routing}/restriction_loader.hpp (100%)
 rename {routing => libs/routing}/restrictions_serialization.cpp (100%)
 rename {routing => libs/routing}/restrictions_serialization.hpp (100%)
 rename {routing => libs/routing}/road_access.cpp (100%)
 rename {routing => libs/routing}/road_access.hpp (100%)
 rename {routing => libs/routing}/road_access_serialization.cpp (100%)
 rename {routing => libs/routing}/road_access_serialization.hpp (100%)
 rename {routing => libs/routing}/road_graph.cpp (100%)
 rename {routing => libs/routing}/road_graph.hpp (100%)
 rename {routing => libs/routing}/road_index.cpp (100%)
 rename {routing => libs/routing}/road_index.hpp (100%)
 rename {routing => libs/routing}/road_point.hpp (100%)
 rename {routing => libs/routing}/route.cpp (100%)
 rename {routing => libs/routing}/route.hpp (100%)
 rename {routing => libs/routing}/route_point.hpp (100%)
 rename {routing => libs/routing}/route_weight.cpp (100%)
 rename {routing => libs/routing}/route_weight.hpp (100%)
 rename {routing => libs/routing}/router.cpp (100%)
 rename {routing => libs/routing}/router.hpp (100%)
 rename {routing => libs/routing}/router_delegate.cpp (100%)
 rename {routing => libs/routing}/router_delegate.hpp (100%)
 rename {routing => libs/routing}/routes_builder/CMakeLists.txt (100%)
 rename {routing => libs/routing}/routes_builder/data_source_storage.cpp (100%)
 rename {routing => libs/routing}/routes_builder/data_source_storage.hpp (100%)
 rename {routing => libs/routing}/routes_builder/routes_builder.cpp (100%)
 rename {routing => libs/routing}/routes_builder/routes_builder.hpp (100%)
 rename {routing => libs/routing}/routes_builder/routes_builder_tool/CMakeLists.txt (100%)
 rename {routing => libs/routing}/routes_builder/routes_builder_tool/routes_builder_tool.cpp (100%)
 rename {routing => libs/routing}/routes_builder/routes_builder_tool/utils.cpp (100%)
 rename {routing => libs/routing}/routes_builder/routes_builder_tool/utils.hpp (100%)
 rename {routing => libs/routing}/routing_benchmarks/CMakeLists.txt (100%)
 rename {routing => libs/routing}/routing_benchmarks/bicycle_routing_tests.cpp (100%)
 rename {routing => libs/routing}/routing_benchmarks/car_routing_tests.cpp (100%)
 rename {routing => libs/routing}/routing_benchmarks/helpers.cpp (100%)
 rename {routing => libs/routing}/routing_benchmarks/helpers.hpp (100%)
 rename {routing => libs/routing}/routing_benchmarks/pedestrian_routing_tests.cpp (100%)
 rename {routing => libs/routing}/routing_callbacks.hpp (100%)
 rename {routing => libs/routing}/routing_consistency_tests/CMakeLists.txt (100%)
 rename {routing => libs/routing}/routing_consistency_tests/routing_consistency_tests.cpp (100%)
 rename {routing => libs/routing}/routing_exceptions.hpp (100%)
 rename {routing => libs/routing}/routing_helpers.cpp (100%)
 rename {routing => libs/routing}/routing_helpers.hpp (100%)
 rename {routing => libs/routing}/routing_integration_tests/CMakeLists.txt (100%)
 rename {routing => libs/routing}/routing_integration_tests/absent_regions_finder_tests.cpp (100%)
 rename {routing => libs/routing}/routing_integration_tests/archival_reporter_tests.cpp (100%)
 rename {routing => libs/routing}/routing_integration_tests/bicycle_route_test.cpp (100%)
 rename {routing => libs/routing}/routing_integration_tests/bicycle_turn_test.cpp (100%)
 rename {routing => libs/routing}/routing_integration_tests/concurrent_feature_parsing_test.cpp (100%)
 rename {routing => libs/routing}/routing_integration_tests/cross_country_routing_tests.cpp (100%)
 rename {routing => libs/routing}/routing_integration_tests/get_altitude_test.cpp (100%)
 rename {routing => libs/routing}/routing_integration_tests/guides_tests.cpp (100%)
 rename {routing => libs/routing}/routing_integration_tests/pedestrian_route_test.cpp (100%)
 rename {routing => libs/routing}/routing_integration_tests/road_graph_tests.cpp (100%)
 rename {routing => libs/routing}/routing_integration_tests/roundabouts_tests.cpp (100%)
 rename {routing => libs/routing}/routing_integration_tests/route_test.cpp (100%)
 rename {routing => libs/routing}/routing_integration_tests/routing_test_tools.cpp (100%)
 rename {routing => libs/routing}/routing_integration_tests/routing_test_tools.hpp (100%)
 rename {routing => libs/routing}/routing_integration_tests/small_routes.cpp (100%)
 rename {routing => libs/routing}/routing_integration_tests/speed_camera_notifications_tests.cpp (100%)
 rename {routing => libs/routing}/routing_integration_tests/street_names_test.cpp (100%)
 rename {routing => libs/routing}/routing_integration_tests/transit_route_test.cpp (100%)
 rename {routing => libs/routing}/routing_integration_tests/turn_test.cpp (100%)
 rename {routing => libs/routing}/routing_options.cpp (100%)
 rename {routing => libs/routing}/routing_options.hpp (100%)
 rename {routing => libs/routing}/routing_quality/CMakeLists.txt (100%)
 rename {routing => libs/routing}/routing_quality/api/CMakeLists.txt (100%)
 rename {routing => libs/routing}/routing_quality/api/api.cpp (100%)
 rename {routing => libs/routing}/routing_quality/api/api.hpp (100%)
 rename {routing => libs/routing}/routing_quality/api/google/google_api.cpp (100%)
 rename {routing => libs/routing}/routing_quality/api/google/google_api.hpp (100%)
 rename {routing => libs/routing}/routing_quality/api/google/types.cpp (100%)
 rename {routing => libs/routing}/routing_quality/api/google/types.hpp (100%)
 rename {routing => libs/routing}/routing_quality/api/mapbox/mapbox_api.cpp (100%)
 rename {routing => libs/routing}/routing_quality/api/mapbox/mapbox_api.hpp (100%)
 rename {routing => libs/routing}/routing_quality/api/mapbox/types.hpp (100%)
 rename {routing => libs/routing}/routing_quality/routing_quality_tests/CMakeLists.txt (100%)
 rename {routing => libs/routing}/routing_quality/routing_quality_tests/barriers_tests.cpp (100%)
 rename {routing => libs/routing}/routing_quality/routing_quality_tests/bigger_roads_tests.cpp (100%)
 rename {routing => libs/routing}/routing_quality/routing_quality_tests/ferry_tests.cpp (100%)
 rename {routing => libs/routing}/routing_quality/routing_quality_tests/is_built_tests.cpp (100%)
 rename {routing => libs/routing}/routing_quality/routing_quality_tests/leaps_postprocessing_tests.cpp (100%)
 rename {routing => libs/routing}/routing_quality/routing_quality_tests/passby_roads_tests.cpp (100%)
 rename {routing => libs/routing}/routing_quality/routing_quality_tests/waypoints_tests.cpp (100%)
 rename {routing => libs/routing}/routing_quality/routing_quality_tool/CMakeLists.txt (100%)
 rename {routing => libs/routing}/routing_quality/routing_quality_tool/benchmark_results.cpp (100%)
 rename {routing => libs/routing}/routing_quality/routing_quality_tool/benchmark_results.hpp (100%)
 rename {routing => libs/routing}/routing_quality/routing_quality_tool/benchmark_stat.cpp (100%)
 rename {routing => libs/routing}/routing_quality/routing_quality_tool/benchmark_stat.hpp (100%)
 rename {routing => libs/routing}/routing_quality/routing_quality_tool/error_type_counter.cpp (100%)
 rename {routing => libs/routing}/routing_quality/routing_quality_tool/error_type_counter.hpp (100%)
 rename {routing => libs/routing}/routing_quality/routing_quality_tool/routing_quality_tool.cpp (100%)
 rename {routing => libs/routing}/routing_quality/routing_quality_tool/utils.cpp (100%)
 rename {routing => libs/routing}/routing_quality/routing_quality_tool/utils.hpp (100%)
 rename {routing => libs/routing}/routing_quality/waypoints.cpp (100%)
 rename {routing => libs/routing}/routing_quality/waypoints.hpp (100%)
 rename {routing => libs/routing}/routing_result_graph.hpp (100%)
 rename {routing => libs/routing}/routing_session.cpp (100%)
 rename {routing => libs/routing}/routing_session.hpp (100%)
 rename {routing => libs/routing}/routing_settings.cpp (100%)
 rename {routing => libs/routing}/routing_settings.hpp (100%)
 rename {routing => libs/routing}/routing_tests/CMakeLists.txt (100%)
 rename {routing => libs/routing}/routing_tests/applying_traffic_test.cpp (100%)
 rename {routing => libs/routing}/routing_tests/astar_algorithm_test.cpp (100%)
 rename {routing => libs/routing}/routing_tests/astar_progress_test.cpp (100%)
 rename {routing => libs/routing}/routing_tests/astar_router_test.cpp (100%)
 rename {routing => libs/routing}/routing_tests/async_router_test.cpp (100%)
 rename {routing => libs/routing}/routing_tests/bfs_tests.cpp (100%)
 rename {routing => libs/routing}/routing_tests/checkpoint_predictor_test.cpp (100%)
 rename {routing => libs/routing}/routing_tests/coding_test.cpp (100%)
 rename {routing => libs/routing}/routing_tests/cross_border_graph_tests.cpp (100%)
 rename {routing => libs/routing}/routing_tests/cross_mwm_connector_test.cpp (100%)
 rename {routing => libs/routing}/routing_tests/cumulative_restriction_test.cpp (100%)
 rename {routing => libs/routing}/routing_tests/edge_estimator_tests.cpp (100%)
 rename {routing => libs/routing}/routing_tests/fake_graph_test.cpp (100%)
 rename {routing => libs/routing}/routing_tests/followed_polyline_test.cpp (100%)
 rename {routing => libs/routing}/routing_tests/guides_tests.cpp (100%)
 rename {routing => libs/routing}/routing_tests/index_graph_test.cpp (100%)
 rename {routing => libs/routing}/routing_tests/index_graph_tools.cpp (100%)
 rename {routing => libs/routing}/routing_tests/index_graph_tools.hpp (100%)
 rename {routing => libs/routing}/routing_tests/maxspeeds_tests.cpp (100%)
 rename {routing => libs/routing}/routing_tests/mwm_hierarchy_test.cpp (100%)
 rename {routing => libs/routing}/routing_tests/nearest_edge_finder_tests.cpp (100%)
 rename {routing => libs/routing}/routing_tests/opening_hours_serdes_tests.cpp (100%)
 rename {routing => libs/routing}/routing_tests/position_accumulator_tests.cpp (100%)
 rename {routing => libs/routing}/routing_tests/restriction_test.cpp (100%)
 rename {routing => libs/routing}/routing_tests/road_access_test.cpp (100%)
 rename {routing => libs/routing}/routing_tests/road_graph_builder.cpp (100%)
 rename {routing => libs/routing}/routing_tests/road_graph_builder.hpp (100%)
 rename {routing => libs/routing}/routing_tests/road_graph_nearest_edges_test.cpp (100%)
 rename {routing => libs/routing}/routing_tests/route_tests.cpp (100%)
 rename {routing => libs/routing}/routing_tests/routing_algorithm.cpp (100%)
 rename {routing => libs/routing}/routing_tests/routing_algorithm.hpp (100%)
 rename {routing => libs/routing}/routing_tests/routing_helpers_tests.cpp (100%)
 rename {routing => libs/routing}/routing_tests/routing_options_tests.cpp (100%)
 rename {routing => libs/routing}/routing_tests/routing_session_test.cpp (100%)
 rename {routing => libs/routing}/routing_tests/speed_cameras_tests.cpp (100%)
 rename {routing => libs/routing}/routing_tests/tools.cpp (100%)
 rename {routing => libs/routing}/routing_tests/tools.hpp (100%)
 rename {routing => libs/routing}/routing_tests/turns_generator_test.cpp (100%)
 rename {routing => libs/routing}/routing_tests/turns_sound_test.cpp (100%)
 rename {routing => libs/routing}/routing_tests/turns_tts_text_tests.cpp (100%)
 rename {routing => libs/routing}/routing_tests/uturn_restriction_tests.cpp (100%)
 rename {routing => libs/routing}/routing_tests/world_graph_builder.cpp (100%)
 rename {routing => libs/routing}/routing_tests/world_graph_builder.hpp (100%)
 rename {routing => libs/routing}/ruler_router.cpp (100%)
 rename {routing => libs/routing}/ruler_router.hpp (100%)
 rename {routing => libs/routing}/segment.cpp (100%)
 rename {routing => libs/routing}/segment.hpp (100%)
 rename {routing => libs/routing}/segmented_route.cpp (100%)
 rename {routing => libs/routing}/segmented_route.hpp (100%)
 rename {routing => libs/routing}/single_vehicle_world_graph.cpp (100%)
 rename {routing => libs/routing}/single_vehicle_world_graph.hpp (100%)
 rename {routing => libs/routing}/speed_camera.cpp (100%)
 rename {routing => libs/routing}/speed_camera.hpp (100%)
 rename {routing => libs/routing}/speed_camera_manager.cpp (100%)
 rename {routing => libs/routing}/speed_camera_manager.hpp (100%)
 rename {routing => libs/routing}/speed_camera_prohibition.cpp (100%)
 rename {routing => libs/routing}/speed_camera_prohibition.hpp (100%)
 rename {routing => libs/routing}/speed_camera_ser_des.cpp (100%)
 rename {routing => libs/routing}/speed_camera_ser_des.hpp (100%)
 rename {routing => libs/routing}/traffic_stash.cpp (100%)
 rename {routing => libs/routing}/traffic_stash.hpp (100%)
 rename {routing => libs/routing}/transit_graph.cpp (100%)
 rename {routing => libs/routing}/transit_graph.hpp (100%)
 rename {routing => libs/routing}/transit_graph_loader.cpp (100%)
 rename {routing => libs/routing}/transit_graph_loader.hpp (100%)
 rename {routing => libs/routing}/transit_info.hpp (100%)
 rename {routing => libs/routing}/transit_world_graph.cpp (100%)
 rename {routing => libs/routing}/transit_world_graph.hpp (100%)
 rename {routing => libs/routing}/turn_candidate.hpp (100%)
 rename {routing => libs/routing}/turns.cpp (100%)
 rename {routing => libs/routing}/turns.hpp (100%)
 rename {routing => libs/routing}/turns_generator.cpp (100%)
 rename {routing => libs/routing}/turns_generator.hpp (100%)
 rename {routing => libs/routing}/turns_generator_utils.cpp (100%)
 rename {routing => libs/routing}/turns_generator_utils.hpp (100%)
 rename {routing => libs/routing}/turns_notification_manager.cpp (100%)
 rename {routing => libs/routing}/turns_notification_manager.hpp (100%)
 rename {routing => libs/routing}/turns_sound_settings.cpp (100%)
 rename {routing => libs/routing}/turns_sound_settings.hpp (100%)
 rename {routing => libs/routing}/turns_tts_text.cpp (100%)
 rename {routing => libs/routing}/turns_tts_text.hpp (100%)
 rename {routing => libs/routing}/turns_tts_text_i18n.cpp (100%)
 rename {routing => libs/routing}/turns_tts_text_i18n.hpp (100%)
 rename {routing => libs/routing}/vehicle_mask.cpp (100%)
 rename {routing => libs/routing}/vehicle_mask.hpp (100%)
 rename {routing => libs/routing}/world_graph.cpp (100%)
 rename {routing => libs/routing}/world_graph.hpp (100%)
 rename {routing_common => libs/routing_common}/CMakeLists.txt (100%)
 rename {routing_common => libs/routing_common}/bicycle_model.cpp (100%)
 rename {routing_common => libs/routing_common}/bicycle_model.hpp (100%)
 rename {routing_common => libs/routing_common}/car_model.cpp (100%)
 rename {routing_common => libs/routing_common}/car_model.hpp (100%)
 rename {routing_common => libs/routing_common}/car_model_coefs.hpp (100%)
 rename {routing_common => libs/routing_common}/maxspeed_conversion.cpp (100%)
 rename {routing_common => libs/routing_common}/maxspeed_conversion.hpp (100%)
 rename {routing_common => libs/routing_common}/num_mwm_id.hpp (100%)
 rename {routing_common => libs/routing_common}/pedestrian_model.cpp (100%)
 rename {routing_common => libs/routing_common}/pedestrian_model.hpp (100%)
 rename {routing_common => libs/routing_common}/routing_common_tests/CMakeLists.txt (100%)
 rename {routing_common => libs/routing_common}/routing_common_tests/bicycle_model_test.cpp (100%)
 rename {routing_common => libs/routing_common}/routing_common_tests/vehicle_model_for_country_test.cpp (100%)
 rename {routing_common => libs/routing_common}/routing_common_tests/vehicle_model_test.cpp (100%)
 rename {routing_common => libs/routing_common}/vehicle_model.cpp (100%)
 rename {routing_common => libs/routing_common}/vehicle_model.hpp (100%)
 rename {search => libs/search}/CMakeLists.txt (100%)
 rename {search => libs/search}/algos.hpp (100%)
 rename {search => libs/search}/approximate_string_match.cpp (100%)
 rename {search => libs/search}/approximate_string_match.hpp (100%)
 rename {search => libs/search}/base/inverted_list.hpp (100%)
 rename {search => libs/search}/base/mem_search_index.hpp (100%)
 rename {search => libs/search}/base/text_index/dictionary.hpp (100%)
 rename {search => libs/search}/base/text_index/header.cpp (100%)
 rename {search => libs/search}/base/text_index/header.hpp (100%)
 rename {search => libs/search}/base/text_index/mem.cpp (100%)
 rename {search => libs/search}/base/text_index/mem.hpp (100%)
 rename {search => libs/search}/base/text_index/merger.cpp (100%)
 rename {search => libs/search}/base/text_index/merger.hpp (100%)
 rename {search => libs/search}/base/text_index/postings.hpp (100%)
 rename {search => libs/search}/base/text_index/reader.hpp (100%)
 rename {search => libs/search}/base/text_index/text_index.cpp (100%)
 rename {search => libs/search}/base/text_index/text_index.hpp (100%)
 rename {search => libs/search}/base/text_index/utils.hpp (100%)
 rename {search => libs/search}/bookmarks/data.cpp (100%)
 rename {search => libs/search}/bookmarks/data.hpp (100%)
 rename {search => libs/search}/bookmarks/processor.cpp (100%)
 rename {search => libs/search}/bookmarks/processor.hpp (100%)
 rename {search => libs/search}/bookmarks/results.hpp (100%)
 rename {search => libs/search}/bookmarks/types.cpp (100%)
 rename {search => libs/search}/bookmarks/types.hpp (100%)
 rename {search => libs/search}/cancel_exception.hpp (100%)
 rename {search => libs/search}/categories_cache.cpp (100%)
 rename {search => libs/search}/categories_cache.hpp (100%)
 rename {search => libs/search}/categories_set.hpp (100%)
 rename {search => libs/search}/cbv.cpp (100%)
 rename {search => libs/search}/cbv.hpp (100%)
 rename {search => libs/search}/cities_boundaries_table.cpp (100%)
 rename {search => libs/search}/cities_boundaries_table.hpp (100%)
 rename {search => libs/search}/city_finder.cpp (100%)
 rename {search => libs/search}/city_finder.hpp (100%)
 rename {search => libs/search}/common.hpp (100%)
 rename {search => libs/search}/cuisine_filter.cpp (100%)
 rename {search => libs/search}/cuisine_filter.hpp (100%)
 rename {search => libs/search}/displayed_categories.cpp (100%)
 rename {search => libs/search}/displayed_categories.hpp (100%)
 rename {search => libs/search}/doc_vec.cpp (100%)
 rename {search => libs/search}/doc_vec.hpp (100%)
 rename {search => libs/search}/downloader_search_callback.cpp (100%)
 rename {search => libs/search}/downloader_search_callback.hpp (100%)
 rename {search => libs/search}/dummy_rank_table.cpp (100%)
 rename {search => libs/search}/dummy_rank_table.hpp (100%)
 rename {search => libs/search}/editor_delegate.cpp (100%)
 rename {search => libs/search}/editor_delegate.hpp (100%)
 rename {search => libs/search}/emitter.hpp (100%)
 rename {search => libs/search}/engine.cpp (100%)
 rename {search => libs/search}/engine.hpp (100%)
 rename {search => libs/search}/feature_loader.cpp (100%)
 rename {search => libs/search}/feature_loader.hpp (100%)
 rename {search => libs/search}/feature_offset_match.hpp (100%)
 rename {search => libs/search}/features_filter.cpp (100%)
 rename {search => libs/search}/features_filter.hpp (100%)
 rename {search => libs/search}/features_layer.cpp (100%)
 rename {search => libs/search}/features_layer.hpp (100%)
 rename {search => libs/search}/features_layer_matcher.cpp (100%)
 rename {search => libs/search}/features_layer_matcher.hpp (100%)
 rename {search => libs/search}/features_layer_path_finder.cpp (100%)
 rename {search => libs/search}/features_layer_path_finder.hpp (100%)
 rename {search => libs/search}/filtering_params.hpp (100%)
 rename {search => libs/search}/geocoder.cpp (100%)
 rename {search => libs/search}/geocoder.hpp (100%)
 rename {search => libs/search}/geocoder_context.cpp (100%)
 rename {search => libs/search}/geocoder_context.hpp (100%)
 rename {search => libs/search}/geocoder_locality.cpp (100%)
 rename {search => libs/search}/geocoder_locality.hpp (100%)
 rename {search => libs/search}/geometry_cache.cpp (100%)
 rename {search => libs/search}/geometry_cache.hpp (100%)
 rename {search => libs/search}/geometry_utils.cpp (100%)
 rename {search => libs/search}/geometry_utils.hpp (100%)
 rename {search => libs/search}/highlighting.cpp (100%)
 rename {search => libs/search}/highlighting.hpp (100%)
 rename {search => libs/search}/house_detector.cpp (100%)
 rename {search => libs/search}/house_detector.hpp (100%)
 rename {search => libs/search}/house_numbers_matcher.cpp (100%)
 rename {search => libs/search}/house_numbers_matcher.hpp (100%)
 rename {search => libs/search}/house_to_street_table.cpp (100%)
 rename {search => libs/search}/house_to_street_table.hpp (100%)
 rename {search => libs/search}/idf_map.cpp (100%)
 rename {search => libs/search}/idf_map.hpp (100%)
 rename {search => libs/search}/intermediate_result.cpp (100%)
 rename {search => libs/search}/intermediate_result.hpp (100%)
 rename {search => libs/search}/intersection_result.cpp (100%)
 rename {search => libs/search}/intersection_result.hpp (100%)
 rename {search => libs/search}/interval_set.hpp (100%)
 rename {search => libs/search}/keyword_lang_matcher.cpp (100%)
 rename {search => libs/search}/keyword_lang_matcher.hpp (100%)
 rename {search => libs/search}/keyword_matcher.cpp (100%)
 rename {search => libs/search}/keyword_matcher.hpp (100%)
 rename {search => libs/search}/latlon_match.cpp (100%)
 rename {search => libs/search}/latlon_match.hpp (100%)
 rename {search => libs/search}/lazy_centers_table.cpp (100%)
 rename {search => libs/search}/lazy_centers_table.hpp (100%)
 rename {search => libs/search}/localities_source.cpp (100%)
 rename {search => libs/search}/localities_source.hpp (100%)
 rename {search => libs/search}/locality_finder.cpp (100%)
 rename {search => libs/search}/locality_finder.hpp (100%)
 rename {search => libs/search}/locality_scorer.cpp (100%)
 rename {search => libs/search}/locality_scorer.hpp (100%)
 rename {search => libs/search}/mode.cpp (100%)
 rename {search => libs/search}/mode.hpp (100%)
 rename {search => libs/search}/model.cpp (100%)
 rename {search => libs/search}/model.hpp (100%)
 rename {search => libs/search}/mwm_context.cpp (100%)
 rename {search => libs/search}/mwm_context.hpp (100%)
 rename {search => libs/search}/nested_rects_cache.cpp (100%)
 rename {search => libs/search}/nested_rects_cache.hpp (100%)
 rename {search => libs/search}/point_rect_matcher.hpp (100%)
 rename {search => libs/search}/postcode_points.cpp (100%)
 rename {search => libs/search}/postcode_points.hpp (100%)
 rename {search => libs/search}/pre_ranker.cpp (100%)
 rename {search => libs/search}/pre_ranker.hpp (100%)
 rename {search => libs/search}/pre_ranking_info.cpp (100%)
 rename {search => libs/search}/pre_ranking_info.hpp (100%)
 rename {search => libs/search}/processor.cpp (100%)
 rename {search => libs/search}/processor.hpp (100%)
 rename {search => libs/search}/projection_on_street.cpp (100%)
 rename {search => libs/search}/projection_on_street.hpp (100%)
 rename {search => libs/search}/pysearch/CMakeLists.txt (100%)
 rename {search => libs/search}/pysearch/README.txt (100%)
 rename {search => libs/search}/pysearch/bindings.cpp (100%)
 rename {search => libs/search}/pysearch/run_search_engine.py (100%)
 rename {search => libs/search}/pysearch/run_search_server.py (100%)
 rename {search => libs/search}/pysearch/setup.py (100%)
 rename {search => libs/search}/query_params.cpp (100%)
 rename {search => libs/search}/query_params.hpp (100%)
 rename {search => libs/search}/query_saver.cpp (100%)
 rename {search => libs/search}/query_saver.hpp (100%)
 rename {search => libs/search}/ranker.cpp (100%)
 rename {search => libs/search}/ranker.hpp (100%)
 rename {search => libs/search}/ranking_info.cpp (100%)
 rename {search => libs/search}/ranking_info.hpp (100%)
 rename {search => libs/search}/ranking_utils.cpp (100%)
 rename {search => libs/search}/ranking_utils.hpp (100%)
 rename {search => libs/search}/region_address_getter.cpp (100%)
 rename {search => libs/search}/region_address_getter.hpp (100%)
 rename {search => libs/search}/region_info_getter.cpp (100%)
 rename {search => libs/search}/region_info_getter.hpp (100%)
 rename {search => libs/search}/result.cpp (100%)
 rename {search => libs/search}/result.hpp (100%)
 rename {search => libs/search}/retrieval.cpp (100%)
 rename {search => libs/search}/retrieval.hpp (100%)
 rename {search => libs/search}/reverse_geocoder.cpp (100%)
 rename {search => libs/search}/reverse_geocoder.hpp (100%)
 rename {search => libs/search}/search_index_header.hpp (100%)
 rename {search => libs/search}/search_index_values.hpp (100%)
 rename {search => libs/search}/search_integration_tests/CMakeLists.txt (100%)
 rename {search => libs/search}/search_integration_tests/downloader_search_test.cpp (100%)
 rename {search => libs/search}/search_integration_tests/generate_tests.cpp (100%)
 rename {search => libs/search}/search_integration_tests/postcode_points_tests.cpp (100%)
 rename {search => libs/search}/search_integration_tests/pre_ranker_test.cpp (100%)
 rename {search => libs/search}/search_integration_tests/processor_test.cpp (100%)
 rename {search => libs/search}/search_integration_tests/ranker_test.cpp (100%)
 rename {search => libs/search}/search_integration_tests/search_edited_features_test.cpp (100%)
 rename {search => libs/search}/search_integration_tests/smoke_test.cpp (100%)
 rename {search => libs/search}/search_integration_tests/tracer_tests.cpp (100%)
 rename {search => libs/search}/search_integration_tests/utils_test.cpp (100%)
 rename {search => libs/search}/search_params.cpp (100%)
 rename {search => libs/search}/search_params.hpp (100%)
 rename {search => libs/search}/search_quality/CMakeLists.txt (100%)
 rename {search => libs/search}/search_quality/README.txt (100%)
 rename {search => libs/search}/search_quality/assessment_tool/CMakeLists.txt (100%)
 rename {openlr/openlr_match_quality/openlr_assessment_tool => libs/search/search_quality/assessment_tool}/Info.plist (100%)
 rename {search => libs/search}/search_quality/assessment_tool/assessment_tool.cpp (100%)
 rename {search => libs/search}/search_quality/assessment_tool/context.cpp (100%)
 rename {search => libs/search}/search_quality/assessment_tool/context.hpp (100%)
 rename {search => libs/search}/search_quality/assessment_tool/edits.cpp (100%)
 rename {search => libs/search}/search_quality/assessment_tool/edits.hpp (100%)
 rename {search => libs/search}/search_quality/assessment_tool/feature_info_dialog.cpp (100%)
 rename {search => libs/search}/search_quality/assessment_tool/feature_info_dialog.hpp (100%)
 rename {search => libs/search}/search_quality/assessment_tool/helpers.cpp (100%)
 rename {search => libs/search}/search_quality/assessment_tool/helpers.hpp (100%)
 rename {search => libs/search}/search_quality/assessment_tool/main_model.cpp (100%)
 rename {search => libs/search}/search_quality/assessment_tool/main_model.hpp (100%)
 rename {search => libs/search}/search_quality/assessment_tool/main_view.cpp (100%)
 rename {search => libs/search}/search_quality/assessment_tool/main_view.hpp (100%)
 rename {search => libs/search}/search_quality/assessment_tool/model.hpp (100%)
 rename {search => libs/search}/search_quality/assessment_tool/result_view.cpp (100%)
 rename {search => libs/search}/search_quality/assessment_tool/result_view.hpp (100%)
 rename {search => libs/search}/search_quality/assessment_tool/results_view.cpp (100%)
 rename {search => libs/search}/search_quality/assessment_tool/results_view.hpp (100%)
 rename {search => libs/search}/search_quality/assessment_tool/sample_view.cpp (100%)
 rename {search => libs/search}/search_quality/assessment_tool/sample_view.hpp (100%)
 rename {search => libs/search}/search_quality/assessment_tool/samples_view.cpp (100%)
 rename {search => libs/search}/search_quality/assessment_tool/samples_view.hpp (100%)
 rename {search => libs/search}/search_quality/assessment_tool/search_request_runner.cpp (100%)
 rename {search => libs/search}/search_quality/assessment_tool/search_request_runner.hpp (100%)
 rename {search => libs/search}/search_quality/assessment_tool/view.hpp (100%)
 rename {search => libs/search}/search_quality/clusterize-tag-values.lisp (100%)
 rename {search => libs/search}/search_quality/download-maps.sh (100%)
 rename {search => libs/search}/search_quality/features_collector_tool/CMakeLists.txt (100%)
 rename {search => libs/search}/search_quality/features_collector_tool/features_collector_tool.cpp (100%)
 rename {search => libs/search}/search_quality/gen-samples.lisp (100%)
 rename {search => libs/search}/search_quality/helpers.cpp (100%)
 rename {search => libs/search}/search_quality/helpers.hpp (100%)
 rename {search => libs/search}/search_quality/helpers_json.cpp (100%)
 rename {search => libs/search}/search_quality/helpers_json.hpp (100%)
 rename {search => libs/search}/search_quality/matcher.cpp (100%)
 rename {search => libs/search}/search_quality/matcher.hpp (100%)
 rename {search => libs/search}/search_quality/merge_samples.py (100%)
 rename {search => libs/search}/search_quality/sample.cpp (100%)
 rename {search => libs/search}/search_quality/sample.hpp (100%)
 rename {search => libs/search}/search_quality/samples_generation_tool/CMakeLists.txt (100%)
 rename {search => libs/search}/search_quality/samples_generation_tool/samples_generation_tool.cpp (100%)
 rename {search => libs/search}/search_quality/scoring_model.py (100%)
 rename {search => libs/search}/search_quality/search_quality_tests/CMakeLists.txt (100%)
 rename {search => libs/search}/search_quality/search_quality_tests/benchmark_tests.cpp (100%)
 rename {search => libs/search}/search_quality/search_quality_tests/real_mwm_tests.cpp (100%)
 rename {search => libs/search}/search_quality/search_quality_tests/sample_test.cpp (100%)
 rename {search => libs/search}/search_quality/search_quality_tool/CMakeLists.txt (100%)
 rename {search => libs/search}/search_quality/search_quality_tool/queries.txt (100%)
 rename {search => libs/search}/search_quality/search_quality_tool/search_quality_tool.cpp (100%)
 rename {search => libs/search}/search_tests/CMakeLists.txt (100%)
 rename {search => libs/search}/search_tests/algos_tests.cpp (100%)
 rename {search => libs/search}/search_tests/bookmarks_processor_tests.cpp (100%)
 rename {search => libs/search}/search_tests/feature_offset_match_tests.cpp (100%)
 rename {search => libs/search}/search_tests/highlighting_tests.cpp (100%)
 rename {search => libs/search}/search_tests/house_detector_tests.cpp (100%)
 rename {search => libs/search}/search_tests/house_numbers_matcher_test.cpp (100%)
 rename {search => libs/search}/search_tests/interval_set_test.cpp (100%)
 rename {search => libs/search}/search_tests/keyword_lang_matcher_test.cpp (100%)
 rename {search => libs/search}/search_tests/keyword_matcher_test.cpp (100%)
 rename {search => libs/search}/search_tests/latlon_match_test.cpp (100%)
 rename {search => libs/search}/search_tests/localities_source_tests.cpp (100%)
 rename {search => libs/search}/search_tests/locality_finder_test.cpp (100%)
 rename {search => libs/search}/search_tests/locality_scorer_test.cpp (100%)
 rename {search => libs/search}/search_tests/locality_selector_test.cpp (100%)
 rename {search => libs/search}/search_tests/mem_search_index_tests.cpp (100%)
 rename {search => libs/search}/search_tests/point_rect_matcher_tests.cpp (100%)
 rename {search => libs/search}/search_tests/query_saver_tests.cpp (100%)
 rename {search => libs/search}/search_tests/ranking_tests.cpp (100%)
 rename {search => libs/search}/search_tests/region_info_getter_tests.cpp (100%)
 rename {search => libs/search}/search_tests/results_tests.cpp (100%)
 rename {search => libs/search}/search_tests/segment_tree_tests.cpp (100%)
 rename {search => libs/search}/search_tests/string_match_test.cpp (100%)
 rename {search => libs/search}/search_tests/suggest_tests.cpp (100%)
 rename {search => libs/search}/search_tests/text_index_tests.cpp (100%)
 rename {search => libs/search}/search_tests/utm_mgrs_coords_match_test.cpp (100%)
 rename {search => libs/search}/search_tests_support/CMakeLists.txt (100%)
 rename {search => libs/search}/search_tests_support/helpers.cpp (100%)
 rename {search => libs/search}/search_tests_support/helpers.hpp (100%)
 rename {search => libs/search}/search_tests_support/test_results_matching.cpp (100%)
 rename {search => libs/search}/search_tests_support/test_results_matching.hpp (100%)
 rename {search => libs/search}/search_tests_support/test_search_engine.cpp (100%)
 rename {search => libs/search}/search_tests_support/test_search_engine.hpp (100%)
 rename {search => libs/search}/search_tests_support/test_search_request.cpp (100%)
 rename {search => libs/search}/search_tests_support/test_search_request.hpp (100%)
 rename {search => libs/search}/search_tests_support/test_with_custom_mwms.hpp (100%)
 rename {search => libs/search}/search_trie.hpp (100%)
 rename {search => libs/search}/segment_tree.cpp (100%)
 rename {search => libs/search}/segment_tree.hpp (100%)
 rename {search => libs/search}/stats_cache.hpp (100%)
 rename {search => libs/search}/street_vicinity_loader.cpp (100%)
 rename {search => libs/search}/street_vicinity_loader.hpp (100%)
 rename {search => libs/search}/streets_matcher.cpp (100%)
 rename {search => libs/search}/streets_matcher.hpp (100%)
 rename {search => libs/search}/string_utils.cpp (100%)
 rename {search => libs/search}/string_utils.hpp (100%)
 rename {search => libs/search}/suggest.cpp (100%)
 rename {search => libs/search}/suggest.hpp (100%)
 rename {search => libs/search}/token_range.hpp (100%)
 rename {search => libs/search}/token_slice.cpp (100%)
 rename {search => libs/search}/token_slice.hpp (100%)
 rename {search => libs/search}/tracer.cpp (100%)
 rename {search => libs/search}/tracer.hpp (100%)
 rename {search => libs/search}/types_skipper.cpp (100%)
 rename {search => libs/search}/types_skipper.hpp (100%)
 rename {search => libs/search}/utils.cpp (100%)
 rename {search => libs/search}/utils.hpp (100%)
 rename {search => libs/search}/utm_mgrs_coords_match.cpp (100%)
 rename {search => libs/search}/utm_mgrs_coords_match.hpp (100%)
 rename {shaders => libs/shaders}/.gitignore (100%)
 rename {shaders => libs/shaders}/CMakeLists.txt (100%)
 rename {shaders => libs/shaders}/GL/area.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/area3d.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/area3d_outline.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/arrow3d.fsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/arrow3d.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/arrow3d_outline.fsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/arrow3d_shadow.fsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/arrow3d_shadow.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/arrow3d_textured.fsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/arrow3d_textured.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/circle.fsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/circle.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/circle_point.fsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/circle_point.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/colored_symbol.fsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/colored_symbol.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/colored_symbol_billboard.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/dashed_line.fsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/dashed_line.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/debug_rect.fsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/debug_rect.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/hatching_area.fsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/hatching_area.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/imgui.fsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/imgui.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/line.fsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/line.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/masked_texturing.fsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/masked_texturing.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/masked_texturing_billboard.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/my_position.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/path_symbol.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/position_accuracy3d.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/route.fsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/route.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/route_arrow.fsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/route_arrow.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/route_dash.fsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/route_marker.fsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/route_marker.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/ruler.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/screen_quad.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/selection_line.fsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/selection_line.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/shader_index.txt (100%)
 rename {shaders => libs/shaders}/GL/shaders_lib.glsl (100%)
 rename {shaders => libs/shaders}/GL/smaa_blending_weight.fsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/smaa_blending_weight.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/smaa_edges.fsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/smaa_edges.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/smaa_final.fsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/smaa_final.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/solid_color.fsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/text.fsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/text.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/text_billboard.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/text_outlined.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/text_outlined_billboard.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/text_outlined_gui.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/texturing.fsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/texturing.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/texturing3d.fsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/texturing_billboard.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/texturing_gui.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/traffic.fsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/traffic.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/traffic_circle.fsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/traffic_circle.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/traffic_line.fsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/traffic_line.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/transit.fsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/transit.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/transit_circle.fsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/transit_circle.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/transit_marker.fsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/transit_marker.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/user_mark.fsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/user_mark.vsh.glsl (100%)
 rename {shaders => libs/shaders}/GL/user_mark_billboard.vsh.glsl (100%)
 rename {shaders => libs/shaders}/Metal/arrow3d.metal (100%)
 rename {shaders => libs/shaders}/Metal/debug_rect.metal (100%)
 rename {shaders => libs/shaders}/Metal/gui.metal (100%)
 rename {shaders => libs/shaders}/Metal/imgui.metal (100%)
 rename {shaders => libs/shaders}/Metal/map.metal (100%)
 rename {shaders => libs/shaders}/Metal/route.metal (100%)
 rename {shaders => libs/shaders}/Metal/screen_quad.metal (100%)
 rename {shaders => libs/shaders}/Metal/shaders_lib.h (100%)
 rename {shaders => libs/shaders}/Metal/shaders_lib.metal (100%)
 rename {shaders => libs/shaders}/Metal/shapes.metal (100%)
 rename {shaders => libs/shaders}/Metal/smaa.metal (100%)
 rename {shaders => libs/shaders}/Metal/system.metal (100%)
 rename {shaders => libs/shaders}/Metal/traffic.metal (100%)
 rename {shaders => libs/shaders}/Metal/transit.metal (100%)
 rename {shaders => libs/shaders}/gl_program_info.hpp (100%)
 rename {shaders => libs/shaders}/gl_program_params.cpp (100%)
 rename {shaders => libs/shaders}/gl_program_params.hpp (100%)
 rename {shaders => libs/shaders}/gl_program_pool.cpp (100%)
 rename {shaders => libs/shaders}/gl_program_pool.hpp (100%)
 rename {shaders => libs/shaders}/gl_shaders_preprocessor.py (100%)
 rename {shaders => libs/shaders}/metal_program_params.hpp (100%)
 rename {shaders => libs/shaders}/metal_program_params.mm (100%)
 rename {shaders => libs/shaders}/metal_program_pool.hpp (100%)
 rename {shaders => libs/shaders}/metal_program_pool.mm (100%)
 rename {shaders => libs/shaders}/program_manager.cpp (100%)
 rename {shaders => libs/shaders}/program_manager.hpp (100%)
 rename {shaders => libs/shaders}/program_manager_metal.mm (100%)
 rename {shaders => libs/shaders}/program_params.cpp (100%)
 rename {shaders => libs/shaders}/program_params.hpp (100%)
 rename {shaders => libs/shaders}/program_pool.hpp (100%)
 rename {shaders => libs/shaders}/programs.hpp (100%)
 rename {shaders => libs/shaders}/shaders_tests/CMakeLists.txt (100%)
 rename {shaders => libs/shaders}/shaders_tests/gl_program_params_tests.cpp (100%)
 rename {shaders => libs/shaders}/shaders_tests/gl_shaders_desktop_compile_tests.cpp (100%)
 rename {shaders => libs/shaders}/shaders_tests/gl_shaders_mobile_compile_test.cpp (100%)
 rename {shaders => libs/shaders}/vulkan_program_params.cpp (100%)
 rename {shaders => libs/shaders}/vulkan_program_params.hpp (100%)
 rename {shaders => libs/shaders}/vulkan_program_pool.cpp (100%)
 rename {shaders => libs/shaders}/vulkan_program_pool.hpp (100%)
 rename {shaders => libs/shaders}/vulkan_shaders_preprocessor.py (100%)
 rename {std => libs/std}/boost_container_hash.hpp (100%)
 rename {std => libs/std}/boost_geometry.hpp (100%)
 rename {std => libs/std}/glm_gtx_rotate_vector.hpp (100%)
 rename {std => libs/std}/target_os.hpp (100%)
 rename {std => libs/std}/windows.hpp (100%)
 rename {storage => libs/storage}/CMakeLists.txt (100%)
 rename {storage => libs/storage}/background_downloading/downloader_adapter_ios.h (100%)
 rename {storage => libs/storage}/background_downloading/downloader_adapter_ios.mm (100%)
 rename {storage => libs/storage}/background_downloading/downloader_queue.hpp (100%)
 rename {storage => libs/storage}/country.hpp (100%)
 rename {storage => libs/storage}/country_decl.cpp (100%)
 rename {storage => libs/storage}/country_decl.hpp (100%)
 rename {storage => libs/storage}/country_info_getter.cpp (100%)
 rename {storage => libs/storage}/country_info_getter.hpp (100%)
 rename {storage => libs/storage}/country_info_reader_light.cpp (100%)
 rename {storage => libs/storage}/country_info_reader_light.hpp (100%)
 rename {storage => libs/storage}/country_name_getter.cpp (100%)
 rename {storage => libs/storage}/country_name_getter.hpp (100%)
 rename {storage => libs/storage}/country_parent_getter.cpp (100%)
 rename {storage => libs/storage}/country_parent_getter.hpp (100%)
 rename {storage => libs/storage}/country_tree.cpp (100%)
 rename {storage => libs/storage}/country_tree.hpp (100%)
 rename {storage => libs/storage}/country_tree_helpers.cpp (100%)
 rename {storage => libs/storage}/country_tree_helpers.hpp (100%)
 rename {storage => libs/storage}/diff_scheme/apply_diff.cpp (100%)
 rename {storage => libs/storage}/diff_scheme/apply_diff.hpp (93%)
 rename {storage => libs/storage}/diff_scheme/diff_scheme_loader.cpp (100%)
 rename {storage => libs/storage}/diff_scheme/diff_scheme_loader.hpp (100%)
 rename {storage => libs/storage}/diff_scheme/diff_types.hpp (100%)
 rename {storage => libs/storage}/diff_scheme/diffs_data_source.cpp (100%)
 rename {storage => libs/storage}/diff_scheme/diffs_data_source.hpp (100%)
 rename {storage => libs/storage}/downloader.hpp (100%)
 rename {storage => libs/storage}/downloader_queue_interface.hpp (100%)
 rename {storage => libs/storage}/downloader_queue_universal.cpp (100%)
 rename {storage => libs/storage}/downloader_queue_universal.hpp (100%)
 rename {storage => libs/storage}/downloader_search_params.hpp (100%)
 rename {storage => libs/storage}/downloading_policy.cpp (100%)
 rename {storage => libs/storage}/downloading_policy.hpp (100%)
 rename {storage => libs/storage}/http_map_files_downloader.cpp (100%)
 rename {storage => libs/storage}/http_map_files_downloader.hpp (100%)
 rename {storage => libs/storage}/map_files_downloader.cpp (100%)
 rename {storage => libs/storage}/map_files_downloader.hpp (100%)
 rename {storage => libs/storage}/map_files_downloader_with_ping.cpp (100%)
 rename {storage => libs/storage}/map_files_downloader_with_ping.hpp (100%)
 rename {storage => libs/storage}/pinger.cpp (100%)
 rename {storage => libs/storage}/pinger.hpp (100%)
 rename {storage => libs/storage}/queued_country.cpp (100%)
 rename {storage => libs/storage}/queued_country.hpp (100%)
 rename {storage => libs/storage}/routing_helpers.cpp (100%)
 rename {storage => libs/storage}/routing_helpers.hpp (100%)
 rename {storage => libs/storage}/storage.cpp (100%)
 rename {storage => libs/storage}/storage.hpp (100%)
 rename {storage => libs/storage}/storage_defines.cpp (100%)
 rename {storage => libs/storage}/storage_defines.hpp (100%)
 rename {storage => libs/storage}/storage_helpers.cpp (100%)
 rename {storage => libs/storage}/storage_helpers.hpp (100%)
 rename {storage => libs/storage}/storage_integration_tests/CMakeLists.txt (100%)
 rename {storage => libs/storage}/storage_integration_tests/download_calc_size_test.cpp (100%)
 rename {storage => libs/storage}/storage_integration_tests/lightweight_matching_tests.cpp (100%)
 rename {storage => libs/storage}/storage_integration_tests/storage_3levels_tests.cpp (100%)
 rename {storage => libs/storage}/storage_integration_tests/storage_downloading_tests.cpp (100%)
 rename {storage => libs/storage}/storage_integration_tests/storage_group_download_tests.cpp (100%)
 rename {storage => libs/storage}/storage_integration_tests/storage_http_tests.cpp (100%)
 rename {storage => libs/storage}/storage_integration_tests/storage_update_tests.cpp (100%)
 rename {storage => libs/storage}/storage_integration_tests/test_defines.cpp (100%)
 rename {storage => libs/storage}/storage_integration_tests/test_defines.hpp (100%)
 rename {storage => libs/storage}/storage_tests/CMakeLists.txt (100%)
 rename {storage => libs/storage}/storage_tests/countries_tests.cpp (100%)
 rename {storage => libs/storage}/storage_tests/country_info_getter_tests.cpp (100%)
 rename {storage => libs/storage}/storage_tests/country_name_getter_tests.cpp (100%)
 rename {storage => libs/storage}/storage_tests/downloader_tests.cpp (100%)
 rename {storage => libs/storage}/storage_tests/fake_map_files_downloader.cpp (100%)
 rename {storage => libs/storage}/storage_tests/fake_map_files_downloader.hpp (100%)
 rename {storage => libs/storage}/storage_tests/helpers.cpp (100%)
 rename {storage => libs/storage}/storage_tests/helpers.hpp (100%)
 rename {storage => libs/storage}/storage_tests/simple_tree_test.cpp (100%)
 rename {storage => libs/storage}/storage_tests/storage_tests.cpp (100%)
 rename {storage => libs/storage}/storage_tests/task_runner.cpp (100%)
 rename {storage => libs/storage}/storage_tests/task_runner.hpp (100%)
 rename {storage => libs/storage}/storage_tests/test_map_files_downloader.cpp (100%)
 rename {storage => libs/storage}/storage_tests/test_map_files_downloader.hpp (100%)
 rename {testing => libs/testing}/benchmark.hpp (100%)
 rename {testing => libs/testing}/testing.hpp (100%)
 rename {testing => libs/testing}/testingmain.cpp (100%)
 rename {testing => libs/testing}/testregister.hpp (100%)
 rename {tracking => libs/tracking}/CMakeLists.txt (100%)
 rename {tracking => libs/tracking}/archival_file.cpp (100%)
 rename {tracking => libs/tracking}/archival_file.hpp (100%)
 rename {tracking => libs/tracking}/archival_manager.cpp (100%)
 rename {tracking => libs/tracking}/archival_manager.hpp (100%)
 rename {tracking => libs/tracking}/archival_reporter.cpp (100%)
 rename {tracking => libs/tracking}/archival_reporter.hpp (100%)
 rename {tracking => libs/tracking}/archive.cpp (100%)
 rename {tracking => libs/tracking}/archive.hpp (100%)
 rename {tracking => libs/tracking}/connection.cpp (100%)
 rename {tracking => libs/tracking}/connection.hpp (100%)
 rename {tracking => libs/tracking}/protocol.cpp (100%)
 rename {tracking => libs/tracking}/protocol.hpp (100%)
 rename {tracking => libs/tracking}/pytracking/CMakeLists.txt (100%)
 rename {tracking => libs/tracking}/pytracking/bindings.cpp (100%)
 rename {tracking => libs/tracking}/pytracking/setup.py (100%)
 rename {tracking => libs/tracking}/reporter.cpp (100%)
 rename {tracking => libs/tracking}/reporter.hpp (100%)
 rename {tracking => libs/tracking}/tracking_fuzz_tests/CMakeLists.txt (100%)
 rename {tracking => libs/tracking}/tracking_fuzz_tests/tracking_fuzz_tests.cpp (100%)
 rename {tracking => libs/tracking}/tracking_tests/CMakeLists.txt (100%)
 rename {tracking => libs/tracking}/tracking_tests/archival_reporter_tests.cpp (100%)
 rename {tracking => libs/tracking}/tracking_tests/protocol_test.cpp (100%)
 rename {tracking => libs/tracking}/tracking_tests/reporter_test.cpp (100%)
 rename {traffic => libs/traffic}/CMakeLists.txt (100%)
 rename {traffic => libs/traffic}/pytraffic/CMakeLists.txt (100%)
 rename {traffic => libs/traffic}/pytraffic/bindings.cpp (100%)
 rename {traffic => libs/traffic}/pytraffic/example.py (100%)
 rename {traffic => libs/traffic}/pytraffic/setup.py (100%)
 rename {traffic => libs/traffic}/speed_groups.cpp (100%)
 rename {traffic => libs/traffic}/speed_groups.hpp (100%)
 rename {traffic => libs/traffic}/traffic_cache.cpp (100%)
 rename {traffic => libs/traffic}/traffic_cache.hpp (100%)
 rename {traffic => libs/traffic}/traffic_info.cpp (100%)
 rename {traffic => libs/traffic}/traffic_info.hpp (100%)
 rename {traffic => libs/traffic}/traffic_tests/CMakeLists.txt (100%)
 rename {traffic => libs/traffic}/traffic_tests/traffic_info_test.cpp (100%)
 rename {transit => libs/transit}/CMakeLists.txt (100%)
 rename {transit => libs/transit}/experimental/transit_data.cpp (100%)
 rename {transit => libs/transit}/experimental/transit_data.hpp (100%)
 rename {transit => libs/transit}/experimental/transit_types_experimental.cpp (100%)
 rename {transit => libs/transit}/experimental/transit_types_experimental.hpp (100%)
 rename {transit => libs/transit}/transit_display_info.hpp (100%)
 rename {transit => libs/transit}/transit_entities.hpp (100%)
 rename {transit => libs/transit}/transit_experimental_tests/CMakeLists.txt (100%)
 rename {transit => libs/transit}/transit_experimental_tests/parse_transit_from_json_tests.cpp (100%)
 rename {transit => libs/transit}/transit_experimental_tests/transit_serdes_tests.cpp (100%)
 rename {transit => libs/transit}/transit_graph_data.cpp (100%)
 rename {transit => libs/transit}/transit_graph_data.hpp (100%)
 rename {transit => libs/transit}/transit_schedule.cpp (100%)
 rename {transit => libs/transit}/transit_schedule.hpp (100%)
 rename {transit => libs/transit}/transit_serdes.hpp (100%)
 rename {transit => libs/transit}/transit_tests/CMakeLists.txt (100%)
 rename {transit => libs/transit}/transit_tests/transit_graph_test.cpp (100%)
 rename {transit => libs/transit}/transit_tests/transit_json_parsing_test.cpp (100%)
 rename {transit => libs/transit}/transit_tests/transit_schedule_tests.cpp (100%)
 rename {transit => libs/transit}/transit_tests/transit_test.cpp (100%)
 rename {transit => libs/transit}/transit_tests/transit_tools.hpp (100%)
 rename {transit => libs/transit}/transit_types.cpp (100%)
 rename {transit => libs/transit}/transit_types.hpp (100%)
 rename {transit => libs/transit}/transit_version.cpp (100%)
 rename {transit => libs/transit}/transit_version.hpp (100%)
 rename {transit => libs/transit}/world_feed/CMakeLists.txt (100%)
 rename {transit => libs/transit}/world_feed/color_picker.cpp (100%)
 rename {transit => libs/transit}/world_feed/color_picker.hpp (100%)
 rename {transit => libs/transit}/world_feed/date_time_helpers.cpp (100%)
 rename {transit => libs/transit}/world_feed/date_time_helpers.hpp (100%)
 rename {transit => libs/transit}/world_feed/feed_helpers.cpp (100%)
 rename {transit => libs/transit}/world_feed/feed_helpers.hpp (100%)
 rename {transit => libs/transit}/world_feed/gtfs_converter/CMakeLists.txt (100%)
 rename {transit => libs/transit}/world_feed/gtfs_converter/gtfs_converter.cpp (100%)
 rename {transit => libs/transit}/world_feed/subway_converter.cpp (100%)
 rename {transit => libs/transit}/world_feed/subway_converter.hpp (100%)
 rename {transit => libs/transit}/world_feed/world_feed.cpp (100%)
 rename {transit => libs/transit}/world_feed/world_feed.hpp (100%)
 rename {transit => libs/transit}/world_feed/world_feed_integration_tests/CMakeLists.txt (100%)
 rename {transit => libs/transit}/world_feed/world_feed_integration_tests/world_feed_integration_tests.cpp (100%)
 rename {transit => libs/transit}/world_feed/world_feed_tests/CMakeLists.txt (100%)
 rename {transit => libs/transit}/world_feed/world_feed_tests/subway_converter_tests.cpp (100%)
 rename {transit => libs/transit}/world_feed/world_feed_tests/world_feed_tests.cpp (100%)
 create mode 100644 tools/CMakeLists.txt
 rename tools/{ruby => }/category_consistency/check_consistency.rb (100%)
 rename tools/{ruby => }/category_consistency/omim_parsers.rb (100%)
 rename {feature_list => tools/feature_list}/CMakeLists.txt (100%)
 rename {feature_list => tools/feature_list}/feature_list.cpp (100%)
 rename {openlr => tools/openlr}/CMakeLists.txt (100%)
 rename {openlr => tools/openlr}/cache_line_size.hpp (100%)
 rename {openlr => tools/openlr}/candidate_paths_getter.cpp (100%)
 rename {openlr => tools/openlr}/candidate_paths_getter.hpp (100%)
 rename {openlr => tools/openlr}/candidate_points_getter.cpp (100%)
 rename {openlr => tools/openlr}/candidate_points_getter.hpp (100%)
 rename {openlr => tools/openlr}/decoded_path.cpp (100%)
 rename {openlr => tools/openlr}/decoded_path.hpp (100%)
 rename {openlr => tools/openlr}/graph.cpp (100%)
 rename {openlr => tools/openlr}/graph.hpp (100%)
 rename {openlr => tools/openlr}/helpers.cpp (100%)
 rename {openlr => tools/openlr}/helpers.hpp (100%)
 rename {openlr => tools/openlr}/openlr_decoder.cpp (100%)
 rename {openlr => tools/openlr}/openlr_decoder.hpp (100%)
 rename {openlr => tools/openlr}/openlr_match_quality/CMakeLists.txt (100%)
 rename {openlr => tools/openlr}/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt (100%)
 rename {search/search_quality/assessment_tool => tools/openlr/openlr_match_quality/openlr_assessment_tool}/Info.plist (100%)
 rename {openlr => tools/openlr}/openlr_match_quality/openlr_assessment_tool/main.cpp (100%)
 rename {openlr => tools/openlr}/openlr_match_quality/openlr_assessment_tool/mainwindow.cpp (100%)
 rename {openlr => tools/openlr}/openlr_match_quality/openlr_assessment_tool/mainwindow.hpp (100%)
 rename {openlr => tools/openlr}/openlr_match_quality/openlr_assessment_tool/map_widget.cpp (100%)
 rename {openlr => tools/openlr}/openlr_match_quality/openlr_assessment_tool/map_widget.hpp (100%)
 rename {openlr => tools/openlr}/openlr_match_quality/openlr_assessment_tool/points_controller_delegate_base.hpp (100%)
 rename {openlr => tools/openlr}/openlr_match_quality/openlr_assessment_tool/segment_correspondence.cpp (100%)
 rename {openlr => tools/openlr}/openlr_match_quality/openlr_assessment_tool/segment_correspondence.hpp (100%)
 rename {openlr => tools/openlr}/openlr_match_quality/openlr_assessment_tool/traffic_drawer_delegate_base.hpp (100%)
 rename {openlr => tools/openlr}/openlr_match_quality/openlr_assessment_tool/traffic_mode.cpp (100%)
 rename {openlr => tools/openlr}/openlr_match_quality/openlr_assessment_tool/traffic_mode.hpp (100%)
 rename {openlr => tools/openlr}/openlr_match_quality/openlr_assessment_tool/traffic_panel.cpp (100%)
 rename {openlr => tools/openlr}/openlr_match_quality/openlr_assessment_tool/traffic_panel.hpp (100%)
 rename {openlr => tools/openlr}/openlr_match_quality/openlr_assessment_tool/trafficmodeinitdlg.cpp (100%)
 rename {openlr => tools/openlr}/openlr_match_quality/openlr_assessment_tool/trafficmodeinitdlg.h (100%)
 rename {openlr => tools/openlr}/openlr_match_quality/openlr_assessment_tool/trafficmodeinitdlg.ui (100%)
 rename {openlr => tools/openlr}/openlr_model.cpp (100%)
 rename {openlr => tools/openlr}/openlr_model.hpp (100%)
 rename {openlr => tools/openlr}/openlr_model_xml.cpp (100%)
 rename {openlr => tools/openlr}/openlr_model_xml.hpp (100%)
 rename {openlr => tools/openlr}/openlr_stat/CMakeLists.txt (100%)
 rename {openlr => tools/openlr}/openlr_stat/openlr_stat.cpp (100%)
 rename {openlr => tools/openlr}/openlr_tests/CMakeLists.txt (100%)
 rename {openlr => tools/openlr}/openlr_tests/decoded_path_test.cpp (100%)
 rename {openlr => tools/openlr}/paths_connector.cpp (100%)
 rename {openlr => tools/openlr}/paths_connector.hpp (100%)
 rename {openlr => tools/openlr}/road_info_getter.cpp (100%)
 rename {openlr => tools/openlr}/road_info_getter.hpp (100%)
 rename {openlr => tools/openlr}/router.cpp (100%)
 rename {openlr => tools/openlr}/router.hpp (100%)
 rename {openlr => tools/openlr}/score_candidate_paths_getter.cpp (100%)
 rename {openlr => tools/openlr}/score_candidate_paths_getter.hpp (100%)
 rename {openlr => tools/openlr}/score_candidate_points_getter.cpp (100%)
 rename {openlr => tools/openlr}/score_candidate_points_getter.hpp (100%)
 rename {openlr => tools/openlr}/score_paths_connector.cpp (100%)
 rename {openlr => tools/openlr}/score_paths_connector.hpp (100%)
 rename {openlr => tools/openlr}/score_types.hpp (100%)
 rename {openlr => tools/openlr}/stats.hpp (100%)
 rename {openlr => tools/openlr}/way_point.hpp (100%)
 rename {poly_borders => tools/poly_borders}/CMakeLists.txt (100%)
 rename {poly_borders => tools/poly_borders}/borders_data.cpp (100%)
 rename {poly_borders => tools/poly_borders}/borders_data.hpp (100%)
 rename {poly_borders => tools/poly_borders}/help_structures.cpp (100%)
 rename {poly_borders => tools/poly_borders}/help_structures.hpp (100%)
 rename {poly_borders => tools/poly_borders}/poly_borders_tests/CMakeLists.txt (100%)
 rename {poly_borders => tools/poly_borders}/poly_borders_tests/mark_points_tests.cpp (100%)
 rename {poly_borders => tools/poly_borders}/poly_borders_tests/remove_empty_spaces_tests.cpp (100%)
 rename {poly_borders => tools/poly_borders}/poly_borders_tests/tools.cpp (100%)
 rename {poly_borders => tools/poly_borders}/poly_borders_tests/tools.hpp (100%)
 rename {poly_borders => tools/poly_borders}/poly_borders_tool/CMakeLists.txt (100%)
 rename {poly_borders => tools/poly_borders}/poly_borders_tool/poly_borders_tool.cpp (100%)
 rename {skin_generator => tools/skin_generator}/CMakeLists.txt (100%)
 rename {skin_generator => tools/skin_generator}/generator.cpp (100%)
 rename {skin_generator => tools/skin_generator}/generator.hpp (100%)
 rename {skin_generator => tools/skin_generator}/main.cpp (100%)
 rename {topography_generator => tools/topography_generator}/CMakeLists.txt (100%)
 rename {topography_generator => tools/topography_generator}/filters_impl.cpp (100%)
 rename {topography_generator => tools/topography_generator}/filters_impl.hpp (100%)
 rename {topography_generator => tools/topography_generator}/generator.cpp (100%)
 rename {topography_generator => tools/topography_generator}/generator.hpp (100%)
 rename {topography_generator => tools/topography_generator}/isolines_profile.hpp (100%)
 rename {topography_generator => tools/topography_generator}/isolines_utils.hpp (100%)
 rename {topography_generator => tools/topography_generator}/main.cpp (100%)
 rename {topography_generator => tools/topography_generator}/marching_squares/contours_builder.cpp (100%)
 rename {topography_generator => tools/topography_generator}/marching_squares/contours_builder.hpp (100%)
 rename {topography_generator => tools/topography_generator}/marching_squares/marching_squares.hpp (100%)
 rename {topography_generator => tools/topography_generator}/marching_squares/square.hpp (100%)
 rename {topography_generator => tools/topography_generator}/tile_filter.hpp (100%)
 rename {topography_generator => tools/topography_generator}/utils/contours.hpp (100%)
 rename {topography_generator => tools/topography_generator}/utils/contours_serdes.hpp (100%)
 rename {topography_generator => tools/topography_generator}/utils/values_provider.hpp (100%)
 rename {track_analyzing => tools/track_analyzing}/CMakeLists.txt (100%)
 rename {track_analyzing => tools/track_analyzing}/exceptions.hpp (100%)
 rename {track_analyzing => tools/track_analyzing}/log_parser.cpp (100%)
 rename {track_analyzing => tools/track_analyzing}/log_parser.hpp (100%)
 rename {track_analyzing => tools/track_analyzing}/serialization.hpp (100%)
 rename {track_analyzing => tools/track_analyzing}/temporary_file.cpp (100%)
 rename {track_analyzing => tools/track_analyzing}/temporary_file.hpp (100%)
 rename {track_analyzing => tools/track_analyzing}/track.cpp (100%)
 rename {track_analyzing => tools/track_analyzing}/track.hpp (100%)
 rename {track_analyzing => tools/track_analyzing}/track_analyzer/CMakeLists.txt (100%)
 rename {track_analyzing => tools/track_analyzing}/track_analyzer/cmd_balance_csv.cpp (100%)
 rename {track_analyzing => tools/track_analyzing}/track_analyzer/cmd_balance_csv.hpp (100%)
 rename {track_analyzing => tools/track_analyzing}/track_analyzer/cmd_cpp_track.cpp (100%)
 rename {track_analyzing => tools/track_analyzing}/track_analyzer/cmd_gpx.cpp (100%)
 rename {track_analyzing => tools/track_analyzing}/track_analyzer/cmd_match.cpp (100%)
 rename {track_analyzing => tools/track_analyzing}/track_analyzer/cmd_table.cpp (100%)
 rename {track_analyzing => tools/track_analyzing}/track_analyzer/cmd_track.cpp (100%)
 rename {track_analyzing => tools/track_analyzing}/track_analyzer/cmd_tracks.cpp (100%)
 rename {track_analyzing => tools/track_analyzing}/track_analyzer/cmd_unmatched_tracks.cpp (100%)
 rename {track_analyzing => tools/track_analyzing}/track_analyzer/crossroad_checker.cpp (100%)
 rename {track_analyzing => tools/track_analyzing}/track_analyzer/crossroad_checker.hpp (100%)
 rename {track_analyzing => tools/track_analyzing}/track_analyzer/track_analyzer.cpp (100%)
 rename {track_analyzing => tools/track_analyzing}/track_analyzer/utils.cpp (100%)
 rename {track_analyzing => tools/track_analyzing}/track_analyzer/utils.hpp (100%)
 rename {track_analyzing => tools/track_analyzing}/track_analyzing_tests/CMakeLists.txt (100%)
 rename {track_analyzing => tools/track_analyzing}/track_analyzing_tests/balance_tests.cpp (100%)
 rename {track_analyzing => tools/track_analyzing}/track_analyzing_tests/statistics_tests.cpp (100%)
 rename {track_analyzing => tools/track_analyzing}/track_analyzing_tests/track_archive_reader_tests.cpp (100%)
 rename {track_analyzing => tools/track_analyzing}/track_archive_reader.cpp (100%)
 rename {track_analyzing => tools/track_analyzing}/track_archive_reader.hpp (100%)
 rename {track_analyzing => tools/track_analyzing}/track_matcher.cpp (100%)
 rename {track_analyzing => tools/track_analyzing}/track_matcher.hpp (100%)
 rename {track_analyzing => tools/track_analyzing}/utils.cpp (100%)
 rename {track_analyzing => tools/track_analyzing}/utils.hpp (100%)
 rename {track_generator => tools/track_generator}/CMakeLists.txt (100%)
 rename {track_generator => tools/track_generator}/track_generator_tool.cpp (100%)
 rename {track_generator => tools/track_generator}/utils.cpp (100%)
 rename {track_generator => tools/track_generator}/utils.hpp (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76126de65..c559bf5c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -185,7 +185,7 @@ if (NOT PLATFORM_IPHONE AND NOT PLATFORM_ANDROID)
 endif()
 
 # To allow #include "base/file_name.hpp" in all sources.
-include_directories(${CMAKE_HOME_DIRECTORY})
+include_directories("${CMAKE_HOME_DIRECTORY}" "${CMAKE_HOME_DIRECTORY}/libs" "${CMAKE_HOME_DIRECTORY}/tools")
 
 if (USE_PCH)
   message(STATUS "Precompiled headers are ON")
@@ -227,49 +227,22 @@ endif()
 # Used in qt/ and shaders/
 find_package(Python3 REQUIRED COMPONENTS Interpreter)
 
-add_subdirectory(base)
-add_subdirectory(coding)
-add_subdirectory(descriptions)
-add_subdirectory(drape)
-add_subdirectory(drape_frontend)
-add_subdirectory(editor)
-add_subdirectory(ge0)
-add_subdirectory(generator/mwm_diff)
-add_subdirectory(geometry)
-add_subdirectory(indexer)
-add_subdirectory(kml)
-add_subdirectory(map)
-add_subdirectory(cppjansson)
-add_subdirectory(platform)
-add_subdirectory(routing)
-add_subdirectory(routing_common)
-add_subdirectory(search)
-add_subdirectory(shaders)
-add_subdirectory(storage)
-add_subdirectory(tracking)
-add_subdirectory(traffic)
-add_subdirectory(transit)
+add_subdirectory(libs)
 
 if (PLATFORM_DESKTOP)
-  omim_add_tool_subdirectory(feature_list)
+  add_subdirectory(dev_sandbox)
   add_subdirectory(generator)
-  add_subdirectory(openlr)
-  add_subdirectory(poly_borders)
-  omim_add_tool_subdirectory(topography_generator)
-  add_subdirectory(track_analyzing)
-  omim_add_tool_subdirectory(track_generator)
+  add_subdirectory(tools)
   if (NOT SKIP_QT_GUI)
     add_subdirectory(qt)
-    omim_add_tool_subdirectory(skin_generator)
   endif()
   if (GENERATOR_TOOL)
     add_compile_options(-march=native -mtune=native)
     message(STATUS "target CPU optimizations enabled, produced binaries will NOT work on a different CPU")
   endif()
-  add_subdirectory(dev_sandbox)
 endif()
 
-omim_add_test_subdirectory(qt_tstfrm)
+omim_add_test_subdirectory(libs/qt_tstfrm)
 
 if (PLATFORM_ANDROID)
   add_subdirectory(android/sdk/src/main/cpp)
diff --git a/cmake/OmimTesting.cmake b/cmake/OmimTesting.cmake
index 18db1d68a..ea4898d0e 100644
--- a/cmake/OmimTesting.cmake
+++ b/cmake/OmimTesting.cmake
@@ -51,7 +51,7 @@ endfunction()
 function(omim_add_test_target name src no_platform_init require_qt boost_test)
   omim_add_executable(${name}
     ${src}
-    $<$<NOT:$<BOOL:${boost_test}>>:${OMIM_ROOT}/testing/testingmain.cpp>
+    $<$<NOT:$<BOOL:${boost_test}>>:${OMIM_ROOT}/libs/testing/testingmain.cpp>
   )
   target_compile_options(${name} PRIVATE ${OMIM_WARNING_FLAGS})
   target_include_directories(${name} PRIVATE ${OMIM_INCLUDE_DIRS})
diff --git a/dev_sandbox/CMakeLists.txt b/dev_sandbox/CMakeLists.txt
index 4e2debc7c..e6a7ea573 100644
--- a/dev_sandbox/CMakeLists.txt
+++ b/dev_sandbox/CMakeLists.txt
@@ -13,7 +13,7 @@ if (${PLATFORM_MAC})
     ../iphone/Maps/Classes/MetalContextFactory.mm
   )
 
-  file(GLOB_RECURSE SHADER_SOURCES_FILES ${OMIM_ROOT}/shaders/Metal/*.metal)
+  file(GLOB_RECURSE SHADER_SOURCES_FILES ${OMIM_ROOT}/libs/shaders/Metal/*.metal)
   add_metal_shader_library(shaders_metal
     ${SHADER_SOURCES_FILES}
   )
diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt
new file mode 100644
index 000000000..00a05fa9d
--- /dev/null
+++ b/libs/CMakeLists.txt
@@ -0,0 +1,22 @@
+add_subdirectory(base)
+add_subdirectory(coding)
+add_subdirectory(descriptions)
+add_subdirectory(drape)
+add_subdirectory(drape_frontend)
+add_subdirectory(editor)
+add_subdirectory(ge0)
+add_subdirectory(mwm_diff)
+add_subdirectory(geometry)
+add_subdirectory(indexer)
+add_subdirectory(kml)
+add_subdirectory(map)
+add_subdirectory(cppjansson)
+add_subdirectory(platform)
+add_subdirectory(routing)
+add_subdirectory(routing_common)
+add_subdirectory(search)
+add_subdirectory(shaders)
+add_subdirectory(storage)
+add_subdirectory(tracking)
+add_subdirectory(traffic)
+add_subdirectory(transit)
diff --git a/base/CMakeLists.txt b/libs/base/CMakeLists.txt
similarity index 100%
rename from base/CMakeLists.txt
rename to libs/base/CMakeLists.txt
diff --git a/base/array_adapters.hpp b/libs/base/array_adapters.hpp
similarity index 100%
rename from base/array_adapters.hpp
rename to libs/base/array_adapters.hpp
diff --git a/base/assert.hpp b/libs/base/assert.hpp
similarity index 100%
rename from base/assert.hpp
rename to libs/base/assert.hpp
diff --git a/base/atomic_shared_ptr.hpp b/libs/base/atomic_shared_ptr.hpp
similarity index 100%
rename from base/atomic_shared_ptr.hpp
rename to libs/base/atomic_shared_ptr.hpp
diff --git a/base/base.cpp b/libs/base/base.cpp
similarity index 100%
rename from base/base.cpp
rename to libs/base/base.cpp
diff --git a/base/base.hpp b/libs/base/base.hpp
similarity index 100%
rename from base/base.hpp
rename to libs/base/base.hpp
diff --git a/base/base_tests/CMakeLists.txt b/libs/base/base_tests/CMakeLists.txt
similarity index 100%
rename from base/base_tests/CMakeLists.txt
rename to libs/base/base_tests/CMakeLists.txt
diff --git a/base/base_tests/assert_test.cpp b/libs/base/base_tests/assert_test.cpp
similarity index 100%
rename from base/base_tests/assert_test.cpp
rename to libs/base/base_tests/assert_test.cpp
diff --git a/base/base_tests/beam_tests.cpp b/libs/base/base_tests/beam_tests.cpp
similarity index 100%
rename from base/base_tests/beam_tests.cpp
rename to libs/base/base_tests/beam_tests.cpp
diff --git a/base/base_tests/bidirectional_map_tests.cpp b/libs/base/base_tests/bidirectional_map_tests.cpp
similarity index 100%
rename from base/base_tests/bidirectional_map_tests.cpp
rename to libs/base/base_tests/bidirectional_map_tests.cpp
diff --git a/base/base_tests/bits_test.cpp b/libs/base/base_tests/bits_test.cpp
similarity index 100%
rename from base/base_tests/bits_test.cpp
rename to libs/base/base_tests/bits_test.cpp
diff --git a/base/base_tests/buffer_vector_test.cpp b/libs/base/base_tests/buffer_vector_test.cpp
similarity index 100%
rename from base/base_tests/buffer_vector_test.cpp
rename to libs/base/base_tests/buffer_vector_test.cpp
diff --git a/base/base_tests/cache_test.cpp b/libs/base/base_tests/cache_test.cpp
similarity index 100%
rename from base/base_tests/cache_test.cpp
rename to libs/base/base_tests/cache_test.cpp
diff --git a/base/base_tests/cancellable_tests.cpp b/libs/base/base_tests/cancellable_tests.cpp
similarity index 100%
rename from base/base_tests/cancellable_tests.cpp
rename to libs/base/base_tests/cancellable_tests.cpp
diff --git a/base/base_tests/checked_cast_tests.cpp b/libs/base/base_tests/checked_cast_tests.cpp
similarity index 100%
rename from base/base_tests/checked_cast_tests.cpp
rename to libs/base/base_tests/checked_cast_tests.cpp
diff --git a/base/base_tests/clustering_map_tests.cpp b/libs/base/base_tests/clustering_map_tests.cpp
similarity index 100%
rename from base/base_tests/clustering_map_tests.cpp
rename to libs/base/base_tests/clustering_map_tests.cpp
diff --git a/base/base_tests/collection_cast_test.cpp b/libs/base/base_tests/collection_cast_test.cpp
similarity index 100%
rename from base/base_tests/collection_cast_test.cpp
rename to libs/base/base_tests/collection_cast_test.cpp
diff --git a/base/base_tests/containers_test.cpp b/libs/base/base_tests/containers_test.cpp
similarity index 100%
rename from base/base_tests/containers_test.cpp
rename to libs/base/base_tests/containers_test.cpp
diff --git a/base/base_tests/control_flow_tests.cpp b/libs/base/base_tests/control_flow_tests.cpp
similarity index 100%
rename from base/base_tests/control_flow_tests.cpp
rename to libs/base/base_tests/control_flow_tests.cpp
diff --git a/base/base_tests/exception_tests.cpp b/libs/base/base_tests/exception_tests.cpp
similarity index 100%
rename from base/base_tests/exception_tests.cpp
rename to libs/base/base_tests/exception_tests.cpp
diff --git a/base/base_tests/fifo_cache_test.cpp b/libs/base/base_tests/fifo_cache_test.cpp
similarity index 100%
rename from base/base_tests/fifo_cache_test.cpp
rename to libs/base/base_tests/fifo_cache_test.cpp
diff --git a/base/base_tests/file_name_utils_tests.cpp b/libs/base/base_tests/file_name_utils_tests.cpp
similarity index 100%
rename from base/base_tests/file_name_utils_tests.cpp
rename to libs/base/base_tests/file_name_utils_tests.cpp
diff --git a/base/base_tests/geo_object_id_tests.cpp b/libs/base/base_tests/geo_object_id_tests.cpp
similarity index 100%
rename from base/base_tests/geo_object_id_tests.cpp
rename to libs/base/base_tests/geo_object_id_tests.cpp
diff --git a/base/base_tests/levenshtein_dfa_test.cpp b/libs/base/base_tests/levenshtein_dfa_test.cpp
similarity index 100%
rename from base/base_tests/levenshtein_dfa_test.cpp
rename to libs/base/base_tests/levenshtein_dfa_test.cpp
diff --git a/base/base_tests/linked_map_tests.cpp b/libs/base/base_tests/linked_map_tests.cpp
similarity index 100%
rename from base/base_tests/linked_map_tests.cpp
rename to libs/base/base_tests/linked_map_tests.cpp
diff --git a/base/base_tests/logging_test.cpp b/libs/base/base_tests/logging_test.cpp
similarity index 100%
rename from base/base_tests/logging_test.cpp
rename to libs/base/base_tests/logging_test.cpp
diff --git a/base/base_tests/lru_cache_tests.cpp b/libs/base/base_tests/lru_cache_tests.cpp
similarity index 100%
rename from base/base_tests/lru_cache_tests.cpp
rename to libs/base/base_tests/lru_cache_tests.cpp
diff --git a/base/base_tests/math_test.cpp b/libs/base/base_tests/math_test.cpp
similarity index 100%
rename from base/base_tests/math_test.cpp
rename to libs/base/base_tests/math_test.cpp
diff --git a/base/base_tests/matrix_test.cpp b/libs/base/base_tests/matrix_test.cpp
similarity index 100%
rename from base/base_tests/matrix_test.cpp
rename to libs/base/base_tests/matrix_test.cpp
diff --git a/base/base_tests/mem_trie_test.cpp b/libs/base/base_tests/mem_trie_test.cpp
similarity index 100%
rename from base/base_tests/mem_trie_test.cpp
rename to libs/base/base_tests/mem_trie_test.cpp
diff --git a/base/base_tests/message_test.cpp b/libs/base/base_tests/message_test.cpp
similarity index 100%
rename from base/base_tests/message_test.cpp
rename to libs/base/base_tests/message_test.cpp
diff --git a/base/base_tests/newtype_test.cpp b/libs/base/base_tests/newtype_test.cpp
similarity index 100%
rename from base/base_tests/newtype_test.cpp
rename to libs/base/base_tests/newtype_test.cpp
diff --git a/base/base_tests/non_intersecting_intervals_tests.cpp b/libs/base/base_tests/non_intersecting_intervals_tests.cpp
similarity index 100%
rename from base/base_tests/non_intersecting_intervals_tests.cpp
rename to libs/base/base_tests/non_intersecting_intervals_tests.cpp
diff --git a/base/base_tests/observer_list_test.cpp b/libs/base/base_tests/observer_list_test.cpp
similarity index 100%
rename from base/base_tests/observer_list_test.cpp
rename to libs/base/base_tests/observer_list_test.cpp
diff --git a/base/base_tests/range_iterator_test.cpp b/libs/base/base_tests/range_iterator_test.cpp
similarity index 100%
rename from base/base_tests/range_iterator_test.cpp
rename to libs/base/base_tests/range_iterator_test.cpp
diff --git a/base/base_tests/ref_counted_tests.cpp b/libs/base/base_tests/ref_counted_tests.cpp
similarity index 100%
rename from base/base_tests/ref_counted_tests.cpp
rename to libs/base/base_tests/ref_counted_tests.cpp
diff --git a/base/base_tests/regexp_test.cpp b/libs/base/base_tests/regexp_test.cpp
similarity index 100%
rename from base/base_tests/regexp_test.cpp
rename to libs/base/base_tests/regexp_test.cpp
diff --git a/base/base_tests/rolling_hash_test.cpp b/libs/base/base_tests/rolling_hash_test.cpp
similarity index 100%
rename from base/base_tests/rolling_hash_test.cpp
rename to libs/base/base_tests/rolling_hash_test.cpp
diff --git a/base/base_tests/scope_guard_test.cpp b/libs/base/base_tests/scope_guard_test.cpp
similarity index 100%
rename from base/base_tests/scope_guard_test.cpp
rename to libs/base/base_tests/scope_guard_test.cpp
diff --git a/base/base_tests/small_set_test.cpp b/libs/base/base_tests/small_set_test.cpp
similarity index 100%
rename from base/base_tests/small_set_test.cpp
rename to libs/base/base_tests/small_set_test.cpp
diff --git a/base/base_tests/stl_helpers_tests.cpp b/libs/base/base_tests/stl_helpers_tests.cpp
similarity index 100%
rename from base/base_tests/stl_helpers_tests.cpp
rename to libs/base/base_tests/stl_helpers_tests.cpp
diff --git a/base/base_tests/string_utils_test.cpp b/libs/base/base_tests/string_utils_test.cpp
similarity index 100%
rename from base/base_tests/string_utils_test.cpp
rename to libs/base/base_tests/string_utils_test.cpp
diff --git a/base/base_tests/suffix_array_tests.cpp b/libs/base/base_tests/suffix_array_tests.cpp
similarity index 100%
rename from base/base_tests/suffix_array_tests.cpp
rename to libs/base/base_tests/suffix_array_tests.cpp
diff --git a/base/base_tests/sunrise_sunset_test.cpp b/libs/base/base_tests/sunrise_sunset_test.cpp
similarity index 100%
rename from base/base_tests/sunrise_sunset_test.cpp
rename to libs/base/base_tests/sunrise_sunset_test.cpp
diff --git a/base/base_tests/thread_pool_computational_tests.cpp b/libs/base/base_tests/thread_pool_computational_tests.cpp
similarity index 100%
rename from base/base_tests/thread_pool_computational_tests.cpp
rename to libs/base/base_tests/thread_pool_computational_tests.cpp
diff --git a/base/base_tests/thread_pool_delayed_tests.cpp b/libs/base/base_tests/thread_pool_delayed_tests.cpp
similarity index 100%
rename from base/base_tests/thread_pool_delayed_tests.cpp
rename to libs/base/base_tests/thread_pool_delayed_tests.cpp
diff --git a/base/base_tests/thread_pool_tests.cpp b/libs/base/base_tests/thread_pool_tests.cpp
similarity index 100%
rename from base/base_tests/thread_pool_tests.cpp
rename to libs/base/base_tests/thread_pool_tests.cpp
diff --git a/base/base_tests/thread_safe_queue_tests.cpp b/libs/base/base_tests/thread_safe_queue_tests.cpp
similarity index 100%
rename from base/base_tests/thread_safe_queue_tests.cpp
rename to libs/base/base_tests/thread_safe_queue_tests.cpp
diff --git a/base/base_tests/threaded_list_test.cpp b/libs/base/base_tests/threaded_list_test.cpp
similarity index 100%
rename from base/base_tests/threaded_list_test.cpp
rename to libs/base/base_tests/threaded_list_test.cpp
diff --git a/base/base_tests/threads_test.cpp b/libs/base/base_tests/threads_test.cpp
similarity index 100%
rename from base/base_tests/threads_test.cpp
rename to libs/base/base_tests/threads_test.cpp
diff --git a/base/base_tests/timegm_test.cpp b/libs/base/base_tests/timegm_test.cpp
similarity index 100%
rename from base/base_tests/timegm_test.cpp
rename to libs/base/base_tests/timegm_test.cpp
diff --git a/base/base_tests/timer_test.cpp b/libs/base/base_tests/timer_test.cpp
similarity index 100%
rename from base/base_tests/timer_test.cpp
rename to libs/base/base_tests/timer_test.cpp
diff --git a/base/base_tests/uni_string_dfa_test.cpp b/libs/base/base_tests/uni_string_dfa_test.cpp
similarity index 100%
rename from base/base_tests/uni_string_dfa_test.cpp
rename to libs/base/base_tests/uni_string_dfa_test.cpp
diff --git a/base/base_tests/visitor_tests.cpp b/libs/base/base_tests/visitor_tests.cpp
similarity index 100%
rename from base/base_tests/visitor_tests.cpp
rename to libs/base/base_tests/visitor_tests.cpp
diff --git a/base/beam.hpp b/libs/base/beam.hpp
similarity index 100%
rename from base/beam.hpp
rename to libs/base/beam.hpp
diff --git a/base/bidirectional_map.hpp b/libs/base/bidirectional_map.hpp
similarity index 100%
rename from base/bidirectional_map.hpp
rename to libs/base/bidirectional_map.hpp
diff --git a/base/bits.hpp b/libs/base/bits.hpp
similarity index 100%
rename from base/bits.hpp
rename to libs/base/bits.hpp
diff --git a/base/buffer_vector.hpp b/libs/base/buffer_vector.hpp
similarity index 100%
rename from base/buffer_vector.hpp
rename to libs/base/buffer_vector.hpp
diff --git a/base/cache.hpp b/libs/base/cache.hpp
similarity index 100%
rename from base/cache.hpp
rename to libs/base/cache.hpp
diff --git a/base/cancellable.cpp b/libs/base/cancellable.cpp
similarity index 100%
rename from base/cancellable.cpp
rename to libs/base/cancellable.cpp
diff --git a/base/cancellable.hpp b/libs/base/cancellable.hpp
similarity index 100%
rename from base/cancellable.hpp
rename to libs/base/cancellable.hpp
diff --git a/base/checked_cast.hpp b/libs/base/checked_cast.hpp
similarity index 100%
rename from base/checked_cast.hpp
rename to libs/base/checked_cast.hpp
diff --git a/base/clustering_map.hpp b/libs/base/clustering_map.hpp
similarity index 100%
rename from base/clustering_map.hpp
rename to libs/base/clustering_map.hpp
diff --git a/base/collection_cast.hpp b/libs/base/collection_cast.hpp
similarity index 100%
rename from base/collection_cast.hpp
rename to libs/base/collection_cast.hpp
diff --git a/base/control_flow.hpp b/libs/base/control_flow.hpp
similarity index 100%
rename from base/control_flow.hpp
rename to libs/base/control_flow.hpp
diff --git a/base/deferred_task.cpp b/libs/base/deferred_task.cpp
similarity index 100%
rename from base/deferred_task.cpp
rename to libs/base/deferred_task.cpp
diff --git a/base/deferred_task.hpp b/libs/base/deferred_task.hpp
similarity index 100%
rename from base/deferred_task.hpp
rename to libs/base/deferred_task.hpp
diff --git a/base/dfa_helpers.hpp b/libs/base/dfa_helpers.hpp
similarity index 100%
rename from base/dfa_helpers.hpp
rename to libs/base/dfa_helpers.hpp
diff --git a/base/exception.cpp b/libs/base/exception.cpp
similarity index 100%
rename from base/exception.cpp
rename to libs/base/exception.cpp
diff --git a/base/exception.hpp b/libs/base/exception.hpp
similarity index 100%
rename from base/exception.hpp
rename to libs/base/exception.hpp
diff --git a/base/fast_math.cpp b/libs/base/fast_math.cpp
similarity index 100%
rename from base/fast_math.cpp
rename to libs/base/fast_math.cpp
diff --git a/base/fifo_cache.hpp b/libs/base/fifo_cache.hpp
similarity index 100%
rename from base/fifo_cache.hpp
rename to libs/base/fifo_cache.hpp
diff --git a/base/file_name_utils.cpp b/libs/base/file_name_utils.cpp
similarity index 100%
rename from base/file_name_utils.cpp
rename to libs/base/file_name_utils.cpp
diff --git a/base/file_name_utils.hpp b/libs/base/file_name_utils.hpp
similarity index 100%
rename from base/file_name_utils.hpp
rename to libs/base/file_name_utils.hpp
diff --git a/base/geo_object_id.cpp b/libs/base/geo_object_id.cpp
similarity index 100%
rename from base/geo_object_id.cpp
rename to libs/base/geo_object_id.cpp
diff --git a/base/geo_object_id.hpp b/libs/base/geo_object_id.hpp
similarity index 100%
rename from base/geo_object_id.hpp
rename to libs/base/geo_object_id.hpp
diff --git a/base/gmtime.cpp b/libs/base/gmtime.cpp
similarity index 100%
rename from base/gmtime.cpp
rename to libs/base/gmtime.cpp
diff --git a/base/gmtime.hpp b/libs/base/gmtime.hpp
similarity index 100%
rename from base/gmtime.hpp
rename to libs/base/gmtime.hpp
diff --git a/base/internal/message.cpp b/libs/base/internal/message.cpp
similarity index 100%
rename from base/internal/message.cpp
rename to libs/base/internal/message.cpp
diff --git a/base/internal/message.hpp b/libs/base/internal/message.hpp
similarity index 100%
rename from base/internal/message.hpp
rename to libs/base/internal/message.hpp
diff --git a/base/levenshtein_dfa.cpp b/libs/base/levenshtein_dfa.cpp
similarity index 100%
rename from base/levenshtein_dfa.cpp
rename to libs/base/levenshtein_dfa.cpp
diff --git a/base/levenshtein_dfa.hpp b/libs/base/levenshtein_dfa.hpp
similarity index 100%
rename from base/levenshtein_dfa.hpp
rename to libs/base/levenshtein_dfa.hpp
diff --git a/base/limited_priority_queue.hpp b/libs/base/limited_priority_queue.hpp
similarity index 100%
rename from base/limited_priority_queue.hpp
rename to libs/base/limited_priority_queue.hpp
diff --git a/base/linked_map.hpp b/libs/base/linked_map.hpp
similarity index 100%
rename from base/linked_map.hpp
rename to libs/base/linked_map.hpp
diff --git a/base/logging.cpp b/libs/base/logging.cpp
similarity index 100%
rename from base/logging.cpp
rename to libs/base/logging.cpp
diff --git a/base/logging.hpp b/libs/base/logging.hpp
similarity index 100%
rename from base/logging.hpp
rename to libs/base/logging.hpp
diff --git a/base/lower_case.cpp b/libs/base/lower_case.cpp
similarity index 100%
rename from base/lower_case.cpp
rename to libs/base/lower_case.cpp
diff --git a/base/lru_cache.hpp b/libs/base/lru_cache.hpp
similarity index 100%
rename from base/lru_cache.hpp
rename to libs/base/lru_cache.hpp
diff --git a/base/macros.hpp b/libs/base/macros.hpp
similarity index 100%
rename from base/macros.hpp
rename to libs/base/macros.hpp
diff --git a/base/math.cpp b/libs/base/math.cpp
similarity index 100%
rename from base/math.cpp
rename to libs/base/math.cpp
diff --git a/base/math.hpp b/libs/base/math.hpp
similarity index 100%
rename from base/math.hpp
rename to libs/base/math.hpp
diff --git a/base/matrix.hpp b/libs/base/matrix.hpp
similarity index 100%
rename from base/matrix.hpp
rename to libs/base/matrix.hpp
diff --git a/base/mem_trie.hpp b/libs/base/mem_trie.hpp
similarity index 100%
rename from base/mem_trie.hpp
rename to libs/base/mem_trie.hpp
diff --git a/base/newtype.hpp b/libs/base/newtype.hpp
similarity index 100%
rename from base/newtype.hpp
rename to libs/base/newtype.hpp
diff --git a/base/non_intersecting_intervals.hpp b/libs/base/non_intersecting_intervals.hpp
similarity index 100%
rename from base/non_intersecting_intervals.hpp
rename to libs/base/non_intersecting_intervals.hpp
diff --git a/base/normalize_unicode.cpp b/libs/base/normalize_unicode.cpp
similarity index 100%
rename from base/normalize_unicode.cpp
rename to libs/base/normalize_unicode.cpp
diff --git a/base/observer_list.hpp b/libs/base/observer_list.hpp
similarity index 100%
rename from base/observer_list.hpp
rename to libs/base/observer_list.hpp
diff --git a/base/pprof.cpp b/libs/base/pprof.cpp
similarity index 100%
rename from base/pprof.cpp
rename to libs/base/pprof.cpp
diff --git a/base/pprof.hpp b/libs/base/pprof.hpp
similarity index 100%
rename from base/pprof.hpp
rename to libs/base/pprof.hpp
diff --git a/base/random.hpp b/libs/base/random.hpp
similarity index 100%
rename from base/random.hpp
rename to libs/base/random.hpp
diff --git a/base/range_iterator.hpp b/libs/base/range_iterator.hpp
similarity index 100%
rename from base/range_iterator.hpp
rename to libs/base/range_iterator.hpp
diff --git a/base/ref_counted.hpp b/libs/base/ref_counted.hpp
similarity index 100%
rename from base/ref_counted.hpp
rename to libs/base/ref_counted.hpp
diff --git a/base/rolling_hash.hpp b/libs/base/rolling_hash.hpp
similarity index 100%
rename from base/rolling_hash.hpp
rename to libs/base/rolling_hash.hpp
diff --git a/base/scope_guard.hpp b/libs/base/scope_guard.hpp
similarity index 100%
rename from base/scope_guard.hpp
rename to libs/base/scope_guard.hpp
diff --git a/base/set_operations.hpp b/libs/base/set_operations.hpp
similarity index 100%
rename from base/set_operations.hpp
rename to libs/base/set_operations.hpp
diff --git a/base/shared_buffer_manager.cpp b/libs/base/shared_buffer_manager.cpp
similarity index 100%
rename from base/shared_buffer_manager.cpp
rename to libs/base/shared_buffer_manager.cpp
diff --git a/base/shared_buffer_manager.hpp b/libs/base/shared_buffer_manager.hpp
similarity index 100%
rename from base/shared_buffer_manager.hpp
rename to libs/base/shared_buffer_manager.hpp
diff --git a/base/small_map.hpp b/libs/base/small_map.hpp
similarity index 100%
rename from base/small_map.hpp
rename to libs/base/small_map.hpp
diff --git a/base/small_set.hpp b/libs/base/small_set.hpp
similarity index 100%
rename from base/small_set.hpp
rename to libs/base/small_set.hpp
diff --git a/base/src_point.cpp b/libs/base/src_point.cpp
similarity index 100%
rename from base/src_point.cpp
rename to libs/base/src_point.cpp
diff --git a/base/src_point.hpp b/libs/base/src_point.hpp
similarity index 100%
rename from base/src_point.hpp
rename to libs/base/src_point.hpp
diff --git a/base/stats.hpp b/libs/base/stats.hpp
similarity index 100%
rename from base/stats.hpp
rename to libs/base/stats.hpp
diff --git a/base/std_serialization.hpp b/libs/base/std_serialization.hpp
similarity index 100%
rename from base/std_serialization.hpp
rename to libs/base/std_serialization.hpp
diff --git a/base/stl_helpers.hpp b/libs/base/stl_helpers.hpp
similarity index 100%
rename from base/stl_helpers.hpp
rename to libs/base/stl_helpers.hpp
diff --git a/base/stl_iterator.hpp b/libs/base/stl_iterator.hpp
similarity index 100%
rename from base/stl_iterator.hpp
rename to libs/base/stl_iterator.hpp
diff --git a/base/string_utils.cpp b/libs/base/string_utils.cpp
similarity index 100%
rename from base/string_utils.cpp
rename to libs/base/string_utils.cpp
diff --git a/base/string_utils.hpp b/libs/base/string_utils.hpp
similarity index 100%
rename from base/string_utils.hpp
rename to libs/base/string_utils.hpp
diff --git a/base/strings_bundle.cpp b/libs/base/strings_bundle.cpp
similarity index 100%
rename from base/strings_bundle.cpp
rename to libs/base/strings_bundle.cpp
diff --git a/base/strings_bundle.hpp b/libs/base/strings_bundle.hpp
similarity index 100%
rename from base/strings_bundle.hpp
rename to libs/base/strings_bundle.hpp
diff --git a/base/suffix_array.cpp b/libs/base/suffix_array.cpp
similarity index 100%
rename from base/suffix_array.cpp
rename to libs/base/suffix_array.cpp
diff --git a/base/suffix_array.hpp b/libs/base/suffix_array.hpp
similarity index 100%
rename from base/suffix_array.hpp
rename to libs/base/suffix_array.hpp
diff --git a/base/sunrise_sunset.cpp b/libs/base/sunrise_sunset.cpp
similarity index 100%
rename from base/sunrise_sunset.cpp
rename to libs/base/sunrise_sunset.cpp
diff --git a/base/sunrise_sunset.hpp b/libs/base/sunrise_sunset.hpp
similarity index 100%
rename from base/sunrise_sunset.hpp
rename to libs/base/sunrise_sunset.hpp
diff --git a/base/task_loop.hpp b/libs/base/task_loop.hpp
similarity index 100%
rename from base/task_loop.hpp
rename to libs/base/task_loop.hpp
diff --git a/base/thread.cpp b/libs/base/thread.cpp
similarity index 100%
rename from base/thread.cpp
rename to libs/base/thread.cpp
diff --git a/base/thread.hpp b/libs/base/thread.hpp
similarity index 100%
rename from base/thread.hpp
rename to libs/base/thread.hpp
diff --git a/base/thread_checker.cpp b/libs/base/thread_checker.cpp
similarity index 100%
rename from base/thread_checker.cpp
rename to libs/base/thread_checker.cpp
diff --git a/base/thread_checker.hpp b/libs/base/thread_checker.hpp
similarity index 100%
rename from base/thread_checker.hpp
rename to libs/base/thread_checker.hpp
diff --git a/base/thread_pool.cpp b/libs/base/thread_pool.cpp
similarity index 100%
rename from base/thread_pool.cpp
rename to libs/base/thread_pool.cpp
diff --git a/base/thread_pool.hpp b/libs/base/thread_pool.hpp
similarity index 100%
rename from base/thread_pool.hpp
rename to libs/base/thread_pool.hpp
diff --git a/base/thread_pool_computational.hpp b/libs/base/thread_pool_computational.hpp
similarity index 100%
rename from base/thread_pool_computational.hpp
rename to libs/base/thread_pool_computational.hpp
diff --git a/base/thread_pool_delayed.cpp b/libs/base/thread_pool_delayed.cpp
similarity index 100%
rename from base/thread_pool_delayed.cpp
rename to libs/base/thread_pool_delayed.cpp
diff --git a/base/thread_pool_delayed.hpp b/libs/base/thread_pool_delayed.hpp
similarity index 100%
rename from base/thread_pool_delayed.hpp
rename to libs/base/thread_pool_delayed.hpp
diff --git a/base/thread_safe_queue.hpp b/libs/base/thread_safe_queue.hpp
similarity index 100%
rename from base/thread_safe_queue.hpp
rename to libs/base/thread_safe_queue.hpp
diff --git a/base/thread_utils.hpp b/libs/base/thread_utils.hpp
similarity index 100%
rename from base/thread_utils.hpp
rename to libs/base/thread_utils.hpp
diff --git a/base/threaded_container.cpp b/libs/base/threaded_container.cpp
similarity index 100%
rename from base/threaded_container.cpp
rename to libs/base/threaded_container.cpp
diff --git a/base/threaded_container.hpp b/libs/base/threaded_container.hpp
similarity index 100%
rename from base/threaded_container.hpp
rename to libs/base/threaded_container.hpp
diff --git a/base/threaded_list.hpp b/libs/base/threaded_list.hpp
similarity index 100%
rename from base/threaded_list.hpp
rename to libs/base/threaded_list.hpp
diff --git a/base/timegm.cpp b/libs/base/timegm.cpp
similarity index 100%
rename from base/timegm.cpp
rename to libs/base/timegm.cpp
diff --git a/base/timegm.hpp b/libs/base/timegm.hpp
similarity index 100%
rename from base/timegm.hpp
rename to libs/base/timegm.hpp
diff --git a/base/timer.cpp b/libs/base/timer.cpp
similarity index 100%
rename from base/timer.cpp
rename to libs/base/timer.cpp
diff --git a/base/timer.hpp b/libs/base/timer.hpp
similarity index 100%
rename from base/timer.hpp
rename to libs/base/timer.hpp
diff --git a/base/uni_string_dfa.cpp b/libs/base/uni_string_dfa.cpp
similarity index 100%
rename from base/uni_string_dfa.cpp
rename to libs/base/uni_string_dfa.cpp
diff --git a/base/uni_string_dfa.hpp b/libs/base/uni_string_dfa.hpp
similarity index 100%
rename from base/uni_string_dfa.hpp
rename to libs/base/uni_string_dfa.hpp
diff --git a/base/visitor.hpp b/libs/base/visitor.hpp
similarity index 100%
rename from base/visitor.hpp
rename to libs/base/visitor.hpp
diff --git a/base/waiter.hpp b/libs/base/waiter.hpp
similarity index 100%
rename from base/waiter.hpp
rename to libs/base/waiter.hpp
diff --git a/coding/CMakeLists.txt b/libs/coding/CMakeLists.txt
similarity index 100%
rename from coding/CMakeLists.txt
rename to libs/coding/CMakeLists.txt
diff --git a/coding/base64.cpp b/libs/coding/base64.cpp
similarity index 100%
rename from coding/base64.cpp
rename to libs/coding/base64.cpp
diff --git a/coding/base64.hpp b/libs/coding/base64.hpp
similarity index 100%
rename from coding/base64.hpp
rename to libs/coding/base64.hpp
diff --git a/coding/bit_streams.hpp b/libs/coding/bit_streams.hpp
similarity index 100%
rename from coding/bit_streams.hpp
rename to libs/coding/bit_streams.hpp
diff --git a/coding/buffer_reader.hpp b/libs/coding/buffer_reader.hpp
similarity index 100%
rename from coding/buffer_reader.hpp
rename to libs/coding/buffer_reader.hpp
diff --git a/coding/buffered_file_writer.cpp b/libs/coding/buffered_file_writer.cpp
similarity index 100%
rename from coding/buffered_file_writer.cpp
rename to libs/coding/buffered_file_writer.cpp
diff --git a/coding/buffered_file_writer.hpp b/libs/coding/buffered_file_writer.hpp
similarity index 100%
rename from coding/buffered_file_writer.hpp
rename to libs/coding/buffered_file_writer.hpp
diff --git a/coding/bwt.cpp b/libs/coding/bwt.cpp
similarity index 100%
rename from coding/bwt.cpp
rename to libs/coding/bwt.cpp
diff --git a/coding/bwt.hpp b/libs/coding/bwt.hpp
similarity index 100%
rename from coding/bwt.hpp
rename to libs/coding/bwt.hpp
diff --git a/coding/bwt_coder.hpp b/libs/coding/bwt_coder.hpp
similarity index 100%
rename from coding/bwt_coder.hpp
rename to libs/coding/bwt_coder.hpp
diff --git a/coding/byte_stream.hpp b/libs/coding/byte_stream.hpp
similarity index 100%
rename from coding/byte_stream.hpp
rename to libs/coding/byte_stream.hpp
diff --git a/coding/coding_tests/CMakeLists.txt b/libs/coding/coding_tests/CMakeLists.txt
similarity index 100%
rename from coding/coding_tests/CMakeLists.txt
rename to libs/coding/coding_tests/CMakeLists.txt
diff --git a/coding/coding_tests/base64_test.cpp b/libs/coding/coding_tests/base64_test.cpp
similarity index 100%
rename from coding/coding_tests/base64_test.cpp
rename to libs/coding/coding_tests/base64_test.cpp
diff --git a/coding/coding_tests/bit_streams_test.cpp b/libs/coding/coding_tests/bit_streams_test.cpp
similarity index 100%
rename from coding/coding_tests/bit_streams_test.cpp
rename to libs/coding/coding_tests/bit_streams_test.cpp
diff --git a/coding/coding_tests/bwt_coder_tests.cpp b/libs/coding/coding_tests/bwt_coder_tests.cpp
similarity index 100%
rename from coding/coding_tests/bwt_coder_tests.cpp
rename to libs/coding/coding_tests/bwt_coder_tests.cpp
diff --git a/coding/coding_tests/bwt_tests.cpp b/libs/coding/coding_tests/bwt_tests.cpp
similarity index 100%
rename from coding/coding_tests/bwt_tests.cpp
rename to libs/coding/coding_tests/bwt_tests.cpp
diff --git a/coding/coding_tests/compressed_bit_vector_test.cpp b/libs/coding/coding_tests/compressed_bit_vector_test.cpp
similarity index 100%
rename from coding/coding_tests/compressed_bit_vector_test.cpp
rename to libs/coding/coding_tests/compressed_bit_vector_test.cpp
diff --git a/coding/coding_tests/csv_reader_test.cpp b/libs/coding/coding_tests/csv_reader_test.cpp
similarity index 100%
rename from coding/coding_tests/csv_reader_test.cpp
rename to libs/coding/coding_tests/csv_reader_test.cpp
diff --git a/coding/coding_tests/dd_vector_test.cpp b/libs/coding/coding_tests/dd_vector_test.cpp
similarity index 100%
rename from coding/coding_tests/dd_vector_test.cpp
rename to libs/coding/coding_tests/dd_vector_test.cpp
diff --git a/coding/coding_tests/diff_test.cpp b/libs/coding/coding_tests/diff_test.cpp
similarity index 100%
rename from coding/coding_tests/diff_test.cpp
rename to libs/coding/coding_tests/diff_test.cpp
diff --git a/coding/coding_tests/elias_coder_test.cpp b/libs/coding/coding_tests/elias_coder_test.cpp
similarity index 100%
rename from coding/coding_tests/elias_coder_test.cpp
rename to libs/coding/coding_tests/elias_coder_test.cpp
diff --git a/coding/coding_tests/endianness_test.cpp b/libs/coding/coding_tests/endianness_test.cpp
similarity index 100%
rename from coding/coding_tests/endianness_test.cpp
rename to libs/coding/coding_tests/endianness_test.cpp
diff --git a/coding/coding_tests/file_data_test.cpp b/libs/coding/coding_tests/file_data_test.cpp
similarity index 100%
rename from coding/coding_tests/file_data_test.cpp
rename to libs/coding/coding_tests/file_data_test.cpp
diff --git a/coding/coding_tests/file_sort_test.cpp b/libs/coding/coding_tests/file_sort_test.cpp
similarity index 100%
rename from coding/coding_tests/file_sort_test.cpp
rename to libs/coding/coding_tests/file_sort_test.cpp
diff --git a/coding/coding_tests/files_container_tests.cpp b/libs/coding/coding_tests/files_container_tests.cpp
similarity index 100%
rename from coding/coding_tests/files_container_tests.cpp
rename to libs/coding/coding_tests/files_container_tests.cpp
diff --git a/coding/coding_tests/fixed_bits_ddvector_test.cpp b/libs/coding/coding_tests/fixed_bits_ddvector_test.cpp
similarity index 100%
rename from coding/coding_tests/fixed_bits_ddvector_test.cpp
rename to libs/coding/coding_tests/fixed_bits_ddvector_test.cpp
diff --git a/coding/coding_tests/geometry_coding_test.cpp b/libs/coding/coding_tests/geometry_coding_test.cpp
similarity index 100%
rename from coding/coding_tests/geometry_coding_test.cpp
rename to libs/coding/coding_tests/geometry_coding_test.cpp
diff --git a/coding/coding_tests/geometry_serialization_test.cpp b/libs/coding/coding_tests/geometry_serialization_test.cpp
similarity index 100%
rename from coding/coding_tests/geometry_serialization_test.cpp
rename to libs/coding/coding_tests/geometry_serialization_test.cpp
diff --git a/coding/coding_tests/hex_test.cpp b/libs/coding/coding_tests/hex_test.cpp
similarity index 100%
rename from coding/coding_tests/hex_test.cpp
rename to libs/coding/coding_tests/hex_test.cpp
diff --git a/coding/coding_tests/huffman_test.cpp b/libs/coding/coding_tests/huffman_test.cpp
similarity index 100%
rename from coding/coding_tests/huffman_test.cpp
rename to libs/coding/coding_tests/huffman_test.cpp
diff --git a/coding/coding_tests/map_uint32_to_val_tests.cpp b/libs/coding/coding_tests/map_uint32_to_val_tests.cpp
similarity index 100%
rename from coding/coding_tests/map_uint32_to_val_tests.cpp
rename to libs/coding/coding_tests/map_uint32_to_val_tests.cpp
diff --git a/coding/coding_tests/mem_file_reader_test.cpp b/libs/coding/coding_tests/mem_file_reader_test.cpp
similarity index 100%
rename from coding/coding_tests/mem_file_reader_test.cpp
rename to libs/coding/coding_tests/mem_file_reader_test.cpp
diff --git a/coding/coding_tests/mem_file_writer_test.cpp b/libs/coding/coding_tests/mem_file_writer_test.cpp
similarity index 100%
rename from coding/coding_tests/mem_file_writer_test.cpp
rename to libs/coding/coding_tests/mem_file_writer_test.cpp
diff --git a/coding/coding_tests/move_to_front_tests.cpp b/libs/coding/coding_tests/move_to_front_tests.cpp
similarity index 100%
rename from coding/coding_tests/move_to_front_tests.cpp
rename to libs/coding/coding_tests/move_to_front_tests.cpp
diff --git a/coding/coding_tests/png_decoder_test.cpp b/libs/coding/coding_tests/png_decoder_test.cpp
similarity index 100%
rename from coding/coding_tests/png_decoder_test.cpp
rename to libs/coding/coding_tests/png_decoder_test.cpp
diff --git a/coding/coding_tests/point_coding_tests.cpp b/libs/coding/coding_tests/point_coding_tests.cpp
similarity index 100%
rename from coding/coding_tests/point_coding_tests.cpp
rename to libs/coding/coding_tests/point_coding_tests.cpp
diff --git a/coding/coding_tests/reader_cache_test.cpp b/libs/coding/coding_tests/reader_cache_test.cpp
similarity index 100%
rename from coding/coding_tests/reader_cache_test.cpp
rename to libs/coding/coding_tests/reader_cache_test.cpp
diff --git a/coding/coding_tests/reader_test.cpp b/libs/coding/coding_tests/reader_test.cpp
similarity index 100%
rename from coding/coding_tests/reader_test.cpp
rename to libs/coding/coding_tests/reader_test.cpp
diff --git a/coding/coding_tests/reader_test.hpp b/libs/coding/coding_tests/reader_test.hpp
similarity index 100%
rename from coding/coding_tests/reader_test.hpp
rename to libs/coding/coding_tests/reader_test.hpp
diff --git a/coding/coding_tests/reader_writer_ops_test.cpp b/libs/coding/coding_tests/reader_writer_ops_test.cpp
similarity index 100%
rename from coding/coding_tests/reader_writer_ops_test.cpp
rename to libs/coding/coding_tests/reader_writer_ops_test.cpp
diff --git a/coding/coding_tests/serdes_json_test.cpp b/libs/coding/coding_tests/serdes_json_test.cpp
similarity index 100%
rename from coding/coding_tests/serdes_json_test.cpp
rename to libs/coding/coding_tests/serdes_json_test.cpp
diff --git a/coding/coding_tests/sha1_test.cpp b/libs/coding/coding_tests/sha1_test.cpp
similarity index 100%
rename from coding/coding_tests/sha1_test.cpp
rename to libs/coding/coding_tests/sha1_test.cpp
diff --git a/coding/coding_tests/simple_dense_coding_test.cpp b/libs/coding/coding_tests/simple_dense_coding_test.cpp
similarity index 100%
rename from coding/coding_tests/simple_dense_coding_test.cpp
rename to libs/coding/coding_tests/simple_dense_coding_test.cpp
diff --git a/coding/coding_tests/sparse_vector_tests.cpp b/libs/coding/coding_tests/sparse_vector_tests.cpp
similarity index 100%
rename from coding/coding_tests/sparse_vector_tests.cpp
rename to libs/coding/coding_tests/sparse_vector_tests.cpp
diff --git a/coding/coding_tests/string_utf8_multilang_tests.cpp b/libs/coding/coding_tests/string_utf8_multilang_tests.cpp
similarity index 100%
rename from coding/coding_tests/string_utf8_multilang_tests.cpp
rename to libs/coding/coding_tests/string_utf8_multilang_tests.cpp
diff --git a/coding/coding_tests/succinct_ef_test.cpp b/libs/coding/coding_tests/succinct_ef_test.cpp
similarity index 100%
rename from coding/coding_tests/succinct_ef_test.cpp
rename to libs/coding/coding_tests/succinct_ef_test.cpp
diff --git a/coding/coding_tests/succinct_mapper_test.cpp b/libs/coding/coding_tests/succinct_mapper_test.cpp
similarity index 100%
rename from coding/coding_tests/succinct_mapper_test.cpp
rename to libs/coding/coding_tests/succinct_mapper_test.cpp
diff --git a/coding/coding_tests/test_polylines.cpp b/libs/coding/coding_tests/test_polylines.cpp
similarity index 100%
rename from coding/coding_tests/test_polylines.cpp
rename to libs/coding/coding_tests/test_polylines.cpp
diff --git a/coding/coding_tests/test_polylines.hpp b/libs/coding/coding_tests/test_polylines.hpp
similarity index 100%
rename from coding/coding_tests/test_polylines.hpp
rename to libs/coding/coding_tests/test_polylines.hpp
diff --git a/coding/coding_tests/text_storage_tests.cpp b/libs/coding/coding_tests/text_storage_tests.cpp
similarity index 100%
rename from coding/coding_tests/text_storage_tests.cpp
rename to libs/coding/coding_tests/text_storage_tests.cpp
diff --git a/coding/coding_tests/traffic_test.cpp b/libs/coding/coding_tests/traffic_test.cpp
similarity index 100%
rename from coding/coding_tests/traffic_test.cpp
rename to libs/coding/coding_tests/traffic_test.cpp
diff --git a/coding/coding_tests/url_tests.cpp b/libs/coding/coding_tests/url_tests.cpp
similarity index 100%
rename from coding/coding_tests/url_tests.cpp
rename to libs/coding/coding_tests/url_tests.cpp
diff --git a/coding/coding_tests/value_opt_string_test.cpp b/libs/coding/coding_tests/value_opt_string_test.cpp
similarity index 100%
rename from coding/coding_tests/value_opt_string_test.cpp
rename to libs/coding/coding_tests/value_opt_string_test.cpp
diff --git a/coding/coding_tests/var_record_reader_test.cpp b/libs/coding/coding_tests/var_record_reader_test.cpp
similarity index 100%
rename from coding/coding_tests/var_record_reader_test.cpp
rename to libs/coding/coding_tests/var_record_reader_test.cpp
diff --git a/coding/coding_tests/var_serial_vector_test.cpp b/libs/coding/coding_tests/var_serial_vector_test.cpp
similarity index 100%
rename from coding/coding_tests/var_serial_vector_test.cpp
rename to libs/coding/coding_tests/var_serial_vector_test.cpp
diff --git a/coding/coding_tests/varint_test.cpp b/libs/coding/coding_tests/varint_test.cpp
similarity index 100%
rename from coding/coding_tests/varint_test.cpp
rename to libs/coding/coding_tests/varint_test.cpp
diff --git a/coding/coding_tests/writer_test.cpp b/libs/coding/coding_tests/writer_test.cpp
similarity index 100%
rename from coding/coding_tests/writer_test.cpp
rename to libs/coding/coding_tests/writer_test.cpp
diff --git a/coding/coding_tests/xml_parser_tests.cpp b/libs/coding/coding_tests/xml_parser_tests.cpp
similarity index 100%
rename from coding/coding_tests/xml_parser_tests.cpp
rename to libs/coding/coding_tests/xml_parser_tests.cpp
diff --git a/coding/coding_tests/zip_creator_test.cpp b/libs/coding/coding_tests/zip_creator_test.cpp
similarity index 100%
rename from coding/coding_tests/zip_creator_test.cpp
rename to libs/coding/coding_tests/zip_creator_test.cpp
diff --git a/coding/coding_tests/zip_reader_test.cpp b/libs/coding/coding_tests/zip_reader_test.cpp
similarity index 100%
rename from coding/coding_tests/zip_reader_test.cpp
rename to libs/coding/coding_tests/zip_reader_test.cpp
diff --git a/coding/coding_tests/zlib_test.cpp b/libs/coding/coding_tests/zlib_test.cpp
similarity index 100%
rename from coding/coding_tests/zlib_test.cpp
rename to libs/coding/coding_tests/zlib_test.cpp
diff --git a/coding/compressed_bit_vector.cpp b/libs/coding/compressed_bit_vector.cpp
similarity index 100%
rename from coding/compressed_bit_vector.cpp
rename to libs/coding/compressed_bit_vector.cpp
diff --git a/coding/compressed_bit_vector.hpp b/libs/coding/compressed_bit_vector.hpp
similarity index 100%
rename from coding/compressed_bit_vector.hpp
rename to libs/coding/compressed_bit_vector.hpp
diff --git a/coding/constants.hpp b/libs/coding/constants.hpp
similarity index 100%
rename from coding/constants.hpp
rename to libs/coding/constants.hpp
diff --git a/coding/csv_reader.cpp b/libs/coding/csv_reader.cpp
similarity index 100%
rename from coding/csv_reader.cpp
rename to libs/coding/csv_reader.cpp
diff --git a/coding/csv_reader.hpp b/libs/coding/csv_reader.hpp
similarity index 100%
rename from coding/csv_reader.hpp
rename to libs/coding/csv_reader.hpp
diff --git a/coding/dd_vector.hpp b/libs/coding/dd_vector.hpp
similarity index 100%
rename from coding/dd_vector.hpp
rename to libs/coding/dd_vector.hpp
diff --git a/coding/diff.hpp b/libs/coding/diff.hpp
similarity index 100%
rename from coding/diff.hpp
rename to libs/coding/diff.hpp
diff --git a/coding/elias_coder.hpp b/libs/coding/elias_coder.hpp
similarity index 100%
rename from coding/elias_coder.hpp
rename to libs/coding/elias_coder.hpp
diff --git a/coding/endianness.hpp b/libs/coding/endianness.hpp
similarity index 100%
rename from coding/endianness.hpp
rename to libs/coding/endianness.hpp
diff --git a/coding/file_reader.cpp b/libs/coding/file_reader.cpp
similarity index 100%
rename from coding/file_reader.cpp
rename to libs/coding/file_reader.cpp
diff --git a/coding/file_reader.hpp b/libs/coding/file_reader.hpp
similarity index 100%
rename from coding/file_reader.hpp
rename to libs/coding/file_reader.hpp
diff --git a/coding/file_sort.hpp b/libs/coding/file_sort.hpp
similarity index 100%
rename from coding/file_sort.hpp
rename to libs/coding/file_sort.hpp
diff --git a/coding/file_writer.cpp b/libs/coding/file_writer.cpp
similarity index 100%
rename from coding/file_writer.cpp
rename to libs/coding/file_writer.cpp
diff --git a/coding/file_writer.hpp b/libs/coding/file_writer.hpp
similarity index 100%
rename from coding/file_writer.hpp
rename to libs/coding/file_writer.hpp
diff --git a/coding/files_container.cpp b/libs/coding/files_container.cpp
similarity index 100%
rename from coding/files_container.cpp
rename to libs/coding/files_container.cpp
diff --git a/coding/files_container.hpp b/libs/coding/files_container.hpp
similarity index 100%
rename from coding/files_container.hpp
rename to libs/coding/files_container.hpp
diff --git a/coding/fixed_bits_ddvector.hpp b/libs/coding/fixed_bits_ddvector.hpp
similarity index 100%
rename from coding/fixed_bits_ddvector.hpp
rename to libs/coding/fixed_bits_ddvector.hpp
diff --git a/coding/geometry_coding.cpp b/libs/coding/geometry_coding.cpp
similarity index 100%
rename from coding/geometry_coding.cpp
rename to libs/coding/geometry_coding.cpp
diff --git a/coding/geometry_coding.hpp b/libs/coding/geometry_coding.hpp
similarity index 100%
rename from coding/geometry_coding.hpp
rename to libs/coding/geometry_coding.hpp
diff --git a/coding/hex.cpp b/libs/coding/hex.cpp
similarity index 100%
rename from coding/hex.cpp
rename to libs/coding/hex.cpp
diff --git a/coding/hex.hpp b/libs/coding/hex.hpp
similarity index 100%
rename from coding/hex.hpp
rename to libs/coding/hex.hpp
diff --git a/coding/huffman.cpp b/libs/coding/huffman.cpp
similarity index 100%
rename from coding/huffman.cpp
rename to libs/coding/huffman.cpp
diff --git a/coding/huffman.hpp b/libs/coding/huffman.hpp
similarity index 100%
rename from coding/huffman.hpp
rename to libs/coding/huffman.hpp
diff --git a/coding/internal/file64_api.hpp b/libs/coding/internal/file64_api.hpp
similarity index 100%
rename from coding/internal/file64_api.hpp
rename to libs/coding/internal/file64_api.hpp
diff --git a/coding/internal/file_data.cpp b/libs/coding/internal/file_data.cpp
similarity index 100%
rename from coding/internal/file_data.cpp
rename to libs/coding/internal/file_data.cpp
diff --git a/coding/internal/file_data.hpp b/libs/coding/internal/file_data.hpp
similarity index 100%
rename from coding/internal/file_data.hpp
rename to libs/coding/internal/file_data.hpp
diff --git a/coding/internal/xmlparser.hpp b/libs/coding/internal/xmlparser.hpp
similarity index 100%
rename from coding/internal/xmlparser.hpp
rename to libs/coding/internal/xmlparser.hpp
diff --git a/coding/map_uint32_to_val.hpp b/libs/coding/map_uint32_to_val.hpp
similarity index 100%
rename from coding/map_uint32_to_val.hpp
rename to libs/coding/map_uint32_to_val.hpp
diff --git a/coding/memory_region.hpp b/libs/coding/memory_region.hpp
similarity index 100%
rename from coding/memory_region.hpp
rename to libs/coding/memory_region.hpp
diff --git a/coding/mmap_reader.cpp b/libs/coding/mmap_reader.cpp
similarity index 100%
rename from coding/mmap_reader.cpp
rename to libs/coding/mmap_reader.cpp
diff --git a/coding/mmap_reader.hpp b/libs/coding/mmap_reader.hpp
similarity index 100%
rename from coding/mmap_reader.hpp
rename to libs/coding/mmap_reader.hpp
diff --git a/coding/move_to_front.cpp b/libs/coding/move_to_front.cpp
similarity index 100%
rename from coding/move_to_front.cpp
rename to libs/coding/move_to_front.cpp
diff --git a/coding/move_to_front.hpp b/libs/coding/move_to_front.hpp
similarity index 100%
rename from coding/move_to_front.hpp
rename to libs/coding/move_to_front.hpp
diff --git a/coding/parse_xml.hpp b/libs/coding/parse_xml.hpp
similarity index 100%
rename from coding/parse_xml.hpp
rename to libs/coding/parse_xml.hpp
diff --git a/coding/point_coding.cpp b/libs/coding/point_coding.cpp
similarity index 100%
rename from coding/point_coding.cpp
rename to libs/coding/point_coding.cpp
diff --git a/coding/point_coding.hpp b/libs/coding/point_coding.hpp
similarity index 100%
rename from coding/point_coding.hpp
rename to libs/coding/point_coding.hpp
diff --git a/coding/read_write_utils.hpp b/libs/coding/read_write_utils.hpp
similarity index 100%
rename from coding/read_write_utils.hpp
rename to libs/coding/read_write_utils.hpp
diff --git a/coding/reader.cpp b/libs/coding/reader.cpp
similarity index 100%
rename from coding/reader.cpp
rename to libs/coding/reader.cpp
diff --git a/coding/reader.hpp b/libs/coding/reader.hpp
similarity index 100%
rename from coding/reader.hpp
rename to libs/coding/reader.hpp
diff --git a/coding/reader_cache.hpp b/libs/coding/reader_cache.hpp
similarity index 100%
rename from coding/reader_cache.hpp
rename to libs/coding/reader_cache.hpp
diff --git a/coding/reader_streambuf.cpp b/libs/coding/reader_streambuf.cpp
similarity index 100%
rename from coding/reader_streambuf.cpp
rename to libs/coding/reader_streambuf.cpp
diff --git a/coding/reader_streambuf.hpp b/libs/coding/reader_streambuf.hpp
similarity index 100%
rename from coding/reader_streambuf.hpp
rename to libs/coding/reader_streambuf.hpp
diff --git a/coding/reader_wrapper.hpp b/libs/coding/reader_wrapper.hpp
similarity index 100%
rename from coding/reader_wrapper.hpp
rename to libs/coding/reader_wrapper.hpp
diff --git a/coding/reader_writer_ops.cpp b/libs/coding/reader_writer_ops.cpp
similarity index 100%
rename from coding/reader_writer_ops.cpp
rename to libs/coding/reader_writer_ops.cpp
diff --git a/coding/reader_writer_ops.hpp b/libs/coding/reader_writer_ops.hpp
similarity index 100%
rename from coding/reader_writer_ops.hpp
rename to libs/coding/reader_writer_ops.hpp
diff --git a/coding/serdes_binary_header.hpp b/libs/coding/serdes_binary_header.hpp
similarity index 100%
rename from coding/serdes_binary_header.hpp
rename to libs/coding/serdes_binary_header.hpp
diff --git a/coding/serdes_json.hpp b/libs/coding/serdes_json.hpp
similarity index 100%
rename from coding/serdes_json.hpp
rename to libs/coding/serdes_json.hpp
diff --git a/coding/sha1.cpp b/libs/coding/sha1.cpp
similarity index 100%
rename from coding/sha1.cpp
rename to libs/coding/sha1.cpp
diff --git a/coding/sha1.hpp b/libs/coding/sha1.hpp
similarity index 100%
rename from coding/sha1.hpp
rename to libs/coding/sha1.hpp
diff --git a/coding/simple_dense_coding.cpp b/libs/coding/simple_dense_coding.cpp
similarity index 100%
rename from coding/simple_dense_coding.cpp
rename to libs/coding/simple_dense_coding.cpp
diff --git a/coding/simple_dense_coding.hpp b/libs/coding/simple_dense_coding.hpp
similarity index 100%
rename from coding/simple_dense_coding.hpp
rename to libs/coding/simple_dense_coding.hpp
diff --git a/coding/sparse_vector.hpp b/libs/coding/sparse_vector.hpp
similarity index 100%
rename from coding/sparse_vector.hpp
rename to libs/coding/sparse_vector.hpp
diff --git a/coding/streams.hpp b/libs/coding/streams.hpp
similarity index 100%
rename from coding/streams.hpp
rename to libs/coding/streams.hpp
diff --git a/coding/streams_common.hpp b/libs/coding/streams_common.hpp
similarity index 100%
rename from coding/streams_common.hpp
rename to libs/coding/streams_common.hpp
diff --git a/coding/streams_sink.hpp b/libs/coding/streams_sink.hpp
similarity index 100%
rename from coding/streams_sink.hpp
rename to libs/coding/streams_sink.hpp
diff --git a/coding/string_utf8_multilang.cpp b/libs/coding/string_utf8_multilang.cpp
similarity index 100%
rename from coding/string_utf8_multilang.cpp
rename to libs/coding/string_utf8_multilang.cpp
diff --git a/coding/string_utf8_multilang.hpp b/libs/coding/string_utf8_multilang.hpp
similarity index 100%
rename from coding/string_utf8_multilang.hpp
rename to libs/coding/string_utf8_multilang.hpp
diff --git a/coding/succinct_mapper.hpp b/libs/coding/succinct_mapper.hpp
similarity index 100%
rename from coding/succinct_mapper.hpp
rename to libs/coding/succinct_mapper.hpp
diff --git a/coding/tesselator_decl.hpp b/libs/coding/tesselator_decl.hpp
similarity index 100%
rename from coding/tesselator_decl.hpp
rename to libs/coding/tesselator_decl.hpp
diff --git a/coding/text_storage.hpp b/libs/coding/text_storage.hpp
similarity index 100%
rename from coding/text_storage.hpp
rename to libs/coding/text_storage.hpp
diff --git a/coding/traffic.cpp b/libs/coding/traffic.cpp
similarity index 100%
rename from coding/traffic.cpp
rename to libs/coding/traffic.cpp
diff --git a/coding/traffic.hpp b/libs/coding/traffic.hpp
similarity index 100%
rename from coding/traffic.hpp
rename to libs/coding/traffic.hpp
diff --git a/coding/transliteration.cpp b/libs/coding/transliteration.cpp
similarity index 100%
rename from coding/transliteration.cpp
rename to libs/coding/transliteration.cpp
diff --git a/coding/transliteration.hpp b/libs/coding/transliteration.hpp
similarity index 100%
rename from coding/transliteration.hpp
rename to libs/coding/transliteration.hpp
diff --git a/coding/url.cpp b/libs/coding/url.cpp
similarity index 100%
rename from coding/url.cpp
rename to libs/coding/url.cpp
diff --git a/coding/url.hpp b/libs/coding/url.hpp
similarity index 100%
rename from coding/url.hpp
rename to libs/coding/url.hpp
diff --git a/coding/value_opt_string.hpp b/libs/coding/value_opt_string.hpp
similarity index 100%
rename from coding/value_opt_string.hpp
rename to libs/coding/value_opt_string.hpp
diff --git a/coding/var_record_reader.hpp b/libs/coding/var_record_reader.hpp
similarity index 100%
rename from coding/var_record_reader.hpp
rename to libs/coding/var_record_reader.hpp
diff --git a/coding/var_serial_vector.hpp b/libs/coding/var_serial_vector.hpp
similarity index 100%
rename from coding/var_serial_vector.hpp
rename to libs/coding/var_serial_vector.hpp
diff --git a/coding/varint.hpp b/libs/coding/varint.hpp
similarity index 100%
rename from coding/varint.hpp
rename to libs/coding/varint.hpp
diff --git a/coding/write_to_sink.hpp b/libs/coding/write_to_sink.hpp
similarity index 100%
rename from coding/write_to_sink.hpp
rename to libs/coding/write_to_sink.hpp
diff --git a/coding/writer.hpp b/libs/coding/writer.hpp
similarity index 100%
rename from coding/writer.hpp
rename to libs/coding/writer.hpp
diff --git a/coding/zip_creator.cpp b/libs/coding/zip_creator.cpp
similarity index 100%
rename from coding/zip_creator.cpp
rename to libs/coding/zip_creator.cpp
diff --git a/coding/zip_creator.hpp b/libs/coding/zip_creator.hpp
similarity index 100%
rename from coding/zip_creator.hpp
rename to libs/coding/zip_creator.hpp
diff --git a/coding/zip_reader.cpp b/libs/coding/zip_reader.cpp
similarity index 100%
rename from coding/zip_reader.cpp
rename to libs/coding/zip_reader.cpp
diff --git a/coding/zip_reader.hpp b/libs/coding/zip_reader.hpp
similarity index 100%
rename from coding/zip_reader.hpp
rename to libs/coding/zip_reader.hpp
diff --git a/coding/zlib.cpp b/libs/coding/zlib.cpp
similarity index 100%
rename from coding/zlib.cpp
rename to libs/coding/zlib.cpp
diff --git a/coding/zlib.hpp b/libs/coding/zlib.hpp
similarity index 100%
rename from coding/zlib.hpp
rename to libs/coding/zlib.hpp
diff --git a/cppjansson/CMakeLists.txt b/libs/cppjansson/CMakeLists.txt
similarity index 100%
rename from cppjansson/CMakeLists.txt
rename to libs/cppjansson/CMakeLists.txt
diff --git a/cppjansson/cppjansson.cpp b/libs/cppjansson/cppjansson.cpp
similarity index 100%
rename from cppjansson/cppjansson.cpp
rename to libs/cppjansson/cppjansson.cpp
diff --git a/cppjansson/cppjansson.hpp b/libs/cppjansson/cppjansson.hpp
similarity index 100%
rename from cppjansson/cppjansson.hpp
rename to libs/cppjansson/cppjansson.hpp
diff --git a/cppjansson/jansson_handle.cpp b/libs/cppjansson/jansson_handle.cpp
similarity index 100%
rename from cppjansson/jansson_handle.cpp
rename to libs/cppjansson/jansson_handle.cpp
diff --git a/cppjansson/jansson_handle.hpp b/libs/cppjansson/jansson_handle.hpp
similarity index 100%
rename from cppjansson/jansson_handle.hpp
rename to libs/cppjansson/jansson_handle.hpp
diff --git a/descriptions/CMakeLists.txt b/libs/descriptions/CMakeLists.txt
similarity index 100%
rename from descriptions/CMakeLists.txt
rename to libs/descriptions/CMakeLists.txt
diff --git a/descriptions/descriptions_tests/CMakeLists.txt b/libs/descriptions/descriptions_tests/CMakeLists.txt
similarity index 100%
rename from descriptions/descriptions_tests/CMakeLists.txt
rename to libs/descriptions/descriptions_tests/CMakeLists.txt
diff --git a/descriptions/descriptions_tests/descriptions_tests.cpp b/libs/descriptions/descriptions_tests/descriptions_tests.cpp
similarity index 100%
rename from descriptions/descriptions_tests/descriptions_tests.cpp
rename to libs/descriptions/descriptions_tests/descriptions_tests.cpp
diff --git a/descriptions/header.hpp b/libs/descriptions/header.hpp
similarity index 100%
rename from descriptions/header.hpp
rename to libs/descriptions/header.hpp
diff --git a/descriptions/loader.cpp b/libs/descriptions/loader.cpp
similarity index 100%
rename from descriptions/loader.cpp
rename to libs/descriptions/loader.cpp
diff --git a/descriptions/loader.hpp b/libs/descriptions/loader.hpp
similarity index 100%
rename from descriptions/loader.hpp
rename to libs/descriptions/loader.hpp
diff --git a/descriptions/serdes.hpp b/libs/descriptions/serdes.hpp
similarity index 100%
rename from descriptions/serdes.hpp
rename to libs/descriptions/serdes.hpp
diff --git a/drape/CMakeLists.txt b/libs/drape/CMakeLists.txt
similarity index 100%
rename from drape/CMakeLists.txt
rename to libs/drape/CMakeLists.txt
diff --git a/drape/attribute_buffer_mutator.cpp b/libs/drape/attribute_buffer_mutator.cpp
similarity index 100%
rename from drape/attribute_buffer_mutator.cpp
rename to libs/drape/attribute_buffer_mutator.cpp
diff --git a/drape/attribute_buffer_mutator.hpp b/libs/drape/attribute_buffer_mutator.hpp
similarity index 100%
rename from drape/attribute_buffer_mutator.hpp
rename to libs/drape/attribute_buffer_mutator.hpp
diff --git a/drape/attribute_provider.cpp b/libs/drape/attribute_provider.cpp
similarity index 100%
rename from drape/attribute_provider.cpp
rename to libs/drape/attribute_provider.cpp
diff --git a/drape/attribute_provider.hpp b/libs/drape/attribute_provider.hpp
similarity index 100%
rename from drape/attribute_provider.hpp
rename to libs/drape/attribute_provider.hpp
diff --git a/drape/batcher.cpp b/libs/drape/batcher.cpp
similarity index 100%
rename from drape/batcher.cpp
rename to libs/drape/batcher.cpp
diff --git a/drape/batcher.hpp b/libs/drape/batcher.hpp
similarity index 100%
rename from drape/batcher.hpp
rename to libs/drape/batcher.hpp
diff --git a/drape/batcher_helpers.cpp b/libs/drape/batcher_helpers.cpp
similarity index 100%
rename from drape/batcher_helpers.cpp
rename to libs/drape/batcher_helpers.cpp
diff --git a/drape/batcher_helpers.hpp b/libs/drape/batcher_helpers.hpp
similarity index 100%
rename from drape/batcher_helpers.hpp
rename to libs/drape/batcher_helpers.hpp
diff --git a/drape/binding_info.cpp b/libs/drape/binding_info.cpp
similarity index 100%
rename from drape/binding_info.cpp
rename to libs/drape/binding_info.cpp
diff --git a/drape/binding_info.hpp b/libs/drape/binding_info.hpp
similarity index 100%
rename from drape/binding_info.hpp
rename to libs/drape/binding_info.hpp
diff --git a/drape/buffer_base.cpp b/libs/drape/buffer_base.cpp
similarity index 100%
rename from drape/buffer_base.cpp
rename to libs/drape/buffer_base.cpp
diff --git a/drape/buffer_base.hpp b/libs/drape/buffer_base.hpp
similarity index 100%
rename from drape/buffer_base.hpp
rename to libs/drape/buffer_base.hpp
diff --git a/drape/color.hpp b/libs/drape/color.hpp
similarity index 100%
rename from drape/color.hpp
rename to libs/drape/color.hpp
diff --git a/drape/constants.hpp b/libs/drape/constants.hpp
similarity index 100%
rename from drape/constants.hpp
rename to libs/drape/constants.hpp
diff --git a/drape/cpu_buffer.cpp b/libs/drape/cpu_buffer.cpp
similarity index 100%
rename from drape/cpu_buffer.cpp
rename to libs/drape/cpu_buffer.cpp
diff --git a/drape/cpu_buffer.hpp b/libs/drape/cpu_buffer.hpp
similarity index 100%
rename from drape/cpu_buffer.hpp
rename to libs/drape/cpu_buffer.hpp
diff --git a/drape/data_buffer.cpp b/libs/drape/data_buffer.cpp
similarity index 100%
rename from drape/data_buffer.cpp
rename to libs/drape/data_buffer.cpp
diff --git a/drape/data_buffer.hpp b/libs/drape/data_buffer.hpp
similarity index 100%
rename from drape/data_buffer.hpp
rename to libs/drape/data_buffer.hpp
diff --git a/drape/data_buffer_impl.hpp b/libs/drape/data_buffer_impl.hpp
similarity index 100%
rename from drape/data_buffer_impl.hpp
rename to libs/drape/data_buffer_impl.hpp
diff --git a/drape/debug_renderer.hpp b/libs/drape/debug_renderer.hpp
similarity index 100%
rename from drape/debug_renderer.hpp
rename to libs/drape/debug_renderer.hpp
diff --git a/drape/drape_diagnostics.hpp b/libs/drape/drape_diagnostics.hpp
similarity index 100%
rename from drape/drape_diagnostics.hpp
rename to libs/drape/drape_diagnostics.hpp
diff --git a/drape/drape_global.hpp b/libs/drape/drape_global.hpp
similarity index 100%
rename from drape/drape_global.hpp
rename to libs/drape/drape_global.hpp
diff --git a/drape/drape_routine.hpp b/libs/drape/drape_routine.hpp
similarity index 100%
rename from drape/drape_routine.hpp
rename to libs/drape/drape_routine.hpp
diff --git a/drape/drape_tests/CMakeLists.txt b/libs/drape/drape_tests/CMakeLists.txt
similarity index 90%
rename from drape/drape_tests/CMakeLists.txt
rename to libs/drape/drape_tests/CMakeLists.txt
index 984853479..07acff7d2 100644
--- a/drape/drape_tests/CMakeLists.txt
+++ b/libs/drape/drape_tests/CMakeLists.txt
@@ -40,7 +40,7 @@ if (WITH_SYSTEM_PROVIDED_3PARTY)
   find_package(GTest REQUIRED)
   target_link_libraries(${PROJECT_NAME} GTest::gtest)
 else()
-  add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/../../3party/googletest" "${CMAKE_CURRENT_BINARY_DIR}/googletest")
+  add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/../../../3party/googletest" "${CMAKE_CURRENT_BINARY_DIR}/googletest")
   target_include_directories(${PROJECT_NAME} PUBLIC ${OMIM_ROOT}/3party/glm)
 endif()
 
diff --git a/drape/drape_tests/attribute_provides_tests.cpp b/libs/drape/drape_tests/attribute_provides_tests.cpp
similarity index 100%
rename from drape/drape_tests/attribute_provides_tests.cpp
rename to libs/drape/drape_tests/attribute_provides_tests.cpp
diff --git a/drape/drape_tests/batcher_tests.cpp b/libs/drape/drape_tests/batcher_tests.cpp
similarity index 100%
rename from drape/drape_tests/batcher_tests.cpp
rename to libs/drape/drape_tests/batcher_tests.cpp
diff --git a/drape/drape_tests/bingind_info_tests.cpp b/libs/drape/drape_tests/bingind_info_tests.cpp
similarity index 100%
rename from drape/drape_tests/bingind_info_tests.cpp
rename to libs/drape/drape_tests/bingind_info_tests.cpp
diff --git a/drape/drape_tests/buffer_tests.cpp b/libs/drape/drape_tests/buffer_tests.cpp
similarity index 100%
rename from drape/drape_tests/buffer_tests.cpp
rename to libs/drape/drape_tests/buffer_tests.cpp
diff --git a/drape/drape_tests/dummy_texture.hpp b/libs/drape/drape_tests/dummy_texture.hpp
similarity index 100%
rename from drape/drape_tests/dummy_texture.hpp
rename to libs/drape/drape_tests/dummy_texture.hpp
diff --git a/drape/drape_tests/font_texture_tests.cpp b/libs/drape/drape_tests/font_texture_tests.cpp
similarity index 100%
rename from drape/drape_tests/font_texture_tests.cpp
rename to libs/drape/drape_tests/font_texture_tests.cpp
diff --git a/drape/drape_tests/gl_functions.cpp b/libs/drape/drape_tests/gl_functions.cpp
similarity index 100%
rename from drape/drape_tests/gl_functions.cpp
rename to libs/drape/drape_tests/gl_functions.cpp
diff --git a/drape/drape_tests/gl_mock_functions.cpp b/libs/drape/drape_tests/gl_mock_functions.cpp
similarity index 100%
rename from drape/drape_tests/gl_mock_functions.cpp
rename to libs/drape/drape_tests/gl_mock_functions.cpp
diff --git a/drape/drape_tests/gl_mock_functions.hpp b/libs/drape/drape_tests/gl_mock_functions.hpp
similarity index 100%
rename from drape/drape_tests/gl_mock_functions.hpp
rename to libs/drape/drape_tests/gl_mock_functions.hpp
diff --git a/drape/drape_tests/glyph_mng_tests.cpp b/libs/drape/drape_tests/glyph_mng_tests.cpp
similarity index 100%
rename from drape/drape_tests/glyph_mng_tests.cpp
rename to libs/drape/drape_tests/glyph_mng_tests.cpp
diff --git a/drape/drape_tests/glyph_packer_test.cpp b/libs/drape/drape_tests/glyph_packer_test.cpp
similarity index 100%
rename from drape/drape_tests/glyph_packer_test.cpp
rename to libs/drape/drape_tests/glyph_packer_test.cpp
diff --git a/drape/drape_tests/harfbuzz_shaping_test.cpp b/libs/drape/drape_tests/harfbuzz_shaping_test.cpp
similarity index 100%
rename from drape/drape_tests/harfbuzz_shaping_test.cpp
rename to libs/drape/drape_tests/harfbuzz_shaping_test.cpp
diff --git a/drape/drape_tests/img.cpp b/libs/drape/drape_tests/img.cpp
similarity index 100%
rename from drape/drape_tests/img.cpp
rename to libs/drape/drape_tests/img.cpp
diff --git a/drape/drape_tests/img.hpp b/libs/drape/drape_tests/img.hpp
similarity index 100%
rename from drape/drape_tests/img.hpp
rename to libs/drape/drape_tests/img.hpp
diff --git a/drape/drape_tests/memory_comparer.hpp b/libs/drape/drape_tests/memory_comparer.hpp
similarity index 100%
rename from drape/drape_tests/memory_comparer.hpp
rename to libs/drape/drape_tests/memory_comparer.hpp
diff --git a/drape/drape_tests/object_pool_tests.cpp b/libs/drape/drape_tests/object_pool_tests.cpp
similarity index 100%
rename from drape/drape_tests/object_pool_tests.cpp
rename to libs/drape/drape_tests/object_pool_tests.cpp
diff --git a/drape/drape_tests/pointers_tests.cpp b/libs/drape/drape_tests/pointers_tests.cpp
similarity index 100%
rename from drape/drape_tests/pointers_tests.cpp
rename to libs/drape/drape_tests/pointers_tests.cpp
diff --git a/drape/drape_tests/static_texture_tests.cpp b/libs/drape/drape_tests/static_texture_tests.cpp
similarity index 100%
rename from drape/drape_tests/static_texture_tests.cpp
rename to libs/drape/drape_tests/static_texture_tests.cpp
diff --git a/drape/drape_tests/stipple_pen_tests.cpp b/libs/drape/drape_tests/stipple_pen_tests.cpp
similarity index 100%
rename from drape/drape_tests/stipple_pen_tests.cpp
rename to libs/drape/drape_tests/stipple_pen_tests.cpp
diff --git a/drape/drape_tests/testing_graphics_context.hpp b/libs/drape/drape_tests/testing_graphics_context.hpp
similarity index 100%
rename from drape/drape_tests/testing_graphics_context.hpp
rename to libs/drape/drape_tests/testing_graphics_context.hpp
diff --git a/drape/drape_tests/texture_of_colors_tests.cpp b/libs/drape/drape_tests/texture_of_colors_tests.cpp
similarity index 100%
rename from drape/drape_tests/texture_of_colors_tests.cpp
rename to libs/drape/drape_tests/texture_of_colors_tests.cpp
diff --git a/drape/drape_tests/uniform_value_tests.cpp b/libs/drape/drape_tests/uniform_value_tests.cpp
similarity index 100%
rename from drape/drape_tests/uniform_value_tests.cpp
rename to libs/drape/drape_tests/uniform_value_tests.cpp
diff --git a/drape/drape_tests/vertex_buffer_tests.cpp b/libs/drape/drape_tests/vertex_buffer_tests.cpp
similarity index 100%
rename from drape/drape_tests/vertex_buffer_tests.cpp
rename to libs/drape/drape_tests/vertex_buffer_tests.cpp
diff --git a/drape/dynamic_texture.hpp b/libs/drape/dynamic_texture.hpp
similarity index 100%
rename from drape/dynamic_texture.hpp
rename to libs/drape/dynamic_texture.hpp
diff --git a/drape/font_constants.hpp b/libs/drape/font_constants.hpp
similarity index 100%
rename from drape/font_constants.hpp
rename to libs/drape/font_constants.hpp
diff --git a/drape/font_texture.cpp b/libs/drape/font_texture.cpp
similarity index 100%
rename from drape/font_texture.cpp
rename to libs/drape/font_texture.cpp
diff --git a/drape/font_texture.hpp b/libs/drape/font_texture.hpp
similarity index 100%
rename from drape/font_texture.hpp
rename to libs/drape/font_texture.hpp
diff --git a/drape/fonts_tool/CMakeLists.txt b/libs/drape/fonts_tool/CMakeLists.txt
similarity index 100%
rename from drape/fonts_tool/CMakeLists.txt
rename to libs/drape/fonts_tool/CMakeLists.txt
diff --git a/drape/fonts_tool/fonts_tool.cpp b/libs/drape/fonts_tool/fonts_tool.cpp
similarity index 100%
rename from drape/fonts_tool/fonts_tool.cpp
rename to libs/drape/fonts_tool/fonts_tool.cpp
diff --git a/drape/framebuffer.cpp b/libs/drape/framebuffer.cpp
similarity index 100%
rename from drape/framebuffer.cpp
rename to libs/drape/framebuffer.cpp
diff --git a/drape/framebuffer.hpp b/libs/drape/framebuffer.hpp
similarity index 100%
rename from drape/framebuffer.hpp
rename to libs/drape/framebuffer.hpp
diff --git a/drape/gl_constants.cpp b/libs/drape/gl_constants.cpp
similarity index 100%
rename from drape/gl_constants.cpp
rename to libs/drape/gl_constants.cpp
diff --git a/drape/gl_constants.hpp b/libs/drape/gl_constants.hpp
similarity index 100%
rename from drape/gl_constants.hpp
rename to libs/drape/gl_constants.hpp
diff --git a/drape/gl_extensions_list.cpp b/libs/drape/gl_extensions_list.cpp
similarity index 100%
rename from drape/gl_extensions_list.cpp
rename to libs/drape/gl_extensions_list.cpp
diff --git a/drape/gl_extensions_list.hpp b/libs/drape/gl_extensions_list.hpp
similarity index 100%
rename from drape/gl_extensions_list.hpp
rename to libs/drape/gl_extensions_list.hpp
diff --git a/drape/gl_functions.cpp b/libs/drape/gl_functions.cpp
similarity index 100%
rename from drape/gl_functions.cpp
rename to libs/drape/gl_functions.cpp
diff --git a/drape/gl_functions.hpp b/libs/drape/gl_functions.hpp
similarity index 100%
rename from drape/gl_functions.hpp
rename to libs/drape/gl_functions.hpp
diff --git a/drape/gl_gpu_program.cpp b/libs/drape/gl_gpu_program.cpp
similarity index 100%
rename from drape/gl_gpu_program.cpp
rename to libs/drape/gl_gpu_program.cpp
diff --git a/drape/gl_gpu_program.hpp b/libs/drape/gl_gpu_program.hpp
similarity index 100%
rename from drape/gl_gpu_program.hpp
rename to libs/drape/gl_gpu_program.hpp
diff --git a/drape/gl_includes.hpp b/libs/drape/gl_includes.hpp
similarity index 100%
rename from drape/gl_includes.hpp
rename to libs/drape/gl_includes.hpp
diff --git a/drape/glsl_func.hpp b/libs/drape/glsl_func.hpp
similarity index 100%
rename from drape/glsl_func.hpp
rename to libs/drape/glsl_func.hpp
diff --git a/drape/glsl_types.hpp b/libs/drape/glsl_types.hpp
similarity index 100%
rename from drape/glsl_types.hpp
rename to libs/drape/glsl_types.hpp
diff --git a/drape/glyph.hpp b/libs/drape/glyph.hpp
similarity index 100%
rename from drape/glyph.hpp
rename to libs/drape/glyph.hpp
diff --git a/drape/glyph_manager.cpp b/libs/drape/glyph_manager.cpp
similarity index 100%
rename from drape/glyph_manager.cpp
rename to libs/drape/glyph_manager.cpp
diff --git a/drape/glyph_manager.hpp b/libs/drape/glyph_manager.hpp
similarity index 100%
rename from drape/glyph_manager.hpp
rename to libs/drape/glyph_manager.hpp
diff --git a/drape/gpu_buffer.cpp b/libs/drape/gpu_buffer.cpp
similarity index 100%
rename from drape/gpu_buffer.cpp
rename to libs/drape/gpu_buffer.cpp
diff --git a/drape/gpu_buffer.hpp b/libs/drape/gpu_buffer.hpp
similarity index 100%
rename from drape/gpu_buffer.hpp
rename to libs/drape/gpu_buffer.hpp
diff --git a/drape/gpu_program.hpp b/libs/drape/gpu_program.hpp
similarity index 100%
rename from drape/gpu_program.hpp
rename to libs/drape/gpu_program.hpp
diff --git a/drape/graphics_context.hpp b/libs/drape/graphics_context.hpp
similarity index 100%
rename from drape/graphics_context.hpp
rename to libs/drape/graphics_context.hpp
diff --git a/drape/graphics_context_factory.cpp b/libs/drape/graphics_context_factory.cpp
similarity index 100%
rename from drape/graphics_context_factory.cpp
rename to libs/drape/graphics_context_factory.cpp
diff --git a/drape/graphics_context_factory.hpp b/libs/drape/graphics_context_factory.hpp
similarity index 100%
rename from drape/graphics_context_factory.hpp
rename to libs/drape/graphics_context_factory.hpp
diff --git a/drape/harfbuzz_shaping.cpp b/libs/drape/harfbuzz_shaping.cpp
similarity index 100%
rename from drape/harfbuzz_shaping.cpp
rename to libs/drape/harfbuzz_shaping.cpp
diff --git a/drape/harfbuzz_shaping.hpp b/libs/drape/harfbuzz_shaping.hpp
similarity index 100%
rename from drape/harfbuzz_shaping.hpp
rename to libs/drape/harfbuzz_shaping.hpp
diff --git a/drape/hw_texture.cpp b/libs/drape/hw_texture.cpp
similarity index 100%
rename from drape/hw_texture.cpp
rename to libs/drape/hw_texture.cpp
diff --git a/drape/hw_texture.hpp b/libs/drape/hw_texture.hpp
similarity index 100%
rename from drape/hw_texture.hpp
rename to libs/drape/hw_texture.hpp
diff --git a/drape/hw_texture_ios.hpp b/libs/drape/hw_texture_ios.hpp
similarity index 100%
rename from drape/hw_texture_ios.hpp
rename to libs/drape/hw_texture_ios.hpp
diff --git a/drape/hw_texture_ios.mm b/libs/drape/hw_texture_ios.mm
similarity index 100%
rename from drape/hw_texture_ios.mm
rename to libs/drape/hw_texture_ios.mm
diff --git a/drape/index_buffer.cpp b/libs/drape/index_buffer.cpp
similarity index 100%
rename from drape/index_buffer.cpp
rename to libs/drape/index_buffer.cpp
diff --git a/drape/index_buffer.hpp b/libs/drape/index_buffer.hpp
similarity index 100%
rename from drape/index_buffer.hpp
rename to libs/drape/index_buffer.hpp
diff --git a/drape/index_buffer_mutator.cpp b/libs/drape/index_buffer_mutator.cpp
similarity index 100%
rename from drape/index_buffer_mutator.cpp
rename to libs/drape/index_buffer_mutator.cpp
diff --git a/drape/index_buffer_mutator.hpp b/libs/drape/index_buffer_mutator.hpp
similarity index 100%
rename from drape/index_buffer_mutator.hpp
rename to libs/drape/index_buffer_mutator.hpp
diff --git a/drape/index_storage.cpp b/libs/drape/index_storage.cpp
similarity index 100%
rename from drape/index_storage.cpp
rename to libs/drape/index_storage.cpp
diff --git a/drape/index_storage.hpp b/libs/drape/index_storage.hpp
similarity index 100%
rename from drape/index_storage.hpp
rename to libs/drape/index_storage.hpp
diff --git a/drape/mesh_object.cpp b/libs/drape/mesh_object.cpp
similarity index 100%
rename from drape/mesh_object.cpp
rename to libs/drape/mesh_object.cpp
diff --git a/drape/mesh_object.hpp b/libs/drape/mesh_object.hpp
similarity index 100%
rename from drape/mesh_object.hpp
rename to libs/drape/mesh_object.hpp
diff --git a/drape/metal/metal_base_context.hpp b/libs/drape/metal/metal_base_context.hpp
similarity index 100%
rename from drape/metal/metal_base_context.hpp
rename to libs/drape/metal/metal_base_context.hpp
diff --git a/drape/metal/metal_base_context.mm b/libs/drape/metal/metal_base_context.mm
similarity index 100%
rename from drape/metal/metal_base_context.mm
rename to libs/drape/metal/metal_base_context.mm
diff --git a/drape/metal/metal_cleaner.hpp b/libs/drape/metal/metal_cleaner.hpp
similarity index 100%
rename from drape/metal/metal_cleaner.hpp
rename to libs/drape/metal/metal_cleaner.hpp
diff --git a/drape/metal/metal_cleaner.mm b/libs/drape/metal/metal_cleaner.mm
similarity index 100%
rename from drape/metal/metal_cleaner.mm
rename to libs/drape/metal/metal_cleaner.mm
diff --git a/drape/metal/metal_gpu_buffer_impl.hpp b/libs/drape/metal/metal_gpu_buffer_impl.hpp
similarity index 100%
rename from drape/metal/metal_gpu_buffer_impl.hpp
rename to libs/drape/metal/metal_gpu_buffer_impl.hpp
diff --git a/drape/metal/metal_gpu_buffer_impl.mm b/libs/drape/metal/metal_gpu_buffer_impl.mm
similarity index 100%
rename from drape/metal/metal_gpu_buffer_impl.mm
rename to libs/drape/metal/metal_gpu_buffer_impl.mm
diff --git a/drape/metal/metal_gpu_program.hpp b/libs/drape/metal/metal_gpu_program.hpp
similarity index 100%
rename from drape/metal/metal_gpu_program.hpp
rename to libs/drape/metal/metal_gpu_program.hpp
diff --git a/drape/metal/metal_mesh_object_impl.mm b/libs/drape/metal/metal_mesh_object_impl.mm
similarity index 100%
rename from drape/metal/metal_mesh_object_impl.mm
rename to libs/drape/metal/metal_mesh_object_impl.mm
diff --git a/drape/metal/metal_states.hpp b/libs/drape/metal/metal_states.hpp
similarity index 100%
rename from drape/metal/metal_states.hpp
rename to libs/drape/metal/metal_states.hpp
diff --git a/drape/metal/metal_states.mm b/libs/drape/metal/metal_states.mm
similarity index 100%
rename from drape/metal/metal_states.mm
rename to libs/drape/metal/metal_states.mm
diff --git a/drape/metal/metal_texture.hpp b/libs/drape/metal/metal_texture.hpp
similarity index 100%
rename from drape/metal/metal_texture.hpp
rename to libs/drape/metal/metal_texture.hpp
diff --git a/drape/metal/metal_texture.mm b/libs/drape/metal/metal_texture.mm
similarity index 100%
rename from drape/metal/metal_texture.mm
rename to libs/drape/metal/metal_texture.mm
diff --git a/drape/metal/metal_vertex_array_buffer_impl.mm b/libs/drape/metal/metal_vertex_array_buffer_impl.mm
similarity index 100%
rename from drape/metal/metal_vertex_array_buffer_impl.mm
rename to libs/drape/metal/metal_vertex_array_buffer_impl.mm
diff --git a/drape/metal/render_state_metal.mm b/libs/drape/metal/render_state_metal.mm
similarity index 100%
rename from drape/metal/render_state_metal.mm
rename to libs/drape/metal/render_state_metal.mm
diff --git a/drape/object_pool.hpp b/libs/drape/object_pool.hpp
similarity index 100%
rename from drape/object_pool.hpp
rename to libs/drape/object_pool.hpp
diff --git a/drape/oglcontext.cpp b/libs/drape/oglcontext.cpp
similarity index 100%
rename from drape/oglcontext.cpp
rename to libs/drape/oglcontext.cpp
diff --git a/drape/oglcontext.hpp b/libs/drape/oglcontext.hpp
similarity index 100%
rename from drape/oglcontext.hpp
rename to libs/drape/oglcontext.hpp
diff --git a/drape/overlay_handle.cpp b/libs/drape/overlay_handle.cpp
similarity index 100%
rename from drape/overlay_handle.cpp
rename to libs/drape/overlay_handle.cpp
diff --git a/drape/overlay_handle.hpp b/libs/drape/overlay_handle.hpp
similarity index 100%
rename from drape/overlay_handle.hpp
rename to libs/drape/overlay_handle.hpp
diff --git a/drape/overlay_tree.cpp b/libs/drape/overlay_tree.cpp
similarity index 100%
rename from drape/overlay_tree.cpp
rename to libs/drape/overlay_tree.cpp
diff --git a/drape/overlay_tree.hpp b/libs/drape/overlay_tree.hpp
similarity index 100%
rename from drape/overlay_tree.hpp
rename to libs/drape/overlay_tree.hpp
diff --git a/drape/pointers.cpp b/libs/drape/pointers.cpp
similarity index 100%
rename from drape/pointers.cpp
rename to libs/drape/pointers.cpp
diff --git a/drape/pointers.hpp b/libs/drape/pointers.hpp
similarity index 100%
rename from drape/pointers.hpp
rename to libs/drape/pointers.hpp
diff --git a/drape/render_bucket.cpp b/libs/drape/render_bucket.cpp
similarity index 100%
rename from drape/render_bucket.cpp
rename to libs/drape/render_bucket.cpp
diff --git a/drape/render_bucket.hpp b/libs/drape/render_bucket.hpp
similarity index 100%
rename from drape/render_bucket.hpp
rename to libs/drape/render_bucket.hpp
diff --git a/drape/render_state.cpp b/libs/drape/render_state.cpp
similarity index 100%
rename from drape/render_state.cpp
rename to libs/drape/render_state.cpp
diff --git a/drape/render_state.hpp b/libs/drape/render_state.hpp
similarity index 100%
rename from drape/render_state.hpp
rename to libs/drape/render_state.hpp
diff --git a/drape/shader.cpp b/libs/drape/shader.cpp
similarity index 100%
rename from drape/shader.cpp
rename to libs/drape/shader.cpp
diff --git a/drape/shader.hpp b/libs/drape/shader.hpp
similarity index 100%
rename from drape/shader.hpp
rename to libs/drape/shader.hpp
diff --git a/drape/static_texture.cpp b/libs/drape/static_texture.cpp
similarity index 100%
rename from drape/static_texture.cpp
rename to libs/drape/static_texture.cpp
diff --git a/drape/static_texture.hpp b/libs/drape/static_texture.hpp
similarity index 100%
rename from drape/static_texture.hpp
rename to libs/drape/static_texture.hpp
diff --git a/drape/stipple_pen_resource.cpp b/libs/drape/stipple_pen_resource.cpp
similarity index 100%
rename from drape/stipple_pen_resource.cpp
rename to libs/drape/stipple_pen_resource.cpp
diff --git a/drape/stipple_pen_resource.hpp b/libs/drape/stipple_pen_resource.hpp
similarity index 100%
rename from drape/stipple_pen_resource.hpp
rename to libs/drape/stipple_pen_resource.hpp
diff --git a/drape/support_manager.cpp b/libs/drape/support_manager.cpp
similarity index 100%
rename from drape/support_manager.cpp
rename to libs/drape/support_manager.cpp
diff --git a/drape/support_manager.hpp b/libs/drape/support_manager.hpp
similarity index 100%
rename from drape/support_manager.hpp
rename to libs/drape/support_manager.hpp
diff --git a/drape/symbols_texture.cpp b/libs/drape/symbols_texture.cpp
similarity index 100%
rename from drape/symbols_texture.cpp
rename to libs/drape/symbols_texture.cpp
diff --git a/drape/symbols_texture.hpp b/libs/drape/symbols_texture.hpp
similarity index 100%
rename from drape/symbols_texture.hpp
rename to libs/drape/symbols_texture.hpp
diff --git a/drape/texture.cpp b/libs/drape/texture.cpp
similarity index 100%
rename from drape/texture.cpp
rename to libs/drape/texture.cpp
diff --git a/drape/texture.hpp b/libs/drape/texture.hpp
similarity index 100%
rename from drape/texture.hpp
rename to libs/drape/texture.hpp
diff --git a/drape/texture_manager.cpp b/libs/drape/texture_manager.cpp
similarity index 100%
rename from drape/texture_manager.cpp
rename to libs/drape/texture_manager.cpp
diff --git a/drape/texture_manager.hpp b/libs/drape/texture_manager.hpp
similarity index 100%
rename from drape/texture_manager.hpp
rename to libs/drape/texture_manager.hpp
diff --git a/drape/texture_of_colors.cpp b/libs/drape/texture_of_colors.cpp
similarity index 100%
rename from drape/texture_of_colors.cpp
rename to libs/drape/texture_of_colors.cpp
diff --git a/drape/texture_of_colors.hpp b/libs/drape/texture_of_colors.hpp
similarity index 100%
rename from drape/texture_of_colors.hpp
rename to libs/drape/texture_of_colors.hpp
diff --git a/drape/texture_types.hpp b/libs/drape/texture_types.hpp
similarity index 100%
rename from drape/texture_types.hpp
rename to libs/drape/texture_types.hpp
diff --git a/drape/tm_read_resources.hpp b/libs/drape/tm_read_resources.hpp
similarity index 100%
rename from drape/tm_read_resources.hpp
rename to libs/drape/tm_read_resources.hpp
diff --git a/drape/uniform_value.cpp b/libs/drape/uniform_value.cpp
similarity index 100%
rename from drape/uniform_value.cpp
rename to libs/drape/uniform_value.cpp
diff --git a/drape/uniform_value.hpp b/libs/drape/uniform_value.hpp
similarity index 100%
rename from drape/uniform_value.hpp
rename to libs/drape/uniform_value.hpp
diff --git a/drape/utils/glyph_usage_tracker.cpp b/libs/drape/utils/glyph_usage_tracker.cpp
similarity index 100%
rename from drape/utils/glyph_usage_tracker.cpp
rename to libs/drape/utils/glyph_usage_tracker.cpp
diff --git a/drape/utils/glyph_usage_tracker.hpp b/libs/drape/utils/glyph_usage_tracker.hpp
similarity index 100%
rename from drape/utils/glyph_usage_tracker.hpp
rename to libs/drape/utils/glyph_usage_tracker.hpp
diff --git a/drape/utils/gpu_mem_tracker.cpp b/libs/drape/utils/gpu_mem_tracker.cpp
similarity index 100%
rename from drape/utils/gpu_mem_tracker.cpp
rename to libs/drape/utils/gpu_mem_tracker.cpp
diff --git a/drape/utils/gpu_mem_tracker.hpp b/libs/drape/utils/gpu_mem_tracker.hpp
similarity index 100%
rename from drape/utils/gpu_mem_tracker.hpp
rename to libs/drape/utils/gpu_mem_tracker.hpp
diff --git a/drape/utils/profiler.hpp b/libs/drape/utils/profiler.hpp
similarity index 100%
rename from drape/utils/profiler.hpp
rename to libs/drape/utils/profiler.hpp
diff --git a/drape/utils/projection.cpp b/libs/drape/utils/projection.cpp
similarity index 100%
rename from drape/utils/projection.cpp
rename to libs/drape/utils/projection.cpp
diff --git a/drape/utils/projection.hpp b/libs/drape/utils/projection.hpp
similarity index 100%
rename from drape/utils/projection.hpp
rename to libs/drape/utils/projection.hpp
diff --git a/drape/utils/vertex_decl.cpp b/libs/drape/utils/vertex_decl.cpp
similarity index 100%
rename from drape/utils/vertex_decl.cpp
rename to libs/drape/utils/vertex_decl.cpp
diff --git a/drape/utils/vertex_decl.hpp b/libs/drape/utils/vertex_decl.hpp
similarity index 100%
rename from drape/utils/vertex_decl.hpp
rename to libs/drape/utils/vertex_decl.hpp
diff --git a/drape/vertex_array_buffer.cpp b/libs/drape/vertex_array_buffer.cpp
similarity index 100%
rename from drape/vertex_array_buffer.cpp
rename to libs/drape/vertex_array_buffer.cpp
diff --git a/drape/vertex_array_buffer.hpp b/libs/drape/vertex_array_buffer.hpp
similarity index 100%
rename from drape/vertex_array_buffer.hpp
rename to libs/drape/vertex_array_buffer.hpp
diff --git a/drape/viewport.cpp b/libs/drape/viewport.cpp
similarity index 100%
rename from drape/viewport.cpp
rename to libs/drape/viewport.cpp
diff --git a/drape/viewport.hpp b/libs/drape/viewport.hpp
similarity index 100%
rename from drape/viewport.hpp
rename to libs/drape/viewport.hpp
diff --git a/drape/visual_scale.hpp b/libs/drape/visual_scale.hpp
similarity index 100%
rename from drape/visual_scale.hpp
rename to libs/drape/visual_scale.hpp
diff --git a/drape/vulkan/vulkan_base_context.cpp b/libs/drape/vulkan/vulkan_base_context.cpp
similarity index 100%
rename from drape/vulkan/vulkan_base_context.cpp
rename to libs/drape/vulkan/vulkan_base_context.cpp
diff --git a/drape/vulkan/vulkan_base_context.hpp b/libs/drape/vulkan/vulkan_base_context.hpp
similarity index 100%
rename from drape/vulkan/vulkan_base_context.hpp
rename to libs/drape/vulkan/vulkan_base_context.hpp
diff --git a/drape/vulkan/vulkan_context_factory.cpp b/libs/drape/vulkan/vulkan_context_factory.cpp
similarity index 100%
rename from drape/vulkan/vulkan_context_factory.cpp
rename to libs/drape/vulkan/vulkan_context_factory.cpp
diff --git a/drape/vulkan/vulkan_context_factory.hpp b/libs/drape/vulkan/vulkan_context_factory.hpp
similarity index 100%
rename from drape/vulkan/vulkan_context_factory.hpp
rename to libs/drape/vulkan/vulkan_context_factory.hpp
diff --git a/drape/vulkan/vulkan_gpu_buffer_impl.cpp b/libs/drape/vulkan/vulkan_gpu_buffer_impl.cpp
similarity index 100%
rename from drape/vulkan/vulkan_gpu_buffer_impl.cpp
rename to libs/drape/vulkan/vulkan_gpu_buffer_impl.cpp
diff --git a/drape/vulkan/vulkan_gpu_buffer_impl.hpp b/libs/drape/vulkan/vulkan_gpu_buffer_impl.hpp
similarity index 100%
rename from drape/vulkan/vulkan_gpu_buffer_impl.hpp
rename to libs/drape/vulkan/vulkan_gpu_buffer_impl.hpp
diff --git a/drape/vulkan/vulkan_gpu_program.hpp b/libs/drape/vulkan/vulkan_gpu_program.hpp
similarity index 100%
rename from drape/vulkan/vulkan_gpu_program.hpp
rename to libs/drape/vulkan/vulkan_gpu_program.hpp
diff --git a/drape/vulkan/vulkan_layers.cpp b/libs/drape/vulkan/vulkan_layers.cpp
similarity index 100%
rename from drape/vulkan/vulkan_layers.cpp
rename to libs/drape/vulkan/vulkan_layers.cpp
diff --git a/drape/vulkan/vulkan_layers.hpp b/libs/drape/vulkan/vulkan_layers.hpp
similarity index 100%
rename from drape/vulkan/vulkan_layers.hpp
rename to libs/drape/vulkan/vulkan_layers.hpp
diff --git a/drape/vulkan/vulkan_memory_manager.cpp b/libs/drape/vulkan/vulkan_memory_manager.cpp
similarity index 100%
rename from drape/vulkan/vulkan_memory_manager.cpp
rename to libs/drape/vulkan/vulkan_memory_manager.cpp
diff --git a/drape/vulkan/vulkan_memory_manager.hpp b/libs/drape/vulkan/vulkan_memory_manager.hpp
similarity index 100%
rename from drape/vulkan/vulkan_memory_manager.hpp
rename to libs/drape/vulkan/vulkan_memory_manager.hpp
diff --git a/drape/vulkan/vulkan_mesh_object_impl.cpp b/libs/drape/vulkan/vulkan_mesh_object_impl.cpp
similarity index 100%
rename from drape/vulkan/vulkan_mesh_object_impl.cpp
rename to libs/drape/vulkan/vulkan_mesh_object_impl.cpp
diff --git a/drape/vulkan/vulkan_object_manager.cpp b/libs/drape/vulkan/vulkan_object_manager.cpp
similarity index 100%
rename from drape/vulkan/vulkan_object_manager.cpp
rename to libs/drape/vulkan/vulkan_object_manager.cpp
diff --git a/drape/vulkan/vulkan_object_manager.hpp b/libs/drape/vulkan/vulkan_object_manager.hpp
similarity index 100%
rename from drape/vulkan/vulkan_object_manager.hpp
rename to libs/drape/vulkan/vulkan_object_manager.hpp
diff --git a/drape/vulkan/vulkan_param_descriptor.cpp b/libs/drape/vulkan/vulkan_param_descriptor.cpp
similarity index 100%
rename from drape/vulkan/vulkan_param_descriptor.cpp
rename to libs/drape/vulkan/vulkan_param_descriptor.cpp
diff --git a/drape/vulkan/vulkan_param_descriptor.hpp b/libs/drape/vulkan/vulkan_param_descriptor.hpp
similarity index 100%
rename from drape/vulkan/vulkan_param_descriptor.hpp
rename to libs/drape/vulkan/vulkan_param_descriptor.hpp
diff --git a/drape/vulkan/vulkan_pipeline.cpp b/libs/drape/vulkan/vulkan_pipeline.cpp
similarity index 100%
rename from drape/vulkan/vulkan_pipeline.cpp
rename to libs/drape/vulkan/vulkan_pipeline.cpp
diff --git a/drape/vulkan/vulkan_pipeline.hpp b/libs/drape/vulkan/vulkan_pipeline.hpp
similarity index 100%
rename from drape/vulkan/vulkan_pipeline.hpp
rename to libs/drape/vulkan/vulkan_pipeline.hpp
diff --git a/drape/vulkan/vulkan_staging_buffer.cpp b/libs/drape/vulkan/vulkan_staging_buffer.cpp
similarity index 100%
rename from drape/vulkan/vulkan_staging_buffer.cpp
rename to libs/drape/vulkan/vulkan_staging_buffer.cpp
diff --git a/drape/vulkan/vulkan_staging_buffer.hpp b/libs/drape/vulkan/vulkan_staging_buffer.hpp
similarity index 100%
rename from drape/vulkan/vulkan_staging_buffer.hpp
rename to libs/drape/vulkan/vulkan_staging_buffer.hpp
diff --git a/drape/vulkan/vulkan_texture.cpp b/libs/drape/vulkan/vulkan_texture.cpp
similarity index 100%
rename from drape/vulkan/vulkan_texture.cpp
rename to libs/drape/vulkan/vulkan_texture.cpp
diff --git a/drape/vulkan/vulkan_texture.hpp b/libs/drape/vulkan/vulkan_texture.hpp
similarity index 100%
rename from drape/vulkan/vulkan_texture.hpp
rename to libs/drape/vulkan/vulkan_texture.hpp
diff --git a/drape/vulkan/vulkan_utils.cpp b/libs/drape/vulkan/vulkan_utils.cpp
similarity index 100%
rename from drape/vulkan/vulkan_utils.cpp
rename to libs/drape/vulkan/vulkan_utils.cpp
diff --git a/drape/vulkan/vulkan_utils.hpp b/libs/drape/vulkan/vulkan_utils.hpp
similarity index 100%
rename from drape/vulkan/vulkan_utils.hpp
rename to libs/drape/vulkan/vulkan_utils.hpp
diff --git a/drape/vulkan/vulkan_vertex_array_buffer_impl.cpp b/libs/drape/vulkan/vulkan_vertex_array_buffer_impl.cpp
similarity index 100%
rename from drape/vulkan/vulkan_vertex_array_buffer_impl.cpp
rename to libs/drape/vulkan/vulkan_vertex_array_buffer_impl.cpp
diff --git a/drape_frontend/CMakeLists.txt b/libs/drape_frontend/CMakeLists.txt
similarity index 100%
rename from drape_frontend/CMakeLists.txt
rename to libs/drape_frontend/CMakeLists.txt
diff --git a/drape_frontend/animation/animation.cpp b/libs/drape_frontend/animation/animation.cpp
similarity index 100%
rename from drape_frontend/animation/animation.cpp
rename to libs/drape_frontend/animation/animation.cpp
diff --git a/drape_frontend/animation/animation.hpp b/libs/drape_frontend/animation/animation.hpp
similarity index 100%
rename from drape_frontend/animation/animation.hpp
rename to libs/drape_frontend/animation/animation.hpp
diff --git a/drape_frontend/animation/arrow_animation.cpp b/libs/drape_frontend/animation/arrow_animation.cpp
similarity index 100%
rename from drape_frontend/animation/arrow_animation.cpp
rename to libs/drape_frontend/animation/arrow_animation.cpp
diff --git a/drape_frontend/animation/arrow_animation.hpp b/libs/drape_frontend/animation/arrow_animation.hpp
similarity index 100%
rename from drape_frontend/animation/arrow_animation.hpp
rename to libs/drape_frontend/animation/arrow_animation.hpp
diff --git a/drape_frontend/animation/base_interpolator.cpp b/libs/drape_frontend/animation/base_interpolator.cpp
similarity index 100%
rename from drape_frontend/animation/base_interpolator.cpp
rename to libs/drape_frontend/animation/base_interpolator.cpp
diff --git a/drape_frontend/animation/base_interpolator.hpp b/libs/drape_frontend/animation/base_interpolator.hpp
similarity index 100%
rename from drape_frontend/animation/base_interpolator.hpp
rename to libs/drape_frontend/animation/base_interpolator.hpp
diff --git a/drape_frontend/animation/follow_animation.cpp b/libs/drape_frontend/animation/follow_animation.cpp
similarity index 100%
rename from drape_frontend/animation/follow_animation.cpp
rename to libs/drape_frontend/animation/follow_animation.cpp
diff --git a/drape_frontend/animation/follow_animation.hpp b/libs/drape_frontend/animation/follow_animation.hpp
similarity index 100%
rename from drape_frontend/animation/follow_animation.hpp
rename to libs/drape_frontend/animation/follow_animation.hpp
diff --git a/drape_frontend/animation/interpolation_holder.cpp b/libs/drape_frontend/animation/interpolation_holder.cpp
similarity index 100%
rename from drape_frontend/animation/interpolation_holder.cpp
rename to libs/drape_frontend/animation/interpolation_holder.cpp
diff --git a/drape_frontend/animation/interpolation_holder.hpp b/libs/drape_frontend/animation/interpolation_holder.hpp
similarity index 100%
rename from drape_frontend/animation/interpolation_holder.hpp
rename to libs/drape_frontend/animation/interpolation_holder.hpp
diff --git a/drape_frontend/animation/interpolations.cpp b/libs/drape_frontend/animation/interpolations.cpp
similarity index 100%
rename from drape_frontend/animation/interpolations.cpp
rename to libs/drape_frontend/animation/interpolations.cpp
diff --git a/drape_frontend/animation/interpolations.hpp b/libs/drape_frontend/animation/interpolations.hpp
similarity index 100%
rename from drape_frontend/animation/interpolations.hpp
rename to libs/drape_frontend/animation/interpolations.hpp
diff --git a/drape_frontend/animation/interpolators.cpp b/libs/drape_frontend/animation/interpolators.cpp
similarity index 100%
rename from drape_frontend/animation/interpolators.cpp
rename to libs/drape_frontend/animation/interpolators.cpp
diff --git a/drape_frontend/animation/interpolators.hpp b/libs/drape_frontend/animation/interpolators.hpp
similarity index 100%
rename from drape_frontend/animation/interpolators.hpp
rename to libs/drape_frontend/animation/interpolators.hpp
diff --git a/drape_frontend/animation/linear_animation.cpp b/libs/drape_frontend/animation/linear_animation.cpp
similarity index 100%
rename from drape_frontend/animation/linear_animation.cpp
rename to libs/drape_frontend/animation/linear_animation.cpp
diff --git a/drape_frontend/animation/linear_animation.hpp b/libs/drape_frontend/animation/linear_animation.hpp
similarity index 100%
rename from drape_frontend/animation/linear_animation.hpp
rename to libs/drape_frontend/animation/linear_animation.hpp
diff --git a/drape_frontend/animation/opacity_animation.cpp b/libs/drape_frontend/animation/opacity_animation.cpp
similarity index 100%
rename from drape_frontend/animation/opacity_animation.cpp
rename to libs/drape_frontend/animation/opacity_animation.cpp
diff --git a/drape_frontend/animation/opacity_animation.hpp b/libs/drape_frontend/animation/opacity_animation.hpp
similarity index 100%
rename from drape_frontend/animation/opacity_animation.hpp
rename to libs/drape_frontend/animation/opacity_animation.hpp
diff --git a/drape_frontend/animation/parallel_animation.cpp b/libs/drape_frontend/animation/parallel_animation.cpp
similarity index 100%
rename from drape_frontend/animation/parallel_animation.cpp
rename to libs/drape_frontend/animation/parallel_animation.cpp
diff --git a/drape_frontend/animation/parallel_animation.hpp b/libs/drape_frontend/animation/parallel_animation.hpp
similarity index 100%
rename from drape_frontend/animation/parallel_animation.hpp
rename to libs/drape_frontend/animation/parallel_animation.hpp
diff --git a/drape_frontend/animation/scale_animation.cpp b/libs/drape_frontend/animation/scale_animation.cpp
similarity index 100%
rename from drape_frontend/animation/scale_animation.cpp
rename to libs/drape_frontend/animation/scale_animation.cpp
diff --git a/drape_frontend/animation/scale_animation.hpp b/libs/drape_frontend/animation/scale_animation.hpp
similarity index 100%
rename from drape_frontend/animation/scale_animation.hpp
rename to libs/drape_frontend/animation/scale_animation.hpp
diff --git a/drape_frontend/animation/sequence_animation.cpp b/libs/drape_frontend/animation/sequence_animation.cpp
similarity index 100%
rename from drape_frontend/animation/sequence_animation.cpp
rename to libs/drape_frontend/animation/sequence_animation.cpp
diff --git a/drape_frontend/animation/sequence_animation.hpp b/libs/drape_frontend/animation/sequence_animation.hpp
similarity index 100%
rename from drape_frontend/animation/sequence_animation.hpp
rename to libs/drape_frontend/animation/sequence_animation.hpp
diff --git a/drape_frontend/animation/show_hide_animation.cpp b/libs/drape_frontend/animation/show_hide_animation.cpp
similarity index 100%
rename from drape_frontend/animation/show_hide_animation.cpp
rename to libs/drape_frontend/animation/show_hide_animation.cpp
diff --git a/drape_frontend/animation/show_hide_animation.hpp b/libs/drape_frontend/animation/show_hide_animation.hpp
similarity index 100%
rename from drape_frontend/animation/show_hide_animation.hpp
rename to libs/drape_frontend/animation/show_hide_animation.hpp
diff --git a/drape_frontend/animation/value_mapping.hpp b/libs/drape_frontend/animation/value_mapping.hpp
similarity index 100%
rename from drape_frontend/animation/value_mapping.hpp
rename to libs/drape_frontend/animation/value_mapping.hpp
diff --git a/drape_frontend/animation_constants.hpp b/libs/drape_frontend/animation_constants.hpp
similarity index 100%
rename from drape_frontend/animation_constants.hpp
rename to libs/drape_frontend/animation_constants.hpp
diff --git a/drape_frontend/animation_system.cpp b/libs/drape_frontend/animation_system.cpp
similarity index 100%
rename from drape_frontend/animation_system.cpp
rename to libs/drape_frontend/animation_system.cpp
diff --git a/drape_frontend/animation_system.hpp b/libs/drape_frontend/animation_system.hpp
similarity index 100%
rename from drape_frontend/animation_system.hpp
rename to libs/drape_frontend/animation_system.hpp
diff --git a/drape_frontend/animation_utils.cpp b/libs/drape_frontend/animation_utils.cpp
similarity index 100%
rename from drape_frontend/animation_utils.cpp
rename to libs/drape_frontend/animation_utils.cpp
diff --git a/drape_frontend/animation_utils.hpp b/libs/drape_frontend/animation_utils.hpp
similarity index 100%
rename from drape_frontend/animation_utils.hpp
rename to libs/drape_frontend/animation_utils.hpp
diff --git a/drape_frontend/apply_feature_functors.cpp b/libs/drape_frontend/apply_feature_functors.cpp
similarity index 100%
rename from drape_frontend/apply_feature_functors.cpp
rename to libs/drape_frontend/apply_feature_functors.cpp
diff --git a/drape_frontend/apply_feature_functors.hpp b/libs/drape_frontend/apply_feature_functors.hpp
similarity index 100%
rename from drape_frontend/apply_feature_functors.hpp
rename to libs/drape_frontend/apply_feature_functors.hpp
diff --git a/drape_frontend/area_shape.cpp b/libs/drape_frontend/area_shape.cpp
similarity index 100%
rename from drape_frontend/area_shape.cpp
rename to libs/drape_frontend/area_shape.cpp
diff --git a/drape_frontend/area_shape.hpp b/libs/drape_frontend/area_shape.hpp
similarity index 100%
rename from drape_frontend/area_shape.hpp
rename to libs/drape_frontend/area_shape.hpp
diff --git a/drape_frontend/arrow3d.cpp b/libs/drape_frontend/arrow3d.cpp
similarity index 100%
rename from drape_frontend/arrow3d.cpp
rename to libs/drape_frontend/arrow3d.cpp
diff --git a/drape_frontend/arrow3d.hpp b/libs/drape_frontend/arrow3d.hpp
similarity index 100%
rename from drape_frontend/arrow3d.hpp
rename to libs/drape_frontend/arrow3d.hpp
diff --git a/drape_frontend/backend_renderer.cpp b/libs/drape_frontend/backend_renderer.cpp
similarity index 100%
rename from drape_frontend/backend_renderer.cpp
rename to libs/drape_frontend/backend_renderer.cpp
diff --git a/drape_frontend/backend_renderer.hpp b/libs/drape_frontend/backend_renderer.hpp
similarity index 100%
rename from drape_frontend/backend_renderer.hpp
rename to libs/drape_frontend/backend_renderer.hpp
diff --git a/drape_frontend/base_renderer.cpp b/libs/drape_frontend/base_renderer.cpp
similarity index 100%
rename from drape_frontend/base_renderer.cpp
rename to libs/drape_frontend/base_renderer.cpp
diff --git a/drape_frontend/base_renderer.hpp b/libs/drape_frontend/base_renderer.hpp
similarity index 100%
rename from drape_frontend/base_renderer.hpp
rename to libs/drape_frontend/base_renderer.hpp
diff --git a/drape_frontend/batcher_bucket.hpp b/libs/drape_frontend/batcher_bucket.hpp
similarity index 100%
rename from drape_frontend/batcher_bucket.hpp
rename to libs/drape_frontend/batcher_bucket.hpp
diff --git a/drape_frontend/batchers_pool.hpp b/libs/drape_frontend/batchers_pool.hpp
similarity index 100%
rename from drape_frontend/batchers_pool.hpp
rename to libs/drape_frontend/batchers_pool.hpp
diff --git a/drape_frontend/circles_pack_shape.cpp b/libs/drape_frontend/circles_pack_shape.cpp
similarity index 100%
rename from drape_frontend/circles_pack_shape.cpp
rename to libs/drape_frontend/circles_pack_shape.cpp
diff --git a/drape_frontend/circles_pack_shape.hpp b/libs/drape_frontend/circles_pack_shape.hpp
similarity index 100%
rename from drape_frontend/circles_pack_shape.hpp
rename to libs/drape_frontend/circles_pack_shape.hpp
diff --git a/drape_frontend/color_constants.cpp b/libs/drape_frontend/color_constants.cpp
similarity index 100%
rename from drape_frontend/color_constants.cpp
rename to libs/drape_frontend/color_constants.cpp
diff --git a/drape_frontend/color_constants.hpp b/libs/drape_frontend/color_constants.hpp
similarity index 100%
rename from drape_frontend/color_constants.hpp
rename to libs/drape_frontend/color_constants.hpp
diff --git a/drape_frontend/colored_symbol_shape.cpp b/libs/drape_frontend/colored_symbol_shape.cpp
similarity index 100%
rename from drape_frontend/colored_symbol_shape.cpp
rename to libs/drape_frontend/colored_symbol_shape.cpp
diff --git a/drape_frontend/colored_symbol_shape.hpp b/libs/drape_frontend/colored_symbol_shape.hpp
similarity index 100%
rename from drape_frontend/colored_symbol_shape.hpp
rename to libs/drape_frontend/colored_symbol_shape.hpp
diff --git a/drape_frontend/custom_features_context.hpp b/libs/drape_frontend/custom_features_context.hpp
similarity index 100%
rename from drape_frontend/custom_features_context.hpp
rename to libs/drape_frontend/custom_features_context.hpp
diff --git a/drape_frontend/debug_rect_renderer.cpp b/libs/drape_frontend/debug_rect_renderer.cpp
similarity index 100%
rename from drape_frontend/debug_rect_renderer.cpp
rename to libs/drape_frontend/debug_rect_renderer.cpp
diff --git a/drape_frontend/debug_rect_renderer.hpp b/libs/drape_frontend/debug_rect_renderer.hpp
similarity index 100%
rename from drape_frontend/debug_rect_renderer.hpp
rename to libs/drape_frontend/debug_rect_renderer.hpp
diff --git a/drape_frontend/drape_api.cpp b/libs/drape_frontend/drape_api.cpp
similarity index 100%
rename from drape_frontend/drape_api.cpp
rename to libs/drape_frontend/drape_api.cpp
diff --git a/drape_frontend/drape_api.hpp b/libs/drape_frontend/drape_api.hpp
similarity index 100%
rename from drape_frontend/drape_api.hpp
rename to libs/drape_frontend/drape_api.hpp
diff --git a/drape_frontend/drape_api_builder.cpp b/libs/drape_frontend/drape_api_builder.cpp
similarity index 100%
rename from drape_frontend/drape_api_builder.cpp
rename to libs/drape_frontend/drape_api_builder.cpp
diff --git a/drape_frontend/drape_api_builder.hpp b/libs/drape_frontend/drape_api_builder.hpp
similarity index 100%
rename from drape_frontend/drape_api_builder.hpp
rename to libs/drape_frontend/drape_api_builder.hpp
diff --git a/drape_frontend/drape_api_renderer.cpp b/libs/drape_frontend/drape_api_renderer.cpp
similarity index 100%
rename from drape_frontend/drape_api_renderer.cpp
rename to libs/drape_frontend/drape_api_renderer.cpp
diff --git a/drape_frontend/drape_api_renderer.hpp b/libs/drape_frontend/drape_api_renderer.hpp
similarity index 100%
rename from drape_frontend/drape_api_renderer.hpp
rename to libs/drape_frontend/drape_api_renderer.hpp
diff --git a/drape_frontend/drape_engine.cpp b/libs/drape_frontend/drape_engine.cpp
similarity index 100%
rename from drape_frontend/drape_engine.cpp
rename to libs/drape_frontend/drape_engine.cpp
diff --git a/drape_frontend/drape_engine.hpp b/libs/drape_frontend/drape_engine.hpp
similarity index 100%
rename from drape_frontend/drape_engine.hpp
rename to libs/drape_frontend/drape_engine.hpp
diff --git a/drape_frontend/drape_engine_params.hpp b/libs/drape_frontend/drape_engine_params.hpp
similarity index 100%
rename from drape_frontend/drape_engine_params.hpp
rename to libs/drape_frontend/drape_engine_params.hpp
diff --git a/drape_frontend/drape_engine_safe_ptr.hpp b/libs/drape_frontend/drape_engine_safe_ptr.hpp
similarity index 100%
rename from drape_frontend/drape_engine_safe_ptr.hpp
rename to libs/drape_frontend/drape_engine_safe_ptr.hpp
diff --git a/drape_frontend/drape_frontend_tests/CMakeLists.txt b/libs/drape_frontend/drape_frontend_tests/CMakeLists.txt
similarity index 100%
rename from drape_frontend/drape_frontend_tests/CMakeLists.txt
rename to libs/drape_frontend/drape_frontend_tests/CMakeLists.txt
diff --git a/drape_frontend/drape_frontend_tests/frame_values_tests.cpp b/libs/drape_frontend/drape_frontend_tests/frame_values_tests.cpp
similarity index 100%
rename from drape_frontend/drape_frontend_tests/frame_values_tests.cpp
rename to libs/drape_frontend/drape_frontend_tests/frame_values_tests.cpp
diff --git a/drape_frontend/drape_frontend_tests/navigator_test.cpp b/libs/drape_frontend/drape_frontend_tests/navigator_test.cpp
similarity index 100%
rename from drape_frontend/drape_frontend_tests/navigator_test.cpp
rename to libs/drape_frontend/drape_frontend_tests/navigator_test.cpp
diff --git a/drape_frontend/drape_frontend_tests/path_text_test.cpp b/libs/drape_frontend/drape_frontend_tests/path_text_test.cpp
similarity index 100%
rename from drape_frontend/drape_frontend_tests/path_text_test.cpp
rename to libs/drape_frontend/drape_frontend_tests/path_text_test.cpp
diff --git a/drape_frontend/drape_frontend_tests/stylist_tests.cpp b/libs/drape_frontend/drape_frontend_tests/stylist_tests.cpp
similarity index 100%
rename from drape_frontend/drape_frontend_tests/stylist_tests.cpp
rename to libs/drape_frontend/drape_frontend_tests/stylist_tests.cpp
diff --git a/drape_frontend/drape_frontend_tests/user_event_stream_tests.cpp b/libs/drape_frontend/drape_frontend_tests/user_event_stream_tests.cpp
similarity index 100%
rename from drape_frontend/drape_frontend_tests/user_event_stream_tests.cpp
rename to libs/drape_frontend/drape_frontend_tests/user_event_stream_tests.cpp
diff --git a/drape_frontend/drape_hints.hpp b/libs/drape_frontend/drape_hints.hpp
similarity index 100%
rename from drape_frontend/drape_hints.hpp
rename to libs/drape_frontend/drape_hints.hpp
diff --git a/drape_frontend/drape_measurer.cpp b/libs/drape_frontend/drape_measurer.cpp
similarity index 100%
rename from drape_frontend/drape_measurer.cpp
rename to libs/drape_frontend/drape_measurer.cpp
diff --git a/drape_frontend/drape_measurer.hpp b/libs/drape_frontend/drape_measurer.hpp
similarity index 100%
rename from drape_frontend/drape_measurer.hpp
rename to libs/drape_frontend/drape_measurer.hpp
diff --git a/drape_frontend/drape_notifier.cpp b/libs/drape_frontend/drape_notifier.cpp
similarity index 100%
rename from drape_frontend/drape_notifier.cpp
rename to libs/drape_frontend/drape_notifier.cpp
diff --git a/drape_frontend/drape_notifier.hpp b/libs/drape_frontend/drape_notifier.hpp
similarity index 100%
rename from drape_frontend/drape_notifier.hpp
rename to libs/drape_frontend/drape_notifier.hpp
diff --git a/drape_frontend/engine_context.cpp b/libs/drape_frontend/engine_context.cpp
similarity index 100%
rename from drape_frontend/engine_context.cpp
rename to libs/drape_frontend/engine_context.cpp
diff --git a/drape_frontend/engine_context.hpp b/libs/drape_frontend/engine_context.hpp
similarity index 100%
rename from drape_frontend/engine_context.hpp
rename to libs/drape_frontend/engine_context.hpp
diff --git a/drape_frontend/frame_values.hpp b/libs/drape_frontend/frame_values.hpp
similarity index 100%
rename from drape_frontend/frame_values.hpp
rename to libs/drape_frontend/frame_values.hpp
diff --git a/drape_frontend/frontend_renderer.cpp b/libs/drape_frontend/frontend_renderer.cpp
similarity index 100%
rename from drape_frontend/frontend_renderer.cpp
rename to libs/drape_frontend/frontend_renderer.cpp
diff --git a/drape_frontend/frontend_renderer.hpp b/libs/drape_frontend/frontend_renderer.hpp
similarity index 100%
rename from drape_frontend/frontend_renderer.hpp
rename to libs/drape_frontend/frontend_renderer.hpp
diff --git a/drape_frontend/gps_track_point.hpp b/libs/drape_frontend/gps_track_point.hpp
similarity index 100%
rename from drape_frontend/gps_track_point.hpp
rename to libs/drape_frontend/gps_track_point.hpp
diff --git a/drape_frontend/gps_track_renderer.cpp b/libs/drape_frontend/gps_track_renderer.cpp
similarity index 100%
rename from drape_frontend/gps_track_renderer.cpp
rename to libs/drape_frontend/gps_track_renderer.cpp
diff --git a/drape_frontend/gps_track_renderer.hpp b/libs/drape_frontend/gps_track_renderer.hpp
similarity index 100%
rename from drape_frontend/gps_track_renderer.hpp
rename to libs/drape_frontend/gps_track_renderer.hpp
diff --git a/drape_frontend/gui/choose_position_mark.cpp b/libs/drape_frontend/gui/choose_position_mark.cpp
similarity index 100%
rename from drape_frontend/gui/choose_position_mark.cpp
rename to libs/drape_frontend/gui/choose_position_mark.cpp
diff --git a/drape_frontend/gui/choose_position_mark.hpp b/libs/drape_frontend/gui/choose_position_mark.hpp
similarity index 100%
rename from drape_frontend/gui/choose_position_mark.hpp
rename to libs/drape_frontend/gui/choose_position_mark.hpp
diff --git a/drape_frontend/gui/compass.cpp b/libs/drape_frontend/gui/compass.cpp
similarity index 100%
rename from drape_frontend/gui/compass.cpp
rename to libs/drape_frontend/gui/compass.cpp
diff --git a/drape_frontend/gui/compass.hpp b/libs/drape_frontend/gui/compass.hpp
similarity index 100%
rename from drape_frontend/gui/compass.hpp
rename to libs/drape_frontend/gui/compass.hpp
diff --git a/drape_frontend/gui/copyright_label.cpp b/libs/drape_frontend/gui/copyright_label.cpp
similarity index 100%
rename from drape_frontend/gui/copyright_label.cpp
rename to libs/drape_frontend/gui/copyright_label.cpp
diff --git a/drape_frontend/gui/copyright_label.hpp b/libs/drape_frontend/gui/copyright_label.hpp
similarity index 100%
rename from drape_frontend/gui/copyright_label.hpp
rename to libs/drape_frontend/gui/copyright_label.hpp
diff --git a/drape_frontend/gui/debug_label.cpp b/libs/drape_frontend/gui/debug_label.cpp
similarity index 100%
rename from drape_frontend/gui/debug_label.cpp
rename to libs/drape_frontend/gui/debug_label.cpp
diff --git a/drape_frontend/gui/debug_label.hpp b/libs/drape_frontend/gui/debug_label.hpp
similarity index 100%
rename from drape_frontend/gui/debug_label.hpp
rename to libs/drape_frontend/gui/debug_label.hpp
diff --git a/drape_frontend/gui/drape_gui.cpp b/libs/drape_frontend/gui/drape_gui.cpp
similarity index 100%
rename from drape_frontend/gui/drape_gui.cpp
rename to libs/drape_frontend/gui/drape_gui.cpp
diff --git a/drape_frontend/gui/drape_gui.hpp b/libs/drape_frontend/gui/drape_gui.hpp
similarity index 100%
rename from drape_frontend/gui/drape_gui.hpp
rename to libs/drape_frontend/gui/drape_gui.hpp
diff --git a/drape_frontend/gui/gui_text.cpp b/libs/drape_frontend/gui/gui_text.cpp
similarity index 100%
rename from drape_frontend/gui/gui_text.cpp
rename to libs/drape_frontend/gui/gui_text.cpp
diff --git a/drape_frontend/gui/gui_text.hpp b/libs/drape_frontend/gui/gui_text.hpp
similarity index 100%
rename from drape_frontend/gui/gui_text.hpp
rename to libs/drape_frontend/gui/gui_text.hpp
diff --git a/drape_frontend/gui/layer_render.cpp b/libs/drape_frontend/gui/layer_render.cpp
similarity index 100%
rename from drape_frontend/gui/layer_render.cpp
rename to libs/drape_frontend/gui/layer_render.cpp
diff --git a/drape_frontend/gui/layer_render.hpp b/libs/drape_frontend/gui/layer_render.hpp
similarity index 100%
rename from drape_frontend/gui/layer_render.hpp
rename to libs/drape_frontend/gui/layer_render.hpp
diff --git a/drape_frontend/gui/ruler.cpp b/libs/drape_frontend/gui/ruler.cpp
similarity index 100%
rename from drape_frontend/gui/ruler.cpp
rename to libs/drape_frontend/gui/ruler.cpp
diff --git a/drape_frontend/gui/ruler.hpp b/libs/drape_frontend/gui/ruler.hpp
similarity index 100%
rename from drape_frontend/gui/ruler.hpp
rename to libs/drape_frontend/gui/ruler.hpp
diff --git a/drape_frontend/gui/ruler_helper.cpp b/libs/drape_frontend/gui/ruler_helper.cpp
similarity index 100%
rename from drape_frontend/gui/ruler_helper.cpp
rename to libs/drape_frontend/gui/ruler_helper.cpp
diff --git a/drape_frontend/gui/ruler_helper.hpp b/libs/drape_frontend/gui/ruler_helper.hpp
similarity index 100%
rename from drape_frontend/gui/ruler_helper.hpp
rename to libs/drape_frontend/gui/ruler_helper.hpp
diff --git a/drape_frontend/gui/scale_fps_helper.hpp b/libs/drape_frontend/gui/scale_fps_helper.hpp
similarity index 100%
rename from drape_frontend/gui/scale_fps_helper.hpp
rename to libs/drape_frontend/gui/scale_fps_helper.hpp
diff --git a/drape_frontend/gui/shape.cpp b/libs/drape_frontend/gui/shape.cpp
similarity index 100%
rename from drape_frontend/gui/shape.cpp
rename to libs/drape_frontend/gui/shape.cpp
diff --git a/drape_frontend/gui/shape.hpp b/libs/drape_frontend/gui/shape.hpp
similarity index 100%
rename from drape_frontend/gui/shape.hpp
rename to libs/drape_frontend/gui/shape.hpp
diff --git a/drape_frontend/gui/skin.cpp b/libs/drape_frontend/gui/skin.cpp
similarity index 100%
rename from drape_frontend/gui/skin.cpp
rename to libs/drape_frontend/gui/skin.cpp
diff --git a/drape_frontend/gui/skin.hpp b/libs/drape_frontend/gui/skin.hpp
similarity index 100%
rename from drape_frontend/gui/skin.hpp
rename to libs/drape_frontend/gui/skin.hpp
diff --git a/drape_frontend/kinetic_scroller.cpp b/libs/drape_frontend/kinetic_scroller.cpp
similarity index 100%
rename from drape_frontend/kinetic_scroller.cpp
rename to libs/drape_frontend/kinetic_scroller.cpp
diff --git a/drape_frontend/kinetic_scroller.hpp b/libs/drape_frontend/kinetic_scroller.hpp
similarity index 100%
rename from drape_frontend/kinetic_scroller.hpp
rename to libs/drape_frontend/kinetic_scroller.hpp
diff --git a/drape_frontend/line_shape.cpp b/libs/drape_frontend/line_shape.cpp
similarity index 100%
rename from drape_frontend/line_shape.cpp
rename to libs/drape_frontend/line_shape.cpp
diff --git a/drape_frontend/line_shape.hpp b/libs/drape_frontend/line_shape.hpp
similarity index 100%
rename from drape_frontend/line_shape.hpp
rename to libs/drape_frontend/line_shape.hpp
diff --git a/drape_frontend/line_shape_helper.cpp b/libs/drape_frontend/line_shape_helper.cpp
similarity index 100%
rename from drape_frontend/line_shape_helper.cpp
rename to libs/drape_frontend/line_shape_helper.cpp
diff --git a/drape_frontend/line_shape_helper.hpp b/libs/drape_frontend/line_shape_helper.hpp
similarity index 100%
rename from drape_frontend/line_shape_helper.hpp
rename to libs/drape_frontend/line_shape_helper.hpp
diff --git a/drape_frontend/map_data_provider.cpp b/libs/drape_frontend/map_data_provider.cpp
similarity index 100%
rename from drape_frontend/map_data_provider.cpp
rename to libs/drape_frontend/map_data_provider.cpp
diff --git a/drape_frontend/map_data_provider.hpp b/libs/drape_frontend/map_data_provider.hpp
similarity index 100%
rename from drape_frontend/map_data_provider.hpp
rename to libs/drape_frontend/map_data_provider.hpp
diff --git a/drape_frontend/map_shape.hpp b/libs/drape_frontend/map_shape.hpp
similarity index 100%
rename from drape_frontend/map_shape.hpp
rename to libs/drape_frontend/map_shape.hpp
diff --git a/drape_frontend/message.cpp b/libs/drape_frontend/message.cpp
similarity index 100%
rename from drape_frontend/message.cpp
rename to libs/drape_frontend/message.cpp
diff --git a/drape_frontend/message.hpp b/libs/drape_frontend/message.hpp
similarity index 100%
rename from drape_frontend/message.hpp
rename to libs/drape_frontend/message.hpp
diff --git a/drape_frontend/message_acceptor.cpp b/libs/drape_frontend/message_acceptor.cpp
similarity index 100%
rename from drape_frontend/message_acceptor.cpp
rename to libs/drape_frontend/message_acceptor.cpp
diff --git a/drape_frontend/message_acceptor.hpp b/libs/drape_frontend/message_acceptor.hpp
similarity index 100%
rename from drape_frontend/message_acceptor.hpp
rename to libs/drape_frontend/message_acceptor.hpp
diff --git a/drape_frontend/message_queue.cpp b/libs/drape_frontend/message_queue.cpp
similarity index 100%
rename from drape_frontend/message_queue.cpp
rename to libs/drape_frontend/message_queue.cpp
diff --git a/drape_frontend/message_queue.hpp b/libs/drape_frontend/message_queue.hpp
similarity index 100%
rename from drape_frontend/message_queue.hpp
rename to libs/drape_frontend/message_queue.hpp
diff --git a/drape_frontend/message_subclasses.hpp b/libs/drape_frontend/message_subclasses.hpp
similarity index 100%
rename from drape_frontend/message_subclasses.hpp
rename to libs/drape_frontend/message_subclasses.hpp
diff --git a/drape_frontend/metaline_manager.cpp b/libs/drape_frontend/metaline_manager.cpp
similarity index 100%
rename from drape_frontend/metaline_manager.cpp
rename to libs/drape_frontend/metaline_manager.cpp
diff --git a/drape_frontend/metaline_manager.hpp b/libs/drape_frontend/metaline_manager.hpp
similarity index 100%
rename from drape_frontend/metaline_manager.hpp
rename to libs/drape_frontend/metaline_manager.hpp
diff --git a/drape_frontend/my_position.cpp b/libs/drape_frontend/my_position.cpp
similarity index 100%
rename from drape_frontend/my_position.cpp
rename to libs/drape_frontend/my_position.cpp
diff --git a/drape_frontend/my_position.hpp b/libs/drape_frontend/my_position.hpp
similarity index 100%
rename from drape_frontend/my_position.hpp
rename to libs/drape_frontend/my_position.hpp
diff --git a/drape_frontend/my_position_controller.cpp b/libs/drape_frontend/my_position_controller.cpp
similarity index 100%
rename from drape_frontend/my_position_controller.cpp
rename to libs/drape_frontend/my_position_controller.cpp
diff --git a/drape_frontend/my_position_controller.hpp b/libs/drape_frontend/my_position_controller.hpp
similarity index 100%
rename from drape_frontend/my_position_controller.hpp
rename to libs/drape_frontend/my_position_controller.hpp
diff --git a/drape_frontend/navigator.cpp b/libs/drape_frontend/navigator.cpp
similarity index 100%
rename from drape_frontend/navigator.cpp
rename to libs/drape_frontend/navigator.cpp
diff --git a/drape_frontend/navigator.hpp b/libs/drape_frontend/navigator.hpp
similarity index 100%
rename from drape_frontend/navigator.hpp
rename to libs/drape_frontend/navigator.hpp
diff --git a/drape_frontend/overlay_batcher.cpp b/libs/drape_frontend/overlay_batcher.cpp
similarity index 100%
rename from drape_frontend/overlay_batcher.cpp
rename to libs/drape_frontend/overlay_batcher.cpp
diff --git a/drape_frontend/overlay_batcher.hpp b/libs/drape_frontend/overlay_batcher.hpp
similarity index 100%
rename from drape_frontend/overlay_batcher.hpp
rename to libs/drape_frontend/overlay_batcher.hpp
diff --git a/drape_frontend/overlays_tracker.cpp b/libs/drape_frontend/overlays_tracker.cpp
similarity index 100%
rename from drape_frontend/overlays_tracker.cpp
rename to libs/drape_frontend/overlays_tracker.cpp
diff --git a/drape_frontend/overlays_tracker.hpp b/libs/drape_frontend/overlays_tracker.hpp
similarity index 100%
rename from drape_frontend/overlays_tracker.hpp
rename to libs/drape_frontend/overlays_tracker.hpp
diff --git a/drape_frontend/path_symbol_shape.cpp b/libs/drape_frontend/path_symbol_shape.cpp
similarity index 100%
rename from drape_frontend/path_symbol_shape.cpp
rename to libs/drape_frontend/path_symbol_shape.cpp
diff --git a/drape_frontend/path_symbol_shape.hpp b/libs/drape_frontend/path_symbol_shape.hpp
similarity index 100%
rename from drape_frontend/path_symbol_shape.hpp
rename to libs/drape_frontend/path_symbol_shape.hpp
diff --git a/drape_frontend/path_text_handle.cpp b/libs/drape_frontend/path_text_handle.cpp
similarity index 100%
rename from drape_frontend/path_text_handle.cpp
rename to libs/drape_frontend/path_text_handle.cpp
diff --git a/drape_frontend/path_text_handle.hpp b/libs/drape_frontend/path_text_handle.hpp
similarity index 100%
rename from drape_frontend/path_text_handle.hpp
rename to libs/drape_frontend/path_text_handle.hpp
diff --git a/drape_frontend/path_text_shape.cpp b/libs/drape_frontend/path_text_shape.cpp
similarity index 100%
rename from drape_frontend/path_text_shape.cpp
rename to libs/drape_frontend/path_text_shape.cpp
diff --git a/drape_frontend/path_text_shape.hpp b/libs/drape_frontend/path_text_shape.hpp
similarity index 100%
rename from drape_frontend/path_text_shape.hpp
rename to libs/drape_frontend/path_text_shape.hpp
diff --git a/drape_frontend/poi_symbol_shape.cpp b/libs/drape_frontend/poi_symbol_shape.cpp
similarity index 100%
rename from drape_frontend/poi_symbol_shape.cpp
rename to libs/drape_frontend/poi_symbol_shape.cpp
diff --git a/drape_frontend/poi_symbol_shape.hpp b/libs/drape_frontend/poi_symbol_shape.hpp
similarity index 100%
rename from drape_frontend/poi_symbol_shape.hpp
rename to libs/drape_frontend/poi_symbol_shape.hpp
diff --git a/drape_frontend/postprocess_renderer.cpp b/libs/drape_frontend/postprocess_renderer.cpp
similarity index 100%
rename from drape_frontend/postprocess_renderer.cpp
rename to libs/drape_frontend/postprocess_renderer.cpp
diff --git a/drape_frontend/postprocess_renderer.hpp b/libs/drape_frontend/postprocess_renderer.hpp
similarity index 100%
rename from drape_frontend/postprocess_renderer.hpp
rename to libs/drape_frontend/postprocess_renderer.hpp
diff --git a/drape_frontend/read_manager.cpp b/libs/drape_frontend/read_manager.cpp
similarity index 100%
rename from drape_frontend/read_manager.cpp
rename to libs/drape_frontend/read_manager.cpp
diff --git a/drape_frontend/read_manager.hpp b/libs/drape_frontend/read_manager.hpp
similarity index 100%
rename from drape_frontend/read_manager.hpp
rename to libs/drape_frontend/read_manager.hpp
diff --git a/drape_frontend/read_metaline_task.cpp b/libs/drape_frontend/read_metaline_task.cpp
similarity index 100%
rename from drape_frontend/read_metaline_task.cpp
rename to libs/drape_frontend/read_metaline_task.cpp
diff --git a/drape_frontend/read_metaline_task.hpp b/libs/drape_frontend/read_metaline_task.hpp
similarity index 100%
rename from drape_frontend/read_metaline_task.hpp
rename to libs/drape_frontend/read_metaline_task.hpp
diff --git a/drape_frontend/read_mwm_task.cpp b/libs/drape_frontend/read_mwm_task.cpp
similarity index 100%
rename from drape_frontend/read_mwm_task.cpp
rename to libs/drape_frontend/read_mwm_task.cpp
diff --git a/drape_frontend/read_mwm_task.hpp b/libs/drape_frontend/read_mwm_task.hpp
similarity index 100%
rename from drape_frontend/read_mwm_task.hpp
rename to libs/drape_frontend/read_mwm_task.hpp
diff --git a/drape_frontend/render_group.cpp b/libs/drape_frontend/render_group.cpp
similarity index 100%
rename from drape_frontend/render_group.cpp
rename to libs/drape_frontend/render_group.cpp
diff --git a/drape_frontend/render_group.hpp b/libs/drape_frontend/render_group.hpp
similarity index 100%
rename from drape_frontend/render_group.hpp
rename to libs/drape_frontend/render_group.hpp
diff --git a/drape_frontend/render_node.hpp b/libs/drape_frontend/render_node.hpp
similarity index 100%
rename from drape_frontend/render_node.hpp
rename to libs/drape_frontend/render_node.hpp
diff --git a/drape_frontend/render_state_extension.cpp b/libs/drape_frontend/render_state_extension.cpp
similarity index 100%
rename from drape_frontend/render_state_extension.cpp
rename to libs/drape_frontend/render_state_extension.cpp
diff --git a/drape_frontend/render_state_extension.hpp b/libs/drape_frontend/render_state_extension.hpp
similarity index 100%
rename from drape_frontend/render_state_extension.hpp
rename to libs/drape_frontend/render_state_extension.hpp
diff --git a/drape_frontend/requested_tiles.cpp b/libs/drape_frontend/requested_tiles.cpp
similarity index 100%
rename from drape_frontend/requested_tiles.cpp
rename to libs/drape_frontend/requested_tiles.cpp
diff --git a/drape_frontend/requested_tiles.hpp b/libs/drape_frontend/requested_tiles.hpp
similarity index 100%
rename from drape_frontend/requested_tiles.hpp
rename to libs/drape_frontend/requested_tiles.hpp
diff --git a/drape_frontend/route_builder.cpp b/libs/drape_frontend/route_builder.cpp
similarity index 100%
rename from drape_frontend/route_builder.cpp
rename to libs/drape_frontend/route_builder.cpp
diff --git a/drape_frontend/route_builder.hpp b/libs/drape_frontend/route_builder.hpp
similarity index 100%
rename from drape_frontend/route_builder.hpp
rename to libs/drape_frontend/route_builder.hpp
diff --git a/drape_frontend/route_renderer.cpp b/libs/drape_frontend/route_renderer.cpp
similarity index 100%
rename from drape_frontend/route_renderer.cpp
rename to libs/drape_frontend/route_renderer.cpp
diff --git a/drape_frontend/route_renderer.hpp b/libs/drape_frontend/route_renderer.hpp
similarity index 100%
rename from drape_frontend/route_renderer.hpp
rename to libs/drape_frontend/route_renderer.hpp
diff --git a/drape_frontend/route_shape.cpp b/libs/drape_frontend/route_shape.cpp
similarity index 100%
rename from drape_frontend/route_shape.cpp
rename to libs/drape_frontend/route_shape.cpp
diff --git a/drape_frontend/route_shape.hpp b/libs/drape_frontend/route_shape.hpp
similarity index 100%
rename from drape_frontend/route_shape.hpp
rename to libs/drape_frontend/route_shape.hpp
diff --git a/drape_frontend/rule_drawer.cpp b/libs/drape_frontend/rule_drawer.cpp
similarity index 100%
rename from drape_frontend/rule_drawer.cpp
rename to libs/drape_frontend/rule_drawer.cpp
diff --git a/drape_frontend/rule_drawer.hpp b/libs/drape_frontend/rule_drawer.hpp
similarity index 100%
rename from drape_frontend/rule_drawer.hpp
rename to libs/drape_frontend/rule_drawer.hpp
diff --git a/drape_frontend/scenario_manager.cpp b/libs/drape_frontend/scenario_manager.cpp
similarity index 100%
rename from drape_frontend/scenario_manager.cpp
rename to libs/drape_frontend/scenario_manager.cpp
diff --git a/drape_frontend/scenario_manager.hpp b/libs/drape_frontend/scenario_manager.hpp
similarity index 100%
rename from drape_frontend/scenario_manager.hpp
rename to libs/drape_frontend/scenario_manager.hpp
diff --git a/drape_frontend/screen_animations.cpp b/libs/drape_frontend/screen_animations.cpp
similarity index 100%
rename from drape_frontend/screen_animations.cpp
rename to libs/drape_frontend/screen_animations.cpp
diff --git a/drape_frontend/screen_animations.hpp b/libs/drape_frontend/screen_animations.hpp
similarity index 100%
rename from drape_frontend/screen_animations.hpp
rename to libs/drape_frontend/screen_animations.hpp
diff --git a/drape_frontend/screen_operations.cpp b/libs/drape_frontend/screen_operations.cpp
similarity index 100%
rename from drape_frontend/screen_operations.cpp
rename to libs/drape_frontend/screen_operations.cpp
diff --git a/drape_frontend/screen_operations.hpp b/libs/drape_frontend/screen_operations.hpp
similarity index 100%
rename from drape_frontend/screen_operations.hpp
rename to libs/drape_frontend/screen_operations.hpp
diff --git a/drape_frontend/screen_quad_renderer.cpp b/libs/drape_frontend/screen_quad_renderer.cpp
similarity index 100%
rename from drape_frontend/screen_quad_renderer.cpp
rename to libs/drape_frontend/screen_quad_renderer.cpp
diff --git a/drape_frontend/screen_quad_renderer.hpp b/libs/drape_frontend/screen_quad_renderer.hpp
similarity index 100%
rename from drape_frontend/screen_quad_renderer.hpp
rename to libs/drape_frontend/screen_quad_renderer.hpp
diff --git a/drape_frontend/selection_shape.cpp b/libs/drape_frontend/selection_shape.cpp
similarity index 100%
rename from drape_frontend/selection_shape.cpp
rename to libs/drape_frontend/selection_shape.cpp
diff --git a/drape_frontend/selection_shape.hpp b/libs/drape_frontend/selection_shape.hpp
similarity index 100%
rename from drape_frontend/selection_shape.hpp
rename to libs/drape_frontend/selection_shape.hpp
diff --git a/drape_frontend/selection_shape_generator.cpp b/libs/drape_frontend/selection_shape_generator.cpp
similarity index 100%
rename from drape_frontend/selection_shape_generator.cpp
rename to libs/drape_frontend/selection_shape_generator.cpp
diff --git a/drape_frontend/selection_shape_generator.hpp b/libs/drape_frontend/selection_shape_generator.hpp
similarity index 100%
rename from drape_frontend/selection_shape_generator.hpp
rename to libs/drape_frontend/selection_shape_generator.hpp
diff --git a/drape_frontend/shape_view_params.hpp b/libs/drape_frontend/shape_view_params.hpp
similarity index 100%
rename from drape_frontend/shape_view_params.hpp
rename to libs/drape_frontend/shape_view_params.hpp
diff --git a/drape_frontend/stylist.cpp b/libs/drape_frontend/stylist.cpp
similarity index 100%
rename from drape_frontend/stylist.cpp
rename to libs/drape_frontend/stylist.cpp
diff --git a/drape_frontend/stylist.hpp b/libs/drape_frontend/stylist.hpp
similarity index 100%
rename from drape_frontend/stylist.hpp
rename to libs/drape_frontend/stylist.hpp
diff --git a/drape_frontend/text_handle.cpp b/libs/drape_frontend/text_handle.cpp
similarity index 100%
rename from drape_frontend/text_handle.cpp
rename to libs/drape_frontend/text_handle.cpp
diff --git a/drape_frontend/text_handle.hpp b/libs/drape_frontend/text_handle.hpp
similarity index 100%
rename from drape_frontend/text_handle.hpp
rename to libs/drape_frontend/text_handle.hpp
diff --git a/drape_frontend/text_layout.cpp b/libs/drape_frontend/text_layout.cpp
similarity index 100%
rename from drape_frontend/text_layout.cpp
rename to libs/drape_frontend/text_layout.cpp
diff --git a/drape_frontend/text_layout.hpp b/libs/drape_frontend/text_layout.hpp
similarity index 100%
rename from drape_frontend/text_layout.hpp
rename to libs/drape_frontend/text_layout.hpp
diff --git a/drape_frontend/text_shape.cpp b/libs/drape_frontend/text_shape.cpp
similarity index 100%
rename from drape_frontend/text_shape.cpp
rename to libs/drape_frontend/text_shape.cpp
diff --git a/drape_frontend/text_shape.hpp b/libs/drape_frontend/text_shape.hpp
similarity index 100%
rename from drape_frontend/text_shape.hpp
rename to libs/drape_frontend/text_shape.hpp
diff --git a/drape_frontend/threads_commutator.cpp b/libs/drape_frontend/threads_commutator.cpp
similarity index 100%
rename from drape_frontend/threads_commutator.cpp
rename to libs/drape_frontend/threads_commutator.cpp
diff --git a/drape_frontend/threads_commutator.hpp b/libs/drape_frontend/threads_commutator.hpp
similarity index 100%
rename from drape_frontend/threads_commutator.hpp
rename to libs/drape_frontend/threads_commutator.hpp
diff --git a/drape_frontend/tile_info.cpp b/libs/drape_frontend/tile_info.cpp
similarity index 100%
rename from drape_frontend/tile_info.cpp
rename to libs/drape_frontend/tile_info.cpp
diff --git a/drape_frontend/tile_info.hpp b/libs/drape_frontend/tile_info.hpp
similarity index 100%
rename from drape_frontend/tile_info.hpp
rename to libs/drape_frontend/tile_info.hpp
diff --git a/drape_frontend/tile_key.cpp b/libs/drape_frontend/tile_key.cpp
similarity index 100%
rename from drape_frontend/tile_key.cpp
rename to libs/drape_frontend/tile_key.cpp
diff --git a/drape_frontend/tile_key.hpp b/libs/drape_frontend/tile_key.hpp
similarity index 100%
rename from drape_frontend/tile_key.hpp
rename to libs/drape_frontend/tile_key.hpp
diff --git a/drape_frontend/tile_utils.cpp b/libs/drape_frontend/tile_utils.cpp
similarity index 100%
rename from drape_frontend/tile_utils.cpp
rename to libs/drape_frontend/tile_utils.cpp
diff --git a/drape_frontend/tile_utils.hpp b/libs/drape_frontend/tile_utils.hpp
similarity index 100%
rename from drape_frontend/tile_utils.hpp
rename to libs/drape_frontend/tile_utils.hpp
diff --git a/drape_frontend/traffic_generator.cpp b/libs/drape_frontend/traffic_generator.cpp
similarity index 100%
rename from drape_frontend/traffic_generator.cpp
rename to libs/drape_frontend/traffic_generator.cpp
diff --git a/drape_frontend/traffic_generator.hpp b/libs/drape_frontend/traffic_generator.hpp
similarity index 100%
rename from drape_frontend/traffic_generator.hpp
rename to libs/drape_frontend/traffic_generator.hpp
diff --git a/drape_frontend/traffic_renderer.cpp b/libs/drape_frontend/traffic_renderer.cpp
similarity index 100%
rename from drape_frontend/traffic_renderer.cpp
rename to libs/drape_frontend/traffic_renderer.cpp
diff --git a/drape_frontend/traffic_renderer.hpp b/libs/drape_frontend/traffic_renderer.hpp
similarity index 100%
rename from drape_frontend/traffic_renderer.hpp
rename to libs/drape_frontend/traffic_renderer.hpp
diff --git a/drape_frontend/transit_scheme_builder.cpp b/libs/drape_frontend/transit_scheme_builder.cpp
similarity index 100%
rename from drape_frontend/transit_scheme_builder.cpp
rename to libs/drape_frontend/transit_scheme_builder.cpp
diff --git a/drape_frontend/transit_scheme_builder.hpp b/libs/drape_frontend/transit_scheme_builder.hpp
similarity index 100%
rename from drape_frontend/transit_scheme_builder.hpp
rename to libs/drape_frontend/transit_scheme_builder.hpp
diff --git a/drape_frontend/transit_scheme_renderer.cpp b/libs/drape_frontend/transit_scheme_renderer.cpp
similarity index 100%
rename from drape_frontend/transit_scheme_renderer.cpp
rename to libs/drape_frontend/transit_scheme_renderer.cpp
diff --git a/drape_frontend/transit_scheme_renderer.hpp b/libs/drape_frontend/transit_scheme_renderer.hpp
similarity index 100%
rename from drape_frontend/transit_scheme_renderer.hpp
rename to libs/drape_frontend/transit_scheme_renderer.hpp
diff --git a/drape_frontend/user_event_stream.cpp b/libs/drape_frontend/user_event_stream.cpp
similarity index 100%
rename from drape_frontend/user_event_stream.cpp
rename to libs/drape_frontend/user_event_stream.cpp
diff --git a/drape_frontend/user_event_stream.hpp b/libs/drape_frontend/user_event_stream.hpp
similarity index 100%
rename from drape_frontend/user_event_stream.hpp
rename to libs/drape_frontend/user_event_stream.hpp
diff --git a/drape_frontend/user_mark_generator.cpp b/libs/drape_frontend/user_mark_generator.cpp
similarity index 100%
rename from drape_frontend/user_mark_generator.cpp
rename to libs/drape_frontend/user_mark_generator.cpp
diff --git a/drape_frontend/user_mark_generator.hpp b/libs/drape_frontend/user_mark_generator.hpp
similarity index 100%
rename from drape_frontend/user_mark_generator.hpp
rename to libs/drape_frontend/user_mark_generator.hpp
diff --git a/drape_frontend/user_mark_shapes.cpp b/libs/drape_frontend/user_mark_shapes.cpp
similarity index 100%
rename from drape_frontend/user_mark_shapes.cpp
rename to libs/drape_frontend/user_mark_shapes.cpp
diff --git a/drape_frontend/user_mark_shapes.hpp b/libs/drape_frontend/user_mark_shapes.hpp
similarity index 100%
rename from drape_frontend/user_mark_shapes.hpp
rename to libs/drape_frontend/user_mark_shapes.hpp
diff --git a/drape_frontend/user_marks_provider.cpp b/libs/drape_frontend/user_marks_provider.cpp
similarity index 100%
rename from drape_frontend/user_marks_provider.cpp
rename to libs/drape_frontend/user_marks_provider.cpp
diff --git a/drape_frontend/user_marks_provider.hpp b/libs/drape_frontend/user_marks_provider.hpp
similarity index 100%
rename from drape_frontend/user_marks_provider.hpp
rename to libs/drape_frontend/user_marks_provider.hpp
diff --git a/drape_frontend/visual_params.cpp b/libs/drape_frontend/visual_params.cpp
similarity index 100%
rename from drape_frontend/visual_params.cpp
rename to libs/drape_frontend/visual_params.cpp
diff --git a/drape_frontend/visual_params.hpp b/libs/drape_frontend/visual_params.hpp
similarity index 100%
rename from drape_frontend/visual_params.hpp
rename to libs/drape_frontend/visual_params.hpp
diff --git a/editor/CMakeLists.txt b/libs/editor/CMakeLists.txt
similarity index 100%
rename from editor/CMakeLists.txt
rename to libs/editor/CMakeLists.txt
diff --git a/editor/changeset_wrapper.cpp b/libs/editor/changeset_wrapper.cpp
similarity index 100%
rename from editor/changeset_wrapper.cpp
rename to libs/editor/changeset_wrapper.cpp
diff --git a/editor/changeset_wrapper.hpp b/libs/editor/changeset_wrapper.hpp
similarity index 100%
rename from editor/changeset_wrapper.hpp
rename to libs/editor/changeset_wrapper.hpp
diff --git a/editor/config_loader.cpp b/libs/editor/config_loader.cpp
similarity index 100%
rename from editor/config_loader.cpp
rename to libs/editor/config_loader.cpp
diff --git a/editor/config_loader.hpp b/libs/editor/config_loader.hpp
similarity index 100%
rename from editor/config_loader.hpp
rename to libs/editor/config_loader.hpp
diff --git a/editor/editable_data_source.hpp b/libs/editor/editable_data_source.hpp
similarity index 100%
rename from editor/editable_data_source.hpp
rename to libs/editor/editable_data_source.hpp
diff --git a/editor/editable_feature_source.cpp b/libs/editor/editable_feature_source.cpp
similarity index 100%
rename from editor/editable_feature_source.cpp
rename to libs/editor/editable_feature_source.cpp
diff --git a/editor/editable_feature_source.hpp b/libs/editor/editable_feature_source.hpp
similarity index 100%
rename from editor/editable_feature_source.hpp
rename to libs/editor/editable_feature_source.hpp
diff --git a/editor/editor_config.cpp b/libs/editor/editor_config.cpp
similarity index 100%
rename from editor/editor_config.cpp
rename to libs/editor/editor_config.cpp
diff --git a/editor/editor_config.hpp b/libs/editor/editor_config.hpp
similarity index 100%
rename from editor/editor_config.hpp
rename to libs/editor/editor_config.hpp
diff --git a/editor/editor_notes.cpp b/libs/editor/editor_notes.cpp
similarity index 100%
rename from editor/editor_notes.cpp
rename to libs/editor/editor_notes.cpp
diff --git a/editor/editor_notes.hpp b/libs/editor/editor_notes.hpp
similarity index 100%
rename from editor/editor_notes.hpp
rename to libs/editor/editor_notes.hpp
diff --git a/editor/editor_storage.cpp b/libs/editor/editor_storage.cpp
similarity index 100%
rename from editor/editor_storage.cpp
rename to libs/editor/editor_storage.cpp
diff --git a/editor/editor_storage.hpp b/libs/editor/editor_storage.hpp
similarity index 100%
rename from editor/editor_storage.hpp
rename to libs/editor/editor_storage.hpp
diff --git a/editor/editor_tests/CMakeLists.txt b/libs/editor/editor_tests/CMakeLists.txt
similarity index 100%
rename from editor/editor_tests/CMakeLists.txt
rename to libs/editor/editor_tests/CMakeLists.txt
diff --git a/editor/editor_tests/config_loader_test.cpp b/libs/editor/editor_tests/config_loader_test.cpp
similarity index 100%
rename from editor/editor_tests/config_loader_test.cpp
rename to libs/editor/editor_tests/config_loader_test.cpp
diff --git a/editor/editor_tests/editor_config_test.cpp b/libs/editor/editor_tests/editor_config_test.cpp
similarity index 100%
rename from editor/editor_tests/editor_config_test.cpp
rename to libs/editor/editor_tests/editor_config_test.cpp
diff --git a/editor/editor_tests/editor_notes_test.cpp b/libs/editor/editor_tests/editor_notes_test.cpp
similarity index 100%
rename from editor/editor_tests/editor_notes_test.cpp
rename to libs/editor/editor_tests/editor_notes_test.cpp
diff --git a/editor/editor_tests/feature_matcher_test.cpp b/libs/editor/editor_tests/feature_matcher_test.cpp
similarity index 100%
rename from editor/editor_tests/feature_matcher_test.cpp
rename to libs/editor/editor_tests/feature_matcher_test.cpp
diff --git a/editor/editor_tests/match_by_geometry_test.cpp b/libs/editor/editor_tests/match_by_geometry_test.cpp
similarity index 100%
rename from editor/editor_tests/match_by_geometry_test.cpp
rename to libs/editor/editor_tests/match_by_geometry_test.cpp
diff --git a/editor/editor_tests/new_feature_categories_test.cpp b/libs/editor/editor_tests/new_feature_categories_test.cpp
similarity index 100%
rename from editor/editor_tests/new_feature_categories_test.cpp
rename to libs/editor/editor_tests/new_feature_categories_test.cpp
diff --git a/editor/editor_tests/opening_hours_ui_test.cpp b/libs/editor/editor_tests/opening_hours_ui_test.cpp
similarity index 100%
rename from editor/editor_tests/opening_hours_ui_test.cpp
rename to libs/editor/editor_tests/opening_hours_ui_test.cpp
diff --git a/editor/editor_tests/osm_editor_test.cpp b/libs/editor/editor_tests/osm_editor_test.cpp
similarity index 100%
rename from editor/editor_tests/osm_editor_test.cpp
rename to libs/editor/editor_tests/osm_editor_test.cpp
diff --git a/editor/editor_tests/osm_editor_test.hpp b/libs/editor/editor_tests/osm_editor_test.hpp
similarity index 100%
rename from editor/editor_tests/osm_editor_test.hpp
rename to libs/editor/editor_tests/osm_editor_test.hpp
diff --git a/editor/editor_tests/ui2oh_test.cpp b/libs/editor/editor_tests/ui2oh_test.cpp
similarity index 100%
rename from editor/editor_tests/ui2oh_test.cpp
rename to libs/editor/editor_tests/ui2oh_test.cpp
diff --git a/editor/editor_tests/xml_feature_test.cpp b/libs/editor/editor_tests/xml_feature_test.cpp
similarity index 100%
rename from editor/editor_tests/xml_feature_test.cpp
rename to libs/editor/editor_tests/xml_feature_test.cpp
diff --git a/editor/editor_tests_support/CMakeLists.txt b/libs/editor/editor_tests_support/CMakeLists.txt
similarity index 100%
rename from editor/editor_tests_support/CMakeLists.txt
rename to libs/editor/editor_tests_support/CMakeLists.txt
diff --git a/editor/editor_tests_support/helpers.cpp b/libs/editor/editor_tests_support/helpers.cpp
similarity index 100%
rename from editor/editor_tests_support/helpers.cpp
rename to libs/editor/editor_tests_support/helpers.cpp
diff --git a/editor/editor_tests_support/helpers.hpp b/libs/editor/editor_tests_support/helpers.hpp
similarity index 100%
rename from editor/editor_tests_support/helpers.hpp
rename to libs/editor/editor_tests_support/helpers.hpp
diff --git a/editor/edits_migration.cpp b/libs/editor/edits_migration.cpp
similarity index 100%
rename from editor/edits_migration.cpp
rename to libs/editor/edits_migration.cpp
diff --git a/editor/edits_migration.hpp b/libs/editor/edits_migration.hpp
similarity index 100%
rename from editor/edits_migration.hpp
rename to libs/editor/edits_migration.hpp
diff --git a/editor/feature_matcher.cpp b/libs/editor/feature_matcher.cpp
similarity index 100%
rename from editor/feature_matcher.cpp
rename to libs/editor/feature_matcher.cpp
diff --git a/editor/feature_matcher.hpp b/libs/editor/feature_matcher.hpp
similarity index 100%
rename from editor/feature_matcher.hpp
rename to libs/editor/feature_matcher.hpp
diff --git a/editor/module.modulemap b/libs/editor/module.modulemap
similarity index 100%
rename from editor/module.modulemap
rename to libs/editor/module.modulemap
diff --git a/editor/new_feature_categories.cpp b/libs/editor/new_feature_categories.cpp
similarity index 100%
rename from editor/new_feature_categories.cpp
rename to libs/editor/new_feature_categories.cpp
diff --git a/editor/new_feature_categories.hpp b/libs/editor/new_feature_categories.hpp
similarity index 100%
rename from editor/new_feature_categories.hpp
rename to libs/editor/new_feature_categories.hpp
diff --git a/editor/opening_hours_ui.cpp b/libs/editor/opening_hours_ui.cpp
similarity index 100%
rename from editor/opening_hours_ui.cpp
rename to libs/editor/opening_hours_ui.cpp
diff --git a/editor/opening_hours_ui.hpp b/libs/editor/opening_hours_ui.hpp
similarity index 100%
rename from editor/opening_hours_ui.hpp
rename to libs/editor/opening_hours_ui.hpp
diff --git a/editor/osm_auth.cpp b/libs/editor/osm_auth.cpp
similarity index 100%
rename from editor/osm_auth.cpp
rename to libs/editor/osm_auth.cpp
diff --git a/editor/osm_auth.hpp b/libs/editor/osm_auth.hpp
similarity index 100%
rename from editor/osm_auth.hpp
rename to libs/editor/osm_auth.hpp
diff --git a/editor/osm_auth_tests/CMakeLists.txt b/libs/editor/osm_auth_tests/CMakeLists.txt
similarity index 100%
rename from editor/osm_auth_tests/CMakeLists.txt
rename to libs/editor/osm_auth_tests/CMakeLists.txt
diff --git a/editor/osm_auth_tests/osm_auth_tests.cpp b/libs/editor/osm_auth_tests/osm_auth_tests.cpp
similarity index 100%
rename from editor/osm_auth_tests/osm_auth_tests.cpp
rename to libs/editor/osm_auth_tests/osm_auth_tests.cpp
diff --git a/editor/osm_auth_tests/server_api_test.cpp b/libs/editor/osm_auth_tests/server_api_test.cpp
similarity index 100%
rename from editor/osm_auth_tests/server_api_test.cpp
rename to libs/editor/osm_auth_tests/server_api_test.cpp
diff --git a/editor/osm_editor.cpp b/libs/editor/osm_editor.cpp
similarity index 100%
rename from editor/osm_editor.cpp
rename to libs/editor/osm_editor.cpp
diff --git a/editor/osm_editor.hpp b/libs/editor/osm_editor.hpp
similarity index 100%
rename from editor/osm_editor.hpp
rename to libs/editor/osm_editor.hpp
diff --git a/editor/server_api.cpp b/libs/editor/server_api.cpp
similarity index 100%
rename from editor/server_api.cpp
rename to libs/editor/server_api.cpp
diff --git a/editor/server_api.hpp b/libs/editor/server_api.hpp
similarity index 100%
rename from editor/server_api.hpp
rename to libs/editor/server_api.hpp
diff --git a/editor/ui2oh.cpp b/libs/editor/ui2oh.cpp
similarity index 100%
rename from editor/ui2oh.cpp
rename to libs/editor/ui2oh.cpp
diff --git a/editor/ui2oh.hpp b/libs/editor/ui2oh.hpp
similarity index 100%
rename from editor/ui2oh.hpp
rename to libs/editor/ui2oh.hpp
diff --git a/editor/xml_feature.cpp b/libs/editor/xml_feature.cpp
similarity index 100%
rename from editor/xml_feature.cpp
rename to libs/editor/xml_feature.cpp
diff --git a/editor/xml_feature.hpp b/libs/editor/xml_feature.hpp
similarity index 100%
rename from editor/xml_feature.hpp
rename to libs/editor/xml_feature.hpp
diff --git a/editor/yes_no_unknown.hpp b/libs/editor/yes_no_unknown.hpp
similarity index 100%
rename from editor/yes_no_unknown.hpp
rename to libs/editor/yes_no_unknown.hpp
diff --git a/ge0/CMakeLists.txt b/libs/ge0/CMakeLists.txt
similarity index 100%
rename from ge0/CMakeLists.txt
rename to libs/ge0/CMakeLists.txt
diff --git a/ge0/ge0.php b/libs/ge0/ge0.php
similarity index 100%
rename from ge0/ge0.php
rename to libs/ge0/ge0.php
diff --git a/ge0/ge0_tests/CMakeLists.txt b/libs/ge0/ge0_tests/CMakeLists.txt
similarity index 100%
rename from ge0/ge0_tests/CMakeLists.txt
rename to libs/ge0/ge0_tests/CMakeLists.txt
diff --git a/ge0/ge0_tests/geo_url_tests.cpp b/libs/ge0/ge0_tests/geo_url_tests.cpp
similarity index 100%
rename from ge0/ge0_tests/geo_url_tests.cpp
rename to libs/ge0/ge0_tests/geo_url_tests.cpp
diff --git a/ge0/ge0_tests/parser_tests.cpp b/libs/ge0/ge0_tests/parser_tests.cpp
similarity index 100%
rename from ge0/ge0_tests/parser_tests.cpp
rename to libs/ge0/ge0_tests/parser_tests.cpp
diff --git a/ge0/ge0_tests/url_generator_tests.cpp b/libs/ge0/ge0_tests/url_generator_tests.cpp
similarity index 100%
rename from ge0/ge0_tests/url_generator_tests.cpp
rename to libs/ge0/ge0_tests/url_generator_tests.cpp
diff --git a/ge0/geo_url_parser.cpp b/libs/ge0/geo_url_parser.cpp
similarity index 100%
rename from ge0/geo_url_parser.cpp
rename to libs/ge0/geo_url_parser.cpp
diff --git a/ge0/geo_url_parser.hpp b/libs/ge0/geo_url_parser.hpp
similarity index 100%
rename from ge0/geo_url_parser.hpp
rename to libs/ge0/geo_url_parser.hpp
diff --git a/ge0/parser.cpp b/libs/ge0/parser.cpp
similarity index 100%
rename from ge0/parser.cpp
rename to libs/ge0/parser.cpp
diff --git a/ge0/parser.hpp b/libs/ge0/parser.hpp
similarity index 100%
rename from ge0/parser.hpp
rename to libs/ge0/parser.hpp
diff --git a/ge0/url_generator.cpp b/libs/ge0/url_generator.cpp
similarity index 100%
rename from ge0/url_generator.cpp
rename to libs/ge0/url_generator.cpp
diff --git a/ge0/url_generator.hpp b/libs/ge0/url_generator.hpp
similarity index 100%
rename from ge0/url_generator.hpp
rename to libs/ge0/url_generator.hpp
diff --git a/geometry/CMakeLists.txt b/libs/geometry/CMakeLists.txt
similarity index 100%
rename from geometry/CMakeLists.txt
rename to libs/geometry/CMakeLists.txt
diff --git a/geometry/algorithm.cpp b/libs/geometry/algorithm.cpp
similarity index 100%
rename from geometry/algorithm.cpp
rename to libs/geometry/algorithm.cpp
diff --git a/geometry/algorithm.hpp b/libs/geometry/algorithm.hpp
similarity index 100%
rename from geometry/algorithm.hpp
rename to libs/geometry/algorithm.hpp
diff --git a/geometry/angles.cpp b/libs/geometry/angles.cpp
similarity index 100%
rename from geometry/angles.cpp
rename to libs/geometry/angles.cpp
diff --git a/geometry/angles.hpp b/libs/geometry/angles.hpp
similarity index 100%
rename from geometry/angles.hpp
rename to libs/geometry/angles.hpp
diff --git a/geometry/any_rect2d.hpp b/libs/geometry/any_rect2d.hpp
similarity index 100%
rename from geometry/any_rect2d.hpp
rename to libs/geometry/any_rect2d.hpp
diff --git a/geometry/area_on_earth.cpp b/libs/geometry/area_on_earth.cpp
similarity index 100%
rename from geometry/area_on_earth.cpp
rename to libs/geometry/area_on_earth.cpp
diff --git a/geometry/area_on_earth.hpp b/libs/geometry/area_on_earth.hpp
similarity index 100%
rename from geometry/area_on_earth.hpp
rename to libs/geometry/area_on_earth.hpp
diff --git a/geometry/avg_vector.hpp b/libs/geometry/avg_vector.hpp
similarity index 100%
rename from geometry/avg_vector.hpp
rename to libs/geometry/avg_vector.hpp
diff --git a/geometry/bounding_box.cpp b/libs/geometry/bounding_box.cpp
similarity index 100%
rename from geometry/bounding_box.cpp
rename to libs/geometry/bounding_box.cpp
diff --git a/geometry/bounding_box.hpp b/libs/geometry/bounding_box.hpp
similarity index 100%
rename from geometry/bounding_box.hpp
rename to libs/geometry/bounding_box.hpp
diff --git a/geometry/calipers_box.cpp b/libs/geometry/calipers_box.cpp
similarity index 100%
rename from geometry/calipers_box.cpp
rename to libs/geometry/calipers_box.cpp
diff --git a/geometry/calipers_box.hpp b/libs/geometry/calipers_box.hpp
similarity index 100%
rename from geometry/calipers_box.hpp
rename to libs/geometry/calipers_box.hpp
diff --git a/geometry/cellid.hpp b/libs/geometry/cellid.hpp
similarity index 100%
rename from geometry/cellid.hpp
rename to libs/geometry/cellid.hpp
diff --git a/geometry/circle_on_earth.cpp b/libs/geometry/circle_on_earth.cpp
similarity index 100%
rename from geometry/circle_on_earth.cpp
rename to libs/geometry/circle_on_earth.cpp
diff --git a/geometry/circle_on_earth.hpp b/libs/geometry/circle_on_earth.hpp
similarity index 100%
rename from geometry/circle_on_earth.hpp
rename to libs/geometry/circle_on_earth.hpp
diff --git a/geometry/clipping.cpp b/libs/geometry/clipping.cpp
similarity index 100%
rename from geometry/clipping.cpp
rename to libs/geometry/clipping.cpp
diff --git a/geometry/clipping.hpp b/libs/geometry/clipping.hpp
similarity index 100%
rename from geometry/clipping.hpp
rename to libs/geometry/clipping.hpp
diff --git a/geometry/convex_hull.cpp b/libs/geometry/convex_hull.cpp
similarity index 100%
rename from geometry/convex_hull.cpp
rename to libs/geometry/convex_hull.cpp
diff --git a/geometry/convex_hull.hpp b/libs/geometry/convex_hull.hpp
similarity index 100%
rename from geometry/convex_hull.hpp
rename to libs/geometry/convex_hull.hpp
diff --git a/geometry/covering.hpp b/libs/geometry/covering.hpp
similarity index 100%
rename from geometry/covering.hpp
rename to libs/geometry/covering.hpp
diff --git a/geometry/covering_utils.hpp b/libs/geometry/covering_utils.hpp
similarity index 100%
rename from geometry/covering_utils.hpp
rename to libs/geometry/covering_utils.hpp
diff --git a/geometry/diamond_box.cpp b/libs/geometry/diamond_box.cpp
similarity index 100%
rename from geometry/diamond_box.cpp
rename to libs/geometry/diamond_box.cpp
diff --git a/geometry/diamond_box.hpp b/libs/geometry/diamond_box.hpp
similarity index 100%
rename from geometry/diamond_box.hpp
rename to libs/geometry/diamond_box.hpp
diff --git a/geometry/distance_on_sphere.cpp b/libs/geometry/distance_on_sphere.cpp
similarity index 100%
rename from geometry/distance_on_sphere.cpp
rename to libs/geometry/distance_on_sphere.cpp
diff --git a/geometry/distance_on_sphere.hpp b/libs/geometry/distance_on_sphere.hpp
similarity index 100%
rename from geometry/distance_on_sphere.hpp
rename to libs/geometry/distance_on_sphere.hpp
diff --git a/geometry/geometry_tests/CMakeLists.txt b/libs/geometry/geometry_tests/CMakeLists.txt
similarity index 100%
rename from geometry/geometry_tests/CMakeLists.txt
rename to libs/geometry/geometry_tests/CMakeLists.txt
diff --git a/geometry/geometry_tests/algorithm_test.cpp b/libs/geometry/geometry_tests/algorithm_test.cpp
similarity index 100%
rename from geometry/geometry_tests/algorithm_test.cpp
rename to libs/geometry/geometry_tests/algorithm_test.cpp
diff --git a/geometry/geometry_tests/angle_test.cpp b/libs/geometry/geometry_tests/angle_test.cpp
similarity index 100%
rename from geometry/geometry_tests/angle_test.cpp
rename to libs/geometry/geometry_tests/angle_test.cpp
diff --git a/geometry/geometry_tests/anyrect_test.cpp b/libs/geometry/geometry_tests/anyrect_test.cpp
similarity index 100%
rename from geometry/geometry_tests/anyrect_test.cpp
rename to libs/geometry/geometry_tests/anyrect_test.cpp
diff --git a/geometry/geometry_tests/area_on_earth_tests.cpp b/libs/geometry/geometry_tests/area_on_earth_tests.cpp
similarity index 100%
rename from geometry/geometry_tests/area_on_earth_tests.cpp
rename to libs/geometry/geometry_tests/area_on_earth_tests.cpp
diff --git a/geometry/geometry_tests/bounding_box_tests.cpp b/libs/geometry/geometry_tests/bounding_box_tests.cpp
similarity index 100%
rename from geometry/geometry_tests/bounding_box_tests.cpp
rename to libs/geometry/geometry_tests/bounding_box_tests.cpp
diff --git a/geometry/geometry_tests/calipers_box_tests.cpp b/libs/geometry/geometry_tests/calipers_box_tests.cpp
similarity index 100%
rename from geometry/geometry_tests/calipers_box_tests.cpp
rename to libs/geometry/geometry_tests/calipers_box_tests.cpp
diff --git a/geometry/geometry_tests/cellid_test.cpp b/libs/geometry/geometry_tests/cellid_test.cpp
similarity index 100%
rename from geometry/geometry_tests/cellid_test.cpp
rename to libs/geometry/geometry_tests/cellid_test.cpp
diff --git a/geometry/geometry_tests/circle_on_earth_tests.cpp b/libs/geometry/geometry_tests/circle_on_earth_tests.cpp
similarity index 100%
rename from geometry/geometry_tests/circle_on_earth_tests.cpp
rename to libs/geometry/geometry_tests/circle_on_earth_tests.cpp
diff --git a/geometry/geometry_tests/clipping_test.cpp b/libs/geometry/geometry_tests/clipping_test.cpp
similarity index 100%
rename from geometry/geometry_tests/clipping_test.cpp
rename to libs/geometry/geometry_tests/clipping_test.cpp
diff --git a/geometry/geometry_tests/common_test.cpp b/libs/geometry/geometry_tests/common_test.cpp
similarity index 100%
rename from geometry/geometry_tests/common_test.cpp
rename to libs/geometry/geometry_tests/common_test.cpp
diff --git a/geometry/geometry_tests/convex_hull_tests.cpp b/libs/geometry/geometry_tests/convex_hull_tests.cpp
similarity index 100%
rename from geometry/geometry_tests/convex_hull_tests.cpp
rename to libs/geometry/geometry_tests/convex_hull_tests.cpp
diff --git a/geometry/geometry_tests/covering_test.cpp b/libs/geometry/geometry_tests/covering_test.cpp
similarity index 100%
rename from geometry/geometry_tests/covering_test.cpp
rename to libs/geometry/geometry_tests/covering_test.cpp
diff --git a/geometry/geometry_tests/diamond_box_tests.cpp b/libs/geometry/geometry_tests/diamond_box_tests.cpp
similarity index 100%
rename from geometry/geometry_tests/diamond_box_tests.cpp
rename to libs/geometry/geometry_tests/diamond_box_tests.cpp
diff --git a/geometry/geometry_tests/distance_on_sphere_test.cpp b/libs/geometry/geometry_tests/distance_on_sphere_test.cpp
similarity index 100%
rename from geometry/geometry_tests/distance_on_sphere_test.cpp
rename to libs/geometry/geometry_tests/distance_on_sphere_test.cpp
diff --git a/geometry/geometry_tests/equality.hpp b/libs/geometry/geometry_tests/equality.hpp
similarity index 100%
rename from geometry/geometry_tests/equality.hpp
rename to libs/geometry/geometry_tests/equality.hpp
diff --git a/geometry/geometry_tests/intersect_test.cpp b/libs/geometry/geometry_tests/intersect_test.cpp
similarity index 100%
rename from geometry/geometry_tests/intersect_test.cpp
rename to libs/geometry/geometry_tests/intersect_test.cpp
diff --git a/geometry/geometry_tests/intersection_score_tests.cpp b/libs/geometry/geometry_tests/intersection_score_tests.cpp
similarity index 100%
rename from geometry/geometry_tests/intersection_score_tests.cpp
rename to libs/geometry/geometry_tests/intersection_score_tests.cpp
diff --git a/geometry/geometry_tests/large_polygon.hpp b/libs/geometry/geometry_tests/large_polygon.hpp
similarity index 100%
rename from geometry/geometry_tests/large_polygon.hpp
rename to libs/geometry/geometry_tests/large_polygon.hpp
diff --git a/geometry/geometry_tests/latlon_test.cpp b/libs/geometry/geometry_tests/latlon_test.cpp
similarity index 100%
rename from geometry/geometry_tests/latlon_test.cpp
rename to libs/geometry/geometry_tests/latlon_test.cpp
diff --git a/geometry/geometry_tests/line2d_tests.cpp b/libs/geometry/geometry_tests/line2d_tests.cpp
similarity index 100%
rename from geometry/geometry_tests/line2d_tests.cpp
rename to libs/geometry/geometry_tests/line2d_tests.cpp
diff --git a/geometry/geometry_tests/mercator_test.cpp b/libs/geometry/geometry_tests/mercator_test.cpp
similarity index 100%
rename from geometry/geometry_tests/mercator_test.cpp
rename to libs/geometry/geometry_tests/mercator_test.cpp
diff --git a/geometry/geometry_tests/nearby_points_sweeper_test.cpp b/libs/geometry/geometry_tests/nearby_points_sweeper_test.cpp
similarity index 100%
rename from geometry/geometry_tests/nearby_points_sweeper_test.cpp
rename to libs/geometry/geometry_tests/nearby_points_sweeper_test.cpp
diff --git a/geometry/geometry_tests/oblate_spheroid_tests.cpp b/libs/geometry/geometry_tests/oblate_spheroid_tests.cpp
similarity index 100%
rename from geometry/geometry_tests/oblate_spheroid_tests.cpp
rename to libs/geometry/geometry_tests/oblate_spheroid_tests.cpp
diff --git a/geometry/geometry_tests/packer_test.cpp b/libs/geometry/geometry_tests/packer_test.cpp
similarity index 100%
rename from geometry/geometry_tests/packer_test.cpp
rename to libs/geometry/geometry_tests/packer_test.cpp
diff --git a/geometry/geometry_tests/parametrized_segment_tests.cpp b/libs/geometry/geometry_tests/parametrized_segment_tests.cpp
similarity index 100%
rename from geometry/geometry_tests/parametrized_segment_tests.cpp
rename to libs/geometry/geometry_tests/parametrized_segment_tests.cpp
diff --git a/geometry/geometry_tests/point3d_tests.cpp b/libs/geometry/geometry_tests/point3d_tests.cpp
similarity index 100%
rename from geometry/geometry_tests/point3d_tests.cpp
rename to libs/geometry/geometry_tests/point3d_tests.cpp
diff --git a/geometry/geometry_tests/point_test.cpp b/libs/geometry/geometry_tests/point_test.cpp
similarity index 100%
rename from geometry/geometry_tests/point_test.cpp
rename to libs/geometry/geometry_tests/point_test.cpp
diff --git a/geometry/geometry_tests/polygon_test.cpp b/libs/geometry/geometry_tests/polygon_test.cpp
similarity index 100%
rename from geometry/geometry_tests/polygon_test.cpp
rename to libs/geometry/geometry_tests/polygon_test.cpp
diff --git a/geometry/geometry_tests/polyline_tests.cpp b/libs/geometry/geometry_tests/polyline_tests.cpp
similarity index 100%
rename from geometry/geometry_tests/polyline_tests.cpp
rename to libs/geometry/geometry_tests/polyline_tests.cpp
diff --git a/geometry/geometry_tests/rect_test.cpp b/libs/geometry/geometry_tests/rect_test.cpp
similarity index 100%
rename from geometry/geometry_tests/rect_test.cpp
rename to libs/geometry/geometry_tests/rect_test.cpp
diff --git a/geometry/geometry_tests/region2d_binary_op_test.cpp b/libs/geometry/geometry_tests/region2d_binary_op_test.cpp
similarity index 100%
rename from geometry/geometry_tests/region2d_binary_op_test.cpp
rename to libs/geometry/geometry_tests/region2d_binary_op_test.cpp
diff --git a/geometry/geometry_tests/region_tests.cpp b/libs/geometry/geometry_tests/region_tests.cpp
similarity index 100%
rename from geometry/geometry_tests/region_tests.cpp
rename to libs/geometry/geometry_tests/region_tests.cpp
diff --git a/geometry/geometry_tests/robust_test.cpp b/libs/geometry/geometry_tests/robust_test.cpp
similarity index 100%
rename from geometry/geometry_tests/robust_test.cpp
rename to libs/geometry/geometry_tests/robust_test.cpp
diff --git a/geometry/geometry_tests/screen_test.cpp b/libs/geometry/geometry_tests/screen_test.cpp
similarity index 100%
rename from geometry/geometry_tests/screen_test.cpp
rename to libs/geometry/geometry_tests/screen_test.cpp
diff --git a/geometry/geometry_tests/segment2d_tests.cpp b/libs/geometry/geometry_tests/segment2d_tests.cpp
similarity index 100%
rename from geometry/geometry_tests/segment2d_tests.cpp
rename to libs/geometry/geometry_tests/segment2d_tests.cpp
diff --git a/geometry/geometry_tests/simplification_test.cpp b/libs/geometry/geometry_tests/simplification_test.cpp
similarity index 100%
rename from geometry/geometry_tests/simplification_test.cpp
rename to libs/geometry/geometry_tests/simplification_test.cpp
diff --git a/geometry/geometry_tests/spline_test.cpp b/libs/geometry/geometry_tests/spline_test.cpp
similarity index 100%
rename from geometry/geometry_tests/spline_test.cpp
rename to libs/geometry/geometry_tests/spline_test.cpp
diff --git a/geometry/geometry_tests/test_regions.hpp b/libs/geometry/geometry_tests/test_regions.hpp
similarity index 100%
rename from geometry/geometry_tests/test_regions.hpp
rename to libs/geometry/geometry_tests/test_regions.hpp
diff --git a/geometry/geometry_tests/transformations_test.cpp b/libs/geometry/geometry_tests/transformations_test.cpp
similarity index 100%
rename from geometry/geometry_tests/transformations_test.cpp
rename to libs/geometry/geometry_tests/transformations_test.cpp
diff --git a/geometry/geometry_tests/tree_test.cpp b/libs/geometry/geometry_tests/tree_test.cpp
similarity index 100%
rename from geometry/geometry_tests/tree_test.cpp
rename to libs/geometry/geometry_tests/tree_test.cpp
diff --git a/geometry/geometry_tests/vector_test.cpp b/libs/geometry/geometry_tests/vector_test.cpp
similarity index 100%
rename from geometry/geometry_tests/vector_test.cpp
rename to libs/geometry/geometry_tests/vector_test.cpp
diff --git a/geometry/intersection_score.hpp b/libs/geometry/intersection_score.hpp
similarity index 100%
rename from geometry/intersection_score.hpp
rename to libs/geometry/intersection_score.hpp
diff --git a/geometry/latlon.cpp b/libs/geometry/latlon.cpp
similarity index 100%
rename from geometry/latlon.cpp
rename to libs/geometry/latlon.cpp
diff --git a/geometry/latlon.hpp b/libs/geometry/latlon.hpp
similarity index 100%
rename from geometry/latlon.hpp
rename to libs/geometry/latlon.hpp
diff --git a/geometry/line2d.cpp b/libs/geometry/line2d.cpp
similarity index 100%
rename from geometry/line2d.cpp
rename to libs/geometry/line2d.cpp
diff --git a/geometry/line2d.hpp b/libs/geometry/line2d.hpp
similarity index 100%
rename from geometry/line2d.hpp
rename to libs/geometry/line2d.hpp
diff --git a/geometry/mercator.cpp b/libs/geometry/mercator.cpp
similarity index 100%
rename from geometry/mercator.cpp
rename to libs/geometry/mercator.cpp
diff --git a/geometry/mercator.hpp b/libs/geometry/mercator.hpp
similarity index 100%
rename from geometry/mercator.hpp
rename to libs/geometry/mercator.hpp
diff --git a/geometry/meter.hpp b/libs/geometry/meter.hpp
similarity index 100%
rename from geometry/meter.hpp
rename to libs/geometry/meter.hpp
diff --git a/geometry/nearby_points_sweeper.cpp b/libs/geometry/nearby_points_sweeper.cpp
similarity index 100%
rename from geometry/nearby_points_sweeper.cpp
rename to libs/geometry/nearby_points_sweeper.cpp
diff --git a/geometry/nearby_points_sweeper.hpp b/libs/geometry/nearby_points_sweeper.hpp
similarity index 100%
rename from geometry/nearby_points_sweeper.hpp
rename to libs/geometry/nearby_points_sweeper.hpp
diff --git a/geometry/oblate_spheroid.cpp b/libs/geometry/oblate_spheroid.cpp
similarity index 100%
rename from geometry/oblate_spheroid.cpp
rename to libs/geometry/oblate_spheroid.cpp
diff --git a/geometry/oblate_spheroid.hpp b/libs/geometry/oblate_spheroid.hpp
similarity index 100%
rename from geometry/oblate_spheroid.hpp
rename to libs/geometry/oblate_spheroid.hpp
diff --git a/geometry/packer.cpp b/libs/geometry/packer.cpp
similarity index 100%
rename from geometry/packer.cpp
rename to libs/geometry/packer.cpp
diff --git a/geometry/packer.hpp b/libs/geometry/packer.hpp
similarity index 100%
rename from geometry/packer.hpp
rename to libs/geometry/packer.hpp
diff --git a/geometry/parametrized_segment.hpp b/libs/geometry/parametrized_segment.hpp
similarity index 100%
rename from geometry/parametrized_segment.hpp
rename to libs/geometry/parametrized_segment.hpp
diff --git a/geometry/point2d.hpp b/libs/geometry/point2d.hpp
similarity index 100%
rename from geometry/point2d.hpp
rename to libs/geometry/point2d.hpp
diff --git a/geometry/point3d.hpp b/libs/geometry/point3d.hpp
similarity index 100%
rename from geometry/point3d.hpp
rename to libs/geometry/point3d.hpp
diff --git a/geometry/point_with_altitude.cpp b/libs/geometry/point_with_altitude.cpp
similarity index 100%
rename from geometry/point_with_altitude.cpp
rename to libs/geometry/point_with_altitude.cpp
diff --git a/geometry/point_with_altitude.hpp b/libs/geometry/point_with_altitude.hpp
similarity index 100%
rename from geometry/point_with_altitude.hpp
rename to libs/geometry/point_with_altitude.hpp
diff --git a/geometry/polygon.hpp b/libs/geometry/polygon.hpp
similarity index 100%
rename from geometry/polygon.hpp
rename to libs/geometry/polygon.hpp
diff --git a/geometry/polyline2d.hpp b/libs/geometry/polyline2d.hpp
similarity index 100%
rename from geometry/polyline2d.hpp
rename to libs/geometry/polyline2d.hpp
diff --git a/geometry/rect2d.hpp b/libs/geometry/rect2d.hpp
similarity index 100%
rename from geometry/rect2d.hpp
rename to libs/geometry/rect2d.hpp
diff --git a/geometry/rect_intersect.hpp b/libs/geometry/rect_intersect.hpp
similarity index 100%
rename from geometry/rect_intersect.hpp
rename to libs/geometry/rect_intersect.hpp
diff --git a/geometry/region2d.hpp b/libs/geometry/region2d.hpp
similarity index 100%
rename from geometry/region2d.hpp
rename to libs/geometry/region2d.hpp
diff --git a/geometry/region2d/binary_operators.cpp b/libs/geometry/region2d/binary_operators.cpp
similarity index 100%
rename from geometry/region2d/binary_operators.cpp
rename to libs/geometry/region2d/binary_operators.cpp
diff --git a/geometry/region2d/binary_operators.hpp b/libs/geometry/region2d/binary_operators.hpp
similarity index 100%
rename from geometry/region2d/binary_operators.hpp
rename to libs/geometry/region2d/binary_operators.hpp
diff --git a/geometry/region2d/boost_concept.hpp b/libs/geometry/region2d/boost_concept.hpp
similarity index 100%
rename from geometry/region2d/boost_concept.hpp
rename to libs/geometry/region2d/boost_concept.hpp
diff --git a/geometry/robust_orientation.cpp b/libs/geometry/robust_orientation.cpp
similarity index 100%
rename from geometry/robust_orientation.cpp
rename to libs/geometry/robust_orientation.cpp
diff --git a/geometry/robust_orientation.hpp b/libs/geometry/robust_orientation.hpp
similarity index 100%
rename from geometry/robust_orientation.hpp
rename to libs/geometry/robust_orientation.hpp
diff --git a/geometry/screenbase.cpp b/libs/geometry/screenbase.cpp
similarity index 100%
rename from geometry/screenbase.cpp
rename to libs/geometry/screenbase.cpp
diff --git a/geometry/screenbase.hpp b/libs/geometry/screenbase.hpp
similarity index 100%
rename from geometry/screenbase.hpp
rename to libs/geometry/screenbase.hpp
diff --git a/geometry/segment2d.cpp b/libs/geometry/segment2d.cpp
similarity index 100%
rename from geometry/segment2d.cpp
rename to libs/geometry/segment2d.cpp
diff --git a/geometry/segment2d.hpp b/libs/geometry/segment2d.hpp
similarity index 100%
rename from geometry/segment2d.hpp
rename to libs/geometry/segment2d.hpp
diff --git a/geometry/simplification.hpp b/libs/geometry/simplification.hpp
similarity index 100%
rename from geometry/simplification.hpp
rename to libs/geometry/simplification.hpp
diff --git a/geometry/smoothing.cpp b/libs/geometry/smoothing.cpp
similarity index 100%
rename from geometry/smoothing.cpp
rename to libs/geometry/smoothing.cpp
diff --git a/geometry/smoothing.hpp b/libs/geometry/smoothing.hpp
similarity index 100%
rename from geometry/smoothing.hpp
rename to libs/geometry/smoothing.hpp
diff --git a/geometry/spline.cpp b/libs/geometry/spline.cpp
similarity index 100%
rename from geometry/spline.cpp
rename to libs/geometry/spline.cpp
diff --git a/geometry/spline.hpp b/libs/geometry/spline.hpp
similarity index 100%
rename from geometry/spline.hpp
rename to libs/geometry/spline.hpp
diff --git a/geometry/transformations.hpp b/libs/geometry/transformations.hpp
similarity index 100%
rename from geometry/transformations.hpp
rename to libs/geometry/transformations.hpp
diff --git a/geometry/tree4d.hpp b/libs/geometry/tree4d.hpp
similarity index 100%
rename from geometry/tree4d.hpp
rename to libs/geometry/tree4d.hpp
diff --git a/geometry/triangle2d.cpp b/libs/geometry/triangle2d.cpp
similarity index 100%
rename from geometry/triangle2d.cpp
rename to libs/geometry/triangle2d.cpp
diff --git a/geometry/triangle2d.hpp b/libs/geometry/triangle2d.hpp
similarity index 100%
rename from geometry/triangle2d.hpp
rename to libs/geometry/triangle2d.hpp
diff --git a/indexer/CMakeLists.txt b/libs/indexer/CMakeLists.txt
similarity index 100%
rename from indexer/CMakeLists.txt
rename to libs/indexer/CMakeLists.txt
diff --git a/indexer/altitude_loader.cpp b/libs/indexer/altitude_loader.cpp
similarity index 100%
rename from indexer/altitude_loader.cpp
rename to libs/indexer/altitude_loader.cpp
diff --git a/indexer/altitude_loader.hpp b/libs/indexer/altitude_loader.hpp
similarity index 100%
rename from indexer/altitude_loader.hpp
rename to libs/indexer/altitude_loader.hpp
diff --git a/indexer/brands_holder.cpp b/libs/indexer/brands_holder.cpp
similarity index 100%
rename from indexer/brands_holder.cpp
rename to libs/indexer/brands_holder.cpp
diff --git a/indexer/brands_holder.hpp b/libs/indexer/brands_holder.hpp
similarity index 100%
rename from indexer/brands_holder.hpp
rename to libs/indexer/brands_holder.hpp
diff --git a/indexer/caching_rank_table_loader.cpp b/libs/indexer/caching_rank_table_loader.cpp
similarity index 100%
rename from indexer/caching_rank_table_loader.cpp
rename to libs/indexer/caching_rank_table_loader.cpp
diff --git a/indexer/caching_rank_table_loader.hpp b/libs/indexer/caching_rank_table_loader.hpp
similarity index 100%
rename from indexer/caching_rank_table_loader.hpp
rename to libs/indexer/caching_rank_table_loader.hpp
diff --git a/indexer/categories_holder.cpp b/libs/indexer/categories_holder.cpp
similarity index 100%
rename from indexer/categories_holder.cpp
rename to libs/indexer/categories_holder.cpp
diff --git a/indexer/categories_holder.hpp b/libs/indexer/categories_holder.hpp
similarity index 100%
rename from indexer/categories_holder.hpp
rename to libs/indexer/categories_holder.hpp
diff --git a/indexer/categories_holder_loader.cpp b/libs/indexer/categories_holder_loader.cpp
similarity index 100%
rename from indexer/categories_holder_loader.cpp
rename to libs/indexer/categories_holder_loader.cpp
diff --git a/indexer/categories_index.cpp b/libs/indexer/categories_index.cpp
similarity index 100%
rename from indexer/categories_index.cpp
rename to libs/indexer/categories_index.cpp
diff --git a/indexer/categories_index.hpp b/libs/indexer/categories_index.hpp
similarity index 100%
rename from indexer/categories_index.hpp
rename to libs/indexer/categories_index.hpp
diff --git a/indexer/cell_coverer.hpp b/libs/indexer/cell_coverer.hpp
similarity index 100%
rename from indexer/cell_coverer.hpp
rename to libs/indexer/cell_coverer.hpp
diff --git a/indexer/cell_id.hpp b/libs/indexer/cell_id.hpp
similarity index 100%
rename from indexer/cell_id.hpp
rename to libs/indexer/cell_id.hpp
diff --git a/indexer/cell_value_pair.hpp b/libs/indexer/cell_value_pair.hpp
similarity index 100%
rename from indexer/cell_value_pair.hpp
rename to libs/indexer/cell_value_pair.hpp
diff --git a/indexer/centers_table.cpp b/libs/indexer/centers_table.cpp
similarity index 100%
rename from indexer/centers_table.cpp
rename to libs/indexer/centers_table.cpp
diff --git a/indexer/centers_table.hpp b/libs/indexer/centers_table.hpp
similarity index 100%
rename from indexer/centers_table.hpp
rename to libs/indexer/centers_table.hpp
diff --git a/indexer/cities_boundaries_serdes.hpp b/libs/indexer/cities_boundaries_serdes.hpp
similarity index 100%
rename from indexer/cities_boundaries_serdes.hpp
rename to libs/indexer/cities_boundaries_serdes.hpp
diff --git a/indexer/city_boundary.hpp b/libs/indexer/city_boundary.hpp
similarity index 100%
rename from indexer/city_boundary.hpp
rename to libs/indexer/city_boundary.hpp
diff --git a/indexer/classificator.cpp b/libs/indexer/classificator.cpp
similarity index 100%
rename from indexer/classificator.cpp
rename to libs/indexer/classificator.cpp
diff --git a/indexer/classificator.hpp b/libs/indexer/classificator.hpp
similarity index 100%
rename from indexer/classificator.hpp
rename to libs/indexer/classificator.hpp
diff --git a/indexer/classificator_loader.cpp b/libs/indexer/classificator_loader.cpp
similarity index 100%
rename from indexer/classificator_loader.cpp
rename to libs/indexer/classificator_loader.cpp
diff --git a/indexer/classificator_loader.hpp b/libs/indexer/classificator_loader.hpp
similarity index 100%
rename from indexer/classificator_loader.hpp
rename to libs/indexer/classificator_loader.hpp
diff --git a/indexer/complex/serdes.cpp b/libs/indexer/complex/serdes.cpp
similarity index 100%
rename from indexer/complex/serdes.cpp
rename to libs/indexer/complex/serdes.cpp
diff --git a/indexer/complex/serdes.hpp b/libs/indexer/complex/serdes.hpp
similarity index 100%
rename from indexer/complex/serdes.hpp
rename to libs/indexer/complex/serdes.hpp
diff --git a/indexer/complex/serdes_utils.hpp b/libs/indexer/complex/serdes_utils.hpp
similarity index 100%
rename from indexer/complex/serdes_utils.hpp
rename to libs/indexer/complex/serdes_utils.hpp
diff --git a/indexer/complex/tree_node.hpp b/libs/indexer/complex/tree_node.hpp
similarity index 100%
rename from indexer/complex/tree_node.hpp
rename to libs/indexer/complex/tree_node.hpp
diff --git a/indexer/cuisines.cpp b/libs/indexer/cuisines.cpp
similarity index 100%
rename from indexer/cuisines.cpp
rename to libs/indexer/cuisines.cpp
diff --git a/indexer/cuisines.hpp b/libs/indexer/cuisines.hpp
similarity index 100%
rename from indexer/cuisines.hpp
rename to libs/indexer/cuisines.hpp
diff --git a/indexer/custom_keyvalue.cpp b/libs/indexer/custom_keyvalue.cpp
similarity index 100%
rename from indexer/custom_keyvalue.cpp
rename to libs/indexer/custom_keyvalue.cpp
diff --git a/indexer/custom_keyvalue.hpp b/libs/indexer/custom_keyvalue.hpp
similarity index 100%
rename from indexer/custom_keyvalue.hpp
rename to libs/indexer/custom_keyvalue.hpp
diff --git a/indexer/dat_section_header.hpp b/libs/indexer/dat_section_header.hpp
similarity index 100%
rename from indexer/dat_section_header.hpp
rename to libs/indexer/dat_section_header.hpp
diff --git a/indexer/data_factory.cpp b/libs/indexer/data_factory.cpp
similarity index 100%
rename from indexer/data_factory.cpp
rename to libs/indexer/data_factory.cpp
diff --git a/indexer/data_factory.hpp b/libs/indexer/data_factory.hpp
similarity index 100%
rename from indexer/data_factory.hpp
rename to libs/indexer/data_factory.hpp
diff --git a/indexer/data_header.cpp b/libs/indexer/data_header.cpp
similarity index 100%
rename from indexer/data_header.cpp
rename to libs/indexer/data_header.cpp
diff --git a/indexer/data_header.hpp b/libs/indexer/data_header.hpp
similarity index 100%
rename from indexer/data_header.hpp
rename to libs/indexer/data_header.hpp
diff --git a/indexer/data_source.cpp b/libs/indexer/data_source.cpp
similarity index 100%
rename from indexer/data_source.cpp
rename to libs/indexer/data_source.cpp
diff --git a/indexer/data_source.hpp b/libs/indexer/data_source.hpp
similarity index 100%
rename from indexer/data_source.hpp
rename to libs/indexer/data_source.hpp
diff --git a/indexer/data_source_helpers.cpp b/libs/indexer/data_source_helpers.cpp
similarity index 100%
rename from indexer/data_source_helpers.cpp
rename to libs/indexer/data_source_helpers.cpp
diff --git a/indexer/data_source_helpers.hpp b/libs/indexer/data_source_helpers.hpp
similarity index 100%
rename from indexer/data_source_helpers.hpp
rename to libs/indexer/data_source_helpers.hpp
diff --git a/indexer/displacement_manager.hpp b/libs/indexer/displacement_manager.hpp
similarity index 100%
rename from indexer/displacement_manager.hpp
rename to libs/indexer/displacement_manager.hpp
diff --git a/indexer/drawing_rule_def.cpp b/libs/indexer/drawing_rule_def.cpp
similarity index 100%
rename from indexer/drawing_rule_def.cpp
rename to libs/indexer/drawing_rule_def.cpp
diff --git a/indexer/drawing_rule_def.hpp b/libs/indexer/drawing_rule_def.hpp
similarity index 100%
rename from indexer/drawing_rule_def.hpp
rename to libs/indexer/drawing_rule_def.hpp
diff --git a/indexer/drawing_rules.cpp b/libs/indexer/drawing_rules.cpp
similarity index 100%
rename from indexer/drawing_rules.cpp
rename to libs/indexer/drawing_rules.cpp
diff --git a/indexer/drawing_rules.hpp b/libs/indexer/drawing_rules.hpp
similarity index 100%
rename from indexer/drawing_rules.hpp
rename to libs/indexer/drawing_rules.hpp
diff --git a/indexer/drules_include.hpp b/libs/indexer/drules_include.hpp
similarity index 100%
rename from indexer/drules_include.hpp
rename to libs/indexer/drules_include.hpp
diff --git a/indexer/drules_selector.cpp b/libs/indexer/drules_selector.cpp
similarity index 100%
rename from indexer/drules_selector.cpp
rename to libs/indexer/drules_selector.cpp
diff --git a/indexer/drules_selector.hpp b/libs/indexer/drules_selector.hpp
similarity index 100%
rename from indexer/drules_selector.hpp
rename to libs/indexer/drules_selector.hpp
diff --git a/indexer/drules_selector_parser.cpp b/libs/indexer/drules_selector_parser.cpp
similarity index 100%
rename from indexer/drules_selector_parser.cpp
rename to libs/indexer/drules_selector_parser.cpp
diff --git a/indexer/drules_selector_parser.hpp b/libs/indexer/drules_selector_parser.hpp
similarity index 100%
rename from indexer/drules_selector_parser.hpp
rename to libs/indexer/drules_selector_parser.hpp
diff --git a/indexer/drules_struct.pb.cc b/libs/indexer/drules_struct.pb.cc
similarity index 100%
rename from indexer/drules_struct.pb.cc
rename to libs/indexer/drules_struct.pb.cc
diff --git a/indexer/drules_struct.pb.h b/libs/indexer/drules_struct.pb.h
similarity index 100%
rename from indexer/drules_struct.pb.h
rename to libs/indexer/drules_struct.pb.h
diff --git a/indexer/drules_struct.proto b/libs/indexer/drules_struct.proto
similarity index 100%
rename from indexer/drules_struct.proto
rename to libs/indexer/drules_struct.proto
diff --git a/indexer/edit_journal.cpp b/libs/indexer/edit_journal.cpp
similarity index 100%
rename from indexer/edit_journal.cpp
rename to libs/indexer/edit_journal.cpp
diff --git a/indexer/edit_journal.hpp b/libs/indexer/edit_journal.hpp
similarity index 100%
rename from indexer/edit_journal.hpp
rename to libs/indexer/edit_journal.hpp
diff --git a/indexer/editable_map_object.cpp b/libs/indexer/editable_map_object.cpp
similarity index 100%
rename from indexer/editable_map_object.cpp
rename to libs/indexer/editable_map_object.cpp
diff --git a/indexer/editable_map_object.hpp b/libs/indexer/editable_map_object.hpp
similarity index 100%
rename from indexer/editable_map_object.hpp
rename to libs/indexer/editable_map_object.hpp
diff --git a/indexer/fake_feature_ids.cpp b/libs/indexer/fake_feature_ids.cpp
similarity index 100%
rename from indexer/fake_feature_ids.cpp
rename to libs/indexer/fake_feature_ids.cpp
diff --git a/indexer/fake_feature_ids.hpp b/libs/indexer/fake_feature_ids.hpp
similarity index 100%
rename from indexer/fake_feature_ids.hpp
rename to libs/indexer/fake_feature_ids.hpp
diff --git a/indexer/feature.cpp b/libs/indexer/feature.cpp
similarity index 100%
rename from indexer/feature.cpp
rename to libs/indexer/feature.cpp
diff --git a/indexer/feature.hpp b/libs/indexer/feature.hpp
similarity index 100%
rename from indexer/feature.hpp
rename to libs/indexer/feature.hpp
diff --git a/indexer/feature_algo.cpp b/libs/indexer/feature_algo.cpp
similarity index 100%
rename from indexer/feature_algo.cpp
rename to libs/indexer/feature_algo.cpp
diff --git a/indexer/feature_algo.hpp b/libs/indexer/feature_algo.hpp
similarity index 100%
rename from indexer/feature_algo.hpp
rename to libs/indexer/feature_algo.hpp
diff --git a/indexer/feature_altitude.hpp b/libs/indexer/feature_altitude.hpp
similarity index 100%
rename from indexer/feature_altitude.hpp
rename to libs/indexer/feature_altitude.hpp
diff --git a/indexer/feature_covering.cpp b/libs/indexer/feature_covering.cpp
similarity index 100%
rename from indexer/feature_covering.cpp
rename to libs/indexer/feature_covering.cpp
diff --git a/indexer/feature_covering.hpp b/libs/indexer/feature_covering.hpp
similarity index 100%
rename from indexer/feature_covering.hpp
rename to libs/indexer/feature_covering.hpp
diff --git a/indexer/feature_data.cpp b/libs/indexer/feature_data.cpp
similarity index 100%
rename from indexer/feature_data.cpp
rename to libs/indexer/feature_data.cpp
diff --git a/indexer/feature_data.hpp b/libs/indexer/feature_data.hpp
similarity index 100%
rename from indexer/feature_data.hpp
rename to libs/indexer/feature_data.hpp
diff --git a/indexer/feature_decl.cpp b/libs/indexer/feature_decl.cpp
similarity index 100%
rename from indexer/feature_decl.cpp
rename to libs/indexer/feature_decl.cpp
diff --git a/indexer/feature_decl.hpp b/libs/indexer/feature_decl.hpp
similarity index 100%
rename from indexer/feature_decl.hpp
rename to libs/indexer/feature_decl.hpp
diff --git a/indexer/feature_impl.cpp b/libs/indexer/feature_impl.cpp
similarity index 100%
rename from indexer/feature_impl.cpp
rename to libs/indexer/feature_impl.cpp
diff --git a/indexer/feature_impl.hpp b/libs/indexer/feature_impl.hpp
similarity index 100%
rename from indexer/feature_impl.hpp
rename to libs/indexer/feature_impl.hpp
diff --git a/indexer/feature_meta.cpp b/libs/indexer/feature_meta.cpp
similarity index 100%
rename from indexer/feature_meta.cpp
rename to libs/indexer/feature_meta.cpp
diff --git a/indexer/feature_meta.hpp b/libs/indexer/feature_meta.hpp
similarity index 100%
rename from indexer/feature_meta.hpp
rename to libs/indexer/feature_meta.hpp
diff --git a/indexer/feature_processor.hpp b/libs/indexer/feature_processor.hpp
similarity index 100%
rename from indexer/feature_processor.hpp
rename to libs/indexer/feature_processor.hpp
diff --git a/indexer/feature_source.cpp b/libs/indexer/feature_source.cpp
similarity index 100%
rename from indexer/feature_source.cpp
rename to libs/indexer/feature_source.cpp
diff --git a/indexer/feature_source.hpp b/libs/indexer/feature_source.hpp
similarity index 100%
rename from indexer/feature_source.hpp
rename to libs/indexer/feature_source.hpp
diff --git a/indexer/feature_to_osm.cpp b/libs/indexer/feature_to_osm.cpp
similarity index 100%
rename from indexer/feature_to_osm.cpp
rename to libs/indexer/feature_to_osm.cpp
diff --git a/indexer/feature_to_osm.hpp b/libs/indexer/feature_to_osm.hpp
similarity index 100%
rename from indexer/feature_to_osm.hpp
rename to libs/indexer/feature_to_osm.hpp
diff --git a/indexer/feature_utils.cpp b/libs/indexer/feature_utils.cpp
similarity index 100%
rename from indexer/feature_utils.cpp
rename to libs/indexer/feature_utils.cpp
diff --git a/indexer/feature_utils.hpp b/libs/indexer/feature_utils.hpp
similarity index 100%
rename from indexer/feature_utils.hpp
rename to libs/indexer/feature_utils.hpp
diff --git a/indexer/feature_visibility.cpp b/libs/indexer/feature_visibility.cpp
similarity index 100%
rename from indexer/feature_visibility.cpp
rename to libs/indexer/feature_visibility.cpp
diff --git a/indexer/feature_visibility.hpp b/libs/indexer/feature_visibility.hpp
similarity index 100%
rename from indexer/feature_visibility.hpp
rename to libs/indexer/feature_visibility.hpp
diff --git a/indexer/features_offsets_table.cpp b/libs/indexer/features_offsets_table.cpp
similarity index 100%
rename from indexer/features_offsets_table.cpp
rename to libs/indexer/features_offsets_table.cpp
diff --git a/indexer/features_offsets_table.hpp b/libs/indexer/features_offsets_table.hpp
similarity index 100%
rename from indexer/features_offsets_table.hpp
rename to libs/indexer/features_offsets_table.hpp
diff --git a/indexer/features_vector.cpp b/libs/indexer/features_vector.cpp
similarity index 100%
rename from indexer/features_vector.cpp
rename to libs/indexer/features_vector.cpp
diff --git a/indexer/features_vector.hpp b/libs/indexer/features_vector.hpp
similarity index 100%
rename from indexer/features_vector.hpp
rename to libs/indexer/features_vector.hpp
diff --git a/indexer/ftraits.hpp b/libs/indexer/ftraits.hpp
similarity index 100%
rename from indexer/ftraits.hpp
rename to libs/indexer/ftraits.hpp
diff --git a/indexer/ftypes_mapping.hpp b/libs/indexer/ftypes_mapping.hpp
similarity index 100%
rename from indexer/ftypes_mapping.hpp
rename to libs/indexer/ftypes_mapping.hpp
diff --git a/indexer/ftypes_matcher.cpp b/libs/indexer/ftypes_matcher.cpp
similarity index 100%
rename from indexer/ftypes_matcher.cpp
rename to libs/indexer/ftypes_matcher.cpp
diff --git a/indexer/ftypes_matcher.hpp b/libs/indexer/ftypes_matcher.hpp
similarity index 100%
rename from indexer/ftypes_matcher.hpp
rename to libs/indexer/ftypes_matcher.hpp
diff --git a/indexer/house_to_street_iface.hpp b/libs/indexer/house_to_street_iface.hpp
similarity index 100%
rename from indexer/house_to_street_iface.hpp
rename to libs/indexer/house_to_street_iface.hpp
diff --git a/indexer/index_builder.cpp b/libs/indexer/index_builder.cpp
similarity index 100%
rename from indexer/index_builder.cpp
rename to libs/indexer/index_builder.cpp
diff --git a/indexer/index_builder.hpp b/libs/indexer/index_builder.hpp
similarity index 100%
rename from indexer/index_builder.hpp
rename to libs/indexer/index_builder.hpp
diff --git a/indexer/indexer_tests/CMakeLists.txt b/libs/indexer/indexer_tests/CMakeLists.txt
similarity index 100%
rename from indexer/indexer_tests/CMakeLists.txt
rename to libs/indexer/indexer_tests/CMakeLists.txt
diff --git a/indexer/indexer_tests/bounds.hpp b/libs/indexer/indexer_tests/bounds.hpp
similarity index 100%
rename from indexer/indexer_tests/bounds.hpp
rename to libs/indexer/indexer_tests/bounds.hpp
diff --git a/indexer/indexer_tests/brands_tests.cpp b/libs/indexer/indexer_tests/brands_tests.cpp
similarity index 100%
rename from indexer/indexer_tests/brands_tests.cpp
rename to libs/indexer/indexer_tests/brands_tests.cpp
diff --git a/indexer/indexer_tests/categories_test.cpp b/libs/indexer/indexer_tests/categories_test.cpp
similarity index 100%
rename from indexer/indexer_tests/categories_test.cpp
rename to libs/indexer/indexer_tests/categories_test.cpp
diff --git a/indexer/indexer_tests/cell_coverer_test.cpp b/libs/indexer/indexer_tests/cell_coverer_test.cpp
similarity index 100%
rename from indexer/indexer_tests/cell_coverer_test.cpp
rename to libs/indexer/indexer_tests/cell_coverer_test.cpp
diff --git a/indexer/indexer_tests/cell_id_test.cpp b/libs/indexer/indexer_tests/cell_id_test.cpp
similarity index 100%
rename from indexer/indexer_tests/cell_id_test.cpp
rename to libs/indexer/indexer_tests/cell_id_test.cpp
diff --git a/indexer/indexer_tests/centers_table_test.cpp b/libs/indexer/indexer_tests/centers_table_test.cpp
similarity index 100%
rename from indexer/indexer_tests/centers_table_test.cpp
rename to libs/indexer/indexer_tests/centers_table_test.cpp
diff --git a/indexer/indexer_tests/checker_test.cpp b/libs/indexer/indexer_tests/checker_test.cpp
similarity index 100%
rename from indexer/indexer_tests/checker_test.cpp
rename to libs/indexer/indexer_tests/checker_test.cpp
diff --git a/indexer/indexer_tests/cities_boundaries_serdes_tests.cpp b/libs/indexer/indexer_tests/cities_boundaries_serdes_tests.cpp
similarity index 100%
rename from indexer/indexer_tests/cities_boundaries_serdes_tests.cpp
rename to libs/indexer/indexer_tests/cities_boundaries_serdes_tests.cpp
diff --git a/indexer/indexer_tests/classificator_tests.cpp b/libs/indexer/indexer_tests/classificator_tests.cpp
similarity index 100%
rename from indexer/indexer_tests/classificator_tests.cpp
rename to libs/indexer/indexer_tests/classificator_tests.cpp
diff --git a/indexer/indexer_tests/complex_serdes_tests.cpp b/libs/indexer/indexer_tests/complex_serdes_tests.cpp
similarity index 100%
rename from indexer/indexer_tests/complex_serdes_tests.cpp
rename to libs/indexer/indexer_tests/complex_serdes_tests.cpp
diff --git a/indexer/indexer_tests/complex_serdes_utils_tests.cpp b/libs/indexer/indexer_tests/complex_serdes_utils_tests.cpp
similarity index 100%
rename from indexer/indexer_tests/complex_serdes_utils_tests.cpp
rename to libs/indexer/indexer_tests/complex_serdes_utils_tests.cpp
diff --git a/indexer/indexer_tests/custom_keyvalue_tests.cpp b/libs/indexer/indexer_tests/custom_keyvalue_tests.cpp
similarity index 100%
rename from indexer/indexer_tests/custom_keyvalue_tests.cpp
rename to libs/indexer/indexer_tests/custom_keyvalue_tests.cpp
diff --git a/indexer/indexer_tests/data_source_test.cpp b/libs/indexer/indexer_tests/data_source_test.cpp
similarity index 100%
rename from indexer/indexer_tests/data_source_test.cpp
rename to libs/indexer/indexer_tests/data_source_test.cpp
diff --git a/indexer/indexer_tests/drules_selector_parser_test.cpp b/libs/indexer/indexer_tests/drules_selector_parser_test.cpp
similarity index 100%
rename from indexer/indexer_tests/drules_selector_parser_test.cpp
rename to libs/indexer/indexer_tests/drules_selector_parser_test.cpp
diff --git a/indexer/indexer_tests/editable_map_object_test.cpp b/libs/indexer/indexer_tests/editable_map_object_test.cpp
similarity index 100%
rename from indexer/indexer_tests/editable_map_object_test.cpp
rename to libs/indexer/indexer_tests/editable_map_object_test.cpp
diff --git a/indexer/indexer_tests/feature_metadata_test.cpp b/libs/indexer/indexer_tests/feature_metadata_test.cpp
similarity index 100%
rename from indexer/indexer_tests/feature_metadata_test.cpp
rename to libs/indexer/indexer_tests/feature_metadata_test.cpp
diff --git a/indexer/indexer_tests/feature_names_test.cpp b/libs/indexer/indexer_tests/feature_names_test.cpp
similarity index 100%
rename from indexer/indexer_tests/feature_names_test.cpp
rename to libs/indexer/indexer_tests/feature_names_test.cpp
diff --git a/indexer/indexer_tests/feature_to_osm_tests.cpp b/libs/indexer/indexer_tests/feature_to_osm_tests.cpp
similarity index 100%
rename from indexer/indexer_tests/feature_to_osm_tests.cpp
rename to libs/indexer/indexer_tests/feature_to_osm_tests.cpp
diff --git a/indexer/indexer_tests/feature_types_test.cpp b/libs/indexer/indexer_tests/feature_types_test.cpp
similarity index 100%
rename from indexer/indexer_tests/feature_types_test.cpp
rename to libs/indexer/indexer_tests/feature_types_test.cpp
diff --git a/indexer/indexer_tests/features_offsets_table_test.cpp b/libs/indexer/indexer_tests/features_offsets_table_test.cpp
similarity index 100%
rename from indexer/indexer_tests/features_offsets_table_test.cpp
rename to libs/indexer/indexer_tests/features_offsets_table_test.cpp
diff --git a/indexer/indexer_tests/features_vector_test.cpp b/libs/indexer/indexer_tests/features_vector_test.cpp
similarity index 100%
rename from indexer/indexer_tests/features_vector_test.cpp
rename to libs/indexer/indexer_tests/features_vector_test.cpp
diff --git a/indexer/indexer_tests/index_builder_test.cpp b/libs/indexer/indexer_tests/index_builder_test.cpp
similarity index 100%
rename from indexer/indexer_tests/index_builder_test.cpp
rename to libs/indexer/indexer_tests/index_builder_test.cpp
diff --git a/indexer/indexer_tests/interval_index_test.cpp b/libs/indexer/indexer_tests/interval_index_test.cpp
similarity index 100%
rename from indexer/indexer_tests/interval_index_test.cpp
rename to libs/indexer/indexer_tests/interval_index_test.cpp
diff --git a/indexer/indexer_tests/metadata_serdes_tests.cpp b/libs/indexer/indexer_tests/metadata_serdes_tests.cpp
similarity index 100%
rename from indexer/indexer_tests/metadata_serdes_tests.cpp
rename to libs/indexer/indexer_tests/metadata_serdes_tests.cpp
diff --git a/indexer/indexer_tests/mwm_set_test.cpp b/libs/indexer/indexer_tests/mwm_set_test.cpp
similarity index 100%
rename from indexer/indexer_tests/mwm_set_test.cpp
rename to libs/indexer/indexer_tests/mwm_set_test.cpp
diff --git a/indexer/indexer_tests/postcodes_matcher_tests.cpp b/libs/indexer/indexer_tests/postcodes_matcher_tests.cpp
similarity index 100%
rename from indexer/indexer_tests/postcodes_matcher_tests.cpp
rename to libs/indexer/indexer_tests/postcodes_matcher_tests.cpp
diff --git a/indexer/indexer_tests/rank_table_test.cpp b/libs/indexer/indexer_tests/rank_table_test.cpp
similarity index 100%
rename from indexer/indexer_tests/rank_table_test.cpp
rename to libs/indexer/indexer_tests/rank_table_test.cpp
diff --git a/indexer/indexer_tests/read_features_tests.cpp b/libs/indexer/indexer_tests/read_features_tests.cpp
similarity index 100%
rename from indexer/indexer_tests/read_features_tests.cpp
rename to libs/indexer/indexer_tests/read_features_tests.cpp
diff --git a/indexer/indexer_tests/road_shields_parser_tests.cpp b/libs/indexer/indexer_tests/road_shields_parser_tests.cpp
similarity index 100%
rename from indexer/indexer_tests/road_shields_parser_tests.cpp
rename to libs/indexer/indexer_tests/road_shields_parser_tests.cpp
diff --git a/indexer/indexer_tests/scale_index_reading_tests.cpp b/libs/indexer/indexer_tests/scale_index_reading_tests.cpp
similarity index 100%
rename from indexer/indexer_tests/scale_index_reading_tests.cpp
rename to libs/indexer/indexer_tests/scale_index_reading_tests.cpp
diff --git a/indexer/indexer_tests/search_string_utils_test.cpp b/libs/indexer/indexer_tests/search_string_utils_test.cpp
similarity index 100%
rename from indexer/indexer_tests/search_string_utils_test.cpp
rename to libs/indexer/indexer_tests/search_string_utils_test.cpp
diff --git a/indexer/indexer_tests/sort_and_merge_intervals_test.cpp b/libs/indexer/indexer_tests/sort_and_merge_intervals_test.cpp
similarity index 100%
rename from indexer/indexer_tests/sort_and_merge_intervals_test.cpp
rename to libs/indexer/indexer_tests/sort_and_merge_intervals_test.cpp
diff --git a/indexer/indexer_tests/string_slice_tests.cpp b/libs/indexer/indexer_tests/string_slice_tests.cpp
similarity index 100%
rename from indexer/indexer_tests/string_slice_tests.cpp
rename to libs/indexer/indexer_tests/string_slice_tests.cpp
diff --git a/indexer/indexer_tests/succinct_trie_test.cpp b/libs/indexer/indexer_tests/succinct_trie_test.cpp
similarity index 100%
rename from indexer/indexer_tests/succinct_trie_test.cpp
rename to libs/indexer/indexer_tests/succinct_trie_test.cpp
diff --git a/indexer/indexer_tests/test_mwm_set.hpp b/libs/indexer/indexer_tests/test_mwm_set.hpp
similarity index 100%
rename from indexer/indexer_tests/test_mwm_set.hpp
rename to libs/indexer/indexer_tests/test_mwm_set.hpp
diff --git a/indexer/indexer_tests/test_type.cpp b/libs/indexer/indexer_tests/test_type.cpp
similarity index 100%
rename from indexer/indexer_tests/test_type.cpp
rename to libs/indexer/indexer_tests/test_type.cpp
diff --git a/indexer/indexer_tests/tree_node_tests.cpp b/libs/indexer/indexer_tests/tree_node_tests.cpp
similarity index 100%
rename from indexer/indexer_tests/tree_node_tests.cpp
rename to libs/indexer/indexer_tests/tree_node_tests.cpp
diff --git a/indexer/indexer_tests/trie_test.cpp b/libs/indexer/indexer_tests/trie_test.cpp
similarity index 100%
rename from indexer/indexer_tests/trie_test.cpp
rename to libs/indexer/indexer_tests/trie_test.cpp
diff --git a/indexer/indexer_tests/validate_and_format_contacts_test.cpp b/libs/indexer/indexer_tests/validate_and_format_contacts_test.cpp
similarity index 100%
rename from indexer/indexer_tests/validate_and_format_contacts_test.cpp
rename to libs/indexer/indexer_tests/validate_and_format_contacts_test.cpp
diff --git a/indexer/indexer_tests/visibility_test.cpp b/libs/indexer/indexer_tests/visibility_test.cpp
similarity index 100%
rename from indexer/indexer_tests/visibility_test.cpp
rename to libs/indexer/indexer_tests/visibility_test.cpp
diff --git a/indexer/indexer_tests/wheelchair_tests.cpp b/libs/indexer/indexer_tests/wheelchair_tests.cpp
similarity index 100%
rename from indexer/indexer_tests/wheelchair_tests.cpp
rename to libs/indexer/indexer_tests/wheelchair_tests.cpp
diff --git a/indexer/interval_index.hpp b/libs/indexer/interval_index.hpp
similarity index 100%
rename from indexer/interval_index.hpp
rename to libs/indexer/interval_index.hpp
diff --git a/indexer/interval_index_builder.hpp b/libs/indexer/interval_index_builder.hpp
similarity index 100%
rename from indexer/interval_index_builder.hpp
rename to libs/indexer/interval_index_builder.hpp
diff --git a/indexer/isolines_info.cpp b/libs/indexer/isolines_info.cpp
similarity index 100%
rename from indexer/isolines_info.cpp
rename to libs/indexer/isolines_info.cpp
diff --git a/indexer/isolines_info.hpp b/libs/indexer/isolines_info.hpp
similarity index 100%
rename from indexer/isolines_info.hpp
rename to libs/indexer/isolines_info.hpp
diff --git a/indexer/map_object.cpp b/libs/indexer/map_object.cpp
similarity index 100%
rename from indexer/map_object.cpp
rename to libs/indexer/map_object.cpp
diff --git a/indexer/map_object.hpp b/libs/indexer/map_object.hpp
similarity index 100%
rename from indexer/map_object.hpp
rename to libs/indexer/map_object.hpp
diff --git a/indexer/map_style.cpp b/libs/indexer/map_style.cpp
similarity index 100%
rename from indexer/map_style.cpp
rename to libs/indexer/map_style.cpp
diff --git a/indexer/map_style.hpp b/libs/indexer/map_style.hpp
similarity index 100%
rename from indexer/map_style.hpp
rename to libs/indexer/map_style.hpp
diff --git a/indexer/map_style_reader.cpp b/libs/indexer/map_style_reader.cpp
similarity index 100%
rename from indexer/map_style_reader.cpp
rename to libs/indexer/map_style_reader.cpp
diff --git a/indexer/map_style_reader.hpp b/libs/indexer/map_style_reader.hpp
similarity index 100%
rename from indexer/map_style_reader.hpp
rename to libs/indexer/map_style_reader.hpp
diff --git a/indexer/metadata_serdes.cpp b/libs/indexer/metadata_serdes.cpp
similarity index 100%
rename from indexer/metadata_serdes.cpp
rename to libs/indexer/metadata_serdes.cpp
diff --git a/indexer/metadata_serdes.hpp b/libs/indexer/metadata_serdes.hpp
similarity index 100%
rename from indexer/metadata_serdes.hpp
rename to libs/indexer/metadata_serdes.hpp
diff --git a/indexer/mwm_set.cpp b/libs/indexer/mwm_set.cpp
similarity index 100%
rename from indexer/mwm_set.cpp
rename to libs/indexer/mwm_set.cpp
diff --git a/indexer/mwm_set.hpp b/libs/indexer/mwm_set.hpp
similarity index 100%
rename from indexer/mwm_set.hpp
rename to libs/indexer/mwm_set.hpp
diff --git a/indexer/postcodes_matcher.cpp b/libs/indexer/postcodes_matcher.cpp
similarity index 100%
rename from indexer/postcodes_matcher.cpp
rename to libs/indexer/postcodes_matcher.cpp
diff --git a/indexer/postcodes_matcher.hpp b/libs/indexer/postcodes_matcher.hpp
similarity index 100%
rename from indexer/postcodes_matcher.hpp
rename to libs/indexer/postcodes_matcher.hpp
diff --git a/indexer/rank_table.cpp b/libs/indexer/rank_table.cpp
similarity index 100%
rename from indexer/rank_table.cpp
rename to libs/indexer/rank_table.cpp
diff --git a/indexer/rank_table.hpp b/libs/indexer/rank_table.hpp
similarity index 100%
rename from indexer/rank_table.hpp
rename to libs/indexer/rank_table.hpp
diff --git a/indexer/road_shields_parser.cpp b/libs/indexer/road_shields_parser.cpp
similarity index 100%
rename from indexer/road_shields_parser.cpp
rename to libs/indexer/road_shields_parser.cpp
diff --git a/indexer/road_shields_parser.hpp b/libs/indexer/road_shields_parser.hpp
similarity index 100%
rename from indexer/road_shields_parser.hpp
rename to libs/indexer/road_shields_parser.hpp
diff --git a/indexer/scale_index.hpp b/libs/indexer/scale_index.hpp
similarity index 100%
rename from indexer/scale_index.hpp
rename to libs/indexer/scale_index.hpp
diff --git a/indexer/scale_index_builder.hpp b/libs/indexer/scale_index_builder.hpp
similarity index 100%
rename from indexer/scale_index_builder.hpp
rename to libs/indexer/scale_index_builder.hpp
diff --git a/indexer/scales.cpp b/libs/indexer/scales.cpp
similarity index 100%
rename from indexer/scales.cpp
rename to libs/indexer/scales.cpp
diff --git a/indexer/scales.hpp b/libs/indexer/scales.hpp
similarity index 100%
rename from indexer/scales.hpp
rename to libs/indexer/scales.hpp
diff --git a/indexer/scales_patch.hpp b/libs/indexer/scales_patch.hpp
similarity index 100%
rename from indexer/scales_patch.hpp
rename to libs/indexer/scales_patch.hpp
diff --git a/indexer/search_delimiters.cpp b/libs/indexer/search_delimiters.cpp
similarity index 100%
rename from indexer/search_delimiters.cpp
rename to libs/indexer/search_delimiters.cpp
diff --git a/indexer/search_delimiters.hpp b/libs/indexer/search_delimiters.hpp
similarity index 100%
rename from indexer/search_delimiters.hpp
rename to libs/indexer/search_delimiters.hpp
diff --git a/indexer/search_string_utils.cpp b/libs/indexer/search_string_utils.cpp
similarity index 100%
rename from indexer/search_string_utils.cpp
rename to libs/indexer/search_string_utils.cpp
diff --git a/indexer/search_string_utils.hpp b/libs/indexer/search_string_utils.hpp
similarity index 100%
rename from indexer/search_string_utils.hpp
rename to libs/indexer/search_string_utils.hpp
diff --git a/indexer/shared_load_info.cpp b/libs/indexer/shared_load_info.cpp
similarity index 100%
rename from indexer/shared_load_info.cpp
rename to libs/indexer/shared_load_info.cpp
diff --git a/indexer/shared_load_info.hpp b/libs/indexer/shared_load_info.hpp
similarity index 100%
rename from indexer/shared_load_info.hpp
rename to libs/indexer/shared_load_info.hpp
diff --git a/indexer/string_set.hpp b/libs/indexer/string_set.hpp
similarity index 100%
rename from indexer/string_set.hpp
rename to libs/indexer/string_set.hpp
diff --git a/indexer/string_slice.cpp b/libs/indexer/string_slice.cpp
similarity index 100%
rename from indexer/string_slice.cpp
rename to libs/indexer/string_slice.cpp
diff --git a/indexer/string_slice.hpp b/libs/indexer/string_slice.hpp
similarity index 100%
rename from indexer/string_slice.hpp
rename to libs/indexer/string_slice.hpp
diff --git a/indexer/succinct_trie_builder.hpp b/libs/indexer/succinct_trie_builder.hpp
similarity index 100%
rename from indexer/succinct_trie_builder.hpp
rename to libs/indexer/succinct_trie_builder.hpp
diff --git a/indexer/succinct_trie_reader.hpp b/libs/indexer/succinct_trie_reader.hpp
similarity index 100%
rename from indexer/succinct_trie_reader.hpp
rename to libs/indexer/succinct_trie_reader.hpp
diff --git a/indexer/transliteration_loader.cpp b/libs/indexer/transliteration_loader.cpp
similarity index 100%
rename from indexer/transliteration_loader.cpp
rename to libs/indexer/transliteration_loader.cpp
diff --git a/indexer/transliteration_loader.hpp b/libs/indexer/transliteration_loader.hpp
similarity index 100%
rename from indexer/transliteration_loader.hpp
rename to libs/indexer/transliteration_loader.hpp
diff --git a/indexer/tree_structure.hpp b/libs/indexer/tree_structure.hpp
similarity index 100%
rename from indexer/tree_structure.hpp
rename to libs/indexer/tree_structure.hpp
diff --git a/indexer/trie.hpp b/libs/indexer/trie.hpp
similarity index 100%
rename from indexer/trie.hpp
rename to libs/indexer/trie.hpp
diff --git a/indexer/trie_builder.hpp b/libs/indexer/trie_builder.hpp
similarity index 100%
rename from indexer/trie_builder.hpp
rename to libs/indexer/trie_builder.hpp
diff --git a/indexer/trie_reader.hpp b/libs/indexer/trie_reader.hpp
similarity index 100%
rename from indexer/trie_reader.hpp
rename to libs/indexer/trie_reader.hpp
diff --git a/indexer/types_mapping.cpp b/libs/indexer/types_mapping.cpp
similarity index 100%
rename from indexer/types_mapping.cpp
rename to libs/indexer/types_mapping.cpp
diff --git a/indexer/types_mapping.hpp b/libs/indexer/types_mapping.hpp
similarity index 100%
rename from indexer/types_mapping.hpp
rename to libs/indexer/types_mapping.hpp
diff --git a/indexer/unique_index.hpp b/libs/indexer/unique_index.hpp
similarity index 100%
rename from indexer/unique_index.hpp
rename to libs/indexer/unique_index.hpp
diff --git a/indexer/utils.cpp b/libs/indexer/utils.cpp
similarity index 100%
rename from indexer/utils.cpp
rename to libs/indexer/utils.cpp
diff --git a/indexer/utils.hpp b/libs/indexer/utils.hpp
similarity index 100%
rename from indexer/utils.hpp
rename to libs/indexer/utils.hpp
diff --git a/indexer/validate_and_format_contacts.cpp b/libs/indexer/validate_and_format_contacts.cpp
similarity index 100%
rename from indexer/validate_and_format_contacts.cpp
rename to libs/indexer/validate_and_format_contacts.cpp
diff --git a/indexer/validate_and_format_contacts.hpp b/libs/indexer/validate_and_format_contacts.hpp
similarity index 100%
rename from indexer/validate_and_format_contacts.hpp
rename to libs/indexer/validate_and_format_contacts.hpp
diff --git a/indexer/yes_no_unknown.hpp b/libs/indexer/yes_no_unknown.hpp
similarity index 100%
rename from indexer/yes_no_unknown.hpp
rename to libs/indexer/yes_no_unknown.hpp
diff --git a/kml/CMakeLists.txt b/libs/kml/CMakeLists.txt
similarity index 100%
rename from kml/CMakeLists.txt
rename to libs/kml/CMakeLists.txt
diff --git a/kml/header_binary.hpp b/libs/kml/header_binary.hpp
similarity index 100%
rename from kml/header_binary.hpp
rename to libs/kml/header_binary.hpp
diff --git a/kml/kmb_to_kml/CMakeLists.txt b/libs/kml/kmb_to_kml/CMakeLists.txt
similarity index 100%
rename from kml/kmb_to_kml/CMakeLists.txt
rename to libs/kml/kmb_to_kml/CMakeLists.txt
diff --git a/kml/kmb_to_kml/kmb_to_kml.cpp b/libs/kml/kmb_to_kml/kmb_to_kml.cpp
similarity index 100%
rename from kml/kmb_to_kml/kmb_to_kml.cpp
rename to libs/kml/kmb_to_kml/kmb_to_kml.cpp
diff --git a/kml/kml_tests/CMakeLists.txt b/libs/kml/kml_tests/CMakeLists.txt
similarity index 100%
rename from kml/kml_tests/CMakeLists.txt
rename to libs/kml/kml_tests/CMakeLists.txt
diff --git a/kml/kml_tests/gpx_tests.cpp b/libs/kml/kml_tests/gpx_tests.cpp
similarity index 100%
rename from kml/kml_tests/gpx_tests.cpp
rename to libs/kml/kml_tests/gpx_tests.cpp
diff --git a/kml/kml_tests/minzoom_quadtree_tests.cpp b/libs/kml/kml_tests/minzoom_quadtree_tests.cpp
similarity index 100%
rename from kml/kml_tests/minzoom_quadtree_tests.cpp
rename to libs/kml/kml_tests/minzoom_quadtree_tests.cpp
diff --git a/kml/kml_tests/serdes_tests.cpp b/libs/kml/kml_tests/serdes_tests.cpp
similarity index 100%
rename from kml/kml_tests/serdes_tests.cpp
rename to libs/kml/kml_tests/serdes_tests.cpp
diff --git a/kml/kml_tests/tests_data.hpp b/libs/kml/kml_tests/tests_data.hpp
similarity index 100%
rename from kml/kml_tests/tests_data.hpp
rename to libs/kml/kml_tests/tests_data.hpp
diff --git a/kml/kml_to_kmb/CMakeLists.txt b/libs/kml/kml_to_kmb/CMakeLists.txt
similarity index 100%
rename from kml/kml_to_kmb/CMakeLists.txt
rename to libs/kml/kml_to_kmb/CMakeLists.txt
diff --git a/kml/kml_to_kmb/kml_to_kmb.cpp b/libs/kml/kml_to_kmb/kml_to_kmb.cpp
similarity index 100%
rename from kml/kml_to_kmb/kml_to_kmb.cpp
rename to libs/kml/kml_to_kmb/kml_to_kmb.cpp
diff --git a/kml/minzoom_quadtree.hpp b/libs/kml/minzoom_quadtree.hpp
similarity index 100%
rename from kml/minzoom_quadtree.hpp
rename to libs/kml/minzoom_quadtree.hpp
diff --git a/kml/pykmlib/CMakeLists.txt b/libs/kml/pykmlib/CMakeLists.txt
similarity index 100%
rename from kml/pykmlib/CMakeLists.txt
rename to libs/kml/pykmlib/CMakeLists.txt
diff --git a/kml/pykmlib/bindings.cpp b/libs/kml/pykmlib/bindings.cpp
similarity index 100%
rename from kml/pykmlib/bindings.cpp
rename to libs/kml/pykmlib/bindings.cpp
diff --git a/kml/pykmlib/bindings_test.py b/libs/kml/pykmlib/bindings_test.py
similarity index 100%
rename from kml/pykmlib/bindings_test.py
rename to libs/kml/pykmlib/bindings_test.py
diff --git a/kml/pykmlib/setup.py b/libs/kml/pykmlib/setup.py
similarity index 100%
rename from kml/pykmlib/setup.py
rename to libs/kml/pykmlib/setup.py
diff --git a/kml/serdes.cpp b/libs/kml/serdes.cpp
similarity index 100%
rename from kml/serdes.cpp
rename to libs/kml/serdes.cpp
diff --git a/kml/serdes.hpp b/libs/kml/serdes.hpp
similarity index 100%
rename from kml/serdes.hpp
rename to libs/kml/serdes.hpp
diff --git a/kml/serdes_binary.cpp b/libs/kml/serdes_binary.cpp
similarity index 100%
rename from kml/serdes_binary.cpp
rename to libs/kml/serdes_binary.cpp
diff --git a/kml/serdes_binary.hpp b/libs/kml/serdes_binary.hpp
similarity index 100%
rename from kml/serdes_binary.hpp
rename to libs/kml/serdes_binary.hpp
diff --git a/kml/serdes_binary_v8.hpp b/libs/kml/serdes_binary_v8.hpp
similarity index 100%
rename from kml/serdes_binary_v8.hpp
rename to libs/kml/serdes_binary_v8.hpp
diff --git a/kml/serdes_common.cpp b/libs/kml/serdes_common.cpp
similarity index 100%
rename from kml/serdes_common.cpp
rename to libs/kml/serdes_common.cpp
diff --git a/kml/serdes_common.hpp b/libs/kml/serdes_common.hpp
similarity index 100%
rename from kml/serdes_common.hpp
rename to libs/kml/serdes_common.hpp
diff --git a/kml/serdes_gpx.cpp b/libs/kml/serdes_gpx.cpp
similarity index 100%
rename from kml/serdes_gpx.cpp
rename to libs/kml/serdes_gpx.cpp
diff --git a/kml/serdes_gpx.hpp b/libs/kml/serdes_gpx.hpp
similarity index 100%
rename from kml/serdes_gpx.hpp
rename to libs/kml/serdes_gpx.hpp
diff --git a/kml/type_utils.cpp b/libs/kml/type_utils.cpp
similarity index 100%
rename from kml/type_utils.cpp
rename to libs/kml/type_utils.cpp
diff --git a/kml/type_utils.hpp b/libs/kml/type_utils.hpp
similarity index 100%
rename from kml/type_utils.hpp
rename to libs/kml/type_utils.hpp
diff --git a/kml/types.cpp b/libs/kml/types.cpp
similarity index 100%
rename from kml/types.cpp
rename to libs/kml/types.cpp
diff --git a/kml/types.hpp b/libs/kml/types.hpp
similarity index 100%
rename from kml/types.hpp
rename to libs/kml/types.hpp
diff --git a/kml/types_v3.hpp b/libs/kml/types_v3.hpp
similarity index 100%
rename from kml/types_v3.hpp
rename to libs/kml/types_v3.hpp
diff --git a/kml/types_v6.hpp b/libs/kml/types_v6.hpp
similarity index 100%
rename from kml/types_v6.hpp
rename to libs/kml/types_v6.hpp
diff --git a/kml/types_v7.hpp b/libs/kml/types_v7.hpp
similarity index 100%
rename from kml/types_v7.hpp
rename to libs/kml/types_v7.hpp
diff --git a/kml/types_v8.hpp b/libs/kml/types_v8.hpp
similarity index 100%
rename from kml/types_v8.hpp
rename to libs/kml/types_v8.hpp
diff --git a/kml/types_v8mm.hpp b/libs/kml/types_v8mm.hpp
similarity index 100%
rename from kml/types_v8mm.hpp
rename to libs/kml/types_v8mm.hpp
diff --git a/kml/types_v9.hpp b/libs/kml/types_v9.hpp
similarity index 100%
rename from kml/types_v9.hpp
rename to libs/kml/types_v9.hpp
diff --git a/kml/types_v9mm.hpp b/libs/kml/types_v9mm.hpp
similarity index 100%
rename from kml/types_v9mm.hpp
rename to libs/kml/types_v9mm.hpp
diff --git a/kml/visitors.hpp b/libs/kml/visitors.hpp
similarity index 100%
rename from kml/visitors.hpp
rename to libs/kml/visitors.hpp
diff --git a/map/CMakeLists.txt b/libs/map/CMakeLists.txt
similarity index 100%
rename from map/CMakeLists.txt
rename to libs/map/CMakeLists.txt
diff --git a/map/api_mark_point.cpp b/libs/map/api_mark_point.cpp
similarity index 100%
rename from map/api_mark_point.cpp
rename to libs/map/api_mark_point.cpp
diff --git a/map/api_mark_point.hpp b/libs/map/api_mark_point.hpp
similarity index 100%
rename from map/api_mark_point.hpp
rename to libs/map/api_mark_point.hpp
diff --git a/map/benchmark_tool/CMakeLists.txt b/libs/map/benchmark_tool/CMakeLists.txt
similarity index 100%
rename from map/benchmark_tool/CMakeLists.txt
rename to libs/map/benchmark_tool/CMakeLists.txt
diff --git a/map/benchmark_tool/api.cpp b/libs/map/benchmark_tool/api.cpp
similarity index 100%
rename from map/benchmark_tool/api.cpp
rename to libs/map/benchmark_tool/api.cpp
diff --git a/map/benchmark_tool/api.hpp b/libs/map/benchmark_tool/api.hpp
similarity index 100%
rename from map/benchmark_tool/api.hpp
rename to libs/map/benchmark_tool/api.hpp
diff --git a/map/benchmark_tool/features_loading.cpp b/libs/map/benchmark_tool/features_loading.cpp
similarity index 100%
rename from map/benchmark_tool/features_loading.cpp
rename to libs/map/benchmark_tool/features_loading.cpp
diff --git a/map/benchmark_tool/main.cpp b/libs/map/benchmark_tool/main.cpp
similarity index 100%
rename from map/benchmark_tool/main.cpp
rename to libs/map/benchmark_tool/main.cpp
diff --git a/map/benchmark_tools.cpp b/libs/map/benchmark_tools.cpp
similarity index 100%
rename from map/benchmark_tools.cpp
rename to libs/map/benchmark_tools.cpp
diff --git a/map/benchmark_tools.hpp b/libs/map/benchmark_tools.hpp
similarity index 100%
rename from map/benchmark_tools.hpp
rename to libs/map/benchmark_tools.hpp
diff --git a/map/bookmark.cpp b/libs/map/bookmark.cpp
similarity index 100%
rename from map/bookmark.cpp
rename to libs/map/bookmark.cpp
diff --git a/map/bookmark.hpp b/libs/map/bookmark.hpp
similarity index 100%
rename from map/bookmark.hpp
rename to libs/map/bookmark.hpp
diff --git a/map/bookmark_helpers.cpp b/libs/map/bookmark_helpers.cpp
similarity index 100%
rename from map/bookmark_helpers.cpp
rename to libs/map/bookmark_helpers.cpp
diff --git a/map/bookmark_helpers.hpp b/libs/map/bookmark_helpers.hpp
similarity index 100%
rename from map/bookmark_helpers.hpp
rename to libs/map/bookmark_helpers.hpp
diff --git a/map/bookmark_manager.cpp b/libs/map/bookmark_manager.cpp
similarity index 100%
rename from map/bookmark_manager.cpp
rename to libs/map/bookmark_manager.cpp
diff --git a/map/bookmark_manager.hpp b/libs/map/bookmark_manager.hpp
similarity index 100%
rename from map/bookmark_manager.hpp
rename to libs/map/bookmark_manager.hpp
diff --git a/map/bookmarks_search_params.hpp b/libs/map/bookmarks_search_params.hpp
similarity index 100%
rename from map/bookmarks_search_params.hpp
rename to libs/map/bookmarks_search_params.hpp
diff --git a/map/chart_generator.cpp b/libs/map/chart_generator.cpp
similarity index 100%
rename from map/chart_generator.cpp
rename to libs/map/chart_generator.cpp
diff --git a/map/chart_generator.hpp b/libs/map/chart_generator.hpp
similarity index 100%
rename from map/chart_generator.hpp
rename to libs/map/chart_generator.hpp
diff --git a/map/elevation_info.cpp b/libs/map/elevation_info.cpp
similarity index 100%
rename from map/elevation_info.cpp
rename to libs/map/elevation_info.cpp
diff --git a/map/elevation_info.hpp b/libs/map/elevation_info.hpp
similarity index 100%
rename from map/elevation_info.hpp
rename to libs/map/elevation_info.hpp
diff --git a/map/everywhere_search_callback.cpp b/libs/map/everywhere_search_callback.cpp
similarity index 100%
rename from map/everywhere_search_callback.cpp
rename to libs/map/everywhere_search_callback.cpp
diff --git a/map/everywhere_search_callback.hpp b/libs/map/everywhere_search_callback.hpp
similarity index 100%
rename from map/everywhere_search_callback.hpp
rename to libs/map/everywhere_search_callback.hpp
diff --git a/map/everywhere_search_params.hpp b/libs/map/everywhere_search_params.hpp
similarity index 100%
rename from map/everywhere_search_params.hpp
rename to libs/map/everywhere_search_params.hpp
diff --git a/map/extrapolation/extrapolator.cpp b/libs/map/extrapolation/extrapolator.cpp
similarity index 100%
rename from map/extrapolation/extrapolator.cpp
rename to libs/map/extrapolation/extrapolator.cpp
diff --git a/map/extrapolation/extrapolator.hpp b/libs/map/extrapolation/extrapolator.hpp
similarity index 100%
rename from map/extrapolation/extrapolator.hpp
rename to libs/map/extrapolation/extrapolator.hpp
diff --git a/map/extrapolation_benchmark/CMakeLists.txt b/libs/map/extrapolation_benchmark/CMakeLists.txt
similarity index 100%
rename from map/extrapolation_benchmark/CMakeLists.txt
rename to libs/map/extrapolation_benchmark/CMakeLists.txt
diff --git a/map/extrapolation_benchmark/extrapolation_benchmark.cpp b/libs/map/extrapolation_benchmark/extrapolation_benchmark.cpp
similarity index 100%
rename from map/extrapolation_benchmark/extrapolation_benchmark.cpp
rename to libs/map/extrapolation_benchmark/extrapolation_benchmark.cpp
diff --git a/map/features_fetcher.cpp b/libs/map/features_fetcher.cpp
similarity index 100%
rename from map/features_fetcher.cpp
rename to libs/map/features_fetcher.cpp
diff --git a/map/features_fetcher.hpp b/libs/map/features_fetcher.hpp
similarity index 100%
rename from map/features_fetcher.hpp
rename to libs/map/features_fetcher.hpp
diff --git a/map/framework.cpp b/libs/map/framework.cpp
similarity index 100%
rename from map/framework.cpp
rename to libs/map/framework.cpp
diff --git a/map/framework.hpp b/libs/map/framework.hpp
similarity index 100%
rename from map/framework.hpp
rename to libs/map/framework.hpp
diff --git a/map/framework_visualize.cpp b/libs/map/framework_visualize.cpp
similarity index 100%
rename from map/framework_visualize.cpp
rename to libs/map/framework_visualize.cpp
diff --git a/map/gps_track.cpp b/libs/map/gps_track.cpp
similarity index 100%
rename from map/gps_track.cpp
rename to libs/map/gps_track.cpp
diff --git a/map/gps_track.hpp b/libs/map/gps_track.hpp
similarity index 100%
rename from map/gps_track.hpp
rename to libs/map/gps_track.hpp
diff --git a/map/gps_track_collection.cpp b/libs/map/gps_track_collection.cpp
similarity index 100%
rename from map/gps_track_collection.cpp
rename to libs/map/gps_track_collection.cpp
diff --git a/map/gps_track_collection.hpp b/libs/map/gps_track_collection.hpp
similarity index 100%
rename from map/gps_track_collection.hpp
rename to libs/map/gps_track_collection.hpp
diff --git a/map/gps_track_filter.cpp b/libs/map/gps_track_filter.cpp
similarity index 100%
rename from map/gps_track_filter.cpp
rename to libs/map/gps_track_filter.cpp
diff --git a/map/gps_track_filter.hpp b/libs/map/gps_track_filter.hpp
similarity index 100%
rename from map/gps_track_filter.hpp
rename to libs/map/gps_track_filter.hpp
diff --git a/map/gps_track_storage.cpp b/libs/map/gps_track_storage.cpp
similarity index 100%
rename from map/gps_track_storage.cpp
rename to libs/map/gps_track_storage.cpp
diff --git a/map/gps_track_storage.hpp b/libs/map/gps_track_storage.hpp
similarity index 100%
rename from map/gps_track_storage.hpp
rename to libs/map/gps_track_storage.hpp
diff --git a/map/gps_tracker.cpp b/libs/map/gps_tracker.cpp
similarity index 100%
rename from map/gps_tracker.cpp
rename to libs/map/gps_tracker.cpp
diff --git a/map/gps_tracker.hpp b/libs/map/gps_tracker.hpp
similarity index 100%
rename from map/gps_tracker.hpp
rename to libs/map/gps_tracker.hpp
diff --git a/map/isolines_manager.cpp b/libs/map/isolines_manager.cpp
similarity index 100%
rename from map/isolines_manager.cpp
rename to libs/map/isolines_manager.cpp
diff --git a/map/isolines_manager.hpp b/libs/map/isolines_manager.hpp
similarity index 100%
rename from map/isolines_manager.hpp
rename to libs/map/isolines_manager.hpp
diff --git a/map/map_integration_tests/CMakeLists.txt b/libs/map/map_integration_tests/CMakeLists.txt
similarity index 100%
rename from map/map_integration_tests/CMakeLists.txt
rename to libs/map/map_integration_tests/CMakeLists.txt
diff --git a/map/map_integration_tests/interactive_search_test.cpp b/libs/map/map_integration_tests/interactive_search_test.cpp
similarity index 100%
rename from map/map_integration_tests/interactive_search_test.cpp
rename to libs/map/map_integration_tests/interactive_search_test.cpp
diff --git a/map/map_tests/CMakeLists.txt b/libs/map/map_tests/CMakeLists.txt
similarity index 100%
rename from map/map_tests/CMakeLists.txt
rename to libs/map/map_tests/CMakeLists.txt
diff --git a/map/map_tests/address_tests.cpp b/libs/map/map_tests/address_tests.cpp
similarity index 100%
rename from map/map_tests/address_tests.cpp
rename to libs/map/map_tests/address_tests.cpp
diff --git a/map/map_tests/bookmarks_test.cpp b/libs/map/map_tests/bookmarks_test.cpp
similarity index 100%
rename from map/map_tests/bookmarks_test.cpp
rename to libs/map/map_tests/bookmarks_test.cpp
diff --git a/map/map_tests/chart_generator_tests.cpp b/libs/map/map_tests/chart_generator_tests.cpp
similarity index 100%
rename from map/map_tests/chart_generator_tests.cpp
rename to libs/map/map_tests/chart_generator_tests.cpp
diff --git a/map/map_tests/check_mwms.cpp b/libs/map/map_tests/check_mwms.cpp
similarity index 100%
rename from map/map_tests/check_mwms.cpp
rename to libs/map/map_tests/check_mwms.cpp
diff --git a/map/map_tests/countries_names_tests.cpp b/libs/map/map_tests/countries_names_tests.cpp
similarity index 100%
rename from map/map_tests/countries_names_tests.cpp
rename to libs/map/map_tests/countries_names_tests.cpp
diff --git a/map/map_tests/elevation_info_tests.cpp b/libs/map/map_tests/elevation_info_tests.cpp
similarity index 100%
rename from map/map_tests/elevation_info_tests.cpp
rename to libs/map/map_tests/elevation_info_tests.cpp
diff --git a/map/map_tests/extrapolator_tests.cpp b/libs/map/map_tests/extrapolator_tests.cpp
similarity index 100%
rename from map/map_tests/extrapolator_tests.cpp
rename to libs/map/map_tests/extrapolator_tests.cpp
diff --git a/map/map_tests/feature_getters_tests.cpp b/libs/map/map_tests/feature_getters_tests.cpp
similarity index 100%
rename from map/map_tests/feature_getters_tests.cpp
rename to libs/map/map_tests/feature_getters_tests.cpp
diff --git a/map/map_tests/gps_track_collection_test.cpp b/libs/map/map_tests/gps_track_collection_test.cpp
similarity index 100%
rename from map/map_tests/gps_track_collection_test.cpp
rename to libs/map/map_tests/gps_track_collection_test.cpp
diff --git a/map/map_tests/gps_track_storage_test.cpp b/libs/map/map_tests/gps_track_storage_test.cpp
similarity index 100%
rename from map/map_tests/gps_track_storage_test.cpp
rename to libs/map/map_tests/gps_track_storage_test.cpp
diff --git a/map/map_tests/gps_track_test.cpp b/libs/map/map_tests/gps_track_test.cpp
similarity index 100%
rename from map/map_tests/gps_track_test.cpp
rename to libs/map/map_tests/gps_track_test.cpp
diff --git a/map/map_tests/kmz_unarchive_test.cpp b/libs/map/map_tests/kmz_unarchive_test.cpp
similarity index 100%
rename from map/map_tests/kmz_unarchive_test.cpp
rename to libs/map/map_tests/kmz_unarchive_test.cpp
diff --git a/map/map_tests/mwm_set_test.cpp b/libs/map/map_tests/mwm_set_test.cpp
similarity index 100%
rename from map/map_tests/mwm_set_test.cpp
rename to libs/map/map_tests/mwm_set_test.cpp
diff --git a/map/map_tests/mwm_url_tests.cpp b/libs/map/map_tests/mwm_url_tests.cpp
similarity index 100%
rename from map/map_tests/mwm_url_tests.cpp
rename to libs/map/map_tests/mwm_url_tests.cpp
diff --git a/map/map_tests/power_manager_tests.cpp b/libs/map/map_tests/power_manager_tests.cpp
similarity index 100%
rename from map/map_tests/power_manager_tests.cpp
rename to libs/map/map_tests/power_manager_tests.cpp
diff --git a/map/map_tests/search_api_tests.cpp b/libs/map/map_tests/search_api_tests.cpp
similarity index 100%
rename from map/map_tests/search_api_tests.cpp
rename to libs/map/map_tests/search_api_tests.cpp
diff --git a/map/map_tests/track_statistics_tests.cpp b/libs/map/map_tests/track_statistics_tests.cpp
similarity index 100%
rename from map/map_tests/track_statistics_tests.cpp
rename to libs/map/map_tests/track_statistics_tests.cpp
diff --git a/map/map_tests/transliteration_test.cpp b/libs/map/map_tests/transliteration_test.cpp
similarity index 100%
rename from map/map_tests/transliteration_test.cpp
rename to libs/map/map_tests/transliteration_test.cpp
diff --git a/map/mwm_tests/CMakeLists.txt b/libs/map/mwm_tests/CMakeLists.txt
similarity index 100%
rename from map/mwm_tests/CMakeLists.txt
rename to libs/map/mwm_tests/CMakeLists.txt
diff --git a/map/mwm_tests/multithread_mwm_test.cpp b/libs/map/mwm_tests/multithread_mwm_test.cpp
similarity index 100%
rename from map/mwm_tests/multithread_mwm_test.cpp
rename to libs/map/mwm_tests/multithread_mwm_test.cpp
diff --git a/map/mwm_tests/mwm_foreach_test.cpp b/libs/map/mwm_tests/mwm_foreach_test.cpp
similarity index 100%
rename from map/mwm_tests/mwm_foreach_test.cpp
rename to libs/map/mwm_tests/mwm_foreach_test.cpp
diff --git a/map/mwm_tests/mwm_index_test.cpp b/libs/map/mwm_tests/mwm_index_test.cpp
similarity index 100%
rename from map/mwm_tests/mwm_index_test.cpp
rename to libs/map/mwm_tests/mwm_index_test.cpp
diff --git a/map/mwm_tests/world_map_test.cpp b/libs/map/mwm_tests/world_map_test.cpp
similarity index 100%
rename from map/mwm_tests/world_map_test.cpp
rename to libs/map/mwm_tests/world_map_test.cpp
diff --git a/map/mwm_tree.hpp b/libs/map/mwm_tree.hpp
similarity index 100%
rename from map/mwm_tree.hpp
rename to libs/map/mwm_tree.hpp
diff --git a/map/mwm_url.cpp b/libs/map/mwm_url.cpp
similarity index 100%
rename from map/mwm_url.cpp
rename to libs/map/mwm_url.cpp
diff --git a/map/mwm_url.hpp b/libs/map/mwm_url.hpp
similarity index 100%
rename from map/mwm_url.hpp
rename to libs/map/mwm_url.hpp
diff --git a/map/place_page_info.cpp b/libs/map/place_page_info.cpp
similarity index 100%
rename from map/place_page_info.cpp
rename to libs/map/place_page_info.cpp
diff --git a/map/place_page_info.hpp b/libs/map/place_page_info.hpp
similarity index 100%
rename from map/place_page_info.hpp
rename to libs/map/place_page_info.hpp
diff --git a/map/position_provider.hpp b/libs/map/position_provider.hpp
similarity index 100%
rename from map/position_provider.hpp
rename to libs/map/position_provider.hpp
diff --git a/map/power_management/power_management_schemas.cpp b/libs/map/power_management/power_management_schemas.cpp
similarity index 100%
rename from map/power_management/power_management_schemas.cpp
rename to libs/map/power_management/power_management_schemas.cpp
diff --git a/map/power_management/power_management_schemas.hpp b/libs/map/power_management/power_management_schemas.hpp
similarity index 100%
rename from map/power_management/power_management_schemas.hpp
rename to libs/map/power_management/power_management_schemas.hpp
diff --git a/map/power_management/power_manager.cpp b/libs/map/power_management/power_manager.cpp
similarity index 100%
rename from map/power_management/power_manager.cpp
rename to libs/map/power_management/power_manager.cpp
diff --git a/map/power_management/power_manager.hpp b/libs/map/power_management/power_manager.hpp
similarity index 100%
rename from map/power_management/power_manager.hpp
rename to libs/map/power_management/power_manager.hpp
diff --git a/map/routing_manager.cpp b/libs/map/routing_manager.cpp
similarity index 100%
rename from map/routing_manager.cpp
rename to libs/map/routing_manager.cpp
diff --git a/map/routing_manager.hpp b/libs/map/routing_manager.hpp
similarity index 100%
rename from map/routing_manager.hpp
rename to libs/map/routing_manager.hpp
diff --git a/map/routing_mark.cpp b/libs/map/routing_mark.cpp
similarity index 100%
rename from map/routing_mark.cpp
rename to libs/map/routing_mark.cpp
diff --git a/map/routing_mark.hpp b/libs/map/routing_mark.hpp
similarity index 100%
rename from map/routing_mark.hpp
rename to libs/map/routing_mark.hpp
diff --git a/map/search_api.cpp b/libs/map/search_api.cpp
similarity index 100%
rename from map/search_api.cpp
rename to libs/map/search_api.cpp
diff --git a/map/search_api.hpp b/libs/map/search_api.hpp
similarity index 100%
rename from map/search_api.hpp
rename to libs/map/search_api.hpp
diff --git a/map/search_mark.cpp b/libs/map/search_mark.cpp
similarity index 100%
rename from map/search_mark.cpp
rename to libs/map/search_mark.cpp
diff --git a/map/search_mark.hpp b/libs/map/search_mark.hpp
similarity index 100%
rename from map/search_mark.hpp
rename to libs/map/search_mark.hpp
diff --git a/map/search_product_info.hpp b/libs/map/search_product_info.hpp
similarity index 100%
rename from map/search_product_info.hpp
rename to libs/map/search_product_info.hpp
diff --git a/map/style_tests/CMakeLists.txt b/libs/map/style_tests/CMakeLists.txt
similarity index 100%
rename from map/style_tests/CMakeLists.txt
rename to libs/map/style_tests/CMakeLists.txt
diff --git a/map/style_tests/classificator_tests.cpp b/libs/map/style_tests/classificator_tests.cpp
similarity index 100%
rename from map/style_tests/classificator_tests.cpp
rename to libs/map/style_tests/classificator_tests.cpp
diff --git a/map/style_tests/dashes_test.cpp b/libs/map/style_tests/dashes_test.cpp
similarity index 100%
rename from map/style_tests/dashes_test.cpp
rename to libs/map/style_tests/dashes_test.cpp
diff --git a/map/style_tests/helpers.hpp b/libs/map/style_tests/helpers.hpp
similarity index 100%
rename from map/style_tests/helpers.hpp
rename to libs/map/style_tests/helpers.hpp
diff --git a/map/style_tests/style_symbols_consistency_test.cpp b/libs/map/style_tests/style_symbols_consistency_test.cpp
similarity index 100%
rename from map/style_tests/style_symbols_consistency_test.cpp
rename to libs/map/style_tests/style_symbols_consistency_test.cpp
diff --git a/map/track.cpp b/libs/map/track.cpp
similarity index 100%
rename from map/track.cpp
rename to libs/map/track.cpp
diff --git a/map/track.hpp b/libs/map/track.hpp
similarity index 100%
rename from map/track.hpp
rename to libs/map/track.hpp
diff --git a/map/track_mark.cpp b/libs/map/track_mark.cpp
similarity index 100%
rename from map/track_mark.cpp
rename to libs/map/track_mark.cpp
diff --git a/map/track_mark.hpp b/libs/map/track_mark.hpp
similarity index 100%
rename from map/track_mark.hpp
rename to libs/map/track_mark.hpp
diff --git a/map/track_statistics.cpp b/libs/map/track_statistics.cpp
similarity index 100%
rename from map/track_statistics.cpp
rename to libs/map/track_statistics.cpp
diff --git a/map/track_statistics.hpp b/libs/map/track_statistics.hpp
similarity index 100%
rename from map/track_statistics.hpp
rename to libs/map/track_statistics.hpp
diff --git a/map/traffic_manager.cpp b/libs/map/traffic_manager.cpp
similarity index 100%
rename from map/traffic_manager.cpp
rename to libs/map/traffic_manager.cpp
diff --git a/map/traffic_manager.hpp b/libs/map/traffic_manager.hpp
similarity index 100%
rename from map/traffic_manager.hpp
rename to libs/map/traffic_manager.hpp
diff --git a/map/transit/transit_display.cpp b/libs/map/transit/transit_display.cpp
similarity index 100%
rename from map/transit/transit_display.cpp
rename to libs/map/transit/transit_display.cpp
diff --git a/map/transit/transit_display.hpp b/libs/map/transit/transit_display.hpp
similarity index 100%
rename from map/transit/transit_display.hpp
rename to libs/map/transit/transit_display.hpp
diff --git a/map/transit/transit_reader.cpp b/libs/map/transit/transit_reader.cpp
similarity index 100%
rename from map/transit/transit_reader.cpp
rename to libs/map/transit/transit_reader.cpp
diff --git a/map/transit/transit_reader.hpp b/libs/map/transit/transit_reader.hpp
similarity index 100%
rename from map/transit/transit_reader.hpp
rename to libs/map/transit/transit_reader.hpp
diff --git a/map/user_mark.cpp b/libs/map/user_mark.cpp
similarity index 100%
rename from map/user_mark.cpp
rename to libs/map/user_mark.cpp
diff --git a/map/user_mark.hpp b/libs/map/user_mark.hpp
similarity index 100%
rename from map/user_mark.hpp
rename to libs/map/user_mark.hpp
diff --git a/map/user_mark_id_storage.cpp b/libs/map/user_mark_id_storage.cpp
similarity index 100%
rename from map/user_mark_id_storage.cpp
rename to libs/map/user_mark_id_storage.cpp
diff --git a/map/user_mark_id_storage.hpp b/libs/map/user_mark_id_storage.hpp
similarity index 100%
rename from map/user_mark_id_storage.hpp
rename to libs/map/user_mark_id_storage.hpp
diff --git a/map/user_mark_layer.cpp b/libs/map/user_mark_layer.cpp
similarity index 100%
rename from map/user_mark_layer.cpp
rename to libs/map/user_mark_layer.cpp
diff --git a/map/user_mark_layer.hpp b/libs/map/user_mark_layer.hpp
similarity index 100%
rename from map/user_mark_layer.hpp
rename to libs/map/user_mark_layer.hpp
diff --git a/map/viewport_search_callback.cpp b/libs/map/viewport_search_callback.cpp
similarity index 100%
rename from map/viewport_search_callback.cpp
rename to libs/map/viewport_search_callback.cpp
diff --git a/map/viewport_search_callback.hpp b/libs/map/viewport_search_callback.hpp
similarity index 100%
rename from map/viewport_search_callback.hpp
rename to libs/map/viewport_search_callback.hpp
diff --git a/map/viewport_search_params.hpp b/libs/map/viewport_search_params.hpp
similarity index 100%
rename from map/viewport_search_params.hpp
rename to libs/map/viewport_search_params.hpp
diff --git a/generator/mwm_diff/CMakeLists.txt b/libs/mwm_diff/CMakeLists.txt
similarity index 100%
rename from generator/mwm_diff/CMakeLists.txt
rename to libs/mwm_diff/CMakeLists.txt
diff --git a/generator/mwm_diff/diff.cpp b/libs/mwm_diff/diff.cpp
similarity index 99%
rename from generator/mwm_diff/diff.cpp
rename to libs/mwm_diff/diff.cpp
index f6095ff16..32d7da9f6 100644
--- a/generator/mwm_diff/diff.cpp
+++ b/libs/mwm_diff/diff.cpp
@@ -1,4 +1,4 @@
-#include "generator/mwm_diff/diff.hpp"
+#include "mwm_diff/diff.hpp"
 
 #include "coding/buffered_file_writer.hpp"
 #include "coding/file_reader.hpp"
diff --git a/generator/mwm_diff/diff.hpp b/libs/mwm_diff/diff.hpp
similarity index 100%
rename from generator/mwm_diff/diff.hpp
rename to libs/mwm_diff/diff.hpp
diff --git a/generator/mwm_diff/mwm_diff_tests/CMakeLists.txt b/libs/mwm_diff/mwm_diff_tests/CMakeLists.txt
similarity index 100%
rename from generator/mwm_diff/mwm_diff_tests/CMakeLists.txt
rename to libs/mwm_diff/mwm_diff_tests/CMakeLists.txt
diff --git a/generator/mwm_diff/mwm_diff_tests/diff_tests.cpp b/libs/mwm_diff/mwm_diff_tests/diff_tests.cpp
similarity index 98%
rename from generator/mwm_diff/mwm_diff_tests/diff_tests.cpp
rename to libs/mwm_diff/mwm_diff_tests/diff_tests.cpp
index 708e2cbe5..01dbeabf7 100644
--- a/generator/mwm_diff/mwm_diff_tests/diff_tests.cpp
+++ b/libs/mwm_diff/mwm_diff_tests/diff_tests.cpp
@@ -1,6 +1,6 @@
 #include "testing/testing.hpp"
 
-#include "generator/mwm_diff/diff.hpp"
+#include "mwm_diff/diff.hpp"
 
 #include "platform/platform.hpp"
 
diff --git a/generator/mwm_diff/mwm_diff_tool/CMakeLists.txt b/libs/mwm_diff/mwm_diff_tool/CMakeLists.txt
similarity index 100%
rename from generator/mwm_diff/mwm_diff_tool/CMakeLists.txt
rename to libs/mwm_diff/mwm_diff_tool/CMakeLists.txt
diff --git a/generator/mwm_diff/mwm_diff_tool/mwm_diff_tool.cpp b/libs/mwm_diff/mwm_diff_tool/mwm_diff_tool.cpp
similarity index 96%
rename from generator/mwm_diff/mwm_diff_tool/mwm_diff_tool.cpp
rename to libs/mwm_diff/mwm_diff_tool/mwm_diff_tool.cpp
index e66fa61c1..507cc37bf 100644
--- a/generator/mwm_diff/mwm_diff_tool/mwm_diff_tool.cpp
+++ b/libs/mwm_diff/mwm_diff_tool/mwm_diff_tool.cpp
@@ -1,4 +1,4 @@
-#include "generator/mwm_diff/diff.hpp"
+#include "mwm_diff/diff.hpp"
 
 #include "base/cancellable.hpp"
 
diff --git a/platform/CMakeLists.txt b/libs/platform/CMakeLists.txt
similarity index 98%
rename from platform/CMakeLists.txt
rename to libs/platform/CMakeLists.txt
index 024fa4c02..2570745ed 100644
--- a/platform/CMakeLists.txt
+++ b/libs/platform/CMakeLists.txt
@@ -1,7 +1,7 @@
 project(platform)
 
 set(SRC
-  ../private.h  # To properly detect its changes with CMake.
+  ../../private.h  # To properly detect its changes with CMake.
   battery_tracker.cpp
   battery_tracker.hpp
   chunks_download_strategy.cpp
diff --git a/platform/background_downloader_ios.h b/libs/platform/background_downloader_ios.h
similarity index 100%
rename from platform/background_downloader_ios.h
rename to libs/platform/background_downloader_ios.h
diff --git a/platform/background_downloader_ios.mm b/libs/platform/background_downloader_ios.mm
similarity index 100%
rename from platform/background_downloader_ios.mm
rename to libs/platform/background_downloader_ios.mm
diff --git a/platform/battery_tracker.cpp b/libs/platform/battery_tracker.cpp
similarity index 100%
rename from platform/battery_tracker.cpp
rename to libs/platform/battery_tracker.cpp
diff --git a/platform/battery_tracker.hpp b/libs/platform/battery_tracker.hpp
similarity index 100%
rename from platform/battery_tracker.hpp
rename to libs/platform/battery_tracker.hpp
diff --git a/platform/chunks_download_strategy.cpp b/libs/platform/chunks_download_strategy.cpp
similarity index 100%
rename from platform/chunks_download_strategy.cpp
rename to libs/platform/chunks_download_strategy.cpp
diff --git a/platform/chunks_download_strategy.hpp b/libs/platform/chunks_download_strategy.hpp
similarity index 100%
rename from platform/chunks_download_strategy.hpp
rename to libs/platform/chunks_download_strategy.hpp
diff --git a/platform/constants.hpp b/libs/platform/constants.hpp
similarity index 100%
rename from platform/constants.hpp
rename to libs/platform/constants.hpp
diff --git a/platform/country_defines.cpp b/libs/platform/country_defines.cpp
similarity index 100%
rename from platform/country_defines.cpp
rename to libs/platform/country_defines.cpp
diff --git a/platform/country_defines.hpp b/libs/platform/country_defines.hpp
similarity index 100%
rename from platform/country_defines.hpp
rename to libs/platform/country_defines.hpp
diff --git a/platform/country_file.cpp b/libs/platform/country_file.cpp
similarity index 100%
rename from platform/country_file.cpp
rename to libs/platform/country_file.cpp
diff --git a/platform/country_file.hpp b/libs/platform/country_file.hpp
similarity index 100%
rename from platform/country_file.hpp
rename to libs/platform/country_file.hpp
diff --git a/platform/distance.cpp b/libs/platform/distance.cpp
similarity index 100%
rename from platform/distance.cpp
rename to libs/platform/distance.cpp
diff --git a/platform/distance.hpp b/libs/platform/distance.hpp
similarity index 100%
rename from platform/distance.hpp
rename to libs/platform/distance.hpp
diff --git a/platform/downloader_defines.hpp b/libs/platform/downloader_defines.hpp
similarity index 100%
rename from platform/downloader_defines.hpp
rename to libs/platform/downloader_defines.hpp
diff --git a/platform/downloader_utils.cpp b/libs/platform/downloader_utils.cpp
similarity index 100%
rename from platform/downloader_utils.cpp
rename to libs/platform/downloader_utils.cpp
diff --git a/platform/downloader_utils.hpp b/libs/platform/downloader_utils.hpp
similarity index 100%
rename from platform/downloader_utils.hpp
rename to libs/platform/downloader_utils.hpp
diff --git a/platform/duration.cpp b/libs/platform/duration.cpp
similarity index 100%
rename from platform/duration.cpp
rename to libs/platform/duration.cpp
diff --git a/platform/duration.hpp b/libs/platform/duration.hpp
similarity index 100%
rename from platform/duration.hpp
rename to libs/platform/duration.hpp
diff --git a/platform/get_text_by_id.cpp b/libs/platform/get_text_by_id.cpp
similarity index 100%
rename from platform/get_text_by_id.cpp
rename to libs/platform/get_text_by_id.cpp
diff --git a/platform/get_text_by_id.hpp b/libs/platform/get_text_by_id.hpp
similarity index 100%
rename from platform/get_text_by_id.hpp
rename to libs/platform/get_text_by_id.hpp
diff --git a/platform/gui_thread.hpp b/libs/platform/gui_thread.hpp
similarity index 100%
rename from platform/gui_thread.hpp
rename to libs/platform/gui_thread.hpp
diff --git a/platform/gui_thread_apple.mm b/libs/platform/gui_thread_apple.mm
similarity index 100%
rename from platform/gui_thread_apple.mm
rename to libs/platform/gui_thread_apple.mm
diff --git a/platform/gui_thread_qt.cpp b/libs/platform/gui_thread_qt.cpp
similarity index 100%
rename from platform/gui_thread_qt.cpp
rename to libs/platform/gui_thread_qt.cpp
diff --git a/platform/http_client.cpp b/libs/platform/http_client.cpp
similarity index 100%
rename from platform/http_client.cpp
rename to libs/platform/http_client.cpp
diff --git a/platform/http_client.hpp b/libs/platform/http_client.hpp
similarity index 100%
rename from platform/http_client.hpp
rename to libs/platform/http_client.hpp
diff --git a/platform/http_client_apple.mm b/libs/platform/http_client_apple.mm
similarity index 100%
rename from platform/http_client_apple.mm
rename to libs/platform/http_client_apple.mm
diff --git a/platform/http_client_curl.cpp b/libs/platform/http_client_curl.cpp
similarity index 100%
rename from platform/http_client_curl.cpp
rename to libs/platform/http_client_curl.cpp
diff --git a/platform/http_payload.cpp b/libs/platform/http_payload.cpp
similarity index 100%
rename from platform/http_payload.cpp
rename to libs/platform/http_payload.cpp
diff --git a/platform/http_payload.hpp b/libs/platform/http_payload.hpp
similarity index 100%
rename from platform/http_payload.hpp
rename to libs/platform/http_payload.hpp
diff --git a/platform/http_request.cpp b/libs/platform/http_request.cpp
similarity index 100%
rename from platform/http_request.cpp
rename to libs/platform/http_request.cpp
diff --git a/platform/http_request.hpp b/libs/platform/http_request.hpp
similarity index 100%
rename from platform/http_request.hpp
rename to libs/platform/http_request.hpp
diff --git a/platform/http_session_manager.h b/libs/platform/http_session_manager.h
similarity index 100%
rename from platform/http_session_manager.h
rename to libs/platform/http_session_manager.h
diff --git a/platform/http_session_manager.mm b/libs/platform/http_session_manager.mm
similarity index 100%
rename from platform/http_session_manager.mm
rename to libs/platform/http_session_manager.mm
diff --git a/platform/http_thread_apple.h b/libs/platform/http_thread_apple.h
similarity index 100%
rename from platform/http_thread_apple.h
rename to libs/platform/http_thread_apple.h
diff --git a/platform/http_thread_apple.mm b/libs/platform/http_thread_apple.mm
similarity index 100%
rename from platform/http_thread_apple.mm
rename to libs/platform/http_thread_apple.mm
diff --git a/platform/http_thread_callback.hpp b/libs/platform/http_thread_callback.hpp
similarity index 100%
rename from platform/http_thread_callback.hpp
rename to libs/platform/http_thread_callback.hpp
diff --git a/platform/http_thread_qt.cpp b/libs/platform/http_thread_qt.cpp
similarity index 100%
rename from platform/http_thread_qt.cpp
rename to libs/platform/http_thread_qt.cpp
diff --git a/platform/http_thread_qt.hpp b/libs/platform/http_thread_qt.hpp
similarity index 100%
rename from platform/http_thread_qt.hpp
rename to libs/platform/http_thread_qt.hpp
diff --git a/platform/http_uploader.hpp b/libs/platform/http_uploader.hpp
similarity index 100%
rename from platform/http_uploader.hpp
rename to libs/platform/http_uploader.hpp
diff --git a/platform/http_uploader_apple.mm b/libs/platform/http_uploader_apple.mm
similarity index 100%
rename from platform/http_uploader_apple.mm
rename to libs/platform/http_uploader_apple.mm
diff --git a/platform/http_uploader_background.hpp b/libs/platform/http_uploader_background.hpp
similarity index 100%
rename from platform/http_uploader_background.hpp
rename to libs/platform/http_uploader_background.hpp
diff --git a/platform/http_uploader_background.mm b/libs/platform/http_uploader_background.mm
similarity index 100%
rename from platform/http_uploader_background.mm
rename to libs/platform/http_uploader_background.mm
diff --git a/platform/http_uploader_background_dummy.cpp b/libs/platform/http_uploader_background_dummy.cpp
similarity index 100%
rename from platform/http_uploader_background_dummy.cpp
rename to libs/platform/http_uploader_background_dummy.cpp
diff --git a/platform/http_uploader_dummy.cpp b/libs/platform/http_uploader_dummy.cpp
similarity index 100%
rename from platform/http_uploader_dummy.cpp
rename to libs/platform/http_uploader_dummy.cpp
diff --git a/platform/languages.hpp b/libs/platform/languages.hpp
similarity index 100%
rename from platform/languages.hpp
rename to libs/platform/languages.hpp
diff --git a/platform/local_country_file.cpp b/libs/platform/local_country_file.cpp
similarity index 100%
rename from platform/local_country_file.cpp
rename to libs/platform/local_country_file.cpp
diff --git a/platform/local_country_file.hpp b/libs/platform/local_country_file.hpp
similarity index 100%
rename from platform/local_country_file.hpp
rename to libs/platform/local_country_file.hpp
diff --git a/platform/local_country_file_utils.cpp b/libs/platform/local_country_file_utils.cpp
similarity index 100%
rename from platform/local_country_file_utils.cpp
rename to libs/platform/local_country_file_utils.cpp
diff --git a/platform/local_country_file_utils.hpp b/libs/platform/local_country_file_utils.hpp
similarity index 100%
rename from platform/local_country_file_utils.hpp
rename to libs/platform/local_country_file_utils.hpp
diff --git a/platform/locale.hpp b/libs/platform/locale.hpp
similarity index 100%
rename from platform/locale.hpp
rename to libs/platform/locale.hpp
diff --git a/platform/locale.mm b/libs/platform/locale.mm
similarity index 100%
rename from platform/locale.mm
rename to libs/platform/locale.mm
diff --git a/platform/locale_std.cpp b/libs/platform/locale_std.cpp
similarity index 100%
rename from platform/locale_std.cpp
rename to libs/platform/locale_std.cpp
diff --git a/platform/localization.cpp b/libs/platform/localization.cpp
similarity index 100%
rename from platform/localization.cpp
rename to libs/platform/localization.cpp
diff --git a/platform/localization.hpp b/libs/platform/localization.hpp
similarity index 100%
rename from platform/localization.hpp
rename to libs/platform/localization.hpp
diff --git a/platform/localization.mm b/libs/platform/localization.mm
similarity index 100%
rename from platform/localization.mm
rename to libs/platform/localization.mm
diff --git a/platform/localization_dummy.cpp b/libs/platform/localization_dummy.cpp
similarity index 100%
rename from platform/localization_dummy.cpp
rename to libs/platform/localization_dummy.cpp
diff --git a/platform/location.hpp b/libs/platform/location.hpp
similarity index 100%
rename from platform/location.hpp
rename to libs/platform/location.hpp
diff --git a/platform/location_service/CMakeLists.txt b/libs/platform/location_service/CMakeLists.txt
similarity index 100%
rename from platform/location_service/CMakeLists.txt
rename to libs/platform/location_service/CMakeLists.txt
diff --git a/platform/location_service/apple_location_service.mm b/libs/platform/location_service/apple_location_service.mm
similarity index 100%
rename from platform/location_service/apple_location_service.mm
rename to libs/platform/location_service/apple_location_service.mm
diff --git a/platform/location_service/location_service.cpp b/libs/platform/location_service/location_service.cpp
similarity index 100%
rename from platform/location_service/location_service.cpp
rename to libs/platform/location_service/location_service.cpp
diff --git a/platform/location_service/location_service.hpp b/libs/platform/location_service/location_service.hpp
similarity index 100%
rename from platform/location_service/location_service.hpp
rename to libs/platform/location_service/location_service.hpp
diff --git a/platform/location_service/qt_location_service.cpp b/libs/platform/location_service/qt_location_service.cpp
similarity index 100%
rename from platform/location_service/qt_location_service.cpp
rename to libs/platform/location_service/qt_location_service.cpp
diff --git a/platform/location_service/qt_location_service.hpp b/libs/platform/location_service/qt_location_service.hpp
similarity index 100%
rename from platform/location_service/qt_location_service.hpp
rename to libs/platform/location_service/qt_location_service.hpp
diff --git a/platform/measurement_utils.cpp b/libs/platform/measurement_utils.cpp
similarity index 100%
rename from platform/measurement_utils.cpp
rename to libs/platform/measurement_utils.cpp
diff --git a/platform/measurement_utils.hpp b/libs/platform/measurement_utils.hpp
similarity index 100%
rename from platform/measurement_utils.hpp
rename to libs/platform/measurement_utils.hpp
diff --git a/platform/mwm_traits.cpp b/libs/platform/mwm_traits.cpp
similarity index 100%
rename from platform/mwm_traits.cpp
rename to libs/platform/mwm_traits.cpp
diff --git a/platform/mwm_traits.hpp b/libs/platform/mwm_traits.hpp
similarity index 100%
rename from platform/mwm_traits.hpp
rename to libs/platform/mwm_traits.hpp
diff --git a/platform/mwm_version.cpp b/libs/platform/mwm_version.cpp
similarity index 100%
rename from platform/mwm_version.cpp
rename to libs/platform/mwm_version.cpp
diff --git a/platform/mwm_version.hpp b/libs/platform/mwm_version.hpp
similarity index 100%
rename from platform/mwm_version.hpp
rename to libs/platform/mwm_version.hpp
diff --git a/platform/network_policy.hpp b/libs/platform/network_policy.hpp
similarity index 100%
rename from platform/network_policy.hpp
rename to libs/platform/network_policy.hpp
diff --git a/platform/network_policy_dummy.cpp b/libs/platform/network_policy_dummy.cpp
similarity index 100%
rename from platform/network_policy_dummy.cpp
rename to libs/platform/network_policy_dummy.cpp
diff --git a/platform/network_policy_ios.h b/libs/platform/network_policy_ios.h
similarity index 100%
rename from platform/network_policy_ios.h
rename to libs/platform/network_policy_ios.h
diff --git a/platform/network_policy_ios.mm b/libs/platform/network_policy_ios.mm
similarity index 100%
rename from platform/network_policy_ios.mm
rename to libs/platform/network_policy_ios.mm
diff --git a/platform/platform.cpp b/libs/platform/platform.cpp
similarity index 100%
rename from platform/platform.cpp
rename to libs/platform/platform.cpp
diff --git a/platform/platform.hpp b/libs/platform/platform.hpp
similarity index 100%
rename from platform/platform.hpp
rename to libs/platform/platform.hpp
diff --git a/platform/platform_android.cpp b/libs/platform/platform_android.cpp
similarity index 100%
rename from platform/platform_android.cpp
rename to libs/platform/platform_android.cpp
diff --git a/platform/platform_ios.h b/libs/platform/platform_ios.h
similarity index 100%
rename from platform/platform_ios.h
rename to libs/platform/platform_ios.h
diff --git a/platform/platform_ios.mm b/libs/platform/platform_ios.mm
similarity index 100%
rename from platform/platform_ios.mm
rename to libs/platform/platform_ios.mm
diff --git a/platform/platform_linux.cpp b/libs/platform/platform_linux.cpp
similarity index 100%
rename from platform/platform_linux.cpp
rename to libs/platform/platform_linux.cpp
diff --git a/platform/platform_mac.mm b/libs/platform/platform_mac.mm
similarity index 100%
rename from platform/platform_mac.mm
rename to libs/platform/platform_mac.mm
diff --git a/platform/platform_qt.cpp b/libs/platform/platform_qt.cpp
similarity index 100%
rename from platform/platform_qt.cpp
rename to libs/platform/platform_qt.cpp
diff --git a/platform/platform_qt_version.cpp.in b/libs/platform/platform_qt_version.cpp.in
similarity index 100%
rename from platform/platform_qt_version.cpp.in
rename to libs/platform/platform_qt_version.cpp.in
diff --git a/platform/platform_tests/CMakeLists.txt b/libs/platform/platform_tests/CMakeLists.txt
similarity index 100%
rename from platform/platform_tests/CMakeLists.txt
rename to libs/platform/platform_tests/CMakeLists.txt
diff --git a/platform/platform_tests/country_file_tests.cpp b/libs/platform/platform_tests/country_file_tests.cpp
similarity index 100%
rename from platform/platform_tests/country_file_tests.cpp
rename to libs/platform/platform_tests/country_file_tests.cpp
diff --git a/platform/platform_tests/distance_tests.cpp b/libs/platform/platform_tests/distance_tests.cpp
similarity index 100%
rename from platform/platform_tests/distance_tests.cpp
rename to libs/platform/platform_tests/distance_tests.cpp
diff --git a/platform/platform_tests/downloader_tests/downloader_test.cpp b/libs/platform/platform_tests/downloader_tests/downloader_test.cpp
similarity index 100%
rename from platform/platform_tests/downloader_tests/downloader_test.cpp
rename to libs/platform/platform_tests/downloader_tests/downloader_test.cpp
diff --git a/platform/platform_tests/downloader_utils_tests.cpp b/libs/platform/platform_tests/downloader_utils_tests.cpp
similarity index 100%
rename from platform/platform_tests/downloader_utils_tests.cpp
rename to libs/platform/platform_tests/downloader_utils_tests.cpp
diff --git a/platform/platform_tests/duration_tests.cpp b/libs/platform/platform_tests/duration_tests.cpp
similarity index 100%
rename from platform/platform_tests/duration_tests.cpp
rename to libs/platform/platform_tests/duration_tests.cpp
diff --git a/platform/platform_tests/get_text_by_id_tests.cpp b/libs/platform/platform_tests/get_text_by_id_tests.cpp
similarity index 100%
rename from platform/platform_tests/get_text_by_id_tests.cpp
rename to libs/platform/platform_tests/get_text_by_id_tests.cpp
diff --git a/platform/platform_tests/jansson_test.cpp b/libs/platform/platform_tests/jansson_test.cpp
similarity index 100%
rename from platform/platform_tests/jansson_test.cpp
rename to libs/platform/platform_tests/jansson_test.cpp
diff --git a/platform/platform_tests/language_test.cpp b/libs/platform/platform_tests/language_test.cpp
similarity index 100%
rename from platform/platform_tests/language_test.cpp
rename to libs/platform/platform_tests/language_test.cpp
diff --git a/platform/platform_tests/local_country_file_tests.cpp b/libs/platform/platform_tests/local_country_file_tests.cpp
similarity index 100%
rename from platform/platform_tests/local_country_file_tests.cpp
rename to libs/platform/platform_tests/local_country_file_tests.cpp
diff --git a/platform/platform_tests/location_test.cpp b/libs/platform/platform_tests/location_test.cpp
similarity index 100%
rename from platform/platform_tests/location_test.cpp
rename to libs/platform/platform_tests/location_test.cpp
diff --git a/platform/platform_tests/measurement_tests.cpp b/libs/platform/platform_tests/measurement_tests.cpp
similarity index 100%
rename from platform/platform_tests/measurement_tests.cpp
rename to libs/platform/platform_tests/measurement_tests.cpp
diff --git a/platform/platform_tests/meta_config_tests.cpp b/libs/platform/platform_tests/meta_config_tests.cpp
similarity index 100%
rename from platform/platform_tests/meta_config_tests.cpp
rename to libs/platform/platform_tests/meta_config_tests.cpp
diff --git a/platform/platform_tests/platform_test.cpp b/libs/platform/platform_tests/platform_test.cpp
similarity index 100%
rename from platform/platform_tests/platform_test.cpp
rename to libs/platform/platform_tests/platform_test.cpp
diff --git a/platform/platform_tests/products_tests.cpp b/libs/platform/platform_tests/products_tests.cpp
similarity index 100%
rename from platform/platform_tests/products_tests.cpp
rename to libs/platform/platform_tests/products_tests.cpp
diff --git a/platform/platform_tests/utm_mgrs_utils_tests.cpp b/libs/platform/platform_tests/utm_mgrs_utils_tests.cpp
similarity index 100%
rename from platform/platform_tests/utm_mgrs_utils_tests.cpp
rename to libs/platform/platform_tests/utm_mgrs_utils_tests.cpp
diff --git a/platform/platform_tests_support/CMakeLists.txt b/libs/platform/platform_tests_support/CMakeLists.txt
similarity index 100%
rename from platform/platform_tests_support/CMakeLists.txt
rename to libs/platform/platform_tests_support/CMakeLists.txt
diff --git a/platform/platform_tests_support/async_gui_thread.hpp b/libs/platform/platform_tests_support/async_gui_thread.hpp
similarity index 100%
rename from platform/platform_tests_support/async_gui_thread.hpp
rename to libs/platform/platform_tests_support/async_gui_thread.hpp
diff --git a/platform/platform_tests_support/helpers.hpp b/libs/platform/platform_tests_support/helpers.hpp
similarity index 100%
rename from platform/platform_tests_support/helpers.hpp
rename to libs/platform/platform_tests_support/helpers.hpp
diff --git a/platform/platform_tests_support/scoped_dir.cpp b/libs/platform/platform_tests_support/scoped_dir.cpp
similarity index 100%
rename from platform/platform_tests_support/scoped_dir.cpp
rename to libs/platform/platform_tests_support/scoped_dir.cpp
diff --git a/platform/platform_tests_support/scoped_dir.hpp b/libs/platform/platform_tests_support/scoped_dir.hpp
similarity index 100%
rename from platform/platform_tests_support/scoped_dir.hpp
rename to libs/platform/platform_tests_support/scoped_dir.hpp
diff --git a/platform/platform_tests_support/scoped_file.cpp b/libs/platform/platform_tests_support/scoped_file.cpp
similarity index 100%
rename from platform/platform_tests_support/scoped_file.cpp
rename to libs/platform/platform_tests_support/scoped_file.cpp
diff --git a/platform/platform_tests_support/scoped_file.hpp b/libs/platform/platform_tests_support/scoped_file.hpp
similarity index 100%
rename from platform/platform_tests_support/scoped_file.hpp
rename to libs/platform/platform_tests_support/scoped_file.hpp
diff --git a/platform/platform_tests_support/scoped_mwm.cpp b/libs/platform/platform_tests_support/scoped_mwm.cpp
similarity index 100%
rename from platform/platform_tests_support/scoped_mwm.cpp
rename to libs/platform/platform_tests_support/scoped_mwm.cpp
diff --git a/platform/platform_tests_support/scoped_mwm.hpp b/libs/platform/platform_tests_support/scoped_mwm.hpp
similarity index 100%
rename from platform/platform_tests_support/scoped_mwm.hpp
rename to libs/platform/platform_tests_support/scoped_mwm.hpp
diff --git a/platform/platform_tests_support/test_socket.cpp b/libs/platform/platform_tests_support/test_socket.cpp
similarity index 100%
rename from platform/platform_tests_support/test_socket.cpp
rename to libs/platform/platform_tests_support/test_socket.cpp
diff --git a/platform/platform_tests_support/test_socket.hpp b/libs/platform/platform_tests_support/test_socket.hpp
similarity index 100%
rename from platform/platform_tests_support/test_socket.hpp
rename to libs/platform/platform_tests_support/test_socket.hpp
diff --git a/platform/platform_tests_support/writable_dir_changer.cpp b/libs/platform/platform_tests_support/writable_dir_changer.cpp
similarity index 100%
rename from platform/platform_tests_support/writable_dir_changer.cpp
rename to libs/platform/platform_tests_support/writable_dir_changer.cpp
diff --git a/platform/platform_tests_support/writable_dir_changer.hpp b/libs/platform/platform_tests_support/writable_dir_changer.hpp
similarity index 100%
rename from platform/platform_tests_support/writable_dir_changer.hpp
rename to libs/platform/platform_tests_support/writable_dir_changer.hpp
diff --git a/platform/platform_unix_impl.cpp b/libs/platform/platform_unix_impl.cpp
similarity index 100%
rename from platform/platform_unix_impl.cpp
rename to libs/platform/platform_unix_impl.cpp
diff --git a/platform/platform_unix_impl.hpp b/libs/platform/platform_unix_impl.hpp
similarity index 100%
rename from platform/platform_unix_impl.hpp
rename to libs/platform/platform_unix_impl.hpp
diff --git a/platform/platform_win.cpp b/libs/platform/platform_win.cpp
similarity index 100%
rename from platform/platform_win.cpp
rename to libs/platform/platform_win.cpp
diff --git a/platform/preferred_languages.cpp b/libs/platform/preferred_languages.cpp
similarity index 100%
rename from platform/preferred_languages.cpp
rename to libs/platform/preferred_languages.cpp
diff --git a/platform/preferred_languages.hpp b/libs/platform/preferred_languages.hpp
similarity index 100%
rename from platform/preferred_languages.hpp
rename to libs/platform/preferred_languages.hpp
diff --git a/platform/products.cpp b/libs/platform/products.cpp
similarity index 100%
rename from platform/products.cpp
rename to libs/platform/products.cpp
diff --git a/platform/products.hpp b/libs/platform/products.hpp
similarity index 100%
rename from platform/products.hpp
rename to libs/platform/products.hpp
diff --git a/platform/remote_file.cpp b/libs/platform/remote_file.cpp
similarity index 100%
rename from platform/remote_file.cpp
rename to libs/platform/remote_file.cpp
diff --git a/platform/remote_file.hpp b/libs/platform/remote_file.hpp
similarity index 100%
rename from platform/remote_file.hpp
rename to libs/platform/remote_file.hpp
diff --git a/platform/safe_callback.hpp b/libs/platform/safe_callback.hpp
similarity index 100%
rename from platform/safe_callback.hpp
rename to libs/platform/safe_callback.hpp
diff --git a/platform/secure_storage.hpp b/libs/platform/secure_storage.hpp
similarity index 100%
rename from platform/secure_storage.hpp
rename to libs/platform/secure_storage.hpp
diff --git a/platform/secure_storage_dummy.cpp b/libs/platform/secure_storage_dummy.cpp
similarity index 100%
rename from platform/secure_storage_dummy.cpp
rename to libs/platform/secure_storage_dummy.cpp
diff --git a/platform/secure_storage_ios.mm b/libs/platform/secure_storage_ios.mm
similarity index 100%
rename from platform/secure_storage_ios.mm
rename to libs/platform/secure_storage_ios.mm
diff --git a/platform/secure_storage_qt.cpp b/libs/platform/secure_storage_qt.cpp
similarity index 100%
rename from platform/secure_storage_qt.cpp
rename to libs/platform/secure_storage_qt.cpp
diff --git a/platform/servers_list.cpp b/libs/platform/servers_list.cpp
similarity index 100%
rename from platform/servers_list.cpp
rename to libs/platform/servers_list.cpp
diff --git a/platform/servers_list.hpp b/libs/platform/servers_list.hpp
similarity index 100%
rename from platform/servers_list.hpp
rename to libs/platform/servers_list.hpp
diff --git a/platform/settings.cpp b/libs/platform/settings.cpp
similarity index 100%
rename from platform/settings.cpp
rename to libs/platform/settings.cpp
diff --git a/platform/settings.hpp b/libs/platform/settings.hpp
similarity index 100%
rename from platform/settings.hpp
rename to libs/platform/settings.hpp
diff --git a/platform/socket.hpp b/libs/platform/socket.hpp
similarity index 100%
rename from platform/socket.hpp
rename to libs/platform/socket.hpp
diff --git a/platform/socket_apple.mm b/libs/platform/socket_apple.mm
similarity index 100%
rename from platform/socket_apple.mm
rename to libs/platform/socket_apple.mm
diff --git a/platform/string_storage_base.cpp b/libs/platform/string_storage_base.cpp
similarity index 100%
rename from platform/string_storage_base.cpp
rename to libs/platform/string_storage_base.cpp
diff --git a/platform/string_storage_base.hpp b/libs/platform/string_storage_base.hpp
similarity index 100%
rename from platform/string_storage_base.hpp
rename to libs/platform/string_storage_base.hpp
diff --git a/platform/style_utils.hpp b/libs/platform/style_utils.hpp
similarity index 100%
rename from platform/style_utils.hpp
rename to libs/platform/style_utils.hpp
diff --git a/platform/trace.hpp b/libs/platform/trace.hpp
similarity index 100%
rename from platform/trace.hpp
rename to libs/platform/trace.hpp
diff --git a/platform/trace_android.cpp b/libs/platform/trace_android.cpp
similarity index 100%
rename from platform/trace_android.cpp
rename to libs/platform/trace_android.cpp
diff --git a/platform/utm_mgrs_utils.cpp b/libs/platform/utm_mgrs_utils.cpp
similarity index 100%
rename from platform/utm_mgrs_utils.cpp
rename to libs/platform/utm_mgrs_utils.cpp
diff --git a/platform/utm_mgrs_utils.hpp b/libs/platform/utm_mgrs_utils.hpp
similarity index 100%
rename from platform/utm_mgrs_utils.hpp
rename to libs/platform/utm_mgrs_utils.hpp
diff --git a/pyhelpers/CMakeLists.txt b/libs/pyhelpers/CMakeLists.txt
similarity index 100%
rename from pyhelpers/CMakeLists.txt
rename to libs/pyhelpers/CMakeLists.txt
diff --git a/pyhelpers/__init__.py b/libs/pyhelpers/__init__.py
similarity index 100%
rename from pyhelpers/__init__.py
rename to libs/pyhelpers/__init__.py
diff --git a/pyhelpers/module_version.hpp.in b/libs/pyhelpers/module_version.hpp.in
similarity index 100%
rename from pyhelpers/module_version.hpp.in
rename to libs/pyhelpers/module_version.hpp.in
diff --git a/pyhelpers/pair.hpp b/libs/pyhelpers/pair.hpp
similarity index 100%
rename from pyhelpers/pair.hpp
rename to libs/pyhelpers/pair.hpp
diff --git a/pyhelpers/setup.py b/libs/pyhelpers/setup.py
similarity index 100%
rename from pyhelpers/setup.py
rename to libs/pyhelpers/setup.py
diff --git a/pyhelpers/specs/build.sh b/libs/pyhelpers/specs/build.sh
similarity index 100%
rename from pyhelpers/specs/build.sh
rename to libs/pyhelpers/specs/build.sh
diff --git a/pyhelpers/specs/python35-mapsme-modules.spec b/libs/pyhelpers/specs/python35-mapsme-modules.spec
similarity index 100%
rename from pyhelpers/specs/python35-mapsme-modules.spec
rename to libs/pyhelpers/specs/python35-mapsme-modules.spec
diff --git a/pyhelpers/vector_list_conversion.hpp b/libs/pyhelpers/vector_list_conversion.hpp
similarity index 100%
rename from pyhelpers/vector_list_conversion.hpp
rename to libs/pyhelpers/vector_list_conversion.hpp
diff --git a/pyhelpers/vector_uint8.hpp b/libs/pyhelpers/vector_uint8.hpp
similarity index 100%
rename from pyhelpers/vector_uint8.hpp
rename to libs/pyhelpers/vector_uint8.hpp
diff --git a/qt_tstfrm/CMakeLists.txt b/libs/qt_tstfrm/CMakeLists.txt
similarity index 100%
rename from qt_tstfrm/CMakeLists.txt
rename to libs/qt_tstfrm/CMakeLists.txt
diff --git a/qt_tstfrm/test_main_loop.cpp b/libs/qt_tstfrm/test_main_loop.cpp
similarity index 100%
rename from qt_tstfrm/test_main_loop.cpp
rename to libs/qt_tstfrm/test_main_loop.cpp
diff --git a/qt_tstfrm/test_main_loop.hpp b/libs/qt_tstfrm/test_main_loop.hpp
similarity index 100%
rename from qt_tstfrm/test_main_loop.hpp
rename to libs/qt_tstfrm/test_main_loop.hpp
diff --git a/routing/CMakeLists.txt b/libs/routing/CMakeLists.txt
similarity index 100%
rename from routing/CMakeLists.txt
rename to libs/routing/CMakeLists.txt
diff --git a/routing/absent_regions_finder.cpp b/libs/routing/absent_regions_finder.cpp
similarity index 100%
rename from routing/absent_regions_finder.cpp
rename to libs/routing/absent_regions_finder.cpp
diff --git a/routing/absent_regions_finder.hpp b/libs/routing/absent_regions_finder.hpp
similarity index 100%
rename from routing/absent_regions_finder.hpp
rename to libs/routing/absent_regions_finder.hpp
diff --git a/routing/async_router.cpp b/libs/routing/async_router.cpp
similarity index 100%
rename from routing/async_router.cpp
rename to libs/routing/async_router.cpp
diff --git a/routing/async_router.hpp b/libs/routing/async_router.hpp
similarity index 100%
rename from routing/async_router.hpp
rename to libs/routing/async_router.hpp
diff --git a/routing/base/astar_algorithm.hpp b/libs/routing/base/astar_algorithm.hpp
similarity index 100%
rename from routing/base/astar_algorithm.hpp
rename to libs/routing/base/astar_algorithm.hpp
diff --git a/routing/base/astar_graph.hpp b/libs/routing/base/astar_graph.hpp
similarity index 100%
rename from routing/base/astar_graph.hpp
rename to libs/routing/base/astar_graph.hpp
diff --git a/routing/base/astar_progress.cpp b/libs/routing/base/astar_progress.cpp
similarity index 100%
rename from routing/base/astar_progress.cpp
rename to libs/routing/base/astar_progress.cpp
diff --git a/routing/base/astar_progress.hpp b/libs/routing/base/astar_progress.hpp
similarity index 100%
rename from routing/base/astar_progress.hpp
rename to libs/routing/base/astar_progress.hpp
diff --git a/routing/base/astar_vertex_data.hpp b/libs/routing/base/astar_vertex_data.hpp
similarity index 100%
rename from routing/base/astar_vertex_data.hpp
rename to libs/routing/base/astar_vertex_data.hpp
diff --git a/routing/base/astar_weight.hpp b/libs/routing/base/astar_weight.hpp
similarity index 100%
rename from routing/base/astar_weight.hpp
rename to libs/routing/base/astar_weight.hpp
diff --git a/routing/base/bfs.hpp b/libs/routing/base/bfs.hpp
similarity index 100%
rename from routing/base/bfs.hpp
rename to libs/routing/base/bfs.hpp
diff --git a/routing/base/followed_polyline.cpp b/libs/routing/base/followed_polyline.cpp
similarity index 100%
rename from routing/base/followed_polyline.cpp
rename to libs/routing/base/followed_polyline.cpp
diff --git a/routing/base/followed_polyline.hpp b/libs/routing/base/followed_polyline.hpp
similarity index 100%
rename from routing/base/followed_polyline.hpp
rename to libs/routing/base/followed_polyline.hpp
diff --git a/routing/base/routing_result.hpp b/libs/routing/base/routing_result.hpp
similarity index 100%
rename from routing/base/routing_result.hpp
rename to libs/routing/base/routing_result.hpp
diff --git a/routing/base/small_list.cpp b/libs/routing/base/small_list.cpp
similarity index 100%
rename from routing/base/small_list.cpp
rename to libs/routing/base/small_list.cpp
diff --git a/routing/base/small_list.hpp b/libs/routing/base/small_list.hpp
similarity index 100%
rename from routing/base/small_list.hpp
rename to libs/routing/base/small_list.hpp
diff --git a/routing/car_directions.cpp b/libs/routing/car_directions.cpp
similarity index 100%
rename from routing/car_directions.cpp
rename to libs/routing/car_directions.cpp
diff --git a/routing/car_directions.hpp b/libs/routing/car_directions.hpp
similarity index 100%
rename from routing/car_directions.hpp
rename to libs/routing/car_directions.hpp
diff --git a/routing/checkpoint_predictor.cpp b/libs/routing/checkpoint_predictor.cpp
similarity index 100%
rename from routing/checkpoint_predictor.cpp
rename to libs/routing/checkpoint_predictor.cpp
diff --git a/routing/checkpoint_predictor.hpp b/libs/routing/checkpoint_predictor.hpp
similarity index 100%
rename from routing/checkpoint_predictor.hpp
rename to libs/routing/checkpoint_predictor.hpp
diff --git a/routing/checkpoints.cpp b/libs/routing/checkpoints.cpp
similarity index 100%
rename from routing/checkpoints.cpp
rename to libs/routing/checkpoints.cpp
diff --git a/routing/checkpoints.hpp b/libs/routing/checkpoints.hpp
similarity index 100%
rename from routing/checkpoints.hpp
rename to libs/routing/checkpoints.hpp
diff --git a/routing/city_roads.cpp b/libs/routing/city_roads.cpp
similarity index 100%
rename from routing/city_roads.cpp
rename to libs/routing/city_roads.cpp
diff --git a/routing/city_roads.hpp b/libs/routing/city_roads.hpp
similarity index 100%
rename from routing/city_roads.hpp
rename to libs/routing/city_roads.hpp
diff --git a/routing/city_roads_serialization.hpp b/libs/routing/city_roads_serialization.hpp
similarity index 100%
rename from routing/city_roads_serialization.hpp
rename to libs/routing/city_roads_serialization.hpp
diff --git a/routing/coding.hpp b/libs/routing/coding.hpp
similarity index 100%
rename from routing/coding.hpp
rename to libs/routing/coding.hpp
diff --git a/routing/cross_border_graph.cpp b/libs/routing/cross_border_graph.cpp
similarity index 100%
rename from routing/cross_border_graph.cpp
rename to libs/routing/cross_border_graph.cpp
diff --git a/routing/cross_border_graph.hpp b/libs/routing/cross_border_graph.hpp
similarity index 100%
rename from routing/cross_border_graph.hpp
rename to libs/routing/cross_border_graph.hpp
diff --git a/routing/cross_mwm_connector.cpp b/libs/routing/cross_mwm_connector.cpp
similarity index 100%
rename from routing/cross_mwm_connector.cpp
rename to libs/routing/cross_mwm_connector.cpp
diff --git a/routing/cross_mwm_connector.hpp b/libs/routing/cross_mwm_connector.hpp
similarity index 100%
rename from routing/cross_mwm_connector.hpp
rename to libs/routing/cross_mwm_connector.hpp
diff --git a/routing/cross_mwm_connector_serialization.hpp b/libs/routing/cross_mwm_connector_serialization.hpp
similarity index 100%
rename from routing/cross_mwm_connector_serialization.hpp
rename to libs/routing/cross_mwm_connector_serialization.hpp
diff --git a/routing/cross_mwm_graph.cpp b/libs/routing/cross_mwm_graph.cpp
similarity index 100%
rename from routing/cross_mwm_graph.cpp
rename to libs/routing/cross_mwm_graph.cpp
diff --git a/routing/cross_mwm_graph.hpp b/libs/routing/cross_mwm_graph.hpp
similarity index 100%
rename from routing/cross_mwm_graph.hpp
rename to libs/routing/cross_mwm_graph.hpp
diff --git a/routing/cross_mwm_ids.hpp b/libs/routing/cross_mwm_ids.hpp
similarity index 100%
rename from routing/cross_mwm_ids.hpp
rename to libs/routing/cross_mwm_ids.hpp
diff --git a/routing/cross_mwm_index_graph.hpp b/libs/routing/cross_mwm_index_graph.hpp
similarity index 100%
rename from routing/cross_mwm_index_graph.hpp
rename to libs/routing/cross_mwm_index_graph.hpp
diff --git a/routing/data_source.hpp b/libs/routing/data_source.hpp
similarity index 100%
rename from routing/data_source.hpp
rename to libs/routing/data_source.hpp
diff --git a/routing/directions_engine.cpp b/libs/routing/directions_engine.cpp
similarity index 100%
rename from routing/directions_engine.cpp
rename to libs/routing/directions_engine.cpp
diff --git a/routing/directions_engine.hpp b/libs/routing/directions_engine.hpp
similarity index 100%
rename from routing/directions_engine.hpp
rename to libs/routing/directions_engine.hpp
diff --git a/routing/directions_engine_helpers.cpp b/libs/routing/directions_engine_helpers.cpp
similarity index 100%
rename from routing/directions_engine_helpers.cpp
rename to libs/routing/directions_engine_helpers.cpp
diff --git a/routing/directions_engine_helpers.hpp b/libs/routing/directions_engine_helpers.hpp
similarity index 100%
rename from routing/directions_engine_helpers.hpp
rename to libs/routing/directions_engine_helpers.hpp
diff --git a/routing/dummy_world_graph.hpp b/libs/routing/dummy_world_graph.hpp
similarity index 100%
rename from routing/dummy_world_graph.hpp
rename to libs/routing/dummy_world_graph.hpp
diff --git a/routing/edge_estimator.cpp b/libs/routing/edge_estimator.cpp
similarity index 100%
rename from routing/edge_estimator.cpp
rename to libs/routing/edge_estimator.cpp
diff --git a/routing/edge_estimator.hpp b/libs/routing/edge_estimator.hpp
similarity index 100%
rename from routing/edge_estimator.hpp
rename to libs/routing/edge_estimator.hpp
diff --git a/routing/fake_edges_container.hpp b/libs/routing/fake_edges_container.hpp
similarity index 100%
rename from routing/fake_edges_container.hpp
rename to libs/routing/fake_edges_container.hpp
diff --git a/routing/fake_ending.cpp b/libs/routing/fake_ending.cpp
similarity index 100%
rename from routing/fake_ending.cpp
rename to libs/routing/fake_ending.cpp
diff --git a/routing/fake_ending.hpp b/libs/routing/fake_ending.hpp
similarity index 100%
rename from routing/fake_ending.hpp
rename to libs/routing/fake_ending.hpp
diff --git a/routing/fake_feature_ids.hpp b/libs/routing/fake_feature_ids.hpp
similarity index 100%
rename from routing/fake_feature_ids.hpp
rename to libs/routing/fake_feature_ids.hpp
diff --git a/routing/fake_graph.cpp b/libs/routing/fake_graph.cpp
similarity index 100%
rename from routing/fake_graph.cpp
rename to libs/routing/fake_graph.cpp
diff --git a/routing/fake_graph.hpp b/libs/routing/fake_graph.hpp
similarity index 100%
rename from routing/fake_graph.hpp
rename to libs/routing/fake_graph.hpp
diff --git a/routing/fake_vertex.hpp b/libs/routing/fake_vertex.hpp
similarity index 100%
rename from routing/fake_vertex.hpp
rename to libs/routing/fake_vertex.hpp
diff --git a/routing/features_road_graph.cpp b/libs/routing/features_road_graph.cpp
similarity index 100%
rename from routing/features_road_graph.cpp
rename to libs/routing/features_road_graph.cpp
diff --git a/routing/features_road_graph.hpp b/libs/routing/features_road_graph.hpp
similarity index 100%
rename from routing/features_road_graph.hpp
rename to libs/routing/features_road_graph.hpp
diff --git a/routing/following_info.hpp b/libs/routing/following_info.hpp
similarity index 100%
rename from routing/following_info.hpp
rename to libs/routing/following_info.hpp
diff --git a/routing/geometry.cpp b/libs/routing/geometry.cpp
similarity index 100%
rename from routing/geometry.cpp
rename to libs/routing/geometry.cpp
diff --git a/routing/geometry.hpp b/libs/routing/geometry.hpp
similarity index 100%
rename from routing/geometry.hpp
rename to libs/routing/geometry.hpp
diff --git a/routing/guides_connections.cpp b/libs/routing/guides_connections.cpp
similarity index 100%
rename from routing/guides_connections.cpp
rename to libs/routing/guides_connections.cpp
diff --git a/routing/guides_connections.hpp b/libs/routing/guides_connections.hpp
similarity index 100%
rename from routing/guides_connections.hpp
rename to libs/routing/guides_connections.hpp
diff --git a/routing/guides_graph.cpp b/libs/routing/guides_graph.cpp
similarity index 100%
rename from routing/guides_graph.cpp
rename to libs/routing/guides_graph.cpp
diff --git a/routing/guides_graph.hpp b/libs/routing/guides_graph.hpp
similarity index 100%
rename from routing/guides_graph.hpp
rename to libs/routing/guides_graph.hpp
diff --git a/routing/index_graph.cpp b/libs/routing/index_graph.cpp
similarity index 100%
rename from routing/index_graph.cpp
rename to libs/routing/index_graph.cpp
diff --git a/routing/index_graph.hpp b/libs/routing/index_graph.hpp
similarity index 100%
rename from routing/index_graph.hpp
rename to libs/routing/index_graph.hpp
diff --git a/routing/index_graph_loader.cpp b/libs/routing/index_graph_loader.cpp
similarity index 100%
rename from routing/index_graph_loader.cpp
rename to libs/routing/index_graph_loader.cpp
diff --git a/routing/index_graph_loader.hpp b/libs/routing/index_graph_loader.hpp
similarity index 100%
rename from routing/index_graph_loader.hpp
rename to libs/routing/index_graph_loader.hpp
diff --git a/routing/index_graph_serialization.cpp b/libs/routing/index_graph_serialization.cpp
similarity index 100%
rename from routing/index_graph_serialization.cpp
rename to libs/routing/index_graph_serialization.cpp
diff --git a/routing/index_graph_serialization.hpp b/libs/routing/index_graph_serialization.hpp
similarity index 100%
rename from routing/index_graph_serialization.hpp
rename to libs/routing/index_graph_serialization.hpp
diff --git a/routing/index_graph_starter.cpp b/libs/routing/index_graph_starter.cpp
similarity index 100%
rename from routing/index_graph_starter.cpp
rename to libs/routing/index_graph_starter.cpp
diff --git a/routing/index_graph_starter.hpp b/libs/routing/index_graph_starter.hpp
similarity index 100%
rename from routing/index_graph_starter.hpp
rename to libs/routing/index_graph_starter.hpp
diff --git a/routing/index_graph_starter_joints.hpp b/libs/routing/index_graph_starter_joints.hpp
similarity index 100%
rename from routing/index_graph_starter_joints.hpp
rename to libs/routing/index_graph_starter_joints.hpp
diff --git a/routing/index_road_graph.cpp b/libs/routing/index_road_graph.cpp
similarity index 100%
rename from routing/index_road_graph.cpp
rename to libs/routing/index_road_graph.cpp
diff --git a/routing/index_road_graph.hpp b/libs/routing/index_road_graph.hpp
similarity index 100%
rename from routing/index_road_graph.hpp
rename to libs/routing/index_road_graph.hpp
diff --git a/routing/index_router.cpp b/libs/routing/index_router.cpp
similarity index 100%
rename from routing/index_router.cpp
rename to libs/routing/index_router.cpp
diff --git a/routing/index_router.hpp b/libs/routing/index_router.hpp
similarity index 100%
rename from routing/index_router.hpp
rename to libs/routing/index_router.hpp
diff --git a/routing/joint.cpp b/libs/routing/joint.cpp
similarity index 100%
rename from routing/joint.cpp
rename to libs/routing/joint.cpp
diff --git a/routing/joint.hpp b/libs/routing/joint.hpp
similarity index 100%
rename from routing/joint.hpp
rename to libs/routing/joint.hpp
diff --git a/routing/joint_index.cpp b/libs/routing/joint_index.cpp
similarity index 100%
rename from routing/joint_index.cpp
rename to libs/routing/joint_index.cpp
diff --git a/routing/joint_index.hpp b/libs/routing/joint_index.hpp
similarity index 100%
rename from routing/joint_index.hpp
rename to libs/routing/joint_index.hpp
diff --git a/routing/joint_segment.cpp b/libs/routing/joint_segment.cpp
similarity index 100%
rename from routing/joint_segment.cpp
rename to libs/routing/joint_segment.cpp
diff --git a/routing/joint_segment.hpp b/libs/routing/joint_segment.hpp
similarity index 100%
rename from routing/joint_segment.hpp
rename to libs/routing/joint_segment.hpp
diff --git a/routing/junction_visitor.cpp b/libs/routing/junction_visitor.cpp
similarity index 100%
rename from routing/junction_visitor.cpp
rename to libs/routing/junction_visitor.cpp
diff --git a/routing/junction_visitor.hpp b/libs/routing/junction_visitor.hpp
similarity index 100%
rename from routing/junction_visitor.hpp
rename to libs/routing/junction_visitor.hpp
diff --git a/routing/latlon_with_altitude.cpp b/libs/routing/latlon_with_altitude.cpp
similarity index 100%
rename from routing/latlon_with_altitude.cpp
rename to libs/routing/latlon_with_altitude.cpp
diff --git a/routing/latlon_with_altitude.hpp b/libs/routing/latlon_with_altitude.hpp
similarity index 100%
rename from routing/latlon_with_altitude.hpp
rename to libs/routing/latlon_with_altitude.hpp
diff --git a/routing/leaps_graph.cpp b/libs/routing/leaps_graph.cpp
similarity index 100%
rename from routing/leaps_graph.cpp
rename to libs/routing/leaps_graph.cpp
diff --git a/routing/leaps_graph.hpp b/libs/routing/leaps_graph.hpp
similarity index 100%
rename from routing/leaps_graph.hpp
rename to libs/routing/leaps_graph.hpp
diff --git a/routing/leaps_postprocessor.cpp b/libs/routing/leaps_postprocessor.cpp
similarity index 100%
rename from routing/leaps_postprocessor.cpp
rename to libs/routing/leaps_postprocessor.cpp
diff --git a/routing/leaps_postprocessor.hpp b/libs/routing/leaps_postprocessor.hpp
similarity index 100%
rename from routing/leaps_postprocessor.hpp
rename to libs/routing/leaps_postprocessor.hpp
diff --git a/routing/loaded_path_segment.hpp b/libs/routing/loaded_path_segment.hpp
similarity index 100%
rename from routing/loaded_path_segment.hpp
rename to libs/routing/loaded_path_segment.hpp
diff --git a/routing/maxspeeds.cpp b/libs/routing/maxspeeds.cpp
similarity index 100%
rename from routing/maxspeeds.cpp
rename to libs/routing/maxspeeds.cpp
diff --git a/routing/maxspeeds.hpp b/libs/routing/maxspeeds.hpp
similarity index 100%
rename from routing/maxspeeds.hpp
rename to libs/routing/maxspeeds.hpp
diff --git a/routing/maxspeeds_serialization.cpp b/libs/routing/maxspeeds_serialization.cpp
similarity index 100%
rename from routing/maxspeeds_serialization.cpp
rename to libs/routing/maxspeeds_serialization.cpp
diff --git a/routing/maxspeeds_serialization.hpp b/libs/routing/maxspeeds_serialization.hpp
similarity index 100%
rename from routing/maxspeeds_serialization.hpp
rename to libs/routing/maxspeeds_serialization.hpp
diff --git a/routing/mwm_hierarchy_handler.cpp b/libs/routing/mwm_hierarchy_handler.cpp
similarity index 100%
rename from routing/mwm_hierarchy_handler.cpp
rename to libs/routing/mwm_hierarchy_handler.cpp
diff --git a/routing/mwm_hierarchy_handler.hpp b/libs/routing/mwm_hierarchy_handler.hpp
similarity index 100%
rename from routing/mwm_hierarchy_handler.hpp
rename to libs/routing/mwm_hierarchy_handler.hpp
diff --git a/routing/nearest_edge_finder.cpp b/libs/routing/nearest_edge_finder.cpp
similarity index 100%
rename from routing/nearest_edge_finder.cpp
rename to libs/routing/nearest_edge_finder.cpp
diff --git a/routing/nearest_edge_finder.hpp b/libs/routing/nearest_edge_finder.hpp
similarity index 100%
rename from routing/nearest_edge_finder.hpp
rename to libs/routing/nearest_edge_finder.hpp
diff --git a/routing/opening_hours_serdes.cpp b/libs/routing/opening_hours_serdes.cpp
similarity index 100%
rename from routing/opening_hours_serdes.cpp
rename to libs/routing/opening_hours_serdes.cpp
diff --git a/routing/opening_hours_serdes.hpp b/libs/routing/opening_hours_serdes.hpp
similarity index 100%
rename from routing/opening_hours_serdes.hpp
rename to libs/routing/opening_hours_serdes.hpp
diff --git a/routing/pedestrian_directions.cpp b/libs/routing/pedestrian_directions.cpp
similarity index 100%
rename from routing/pedestrian_directions.cpp
rename to libs/routing/pedestrian_directions.cpp
diff --git a/routing/pedestrian_directions.hpp b/libs/routing/pedestrian_directions.hpp
similarity index 100%
rename from routing/pedestrian_directions.hpp
rename to libs/routing/pedestrian_directions.hpp
diff --git a/routing/position_accumulator.cpp b/libs/routing/position_accumulator.cpp
similarity index 100%
rename from routing/position_accumulator.cpp
rename to libs/routing/position_accumulator.cpp
diff --git a/routing/position_accumulator.hpp b/libs/routing/position_accumulator.hpp
similarity index 100%
rename from routing/position_accumulator.hpp
rename to libs/routing/position_accumulator.hpp
diff --git a/routing/regions_decl.hpp b/libs/routing/regions_decl.hpp
similarity index 100%
rename from routing/regions_decl.hpp
rename to libs/routing/regions_decl.hpp
diff --git a/routing/regions_router.cpp b/libs/routing/regions_router.cpp
similarity index 100%
rename from routing/regions_router.cpp
rename to libs/routing/regions_router.cpp
diff --git a/routing/regions_router.hpp b/libs/routing/regions_router.hpp
similarity index 100%
rename from routing/regions_router.hpp
rename to libs/routing/regions_router.hpp
diff --git a/routing/regions_sparse_graph.cpp b/libs/routing/regions_sparse_graph.cpp
similarity index 100%
rename from routing/regions_sparse_graph.cpp
rename to libs/routing/regions_sparse_graph.cpp
diff --git a/routing/regions_sparse_graph.hpp b/libs/routing/regions_sparse_graph.hpp
similarity index 100%
rename from routing/regions_sparse_graph.hpp
rename to libs/routing/regions_sparse_graph.hpp
diff --git a/routing/restriction_loader.cpp b/libs/routing/restriction_loader.cpp
similarity index 100%
rename from routing/restriction_loader.cpp
rename to libs/routing/restriction_loader.cpp
diff --git a/routing/restriction_loader.hpp b/libs/routing/restriction_loader.hpp
similarity index 100%
rename from routing/restriction_loader.hpp
rename to libs/routing/restriction_loader.hpp
diff --git a/routing/restrictions_serialization.cpp b/libs/routing/restrictions_serialization.cpp
similarity index 100%
rename from routing/restrictions_serialization.cpp
rename to libs/routing/restrictions_serialization.cpp
diff --git a/routing/restrictions_serialization.hpp b/libs/routing/restrictions_serialization.hpp
similarity index 100%
rename from routing/restrictions_serialization.hpp
rename to libs/routing/restrictions_serialization.hpp
diff --git a/routing/road_access.cpp b/libs/routing/road_access.cpp
similarity index 100%
rename from routing/road_access.cpp
rename to libs/routing/road_access.cpp
diff --git a/routing/road_access.hpp b/libs/routing/road_access.hpp
similarity index 100%
rename from routing/road_access.hpp
rename to libs/routing/road_access.hpp
diff --git a/routing/road_access_serialization.cpp b/libs/routing/road_access_serialization.cpp
similarity index 100%
rename from routing/road_access_serialization.cpp
rename to libs/routing/road_access_serialization.cpp
diff --git a/routing/road_access_serialization.hpp b/libs/routing/road_access_serialization.hpp
similarity index 100%
rename from routing/road_access_serialization.hpp
rename to libs/routing/road_access_serialization.hpp
diff --git a/routing/road_graph.cpp b/libs/routing/road_graph.cpp
similarity index 100%
rename from routing/road_graph.cpp
rename to libs/routing/road_graph.cpp
diff --git a/routing/road_graph.hpp b/libs/routing/road_graph.hpp
similarity index 100%
rename from routing/road_graph.hpp
rename to libs/routing/road_graph.hpp
diff --git a/routing/road_index.cpp b/libs/routing/road_index.cpp
similarity index 100%
rename from routing/road_index.cpp
rename to libs/routing/road_index.cpp
diff --git a/routing/road_index.hpp b/libs/routing/road_index.hpp
similarity index 100%
rename from routing/road_index.hpp
rename to libs/routing/road_index.hpp
diff --git a/routing/road_point.hpp b/libs/routing/road_point.hpp
similarity index 100%
rename from routing/road_point.hpp
rename to libs/routing/road_point.hpp
diff --git a/routing/route.cpp b/libs/routing/route.cpp
similarity index 100%
rename from routing/route.cpp
rename to libs/routing/route.cpp
diff --git a/routing/route.hpp b/libs/routing/route.hpp
similarity index 100%
rename from routing/route.hpp
rename to libs/routing/route.hpp
diff --git a/routing/route_point.hpp b/libs/routing/route_point.hpp
similarity index 100%
rename from routing/route_point.hpp
rename to libs/routing/route_point.hpp
diff --git a/routing/route_weight.cpp b/libs/routing/route_weight.cpp
similarity index 100%
rename from routing/route_weight.cpp
rename to libs/routing/route_weight.cpp
diff --git a/routing/route_weight.hpp b/libs/routing/route_weight.hpp
similarity index 100%
rename from routing/route_weight.hpp
rename to libs/routing/route_weight.hpp
diff --git a/routing/router.cpp b/libs/routing/router.cpp
similarity index 100%
rename from routing/router.cpp
rename to libs/routing/router.cpp
diff --git a/routing/router.hpp b/libs/routing/router.hpp
similarity index 100%
rename from routing/router.hpp
rename to libs/routing/router.hpp
diff --git a/routing/router_delegate.cpp b/libs/routing/router_delegate.cpp
similarity index 100%
rename from routing/router_delegate.cpp
rename to libs/routing/router_delegate.cpp
diff --git a/routing/router_delegate.hpp b/libs/routing/router_delegate.hpp
similarity index 100%
rename from routing/router_delegate.hpp
rename to libs/routing/router_delegate.hpp
diff --git a/routing/routes_builder/CMakeLists.txt b/libs/routing/routes_builder/CMakeLists.txt
similarity index 100%
rename from routing/routes_builder/CMakeLists.txt
rename to libs/routing/routes_builder/CMakeLists.txt
diff --git a/routing/routes_builder/data_source_storage.cpp b/libs/routing/routes_builder/data_source_storage.cpp
similarity index 100%
rename from routing/routes_builder/data_source_storage.cpp
rename to libs/routing/routes_builder/data_source_storage.cpp
diff --git a/routing/routes_builder/data_source_storage.hpp b/libs/routing/routes_builder/data_source_storage.hpp
similarity index 100%
rename from routing/routes_builder/data_source_storage.hpp
rename to libs/routing/routes_builder/data_source_storage.hpp
diff --git a/routing/routes_builder/routes_builder.cpp b/libs/routing/routes_builder/routes_builder.cpp
similarity index 100%
rename from routing/routes_builder/routes_builder.cpp
rename to libs/routing/routes_builder/routes_builder.cpp
diff --git a/routing/routes_builder/routes_builder.hpp b/libs/routing/routes_builder/routes_builder.hpp
similarity index 100%
rename from routing/routes_builder/routes_builder.hpp
rename to libs/routing/routes_builder/routes_builder.hpp
diff --git a/routing/routes_builder/routes_builder_tool/CMakeLists.txt b/libs/routing/routes_builder/routes_builder_tool/CMakeLists.txt
similarity index 100%
rename from routing/routes_builder/routes_builder_tool/CMakeLists.txt
rename to libs/routing/routes_builder/routes_builder_tool/CMakeLists.txt
diff --git a/routing/routes_builder/routes_builder_tool/routes_builder_tool.cpp b/libs/routing/routes_builder/routes_builder_tool/routes_builder_tool.cpp
similarity index 100%
rename from routing/routes_builder/routes_builder_tool/routes_builder_tool.cpp
rename to libs/routing/routes_builder/routes_builder_tool/routes_builder_tool.cpp
diff --git a/routing/routes_builder/routes_builder_tool/utils.cpp b/libs/routing/routes_builder/routes_builder_tool/utils.cpp
similarity index 100%
rename from routing/routes_builder/routes_builder_tool/utils.cpp
rename to libs/routing/routes_builder/routes_builder_tool/utils.cpp
diff --git a/routing/routes_builder/routes_builder_tool/utils.hpp b/libs/routing/routes_builder/routes_builder_tool/utils.hpp
similarity index 100%
rename from routing/routes_builder/routes_builder_tool/utils.hpp
rename to libs/routing/routes_builder/routes_builder_tool/utils.hpp
diff --git a/routing/routing_benchmarks/CMakeLists.txt b/libs/routing/routing_benchmarks/CMakeLists.txt
similarity index 100%
rename from routing/routing_benchmarks/CMakeLists.txt
rename to libs/routing/routing_benchmarks/CMakeLists.txt
diff --git a/routing/routing_benchmarks/bicycle_routing_tests.cpp b/libs/routing/routing_benchmarks/bicycle_routing_tests.cpp
similarity index 100%
rename from routing/routing_benchmarks/bicycle_routing_tests.cpp
rename to libs/routing/routing_benchmarks/bicycle_routing_tests.cpp
diff --git a/routing/routing_benchmarks/car_routing_tests.cpp b/libs/routing/routing_benchmarks/car_routing_tests.cpp
similarity index 100%
rename from routing/routing_benchmarks/car_routing_tests.cpp
rename to libs/routing/routing_benchmarks/car_routing_tests.cpp
diff --git a/routing/routing_benchmarks/helpers.cpp b/libs/routing/routing_benchmarks/helpers.cpp
similarity index 100%
rename from routing/routing_benchmarks/helpers.cpp
rename to libs/routing/routing_benchmarks/helpers.cpp
diff --git a/routing/routing_benchmarks/helpers.hpp b/libs/routing/routing_benchmarks/helpers.hpp
similarity index 100%
rename from routing/routing_benchmarks/helpers.hpp
rename to libs/routing/routing_benchmarks/helpers.hpp
diff --git a/routing/routing_benchmarks/pedestrian_routing_tests.cpp b/libs/routing/routing_benchmarks/pedestrian_routing_tests.cpp
similarity index 100%
rename from routing/routing_benchmarks/pedestrian_routing_tests.cpp
rename to libs/routing/routing_benchmarks/pedestrian_routing_tests.cpp
diff --git a/routing/routing_callbacks.hpp b/libs/routing/routing_callbacks.hpp
similarity index 100%
rename from routing/routing_callbacks.hpp
rename to libs/routing/routing_callbacks.hpp
diff --git a/routing/routing_consistency_tests/CMakeLists.txt b/libs/routing/routing_consistency_tests/CMakeLists.txt
similarity index 100%
rename from routing/routing_consistency_tests/CMakeLists.txt
rename to libs/routing/routing_consistency_tests/CMakeLists.txt
diff --git a/routing/routing_consistency_tests/routing_consistency_tests.cpp b/libs/routing/routing_consistency_tests/routing_consistency_tests.cpp
similarity index 100%
rename from routing/routing_consistency_tests/routing_consistency_tests.cpp
rename to libs/routing/routing_consistency_tests/routing_consistency_tests.cpp
diff --git a/routing/routing_exceptions.hpp b/libs/routing/routing_exceptions.hpp
similarity index 100%
rename from routing/routing_exceptions.hpp
rename to libs/routing/routing_exceptions.hpp
diff --git a/routing/routing_helpers.cpp b/libs/routing/routing_helpers.cpp
similarity index 100%
rename from routing/routing_helpers.cpp
rename to libs/routing/routing_helpers.cpp
diff --git a/routing/routing_helpers.hpp b/libs/routing/routing_helpers.hpp
similarity index 100%
rename from routing/routing_helpers.hpp
rename to libs/routing/routing_helpers.hpp
diff --git a/routing/routing_integration_tests/CMakeLists.txt b/libs/routing/routing_integration_tests/CMakeLists.txt
similarity index 100%
rename from routing/routing_integration_tests/CMakeLists.txt
rename to libs/routing/routing_integration_tests/CMakeLists.txt
diff --git a/routing/routing_integration_tests/absent_regions_finder_tests.cpp b/libs/routing/routing_integration_tests/absent_regions_finder_tests.cpp
similarity index 100%
rename from routing/routing_integration_tests/absent_regions_finder_tests.cpp
rename to libs/routing/routing_integration_tests/absent_regions_finder_tests.cpp
diff --git a/routing/routing_integration_tests/archival_reporter_tests.cpp b/libs/routing/routing_integration_tests/archival_reporter_tests.cpp
similarity index 100%
rename from routing/routing_integration_tests/archival_reporter_tests.cpp
rename to libs/routing/routing_integration_tests/archival_reporter_tests.cpp
diff --git a/routing/routing_integration_tests/bicycle_route_test.cpp b/libs/routing/routing_integration_tests/bicycle_route_test.cpp
similarity index 100%
rename from routing/routing_integration_tests/bicycle_route_test.cpp
rename to libs/routing/routing_integration_tests/bicycle_route_test.cpp
diff --git a/routing/routing_integration_tests/bicycle_turn_test.cpp b/libs/routing/routing_integration_tests/bicycle_turn_test.cpp
similarity index 100%
rename from routing/routing_integration_tests/bicycle_turn_test.cpp
rename to libs/routing/routing_integration_tests/bicycle_turn_test.cpp
diff --git a/routing/routing_integration_tests/concurrent_feature_parsing_test.cpp b/libs/routing/routing_integration_tests/concurrent_feature_parsing_test.cpp
similarity index 100%
rename from routing/routing_integration_tests/concurrent_feature_parsing_test.cpp
rename to libs/routing/routing_integration_tests/concurrent_feature_parsing_test.cpp
diff --git a/routing/routing_integration_tests/cross_country_routing_tests.cpp b/libs/routing/routing_integration_tests/cross_country_routing_tests.cpp
similarity index 100%
rename from routing/routing_integration_tests/cross_country_routing_tests.cpp
rename to libs/routing/routing_integration_tests/cross_country_routing_tests.cpp
diff --git a/routing/routing_integration_tests/get_altitude_test.cpp b/libs/routing/routing_integration_tests/get_altitude_test.cpp
similarity index 100%
rename from routing/routing_integration_tests/get_altitude_test.cpp
rename to libs/routing/routing_integration_tests/get_altitude_test.cpp
diff --git a/routing/routing_integration_tests/guides_tests.cpp b/libs/routing/routing_integration_tests/guides_tests.cpp
similarity index 100%
rename from routing/routing_integration_tests/guides_tests.cpp
rename to libs/routing/routing_integration_tests/guides_tests.cpp
diff --git a/routing/routing_integration_tests/pedestrian_route_test.cpp b/libs/routing/routing_integration_tests/pedestrian_route_test.cpp
similarity index 100%
rename from routing/routing_integration_tests/pedestrian_route_test.cpp
rename to libs/routing/routing_integration_tests/pedestrian_route_test.cpp
diff --git a/routing/routing_integration_tests/road_graph_tests.cpp b/libs/routing/routing_integration_tests/road_graph_tests.cpp
similarity index 100%
rename from routing/routing_integration_tests/road_graph_tests.cpp
rename to libs/routing/routing_integration_tests/road_graph_tests.cpp
diff --git a/routing/routing_integration_tests/roundabouts_tests.cpp b/libs/routing/routing_integration_tests/roundabouts_tests.cpp
similarity index 100%
rename from routing/routing_integration_tests/roundabouts_tests.cpp
rename to libs/routing/routing_integration_tests/roundabouts_tests.cpp
diff --git a/routing/routing_integration_tests/route_test.cpp b/libs/routing/routing_integration_tests/route_test.cpp
similarity index 100%
rename from routing/routing_integration_tests/route_test.cpp
rename to libs/routing/routing_integration_tests/route_test.cpp
diff --git a/routing/routing_integration_tests/routing_test_tools.cpp b/libs/routing/routing_integration_tests/routing_test_tools.cpp
similarity index 100%
rename from routing/routing_integration_tests/routing_test_tools.cpp
rename to libs/routing/routing_integration_tests/routing_test_tools.cpp
diff --git a/routing/routing_integration_tests/routing_test_tools.hpp b/libs/routing/routing_integration_tests/routing_test_tools.hpp
similarity index 100%
rename from routing/routing_integration_tests/routing_test_tools.hpp
rename to libs/routing/routing_integration_tests/routing_test_tools.hpp
diff --git a/routing/routing_integration_tests/small_routes.cpp b/libs/routing/routing_integration_tests/small_routes.cpp
similarity index 100%
rename from routing/routing_integration_tests/small_routes.cpp
rename to libs/routing/routing_integration_tests/small_routes.cpp
diff --git a/routing/routing_integration_tests/speed_camera_notifications_tests.cpp b/libs/routing/routing_integration_tests/speed_camera_notifications_tests.cpp
similarity index 100%
rename from routing/routing_integration_tests/speed_camera_notifications_tests.cpp
rename to libs/routing/routing_integration_tests/speed_camera_notifications_tests.cpp
diff --git a/routing/routing_integration_tests/street_names_test.cpp b/libs/routing/routing_integration_tests/street_names_test.cpp
similarity index 100%
rename from routing/routing_integration_tests/street_names_test.cpp
rename to libs/routing/routing_integration_tests/street_names_test.cpp
diff --git a/routing/routing_integration_tests/transit_route_test.cpp b/libs/routing/routing_integration_tests/transit_route_test.cpp
similarity index 100%
rename from routing/routing_integration_tests/transit_route_test.cpp
rename to libs/routing/routing_integration_tests/transit_route_test.cpp
diff --git a/routing/routing_integration_tests/turn_test.cpp b/libs/routing/routing_integration_tests/turn_test.cpp
similarity index 100%
rename from routing/routing_integration_tests/turn_test.cpp
rename to libs/routing/routing_integration_tests/turn_test.cpp
diff --git a/routing/routing_options.cpp b/libs/routing/routing_options.cpp
similarity index 100%
rename from routing/routing_options.cpp
rename to libs/routing/routing_options.cpp
diff --git a/routing/routing_options.hpp b/libs/routing/routing_options.hpp
similarity index 100%
rename from routing/routing_options.hpp
rename to libs/routing/routing_options.hpp
diff --git a/routing/routing_quality/CMakeLists.txt b/libs/routing/routing_quality/CMakeLists.txt
similarity index 100%
rename from routing/routing_quality/CMakeLists.txt
rename to libs/routing/routing_quality/CMakeLists.txt
diff --git a/routing/routing_quality/api/CMakeLists.txt b/libs/routing/routing_quality/api/CMakeLists.txt
similarity index 100%
rename from routing/routing_quality/api/CMakeLists.txt
rename to libs/routing/routing_quality/api/CMakeLists.txt
diff --git a/routing/routing_quality/api/api.cpp b/libs/routing/routing_quality/api/api.cpp
similarity index 100%
rename from routing/routing_quality/api/api.cpp
rename to libs/routing/routing_quality/api/api.cpp
diff --git a/routing/routing_quality/api/api.hpp b/libs/routing/routing_quality/api/api.hpp
similarity index 100%
rename from routing/routing_quality/api/api.hpp
rename to libs/routing/routing_quality/api/api.hpp
diff --git a/routing/routing_quality/api/google/google_api.cpp b/libs/routing/routing_quality/api/google/google_api.cpp
similarity index 100%
rename from routing/routing_quality/api/google/google_api.cpp
rename to libs/routing/routing_quality/api/google/google_api.cpp
diff --git a/routing/routing_quality/api/google/google_api.hpp b/libs/routing/routing_quality/api/google/google_api.hpp
similarity index 100%
rename from routing/routing_quality/api/google/google_api.hpp
rename to libs/routing/routing_quality/api/google/google_api.hpp
diff --git a/routing/routing_quality/api/google/types.cpp b/libs/routing/routing_quality/api/google/types.cpp
similarity index 100%
rename from routing/routing_quality/api/google/types.cpp
rename to libs/routing/routing_quality/api/google/types.cpp
diff --git a/routing/routing_quality/api/google/types.hpp b/libs/routing/routing_quality/api/google/types.hpp
similarity index 100%
rename from routing/routing_quality/api/google/types.hpp
rename to libs/routing/routing_quality/api/google/types.hpp
diff --git a/routing/routing_quality/api/mapbox/mapbox_api.cpp b/libs/routing/routing_quality/api/mapbox/mapbox_api.cpp
similarity index 100%
rename from routing/routing_quality/api/mapbox/mapbox_api.cpp
rename to libs/routing/routing_quality/api/mapbox/mapbox_api.cpp
diff --git a/routing/routing_quality/api/mapbox/mapbox_api.hpp b/libs/routing/routing_quality/api/mapbox/mapbox_api.hpp
similarity index 100%
rename from routing/routing_quality/api/mapbox/mapbox_api.hpp
rename to libs/routing/routing_quality/api/mapbox/mapbox_api.hpp
diff --git a/routing/routing_quality/api/mapbox/types.hpp b/libs/routing/routing_quality/api/mapbox/types.hpp
similarity index 100%
rename from routing/routing_quality/api/mapbox/types.hpp
rename to libs/routing/routing_quality/api/mapbox/types.hpp
diff --git a/routing/routing_quality/routing_quality_tests/CMakeLists.txt b/libs/routing/routing_quality/routing_quality_tests/CMakeLists.txt
similarity index 100%
rename from routing/routing_quality/routing_quality_tests/CMakeLists.txt
rename to libs/routing/routing_quality/routing_quality_tests/CMakeLists.txt
diff --git a/routing/routing_quality/routing_quality_tests/barriers_tests.cpp b/libs/routing/routing_quality/routing_quality_tests/barriers_tests.cpp
similarity index 100%
rename from routing/routing_quality/routing_quality_tests/barriers_tests.cpp
rename to libs/routing/routing_quality/routing_quality_tests/barriers_tests.cpp
diff --git a/routing/routing_quality/routing_quality_tests/bigger_roads_tests.cpp b/libs/routing/routing_quality/routing_quality_tests/bigger_roads_tests.cpp
similarity index 100%
rename from routing/routing_quality/routing_quality_tests/bigger_roads_tests.cpp
rename to libs/routing/routing_quality/routing_quality_tests/bigger_roads_tests.cpp
diff --git a/routing/routing_quality/routing_quality_tests/ferry_tests.cpp b/libs/routing/routing_quality/routing_quality_tests/ferry_tests.cpp
similarity index 100%
rename from routing/routing_quality/routing_quality_tests/ferry_tests.cpp
rename to libs/routing/routing_quality/routing_quality_tests/ferry_tests.cpp
diff --git a/routing/routing_quality/routing_quality_tests/is_built_tests.cpp b/libs/routing/routing_quality/routing_quality_tests/is_built_tests.cpp
similarity index 100%
rename from routing/routing_quality/routing_quality_tests/is_built_tests.cpp
rename to libs/routing/routing_quality/routing_quality_tests/is_built_tests.cpp
diff --git a/routing/routing_quality/routing_quality_tests/leaps_postprocessing_tests.cpp b/libs/routing/routing_quality/routing_quality_tests/leaps_postprocessing_tests.cpp
similarity index 100%
rename from routing/routing_quality/routing_quality_tests/leaps_postprocessing_tests.cpp
rename to libs/routing/routing_quality/routing_quality_tests/leaps_postprocessing_tests.cpp
diff --git a/routing/routing_quality/routing_quality_tests/passby_roads_tests.cpp b/libs/routing/routing_quality/routing_quality_tests/passby_roads_tests.cpp
similarity index 100%
rename from routing/routing_quality/routing_quality_tests/passby_roads_tests.cpp
rename to libs/routing/routing_quality/routing_quality_tests/passby_roads_tests.cpp
diff --git a/routing/routing_quality/routing_quality_tests/waypoints_tests.cpp b/libs/routing/routing_quality/routing_quality_tests/waypoints_tests.cpp
similarity index 100%
rename from routing/routing_quality/routing_quality_tests/waypoints_tests.cpp
rename to libs/routing/routing_quality/routing_quality_tests/waypoints_tests.cpp
diff --git a/routing/routing_quality/routing_quality_tool/CMakeLists.txt b/libs/routing/routing_quality/routing_quality_tool/CMakeLists.txt
similarity index 100%
rename from routing/routing_quality/routing_quality_tool/CMakeLists.txt
rename to libs/routing/routing_quality/routing_quality_tool/CMakeLists.txt
diff --git a/routing/routing_quality/routing_quality_tool/benchmark_results.cpp b/libs/routing/routing_quality/routing_quality_tool/benchmark_results.cpp
similarity index 100%
rename from routing/routing_quality/routing_quality_tool/benchmark_results.cpp
rename to libs/routing/routing_quality/routing_quality_tool/benchmark_results.cpp
diff --git a/routing/routing_quality/routing_quality_tool/benchmark_results.hpp b/libs/routing/routing_quality/routing_quality_tool/benchmark_results.hpp
similarity index 100%
rename from routing/routing_quality/routing_quality_tool/benchmark_results.hpp
rename to libs/routing/routing_quality/routing_quality_tool/benchmark_results.hpp
diff --git a/routing/routing_quality/routing_quality_tool/benchmark_stat.cpp b/libs/routing/routing_quality/routing_quality_tool/benchmark_stat.cpp
similarity index 100%
rename from routing/routing_quality/routing_quality_tool/benchmark_stat.cpp
rename to libs/routing/routing_quality/routing_quality_tool/benchmark_stat.cpp
diff --git a/routing/routing_quality/routing_quality_tool/benchmark_stat.hpp b/libs/routing/routing_quality/routing_quality_tool/benchmark_stat.hpp
similarity index 100%
rename from routing/routing_quality/routing_quality_tool/benchmark_stat.hpp
rename to libs/routing/routing_quality/routing_quality_tool/benchmark_stat.hpp
diff --git a/routing/routing_quality/routing_quality_tool/error_type_counter.cpp b/libs/routing/routing_quality/routing_quality_tool/error_type_counter.cpp
similarity index 100%
rename from routing/routing_quality/routing_quality_tool/error_type_counter.cpp
rename to libs/routing/routing_quality/routing_quality_tool/error_type_counter.cpp
diff --git a/routing/routing_quality/routing_quality_tool/error_type_counter.hpp b/libs/routing/routing_quality/routing_quality_tool/error_type_counter.hpp
similarity index 100%
rename from routing/routing_quality/routing_quality_tool/error_type_counter.hpp
rename to libs/routing/routing_quality/routing_quality_tool/error_type_counter.hpp
diff --git a/routing/routing_quality/routing_quality_tool/routing_quality_tool.cpp b/libs/routing/routing_quality/routing_quality_tool/routing_quality_tool.cpp
similarity index 100%
rename from routing/routing_quality/routing_quality_tool/routing_quality_tool.cpp
rename to libs/routing/routing_quality/routing_quality_tool/routing_quality_tool.cpp
diff --git a/routing/routing_quality/routing_quality_tool/utils.cpp b/libs/routing/routing_quality/routing_quality_tool/utils.cpp
similarity index 100%
rename from routing/routing_quality/routing_quality_tool/utils.cpp
rename to libs/routing/routing_quality/routing_quality_tool/utils.cpp
diff --git a/routing/routing_quality/routing_quality_tool/utils.hpp b/libs/routing/routing_quality/routing_quality_tool/utils.hpp
similarity index 100%
rename from routing/routing_quality/routing_quality_tool/utils.hpp
rename to libs/routing/routing_quality/routing_quality_tool/utils.hpp
diff --git a/routing/routing_quality/waypoints.cpp b/libs/routing/routing_quality/waypoints.cpp
similarity index 100%
rename from routing/routing_quality/waypoints.cpp
rename to libs/routing/routing_quality/waypoints.cpp
diff --git a/routing/routing_quality/waypoints.hpp b/libs/routing/routing_quality/waypoints.hpp
similarity index 100%
rename from routing/routing_quality/waypoints.hpp
rename to libs/routing/routing_quality/waypoints.hpp
diff --git a/routing/routing_result_graph.hpp b/libs/routing/routing_result_graph.hpp
similarity index 100%
rename from routing/routing_result_graph.hpp
rename to libs/routing/routing_result_graph.hpp
diff --git a/routing/routing_session.cpp b/libs/routing/routing_session.cpp
similarity index 100%
rename from routing/routing_session.cpp
rename to libs/routing/routing_session.cpp
diff --git a/routing/routing_session.hpp b/libs/routing/routing_session.hpp
similarity index 100%
rename from routing/routing_session.hpp
rename to libs/routing/routing_session.hpp
diff --git a/routing/routing_settings.cpp b/libs/routing/routing_settings.cpp
similarity index 100%
rename from routing/routing_settings.cpp
rename to libs/routing/routing_settings.cpp
diff --git a/routing/routing_settings.hpp b/libs/routing/routing_settings.hpp
similarity index 100%
rename from routing/routing_settings.hpp
rename to libs/routing/routing_settings.hpp
diff --git a/routing/routing_tests/CMakeLists.txt b/libs/routing/routing_tests/CMakeLists.txt
similarity index 100%
rename from routing/routing_tests/CMakeLists.txt
rename to libs/routing/routing_tests/CMakeLists.txt
diff --git a/routing/routing_tests/applying_traffic_test.cpp b/libs/routing/routing_tests/applying_traffic_test.cpp
similarity index 100%
rename from routing/routing_tests/applying_traffic_test.cpp
rename to libs/routing/routing_tests/applying_traffic_test.cpp
diff --git a/routing/routing_tests/astar_algorithm_test.cpp b/libs/routing/routing_tests/astar_algorithm_test.cpp
similarity index 100%
rename from routing/routing_tests/astar_algorithm_test.cpp
rename to libs/routing/routing_tests/astar_algorithm_test.cpp
diff --git a/routing/routing_tests/astar_progress_test.cpp b/libs/routing/routing_tests/astar_progress_test.cpp
similarity index 100%
rename from routing/routing_tests/astar_progress_test.cpp
rename to libs/routing/routing_tests/astar_progress_test.cpp
diff --git a/routing/routing_tests/astar_router_test.cpp b/libs/routing/routing_tests/astar_router_test.cpp
similarity index 100%
rename from routing/routing_tests/astar_router_test.cpp
rename to libs/routing/routing_tests/astar_router_test.cpp
diff --git a/routing/routing_tests/async_router_test.cpp b/libs/routing/routing_tests/async_router_test.cpp
similarity index 100%
rename from routing/routing_tests/async_router_test.cpp
rename to libs/routing/routing_tests/async_router_test.cpp
diff --git a/routing/routing_tests/bfs_tests.cpp b/libs/routing/routing_tests/bfs_tests.cpp
similarity index 100%
rename from routing/routing_tests/bfs_tests.cpp
rename to libs/routing/routing_tests/bfs_tests.cpp
diff --git a/routing/routing_tests/checkpoint_predictor_test.cpp b/libs/routing/routing_tests/checkpoint_predictor_test.cpp
similarity index 100%
rename from routing/routing_tests/checkpoint_predictor_test.cpp
rename to libs/routing/routing_tests/checkpoint_predictor_test.cpp
diff --git a/routing/routing_tests/coding_test.cpp b/libs/routing/routing_tests/coding_test.cpp
similarity index 100%
rename from routing/routing_tests/coding_test.cpp
rename to libs/routing/routing_tests/coding_test.cpp
diff --git a/routing/routing_tests/cross_border_graph_tests.cpp b/libs/routing/routing_tests/cross_border_graph_tests.cpp
similarity index 100%
rename from routing/routing_tests/cross_border_graph_tests.cpp
rename to libs/routing/routing_tests/cross_border_graph_tests.cpp
diff --git a/routing/routing_tests/cross_mwm_connector_test.cpp b/libs/routing/routing_tests/cross_mwm_connector_test.cpp
similarity index 100%
rename from routing/routing_tests/cross_mwm_connector_test.cpp
rename to libs/routing/routing_tests/cross_mwm_connector_test.cpp
diff --git a/routing/routing_tests/cumulative_restriction_test.cpp b/libs/routing/routing_tests/cumulative_restriction_test.cpp
similarity index 100%
rename from routing/routing_tests/cumulative_restriction_test.cpp
rename to libs/routing/routing_tests/cumulative_restriction_test.cpp
diff --git a/routing/routing_tests/edge_estimator_tests.cpp b/libs/routing/routing_tests/edge_estimator_tests.cpp
similarity index 100%
rename from routing/routing_tests/edge_estimator_tests.cpp
rename to libs/routing/routing_tests/edge_estimator_tests.cpp
diff --git a/routing/routing_tests/fake_graph_test.cpp b/libs/routing/routing_tests/fake_graph_test.cpp
similarity index 100%
rename from routing/routing_tests/fake_graph_test.cpp
rename to libs/routing/routing_tests/fake_graph_test.cpp
diff --git a/routing/routing_tests/followed_polyline_test.cpp b/libs/routing/routing_tests/followed_polyline_test.cpp
similarity index 100%
rename from routing/routing_tests/followed_polyline_test.cpp
rename to libs/routing/routing_tests/followed_polyline_test.cpp
diff --git a/routing/routing_tests/guides_tests.cpp b/libs/routing/routing_tests/guides_tests.cpp
similarity index 100%
rename from routing/routing_tests/guides_tests.cpp
rename to libs/routing/routing_tests/guides_tests.cpp
diff --git a/routing/routing_tests/index_graph_test.cpp b/libs/routing/routing_tests/index_graph_test.cpp
similarity index 100%
rename from routing/routing_tests/index_graph_test.cpp
rename to libs/routing/routing_tests/index_graph_test.cpp
diff --git a/routing/routing_tests/index_graph_tools.cpp b/libs/routing/routing_tests/index_graph_tools.cpp
similarity index 100%
rename from routing/routing_tests/index_graph_tools.cpp
rename to libs/routing/routing_tests/index_graph_tools.cpp
diff --git a/routing/routing_tests/index_graph_tools.hpp b/libs/routing/routing_tests/index_graph_tools.hpp
similarity index 100%
rename from routing/routing_tests/index_graph_tools.hpp
rename to libs/routing/routing_tests/index_graph_tools.hpp
diff --git a/routing/routing_tests/maxspeeds_tests.cpp b/libs/routing/routing_tests/maxspeeds_tests.cpp
similarity index 100%
rename from routing/routing_tests/maxspeeds_tests.cpp
rename to libs/routing/routing_tests/maxspeeds_tests.cpp
diff --git a/routing/routing_tests/mwm_hierarchy_test.cpp b/libs/routing/routing_tests/mwm_hierarchy_test.cpp
similarity index 100%
rename from routing/routing_tests/mwm_hierarchy_test.cpp
rename to libs/routing/routing_tests/mwm_hierarchy_test.cpp
diff --git a/routing/routing_tests/nearest_edge_finder_tests.cpp b/libs/routing/routing_tests/nearest_edge_finder_tests.cpp
similarity index 100%
rename from routing/routing_tests/nearest_edge_finder_tests.cpp
rename to libs/routing/routing_tests/nearest_edge_finder_tests.cpp
diff --git a/routing/routing_tests/opening_hours_serdes_tests.cpp b/libs/routing/routing_tests/opening_hours_serdes_tests.cpp
similarity index 100%
rename from routing/routing_tests/opening_hours_serdes_tests.cpp
rename to libs/routing/routing_tests/opening_hours_serdes_tests.cpp
diff --git a/routing/routing_tests/position_accumulator_tests.cpp b/libs/routing/routing_tests/position_accumulator_tests.cpp
similarity index 100%
rename from routing/routing_tests/position_accumulator_tests.cpp
rename to libs/routing/routing_tests/position_accumulator_tests.cpp
diff --git a/routing/routing_tests/restriction_test.cpp b/libs/routing/routing_tests/restriction_test.cpp
similarity index 100%
rename from routing/routing_tests/restriction_test.cpp
rename to libs/routing/routing_tests/restriction_test.cpp
diff --git a/routing/routing_tests/road_access_test.cpp b/libs/routing/routing_tests/road_access_test.cpp
similarity index 100%
rename from routing/routing_tests/road_access_test.cpp
rename to libs/routing/routing_tests/road_access_test.cpp
diff --git a/routing/routing_tests/road_graph_builder.cpp b/libs/routing/routing_tests/road_graph_builder.cpp
similarity index 100%
rename from routing/routing_tests/road_graph_builder.cpp
rename to libs/routing/routing_tests/road_graph_builder.cpp
diff --git a/routing/routing_tests/road_graph_builder.hpp b/libs/routing/routing_tests/road_graph_builder.hpp
similarity index 100%
rename from routing/routing_tests/road_graph_builder.hpp
rename to libs/routing/routing_tests/road_graph_builder.hpp
diff --git a/routing/routing_tests/road_graph_nearest_edges_test.cpp b/libs/routing/routing_tests/road_graph_nearest_edges_test.cpp
similarity index 100%
rename from routing/routing_tests/road_graph_nearest_edges_test.cpp
rename to libs/routing/routing_tests/road_graph_nearest_edges_test.cpp
diff --git a/routing/routing_tests/route_tests.cpp b/libs/routing/routing_tests/route_tests.cpp
similarity index 100%
rename from routing/routing_tests/route_tests.cpp
rename to libs/routing/routing_tests/route_tests.cpp
diff --git a/routing/routing_tests/routing_algorithm.cpp b/libs/routing/routing_tests/routing_algorithm.cpp
similarity index 100%
rename from routing/routing_tests/routing_algorithm.cpp
rename to libs/routing/routing_tests/routing_algorithm.cpp
diff --git a/routing/routing_tests/routing_algorithm.hpp b/libs/routing/routing_tests/routing_algorithm.hpp
similarity index 100%
rename from routing/routing_tests/routing_algorithm.hpp
rename to libs/routing/routing_tests/routing_algorithm.hpp
diff --git a/routing/routing_tests/routing_helpers_tests.cpp b/libs/routing/routing_tests/routing_helpers_tests.cpp
similarity index 100%
rename from routing/routing_tests/routing_helpers_tests.cpp
rename to libs/routing/routing_tests/routing_helpers_tests.cpp
diff --git a/routing/routing_tests/routing_options_tests.cpp b/libs/routing/routing_tests/routing_options_tests.cpp
similarity index 100%
rename from routing/routing_tests/routing_options_tests.cpp
rename to libs/routing/routing_tests/routing_options_tests.cpp
diff --git a/routing/routing_tests/routing_session_test.cpp b/libs/routing/routing_tests/routing_session_test.cpp
similarity index 100%
rename from routing/routing_tests/routing_session_test.cpp
rename to libs/routing/routing_tests/routing_session_test.cpp
diff --git a/routing/routing_tests/speed_cameras_tests.cpp b/libs/routing/routing_tests/speed_cameras_tests.cpp
similarity index 100%
rename from routing/routing_tests/speed_cameras_tests.cpp
rename to libs/routing/routing_tests/speed_cameras_tests.cpp
diff --git a/routing/routing_tests/tools.cpp b/libs/routing/routing_tests/tools.cpp
similarity index 100%
rename from routing/routing_tests/tools.cpp
rename to libs/routing/routing_tests/tools.cpp
diff --git a/routing/routing_tests/tools.hpp b/libs/routing/routing_tests/tools.hpp
similarity index 100%
rename from routing/routing_tests/tools.hpp
rename to libs/routing/routing_tests/tools.hpp
diff --git a/routing/routing_tests/turns_generator_test.cpp b/libs/routing/routing_tests/turns_generator_test.cpp
similarity index 100%
rename from routing/routing_tests/turns_generator_test.cpp
rename to libs/routing/routing_tests/turns_generator_test.cpp
diff --git a/routing/routing_tests/turns_sound_test.cpp b/libs/routing/routing_tests/turns_sound_test.cpp
similarity index 100%
rename from routing/routing_tests/turns_sound_test.cpp
rename to libs/routing/routing_tests/turns_sound_test.cpp
diff --git a/routing/routing_tests/turns_tts_text_tests.cpp b/libs/routing/routing_tests/turns_tts_text_tests.cpp
similarity index 100%
rename from routing/routing_tests/turns_tts_text_tests.cpp
rename to libs/routing/routing_tests/turns_tts_text_tests.cpp
diff --git a/routing/routing_tests/uturn_restriction_tests.cpp b/libs/routing/routing_tests/uturn_restriction_tests.cpp
similarity index 100%
rename from routing/routing_tests/uturn_restriction_tests.cpp
rename to libs/routing/routing_tests/uturn_restriction_tests.cpp
diff --git a/routing/routing_tests/world_graph_builder.cpp b/libs/routing/routing_tests/world_graph_builder.cpp
similarity index 100%
rename from routing/routing_tests/world_graph_builder.cpp
rename to libs/routing/routing_tests/world_graph_builder.cpp
diff --git a/routing/routing_tests/world_graph_builder.hpp b/libs/routing/routing_tests/world_graph_builder.hpp
similarity index 100%
rename from routing/routing_tests/world_graph_builder.hpp
rename to libs/routing/routing_tests/world_graph_builder.hpp
diff --git a/routing/ruler_router.cpp b/libs/routing/ruler_router.cpp
similarity index 100%
rename from routing/ruler_router.cpp
rename to libs/routing/ruler_router.cpp
diff --git a/routing/ruler_router.hpp b/libs/routing/ruler_router.hpp
similarity index 100%
rename from routing/ruler_router.hpp
rename to libs/routing/ruler_router.hpp
diff --git a/routing/segment.cpp b/libs/routing/segment.cpp
similarity index 100%
rename from routing/segment.cpp
rename to libs/routing/segment.cpp
diff --git a/routing/segment.hpp b/libs/routing/segment.hpp
similarity index 100%
rename from routing/segment.hpp
rename to libs/routing/segment.hpp
diff --git a/routing/segmented_route.cpp b/libs/routing/segmented_route.cpp
similarity index 100%
rename from routing/segmented_route.cpp
rename to libs/routing/segmented_route.cpp
diff --git a/routing/segmented_route.hpp b/libs/routing/segmented_route.hpp
similarity index 100%
rename from routing/segmented_route.hpp
rename to libs/routing/segmented_route.hpp
diff --git a/routing/single_vehicle_world_graph.cpp b/libs/routing/single_vehicle_world_graph.cpp
similarity index 100%
rename from routing/single_vehicle_world_graph.cpp
rename to libs/routing/single_vehicle_world_graph.cpp
diff --git a/routing/single_vehicle_world_graph.hpp b/libs/routing/single_vehicle_world_graph.hpp
similarity index 100%
rename from routing/single_vehicle_world_graph.hpp
rename to libs/routing/single_vehicle_world_graph.hpp
diff --git a/routing/speed_camera.cpp b/libs/routing/speed_camera.cpp
similarity index 100%
rename from routing/speed_camera.cpp
rename to libs/routing/speed_camera.cpp
diff --git a/routing/speed_camera.hpp b/libs/routing/speed_camera.hpp
similarity index 100%
rename from routing/speed_camera.hpp
rename to libs/routing/speed_camera.hpp
diff --git a/routing/speed_camera_manager.cpp b/libs/routing/speed_camera_manager.cpp
similarity index 100%
rename from routing/speed_camera_manager.cpp
rename to libs/routing/speed_camera_manager.cpp
diff --git a/routing/speed_camera_manager.hpp b/libs/routing/speed_camera_manager.hpp
similarity index 100%
rename from routing/speed_camera_manager.hpp
rename to libs/routing/speed_camera_manager.hpp
diff --git a/routing/speed_camera_prohibition.cpp b/libs/routing/speed_camera_prohibition.cpp
similarity index 100%
rename from routing/speed_camera_prohibition.cpp
rename to libs/routing/speed_camera_prohibition.cpp
diff --git a/routing/speed_camera_prohibition.hpp b/libs/routing/speed_camera_prohibition.hpp
similarity index 100%
rename from routing/speed_camera_prohibition.hpp
rename to libs/routing/speed_camera_prohibition.hpp
diff --git a/routing/speed_camera_ser_des.cpp b/libs/routing/speed_camera_ser_des.cpp
similarity index 100%
rename from routing/speed_camera_ser_des.cpp
rename to libs/routing/speed_camera_ser_des.cpp
diff --git a/routing/speed_camera_ser_des.hpp b/libs/routing/speed_camera_ser_des.hpp
similarity index 100%
rename from routing/speed_camera_ser_des.hpp
rename to libs/routing/speed_camera_ser_des.hpp
diff --git a/routing/traffic_stash.cpp b/libs/routing/traffic_stash.cpp
similarity index 100%
rename from routing/traffic_stash.cpp
rename to libs/routing/traffic_stash.cpp
diff --git a/routing/traffic_stash.hpp b/libs/routing/traffic_stash.hpp
similarity index 100%
rename from routing/traffic_stash.hpp
rename to libs/routing/traffic_stash.hpp
diff --git a/routing/transit_graph.cpp b/libs/routing/transit_graph.cpp
similarity index 100%
rename from routing/transit_graph.cpp
rename to libs/routing/transit_graph.cpp
diff --git a/routing/transit_graph.hpp b/libs/routing/transit_graph.hpp
similarity index 100%
rename from routing/transit_graph.hpp
rename to libs/routing/transit_graph.hpp
diff --git a/routing/transit_graph_loader.cpp b/libs/routing/transit_graph_loader.cpp
similarity index 100%
rename from routing/transit_graph_loader.cpp
rename to libs/routing/transit_graph_loader.cpp
diff --git a/routing/transit_graph_loader.hpp b/libs/routing/transit_graph_loader.hpp
similarity index 100%
rename from routing/transit_graph_loader.hpp
rename to libs/routing/transit_graph_loader.hpp
diff --git a/routing/transit_info.hpp b/libs/routing/transit_info.hpp
similarity index 100%
rename from routing/transit_info.hpp
rename to libs/routing/transit_info.hpp
diff --git a/routing/transit_world_graph.cpp b/libs/routing/transit_world_graph.cpp
similarity index 100%
rename from routing/transit_world_graph.cpp
rename to libs/routing/transit_world_graph.cpp
diff --git a/routing/transit_world_graph.hpp b/libs/routing/transit_world_graph.hpp
similarity index 100%
rename from routing/transit_world_graph.hpp
rename to libs/routing/transit_world_graph.hpp
diff --git a/routing/turn_candidate.hpp b/libs/routing/turn_candidate.hpp
similarity index 100%
rename from routing/turn_candidate.hpp
rename to libs/routing/turn_candidate.hpp
diff --git a/routing/turns.cpp b/libs/routing/turns.cpp
similarity index 100%
rename from routing/turns.cpp
rename to libs/routing/turns.cpp
diff --git a/routing/turns.hpp b/libs/routing/turns.hpp
similarity index 100%
rename from routing/turns.hpp
rename to libs/routing/turns.hpp
diff --git a/routing/turns_generator.cpp b/libs/routing/turns_generator.cpp
similarity index 100%
rename from routing/turns_generator.cpp
rename to libs/routing/turns_generator.cpp
diff --git a/routing/turns_generator.hpp b/libs/routing/turns_generator.hpp
similarity index 100%
rename from routing/turns_generator.hpp
rename to libs/routing/turns_generator.hpp
diff --git a/routing/turns_generator_utils.cpp b/libs/routing/turns_generator_utils.cpp
similarity index 100%
rename from routing/turns_generator_utils.cpp
rename to libs/routing/turns_generator_utils.cpp
diff --git a/routing/turns_generator_utils.hpp b/libs/routing/turns_generator_utils.hpp
similarity index 100%
rename from routing/turns_generator_utils.hpp
rename to libs/routing/turns_generator_utils.hpp
diff --git a/routing/turns_notification_manager.cpp b/libs/routing/turns_notification_manager.cpp
similarity index 100%
rename from routing/turns_notification_manager.cpp
rename to libs/routing/turns_notification_manager.cpp
diff --git a/routing/turns_notification_manager.hpp b/libs/routing/turns_notification_manager.hpp
similarity index 100%
rename from routing/turns_notification_manager.hpp
rename to libs/routing/turns_notification_manager.hpp
diff --git a/routing/turns_sound_settings.cpp b/libs/routing/turns_sound_settings.cpp
similarity index 100%
rename from routing/turns_sound_settings.cpp
rename to libs/routing/turns_sound_settings.cpp
diff --git a/routing/turns_sound_settings.hpp b/libs/routing/turns_sound_settings.hpp
similarity index 100%
rename from routing/turns_sound_settings.hpp
rename to libs/routing/turns_sound_settings.hpp
diff --git a/routing/turns_tts_text.cpp b/libs/routing/turns_tts_text.cpp
similarity index 100%
rename from routing/turns_tts_text.cpp
rename to libs/routing/turns_tts_text.cpp
diff --git a/routing/turns_tts_text.hpp b/libs/routing/turns_tts_text.hpp
similarity index 100%
rename from routing/turns_tts_text.hpp
rename to libs/routing/turns_tts_text.hpp
diff --git a/routing/turns_tts_text_i18n.cpp b/libs/routing/turns_tts_text_i18n.cpp
similarity index 100%
rename from routing/turns_tts_text_i18n.cpp
rename to libs/routing/turns_tts_text_i18n.cpp
diff --git a/routing/turns_tts_text_i18n.hpp b/libs/routing/turns_tts_text_i18n.hpp
similarity index 100%
rename from routing/turns_tts_text_i18n.hpp
rename to libs/routing/turns_tts_text_i18n.hpp
diff --git a/routing/vehicle_mask.cpp b/libs/routing/vehicle_mask.cpp
similarity index 100%
rename from routing/vehicle_mask.cpp
rename to libs/routing/vehicle_mask.cpp
diff --git a/routing/vehicle_mask.hpp b/libs/routing/vehicle_mask.hpp
similarity index 100%
rename from routing/vehicle_mask.hpp
rename to libs/routing/vehicle_mask.hpp
diff --git a/routing/world_graph.cpp b/libs/routing/world_graph.cpp
similarity index 100%
rename from routing/world_graph.cpp
rename to libs/routing/world_graph.cpp
diff --git a/routing/world_graph.hpp b/libs/routing/world_graph.hpp
similarity index 100%
rename from routing/world_graph.hpp
rename to libs/routing/world_graph.hpp
diff --git a/routing_common/CMakeLists.txt b/libs/routing_common/CMakeLists.txt
similarity index 100%
rename from routing_common/CMakeLists.txt
rename to libs/routing_common/CMakeLists.txt
diff --git a/routing_common/bicycle_model.cpp b/libs/routing_common/bicycle_model.cpp
similarity index 100%
rename from routing_common/bicycle_model.cpp
rename to libs/routing_common/bicycle_model.cpp
diff --git a/routing_common/bicycle_model.hpp b/libs/routing_common/bicycle_model.hpp
similarity index 100%
rename from routing_common/bicycle_model.hpp
rename to libs/routing_common/bicycle_model.hpp
diff --git a/routing_common/car_model.cpp b/libs/routing_common/car_model.cpp
similarity index 100%
rename from routing_common/car_model.cpp
rename to libs/routing_common/car_model.cpp
diff --git a/routing_common/car_model.hpp b/libs/routing_common/car_model.hpp
similarity index 100%
rename from routing_common/car_model.hpp
rename to libs/routing_common/car_model.hpp
diff --git a/routing_common/car_model_coefs.hpp b/libs/routing_common/car_model_coefs.hpp
similarity index 100%
rename from routing_common/car_model_coefs.hpp
rename to libs/routing_common/car_model_coefs.hpp
diff --git a/routing_common/maxspeed_conversion.cpp b/libs/routing_common/maxspeed_conversion.cpp
similarity index 100%
rename from routing_common/maxspeed_conversion.cpp
rename to libs/routing_common/maxspeed_conversion.cpp
diff --git a/routing_common/maxspeed_conversion.hpp b/libs/routing_common/maxspeed_conversion.hpp
similarity index 100%
rename from routing_common/maxspeed_conversion.hpp
rename to libs/routing_common/maxspeed_conversion.hpp
diff --git a/routing_common/num_mwm_id.hpp b/libs/routing_common/num_mwm_id.hpp
similarity index 100%
rename from routing_common/num_mwm_id.hpp
rename to libs/routing_common/num_mwm_id.hpp
diff --git a/routing_common/pedestrian_model.cpp b/libs/routing_common/pedestrian_model.cpp
similarity index 100%
rename from routing_common/pedestrian_model.cpp
rename to libs/routing_common/pedestrian_model.cpp
diff --git a/routing_common/pedestrian_model.hpp b/libs/routing_common/pedestrian_model.hpp
similarity index 100%
rename from routing_common/pedestrian_model.hpp
rename to libs/routing_common/pedestrian_model.hpp
diff --git a/routing_common/routing_common_tests/CMakeLists.txt b/libs/routing_common/routing_common_tests/CMakeLists.txt
similarity index 100%
rename from routing_common/routing_common_tests/CMakeLists.txt
rename to libs/routing_common/routing_common_tests/CMakeLists.txt
diff --git a/routing_common/routing_common_tests/bicycle_model_test.cpp b/libs/routing_common/routing_common_tests/bicycle_model_test.cpp
similarity index 100%
rename from routing_common/routing_common_tests/bicycle_model_test.cpp
rename to libs/routing_common/routing_common_tests/bicycle_model_test.cpp
diff --git a/routing_common/routing_common_tests/vehicle_model_for_country_test.cpp b/libs/routing_common/routing_common_tests/vehicle_model_for_country_test.cpp
similarity index 100%
rename from routing_common/routing_common_tests/vehicle_model_for_country_test.cpp
rename to libs/routing_common/routing_common_tests/vehicle_model_for_country_test.cpp
diff --git a/routing_common/routing_common_tests/vehicle_model_test.cpp b/libs/routing_common/routing_common_tests/vehicle_model_test.cpp
similarity index 100%
rename from routing_common/routing_common_tests/vehicle_model_test.cpp
rename to libs/routing_common/routing_common_tests/vehicle_model_test.cpp
diff --git a/routing_common/vehicle_model.cpp b/libs/routing_common/vehicle_model.cpp
similarity index 100%
rename from routing_common/vehicle_model.cpp
rename to libs/routing_common/vehicle_model.cpp
diff --git a/routing_common/vehicle_model.hpp b/libs/routing_common/vehicle_model.hpp
similarity index 100%
rename from routing_common/vehicle_model.hpp
rename to libs/routing_common/vehicle_model.hpp
diff --git a/search/CMakeLists.txt b/libs/search/CMakeLists.txt
similarity index 100%
rename from search/CMakeLists.txt
rename to libs/search/CMakeLists.txt
diff --git a/search/algos.hpp b/libs/search/algos.hpp
similarity index 100%
rename from search/algos.hpp
rename to libs/search/algos.hpp
diff --git a/search/approximate_string_match.cpp b/libs/search/approximate_string_match.cpp
similarity index 100%
rename from search/approximate_string_match.cpp
rename to libs/search/approximate_string_match.cpp
diff --git a/search/approximate_string_match.hpp b/libs/search/approximate_string_match.hpp
similarity index 100%
rename from search/approximate_string_match.hpp
rename to libs/search/approximate_string_match.hpp
diff --git a/search/base/inverted_list.hpp b/libs/search/base/inverted_list.hpp
similarity index 100%
rename from search/base/inverted_list.hpp
rename to libs/search/base/inverted_list.hpp
diff --git a/search/base/mem_search_index.hpp b/libs/search/base/mem_search_index.hpp
similarity index 100%
rename from search/base/mem_search_index.hpp
rename to libs/search/base/mem_search_index.hpp
diff --git a/search/base/text_index/dictionary.hpp b/libs/search/base/text_index/dictionary.hpp
similarity index 100%
rename from search/base/text_index/dictionary.hpp
rename to libs/search/base/text_index/dictionary.hpp
diff --git a/search/base/text_index/header.cpp b/libs/search/base/text_index/header.cpp
similarity index 100%
rename from search/base/text_index/header.cpp
rename to libs/search/base/text_index/header.cpp
diff --git a/search/base/text_index/header.hpp b/libs/search/base/text_index/header.hpp
similarity index 100%
rename from search/base/text_index/header.hpp
rename to libs/search/base/text_index/header.hpp
diff --git a/search/base/text_index/mem.cpp b/libs/search/base/text_index/mem.cpp
similarity index 100%
rename from search/base/text_index/mem.cpp
rename to libs/search/base/text_index/mem.cpp
diff --git a/search/base/text_index/mem.hpp b/libs/search/base/text_index/mem.hpp
similarity index 100%
rename from search/base/text_index/mem.hpp
rename to libs/search/base/text_index/mem.hpp
diff --git a/search/base/text_index/merger.cpp b/libs/search/base/text_index/merger.cpp
similarity index 100%
rename from search/base/text_index/merger.cpp
rename to libs/search/base/text_index/merger.cpp
diff --git a/search/base/text_index/merger.hpp b/libs/search/base/text_index/merger.hpp
similarity index 100%
rename from search/base/text_index/merger.hpp
rename to libs/search/base/text_index/merger.hpp
diff --git a/search/base/text_index/postings.hpp b/libs/search/base/text_index/postings.hpp
similarity index 100%
rename from search/base/text_index/postings.hpp
rename to libs/search/base/text_index/postings.hpp
diff --git a/search/base/text_index/reader.hpp b/libs/search/base/text_index/reader.hpp
similarity index 100%
rename from search/base/text_index/reader.hpp
rename to libs/search/base/text_index/reader.hpp
diff --git a/search/base/text_index/text_index.cpp b/libs/search/base/text_index/text_index.cpp
similarity index 100%
rename from search/base/text_index/text_index.cpp
rename to libs/search/base/text_index/text_index.cpp
diff --git a/search/base/text_index/text_index.hpp b/libs/search/base/text_index/text_index.hpp
similarity index 100%
rename from search/base/text_index/text_index.hpp
rename to libs/search/base/text_index/text_index.hpp
diff --git a/search/base/text_index/utils.hpp b/libs/search/base/text_index/utils.hpp
similarity index 100%
rename from search/base/text_index/utils.hpp
rename to libs/search/base/text_index/utils.hpp
diff --git a/search/bookmarks/data.cpp b/libs/search/bookmarks/data.cpp
similarity index 100%
rename from search/bookmarks/data.cpp
rename to libs/search/bookmarks/data.cpp
diff --git a/search/bookmarks/data.hpp b/libs/search/bookmarks/data.hpp
similarity index 100%
rename from search/bookmarks/data.hpp
rename to libs/search/bookmarks/data.hpp
diff --git a/search/bookmarks/processor.cpp b/libs/search/bookmarks/processor.cpp
similarity index 100%
rename from search/bookmarks/processor.cpp
rename to libs/search/bookmarks/processor.cpp
diff --git a/search/bookmarks/processor.hpp b/libs/search/bookmarks/processor.hpp
similarity index 100%
rename from search/bookmarks/processor.hpp
rename to libs/search/bookmarks/processor.hpp
diff --git a/search/bookmarks/results.hpp b/libs/search/bookmarks/results.hpp
similarity index 100%
rename from search/bookmarks/results.hpp
rename to libs/search/bookmarks/results.hpp
diff --git a/search/bookmarks/types.cpp b/libs/search/bookmarks/types.cpp
similarity index 100%
rename from search/bookmarks/types.cpp
rename to libs/search/bookmarks/types.cpp
diff --git a/search/bookmarks/types.hpp b/libs/search/bookmarks/types.hpp
similarity index 100%
rename from search/bookmarks/types.hpp
rename to libs/search/bookmarks/types.hpp
diff --git a/search/cancel_exception.hpp b/libs/search/cancel_exception.hpp
similarity index 100%
rename from search/cancel_exception.hpp
rename to libs/search/cancel_exception.hpp
diff --git a/search/categories_cache.cpp b/libs/search/categories_cache.cpp
similarity index 100%
rename from search/categories_cache.cpp
rename to libs/search/categories_cache.cpp
diff --git a/search/categories_cache.hpp b/libs/search/categories_cache.hpp
similarity index 100%
rename from search/categories_cache.hpp
rename to libs/search/categories_cache.hpp
diff --git a/search/categories_set.hpp b/libs/search/categories_set.hpp
similarity index 100%
rename from search/categories_set.hpp
rename to libs/search/categories_set.hpp
diff --git a/search/cbv.cpp b/libs/search/cbv.cpp
similarity index 100%
rename from search/cbv.cpp
rename to libs/search/cbv.cpp
diff --git a/search/cbv.hpp b/libs/search/cbv.hpp
similarity index 100%
rename from search/cbv.hpp
rename to libs/search/cbv.hpp
diff --git a/search/cities_boundaries_table.cpp b/libs/search/cities_boundaries_table.cpp
similarity index 100%
rename from search/cities_boundaries_table.cpp
rename to libs/search/cities_boundaries_table.cpp
diff --git a/search/cities_boundaries_table.hpp b/libs/search/cities_boundaries_table.hpp
similarity index 100%
rename from search/cities_boundaries_table.hpp
rename to libs/search/cities_boundaries_table.hpp
diff --git a/search/city_finder.cpp b/libs/search/city_finder.cpp
similarity index 100%
rename from search/city_finder.cpp
rename to libs/search/city_finder.cpp
diff --git a/search/city_finder.hpp b/libs/search/city_finder.hpp
similarity index 100%
rename from search/city_finder.hpp
rename to libs/search/city_finder.hpp
diff --git a/search/common.hpp b/libs/search/common.hpp
similarity index 100%
rename from search/common.hpp
rename to libs/search/common.hpp
diff --git a/search/cuisine_filter.cpp b/libs/search/cuisine_filter.cpp
similarity index 100%
rename from search/cuisine_filter.cpp
rename to libs/search/cuisine_filter.cpp
diff --git a/search/cuisine_filter.hpp b/libs/search/cuisine_filter.hpp
similarity index 100%
rename from search/cuisine_filter.hpp
rename to libs/search/cuisine_filter.hpp
diff --git a/search/displayed_categories.cpp b/libs/search/displayed_categories.cpp
similarity index 100%
rename from search/displayed_categories.cpp
rename to libs/search/displayed_categories.cpp
diff --git a/search/displayed_categories.hpp b/libs/search/displayed_categories.hpp
similarity index 100%
rename from search/displayed_categories.hpp
rename to libs/search/displayed_categories.hpp
diff --git a/search/doc_vec.cpp b/libs/search/doc_vec.cpp
similarity index 100%
rename from search/doc_vec.cpp
rename to libs/search/doc_vec.cpp
diff --git a/search/doc_vec.hpp b/libs/search/doc_vec.hpp
similarity index 100%
rename from search/doc_vec.hpp
rename to libs/search/doc_vec.hpp
diff --git a/search/downloader_search_callback.cpp b/libs/search/downloader_search_callback.cpp
similarity index 100%
rename from search/downloader_search_callback.cpp
rename to libs/search/downloader_search_callback.cpp
diff --git a/search/downloader_search_callback.hpp b/libs/search/downloader_search_callback.hpp
similarity index 100%
rename from search/downloader_search_callback.hpp
rename to libs/search/downloader_search_callback.hpp
diff --git a/search/dummy_rank_table.cpp b/libs/search/dummy_rank_table.cpp
similarity index 100%
rename from search/dummy_rank_table.cpp
rename to libs/search/dummy_rank_table.cpp
diff --git a/search/dummy_rank_table.hpp b/libs/search/dummy_rank_table.hpp
similarity index 100%
rename from search/dummy_rank_table.hpp
rename to libs/search/dummy_rank_table.hpp
diff --git a/search/editor_delegate.cpp b/libs/search/editor_delegate.cpp
similarity index 100%
rename from search/editor_delegate.cpp
rename to libs/search/editor_delegate.cpp
diff --git a/search/editor_delegate.hpp b/libs/search/editor_delegate.hpp
similarity index 100%
rename from search/editor_delegate.hpp
rename to libs/search/editor_delegate.hpp
diff --git a/search/emitter.hpp b/libs/search/emitter.hpp
similarity index 100%
rename from search/emitter.hpp
rename to libs/search/emitter.hpp
diff --git a/search/engine.cpp b/libs/search/engine.cpp
similarity index 100%
rename from search/engine.cpp
rename to libs/search/engine.cpp
diff --git a/search/engine.hpp b/libs/search/engine.hpp
similarity index 100%
rename from search/engine.hpp
rename to libs/search/engine.hpp
diff --git a/search/feature_loader.cpp b/libs/search/feature_loader.cpp
similarity index 100%
rename from search/feature_loader.cpp
rename to libs/search/feature_loader.cpp
diff --git a/search/feature_loader.hpp b/libs/search/feature_loader.hpp
similarity index 100%
rename from search/feature_loader.hpp
rename to libs/search/feature_loader.hpp
diff --git a/search/feature_offset_match.hpp b/libs/search/feature_offset_match.hpp
similarity index 100%
rename from search/feature_offset_match.hpp
rename to libs/search/feature_offset_match.hpp
diff --git a/search/features_filter.cpp b/libs/search/features_filter.cpp
similarity index 100%
rename from search/features_filter.cpp
rename to libs/search/features_filter.cpp
diff --git a/search/features_filter.hpp b/libs/search/features_filter.hpp
similarity index 100%
rename from search/features_filter.hpp
rename to libs/search/features_filter.hpp
diff --git a/search/features_layer.cpp b/libs/search/features_layer.cpp
similarity index 100%
rename from search/features_layer.cpp
rename to libs/search/features_layer.cpp
diff --git a/search/features_layer.hpp b/libs/search/features_layer.hpp
similarity index 100%
rename from search/features_layer.hpp
rename to libs/search/features_layer.hpp
diff --git a/search/features_layer_matcher.cpp b/libs/search/features_layer_matcher.cpp
similarity index 100%
rename from search/features_layer_matcher.cpp
rename to libs/search/features_layer_matcher.cpp
diff --git a/search/features_layer_matcher.hpp b/libs/search/features_layer_matcher.hpp
similarity index 100%
rename from search/features_layer_matcher.hpp
rename to libs/search/features_layer_matcher.hpp
diff --git a/search/features_layer_path_finder.cpp b/libs/search/features_layer_path_finder.cpp
similarity index 100%
rename from search/features_layer_path_finder.cpp
rename to libs/search/features_layer_path_finder.cpp
diff --git a/search/features_layer_path_finder.hpp b/libs/search/features_layer_path_finder.hpp
similarity index 100%
rename from search/features_layer_path_finder.hpp
rename to libs/search/features_layer_path_finder.hpp
diff --git a/search/filtering_params.hpp b/libs/search/filtering_params.hpp
similarity index 100%
rename from search/filtering_params.hpp
rename to libs/search/filtering_params.hpp
diff --git a/search/geocoder.cpp b/libs/search/geocoder.cpp
similarity index 100%
rename from search/geocoder.cpp
rename to libs/search/geocoder.cpp
diff --git a/search/geocoder.hpp b/libs/search/geocoder.hpp
similarity index 100%
rename from search/geocoder.hpp
rename to libs/search/geocoder.hpp
diff --git a/search/geocoder_context.cpp b/libs/search/geocoder_context.cpp
similarity index 100%
rename from search/geocoder_context.cpp
rename to libs/search/geocoder_context.cpp
diff --git a/search/geocoder_context.hpp b/libs/search/geocoder_context.hpp
similarity index 100%
rename from search/geocoder_context.hpp
rename to libs/search/geocoder_context.hpp
diff --git a/search/geocoder_locality.cpp b/libs/search/geocoder_locality.cpp
similarity index 100%
rename from search/geocoder_locality.cpp
rename to libs/search/geocoder_locality.cpp
diff --git a/search/geocoder_locality.hpp b/libs/search/geocoder_locality.hpp
similarity index 100%
rename from search/geocoder_locality.hpp
rename to libs/search/geocoder_locality.hpp
diff --git a/search/geometry_cache.cpp b/libs/search/geometry_cache.cpp
similarity index 100%
rename from search/geometry_cache.cpp
rename to libs/search/geometry_cache.cpp
diff --git a/search/geometry_cache.hpp b/libs/search/geometry_cache.hpp
similarity index 100%
rename from search/geometry_cache.hpp
rename to libs/search/geometry_cache.hpp
diff --git a/search/geometry_utils.cpp b/libs/search/geometry_utils.cpp
similarity index 100%
rename from search/geometry_utils.cpp
rename to libs/search/geometry_utils.cpp
diff --git a/search/geometry_utils.hpp b/libs/search/geometry_utils.hpp
similarity index 100%
rename from search/geometry_utils.hpp
rename to libs/search/geometry_utils.hpp
diff --git a/search/highlighting.cpp b/libs/search/highlighting.cpp
similarity index 100%
rename from search/highlighting.cpp
rename to libs/search/highlighting.cpp
diff --git a/search/highlighting.hpp b/libs/search/highlighting.hpp
similarity index 100%
rename from search/highlighting.hpp
rename to libs/search/highlighting.hpp
diff --git a/search/house_detector.cpp b/libs/search/house_detector.cpp
similarity index 100%
rename from search/house_detector.cpp
rename to libs/search/house_detector.cpp
diff --git a/search/house_detector.hpp b/libs/search/house_detector.hpp
similarity index 100%
rename from search/house_detector.hpp
rename to libs/search/house_detector.hpp
diff --git a/search/house_numbers_matcher.cpp b/libs/search/house_numbers_matcher.cpp
similarity index 100%
rename from search/house_numbers_matcher.cpp
rename to libs/search/house_numbers_matcher.cpp
diff --git a/search/house_numbers_matcher.hpp b/libs/search/house_numbers_matcher.hpp
similarity index 100%
rename from search/house_numbers_matcher.hpp
rename to libs/search/house_numbers_matcher.hpp
diff --git a/search/house_to_street_table.cpp b/libs/search/house_to_street_table.cpp
similarity index 100%
rename from search/house_to_street_table.cpp
rename to libs/search/house_to_street_table.cpp
diff --git a/search/house_to_street_table.hpp b/libs/search/house_to_street_table.hpp
similarity index 100%
rename from search/house_to_street_table.hpp
rename to libs/search/house_to_street_table.hpp
diff --git a/search/idf_map.cpp b/libs/search/idf_map.cpp
similarity index 100%
rename from search/idf_map.cpp
rename to libs/search/idf_map.cpp
diff --git a/search/idf_map.hpp b/libs/search/idf_map.hpp
similarity index 100%
rename from search/idf_map.hpp
rename to libs/search/idf_map.hpp
diff --git a/search/intermediate_result.cpp b/libs/search/intermediate_result.cpp
similarity index 100%
rename from search/intermediate_result.cpp
rename to libs/search/intermediate_result.cpp
diff --git a/search/intermediate_result.hpp b/libs/search/intermediate_result.hpp
similarity index 100%
rename from search/intermediate_result.hpp
rename to libs/search/intermediate_result.hpp
diff --git a/search/intersection_result.cpp b/libs/search/intersection_result.cpp
similarity index 100%
rename from search/intersection_result.cpp
rename to libs/search/intersection_result.cpp
diff --git a/search/intersection_result.hpp b/libs/search/intersection_result.hpp
similarity index 100%
rename from search/intersection_result.hpp
rename to libs/search/intersection_result.hpp
diff --git a/search/interval_set.hpp b/libs/search/interval_set.hpp
similarity index 100%
rename from search/interval_set.hpp
rename to libs/search/interval_set.hpp
diff --git a/search/keyword_lang_matcher.cpp b/libs/search/keyword_lang_matcher.cpp
similarity index 100%
rename from search/keyword_lang_matcher.cpp
rename to libs/search/keyword_lang_matcher.cpp
diff --git a/search/keyword_lang_matcher.hpp b/libs/search/keyword_lang_matcher.hpp
similarity index 100%
rename from search/keyword_lang_matcher.hpp
rename to libs/search/keyword_lang_matcher.hpp
diff --git a/search/keyword_matcher.cpp b/libs/search/keyword_matcher.cpp
similarity index 100%
rename from search/keyword_matcher.cpp
rename to libs/search/keyword_matcher.cpp
diff --git a/search/keyword_matcher.hpp b/libs/search/keyword_matcher.hpp
similarity index 100%
rename from search/keyword_matcher.hpp
rename to libs/search/keyword_matcher.hpp
diff --git a/search/latlon_match.cpp b/libs/search/latlon_match.cpp
similarity index 100%
rename from search/latlon_match.cpp
rename to libs/search/latlon_match.cpp
diff --git a/search/latlon_match.hpp b/libs/search/latlon_match.hpp
similarity index 100%
rename from search/latlon_match.hpp
rename to libs/search/latlon_match.hpp
diff --git a/search/lazy_centers_table.cpp b/libs/search/lazy_centers_table.cpp
similarity index 100%
rename from search/lazy_centers_table.cpp
rename to libs/search/lazy_centers_table.cpp
diff --git a/search/lazy_centers_table.hpp b/libs/search/lazy_centers_table.hpp
similarity index 100%
rename from search/lazy_centers_table.hpp
rename to libs/search/lazy_centers_table.hpp
diff --git a/search/localities_source.cpp b/libs/search/localities_source.cpp
similarity index 100%
rename from search/localities_source.cpp
rename to libs/search/localities_source.cpp
diff --git a/search/localities_source.hpp b/libs/search/localities_source.hpp
similarity index 100%
rename from search/localities_source.hpp
rename to libs/search/localities_source.hpp
diff --git a/search/locality_finder.cpp b/libs/search/locality_finder.cpp
similarity index 100%
rename from search/locality_finder.cpp
rename to libs/search/locality_finder.cpp
diff --git a/search/locality_finder.hpp b/libs/search/locality_finder.hpp
similarity index 100%
rename from search/locality_finder.hpp
rename to libs/search/locality_finder.hpp
diff --git a/search/locality_scorer.cpp b/libs/search/locality_scorer.cpp
similarity index 100%
rename from search/locality_scorer.cpp
rename to libs/search/locality_scorer.cpp
diff --git a/search/locality_scorer.hpp b/libs/search/locality_scorer.hpp
similarity index 100%
rename from search/locality_scorer.hpp
rename to libs/search/locality_scorer.hpp
diff --git a/search/mode.cpp b/libs/search/mode.cpp
similarity index 100%
rename from search/mode.cpp
rename to libs/search/mode.cpp
diff --git a/search/mode.hpp b/libs/search/mode.hpp
similarity index 100%
rename from search/mode.hpp
rename to libs/search/mode.hpp
diff --git a/search/model.cpp b/libs/search/model.cpp
similarity index 100%
rename from search/model.cpp
rename to libs/search/model.cpp
diff --git a/search/model.hpp b/libs/search/model.hpp
similarity index 100%
rename from search/model.hpp
rename to libs/search/model.hpp
diff --git a/search/mwm_context.cpp b/libs/search/mwm_context.cpp
similarity index 100%
rename from search/mwm_context.cpp
rename to libs/search/mwm_context.cpp
diff --git a/search/mwm_context.hpp b/libs/search/mwm_context.hpp
similarity index 100%
rename from search/mwm_context.hpp
rename to libs/search/mwm_context.hpp
diff --git a/search/nested_rects_cache.cpp b/libs/search/nested_rects_cache.cpp
similarity index 100%
rename from search/nested_rects_cache.cpp
rename to libs/search/nested_rects_cache.cpp
diff --git a/search/nested_rects_cache.hpp b/libs/search/nested_rects_cache.hpp
similarity index 100%
rename from search/nested_rects_cache.hpp
rename to libs/search/nested_rects_cache.hpp
diff --git a/search/point_rect_matcher.hpp b/libs/search/point_rect_matcher.hpp
similarity index 100%
rename from search/point_rect_matcher.hpp
rename to libs/search/point_rect_matcher.hpp
diff --git a/search/postcode_points.cpp b/libs/search/postcode_points.cpp
similarity index 100%
rename from search/postcode_points.cpp
rename to libs/search/postcode_points.cpp
diff --git a/search/postcode_points.hpp b/libs/search/postcode_points.hpp
similarity index 100%
rename from search/postcode_points.hpp
rename to libs/search/postcode_points.hpp
diff --git a/search/pre_ranker.cpp b/libs/search/pre_ranker.cpp
similarity index 100%
rename from search/pre_ranker.cpp
rename to libs/search/pre_ranker.cpp
diff --git a/search/pre_ranker.hpp b/libs/search/pre_ranker.hpp
similarity index 100%
rename from search/pre_ranker.hpp
rename to libs/search/pre_ranker.hpp
diff --git a/search/pre_ranking_info.cpp b/libs/search/pre_ranking_info.cpp
similarity index 100%
rename from search/pre_ranking_info.cpp
rename to libs/search/pre_ranking_info.cpp
diff --git a/search/pre_ranking_info.hpp b/libs/search/pre_ranking_info.hpp
similarity index 100%
rename from search/pre_ranking_info.hpp
rename to libs/search/pre_ranking_info.hpp
diff --git a/search/processor.cpp b/libs/search/processor.cpp
similarity index 100%
rename from search/processor.cpp
rename to libs/search/processor.cpp
diff --git a/search/processor.hpp b/libs/search/processor.hpp
similarity index 100%
rename from search/processor.hpp
rename to libs/search/processor.hpp
diff --git a/search/projection_on_street.cpp b/libs/search/projection_on_street.cpp
similarity index 100%
rename from search/projection_on_street.cpp
rename to libs/search/projection_on_street.cpp
diff --git a/search/projection_on_street.hpp b/libs/search/projection_on_street.hpp
similarity index 100%
rename from search/projection_on_street.hpp
rename to libs/search/projection_on_street.hpp
diff --git a/search/pysearch/CMakeLists.txt b/libs/search/pysearch/CMakeLists.txt
similarity index 100%
rename from search/pysearch/CMakeLists.txt
rename to libs/search/pysearch/CMakeLists.txt
diff --git a/search/pysearch/README.txt b/libs/search/pysearch/README.txt
similarity index 100%
rename from search/pysearch/README.txt
rename to libs/search/pysearch/README.txt
diff --git a/search/pysearch/bindings.cpp b/libs/search/pysearch/bindings.cpp
similarity index 100%
rename from search/pysearch/bindings.cpp
rename to libs/search/pysearch/bindings.cpp
diff --git a/search/pysearch/run_search_engine.py b/libs/search/pysearch/run_search_engine.py
similarity index 100%
rename from search/pysearch/run_search_engine.py
rename to libs/search/pysearch/run_search_engine.py
diff --git a/search/pysearch/run_search_server.py b/libs/search/pysearch/run_search_server.py
similarity index 100%
rename from search/pysearch/run_search_server.py
rename to libs/search/pysearch/run_search_server.py
diff --git a/search/pysearch/setup.py b/libs/search/pysearch/setup.py
similarity index 100%
rename from search/pysearch/setup.py
rename to libs/search/pysearch/setup.py
diff --git a/search/query_params.cpp b/libs/search/query_params.cpp
similarity index 100%
rename from search/query_params.cpp
rename to libs/search/query_params.cpp
diff --git a/search/query_params.hpp b/libs/search/query_params.hpp
similarity index 100%
rename from search/query_params.hpp
rename to libs/search/query_params.hpp
diff --git a/search/query_saver.cpp b/libs/search/query_saver.cpp
similarity index 100%
rename from search/query_saver.cpp
rename to libs/search/query_saver.cpp
diff --git a/search/query_saver.hpp b/libs/search/query_saver.hpp
similarity index 100%
rename from search/query_saver.hpp
rename to libs/search/query_saver.hpp
diff --git a/search/ranker.cpp b/libs/search/ranker.cpp
similarity index 100%
rename from search/ranker.cpp
rename to libs/search/ranker.cpp
diff --git a/search/ranker.hpp b/libs/search/ranker.hpp
similarity index 100%
rename from search/ranker.hpp
rename to libs/search/ranker.hpp
diff --git a/search/ranking_info.cpp b/libs/search/ranking_info.cpp
similarity index 100%
rename from search/ranking_info.cpp
rename to libs/search/ranking_info.cpp
diff --git a/search/ranking_info.hpp b/libs/search/ranking_info.hpp
similarity index 100%
rename from search/ranking_info.hpp
rename to libs/search/ranking_info.hpp
diff --git a/search/ranking_utils.cpp b/libs/search/ranking_utils.cpp
similarity index 100%
rename from search/ranking_utils.cpp
rename to libs/search/ranking_utils.cpp
diff --git a/search/ranking_utils.hpp b/libs/search/ranking_utils.hpp
similarity index 100%
rename from search/ranking_utils.hpp
rename to libs/search/ranking_utils.hpp
diff --git a/search/region_address_getter.cpp b/libs/search/region_address_getter.cpp
similarity index 100%
rename from search/region_address_getter.cpp
rename to libs/search/region_address_getter.cpp
diff --git a/search/region_address_getter.hpp b/libs/search/region_address_getter.hpp
similarity index 100%
rename from search/region_address_getter.hpp
rename to libs/search/region_address_getter.hpp
diff --git a/search/region_info_getter.cpp b/libs/search/region_info_getter.cpp
similarity index 100%
rename from search/region_info_getter.cpp
rename to libs/search/region_info_getter.cpp
diff --git a/search/region_info_getter.hpp b/libs/search/region_info_getter.hpp
similarity index 100%
rename from search/region_info_getter.hpp
rename to libs/search/region_info_getter.hpp
diff --git a/search/result.cpp b/libs/search/result.cpp
similarity index 100%
rename from search/result.cpp
rename to libs/search/result.cpp
diff --git a/search/result.hpp b/libs/search/result.hpp
similarity index 100%
rename from search/result.hpp
rename to libs/search/result.hpp
diff --git a/search/retrieval.cpp b/libs/search/retrieval.cpp
similarity index 100%
rename from search/retrieval.cpp
rename to libs/search/retrieval.cpp
diff --git a/search/retrieval.hpp b/libs/search/retrieval.hpp
similarity index 100%
rename from search/retrieval.hpp
rename to libs/search/retrieval.hpp
diff --git a/search/reverse_geocoder.cpp b/libs/search/reverse_geocoder.cpp
similarity index 100%
rename from search/reverse_geocoder.cpp
rename to libs/search/reverse_geocoder.cpp
diff --git a/search/reverse_geocoder.hpp b/libs/search/reverse_geocoder.hpp
similarity index 100%
rename from search/reverse_geocoder.hpp
rename to libs/search/reverse_geocoder.hpp
diff --git a/search/search_index_header.hpp b/libs/search/search_index_header.hpp
similarity index 100%
rename from search/search_index_header.hpp
rename to libs/search/search_index_header.hpp
diff --git a/search/search_index_values.hpp b/libs/search/search_index_values.hpp
similarity index 100%
rename from search/search_index_values.hpp
rename to libs/search/search_index_values.hpp
diff --git a/search/search_integration_tests/CMakeLists.txt b/libs/search/search_integration_tests/CMakeLists.txt
similarity index 100%
rename from search/search_integration_tests/CMakeLists.txt
rename to libs/search/search_integration_tests/CMakeLists.txt
diff --git a/search/search_integration_tests/downloader_search_test.cpp b/libs/search/search_integration_tests/downloader_search_test.cpp
similarity index 100%
rename from search/search_integration_tests/downloader_search_test.cpp
rename to libs/search/search_integration_tests/downloader_search_test.cpp
diff --git a/search/search_integration_tests/generate_tests.cpp b/libs/search/search_integration_tests/generate_tests.cpp
similarity index 100%
rename from search/search_integration_tests/generate_tests.cpp
rename to libs/search/search_integration_tests/generate_tests.cpp
diff --git a/search/search_integration_tests/postcode_points_tests.cpp b/libs/search/search_integration_tests/postcode_points_tests.cpp
similarity index 100%
rename from search/search_integration_tests/postcode_points_tests.cpp
rename to libs/search/search_integration_tests/postcode_points_tests.cpp
diff --git a/search/search_integration_tests/pre_ranker_test.cpp b/libs/search/search_integration_tests/pre_ranker_test.cpp
similarity index 100%
rename from search/search_integration_tests/pre_ranker_test.cpp
rename to libs/search/search_integration_tests/pre_ranker_test.cpp
diff --git a/search/search_integration_tests/processor_test.cpp b/libs/search/search_integration_tests/processor_test.cpp
similarity index 100%
rename from search/search_integration_tests/processor_test.cpp
rename to libs/search/search_integration_tests/processor_test.cpp
diff --git a/search/search_integration_tests/ranker_test.cpp b/libs/search/search_integration_tests/ranker_test.cpp
similarity index 100%
rename from search/search_integration_tests/ranker_test.cpp
rename to libs/search/search_integration_tests/ranker_test.cpp
diff --git a/search/search_integration_tests/search_edited_features_test.cpp b/libs/search/search_integration_tests/search_edited_features_test.cpp
similarity index 100%
rename from search/search_integration_tests/search_edited_features_test.cpp
rename to libs/search/search_integration_tests/search_edited_features_test.cpp
diff --git a/search/search_integration_tests/smoke_test.cpp b/libs/search/search_integration_tests/smoke_test.cpp
similarity index 100%
rename from search/search_integration_tests/smoke_test.cpp
rename to libs/search/search_integration_tests/smoke_test.cpp
diff --git a/search/search_integration_tests/tracer_tests.cpp b/libs/search/search_integration_tests/tracer_tests.cpp
similarity index 100%
rename from search/search_integration_tests/tracer_tests.cpp
rename to libs/search/search_integration_tests/tracer_tests.cpp
diff --git a/search/search_integration_tests/utils_test.cpp b/libs/search/search_integration_tests/utils_test.cpp
similarity index 100%
rename from search/search_integration_tests/utils_test.cpp
rename to libs/search/search_integration_tests/utils_test.cpp
diff --git a/search/search_params.cpp b/libs/search/search_params.cpp
similarity index 100%
rename from search/search_params.cpp
rename to libs/search/search_params.cpp
diff --git a/search/search_params.hpp b/libs/search/search_params.hpp
similarity index 100%
rename from search/search_params.hpp
rename to libs/search/search_params.hpp
diff --git a/search/search_quality/CMakeLists.txt b/libs/search/search_quality/CMakeLists.txt
similarity index 100%
rename from search/search_quality/CMakeLists.txt
rename to libs/search/search_quality/CMakeLists.txt
diff --git a/search/search_quality/README.txt b/libs/search/search_quality/README.txt
similarity index 100%
rename from search/search_quality/README.txt
rename to libs/search/search_quality/README.txt
diff --git a/search/search_quality/assessment_tool/CMakeLists.txt b/libs/search/search_quality/assessment_tool/CMakeLists.txt
similarity index 100%
rename from search/search_quality/assessment_tool/CMakeLists.txt
rename to libs/search/search_quality/assessment_tool/CMakeLists.txt
diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/Info.plist b/libs/search/search_quality/assessment_tool/Info.plist
similarity index 100%
rename from openlr/openlr_match_quality/openlr_assessment_tool/Info.plist
rename to libs/search/search_quality/assessment_tool/Info.plist
diff --git a/search/search_quality/assessment_tool/assessment_tool.cpp b/libs/search/search_quality/assessment_tool/assessment_tool.cpp
similarity index 100%
rename from search/search_quality/assessment_tool/assessment_tool.cpp
rename to libs/search/search_quality/assessment_tool/assessment_tool.cpp
diff --git a/search/search_quality/assessment_tool/context.cpp b/libs/search/search_quality/assessment_tool/context.cpp
similarity index 100%
rename from search/search_quality/assessment_tool/context.cpp
rename to libs/search/search_quality/assessment_tool/context.cpp
diff --git a/search/search_quality/assessment_tool/context.hpp b/libs/search/search_quality/assessment_tool/context.hpp
similarity index 100%
rename from search/search_quality/assessment_tool/context.hpp
rename to libs/search/search_quality/assessment_tool/context.hpp
diff --git a/search/search_quality/assessment_tool/edits.cpp b/libs/search/search_quality/assessment_tool/edits.cpp
similarity index 100%
rename from search/search_quality/assessment_tool/edits.cpp
rename to libs/search/search_quality/assessment_tool/edits.cpp
diff --git a/search/search_quality/assessment_tool/edits.hpp b/libs/search/search_quality/assessment_tool/edits.hpp
similarity index 100%
rename from search/search_quality/assessment_tool/edits.hpp
rename to libs/search/search_quality/assessment_tool/edits.hpp
diff --git a/search/search_quality/assessment_tool/feature_info_dialog.cpp b/libs/search/search_quality/assessment_tool/feature_info_dialog.cpp
similarity index 100%
rename from search/search_quality/assessment_tool/feature_info_dialog.cpp
rename to libs/search/search_quality/assessment_tool/feature_info_dialog.cpp
diff --git a/search/search_quality/assessment_tool/feature_info_dialog.hpp b/libs/search/search_quality/assessment_tool/feature_info_dialog.hpp
similarity index 100%
rename from search/search_quality/assessment_tool/feature_info_dialog.hpp
rename to libs/search/search_quality/assessment_tool/feature_info_dialog.hpp
diff --git a/search/search_quality/assessment_tool/helpers.cpp b/libs/search/search_quality/assessment_tool/helpers.cpp
similarity index 100%
rename from search/search_quality/assessment_tool/helpers.cpp
rename to libs/search/search_quality/assessment_tool/helpers.cpp
diff --git a/search/search_quality/assessment_tool/helpers.hpp b/libs/search/search_quality/assessment_tool/helpers.hpp
similarity index 100%
rename from search/search_quality/assessment_tool/helpers.hpp
rename to libs/search/search_quality/assessment_tool/helpers.hpp
diff --git a/search/search_quality/assessment_tool/main_model.cpp b/libs/search/search_quality/assessment_tool/main_model.cpp
similarity index 100%
rename from search/search_quality/assessment_tool/main_model.cpp
rename to libs/search/search_quality/assessment_tool/main_model.cpp
diff --git a/search/search_quality/assessment_tool/main_model.hpp b/libs/search/search_quality/assessment_tool/main_model.hpp
similarity index 100%
rename from search/search_quality/assessment_tool/main_model.hpp
rename to libs/search/search_quality/assessment_tool/main_model.hpp
diff --git a/search/search_quality/assessment_tool/main_view.cpp b/libs/search/search_quality/assessment_tool/main_view.cpp
similarity index 100%
rename from search/search_quality/assessment_tool/main_view.cpp
rename to libs/search/search_quality/assessment_tool/main_view.cpp
diff --git a/search/search_quality/assessment_tool/main_view.hpp b/libs/search/search_quality/assessment_tool/main_view.hpp
similarity index 100%
rename from search/search_quality/assessment_tool/main_view.hpp
rename to libs/search/search_quality/assessment_tool/main_view.hpp
diff --git a/search/search_quality/assessment_tool/model.hpp b/libs/search/search_quality/assessment_tool/model.hpp
similarity index 100%
rename from search/search_quality/assessment_tool/model.hpp
rename to libs/search/search_quality/assessment_tool/model.hpp
diff --git a/search/search_quality/assessment_tool/result_view.cpp b/libs/search/search_quality/assessment_tool/result_view.cpp
similarity index 100%
rename from search/search_quality/assessment_tool/result_view.cpp
rename to libs/search/search_quality/assessment_tool/result_view.cpp
diff --git a/search/search_quality/assessment_tool/result_view.hpp b/libs/search/search_quality/assessment_tool/result_view.hpp
similarity index 100%
rename from search/search_quality/assessment_tool/result_view.hpp
rename to libs/search/search_quality/assessment_tool/result_view.hpp
diff --git a/search/search_quality/assessment_tool/results_view.cpp b/libs/search/search_quality/assessment_tool/results_view.cpp
similarity index 100%
rename from search/search_quality/assessment_tool/results_view.cpp
rename to libs/search/search_quality/assessment_tool/results_view.cpp
diff --git a/search/search_quality/assessment_tool/results_view.hpp b/libs/search/search_quality/assessment_tool/results_view.hpp
similarity index 100%
rename from search/search_quality/assessment_tool/results_view.hpp
rename to libs/search/search_quality/assessment_tool/results_view.hpp
diff --git a/search/search_quality/assessment_tool/sample_view.cpp b/libs/search/search_quality/assessment_tool/sample_view.cpp
similarity index 100%
rename from search/search_quality/assessment_tool/sample_view.cpp
rename to libs/search/search_quality/assessment_tool/sample_view.cpp
diff --git a/search/search_quality/assessment_tool/sample_view.hpp b/libs/search/search_quality/assessment_tool/sample_view.hpp
similarity index 100%
rename from search/search_quality/assessment_tool/sample_view.hpp
rename to libs/search/search_quality/assessment_tool/sample_view.hpp
diff --git a/search/search_quality/assessment_tool/samples_view.cpp b/libs/search/search_quality/assessment_tool/samples_view.cpp
similarity index 100%
rename from search/search_quality/assessment_tool/samples_view.cpp
rename to libs/search/search_quality/assessment_tool/samples_view.cpp
diff --git a/search/search_quality/assessment_tool/samples_view.hpp b/libs/search/search_quality/assessment_tool/samples_view.hpp
similarity index 100%
rename from search/search_quality/assessment_tool/samples_view.hpp
rename to libs/search/search_quality/assessment_tool/samples_view.hpp
diff --git a/search/search_quality/assessment_tool/search_request_runner.cpp b/libs/search/search_quality/assessment_tool/search_request_runner.cpp
similarity index 100%
rename from search/search_quality/assessment_tool/search_request_runner.cpp
rename to libs/search/search_quality/assessment_tool/search_request_runner.cpp
diff --git a/search/search_quality/assessment_tool/search_request_runner.hpp b/libs/search/search_quality/assessment_tool/search_request_runner.hpp
similarity index 100%
rename from search/search_quality/assessment_tool/search_request_runner.hpp
rename to libs/search/search_quality/assessment_tool/search_request_runner.hpp
diff --git a/search/search_quality/assessment_tool/view.hpp b/libs/search/search_quality/assessment_tool/view.hpp
similarity index 100%
rename from search/search_quality/assessment_tool/view.hpp
rename to libs/search/search_quality/assessment_tool/view.hpp
diff --git a/search/search_quality/clusterize-tag-values.lisp b/libs/search/search_quality/clusterize-tag-values.lisp
similarity index 100%
rename from search/search_quality/clusterize-tag-values.lisp
rename to libs/search/search_quality/clusterize-tag-values.lisp
diff --git a/search/search_quality/download-maps.sh b/libs/search/search_quality/download-maps.sh
similarity index 100%
rename from search/search_quality/download-maps.sh
rename to libs/search/search_quality/download-maps.sh
diff --git a/search/search_quality/features_collector_tool/CMakeLists.txt b/libs/search/search_quality/features_collector_tool/CMakeLists.txt
similarity index 100%
rename from search/search_quality/features_collector_tool/CMakeLists.txt
rename to libs/search/search_quality/features_collector_tool/CMakeLists.txt
diff --git a/search/search_quality/features_collector_tool/features_collector_tool.cpp b/libs/search/search_quality/features_collector_tool/features_collector_tool.cpp
similarity index 100%
rename from search/search_quality/features_collector_tool/features_collector_tool.cpp
rename to libs/search/search_quality/features_collector_tool/features_collector_tool.cpp
diff --git a/search/search_quality/gen-samples.lisp b/libs/search/search_quality/gen-samples.lisp
similarity index 100%
rename from search/search_quality/gen-samples.lisp
rename to libs/search/search_quality/gen-samples.lisp
diff --git a/search/search_quality/helpers.cpp b/libs/search/search_quality/helpers.cpp
similarity index 100%
rename from search/search_quality/helpers.cpp
rename to libs/search/search_quality/helpers.cpp
diff --git a/search/search_quality/helpers.hpp b/libs/search/search_quality/helpers.hpp
similarity index 100%
rename from search/search_quality/helpers.hpp
rename to libs/search/search_quality/helpers.hpp
diff --git a/search/search_quality/helpers_json.cpp b/libs/search/search_quality/helpers_json.cpp
similarity index 100%
rename from search/search_quality/helpers_json.cpp
rename to libs/search/search_quality/helpers_json.cpp
diff --git a/search/search_quality/helpers_json.hpp b/libs/search/search_quality/helpers_json.hpp
similarity index 100%
rename from search/search_quality/helpers_json.hpp
rename to libs/search/search_quality/helpers_json.hpp
diff --git a/search/search_quality/matcher.cpp b/libs/search/search_quality/matcher.cpp
similarity index 100%
rename from search/search_quality/matcher.cpp
rename to libs/search/search_quality/matcher.cpp
diff --git a/search/search_quality/matcher.hpp b/libs/search/search_quality/matcher.hpp
similarity index 100%
rename from search/search_quality/matcher.hpp
rename to libs/search/search_quality/matcher.hpp
diff --git a/search/search_quality/merge_samples.py b/libs/search/search_quality/merge_samples.py
similarity index 100%
rename from search/search_quality/merge_samples.py
rename to libs/search/search_quality/merge_samples.py
diff --git a/search/search_quality/sample.cpp b/libs/search/search_quality/sample.cpp
similarity index 100%
rename from search/search_quality/sample.cpp
rename to libs/search/search_quality/sample.cpp
diff --git a/search/search_quality/sample.hpp b/libs/search/search_quality/sample.hpp
similarity index 100%
rename from search/search_quality/sample.hpp
rename to libs/search/search_quality/sample.hpp
diff --git a/search/search_quality/samples_generation_tool/CMakeLists.txt b/libs/search/search_quality/samples_generation_tool/CMakeLists.txt
similarity index 100%
rename from search/search_quality/samples_generation_tool/CMakeLists.txt
rename to libs/search/search_quality/samples_generation_tool/CMakeLists.txt
diff --git a/search/search_quality/samples_generation_tool/samples_generation_tool.cpp b/libs/search/search_quality/samples_generation_tool/samples_generation_tool.cpp
similarity index 100%
rename from search/search_quality/samples_generation_tool/samples_generation_tool.cpp
rename to libs/search/search_quality/samples_generation_tool/samples_generation_tool.cpp
diff --git a/search/search_quality/scoring_model.py b/libs/search/search_quality/scoring_model.py
similarity index 100%
rename from search/search_quality/scoring_model.py
rename to libs/search/search_quality/scoring_model.py
diff --git a/search/search_quality/search_quality_tests/CMakeLists.txt b/libs/search/search_quality/search_quality_tests/CMakeLists.txt
similarity index 100%
rename from search/search_quality/search_quality_tests/CMakeLists.txt
rename to libs/search/search_quality/search_quality_tests/CMakeLists.txt
diff --git a/search/search_quality/search_quality_tests/benchmark_tests.cpp b/libs/search/search_quality/search_quality_tests/benchmark_tests.cpp
similarity index 100%
rename from search/search_quality/search_quality_tests/benchmark_tests.cpp
rename to libs/search/search_quality/search_quality_tests/benchmark_tests.cpp
diff --git a/search/search_quality/search_quality_tests/real_mwm_tests.cpp b/libs/search/search_quality/search_quality_tests/real_mwm_tests.cpp
similarity index 100%
rename from search/search_quality/search_quality_tests/real_mwm_tests.cpp
rename to libs/search/search_quality/search_quality_tests/real_mwm_tests.cpp
diff --git a/search/search_quality/search_quality_tests/sample_test.cpp b/libs/search/search_quality/search_quality_tests/sample_test.cpp
similarity index 100%
rename from search/search_quality/search_quality_tests/sample_test.cpp
rename to libs/search/search_quality/search_quality_tests/sample_test.cpp
diff --git a/search/search_quality/search_quality_tool/CMakeLists.txt b/libs/search/search_quality/search_quality_tool/CMakeLists.txt
similarity index 100%
rename from search/search_quality/search_quality_tool/CMakeLists.txt
rename to libs/search/search_quality/search_quality_tool/CMakeLists.txt
diff --git a/search/search_quality/search_quality_tool/queries.txt b/libs/search/search_quality/search_quality_tool/queries.txt
similarity index 100%
rename from search/search_quality/search_quality_tool/queries.txt
rename to libs/search/search_quality/search_quality_tool/queries.txt
diff --git a/search/search_quality/search_quality_tool/search_quality_tool.cpp b/libs/search/search_quality/search_quality_tool/search_quality_tool.cpp
similarity index 100%
rename from search/search_quality/search_quality_tool/search_quality_tool.cpp
rename to libs/search/search_quality/search_quality_tool/search_quality_tool.cpp
diff --git a/search/search_tests/CMakeLists.txt b/libs/search/search_tests/CMakeLists.txt
similarity index 100%
rename from search/search_tests/CMakeLists.txt
rename to libs/search/search_tests/CMakeLists.txt
diff --git a/search/search_tests/algos_tests.cpp b/libs/search/search_tests/algos_tests.cpp
similarity index 100%
rename from search/search_tests/algos_tests.cpp
rename to libs/search/search_tests/algos_tests.cpp
diff --git a/search/search_tests/bookmarks_processor_tests.cpp b/libs/search/search_tests/bookmarks_processor_tests.cpp
similarity index 100%
rename from search/search_tests/bookmarks_processor_tests.cpp
rename to libs/search/search_tests/bookmarks_processor_tests.cpp
diff --git a/search/search_tests/feature_offset_match_tests.cpp b/libs/search/search_tests/feature_offset_match_tests.cpp
similarity index 100%
rename from search/search_tests/feature_offset_match_tests.cpp
rename to libs/search/search_tests/feature_offset_match_tests.cpp
diff --git a/search/search_tests/highlighting_tests.cpp b/libs/search/search_tests/highlighting_tests.cpp
similarity index 100%
rename from search/search_tests/highlighting_tests.cpp
rename to libs/search/search_tests/highlighting_tests.cpp
diff --git a/search/search_tests/house_detector_tests.cpp b/libs/search/search_tests/house_detector_tests.cpp
similarity index 100%
rename from search/search_tests/house_detector_tests.cpp
rename to libs/search/search_tests/house_detector_tests.cpp
diff --git a/search/search_tests/house_numbers_matcher_test.cpp b/libs/search/search_tests/house_numbers_matcher_test.cpp
similarity index 100%
rename from search/search_tests/house_numbers_matcher_test.cpp
rename to libs/search/search_tests/house_numbers_matcher_test.cpp
diff --git a/search/search_tests/interval_set_test.cpp b/libs/search/search_tests/interval_set_test.cpp
similarity index 100%
rename from search/search_tests/interval_set_test.cpp
rename to libs/search/search_tests/interval_set_test.cpp
diff --git a/search/search_tests/keyword_lang_matcher_test.cpp b/libs/search/search_tests/keyword_lang_matcher_test.cpp
similarity index 100%
rename from search/search_tests/keyword_lang_matcher_test.cpp
rename to libs/search/search_tests/keyword_lang_matcher_test.cpp
diff --git a/search/search_tests/keyword_matcher_test.cpp b/libs/search/search_tests/keyword_matcher_test.cpp
similarity index 100%
rename from search/search_tests/keyword_matcher_test.cpp
rename to libs/search/search_tests/keyword_matcher_test.cpp
diff --git a/search/search_tests/latlon_match_test.cpp b/libs/search/search_tests/latlon_match_test.cpp
similarity index 100%
rename from search/search_tests/latlon_match_test.cpp
rename to libs/search/search_tests/latlon_match_test.cpp
diff --git a/search/search_tests/localities_source_tests.cpp b/libs/search/search_tests/localities_source_tests.cpp
similarity index 100%
rename from search/search_tests/localities_source_tests.cpp
rename to libs/search/search_tests/localities_source_tests.cpp
diff --git a/search/search_tests/locality_finder_test.cpp b/libs/search/search_tests/locality_finder_test.cpp
similarity index 100%
rename from search/search_tests/locality_finder_test.cpp
rename to libs/search/search_tests/locality_finder_test.cpp
diff --git a/search/search_tests/locality_scorer_test.cpp b/libs/search/search_tests/locality_scorer_test.cpp
similarity index 100%
rename from search/search_tests/locality_scorer_test.cpp
rename to libs/search/search_tests/locality_scorer_test.cpp
diff --git a/search/search_tests/locality_selector_test.cpp b/libs/search/search_tests/locality_selector_test.cpp
similarity index 100%
rename from search/search_tests/locality_selector_test.cpp
rename to libs/search/search_tests/locality_selector_test.cpp
diff --git a/search/search_tests/mem_search_index_tests.cpp b/libs/search/search_tests/mem_search_index_tests.cpp
similarity index 100%
rename from search/search_tests/mem_search_index_tests.cpp
rename to libs/search/search_tests/mem_search_index_tests.cpp
diff --git a/search/search_tests/point_rect_matcher_tests.cpp b/libs/search/search_tests/point_rect_matcher_tests.cpp
similarity index 100%
rename from search/search_tests/point_rect_matcher_tests.cpp
rename to libs/search/search_tests/point_rect_matcher_tests.cpp
diff --git a/search/search_tests/query_saver_tests.cpp b/libs/search/search_tests/query_saver_tests.cpp
similarity index 100%
rename from search/search_tests/query_saver_tests.cpp
rename to libs/search/search_tests/query_saver_tests.cpp
diff --git a/search/search_tests/ranking_tests.cpp b/libs/search/search_tests/ranking_tests.cpp
similarity index 100%
rename from search/search_tests/ranking_tests.cpp
rename to libs/search/search_tests/ranking_tests.cpp
diff --git a/search/search_tests/region_info_getter_tests.cpp b/libs/search/search_tests/region_info_getter_tests.cpp
similarity index 100%
rename from search/search_tests/region_info_getter_tests.cpp
rename to libs/search/search_tests/region_info_getter_tests.cpp
diff --git a/search/search_tests/results_tests.cpp b/libs/search/search_tests/results_tests.cpp
similarity index 100%
rename from search/search_tests/results_tests.cpp
rename to libs/search/search_tests/results_tests.cpp
diff --git a/search/search_tests/segment_tree_tests.cpp b/libs/search/search_tests/segment_tree_tests.cpp
similarity index 100%
rename from search/search_tests/segment_tree_tests.cpp
rename to libs/search/search_tests/segment_tree_tests.cpp
diff --git a/search/search_tests/string_match_test.cpp b/libs/search/search_tests/string_match_test.cpp
similarity index 100%
rename from search/search_tests/string_match_test.cpp
rename to libs/search/search_tests/string_match_test.cpp
diff --git a/search/search_tests/suggest_tests.cpp b/libs/search/search_tests/suggest_tests.cpp
similarity index 100%
rename from search/search_tests/suggest_tests.cpp
rename to libs/search/search_tests/suggest_tests.cpp
diff --git a/search/search_tests/text_index_tests.cpp b/libs/search/search_tests/text_index_tests.cpp
similarity index 100%
rename from search/search_tests/text_index_tests.cpp
rename to libs/search/search_tests/text_index_tests.cpp
diff --git a/search/search_tests/utm_mgrs_coords_match_test.cpp b/libs/search/search_tests/utm_mgrs_coords_match_test.cpp
similarity index 100%
rename from search/search_tests/utm_mgrs_coords_match_test.cpp
rename to libs/search/search_tests/utm_mgrs_coords_match_test.cpp
diff --git a/search/search_tests_support/CMakeLists.txt b/libs/search/search_tests_support/CMakeLists.txt
similarity index 100%
rename from search/search_tests_support/CMakeLists.txt
rename to libs/search/search_tests_support/CMakeLists.txt
diff --git a/search/search_tests_support/helpers.cpp b/libs/search/search_tests_support/helpers.cpp
similarity index 100%
rename from search/search_tests_support/helpers.cpp
rename to libs/search/search_tests_support/helpers.cpp
diff --git a/search/search_tests_support/helpers.hpp b/libs/search/search_tests_support/helpers.hpp
similarity index 100%
rename from search/search_tests_support/helpers.hpp
rename to libs/search/search_tests_support/helpers.hpp
diff --git a/search/search_tests_support/test_results_matching.cpp b/libs/search/search_tests_support/test_results_matching.cpp
similarity index 100%
rename from search/search_tests_support/test_results_matching.cpp
rename to libs/search/search_tests_support/test_results_matching.cpp
diff --git a/search/search_tests_support/test_results_matching.hpp b/libs/search/search_tests_support/test_results_matching.hpp
similarity index 100%
rename from search/search_tests_support/test_results_matching.hpp
rename to libs/search/search_tests_support/test_results_matching.hpp
diff --git a/search/search_tests_support/test_search_engine.cpp b/libs/search/search_tests_support/test_search_engine.cpp
similarity index 100%
rename from search/search_tests_support/test_search_engine.cpp
rename to libs/search/search_tests_support/test_search_engine.cpp
diff --git a/search/search_tests_support/test_search_engine.hpp b/libs/search/search_tests_support/test_search_engine.hpp
similarity index 100%
rename from search/search_tests_support/test_search_engine.hpp
rename to libs/search/search_tests_support/test_search_engine.hpp
diff --git a/search/search_tests_support/test_search_request.cpp b/libs/search/search_tests_support/test_search_request.cpp
similarity index 100%
rename from search/search_tests_support/test_search_request.cpp
rename to libs/search/search_tests_support/test_search_request.cpp
diff --git a/search/search_tests_support/test_search_request.hpp b/libs/search/search_tests_support/test_search_request.hpp
similarity index 100%
rename from search/search_tests_support/test_search_request.hpp
rename to libs/search/search_tests_support/test_search_request.hpp
diff --git a/search/search_tests_support/test_with_custom_mwms.hpp b/libs/search/search_tests_support/test_with_custom_mwms.hpp
similarity index 100%
rename from search/search_tests_support/test_with_custom_mwms.hpp
rename to libs/search/search_tests_support/test_with_custom_mwms.hpp
diff --git a/search/search_trie.hpp b/libs/search/search_trie.hpp
similarity index 100%
rename from search/search_trie.hpp
rename to libs/search/search_trie.hpp
diff --git a/search/segment_tree.cpp b/libs/search/segment_tree.cpp
similarity index 100%
rename from search/segment_tree.cpp
rename to libs/search/segment_tree.cpp
diff --git a/search/segment_tree.hpp b/libs/search/segment_tree.hpp
similarity index 100%
rename from search/segment_tree.hpp
rename to libs/search/segment_tree.hpp
diff --git a/search/stats_cache.hpp b/libs/search/stats_cache.hpp
similarity index 100%
rename from search/stats_cache.hpp
rename to libs/search/stats_cache.hpp
diff --git a/search/street_vicinity_loader.cpp b/libs/search/street_vicinity_loader.cpp
similarity index 100%
rename from search/street_vicinity_loader.cpp
rename to libs/search/street_vicinity_loader.cpp
diff --git a/search/street_vicinity_loader.hpp b/libs/search/street_vicinity_loader.hpp
similarity index 100%
rename from search/street_vicinity_loader.hpp
rename to libs/search/street_vicinity_loader.hpp
diff --git a/search/streets_matcher.cpp b/libs/search/streets_matcher.cpp
similarity index 100%
rename from search/streets_matcher.cpp
rename to libs/search/streets_matcher.cpp
diff --git a/search/streets_matcher.hpp b/libs/search/streets_matcher.hpp
similarity index 100%
rename from search/streets_matcher.hpp
rename to libs/search/streets_matcher.hpp
diff --git a/search/string_utils.cpp b/libs/search/string_utils.cpp
similarity index 100%
rename from search/string_utils.cpp
rename to libs/search/string_utils.cpp
diff --git a/search/string_utils.hpp b/libs/search/string_utils.hpp
similarity index 100%
rename from search/string_utils.hpp
rename to libs/search/string_utils.hpp
diff --git a/search/suggest.cpp b/libs/search/suggest.cpp
similarity index 100%
rename from search/suggest.cpp
rename to libs/search/suggest.cpp
diff --git a/search/suggest.hpp b/libs/search/suggest.hpp
similarity index 100%
rename from search/suggest.hpp
rename to libs/search/suggest.hpp
diff --git a/search/token_range.hpp b/libs/search/token_range.hpp
similarity index 100%
rename from search/token_range.hpp
rename to libs/search/token_range.hpp
diff --git a/search/token_slice.cpp b/libs/search/token_slice.cpp
similarity index 100%
rename from search/token_slice.cpp
rename to libs/search/token_slice.cpp
diff --git a/search/token_slice.hpp b/libs/search/token_slice.hpp
similarity index 100%
rename from search/token_slice.hpp
rename to libs/search/token_slice.hpp
diff --git a/search/tracer.cpp b/libs/search/tracer.cpp
similarity index 100%
rename from search/tracer.cpp
rename to libs/search/tracer.cpp
diff --git a/search/tracer.hpp b/libs/search/tracer.hpp
similarity index 100%
rename from search/tracer.hpp
rename to libs/search/tracer.hpp
diff --git a/search/types_skipper.cpp b/libs/search/types_skipper.cpp
similarity index 100%
rename from search/types_skipper.cpp
rename to libs/search/types_skipper.cpp
diff --git a/search/types_skipper.hpp b/libs/search/types_skipper.hpp
similarity index 100%
rename from search/types_skipper.hpp
rename to libs/search/types_skipper.hpp
diff --git a/search/utils.cpp b/libs/search/utils.cpp
similarity index 100%
rename from search/utils.cpp
rename to libs/search/utils.cpp
diff --git a/search/utils.hpp b/libs/search/utils.hpp
similarity index 100%
rename from search/utils.hpp
rename to libs/search/utils.hpp
diff --git a/search/utm_mgrs_coords_match.cpp b/libs/search/utm_mgrs_coords_match.cpp
similarity index 100%
rename from search/utm_mgrs_coords_match.cpp
rename to libs/search/utm_mgrs_coords_match.cpp
diff --git a/search/utm_mgrs_coords_match.hpp b/libs/search/utm_mgrs_coords_match.hpp
similarity index 100%
rename from search/utm_mgrs_coords_match.hpp
rename to libs/search/utm_mgrs_coords_match.hpp
diff --git a/shaders/.gitignore b/libs/shaders/.gitignore
similarity index 100%
rename from shaders/.gitignore
rename to libs/shaders/.gitignore
diff --git a/shaders/CMakeLists.txt b/libs/shaders/CMakeLists.txt
similarity index 100%
rename from shaders/CMakeLists.txt
rename to libs/shaders/CMakeLists.txt
diff --git a/shaders/GL/area.vsh.glsl b/libs/shaders/GL/area.vsh.glsl
similarity index 100%
rename from shaders/GL/area.vsh.glsl
rename to libs/shaders/GL/area.vsh.glsl
diff --git a/shaders/GL/area3d.vsh.glsl b/libs/shaders/GL/area3d.vsh.glsl
similarity index 100%
rename from shaders/GL/area3d.vsh.glsl
rename to libs/shaders/GL/area3d.vsh.glsl
diff --git a/shaders/GL/area3d_outline.vsh.glsl b/libs/shaders/GL/area3d_outline.vsh.glsl
similarity index 100%
rename from shaders/GL/area3d_outline.vsh.glsl
rename to libs/shaders/GL/area3d_outline.vsh.glsl
diff --git a/shaders/GL/arrow3d.fsh.glsl b/libs/shaders/GL/arrow3d.fsh.glsl
similarity index 100%
rename from shaders/GL/arrow3d.fsh.glsl
rename to libs/shaders/GL/arrow3d.fsh.glsl
diff --git a/shaders/GL/arrow3d.vsh.glsl b/libs/shaders/GL/arrow3d.vsh.glsl
similarity index 100%
rename from shaders/GL/arrow3d.vsh.glsl
rename to libs/shaders/GL/arrow3d.vsh.glsl
diff --git a/shaders/GL/arrow3d_outline.fsh.glsl b/libs/shaders/GL/arrow3d_outline.fsh.glsl
similarity index 100%
rename from shaders/GL/arrow3d_outline.fsh.glsl
rename to libs/shaders/GL/arrow3d_outline.fsh.glsl
diff --git a/shaders/GL/arrow3d_shadow.fsh.glsl b/libs/shaders/GL/arrow3d_shadow.fsh.glsl
similarity index 100%
rename from shaders/GL/arrow3d_shadow.fsh.glsl
rename to libs/shaders/GL/arrow3d_shadow.fsh.glsl
diff --git a/shaders/GL/arrow3d_shadow.vsh.glsl b/libs/shaders/GL/arrow3d_shadow.vsh.glsl
similarity index 100%
rename from shaders/GL/arrow3d_shadow.vsh.glsl
rename to libs/shaders/GL/arrow3d_shadow.vsh.glsl
diff --git a/shaders/GL/arrow3d_textured.fsh.glsl b/libs/shaders/GL/arrow3d_textured.fsh.glsl
similarity index 100%
rename from shaders/GL/arrow3d_textured.fsh.glsl
rename to libs/shaders/GL/arrow3d_textured.fsh.glsl
diff --git a/shaders/GL/arrow3d_textured.vsh.glsl b/libs/shaders/GL/arrow3d_textured.vsh.glsl
similarity index 100%
rename from shaders/GL/arrow3d_textured.vsh.glsl
rename to libs/shaders/GL/arrow3d_textured.vsh.glsl
diff --git a/shaders/GL/circle.fsh.glsl b/libs/shaders/GL/circle.fsh.glsl
similarity index 100%
rename from shaders/GL/circle.fsh.glsl
rename to libs/shaders/GL/circle.fsh.glsl
diff --git a/shaders/GL/circle.vsh.glsl b/libs/shaders/GL/circle.vsh.glsl
similarity index 100%
rename from shaders/GL/circle.vsh.glsl
rename to libs/shaders/GL/circle.vsh.glsl
diff --git a/shaders/GL/circle_point.fsh.glsl b/libs/shaders/GL/circle_point.fsh.glsl
similarity index 100%
rename from shaders/GL/circle_point.fsh.glsl
rename to libs/shaders/GL/circle_point.fsh.glsl
diff --git a/shaders/GL/circle_point.vsh.glsl b/libs/shaders/GL/circle_point.vsh.glsl
similarity index 100%
rename from shaders/GL/circle_point.vsh.glsl
rename to libs/shaders/GL/circle_point.vsh.glsl
diff --git a/shaders/GL/colored_symbol.fsh.glsl b/libs/shaders/GL/colored_symbol.fsh.glsl
similarity index 100%
rename from shaders/GL/colored_symbol.fsh.glsl
rename to libs/shaders/GL/colored_symbol.fsh.glsl
diff --git a/shaders/GL/colored_symbol.vsh.glsl b/libs/shaders/GL/colored_symbol.vsh.glsl
similarity index 100%
rename from shaders/GL/colored_symbol.vsh.glsl
rename to libs/shaders/GL/colored_symbol.vsh.glsl
diff --git a/shaders/GL/colored_symbol_billboard.vsh.glsl b/libs/shaders/GL/colored_symbol_billboard.vsh.glsl
similarity index 100%
rename from shaders/GL/colored_symbol_billboard.vsh.glsl
rename to libs/shaders/GL/colored_symbol_billboard.vsh.glsl
diff --git a/shaders/GL/dashed_line.fsh.glsl b/libs/shaders/GL/dashed_line.fsh.glsl
similarity index 100%
rename from shaders/GL/dashed_line.fsh.glsl
rename to libs/shaders/GL/dashed_line.fsh.glsl
diff --git a/shaders/GL/dashed_line.vsh.glsl b/libs/shaders/GL/dashed_line.vsh.glsl
similarity index 100%
rename from shaders/GL/dashed_line.vsh.glsl
rename to libs/shaders/GL/dashed_line.vsh.glsl
diff --git a/shaders/GL/debug_rect.fsh.glsl b/libs/shaders/GL/debug_rect.fsh.glsl
similarity index 100%
rename from shaders/GL/debug_rect.fsh.glsl
rename to libs/shaders/GL/debug_rect.fsh.glsl
diff --git a/shaders/GL/debug_rect.vsh.glsl b/libs/shaders/GL/debug_rect.vsh.glsl
similarity index 100%
rename from shaders/GL/debug_rect.vsh.glsl
rename to libs/shaders/GL/debug_rect.vsh.glsl
diff --git a/shaders/GL/hatching_area.fsh.glsl b/libs/shaders/GL/hatching_area.fsh.glsl
similarity index 100%
rename from shaders/GL/hatching_area.fsh.glsl
rename to libs/shaders/GL/hatching_area.fsh.glsl
diff --git a/shaders/GL/hatching_area.vsh.glsl b/libs/shaders/GL/hatching_area.vsh.glsl
similarity index 100%
rename from shaders/GL/hatching_area.vsh.glsl
rename to libs/shaders/GL/hatching_area.vsh.glsl
diff --git a/shaders/GL/imgui.fsh.glsl b/libs/shaders/GL/imgui.fsh.glsl
similarity index 100%
rename from shaders/GL/imgui.fsh.glsl
rename to libs/shaders/GL/imgui.fsh.glsl
diff --git a/shaders/GL/imgui.vsh.glsl b/libs/shaders/GL/imgui.vsh.glsl
similarity index 100%
rename from shaders/GL/imgui.vsh.glsl
rename to libs/shaders/GL/imgui.vsh.glsl
diff --git a/shaders/GL/line.fsh.glsl b/libs/shaders/GL/line.fsh.glsl
similarity index 100%
rename from shaders/GL/line.fsh.glsl
rename to libs/shaders/GL/line.fsh.glsl
diff --git a/shaders/GL/line.vsh.glsl b/libs/shaders/GL/line.vsh.glsl
similarity index 100%
rename from shaders/GL/line.vsh.glsl
rename to libs/shaders/GL/line.vsh.glsl
diff --git a/shaders/GL/masked_texturing.fsh.glsl b/libs/shaders/GL/masked_texturing.fsh.glsl
similarity index 100%
rename from shaders/GL/masked_texturing.fsh.glsl
rename to libs/shaders/GL/masked_texturing.fsh.glsl
diff --git a/shaders/GL/masked_texturing.vsh.glsl b/libs/shaders/GL/masked_texturing.vsh.glsl
similarity index 100%
rename from shaders/GL/masked_texturing.vsh.glsl
rename to libs/shaders/GL/masked_texturing.vsh.glsl
diff --git a/shaders/GL/masked_texturing_billboard.vsh.glsl b/libs/shaders/GL/masked_texturing_billboard.vsh.glsl
similarity index 100%
rename from shaders/GL/masked_texturing_billboard.vsh.glsl
rename to libs/shaders/GL/masked_texturing_billboard.vsh.glsl
diff --git a/shaders/GL/my_position.vsh.glsl b/libs/shaders/GL/my_position.vsh.glsl
similarity index 100%
rename from shaders/GL/my_position.vsh.glsl
rename to libs/shaders/GL/my_position.vsh.glsl
diff --git a/shaders/GL/path_symbol.vsh.glsl b/libs/shaders/GL/path_symbol.vsh.glsl
similarity index 100%
rename from shaders/GL/path_symbol.vsh.glsl
rename to libs/shaders/GL/path_symbol.vsh.glsl
diff --git a/shaders/GL/position_accuracy3d.vsh.glsl b/libs/shaders/GL/position_accuracy3d.vsh.glsl
similarity index 100%
rename from shaders/GL/position_accuracy3d.vsh.glsl
rename to libs/shaders/GL/position_accuracy3d.vsh.glsl
diff --git a/shaders/GL/route.fsh.glsl b/libs/shaders/GL/route.fsh.glsl
similarity index 100%
rename from shaders/GL/route.fsh.glsl
rename to libs/shaders/GL/route.fsh.glsl
diff --git a/shaders/GL/route.vsh.glsl b/libs/shaders/GL/route.vsh.glsl
similarity index 100%
rename from shaders/GL/route.vsh.glsl
rename to libs/shaders/GL/route.vsh.glsl
diff --git a/shaders/GL/route_arrow.fsh.glsl b/libs/shaders/GL/route_arrow.fsh.glsl
similarity index 100%
rename from shaders/GL/route_arrow.fsh.glsl
rename to libs/shaders/GL/route_arrow.fsh.glsl
diff --git a/shaders/GL/route_arrow.vsh.glsl b/libs/shaders/GL/route_arrow.vsh.glsl
similarity index 100%
rename from shaders/GL/route_arrow.vsh.glsl
rename to libs/shaders/GL/route_arrow.vsh.glsl
diff --git a/shaders/GL/route_dash.fsh.glsl b/libs/shaders/GL/route_dash.fsh.glsl
similarity index 100%
rename from shaders/GL/route_dash.fsh.glsl
rename to libs/shaders/GL/route_dash.fsh.glsl
diff --git a/shaders/GL/route_marker.fsh.glsl b/libs/shaders/GL/route_marker.fsh.glsl
similarity index 100%
rename from shaders/GL/route_marker.fsh.glsl
rename to libs/shaders/GL/route_marker.fsh.glsl
diff --git a/shaders/GL/route_marker.vsh.glsl b/libs/shaders/GL/route_marker.vsh.glsl
similarity index 100%
rename from shaders/GL/route_marker.vsh.glsl
rename to libs/shaders/GL/route_marker.vsh.glsl
diff --git a/shaders/GL/ruler.vsh.glsl b/libs/shaders/GL/ruler.vsh.glsl
similarity index 100%
rename from shaders/GL/ruler.vsh.glsl
rename to libs/shaders/GL/ruler.vsh.glsl
diff --git a/shaders/GL/screen_quad.vsh.glsl b/libs/shaders/GL/screen_quad.vsh.glsl
similarity index 100%
rename from shaders/GL/screen_quad.vsh.glsl
rename to libs/shaders/GL/screen_quad.vsh.glsl
diff --git a/shaders/GL/selection_line.fsh.glsl b/libs/shaders/GL/selection_line.fsh.glsl
similarity index 100%
rename from shaders/GL/selection_line.fsh.glsl
rename to libs/shaders/GL/selection_line.fsh.glsl
diff --git a/shaders/GL/selection_line.vsh.glsl b/libs/shaders/GL/selection_line.vsh.glsl
similarity index 100%
rename from shaders/GL/selection_line.vsh.glsl
rename to libs/shaders/GL/selection_line.vsh.glsl
diff --git a/shaders/GL/shader_index.txt b/libs/shaders/GL/shader_index.txt
similarity index 100%
rename from shaders/GL/shader_index.txt
rename to libs/shaders/GL/shader_index.txt
diff --git a/shaders/GL/shaders_lib.glsl b/libs/shaders/GL/shaders_lib.glsl
similarity index 100%
rename from shaders/GL/shaders_lib.glsl
rename to libs/shaders/GL/shaders_lib.glsl
diff --git a/shaders/GL/smaa_blending_weight.fsh.glsl b/libs/shaders/GL/smaa_blending_weight.fsh.glsl
similarity index 100%
rename from shaders/GL/smaa_blending_weight.fsh.glsl
rename to libs/shaders/GL/smaa_blending_weight.fsh.glsl
diff --git a/shaders/GL/smaa_blending_weight.vsh.glsl b/libs/shaders/GL/smaa_blending_weight.vsh.glsl
similarity index 100%
rename from shaders/GL/smaa_blending_weight.vsh.glsl
rename to libs/shaders/GL/smaa_blending_weight.vsh.glsl
diff --git a/shaders/GL/smaa_edges.fsh.glsl b/libs/shaders/GL/smaa_edges.fsh.glsl
similarity index 100%
rename from shaders/GL/smaa_edges.fsh.glsl
rename to libs/shaders/GL/smaa_edges.fsh.glsl
diff --git a/shaders/GL/smaa_edges.vsh.glsl b/libs/shaders/GL/smaa_edges.vsh.glsl
similarity index 100%
rename from shaders/GL/smaa_edges.vsh.glsl
rename to libs/shaders/GL/smaa_edges.vsh.glsl
diff --git a/shaders/GL/smaa_final.fsh.glsl b/libs/shaders/GL/smaa_final.fsh.glsl
similarity index 100%
rename from shaders/GL/smaa_final.fsh.glsl
rename to libs/shaders/GL/smaa_final.fsh.glsl
diff --git a/shaders/GL/smaa_final.vsh.glsl b/libs/shaders/GL/smaa_final.vsh.glsl
similarity index 100%
rename from shaders/GL/smaa_final.vsh.glsl
rename to libs/shaders/GL/smaa_final.vsh.glsl
diff --git a/shaders/GL/solid_color.fsh.glsl b/libs/shaders/GL/solid_color.fsh.glsl
similarity index 100%
rename from shaders/GL/solid_color.fsh.glsl
rename to libs/shaders/GL/solid_color.fsh.glsl
diff --git a/shaders/GL/text.fsh.glsl b/libs/shaders/GL/text.fsh.glsl
similarity index 100%
rename from shaders/GL/text.fsh.glsl
rename to libs/shaders/GL/text.fsh.glsl
diff --git a/shaders/GL/text.vsh.glsl b/libs/shaders/GL/text.vsh.glsl
similarity index 100%
rename from shaders/GL/text.vsh.glsl
rename to libs/shaders/GL/text.vsh.glsl
diff --git a/shaders/GL/text_billboard.vsh.glsl b/libs/shaders/GL/text_billboard.vsh.glsl
similarity index 100%
rename from shaders/GL/text_billboard.vsh.glsl
rename to libs/shaders/GL/text_billboard.vsh.glsl
diff --git a/shaders/GL/text_outlined.vsh.glsl b/libs/shaders/GL/text_outlined.vsh.glsl
similarity index 100%
rename from shaders/GL/text_outlined.vsh.glsl
rename to libs/shaders/GL/text_outlined.vsh.glsl
diff --git a/shaders/GL/text_outlined_billboard.vsh.glsl b/libs/shaders/GL/text_outlined_billboard.vsh.glsl
similarity index 100%
rename from shaders/GL/text_outlined_billboard.vsh.glsl
rename to libs/shaders/GL/text_outlined_billboard.vsh.glsl
diff --git a/shaders/GL/text_outlined_gui.vsh.glsl b/libs/shaders/GL/text_outlined_gui.vsh.glsl
similarity index 100%
rename from shaders/GL/text_outlined_gui.vsh.glsl
rename to libs/shaders/GL/text_outlined_gui.vsh.glsl
diff --git a/shaders/GL/texturing.fsh.glsl b/libs/shaders/GL/texturing.fsh.glsl
similarity index 100%
rename from shaders/GL/texturing.fsh.glsl
rename to libs/shaders/GL/texturing.fsh.glsl
diff --git a/shaders/GL/texturing.vsh.glsl b/libs/shaders/GL/texturing.vsh.glsl
similarity index 100%
rename from shaders/GL/texturing.vsh.glsl
rename to libs/shaders/GL/texturing.vsh.glsl
diff --git a/shaders/GL/texturing3d.fsh.glsl b/libs/shaders/GL/texturing3d.fsh.glsl
similarity index 100%
rename from shaders/GL/texturing3d.fsh.glsl
rename to libs/shaders/GL/texturing3d.fsh.glsl
diff --git a/shaders/GL/texturing_billboard.vsh.glsl b/libs/shaders/GL/texturing_billboard.vsh.glsl
similarity index 100%
rename from shaders/GL/texturing_billboard.vsh.glsl
rename to libs/shaders/GL/texturing_billboard.vsh.glsl
diff --git a/shaders/GL/texturing_gui.vsh.glsl b/libs/shaders/GL/texturing_gui.vsh.glsl
similarity index 100%
rename from shaders/GL/texturing_gui.vsh.glsl
rename to libs/shaders/GL/texturing_gui.vsh.glsl
diff --git a/shaders/GL/traffic.fsh.glsl b/libs/shaders/GL/traffic.fsh.glsl
similarity index 100%
rename from shaders/GL/traffic.fsh.glsl
rename to libs/shaders/GL/traffic.fsh.glsl
diff --git a/shaders/GL/traffic.vsh.glsl b/libs/shaders/GL/traffic.vsh.glsl
similarity index 100%
rename from shaders/GL/traffic.vsh.glsl
rename to libs/shaders/GL/traffic.vsh.glsl
diff --git a/shaders/GL/traffic_circle.fsh.glsl b/libs/shaders/GL/traffic_circle.fsh.glsl
similarity index 100%
rename from shaders/GL/traffic_circle.fsh.glsl
rename to libs/shaders/GL/traffic_circle.fsh.glsl
diff --git a/shaders/GL/traffic_circle.vsh.glsl b/libs/shaders/GL/traffic_circle.vsh.glsl
similarity index 100%
rename from shaders/GL/traffic_circle.vsh.glsl
rename to libs/shaders/GL/traffic_circle.vsh.glsl
diff --git a/shaders/GL/traffic_line.fsh.glsl b/libs/shaders/GL/traffic_line.fsh.glsl
similarity index 100%
rename from shaders/GL/traffic_line.fsh.glsl
rename to libs/shaders/GL/traffic_line.fsh.glsl
diff --git a/shaders/GL/traffic_line.vsh.glsl b/libs/shaders/GL/traffic_line.vsh.glsl
similarity index 100%
rename from shaders/GL/traffic_line.vsh.glsl
rename to libs/shaders/GL/traffic_line.vsh.glsl
diff --git a/shaders/GL/transit.fsh.glsl b/libs/shaders/GL/transit.fsh.glsl
similarity index 100%
rename from shaders/GL/transit.fsh.glsl
rename to libs/shaders/GL/transit.fsh.glsl
diff --git a/shaders/GL/transit.vsh.glsl b/libs/shaders/GL/transit.vsh.glsl
similarity index 100%
rename from shaders/GL/transit.vsh.glsl
rename to libs/shaders/GL/transit.vsh.glsl
diff --git a/shaders/GL/transit_circle.fsh.glsl b/libs/shaders/GL/transit_circle.fsh.glsl
similarity index 100%
rename from shaders/GL/transit_circle.fsh.glsl
rename to libs/shaders/GL/transit_circle.fsh.glsl
diff --git a/shaders/GL/transit_circle.vsh.glsl b/libs/shaders/GL/transit_circle.vsh.glsl
similarity index 100%
rename from shaders/GL/transit_circle.vsh.glsl
rename to libs/shaders/GL/transit_circle.vsh.glsl
diff --git a/shaders/GL/transit_marker.fsh.glsl b/libs/shaders/GL/transit_marker.fsh.glsl
similarity index 100%
rename from shaders/GL/transit_marker.fsh.glsl
rename to libs/shaders/GL/transit_marker.fsh.glsl
diff --git a/shaders/GL/transit_marker.vsh.glsl b/libs/shaders/GL/transit_marker.vsh.glsl
similarity index 100%
rename from shaders/GL/transit_marker.vsh.glsl
rename to libs/shaders/GL/transit_marker.vsh.glsl
diff --git a/shaders/GL/user_mark.fsh.glsl b/libs/shaders/GL/user_mark.fsh.glsl
similarity index 100%
rename from shaders/GL/user_mark.fsh.glsl
rename to libs/shaders/GL/user_mark.fsh.glsl
diff --git a/shaders/GL/user_mark.vsh.glsl b/libs/shaders/GL/user_mark.vsh.glsl
similarity index 100%
rename from shaders/GL/user_mark.vsh.glsl
rename to libs/shaders/GL/user_mark.vsh.glsl
diff --git a/shaders/GL/user_mark_billboard.vsh.glsl b/libs/shaders/GL/user_mark_billboard.vsh.glsl
similarity index 100%
rename from shaders/GL/user_mark_billboard.vsh.glsl
rename to libs/shaders/GL/user_mark_billboard.vsh.glsl
diff --git a/shaders/Metal/arrow3d.metal b/libs/shaders/Metal/arrow3d.metal
similarity index 100%
rename from shaders/Metal/arrow3d.metal
rename to libs/shaders/Metal/arrow3d.metal
diff --git a/shaders/Metal/debug_rect.metal b/libs/shaders/Metal/debug_rect.metal
similarity index 100%
rename from shaders/Metal/debug_rect.metal
rename to libs/shaders/Metal/debug_rect.metal
diff --git a/shaders/Metal/gui.metal b/libs/shaders/Metal/gui.metal
similarity index 100%
rename from shaders/Metal/gui.metal
rename to libs/shaders/Metal/gui.metal
diff --git a/shaders/Metal/imgui.metal b/libs/shaders/Metal/imgui.metal
similarity index 100%
rename from shaders/Metal/imgui.metal
rename to libs/shaders/Metal/imgui.metal
diff --git a/shaders/Metal/map.metal b/libs/shaders/Metal/map.metal
similarity index 100%
rename from shaders/Metal/map.metal
rename to libs/shaders/Metal/map.metal
diff --git a/shaders/Metal/route.metal b/libs/shaders/Metal/route.metal
similarity index 100%
rename from shaders/Metal/route.metal
rename to libs/shaders/Metal/route.metal
diff --git a/shaders/Metal/screen_quad.metal b/libs/shaders/Metal/screen_quad.metal
similarity index 100%
rename from shaders/Metal/screen_quad.metal
rename to libs/shaders/Metal/screen_quad.metal
diff --git a/shaders/Metal/shaders_lib.h b/libs/shaders/Metal/shaders_lib.h
similarity index 100%
rename from shaders/Metal/shaders_lib.h
rename to libs/shaders/Metal/shaders_lib.h
diff --git a/shaders/Metal/shaders_lib.metal b/libs/shaders/Metal/shaders_lib.metal
similarity index 100%
rename from shaders/Metal/shaders_lib.metal
rename to libs/shaders/Metal/shaders_lib.metal
diff --git a/shaders/Metal/shapes.metal b/libs/shaders/Metal/shapes.metal
similarity index 100%
rename from shaders/Metal/shapes.metal
rename to libs/shaders/Metal/shapes.metal
diff --git a/shaders/Metal/smaa.metal b/libs/shaders/Metal/smaa.metal
similarity index 100%
rename from shaders/Metal/smaa.metal
rename to libs/shaders/Metal/smaa.metal
diff --git a/shaders/Metal/system.metal b/libs/shaders/Metal/system.metal
similarity index 100%
rename from shaders/Metal/system.metal
rename to libs/shaders/Metal/system.metal
diff --git a/shaders/Metal/traffic.metal b/libs/shaders/Metal/traffic.metal
similarity index 100%
rename from shaders/Metal/traffic.metal
rename to libs/shaders/Metal/traffic.metal
diff --git a/shaders/Metal/transit.metal b/libs/shaders/Metal/transit.metal
similarity index 100%
rename from shaders/Metal/transit.metal
rename to libs/shaders/Metal/transit.metal
diff --git a/shaders/gl_program_info.hpp b/libs/shaders/gl_program_info.hpp
similarity index 100%
rename from shaders/gl_program_info.hpp
rename to libs/shaders/gl_program_info.hpp
diff --git a/shaders/gl_program_params.cpp b/libs/shaders/gl_program_params.cpp
similarity index 100%
rename from shaders/gl_program_params.cpp
rename to libs/shaders/gl_program_params.cpp
diff --git a/shaders/gl_program_params.hpp b/libs/shaders/gl_program_params.hpp
similarity index 100%
rename from shaders/gl_program_params.hpp
rename to libs/shaders/gl_program_params.hpp
diff --git a/shaders/gl_program_pool.cpp b/libs/shaders/gl_program_pool.cpp
similarity index 100%
rename from shaders/gl_program_pool.cpp
rename to libs/shaders/gl_program_pool.cpp
diff --git a/shaders/gl_program_pool.hpp b/libs/shaders/gl_program_pool.hpp
similarity index 100%
rename from shaders/gl_program_pool.hpp
rename to libs/shaders/gl_program_pool.hpp
diff --git a/shaders/gl_shaders_preprocessor.py b/libs/shaders/gl_shaders_preprocessor.py
similarity index 100%
rename from shaders/gl_shaders_preprocessor.py
rename to libs/shaders/gl_shaders_preprocessor.py
diff --git a/shaders/metal_program_params.hpp b/libs/shaders/metal_program_params.hpp
similarity index 100%
rename from shaders/metal_program_params.hpp
rename to libs/shaders/metal_program_params.hpp
diff --git a/shaders/metal_program_params.mm b/libs/shaders/metal_program_params.mm
similarity index 100%
rename from shaders/metal_program_params.mm
rename to libs/shaders/metal_program_params.mm
diff --git a/shaders/metal_program_pool.hpp b/libs/shaders/metal_program_pool.hpp
similarity index 100%
rename from shaders/metal_program_pool.hpp
rename to libs/shaders/metal_program_pool.hpp
diff --git a/shaders/metal_program_pool.mm b/libs/shaders/metal_program_pool.mm
similarity index 100%
rename from shaders/metal_program_pool.mm
rename to libs/shaders/metal_program_pool.mm
diff --git a/shaders/program_manager.cpp b/libs/shaders/program_manager.cpp
similarity index 100%
rename from shaders/program_manager.cpp
rename to libs/shaders/program_manager.cpp
diff --git a/shaders/program_manager.hpp b/libs/shaders/program_manager.hpp
similarity index 100%
rename from shaders/program_manager.hpp
rename to libs/shaders/program_manager.hpp
diff --git a/shaders/program_manager_metal.mm b/libs/shaders/program_manager_metal.mm
similarity index 100%
rename from shaders/program_manager_metal.mm
rename to libs/shaders/program_manager_metal.mm
diff --git a/shaders/program_params.cpp b/libs/shaders/program_params.cpp
similarity index 100%
rename from shaders/program_params.cpp
rename to libs/shaders/program_params.cpp
diff --git a/shaders/program_params.hpp b/libs/shaders/program_params.hpp
similarity index 100%
rename from shaders/program_params.hpp
rename to libs/shaders/program_params.hpp
diff --git a/shaders/program_pool.hpp b/libs/shaders/program_pool.hpp
similarity index 100%
rename from shaders/program_pool.hpp
rename to libs/shaders/program_pool.hpp
diff --git a/shaders/programs.hpp b/libs/shaders/programs.hpp
similarity index 100%
rename from shaders/programs.hpp
rename to libs/shaders/programs.hpp
diff --git a/shaders/shaders_tests/CMakeLists.txt b/libs/shaders/shaders_tests/CMakeLists.txt
similarity index 100%
rename from shaders/shaders_tests/CMakeLists.txt
rename to libs/shaders/shaders_tests/CMakeLists.txt
diff --git a/shaders/shaders_tests/gl_program_params_tests.cpp b/libs/shaders/shaders_tests/gl_program_params_tests.cpp
similarity index 100%
rename from shaders/shaders_tests/gl_program_params_tests.cpp
rename to libs/shaders/shaders_tests/gl_program_params_tests.cpp
diff --git a/shaders/shaders_tests/gl_shaders_desktop_compile_tests.cpp b/libs/shaders/shaders_tests/gl_shaders_desktop_compile_tests.cpp
similarity index 100%
rename from shaders/shaders_tests/gl_shaders_desktop_compile_tests.cpp
rename to libs/shaders/shaders_tests/gl_shaders_desktop_compile_tests.cpp
diff --git a/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp b/libs/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp
similarity index 100%
rename from shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp
rename to libs/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp
diff --git a/shaders/vulkan_program_params.cpp b/libs/shaders/vulkan_program_params.cpp
similarity index 100%
rename from shaders/vulkan_program_params.cpp
rename to libs/shaders/vulkan_program_params.cpp
diff --git a/shaders/vulkan_program_params.hpp b/libs/shaders/vulkan_program_params.hpp
similarity index 100%
rename from shaders/vulkan_program_params.hpp
rename to libs/shaders/vulkan_program_params.hpp
diff --git a/shaders/vulkan_program_pool.cpp b/libs/shaders/vulkan_program_pool.cpp
similarity index 100%
rename from shaders/vulkan_program_pool.cpp
rename to libs/shaders/vulkan_program_pool.cpp
diff --git a/shaders/vulkan_program_pool.hpp b/libs/shaders/vulkan_program_pool.hpp
similarity index 100%
rename from shaders/vulkan_program_pool.hpp
rename to libs/shaders/vulkan_program_pool.hpp
diff --git a/shaders/vulkan_shaders_preprocessor.py b/libs/shaders/vulkan_shaders_preprocessor.py
similarity index 100%
rename from shaders/vulkan_shaders_preprocessor.py
rename to libs/shaders/vulkan_shaders_preprocessor.py
diff --git a/std/boost_container_hash.hpp b/libs/std/boost_container_hash.hpp
similarity index 100%
rename from std/boost_container_hash.hpp
rename to libs/std/boost_container_hash.hpp
diff --git a/std/boost_geometry.hpp b/libs/std/boost_geometry.hpp
similarity index 100%
rename from std/boost_geometry.hpp
rename to libs/std/boost_geometry.hpp
diff --git a/std/glm_gtx_rotate_vector.hpp b/libs/std/glm_gtx_rotate_vector.hpp
similarity index 100%
rename from std/glm_gtx_rotate_vector.hpp
rename to libs/std/glm_gtx_rotate_vector.hpp
diff --git a/std/target_os.hpp b/libs/std/target_os.hpp
similarity index 100%
rename from std/target_os.hpp
rename to libs/std/target_os.hpp
diff --git a/std/windows.hpp b/libs/std/windows.hpp
similarity index 100%
rename from std/windows.hpp
rename to libs/std/windows.hpp
diff --git a/storage/CMakeLists.txt b/libs/storage/CMakeLists.txt
similarity index 100%
rename from storage/CMakeLists.txt
rename to libs/storage/CMakeLists.txt
diff --git a/storage/background_downloading/downloader_adapter_ios.h b/libs/storage/background_downloading/downloader_adapter_ios.h
similarity index 100%
rename from storage/background_downloading/downloader_adapter_ios.h
rename to libs/storage/background_downloading/downloader_adapter_ios.h
diff --git a/storage/background_downloading/downloader_adapter_ios.mm b/libs/storage/background_downloading/downloader_adapter_ios.mm
similarity index 100%
rename from storage/background_downloading/downloader_adapter_ios.mm
rename to libs/storage/background_downloading/downloader_adapter_ios.mm
diff --git a/storage/background_downloading/downloader_queue.hpp b/libs/storage/background_downloading/downloader_queue.hpp
similarity index 100%
rename from storage/background_downloading/downloader_queue.hpp
rename to libs/storage/background_downloading/downloader_queue.hpp
diff --git a/storage/country.hpp b/libs/storage/country.hpp
similarity index 100%
rename from storage/country.hpp
rename to libs/storage/country.hpp
diff --git a/storage/country_decl.cpp b/libs/storage/country_decl.cpp
similarity index 100%
rename from storage/country_decl.cpp
rename to libs/storage/country_decl.cpp
diff --git a/storage/country_decl.hpp b/libs/storage/country_decl.hpp
similarity index 100%
rename from storage/country_decl.hpp
rename to libs/storage/country_decl.hpp
diff --git a/storage/country_info_getter.cpp b/libs/storage/country_info_getter.cpp
similarity index 100%
rename from storage/country_info_getter.cpp
rename to libs/storage/country_info_getter.cpp
diff --git a/storage/country_info_getter.hpp b/libs/storage/country_info_getter.hpp
similarity index 100%
rename from storage/country_info_getter.hpp
rename to libs/storage/country_info_getter.hpp
diff --git a/storage/country_info_reader_light.cpp b/libs/storage/country_info_reader_light.cpp
similarity index 100%
rename from storage/country_info_reader_light.cpp
rename to libs/storage/country_info_reader_light.cpp
diff --git a/storage/country_info_reader_light.hpp b/libs/storage/country_info_reader_light.hpp
similarity index 100%
rename from storage/country_info_reader_light.hpp
rename to libs/storage/country_info_reader_light.hpp
diff --git a/storage/country_name_getter.cpp b/libs/storage/country_name_getter.cpp
similarity index 100%
rename from storage/country_name_getter.cpp
rename to libs/storage/country_name_getter.cpp
diff --git a/storage/country_name_getter.hpp b/libs/storage/country_name_getter.hpp
similarity index 100%
rename from storage/country_name_getter.hpp
rename to libs/storage/country_name_getter.hpp
diff --git a/storage/country_parent_getter.cpp b/libs/storage/country_parent_getter.cpp
similarity index 100%
rename from storage/country_parent_getter.cpp
rename to libs/storage/country_parent_getter.cpp
diff --git a/storage/country_parent_getter.hpp b/libs/storage/country_parent_getter.hpp
similarity index 100%
rename from storage/country_parent_getter.hpp
rename to libs/storage/country_parent_getter.hpp
diff --git a/storage/country_tree.cpp b/libs/storage/country_tree.cpp
similarity index 100%
rename from storage/country_tree.cpp
rename to libs/storage/country_tree.cpp
diff --git a/storage/country_tree.hpp b/libs/storage/country_tree.hpp
similarity index 100%
rename from storage/country_tree.hpp
rename to libs/storage/country_tree.hpp
diff --git a/storage/country_tree_helpers.cpp b/libs/storage/country_tree_helpers.cpp
similarity index 100%
rename from storage/country_tree_helpers.cpp
rename to libs/storage/country_tree_helpers.cpp
diff --git a/storage/country_tree_helpers.hpp b/libs/storage/country_tree_helpers.hpp
similarity index 100%
rename from storage/country_tree_helpers.hpp
rename to libs/storage/country_tree_helpers.hpp
diff --git a/storage/diff_scheme/apply_diff.cpp b/libs/storage/diff_scheme/apply_diff.cpp
similarity index 100%
rename from storage/diff_scheme/apply_diff.cpp
rename to libs/storage/diff_scheme/apply_diff.cpp
diff --git a/storage/diff_scheme/apply_diff.hpp b/libs/storage/diff_scheme/apply_diff.hpp
similarity index 93%
rename from storage/diff_scheme/apply_diff.hpp
rename to libs/storage/diff_scheme/apply_diff.hpp
index fdca5b9eb..7b64c680c 100644
--- a/storage/diff_scheme/apply_diff.hpp
+++ b/libs/storage/diff_scheme/apply_diff.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "generator/mwm_diff/diff.hpp"
+#include "mwm_diff/diff.hpp"
 
 #include "storage/storage_defines.hpp"
 
diff --git a/storage/diff_scheme/diff_scheme_loader.cpp b/libs/storage/diff_scheme/diff_scheme_loader.cpp
similarity index 100%
rename from storage/diff_scheme/diff_scheme_loader.cpp
rename to libs/storage/diff_scheme/diff_scheme_loader.cpp
diff --git a/storage/diff_scheme/diff_scheme_loader.hpp b/libs/storage/diff_scheme/diff_scheme_loader.hpp
similarity index 100%
rename from storage/diff_scheme/diff_scheme_loader.hpp
rename to libs/storage/diff_scheme/diff_scheme_loader.hpp
diff --git a/storage/diff_scheme/diff_types.hpp b/libs/storage/diff_scheme/diff_types.hpp
similarity index 100%
rename from storage/diff_scheme/diff_types.hpp
rename to libs/storage/diff_scheme/diff_types.hpp
diff --git a/storage/diff_scheme/diffs_data_source.cpp b/libs/storage/diff_scheme/diffs_data_source.cpp
similarity index 100%
rename from storage/diff_scheme/diffs_data_source.cpp
rename to libs/storage/diff_scheme/diffs_data_source.cpp
diff --git a/storage/diff_scheme/diffs_data_source.hpp b/libs/storage/diff_scheme/diffs_data_source.hpp
similarity index 100%
rename from storage/diff_scheme/diffs_data_source.hpp
rename to libs/storage/diff_scheme/diffs_data_source.hpp
diff --git a/storage/downloader.hpp b/libs/storage/downloader.hpp
similarity index 100%
rename from storage/downloader.hpp
rename to libs/storage/downloader.hpp
diff --git a/storage/downloader_queue_interface.hpp b/libs/storage/downloader_queue_interface.hpp
similarity index 100%
rename from storage/downloader_queue_interface.hpp
rename to libs/storage/downloader_queue_interface.hpp
diff --git a/storage/downloader_queue_universal.cpp b/libs/storage/downloader_queue_universal.cpp
similarity index 100%
rename from storage/downloader_queue_universal.cpp
rename to libs/storage/downloader_queue_universal.cpp
diff --git a/storage/downloader_queue_universal.hpp b/libs/storage/downloader_queue_universal.hpp
similarity index 100%
rename from storage/downloader_queue_universal.hpp
rename to libs/storage/downloader_queue_universal.hpp
diff --git a/storage/downloader_search_params.hpp b/libs/storage/downloader_search_params.hpp
similarity index 100%
rename from storage/downloader_search_params.hpp
rename to libs/storage/downloader_search_params.hpp
diff --git a/storage/downloading_policy.cpp b/libs/storage/downloading_policy.cpp
similarity index 100%
rename from storage/downloading_policy.cpp
rename to libs/storage/downloading_policy.cpp
diff --git a/storage/downloading_policy.hpp b/libs/storage/downloading_policy.hpp
similarity index 100%
rename from storage/downloading_policy.hpp
rename to libs/storage/downloading_policy.hpp
diff --git a/storage/http_map_files_downloader.cpp b/libs/storage/http_map_files_downloader.cpp
similarity index 100%
rename from storage/http_map_files_downloader.cpp
rename to libs/storage/http_map_files_downloader.cpp
diff --git a/storage/http_map_files_downloader.hpp b/libs/storage/http_map_files_downloader.hpp
similarity index 100%
rename from storage/http_map_files_downloader.hpp
rename to libs/storage/http_map_files_downloader.hpp
diff --git a/storage/map_files_downloader.cpp b/libs/storage/map_files_downloader.cpp
similarity index 100%
rename from storage/map_files_downloader.cpp
rename to libs/storage/map_files_downloader.cpp
diff --git a/storage/map_files_downloader.hpp b/libs/storage/map_files_downloader.hpp
similarity index 100%
rename from storage/map_files_downloader.hpp
rename to libs/storage/map_files_downloader.hpp
diff --git a/storage/map_files_downloader_with_ping.cpp b/libs/storage/map_files_downloader_with_ping.cpp
similarity index 100%
rename from storage/map_files_downloader_with_ping.cpp
rename to libs/storage/map_files_downloader_with_ping.cpp
diff --git a/storage/map_files_downloader_with_ping.hpp b/libs/storage/map_files_downloader_with_ping.hpp
similarity index 100%
rename from storage/map_files_downloader_with_ping.hpp
rename to libs/storage/map_files_downloader_with_ping.hpp
diff --git a/storage/pinger.cpp b/libs/storage/pinger.cpp
similarity index 100%
rename from storage/pinger.cpp
rename to libs/storage/pinger.cpp
diff --git a/storage/pinger.hpp b/libs/storage/pinger.hpp
similarity index 100%
rename from storage/pinger.hpp
rename to libs/storage/pinger.hpp
diff --git a/storage/queued_country.cpp b/libs/storage/queued_country.cpp
similarity index 100%
rename from storage/queued_country.cpp
rename to libs/storage/queued_country.cpp
diff --git a/storage/queued_country.hpp b/libs/storage/queued_country.hpp
similarity index 100%
rename from storage/queued_country.hpp
rename to libs/storage/queued_country.hpp
diff --git a/storage/routing_helpers.cpp b/libs/storage/routing_helpers.cpp
similarity index 100%
rename from storage/routing_helpers.cpp
rename to libs/storage/routing_helpers.cpp
diff --git a/storage/routing_helpers.hpp b/libs/storage/routing_helpers.hpp
similarity index 100%
rename from storage/routing_helpers.hpp
rename to libs/storage/routing_helpers.hpp
diff --git a/storage/storage.cpp b/libs/storage/storage.cpp
similarity index 100%
rename from storage/storage.cpp
rename to libs/storage/storage.cpp
diff --git a/storage/storage.hpp b/libs/storage/storage.hpp
similarity index 100%
rename from storage/storage.hpp
rename to libs/storage/storage.hpp
diff --git a/storage/storage_defines.cpp b/libs/storage/storage_defines.cpp
similarity index 100%
rename from storage/storage_defines.cpp
rename to libs/storage/storage_defines.cpp
diff --git a/storage/storage_defines.hpp b/libs/storage/storage_defines.hpp
similarity index 100%
rename from storage/storage_defines.hpp
rename to libs/storage/storage_defines.hpp
diff --git a/storage/storage_helpers.cpp b/libs/storage/storage_helpers.cpp
similarity index 100%
rename from storage/storage_helpers.cpp
rename to libs/storage/storage_helpers.cpp
diff --git a/storage/storage_helpers.hpp b/libs/storage/storage_helpers.hpp
similarity index 100%
rename from storage/storage_helpers.hpp
rename to libs/storage/storage_helpers.hpp
diff --git a/storage/storage_integration_tests/CMakeLists.txt b/libs/storage/storage_integration_tests/CMakeLists.txt
similarity index 100%
rename from storage/storage_integration_tests/CMakeLists.txt
rename to libs/storage/storage_integration_tests/CMakeLists.txt
diff --git a/storage/storage_integration_tests/download_calc_size_test.cpp b/libs/storage/storage_integration_tests/download_calc_size_test.cpp
similarity index 100%
rename from storage/storage_integration_tests/download_calc_size_test.cpp
rename to libs/storage/storage_integration_tests/download_calc_size_test.cpp
diff --git a/storage/storage_integration_tests/lightweight_matching_tests.cpp b/libs/storage/storage_integration_tests/lightweight_matching_tests.cpp
similarity index 100%
rename from storage/storage_integration_tests/lightweight_matching_tests.cpp
rename to libs/storage/storage_integration_tests/lightweight_matching_tests.cpp
diff --git a/storage/storage_integration_tests/storage_3levels_tests.cpp b/libs/storage/storage_integration_tests/storage_3levels_tests.cpp
similarity index 100%
rename from storage/storage_integration_tests/storage_3levels_tests.cpp
rename to libs/storage/storage_integration_tests/storage_3levels_tests.cpp
diff --git a/storage/storage_integration_tests/storage_downloading_tests.cpp b/libs/storage/storage_integration_tests/storage_downloading_tests.cpp
similarity index 100%
rename from storage/storage_integration_tests/storage_downloading_tests.cpp
rename to libs/storage/storage_integration_tests/storage_downloading_tests.cpp
diff --git a/storage/storage_integration_tests/storage_group_download_tests.cpp b/libs/storage/storage_integration_tests/storage_group_download_tests.cpp
similarity index 100%
rename from storage/storage_integration_tests/storage_group_download_tests.cpp
rename to libs/storage/storage_integration_tests/storage_group_download_tests.cpp
diff --git a/storage/storage_integration_tests/storage_http_tests.cpp b/libs/storage/storage_integration_tests/storage_http_tests.cpp
similarity index 100%
rename from storage/storage_integration_tests/storage_http_tests.cpp
rename to libs/storage/storage_integration_tests/storage_http_tests.cpp
diff --git a/storage/storage_integration_tests/storage_update_tests.cpp b/libs/storage/storage_integration_tests/storage_update_tests.cpp
similarity index 100%
rename from storage/storage_integration_tests/storage_update_tests.cpp
rename to libs/storage/storage_integration_tests/storage_update_tests.cpp
diff --git a/storage/storage_integration_tests/test_defines.cpp b/libs/storage/storage_integration_tests/test_defines.cpp
similarity index 100%
rename from storage/storage_integration_tests/test_defines.cpp
rename to libs/storage/storage_integration_tests/test_defines.cpp
diff --git a/storage/storage_integration_tests/test_defines.hpp b/libs/storage/storage_integration_tests/test_defines.hpp
similarity index 100%
rename from storage/storage_integration_tests/test_defines.hpp
rename to libs/storage/storage_integration_tests/test_defines.hpp
diff --git a/storage/storage_tests/CMakeLists.txt b/libs/storage/storage_tests/CMakeLists.txt
similarity index 100%
rename from storage/storage_tests/CMakeLists.txt
rename to libs/storage/storage_tests/CMakeLists.txt
diff --git a/storage/storage_tests/countries_tests.cpp b/libs/storage/storage_tests/countries_tests.cpp
similarity index 100%
rename from storage/storage_tests/countries_tests.cpp
rename to libs/storage/storage_tests/countries_tests.cpp
diff --git a/storage/storage_tests/country_info_getter_tests.cpp b/libs/storage/storage_tests/country_info_getter_tests.cpp
similarity index 100%
rename from storage/storage_tests/country_info_getter_tests.cpp
rename to libs/storage/storage_tests/country_info_getter_tests.cpp
diff --git a/storage/storage_tests/country_name_getter_tests.cpp b/libs/storage/storage_tests/country_name_getter_tests.cpp
similarity index 100%
rename from storage/storage_tests/country_name_getter_tests.cpp
rename to libs/storage/storage_tests/country_name_getter_tests.cpp
diff --git a/storage/storage_tests/downloader_tests.cpp b/libs/storage/storage_tests/downloader_tests.cpp
similarity index 100%
rename from storage/storage_tests/downloader_tests.cpp
rename to libs/storage/storage_tests/downloader_tests.cpp
diff --git a/storage/storage_tests/fake_map_files_downloader.cpp b/libs/storage/storage_tests/fake_map_files_downloader.cpp
similarity index 100%
rename from storage/storage_tests/fake_map_files_downloader.cpp
rename to libs/storage/storage_tests/fake_map_files_downloader.cpp
diff --git a/storage/storage_tests/fake_map_files_downloader.hpp b/libs/storage/storage_tests/fake_map_files_downloader.hpp
similarity index 100%
rename from storage/storage_tests/fake_map_files_downloader.hpp
rename to libs/storage/storage_tests/fake_map_files_downloader.hpp
diff --git a/storage/storage_tests/helpers.cpp b/libs/storage/storage_tests/helpers.cpp
similarity index 100%
rename from storage/storage_tests/helpers.cpp
rename to libs/storage/storage_tests/helpers.cpp
diff --git a/storage/storage_tests/helpers.hpp b/libs/storage/storage_tests/helpers.hpp
similarity index 100%
rename from storage/storage_tests/helpers.hpp
rename to libs/storage/storage_tests/helpers.hpp
diff --git a/storage/storage_tests/simple_tree_test.cpp b/libs/storage/storage_tests/simple_tree_test.cpp
similarity index 100%
rename from storage/storage_tests/simple_tree_test.cpp
rename to libs/storage/storage_tests/simple_tree_test.cpp
diff --git a/storage/storage_tests/storage_tests.cpp b/libs/storage/storage_tests/storage_tests.cpp
similarity index 100%
rename from storage/storage_tests/storage_tests.cpp
rename to libs/storage/storage_tests/storage_tests.cpp
diff --git a/storage/storage_tests/task_runner.cpp b/libs/storage/storage_tests/task_runner.cpp
similarity index 100%
rename from storage/storage_tests/task_runner.cpp
rename to libs/storage/storage_tests/task_runner.cpp
diff --git a/storage/storage_tests/task_runner.hpp b/libs/storage/storage_tests/task_runner.hpp
similarity index 100%
rename from storage/storage_tests/task_runner.hpp
rename to libs/storage/storage_tests/task_runner.hpp
diff --git a/storage/storage_tests/test_map_files_downloader.cpp b/libs/storage/storage_tests/test_map_files_downloader.cpp
similarity index 100%
rename from storage/storage_tests/test_map_files_downloader.cpp
rename to libs/storage/storage_tests/test_map_files_downloader.cpp
diff --git a/storage/storage_tests/test_map_files_downloader.hpp b/libs/storage/storage_tests/test_map_files_downloader.hpp
similarity index 100%
rename from storage/storage_tests/test_map_files_downloader.hpp
rename to libs/storage/storage_tests/test_map_files_downloader.hpp
diff --git a/testing/benchmark.hpp b/libs/testing/benchmark.hpp
similarity index 100%
rename from testing/benchmark.hpp
rename to libs/testing/benchmark.hpp
diff --git a/testing/testing.hpp b/libs/testing/testing.hpp
similarity index 100%
rename from testing/testing.hpp
rename to libs/testing/testing.hpp
diff --git a/testing/testingmain.cpp b/libs/testing/testingmain.cpp
similarity index 100%
rename from testing/testingmain.cpp
rename to libs/testing/testingmain.cpp
diff --git a/testing/testregister.hpp b/libs/testing/testregister.hpp
similarity index 100%
rename from testing/testregister.hpp
rename to libs/testing/testregister.hpp
diff --git a/tracking/CMakeLists.txt b/libs/tracking/CMakeLists.txt
similarity index 100%
rename from tracking/CMakeLists.txt
rename to libs/tracking/CMakeLists.txt
diff --git a/tracking/archival_file.cpp b/libs/tracking/archival_file.cpp
similarity index 100%
rename from tracking/archival_file.cpp
rename to libs/tracking/archival_file.cpp
diff --git a/tracking/archival_file.hpp b/libs/tracking/archival_file.hpp
similarity index 100%
rename from tracking/archival_file.hpp
rename to libs/tracking/archival_file.hpp
diff --git a/tracking/archival_manager.cpp b/libs/tracking/archival_manager.cpp
similarity index 100%
rename from tracking/archival_manager.cpp
rename to libs/tracking/archival_manager.cpp
diff --git a/tracking/archival_manager.hpp b/libs/tracking/archival_manager.hpp
similarity index 100%
rename from tracking/archival_manager.hpp
rename to libs/tracking/archival_manager.hpp
diff --git a/tracking/archival_reporter.cpp b/libs/tracking/archival_reporter.cpp
similarity index 100%
rename from tracking/archival_reporter.cpp
rename to libs/tracking/archival_reporter.cpp
diff --git a/tracking/archival_reporter.hpp b/libs/tracking/archival_reporter.hpp
similarity index 100%
rename from tracking/archival_reporter.hpp
rename to libs/tracking/archival_reporter.hpp
diff --git a/tracking/archive.cpp b/libs/tracking/archive.cpp
similarity index 100%
rename from tracking/archive.cpp
rename to libs/tracking/archive.cpp
diff --git a/tracking/archive.hpp b/libs/tracking/archive.hpp
similarity index 100%
rename from tracking/archive.hpp
rename to libs/tracking/archive.hpp
diff --git a/tracking/connection.cpp b/libs/tracking/connection.cpp
similarity index 100%
rename from tracking/connection.cpp
rename to libs/tracking/connection.cpp
diff --git a/tracking/connection.hpp b/libs/tracking/connection.hpp
similarity index 100%
rename from tracking/connection.hpp
rename to libs/tracking/connection.hpp
diff --git a/tracking/protocol.cpp b/libs/tracking/protocol.cpp
similarity index 100%
rename from tracking/protocol.cpp
rename to libs/tracking/protocol.cpp
diff --git a/tracking/protocol.hpp b/libs/tracking/protocol.hpp
similarity index 100%
rename from tracking/protocol.hpp
rename to libs/tracking/protocol.hpp
diff --git a/tracking/pytracking/CMakeLists.txt b/libs/tracking/pytracking/CMakeLists.txt
similarity index 100%
rename from tracking/pytracking/CMakeLists.txt
rename to libs/tracking/pytracking/CMakeLists.txt
diff --git a/tracking/pytracking/bindings.cpp b/libs/tracking/pytracking/bindings.cpp
similarity index 100%
rename from tracking/pytracking/bindings.cpp
rename to libs/tracking/pytracking/bindings.cpp
diff --git a/tracking/pytracking/setup.py b/libs/tracking/pytracking/setup.py
similarity index 100%
rename from tracking/pytracking/setup.py
rename to libs/tracking/pytracking/setup.py
diff --git a/tracking/reporter.cpp b/libs/tracking/reporter.cpp
similarity index 100%
rename from tracking/reporter.cpp
rename to libs/tracking/reporter.cpp
diff --git a/tracking/reporter.hpp b/libs/tracking/reporter.hpp
similarity index 100%
rename from tracking/reporter.hpp
rename to libs/tracking/reporter.hpp
diff --git a/tracking/tracking_fuzz_tests/CMakeLists.txt b/libs/tracking/tracking_fuzz_tests/CMakeLists.txt
similarity index 100%
rename from tracking/tracking_fuzz_tests/CMakeLists.txt
rename to libs/tracking/tracking_fuzz_tests/CMakeLists.txt
diff --git a/tracking/tracking_fuzz_tests/tracking_fuzz_tests.cpp b/libs/tracking/tracking_fuzz_tests/tracking_fuzz_tests.cpp
similarity index 100%
rename from tracking/tracking_fuzz_tests/tracking_fuzz_tests.cpp
rename to libs/tracking/tracking_fuzz_tests/tracking_fuzz_tests.cpp
diff --git a/tracking/tracking_tests/CMakeLists.txt b/libs/tracking/tracking_tests/CMakeLists.txt
similarity index 100%
rename from tracking/tracking_tests/CMakeLists.txt
rename to libs/tracking/tracking_tests/CMakeLists.txt
diff --git a/tracking/tracking_tests/archival_reporter_tests.cpp b/libs/tracking/tracking_tests/archival_reporter_tests.cpp
similarity index 100%
rename from tracking/tracking_tests/archival_reporter_tests.cpp
rename to libs/tracking/tracking_tests/archival_reporter_tests.cpp
diff --git a/tracking/tracking_tests/protocol_test.cpp b/libs/tracking/tracking_tests/protocol_test.cpp
similarity index 100%
rename from tracking/tracking_tests/protocol_test.cpp
rename to libs/tracking/tracking_tests/protocol_test.cpp
diff --git a/tracking/tracking_tests/reporter_test.cpp b/libs/tracking/tracking_tests/reporter_test.cpp
similarity index 100%
rename from tracking/tracking_tests/reporter_test.cpp
rename to libs/tracking/tracking_tests/reporter_test.cpp
diff --git a/traffic/CMakeLists.txt b/libs/traffic/CMakeLists.txt
similarity index 100%
rename from traffic/CMakeLists.txt
rename to libs/traffic/CMakeLists.txt
diff --git a/traffic/pytraffic/CMakeLists.txt b/libs/traffic/pytraffic/CMakeLists.txt
similarity index 100%
rename from traffic/pytraffic/CMakeLists.txt
rename to libs/traffic/pytraffic/CMakeLists.txt
diff --git a/traffic/pytraffic/bindings.cpp b/libs/traffic/pytraffic/bindings.cpp
similarity index 100%
rename from traffic/pytraffic/bindings.cpp
rename to libs/traffic/pytraffic/bindings.cpp
diff --git a/traffic/pytraffic/example.py b/libs/traffic/pytraffic/example.py
similarity index 100%
rename from traffic/pytraffic/example.py
rename to libs/traffic/pytraffic/example.py
diff --git a/traffic/pytraffic/setup.py b/libs/traffic/pytraffic/setup.py
similarity index 100%
rename from traffic/pytraffic/setup.py
rename to libs/traffic/pytraffic/setup.py
diff --git a/traffic/speed_groups.cpp b/libs/traffic/speed_groups.cpp
similarity index 100%
rename from traffic/speed_groups.cpp
rename to libs/traffic/speed_groups.cpp
diff --git a/traffic/speed_groups.hpp b/libs/traffic/speed_groups.hpp
similarity index 100%
rename from traffic/speed_groups.hpp
rename to libs/traffic/speed_groups.hpp
diff --git a/traffic/traffic_cache.cpp b/libs/traffic/traffic_cache.cpp
similarity index 100%
rename from traffic/traffic_cache.cpp
rename to libs/traffic/traffic_cache.cpp
diff --git a/traffic/traffic_cache.hpp b/libs/traffic/traffic_cache.hpp
similarity index 100%
rename from traffic/traffic_cache.hpp
rename to libs/traffic/traffic_cache.hpp
diff --git a/traffic/traffic_info.cpp b/libs/traffic/traffic_info.cpp
similarity index 100%
rename from traffic/traffic_info.cpp
rename to libs/traffic/traffic_info.cpp
diff --git a/traffic/traffic_info.hpp b/libs/traffic/traffic_info.hpp
similarity index 100%
rename from traffic/traffic_info.hpp
rename to libs/traffic/traffic_info.hpp
diff --git a/traffic/traffic_tests/CMakeLists.txt b/libs/traffic/traffic_tests/CMakeLists.txt
similarity index 100%
rename from traffic/traffic_tests/CMakeLists.txt
rename to libs/traffic/traffic_tests/CMakeLists.txt
diff --git a/traffic/traffic_tests/traffic_info_test.cpp b/libs/traffic/traffic_tests/traffic_info_test.cpp
similarity index 100%
rename from traffic/traffic_tests/traffic_info_test.cpp
rename to libs/traffic/traffic_tests/traffic_info_test.cpp
diff --git a/transit/CMakeLists.txt b/libs/transit/CMakeLists.txt
similarity index 100%
rename from transit/CMakeLists.txt
rename to libs/transit/CMakeLists.txt
diff --git a/transit/experimental/transit_data.cpp b/libs/transit/experimental/transit_data.cpp
similarity index 100%
rename from transit/experimental/transit_data.cpp
rename to libs/transit/experimental/transit_data.cpp
diff --git a/transit/experimental/transit_data.hpp b/libs/transit/experimental/transit_data.hpp
similarity index 100%
rename from transit/experimental/transit_data.hpp
rename to libs/transit/experimental/transit_data.hpp
diff --git a/transit/experimental/transit_types_experimental.cpp b/libs/transit/experimental/transit_types_experimental.cpp
similarity index 100%
rename from transit/experimental/transit_types_experimental.cpp
rename to libs/transit/experimental/transit_types_experimental.cpp
diff --git a/transit/experimental/transit_types_experimental.hpp b/libs/transit/experimental/transit_types_experimental.hpp
similarity index 100%
rename from transit/experimental/transit_types_experimental.hpp
rename to libs/transit/experimental/transit_types_experimental.hpp
diff --git a/transit/transit_display_info.hpp b/libs/transit/transit_display_info.hpp
similarity index 100%
rename from transit/transit_display_info.hpp
rename to libs/transit/transit_display_info.hpp
diff --git a/transit/transit_entities.hpp b/libs/transit/transit_entities.hpp
similarity index 100%
rename from transit/transit_entities.hpp
rename to libs/transit/transit_entities.hpp
diff --git a/transit/transit_experimental_tests/CMakeLists.txt b/libs/transit/transit_experimental_tests/CMakeLists.txt
similarity index 100%
rename from transit/transit_experimental_tests/CMakeLists.txt
rename to libs/transit/transit_experimental_tests/CMakeLists.txt
diff --git a/transit/transit_experimental_tests/parse_transit_from_json_tests.cpp b/libs/transit/transit_experimental_tests/parse_transit_from_json_tests.cpp
similarity index 100%
rename from transit/transit_experimental_tests/parse_transit_from_json_tests.cpp
rename to libs/transit/transit_experimental_tests/parse_transit_from_json_tests.cpp
diff --git a/transit/transit_experimental_tests/transit_serdes_tests.cpp b/libs/transit/transit_experimental_tests/transit_serdes_tests.cpp
similarity index 100%
rename from transit/transit_experimental_tests/transit_serdes_tests.cpp
rename to libs/transit/transit_experimental_tests/transit_serdes_tests.cpp
diff --git a/transit/transit_graph_data.cpp b/libs/transit/transit_graph_data.cpp
similarity index 100%
rename from transit/transit_graph_data.cpp
rename to libs/transit/transit_graph_data.cpp
diff --git a/transit/transit_graph_data.hpp b/libs/transit/transit_graph_data.hpp
similarity index 100%
rename from transit/transit_graph_data.hpp
rename to libs/transit/transit_graph_data.hpp
diff --git a/transit/transit_schedule.cpp b/libs/transit/transit_schedule.cpp
similarity index 100%
rename from transit/transit_schedule.cpp
rename to libs/transit/transit_schedule.cpp
diff --git a/transit/transit_schedule.hpp b/libs/transit/transit_schedule.hpp
similarity index 100%
rename from transit/transit_schedule.hpp
rename to libs/transit/transit_schedule.hpp
diff --git a/transit/transit_serdes.hpp b/libs/transit/transit_serdes.hpp
similarity index 100%
rename from transit/transit_serdes.hpp
rename to libs/transit/transit_serdes.hpp
diff --git a/transit/transit_tests/CMakeLists.txt b/libs/transit/transit_tests/CMakeLists.txt
similarity index 100%
rename from transit/transit_tests/CMakeLists.txt
rename to libs/transit/transit_tests/CMakeLists.txt
diff --git a/transit/transit_tests/transit_graph_test.cpp b/libs/transit/transit_tests/transit_graph_test.cpp
similarity index 100%
rename from transit/transit_tests/transit_graph_test.cpp
rename to libs/transit/transit_tests/transit_graph_test.cpp
diff --git a/transit/transit_tests/transit_json_parsing_test.cpp b/libs/transit/transit_tests/transit_json_parsing_test.cpp
similarity index 100%
rename from transit/transit_tests/transit_json_parsing_test.cpp
rename to libs/transit/transit_tests/transit_json_parsing_test.cpp
diff --git a/transit/transit_tests/transit_schedule_tests.cpp b/libs/transit/transit_tests/transit_schedule_tests.cpp
similarity index 100%
rename from transit/transit_tests/transit_schedule_tests.cpp
rename to libs/transit/transit_tests/transit_schedule_tests.cpp
diff --git a/transit/transit_tests/transit_test.cpp b/libs/transit/transit_tests/transit_test.cpp
similarity index 100%
rename from transit/transit_tests/transit_test.cpp
rename to libs/transit/transit_tests/transit_test.cpp
diff --git a/transit/transit_tests/transit_tools.hpp b/libs/transit/transit_tests/transit_tools.hpp
similarity index 100%
rename from transit/transit_tests/transit_tools.hpp
rename to libs/transit/transit_tests/transit_tools.hpp
diff --git a/transit/transit_types.cpp b/libs/transit/transit_types.cpp
similarity index 100%
rename from transit/transit_types.cpp
rename to libs/transit/transit_types.cpp
diff --git a/transit/transit_types.hpp b/libs/transit/transit_types.hpp
similarity index 100%
rename from transit/transit_types.hpp
rename to libs/transit/transit_types.hpp
diff --git a/transit/transit_version.cpp b/libs/transit/transit_version.cpp
similarity index 100%
rename from transit/transit_version.cpp
rename to libs/transit/transit_version.cpp
diff --git a/transit/transit_version.hpp b/libs/transit/transit_version.hpp
similarity index 100%
rename from transit/transit_version.hpp
rename to libs/transit/transit_version.hpp
diff --git a/transit/world_feed/CMakeLists.txt b/libs/transit/world_feed/CMakeLists.txt
similarity index 100%
rename from transit/world_feed/CMakeLists.txt
rename to libs/transit/world_feed/CMakeLists.txt
diff --git a/transit/world_feed/color_picker.cpp b/libs/transit/world_feed/color_picker.cpp
similarity index 100%
rename from transit/world_feed/color_picker.cpp
rename to libs/transit/world_feed/color_picker.cpp
diff --git a/transit/world_feed/color_picker.hpp b/libs/transit/world_feed/color_picker.hpp
similarity index 100%
rename from transit/world_feed/color_picker.hpp
rename to libs/transit/world_feed/color_picker.hpp
diff --git a/transit/world_feed/date_time_helpers.cpp b/libs/transit/world_feed/date_time_helpers.cpp
similarity index 100%
rename from transit/world_feed/date_time_helpers.cpp
rename to libs/transit/world_feed/date_time_helpers.cpp
diff --git a/transit/world_feed/date_time_helpers.hpp b/libs/transit/world_feed/date_time_helpers.hpp
similarity index 100%
rename from transit/world_feed/date_time_helpers.hpp
rename to libs/transit/world_feed/date_time_helpers.hpp
diff --git a/transit/world_feed/feed_helpers.cpp b/libs/transit/world_feed/feed_helpers.cpp
similarity index 100%
rename from transit/world_feed/feed_helpers.cpp
rename to libs/transit/world_feed/feed_helpers.cpp
diff --git a/transit/world_feed/feed_helpers.hpp b/libs/transit/world_feed/feed_helpers.hpp
similarity index 100%
rename from transit/world_feed/feed_helpers.hpp
rename to libs/transit/world_feed/feed_helpers.hpp
diff --git a/transit/world_feed/gtfs_converter/CMakeLists.txt b/libs/transit/world_feed/gtfs_converter/CMakeLists.txt
similarity index 100%
rename from transit/world_feed/gtfs_converter/CMakeLists.txt
rename to libs/transit/world_feed/gtfs_converter/CMakeLists.txt
diff --git a/transit/world_feed/gtfs_converter/gtfs_converter.cpp b/libs/transit/world_feed/gtfs_converter/gtfs_converter.cpp
similarity index 100%
rename from transit/world_feed/gtfs_converter/gtfs_converter.cpp
rename to libs/transit/world_feed/gtfs_converter/gtfs_converter.cpp
diff --git a/transit/world_feed/subway_converter.cpp b/libs/transit/world_feed/subway_converter.cpp
similarity index 100%
rename from transit/world_feed/subway_converter.cpp
rename to libs/transit/world_feed/subway_converter.cpp
diff --git a/transit/world_feed/subway_converter.hpp b/libs/transit/world_feed/subway_converter.hpp
similarity index 100%
rename from transit/world_feed/subway_converter.hpp
rename to libs/transit/world_feed/subway_converter.hpp
diff --git a/transit/world_feed/world_feed.cpp b/libs/transit/world_feed/world_feed.cpp
similarity index 100%
rename from transit/world_feed/world_feed.cpp
rename to libs/transit/world_feed/world_feed.cpp
diff --git a/transit/world_feed/world_feed.hpp b/libs/transit/world_feed/world_feed.hpp
similarity index 100%
rename from transit/world_feed/world_feed.hpp
rename to libs/transit/world_feed/world_feed.hpp
diff --git a/transit/world_feed/world_feed_integration_tests/CMakeLists.txt b/libs/transit/world_feed/world_feed_integration_tests/CMakeLists.txt
similarity index 100%
rename from transit/world_feed/world_feed_integration_tests/CMakeLists.txt
rename to libs/transit/world_feed/world_feed_integration_tests/CMakeLists.txt
diff --git a/transit/world_feed/world_feed_integration_tests/world_feed_integration_tests.cpp b/libs/transit/world_feed/world_feed_integration_tests/world_feed_integration_tests.cpp
similarity index 100%
rename from transit/world_feed/world_feed_integration_tests/world_feed_integration_tests.cpp
rename to libs/transit/world_feed/world_feed_integration_tests/world_feed_integration_tests.cpp
diff --git a/transit/world_feed/world_feed_tests/CMakeLists.txt b/libs/transit/world_feed/world_feed_tests/CMakeLists.txt
similarity index 100%
rename from transit/world_feed/world_feed_tests/CMakeLists.txt
rename to libs/transit/world_feed/world_feed_tests/CMakeLists.txt
diff --git a/transit/world_feed/world_feed_tests/subway_converter_tests.cpp b/libs/transit/world_feed/world_feed_tests/subway_converter_tests.cpp
similarity index 100%
rename from transit/world_feed/world_feed_tests/subway_converter_tests.cpp
rename to libs/transit/world_feed/world_feed_tests/subway_converter_tests.cpp
diff --git a/transit/world_feed/world_feed_tests/world_feed_tests.cpp b/libs/transit/world_feed/world_feed_tests/world_feed_tests.cpp
similarity index 100%
rename from transit/world_feed/world_feed_tests/world_feed_tests.cpp
rename to libs/transit/world_feed/world_feed_tests/world_feed_tests.cpp
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
new file mode 100644
index 000000000..6a8e916f0
--- /dev/null
+++ b/tools/CMakeLists.txt
@@ -0,0 +1,11 @@
+add_subdirectory(openlr)
+add_subdirectory(poly_borders)
+add_subdirectory(track_analyzing)
+
+omim_add_tool_subdirectory(feature_list)
+omim_add_tool_subdirectory(topography_generator)
+omim_add_tool_subdirectory(track_generator)
+if (NOT SKIP_QT_GUI)
+  omim_add_tool_subdirectory(skin_generator)
+endif()
+
diff --git a/tools/ruby/category_consistency/check_consistency.rb b/tools/category_consistency/check_consistency.rb
similarity index 100%
rename from tools/ruby/category_consistency/check_consistency.rb
rename to tools/category_consistency/check_consistency.rb
diff --git a/tools/ruby/category_consistency/omim_parsers.rb b/tools/category_consistency/omim_parsers.rb
similarity index 100%
rename from tools/ruby/category_consistency/omim_parsers.rb
rename to tools/category_consistency/omim_parsers.rb
diff --git a/feature_list/CMakeLists.txt b/tools/feature_list/CMakeLists.txt
similarity index 100%
rename from feature_list/CMakeLists.txt
rename to tools/feature_list/CMakeLists.txt
diff --git a/feature_list/feature_list.cpp b/tools/feature_list/feature_list.cpp
similarity index 100%
rename from feature_list/feature_list.cpp
rename to tools/feature_list/feature_list.cpp
diff --git a/openlr/CMakeLists.txt b/tools/openlr/CMakeLists.txt
similarity index 100%
rename from openlr/CMakeLists.txt
rename to tools/openlr/CMakeLists.txt
diff --git a/openlr/cache_line_size.hpp b/tools/openlr/cache_line_size.hpp
similarity index 100%
rename from openlr/cache_line_size.hpp
rename to tools/openlr/cache_line_size.hpp
diff --git a/openlr/candidate_paths_getter.cpp b/tools/openlr/candidate_paths_getter.cpp
similarity index 100%
rename from openlr/candidate_paths_getter.cpp
rename to tools/openlr/candidate_paths_getter.cpp
diff --git a/openlr/candidate_paths_getter.hpp b/tools/openlr/candidate_paths_getter.hpp
similarity index 100%
rename from openlr/candidate_paths_getter.hpp
rename to tools/openlr/candidate_paths_getter.hpp
diff --git a/openlr/candidate_points_getter.cpp b/tools/openlr/candidate_points_getter.cpp
similarity index 100%
rename from openlr/candidate_points_getter.cpp
rename to tools/openlr/candidate_points_getter.cpp
diff --git a/openlr/candidate_points_getter.hpp b/tools/openlr/candidate_points_getter.hpp
similarity index 100%
rename from openlr/candidate_points_getter.hpp
rename to tools/openlr/candidate_points_getter.hpp
diff --git a/openlr/decoded_path.cpp b/tools/openlr/decoded_path.cpp
similarity index 100%
rename from openlr/decoded_path.cpp
rename to tools/openlr/decoded_path.cpp
diff --git a/openlr/decoded_path.hpp b/tools/openlr/decoded_path.hpp
similarity index 100%
rename from openlr/decoded_path.hpp
rename to tools/openlr/decoded_path.hpp
diff --git a/openlr/graph.cpp b/tools/openlr/graph.cpp
similarity index 100%
rename from openlr/graph.cpp
rename to tools/openlr/graph.cpp
diff --git a/openlr/graph.hpp b/tools/openlr/graph.hpp
similarity index 100%
rename from openlr/graph.hpp
rename to tools/openlr/graph.hpp
diff --git a/openlr/helpers.cpp b/tools/openlr/helpers.cpp
similarity index 100%
rename from openlr/helpers.cpp
rename to tools/openlr/helpers.cpp
diff --git a/openlr/helpers.hpp b/tools/openlr/helpers.hpp
similarity index 100%
rename from openlr/helpers.hpp
rename to tools/openlr/helpers.hpp
diff --git a/openlr/openlr_decoder.cpp b/tools/openlr/openlr_decoder.cpp
similarity index 100%
rename from openlr/openlr_decoder.cpp
rename to tools/openlr/openlr_decoder.cpp
diff --git a/openlr/openlr_decoder.hpp b/tools/openlr/openlr_decoder.hpp
similarity index 100%
rename from openlr/openlr_decoder.hpp
rename to tools/openlr/openlr_decoder.hpp
diff --git a/openlr/openlr_match_quality/CMakeLists.txt b/tools/openlr/openlr_match_quality/CMakeLists.txt
similarity index 100%
rename from openlr/openlr_match_quality/CMakeLists.txt
rename to tools/openlr/openlr_match_quality/CMakeLists.txt
diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt b/tools/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt
similarity index 100%
rename from openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt
rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/CMakeLists.txt
diff --git a/search/search_quality/assessment_tool/Info.plist b/tools/openlr/openlr_match_quality/openlr_assessment_tool/Info.plist
similarity index 100%
rename from search/search_quality/assessment_tool/Info.plist
rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/Info.plist
diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/main.cpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/main.cpp
similarity index 100%
rename from openlr/openlr_match_quality/openlr_assessment_tool/main.cpp
rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/main.cpp
diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.cpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.cpp
similarity index 100%
rename from openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.cpp
rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.cpp
diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.hpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.hpp
similarity index 100%
rename from openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.hpp
rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.hpp
diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/map_widget.cpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/map_widget.cpp
similarity index 100%
rename from openlr/openlr_match_quality/openlr_assessment_tool/map_widget.cpp
rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/map_widget.cpp
diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/map_widget.hpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/map_widget.hpp
similarity index 100%
rename from openlr/openlr_match_quality/openlr_assessment_tool/map_widget.hpp
rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/map_widget.hpp
diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/points_controller_delegate_base.hpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/points_controller_delegate_base.hpp
similarity index 100%
rename from openlr/openlr_match_quality/openlr_assessment_tool/points_controller_delegate_base.hpp
rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/points_controller_delegate_base.hpp
diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/segment_correspondence.cpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/segment_correspondence.cpp
similarity index 100%
rename from openlr/openlr_match_quality/openlr_assessment_tool/segment_correspondence.cpp
rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/segment_correspondence.cpp
diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/segment_correspondence.hpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/segment_correspondence.hpp
similarity index 100%
rename from openlr/openlr_match_quality/openlr_assessment_tool/segment_correspondence.hpp
rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/segment_correspondence.hpp
diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/traffic_drawer_delegate_base.hpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_drawer_delegate_base.hpp
similarity index 100%
rename from openlr/openlr_match_quality/openlr_assessment_tool/traffic_drawer_delegate_base.hpp
rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_drawer_delegate_base.hpp
diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.cpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.cpp
similarity index 100%
rename from openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.cpp
rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.cpp
diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.hpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.hpp
similarity index 100%
rename from openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.hpp
rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.hpp
diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/traffic_panel.cpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_panel.cpp
similarity index 100%
rename from openlr/openlr_match_quality/openlr_assessment_tool/traffic_panel.cpp
rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_panel.cpp
diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/traffic_panel.hpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_panel.hpp
similarity index 100%
rename from openlr/openlr_match_quality/openlr_assessment_tool/traffic_panel.hpp
rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_panel.hpp
diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/trafficmodeinitdlg.cpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/trafficmodeinitdlg.cpp
similarity index 100%
rename from openlr/openlr_match_quality/openlr_assessment_tool/trafficmodeinitdlg.cpp
rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/trafficmodeinitdlg.cpp
diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/trafficmodeinitdlg.h b/tools/openlr/openlr_match_quality/openlr_assessment_tool/trafficmodeinitdlg.h
similarity index 100%
rename from openlr/openlr_match_quality/openlr_assessment_tool/trafficmodeinitdlg.h
rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/trafficmodeinitdlg.h
diff --git a/openlr/openlr_match_quality/openlr_assessment_tool/trafficmodeinitdlg.ui b/tools/openlr/openlr_match_quality/openlr_assessment_tool/trafficmodeinitdlg.ui
similarity index 100%
rename from openlr/openlr_match_quality/openlr_assessment_tool/trafficmodeinitdlg.ui
rename to tools/openlr/openlr_match_quality/openlr_assessment_tool/trafficmodeinitdlg.ui
diff --git a/openlr/openlr_model.cpp b/tools/openlr/openlr_model.cpp
similarity index 100%
rename from openlr/openlr_model.cpp
rename to tools/openlr/openlr_model.cpp
diff --git a/openlr/openlr_model.hpp b/tools/openlr/openlr_model.hpp
similarity index 100%
rename from openlr/openlr_model.hpp
rename to tools/openlr/openlr_model.hpp
diff --git a/openlr/openlr_model_xml.cpp b/tools/openlr/openlr_model_xml.cpp
similarity index 100%
rename from openlr/openlr_model_xml.cpp
rename to tools/openlr/openlr_model_xml.cpp
diff --git a/openlr/openlr_model_xml.hpp b/tools/openlr/openlr_model_xml.hpp
similarity index 100%
rename from openlr/openlr_model_xml.hpp
rename to tools/openlr/openlr_model_xml.hpp
diff --git a/openlr/openlr_stat/CMakeLists.txt b/tools/openlr/openlr_stat/CMakeLists.txt
similarity index 100%
rename from openlr/openlr_stat/CMakeLists.txt
rename to tools/openlr/openlr_stat/CMakeLists.txt
diff --git a/openlr/openlr_stat/openlr_stat.cpp b/tools/openlr/openlr_stat/openlr_stat.cpp
similarity index 100%
rename from openlr/openlr_stat/openlr_stat.cpp
rename to tools/openlr/openlr_stat/openlr_stat.cpp
diff --git a/openlr/openlr_tests/CMakeLists.txt b/tools/openlr/openlr_tests/CMakeLists.txt
similarity index 100%
rename from openlr/openlr_tests/CMakeLists.txt
rename to tools/openlr/openlr_tests/CMakeLists.txt
diff --git a/openlr/openlr_tests/decoded_path_test.cpp b/tools/openlr/openlr_tests/decoded_path_test.cpp
similarity index 100%
rename from openlr/openlr_tests/decoded_path_test.cpp
rename to tools/openlr/openlr_tests/decoded_path_test.cpp
diff --git a/openlr/paths_connector.cpp b/tools/openlr/paths_connector.cpp
similarity index 100%
rename from openlr/paths_connector.cpp
rename to tools/openlr/paths_connector.cpp
diff --git a/openlr/paths_connector.hpp b/tools/openlr/paths_connector.hpp
similarity index 100%
rename from openlr/paths_connector.hpp
rename to tools/openlr/paths_connector.hpp
diff --git a/openlr/road_info_getter.cpp b/tools/openlr/road_info_getter.cpp
similarity index 100%
rename from openlr/road_info_getter.cpp
rename to tools/openlr/road_info_getter.cpp
diff --git a/openlr/road_info_getter.hpp b/tools/openlr/road_info_getter.hpp
similarity index 100%
rename from openlr/road_info_getter.hpp
rename to tools/openlr/road_info_getter.hpp
diff --git a/openlr/router.cpp b/tools/openlr/router.cpp
similarity index 100%
rename from openlr/router.cpp
rename to tools/openlr/router.cpp
diff --git a/openlr/router.hpp b/tools/openlr/router.hpp
similarity index 100%
rename from openlr/router.hpp
rename to tools/openlr/router.hpp
diff --git a/openlr/score_candidate_paths_getter.cpp b/tools/openlr/score_candidate_paths_getter.cpp
similarity index 100%
rename from openlr/score_candidate_paths_getter.cpp
rename to tools/openlr/score_candidate_paths_getter.cpp
diff --git a/openlr/score_candidate_paths_getter.hpp b/tools/openlr/score_candidate_paths_getter.hpp
similarity index 100%
rename from openlr/score_candidate_paths_getter.hpp
rename to tools/openlr/score_candidate_paths_getter.hpp
diff --git a/openlr/score_candidate_points_getter.cpp b/tools/openlr/score_candidate_points_getter.cpp
similarity index 100%
rename from openlr/score_candidate_points_getter.cpp
rename to tools/openlr/score_candidate_points_getter.cpp
diff --git a/openlr/score_candidate_points_getter.hpp b/tools/openlr/score_candidate_points_getter.hpp
similarity index 100%
rename from openlr/score_candidate_points_getter.hpp
rename to tools/openlr/score_candidate_points_getter.hpp
diff --git a/openlr/score_paths_connector.cpp b/tools/openlr/score_paths_connector.cpp
similarity index 100%
rename from openlr/score_paths_connector.cpp
rename to tools/openlr/score_paths_connector.cpp
diff --git a/openlr/score_paths_connector.hpp b/tools/openlr/score_paths_connector.hpp
similarity index 100%
rename from openlr/score_paths_connector.hpp
rename to tools/openlr/score_paths_connector.hpp
diff --git a/openlr/score_types.hpp b/tools/openlr/score_types.hpp
similarity index 100%
rename from openlr/score_types.hpp
rename to tools/openlr/score_types.hpp
diff --git a/openlr/stats.hpp b/tools/openlr/stats.hpp
similarity index 100%
rename from openlr/stats.hpp
rename to tools/openlr/stats.hpp
diff --git a/openlr/way_point.hpp b/tools/openlr/way_point.hpp
similarity index 100%
rename from openlr/way_point.hpp
rename to tools/openlr/way_point.hpp
diff --git a/poly_borders/CMakeLists.txt b/tools/poly_borders/CMakeLists.txt
similarity index 100%
rename from poly_borders/CMakeLists.txt
rename to tools/poly_borders/CMakeLists.txt
diff --git a/poly_borders/borders_data.cpp b/tools/poly_borders/borders_data.cpp
similarity index 100%
rename from poly_borders/borders_data.cpp
rename to tools/poly_borders/borders_data.cpp
diff --git a/poly_borders/borders_data.hpp b/tools/poly_borders/borders_data.hpp
similarity index 100%
rename from poly_borders/borders_data.hpp
rename to tools/poly_borders/borders_data.hpp
diff --git a/poly_borders/help_structures.cpp b/tools/poly_borders/help_structures.cpp
similarity index 100%
rename from poly_borders/help_structures.cpp
rename to tools/poly_borders/help_structures.cpp
diff --git a/poly_borders/help_structures.hpp b/tools/poly_borders/help_structures.hpp
similarity index 100%
rename from poly_borders/help_structures.hpp
rename to tools/poly_borders/help_structures.hpp
diff --git a/poly_borders/poly_borders_tests/CMakeLists.txt b/tools/poly_borders/poly_borders_tests/CMakeLists.txt
similarity index 100%
rename from poly_borders/poly_borders_tests/CMakeLists.txt
rename to tools/poly_borders/poly_borders_tests/CMakeLists.txt
diff --git a/poly_borders/poly_borders_tests/mark_points_tests.cpp b/tools/poly_borders/poly_borders_tests/mark_points_tests.cpp
similarity index 100%
rename from poly_borders/poly_borders_tests/mark_points_tests.cpp
rename to tools/poly_borders/poly_borders_tests/mark_points_tests.cpp
diff --git a/poly_borders/poly_borders_tests/remove_empty_spaces_tests.cpp b/tools/poly_borders/poly_borders_tests/remove_empty_spaces_tests.cpp
similarity index 100%
rename from poly_borders/poly_borders_tests/remove_empty_spaces_tests.cpp
rename to tools/poly_borders/poly_borders_tests/remove_empty_spaces_tests.cpp
diff --git a/poly_borders/poly_borders_tests/tools.cpp b/tools/poly_borders/poly_borders_tests/tools.cpp
similarity index 100%
rename from poly_borders/poly_borders_tests/tools.cpp
rename to tools/poly_borders/poly_borders_tests/tools.cpp
diff --git a/poly_borders/poly_borders_tests/tools.hpp b/tools/poly_borders/poly_borders_tests/tools.hpp
similarity index 100%
rename from poly_borders/poly_borders_tests/tools.hpp
rename to tools/poly_borders/poly_borders_tests/tools.hpp
diff --git a/poly_borders/poly_borders_tool/CMakeLists.txt b/tools/poly_borders/poly_borders_tool/CMakeLists.txt
similarity index 100%
rename from poly_borders/poly_borders_tool/CMakeLists.txt
rename to tools/poly_borders/poly_borders_tool/CMakeLists.txt
diff --git a/poly_borders/poly_borders_tool/poly_borders_tool.cpp b/tools/poly_borders/poly_borders_tool/poly_borders_tool.cpp
similarity index 100%
rename from poly_borders/poly_borders_tool/poly_borders_tool.cpp
rename to tools/poly_borders/poly_borders_tool/poly_borders_tool.cpp
diff --git a/skin_generator/CMakeLists.txt b/tools/skin_generator/CMakeLists.txt
similarity index 100%
rename from skin_generator/CMakeLists.txt
rename to tools/skin_generator/CMakeLists.txt
diff --git a/skin_generator/generator.cpp b/tools/skin_generator/generator.cpp
similarity index 100%
rename from skin_generator/generator.cpp
rename to tools/skin_generator/generator.cpp
diff --git a/skin_generator/generator.hpp b/tools/skin_generator/generator.hpp
similarity index 100%
rename from skin_generator/generator.hpp
rename to tools/skin_generator/generator.hpp
diff --git a/skin_generator/main.cpp b/tools/skin_generator/main.cpp
similarity index 100%
rename from skin_generator/main.cpp
rename to tools/skin_generator/main.cpp
diff --git a/topography_generator/CMakeLists.txt b/tools/topography_generator/CMakeLists.txt
similarity index 100%
rename from topography_generator/CMakeLists.txt
rename to tools/topography_generator/CMakeLists.txt
diff --git a/topography_generator/filters_impl.cpp b/tools/topography_generator/filters_impl.cpp
similarity index 100%
rename from topography_generator/filters_impl.cpp
rename to tools/topography_generator/filters_impl.cpp
diff --git a/topography_generator/filters_impl.hpp b/tools/topography_generator/filters_impl.hpp
similarity index 100%
rename from topography_generator/filters_impl.hpp
rename to tools/topography_generator/filters_impl.hpp
diff --git a/topography_generator/generator.cpp b/tools/topography_generator/generator.cpp
similarity index 100%
rename from topography_generator/generator.cpp
rename to tools/topography_generator/generator.cpp
diff --git a/topography_generator/generator.hpp b/tools/topography_generator/generator.hpp
similarity index 100%
rename from topography_generator/generator.hpp
rename to tools/topography_generator/generator.hpp
diff --git a/topography_generator/isolines_profile.hpp b/tools/topography_generator/isolines_profile.hpp
similarity index 100%
rename from topography_generator/isolines_profile.hpp
rename to tools/topography_generator/isolines_profile.hpp
diff --git a/topography_generator/isolines_utils.hpp b/tools/topography_generator/isolines_utils.hpp
similarity index 100%
rename from topography_generator/isolines_utils.hpp
rename to tools/topography_generator/isolines_utils.hpp
diff --git a/topography_generator/main.cpp b/tools/topography_generator/main.cpp
similarity index 100%
rename from topography_generator/main.cpp
rename to tools/topography_generator/main.cpp
diff --git a/topography_generator/marching_squares/contours_builder.cpp b/tools/topography_generator/marching_squares/contours_builder.cpp
similarity index 100%
rename from topography_generator/marching_squares/contours_builder.cpp
rename to tools/topography_generator/marching_squares/contours_builder.cpp
diff --git a/topography_generator/marching_squares/contours_builder.hpp b/tools/topography_generator/marching_squares/contours_builder.hpp
similarity index 100%
rename from topography_generator/marching_squares/contours_builder.hpp
rename to tools/topography_generator/marching_squares/contours_builder.hpp
diff --git a/topography_generator/marching_squares/marching_squares.hpp b/tools/topography_generator/marching_squares/marching_squares.hpp
similarity index 100%
rename from topography_generator/marching_squares/marching_squares.hpp
rename to tools/topography_generator/marching_squares/marching_squares.hpp
diff --git a/topography_generator/marching_squares/square.hpp b/tools/topography_generator/marching_squares/square.hpp
similarity index 100%
rename from topography_generator/marching_squares/square.hpp
rename to tools/topography_generator/marching_squares/square.hpp
diff --git a/topography_generator/tile_filter.hpp b/tools/topography_generator/tile_filter.hpp
similarity index 100%
rename from topography_generator/tile_filter.hpp
rename to tools/topography_generator/tile_filter.hpp
diff --git a/topography_generator/utils/contours.hpp b/tools/topography_generator/utils/contours.hpp
similarity index 100%
rename from topography_generator/utils/contours.hpp
rename to tools/topography_generator/utils/contours.hpp
diff --git a/topography_generator/utils/contours_serdes.hpp b/tools/topography_generator/utils/contours_serdes.hpp
similarity index 100%
rename from topography_generator/utils/contours_serdes.hpp
rename to tools/topography_generator/utils/contours_serdes.hpp
diff --git a/topography_generator/utils/values_provider.hpp b/tools/topography_generator/utils/values_provider.hpp
similarity index 100%
rename from topography_generator/utils/values_provider.hpp
rename to tools/topography_generator/utils/values_provider.hpp
diff --git a/track_analyzing/CMakeLists.txt b/tools/track_analyzing/CMakeLists.txt
similarity index 100%
rename from track_analyzing/CMakeLists.txt
rename to tools/track_analyzing/CMakeLists.txt
diff --git a/track_analyzing/exceptions.hpp b/tools/track_analyzing/exceptions.hpp
similarity index 100%
rename from track_analyzing/exceptions.hpp
rename to tools/track_analyzing/exceptions.hpp
diff --git a/track_analyzing/log_parser.cpp b/tools/track_analyzing/log_parser.cpp
similarity index 100%
rename from track_analyzing/log_parser.cpp
rename to tools/track_analyzing/log_parser.cpp
diff --git a/track_analyzing/log_parser.hpp b/tools/track_analyzing/log_parser.hpp
similarity index 100%
rename from track_analyzing/log_parser.hpp
rename to tools/track_analyzing/log_parser.hpp
diff --git a/track_analyzing/serialization.hpp b/tools/track_analyzing/serialization.hpp
similarity index 100%
rename from track_analyzing/serialization.hpp
rename to tools/track_analyzing/serialization.hpp
diff --git a/track_analyzing/temporary_file.cpp b/tools/track_analyzing/temporary_file.cpp
similarity index 100%
rename from track_analyzing/temporary_file.cpp
rename to tools/track_analyzing/temporary_file.cpp
diff --git a/track_analyzing/temporary_file.hpp b/tools/track_analyzing/temporary_file.hpp
similarity index 100%
rename from track_analyzing/temporary_file.hpp
rename to tools/track_analyzing/temporary_file.hpp
diff --git a/track_analyzing/track.cpp b/tools/track_analyzing/track.cpp
similarity index 100%
rename from track_analyzing/track.cpp
rename to tools/track_analyzing/track.cpp
diff --git a/track_analyzing/track.hpp b/tools/track_analyzing/track.hpp
similarity index 100%
rename from track_analyzing/track.hpp
rename to tools/track_analyzing/track.hpp
diff --git a/track_analyzing/track_analyzer/CMakeLists.txt b/tools/track_analyzing/track_analyzer/CMakeLists.txt
similarity index 100%
rename from track_analyzing/track_analyzer/CMakeLists.txt
rename to tools/track_analyzing/track_analyzer/CMakeLists.txt
diff --git a/track_analyzing/track_analyzer/cmd_balance_csv.cpp b/tools/track_analyzing/track_analyzer/cmd_balance_csv.cpp
similarity index 100%
rename from track_analyzing/track_analyzer/cmd_balance_csv.cpp
rename to tools/track_analyzing/track_analyzer/cmd_balance_csv.cpp
diff --git a/track_analyzing/track_analyzer/cmd_balance_csv.hpp b/tools/track_analyzing/track_analyzer/cmd_balance_csv.hpp
similarity index 100%
rename from track_analyzing/track_analyzer/cmd_balance_csv.hpp
rename to tools/track_analyzing/track_analyzer/cmd_balance_csv.hpp
diff --git a/track_analyzing/track_analyzer/cmd_cpp_track.cpp b/tools/track_analyzing/track_analyzer/cmd_cpp_track.cpp
similarity index 100%
rename from track_analyzing/track_analyzer/cmd_cpp_track.cpp
rename to tools/track_analyzing/track_analyzer/cmd_cpp_track.cpp
diff --git a/track_analyzing/track_analyzer/cmd_gpx.cpp b/tools/track_analyzing/track_analyzer/cmd_gpx.cpp
similarity index 100%
rename from track_analyzing/track_analyzer/cmd_gpx.cpp
rename to tools/track_analyzing/track_analyzer/cmd_gpx.cpp
diff --git a/track_analyzing/track_analyzer/cmd_match.cpp b/tools/track_analyzing/track_analyzer/cmd_match.cpp
similarity index 100%
rename from track_analyzing/track_analyzer/cmd_match.cpp
rename to tools/track_analyzing/track_analyzer/cmd_match.cpp
diff --git a/track_analyzing/track_analyzer/cmd_table.cpp b/tools/track_analyzing/track_analyzer/cmd_table.cpp
similarity index 100%
rename from track_analyzing/track_analyzer/cmd_table.cpp
rename to tools/track_analyzing/track_analyzer/cmd_table.cpp
diff --git a/track_analyzing/track_analyzer/cmd_track.cpp b/tools/track_analyzing/track_analyzer/cmd_track.cpp
similarity index 100%
rename from track_analyzing/track_analyzer/cmd_track.cpp
rename to tools/track_analyzing/track_analyzer/cmd_track.cpp
diff --git a/track_analyzing/track_analyzer/cmd_tracks.cpp b/tools/track_analyzing/track_analyzer/cmd_tracks.cpp
similarity index 100%
rename from track_analyzing/track_analyzer/cmd_tracks.cpp
rename to tools/track_analyzing/track_analyzer/cmd_tracks.cpp
diff --git a/track_analyzing/track_analyzer/cmd_unmatched_tracks.cpp b/tools/track_analyzing/track_analyzer/cmd_unmatched_tracks.cpp
similarity index 100%
rename from track_analyzing/track_analyzer/cmd_unmatched_tracks.cpp
rename to tools/track_analyzing/track_analyzer/cmd_unmatched_tracks.cpp
diff --git a/track_analyzing/track_analyzer/crossroad_checker.cpp b/tools/track_analyzing/track_analyzer/crossroad_checker.cpp
similarity index 100%
rename from track_analyzing/track_analyzer/crossroad_checker.cpp
rename to tools/track_analyzing/track_analyzer/crossroad_checker.cpp
diff --git a/track_analyzing/track_analyzer/crossroad_checker.hpp b/tools/track_analyzing/track_analyzer/crossroad_checker.hpp
similarity index 100%
rename from track_analyzing/track_analyzer/crossroad_checker.hpp
rename to tools/track_analyzing/track_analyzer/crossroad_checker.hpp
diff --git a/track_analyzing/track_analyzer/track_analyzer.cpp b/tools/track_analyzing/track_analyzer/track_analyzer.cpp
similarity index 100%
rename from track_analyzing/track_analyzer/track_analyzer.cpp
rename to tools/track_analyzing/track_analyzer/track_analyzer.cpp
diff --git a/track_analyzing/track_analyzer/utils.cpp b/tools/track_analyzing/track_analyzer/utils.cpp
similarity index 100%
rename from track_analyzing/track_analyzer/utils.cpp
rename to tools/track_analyzing/track_analyzer/utils.cpp
diff --git a/track_analyzing/track_analyzer/utils.hpp b/tools/track_analyzing/track_analyzer/utils.hpp
similarity index 100%
rename from track_analyzing/track_analyzer/utils.hpp
rename to tools/track_analyzing/track_analyzer/utils.hpp
diff --git a/track_analyzing/track_analyzing_tests/CMakeLists.txt b/tools/track_analyzing/track_analyzing_tests/CMakeLists.txt
similarity index 100%
rename from track_analyzing/track_analyzing_tests/CMakeLists.txt
rename to tools/track_analyzing/track_analyzing_tests/CMakeLists.txt
diff --git a/track_analyzing/track_analyzing_tests/balance_tests.cpp b/tools/track_analyzing/track_analyzing_tests/balance_tests.cpp
similarity index 100%
rename from track_analyzing/track_analyzing_tests/balance_tests.cpp
rename to tools/track_analyzing/track_analyzing_tests/balance_tests.cpp
diff --git a/track_analyzing/track_analyzing_tests/statistics_tests.cpp b/tools/track_analyzing/track_analyzing_tests/statistics_tests.cpp
similarity index 100%
rename from track_analyzing/track_analyzing_tests/statistics_tests.cpp
rename to tools/track_analyzing/track_analyzing_tests/statistics_tests.cpp
diff --git a/track_analyzing/track_analyzing_tests/track_archive_reader_tests.cpp b/tools/track_analyzing/track_analyzing_tests/track_archive_reader_tests.cpp
similarity index 100%
rename from track_analyzing/track_analyzing_tests/track_archive_reader_tests.cpp
rename to tools/track_analyzing/track_analyzing_tests/track_archive_reader_tests.cpp
diff --git a/track_analyzing/track_archive_reader.cpp b/tools/track_analyzing/track_archive_reader.cpp
similarity index 100%
rename from track_analyzing/track_archive_reader.cpp
rename to tools/track_analyzing/track_archive_reader.cpp
diff --git a/track_analyzing/track_archive_reader.hpp b/tools/track_analyzing/track_archive_reader.hpp
similarity index 100%
rename from track_analyzing/track_archive_reader.hpp
rename to tools/track_analyzing/track_archive_reader.hpp
diff --git a/track_analyzing/track_matcher.cpp b/tools/track_analyzing/track_matcher.cpp
similarity index 100%
rename from track_analyzing/track_matcher.cpp
rename to tools/track_analyzing/track_matcher.cpp
diff --git a/track_analyzing/track_matcher.hpp b/tools/track_analyzing/track_matcher.hpp
similarity index 100%
rename from track_analyzing/track_matcher.hpp
rename to tools/track_analyzing/track_matcher.hpp
diff --git a/track_analyzing/utils.cpp b/tools/track_analyzing/utils.cpp
similarity index 100%
rename from track_analyzing/utils.cpp
rename to tools/track_analyzing/utils.cpp
diff --git a/track_analyzing/utils.hpp b/tools/track_analyzing/utils.hpp
similarity index 100%
rename from track_analyzing/utils.hpp
rename to tools/track_analyzing/utils.hpp
diff --git a/track_generator/CMakeLists.txt b/tools/track_generator/CMakeLists.txt
similarity index 100%
rename from track_generator/CMakeLists.txt
rename to tools/track_generator/CMakeLists.txt
diff --git a/track_generator/track_generator_tool.cpp b/tools/track_generator/track_generator_tool.cpp
similarity index 100%
rename from track_generator/track_generator_tool.cpp
rename to tools/track_generator/track_generator_tool.cpp
diff --git a/track_generator/utils.cpp b/tools/track_generator/utils.cpp
similarity index 100%
rename from track_generator/utils.cpp
rename to tools/track_generator/utils.cpp
diff --git a/track_generator/utils.hpp b/tools/track_generator/utils.hpp
similarity index 100%
rename from track_generator/utils.hpp
rename to tools/track_generator/utils.hpp
diff --git a/tools/unix/generate_symbols.sh b/tools/unix/generate_symbols.sh
index b2a521112..68f247dd8 100755
--- a/tools/unix/generate_symbols.sh
+++ b/tools/unix/generate_symbols.sh
@@ -20,27 +20,16 @@ export PYTHONDONTWRITEBYTECODE=1
 # Add env var to disable renderer on a display (renderer not working into a Github container)
 export QT_QPA_PLATFORM=offscreen
 
+BINARY_NAME=skin_generator_tool
 OMIM_PATH="${OMIM_PATH:-$(cd "$(dirname "$0")/../.."; pwd)}"
-OUT_PATH="$OMIM_PATH/out/release"
-SKIN_GENERATOR="${SKIN_GENERATOR:-$OUT_PATH/skin_generator_tool}"
+BUILD_DIR="$OMIM_PATH/build"
+SKIN_GENERATOR="${SKIN_GENERATOR:-$BUILD_DIR/$BINARY_NAME}"
 DATA_PATH="$OMIM_PATH/data"
 
-# If skin_generator does not exist then build it
-if [ ! -f "$SKIN_GENERATOR" ];
-then
-  source "$OMIM_PATH/tools/autobuild/detect_cmake.sh"
-  # OS-specific parameters
-  if [ "$(uname -s)" == "Darwin" ]; then
-    PROCESSES=$(sysctl -n hw.ncpu)
-  else
-    PROCESSES=$(nproc)
-  fi
-  mkdir -p "$OUT_PATH"
-  pushd "$OUT_PATH" > /dev/null
-  "$CMAKE" "$OMIM_PATH" -DSKIP_TESTS:bool=true
-  make skin_generator_tool -j$PROCESSES
-  popd > /dev/null
-fi
+# cmake rebuilds skin generator binary if necessary.
+cmake -S "$OMIM_PATH" -B "$BUILD_DIR" -G Ninja -DCMAKE_BUILD_TYPE=Release -DSKIP_TESTS:bool=true
+cmake --build "$BUILD_DIR" --target "$BINARY_NAME"
+
 
 # Helper function to build skin
 # Parameter $1 - style type (default)
diff --git a/xcode/CoMaps.xcworkspace/contents.xcworkspacedata b/xcode/CoMaps.xcworkspace/contents.xcworkspacedata
index 490f821db..292dc0328 100644
--- a/xcode/CoMaps.xcworkspace/contents.xcworkspacedata
+++ b/xcode/CoMaps.xcworkspace/contents.xcworkspacedata
@@ -11,17 +11,17 @@
       location = "container:common.xcconfig">
    </FileRef>
    <Group
-      location = "group:../std"
+      location = "group:../libs/std"
       name = "std">
       <FileRef
-         location = "group:../std/target_os.hpp">
+         location = "group:../libs/std/target_os.hpp">
       </FileRef>
       <FileRef
-         location = "group:../std/windows.hpp">
+         location = "group:../libs/std/windows.hpp">
       </FileRef>
    </Group>
    <Group
-      location = "container:../pyhelpers"
+      location = "container:../libs/pyhelpers"
       name = "pyhelpers">
       <FileRef
          location = "group:pair.hpp">
@@ -85,7 +85,7 @@
          location = "container:tess2/tess2.xcodeproj">
       </FileRef>
       <FileRef
-         location = "group:vulkan_wrapper/vulkan_wrapper.xcodeproj">
+         location = "container:vulkan_wrapper/vulkan_wrapper.xcodeproj">
       </FileRef>
    </Group>
    <FileRef
@@ -146,7 +146,7 @@
       location = "container:search/search.xcodeproj">
    </FileRef>
    <FileRef
-      location = "group:shaders/shaders.xcodeproj">
+      location = "container:shaders/shaders.xcodeproj">
    </FileRef>
    <FileRef
       location = "container:storage/storage.xcodeproj">
@@ -158,7 +158,7 @@
       location = "container:traffic/traffic.xcodeproj">
    </FileRef>
    <FileRef
-      location = "group:transit/transit.xcodeproj">
+      location = "container:transit/transit.xcodeproj">
    </FileRef>
    <FileRef
       location = "group:../iphone/Chart/Chart.xcodeproj">
diff --git a/xcode/base/base.xcodeproj/project.pbxproj b/xcode/base/base.xcodeproj/project.pbxproj
index 570062965..40683d11c 100644
--- a/xcode/base/base.xcodeproj/project.pbxproj
+++ b/xcode/base/base.xcodeproj/project.pbxproj
@@ -213,7 +213,7 @@
 		39FD26E11CC65A0E00AFF551 /* threads_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = threads_test.cpp; sourceTree = "<group>"; };
 		39FD26E21CC65A0E00AFF551 /* timegm_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = timegm_test.cpp; sourceTree = "<group>"; };
 		39FD26E31CC65A0E00AFF551 /* timer_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = timer_test.cpp; sourceTree = "<group>"; };
-		39FD27011CC65A2800AFF551 /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = "<group>"; };
+		39FD27011CC65A2800AFF551 /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../libs/testing/testingmain.cpp; sourceTree = "<group>"; };
 		39FD27071CC65A7100AFF551 /* base_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = base_tests.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		3D08987824810A0B00837783 /* linked_map.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = linked_map.hpp; sourceTree = "<group>"; };
 		3D08987A24810A1300837783 /* linked_map_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = linked_map_tests.cpp; sourceTree = "<group>"; };
@@ -375,7 +375,7 @@
 				39F995E220F55B8A0034F977 /* visitor_tests.cpp */,
 			);
 			name = base_tests;
-			path = ../../base/base_tests;
+			path = ../../libs/base/base_tests;
 			sourceTree = "<group>";
 		};
 		6753416E1A3F57BF00A0A8C3 = {
@@ -500,7 +500,7 @@
 				3D78157A1F3D89EC0068B6AC /* waiter.hpp */,
 			);
 			name = base;
-			path = ../../base;
+			path = ../../libs/base;
 			sourceTree = SOURCE_ROOT;
 		};
 		675345381A3F6F5E00A0A8C3 /* internal */ = {
diff --git a/xcode/coding/coding.xcodeproj/project.pbxproj b/xcode/coding/coding.xcodeproj/project.pbxproj
index 9e764a22f..e81c74dbd 100644
--- a/xcode/coding/coding.xcodeproj/project.pbxproj
+++ b/xcode/coding/coding.xcodeproj/project.pbxproj
@@ -185,7 +185,7 @@
 		34A72A431DBE4989003D1F5F /* common-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = "<group>"; };
 		34A72A441DBE4989003D1F5F /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = "<group>"; };
 		3949168F1BAC3A5F002A8C4F /* coding_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = coding_tests.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		3949171F1BAC3BE0002A8C4F /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = "<group>"; };
+		3949171F1BAC3BE0002A8C4F /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../libs/testing/testingmain.cpp; sourceTree = "<group>"; };
 		394917221BAC3C2F002A8C4F /* huffman.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = huffman.cpp; sourceTree = "<group>"; };
 		394917231BAC3C2F002A8C4F /* huffman.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = huffman.hpp; sourceTree = "<group>"; };
 		3954E00D233500E90007FDE4 /* files_container.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = files_container.hpp; sourceTree = "<group>"; };
@@ -419,7 +419,7 @@
 				395D1A91207BBBAC001164A5 /* zlib_test.cpp */,
 			);
 			name = coding_tests;
-			path = ../../coding/coding_tests;
+			path = ../../libs/coding/coding_tests;
 			sourceTree = "<group>";
 		};
 		670D04B21B0BA9050013A7AC /* internal */ = {
@@ -545,7 +545,7 @@
 				34A129D21DF99E43001B4531 /* zlib.hpp */,
 			);
 			name = coding;
-			path = ../../coding;
+			path = ../../libs/coding;
 			sourceTree = SOURCE_ROOT;
 		};
 /* End PBXGroup section */
diff --git a/xcode/common.xcconfig b/xcode/common.xcconfig
index fe50da5b9..7edb7fa65 100644
--- a/xcode/common.xcconfig
+++ b/xcode/common.xcconfig
@@ -5,7 +5,7 @@ QT_PATH[arch=arm64] = /opt/homebrew/opt/qt@6
 BOOST_ROOT = $(OMIM_ROOT)/3party/boost
 
 // jansson is included in many libs, and is also used in headers (leaks to other libs)
-HEADER_SEARCH_PATHS = $(inherited) $(OMIM_ROOT) $(BOOST_ROOT) $(OMIM_ROOT)/3party/jansson $(OMIM_ROOT)/3party/jansson/jansson/src $(OMIM_ROOT)/3party/utfcpp/source
+HEADER_SEARCH_PATHS = $(inherited) $(OMIM_ROOT) $(OMIM_ROOT)/libs $(BOOST_ROOT) $(OMIM_ROOT)/3party/jansson $(OMIM_ROOT)/3party/jansson/jansson/src $(OMIM_ROOT)/3party/utfcpp/source
 FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(QT_PATH)/lib
 
 // Deployment target
diff --git a/xcode/cppjansson/cppjansson.xcodeproj/project.pbxproj b/xcode/cppjansson/cppjansson.xcodeproj/project.pbxproj
index 323906094..00b481101 100644
--- a/xcode/cppjansson/cppjansson.xcodeproj/project.pbxproj
+++ b/xcode/cppjansson/cppjansson.xcodeproj/project.pbxproj
@@ -77,7 +77,7 @@
 				7168E916294CBB91005BA468 /* cppjansson.hpp */,
 			);
 			name = cppjansson;
-			path = ../../cppjansson;
+			path = ../../libs/cppjansson;
 			sourceTree = "<group>";
 		};
 		71D730FC294CC4B400F3EEC2 /* Frameworks */ = {
diff --git a/xcode/descriptions/descriptions.xcodeproj/project.pbxproj b/xcode/descriptions/descriptions.xcodeproj/project.pbxproj
index a882a0079..5823f24a5 100644
--- a/xcode/descriptions/descriptions.xcodeproj/project.pbxproj
+++ b/xcode/descriptions/descriptions.xcodeproj/project.pbxproj
@@ -63,7 +63,7 @@
 				B7A5517221CAFB2800789B7E /* serdes.hpp */,
 			);
 			name = descriptions;
-			path = ../../descriptions;
+			path = ../../libs/descriptions;
 			sourceTree = SOURCE_ROOT;
 		};
 /* End PBXGroup section */
diff --git a/xcode/drape/drape.xcodeproj/project.pbxproj b/xcode/drape/drape.xcodeproj/project.pbxproj
index cbe56ddec..b84ad6270 100644
--- a/xcode/drape/drape.xcodeproj/project.pbxproj
+++ b/xcode/drape/drape.xcodeproj/project.pbxproj
@@ -481,7 +481,7 @@
 				4577B24321F2034200864FAC /* vulkan */,
 			);
 			name = drape;
-			path = ../../drape;
+			path = ../../libs/drape;
 			sourceTree = SOURCE_ROOT;
 		};
 		6729A55C1A69213A007D5872 /* utils */ = {
diff --git a/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj b/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj
index 959a01117..9ccf76f38 100644
--- a/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj
+++ b/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj
@@ -617,7 +617,7 @@
 				670947901BDF9BE1005014C0 /* visual_params.hpp */,
 			);
 			name = drape_frontend;
-			path = ../../drape_frontend;
+			path = ../../libs/drape_frontend;
 			sourceTree = "<group>";
 		};
 		670948051BDF9C0D005014C0 /* animation */ = {
diff --git a/xcode/editor/editor.xcodeproj/project.pbxproj b/xcode/editor/editor.xcodeproj/project.pbxproj
index afb5c320b..0b53cabfc 100644
--- a/xcode/editor/editor.xcodeproj/project.pbxproj
+++ b/xcode/editor/editor.xcodeproj/project.pbxproj
@@ -96,7 +96,7 @@
 		3496ABD41DC2034900C5DDBA /* opening_hours_ui_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = opening_hours_ui_test.cpp; sourceTree = "<group>"; };
 		3496ABD61DC2034900C5DDBA /* ui2oh_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ui2oh_test.cpp; sourceTree = "<group>"; };
 		3496ABD81DC2034900C5DDBA /* xml_feature_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xml_feature_test.cpp; sourceTree = "<group>"; };
-		3496AC011DC2047D00C5DDBA /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = "<group>"; };
+		3496AC011DC2047D00C5DDBA /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../libs/testing/testingmain.cpp; sourceTree = "<group>"; };
 		3496AC041DC204B700C5DDBA /* editor.config */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = editor.config; path = ../../data/editor.config; sourceTree = "<group>"; };
 		34F5586E1DBF49B200A4FC11 /* common-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../common-debug.xcconfig"; sourceTree = "<group>"; };
 		34F5586F1DBF49B200A4FC11 /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = "<group>"; };
@@ -257,7 +257,7 @@
 				34583BBE1C8854C100F94664 /* yes_no_unknown.hpp */,
 			);
 			name = editor;
-			path = ../../editor;
+			path = ../../libs/editor;
 			sourceTree = SOURCE_ROOT;
 		};
 		3496ABD01DC2032800C5DDBA /* editor_tests */ = {
@@ -277,7 +277,7 @@
 				3496ABD81DC2034900C5DDBA /* xml_feature_test.cpp */,
 			);
 			name = editor_tests;
-			path = ../../editor/editor_tests;
+			path = ../../libs/editor/editor_tests;
 			sourceTree = "<group>";
 		};
 		3496ABEA1DC2041800C5DDBA /* Frameworks */ = {
@@ -313,7 +313,7 @@
 				6715560D20BF01EE002BA3B4 /* helpers.hpp */,
 			);
 			name = editor_tests_support;
-			path = ../../editor/editor_tests_support;
+			path = ../../libs/editor/editor_tests_support;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
diff --git a/xcode/ge0/ge0.xcodeproj/project.pbxproj b/xcode/ge0/ge0.xcodeproj/project.pbxproj
index 06a661d46..c38781da4 100644
--- a/xcode/ge0/ge0.xcodeproj/project.pbxproj
+++ b/xcode/ge0/ge0.xcodeproj/project.pbxproj
@@ -12,16 +12,16 @@
 		391A145E23E0FC8400A448F4 /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 391A145D23E0FC8400A448F4 /* libcoding.a */; };
 		391A146023E0FC8700A448F4 /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 391A145F23E0FC8700A448F4 /* libbase.a */; };
 		391A146623E0FC9A00A448F4 /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 391A146523E0FC9A00A448F4 /* libz.tbd */; };
-		39C29BD023E19B3C009ECB47 /* parser.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 39C29BCC23E19B3C009ECB47 /* parser.hpp */; };
-		39C29BD123E19B3C009ECB47 /* parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39C29BCD23E19B3C009ECB47 /* parser.cpp */; };
-		39C29BD223E19B3C009ECB47 /* url_generator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 39C29BCE23E19B3C009ECB47 /* url_generator.hpp */; };
-		39C29BD323E19B3C009ECB47 /* url_generator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39C29BCF23E19B3C009ECB47 /* url_generator.cpp */; };
-		AC3F14BF279C6D8C00AFEC02 /* geo_url_parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC3F14BA279C524D00AFEC02 /* geo_url_parser.cpp */; };
-		AC3F14C0279C6D9500AFEC02 /* geo_url_parser.hpp in Headers */ = {isa = PBXBuildFile; fileRef = AC3F14B9279C524D00AFEC02 /* geo_url_parser.hpp */; };
 		AC3F14C2279C6DEB00AFEC02 /* geo_url_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AC3F14C1279C6DEB00AFEC02 /* geo_url_tests.cpp */; };
 		FACB76A526B8939C00810C9C /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FACB76A426B8939C00810C9C /* testingmain.cpp */; };
 		FACB76A626B893A000810C9C /* url_generator_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FACB76A226B8937800810C9C /* url_generator_tests.cpp */; };
 		FACB76A726B893A300810C9C /* parser_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FACB76A326B8937800810C9C /* parser_tests.cpp */; };
+		FAEE27C22E29B6AF00855F79 /* geo_url_parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAEE27BB2E29B6AF00855F79 /* geo_url_parser.cpp */; };
+		FAEE27C52E29B6AF00855F79 /* parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAEE27BD2E29B6AF00855F79 /* parser.cpp */; };
+		FAEE27C62E29B6AF00855F79 /* url_generator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FAEE27BF2E29B6AF00855F79 /* url_generator.cpp */; };
+		FAEE27C72E29B6AF00855F79 /* geo_url_parser.hpp in Headers */ = {isa = PBXBuildFile; fileRef = FAEE27BA2E29B6AF00855F79 /* geo_url_parser.hpp */; };
+		FAEE27C82E29B6AF00855F79 /* url_generator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = FAEE27BE2E29B6AF00855F79 /* url_generator.hpp */; };
+		FAEE27C92E29B6AF00855F79 /* parser.hpp in Headers */ = {isa = PBXBuildFile; fileRef = FAEE27BC2E29B6AF00855F79 /* parser.hpp */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -32,17 +32,18 @@
 		391A145D23E0FC8400A448F4 /* libcoding.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libcoding.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		391A145F23E0FC8700A448F4 /* libbase.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libbase.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		391A146523E0FC9A00A448F4 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
-		39C29BCC23E19B3C009ECB47 /* parser.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = parser.hpp; path = ../../ge0/parser.hpp; sourceTree = "<group>"; };
-		39C29BCD23E19B3C009ECB47 /* parser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = parser.cpp; path = ../../ge0/parser.cpp; sourceTree = "<group>"; };
-		39C29BCE23E19B3C009ECB47 /* url_generator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = url_generator.hpp; path = ../../ge0/url_generator.hpp; sourceTree = "<group>"; };
-		39C29BCF23E19B3C009ECB47 /* url_generator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = url_generator.cpp; path = ../../ge0/url_generator.cpp; sourceTree = "<group>"; };
 		675347171A40577A00A0A8C3 /* libge0.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libge0.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		AC3F14B9279C524D00AFEC02 /* geo_url_parser.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; name = geo_url_parser.hpp; path = ../../ge0/geo_url_parser.hpp; sourceTree = "<group>"; };
-		AC3F14BA279C524D00AFEC02 /* geo_url_parser.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = geo_url_parser.cpp; path = ../../ge0/geo_url_parser.cpp; sourceTree = "<group>"; };
 		AC3F14C1279C6DEB00AFEC02 /* geo_url_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = geo_url_tests.cpp; sourceTree = "<group>"; };
 		FACB76A226B8937800810C9C /* url_generator_tests.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = url_generator_tests.cpp; sourceTree = "<group>"; };
 		FACB76A326B8937800810C9C /* parser_tests.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = parser_tests.cpp; sourceTree = "<group>"; };
-		FACB76A426B8939C00810C9C /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = "<group>"; };
+		FACB76A426B8939C00810C9C /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../libs/testing/testingmain.cpp; sourceTree = "<group>"; };
+		FAEE27B92E29B6AF00855F79 /* ge0.php */ = {isa = PBXFileReference; lastKnownFileType = text.script.php; path = ge0.php; sourceTree = "<group>"; };
+		FAEE27BA2E29B6AF00855F79 /* geo_url_parser.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = geo_url_parser.hpp; sourceTree = "<group>"; };
+		FAEE27BB2E29B6AF00855F79 /* geo_url_parser.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = geo_url_parser.cpp; sourceTree = "<group>"; };
+		FAEE27BC2E29B6AF00855F79 /* parser.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = parser.hpp; sourceTree = "<group>"; };
+		FAEE27BD2E29B6AF00855F79 /* parser.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = parser.cpp; sourceTree = "<group>"; };
+		FAEE27BE2E29B6AF00855F79 /* url_generator.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = url_generator.hpp; sourceTree = "<group>"; };
+		FAEE27BF2E29B6AF00855F79 /* url_generator.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = url_generator.cpp; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -82,13 +83,8 @@
 		6753470E1A40577A00A0A8C3 = {
 			isa = PBXGroup;
 			children = (
-				AC3F14BA279C524D00AFEC02 /* geo_url_parser.cpp */,
-				AC3F14B9279C524D00AFEC02 /* geo_url_parser.hpp */,
+				FAEE27C02E29B6AF00855F79 /* ge0 */,
 				FACB76A026B8937800810C9C /* ge0_tests */,
-				39C29BCD23E19B3C009ECB47 /* parser.cpp */,
-				39C29BCC23E19B3C009ECB47 /* parser.hpp */,
-				39C29BCF23E19B3C009ECB47 /* url_generator.cpp */,
-				39C29BCE23E19B3C009ECB47 /* url_generator.hpp */,
 				34763F471DBE28F800D370CF /* common-debug.xcconfig */,
 				34763F481DBE28F800D370CF /* common-release.xcconfig */,
 				675347181A40577A00A0A8C3 /* Products */,
@@ -116,9 +112,24 @@
 				FACB76A326B8937800810C9C /* parser_tests.cpp */,
 			);
 			name = ge0_tests;
-			path = ../../ge0/ge0_tests;
+			path = ../../libs/ge0/ge0_tests;
 			sourceTree = "<group>";
 		};
+		FAEE27C02E29B6AF00855F79 /* ge0 */ = {
+			isa = PBXGroup;
+			children = (
+				FAEE27B92E29B6AF00855F79 /* ge0.php */,
+				FAEE27BA2E29B6AF00855F79 /* geo_url_parser.hpp */,
+				FAEE27BB2E29B6AF00855F79 /* geo_url_parser.cpp */,
+				FAEE27BC2E29B6AF00855F79 /* parser.hpp */,
+				FAEE27BD2E29B6AF00855F79 /* parser.cpp */,
+				FAEE27BE2E29B6AF00855F79 /* url_generator.hpp */,
+				FAEE27BF2E29B6AF00855F79 /* url_generator.cpp */,
+			);
+			name = ge0;
+			path = ../../libs/ge0;
+			sourceTree = SOURCE_ROOT;
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -126,9 +137,9 @@
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				39C29BD223E19B3C009ECB47 /* url_generator.hpp in Headers */,
-				39C29BD023E19B3C009ECB47 /* parser.hpp in Headers */,
-				AC3F14C0279C6D9500AFEC02 /* geo_url_parser.hpp in Headers */,
+				FAEE27C72E29B6AF00855F79 /* geo_url_parser.hpp in Headers */,
+				FAEE27C82E29B6AF00855F79 /* url_generator.hpp in Headers */,
+				FAEE27C92E29B6AF00855F79 /* parser.hpp in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -233,9 +244,9 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				39C29BD123E19B3C009ECB47 /* parser.cpp in Sources */,
-				AC3F14BF279C6D8C00AFEC02 /* geo_url_parser.cpp in Sources */,
-				39C29BD323E19B3C009ECB47 /* url_generator.cpp in Sources */,
+				FAEE27C22E29B6AF00855F79 /* geo_url_parser.cpp in Sources */,
+				FAEE27C52E29B6AF00855F79 /* parser.cpp in Sources */,
+				FAEE27C62E29B6AF00855F79 /* url_generator.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/xcode/geometry/geometry.xcodeproj/project.pbxproj b/xcode/geometry/geometry.xcodeproj/project.pbxproj
index d866bc612..504be4227 100644
--- a/xcode/geometry/geometry.xcodeproj/project.pbxproj
+++ b/xcode/geometry/geometry.xcodeproj/project.pbxproj
@@ -196,7 +196,7 @@
 		670F293B1BA9D2E700F2ABF4 /* tree_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tree_test.cpp; sourceTree = "<group>"; };
 		670F293C1BA9D2E700F2ABF4 /* vector_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vector_test.cpp; sourceTree = "<group>"; };
 		670F295C1BA9D39A00F2ABF4 /* geometry_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = geometry_tests.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		670F297E1BA9D41E00F2ABF4 /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = "<group>"; };
+		670F297E1BA9D41E00F2ABF4 /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../libs/testing/testingmain.cpp; sourceTree = "<group>"; };
 		671C2D5422AFD904008B2B8B /* meter.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = meter.hpp; sourceTree = "<group>"; };
 		6741AA9E1BF35476002C974C /* latlon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = latlon.cpp; sourceTree = "<group>"; };
 		6741AA9F1BF35476002C974C /* latlon.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = latlon.hpp; sourceTree = "<group>"; };
@@ -307,7 +307,7 @@
 				670F293C1BA9D2E700F2ABF4 /* vector_test.cpp */,
 			);
 			name = geometry_tests;
-			path = ../../geometry/geometry_tests;
+			path = ../../libs/geometry/geometry_tests;
 			sourceTree = "<group>";
 		};
 		675344881A3F684600A0A8C3 = {
@@ -403,7 +403,7 @@
 				347F336F1C454205009758CC /* triangle2d.hpp */,
 			);
 			name = geometry;
-			path = ../../geometry;
+			path = ../../libs/geometry;
 			sourceTree = SOURCE_ROOT;
 		};
 		675344DA1A3F68E200A0A8C3 /* region2d */ = {
diff --git a/xcode/indexer/indexer.xcodeproj/project.pbxproj b/xcode/indexer/indexer.xcodeproj/project.pbxproj
index f11bdde32..b25f19f19 100644
--- a/xcode/indexer/indexer.xcodeproj/project.pbxproj
+++ b/xcode/indexer/indexer.xcodeproj/project.pbxproj
@@ -327,7 +327,7 @@
 		670C61071AB065B100C38A8C /* sort_and_merge_intervals_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sort_and_merge_intervals_test.cpp; sourceTree = "<group>"; };
 		670C610A1AB065B100C38A8C /* test_type.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_type.cpp; sourceTree = "<group>"; };
 		670C610B1AB065B100C38A8C /* visibility_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = visibility_test.cpp; sourceTree = "<group>"; };
-		670C611F1AB065E100C38A8C /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = "<group>"; };
+		670C611F1AB065E100C38A8C /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../libs/testing/testingmain.cpp; sourceTree = "<group>"; };
 		670C61251AB0661100C38A8C /* indexer_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = indexer_tests.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		670C61581AB0691900C38A8C /* features_offsets_table.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = features_offsets_table.cpp; sourceTree = "<group>"; };
 		670C61591AB0691900C38A8C /* features_offsets_table.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = features_offsets_table.hpp; sourceTree = "<group>"; };
@@ -570,7 +570,7 @@
 				3D452AF71EE6D9F5009EAB9B /* wheelchair_tests.cpp */,
 			);
 			name = indexer_tests;
-			path = ../../indexer/indexer_tests;
+			path = ../../libs/indexer/indexer_tests;
 			sourceTree = "<group>";
 		};
 		675340911A3F53CB00A0A8C3 = {
@@ -740,7 +740,7 @@
 				FA7F9B82273F32680093EA08 /* validate_and_format_contacts.hpp */,
 			);
 			name = indexer;
-			path = ../../indexer;
+			path = ../../libs/indexer;
 			sourceTree = SOURCE_ROOT;
 		};
 /* End PBXGroup section */
diff --git a/xcode/kml/kml.xcodeproj/project.pbxproj b/xcode/kml/kml.xcodeproj/project.pbxproj
index ce90a474a..428bc466d 100644
--- a/xcode/kml/kml.xcodeproj/project.pbxproj
+++ b/xcode/kml/kml.xcodeproj/project.pbxproj
@@ -56,7 +56,7 @@
 		45E4559420584ABA00D9F45E /* types.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = types.hpp; sourceTree = "<group>"; };
 		45E455ED20584DCB00D9F45E /* kml_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = kml_tests.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		45E455FF20584DEF00D9F45E /* serdes_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = serdes_tests.cpp; sourceTree = "<group>"; };
-		45E456122058508C00D9F45E /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = "<group>"; };
+		45E456122058508C00D9F45E /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../libs/testing/testingmain.cpp; sourceTree = "<group>"; };
 		464344F2294F952700984CB7 /* gpx_tests.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = gpx_tests.cpp; sourceTree = "<group>"; };
 		464BD0FB294546B20011955A /* serdes_gpx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; path = serdes_gpx.cpp; sourceTree = "<group>"; };
 		464BD0FC294546B20011955A /* serdes_gpx.hpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.h; path = serdes_gpx.hpp; sourceTree = "<group>"; };
@@ -158,7 +158,7 @@
 				45E4559120584ABA00D9F45E /* visitors.hpp */,
 			);
 			name = kml;
-			path = ../../kml;
+			path = ../../libs/kml;
 			sourceTree = "<group>";
 		};
 		45E455EE20584DCC00D9F45E /* kml_tests */ = {
@@ -171,7 +171,7 @@
 				464344F2294F952700984CB7 /* gpx_tests.cpp */,
 			);
 			name = kml_tests;
-			path = ../../kml/kml_tests;
+			path = ../../libs/kml/kml_tests;
 			sourceTree = "<group>";
 		};
 		45E4560220584E1C00D9F45E /* Frameworks */ = {
diff --git a/xcode/map/map.xcodeproj/project.pbxproj b/xcode/map/map.xcodeproj/project.pbxproj
index 5c9d17a45..ab9cf0a4e 100644
--- a/xcode/map/map.xcodeproj/project.pbxproj
+++ b/xcode/map/map.xcodeproj/project.pbxproj
@@ -201,7 +201,7 @@
 		674A29CE1B26FCFE001A525C /* kmz_unarchive_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = kmz_unarchive_test.cpp; sourceTree = "<group>"; };
 		674A29CF1B26FCFE001A525C /* mwm_url_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mwm_url_tests.cpp; sourceTree = "<group>"; };
 		674A29DF1B26FD1C001A525C /* map_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = map_tests.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		674A29EE1B26FD5F001A525C /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = "<group>"; };
+		674A29EE1B26FD5F001A525C /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../libs/testing/testingmain.cpp; sourceTree = "<group>"; };
 		674A2A351B27011A001A525C /* working_time_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = working_time_tests.cpp; sourceTree = "<group>"; };
 		674A2A371B2715FB001A525C /* osm_opening_hours.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = osm_opening_hours.hpp; sourceTree = "<group>"; };
 		674C385F1BFF3095000D603B /* user_mark.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = user_mark.cpp; sourceTree = "<group>"; };
@@ -323,7 +323,7 @@
 				3DA571EF20C19262007BDE27 /* interactive_search_test.cpp */,
 			);
 			name = map_integration_tests;
-			path = ../../map/map_integration_tests;
+			path = ../../libs/map/map_integration_tests;
 			sourceTree = "<group>";
 		};
 		3DEE1AD921EE03B400054A91 /* power_management */ = {
@@ -362,7 +362,7 @@
 				ED85D1CF2D5F508700D8075D /* track_statistics_tests.cpp */,
 			);
 			name = map_tests;
-			path = ../../map/map_tests;
+			path = ../../libs/map/map_tests;
 			sourceTree = "<group>";
 		};
 		675345B21A4054AD00A0A8C3 = {
@@ -466,7 +466,7 @@
 				3D4E99811FB462B60025B48C /* viewport_search_params.hpp */,
 			);
 			name = map;
-			path = ../../map;
+			path = ../../libs/map;
 			sourceTree = "<group>";
 		};
 		BB4E5F201FCC663700A77250 /* transit */ = {
diff --git a/xcode/mwm_diff/mwm_diff.xcodeproj/project.pbxproj b/xcode/mwm_diff/mwm_diff.xcodeproj/project.pbxproj
index a87855406..6786dee63 100644
--- a/xcode/mwm_diff/mwm_diff.xcodeproj/project.pbxproj
+++ b/xcode/mwm_diff/mwm_diff.xcodeproj/project.pbxproj
@@ -57,7 +57,7 @@
 				4586D0E31F48139400DF9CE5 /* diff.hpp */,
 			);
 			name = mwm_diff;
-			path = ../../generator/mwm_diff;
+			path = ../../libs/mwm_diff;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
diff --git a/xcode/openlr/openlr.xcodeproj/project.pbxproj b/xcode/openlr/openlr.xcodeproj/project.pbxproj
index fd0dd938d..042d8a175 100644
--- a/xcode/openlr/openlr.xcodeproj/project.pbxproj
+++ b/xcode/openlr/openlr.xcodeproj/project.pbxproj
@@ -147,7 +147,7 @@
 				671E790F1E6A502200B2859B /* way_point.hpp */,
 			);
 			name = openlr;
-			path = ../../openlr;
+			path = ../../tools/openlr;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
diff --git a/xcode/platform/platform.xcodeproj/project.pbxproj b/xcode/platform/platform.xcodeproj/project.pbxproj
index 367f3f85c..c32797c28 100644
--- a/xcode/platform/platform.xcodeproj/project.pbxproj
+++ b/xcode/platform/platform.xcodeproj/project.pbxproj
@@ -212,7 +212,7 @@
 		675341061C58C4C9002CF0D9 /* location_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = location_test.cpp; sourceTree = "<group>"; };
 		675341071C58C4C9002CF0D9 /* measurement_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = measurement_tests.cpp; sourceTree = "<group>"; };
 		675341081C58C4C9002CF0D9 /* platform_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = platform_test.cpp; sourceTree = "<group>"; };
-		675341141C58C4D8002CF0D9 /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = "<group>"; };
+		675341141C58C4D8002CF0D9 /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../libs/testing/testingmain.cpp; sourceTree = "<group>"; };
 		675343781A3F5CF500A0A8C3 /* libplatform.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libplatform.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		675343861A3F5D5900A0A8C3 /* location_service/apple_location_service.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = location_service/apple_location_service.mm; sourceTree = "<group>"; };
 		675343881A3F5D5900A0A8C3 /* chunks_download_strategy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = chunks_download_strategy.cpp; sourceTree = "<group>"; };
@@ -339,7 +339,7 @@
 				44CAB5F52A1F926800819330 /* utm_mgrs_utils_tests.cpp */,
 			);
 			name = platform_tests;
-			path = ../../platform/platform_tests;
+			path = ../../libs/platform/platform_tests;
 			sourceTree = "<group>";
 		};
 		675340E41C58C43A002CF0D9 /* platform_tests_support */ = {
@@ -359,7 +359,7 @@
 				67247FFC1C60BD6500EDE56A /* writable_dir_changer.hpp */,
 			);
 			name = platform_tests_support;
-			path = ../../platform/platform_tests_support;
+			path = ../../libs/platform/platform_tests_support;
 			sourceTree = "<group>";
 		};
 		6753436F1A3F5CF500A0A8C3 = {
@@ -485,7 +485,7 @@
 				44DC51072A1F91EA00B6562E /* utm_mgrs_utils.cpp */,
 			);
 			name = platform;
-			path = ../../platform;
+			path = ../../libs/platform;
 			sourceTree = SOURCE_ROOT;
 		};
 		678338A91C6DF4BD00FD6263 /* Resources */ = {
diff --git a/xcode/routing/routing.xcodeproj/project.pbxproj b/xcode/routing/routing.xcodeproj/project.pbxproj
index a928e110d..4271946c9 100644
--- a/xcode/routing/routing.xcodeproj/project.pbxproj
+++ b/xcode/routing/routing.xcodeproj/project.pbxproj
@@ -405,8 +405,8 @@
 		567E9F731F5850460064CB96 /* bicycle_turn_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bicycle_turn_test.cpp; sourceTree = "<group>"; };
 		567E9F741F5850460064CB96 /* turn_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = turn_test.cpp; sourceTree = "<group>"; };
 		567E9F7A1F58506B0064CB96 /* street_names_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = street_names_test.cpp; sourceTree = "<group>"; };
-		567F81922154D6FF0093C25B /* city_roads.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = city_roads.cpp; path = ../../routing/city_roads.cpp; sourceTree = "<group>"; };
-		567F81932154D6FF0093C25B /* city_roads.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = city_roads.hpp; path = ../../routing/city_roads.hpp; sourceTree = "<group>"; };
+		567F81922154D6FF0093C25B /* city_roads.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = city_roads.cpp; sourceTree = "<group>"; };
+		567F81932154D6FF0093C25B /* city_roads.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = city_roads.hpp; sourceTree = "<group>"; };
 		568194731F03A32400450EC3 /* road_access_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = road_access_test.cpp; sourceTree = "<group>"; };
 		568194741F03A32400450EC3 /* routing_helpers_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = routing_helpers_tests.cpp; sourceTree = "<group>"; };
 		5694723F2418C8220013CD21 /* car_directions.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = car_directions.hpp; sourceTree = "<group>"; };
@@ -462,7 +462,7 @@
 		6742ACB51C68A0B1009CB89E /* turns_generator_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = turns_generator_test.cpp; sourceTree = "<group>"; };
 		6742ACB61C68A0B1009CB89E /* turns_sound_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = turns_sound_test.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		6742ACB71C68A0B1009CB89E /* turns_tts_text_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = turns_tts_text_tests.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
-		6742ACDE1C68A13F009CB89E /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = "<group>"; };
+		6742ACDE1C68A13F009CB89E /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../libs/testing/testingmain.cpp; sourceTree = "<group>"; };
 		6742AD0E1C68A91B009CB89E /* routing_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = routing_tests.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		6742AD531C68BB14009CB89E /* classificator.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = classificator.txt; sourceTree = "<group>"; };
 		6742AD551C68C7C1009CB89E /* types.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = types.txt; sourceTree = "<group>"; };
@@ -635,7 +635,7 @@
 				440BE38422AFB31100C548FB /* world_graph_builder.hpp */,
 			);
 			name = routing_tests;
-			path = ../../routing/routing_tests;
+			path = ../../libs/routing/routing_tests;
 			sourceTree = "<group>";
 		};
 		6742AD511C68BAEE009CB89E /* Resources */ = {
@@ -659,8 +659,6 @@
 		675343EF1A3F640D00A0A8C3 = {
 			isa = PBXGroup;
 			children = (
-				567F81922154D6FF0093C25B /* city_roads.cpp */,
-				567F81932154D6FF0093C25B /* city_roads.hpp */,
 				34F558351DBF2A2600A4FC11 /* common-debug.xcconfig */,
 				34F558361DBF2A2600A4FC11 /* common-release.xcconfig */,
 				675343FA1A3F640D00A0A8C3 /* routing */,
@@ -688,178 +686,180 @@
 		675343FA1A3F640D00A0A8C3 /* routing */ = {
 			isa = PBXGroup;
 			children = (
-				44642D2C29CDA44700F8813A /* ruler_router.cpp */,
-				44642D2B29CDA44600F8813A /* ruler_router.hpp */,
-				ACAE44A327426EDB0054DD15 /* junction_visitor.cpp */,
-				D549BEBC25765CFB009131F2 /* absent_regions_finder.cpp */,
 				D549BEBA25765CFA009131F2 /* absent_regions_finder.hpp */,
+				D549BEBC25765CFB009131F2 /* absent_regions_finder.cpp */,
 				44A95C6F225F6A4F00C22F4F /* astar_graph.hpp */,
-				674F9BBA1B0A580E00704FFA /* async_router.cpp */,
 				674F9BBB1B0A580E00704FFA /* async_router.hpp */,
+				674F9BBA1B0A580E00704FFA /* async_router.cpp */,
 				671F58BA1B874EA20032311E /* base */,
-				569472402418C8220013CD21 /* car_directions.cpp */,
 				5694723F2418C8220013CD21 /* car_directions.hpp */,
-				5670595B1F3AF97F0062672D /* checkpoint_predictor.cpp */,
+				569472402418C8220013CD21 /* car_directions.cpp */,
 				5670595C1F3AF97F0062672D /* checkpoint_predictor.hpp */,
-				0CF709351F05172200D5067E /* checkpoints.cpp */,
+				5670595B1F3AF97F0062672D /* checkpoint_predictor.cpp */,
 				0C15B8011F02A61B0058E253 /* checkpoints.hpp */,
+				0CF709351F05172200D5067E /* checkpoints.cpp */,
+				567F81932154D6FF0093C25B /* city_roads.hpp */,
+				567F81922154D6FF0093C25B /* city_roads.cpp */,
 				56473D72214825B4007E6FBA /* city_roads_serialization.hpp */,
 				0C62BFE51E8ADC3100055A79 /* coding.hpp */,
-				D57834BE2562ED5F0020A420 /* cross_border_graph.cpp */,
 				D57834BF2562ED5F0020A420 /* cross_border_graph.hpp */,
-				0C5F5D1D1E798B0400307B98 /* cross_mwm_connector_serialization.hpp */,
-				0C5F5D1E1E798B0400307B98 /* cross_mwm_connector.cpp */,
+				D57834BE2562ED5F0020A420 /* cross_border_graph.cpp */,
 				0C5F5D1F1E798B0400307B98 /* cross_mwm_connector.hpp */,
-				56C439241E93BF8C00998E29 /* cross_mwm_graph.cpp */,
+				0C5F5D1E1E798B0400307B98 /* cross_mwm_connector.cpp */,
+				0C5F5D1D1E798B0400307B98 /* cross_mwm_connector_serialization.hpp */,
 				56C439251E93BF8C00998E29 /* cross_mwm_graph.hpp */,
+				56C439241E93BF8C00998E29 /* cross_mwm_graph.cpp */,
 				56FA20461FBF23A90045DE78 /* cross_mwm_ids.hpp */,
 				56CC5A361E3884960016AC46 /* cross_mwm_index_graph.hpp */,
-				D5C9497B2525C855001E45E2 /* directions_engine_helpers.cpp */,
-				D5C9497A2525C854001E45E2 /* directions_engine_helpers.hpp */,
-				D52EF20125260E1500DFEB57 /* directions_engine.cpp */,
 				670EE56E1B664796001E8064 /* directions_engine.hpp */,
+				D52EF20125260E1500DFEB57 /* directions_engine.cpp */,
+				D5C9497A2525C854001E45E2 /* directions_engine_helpers.hpp */,
+				D5C9497B2525C855001E45E2 /* directions_engine_helpers.cpp */,
 				D549BEB825765CFA009131F2 /* dummy_world_graph.hpp */,
-				0C5FEC521DDE191E0017688C /* edge_estimator.cpp */,
 				0C5FEC531DDE191E0017688C /* edge_estimator.hpp */,
+				0C5FEC521DDE191E0017688C /* edge_estimator.cpp */,
 				40C227FD1F61C07C0046696C /* fake_edges_container.hpp */,
-				40C645141F8D167E002E05A0 /* fake_ending.cpp */,
 				40C645151F8D167E002E05A0 /* fake_ending.hpp */,
+				40C645141F8D167E002E05A0 /* fake_ending.cpp */,
 				40655E731F8BA46B0065305E /* fake_feature_ids.hpp */,
-				D51A9C13242E379C00F750F8 /* fake_graph.cpp */,
 				405F48E81F75231E005BA81A /* fake_graph.hpp */,
+				D51A9C13242E379C00F750F8 /* fake_graph.cpp */,
 				40576F771F7A788B000B593B /* fake_vertex.hpp */,
-				674F9BBC1B0A580E00704FFA /* features_road_graph.cpp */,
 				674F9BBD1B0A580E00704FFA /* features_road_graph.hpp */,
+				674F9BBC1B0A580E00704FFA /* features_road_graph.cpp */,
 				560A273A233BB18900B20E8F /* following_info.hpp */,
-				0C5FEC561DDE192A0017688C /* geometry.cpp */,
 				0C5FEC571DDE192A0017688C /* geometry.hpp */,
-				D526BA76241FC5580076E0B0 /* guides_connections.cpp */,
+				0C5FEC561DDE192A0017688C /* geometry.cpp */,
 				D526BA77241FC5580076E0B0 /* guides_connections.hpp */,
-				D526BA75241FC5580076E0B0 /* guides_graph.cpp */,
+				D526BA76241FC5580076E0B0 /* guides_connections.cpp */,
 				D526BA78241FC5580076E0B0 /* guides_graph.hpp */,
-				0C090C7F1E4E274000D52AFD /* index_graph_loader.cpp */,
-				0C090C801E4E274000D52AFD /* index_graph_loader.hpp */,
-				0C08AA321DF83223004195DD /* index_graph_serialization.cpp */,
-				0C08AA331DF83223004195DD /* index_graph_serialization.hpp */,
-				4408A63921F1E7F0008171B8 /* index_graph_starter_joints.hpp */,
-				0C0DF91F1DE898B70055A22F /* index_graph_starter.cpp */,
-				0C0DF9201DE898B70055A22F /* index_graph_starter.hpp */,
-				0C5FEC581DDE192A0017688C /* index_graph.cpp */,
+				D526BA75241FC5580076E0B0 /* guides_graph.cpp */,
 				0C5FEC591DDE192A0017688C /* index_graph.hpp */,
-				0C5BC9CF1E28FD4E0071BFDD /* index_road_graph.cpp */,
+				0C5FEC581DDE192A0017688C /* index_graph.cpp */,
+				0C090C801E4E274000D52AFD /* index_graph_loader.hpp */,
+				0C090C7F1E4E274000D52AFD /* index_graph_loader.cpp */,
+				0C08AA331DF83223004195DD /* index_graph_serialization.hpp */,
+				0C08AA321DF83223004195DD /* index_graph_serialization.cpp */,
+				0C0DF9201DE898B70055A22F /* index_graph_starter.hpp */,
+				0C0DF91F1DE898B70055A22F /* index_graph_starter.cpp */,
+				4408A63921F1E7F0008171B8 /* index_graph_starter_joints.hpp */,
 				0C5BC9D01E28FD4E0071BFDD /* index_road_graph.hpp */,
-				0C12ED211E5C822A0080D0F4 /* index_router.cpp */,
+				0C5BC9CF1E28FD4E0071BFDD /* index_road_graph.cpp */,
 				0C12ED221E5C822A0080D0F4 /* index_router.hpp */,
-				0C5FEC5A1DDE192A0017688C /* joint_index.cpp */,
-				0C5FEC5B1DDE192A0017688C /* joint_index.hpp */,
-				4408A63A21F1E7F0008171B8 /* joint_segment.cpp */,
-				4408A63821F1E7F0008171B8 /* joint_segment.hpp */,
-				0C5FEC5C1DDE192A0017688C /* joint.cpp */,
+				0C12ED211E5C822A0080D0F4 /* index_router.cpp */,
 				0C5FEC5D1DDE192A0017688C /* joint.hpp */,
+				0C5FEC5C1DDE192A0017688C /* joint.cpp */,
+				0C5FEC5B1DDE192A0017688C /* joint_index.hpp */,
+				0C5FEC5A1DDE192A0017688C /* joint_index.cpp */,
+				4408A63821F1E7F0008171B8 /* joint_segment.hpp */,
+				4408A63A21F1E7F0008171B8 /* joint_segment.cpp */,
 				56DAC2C72398F3C8000BC50D /* junction_visitor.hpp */,
-				44F4EDC523A78C2D005254C4 /* latlon_with_altitude.cpp */,
+				ACAE44A327426EDB0054DD15 /* junction_visitor.cpp */,
 				44F4EDC623A78C2E005254C4 /* latlon_with_altitude.hpp */,
-				4433A8E823993BD200E1350B /* leaps_graph.cpp */,
+				44F4EDC523A78C2D005254C4 /* latlon_with_altitude.cpp */,
 				4433A8EA23993BD700E1350B /* leaps_graph.hpp */,
-				4443DC3522789793000C8E32 /* leaps_postprocessor.cpp */,
+				4433A8E823993BD200E1350B /* leaps_graph.cpp */,
 				4443DC3622789793000C8E32 /* leaps_postprocessor.hpp */,
+				4443DC3522789793000C8E32 /* leaps_postprocessor.cpp */,
 				56099E251CC7C97D00A7772A /* loaded_path_segment.hpp */,
-				56FEAA6D219E8A610073DF5F /* maxspeeds_serialization.cpp */,
-				56FEAA6C219E8A600073DF5F /* maxspeeds_serialization.hpp */,
-				5631B667219B125C009F47D4 /* maxspeeds.cpp */,
 				5631B668219B125C009F47D4 /* maxspeeds.hpp */,
-				D5481E4D24BF4F70008FB1D8 /* mwm_hierarchy_handler.cpp */,
+				5631B667219B125C009F47D4 /* maxspeeds.cpp */,
+				56FEAA6C219E8A600073DF5F /* maxspeeds_serialization.hpp */,
+				56FEAA6D219E8A610073DF5F /* maxspeeds_serialization.cpp */,
 				D5481E4C24BF4F70008FB1D8 /* mwm_hierarchy_handler.hpp */,
-				670D049C1B0B4A970013A7AC /* nearest_edge_finder.cpp */,
+				D5481E4D24BF4F70008FB1D8 /* mwm_hierarchy_handler.cpp */,
 				670D049D1B0B4A970013A7AC /* nearest_edge_finder.hpp */,
-				44B284C523F5A21300A3FBB7 /* opening_hours_serdes.cpp */,
+				670D049C1B0B4A970013A7AC /* nearest_edge_finder.cpp */,
 				44B284C623F5A21300A3FBB7 /* opening_hours_serdes.hpp */,
-				670EE56F1B664796001E8064 /* pedestrian_directions.cpp */,
+				44B284C523F5A21300A3FBB7 /* opening_hours_serdes.cpp */,
 				670EE5701B664796001E8064 /* pedestrian_directions.hpp */,
-				56CBED5422E9CE2600D51AF7 /* position_accumulator.cpp */,
+				670EE56F1B664796001E8064 /* pedestrian_directions.cpp */,
 				56CBED5322E9CE2500D51AF7 /* position_accumulator.hpp */,
-				D549BEB925765CFA009131F2 /* regions_router.cpp */,
+				56CBED5422E9CE2600D51AF7 /* position_accumulator.cpp */,
 				D549BEB725765CFA009131F2 /* regions_router.hpp */,
-				D549BEBB25765CFA009131F2 /* regions_sparse_graph.cpp */,
+				D549BEB925765CFA009131F2 /* regions_router.cpp */,
 				D549BEB625765CFA009131F2 /* regions_sparse_graph.hpp */,
-				67C79B9F1E2CEE1400C40034 /* restriction_loader.cpp */,
+				D549BEBB25765CFA009131F2 /* regions_sparse_graph.cpp */,
 				67C79BA01E2CEE1400C40034 /* restriction_loader.hpp */,
-				349D1CDE1E3F589900A878FD /* restrictions_serialization.cpp */,
+				67C79B9F1E2CEE1400C40034 /* restriction_loader.cpp */,
 				349D1CDF1E3F589900A878FD /* restrictions_serialization.hpp */,
-				4432C5B524067E6700C9E445 /* road_access_serialization.cpp */,
-				5694CEC61EBA25F7004576D3 /* road_access_serialization.hpp */,
-				5694CEC71EBA25F7004576D3 /* road_access.cpp */,
+				349D1CDE1E3F589900A878FD /* restrictions_serialization.cpp */,
 				5694CEC81EBA25F7004576D3 /* road_access.hpp */,
-				674F9BC41B0A580E00704FFA /* road_graph.cpp */,
+				5694CEC71EBA25F7004576D3 /* road_access.cpp */,
+				5694CEC61EBA25F7004576D3 /* road_access_serialization.hpp */,
+				4432C5B524067E6700C9E445 /* road_access_serialization.cpp */,
 				674F9BC51B0A580E00704FFA /* road_graph.hpp */,
-				0C5FEC661DDE193F0017688C /* road_index.cpp */,
+				674F9BC41B0A580E00704FFA /* road_graph.cpp */,
 				0C5FEC671DDE193F0017688C /* road_index.hpp */,
+				0C5FEC661DDE193F0017688C /* road_index.cpp */,
 				0C5FEC681DDE193F0017688C /* road_point.hpp */,
-				0C8705041E0182F200BCAF71 /* route_point.hpp */,
-				40A111CB1F2F6776005E6AD5 /* route_weight.cpp */,
-				40A111CC1F2F6776005E6AD5 /* route_weight.hpp */,
-				6753440D1A3F644F00A0A8C3 /* route.cpp */,
 				6753440E1A3F644F00A0A8C3 /* route.hpp */,
-				A1616E291B6B60AB003F078E /* router_delegate.cpp */,
-				A1616E2A1B6B60AB003F078E /* router_delegate.hpp */,
-				670EE5711B664796001E8064 /* router.cpp */,
+				6753440D1A3F644F00A0A8C3 /* route.cpp */,
+				0C8705041E0182F200BCAF71 /* route_point.hpp */,
+				40A111CC1F2F6776005E6AD5 /* route_weight.hpp */,
+				40A111CB1F2F6776005E6AD5 /* route_weight.cpp */,
 				6753440F1A3F644F00A0A8C3 /* router.hpp */,
+				670EE5711B664796001E8064 /* router.cpp */,
+				A1616E2A1B6B60AB003F078E /* router_delegate.hpp */,
+				A1616E291B6B60AB003F078E /* router_delegate.cpp */,
 				562BDE1F20D14860008EFF6F /* routing_callbacks.hpp */,
 				0C08AA381DF8329B004195DD /* routing_exceptions.hpp */,
-				0C0DF9281DE898FF0055A22F /* routing_helpers.cpp */,
 				56EA2FD41D8FD8590083F01A /* routing_helpers.hpp */,
-				44C56C0922296498006C2A1D /* routing_options.cpp */,
+				0C0DF9281DE898FF0055A22F /* routing_helpers.cpp */,
 				44C56C0822296498006C2A1D /* routing_options.hpp */,
+				44C56C0922296498006C2A1D /* routing_options.cpp */,
 				56099E261CC7C97D00A7772A /* routing_result_graph.hpp */,
-				670EE55A1B6001E7001E8064 /* routing_session.cpp */,
 				670EE55B1B6001E7001E8064 /* routing_session.hpp */,
-				0C45D7381F2F75500065C3ED /* routing_settings.cpp */,
+				670EE55A1B6001E7001E8064 /* routing_session.cpp */,
 				670EE55C1B6001E7001E8064 /* routing_settings.hpp */,
-				441CC8C523ACF42C008B9A49 /* segment.cpp */,
+				0C45D7381F2F75500065C3ED /* routing_settings.cpp */,
+				44642D2B29CDA44600F8813A /* ruler_router.hpp */,
+				44642D2C29CDA44700F8813A /* ruler_router.cpp */,
 				0C470E6F1E0D4EB1005B824D /* segment.hpp */,
-				0C81E1551F0258AA00DC66DF /* segmented_route.cpp */,
+				441CC8C523ACF42C008B9A49 /* segment.cpp */,
 				0C81E1561F0258AA00DC66DF /* segmented_route.hpp */,
-				40F7F3E31F7D246D0082D564 /* single_vehicle_world_graph.cpp */,
+				0C81E1551F0258AA00DC66DF /* segmented_route.cpp */,
 				40F7F3E21F7D246C0082D564 /* single_vehicle_world_graph.hpp */,
-				F6C3A1B421AC298F0060EEC8 /* speed_camera_manager.cpp */,
-				F6C3A1B321AC298E0060EEC8 /* speed_camera_manager.hpp */,
-				5610731A221ABF96008447B2 /* speed_camera_prohibition.cpp */,
-				56107319221ABF96008447B2 /* speed_camera_prohibition.hpp */,
-				44E5574B2136EED000B01439 /* speed_camera_ser_des.cpp */,
-				44E557492136EEC800B01439 /* speed_camera_ser_des.hpp */,
-				44AE4A10214FBB8D006321F5 /* speed_camera.cpp */,
+				40F7F3E31F7D246D0082D564 /* single_vehicle_world_graph.cpp */,
 				44AE4A11214FBB8D006321F5 /* speed_camera.hpp */,
-				0C81E1511F02589800DC66DF /* traffic_stash.cpp */,
+				44AE4A10214FBB8D006321F5 /* speed_camera.cpp */,
+				F6C3A1B321AC298E0060EEC8 /* speed_camera_manager.hpp */,
+				F6C3A1B421AC298F0060EEC8 /* speed_camera_manager.cpp */,
+				56107319221ABF96008447B2 /* speed_camera_prohibition.hpp */,
+				5610731A221ABF96008447B2 /* speed_camera_prohibition.cpp */,
+				44E557492136EEC800B01439 /* speed_camera_ser_des.hpp */,
+				44E5574B2136EED000B01439 /* speed_camera_ser_des.cpp */,
 				0C81E1521F02589800DC66DF /* traffic_stash.hpp */,
-				4065EA821F8260000094DEF3 /* transit_graph_loader.cpp */,
-				4065EA831F8260000094DEF3 /* transit_graph_loader.hpp */,
-				4081AD4D1F8E4C1C006CE8A5 /* transit_graph.cpp */,
+				0C81E1511F02589800DC66DF /* traffic_stash.cpp */,
 				4065EA841F8260000094DEF3 /* transit_graph.hpp */,
+				4081AD4D1F8E4C1C006CE8A5 /* transit_graph.cpp */,
+				4065EA831F8260000094DEF3 /* transit_graph_loader.hpp */,
+				4065EA821F8260000094DEF3 /* transit_graph_loader.cpp */,
 				40BEC0801F99FFD600E06CA4 /* transit_info.hpp */,
-				4065EA7F1F824A6C0094DEF3 /* transit_world_graph.cpp */,
 				4065EA7E1F824A6C0094DEF3 /* transit_world_graph.hpp */,
+				4065EA7F1F824A6C0094DEF3 /* transit_world_graph.cpp */,
 				56099E271CC7C97D00A7772A /* turn_candidate.hpp */,
-				674F9BC61B0A580E00704FFA /* turns_generator.cpp */,
-				674F9BC71B0A580E00704FFA /* turns_generator.hpp */,
-				AC53BEEF282BE95B00E6DE59 /* turns_generator_utils.cpp */,
-				AC53BEEE282BE95B00E6DE59 /* turns_generator_utils.hpp */,
-				6741AA9A1BF35331002C974C /* turns_notification_manager.cpp */,
-				6741AA9B1BF35331002C974C /* turns_notification_manager.hpp */,
-				67C7D4251B4EB48F00FE41AA /* turns_sound_settings.cpp */,
-				67C7D4261B4EB48F00FE41AA /* turns_sound_settings.hpp */,
-				4652D9142BAA3C5600C71046 /* turns_tts_text_i18n.cpp */,
-				4652D9152BAA3C5600C71046 /* turns_tts_text_i18n.hpp */,
-				67AB92E11B7B3E6E00AB5194 /* turns_tts_text.cpp */,
-				67AB92E21B7B3E6E00AB5194 /* turns_tts_text.hpp */,
-				675344101A3F644F00A0A8C3 /* turns.cpp */,
 				675344111A3F644F00A0A8C3 /* turns.hpp */,
-				5694CEC91EBA25F7004576D3 /* vehicle_mask.cpp */,
+				675344101A3F644F00A0A8C3 /* turns.cpp */,
+				674F9BC71B0A580E00704FFA /* turns_generator.hpp */,
+				674F9BC61B0A580E00704FFA /* turns_generator.cpp */,
+				AC53BEEE282BE95B00E6DE59 /* turns_generator_utils.hpp */,
+				AC53BEEF282BE95B00E6DE59 /* turns_generator_utils.cpp */,
+				6741AA9B1BF35331002C974C /* turns_notification_manager.hpp */,
+				6741AA9A1BF35331002C974C /* turns_notification_manager.cpp */,
+				67C7D4261B4EB48F00FE41AA /* turns_sound_settings.hpp */,
+				67C7D4251B4EB48F00FE41AA /* turns_sound_settings.cpp */,
+				67AB92E21B7B3E6E00AB5194 /* turns_tts_text.hpp */,
+				67AB92E11B7B3E6E00AB5194 /* turns_tts_text.cpp */,
+				4652D9152BAA3C5600C71046 /* turns_tts_text_i18n.hpp */,
+				4652D9142BAA3C5600C71046 /* turns_tts_text_i18n.cpp */,
 				0C08AA361DF8324D004195DD /* vehicle_mask.hpp */,
-				0C090C851E4E276700D52AFD /* world_graph.cpp */,
+				5694CEC91EBA25F7004576D3 /* vehicle_mask.cpp */,
 				0C090C861E4E276700D52AFD /* world_graph.hpp */,
+				0C090C851E4E276700D52AFD /* world_graph.cpp */,
 			);
 			name = routing;
-			path = ../../routing;
+			path = ../../libs/routing;
 			sourceTree = "<group>";
 		};
 		67BD35961C69F03E003AA26F /* routing_integration_tests */ = {
@@ -881,7 +881,7 @@
 				567E9F741F5850460064CB96 /* turn_test.cpp */,
 			);
 			name = routing_integration_tests;
-			path = ../../routing/routing_integration_tests;
+			path = ../../libs/routing/routing_integration_tests;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
diff --git a/xcode/routing_common/routing_common.xcodeproj/project.pbxproj b/xcode/routing_common/routing_common.xcodeproj/project.pbxproj
index 2e8459964..473de0530 100644
--- a/xcode/routing_common/routing_common.xcodeproj/project.pbxproj
+++ b/xcode/routing_common/routing_common.xcodeproj/project.pbxproj
@@ -43,7 +43,7 @@
 		671E78911E6A3C9C00B2859B /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../common-release.xcconfig"; sourceTree = "<group>"; };
 		671E78961E6A3DA700B2859B /* routing_common_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = routing_common_tests.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		671E78AD1E6A3FDB00B2859B /* vehicle_model_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vehicle_model_test.cpp; sourceTree = "<group>"; };
-		671E78AF1E6A3FEF00B2859B /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = "<group>"; };
+		671E78AF1E6A3FEF00B2859B /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../libs/testing/testingmain.cpp; sourceTree = "<group>"; };
 		F6E4ECDF223AB60600C8A79A /* car_model_coefs.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = car_model_coefs.hpp; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -106,7 +106,7 @@
 				671E78871E6A3C5D00B2859B /* vehicle_model.hpp */,
 			);
 			name = routing_common;
-			path = ../../routing_common;
+			path = ../../libs/routing_common;
 			sourceTree = "<group>";
 		};
 		671E78971E6A3DA800B2859B /* routing_common_tests */ = {
@@ -117,7 +117,7 @@
 				671E78AD1E6A3FDB00B2859B /* vehicle_model_test.cpp */,
 			);
 			name = routing_common_tests;
-			path = ../../routing_common/routing_common_tests;
+			path = ../../libs/routing_common/routing_common_tests;
 			sourceTree = "<group>";
 		};
 		671E78B41E6A404F00B2859B /* Frameworks */ = {
diff --git a/xcode/search/search.xcodeproj/project.pbxproj b/xcode/search/search.xcodeproj/project.pbxproj
index e6844bc38..b76f5403c 100644
--- a/xcode/search/search.xcodeproj/project.pbxproj
+++ b/xcode/search/search.xcodeproj/project.pbxproj
@@ -445,7 +445,7 @@
 		671C62171AE9227C00076BD0 /* latlon_match_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = latlon_match_test.cpp; sourceTree = "<group>"; };
 		671C62181AE9227C00076BD0 /* locality_finder_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = locality_finder_test.cpp; sourceTree = "<group>"; };
 		671C621B1AE9227C00076BD0 /* string_match_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = string_match_test.cpp; sourceTree = "<group>"; };
-		671C62241AE9229A00076BD0 /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = "<group>"; };
+		671C62241AE9229A00076BD0 /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../libs/testing/testingmain.cpp; sourceTree = "<group>"; };
 		675346B01A4055CF00A0A8C3 /* libsearch.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libsearch.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		675346BE1A40560D00A0A8C3 /* algos.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = algos.hpp; sourceTree = "<group>"; };
 		675346BF1A40560D00A0A8C3 /* approximate_string_match.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = approximate_string_match.cpp; sourceTree = "<group>"; };
@@ -687,7 +687,7 @@
 				405DB10620FF472300EE3824 /* utils_test.cpp */,
 			);
 			name = search_integration_tests;
-			path = ../../search/search_integration_tests;
+			path = ../../libs/search/search_integration_tests;
 			sourceTree = "<group>";
 		};
 		671C620D1AE9225100076BD0 /* search_tests */ = {
@@ -720,7 +720,7 @@
 				44CAB5F72A1F928200819330 /* utm_mgrs_coords_match_test.cpp */,
 			);
 			name = search_tests;
-			path = ../../search/search_tests;
+			path = ../../libs/search/search_tests;
 			sourceTree = "<group>";
 		};
 		675346A71A4055CF00A0A8C3 = {
@@ -900,7 +900,7 @@
 				44A871B92A1F917400A80D62 /* utm_mgrs_coords_match.hpp */,
 			);
 			name = search;
-			path = ../../search;
+			path = ../../libs/search;
 			sourceTree = "<group>";
 		};
 		6796248E1D10134200AE4E3C /* search_tests_support */ = {
@@ -917,7 +917,7 @@
 				39AEF84F1FB45DA100943FC9 /* test_with_custom_mwms.hpp */,
 			);
 			name = search_tests_support;
-			path = ../../search/search_tests_support;
+			path = ../../libs/search/search_tests_support;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
diff --git a/xcode/shaders/shaders.xcodeproj/project.pbxproj b/xcode/shaders/shaders.xcodeproj/project.pbxproj
index bb0d72b42..e934328b2 100644
--- a/xcode/shaders/shaders.xcodeproj/project.pbxproj
+++ b/xcode/shaders/shaders.xcodeproj/project.pbxproj
@@ -154,7 +154,7 @@
 		456660EC20E25AA90085E8C1 /* gl_program_params_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gl_program_params_tests.cpp; sourceTree = "<group>"; };
 		456660ED20E25AA90085E8C1 /* gl_shaders_desktop_compile_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gl_shaders_desktop_compile_tests.cpp; sourceTree = "<group>"; };
 		456660EE20E25AA90085E8C1 /* gl_shaders_mobile_compile_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = gl_shaders_mobile_compile_test.cpp; sourceTree = "<group>"; };
-		456660F220E25AD40085E8C1 /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = "<group>"; };
+		456660F220E25AD40085E8C1 /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../libs/testing/testingmain.cpp; sourceTree = "<group>"; };
 		456660F520E25E2E0085E8C1 /* libdrape.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libdrape.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		456660F820E25E4C0085E8C1 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; };
 		456660FC20E25EDD0085E8C1 /* libexpat.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libexpat.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -163,8 +163,8 @@
 		4566610220E25EEF0085E8C1 /* libcoding.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libcoding.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		4566610420E25EF70085E8C1 /* libplatform.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libplatform.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		4566610620E25F560085E8C1 /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
-		4566610820E25F790085E8C1 /* test_main_loop.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = test_main_loop.hpp; path = ../../qt_tstfrm/test_main_loop.hpp; sourceTree = "<group>"; };
-		4566610920E25F790085E8C1 /* test_main_loop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = test_main_loop.cpp; path = ../../qt_tstfrm/test_main_loop.cpp; sourceTree = "<group>"; };
+		4566610820E25F790085E8C1 /* test_main_loop.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = test_main_loop.hpp; path = ../../../libs/qt_tstfrm/test_main_loop.hpp; sourceTree = "<group>"; };
+		4566610920E25F790085E8C1 /* test_main_loop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = test_main_loop.cpp; path = ../../../libs/qt_tstfrm/test_main_loop.cpp; sourceTree = "<group>"; };
 		4577B28221F2088800864FAC /* vulkan_program_pool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vulkan_program_pool.cpp; sourceTree = "<group>"; };
 		4577B28321F2088800864FAC /* vulkan_program_params.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = vulkan_program_params.cpp; sourceTree = "<group>"; };
 		4577B28421F2088800864FAC /* vulkan_program_params.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = vulkan_program_params.hpp; sourceTree = "<group>"; };
@@ -266,7 +266,7 @@
 				4577B28521F2088800864FAC /* vulkan_program_pool.hpp */,
 			);
 			name = shaders;
-			path = ../../shaders;
+			path = ../../libs/shaders;
 			sourceTree = "<group>";
 		};
 		4566608E20E2562C0085E8C1 /* GL */ = {
@@ -362,7 +362,7 @@
 				456660F220E25AD40085E8C1 /* testingmain.cpp */,
 			);
 			name = shaders_tests;
-			path = ../../shaders/shaders_tests;
+			path = ../../libs/shaders/shaders_tests;
 			sourceTree = "<group>";
 		};
 		456660F420E25E2E0085E8C1 /* Frameworks */ = {
@@ -520,96 +520,96 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/../../shaders/GL/area.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/area3d.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/area3d_outline.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/arrow3d.fsh.glsl",
-				"${SRCROOT}/../../shaders/GL/arrow3d.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/arrow3d_outline.fsh.glsl",
-				"${SRCROOT}/../../shaders/GL/arrow3d_shadow.fsh.glsl",
-				"${SRCROOT}/../../shaders/GL/arrow3d_shadow.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/circle.fsh.glsl",
-				"${SRCROOT}/../../shaders/GL/circle.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/circle_point.fsh.glsl",
-				"${SRCROOT}/../../shaders/GL/circle_point.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/colored_symbol.fsh.glsl",
-				"${SRCROOT}/../../shaders/GL/colored_symbol.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/colored_symbol_billboard.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/dashed_line.fsh.glsl",
-				"${SRCROOT}/../../shaders/GL/dashed_line.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/debug_rect.fsh.glsl",
-				"${SRCROOT}/../../shaders/GL/debug_rect.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/hatching_area.fsh.glsl",
-				"${SRCROOT}/../../shaders/GL/hatching_area.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/line.fsh.glsl",
-				"${SRCROOT}/../../shaders/GL/line.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/masked_texturing.fsh.glsl",
-				"${SRCROOT}/../../shaders/GL/masked_texturing.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/masked_texturing_billboard.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/my_position.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/path_symbol.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/position_accuracy3d.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/route.fsh.glsl",
-				"${SRCROOT}/../../shaders/GL/route.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/route_arrow.fsh.glsl",
-				"${SRCROOT}/../../shaders/GL/route_arrow.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/route_dash.fsh.glsl",
-				"${SRCROOT}/../../shaders/GL/route_marker.fsh.glsl",
-				"${SRCROOT}/../../shaders/GL/route_marker.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/ruler.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/screen_quad.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/selection_line.fsh.glsl",
-				"${SRCROOT}/../../shaders/GL/selection_line.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/shader_index.txt",
-				"${SRCROOT}/../../shaders/GL/shaders_lib.glsl",
-				"${SRCROOT}/../../shaders/GL/smaa_blending_weight.fsh.glsl",
-				"${SRCROOT}/../../shaders/GL/smaa_blending_weight.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/smaa_edges.fsh.glsl",
-				"${SRCROOT}/../../shaders/GL/smaa_edges.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/smaa_final.fsh.glsl",
-				"${SRCROOT}/../../shaders/GL/smaa_final.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/solid_color.fsh.glsl",
-				"${SRCROOT}/../../shaders/GL/text.fsh.glsl",
-				"${SRCROOT}/../../shaders/GL/text.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/text_billboard.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/text_outlined.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/text_outlined_billboard.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/text_outlined_gui.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/texturing.fsh.glsl",
-				"${SRCROOT}/../../shaders/GL/texturing.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/texturing3d.fsh.glsl",
-				"${SRCROOT}/../../shaders/GL/texturing_billboard.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/texturing_gui.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/traffic.fsh.glsl",
-				"${SRCROOT}/../../shaders/GL/traffic.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/traffic_circle.fsh.glsl",
-				"${SRCROOT}/../../shaders/GL/traffic_circle.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/traffic_line.fsh.glsl",
-				"${SRCROOT}/../../shaders/GL/traffic_line.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/transit.fsh.glsl",
-				"${SRCROOT}/../../shaders/GL/transit.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/transit_circle.fsh.glsl",
-				"${SRCROOT}/../../shaders/GL/transit_circle.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/transit_marker.fsh.glsl",
-				"${SRCROOT}/../../shaders/GL/transit_marker.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/user_mark.fsh.glsl",
-				"${SRCROOT}/../../shaders/GL/user_mark.vsh.glsl",
-				"${SRCROOT}/../../shaders/GL/user_mark_billboard.vsh.glsl",
-				"${SRCROOT}/../../shaders/gl_shaders_preprocessor.py",
-				"$(SRCROOT)/../../shaders/GL/shader_index.txt",
-				"$(SRCROOT)/../../shaders/programs.hpp",
-				"$(SRCROOT)/../../shaders/GL/shaders_lib.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/area.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/area3d.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/area3d_outline.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/arrow3d.fsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/arrow3d.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/arrow3d_outline.fsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/arrow3d_shadow.fsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/arrow3d_shadow.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/circle.fsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/circle.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/circle_point.fsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/circle_point.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/colored_symbol.fsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/colored_symbol.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/colored_symbol_billboard.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/dashed_line.fsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/dashed_line.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/debug_rect.fsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/debug_rect.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/hatching_area.fsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/hatching_area.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/line.fsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/line.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/masked_texturing.fsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/masked_texturing.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/masked_texturing_billboard.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/my_position.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/path_symbol.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/position_accuracy3d.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/route.fsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/route.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/route_arrow.fsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/route_arrow.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/route_dash.fsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/route_marker.fsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/route_marker.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/ruler.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/screen_quad.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/selection_line.fsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/selection_line.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/shader_index.txt",
+				"${OMIM_ROOT}/libs/shaders/GL/shaders_lib.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/smaa_blending_weight.fsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/smaa_blending_weight.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/smaa_edges.fsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/smaa_edges.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/smaa_final.fsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/smaa_final.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/solid_color.fsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/text.fsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/text.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/text_billboard.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/text_outlined.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/text_outlined_billboard.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/text_outlined_gui.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/texturing.fsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/texturing.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/texturing3d.fsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/texturing_billboard.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/texturing_gui.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/traffic.fsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/traffic.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/traffic_circle.fsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/traffic_circle.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/traffic_line.fsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/traffic_line.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/transit.fsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/transit.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/transit_circle.fsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/transit_circle.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/transit_marker.fsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/transit_marker.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/user_mark.fsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/user_mark.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/GL/user_mark_billboard.vsh.glsl",
+				"${OMIM_ROOT}/libs/shaders/gl_shaders_preprocessor.py",
+				"${OMIM_ROOT}/libs/shaders/GL/shader_index.txt",
+				"${OMIM_ROOT}/libs/shaders/programs.hpp",
+				"${OMIM_ROOT}/libs/shaders/GL/shaders_lib.glsl",
 			);
 			name = "Run Script";
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				"$(SRCROOT)/../../shaders/gl_shaders.hpp",
-				"$(SRCROOT)/../../shaders/gl_shaders.cpp",
+				"${OMIM_ROOT}/libs/shaders/gl_shaders.hpp",
+				"${OMIM_ROOT}/libs/shaders/gl_shaders.cpp",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Without this check shaders library is always rebuilt in XCode 13.\n# See https://stackoverflow.com/a/69481200/1209392\nif [ $ACTION != \"indexbuild\" ]; then\npython3 ${SRCROOT}/../../shaders/gl_shaders_preprocessor.py ${SRCROOT}/../../shaders/GL shader_index.txt programs.hpp shaders_lib.glsl ${SRCROOT}/../../shaders gl_shaders\nfi\n";
+			shellScript = "# Without this check shaders library is always rebuilt in XCode 13.\n# See https://stackoverflow.com/a/69481200/1209392\nif [ $ACTION != \"indexbuild\" ]; then\npython3 ${OMIM_ROOT}/libs/shaders/gl_shaders_preprocessor.py ${OMIM_ROOT}/libs/shaders/GL shader_index.txt programs.hpp shaders_lib.glsl ${OMIM_ROOT}/libs/shaders gl_shaders\nfi\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
diff --git a/xcode/storage/storage.xcodeproj/project.pbxproj b/xcode/storage/storage.xcodeproj/project.pbxproj
index 69cffabc9..f07cfa30b 100644
--- a/xcode/storage/storage.xcodeproj/project.pbxproj
+++ b/xcode/storage/storage.xcodeproj/project.pbxproj
@@ -186,7 +186,7 @@
 		67247FCA1C60BA8A00EDE56A /* task_runner.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = task_runner.hpp; sourceTree = "<group>"; };
 		67247FCB1C60BA8A00EDE56A /* test_map_files_downloader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = test_map_files_downloader.cpp; sourceTree = "<group>"; };
 		67247FCC1C60BA8A00EDE56A /* test_map_files_downloader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = test_map_files_downloader.hpp; sourceTree = "<group>"; };
-		67247FD71C60BA9900EDE56A /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = "<group>"; };
+		67247FD71C60BA9900EDE56A /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../libs/testing/testingmain.cpp; sourceTree = "<group>"; };
 		6724800E1C60CE7300EDE56A /* storage_group_download_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = storage_group_download_tests.cpp; sourceTree = "<group>"; };
 		6724800F1C60CE7300EDE56A /* storage_http_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = storage_http_tests.cpp; sourceTree = "<group>"; };
 		6741251A1B4C05FA00A3E828 /* map_files_downloader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = map_files_downloader.hpp; sourceTree = "<group>"; };
@@ -293,7 +293,7 @@
 				67247FD71C60BA9900EDE56A /* testingmain.cpp */,
 			);
 			name = storage_tests;
-			path = ../../storage/storage_tests;
+			path = ../../libs/storage/storage_tests;
 			sourceTree = "<group>";
 		};
 		672480071C60CE3D00EDE56A /* storage_integration_tests */ = {
@@ -310,7 +310,7 @@
 				56D8CB981CAC17A80003F420 /* test_defines.hpp */,
 			);
 			name = storage_integration_tests;
-			path = ../../storage/storage_integration_tests;
+			path = ../../libs/storage/storage_integration_tests;
 			sourceTree = "<group>";
 		};
 		675342D71A3F59EF00A0A8C3 = {
@@ -390,7 +390,7 @@
 				675343041A3F5A2600A0A8C3 /* storage.hpp */,
 			);
 			name = storage;
-			path = ../../storage;
+			path = ../../libs/storage;
 			sourceTree = "<group>";
 		};
 		676C83F81C6387D000DC9603 /* Resources */ = {
diff --git a/xcode/tracking/tracking.xcodeproj/project.pbxproj b/xcode/tracking/tracking.xcodeproj/project.pbxproj
index dfaaa6e4e..711d1aa11 100644
--- a/xcode/tracking/tracking.xcodeproj/project.pbxproj
+++ b/xcode/tracking/tracking.xcodeproj/project.pbxproj
@@ -49,7 +49,7 @@
 		6772592B1DBA26FD00BF54EE /* protocol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = protocol.cpp; sourceTree = "<group>"; };
 		6772592C1DBA26FD00BF54EE /* protocol.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = protocol.hpp; sourceTree = "<group>"; };
 		67A7144D1DC2524E005FF350 /* bindings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bindings.cpp; sourceTree = "<group>"; };
-		67B6E7B71DB8BBA900745F8A /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = "<group>"; };
+		67B6E7B71DB8BBA900745F8A /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../libs/testing/testingmain.cpp; sourceTree = "<group>"; };
 		67EC0CB61DBE4A320021F484 /* protocol_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = protocol_test.cpp; sourceTree = "<group>"; };
 		D5F7FFB52382CE0E00BF7B97 /* archival_reporter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = archival_reporter.cpp; sourceTree = "<group>"; };
 		D5F7FFB62382CE0E00BF7B97 /* archive.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = archive.hpp; sourceTree = "<group>"; };
@@ -140,7 +140,7 @@
 				675E88631DB7AC9000F8EBDA /* reporter.hpp */,
 			);
 			name = tracking;
-			path = ../../tracking;
+			path = ../../libs/tracking;
 			sourceTree = "<group>";
 		};
 		675E88831DB7ACEA00F8EBDA /* tracking_tests */ = {
@@ -152,7 +152,7 @@
 				67B6E7B71DB8BBA900745F8A /* testingmain.cpp */,
 			);
 			name = tracking_tests;
-			path = ../../tracking/tracking_tests;
+			path = ../../libs/tracking/tracking_tests;
 			sourceTree = "<group>";
 		};
 		675E888D1DB7B03400F8EBDA /* Frameworks */ = {
@@ -176,7 +176,7 @@
 				67A7144D1DC2524E005FF350 /* bindings.cpp */,
 			);
 			name = pytracking;
-			path = ../../tracking/pytracking;
+			path = ../../libs/tracking/pytracking;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
diff --git a/xcode/traffic/traffic.xcodeproj/project.pbxproj b/xcode/traffic/traffic.xcodeproj/project.pbxproj
index fcc9f7cac..f3f4b96a7 100644
--- a/xcode/traffic/traffic.xcodeproj/project.pbxproj
+++ b/xcode/traffic/traffic.xcodeproj/project.pbxproj
@@ -41,7 +41,7 @@
 		67BECB5E1DDA44FD00FC4E99 /* traffic_info.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = traffic_info.hpp; sourceTree = "<group>"; };
 		67BECB671DDA466800FC4E99 /* traffic_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = traffic_tests.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		67BECB7F1DDA46A100FC4E99 /* traffic_info_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = traffic_info_test.cpp; sourceTree = "<group>"; };
-		67BECB8A1DDA478800FC4E99 /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = "<group>"; };
+		67BECB8A1DDA478800FC4E99 /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../../libs/testing/testingmain.cpp; sourceTree = "<group>"; };
 		67BECB941DDA4AC800FC4E99 /* bindings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = bindings.cpp; sourceTree = "<group>"; };
 		FAFD413F26BBE3FC00D1DE1B /* libbase.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libbase.a; sourceTree = BUILT_PRODUCTS_DIR; };
 		FAFD414126BBE3FC00D1DE1B /* libcoding.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libcoding.a; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -121,7 +121,7 @@
 				67BECB5E1DDA44FD00FC4E99 /* traffic_info.hpp */,
 			);
 			name = traffic;
-			path = ../../traffic;
+			path = ../../libs/traffic;
 			sourceTree = "<group>";
 		};
 		67BECB7E1DDA467A00FC4E99 /* traffic_tests */ = {
@@ -131,7 +131,7 @@
 				67BECB7F1DDA46A100FC4E99 /* traffic_info_test.cpp */,
 			);
 			name = traffic_tests;
-			path = ../../traffic/traffic_tests;
+			path = ../../libs/traffic/traffic_tests;
 			sourceTree = "<group>";
 		};
 		67BECB831DDA474400FC4E99 /* Frameworks */ = {
@@ -158,7 +158,7 @@
 				67BECB941DDA4AC800FC4E99 /* bindings.cpp */,
 			);
 			name = pytraffic;
-			path = ../../traffic/pytraffic;
+			path = ../../libs/traffic/pytraffic;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
diff --git a/xcode/transit/transit.xcodeproj/project.pbxproj b/xcode/transit/transit.xcodeproj/project.pbxproj
index 37dacb61c..8704a6b1a 100644
--- a/xcode/transit/transit.xcodeproj/project.pbxproj
+++ b/xcode/transit/transit.xcodeproj/project.pbxproj
@@ -93,7 +93,7 @@
 				D55B290624CACF9E000E2EBE /* transit_version.hpp */,
 			);
 			name = transit;
-			path = ../../transit;
+			path = ../../libs/transit;
 			sourceTree = "<group>";
 		};
 		D56AD1D624CB02BF0057F2E0 /* experimental */ = {

From 1f2d70c720e6d6805040de1c92de7f4bf555b6b7 Mon Sep 17 00:00:00 2001
From: Yannik Bloscheck <git@yannikbloscheck.com>
Date: Thu, 14 Aug 2025 18:22:40 +0200
Subject: [PATCH 004/302] [xcode] Updated upgrade check version to latest value

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
---
 xcode/base/base.xcodeproj/project.pbxproj                     | 2 +-
 xcode/coding/coding.xcodeproj/project.pbxproj                 | 2 +-
 xcode/cppjansson/cppjansson.xcodeproj/project.pbxproj         | 2 +-
 xcode/descriptions/descriptions.xcodeproj/project.pbxproj     | 2 +-
 xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj | 2 +-
 xcode/editor/editor.xcodeproj/project.pbxproj                 | 2 +-
 xcode/ge0/ge0.xcodeproj/project.pbxproj                       | 2 +-
 xcode/geometry/geometry.xcodeproj/project.pbxproj             | 2 +-
 xcode/indexer/indexer.xcodeproj/project.pbxproj               | 2 +-
 xcode/kml/kml.xcodeproj/project.pbxproj                       | 2 +-
 xcode/map/map.xcodeproj/project.pbxproj                       | 2 +-
 xcode/mwm_diff/mwm_diff.xcodeproj/project.pbxproj             | 2 +-
 xcode/openlr/openlr.xcodeproj/project.pbxproj                 | 2 +-
 xcode/platform/platform.xcodeproj/project.pbxproj             | 2 +-
 xcode/routing/routing.xcodeproj/project.pbxproj               | 2 +-
 xcode/routing_common/routing_common.xcodeproj/project.pbxproj | 2 +-
 xcode/search/search.xcodeproj/project.pbxproj                 | 2 +-
 xcode/shaders/shaders.xcodeproj/project.pbxproj               | 2 +-
 xcode/storage/storage.xcodeproj/project.pbxproj               | 2 +-
 xcode/tracking/tracking.xcodeproj/project.pbxproj             | 2 +-
 xcode/traffic/traffic.xcodeproj/project.pbxproj               | 2 +-
 xcode/transit/transit.xcodeproj/project.pbxproj               | 2 +-
 22 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/xcode/base/base.xcodeproj/project.pbxproj b/xcode/base/base.xcodeproj/project.pbxproj
index 40683d11c..bc386cdab 100644
--- a/xcode/base/base.xcodeproj/project.pbxproj
+++ b/xcode/base/base.xcodeproj/project.pbxproj
@@ -634,7 +634,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				DefaultBuildSystemTypeForWorkspace = Latest;
-				LastUpgradeCheck = 1610;
+				LastUpgradeCheck = 1640;
 				TargetAttributes = {
 					39FD27061CC65A7100AFF551 = {
 						CreatedOnToolsVersion = 7.2.1;
diff --git a/xcode/coding/coding.xcodeproj/project.pbxproj b/xcode/coding/coding.xcodeproj/project.pbxproj
index e81c74dbd..bfd2648b1 100644
--- a/xcode/coding/coding.xcodeproj/project.pbxproj
+++ b/xcode/coding/coding.xcodeproj/project.pbxproj
@@ -664,7 +664,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				DefaultBuildSystemTypeForWorkspace = Latest;
-				LastUpgradeCheck = 1510;
+				LastUpgradeCheck = 1640;
 				TargetAttributes = {
 					3949168E1BAC3A5F002A8C4F = {
 						CreatedOnToolsVersion = 7.0;
diff --git a/xcode/cppjansson/cppjansson.xcodeproj/project.pbxproj b/xcode/cppjansson/cppjansson.xcodeproj/project.pbxproj
index 00b481101..52503d4be 100644
--- a/xcode/cppjansson/cppjansson.xcodeproj/project.pbxproj
+++ b/xcode/cppjansson/cppjansson.xcodeproj/project.pbxproj
@@ -117,7 +117,7 @@
 				BuildIndependentTargetsInParallel = YES;
 				DefaultBuildSystemTypeForWorkspace = Latest;
 				LastSwiftUpdateCheck = 1330;
-				LastUpgradeCheck = 1510;
+				LastUpgradeCheck = 1640;
 				TargetAttributes = {
 					71407E78294CB3E800FBD9A4 = {
 						CreatedOnToolsVersion = 13.3;
diff --git a/xcode/descriptions/descriptions.xcodeproj/project.pbxproj b/xcode/descriptions/descriptions.xcodeproj/project.pbxproj
index 5823f24a5..98a7c01f1 100644
--- a/xcode/descriptions/descriptions.xcodeproj/project.pbxproj
+++ b/xcode/descriptions/descriptions.xcodeproj/project.pbxproj
@@ -107,7 +107,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				DefaultBuildSystemTypeForWorkspace = Latest;
-				LastUpgradeCheck = 1510;
+				LastUpgradeCheck = 1640;
 				TargetAttributes = {
 					BBD4571121A6BD0300B0A79C = {
 						CreatedOnToolsVersion = 10.0;
diff --git a/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj b/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj
index 9ccf76f38..880d755d3 100644
--- a/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj
+++ b/xcode/drape_frontend/drape_frontend.xcodeproj/project.pbxproj
@@ -831,7 +831,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				DefaultBuildSystemTypeForWorkspace = Latest;
-				LastUpgradeCheck = 1510;
+				LastUpgradeCheck = 1640;
 				TargetAttributes = {
 					670947391BDF9B82005014C0 = {
 						CreatedOnToolsVersion = 7.1;
diff --git a/xcode/editor/editor.xcodeproj/project.pbxproj b/xcode/editor/editor.xcodeproj/project.pbxproj
index 0b53cabfc..262da3180 100644
--- a/xcode/editor/editor.xcodeproj/project.pbxproj
+++ b/xcode/editor/editor.xcodeproj/project.pbxproj
@@ -411,7 +411,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				DefaultBuildSystemTypeForWorkspace = Latest;
-				LastUpgradeCheck = 1510;
+				LastUpgradeCheck = 1640;
 				TargetAttributes = {
 					3411386A1C15AD97002E3B3E = {
 						CreatedOnToolsVersion = 7.1.1;
diff --git a/xcode/ge0/ge0.xcodeproj/project.pbxproj b/xcode/ge0/ge0.xcodeproj/project.pbxproj
index c38781da4..c64519b01 100644
--- a/xcode/ge0/ge0.xcodeproj/project.pbxproj
+++ b/xcode/ge0/ge0.xcodeproj/project.pbxproj
@@ -188,7 +188,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				DefaultBuildSystemTypeForWorkspace = Latest;
-				LastUpgradeCheck = 1510;
+				LastUpgradeCheck = 1640;
 				TargetAttributes = {
 					3496AB751DC1F6CD00C5DDBA = {
 						CreatedOnToolsVersion = 8.0;
diff --git a/xcode/geometry/geometry.xcodeproj/project.pbxproj b/xcode/geometry/geometry.xcodeproj/project.pbxproj
index 504be4227..25d085585 100644
--- a/xcode/geometry/geometry.xcodeproj/project.pbxproj
+++ b/xcode/geometry/geometry.xcodeproj/project.pbxproj
@@ -522,7 +522,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				DefaultBuildSystemTypeForWorkspace = Latest;
-				LastUpgradeCheck = 1510;
+				LastUpgradeCheck = 1640;
 				TargetAttributes = {
 					670F295B1BA9D39A00F2ABF4 = {
 						CreatedOnToolsVersion = 6.4;
diff --git a/xcode/indexer/indexer.xcodeproj/project.pbxproj b/xcode/indexer/indexer.xcodeproj/project.pbxproj
index b25f19f19..367f6cf60 100644
--- a/xcode/indexer/indexer.xcodeproj/project.pbxproj
+++ b/xcode/indexer/indexer.xcodeproj/project.pbxproj
@@ -890,7 +890,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				DefaultBuildSystemTypeForWorkspace = Latest;
-				LastUpgradeCheck = 1510;
+				LastUpgradeCheck = 1640;
 				TargetAttributes = {
 					670C61241AB0661100C38A8C = {
 						CreatedOnToolsVersion = 6.1.1;
diff --git a/xcode/kml/kml.xcodeproj/project.pbxproj b/xcode/kml/kml.xcodeproj/project.pbxproj
index 428bc466d..d56d1c68a 100644
--- a/xcode/kml/kml.xcodeproj/project.pbxproj
+++ b/xcode/kml/kml.xcodeproj/project.pbxproj
@@ -235,7 +235,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				DefaultBuildSystemTypeForWorkspace = Latest;
-				LastUpgradeCheck = 1510;
+				LastUpgradeCheck = 1640;
 				TargetAttributes = {
 					45E4557C205849A600D9F45E = {
 						CreatedOnToolsVersion = 9.2;
diff --git a/xcode/map/map.xcodeproj/project.pbxproj b/xcode/map/map.xcodeproj/project.pbxproj
index ab9cf0a4e..9f72631d3 100644
--- a/xcode/map/map.xcodeproj/project.pbxproj
+++ b/xcode/map/map.xcodeproj/project.pbxproj
@@ -596,7 +596,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				DefaultBuildSystemTypeForWorkspace = Latest;
-				LastUpgradeCheck = 1510;
+				LastUpgradeCheck = 1640;
 				TargetAttributes = {
 					3DA571D720C1921D007BDE27 = {
 						CreatedOnToolsVersion = 9.3.1;
diff --git a/xcode/mwm_diff/mwm_diff.xcodeproj/project.pbxproj b/xcode/mwm_diff/mwm_diff.xcodeproj/project.pbxproj
index 6786dee63..6be7b065a 100644
--- a/xcode/mwm_diff/mwm_diff.xcodeproj/project.pbxproj
+++ b/xcode/mwm_diff/mwm_diff.xcodeproj/project.pbxproj
@@ -99,7 +99,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				DefaultBuildSystemTypeForWorkspace = Latest;
-				LastUpgradeCheck = 1510;
+				LastUpgradeCheck = 1640;
 				TargetAttributes = {
 					4586D0D11F48130600DF9CE5 = {
 						CreatedOnToolsVersion = 8.3.3;
diff --git a/xcode/openlr/openlr.xcodeproj/project.pbxproj b/xcode/openlr/openlr.xcodeproj/project.pbxproj
index 042d8a175..b715c97b4 100644
--- a/xcode/openlr/openlr.xcodeproj/project.pbxproj
+++ b/xcode/openlr/openlr.xcodeproj/project.pbxproj
@@ -206,7 +206,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				DefaultBuildSystemTypeForWorkspace = Latest;
-				LastUpgradeCheck = 1510;
+				LastUpgradeCheck = 1640;
 				TargetAttributes = {
 					671E78F21E6A4FE400B2859B = {
 						CreatedOnToolsVersion = 8.2.1;
diff --git a/xcode/platform/platform.xcodeproj/project.pbxproj b/xcode/platform/platform.xcodeproj/project.pbxproj
index c32797c28..a2ef9f9e0 100644
--- a/xcode/platform/platform.xcodeproj/project.pbxproj
+++ b/xcode/platform/platform.xcodeproj/project.pbxproj
@@ -629,7 +629,7 @@
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
-				LastUpgradeCheck = 1510;
+				LastUpgradeCheck = 1640;
 				TargetAttributes = {
 					675340E81C58C496002CF0D9 = {
 						CreatedOnToolsVersion = 7.2;
diff --git a/xcode/routing/routing.xcodeproj/project.pbxproj b/xcode/routing/routing.xcodeproj/project.pbxproj
index 4271946c9..a097ab6ac 100644
--- a/xcode/routing/routing.xcodeproj/project.pbxproj
+++ b/xcode/routing/routing.xcodeproj/project.pbxproj
@@ -1075,7 +1075,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				DefaultBuildSystemTypeForWorkspace = Latest;
-				LastUpgradeCheck = 1510;
+				LastUpgradeCheck = 1640;
 				TargetAttributes = {
 					6742AD0D1C68A91B009CB89E = {
 						CreatedOnToolsVersion = 7.2.1;
diff --git a/xcode/routing_common/routing_common.xcodeproj/project.pbxproj b/xcode/routing_common/routing_common.xcodeproj/project.pbxproj
index 473de0530..8fd1cc83d 100644
--- a/xcode/routing_common/routing_common.xcodeproj/project.pbxproj
+++ b/xcode/routing_common/routing_common.xcodeproj/project.pbxproj
@@ -189,7 +189,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				DefaultBuildSystemTypeForWorkspace = Latest;
-				LastUpgradeCheck = 1510;
+				LastUpgradeCheck = 1640;
 				TargetAttributes = {
 					671E78711E6A3BE200B2859B = {
 						CreatedOnToolsVersion = 8.2.1;
diff --git a/xcode/search/search.xcodeproj/project.pbxproj b/xcode/search/search.xcodeproj/project.pbxproj
index b76f5403c..8ce3771de 100644
--- a/xcode/search/search.xcodeproj/project.pbxproj
+++ b/xcode/search/search.xcodeproj/project.pbxproj
@@ -1113,7 +1113,7 @@
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
-				LastUpgradeCheck = 1510;
+				LastUpgradeCheck = 1640;
 				TargetAttributes = {
 					671C620B1AE9225100076BD0 = {
 						CreatedOnToolsVersion = 6.3.1;
diff --git a/xcode/shaders/shaders.xcodeproj/project.pbxproj b/xcode/shaders/shaders.xcodeproj/project.pbxproj
index e934328b2..ca0b491fe 100644
--- a/xcode/shaders/shaders.xcodeproj/project.pbxproj
+++ b/xcode/shaders/shaders.xcodeproj/project.pbxproj
@@ -469,7 +469,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				DefaultBuildSystemTypeForWorkspace = Latest;
-				LastUpgradeCheck = 1510;
+				LastUpgradeCheck = 1640;
 				TargetAttributes = {
 					4566606D20E254060085E8C1 = {
 						CreatedOnToolsVersion = 9.4;
diff --git a/xcode/storage/storage.xcodeproj/project.pbxproj b/xcode/storage/storage.xcodeproj/project.pbxproj
index f07cfa30b..0ce94a807 100644
--- a/xcode/storage/storage.xcodeproj/project.pbxproj
+++ b/xcode/storage/storage.xcodeproj/project.pbxproj
@@ -521,7 +521,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				DefaultBuildSystemTypeForWorkspace = Latest;
-				LastUpgradeCheck = 1510;
+				LastUpgradeCheck = 1640;
 				TargetAttributes = {
 					675342DF1A3F59EF00A0A8C3 = {
 						CreatedOnToolsVersion = 6.1;
diff --git a/xcode/tracking/tracking.xcodeproj/project.pbxproj b/xcode/tracking/tracking.xcodeproj/project.pbxproj
index 711d1aa11..c4e660d93 100644
--- a/xcode/tracking/tracking.xcodeproj/project.pbxproj
+++ b/xcode/tracking/tracking.xcodeproj/project.pbxproj
@@ -241,7 +241,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				DefaultBuildSystemTypeForWorkspace = Latest;
-				LastUpgradeCheck = 1510;
+				LastUpgradeCheck = 1640;
 				TargetAttributes = {
 					675E884F1DB7AC0300F8EBDA = {
 						CreatedOnToolsVersion = 8.0;
diff --git a/xcode/traffic/traffic.xcodeproj/project.pbxproj b/xcode/traffic/traffic.xcodeproj/project.pbxproj
index f3f4b96a7..b7895965b 100644
--- a/xcode/traffic/traffic.xcodeproj/project.pbxproj
+++ b/xcode/traffic/traffic.xcodeproj/project.pbxproj
@@ -219,7 +219,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				DefaultBuildSystemTypeForWorkspace = Latest;
-				LastUpgradeCheck = 1510;
+				LastUpgradeCheck = 1640;
 				TargetAttributes = {
 					67BECB491DDA43AF00FC4E99 = {
 						CreatedOnToolsVersion = 8.1;
diff --git a/xcode/transit/transit.xcodeproj/project.pbxproj b/xcode/transit/transit.xcodeproj/project.pbxproj
index 8704a6b1a..f66f510bf 100644
--- a/xcode/transit/transit.xcodeproj/project.pbxproj
+++ b/xcode/transit/transit.xcodeproj/project.pbxproj
@@ -154,7 +154,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				DefaultBuildSystemTypeForWorkspace = Latest;
-				LastUpgradeCheck = 1510;
+				LastUpgradeCheck = 1640;
 				TargetAttributes = {
 					56D7F2F31FE7F0F200D99E62 = {
 						CreatedOnToolsVersion = 9.2;

From 5d990bdc19cca66b867f1dcd7b4dc12443b5db2c Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Fri, 15 Aug 2025 11:47:53 +0700
Subject: [PATCH 005/302] [docs] Add ninja to MacOS deps

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 docs/INSTALL.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/INSTALL.md b/docs/INSTALL.md
index 6f0a8fdce..73d4b8ff0 100644
--- a/docs/INSTALL.md
+++ b/docs/INSTALL.md
@@ -81,7 +81,7 @@ xcode-select --install
 
 #### Homebrew packages
 ```bash
-brew install wget optipng cmake qt
+brew install wget optipng cmake ninja qt
 pip3 install "protobuf<3.21"
 ```
 

From 0f744e7cf2f0dee5e094752a4d74bd6a781f7519 Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Wed, 2 Jul 2025 19:11:08 +0200
Subject: [PATCH 006/302] [desktop] Organize desktop resources

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 .forgejo/workflows/desktop-file-check.yaml   |   6 ++---
 .gitignore                                   |   2 +-
 qt/CMakeLists.txt                            |  24 ++++++++++++-------
 qt/res/{ => linux}/app.comaps.comaps.desktop |   0
 qt/res/{ => mac}/Info.plist.in               |   0
 qt/res/{ => mac}/designer.icns               | Bin
 qt/res/{ => windows}/windows.ico             | Bin
 qt/res/{ => windows}/windows.rc              |   0
 8 files changed, 19 insertions(+), 13 deletions(-)
 rename qt/res/{ => linux}/app.comaps.comaps.desktop (100%)
 rename qt/res/{ => mac}/Info.plist.in (100%)
 rename qt/res/{ => mac}/designer.icns (100%)
 rename qt/res/{ => windows}/windows.ico (100%)
 rename qt/res/{ => windows}/windows.rc (100%)

diff --git a/.forgejo/workflows/desktop-file-check.yaml b/.forgejo/workflows/desktop-file-check.yaml
index b0f6c0a7e..384f94730 100644
--- a/.forgejo/workflows/desktop-file-check.yaml
+++ b/.forgejo/workflows/desktop-file-check.yaml
@@ -3,7 +3,7 @@ on:
   workflow_dispatch: # Manual trigger
   pull_request:
     paths:
-      - qt/res/app.comaps.comaps.desktop
+      - qt/res/linux/app.comaps.comaps.desktop
       - .forgejo/workflows/desktop-file-check.yaml # Run check on self change
 
 jobs:
@@ -16,7 +16,7 @@ jobs:
         with:
           fetch-depth: 1
           sparse-checkout: |
-            qt/res/app.comaps.comaps.desktop
+            qt/res/linux/app.comaps.comaps.desktop
 
       - name: Install desktop-file-validate tool
         shell: bash
@@ -27,4 +27,4 @@ jobs:
 
       - name: Validate desktop file
         shell: bash
-        run: desktop-file-validate qt/res/app.comaps.comaps.desktop && echo "Successfully validated .desktop file"
+        run: desktop-file-validate qt/res/linux/app.comaps.comaps.desktop && echo "Successfully validated .desktop file"
diff --git a/.gitignore b/.gitignore
index 0dc3565c5..4dc9ffa93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,7 +50,7 @@ omim.sdf
 *.suo
 *.aps
 *.rc
-!qt/res/windows.rc
+!qt/res/windows/windows.rc
 *.pdb
 out/
 
diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt
index 0a4f93edc..1cf2a1000 100644
--- a/qt/CMakeLists.txt
+++ b/qt/CMakeLists.txt
@@ -93,11 +93,8 @@ set(RESOURCES_FOLDER ${BUNDLE_FOLDER}/Contents/Resources)
 set(DATA_DIR ${OMIM_ROOT}/data)
 
 execute_process(
-  COMMAND mkdir -p ${RESOURCES_FOLDER}/shaders_compiler
-  COMMAND cp ${PROJECT_SOURCE_DIR}/res/mac.icns ${RESOURCES_FOLDER}
-  COMMAND cp ${PROJECT_SOURCE_DIR}/res/designer.icns ${RESOURCES_FOLDER}
+    COMMAND mkdir -p ${RESOURCES_FOLDER}/shaders_compiler
 )
-
 function(copy_resources)
   foreach(file ${ARGN})
     execute_process(
@@ -138,7 +135,7 @@ install(DIRECTORY ${OMIM_ROOT}/data DESTINATION ${CMAKE_INSTALL_PREFIX}/share/co
 
 if (PLATFORM_LINUX)
   install(FILES ${OMIM_ROOT}/packaging/app.comaps.comaps.metainfo.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo/)
-  install(FILES ${OMIM_ROOT}/qt/res/app.comaps.comaps.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications/)
+  install(FILES ${OMIM_ROOT}/qt/res/linux/app.comaps.comaps.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications/)
   install(FILES ${OMIM_ROOT}/qt/res/logo.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/512x512/apps/ RENAME comaps.png)
 endif()
 
@@ -151,6 +148,15 @@ if (PLATFORM_MAC)
   execute_process(
     COMMAND cp -r ${OMIM_ROOT}/tools/shaders_compiler/macos ${RESOURCES_FOLDER}/shaders_compiler
   )
+  if (BUILD_DESIGNER)
+    execute_process(
+        COMMAND cp ${PROJECT_SOURCE_DIR}/res/mac/designer.icns ${RESOURCES_FOLDER}
+    )
+  else ()
+    execute_process(
+        COMMAND cp ${PROJECT_SOURCE_DIR}/res/mac/mac.icns ${RESOURCES_FOLDER}
+    )
+  endif ()
 elseif (PLATFORM_LINUX)
   execute_process(
     COMMAND cp -r ${OMIM_ROOT}/tools/shaders_compiler/linux ${RESOURCES_FOLDER}/shaders_compiler
@@ -164,17 +170,17 @@ if (PLATFORM_MAC)
     set(BUNDLE_VERSION ${APP_VERSION})
   endif()
 
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/res/Info.plist.in ${CMAKE_CURRENT_SOURCE_DIR}/res/Info.plist)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/res/mac/Info.plist.in ${CMAKE_CURRENT_BINARY_DIR}/generated/Info.plist)
 
   set_target_properties(${PROJECT_NAME}
     PROPERTIES
       OUTPUT_NAME ${BUNDLE_NAME}
-      MACOSX_BUNDLE_INFO_PLIST ${PROJECT_SOURCE_DIR}/res/Info.plist
+      MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_BINARY_DIR}/generated/Info.plist
   )
 endif()
 
 if (PLATFORM_WIN)
-  target_sources(${PROJECT_NAME} PRIVATE res/windows.rc)
+  target_sources(${PROJECT_NAME} PRIVATE res/windows/windows.rc)
 endif()
 
 if (BUILD_DESIGNER)
@@ -237,7 +243,7 @@ if (BUILD_DESIGNER)
   set(CPACK_GENERATOR DragNDrop)
   set(CPACK_DMG_FORMAT UDZO)
   set(CPACK_DMG_VOLUME_NAME ${BUNDLE_NAME})
-  set(CPACK_PACKAGE_ICON ${PROJECT_SOURCE_DIR}/res/designer.icns)
+  set(CPACK_PACKAGE_ICON ${PROJECT_SOURCE_DIR}/res/mac/designer.icns)
   include(CPack)
 elseif (BUILD_STANDALONE)
   add_custom_command(TARGET desktop POST_BUILD
diff --git a/qt/res/app.comaps.comaps.desktop b/qt/res/linux/app.comaps.comaps.desktop
similarity index 100%
rename from qt/res/app.comaps.comaps.desktop
rename to qt/res/linux/app.comaps.comaps.desktop
diff --git a/qt/res/Info.plist.in b/qt/res/mac/Info.plist.in
similarity index 100%
rename from qt/res/Info.plist.in
rename to qt/res/mac/Info.plist.in
diff --git a/qt/res/designer.icns b/qt/res/mac/designer.icns
similarity index 100%
rename from qt/res/designer.icns
rename to qt/res/mac/designer.icns
diff --git a/qt/res/windows.ico b/qt/res/windows/windows.ico
similarity index 100%
rename from qt/res/windows.ico
rename to qt/res/windows/windows.ico
diff --git a/qt/res/windows.rc b/qt/res/windows/windows.rc
similarity index 100%
rename from qt/res/windows.rc
rename to qt/res/windows/windows.rc

From 76d8396cb1c9475246f0d68d2e468a114d92d5ff Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Mon, 21 Jul 2025 22:49:22 +0200
Subject: [PATCH 007/302] [3party] Updated Vulkan headers to v1.4.322

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 3party/Vulkan-Headers | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3party/Vulkan-Headers b/3party/Vulkan-Headers
index 595c8d479..f69f0433b 160000
--- a/3party/Vulkan-Headers
+++ b/3party/Vulkan-Headers
@@ -1 +1 @@
-Subproject commit 595c8d4794410a4e64b98dc58d27c0310d7ea2fd
+Subproject commit f69f0433bae0b30598380ef0420b9d2d02dbac4d

From 33f8e20f1bcc60d7f7ecdd06a23f219b7a5fb019 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Mon, 21 Jul 2025 23:06:04 +0200
Subject: [PATCH 008/302] [Linux] Vulkan build fixes

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 dev_sandbox/main_linux.cpp         | 1 -
 libs/drape/vulkan/vulkan_utils.cpp | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev_sandbox/main_linux.cpp b/dev_sandbox/main_linux.cpp
index 286a5183e..40dd14873 100644
--- a/dev_sandbox/main_linux.cpp
+++ b/dev_sandbox/main_linux.cpp
@@ -12,7 +12,6 @@
 #include <X11/X.h>
 
 #include <vulkan_wrapper.h>
-#include <vulkan/vulkan_xlib.h>
 // Workaround for TestFunction::Always compilation issue:
 // /usr/include/X11/X.h:441:33: note: expanded from macro 'Always'
 #undef Always
diff --git a/libs/drape/vulkan/vulkan_utils.cpp b/libs/drape/vulkan/vulkan_utils.cpp
index 47acf6322..bd76b10c1 100644
--- a/libs/drape/vulkan/vulkan_utils.cpp
+++ b/libs/drape/vulkan/vulkan_utils.cpp
@@ -1,6 +1,7 @@
 #include "drape/vulkan/vulkan_utils.hpp"
 
 #include <array>
+#include <string>
 
 namespace dp
 {
@@ -22,7 +23,7 @@ static bool gUse32bitDepth8bitStencil = false;
 
 void DebugName::Init(VkInstance instance, VkDevice device)
 {
-  vkSetDebugUtilsObjectNameEXT = 
+  vkSetDebugUtilsObjectNameEXT =
     (PFN_vkSetDebugUtilsObjectNameEXT)vkGetInstanceProcAddr(instance, "vkSetDebugUtilsObjectNameEXT");
   m_device = device;
 }
@@ -95,6 +96,8 @@ std::string GetVulkanResultString(VkResult result)
   case VK_ERROR_VIDEO_PICTURE_LAYOUT_NOT_SUPPORTED_KHR: return "VK_ERROR_VIDEO_PICTURE_LAYOUT_NOT_SUPPORTED_KHR";
   case VK_ERROR_IMAGE_USAGE_NOT_SUPPORTED_KHR: return "VK_ERROR_IMAGE_USAGE_NOT_SUPPORTED_KHR";
   case VK_INCOMPATIBLE_SHADER_BINARY_EXT: return "VK_INCOMPATIBLE_SHADER_BINARY_EXT";
+  case VK_PIPELINE_BINARY_MISSING_KHR: return "VK_PIPELINE_BINARY_MISSING_KHR";
+  case VK_ERROR_NOT_ENOUGH_SPACE_KHR: return "VK_ERROR_NOT_ENOUGH_SPACE_KHR";
   }
   UNREACHABLE();
   return "Unknown result";

From d01b8aaab438cbf3c5eeae7e7c71f2d2a551e075 Mon Sep 17 00:00:00 2001
From: Kiryl Kaveryn <kirylkaveryn@gmail.com>
Date: Wed, 23 Jul 2025 19:29:09 +0400
Subject: [PATCH 009/302] [map] Remove zooming back on track deselection

Closes https://github.com/organicmaps/organicmaps/issues/10941

Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
---
 libs/map/framework.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libs/map/framework.cpp b/libs/map/framework.cpp
index 22282df66..f81cfebb3 100644
--- a/libs/map/framework.cpp
+++ b/libs/map/framework.cpp
@@ -2030,14 +2030,14 @@ void Framework::DeactivateMapSelection()
     m_currentPlacePageInfo = {};
 
     if (m_drapeEngine != nullptr)
-      m_drapeEngine->DeselectObject(true);
+      m_drapeEngine->DeselectObject(false /* restoreViewport */);
   }
 }
 
 void Framework::DeactivateMapSelectionCircle(bool restoreViewport)
 {
-    if (m_drapeEngine != nullptr)
-        m_drapeEngine->DeselectObject(restoreViewport);
+  if (m_drapeEngine != nullptr)
+    m_drapeEngine->DeselectObject(restoreViewport);
 }
 
 void Framework::SwitchFullScreen()

From 0f2353aae6b7e58fd4fae34644e1f27537eaf0af Mon Sep 17 00:00:00 2001
From: Kiryl Kaveryn <kirylkaveryn@gmail.com>
Date: Wed, 23 Jul 2025 18:36:22 +0400
Subject: [PATCH 010/302] [ios] Track the percentDownloaded for the downloaded
 from the cloud files

Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
---
 iphone/Maps/Core/iCloud/MetadataItem.swift       | 10 ++++++++--
 .../Core/iCloudTests/MetadataItemStubs.swift     |  4 +++-
 .../SynchronizationStateManagerTests.swift       | 16 ++++++++++++----
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/iphone/Maps/Core/iCloud/MetadataItem.swift b/iphone/Maps/Core/iCloud/MetadataItem.swift
index 403993547..75e4c297d 100644
--- a/iphone/Maps/Core/iCloud/MetadataItem.swift
+++ b/iphone/Maps/Core/iCloud/MetadataItem.swift
@@ -14,6 +14,7 @@ struct CloudMetadataItem: MetadataItem {
   let fileName: String
   let fileUrl: URL
   var isDownloaded: Bool
+  var percentDownloaded: NSNumber
   var lastModificationDate: TimeInterval
   let downloadingError: NSError?
   let uploadingError: NSError?
@@ -42,6 +43,7 @@ extension CloudMetadataItem {
     guard let fileName = metadataItem.value(forAttribute: NSMetadataItemFSNameKey) as? String,
           let fileUrl = metadataItem.value(forAttribute: NSMetadataItemURLKey) as? URL,
           let downloadStatus = metadataItem.value(forAttribute: NSMetadataUbiquitousItemDownloadingStatusKey) as? String,
+          let percentDownloaded = metadataItem.value(forAttribute: NSMetadataUbiquitousItemPercentDownloadedKey) as? NSNumber,
           let lastModificationDate = (metadataItem.value(forAttribute: NSMetadataItemFSContentChangeDateKey) as? Date)?.roundedTime,
           let hasUnresolvedConflicts = metadataItem.value(forAttribute: NSMetadataUbiquitousItemHasUnresolvedConflictsKey) as? Bool else {
       let allAttributes = metadataItem.values(forAttributes: metadataItem.attributes)
@@ -51,6 +53,7 @@ extension CloudMetadataItem {
     self.fileName = fileName
     self.fileUrl = fileUrl.standardizedFileURL
     self.isDownloaded = downloadStatus == NSMetadataUbiquitousItemDownloadingStatusCurrent
+    self.percentDownloaded = percentDownloaded
     self.lastModificationDate = lastModificationDate
     self.hasUnresolvedConflicts = hasUnresolvedConflicts
     self.downloadingError = metadataItem.value(forAttribute: NSMetadataUbiquitousItemDownloadingErrorKey) as? NSError
@@ -65,6 +68,7 @@ extension CloudMetadataItem {
                                                          .ubiquitousItemDownloadingErrorKey,
                                                          .ubiquitousItemUploadingErrorKey])
     guard let downloadStatus = resources.ubiquitousItemDownloadingStatus,
+          let percentDownloaded = resources.ubiquitousItemDownloadingStatus,
           let lastModificationDate = resources.contentModificationDate?.roundedTime,
           let hasUnresolvedConflicts = resources.ubiquitousItemHasUnresolvedConflicts else {
       LOG(.error, "Failed to initialize CloudMetadataItem from \(fileUrl) resources: \(resources.allValues)")
@@ -72,7 +76,9 @@ extension CloudMetadataItem {
     }
     self.fileName = fileUrl.lastPathComponent
     self.fileUrl = fileUrl.standardizedFileURL
-    self.isDownloaded = downloadStatus.rawValue == NSMetadataUbiquitousItemDownloadingStatusCurrent
+    let isDownloaded = downloadStatus.rawValue == NSMetadataUbiquitousItemDownloadingStatusCurrent
+    self.isDownloaded = isDownloaded
+    self.percentDownloaded = isDownloaded ? 0.0 : 100.0
     self.lastModificationDate = lastModificationDate
     self.hasUnresolvedConflicts = hasUnresolvedConflicts
     self.downloadingError = resources.ubiquitousItemDownloadingError
@@ -115,7 +121,7 @@ extension Array where Element == CloudMetadataItem {
   }
 
   var notDownloaded: Self {
-    filter { !$0.isDownloaded }
+    filter { !$0.isDownloaded && $0.percentDownloaded == 0.0 }
   }
 
   func withUnresolvedConflicts(_ hasUnresolvedConflicts: Bool) -> Self {
diff --git a/iphone/Maps/Tests/Core/iCloudTests/MetadataItemStubs.swift b/iphone/Maps/Tests/Core/iCloudTests/MetadataItemStubs.swift
index 38deb86a3..67f1bb279 100644
--- a/iphone/Maps/Tests/Core/iCloudTests/MetadataItemStubs.swift
+++ b/iphone/Maps/Tests/Core/iCloudTests/MetadataItemStubs.swift
@@ -12,13 +12,15 @@ extension LocalMetadataItem {
 }
 
 extension CloudMetadataItem {
-  static func stub(fileName: String, 
+  static func stub(fileName: String,
                    lastModificationDate: TimeInterval,
                    isDownloaded: Bool = true,
+                   percentDownloaded: NSNumber = 100.0,
                    hasUnresolvedConflicts: Bool = false) -> CloudMetadataItem {
     let item = CloudMetadataItem(fileName: fileName,
                                  fileUrl: URL(string: "url")!,
                                  isDownloaded: isDownloaded,
+                                 percentDownloaded: percentDownloaded,
                                  lastModificationDate: lastModificationDate,
                                  downloadingError: nil,
                                  uploadingError: nil,
diff --git a/iphone/Maps/Tests/Core/iCloudTests/SynchronizationStateManagerTests.swift b/iphone/Maps/Tests/Core/iCloudTests/SynchronizationStateManagerTests.swift
index fbff8ab23..97167873d 100644
--- a/iphone/Maps/Tests/Core/iCloudTests/SynchronizationStateManagerTests.swift
+++ b/iphone/Maps/Tests/Core/iCloudTests/SynchronizationStateManagerTests.swift
@@ -103,7 +103,7 @@ final class SynchronizationtateManagerTests: XCTestCase {
 
     let localItem1 = LocalMetadataItem.stub(fileName: "file1", lastModificationDate: TimeInterval(1))
     let cloudItem1 = CloudMetadataItem.stub(fileName: "file1", lastModificationDate: TimeInterval(2))
-    let cloudItem2 = CloudMetadataItem.stub(fileName: "file2", lastModificationDate: TimeInterval(3), isDownloaded: false)
+    let cloudItem2 = CloudMetadataItem.stub(fileName: "file2", lastModificationDate: TimeInterval(3), isDownloaded: false, percentDownloaded: 0.0)
     let cloudItem3 = CloudMetadataItem.stub(fileName: "file3", lastModificationDate: TimeInterval(4))
 
     let localItems = LocalContents([localItem1])
@@ -530,7 +530,7 @@ final class SynchronizationtateManagerTests: XCTestCase {
 
     XCTAssertEqual(outgoingEvents.count, 0)
 
-    var cloudItem4 = CloudMetadataItem.stub(fileName: "file4", lastModificationDate: TimeInterval(3), isDownloaded: false)
+    var cloudItem4 = CloudMetadataItem.stub(fileName: "file4", lastModificationDate: TimeInterval(3), isDownloaded: false, percentDownloaded: 0.0)
     cloudItems.append(cloudItem4)
     var update = CloudContentsUpdate(added: [cloudItem4], updated: [], removed: [])
     outgoingEvents = syncStateManager.resolveEvent(.didUpdateCloudContents(contents: cloudItems, update: update))
@@ -544,8 +544,17 @@ final class SynchronizationtateManagerTests: XCTestCase {
       }
     }
 
-    cloudItem4.isDownloaded = true
+    cloudItem4.percentDownloaded = 50.0
+    update = CloudContentsUpdate(added: [], updated: [cloudItem4], removed: [])
+    outgoingEvents = syncStateManager.resolveEvent(.didUpdateCloudContents(contents: cloudItems, update: update))
+    XCTAssertEqual(outgoingEvents.count, 0)
 
+    cloudItem4.percentDownloaded = 100.0
+    update = CloudContentsUpdate(added: [], updated: [cloudItem4], removed: [])
+    outgoingEvents = syncStateManager.resolveEvent(.didUpdateCloudContents(contents: cloudItems, update: update))
+    XCTAssertEqual(outgoingEvents.count, 0)
+
+    cloudItem4.isDownloaded = true
     // recreate collection
     cloudItems = [cloudItem1, cloudItem2, cloudItem3, cloudItem4]
     update = CloudContentsUpdate(added: [], updated: [cloudItem4], removed: [])
@@ -562,4 +571,3 @@ final class SynchronizationtateManagerTests: XCTestCase {
     }
   }
 }
-

From 31104eed4d7f2407575d93c8ecaa78ca4d9eef86 Mon Sep 17 00:00:00 2001
From: Kiryl Kaveryn <kirylkaveryn@gmail.com>
Date: Wed, 23 Jul 2025 18:38:36 +0400
Subject: [PATCH 011/302] [ios] Remove fileCoordinator wrapping from
 downloading starting

And add check `isUbiquitousItem` before downloading start. This method returns false when the file doesn't exist.

Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
---
 .../iCloud/SynchronizationFileWriter.swift    | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/iphone/Maps/Core/iCloud/SynchronizationFileWriter.swift b/iphone/Maps/Core/iCloud/SynchronizationFileWriter.swift
index 5ae7e07a3..618e79540 100644
--- a/iphone/Maps/Core/iCloud/SynchronizationFileWriter.swift
+++ b/iphone/Maps/Core/iCloud/SynchronizationFileWriter.swift
@@ -39,18 +39,16 @@ final class SynchronizationFileWriter {
 
   // MARK: - Read/Write/Downloading/Uploading
   private func startDownloading(_ cloudMetadataItem: CloudMetadataItem, completion: WritingResultCompletionHandler) {
-    var coordinationError: NSError?
-    fileCoordinator.coordinate(writingItemAt: cloudMetadataItem.fileUrl, options: [], error: &coordinationError) { cloudItemUrl in
-      do {
-        LOG(.info, "Start downloading file: \(cloudItemUrl.path)...")
-        try fileManager.startDownloadingUbiquitousItem(at: cloudItemUrl)
-        completion(.success)
-      } catch {
-        completion(.failure(error))
+    LOG(.info, "Start downloading file: \(cloudMetadataItem.fileUrl.path)...")
+    do {
+      if fileManager.isUbiquitousItem(at: cloudMetadataItem.fileUrl) {
+        try fileManager.startDownloadingUbiquitousItem(at: cloudMetadataItem.fileUrl)
+      } else {
+        LOG(.warning, "File \(cloudMetadataItem.fileUrl.path) is not a ubiquitous item. Skipping download.")
       }
-    }
-    if let coordinationError {
-      completion(.failure(coordinationError))
+      completion(.success)
+    } catch {
+      completion(.failure(error))
     }
   }
 

From 5b05a7ac719902b3d7568dd63cba3670523ec478 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Sat, 16 Aug 2025 01:15:07 +0700
Subject: [PATCH 012/302] [3party] Protobuf MSVC and C++23 fixes

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 3party/protobuf/protobuf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3party/protobuf/protobuf b/3party/protobuf/protobuf
index a6189acd1..9442c12e8 160000
--- a/3party/protobuf/protobuf
+++ b/3party/protobuf/protobuf
@@ -1 +1 @@
-Subproject commit a6189acd18b00611c1dc7042299ad75486f08a1a
+Subproject commit 9442c12e866b56369f1c53abea1261259c924a19

From 0a96a23ca0e27ebe0527e19f728916c7dc59c363 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Sat, 16 Aug 2025 01:43:47 +0700
Subject: [PATCH 013/302] [desktop] Fix Mac icon file location

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 qt/res/{ => mac}/mac.icns | Bin
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename qt/res/{ => mac}/mac.icns (100%)

diff --git a/qt/res/mac.icns b/qt/res/mac/mac.icns
similarity index 100%
rename from qt/res/mac.icns
rename to qt/res/mac/mac.icns

From ebc537005266fc97c588b5f50dec1396b9f3b1e3 Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Sat, 19 Jul 2025 00:12:29 +0200
Subject: [PATCH 014/302] [android] Load TTS languages from core

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 .../app/organicmaps/sdk/sound/TtsPlayer.java  |  30 +++--
 .../app/src/main/res/values/strings-tts.xml   | 106 ------------------
 .../cpp/app/organicmaps/sdk/sound/tts.cpp     |  59 ++++++----
 libs/platform/languages.hpp                   |  39 ++++++-
 4 files changed, 95 insertions(+), 139 deletions(-)
 delete mode 100644 android/app/src/main/res/values/strings-tts.xml

diff --git a/android/app/src/main/java/app/organicmaps/sdk/sound/TtsPlayer.java b/android/app/src/main/java/app/organicmaps/sdk/sound/TtsPlayer.java
index 0fc8a9b6c..2be401958 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/sound/TtsPlayer.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/sound/TtsPlayer.java
@@ -1,7 +1,6 @@
 package app.organicmaps.sdk.sound;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.database.ContentObserver;
 import android.os.Bundle;
 import android.os.Handler;
@@ -10,9 +9,9 @@ import android.provider.Settings;
 import android.speech.tts.TextToSpeech;
 import android.speech.tts.UtteranceProgressListener;
 import android.text.TextUtils;
+import android.util.Pair;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import app.organicmaps.R;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.concurrency.UiThread;
 import app.organicmaps.sdk.util.log.Logger;
@@ -43,6 +42,9 @@ public enum TtsPlayer
   private static final float SPEECH_RATE = 1.0f;
   private static final int TTS_SPEAK_DELAY_MILLIS = 50;
 
+  @Nullable
+  private static List<Pair<String, String>> sSupportedLanguages = null;
+
   public static Runnable sOnReloadCallback = null;
 
   private ContentObserver mTtsEngineObserver;
@@ -286,19 +288,15 @@ public enum TtsPlayer
 
   private boolean getUsableLanguages(List<LanguageData> outList)
   {
-    Resources resources = mContext.getResources();
-    String[] codes = resources.getStringArray(R.array.tts_languages_supported);
-    String[] names = resources.getStringArray(R.array.tts_language_names);
-
-    for (int i = 0; i < codes.length; i++)
+    for (final Pair<String, String> langNamePair : getSupportedLanguages())
     {
       try
       {
-        outList.add(new LanguageData(codes[i], names[i], mTts));
+        outList.add(new LanguageData(langNamePair.first, langNamePair.second, mTts));
       }
-      catch (LanguageData.NotAvailableException ignored)
+      catch (LanguageData.NotAvailableException ex)
       {
-        Logger.w(TAG, "Failed to get usable languages " + ignored.getMessage());
+        Logger.w(TAG, "Failed to get usable languages " + ex.getMessage());
       }
       catch (IllegalArgumentException e)
       {
@@ -351,8 +349,20 @@ public enum TtsPlayer
     return res;
   }
 
+  @NonNull
+  private List<Pair<String, String>> getSupportedLanguages()
+  {
+    if (sSupportedLanguages == null)
+    {
+      sSupportedLanguages = nativeGetSupportedLanguages();
+    }
+    return sSupportedLanguages;
+  }
+
   private native static void nativeEnableTurnNotifications(boolean enable);
   private native static boolean nativeAreTurnNotificationsEnabled();
   private native static void nativeSetTurnNotificationsLocale(String code);
   private native static String nativeGetTurnNotificationsLocale();
+  @NonNull
+  private native static List<Pair<String, String>> nativeGetSupportedLanguages();
 }
diff --git a/android/app/src/main/res/values/strings-tts.xml b/android/app/src/main/res/values/strings-tts.xml
deleted file mode 100644
index 4e2dc74cf..000000000
--- a/android/app/src/main/res/values/strings-tts.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <!--
-    Supported voice languages. Should have language[-country][:code] format.
-    Where:
-      language - two-letter ISO 639-1 language code.
-      country - two-letter ISO 3166-1 (alpha-2) country code.
-      code - internal language code to be set in the core.
-             If not specified, language is used.
-
-    Chinese is an exception. Matching is based on country code:
-    zh_TW, zh_MO and zh_HK correspond to zh-Hant.
-    Otherwise we consider that this is zh-Hans.
-
-    TODO: Move language list to core, now sync manually with platform/languages.hpp
-
-    languages should be added alphabetically in tts_language_names
-  -->
-  <string-array name="tts_languages_supported"
-                translatable="false">
-    <item>en</item>
-    <item>id</item>
-    <item>ca</item>
-    <item>da</item>
-    <item>de</item>
-    <item>es-ES:es</item>
-    <item>es-MX:es-MX</item>
-    <item>eu</item>
-    <item>fr</item>
-    <item>hr</item>
-    <item>it</item>
-    <item>sw</item>
-    <item>hu</item>
-    <item>nl</item>
-    <item>nb</item>
-    <item>pl</item>
-    <item>pt-PT:pt</item>
-    <item>pt-BR:pt-BR</item>
-    <item>ro</item>
-    <item>sk</item>
-    <item>fi</item>
-    <item>sv</item>
-    <item>vi</item>
-    <item>tr</item>
-    <item>cs</item>
-    <item>el</item>
-    <item>be</item>
-    <item>bg</item>
-    <item>ru</item>
-    <item>sr</item>
-    <item>uk</item>
-    <item>ar</item>
-    <item>fa</item>
-    <item>mr</item>
-    <item>hi</item>
-    <item>th</item>
-    <item>zh-CN:zh-Hans</item>
-    <item>zh-TW:zh-Hant</item>
-    <item>ja</item>
-    <item>ko</item>
-  </string-array>
-
-  <string-array name="tts_language_names"
-                translatable="false">
-    <item>English</item>
-    <item>Bahasa Indonesia</item>
-    <item>Català</item>
-    <item>Dansk</item>
-    <item>Deutsch</item>
-    <item>Español</item>
-    <item>Español (México)</item>
-    <item>Euskara</item>
-    <item>Français</item>
-    <item>Hrvatski</item>
-    <item>Italiano</item>
-    <item>Kiswahili</item>
-    <item>Magyar</item>
-    <item>Nederlands</item>
-    <item>Norsk Bokmål</item>
-    <item>Polski</item>
-    <item>Português</item>
-    <item>Português (Brasil)</item>
-    <item>Română</item>
-    <item>Slovenčina</item>
-    <item>Suomi</item>
-    <item>Svenska</item>
-    <item>Tiếng Việt</item>
-    <item>Türkçe</item>
-    <item>Čeština</item>
-    <item>Ελληνικά</item>
-    <item>Беларуская</item>
-    <item>Български</item>
-    <item>Русский</item>
-    <item>Српски</item>
-    <item>Українська</item>
-    <item>العربية</item>
-    <item>فارسی</item>
-    <item>मराठी</item>
-    <item>हिन्दी</item>
-    <item>ไทย</item>
-    <item>中文简体</item>
-    <item>中文繁體</item>
-    <item>日本語</item>
-    <item>한국어</item>
-  </string-array>
-</resources>
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/sound/tts.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/sound/tts.cpp
index 3fabf7596..a40287c90 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/sound/tts.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/sound/tts.cpp
@@ -1,30 +1,51 @@
 #include "app/organicmaps/sdk/Framework.hpp"
 
 #include "app/organicmaps/sdk/core/jni_helper.hpp"
+#include "app/organicmaps/sdk/core/jni_java_methods.hpp"
+
+#include "platform/languages.hpp"
 
 extern "C"
 {
-  JNIEXPORT void JNICALL
-  Java_app_organicmaps_sdk_sound_TtsPlayer_nativeEnableTurnNotifications(JNIEnv *, jclass, jboolean enable)
-  {
-    return frm()->GetRoutingManager().EnableTurnNotifications(static_cast<bool>(enable));
-  }
+JNIEXPORT void JNICALL
+Java_app_organicmaps_sdk_sound_TtsPlayer_nativeEnableTurnNotifications(JNIEnv *, jclass, jboolean enable)
+{
+  return frm()->GetRoutingManager().EnableTurnNotifications(static_cast<bool>(enable));
+}
 
-  JNIEXPORT jboolean JNICALL
-  Java_app_organicmaps_sdk_sound_TtsPlayer_nativeAreTurnNotificationsEnabled(JNIEnv *, jclass)
-  {
-    return static_cast<jboolean>(frm()->GetRoutingManager().AreTurnNotificationsEnabled());
-  }
+JNIEXPORT jboolean JNICALL
+Java_app_organicmaps_sdk_sound_TtsPlayer_nativeAreTurnNotificationsEnabled(JNIEnv *, jclass)
+{
+  return static_cast<jboolean>(frm()->GetRoutingManager().AreTurnNotificationsEnabled());
+}
 
-  JNIEXPORT void JNICALL
-  Java_app_organicmaps_sdk_sound_TtsPlayer_nativeSetTurnNotificationsLocale(JNIEnv * env, jclass, jstring jLocale)
-  {
-    frm()->GetRoutingManager().SetTurnNotificationsLocale(jni::ToNativeString(env, jLocale));
-  }
+JNIEXPORT void JNICALL
+Java_app_organicmaps_sdk_sound_TtsPlayer_nativeSetTurnNotificationsLocale(JNIEnv * env, jclass, jstring jLocale)
+{
+  frm()->GetRoutingManager().SetTurnNotificationsLocale(jni::ToNativeString(env, jLocale));
+}
 
-  JNIEXPORT jstring JNICALL
-  Java_app_organicmaps_sdk_sound_TtsPlayer_nativeGetTurnNotificationsLocale(JNIEnv * env, jclass)
+JNIEXPORT jstring JNICALL
+Java_app_organicmaps_sdk_sound_TtsPlayer_nativeGetTurnNotificationsLocale(JNIEnv * env, jclass)
+{
+  return jni::ToJavaString(env, frm()->GetRoutingManager().GetTurnNotificationsLocale());
+}
+
+JNIEXPORT jobject JNICALL
+Java_app_organicmaps_sdk_sound_TtsPlayer_nativeGetSupportedLanguages(JNIEnv * env, jclass)
+{
+  auto const & supportedLanguages = routing::turns::sound::kLanguageList;
+
+  auto const & listBuilder = jni::ListBuilder::Instance(env);
+  jobject const list = listBuilder.CreateArray(env, supportedLanguages.size());
+  for (auto const & [lang, name] : supportedLanguages)
   {
-    return jni::ToJavaString(env, frm()->GetRoutingManager().GetTurnNotificationsLocale());
+    jni::TScopedLocalRef const jLangString(env, jni::ToJavaString(env, lang));
+    jni::TScopedLocalRef const jNameString(env, jni::ToJavaString(env, name));
+    jni::TScopedLocalRef const pair(env,
+                                    jni::PairBuilder::Instance(env).Create(env, jLangString.get(), jNameString.get()));
+    env->CallBooleanMethod(list, listBuilder.m_add, pair.get());
   }
-} // extern "C"
+  return list;
+}
+}  // extern "C"
diff --git a/libs/platform/languages.hpp b/libs/platform/languages.hpp
index f11b33d2e..9f912dbfa 100644
--- a/libs/platform/languages.hpp
+++ b/libs/platform/languages.hpp
@@ -4,13 +4,29 @@
 #include <string>
 #include <utility>
 
-// The list of languages which can be used by TTS.
-// It shall be included in Android (jni) and iOS parts to get the languages list.
-// TODO: Now it is used only on iOS.
-// Manual sync with android/res/values/strings-tts.xml is needed.
+#include "std/target_os.hpp"
 
 namespace routing::turns::sound
 {
+/**
+ * @brief The list of languages which can be used by TTS (Text-To-Speech).
+ *
+ * Supported language identifiers follow the format:
+ *   @code
+ *   language[-COUNTRY][:internal_code]
+ *   @endcode
+ *
+ * Where:
+ * - `language`: a two-letter ISO 639-1 language code (e.g., "en", "fr", "zh").
+ * - `COUNTRY`: optional two-letter ISO 3166-1 alpha-2 country code (e.g., "US", "CN", "TW").
+ * - `internal_code`: optional internal language code used by the TTS core.
+ *                    If not specified, `language` is used as the default.
+ *
+ * @note Special handling for Chinese:
+ * - `zh_TW`, `zh_MO`, and `zh_HK` are treated as `zh-Hant` (Traditional Chinese).
+ * - All other variants default to `zh-Hans` (Simplified Chinese).
+ *
+ */
 std::array<std::pair<std::string_view, std::string_view>, 40> constexpr kLanguageList =
 {{
   {"en", "English"},
@@ -18,8 +34,13 @@ std::array<std::pair<std::string_view, std::string_view>, 40> constexpr kLanguag
   {"ca", "Català"},
   {"da", "Dansk"},
   {"de", "Deutsch"},
+#ifdef OMIM_OS_ANDROID
+  {"es-ES:es", "Español"},
+  {"es-MX:es-MX", "Español (México)"},
+#else
   {"es", "Español"},
   {"es-MX", "Español (México)"},
+#endif
   {"eu", "Euskara"},
   {"fr", "Français"},
   {"hr", "Hrvatski"},
@@ -29,8 +50,13 @@ std::array<std::pair<std::string_view, std::string_view>, 40> constexpr kLanguag
   {"nl", "Nederlands"},
   {"nb", "Norsk Bokmål"},
   {"pl", "Polski"},
+#ifdef OMIM_OS_ANDROID
+  {"pt-PT:pt", "Português"},
+  {"pt-BR:pt-BR", "Português (Brasil)"},
+#else
   {"pt", "Português"},
   {"pt-BR", "Português (Brasil)"},
+#endif
   {"ro", "Română"},
   {"sk", "Slovenčina"},
   {"fi", "Suomi"},
@@ -49,8 +75,13 @@ std::array<std::pair<std::string_view, std::string_view>, 40> constexpr kLanguag
   {"mr", "मराठी"},
   {"hi", "हिंदी"},
   {"th", "ไทย"},
+#ifdef OMIM_OS_ANDROID
+  {"zh-CN:zh-Hans", "中文简体"},
+  {"zh-TW:zh-Hant", "中文繁體"},
+#else
   {"zh-Hans", "中文简体"},
   {"zh-Hant", "中文繁體"},
+#endif
   {"ja", "日本語"},
   {"ko", "한국어"},
 }};

From d9335c0b6ce5e7fe01fc401a2b99432f9bfa5b41 Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Sat, 19 Jul 2025 15:07:48 +0200
Subject: [PATCH 015/302] [android] Load predefined colors from core

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 .../bookmarks/BookmarksListFragment.java      |  5 +-
 .../{IconsAdapter.java => ColorsAdapter.java} | 19 +++--
 .../sdk/bookmarks/data/BookmarkManager.java   | 39 ++-------
 .../organicmaps/sdk/bookmarks/data/Icon.java  | 84 +++----------------
 .../sdk/bookmarks/data/PredefinedColors.java  | 50 +++++++++++
 .../widget/SearchToolbarController.java       |  3 +-
 .../BookmarkColorDialogFragment.java          | 17 ++--
 .../placepage/EditBookmarkFragment.java       | 16 ++--
 .../widget/placepage/PlacePageController.java |  2 +-
 .../PlacePageOpeningHoursFragment.java        |  2 +-
 android/sdk/src/main/cpp/CMakeLists.txt       |  2 +
 .../sdk/bookmarks/data/BookmarkManager.cpp    | 14 +---
 .../sdk/bookmarks/data/PredefinedColors.cpp   | 40 +++++++++
 .../sdk/bookmarks/data/PredefinedColors.hpp   |  8 ++
 .../app/organicmaps/sdk/core/jni_helper.cpp   | 24 ++++--
 libs/drape/color.hpp                          |  5 ++
 libs/kml/types.hpp                            |  1 -
 17 files changed, 180 insertions(+), 151 deletions(-)
 rename android/app/src/main/java/app/organicmaps/bookmarks/{IconsAdapter.java => ColorsAdapter.java} (70%)
 create mode 100644 android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/PredefinedColors.java
 create mode 100644 android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/PredefinedColors.cpp
 create mode 100644 android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/PredefinedColors.hpp

diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java
index 32d2152f8..5567715a5 100644
--- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java
@@ -35,6 +35,7 @@ import app.organicmaps.sdk.bookmarks.data.BookmarkSharingResult;
 import app.organicmaps.sdk.bookmarks.data.CategoryDataSource;
 import app.organicmaps.sdk.bookmarks.data.Icon;
 import app.organicmaps.sdk.bookmarks.data.KmlFileType;
+import app.organicmaps.sdk.bookmarks.data.PredefinedColors;
 import app.organicmaps.sdk.bookmarks.data.SortedBlock;
 import app.organicmaps.sdk.bookmarks.data.Track;
 import app.organicmaps.sdk.search.BookmarkSearchListener;
@@ -592,7 +593,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
     if (mTrack == null)
       return;
     final Bundle args = new Bundle();
-    args.putInt(BookmarkColorDialogFragment.ICON_TYPE, Icon.getColorPosition(mTrack.getColor()));
+    args.putInt(BookmarkColorDialogFragment.ICON_TYPE, PredefinedColors.getPredefinedColorIndex(mTrack.getColor()));
     final FragmentManager manager = getChildFragmentManager();
     String className = BookmarkColorDialogFragment.class.getName();
     final FragmentFactory factory = manager.getFragmentFactory();
@@ -601,7 +602,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
     dialogFragment.setArguments(args);
     dialogFragment.setOnColorSetListener((colorPos) -> {
       int from = mTrack.getColor();
-      int to = BookmarkManager.ICONS.get(colorPos).argb();
+      int to = PredefinedColors.getColor(colorPos);
       if (from == to)
         return;
       BookmarkManager.INSTANCE.changeTrackColor(mTrack.getTrackId(), to);
diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/IconsAdapter.java b/android/app/src/main/java/app/organicmaps/bookmarks/ColorsAdapter.java
similarity index 70%
rename from android/app/src/main/java/app/organicmaps/bookmarks/IconsAdapter.java
rename to android/app/src/main/java/app/organicmaps/bookmarks/ColorsAdapter.java
index 58c16343a..ffcbd3011 100644
--- a/android/app/src/main/java/app/organicmaps/bookmarks/IconsAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/ColorsAdapter.java
@@ -7,16 +7,18 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import app.organicmaps.R;
-import app.organicmaps.sdk.bookmarks.data.Icon;
+import app.organicmaps.sdk.bookmarks.data.PredefinedColors;
 import app.organicmaps.util.Graphics;
 import com.google.android.material.imageview.ShapeableImageView;
 import java.util.List;
+import java.util.Objects;
 
-public class IconsAdapter extends ArrayAdapter<Icon>
+public class ColorsAdapter extends ArrayAdapter<Integer>
 {
+  @PredefinedColors.Color
   private int mCheckedIconColor;
 
-  public IconsAdapter(Context context, List<Icon> list)
+  public ColorsAdapter(Context context, List<Integer> list)
   {
     super(context, 0, 0, list);
   }
@@ -35,19 +37,20 @@ public class IconsAdapter extends ArrayAdapter<Icon>
     else
       holder = (SpinnerViewHolder) convertView.getTag();
 
-    final Icon icon = getItem(position);
+    @PredefinedColors.Color
+    final int color = Objects.requireNonNull(getItem(position));
 
     Drawable circle;
-    if (icon.getColor() == mCheckedIconColor)
+    if (color == mCheckedIconColor)
     {
-      circle = Graphics.drawCircleAndImage(getItem(position).argb(), R.dimen.track_circle_size,
+      circle = Graphics.drawCircleAndImage(PredefinedColors.getColor(mCheckedIconColor), R.dimen.track_circle_size,
                                            app.organicmaps.sdk.R.drawable.ic_bookmark_none, R.dimen.bookmark_icon_size,
                                            getContext());
     }
     else
     {
-      circle =
-          Graphics.drawCircle(getItem(position).argb(), R.dimen.select_color_circle_size, getContext().getResources());
+      circle = Graphics.drawCircle(PredefinedColors.getColor(color), R.dimen.select_color_circle_size,
+                                   getContext().getResources());
     }
     holder.icon.setImageDrawable(circle);
     return convertView;
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkManager.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkManager.java
index ae0fdc7fa..e683d4a56 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkManager.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkManager.java
@@ -41,8 +41,6 @@ public enum BookmarkManager {
   // These values have to match the values of kml::CompilationType from kml/types.hpp
   public static final int CATEGORY = 0;
 
-  public static final List<Icon> ICONS = new ArrayList<>();
-
   private static final String[] BOOKMARKS_EXTENSIONS = Framework.nativeGetBookmarksFilesExts();
 
   private static final String TAG = BookmarkManager.class.getSimpleName();
@@ -70,26 +68,6 @@ public enum BookmarkManager {
   @Nullable
   private OnElevationActivePointChangedListener mOnElevationActivePointChangedListener;
 
-  static
-  {
-    ICONS.add(new Icon(Icon.PREDEFINED_COLOR_RED, Icon.BOOKMARK_ICON_TYPE_NONE));
-    ICONS.add(new Icon(Icon.PREDEFINED_COLOR_PINK, Icon.BOOKMARK_ICON_TYPE_NONE));
-    ICONS.add(new Icon(Icon.PREDEFINED_COLOR_PURPLE, Icon.BOOKMARK_ICON_TYPE_NONE));
-    ICONS.add(new Icon(Icon.PREDEFINED_COLOR_DEEPPURPLE, Icon.BOOKMARK_ICON_TYPE_NONE));
-    ICONS.add(new Icon(Icon.PREDEFINED_COLOR_BLUE, Icon.BOOKMARK_ICON_TYPE_NONE));
-    ICONS.add(new Icon(Icon.PREDEFINED_COLOR_LIGHTBLUE, Icon.BOOKMARK_ICON_TYPE_NONE));
-    ICONS.add(new Icon(Icon.PREDEFINED_COLOR_CYAN, Icon.BOOKMARK_ICON_TYPE_NONE));
-    ICONS.add(new Icon(Icon.PREDEFINED_COLOR_TEAL, Icon.BOOKMARK_ICON_TYPE_NONE));
-    ICONS.add(new Icon(Icon.PREDEFINED_COLOR_GREEN, Icon.BOOKMARK_ICON_TYPE_NONE));
-    ICONS.add(new Icon(Icon.PREDEFINED_COLOR_LIME, Icon.BOOKMARK_ICON_TYPE_NONE));
-    ICONS.add(new Icon(Icon.PREDEFINED_COLOR_YELLOW, Icon.BOOKMARK_ICON_TYPE_NONE));
-    ICONS.add(new Icon(Icon.PREDEFINED_COLOR_ORANGE, Icon.BOOKMARK_ICON_TYPE_NONE));
-    ICONS.add(new Icon(Icon.PREDEFINED_COLOR_DEEPORANGE, Icon.BOOKMARK_ICON_TYPE_NONE));
-    ICONS.add(new Icon(Icon.PREDEFINED_COLOR_BROWN, Icon.BOOKMARK_ICON_TYPE_NONE));
-    ICONS.add(new Icon(Icon.PREDEFINED_COLOR_GRAY, Icon.BOOKMARK_ICON_TYPE_NONE));
-    ICONS.add(new Icon(Icon.PREDEFINED_COLOR_BLUEGRAY, Icon.BOOKMARK_ICON_TYPE_NONE));
-  }
-
   public void toggleCategoryVisibility(@NonNull BookmarkCategory category)
   {
     boolean isVisible = isVisible(category.getId());
@@ -342,7 +320,7 @@ public enum BookmarkManager {
     nativeShowBookmarkCategoryOnMap(catId);
   }
 
-  @Icon.PredefinedColor
+  @PredefinedColors.Color
   public int getLastEditedColor()
   {
     return nativeGetLastEditedColor();
@@ -618,7 +596,7 @@ public enum BookmarkManager {
     return nativeGetBookmarkXY(bookmarkId);
   }
 
-  @Icon.PredefinedColor
+  @PredefinedColors.Color
   public int getBookmarkColor(@IntRange(from = 0) long bookmarkId)
   {
     return nativeGetBookmarkColor(bookmarkId);
@@ -652,7 +630,7 @@ public enum BookmarkManager {
   }
 
   public void setBookmarkParams(@IntRange(from = 0) long bookmarkId, @NonNull String name,
-                                @Icon.PredefinedColor int color, @NonNull String descr)
+                                @PredefinedColors.Color int color, @NonNull String descr)
   {
     nativeSetBookmarkParams(bookmarkId, name, color, descr);
   }
@@ -808,7 +786,7 @@ public enum BookmarkManager {
   @Nullable
   private native Bookmark nativeAddBookmarkToLastEditedCategory(double lat, double lon);
 
-  @Icon.PredefinedColor
+  @PredefinedColors.Color
   private native int nativeGetLastEditedColor();
 
   private static native void nativeLoadBookmarksFile(@NonNull String path, boolean isTemporaryFile);
@@ -874,7 +852,7 @@ public enum BookmarkManager {
   @NonNull
   private static native ParcelablePointD nativeGetBookmarkXY(@IntRange(from = 0) long bookmarkId);
 
-  @Icon.PredefinedColor
+  @PredefinedColors.Color
   private static native int nativeGetBookmarkColor(@IntRange(from = 0) long bookmarkId);
 
   private static native int nativeGetBookmarkIcon(@IntRange(from = 0) long bookmarkId);
@@ -889,12 +867,13 @@ public enum BookmarkManager {
   private static native String nativeEncode2Ge0Url(@IntRange(from = 0) long bookmarkId, boolean addName);
 
   private static native void nativeSetBookmarkParams(@IntRange(from = 0) long bookmarkId, @NonNull String name,
-                                                     @Icon.PredefinedColor int color, @NonNull String descr);
+                                                     @PredefinedColors.Color int color, @NonNull String descr);
 
-  private static native void nativeChangeTrackColor(@IntRange(from = 0) long trackId, @Icon.PredefinedColor int color);
+  private static native void nativeChangeTrackColor(@IntRange(from = 0) long trackId,
+                                                    @PredefinedColors.Color int color);
 
   private static native void nativeSetTrackParams(@IntRange(from = 0) long trackId, @NonNull String name,
-                                                  @Icon.PredefinedColor int color, @NonNull String descr);
+                                                  @PredefinedColors.Color int color, @NonNull String descr);
 
   private static native void nativeChangeBookmarkCategory(@IntRange(from = 0) long oldCatId,
                                                           @IntRange(from = 0) long newCatId,
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java
index ffc3e9252..1d80f0980 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java
@@ -2,71 +2,13 @@ package app.organicmaps.sdk.bookmarks.data;
 
 import android.os.Parcel;
 import android.os.Parcelable;
+import androidx.annotation.ColorInt;
 import androidx.annotation.DrawableRes;
-import androidx.annotation.IntDef;
 import app.organicmaps.sdk.R;
 import com.google.common.base.Objects;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
 
 public class Icon implements Parcelable
 {
-  @Retention(RetentionPolicy.SOURCE)
-  @IntDef({PREDEFINED_COLOR_NONE, PREDEFINED_COLOR_RED, PREDEFINED_COLOR_BLUE, PREDEFINED_COLOR_PURPLE,
-           PREDEFINED_COLOR_YELLOW, PREDEFINED_COLOR_PINK, PREDEFINED_COLOR_BROWN, PREDEFINED_COLOR_GREEN,
-           PREDEFINED_COLOR_ORANGE, PREDEFINED_COLOR_DEEPPURPLE, PREDEFINED_COLOR_LIGHTBLUE, PREDEFINED_COLOR_CYAN,
-           PREDEFINED_COLOR_TEAL, PREDEFINED_COLOR_LIME, PREDEFINED_COLOR_DEEPORANGE, PREDEFINED_COLOR_GRAY,
-           PREDEFINED_COLOR_BLUEGRAY})
-  @interface PredefinedColor
-  {}
-
-  static final int PREDEFINED_COLOR_NONE = 0;
-  static final int PREDEFINED_COLOR_RED = 1;
-  static final int PREDEFINED_COLOR_BLUE = 2;
-  static final int PREDEFINED_COLOR_PURPLE = 3;
-  static final int PREDEFINED_COLOR_YELLOW = 4;
-  static final int PREDEFINED_COLOR_PINK = 5;
-  static final int PREDEFINED_COLOR_BROWN = 6;
-  static final int PREDEFINED_COLOR_GREEN = 7;
-  static final int PREDEFINED_COLOR_ORANGE = 8;
-  static final int PREDEFINED_COLOR_DEEPPURPLE = 9;
-  static final int PREDEFINED_COLOR_LIGHTBLUE = 10;
-  static final int PREDEFINED_COLOR_CYAN = 11;
-  static final int PREDEFINED_COLOR_TEAL = 12;
-  static final int PREDEFINED_COLOR_LIME = 13;
-  static final int PREDEFINED_COLOR_DEEPORANGE = 14;
-  static final int PREDEFINED_COLOR_GRAY = 15;
-  static final int PREDEFINED_COLOR_BLUEGRAY = 16;
-
-  private static int shift(int v, int bitCount)
-  {
-    return v << bitCount;
-  }
-  private static int toARGB(int r, int g, int b)
-  {
-    return shift(255, 24) + shift(r, 16) + shift(g, 8) + b;
-  }
-
-  /// @note Important! Should be synced with kml/types.hpp/PredefinedColor
-  /// @todo Values can be taken from Core.
-  private static final int[] ARGB_COLORS = {toARGB(229, 27, 35), // none
-                                            toARGB(229, 27, 35), // red
-                                            toARGB(0, 110, 199), // blue
-                                            toARGB(156, 39, 176), // purple
-                                            toARGB(255, 200, 0), // yellow
-                                            toARGB(255, 65, 130), // pink
-                                            toARGB(121, 85, 72), // brown
-                                            toARGB(56, 142, 60), // green
-                                            toARGB(255, 160, 0), // orange
-                                            toARGB(102, 57, 191), // deeppurple
-                                            toARGB(36, 156, 242), // lightblue
-                                            toARGB(20, 190, 205), // cyan
-                                            toARGB(0, 165, 140), // teal
-                                            toARGB(147, 191, 57), // lime
-                                            toARGB(240, 100, 50), // deeporange
-                                            toARGB(115, 115, 115), // gray
-                                            toARGB(89, 115, 128)}; // bluegray
-
   static final int BOOKMARK_ICON_TYPE_NONE = 0;
 
   /// @note Important! Should be synced with kml/types.hpp/BookmarkIcon
@@ -98,11 +40,16 @@ public class Icon implements Parcelable
       R.drawable.ic_bookmark_none  // FastFood
   };
 
-  @PredefinedColor
+  @PredefinedColors.Color
   private final int mColor;
   private final int mType;
 
-  public Icon(@PredefinedColor int color, int type)
+  public Icon(@PredefinedColors.Color int color)
+  {
+    this(color, BOOKMARK_ICON_TYPE_NONE);
+  }
+
+  public Icon(@PredefinedColors.Color int color, int type)
   {
     mColor = color;
     mType = type;
@@ -127,25 +74,16 @@ public class Icon implements Parcelable
     mType = in.readInt();
   }
 
-  @PredefinedColor
+  @PredefinedColors.Color
   public int getColor()
   {
     return mColor;
   }
 
+  @ColorInt
   public int argb()
   {
-    return ARGB_COLORS[mColor];
-  }
-
-  public static int getColorPosition(int color)
-  {
-    for (int index = 1; index < ARGB_COLORS.length; index++)
-    {
-      if (ARGB_COLORS[index] == color)
-        return index;
-    }
-    return -1;
+    return PredefinedColors.getColor(mColor);
   }
 
   @DrawableRes
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/PredefinedColors.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/PredefinedColors.java
new file mode 100644
index 000000000..dd9b3fcb0
--- /dev/null
+++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/PredefinedColors.java
@@ -0,0 +1,50 @@
+package app.organicmaps.sdk.bookmarks.data;
+
+import androidx.annotation.ColorInt;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import dalvik.annotation.optimization.FastNative;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.List;
+import java.util.stream.IntStream;
+
+public class PredefinedColors
+{
+  @Retention(RetentionPolicy.SOURCE)
+  @IntRange(from = 0)
+  public @interface Color
+  {}
+
+  /// @note Color format: ARGB
+  @ColorInt
+  private static final int[] PREDEFINED_COLORS = nativeGetPredefinedColors();
+
+  @ColorInt
+  public static int getColor(int index)
+  {
+    return PREDEFINED_COLORS[index];
+  }
+
+  @PredefinedColors.Color
+  public static List<Integer> getAllPredefinedColors()
+  {
+    // 0 is reserved for "no color" option.
+    return IntStream.range(1, PREDEFINED_COLORS.length).boxed().toList();
+  }
+
+  public static int getPredefinedColorIndex(@ColorInt int color)
+  {
+    // 0 is reserved for "no color" option.
+    for (int index = 1; index < PREDEFINED_COLORS.length; index++)
+    {
+      if (PREDEFINED_COLORS[index] == color)
+        return index;
+    }
+    return -1;
+  }
+
+  @FastNative
+  @NonNull
+  private static native int[] nativeGetPredefinedColors();
+}
diff --git a/android/app/src/main/java/app/organicmaps/widget/SearchToolbarController.java b/android/app/src/main/java/app/organicmaps/widget/SearchToolbarController.java
index 12e17bc92..2060dd4e2 100644
--- a/android/app/src/main/java/app/organicmaps/widget/SearchToolbarController.java
+++ b/android/app/src/main/java/app/organicmaps/widget/SearchToolbarController.java
@@ -240,7 +240,8 @@ public class SearchToolbarController extends ToolbarController implements View.O
   }
 
   @NonNull
-  public OnBackPressedCallback getBackPressedCallback() {
+  public OnBackPressedCallback getBackPressedCallback()
+  {
     return mBackPressedCallback;
   }
 }
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java
index a1a966b63..87310f7c8 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java
@@ -9,9 +9,8 @@ import android.widget.GridView;
 import androidx.annotation.NonNull;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmDialogFragment;
-import app.organicmaps.bookmarks.IconsAdapter;
-import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
-import app.organicmaps.sdk.bookmarks.data.Icon;
+import app.organicmaps.bookmarks.ColorsAdapter;
+import app.organicmaps.sdk.bookmarks.data.PredefinedColors;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import java.util.List;
 
@@ -19,11 +18,12 @@ public class BookmarkColorDialogFragment extends BaseMwmDialogFragment
 {
   public static final String ICON_TYPE = "ExtraIconType";
 
+  @PredefinedColors.Color
   private int mIconColor;
 
   public interface OnBookmarkColorChangeListener
   {
-    void onBookmarkColorSet(int colorPos);
+    void onBookmarkColorSet(@PredefinedColors.Color int color);
   }
 
   private OnBookmarkColorChangeListener mColorSetListener;
@@ -49,19 +49,20 @@ public class BookmarkColorDialogFragment extends BaseMwmDialogFragment
     mColorSetListener = listener;
   }
 
+  @NonNull
   private View buildView()
   {
-    final List<Icon> icons = BookmarkManager.ICONS;
-    final IconsAdapter adapter = new IconsAdapter(requireActivity(), icons);
+    final List<Integer> colors = PredefinedColors.getAllPredefinedColors();
+    final ColorsAdapter adapter = new ColorsAdapter(requireActivity(), colors);
     adapter.chooseItem(mIconColor);
 
     @SuppressLint("InflateParams")
     final GridView gView =
         (GridView) LayoutInflater.from(requireActivity()).inflate(R.layout.fragment_color_grid, null);
     gView.setAdapter(adapter);
-    gView.setOnItemClickListener((arg0, who, pos, id) -> {
+    gView.setOnItemClickListener((parent, view, predefinedColor, id) -> {
       if (mColorSetListener != null)
-        mColorSetListener.onBookmarkColorSet(pos);
+        mColorSetListener.onBookmarkColorSet(predefinedColor);
       dismiss();
     });
 
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
index 2bcfee1ee..ec586ffaf 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
@@ -24,6 +24,7 @@ import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
 import app.organicmaps.sdk.bookmarks.data.BookmarkInfo;
 import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
 import app.organicmaps.sdk.bookmarks.data.Icon;
+import app.organicmaps.sdk.bookmarks.data.PredefinedColors;
 import app.organicmaps.sdk.bookmarks.data.Track;
 import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.Graphics;
@@ -304,7 +305,7 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
 
     final Bundle args = new Bundle();
     if (mTrack != null)
-      args.putInt(BookmarkColorDialogFragment.ICON_TYPE, mTrack.getColor());
+      args.putInt(BookmarkColorDialogFragment.ICON_TYPE, PredefinedColors.getPredefinedColorIndex(mColor));
     else
       args.putInt(BookmarkColorDialogFragment.ICON_TYPE, mIcon.getColor());
     final FragmentManager manager = getChildFragmentManager();
@@ -317,17 +318,16 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
     {
       case TYPE_BOOKMARK ->
         dialogFragment.setOnColorSetListener(colorPos -> {
-          final Icon newIcon = BookmarkManager.ICONS.get(colorPos);
-          if (mIcon.getColor() == newIcon.getColor())
+          if (mIcon != null & mIcon.getColor() == colorPos)
             return;
 
-          mIcon = newIcon;
+          mIcon = new Icon(colorPos);
           refreshColorMarker();
         });
       case TYPE_TRACK ->
         dialogFragment.setOnColorSetListener(colorPos -> {
           int from = mTrack.getColor();
-          int to = BookmarkManager.ICONS.get(colorPos).argb();
+          int to = PredefinedColors.getColor(colorPos);
           if (from == to)
             return;
           mColor = to;
@@ -342,9 +342,9 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
   {
     if (mIcon != null)
     {
-      Drawable circle =
-          Graphics.drawCircleAndImage(mIcon.argb(), R.dimen.track_circle_size, app.organicmaps.sdk.R.drawable.ic_bookmark_none,
-                                      R.dimen.bookmark_icon_size, requireContext());
+      Drawable circle = Graphics.drawCircleAndImage(mIcon.argb(), R.dimen.track_circle_size,
+                                                    app.organicmaps.sdk.R.drawable.ic_bookmark_none,
+                                                    R.dimen.bookmark_icon_size, requireContext());
       mIvColor.setImageDrawable(circle);
     }
   }
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
index 086b6d668..c8de26b72 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
@@ -26,6 +26,7 @@ import app.organicmaps.R;
 import app.organicmaps.api.Const;
 import app.organicmaps.intent.Factory;
 import app.organicmaps.routing.RoutingController;
+import app.organicmaps.sdk.ChoosePositionMode;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
@@ -33,7 +34,6 @@ import app.organicmaps.sdk.bookmarks.data.RoadWarningMarkType;
 import app.organicmaps.sdk.settings.RoadType;
 import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.sdk.util.log.Logger;
-import app.organicmaps.sdk.ChoosePositionMode;
 import app.organicmaps.util.ThemeUtils;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetItem;
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java
index 060cdea8a..e227ff2dd 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java
@@ -14,10 +14,10 @@ import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.R;
+import app.organicmaps.editor.data.TimeFormatUtils;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
 import app.organicmaps.sdk.bookmarks.data.Metadata;
 import app.organicmaps.sdk.editor.OpeningHours;
-import app.organicmaps.editor.data.TimeFormatUtils;
 import app.organicmaps.sdk.editor.data.Timespan;
 import app.organicmaps.sdk.editor.data.Timetable;
 import app.organicmaps.sdk.util.UiUtils;
diff --git a/android/sdk/src/main/cpp/CMakeLists.txt b/android/sdk/src/main/cpp/CMakeLists.txt
index 770e2682a..4efbd8135 100644
--- a/android/sdk/src/main/cpp/CMakeLists.txt
+++ b/android/sdk/src/main/cpp/CMakeLists.txt
@@ -43,6 +43,8 @@ set(SRC
   app/organicmaps/sdk/core/jni_java_methods.cpp
   app/organicmaps/sdk/core/logging.cpp
   app/organicmaps/sdk/bookmarks/data/BookmarkManager.cpp
+  app/organicmaps/sdk/bookmarks/data/PredefinedColors.cpp
+  app/organicmaps/sdk/bookmarks/data/PredefinedColors.hpp
   app/organicmaps/sdk/DownloadResourcesLegacyActivity.cpp
   app/organicmaps/sdk/editor/Editor.cpp
   app/organicmaps/sdk/editor/OpeningHours.cpp
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/BookmarkManager.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/BookmarkManager.cpp
index 69c99079b..8048629be 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/BookmarkManager.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/BookmarkManager.cpp
@@ -532,16 +532,10 @@ Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetTrack(
 
   ASSERT(nTrack, ("Track must not be null with id:)", trackId));
 
-  dp::Color nColor = nTrack->GetColor(0);
-
-  jint androidColor = shift(nColor.GetAlpha(), 24) +
-                      shift(nColor.GetRed(), 16) +
-                      shift(nColor.GetGreen(), 8) +
-                      nColor.GetBlue();
-
-  return env->NewObject(trackClazz, cId,
-                        trackId, static_cast<jlong>(nTrack->GetGroupId()), jni::ToJavaString(env, nTrack->GetName()),
-                        ToJavaDistance(env, platform::Distance::CreateFormatted(nTrack->GetLengthMeters())), androidColor);
+  return env->NewObject(trackClazz, cId, trackId, static_cast<jlong>(nTrack->GetGroupId()),
+                        jni::ToJavaString(env, nTrack->GetName()),
+                        ToJavaDistance(env, platform::Distance::CreateFormatted(nTrack->GetLengthMeters())),
+                        nTrack->GetColor(0).GetARGB());
 }
 
 JNIEXPORT jlong JNICALL
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/PredefinedColors.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/PredefinedColors.cpp
new file mode 100644
index 000000000..c038a1330
--- /dev/null
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/PredefinedColors.cpp
@@ -0,0 +1,40 @@
+#include "PredefinedColors.hpp"
+
+#include "kml/types.hpp"
+
+#include <array>
+
+extern "C"
+{
+JNIEXPORT jintArray JNICALL
+Java_app_organicmaps_sdk_bookmarks_data_PredefinedColors_nativeGetPredefinedColors(JNIEnv * env, jclass)
+{
+  std::array<jint, static_cast<size_t>(kml::PredefinedColor::Count)> colors{};
+  for (size_t i = 0; i < static_cast<size_t>(kml::PredefinedColor::Count); ++i)
+    colors[i] = static_cast<jint>(kml::ColorFromPredefinedColor(static_cast<kml::PredefinedColor>(i)).GetARGB());
+
+  jintArray jColors = env->NewIntArray(colors.size());
+  env->SetIntArrayRegion(jColors, 0, static_cast<jsize>(colors.size()), colors.data());
+  return jColors;
+}
+}
+
+namespace
+{
+JNINativeMethod const methods[] = {
+    {"nativeGetPredefinedColors", "()[I",
+     reinterpret_cast<void *>(&Java_app_organicmaps_sdk_bookmarks_data_PredefinedColors_nativeGetPredefinedColors)},
+};
+}
+
+namespace predefined_colors
+{
+jint registerNativeMethods(JNIEnv * env)
+{
+  jclass clazz = env->FindClass("app/organicmaps/sdk/bookmarks/data/PredefinedColors");
+  if (clazz == nullptr)
+    return JNI_ERR;
+
+  return env->RegisterNatives(clazz, methods, std::size(methods));
+}
+}  // namespace predefined_colors
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/PredefinedColors.hpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/PredefinedColors.hpp
new file mode 100644
index 000000000..0296558b6
--- /dev/null
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/PredefinedColors.hpp
@@ -0,0 +1,8 @@
+#pragma once
+
+#include <jni.h>
+
+namespace predefined_colors
+{
+jint registerNativeMethods(JNIEnv * env);
+}
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.cpp
index 9050f7823..05a8700bf 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.cpp
@@ -1,11 +1,13 @@
 #include "jni_helper.hpp"
-#include "logging.hpp"
 #include "ScopedLocalRef.hpp"
+#include "logging.hpp"
 
 #include "base/assert.hpp"
 #include "base/exception.hpp"
 #include "base/string_utils.hpp"
 
+#include "app/organicmaps/sdk/bookmarks/data/PredefinedColors.hpp"
+
 #include <vector>
 
 static JavaVM * g_jvm = 0;
@@ -31,21 +33,21 @@ extern "C"
 {
 int __system_property_get(char const * name, char * value);
 
-static bool IsAndroidLowerThan7()
+static bool IsAndroidApiLowerThan(int apiLevel)
 {
   char value[92] = { 0 };
   if (__system_property_get("ro.build.version.sdk", value) < 1)
     return false;
-  const int apiLevel = atoi(value);
-  if (apiLevel > 0 && apiLevel < 24)
+  int const deviceApiLevel = atoi(value);
+  if (deviceApiLevel > 0 && deviceApiLevel < apiLevel)
     return true;
   return false;
 }
 
-static bool const g_isAndroidLowerThan7 = IsAndroidLowerThan7();
+static bool const g_isAndroidLowerThan12 = IsAndroidApiLowerThan(30);
+static bool const g_isAndroidLowerThan7 = g_isAndroidLowerThan12 && IsAndroidApiLowerThan(24);
 
-JNIEXPORT jint JNICALL
-JNI_OnLoad(JavaVM * jvm, void *)
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM * jvm, void *)
 {
   g_jvm = jvm;
   jni::InitSystemLog();
@@ -64,6 +66,12 @@ JNI_OnLoad(JavaVM * jvm, void *)
   g_networkPolicyClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/NetworkPolicy");
   g_elevationInfoClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/ElevationInfo");
 
+  if (g_isAndroidLowerThan12)
+  {
+    if (predefined_colors::registerNativeMethods(env) != JNI_OK)
+      return JNI_ERR;
+  }
+
   return JNI_VERSION_1_6;
 }
 
@@ -84,7 +92,7 @@ JNI_OnUnload(JavaVM *, void *)
   env->DeleteGlobalRef(g_networkPolicyClazz);
   env->DeleteGlobalRef(g_elevationInfoClazz);
 }
-} // extern "C"
+}  // extern "C"
 
 namespace jni
 {
diff --git a/libs/drape/color.hpp b/libs/drape/color.hpp
index fca5effe6..45b9dcf66 100644
--- a/libs/drape/color.hpp
+++ b/libs/drape/color.hpp
@@ -26,6 +26,11 @@ struct Color
   constexpr uint8_t GetBlue() const { return ExtractByte(m_rgba, 1); }
   constexpr uint8_t GetAlpha() const { return ExtractByte(m_rgba, 0); }
   constexpr uint32_t GetRGBA() const { return m_rgba; }
+  constexpr uint32_t GetARGB() const
+  {
+    return (static_cast<uint32_t>(GetAlpha()) << 24) | (static_cast<uint32_t>(GetRed()) << 16) |
+           (static_cast<uint32_t>(GetGreen()) << 8) | static_cast<uint32_t>(GetBlue());
+  }
 
   constexpr float GetRedF() const { return ChannelToFloat(GetRed()); }
   constexpr float GetGreenF() const { return ChannelToFloat(GetGreen()); }
diff --git a/libs/kml/types.hpp b/libs/kml/types.hpp
index b65b73353..c4ad8deb1 100644
--- a/libs/kml/types.hpp
+++ b/libs/kml/types.hpp
@@ -15,7 +15,6 @@
 
 namespace kml
 {
-/// @note Important! Should be synced with android/app/src/main/java/app/organicmaps/bookmarks/data/Icon.java
 enum class PredefinedColor : uint8_t
 {
   None = 0,

From 2ded7e5e2ba2696d04a34b392f19a8a2c7f92c26 Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Sun, 20 Jul 2025 11:52:35 +0200
Subject: [PATCH 016/302] [android] Load icon types from core

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 .../organicmaps/sdk/bookmarks/data/Icon.java  | 66 +++++++++++--------
 .../app/organicmaps/sdk/util/StringUtils.java |  4 ++
 android/sdk/src/main/cpp/CMakeLists.txt       |  2 +
 .../organicmaps/sdk/bookmarks/data/Icon.cpp   | 37 +++++++++++
 .../organicmaps/sdk/bookmarks/data/Icon.hpp   |  8 +++
 .../sdk/bookmarks/data/PredefinedColors.cpp   |  4 +-
 .../sdk/bookmarks/data/PredefinedColors.hpp   |  2 +-
 .../app/organicmaps/sdk/core/jni_helper.cpp   |  3 +
 .../src/main/res/drawable/ic_bookmark_art.xml | 10 +++
 .../main/res/drawable/ic_bookmark_bank.xml    | 10 +++
 .../drawable/ic_bookmark_bicycle_parking.xml  |  9 +++
 .../ic_bookmark_bicycle_parking_covered.xml   | 15 +++++
 .../drawable/ic_bookmark_bicycle_rental.xml   | 30 +++++++++
 .../main/res/drawable/ic_bookmark_cafe.xml    | 10 +++
 .../drawable/ic_bookmark_charging_station.xml |  9 +++
 .../res/drawable/ic_bookmark_exchange.xml     | 10 +++
 .../res/drawable/ic_bookmark_fast_food.xml    | 10 +++
 .../res/drawable/ic_bookmark_information.xml  | 18 +++++
 .../res/drawable/ic_bookmark_pharmacy.xml     | 10 +++
 .../src/main/res/drawable/ic_bookmark_pub.xml | 10 +++
 .../main/res/drawable/ic_bookmark_stadium.xml | 10 +++
 .../main/res/drawable/ic_bookmark_theatre.xml | 10 +++
 libs/kml/types.hpp                            |  1 -
 23 files changed, 266 insertions(+), 32 deletions(-)
 create mode 100644 android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/Icon.cpp
 create mode 100644 android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/Icon.hpp
 create mode 100644 android/sdk/src/main/res/drawable/ic_bookmark_art.xml
 create mode 100644 android/sdk/src/main/res/drawable/ic_bookmark_bank.xml
 create mode 100644 android/sdk/src/main/res/drawable/ic_bookmark_bicycle_parking.xml
 create mode 100644 android/sdk/src/main/res/drawable/ic_bookmark_bicycle_parking_covered.xml
 create mode 100644 android/sdk/src/main/res/drawable/ic_bookmark_bicycle_rental.xml
 create mode 100644 android/sdk/src/main/res/drawable/ic_bookmark_cafe.xml
 create mode 100644 android/sdk/src/main/res/drawable/ic_bookmark_charging_station.xml
 create mode 100644 android/sdk/src/main/res/drawable/ic_bookmark_exchange.xml
 create mode 100644 android/sdk/src/main/res/drawable/ic_bookmark_fast_food.xml
 create mode 100644 android/sdk/src/main/res/drawable/ic_bookmark_information.xml
 create mode 100644 android/sdk/src/main/res/drawable/ic_bookmark_pharmacy.xml
 create mode 100644 android/sdk/src/main/res/drawable/ic_bookmark_pub.xml
 create mode 100644 android/sdk/src/main/res/drawable/ic_bookmark_stadium.xml
 create mode 100644 android/sdk/src/main/res/drawable/ic_bookmark_theatre.xml

diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java
index 1d80f0980..695552669 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java
@@ -4,41 +4,21 @@ import android.os.Parcel;
 import android.os.Parcelable;
 import androidx.annotation.ColorInt;
 import androidx.annotation.DrawableRes;
-import app.organicmaps.sdk.R;
+import androidx.annotation.NonNull;
+import app.organicmaps.BuildConfig;
+import app.organicmaps.sdk.util.StringUtils;
+import app.organicmaps.sdk.util.log.Logger;
 import com.google.common.base.Objects;
+import dalvik.annotation.optimization.FastNative;
 
 public class Icon implements Parcelable
 {
+  private static final String TAG = Icon.class.getSimpleName();
+
   static final int BOOKMARK_ICON_TYPE_NONE = 0;
 
-  /// @note Important! Should be synced with kml/types.hpp/BookmarkIcon
-  /// @todo Can make better: take name-by-type from Core and make a concat: "R.drawable.ic_bookmark_" + name.
-  // First icon should be "none" <-> BOOKMARK_ICON_TYPE_NONE.
   @DrawableRes
-  private static final int[] TYPE_ICONS = {
-      R.drawable.ic_bookmark_none,          R.drawable.ic_bookmark_hotel,     R.drawable.ic_bookmark_animals,
-      R.drawable.ic_bookmark_buddhism,      R.drawable.ic_bookmark_building,  R.drawable.ic_bookmark_christianity,
-      R.drawable.ic_bookmark_entertainment, R.drawable.ic_bookmark_money,     R.drawable.ic_bookmark_food,
-      R.drawable.ic_bookmark_gas,           R.drawable.ic_bookmark_judaism,   R.drawable.ic_bookmark_medicine,
-      R.drawable.ic_bookmark_mountain,      R.drawable.ic_bookmark_museum,    R.drawable.ic_bookmark_islam,
-      R.drawable.ic_bookmark_park,          R.drawable.ic_bookmark_parking,   R.drawable.ic_bookmark_shop,
-      R.drawable.ic_bookmark_sights,        R.drawable.ic_bookmark_swim,      R.drawable.ic_bookmark_water,
-      R.drawable.ic_bookmark_bar,           R.drawable.ic_bookmark_transport, R.drawable.ic_bookmark_viewpoint,
-      R.drawable.ic_bookmark_sport,
-      R.drawable.ic_bookmark_none, // pub
-      R.drawable.ic_bookmark_none, // art
-      R.drawable.ic_bookmark_none, // bank
-      R.drawable.ic_bookmark_none, // cafe
-      R.drawable.ic_bookmark_none, // pharmacy
-      R.drawable.ic_bookmark_none, // stadium
-      R.drawable.ic_bookmark_none, // theatre
-      R.drawable.ic_bookmark_none, // information
-      R.drawable.ic_bookmark_none, // ChargingStation
-      R.drawable.ic_bookmark_none, // BicycleParking
-      R.drawable.ic_bookmark_none, // BicycleParkingCovered
-      R.drawable.ic_bookmark_none, // BicycleRental
-      R.drawable.ic_bookmark_none  // FastFood
-  };
+  private static final int[] TYPE_ICONS = GetTypeIcons();
 
   @PredefinedColors.Color
   private final int mColor;
@@ -119,4 +99,34 @@ public class Icon implements Parcelable
       return new Icon[size];
     }
   };
+
+  @NonNull
+  @DrawableRes
+  private static int[] GetTypeIcons()
+  {
+    final String[] names = nativeGetBookmarkIconNames();
+    int[] icons = new int[names.length];
+    for (int i = 0; i < names.length; i++)
+    {
+      final String name = StringUtils.toSnakeCase(names[i]);
+      try
+      {
+        icons[i] = app.organicmaps.sdk.R.drawable.class.getField("ic_bookmark_" + name).getInt(null);
+      }
+      catch (NoSuchFieldException | IllegalAccessException e)
+      {
+        Logger.e(TAG, "Error getting icon for " + name);
+        // Force devs to add an icon for each bookmark type.
+        if (BuildConfig.DEBUG)
+          throw new RuntimeException("Error getting icon for " + name, e);
+        icons[i] = app.organicmaps.sdk.R.drawable.ic_bookmark_none; // Fallback icon
+      }
+    }
+
+    return icons;
+  }
+
+  @FastNative
+  @NonNull
+  private static native String[] nativeGetBookmarkIconNames();
 }
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/StringUtils.java b/android/app/src/main/java/app/organicmaps/sdk/util/StringUtils.java
index 1512c6898..ca0ce167b 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/util/StringUtils.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/util/StringUtils.java
@@ -11,6 +11,10 @@ import java.util.Locale;
 
 public class StringUtils
 {
+  public static String toSnakeCase(String input)
+  {
+    return input.replaceAll("([a-z])([A-Z]+)", "$1_$2").toLowerCase();
+  }
   public static String formatUsingUsLocale(String pattern, Object... args)
   {
     return String.format(Locale.US, pattern, args);
diff --git a/android/sdk/src/main/cpp/CMakeLists.txt b/android/sdk/src/main/cpp/CMakeLists.txt
index 4efbd8135..d579fca8a 100644
--- a/android/sdk/src/main/cpp/CMakeLists.txt
+++ b/android/sdk/src/main/cpp/CMakeLists.txt
@@ -43,6 +43,8 @@ set(SRC
   app/organicmaps/sdk/core/jni_java_methods.cpp
   app/organicmaps/sdk/core/logging.cpp
   app/organicmaps/sdk/bookmarks/data/BookmarkManager.cpp
+  app/organicmaps/sdk/bookmarks/data/Icon.cpp
+  app/organicmaps/sdk/bookmarks/data/Icon.hpp
   app/organicmaps/sdk/bookmarks/data/PredefinedColors.cpp
   app/organicmaps/sdk/bookmarks/data/PredefinedColors.hpp
   app/organicmaps/sdk/DownloadResourcesLegacyActivity.cpp
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/Icon.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/Icon.cpp
new file mode 100644
index 000000000..377f0e42b
--- /dev/null
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/Icon.cpp
@@ -0,0 +1,37 @@
+#include <jni.h>
+
+#include "app/organicmaps/sdk/core/jni_helper.hpp"
+
+#include "kml/types.hpp"
+
+extern "C"
+{
+JNIEXPORT jobjectArray JNICALL Java_app_organicmaps_sdk_bookmarks_data_Icon_nativeGetBookmarkIconNames(JNIEnv * env,
+                                                                                                       jclass)
+{
+  std::vector<std::string> icons;
+  for (uint16_t i = 0; i < static_cast<uint16_t>(kml::BookmarkIcon::Count); ++i)
+    icons.emplace_back(kml::DebugPrint(static_cast<kml::BookmarkIcon>(i)));
+  return jni::ToJavaStringArray(env, icons);
+}
+}
+
+namespace
+{
+JNINativeMethod const iconMethods[] = {
+    {"nativeGetBookmarkIconNames", "()[Ljava/lang/String;",
+     reinterpret_cast<void *>(&Java_app_organicmaps_sdk_bookmarks_data_Icon_nativeGetBookmarkIconNames)},
+};
+}
+
+namespace icon
+{
+jint registerNativeMethods(JNIEnv * env)
+{
+  jclass clazz = env->FindClass("app/organicmaps/sdk/bookmarks/data/Icon");
+  if (clazz == nullptr)
+    return JNI_ERR;
+
+  return env->RegisterNatives(clazz, iconMethods, std::size(iconMethods));
+}
+}  // namespace icon
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/Icon.hpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/Icon.hpp
new file mode 100644
index 000000000..3eefa4214
--- /dev/null
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/Icon.hpp
@@ -0,0 +1,8 @@
+#pragma once
+
+#include <jni.h>
+
+namespace icon
+{
+jint registerNativeMethods(JNIEnv * env);
+}  // namespace icon
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/PredefinedColors.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/PredefinedColors.cpp
index c038a1330..da8cc3e45 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/PredefinedColors.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/PredefinedColors.cpp
@@ -21,7 +21,7 @@ Java_app_organicmaps_sdk_bookmarks_data_PredefinedColors_nativeGetPredefinedColo
 
 namespace
 {
-JNINativeMethod const methods[] = {
+JNINativeMethod const predefinedColorsMethods[] = {
     {"nativeGetPredefinedColors", "()[I",
      reinterpret_cast<void *>(&Java_app_organicmaps_sdk_bookmarks_data_PredefinedColors_nativeGetPredefinedColors)},
 };
@@ -35,6 +35,6 @@ jint registerNativeMethods(JNIEnv * env)
   if (clazz == nullptr)
     return JNI_ERR;
 
-  return env->RegisterNatives(clazz, methods, std::size(methods));
+  return env->RegisterNatives(clazz, predefinedColorsMethods, std::size(predefinedColorsMethods));
 }
 }  // namespace predefined_colors
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/PredefinedColors.hpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/PredefinedColors.hpp
index 0296558b6..e7d798b5d 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/PredefinedColors.hpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/PredefinedColors.hpp
@@ -5,4 +5,4 @@
 namespace predefined_colors
 {
 jint registerNativeMethods(JNIEnv * env);
-}
+}  // namespace predefined_colors
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.cpp
index 05a8700bf..c315cc7cc 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.cpp
@@ -7,6 +7,7 @@
 #include "base/string_utils.hpp"
 
 #include "app/organicmaps/sdk/bookmarks/data/PredefinedColors.hpp"
+#include "app/organicmaps/sdk/bookmarks/data/Icon.hpp"
 
 #include <vector>
 
@@ -70,6 +71,8 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM * jvm, void *)
   {
     if (predefined_colors::registerNativeMethods(env) != JNI_OK)
       return JNI_ERR;
+    if (icon::registerNativeMethods(env) != JNI_OK)
+      return JNI_ERR;
   }
 
   return JNI_VERSION_1_6;
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_art.xml b/android/sdk/src/main/res/drawable/ic_bookmark_art.xml
new file mode 100644
index 000000000..d6eac556c
--- /dev/null
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_art.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="11dp"
+    android:height="11dp"
+    android:viewportWidth="11"
+    android:viewportHeight="11">
+  <path
+      android:strokeWidth="1"
+      android:pathData="m5.5,0c-3.037,0 -5.5,2.463 -5.5,5.5c0,3.037 2.463,5.5 5.5,5.5c0.507,0 0.916,-0.409 0.916,-0.916c0,-0.238 -0.088,-0.453 -0.238,-0.615c-0.144,-0.162 -0.229,-0.372 -0.229,-0.608c0,-0.507 0.409,-0.916 0.916,-0.916l1.079,0c1.687,0 3.055,-1.369 3.055,-3.055c0,-2.701 -2.463,-4.889 -5.5,-4.889l0,-0zM7.019,1.025a1.092,1.092 0,0 1,1.091 1.091a1.092,1.092 0,0 1,-1.091 1.093a1.092,1.092 0,0 1,-1.091 -1.093a1.092,1.092 0,0 1,1.091 -1.091zM3.959,1.04a1.092,1.092 0,0 1,1.093 1.093a1.092,1.092 0,0 1,-1.093 1.091a1.092,1.092 0,0 1,-1.091 -1.091a1.092,1.092 0,0 1,1.091 -1.093zM2.127,3.494a1.092,1.092 0,0 1,1.091 1.093a1.092,1.092 0,0 1,-1.091 1.091a1.092,1.092 0,0 1,-1.091 -1.091a1.092,1.092 0,0 1,1.091 -1.093zM8.852,3.494a1.092,1.092 0,0 1,1.091 1.093a1.092,1.092 0,0 1,-1.091 1.091a1.092,1.092 0,0 1,-1.091 -1.091a1.092,1.092 0,0 1,1.091 -1.093z"
+      android:fillColor="#fff"/>
+</vector>
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_bank.xml b/android/sdk/src/main/res/drawable/ic_bookmark_bank.xml
new file mode 100644
index 000000000..f730dabb8
--- /dev/null
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_bank.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="10dp"
+    android:height="10dp"
+    android:viewportWidth="10"
+    android:viewportHeight="10">
+  <path
+      android:strokeWidth="1"
+      android:pathData="m0,2.308l5,-2.308l5,2.308l0,0.769l-0.769,0l0,5.769l0.769,0l0,1.154l-10,0l0,-1.154l0.769,0l0,-5.769l-0.769,0l0,-0.769zM6.923,6.411c0,-0.85 -0.865,-1.539 -1.925,-1.539c-0.352,0 -0.643,-0.23 -0.643,-0.514s0.287,-0.514 0.643,-0.514c0.356,0 0.643,0.232 0.643,0.514l1.282,0c0,-0.667 -0.537,-1.23 -1.282,-1.444l0,-0.607l-1.282,0l0,0.607c-0.745,0.213 -1.282,0.776 -1.282,1.444c0,0.85 0.865,1.539 1.925,1.539c0.356,0 0.643,0.23 0.643,0.514s-0.287,0.514 -0.643,0.514c-0.356,0 -0.643,-0.232 -0.643,-0.514l-1.282,0c0,0.667 0.537,1.23 1.282,1.444l0,0.607l1.282,0l0,-0.607c0.745,-0.213 1.282,-0.776 1.282,-1.444z"
+      android:fillColor="#fff"/>
+</vector>
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_bicycle_parking.xml b/android/sdk/src/main/res/drawable/ic_bookmark_bicycle_parking.xml
new file mode 100644
index 000000000..1b2bc137e
--- /dev/null
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_bicycle_parking.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="13dp"
+    android:height="10dp"
+    android:viewportWidth="13"
+    android:viewportHeight="10">
+  <path
+      android:pathData="m6.465,0c-0.583,-0.009 -0.583,0.873 0,0.865l1.293,0l0,1.095l-2.416,2.019l-0.84,-2.249l0.239,0c0.583,0.009 0.583,-0.873 0,-0.865l-1.724,0c-0.583,-0.009 -0.583,0.873 0,0.865l0.562,0l0.768,2.055c-0.403,-0.201 -0.851,-0.324 -1.33,-0.324c-1.661,0 -3.017,1.361 -3.017,3.028s1.356,3.028 3.017,3.028s3.017,-1.361 3.017,-3.028c0,-0.58 -0.173,-1.117 -0.456,-1.578l2.431,-2.033l0.399,1.004c-0.899,0.525 -1.512,1.492 -1.512,2.607c0,1.667 1.356,3.028 3.017,3.028c1.661,0 3.017,-1.361 3.017,-3.028s-1.356,-3.028 -3.017,-3.028c-0.244,0 -0.478,0.038 -0.705,0.093l-0.588,-1.475l0,-1.646c0,-0.239 -0.193,-0.433 -0.431,-0.433l-1.724,-0zM3.017,4.326c0.511,0 0.972,0.183 1.34,0.478l-1.616,1.352c-0.44,0.37 0.11,1.033 0.552,0.666l1.616,-1.352c0.162,0.304 0.263,0.648 0.263,1.019c0,1.2 -0.96,2.163 -2.155,2.163c-1.195,0 -2.155,-0.963 -2.155,-2.163c0,-1.2 0.96,-2.163 2.155,-2.163l-0,0zM9.912,4.326c1.195,0 2.155,0.963 2.155,2.163c0,1.2 -0.96,2.163 -2.155,2.163c-1.195,0 -2.155,-0.963 -2.155,-2.163c0,-0.759 0.385,-1.421 0.97,-1.806l0.785,1.967c0.212,0.539 1.017,0.216 0.801,-0.321l-0.783,-1.963c0.124,-0.022 0.251,-0.039 0.382,-0.039l-0,-0z"
+      android:fillColor="#fff"/>
+</vector>
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_bicycle_parking_covered.xml b/android/sdk/src/main/res/drawable/ic_bookmark_bicycle_parking_covered.xml
new file mode 100644
index 000000000..20a49e010
--- /dev/null
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_bicycle_parking_covered.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="15dp"
+    android:height="15dp"
+    android:viewportWidth="15"
+    android:viewportHeight="15">
+  <path
+      android:pathData="m7.501,4.135c-0.583,-0.009 -0.583,0.873 0,0.865l1.293,0l0,1.095l-2.416,2.019l-0.84,-2.249l0.239,0c0.583,0.009 0.583,-0.873 0,-0.865l-1.724,0c-0.583,-0.009 -0.583,0.873 0,0.865l0.562,0l0.768,2.055c-0.403,-0.201 -0.851,-0.324 -1.33,-0.324c-1.661,0 -3.017,1.361 -3.017,3.028s1.356,3.028 3.017,3.028s3.017,-1.361 3.017,-3.028c0,-0.58 -0.173,-1.117 -0.456,-1.578l2.431,-2.033l0.399,1.004c-0.899,0.525 -1.512,1.492 -1.512,2.607c0,1.667 1.356,3.028 3.017,3.028s3.017,-1.361 3.017,-3.028s-1.356,-3.028 -3.017,-3.028c-0.244,0 -0.478,0.038 -0.705,0.093l-0.588,-1.475l0,-1.646c0,-0.239 -0.193,-0.433 -0.431,-0.433l-1.724,-0zM4.053,8.461c0.511,0 0.972,0.183 1.34,0.478l-1.616,1.352c-0.44,0.37 0.11,1.033 0.552,0.666l1.616,-1.352c0.162,0.304 0.263,0.648 0.263,1.019c0,1.2 -0.96,2.163 -2.155,2.163s-2.155,-0.963 -2.155,-2.163c0,-1.2 0.96,-2.163 2.155,-2.163l-0,0zM10.949,8.461c1.195,0 2.155,0.963 2.155,2.163c0,1.2 -0.96,2.163 -2.155,2.163s-2.155,-0.963 -2.155,-2.163c0,-0.759 0.385,-1.421 0.97,-1.806l0.785,1.967c0.212,0.539 1.017,0.216 0.801,-0.321l-0.783,-1.963c0.124,-0.022 0.251,-0.039 0.382,-0.039l-0,-0z"
+      android:fillColor="#fff"/>
+  <path
+      android:strokeWidth="1"
+      android:pathData="m1.5,4.5l6,-3l6,3"
+      android:fillColor="#00000000"
+      android:strokeColor="#fff"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_bicycle_rental.xml b/android/sdk/src/main/res/drawable/ic_bookmark_bicycle_rental.xml
new file mode 100644
index 000000000..e9cfcb4c3
--- /dev/null
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_bicycle_rental.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="13dp"
+    android:height="15dp"
+    android:viewportWidth="13"
+    android:viewportHeight="15">
+  <path
+      android:pathData="m6.563,4.584c-0.583,-0.009 -0.583,0.873 0,0.865l1.293,0l0,1.095l-2.416,2.019l-0.84,-2.249l0.239,0c0.583,0.009 0.583,-0.873 0,-0.865l-1.724,0c-0.583,-0.009 -0.583,0.873 0,0.865l0.562,0l0.768,2.055c-0.403,-0.201 -0.851,-0.324 -1.33,-0.324c-1.661,0 -3.017,1.361 -3.017,3.028s1.356,3.028 3.017,3.028s3.017,-1.361 3.017,-3.028c0,-0.58 -0.173,-1.117 -0.456,-1.578l2.431,-2.033l0.399,1.004c-0.899,0.525 -1.512,1.492 -1.512,2.607c0,1.667 1.356,3.028 3.017,3.028c1.661,0 3.017,-1.361 3.017,-3.028s-1.356,-3.028 -3.017,-3.028c-0.244,0 -0.478,0.038 -0.705,0.093l-0.588,-1.475l0,-1.646c0,-0.239 -0.193,-0.433 -0.431,-0.433l-1.724,-0zM3.115,8.91c0.511,0 0.972,0.183 1.34,0.478l-1.616,1.352c-0.44,0.37 0.11,1.033 0.552,0.666l1.616,-1.352c0.162,0.304 0.263,0.648 0.263,1.019c0,1.2 -0.96,2.163 -2.155,2.163c-1.195,0 -2.155,-0.963 -2.155,-2.163c0,-1.2 0.96,-2.163 2.155,-2.163l-0,0zM10.01,8.91c1.195,0 2.155,0.963 2.155,2.163c0,1.2 -0.96,2.163 -2.155,2.163c-1.195,0 -2.155,-0.963 -2.155,-2.163c0,-0.759 0.385,-1.421 0.97,-1.806l0.785,1.967c0.212,0.539 1.017,0.216 0.801,-0.321l-0.783,-1.963c0.124,-0.022 0.251,-0.039 0.382,-0.039l-0,-0z"
+      android:fillColor="#fff"/>
+  <path
+      android:strokeWidth="1"
+      android:pathData="M3.694,2.038m-1.462,0a1.462,1.462 0,1 1,2.925 0a1.462,1.462 0,1 1,-2.925 0"
+      android:strokeLineJoin="round"
+      android:fillColor="#00000000"
+      android:strokeColor="#fff"
+      android:strokeLineCap="round"/>
+  <path
+      android:strokeWidth="1"
+      android:pathData="m5.186,2.027l5.811,0"
+      android:strokeLineJoin="round"
+      android:fillColor="#00000000"
+      android:strokeColor="#fff"
+      android:strokeLineCap="round"/>
+  <path
+      android:strokeWidth="1"
+      android:pathData="m10.099,2.027l0,1.648"
+      android:strokeLineJoin="round"
+      android:fillColor="#00000000"
+      android:strokeColor="#fff"
+      android:strokeLineCap="round"/>
+</vector>
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_cafe.xml b/android/sdk/src/main/res/drawable/ic_bookmark_cafe.xml
new file mode 100644
index 000000000..e0e30df2c
--- /dev/null
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_cafe.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="10dp"
+    android:height="10dp"
+    android:viewportWidth="10"
+    android:viewportHeight="10">
+  <path
+      android:strokeWidth="1"
+      android:pathData="m8.833,0l-8.833,0l0,5.521c0,1.22 0.988,2.208 2.208,2.208l3.313,0c1.22,0 2.208,-0.988 2.208,-2.208l0,-1.656l1.104,0c0.613,0 1.104,-0.497 1.104,-1.104l0,-1.656c0,-0.613 -0.491,-1.104 -1.104,-1.104l0,-0zM8.833,2.761l-1.104,0l0,-1.656l1.104,0l0,1.656zM0,8.833l8.833,0l0,1.104l-8.833,0l0,-1.104z"
+      android:fillColor="#fff"/>
+</vector>
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_charging_station.xml b/android/sdk/src/main/res/drawable/ic_bookmark_charging_station.xml
new file mode 100644
index 000000000..b12b65325
--- /dev/null
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_charging_station.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="10dp"
+    android:viewportWidth="12"
+    android:viewportHeight="10">
+  <path
+      android:pathData="m1,0a0.998,0.998 0,0 0,-1 1l0,7.999a0.998,0.998 0,0 0,1 1l4,0a0.998,0.998 0,0 0,1 -1l0,-2l0.5,0c0.282,0 0.5,0.218 0.5,0.5l0,1c0,0.822 0.677,1.5 1.5,1.5c0.822,0 1.5,-0.678 1.5,-1.5l0,-3.5a0.51,0.51 0,0 0,-0.007 -0.084a1.517,1.517 0,0 0,0.919 -0.916l0.088,0a0.998,0.998 0,0 0,1 -1l-1,0l0,-2a0.5,0.5 0,1 0,-1 0l0,2l-1,0l0,-2a0.5,0.5 0,1 0,-1 0l0,2l-1,0a0.998,0.998 0,0 0,1 1l0.088,0a1.516,1.516 0,0 0,0.92 0.916a0.512,0.512 0,0 0,-0.007 0.084l0,3.5a0.493,0.493 0,0 1,-0.5 0.5a0.493,0.493 0,0 1,-0.5 -0.5l0,-1c0,-0.822 -0.677,-1.5 -1.5,-1.5l-0.5,0l0,-4.999a0.998,0.998 0,0 0,-1 -1l-4,-0zM1.5,1l3,0c0.278,0 0.5,0.223 0.5,0.5l0,2.5l-4,0l0,-2.5c0,-0.277 0.223,-0.5 0.5,-0.5l0,0zM4.141,4.75a0.24,0.24 0,0 1,0.154 0.06c0.077,0.078 0.078,0.195 0.002,0.274l-1.197,1.385l0.9,0.905a0.178,0.178 0,0 1,-0.017 0.271l-1.965,1.555a0.247,0.247 0,0 1,-0.312 -0.01a0.191,0.191 0,0 1,-0.002 -0.274l1.198,-1.382l-0.901,-0.907a0.178,0.178 0,0 1,0.017 -0.271l1.965,-1.555a0.242,0.242 0,0 1,0.158 -0.05l-0,0z"
+      android:fillColor="#fff"/>
+</vector>
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_exchange.xml b/android/sdk/src/main/res/drawable/ic_bookmark_exchange.xml
new file mode 100644
index 000000000..e47ba88a0
--- /dev/null
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_exchange.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="11dp"
+    android:height="11dp"
+    android:viewportWidth="11"
+    android:viewportHeight="11">
+  <path
+      android:strokeWidth="1"
+      android:pathData="m10.394,2.26l-0.652,0l-1.232,-2.041c-0.065,-0.108 -0.173,-0.184 -0.297,-0.21c-0.123,-0.025 -0.254,0.002 -0.357,0.075l-3.064,2.176l1.564,0l1.627,-1.155l0.697,1.155l-1.925,0l0,0.904l3.182,0l0,3.616l-5.455,0l0,-0.904l-0.909,0l0,1.356c0,0.25 0.204,0.452 0.455,0.452l3.129,0l-0.102,0.203c-0.077,0.154 -0.233,0.25 -0.406,0.25l-2.887,0l-1.097,-1.091l0,-2.337l1.097,-1.092l1.63,0l0,0.452c0,0.249 -0.204,0.452 -0.455,0.452l-0.909,0l0,0.904l0.909,0c0.752,0 1.364,-0.608 1.364,-1.356l0,-0.904c0,-0.25 -0.203,-0.452 -0.455,-0.452l-2.273,0c-0.12,0 -0.236,0.047 -0.321,0.133l-0.833,0.828c-0.064,-0.033 -0.132,-0.057 -0.209,-0.057l-1.818,0c-0.251,0 -0.455,0.203 -0.455,0.452l0,3.616c0,0.25 0.204,0.452 0.455,0.452l1.818,0c0.077,0 0.145,-0.023 0.209,-0.057l0.833,0.829c0.085,0.084 0.201,0.132 0.321,0.132l3.075,0c0.52,0 0.987,-0.287 1.22,-0.75l0.305,-0.606l2.219,0c0.251,0 0.455,-0.202 0.455,-0.452l0,-4.52c0,-0.25 -0.203,-0.452 -0.455,-0.452l0,0zM1.756,7.232l-0.909,0l0,-2.712l0.909,0l0,2.712z"
+      android:fillColor="#fff"/>
+</vector>
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_fast_food.xml b/android/sdk/src/main/res/drawable/ic_bookmark_fast_food.xml
new file mode 100644
index 000000000..95045c3bc
--- /dev/null
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_fast_food.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="11dp"
+    android:height="11dp"
+    android:viewportWidth="11"
+    android:viewportHeight="11">
+  <path
+      android:strokeWidth="1"
+      android:pathData="m10.875,3.263c0.011,-2.175 -2.327,-3.263 -5.438,-3.263c-3.105,0 -5.438,1.087 -5.438,3.263c0,0.299 0.245,0.544 0.544,0.544l9.788,0c0.299,0 0.544,-0.245 0.544,-0.544l-0,0zM0,8.7c0,0.598 0.489,1.087 1.087,1.087l8.7,0c0.598,0 1.087,-0.489 1.087,-1.087l0,-0.544c0,-0.598 -0.489,-1.087 -1.087,-1.087l-8.7,0c-0.598,0 -1.087,0.489 -1.087,1.087l0,0.544zM0.745,6.134c0.43,-0.158 0.636,-0.424 1.082,-0.424c0.647,0 0.772,0.544 1.811,0.544c1.06,0 1.136,-0.544 1.811,-0.544c0.647,0 0.772,0.544 1.811,0.544c1.06,0 1.136,-0.544 1.811,-0.544c0.44,0 0.636,0.25 1.049,0.413c0.364,0.141 0.756,-0.136 0.756,-0.522c0,-0.234 -0.152,-0.44 -0.375,-0.522c-0.527,-0.19 -0.663,-0.451 -1.441,-0.451c-1.06,0 -1.136,0.544 -1.811,0.544c-0.647,0 -0.772,-0.544 -1.811,-0.544c-1.06,0 -1.136,0.544 -1.811,0.544c-0.647,0 -0.772,-0.544 -1.811,-0.544c-0.843,0 -1.066,0.343 -1.457,0.484c-0.212,0.076 -0.353,0.283 -0.353,0.511c0,0.375 0.381,0.642 0.739,0.511l-0,0z"
+      android:fillColor="#fff"/>
+</vector>
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_information.xml b/android/sdk/src/main/res/drawable/ic_bookmark_information.xml
new file mode 100644
index 000000000..f64461c04
--- /dev/null
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_information.xml
@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="11dp"
+    android:height="11dp"
+    android:viewportWidth="11"
+    android:viewportHeight="11">
+  <path
+      android:pathData="M5.5,2m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"
+      android:fillColor="#fff"/>
+  <path
+      android:pathData="M4,4L6,4A0.5,0.5 0,0 1,6.5 4.5L6.5,5A0.5,0.5 0,0 1,6 5.5L4,5.5A0.5,0.5 0,0 1,3.5 5L3.5,4.5A0.5,0.5 0,0 1,4 4z"
+      android:fillColor="#fff"/>
+  <path
+      android:pathData="M4.5,5h2v5h-2z"
+      android:fillColor="#fff"/>
+  <path
+      android:pathData="M4,9.5L7,9.5A0.5,0.5 0,0 1,7.5 10L7.5,10.5A0.5,0.5 0,0 1,7 11L4,11A0.5,0.5 0,0 1,3.5 10.5L3.5,10A0.5,0.5 0,0 1,4 9.5z"
+      android:fillColor="#fff"/>
+</vector>
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_pharmacy.xml b/android/sdk/src/main/res/drawable/ic_bookmark_pharmacy.xml
new file mode 100644
index 000000000..919a6d694
--- /dev/null
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_pharmacy.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="10dp"
+    android:height="10dp"
+    android:viewportWidth="10"
+    android:viewportHeight="10">
+  <path
+      android:strokeWidth="1"
+      android:pathData="m7.07,0c-0.751,0 -1.499,0.292 -2.05,0.837l-4.147,4.125c-0.855,0.847 -1.087,2.077 -0.673,3.101c0,0 0.31,0.726 0.61,1.023c0.283,0.28 0.624,0.478 0.97,0.62c0.096,0.049 0.168,0.067 0.25,0.093c0.011,0.003 0.02,0.012 0.031,0.015c0.996,0.294 2.107,0.056 2.864,-0.729l2.504,-2.481l1.643,-1.644c1.152,-1.141 1.152,-2.971 0,-4.063c-0.501,-0.595 -1.252,-0.899 -2.003,-0.899l0,0zM7.07,0.993c0.501,0 1.011,0.195 1.362,0.543s0.548,0.853 0.548,1.349c0,0.496 -0.197,0.986 -0.548,1.334l-1.706,1.69l-2.705,-2.698l1.656,-1.629c0.401,-0.397 0.842,-0.589 1.393,-0.589l-0,0z"
+      android:fillColor="#fff"/>
+</vector>
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_pub.xml b/android/sdk/src/main/res/drawable/ic_bookmark_pub.xml
new file mode 100644
index 000000000..68cac9429
--- /dev/null
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_pub.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="10dp"
+    android:height="11dp"
+    android:viewportWidth="10"
+    android:viewportHeight="10">
+  <path
+      android:strokeWidth="1"
+      android:pathData="m8.862,3.866l-0.864,0c0.194,-0.327 0.31,-0.703 0.31,-1.108c0,-1.224 -0.991,-2.216 -2.216,-2.216c-0.188,0 -0.366,0.028 -0.543,0.072c-0.454,-0.377 -1.03,-0.615 -1.673,-0.615c-1.047,0 -1.944,0.615 -2.365,1.501c-0.875,0.294 -1.512,1.113 -1.512,2.088c0,1.03 0.709,1.889 1.662,2.138l0,4.785l6.092,0l0,-1.108l1.108,0c0.609,0 1.108,-0.498 1.108,-1.108l0,-3.323c0,-0.609 -0.498,-1.108 -1.108,-1.108l0,0zM2.216,4.697c-0.609,0 -1.108,-0.498 -1.108,-1.108c0,-0.471 0.305,-0.886 0.759,-1.041l0.443,-0.15l0.199,-0.421c0.26,-0.537 0.781,-0.87 1.368,-0.87c0.438,0 0.77,0.194 0.964,0.36l0.432,0.36s0.354,-0.177 0.814,-0.177c0.609,0 1.108,0.498 1.108,1.108l-1.662,0c-1.839,0 -2.127,1.939 -3.318,1.939l-0,-0zM8.862,8.297l-1.108,0l0,-3.323l1.108,0l0,3.323z"
+      android:fillColor="#fff"/>
+</vector>
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_stadium.xml b/android/sdk/src/main/res/drawable/ic_bookmark_stadium.xml
new file mode 100644
index 000000000..c66d8cc94
--- /dev/null
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_stadium.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="11dp"
+    android:height="10dp"
+    android:viewportWidth="11"
+    android:viewportHeight="10">
+  <path
+      android:strokeWidth="1"
+      android:pathData="m1.651,0l1.101,0l1.651,1.101l-1.651,1.101l0,0.734c0.809,-0.117 1.749,-0.184 2.752,-0.184c1.002,0 1.942,0.067 2.752,0.184l0,-2.936l1.101,0l1.651,1.101l-1.651,1.101l0,0.944c1.019,0.25 1.651,0.598 1.651,0.983c0,0.76 -2.464,1.376 -5.503,1.376c-3.039,0 -5.503,-0.616 -5.503,-1.376c0,-0.385 0.632,-0.733 1.651,-0.983l0,-3.145l0,0zM5.503,3.577c-1.824,0 -2.752,0.094 -2.752,0.55c0,0.456 0.928,0.55 2.752,0.55c1.824,0 2.752,-0.094 2.752,-0.55c0,-0.456 -0.928,-0.55 -2.752,-0.55zM5.503,6.467c2.096,0 3.964,-0.366 5.174,-0.937l-0.771,4.377l-2.752,0l0,-1.101c0,-0.608 -0.493,-1.101 -1.101,-1.101l-1.101,0c-0.608,0 -1.101,0.493 -1.101,1.101l0,1.101l-2.752,0l-0.771,-4.377c1.21,0.571 3.078,0.937 5.174,0.937l-0,0z"
+      android:fillColor="#fff"/>
+</vector>
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_theatre.xml b/android/sdk/src/main/res/drawable/ic_bookmark_theatre.xml
new file mode 100644
index 000000000..304450ebd
--- /dev/null
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_theatre.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="12dp"
+    android:viewportWidth="12"
+    android:viewportHeight="12">
+  <path
+      android:strokeWidth="1"
+      android:pathData="m5.372,0l0,3.581l1.791,0l0,1.492c0,-0.495 0.669,-0.895 1.492,-0.895s1.492,0.4 1.492,0.895l-2.984,0l0,1.725c0.448,0.227 0.955,0.364 1.492,0.364c1.814,0 3.283,-1.468 3.283,-3.283l0,-3.88l-6.566,0zM7.162,3.032c-0.328,0 -0.597,-0.269 -0.597,-0.597c0,-0.328 0.269,-0.597 0.597,-0.597s0.597,0.269 0.597,0.597c0,0.334 -0.269,0.597 -0.597,0.597zM10.147,3.032c-0.328,0 -0.597,-0.269 -0.597,-0.597c0,-0.328 0.269,-0.597 0.597,-0.597s0.597,0.269 0.597,0.597c0,0.334 -0.269,0.597 -0.597,0.597zM0,8.058c0,1.814 1.468,3.283 3.283,3.283s3.283,-1.468 3.283,-3.283l0,-3.88l-6.566,0l0,3.88zM3.283,9.252c-0.824,0 -1.492,-0.4 -1.492,-0.895l2.984,0c0,0.495 -0.669,0.895 -1.492,0.895zM4.775,5.969c0.328,0 0.597,0.269 0.597,0.597s-0.269,0.597 -0.597,0.597s-0.597,-0.269 -0.597,-0.597s0.269,-0.597 0.597,-0.597zM1.791,5.969c0.328,0 0.597,0.269 0.597,0.597s-0.269,0.597 -0.597,0.597s-0.597,-0.269 -0.597,-0.597s0.269,-0.597 0.597,-0.597z"
+      android:fillColor="#fff"/>
+</vector>
diff --git a/libs/kml/types.hpp b/libs/kml/types.hpp
index c4ad8deb1..dcda3fcda 100644
--- a/libs/kml/types.hpp
+++ b/libs/kml/types.hpp
@@ -145,7 +145,6 @@ inline std::string DebugPrint(CompilationType compilationType)
   UNREACHABLE();
 }
 
-/// @note Important! Should be synced with android/app/src/main/java/app/organicmaps/bookmarks/data/Icon.java
 enum class BookmarkIcon : uint16_t
 {
   None = 0,

From 8493ed369aa325fe8fe5a61b9bd2e2da407f8192 Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Sun, 20 Jul 2025 19:41:14 +0200
Subject: [PATCH 017/302] [android] Fix collor selector issue

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 .../widget/placepage/BookmarkColorDialogFragment.java         | 4 ++--
 .../organicmaps/widget/placepage/EditBookmarkFragment.java    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java
index 87310f7c8..15a1449d5 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java
@@ -60,9 +60,9 @@ public class BookmarkColorDialogFragment extends BaseMwmDialogFragment
     final GridView gView =
         (GridView) LayoutInflater.from(requireActivity()).inflate(R.layout.fragment_color_grid, null);
     gView.setAdapter(adapter);
-    gView.setOnItemClickListener((parent, view, predefinedColor, id) -> {
+    gView.setOnItemClickListener((parent, view, pos, id) -> {
       if (mColorSetListener != null)
-        mColorSetListener.onBookmarkColorSet(predefinedColor);
+        mColorSetListener.onBookmarkColorSet(adapter.getItem(pos));
       dismiss();
     });
 
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
index ec586ffaf..a63fbc72a 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
@@ -318,7 +318,7 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
     {
       case TYPE_BOOKMARK ->
         dialogFragment.setOnColorSetListener(colorPos -> {
-          if (mIcon != null & mIcon.getColor() == colorPos)
+          if (mIcon != null && mIcon.getColor() == colorPos)
             return;
 
           mIcon = new Icon(colorPos);

From a39b3a99211a575d582dc223e7c64ddcdb875a60 Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Sun, 20 Jul 2025 23:42:45 -0300
Subject: [PATCH 018/302] [android] Fixed getting drawable icons.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 .../java/app/organicmaps/sdk/OrganicMaps.java |  3 +++
 .../organicmaps/sdk/bookmarks/data/Icon.java  | 22 +++++++++----------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java b/android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java
index 627d0c746..db25ce0c5 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java
@@ -9,6 +9,7 @@ import androidx.lifecycle.ProcessLifecycleOwner;
 import app.organicmaps.R;
 import app.organicmaps.routing.RoutingController;
 import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
+import app.organicmaps.sdk.bookmarks.data.Icon;
 import app.organicmaps.sdk.downloader.Android7RootCertificateWorkaround;
 import app.organicmaps.sdk.editor.OsmOAuth;
 import app.organicmaps.sdk.location.LocationHelper;
@@ -96,6 +97,8 @@ public final class OrganicMaps implements DefaultLifecycleObserver
 
     Android7RootCertificateWorkaround.initializeIfNeeded(mContext);
 
+    Icon.loadDefaultIcons(mContext.getResources(), mContext.getPackageName());
+
     mSensorHelper = new SensorHelper(mContext);
     mLocationHelper = new LocationHelper(mContext, mSensorHelper);
     mIsolinesManager = new IsolinesManager(mContext);
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java
index 695552669..a97fabaf6 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java
@@ -1,5 +1,6 @@
 package app.organicmaps.sdk.bookmarks.data;
 
+import android.content.res.Resources;
 import android.os.Parcel;
 import android.os.Parcelable;
 import androidx.annotation.ColorInt;
@@ -18,7 +19,7 @@ public class Icon implements Parcelable
   static final int BOOKMARK_ICON_TYPE_NONE = 0;
 
   @DrawableRes
-  private static final int[] TYPE_ICONS = GetTypeIcons();
+  private static int[] sTypeIcons = null;
 
   @PredefinedColors.Color
   private final int mColor;
@@ -69,7 +70,9 @@ public class Icon implements Parcelable
   @DrawableRes
   public int getResId()
   {
-    return TYPE_ICONS[mType];
+    // loadDefaultIcons should be called
+    assert (sTypeIcons != null);
+    return sTypeIcons[mType];
   }
 
   @Override
@@ -100,30 +103,25 @@ public class Icon implements Parcelable
     }
   };
 
-  @NonNull
-  @DrawableRes
-  private static int[] GetTypeIcons()
+  static public void loadDefaultIcons(@NonNull Resources resources, @NonNull String packageName)
   {
     final String[] names = nativeGetBookmarkIconNames();
     int[] icons = new int[names.length];
     for (int i = 0; i < names.length; i++)
     {
       final String name = StringUtils.toSnakeCase(names[i]);
-      try
-      {
-        icons[i] = app.organicmaps.sdk.R.drawable.class.getField("ic_bookmark_" + name).getInt(null);
-      }
-      catch (NoSuchFieldException | IllegalAccessException e)
+      icons[i] = resources.getIdentifier("ic_bookmark_" + name, "drawable", packageName);
+      if (icons[i] == 0)
       {
         Logger.e(TAG, "Error getting icon for " + name);
         // Force devs to add an icon for each bookmark type.
         if (BuildConfig.DEBUG)
-          throw new RuntimeException("Error getting icon for " + name, e);
+          throw new RuntimeException("Error getting icon for " + name);
         icons[i] = app.organicmaps.sdk.R.drawable.ic_bookmark_none; // Fallback icon
       }
     }
 
-    return icons;
+    sTypeIcons = icons;
   }
 
   @FastNative

From 6c4503b0dbf2e310214918d4ec1c206ac93136c1 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Sat, 9 Aug 2025 14:49:07 +0200
Subject: [PATCH 019/302] [android] Improve size of bookmark icons

Signed-off-by: Jean-Baptiste Charron <jeanbaptiste.charron@outlook.fr>
---
 .../src/main/res/drawable/ic_bookmark_art.xml | 15 +++----
 .../main/res/drawable/ic_bookmark_bank.xml    | 15 +++----
 .../src/main/res/drawable/ic_bookmark_bar.xml | 20 ++++-----
 .../drawable/ic_bookmark_bicycle_parking.xml  | 14 ++++---
 .../ic_bookmark_bicycle_parking_covered.xml   |  4 +-
 .../drawable/ic_bookmark_bicycle_rental.xml   | 41 +++++++++++--------
 .../res/drawable/ic_bookmark_buddhism.xml     | 20 ++++-----
 .../res/drawable/ic_bookmark_building.xml     | 20 ++++-----
 .../main/res/drawable/ic_bookmark_cafe.xml    | 11 +++--
 .../drawable/ic_bookmark_charging_station.xml | 14 ++++---
 .../res/drawable/ic_bookmark_christianity.xml | 20 ++++-----
 .../res/drawable/ic_bookmark_exchange.xml     | 15 +++----
 .../res/drawable/ic_bookmark_fast_food.xml    | 15 +++----
 .../main/res/drawable/ic_bookmark_food.xml    | 23 ++++-------
 .../src/main/res/drawable/ic_bookmark_gas.xml | 20 ++++-----
 .../main/res/drawable/ic_bookmark_hotel.xml   | 20 ++++-----
 .../res/drawable/ic_bookmark_information.xml  | 29 +++++++------
 .../main/res/drawable/ic_bookmark_museum.xml  |  4 +-
 .../res/drawable/ic_bookmark_pharmacy.xml     | 15 +++----
 .../src/main/res/drawable/ic_bookmark_pub.xml | 15 +++----
 .../main/res/drawable/ic_bookmark_stadium.xml | 15 +++----
 .../main/res/drawable/ic_bookmark_theatre.xml | 15 +++----
 22 files changed, 185 insertions(+), 195 deletions(-)

diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_art.xml b/android/sdk/src/main/res/drawable/ic_bookmark_art.xml
index d6eac556c..327168fe3 100644
--- a/android/sdk/src/main/res/drawable/ic_bookmark_art.xml
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_art.xml
@@ -1,10 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="11dp"
-    android:height="11dp"
-    android:viewportWidth="11"
-    android:viewportHeight="11">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="19"
+    android:viewportHeight="19">
+
   <path
-      android:strokeWidth="1"
-      android:pathData="m5.5,0c-3.037,0 -5.5,2.463 -5.5,5.5c0,3.037 2.463,5.5 5.5,5.5c0.507,0 0.916,-0.409 0.916,-0.916c0,-0.238 -0.088,-0.453 -0.238,-0.615c-0.144,-0.162 -0.229,-0.372 -0.229,-0.608c0,-0.507 0.409,-0.916 0.916,-0.916l1.079,0c1.687,0 3.055,-1.369 3.055,-3.055c0,-2.701 -2.463,-4.889 -5.5,-4.889l0,-0zM7.019,1.025a1.092,1.092 0,0 1,1.091 1.091a1.092,1.092 0,0 1,-1.091 1.093a1.092,1.092 0,0 1,-1.091 -1.093a1.092,1.092 0,0 1,1.091 -1.091zM3.959,1.04a1.092,1.092 0,0 1,1.093 1.093a1.092,1.092 0,0 1,-1.093 1.091a1.092,1.092 0,0 1,-1.091 -1.091a1.092,1.092 0,0 1,1.091 -1.093zM2.127,3.494a1.092,1.092 0,0 1,1.091 1.093a1.092,1.092 0,0 1,-1.091 1.091a1.092,1.092 0,0 1,-1.091 -1.091a1.092,1.092 0,0 1,1.091 -1.093zM8.852,3.494a1.092,1.092 0,0 1,1.091 1.093a1.092,1.092 0,0 1,-1.091 1.091a1.092,1.092 0,0 1,-1.091 -1.091a1.092,1.092 0,0 1,1.091 -1.093z"
-      android:fillColor="#fff"/>
+      android:fillColor="#fff"
+      android:pathData="m9.5,1.625c-4.349,0 -7.875,3.526 -7.875,7.875 0,4.349 3.526,7.875 7.875,7.875 0.726,0 1.312,-0.586 1.312,-1.312 0,-0.341 -0.126,-0.649 -0.341,-0.881 -0.206,-0.232 -0.327,-0.533 -0.327,-0.87 0,-0.726 0.586,-1.312 1.312,-1.312h1.545c2.415,0 4.375,-1.96 4.375,-4.375 0,-3.868 -3.526,-7.001 -7.875,-7.001zM11.675,3.093a1.563,1.563 0,0 1,1.562 1.562,1.563 1.563,0 0,1 -1.562,1.564 1.563,1.563 0,0 1,-1.562 -1.564,1.563 1.563,0 0,1 1.562,-1.562zM7.294,3.115a1.563,1.563 0,0 1,1.564 1.564,1.563 1.563,0 0,1 -1.564,1.562 1.563,1.563 0,0 1,-1.562 -1.562,1.563 1.563,0 0,1 1.562,-1.564zM4.67,6.628a1.563,1.563 0,0 1,1.562 1.564,1.563 1.563,0 0,1 -1.562,1.562 1.563,1.563 0,0 1,-1.562 -1.562,1.563 1.563,0 0,1 1.562,-1.564zM14.299,6.628a1.563,1.563 0,0 1,1.562 1.564,1.563 1.563,0 0,1 -1.562,1.562 1.563,1.563 0,0 1,-1.562 -1.562,1.563 1.563,0 0,1 1.562,-1.564z" />
+
 </vector>
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_bank.xml b/android/sdk/src/main/res/drawable/ic_bookmark_bank.xml
index f730dabb8..d7a19dbf6 100644
--- a/android/sdk/src/main/res/drawable/ic_bookmark_bank.xml
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_bank.xml
@@ -1,10 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="10dp"
-    android:height="10dp"
-    android:viewportWidth="10"
-    android:viewportHeight="10">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="19"
+    android:viewportHeight="19">
+
   <path
-      android:strokeWidth="1"
-      android:pathData="m0,2.308l5,-2.308l5,2.308l0,0.769l-0.769,0l0,5.769l0.769,0l0,1.154l-10,0l0,-1.154l0.769,0l0,-5.769l-0.769,0l0,-0.769zM6.923,6.411c0,-0.85 -0.865,-1.539 -1.925,-1.539c-0.352,0 -0.643,-0.23 -0.643,-0.514s0.287,-0.514 0.643,-0.514c0.356,0 0.643,0.232 0.643,0.514l1.282,0c0,-0.667 -0.537,-1.23 -1.282,-1.444l0,-0.607l-1.282,0l0,0.607c-0.745,0.213 -1.282,0.776 -1.282,1.444c0,0.85 0.865,1.539 1.925,1.539c0.356,0 0.643,0.23 0.643,0.514s-0.287,0.514 -0.643,0.514c-0.356,0 -0.643,-0.232 -0.643,-0.514l-1.282,0c0,0.667 0.537,1.23 1.282,1.444l0,0.607l1.282,0l0,-0.607c0.745,-0.213 1.282,-0.776 1.282,-1.444z"
-      android:fillColor="#fff"/>
+      android:fillColor="#fff"
+      android:pathData="m2.75,5.865 l6.75,-3.115 6.75,3.115v1.038h-1.038v7.788h1.038v1.558h-13.5v-1.558h1.038v-7.788h-1.038zM12.096,11.405c0,-1.148 -1.168,-2.078 -2.599,-2.078 -0.475,0 -0.868,-0.31 -0.868,-0.694s0.388,-0.694 0.868,-0.694c0.48,0 0.868,0.314 0.868,0.694h1.731c0,-0.901 -0.725,-1.661 -1.731,-1.949v-0.819h-1.731v0.819c-1.006,0.288 -1.731,1.048 -1.731,1.949 0,1.148 1.168,2.078 2.599,2.078 0.48,0 0.868,0.31 0.868,0.694s-0.388,0.694 -0.868,0.694c-0.48,0 -0.868,-0.314 -0.868,-0.694h-1.731c0,0.901 0.725,1.661 1.731,1.949v0.819h1.731v-0.819c1.006,-0.288 1.731,-1.048 1.731,-1.949z" />
+
 </vector>
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_bar.xml b/android/sdk/src/main/res/drawable/ic_bookmark_bar.xml
index f3f3e6603..a5a11548d 100644
--- a/android/sdk/src/main/res/drawable/ic_bookmark_bar.xml
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_bar.xml
@@ -1,15 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <group
-        android:pivotX="12"
-        android:pivotY="12"
-        android:scaleX="1"
-        android:scaleY="1">
-        <path
-            android:fillColor="#FFF"
-            android:pathData="M8.64,12.96l0,-5.76l-3.84,0l0,3.84c0,0.53 0.1875,0.9825 0.5625,1.3575 0.375,0.375 0.8275,0.5625 1.3575,0.5625ZM24.0001,19.68l0,2.88l-17.28,0l0,-2.88l1.92,-2.88l-1.92,0c-1.59,0 -2.9475,-0.5625 -4.0725,-1.6875 -1.125,-1.125 -1.6875,-2.4825 -1.6875,-4.0725l0,-4.8l-0.96,-0.96 0.48,-1.92l7.2,0l0.48,-1.92l14.4,0l0.48,2.88 -0.96,0.48l0,12Z" />
-    </group>
+    android:width="24dp"
+    android:viewportWidth="19"
+    android:viewportHeight="19">
+
+    <path
+        android:fillColor="#fff"
+        android:pathData="m16.25,3.838c0,-0.6 -0.487,-1.087 -1.087,-1.087h-11.325c-0.6,0 -1.087,0.487 -1.087,1.087 0,0.262 0.097,0.525 0.277,0.72l5.722,6.442v3.75h-3c-0.412,0 -0.75,0.337 -0.75,0.75s0.337,0.75 0.75,0.75h7.5c0.412,0 0.75,-0.337 0.75,-0.75s-0.337,-0.75 -0.75,-0.75h-3v-3.75l5.722,-6.442c0.18,-0.195 0.277,-0.457 0.277,-0.72zM6.073,5.75 L4.746,4.25h9.517l-1.335,1.5z" />
+
 </vector>
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_bicycle_parking.xml b/android/sdk/src/main/res/drawable/ic_bookmark_bicycle_parking.xml
index 1b2bc137e..6c9091eda 100644
--- a/android/sdk/src/main/res/drawable/ic_bookmark_bicycle_parking.xml
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_bicycle_parking.xml
@@ -1,9 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="13dp"
-    android:height="10dp"
-    android:viewportWidth="13"
-    android:viewportHeight="10">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="19"
+    android:viewportHeight="19">
+
   <path
-      android:pathData="m6.465,0c-0.583,-0.009 -0.583,0.873 0,0.865l1.293,0l0,1.095l-2.416,2.019l-0.84,-2.249l0.239,0c0.583,0.009 0.583,-0.873 0,-0.865l-1.724,0c-0.583,-0.009 -0.583,0.873 0,0.865l0.562,0l0.768,2.055c-0.403,-0.201 -0.851,-0.324 -1.33,-0.324c-1.661,0 -3.017,1.361 -3.017,3.028s1.356,3.028 3.017,3.028s3.017,-1.361 3.017,-3.028c0,-0.58 -0.173,-1.117 -0.456,-1.578l2.431,-2.033l0.399,1.004c-0.899,0.525 -1.512,1.492 -1.512,2.607c0,1.667 1.356,3.028 3.017,3.028c1.661,0 3.017,-1.361 3.017,-3.028s-1.356,-3.028 -3.017,-3.028c-0.244,0 -0.478,0.038 -0.705,0.093l-0.588,-1.475l0,-1.646c0,-0.239 -0.193,-0.433 -0.431,-0.433l-1.724,-0zM3.017,4.326c0.511,0 0.972,0.183 1.34,0.478l-1.616,1.352c-0.44,0.37 0.11,1.033 0.552,0.666l1.616,-1.352c0.162,0.304 0.263,0.648 0.263,1.019c0,1.2 -0.96,2.163 -2.155,2.163c-1.195,0 -2.155,-0.963 -2.155,-2.163c0,-1.2 0.96,-2.163 2.155,-2.163l-0,0zM9.912,4.326c1.195,0 2.155,0.963 2.155,2.163c0,1.2 -0.96,2.163 -2.155,2.163c-1.195,0 -2.155,-0.963 -2.155,-2.163c0,-0.759 0.385,-1.421 0.97,-1.806l0.785,1.967c0.212,0.539 1.017,0.216 0.801,-0.321l-0.783,-1.963c0.124,-0.022 0.251,-0.039 0.382,-0.039l-0,-0z"
-      android:fillColor="#fff"/>
+      android:fillColor="#fff"
+      android:pathData="m9.5,3.314c-0.758,-0.011 -0.758,1.135 0,1.125h1.681v1.423l-3.141,2.625 -1.092,-2.924h0.311c0.758,0.011 0.758,-1.135 0,-1.125h-2.241c-0.758,-0.011 -0.758,1.135 0,1.125h0.731l0.998,2.671c-0.524,-0.262 -1.106,-0.422 -1.729,-0.422 -2.159,0 -3.922,1.769 -3.922,3.936 0,2.167 1.763,3.936 3.922,3.936s3.922,-1.769 3.922,-3.936c0,-0.753 -0.224,-1.452 -0.593,-2.052l3.16,-2.642 0.519,1.305c-1.168,0.683 -1.965,1.94 -1.965,3.389 0,2.167 1.763,3.936 3.922,3.936 2.159,0 3.922,-1.769 3.922,-3.936 0,-2.167 -1.763,-3.936 -3.922,-3.936 -0.317,0 -0.621,0.049 -0.917,0.121l-0.764,-1.918v-2.139c0,-0.311 -0.251,-0.562 -0.56,-0.562zM5.018,8.938c0.664,0 1.263,0.238 1.742,0.622l-2.101,1.757c-0.572,0.481 0.143,1.343 0.718,0.865l2.101,-1.757c0.211,0.396 0.341,0.842 0.341,1.325 0,1.559 -1.248,2.812 -2.801,2.812s-2.801,-1.252 -2.801,-2.812c0,-1.559 1.247,-2.812 2.801,-2.812zM13.982,8.938c1.554,0 2.801,1.252 2.801,2.812 0,1.559 -1.248,2.812 -2.801,2.812s-2.801,-1.252 -2.801,-2.812c0,-0.986 0.501,-1.847 1.261,-2.348l1.02,2.557c0.276,0.701 1.323,0.281 1.042,-0.417l-1.018,-2.552c0.162,-0.029 0.327,-0.051 0.497,-0.051z" />
+
 </vector>
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_bicycle_parking_covered.xml b/android/sdk/src/main/res/drawable/ic_bookmark_bicycle_parking_covered.xml
index 20a49e010..f6f2a2cc4 100644
--- a/android/sdk/src/main/res/drawable/ic_bookmark_bicycle_parking_covered.xml
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_bicycle_parking_covered.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="15dp"
-    android:height="15dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="15"
     android:viewportHeight="15">
   <path
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_bicycle_rental.xml b/android/sdk/src/main/res/drawable/ic_bookmark_bicycle_rental.xml
index e9cfcb4c3..0c4bf7557 100644
--- a/android/sdk/src/main/res/drawable/ic_bookmark_bicycle_rental.xml
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_bicycle_rental.xml
@@ -1,30 +1,35 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="13dp"
-    android:height="15dp"
-    android:viewportWidth="13"
-    android:viewportHeight="15">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="19"
+    android:viewportHeight="19">
+
   <path
-      android:pathData="m6.563,4.584c-0.583,-0.009 -0.583,0.873 0,0.865l1.293,0l0,1.095l-2.416,2.019l-0.84,-2.249l0.239,0c0.583,0.009 0.583,-0.873 0,-0.865l-1.724,0c-0.583,-0.009 -0.583,0.873 0,0.865l0.562,0l0.768,2.055c-0.403,-0.201 -0.851,-0.324 -1.33,-0.324c-1.661,0 -3.017,1.361 -3.017,3.028s1.356,3.028 3.017,3.028s3.017,-1.361 3.017,-3.028c0,-0.58 -0.173,-1.117 -0.456,-1.578l2.431,-2.033l0.399,1.004c-0.899,0.525 -1.512,1.492 -1.512,2.607c0,1.667 1.356,3.028 3.017,3.028c1.661,0 3.017,-1.361 3.017,-3.028s-1.356,-3.028 -3.017,-3.028c-0.244,0 -0.478,0.038 -0.705,0.093l-0.588,-1.475l0,-1.646c0,-0.239 -0.193,-0.433 -0.431,-0.433l-1.724,-0zM3.115,8.91c0.511,0 0.972,0.183 1.34,0.478l-1.616,1.352c-0.44,0.37 0.11,1.033 0.552,0.666l1.616,-1.352c0.162,0.304 0.263,0.648 0.263,1.019c0,1.2 -0.96,2.163 -2.155,2.163c-1.195,0 -2.155,-0.963 -2.155,-2.163c0,-1.2 0.96,-2.163 2.155,-2.163l-0,0zM10.01,8.91c1.195,0 2.155,0.963 2.155,2.163c0,1.2 -0.96,2.163 -2.155,2.163c-1.195,0 -2.155,-0.963 -2.155,-2.163c0,-0.759 0.385,-1.421 0.97,-1.806l0.785,1.967c0.212,0.539 1.017,0.216 0.801,-0.321l-0.783,-1.963c0.124,-0.022 0.251,-0.039 0.382,-0.039l-0,-0z"
-      android:fillColor="#fff"/>
+      android:fillColor="#fff"
+      android:pathData="m9.5,6.245c-0.758,-0.011 -0.758,1.135 0,1.125h1.681v1.423l-3.141,2.625 -1.092,-2.924h0.311c0.758,0.011 0.758,-1.135 0,-1.125h-2.241c-0.758,-0.011 -0.758,1.135 0,1.125h0.731l0.998,2.671c-0.524,-0.262 -1.106,-0.422 -1.729,-0.422 -2.159,0 -3.922,1.769 -3.922,3.936s1.763,3.936 3.922,3.936 3.922,-1.769 3.922,-3.936c0,-0.753 -0.224,-1.452 -0.593,-2.052l3.16,-2.642 0.519,1.305c-1.168,0.683 -1.965,1.94 -1.965,3.389 0,2.167 1.763,3.936 3.922,3.936 2.159,0 3.922,-1.769 3.922,-3.936s-1.763,-3.936 -3.922,-3.936c-0.317,0 -0.621,0.049 -0.917,0.121l-0.764,-1.918v-2.139c0,-0.311 -0.251,-0.562 -0.56,-0.562zM5.018,11.868c0.664,0 1.263,0.238 1.742,0.622l-2.101,1.757c-0.572,0.481 0.143,1.343 0.718,0.865l2.101,-1.757c0.211,0.396 0.341,0.842 0.341,1.325 0,1.559 -1.248,2.812 -2.801,2.812s-2.801,-1.252 -2.801,-2.812c0,-1.559 1.247,-2.812 2.801,-2.812zM13.982,11.868c1.554,0 2.801,1.252 2.801,2.812 0,1.559 -1.248,2.812 -2.801,2.812s-2.801,-1.252 -2.801,-2.812c0,-0.986 0.501,-1.847 1.261,-2.348l1.02,2.557c0.276,0.701 1.323,0.281 1.042,-0.417l-1.018,-2.552c0.162,-0.029 0.327,-0.051 0.497,-0.051z" />
+
   <path
-      android:strokeWidth="1"
-      android:pathData="M3.694,2.038m-1.462,0a1.462,1.462 0,1 1,2.925 0a1.462,1.462 0,1 1,-2.925 0"
-      android:strokeLineJoin="round"
       android:fillColor="#00000000"
+      android:pathData="M5.771,2.935m-1.901,0a1.901,1.901 0,1 1,3.802 0a1.901,1.901 0,1 1,-3.802 0"
       android:strokeColor="#fff"
-      android:strokeLineCap="round"/>
+      android:strokeWidth="1.3"
+      android:strokeLineCap="round"
+      android:strokeLineJoin="round" />
+
   <path
-      android:strokeWidth="1"
-      android:pathData="m5.186,2.027l5.811,0"
-      android:strokeLineJoin="round"
       android:fillColor="#00000000"
+      android:pathData="m7.711,2.92h7.554"
       android:strokeColor="#fff"
-      android:strokeLineCap="round"/>
+      android:strokeWidth="1.3"
+      android:strokeLineJoin="round"
+      android:strokeLineCap="round" />
+
   <path
-      android:strokeWidth="1"
-      android:pathData="m10.099,2.027l0,1.648"
-      android:strokeLineJoin="round"
       android:fillColor="#00000000"
+      android:pathData="m14.098,2.92v2.142"
       android:strokeColor="#fff"
-      android:strokeLineCap="round"/>
+      android:strokeWidth="1.3"
+      android:strokeLineCap="round"
+      android:strokeLineJoin="round" />
+
 </vector>
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_buddhism.xml b/android/sdk/src/main/res/drawable/ic_bookmark_buddhism.xml
index 40c148e7d..367880607 100644
--- a/android/sdk/src/main/res/drawable/ic_bookmark_buddhism.xml
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_buddhism.xml
@@ -1,15 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <group
-        android:pivotX="12"
-        android:pivotY="12"
-        android:scaleX="1"
-        android:scaleY="1">
-        <path
-            android:fillColor="#fff"
-            android:pathData="M11,2V3C9.27,3.2 7.69,3.9 6.4,4.94L5.64,4.18L4.22,5.6L5,6.35C3.9,7.68 3.21,9.3 3,11H2V13H3C3.21,14.68 3.9,16.26 5,17.56L4.22,18.32L5.64,19.74L6.39,19C7.71,20.07 9.3,20.77 11,21V22H13V21C14.69,20.77 16.29,20.07 17.6,19L18.36,19.74L19.78,18.32L19,17.57C20.1,16.27 20.79,14.68 21,13H22V11H21C20.79,9.3 20.1,7.69 19,6.36L19.78,5.6L18.36,4.18L17.61,4.94C16.29,3.87 14.69,3.2 13,3V2H11M11,5V8L10,8.5L7.81,6.35C8.72,5.67 9.81,5.17 11,5M13,5C14.16,5.18 15.26,5.64 16.2,6.35L14,8.5L13,8V5M6.4,7.76L8.5,10L8,11H5C5.16,9.84 5.7,8.7 6.39,7.75L6.4,7.76M17.6,7.76C18.33,8.71 18.81,9.82 19,11H16L15.5,10L17.61,7.76H17.6M12,10C13.12,10 14,10.88 14,12C14,13.12 13.12,14 12,14C10.88,14 10,13.12 10,12C10,10.88 10.88,10 12,10M5,13H8L8.57,14L6.39,16.15C5.67,15.24 5.19,14.16 5,13V13M16,13H19C18.81,14.15 18.33,15.24 17.61,16.16L15.5,14L16,13M10,15.5L11,16V19C9.83,18.8 8.73,18.31 7.8,17.57L10,15.5M14,15.5L16.19,17.57C15.28,18.25 14.19,18.83 13,19V16L14,15.5Z" />
-    </group>
+    android:width="24dp"
+    android:viewportWidth="19"
+    android:viewportHeight="19">
+
+    <path
+        android:fillColor="#fff"
+        android:pathData="m8.712,1.625v0.788c-1.362,0.157 -2.607,0.709 -3.622,1.528l-0.599,-0.599 -1.118,1.118 0.614,0.591c-0.866,1.047 -1.41,2.323 -1.575,3.662h-0.788v1.575h0.788c0.165,1.323 0.709,2.567 1.575,3.591l-0.614,0.599 1.118,1.118 0.591,-0.583c1.039,0.843 2.292,1.394 3.63,1.575v0.788h1.575v-0.788c1.331,-0.181 2.591,-0.732 3.622,-1.575l0.599,0.583 1.118,-1.118 -0.614,-0.591c0.866,-1.024 1.41,-2.276 1.575,-3.599h0.788v-1.575h-0.788c-0.165,-1.339 -0.709,-2.607 -1.575,-3.654l0.614,-0.599 -1.118,-1.118 -0.591,0.599c-1.039,-0.843 -2.299,-1.37 -3.63,-1.528v-0.788h-1.575m0,2.362v2.362l-0.788,0.394 -1.725,-1.693c0.717,-0.535 1.575,-0.929 2.512,-1.063m1.575,0c0.914,0.142 1.78,0.504 2.52,1.063l-1.732,1.693 -0.788,-0.394v-2.362m-5.198,2.174 l1.654,1.764 -0.394,0.788h-2.362c0.126,-0.914 0.551,-1.811 1.095,-2.559l0.008,0.008m8.82,0c0.575,0.748 0.953,1.622 1.102,2.552h-2.362l-0.394,-0.788 1.662,-1.764h-0.008m-4.41,1.764c0.882,0 1.575,0.693 1.575,1.575 0,0.882 -0.693,1.575 -1.575,1.575 -0.882,0 -1.575,-0.693 -1.575,-1.575 0,-0.882 0.693,-1.575 1.575,-1.575m-5.512,2.362h2.362l0.449,0.788 -1.717,1.693c-0.567,-0.717 -0.945,-1.567 -1.095,-2.481m8.663,0h2.362c-0.15,0.906 -0.528,1.764 -1.095,2.489l-1.662,-1.701 0.394,-0.788m-4.725,1.969 l0.788,0.394v2.362c-0.921,-0.157 -1.788,-0.543 -2.52,-1.126l1.732,-1.63m3.15,0 l1.725,1.63c-0.717,0.535 -1.575,0.992 -2.512,1.126v-2.362z" />
+
 </vector>
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_building.xml b/android/sdk/src/main/res/drawable/ic_bookmark_building.xml
index cbd374402..52f0f2973 100644
--- a/android/sdk/src/main/res/drawable/ic_bookmark_building.xml
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_building.xml
@@ -1,15 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <group
-        android:pivotX="12"
-        android:pivotY="12"
-        android:scaleX="1"
-        android:scaleY="1">
-        <path
-            android:fillColor="#FFF"
-            android:pathData="M7.7143,17.5714l0,0.8571c0,0.1161 -0.0424,0.2165 -0.1272,0.3013 -0.0848,0.0848 -0.1853,0.1272 -0.3013,0.1272l-0.8571,0c-0.1161,0 -0.2165,-0.0424 -0.3013,-0.1272 -0.0848,-0.0848 -0.1272,-0.1853 -0.1272,-0.3013l0,-0.8571c0,-0.1161 0.0424,-0.2165 0.1272,-0.3013 0.0848,-0.0848 0.1853,-0.1272 0.3013,-0.1272l0.8571,0c0.1161,0 0.2165,0.0424 0.3013,0.1272 0.0848,0.0848 0.1272,0.1853 0.1272,0.3013ZM7.7143,14.1428l0,0.8571c0,0.1161 -0.0424,0.2165 -0.1272,0.3013 -0.0848,0.0848 -0.1853,0.1272 -0.3013,0.1272l-0.8571,0c-0.1161,0 -0.2165,-0.0424 -0.3013,-0.1272 -0.0848,-0.0848 -0.1272,-0.1853 -0.1272,-0.3013l0,-0.8571c0,-0.1161 0.0424,-0.2165 0.1272,-0.3013 0.0848,-0.0848 0.1853,-0.1272 0.3013,-0.1272l0.8571,0c0.1161,0 0.2165,0.0424 0.3013,0.1272 0.0848,0.0848 0.1272,0.1853 0.1272,0.3013ZM11.1429,14.1428l0,0.8571c0,0.1161 -0.0424,0.2165 -0.1272,0.3013 -0.0848,0.0848 -0.1853,0.1272 -0.3013,0.1272l-0.8571,0c-0.1161,0 -0.2165,-0.0424 -0.3013,-0.1272 -0.0848,-0.0848 -0.1272,-0.1853 -0.1272,-0.3013l0,-0.8571c0,-0.1161 0.0424,-0.2165 0.1272,-0.3013 0.0848,-0.0848 0.1853,-0.1272 0.3013,-0.1272l0.8571,0c0.1161,0 0.2165,0.0424 0.3013,0.1272 0.0848,0.0848 0.1272,0.1853 0.1272,0.3013ZM7.7143,10.7143l0,0.8571c0,0.1161 -0.0424,0.2165 -0.1272,0.3013 -0.0848,0.0848 -0.1853,0.1272 -0.3013,0.1272l-0.8571,0c-0.1161,0 -0.2165,-0.0424 -0.3013,-0.1272 -0.0848,-0.0848 -0.1272,-0.1853 -0.1272,-0.3013l0,-0.8571c0,-0.1161 0.0424,-0.2165 0.1272,-0.3013 0.0848,-0.0848 0.1853,-0.1272 0.3013,-0.1272l0.8571,0c0.1161,0 0.2165,0.0424 0.3013,0.1272 0.0848,0.0848 0.1272,0.1853 0.1272,0.3013ZM18,17.5714l0,0.8571c0,0.1161 -0.0424,0.2165 -0.1272,0.3013 -0.0848,0.0848 -0.1853,0.1272 -0.3013,0.1272l-0.8571,0c-0.1161,0 -0.2165,-0.0424 -0.3013,-0.1272 -0.0848,-0.0848 -0.1272,-0.1853 -0.1272,-0.3013l0,-0.8571c0,-0.1161 0.0424,-0.2165 0.1272,-0.3013 0.0848,-0.0848 0.1853,-0.1272 0.3013,-0.1272l0.8571,0c0.1161,0 0.2165,0.0424 0.3013,0.1272 0.0848,0.0848 0.1272,0.1853 0.1272,0.3013ZM14.5714,14.1428l0,0.8571c0,0.1161 -0.0424,0.2165 -0.1272,0.3013 -0.0848,0.0848 -0.1853,0.1272 -0.3013,0.1272l-0.8571,0c-0.1161,0 -0.2165,-0.0424 -0.3013,-0.1272 -0.0848,-0.0848 -0.1272,-0.1853 -0.1272,-0.3013l0,-0.8571c0,-0.1161 0.0424,-0.2165 0.1272,-0.3013 0.0848,-0.0848 0.1853,-0.1272 0.3013,-0.1272l0.8571,0c0.1161,0 0.2165,0.0424 0.3013,0.1272 0.0848,0.0848 0.1272,0.1853 0.1272,0.3013ZM11.1428,10.7143l0,0.8571c0,0.1161 -0.0424,0.2165 -0.1272,0.3013 -0.0848,0.0848 -0.1853,0.1272 -0.3013,0.1272l-0.8571,0c-0.1161,0 -0.2165,-0.0424 -0.3013,-0.1272 -0.0848,-0.0848 -0.1272,-0.1853 -0.1272,-0.3013l0,-0.8571c0,-0.1161 0.0424,-0.2165 0.1272,-0.3013 0.0848,-0.0848 0.1853,-0.1272 0.3013,-0.1272l0.8571,0c0.1161,0 0.2165,0.0424 0.3013,0.1272 0.0848,0.0848 0.1272,0.1853 0.1272,0.3013ZM7.7143,7.2857l0,0.8571c0,0.1161 -0.0424,0.2165 -0.1272,0.3013 -0.0848,0.0848 -0.1853,0.1272 -0.3013,0.1272l-0.8571,0c-0.1161,0 -0.2165,-0.0424 -0.3013,-0.1272 -0.0848,-0.0848 -0.1272,-0.1853 -0.1272,-0.3013l0,-0.8571c0,-0.1161 0.0424,-0.2165 0.1272,-0.3013 0.0848,-0.0848 0.1853,-0.1272 0.3013,-0.1272l0.8571,0c0.1161,0 0.2165,0.0424 0.3013,0.1272 0.0848,0.0848 0.1272,0.1853 0.1272,0.3013ZM17.9999,14.1428l0,0.8571c0,0.1161 -0.0424,0.2165 -0.1272,0.3013 -0.0848,0.0848 -0.1853,0.1272 -0.3013,0.1272l-0.8571,0c-0.1161,0 -0.2165,-0.0424 -0.3013,-0.1272 -0.0848,-0.0848 -0.1272,-0.1853 -0.1272,-0.3013l0,-0.8571c0,-0.1161 0.0424,-0.2165 0.1272,-0.3013 0.0848,-0.0848 0.1853,-0.1272 0.3013,-0.1272l0.8571,0c0.1161,0 0.2165,0.0424 0.3013,0.1272 0.0848,0.0848 0.1272,0.1853 0.1272,0.3013ZM14.5714,10.7143l0,0.8571c0,0.1161 -0.0424,0.2165 -0.1272,0.3013 -0.0848,0.0848 -0.1853,0.1272 -0.3013,0.1272l-0.8571,0c-0.1161,0 -0.2165,-0.0424 -0.3013,-0.1272 -0.0848,-0.0848 -0.1272,-0.1853 -0.1272,-0.3013l0,-0.8571c0,-0.1161 0.0424,-0.2165 0.1272,-0.3013 0.0848,-0.0848 0.1853,-0.1272 0.3013,-0.1272l0.8571,0c0.1161,0 0.2165,0.0424 0.3013,0.1272 0.0848,0.0848 0.1272,0.1853 0.1272,0.3013ZM11.1428,7.2857l0,0.8571c0,0.1161 -0.0424,0.2165 -0.1272,0.3013 -0.0848,0.0848 -0.1853,0.1272 -0.3013,0.1272l-0.8571,0c-0.1161,0 -0.2165,-0.0424 -0.3013,-0.1272 -0.0848,-0.0848 -0.1272,-0.1853 -0.1272,-0.3013l0,-0.8571c0,-0.1161 0.0424,-0.2165 0.1272,-0.3013 0.0848,-0.0848 0.1853,-0.1272 0.3013,-0.1272l0.8571,0c0.1161,0 0.2165,0.0424 0.3013,0.1272 0.0848,0.0848 0.1272,0.1853 0.1272,0.3013ZM7.7142,3.8571l0,0.8571c0,0.1161 -0.0424,0.2165 -0.1272,0.3013 -0.0848,0.0848 -0.1853,0.1272 -0.3013,0.1272l-0.8571,0c-0.1161,0 -0.2165,-0.0424 -0.3013,-0.1272 -0.0848,-0.0848 -0.1272,-0.1853 -0.1272,-0.3013l0,-0.8571c0,-0.1161 0.0424,-0.2165 0.1272,-0.3013 0.0848,-0.0848 0.1853,-0.1272 0.3013,-0.1272l0.8571,0c0.1161,0 0.2165,0.0424 0.3013,0.1272 0.0848,0.0848 0.1272,0.1853 0.1272,0.3013ZM17.9999,10.7143l0,0.8571c0,0.1161 -0.0424,0.2165 -0.1272,0.3013 -0.0848,0.0848 -0.1853,0.1272 -0.3013,0.1272l-0.8571,0c-0.1161,0 -0.2165,-0.0424 -0.3013,-0.1272 -0.0848,-0.0848 -0.1272,-0.1853 -0.1272,-0.3013l0,-0.8571c0,-0.1161 0.0424,-0.2165 0.1272,-0.3013 0.0848,-0.0848 0.1853,-0.1272 0.3013,-0.1272l0.8571,0c0.1161,0 0.2165,0.0424 0.3013,0.1272 0.0848,0.0848 0.1272,0.1853 0.1272,0.3013ZM14.5714,7.2857l0,0.8571c0,0.1161 -0.0424,0.2165 -0.1272,0.3013 -0.0848,0.0848 -0.1853,0.1272 -0.3013,0.1272l-0.8571,0c-0.1161,0 -0.2165,-0.0424 -0.3013,-0.1272 -0.0848,-0.0848 -0.1272,-0.1853 -0.1272,-0.3013l0,-0.8571c0,-0.1161 0.0424,-0.2165 0.1272,-0.3013 0.0848,-0.0848 0.1853,-0.1272 0.3013,-0.1272l0.8571,0c0.1161,0 0.2165,0.0424 0.3013,0.1272 0.0848,0.0848 0.1272,0.1853 0.1272,0.3013ZM11.1428,3.8572l0,0.8571c0,0.1161 -0.0424,0.2165 -0.1272,0.3013 -0.0848,0.0848 -0.1853,0.1272 -0.3013,0.1272l-0.8571,0c-0.1161,0 -0.2165,-0.0424 -0.3013,-0.1272 -0.0848,-0.0848 -0.1272,-0.1853 -0.1272,-0.3013l0,-0.8571c0,-0.1161 0.0424,-0.2165 0.1272,-0.3013 0.0848,-0.0848 0.1853,-0.1272 0.3013,-0.1272l0.8571,0c0.1161,0 0.2165,0.0424 0.3013,0.1272 0.0848,0.0848 0.1272,0.1853 0.1272,0.3013ZM17.9999,7.2857l0,0.8571c0,0.1161 -0.0424,0.2165 -0.1272,0.3013 -0.0848,0.0848 -0.1853,0.1272 -0.3013,0.1272l-0.8571,0c-0.1161,0 -0.2165,-0.0424 -0.3013,-0.1272 -0.0848,-0.0848 -0.1272,-0.1853 -0.1272,-0.3013l0,-0.8571c0,-0.1161 0.0424,-0.2165 0.1272,-0.3013 0.0848,-0.0848 0.1853,-0.1272 0.3013,-0.1272l0.8571,0c0.1161,0 0.2165,0.0424 0.3013,0.1272 0.0848,0.0848 0.1272,0.1853 0.1272,0.3013ZM14.5714,3.8572l0,0.8571c0,0.1161 -0.0424,0.2165 -0.1272,0.3013 -0.0848,0.0848 -0.1853,0.1272 -0.3013,0.1272l-0.8571,0c-0.1161,0 -0.2165,-0.0424 -0.3013,-0.1272 -0.0848,-0.0848 -0.1272,-0.1853 -0.1272,-0.3013l0,-0.8571c0,-0.1161 0.0424,-0.2165 0.1272,-0.3013 0.0848,-0.0848 0.1853,-0.1272 0.3013,-0.1272l0.8571,0c0.1161,0 0.2165,0.0424 0.3013,0.1272 0.0848,0.0848 0.1272,0.1853 0.1272,0.3013ZM17.9999,3.8572l0,0.8571c0,0.1161 -0.0424,0.2165 -0.1272,0.3013 -0.0848,0.0848 -0.1853,0.1272 -0.3013,0.1272l-0.8571,0c-0.1161,0 -0.2165,-0.0424 -0.3013,-0.1272 -0.0848,-0.0848 -0.1272,-0.1853 -0.1272,-0.3013l0,-0.8571c0,-0.1161 0.0424,-0.2165 0.1272,-0.3013 0.0848,-0.0848 0.1853,-0.1272 0.3013,-0.1272l0.8571,0c0.1161,0 0.2165,0.0424 0.3013,0.1272 0.0848,0.0848 0.1272,0.1853 0.1272,0.3013ZM14.5714,22.2857l5.1429,0l0,-20.5714l-15.4286,0l0,20.5714l5.1429,0l0,-3c0,-0.1161 0.0424,-0.2165 0.1272,-0.3013 0.0848,-0.0848 0.1853,-0.1272 0.3013,-0.1272l4.2857,0c0.1161,0 0.2165,0.0424 0.3013,0.1272 0.0848,0.0848 0.1272,0.1853 0.1272,0.3013ZM21.4285,0.8572l0,22.2857c0,0.2321 -0.0848,0.433 -0.2545,0.6027 -0.1696,0.1696 -0.3705,0.2545 -0.6027,0.2545l-17.1429,0c-0.2321,0 -0.433,-0.0848 -0.6027,-0.2545 -0.1696,-0.1696 -0.2545,-0.3705 -0.2545,-0.6027l0,-22.2857c0,-0.2321 0.0848,-0.433 0.2545,-0.6027 0.1696,-0.1696 0.3705,-0.2545 0.6027,-0.2545l17.1429,0c0.2321,0 0.433,0.0848 0.6027,0.2545 0.1696,0.1696 0.2545,0.3705 0.2545,0.6027Z" />
-    </group>
+    android:width="24dp"
+    android:viewportWidth="19"
+    android:viewportHeight="19">
+
+    <path
+        android:fillColor="#fff"
+        android:pathData="m11.75,16.812v-5.223h-4.5v5.223h-4.5v-9.402l6.75,-5.223 6.75,5.223v9.402z" />
+
 </vector>
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_cafe.xml b/android/sdk/src/main/res/drawable/ic_bookmark_cafe.xml
index e0e30df2c..79c3cf86d 100644
--- a/android/sdk/src/main/res/drawable/ic_bookmark_cafe.xml
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_cafe.xml
@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="10dp"
-    android:height="10dp"
-    android:viewportWidth="10"
-    android:viewportHeight="10">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="19"
+    android:viewportHeight="19">
   <path
-      android:strokeWidth="1"
-      android:pathData="m8.833,0l-8.833,0l0,5.521c0,1.22 0.988,2.208 2.208,2.208l3.313,0c1.22,0 2.208,-0.988 2.208,-2.208l0,-1.656l1.104,0c0.613,0 1.104,-0.497 1.104,-1.104l0,-1.656c0,-0.613 -0.491,-1.104 -1.104,-1.104l0,-0zM8.833,2.761l-1.104,0l0,-1.656l1.104,0l0,1.656zM0,8.833l8.833,0l0,1.104l-8.833,0l0,-1.104z"
+      android:pathData="m13.875,3.875h-10v6.25c0,1.381 1.119,2.5 2.5,2.5h3.75c1.381,0 2.5,-1.119 2.5,-2.5v-1.875h1.25c0.694,0 1.25,-0.563 1.25,-1.25v-1.875c-0,-0.694 -0.556,-1.25 -1.25,-1.25zM13.875,7h-1.25v-1.875h1.25zM3.875,13.875h10v1.25h-10z"
       android:fillColor="#fff"/>
 </vector>
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_charging_station.xml b/android/sdk/src/main/res/drawable/ic_bookmark_charging_station.xml
index b12b65325..1abbe76a8 100644
--- a/android/sdk/src/main/res/drawable/ic_bookmark_charging_station.xml
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_charging_station.xml
@@ -1,9 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="12dp"
-    android:height="10dp"
-    android:viewportWidth="12"
-    android:viewportHeight="10">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="19"
+    android:viewportHeight="19">
+
   <path
-      android:pathData="m1,0a0.998,0.998 0,0 0,-1 1l0,7.999a0.998,0.998 0,0 0,1 1l4,0a0.998,0.998 0,0 0,1 -1l0,-2l0.5,0c0.282,0 0.5,0.218 0.5,0.5l0,1c0,0.822 0.677,1.5 1.5,1.5c0.822,0 1.5,-0.678 1.5,-1.5l0,-3.5a0.51,0.51 0,0 0,-0.007 -0.084a1.517,1.517 0,0 0,0.919 -0.916l0.088,0a0.998,0.998 0,0 0,1 -1l-1,0l0,-2a0.5,0.5 0,1 0,-1 0l0,2l-1,0l0,-2a0.5,0.5 0,1 0,-1 0l0,2l-1,0a0.998,0.998 0,0 0,1 1l0.088,0a1.516,1.516 0,0 0,0.92 0.916a0.512,0.512 0,0 0,-0.007 0.084l0,3.5a0.493,0.493 0,0 1,-0.5 0.5a0.493,0.493 0,0 1,-0.5 -0.5l0,-1c0,-0.822 -0.677,-1.5 -1.5,-1.5l-0.5,0l0,-4.999a0.998,0.998 0,0 0,-1 -1l-4,-0zM1.5,1l3,0c0.278,0 0.5,0.223 0.5,0.5l0,2.5l-4,0l0,-2.5c0,-0.277 0.223,-0.5 0.5,-0.5l0,0zM4.141,4.75a0.24,0.24 0,0 1,0.154 0.06c0.077,0.078 0.078,0.195 0.002,0.274l-1.197,1.385l0.9,0.905a0.178,0.178 0,0 1,-0.017 0.271l-1.965,1.555a0.247,0.247 0,0 1,-0.312 -0.01a0.191,0.191 0,0 1,-0.002 -0.274l1.198,-1.382l-0.901,-0.907a0.178,0.178 0,0 1,0.017 -0.271l1.965,-1.555a0.242,0.242 0,0 1,0.158 -0.05l-0,0z"
-      android:fillColor="#fff"/>
+      android:fillColor="#fff"
+      android:pathData="m2.001,2a1.496,1.496 0,0 0,-1.501 1.501v11.999a1.496,1.496 0,0 0,1.501 1.501h6a1.496,1.496 0,0 0,1.5 -1.501v-2.999h0.75c0.423,0 0.75,0.326 0.75,0.749v1.501c0,1.233 1.016,2.25 2.25,2.25 1.233,0 2.25,-1.017 2.25,-2.25v-5.25a0.765,0.765 0,0 0,-0.011 -0.126c0.64,-0.225 1.15,-0.735 1.379,-1.374h0.132a1.496,1.496 0,0 0,1.5 -1.501h-1.5v-2.999a0.75,0.75 0,1 0,-1.5 0v2.999h-1.501v-2.999a0.75,0.75 0,1 0,-1.5 0v2.999h-1.5a1.496,1.496 0,0 0,1.5 1.501h0.132a2.275,2.275 0,0 0,1.38 1.374,0.767 0.767,0 0,0 -0.011,0.126v5.25c0,0.423 -0.327,0.749 -0.75,0.749a0.739,0.739 0,0 1,-0.75 -0.749v-1.501c0,-1.233 -1.016,-2.25 -2.25,-2.25h-0.75v-7.499a1.496,1.496 0,0 0,-1.5 -1.501zM2.75,3.5h4.5c0.416,0 0.75,0.334 0.75,0.749v3.751h-6v-3.751c0,-0.415 0.334,-0.749 0.749,-0.749zM6.711,9.125a0.36,0.36 0,0 1,0.232 0.09c0.116,0.117 0.117,0.292 0.002,0.411l-1.796,2.077 1.35,1.357a0.268,0.268 0,0 1,-0.026 0.407l-2.947,2.332a0.37,0.37 0,0 1,-0.468 -0.015,0.287 0.287,0 0,1 -0.003,-0.411l1.797,-2.073 -1.351,-1.36a0.268,0.268 0,0 1,0.026 -0.407l2.947,-2.332a0.363,0.363 0,0 1,0.237 -0.075z" />
+
 </vector>
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_christianity.xml b/android/sdk/src/main/res/drawable/ic_bookmark_christianity.xml
index b16ee0222..37f9f7fd8 100644
--- a/android/sdk/src/main/res/drawable/ic_bookmark_christianity.xml
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_christianity.xml
@@ -1,15 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <group
-        android:pivotX="12"
-        android:pivotY="12"
-        android:scaleX="1"
-        android:scaleY="1">
-        <path
-            android:fillColor="#FFF"
-            android:pathData="M19.5,6l-4.5,0l0,-4.5c0,-0.8283 -0.6717,-1.5 -1.5,-1.5l-3,0c-0.8283,0 -1.5,0.6717 -1.5,1.5l0,4.5l-4.5,0c-0.8283,0 -1.5,0.6717 -1.5,1.5l0,3c0,0.8283 0.6717,1.5 1.5,1.5l4.5,0l0,10.5c0,0.8283 0.6717,1.5 1.5,1.5l3,0c0.8283,0 1.5,-0.6717 1.5,-1.5l0,-10.5l4.5,0c0.8283,0 1.5,-0.6717 1.5,-1.5l0,-3c0,-0.8283 -0.6717,-1.5 -1.5,-1.5Z" />
-    </group>
+    android:width="24dp"
+    android:viewportWidth="19"
+    android:viewportHeight="19">
+
+    <path
+        android:fillColor="#fff"
+        android:pathData="m3.875,7.683v-2.423h4.375v-3.635h2.5v3.635h4.375v2.423h-4.375v9.692h-2.5v-9.692z" />
+
 </vector>
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_exchange.xml b/android/sdk/src/main/res/drawable/ic_bookmark_exchange.xml
index e47ba88a0..4105c4d27 100644
--- a/android/sdk/src/main/res/drawable/ic_bookmark_exchange.xml
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_exchange.xml
@@ -1,10 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="11dp"
-    android:height="11dp"
-    android:viewportWidth="11"
-    android:viewportHeight="11">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="19"
+    android:viewportHeight="19">
+
   <path
-      android:strokeWidth="1"
-      android:pathData="m10.394,2.26l-0.652,0l-1.232,-2.041c-0.065,-0.108 -0.173,-0.184 -0.297,-0.21c-0.123,-0.025 -0.254,0.002 -0.357,0.075l-3.064,2.176l1.564,0l1.627,-1.155l0.697,1.155l-1.925,0l0,0.904l3.182,0l0,3.616l-5.455,0l0,-0.904l-0.909,0l0,1.356c0,0.25 0.204,0.452 0.455,0.452l3.129,0l-0.102,0.203c-0.077,0.154 -0.233,0.25 -0.406,0.25l-2.887,0l-1.097,-1.091l0,-2.337l1.097,-1.092l1.63,0l0,0.452c0,0.249 -0.204,0.452 -0.455,0.452l-0.909,0l0,0.904l0.909,0c0.752,0 1.364,-0.608 1.364,-1.356l0,-0.904c0,-0.25 -0.203,-0.452 -0.455,-0.452l-2.273,0c-0.12,0 -0.236,0.047 -0.321,0.133l-0.833,0.828c-0.064,-0.033 -0.132,-0.057 -0.209,-0.057l-1.818,0c-0.251,0 -0.455,0.203 -0.455,0.452l0,3.616c0,0.25 0.204,0.452 0.455,0.452l1.818,0c0.077,0 0.145,-0.023 0.209,-0.057l0.833,0.829c0.085,0.084 0.201,0.132 0.321,0.132l3.075,0c0.52,0 0.987,-0.287 1.22,-0.75l0.305,-0.606l2.219,0c0.251,0 0.455,-0.202 0.455,-0.452l0,-4.52c0,-0.25 -0.203,-0.452 -0.455,-0.452l0,0zM1.756,7.232l-0.909,0l0,-2.712l0.909,0l0,2.712z"
-      android:fillColor="#fff"/>
+      android:fillColor="#fff"
+      android:pathData="m16.572,6.286h-0.922l-1.742,-2.903c-0.093,-0.153 -0.244,-0.262 -0.42,-0.298 -0.174,-0.036 -0.359,0.002 -0.505,0.106l-4.332,3.095h2.212l2.301,-1.643 0.986,1.643h-2.722v1.286h4.5v5.143h-7.714v-1.286h-1.286v1.929c0,0.356 0.288,0.643 0.643,0.643h4.424l-0.144,0.288c-0.109,0.219 -0.329,0.355 -0.574,0.355h-4.083l-1.552,-1.552v-3.324l1.552,-1.553h2.305v0.643c0,0.354 -0.288,0.643 -0.643,0.643h-1.286v1.286h1.286c1.063,0 1.929,-0.865 1.929,-1.929v-1.286c0,-0.355 -0.287,-0.643 -0.643,-0.643h-3.214c-0.17,0 -0.334,0.067 -0.455,0.189l-1.178,1.178c-0.09,-0.047 -0.187,-0.081 -0.296,-0.081h-2.572c-0.355,0 -0.643,0.288 -0.643,0.643v5.143c0,0.356 0.288,0.643 0.643,0.643h2.572c0.109,0 0.206,-0.033 0.296,-0.081l1.178,1.179c0.12,0.12 0.284,0.188 0.455,0.188h4.349c0.735,0 1.396,-0.408 1.725,-1.066l0.431,-0.862h3.138c0.356,0 0.643,-0.287 0.643,-0.643v-6.429c0,-0.355 -0.287,-0.643 -0.643,-0.643zM4.357,13.357h-1.286v-3.857h1.286z" />
+
 </vector>
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_fast_food.xml b/android/sdk/src/main/res/drawable/ic_bookmark_fast_food.xml
index 95045c3bc..7ce2a8535 100644
--- a/android/sdk/src/main/res/drawable/ic_bookmark_fast_food.xml
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_fast_food.xml
@@ -1,10 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="11dp"
-    android:height="11dp"
-    android:viewportWidth="11"
-    android:viewportHeight="11">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="19"
+    android:viewportHeight="19">
+
   <path
-      android:strokeWidth="1"
-      android:pathData="m10.875,3.263c0.011,-2.175 -2.327,-3.263 -5.438,-3.263c-3.105,0 -5.438,1.087 -5.438,3.263c0,0.299 0.245,0.544 0.544,0.544l9.788,0c0.299,0 0.544,-0.245 0.544,-0.544l-0,0zM0,8.7c0,0.598 0.489,1.087 1.087,1.087l8.7,0c0.598,0 1.087,-0.489 1.087,-1.087l0,-0.544c0,-0.598 -0.489,-1.087 -1.087,-1.087l-8.7,0c-0.598,0 -1.087,0.489 -1.087,1.087l0,0.544zM0.745,6.134c0.43,-0.158 0.636,-0.424 1.082,-0.424c0.647,0 0.772,0.544 1.811,0.544c1.06,0 1.136,-0.544 1.811,-0.544c0.647,0 0.772,0.544 1.811,0.544c1.06,0 1.136,-0.544 1.811,-0.544c0.44,0 0.636,0.25 1.049,0.413c0.364,0.141 0.756,-0.136 0.756,-0.522c0,-0.234 -0.152,-0.44 -0.375,-0.522c-0.527,-0.19 -0.663,-0.451 -1.441,-0.451c-1.06,0 -1.136,0.544 -1.811,0.544c-0.647,0 -0.772,-0.544 -1.811,-0.544c-1.06,0 -1.136,0.544 -1.811,0.544c-0.647,0 -0.772,-0.544 -1.811,-0.544c-0.843,0 -1.066,0.343 -1.457,0.484c-0.212,0.076 -0.353,0.283 -0.353,0.511c0,0.375 0.381,0.642 0.739,0.511l-0,0z"
-      android:fillColor="#fff"/>
+      android:fillColor="#fff"
+      android:pathData="m17.375,7.137c0.016,-3.15 -3.371,-4.725 -7.875,-4.725 -4.497,0 -7.875,1.575 -7.875,4.725 0,0.433 0.354,0.788 0.788,0.788h14.175c0.433,0 0.788,-0.354 0.788,-0.788zM1.625,15.012c0,0.866 0.709,1.575 1.575,1.575h12.6c0.866,0 1.575,-0.709 1.575,-1.575v-0.788c0,-0.866 -0.709,-1.575 -1.575,-1.575h-12.6c-0.866,0 -1.575,0.709 -1.575,1.575zM2.704,11.295c0.622,-0.228 0.921,-0.614 1.567,-0.614 0.937,0 1.118,0.788 2.622,0.788 1.536,0 1.646,-0.788 2.622,-0.788 0.937,0 1.118,0.788 2.622,0.788 1.536,0 1.646,-0.788 2.622,-0.788 0.638,0 0.921,0.362 1.52,0.599 0.528,0.205 1.095,-0.197 1.095,-0.756 0,-0.339 -0.221,-0.638 -0.543,-0.756 -0.764,-0.276 -0.961,-0.654 -2.087,-0.654 -1.536,0 -1.646,0.788 -2.622,0.788 -0.937,0 -1.118,-0.788 -2.622,-0.788 -1.536,0 -1.646,0.788 -2.622,0.788 -0.937,0 -1.118,-0.788 -2.622,-0.788 -1.221,0 -1.543,0.496 -2.111,0.701 -0.307,0.11 -0.512,0.41 -0.512,0.74 0,0.543 0.551,0.929 1.071,0.74z" />
+
 </vector>
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_food.xml b/android/sdk/src/main/res/drawable/ic_bookmark_food.xml
index 515ed649d..01507199f 100644
--- a/android/sdk/src/main/res/drawable/ic_bookmark_food.xml
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_food.xml
@@ -1,18 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <group
-        android:pivotX="12"
-        android:pivotY="12"
-        android:scaleX="1"
-        android:scaleY="1">
-        <path
-            android:fillColor="#FFF"
-            android:pathData="M11.217,0.426c-0.036,-0.246 -0.247,-0.426 -0.494,-0.426 -0.005,0 -0.011,0 -0.017,0 -0.254,0.008 -0.461,0.205 -0.481,0.458l-0.438,5.252c-0.027,0.324 -0.602,0.324 -0.629,0l-0.438,-5.252c-0.02,-0.259 -0.237,-0.458 -0.497,-0.458 -0.26,0 -0.477,0.199 -0.498,0.458l-0.438,5.252c-0.027,0.324 -0.602,0.324 -0.629,0l-0.438,-5.252c-0.021,-0.253 -0.228,-0.45 -0.481,-0.458 -0.006,0 -0.012,0 -0.017,0 -0.247,0 -0.458,0.18 -0.494,0.426l-0.907,6.05c-0.267,1.773 0.695,3.469 2.317,4.176l-0.772,10.82c-0.046,0.651 0.182,1.298 0.627,1.776 0.445,0.478 1.075,0.752 1.728,0.752h0.004c0.653,0 1.283,-0.274 1.728,-0.752 0.445,-0.478 0.673,-1.125 0.627,-1.776l-0.772,-10.82c1.622,-0.707 2.584,-2.403 2.317,-4.176l-0.908,-6.05Z" />
-        <path
-            android:fillColor="#FFF"
-            android:pathData="M19.511,0.092c-0.132,-0.094 -0.302,-0.116 -0.455,-0.063 -0.043,0.015 -4.333,1.591 -4.333,6.471 0,3.513 1.143,5.287 1.786,6.007l-0.64,0.64c-0.082,0.082 -0.133,0.189 -0.144,0.304l-0.791,7.911c-0.068,0.673 0.153,1.347 0.607,1.849 0.454,0.502 1.105,0.789 1.782,0.789 1.323,0 2.4,-1.077 2.4,-2.4v-21.1c0,-0.163 -0.079,-0.314 -0.212,-0.408Z" />
-    </group>
+    android:width="24dp"
+    android:viewportWidth="19"
+    android:viewportHeight="19">
+
+    <path
+        android:fillColor="#fff"
+        android:pathData="m8.094,6.744v-3.316c0,-0.374 -0.298,-0.677 -0.67,-0.677h-0.066c-0.37,0 -0.67,0.313 -0.67,0.677v3.316h-1.406v-3.316c0,-0.374 -0.298,-0.677 -0.67,-0.677h-0.066c-0.37,0 -0.67,0.313 -0.67,0.677v3.316c0,1.55 1.406,2.756 2.742,2.756l-0.182,5.84c-0.016,0.503 0.37,0.91 0.864,0.91h0.184c0.493,0 0.875,-0.402 0.854,-0.91l-0.243,-5.84c1.406,0 3.094,-1.206 2.813,-2.756v-3.316c0,-0.374 -0.298,-0.677 -0.67,-0.677h-0.066c-0.37,0 -0.67,0.313 -0.67,0.677v3.316h-1.406zM11.75,10.4h1.688v5.012c0,0.463 0.375,0.838 0.844,0.838 0.466,0 0.844,-0.375 0.844,-0.844v-12.655c-2.356,0 -3.431,1.638 -3.375,2.925v4.725z" />
+
 </vector>
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_gas.xml b/android/sdk/src/main/res/drawable/ic_bookmark_gas.xml
index 2519806a5..8cf395c45 100644
--- a/android/sdk/src/main/res/drawable/ic_bookmark_gas.xml
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_gas.xml
@@ -1,15 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <group
-        android:pivotX="12"
-        android:pivotY="12"
-        android:scaleX="1"
-        android:scaleY="1">
-        <path
-            android:fillColor="#FFF"
-            android:pathData="M19.77,7.23l0.01,-0.01 -3.72,-3.72 -1.06,1.06 2.11,2.11c-0.94,0.36 -1.61,1.26 -1.61,2.33 0,1.38 1.12,2.5 2.5,2.5 0.36,0 0.69,-0.08 1,-0.21v7.21c0,0.55 -0.45,1 -1,1 -0.55,0 -1,-0.45 -1,-1v-4.5c0,-1.1 -0.9,-2 -2,-2h-1v-7c0,-1.1 -0.9,-2 -2,-2h-6c-1.1,0 -2,0.9 -2,2v16h10v-7.5h1.5v5c0,1.38 1.12,2.5 2.5,2.5 1.38,0 2.5,-1.12 2.5,-2.5v-9.5c0,-0.69 -0.28,-1.32 -0.73,-1.77ZM12,10h-6v-5h6v5ZM18,10c-0.55,0 -1,-0.45 -1,-1 0,-0.55 0.45,-1 1,-1 0.55,0 1,0.45 1,1 0,0.55 -0.45,1 -1,1Z" />
-    </group>
+    android:width="24dp"
+    android:viewportWidth="19"
+    android:viewportHeight="19">
+
+    <path
+        android:fillColor="#fff"
+        android:pathData="m13.134,1.259a0.75,0.75 0,0 0,-0.414 1.271l1.939,1.939c0.358,0.358 0.611,0.8 0.741,1.28h-0.65c-1.234,0 -2.25,1.016 -2.25,2.25s1.016,2.25 2.25,2.25h0.749v5.25c0,0.423 -0.326,0.749 -0.749,0.749a0.739,0.739 0,0 1,-0.75 -0.749v-1.501c0,-1.233 -1.016,-2.25 -2.25,-2.25h-0.75v-7.499a1.496,1.496 0,0 0,-1.5 -1.501h-6a1.496,1.496 0,0 0,-1.501 1.501v11.999a1.496,1.496 0,0 0,1.501 1.501h6a1.496,1.496 0,0 0,1.5 -1.501v-2.999h0.75c0.423,0 0.75,0.326 0.75,0.749v1.501c0,1.233 1.016,2.25 2.25,2.25 1.233,0 2.25,-1.017 2.25,-2.25v-9a4.37,4.37 0,0 0,-1.28 -3.09l-1.939,-1.941a0.75,0.75 0,0 0,-0.648 -0.21zM4.249,4.25h4.5c0.416,0 0.75,0.334 0.75,0.749v3.751h-5.998v-3.751c0,-0.415 0.334,-0.749 0.749,-0.749zM14.751,6.875a1.125,1.125 0,1 1,0 2.25,1.125 1.125,0 0,1 0,-2.25z" />
+
 </vector>
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_hotel.xml b/android/sdk/src/main/res/drawable/ic_bookmark_hotel.xml
index 0ae68c471..e927c7dde 100644
--- a/android/sdk/src/main/res/drawable/ic_bookmark_hotel.xml
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_hotel.xml
@@ -1,15 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <group
-        android:pivotX="12"
-        android:pivotY="12"
-        android:scaleX="1"
-        android:scaleY="1">
-        <path
-            android:fillColor="#FFF"
-            android:pathData="M7,13c1.66,0 3,-1.34 3,-3 0,-1.66 -1.34,-3 -3,-3 -1.66,0 -3,1.34 -3,3 0,1.66 1.34,3 3,3ZM19,7h-8v7h-8v-9h-2v15h2v-3h18v3h2v-9c0,-2.21 -1.79,-4 -4,-4Z" />
-    </group>
+    android:width="24dp"
+    android:viewportWidth="19"
+    android:viewportHeight="19">
+
+    <path
+        android:fillColor="#fff"
+        android:pathData="m5.92,9.858c1.188,0 2.148,-0.959 2.148,-2.148 0,-1.188 -0.959,-2.148 -2.148,-2.148 -1.188,0 -2.148,0.959 -2.148,2.148 0,1.188 0.959,2.148 2.148,2.148zM14.511,5.563h-4.295c-0.787,0 -1.432,0.644 -1.432,1.432v3.579h-5.727v-5.727c0,-0.394 -0.322,-0.716 -0.716,-0.716s-0.716,0.322 -0.716,0.716v9.306c0,0.394 0.322,0.716 0.716,0.716s0.716,-0.322 0.716,-0.716v-1.432h12.886v1.432c0,0.394 0.322,0.716 0.716,0.716s0.716,-0.322 0.716,-0.716v-5.727c0,-1.582 -1.281,-2.864 -2.864,-2.864z" />
+
 </vector>
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_information.xml b/android/sdk/src/main/res/drawable/ic_bookmark_information.xml
index f64461c04..b5eeb4419 100644
--- a/android/sdk/src/main/res/drawable/ic_bookmark_information.xml
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_information.xml
@@ -1,18 +1,23 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="11dp"
-    android:height="11dp"
-    android:viewportWidth="11"
-    android:viewportHeight="11">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="19"
+    android:viewportHeight="19">
+
   <path
-      android:pathData="M5.5,2m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"
-      android:fillColor="#fff"/>
+      android:fillColor="#fff"
+      android:pathData="M9.5,3.875m-2.25,0a2.25,2.25 0,1 1,4.5 0a2.25,2.25 0,1 1,-4.5 0" />
+
   <path
-      android:pathData="M4,4L6,4A0.5,0.5 0,0 1,6.5 4.5L6.5,5A0.5,0.5 0,0 1,6 5.5L4,5.5A0.5,0.5 0,0 1,3.5 5L3.5,4.5A0.5,0.5 0,0 1,4 4z"
-      android:fillColor="#fff"/>
+      android:fillColor="#fff"
+      android:pathData="M7.25,6.875L10.25,6.875A0.75,0.75 0,0 1,11 7.625L11,8.375A0.75,0.75 0,0 1,10.25 9.125L7.25,9.125A0.75,0.75 0,0 1,6.5 8.375L6.5,7.625A0.75,0.75 0,0 1,7.25 6.875z" />
+
   <path
-      android:pathData="M4.5,5h2v5h-2z"
-      android:fillColor="#fff"/>
+      android:fillColor="#fff"
+      android:pathData="M8,8.375h3v7.5h-3z" />
+
   <path
-      android:pathData="M4,9.5L7,9.5A0.5,0.5 0,0 1,7.5 10L7.5,10.5A0.5,0.5 0,0 1,7 11L4,11A0.5,0.5 0,0 1,3.5 10.5L3.5,10A0.5,0.5 0,0 1,4 9.5z"
-      android:fillColor="#fff"/>
+      android:fillColor="#fff"
+      android:pathData="M7.25,15.125L11.75,15.125A0.75,0.75 0,0 1,12.5 15.875L12.5,16.625A0.75,0.75 0,0 1,11.75 17.375L7.25,17.375A0.75,0.75 0,0 1,6.5 16.625L6.5,15.875A0.75,0.75 0,0 1,7.25 15.125z" />
+
 </vector>
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_museum.xml b/android/sdk/src/main/res/drawable/ic_bookmark_museum.xml
index 67763839f..4a729890a 100644
--- a/android/sdk/src/main/res/drawable/ic_bookmark_museum.xml
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_museum.xml
@@ -1,8 +1,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
-    android:height="24.001dp"
+    android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24.001">
+    android:viewportHeight="24">
     <group
         android:pivotX="12"
         android:pivotY="12"
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_pharmacy.xml b/android/sdk/src/main/res/drawable/ic_bookmark_pharmacy.xml
index 919a6d694..c15bfe3a0 100644
--- a/android/sdk/src/main/res/drawable/ic_bookmark_pharmacy.xml
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_pharmacy.xml
@@ -1,10 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="10dp"
-    android:height="10dp"
-    android:viewportWidth="10"
-    android:viewportHeight="10">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="19"
+    android:viewportHeight="19">
+
   <path
-      android:strokeWidth="1"
-      android:pathData="m7.07,0c-0.751,0 -1.499,0.292 -2.05,0.837l-4.147,4.125c-0.855,0.847 -1.087,2.077 -0.673,3.101c0,0 0.31,0.726 0.61,1.023c0.283,0.28 0.624,0.478 0.97,0.62c0.096,0.049 0.168,0.067 0.25,0.093c0.011,0.003 0.02,0.012 0.031,0.015c0.996,0.294 2.107,0.056 2.864,-0.729l2.504,-2.481l1.643,-1.644c1.152,-1.141 1.152,-2.971 0,-4.063c-0.501,-0.595 -1.252,-0.899 -2.003,-0.899l0,0zM7.07,0.993c0.501,0 1.011,0.195 1.362,0.543s0.548,0.853 0.548,1.349c0,0.496 -0.197,0.986 -0.548,1.334l-1.706,1.69l-2.705,-2.698l1.656,-1.629c0.401,-0.397 0.842,-0.589 1.393,-0.589l-0,0z"
-      android:fillColor="#fff"/>
+      android:fillColor="#fff"
+      android:pathData="m12.355,2.75c-1.02,0 -2.037,0.396 -2.785,1.138l-5.634,5.604c-1.162,1.151 -1.477,2.822 -0.914,4.213 0,0 0.421,0.986 0.829,1.39 0.384,0.381 0.848,0.649 1.318,0.843 0.13,0.067 0.228,0.091 0.34,0.126 0.015,0.005 0.027,0.017 0.043,0.021 1.353,0.4 2.862,0.076 3.891,-0.99l3.402,-3.371 2.232,-2.233c1.565,-1.551 1.565,-4.036 0,-5.519 -0.68,-0.809 -1.701,-1.222 -2.721,-1.222zM12.355,4.098c0.68,0 1.373,0.265 1.85,0.737 0.476,0.472 0.744,1.159 0.744,1.833 0,0.674 -0.268,1.34 -0.744,1.812l-2.317,2.296 -3.674,-3.665 2.25,-2.213c0.544,-0.539 1.144,-0.801 1.892,-0.801z" />
+
 </vector>
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_pub.xml b/android/sdk/src/main/res/drawable/ic_bookmark_pub.xml
index 68cac9429..d3b8394f8 100644
--- a/android/sdk/src/main/res/drawable/ic_bookmark_pub.xml
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_pub.xml
@@ -1,10 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="10dp"
-    android:height="11dp"
-    android:viewportWidth="10"
-    android:viewportHeight="10">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="19"
+    android:viewportHeight="19">
+
   <path
-      android:strokeWidth="1"
-      android:pathData="m8.862,3.866l-0.864,0c0.194,-0.327 0.31,-0.703 0.31,-1.108c0,-1.224 -0.991,-2.216 -2.216,-2.216c-0.188,0 -0.366,0.028 -0.543,0.072c-0.454,-0.377 -1.03,-0.615 -1.673,-0.615c-1.047,0 -1.944,0.615 -2.365,1.501c-0.875,0.294 -1.512,1.113 -1.512,2.088c0,1.03 0.709,1.889 1.662,2.138l0,4.785l6.092,0l0,-1.108l1.108,0c0.609,0 1.108,-0.498 1.108,-1.108l0,-3.323c0,-0.609 -0.498,-1.108 -1.108,-1.108l0,0zM2.216,4.697c-0.609,0 -1.108,-0.498 -1.108,-1.108c0,-0.471 0.305,-0.886 0.759,-1.041l0.443,-0.15l0.199,-0.421c0.26,-0.537 0.781,-0.87 1.368,-0.87c0.438,0 0.77,0.194 0.964,0.36l0.432,0.36s0.354,-0.177 0.814,-0.177c0.609,0 1.108,0.498 1.108,1.108l-1.662,0c-1.839,0 -2.127,1.939 -3.318,1.939l-0,-0zM8.862,8.297l-1.108,0l0,-3.323l1.108,0l0,3.323z"
-      android:fillColor="#fff"/>
+      android:fillColor="#fff"
+      android:pathData="m14.479,7.715h-1.11c0.249,-0.42 0.398,-0.903 0.398,-1.423 0,-1.572 -1.273,-2.845 -2.845,-2.845 -0.242,0 -0.469,0.036 -0.697,0.092 -0.583,-0.484 -1.323,-0.789 -2.148,-0.789 -1.344,0 -2.497,0.789 -3.037,1.928 -1.124,0.377 -1.942,1.43 -1.942,2.681 0,1.323 0.91,2.425 2.134,2.746v6.145h7.824v-1.423h1.423c0.782,0 1.423,-0.64 1.423,-1.423v-4.268c0,-0.782 -0.64,-1.423 -1.423,-1.423zM5.944,8.782c-0.782,0 -1.423,-0.64 -1.423,-1.423 0,-0.605 0.391,-1.138 0.974,-1.337l0.569,-0.192 0.256,-0.541c0.334,-0.69 1.003,-1.117 1.757,-1.117 0.562,0 0.989,0.249 1.238,0.462l0.555,0.462s0.455,-0.228 1.046,-0.228c0.782,0 1.423,0.64 1.423,1.423h-2.134c-2.361,0 -2.731,2.49 -4.26,2.49zM14.479,13.405h-1.423v-4.268h1.423z" />
+
 </vector>
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_stadium.xml b/android/sdk/src/main/res/drawable/ic_bookmark_stadium.xml
index c66d8cc94..469b0c4bc 100644
--- a/android/sdk/src/main/res/drawable/ic_bookmark_stadium.xml
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_stadium.xml
@@ -1,10 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="11dp"
-    android:height="10dp"
-    android:viewportWidth="11"
-    android:viewportHeight="10">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="19"
+    android:viewportHeight="19">
+
   <path
-      android:strokeWidth="1"
-      android:pathData="m1.651,0l1.101,0l1.651,1.101l-1.651,1.101l0,0.734c0.809,-0.117 1.749,-0.184 2.752,-0.184c1.002,0 1.942,0.067 2.752,0.184l0,-2.936l1.101,0l1.651,1.101l-1.651,1.101l0,0.944c1.019,0.25 1.651,0.598 1.651,0.983c0,0.76 -2.464,1.376 -5.503,1.376c-3.039,0 -5.503,-0.616 -5.503,-1.376c0,-0.385 0.632,-0.733 1.651,-0.983l0,-3.145l0,0zM5.503,3.577c-1.824,0 -2.752,0.094 -2.752,0.55c0,0.456 0.928,0.55 2.752,0.55c1.824,0 2.752,-0.094 2.752,-0.55c0,-0.456 -0.928,-0.55 -2.752,-0.55zM5.503,6.467c2.096,0 3.964,-0.366 5.174,-0.937l-0.771,4.377l-2.752,0l0,-1.101c0,-0.608 -0.493,-1.101 -1.101,-1.101l-1.101,0c-0.608,0 -1.101,0.493 -1.101,1.101l0,1.101l-2.752,0l-0.771,-4.377c1.21,0.571 3.078,0.937 5.174,0.937l-0,0z"
-      android:fillColor="#fff"/>
+      android:fillColor="#fff"
+      android:pathData="m3.987,2.413h1.575l2.362,1.575 -2.362,1.575v1.051c1.158,-0.168 2.503,-0.263 3.938,-0.263 1.434,0 2.779,0.096 3.938,0.263v-4.201h1.575l2.362,1.575 -2.362,1.575v1.35c1.458,0.357 2.362,0.855 2.362,1.406 0,1.087 -3.526,1.969 -7.875,1.969 -4.349,0 -7.875,-0.881 -7.875,-1.969 0,-0.551 0.905,-1.049 2.362,-1.406v-4.5zM9.5,7.531c-2.61,0 -3.938,0.135 -3.938,0.787 0,0.652 1.328,0.788 3.938,0.788s3.938,-0.135 3.938,-0.788c0,-0.652 -1.328,-0.787 -3.938,-0.787zM9.5,11.666c2.999,0 5.672,-0.524 7.403,-1.341l-1.103,6.263h-3.938v-1.575c0,-0.87 -0.705,-1.575 -1.575,-1.575h-1.575c-0.87,0 -1.575,0.705 -1.575,1.575v1.575h-3.938l-1.103,-6.263c1.731,0.817 4.404,1.341 7.403,1.341z" />
+
 </vector>
diff --git a/android/sdk/src/main/res/drawable/ic_bookmark_theatre.xml b/android/sdk/src/main/res/drawable/ic_bookmark_theatre.xml
index 304450ebd..62713c9ff 100644
--- a/android/sdk/src/main/res/drawable/ic_bookmark_theatre.xml
+++ b/android/sdk/src/main/res/drawable/ic_bookmark_theatre.xml
@@ -1,10 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="12dp"
-    android:height="12dp"
-    android:viewportWidth="12"
-    android:viewportHeight="12">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="19"
+    android:viewportHeight="19">
+
   <path
-      android:strokeWidth="1"
-      android:pathData="m5.372,0l0,3.581l1.791,0l0,1.492c0,-0.495 0.669,-0.895 1.492,-0.895s1.492,0.4 1.492,0.895l-2.984,0l0,1.725c0.448,0.227 0.955,0.364 1.492,0.364c1.814,0 3.283,-1.468 3.283,-3.283l0,-3.88l-6.566,0zM7.162,3.032c-0.328,0 -0.597,-0.269 -0.597,-0.597c0,-0.328 0.269,-0.597 0.597,-0.597s0.597,0.269 0.597,0.597c0,0.334 -0.269,0.597 -0.597,0.597zM10.147,3.032c-0.328,0 -0.597,-0.269 -0.597,-0.597c0,-0.328 0.269,-0.597 0.597,-0.597s0.597,0.269 0.597,0.597c0,0.334 -0.269,0.597 -0.597,0.597zM0,8.058c0,1.814 1.468,3.283 3.283,3.283s3.283,-1.468 3.283,-3.283l0,-3.88l-6.566,0l0,3.88zM3.283,9.252c-0.824,0 -1.492,-0.4 -1.492,-0.895l2.984,0c0,0.495 -0.669,0.895 -1.492,0.895zM4.775,5.969c0.328,0 0.597,0.269 0.597,0.597s-0.269,0.597 -0.597,0.597s-0.597,-0.269 -0.597,-0.597s0.269,-0.597 0.597,-0.597zM1.791,5.969c0.328,0 0.597,0.269 0.597,0.597s-0.269,0.597 -0.597,0.597s-0.597,-0.269 -0.597,-0.597s0.269,-0.597 0.597,-0.597z"
-      android:fillColor="#fff"/>
+      android:fillColor="#fff"
+      android:pathData="m8.712,2.019v4.725h2.362v1.969c0,-0.654 0.882,-1.181 1.969,-1.181s1.969,0.528 1.969,1.181h-3.938v2.276c0.591,0.299 1.26,0.48 1.969,0.48 2.394,0 4.331,-1.937 4.331,-4.331v-5.119zM11.075,6.019c-0.433,0 -0.788,-0.354 -0.788,-0.788s0.354,-0.788 0.788,-0.788 0.788,0.354 0.788,0.788c0,0.441 -0.354,0.788 -0.788,0.788zM15.012,6.019c-0.433,0 -0.788,-0.354 -0.788,-0.788s0.354,-0.788 0.788,-0.788 0.788,0.354 0.788,0.788c0,0.441 -0.354,0.788 -0.788,0.788zM1.625,12.65c0,2.394 1.937,4.331 4.331,4.331s4.331,-1.937 4.331,-4.331v-5.119h-8.663zM5.956,14.225c-1.087,0 -1.969,-0.528 -1.969,-1.181h3.938c0,0.654 -0.882,1.181 -1.969,1.181zM7.925,9.894c0.433,0 0.788,0.354 0.788,0.788 0,0.433 -0.354,0.788 -0.788,0.788s-0.788,-0.354 -0.788,-0.788c0,-0.433 0.354,-0.788 0.788,-0.788zM3.987,9.894c0.433,0 0.788,0.354 0.788,0.788 0,0.433 -0.354,0.788 -0.788,0.788s-0.788,-0.354 -0.788,-0.788c0,-0.433 0.354,-0.788 0.788,-0.788z" />
+
 </vector>

From d0bb8c1c492fd0c7d90934fac8894f1fc0d4c54c Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Mon, 11 Aug 2025 21:40:45 +0200
Subject: [PATCH 020/302] [android] Fix colors order

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 .../sdk/bookmarks/data/PredefinedColors.cpp   |  7 ++---
 libs/base/stl_helpers.hpp                     | 11 +++++++-
 libs/kml/types.hpp                            | 26 +++++++++++++++++++
 3 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/PredefinedColors.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/PredefinedColors.cpp
index da8cc3e45..4fbfa8800 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/PredefinedColors.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/PredefinedColors.cpp
@@ -9,9 +9,10 @@ extern "C"
 JNIEXPORT jintArray JNICALL
 Java_app_organicmaps_sdk_bookmarks_data_PredefinedColors_nativeGetPredefinedColors(JNIEnv * env, jclass)
 {
-  std::array<jint, static_cast<size_t>(kml::PredefinedColor::Count)> colors{};
-  for (size_t i = 0; i < static_cast<size_t>(kml::PredefinedColor::Count); ++i)
-    colors[i] = static_cast<jint>(kml::ColorFromPredefinedColor(static_cast<kml::PredefinedColor>(i)).GetARGB());
+  using kml::kOrderedPredefinedColors;
+  std::array<jint, kOrderedPredefinedColors.size()> colors;
+  for (size_t i = 0; i < kOrderedPredefinedColors.size(); ++i)
+    colors[i] = static_cast<jint>(kml::ColorFromPredefinedColor(kOrderedPredefinedColors[i]).GetARGB());
 
   jintArray jColors = env->NewIntArray(colors.size());
   env->SetIntArrayRegion(jColors, 0, static_cast<jsize>(colors.size()), colors.data());
diff --git a/libs/base/stl_helpers.hpp b/libs/base/stl_helpers.hpp
index 95dabf331..c62070784 100644
--- a/libs/base/stl_helpers.hpp
+++ b/libs/base/stl_helpers.hpp
@@ -1,10 +1,11 @@
 #pragma once
 
 #include <algorithm>
+#include <concepts>
 #include <functional>
 #include <initializer_list>
 #include <iterator>
-#include <memory>
+#include <ranges>
 #include <tuple>
 #include <type_traits>
 #include <vector>
@@ -496,4 +497,12 @@ struct RetrieveSecond
     return pair.second;
   }
 };
+
+template <std::ranges::random_access_range Container>
+  requires std::totally_ordered<std::ranges::range_value_t<Container>>
+consteval bool HasUniqueElements(Container container)
+{
+  std::sort(container.begin(), container.end());
+  return std::adjacent_find(container.begin(), container.end()) == container.end();
+}
 }  // namespace base
diff --git a/libs/kml/types.hpp b/libs/kml/types.hpp
index dcda3fcda..97c542a63 100644
--- a/libs/kml/types.hpp
+++ b/libs/kml/types.hpp
@@ -6,6 +6,7 @@
 
 #include "base/assert.hpp"
 #include "base/internal/message.hpp"  // DebugPrint(Timestamp)
+#include "base/stl_helpers.hpp"
 #include "base/visitor.hpp"
 
 #include "drape/color.hpp"
@@ -40,6 +41,31 @@ enum class PredefinedColor : uint8_t
   Count
 };
 
+std::array constexpr kOrderedPredefinedColors = {
+    // clang-format off
+    PredefinedColor::None,
+    PredefinedColor::Red,
+    PredefinedColor::Pink,
+    PredefinedColor::Purple,
+    PredefinedColor::DeepPurple,
+    PredefinedColor::Blue,
+    PredefinedColor::LightBlue,
+    PredefinedColor::Cyan,
+    PredefinedColor::Teal,
+    PredefinedColor::Green,
+    PredefinedColor::Lime,
+    PredefinedColor::Yellow,
+    PredefinedColor::Orange,
+    PredefinedColor::DeepOrange,
+    PredefinedColor::Brown,
+    PredefinedColor::Gray,
+    PredefinedColor::BlueGray
+    // clang-format on
+};
+static_assert(kOrderedPredefinedColors.size() == static_cast<size_t>(PredefinedColor::Count),
+              "kOrderedPredefinedColors size must match PredefinedColor::Count");
+static_assert(base::HasUniqueElements(kOrderedPredefinedColors), "All values must be unique");
+
 inline std::string DebugPrint(PredefinedColor color)
 {
   switch (color)

From 1c8ac1f32a62e038fc92f052301ec1b731fc4c20 Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Sun, 20 Jul 2025 20:49:45 +0200
Subject: [PATCH 021/302] [android] Show bookmark icon in color selector

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 .../bookmarks/BookmarksListFragment.java         |  2 +-
 .../app/organicmaps/bookmarks/ColorsAdapter.java | 10 +++++++---
 .../app/organicmaps/sdk/bookmarks/data/Icon.java | 12 +++++-------
 .../placepage/BookmarkColorDialogFragment.java   | 16 +++++++++++++---
 .../widget/placepage/EditBookmarkFragment.java   | 14 ++++++++------
 5 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java
index 5567715a5..98bad6b1d 100644
--- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java
@@ -593,7 +593,7 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
     if (mTrack == null)
       return;
     final Bundle args = new Bundle();
-    args.putInt(BookmarkColorDialogFragment.ICON_TYPE, PredefinedColors.getPredefinedColorIndex(mTrack.getColor()));
+    args.putInt(BookmarkColorDialogFragment.ICON_COLOR, PredefinedColors.getPredefinedColorIndex(mTrack.getColor()));
     final FragmentManager manager = getChildFragmentManager();
     String className = BookmarkColorDialogFragment.class.getName();
     final FragmentFactory factory = manager.getFragmentFactory();
diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/ColorsAdapter.java b/android/app/src/main/java/app/organicmaps/bookmarks/ColorsAdapter.java
index ffcbd3011..42dc03ec5 100644
--- a/android/app/src/main/java/app/organicmaps/bookmarks/ColorsAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/ColorsAdapter.java
@@ -6,6 +6,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
+import androidx.annotation.DrawableRes;
 import app.organicmaps.R;
 import app.organicmaps.sdk.bookmarks.data.PredefinedColors;
 import app.organicmaps.util.Graphics;
@@ -18,9 +19,13 @@ public class ColorsAdapter extends ArrayAdapter<Integer>
   @PredefinedColors.Color
   private int mCheckedIconColor;
 
-  public ColorsAdapter(Context context, List<Integer> list)
+  @DrawableRes
+  private final int mIconResId;
+
+  public ColorsAdapter(Context context, List<Integer> list, @DrawableRes int iconResId)
   {
     super(context, 0, 0, list);
+    mIconResId = iconResId;
   }
 
   @Override
@@ -44,8 +49,7 @@ public class ColorsAdapter extends ArrayAdapter<Integer>
     if (color == mCheckedIconColor)
     {
       circle = Graphics.drawCircleAndImage(PredefinedColors.getColor(mCheckedIconColor), R.dimen.track_circle_size,
-                                           app.organicmaps.sdk.R.drawable.ic_bookmark_none, R.dimen.bookmark_icon_size,
-                                           getContext());
+                                           mIconResId, R.dimen.bookmark_icon_size, getContext());
     }
     else
     {
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java
index a97fabaf6..0ac0c513b 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java
@@ -16,8 +16,6 @@ public class Icon implements Parcelable
 {
   private static final String TAG = Icon.class.getSimpleName();
 
-  static final int BOOKMARK_ICON_TYPE_NONE = 0;
-
   @DrawableRes
   private static int[] sTypeIcons = null;
 
@@ -25,11 +23,6 @@ public class Icon implements Parcelable
   private final int mColor;
   private final int mType;
 
-  public Icon(@PredefinedColors.Color int color)
-  {
-    this(color, BOOKMARK_ICON_TYPE_NONE);
-  }
-
   public Icon(@PredefinedColors.Color int color, int type)
   {
     mColor = color;
@@ -75,6 +68,11 @@ public class Icon implements Parcelable
     return sTypeIcons[mType];
   }
 
+  public int getType()
+  {
+    return mType;
+  }
+
   @Override
   public boolean equals(Object o)
   {
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java
index 15a1449d5..2994a98ad 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/BookmarkColorDialogFragment.java
@@ -6,6 +6,7 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.GridView;
+import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmDialogFragment;
@@ -16,11 +17,15 @@ import java.util.List;
 
 public class BookmarkColorDialogFragment extends BaseMwmDialogFragment
 {
-  public static final String ICON_TYPE = "ExtraIconType";
+  public static final String ICON_COLOR = "ExtraIconColor";
+  public static final String ICON_RES = "ExtraIconRes";
 
   @PredefinedColors.Color
   private int mIconColor;
 
+  @DrawableRes
+  private int mIconResId = app.organicmaps.sdk.R.drawable.ic_bookmark_none;
+
   public interface OnBookmarkColorChangeListener
   {
     void onBookmarkColorSet(@PredefinedColors.Color int color);
@@ -35,7 +40,12 @@ public class BookmarkColorDialogFragment extends BaseMwmDialogFragment
   public Dialog onCreateDialog(Bundle savedInstanceState)
   {
     if (getArguments() != null)
-      mIconColor = getArguments().getInt(ICON_TYPE);
+    {
+      if (getArguments().containsKey(ICON_COLOR))
+        mIconColor = getArguments().getInt(ICON_COLOR);
+      if (getArguments().containsKey(ICON_RES))
+        mIconResId = getArguments().getInt(ICON_RES);
+    }
 
     return new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
         .setView(buildView())
@@ -53,7 +63,7 @@ public class BookmarkColorDialogFragment extends BaseMwmDialogFragment
   private View buildView()
   {
     final List<Integer> colors = PredefinedColors.getAllPredefinedColors();
-    final ColorsAdapter adapter = new ColorsAdapter(requireActivity(), colors);
+    final ColorsAdapter adapter = new ColorsAdapter(requireActivity(), colors, mIconResId);
     adapter.chooseItem(mIconColor);
 
     @SuppressLint("InflateParams")
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
index a63fbc72a..8ffc5ab53 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
@@ -305,9 +305,12 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
 
     final Bundle args = new Bundle();
     if (mTrack != null)
-      args.putInt(BookmarkColorDialogFragment.ICON_TYPE, PredefinedColors.getPredefinedColorIndex(mColor));
+      args.putInt(BookmarkColorDialogFragment.ICON_COLOR, PredefinedColors.getPredefinedColorIndex(mColor));
     else
-      args.putInt(BookmarkColorDialogFragment.ICON_TYPE, mIcon.getColor());
+    {
+      args.putInt(BookmarkColorDialogFragment.ICON_COLOR, mIcon.getColor());
+      args.putInt(BookmarkColorDialogFragment.ICON_RES, mIcon.getResId());
+    }
     final FragmentManager manager = getChildFragmentManager();
     String className = BookmarkColorDialogFragment.class.getName();
     final FragmentFactory factory = manager.getFragmentFactory();
@@ -321,7 +324,7 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
           if (mIcon != null && mIcon.getColor() == colorPos)
             return;
 
-          mIcon = new Icon(colorPos);
+          mIcon = new Icon(colorPos, mIcon.getType());
           refreshColorMarker();
         });
       case TYPE_TRACK ->
@@ -342,9 +345,8 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
   {
     if (mIcon != null)
     {
-      Drawable circle = Graphics.drawCircleAndImage(mIcon.argb(), R.dimen.track_circle_size,
-                                                    app.organicmaps.sdk.R.drawable.ic_bookmark_none,
-                                                    R.dimen.bookmark_icon_size, requireContext());
+      final Drawable circle = Graphics.drawCircleAndImage(mIcon.argb(), R.dimen.track_circle_size, mIcon.getResId(),
+                                                          R.dimen.bookmark_icon_size, requireContext());
       mIvColor.setImageDrawable(circle);
     }
   }

From 9e494ed8a55e1141e7cfc39fd0da9468b4b3a2c2 Mon Sep 17 00:00:00 2001
From: hemanggs <hemangmanhas@gmail.com>
Date: Wed, 21 May 2025 19:33:50 +0530
Subject: [PATCH 022/302] [core] Create Standalone Note core

Signed-off-by: hemanggs <hemangmanhas@gmail.com>
---
 .../src/main/java/app/organicmaps/sdk/editor/Editor.java    | 1 +
 android/app/src/main/res/values/strings.xml                 | 3 +++
 .../sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp  | 6 ++++++
 libs/editor/osm_editor.cpp                                  | 6 ++++++
 libs/editor/osm_editor.hpp                                  | 2 ++
 5 files changed, 18 insertions(+)

diff --git a/android/app/src/main/java/app/organicmaps/sdk/editor/Editor.java b/android/app/src/main/java/app/organicmaps/sdk/editor/Editor.java
index 7bc120164..10cd2dc55 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/editor/Editor.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/editor/Editor.java
@@ -161,6 +161,7 @@ public final class Editor
   public static native void nativeCreateNote(String text);
   public static native void nativePlaceDoesNotExist(@NonNull String comment);
   public static native void nativeRollbackMapObject();
+  public static native void nativeCreateStandaloneNote(double lat, double lon, String text);
 
   /**
    * @return all cuisines keys.
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index c1a3ef167..478174903 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -610,6 +610,9 @@
     <string name="error_enter_correct_fediverse_page">Enter a valid Mastodon username or web address</string>
     <string name="error_enter_correct_bluesky_page">Enter a valid Bluesky username or web address</string>
     <string name="placepage_add_place_button">Add Place to OpenStreetMap</string>
+    <string name="placepage_add_note">Leave Note to OpenStreetMap</string>
+    <string name="osm_note_hint">Describe the issue, add details, or suggest an improvement.</string>
+    <string name="error_enter_note">Please enter a note text.</string>
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Do you want to send it to all users?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp
index 4efb0db64..433775a75 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp
@@ -391,6 +391,12 @@ Java_app_organicmaps_sdk_editor_Editor_nativeCreateNote(JNIEnv * env, jclass cla
       g_editableMapObject, osm::Editor::NoteProblemType::General, jni::ToNativeString(env, text));
 }
 
+JNIEXPORT void JNICALL
+Java_app_organicmaps_editor_Editor_nativeCreateStandaloneNote(JNIEnv * env, jclass clazz, jdouble lat, jdouble lon,jstring text)
+{
+    osm::Editor::Instance().CreateStandaloneNote(ms::LatLon(lat, lon), jni::ToNativeString(env, text));
+}
+
 // static void nativePlaceDoesNotExist(String comment);
 JNIEXPORT void JNICALL
 Java_app_organicmaps_sdk_editor_Editor_nativePlaceDoesNotExist(JNIEnv * env, jclass clazz, jstring comment)
diff --git a/libs/editor/osm_editor.cpp b/libs/editor/osm_editor.cpp
index 6c9783a8e..73789240a 100644
--- a/libs/editor/osm_editor.cpp
+++ b/libs/editor/osm_editor.cpp
@@ -1184,6 +1184,12 @@ void Editor::CreateNote(ms::LatLon const & latLon, FeatureID const & fid,
   m_notes->CreateNote(latLon, sstr.str());
 }
 
+void Editor::CreateStandaloneNote(ms::LatLon const & latLon, std::string const & noteText)
+{
+  CHECK_THREAD_CHECKER(MainThreadChecker,(""));
+  m_notes->CreateNote(latLon, noteText + "\n");
+}
+
 void Editor::MarkFeatureWithStatus(FeaturesContainer & editableFeatures, FeatureID const & fid,
                                    FeatureStatus status)
 {
diff --git a/libs/editor/osm_editor.hpp b/libs/editor/osm_editor.hpp
index da4006857..a44511964 100644
--- a/libs/editor/osm_editor.hpp
+++ b/libs/editor/osm_editor.hpp
@@ -170,6 +170,8 @@ public:
 
   Stats GetStats() const;
 
+  void CreateStandaloneNote(ms::LatLon const & latLon, std::string const & noteText);
+
   // Don't use this function to determine if a feature in editor was created.
   // Use GetFeatureStatus(fid) instead. This function is used when a feature is
   // not yet saved, and we have to know if it was modified or created.

From 2492e8bda4bc49be79e979507b07394eba71325f Mon Sep 17 00:00:00 2001
From: hemanggs <hemangmanhas@gmail.com>
Date: Fri, 6 Jun 2025 17:49:35 +0530
Subject: [PATCH 023/302] [Android] Standalone Note UI in Category select
 screen

Signed-off-by: hemanggs <hemangmanhas@gmail.com>
---
 .../editor/FeatureCategoryAdapter.java        | 43 +++++++++-
 .../editor/FeatureCategoryFragment.java       | 79 +++++++++++++++++--
 .../layout/item_feature_category_footer.xml   | 35 +++++++-
 android/app/src/main/res/values/strings.xml   |  5 +-
 .../cpp/app/organicmaps/sdk/editor/Editor.cpp |  7 +-
 libs/editor/osm_editor.cpp                    |  2 +-
 6 files changed, 155 insertions(+), 16 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryAdapter.java b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryAdapter.java
index ad4eeb008..7541f042e 100644
--- a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryAdapter.java
@@ -7,8 +7,12 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.textfield.TextInputEditText;
+
 import app.organicmaps.R;
 import app.organicmaps.sdk.editor.data.FeatureCategory;
+import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.sdk.util.UiUtils;
 import com.google.android.material.textview.MaterialTextView;
 
@@ -21,6 +25,12 @@ public class FeatureCategoryAdapter extends RecyclerView.Adapter<RecyclerView.Vi
   private final FeatureCategoryFragment mFragment;
   private final FeatureCategory mSelectedCategory;
 
+  public interface FooterListener
+  {
+    void onNoteTextChanged(String newText);
+    void onSendNoteClicked();
+  }
+
   public FeatureCategoryAdapter(@NonNull FeatureCategoryFragment host, @NonNull FeatureCategory[] categories,
                                 @Nullable FeatureCategory category)
   {
@@ -57,7 +67,7 @@ public class FeatureCategoryAdapter extends RecyclerView.Adapter<RecyclerView.Vi
       case TYPE_FOOTER ->
       {
         return new FooterViewHolder(
-            LayoutInflater.from(parent.getContext()).inflate(R.layout.item_feature_category_footer, parent, false));
+            LayoutInflater.from(parent.getContext()).inflate(R.layout.item_feature_category_footer, parent, false), (FooterListener) mFragment);
       }
       default -> throw new IllegalArgumentException("Unsupported");
     }
@@ -70,6 +80,10 @@ public class FeatureCategoryAdapter extends RecyclerView.Adapter<RecyclerView.Vi
     {
       ((FeatureViewHolder) holder).bind(position);
     }
+    else if (holder instanceof FooterViewHolder)
+    {
+      ((FooterViewHolder) holder).bind(mFragment.getPendingNoteText());
+    }
   }
 
   @Override
@@ -105,11 +119,36 @@ public class FeatureCategoryAdapter extends RecyclerView.Adapter<RecyclerView.Vi
 
   protected static class FooterViewHolder extends RecyclerView.ViewHolder
   {
-    FooterViewHolder(@NonNull View itemView)
+    private final TextInputEditText mNoteEditText;
+    private final View mSendNoteButton;
+
+    FooterViewHolder(@NonNull View itemView, @NonNull FooterListener listener)
     {
       super(itemView);
       MaterialTextView categoryUnsuitableText = itemView.findViewById(R.id.editor_category_unsuitable_text);
       categoryUnsuitableText.setMovementMethod(LinkMovementMethod.getInstance());
+      mNoteEditText = itemView.findViewById(R.id.note_edit_text);
+      mSendNoteButton = itemView.findViewById(R.id.send_note_button);
+      mSendNoteButton.setOnClickListener(v -> listener.onSendNoteClicked());
+      mNoteEditText.addTextChangedListener(new StringUtils.SimpleTextWatcher() {
+        @Override
+        public void onTextChanged(CharSequence s, int start, int before, int count)
+        {
+          final String str = s.toString();
+          listener.onNoteTextChanged(str);
+          mSendNoteButton.setEnabled(!str.trim().isEmpty());
+        }
+      });
+    }
+    public void bind(String pendingNoteText)
+    {
+      if (!mNoteEditText.getText().toString().equals(pendingNoteText))
+      {
+        mNoteEditText.setText(pendingNoteText);
+        if (pendingNoteText != null)
+          mNoteEditText.setSelection(pendingNoteText.length());
+      }
+      mSendNoteButton.setEnabled(pendingNoteText != null && !pendingNoteText.trim().isEmpty());
     }
   }
 
diff --git a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java
index e7f222916..ec1cdcce3 100644
--- a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java
@@ -1,7 +1,6 @@
 package app.organicmaps.editor;
 
 import static app.organicmaps.sdk.util.Utils.getLocalizedFeatureType;
-
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -9,21 +8,32 @@ import android.view.ViewGroup;
 import androidx.annotation.CallSuper;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import app.organicmaps.R;
-import app.organicmaps.base.BaseMwmRecyclerFragment;
+import app.organicmaps.MwmApplication;
 import app.organicmaps.sdk.editor.Editor;
 import app.organicmaps.sdk.editor.data.FeatureCategory;
 import app.organicmaps.sdk.util.Language;
+import app.organicmaps.sdk.editor.OsmOAuth;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import android.text.TextUtils;
+import android.content.Intent;
+import android.widget.Toast;
+
+import app.organicmaps.sdk.Framework;
+import app.organicmaps.R;
+import app.organicmaps.base.BaseMwmRecyclerFragment;
+import app.organicmaps.dialog.EditTextDialogFragment;
 import app.organicmaps.util.Utils;
 import app.organicmaps.widget.SearchToolbarController;
 import app.organicmaps.widget.ToolbarController;
 import java.util.Arrays;
 import java.util.Comparator;
 
-public class FeatureCategoryFragment extends BaseMwmRecyclerFragment<FeatureCategoryAdapter>
+public class FeatureCategoryFragment extends BaseMwmRecyclerFragment<FeatureCategoryAdapter> implements FeatureCategoryAdapter.FooterListener
 {
   private FeatureCategory mSelectedCategory;
   protected ToolbarController mToolbarController;
+  private static final String NOTE_CONFIRMATION_SHOWN = "NoteConfirmationAlertWasShown";
+  private static String mPendingNoteText = "";
 
   public interface FeatureCategoryListener
   {
@@ -48,7 +58,8 @@ public class FeatureCategoryFragment extends BaseMwmRecyclerFragment<FeatureCate
       mSelectedCategory =
           Utils.getParcelable(args, FeatureCategoryActivity.EXTRA_FEATURE_CATEGORY, FeatureCategory.class);
     }
-    mToolbarController = new SearchToolbarController(view, requireActivity()) {
+    mToolbarController = new SearchToolbarController(view, requireActivity())
+    {
       @Override
       protected void onTextChanged(String query)
       {
@@ -104,4 +115,62 @@ public class FeatureCategoryFragment extends BaseMwmRecyclerFragment<FeatureCate
     else if (getParentFragment() instanceof FeatureCategoryListener)
       ((FeatureCategoryListener) getParentFragment()).onFeatureCategorySelected(category);
   }
+
+  public String getPendingNoteText()
+  {
+    return mPendingNoteText;
+  }
+
+  @Override
+  public void onNoteTextChanged(String newText)
+  {
+    mPendingNoteText = newText;
+  }
+
+  @Override
+  public void onSendNoteClicked()
+  {
+    if (!OsmOAuth.isAuthorized())
+    {
+      final Intent intent = new Intent(requireActivity(), OsmLoginActivity.class);
+      startActivity(intent);
+      return;
+    }
+
+    final double[] center = Framework.nativeGetScreenRectCenter();
+    final double lat = center[0];
+    final double lon = center[1];
+
+    if (!MwmApplication.prefs(requireContext().getApplicationContext()).contains(NOTE_CONFIRMATION_SHOWN))
+    {
+      showNoteConfirmationDialog(lat, lon, mPendingNoteText);
+    }
+    else
+    {
+      Editor.nativeCreateStandaloneNote(lat, lon, mPendingNoteText);
+      mPendingNoteText = "";
+      Toast.makeText(requireContext(), R.string.osm_note_toast, Toast.LENGTH_SHORT).show();
+      requireActivity().finish();
+    }
+  }
+
+  // Duplicate of showNoobDialog()
+  private void showNoteConfirmationDialog(double lat, double lon, String noteText)
+  {
+    new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
+      .setTitle(R.string.editor_share_to_all_dialog_title)
+      .setMessage(getString(R.string.editor_share_to_all_dialog_message_1)
+        + " " + getString(R.string.editor_share_to_all_dialog_message_2))
+      .setPositiveButton(android.R.string.ok, (dlg, which) -> {
+        MwmApplication.prefs(requireContext().getApplicationContext()).edit()
+          .putBoolean(NOTE_CONFIRMATION_SHOWN, true)
+          .apply();
+        Editor.nativeCreateStandaloneNote(lat, lon, noteText);
+        mPendingNoteText = "";
+        Toast.makeText(requireContext(), R.string.osm_note_toast, Toast.LENGTH_SHORT).show();
+        requireActivity().finish();
+      })
+      .setNegativeButton(R.string.cancel, null)
+      .show();
+  }
 }
diff --git a/android/app/src/main/res/layout/item_feature_category_footer.xml b/android/app/src/main/res/layout/item_feature_category_footer.xml
index bd4a5d8e2..25d85482b 100644
--- a/android/app/src/main/res/layout/item_feature_category_footer.xml
+++ b/android/app/src/main/res/layout/item_feature_category_footer.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="wrap_content"
+  android:layout_width="match_parent"
   android:layout_height="wrap_content"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_gravity="center"
   android:orientation="vertical"
   android:background="?windowBackgroundForced"
@@ -17,10 +18,40 @@
     android:textStyle="bold" />
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/editor_category_unsuitable_text"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginTop="@dimen/margin_half"
     android:maxWidth="500dp"
     android:text="@string/editor_category_unsuitable_text"
     android:textAppearance="@style/MwmTextAppearance.Body3" />
+
+  <com.google.android.material.textfield.TextInputLayout
+    android:id="@+id/note_input_layout"
+    style="@style/MwmWidget.Editor.CustomTextInput"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:textColorHint="?android:textColorSecondary"
+    android:layout_marginTop="@dimen/margin_base_plus"
+    app:hintEnabled="false">
+    <com.google.android.material.textfield.TextInputEditText
+      android:id="@+id/note_edit_text"
+      style="@style/MwmWidget.Editor.FieldLayout.EditText"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:hint="@string/osm_note_hint"
+      android:inputType="textMultiLine"
+      android:gravity="top"
+      android:minLines="3"
+      android:maxLines="6" />
+  </com.google.android.material.textfield.TextInputLayout>
+  
+  <Button
+    android:id="@+id/send_note_button"
+    style="@style/MwmWidget.Button.Accent"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center_horizontal"
+    android:layout_marginTop="@dimen/margin_base"
+    android:enabled="false"
+    android:text="@string/editor_report_problem_send_button" />
 </LinearLayout>
\ No newline at end of file
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 478174903..0f8cb5720 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -610,9 +610,8 @@
     <string name="error_enter_correct_fediverse_page">Enter a valid Mastodon username or web address</string>
     <string name="error_enter_correct_bluesky_page">Enter a valid Bluesky username or web address</string>
     <string name="placepage_add_place_button">Add Place to OpenStreetMap</string>
-    <string name="placepage_add_note">Leave Note to OpenStreetMap</string>
-    <string name="osm_note_hint">Describe the issue, add details, or suggest an improvement.</string>
-    <string name="error_enter_note">Please enter a note text.</string>
+    <string name="osm_note_hint">Or, alternatively, leave a note to OpenStreetMap community so that someone else can add or fix a place here.</string>
+    <string name="osm_note_toast">Note will be sent to OpenStreetMap</string>
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Do you want to send it to all users?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp
index 433775a75..b225381cc 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp
@@ -391,10 +391,11 @@ Java_app_organicmaps_sdk_editor_Editor_nativeCreateNote(JNIEnv * env, jclass cla
       g_editableMapObject, osm::Editor::NoteProblemType::General, jni::ToNativeString(env, text));
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_editor_Editor_nativeCreateStandaloneNote(JNIEnv * env, jclass clazz, jdouble lat, jdouble lon,jstring text)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeCreateStandaloneNote(JNIEnv * env, jclass clazz,
+                                                                                         jdouble lat, jdouble lon,
+                                                                                         jstring text)
 {
-    osm::Editor::Instance().CreateStandaloneNote(ms::LatLon(lat, lon), jni::ToNativeString(env, text));
+  osm::Editor::Instance().CreateStandaloneNote(ms::LatLon(lat, lon), jni::ToNativeString(env, text));
 }
 
 // static void nativePlaceDoesNotExist(String comment);
diff --git a/libs/editor/osm_editor.cpp b/libs/editor/osm_editor.cpp
index 73789240a..2ca7a0201 100644
--- a/libs/editor/osm_editor.cpp
+++ b/libs/editor/osm_editor.cpp
@@ -1186,7 +1186,7 @@ void Editor::CreateNote(ms::LatLon const & latLon, FeatureID const & fid,
 
 void Editor::CreateStandaloneNote(ms::LatLon const & latLon, std::string const & noteText)
 {
-  CHECK_THREAD_CHECKER(MainThreadChecker,(""));
+  CHECK_THREAD_CHECKER(MainThreadChecker, (""));
   m_notes->CreateNote(latLon, noteText + "\n");
 }
 

From 826ddba26f0d24c1b140cd800adc4486603f0c40 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Sun, 10 Aug 2025 07:44:15 +0200
Subject: [PATCH 024/302] [android] Use material properties in styles and
 themes

Signed-off-by: Jean-Baptiste Charron <jeanbaptiste.charron@outlook.fr>
---
 .../editor/AdvancedTimetableFragment.java        |  4 ++--
 .../app/organicmaps/maplayer/SearchWheel.java    |  2 +-
 .../routing/RoutingBottomMenuController.java     |  6 +++---
 .../app/organicmaps/search/SearchAdapter.java    |  2 +-
 .../java/app/organicmaps/search/TabAdapter.java  |  2 +-
 .../VoiceInstructionsSettingsFragment.java       |  2 +-
 .../widget/menu/MyPositionButton.java            |  2 +-
 .../app/organicmaps/widget/menu/NavMenu.java     |  2 +-
 .../widget/placepage/PlacePageView.java          |  2 +-
 .../res/layout-land/altitude_chart_panel.xml     |  2 +-
 .../src/main/res/layout-land/layout_nav_top.xml  |  2 +-
 .../main/res/layout-land/onmap_downloader.xml    |  2 +-
 .../src/main/res/layout-land/routing_details.xml |  2 +-
 .../layout-w1020dp-land/altitude_chart_panel.xml |  2 +-
 .../res/layout-w1020dp-land/routing_details.xml  |  2 +-
 .../res/layout/activity_download_resources.xml   |  2 +-
 .../src/main/res/layout/altitude_chart_panel.xml |  2 +-
 .../src/main/res/layout/button_with_progress.xml |  4 ++--
 .../src/main/res/layout/downloader_status.xml    |  2 +-
 .../app/src/main/res/layout/fragment_editor.xml  |  2 +-
 .../src/main/res/layout/fragment_osm_profile.xml |  6 +++---
 .../app/src/main/res/layout/fragment_phone.xml   |  2 +-
 .../layout/fragment_suggest_country_download.xml |  2 +-
 .../src/main/res/layout/fragment_timetable.xml   |  2 +-
 .../res/layout/fragment_timetable_advanced.xml   |  2 +-
 .../res/layout/fragment_timetable_picker.xml     |  2 +-
 .../app/src/main/res/layout/item_add_street.xml  |  4 ++--
 .../src/main/res/layout/item_bookmark_button.xml |  4 ++--
 .../layout/item_bookmark_group_list_header.xml   |  2 +-
 .../res/layout/item_category_description.xml     |  2 +-
 android/app/src/main/res/layout/item_cuisine.xml |  2 +-
 .../app/src/main/res/layout/item_missed_map.xml  |  2 +-
 .../main/res/layout/item_missed_map_group.xml    |  6 +++---
 .../src/main/res/layout/item_opening_hours.xml   |  2 +-
 .../src/main/res/layout/item_search_result.xml   |  2 +-
 .../src/main/res/layout/item_search_suggest.xml  |  2 +-
 .../app/src/main/res/layout/item_timetable.xml   |  2 +-
 .../src/main/res/layout/layout_nav_bottom.xml    |  2 +-
 .../app/src/main/res/layout/onmap_downloader.xml |  2 +-
 .../src/main/res/layout/place_page_bluesky.xml   |  2 +-
 .../res/layout/place_page_description_layout.xml |  2 +-
 .../app/src/main/res/layout/place_page_email.xml |  2 +-
 .../src/main/res/layout/place_page_facebook.xml  |  2 +-
 .../src/main/res/layout/place_page_fediverse.xml |  2 +-
 .../src/main/res/layout/place_page_instagram.xml |  2 +-
 .../app/src/main/res/layout/place_page_line.xml  |  2 +-
 .../src/main/res/layout/place_page_open_in.xml   |  2 +-
 .../src/main/res/layout/place_page_panoramax.xml |  2 +-
 .../main/res/layout/place_page_phone_item.xml    |  2 +-
 .../src/main/res/layout/place_page_preview.xml   |  2 +-
 .../src/main/res/layout/place_page_twitter.xml   |  2 +-
 .../app/src/main/res/layout/place_page_vk.xml    |  2 +-
 .../src/main/res/layout/place_page_website.xml   |  2 +-
 .../main/res/layout/place_page_website_menu.xml  |  2 +-
 .../src/main/res/layout/place_page_wikimedia.xml |  2 +-
 .../res/layout/place_page_wikipedia_fragment.xml |  2 +-
 .../src/main/res/layout/routing_action_panel.xml |  6 +++---
 .../app/src/main/res/layout/routing_details.xml  |  2 +-
 android/app/src/main/res/layout/routing_plan.xml |  2 +-
 .../app/src/main/res/values-night-v27/themes.xml |  2 +-
 android/app/src/main/res/values-night/themes.xml | 14 +++++++-------
 android/app/src/main/res/values-v27/themes.xml   |  2 +-
 .../app/src/main/res/values/styles-editor.xml    |  2 +-
 android/app/src/main/res/values/styles-text.xml  |  6 +++---
 android/app/src/main/res/values/styles.xml       | 10 +++++-----
 android/app/src/main/res/values/themes.xml       | 16 ++++++++--------
 66 files changed, 97 insertions(+), 97 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java b/android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java
index 9a795fafd..ffba644c7 100644
--- a/android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java
@@ -87,8 +87,8 @@ public class AdvancedTimetableFragment extends BaseMwmFragment implements View.O
   private void setExampleDrawables(@DrawableRes int left, @DrawableRes int right)
   {
     mExamplesTitle.setCompoundDrawablesRelativeWithIntrinsicBounds(
-        Graphics.tint(requireActivity(), left, androidx.appcompat.R.attr.colorAccent), null,
-        Graphics.tint(requireActivity(), right, androidx.appcompat.R.attr.colorAccent), null);
+        Graphics.tint(requireActivity(), left, com.google.android.material.R.attr.colorSecondary), null,
+        Graphics.tint(requireActivity(), right, com.google.android.material.R.attr.colorSecondary), null);
   }
 
   @Override
diff --git a/android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java b/android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java
index 1d05d8e58..962b7b15a 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java
@@ -215,7 +215,7 @@ public class SearchWheel implements View.OnClickListener
     final SearchOption searchOption = mMapButtonsViewModel.getSearchOption().getValue();
     mSearchButton.setImageDrawable(Graphics.tint(
         mSearchButton.getContext(), searchOption == null ? R.drawable.ic_routing_search_off : searchOption.mDrawableOff,
-        androidx.appcompat.R.attr.colorAccent));
+        com.google.android.material.R.attr.colorSecondary));
   }
 
   @Override
diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java b/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
index 66b4502da..f8d338ae5 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
@@ -261,9 +261,9 @@ final class RoutingBottomMenuController implements View.OnClickListener
     {
       UiUtils.show(mActionButton);
       Drawable icon = ContextCompat.getDrawable(mContext, R.drawable.ic_location_crosshair);
-      int colorAccent = ContextCompat.getColor(
-          mContext, UiUtils.getStyledResourceId(mContext, androidx.appcompat.R.attr.colorAccent));
-      mActionIcon.setImageDrawable(Graphics.tint(icon, colorAccent));
+      int colorSecondary = ContextCompat.getColor(
+          mContext, UiUtils.getStyledResourceId(mContext, com.google.android.material.R.attr.colorSecondary));
+      mActionIcon.setImageDrawable(Graphics.tint(icon, colorSecondary));
     }
     else
     {
diff --git a/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java b/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java
index 38b4994ab..7ce6cedfe 100644
--- a/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java
@@ -65,7 +65,7 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
     @AttrRes
     int getTintAttr()
     {
-      return androidx.appcompat.R.attr.colorAccent;
+      return com.google.android.material.R.attr.colorSecondary;
     }
 
     abstract TextView getTitleView();
diff --git a/android/app/src/main/java/app/organicmaps/search/TabAdapter.java b/android/app/src/main/java/app/organicmaps/search/TabAdapter.java
index 470b77d32..314fad9c9 100644
--- a/android/app/src/main/java/app/organicmaps/search/TabAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/search/TabAdapter.java
@@ -92,7 +92,7 @@ class TabAdapter extends FragmentPagerAdapter
       editor.putInt(Config.KEY_PREF_LAST_SEARCHED_TAB, tab.getPosition());
       editor.apply();
       super.onTabSelected(tab);
-      Graphics.tint(mContext, tab.getIcon(), androidx.appcompat.R.attr.colorAccent);
+      Graphics.tint(mContext, tab.getIcon(), com.google.android.material.R.attr.colorSecondary);
     }
 
     @Override
diff --git a/android/app/src/main/java/app/organicmaps/settings/VoiceInstructionsSettingsFragment.java b/android/app/src/main/java/app/organicmaps/settings/VoiceInstructionsSettingsFragment.java
index 1c198c69c..4e3bea88e 100644
--- a/android/app/src/main/java/app/organicmaps/settings/VoiceInstructionsSettingsFragment.java
+++ b/android/app/src/main/java/app/organicmaps/settings/VoiceInstructionsSettingsFragment.java
@@ -328,7 +328,7 @@ public class VoiceInstructionsSettingsFragment extends BaseXmlSettingsFragment
     // Set link color.
     link.setSpan(
         new ForegroundColorSpan(ContextCompat.getColor(
-            requireContext(), UiUtils.getStyledResourceId(requireContext(), androidx.appcompat.R.attr.colorAccent))),
+            requireContext(), UiUtils.getStyledResourceId(requireContext(), com.google.android.material.R.attr.colorSecondary))),
         0, ttsLinkText.length(), 0);
     ttsLangInfoLink.setSummary(link);
 
diff --git a/android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java b/android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java
index 875ed86a1..12030791f 100644
--- a/android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java
+++ b/android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java
@@ -52,7 +52,7 @@ public class MyPositionButton
     if (mode == LocationState.FOLLOW || mode == LocationState.FOLLOW_AND_ROTATE
         || mode == LocationState.PENDING_POSITION)
     {
-      colorAttr = androidx.appcompat.R.attr.colorAccent;
+      colorAttr = com.google.android.material.R.attr.colorSecondary;
       if (mode == LocationState.PENDING_POSITION)
         sizeDimen = R.dimen.map_button_size;
       else
diff --git a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
index e25f922db..f5c01d931 100644
--- a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
+++ b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
@@ -167,7 +167,7 @@ public class NavMenu
   public void refreshTts()
   {
     mTts.setImageDrawable(TtsPlayer.isEnabled()
-                              ? Graphics.tint(mActivity, R.drawable.ic_voice_on, androidx.appcompat.R.attr.colorAccent)
+                              ? Graphics.tint(mActivity, R.drawable.ic_voice_on, com.google.android.material.R.attr.colorSecondary)
                               : Graphics.tint(mActivity, R.drawable.ic_voice_off));
   }
 
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
index 5f9ebf711..2c5b332f0 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
@@ -478,7 +478,7 @@ public class PlacePageView extends Fragment
       final int editPlaceButtonColor =
           Editor.nativeShouldEnableEditPlace()
               ? ContextCompat.getColor(getContext(),
-                                       UiUtils.getStyledResourceId(getContext(), androidx.appcompat.R.attr.colorAccent))
+                                       UiUtils.getStyledResourceId(getContext(), com.google.android.material.R.attr.colorSecondary))
               : getResources().getColor(R.color.button_accent_text_disabled);
       mTvEditPlace.setTextColor(editPlaceButtonColor);
       mTvAddBusiness.setTextColor(editPlaceButtonColor);
diff --git a/android/app/src/main/res/layout-land/altitude_chart_panel.xml b/android/app/src/main/res/layout-land/altitude_chart_panel.xml
index 23758503b..f5fcb7822 100644
--- a/android/app/src/main/res/layout-land/altitude_chart_panel.xml
+++ b/android/app/src/main/res/layout-land/altitude_chart_panel.xml
@@ -40,7 +40,7 @@
           android:layout_gravity="center_horizontal"
           android:textAppearance="@style/MwmTextAppearance.Body3"
           android:fontFamily="@string/robotoMedium"
-          android:textColor="?colorAccent"
+          android:textColor="?colorSecondary"
           android:gravity="center"
           tools:text="↗ 43 m ↘ 88 m"
           tools:visibility="visible" />
diff --git a/android/app/src/main/res/layout-land/layout_nav_top.xml b/android/app/src/main/res/layout-land/layout_nav_top.xml
index c7657a544..4636a4159 100644
--- a/android/app/src/main/res/layout-land/layout_nav_top.xml
+++ b/android/app/src/main/res/layout-land/layout_nav_top.xml
@@ -118,7 +118,7 @@
       app:layout_constraintTop_toBottomOf="@id/street_frame"
       app:lanesActiveLaneTintColor="?navLaneArrowActiveColor"
       app:lanesInactiveLaneTintColor="?navLaneArrowInactiveColor"
-      app:lanesBackgroundColor="?colorAccent"
+      app:lanesBackgroundColor="?colorSecondary"
       app:lanesCornerRadius="@dimen/margin_quarter"
       app:lanesEditModeLanesCount="10"
       tools:visibility="visible" />
diff --git a/android/app/src/main/res/layout-land/onmap_downloader.xml b/android/app/src/main/res/layout-land/onmap_downloader.xml
index 534b556cc..4f722e2b4 100644
--- a/android/app/src/main/res/layout-land/onmap_downloader.xml
+++ b/android/app/src/main/res/layout-land/onmap_downloader.xml
@@ -70,7 +70,7 @@
           android:layout_width="@dimen/downloader_status_size"
           android:layout_height="@dimen/downloader_status_size"
           android:layout_gravity="center"
-          app:wheelProgressColor="?colorAccent"
+          app:wheelProgressColor="?colorSecondary"
           app:wheelSecondaryColor="?dividerHorizontal"
           app:wheelThickness="@dimen/margin_eighth"
           android:visibility="visible"
diff --git a/android/app/src/main/res/layout-land/routing_details.xml b/android/app/src/main/res/layout-land/routing_details.xml
index 14b958aa8..b939b06e9 100644
--- a/android/app/src/main/res/layout-land/routing_details.xml
+++ b/android/app/src/main/res/layout-land/routing_details.xml
@@ -19,7 +19,7 @@
     android:layout_height="@dimen/altitude_chart_time_distance_height"
     android:textAppearance="@style/MwmTextAppearance.Body3"
     android:fontFamily="@string/robotoMedium"
-    android:textColor="?colorAccent"
+    android:textColor="?colorSecondary"
     android:visibility="gone"
     tools:text="43 m"
     tools:visibility="visible"/>
diff --git a/android/app/src/main/res/layout-w1020dp-land/altitude_chart_panel.xml b/android/app/src/main/res/layout-w1020dp-land/altitude_chart_panel.xml
index c61c04995..414abd3bb 100644
--- a/android/app/src/main/res/layout-w1020dp-land/altitude_chart_panel.xml
+++ b/android/app/src/main/res/layout-w1020dp-land/altitude_chart_panel.xml
@@ -40,7 +40,7 @@
           android:layout_gravity="center_horizontal"
           android:textAppearance="@style/MwmTextAppearance.Body3"
           android:fontFamily="@string/robotoMedium"
-          android:textColor="?colorAccent"
+          android:textColor="?colorSecondary"
           android:gravity="center"
           tools:text="↗ 43 m ↘ 88 m"
           tools:visibility="visible" />
diff --git a/android/app/src/main/res/layout-w1020dp-land/routing_details.xml b/android/app/src/main/res/layout-w1020dp-land/routing_details.xml
index 683231a5e..c5f4ed7e2 100644
--- a/android/app/src/main/res/layout-w1020dp-land/routing_details.xml
+++ b/android/app/src/main/res/layout-w1020dp-land/routing_details.xml
@@ -30,7 +30,7 @@
     android:layout_alignParentEnd="true"
     android:textAppearance="@style/MwmTextAppearance.Body3"
     android:fontFamily="@string/robotoMedium"
-    android:textColor="?colorAccent"
+    android:textColor="?colorSecondary"
     android:visibility="gone"
     tools:text="43 m"
     tools:visibility="visible"/>
diff --git a/android/app/src/main/res/layout/activity_download_resources.xml b/android/app/src/main/res/layout/activity_download_resources.xml
index b1dbc08bf..1ba9dddf8 100644
--- a/android/app/src/main/res/layout/activity_download_resources.xml
+++ b/android/app/src/main/res/layout/activity_download_resources.xml
@@ -23,7 +23,7 @@
         android:layout_width="90dp"
         android:layout_height="90dp"
         app:srcCompat="@drawable/ic_download"
-        app:tint="?android:colorAccent"/>
+        app:tint="?colorSecondary"/>
       <com.google.android.material.textview.MaterialTextView
         android:id="@+id/head_message"
         style="?fontHeadline6"
diff --git a/android/app/src/main/res/layout/altitude_chart_panel.xml b/android/app/src/main/res/layout/altitude_chart_panel.xml
index 2b7f6003a..cb9e66d79 100644
--- a/android/app/src/main/res/layout/altitude_chart_panel.xml
+++ b/android/app/src/main/res/layout/altitude_chart_panel.xml
@@ -37,7 +37,7 @@
           android:layout_height="@dimen/altitude_chart_time_distance_height"
           android:textAppearance="@style/MwmTextAppearance.Body3"
           android:fontFamily="@string/robotoMedium"
-          android:textColor="?colorAccent"
+          android:textColor="?colorSecondary"
           android:layout_gravity="end"
           android:gravity="center"
           android:visibility="gone"
diff --git a/android/app/src/main/res/layout/button_with_progress.xml b/android/app/src/main/res/layout/button_with_progress.xml
index e2ad9083e..d7511c20a 100644
--- a/android/app/src/main/res/layout/button_with_progress.xml
+++ b/android/app/src/main/res/layout/button_with_progress.xml
@@ -13,7 +13,7 @@
     android:layout_marginStart="@dimen/margin_base"
     android:text="@string/download_country_ask"
     android:textAppearance="?fontBody2"
-    app:buttonTint="?colorAccent"
+    app:buttonTint="?colorSecondary"
     android:visibility="gone"
     tools:visibility="visible"/>
   <com.google.android.material.progressindicator.LinearProgressIndicator
@@ -26,7 +26,7 @@
     android:layout_marginEnd="@dimen/margin_base_plus"
     android:layout_marginBottom="@dimen/margin_base"
     android:indeterminate="false"
-    app:indicatorColor="?android:colorAccent"
+    app:indicatorColor="?colorSecondary"
     app:trackColor="@color/bg_routing_progress"/>
   <com.google.android.material.button.MaterialButton
     android:id="@+id/btn_download_resources"
diff --git a/android/app/src/main/res/layout/downloader_status.xml b/android/app/src/main/res/layout/downloader_status.xml
index bc8ed9909..b4175ac03 100644
--- a/android/app/src/main/res/layout/downloader_status.xml
+++ b/android/app/src/main/res/layout/downloader_status.xml
@@ -11,7 +11,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?clickableBackground"
-    wheel:wheelProgressColor="?colorAccent"
+    wheel:wheelProgressColor="?colorSecondary"
     wheel:wheelSecondaryColor="?dividerHorizontal"
     wheel:wheelThickness="@dimen/margin_eighth"/>
 
diff --git a/android/app/src/main/res/layout/fragment_editor.xml b/android/app/src/main/res/layout/fragment_editor.xml
index c6bd79f0a..136eb4052 100644
--- a/android/app/src/main/res/layout/fragment_editor.xml
+++ b/android/app/src/main/res/layout/fragment_editor.xml
@@ -221,7 +221,7 @@
               android:layout_alignParentEnd="true"
               android:layout_centerVertical="true"
               android:textAppearance="@style/MwmTextAppearance.Body1"
-              android:textColor="?colorAccent"/>
+              android:textColor="?colorSecondary"/>
         </RelativeLayout>
 
         <include
diff --git a/android/app/src/main/res/layout/fragment_osm_profile.xml b/android/app/src/main/res/layout/fragment_osm_profile.xml
index aa2a47061..9b9865e25 100644
--- a/android/app/src/main/res/layout/fragment_osm_profile.xml
+++ b/android/app/src/main/res/layout/fragment_osm_profile.xml
@@ -107,7 +107,7 @@
         android:paddingBottom="@dimen/margin_half"
         android:text="@string/editor_osm_history"
         android:textAppearance="@style/MwmTextAppearance.Body2"
-        android:textColor="?colorAccent"
+        android:textColor="?colorSecondary"
         app:layout_constraintTop_toTopOf="parent" />
 
     <com.google.android.material.textview.MaterialTextView
@@ -123,7 +123,7 @@
         android:paddingBottom="@dimen/margin_half"
         android:text="@string/editor_osm_notes"
         android:textAppearance="@style/MwmTextAppearance.Body2"
-        android:textColor="?colorAccent"
+        android:textColor="?colorSecondary"
         app:layout_constraintTop_toBottomOf="@id/osm_history" />
 
     <com.google.android.material.textview.MaterialTextView
@@ -140,7 +140,7 @@
         android:paddingBottom="@dimen/margin_half"
         android:text="@string/editor_more_about_osm"
         android:textAppearance="@style/MwmTextAppearance.Body3"
-        android:textColor="?colorAccent"
+        android:textColor="?colorSecondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/osm_notes"
         app:layout_constraintVertical_bias="1" />
diff --git a/android/app/src/main/res/layout/fragment_phone.xml b/android/app/src/main/res/layout/fragment_phone.xml
index 59d5c9c89..13ae40581 100644
--- a/android/app/src/main/res/layout/fragment_phone.xml
+++ b/android/app/src/main/res/layout/fragment_phone.xml
@@ -31,7 +31,7 @@
         android:text="@string/editor_add_phone"
         android:textAllCaps="true"
         android:textAppearance="@style/MwmTextAppearance.Body3"
-        android:textColor="?colorAccent"
+        android:textColor="?colorSecondary"
         app:layout_constraintBottom_toBottomOf="@+id/frameLayout" />
 
     <include
diff --git a/android/app/src/main/res/layout/fragment_suggest_country_download.xml b/android/app/src/main/res/layout/fragment_suggest_country_download.xml
index 985c55176..0c3438029 100644
--- a/android/app/src/main/res/layout/fragment_suggest_country_download.xml
+++ b/android/app/src/main/res/layout/fragment_suggest_country_download.xml
@@ -122,7 +122,7 @@
       android:layout_width="@dimen/downloader_status_size"
       android:layout_height="@dimen/downloader_status_size"
       android:background="?clickableBackground"
-      wheel:wheelProgressColor="?colorAccent"
+      wheel:wheelProgressColor="?colorSecondary"
       wheel:wheelSecondaryColor="?dividerHorizontal"
       wheel:wheelThickness="@dimen/margin_eighth"/>
   </LinearLayout>
diff --git a/android/app/src/main/res/layout/fragment_timetable.xml b/android/app/src/main/res/layout/fragment_timetable.xml
index 5a60096e7..700a7ea8d 100644
--- a/android/app/src/main/res/layout/fragment_timetable.xml
+++ b/android/app/src/main/res/layout/fragment_timetable.xml
@@ -32,7 +32,7 @@
     android:text="@string/editor_time_advanced"
     android:textAllCaps="true"
     android:textAppearance="@style/MwmTextAppearance.Body3"
-    android:textColor="?colorAccent" />
+    android:textColor="?colorSecondary" />
 
   <include
     layout="@layout/shadow_bottom"
diff --git a/android/app/src/main/res/layout/fragment_timetable_advanced.xml b/android/app/src/main/res/layout/fragment_timetable_advanced.xml
index aaeb8312b..0bd7259fa 100644
--- a/android/app/src/main/res/layout/fragment_timetable_advanced.xml
+++ b/android/app/src/main/res/layout/fragment_timetable_advanced.xml
@@ -60,7 +60,7 @@
           android:padding="@dimen/margin_base"
           android:text="@string/editor_example_values"
           android:textAppearance="@style/MwmTextAppearance.Body3"
-          android:textColor="?colorAccent"/>
+          android:textColor="?colorSecondary"/>
 
         <View
           android:layout_width="match_parent"
diff --git a/android/app/src/main/res/layout/fragment_timetable_picker.xml b/android/app/src/main/res/layout/fragment_timetable_picker.xml
index 16c6de9f4..4254a2c38 100644
--- a/android/app/src/main/res/layout/fragment_timetable_picker.xml
+++ b/android/app/src/main/res/layout/fragment_timetable_picker.xml
@@ -14,7 +14,7 @@
     android:elevation="@dimen/appbar_elevation"
     android:background="?android:windowBackground"
     app:tabGravity="fill"
-    app:tabIndicatorColor="?colorAccent"
+    app:tabIndicatorColor="?colorSecondary"
     app:tabMode="fixed"
     app:tabRippleColor="@android:color/transparent"
     tools:ignore="UnusedAttribute"/>
diff --git a/android/app/src/main/res/layout/item_add_street.xml b/android/app/src/main/res/layout/item_add_street.xml
index bc4bbdea0..09fc56193 100644
--- a/android/app/src/main/res/layout/item_add_street.xml
+++ b/android/app/src/main/res/layout/item_add_street.xml
@@ -15,7 +15,7 @@
     android:layout_marginEnd="@dimen/margin_double"
     android:scaleType="centerCrop"
     app:srcCompat="@drawable/ic_plus"
-    app:tint="?colorAccent" />
+    app:tint="?colorSecondary" />
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/street"
@@ -25,6 +25,6 @@
     android:singleLine="true"
     android:text="@string/add_street"
     android:textAppearance="@style/MwmTextAppearance.Body1"
-    android:textColor="?colorAccent"/>
+    android:textColor="?colorSecondary"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/item_bookmark_button.xml b/android/app/src/main/res/layout/item_bookmark_button.xml
index de3afc21f..fb171fe61 100644
--- a/android/app/src/main/res/layout/item_bookmark_button.xml
+++ b/android/app/src/main/res/layout/item_bookmark_button.xml
@@ -15,7 +15,7 @@
     android:layout_width="@dimen/nav_icon_size"
     android:layout_height="wrap_content"
     android:layout_gravity="center_vertical"
-    app:tint="?colorAccent"
+    app:tint="?colorSecondary"
     tools:srcCompat="@drawable/ic_import" />
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/text"
@@ -26,5 +26,5 @@
     tools:text="Some text should go here"
     android:textAllCaps="true"
     android:textAppearance="@style/MwmTextAppearance.Body3"
-    android:textColor="?colorAccent"/>
+    android:textColor="?colorSecondary"/>
 </LinearLayout>
diff --git a/android/app/src/main/res/layout/item_bookmark_group_list_header.xml b/android/app/src/main/res/layout/item_bookmark_group_list_header.xml
index 5862854c2..a41eb4f05 100644
--- a/android/app/src/main/res/layout/item_bookmark_group_list_header.xml
+++ b/android/app/src/main/res/layout/item_bookmark_group_list_header.xml
@@ -31,7 +31,7 @@
     android:paddingTop="@dimen/margin_half_plus"
     android:text="@string/bookmark_lists_hide_all"
     android:textAllCaps="true"
-    android:textColor="?colorAccent"
+    android:textColor="?colorSecondary"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintTop_toTopOf="parent" />
diff --git a/android/app/src/main/res/layout/item_category_description.xml b/android/app/src/main/res/layout/item_category_description.xml
index 0a3de700d..26d032e68 100644
--- a/android/app/src/main/res/layout/item_category_description.xml
+++ b/android/app/src/main/res/layout/item_category_description.xml
@@ -36,7 +36,7 @@
         android:clickable="true"
         android:gravity="start|top"
         android:text="@string/category_desc_more"
-        android:textColor="?attr/colorAccent"
+        android:textColor="?attr/colorSecondary"
         android:layout_marginTop="2dp" />
   </LinearLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/item_cuisine.xml b/android/app/src/main/res/layout/item_cuisine.xml
index a5b002bc4..dea81533a 100644
--- a/android/app/src/main/res/layout/item_cuisine.xml
+++ b/android/app/src/main/res/layout/item_cuisine.xml
@@ -14,7 +14,7 @@
     android:layout_width="48dp"
     android:layout_height="48dp"
     android:layout_marginEnd="@dimen/margin_double"
-    app:buttonTint="?colorAccent"/>
+    app:buttonTint="?colorSecondary"/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/cuisine"
diff --git a/android/app/src/main/res/layout/item_missed_map.xml b/android/app/src/main/res/layout/item_missed_map.xml
index 724131016..02dc8235f 100644
--- a/android/app/src/main/res/layout/item_missed_map.xml
+++ b/android/app/src/main/res/layout/item_missed_map.xml
@@ -17,7 +17,7 @@
     android:layout_centerVertical="true"
     android:layout_marginEnd="@dimen/margin_half"
     android:visibility="gone"
-    app:wheelProgressColor="?colorAccent"
+    app:wheelProgressColor="?colorSecondary"
     app:wheelSecondaryColor="?dividerHorizontal"
     app:wheelThickness="@dimen/margin_eighth"
     app:centerDrawable="@android:color/transparent"
diff --git a/android/app/src/main/res/layout/item_missed_map_group.xml b/android/app/src/main/res/layout/item_missed_map_group.xml
index f6d5d7b38..0075e42bb 100644
--- a/android/app/src/main/res/layout/item_missed_map_group.xml
+++ b/android/app/src/main/res/layout/item_missed_map_group.xml
@@ -17,7 +17,7 @@
     android:layout_centerVertical="true"
     android:layout_marginEnd="@dimen/margin_half"
     android:visibility="gone"
-    app:wheelProgressColor="?colorAccent"
+    app:wheelProgressColor="?colorSecondary"
     app:wheelSecondaryColor="?dividerHorizontal"
     app:wheelThickness="@dimen/margin_eighth"
     app:centerDrawable="@android:color/transparent"
@@ -32,7 +32,7 @@
     android:layout_marginEnd="@dimen/margin_base_plus"
     android:maxLines="1"
     android:textAppearance="@style/MwmTextAppearance.Body1"
-    android:textColor="?colorAccent"
+    android:textColor="?colorSecondary"
     tools:text="256 MB"/>
 
   <com.google.android.material.textview.MaterialTextView
@@ -45,6 +45,6 @@
     android:layout_alignWithParentIfMissing="true"
     android:layout_marginEnd="@dimen/margin_half"
     android:textAppearance="@style/MwmTextAppearance.Body1"
-    android:textColor="?colorAccent"
+    android:textColor="?colorSecondary"
     tools:text="Country name"/>
 </RelativeLayout>
diff --git a/android/app/src/main/res/layout/item_opening_hours.xml b/android/app/src/main/res/layout/item_opening_hours.xml
index 62708cc2f..28390537b 100644
--- a/android/app/src/main/res/layout/item_opening_hours.xml
+++ b/android/app/src/main/res/layout/item_opening_hours.xml
@@ -68,6 +68,6 @@
     android:text="@string/edit_opening_hours"
     android:textAllCaps="true"
     android:textAppearance="@style/MwmTextAppearance.Body1"
-    android:textColor="?colorAccent"/>
+    android:textColor="?colorSecondary"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/item_search_result.xml b/android/app/src/main/res/layout/item_search_result.xml
index 98bc7967a..61868bcf3 100644
--- a/android/app/src/main/res/layout/item_search_result.xml
+++ b/android/app/src/main/res/layout/item_search_result.xml
@@ -68,6 +68,6 @@
     android:layout_alignBaseline="@id/region"
     android:layout_below="@id/description"
     android:textAppearance="@style/MwmTextAppearance.Body3"
-    android:textColor="?colorAccent"
+    android:textColor="?colorSecondary"
     tools:text="500 km"/>
 </RelativeLayout>
diff --git a/android/app/src/main/res/layout/item_search_suggest.xml b/android/app/src/main/res/layout/item_search_suggest.xml
index 967a63867..b8c64011f 100644
--- a/android/app/src/main/res/layout/item_search_suggest.xml
+++ b/android/app/src/main/res/layout/item_search_suggest.xml
@@ -3,7 +3,7 @@
           xmlns:app="http://schemas.android.com/apk/res-auto"
           xmlns:tools="http://schemas.android.com/tools"
           style="@style/MwmWidget.TextView.Search"
-          android:textColor="?colorAccent"
+          android:textColor="?colorSecondary"
           android:textAlignment="viewStart"
           app:drawableStartCompat="@drawable/ic_search"
           tools:text="Some suggest title"/>
diff --git a/android/app/src/main/res/layout/item_timetable.xml b/android/app/src/main/res/layout/item_timetable.xml
index 35a41c25b..cc5b5f042 100644
--- a/android/app/src/main/res/layout/item_timetable.xml
+++ b/android/app/src/main/res/layout/item_timetable.xml
@@ -276,7 +276,7 @@
         android:text="@string/editor_time_add_closed"
         android:textAllCaps="true"
         android:textAppearance="@style/MwmTextAppearance.Body1"
-        android:textColor="?colorAccent"/>
+        android:textColor="?colorSecondary"/>
 
     </LinearLayout>
 
diff --git a/android/app/src/main/res/layout/layout_nav_bottom.xml b/android/app/src/main/res/layout/layout_nav_bottom.xml
index 643d15a3f..99ddc9918 100644
--- a/android/app/src/main/res/layout/layout_nav_bottom.xml
+++ b/android/app/src/main/res/layout/layout_nav_bottom.xml
@@ -26,7 +26,7 @@
       style="@style/Widget.MaterialComponents.LinearProgressIndicator"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      app:indicatorColor="?colorAccent"
+      app:indicatorColor="?colorSecondary"
       app:trackCornerRadius="@dimen/nav_progress_head"
       app:trackThickness="@dimen/nav_progress"
       app:trackColor="@color/bg_routing_progress" />
diff --git a/android/app/src/main/res/layout/onmap_downloader.xml b/android/app/src/main/res/layout/onmap_downloader.xml
index 9d71c51c1..1d7665670 100644
--- a/android/app/src/main/res/layout/onmap_downloader.xml
+++ b/android/app/src/main/res/layout/onmap_downloader.xml
@@ -63,7 +63,7 @@
         android:layout_width="@dimen/downloader_status_size"
         android:layout_height="@dimen/downloader_status_size"
         android:layout_gravity="center"
-        app:wheelProgressColor="?colorAccent"
+        app:wheelProgressColor="?colorSecondary"
         app:wheelSecondaryColor="?dividerHorizontal"
         app:wheelThickness="@dimen/margin_eighth"
         android:visibility="visible"
diff --git a/android/app/src/main/res/layout/place_page_bluesky.xml b/android/app/src/main/res/layout/place_page_bluesky.xml
index a289defed..e463f88f2 100644
--- a/android/app/src/main/res/layout/place_page_bluesky.xml
+++ b/android/app/src/main/res/layout/place_page_bluesky.xml
@@ -13,7 +13,7 @@
     android:id="@+id/iv__place_bluesky"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_bluesky_white"
-    app:tint="?colorAccent"/>
+    app:tint="?colorSecondary"/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_bluesky_page"
diff --git a/android/app/src/main/res/layout/place_page_description_layout.xml b/android/app/src/main/res/layout/place_page_description_layout.xml
index f33131135..39b69d07a 100644
--- a/android/app/src/main/res/layout/place_page_description_layout.xml
+++ b/android/app/src/main/res/layout/place_page_description_layout.xml
@@ -34,7 +34,7 @@
     android:layout_marginBottom="@dimen/margin_base"
     android:textAppearance="?android:attr/textAppearance"
     android:gravity="start|top"
-    android:textColor="?attr/colorAccent"
+    android:textColor="?attr/colorSecondary"
     android:text="@string/category_desc_more"
     android:background="@android:color/transparent"/>
   <include
diff --git a/android/app/src/main/res/layout/place_page_email.xml b/android/app/src/main/res/layout/place_page_email.xml
index 4feb01da5..16d5f8965 100644
--- a/android/app/src/main/res/layout/place_page_email.xml
+++ b/android/app/src/main/res/layout/place_page_email.xml
@@ -12,7 +12,7 @@
     android:id="@+id/iv__place_email"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_email"
-    app:tint="?colorAccent" />
+    app:tint="?colorSecondary" />
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_email"
diff --git a/android/app/src/main/res/layout/place_page_facebook.xml b/android/app/src/main/res/layout/place_page_facebook.xml
index 2175af308..dd0984d83 100644
--- a/android/app/src/main/res/layout/place_page_facebook.xml
+++ b/android/app/src/main/res/layout/place_page_facebook.xml
@@ -11,7 +11,7 @@
     android:id="@+id/iv__place_facebook"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_facebook_white"
-    app:tint="?colorAccent"/>
+    app:tint="?colorSecondary"/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_facebook_page"
diff --git a/android/app/src/main/res/layout/place_page_fediverse.xml b/android/app/src/main/res/layout/place_page_fediverse.xml
index 66f40a0c8..0e0564381 100644
--- a/android/app/src/main/res/layout/place_page_fediverse.xml
+++ b/android/app/src/main/res/layout/place_page_fediverse.xml
@@ -13,7 +13,7 @@
     android:id="@+id/iv__place_fediverse"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_mastodon_white"
-    app:tint="?colorAccent"/>
+    app:tint="?colorSecondary"/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_fediverse_page"
diff --git a/android/app/src/main/res/layout/place_page_instagram.xml b/android/app/src/main/res/layout/place_page_instagram.xml
index afa79eed7..890a228ad 100644
--- a/android/app/src/main/res/layout/place_page_instagram.xml
+++ b/android/app/src/main/res/layout/place_page_instagram.xml
@@ -12,7 +12,7 @@
     android:id="@+id/iv__place_instagram"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_instagram_white"
-    app:tint="?colorAccent"/>
+    app:tint="?colorSecondary"/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_instagram_page"
diff --git a/android/app/src/main/res/layout/place_page_line.xml b/android/app/src/main/res/layout/place_page_line.xml
index 4b64a5573..b0499dc8c 100644
--- a/android/app/src/main/res/layout/place_page_line.xml
+++ b/android/app/src/main/res/layout/place_page_line.xml
@@ -11,7 +11,7 @@
     android:id="@+id/iv__place_line"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_line_white"
-    app:tint="?colorAccent"/>
+    app:tint="?colorSecondary"/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_line_page"
diff --git a/android/app/src/main/res/layout/place_page_open_in.xml b/android/app/src/main/res/layout/place_page_open_in.xml
index f3b3ea501..82880977d 100644
--- a/android/app/src/main/res/layout/place_page_open_in.xml
+++ b/android/app/src/main/res/layout/place_page_open_in.xml
@@ -12,7 +12,7 @@
     android:id="@+id/iv__place_open_in"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_open_in"
-    app:tint="?colorAccent"/>
+    app:tint="?colorSecondary"/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_open_in"
diff --git a/android/app/src/main/res/layout/place_page_panoramax.xml b/android/app/src/main/res/layout/place_page_panoramax.xml
index 5d6710ab6..3cc625558 100644
--- a/android/app/src/main/res/layout/place_page_panoramax.xml
+++ b/android/app/src/main/res/layout/place_page_panoramax.xml
@@ -13,7 +13,7 @@
     android:id="@+id/iv__place_panoramax"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_panoramax"
-    app:tint="?colorAccent"/>
+    app:tint="?colorSecondary"/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_panoramax"
diff --git a/android/app/src/main/res/layout/place_page_phone_item.xml b/android/app/src/main/res/layout/place_page_phone_item.xml
index 5413f0cdb..dd02e0af8 100644
--- a/android/app/src/main/res/layout/place_page_phone_item.xml
+++ b/android/app/src/main/res/layout/place_page_phone_item.xml
@@ -13,7 +13,7 @@
     android:id="@+id/iv__place_phone"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_phone"
-    app:tint="?colorAccent"/>
+    app:tint="?colorSecondary"/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_phone"
diff --git a/android/app/src/main/res/layout/place_page_preview.xml b/android/app/src/main/res/layout/place_page_preview.xml
index c40e48dbf..91c45feb7 100644
--- a/android/app/src/main/res/layout/place_page_preview.xml
+++ b/android/app/src/main/res/layout/place_page_preview.xml
@@ -168,7 +168,7 @@
           android:layout_gravity="center"
           android:scaleType="center"
           app:srcCompat="@drawable/ic_direction_pagepreview"
-          app:tint="?colorAccent" />
+          app:tint="?colorSecondary" />
         <com.google.android.material.textview.MaterialTextView
           android:id="@+id/tv__straight_distance"
           android:layout_width="wrap_content"
diff --git a/android/app/src/main/res/layout/place_page_twitter.xml b/android/app/src/main/res/layout/place_page_twitter.xml
index 2422954d4..aa6a115da 100644
--- a/android/app/src/main/res/layout/place_page_twitter.xml
+++ b/android/app/src/main/res/layout/place_page_twitter.xml
@@ -12,7 +12,7 @@
     android:id="@+id/iv__place_twitter"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_twitterx_white"
-    app:tint="?colorAccent"/>
+    app:tint="?colorSecondary"/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_twitter_page"
diff --git a/android/app/src/main/res/layout/place_page_vk.xml b/android/app/src/main/res/layout/place_page_vk.xml
index a8af9e611..5c8b64b1b 100644
--- a/android/app/src/main/res/layout/place_page_vk.xml
+++ b/android/app/src/main/res/layout/place_page_vk.xml
@@ -12,7 +12,7 @@
     android:id="@+id/iv__place_vk"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_vk_white"
-    app:tint="?colorAccent"/>
+    app:tint="?colorSecondary"/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_vk_page"
diff --git a/android/app/src/main/res/layout/place_page_website.xml b/android/app/src/main/res/layout/place_page_website.xml
index e7cd66fc6..f3f07ea87 100644
--- a/android/app/src/main/res/layout/place_page_website.xml
+++ b/android/app/src/main/res/layout/place_page_website.xml
@@ -12,7 +12,7 @@
     android:id="@+id/iv__place_website"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_website"
-    app:tint="?colorAccent"/>
+    app:tint="?colorSecondary"/>
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_website"
diff --git a/android/app/src/main/res/layout/place_page_website_menu.xml b/android/app/src/main/res/layout/place_page_website_menu.xml
index 379c9dade..78d10f363 100644
--- a/android/app/src/main/res/layout/place_page_website_menu.xml
+++ b/android/app/src/main/res/layout/place_page_website_menu.xml
@@ -12,7 +12,7 @@
     android:id="@+id/iv__place_website_menu"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_website_menu"
-    app:tint="?colorAccent"/>
+    app:tint="?colorSecondary"/>
 
   <LinearLayout
     android:layout_width="match_parent"
diff --git a/android/app/src/main/res/layout/place_page_wikimedia.xml b/android/app/src/main/res/layout/place_page_wikimedia.xml
index 96d1d2b16..8cea26a9d 100644
--- a/android/app/src/main/res/layout/place_page_wikimedia.xml
+++ b/android/app/src/main/res/layout/place_page_wikimedia.xml
@@ -11,7 +11,7 @@
     android:id="@+id/iv__place_wikimedia"
     style="@style/PlacePageMetadataIcon"
     app:srcCompat="@drawable/ic_wikimedia_commons_white"
-    app:tint="?colorAccent" />
+    app:tint="?colorSecondary" />
 
   <com.google.android.material.textview.MaterialTextView
     android:id="@+id/tv__place_wikimedia"
diff --git a/android/app/src/main/res/layout/place_page_wikipedia_fragment.xml b/android/app/src/main/res/layout/place_page_wikipedia_fragment.xml
index 9d2b1e44e..c1d253a78 100644
--- a/android/app/src/main/res/layout/place_page_wikipedia_fragment.xml
+++ b/android/app/src/main/res/layout/place_page_wikipedia_fragment.xml
@@ -15,7 +15,7 @@
       android:id="@+id/iv__place_wiki"
       style="@style/PlacePageMetadataIcon"
       app:srcCompat="@drawable/ic_wiki"
-      app:tint="?colorAccent" />
+      app:tint="?colorSecondary" />
     <com.google.android.material.textview.MaterialTextView
       android:id="@+id/tv__place_wiki"
       android:layout_width="match_parent"
diff --git a/android/app/src/main/res/layout/routing_action_panel.xml b/android/app/src/main/res/layout/routing_action_panel.xml
index 496d8a313..40ade18a9 100644
--- a/android/app/src/main/res/layout/routing_action_panel.xml
+++ b/android/app/src/main/res/layout/routing_action_panel.xml
@@ -19,7 +19,7 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       app:srcCompat="@drawable/ic_search"
-      app:tint="?colorAccent"
+      app:tint="?colorSecondary"
       android:layout_marginStart="@dimen/margin_base"
       android:layout_marginEnd="@dimen/margin_base"/>
     <com.google.android.material.textview.MaterialTextView
@@ -31,7 +31,7 @@
       android:layout_marginEnd="@dimen/margin_base"
       android:layout_marginTop="@dimen/routing_action_panel_margin_vert"
       android:layout_marginBottom="@dimen/routing_action_panel_margin_vert"
-      android:textColor="?colorAccent"
+      android:textColor="?colorSecondary"
       tools:text="Add start point to plan a route."/>
   </LinearLayout>
   <LinearLayout
@@ -55,6 +55,6 @@
       android:layout_height="wrap_content"
       android:layout_margin="@dimen/margin_base"
       app:srcCompat="@drawable/ic_location_crosshair"
-      tools:tint="?colorAccent"/>
+      tools:tint="?colorSecondary"/>
   </LinearLayout>
 </LinearLayout>
diff --git a/android/app/src/main/res/layout/routing_details.xml b/android/app/src/main/res/layout/routing_details.xml
index 50b91bff0..6307d0917 100644
--- a/android/app/src/main/res/layout/routing_details.xml
+++ b/android/app/src/main/res/layout/routing_details.xml
@@ -12,7 +12,7 @@
     android:layout_height="@dimen/altitude_chart_time_distance_height"
     android:textAppearance="@style/MwmTextAppearance.Body3"
     android:fontFamily="@string/robotoMedium"
-    android:textColor="?colorAccent"
+    android:textColor="?colorSecondary"
     android:layout_gravity="end"
     android:gravity="center"
     android:layout_alignParentEnd="true"
diff --git a/android/app/src/main/res/layout/routing_plan.xml b/android/app/src/main/res/layout/routing_plan.xml
index 078a92f0d..86f975c72 100644
--- a/android/app/src/main/res/layout/routing_plan.xml
+++ b/android/app/src/main/res/layout/routing_plan.xml
@@ -48,7 +48,7 @@
               android:layout_marginStart="@dimen/routing_selector_wheel_margin"
               android:contentDescription="@string/vehicle"
               tools:button="@drawable/ic_car"
-              tools:buttonTint="?colorAccent" />
+              tools:buttonTint="?colorSecondary" />
 
           <app.organicmaps.widget.RoutingToolbarButton
               android:id="@+id/pedestrian"
diff --git a/android/app/src/main/res/values-night-v27/themes.xml b/android/app/src/main/res/values-night-v27/themes.xml
index 0d4df4912..87388ede0 100644
--- a/android/app/src/main/res/values-night-v27/themes.xml
+++ b/android/app/src/main/res/values-night-v27/themes.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <style name="MwmTheme.Night.MainActivity">
-        <item name="android:colorPrimaryDark">@android:color/black</item>
+        <item name="colorPrimaryVariant">@android:color/black</item>
         <item name="android:windowBackground">@null</item>
         <item name="android:windowTranslucentNavigation">false</item>
         <!-- Allows to show the app behind the camera notch in landscape and when hiding the status bar -->
diff --git a/android/app/src/main/res/values-night/themes.xml b/android/app/src/main/res/values-night/themes.xml
index 4bab7064b..888d0138e 100644
--- a/android/app/src/main/res/values-night/themes.xml
+++ b/android/app/src/main/res/values-night/themes.xml
@@ -13,7 +13,7 @@
         <item name="android:textColorPrimaryInverse">@color/text_dark</item>
         <item name="android:textColorSecondary">@color/text_light_subtitle</item>
         <item name="android:windowBackground">?windowBackgroundForced</item>
-        <item name="android:colorPrimaryDark">@color/bg_primary_dark_night</item>
+        <item name="colorPrimaryVariant">@color/bg_primary_dark_night</item>
         <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
         <item name="android:fontFamily">@string/robotoRegular</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
@@ -30,7 +30,7 @@
         <item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen.Night</item>
         <item name="colorPrimary">@color/bg_primary_night</item>
         <item name="colorControlNormal">?secondary</item>
-        <item name="colorAccent">@color/base_accent_night</item>
+        <item name="colorSecondary">@color/base_accent_night</item>
         <item name="colorAccentTransparent">@color/base_accent_transparent</item>
         <item name="colorBtnHighlight">@color/white_24</item>
         <item name="panel">@color/bg_panel_night</item>
@@ -132,7 +132,7 @@
 
     <!-- Theme is overridden in v27 folder to handle cutouts -->
     <style name="MwmTheme.Night.MainActivity">
-        <item name="android:colorPrimaryDark">@android:color/black</item>
+        <item name="colorPrimaryVariant">@android:color/black</item>
         <item name="android:windowBackground">@null</item>
         <item name="android:windowTranslucentNavigation">false</item>
     </style>
@@ -147,7 +147,7 @@
     </style>
 
     <style name="MwmTheme.Night.AlertDialog" parent="Theme.MaterialComponents.Dialog.Alert">
-        <item name="colorAccent">?buttonDialogTextColor</item>
+        <item name="colorSecondary">?buttonDialogTextColor</item>
         <item name="colorPrimary">?buttonDialogTextColor</item>
         <item name="android:background">?cardBackground</item>
         <!-- Used for the message in the dialog -->
@@ -163,8 +163,8 @@
 
     <style name="MwmTheme.DialogFragment.Fullscreen.Night" parent="Theme.AppCompat">
         <item name="colorPrimary">@color/bg_primary_night</item>
-        <item name="android:colorPrimaryDark">?statusBar</item>
-        <item name="colorAccent">@color/base_accent_night</item>
+        <item name="colorPrimaryVariant">?statusBar</item>
+        <item name="colorSecondary">@color/base_accent_night</item>
         <item name="clickableBackground">?selectableItemBackground</item>
         <item name="colorControlNormal">@color/text_dark_hint</item>
         <item name="android:windowIsFloating">false</item>
@@ -182,7 +182,7 @@
     </style>
 
     <style name="MwmMain.DialogFragment.TimePicker.Night" parent="Theme.MaterialComponents.Dialog.Alert">
-        <item name="colorAccent">@color/base_accent_night</item>
+        <item name="colorSecondary">@color/base_accent_night</item>
         <item name="colorPrimary">?buttonDialogTextColor</item>
         <item name="android:fontFamily">@string/robotoMedium</item>
         <item name="android:windowBackground">@color/bg_cards_night</item>
diff --git a/android/app/src/main/res/values-v27/themes.xml b/android/app/src/main/res/values-v27/themes.xml
index ff2be3c5e..2965eda39 100644
--- a/android/app/src/main/res/values-v27/themes.xml
+++ b/android/app/src/main/res/values-v27/themes.xml
@@ -2,7 +2,7 @@
 <!-- Cutouts API is available for API >= 27 -->
 <resources>
   <style name="MwmTheme.MainActivity">
-    <item name="android:colorPrimaryDark">@android:color/black</item>
+    <item name="colorPrimaryVariant">@android:color/black</item>
     <item name="android:windowBackground">@null</item>
     <item name="android:windowTranslucentNavigation">false</item>
     <!-- Allows to show the app behind the camera notch in landscape and when hiding the status bar -->
diff --git a/android/app/src/main/res/values/styles-editor.xml b/android/app/src/main/res/values/styles-editor.xml
index e88d81250..b6f80eb52 100644
--- a/android/app/src/main/res/values/styles-editor.xml
+++ b/android/app/src/main/res/values/styles-editor.xml
@@ -38,7 +38,7 @@
     <item name="android:layout_width">wrap_content</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:checked">true</item>
-    <item name="buttonTint">?colorAccent</item>
+    <item name="buttonTint">?colorSecondary</item>
   </style>
 
   <style name="MwmWidget.Editor.DayText">
diff --git a/android/app/src/main/res/values/styles-text.xml b/android/app/src/main/res/values/styles-text.xml
index f5f78b41a..07b1336da 100644
--- a/android/app/src/main/res/values/styles-text.xml
+++ b/android/app/src/main/res/values/styles-text.xml
@@ -95,7 +95,7 @@
 
   <style name="MwmTextAppearance.Button">
     <item name="android:textSize">@dimen/text_size_button</item>
-    <item name="android:textColor">?colorAccent</item>
+    <item name="android:textColor">?colorSecondary</item>
     <item name="android:textAllCaps">true</item>
   </style>
 
@@ -133,7 +133,7 @@
 
   <style name="MwmTextAppearance.NavMenu.Time">
     <item name="android:textSize">@dimen/text_size_nav_menu_number</item>
-    <item name="android:textColor">?colorAccent</item>
+    <item name="android:textColor">?colorSecondary</item>
   </style>
 
   <style name="MwmTextAppearance.NavMenu.Time.Dimension">
@@ -180,7 +180,7 @@
   <style name="MwmTextAppearance.PlacePage" parent="MwmTextAppearance.Body1"/>
 
   <style name="MwmTextAppearance.PlacePage.Accent">
-    <item name="android:textColor">?colorAccent</item>
+    <item name="android:textColor">?colorSecondary</item>
   </style>
 
   <style name="MwmTextAppearance.Tab" parent="MwmTextAppearance.Body3">
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index ec0e062e1..cdba5938c 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -144,18 +144,18 @@
 
   <style name="MwmWidget.ToolbarTheme" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
     <item name="android:gravity">center_vertical</item>
-    <item name="colorAccent">@android:color/white</item>
+    <item name="colorSecondary">@android:color/white</item>
     <item name="iconTint">@color/white_primary</item>
   </style>
 
   <style name="MwmWidget.ToolbarTheme.Light" parent="MwmWidget.ToolbarTheme">
     <item name="android:gravity">center_vertical</item>
-    <item name="colorAccent">@color/bg_window_night</item>
+    <item name="colorSecondary">@color/bg_window_night</item>
   </style>
 
   <style name="MwmWidget.ToolbarTheme.Transparent" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
     <item name="android:gravity">center_vertical</item>
-    <item name="colorAccent">@android:color/white</item>
+    <item name="colorSecondary">@android:color/white</item>
     <item name="android:windowActionBarOverlay">true</item>
     <item name="windowActionBarOverlay">true</item>
   </style>
@@ -164,7 +164,7 @@
     name="MwmWidget.ToolbarTheme.DownButton"
     parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
     <item name="android:gravity">center_vertical</item>
-    <item name="colorAccent">@android:color/white</item>
+    <item name="colorSecondary">@android:color/white</item>
     <item name="android:homeAsUpIndicator">@drawable/ic_down</item>
   </style>
 
@@ -364,7 +364,7 @@
     <item name="iconSize">20dp</item>
     <item name="iconTint">?accentButtonTextColor</item>
     <item name="android:textColor">?accentButtonTextColor</item>
-    <item name="backgroundTint">?colorAccent</item>
+    <item name="backgroundTint">?colorSecondary</item>
     <item name="android:textSize">14sp</item>
     <item name="textAllCaps">false</item>
     <item name="android:textAllCaps">false</item>
diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml
index 640a81f0e..2649b6a62 100644
--- a/android/app/src/main/res/values/themes.xml
+++ b/android/app/src/main/res/values/themes.xml
@@ -13,7 +13,7 @@
     <item name="android:textColorPrimaryInverse">@color/text_light</item>
     <item name="android:textColorSecondary">@color/text_dark_subtitle</item>
     <item name="android:windowBackground">?windowBackgroundForced</item>
-    <item name="android:colorPrimaryDark">@color/bg_primary_dark</item>
+    <item name="colorPrimaryVariant">@color/bg_primary_dark</item>
     <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
     <item name="android:colorBackgroundCacheHint">@null</item>
@@ -28,7 +28,7 @@
     <item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen</item>
     <item name="colorPrimary">@color/bg_primary</item>
     <item name="colorControlNormal">?secondary</item>
-    <item name="colorAccent">@color/base_accent</item>
+    <item name="colorSecondary">@color/base_accent</item>
     <item name="colorAccentTransparent">@color/base_accent_transparent</item>
     <item name="colorBtnHighlight">@color/white_38</item>
     <item name="panel">@color/bg_panel</item>
@@ -146,7 +146,7 @@
 
   <!-- Theme is overridden in v27 folder to handle cutouts -->
   <style name="MwmTheme.MainActivity">
-    <item name="android:colorPrimaryDark">@android:color/black</item>
+    <item name="colorPrimaryVariant">@android:color/black</item>
     <item name="android:windowBackground">@null</item>
     <item name="android:windowTranslucentNavigation">false</item>
   </style>
@@ -165,7 +165,7 @@
   </style>
 
   <style name="MwmTheme.AlertDialog" parent="Theme.MaterialComponents.Light.Dialog.Alert">
-    <item name="colorAccent">?buttonDialogTextColor</item>
+    <item name="colorSecondary">?buttonDialogTextColor</item>
     <item name="colorPrimary">?buttonDialogTextColor</item>
     <item name="android:background">?cardBackground</item>
     <item name="android:textColorPrimary">?textDialogTheme</item>
@@ -184,8 +184,8 @@
 
   <style name="MwmTheme.DialogFragment.Fullscreen" parent="Theme.AppCompat.Light">
     <item name="colorPrimary">@color/bg_primary</item>
-    <item name="android:colorPrimaryDark">?statusBar</item>
-    <item name="colorAccent">@color/base_accent</item>
+    <item name="colorPrimaryVariant">?statusBar</item>
+    <item name="colorSecondary">@color/base_accent</item>
     <item name="clickableBackground">?selectableItemBackground</item>
     <item name="colorControlNormal">@color/text_light_hint</item>
     <item name="android:windowIsFloating">false</item>
@@ -203,14 +203,14 @@
   </style>
 
   <style name="MwmTheme.DialogFragment.Fullscreen.Translucent">
-    <item name="android:colorPrimaryDark">@android:color/black</item>
+    <item name="colorPrimaryVariant">@android:color/black</item>
     <item name="android:windowBackground">@color/bg_dialog_translucent</item>
     <item name="android:windowIsTranslucent">true</item>
     <item name="android:navigationBarColor">@android:color/transparent</item>
   </style>
 
   <style name="MwmMain.DialogFragment.TimePicker" parent="Theme.MaterialComponents.Light.Dialog.Alert">
-    <item name="colorAccent">@color/base_accent</item>
+    <item name="colorSecondary">@color/base_accent</item>
     <item name="colorPrimary">?buttonDialogTextColor</item>
     <item name="android:fontFamily">@string/robotoMedium</item>
     <item name="android:windowBackground">@color/bg_cards</item>

From 705c715356eaf00c86c989f6396144bf581bc616 Mon Sep 17 00:00:00 2001
From: hb0nd <me@hbond.xyz>
Date: Sat, 16 Aug 2025 19:48:29 +0200
Subject: [PATCH 025/302] [docs] Make funding section sound less threatening
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently, it sounds like a threat to make it paid etc unless people donate 😅

Signed-off-by: hb0nd <me@hbond.xyz>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index bb8cf175c..f73eca5c6 100644
--- a/README.md
+++ b/README.md
@@ -140,7 +140,7 @@ There is a dedicated [Zulip](https://codeberg.org/comaps/Governance/src/branch/m
 
 ## 💸 Funding
 
-CoMaps is free. To stay that way, it relies on your support.  
+CoMaps is free. To fund development, we rely on your voluntary support ♥️
 Donate via [OpenCollective](https://opencollective.com/comaps/donate) or [Liberapay](https://liberapay.com/CoMaps).  
 The project's financial information is completely open and transparent at [our Open Collective](https://opencollective.com/comaps).
 

From b23c2ba3e3c19b17c2137ff4bff7ae2c0a74bbf2 Mon Sep 17 00:00:00 2001
From: renderexpert <expert@renderconsulting.co.uk>
Date: Mon, 20 Jan 2025 11:05:45 +0000
Subject: [PATCH 026/302] [Drape] Remove GLES2-related code

Signed-off-by: renderexpert <expert@renderconsulting.co.uk>
---
 .../cpp/app/organicmaps/sdk/Framework.cpp     |   3 +-
 .../sdk/opengl/androidoglcontext.cpp          |  12 +-
 .../sdk/opengl/androidoglcontext.hpp          |   2 +-
 .../sdk/opengl/androidoglcontextfactory.cpp   |  60 +---
 .../sdk/opengl/androidoglcontextfactory.hpp   |   3 -
 iphone/Maps/Classes/EAGLView.mm               |   2 +-
 iphone/Maps/Classes/iosOGLContext.mm          |  10 +-
 libs/drape/data_buffer.cpp                    |   2 +-
 libs/drape/drape_global.hpp                   |   5 -
 libs/drape/drape_tests/font_texture_tests.cpp |   2 +-
 .../drape_tests/testing_graphics_context.hpp  |   4 +-
 libs/drape/font_texture.hpp                   |   2 +-
 libs/drape/framebuffer.cpp                    |   2 +-
 libs/drape/gl_extensions_list.cpp             |  61 +---
 libs/drape/gl_extensions_list.hpp             |   5 +-
 libs/drape/gl_functions.cpp                   | 284 +++++++-----------
 libs/drape/gpu_buffer.cpp                     |  25 +-
 libs/drape/hw_texture.cpp                     |  12 +-
 libs/drape/hw_texture_ios.mm                  |   2 +-
 libs/drape/index_storage.cpp                  |   2 +-
 libs/drape/mesh_object.cpp                    |  59 +---
 libs/drape/metal/metal_texture.mm             |   2 +-
 libs/drape/render_state.cpp                   |   8 +-
 libs/drape/stipple_pen_resource.cpp           |   2 +-
 libs/drape/stipple_pen_resource.hpp           |   2 +-
 libs/drape/support_manager.cpp                |   2 +-
 libs/drape/texture_manager.cpp                |  21 +-
 libs/drape/texture_types.hpp                  |   6 +-
 libs/drape/vertex_array_buffer.cpp            |  20 +-
 libs/drape/vulkan/vulkan_utils.cpp            |   2 +-
 libs/drape_frontend/arrow3d.cpp               |   2 +-
 libs/drape_frontend/frontend_renderer.cpp     |   4 +-
 libs/drape_frontend/gui/layer_render.cpp      |   1 -
 libs/drape_frontend/postprocess_renderer.cpp  |  13 +-
 libs/map/framework.hpp                        |   2 +-
 libs/qt_tstfrm/test_main_loop.cpp             |  17 +-
 libs/qt_tstfrm/test_main_loop.hpp             |   4 +-
 libs/shaders/gl_shaders_preprocessor.py       |   9 +-
 libs/shaders/program_manager.cpp              |   2 +-
 .../shaders_tests/gl_program_params_tests.cpp |  74 ++---
 .../gl_shaders_desktop_compile_tests.cpp      |  24 +-
 .../gl_shaders_mobile_compile_test.cpp        |  26 --
 qt/qt_common/map_widget.cpp                   |  29 +-
 qt/qt_common/map_widget.hpp                   |   1 -
 qt/qt_common/res/resources_common.qrc         |   2 -
 qt/qt_common/res/shaders/gles_200.fsh.glsl    |  15 -
 qt/qt_common/res/shaders/gles_200.vsh.glsl    |   9 -
 47 files changed, 235 insertions(+), 623 deletions(-)
 delete mode 100644 qt/qt_common/res/shaders/gles_200.fsh.glsl
 delete mode 100644 qt/qt_common/res/shaders/gles_200.vsh.glsl

diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.cpp
index 5152a4bf7..8eed02401 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.cpp
@@ -229,8 +229,7 @@ bool Framework::CreateDrapeEngine(JNIEnv * env, jobject jSurface, int densityDpi
       LOG(LWARNING, ("Invalid GL context."));
       return false;
     }
-    p.m_apiVersion = oglFactory->IsSupportedOpenGLES3() ? dp::ApiVersion::OpenGLES3 :
-                                                          dp::ApiVersion::OpenGLES2;
+    p.m_apiVersion = dp::ApiVersion::OpenGLES3;
     p.m_surfaceWidth = oglFactory->GetWidth();
     p.m_surfaceHeight = oglFactory->GetHeight();
 
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontext.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontext.cpp
index 0c7376121..bfe5b3841 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontext.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontext.cpp
@@ -8,20 +8,16 @@
 namespace android
 {
 
-static EGLint * getContextAttributesList(bool supportedES3)
+static EGLint * getContextAttributesList()
 {
   static EGLint contextAttrList[] = {
-    EGL_CONTEXT_CLIENT_VERSION, 2,
-    EGL_NONE
-  };
-  static EGLint contextAttrListES3[] = {
     EGL_CONTEXT_CLIENT_VERSION, 3,
     EGL_NONE
   };
-  return supportedES3 ? contextAttrListES3 : contextAttrList;
+  return contextAttrList;
 }
 
-AndroidOGLContext::AndroidOGLContext(bool supportedES3, EGLDisplay display, EGLSurface surface,
+AndroidOGLContext::AndroidOGLContext(EGLDisplay display, EGLSurface surface,
                                      EGLConfig config, AndroidOGLContext * contextToShareWith)
   : m_nativeContext(EGL_NO_CONTEXT)
   , m_surface(surface)
@@ -32,7 +28,7 @@ AndroidOGLContext::AndroidOGLContext(bool supportedES3, EGLDisplay display, EGLS
   ASSERT(m_display != EGL_NO_DISPLAY, ());
 
   EGLContext sharedContext = (contextToShareWith == NULL) ? EGL_NO_CONTEXT : contextToShareWith->m_nativeContext;
-  m_nativeContext = eglCreateContext(m_display, config, sharedContext, getContextAttributesList(supportedES3));
+  m_nativeContext = eglCreateContext(m_display, config, sharedContext, getContextAttributesList());
   CHECK(m_nativeContext != EGL_NO_CONTEXT, ());
 }
 
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontext.hpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontext.hpp
index 385d80154..6f7885b64 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontext.hpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontext.hpp
@@ -10,7 +10,7 @@ namespace android
 class AndroidOGLContext : public dp::OGLContext
 {
 public:
-  AndroidOGLContext(bool supportedES3, EGLDisplay display, EGLSurface surface,
+  AndroidOGLContext(EGLDisplay display, EGLSurface surface,
                     EGLConfig config, AndroidOGLContext * contextToShareWith);
   ~AndroidOGLContext();
 
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontextfactory.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontextfactory.cpp
index 0d7a73e31..4cdedf081 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontextfactory.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontextfactory.cpp
@@ -16,26 +16,13 @@
 
 #define EGL_OPENGL_ES3_BIT 0x00000040
 
-int constexpr kMinSdkVersionForES3 = 21;
-
 namespace android
 {
 namespace
 {
-static EGLint * getConfigAttributesListRGB8(bool supportedES3)
+static EGLint * getConfigAttributesListRGB8()
 {
   static EGLint attr_list[] = {
-    EGL_RED_SIZE, 8,
-    EGL_GREEN_SIZE, 8,
-    EGL_BLUE_SIZE, 8,
-    EGL_ALPHA_SIZE, 0,
-    EGL_STENCIL_SIZE, 0,
-    EGL_DEPTH_SIZE, 16,
-    EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
-    EGL_SURFACE_TYPE, EGL_PBUFFER_BIT | EGL_WINDOW_BIT,
-    EGL_NONE
-  };
-  static EGLint attr_list_es3[] = {
     EGL_RED_SIZE, 8,
     EGL_GREEN_SIZE, 8,
     EGL_BLUE_SIZE, 8,
@@ -46,33 +33,16 @@ static EGLint * getConfigAttributesListRGB8(bool supportedES3)
     EGL_SURFACE_TYPE, EGL_PBUFFER_BIT | EGL_WINDOW_BIT,
     EGL_NONE
   };
-  return supportedES3 ? attr_list_es3 : attr_list;
+  return attr_list;
 }
 
 int const kMaxConfigCount = 40;
 
-static EGLint * getConfigAttributesListR5G6B5()
-{
-  // We do not support OpenGL ES3 for R5G6B5, because some Android devices
-  // are not able to create OpenGL context in such mode.
-  static EGLint attr_list[] = {
-    EGL_RED_SIZE, 5,
-    EGL_GREEN_SIZE, 6,
-    EGL_BLUE_SIZE, 5,
-    EGL_STENCIL_SIZE, 0,
-    EGL_DEPTH_SIZE, 16,
-    EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
-    EGL_SURFACE_TYPE, EGL_PBUFFER_BIT | EGL_WINDOW_BIT,
-    EGL_NONE
-  };
-  return attr_list;
-}
-
-bool IsSupportedRGB8(EGLDisplay display, bool es3)
+bool IsSupportedRGB8(EGLDisplay display)
 {
   EGLConfig configs[kMaxConfigCount];
   int count = 0;
-  return eglChooseConfig(display, getConfigAttributesListRGB8(es3), configs,
+  return eglChooseConfig(display, getConfigAttributesListRGB8(), configs,
                          kMaxConfigCount, &count) == EGL_TRUE && count != 0;
 }
 
@@ -90,7 +60,6 @@ AndroidOGLContextFactory::AndroidOGLContextFactory(JNIEnv * env, jobject jsurfac
   , m_surfaceWidth(0)
   , m_surfaceHeight(0)
   , m_windowSurfaceValid(false)
-  , m_supportedES3(false)
 {
   m_display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
   if (m_display == EGL_NO_DISPLAY)
@@ -106,10 +75,7 @@ AndroidOGLContextFactory::AndroidOGLContextFactory(JNIEnv * env, jobject jsurfac
     return;
   }
 
-  // Check ES3 availability.
-  bool const isES3Supported = IsSupportedRGB8(m_display, true /* es3 */) &&
-             android_get_device_api_level() >= kMinSdkVersionForES3;
-  m_supportedES3 = isES3Supported && gl3stubInit();
+  CHECK(gl3stubInit(), ("Could not initialize OpenGL ES3"));
 
   SetSurface(env, jsurface);
 
@@ -266,7 +232,7 @@ dp::GraphicsContext * AndroidOGLContextFactory::GetDrawContext()
   ASSERT(m_windowSurface != EGL_NO_SURFACE, ());
   if (m_drawContext == nullptr)
   {
-    m_drawContext = new AndroidOGLContext(m_supportedES3, m_display, m_windowSurface,
+    m_drawContext = new AndroidOGLContext(m_display, m_windowSurface,
                                           m_config, m_uploadContext);
   }
   return m_drawContext;
@@ -278,7 +244,7 @@ dp::GraphicsContext * AndroidOGLContextFactory::GetResourcesUploadContext()
   ASSERT(m_pixelbufferSurface != EGL_NO_SURFACE, ());
   if (m_uploadContext == nullptr)
   {
-    m_uploadContext = new AndroidOGLContext(m_supportedES3, m_display, m_pixelbufferSurface,
+    m_uploadContext = new AndroidOGLContext(m_display, m_pixelbufferSurface,
                                             m_config, m_drawContext);
   }
   return m_uploadContext;
@@ -322,17 +288,15 @@ bool AndroidOGLContextFactory::CreateWindowSurface()
 {
   EGLConfig configs[kMaxConfigCount];
   int count = 0;
-  if (eglChooseConfig(m_display, getConfigAttributesListRGB8(m_supportedES3), configs,
-                      kMaxConfigCount, &count) != EGL_TRUE)
+  if (eglChooseConfig(m_display, getConfigAttributesListRGB8(), configs,
+                      kMaxConfigCount, &count) == EGL_TRUE)
   {
-    ASSERT(!m_supportedES3, ());
-    VERIFY(eglChooseConfig(m_display, getConfigAttributesListR5G6B5(), configs,
-                                      kMaxConfigCount, &count) == EGL_TRUE, ());
-    LOG(LDEBUG, ("Backbuffer format: R5G6B5"));
+    CHECK(IsSupportedRGB8(m_display), ("RGB8 is not suported on this device"));
+    LOG(LDEBUG, ("Backbuffer format: RGB8"));
   }
   else
   {
-    LOG(LDEBUG, ("Backbuffer format: RGB8"));
+    CHECK(false, ("OpenGL ES3 is not supported"));
   }
   ASSERT(count > 0, ("Didn't find any configs."));
 
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontextfactory.hpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontextfactory.hpp
index 17e9e0b8a..44015dcb0 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontextfactory.hpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontextfactory.hpp
@@ -33,8 +33,6 @@ public:
   int GetHeight() const;
   void UpdateSurfaceSize(int w, int h);
 
-  bool IsSupportedOpenGLES3() const { return m_supportedES3; }
-
 private:
   bool QuerySurfaceSize();
 
@@ -56,7 +54,6 @@ private:
   int m_surfaceHeight;
 
   bool m_windowSurfaceValid;
-  bool m_supportedES3;
 
   bool m_isInitialized = false;
   size_t m_initializationCounter = 0;
diff --git a/iphone/Maps/Classes/EAGLView.mm b/iphone/Maps/Classes/EAGLView.mm
index 7a0ae3730..c681bd86d 100644
--- a/iphone/Maps/Classes/EAGLView.mm
+++ b/iphone/Maps/Classes/EAGLView.mm
@@ -81,7 +81,7 @@ double getExactDPI(double contentScaleFactor)
     if (tempContext != nil)
       apiVersion = dp::ApiVersion::OpenGLES3;
     else
-      apiVersion = dp::ApiVersion::OpenGLES2;
+      CHECK(false, ("OpenGL ES3 is not supported"));
   }
   
   return apiVersion;
diff --git a/iphone/Maps/Classes/iosOGLContext.mm b/iphone/Maps/Classes/iosOGLContext.mm
index ec18d14c8..04b86cb0d 100644
--- a/iphone/Maps/Classes/iosOGLContext.mm
+++ b/iphone/Maps/Classes/iosOGLContext.mm
@@ -17,20 +17,14 @@ iosOGLContext::iosOGLContext(CAEAGLLayer * layer, dp::ApiVersion apiVersion,
   , m_frameBufferId(0)
   , m_presentAvailable(true)
 {
-  EAGLRenderingAPI api;
-  if (m_apiVersion == dp::ApiVersion::OpenGLES3)
-    api = kEAGLRenderingAPIOpenGLES3;
-  else
-    api = kEAGLRenderingAPIOpenGLES2;
-  
   if (contextToShareWith != NULL)
   {
-    m_nativeContext = [[EAGLContext alloc] initWithAPI:api
+    m_nativeContext = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES3
                                            sharegroup: contextToShareWith->m_nativeContext.sharegroup];
   }
   else
   {
-    m_nativeContext = [[EAGLContext alloc] initWithAPI:api];
+    m_nativeContext = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES3];
   }
 }
 
diff --git a/libs/drape/data_buffer.cpp b/libs/drape/data_buffer.cpp
index 8040056cc..878757782 100644
--- a/libs/drape/data_buffer.cpp
+++ b/libs/drape/data_buffer.cpp
@@ -21,7 +21,7 @@ void DataBuffer::MoveToGPU(ref_ptr<GraphicsContext> context, GPUBuffer::Target t
   uint32_t const currentSize = m_impl->GetCurrentSize();
 
   auto const apiVersion = context->GetApiVersion();
-  if (apiVersion == dp::ApiVersion::OpenGLES2 || apiVersion == dp::ApiVersion::OpenGLES3)
+  if (apiVersion == dp::ApiVersion::OpenGLES3)
   {
     if (currentSize != 0)
     {
diff --git a/libs/drape/drape_global.hpp b/libs/drape/drape_global.hpp
index d0f449483..3939ad942 100644
--- a/libs/drape/drape_global.hpp
+++ b/libs/drape/drape_global.hpp
@@ -26,7 +26,6 @@ namespace dp
 enum class ApiVersion
 {
   Invalid = -1,
-  OpenGLES2 = 0,
   OpenGLES3,
   Metal,
   Vulkan
@@ -101,7 +100,6 @@ inline std::string DebugPrint(dp::ApiVersion apiVersion)
   switch (apiVersion)
   {
   case dp::ApiVersion::Invalid: return "Invalid";
-  case dp::ApiVersion::OpenGLES2: return "OpenGLES2";
   case dp::ApiVersion::OpenGLES3: return "OpenGLES3";
   case dp::ApiVersion::Metal: return "Metal";
   case dp::ApiVersion::Vulkan: return "Vulkan";
@@ -121,9 +119,6 @@ inline dp::ApiVersion ApiVersionFromString(std::string const & str)
     return dp::ApiVersion::Vulkan;
 #endif
 
-  if (str == "OpenGLES2")
-    return dp::ApiVersion::OpenGLES2;
-
   if (str == "OpenGLES3")
     return dp::ApiVersion::OpenGLES3;
 
diff --git a/libs/drape/drape_tests/font_texture_tests.cpp b/libs/drape/drape_tests/font_texture_tests.cpp
index 6eade2b5a..72e6f0ba8 100644
--- a/libs/drape/drape_tests/font_texture_tests.cpp
+++ b/libs/drape/drape_tests/font_texture_tests.cpp
@@ -107,7 +107,7 @@ UNIT_TEST(UploadingGlyphs)
   TestingGraphicsContext context;
   Texture::Params p;
   p.m_allocator = GetDefaultAllocator(make_ref(&context));
-  p.m_format = dp::TextureFormat::Alpha;
+  p.m_format = dp::TextureFormat::Red;
   p.m_width = p.m_height = kTextureSize;
 
   DummyTexture tex;
diff --git a/libs/drape/drape_tests/testing_graphics_context.hpp b/libs/drape/drape_tests/testing_graphics_context.hpp
index 95b9580c3..e7f3d1da7 100644
--- a/libs/drape/drape_tests/testing_graphics_context.hpp
+++ b/libs/drape/drape_tests/testing_graphics_context.hpp
@@ -2,7 +2,7 @@
 
 #include "drape/graphics_context.hpp"
 
-// Testing context simulates OpenGLES2 API version.
+// Testing context simulates OpenGLES3 API version.
 class TestingGraphicsContext : public dp::GraphicsContext
 {
 public:
@@ -38,5 +38,5 @@ public:
   void SetCullingEnabled(bool enabled) override {}
 
 private:
-  dp::ApiVersion m_apiVersion = dp::ApiVersion::OpenGLES2;
+  dp::ApiVersion m_apiVersion = dp::ApiVersion::OpenGLES3;
 };
diff --git a/libs/drape/font_texture.hpp b/libs/drape/font_texture.hpp
index ac25ad094..b658ba0dc 100644
--- a/libs/drape/font_texture.hpp
+++ b/libs/drape/font_texture.hpp
@@ -81,7 +81,7 @@ public:
   FontTexture(m2::PointU const & size, ref_ptr<GlyphManager> glyphMng, ref_ptr<HWTextureAllocator> allocator)
     : m_index(size, glyphMng)
   {
-    DynamicTextureParams const params{size, TextureFormat::Alpha, TextureFilter::Linear, true /* m_usePixelBuffer */};
+    DynamicTextureParams const params{size, TextureFormat::Red, TextureFilter::Linear, true /* m_usePixelBuffer */};
     Init(allocator, make_ref(&m_index), params);
   }
 
diff --git a/libs/drape/framebuffer.cpp b/libs/drape/framebuffer.cpp
index 72b6d098b..c2b5f4f99 100644
--- a/libs/drape/framebuffer.cpp
+++ b/libs/drape/framebuffer.cpp
@@ -134,7 +134,7 @@ void Framebuffer::SetSize(ref_ptr<dp::GraphicsContext> context, uint32_t width,
     m_depthStencilRef->SetSize(context, m_width, m_height);
 
   auto const apiVersion = context->GetApiVersion();
-  if (apiVersion == dp::ApiVersion::OpenGLES2 || apiVersion == dp::ApiVersion::OpenGLES3)
+  if (apiVersion == dp::ApiVersion::OpenGLES3)
   {
     glConst depthAttachmentId = 0;
     glConst stencilAttachmentId = 0;
diff --git a/libs/drape/gl_extensions_list.cpp b/libs/drape/gl_extensions_list.cpp
index bd80605cf..a616d232d 100644
--- a/libs/drape/gl_extensions_list.cpp
+++ b/libs/drape/gl_extensions_list.cpp
@@ -7,67 +7,14 @@
 
 namespace dp
 {
-void GLExtensionsList::Init(dp::ApiVersion apiVersion)
+void GLExtensionsList::Init()
 {
-#if defined(OMIM_OS_MOBILE)
-  if (apiVersion == dp::ApiVersion::OpenGLES2)
-  {
 #ifdef OMIM_OS_ANDROID
-    SetExtension(VertexArrayObject, false);
-    // On some Android devices glMapBufferRange/glMapBuffer works very slow.
-    // We have to substitute these functions to glBufferData/glBufferSubData.
-    SetExtension(MapBuffer, false);
-    SetExtension(MapBufferRange, false);
-#else
-    CheckExtension(VertexArrayObject, "GL_OES_vertex_array_object");
-    CheckExtension(MapBuffer, "GL_OES_mapbuffer");
-    CheckExtension(MapBufferRange, "GL_EXT_map_buffer_range");
-#endif
-    CheckExtension(UintIndices, "GL_OES_element_index_uint");
-  }
-  else
-  {
-#ifdef OMIM_OS_ANDROID
-    SetExtension(MapBuffer, false);
-    SetExtension(MapBufferRange, false);
-#else
-    SetExtension(MapBuffer, true);
-    SetExtension(MapBufferRange, true);
-#endif
-    SetExtension(VertexArrayObject, true);
-    SetExtension(UintIndices, true);
-  }
-#elif defined(OMIM_OS_LINUX)
-  SetExtension(MapBuffer, true);
-  SetExtension(UintIndices, true);
-  SetExtension(VertexArrayObject, true);
-  SetExtension(MapBufferRange, true);
-#elif defined(OMIM_OS_WINDOWS)
-  SetExtension(MapBuffer, true);
-  SetExtension(UintIndices, true);
-  if (apiVersion == dp::ApiVersion::OpenGLES2)
-  {
-    SetExtension(VertexArrayObject, false);
-    SetExtension(MapBufferRange, false);
-  }
-  else
-  {
-    SetExtension(VertexArrayObject, true);
-    SetExtension(MapBufferRange, true);
-  }
+  // NOTE: MapBuffer/MapBufferRange are disabled by performance reasons according to
+  // https://github.com/organicmaps/organicmaps/commit/d72ab7c8cd8be0eb5a622d9d33ae943b391d5707
+  SetExtension(MapBuffer, false);
 #else
   SetExtension(MapBuffer, true);
-  SetExtension(UintIndices, true);
-  if (apiVersion == dp::ApiVersion::OpenGLES2)
-  {
-    CheckExtension(VertexArrayObject, "GL_APPLE_vertex_array_object");
-    SetExtension(MapBufferRange, false);
-  }
-  else
-  {
-    SetExtension(VertexArrayObject, true);
-    SetExtension(MapBufferRange, true);
-  }
 #endif
 }
 
diff --git a/libs/drape/gl_extensions_list.hpp b/libs/drape/gl_extensions_list.hpp
index c5fb4dfc1..c962c0714 100644
--- a/libs/drape/gl_extensions_list.hpp
+++ b/libs/drape/gl_extensions_list.hpp
@@ -14,14 +14,11 @@ class GLExtensionsList
 public:
   enum ExtensionName
   {
-    VertexArrayObject,
     MapBuffer,
-    UintIndices,
-    MapBufferRange
   };
 
   GLExtensionsList() = default;
-  void Init(dp::ApiVersion apiVersion);
+  void Init();
   bool IsSupported(ExtensionName extName) const;
 
 private:
diff --git a/libs/drape/gl_functions.cpp b/libs/drape/gl_functions.cpp
index 0a7bd3372..2abd199f8 100644
--- a/libs/drape/gl_functions.cpp
+++ b/libs/drape/gl_functions.cpp
@@ -244,71 +244,18 @@ void GLFunctions::Init(dp::ApiVersion apiVersion)
     return;
 
   CurrentApiVersion = apiVersion;
-  ExtensionsList.Init(apiVersion);
+  ExtensionsList.Init();
   s_inited = true;
 
-/// VAO
 #if !defined(OMIM_OS_WINDOWS)
-  if (CurrentApiVersion == dp::ApiVersion::OpenGLES2)
-  {
-#if defined(OMIM_OS_MAC)
-
-    glGenVertexArraysFn = &glGenVertexArraysAPPLE;
-    glBindVertexArrayFn = &glBindVertexArrayAPPLE;
-    glDeleteVertexArrayFn = &glDeleteVertexArraysAPPLE;
-    glMapBufferFn = &::glMapBuffer;
-    glUnmapBufferFn = &::glUnmapBuffer;
-
-#elif defined(OMIM_OS_LINUX)
-    void *libhandle = dlopen("libGL.so.1", RTLD_LAZY);
-    if (!libhandle)
-      LOG(LCRITICAL, ("Failed to open libGL.so.1:", dlerror()));
-    glGenVertexArraysFn = (TglGenVertexArraysFn)dlsym(libhandle,"glGenVertexArraysOES");
-    glBindVertexArrayFn = (TglBindVertexArrayFn)dlsym(libhandle, "glBindVertexArrayOES");
-    glDeleteVertexArrayFn = (TglDeleteVertexArrayFn)dlsym(libhandle,"glDeleteVertexArraysOES");
-    glMapBufferFn = (TglMapBufferFn)dlsym(libhandle, "glMapBufferOES");
-    glUnmapBufferFn = (TglUnmapBufferFn)dlsym(libhandle, "glUnmapBufferOES");
-    glMapBufferRangeFn = (TglMapBufferRangeFn)dlsym(libhandle, "glMapBufferRangeEXT");
-    glFlushMappedBufferRangeFn =
-        (TglFlushMappedBufferRangeFn)dlsym(libhandle, "glFlushMappedBufferRangeEXT");
-
-#elif defined(OMIM_OS_ANDROID)
-
-    glGenVertexArraysFn = (TglGenVertexArraysFn)eglGetProcAddress("glGenVertexArraysOES");
-    glBindVertexArrayFn = (TglBindVertexArrayFn)eglGetProcAddress("glBindVertexArrayOES");
-    glDeleteVertexArrayFn = (TglDeleteVertexArrayFn)eglGetProcAddress("glDeleteVertexArraysOES");
-    glMapBufferFn = &::glMapBufferOES;
-    glUnmapBufferFn = &::glUnmapBufferOES;
-    glMapBufferRangeFn = (TglMapBufferRangeFn)eglGetProcAddress("glMapBufferRangeEXT");
-    glFlushMappedBufferRangeFn =
-        (TglFlushMappedBufferRangeFn)eglGetProcAddress("glFlushMappedBufferRangeEXT");
-
-#elif defined(OMIM_OS_MOBILE)
-
-    glGenVertexArraysFn = &glGenVertexArraysOES;
-    glBindVertexArrayFn = &glBindVertexArrayOES;
-    glDeleteVertexArrayFn = &glDeleteVertexArraysOES;
-    glMapBufferFn = &::glMapBufferOES;
-    glUnmapBufferFn = &::glUnmapBufferOES;
-    glMapBufferRangeFn = &::glMapBufferRangeEXT;
-    glFlushMappedBufferRangeFn = &::glFlushMappedBufferRangeEXT;
-#endif  // #if defined(OMIM_OS_MAC)
-  }
-  else if (CurrentApiVersion == dp::ApiVersion::OpenGLES3)
-  {
-    // OpenGL ES3 api is the same for all systems, except WINDOWS.
-    glGenVertexArraysFn = ::glGenVertexArrays;
-    glBindVertexArrayFn = ::glBindVertexArray;
-    glDeleteVertexArrayFn = ::glDeleteVertexArrays;
-    glUnmapBufferFn = ::glUnmapBuffer;
-    glMapBufferRangeFn = ::glMapBufferRange;
-    glFlushMappedBufferRangeFn = ::glFlushMappedBufferRange;
-    glGetStringiFn = ::glGetStringi;
-  }
-  else
-  {
-    CHECK(false, ("Unknown Graphics API"));
-  }
+  // OpenGL ES3 api is the same for all systems, except WINDOWS.
+  glGenVertexArraysFn = ::glGenVertexArrays;
+  glBindVertexArrayFn = ::glBindVertexArray;
+  glDeleteVertexArrayFn = ::glDeleteVertexArrays;
+  glUnmapBufferFn = ::glUnmapBuffer;
+  glMapBufferRangeFn = ::glMapBufferRange;
+  glFlushMappedBufferRangeFn = ::glFlushMappedBufferRange;
+  glGetStringiFn = ::glGetStringi;
 
   glClearColorFn = LOAD_GL_FUNC(TglClearColorFn, glClearColor);
   glClearFn = LOAD_GL_FUNC(TglClearFn, glClear);
@@ -316,13 +263,9 @@ void GLFunctions::Init(dp::ApiVersion apiVersion)
   glScissorFn = LOAD_GL_FUNC(TglScissorFn, glScissor);
   glFlushFn = LOAD_GL_FUNC(TglFlushFn, glFlush);
 #else  // OMIM_OS_WINDOWS
-  if (ExtensionsList.IsSupported(dp::GLExtensionsList::VertexArrayObject))
-  {
-    glGenVertexArraysFn = LOAD_GL_FUNC(TglGenVertexArraysFn, glGenVertexArrays);
-    glBindVertexArrayFn = LOAD_GL_FUNC(TglBindVertexArrayFn, glBindVertexArray);
-    glDeleteVertexArrayFn = LOAD_GL_FUNC(TglDeleteVertexArrayFn, glDeleteVertexArrays);
-  }
-  glMapBufferFn = LOAD_GL_FUNC(TglMapBufferFn, glMapBuffer);
+  glGenVertexArraysFn = LOAD_GL_FUNC(TglGenVertexArraysFn, glGenVertexArrays);
+  glBindVertexArrayFn = LOAD_GL_FUNC(TglBindVertexArrayFn, glBindVertexArray);
+  glDeleteVertexArrayFn = LOAD_GL_FUNC(TglDeleteVertexArrayFn, glDeleteVertexArrays);
   glUnmapBufferFn = LOAD_GL_FUNC(TglUnmapBufferFn, glUnmapBuffer);
   glMapBufferRangeFn = LOAD_GL_FUNC(TglMapBufferRangeFn, glMapBufferRange);
   glFlushMappedBufferRangeFn = LOAD_GL_FUNC(TglFlushMappedBufferRangeFn, glFlushMappedBufferRange);
@@ -403,115 +346,94 @@ void GLFunctions::Init(dp::ApiVersion apiVersion)
 
 bool GLFunctions::glHasExtension(std::string const & name)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
-  if (CurrentApiVersion == dp::ApiVersion::OpenGLES2)
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
+  ASSERT(glGetStringiFn != nullptr, ());
+  GLint n = 0;
+  glGetIntegerv(GL_NUM_EXTENSIONS, &n);
+  for (GLint i = 0; i < n; i++)
   {
-    char const * extensions = reinterpret_cast<char const *>(::glGetString(GL_EXTENSIONS));
-    GLCHECKCALL();
-    if (extensions == nullptr)
-      return false;
-
-    char const * extName = name.c_str();
-    char const * ptr = nullptr;
-    while ((ptr = strstr(extensions, extName)) != nullptr)
-    {
-      char const * end = ptr + strlen(extName);
-      if (isspace(*end) || *end == '\0')
-        return true;
-
-      extensions = end;
-    }
-  }
-  else if (CurrentApiVersion == dp::ApiVersion::OpenGLES3)
-  {
-    ASSERT(glGetStringiFn != nullptr, ());
-    GLint n = 0;
-    glGetIntegerv(GL_NUM_EXTENSIONS, &n);
-    for (GLint i = 0; i < n; i++)
-    {
-      std::string const extension =
-          std::string(reinterpret_cast<char const *>(glGetStringiFn(GL_EXTENSIONS, i)));
-      if (extension == name)
-        return true;
-    }
+    std::string const extension =
+        std::string(reinterpret_cast<char const *>(glGetStringiFn(GL_EXTENSIONS, i)));
+    if (extension == name)
+      return true;
   }
   return false;
 }
 
 void GLFunctions::glClearColor(float r, float g, float b, float a)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glClearColorFn != nullptr, ());
   GLCHECK(glClearColorFn(r, g, b, a));
 }
 
 void GLFunctions::glClear(uint32_t clearBits)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glClearFn != nullptr, ());
   GLCHECK(glClearFn(clearBits));
 }
 
 void GLFunctions::glViewport(uint32_t x, uint32_t y, uint32_t w, uint32_t h)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glViewportFn != nullptr, ());
   GLCHECK(glViewportFn(x, y, w, h));
 }
 
 void GLFunctions::glScissor(uint32_t x, uint32_t y, uint32_t w, uint32_t h)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glScissorFn != nullptr, ());
   GLCHECK(glScissorFn(x, y, w, h));
 }
 
 void GLFunctions::glFlush()
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glFlushFn != nullptr, ());
   GLCHECK(glFlushFn());
 }
 
 void GLFunctions::glFinish()
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   GLCHECK(::glFinish());
 }
 
 void GLFunctions::glFrontFace(glConst mode)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   GLCHECK(::glFrontFace(mode));
 }
 
 void GLFunctions::glCullFace(glConst face)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   GLCHECK(::glCullFace(face));
 }
 
 void GLFunctions::glStencilOpSeparate(glConst face, glConst sfail, glConst dpfail, glConst dppass)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   GLCHECK(glStencilOpSeparateFn(face, sfail, dpfail, dppass));
 }
 
 void GLFunctions::glStencilFuncSeparate(glConst face, glConst func, int ref, uint32_t mask)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   GLCHECK(glStencilFuncSeparateFn(face, func, ref, mask));
 }
 
 void GLFunctions::glPixelStore(glConst name, uint32_t value)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   GLCHECK(::glPixelStorei(name, value));
 }
 
 int32_t GLFunctions::glGetInteger(glConst pname)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   GLint value;
   GLCHECK(::glGetIntegerv(pname, &value));
   return (int32_t)value;
@@ -519,7 +441,7 @@ int32_t GLFunctions::glGetInteger(glConst pname)
 
 std::string GLFunctions::glGetString(glConst pname)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   char const * str = reinterpret_cast<char const *>(::glGetString(pname));
   GLCHECKCALL();
   if (str == nullptr)
@@ -530,7 +452,7 @@ std::string GLFunctions::glGetString(glConst pname)
 
 int32_t GLFunctions::glGetMaxLineWidth()
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   GLint range[2];
   GLCHECK(::glGetIntegerv(GL_ALIASED_LINE_WIDTH_RANGE, range));
   return std::max(range[0], range[1]);
@@ -538,7 +460,7 @@ int32_t GLFunctions::glGetMaxLineWidth()
 
 int32_t GLFunctions::glGetBufferParameter(glConst target, glConst name)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   GLint result;
   ASSERT(glGetBufferParameterFn != nullptr, ());
   GLCHECK(glGetBufferParameterFn(target, name, &result));
@@ -547,19 +469,19 @@ int32_t GLFunctions::glGetBufferParameter(glConst target, glConst name)
 
 void GLFunctions::glEnable(glConst mode)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   GLCHECK(::glEnable(mode));
 }
 
 void GLFunctions::glDisable(glConst mode)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   GLCHECK(::glDisable(mode));
 }
 
 void GLFunctions::glClearDepthValue(double depth)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
 #if defined(OMIM_OS_IPHONE) || defined(OMIM_OS_ANDROID) || defined(OMIM_OS_LINUX)
   GLCHECK(::glClearDepthf(static_cast<GLclampf>(depth)));
 #else
@@ -569,32 +491,32 @@ void GLFunctions::glClearDepthValue(double depth)
 
 void GLFunctions::glDepthMask(bool needWriteToDepthBuffer)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   GLCHECK(::glDepthMask(convert(needWriteToDepthBuffer)));
 }
 
 void GLFunctions::glDepthFunc(glConst depthFunc)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   GLCHECK(::glDepthFunc(depthFunc));
 }
 
 void GLFunctions::glBlendEquation(glConst function)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glBlendEquationFn != nullptr, ());
   GLCHECK(glBlendEquationFn(function));
 }
 
 void GLFunctions::glBlendFunc(glConst srcFactor, glConst dstFactor)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   GLCHECK(::glBlendFunc(srcFactor, dstFactor));
 }
 
 bool GLFunctions::CanEnableDebugMessages()
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   if (glDebugMessageCallbackFn == nullptr)
     return false;
   if (glDebugMessageControlFn == nullptr)
@@ -606,7 +528,7 @@ bool GLFunctions::CanEnableDebugMessages()
 
 void GLFunctions::glDebugMessageCallback(TglDebugProc messageCallback, void * userParam)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glDebugMessageCallbackFn != nullptr, ());
   GLCHECK(glDebugMessageCallbackFn(reinterpret_cast<GLDEBUGPROC>(messageCallback), userParam));
 }
@@ -614,14 +536,14 @@ void GLFunctions::glDebugMessageCallback(TglDebugProc messageCallback, void * us
 void GLFunctions::glDebugMessageControl(glConst source, glConst type, glConst severity,
                                         int32_t count, uint32_t const * ids, uint8_t enabled)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glDebugMessageControlFn != nullptr, ());
   GLCHECK(glDebugMessageControlFn(source, type, severity, count, ids, enabled));
 }
 
 uint32_t GLFunctions::glGenVertexArray()
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glGenVertexArraysFn != nullptr, ());
   GLuint result = std::numeric_limits<GLuint>::max();
   GLCHECK(glGenVertexArraysFn(1, &result));
@@ -630,21 +552,21 @@ uint32_t GLFunctions::glGenVertexArray()
 
 void GLFunctions::glBindVertexArray(uint32_t vao)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glBindVertexArrayFn != nullptr, ());
   GLCHECK(glBindVertexArrayFn(vao));
 }
 
 void GLFunctions::glDeleteVertexArray(uint32_t vao)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glDeleteVertexArrayFn != nullptr, ());
   GLCHECK(glDeleteVertexArrayFn(1, &vao));
 }
 
 uint32_t GLFunctions::glGenBuffer()
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glGenBuffersFn != nullptr, ());
   GLuint result = std::numeric_limits<GLuint>::max();
   GLCHECK(glGenBuffersFn(1, &result));
@@ -653,7 +575,7 @@ uint32_t GLFunctions::glGenBuffer()
 
 void GLFunctions::glBindBuffer(uint32_t vbo, uint32_t target)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glBindBufferFn != nullptr, ());
 #ifdef DEBUG
   std::lock_guard<std::mutex> guard(g_boundBuffersMutex);
@@ -664,7 +586,7 @@ void GLFunctions::glBindBuffer(uint32_t vbo, uint32_t target)
 
 void GLFunctions::glDeleteBuffer(uint32_t vbo)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glDeleteBuffersFn != nullptr, ());
 #ifdef DEBUG
   std::lock_guard<std::mutex> guard(g_boundBuffersMutex);
@@ -676,21 +598,21 @@ void GLFunctions::glDeleteBuffer(uint32_t vbo)
 
 void GLFunctions::glBufferData(glConst target, uint32_t size, void const * data, glConst usage)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glBufferDataFn != nullptr, ());
   GLCHECK(glBufferDataFn(target, size, data, usage));
 }
 
 void GLFunctions::glBufferSubData(glConst target, uint32_t size, void const * data, uint32_t offset)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glBufferSubDataFn != nullptr, ());
   GLCHECK(glBufferSubDataFn(target, offset, size, data));
 }
 
 void * GLFunctions::glMapBuffer(glConst target, glConst access)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glMapBufferFn != nullptr, ());
   void * result = glMapBufferFn(target, access);
   GLCHECKCALL();
@@ -699,7 +621,7 @@ void * GLFunctions::glMapBuffer(glConst target, glConst access)
 
 void GLFunctions::glUnmapBuffer(glConst target)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glUnmapBufferFn != nullptr, ());
   VERIFY(glUnmapBufferFn(target) == GL_TRUE, ());
   GLCHECKCALL();
@@ -708,7 +630,7 @@ void GLFunctions::glUnmapBuffer(glConst target)
 void * GLFunctions::glMapBufferRange(glConst target, uint32_t offset, uint32_t length,
                                      glConst access)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glMapBufferRangeFn != nullptr, ());
   void * result = glMapBufferRangeFn(target, offset, length, access);
   GLCHECKCALL();
@@ -717,14 +639,14 @@ void * GLFunctions::glMapBufferRange(glConst target, uint32_t offset, uint32_t l
 
 void GLFunctions::glFlushMappedBufferRange(glConst target, uint32_t offset, uint32_t length)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glFlushMappedBufferRangeFn != nullptr, ());
   GLCHECK(glFlushMappedBufferRangeFn(target, offset, length));
 }
 
 uint32_t GLFunctions::glCreateShader(glConst type)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glCreateShaderFn != nullptr, ());
   GLuint result = glCreateShaderFn(type);
   GLCHECKCALL();
@@ -733,7 +655,7 @@ uint32_t GLFunctions::glCreateShader(glConst type)
 
 void GLFunctions::glShaderSource(uint32_t shaderID, std::string const & src, std::string const & defines)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glShaderSourceFn != nullptr, ());
 
   std::string fullSrc;
@@ -756,7 +678,7 @@ void GLFunctions::glShaderSource(uint32_t shaderID, std::string const & src, std
 
 bool GLFunctions::glCompileShader(uint32_t shaderID, std::string & errorLog)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glCompileShaderFn != nullptr, ());
   ASSERT(glGetShaderivFn != nullptr, ());
   ASSERT(glGetShaderInfoLogFn != nullptr, ());
@@ -776,14 +698,14 @@ bool GLFunctions::glCompileShader(uint32_t shaderID, std::string & errorLog)
 
 void GLFunctions::glDeleteShader(uint32_t shaderID)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glDeleteShaderFn != nullptr, ());
   GLCHECK(glDeleteBuffersFn(1, &shaderID));
 }
 
 uint32_t GLFunctions::glCreateProgram()
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glCreateProgramFn != nullptr, ());
   GLuint result = glCreateProgramFn();
   GLCHECKCALL();
@@ -792,21 +714,21 @@ uint32_t GLFunctions::glCreateProgram()
 
 void GLFunctions::glAttachShader(uint32_t programID, uint32_t shaderID)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glAttachShaderFn != nullptr, ());
   GLCHECK(glAttachShaderFn(programID, shaderID));
 }
 
 void GLFunctions::glDetachShader(uint32_t programID, uint32_t shaderID)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glDetachShaderFn != nullptr, ());
   GLCHECK(glDetachShaderFn(programID, shaderID));
 }
 
 bool GLFunctions::glLinkProgram(uint32_t programID, std::string & errorLog)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glLinkProgramFn != nullptr, ());
   ASSERT(glGetProgramivFn != nullptr, ());
   ASSERT(glGetProgramInfoLogFn != nullptr, ());
@@ -827,21 +749,21 @@ bool GLFunctions::glLinkProgram(uint32_t programID, std::string & errorLog)
 
 void GLFunctions::glDeleteProgram(uint32_t programID)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glDeleteProgramFn != nullptr, ());
   GLCHECK(glDeleteProgramFn(programID));
 }
 
 void GLFunctions::glUseProgram(uint32_t programID)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glUseProgramFn != nullptr, ());
   GLCHECK(glUseProgramFn(programID));
 }
 
 int8_t GLFunctions::glGetAttribLocation(uint32_t programID, std::string const & name)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glGetAttribLocationFn != nullptr, ());
   int result = glGetAttribLocationFn(programID, name.c_str());
   GLCHECKCALL();
@@ -851,14 +773,14 @@ int8_t GLFunctions::glGetAttribLocation(uint32_t programID, std::string const &
 
 void GLFunctions::glBindAttribLocation(uint32_t programID, uint8_t index, std::string const & name)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glBindAttribLocationFn != nullptr, ());
   GLCHECK(glBindAttribLocationFn(programID, index, name.c_str()));
 }
 
 void GLFunctions::glEnableVertexAttribute(int attributeLocation)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glEnableVertexAttributeFn != nullptr, ());
   GLCHECK(glEnableVertexAttributeFn(attributeLocation));
 }
@@ -866,7 +788,7 @@ void GLFunctions::glEnableVertexAttribute(int attributeLocation)
 void GLFunctions::glVertexAttributePointer(int attrLocation, uint32_t count, glConst type,
                                            bool needNormalize, uint32_t stride, uint32_t offset)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glVertexAttributePointerFn != nullptr, ());
   GLCHECK(glVertexAttributePointerFn(attrLocation, count, type, convert(needNormalize), stride,
                                      reinterpret_cast<void *>(offset)));
@@ -875,7 +797,7 @@ void GLFunctions::glVertexAttributePointer(int attrLocation, uint32_t count, glC
 void GLFunctions::glGetActiveUniform(uint32_t programID, uint32_t uniformIndex,
                                      int32_t * uniformSize, glConst * type, std::string & name)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glGetActiveUniformFn != nullptr, ());
   GLchar buff[256];
   GLCHECK(glGetActiveUniformFn(programID, uniformIndex, ARRAY_SIZE(buff), nullptr, uniformSize,
@@ -885,7 +807,7 @@ void GLFunctions::glGetActiveUniform(uint32_t programID, uint32_t uniformIndex,
 
 int8_t GLFunctions::glGetUniformLocation(uint32_t programID, std::string const & name)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glGetUniformLocationFn != nullptr, ());
   int result = glGetUniformLocationFn(programID, name.c_str());
   GLCHECKCALL();
@@ -895,7 +817,7 @@ int8_t GLFunctions::glGetUniformLocation(uint32_t programID, std::string const &
 
 void GLFunctions::glUniformValuei(int8_t location, int32_t v)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glUniform1iFn != nullptr, ());
   ASSERT(location != -1, ());
   GLCHECK(glUniform1iFn(location, v));
@@ -903,7 +825,7 @@ void GLFunctions::glUniformValuei(int8_t location, int32_t v)
 
 void GLFunctions::glUniformValuei(int8_t location, int32_t v1, int32_t v2)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glUniform2iFn != nullptr, ());
   ASSERT(location != -1, ());
   GLCHECK(glUniform2iFn(location, v1, v2));
@@ -911,7 +833,7 @@ void GLFunctions::glUniformValuei(int8_t location, int32_t v1, int32_t v2)
 
 void GLFunctions::glUniformValuei(int8_t location, int32_t v1, int32_t v2, int32_t v3)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glUniform3iFn != nullptr, ());
   ASSERT(location != -1, ());
   GLCHECK(glUniform3iFn(location, v1, v2, v3));
@@ -919,7 +841,7 @@ void GLFunctions::glUniformValuei(int8_t location, int32_t v1, int32_t v2, int32
 
 void GLFunctions::glUniformValuei(int8_t location, int32_t v1, int32_t v2, int32_t v3, int32_t v4)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glUniform4iFn != nullptr, ());
   ASSERT(location != -1, ());
   GLCHECK(glUniform4iFn(location, v1, v2, v3, v4));
@@ -927,7 +849,7 @@ void GLFunctions::glUniformValuei(int8_t location, int32_t v1, int32_t v2, int32
 
 void GLFunctions::glUniformValueiv(int8_t location, int32_t * v, uint32_t size)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glUniform1ivFn != nullptr, ());
   ASSERT(location != -1, ());
   GLCHECK(glUniform1ivFn(location, size, v));
@@ -935,7 +857,7 @@ void GLFunctions::glUniformValueiv(int8_t location, int32_t * v, uint32_t size)
 
 void GLFunctions::glUniformValuef(int8_t location, float v)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glUniform1fFn != nullptr, ());
   ASSERT(location != -1, ());
   GLCHECK(glUniform1fFn(location, v));
@@ -943,7 +865,7 @@ void GLFunctions::glUniformValuef(int8_t location, float v)
 
 void GLFunctions::glUniformValuef(int8_t location, float v1, float v2)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glUniform2fFn != nullptr, ());
   ASSERT(location != -1, ());
   GLCHECK(glUniform2fFn(location, v1, v2));
@@ -951,7 +873,7 @@ void GLFunctions::glUniformValuef(int8_t location, float v1, float v2)
 
 void GLFunctions::glUniformValuef(int8_t location, float v1, float v2, float v3)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glUniform3fFn != nullptr, ());
   ASSERT(location != -1, ());
   GLCHECK(glUniform3fFn(location, v1, v2, v3));
@@ -959,7 +881,7 @@ void GLFunctions::glUniformValuef(int8_t location, float v1, float v2, float v3)
 
 void GLFunctions::glUniformValuef(int8_t location, float v1, float v2, float v3, float v4)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glUniform4fFn != nullptr, ());
   ASSERT(location != -1, ());
   GLCHECK(glUniform4fFn(location, v1, v2, v3, v4));
@@ -967,7 +889,7 @@ void GLFunctions::glUniformValuef(int8_t location, float v1, float v2, float v3,
 
 void GLFunctions::glUniformValuefv(int8_t location, float * v, uint32_t size)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glUniform1fvFn != nullptr, ());
   ASSERT(location != -1, ());
   GLCHECK(glUniform1fvFn(location, size, v));
@@ -975,7 +897,7 @@ void GLFunctions::glUniformValuefv(int8_t location, float * v, uint32_t size)
 
 void GLFunctions::glUniformMatrix4x4Value(int8_t location, float const * values)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glUniformMatrix4fvFn != nullptr, ());
   ASSERT(location != -1, ());
   GLCHECK(glUniformMatrix4fvFn(location, 1, GL_FALSE, values));
@@ -983,7 +905,7 @@ void GLFunctions::glUniformMatrix4x4Value(int8_t location, float const * values)
 
 uint32_t GLFunctions::glGetCurrentProgram()
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   GLint programIndex = 0;
   GLCHECK(glGetIntegerv(GL_CURRENT_PROGRAM, &programIndex));
   ASSERT_GREATER_OR_EQUAL(programIndex, 0, ());
@@ -992,7 +914,7 @@ uint32_t GLFunctions::glGetCurrentProgram()
 
 int32_t GLFunctions::glGetProgramiv(uint32_t program, glConst paramName)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glGetProgramivFn != nullptr, ());
   GLint paramValue = 0;
   GLCHECK(glGetProgramivFn(program, paramName, &paramValue));
@@ -1001,14 +923,14 @@ int32_t GLFunctions::glGetProgramiv(uint32_t program, glConst paramName)
 
 void GLFunctions::glActiveTexture(glConst texBlock)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glActiveTextureFn != nullptr, ());
   GLCHECK(glActiveTextureFn(texBlock));
 }
 
 uint32_t GLFunctions::glGenTexture()
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   GLuint result = std::numeric_limits<GLuint>::max();
   GLCHECK(::glGenTextures(1, &result));
   return result;
@@ -1016,20 +938,20 @@ uint32_t GLFunctions::glGenTexture()
 
 void GLFunctions::glDeleteTexture(uint32_t id)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   GLCHECK(::glDeleteTextures(1, &id));
 }
 
 void GLFunctions::glBindTexture(uint32_t textureID)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   GLCHECK(::glBindTexture(GL_TEXTURE_2D, textureID));
 }
 
 void GLFunctions::glTexImage2D(int width, int height, glConst layout, glConst pixelType,
                                void const * data)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   // In OpenGL ES3:
   // - we can't create unsized GL_RED texture, so we use GL_R8;
   // - we can't create unsized GL_RG texture, so we use GL_RG8;
@@ -1068,20 +990,20 @@ void GLFunctions::glTexImage2D(int width, int height, glConst layout, glConst pi
 void GLFunctions::glTexSubImage2D(int x, int y, int width, int height, glConst layout,
                                   glConst pixelType, void const * data)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   GLCHECK(::glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, width, height, layout, pixelType, data));
 }
 
 void GLFunctions::glTexParameter(glConst param, glConst value)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   GLCHECK(::glTexParameteri(GL_TEXTURE_2D, param, value));
 }
 
 void GLFunctions::glDrawElements(glConst primitive, uint32_t sizeOfIndex, uint32_t indexCount,
                                  uint32_t startIndex)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   GLCHECK(::glDrawElements(primitive, indexCount,
                            sizeOfIndex == sizeof(uint32_t) ? GL_UNSIGNED_INT : GL_UNSIGNED_SHORT,
                            reinterpret_cast<GLvoid *>(startIndex * sizeOfIndex)));
@@ -1089,41 +1011,41 @@ void GLFunctions::glDrawElements(glConst primitive, uint32_t sizeOfIndex, uint32
 
 void GLFunctions::glDrawArrays(glConst mode, int32_t first, uint32_t count)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   GLCHECK(::glDrawArrays(mode, first, count));
 }
 
 void GLFunctions::glGenFramebuffer(uint32_t * fbo)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glGenFramebuffersFn != nullptr, ());
   GLCHECK(glGenFramebuffersFn(1, fbo));
 }
 
 void GLFunctions::glDeleteFramebuffer(uint32_t * fbo)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glDeleteFramebuffersFn != nullptr, ());
   GLCHECK(glDeleteFramebuffersFn(1, fbo));
 }
 
 void GLFunctions::glFramebufferTexture2D(glConst attachment, glConst texture)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glFramebufferTexture2DFn != nullptr, ());
   GLCHECK(glFramebufferTexture2DFn(GL_FRAMEBUFFER, attachment, GL_TEXTURE_2D, texture, 0));
 }
 
 void GLFunctions::glBindFramebuffer(uint32_t fbo)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glBindFramebufferFn != nullptr, ());
   GLCHECK(glBindFramebufferFn(GL_FRAMEBUFFER, fbo));
 }
 
 uint32_t GLFunctions::glCheckFramebufferStatus()
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glCheckFramebufferStatusFn != nullptr, ());
   uint32_t const result = glCheckFramebufferStatusFn(GL_FRAMEBUFFER);
   GLCHECKCALL();
@@ -1132,7 +1054,7 @@ uint32_t GLFunctions::glCheckFramebufferStatus()
 
 void GLFunctions::glLineWidth(uint32_t value)
 {
-  ASSERT_NOT_EQUAL(CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   GLCHECK(::glLineWidth(static_cast<float>(value)));
 }
 
@@ -1153,7 +1075,7 @@ std::string GetGLError(GLenum error)
 
 void CheckGLError(base::SrcPoint const & srcPoint)
 {
-  ASSERT_NOT_EQUAL(GLFunctions::CurrentApiVersion, dp::ApiVersion::Invalid, ());
+  ASSERT_EQUAL(GLFunctions::CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   GLenum result = glGetError();
   while (result != GL_NO_ERROR)
   {
diff --git a/libs/drape/gpu_buffer.cpp b/libs/drape/gpu_buffer.cpp
index af8490690..a280aeddd 100644
--- a/libs/drape/gpu_buffer.cpp
+++ b/libs/drape/gpu_buffer.cpp
@@ -87,26 +87,17 @@ void * GPUBuffer::Map(uint32_t elementOffset, uint32_t elementCount)
   m_isMapped = true;
 #endif
 
-  if (GLFunctions::CurrentApiVersion == dp::ApiVersion::OpenGLES2)
+  if (!IsMapBufferSupported())
   {
     m_mappingOffset = elementOffset;
-    return IsMapBufferSupported() ? GLFunctions::glMapBuffer(glTarget(m_t)) : nullptr;
+    return nullptr;
   }
-  else if (GLFunctions::CurrentApiVersion == dp::ApiVersion::OpenGLES3)
-  {
-    if (!IsMapBufferSupported())
-    {
-      m_mappingOffset = elementOffset;
-      return nullptr;
-    }
-    m_mappingOffset = 0;
-    uint32_t const elementSize = GetElementSize();
-    uint32_t const byteOffset = elementOffset * elementSize;
-    uint32_t const byteCount = elementCount * elementSize;
-    return GLFunctions::glMapBufferRange(glTarget(m_t), byteOffset, byteCount,
-                                         gl_const::GLWriteBufferBit);
-  }
-  return nullptr;
+  m_mappingOffset = 0;
+  uint32_t const elementSize = GetElementSize();
+  uint32_t const byteOffset = elementOffset * elementSize;
+  uint32_t const byteCount = elementCount * elementSize;
+  return GLFunctions::glMapBufferRange(glTarget(m_t), byteOffset, byteCount,
+                                        gl_const::GLWriteBufferBit);
 }
 
 void GPUBuffer::UpdateData(void * gpuPtr, void const * data, uint32_t elementOffset,
diff --git a/libs/drape/hw_texture.cpp b/libs/drape/hw_texture.cpp
index 560e8978f..1d99e2028 100644
--- a/libs/drape/hw_texture.cpp
+++ b/libs/drape/hw_texture.cpp
@@ -36,7 +36,7 @@ void UnpackFormat(ref_ptr<dp::GraphicsContext> context, TextureFormat format,
                   glConst & layout, glConst & pixelType)
 {
   auto const apiVersion = context->GetApiVersion();
-  CHECK(apiVersion == dp::ApiVersion::OpenGLES2 || apiVersion == dp::ApiVersion::OpenGLES3, ());
+  CHECK(apiVersion == dp::ApiVersion::OpenGLES3, ());
 
   switch (format)
   {
@@ -45,21 +45,17 @@ void UnpackFormat(ref_ptr<dp::GraphicsContext> context, TextureFormat format,
     pixelType = gl_const::GL8BitOnChannel;
     return;
 
-  case TextureFormat::Alpha:
-    // On OpenGL ES3 GLAlpha is not supported, we use GLRed instead.
-    layout = apiVersion == dp::ApiVersion::OpenGLES2 ? gl_const::GLAlpha : gl_const::GLRed;
+  case TextureFormat::Red:
+    layout = gl_const::GLRed;
     pixelType = gl_const::GL8BitOnChannel;
     return;
 
   case TextureFormat::RedGreen:
-    // On OpenGL ES2 2-channel textures are not supported.
-    layout = (apiVersion == dp::ApiVersion::OpenGLES2) ? gl_const::GLRGBA : gl_const::GLRedGreen;
+    layout = gl_const::GLRedGreen;
     pixelType = gl_const::GL8BitOnChannel;
     return;
 
   case TextureFormat::DepthStencil:
-    // OpenGLES2 does not support texture-based depth-stencil.
-    CHECK(apiVersion != dp::ApiVersion::OpenGLES2, ());
     layout = gl_const::GLDepthStencil;
     pixelType = gl_const::GLUnsignedInt24_8Type;
     return;
diff --git a/libs/drape/hw_texture_ios.mm b/libs/drape/hw_texture_ios.mm
index f83725f41..658ce02e0 100644
--- a/libs/drape/hw_texture_ios.mm
+++ b/libs/drape/hw_texture_ios.mm
@@ -61,7 +61,7 @@ CVPixelBufferRef HWTextureAllocatorApple::CVCreatePixelBuffer(uint32_t width, ui
     cvRetval = CVPixelBufferCreate(kCFAllocatorDefault, width, height, kCVPixelFormatType_32BGRA,
                                    attrsRef, &result);
     break;
-  case dp::TextureFormat::Alpha:
+  case dp::TextureFormat::Red:
     cvRetval = CVPixelBufferCreate(kCFAllocatorDefault, width, height, kCVPixelFormatType_OneComponent8,
                                    attrsRef, &result);
     break;
diff --git a/libs/drape/index_storage.cpp b/libs/drape/index_storage.cpp
index 5f6bb8fc9..3432e8be9 100644
--- a/libs/drape/index_storage.cpp
+++ b/libs/drape/index_storage.cpp
@@ -56,7 +56,7 @@ void const * IndexStorage::GetRawConst() const
 bool IndexStorage::IsSupported32bit()
 {
   // We do not use 32-bit indices now to reduce size of index buffers.
-  static bool const supports32Bit = false;//GLFunctions::ExtensionsList.IsSupported(GLExtensionsList::UintIndices);
+  static bool const supports32Bit = false;
   return supports32Bit;
 }
 
diff --git a/libs/drape/mesh_object.cpp b/libs/drape/mesh_object.cpp
index 525c31b0c..4fbaa899e 100644
--- a/libs/drape/mesh_object.cpp
+++ b/libs/drape/mesh_object.cpp
@@ -36,13 +36,8 @@ public:
   {
     UNUSED_VALUE(context);
 
-    bool const isVAOSupported =
-      GLFunctions::ExtensionsList.IsSupported(dp::GLExtensionsList::VertexArrayObject);
-    if (isVAOSupported)
-    {
-      m_VAO = GLFunctions::glGenVertexArray();
-      GLFunctions::glBindVertexArray(m_VAO);
-    }
+    m_VAO = GLFunctions::glGenVertexArray();
+    GLFunctions::glBindVertexArray(m_VAO);
 
     for (auto & buffer : m_mesh->m_buffers)
     {
@@ -64,23 +59,19 @@ public:
                                   m_mesh->m_indices.data(), gl_const::GLStaticDraw);
       }
 
-      if (isVAOSupported)
+      ref_ptr<dp::GLGpuProgram> p = program;
+      for (auto const & attribute : buffer->m_attributes)
       {
-        ref_ptr<dp::GLGpuProgram> p = program;
-        for (auto const & attribute : buffer->m_attributes)
-        {
-          int8_t const attributePosition = p->GetAttributeLocation(attribute.m_attributeName);
-          ASSERT_NOT_EQUAL(attributePosition, -1, ());
-          GLFunctions::glEnableVertexAttribute(attributePosition);
-          GLFunctions::glVertexAttributePointer(attributePosition, attribute.m_componentsCount,
-                                                attribute.m_type, false, buffer->GetStrideInBytes(), 
-                                                attribute.m_offset);
-        }
+        int8_t const attributePosition = p->GetAttributeLocation(attribute.m_attributeName);
+        ASSERT_NOT_EQUAL(attributePosition, -1, ());
+        GLFunctions::glEnableVertexAttribute(attributePosition);
+        GLFunctions::glVertexAttributePointer(attributePosition, attribute.m_componentsCount,
+                                              attribute.m_type, false, buffer->GetStrideInBytes(), 
+                                              attribute.m_offset);
       }
     }
 
-    if (isVAOSupported)
-      GLFunctions::glBindVertexArray(0);
+    GLFunctions::glBindVertexArray(0);
     GLFunctions::glBindBuffer(0, gl_const::GLArrayBuffer);
     if (!m_mesh->m_indices.empty())
       GLFunctions::glBindBuffer(0, gl_const::GLElementArrayBuffer);
@@ -134,34 +125,12 @@ public:
 
   void Bind(ref_ptr<dp::GpuProgram> program) override
   {
-    if (GLFunctions::ExtensionsList.IsSupported(dp::GLExtensionsList::VertexArrayObject))
-    {
-      GLFunctions::glBindVertexArray(m_VAO);
-      return;
-    }
-
-    ref_ptr<dp::GLGpuProgram> p = program;
-    for (auto const & buffer : m_mesh->m_buffers)
-    {
-      GLFunctions::glBindBuffer(buffer->m_bufferId, gl_const::GLArrayBuffer);
-      if (m_indexBuffer != 0)
-        GLFunctions::glBindBuffer(m_indexBuffer, gl_const::GLElementArrayBuffer);
-      for (auto const & attribute : buffer->m_attributes)
-      {
-        int8_t const attributePosition = p->GetAttributeLocation(attribute.m_attributeName);
-        ASSERT_NOT_EQUAL(attributePosition, -1, ());
-        GLFunctions::glEnableVertexAttribute(attributePosition);
-        GLFunctions::glVertexAttributePointer(attributePosition, attribute.m_componentsCount,
-                                              attribute.m_type, false, buffer->GetStrideInBytes(), 
-                                              attribute.m_offset);
-      }
-    }
+    GLFunctions::glBindVertexArray(m_VAO);
   }
 
   void Unbind() override
   {
-    if (GLFunctions::ExtensionsList.IsSupported(dp::GLExtensionsList::VertexArrayObject))
-      GLFunctions::glBindVertexArray(0);
+    GLFunctions::glBindVertexArray(0);
     GLFunctions::glBindBuffer(0, gl_const::GLArrayBuffer);
     if (m_indexBuffer != 0)
       GLFunctions::glBindBuffer(0, gl_const::GLElementArrayBuffer);
@@ -197,7 +166,7 @@ MeshObject::MeshObject(ref_ptr<dp::GraphicsContext> context, DrawPrimitive drawP
   , m_debugName(debugName)
 {
   auto const apiVersion = context->GetApiVersion();
-  if (apiVersion == dp::ApiVersion::OpenGLES2 || apiVersion == dp::ApiVersion::OpenGLES3)
+  if (apiVersion == dp::ApiVersion::OpenGLES3)
   {
     InitForOpenGL();
   }
diff --git a/libs/drape/metal/metal_texture.mm b/libs/drape/metal/metal_texture.mm
index cd0a94617..89d674ef0 100644
--- a/libs/drape/metal/metal_texture.mm
+++ b/libs/drape/metal/metal_texture.mm
@@ -25,7 +25,7 @@ MTLPixelFormat UnpackFormat(TextureFormat format)
   switch (format)
   {
   case TextureFormat::RGBA8: return MTLPixelFormatRGBA8Unorm;
-  case TextureFormat::Alpha: return MTLPixelFormatA8Unorm;
+  case TextureFormat::Red: return MTLPixelFormatA8Unorm; // TODO: change to R8, fix shaders
   case TextureFormat::RedGreen: return MTLPixelFormatRG8Unorm;
   case TextureFormat::DepthStencil: return MTLPixelFormatDepth32Float_Stencil8;
   case TextureFormat::Depth: return MTLPixelFormatDepth32Float;
diff --git a/libs/drape/render_state.cpp b/libs/drape/render_state.cpp
index 5c09fd807..55611a203 100644
--- a/libs/drape/render_state.cpp
+++ b/libs/drape/render_state.cpp
@@ -30,7 +30,7 @@ void AlphaBlendingState::Apply(ref_ptr<GraphicsContext> context)
 {
   // For Metal Rendering these settings must be set in the pipeline state.
   auto const apiVersion = context->GetApiVersion();
-  if (apiVersion == dp::ApiVersion::OpenGLES2 || apiVersion == dp::ApiVersion::OpenGLES3)
+  if (apiVersion == dp::ApiVersion::OpenGLES3)
   {
     GLFunctions::glBlendEquation(gl_const::GLAddBlend);
     GLFunctions::glBlendFunc(gl_const::GLSrcAlpha, gl_const::GLOneMinusSrcAlpha);
@@ -45,7 +45,7 @@ void Blending::Apply(ref_ptr<GraphicsContext> context, ref_ptr<GpuProgram> progr
 {
   // For Metal Rendering these settings must be set in the pipeline state.
   auto const apiVersion = context->GetApiVersion();
-  if (apiVersion == dp::ApiVersion::OpenGLES2 || apiVersion == dp::ApiVersion::OpenGLES3)
+  if (apiVersion == dp::ApiVersion::OpenGLES3)
   {
     if (m_isEnabled)
       GLFunctions::glEnable(gl_const::GLBlending);
@@ -216,7 +216,7 @@ void TextureState::ApplyTextures(ref_ptr<GraphicsContext> context, RenderState c
 {
   m_usedSlots = 0;
   auto const apiVersion = context->GetApiVersion();
-  if (apiVersion == dp::ApiVersion::OpenGLES2 || apiVersion == dp::ApiVersion::OpenGLES3)
+  if (apiVersion == dp::ApiVersion::OpenGLES3)
   {
     ref_ptr<dp::GLGpuProgram> p = program;
     for (auto const & texture : state.GetTextures())
@@ -324,7 +324,7 @@ void ApplyState(ref_ptr<GraphicsContext> context, ref_ptr<GpuProgram> program, R
 
   if (state.GetDrawAsLine())
   {
-    if (apiVersion == dp::ApiVersion::OpenGLES2 || apiVersion == dp::ApiVersion::OpenGLES3)
+    if (apiVersion == dp::ApiVersion::OpenGLES3)
     {
       ASSERT_GREATER_OR_EQUAL(state.GetLineWidth(), 0, ());
       GLFunctions::glLineWidth(static_cast<uint32_t>(state.GetLineWidth()));
diff --git a/libs/drape/stipple_pen_resource.cpp b/libs/drape/stipple_pen_resource.cpp
index 5f4cb4b5a..e5d4a9e74 100644
--- a/libs/drape/stipple_pen_resource.cpp
+++ b/libs/drape/stipple_pen_resource.cpp
@@ -176,7 +176,7 @@ ref_ptr<Texture::ResourceInfo> StipplePenIndex::MapResource(StipplePenKey const
 
 void StipplePenIndex::UploadResources(ref_ptr<dp::GraphicsContext> context, ref_ptr<Texture> texture)
 {
-  ASSERT(texture->GetFormat() == dp::TextureFormat::Alpha, ());
+  ASSERT(texture->GetFormat() == dp::TextureFormat::Red, ());
   TPendingNodes pendingNodes;
   {
     std::lock_guard<std::mutex> g(m_lock);
diff --git a/libs/drape/stipple_pen_resource.hpp b/libs/drape/stipple_pen_resource.hpp
index 3095e09bd..03c6e1e26 100644
--- a/libs/drape/stipple_pen_resource.hpp
+++ b/libs/drape/stipple_pen_resource.hpp
@@ -139,7 +139,7 @@ public:
   StipplePenTexture(m2::PointU const & size, ref_ptr<HWTextureAllocator> allocator)
     : m_index(size)
   {
-    TBase::DynamicTextureParams params{size, TextureFormat::Alpha, TextureFilter::Nearest,
+    TBase::DynamicTextureParams params{size, TextureFormat::Red, TextureFilter::Nearest,
                                        false /* m_usePixelBuffer */};
     TBase::Init(allocator, make_ref(&m_index), params);
   }
diff --git a/libs/drape/support_manager.cpp b/libs/drape/support_manager.cpp
index d3fde0fa2..21497ed9c 100644
--- a/libs/drape/support_manager.cpp
+++ b/libs/drape/support_manager.cpp
@@ -56,7 +56,7 @@ void SupportManager::Init(ref_ptr<GraphicsContext> context)
     LOG(LINFO, ("NVidia Tegra device detected."));
 
   auto const apiVersion = context->GetApiVersion();
-  if (apiVersion == dp::ApiVersion::OpenGLES2 || apiVersion == dp::ApiVersion::OpenGLES3)
+  if (apiVersion == dp::ApiVersion::OpenGLES3)
   {
     m_maxLineWidth = static_cast<float>(std::max(1, GLFunctions::glGetMaxLineWidth()));
     m_maxTextureSize = static_cast<uint32_t>(GLFunctions::glGetInteger(gl_const::GLMaxTextureSize));
diff --git a/libs/drape/texture_manager.cpp b/libs/drape/texture_manager.cpp
index fcb183d26..03e472a29 100644
--- a/libs/drape/texture_manager.cpp
+++ b/libs/drape/texture_manager.cpp
@@ -184,7 +184,7 @@ bool TextureManager::UpdateDynamicTextures(ref_ptr<dp::GraphicsContext> context)
   if (m_nothingToUpload.test_and_set())
   {
     auto const apiVersion = context->GetApiVersion();
-    if (apiVersion == dp::ApiVersion::OpenGLES2 || apiVersion == dp::ApiVersion::OpenGLES3)
+    if (apiVersion == dp::ApiVersion::OpenGLES3)
     {
       // For some reasons OpenGL can not update textures immediately.
       // Here we use some timeout to prevent rendering frozening.
@@ -303,7 +303,7 @@ void TextureManager::Init(ref_ptr<dp::GraphicsContext> context, Params const & p
 
   m_maxTextureSize = std::min(kMaxTextureSize, dp::SupportManager::Instance().GetMaxTextureSize());
   auto const apiVersion = context->GetApiVersion();
-  if (apiVersion == dp::ApiVersion::OpenGLES2 || apiVersion == dp::ApiVersion::OpenGLES3)
+  if (apiVersion == dp::ApiVersion::OpenGLES3)
     GLFunctions::glPixelStore(gl_const::GLUnpackAlignment, 1);
 
   // Initialize symbols.
@@ -324,16 +324,13 @@ void TextureManager::Init(ref_ptr<dp::GraphicsContext> context, Params const & p
       CreateArrowTexture(context, make_ref(m_textureAllocator), params.m_arrowTexturePath,
                          params.m_arrowTextureUseDefaultResourceFolder);
 
-  // SMAA is not supported on OpenGL ES2.
-  if (apiVersion != dp::ApiVersion::OpenGLES2)
-  {
-    m_smaaAreaTexture =
-        make_unique_dp<StaticTexture>(context, "smaa-area.png", StaticTexture::kDefaultResource,
-                                      dp::TextureFormat::RedGreen, make_ref(m_textureAllocator));
-    m_smaaSearchTexture =
-        make_unique_dp<StaticTexture>(context, "smaa-search.png", StaticTexture::kDefaultResource,
-                                      dp::TextureFormat::Alpha, make_ref(m_textureAllocator));
-  }
+  // SMAA.
+  m_smaaAreaTexture =
+      make_unique_dp<StaticTexture>(context, "smaa-area.png", StaticTexture::kDefaultResource,
+                                    dp::TextureFormat::RedGreen, make_ref(m_textureAllocator));
+  m_smaaSearchTexture =
+      make_unique_dp<StaticTexture>(context, "smaa-search.png", StaticTexture::kDefaultResource,
+                                    dp::TextureFormat::Red, make_ref(m_textureAllocator));
 
   // Initialize patterns (reserved ./data/patterns.txt lines count).
   std::set<PenPatternT> patterns;
diff --git a/libs/drape/texture_types.hpp b/libs/drape/texture_types.hpp
index 5aa79221d..ff95c59d3 100644
--- a/libs/drape/texture_types.hpp
+++ b/libs/drape/texture_types.hpp
@@ -9,7 +9,7 @@ namespace dp
 enum class TextureFormat : uint8_t
 {
   RGBA8,
-  Alpha,
+  Red,
   RedGreen,
   DepthStencil,
   Depth,
@@ -21,7 +21,7 @@ inline std::string DebugPrint(TextureFormat tf)
   switch (tf)
   {
   case TextureFormat::RGBA8: return "RGBA8";
-  case TextureFormat::Alpha: return "Alpha";
+  case TextureFormat::Red: return "Red";
   case TextureFormat::RedGreen: return "RedGreen";
   case TextureFormat::DepthStencil: return "DepthStencil";
   case TextureFormat::Depth: return "Depth";
@@ -50,7 +50,7 @@ inline uint8_t GetBytesPerPixel(TextureFormat format)
   switch (format)
   {
   case TextureFormat::RGBA8: result = 4; break;
-  case TextureFormat::Alpha: result = 1; break;
+  case TextureFormat::Red: result = 1; break;
   case TextureFormat::RedGreen: result = 2; break;
   case TextureFormat::DepthStencil: result = 4; break;
   case TextureFormat::Depth: result = 4; break;
diff --git a/libs/drape/vertex_array_buffer.cpp b/libs/drape/vertex_array_buffer.cpp
index 6190fa029..17f528d3f 100644
--- a/libs/drape/vertex_array_buffer.cpp
+++ b/libs/drape/vertex_array_buffer.cpp
@@ -56,9 +56,6 @@ public:
       return false;
 
     m_program = program;
-    // If OES_vertex_array_object not supported, than buffers will be bound on each render call.
-    if (!GLFunctions::ExtensionsList.IsSupported(GLExtensionsList::VertexArrayObject))
-      return false;
 
     if (m_VAO != 0)
       GLFunctions::glDeleteVertexArray(m_VAO);
@@ -68,19 +65,14 @@ public:
 
   bool Bind() override
   {
-    if (GLFunctions::ExtensionsList.IsSupported(GLExtensionsList::VertexArrayObject))
-    {
-      ASSERT(m_VAO != 0, ("You need to call Build method before bind it and render."));
-      GLFunctions::glBindVertexArray(m_VAO);
-      return true;
-    }
-    return false;
+    ASSERT(m_VAO != 0, ("You need to call Build method before bind it and render."));
+    GLFunctions::glBindVertexArray(m_VAO);
+    return true;
   }
 
   void Unbind() override
   {
-    if (GLFunctions::ExtensionsList.IsSupported(GLExtensionsList::VertexArrayObject))
-      GLFunctions::glBindVertexArray(0);
+    GLFunctions::glBindVertexArray(0);
   }
 
   void BindBuffers(BuffersMap const & buffers) const override
@@ -163,7 +155,7 @@ void VertexArrayBuffer::PreflushImpl(ref_ptr<GraphicsContext> context)
   // Preflush can be called on BR, where impl is not initialized.
   // For Metal rendering this code has no meaning.
   auto const apiVersion = context->GetApiVersion();
-  if (apiVersion == dp::ApiVersion::OpenGLES2 || apiVersion == dp::ApiVersion::OpenGLES3)
+  if (apiVersion == dp::ApiVersion::OpenGLES3)
   {
     GLFunctions::glBindBuffer(0, gl_const::GLElementArrayBuffer);
     GLFunctions::glBindBuffer(0, gl_const::GLArrayBuffer);
@@ -208,7 +200,7 @@ void VertexArrayBuffer::Build(ref_ptr<GraphicsContext> context, ref_ptr<GpuProgr
   if (!m_impl)
   {
     auto const apiVersion = context->GetApiVersion();
-    if (apiVersion == dp::ApiVersion::OpenGLES2 || apiVersion == dp::ApiVersion::OpenGLES3)
+    if (apiVersion == dp::ApiVersion::OpenGLES3)
     {
       m_impl = make_unique_dp<GLVertexArrayBufferImpl>();
     }
diff --git a/libs/drape/vulkan/vulkan_utils.cpp b/libs/drape/vulkan/vulkan_utils.cpp
index bd76b10c1..096bb7a0c 100644
--- a/libs/drape/vulkan/vulkan_utils.cpp
+++ b/libs/drape/vulkan/vulkan_utils.cpp
@@ -162,7 +162,7 @@ VkFormat VulkanFormatUnpacker::Unpack(TextureFormat format)
   switch (format)
   {
   case TextureFormat::RGBA8: return VK_FORMAT_R8G8B8A8_UNORM;
-  case TextureFormat::Alpha: return VK_FORMAT_R8_UNORM;
+  case TextureFormat::Red: return VK_FORMAT_R8_UNORM;
   case TextureFormat::RedGreen: return VK_FORMAT_R8G8_UNORM;
 #if defined(OMIM_OS_MAC)
   case TextureFormat::DepthStencil: return VK_FORMAT_D32_SFLOAT_S8_UINT;
diff --git a/libs/drape_frontend/arrow3d.cpp b/libs/drape_frontend/arrow3d.cpp
index 48bf8f6e6..d76340757 100644
--- a/libs/drape_frontend/arrow3d.cpp
+++ b/libs/drape_frontend/arrow3d.cpp
@@ -308,7 +308,7 @@ Arrow3d::Arrow3d(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::TextureManage
 
   // Workaround for OpenGL: some devices require any texture to be set in the rendering pipeline.
   auto const apiVersion = context->GetApiVersion();
-  if (apiVersion == dp::ApiVersion::OpenGLES2 || apiVersion == dp::ApiVersion::OpenGLES3)
+  if (apiVersion == dp::ApiVersion::OpenGLES3)
     m_state.SetColorTexture(texMng->GetSymbolsTexture());
 
   m_isValid = preloadedData.m_meshData.has_value();
diff --git a/libs/drape_frontend/frontend_renderer.cpp b/libs/drape_frontend/frontend_renderer.cpp
index b0a3154ae..a34cc558d 100755
--- a/libs/drape_frontend/frontend_renderer.cpp
+++ b/libs/drape_frontend/frontend_renderer.cpp
@@ -1424,7 +1424,7 @@ void FrontendRenderer::RenderScene(ScreenBase const & modelView, bool activeFram
     RefreshBgColor();
 
     uint32_t clearBits = dp::ClearBits::ColorBit | dp::ClearBits::DepthBit;
-    if (m_apiVersion == dp::ApiVersion::OpenGLES2 || m_apiVersion == dp::ApiVersion::OpenGLES3)
+    if (m_apiVersion == dp::ApiVersion::OpenGLES3)
       clearBits |= dp::ClearBits::StencilBit;
 
     uint32_t storeBits = dp::ClearBits::ColorBit;
@@ -1522,7 +1522,7 @@ void FrontendRenderer::RenderScene(ScreenBase const & modelView, bool activeFram
   if (IsValidCurrentZoom())
   {
     uint32_t clearBits = dp::ClearBits::DepthBit;
-    if (m_apiVersion == dp::ApiVersion::OpenGLES2 || m_apiVersion == dp::ApiVersion::OpenGLES3)
+    if (m_apiVersion == dp::ApiVersion::OpenGLES3)
       clearBits |= dp::ClearBits::StencilBit;
     m_context->Clear(clearBits, dp::kClearBitsStoreAll);
 
diff --git a/libs/drape_frontend/gui/layer_render.cpp b/libs/drape_frontend/gui/layer_render.cpp
index bace4c1a5..5ab3239c9 100644
--- a/libs/drape_frontend/gui/layer_render.cpp
+++ b/libs/drape_frontend/gui/layer_render.cpp
@@ -369,7 +369,6 @@ void LayerCacher::CacheScaleFpsLabel(ref_ptr<dp::GraphicsContext> context, Posit
     std::string apiLabel;
     switch (apiVersion)
     {
-    case dp::ApiVersion::OpenGLES2: apiLabel = "GL2"; break;
     case dp::ApiVersion::OpenGLES3: apiLabel = "GL3"; break;
     case dp::ApiVersion::Metal: apiLabel = "M"; break;
     case dp::ApiVersion::Vulkan: apiLabel = "V"; break;
diff --git a/libs/drape_frontend/postprocess_renderer.cpp b/libs/drape_frontend/postprocess_renderer.cpp
index 0118f5dd1..083eeabe2 100644
--- a/libs/drape_frontend/postprocess_renderer.cpp
+++ b/libs/drape_frontend/postprocess_renderer.cpp
@@ -203,10 +203,6 @@ bool PostprocessRenderer::IsEnabled() const
 void PostprocessRenderer::SetEffectEnabled(ref_ptr<dp::GraphicsContext> context,
                                            Effect effect, bool enabled)
 {
-  // Do not support AA for OpenGLES 2.0.
-  if (m_apiVersion == dp::ApiVersion::OpenGLES2 && effect == Effect::Antialiasing)
-    return;
-
   auto const oldValue = m_effects;
   auto const effectMask = static_cast<uint32_t>(effect);
   m_effects = (m_effects & ~effectMask) | (enabled ? effectMask : 0);
@@ -238,7 +234,7 @@ bool PostprocessRenderer::CanRenderAntialiasing() const
     return false;
   }
 
-  if (m_apiVersion == dp::ApiVersion::OpenGLES2 || m_apiVersion == dp::ApiVersion::OpenGLES3)
+  if (m_apiVersion == dp::ApiVersion::OpenGLES3)
   {
     return m_staticTextures->m_smaaAreaTexture->GetID() != 0 &&
            m_staticTextures->m_smaaSearchTexture->GetID() != 0;
@@ -289,7 +285,7 @@ bool PostprocessRenderer::EndFrame(ref_ptr<dp::GraphicsContext> context,
     ASSERT(m_staticTextures->m_smaaAreaTexture != nullptr, ());
     ASSERT(m_staticTextures->m_smaaSearchTexture != nullptr, ());
 
-    if (m_apiVersion == dp::ApiVersion::OpenGLES2 || m_apiVersion == dp::ApiVersion::OpenGLES3)
+    if (m_apiVersion == dp::ApiVersion::OpenGLES3)
     {
       ASSERT_GREATER(m_staticTextures->m_smaaAreaTexture->GetID(), 0, ());
       ASSERT_GREATER(m_staticTextures->m_smaaSearchTexture->GetID(), 0, ());
@@ -418,15 +414,12 @@ void PostprocessRenderer::UpdateFramebuffers(ref_ptr<dp::GraphicsContext> contex
   ASSERT_NOT_EQUAL(height, 0, ());
 
   CHECK_EQUAL(m_apiVersion, context->GetApiVersion(), ());
-  InitFramebuffer(context, m_mainFramebuffer, width, height, true /* depthEnabled */,
-                  m_apiVersion != dp::ApiVersion::OpenGLES2 /* stencilEnabled */);
+  InitFramebuffer(context, m_mainFramebuffer, width, height, true /* depthEnabled */, true /* stencilEnabled */);
   m_isMainFramebufferRendered = false;
 
   m_isSmaaFramebufferRendered = false;
   if (!m_isRouteFollowingActive && IsEffectEnabled(Effect::Antialiasing))
   {
-    CHECK_NOT_EQUAL(m_apiVersion, dp::ApiVersion::OpenGLES2, ());
-
     InitFramebuffer(context, m_edgesFramebuffer, dp::TextureFormat::RedGreen,
                     m_mainFramebuffer->GetDepthStencilRef(),
                     width, height);
diff --git a/libs/map/framework.hpp b/libs/map/framework.hpp
index c2e4aee68..5df56f8dc 100644
--- a/libs/map/framework.hpp
+++ b/libs/map/framework.hpp
@@ -395,7 +395,7 @@ private:
 public:
   struct DrapeCreationParams
   {
-    dp::ApiVersion m_apiVersion = dp::ApiVersion::OpenGLES2;
+    dp::ApiVersion m_apiVersion = dp::ApiVersion::OpenGLES3;
     float m_visualScale = 1.0f;
     int m_surfaceWidth = 0;
     int m_surfaceHeight = 0;
diff --git a/libs/qt_tstfrm/test_main_loop.cpp b/libs/qt_tstfrm/test_main_loop.cpp
index 1f773c307..ecd051886 100644
--- a/libs/qt_tstfrm/test_main_loop.cpp
+++ b/libs/qt_tstfrm/test_main_loop.cpp
@@ -51,8 +51,7 @@ void RunTestLoop(char const * testName, testing::RenderFunction && fn, bool auto
   app.exec();
 }
 
-void RunTestInOpenGLOffscreenEnvironment(char const * testName, bool apiOpenGLES3,
-                                         testing::TestFunction const & fn)
+void RunTestInOpenGLOffscreenEnvironment(char const * testName, testing::TestFunction const & fn)
 {
   std::vector<char> buf(strlen(testName) + 1);
   strcpy(buf.data(), testName);
@@ -71,16 +70,8 @@ void RunTestInOpenGLOffscreenEnvironment(char const * testName, bool apiOpenGLES
   fmt.setSwapBehavior(QSurfaceFormat::DoubleBuffer);
   fmt.setSwapInterval(1);
   fmt.setDepthBufferSize(16);
-  if (apiOpenGLES3)
-  {
-    fmt.setProfile(QSurfaceFormat::CoreProfile);
-    fmt.setVersion(3, 2);
-  }
-  else
-  {
-    fmt.setProfile(QSurfaceFormat::CompatibilityProfile);
-    fmt.setVersion(2, 1);
-  }
+  fmt.setProfile(QSurfaceFormat::CoreProfile);
+  fmt.setVersion(3, 2);
 
   auto surface = std::make_unique<QOffscreenSurface>();
   surface->setFormat(fmt);
@@ -92,7 +83,7 @@ void RunTestInOpenGLOffscreenEnvironment(char const * testName, bool apiOpenGLES
   context->makeCurrent(surface.get());
 
   if (fn)
-    fn(apiOpenGLES3);
+    fn();
 
   context->doneCurrent();
   surface->destroy();
diff --git a/libs/qt_tstfrm/test_main_loop.hpp b/libs/qt_tstfrm/test_main_loop.hpp
index f47e0a2ee..4796b99f7 100644
--- a/libs/qt_tstfrm/test_main_loop.hpp
+++ b/libs/qt_tstfrm/test_main_loop.hpp
@@ -6,9 +6,9 @@ class QPaintDevice;
 namespace testing
 {
 using RenderFunction = std::function<void (QPaintDevice *)>;
-using TestFunction = std::function<void (bool apiOpenGLES3)>;
+using TestFunction = std::function<void ()>;
 }  // namespace testing
 
 extern void RunTestLoop(char const * testName, testing::RenderFunction && fn, bool autoExit = true);
 
-extern void RunTestInOpenGLOffscreenEnvironment(char const * testName, bool apiOpenGLES3, testing::TestFunction const & fn);
+extern void RunTestInOpenGLOffscreenEnvironment(char const * testName, testing::TestFunction const & fn);
diff --git a/libs/shaders/gl_shaders_preprocessor.py b/libs/shaders/gl_shaders_preprocessor.py
index f327697be..a3f2aac1f 100755
--- a/libs/shaders/gl_shaders_preprocessor.py
+++ b/libs/shaders/gl_shaders_preprocessor.py
@@ -253,14 +253,7 @@ def write_implementation_file(programs_def, shader_index, shader_dir, impl_file,
 
         file.write("GLProgramInfo GetProgramInfo(dp::ApiVersion apiVersion, Program program)\n")
         file.write("{\n")
-        file.write("  if (apiVersion == dp::ApiVersion::OpenGLES2)\n")
-        file.write("  {\n")
-        file.write("    static std::array<GLProgramInfo, static_cast<size_t>(Program::ProgramsCount)> gpuIndex = {{\n")
-        write_gpu_programs_map(file, programs_def, '')
-        file.write("    }};\n")
-        file.write("    return gpuIndex[static_cast<size_t>(program)];\n")
-        file.write("  }\n")
-        file.write("  else if (apiVersion == dp::ApiVersion::OpenGLES3)\n")
+        file.write("  if (apiVersion == dp::ApiVersion::OpenGLES3)\n") # TODO: remove
         file.write("  {\n")
         file.write("    static std::array<GLProgramInfo, static_cast<size_t>(Program::ProgramsCount)> gpuIndex = {{\n")
         write_gpu_programs_map(file, programs_def, GLES3_PREFIX)
diff --git a/libs/shaders/program_manager.cpp b/libs/shaders/program_manager.cpp
index e983eb2da..e413c7021 100644
--- a/libs/shaders/program_manager.cpp
+++ b/libs/shaders/program_manager.cpp
@@ -19,7 +19,7 @@ void ProgramManager::Init(ref_ptr<dp::GraphicsContext> context)
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
   auto const apiVersion = context->GetApiVersion();
-  if (apiVersion == dp::ApiVersion::OpenGLES2 || apiVersion == dp::ApiVersion::OpenGLES3)
+  if (apiVersion == dp::ApiVersion::OpenGLES3)
   {
     InitForOpenGL(context);
   }
diff --git a/libs/shaders/shaders_tests/gl_program_params_tests.cpp b/libs/shaders/shaders_tests/gl_program_params_tests.cpp
index 6a69ff0ed..3b96e0d53 100644
--- a/libs/shaders/shaders_tests/gl_program_params_tests.cpp
+++ b/libs/shaders/shaders_tests/gl_program_params_tests.cpp
@@ -15,9 +15,9 @@
 using namespace std::placeholders;
 
 template <typename ProgramParams>
-void TestProgramParams(bool apiOpenGLES3)
+void TestProgramParams()
 {
-  auto const api = apiOpenGLES3 ? dp::ApiVersion::OpenGLES3 : dp::ApiVersion::OpenGLES2;
+  auto constexpr api = dp::ApiVersion::OpenGLES3;
   TestingGraphicsContext context(api);
   GLFunctions::Init(api);
   gpu::GLProgramPool pool(api);
@@ -37,91 +37,61 @@ void TestProgramParams(bool apiOpenGLES3)
 #ifdef OMIM_OS_MAC
 UNIT_TEST(MapProgramParams_Test)
 {
-  RunTestInOpenGLOffscreenEnvironment("MapProgramParams_Test", false /* apiOpenGLES3 */,
-                                      std::bind(&TestProgramParams<gpu::MapProgramParams>, _1));
-
-  RunTestInOpenGLOffscreenEnvironment("MapProgramParams_Test", true /* apiOpenGLES3 */,
-                                      std::bind(&TestProgramParams<gpu::MapProgramParams>, _1));
+  RunTestInOpenGLOffscreenEnvironment("MapProgramParams_Test",
+                                      std::bind(&TestProgramParams<gpu::MapProgramParams>));
 }
 
 UNIT_TEST(RouteProgramParams_Test)
 {
-  RunTestInOpenGLOffscreenEnvironment("RouteProgramParams_Test", false /* apiOpenGLES3 */,
-                                      std::bind(&TestProgramParams<gpu::RouteProgramParams>, _1));
-
-  RunTestInOpenGLOffscreenEnvironment("RouteProgramParams_Test", true /* apiOpenGLES3 */,
-                                      std::bind(&TestProgramParams<gpu::RouteProgramParams>, _1));
+  RunTestInOpenGLOffscreenEnvironment("RouteProgramParams_Test",
+                                      std::bind(&TestProgramParams<gpu::RouteProgramParams>));
 }
 
 UNIT_TEST(TrafficProgramParams_Test)
 {
-  RunTestInOpenGLOffscreenEnvironment("TrafficProgramParams_Test", false /* apiOpenGLES3 */,
-                                      std::bind(&TestProgramParams<gpu::TrafficProgramParams>, _1));
-
-  RunTestInOpenGLOffscreenEnvironment("TrafficProgramParams_Test", true /* apiOpenGLES3 */,
-                                      std::bind(&TestProgramParams<gpu::TrafficProgramParams>, _1));
+  RunTestInOpenGLOffscreenEnvironment("TrafficProgramParams_Test",
+                                      std::bind(&TestProgramParams<gpu::TrafficProgramParams>));
 }
 
 UNIT_TEST(TransitProgramParams_Test)
 {
-  RunTestInOpenGLOffscreenEnvironment("TransitProgramParams_Test", false /* apiOpenGLES3 */,
-                                      std::bind(&TestProgramParams<gpu::TransitProgramParams>, _1));
-
-  RunTestInOpenGLOffscreenEnvironment("TransitProgramParams_Test", true /* apiOpenGLES3 */,
-                                      std::bind(&TestProgramParams<gpu::TransitProgramParams>, _1));
+  RunTestInOpenGLOffscreenEnvironment("TransitProgramParams_Test",
+                                      std::bind(&TestProgramParams<gpu::TransitProgramParams>));
 }
 
 UNIT_TEST(GuiProgramParams_Test)
 {
-  RunTestInOpenGLOffscreenEnvironment("GuiProgramParams_Test", false /* apiOpenGLES3 */,
-                                      std::bind(&TestProgramParams<gpu::GuiProgramParams>, _1));
-
-  RunTestInOpenGLOffscreenEnvironment("GuiProgramParams_Test", true /* apiOpenGLES3 */,
-                                      std::bind(&TestProgramParams<gpu::GuiProgramParams>, _1));
+  RunTestInOpenGLOffscreenEnvironment("GuiProgramParams_Test",
+                                      std::bind(&TestProgramParams<gpu::GuiProgramParams>));
 }
 
 UNIT_TEST(ShapesProgramParams_Test)
 {
-  RunTestInOpenGLOffscreenEnvironment("ShapesProgramParams_Test", false /* apiOpenGLES3 */,
-                                      std::bind(&TestProgramParams<gpu::ShapesProgramParams>, _1));
-
-  RunTestInOpenGLOffscreenEnvironment("ShapesProgramParams_Test", true /* apiOpenGLES3 */,
-                                      std::bind(&TestProgramParams<gpu::ShapesProgramParams>, _1));
+  RunTestInOpenGLOffscreenEnvironment("ShapesProgramParams_Test",
+                                      std::bind(&TestProgramParams<gpu::ShapesProgramParams>));
 }
 
 UNIT_TEST(Arrow3dProgramParams_Test)
 {
-  RunTestInOpenGLOffscreenEnvironment("Arrow3dProgramParams_Test", false /* apiOpenGLES3 */,
-                                      std::bind(&TestProgramParams<gpu::Arrow3dProgramParams>, _1));
-
-  RunTestInOpenGLOffscreenEnvironment("Arrow3dProgramParams_Test", true /* apiOpenGLES3 */,
-                                      std::bind(&TestProgramParams<gpu::Arrow3dProgramParams>, _1));
+  RunTestInOpenGLOffscreenEnvironment("Arrow3dProgramParams_Test",
+                                      std::bind(&TestProgramParams<gpu::Arrow3dProgramParams>));
 }
 
 UNIT_TEST(DebugRectProgramParams_Test)
 {
-  RunTestInOpenGLOffscreenEnvironment("DebugRectProgramParams_Test", false /* apiOpenGLES3 */,
-                                      std::bind(&TestProgramParams<gpu::DebugRectProgramParams>, _1));
-
-  RunTestInOpenGLOffscreenEnvironment("DebugRectProgramParams_Test", true /* apiOpenGLES3 */,
-                                      std::bind(&TestProgramParams<gpu::DebugRectProgramParams>, _1));
+  RunTestInOpenGLOffscreenEnvironment("DebugRectProgramParams_Test",
+                                      std::bind(&TestProgramParams<gpu::DebugRectProgramParams>));
 }
 
 UNIT_TEST(ScreenQuadProgramParams_Test)
 {
-  RunTestInOpenGLOffscreenEnvironment("ScreenQuadProgramParams_Test", false /* apiOpenGLES3 */,
-                                      std::bind(&TestProgramParams<gpu::ScreenQuadProgramParams>, _1));
-
-  RunTestInOpenGLOffscreenEnvironment("ScreenQuadProgramParams_Test", true /* apiOpenGLES3 */,
-                                      std::bind(&TestProgramParams<gpu::ScreenQuadProgramParams>, _1));
+  RunTestInOpenGLOffscreenEnvironment("ScreenQuadProgramParams_Test",
+                                      std::bind(&TestProgramParams<gpu::ScreenQuadProgramParams>));
 }
 
 UNIT_TEST(SMAAProgramParams_Test)
 {
-  RunTestInOpenGLOffscreenEnvironment("SMAAProgramParams_Test", false /* apiOpenGLES3 */,
-                                      std::bind(&TestProgramParams<gpu::SMAAProgramParams>, _1));
-
-  RunTestInOpenGLOffscreenEnvironment("SMAAProgramParams_Test", true /* apiOpenGLES3 */,
-                                      std::bind(&TestProgramParams<gpu::SMAAProgramParams>, _1));
+  RunTestInOpenGLOffscreenEnvironment("SMAAProgramParams_Test",
+                                      std::bind(&TestProgramParams<gpu::SMAAProgramParams>));
 }
 #endif
diff --git a/libs/shaders/shaders_tests/gl_shaders_desktop_compile_tests.cpp b/libs/shaders/shaders_tests/gl_shaders_desktop_compile_tests.cpp
index 67c84e9fb..10f8eeec8 100644
--- a/libs/shaders/shaders_tests/gl_shaders_desktop_compile_tests.cpp
+++ b/libs/shaders/shaders_tests/gl_shaders_desktop_compile_tests.cpp
@@ -10,9 +10,9 @@
 
 using namespace std::placeholders;
 
-void CompileShaders(bool apiOpenGLES3, bool enableVTF)
+void CompileShaders(bool enableVTF)
 {
-  auto const api = apiOpenGLES3 ? dp::ApiVersion::OpenGLES3 : dp::ApiVersion::OpenGLES2;
+  auto constexpr api = dp::ApiVersion::OpenGLES3;
   GLFunctions::Init(api);
   gpu::GLProgramPool pool(api);
   if (enableVTF)
@@ -24,29 +24,17 @@ void CompileShaders(bool apiOpenGLES3, bool enableVTF)
 
 // These unit tests create Qt application and OGL context so can't be run in GUI-less Linux machine.
 #ifdef OMIM_OS_MAC
-UNIT_TEST(DesktopCompileShaders_GLES2_Test)
-{
-  RunTestInOpenGLOffscreenEnvironment("DesktopCompileShaders_GLES2_Test", false /* apiOpenGLES3 */,
-                                      std::bind(&CompileShaders, _1, false /* enableVTF */));
-}
-
 UNIT_TEST(DesktopCompileShaders_GLES3_Test)
 {
-  RunTestInOpenGLOffscreenEnvironment("DesktopCompileShaders_GLES3_Test", true /* apiOpenGLES3 */,
-                                      std::bind(&CompileShaders, _1, false /* enableVTF */));
+  RunTestInOpenGLOffscreenEnvironment("DesktopCompileShaders_GLES3_Test",
+                                      std::bind(&CompileShaders, false /* enableVTF */));
 
 }
 
-UNIT_TEST(DesktopCompileShaders_GLES2_VTF_Test)
-{
-  RunTestInOpenGLOffscreenEnvironment("DesktopCompileShaders_GLES2_VTF_Test", false /* apiOpenGLES3 */,
-                                      std::bind(&CompileShaders, _1, true /* enableVTF */));
-}
-
 UNIT_TEST(DesktopCompileShaders_GLES3_VTF_Test)
 {
-  RunTestInOpenGLOffscreenEnvironment("DesktopCompileShaders_GLES3_VTF_Test", true /* apiOpenGLES3 */,
-                                      std::bind(&CompileShaders, _1, true /* enableVTF */));
+  RunTestInOpenGLOffscreenEnvironment("DesktopCompileShaders_GLES3_VTF_Test",
+                                      std::bind(&CompileShaders, true /* enableVTF */));
 
 }
 #endif
diff --git a/libs/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp b/libs/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp
index 9ef3dc22c..ec25d31d8 100644
--- a/libs/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp
+++ b/libs/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp
@@ -26,9 +26,7 @@
 std::string const kCompilersDir = "shaders_compiler";
 
 #if defined(OMIM_OS_MAC)
-std::string const kMaliCompilerOpenGLES2Dir = "macos/mali_compiler";
 std::string const kMaliCompilerOpenGLES3Dir = "macos/mali_compiler_es3";
-std::string const kCompilerMaliOpenGLES2 = kMaliCompilerOpenGLES2Dir + "/malisc";
 std::string const kCompilerMaliOpenGLES3 = kMaliCompilerOpenGLES3Dir + "/malisc";
 std::string const kCompilerOpenGLES = "macos/glslangValidator";
 #elif defined(OMIM_OS_LINUX)
@@ -166,29 +164,15 @@ UNIT_TEST(MobileCompileShaders_Test)
 {
   base::DelayedThreadPool workerThread(6 /* threadsCount */);
 
-  workerThread.Push([] {
-    CompileShaders({dp::ApiVersion::OpenGLES2, GetCompilerPath(kCompilerOpenGLES)});
-  });
-
   workerThread.Push([] {
     CompileShaders({dp::ApiVersion::OpenGLES3, GetCompilerPath(kCompilerOpenGLES)});
   });
 
-  workerThread.Push([] {
-    CompileShaders({dp::ApiVersion::OpenGLES2, GetCompilerPath(kCompilerOpenGLES)},
-      "#define ENABLE_VTF\n");
-  });
-
   workerThread.Push([] {
     CompileShaders({dp::ApiVersion::OpenGLES3, GetCompilerPath(kCompilerOpenGLES)},
       "#define ENABLE_VTF\n");
   });
 
-  workerThread.Push([] {
-    CompileShaders({dp::ApiVersion::OpenGLES2, GetCompilerPath(kCompilerOpenGLES)},
-      "#define SAMSUNG_GOOGLE_NEXUS\n");
-  });
-
   workerThread.Push([] {
     CompileShaders({dp::ApiVersion::OpenGLES3, GetCompilerPath(kCompilerOpenGLES)},
       "#define SAMSUNG_GOOGLE_NEXUS\n");
@@ -474,16 +458,6 @@ UNIT_TEST(MALI_MobileCompileShaders_Test)
   driversES2new.insert(driversES2new.end(), driversES3new.begin(), driversES3new.end());
 
   std::vector<MaliCompilerData> const compilers = {
-#if defined(OMIM_OS_MAC)
-    {dp::ApiVersion::OpenGLES2,
-      GetCompilerPath(kCompilerMaliOpenGLES2),
-      GetCompilerPath(kMaliCompilerOpenGLES2Dir),
-      driversES2old},
-#endif
-    {dp::ApiVersion::OpenGLES2,
-     GetCompilerPath(kCompilerMaliOpenGLES3),
-     GetCompilerPath(kMaliCompilerOpenGLES3Dir),
-     driversES2new},
     {dp::ApiVersion::OpenGLES3,
      GetCompilerPath(kCompilerMaliOpenGLES3),
      GetCompilerPath(kMaliCompilerOpenGLES3Dir),
diff --git a/qt/qt_common/map_widget.cpp b/qt/qt_common/map_widget.cpp
index 07da1e31f..dc3f2455a 100644
--- a/qt/qt_common/map_widget.cpp
+++ b/qt/qt_common/map_widget.cpp
@@ -107,7 +107,7 @@ void MapWidget::CreateEngine()
 {
   Framework::DrapeCreationParams p;
 
-  p.m_apiVersion = m_apiOpenGLES3 ? dp::ApiVersion::OpenGLES3 : dp::ApiVersion::OpenGLES2;
+  p.m_apiVersion = dp::ApiVersion::OpenGLES3;
 
   p.m_surfaceWidth = m_screenshotMode ? width() : static_cast<int>(m_ratio * width());
   p.m_surfaceHeight = m_screenshotMode ? height() : static_cast<int>(m_ratio * height());
@@ -232,8 +232,6 @@ void MapWidget::Build()
 {
   std::string_view vertexSrc;
   std::string_view fragmentSrc;
-  if (m_apiOpenGLES3)
-  {
 #if defined(OMIM_OS_LINUX)
     vertexSrc = ":common/shaders/gles_300.vsh.glsl";
     fragmentSrc = ":common/shaders/gles_300.fsh.glsl";
@@ -241,12 +239,6 @@ void MapWidget::Build()
     vertexSrc = ":common/shaders/gl_150.vsh.glsl";
     fragmentSrc = ":common/shaders/gl_150.fsh.glsl";
 #endif
-  }
-  else
-  {
-    vertexSrc = ":common/shaders/gles_200.vsh.glsl";
-    fragmentSrc = ":common/shaders/gles_200.fsh.glsl";
-  }
 
   m_program = std::make_unique<QOpenGLShaderProgram>(this);
   m_program->addShaderFromSourceFile(QOpenGLShader::Vertex, vertexSrc.data());
@@ -348,8 +340,6 @@ void MapWidget::initializeGL()
   if (!m_screenshotMode)
     m_ratio = devicePixelRatio();
 
-  m_apiOpenGLES3 = true;
-
 #if defined(OMIM_OS_LINUX)
   {
     QOpenGLFunctions * funcs = context()->functions();
@@ -367,29 +357,14 @@ void MapWidget::initializeGL()
     auto fmt = context()->format();
     if (context()->format().version() < qMakePair(3, 0))
     {
-      LOG(LINFO, ("OpenGL ES version is below 3.0, taking the OpenGL ES 2.0 path"));
-      m_apiOpenGLES3 = false;
-
-      constexpr const char* requiredExtensions[3] =
-        { "GL_EXT_map_buffer_range", "GL_OES_mapbuffer", "GL_OES_vertex_array_object" };
-      for (auto & requiredExtension : requiredExtensions)
-      {
-        if (context()->hasExtension(QByteArray::fromStdString(requiredExtension)))
-          LOG(LDEBUG, ("Found OpenGL ES 2.0 extension: ", requiredExtension));
-        else
-          LOG(LCRITICAL, ("A required OpenGL ES 2.0 extension is missing:", requiredExtension));
-      }
-      fmt.setProfile(QSurfaceFormat::CompatibilityProfile);
-      fmt.setVersion(2, 0);
+      CHECK(false, ("OpenGL ES2 is not supported"));
     }
     else
     {
       LOG(LINFO, ("OpenGL version is at least 3.0, enabling GLSL '#version 300 es'"));
-      m_apiOpenGLES3 = true;
       fmt.setVersion(3, 0);
     }
 
-
     QSurfaceFormat::setDefaultFormat(fmt);
   }
 #endif
diff --git a/qt/qt_common/map_widget.hpp b/qt/qt_common/map_widget.hpp
index 304a51aea..aacb29237 100644
--- a/qt/qt_common/map_widget.hpp
+++ b/qt/qt_common/map_widget.hpp
@@ -97,7 +97,6 @@ protected:
   void wheelEvent(QWheelEvent * e) override;
 
   Framework & m_framework;
-  bool m_apiOpenGLES3;
   bool m_screenshotMode;
   ScaleSlider * m_slider;
   SliderState m_sliderState;
diff --git a/qt/qt_common/res/resources_common.qrc b/qt/qt_common/res/resources_common.qrc
index 8aa243bd9..0bc03d9f7 100644
--- a/qt/qt_common/res/resources_common.qrc
+++ b/qt/qt_common/res/resources_common.qrc
@@ -16,8 +16,6 @@
         <file>spinner12.png</file>
         <file>shaders/gl_150.fsh.glsl</file>
         <file>shaders/gl_150.vsh.glsl</file>
-        <file>shaders/gles_200.fsh.glsl</file>
-        <file>shaders/gles_200.vsh.glsl</file>
         <file>shaders/gles_300.fsh.glsl</file>
         <file>shaders/gles_300.vsh.glsl</file>
     </qresource>
diff --git a/qt/qt_common/res/shaders/gles_200.fsh.glsl b/qt/qt_common/res/shaders/gles_200.fsh.glsl
deleted file mode 100644
index baa46225b..000000000
--- a/qt/qt_common/res/shaders/gles_200.fsh.glsl
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifdef GL_ES
-#ifdef GL_FRAGMENT_PRECISION_HIGH
-precision highp float;
-#else
-precision mediump float;
-#endif
-#endif
-
-uniform sampler2D u_sampler;
-varying vec2 v_texCoord;
-
-void main()
-{
-    gl_FragColor = vec4(texture2D(u_sampler, v_texCoord).rgb, 1.0);
-}
diff --git a/qt/qt_common/res/shaders/gles_200.vsh.glsl b/qt/qt_common/res/shaders/gles_200.vsh.glsl
deleted file mode 100644
index 7d1208f96..000000000
--- a/qt/qt_common/res/shaders/gles_200.vsh.glsl
+++ /dev/null
@@ -1,9 +0,0 @@
-attribute vec4 a_position;
-uniform vec2 u_samplerSize;
-varying vec2 v_texCoord;
-
-void main()
-{
-    v_texCoord = vec2(a_position.z * u_samplerSize.x, a_position.w * u_samplerSize.y);
-    gl_Position = vec4(a_position.x, a_position.y, 0.0, 1.0);
-}

From 897d7a253dc6d543d99629faccc8afc08d3786f9 Mon Sep 17 00:00:00 2001
From: renderexpert <expert@renderconsulting.co.uk>
Date: Tue, 21 Jan 2025 14:39:31 +0000
Subject: [PATCH 027/302] Refactor shaders to use GLES3 syntax

Signed-off-by: renderexpert <expert@renderconsulting.co.uk>
---
 libs/drape/support_manager.cpp                |  5 --
 libs/drape/support_manager.hpp                |  2 -
 libs/shaders/GL/area.vsh.glsl                 | 10 ++--
 libs/shaders/GL/area3d.vsh.glsl               | 12 ++--
 libs/shaders/GL/area3d_outline.vsh.glsl       | 10 ++--
 libs/shaders/GL/arrow3d.fsh.glsl              | 11 ++--
 libs/shaders/GL/arrow3d.vsh.glsl              |  6 +-
 libs/shaders/GL/arrow3d_outline.fsh.glsl      | 11 ++--
 libs/shaders/GL/arrow3d_shadow.fsh.glsl       | 11 ++--
 libs/shaders/GL/arrow3d_shadow.vsh.glsl       |  6 +-
 libs/shaders/GL/arrow3d_textured.fsh.glsl     | 10 ++--
 libs/shaders/GL/arrow3d_textured.vsh.glsl     | 10 ++--
 libs/shaders/GL/circle.fsh.glsl               | 12 ++--
 libs/shaders/GL/circle.vsh.glsl               | 14 ++---
 libs/shaders/GL/circle_point.fsh.glsl         | 14 ++---
 libs/shaders/GL/circle_point.vsh.glsl         | 10 ++--
 libs/shaders/GL/colored_symbol.fsh.glsl       | 12 ++--
 libs/shaders/GL/colored_symbol.vsh.glsl       | 14 ++---
 .../GL/colored_symbol_billboard.vsh.glsl      | 14 ++---
 libs/shaders/GL/dashed_line.fsh.glsl          | 18 +++---
 libs/shaders/GL/dashed_line.vsh.glsl          | 14 ++---
 libs/shaders/GL/debug_rect.fsh.glsl           |  6 +-
 libs/shaders/GL/debug_rect.vsh.glsl           |  2 +-
 libs/shaders/GL/hatching_area.fsh.glsl        | 14 +++--
 libs/shaders/GL/hatching_area.vsh.glsl        | 14 ++---
 libs/shaders/GL/imgui.fsh.glsl                | 10 ++--
 libs/shaders/GL/imgui.vsh.glsl                | 10 ++--
 libs/shaders/GL/line.fsh.glsl                 | 12 ++--
 libs/shaders/GL/line.vsh.glsl                 | 14 ++---
 libs/shaders/GL/masked_texturing.fsh.glsl     | 10 ++--
 libs/shaders/GL/masked_texturing.vsh.glsl     | 12 ++--
 .../GL/masked_texturing_billboard.vsh.glsl    | 12 ++--
 libs/shaders/GL/my_position.vsh.glsl          |  6 +-
 libs/shaders/GL/path_symbol.vsh.glsl          |  8 +--
 libs/shaders/GL/position_accuracy3d.vsh.glsl  |  6 +-
 libs/shaders/GL/route.fsh.glsl                | 12 ++--
 libs/shaders/GL/route.vsh.glsl                | 12 ++--
 libs/shaders/GL/route_arrow.fsh.glsl          |  8 ++-
 libs/shaders/GL/route_arrow.vsh.glsl          |  8 +--
 libs/shaders/GL/route_dash.fsh.glsl           | 12 ++--
 libs/shaders/GL/route_marker.fsh.glsl         | 14 ++---
 libs/shaders/GL/route_marker.vsh.glsl         | 10 ++--
 libs/shaders/GL/ruler.vsh.glsl                |  8 +--
 libs/shaders/GL/screen_quad.vsh.glsl          |  6 +-
 libs/shaders/GL/selection_line.fsh.glsl       | 12 ++--
 libs/shaders/GL/selection_line.vsh.glsl       | 16 ++---
 libs/shaders/GL/shaders_lib.glsl              | 12 ----
 libs/shaders/GL/smaa_blending_weight.fsh.glsl | 40 +++++--------
 libs/shaders/GL/smaa_blending_weight.vsh.glsl | 12 ++--
 libs/shaders/GL/smaa_edges.fsh.glsl           | 26 +++++----
 libs/shaders/GL/smaa_edges.vsh.glsl           | 12 ++--
 libs/shaders/GL/smaa_final.fsh.glsl           | 22 ++++---
 libs/shaders/GL/smaa_final.vsh.glsl           |  8 +--
 libs/shaders/GL/solid_color.fsh.glsl          | 10 ++--
 libs/shaders/GL/text.fsh.glsl                 | 18 +++---
 libs/shaders/GL/text.vsh.glsl                 | 18 +++---
 libs/shaders/GL/text_billboard.vsh.glsl       | 16 ++---
 libs/shaders/GL/text_outlined.vsh.glsl        | 18 +++---
 .../GL/text_outlined_billboard.vsh.glsl       | 20 +++----
 libs/shaders/GL/text_outlined_gui.vsh.glsl    | 20 +++----
 libs/shaders/GL/texturing.fsh.glsl            |  8 ++-
 libs/shaders/GL/texturing.vsh.glsl            |  8 +--
 libs/shaders/GL/texturing3d.fsh.glsl          | 10 ++--
 libs/shaders/GL/texturing_billboard.vsh.glsl  |  8 +--
 libs/shaders/GL/texturing_gui.vsh.glsl        |  6 +-
 libs/shaders/GL/traffic.fsh.glsl              | 14 +++--
 libs/shaders/GL/traffic.vsh.glsl              | 12 ++--
 libs/shaders/GL/traffic_circle.fsh.glsl       | 10 ++--
 libs/shaders/GL/traffic_circle.vsh.glsl       | 10 ++--
 libs/shaders/GL/traffic_line.fsh.glsl         |  8 ++-
 libs/shaders/GL/traffic_line.vsh.glsl         |  6 +-
 libs/shaders/GL/transit.fsh.glsl              |  8 +--
 libs/shaders/GL/transit.vsh.glsl              |  8 +--
 libs/shaders/GL/transit_circle.fsh.glsl       | 12 ++--
 libs/shaders/GL/transit_circle.vsh.glsl       | 10 ++--
 libs/shaders/GL/transit_marker.fsh.glsl       | 10 ++--
 libs/shaders/GL/transit_marker.vsh.glsl       | 10 ++--
 libs/shaders/GL/user_mark.fsh.glsl            | 12 ++--
 libs/shaders/GL/user_mark.vsh.glsl            | 12 ++--
 libs/shaders/GL/user_mark_billboard.vsh.glsl  | 12 ++--
 libs/shaders/gl_program_pool.cpp              |  2 +-
 libs/shaders/gl_shaders_preprocessor.py       | 58 +++++--------------
 libs/shaders/program_manager.cpp              |  6 --
 .../gl_shaders_mobile_compile_test.cpp        | 22 ++-----
 84 files changed, 471 insertions(+), 543 deletions(-)

diff --git a/libs/drape/support_manager.cpp b/libs/drape/support_manager.cpp
index 21497ed9c..f9357d2b4 100644
--- a/libs/drape/support_manager.cpp
+++ b/libs/drape/support_manager.cpp
@@ -32,11 +32,6 @@ void SupportManager::Init(ref_ptr<GraphicsContext> context)
   m_rendererVersion = context->GetRendererVersion();
   LOG(LINFO, ("Renderer =", m_rendererName, "| Api =", context->GetApiVersion(), "| Version =", m_rendererVersion));
 
-  m_isSamsungGoogleNexus = (m_rendererName == "PowerVR SGX 540" &&
-                            m_rendererVersion.find("GOOGLENEXUS.ED945322") != std::string::npos);
-  if (m_isSamsungGoogleNexus)
-    LOG(LINFO, ("Samsung Google Nexus detected."));
-
   if (m_rendererName.find("Adreno") != std::string::npos)
   {
     std::array<std::string_view, 5> constexpr models = { "200", "203", "205", "220", "225" };
diff --git a/libs/drape/support_manager.hpp b/libs/drape/support_manager.hpp
index 4cb01da84..cddbb3cac 100644
--- a/libs/drape/support_manager.hpp
+++ b/libs/drape/support_manager.hpp
@@ -26,7 +26,6 @@ public:
   // reinitialization.
   void Init(ref_ptr<GraphicsContext> context);
 
-  bool IsSamsungGoogleNexus() const { return m_isSamsungGoogleNexus; }
   bool IsAdreno200Device() const { return m_isAdreno200; }
   bool IsTegraDevice() const { return m_isTegra; }
   bool IsAntialiasingEnabledByDefault() const { return m_isAntialiasingEnabledByDefault; }
@@ -51,7 +50,6 @@ private:
 
   std::string m_rendererName;
   std::string m_rendererVersion;
-  bool m_isSamsungGoogleNexus = false;
   bool m_isAdreno200 = false;
   bool m_isTegra = false;
   bool m_isAntialiasingEnabledByDefault = false;
diff --git a/libs/shaders/GL/area.vsh.glsl b/libs/shaders/GL/area.vsh.glsl
index fd47ba1ef..7e787a829 100644
--- a/libs/shaders/GL/area.vsh.glsl
+++ b/libs/shaders/GL/area.vsh.glsl
@@ -1,5 +1,5 @@
-attribute vec3 a_position;
-attribute vec2 a_colorTexCoords;
+in vec3 a_position;
+in vec2 a_colorTexCoords;
 
 uniform mat4 u_modelView;
 uniform mat4 u_projection;
@@ -7,9 +7,9 @@ uniform mat4 u_pivotTransform;
 
 #ifdef ENABLE_VTF
 uniform sampler2D u_colorTex;
-varying LOW_P vec4 v_color;
+out LOW_P vec4 v_color;
 #else
-varying vec2 v_colorTexCoords;
+out vec2 v_colorTexCoords;
 #endif
 
 void main()
@@ -17,7 +17,7 @@ void main()
   vec4 pos = vec4(a_position, 1) * u_modelView * u_projection;
   gl_Position = applyPivotTransform(pos, u_pivotTransform, 0.0);
 #ifdef ENABLE_VTF
-  v_color = texture2D(u_colorTex, a_colorTexCoords);
+  v_color = texture(u_colorTex, a_colorTexCoords);
 #else
   v_colorTexCoords = a_colorTexCoords;
 #endif
diff --git a/libs/shaders/GL/area3d.vsh.glsl b/libs/shaders/GL/area3d.vsh.glsl
index a0a4490b2..43c28f337 100644
--- a/libs/shaders/GL/area3d.vsh.glsl
+++ b/libs/shaders/GL/area3d.vsh.glsl
@@ -1,21 +1,21 @@
-attribute vec3 a_position;
-attribute vec3 a_normal;
-attribute vec2 a_colorTexCoords;
+in vec3 a_position;
+in vec3 a_normal;
+in vec2 a_colorTexCoords;
 
 uniform mat4 u_modelView;
 uniform mat4 u_projection;
 uniform mat4 u_pivotTransform;
 uniform float u_zScale;
 
-varying vec2 v_colorTexCoords;
-varying float v_intensity;
+out vec2 v_colorTexCoords;
+out float v_intensity;
 
 const vec4 kNormalizedLightDir = vec4(0.3162, 0.0, 0.9486, 0.0);
 
 void main()
 {
   vec4 pos = vec4(a_position, 1.0) * u_modelView;
-  
+
   vec4 normal = vec4(a_position + a_normal, 1.0) * u_modelView;
   normal.xyw = (normal * u_projection).xyw;
   normal.z = normal.z * u_zScale;
diff --git a/libs/shaders/GL/area3d_outline.vsh.glsl b/libs/shaders/GL/area3d_outline.vsh.glsl
index c5a04b0df..b488464c0 100644
--- a/libs/shaders/GL/area3d_outline.vsh.glsl
+++ b/libs/shaders/GL/area3d_outline.vsh.glsl
@@ -1,5 +1,5 @@
-attribute vec3 a_position;
-attribute vec2 a_colorTexCoords;
+in vec3 a_position;
+in vec2 a_colorTexCoords;
 
 uniform mat4 u_modelView;
 uniform mat4 u_projection;
@@ -8,9 +8,9 @@ uniform float u_zScale;
 
 #ifdef ENABLE_VTF
 uniform sampler2D u_colorTex;
-varying LOW_P vec4 v_color;
+out LOW_P vec4 v_color;
 #else
-varying vec2 v_colorTexCoords;
+out vec2 v_colorTexCoords;
 #endif
 
 void main()
@@ -25,7 +25,7 @@ void main()
 #endif
 
 #ifdef ENABLE_VTF
-  v_color = texture2D(u_colorTex, a_colorTexCoords);
+  v_color = texture(u_colorTex, a_colorTexCoords);
 #else
   v_colorTexCoords = a_colorTexCoords;
 #endif
diff --git a/libs/shaders/GL/arrow3d.fsh.glsl b/libs/shaders/GL/arrow3d.fsh.glsl
index 5870c40dd..3ac87ea52 100644
--- a/libs/shaders/GL/arrow3d.fsh.glsl
+++ b/libs/shaders/GL/arrow3d.fsh.glsl
@@ -1,16 +1,13 @@
-varying vec3 v_normal;
-
-#ifdef SAMSUNG_GOOGLE_NEXUS
-uniform sampler2D u_colorTex;
-#endif
+in vec3 v_normal;
 
 const vec3 lightDir = vec3(0.316, 0.0, 0.948);
 
 uniform vec4 u_color;
 
+out vec4 v_FragColor;
+
 void main()
 {
   float phongDiffuse = max(0.0, -dot(lightDir, v_normal));
-  vec4 resColor = vec4((phongDiffuse * 0.5 + 0.5) * u_color.rgb, u_color.a);
-  gl_FragColor = samsungGoogleNexusWorkaround(resColor);
+  v_FragColor = vec4((phongDiffuse * 0.5 + 0.5) * u_color.rgb, u_color.a);
 }
diff --git a/libs/shaders/GL/arrow3d.vsh.glsl b/libs/shaders/GL/arrow3d.vsh.glsl
index 4b2772b99..573823769 100644
--- a/libs/shaders/GL/arrow3d.vsh.glsl
+++ b/libs/shaders/GL/arrow3d.vsh.glsl
@@ -1,10 +1,10 @@
-attribute vec3 a_pos;
-attribute vec3 a_normal;
+in vec3 a_pos;
+in vec3 a_normal;
 
 uniform mat4 u_transform;
 uniform mat4 u_normalTransform;
 
-varying vec3 v_normal;
+out vec3 v_normal;
 
 void main()
 {
diff --git a/libs/shaders/GL/arrow3d_outline.fsh.glsl b/libs/shaders/GL/arrow3d_outline.fsh.glsl
index 4b523a8cf..810d0ef56 100644
--- a/libs/shaders/GL/arrow3d_outline.fsh.glsl
+++ b/libs/shaders/GL/arrow3d_outline.fsh.glsl
@@ -1,13 +1,10 @@
-varying float v_intensity;
-
-#ifdef SAMSUNG_GOOGLE_NEXUS
-uniform sampler2D u_colorTex;
-#endif
+in float v_intensity;
 
 uniform vec4 u_color;
 
+out vec4 v_FragColor;
+
 void main()
 {
-  vec4 resColor = vec4(u_color.rgb, u_color.a * smoothstep(0.7, 1.0, v_intensity));
-  gl_FragColor = samsungGoogleNexusWorkaround(resColor);
+  v_FragColor = vec4(u_color.rgb, u_color.a * smoothstep(0.7, 1.0, v_intensity));
 }
diff --git a/libs/shaders/GL/arrow3d_shadow.fsh.glsl b/libs/shaders/GL/arrow3d_shadow.fsh.glsl
index ba53653df..48c160ec9 100644
--- a/libs/shaders/GL/arrow3d_shadow.fsh.glsl
+++ b/libs/shaders/GL/arrow3d_shadow.fsh.glsl
@@ -1,13 +1,10 @@
-varying float v_intensity;
-
-#ifdef SAMSUNG_GOOGLE_NEXUS
-uniform sampler2D u_colorTex;
-#endif
+in float v_intensity;
 
 uniform vec4 u_color;
 
+out vec4 v_FragColor;
+
 void main()
 {
-  vec4 resColor = vec4(u_color.rgb, u_color.a * v_intensity);
-  gl_FragColor = samsungGoogleNexusWorkaround(resColor);
+  v_FragColor = vec4(u_color.rgb, u_color.a * v_intensity);
 }
diff --git a/libs/shaders/GL/arrow3d_shadow.vsh.glsl b/libs/shaders/GL/arrow3d_shadow.vsh.glsl
index a8491441e..57860b9d6 100644
--- a/libs/shaders/GL/arrow3d_shadow.vsh.glsl
+++ b/libs/shaders/GL/arrow3d_shadow.vsh.glsl
@@ -1,9 +1,9 @@
-attribute vec3 a_pos;
-attribute vec2 a_texCoords;
+in vec3 a_pos;
+in vec2 a_texCoords;
 
 uniform mat4 u_transform;
 
-varying float v_intensity;
+out float v_intensity;
 
 void main()
 {
diff --git a/libs/shaders/GL/arrow3d_textured.fsh.glsl b/libs/shaders/GL/arrow3d_textured.fsh.glsl
index 56ab3b8ce..8b67447ed 100644
--- a/libs/shaders/GL/arrow3d_textured.fsh.glsl
+++ b/libs/shaders/GL/arrow3d_textured.fsh.glsl
@@ -1,5 +1,5 @@
-varying vec3 v_normal;
-varying vec2 v_texCoords;
+in vec3 v_normal;
+in vec2 v_texCoords;
 
 uniform sampler2D u_colorTex;
 
@@ -7,9 +7,11 @@ const vec3 lightDir = vec3(0.316, 0.0, 0.948);
 
 uniform vec4 u_color;
 
+out vec4 v_FragColor;
+
 void main()
 {
   float phongDiffuse = max(0.0, -dot(lightDir, v_normal));
-  vec4 color = texture2D(u_colorTex, v_texCoords) * u_color;
-  gl_FragColor = vec4((phongDiffuse * 0.5 + 0.5) * color.rgb, color.a);
+  vec4 color = texture(u_colorTex, v_texCoords) * u_color;
+  v_FragColor = vec4((phongDiffuse * 0.5 + 0.5) * color.rgb, color.a);
 }
diff --git a/libs/shaders/GL/arrow3d_textured.vsh.glsl b/libs/shaders/GL/arrow3d_textured.vsh.glsl
index 6aafa796d..ea0428f4e 100644
--- a/libs/shaders/GL/arrow3d_textured.vsh.glsl
+++ b/libs/shaders/GL/arrow3d_textured.vsh.glsl
@@ -1,13 +1,13 @@
-attribute vec3 a_pos;
-attribute vec3 a_normal;
-attribute vec2 a_texCoords;
+in vec3 a_pos;
+in vec3 a_normal;
+in vec2 a_texCoords;
 
 uniform mat4 u_transform;
 uniform mat4 u_normalTransform;
 uniform vec2 u_texCoordFlipping;
 
-varying vec3 v_normal;
-varying vec2 v_texCoords;
+out vec3 v_normal;
+out vec2 v_texCoords;
 
 void main()
 {
diff --git a/libs/shaders/GL/circle.fsh.glsl b/libs/shaders/GL/circle.fsh.glsl
index e81ece067..33f251b5c 100644
--- a/libs/shaders/GL/circle.fsh.glsl
+++ b/libs/shaders/GL/circle.fsh.glsl
@@ -1,26 +1,28 @@
 uniform float u_opacity;
 #ifdef ENABLE_VTF
-varying LOW_P vec4 v_color;
+in LOW_P vec4 v_color;
 #else
 uniform sampler2D u_colorTex;
-varying vec2 v_colorTexCoords;
+in vec2 v_colorTexCoords;
 #endif
 
-varying vec3 v_radius;
+in vec3 v_radius;
 
 const float aaPixelsCount = 2.5;
 
+out vec4 v_FragColor;
+
 void main()
 {
 #ifdef ENABLE_VTF
   LOW_P vec4 finalColor = v_color;
 #else
-  LOW_P vec4 finalColor = texture2D(u_colorTex, v_colorTexCoords);
+  LOW_P vec4 finalColor = texture(u_colorTex, v_colorTexCoords);
 #endif
 
   float smallRadius = v_radius.z - aaPixelsCount;
   float stepValue = smoothstep(smallRadius * smallRadius, v_radius.z * v_radius.z,
                                v_radius.x * v_radius.x + v_radius.y * v_radius.y);
   finalColor.a = finalColor.a * u_opacity * (1.0 - stepValue);
-  gl_FragColor = finalColor;
+  v_FragColor = finalColor;
 }
diff --git a/libs/shaders/GL/circle.vsh.glsl b/libs/shaders/GL/circle.vsh.glsl
index 119146405..c94dcc8f4 100644
--- a/libs/shaders/GL/circle.vsh.glsl
+++ b/libs/shaders/GL/circle.vsh.glsl
@@ -1,6 +1,6 @@
-attribute vec3 a_position;
-attribute vec3 a_normal;
-attribute vec2 a_colorTexCoords;
+in vec3 a_position;
+in vec3 a_normal;
+in vec2 a_colorTexCoords;
 
 uniform mat4 u_modelView;
 uniform mat4 u_projection;
@@ -8,12 +8,12 @@ uniform mat4 u_pivotTransform;
 
 #ifdef ENABLE_VTF
 uniform sampler2D u_colorTex;
-varying LOW_P vec4 v_color;
+out LOW_P vec4 v_color;
 #else
-varying vec2 v_colorTexCoords;
+out vec2 v_colorTexCoords;
 #endif
 
-varying vec3 v_radius;
+out vec3 v_radius;
 
 void main()
 {
@@ -21,7 +21,7 @@ void main()
   vec4 pos = vec4(a_normal.xy, 0, 0) + p;
   gl_Position = applyPivotTransform(pos * u_projection, u_pivotTransform, 0.0);
 #ifdef ENABLE_VTF
-  v_color = texture2D(u_colorTex, a_colorTexCoords);
+  v_color = texture(u_colorTex, a_colorTexCoords);
 #else
   v_colorTexCoords = a_colorTexCoords;
 #endif
diff --git a/libs/shaders/GL/circle_point.fsh.glsl b/libs/shaders/GL/circle_point.fsh.glsl
index f96beba50..57fcd7dcb 100644
--- a/libs/shaders/GL/circle_point.fsh.glsl
+++ b/libs/shaders/GL/circle_point.fsh.glsl
@@ -1,22 +1,20 @@
-#ifdef SAMSUNG_GOOGLE_NEXUS
-uniform sampler2D u_colorTex;
-#endif
-
 uniform float u_opacity;
 
-varying vec3 v_radius;
-varying vec4 v_color;
+in vec3 v_radius;
+in vec4 v_color;
 
 const float kAntialiasingScalar = 0.9;
 
+out vec4 v_FragColor;
+
 void main()
 {
   float d = dot(v_radius.xy, v_radius.xy);
   vec4 finalColor = v_color;
-  
+
   float aaRadius = v_radius.z * kAntialiasingScalar;
   float stepValue = smoothstep(aaRadius * aaRadius, v_radius.z * v_radius.z, d);
   finalColor.a = finalColor.a * u_opacity * (1.0 - stepValue);
 
-  gl_FragColor = samsungGoogleNexusWorkaround(finalColor);
+  v_FragColor = finalColor;
 }
diff --git a/libs/shaders/GL/circle_point.vsh.glsl b/libs/shaders/GL/circle_point.vsh.glsl
index ca165c806..3b125dec4 100644
--- a/libs/shaders/GL/circle_point.vsh.glsl
+++ b/libs/shaders/GL/circle_point.vsh.glsl
@@ -1,13 +1,13 @@
-attribute vec3 a_normal;
-attribute vec3 a_position;
-attribute vec4 a_color;
+in vec3 a_normal;
+in vec3 a_position;
+in vec4 a_color;
 
 uniform mat4 u_modelView;
 uniform mat4 u_projection;
 uniform mat4 u_pivotTransform;
 
-varying vec3 v_radius;
-varying vec4 v_color;
+out vec3 v_radius;
+out vec4 v_color;
 
 void main()
 {
diff --git a/libs/shaders/GL/colored_symbol.fsh.glsl b/libs/shaders/GL/colored_symbol.fsh.glsl
index 4329d213e..384460e47 100644
--- a/libs/shaders/GL/colored_symbol.fsh.glsl
+++ b/libs/shaders/GL/colored_symbol.fsh.glsl
@@ -1,21 +1,23 @@
 uniform float u_opacity;
 
-varying vec4 v_normal;
+in vec4 v_normal;
 #ifdef ENABLE_VTF
-varying LOW_P vec4 v_color;
+in LOW_P vec4 v_color;
 #else
 uniform sampler2D u_colorTex;
-varying vec2 v_colorTexCoords;
+in vec2 v_colorTexCoords;
 #endif
 
 const float aaPixelsCount = 2.5;
 
+out vec4 v_FragColor;
+
 void main()
 {
 #ifdef ENABLE_VTF
   LOW_P vec4 color = v_color;
 #else
-  LOW_P vec4 color = texture2D(u_colorTex, v_colorTexCoords);
+  LOW_P vec4 color = texture(u_colorTex, v_colorTexCoords);
 #endif
 
   float r1 = (v_normal.z - aaPixelsCount) * (v_normal.z - aaPixelsCount);
@@ -28,5 +30,5 @@ void main()
   if (finalColor.a == 0.0)
     discard;
 
-  gl_FragColor = finalColor;
+  v_FragColor = finalColor;
 }
diff --git a/libs/shaders/GL/colored_symbol.vsh.glsl b/libs/shaders/GL/colored_symbol.vsh.glsl
index 1d75acf94..b253a9ce0 100644
--- a/libs/shaders/GL/colored_symbol.vsh.glsl
+++ b/libs/shaders/GL/colored_symbol.vsh.glsl
@@ -1,17 +1,17 @@
-attribute vec3 a_position;
-attribute vec4 a_normal;
-attribute vec4 a_colorTexCoords;
+in vec3 a_position;
+in vec4 a_normal;
+in vec4 a_colorTexCoords;
 
 uniform mat4 u_modelView;
 uniform mat4 u_projection;
 uniform mat4 u_pivotTransform;
 
-varying vec4 v_normal;
+out vec4 v_normal;
 #ifdef ENABLE_VTF
 uniform sampler2D u_colorTex;
-varying LOW_P vec4 v_color;
+out LOW_P vec4 v_color;
 #else
-varying vec2 v_colorTexCoords;
+out vec2 v_colorTexCoords;
 #endif
 
 void main()
@@ -21,7 +21,7 @@ void main()
   gl_Position = applyPivotTransform(pos * u_projection, u_pivotTransform, 0.0);
 
 #ifdef ENABLE_VTF
-  v_color = texture2D(u_colorTex, a_colorTexCoords.xy);
+  v_color = texture(u_colorTex, a_colorTexCoords.xy);
 #else
   v_colorTexCoords = a_colorTexCoords.xy;
 #endif
diff --git a/libs/shaders/GL/colored_symbol_billboard.vsh.glsl b/libs/shaders/GL/colored_symbol_billboard.vsh.glsl
index f521d272d..93cbe4c8e 100644
--- a/libs/shaders/GL/colored_symbol_billboard.vsh.glsl
+++ b/libs/shaders/GL/colored_symbol_billboard.vsh.glsl
@@ -1,17 +1,17 @@
-attribute vec3 a_position;
-attribute vec4 a_normal;
-attribute vec4 a_colorTexCoords;
+in vec3 a_position;
+in vec4 a_normal;
+in vec4 a_colorTexCoords;
 
 uniform mat4 u_modelView;
 uniform mat4 u_projection;
 uniform mat4 u_pivotTransform;
 
-varying vec4 v_normal;
+out vec4 v_normal;
 #ifdef ENABLE_VTF
 uniform sampler2D u_colorTex;
-varying LOW_P vec4 v_color;
+out LOW_P vec4 v_color;
 #else
-varying vec2 v_colorTexCoords;
+out vec2 v_colorTexCoords;
 #endif
 
 void main()
@@ -21,7 +21,7 @@ void main()
   gl_Position = applyBillboardPivotTransform(pivot * u_projection, u_pivotTransform, 0.0, offset.xy);
 
 #ifdef ENABLE_VTF
-  v_color = texture2D(u_colorTex, a_colorTexCoords.xy);
+  v_color = texture(u_colorTex, a_colorTexCoords.xy);
 #else
   v_colorTexCoords = a_colorTexCoords.xy;
 #endif
diff --git a/libs/shaders/GL/dashed_line.fsh.glsl b/libs/shaders/GL/dashed_line.fsh.glsl
index c32101bac..5cb47afe2 100644
--- a/libs/shaders/GL/dashed_line.fsh.glsl
+++ b/libs/shaders/GL/dashed_line.fsh.glsl
@@ -1,6 +1,6 @@
-varying vec2 v_colorTexCoord;
-varying vec2 v_maskTexCoord;
-//varying vec2 v_halfLength;
+in vec2 v_colorTexCoord;
+in vec2 v_maskTexCoord;
+//in vec2 v_halfLength;
 
 uniform sampler2D u_colorTex;
 uniform sampler2D u_maskTex;
@@ -8,14 +8,12 @@ uniform float u_opacity;
 
 //const float aaPixelsCount = 2.5;
 
+out vec4 v_FragColor;
+
 void main()
 {
-  vec4 color = texture2D(u_colorTex, v_colorTexCoord);
-#ifdef GLES3
-  float mask = texture2D(u_maskTex, v_maskTexCoord).r;
-#else
-  float mask = texture2D(u_maskTex, v_maskTexCoord).a;
-#endif
+  vec4 color = texture(u_colorTex, v_colorTexCoord);
+  float mask = texture(u_maskTex, v_maskTexCoord).r;
   color.a = color.a * mask * u_opacity;
 
   // Disabled too agressive AA-like blurring of edges,
@@ -24,5 +22,5 @@ void main()
   //float diff = v_halfLength.y - currentW;
   //color.a *= mix(0.3, 1.0, clamp(diff / aaPixelsCount, 0.0, 1.0));
 
-  gl_FragColor = color;
+  v_FragColor = color;
 }
diff --git a/libs/shaders/GL/dashed_line.vsh.glsl b/libs/shaders/GL/dashed_line.vsh.glsl
index 8fb250158..d401e485d 100644
--- a/libs/shaders/GL/dashed_line.vsh.glsl
+++ b/libs/shaders/GL/dashed_line.vsh.glsl
@@ -1,15 +1,15 @@
-attribute vec3 a_position;
-attribute vec3 a_normal;
-attribute vec2 a_colorTexCoord;
-attribute vec4 a_maskTexCoord;
+in vec3 a_position;
+in vec3 a_normal;
+in vec2 a_colorTexCoord;
+in vec4 a_maskTexCoord;
 
 uniform mat4 u_modelView;
 uniform mat4 u_projection;
 uniform mat4 u_pivotTransform;
 
-varying vec2 v_colorTexCoord;
-varying vec2 v_maskTexCoord;
-//varying vec2 v_halfLength;
+out vec2 v_colorTexCoord;
+out vec2 v_maskTexCoord;
+//out vec2 v_halfLength;
 
 void main()
 {
diff --git a/libs/shaders/GL/debug_rect.fsh.glsl b/libs/shaders/GL/debug_rect.fsh.glsl
index 137df1671..513a572b2 100644
--- a/libs/shaders/GL/debug_rect.fsh.glsl
+++ b/libs/shaders/GL/debug_rect.fsh.glsl
@@ -1,10 +1,8 @@
 uniform vec4 u_color;
 
-#ifdef SAMSUNG_GOOGLE_NEXUS
-uniform sampler2D u_colorTex;
-#endif
+out vec4 v_FragColor;
 
 void main()
 {
-  gl_FragColor = samsungGoogleNexusWorkaround(u_color);
+  v_FragColor = u_color;
 }
diff --git a/libs/shaders/GL/debug_rect.vsh.glsl b/libs/shaders/GL/debug_rect.vsh.glsl
index dca1cd66e..7865de4e7 100644
--- a/libs/shaders/GL/debug_rect.vsh.glsl
+++ b/libs/shaders/GL/debug_rect.vsh.glsl
@@ -1,4 +1,4 @@
-attribute vec2 a_position;
+in vec2 a_position;
 
 void main()
 {
diff --git a/libs/shaders/GL/hatching_area.fsh.glsl b/libs/shaders/GL/hatching_area.fsh.glsl
index 3cc7e5867..e3069aa64 100644
--- a/libs/shaders/GL/hatching_area.fsh.glsl
+++ b/libs/shaders/GL/hatching_area.fsh.glsl
@@ -1,24 +1,26 @@
 uniform float u_opacity;
 
 #ifdef ENABLE_VTF
-varying LOW_P vec4 v_color;
+in LOW_P vec4 v_color;
 #else
 uniform sampler2D u_colorTex;
-varying vec2 v_colorTexCoords;
+in vec2 v_colorTexCoords;
 #endif
 
 uniform sampler2D u_maskTex;
-varying vec2 v_maskTexCoords;
+in vec2 v_maskTexCoords;
+
+out vec4 v_FragColor;
 
 void main()
 {
 #ifdef ENABLE_VTF
   LOW_P vec4 color = v_color;
 #else
-  LOW_P vec4 color = texture2D(u_colorTex, v_colorTexCoords);
+  LOW_P vec4 color = texture(u_colorTex, v_colorTexCoords);
 #endif
-  color *= texture2D(u_maskTex, v_maskTexCoords);
+  color *= texture(u_maskTex, v_maskTexCoords);
   color.a *= u_opacity;
-  gl_FragColor = color;
+  v_FragColor = color;
 }
 
diff --git a/libs/shaders/GL/hatching_area.vsh.glsl b/libs/shaders/GL/hatching_area.vsh.glsl
index 9b5407ad5..b2ebad946 100644
--- a/libs/shaders/GL/hatching_area.vsh.glsl
+++ b/libs/shaders/GL/hatching_area.vsh.glsl
@@ -1,6 +1,6 @@
-attribute vec3 a_position;
-attribute vec2 a_colorTexCoords;
-attribute vec2 a_maskTexCoords;
+in vec3 a_position;
+in vec2 a_colorTexCoords;
+in vec2 a_maskTexCoords;
 
 uniform mat4 u_modelView;
 uniform mat4 u_projection;
@@ -8,18 +8,18 @@ uniform mat4 u_pivotTransform;
 
 #ifdef ENABLE_VTF
 uniform sampler2D u_colorTex;
-varying LOW_P vec4 v_color;
+out LOW_P vec4 v_color;
 #else
-varying vec2 v_colorTexCoords;
+out vec2 v_colorTexCoords;
 #endif
-varying vec2 v_maskTexCoords;
+out vec2 v_maskTexCoords;
 
 void main()
 {
   vec4 pos = vec4(a_position, 1) * u_modelView * u_projection;
   gl_Position = applyPivotTransform(pos, u_pivotTransform, 0.0);
 #ifdef ENABLE_VTF
-  v_color = texture2D(u_colorTex, a_colorTexCoords);
+  v_color = texture(u_colorTex, a_colorTexCoords);
 #else
   v_colorTexCoords = a_colorTexCoords;
 #endif
diff --git a/libs/shaders/GL/imgui.fsh.glsl b/libs/shaders/GL/imgui.fsh.glsl
index 4c4fcb13f..53d77f321 100644
--- a/libs/shaders/GL/imgui.fsh.glsl
+++ b/libs/shaders/GL/imgui.fsh.glsl
@@ -1,10 +1,12 @@
-varying vec2 v_texCoords;
-varying vec4 v_color;
+in vec2 v_texCoords;
+in vec4 v_color;
 
 uniform sampler2D u_colorTex;
 
+out vec4 v_FragColor;
+
 void main()
 {
-  LOW_P vec4 color = texture2D(u_colorTex, v_texCoords);
-  gl_FragColor = color * v_color;
+  LOW_P vec4 color = texture(u_colorTex, v_texCoords);
+  v_FragColor = color * v_color;
 }
diff --git a/libs/shaders/GL/imgui.vsh.glsl b/libs/shaders/GL/imgui.vsh.glsl
index 977894c4f..ece5b5580 100644
--- a/libs/shaders/GL/imgui.vsh.glsl
+++ b/libs/shaders/GL/imgui.vsh.glsl
@@ -1,9 +1,9 @@
-attribute vec2 a_position;
-attribute vec2 a_texCoords;
-attribute vec4 a_color;
+in vec2 a_position;
+in vec2 a_texCoords;
+in vec4 a_color;
 
-varying vec2 v_texCoords;
-varying vec4 v_color;
+out vec2 v_texCoords;
+out vec4 v_color;
 
 uniform mat4 u_projection;
 
diff --git a/libs/shaders/GL/line.fsh.glsl b/libs/shaders/GL/line.fsh.glsl
index b39c459f9..1f30bda0b 100644
--- a/libs/shaders/GL/line.fsh.glsl
+++ b/libs/shaders/GL/line.fsh.glsl
@@ -1,21 +1,23 @@
 uniform float u_opacity;
 #ifdef ENABLE_VTF
-varying LOW_P vec4 v_color;
+in LOW_P vec4 v_color;
 #else
 uniform sampler2D u_colorTex;
-varying vec2 v_colorTexCoord;
+in vec2 v_colorTexCoord;
 #endif
 
-//varying vec2 v_halfLength;
+//in vec2 v_halfLength;
 
 //const float aaPixelsCount = 2.5;
 
+out vec4 v_FragColor;
+
 void main()
 {
 #ifdef ENABLE_VTF
   LOW_P vec4 color = v_color;
 #else
-  LOW_P vec4 color = texture2D(u_colorTex, v_colorTexCoord);
+  LOW_P vec4 color = texture(u_colorTex, v_colorTexCoord);
 #endif
   color.a *= u_opacity;
 
@@ -25,5 +27,5 @@ void main()
   //float diff = v_halfLength.y - currentW;
   //color.a *= mix(0.3, 1.0, clamp(diff / aaPixelsCount, 0.0, 1.0));
 
-  gl_FragColor = color;
+  v_FragColor = color;
 }
diff --git a/libs/shaders/GL/line.vsh.glsl b/libs/shaders/GL/line.vsh.glsl
index 8daebc324..75cd446cd 100644
--- a/libs/shaders/GL/line.vsh.glsl
+++ b/libs/shaders/GL/line.vsh.glsl
@@ -1,6 +1,6 @@
-attribute vec3 a_position;
-attribute vec3 a_normal;
-attribute vec2 a_colorTexCoord;
+in vec3 a_position;
+in vec3 a_normal;
+in vec2 a_colorTexCoord;
 
 uniform mat4 u_modelView;
 uniform mat4 u_projection;
@@ -8,12 +8,12 @@ uniform mat4 u_pivotTransform;
 
 #ifdef ENABLE_VTF
 uniform sampler2D u_colorTex;
-varying LOW_P vec4 v_color;
+out LOW_P vec4 v_color;
 #else
-varying vec2 v_colorTexCoord;
+out vec2 v_colorTexCoord;
 #endif
 
-//varying vec2 v_halfLength;
+//out vec2 v_halfLength;
 
 void main()
 {
@@ -27,7 +27,7 @@ void main()
   }
 
 #ifdef ENABLE_VTF
-  v_color = texture2D(u_colorTex, a_colorTexCoord);
+  v_color = texture(u_colorTex, a_colorTexCoord);
 #else
   v_colorTexCoord = a_colorTexCoord;
 #endif
diff --git a/libs/shaders/GL/masked_texturing.fsh.glsl b/libs/shaders/GL/masked_texturing.fsh.glsl
index 2c33afb60..bae0daed7 100644
--- a/libs/shaders/GL/masked_texturing.fsh.glsl
+++ b/libs/shaders/GL/masked_texturing.fsh.glsl
@@ -2,12 +2,14 @@ uniform sampler2D u_colorTex;
 uniform sampler2D u_maskTex;
 uniform float u_opacity;
 
-varying vec2 v_colorTexCoords;
-varying vec2 v_maskTexCoords;
+in vec2 v_colorTexCoords;
+in vec2 v_maskTexCoords;
+
+out vec4 v_FragColor;
 
 void main()
 {
-  vec4 finalColor = texture2D(u_colorTex, v_colorTexCoords) * texture2D(u_maskTex, v_maskTexCoords);
+  vec4 finalColor = texture(u_colorTex, v_colorTexCoords) * texture(u_maskTex, v_maskTexCoords);
   finalColor.a *= u_opacity;
-  gl_FragColor = finalColor;
+  v_FragColor = finalColor;
 }
diff --git a/libs/shaders/GL/masked_texturing.vsh.glsl b/libs/shaders/GL/masked_texturing.vsh.glsl
index f39284265..69864b283 100644
--- a/libs/shaders/GL/masked_texturing.vsh.glsl
+++ b/libs/shaders/GL/masked_texturing.vsh.glsl
@@ -1,14 +1,14 @@
-attribute vec4 a_position;
-attribute vec2 a_normal;
-attribute vec2 a_colorTexCoords;
-attribute vec2 a_maskTexCoords;
+in vec4 a_position;
+in vec2 a_normal;
+in vec2 a_colorTexCoords;
+in vec2 a_maskTexCoords;
 
 uniform mat4 u_modelView;
 uniform mat4 u_projection;
 uniform mat4 u_pivotTransform;
 
-varying vec2 v_colorTexCoords;
-varying vec2 v_maskTexCoords;
+out vec2 v_colorTexCoords;
+out vec2 v_maskTexCoords;
 
 void main()
 {
diff --git a/libs/shaders/GL/masked_texturing_billboard.vsh.glsl b/libs/shaders/GL/masked_texturing_billboard.vsh.glsl
index 8363abafc..5c7928755 100644
--- a/libs/shaders/GL/masked_texturing_billboard.vsh.glsl
+++ b/libs/shaders/GL/masked_texturing_billboard.vsh.glsl
@@ -1,15 +1,15 @@
-attribute vec4 a_position;
-attribute vec2 a_normal;
-attribute vec2 a_colorTexCoords;
-attribute vec2 a_maskTexCoords;
+in vec4 a_position;
+in vec2 a_normal;
+in vec2 a_colorTexCoords;
+in vec2 a_maskTexCoords;
 
 uniform mat4 u_modelView;
 uniform mat4 u_projection;
 uniform mat4 u_pivotTransform;
 uniform float u_zScale;
 
-varying vec2 v_colorTexCoords;
-varying vec2 v_maskTexCoords;
+out vec2 v_colorTexCoords;
+out vec2 v_maskTexCoords;
 
 void main()
 {
diff --git a/libs/shaders/GL/my_position.vsh.glsl b/libs/shaders/GL/my_position.vsh.glsl
index 73bdc2ba1..21575b727 100644
--- a/libs/shaders/GL/my_position.vsh.glsl
+++ b/libs/shaders/GL/my_position.vsh.glsl
@@ -1,5 +1,5 @@
-attribute vec2 a_normal;
-attribute vec2 a_colorTexCoords;
+in vec2 a_normal;
+in vec2 a_colorTexCoords;
 
 uniform vec3 u_position;
 uniform float u_azimut;
@@ -8,7 +8,7 @@ uniform mat4 u_modelView;
 uniform mat4 u_projection;
 uniform mat4 u_pivotTransform;
 
-varying vec2 v_colorTexCoords;
+out vec2 v_colorTexCoords;
 
 void main()
 {
diff --git a/libs/shaders/GL/path_symbol.vsh.glsl b/libs/shaders/GL/path_symbol.vsh.glsl
index 708a4edc0..abfd416ca 100644
--- a/libs/shaders/GL/path_symbol.vsh.glsl
+++ b/libs/shaders/GL/path_symbol.vsh.glsl
@@ -1,12 +1,12 @@
-attribute vec4 a_position;
-attribute vec2 a_normal;
-attribute vec2 a_colorTexCoords;
+in vec4 a_position;
+in vec2 a_normal;
+in vec2 a_colorTexCoords;
 
 uniform mat4 u_modelView;
 uniform mat4 u_projection;
 uniform mat4 u_pivotTransform;
 
-varying vec2 v_colorTexCoords;
+out vec2 v_colorTexCoords;
 
 void main()
 {
diff --git a/libs/shaders/GL/position_accuracy3d.vsh.glsl b/libs/shaders/GL/position_accuracy3d.vsh.glsl
index d46aeeeca..5a0f815d4 100644
--- a/libs/shaders/GL/position_accuracy3d.vsh.glsl
+++ b/libs/shaders/GL/position_accuracy3d.vsh.glsl
@@ -1,5 +1,5 @@
-attribute vec2 a_normal;
-attribute vec2 a_colorTexCoords;
+in vec2 a_normal;
+in vec2 a_colorTexCoords;
 
 uniform vec3 u_position;
 uniform float u_accuracy;
@@ -9,7 +9,7 @@ uniform mat4 u_projection;
 uniform mat4 u_pivotTransform;
 uniform float u_zScale;
 
-varying vec2 v_colorTexCoords;
+out vec2 v_colorTexCoords;
 
 void main()
 {
diff --git a/libs/shaders/GL/route.fsh.glsl b/libs/shaders/GL/route.fsh.glsl
index 3e811131f..bc7d28acc 100644
--- a/libs/shaders/GL/route.fsh.glsl
+++ b/libs/shaders/GL/route.fsh.glsl
@@ -2,12 +2,8 @@
 // Unfortunately some CG algorithms cannot be implemented on OpenGL ES 2.0 without discarding
 // fragments from depth buffer.
 
-varying vec3 v_length;
-varying vec4 v_color;
-
-#ifdef SAMSUNG_GOOGLE_NEXUS
-uniform sampler2D u_colorTex;
-#endif
+in vec3 v_length;
+in vec4 v_color;
 
 uniform vec4 u_color;
 uniform vec4 u_outlineColor;
@@ -23,6 +19,8 @@ const float kAntialiasingThreshold = 0.92;
 const float kOutlineThreshold1 = 0.81;
 const float kOutlineThreshold2 = 0.71;
 
+out vec4 v_FragColor;
+
 void main()
 {
   if (v_length.x < v_length.z)
@@ -40,5 +38,5 @@ void main()
   color = mix(color, mainOutlineColor, smoothstep(kOutlineThreshold2, kOutlineThreshold1, abs(v_length.y)));
   color.a *= (1.0 - smoothstep(kAntialiasingThreshold, 1.0, abs(v_length.y)));
   color = vec4(mix(color.rgb, u_maskColor.rgb, u_maskColor.a), color.a);
-  gl_FragColor = samsungGoogleNexusWorkaround(color);
+  v_FragColor = color;
 }
diff --git a/libs/shaders/GL/route.vsh.glsl b/libs/shaders/GL/route.vsh.glsl
index 588000cab..9fe52f316 100644
--- a/libs/shaders/GL/route.vsh.glsl
+++ b/libs/shaders/GL/route.vsh.glsl
@@ -1,7 +1,7 @@
-attribute vec3 a_position;
-attribute vec2 a_normal;
-attribute vec3 a_length;
-attribute vec4 a_color;
+in vec3 a_position;
+in vec2 a_normal;
+in vec3 a_length;
+in vec4 a_color;
 
 uniform mat4 u_modelView;
 uniform mat4 u_projection;
@@ -9,8 +9,8 @@ uniform mat4 u_pivotTransform;
 
 uniform vec4 u_routeParams;
 
-varying vec3 v_length;
-varying vec4 v_color;
+out vec3 v_length;
+out vec4 v_color;
 
 void main()
 {
diff --git a/libs/shaders/GL/route_arrow.fsh.glsl b/libs/shaders/GL/route_arrow.fsh.glsl
index 1f5d22e4f..5b5bad2c0 100644
--- a/libs/shaders/GL/route_arrow.fsh.glsl
+++ b/libs/shaders/GL/route_arrow.fsh.glsl
@@ -6,14 +6,16 @@ uniform sampler2D u_colorTex;
 uniform float u_opacity;
 uniform vec4 u_maskColor;
 
-varying vec2 v_colorTexCoords;
+in vec2 v_colorTexCoords;
+
+out vec4 v_FragColor;
 
 void main()
 {
-  vec4 finalColor = texture2D(u_colorTex, v_colorTexCoords);
+  vec4 finalColor = texture(u_colorTex, v_colorTexCoords);
   finalColor.a *= u_opacity;
   if (finalColor.a < 0.01)
     discard;
   finalColor = vec4(mix(finalColor.rgb, u_maskColor.rgb, u_maskColor.a), finalColor.a);
-  gl_FragColor = finalColor;
+  v_FragColor = finalColor;
 }
diff --git a/libs/shaders/GL/route_arrow.vsh.glsl b/libs/shaders/GL/route_arrow.vsh.glsl
index 31220de91..764dba5e4 100644
--- a/libs/shaders/GL/route_arrow.vsh.glsl
+++ b/libs/shaders/GL/route_arrow.vsh.glsl
@@ -1,6 +1,6 @@
-attribute vec4 a_position;
-attribute vec2 a_normal;
-attribute vec2 a_colorTexCoords;
+in vec4 a_position;
+in vec2 a_normal;
+in vec2 a_colorTexCoords;
 
 uniform mat4 u_modelView;
 uniform mat4 u_projection;
@@ -8,7 +8,7 @@ uniform mat4 u_pivotTransform;
 
 uniform float u_arrowHalfWidth;
 
-varying vec2 v_colorTexCoords;
+out vec2 v_colorTexCoords;
 
 void main()
 {
diff --git a/libs/shaders/GL/route_dash.fsh.glsl b/libs/shaders/GL/route_dash.fsh.glsl
index 484fd2ccc..3f9556339 100644
--- a/libs/shaders/GL/route_dash.fsh.glsl
+++ b/libs/shaders/GL/route_dash.fsh.glsl
@@ -2,12 +2,8 @@
 // Unfortunately some CG algorithms cannot be implemented on OpenGL ES 2.0 without discarding
 // fragments from depth buffer.
 
-varying vec3 v_length;
-varying vec4 v_color;
-
-#ifdef SAMSUNG_GOOGLE_NEXUS
-uniform sampler2D u_colorTex;
-#endif
+in vec3 v_length;
+in vec4 v_color;
 
 uniform vec4 u_color;
 uniform vec2 u_pattern;
@@ -25,6 +21,8 @@ float alphaFromPattern(float curLen, float dashLen, float gapLen)
   return step(offset, dashLen);
 }
 
+out vec4 v_FragColor;
+
 void main()
 {
   if (v_length.x < v_length.z)
@@ -39,5 +37,5 @@ void main()
   color.a *= (1.0 - smoothstep(kAntialiasingThreshold, 1.0, abs(v_length.y))) *
               alphaFromPattern(v_length.x, u_pattern.x, u_pattern.y);
   color = vec4(mix(color.rgb, u_maskColor.rgb, u_maskColor.a), color.a);
-  gl_FragColor = samsungGoogleNexusWorkaround(color);
+  v_FragColor = color;
 }
diff --git a/libs/shaders/GL/route_marker.fsh.glsl b/libs/shaders/GL/route_marker.fsh.glsl
index 6b2f3f0f3..fee0c9efc 100644
--- a/libs/shaders/GL/route_marker.fsh.glsl
+++ b/libs/shaders/GL/route_marker.fsh.glsl
@@ -2,23 +2,21 @@
 // Unfortunately some CG algorithms cannot be implemented on OpenGL ES 2.0 without discarding
 // fragments from depth buffer.
 
-#ifdef SAMSUNG_GOOGLE_NEXUS
-uniform sampler2D u_colorTex;
-#endif
-
 uniform vec4 u_routeParams;
 uniform vec4 u_maskColor;
 uniform float u_opacity;
 
-varying vec4 v_radius;
-varying vec4 v_color;
+in vec4 v_radius;
+in vec4 v_color;
 
 const float kAntialiasingPixelsCount = 2.5;
 
+out vec4 v_FragColor;
+
 void main()
 {
   vec4 finalColor = v_color;
-  
+
   float aaRadius = max(v_radius.z - kAntialiasingPixelsCount, 0.0);
   float stepValue = smoothstep(aaRadius * aaRadius, v_radius.z * v_radius.z,
                                dot(v_radius.xy, v_radius.xy));
@@ -27,5 +25,5 @@ void main()
     discard;
 
   finalColor = vec4(mix(finalColor.rgb, u_maskColor.rgb, u_maskColor.a), finalColor.a);
-  gl_FragColor = samsungGoogleNexusWorkaround(finalColor);
+  v_FragColor = finalColor;
 }
diff --git a/libs/shaders/GL/route_marker.vsh.glsl b/libs/shaders/GL/route_marker.vsh.glsl
index 533725510..7ca104e1b 100644
--- a/libs/shaders/GL/route_marker.vsh.glsl
+++ b/libs/shaders/GL/route_marker.vsh.glsl
@@ -1,6 +1,6 @@
-attribute vec4 a_position;
-attribute vec3 a_normal;
-attribute vec4 a_color;
+in vec4 a_position;
+in vec3 a_normal;
+in vec4 a_color;
 
 uniform mat4 u_modelView;
 uniform mat4 u_projection;
@@ -9,8 +9,8 @@ uniform mat4 u_pivotTransform;
 uniform vec2 u_angleCosSin;
 uniform vec4 u_routeParams;
 
-varying vec4 v_radius;
-varying vec4 v_color;
+out vec4 v_radius;
+out vec4 v_color;
 
 void main()
 {
diff --git a/libs/shaders/GL/ruler.vsh.glsl b/libs/shaders/GL/ruler.vsh.glsl
index 9e07d3663..27c670853 100644
--- a/libs/shaders/GL/ruler.vsh.glsl
+++ b/libs/shaders/GL/ruler.vsh.glsl
@@ -1,12 +1,12 @@
-attribute vec2 a_position;
-attribute vec2 a_normal;
-attribute vec2 a_colorTexCoords;
+in vec2 a_position;
+in vec2 a_normal;
+in vec2 a_colorTexCoords;
 
 uniform vec2 u_position;
 uniform float u_length;
 uniform mat4 u_projection;
 
-varying vec2 v_colorTexCoords;
+out vec2 v_colorTexCoords;
 
 void main()
 {
diff --git a/libs/shaders/GL/screen_quad.vsh.glsl b/libs/shaders/GL/screen_quad.vsh.glsl
index 388b7070c..78b4b5f8a 100644
--- a/libs/shaders/GL/screen_quad.vsh.glsl
+++ b/libs/shaders/GL/screen_quad.vsh.glsl
@@ -1,7 +1,7 @@
-attribute vec2 a_pos;
-attribute vec2 a_tcoord;
+in vec2 a_pos;
+in vec2 a_tcoord;
 
-varying vec2 v_colorTexCoords;
+out vec2 v_colorTexCoords;
 
 void main()
 {
diff --git a/libs/shaders/GL/selection_line.fsh.glsl b/libs/shaders/GL/selection_line.fsh.glsl
index eec57e298..c9749c9a2 100644
--- a/libs/shaders/GL/selection_line.fsh.glsl
+++ b/libs/shaders/GL/selection_line.fsh.glsl
@@ -1,24 +1,26 @@
 #ifdef ENABLE_VTF
-varying LOW_P vec4 v_color;
+in LOW_P vec4 v_color;
 #else
 uniform sampler2D u_colorTex;
-varying vec2 v_colorTexCoord;
+in vec2 v_colorTexCoord;
 #endif
 uniform float u_opacity;
 
-varying float v_lengthY;
+in float v_lengthY;
 
 const float kAntialiasingThreshold = 0.92;
 
+out vec4 v_FragColor;
+
 void main()
 {
 #ifdef ENABLE_VTF
   LOW_P vec4 color = v_color;
 #else
-  LOW_P vec4 color = texture2D(u_colorTex, v_colorTexCoord);
+  LOW_P vec4 color = texture(u_colorTex, v_colorTexCoord);
 #endif
   color.a *= u_opacity;
   color.a *= (1.0 - smoothstep(kAntialiasingThreshold, 1.0, abs(v_lengthY)));
 
-  gl_FragColor = samsungGoogleNexusWorkaround(color);
+  v_FragColor = color;
 }
diff --git a/libs/shaders/GL/selection_line.vsh.glsl b/libs/shaders/GL/selection_line.vsh.glsl
index 19c1137ac..b9d9e693f 100644
--- a/libs/shaders/GL/selection_line.vsh.glsl
+++ b/libs/shaders/GL/selection_line.vsh.glsl
@@ -1,7 +1,7 @@
-attribute vec3 a_position;
-attribute vec2 a_normal;
-attribute vec2 a_colorTexCoords;
-attribute vec3 a_length;
+in vec3 a_position;
+in vec2 a_normal;
+in vec2 a_colorTexCoords;
+in vec3 a_length;
 
 uniform mat4 u_modelView;
 uniform mat4 u_projection;
@@ -11,12 +11,12 @@ uniform vec2 u_lineParams;
 
 #ifdef ENABLE_VTF
 uniform sampler2D u_colorTex;
-varying LOW_P vec4 v_color;
+out LOW_P vec4 v_color;
 #else
-varying vec2 v_colorTexCoord;
+out vec2 v_colorTexCoord;
 #endif
 
-varying float v_lengthY;
+out float v_lengthY;
 
 void main()
 {
@@ -32,7 +32,7 @@ void main()
   }
 
 #ifdef ENABLE_VTF
-  v_color = texture2D(u_colorTex, a_colorTexCoords);
+  v_color = texture(u_colorTex, a_colorTexCoords);
 #else
   v_colorTexCoord = a_colorTexCoords;
 #endif
diff --git a/libs/shaders/GL/shaders_lib.glsl b/libs/shaders/GL/shaders_lib.glsl
index a7d41db76..e70eb0151 100644
--- a/libs/shaders/GL/shaders_lib.glsl
+++ b/libs/shaders/GL/shaders_lib.glsl
@@ -47,15 +47,3 @@ vec2 calcLineTransformedAxisPos(vec2 originalAxisPos, vec2 shiftedPos, mat4 mode
 }
 
 // FS (DO NOT modify this comment, it marks up block of fragment shader functions).
-
-// Because of a bug in OpenGL driver on Samsung Google Nexus this workaround is here.
-// It must be used in shaders which do not have any sampler2D usage.
-vec4 samsungGoogleNexusWorkaround(vec4 color)
-{
-#ifdef SAMSUNG_GOOGLE_NEXUS
-  const float kFakeColorScalar = 0.0;
-  return color + texture2D(u_colorTex, vec2(0.0, 0.0)) * kFakeColorScalar;
-#else
-  return color;
-#endif
-}
diff --git a/libs/shaders/GL/smaa_blending_weight.fsh.glsl b/libs/shaders/GL/smaa_blending_weight.fsh.glsl
index 3fccfd2d7..c34e27f8d 100644
--- a/libs/shaders/GL/smaa_blending_weight.fsh.glsl
+++ b/libs/shaders/GL/smaa_blending_weight.fsh.glsl
@@ -6,32 +6,22 @@ uniform sampler2D u_smaaSearch;
 
 uniform vec4 u_framebufferMetrics;
 
-varying vec4 v_coords;
-varying vec4 v_offset0;
-varying vec4 v_offset1;
-varying vec4 v_offset2;
+in vec4 v_coords;
+in vec4 v_offset0;
+in vec4 v_offset1;
+in vec4 v_offset2;
 
 #define SMAA_SEARCHTEX_SIZE vec2(66.0, 33.0)
 #define SMAA_SEARCHTEX_PACKED_SIZE vec2(64.0, 16.0)
 #define SMAA_AREATEX_MAX_DISTANCE 16.0
 #define SMAA_AREATEX_PIXEL_SIZE (vec2(1.0 / 256.0, 1.0 / 1024.0))
 
-#ifdef GLES3
-  #define SMAALoopBegin(condition) while (condition) {
-  #define SMAALoopEnd }
-  #define SMAASampleLevelZero(tex, coord) textureLod(tex, coord, 0.0)
-  #define SMAASampleLevelZeroOffset(tex, coord, offset) textureLodOffset(tex, coord, 0.0, offset)
-  #define SMAARound(v) round((v))
-  #define SMAAOffset(x,y) ivec2(x,y)
-#else
-  #define SMAA_MAX_SEARCH_STEPS 8
-  #define SMAALoopBegin(condition) for (int i = 0; i < SMAA_MAX_SEARCH_STEPS; i++) { if (!(condition)) break;
-  #define SMAALoopEnd }
-  #define SMAASampleLevelZero(tex, coord) texture2D(tex, coord)
-  #define SMAASampleLevelZeroOffset(tex, coord, offset) texture2D(tex, coord + vec2(offset) * u_framebufferMetrics.xy)
-  #define SMAARound(v) floor((v) + 0.5)
-  #define SMAAOffset(x,y) vec2(x,y)
-#endif
+#define SMAALoopBegin(condition) while (condition) {
+#define SMAALoopEnd }
+#define SMAASampleLevelZero(tex, coord) textureLod(tex, coord, 0.0)
+#define SMAASampleLevelZeroOffset(tex, coord, offset) textureLodOffset(tex, coord, 0.0, offset)
+#define SMAARound(v) round((v))
+#define SMAAOffset(x,y) ivec2(x,y)
 
 const vec2 kAreaTexMaxDistance = vec2(SMAA_AREATEX_MAX_DISTANCE, SMAA_AREATEX_MAX_DISTANCE);
 const float kActivationThreshold = 0.8281;
@@ -53,11 +43,7 @@ float SMAASearchLength(vec2 e, float offset)
   bias *= 1.0 / SMAA_SEARCHTEX_PACKED_SIZE;
 
   // Lookup the search texture.
-#ifdef GLES3
   return SMAASampleLevelZero(u_smaaSearch, scale * e + bias).r;
-#else
-  return SMAASampleLevelZero(u_smaaSearch, scale * e + bias).a;
-#endif
 }
 
 float SMAASearchXLeft(vec2 texcoord, float end)
@@ -115,10 +101,12 @@ vec2 SMAAArea(vec2 dist, float e1, float e2)
   return SMAASampleLevelZero(u_smaaArea, texcoord).rg;
 }
 
+out vec4 v_FragColor;
+
 void main()
 {
   vec4 weights = vec4(0.0, 0.0, 0.0, 0.0);
-  vec2 e = texture2D(u_colorTex, v_coords.xy).rg;
+  vec2 e = texture(u_colorTex, v_coords.xy).rg;
 
   if (e.g > 0.0) // Edge at north
   {
@@ -187,5 +175,5 @@ void main()
     weights.ba = SMAAArea(sqrt_d, e1, e2);
   }
 
-  gl_FragColor = weights;
+  v_FragColor = weights;
 }
diff --git a/libs/shaders/GL/smaa_blending_weight.vsh.glsl b/libs/shaders/GL/smaa_blending_weight.vsh.glsl
index 621cd2a33..afccac122 100644
--- a/libs/shaders/GL/smaa_blending_weight.vsh.glsl
+++ b/libs/shaders/GL/smaa_blending_weight.vsh.glsl
@@ -1,14 +1,14 @@
 // Implementation of Subpixel Morphological Antialiasing (SMAA) is based on https://github.com/iryoku/smaa
 
-attribute vec2 a_pos;
-attribute vec2 a_tcoord;
+in vec2 a_pos;
+in vec2 a_tcoord;
 
 uniform vec4 u_framebufferMetrics;
 
-varying vec4 v_coords;
-varying vec4 v_offset0;
-varying vec4 v_offset1;
-varying vec4 v_offset2;
+out vec4 v_coords;
+out vec4 v_offset0;
+out vec4 v_offset1;
+out vec4 v_offset2;
 
 // SMAA_MAX_SEARCH_STEPS specifies the maximum steps performed in the
 // horizontal/vertical pattern searches, at each side of the pixel.
diff --git a/libs/shaders/GL/smaa_edges.fsh.glsl b/libs/shaders/GL/smaa_edges.fsh.glsl
index 69322a954..6fcf641e6 100644
--- a/libs/shaders/GL/smaa_edges.fsh.glsl
+++ b/libs/shaders/GL/smaa_edges.fsh.glsl
@@ -2,10 +2,10 @@
 
 uniform sampler2D u_colorTex;
 
-varying vec2 v_colorTexCoords;
-varying vec4 v_offset0;
-varying vec4 v_offset1;
-varying vec4 v_offset2;
+in vec2 v_colorTexCoords;
+in vec4 v_offset0;
+in vec4 v_offset1;
+in vec4 v_offset2;
 
 // SMAA_THRESHOLD specifies the threshold or sensitivity to edges.
 // Lowering this value you will be able to detect more edges at the expense of
@@ -27,12 +27,14 @@ const vec2 kThreshold = vec2(SMAA_THRESHOLD, SMAA_THRESHOLD);
 // https://en.wikipedia.org/wiki/Relative_luminance
 const vec3 kWeights = vec3(0.2126, 0.7152, 0.0722);
 
+out vec4 v_FragColor;
+
 void main()
 {
   // Calculate lumas.
-  float L = dot(texture2D(u_colorTex, v_colorTexCoords).rgb, kWeights);
-  float Lleft = dot(texture2D(u_colorTex, v_offset0.xy).rgb, kWeights);
-  float Ltop = dot(texture2D(u_colorTex, v_offset0.zw).rgb, kWeights);
+  float L = dot(texture(u_colorTex, v_colorTexCoords).rgb, kWeights);
+  float Lleft = dot(texture(u_colorTex, v_offset0.xy).rgb, kWeights);
+  float Ltop = dot(texture(u_colorTex, v_offset0.zw).rgb, kWeights);
 
   // We do the usual threshold.
   vec4 delta;
@@ -42,16 +44,16 @@ void main()
       discard;
 
   // Calculate right and bottom deltas.
-  float Lright = dot(texture2D(u_colorTex, v_offset1.xy).rgb, kWeights);
-  float Lbottom  = dot(texture2D(u_colorTex, v_offset1.zw).rgb, kWeights);
+  float Lright = dot(texture(u_colorTex, v_offset1.xy).rgb, kWeights);
+  float Lbottom  = dot(texture(u_colorTex, v_offset1.zw).rgb, kWeights);
   delta.zw = abs(L - vec2(Lright, Lbottom));
 
   // Calculate the maximum delta in the direct neighborhood.
   vec2 maxDelta = max(delta.xy, delta.zw);
 
   // Calculate left-left and top-top deltas.
-  float Lleftleft = dot(texture2D(u_colorTex, v_offset2.xy).rgb, kWeights);
-  float Ltoptop = dot(texture2D(u_colorTex, v_offset2.zw).rgb, kWeights);
+  float Lleftleft = dot(texture(u_colorTex, v_offset2.xy).rgb, kWeights);
+  float Ltoptop = dot(texture(u_colorTex, v_offset2.zw).rgb, kWeights);
   delta.zw = abs(vec2(Lleft, Ltop) - vec2(Lleftleft, Ltoptop));
 
   // Calculate the final maximum delta.
@@ -61,5 +63,5 @@ void main()
   // Local contrast adaptation
   edges *= step(finalDelta, SMAA_LOCAL_CONTRAST_ADAPTATION_FACTOR * delta.xy);
 
-  gl_FragColor = vec4(edges, 0.0, 1.0);
+  v_FragColor = vec4(edges, 0.0, 1.0);
 }
diff --git a/libs/shaders/GL/smaa_edges.vsh.glsl b/libs/shaders/GL/smaa_edges.vsh.glsl
index efcd5e118..aa70aff81 100644
--- a/libs/shaders/GL/smaa_edges.vsh.glsl
+++ b/libs/shaders/GL/smaa_edges.vsh.glsl
@@ -1,14 +1,14 @@
 // Implementation of Subpixel Morphological Antialiasing (SMAA) is based on https://github.com/iryoku/smaa
 
-attribute vec2 a_pos;
-attribute vec2 a_tcoord;
+in vec2 a_pos;
+in vec2 a_tcoord;
 
 uniform vec4 u_framebufferMetrics;
 
-varying vec2 v_colorTexCoords;
-varying vec4 v_offset0;
-varying vec4 v_offset1;
-varying vec4 v_offset2;
+out vec2 v_colorTexCoords;
+out vec4 v_offset0;
+out vec4 v_offset1;
+out vec4 v_offset2;
 
 void main()
 {
diff --git a/libs/shaders/GL/smaa_final.fsh.glsl b/libs/shaders/GL/smaa_final.fsh.glsl
index 01054dedb..f8bac1636 100644
--- a/libs/shaders/GL/smaa_final.fsh.glsl
+++ b/libs/shaders/GL/smaa_final.fsh.glsl
@@ -5,27 +5,25 @@ uniform sampler2D u_blendingWeightTex;
 
 uniform vec4 u_framebufferMetrics;
 
-varying vec2 v_colorTexCoords;
-varying vec4 v_offset;
+in vec2 v_colorTexCoords;
+in vec4 v_offset;
 
-#ifdef GLES3
-  #define SMAASampleLevelZero(tex, coord) textureLod(tex, coord, 0.0)
-#else
-  #define SMAASampleLevelZero(tex, coord) texture2D(tex, coord)
-#endif
+#define SMAASampleLevelZero(tex, coord) textureLod(tex, coord, 0.0)
+
+out vec4 v_FragColor;
 
 void main()
 {
   // Fetch the blending weights for current pixel.
   vec4 a;
-  a.x = texture2D(u_blendingWeightTex, v_offset.xy).a; // Right
-  a.y = texture2D(u_blendingWeightTex, v_offset.zw).g; // Top
-  a.wz = texture2D(u_blendingWeightTex, v_colorTexCoords).xz; // Bottom / Left
+  a.x = texture(u_blendingWeightTex, v_offset.xy).a; // Right
+  a.y = texture(u_blendingWeightTex, v_offset.zw).g; // Top
+  a.wz = texture(u_blendingWeightTex, v_colorTexCoords).xz; // Bottom / Left
 
   // Is there any blending weight with a value greater than 0.0?
   if (dot(a, vec4(1.0, 1.0, 1.0, 1.0)) < 1e-5)
   {
-    gl_FragColor = texture2D(u_colorTex, v_colorTexCoords);
+    v_FragColor = texture(u_colorTex, v_colorTexCoords);
   }
   else
   {
@@ -46,6 +44,6 @@ void main()
     // We exploit bilinear filtering to mix current pixel with the chosen neighbor.
     vec4 color = blendingWeight.x * SMAASampleLevelZero(u_colorTex, bc.xy);
     color += blendingWeight.y * SMAASampleLevelZero(u_colorTex, bc.zw);
-    gl_FragColor = color;
+    v_FragColor = color;
   }
 }
diff --git a/libs/shaders/GL/smaa_final.vsh.glsl b/libs/shaders/GL/smaa_final.vsh.glsl
index 7f872d4f1..73dbd83c9 100644
--- a/libs/shaders/GL/smaa_final.vsh.glsl
+++ b/libs/shaders/GL/smaa_final.vsh.glsl
@@ -1,12 +1,12 @@
 // Implementation of Subpixel Morphological Antialiasing (SMAA) is based on https://github.com/iryoku/smaa
 
-attribute vec2 a_pos;
-attribute vec2 a_tcoord;
+in vec2 a_pos;
+in vec2 a_tcoord;
 
 uniform vec4 u_framebufferMetrics;
 
-varying vec2 v_colorTexCoords;
-varying vec4 v_offset;
+out vec2 v_colorTexCoords;
+out vec4 v_offset;
 
 void main()
 {
diff --git a/libs/shaders/GL/solid_color.fsh.glsl b/libs/shaders/GL/solid_color.fsh.glsl
index ac4440148..4362d4ecb 100644
--- a/libs/shaders/GL/solid_color.fsh.glsl
+++ b/libs/shaders/GL/solid_color.fsh.glsl
@@ -1,20 +1,22 @@
 uniform float u_opacity;
 
 #ifdef ENABLE_VTF
-varying LOW_P vec4 v_color;
+in LOW_P vec4 v_color;
 #else
 uniform sampler2D u_colorTex;
-varying vec2 v_colorTexCoords;
+in vec2 v_colorTexCoords;
 #endif
 
+out vec4 v_FragColor;
+
 void main()
 {
 #ifdef ENABLE_VTF
   LOW_P vec4 finalColor = v_color;
 #else
-  LOW_P vec4 finalColor = texture2D(u_colorTex, v_colorTexCoords);
+  LOW_P vec4 finalColor = texture(u_colorTex, v_colorTexCoords);
 #endif
   finalColor.a *= u_opacity;
-  gl_FragColor = finalColor;
+  v_FragColor = finalColor;
 }
 
diff --git a/libs/shaders/GL/text.fsh.glsl b/libs/shaders/GL/text.fsh.glsl
index b97e06f23..5e27e1c36 100644
--- a/libs/shaders/GL/text.fsh.glsl
+++ b/libs/shaders/GL/text.fsh.glsl
@@ -1,29 +1,27 @@
 #ifdef ENABLE_VTF
-varying LOW_P vec4 v_color;
+in LOW_P vec4 v_color;
 #else
-varying vec2 v_colorTexCoord;
+in vec2 v_colorTexCoord;
 uniform sampler2D u_colorTex;
 #endif
 
-varying vec2 v_maskTexCoord;
+in vec2 v_maskTexCoord;
 
 uniform sampler2D u_maskTex;
 uniform float u_opacity;
 uniform vec2 u_contrastGamma;
 
+out vec4 v_FragColor;
+
 void main()
 {
 #ifdef ENABLE_VTF
   LOW_P vec4 glyphColor = v_color;
 #else
-  LOW_P vec4 glyphColor = texture2D(u_colorTex, v_colorTexCoord);
-#endif
-#ifdef GLES3
-  float dist = texture2D(u_maskTex, v_maskTexCoord).r;
-#else
-  float dist = texture2D(u_maskTex, v_maskTexCoord).a;
+  LOW_P vec4 glyphColor = texture(u_colorTex, v_colorTexCoord);
 #endif
+  float dist = texture(u_maskTex, v_maskTexCoord).r;
   float alpha = smoothstep(u_contrastGamma.x - u_contrastGamma.y, u_contrastGamma.x + u_contrastGamma.y, dist) * u_opacity;
   glyphColor.a *= alpha;
-  gl_FragColor = glyphColor;
+  v_FragColor = glyphColor;
 }
diff --git a/libs/shaders/GL/text.vsh.glsl b/libs/shaders/GL/text.vsh.glsl
index 0e8ced460..d3c5e1002 100644
--- a/libs/shaders/GL/text.vsh.glsl
+++ b/libs/shaders/GL/text.vsh.glsl
@@ -1,7 +1,7 @@
-attribute vec2 a_colorTexCoord;
-attribute vec2 a_maskTexCoord;
-attribute vec4 a_position;
-attribute vec2 a_normal;
+in vec2 a_colorTexCoord;
+in vec2 a_maskTexCoord;
+in vec4 a_position;
+in vec2 a_normal;
 
 uniform mat4 u_modelView;
 uniform mat4 u_projection;
@@ -9,21 +9,21 @@ uniform mat4 u_pivotTransform;
 
 #ifdef ENABLE_VTF
 uniform sampler2D u_colorTex;
-varying LOW_P vec4 v_color;
+out LOW_P vec4 v_color;
 #else
-varying vec2 v_colorTexCoord;
+out vec2 v_colorTexCoord;
 #endif
 
-varying vec2 v_maskTexCoord;
+out vec2 v_maskTexCoord;
 
 void main()
 {
   vec4 pos = vec4(a_position.xyz, 1) * u_modelView;
   vec4 shiftedPos = vec4(a_normal, 0.0, 0.0) + pos;
   gl_Position = applyPivotTransform(shiftedPos * u_projection, u_pivotTransform, 0.0);
-  
+
 #ifdef ENABLE_VTF
-  v_color = texture2D(u_colorTex, a_colorTexCoord);
+  v_color = texture(u_colorTex, a_colorTexCoord);
 #else
   v_colorTexCoord = a_colorTexCoord;
 #endif
diff --git a/libs/shaders/GL/text_billboard.vsh.glsl b/libs/shaders/GL/text_billboard.vsh.glsl
index 728b84979..efadcb39c 100644
--- a/libs/shaders/GL/text_billboard.vsh.glsl
+++ b/libs/shaders/GL/text_billboard.vsh.glsl
@@ -1,7 +1,7 @@
-attribute vec2 a_colorTexCoord;
-attribute vec2 a_maskTexCoord;
-attribute vec4 a_position;
-attribute vec2 a_normal;
+in vec2 a_colorTexCoord;
+in vec2 a_maskTexCoord;
+in vec4 a_position;
+in vec2 a_normal;
 
 uniform mat4 u_modelView;
 uniform mat4 u_projection;
@@ -11,12 +11,12 @@ uniform float u_zScale;
 
 #ifdef ENABLE_VTF
 uniform sampler2D u_colorTex;
-varying LOW_P vec4 v_color;
+out LOW_P vec4 v_color;
 #else
-varying vec2 v_colorTexCoord;
+out vec2 v_colorTexCoord;
 #endif
 
-varying vec2 v_maskTexCoord;
+out vec2 v_maskTexCoord;
 
 void main()
 {
@@ -25,7 +25,7 @@ void main()
   gl_Position = applyBillboardPivotTransform(pivot * u_projection, u_pivotTransform,
                                              a_position.w * u_zScale, offset.xy);
 #ifdef ENABLE_VTF
-  v_color = texture2D(u_colorTex, a_colorTexCoord);
+  v_color = texture(u_colorTex, a_colorTexCoord);
 #else
   v_colorTexCoord = a_colorTexCoord;
 #endif
diff --git a/libs/shaders/GL/text_outlined.vsh.glsl b/libs/shaders/GL/text_outlined.vsh.glsl
index 7e7b2d2d7..4fd1c82ac 100644
--- a/libs/shaders/GL/text_outlined.vsh.glsl
+++ b/libs/shaders/GL/text_outlined.vsh.glsl
@@ -1,8 +1,8 @@
-attribute vec2 a_colorTexCoord;
-attribute vec2 a_outlineColorTexCoord;
-attribute vec2 a_maskTexCoord;
-attribute vec4 a_position;
-attribute vec2 a_normal;
+in vec2 a_colorTexCoord;
+in vec2 a_outlineColorTexCoord;
+in vec2 a_maskTexCoord;
+in vec4 a_position;
+in vec2 a_normal;
 
 uniform mat4 u_modelView;
 uniform mat4 u_projection;
@@ -11,12 +11,12 @@ uniform float u_isOutlinePass;
 
 #ifdef ENABLE_VTF
 uniform sampler2D u_colorTex;
-varying LOW_P vec4 v_color;
+out LOW_P vec4 v_color;
 #else
-varying vec2 v_colorTexCoord;
+out vec2 v_colorTexCoord;
 #endif
 
-varying vec2 v_maskTexCoord;
+out vec2 v_maskTexCoord;
 
 const float BaseDepthShift = -10.0;
 
@@ -31,7 +31,7 @@ void main()
   gl_Position = applyPivotTransform(shiftedPos * u_projection, u_pivotTransform, 0.0);
   vec2 colorTexCoord = a_colorTexCoord * notOutline + a_outlineColorTexCoord * isOutline;
 #ifdef ENABLE_VTF
-  v_color = texture2D(u_colorTex, colorTexCoord);
+  v_color = texture(u_colorTex, colorTexCoord);
 #else
   v_colorTexCoord = colorTexCoord;
 #endif
diff --git a/libs/shaders/GL/text_outlined_billboard.vsh.glsl b/libs/shaders/GL/text_outlined_billboard.vsh.glsl
index 0f23286d0..2fd2ae501 100644
--- a/libs/shaders/GL/text_outlined_billboard.vsh.glsl
+++ b/libs/shaders/GL/text_outlined_billboard.vsh.glsl
@@ -1,8 +1,8 @@
-attribute vec2 a_colorTexCoord;
-attribute vec2 a_outlineColorTexCoord;
-attribute vec2 a_maskTexCoord;
-attribute vec4 a_position;
-attribute vec2 a_normal;
+in vec2 a_colorTexCoord;
+in vec2 a_outlineColorTexCoord;
+in vec2 a_maskTexCoord;
+in vec4 a_position;
+in vec2 a_normal;
 
 uniform mat4 u_modelView;
 uniform mat4 u_projection;
@@ -12,12 +12,12 @@ uniform float u_zScale;
 
 #ifdef ENABLE_VTF
 uniform sampler2D u_colorTex;
-varying LOW_P vec4 v_color;
+out LOW_P vec4 v_color;
 #else
-varying vec2 v_colorTexCoord;
+out vec2 v_colorTexCoord;
 #endif
 
-varying vec2 v_maskTexCoord;
+out vec2 v_maskTexCoord;
 
 const float kBaseDepthShift = -10.0;
 
@@ -25,7 +25,7 @@ void main()
 {
   float isOutline = step(0.5, u_isOutlinePass);
   float depthShift = kBaseDepthShift * isOutline;
-  
+
   vec4 pivot = (vec4(a_position.xyz, 1.0) + vec4(0.0, 0.0, depthShift, 0.0)) * u_modelView;
   vec4 offset = vec4(a_normal, 0.0, 0.0) * u_projection;
   gl_Position = applyBillboardPivotTransform(pivot * u_projection, u_pivotTransform,
@@ -33,7 +33,7 @@ void main()
 
   vec2 colorTexCoord = mix(a_colorTexCoord, a_outlineColorTexCoord, isOutline);
 #ifdef ENABLE_VTF
-  v_color = texture2D(u_colorTex, colorTexCoord);
+  v_color = texture(u_colorTex, colorTexCoord);
 #else
   v_colorTexCoord = colorTexCoord;
 #endif
diff --git a/libs/shaders/GL/text_outlined_gui.vsh.glsl b/libs/shaders/GL/text_outlined_gui.vsh.glsl
index 29637d475..287ec2afd 100644
--- a/libs/shaders/GL/text_outlined_gui.vsh.glsl
+++ b/libs/shaders/GL/text_outlined_gui.vsh.glsl
@@ -1,8 +1,8 @@
-attribute vec3 a_position;
-attribute vec2 a_colorTexCoord;
-attribute vec2 a_outlineColorTexCoord;
-attribute vec2 a_normal;
-attribute vec2 a_maskTexCoord;
+in vec3 a_position;
+in vec2 a_colorTexCoord;
+in vec2 a_outlineColorTexCoord;
+in vec2 a_normal;
+in vec2 a_maskTexCoord;
 
 uniform mat4 u_modelView;
 uniform mat4 u_projection;
@@ -10,12 +10,12 @@ uniform float u_isOutlinePass;
 
 #ifdef ENABLE_VTF
 uniform sampler2D u_colorTex;
-varying LOW_P vec4 v_color;
+out LOW_P vec4 v_color;
 #else
-varying vec2 v_colorTexCoord;
+out vec2 v_colorTexCoord;
 #endif
 
-varying vec2 v_maskTexCoord;
+out vec2 v_maskTexCoord;
 
 const float kBaseDepthShift = -10.0;
 
@@ -23,7 +23,7 @@ void main()
 {
   float isOutline = step(0.5, u_isOutlinePass);
   float depthShift = kBaseDepthShift * isOutline;
-  
+
   vec4 pos = (vec4(a_position, 1.0) + vec4(0.0, 0.0, depthShift, 0.0)) * u_modelView;
   vec4 shiftedPos = vec4(a_normal, 0.0, 0.0) + pos;
   gl_Position = shiftedPos * u_projection;
@@ -33,7 +33,7 @@ void main()
 #endif
   vec2 colorTexCoord = mix(a_colorTexCoord, a_outlineColorTexCoord, isOutline);
 #ifdef ENABLE_VTF
-  v_color = texture2D(u_colorTex, colorTexCoord);
+  v_color = texture(u_colorTex, colorTexCoord);
 #else
   v_colorTexCoord = colorTexCoord;
 #endif
diff --git a/libs/shaders/GL/texturing.fsh.glsl b/libs/shaders/GL/texturing.fsh.glsl
index 8cc810938..720f28ad3 100644
--- a/libs/shaders/GL/texturing.fsh.glsl
+++ b/libs/shaders/GL/texturing.fsh.glsl
@@ -1,11 +1,13 @@
 uniform sampler2D u_colorTex;
 uniform float u_opacity;
 
-varying vec2 v_colorTexCoords;
+in vec2 v_colorTexCoords;
+
+out vec4 v_FragColor;
 
 void main()
 {
-  vec4 finalColor = texture2D(u_colorTex, v_colorTexCoords);
+  vec4 finalColor = texture(u_colorTex, v_colorTexCoords);
   finalColor.a *= u_opacity;
-  gl_FragColor = finalColor;
+  v_FragColor = finalColor;
 }
diff --git a/libs/shaders/GL/texturing.vsh.glsl b/libs/shaders/GL/texturing.vsh.glsl
index 9121006cf..57b4353fb 100644
--- a/libs/shaders/GL/texturing.vsh.glsl
+++ b/libs/shaders/GL/texturing.vsh.glsl
@@ -1,12 +1,12 @@
-attribute vec4 a_position;
-attribute vec2 a_normal;
-attribute vec2 a_colorTexCoords;
+in vec4 a_position;
+in vec2 a_normal;
+in vec2 a_colorTexCoords;
 
 uniform mat4 u_modelView;
 uniform mat4 u_projection;
 uniform mat4 u_pivotTransform;
 
-varying vec2 v_colorTexCoords;
+out vec2 v_colorTexCoords;
 
 void main()
 {
diff --git a/libs/shaders/GL/texturing3d.fsh.glsl b/libs/shaders/GL/texturing3d.fsh.glsl
index 961ab161f..8af084e70 100644
--- a/libs/shaders/GL/texturing3d.fsh.glsl
+++ b/libs/shaders/GL/texturing3d.fsh.glsl
@@ -1,11 +1,13 @@
 uniform sampler2D u_colorTex;
 uniform float u_opacity;
 
-varying vec2 v_colorTexCoords;
-varying float v_intensity;
+in vec2 v_colorTexCoords;
+in float v_intensity;
+
+out vec4 v_FragColor;
 
 void main()
 {
-  vec4 finalColor = vec4(texture2D(u_colorTex, v_colorTexCoords).rgb, u_opacity);
-  gl_FragColor = vec4((v_intensity * 0.2 + 0.8) * finalColor.rgb, finalColor.a);
+  vec4 finalColor = vec4(texture(u_colorTex, v_colorTexCoords).rgb, u_opacity);
+  v_FragColor = vec4((v_intensity * 0.2 + 0.8) * finalColor.rgb, finalColor.a);
 }
diff --git a/libs/shaders/GL/texturing_billboard.vsh.glsl b/libs/shaders/GL/texturing_billboard.vsh.glsl
index 5c3d5774d..76ba64f47 100644
--- a/libs/shaders/GL/texturing_billboard.vsh.glsl
+++ b/libs/shaders/GL/texturing_billboard.vsh.glsl
@@ -1,13 +1,13 @@
-attribute vec4 a_position;
-attribute vec2 a_normal;
-attribute vec2 a_colorTexCoords;
+in vec4 a_position;
+in vec2 a_normal;
+in vec2 a_colorTexCoords;
 
 uniform mat4 u_modelView;
 uniform mat4 u_projection;
 uniform mat4 u_pivotTransform;
 uniform float u_zScale;
 
-varying vec2 v_colorTexCoords;
+out vec2 v_colorTexCoords;
 
 void main()
 {
diff --git a/libs/shaders/GL/texturing_gui.vsh.glsl b/libs/shaders/GL/texturing_gui.vsh.glsl
index eaff57467..c945418a6 100644
--- a/libs/shaders/GL/texturing_gui.vsh.glsl
+++ b/libs/shaders/GL/texturing_gui.vsh.glsl
@@ -1,10 +1,10 @@
-attribute vec2 a_position;
-attribute vec2 a_colorTexCoords;
+in vec2 a_position;
+in vec2 a_colorTexCoords;
 
 uniform mat4 u_modelView;
 uniform mat4 u_projection;
 
-varying vec2 v_colorTexCoords;
+out vec2 v_colorTexCoords;
 
 void main()
 {
diff --git a/libs/shaders/GL/traffic.fsh.glsl b/libs/shaders/GL/traffic.fsh.glsl
index 82a43bf0a..98cb596ab 100644
--- a/libs/shaders/GL/traffic.fsh.glsl
+++ b/libs/shaders/GL/traffic.fsh.glsl
@@ -1,6 +1,6 @@
-varying vec2 v_colorTexCoord;
-varying vec2 v_maskTexCoord;
-varying float v_halfLength;
+in vec2 v_colorTexCoord;
+in vec2 v_maskTexCoord;
+in float v_halfLength;
 
 uniform sampler2D u_colorTex;
 uniform sampler2D u_maskTex;
@@ -18,11 +18,13 @@ const float kOutlineThreshold2 = 0.5;
 
 const float kMaskOpacity = 0.7;
 
+out vec4 v_FragColor;
+
 void main()
 {
-  vec4 color = texture2D(u_colorTex, v_colorTexCoord);
+  vec4 color = texture(u_colorTex, v_colorTexCoord);
   float alphaCode = color.a;
-  vec4 mask = texture2D(u_maskTex, v_maskTexCoord);
+  vec4 mask = texture(u_maskTex, v_maskTexCoord);
   color.a = u_opacity * (1.0 - smoothstep(kAntialiasingThreshold, 1.0, abs(v_halfLength)));
   color.rgb = mix(color.rgb, mask.rgb * mix(u_lightArrowColor, u_darkArrowColor, step(alphaCode, 0.6)), mask.a * kMaskOpacity);
   if (u_outline > 0.0)
@@ -30,5 +32,5 @@ void main()
     color.rgb = mix(color.rgb, u_outlineColor, step(kOutlineThreshold1, abs(v_halfLength)));
     color.rgb = mix(color.rgb, u_outlineColor, smoothstep(kOutlineThreshold2, kOutlineThreshold1, abs(v_halfLength)));
   }
-  gl_FragColor = color;
+  v_FragColor = color;
 }
diff --git a/libs/shaders/GL/traffic.vsh.glsl b/libs/shaders/GL/traffic.vsh.glsl
index 6706859bb..4a1800260 100644
--- a/libs/shaders/GL/traffic.vsh.glsl
+++ b/libs/shaders/GL/traffic.vsh.glsl
@@ -1,6 +1,6 @@
-attribute vec3 a_position;
-attribute vec4 a_normal;
-attribute vec4 a_colorTexCoord;
+in vec3 a_position;
+in vec4 a_normal;
+in vec4 a_colorTexCoord;
 
 uniform mat4 u_modelView;
 uniform mat4 u_projection;
@@ -8,9 +8,9 @@ uniform mat4 u_pivotTransform;
 
 uniform vec4 u_trafficParams;
 
-varying vec2 v_colorTexCoord;
-varying vec2 v_maskTexCoord;
-varying float v_halfLength;
+out vec2 v_colorTexCoord;
+out vec2 v_maskTexCoord;
+out float v_halfLength;
 
 const float kArrowVSize = 0.25;
 
diff --git a/libs/shaders/GL/traffic_circle.fsh.glsl b/libs/shaders/GL/traffic_circle.fsh.glsl
index e26402112..d844718c7 100644
--- a/libs/shaders/GL/traffic_circle.fsh.glsl
+++ b/libs/shaders/GL/traffic_circle.fsh.glsl
@@ -2,22 +2,24 @@
 // Unfortunately some CG algorithms cannot be implemented on OpenGL ES 2.0 without discarding
 // fragments from depth buffer.
 
-varying vec2 v_colorTexCoord;
-varying vec3 v_radius;
+in vec2 v_colorTexCoord;
+in vec3 v_radius;
 
 uniform sampler2D u_colorTex;
 uniform float u_opacity;
 
 const float kAntialiasingThreshold = 0.92;
 
+out vec4 v_FragColor;
+
 void main()
 {
-  vec4 color = texture2D(u_colorTex, v_colorTexCoord);
+  vec4 color = texture(u_colorTex, v_colorTexCoord);
   float smallRadius = v_radius.z * kAntialiasingThreshold;
   float stepValue = smoothstep(smallRadius * smallRadius, v_radius.z * v_radius.z,
                                v_radius.x * v_radius.x + v_radius.y * v_radius.y);
   color.a = u_opacity * (1.0 - stepValue);
   if (color.a < 0.01)
     discard;
-  gl_FragColor = color;
+  v_FragColor = color;
 }
diff --git a/libs/shaders/GL/traffic_circle.vsh.glsl b/libs/shaders/GL/traffic_circle.vsh.glsl
index 914f0ba83..4a61e10b6 100644
--- a/libs/shaders/GL/traffic_circle.vsh.glsl
+++ b/libs/shaders/GL/traffic_circle.vsh.glsl
@@ -1,6 +1,6 @@
-attribute vec4 a_position;
-attribute vec4 a_normal;
-attribute vec2 a_colorTexCoord;
+in vec4 a_position;
+in vec4 a_normal;
+in vec2 a_colorTexCoord;
 
 uniform mat4 u_modelView;
 uniform mat4 u_projection;
@@ -9,8 +9,8 @@ uniform mat4 u_pivotTransform;
 uniform vec3 u_lightArrowColor; // Here we store left sizes by road classes.
 uniform vec3 u_darkArrowColor; // Here we store right sizes by road classes.
 
-varying vec2 v_colorTexCoord;
-varying vec3 v_radius;
+out vec2 v_colorTexCoord;
+out vec3 v_radius;
 
 void main()
 {
diff --git a/libs/shaders/GL/traffic_line.fsh.glsl b/libs/shaders/GL/traffic_line.fsh.glsl
index ad8a8fdbb..d4635a9a1 100644
--- a/libs/shaders/GL/traffic_line.fsh.glsl
+++ b/libs/shaders/GL/traffic_line.fsh.glsl
@@ -1,10 +1,12 @@
 uniform sampler2D u_colorTex;
 uniform float u_opacity;
 
-varying vec2 v_colorTexCoord;
+in vec2 v_colorTexCoord;
+
+out vec4 v_FragColor;
 
 void main()
 {
-  vec4 color = texture2D(u_colorTex, v_colorTexCoord);
-  gl_FragColor = vec4(color.rgb, u_opacity);
+  vec4 color = texture(u_colorTex, v_colorTexCoord);
+  v_FragColor = vec4(color.rgb, u_opacity);
 }
diff --git a/libs/shaders/GL/traffic_line.vsh.glsl b/libs/shaders/GL/traffic_line.vsh.glsl
index 3162dd576..f7eaea48d 100644
--- a/libs/shaders/GL/traffic_line.vsh.glsl
+++ b/libs/shaders/GL/traffic_line.vsh.glsl
@@ -1,11 +1,11 @@
-attribute vec3 a_position;
-attribute vec2 a_colorTexCoord;
+in vec3 a_position;
+in vec2 a_colorTexCoord;
 
 uniform mat4 u_modelView;
 uniform mat4 u_projection;
 uniform mat4 u_pivotTransform;
 
-varying vec2 v_colorTexCoord;
+out vec2 v_colorTexCoord;
 
 void main()
 {
diff --git a/libs/shaders/GL/transit.fsh.glsl b/libs/shaders/GL/transit.fsh.glsl
index 2ba51ec66..987d64bc0 100644
--- a/libs/shaders/GL/transit.fsh.glsl
+++ b/libs/shaders/GL/transit.fsh.glsl
@@ -1,10 +1,8 @@
-#ifdef SAMSUNG_GOOGLE_NEXUS
-uniform sampler2D u_colorTex;
-#endif
+in vec4 v_color;
 
-varying vec4 v_color;
+out vec4 v_FragColor;
 
 void main()
 {
-  gl_FragColor = samsungGoogleNexusWorkaround(v_color);
+  v_FragColor = v_color;
 }
diff --git a/libs/shaders/GL/transit.vsh.glsl b/libs/shaders/GL/transit.vsh.glsl
index 39f7ffd7e..fa1bf5821 100644
--- a/libs/shaders/GL/transit.vsh.glsl
+++ b/libs/shaders/GL/transit.vsh.glsl
@@ -1,6 +1,6 @@
-attribute vec3 a_position;
-attribute vec4 a_normal;
-attribute vec4 a_color;
+in vec3 a_position;
+in vec4 a_normal;
+in vec4 a_color;
 
 uniform mat4 u_modelView;
 uniform mat4 u_projection;
@@ -8,7 +8,7 @@ uniform mat4 u_pivotTransform;
 
 uniform float u_lineHalfWidth;
 
-varying vec4 v_color;
+out vec4 v_color;
 
 void main()
 {
diff --git a/libs/shaders/GL/transit_circle.fsh.glsl b/libs/shaders/GL/transit_circle.fsh.glsl
index 8eb6bb9ae..72d58ba3c 100644
--- a/libs/shaders/GL/transit_circle.fsh.glsl
+++ b/libs/shaders/GL/transit_circle.fsh.glsl
@@ -2,15 +2,13 @@
 // Unfortunately some CG algorithms cannot be implemented on OpenGL ES 2.0 without discarding
 // fragments from depth buffer.
 
-varying vec3 v_radius;
-varying vec4 v_color;
-
-#ifdef SAMSUNG_GOOGLE_NEXUS
-uniform sampler2D u_colorTex;
-#endif
+in vec3 v_radius;
+in vec4 v_color;
 
 const float aaPixelsCount = 2.5;
 
+out vec4 v_FragColor;
+
 void main()
 {
   vec4 finalColor = v_color;
@@ -21,5 +19,5 @@ void main()
   finalColor.a = finalColor.a * (1.0 - stepValue);
   if (finalColor.a < 0.01)
     discard;
-  gl_FragColor = samsungGoogleNexusWorkaround(finalColor);
+  v_FragColor = finalColor;
 }
diff --git a/libs/shaders/GL/transit_circle.vsh.glsl b/libs/shaders/GL/transit_circle.vsh.glsl
index b2bc5c1d6..f775986be 100644
--- a/libs/shaders/GL/transit_circle.vsh.glsl
+++ b/libs/shaders/GL/transit_circle.vsh.glsl
@@ -1,6 +1,6 @@
-attribute vec3 a_position;
-attribute vec4 a_normal;
-attribute vec4 a_color;
+in vec3 a_position;
+in vec4 a_normal;
+in vec4 a_color;
 
 uniform mat4 u_modelView;
 uniform mat4 u_projection;
@@ -9,8 +9,8 @@ uniform mat4 u_pivotTransform;
 uniform float u_lineHalfWidth;
 uniform float u_maxRadius;
 
-varying vec3 v_radius;
-varying vec4 v_color;
+out vec3 v_radius;
+out vec4 v_color;
 
 void main()
 {
diff --git a/libs/shaders/GL/transit_marker.fsh.glsl b/libs/shaders/GL/transit_marker.fsh.glsl
index d50f86528..f1c9298f8 100644
--- a/libs/shaders/GL/transit_marker.fsh.glsl
+++ b/libs/shaders/GL/transit_marker.fsh.glsl
@@ -1,9 +1,7 @@
-#ifdef SAMSUNG_GOOGLE_NEXUS
-uniform sampler2D u_colorTex;
-#endif
+in vec4 v_offsets;
+in vec4 v_color;
 
-varying vec4 v_offsets;
-varying vec4 v_color;
+out vec4 v_FragColor;
 
 void main()
 {
@@ -17,5 +15,5 @@ void main()
   float stepValue = smoothstep(aaRadius * aaRadius, maxRadius * maxRadius, dot(radius.xy, radius.xy));
   finalColor.a = finalColor.a * (1.0 - stepValue);
 
-  gl_FragColor = samsungGoogleNexusWorkaround(finalColor);
+  v_FragColor = finalColor;
 }
diff --git a/libs/shaders/GL/transit_marker.vsh.glsl b/libs/shaders/GL/transit_marker.vsh.glsl
index 6e9d560a0..9a3f860ee 100644
--- a/libs/shaders/GL/transit_marker.vsh.glsl
+++ b/libs/shaders/GL/transit_marker.vsh.glsl
@@ -1,6 +1,6 @@
-attribute vec3 a_position;
-attribute vec4 a_normal;
-attribute vec4 a_color;
+in vec3 a_position;
+in vec4 a_normal;
+in vec4 a_color;
 
 uniform mat4 u_modelView;
 uniform mat4 u_projection;
@@ -8,8 +8,8 @@ uniform mat4 u_pivotTransform;
 
 uniform vec3 u_params;
 
-varying vec4 v_offsets;
-varying vec4 v_color;
+out vec4 v_offsets;
+out vec4 v_color;
 
 void main()
 {
diff --git a/libs/shaders/GL/user_mark.fsh.glsl b/libs/shaders/GL/user_mark.fsh.glsl
index c6e4753b1..a1ccd6d48 100644
--- a/libs/shaders/GL/user_mark.fsh.glsl
+++ b/libs/shaders/GL/user_mark.fsh.glsl
@@ -5,16 +5,18 @@
 uniform sampler2D u_colorTex;
 uniform float u_opacity;
 
-varying vec4 v_texCoords;
-varying vec4 v_maskColor;
+in vec4 v_texCoords;
+in vec4 v_maskColor;
+
+out vec4 v_FragColor;
 
 void main()
 {
-  vec4 color = texture2D(u_colorTex, v_texCoords.xy);
-  vec4 bgColor = texture2D(u_colorTex, v_texCoords.zw) * vec4(v_maskColor.xyz, 1.0);
+  vec4 color = texture(u_colorTex, v_texCoords.xy);
+  vec4 bgColor = texture(u_colorTex, v_texCoords.zw) * vec4(v_maskColor.xyz, 1.0);
   vec4 finalColor = mix(color, mix(bgColor, color, color.a), bgColor.a);
   finalColor.a = clamp(color.a + bgColor.a, 0.0, 1.0) * u_opacity * v_maskColor.w;
   if (finalColor.a < 0.01)
     discard;
-  gl_FragColor = finalColor;
+  v_FragColor = finalColor;
 }
diff --git a/libs/shaders/GL/user_mark.vsh.glsl b/libs/shaders/GL/user_mark.vsh.glsl
index 6c17cf4cc..311df0481 100644
--- a/libs/shaders/GL/user_mark.vsh.glsl
+++ b/libs/shaders/GL/user_mark.vsh.glsl
@@ -1,15 +1,15 @@
-attribute vec3 a_position;
-attribute vec3 a_normalAndAnimateOrZ;
-attribute vec4 a_texCoords;
-attribute vec4 a_color;
+in vec3 a_position;
+in vec3 a_normalAndAnimateOrZ;
+in vec4 a_texCoords;
+in vec4 a_color;
 
 uniform mat4 u_modelView;
 uniform mat4 u_projection;
 uniform mat4 u_pivotTransform;
 uniform float u_interpolation;
 
-varying vec4 v_texCoords;
-varying vec4 v_maskColor;
+out vec4 v_texCoords;
+out vec4 v_maskColor;
 
 void main()
 {
diff --git a/libs/shaders/GL/user_mark_billboard.vsh.glsl b/libs/shaders/GL/user_mark_billboard.vsh.glsl
index 1454c7f71..746e811f0 100644
--- a/libs/shaders/GL/user_mark_billboard.vsh.glsl
+++ b/libs/shaders/GL/user_mark_billboard.vsh.glsl
@@ -1,15 +1,15 @@
-attribute vec3 a_position;
-attribute vec3 a_normalAndAnimateOrZ;
-attribute vec4 a_texCoords;
-attribute vec4 a_color;
+in vec3 a_position;
+in vec3 a_normalAndAnimateOrZ;
+in vec4 a_texCoords;
+in vec4 a_color;
 
 uniform mat4 u_modelView;
 uniform mat4 u_projection;
 uniform mat4 u_pivotTransform;
 uniform float u_interpolation;
 
-varying vec4 v_texCoords;
-varying vec4 v_maskColor;
+out vec4 v_texCoords;
+out vec4 v_maskColor;
 
 void main()
 {
diff --git a/libs/shaders/gl_program_pool.cpp b/libs/shaders/gl_program_pool.cpp
index 83e423444..d44187091 100644
--- a/libs/shaders/gl_program_pool.cpp
+++ b/libs/shaders/gl_program_pool.cpp
@@ -15,7 +15,7 @@ GLProgramPool::GLProgramPool(dp::ApiVersion apiVersion)
   if (m_apiVersion == dp::ApiVersion::OpenGLES3)
   {
 #if defined(OMIM_OS_DESKTOP) && !defined(OMIM_OS_LINUX)
-    m_baseDefines = std::string(GL3_SHADER_VERSION) + "#define GLES3\n";
+    m_baseDefines = std::string(GL3_SHADER_VERSION);
 #else
     m_baseDefines = std::string(GLES3_SHADER_VERSION);
 #endif
diff --git a/libs/shaders/gl_shaders_preprocessor.py b/libs/shaders/gl_shaders_preprocessor.py
index a3f2aac1f..8e7073068 100755
--- a/libs/shaders/gl_shaders_preprocessor.py
+++ b/libs/shaders/gl_shaders_preprocessor.py
@@ -10,8 +10,6 @@ MEDIUMP_SEARCH = "mediump"
 HIGHP_SEARCH = "highp"
 VERTEX_SHADER_EXT = ".vsh.glsl"
 FRAG_SHADER_EXT = ".fsh.glsl"
-GLES3_PREFIX = "GLES3_"
-GLES3_SHADER_PREFIX = "gles3_"
 
 SHADERS_LIB_COMMON_PATTERN = "// Common"
 SHADERS_LIB_VS_PATTERN = "// VS"
@@ -164,7 +162,7 @@ def get_shaders_lib_content(shader_file, shaders_library):
     return lib_content
 
 
-def write_shader_line(output_file, line, convert_to_gles3, is_fragment_shader):
+def write_shader_line(output_file, line):
     if line.lstrip().startswith("//") or line == '\n' or len(line) == 0:
         return
 
@@ -179,54 +177,34 @@ def write_shader_line(output_file, line, convert_to_gles3, is_fragment_shader):
         exit(2)
 
     output_line = line.rstrip()
-    if convert_to_gles3:
-        output_line = output_line.replace("attribute", "in")
-        if is_fragment_shader:
-            output_line = output_line.replace("varying", "in")
-        else:
-            output_line = output_line.replace("varying", "out")
-        output_line = output_line.replace("texture2D", "texture")
-        output_line = output_line.replace("gl_FragColor", "v_FragColor")
     output_file.write("  %s \\n\\\n" % output_line)
 
 
-def write_shader_body(output_file, shader_file, shader_dir, shaders_library, convert_to_gles3):
-    is_fragment_shader = shader_file.find(FRAG_SHADER_EXT) >= 0
+def write_shader_body(output_file, shader_file, shader_dir, shaders_library):
     lib_content = get_shaders_lib_content(shader_file, shaders_library)
     for line in open(os.path.join(shader_dir, shader_file)):
         if line.lstrip().startswith("void main"):
             for lib_line in lib_content.splitlines():
-                write_shader_line(output_file, lib_line, convert_to_gles3, is_fragment_shader)
-            if convert_to_gles3 and is_fragment_shader:
-                output_file.write("  out vec4 v_FragColor; \\n\\\n")
-        write_shader_line(output_file, line, convert_to_gles3, is_fragment_shader)
+                write_shader_line(output_file, lib_line)
+        write_shader_line(output_file, line)
     output_file.write("\";\n\n")
 
 
 def write_shader(output_file, shader_file, shader_dir, shaders_library):
-    output_file.write("char const %s[] = \" \\\n" % (format_shader_source_name(shader_file)))
+    output_file.write("char const %s[] = \" \\\n" % format_shader_source_name(shader_file))
     write_shader_gles_header(output_file)
-    write_shader_body(output_file, shader_file, shader_dir, shaders_library, False)
+    write_shader_body(output_file, shader_file, shader_dir, shaders_library)
 
 
-def write_gles3_shader(output_file, shader_file, shader_dir, shaders_library):
-    output_file.write("char const %s[] = \" \\\n" % (GLES3_PREFIX + format_shader_source_name(shader_file)))
-    write_shader_gles_header(output_file)
-    if os.path.exists(os.path.join(shader_dir, GLES3_SHADER_PREFIX + shader_file)):
-        write_shader_body(output_file, GLES3_SHADER_PREFIX + shader_file, shader_dir, shaders_library, False)
-    else:
-        write_shader_body(output_file, shader_file, shader_dir, shaders_library, True)
-
-
-def write_gpu_programs_map(file, programs_def, source_prefix):
+def write_gpu_programs_map(file, programs_def):
     for program in programs_def.keys():
         vertex_shader = programs_def[program][0]
-        vertex_source_name = source_prefix + format_shader_source_name(vertex_shader)
+        vertex_source_name = format_shader_source_name(vertex_shader)
 
         fragment_shader = programs_def[program][1]
-        fragment_source_name = source_prefix + format_shader_source_name(fragment_shader)
+        fragment_source_name = format_shader_source_name(fragment_shader)
 
-        file.write("      GLProgramInfo(\"%s\", \"%s\", %s, %s),\n" % (
+        file.write("    GLProgramInfo(\"%s\", \"%s\", %s, %s),\n" % (
             vertex_source_name, fragment_source_name, vertex_source_name, fragment_source_name))
 
 
@@ -243,25 +221,19 @@ def write_implementation_file(programs_def, shader_index, shader_dir, impl_file,
 
         file.write("namespace gpu\n")
         file.write("{\n")
-        # TODO: Drop this GL3_SHADER_VERSION once MacOS code has been migrated to Metal
         file.write("char const * GL3_SHADER_VERSION = \"#version 150 core \\n\";\n")
         file.write("char const * GLES3_SHADER_VERSION = \"#version 300 es \\n\";\n\n")
 
         for shader in shader_index.keys():
             write_shader(file, shader, shader_dir, shaders_library)
-            write_gles3_shader(file, shader, shader_dir, shaders_library)
 
         file.write("GLProgramInfo GetProgramInfo(dp::ApiVersion apiVersion, Program program)\n")
         file.write("{\n")
-        file.write("  if (apiVersion == dp::ApiVersion::OpenGLES3)\n") # TODO: remove
-        file.write("  {\n")
-        file.write("    static std::array<GLProgramInfo, static_cast<size_t>(Program::ProgramsCount)> gpuIndex = {{\n")
-        write_gpu_programs_map(file, programs_def, GLES3_PREFIX)
-        file.write("    }};\n")
-        file.write("    return gpuIndex[static_cast<size_t>(program)];\n")
-        file.write("  }\n")
-        file.write("  CHECK(false, (\"Unsupported API version.\"));\n")
-        file.write("  return {};\n")
+        file.write("  CHECK_EQUAL(apiVersion, dp::ApiVersion::OpenGLES3, ());\n")
+        file.write("  static std::array<GLProgramInfo, static_cast<size_t>(Program::ProgramsCount)> gpuIndex = {{\n")
+        write_gpu_programs_map(file, programs_def)
+        file.write("  }};\n")
+        file.write("  return gpuIndex[static_cast<size_t>(program)];\n")
         file.write("}\n")
         file.write("}  // namespace gpu\n")
 
diff --git a/libs/shaders/program_manager.cpp b/libs/shaders/program_manager.cpp
index e413c7021..ae69d0fc9 100644
--- a/libs/shaders/program_manager.cpp
+++ b/libs/shaders/program_manager.cpp
@@ -69,13 +69,7 @@ void ProgramManager::InitForOpenGL(ref_ptr<dp::GraphicsContext> context)
   }
 #endif
 
-  if (dp::SupportManager::Instance().IsSamsungGoogleNexus())
-    globalDefines.append("#define SAMSUNG_GOOGLE_NEXUS\n");
-
   auto const apiVersion = context->GetApiVersion();
-  if (apiVersion == dp::ApiVersion::OpenGLES3)
-    globalDefines.append("#define GLES3\n");
-
   m_pool = make_unique_dp<GLProgramPool>(apiVersion);
   ref_ptr<GLProgramPool> pool = make_ref(m_pool);
   pool->SetDefines(globalDefines);
diff --git a/libs/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp b/libs/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp
index ec25d31d8..0285e0beb 100644
--- a/libs/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp
+++ b/libs/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp
@@ -150,14 +150,12 @@ void CompileShaders(CompilerData const & compiler, std::string const & additiona
     args << fileName;
   };
 
-  std::string const defines = compiler.m_apiVersion == dp::ApiVersion::OpenGLES3 ?
-    "#define GLES3\n" + additionalDefines : additionalDefines;
-  TestShaders(compiler.m_apiVersion, defines, ".vert", GetVertexShaders(compiler.m_apiVersion),
+  TestShaders(compiler.m_apiVersion, additionalDefines, ".vert", GetVertexShaders(compiler.m_apiVersion),
               compilerPath, [](QProcess const &) {}, argsPrepareFn, successChecker, ss);
-  TestShaders(compiler.m_apiVersion, defines, ".frag", GetFragmentShaders(compiler.m_apiVersion),
+  TestShaders(compiler.m_apiVersion, additionalDefines, ".frag", GetFragmentShaders(compiler.m_apiVersion),
               compilerPath, [](QProcess const &) {}, argsPrepareFn, successChecker, ss);
 
-  TEST_EQUAL(errorLog.isEmpty(), true, ("Defines:", defines, additionalDefines, "\n", errorLog));
+  TEST_EQUAL(errorLog.isEmpty(), true, ("Defines:", additionalDefines, "\n", errorLog));
 }
 
 UNIT_TEST(MobileCompileShaders_Test)
@@ -173,11 +171,6 @@ UNIT_TEST(MobileCompileShaders_Test)
       "#define ENABLE_VTF\n");
   });
 
-  workerThread.Push([] {
-    CompileShaders({dp::ApiVersion::OpenGLES3, GetCompilerPath(kCompilerOpenGLES)},
-      "#define SAMSUNG_GOOGLE_NEXUS\n");
-  });
-
   workerThread.Shutdown(base::DelayedThreadPool::Exit::ExecPending);
 }
 
@@ -223,19 +216,16 @@ void MaliCompileShaders(MaliCompilerData const & compiler, MaliDriverSet const &
          << "-r" << version.m_version << "-c" << version.m_series << "-d" << driverSet.m_driverName
          << fileName;
   };
-  std::string const defines =
-    compiler.m_apiVersion == dp::ApiVersion::OpenGLES3 ? "#define GLES3\n" : "";
   QString const compilerPath = QString::fromStdString(compiler.m_compilerPath);
-  TestShaders(compiler.m_apiVersion, defines, {}, GetVertexShaders(compiler.m_apiVersion),
+  TestShaders(compiler.m_apiVersion, "", {}, GetVertexShaders(compiler.m_apiVersion),
               compilerPath, procPrepare, argForming, successChecker, ss);
   shaderType = "-f";
-  TestShaders(compiler.m_apiVersion, defines, {}, GetFragmentShaders(compiler.m_apiVersion),
+  TestShaders(compiler.m_apiVersion, "", {}, GetFragmentShaders(compiler.m_apiVersion),
               compilerPath, procPrepare, argForming, successChecker, ss);
   TEST(errorLog.isEmpty(),
-       (shaderType, version.m_series, version.m_version, driverSet.m_driverName, defines, errorLog));
+       (shaderType, version.m_series, version.m_version, driverSet.m_driverName, "", errorLog));
 
   // MALI GPUs do not support ENABLE_VTF. Do not test it here.
-  // SAMSUNG_GOOGLE_NEXUS doesn't use Mali GPU. Do not test it here.
 }
 
 UNIT_TEST(MALI_MobileCompileShaders_Test)

From a4064625499c06ed314b4cb67b1f7196834e9f45 Mon Sep 17 00:00:00 2001
From: renderexpert <expert@renderconsulting.co.uk>
Date: Fri, 24 Jan 2025 14:19:32 +0000
Subject: [PATCH 028/302] Remove Adreno 200 support hacks

Signed-off-by: renderexpert <expert@renderconsulting.co.uk>
---
 libs/drape/support_manager.cpp     | 14 --------------
 libs/drape/support_manager.hpp     |  2 --
 libs/drape/vertex_array_buffer.cpp |  9 ++-------
 libs/drape/vertex_array_buffer.hpp |  1 -
 4 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/libs/drape/support_manager.cpp b/libs/drape/support_manager.cpp
index f9357d2b4..ad783c0ad 100644
--- a/libs/drape/support_manager.cpp
+++ b/libs/drape/support_manager.cpp
@@ -32,20 +32,6 @@ void SupportManager::Init(ref_ptr<GraphicsContext> context)
   m_rendererVersion = context->GetRendererVersion();
   LOG(LINFO, ("Renderer =", m_rendererName, "| Api =", context->GetApiVersion(), "| Version =", m_rendererVersion));
 
-  if (m_rendererName.find("Adreno") != std::string::npos)
-  {
-    std::array<std::string_view, 5> constexpr models = { "200", "203", "205", "220", "225" };
-    for (auto const & model : models)
-    {
-      if (m_rendererName.find(model) != std::string::npos)
-      {
-        LOG(LINFO, ("Adreno 200 device detected."));
-        m_isAdreno200 = true;
-        break;
-      }
-    }
-  }
-
   m_isTegra = (m_rendererName.find("Tegra") != std::string::npos);
   if (m_isTegra)
     LOG(LINFO, ("NVidia Tegra device detected."));
diff --git a/libs/drape/support_manager.hpp b/libs/drape/support_manager.hpp
index cddbb3cac..36d2b5b69 100644
--- a/libs/drape/support_manager.hpp
+++ b/libs/drape/support_manager.hpp
@@ -26,7 +26,6 @@ public:
   // reinitialization.
   void Init(ref_ptr<GraphicsContext> context);
 
-  bool IsAdreno200Device() const { return m_isAdreno200; }
   bool IsTegraDevice() const { return m_isTegra; }
   bool IsAntialiasingEnabledByDefault() const { return m_isAntialiasingEnabledByDefault; }
 
@@ -50,7 +49,6 @@ private:
 
   std::string m_rendererName;
   std::string m_rendererVersion;
-  bool m_isAdreno200 = false;
   bool m_isTegra = false;
   bool m_isAntialiasingEnabledByDefault = false;
 
diff --git a/libs/drape/vertex_array_buffer.cpp b/libs/drape/vertex_array_buffer.cpp
index 17f528d3f..8c417bfcd 100644
--- a/libs/drape/vertex_array_buffer.cpp
+++ b/libs/drape/vertex_array_buffer.cpp
@@ -118,10 +118,6 @@ VertexArrayBuffer::VertexArrayBuffer(uint32_t indexBufferSize, uint32_t dataBuff
   , m_batcherHash(batcherHash)
 {
   m_indexBuffer = make_unique_dp<IndexBuffer>(indexBufferSize);
-
-  // Adreno 200 GPUs aren't able to share OpenGL resources between 2 OGL-contexts correctly,
-  // so we have to create and destroy VBO on one context.
-  m_moveToGpuOnBuild = SupportManager::Instance().IsAdreno200Device();
 }
 
 VertexArrayBuffer::~VertexArrayBuffer()
@@ -134,8 +130,7 @@ VertexArrayBuffer::~VertexArrayBuffer()
 
 void VertexArrayBuffer::Preflush(ref_ptr<GraphicsContext> context)
 {
-  if (!m_moveToGpuOnBuild)
-    PreflushImpl(context);
+  PreflushImpl(context);
 }
 
 void VertexArrayBuffer::PreflushImpl(ref_ptr<GraphicsContext> context)
@@ -191,7 +186,7 @@ void VertexArrayBuffer::RenderRange(ref_ptr<GraphicsContext> context,
 
 void VertexArrayBuffer::Build(ref_ptr<GraphicsContext> context, ref_ptr<GpuProgram> program)
 {
-  if (m_moveToGpuOnBuild && !m_isPreflushed)
+  if (!m_isPreflushed)
     PreflushImpl(context);
 
   if (!HasBuffers())
diff --git a/libs/drape/vertex_array_buffer.hpp b/libs/drape/vertex_array_buffer.hpp
index 34a727704..bc4f69fcc 100644
--- a/libs/drape/vertex_array_buffer.hpp
+++ b/libs/drape/vertex_array_buffer.hpp
@@ -124,7 +124,6 @@ private:
   drape_ptr<IndexBuffer> m_indexBuffer;
 
   bool m_isPreflushed = false;
-  bool m_moveToGpuOnBuild = false;
   bool m_isChanged = false;
   BindingInfoArray m_bindingInfo;
   uint8_t m_bindingInfoCount = 0;

From 9b3507211fc62d8c363b8ae8053ea7981471a81a Mon Sep 17 00:00:00 2001
From: renderexpert <expert@renderconsulting.co.uk>
Date: Fri, 24 Jan 2025 14:30:29 +0000
Subject: [PATCH 029/302] Remove Tegra support hacks

Signed-off-by: renderexpert <expert@renderconsulting.co.uk>
---
 libs/drape/gl_gpu_program.cpp  | 16 ++--------------
 libs/drape/support_manager.cpp |  4 ----
 libs/drape/support_manager.hpp |  2 --
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/libs/drape/gl_gpu_program.cpp b/libs/drape/gl_gpu_program.cpp
index 3a3bfedbc..04471969f 100644
--- a/libs/drape/gl_gpu_program.cpp
+++ b/libs/drape/gl_gpu_program.cpp
@@ -23,26 +23,14 @@ GLGpuProgram::GLGpuProgram(std::string const & programName,
   if (!GLFunctions::glLinkProgram(m_programID, errorLog))
     LOG(LERROR, ("Program ", programName, " link error = ", errorLog));
 
-  // On Tegra3 glGetActiveUniform isn't work if you detach shaders after linking.
   LoadUniformLocations();
 
-  // On Tegra2 we cannot detach shaders at all.
-  // https://devtalk.nvidia.com/default/topic/528941/alpha-blending-not-working-on-t20-and-t30-under-ice-cream-sandwich/
-  if (!SupportManager::Instance().IsTegraDevice())
-  {
-    GLFunctions::glDetachShader(m_programID, m_vertexShader->GetID());
-    GLFunctions::glDetachShader(m_programID, m_fragmentShader->GetID());
-  }
+  GLFunctions::glDetachShader(m_programID, m_vertexShader->GetID());
+  GLFunctions::glDetachShader(m_programID, m_fragmentShader->GetID());
 }
 
 GLGpuProgram::~GLGpuProgram()
 {
-  if (SupportManager::Instance().IsTegraDevice())
-  {
-    GLFunctions::glDetachShader(m_programID, m_vertexShader->GetID());
-    GLFunctions::glDetachShader(m_programID, m_fragmentShader->GetID());
-  }
-
   GLFunctions::glDeleteProgram(m_programID);
 }
 
diff --git a/libs/drape/support_manager.cpp b/libs/drape/support_manager.cpp
index ad783c0ad..b396899d5 100644
--- a/libs/drape/support_manager.cpp
+++ b/libs/drape/support_manager.cpp
@@ -32,10 +32,6 @@ void SupportManager::Init(ref_ptr<GraphicsContext> context)
   m_rendererVersion = context->GetRendererVersion();
   LOG(LINFO, ("Renderer =", m_rendererName, "| Api =", context->GetApiVersion(), "| Version =", m_rendererVersion));
 
-  m_isTegra = (m_rendererName.find("Tegra") != std::string::npos);
-  if (m_isTegra)
-    LOG(LINFO, ("NVidia Tegra device detected."));
-
   auto const apiVersion = context->GetApiVersion();
   if (apiVersion == dp::ApiVersion::OpenGLES3)
   {
diff --git a/libs/drape/support_manager.hpp b/libs/drape/support_manager.hpp
index 36d2b5b69..d6f6f51a2 100644
--- a/libs/drape/support_manager.hpp
+++ b/libs/drape/support_manager.hpp
@@ -26,7 +26,6 @@ public:
   // reinitialization.
   void Init(ref_ptr<GraphicsContext> context);
 
-  bool IsTegraDevice() const { return m_isTegra; }
   bool IsAntialiasingEnabledByDefault() const { return m_isAntialiasingEnabledByDefault; }
 
   float GetMaxLineWidth() const { return m_maxLineWidth; }
@@ -49,7 +48,6 @@ private:
 
   std::string m_rendererName;
   std::string m_rendererVersion;
-  bool m_isTegra = false;
   bool m_isAntialiasingEnabledByDefault = false;
 
   float m_maxLineWidth = 1;

From 6d0daf6fe75ee24a5ad17dfd0a5272763d41c113 Mon Sep 17 00:00:00 2001
From: renderexpert <expert@renderconsulting.co.uk>
Date: Thu, 6 Feb 2025 10:49:02 +0000
Subject: [PATCH 030/302] Rewrite shaders to use OpenGL ES3 syntax

Signed-off-by: renderexpert <expert@renderconsulting.co.uk>
---
 data/vulkan_shaders/reflection.json           |   2 +-
 data/vulkan_shaders/shaders_pack.spv          | Bin 341244 -> 348916 bytes
 libs/drape/gl_functions.cpp                   |   2 +-
 libs/drape/gl_gpu_program.cpp                 |   2 +-
 libs/shaders/GL/area.vsh.glsl                 |  29 +-
 libs/shaders/GL/area3d.vsh.glsl               |  30 +-
 libs/shaders/GL/area3d_outline.vsh.glsl       |  31 +-
 libs/shaders/GL/arrow3d.fsh.glsl              |  16 +-
 libs/shaders/GL/arrow3d.vsh.glsl              |  15 +-
 libs/shaders/GL/arrow3d_outline.fsh.glsl      |  12 +-
 libs/shaders/GL/arrow3d_shadow.fsh.glsl       |  12 +-
 libs/shaders/GL/arrow3d_shadow.vsh.glsl       |  14 +-
 libs/shaders/GL/arrow3d_textured.fsh.glsl     |  20 +-
 libs/shaders/GL/arrow3d_textured.vsh.glsl     |  20 +-
 libs/shaders/GL/circle.fsh.glsl               |  25 +-
 libs/shaders/GL/circle.vsh.glsl               |  32 +-
 libs/shaders/GL/circle_point.fsh.glsl         |  22 +-
 libs/shaders/GL/circle_point.vsh.glsl         |  25 +-
 libs/shaders/GL/colored_symbol.fsh.glsl       |  29 +-
 libs/shaders/GL/colored_symbol.vsh.glsl       |  34 +-
 .../GL/colored_symbol_billboard.vsh.glsl      |  34 +-
 libs/shaders/GL/dashed_line.fsh.glsl          |  29 +-
 libs/shaders/GL/dashed_line.vsh.glsl          |  30 +-
 libs/shaders/GL/debug_rect.fsh.glsl           |   7 +-
 libs/shaders/GL/debug_rect.vsh.glsl           |   2 +-
 libs/shaders/GL/hatching_area.fsh.glsl        |  27 +-
 libs/shaders/GL/hatching_area.vsh.glsl        |  33 +-
 libs/shaders/GL/imgui.fsh.glsl                |   8 +-
 libs/shaders/GL/imgui.vsh.glsl                |  15 +-
 libs/shaders/GL/line.fsh.glsl                 |  26 +-
 libs/shaders/GL/line.vsh.glsl                 |  34 +-
 libs/shaders/GL/masked_texturing.fsh.glsl     |  23 +-
 libs/shaders/GL/masked_texturing.vsh.glsl     |  26 +-
 .../GL/masked_texturing_billboard.vsh.glsl    |  27 +-
 libs/shaders/GL/my_position.vsh.glsl          |  29 +-
 libs/shaders/GL/path_symbol.vsh.glsl          |  24 +-
 libs/shaders/GL/position_accuracy3d.vsh.glsl  |  26 +-
 libs/shaders/GL/route.fsh.glsl                |  37 ++-
 libs/shaders/GL/route.vsh.glsl                |  35 +-
 libs/shaders/GL/route_arrow.fsh.glsl          |  29 +-
 libs/shaders/GL/route_arrow.vsh.glsl          |  32 +-
 libs/shaders/GL/route_dash.fsh.glsl           |  34 +-
 libs/shaders/GL/route_marker.fsh.glsl         |  33 +-
 libs/shaders/GL/route_marker.vsh.glsl         |  33 +-
 libs/shaders/GL/ruler.fsh.glsl                |  23 ++
 libs/shaders/GL/ruler.vsh.glsl                |  21 +-
 libs/shaders/GL/screen_quad.fsh.glsl          |  17 +
 libs/shaders/GL/screen_quad.vsh.glsl          |   7 +-
 libs/shaders/GL/selection_line.fsh.glsl       |  26 +-
 libs/shaders/GL/selection_line.vsh.glsl       |  40 ++-
 libs/shaders/GL/shader_index.txt              |  14 +-
 libs/shaders/GL/smaa_blending_weight.fsh.glsl |  43 +--
 libs/shaders/GL/smaa_blending_weight.vsh.glsl |  18 +-
 libs/shaders/GL/smaa_edges.fsh.glsl           |  21 +-
 libs/shaders/GL/smaa_edges.vsh.glsl           |  19 +-
 libs/shaders/GL/smaa_final.fsh.glsl           |  20 +-
 libs/shaders/GL/smaa_final.vsh.glsl           |  14 +-
 libs/shaders/GL/solid_color.fsh.glsl          |  23 +-
 libs/shaders/GL/text.fsh.glsl                 |  25 +-
 libs/shaders/GL/text.vsh.glsl                 |  35 +-
 libs/shaders/GL/text_billboard.vsh.glsl       |  34 +-
 libs/shaders/GL/text_outlined.vsh.glsl        |  38 ++-
 .../GL/text_outlined_billboard.vsh.glsl       |  38 ++-
 libs/shaders/GL/text_outlined_gui.fsh.glsl    |  35 ++
 libs/shaders/GL/text_outlined_gui.vsh.glsl    |  36 ++-
 libs/shaders/GL/texturing.fsh.glsl            |  19 +-
 libs/shaders/GL/texturing.vsh.glsl            |  22 +-
 libs/shaders/GL/texturing3d.fsh.glsl          |  21 +-
 libs/shaders/GL/texturing_billboard.vsh.glsl  |  23 +-
 libs/shaders/GL/texturing_gui.fsh.glsl        |  23 ++
 libs/shaders/GL/texturing_gui.vsh.glsl        |  18 +-
 libs/shaders/GL/texturing_position.fsh.glsl   |  25 ++
 libs/shaders/GL/traffic.fsh.glsl              |  39 ++-
 libs/shaders/GL/traffic.vsh.glsl              |  30 +-
 libs/shaders/GL/traffic_circle.fsh.glsl       |  27 +-
 libs/shaders/GL/traffic_circle.vsh.glsl       |  29 +-
 libs/shaders/GL/traffic_line.fsh.glsl         |  20 +-
 libs/shaders/GL/traffic_line.vsh.glsl         |  21 +-
 libs/shaders/GL/transit.fsh.glsl              |   4 +-
 libs/shaders/GL/transit.vsh.glsl              |  22 +-
 libs/shaders/GL/transit_circle.fsh.glsl       |  12 +-
 libs/shaders/GL/transit_circle.vsh.glsl       |  25 +-
 libs/shaders/GL/transit_marker.fsh.glsl       |   8 +-
 libs/shaders/GL/transit_marker.vsh.glsl       |  24 +-
 libs/shaders/GL/user_mark.fsh.glsl            |  24 +-
 libs/shaders/GL/user_mark.vsh.glsl            |  28 +-
 libs/shaders/GL/user_mark_billboard.vsh.glsl  |  28 +-
 libs/shaders/Metal/map.metal                  |   2 +-
 libs/shaders/Metal/route.metal                |   6 +-
 libs/shaders/Metal/shapes.metal               |   3 +-
 libs/shaders/Metal/traffic.metal              |   7 +-
 libs/shaders/Metal/transit.metal              |   1 +
 libs/shaders/gl_program_params.cpp            |   4 +-
 libs/shaders/gl_shaders_preprocessor.py       | 139 ++++++--
 libs/shaders/program_params.hpp               |  28 +-
 libs/shaders/vulkan_shaders_preprocessor.py   | 299 +++---------------
 tools/unix/generate_vulkan_shaders.sh         |   2 +-
 97 files changed, 1520 insertions(+), 1015 deletions(-)
 create mode 100644 libs/shaders/GL/ruler.fsh.glsl
 create mode 100644 libs/shaders/GL/screen_quad.fsh.glsl
 create mode 100644 libs/shaders/GL/text_outlined_gui.fsh.glsl
 create mode 100644 libs/shaders/GL/texturing_gui.fsh.glsl
 create mode 100644 libs/shaders/GL/texturing_position.fsh.glsl

diff --git a/data/vulkan_shaders/reflection.json b/data/vulkan_shaders/reflection.json
index b428a2a4e..e2784fb8a 100644
--- a/data/vulkan_shaders/reflection.json
+++ b/data/vulkan_shaders/reflection.json
@@ -1 +1 @@
-[{"prg":0,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":0,"vs_size":3772,"fs_off":3772,"fs_size":2552},{"prg":1,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":6324,"vs_size":3412,"fs_off":9736,"fs_size":1508},{"prg":2,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_maskTex","idx":2,"frag":1}]},"vs_off":11244,"vs_size":3560,"fs_off":14804,"fs_size":1756},{"prg":3,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":16560,"vs_size":4468,"fs_off":21028,"fs_size":2508},{"prg":4,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":23536,"vs_size":4468,"fs_off":28004,"fs_size":2508},{"prg":5,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":30512,"vs_size":4440,"fs_off":34952,"fs_size":2084},{"prg":6,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":37036,"vs_size":3768,"fs_off":40804,"fs_size":2084},{"prg":7,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":42888,"vs_size":3104,"fs_off":45992,"fs_size":1992},{"prg":8,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":47984,"vs_size":3104,"fs_off":51088,"fs_size":1992},{"prg":9,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":53080,"vs_size":3352,"fs_off":56432,"fs_size":1336},{"prg":10,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":57768,"vs_size":3352,"fs_off":61120,"fs_size":1336},{"prg":11,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":62456,"vs_size":3692,"fs_off":66148,"fs_size":1904},{"prg":12,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":68052,"vs_size":2716,"fs_off":70768,"fs_size":1336},{"prg":13,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":72104,"vs_size":5084,"fs_off":77188,"fs_size":1332},{"prg":14,"info":{"vs_uni":0,"fs_uni":-1,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":78520,"vs_size":5436,"fs_off":83956,"fs_size":1800},{"prg":15,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_maskTex","idx":2,"frag":1}]},"vs_off":85756,"vs_size":5452,"fs_off":91208,"fs_size":1828},{"prg":16,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":93036,"vs_size":3988,"fs_off":97024,"fs_size":1508},{"prg":17,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":98532,"vs_size":3352,"fs_off":101884,"fs_size":1336},{"prg":18,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":103220,"vs_size":3696,"fs_off":106916,"fs_size":2092},{"prg":19,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":109008,"vs_size":3516,"fs_off":112524,"fs_size":1716},{"prg":20,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":114240,"vs_size":1820,"fs_off":116060,"fs_size":1416},{"prg":21,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":117476,"vs_size":2064,"fs_off":119540,"fs_size":1416},{"prg":22,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":120956,"vs_size":3640,"fs_off":124596,"fs_size":1540},{"prg":23,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":126136,"vs_size":4140,"fs_off":130276,"fs_size":1540},{"prg":24,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":131816,"vs_size":5812,"fs_off":137628,"fs_size":1868},{"prg":25,"info":{"vs_uni":0,"fs_uni":-1,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":139496,"vs_size":4976,"fs_off":144472,"fs_size":832},{"prg":26,"info":{"vs_uni":0,"fs_uni":-1,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":145304,"vs_size":4440,"fs_off":149744,"fs_size":1984},{"prg":27,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":151728,"vs_size":5928,"fs_off":157656,"fs_size":4644},{"prg":28,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":162300,"vs_size":5928,"fs_off":168228,"fs_size":4240},{"prg":29,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":172468,"vs_size":5228,"fs_off":177696,"fs_size":2332},{"prg":30,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":180028,"vs_size":4772,"fs_off":184800,"fs_size":3332},{"prg":31,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":188132,"vs_size":3624,"fs_off":191756,"fs_size":2344},{"prg":32,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":194100,"vs_size":4468,"fs_off":198568,"fs_size":2508},{"prg":33,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":201076,"vs_size":4468,"fs_off":205544,"fs_size":2508},{"prg":34,"info":{"vs_uni":-1,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":208052,"vs_size":1104,"fs_off":209156,"fs_size":992},{"prg":35,"info":{"vs_uni":-1,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":210148,"vs_size":920,"fs_off":211068,"fs_size":1180},{"prg":36,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":212248,"vs_size":2044,"fs_off":214292,"fs_size":1904},{"prg":37,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":216196,"vs_size":2416,"fs_off":218612,"fs_size":1856},{"prg":38,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":220468,"vs_size":1880,"fs_off":222348,"fs_size":1628},{"prg":39,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":223976,"vs_size":1880,"fs_off":225856,"fs_size":1692},{"prg":40,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":227548,"vs_size":4280,"fs_off":231828,"fs_size":2552},{"prg":41,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":234380,"vs_size":4056,"fs_off":238436,"fs_size":1508},{"prg":42,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_maskTex","idx":2,"frag":1}]},"vs_off":239944,"vs_size":4204,"fs_off":244148,"fs_size":1756},{"prg":43,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":245904,"vs_size":4904,"fs_off":250808,"fs_size":2508},{"prg":44,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":253316,"vs_size":4904,"fs_off":258220,"fs_size":2508},{"prg":45,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":260728,"vs_size":4904,"fs_off":265632,"fs_size":2508},{"prg":46,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":268140,"vs_size":4904,"fs_off":273044,"fs_size":2508},{"prg":47,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":275552,"vs_size":4928,"fs_off":280480,"fs_size":2084},{"prg":48,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":282564,"vs_size":4412,"fs_off":286976,"fs_size":2084},{"prg":49,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_maskTex","idx":2,"frag":1}]},"vs_off":289060,"vs_size":6368,"fs_off":295428,"fs_size":3820},{"prg":50,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":299248,"vs_size":3492,"fs_off":302740,"fs_size":1616},{"prg":51,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":304356,"vs_size":5984,"fs_off":310340,"fs_size":2428},{"prg":52,"info":{"vs_uni":0,"fs_uni":-1,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":312768,"vs_size":1924,"fs_off":314692,"fs_size":4236},{"prg":53,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_smaaArea","idx":2,"frag":1},{"name":"u_smaaSearch","idx":3,"frag":1}]},"vs_off":318928,"vs_size":2300,"fs_off":321228,"fs_size":12356},{"prg":54,"info":{"vs_uni":0,"fs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_blendingWeightTex","idx":2,"frag":1}]},"vs_off":333584,"vs_size":1372,"fs_off":334956,"fs_size":3696},{"prg":55,"info":{"vs_uni":0,"fs_uni":-1,"tex":[{"name":"u_colorTex","idx":1,"frag":1}]},"vs_off":338652,"vs_size":1700,"fs_off":340352,"fs_size":892}]
\ No newline at end of file
+[{"prg":0,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":0,"vs_size":3920,"fs_off":3920,"fs_size":2712},{"prg":1,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":6632,"vs_size":3560,"fs_off":10192,"fs_size":1636},{"prg":2,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":11828,"vs_size":3708,"fs_off":15536,"fs_size":1884},{"prg":3,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":17420,"vs_size":4612,"fs_off":22032,"fs_size":2636},{"prg":4,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":24668,"vs_size":4612,"fs_off":29280,"fs_size":2636},{"prg":5,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":31916,"vs_size":4584,"fs_off":36500,"fs_size":2228},{"prg":6,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":38728,"vs_size":3916,"fs_off":42644,"fs_size":2228},{"prg":7,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":44872,"vs_size":3228,"fs_off":48100,"fs_size":2132},{"prg":8,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":50232,"vs_size":3228,"fs_off":53460,"fs_size":2132},{"prg":9,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":55592,"vs_size":3500,"fs_off":59092,"fs_size":1480},{"prg":10,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":60572,"vs_size":3500,"fs_off":64072,"fs_size":1480},{"prg":11,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":65552,"vs_size":3832,"fs_off":69384,"fs_size":2032},{"prg":12,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":71416,"vs_size":2860,"fs_off":74276,"fs_size":1480},{"prg":13,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":75756,"vs_size":5232,"fs_off":80988,"fs_size":1476},{"prg":14,"info":{"vs_uni":0,"tex":[],"fs_uni":-1},"vs_off":82464,"vs_size":5464,"fs_off":87928,"fs_size":1448},{"prg":15,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":89376,"vs_size":5600,"fs_off":94976,"fs_size":1972},{"prg":16,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":96948,"vs_size":4136,"fs_off":101084,"fs_size":1636},{"prg":17,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":102720,"vs_size":3500,"fs_off":106220,"fs_size":1480},{"prg":18,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":107700,"vs_size":3844,"fs_off":111544,"fs_size":2396},{"prg":19,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":113940,"vs_size":3664,"fs_off":117604,"fs_size":1844},{"prg":20,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":119448,"vs_size":1964,"fs_off":121412,"fs_size":1540},{"prg":21,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":122952,"vs_size":2176,"fs_off":125128,"fs_size":1540},{"prg":22,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":126668,"vs_size":3788,"fs_off":130456,"fs_size":1676},{"prg":23,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":132132,"vs_size":4272,"fs_off":136404,"fs_size":1676},{"prg":24,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":138080,"vs_size":5968,"fs_off":144048,"fs_size":1812},{"prg":25,"info":{"vs_uni":0,"tex":[],"fs_uni":-1},"vs_off":145860,"vs_size":5016,"fs_off":150876,"fs_size":464},{"prg":26,"info":{"vs_uni":0,"tex":[],"fs_uni":-1},"vs_off":151340,"vs_size":4484,"fs_off":155824,"fs_size":1632},{"prg":27,"info":{"vs_uni":0,"tex":[],"fs_uni":0},"vs_off":157456,"vs_size":6080,"fs_off":163536,"fs_size":4432},{"prg":28,"info":{"vs_uni":0,"tex":[],"fs_uni":0},"vs_off":167968,"vs_size":6080,"fs_off":174048,"fs_size":4028},{"prg":29,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":178076,"vs_size":5376,"fs_off":183452,"fs_size":2464},{"prg":30,"info":{"vs_uni":0,"tex":[],"fs_uni":0},"vs_off":185916,"vs_size":4924,"fs_off":190840,"fs_size":3128},{"prg":31,"info":{"vs_uni":0,"tex":[],"fs_uni":0},"vs_off":193968,"vs_size":3772,"fs_off":197740,"fs_size":2120},{"prg":32,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":199860,"vs_size":4612,"fs_off":204472,"fs_size":2636},{"prg":33,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":207108,"vs_size":4612,"fs_off":211720,"fs_size":2636},{"prg":34,"info":{"vs_uni":-1,"tex":[],"fs_uni":0},"vs_off":214356,"vs_size":1104,"fs_off":215460,"fs_size":616},{"prg":35,"info":{"vs_uni":-1,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":216076,"vs_size":920,"fs_off":216996,"fs_size":1152},{"prg":36,"info":{"vs_uni":0,"tex":[],"fs_uni":0},"vs_off":218148,"vs_size":2060,"fs_off":220208,"fs_size":1488},{"prg":37,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":221696,"vs_size":2388,"fs_off":224084,"fs_size":1856},{"prg":38,"info":{"vs_uni":0,"tex":[],"fs_uni":0},"vs_off":225940,"vs_size":1880,"fs_off":227820,"fs_size":1212},{"prg":39,"info":{"vs_uni":0,"tex":[],"fs_uni":0},"vs_off":229032,"vs_size":1880,"fs_off":230912,"fs_size":1276},{"prg":40,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":232188,"vs_size":4428,"fs_off":236616,"fs_size":2712},{"prg":41,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":239328,"vs_size":4200,"fs_off":243528,"fs_size":1636},{"prg":42,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":245164,"vs_size":4348,"fs_off":249512,"fs_size":1884},{"prg":43,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":251396,"vs_size":5048,"fs_off":256444,"fs_size":2636},{"prg":44,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":259080,"vs_size":5048,"fs_off":264128,"fs_size":2636},{"prg":45,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":266764,"vs_size":5048,"fs_off":271812,"fs_size":2636},{"prg":46,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":274448,"vs_size":5048,"fs_off":279496,"fs_size":2636},{"prg":47,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":282132,"vs_size":5084,"fs_off":287216,"fs_size":2228},{"prg":48,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":289444,"vs_size":4556,"fs_off":294000,"fs_size":2228},{"prg":49,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":296228,"vs_size":6476,"fs_off":302704,"fs_size":3952},{"prg":50,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":306656,"vs_size":3600,"fs_off":310256,"fs_size":1688},{"prg":51,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":311944,"vs_size":6012,"fs_off":317956,"fs_size":2532},{"prg":52,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":-1},"vs_off":320488,"vs_size":1916,"fs_off":322404,"fs_size":4236},{"prg":53,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_smaaArea","idx":2,"frag":1},{"name":"u_smaaSearch","idx":3,"frag":1}],"fs_uni":0},"vs_off":326640,"vs_size":2292,"fs_off":328932,"fs_size":12348},{"prg":54,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_blendingWeightTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":341280,"vs_size":1364,"fs_off":342644,"fs_size":3688},{"prg":55,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":-1},"vs_off":346332,"vs_size":1692,"fs_off":348024,"fs_size":892}]
\ No newline at end of file
diff --git a/data/vulkan_shaders/shaders_pack.spv b/data/vulkan_shaders/shaders_pack.spv
index ac7f25de5b3e6a87c72af7f9194ece320d2b3d63..cf7b08f3a17c19b1ec62753a5ea46a4d886cf39c 100644
GIT binary patch
delta 60170
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
OFdCS7dSr29$^QqIIo{0x

delta 54738
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
EKRrF5kpKVy

diff --git a/libs/drape/gl_functions.cpp b/libs/drape/gl_functions.cpp
index 2abd199f8..e3e1f73ae 100644
--- a/libs/drape/gl_functions.cpp
+++ b/libs/drape/gl_functions.cpp
@@ -811,7 +811,7 @@ int8_t GLFunctions::glGetUniformLocation(uint32_t programID, std::string const &
   ASSERT(glGetUniformLocationFn != nullptr, ());
   int result = glGetUniformLocationFn(programID, name.c_str());
   GLCHECKCALL();
-  ASSERT(result != -1, ());
+  ASSERT(result != -1, (name));
   return static_cast<int8_t>(result);
 }
 
diff --git a/libs/drape/gl_gpu_program.cpp b/libs/drape/gl_gpu_program.cpp
index 04471969f..2778a38ec 100644
--- a/libs/drape/gl_gpu_program.cpp
+++ b/libs/drape/gl_gpu_program.cpp
@@ -95,7 +95,7 @@ void GLGpuProgram::LoadUniformLocations()
     std::string name;
     GLFunctions::glGetActiveUniform(m_programID, static_cast<uint32_t>(i), &size, &info.m_type, name);
     CHECK(kSupportedTypes.find(info.m_type) != kSupportedTypes.cend(),
-          ("Used uniform has unsupported type. Program =", m_programName, "Type =", info.m_type));
+          ("Used uniform has unsupported type. Program =", m_programName, "; Type =", info.m_type, "; Name =", name));
 
     info.m_location = GLFunctions::glGetUniformLocation(m_programID, name);
     m_uniforms[name] = std::move(info);
diff --git a/libs/shaders/GL/area.vsh.glsl b/libs/shaders/GL/area.vsh.glsl
index 7e787a829..66b88cae8 100644
--- a/libs/shaders/GL/area.vsh.glsl
+++ b/libs/shaders/GL/area.vsh.glsl
@@ -1,15 +1,26 @@
-in vec3 a_position;
-in vec2 a_colorTexCoords;
-
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform mat4 u_pivotTransform;
+layout (location = 0) in vec3 a_position;
+layout (location = 1) in vec2 a_colorTexCoords;
 
 #ifdef ENABLE_VTF
-uniform sampler2D u_colorTex;
-out LOW_P vec4 v_color;
+layout (location = 0) out LOW_P vec4 v_color;
 #else
-out vec2 v_colorTexCoords;
+layout (location = 1) out vec2 v_colorTexCoords;
+#endif
+
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec2 u_contrastGamma;
+  float u_opacity;
+  float u_zScale;
+  float u_interpolation;
+  float u_isOutlinePass;
+};
+
+#ifdef ENABLE_VTF
+layout (binding = 1) uniform sampler2D u_colorTex;
 #endif
 
 void main()
diff --git a/libs/shaders/GL/area3d.vsh.glsl b/libs/shaders/GL/area3d.vsh.glsl
index 43c28f337..9ace4cc36 100644
--- a/libs/shaders/GL/area3d.vsh.glsl
+++ b/libs/shaders/GL/area3d.vsh.glsl
@@ -1,34 +1,36 @@
-in vec3 a_position;
-in vec3 a_normal;
-in vec2 a_colorTexCoords;
+layout (location = 0) in vec3 a_position;
+layout (location = 1) in vec3 a_normal;
+layout (location = 2) in vec2 a_colorTexCoords;
+layout (location = 0) out vec2 v_colorTexCoords;
+layout (location = 1) out float v_intensity;
 
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform mat4 u_pivotTransform;
-uniform float u_zScale;
-
-out vec2 v_colorTexCoords;
-out float v_intensity;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec2 u_contrastGamma;
+  float u_opacity;
+  float u_zScale;
+  float u_interpolation;
+  float u_isOutlinePass;
+};
 
 const vec4 kNormalizedLightDir = vec4(0.3162, 0.0, 0.9486, 0.0);
 
 void main()
 {
   vec4 pos = vec4(a_position, 1.0) * u_modelView;
-
   vec4 normal = vec4(a_position + a_normal, 1.0) * u_modelView;
   normal.xyw = (normal * u_projection).xyw;
   normal.z = normal.z * u_zScale;
-
   pos.xyw = (pos * u_projection).xyw;
   pos.z = a_position.z * u_zScale;
-
   vec4 normDir = normal - pos;
   if (dot(normDir, normDir) != 0.0)
     v_intensity = max(0.0, -dot(kNormalizedLightDir, normalize(normDir)));
   else
     v_intensity = 0.0;
-
   gl_Position = u_pivotTransform * pos;
 #ifdef VULKAN
   gl_Position.y = -gl_Position.y;
diff --git a/libs/shaders/GL/area3d_outline.vsh.glsl b/libs/shaders/GL/area3d_outline.vsh.glsl
index b488464c0..2b608d56a 100644
--- a/libs/shaders/GL/area3d_outline.vsh.glsl
+++ b/libs/shaders/GL/area3d_outline.vsh.glsl
@@ -1,16 +1,26 @@
-in vec3 a_position;
-in vec2 a_colorTexCoords;
-
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform mat4 u_pivotTransform;
-uniform float u_zScale;
+layout (location = 0) in vec3 a_position;
+layout (location = 1) in vec2 a_colorTexCoords;
 
 #ifdef ENABLE_VTF
-uniform sampler2D u_colorTex;
-out LOW_P vec4 v_color;
+layout (location = 0) out LOW_P vec4 v_color;
 #else
-out vec2 v_colorTexCoords;
+layout (location = 1) out vec2 v_colorTexCoords;
+#endif
+
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec2 u_contrastGamma;
+  float u_opacity;
+  float u_zScale;
+  float u_interpolation;
+  float u_isOutlinePass;
+};
+
+#ifdef ENABLE_VTF
+layout (binding = 1) uniform sampler2D u_colorTex;
 #endif
 
 void main()
@@ -23,7 +33,6 @@ void main()
   gl_Position.y = -gl_Position.y;
   gl_Position.z = (gl_Position.z  + gl_Position.w) * 0.5;
 #endif
-
 #ifdef ENABLE_VTF
   v_color = texture(u_colorTex, a_colorTexCoords);
 #else
diff --git a/libs/shaders/GL/arrow3d.fsh.glsl b/libs/shaders/GL/arrow3d.fsh.glsl
index 3ac87ea52..a88df9fe4 100644
--- a/libs/shaders/GL/arrow3d.fsh.glsl
+++ b/libs/shaders/GL/arrow3d.fsh.glsl
@@ -1,11 +1,17 @@
-in vec3 v_normal;
+layout (location = 0) in vec3 v_normal;
+
+layout (location = 0) out vec4 v_FragColor;
+
+layout (binding = 0) uniform UBO
+{
+  mat4 u_transform;
+  mat4 u_normalTransform;
+  vec4 u_color;
+  vec2 u_texCoordFlipping;
+};
 
 const vec3 lightDir = vec3(0.316, 0.0, 0.948);
 
-uniform vec4 u_color;
-
-out vec4 v_FragColor;
-
 void main()
 {
   float phongDiffuse = max(0.0, -dot(lightDir, v_normal));
diff --git a/libs/shaders/GL/arrow3d.vsh.glsl b/libs/shaders/GL/arrow3d.vsh.glsl
index 573823769..0b0c23788 100644
--- a/libs/shaders/GL/arrow3d.vsh.glsl
+++ b/libs/shaders/GL/arrow3d.vsh.glsl
@@ -1,10 +1,15 @@
-in vec3 a_pos;
-in vec3 a_normal;
+layout (location = 0) in vec3 a_pos;
+layout (location = 1) in vec3 a_normal;
 
-uniform mat4 u_transform;
-uniform mat4 u_normalTransform;
+layout (location = 0) out vec3 v_normal;
 
-out vec3 v_normal;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_transform;
+  mat4 u_normalTransform;
+  vec4 u_color;
+  vec2 u_texCoordFlipping;
+};
 
 void main()
 {
diff --git a/libs/shaders/GL/arrow3d_outline.fsh.glsl b/libs/shaders/GL/arrow3d_outline.fsh.glsl
index 810d0ef56..4bc8388f3 100644
--- a/libs/shaders/GL/arrow3d_outline.fsh.glsl
+++ b/libs/shaders/GL/arrow3d_outline.fsh.glsl
@@ -1,8 +1,14 @@
-in float v_intensity;
+layout (location = 0) in float v_intensity;
 
-uniform vec4 u_color;
+layout (location = 0) out vec4 v_FragColor;
 
-out vec4 v_FragColor;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_transform;
+  mat4 u_normalTransform;
+  vec4 u_color;
+  vec2 u_texCoordFlipping;
+};
 
 void main()
 {
diff --git a/libs/shaders/GL/arrow3d_shadow.fsh.glsl b/libs/shaders/GL/arrow3d_shadow.fsh.glsl
index 48c160ec9..40143c69a 100644
--- a/libs/shaders/GL/arrow3d_shadow.fsh.glsl
+++ b/libs/shaders/GL/arrow3d_shadow.fsh.glsl
@@ -1,8 +1,14 @@
-in float v_intensity;
+layout (location = 0) in float v_intensity;
 
-uniform vec4 u_color;
+layout (location = 0) out vec4 v_FragColor;
 
-out vec4 v_FragColor;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_transform;
+  mat4 u_normalTransform;
+  vec4 u_color;
+  vec2 u_texCoordFlipping;
+};
 
 void main()
 {
diff --git a/libs/shaders/GL/arrow3d_shadow.vsh.glsl b/libs/shaders/GL/arrow3d_shadow.vsh.glsl
index 57860b9d6..97060408d 100644
--- a/libs/shaders/GL/arrow3d_shadow.vsh.glsl
+++ b/libs/shaders/GL/arrow3d_shadow.vsh.glsl
@@ -1,9 +1,15 @@
-in vec3 a_pos;
-in vec2 a_texCoords;
+layout (location = 0) in vec3 a_pos;
+layout (location = 1) in vec2 a_texCoords;
 
-uniform mat4 u_transform;
+layout (location = 0) out float v_intensity;
 
-out float v_intensity;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_transform;
+  mat4 u_normalTransform;
+  vec4 u_color;
+  vec2 u_texCoordFlipping;
+};
 
 void main()
 {
diff --git a/libs/shaders/GL/arrow3d_textured.fsh.glsl b/libs/shaders/GL/arrow3d_textured.fsh.glsl
index 8b67447ed..ac93c59a3 100644
--- a/libs/shaders/GL/arrow3d_textured.fsh.glsl
+++ b/libs/shaders/GL/arrow3d_textured.fsh.glsl
@@ -1,14 +1,20 @@
-in vec3 v_normal;
-in vec2 v_texCoords;
+layout (location = 0) in vec3 v_normal;
+layout (location = 1) in vec2 v_texCoords;
 
-uniform sampler2D u_colorTex;
+layout (location = 0) out vec4 v_FragColor;
+
+layout (binding = 0) uniform UBO
+{
+  mat4 u_transform;
+  mat4 u_normalTransform;
+  vec4 u_color;
+  vec2 u_texCoordFlipping;
+};
+
+layout (binding = 1) uniform sampler2D u_colorTex;
 
 const vec3 lightDir = vec3(0.316, 0.0, 0.948);
 
-uniform vec4 u_color;
-
-out vec4 v_FragColor;
-
 void main()
 {
   float phongDiffuse = max(0.0, -dot(lightDir, v_normal));
diff --git a/libs/shaders/GL/arrow3d_textured.vsh.glsl b/libs/shaders/GL/arrow3d_textured.vsh.glsl
index ea0428f4e..a6ad64b1f 100644
--- a/libs/shaders/GL/arrow3d_textured.vsh.glsl
+++ b/libs/shaders/GL/arrow3d_textured.vsh.glsl
@@ -1,13 +1,17 @@
-in vec3 a_pos;
-in vec3 a_normal;
-in vec2 a_texCoords;
+layout (location = 0) in vec3 a_pos;
+layout (location = 1) in vec3 a_normal;
+layout (location = 2) in vec2 a_texCoords;
 
-uniform mat4 u_transform;
-uniform mat4 u_normalTransform;
-uniform vec2 u_texCoordFlipping;
+layout (location = 0) out vec3 v_normal;
+layout (location = 1) out vec2 v_texCoords;
 
-out vec3 v_normal;
-out vec2 v_texCoords;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_transform;
+  mat4 u_normalTransform;
+  vec4 u_color;
+  vec2 u_texCoordFlipping;
+};
 
 void main()
 {
diff --git a/libs/shaders/GL/circle.fsh.glsl b/libs/shaders/GL/circle.fsh.glsl
index 33f251b5c..5d1558bba 100644
--- a/libs/shaders/GL/circle.fsh.glsl
+++ b/libs/shaders/GL/circle.fsh.glsl
@@ -1,17 +1,27 @@
-uniform float u_opacity;
 #ifdef ENABLE_VTF
-in LOW_P vec4 v_color;
+layout (location = 0) in LOW_P vec4 v_color;
 #else
-uniform sampler2D u_colorTex;
-in vec2 v_colorTexCoords;
+layout (location = 1) in vec2 v_colorTexCoords;
+layout (binding = 1) uniform sampler2D u_colorTex;
 #endif
+layout (location = 2) in vec3 v_radius;
 
-in vec3 v_radius;
+layout (location = 0) out vec4 v_FragColor;
+
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec2 u_contrastGamma;
+  float u_opacity;
+  float u_zScale;
+  float u_interpolation;
+  float u_isOutlinePass;
+};
 
 const float aaPixelsCount = 2.5;
 
-out vec4 v_FragColor;
-
 void main()
 {
 #ifdef ENABLE_VTF
@@ -19,7 +29,6 @@ void main()
 #else
   LOW_P vec4 finalColor = texture(u_colorTex, v_colorTexCoords);
 #endif
-
   float smallRadius = v_radius.z - aaPixelsCount;
   float stepValue = smoothstep(smallRadius * smallRadius, v_radius.z * v_radius.z,
                                v_radius.x * v_radius.x + v_radius.y * v_radius.y);
diff --git a/libs/shaders/GL/circle.vsh.glsl b/libs/shaders/GL/circle.vsh.glsl
index c94dcc8f4..b186af21c 100644
--- a/libs/shaders/GL/circle.vsh.glsl
+++ b/libs/shaders/GL/circle.vsh.glsl
@@ -1,19 +1,29 @@
-in vec3 a_position;
-in vec3 a_normal;
-in vec2 a_colorTexCoords;
-
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform mat4 u_pivotTransform;
+layout (location = 0) in vec3 a_position;
+layout (location = 1) in vec3 a_normal;
+layout (location = 2) in vec2 a_colorTexCoords;
 
 #ifdef ENABLE_VTF
-uniform sampler2D u_colorTex;
-out LOW_P vec4 v_color;
+layout (location = 0) out LOW_P vec4 v_color;
 #else
-out vec2 v_colorTexCoords;
+layout (location = 1) out vec2 v_colorTexCoords;
 #endif
+layout (location = 2) out vec3 v_radius;
 
-out vec3 v_radius;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec2 u_contrastGamma;
+  float u_opacity;
+  float u_zScale;
+  float u_interpolation;
+  float u_isOutlinePass;
+};
+
+#ifdef ENABLE_VTF
+layout (binding = 1) uniform sampler2D u_colorTex;
+#endif
 
 void main()
 {
diff --git a/libs/shaders/GL/circle_point.fsh.glsl b/libs/shaders/GL/circle_point.fsh.glsl
index 57fcd7dcb..debb2230c 100644
--- a/libs/shaders/GL/circle_point.fsh.glsl
+++ b/libs/shaders/GL/circle_point.fsh.glsl
@@ -1,20 +1,28 @@
-uniform float u_opacity;
+layout (location = 0) in vec3 v_radius;
+layout (location = 1) in vec4 v_color;
 
-in vec3 v_radius;
-in vec4 v_color;
+layout (location = 0) out vec4 v_FragColor;
+
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec2 u_contrastGamma;
+  float u_opacity;
+  float u_zScale;
+  float u_interpolation;
+  float u_isOutlinePass;
+};
 
 const float kAntialiasingScalar = 0.9;
 
-out vec4 v_FragColor;
-
 void main()
 {
   float d = dot(v_radius.xy, v_radius.xy);
   vec4 finalColor = v_color;
-
   float aaRadius = v_radius.z * kAntialiasingScalar;
   float stepValue = smoothstep(aaRadius * aaRadius, v_radius.z * v_radius.z, d);
   finalColor.a = finalColor.a * u_opacity * (1.0 - stepValue);
-
   v_FragColor = finalColor;
 }
diff --git a/libs/shaders/GL/circle_point.vsh.glsl b/libs/shaders/GL/circle_point.vsh.glsl
index 3b125dec4..3a174db6b 100644
--- a/libs/shaders/GL/circle_point.vsh.glsl
+++ b/libs/shaders/GL/circle_point.vsh.glsl
@@ -1,13 +1,21 @@
-in vec3 a_normal;
-in vec3 a_position;
-in vec4 a_color;
+layout (location = 0) in vec3 a_normal;
+layout (location = 1) in vec3 a_position;
+layout (location = 2) in vec4 a_color;
 
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform mat4 u_pivotTransform;
+layout (location = 0) out vec3 v_radius;
+layout (location = 1) out vec4 v_color;
 
-out vec3 v_radius;
-out vec4 v_color;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec2 u_contrastGamma;
+  float u_opacity;
+  float u_zScale;
+  float u_interpolation;
+  float u_isOutlinePass;
+};
 
 void main()
 {
@@ -15,7 +23,6 @@ void main()
   vec4 pos = vec4(a_position.xy, 0, 1) * u_modelView;
   vec4 shiftedPos = vec4(radius.xy, 0, 0) + pos;
   gl_Position = applyPivotTransform(shiftedPos * u_projection, u_pivotTransform, 0.0);
-
   v_radius = radius;
   v_color = a_color;
 }
diff --git a/libs/shaders/GL/colored_symbol.fsh.glsl b/libs/shaders/GL/colored_symbol.fsh.glsl
index 384460e47..a43dc0a76 100644
--- a/libs/shaders/GL/colored_symbol.fsh.glsl
+++ b/libs/shaders/GL/colored_symbol.fsh.glsl
@@ -1,16 +1,26 @@
-uniform float u_opacity;
-
-in vec4 v_normal;
+layout (location = 0) in vec4 v_normal;
 #ifdef ENABLE_VTF
-in LOW_P vec4 v_color;
+layout (location = 1) in LOW_P vec4 v_color;
 #else
-uniform sampler2D u_colorTex;
-in vec2 v_colorTexCoords;
+layout (location = 2) in vec2 v_colorTexCoords;
+layout (binding = 1) uniform sampler2D u_colorTex;
 #endif
 
-const float aaPixelsCount = 2.5;
+layout (location = 0) out vec4 v_FragColor;
 
-out vec4 v_FragColor;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec2 u_contrastGamma;
+  float u_opacity;
+  float u_zScale;
+  float u_interpolation;
+  float u_isOutlinePass;
+};
+
+const float aaPixelsCount = 2.5;
 
 void main()
 {
@@ -19,16 +29,13 @@ void main()
 #else
   LOW_P vec4 color = texture(u_colorTex, v_colorTexCoords);
 #endif
-
   float r1 = (v_normal.z - aaPixelsCount) * (v_normal.z - aaPixelsCount);
   float r2 = v_normal.x * v_normal.x + v_normal.y * v_normal.y;
   float r3 = v_normal.z * v_normal.z;
   float alpha = mix(step(r3, r2), smoothstep(r1, r3, r2), v_normal.w);
-
   LOW_P vec4 finalColor = color;
   finalColor.a = finalColor.a * u_opacity * (1.0 - alpha);
   if (finalColor.a == 0.0)
     discard;
-
   v_FragColor = finalColor;
 }
diff --git a/libs/shaders/GL/colored_symbol.vsh.glsl b/libs/shaders/GL/colored_symbol.vsh.glsl
index b253a9ce0..8b6b8beaa 100644
--- a/libs/shaders/GL/colored_symbol.vsh.glsl
+++ b/libs/shaders/GL/colored_symbol.vsh.glsl
@@ -1,17 +1,28 @@
-in vec3 a_position;
-in vec4 a_normal;
-in vec4 a_colorTexCoords;
+layout (location = 0) in vec3 a_position;
+layout (location = 1) in vec4 a_normal;
+layout (location = 2) in vec4 a_colorTexCoords;
 
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform mat4 u_pivotTransform;
-
-out vec4 v_normal;
+layout (location = 0) out vec4 v_normal;
 #ifdef ENABLE_VTF
-uniform sampler2D u_colorTex;
-out LOW_P vec4 v_color;
+layout (location = 1) out LOW_P vec4 v_color;
 #else
-out vec2 v_colorTexCoords;
+layout (location = 2) out vec2 v_colorTexCoords;
+#endif
+
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec2 u_contrastGamma;
+  float u_opacity;
+  float u_zScale;
+  float u_interpolation;
+  float u_isOutlinePass;
+};
+
+#ifdef ENABLE_VTF
+layout (binding = 1) uniform sampler2D u_colorTex;
 #endif
 
 void main()
@@ -19,7 +30,6 @@ void main()
   vec4 p = vec4(a_position, 1) * u_modelView;
   vec4 pos = vec4(a_normal.xy + a_colorTexCoords.zw, 0, 0) + p;
   gl_Position = applyPivotTransform(pos * u_projection, u_pivotTransform, 0.0);
-
 #ifdef ENABLE_VTF
   v_color = texture(u_colorTex, a_colorTexCoords.xy);
 #else
diff --git a/libs/shaders/GL/colored_symbol_billboard.vsh.glsl b/libs/shaders/GL/colored_symbol_billboard.vsh.glsl
index 93cbe4c8e..b2ac3c6d3 100644
--- a/libs/shaders/GL/colored_symbol_billboard.vsh.glsl
+++ b/libs/shaders/GL/colored_symbol_billboard.vsh.glsl
@@ -1,17 +1,28 @@
-in vec3 a_position;
-in vec4 a_normal;
-in vec4 a_colorTexCoords;
+layout (location = 0) in vec3 a_position;
+layout (location = 1) in vec4 a_normal;
+layout (location = 2) in vec4 a_colorTexCoords;
 
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform mat4 u_pivotTransform;
-
-out vec4 v_normal;
+layout (location = 0) out vec4 v_normal;
 #ifdef ENABLE_VTF
-uniform sampler2D u_colorTex;
-out LOW_P vec4 v_color;
+layout (location = 1) out LOW_P vec4 v_color;
 #else
-out vec2 v_colorTexCoords;
+layout (location = 2) out vec2 v_colorTexCoords;
+#endif
+
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec2 u_contrastGamma;
+  float u_opacity;
+  float u_zScale;
+  float u_interpolation;
+  float u_isOutlinePass;
+};
+
+#ifdef ENABLE_VTF
+layout (binding = 1) uniform sampler2D u_colorTex;
 #endif
 
 void main()
@@ -19,7 +30,6 @@ void main()
   vec4 pivot = vec4(a_position.xyz, 1.0) * u_modelView;
   vec4 offset = vec4(a_normal.xy + a_colorTexCoords.zw, 0.0, 0.0) * u_projection;
   gl_Position = applyBillboardPivotTransform(pivot * u_projection, u_pivotTransform, 0.0, offset.xy);
-
 #ifdef ENABLE_VTF
   v_color = texture(u_colorTex, a_colorTexCoords.xy);
 #else
diff --git a/libs/shaders/GL/dashed_line.fsh.glsl b/libs/shaders/GL/dashed_line.fsh.glsl
index 5cb47afe2..beb0fb416 100644
--- a/libs/shaders/GL/dashed_line.fsh.glsl
+++ b/libs/shaders/GL/dashed_line.fsh.glsl
@@ -1,26 +1,35 @@
-in vec2 v_colorTexCoord;
-in vec2 v_maskTexCoord;
-//in vec2 v_halfLength;
+layout (location = 0) in vec2 v_colorTexCoord;
+layout (location = 1) in vec2 v_maskTexCoord;
+//layout (location = 2) in vec2 v_halfLength;
 
-uniform sampler2D u_colorTex;
-uniform sampler2D u_maskTex;
-uniform float u_opacity;
+layout (location = 0) out vec4 v_FragColor;
+
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec2 u_contrastGamma;
+  float u_opacity;
+  float u_zScale;
+  float u_interpolation;
+  float u_isOutlinePass;
+};
+
+layout (binding = 1) uniform sampler2D u_colorTex;
+layout (binding = 2) uniform sampler2D u_maskTex;
 
 //const float aaPixelsCount = 2.5;
 
-out vec4 v_FragColor;
-
 void main()
 {
   vec4 color = texture(u_colorTex, v_colorTexCoord);
   float mask = texture(u_maskTex, v_maskTexCoord).r;
   color.a = color.a * mask * u_opacity;
-
   // Disabled too agressive AA-like blurring of edges,
   // see https://github.com/organicmaps/organicmaps/issues/6583.
   //float currentW = abs(v_halfLength.x);
   //float diff = v_halfLength.y - currentW;
   //color.a *= mix(0.3, 1.0, clamp(diff / aaPixelsCount, 0.0, 1.0));
-
   v_FragColor = color;
 }
diff --git a/libs/shaders/GL/dashed_line.vsh.glsl b/libs/shaders/GL/dashed_line.vsh.glsl
index d401e485d..355fa6e3c 100644
--- a/libs/shaders/GL/dashed_line.vsh.glsl
+++ b/libs/shaders/GL/dashed_line.vsh.glsl
@@ -1,15 +1,23 @@
-in vec3 a_position;
-in vec3 a_normal;
-in vec2 a_colorTexCoord;
-in vec4 a_maskTexCoord;
+layout (location = 0) in vec3 a_position;
+layout (location = 1) in vec3 a_normal;
+layout (location = 2) in vec2 a_colorTexCoord;
+layout (location = 3) in vec4 a_maskTexCoord;
 
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform mat4 u_pivotTransform;
+layout (location = 0) out vec2 v_colorTexCoord;
+layout (location = 1) out vec2 v_maskTexCoord;
+//layout (location = 2) out vec2 v_halfLength;
 
-out vec2 v_colorTexCoord;
-out vec2 v_maskTexCoord;
-//out vec2 v_halfLength;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec2 u_contrastGamma;
+  float u_opacity;
+  float u_zScale;
+  float u_interpolation;
+  float u_isOutlinePass;
+};
 
 void main()
 {
@@ -21,12 +29,10 @@ void main()
     transformedAxisPos = calcLineTransformedAxisPos(transformedAxisPos, a_position.xy + normal,
                                                     u_modelView, halfWidth);
   }
-
   float uOffset = min(length(vec4(kShapeCoordScalar, 0, 0, 0) * u_modelView) * a_maskTexCoord.x, 1.0);
   v_colorTexCoord = a_colorTexCoord;
   v_maskTexCoord = vec2(a_maskTexCoord.y + uOffset * a_maskTexCoord.z, a_maskTexCoord.w);
   //v_halfLength = vec2(sign(a_normal.z) * halfWidth, abs(a_normal.z));
   vec4 pos = vec4(transformedAxisPos, a_position.z, 1.0) * u_projection;
-
   gl_Position = applyPivotTransform(pos, u_pivotTransform, 0.0);
 }
diff --git a/libs/shaders/GL/debug_rect.fsh.glsl b/libs/shaders/GL/debug_rect.fsh.glsl
index 513a572b2..b8bf15354 100644
--- a/libs/shaders/GL/debug_rect.fsh.glsl
+++ b/libs/shaders/GL/debug_rect.fsh.glsl
@@ -1,6 +1,9 @@
-uniform vec4 u_color;
+layout (location = 0) out vec4 v_FragColor;
 
-out vec4 v_FragColor;
+layout (binding = 0) uniform UBO
+{
+  vec4 u_color;
+};
 
 void main()
 {
diff --git a/libs/shaders/GL/debug_rect.vsh.glsl b/libs/shaders/GL/debug_rect.vsh.glsl
index 7865de4e7..99070edf7 100644
--- a/libs/shaders/GL/debug_rect.vsh.glsl
+++ b/libs/shaders/GL/debug_rect.vsh.glsl
@@ -1,4 +1,4 @@
-in vec2 a_position;
+layout (location = 0) in vec2 a_position;
 
 void main()
 {
diff --git a/libs/shaders/GL/hatching_area.fsh.glsl b/libs/shaders/GL/hatching_area.fsh.glsl
index e3069aa64..aa47ac1c2 100644
--- a/libs/shaders/GL/hatching_area.fsh.glsl
+++ b/libs/shaders/GL/hatching_area.fsh.glsl
@@ -1,16 +1,26 @@
-uniform float u_opacity;
-
 #ifdef ENABLE_VTF
-in LOW_P vec4 v_color;
+layout (location = 0) in LOW_P vec4 v_color;
 #else
-uniform sampler2D u_colorTex;
-in vec2 v_colorTexCoords;
+layout (location = 1) in vec2 v_colorTexCoords;
+layout (binding = 1) uniform sampler2D u_colorTex;
 #endif
+layout (location = 2) in vec2 v_maskTexCoords;
 
-uniform sampler2D u_maskTex;
-in vec2 v_maskTexCoords;
+layout (location = 0) out vec4 v_FragColor;
 
-out vec4 v_FragColor;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec2 u_contrastGamma;
+  float u_opacity;
+  float u_zScale;
+  float u_interpolation;
+  float u_isOutlinePass;
+};
+
+layout (binding = 2) uniform sampler2D u_maskTex;
 
 void main()
 {
@@ -23,4 +33,3 @@ void main()
   color.a *= u_opacity;
   v_FragColor = color;
 }
-
diff --git a/libs/shaders/GL/hatching_area.vsh.glsl b/libs/shaders/GL/hatching_area.vsh.glsl
index b2ebad946..92565fec1 100644
--- a/libs/shaders/GL/hatching_area.vsh.glsl
+++ b/libs/shaders/GL/hatching_area.vsh.glsl
@@ -1,18 +1,29 @@
-in vec3 a_position;
-in vec2 a_colorTexCoords;
-in vec2 a_maskTexCoords;
-
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform mat4 u_pivotTransform;
+layout (location = 0) in vec3 a_position;
+layout (location = 1) in vec2 a_colorTexCoords;
+layout (location = 2) in vec2 a_maskTexCoords;
 
 #ifdef ENABLE_VTF
-uniform sampler2D u_colorTex;
-out LOW_P vec4 v_color;
+layout (location = 0) out LOW_P vec4 v_color;
 #else
-out vec2 v_colorTexCoords;
+layout (location = 1) out vec2 v_colorTexCoords;
+#endif
+layout (location = 2) out vec2 v_maskTexCoords;
+
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec2 u_contrastGamma;
+  float u_opacity;
+  float u_zScale;
+  float u_interpolation;
+  float u_isOutlinePass;
+};
+
+#ifdef ENABLE_VTF
+layout (binding = 1) uniform sampler2D u_colorTex;
 #endif
-out vec2 v_maskTexCoords;
 
 void main()
 {
diff --git a/libs/shaders/GL/imgui.fsh.glsl b/libs/shaders/GL/imgui.fsh.glsl
index 53d77f321..0114ac144 100644
--- a/libs/shaders/GL/imgui.fsh.glsl
+++ b/libs/shaders/GL/imgui.fsh.glsl
@@ -1,9 +1,9 @@
-in vec2 v_texCoords;
-in vec4 v_color;
+layout (location = 0) in vec2 v_texCoords;
+layout (location = 1) in vec4 v_color;
 
-uniform sampler2D u_colorTex;
+layout (location = 0) out vec4 v_FragColor;
 
-out vec4 v_FragColor;
+layout (binding = 1) uniform sampler2D u_colorTex;
 
 void main()
 {
diff --git a/libs/shaders/GL/imgui.vsh.glsl b/libs/shaders/GL/imgui.vsh.glsl
index ece5b5580..a83b78781 100644
--- a/libs/shaders/GL/imgui.vsh.glsl
+++ b/libs/shaders/GL/imgui.vsh.glsl
@@ -1,11 +1,14 @@
-in vec2 a_position;
-in vec2 a_texCoords;
-in vec4 a_color;
+layout (location = 0) in vec2 a_position;
+layout (location = 1) in vec2 a_texCoords;
+layout (location = 2) in vec4 a_color;
 
-out vec2 v_texCoords;
-out vec4 v_color;
+layout (location = 0) out vec2 v_texCoords;
+layout (location = 1) out vec4 v_color;
 
-uniform mat4 u_projection;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_projection;
+};
 
 void main()
 {
diff --git a/libs/shaders/GL/line.fsh.glsl b/libs/shaders/GL/line.fsh.glsl
index 1f30bda0b..3f640fc86 100644
--- a/libs/shaders/GL/line.fsh.glsl
+++ b/libs/shaders/GL/line.fsh.glsl
@@ -1,17 +1,27 @@
-uniform float u_opacity;
 #ifdef ENABLE_VTF
-in LOW_P vec4 v_color;
+layout (location = 0) in LOW_P vec4 v_color;
 #else
-uniform sampler2D u_colorTex;
-in vec2 v_colorTexCoord;
+layout (location = 1) in vec2 v_colorTexCoord;
+layout (binding = 1) uniform sampler2D u_colorTex;
 #endif
+//layout (location = 2) in vec2 v_halfLength;
 
-//in vec2 v_halfLength;
+layout (location = 0) out vec4 v_FragColor;
+
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec2 u_contrastGamma;
+  float u_opacity;
+  float u_zScale;
+  float u_interpolation;
+  float u_isOutlinePass;
+};
 
 //const float aaPixelsCount = 2.5;
 
-out vec4 v_FragColor;
-
 void main()
 {
 #ifdef ENABLE_VTF
@@ -20,12 +30,10 @@ void main()
   LOW_P vec4 color = texture(u_colorTex, v_colorTexCoord);
 #endif
   color.a *= u_opacity;
-
   // Disabled too agressive AA-like blurring of edges,
   // see https://github.com/organicmaps/organicmaps/issues/6583.
   //float currentW = abs(v_halfLength.x);
   //float diff = v_halfLength.y - currentW;
   //color.a *= mix(0.3, 1.0, clamp(diff / aaPixelsCount, 0.0, 1.0));
-
   v_FragColor = color;
 }
diff --git a/libs/shaders/GL/line.vsh.glsl b/libs/shaders/GL/line.vsh.glsl
index 75cd446cd..122e03dd2 100644
--- a/libs/shaders/GL/line.vsh.glsl
+++ b/libs/shaders/GL/line.vsh.glsl
@@ -1,19 +1,30 @@
-in vec3 a_position;
-in vec3 a_normal;
-in vec2 a_colorTexCoord;
-
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform mat4 u_pivotTransform;
+layout (location = 0) in vec3 a_position;
+layout (location = 1) in vec3 a_normal;
+layout (location = 2) in vec2 a_colorTexCoord;
 
 #ifdef ENABLE_VTF
-uniform sampler2D u_colorTex;
-out LOW_P vec4 v_color;
+layout (location = 0) out LOW_P vec4 v_color;
 #else
-out vec2 v_colorTexCoord;
+layout (location = 1) out vec2 v_colorTexCoord;
 #endif
 
-//out vec2 v_halfLength;
+//layout (location = 2) out vec2 v_halfLength;
+
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec2 u_contrastGamma;
+  float u_opacity;
+  float u_zScale;
+  float u_interpolation;
+  float u_isOutlinePass;
+};
+
+#ifdef ENABLE_VTF
+layout (binding = 1) uniform sampler2D u_colorTex;
+#endif
 
 void main()
 {
@@ -25,7 +36,6 @@ void main()
     transformedAxisPos = calcLineTransformedAxisPos(transformedAxisPos, a_position.xy + normal,
                                                     u_modelView, halfWidth);
   }
-
 #ifdef ENABLE_VTF
   v_color = texture(u_colorTex, a_colorTexCoord);
 #else
diff --git a/libs/shaders/GL/masked_texturing.fsh.glsl b/libs/shaders/GL/masked_texturing.fsh.glsl
index bae0daed7..24553f694 100644
--- a/libs/shaders/GL/masked_texturing.fsh.glsl
+++ b/libs/shaders/GL/masked_texturing.fsh.glsl
@@ -1,11 +1,22 @@
-uniform sampler2D u_colorTex;
-uniform sampler2D u_maskTex;
-uniform float u_opacity;
+layout (location = 0) in vec2 v_colorTexCoords;
+layout (location = 1) in vec2 v_maskTexCoords;
 
-in vec2 v_colorTexCoords;
-in vec2 v_maskTexCoords;
+layout (location = 0) out vec4 v_FragColor;
 
-out vec4 v_FragColor;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec2 u_contrastGamma;
+  float u_opacity;
+  float u_zScale;
+  float u_interpolation;
+  float u_isOutlinePass;
+};
+
+layout (binding = 1) uniform sampler2D u_colorTex;
+layout (binding = 2) uniform sampler2D u_maskTex;
 
 void main()
 {
diff --git a/libs/shaders/GL/masked_texturing.vsh.glsl b/libs/shaders/GL/masked_texturing.vsh.glsl
index 69864b283..1f6d9a1e5 100644
--- a/libs/shaders/GL/masked_texturing.vsh.glsl
+++ b/libs/shaders/GL/masked_texturing.vsh.glsl
@@ -1,14 +1,22 @@
-in vec4 a_position;
-in vec2 a_normal;
-in vec2 a_colorTexCoords;
-in vec2 a_maskTexCoords;
+layout (location = 0) in vec4 a_position;
+layout (location = 1) in vec2 a_normal;
+layout (location = 2) in vec2 a_colorTexCoords;
+layout (location = 3) in vec2 a_maskTexCoords;
 
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform mat4 u_pivotTransform;
+layout (location = 0) out vec2 v_colorTexCoords;
+layout (location = 1) out vec2 v_maskTexCoords;
 
-out vec2 v_colorTexCoords;
-out vec2 v_maskTexCoords;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec2 u_contrastGamma;
+  float u_opacity;
+  float u_zScale;
+  float u_interpolation;
+  float u_isOutlinePass;
+};
 
 void main()
 {
diff --git a/libs/shaders/GL/masked_texturing_billboard.vsh.glsl b/libs/shaders/GL/masked_texturing_billboard.vsh.glsl
index 5c7928755..0caccd80e 100644
--- a/libs/shaders/GL/masked_texturing_billboard.vsh.glsl
+++ b/libs/shaders/GL/masked_texturing_billboard.vsh.glsl
@@ -1,15 +1,22 @@
-in vec4 a_position;
-in vec2 a_normal;
-in vec2 a_colorTexCoords;
-in vec2 a_maskTexCoords;
+layout (location = 0) in vec4 a_position;
+layout (location = 1) in vec2 a_normal;
+layout (location = 2) in vec2 a_colorTexCoords;
+layout (location = 3) in vec2 a_maskTexCoords;
 
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform mat4 u_pivotTransform;
-uniform float u_zScale;
+layout (location = 0) out vec2 v_colorTexCoords;
+layout (location = 1) out vec2 v_maskTexCoords;
 
-out vec2 v_colorTexCoords;
-out vec2 v_maskTexCoords;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec2 u_contrastGamma;
+  float u_opacity;
+  float u_zScale;
+  float u_interpolation;
+  float u_isOutlinePass;
+};
 
 void main()
 {
diff --git a/libs/shaders/GL/my_position.vsh.glsl b/libs/shaders/GL/my_position.vsh.glsl
index 21575b727..8489cc6ad 100644
--- a/libs/shaders/GL/my_position.vsh.glsl
+++ b/libs/shaders/GL/my_position.vsh.glsl
@@ -1,30 +1,33 @@
-in vec2 a_normal;
-in vec2 a_colorTexCoords;
+layout (location = 0) in vec2 a_normal;
+layout (location = 1) in vec2 a_colorTexCoords;
 
-uniform vec3 u_position;
-uniform float u_azimut;
+layout (location = 0) out vec2 v_colorTexCoords;
 
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform mat4 u_pivotTransform;
-
-out vec2 v_colorTexCoords;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec4 u_position;
+  vec2 u_lineParams;
+  float u_accuracy;
+  float u_zScale;
+  float u_opacity;
+  float u_azimut;
+};
 
 void main()
 {
   float sinV = sin(u_azimut);
   float cosV = cos(u_azimut);
-
   mat4 rotation;
   rotation[0] = vec4(cosV, sinV, 0.0, 0.0);
   rotation[1] = vec4(-sinV, cosV, 0.0, 0.0);
   rotation[2] = vec4(0.0, 0.0, 1.0, 0.0);
   rotation[3] = vec4(0.0, 0.0, 0.0, 1.0);
-
-  vec4 pos = vec4(u_position, 1.0) * u_modelView;
+  vec4 pos = vec4(u_position.xyz, 1.0) * u_modelView;
   vec4 normal = vec4(a_normal, 0, 0);
   vec4 shiftedPos = normal * rotation + pos;
-
   gl_Position = applyPivotTransform(shiftedPos * u_projection, u_pivotTransform, 0.0);
   v_colorTexCoords = a_colorTexCoords;
 }
diff --git a/libs/shaders/GL/path_symbol.vsh.glsl b/libs/shaders/GL/path_symbol.vsh.glsl
index abfd416ca..72d81d96b 100644
--- a/libs/shaders/GL/path_symbol.vsh.glsl
+++ b/libs/shaders/GL/path_symbol.vsh.glsl
@@ -1,23 +1,29 @@
-in vec4 a_position;
-in vec2 a_normal;
-in vec2 a_colorTexCoords;
+layout (location = 0) in vec4 a_position;
+layout (location = 1) in vec2 a_normal;
+layout (location = 2) in vec2 a_colorTexCoords;
 
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform mat4 u_pivotTransform;
+layout (location = 0) out vec2 v_colorTexCoords;
 
-out vec2 v_colorTexCoords;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec2 u_contrastGamma;
+  float u_opacity;
+  float u_zScale;
+  float u_interpolation;
+  float u_isOutlinePass;
+};
 
 void main()
 {
   vec4 pos = vec4(a_position.xyz, 1) * u_modelView;
-
   float normalLen = length(a_normal);
   vec4 n = vec4(a_position.xy + a_normal * kShapeCoordScalar, 0.0, 0.0) * u_modelView;
   vec4 norm = vec4(0.0, 0.0, 0.0, 0.0);
   if (dot(n, n) != 0.0)
     norm = normalize(n) * normalLen;
-
   vec4 shiftedPos = norm + pos;
   gl_Position = applyPivotTransform(shiftedPos * u_projection, u_pivotTransform, 0.0);
   v_colorTexCoords = a_colorTexCoords;
diff --git a/libs/shaders/GL/position_accuracy3d.vsh.glsl b/libs/shaders/GL/position_accuracy3d.vsh.glsl
index 5a0f815d4..196c6d736 100644
--- a/libs/shaders/GL/position_accuracy3d.vsh.glsl
+++ b/libs/shaders/GL/position_accuracy3d.vsh.glsl
@@ -1,15 +1,20 @@
-in vec2 a_normal;
-in vec2 a_colorTexCoords;
+layout (location = 0) in vec2 a_normal;
+layout (location = 1) in vec2 a_colorTexCoords;
 
-uniform vec3 u_position;
-uniform float u_accuracy;
+layout (location = 0) out vec2 v_colorTexCoords;
 
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform mat4 u_pivotTransform;
-uniform float u_zScale;
-
-out vec2 v_colorTexCoords;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec4 u_position;
+  vec2 u_lineParams;
+  float u_accuracy;
+  float u_zScale;
+  float u_opacity;
+  float u_azimut;
+};
 
 void main()
 {
@@ -17,6 +22,5 @@ void main()
   vec4 normal = vec4(a_normal * u_accuracy, 0.0, 0.0);
   position = (position + normal) * u_projection;
   gl_Position = applyPivotTransform(position, u_pivotTransform, u_position.z * u_zScale);
-
   v_colorTexCoords = a_colorTexCoords;
 }
diff --git a/libs/shaders/GL/route.fsh.glsl b/libs/shaders/GL/route.fsh.glsl
index bc7d28acc..fab19eedc 100644
--- a/libs/shaders/GL/route.fsh.glsl
+++ b/libs/shaders/GL/route.fsh.glsl
@@ -1,38 +1,43 @@
 // Warning! Beware to use this shader. "discard" command may significally reduce performance.
-// Unfortunately some CG algorithms cannot be implemented on OpenGL ES 2.0 without discarding
-// fragments from depth buffer.
+// Unfortunately some CG algorithms cannot be implemented without discarding fragments from depth buffer.
 
-in vec3 v_length;
-in vec4 v_color;
+layout (location = 0) in vec3 v_length;
+layout (location = 1) in vec4 v_color;
 
-uniform vec4 u_color;
-uniform vec4 u_outlineColor;
-uniform vec4 u_routeParams;
-uniform vec4 u_maskColor;
+layout (location = 0) out vec4 v_FragColor;
 
-uniform vec2 u_fakeBorders;
-uniform vec4 u_fakeColor;
-uniform vec4 u_fakeOutlineColor;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec4 u_routeParams;
+  vec4 u_color;
+  vec4 u_maskColor;
+  vec4 u_outlineColor;
+  vec4 u_fakeColor;
+  vec4 u_fakeOutlineColor;
+  vec2 u_fakeBorders;
+  vec2 u_pattern;
+  vec2 u_angleCosSin;
+  float u_arrowHalfWidth;
+  float u_opacity;
+};
 
 const float kAntialiasingThreshold = 0.92;
-
 const float kOutlineThreshold1 = 0.81;
 const float kOutlineThreshold2 = 0.71;
 
-out vec4 v_FragColor;
-
 void main()
 {
   if (v_length.x < v_length.z)
     discard;
-
   vec2 coefs = step(v_length.xx, u_fakeBorders);
   coefs.y = 1.0 - coefs.y;
   vec4 mainColor = mix(u_color, u_fakeColor, coefs.x);
   mainColor = mix(mainColor, u_fakeColor, coefs.y);
   vec4 mainOutlineColor = mix(u_outlineColor, u_fakeOutlineColor, coefs.x);
   mainOutlineColor = mix(mainOutlineColor, u_fakeOutlineColor, coefs.y);
-
   vec4 color = mix(mix(mainColor, vec4(v_color.rgb, 1.0), v_color.a), mainColor, step(u_routeParams.w, 0.0));
   color = mix(color, mainOutlineColor, step(kOutlineThreshold1, abs(v_length.y)));
   color = mix(color, mainOutlineColor, smoothstep(kOutlineThreshold2, kOutlineThreshold1, abs(v_length.y)));
diff --git a/libs/shaders/GL/route.vsh.glsl b/libs/shaders/GL/route.vsh.glsl
index 9fe52f316..5915b92af 100644
--- a/libs/shaders/GL/route.vsh.glsl
+++ b/libs/shaders/GL/route.vsh.glsl
@@ -1,16 +1,28 @@
-in vec3 a_position;
-in vec2 a_normal;
-in vec3 a_length;
-in vec4 a_color;
+layout (location = 0) in vec3 a_position;
+layout (location = 1) in vec2 a_normal;
+layout (location = 2) in vec3 a_length;
+layout (location = 3) in vec4 a_color;
 
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform mat4 u_pivotTransform;
+layout (location = 0) out vec3 v_length;
+layout (location = 1) out vec4 v_color;
 
-uniform vec4 u_routeParams;
-
-out vec3 v_length;
-out vec4 v_color;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec4 u_routeParams;
+  vec4 u_color;
+  vec4 u_maskColor;
+  vec4 u_outlineColor;
+  vec4 u_fakeColor;
+  vec4 u_fakeOutlineColor;
+  vec2 u_fakeBorders;
+  vec2 u_pattern;
+  vec2 u_angleCosSin;
+  float u_arrowHalfWidth;
+  float u_opacity;
+};
 
 void main()
 {
@@ -24,7 +36,6 @@ void main()
     if (u_routeParams.y != 0.0)
       len = vec2(a_length.x + a_length.y * u_routeParams.y, a_length.z);
   }
-
   v_length = vec3(len, u_routeParams.z);
   v_color = a_color;
   vec4 pos = vec4(transformedAxisPos, a_position.z, 1.0) * u_projection;
diff --git a/libs/shaders/GL/route_arrow.fsh.glsl b/libs/shaders/GL/route_arrow.fsh.glsl
index 5b5bad2c0..c926c7f50 100644
--- a/libs/shaders/GL/route_arrow.fsh.glsl
+++ b/libs/shaders/GL/route_arrow.fsh.glsl
@@ -1,14 +1,29 @@
 // Warning! Beware to use this shader. "discard" command may significally reduce performance.
-// Unfortunately some CG algorithms cannot be implemented on OpenGL ES 2.0 without discarding
-// fragments from depth buffer.
+// Unfortunately some CG algorithms cannot be implemented without discarding fragments from depth buffer.
 
-uniform sampler2D u_colorTex;
-uniform float u_opacity;
-uniform vec4 u_maskColor;
+layout (location = 0) in vec2 v_colorTexCoords;
 
-in vec2 v_colorTexCoords;
+layout (location = 0) out vec4 v_FragColor;
 
-out vec4 v_FragColor;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec4 u_routeParams;
+  vec4 u_color;
+  vec4 u_maskColor;
+  vec4 u_outlineColor;
+  vec4 u_fakeColor;
+  vec4 u_fakeOutlineColor;
+  vec2 u_fakeBorders;
+  vec2 u_pattern;
+  vec2 u_angleCosSin;
+  float u_arrowHalfWidth;
+  float u_opacity;
+};
+
+layout (binding = 1) uniform sampler2D u_colorTex;
 
 void main()
 {
diff --git a/libs/shaders/GL/route_arrow.vsh.glsl b/libs/shaders/GL/route_arrow.vsh.glsl
index 764dba5e4..93a742dab 100644
--- a/libs/shaders/GL/route_arrow.vsh.glsl
+++ b/libs/shaders/GL/route_arrow.vsh.glsl
@@ -1,14 +1,26 @@
-in vec4 a_position;
-in vec2 a_normal;
-in vec2 a_colorTexCoords;
+layout (location = 0) in vec4 a_position;
+layout (location = 1) in vec2 a_normal;
+layout (location = 2) in vec2 a_colorTexCoords;
 
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform mat4 u_pivotTransform;
+layout (location = 0) out vec2 v_colorTexCoords;
 
-uniform float u_arrowHalfWidth;
-
-out vec2 v_colorTexCoords;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec4 u_routeParams;
+  vec4 u_color;
+  vec4 u_maskColor;
+  vec4 u_outlineColor;
+  vec4 u_fakeColor;
+  vec4 u_fakeOutlineColor;
+  vec2 u_fakeBorders;
+  vec2 u_pattern;
+  vec2 u_angleCosSin;
+  float u_arrowHalfWidth;
+  float u_opacity;
+};
 
 void main()
 {
@@ -19,9 +31,7 @@ void main()
     transformedAxisPos = calcLineTransformedAxisPos(transformedAxisPos, a_position.xy + norm,
                                                     u_modelView, length(norm));
   }
-
   v_colorTexCoords = a_colorTexCoords;
-
   vec4 pos = vec4(transformedAxisPos, a_position.z, 1.0) * u_projection;
   gl_Position = applyPivotTransform(pos, u_pivotTransform, 0.0);
 }
diff --git a/libs/shaders/GL/route_dash.fsh.glsl b/libs/shaders/GL/route_dash.fsh.glsl
index 3f9556339..1f928e041 100644
--- a/libs/shaders/GL/route_dash.fsh.glsl
+++ b/libs/shaders/GL/route_dash.fsh.glsl
@@ -1,16 +1,28 @@
 // Warning! Beware to use this shader. "discard" command may significally reduce performance.
-// Unfortunately some CG algorithms cannot be implemented on OpenGL ES 2.0 without discarding
-// fragments from depth buffer.
+// Unfortunately some CG algorithms cannot be implemented without discarding fragments from depth buffer.
 
-in vec3 v_length;
-in vec4 v_color;
+layout (location = 0) in vec3 v_length;
+layout (location = 1) in vec4 v_color;
 
-uniform vec4 u_color;
-uniform vec2 u_pattern;
-uniform vec4 u_maskColor;
+layout (location = 0) out vec4 v_FragColor;
 
-uniform vec2 u_fakeBorders;
-uniform vec4 u_fakeColor;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec4 u_routeParams;
+  vec4 u_color;
+  vec4 u_maskColor;
+  vec4 u_outlineColor;
+  vec4 u_fakeColor;
+  vec4 u_fakeOutlineColor;
+  vec2 u_fakeBorders;
+  vec2 u_pattern;
+  vec2 u_angleCosSin;
+  float u_arrowHalfWidth;
+  float u_opacity;
+};
 
 const float kAntialiasingThreshold = 0.92;
 
@@ -21,18 +33,14 @@ float alphaFromPattern(float curLen, float dashLen, float gapLen)
   return step(offset, dashLen);
 }
 
-out vec4 v_FragColor;
-
 void main()
 {
   if (v_length.x < v_length.z)
     discard;
-
   vec2 coefs = step(v_length.xx, u_fakeBorders);
   coefs.y = 1.0 - coefs.y;
   vec4 mainColor = mix(u_color, u_fakeColor, coefs.x);
   mainColor = mix(mainColor, u_fakeColor, coefs.y);
-
   vec4 color = mainColor + v_color;
   color.a *= (1.0 - smoothstep(kAntialiasingThreshold, 1.0, abs(v_length.y))) *
               alphaFromPattern(v_length.x, u_pattern.x, u_pattern.y);
diff --git a/libs/shaders/GL/route_marker.fsh.glsl b/libs/shaders/GL/route_marker.fsh.glsl
index fee0c9efc..95bca7fdb 100644
--- a/libs/shaders/GL/route_marker.fsh.glsl
+++ b/libs/shaders/GL/route_marker.fsh.glsl
@@ -1,29 +1,40 @@
 // Warning! Beware to use this shader. "discard" command may significally reduce performance.
-// Unfortunately some CG algorithms cannot be implemented on OpenGL ES 2.0 without discarding
-// fragments from depth buffer.
+// Unfortunately some CG algorithms cannot be implemented without discarding fragments from depth buffer.
 
-uniform vec4 u_routeParams;
-uniform vec4 u_maskColor;
-uniform float u_opacity;
+layout (location = 0) in vec4 v_radius;
+layout (location = 1) in vec4 v_color;
 
-in vec4 v_radius;
-in vec4 v_color;
+layout (location = 0) out vec4 v_FragColor;
+
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec4 u_routeParams;
+  vec4 u_color;
+  vec4 u_maskColor;
+  vec4 u_outlineColor;
+  vec4 u_fakeColor;
+  vec4 u_fakeOutlineColor;
+  vec2 u_fakeBorders;
+  vec2 u_pattern;
+  vec2 u_angleCosSin;
+  float u_arrowHalfWidth;
+  float u_opacity;
+};
 
 const float kAntialiasingPixelsCount = 2.5;
 
-out vec4 v_FragColor;
-
 void main()
 {
   vec4 finalColor = v_color;
-
   float aaRadius = max(v_radius.z - kAntialiasingPixelsCount, 0.0);
   float stepValue = smoothstep(aaRadius * aaRadius, v_radius.z * v_radius.z,
                                dot(v_radius.xy, v_radius.xy));
   finalColor.a = finalColor.a * u_opacity * (1.0 - stepValue);
   if (finalColor.a < 0.01 || u_routeParams.y > v_radius.w)
     discard;
-
   finalColor = vec4(mix(finalColor.rgb, u_maskColor.rgb, u_maskColor.a), finalColor.a);
   v_FragColor = finalColor;
 }
diff --git a/libs/shaders/GL/route_marker.vsh.glsl b/libs/shaders/GL/route_marker.vsh.glsl
index 7ca104e1b..7bee7f473 100644
--- a/libs/shaders/GL/route_marker.vsh.glsl
+++ b/libs/shaders/GL/route_marker.vsh.glsl
@@ -1,16 +1,27 @@
-in vec4 a_position;
-in vec3 a_normal;
-in vec4 a_color;
+layout (location = 0) in vec4 a_position;
+layout (location = 1) in vec3 a_normal;
+layout (location = 2) in vec4 a_color;
 
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform mat4 u_pivotTransform;
+layout (location = 0) out vec4 v_radius;
+layout (location = 1) out vec4 v_color;
 
-uniform vec2 u_angleCosSin;
-uniform vec4 u_routeParams;
-
-out vec4 v_radius;
-out vec4 v_color;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec4 u_routeParams;
+  vec4 u_color;
+  vec4 u_maskColor;
+  vec4 u_outlineColor;
+  vec4 u_fakeColor;
+  vec4 u_fakeOutlineColor;
+  vec2 u_fakeBorders;
+  vec2 u_pattern;
+  vec2 u_angleCosSin;
+  float u_arrowHalfWidth;
+  float u_opacity;
+};
 
 void main()
 {
diff --git a/libs/shaders/GL/ruler.fsh.glsl b/libs/shaders/GL/ruler.fsh.glsl
new file mode 100644
index 000000000..667d16c4f
--- /dev/null
+++ b/libs/shaders/GL/ruler.fsh.glsl
@@ -0,0 +1,23 @@
+layout (location = 0) in vec2 v_colorTexCoords;
+
+layout (location = 0) out vec4 v_FragColor;
+
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  vec2 u_contrastGamma;
+  vec2 u_position;
+  float u_isOutlinePass;
+  float u_opacity;
+  float u_length;
+};
+
+layout (binding = 1) uniform sampler2D u_colorTex;
+
+void main()
+{
+  vec4 finalColor = texture(u_colorTex, v_colorTexCoords);
+  finalColor.a *= u_opacity;
+  v_FragColor = finalColor;
+}
diff --git a/libs/shaders/GL/ruler.vsh.glsl b/libs/shaders/GL/ruler.vsh.glsl
index 27c670853..434df4c5f 100644
--- a/libs/shaders/GL/ruler.vsh.glsl
+++ b/libs/shaders/GL/ruler.vsh.glsl
@@ -1,12 +1,19 @@
-in vec2 a_position;
-in vec2 a_normal;
-in vec2 a_colorTexCoords;
+layout (location = 0) in vec2 a_position;
+layout (location = 1) in vec2 a_normal;
+layout (location = 2) in vec2 a_colorTexCoords;
 
-uniform vec2 u_position;
-uniform float u_length;
-uniform mat4 u_projection;
+layout (location = 0) out vec2 v_colorTexCoords;
 
-out vec2 v_colorTexCoords;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  vec2 u_contrastGamma;
+  vec2 u_position;
+  float u_isOutlinePass;
+  float u_opacity;
+  float u_length;
+};
 
 void main()
 {
diff --git a/libs/shaders/GL/screen_quad.fsh.glsl b/libs/shaders/GL/screen_quad.fsh.glsl
new file mode 100644
index 000000000..d30f79552
--- /dev/null
+++ b/libs/shaders/GL/screen_quad.fsh.glsl
@@ -0,0 +1,17 @@
+layout (location = 0) in vec2 v_colorTexCoords;
+
+layout (location = 0) out vec4 v_FragColor;
+
+layout (binding = 0) uniform UBO
+{
+  float u_opacity;
+};
+
+layout (binding = 1) uniform sampler2D u_colorTex;
+
+void main()
+{
+  vec4 finalColor = texture(u_colorTex, v_colorTexCoords);
+  finalColor.a *= u_opacity;
+  v_FragColor = finalColor;
+}
diff --git a/libs/shaders/GL/screen_quad.vsh.glsl b/libs/shaders/GL/screen_quad.vsh.glsl
index 78b4b5f8a..11485fc5a 100644
--- a/libs/shaders/GL/screen_quad.vsh.glsl
+++ b/libs/shaders/GL/screen_quad.vsh.glsl
@@ -1,11 +1,10 @@
-in vec2 a_pos;
-in vec2 a_tcoord;
+layout (location = 0) in vec2 a_pos;
+layout (location = 1) in vec2 a_tcoord;
 
-out vec2 v_colorTexCoords;
+layout (location = 0) out vec2 v_colorTexCoords;
 
 void main()
 {
   v_colorTexCoords = a_tcoord;
   gl_Position = vec4(a_pos, 0.0, 1.0);
 }
-
diff --git a/libs/shaders/GL/selection_line.fsh.glsl b/libs/shaders/GL/selection_line.fsh.glsl
index c9749c9a2..55a832c62 100644
--- a/libs/shaders/GL/selection_line.fsh.glsl
+++ b/libs/shaders/GL/selection_line.fsh.glsl
@@ -1,17 +1,28 @@
 #ifdef ENABLE_VTF
-in LOW_P vec4 v_color;
+layout (location = 0) in LOW_P vec4 v_color;
 #else
-uniform sampler2D u_colorTex;
-in vec2 v_colorTexCoord;
+layout (location = 1) in vec2 v_colorTexCoord;
+layout (binding = 1) uniform sampler2D u_colorTex;
 #endif
-uniform float u_opacity;
+layout (location = 2) in float v_lengthY;
 
-in float v_lengthY;
+layout (location = 0) out vec4 v_FragColor;
+
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec4 u_position;
+  vec2 u_lineParams;
+  float u_accuracy;
+  float u_zScale;
+  float u_opacity;
+  float u_azimut;
+};
 
 const float kAntialiasingThreshold = 0.92;
 
-out vec4 v_FragColor;
-
 void main()
 {
 #ifdef ENABLE_VTF
@@ -21,6 +32,5 @@ void main()
 #endif
   color.a *= u_opacity;
   color.a *= (1.0 - smoothstep(kAntialiasingThreshold, 1.0, abs(v_lengthY)));
-
   v_FragColor = color;
 }
diff --git a/libs/shaders/GL/selection_line.vsh.glsl b/libs/shaders/GL/selection_line.vsh.glsl
index b9d9e693f..4c262ff69 100644
--- a/libs/shaders/GL/selection_line.vsh.glsl
+++ b/libs/shaders/GL/selection_line.vsh.glsl
@@ -1,22 +1,33 @@
-in vec3 a_position;
-in vec2 a_normal;
-in vec2 a_colorTexCoords;
-in vec3 a_length;
-
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform mat4 u_pivotTransform;
-
-uniform vec2 u_lineParams;
+layout (location = 0) in vec3 a_position;
+layout (location = 1) in vec2 a_normal;
+layout (location = 2) in vec2 a_colorTexCoords;
+layout (location = 3) in vec3 a_length;
 
 #ifdef ENABLE_VTF
-uniform sampler2D u_colorTex;
-out LOW_P vec4 v_color;
+layout (location = 0) out LOW_P vec4 v_color;
 #else
-out vec2 v_colorTexCoord;
+layout (location = 1) out vec2 v_colorTexCoord;
+#endif
+layout (location = 2) out float v_lengthY;
+
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec4 u_position;
+  vec2 u_lineParams;
+  float u_accuracy;
+  float u_zScale;
+  float u_opacity;
+  float u_azimut;
+};
+
+#ifdef ENABLE_VTF
+layout (binding = 1) uniform sampler2D u_colorTex;
 #endif
 
-out float v_lengthY;
+const float kAntialiasingThreshold = 0.92;
 
 void main()
 {
@@ -30,7 +41,6 @@ void main()
     if (u_lineParams.y != 0.0)
       len = vec2(a_length.x + a_length.y * u_lineParams.y, a_length.z);
   }
-
 #ifdef ENABLE_VTF
   v_color = texture(u_colorTex, a_colorTexCoords);
 #else
diff --git a/libs/shaders/GL/shader_index.txt b/libs/shaders/GL/shader_index.txt
index 9decc5950..c7271a255 100644
--- a/libs/shaders/GL/shader_index.txt
+++ b/libs/shaders/GL/shader_index.txt
@@ -5,8 +5,8 @@ Bookmark user_mark.vsh.glsl user_mark.fsh.glsl
 BookmarkAnim user_mark.vsh.glsl user_mark.fsh.glsl
 TextOutlined text_outlined.vsh.glsl text.fsh.glsl
 Text text.vsh.glsl text.fsh.glsl
-TextStaticOutlinedGui text_outlined_gui.vsh.glsl text.fsh.glsl
-TextOutlinedGui text_outlined_gui.vsh.glsl text.fsh.glsl
+TextStaticOutlinedGui text_outlined_gui.vsh.glsl text_outlined_gui.fsh.glsl
+TextOutlinedGui text_outlined_gui.vsh.glsl text_outlined_gui.fsh.glsl
 Area area.vsh.glsl solid_color.fsh.glsl
 AreaOutline area.vsh.glsl solid_color.fsh.glsl
 Area3d area3d.vsh.glsl texturing3d.fsh.glsl
@@ -18,10 +18,10 @@ PathSymbol path_symbol.vsh.glsl texturing.fsh.glsl
 TransparentArea area.vsh.glsl solid_color.fsh.glsl
 CapJoin circle.vsh.glsl circle.fsh.glsl
 HatchingArea hatching_area.vsh.glsl hatching_area.fsh.glsl
-TexturingGui texturing_gui.vsh.glsl texturing.fsh.glsl
-Ruler ruler.vsh.glsl texturing.fsh.glsl
-Accuracy position_accuracy3d.vsh.glsl texturing.fsh.glsl
-MyPosition my_position.vsh.glsl texturing.fsh.glsl
+TexturingGui texturing_gui.vsh.glsl texturing_gui.fsh.glsl
+Ruler ruler.vsh.glsl ruler.fsh.glsl
+Accuracy position_accuracy3d.vsh.glsl texturing_position.fsh.glsl
+MyPosition my_position.vsh.glsl texturing_position.fsh.glsl
 SelectionLine selection_line.vsh.glsl selection_line.fsh.glsl
 Transit transit.vsh.glsl transit.fsh.glsl
 TransitMarker transit_marker.vsh.glsl transit_marker.fsh.glsl
@@ -33,7 +33,7 @@ CirclePoint circle_point.vsh.glsl circle_point.fsh.glsl
 BookmarkAboveText user_mark.vsh.glsl user_mark.fsh.glsl
 BookmarkAnimAboveText user_mark.vsh.glsl user_mark.fsh.glsl
 DebugRect debug_rect.vsh.glsl debug_rect.fsh.glsl
-ScreenQuad screen_quad.vsh.glsl texturing.fsh.glsl
+ScreenQuad screen_quad.vsh.glsl screen_quad.fsh.glsl
 Arrow3d arrow3d.vsh.glsl arrow3d.fsh.glsl
 Arrow3dTextured arrow3d_textured.vsh.glsl arrow3d_textured.fsh.glsl
 Arrow3dShadow arrow3d_shadow.vsh.glsl arrow3d_shadow.fsh.glsl
diff --git a/libs/shaders/GL/smaa_blending_weight.fsh.glsl b/libs/shaders/GL/smaa_blending_weight.fsh.glsl
index c34e27f8d..15aec1ce8 100644
--- a/libs/shaders/GL/smaa_blending_weight.fsh.glsl
+++ b/libs/shaders/GL/smaa_blending_weight.fsh.glsl
@@ -1,21 +1,24 @@
 // Implementation of Subpixel Morphological Antialiasing (SMAA) is based on https://github.com/iryoku/smaa
+layout (location = 0) in vec4 v_coords;
+layout (location = 1) in vec4 v_offset0;
+layout (location = 2) in vec4 v_offset1;
+layout (location = 3) in vec4 v_offset2;
 
-uniform sampler2D u_colorTex;
-uniform sampler2D u_smaaArea;
-uniform sampler2D u_smaaSearch;
+layout (location = 0) out vec4 v_FragColor;
 
-uniform vec4 u_framebufferMetrics;
+layout (binding = 0) uniform UBO
+{
+  vec4 u_framebufferMetrics;
+};
 
-in vec4 v_coords;
-in vec4 v_offset0;
-in vec4 v_offset1;
-in vec4 v_offset2;
+layout (binding = 1) uniform sampler2D u_colorTex;
+layout (binding = 2) uniform sampler2D u_smaaArea;
+layout (binding = 3) uniform sampler2D u_smaaSearch;
 
 #define SMAA_SEARCHTEX_SIZE vec2(66.0, 33.0)
 #define SMAA_SEARCHTEX_PACKED_SIZE vec2(64.0, 16.0)
 #define SMAA_AREATEX_MAX_DISTANCE 16.0
 #define SMAA_AREATEX_PIXEL_SIZE (vec2(1.0 / 256.0, 1.0 / 1024.0))
-
 #define SMAALoopBegin(condition) while (condition) {
 #define SMAALoopEnd }
 #define SMAASampleLevelZero(tex, coord) textureLod(tex, coord, 0.0)
@@ -32,16 +35,13 @@ float SMAASearchLength(vec2 e, float offset)
   // of the space horizontally.
   vec2 scale = SMAA_SEARCHTEX_SIZE * vec2(0.5, -1.0);
   vec2 bias = SMAA_SEARCHTEX_SIZE * vec2(offset, 1.0);
-
   // Scale and bias to access texel centers.
   scale += vec2(-1.0,  1.0);
   bias += vec2( 0.5, -0.5);
-
   // Convert from pixel coordinates to texcoords.
   // (We use SMAA_SEARCHTEX_PACKED_SIZE because the texture is cropped).
   scale *= 1.0 / SMAA_SEARCHTEX_PACKED_SIZE;
   bias *= 1.0 / SMAA_SEARCHTEX_PACKED_SIZE;
-
   // Lookup the search texture.
   return SMAASampleLevelZero(u_smaaSearch, scale * e + bias).r;
 }
@@ -101,79 +101,60 @@ vec2 SMAAArea(vec2 dist, float e1, float e2)
   return SMAASampleLevelZero(u_smaaArea, texcoord).rg;
 }
 
-out vec4 v_FragColor;
-
 void main()
 {
   vec4 weights = vec4(0.0, 0.0, 0.0, 0.0);
   vec2 e = texture(u_colorTex, v_coords.xy).rg;
-
   if (e.g > 0.0) // Edge at north
   {
     vec2 d;
-
     // Find the distance to the left.
     vec3 coords;
     coords.x = SMAASearchXLeft(v_offset0.xy, v_offset2.x);
     coords.y = v_offset1.y;
     d.x = coords.x;
-
     // Now fetch the left crossing edges, two at a time using bilinear
     // filtering. Sampling at -0.25 enables to discern what value each edge has.
     float e1 = SMAASampleLevelZero(u_colorTex, coords.xy).r;
-
     // Find the distance to the right.
     coords.z = SMAASearchXRight(v_offset0.zw, v_offset2.y);
     d.y = coords.z;
-
     // We want the distances to be in pixel units (doing this here allow to
     // better interleave arithmetic and memory accesses).
     vec2 zz = u_framebufferMetrics.zz;
     d = abs(SMAARound(zz * d - v_coords.zz));
-
     // SMAAArea below needs a sqrt, as the areas texture is compressed
     // quadratically.
     vec2 sqrt_d = sqrt(d);
-
     // Fetch the right crossing edges.
     float e2 = SMAASampleLevelZeroOffset(u_colorTex, coords.zy, SMAAOffset(1, 0)).r;
-
     // Here we know how this pattern looks like, now it is time for getting
     // the actual area.
     weights.rg = SMAAArea(sqrt_d, e1, e2);
   }
-
   if (e.r > 0.0) // Edge at west
   {
     vec2 d;
-
     // Find the distance to the top.
     vec3 coords;
     coords.y = SMAASearchYUp(v_offset1.xy, v_offset2.z);
     coords.x = v_offset0.x;
     d.x = coords.y;
-
     // Fetch the top crossing edges.
     float e1 = SMAASampleLevelZero(u_colorTex, coords.xy).g;
-
     // Find the distance to the bottom.
     coords.z = SMAASearchYDown(v_offset1.zw, v_offset2.w);
     d.y = coords.z;
-
     // We want the distances to be in pixel units.
     vec2 ww = u_framebufferMetrics.ww;
     d = abs(SMAARound(ww * d - v_coords.ww));
-
     // SMAAArea below needs a sqrt, as the areas texture is compressed
     // quadratically.
     vec2 sqrt_d = sqrt(d);
-
     // Fetch the bottom crossing edges.
     float e2 = SMAASampleLevelZeroOffset(u_colorTex, coords.xz, SMAAOffset(0, 1)).g;
-
     // Get the area for this direction.
     weights.ba = SMAAArea(sqrt_d, e1, e2);
   }
-
   v_FragColor = weights;
 }
diff --git a/libs/shaders/GL/smaa_blending_weight.vsh.glsl b/libs/shaders/GL/smaa_blending_weight.vsh.glsl
index afccac122..56444480c 100644
--- a/libs/shaders/GL/smaa_blending_weight.vsh.glsl
+++ b/libs/shaders/GL/smaa_blending_weight.vsh.glsl
@@ -1,14 +1,16 @@
 // Implementation of Subpixel Morphological Antialiasing (SMAA) is based on https://github.com/iryoku/smaa
+layout (location = 0) in vec2 a_pos;
+layout (location = 1) in vec2 a_tcoord;
 
-in vec2 a_pos;
-in vec2 a_tcoord;
+layout (location = 0) out vec4 v_coords;
+layout (location = 1) out vec4 v_offset0;
+layout (location = 2) out vec4 v_offset1;
+layout (location = 3) out vec4 v_offset2;
 
-uniform vec4 u_framebufferMetrics;
-
-out vec4 v_coords;
-out vec4 v_offset0;
-out vec4 v_offset1;
-out vec4 v_offset2;
+layout (binding = 0) uniform UBO
+{
+  vec4 u_framebufferMetrics;
+};
 
 // SMAA_MAX_SEARCH_STEPS specifies the maximum steps performed in the
 // horizontal/vertical pattern searches, at each side of the pixel.
diff --git a/libs/shaders/GL/smaa_edges.fsh.glsl b/libs/shaders/GL/smaa_edges.fsh.glsl
index 6fcf641e6..a9efdf7d6 100644
--- a/libs/shaders/GL/smaa_edges.fsh.glsl
+++ b/libs/shaders/GL/smaa_edges.fsh.glsl
@@ -1,11 +1,12 @@
 // Implementation of Subpixel Morphological Antialiasing (SMAA) is based on https://github.com/iryoku/smaa
+layout (location = 0) in vec2 v_colorTexCoords;
+layout (location = 1) in vec4 v_offset0;
+layout (location = 2) in vec4 v_offset1;
+layout (location = 3) in vec4 v_offset2;
 
-uniform sampler2D u_colorTex;
+layout (location = 0) out vec4 v_FragColor;
 
-in vec2 v_colorTexCoords;
-in vec4 v_offset0;
-in vec4 v_offset1;
-in vec4 v_offset2;
+layout (binding = 1) uniform sampler2D u_colorTex;
 
 // SMAA_THRESHOLD specifies the threshold or sensitivity to edges.
 // Lowering this value you will be able to detect more edges at the expense of
@@ -22,46 +23,36 @@ const vec2 kThreshold = vec2(SMAA_THRESHOLD, SMAA_THRESHOLD);
 // that, if there is too much contrast in a direction, that will hide
 // perceptually contrast in the other neighbors.
 #define SMAA_LOCAL_CONTRAST_ADAPTATION_FACTOR 2.0
-
 // Standard relative luminance weights.
 // https://en.wikipedia.org/wiki/Relative_luminance
 const vec3 kWeights = vec3(0.2126, 0.7152, 0.0722);
 
-out vec4 v_FragColor;
-
 void main()
 {
   // Calculate lumas.
   float L = dot(texture(u_colorTex, v_colorTexCoords).rgb, kWeights);
   float Lleft = dot(texture(u_colorTex, v_offset0.xy).rgb, kWeights);
   float Ltop = dot(texture(u_colorTex, v_offset0.zw).rgb, kWeights);
-
   // We do the usual threshold.
   vec4 delta;
   delta.xy = abs(L - vec2(Lleft, Ltop));
   vec2 edges = step(kThreshold, delta.xy);
   if (dot(edges, vec2(1.0, 1.0)) == 0.0)
       discard;
-
   // Calculate right and bottom deltas.
   float Lright = dot(texture(u_colorTex, v_offset1.xy).rgb, kWeights);
   float Lbottom  = dot(texture(u_colorTex, v_offset1.zw).rgb, kWeights);
   delta.zw = abs(L - vec2(Lright, Lbottom));
-
   // Calculate the maximum delta in the direct neighborhood.
   vec2 maxDelta = max(delta.xy, delta.zw);
-
   // Calculate left-left and top-top deltas.
   float Lleftleft = dot(texture(u_colorTex, v_offset2.xy).rgb, kWeights);
   float Ltoptop = dot(texture(u_colorTex, v_offset2.zw).rgb, kWeights);
   delta.zw = abs(vec2(Lleft, Ltop) - vec2(Lleftleft, Ltoptop));
-
   // Calculate the final maximum delta.
   maxDelta = max(maxDelta.xy, delta.zw);
   float finalDelta = max(maxDelta.x, maxDelta.y);
-
   // Local contrast adaptation
   edges *= step(finalDelta, SMAA_LOCAL_CONTRAST_ADAPTATION_FACTOR * delta.xy);
-
   v_FragColor = vec4(edges, 0.0, 1.0);
 }
diff --git a/libs/shaders/GL/smaa_edges.vsh.glsl b/libs/shaders/GL/smaa_edges.vsh.glsl
index aa70aff81..67dc42880 100644
--- a/libs/shaders/GL/smaa_edges.vsh.glsl
+++ b/libs/shaders/GL/smaa_edges.vsh.glsl
@@ -1,14 +1,16 @@
 // Implementation of Subpixel Morphological Antialiasing (SMAA) is based on https://github.com/iryoku/smaa
+layout (location = 0) in vec2 a_pos;
+layout (location = 1) in vec2 a_tcoord;
 
-in vec2 a_pos;
-in vec2 a_tcoord;
+layout (location = 0) out vec2 v_colorTexCoords;
+layout (location = 1) out vec4 v_offset0;
+layout (location = 2) out vec4 v_offset1;
+layout (location = 3) out vec4 v_offset2;
 
-uniform vec4 u_framebufferMetrics;
-
-out vec2 v_colorTexCoords;
-out vec4 v_offset0;
-out vec4 v_offset1;
-out vec4 v_offset2;
+layout (binding = 0) uniform UBO
+{
+  vec4 u_framebufferMetrics;
+};
 
 void main()
 {
@@ -18,4 +20,3 @@ void main()
   v_offset2 = u_framebufferMetrics.xyxy * vec4(-2.0, 0.0, 0.0, -2.0) + a_tcoord.xyxy;
   gl_Position = vec4(a_pos, 0.0, 1.0);
 }
-
diff --git a/libs/shaders/GL/smaa_final.fsh.glsl b/libs/shaders/GL/smaa_final.fsh.glsl
index f8bac1636..767f34c8a 100644
--- a/libs/shaders/GL/smaa_final.fsh.glsl
+++ b/libs/shaders/GL/smaa_final.fsh.glsl
@@ -1,17 +1,20 @@
 // Implementation of Subpixel Morphological Antialiasing (SMAA) is based on https://github.com/iryoku/smaa
+layout (location = 0) in vec2 v_colorTexCoords;
+layout (location = 1) in vec4 v_offset;
 
-uniform sampler2D u_colorTex;
-uniform sampler2D u_blendingWeightTex;
+layout (location = 0) out vec4 v_FragColor;
 
-uniform vec4 u_framebufferMetrics;
+layout (binding = 0) uniform UBO
+{
+  vec4 u_framebufferMetrics;
+};
 
-in vec2 v_colorTexCoords;
-in vec4 v_offset;
+layout (binding = 1) uniform sampler2D u_colorTex;
+
+layout (binding = 2) uniform sampler2D u_blendingWeightTex;
 
 #define SMAASampleLevelZero(tex, coord) textureLod(tex, coord, 0.0)
 
-out vec4 v_FragColor;
-
 void main()
 {
   // Fetch the blending weights for current pixel.
@@ -19,7 +22,6 @@ void main()
   a.x = texture(u_blendingWeightTex, v_offset.xy).a; // Right
   a.y = texture(u_blendingWeightTex, v_offset.zw).g; // Top
   a.wz = texture(u_blendingWeightTex, v_colorTexCoords).xz; // Bottom / Left
-
   // Is there any blending weight with a value greater than 0.0?
   if (dot(a, vec4(1.0, 1.0, 1.0, 1.0)) < 1e-5)
   {
@@ -36,11 +38,9 @@ void main()
       blendingWeight = a.xz;
     }
     blendingWeight /= dot(blendingWeight, vec2(1.0, 1.0));
-
     // Calculate the texture coordinates.
     vec4 bc = blendingOffset * vec4(u_framebufferMetrics.xy, -u_framebufferMetrics.xy);
     bc += v_colorTexCoords.xyxy;
-
     // We exploit bilinear filtering to mix current pixel with the chosen neighbor.
     vec4 color = blendingWeight.x * SMAASampleLevelZero(u_colorTex, bc.xy);
     color += blendingWeight.y * SMAASampleLevelZero(u_colorTex, bc.zw);
diff --git a/libs/shaders/GL/smaa_final.vsh.glsl b/libs/shaders/GL/smaa_final.vsh.glsl
index 73dbd83c9..8a9752ac4 100644
--- a/libs/shaders/GL/smaa_final.vsh.glsl
+++ b/libs/shaders/GL/smaa_final.vsh.glsl
@@ -1,12 +1,14 @@
 // Implementation of Subpixel Morphological Antialiasing (SMAA) is based on https://github.com/iryoku/smaa
+layout (location = 0) in vec2 a_pos;
+layout (location = 1) in vec2 a_tcoord;
 
-in vec2 a_pos;
-in vec2 a_tcoord;
+layout (location = 0) out vec2 v_colorTexCoords;
+layout (location = 1) out vec4 v_offset;
 
-uniform vec4 u_framebufferMetrics;
-
-out vec2 v_colorTexCoords;
-out vec4 v_offset;
+layout (binding = 0) uniform UBO
+{
+  vec4 u_framebufferMetrics;
+};
 
 void main()
 {
diff --git a/libs/shaders/GL/solid_color.fsh.glsl b/libs/shaders/GL/solid_color.fsh.glsl
index 4362d4ecb..5b1f53ba5 100644
--- a/libs/shaders/GL/solid_color.fsh.glsl
+++ b/libs/shaders/GL/solid_color.fsh.glsl
@@ -1,13 +1,23 @@
-uniform float u_opacity;
-
 #ifdef ENABLE_VTF
-in LOW_P vec4 v_color;
+layout (location = 0) in LOW_P vec4 v_color;
 #else
-uniform sampler2D u_colorTex;
-in vec2 v_colorTexCoords;
+layout (location = 1) in vec2 v_colorTexCoords;
+layout (binding = 1) uniform sampler2D u_colorTex;
 #endif
 
-out vec4 v_FragColor;
+layout (location = 0) out vec4 v_FragColor;
+
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec2 u_contrastGamma;
+  float u_opacity;
+  float u_zScale;
+  float u_interpolation;
+  float u_isOutlinePass;
+};
 
 void main()
 {
@@ -19,4 +29,3 @@ void main()
   finalColor.a *= u_opacity;
   v_FragColor = finalColor;
 }
-
diff --git a/libs/shaders/GL/text.fsh.glsl b/libs/shaders/GL/text.fsh.glsl
index 5e27e1c36..eb1e15bad 100644
--- a/libs/shaders/GL/text.fsh.glsl
+++ b/libs/shaders/GL/text.fsh.glsl
@@ -1,17 +1,26 @@
 #ifdef ENABLE_VTF
-in LOW_P vec4 v_color;
+layout (location = 0) in LOW_P vec4 v_color;
 #else
-in vec2 v_colorTexCoord;
-uniform sampler2D u_colorTex;
+layout (location = 1) in vec2 v_colorTexCoord;
+layout (binding = 1) uniform sampler2D u_colorTex;
 #endif
+layout (location = 2) in vec2 v_maskTexCoord;
 
-in vec2 v_maskTexCoord;
+layout (location = 0) out vec4 v_FragColor;
 
-uniform sampler2D u_maskTex;
-uniform float u_opacity;
-uniform vec2 u_contrastGamma;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec2 u_contrastGamma;
+  float u_opacity;
+  float u_zScale;
+  float u_interpolation;
+  float u_isOutlinePass;
+};
 
-out vec4 v_FragColor;
+layout (binding = 2) uniform sampler2D u_maskTex;
 
 void main()
 {
diff --git a/libs/shaders/GL/text.vsh.glsl b/libs/shaders/GL/text.vsh.glsl
index d3c5e1002..b2669589a 100644
--- a/libs/shaders/GL/text.vsh.glsl
+++ b/libs/shaders/GL/text.vsh.glsl
@@ -1,27 +1,36 @@
-in vec2 a_colorTexCoord;
-in vec2 a_maskTexCoord;
-in vec4 a_position;
-in vec2 a_normal;
-
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform mat4 u_pivotTransform;
+layout (location = 0) in vec2 a_colorTexCoord;
+layout (location = 1) in vec2 a_maskTexCoord;
+layout (location = 2) in vec4 a_position;
+layout (location = 3) in vec2 a_normal;
 
 #ifdef ENABLE_VTF
-uniform sampler2D u_colorTex;
-out LOW_P vec4 v_color;
+layout (location = 0) out LOW_P vec4 v_color;
 #else
-out vec2 v_colorTexCoord;
+layout (location = 1) out vec2 v_colorTexCoord;
 #endif
+layout (location = 2) out vec2 v_maskTexCoord;
 
-out vec2 v_maskTexCoord;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec2 u_contrastGamma;
+  float u_opacity;
+  float u_zScale;
+  float u_interpolation;
+  float u_isOutlinePass;
+};
+
+#ifdef ENABLE_VTF
+layout (binding = 1) uniform sampler2D u_colorTex;
+#endif
 
 void main()
 {
   vec4 pos = vec4(a_position.xyz, 1) * u_modelView;
   vec4 shiftedPos = vec4(a_normal, 0.0, 0.0) + pos;
   gl_Position = applyPivotTransform(shiftedPos * u_projection, u_pivotTransform, 0.0);
-
 #ifdef ENABLE_VTF
   v_color = texture(u_colorTex, a_colorTexCoord);
 #else
diff --git a/libs/shaders/GL/text_billboard.vsh.glsl b/libs/shaders/GL/text_billboard.vsh.glsl
index efadcb39c..d11c44011 100644
--- a/libs/shaders/GL/text_billboard.vsh.glsl
+++ b/libs/shaders/GL/text_billboard.vsh.glsl
@@ -1,22 +1,28 @@
-in vec2 a_colorTexCoord;
-in vec2 a_maskTexCoord;
-in vec4 a_position;
-in vec2 a_normal;
-
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform mat4 u_pivotTransform;
-uniform float u_isOutlinePass;
-uniform float u_zScale;
+layout (location = 0) in vec2 a_colorTexCoord;
+layout (location = 1) in vec2 a_maskTexCoord;
+layout (location = 2) in vec4 a_position;
+layout (location = 3) in vec2 a_normal;
 
 #ifdef ENABLE_VTF
-uniform sampler2D u_colorTex;
-out LOW_P vec4 v_color;
+layout (location = 0) out LOW_P vec4 v_color;
 #else
-out vec2 v_colorTexCoord;
+layout (location = 1) out vec2 v_colorTexCoord;
 #endif
+layout (location = 2) out vec2 v_maskTexCoord;
 
-out vec2 v_maskTexCoord;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec2 u_contrastGamma;
+  float u_opacity;
+  float u_zScale;
+  float u_interpolation;
+  float u_isOutlinePass;
+};
+
+layout (binding = 1) uniform sampler2D u_colorTex;
 
 void main()
 {
diff --git a/libs/shaders/GL/text_outlined.vsh.glsl b/libs/shaders/GL/text_outlined.vsh.glsl
index 4fd1c82ac..851f0e09f 100644
--- a/libs/shaders/GL/text_outlined.vsh.glsl
+++ b/libs/shaders/GL/text_outlined.vsh.glsl
@@ -1,22 +1,31 @@
-in vec2 a_colorTexCoord;
-in vec2 a_outlineColorTexCoord;
-in vec2 a_maskTexCoord;
-in vec4 a_position;
-in vec2 a_normal;
-
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform mat4 u_pivotTransform;
-uniform float u_isOutlinePass;
+layout (location = 0) in vec2 a_colorTexCoord;
+layout (location = 1) in vec2 a_outlineColorTexCoord;
+layout (location = 2) in vec2 a_maskTexCoord;
+layout (location = 3) in vec4 a_position;
+layout (location = 4) in vec2 a_normal;
 
 #ifdef ENABLE_VTF
-uniform sampler2D u_colorTex;
-out LOW_P vec4 v_color;
+layout (location = 0) out LOW_P vec4 v_color;
 #else
-out vec2 v_colorTexCoord;
+layout (location = 1) out vec2 v_colorTexCoord;
 #endif
+layout (location = 2) out vec2 v_maskTexCoord;
 
-out vec2 v_maskTexCoord;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec2 u_contrastGamma;
+  float u_opacity;
+  float u_zScale;
+  float u_interpolation;
+  float u_isOutlinePass;
+};
+
+#ifdef ENABLE_VTF
+layout (binding = 1) uniform sampler2D u_colorTex;
+#endif
 
 const float BaseDepthShift = -10.0;
 
@@ -25,7 +34,6 @@ void main()
   float isOutline = step(0.5, u_isOutlinePass);
   float notOutline = 1.0 - isOutline;
   float depthShift = BaseDepthShift * isOutline;
-
   vec4 pos = (vec4(a_position.xyz, 1) + vec4(0.0, 0.0, depthShift, 0.0)) * u_modelView;
   vec4 shiftedPos = vec4(a_normal, 0.0, 0.0) + pos;
   gl_Position = applyPivotTransform(shiftedPos * u_projection, u_pivotTransform, 0.0);
diff --git a/libs/shaders/GL/text_outlined_billboard.vsh.glsl b/libs/shaders/GL/text_outlined_billboard.vsh.glsl
index 2fd2ae501..c7f1f6dbb 100644
--- a/libs/shaders/GL/text_outlined_billboard.vsh.glsl
+++ b/libs/shaders/GL/text_outlined_billboard.vsh.glsl
@@ -1,23 +1,29 @@
-in vec2 a_colorTexCoord;
-in vec2 a_outlineColorTexCoord;
-in vec2 a_maskTexCoord;
-in vec4 a_position;
-in vec2 a_normal;
-
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform mat4 u_pivotTransform;
-uniform float u_isOutlinePass;
-uniform float u_zScale;
+layout (location = 0) in vec2 a_colorTexCoord;
+layout (location = 1) in vec2 a_outlineColorTexCoord;
+layout (location = 2) in vec2 a_maskTexCoord;
+layout (location = 3) in vec4 a_position;
+layout (location = 4) in vec2 a_normal;
 
 #ifdef ENABLE_VTF
-uniform sampler2D u_colorTex;
-out LOW_P vec4 v_color;
+layout (location = 0) out LOW_P vec4 v_color;
 #else
-out vec2 v_colorTexCoord;
+layout (location = 1) out vec2 v_colorTexCoord;
 #endif
+layout (location = 2) out vec2 v_maskTexCoord;
 
-out vec2 v_maskTexCoord;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec2 u_contrastGamma;
+  float u_opacity;
+  float u_zScale;
+  float u_interpolation;
+  float u_isOutlinePass;
+};
+
+layout (binding = 1) uniform sampler2D u_colorTex;
 
 const float kBaseDepthShift = -10.0;
 
@@ -25,12 +31,10 @@ void main()
 {
   float isOutline = step(0.5, u_isOutlinePass);
   float depthShift = kBaseDepthShift * isOutline;
-
   vec4 pivot = (vec4(a_position.xyz, 1.0) + vec4(0.0, 0.0, depthShift, 0.0)) * u_modelView;
   vec4 offset = vec4(a_normal, 0.0, 0.0) * u_projection;
   gl_Position = applyBillboardPivotTransform(pivot * u_projection, u_pivotTransform,
                                              a_position.w * u_zScale, offset.xy);
-
   vec2 colorTexCoord = mix(a_colorTexCoord, a_outlineColorTexCoord, isOutline);
 #ifdef ENABLE_VTF
   v_color = texture(u_colorTex, colorTexCoord);
diff --git a/libs/shaders/GL/text_outlined_gui.fsh.glsl b/libs/shaders/GL/text_outlined_gui.fsh.glsl
new file mode 100644
index 000000000..e5cd02a34
--- /dev/null
+++ b/libs/shaders/GL/text_outlined_gui.fsh.glsl
@@ -0,0 +1,35 @@
+#ifdef ENABLE_VTF
+layout (location = 0) in LOW_P vec4 v_color;
+#else
+layout (location = 1) in vec2 v_colorTexCoord;
+layout (binding = 1) uniform sampler2D u_colorTex;
+#endif
+layout (location = 2) in vec2 v_maskTexCoord;
+
+layout (location = 0) out vec4 v_FragColor;
+
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  vec2 u_contrastGamma;
+  vec2 u_position;
+  float u_isOutlinePass;
+  float u_opacity;
+  float u_length;
+};
+
+layout (binding = 2) uniform sampler2D u_maskTex;
+
+void main()
+{
+#ifdef ENABLE_VTF
+  LOW_P vec4 glyphColor = v_color;
+#else
+  LOW_P vec4 glyphColor = texture(u_colorTex, v_colorTexCoord);
+#endif
+  float dist = texture(u_maskTex, v_maskTexCoord).r;
+  float alpha = smoothstep(u_contrastGamma.x - u_contrastGamma.y, u_contrastGamma.x + u_contrastGamma.y, dist) * u_opacity;
+  glyphColor.a *= alpha;
+  v_FragColor = glyphColor;
+}
diff --git a/libs/shaders/GL/text_outlined_gui.vsh.glsl b/libs/shaders/GL/text_outlined_gui.vsh.glsl
index 287ec2afd..a242ba5d1 100644
--- a/libs/shaders/GL/text_outlined_gui.vsh.glsl
+++ b/libs/shaders/GL/text_outlined_gui.vsh.glsl
@@ -1,21 +1,30 @@
-in vec3 a_position;
-in vec2 a_colorTexCoord;
-in vec2 a_outlineColorTexCoord;
-in vec2 a_normal;
-in vec2 a_maskTexCoord;
-
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform float u_isOutlinePass;
+layout (location = 0) in vec3 a_position;
+layout (location = 1) in vec2 a_colorTexCoord;
+layout (location = 2) in vec2 a_outlineColorTexCoord;
+layout (location = 3) in vec2 a_normal;
+layout (location = 4) in vec2 a_maskTexCoord;
 
 #ifdef ENABLE_VTF
-uniform sampler2D u_colorTex;
-out LOW_P vec4 v_color;
+layout (location = 0) out LOW_P vec4 v_color;
 #else
-out vec2 v_colorTexCoord;
+layout (location = 1) out vec2 v_colorTexCoord;
 #endif
+layout (location = 2) out vec2 v_maskTexCoord;
 
-out vec2 v_maskTexCoord;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  vec2 u_contrastGamma;
+  vec2 u_position;
+  float u_isOutlinePass;
+  float u_opacity;
+  float u_length;
+};
+
+#ifdef ENABLE_VTF
+layout (binding = 1) uniform sampler2D u_colorTex;
+#endif
 
 const float kBaseDepthShift = -10.0;
 
@@ -23,7 +32,6 @@ void main()
 {
   float isOutline = step(0.5, u_isOutlinePass);
   float depthShift = kBaseDepthShift * isOutline;
-
   vec4 pos = (vec4(a_position, 1.0) + vec4(0.0, 0.0, depthShift, 0.0)) * u_modelView;
   vec4 shiftedPos = vec4(a_normal, 0.0, 0.0) + pos;
   gl_Position = shiftedPos * u_projection;
diff --git a/libs/shaders/GL/texturing.fsh.glsl b/libs/shaders/GL/texturing.fsh.glsl
index 720f28ad3..d8a628df6 100644
--- a/libs/shaders/GL/texturing.fsh.glsl
+++ b/libs/shaders/GL/texturing.fsh.glsl
@@ -1,9 +1,20 @@
-uniform sampler2D u_colorTex;
-uniform float u_opacity;
+layout (location = 0) in vec2 v_colorTexCoords;
 
-in vec2 v_colorTexCoords;
+layout (location = 0) out vec4 v_FragColor;
 
-out vec4 v_FragColor;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec2 u_contrastGamma;
+  float u_opacity;
+  float u_zScale;
+  float u_interpolation;
+  float u_isOutlinePass;
+};
+
+layout (binding = 1) uniform sampler2D u_colorTex;
 
 void main()
 {
diff --git a/libs/shaders/GL/texturing.vsh.glsl b/libs/shaders/GL/texturing.vsh.glsl
index 57b4353fb..224778c7c 100644
--- a/libs/shaders/GL/texturing.vsh.glsl
+++ b/libs/shaders/GL/texturing.vsh.glsl
@@ -1,12 +1,20 @@
-in vec4 a_position;
-in vec2 a_normal;
-in vec2 a_colorTexCoords;
+layout (location = 0) in vec4 a_position;
+layout (location = 1) in vec2 a_normal;
+layout (location = 2) in vec2 a_colorTexCoords;
 
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform mat4 u_pivotTransform;
+layout (location = 0) out vec2 v_colorTexCoords;
 
-out vec2 v_colorTexCoords;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec2 u_contrastGamma;
+  float u_opacity;
+  float u_zScale;
+  float u_interpolation;
+  float u_isOutlinePass;
+};
 
 void main()
 {
diff --git a/libs/shaders/GL/texturing3d.fsh.glsl b/libs/shaders/GL/texturing3d.fsh.glsl
index 8af084e70..22c6516cf 100644
--- a/libs/shaders/GL/texturing3d.fsh.glsl
+++ b/libs/shaders/GL/texturing3d.fsh.glsl
@@ -1,10 +1,21 @@
-uniform sampler2D u_colorTex;
-uniform float u_opacity;
+layout (location = 0) in vec2 v_colorTexCoords;
+layout (location = 1) in float v_intensity;
 
-in vec2 v_colorTexCoords;
-in float v_intensity;
+layout (location = 0) out vec4 v_FragColor;
 
-out vec4 v_FragColor;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec2 u_contrastGamma;
+  float u_opacity;
+  float u_zScale;
+  float u_interpolation;
+  float u_isOutlinePass;
+};
+
+layout (binding = 1) uniform sampler2D u_colorTex;
 
 void main()
 {
diff --git a/libs/shaders/GL/texturing_billboard.vsh.glsl b/libs/shaders/GL/texturing_billboard.vsh.glsl
index 76ba64f47..e68b97c8f 100644
--- a/libs/shaders/GL/texturing_billboard.vsh.glsl
+++ b/libs/shaders/GL/texturing_billboard.vsh.glsl
@@ -1,13 +1,20 @@
-in vec4 a_position;
-in vec2 a_normal;
-in vec2 a_colorTexCoords;
+layout (location = 0) in vec4 a_position;
+layout (location = 1) in vec2 a_normal;
+layout (location = 2) in vec2 a_colorTexCoords;
 
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform mat4 u_pivotTransform;
-uniform float u_zScale;
+layout (location = 0) out vec2 v_colorTexCoords;
 
-out vec2 v_colorTexCoords;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec2 u_contrastGamma;
+  float u_opacity;
+  float u_zScale;
+  float u_interpolation;
+  float u_isOutlinePass;
+};
 
 void main()
 {
diff --git a/libs/shaders/GL/texturing_gui.fsh.glsl b/libs/shaders/GL/texturing_gui.fsh.glsl
new file mode 100644
index 000000000..667d16c4f
--- /dev/null
+++ b/libs/shaders/GL/texturing_gui.fsh.glsl
@@ -0,0 +1,23 @@
+layout (location = 0) in vec2 v_colorTexCoords;
+
+layout (location = 0) out vec4 v_FragColor;
+
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  vec2 u_contrastGamma;
+  vec2 u_position;
+  float u_isOutlinePass;
+  float u_opacity;
+  float u_length;
+};
+
+layout (binding = 1) uniform sampler2D u_colorTex;
+
+void main()
+{
+  vec4 finalColor = texture(u_colorTex, v_colorTexCoords);
+  finalColor.a *= u_opacity;
+  v_FragColor = finalColor;
+}
diff --git a/libs/shaders/GL/texturing_gui.vsh.glsl b/libs/shaders/GL/texturing_gui.vsh.glsl
index c945418a6..74aac5d49 100644
--- a/libs/shaders/GL/texturing_gui.vsh.glsl
+++ b/libs/shaders/GL/texturing_gui.vsh.glsl
@@ -1,10 +1,18 @@
-in vec2 a_position;
-in vec2 a_colorTexCoords;
+layout (location = 0) in vec2 a_position;
+layout (location = 1) in vec2 a_colorTexCoords;
 
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
+layout (location = 0) out vec2 v_colorTexCoords;
 
-out vec2 v_colorTexCoords;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  vec2 u_contrastGamma;
+  vec2 u_position;
+  float u_isOutlinePass;
+  float u_opacity;
+  float u_length;
+};
 
 void main()
 {
diff --git a/libs/shaders/GL/texturing_position.fsh.glsl b/libs/shaders/GL/texturing_position.fsh.glsl
new file mode 100644
index 000000000..c5ad5a77e
--- /dev/null
+++ b/libs/shaders/GL/texturing_position.fsh.glsl
@@ -0,0 +1,25 @@
+layout (location = 0) in vec2 v_colorTexCoords;
+
+layout (location = 0) out vec4 v_FragColor;
+
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec4 u_position;
+  vec2 u_lineParams;
+  float u_accuracy;
+  float u_zScale;
+  float u_opacity;
+  float u_azimut;
+};
+
+layout (binding = 1) uniform sampler2D u_colorTex;
+
+void main()
+{
+  vec4 finalColor = texture(u_colorTex, v_colorTexCoords);
+  finalColor.a *= u_opacity;
+  v_FragColor = finalColor;
+}
diff --git a/libs/shaders/GL/traffic.fsh.glsl b/libs/shaders/GL/traffic.fsh.glsl
index 98cb596ab..9e631f075 100644
--- a/libs/shaders/GL/traffic.fsh.glsl
+++ b/libs/shaders/GL/traffic.fsh.glsl
@@ -1,36 +1,41 @@
-in vec2 v_colorTexCoord;
-in vec2 v_maskTexCoord;
-in float v_halfLength;
+layout (location = 0) in vec2 v_colorTexCoord;
+layout (location = 1) in vec2 v_maskTexCoord;
+layout (location = 2) in float v_halfLength;
 
-uniform sampler2D u_colorTex;
-uniform sampler2D u_maskTex;
-uniform float u_opacity;
-uniform float u_outline;
+layout (location = 0) out vec4 v_FragColor;
 
-uniform vec3 u_lightArrowColor;
-uniform vec3 u_darkArrowColor;
-uniform vec3 u_outlineColor;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec4 u_trafficParams;
+  vec4 u_outlineColor;
+  vec4 u_lightArrowColor;
+  vec4 u_darkArrowColor;
+  float u_outline;
+  float u_opacity;
+};
+
+layout (binding = 1) uniform sampler2D u_colorTex;
+layout (binding = 2) uniform sampler2D u_maskTex;
 
 const float kAntialiasingThreshold = 0.92;
-
 const float kOutlineThreshold1 = 0.8;
 const float kOutlineThreshold2 = 0.5;
-
 const float kMaskOpacity = 0.7;
 
-out vec4 v_FragColor;
-
 void main()
 {
   vec4 color = texture(u_colorTex, v_colorTexCoord);
   float alphaCode = color.a;
   vec4 mask = texture(u_maskTex, v_maskTexCoord);
   color.a = u_opacity * (1.0 - smoothstep(kAntialiasingThreshold, 1.0, abs(v_halfLength)));
-  color.rgb = mix(color.rgb, mask.rgb * mix(u_lightArrowColor, u_darkArrowColor, step(alphaCode, 0.6)), mask.a * kMaskOpacity);
+  color.rgb = mix(color.rgb, mask.rgb * mix(u_lightArrowColor.rgb, u_darkArrowColor.rgb, step(alphaCode, 0.6)), mask.a * kMaskOpacity);
   if (u_outline > 0.0)
   {
-    color.rgb = mix(color.rgb, u_outlineColor, step(kOutlineThreshold1, abs(v_halfLength)));
-    color.rgb = mix(color.rgb, u_outlineColor, smoothstep(kOutlineThreshold2, kOutlineThreshold1, abs(v_halfLength)));
+    color.rgb = mix(color.rgb, u_outlineColor.rgb, step(kOutlineThreshold1, abs(v_halfLength)));
+    color.rgb = mix(color.rgb, u_outlineColor.rgb, smoothstep(kOutlineThreshold2, kOutlineThreshold1, abs(v_halfLength)));
   }
   v_FragColor = color;
 }
diff --git a/libs/shaders/GL/traffic.vsh.glsl b/libs/shaders/GL/traffic.vsh.glsl
index 4a1800260..ae06dfdb4 100644
--- a/libs/shaders/GL/traffic.vsh.glsl
+++ b/libs/shaders/GL/traffic.vsh.glsl
@@ -1,16 +1,23 @@
-in vec3 a_position;
-in vec4 a_normal;
-in vec4 a_colorTexCoord;
+layout (location = 0) in vec3 a_position;
+layout (location = 1) in vec4 a_normal;
+layout (location = 2) in vec4 a_colorTexCoord;
 
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform mat4 u_pivotTransform;
+layout (location = 0) out vec2 v_colorTexCoord;
+layout (location = 1) out vec2 v_maskTexCoord;
+layout (location = 2) out float v_halfLength;
 
-uniform vec4 u_trafficParams;
-
-out vec2 v_colorTexCoord;
-out vec2 v_maskTexCoord;
-out float v_halfLength;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec4 u_trafficParams;
+  vec4 u_outlineColor;
+  vec4 u_lightArrowColor;
+  vec4 u_darkArrowColor;
+  float u_outline;
+  float u_opacity;
+};
 
 const float kArrowVSize = 0.25;
 
@@ -26,7 +33,6 @@ void main()
     transformedAxisPos = calcLineTransformedAxisPos(transformedAxisPos, a_position.xy + norm,
                                                     u_modelView, length(norm));
   }
-
   float uOffset = length(vec4(kShapeCoordScalar, 0, 0, 0) * u_modelView) * a_normal.w;
   v_colorTexCoord = a_colorTexCoord.xy;
   float v = mix(a_colorTexCoord.z, a_colorTexCoord.z + kArrowVSize, 0.5 * a_normal.z + 0.5);
diff --git a/libs/shaders/GL/traffic_circle.fsh.glsl b/libs/shaders/GL/traffic_circle.fsh.glsl
index d844718c7..42c952913 100644
--- a/libs/shaders/GL/traffic_circle.fsh.glsl
+++ b/libs/shaders/GL/traffic_circle.fsh.glsl
@@ -1,17 +1,28 @@
 // Warning! Beware to use this shader. "discard" command may significally reduce performance.
-// Unfortunately some CG algorithms cannot be implemented on OpenGL ES 2.0 without discarding
-// fragments from depth buffer.
+// Unfortunately some CG algorithms cannot be implemented without discarding fragments from depth buffer.
 
-in vec2 v_colorTexCoord;
-in vec3 v_radius;
+layout (location = 0) in vec2 v_colorTexCoord;
+layout (location = 1) in vec3 v_radius;
 
-uniform sampler2D u_colorTex;
-uniform float u_opacity;
+layout (location = 0) out vec4 v_FragColor;
+
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec4 u_trafficParams;
+  vec4 u_outlineColor;
+  vec4 u_lightArrowColor;
+  vec4 u_darkArrowColor;
+  float u_outline;
+  float u_opacity;
+};
+
+layout (binding = 1) uniform sampler2D u_colorTex;
 
 const float kAntialiasingThreshold = 0.92;
 
-out vec4 v_FragColor;
-
 void main()
 {
   vec4 color = texture(u_colorTex, v_colorTexCoord);
diff --git a/libs/shaders/GL/traffic_circle.vsh.glsl b/libs/shaders/GL/traffic_circle.vsh.glsl
index 4a61e10b6..e0e022ffe 100644
--- a/libs/shaders/GL/traffic_circle.vsh.glsl
+++ b/libs/shaders/GL/traffic_circle.vsh.glsl
@@ -1,16 +1,22 @@
-in vec4 a_position;
-in vec4 a_normal;
-in vec2 a_colorTexCoord;
+layout (location = 0) in vec4 a_position;
+layout (location = 1) in vec4 a_normal;
+layout (location = 2) in vec2 a_colorTexCoord;
 
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform mat4 u_pivotTransform;
+layout (location = 0) out vec2 v_colorTexCoord;
+layout (location = 1) out vec3 v_radius;
 
-uniform vec3 u_lightArrowColor; // Here we store left sizes by road classes.
-uniform vec3 u_darkArrowColor; // Here we store right sizes by road classes.
-
-out vec2 v_colorTexCoord;
-out vec3 v_radius;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec4 u_trafficParams;
+  vec4 u_outlineColor;
+  vec4 u_lightArrowColor;
+  vec4 u_darkArrowColor;
+  float u_outline;
+  float u_opacity;
+};
 
 void main()
 {
@@ -28,7 +34,6 @@ void main()
   }
   // radius = (leftSize + rightSize) / 2
   v_radius = vec3(a_normal.zw, 1.0) * 0.5 * (leftSize + rightSize);
-
   vec2 finalPos = transformedAxisPos + v_radius.xy;
   v_colorTexCoord = a_colorTexCoord;
   vec4 pos = vec4(finalPos, a_position.z, 1.0) * u_projection;
diff --git a/libs/shaders/GL/traffic_line.fsh.glsl b/libs/shaders/GL/traffic_line.fsh.glsl
index d4635a9a1..230dd72f1 100644
--- a/libs/shaders/GL/traffic_line.fsh.glsl
+++ b/libs/shaders/GL/traffic_line.fsh.glsl
@@ -1,9 +1,21 @@
-uniform sampler2D u_colorTex;
-uniform float u_opacity;
+layout (location = 0) in vec2 v_colorTexCoord;
 
-in vec2 v_colorTexCoord;
+layout (location = 0) out vec4 v_FragColor;
 
-out vec4 v_FragColor;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec4 u_trafficParams;
+  vec4 u_outlineColor;
+  vec4 u_lightArrowColor;
+  vec4 u_darkArrowColor;
+  float u_outline;
+  float u_opacity;
+};
+
+layout (binding = 1) uniform sampler2D u_colorTex;
 
 void main()
 {
diff --git a/libs/shaders/GL/traffic_line.vsh.glsl b/libs/shaders/GL/traffic_line.vsh.glsl
index f7eaea48d..0b21a74b3 100644
--- a/libs/shaders/GL/traffic_line.vsh.glsl
+++ b/libs/shaders/GL/traffic_line.vsh.glsl
@@ -1,11 +1,20 @@
-in vec3 a_position;
-in vec2 a_colorTexCoord;
+layout (location = 0) in vec3 a_position;
+layout (location = 1) in vec2 a_colorTexCoord;
 
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform mat4 u_pivotTransform;
+layout (location = 0) out vec2 v_colorTexCoord;
 
-out vec2 v_colorTexCoord;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec4 u_trafficParams;
+  vec4 u_outlineColor;
+  vec4 u_lightArrowColor;
+  vec4 u_darkArrowColor;
+  float u_outline;
+  float u_opacity;
+};
 
 void main()
 {
diff --git a/libs/shaders/GL/transit.fsh.glsl b/libs/shaders/GL/transit.fsh.glsl
index 987d64bc0..db534f2d4 100644
--- a/libs/shaders/GL/transit.fsh.glsl
+++ b/libs/shaders/GL/transit.fsh.glsl
@@ -1,6 +1,6 @@
-in vec4 v_color;
+layout (location = 0) in vec4 v_color;
 
-out vec4 v_FragColor;
+layout (location = 0) out vec4 v_FragColor;
 
 void main()
 {
diff --git a/libs/shaders/GL/transit.vsh.glsl b/libs/shaders/GL/transit.vsh.glsl
index fa1bf5821..4765e91d8 100644
--- a/libs/shaders/GL/transit.vsh.glsl
+++ b/libs/shaders/GL/transit.vsh.glsl
@@ -1,14 +1,18 @@
-in vec3 a_position;
-in vec4 a_normal;
-in vec4 a_color;
+layout (location = 0) in vec3 a_position;
+layout (location = 1) in vec4 a_normal;
+layout (location = 2) in vec4 a_color;
 
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform mat4 u_pivotTransform;
+layout (location = 0) out vec4 v_color;
 
-uniform float u_lineHalfWidth;
-
-out vec4 v_color;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec4 u_params;
+  float u_lineHalfWidth;
+  float u_maxRadius;
+};
 
 void main()
 {
diff --git a/libs/shaders/GL/transit_circle.fsh.glsl b/libs/shaders/GL/transit_circle.fsh.glsl
index 72d58ba3c..d173f68f7 100644
--- a/libs/shaders/GL/transit_circle.fsh.glsl
+++ b/libs/shaders/GL/transit_circle.fsh.glsl
@@ -1,18 +1,16 @@
 // Warning! Beware to use this shader. "discard" command may significally reduce performance.
-// Unfortunately some CG algorithms cannot be implemented on OpenGL ES 2.0 without discarding
-// fragments from depth buffer.
+// Unfortunately some CG algorithms cannot be implemented without discarding fragments from depth buffer.
 
-in vec3 v_radius;
-in vec4 v_color;
+layout (location = 0) in vec3 v_radius;
+layout (location = 1) in vec4 v_color;
+
+layout (location = 0) out vec4 v_FragColor;
 
 const float aaPixelsCount = 2.5;
 
-out vec4 v_FragColor;
-
 void main()
 {
   vec4 finalColor = v_color;
-
   float smallRadius = v_radius.z - aaPixelsCount;
   float stepValue = smoothstep(smallRadius * smallRadius, v_radius.z * v_radius.z,
                               dot(v_radius.xy, v_radius.xy));
diff --git a/libs/shaders/GL/transit_circle.vsh.glsl b/libs/shaders/GL/transit_circle.vsh.glsl
index f775986be..6595d1c13 100644
--- a/libs/shaders/GL/transit_circle.vsh.glsl
+++ b/libs/shaders/GL/transit_circle.vsh.glsl
@@ -1,16 +1,19 @@
-in vec3 a_position;
-in vec4 a_normal;
-in vec4 a_color;
+layout (location = 0) in vec3 a_position;
+layout (location = 1) in vec4 a_normal;
+layout (location = 2) in vec4 a_color;
 
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform mat4 u_pivotTransform;
+layout (location = 0) out vec3 v_radius;
+layout (location = 1) out vec4 v_color;
 
-uniform float u_lineHalfWidth;
-uniform float u_maxRadius;
-
-out vec3 v_radius;
-out vec4 v_color;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec4 u_params;
+  float u_lineHalfWidth;
+  float u_maxRadius;
+};
 
 void main()
 {
diff --git a/libs/shaders/GL/transit_marker.fsh.glsl b/libs/shaders/GL/transit_marker.fsh.glsl
index f1c9298f8..9a44781a1 100644
--- a/libs/shaders/GL/transit_marker.fsh.glsl
+++ b/libs/shaders/GL/transit_marker.fsh.glsl
@@ -1,7 +1,7 @@
-in vec4 v_offsets;
-in vec4 v_color;
+layout (location = 0) in vec4 v_offsets;
+layout (location = 1) in vec4 v_color;
 
-out vec4 v_FragColor;
+layout (location = 0) out vec4 v_FragColor;
 
 void main()
 {
@@ -9,11 +9,9 @@ void main()
   vec2 radius;
   radius.x = max(0.0, abs(v_offsets.x) - v_offsets.z);
   radius.y = max(0.0, abs(v_offsets.y) - v_offsets.w);
-
   float maxRadius = 1.0;
   float aaRadius = 0.9;
   float stepValue = smoothstep(aaRadius * aaRadius, maxRadius * maxRadius, dot(radius.xy, radius.xy));
   finalColor.a = finalColor.a * (1.0 - stepValue);
-
   v_FragColor = finalColor;
 }
diff --git a/libs/shaders/GL/transit_marker.vsh.glsl b/libs/shaders/GL/transit_marker.vsh.glsl
index 9a3f860ee..27a6c12c8 100644
--- a/libs/shaders/GL/transit_marker.vsh.glsl
+++ b/libs/shaders/GL/transit_marker.vsh.glsl
@@ -1,15 +1,19 @@
-in vec3 a_position;
-in vec4 a_normal;
-in vec4 a_color;
+layout (location = 0) in vec3 a_position;
+layout (location = 1) in vec4 a_normal;
+layout (location = 2) in vec4 a_color;
 
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform mat4 u_pivotTransform;
+layout (location = 0) out vec4 v_offsets;
+layout (location = 1) out vec4 v_color;
 
-uniform vec3 u_params;
-
-out vec4 v_offsets;
-out vec4 v_color;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec4 u_params;
+  float u_lineHalfWidth;
+  float u_maxRadius;
+};
 
 void main()
 {
diff --git a/libs/shaders/GL/user_mark.fsh.glsl b/libs/shaders/GL/user_mark.fsh.glsl
index a1ccd6d48..ef07a95de 100644
--- a/libs/shaders/GL/user_mark.fsh.glsl
+++ b/libs/shaders/GL/user_mark.fsh.glsl
@@ -1,14 +1,24 @@
 // Warning! Beware to use this shader. "discard" command may significally reduce performance.
-// Unfortunately some CG algorithms cannot be implemented on OpenGL ES 2.0 without discarding
-// fragments from depth buffer.
+// Unfortunately some CG algorithms cannot be implemented without discarding fragments from depth buffer.
 
-uniform sampler2D u_colorTex;
-uniform float u_opacity;
+layout (location = 0) in vec4 v_texCoords;
+layout (location = 1) in vec4 v_maskColor;
 
-in vec4 v_texCoords;
-in vec4 v_maskColor;
+layout (location = 0) out vec4 v_FragColor;
 
-out vec4 v_FragColor;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec2 u_contrastGamma;
+  float u_opacity;
+  float u_zScale;
+  float u_interpolation;
+  float u_isOutlinePass;
+};
+
+layout (binding = 1) uniform sampler2D u_colorTex;
 
 void main()
 {
diff --git a/libs/shaders/GL/user_mark.vsh.glsl b/libs/shaders/GL/user_mark.vsh.glsl
index 311df0481..d9e150e6c 100644
--- a/libs/shaders/GL/user_mark.vsh.glsl
+++ b/libs/shaders/GL/user_mark.vsh.glsl
@@ -1,22 +1,28 @@
-in vec3 a_position;
-in vec3 a_normalAndAnimateOrZ;
-in vec4 a_texCoords;
-in vec4 a_color;
+layout (location = 0) in vec3 a_position;
+layout (location = 1) in vec3 a_normalAndAnimateOrZ;
+layout (location = 2) in vec4 a_texCoords;
+layout (location = 3) in vec4 a_color;
 
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform mat4 u_pivotTransform;
-uniform float u_interpolation;
+layout (location = 0) out vec4 v_texCoords;
+layout (location = 1) out vec4 v_maskColor;
 
-out vec4 v_texCoords;
-out vec4 v_maskColor;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec2 u_contrastGamma;
+  float u_opacity;
+  float u_zScale;
+  float u_interpolation;
+  float u_isOutlinePass;
+};
 
 void main()
 {
   vec2 normal = a_normalAndAnimateOrZ.xy;
   if (a_normalAndAnimateOrZ.z > 0.0)
     normal = u_interpolation * normal;
-
   vec4 p = vec4(a_position, 1.0) * u_modelView;
   vec4 pos = vec4(normal, 0.0, 0.0) + p;
   vec4 projectedPivot = p * u_projection;
diff --git a/libs/shaders/GL/user_mark_billboard.vsh.glsl b/libs/shaders/GL/user_mark_billboard.vsh.glsl
index 746e811f0..607ad08d2 100644
--- a/libs/shaders/GL/user_mark_billboard.vsh.glsl
+++ b/libs/shaders/GL/user_mark_billboard.vsh.glsl
@@ -1,22 +1,28 @@
-in vec3 a_position;
-in vec3 a_normalAndAnimateOrZ;
-in vec4 a_texCoords;
-in vec4 a_color;
+layout (location = 0) in vec3 a_position;
+layout (location = 1) in vec3 a_normalAndAnimateOrZ;
+layout (location = 2) in vec4 a_texCoords;
+layout (location = 3) in vec4 a_color;
 
-uniform mat4 u_modelView;
-uniform mat4 u_projection;
-uniform mat4 u_pivotTransform;
-uniform float u_interpolation;
+layout (location = 0) out vec4 v_texCoords;
+layout (location = 1) out vec4 v_maskColor;
 
-out vec4 v_texCoords;
-out vec4 v_maskColor;
+layout (binding = 0) uniform UBO
+{
+  mat4 u_modelView;
+  mat4 u_projection;
+  mat4 u_pivotTransform;
+  vec2 u_contrastGamma;
+  float u_opacity;
+  float u_zScale;
+  float u_interpolation;
+  float u_isOutlinePass;
+};
 
 void main()
 {
   vec2 normal = a_normalAndAnimateOrZ.xy;
   if (a_normalAndAnimateOrZ.z > 0.0)
     normal = u_interpolation * normal;
-
   vec4 pivot = vec4(a_position, 1.0) * u_modelView;
   vec4 offset = vec4(normal, 0.0, 0.0) * u_projection;
   vec4 projectedPivot = pivot * u_projection;
diff --git a/libs/shaders/Metal/map.metal b/libs/shaders/Metal/map.metal
index ec5698d69..7e7d27db6 100644
--- a/libs/shaders/Metal/map.metal
+++ b/libs/shaders/Metal/map.metal
@@ -8,11 +8,11 @@ typedef struct
   float4x4 u_modelView;
   float4x4 u_projection;
   float4x4 u_pivotTransform;
+  packed_float2 u_contrastGamma;
   float u_opacity;
   float u_zScale;
   float u_interpolation;
   float u_isOutlinePass;
-  packed_float2 u_contrastGamma;
 } Uniforms_T;
 
 // Area/AreaOutline
diff --git a/libs/shaders/Metal/route.metal b/libs/shaders/Metal/route.metal
index 39e0a0f41..8d5681aa4 100644
--- a/libs/shaders/Metal/route.metal
+++ b/libs/shaders/Metal/route.metal
@@ -12,13 +12,13 @@ typedef struct
   float4 u_color;
   float4 u_maskColor;
   float4 u_outlineColor;
+  float4 u_fakeColor;
+  float4 u_fakeOutlineColor;
+  packed_float2 u_fakeBorders;
   packed_float2 u_pattern;
   packed_float2 u_angleCosSin;
   float u_arrowHalfWidth;
   float u_opacity;
-  packed_float2 u_fakeBorders;
-  float4 u_fakeColor;
-  float4 u_fakeOutlineColor;
 } Uniforms_T;
 
 // Route/RouteDash
diff --git a/libs/shaders/Metal/shapes.metal b/libs/shaders/Metal/shapes.metal
index 322f58c62..9b3cba892 100644
--- a/libs/shaders/Metal/shapes.metal
+++ b/libs/shaders/Metal/shapes.metal
@@ -10,8 +10,9 @@ typedef struct
   float4x4 u_projection;
   float4x4 u_pivotTransform;
   packed_float3 u_position;
-  float u_accuracy;
+  float u_dummy1;
   packed_float2 u_lineParams;
+  float u_accuracy;
   float u_zScale;
   float u_opacity;
   float u_azimut;
diff --git a/libs/shaders/Metal/traffic.metal b/libs/shaders/Metal/traffic.metal
index 2196c154b..0ce95d998 100644
--- a/libs/shaders/Metal/traffic.metal
+++ b/libs/shaders/Metal/traffic.metal
@@ -10,10 +10,13 @@ typedef struct
   float4x4 u_pivotTransform;
   float4 u_trafficParams;
   packed_float3 u_outlineColor;
-  float u_outline;
+  float u_dummy1; // alignment
   packed_float3 u_lightArrowColor;
-  float u_opacity;
+  float u_dummy2; // alignment
   packed_float3 u_darkArrowColor;
+  float u_dummy3; // alignment
+  float u_outline;
+  float u_opacity;
 } Uniforms_T;
 
 // Traffic
diff --git a/libs/shaders/Metal/transit.metal b/libs/shaders/Metal/transit.metal
index 602be7f70..c8c8f74b5 100644
--- a/libs/shaders/Metal/transit.metal
+++ b/libs/shaders/Metal/transit.metal
@@ -9,6 +9,7 @@ typedef struct
   float4x4 u_projection;
   float4x4 u_pivotTransform;
   packed_float3 u_params;
+  float u_dummy1;
   float u_lineHalfWidth;
   float u_maxRadius;
 } Uniforms_T;
diff --git a/libs/shaders/gl_program_params.cpp b/libs/shaders/gl_program_params.cpp
index cf372db3e..e524908ba 100644
--- a/libs/shaders/gl_program_params.cpp
+++ b/libs/shaders/gl_program_params.cpp
@@ -46,12 +46,12 @@ template <typename ParamType> class GLTypeWrapper;
 
 BIND_GL_TYPE(float, gl_const::GLFloatType)
 BIND_GL_TYPE(glsl::vec2, gl_const::GLFloatVec2)
-BIND_GL_TYPE(glsl::vec3, gl_const::GLFloatVec3)
+BIND_GL_TYPE(glsl::vec3, gl_const::GLFloatVec4)
 BIND_GL_TYPE(glsl::vec4, gl_const::GLFloatVec4)
 BIND_GL_TYPE(glsl::mat4, gl_const::GLFloatMat4)
 BIND_GL_TYPE(int, gl_const::GLIntType)
 BIND_GL_TYPE(glsl::ivec2, gl_const::GLIntVec2)
-BIND_GL_TYPE(glsl::ivec3, gl_const::GLIntVec3)
+BIND_GL_TYPE(glsl::ivec3, gl_const::GLIntVec4)
 BIND_GL_TYPE(glsl::ivec4, gl_const::GLIntVec4)
 
 class Parameter
diff --git a/libs/shaders/gl_shaders_preprocessor.py b/libs/shaders/gl_shaders_preprocessor.py
index 8e7073068..b30c197e3 100755
--- a/libs/shaders/gl_shaders_preprocessor.py
+++ b/libs/shaders/gl_shaders_preprocessor.py
@@ -11,6 +11,9 @@ HIGHP_SEARCH = "highp"
 VERTEX_SHADER_EXT = ".vsh.glsl"
 FRAG_SHADER_EXT = ".fsh.glsl"
 
+UBO_KEY = "UBO"
+UNIFORMS_KEY = "Uniforms"
+
 SHADERS_LIB_COMMON_PATTERN = "// Common"
 SHADERS_LIB_VS_PATTERN = "// VS"
 SHADERS_LIB_FS_PATTERN = "// FS"
@@ -125,7 +128,7 @@ def write_definition_file(defines_file, generation_dir):
         output_file.write("{\n")
         output_file.write("extern char const * GL3_SHADER_VERSION;\n")
         output_file.write("extern char const * GLES3_SHADER_VERSION;\n\n")
-        output_file.write("extern GLProgramInfo GetProgramInfo(dp::ApiVersion apiVersion, Program program);\n")
+        output_file.write("extern GLProgramInfo const & GetProgramInfo(dp::ApiVersion apiVersion, Program program);\n")
         output_file.write("}  // namespace gpu\n")
 
     if not os.path.isfile(defines_file) or not filecmp.cmp(defines_file, defines_file_tmp, False):
@@ -162,57 +165,146 @@ def get_shaders_lib_content(shader_file, shaders_library):
     return lib_content
 
 
-def write_shader_line(output_file, line):
+def write_shader_line(output_file, line, shader_file, binding_info):
     if line.lstrip().startswith("//") or line == '\n' or len(line) == 0:
-        return
+        return False
 
     if line.find(LOWP_SEARCH) >= 0:
-        print("Incorrect shader. Do not use lowp in shader, use LOW_P instead.")
+        print(f"Incorrect shader {shader_file}. Do not use lowp in shader, use LOW_P instead.")
         exit(2)
     if line.find(MEDIUMP_SEARCH) >= 0:
-        print("Incorrect shader. Do not use mediump in shader, use MEDIUM_P instead.")
+        print(f"Incorrect shader {shader_file}. Do not use mediump in shader, use MEDIUM_P instead.")
         exit(2)
     if line.find(HIGHP_SEARCH) >= 0:
-        print("Incorrect shader. Do not use highp in shader, use HIGH_P instead.")
+        print(f"Incorrect shader {shader_file}. Do not use highp in shader, use HIGH_P instead.")
         exit(2)
 
     output_line = line.rstrip()
-    output_file.write("  %s \\n\\\n" % output_line)
+    
+    # Extract and remove layout binding
+    binding_match = re.search(r"layout\s*\(\s*binding\s*=\s*(\d+)\s*\)", output_line)
+    if binding_match:
+        binding_index = int(binding_match.group(1))
+        # Remove the matched layout part from the string
+        output_line = re.sub(r"layout\s*\(\s*binding\s*=\s*\d+\s*\)\s*", "", output_line)
+    else:
+        binding_index = None
+        
+    # Remove lauout(location = X) part. Mali compiler may not support it.
+    output_line = re.sub(r"layout\s*\(\s*location\s*=\s*\d+\s*\)\s*", "", output_line)
+
+    # Extract sampler name
+    sampler_match = re.search(r"sampler2D\s+(\w+)", output_line)
+    sampler_name = sampler_match.group(1) if sampler_match else None
+    
+    if binding_index is None and sampler_name is not None:
+        print(f"Incorrect shader {shader_file}. Sampler must have binding index")
+        exit(2)
+    
+    ubo_started = False    
+    if line.find("uniform UBO") >= 0:
+        if binding_index is not None:
+            binding_info[shader_file].append({UBO_KEY: binding_index})
+            ubo_started = True
+        else:
+            print(f"Incorrect shader {shader_file}. Uniform block must have binding index")
+            exit(2)
+        
+    if binding_index and sampler_name:
+        binding_info[shader_file].append({sampler_name: binding_index})
+    
+    if not ubo_started:    
+        output_file.write("  %s \\n\\\n" % output_line)
+        
+    return ubo_started
 
 
-def write_shader_body(output_file, shader_file, shader_dir, shaders_library):
+def find_by_name_in_list(lst, name):
+    return next((item[name] for item in lst if name in item), None)
+
+
+def write_uniform_shader_line(output_file, line, shader_file, binding_info):
+    if line.lstrip().startswith("//") or line == '\n' or len(line) == 0:
+        return False
+    output_line = line.lstrip().rstrip()
+    if output_line.find("};") >= 0:
+        return True
+    if output_line.find("{") >= 0:
+        return False
+    if output_line.find(",") >= 0 or output_line.count("u_") > 1:
+        print(f"Incorrect shader {shader_file}. Only one uniform per line")
+        exit(2)
+        
+    find_by_name_in_list(binding_info[shader_file], UNIFORMS_KEY).append(output_line)
+        
+    output_file.write("  uniform %s \\n\\\n" % output_line)
+    return False
+
+
+def write_shader_body(output_file, shader_file, shader_dir, shaders_library, binding_info):
     lib_content = get_shaders_lib_content(shader_file, shaders_library)
+    ubo_started = False
     for line in open(os.path.join(shader_dir, shader_file)):
+        if ubo_started:
+            if write_uniform_shader_line(output_file, line, shader_file, binding_info):
+                ubo_started = False
+            continue
         if line.lstrip().startswith("void main"):
             for lib_line in lib_content.splitlines():
-                write_shader_line(output_file, lib_line)
-        write_shader_line(output_file, line)
+                write_shader_line(output_file, lib_line, shader_file, binding_info)
+        ubo_started = write_shader_line(output_file, line, shader_file, binding_info)
+        if ubo_started:
+            binding_info[shader_file].append({UNIFORMS_KEY: []})
+    
     output_file.write("\";\n\n")
 
 
-def write_shader(output_file, shader_file, shader_dir, shaders_library):
+def write_shader(output_file, shader_file, shader_dir, shaders_library, binding_info):
     output_file.write("char const %s[] = \" \\\n" % format_shader_source_name(shader_file))
     write_shader_gles_header(output_file)
-    write_shader_body(output_file, shader_file, shader_dir, shaders_library)
+    write_shader_body(output_file, shader_file, shader_dir, shaders_library, binding_info)
 
 
-def write_gpu_programs_map(file, programs_def):
+def write_gpu_programs_map(file, programs_def, binding_info):
     for program in programs_def.keys():
         vertex_shader = programs_def[program][0]
         vertex_source_name = format_shader_source_name(vertex_shader)
 
         fragment_shader = programs_def[program][1]
         fragment_source_name = format_shader_source_name(fragment_shader)
+        
+        check_bindings(vertex_shader, fragment_shader, binding_info[vertex_shader], binding_info[fragment_shader])
 
         file.write("    GLProgramInfo(\"%s\", \"%s\", %s, %s),\n" % (
             vertex_source_name, fragment_source_name, vertex_source_name, fragment_source_name))
 
 
+def check_bindings(vs, fs, vs_bindings, fs_bindings):
+    dict1 = {k: v for d in vs_bindings for k, v in d.items()}
+    dict2 = {k: v for d in fs_bindings for k, v in d.items()}
+    if UBO_KEY in dict1 and UBO_KEY in dict2:
+        if dict1[UBO_KEY] != dict2[UBO_KEY]:
+            print(f"Shaders {vs} and {fs} must use the same binding indexes for the UBO. VS:{dict1[UBO_KEY]}, FS:{dict2[UBO_KEY]}")
+            exit(2)
+    if UNIFORMS_KEY in dict1 and UNIFORMS_KEY in dict2:
+        if dict1[UNIFORMS_KEY] != dict2[UNIFORMS_KEY]:
+            print(f"Shaders {vs} and {fs} must use the same unforms inside the UBO. VS:{dict1[UNIFORMS_KEY]}, FS:{dict2[UNIFORMS_KEY]}")
+            exit(2)
+    common_keys = dict1.keys() & dict2.keys()
+    for key in common_keys:
+        if key == UBO_KEY or key == UNIFORMS_KEY:
+            continue
+        if dict1[key] != dict2[key]:
+            print(f"Shaders {vs} and {fs} must use the same binding indexes for textures. VS:{dict1[key]}, FS:{dict2[key]}")
+            exit(2)
+    
+            
 def write_implementation_file(programs_def, shader_index, shader_dir, impl_file, def_file, generation_dir,
                               shaders_library):
     impl_file = os.path.join(generation_dir, impl_file)
     # Write to temporary file first, and then compare if its content has changed to avoid unnecessary code rebuilds.
     impl_file_tmp = impl_file + ".tmp"
+    binding_info = dict()
     with open(impl_file_tmp, 'w') as file:
         file.write("#include \"shaders/%s\"\n\n" % (def_file))
         file.write("#include \"base/assert.hpp\"\n\n")
@@ -221,22 +313,27 @@ def write_implementation_file(programs_def, shader_index, shader_dir, impl_file,
 
         file.write("namespace gpu\n")
         file.write("{\n")
-        file.write("char const * GL3_SHADER_VERSION = \"#version 150 core \\n\";\n")
+        file.write("#if defined(OMIM_OS_LINUX)\n")
+        file.write("  char const * GL3_SHADER_VERSION = \"#version 310 es \\n\";\n")
+        file.write("#else\n")
+        file.write("  char const * GL3_SHADER_VERSION = \"#version 410 core \\n\";\n")
+        file.write("#endif\n")
         file.write("char const * GLES3_SHADER_VERSION = \"#version 300 es \\n\";\n\n")
 
         for shader in shader_index.keys():
-            write_shader(file, shader, shader_dir, shaders_library)
+            binding_info[shader] = []
+            write_shader(file, shader, shader_dir, shaders_library, binding_info)
 
-        file.write("GLProgramInfo GetProgramInfo(dp::ApiVersion apiVersion, Program program)\n")
+        file.write("GLProgramInfo const & GetProgramInfo(dp::ApiVersion apiVersion, Program program)\n")
         file.write("{\n")
         file.write("  CHECK_EQUAL(apiVersion, dp::ApiVersion::OpenGLES3, ());\n")
         file.write("  static std::array<GLProgramInfo, static_cast<size_t>(Program::ProgramsCount)> gpuIndex = {{\n")
-        write_gpu_programs_map(file, programs_def)
+        write_gpu_programs_map(file, programs_def, binding_info)
         file.write("  }};\n")
         file.write("  return gpuIndex[static_cast<size_t>(program)];\n")
         file.write("}\n")
         file.write("}  // namespace gpu\n")
-
+    
     if not os.path.isfile(impl_file) or not filecmp.cmp(impl_file, impl_file_tmp, False):
         os.replace(impl_file_tmp, impl_file)
         print(impl_file + " was replaced")
@@ -260,13 +357,13 @@ if __name__ == '__main__':
     shaders = [file for file in os.listdir(shader_dir) if
                os.path.isfile(os.path.join(shader_dir, file)) and (
                    file.endswith(VERTEX_SHADER_EXT) or file.endswith(FRAG_SHADER_EXT))]
-    shaderIndex = generate_shader_indexes(shaders)
+    shader_index = generate_shader_indexes(shaders)
 
     programs_order = read_programs_file(os.path.join(shader_dir, '..', programs_file_name))
-    programDefinition = read_index_file(os.path.join(shader_dir, index_file_name), programs_order)
+    program_definition = read_index_file(os.path.join(shader_dir, index_file_name), programs_order)
 
     shaders_library = read_shaders_lib_file(os.path.join(shader_dir, shaders_lib_file))
 
     write_definition_file(defines_file, generation_dir)
-    write_implementation_file(programDefinition, shaderIndex, shader_dir, impl_file, defines_file, generation_dir,
+    write_implementation_file(program_definition, shader_index, shader_dir, impl_file, defines_file, generation_dir,
                               shaders_library)
diff --git a/libs/shaders/program_params.hpp b/libs/shaders/program_params.hpp
index fa17305b7..f8ffa5d43 100644
--- a/libs/shaders/program_params.hpp
+++ b/libs/shaders/program_params.hpp
@@ -48,17 +48,22 @@ private:
 
 #define ALIGNMENT alignas(16)
 
+// NOTE: structs may contain dummy elements to fit MSL and GLSL struct alignment rules
+// 1. Add new fields in order from the highest byte size to the lowest, it minimizes alignment overhead
+// 2. Keep 16 bytes alignment for the whole struct, it complements the size of the latest element to vec4
+// 3. Consider vec3 as vec4, add float complement and don't reuse it
+
 struct ALIGNMENT MapProgramParams
 {
   glsl::mat4 m_modelView;
   glsl::mat4 m_projection;
   glsl::mat4 m_pivotTransform;
+  glsl::vec2 m_contrastGamma;
   float m_opacity = 1.0f;
   float m_zScale = 1.0f;
   float m_interpolation = 1.0f;
   float m_isOutlinePass = 1.0f;
-  glsl::vec2 m_contrastGamma;
-
+  
   BIND_PROGRAMS(MapProgramParams,
     Program::Area,
     Program::Area3d,
@@ -100,14 +105,14 @@ struct ALIGNMENT RouteProgramParams
   glsl::vec4 m_color;
   glsl::vec4 m_maskColor;
   glsl::vec4 m_outlineColor;
+  glsl::vec4 m_fakeColor;
+  glsl::vec4 m_fakeOutlineColor;
+  glsl::vec2 m_fakeBorders;
   glsl::vec2 m_pattern;
   glsl::vec2 m_angleCosSin;
   float m_arrowHalfWidth = 0.0f;
   float m_opacity = 1.0f;
-  glsl::vec2 m_fakeBorders;
-  glsl::vec4 m_fakeColor;
-  glsl::vec4 m_fakeOutlineColor;
-
+  
   BIND_PROGRAMS(RouteProgramParams,
     Program::Route,
     Program::RouteDash,
@@ -122,10 +127,13 @@ struct ALIGNMENT TrafficProgramParams
   glsl::mat4 m_pivotTransform;
   glsl::vec4 m_trafficParams;
   glsl::vec3 m_outlineColor;
-  float m_outline = 0.0f;
+  float m_dummy1; // alignment
   glsl::vec3 m_lightArrowColor;
-  float m_opacity = 1.0f;
+  float m_dummy2; // alignment
   glsl::vec3 m_darkArrowColor;
+  float m_dummy3; // alignment
+  float m_outline = 0.0f;
+  float m_opacity = 1.0f;
 
   BIND_PROGRAMS(TrafficProgramParams,
     Program::Traffic,
@@ -139,6 +147,7 @@ struct ALIGNMENT TransitProgramParams
   glsl::mat4 m_projection;
   glsl::mat4 m_pivotTransform;
   glsl::vec3 m_params;
+  float m_dummy1; // alignment
   float m_lineHalfWidth = 0.0f;
   float m_maxRadius = 0.0f;
 
@@ -171,8 +180,9 @@ struct ALIGNMENT ShapesProgramParams
   glsl::mat4 m_projection;
   glsl::mat4 m_pivotTransform;
   glsl::vec3 m_position;
-  float m_accuracy = 0.0;
+  float m_dummy1; // alignment
   glsl::vec2 m_lineParams;
+  float m_accuracy = 0.0;
   float m_zScale = 1.0f;
   float m_opacity = 1.0f;
   float m_azimut = 0.0;
diff --git a/libs/shaders/vulkan_shaders_preprocessor.py b/libs/shaders/vulkan_shaders_preprocessor.py
index 5c4e164d0..aff77e02b 100644
--- a/libs/shaders/vulkan_shaders_preprocessor.py
+++ b/libs/shaders/vulkan_shaders_preprocessor.py
@@ -16,8 +16,6 @@ SHADERS_LIB_COMMON_INDEX = 0
 SHADERS_LIB_VS_INDEX = 1
 SHADERS_LIB_FS_INDEX = 2
 
-IN = 'in'
-OUT = 'out'
 UNIFORMS = 'uniforms'
 SAMPLERS = 'samplers'
 
@@ -25,7 +23,7 @@ debug_output = False
 
 
 # Read index file which contains program to shaders bindings.
-def read_index_file(file_path, programs_order):
+def read_index_file(file_path):
     gpu_programs = dict()
     with open(file_path, 'r') as f:
         index = 0
@@ -35,10 +33,6 @@ def read_index_file(file_path, programs_order):
                 print('Incorrect GPU program definition : ' + line)
                 exit(1)
 
-            if line_parts[0] != programs_order[index]:
-                print('Incorrect GPU program order or name : ' + line)
-                exit(1)
-
             vertex_shader = next(f for f in line_parts if f.endswith(VERTEX_SHADER_EXT))
             fragment_shader = next(f for f in line_parts if f.endswith(FRAG_SHADER_EXT))
 
@@ -64,76 +58,6 @@ def read_index_file(file_path, programs_order):
     return gpu_programs_cache
 
 
-# Read hpp-file with programs enumeration.
-def read_programs_file(file_path):
-    gpu_programs = []
-    with open(file_path, 'r') as f:
-        found = False
-        for line in f:
-            if not found and line.find('enum class Program') >= 0:
-                found = True
-                continue
-            if found and line.find('}') >= 0:
-                break
-            if found and line.find('{') == -1:
-                line_parts = re.split(',|=', line)
-                name = line_parts[0].strip()
-                if name and name != 'ProgramsCount':
-                    gpu_programs.append(name)
-    return gpu_programs
-
-
-def drop_variable_initialization(line):
-    equal_found = line.find('=')
-    if equal_found:
-        return line[:equal_found - 1]
-    return line.replace(';', '')
-
-
-def get_program_param(line):
-    glsl_found = line.find('glsl::')
-    if glsl_found >= 0:
-        return drop_variable_initialization(line[glsl_found + 6:].replace('m_', 'u_'))
-    if line.find('float ') >= 0 or line.find('int ') >= 0:
-        return drop_variable_initialization(line.lstrip().replace('m_', 'u_'))
-    return None
-
-
-def get_program(line):
-    program_found = line.find('Program::')
-    if program_found >= 0:
-        return line[program_found + 9:].replace(',', '').replace(')', '').replace('\n', '')
-    return None
-
-
-# Read hpp-file with program parameters declaration.
-def read_program_params_file(file_path):
-    program_params = []
-    programs = []
-    result = dict()
-    with open(file_path, 'r') as f:
-        block_found = False
-        for line in f:
-            if line.find('struct') >= 0 and line.find('ProgramParams') >= 0:
-                block_found = True
-                program_params = []
-                programs = []
-                continue
-            if block_found and line.find('}') >= 0:
-                block_found = False
-                for p in programs:
-                    result[p] = program_params
-                continue
-            if block_found:
-                param = get_program_param(line)
-                if param:
-                    program_params.append(param.split(' '))
-                program = get_program(line)
-                if program:
-                    programs.append(program)
-    return result
-
-
 # Read GLSL-file with common shader functions.
 def read_shaders_lib_file(file_path):
     shaders_library = ['', '', '']
@@ -174,112 +98,43 @@ def get_shaders_lib_content(shader_file, shaders_library):
     return lib_content
 
 
-def get_shader_line(line, layout_counters, is_fragment_shader):
+def get_shader_line(line, layout_counters):
     if line.lstrip().startswith('//') or line == '\n' or len(line) == 0:
         return None
 
     output_line = line.rstrip()
 
-    if output_line.find('uniform ') >= 0:
+    if output_line.find('layout (binding') >= 0:
         if output_line.find('sampler') >= 0:
-            layout_counters[SAMPLERS][1].append(output_line)
+            match = re.search(r"binding\s*=\s*(\d+)", output_line)
+            sampler_match = re.search(r"sampler2D\s+(\w+)", output_line)
+            if match and sampler_match:
+                binding_index = int(match.group(1))
+                sampler_name = sampler_match.group(1)
+                if binding_index == 0:
+                    print('Binding index must not be 0 for sampler in the line: ' + line)
+                    exit(1)
+                layout_counters[SAMPLERS][sampler_name] = binding_index
+            else:
+                print('Sampler name or binding index is not found in the line: ' + line)
+                exit(1)
         else:
+            match = re.search(r"binding\s*=\s*(\d+)", output_line)
+            if match:
+                binding_index = int(match.group(1))
+                if binding_index != 0:
+                    print('Binding index must be 0 in the line: ' + line)
+                    exit(1)
+            else:
+                print('Binding index is not found in the line: ' + line)
+                exit(1)
             layout_counters[UNIFORMS] += 1
-        return None
 
-    if output_line.find('attribute ') >= 0:
-        location = layout_counters[IN]
-        layout_counters[IN] += 1
-        output_line = output_line.replace('attribute', 'layout (location = {0}) in'.format(location))
-
-    if output_line.find('varying ') >= 0:
-        if is_fragment_shader:
-            location = layout_counters[IN]
-            layout_counters[IN] += 1
-            output_line = output_line.replace('varying', 'layout (location = {0}) in'.format(location))
-        else:
-            location = layout_counters[OUT]
-            layout_counters[OUT] += 1
-            output_line = output_line.replace('varying', 'layout (location = {0}) out'.format(location))
-    output_line = output_line.replace('texture2D', 'texture')
-    output_line = output_line.replace('gl_FragColor', 'v_FragColor')
     return output_line
 
 
-def get_size_by_type(type):
-    if type == 'float' or type == 'int':
-        return 1
-    if type == 'vec2':
-        return 2
-    if type == 'vec3':
-        return 3
-    if type == 'vec4':
-        return 4
-    if type == 'mat4':
-        return 16
-    print('Type is not supported' + type)
-    exit(1)
-
-
-def get_subscript(offset, param):
-    symbols = ['x', 'y', 'z', 'w']
-    subscript = ''
-    for i in range(0, get_size_by_type(param[0])):
-        subscript += symbols[offset + i]
-    return subscript
-
-
-def write_uniform_block(output_file, program_params):
-    groups = []
-    c = 0
-    group_index = 0
-    group_params = []
-    for p in program_params:
-        sz = get_size_by_type(p[0])
-        if sz % 4 == 0:
-            groups.append((p[0], p[1], [p]))
-        else:
-            if c + sz < 4:
-                group_params.append(p)
-                c += sz
-            elif c + sz == 4:
-                group_params.append(p)
-                groups.append(('vec4', 'u_grouped{0}'.format(group_index), group_params))
-                group_index += 1
-                group_params = []
-                c = 0
-            else:
-                print('Must be possible to unite sequential variables to vec4')
-                exit(1)
-    if c != 0:
-        groups.append(('vec4', 'u_grouped{0}'.format(group_index), group_params))
-
-    output_file.write('layout (binding = 0) uniform UBO\n')
-    output_file.write('{\n')
-    for g in groups:
-        output_file.write('  {0} {1};\n'.format(g[0], g[1]))
-    output_file.write('} uniforms;\n')
-    for k in groups:
-        name = k[1]
-        params = k[2]
-        offset = 0
-        if len(params) == 1 and get_size_by_type(params[0][0]) % 4 == 0:
-            output_file.write('#define {0} uniforms.{1}\n'.format(params[0][1], name))
-            continue
-        for param in params:
-            output_file.write('#define {0} uniforms.{1}.{2}\n'.format(param[1], name, get_subscript(offset, param)))
-            offset += get_size_by_type(param[0])
-
-
-def get_size_of_attributes_block(lines_before_main):
-    for i, line in reversed(list(enumerate(lines_before_main))):
-        if line.find('layout (location') >= 0:
-            return i + 1
-    return len(lines_before_main)
-
-
 def generate_spirv_compatible_glsl_shader(output_file, shader_file, shader_dir, shaders_library,
-                                          program_params, layout_counters, reflection_dict):
+                                          layout_counters, reflection_dict):
     output_file.write('#version 310 es\n')
     output_file.write('precision highp float;\n')
     output_file.write('#define LOW_P lowp\n')
@@ -290,8 +145,6 @@ def generate_spirv_compatible_glsl_shader(output_file, shader_file, shader_dir,
     lib_content = get_shaders_lib_content(shader_file, shaders_library)
     conditional_started = False
     conditional_skip = False
-    lines_before_main = []
-    main_found = False
     for line in open(os.path.join(shader_dir, shader_file)):
         # Remove some useless conditional compilation.
         if conditional_started and line.lstrip().startswith('#else'):
@@ -303,67 +156,40 @@ def generate_spirv_compatible_glsl_shader(output_file, shader_file, shader_dir,
             continue
         if conditional_skip:
             continue
-        if line.lstrip().startswith('#ifdef ENABLE_VTF') or line.lstrip().startswith('#ifdef GLES3'):
+        if line.lstrip().startswith('#ifdef ENABLE_VTF'):
             conditional_started = True
             continue
 
         if line.lstrip().startswith('void main'):
-            main_found = True
-
-            # Write attributes.
-            sz = get_size_of_attributes_block(lines_before_main)
-            for i in range(0, sz):
-                output_file.write('%s\n' % lines_before_main[i])
-
-            if is_fragment_shader:
-                output_file.write('layout (location = 0) out vec4 v_FragColor;\n')
-
-            # Write uniforms block.
+            # Write reflection for uniforms block.
             uniforms_index = 'vs_uni';
             if is_fragment_shader:
                 uniforms_index = 'fs_uni'
             if layout_counters[UNIFORMS] > 0:
-                write_uniform_block(output_file, program_params)
                 reflection_dict[uniforms_index] = 0
             else:
                 reflection_dict[uniforms_index] = -1
 
-            # Write samplers.
+            # Write reflection for samplers.
             sample_index = 'tex'
-            samplers_offset = layout_counters[SAMPLERS][0]
-            if layout_counters[UNIFORMS] > 0 and samplers_offset == 0:
-                samplers_offset = 1
-            for idx, s in enumerate(layout_counters[SAMPLERS][1]):
-                output_file.write('layout (binding = {0}) {1}\n'.format(samplers_offset + idx, s))
-                sampler = {'name': s[s.find('u_'):-1], 'idx': samplers_offset + idx, 'frag':int(is_fragment_shader)}
-                if not sample_index in reflection_dict:
-                    reflection_dict[sample_index] = [sampler]
-                else:
-                    reflection_dict[sample_index].append(sampler)
-            layout_counters[SAMPLERS][0] = samplers_offset + len(layout_counters[SAMPLERS][1])
-            layout_counters[SAMPLERS][1] = []
+            if not sample_index in reflection_dict:
+                reflection_dict[sample_index] = []
+            for (s, idx) in layout_counters[SAMPLERS].items():
+                sampler = {'name': s, 'idx': idx, 'frag':int(is_fragment_shader)}
+                reflection_dict[sample_index].append(sampler)
 
             # Write shaders library.
             for lib_line in lib_content.splitlines():
-                shader_line = get_shader_line(lib_line, layout_counters, is_fragment_shader)
+                shader_line = get_shader_line(lib_line, layout_counters)
                 if shader_line:
                     output_file.write('%s\n' % shader_line)
 
-            # Write rest lines.
-            for i in range(sz, len(lines_before_main)):
-                output_file.write('%s\n' % lines_before_main[i])
-
-        shader_line = get_shader_line(line, layout_counters, is_fragment_shader)
-        if not shader_line:
-            continue
-
-        if main_found:
+        shader_line = get_shader_line(line, layout_counters)
+        if shader_line:
             output_file.write('%s\n' % shader_line)
-        else:
-            lines_before_main.append(shader_line)
-    layout_counters[IN] = 0
-    layout_counters[OUT] = 0
+
     layout_counters[UNIFORMS] = 0
+    layout_counters[SAMPLERS] = dict()
 
 
 # Execute external program.
@@ -377,12 +203,12 @@ def execute_external(options):
 
 
 # Generate SPIR-V shader from GLSL source.
-def generate_shader(shader, shader_dir, generation_dir, shaders_library, program_name, program_params,
+def generate_shader(shader, shader_dir, generation_dir, shaders_library, program_name,
                     layout_counters, output_name, reflection_dict, glslc_path):
     output_path = os.path.join(generation_dir, output_name)
     with open(output_path, 'w') as file:
         generate_spirv_compatible_glsl_shader(file, shader, shader_dir, shaders_library,
-                                              program_params, layout_counters, reflection_dict)
+                                              layout_counters, reflection_dict)
     spv_path = output_path + '.spv'
     try:
         execute_external([glslc_path, '-c', output_path, '-o', spv_path, '-std=310es', '--target-env=vulkan'])
@@ -402,21 +228,6 @@ def generate_shader(shader, shader_dir, generation_dir, shaders_library, program
     return spv_path
 
 
-# Check if varying are in the same order in vertex and fragment shaders.
-def check_varying_consistency(vs_file_name, fs_file_name):
-    vs_varyings = []
-    for line in open(vs_file_name):
-        line = line.lstrip().rstrip()
-        if line.startswith('varying '):
-            vs_varyings.append(line)
-    fs_varyings = []
-    for line in open(fs_file_name):
-        line = line.lstrip().rstrip()
-        if line.startswith('varying '):
-            fs_varyings.append(line)
-    return vs_varyings == fs_varyings
-
-
 def write_shader_to_pack(pack_file, shader_file_name):
     offset = pack_file.tell()
     with open(shader_file_name, 'rb') as shader_file:
@@ -427,48 +238,38 @@ def write_shader_to_pack(pack_file, shader_file_name):
 
 if __name__ == '__main__':
     if len(sys.argv) < 7:
-        print('Usage : ' + sys.argv[0] + ' <shader_dir> <index_file> <programs_file> <program_params_file> <shaders_lib> <generation_dir> <glslc_path> [--debug]')
+        print('Usage : ' + sys.argv[0] + ' <shader_dir> <index_file> <shaders_lib> <generation_dir> <glslc_path> [--debug]')
         exit(1)
 
     shader_dir = sys.argv[1]
     index_file_name = sys.argv[2]
-    programs_file_name = sys.argv[3]
-    program_params_file_name = sys.argv[4]
-    shaders_lib_file = sys.argv[5]
-    generation_dir = sys.argv[6]
-    glslc_path = sys.argv[7]
+    shaders_lib_file = sys.argv[3]
+    generation_dir = sys.argv[4]
+    glslc_path = sys.argv[5]
 
-    if len(sys.argv) >= 9:
-        debug_output = (sys.argv[8] == '--debug')
+    if len(sys.argv) >= 7:
+        debug_output = (sys.argv[6] == '--debug')
 
     shaders = [file for file in os.listdir(shader_dir) if
                os.path.isfile(os.path.join(shader_dir, file)) and (
                    file.endswith(VERTEX_SHADER_EXT) or file.endswith(FRAG_SHADER_EXT))]
 
-    programs_order = read_programs_file(os.path.join(shader_dir, '..', programs_file_name))
-    program_params = read_program_params_file(os.path.join(shader_dir, '..', program_params_file_name))
-    gpu_programs_cache = read_index_file(os.path.join(shader_dir, index_file_name), programs_order)
+    gpu_programs_cache = read_index_file(os.path.join(shader_dir, index_file_name))
     shaders_library = read_shaders_lib_file(os.path.join(shader_dir, shaders_lib_file))
     reflection = []
     current_offset = 0
     with open(os.path.join(generation_dir, 'shaders_pack.spv'), 'wb') as pack_file:
         for (k, v) in gpu_programs_cache.items():
-            if not k in program_params:
-                print('Program params were not found for the shader ' + k)
-                exit(1)
-            if not check_varying_consistency(os.path.join(shader_dir, v[0]), os.path.join(shader_dir, v[1])):
-                print('Varyings must be in the same order in VS and FS. Shaders: {0}, {1} / Program: {2}.'.format(v[0], v[1], k))
-                exit(1)
-            layout_counters = {IN: 0, OUT: 0, UNIFORMS: 0, SAMPLERS: [0, list()]}
+            layout_counters = {UNIFORMS: 0, SAMPLERS: dict()}
             reflection_dict = {'prg': v[2], 'info': dict()}
             vs_offset = write_shader_to_pack(pack_file, generate_shader(v[0], shader_dir, generation_dir,
-                                                                        shaders_library, k, program_params[k],
+                                                                        shaders_library, k,
                                                                         layout_counters, k + VERTEX_SHADER_EXT_OUT,
                                                                         reflection_dict['info'], glslc_path))
             reflection_dict['vs_off'] = vs_offset[0]
             reflection_dict['vs_size'] = vs_offset[1]
             fs_offset = write_shader_to_pack(pack_file, generate_shader(v[1], shader_dir, generation_dir,
-                                                                        shaders_library, k, program_params[k],
+                                                                        shaders_library, k,
                                                                         layout_counters, k + FRAG_SHADER_EXT_OUT,
                                                                         reflection_dict['info'], glslc_path))
             reflection_dict['fs_off'] = fs_offset[0]
diff --git a/tools/unix/generate_vulkan_shaders.sh b/tools/unix/generate_vulkan_shaders.sh
index 159af305b..70f9d64c4 100755
--- a/tools/unix/generate_vulkan_shaders.sh
+++ b/tools/unix/generate_vulkan_shaders.sh
@@ -29,4 +29,4 @@ fi
 OMIM_PATH="${OMIM_PATH:-$(cd "$(dirname "$0")/../.."; pwd)}"
 SHADERS_GENERATOR="$OMIM_PATH/shaders/vulkan_shaders_preprocessor.py"
 
-python3 "$SHADERS_GENERATOR" "$OMIM_PATH/shaders/GL" shader_index.txt programs.hpp program_params.hpp shaders_lib.glsl "$OMIM_PATH/data/vulkan_shaders" "$GLSLC_PATH" "$DEBUG"
\ No newline at end of file
+python3 "$SHADERS_GENERATOR" "$OMIM_PATH/shaders/GL" shader_index.txt shaders_lib.glsl "$OMIM_PATH/data/vulkan_shaders" "$GLSLC_PATH" "$DEBUG"
\ No newline at end of file

From 14b3e8fc8fe75a8a5e78eae8b54ac2b215dbeceb Mon Sep 17 00:00:00 2001
From: renderexpert <expert@renderconsulting.co.uk>
Date: Thu, 19 Jun 2025 11:41:53 +0100
Subject: [PATCH 031/302] Fix shader tests on Linux

Signed-off-by: renderexpert <expert@renderconsulting.co.uk>
---
 libs/shaders/gl_program_pool.cpp                 |  2 +-
 .../gl_shaders_mobile_compile_test.cpp           | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/libs/shaders/gl_program_pool.cpp b/libs/shaders/gl_program_pool.cpp
index d44187091..d373bc559 100644
--- a/libs/shaders/gl_program_pool.cpp
+++ b/libs/shaders/gl_program_pool.cpp
@@ -14,7 +14,7 @@ GLProgramPool::GLProgramPool(dp::ApiVersion apiVersion)
 
   if (m_apiVersion == dp::ApiVersion::OpenGLES3)
   {
-#if defined(OMIM_OS_DESKTOP) && !defined(OMIM_OS_LINUX)
+#if defined(OMIM_OS_DESKTOP)
     m_baseDefines = std::string(GL3_SHADER_VERSION);
 #else
     m_baseDefines = std::string(GLES3_SHADER_VERSION);
diff --git a/libs/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp b/libs/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp
index 0285e0beb..a23fb6803 100644
--- a/libs/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp
+++ b/libs/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp
@@ -112,9 +112,23 @@ void TestShaders(dp::ApiVersion apiVersion, std::string const & defines, QString
     TEST(srcFile.open(), ("Temporary file can't be created!"));
     std::string fullSrc;
     if (apiVersion == dp::ApiVersion::OpenGLES3)
-      fullSrc = std::string(gpu::GLES3_SHADER_VERSION) + defines + src.second;
+    {
+      // Use desktop shader version for Linux
+#ifdef OMIM_OS_LINUX
+      if (glslCompiler.contains(kCompilerOpenGLES.c_str()))
+      {
+        fullSrc = std::string(gpu::GL3_SHADER_VERSION) + defines + src.second;
+      }
+      else
+#endif
+      {
+        fullSrc = std::string(gpu::GLES3_SHADER_VERSION) + defines + src.second;
+      }
+    }
     else
+    {
       fullSrc = defines + src.second;
+    }
     WriteShaderToFile(srcFile, fullSrc);
     RunShaderTest(apiVersion, src.first, glslCompiler, srcFile.fileName(), procPrepare, argsPrepare,
                   successChecker, errorLog);

From 344cf6d7094fcfb157c171055cfea02b49dbadd1 Mon Sep 17 00:00:00 2001
From: renderexpert <expert@renderconsulting.co.uk>
Date: Thu, 19 Jun 2025 15:53:44 +0100
Subject: [PATCH 032/302] Fix OpenGL glUniform mismatch

Signed-off-by: renderexpert <expert@renderconsulting.co.uk>
---
 libs/shaders/gl_program_params.cpp | 10 +++----
 libs/shaders/program_params.hpp    | 45 +++++++++++++++++++++++-------
 2 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/libs/shaders/gl_program_params.cpp b/libs/shaders/gl_program_params.cpp
index e524908ba..dee6450aa 100644
--- a/libs/shaders/gl_program_params.cpp
+++ b/libs/shaders/gl_program_params.cpp
@@ -132,11 +132,11 @@ void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
   Parameter::CheckApply(guard, "u_projection", params.m_projection);
   Parameter::CheckApply(guard, "u_pivotTransform", params.m_pivotTransform);
   Parameter::CheckApply(guard, "u_trafficParams", params.m_trafficParams);
-  Parameter::CheckApply(guard, "u_outlineColor", params.m_outlineColor);
+  Parameter::CheckApply(guard, "u_outlineColor", params.m_outlineColorAligned);
   Parameter::CheckApply(guard, "u_outline", params.m_outline);
-  Parameter::CheckApply(guard, "u_lightArrowColor", params.m_lightArrowColor);
+  Parameter::CheckApply(guard, "u_lightArrowColor", params.m_lightArrowColorAligned);
   Parameter::CheckApply(guard, "u_opacity", params.m_opacity);
-  Parameter::CheckApply(guard, "u_darkArrowColor", params.m_darkArrowColor);
+  Parameter::CheckApply(guard, "u_darkArrowColor", params.m_darkArrowColorAligned);
 }
 
 void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
@@ -149,7 +149,7 @@ void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
   Parameter::CheckApply(guard, "u_modelView", params.m_modelView);
   Parameter::CheckApply(guard, "u_projection", params.m_projection);
   Parameter::CheckApply(guard, "u_pivotTransform", params.m_pivotTransform);
-  Parameter::CheckApply(guard, "u_params", params.m_params);
+  Parameter::CheckApply(guard, "u_params", params.m_paramsAligned);
   Parameter::CheckApply(guard, "u_lineHalfWidth", params.m_lineHalfWidth);
   Parameter::CheckApply(guard, "u_maxRadius", params.m_maxRadius);
 }
@@ -180,7 +180,7 @@ void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
   Parameter::CheckApply(guard, "u_modelView", params.m_modelView);
   Parameter::CheckApply(guard, "u_projection", params.m_projection);
   Parameter::CheckApply(guard, "u_pivotTransform", params.m_pivotTransform);
-  Parameter::CheckApply(guard, "u_position", params.m_position);
+  Parameter::CheckApply(guard, "u_position", params.m_positionAligned);
   Parameter::CheckApply(guard, "u_accuracy", params.m_accuracy);
   Parameter::CheckApply(guard, "u_lineParams", params.m_lineParams);
   Parameter::CheckApply(guard, "u_zScale", params.m_zScale);
diff --git a/libs/shaders/program_params.hpp b/libs/shaders/program_params.hpp
index f8ffa5d43..fcf4079eb 100644
--- a/libs/shaders/program_params.hpp
+++ b/libs/shaders/program_params.hpp
@@ -126,15 +126,30 @@ struct ALIGNMENT TrafficProgramParams
   glsl::mat4 m_projection;
   glsl::mat4 m_pivotTransform;
   glsl::vec4 m_trafficParams;
-  glsl::vec3 m_outlineColor;
-  float m_dummy1; // alignment
-  glsl::vec3 m_lightArrowColor;
-  float m_dummy2; // alignment
-  glsl::vec3 m_darkArrowColor;
-  float m_dummy3; // alignment
+  union
+  {
+    glsl::vec4 m_outlineColorAligned;
+    glsl::vec3 m_outlineColor;
+  };
+  union
+  {
+    glsl::vec4 m_lightArrowColorAligned;
+    glsl::vec3 m_lightArrowColor;
+  };
+  union
+  {
+    glsl::vec4 m_darkArrowColorAligned;
+    glsl::vec3 m_darkArrowColor;
+  };
   float m_outline = 0.0f;
   float m_opacity = 1.0f;
 
+  TrafficProgramParams() 
+    : m_outlineColorAligned(0.0f, 0.0f, 0.0f, 0.0f)
+    , m_lightArrowColorAligned(0.0f, 0.0f, 0.0f, 0.0f)
+    , m_darkArrowColorAligned(0.0f, 0.0f, 0.0f, 0.0f)
+  {}
+
   BIND_PROGRAMS(TrafficProgramParams,
     Program::Traffic,
     Program::TrafficLine,
@@ -146,11 +161,16 @@ struct ALIGNMENT TransitProgramParams
   glsl::mat4 m_modelView;
   glsl::mat4 m_projection;
   glsl::mat4 m_pivotTransform;
-  glsl::vec3 m_params;
-  float m_dummy1; // alignment
+  union
+  {
+    glsl::vec4 m_paramsAligned;
+    glsl::vec3 m_params;
+  };
   float m_lineHalfWidth = 0.0f;
   float m_maxRadius = 0.0f;
 
+  TransitProgramParams() : m_paramsAligned(0.0f, 0.0f, 0.0f, 0.0f) {}
+
   BIND_PROGRAMS(TransitProgramParams,
     Program::Transit,
     Program::TransitCircle,
@@ -179,14 +199,19 @@ struct ALIGNMENT ShapesProgramParams
   glsl::mat4 m_modelView;
   glsl::mat4 m_projection;
   glsl::mat4 m_pivotTransform;
-  glsl::vec3 m_position;
-  float m_dummy1; // alignment
+  union
+  {
+    glsl::vec4 m_positionAligned;
+    glsl::vec3 m_position;
+  };
   glsl::vec2 m_lineParams;
   float m_accuracy = 0.0;
   float m_zScale = 1.0f;
   float m_opacity = 1.0f;
   float m_azimut = 0.0;
 
+  ShapesProgramParams() : m_positionAligned(0.0f, 0.0f, 0.0f, 0.0f) {}
+
   BIND_PROGRAMS(ShapesProgramParams,
     Program::Accuracy,
     Program::MyPosition,

From 4d702ec541dedbd26eec8151600e2abd5f470644 Mon Sep 17 00:00:00 2001
From: renderexpert <expert@renderconsulting.co.uk>
Date: Thu, 19 Jun 2025 16:11:52 +0100
Subject: [PATCH 033/302] Set OpenGLES 3.0 as minimal version in Android
 manifest

Signed-off-by: renderexpert <expert@renderconsulting.co.uk>
---
 android/app/src/main/AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 1ff93e999..51cad9fe3 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
 
   <!-- Requiring "android.hardware.touchscreen" here breaks DeX mode -->
   <uses-feature
-      android:glEsVersion="0x00020000"
+      android:glEsVersion="0x00030000"
       android:required="true"/>
   <uses-feature
       android:name="android.hardware.wifi"

From 01c2f02c8604b80832faf1b3f8abbe46153cd3f8 Mon Sep 17 00:00:00 2001
From: renderexpert <expert@renderconsulting.co.uk>
Date: Mon, 30 Jun 2025 23:52:59 +0100
Subject: [PATCH 034/302] Remove OpenGL ES2 leftovers that caused crash in
 Vulkan

Signed-off-by: renderexpert <expert@renderconsulting.co.uk>
---
 libs/drape_frontend/arrow3d.cpp            | 5 -----
 libs/drape_frontend/backend_renderer.cpp   | 2 +-
 libs/drape_frontend/circles_pack_shape.cpp | 8 +++-----
 libs/drape_frontend/circles_pack_shape.hpp | 3 +--
 libs/drape_frontend/route_builder.cpp      | 3 +--
 libs/drape_frontend/route_shape.cpp        | 4 +---
 libs/drape_frontend/route_shape.hpp        | 3 +--
 7 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/libs/drape_frontend/arrow3d.cpp b/libs/drape_frontend/arrow3d.cpp
index d76340757..a758c3dea 100644
--- a/libs/drape_frontend/arrow3d.cpp
+++ b/libs/drape_frontend/arrow3d.cpp
@@ -306,11 +306,6 @@ Arrow3d::Arrow3d(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::TextureManage
 {
   m_state.SetDepthTestEnabled(true);
 
-  // Workaround for OpenGL: some devices require any texture to be set in the rendering pipeline.
-  auto const apiVersion = context->GetApiVersion();
-  if (apiVersion == dp::ApiVersion::OpenGLES3)
-    m_state.SetColorTexture(texMng->GetSymbolsTexture());
-
   m_isValid = preloadedData.m_meshData.has_value();
 
   // Init arrow mesh.
diff --git a/libs/drape_frontend/backend_renderer.cpp b/libs/drape_frontend/backend_renderer.cpp
index 8faecca5d..861b89749 100644
--- a/libs/drape_frontend/backend_renderer.cpp
+++ b/libs/drape_frontend/backend_renderer.cpp
@@ -387,7 +387,7 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
       drape_ptr<CirclesPackRenderData> data = make_unique_dp<CirclesPackRenderData>();
       data->m_pointsCount = msg->GetPointsCount();
       CHECK(m_context != nullptr, ());
-      CirclesPackShape::Draw(m_context, m_texMng, *data.get());
+      CirclesPackShape::Draw(m_context, *data.get());
       m_commutator->PostMessage(ThreadsCommutator::RenderThread,
                                 make_unique_dp<FlushCirclesPackMessage>(
                                   std::move(data), msg->GetDestination()),
diff --git a/libs/drape_frontend/circles_pack_shape.cpp b/libs/drape_frontend/circles_pack_shape.cpp
index 31fb0e376..d0f2b9999 100644
--- a/libs/drape_frontend/circles_pack_shape.cpp
+++ b/libs/drape_frontend/circles_pack_shape.cpp
@@ -28,10 +28,9 @@ struct CirclesPackStaticVertex
   TNormal m_normal;
 };
 
-dp::RenderState GetCirclesPackState(ref_ptr<dp::TextureManager> texMng)
+dp::RenderState GetCirclesPackState()
 {
   auto state = CreateRenderState(gpu::Program::CirclePoint, DepthLayer::OverlayLayer);
-  state.SetColorTexture(texMng->GetSymbolsTexture());
   state.SetDepthTestEnabled(false);
   return state;
 }
@@ -139,8 +138,7 @@ size_t CirclesPackHandle::GetPointsCount() const
   return m_buffer.size() / dp::Batcher::VertexPerQuad;
 }
 
-void CirclesPackShape::Draw(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::TextureManager> texMng,
-                            CirclesPackRenderData & data)
+void CirclesPackShape::Draw(ref_ptr<dp::GraphicsContext> context, CirclesPackRenderData & data)
 {
   ASSERT_NOT_EQUAL(data.m_pointsCount, 0, ());
 
@@ -178,7 +176,7 @@ void CirclesPackShape::Draw(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Te
                       make_ref(staticVertexData.data()));
   provider.InitStream(1 /* stream index */, GetCirclesPackDynamicBindingInfo(),
                       make_ref(dynamicVertexData.data()));
-  batcher.InsertListOfStrip(context, GetCirclesPackState(texMng), make_ref(&provider),
+  batcher.InsertListOfStrip(context, GetCirclesPackState(), make_ref(&provider),
                             std::move(handle), kVerticesInPoint);
 
   context->Flush();
diff --git a/libs/drape_frontend/circles_pack_shape.hpp b/libs/drape_frontend/circles_pack_shape.hpp
index baf033da8..fa92a8d01 100644
--- a/libs/drape_frontend/circles_pack_shape.hpp
+++ b/libs/drape_frontend/circles_pack_shape.hpp
@@ -69,7 +69,6 @@ private:
 class CirclesPackShape
 {
 public:
-  static void Draw(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::TextureManager> texMng,
-                   CirclesPackRenderData & data);
+  static void Draw(ref_ptr<dp::GraphicsContext> context, CirclesPackRenderData & data);
 };
 }  // namespace df
diff --git a/libs/drape_frontend/route_builder.cpp b/libs/drape_frontend/route_builder.cpp
index c65a158a6..f8c0f0f2a 100644
--- a/libs/drape_frontend/route_builder.cpp
+++ b/libs/drape_frontend/route_builder.cpp
@@ -29,8 +29,7 @@ void RouteBuilder::Build(ref_ptr<dp::GraphicsContext> context, dp::DrapeID subro
   ASSERT(!subroute->m_style.empty(), ());
   for (size_t styleIndex = 0; styleIndex < subroute->m_style.size(); ++styleIndex)
   {
-    subrouteData.push_back(RouteShape::CacheRoute(context, subrouteId, subroute,
-                                                  styleIndex, recacheId, textures));
+    subrouteData.push_back(RouteShape::CacheRoute(context, subrouteId, subroute, styleIndex, recacheId));
   }
 
   auto markersData = RouteShape::CacheMarkers(context, subrouteId, subroute, recacheId, textures);
diff --git a/libs/drape_frontend/route_shape.cpp b/libs/drape_frontend/route_shape.cpp
index 59e70f04f..47bb9f644 100644
--- a/libs/drape_frontend/route_shape.cpp
+++ b/libs/drape_frontend/route_shape.cpp
@@ -539,8 +539,7 @@ void RouteShape::CacheRouteArrows(ref_ptr<dp::GraphicsContext> context,
 
 drape_ptr<df::SubrouteData> RouteShape::CacheRoute(ref_ptr<dp::GraphicsContext> context,
                                                    dp::DrapeID subrouteId, SubrouteConstPtr subroute,
-                                                   size_t styleIndex, int recacheId,
-                                                   ref_ptr<dp::TextureManager> textures)
+                                                   size_t styleIndex, int recacheId)
 {
   size_t startIndex;
   size_t endIndex;
@@ -596,7 +595,6 @@ drape_ptr<df::SubrouteData> RouteShape::CacheRoute(ref_ptr<dp::GraphicsContext>
 
   auto state = CreateRenderState(subroute->m_style[styleIndex].m_pattern.m_isDashed ?
                                  gpu::Program::RouteDash : gpu::Program::Route, DepthLayer::GeometryLayer);
-  state.SetColorTexture(textures->GetSymbolsTexture());
 
   for (auto & data : geometryBufferData)
   {
diff --git a/libs/drape_frontend/route_shape.hpp b/libs/drape_frontend/route_shape.hpp
index 0380d5441..74e3d5d6a 100644
--- a/libs/drape_frontend/route_shape.hpp
+++ b/libs/drape_frontend/route_shape.hpp
@@ -208,8 +208,7 @@ public:
 
   static drape_ptr<df::SubrouteData> CacheRoute(ref_ptr<dp::GraphicsContext> context,
                                                 dp::DrapeID subrouteId, SubrouteConstPtr subroute,
-                                                size_t styleIndex, int recacheId,
-                                                ref_ptr<dp::TextureManager> textures);
+                                                size_t styleIndex, int recacheId);
 
   static drape_ptr<df::SubrouteMarkersData> CacheMarkers(ref_ptr<dp::GraphicsContext> context,
                                                          dp::DrapeID subrouteId,

From 36f123ef25e29a9749f5224e3df011e6c824ad7b Mon Sep 17 00:00:00 2001
From: renderexpert <expert@renderconsulting.co.uk>
Date: Fri, 4 Jul 2025 19:22:05 +0100
Subject: [PATCH 035/302] Fix crash in CreateDescriptorSetGroup

Signed-off-by: renderexpert <expert@renderconsulting.co.uk>
---
 libs/drape/vulkan/vulkan_object_manager.cpp | 57 +++++++++++++--------
 1 file changed, 37 insertions(+), 20 deletions(-)

diff --git a/libs/drape/vulkan/vulkan_object_manager.cpp b/libs/drape/vulkan/vulkan_object_manager.cpp
index 53b213616..8a711351e 100644
--- a/libs/drape/vulkan/vulkan_object_manager.cpp
+++ b/libs/drape/vulkan/vulkan_object_manager.cpp
@@ -202,8 +202,7 @@ VulkanObject VulkanObjectManager::CreateImage(VkImageUsageFlags usageFlags, VkFo
   return result;
 }
 
-DescriptorSetGroup VulkanObjectManager::CreateDescriptorSetGroup(ref_ptr<VulkanGpuProgram> program)
-{
+DescriptorSetGroup VulkanObjectManager::CreateDescriptorSetGroup(ref_ptr<VulkanGpuProgram> program) {
   CHECK(std::this_thread::get_id() == m_renderers[ThreadType::Frontend], ());
 
   DescriptorSetGroup s;
@@ -212,26 +211,45 @@ DescriptorSetGroup VulkanObjectManager::CreateDescriptorSetGroup(ref_ptr<VulkanG
 
   // Find a pool with available sets.
   uint32_t poolIndex = 0;
-  while (poolIndex < m_descriptorPools.size() && m_descriptorPools[poolIndex].m_availableSetsCount == 0)
-    ++poolIndex;
-
-  // No such a pool, create one.
-  if (poolIndex == m_descriptorPools.size())
+  while (poolIndex <= m_descriptorPools.size())
   {
-    CreateDescriptorPool();
-    poolIndex = m_descriptorPools.size() - 1;
+    // No such a pool, create one.
+    if (poolIndex == m_descriptorPools.size())
+      CreateDescriptorPool();
+
+    // No available sets in the pool, try next one.
+    if (m_descriptorPools[poolIndex].m_availableSetsCount == 0)
+    {
+      poolIndex++;
+      continue;
+    }
+
+    // Allocate a descriptor set.
+    allocInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO;
+    allocInfo.descriptorPool = m_descriptorPools[poolIndex].m_pool;
+    s.m_descriptorPoolIndex = poolIndex;
+    allocInfo.pSetLayouts = &layout;
+    allocInfo.descriptorSetCount = 1;
+
+    // Decrease the available sets count.
+    m_descriptorPools[poolIndex].m_availableSetsCount--;
+
+    auto const r = vkAllocateDescriptorSets(m_device, &allocInfo, &s.m_descriptorSet);
+    if (r == VK_ERROR_FRAGMENTED_POOL || r == VK_ERROR_OUT_OF_POOL_MEMORY)
+    {
+      poolIndex++;
+      m_descriptorPools[poolIndex].m_availableSetsCount++;
+    }
+    else if (r != VK_SUCCESS)
+    {
+      CHECK_VK_CALL(r);
+    }
+    else
+    {
+      break;
+    }
   }
 
-  // Allocate a descriptor set.
-  allocInfo.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO;
-  allocInfo.descriptorPool = m_descriptorPools[poolIndex].m_pool;
-  s.m_descriptorPoolIndex = poolIndex;
-  allocInfo.pSetLayouts = &layout;
-  allocInfo.descriptorSetCount = 1;
-
-  // Decrease the available sets count.
-  m_descriptorPools[poolIndex].m_availableSetsCount--;
-
   TRACE_COUNTER("[drape][vulkan] Descriptor pools", static_cast<int64_t>(m_descriptorPools.size()));
 #ifdef ENABLE_TRACE
   int64_t usedDescriptorsSets = 0;
@@ -240,7 +258,6 @@ DescriptorSetGroup VulkanObjectManager::CreateDescriptorSetGroup(ref_ptr<VulkanG
   TRACE_COUNTER("[drape][vulkan] Descriptor sets", usedDescriptorsSets);
 #endif
 
-  CHECK_VK_CALL(vkAllocateDescriptorSets(m_device, &allocInfo, &s.m_descriptorSet));
   return s;
 }
 

From 5a0ff536a7f1a1d56fd2c357b8385d5916ee4cb1 Mon Sep 17 00:00:00 2001
From: renderexpert <expert@renderconsulting.co.uk>
Date: Sat, 5 Jul 2025 19:55:38 +0100
Subject: [PATCH 036/302] Regenerate Vulkan shaders

Signed-off-by: renderexpert <expert@renderconsulting.co.uk>
---
 data/vulkan_shaders/reflection.json  |   2 +-
 data/vulkan_shaders/shaders_pack.spv | Bin 348916 -> 348772 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/vulkan_shaders/reflection.json b/data/vulkan_shaders/reflection.json
index e2784fb8a..21051de84 100644
--- a/data/vulkan_shaders/reflection.json
+++ b/data/vulkan_shaders/reflection.json
@@ -1 +1 @@
-[{"prg":0,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":0,"vs_size":3920,"fs_off":3920,"fs_size":2712},{"prg":1,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":6632,"vs_size":3560,"fs_off":10192,"fs_size":1636},{"prg":2,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":11828,"vs_size":3708,"fs_off":15536,"fs_size":1884},{"prg":3,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":17420,"vs_size":4612,"fs_off":22032,"fs_size":2636},{"prg":4,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":24668,"vs_size":4612,"fs_off":29280,"fs_size":2636},{"prg":5,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":31916,"vs_size":4584,"fs_off":36500,"fs_size":2228},{"prg":6,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":38728,"vs_size":3916,"fs_off":42644,"fs_size":2228},{"prg":7,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":44872,"vs_size":3228,"fs_off":48100,"fs_size":2132},{"prg":8,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":50232,"vs_size":3228,"fs_off":53460,"fs_size":2132},{"prg":9,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":55592,"vs_size":3500,"fs_off":59092,"fs_size":1480},{"prg":10,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":60572,"vs_size":3500,"fs_off":64072,"fs_size":1480},{"prg":11,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":65552,"vs_size":3832,"fs_off":69384,"fs_size":2032},{"prg":12,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":71416,"vs_size":2860,"fs_off":74276,"fs_size":1480},{"prg":13,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":75756,"vs_size":5232,"fs_off":80988,"fs_size":1476},{"prg":14,"info":{"vs_uni":0,"tex":[],"fs_uni":-1},"vs_off":82464,"vs_size":5464,"fs_off":87928,"fs_size":1448},{"prg":15,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":89376,"vs_size":5600,"fs_off":94976,"fs_size":1972},{"prg":16,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":96948,"vs_size":4136,"fs_off":101084,"fs_size":1636},{"prg":17,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":102720,"vs_size":3500,"fs_off":106220,"fs_size":1480},{"prg":18,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":107700,"vs_size":3844,"fs_off":111544,"fs_size":2396},{"prg":19,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":113940,"vs_size":3664,"fs_off":117604,"fs_size":1844},{"prg":20,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":119448,"vs_size":1964,"fs_off":121412,"fs_size":1540},{"prg":21,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":122952,"vs_size":2176,"fs_off":125128,"fs_size":1540},{"prg":22,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":126668,"vs_size":3788,"fs_off":130456,"fs_size":1676},{"prg":23,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":132132,"vs_size":4272,"fs_off":136404,"fs_size":1676},{"prg":24,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":138080,"vs_size":5968,"fs_off":144048,"fs_size":1812},{"prg":25,"info":{"vs_uni":0,"tex":[],"fs_uni":-1},"vs_off":145860,"vs_size":5016,"fs_off":150876,"fs_size":464},{"prg":26,"info":{"vs_uni":0,"tex":[],"fs_uni":-1},"vs_off":151340,"vs_size":4484,"fs_off":155824,"fs_size":1632},{"prg":27,"info":{"vs_uni":0,"tex":[],"fs_uni":0},"vs_off":157456,"vs_size":6080,"fs_off":163536,"fs_size":4432},{"prg":28,"info":{"vs_uni":0,"tex":[],"fs_uni":0},"vs_off":167968,"vs_size":6080,"fs_off":174048,"fs_size":4028},{"prg":29,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":178076,"vs_size":5376,"fs_off":183452,"fs_size":2464},{"prg":30,"info":{"vs_uni":0,"tex":[],"fs_uni":0},"vs_off":185916,"vs_size":4924,"fs_off":190840,"fs_size":3128},{"prg":31,"info":{"vs_uni":0,"tex":[],"fs_uni":0},"vs_off":193968,"vs_size":3772,"fs_off":197740,"fs_size":2120},{"prg":32,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":199860,"vs_size":4612,"fs_off":204472,"fs_size":2636},{"prg":33,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":207108,"vs_size":4612,"fs_off":211720,"fs_size":2636},{"prg":34,"info":{"vs_uni":-1,"tex":[],"fs_uni":0},"vs_off":214356,"vs_size":1104,"fs_off":215460,"fs_size":616},{"prg":35,"info":{"vs_uni":-1,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":216076,"vs_size":920,"fs_off":216996,"fs_size":1152},{"prg":36,"info":{"vs_uni":0,"tex":[],"fs_uni":0},"vs_off":218148,"vs_size":2060,"fs_off":220208,"fs_size":1488},{"prg":37,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":221696,"vs_size":2388,"fs_off":224084,"fs_size":1856},{"prg":38,"info":{"vs_uni":0,"tex":[],"fs_uni":0},"vs_off":225940,"vs_size":1880,"fs_off":227820,"fs_size":1212},{"prg":39,"info":{"vs_uni":0,"tex":[],"fs_uni":0},"vs_off":229032,"vs_size":1880,"fs_off":230912,"fs_size":1276},{"prg":40,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":232188,"vs_size":4428,"fs_off":236616,"fs_size":2712},{"prg":41,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":239328,"vs_size":4200,"fs_off":243528,"fs_size":1636},{"prg":42,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":245164,"vs_size":4348,"fs_off":249512,"fs_size":1884},{"prg":43,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":251396,"vs_size":5048,"fs_off":256444,"fs_size":2636},{"prg":44,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":259080,"vs_size":5048,"fs_off":264128,"fs_size":2636},{"prg":45,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":266764,"vs_size":5048,"fs_off":271812,"fs_size":2636},{"prg":46,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":274448,"vs_size":5048,"fs_off":279496,"fs_size":2636},{"prg":47,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":282132,"vs_size":5084,"fs_off":287216,"fs_size":2228},{"prg":48,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":289444,"vs_size":4556,"fs_off":294000,"fs_size":2228},{"prg":49,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":296228,"vs_size":6476,"fs_off":302704,"fs_size":3952},{"prg":50,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":306656,"vs_size":3600,"fs_off":310256,"fs_size":1688},{"prg":51,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":311944,"vs_size":6012,"fs_off":317956,"fs_size":2532},{"prg":52,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":-1},"vs_off":320488,"vs_size":1916,"fs_off":322404,"fs_size":4236},{"prg":53,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_smaaArea","idx":2,"frag":1},{"name":"u_smaaSearch","idx":3,"frag":1}],"fs_uni":0},"vs_off":326640,"vs_size":2292,"fs_off":328932,"fs_size":12348},{"prg":54,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_blendingWeightTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":341280,"vs_size":1364,"fs_off":342644,"fs_size":3688},{"prg":55,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":-1},"vs_off":346332,"vs_size":1692,"fs_off":348024,"fs_size":892}]
\ No newline at end of file
+[{"prg":0,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":0,"vs_size":3920,"fs_off":3920,"fs_size":2712},{"prg":1,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":6632,"vs_size":3560,"fs_off":10192,"fs_size":1636},{"prg":2,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":11828,"vs_size":3708,"fs_off":15536,"fs_size":1884},{"prg":3,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":17420,"vs_size":4612,"fs_off":22032,"fs_size":2636},{"prg":4,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":24668,"vs_size":4612,"fs_off":29280,"fs_size":2636},{"prg":5,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":31916,"vs_size":4584,"fs_off":36500,"fs_size":2228},{"prg":6,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":38728,"vs_size":3916,"fs_off":42644,"fs_size":2228},{"prg":7,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":44872,"vs_size":3228,"fs_off":48100,"fs_size":2132},{"prg":8,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":50232,"vs_size":3228,"fs_off":53460,"fs_size":2132},{"prg":9,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":55592,"vs_size":3500,"fs_off":59092,"fs_size":1480},{"prg":10,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":60572,"vs_size":3500,"fs_off":64072,"fs_size":1480},{"prg":11,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":65552,"vs_size":3832,"fs_off":69384,"fs_size":2032},{"prg":12,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":71416,"vs_size":2860,"fs_off":74276,"fs_size":1480},{"prg":13,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":75756,"vs_size":5232,"fs_off":80988,"fs_size":1476},{"prg":14,"info":{"vs_uni":0,"tex":[],"fs_uni":-1},"vs_off":82464,"vs_size":5464,"fs_off":87928,"fs_size":1448},{"prg":15,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":89376,"vs_size":5600,"fs_off":94976,"fs_size":1972},{"prg":16,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":96948,"vs_size":4136,"fs_off":101084,"fs_size":1636},{"prg":17,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":102720,"vs_size":3500,"fs_off":106220,"fs_size":1480},{"prg":18,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":107700,"vs_size":3844,"fs_off":111544,"fs_size":2252},{"prg":19,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":113796,"vs_size":3664,"fs_off":117460,"fs_size":1844},{"prg":20,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":119304,"vs_size":1964,"fs_off":121268,"fs_size":1540},{"prg":21,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":122808,"vs_size":2176,"fs_off":124984,"fs_size":1540},{"prg":22,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":126524,"vs_size":3788,"fs_off":130312,"fs_size":1676},{"prg":23,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":131988,"vs_size":4272,"fs_off":136260,"fs_size":1676},{"prg":24,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":137936,"vs_size":5968,"fs_off":143904,"fs_size":1812},{"prg":25,"info":{"vs_uni":0,"tex":[],"fs_uni":-1},"vs_off":145716,"vs_size":5016,"fs_off":150732,"fs_size":464},{"prg":26,"info":{"vs_uni":0,"tex":[],"fs_uni":-1},"vs_off":151196,"vs_size":4484,"fs_off":155680,"fs_size":1632},{"prg":27,"info":{"vs_uni":0,"tex":[],"fs_uni":0},"vs_off":157312,"vs_size":6080,"fs_off":163392,"fs_size":4432},{"prg":28,"info":{"vs_uni":0,"tex":[],"fs_uni":0},"vs_off":167824,"vs_size":6080,"fs_off":173904,"fs_size":4028},{"prg":29,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":177932,"vs_size":5376,"fs_off":183308,"fs_size":2464},{"prg":30,"info":{"vs_uni":0,"tex":[],"fs_uni":0},"vs_off":185772,"vs_size":4924,"fs_off":190696,"fs_size":3128},{"prg":31,"info":{"vs_uni":0,"tex":[],"fs_uni":0},"vs_off":193824,"vs_size":3772,"fs_off":197596,"fs_size":2120},{"prg":32,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":199716,"vs_size":4612,"fs_off":204328,"fs_size":2636},{"prg":33,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":206964,"vs_size":4612,"fs_off":211576,"fs_size":2636},{"prg":34,"info":{"vs_uni":-1,"tex":[],"fs_uni":0},"vs_off":214212,"vs_size":1104,"fs_off":215316,"fs_size":616},{"prg":35,"info":{"vs_uni":-1,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":215932,"vs_size":920,"fs_off":216852,"fs_size":1152},{"prg":36,"info":{"vs_uni":0,"tex":[],"fs_uni":0},"vs_off":218004,"vs_size":2060,"fs_off":220064,"fs_size":1488},{"prg":37,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":221552,"vs_size":2388,"fs_off":223940,"fs_size":1856},{"prg":38,"info":{"vs_uni":0,"tex":[],"fs_uni":0},"vs_off":225796,"vs_size":1880,"fs_off":227676,"fs_size":1212},{"prg":39,"info":{"vs_uni":0,"tex":[],"fs_uni":0},"vs_off":228888,"vs_size":1880,"fs_off":230768,"fs_size":1276},{"prg":40,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0}],"fs_uni":0},"vs_off":232044,"vs_size":4428,"fs_off":236472,"fs_size":2712},{"prg":41,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":239184,"vs_size":4200,"fs_off":243384,"fs_size":1636},{"prg":42,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":245020,"vs_size":4348,"fs_off":249368,"fs_size":1884},{"prg":43,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":251252,"vs_size":5048,"fs_off":256300,"fs_size":2636},{"prg":44,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":258936,"vs_size":5048,"fs_off":263984,"fs_size":2636},{"prg":45,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":266620,"vs_size":5048,"fs_off":271668,"fs_size":2636},{"prg":46,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":274304,"vs_size":5048,"fs_off":279352,"fs_size":2636},{"prg":47,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":281988,"vs_size":5084,"fs_off":287072,"fs_size":2228},{"prg":48,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":0},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":289300,"vs_size":4556,"fs_off":293856,"fs_size":2228},{"prg":49,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_maskTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":296084,"vs_size":6476,"fs_off":302560,"fs_size":3952},{"prg":50,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":306512,"vs_size":3600,"fs_off":310112,"fs_size":1688},{"prg":51,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":0},"vs_off":311800,"vs_size":6012,"fs_off":317812,"fs_size":2532},{"prg":52,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":-1},"vs_off":320344,"vs_size":1916,"fs_off":322260,"fs_size":4236},{"prg":53,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_smaaArea","idx":2,"frag":1},{"name":"u_smaaSearch","idx":3,"frag":1}],"fs_uni":0},"vs_off":326496,"vs_size":2292,"fs_off":328788,"fs_size":12348},{"prg":54,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1},{"name":"u_blendingWeightTex","idx":2,"frag":1}],"fs_uni":0},"vs_off":341136,"vs_size":1364,"fs_off":342500,"fs_size":3688},{"prg":55,"info":{"vs_uni":0,"tex":[{"name":"u_colorTex","idx":1,"frag":1}],"fs_uni":-1},"vs_off":346188,"vs_size":1692,"fs_off":347880,"fs_size":892}]
\ No newline at end of file
diff --git a/data/vulkan_shaders/shaders_pack.spv b/data/vulkan_shaders/shaders_pack.spv
index cf7b08f3a17c19b1ec62753a5ea46a4d886cf39c..2d49ec0ecab820aa09d9c7de19b5fa50b9a7ee92 100644
GIT binary patch
delta 77
zcmeyeRP@Ob(S|LIM>aFMPhQyPy<K1n;~mE74;C<*OxNgT<k{}9jWLCBa)xlhc848|
g8H}9T3@i+63=9lz?Tot^ftU%1nYT0UV);A+0G#g|MgRZ+

delta 160
zcmaE|MD)v2(S|LIM>aEhPhQyPy<K1n;~mE73WAI*{GJR945jhO`8oMTA*mG%)9)`}
zG~KSSjj@1{)185t0VK^Z`DCL!BjfbKMU2VYKWt~LU}TkK;AC){>^NE3&>bl62E+;s
pEDRnX#XtZOvxf4)1_1fmKt3Cg_G&NO$q2+uK+L?oa3{;>833vXDE<Hd


From da3053f5fc636f38e3f3515862b0b644358f4d82 Mon Sep 17 00:00:00 2001
From: renderexpert <expert@renderconsulting.co.uk>
Date: Wed, 9 Jul 2025 07:53:26 +0100
Subject: [PATCH 037/302] Make check more strict in ApplyTextures

Signed-off-by: renderexpert <expert@renderconsulting.co.uk>
---
 libs/drape/render_state.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/drape/render_state.cpp b/libs/drape/render_state.cpp
index 55611a203..59c89cc41 100644
--- a/libs/drape/render_state.cpp
+++ b/libs/drape/render_state.cpp
@@ -267,7 +267,7 @@ void TextureState::ApplyTextures(ref_ptr<GraphicsContext> context, RenderState c
       descriptor.m_imageDescriptor.imageLayout = VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL;
 
       auto const it = bindings.find(texture.first);
-      ASSERT(it != bindings.end(), ());
+      CHECK(it != bindings.end(), (texture.first, " is not found in the program", p->GetName()));
       descriptor.m_textureSlot = it->second;
 
       descriptor.m_id = texture.second->GetID();

From 0000ec149c8e427ae904d80dccdd09ba936bea01 Mon Sep 17 00:00:00 2001
From: renderexpert <expert@renderconsulting.co.uk>
Date: Tue, 15 Jul 2025 22:36:12 +0100
Subject: [PATCH 038/302] Fix wrong texture setting for RouteMarker

Signed-off-by: renderexpert <expert@renderconsulting.co.uk>
---
 libs/drape_frontend/route_shape.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libs/drape_frontend/route_shape.cpp b/libs/drape_frontend/route_shape.cpp
index 47bb9f644..d213ef01c 100644
--- a/libs/drape_frontend/route_shape.cpp
+++ b/libs/drape_frontend/route_shape.cpp
@@ -630,7 +630,6 @@ drape_ptr<df::SubrouteMarkersData> RouteShape::CacheMarkers(ref_ptr<dp::Graphics
     return nullptr;
 
   auto state = CreateRenderState(gpu::Program::RouteMarker, DepthLayer::GeometryLayer);
-  state.SetColorTexture(textures->GetSymbolsTexture());
 
   // Batching.
   {

From 9833918aac0b2775800efd8b2352d17c4d3f497e Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Wed, 9 Jul 2025 22:49:18 +0200
Subject: [PATCH 039/302] [android][sdk] Refactoring

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 .../java/app/organicmaps/MapFragment.java     |  6 +-
 .../java/app/organicmaps/MwmActivity.java     | 35 +++++------
 .../java/app/organicmaps/MwmApplication.java  |  5 +-
 .../app/organicmaps/car/CarAppSession.java    |  2 +-
 .../app/organicmaps/car/SurfaceRenderer.java  |  6 +-
 .../car/screens/NavigationScreen.java         |  2 +-
 .../organicmaps/car/screens/PlaceScreen.java  |  2 +-
 .../util/CurrentCountryChangedListener.java   |  2 +-
 .../app/organicmaps/car/util/IntentUtils.java |  2 +-
 .../app/organicmaps/car/util/ThemeUtils.java  |  2 +-
 .../downloader/DownloaderAdapter.java         |  2 +-
 .../downloader/OnmapDownloader.java           |  2 +-
 .../java/app/organicmaps/intent/Factory.java  |  2 +-
 .../maplayer/MapButtonsController.java        |  2 +-
 .../app/organicmaps/maplayer/SearchWheel.java |  2 +-
 .../maplayer/ToggleMapLayerFragment.java      |  4 ++
 .../BaseRoutingErrorDialogFragment.java       |  1 +
 .../routing/ManageRouteBottomSheet.java       |  1 +
 .../routing/NavigationController.java         |  1 +
 .../routing/NavigationService.java            |  1 +
 .../routing/RoutingBottomMenuController.java  |  9 +--
 .../routing/RoutingMapsDownloadFragment.java  |  1 +
 .../routing/RoutingPlanController.java        |  1 +
 .../routing/RoutingPlanFragment.java          |  1 +
 .../main/java/app/organicmaps/sdk/Map.java    | 15 +++--
 .../java/app/organicmaps/sdk/OrganicMaps.java | 11 ++--
 .../app/organicmaps/sdk/api/RequestType.java  | 16 ++---
 .../sdk/location/LocationHelper.java          |  3 +-
 .../app/organicmaps/sdk/maplayer/Mode.java    |  4 +-
 .../maplayer/isolines/IsolinesManager.java    |  8 +--
 .../sdk/maplayer/isolines/IsolinesState.java  | 35 +----------
 .../isolines/OnIsolinesChangedListener.java   | 17 +-----
 .../{ => sdk}/routing/RoutingController.java  | 60 +++----------------
 .../{ => sdk}/settings/StorageItem.java       |  2 +-
 .../settings/StoragePathManager.java          |  6 +-
 .../java/app/organicmaps/sdk/util/Config.java |  2 +-
 .../app/organicmaps/sdk/util/Constants.java   |  9 ---
 .../widget/placepage/CoordinatesFormat.java   |  2 +-
 .../organicmaps/search/SearchFragment.java    |  2 +-
 .../search/SearchHistoryAdapter.java          |  2 +-
 .../search/SearchHistoryFragment.java         |  2 +-
 .../settings/DrivingOptionsFragment.java      |  2 +-
 .../settings/SettingsPrefsFragment.java       |  2 +-
 .../settings/StoragePathAdapter.java          |  2 +
 .../settings/StoragePathFragment.java         |  2 +
 .../{sdk => }/util/ThemeSwitcher.java         |  8 +--
 .../main/java/app/organicmaps/util/Utils.java | 33 +++++++++-
 .../ElevationProfileViewRenderer.java         |  6 +-
 .../widget/placepage/PlacePageController.java |  2 +-
 .../widget/placepage/PlacePageView.java       |  7 ++-
 50 files changed, 156 insertions(+), 198 deletions(-)
 rename android/app/src/main/java/app/organicmaps/{ => sdk}/routing/RoutingController.java (89%)
 rename android/app/src/main/java/app/organicmaps/{ => sdk}/settings/StorageItem.java (95%)
 rename android/app/src/main/java/app/organicmaps/{ => sdk}/settings/StoragePathManager.java (98%)
 rename android/app/src/main/java/app/organicmaps/{ => sdk}/widget/placepage/CoordinatesFormat.java (96%)
 rename android/app/src/main/java/app/organicmaps/{sdk => }/util/ThemeSwitcher.java (97%)

diff --git a/android/app/src/main/java/app/organicmaps/MapFragment.java b/android/app/src/main/java/app/organicmaps/MapFragment.java
index df0feaae6..af1626859 100644
--- a/android/app/src/main/java/app/organicmaps/MapFragment.java
+++ b/android/app/src/main/java/app/organicmaps/MapFragment.java
@@ -23,7 +23,10 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 public class MapFragment extends BaseMwmFragment implements View.OnTouchListener, SurfaceHolder.Callback
 {
   private static final String TAG = MapFragment.class.getSimpleName();
-  private final Map mMap = new Map(DisplayType.Device);
+
+  @SuppressWarnings("NonNullFieldNotInitialized")
+  @NonNull
+  private Map mMap;
 
   public void updateCompassOffset(int offsetX, int offsetY)
   {
@@ -84,6 +87,7 @@ public class MapFragment extends BaseMwmFragment implements View.OnTouchListener
   {
     Logger.d(TAG);
     super.onAttach(context);
+    mMap = new Map(DisplayType.Device, MwmApplication.from(requireContext()).getLocationHelper());
     mMap.setMapRenderingListener((MapRenderingListener) context);
     mMap.setCallbackUnsupported(this::reportUnsupported);
   }
diff --git a/android/app/src/main/java/app/organicmaps/MwmActivity.java b/android/app/src/main/java/app/organicmaps/MwmActivity.java
index 47a97b0a7..3e48cfd3a 100644
--- a/android/app/src/main/java/app/organicmaps/MwmActivity.java
+++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java
@@ -82,7 +82,6 @@ import app.organicmaps.routing.ManageRouteBottomSheet;
 import app.organicmaps.routing.NavigationController;
 import app.organicmaps.routing.NavigationService;
 import app.organicmaps.routing.RoutingBottomMenuListener;
-import app.organicmaps.routing.RoutingController;
 import app.organicmaps.routing.RoutingErrorDialogFragment;
 import app.organicmaps.routing.RoutingPlanFragment;
 import app.organicmaps.routing.RoutingPlanInplaceController;
@@ -108,6 +107,7 @@ import app.organicmaps.sdk.location.SensorListener;
 import app.organicmaps.sdk.location.TrackRecorder;
 import app.organicmaps.sdk.maplayer.isolines.IsolinesState;
 import app.organicmaps.sdk.routing.RouteMarkType;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.routing.RoutingOptions;
 import app.organicmaps.sdk.search.SearchEngine;
 import app.organicmaps.sdk.settings.RoadType;
@@ -115,7 +115,6 @@ import app.organicmaps.sdk.settings.UnitLocale;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.LocationUtils;
 import app.organicmaps.sdk.util.PowerManagment;
-import app.organicmaps.sdk.util.ThemeSwitcher;
 import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.sdk.util.log.Logger;
 import app.organicmaps.sdk.widget.placepage.PlacePageData;
@@ -125,6 +124,7 @@ import app.organicmaps.search.SearchFragment;
 import app.organicmaps.settings.DrivingOptionsActivity;
 import app.organicmaps.settings.SettingsActivity;
 import app.organicmaps.util.SharingUtils;
+import app.organicmaps.util.ThemeSwitcher;
 import app.organicmaps.util.ThemeUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
@@ -772,9 +772,9 @@ public class MwmActivity extends BaseMwmFragmentActivity
       final View mapView = mMapFragment.getView();
       if (mapView != null)
       {
-      int width = mapView.getWidth();
-      int height = mapView.getHeight();
-      Framework.nativeSetVisibleRect(0, 0, width, height);
+        int width = mapView.getWidth();
+        int height = mapView.getHeight();
+        Framework.nativeSetVisibleRect(0, 0, width, height);
       }
     }
     UiUtils.show(mPointChooser);
@@ -1223,21 +1223,22 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
   private void onIsolinesStateChanged(@NonNull IsolinesState type)
   {
-    if (type != IsolinesState.EXPIREDDATA)
+    if (type == IsolinesState.NODATA)
     {
-      type.activate(this, findViewById(R.id.coordinator), findViewById(R.id.menu_frame));
-      return;
+      Toast.makeText(this, R.string.isolines_location_error_dialog, Toast.LENGTH_SHORT).show();
     }
 
-    dismissAlertDialog();
-    mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
-                       .setTitle(R.string.downloader_update_maps)
-                       .setMessage(R.string.isolines_activation_error_dialog)
-                       .setPositiveButton(R.string.ok,
-                                          (dialog, which) -> startActivity(new Intent(this, DownloaderActivity.class)))
-                       .setNegativeButton(R.string.cancel, null)
-                       .setOnDismissListener(dialog -> mAlertDialog = null)
-                       .show();
+    if (type == IsolinesState.EXPIREDDATA)
+    {
+      mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+                         .setTitle(R.string.downloader_update_maps)
+                         .setMessage(R.string.isolines_activation_error_dialog)
+                         .setPositiveButton(
+                             R.string.ok, (dialog, which) -> startActivity(new Intent(this, DownloaderActivity.class)))
+                         .setNegativeButton(R.string.cancel, null)
+                         .setOnDismissListener(dialog -> mAlertDialog = null)
+                         .show();
+    }
   }
 
   @Override
diff --git a/android/app/src/main/java/app/organicmaps/MwmApplication.java b/android/app/src/main/java/app/organicmaps/MwmApplication.java
index 8aa21dac2..6268e51e1 100644
--- a/android/app/src/main/java/app/organicmaps/MwmApplication.java
+++ b/android/app/src/main/java/app/organicmaps/MwmApplication.java
@@ -18,7 +18,6 @@ import app.organicmaps.background.OsmUploadWork;
 import app.organicmaps.downloader.DownloaderNotifier;
 import app.organicmaps.location.TrackRecordingService;
 import app.organicmaps.routing.NavigationService;
-import app.organicmaps.routing.RoutingController;
 import app.organicmaps.sdk.Map;
 import app.organicmaps.sdk.OrganicMaps;
 import app.organicmaps.sdk.display.DisplayManager;
@@ -28,9 +27,11 @@ import app.organicmaps.sdk.location.SensorHelper;
 import app.organicmaps.sdk.location.TrackRecorder;
 import app.organicmaps.sdk.maplayer.isolines.IsolinesManager;
 import app.organicmaps.sdk.maplayer.subway.SubwayManager;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.ConnectionState;
 import app.organicmaps.sdk.util.log.Logger;
+import app.organicmaps.util.ThemeSwitcher;
 import app.organicmaps.util.Utils;
 import java.io.IOException;
 import java.lang.ref.WeakReference;
@@ -133,6 +134,8 @@ public class MwmApplication extends Application implements Application.ActivityL
   public boolean initOrganicMaps(@NonNull Runnable onComplete) throws IOException
   {
     return mOrganicMaps.init(() -> {
+      ThemeSwitcher.INSTANCE.initialize(this);
+      ThemeSwitcher.INSTANCE.restart(false);
       ProcessLifecycleOwner.get().getLifecycle().addObserver(mProcessLifecycleObserver);
       onComplete.run();
     });
diff --git a/android/app/src/main/java/app/organicmaps/car/CarAppSession.java b/android/app/src/main/java/app/organicmaps/car/CarAppSession.java
index e4eb30450..594869b8f 100644
--- a/android/app/src/main/java/app/organicmaps/car/CarAppSession.java
+++ b/android/app/src/main/java/app/organicmaps/car/CarAppSession.java
@@ -26,7 +26,6 @@ import app.organicmaps.car.util.CurrentCountryChangedListener;
 import app.organicmaps.car.util.IntentUtils;
 import app.organicmaps.car.util.ThemeUtils;
 import app.organicmaps.car.util.UserActionRequired;
-import app.organicmaps.routing.RoutingController;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.PlacePageActivationListener;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
@@ -34,6 +33,7 @@ import app.organicmaps.sdk.display.DisplayChangedListener;
 import app.organicmaps.sdk.display.DisplayManager;
 import app.organicmaps.sdk.display.DisplayType;
 import app.organicmaps.sdk.location.LocationState;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.LocationUtils;
 import app.organicmaps.sdk.util.log.Logger;
diff --git a/android/app/src/main/java/app/organicmaps/car/SurfaceRenderer.java b/android/app/src/main/java/app/organicmaps/car/SurfaceRenderer.java
index 9cb01e40d..2855afbe6 100644
--- a/android/app/src/main/java/app/organicmaps/car/SurfaceRenderer.java
+++ b/android/app/src/main/java/app/organicmaps/car/SurfaceRenderer.java
@@ -27,8 +27,11 @@ public class SurfaceRenderer implements DefaultLifecycleObserver, SurfaceCallbac
 {
   private static final String TAG = SurfaceRenderer.class.getSimpleName();
 
+  @NonNull
   private final CarContext mCarContext;
-  private final Map mMap = new Map(Car);
+
+  @NonNull
+  private final Map mMap;
 
   @NonNull
   private Rect mVisibleArea = new Rect();
@@ -42,6 +45,7 @@ public class SurfaceRenderer implements DefaultLifecycleObserver, SurfaceCallbac
   {
     Logger.d(TAG, "SurfaceRenderer()");
     mCarContext = carContext;
+    mMap = new Map(Car, MwmApplication.from(mCarContext).getLocationHelper());
     mIsRunning = true;
     lifecycle.addObserver(this);
     mMap.setMapRenderingListener(this);
diff --git a/android/app/src/main/java/app/organicmaps/car/screens/NavigationScreen.java b/android/app/src/main/java/app/organicmaps/car/screens/NavigationScreen.java
index 0430a77b8..c9fae2b53 100644
--- a/android/app/src/main/java/app/organicmaps/car/screens/NavigationScreen.java
+++ b/android/app/src/main/java/app/organicmaps/car/screens/NavigationScreen.java
@@ -28,11 +28,11 @@ import app.organicmaps.car.util.RoutingUtils;
 import app.organicmaps.car.util.ThemeUtils;
 import app.organicmaps.car.util.UiHelpers;
 import app.organicmaps.routing.NavigationService;
-import app.organicmaps.routing.RoutingController;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.location.LocationHelper;
 import app.organicmaps.sdk.location.LocationListener;
 import app.organicmaps.sdk.routing.JunctionInfo;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.routing.RoutingInfo;
 import app.organicmaps.sdk.sound.TtsPlayer;
 import app.organicmaps.sdk.util.LocationUtils;
diff --git a/android/app/src/main/java/app/organicmaps/car/screens/PlaceScreen.java b/android/app/src/main/java/app/organicmaps/car/screens/PlaceScreen.java
index ee04d535e..96489d783 100644
--- a/android/app/src/main/java/app/organicmaps/car/screens/PlaceScreen.java
+++ b/android/app/src/main/java/app/organicmaps/car/screens/PlaceScreen.java
@@ -35,11 +35,11 @@ import app.organicmaps.car.util.OnBackPressedCallback;
 import app.organicmaps.car.util.RoutingHelpers;
 import app.organicmaps.car.util.UiHelpers;
 import app.organicmaps.routing.ResultCodesHelper;
-import app.organicmaps.routing.RoutingController;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.Router;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
 import app.organicmaps.sdk.bookmarks.data.Metadata;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.routing.RoutingInfo;
 import app.organicmaps.sdk.util.Config;
 import java.util.Objects;
diff --git a/android/app/src/main/java/app/organicmaps/car/util/CurrentCountryChangedListener.java b/android/app/src/main/java/app/organicmaps/car/util/CurrentCountryChangedListener.java
index 802bbf8bc..ea1a9f1f1 100644
--- a/android/app/src/main/java/app/organicmaps/car/util/CurrentCountryChangedListener.java
+++ b/android/app/src/main/java/app/organicmaps/car/util/CurrentCountryChangedListener.java
@@ -7,9 +7,9 @@ import androidx.car.app.CarContext;
 import androidx.car.app.ScreenManager;
 import app.organicmaps.car.screens.download.DownloadMapsScreen;
 import app.organicmaps.car.screens.download.DownloadMapsScreenBuilder;
-import app.organicmaps.routing.RoutingController;
 import app.organicmaps.sdk.downloader.CountryItem;
 import app.organicmaps.sdk.downloader.MapManager;
+import app.organicmaps.sdk.routing.RoutingController;
 
 public class CurrentCountryChangedListener implements MapManager.CurrentCountryChangedListener
 {
diff --git a/android/app/src/main/java/app/organicmaps/car/util/IntentUtils.java b/android/app/src/main/java/app/organicmaps/car/util/IntentUtils.java
index 776e95e63..02d55fb34 100644
--- a/android/app/src/main/java/app/organicmaps/car/util/IntentUtils.java
+++ b/android/app/src/main/java/app/organicmaps/car/util/IntentUtils.java
@@ -15,13 +15,13 @@ import app.organicmaps.car.CarAppService;
 import app.organicmaps.car.SurfaceRenderer;
 import app.organicmaps.car.screens.NavigationScreen;
 import app.organicmaps.car.screens.search.SearchScreen;
-import app.organicmaps.routing.RoutingController;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.Map;
 import app.organicmaps.sdk.api.ParsedSearchRequest;
 import app.organicmaps.sdk.api.RequestType;
 import app.organicmaps.sdk.display.DisplayManager;
 import app.organicmaps.sdk.display.DisplayType;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.util.log.Logger;
 
 public final class IntentUtils
diff --git a/android/app/src/main/java/app/organicmaps/car/util/ThemeUtils.java b/android/app/src/main/java/app/organicmaps/car/util/ThemeUtils.java
index 20b688d83..4f087e207 100644
--- a/android/app/src/main/java/app/organicmaps/car/util/ThemeUtils.java
+++ b/android/app/src/main/java/app/organicmaps/car/util/ThemeUtils.java
@@ -8,8 +8,8 @@ import androidx.annotation.StringRes;
 import androidx.annotation.UiThread;
 import androidx.car.app.CarContext;
 import app.organicmaps.R;
-import app.organicmaps.routing.RoutingController;
 import app.organicmaps.sdk.MapStyle;
+import app.organicmaps.sdk.routing.RoutingController;
 
 public final class ThemeUtils
 {
diff --git a/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java b/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java
index 56060f667..597a78b45 100644
--- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java
@@ -20,9 +20,9 @@ import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.MwmActivity;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
-import app.organicmaps.routing.RoutingController;
 import app.organicmaps.sdk.downloader.CountryItem;
 import app.organicmaps.sdk.downloader.MapManager;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
diff --git a/android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java b/android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java
index 3f09d5bdc..648b382dc 100644
--- a/android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java
@@ -9,9 +9,9 @@ import androidx.core.view.ViewCompat;
 import app.organicmaps.MwmActivity;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
-import app.organicmaps.routing.RoutingController;
 import app.organicmaps.sdk.downloader.CountryItem;
 import app.organicmaps.sdk.downloader.MapManager;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.ConnectionState;
 import app.organicmaps.sdk.util.StringUtils;
diff --git a/android/app/src/main/java/app/organicmaps/intent/Factory.java b/android/app/src/main/java/app/organicmaps/intent/Factory.java
index e28aa5aad..5a2677fdd 100644
--- a/android/app/src/main/java/app/organicmaps/intent/Factory.java
+++ b/android/app/src/main/java/app/organicmaps/intent/Factory.java
@@ -10,7 +10,6 @@ import androidx.core.content.IntentCompat;
 import app.organicmaps.MwmActivity;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.editor.OsmLoginActivity;
-import app.organicmaps.routing.RoutingController;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.Map;
 import app.organicmaps.sdk.api.ParsedRoutingData;
@@ -20,6 +19,7 @@ import app.organicmaps.sdk.api.RoutePoint;
 import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
 import app.organicmaps.sdk.bookmarks.data.FeatureId;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.search.SearchEngine;
 import app.organicmaps.sdk.util.StorageUtils;
 import app.organicmaps.sdk.util.concurrency.ThreadPool;
diff --git a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
index cdfe67050..9dd0e4380 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
@@ -26,7 +26,6 @@ import app.organicmaps.MwmActivity;
 import app.organicmaps.R;
 import app.organicmaps.leftbutton.LeftButton;
 import app.organicmaps.leftbutton.LeftToggleButton;
-import app.organicmaps.routing.RoutingController;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.downloader.MapManager;
 import app.organicmaps.sdk.downloader.UpdateInfo;
@@ -34,6 +33,7 @@ import app.organicmaps.sdk.location.TrackRecorder;
 import app.organicmaps.sdk.maplayer.isolines.IsolinesManager;
 import app.organicmaps.sdk.maplayer.subway.SubwayManager;
 import app.organicmaps.sdk.maplayer.traffic.TrafficManager;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.ThemeUtils;
diff --git a/android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java b/android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java
index 962b7b15a..cc837d506 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java
@@ -14,7 +14,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import app.organicmaps.R;
-import app.organicmaps.routing.RoutingController;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.search.SearchEngine;
 import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.sdk.util.concurrency.UiThread;
diff --git a/android/app/src/main/java/app/organicmaps/maplayer/ToggleMapLayerFragment.java b/android/app/src/main/java/app/organicmaps/maplayer/ToggleMapLayerFragment.java
index 60e774e80..d54fb634b 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/ToggleMapLayerFragment.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/ToggleMapLayerFragment.java
@@ -14,6 +14,7 @@ import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.sdk.maplayer.Mode;
 import app.organicmaps.sdk.util.SharedPropertiesUtils;
+import app.organicmaps.util.ThemeSwitcher;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
 import app.organicmaps.widget.recycler.SpanningLinearLayoutManager;
@@ -72,6 +73,9 @@ public class ToggleMapLayerFragment extends Fragment
     Context context = v.getContext();
     SharedPropertiesUtils.setLayerMarkerShownForLayerMode(mode);
     mode.setEnabled(context, !mode.isEnabled(context));
+    // TODO: dirty hack :(
+    if (mode == Mode.OUTDOORS)
+      ThemeSwitcher.INSTANCE.restart(true);
     mAdapter.notifyDataSetChanged();
     mMapButtonsController.updateLayerButton();
     if (MwmApplication.from(context).getIsolinesManager().shouldShowNotification())
diff --git a/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java b/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java
index 1628b7bbf..f05f24d27 100644
--- a/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java
@@ -15,6 +15,7 @@ import app.organicmaps.R;
 import app.organicmaps.adapter.DisabledChildSimpleExpandableListAdapter;
 import app.organicmaps.base.BaseMwmDialogFragment;
 import app.organicmaps.sdk.downloader.CountryItem;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.sdk.util.UiUtils;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
diff --git a/android/app/src/main/java/app/organicmaps/routing/ManageRouteBottomSheet.java b/android/app/src/main/java/app/organicmaps/routing/ManageRouteBottomSheet.java
index 3c1028008..9e158fa1a 100644
--- a/android/app/src/main/java/app/organicmaps/routing/ManageRouteBottomSheet.java
+++ b/android/app/src/main/java/app/organicmaps/routing/ManageRouteBottomSheet.java
@@ -22,6 +22,7 @@ import app.organicmaps.R;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
 import app.organicmaps.sdk.routing.RouteMarkData;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.util.UiUtils;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
diff --git a/android/app/src/main/java/app/organicmaps/routing/NavigationController.java b/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
index 63a51b8bd..283365f3e 100644
--- a/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
@@ -18,6 +18,7 @@ import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.Router;
 import app.organicmaps.sdk.maplayer.traffic.TrafficManager;
 import app.organicmaps.sdk.routing.CarDirection;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.routing.RoutingInfo;
 import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.sdk.util.UiUtils;
diff --git a/android/app/src/main/java/app/organicmaps/routing/NavigationService.java b/android/app/src/main/java/app/organicmaps/routing/NavigationService.java
index 9582f7ae1..3a6f27387 100644
--- a/android/app/src/main/java/app/organicmaps/routing/NavigationService.java
+++ b/android/app/src/main/java/app/organicmaps/routing/NavigationService.java
@@ -35,6 +35,7 @@ import app.organicmaps.R;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.location.LocationHelper;
 import app.organicmaps.sdk.location.LocationListener;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.routing.RoutingInfo;
 import app.organicmaps.sdk.sound.MediaPlayerWrapper;
 import app.organicmaps.sdk.sound.TtsPlayer;
diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java b/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
index f8d338ae5..d6242c8df 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
@@ -32,6 +32,7 @@ import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.bookmarks.data.DistanceAndAzimut;
 import app.organicmaps.sdk.routing.RouteMarkData;
 import app.organicmaps.sdk.routing.RouteMarkType;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.routing.RoutingInfo;
 import app.organicmaps.sdk.routing.TransitRouteInfo;
 import app.organicmaps.sdk.routing.TransitStepInfo;
@@ -39,6 +40,7 @@ import app.organicmaps.sdk.util.Distance;
 import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.util.ThemeUtils;
+import app.organicmaps.util.Utils;
 import app.organicmaps.widget.recycler.DotDividerItemDecoration;
 import app.organicmaps.widget.recycler.MultilineLayoutManager;
 import com.google.android.material.imageview.ShapeableImageView;
@@ -191,8 +193,7 @@ final class RoutingBottomMenuController implements View.OnClickListener
     scrollToBottom(rv);
 
     MaterialTextView totalTimeView = mTransitFrame.findViewById(R.id.total_time);
-    totalTimeView.setText(
-        RoutingController.formatRoutingTime(mContext, info.getTotalTime(), R.dimen.text_size_routing_number));
+    totalTimeView.setText(Utils.formatRoutingTime(mContext, info.getTotalTime(), R.dimen.text_size_routing_number));
     View dotView = mTransitFrame.findViewById(R.id.dot);
     View pedestrianIcon = mTransitFrame.findViewById(R.id.pedestrian_icon);
     MaterialTextView distanceView = mTransitFrame.findViewById(R.id.total_distance);
@@ -382,7 +383,7 @@ final class RoutingBottomMenuController implements View.OnClickListener
 
     if (mArrival != null)
     {
-      String arrivalTime = RoutingController.formatArrivalTime(rinfo.totalTimeInSeconds);
+      String arrivalTime = Utils.formatArrivalTime(rinfo.totalTimeInSeconds);
       mArrival.setText(arrivalTime);
     }
   }
@@ -400,7 +401,7 @@ final class RoutingBottomMenuController implements View.OnClickListener
 
   {
     CharSequence time =
-        RoutingController.formatRoutingTime(context, routingInfo.totalTimeInSeconds, R.dimen.text_size_routing_number);
+        Utils.formatRoutingTime(context, routingInfo.totalTimeInSeconds, R.dimen.text_size_routing_number);
 
     SpannableStringBuilder builder = new SpannableStringBuilder();
     initTimeBuilderSequence(context, time, builder);
diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingMapsDownloadFragment.java b/android/app/src/main/java/app/organicmaps/routing/RoutingMapsDownloadFragment.java
index 6be818816..239ea14e3 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingMapsDownloadFragment.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingMapsDownloadFragment.java
@@ -11,6 +11,7 @@ import androidx.fragment.app.FragmentFactory;
 import app.organicmaps.R;
 import app.organicmaps.sdk.downloader.CountryItem;
 import app.organicmaps.sdk.downloader.MapManager;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.widget.WheelProgressView;
 import java.util.HashSet;
diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java
index c75af51d8..a49d32a57 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java
@@ -17,6 +17,7 @@ import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.Router;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.routing.RoutingInfo;
 import app.organicmaps.sdk.routing.RoutingOptions;
 import app.organicmaps.sdk.routing.TransitRouteInfo;
diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanFragment.java b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanFragment.java
index 5080c6383..32e7b13de 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanFragment.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanFragment.java
@@ -10,6 +10,7 @@ import app.organicmaps.MwmActivity;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmFragment;
 import app.organicmaps.sdk.Router;
+import app.organicmaps.sdk.routing.RoutingController;
 
 public class RoutingPlanFragment extends BaseMwmFragment
 {
diff --git a/android/app/src/main/java/app/organicmaps/sdk/Map.java b/android/app/src/main/java/app/organicmaps/sdk/Map.java
index f319315ee..f5dce6179 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/Map.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/Map.java
@@ -4,9 +4,9 @@ import android.content.Context;
 import android.graphics.Rect;
 import android.view.MotionEvent;
 import android.view.Surface;
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import app.organicmaps.BuildConfig;
-import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.sdk.display.DisplayType;
 import app.organicmaps.sdk.location.LocationHelper;
@@ -53,8 +53,12 @@ public final class Map
   public static final int INVALID_POINTER_MASK = 0xFF;
   public static final int INVALID_TOUCH_ID = -1;
 
+  @NonNull
   private final DisplayType mDisplayType;
 
+  @NonNull
+  private final LocationHelper mLocationHelper;
+
   private int mCurrentCompassOffsetX;
   private int mCurrentCompassOffsetY;
   private int mBottomWidgetOffsetX;
@@ -75,9 +79,10 @@ public final class Map
 
   private static int sCurrentDpi = 0;
 
-  public Map(DisplayType mapType)
+  public Map(@NonNull DisplayType mapType, @NonNull LocationHelper locationHelper)
   {
     mDisplayType = mapType;
+    mLocationHelper = locationHelper;
     onCreate(false);
   }
 
@@ -169,9 +174,7 @@ public final class Map
     mRequireResize = false;
     setupWidgets(context, surfaceFrame.width(), surfaceFrame.height());
 
-    final LocationHelper locationHelper = MwmApplication.from(context).getLocationHelper();
-
-    final boolean firstStart = locationHelper.isInFirstRun();
+    final boolean firstStart = mLocationHelper.isInFirstRun();
     if (!nativeCreateEngine(surface, surfaceDpi, firstStart, mLaunchByDeepLink, BuildConfig.VERSION_CODE,
                             ROMUtils.isCustomROM()))
     {
@@ -182,7 +185,7 @@ public final class Map
     sCurrentDpi = surfaceDpi;
 
     if (firstStart)
-      UiThread.runLater(locationHelper::onExitFromFirstRun);
+      UiThread.runLater(mLocationHelper::onExitFromFirstRun);
 
     mSurfaceCreated = true;
     mSurfaceAttached = true;
diff --git a/android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java b/android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java
index db25ce0c5..1b55c231d 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java
@@ -7,7 +7,6 @@ import androidx.lifecycle.DefaultLifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.ProcessLifecycleOwner;
 import app.organicmaps.R;
-import app.organicmaps.routing.RoutingController;
 import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
 import app.organicmaps.sdk.bookmarks.data.Icon;
 import app.organicmaps.sdk.downloader.Android7RootCertificateWorkaround;
@@ -17,16 +16,16 @@ import app.organicmaps.sdk.location.SensorHelper;
 import app.organicmaps.sdk.maplayer.isolines.IsolinesManager;
 import app.organicmaps.sdk.maplayer.subway.SubwayManager;
 import app.organicmaps.sdk.maplayer.traffic.TrafficManager;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.search.SearchEngine;
+import app.organicmaps.sdk.settings.StoragePathManager;
 import app.organicmaps.sdk.sound.TtsPlayer;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.SharedPropertiesUtils;
 import app.organicmaps.sdk.util.StorageUtils;
-import app.organicmaps.sdk.util.ThemeSwitcher;
 import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.sdk.util.log.Logger;
 import app.organicmaps.sdk.util.log.LogsManager;
-import app.organicmaps.settings.StoragePathManager;
 import java.io.IOException;
 
 public final class OrganicMaps implements DefaultLifecycleObserver
@@ -101,7 +100,7 @@ public final class OrganicMaps implements DefaultLifecycleObserver
 
     mSensorHelper = new SensorHelper(mContext);
     mLocationHelper = new LocationHelper(mContext, mSensorHelper);
-    mIsolinesManager = new IsolinesManager(mContext);
+    mIsolinesManager = new IsolinesManager();
     mSubwayManager = new SubwayManager(mContext);
   }
 
@@ -177,12 +176,10 @@ public final class OrganicMaps implements DefaultLifecycleObserver
     nativeInitFramework(onComplete);
 
     initNativeStrings();
-    ThemeSwitcher.INSTANCE.initialize(mContext);
     SearchEngine.INSTANCE.initialize();
     BookmarkManager.loadBookmarks();
     TtsPlayer.INSTANCE.initialize(mContext);
-    ThemeSwitcher.INSTANCE.restart(false);
-    RoutingController.get().initialize(mContext);
+    RoutingController.get().initialize(mLocationHelper);
     TrafficManager.INSTANCE.initialize();
     mSubwayManager.initialize();
     mIsolinesManager.initialize();
diff --git a/android/app/src/main/java/app/organicmaps/sdk/api/RequestType.java b/android/app/src/main/java/app/organicmaps/sdk/api/RequestType.java
index 65e4a9b7d..4e02274f0 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/api/RequestType.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/api/RequestType.java
@@ -10,12 +10,12 @@ import java.lang.annotation.RetentionPolicy;
 public @interface RequestType
 {
   // Represents url_scheme::ParsedMapApi::UrlType from c++ part.
-  public static final int INCORRECT = 0;
-  public static final int MAP = 1;
-  public static final int ROUTE = 2;
-  public static final int SEARCH = 3;
-  public static final int CROSSHAIR = 4;
-  public static final int OAUTH2 = 5;
-  public static final int MENU = 6;
-  public static final int SETTINGS = 7;
+  int INCORRECT = 0;
+  int MAP = 1;
+  int ROUTE = 2;
+  int SEARCH = 3;
+  int CROSSHAIR = 4;
+  int OAUTH2 = 5;
+  int MENU = 6;
+  int SETTINGS = 7;
 }
diff --git a/android/app/src/main/java/app/organicmaps/sdk/location/LocationHelper.java b/android/app/src/main/java/app/organicmaps/sdk/location/LocationHelper.java
index 7cf9cfdda..4e384ba8d 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/location/LocationHelper.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/location/LocationHelper.java
@@ -16,13 +16,12 @@ import androidx.annotation.UiThread;
 import androidx.core.content.ContextCompat;
 import androidx.core.location.GnssStatusCompat;
 import androidx.core.location.LocationManagerCompat;
-import app.organicmaps.MwmApplication;
-import app.organicmaps.routing.RoutingController;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.Map;
 import app.organicmaps.sdk.bookmarks.data.FeatureId;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
 import app.organicmaps.sdk.routing.JunctionInfo;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.LocationUtils;
 import app.organicmaps.sdk.util.NetworkPolicy;
diff --git a/android/app/src/main/java/app/organicmaps/sdk/maplayer/Mode.java b/android/app/src/main/java/app/organicmaps/sdk/maplayer/Mode.java
index 1afdbadf5..3ed242cff 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/maplayer/Mode.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/maplayer/Mode.java
@@ -6,7 +6,6 @@ import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.maplayer.isolines.IsolinesManager;
 import app.organicmaps.sdk.maplayer.subway.SubwayManager;
 import app.organicmaps.sdk.maplayer.traffic.TrafficManager;
-import app.organicmaps.sdk.util.ThemeSwitcher;
 
 public enum Mode
 {
@@ -61,7 +60,8 @@ public enum Mode
     public void setEnabled(@NonNull Context context, boolean isEnabled)
     {
       Framework.nativeSetOutdoorsLayerEnabled(isEnabled);
-      ThemeSwitcher.INSTANCE.restart(true);
+      // TODO: ThemeSwitcher is outside sdk package. Properly fix dependencies
+      // ThemeSwitcher.INSTANCE.restart(true);
     }
   };
 
diff --git a/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesManager.java b/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesManager.java
index e656492b9..bfcb5be3b 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesManager.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesManager.java
@@ -1,18 +1,12 @@
 package app.organicmaps.sdk.maplayer.isolines;
 
-import android.content.Context;
 import androidx.annotation.NonNull;
 import app.organicmaps.sdk.Framework;
 
 public class IsolinesManager
 {
   @NonNull
-  private final OnIsolinesChangedListener mListener;
-
-  public IsolinesManager(@NonNull Context context)
-  {
-    mListener = new OnIsolinesChangedListener(context);
-  }
+  private final OnIsolinesChangedListener mListener = new OnIsolinesChangedListener();
 
   static public boolean isEnabled()
   {
diff --git a/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesState.java b/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesState.java
index 37cdfe8b6..90b665ee2 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesState.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesState.java
@@ -1,40 +1,9 @@
 package app.organicmaps.sdk.maplayer.isolines;
 
-import android.content.Context;
-import android.view.View;
-import android.widget.Toast;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import app.organicmaps.R;
-import app.organicmaps.util.Utils;
-
 public enum IsolinesState
 {
   DISABLED,
   ENABLED,
-  EXPIREDDATA {
-    @Override
-    public void activate(@NonNull Context context, @Nullable View view, @Nullable View viewAbove)
-    {
-      if (view != null)
-        Utils.showSnackbar(context, view, viewAbove, R.string.isolines_activation_error_dialog);
-      else
-        Toast.makeText(context, R.string.isolines_activation_error_dialog, Toast.LENGTH_SHORT).show();
-    }
-  },
-  NODATA {
-    @Override
-    public void activate(@NonNull Context context, @Nullable View view, @Nullable View viewAbove)
-    {
-      if (view != null)
-        Utils.showSnackbar(context, view, viewAbove, R.string.isolines_location_error_dialog);
-      else
-        Toast.makeText(context, R.string.isolines_location_error_dialog, Toast.LENGTH_SHORT).show();
-    }
-  };
-
-  public void activate(@NonNull Context context, @Nullable View viewAbove, @Nullable View view)
-  {
-    /* Do nothing by default */
-  }
+  EXPIREDDATA,
+  NODATA;
 }
diff --git a/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/OnIsolinesChangedListener.java b/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/OnIsolinesChangedListener.java
index 01a6fe614..e480ad458 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/OnIsolinesChangedListener.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/OnIsolinesChangedListener.java
@@ -1,33 +1,22 @@
 package app.organicmaps.sdk.maplayer.isolines;
 
-import android.content.Context;
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 class OnIsolinesChangedListener
 {
-  @NonNull
-  private final Context mContext;
+  @Nullable
   private IsolinesErrorDialogListener mListener;
 
-  OnIsolinesChangedListener(@NonNull Context app)
-  {
-    mContext = app;
-  }
-
   // Called from JNI.
   @Keep
   @SuppressWarnings("unused")
   public void onStateChanged(int type)
   {
-    IsolinesState state = IsolinesState.values()[type];
     if (mListener == null)
-    {
-      state.activate(mContext, null, null);
       return;
-    }
-
-    mListener.onStateChanged(state);
+    mListener.onStateChanged(IsolinesState.values()[type]);
   }
 
   public void attach(@NonNull IsolinesErrorDialogListener listener)
diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingController.java b/android/app/src/main/java/app/organicmaps/sdk/routing/RoutingController.java
similarity index 89%
rename from android/app/src/main/java/app/organicmaps/routing/RoutingController.java
rename to android/app/src/main/java/app/organicmaps/sdk/routing/RoutingController.java
index 3df9ad8f0..277f3e2d8 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingController.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/routing/RoutingController.java
@@ -1,38 +1,19 @@
-package app.organicmaps.routing;
+package app.organicmaps.sdk.routing;
 
-import android.content.Context;
-import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
-import androidx.annotation.DimenRes;
 import androidx.annotation.IntRange;
 import androidx.annotation.MainThread;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.util.Pair;
-import app.organicmaps.MwmApplication;
-import app.organicmaps.R;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.Router;
 import app.organicmaps.sdk.bookmarks.data.FeatureId;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
-import app.organicmaps.sdk.routing.ResultCodes;
-import app.organicmaps.sdk.routing.RouteMarkData;
-import app.organicmaps.sdk.routing.RouteMarkType;
-import app.organicmaps.sdk.routing.RoutePointInfo;
-import app.organicmaps.sdk.routing.RouteRecommendationType;
-import app.organicmaps.sdk.routing.RoutingInfo;
-import app.organicmaps.sdk.routing.RoutingListener;
-import app.organicmaps.sdk.routing.RoutingLoadPointsListener;
-import app.organicmaps.sdk.routing.RoutingOptions;
-import app.organicmaps.sdk.routing.RoutingProgressListener;
-import app.organicmaps.sdk.routing.TransitRouteInfo;
-import app.organicmaps.sdk.util.StringUtils;
+import app.organicmaps.sdk.location.LocationHelper;
 import app.organicmaps.sdk.util.concurrency.UiThread;
 import app.organicmaps.sdk.util.log.Logger;
-import app.organicmaps.util.Utils;
-import app.organicmaps.widget.placepage.CoordinatesFormat;
-import java.time.LocalTime;
-import java.util.concurrent.TimeUnit;
+import app.organicmaps.sdk.widget.placepage.CoordinatesFormat;
 
 @androidx.annotation.UiThread
 public class RoutingController
@@ -114,7 +95,7 @@ public class RoutingController
       mLastMissingMaps = missingMaps;
       mContainsCachedResult = true;
 
-      if (mLastResultCode == ResultCodes.NO_ERROR || ResultCodesHelper.isMoreMapsNeeded(mLastResultCode))
+      if (mLastResultCode == ResultCodes.NO_ERROR || resultCode == ResultCodes.NEED_MORE_MAPS)
       {
         onBuiltRoute();
       }
@@ -180,7 +161,7 @@ public class RoutingController
       return;
     }
 
-    if (!ResultCodesHelper.isMoreMapsNeeded(mLastResultCode))
+    if (mLastResultCode != ResultCodes.NEED_MORE_MAPS)
     {
       setBuildState(BuildState.ERROR);
       mLastBuildProgress = 0;
@@ -195,8 +176,7 @@ public class RoutingController
 
   private boolean isDrivingOptionsBuildError()
   {
-    return !ResultCodesHelper.isMoreMapsNeeded(mLastResultCode) && RoutingOptions.hasAnyOptions()
- && !isRulerRouterType();
+    return mLastResultCode != ResultCodes.NEED_MORE_MAPS && RoutingOptions.hasAnyOptions() && !isRulerRouterType();
   }
 
   private void setState(State newState)
@@ -250,7 +230,7 @@ public class RoutingController
     mContainer = container;
   }
 
-  public void initialize(@NonNull Context context)
+  public void initialize(@NonNull LocationHelper locationHelper)
   {
     mLastRouterType = Router.getLastUsed();
     mInvalidRoutePointsTransactionId = Framework.nativeInvalidRoutePointsTransactionId();
@@ -260,7 +240,7 @@ public class RoutingController
     Framework.nativeSetRouteProgressListener(mRoutingProgressListener);
     Framework.nativeSetRoutingRecommendationListener(recommendation -> UiThread.run(() -> {
       if (recommendation == RouteRecommendationType.RebuildAfterPointsLoading)
-        setStartPoint(MwmApplication.from(context).getLocationHelper().getMyPosition());
+        setStartPoint(locationHelper.getMyPosition());
     }));
     Framework.nativeSetRoutingLoadPointsListener(mRoutingLoadPointsListener);
   }
@@ -557,7 +537,7 @@ public class RoutingController
     return mLastRouterType == Router.Vehicle;
   }
 
-  boolean isRulerRouterType()
+  public boolean isRulerRouterType()
   {
     return mLastRouterType == Router.Ruler;
   }
@@ -883,26 +863,4 @@ public class RoutingController
 
     mWaitingPoiPickType = null;
   }
-  public static CharSequence formatRoutingTime(Context context, int seconds, @DimenRes int unitsSize)
-  {
-    return formatRoutingTime(context, seconds, unitsSize, R.dimen.text_size_routing_number);
-  }
-
-  public static CharSequence formatRoutingTime(Context context, int seconds, @DimenRes int unitsSize,
-                                               @DimenRes int textSize)
-  {
-    long minutes = TimeUnit.SECONDS.toMinutes(seconds) % 60;
-    long hours = TimeUnit.SECONDS.toHours(seconds);
-    String min = context.getString(R.string.minute);
-    String hour = context.getString(R.string.hour);
-    SpannableStringBuilder displayedH = Utils.formatTime(context, textSize, unitsSize, String.valueOf(hours), hour);
-    SpannableStringBuilder displayedM = Utils.formatTime(context, textSize, unitsSize, String.valueOf(minutes), min);
-    return hours == 0 ? displayedM : TextUtils.concat(displayedH + "\u00A0", displayedM);
-  }
-
-  static String formatArrivalTime(int seconds)
-  {
-    final LocalTime time = LocalTime.now().plusSeconds(seconds);
-    return StringUtils.formatUsingUsLocale("%d:%02d", time.getHour(), time.getMinute());
-  }
 }
diff --git a/android/app/src/main/java/app/organicmaps/settings/StorageItem.java b/android/app/src/main/java/app/organicmaps/sdk/settings/StorageItem.java
similarity index 95%
rename from android/app/src/main/java/app/organicmaps/settings/StorageItem.java
rename to android/app/src/main/java/app/organicmaps/sdk/settings/StorageItem.java
index 8eb36701b..72074da2c 100644
--- a/android/app/src/main/java/app/organicmaps/settings/StorageItem.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/settings/StorageItem.java
@@ -1,4 +1,4 @@
-package app.organicmaps.settings;
+package app.organicmaps.sdk.settings;
 
 /**
  * Represents storage option.
diff --git a/android/app/src/main/java/app/organicmaps/settings/StoragePathManager.java b/android/app/src/main/java/app/organicmaps/sdk/settings/StoragePathManager.java
similarity index 98%
rename from android/app/src/main/java/app/organicmaps/settings/StoragePathManager.java
rename to android/app/src/main/java/app/organicmaps/sdk/settings/StoragePathManager.java
index d22f93193..5164f1088 100644
--- a/android/app/src/main/java/app/organicmaps/settings/StoragePathManager.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/settings/StoragePathManager.java
@@ -1,4 +1,4 @@
-package app.organicmaps.settings;
+package app.organicmaps.sdk.settings;
 
 import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
@@ -28,7 +28,7 @@ public class StoragePathManager
   private static final String TAG = StoragePathManager.class.getSimpleName();
   private static final String DATA_FILE_EXT = Framework.nativeGetDataFileExt();
   private static final String[] MOVABLE_EXTS = Framework.nativeGetMovableFilesExts();
-  static final FilenameFilter MOVABLE_FILES_FILTER = (dir, filename) ->
+  public static final FilenameFilter MOVABLE_FILES_FILTER = (dir, filename) ->
   {
     for (String ext : MOVABLE_EXTS)
       if (filename.endsWith(ext))
@@ -37,7 +37,7 @@ public class StoragePathManager
     return false;
   };
 
-  interface OnStorageListChangedListener
+  public interface OnStorageListChangedListener
   {
     void onStorageListChanged(List<StorageItem> storageItems, int currentStorageIndex);
   }
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/Config.java b/android/app/src/main/java/app/organicmaps/sdk/util/Config.java
index 3868c0aab..fbdf46154 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/util/Config.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/util/Config.java
@@ -231,7 +231,7 @@ public final class Config
     return defaultTheme;
   }
 
-  static void setCurrentUiTheme(@NonNull Context context, @NonNull String theme)
+  public static void setCurrentUiTheme(@NonNull Context context, @NonNull String theme)
   {
     if (getCurrentUiTheme(context).equals(theme))
       return;
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/Constants.java b/android/app/src/main/java/app/organicmaps/sdk/util/Constants.java
index d8d49111f..6a3ef828e 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/util/Constants.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/util/Constants.java
@@ -1,7 +1,5 @@
 package app.organicmaps.sdk.util;
 
-import app.organicmaps.BuildConfig;
-
 public final class Constants
 {
   public static final int KB = 1024;
@@ -36,13 +34,6 @@ public final class Constants
     private Url() {}
   }
 
-  public static class Email
-  {
-    public static final String SUPPORT = BuildConfig.SUPPORT_MAIL;
-
-    private Email() {}
-  }
-
   public static class Package
   {
     public static final String FB_PACKAGE = "com.facebook.katana";
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/CoordinatesFormat.java b/android/app/src/main/java/app/organicmaps/sdk/widget/placepage/CoordinatesFormat.java
similarity index 96%
rename from android/app/src/main/java/app/organicmaps/widget/placepage/CoordinatesFormat.java
rename to android/app/src/main/java/app/organicmaps/sdk/widget/placepage/CoordinatesFormat.java
index ad621f990..a93adeaf0 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/CoordinatesFormat.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/widget/placepage/CoordinatesFormat.java
@@ -1,4 +1,4 @@
-package app.organicmaps.widget.placepage;
+package app.organicmaps.sdk.widget.placepage;
 
 public enum CoordinatesFormat
 {
diff --git a/android/app/src/main/java/app/organicmaps/search/SearchFragment.java b/android/app/src/main/java/app/organicmaps/search/SearchFragment.java
index 766ce2d8d..7f8bf0d7b 100644
--- a/android/app/src/main/java/app/organicmaps/search/SearchFragment.java
+++ b/android/app/src/main/java/app/organicmaps/search/SearchFragment.java
@@ -26,12 +26,12 @@ import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmFragment;
 import app.organicmaps.downloader.CountrySuggestFragment;
-import app.organicmaps.routing.RoutingController;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.bookmarks.data.FeatureId;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
 import app.organicmaps.sdk.downloader.MapManager;
 import app.organicmaps.sdk.location.LocationListener;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.search.SearchEngine;
 import app.organicmaps.sdk.search.SearchListener;
 import app.organicmaps.sdk.search.SearchRecents;
diff --git a/android/app/src/main/java/app/organicmaps/search/SearchHistoryAdapter.java b/android/app/src/main/java/app/organicmaps/search/SearchHistoryAdapter.java
index df906f695..368d845a8 100644
--- a/android/app/src/main/java/app/organicmaps/search/SearchHistoryAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/search/SearchHistoryAdapter.java
@@ -8,7 +8,7 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
-import app.organicmaps.routing.RoutingController;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.search.SearchRecents;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.widget.SearchToolbarController;
diff --git a/android/app/src/main/java/app/organicmaps/search/SearchHistoryFragment.java b/android/app/src/main/java/app/organicmaps/search/SearchHistoryFragment.java
index 82d3c29b1..45770d6ac 100644
--- a/android/app/src/main/java/app/organicmaps/search/SearchHistoryFragment.java
+++ b/android/app/src/main/java/app/organicmaps/search/SearchHistoryFragment.java
@@ -10,7 +10,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmRecyclerFragment;
-import app.organicmaps.routing.RoutingController;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.widget.PlaceholderView;
 import app.organicmaps.widget.SearchToolbarController;
diff --git a/android/app/src/main/java/app/organicmaps/settings/DrivingOptionsFragment.java b/android/app/src/main/java/app/organicmaps/settings/DrivingOptionsFragment.java
index 69d3a53e0..18349133b 100644
--- a/android/app/src/main/java/app/organicmaps/settings/DrivingOptionsFragment.java
+++ b/android/app/src/main/java/app/organicmaps/settings/DrivingOptionsFragment.java
@@ -11,7 +11,7 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.widget.SwitchCompat;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmToolbarFragment;
-import app.organicmaps.routing.RoutingController;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.routing.RoutingOptions;
 import app.organicmaps.sdk.settings.RoadType;
 import java.util.ArrayList;
diff --git a/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java b/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
index 125f786da..aaf98b69e 100644
--- a/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
+++ b/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
@@ -35,8 +35,8 @@ import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.NetworkPolicy;
 import app.organicmaps.sdk.util.PowerManagment;
 import app.organicmaps.sdk.util.SharedPropertiesUtils;
-import app.organicmaps.sdk.util.ThemeSwitcher;
 import app.organicmaps.sdk.util.log.LogsManager;
+import app.organicmaps.util.ThemeSwitcher;
 import app.organicmaps.util.Utils;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import java.util.ArrayList;
diff --git a/android/app/src/main/java/app/organicmaps/settings/StoragePathAdapter.java b/android/app/src/main/java/app/organicmaps/settings/StoragePathAdapter.java
index 13dca24dc..d9f64b88f 100644
--- a/android/app/src/main/java/app/organicmaps/settings/StoragePathAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/settings/StoragePathAdapter.java
@@ -11,6 +11,8 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.CheckedTextView;
 import app.organicmaps.R;
+import app.organicmaps.sdk.settings.StorageItem;
+import app.organicmaps.sdk.settings.StoragePathManager;
 import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.ThemeUtils;
 
diff --git a/android/app/src/main/java/app/organicmaps/settings/StoragePathFragment.java b/android/app/src/main/java/app/organicmaps/settings/StoragePathFragment.java
index 88001de91..e435632c9 100644
--- a/android/app/src/main/java/app/organicmaps/settings/StoragePathFragment.java
+++ b/android/app/src/main/java/app/organicmaps/settings/StoragePathFragment.java
@@ -12,6 +12,8 @@ import androidx.activity.result.ActivityResultLauncher;
 import androidx.annotation.NonNull;
 import app.organicmaps.R;
 import app.organicmaps.sdk.Framework;
+import app.organicmaps.sdk.settings.StorageItem;
+import app.organicmaps.sdk.settings.StoragePathManager;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.StorageUtils;
 import app.organicmaps.sdk.util.concurrency.ThreadPool;
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/ThemeSwitcher.java b/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java
similarity index 97%
rename from android/app/src/main/java/app/organicmaps/sdk/util/ThemeSwitcher.java
rename to android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java
index 0acd89688..14a40d9da 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/util/ThemeSwitcher.java
+++ b/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java
@@ -1,4 +1,4 @@
-package app.organicmaps.sdk.util;
+package app.organicmaps.util;
 
 import android.app.Activity;
 import android.app.UiModeManager;
@@ -10,12 +10,11 @@ import androidx.appcompat.app.AppCompatDelegate;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.downloader.DownloaderStatusIcon;
-import app.organicmaps.routing.RoutingController;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.MapStyle;
-import app.organicmaps.sdk.display.DisplayManager;
+import app.organicmaps.sdk.routing.RoutingController;
+import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.concurrency.UiThread;
-import app.organicmaps.util.ThemeUtils;
 import java.util.Calendar;
 
 public enum ThemeSwitcher
@@ -150,6 +149,7 @@ public enum ThemeSwitcher
    *
    * @return theme_light/dark string
    */
+  @NonNull
   private String calcAutoTheme()
   {
     String defaultTheme = mContext.getResources().getString(R.string.theme_default);
diff --git a/android/app/src/main/java/app/organicmaps/util/Utils.java b/android/app/src/main/java/app/organicmaps/util/Utils.java
index 5c6614da1..430b3eb74 100644
--- a/android/app/src/main/java/app/organicmaps/util/Utils.java
+++ b/android/app/src/main/java/app/organicmaps/util/Utils.java
@@ -41,12 +41,15 @@ import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.sdk.util.Constants;
 import app.organicmaps.sdk.util.Distance;
+import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.sdk.util.concurrency.UiThread;
 import app.organicmaps.sdk.util.log.Logger;
 import app.organicmaps.sdk.util.log.LogsManager;
 import com.google.android.material.snackbar.Snackbar;
 import java.lang.ref.WeakReference;
+import java.time.LocalTime;
+import java.util.concurrent.TimeUnit;
 
 @Keep
 public class Utils
@@ -259,7 +262,7 @@ public class Utils
     subject =
         activity.getString(R.string.project_name) + " Bug Report" + (TextUtils.isEmpty(subject) ? "" : ": " + subject);
     LogsManager.INSTANCE.zipLogs(
-        new SupportInfoWithLogsCallback(launcher, activity, subject, body, Constants.Email.SUPPORT));
+        new SupportInfoWithLogsCallback(launcher, activity, subject, body, BuildConfig.SUPPORT_MAIL));
   }
 
   // TODO: Don't send logs with general feedback, send system information only (version, device name, connectivity,
@@ -268,7 +271,7 @@ public class Utils
                                   @NonNull Activity activity)
   {
     LogsManager.INSTANCE.zipLogs(new SupportInfoWithLogsCallback(
-        launcher, activity, activity.getString(R.string.project_name) + " Feedback", "", Constants.Email.SUPPORT));
+        launcher, activity, activity.getString(R.string.project_name) + " Feedback", "", BuildConfig.SUPPORT_MAIL));
   }
 
   public static void navigateToParent(@NonNull Activity activity)
@@ -460,4 +463,30 @@ public class Utils
       return getPackageInfoOld(manager, packageName, flags);
     return manager.getPackageInfo(packageName, PackageManager.PackageInfoFlags.of(flags));
   }
+
+  @NonNull
+  public static CharSequence formatRoutingTime(Context context, int seconds, @DimenRes int unitsSize)
+  {
+    return formatRoutingTime(context, seconds, unitsSize, R.dimen.text_size_routing_number);
+  }
+
+  @NonNull
+  public static CharSequence formatRoutingTime(Context context, int seconds, @DimenRes int unitsSize,
+                                               @DimenRes int textSize)
+  {
+    long minutes = TimeUnit.SECONDS.toMinutes(seconds) % 60;
+    long hours = TimeUnit.SECONDS.toHours(seconds);
+    String min = context.getString(R.string.minute);
+    String hour = context.getString(R.string.hour);
+    SpannableStringBuilder displayedH = Utils.formatTime(context, textSize, unitsSize, String.valueOf(hours), hour);
+    SpannableStringBuilder displayedM = Utils.formatTime(context, textSize, unitsSize, String.valueOf(minutes), min);
+    return hours == 0 ? displayedM : TextUtils.concat(displayedH + "\u00A0", displayedM);
+  }
+
+  @NonNull
+  public static String formatArrivalTime(int seconds)
+  {
+    final LocalTime time = LocalTime.now().plusSeconds(seconds);
+    return StringUtils.formatUsingUsLocale("%d:%02d", time.getHour(), time.getMinute());
+  }
 }
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java b/android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java
index f0f4442cb..d6a808555 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java
@@ -10,11 +10,11 @@ import androidx.annotation.Nullable;
 import androidx.core.widget.NestedScrollView;
 import app.organicmaps.ChartController;
 import app.organicmaps.R;
-import app.organicmaps.routing.RoutingController;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.bookmarks.data.ElevationInfo;
 import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.sdk.widget.placepage.PlacePageData;
+import app.organicmaps.util.Utils;
 import java.util.Objects;
 
 @SuppressWarnings("unused") // https://github.com/organicmaps/organicmaps/issues/2829
@@ -72,8 +72,8 @@ public class ElevationProfileViewRenderer implements PlacePageStateListener
     mMaxAltitude.setText(formatDistance(context, mElevationInfo.getMaxAltitude()));
     mMinAltitude.setText(formatDistance(context, mElevationInfo.getMinAltitude()));
     UiUtils.hideIf(mElevationInfo.getDuration() == 0, mTimeContainer);
-    mTime.setText(RoutingController.formatRoutingTime(mTitle.getContext(), (int) mElevationInfo.getDuration(),
-                                                      R.dimen.text_size_body_2));
+    mTime.setText(
+        Utils.formatRoutingTime(mTitle.getContext(), (int) mElevationInfo.getDuration(), R.dimen.text_size_body_2));
   }
 
   @NonNull
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
index c8de26b72..c85225f6c 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
@@ -25,12 +25,12 @@ import app.organicmaps.MwmActivity;
 import app.organicmaps.R;
 import app.organicmaps.api.Const;
 import app.organicmaps.intent.Factory;
-import app.organicmaps.routing.RoutingController;
 import app.organicmaps.sdk.ChoosePositionMode;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
 import app.organicmaps.sdk.bookmarks.data.RoadWarningMarkType;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.settings.RoadType;
 import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.sdk.util.log.Logger;
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
index 2c5b332f0..7a41c5e17 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
@@ -30,8 +30,7 @@ import app.organicmaps.MwmActivity;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.downloader.DownloaderStatusIcon;
-import app.organicmaps.editor.OhState; //pastk: move?
-import app.organicmaps.routing.RoutingController;
+import app.organicmaps.editor.OhState;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.bookmarks.data.DistanceAndAzimut;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
@@ -39,15 +38,17 @@ import app.organicmaps.sdk.bookmarks.data.Metadata;
 import app.organicmaps.sdk.downloader.CountryItem;
 import app.organicmaps.sdk.downloader.MapManager;
 import app.organicmaps.sdk.editor.Editor;
-import app.organicmaps.sdk.editor.OpeningHours; //pastk: a part of Editor?
+import app.organicmaps.sdk.editor.OpeningHours;
 import app.organicmaps.sdk.editor.data.HoursMinutes;
 import app.organicmaps.sdk.editor.data.Timetable;
 import app.organicmaps.sdk.location.LocationListener;
 import app.organicmaps.sdk.location.SensorListener;
+import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.util.DateUtils;
 import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.sdk.util.concurrency.UiThread;
+import app.organicmaps.sdk.widget.placepage.CoordinatesFormat;
 import app.organicmaps.util.SharingUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.widget.ArrowView;

From 872c0d3e152b5c98cc457ba3c90c4e77f1b165b8 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Mon, 21 Jul 2025 23:27:13 +0300
Subject: [PATCH 040/302] .clang-format rules

Signed-off-by: Alexander Borsuk <me@alex.bio>

.clang-format remove unnecessary semicolons

Signed-off-by: Alexander Borsuk <me@alex.bio>

[clang-format] Removed "AlignArrayOfStructures".

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 .clang-format | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.clang-format b/.clang-format
index a5b87e0ba..fceb426b3 100644
--- a/.clang-format
+++ b/.clang-format
@@ -3,7 +3,6 @@ BasedOnStyle: Google
 
 AccessModifierOffset: -2
 AlignAfterOpenBracket: Align
-AlignArrayOfStructures: Right
 AlignConsecutiveMacros: AcrossEmptyLinesAndComments
 AlignEscapedNewlines: LeftWithLastLine
 AlignOperands: AlignAfterOperator
@@ -40,8 +39,10 @@ ColumnLimit: 120
 ConstructorInitializerIndentWidth: 2
 ContinuationIndentWidth: 4
 DerivePointerAlignment: false
+EmptyLineBeforeAccessModifier: Always
 IncludeBlocks: Preserve
 IndentAccessModifiers: false
+IndentCaseLabels: false
 IndentExternBlock: NoIndent
 InsertBraces: false
 InsertNewlineAtEOF: true
@@ -49,6 +50,7 @@ LambdaBodyIndentation: OuterScope
 PackConstructorInitializers: CurrentLine
 PointerAlignment: Middle
 RemoveBracesLLVM: true
+RemoveSemicolon: true
 QualifierAlignment: Right
 SpacesInContainerLiterals: false
 Standard: Latest

From fbe3f72fb16f12695ffb1eaff40531d8b5603bb2 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Fri, 25 Jul 2025 00:44:34 +0200
Subject: [PATCH 041/302] .clang-format-ignore

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 .clang-format-ignore | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .clang-format-ignore

diff --git a/.clang-format-ignore b/.clang-format-ignore
new file mode 100644
index 000000000..9c47cc33e
--- /dev/null
+++ b/.clang-format-ignore
@@ -0,0 +1,8 @@
+# Files that should not be formatted.
+./3party
+# A patched copy of the https://registry.khronos.org/OpenGL/api/GLES3/gl3.h
+./android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/gl3stub.h
+# Formatting it leads to crashes in runtime. Newer protobuf may fix it.
+./libs/indexer/drules_struct.pb.cc
+# No need to format this 3party tool.
+tools/osmctools/*.c

From 5063b511ae94f32cd8104cb03a975c41c1d35423 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Fri, 25 Jul 2025 00:48:04 +0200
Subject: [PATCH 042/302] tools/unix/clang-format.sh to format all necessary
 files in the repo

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 tools/unix/clang-format.sh | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100755 tools/unix/clang-format.sh

diff --git a/tools/unix/clang-format.sh b/tools/unix/clang-format.sh
new file mode 100755
index 000000000..9c373b85e
--- /dev/null
+++ b/tools/unix/clang-format.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+echo "Running clang-format on all repository files..."
+
+XARGS_COMMAND='xargs -n1 -0 -P0 clang-format -i'
+
+# Android
+find android/{app,sdk}/src -type f -name '*.java' -print0 | $XARGS_COMMAND
+find android/sdk/src/main/cpp -type f -name '*.[hc]pp' -print0 | $XARGS_COMMAND
+
+# iOS
+find iphone -type f -name '*.[hc]pp' -o -name '*.[hm]' -o -name '*.mm' -print0 | $XARGS_COMMAND
+
+# Core/C++
+find dev_sandbox generator libs qt tools -type f -name '*.[hc]pp' -print0 | $XARGS_COMMAND
+
+git diff --exit-code

From 518747d5039e3f7729467785edb04c24e945ba25 Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Fri, 25 Jul 2025 20:48:53 +0200
Subject: [PATCH 043/302] [ci] add code style check workflow

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 .github/workflows/code-style-check.yaml | 51 +++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 .github/workflows/code-style-check.yaml

diff --git a/.github/workflows/code-style-check.yaml b/.github/workflows/code-style-check.yaml
new file mode 100644
index 000000000..409f0a5e8
--- /dev/null
+++ b/.github/workflows/code-style-check.yaml
@@ -0,0 +1,51 @@
+name: Code style check
+
+on:
+  pull_request:
+    branches: [ master ]
+    paths:  # Should stay in sync with tools/unix/clang-format.sh
+      - '.github/workflows/code-style-check.yaml'
+      - 'android/app/src/**.java'
+      - 'android/sdk/src/**.java'
+      - 'android/sdk/src/main/cpp/**.[ch]pp'
+      - 'dev_sandbox/**.[ch]pp'
+      - 'generator/**.[ch]pp'
+      - 'iphone/**.[ch]pp'
+      - 'iphone/**.[hm]'
+      - 'iphone/**.mm'
+      - 'libs/**.[ch]pp'
+      - 'libs/**.[hm]'
+      - '!libs/indexer/drules_struct.pb.h'
+      - 'libs/**.mm'
+      - 'qt/**.[ch]pp'
+      - 'qt/**.h'
+      - 'tools/**.[ch]pp'
+      - '.clang-format'
+      - '.clang-format-ignore'
+
+jobs:
+  code-style-check:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install clang-format
+        run: |
+          sudo apt purge -y clang-format-18  # Remove default old version of clang-format
+          wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
+          echo 'deb http://apt.llvm.org/noble/ llvm-toolchain-noble-20 main' | sudo tee /etc/apt/sources.list.d/llvm-toolchain-noble-20.list
+          sudo apt-get update
+          sudo apt-get install -y clang-format-20
+          sudo update-alternatives --force --install /usr/bin/clang-format clang-format /usr/bin/clang-format-20 10
+          sudo update-alternatives --force --install /usr/bin/git-clang-format git-clang-format /usr/bin/git-clang-format-20 10
+          clang-format --version
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
+      - name: Check code style
+        run: tools/unix/clang-format.sh
+
+      - name: Post clang-format comments
+        if: failure()
+        uses: reviewdog/action-suggester@v1.21.0
+        with:
+          tool_name: clang-format
+          fail_level: error

From 8a8a3c5a08c92690db1b4f77120beee153108b05 Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Fri, 25 Jul 2025 21:26:57 +0200
Subject: [PATCH 044/302] [ci] remove clang-format workflow

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 .github/workflows/clang-format.yaml | 43 -----------------------------
 1 file changed, 43 deletions(-)
 delete mode 100644 .github/workflows/clang-format.yaml

diff --git a/.github/workflows/clang-format.yaml b/.github/workflows/clang-format.yaml
deleted file mode 100644
index f74088c8e..000000000
--- a/.github/workflows/clang-format.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-name: clang-format
-
-on:
-  push:
-    branches: [ master ]
-    paths:
-      - 'android/app/src/**.java'
-      - '.clang-format'
-      - '.github/workflows/clang-format.yml'
-  pull_request:
-    branches: [ master ]
-    paths:
-      - 'android/app/src/**.java'
-      - '.clang-format'
-      - '.github/workflows/clang-format.yml'
-
-jobs:
-  check-formatting:
-    runs-on: ubuntu-latest
-    continue-on-error: true  # TODO(AB): Remove this line when ready to enforce formatting.
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install clang-format
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y clang-format-19
-          clang-format-19 --version
-
-      - name: Check Java formatting
-        run: |
-          JAVA_FILES=($(find android/app/src -name '*.java'))
-
-          FORMATTING_ISSUES=$(clang-format-19 --dry-run --Werror $JAVA_FILES 2>&1 || true)
-
-          if [ -n "$FORMATTING_ISSUES" ]; then
-            echo "$FORMATTING_ISSUES"
-            echo ""
-            echo "To fix formatting, please run:"
-            echo "  clang-format -i <file>"
-            exit 1
-          fi

From 9f0290c0ec4f2ed3846f764efaf9219f3b205687 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Sun, 17 Aug 2025 14:25:36 +0700
Subject: [PATCH 045/302] [ios] Disable clang-format temporary

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 tools/unix/clang-format.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/unix/clang-format.sh b/tools/unix/clang-format.sh
index 9c373b85e..d687778d0 100755
--- a/tools/unix/clang-format.sh
+++ b/tools/unix/clang-format.sh
@@ -9,8 +9,8 @@ XARGS_COMMAND='xargs -n1 -0 -P0 clang-format -i'
 find android/{app,sdk}/src -type f -name '*.java' -print0 | $XARGS_COMMAND
 find android/sdk/src/main/cpp -type f -name '*.[hc]pp' -print0 | $XARGS_COMMAND
 
-# iOS
-find iphone -type f -name '*.[hc]pp' -o -name '*.[hm]' -o -name '*.mm' -print0 | $XARGS_COMMAND
+# TODO: iOS
+# find iphone -type f -name '*.[hc]pp' -o -name '*.[hm]' -o -name '*.mm' -print0 | $XARGS_COMMAND
 
 # Core/C++
 find dev_sandbox generator libs qt tools -type f -name '*.[hc]pp' -print0 | $XARGS_COMMAND

From bfffa1fff48ddecb48d6b7adc90fff34c451a6b9 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Sun, 17 Aug 2025 14:32:37 +0700
Subject: [PATCH 046/302] Format all C++ and Java code via clang-format

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 .../DownloadResourcesLegacyActivity.java      |    12 +-
 .../java/app/organicmaps/MapFragment.java     |    36 +-
 .../java/app/organicmaps/MwmActivity.java     |   106 +-
 .../backup/LocalBackupManager.java            |    54 +-
 .../bookmarks/BookmarkCategoriesAdapter.java  |   158 +-
 .../bookmarks/BookmarkListAdapter.java        |    62 +-
 .../bookmarks/BookmarksListFragment.java      |    66 +-
 .../bookmarks/BookmarksSharingHelper.java     |    42 +-
 .../ChooseBookmarksSortingTypeFragment.java   |     8 +-
 .../car/screens/search/SearchUiHelpers.java   |    46 +-
 .../app/organicmaps/car/util/IntentUtils.java |    58 +-
 .../app/organicmaps/car/util/UiHelpers.java   |    28 +-
 .../organicmaps/downloader/BottomPanel.java   |    36 +-
 .../downloader/CountrySuggestFragment.java    |     4 +-
 .../downloader/DownloaderAdapter.java         |   130 +-
 .../downloader/DownloaderFragment.java        |    10 +-
 .../organicmaps/editor/EditorFragment.java    |    22 +-
 .../editor/EditorHostFragment.java            |   100 +-
 .../editor/FeatureCategoryAdapter.java        |    27 +-
 .../editor/FeatureCategoryFragment.java       |    56 +-
 .../editor/SimpleTimetableAdapter.java        |     2 +-
 .../editor/TimetableContainerFragment.java    |     4 +-
 .../app/organicmaps/help/FaqFragment.java     |     4 +-
 .../java/app/organicmaps/intent/Factory.java  |   108 +-
 .../maplayer/LayerBottomSheetItem.java        |    40 +-
 .../maplayer/MapButtonsController.java        |    30 +-
 .../routing/ManageRouteAdapter.java           |    38 +-
 .../routing/ResultCodesHelper.java            |   136 +-
 .../routing/RoutingBottomMenuController.java  |     9 +-
 .../routing/RoutingErrorDialogFragment.java   |     2 +-
 .../sdk/location/SensorHelper.java            |    20 +-
 .../sdk/routing/RoutePointInfo.java           |     8 +-
 .../organicmaps/sdk/util/LocationUtils.java   |    14 +-
 .../app/organicmaps/sdk/util/log/Logger.java  |    10 +-
 .../app/organicmaps/search/SearchAdapter.java |    56 +-
 .../search/SearchHistoryAdapter.java          |    46 +-
 .../VoiceInstructionsSettingsFragment.java    |     8 +-
 .../app/organicmaps/widget/menu/NavMenu.java  |     6 +-
 .../placepage/EditBookmarkFragment.java       |    86 +-
 .../widget/placepage/PlacePageController.java |    18 +-
 .../widget/placepage/PlacePageView.java       |     5 +-
 .../sdk/DownloadResourcesLegacyActivity.cpp   |   260 +-
 .../cpp/app/organicmaps/sdk/Framework.cpp     |   553 +-
 .../cpp/app/organicmaps/sdk/Framework.hpp     |   295 +-
 .../cpp/app/organicmaps/sdk/LocationState.cpp |    40 +-
 .../src/main/cpp/app/organicmaps/sdk/Map.cpp  |   105 +-
 .../cpp/app/organicmaps/sdk/MapManager.cpp    |   204 +-
 .../cpp/app/organicmaps/sdk/OrganicMaps.cpp   |    17 +-
 .../cpp/app/organicmaps/sdk/TrackRecorder.cpp |    96 +-
 .../cpp/app/organicmaps/sdk/TrafficState.cpp  |    27 +-
 .../app/organicmaps/sdk/UserMarkHelper.cpp    |   180 +-
 .../app/organicmaps/sdk/UserMarkHelper.hpp    |     2 +-
 .../sdk/bookmarks/data/BookmarkManager.cpp    |   592 +-
 .../organicmaps/sdk/core/ScopedLocalRef.hpp   |     3 +-
 .../app/organicmaps/sdk/core/jni_helper.cpp   |    74 +-
 .../app/organicmaps/sdk/core/jni_helper.hpp   |    20 +-
 .../organicmaps/sdk/core/jni_java_methods.cpp |     2 +-
 .../organicmaps/sdk/core/jni_java_methods.hpp |    10 +-
 .../cpp/app/organicmaps/sdk/core/logging.cpp  |    20 +-
 .../cpp/app/organicmaps/sdk/core/logging.hpp  |     8 +-
 .../organicmaps/sdk/core/render_context.cpp   |    18 +-
 .../organicmaps/sdk/core/render_context.hpp   |    15 +-
 .../cpp/app/organicmaps/sdk/editor/Editor.cpp |   247 +-
 .../organicmaps/sdk/editor/OpeningHours.cpp   |   143 +-
 .../app/organicmaps/sdk/editor/OsmOAuth.cpp   |    41 +-
 .../sdk/isolines/IsolinesManager.cpp          |    27 +-
 .../sdk/opengl/android_gl_utils.cpp           |    47 +-
 .../sdk/opengl/android_gl_utils.hpp           |    15 +-
 .../sdk/opengl/androidoglcontext.cpp          |    12 +-
 .../sdk/opengl/androidoglcontext.hpp          |     3 +-
 .../sdk/opengl/androidoglcontextfactory.cpp   |    60 +-
 .../sdk/opengl/androidoglcontextfactory.hpp   |     4 +-
 .../app/organicmaps/sdk/opengl/gl3stub.cpp    |   600 +-
 .../sdk/platform/AndroidPlatform.cpp          |    87 +-
 .../sdk/platform/AndroidPlatform.hpp          |     5 +-
 .../organicmaps/sdk/platform/HttpThread.cpp   |    58 +-
 .../app/organicmaps/sdk/platform/Language.cpp |    29 +-
 .../organicmaps/sdk/platform/Localization.cpp |    12 +-
 .../organicmaps/sdk/platform/SocketImpl.cpp   |    16 +-
 .../organicmaps/sdk/routing/JunctionInfo.hpp  |     9 +-
 .../organicmaps/sdk/routing/RouteMarkData.hpp |    24 +-
 .../organicmaps/sdk/routing/RoutingInfo.hpp   |    18 +-
 .../sdk/routing/SingleLaneInfo.hpp            |     2 +-
 .../sdk/routing/TransitRouteInfo.hpp          |    10 +-
 .../sdk/routing/TransitStepInfo.hpp           |    22 +-
 .../sdk/search/DisplayedCategories.cpp        |     5 +-
 .../organicmaps/sdk/search/SearchEngine.cpp   |   317 +-
 .../sdk/settings/MapLanguageCode.cpp          |     7 +-
 .../organicmaps/sdk/settings/UnitLocale.cpp   |    28 +-
 .../cpp/app/organicmaps/sdk/sound/tts.cpp     |    18 +-
 .../organicmaps/sdk/subway/SubwayManager.cpp  |    17 +-
 .../cpp/app/organicmaps/sdk/util/Config.cpp   |   198 +-
 .../cpp/app/organicmaps/sdk/util/Distance.hpp |     6 +-
 .../cpp/app/organicmaps/sdk/util/GeoUtils.cpp |     5 +-
 .../app/organicmaps/sdk/util/HttpClient.cpp   |    65 +-
 .../cpp/app/organicmaps/sdk/util/Language.cpp |     4 +-
 .../app/organicmaps/sdk/util/LogsManager.cpp  |     9 +-
 .../organicmaps/sdk/util/NetworkPolicy.cpp    |     5 +-
 .../organicmaps/sdk/util/NetworkPolicy.hpp    |     2 +-
 .../app/organicmaps/sdk/util/StringUtils.cpp  |    38 +-
 .../cpp/app/organicmaps/sdk/util/UiThread.cpp |     4 +-
 .../vulkan/android_vulkan_context_factory.cpp |     3 +-
 dev_sandbox/imgui_renderer.cpp                |    34 +-
 dev_sandbox/imgui_renderer.hpp                |     3 +-
 dev_sandbox/main.cpp                          |   126 +-
 dev_sandbox/main_linux.cpp                    |   101 +-
 generator/address_enricher.cpp                |    33 +-
 generator/address_enricher.hpp                |    10 +-
 .../address_parser_tests/parser_tests.cpp     |    47 +-
 generator/address_parser/parser_tool.cpp      |     5 +-
 generator/address_parser/processor.cpp        |     6 +-
 generator/address_parser/processor.hpp        |     2 +-
 generator/address_parser/tiger_parser.cpp     |    30 +-
 generator/address_parser/tiger_parser.hpp     |     4 +-
 generator/addresses_collector.cpp             |    14 +-
 generator/addresses_collector.hpp             |     4 +-
 generator/affiliation.cpp                     |    83 +-
 generator/affiliation.hpp                     |     1 -
 generator/altitude_generator.cpp              |    20 +-
 generator/borders.cpp                         |    14 +-
 generator/borders.hpp                         |    32 +-
 generator/boundary_postcodes_enricher.cpp     |     3 +-
 generator/brands_loader.cpp                   |     5 +-
 generator/camera_info_collector.cpp           |    42 +-
 generator/camera_info_collector.hpp           |     9 +-
 generator/cells_merger.cpp                    |    72 +-
 generator/cells_merger.hpp                    |     3 +-
 generator/centers_table_builder.cpp           |     5 +-
 generator/check_model.cpp                     |     4 +-
 generator/cities_boundaries_builder.hpp       |     3 +-
 generator/cities_boundaries_checker.cpp       |     3 +-
 generator/cities_ids_builder.cpp              |    15 +-
 generator/city_roads_generator.cpp            |    10 +-
 generator/cluster_finder.hpp                  |    15 +-
 generator/coastlines_generator.cpp            |    79 +-
 generator/coastlines_generator.hpp            |     4 +-
 generator/collection_base.hpp                 |    18 +-
 generator/collector_boundary_postcode.cpp     |     3 +-
 generator/collector_building_parts.cpp        |    39 +-
 generator/collector_camera.cpp                |    13 +-
 generator/collector_camera.hpp                |     4 +-
 generator/collector_collection.hpp            |     4 +-
 generator/collector_interface.hpp             |     8 +-
 generator/collector_mini_roundabout.cpp       |     9 +-
 generator/collector_mini_roundabout.hpp       |     2 -
 .../collector_routing_city_boundaries.cpp     |    28 +-
 .../collector_routing_city_boundaries.hpp     |     9 +-
 generator/collector_tag.cpp                   |     8 +-
 generator/collector_tag.hpp                   |     3 +-
 .../complex_generator/complex_generator.cpp   |    21 +-
 generator/complex_loader.cpp                  |    16 +-
 generator/complex_loader.hpp                  |     7 +-
 generator/composite_id.cpp                    |    11 +-
 generator/composite_id.hpp                    |     5 +-
 generator/cross_mwm_osm_ways_collector.cpp    |    36 +-
 generator/cross_mwm_osm_ways_collector.hpp    |     7 +-
 generator/descriptions_section_builder.cpp    |    32 +-
 generator/descriptions_section_builder.hpp    |    10 +-
 generator/dumper.cpp                          |   280 +-
 generator/dumper.hpp                          |    22 +-
 generator/factory_utils.hpp                   |     6 +-
 generator/feature_builder.cpp                 |    71 +-
 generator/feature_builder.hpp                 |    47 +-
 generator/feature_emitter_iface.hpp           |     3 +-
 generator/feature_generator.cpp               |    18 +-
 generator/feature_generator.hpp               |     3 +-
 generator/feature_helpers.cpp                 |     4 +-
 generator/feature_helpers.hpp                 |     8 +-
 generator/feature_maker.cpp                   |    18 +-
 generator/feature_maker.hpp                   |     3 +-
 generator/feature_maker_base.cpp              |    12 +-
 generator/feature_merger.cpp                  |    80 +-
 generator/feature_merger.hpp                  |    42 +-
 generator/feature_processing_layers.cpp       |    56 +-
 generator/feature_processing_layers.hpp       |     4 +-
 .../feature_segments_checker.cpp              |    33 +-
 generator/feature_sorter.cpp                  |    34 +-
 generator/features_processing_helpers.hpp     |     9 +-
 generator/filter_collection.cpp               |     4 +-
 generator/filter_collection.hpp               |     4 +-
 generator/filter_elements.cpp                 |    17 +-
 generator/filter_elements.hpp                 |     2 +-
 generator/filter_world.cpp                    |     4 +-
 generator/final_processor_cities.cpp          |    13 +-
 generator/final_processor_cities.hpp          |     6 +-
 generator/final_processor_coastline.cpp       |    13 +-
 generator/final_processor_coastline.hpp       |     3 +-
 generator/final_processor_complex.cpp         |    38 +-
 generator/final_processor_complex.hpp         |     6 +-
 generator/final_processor_country.cpp         |    33 +-
 generator/final_processor_country.hpp         |    41 +-
 generator/final_processor_interface.hpp       |    10 +-
 generator/final_processor_utils.cpp           |    11 +-
 generator/final_processor_utils.hpp           |    12 +-
 generator/final_processor_world.cpp           |     6 +-
 generator/final_processor_world.hpp           |     5 +-
 generator/gen_mwm_info.cpp                    |     9 +-
 generator/generate_info.hpp                   |     9 +-
 .../features_tests.cpp                        |   163 +-
 .../mwm_playground.cpp                        |     9 +-
 .../towns_tests.cpp                           |     7 +-
 .../generator_tests/affiliation_tests.cpp     |    68 +-
 generator/generator_tests/altitude_test.cpp   |    15 +-
 .../generator_tests/brands_loader_test.cpp    |    32 +-
 .../camera_collector_tests.cpp                |    40 +-
 .../generator_tests/cells_merger_tests.cpp    |    42 +-
 .../cities_boundaries_checker_tests.cpp       |    17 +-
 .../generator_tests/cities_ids_tests.cpp      |     8 +-
 .../generator_tests/city_roads_tests.cpp      |    50 +-
 .../generator_tests/cluster_finder_tests.cpp  |    55 +-
 generator/generator_tests/coasts_test.cpp     |    13 +-
 .../collector_boundary_postcode_tests.cpp     |    53 +-
 .../collector_building_parts_tests.cpp        |    27 +-
 ...ollector_routing_city_boundaries_tests.cpp |    51 +-
 .../generator_tests/complex_loader_tests.cpp  |     6 +-
 .../cross_mwm_osm_ways_collector_tests.cpp    |    60 +-
 .../descriptions_section_builder_tests.cpp    |    75 +-
 .../generator_tests/feature_builder_test.cpp  |    59 +-
 .../generator_tests/feature_merger_test.cpp   |    72 +-
 .../generator_tests/filter_elements_tests.cpp |    16 +-
 .../generator_tests/gen_mwm_info_tests.cpp    |    13 +-
 .../generator_tests/hierarchy_entry_tests.cpp |    21 +-
 generator/generator_tests/hierarchy_tests.cpp |    30 +-
 .../intermediate_data_test.cpp                |     5 +-
 generator/generator_tests/maxspeeds_tests.cpp |    85 +-
 .../merge_collectors_tests.cpp                |    18 +-
 .../generator_tests/metadata_parser_test.cpp  |    44 +-
 generator/generator_tests/metalines_tests.cpp |    48 +-
 .../generator_tests/mini_roundabout_tests.cpp |    77 +-
 generator/generator_tests/node_mixer_test.cpp |    24 +-
 .../generator_tests/osm_o5m_source_test.cpp   |   163 +-
 generator/generator_tests/osm_type_test.cpp   |  2913 ++--
 .../generator_tests/place_processor_tests.cpp |   156 +-
 .../generator_tests/raw_generator_test.cpp    |   146 +-
 .../generator_tests/relation_tags_tests.cpp   |    29 +-
 .../restriction_collector_test.cpp            |    70 +-
 .../generator_tests/restriction_test.cpp      |    99 +-
 .../generator_tests/road_access_test.cpp      |   173 +-
 generator/generator_tests/source_data.cpp     |    86 +-
 .../source_to_element_test.cpp                |    22 +-
 .../generator_tests/speed_cameras_test.cpp    |    30 +-
 .../generator_tests/srtm_parser_test.cpp      |   105 +-
 .../generator_tests/tag_admixer_test.cpp      |    13 +-
 generator/generator_tests/tesselator_test.cpp |    20 +-
 .../triangles_tree_coding_test.cpp            |    12 +-
 generator/generator_tests/types_helper.hpp    |     2 +-
 .../routing_helpers.cpp                       |    13 +-
 .../routing_helpers.hpp                       |    12 +-
 .../generator_tests_support/test_feature.cpp  |   120 +-
 .../generator_tests_support/test_feature.hpp  |    33 +-
 .../test_generator.cpp                        |    17 +-
 .../test_generator.hpp                        |    15 +-
 .../test_mwm_builder.cpp                      |    30 +-
 .../test_mwm_builder.hpp                      |     5 +-
 .../test_with_custom_mwms.cpp                 |    14 +-
 .../test_with_custom_mwms.hpp                 |     3 +-
 generator/generator_tool/generator_tool.cpp   |   113 +-
 generator/geometry_holder.hpp                 |    14 +-
 generator/hierarchy.cpp                       |    75 +-
 generator/hierarchy_entry.cpp                 |    16 +-
 generator/holes.cpp                           |    33 +-
 generator/holes.hpp                           |    11 +-
 generator/intermediate_data.cpp               |   123 +-
 generator/intermediate_data.hpp               |    40 +-
 generator/intermediate_elements.hpp           |     7 +-
 generator/isolines_generator.cpp              |    21 +-
 generator/maxspeeds_builder.cpp               |    91 +-
 generator/maxspeeds_builder.hpp               |     5 +-
 generator/maxspeeds_collector.cpp             |    16 +-
 generator/maxspeeds_parser.cpp                |    16 +-
 generator/metalines_builder.cpp               |    15 +-
 generator/metalines_builder.hpp               |     4 +-
 generator/mini_roundabout_info.cpp            |     9 +-
 generator/mini_roundabout_info.hpp            |     5 +-
 generator/mini_roundabout_transformer.cpp     |    71 +-
 generator/mini_roundabout_transformer.hpp     |    25 +-
 generator/osm2meta.cpp                        |    48 +-
 generator/osm2meta.hpp                        |    46 +-
 generator/osm2type.cpp                        |   518 +-
 generator/osm2type.hpp                        |     6 +-
 generator/osm_element.cpp                     |    97 +-
 generator/osm_element.hpp                     |    35 +-
 generator/osm_element_helpers.cpp             |     4 +-
 generator/osm_o5m_source.hpp                  |   232 +-
 generator/osm_source.cpp                      |    46 +-
 generator/osm_source.hpp                      |     4 +-
 generator/osm_xml_source.hpp                  |    20 +-
 generator/place_processor.cpp                 |    54 +-
 generator/place_processor.hpp                 |     2 +-
 generator/popular_places_section_builder.cpp  |    13 +-
 generator/popular_places_section_builder.hpp  |     4 +-
 generator/postcode_points_builder.cpp         |    45 +-
 generator/postcode_points_builder.hpp         |    10 +-
 generator/processor_booking.hpp               |     9 +-
 generator/processor_coastline.cpp             |    11 +-
 generator/processor_complex.cpp               |    11 +-
 generator/processor_complex.hpp               |     4 +-
 generator/processor_country.cpp               |     9 +-
 generator/processor_country.hpp               |     2 +-
 generator/processor_factory.hpp               |    17 +-
 generator/processor_noop.hpp                  |     5 +-
 generator/processor_simple.cpp                |    21 +-
 generator/processor_simple.hpp                |     6 +-
 generator/processor_world.cpp                 |    11 +-
 generator/processor_world.hpp                 |     3 +-
 generator/pygen/pygen.cpp                     |   106 +-
 generator/raw_generator.cpp                   |    64 +-
 generator/raw_generator.hpp                   |    13 +-
 generator/raw_generator_writer.cpp            |    19 +-
 generator/raw_generator_writer.hpp            |     6 +-
 generator/relation_tags.cpp                   |    21 +-
 generator/relation_tags.hpp                   |     9 +-
 generator/relation_tags_enricher.cpp          |     3 +-
 generator/restriction_collector.cpp           |    55 +-
 generator/restriction_collector.hpp           |     6 +-
 generator/restriction_generator.cpp           |    30 +-
 generator/restriction_generator.hpp           |     9 +-
 generator/restriction_writer.cpp              |    63 +-
 generator/restriction_writer.hpp              |     2 -
 generator/road_access_generator.cpp           |   109 +-
 generator/road_access_generator.hpp           |    29 +-
 .../routing_city_boundaries_processor.cpp     |     5 +-
 .../routing_city_boundaries_processor.hpp     |     2 +-
 generator/routing_helpers.cpp                 |    34 +-
 generator/routing_helpers.hpp                 |    22 +-
 generator/routing_index_generator.cpp         |   219 +-
 generator/routing_index_generator.hpp         |    15 +-
 generator/routing_world_roads_generator.cpp   |     6 +-
 generator/search_index_builder.cpp            |    90 +-
 generator/search_index_builder.hpp            |    11 +-
 .../srtm_coverage_checker.cpp                 |    16 +-
 generator/srtm_parser.cpp                     |    10 +-
 generator/srtm_parser.hpp                     |    11 +-
 generator/statistics.cpp                      |   578 +-
 generator/statistics.hpp                      |   124 +-
 generator/tag_admixer.hpp                     |    12 +-
 generator/tesselator.cpp                      |   346 +-
 generator/tesselator.hpp                      |   288 +-
 generator/towns_dumper.cpp                    |    30 +-
 generator/towns_dumper.hpp                    |     8 +-
 generator/traffic_generator.cpp               |     2 +-
 generator/transit_generator.cpp               |    58 +-
 generator/transit_generator.hpp               |     3 +-
 generator/transit_generator_experimental.cpp  |    43 +-
 generator/transit_generator_experimental.hpp  |     3 +-
 generator/translator.cpp                      |    19 +-
 generator/translator.hpp                      |     8 +-
 generator/translator_coastline.cpp            |    19 +-
 generator/translator_collection.hpp           |     5 +-
 generator/translator_complex.cpp              |    21 +-
 generator/translator_country.cpp              |    44 +-
 generator/translator_country.hpp              |     4 +-
 generator/translator_factory.hpp              |     9 +-
 generator/translator_interface.hpp            |     8 +-
 generator/translator_world.cpp                |    24 +-
 generator/translator_world.hpp                |     3 +-
 generator/translators_pool.cpp                |     6 +-
 generator/translators_pool.hpp                |     3 +-
 generator/unpack_mwm.cpp                      |     2 +-
 generator/unpack_mwm.hpp                      |     1 -
 generator/utils.cpp                           |    28 +-
 generator/utils.hpp                           |    10 +-
 generator/water_boundary_checker.hpp          |     1 -
 generator/way_nodes_mapper.hpp                |    60 +-
 generator/ways_merger.cpp                     |     5 +-
 generator/ways_merger.hpp                     |     5 +-
 generator/wiki_url_dumper.cpp                 |    33 +-
 generator/world_map_generator.hpp             |    27 +-
 .../world_roads_builder.cpp                   |    18 +-
 .../world_roads_builder.hpp                   |    14 +-
 .../world_roads_builder_tool.cpp              |    22 +-
 libs/base/array_adapters.hpp                  |    75 +-
 libs/base/assert.hpp                          |   145 +-
 libs/base/base.cpp                            |     5 +-
 libs/base/base.hpp                            |    10 +-
 libs/base/base_tests/assert_test.cpp          |    13 +-
 libs/base/base_tests/beam_tests.cpp           |     6 +-
 libs/base/base_tests/bits_test.cpp            |    23 +-
 libs/base/base_tests/buffer_vector_test.cpp   |    66 +-
 libs/base/base_tests/cache_test.cpp           |    48 +-
 libs/base/base_tests/cancellable_tests.cpp    |     6 +-
 libs/base/base_tests/clustering_map_tests.cpp |    24 +-
 libs/base/base_tests/collection_cast_test.cpp |     8 +-
 libs/base/base_tests/control_flow_tests.cpp   |     3 +-
 libs/base/base_tests/exception_tests.cpp      |   161 +-
 libs/base/base_tests/fifo_cache_test.cpp      |     8 +-
 .../base/base_tests/file_name_utils_tests.cpp |     2 +-
 libs/base/base_tests/geo_object_id_tests.cpp  |    10 +-
 libs/base/base_tests/levenshtein_dfa_test.cpp |    40 +-
 libs/base/base_tests/logging_test.cpp         |    29 +-
 libs/base/base_tests/lru_cache_tests.cpp      |    16 +-
 libs/base/base_tests/math_test.cpp            |    20 +-
 libs/base/base_tests/matrix_test.cpp          |    13 +-
 libs/base/base_tests/mem_trie_test.cpp        |     3 +-
 libs/base/base_tests/range_iterator_test.cpp  |     3 +-
 libs/base/base_tests/regexp_test.cpp          |     3 +-
 libs/base/base_tests/rolling_hash_test.cpp    |    58 +-
 libs/base/base_tests/scope_guard_test.cpp     |    28 +-
 libs/base/base_tests/small_set_test.cpp       |    63 +-
 libs/base/base_tests/stl_helpers_tests.cpp    |   113 +-
 libs/base/base_tests/string_utils_test.cpp    |   153 +-
 libs/base/base_tests/suffix_array_tests.cpp   |     7 +-
 .../thread_pool_computational_tests.cpp       |    15 +-
 .../base_tests/thread_pool_delayed_tests.cpp  |    22 +-
 libs/base/base_tests/thread_pool_tests.cpp    |   105 +-
 .../base_tests/thread_safe_queue_tests.cpp    |    26 +-
 libs/base/base_tests/threaded_list_test.cpp   |    12 +-
 libs/base/base_tests/threads_test.cpp         |    16 +-
 libs/base/base_tests/timer_test.cpp           |     5 +-
 libs/base/beam.hpp                            |     5 +-
 libs/base/bidirectional_map.hpp               |     6 +-
 libs/base/bits.hpp                            |    35 +-
 libs/base/buffer_vector.hpp                   |    55 +-
 libs/base/cache.hpp                           |   255 +-
 libs/base/cancellable.cpp                     |     5 +-
 libs/base/clustering_map.hpp                  |    10 +-
 libs/base/collection_cast.hpp                 |     2 +-
 libs/base/control_flow.hpp                    |    10 +-
 libs/base/exception.cpp                       |     2 -
 libs/base/exception.hpp                       |    25 +-
 libs/base/fast_math.cpp                       |     2 +-
 libs/base/fifo_cache.hpp                      |    10 +-
 libs/base/file_name_utils.cpp                 |     6 +-
 libs/base/file_name_utils.hpp                 |     5 +-
 libs/base/geo_object_id.cpp                   |    14 +-
 libs/base/internal/message.hpp                |    80 +-
 libs/base/levenshtein_dfa.cpp                 |    60 +-
 libs/base/levenshtein_dfa.hpp                 |     4 +-
 libs/base/limited_priority_queue.hpp          |    10 +-
 libs/base/linked_map.hpp                      |    25 +-
 libs/base/logging.cpp                         |     4 +-
 libs/base/logging.hpp                         |    24 +-
 libs/base/lower_case.cpp                      |   904 +-
 libs/base/lru_cache.hpp                       |    17 +-
 libs/base/macros.hpp                          |    55 +-
 libs/base/math.hpp                            |    17 +-
 libs/base/matrix.hpp                          |   340 +-
 libs/base/mem_trie.hpp                        |    81 +-
 libs/base/newtype.hpp                         |     7 +-
 libs/base/non_intersecting_intervals.hpp      |     9 +-
 libs/base/normalize_unicode.cpp               |  9471 ++++++-------
 libs/base/random.hpp                          |     5 +-
 libs/base/range_iterator.hpp                  |    20 +-
 libs/base/rolling_hash.hpp                    |    17 +-
 libs/base/scope_guard.hpp                     |    67 +-
 libs/base/set_operations.hpp                  |    44 +-
 libs/base/shared_buffer_manager.hpp           |     2 +-
 libs/base/small_map.hpp                       |    39 +-
 libs/base/small_set.hpp                       |     4 +-
 libs/base/src_point.cpp                       |     3 +-
 libs/base/src_point.hpp                       |     5 +-
 libs/base/stats.hpp                           |    13 +-
 libs/base/std_serialization.hpp               |    29 +-
 libs/base/stl_helpers.hpp                     |    65 +-
 libs/base/stl_iterator.hpp                    |    11 +-
 libs/base/string_utils.cpp                    |    38 +-
 libs/base/string_utils.hpp                    |   135 +-
 libs/base/suffix_array.cpp                    |    19 +-
 libs/base/sunrise_sunset.cpp                  |    25 +-
 libs/base/thread.cpp                          |    19 +-
 libs/base/thread.hpp                          |     8 +-
 libs/base/thread_checker.cpp                  |     5 +-
 libs/base/thread_checker.hpp                  |    12 +-
 libs/base/thread_pool.cpp                     |    25 +-
 libs/base/thread_pool.hpp                     |     6 +-
 libs/base/thread_pool_computational.hpp       |     9 +-
 libs/base/thread_pool_delayed.cpp             |    27 +-
 libs/base/thread_pool_delayed.hpp             |    16 +-
 libs/base/thread_safe_queue.hpp               |     3 +-
 libs/base/thread_utils.hpp                    |    10 +-
 libs/base/threaded_list.hpp                   |     1 -
 libs/base/timegm.cpp                          |    12 +-
 libs/base/timegm.hpp                          |     2 +-
 libs/base/timer.cpp                           |    17 +-
 libs/base/timer.hpp                           |    10 +-
 libs/base/waiter.hpp                          |     7 +-
 libs/coding/base64.cpp                        |     2 +-
 libs/coding/bit_streams.hpp                   |    14 +-
 libs/coding/buffer_reader.hpp                 |    10 +-
 libs/coding/buffered_file_writer.cpp          |     3 +-
 libs/coding/buffered_file_writer.hpp          |     3 +-
 libs/coding/byte_stream.hpp                   |    22 +-
 libs/coding/coding_tests/base64_test.cpp      |     8 +-
 libs/coding/coding_tests/bit_streams_test.cpp |     2 -
 .../compressed_bit_vector_test.cpp            |    65 +-
 libs/coding/coding_tests/csv_reader_test.cpp  |     9 +-
 libs/coding/coding_tests/diff_test.cpp        |    55 +-
 libs/coding/coding_tests/elias_coder_test.cpp |    10 +-
 libs/coding/coding_tests/endianness_test.cpp  |    33 +-
 libs/coding/coding_tests/file_data_test.cpp   |    49 +-
 libs/coding/coding_tests/file_sort_test.cpp   |    40 +-
 .../coding_tests/files_container_tests.cpp    |    76 +-
 .../coding_tests/fixed_bits_ddvector_test.cpp |     5 +-
 .../coding_tests/geometry_coding_test.cpp     |    18 +-
 .../geometry_serialization_test.cpp           |     4 +-
 libs/coding/coding_tests/hex_test.cpp         |     3 +-
 libs/coding/coding_tests/huffman_test.cpp     |     6 +-
 .../coding_tests/map_uint32_to_val_tests.cpp  |     6 +-
 .../coding_tests/mem_file_reader_test.cpp     |     2 +-
 .../coding_tests/mem_file_writer_test.cpp     |     4 +-
 libs/coding/coding_tests/png_decoder_test.cpp |    29 +-
 .../coding_tests/point_coding_tests.cpp       |    13 +-
 .../coding/coding_tests/reader_cache_test.cpp |    31 +-
 libs/coding/coding_tests/reader_test.cpp      |     7 +-
 libs/coding/coding_tests/reader_test.hpp      |    27 +-
 .../coding_tests/reader_writer_ops_test.cpp   |    87 +-
 libs/coding/coding_tests/serdes_json_test.cpp |    60 +-
 libs/coding/coding_tests/sha1_test.cpp        |    54 +-
 .../coding_tests/simple_dense_coding_test.cpp |     2 +-
 .../coding_tests/sparse_vector_tests.cpp      |     4 +-
 .../string_utf8_multilang_tests.cpp           |    26 +-
 libs/coding/coding_tests/succinct_ef_test.cpp |    11 +-
 libs/coding/coding_tests/test_polylines.cpp   |   564 +-
 libs/coding/coding_tests/traffic_test.cpp     |    19 +-
 libs/coding/coding_tests/url_tests.cpp        |    69 +-
 .../coding_tests/value_opt_string_test.cpp    |    10 +-
 .../coding_tests/var_record_reader_test.cpp   |    43 +-
 .../coding_tests/var_serial_vector_test.cpp   |    11 +-
 libs/coding/coding_tests/varint_test.cpp      |    70 +-
 libs/coding/coding_tests/writer_test.cpp      |    71 +-
 libs/coding/coding_tests/xml_parser_tests.cpp |    40 +-
 libs/coding/coding_tests/zip_creator_test.cpp |    24 +-
 libs/coding/coding_tests/zip_reader_test.cpp  |    99 +-
 libs/coding/coding_tests/zlib_test.cpp        |    24 +-
 libs/coding/compressed_bit_vector.cpp         |    81 +-
 libs/coding/compressed_bit_vector.hpp         |    16 +-
 libs/coding/constants.hpp                     |     4 +-
 libs/coding/csv_reader.cpp                    |    66 +-
 libs/coding/dd_vector.hpp                     |    34 +-
 libs/coding/diff.hpp                          |    66 +-
 libs/coding/file_reader.cpp                   |    38 +-
 libs/coding/file_reader.hpp                   |     3 +-
 libs/coding/file_sort.hpp                     |    15 +-
 libs/coding/file_writer.cpp                   |     3 +-
 libs/coding/file_writer.hpp                   |    13 +-
 libs/coding/files_container.cpp               |    89 +-
 libs/coding/files_container.hpp               |    60 +-
 libs/coding/fixed_bits_ddvector.hpp           |    36 +-
 libs/coding/geometry_coding.cpp               |   128 +-
 libs/coding/geometry_coding.hpp               |   111 +-
 libs/coding/hex.cpp                           |    77 +-
 libs/coding/hex.hpp                           |    11 +-
 libs/coding/huffman.hpp                       |    12 +-
 libs/coding/internal/file64_api.hpp           |    30 +-
 libs/coding/internal/file_data.cpp            |    23 +-
 libs/coding/internal/file_data.hpp            |    15 +-
 libs/coding/internal/xmlparser.hpp            |    11 +-
 libs/coding/map_uint32_to_val.hpp             |     9 +-
 libs/coding/memory_region.hpp                 |     4 +-
 libs/coding/mmap_reader.cpp                   |    39 +-
 libs/coding/parse_xml.hpp                     |     7 +-
 libs/coding/point_coding.cpp                  |    22 +-
 libs/coding/read_write_utils.hpp              |   296 +-
 libs/coding/reader.hpp                        |    58 +-
 libs/coding/reader_cache.hpp                  |    12 +-
 libs/coding/reader_streambuf.cpp              |     8 +-
 libs/coding/reader_streambuf.hpp              |     1 -
 libs/coding/reader_wrapper.hpp                |    16 +-
 libs/coding/reader_writer_ops.hpp             |     8 +-
 libs/coding/serdes_binary_header.hpp          |     7 +-
 libs/coding/serdes_json.hpp                   |    65 +-
 libs/coding/sha1.cpp                          |     4 +-
 libs/coding/sha1.hpp                          |     2 +-
 libs/coding/simple_dense_coding.cpp           |    12 +-
 libs/coding/simple_dense_coding.hpp           |    15 +-
 libs/coding/sparse_vector.hpp                 |    27 +-
 libs/coding/streams.hpp                       |   146 +-
 libs/coding/streams_common.hpp                |     2 +-
 libs/coding/streams_sink.hpp                  |   128 +-
 libs/coding/string_utf8_multilang.cpp         |    34 +-
 libs/coding/string_utf8_multilang.hpp         |     5 +-
 libs/coding/succinct_mapper.hpp               |    39 +-
 libs/coding/text_storage.hpp                  |    26 +-
 libs/coding/traffic.hpp                       |    74 +-
 libs/coding/transliteration.cpp               |    12 +-
 libs/coding/transliteration.hpp               |     3 +-
 libs/coding/url.cpp                           |     7 +-
 libs/coding/url.hpp                           |     3 +-
 libs/coding/value_opt_string.hpp              |    17 +-
 libs/coding/var_record_reader.hpp             |     3 +-
 libs/coding/var_serial_vector.hpp             |    39 +-
 libs/coding/varint.hpp                        |    51 +-
 libs/coding/write_to_sink.hpp                 |    17 +-
 libs/coding/writer.hpp                        |    24 +-
 libs/coding/zip_creator.cpp                   |    12 +-
 libs/coding/zip_creator.hpp                   |     3 +-
 libs/coding/zip_reader.cpp                    |    25 +-
 libs/coding/zip_reader.hpp                    |     6 +-
 libs/coding/zlib.cpp                          |    12 +-
 libs/coding/zlib.hpp                          |     3 +-
 libs/cppjansson/cppjansson.cpp                |    10 +-
 libs/cppjansson/cppjansson.hpp                |    76 +-
 libs/cppjansson/jansson_handle.hpp            |    37 +-
 .../descriptions_tests/descriptions_tests.cpp |   338 +-
 libs/descriptions/serdes.hpp                  |    10 +-
 libs/drape/attribute_buffer_mutator.hpp       |     6 +-
 libs/drape/attribute_provider.cpp             |    21 +-
 libs/drape/attribute_provider.hpp             |     6 +-
 libs/drape/batcher.cpp                        |    79 +-
 libs/drape/batcher.hpp                        |    37 +-
 libs/drape/batcher_helpers.cpp                |    91 +-
 libs/drape/batcher_helpers.hpp                |    17 +-
 libs/drape/binding_info.cpp                   |    14 +-
 libs/drape/buffer_base.cpp                    |     5 +-
 libs/drape/color.hpp                          |     6 +-
 libs/drape/constants.hpp                      |     2 +-
 libs/drape/cpu_buffer.cpp                     |     5 +-
 libs/drape/cpu_buffer.hpp                     |     1 +
 libs/drape/data_buffer.cpp                    |    40 +-
 libs/drape/data_buffer.hpp                    |    24 +-
 libs/drape/data_buffer_impl.hpp               |    27 +-
 libs/drape/debug_renderer.hpp                 |     4 +-
 libs/drape/drape_diagnostics.hpp              |    40 +-
 libs/drape/drape_global.hpp                   |    10 +-
 libs/drape/drape_routine.hpp                  |    35 +-
 .../drape_tests/attribute_provides_tests.cpp  |    10 +-
 libs/drape/drape_tests/batcher_tests.cpp      |   112 +-
 libs/drape/drape_tests/buffer_tests.cpp       |    15 +-
 libs/drape/drape_tests/dummy_texture.hpp      |     5 +-
 libs/drape/drape_tests/font_texture_tests.cpp |     2 +-
 libs/drape/drape_tests/gl_functions.cpp       |    42 +-
 libs/drape/drape_tests/gl_mock_functions.cpp  |     2 +-
 libs/drape/drape_tests/gl_mock_functions.hpp  |    11 +-
 libs/drape/drape_tests/glyph_mng_tests.cpp    |    68 +-
 libs/drape/drape_tests/glyph_packer_test.cpp  |     4 +-
 .../drape_tests/harfbuzz_shaping_test.cpp     |    18 +-
 libs/drape/drape_tests/img.hpp                |     2 +-
 libs/drape/drape_tests/memory_comparer.hpp    |     9 +-
 libs/drape/drape_tests/pointers_tests.cpp     |     6 +-
 .../drape_tests/static_texture_tests.cpp      |    12 +-
 libs/drape/drape_tests/stipple_pen_tests.cpp  |    22 +-
 .../drape_tests/testing_graphics_context.hpp  |     5 +-
 .../drape_tests/texture_of_colors_tests.cpp   |   226 +-
 .../drape/drape_tests/uniform_value_tests.cpp |    62 +-
 .../drape/drape_tests/vertex_buffer_tests.cpp |    14 +-
 libs/drape/dynamic_texture.hpp                |    50 +-
 libs/drape/font_texture.cpp                   |    32 +-
 libs/drape/font_texture.hpp                   |    13 +-
 libs/drape/fonts_tool/fonts_tool.cpp          |     4 +-
 libs/drape/framebuffer.cpp                    |     9 +-
 libs/drape/framebuffer.hpp                    |     3 +-
 libs/drape/gl_constants.cpp                   |   360 +-
 libs/drape/gl_constants.hpp                   |   288 +-
 libs/drape/gl_extensions_list.hpp             |     1 -
 libs/drape/gl_functions.cpp                   |   109 +-
 libs/drape/gl_functions.hpp                   |    46 +-
 libs/drape/gl_gpu_program.cpp                 |    14 +-
 libs/drape/gl_gpu_program.hpp                 |     3 +-
 libs/drape/gl_includes.hpp                    |    44 +-
 libs/drape/glsl_func.hpp                      |     8 +-
 libs/drape/glsl_types.hpp                     |    12 +-
 libs/drape/glyph.hpp                          |    13 +-
 libs/drape/glyph_manager.cpp                  |  1162 +-
 libs/drape/glyph_manager.hpp                  |    16 +-
 libs/drape/gpu_buffer.cpp                     |    26 +-
 libs/drape/gpu_buffer.hpp                     |     3 +-
 libs/drape/gpu_program.hpp                    |     4 +-
 libs/drape/graphics_context.hpp               |     6 +-
 libs/drape/graphics_context_factory.cpp       |    11 +-
 libs/drape/graphics_context_factory.hpp       |     7 +-
 libs/drape/harfbuzz_shaping.cpp               |    17 +-
 libs/drape/harfbuzz_shaping.hpp               |     8 +-
 libs/drape/hw_texture.cpp                     |    34 +-
 libs/drape/hw_texture.hpp                     |    17 +-
 libs/drape/hw_texture_ios.hpp                 |    14 +-
 libs/drape/index_buffer.cpp                   |     4 +-
 libs/drape/index_buffer_mutator.cpp           |     2 +-
 libs/drape/index_storage.cpp                  |     4 +-
 libs/drape/mesh_object.cpp                    |    58 +-
 libs/drape/mesh_object.hpp                    |    47 +-
 libs/drape/metal/metal_base_context.hpp       |    38 +-
 libs/drape/metal/metal_cleaner.hpp            |    21 +-
 libs/drape/metal/metal_gpu_buffer_impl.hpp    |    44 +-
 libs/drape/metal/metal_gpu_program.hpp        |    18 +-
 libs/drape/metal/metal_states.hpp             |    30 +-
 libs/drape/metal/metal_texture.hpp            |     9 +-
 libs/drape/object_pool.hpp                    |     8 +-
 libs/drape/oglcontext.cpp                     |    20 +-
 libs/drape/oglcontext.hpp                     |     2 +-
 libs/drape/overlay_handle.cpp                 |    30 +-
 libs/drape/overlay_handle.hpp                 |    63 +-
 libs/drape/overlay_tree.cpp                   |    37 +-
 libs/drape/overlay_tree.hpp                   |    23 +-
 libs/drape/pointers.cpp                       |     3 +-
 libs/drape/pointers.hpp                       |    21 +-
 libs/drape/render_bucket.cpp                  |     8 +-
 libs/drape/render_state.cpp                   |    31 +-
 libs/drape/render_state.hpp                   |    28 +-
 libs/drape/shader.cpp                         |     3 +-
 libs/drape/shader.hpp                         |     3 +-
 libs/drape/static_texture.cpp                 |    36 +-
 libs/drape/static_texture.hpp                 |     9 +-
 libs/drape/stipple_pen_resource.cpp           |    19 +-
 libs/drape/stipple_pen_resource.hpp           |    25 +-
 libs/drape/support_manager.cpp                |    58 +-
 libs/drape/support_manager.hpp                |     4 +-
 libs/drape/symbols_texture.cpp                |    50 +-
 libs/drape/symbols_texture.hpp                |     7 +-
 libs/drape/texture.cpp                        |    17 +-
 libs/drape/texture.hpp                        |    10 +-
 libs/drape/texture_manager.cpp                |    96 +-
 libs/drape/texture_manager.hpp                |    40 +-
 libs/drape/texture_of_colors.cpp              |    23 +-
 libs/drape/texture_of_colors.hpp              |     8 +-
 libs/drape/tm_read_resources.hpp              |     2 +-
 libs/drape/uniform_value.cpp                  |    38 +-
 libs/drape/utils/glyph_usage_tracker.cpp      |     4 +-
 libs/drape/utils/glyph_usage_tracker.hpp      |     4 +-
 libs/drape/utils/profiler.hpp                 |    13 +-
 libs/drape/utils/projection.cpp               |     3 +-
 libs/drape/utils/projection.hpp               |     3 +-
 libs/drape/utils/vertex_decl.cpp              |   120 +-
 libs/drape/utils/vertex_decl.hpp              |    32 +-
 libs/drape/vertex_array_buffer.cpp            |    66 +-
 libs/drape/vertex_array_buffer.hpp            |    13 +-
 libs/drape/viewport.cpp                       |    25 +-
 libs/drape/visual_scale.hpp                   |     2 +-
 libs/drape/vulkan/vulkan_base_context.cpp     |   171 +-
 libs/drape/vulkan/vulkan_base_context.hpp     |    12 +-
 libs/drape/vulkan/vulkan_context_factory.cpp  |    84 +-
 libs/drape/vulkan/vulkan_context_factory.hpp  |     6 +-
 libs/drape/vulkan/vulkan_gpu_buffer_impl.cpp  |    40 +-
 libs/drape/vulkan/vulkan_gpu_buffer_impl.hpp  |    34 +-
 libs/drape/vulkan/vulkan_gpu_program.hpp      |    14 +-
 libs/drape/vulkan/vulkan_layers.cpp           |   136 +-
 libs/drape/vulkan/vulkan_layers.hpp           |     2 +-
 libs/drape/vulkan/vulkan_memory_manager.cpp   |    79 +-
 libs/drape/vulkan/vulkan_memory_manager.hpp   |    13 +-
 libs/drape/vulkan/vulkan_mesh_object_impl.cpp |    67 +-
 libs/drape/vulkan/vulkan_object_manager.cpp   |    66 +-
 libs/drape/vulkan/vulkan_object_manager.hpp   |     8 +-
 libs/drape/vulkan/vulkan_param_descriptor.cpp |     3 +-
 libs/drape/vulkan/vulkan_param_descriptor.hpp |     3 +-
 libs/drape/vulkan/vulkan_pipeline.cpp         |    70 +-
 libs/drape/vulkan/vulkan_pipeline.hpp         |     6 +-
 libs/drape/vulkan/vulkan_staging_buffer.cpp   |     9 +-
 libs/drape/vulkan/vulkan_staging_buffer.hpp   |     3 +-
 libs/drape/vulkan/vulkan_texture.cpp          |   109 +-
 libs/drape/vulkan/vulkan_texture.hpp          |    14 +-
 libs/drape/vulkan/vulkan_utils.cpp            |    28 +-
 libs/drape/vulkan/vulkan_utils.hpp            |    61 +-
 .../vulkan_vertex_array_buffer_impl.cpp       |    32 +-
 libs/drape_frontend/animation/animation.cpp   |    10 +-
 libs/drape_frontend/animation/animation.hpp   |    42 +-
 .../animation/arrow_animation.cpp             |    21 +-
 .../animation/arrow_animation.hpp             |     6 +-
 .../animation/follow_animation.cpp            |    19 +-
 .../animation/follow_animation.hpp            |    19 +-
 .../animation/interpolation_holder.cpp        |     2 +-
 .../animation/interpolations.cpp              |     2 +-
 .../animation/interpolations.hpp              |     4 +-
 .../animation/interpolators.cpp               |    32 +-
 .../animation/interpolators.hpp               |    28 +-
 .../animation/linear_animation.cpp            |    30 +-
 .../animation/linear_animation.hpp            |    13 +-
 .../animation/opacity_animation.cpp           |     8 +-
 .../animation/parallel_animation.cpp          |    12 +-
 .../animation/parallel_animation.hpp          |     8 +-
 .../animation/scale_animation.cpp             |     8 +-
 .../animation/scale_animation.hpp             |    17 +-
 .../animation/sequence_animation.cpp          |    19 +-
 .../animation/sequence_animation.hpp          |     7 +-
 .../animation/show_hide_animation.cpp         |    20 +-
 .../animation/value_mapping.hpp               |     3 +-
 libs/drape_frontend/animation_constants.hpp   |     4 +-
 libs/drape_frontend/animation_system.cpp      |    45 +-
 libs/drape_frontend/animation_system.hpp      |    21 +-
 libs/drape_frontend/animation_utils.cpp       |     2 +-
 libs/drape_frontend/animation_utils.hpp       |     2 +-
 .../drape_frontend/apply_feature_functors.cpp |   186 +-
 .../drape_frontend/apply_feature_functors.hpp |    46 +-
 libs/drape_frontend/area_shape.cpp            |     8 +-
 libs/drape_frontend/area_shape.hpp            |    23 +-
 libs/drape_frontend/arrow3d.cpp               |   256 +-
 libs/drape_frontend/arrow3d.hpp               |    17 +-
 libs/drape_frontend/backend_renderer.cpp      |   877 +-
 libs/drape_frontend/backend_renderer.hpp      |     9 +-
 libs/drape_frontend/base_renderer.cpp         |    11 +-
 libs/drape_frontend/base_renderer.hpp         |    10 +-
 libs/drape_frontend/batchers_pool.hpp         |     9 +-
 libs/drape_frontend/circles_pack_shape.cpp    |    29 +-
 libs/drape_frontend/circles_pack_shape.hpp    |     6 +-
 libs/drape_frontend/color_constants.cpp       |     7 +-
 libs/drape_frontend/color_constants.hpp       |     2 +-
 libs/drape_frontend/colored_symbol_shape.cpp  |    38 +-
 libs/drape_frontend/colored_symbol_shape.hpp  |     8 +-
 .../custom_features_context.hpp               |     6 +-
 libs/drape_frontend/debug_rect_renderer.cpp   |     3 +-
 libs/drape_frontend/debug_rect_renderer.hpp   |    13 +-
 libs/drape_frontend/drape_api.cpp             |    12 +-
 libs/drape_frontend/drape_api.hpp             |     5 +-
 libs/drape_frontend/drape_api_builder.cpp     |    27 +-
 libs/drape_frontend/drape_api_builder.hpp     |     3 +-
 libs/drape_frontend/drape_api_renderer.cpp    |    11 +-
 libs/drape_frontend/drape_engine.cpp          |   303 +-
 libs/drape_frontend/drape_engine.hpp          |    48 +-
 libs/drape_frontend/drape_engine_safe_ptr.hpp |    19 +-
 .../frame_values_tests.cpp                    |    12 +-
 .../drape_frontend_tests/navigator_test.cpp   |    38 +-
 .../drape_frontend_tests/path_text_test.cpp   |     4 +-
 .../drape_frontend_tests/stylist_tests.cpp    |     2 +-
 .../user_event_stream_tests.cpp               |    17 +-
 libs/drape_frontend/drape_measurer.cpp        |    44 +-
 libs/drape_frontend/drape_measurer.hpp        |     6 +-
 libs/drape_frontend/drape_notifier.cpp        |    12 +-
 libs/drape_frontend/drape_notifier.hpp        |     8 +-
 libs/drape_frontend/engine_context.cpp        |    16 +-
 libs/drape_frontend/engine_context.hpp        |    14 +-
 libs/drape_frontend/frame_values.hpp          |    39 +-
 libs/drape_frontend/frontend_renderer.cpp     |  1503 +--
 libs/drape_frontend/frontend_renderer.hpp     |    46 +-
 libs/drape_frontend/gps_track_renderer.cpp    |    59 +-
 libs/drape_frontend/gps_track_renderer.hpp    |    11 +-
 .../gui/choose_position_mark.cpp              |    22 +-
 .../gui/choose_position_mark.hpp              |     3 +-
 libs/drape_frontend/gui/compass.cpp           |    23 +-
 libs/drape_frontend/gui/compass.hpp           |     3 +-
 libs/drape_frontend/gui/copyright_label.cpp   |    26 +-
 libs/drape_frontend/gui/debug_label.cpp       |    16 +-
 libs/drape_frontend/gui/debug_label.hpp       |     6 +-
 libs/drape_frontend/gui/drape_gui.cpp         |     6 +-
 libs/drape_frontend/gui/gui_text.cpp          |    66 +-
 libs/drape_frontend/gui/gui_text.hpp          |    25 +-
 libs/drape_frontend/gui/layer_render.cpp      |    51 +-
 libs/drape_frontend/gui/layer_render.hpp      |    23 +-
 libs/drape_frontend/gui/ruler.cpp             |    51 +-
 libs/drape_frontend/gui/ruler.hpp             |    12 +-
 libs/drape_frontend/gui/ruler_helper.cpp      |    82 +-
 libs/drape_frontend/gui/scale_fps_helper.hpp  |     5 +-
 libs/drape_frontend/gui/shape.cpp             |    24 +-
 libs/drape_frontend/gui/shape.hpp             |    10 +-
 libs/drape_frontend/gui/skin.cpp              |    66 +-
 libs/drape_frontend/gui/skin.hpp              |    15 +-
 libs/drape_frontend/kinetic_scroller.cpp      |    24 +-
 libs/drape_frontend/line_shape.cpp            |   153 +-
 libs/drape_frontend/line_shape.hpp            |     8 +-
 libs/drape_frontend/line_shape_helper.cpp     |    67 +-
 libs/drape_frontend/line_shape_helper.hpp     |    18 +-
 libs/drape_frontend/map_data_provider.cpp     |     9 +-
 libs/drape_frontend/map_data_provider.hpp     |    17 +-
 libs/drape_frontend/map_shape.hpp             |     7 +-
 libs/drape_frontend/message_acceptor.cpp      |     4 +-
 libs/drape_frontend/message_acceptor.hpp      |     2 +-
 libs/drape_frontend/message_queue.cpp         |    70 +-
 libs/drape_frontend/message_subclasses.hpp    |   259 +-
 libs/drape_frontend/metaline_manager.cpp      |     6 +-
 libs/drape_frontend/metaline_manager.hpp      |     3 +-
 libs/drape_frontend/my_position.cpp           |    45 +-
 libs/drape_frontend/my_position.hpp           |    12 +-
 .../drape_frontend/my_position_controller.cpp |   120 +-
 .../drape_frontend/my_position_controller.hpp |    22 +-
 libs/drape_frontend/navigator.cpp             |    36 +-
 libs/drape_frontend/navigator.hpp             |    10 +-
 libs/drape_frontend/overlay_batcher.cpp       |     7 +-
 libs/drape_frontend/overlay_batcher.hpp       |    12 +-
 libs/drape_frontend/overlays_tracker.cpp      |     9 +-
 libs/drape_frontend/overlays_tracker.hpp      |     6 +-
 libs/drape_frontend/path_symbol_shape.cpp     |    13 +-
 libs/drape_frontend/path_text_handle.cpp      |    37 +-
 libs/drape_frontend/path_text_handle.hpp      |     7 +-
 libs/drape_frontend/path_text_shape.cpp       |    37 +-
 libs/drape_frontend/path_text_shape.hpp       |    13 +-
 libs/drape_frontend/poi_symbol_shape.cpp      |    64 +-
 libs/drape_frontend/poi_symbol_shape.hpp      |     5 +-
 libs/drape_frontend/postprocess_renderer.cpp  |   115 +-
 libs/drape_frontend/postprocess_renderer.hpp  |     1 +
 libs/drape_frontend/read_manager.cpp          |    73 +-
 libs/drape_frontend/read_manager.hpp          |    10 +-
 libs/drape_frontend/read_metaline_task.cpp    |     9 +-
 libs/drape_frontend/read_mwm_task.cpp         |     3 +-
 libs/drape_frontend/read_mwm_task.hpp         |     9 +-
 libs/drape_frontend/render_group.cpp          |    18 +-
 libs/drape_frontend/render_group.hpp          |    22 +-
 libs/drape_frontend/render_node.hpp           |    12 +-
 .../drape_frontend/render_state_extension.cpp |    19 +-
 libs/drape_frontend/requested_tiles.cpp       |     8 +-
 libs/drape_frontend/requested_tiles.hpp       |     7 +-
 libs/drape_frontend/route_builder.cpp         |    14 +-
 libs/drape_frontend/route_builder.hpp         |     7 +-
 libs/drape_frontend/route_renderer.cpp        |   121 +-
 libs/drape_frontend/route_renderer.hpp        |    26 +-
 libs/drape_frontend/route_shape.cpp           |   261 +-
 libs/drape_frontend/route_shape.hpp           |    64 +-
 libs/drape_frontend/rule_drawer.cpp           |    88 +-
 libs/drape_frontend/rule_drawer.hpp           |     3 +-
 libs/drape_frontend/scenario_manager.cpp      |    38 +-
 libs/drape_frontend/scenario_manager.hpp      |    14 +-
 libs/drape_frontend/screen_animations.cpp     |    37 +-
 libs/drape_frontend/screen_animations.hpp     |    17 +-
 libs/drape_frontend/screen_operations.cpp     |    17 +-
 libs/drape_frontend/screen_operations.hpp     |     9 +-
 libs/drape_frontend/screen_quad_renderer.cpp  |    21 +-
 libs/drape_frontend/screen_quad_renderer.hpp  |     1 +
 libs/drape_frontend/selection_shape.cpp       |    16 +-
 libs/drape_frontend/selection_shape.hpp       |     4 +-
 .../selection_shape_generator.cpp             |    71 +-
 .../selection_shape_generator.hpp             |     5 +-
 libs/drape_frontend/shape_view_params.hpp     |     4 +-
 libs/drape_frontend/stylist.cpp               |    39 +-
 libs/drape_frontend/stylist.hpp               |    10 +-
 libs/drape_frontend/text_handle.cpp           |    10 +-
 libs/drape_frontend/text_handle.hpp           |    14 +-
 libs/drape_frontend/text_layout.cpp           |    49 +-
 libs/drape_frontend/text_layout.hpp           |    26 +-
 libs/drape_frontend/text_shape.cpp            |   107 +-
 libs/drape_frontend/text_shape.hpp            |    28 +-
 libs/drape_frontend/threads_commutator.cpp    |     3 +-
 libs/drape_frontend/threads_commutator.hpp    |     2 +-
 libs/drape_frontend/tile_info.cpp             |    10 +-
 libs/drape_frontend/tile_info.hpp             |     2 +-
 libs/drape_frontend/tile_key.cpp              |    39 +-
 libs/drape_frontend/tile_key.hpp              |     9 +-
 libs/drape_frontend/tile_utils.cpp            |     6 +-
 libs/drape_frontend/traffic_generator.cpp     |   150 +-
 libs/drape_frontend/traffic_generator.hpp     |    27 +-
 libs/drape_frontend/traffic_renderer.cpp      |   120 +-
 libs/drape_frontend/traffic_renderer.hpp      |     7 +-
 .../drape_frontend/transit_scheme_builder.cpp |   387 +-
 .../drape_frontend/transit_scheme_builder.hpp |    72 +-
 .../transit_scheme_renderer.cpp               |   103 +-
 .../transit_scheme_renderer.hpp               |    10 +-
 libs/drape_frontend/user_event_stream.cpp     |   317 +-
 libs/drape_frontend/user_event_stream.hpp     |   103 +-
 libs/drape_frontend/user_mark_generator.cpp   |    52 +-
 libs/drape_frontend/user_mark_shapes.cpp      |   134 +-
 libs/drape_frontend/user_mark_shapes.hpp      |    28 +-
 libs/drape_frontend/user_marks_provider.cpp   |    11 +-
 libs/drape_frontend/user_marks_provider.hpp   |     7 +-
 libs/drape_frontend/visual_params.cpp         |    28 +-
 libs/drape_frontend/visual_params.hpp         |    19 +-
 libs/editor/changeset_wrapper.cpp             |    40 +-
 libs/editor/editor_config.cpp                 |    34 +-
 libs/editor/editor_config.hpp                 |     8 +-
 libs/editor/editor_notes.cpp                  |    34 +-
 libs/editor/editor_notes.hpp                  |     5 +-
 libs/editor/editor_storage.cpp                |    10 +-
 .../editor_tests/config_loader_test.cpp       |     4 +-
 .../editor_tests/editor_config_test.cpp       |    17 +-
 .../editor/editor_tests/editor_notes_test.cpp |     7 +-
 .../editor_tests/feature_matcher_test.cpp     |   189 +-
 .../editor_tests/match_by_geometry_test.cpp   |   159 +-
 .../new_feature_categories_test.cpp           |     3 +-
 .../editor_tests/opening_hours_ui_test.cpp    |    17 +-
 libs/editor/editor_tests/osm_editor_test.cpp  |   196 +-
 libs/editor/editor_tests/ui2oh_test.cpp       |   104 +-
 libs/editor/editor_tests/xml_feature_test.cpp |    33 +-
 libs/editor/edits_migration.cpp               |   101 +-
 libs/editor/edits_migration.hpp               |     6 +-
 libs/editor/feature_matcher.cpp               |    34 +-
 libs/editor/feature_matcher.hpp               |     8 +-
 libs/editor/new_feature_categories.cpp        |     3 +-
 libs/editor/opening_hours_ui.cpp              |    65 +-
 libs/editor/opening_hours_ui.hpp              |     9 +-
 libs/editor/osm_auth.cpp                      |    92 +-
 libs/editor/osm_auth.hpp                      |    33 +-
 libs/editor/osm_auth_tests/osm_auth_tests.cpp |     2 +-
 .../editor/osm_auth_tests/server_api_test.cpp |    20 +-
 libs/editor/osm_editor.cpp                    |   508 +-
 libs/editor/osm_editor.hpp                    |     6 +-
 libs/editor/server_api.cpp                    |    38 +-
 libs/editor/server_api.hpp                    |     2 +-
 libs/editor/ui2oh.cpp                         |    45 +-
 libs/editor/ui2oh.hpp                         |     4 +-
 libs/editor/xml_feature.cpp                   |   275 +-
 libs/editor/xml_feature.hpp                   |     4 +-
 libs/ge0/ge0_tests/geo_url_tests.cpp          |     7 +-
 libs/ge0/ge0_tests/parser_tests.cpp           |    29 +-
 libs/ge0/ge0_tests/url_generator_tests.cpp    |     2 +-
 libs/ge0/geo_url_parser.cpp                   |    33 +-
 libs/ge0/geo_url_parser.hpp                   |     3 +-
 libs/ge0/parser.cpp                           |     4 -
 libs/ge0/parser.hpp                           |     6 +-
 libs/ge0/url_generator.cpp                    |    52 +-
 libs/geometry/algorithm.cpp                   |     3 +-
 libs/geometry/algorithm.hpp                   |    27 +-
 libs/geometry/any_rect2d.hpp                  |    18 +-
 libs/geometry/area_on_earth.cpp               |     6 +-
 libs/geometry/avg_vector.hpp                  |     5 +-
 libs/geometry/bounding_box.hpp                |     5 +-
 libs/geometry/calipers_box.cpp                |    26 +-
 libs/geometry/cellid.hpp                      |     2 -
 libs/geometry/circle_on_earth.cpp             |     9 +-
 libs/geometry/clipping.cpp                    |    41 +-
 libs/geometry/clipping.hpp                    |    12 +-
 libs/geometry/convex_hull.cpp                 |     5 +-
 libs/geometry/covering.hpp                    |    23 +-
 libs/geometry/covering_utils.hpp              |    22 +-
 libs/geometry/diamond_box.hpp                 |    10 +-
 .../geometry_tests/algorithm_test.cpp         |   106 +-
 libs/geometry/geometry_tests/angle_test.cpp   |    98 +-
 libs/geometry/geometry_tests/anyrect_test.cpp |     2 +-
 .../geometry_tests/area_on_earth_tests.cpp    |    20 +-
 .../geometry_tests/bounding_box_tests.cpp     |     2 +-
 .../geometry_tests/calipers_box_tests.cpp     |    10 +-
 libs/geometry/geometry_tests/cellid_test.cpp  |    29 +-
 .../geometry_tests/circle_on_earth_tests.cpp  |    31 +-
 .../geometry/geometry_tests/clipping_test.cpp |    60 +-
 libs/geometry/geometry_tests/common_test.cpp  |     4 +-
 .../geometry_tests/convex_hull_tests.cpp      |    20 +-
 .../geometry/geometry_tests/covering_test.cpp |    14 +-
 libs/geometry/geometry_tests/equality.hpp     |    84 +-
 .../geometry_tests/intersect_test.cpp         |    49 +-
 .../intersection_score_tests.cpp              |     6 +-
 .../geometry/geometry_tests/large_polygon.hpp | 11083 ++++++++--------
 libs/geometry/geometry_tests/latlon_test.cpp  |     4 +-
 .../geometry/geometry_tests/mercator_test.cpp |    10 +-
 .../nearby_points_sweeper_test.cpp            |    12 +-
 .../geometry_tests/oblate_spheroid_tests.cpp  |     2 +-
 libs/geometry/geometry_tests/packer_test.cpp  |    48 +-
 .../parametrized_segment_tests.cpp            |    15 +-
 .../geometry/geometry_tests/point3d_tests.cpp |     2 +-
 libs/geometry/geometry_tests/point_test.cpp   |    19 +-
 libs/geometry/geometry_tests/polygon_test.cpp |    12 +-
 .../geometry_tests/polyline_tests.cpp         |     7 +-
 libs/geometry/geometry_tests/rect_test.cpp    |     3 +-
 .../region2d_binary_op_test.cpp               |    37 +-
 libs/geometry/geometry_tests/region_tests.cpp |    33 +-
 libs/geometry/geometry_tests/robust_test.cpp  |     8 +-
 libs/geometry/geometry_tests/screen_test.cpp  |    39 +-
 .../geometry_tests/segment2d_tests.cpp        |    41 +-
 .../geometry_tests/simplification_test.cpp    |    43 +-
 libs/geometry/geometry_tests/spline_test.cpp  |     8 +-
 libs/geometry/geometry_tests/test_regions.hpp |  2056 ++-
 .../geometry_tests/transformations_test.cpp   |     7 +-
 libs/geometry/geometry_tests/tree_test.cpp    |    10 +-
 libs/geometry/geometry_tests/vector_test.cpp  |    16 +-
 libs/geometry/intersection_score.hpp          |     9 +-
 libs/geometry/latlon.cpp                      |    10 +-
 libs/geometry/mercator.cpp                    |     7 +-
 libs/geometry/mercator.hpp                    |    70 +-
 libs/geometry/nearby_points_sweeper.cpp       |     9 +-
 libs/geometry/nearby_points_sweeper.hpp       |     4 +-
 libs/geometry/oblate_spheroid.cpp             |    25 +-
 libs/geometry/oblate_spheroid.hpp             |     2 +-
 libs/geometry/packer.cpp                      |    21 +-
 libs/geometry/packer.hpp                      |    10 +-
 libs/geometry/parametrized_segment.hpp        |     3 +-
 libs/geometry/point2d.hpp                     |    28 +-
 libs/geometry/point3d.hpp                     |     3 +-
 libs/geometry/point_with_altitude.cpp         |    16 +-
 libs/geometry/point_with_altitude.hpp         |    10 +-
 libs/geometry/polygon.hpp                     |    71 +-
 libs/geometry/polyline2d.hpp                  |    21 +-
 libs/geometry/rect2d.hpp                      |    24 +-
 libs/geometry/rect_intersect.hpp              |   194 +-
 libs/geometry/region2d.hpp                    |    21 +-
 libs/geometry/region2d/boost_concept.hpp      |   269 +-
 libs/geometry/robust_orientation.cpp          |     6 +-
 libs/geometry/robust_orientation.hpp          |     3 +-
 libs/geometry/screenbase.cpp                  |   121 +-
 libs/geometry/screenbase.hpp                  |    13 +-
 libs/geometry/segment2d.cpp                   |     7 +-
 libs/geometry/segment2d.hpp                   |     3 +-
 libs/geometry/simplification.hpp              |    15 +-
 libs/geometry/smoothing.cpp                   |     9 +-
 libs/geometry/smoothing.hpp                   |     4 +-
 libs/geometry/spline.cpp                      |    39 +-
 libs/geometry/spline.hpp                      |     2 +-
 libs/geometry/transformations.hpp             |    91 +-
 libs/geometry/tree4d.hpp                      |    23 +-
 libs/geometry/triangle2d.cpp                  |    23 +-
 libs/geometry/triangle2d.hpp                  |    19 +-
 libs/indexer/altitude_loader.cpp              |     8 +-
 libs/indexer/altitude_loader.hpp              |     5 +-
 libs/indexer/brands_holder.cpp                |     6 +-
 libs/indexer/brands_holder.hpp                |     8 +-
 libs/indexer/caching_rank_table_loader.cpp    |    10 +-
 libs/indexer/categories_holder.cpp            |    12 +-
 libs/indexer/categories_holder.hpp            |     9 +-
 libs/indexer/categories_index.cpp             |    59 +-
 libs/indexer/cell_coverer.hpp                 |    23 +-
 libs/indexer/cell_id.hpp                      |    37 +-
 libs/indexer/cell_value_pair.hpp              |     5 +-
 libs/indexer/centers_table.cpp                |    20 +-
 libs/indexer/centers_table.hpp                |     8 +-
 libs/indexer/cities_boundaries_serdes.hpp     |    73 +-
 libs/indexer/city_boundary.hpp                |     5 +-
 libs/indexer/classificator.cpp                |   278 +-
 libs/indexer/classificator.hpp                |    67 +-
 libs/indexer/classificator_loader.cpp         |    19 +-
 libs/indexer/classificator_loader.hpp         |     3 +-
 libs/indexer/complex/serdes.hpp               |     6 +-
 libs/indexer/complex/tree_node.hpp            |    51 +-
 libs/indexer/cuisines.cpp                     |    16 +-
 libs/indexer/custom_keyvalue.cpp              |     2 +-
 libs/indexer/custom_keyvalue.hpp              |     4 +-
 libs/indexer/data_header.cpp                  |   182 +-
 libs/indexer/data_header.hpp                  |   122 +-
 libs/indexer/data_source.cpp                  |    48 +-
 libs/indexer/data_source.hpp                  |    23 +-
 libs/indexer/data_source_helpers.cpp          |    11 +-
 libs/indexer/displacement_manager.hpp         |    21 +-
 libs/indexer/drawing_rule_def.cpp             |    12 +-
 libs/indexer/drawing_rule_def.hpp             |    95 +-
 libs/indexer/drawing_rules.cpp                |   408 +-
 libs/indexer/drawing_rules.hpp                |    98 +-
 libs/indexer/drules_selector.cpp              |    46 +-
 libs/indexer/drules_selector_parser.cpp       |    20 +-
 libs/indexer/edit_journal.cpp                 |   198 +-
 libs/indexer/edit_journal.hpp                 |   116 +-
 libs/indexer/editable_map_object.cpp          |   251 +-
 libs/indexer/editable_map_object.hpp          |    21 +-
 libs/indexer/fake_feature_ids.hpp             |    10 +-
 libs/indexer/feature.cpp                      |    45 +-
 libs/indexer/feature.hpp                      |    17 +-
 libs/indexer/feature_algo.cpp                 |    19 +-
 libs/indexer/feature_altitude.hpp             |    12 +-
 libs/indexer/feature_covering.cpp             |    50 +-
 libs/indexer/feature_covering.hpp             |    28 +-
 libs/indexer/feature_data.cpp                 |    76 +-
 libs/indexer/feature_data.hpp                 |   240 +-
 libs/indexer/feature_decl.cpp                 |    11 +-
 libs/indexer/feature_decl.hpp                 |     5 +-
 libs/indexer/feature_impl.cpp                 |     2 +-
 libs/indexer/feature_impl.hpp                 |    11 +-
 libs/indexer/feature_meta.cpp                 |    28 +-
 libs/indexer/feature_meta.hpp                 |    58 +-
 libs/indexer/feature_source.cpp               |    10 +-
 libs/indexer/feature_source.hpp               |     7 +-
 libs/indexer/feature_to_osm.cpp               |    11 +-
 libs/indexer/feature_to_osm.hpp               |    50 +-
 libs/indexer/feature_utils.cpp                |   103 +-
 libs/indexer/feature_utils.hpp                |   301 +-
 libs/indexer/feature_visibility.cpp           |   315 +-
 libs/indexer/feature_visibility.hpp           |   140 +-
 libs/indexer/features_offsets_table.cpp       |   229 +-
 libs/indexer/features_offsets_table.hpp       |   146 +-
 libs/indexer/features_vector.cpp              |    22 +-
 libs/indexer/features_vector.hpp              |    20 +-
 libs/indexer/ftypes_mapping.hpp               |    18 +-
 libs/indexer/ftypes_matcher.cpp               |   180 +-
 libs/indexer/ftypes_matcher.hpp               |    90 +-
 libs/indexer/house_to_street_iface.hpp        |     6 +-
 libs/indexer/index_builder.hpp                |    24 +-
 libs/indexer/indexer_tests/brands_tests.cpp   |    23 +-
 .../indexer/indexer_tests/categories_test.cpp |   101 +-
 libs/indexer/indexer_tests/cell_id_test.cpp   |    29 +-
 .../indexer_tests/centers_table_test.cpp      |    13 +-
 libs/indexer/indexer_tests/checker_test.cpp   |    41 +-
 .../cities_boundaries_serdes_tests.cpp        |    10 +-
 .../indexer_tests/classificator_tests.cpp     |     2 +-
 .../drules_selector_parser_test.cpp           |    21 +-
 .../editable_map_object_test.cpp              |   115 +-
 .../indexer_tests/feature_metadata_test.cpp   |    24 +-
 .../indexer_tests/feature_names_test.cpp      |     6 +-
 .../indexer_tests/feature_to_osm_tests.cpp    |     7 +-
 .../indexer_tests/feature_types_test.cpp      |    79 +-
 .../features_offsets_table_test.cpp           |   116 +-
 .../indexer_tests/features_vector_test.cpp    |    27 +-
 .../indexer_tests/index_builder_test.cpp      |     2 -
 .../indexer_tests/interval_index_test.cpp     |   103 +-
 .../indexer_tests/metadata_serdes_tests.cpp   |     6 +-
 libs/indexer/indexer_tests/mwm_set_test.cpp   |     3 +-
 .../indexer_tests/postcodes_matcher_tests.cpp |     3 +-
 .../indexer/indexer_tests/rank_table_test.cpp |     2 +-
 .../road_shields_parser_tests.cpp             |     2 +-
 .../scale_index_reading_tests.cpp             |    37 +-
 .../search_string_utils_test.cpp              |   103 +-
 .../sort_and_merge_intervals_test.cpp         |    27 +-
 .../indexer_tests/succinct_trie_test.cpp      |    21 +-
 libs/indexer/indexer_tests/test_mwm_set.hpp   |     2 +-
 libs/indexer/indexer_tests/test_type.cpp      |    44 +-
 .../indexer/indexer_tests/tree_node_tests.cpp |    27 +-
 libs/indexer/indexer_tests/trie_test.cpp      |   119 +-
 .../validate_and_format_contacts_test.cpp     |    79 +-
 .../indexer/indexer_tests/visibility_test.cpp |    21 +-
 libs/indexer/interval_index.hpp               |    30 +-
 libs/indexer/interval_index_builder.hpp       |    20 +-
 libs/indexer/isolines_info.cpp                |     3 +-
 libs/indexer/isolines_info.hpp                |    16 +-
 libs/indexer/map_object.cpp                   |    81 +-
 libs/indexer/map_object.hpp                   |    14 +-
 libs/indexer/map_style.cpp                    |    55 +-
 libs/indexer/map_style_reader.cpp             |    61 +-
 libs/indexer/metadata_serdes.cpp              |    23 +-
 libs/indexer/mwm_set.cpp                      |    99 +-
 libs/indexer/mwm_set.hpp                      |    45 +-
 libs/indexer/postcodes_matcher.cpp            |    23 +-
 libs/indexer/rank_table.cpp                   |    17 +-
 libs/indexer/rank_table.hpp                   |     9 +-
 libs/indexer/road_shields_parser.cpp          |   154 +-
 libs/indexer/road_shields_parser.hpp          |    12 +-
 libs/indexer/scale_index.hpp                  |    18 +-
 libs/indexer/scale_index_builder.hpp          |    21 +-
 libs/indexer/scales.cpp                       |   144 +-
 libs/indexer/scales.hpp                       |   112 +-
 libs/indexer/scales_patch.hpp                 |    11 +-
 libs/indexer/search_delimiters.cpp            |     3 +-
 libs/indexer/search_string_utils.cpp          |   219 +-
 libs/indexer/search_string_utils.hpp          |    12 +-
 libs/indexer/shared_load_info.cpp             |     6 +-
 libs/indexer/string_set.hpp                   |     4 -
 libs/indexer/succinct_trie_reader.hpp         |    39 +-
 libs/indexer/transliteration_loader.cpp       |     2 +-
 libs/indexer/tree_structure.hpp               |     9 +-
 libs/indexer/trie.hpp                         |     6 +-
 libs/indexer/trie_builder.hpp                 |    23 +-
 libs/indexer/trie_reader.hpp                  |    15 +-
 libs/indexer/types_mapping.cpp                |     2 +-
 libs/indexer/types_mapping.hpp                |     6 +-
 libs/indexer/utils.cpp                        |     3 +-
 libs/indexer/utils.hpp                        |     5 +-
 libs/indexer/validate_and_format_contacts.cpp |   112 +-
 libs/kml/header_binary.hpp                    |    41 +-
 libs/kml/kmb_to_kml/kmb_to_kml.cpp            |     9 +-
 libs/kml/kml_tests/gpx_tests.cpp              |    24 +-
 libs/kml/kml_tests/minzoom_quadtree_tests.cpp |    24 +-
 libs/kml/kml_tests/serdes_tests.cpp           |   419 +-
 libs/kml/kml_tests/tests_data.hpp             |  3141 ++---
 libs/kml/kml_to_kmb/kml_to_kmb.cpp            |     3 +-
 libs/kml/minzoom_quadtree.hpp                 |    26 +-
 libs/kml/pykmlib/bindings.cpp                 |   480 +-
 libs/kml/serdes.cpp                           |   110 +-
 libs/kml/serdes.hpp                           |    19 +-
 libs/kml/serdes_binary.cpp                    |     6 +-
 libs/kml/serdes_binary.hpp                    |    21 +-
 libs/kml/serdes_binary_v8.hpp                 |     6 +-
 libs/kml/serdes_common.cpp                    |    21 +-
 libs/kml/serdes_common.hpp                    |    16 +-
 libs/kml/serdes_gpx.cpp                       |    97 +-
 libs/kml/serdes_gpx.hpp                       |    10 +-
 libs/kml/type_utils.cpp                       |     2 +-
 libs/kml/type_utils.hpp                       |    18 +-
 libs/kml/types.cpp                            |     9 +-
 libs/kml/types.hpp                            |   136 +-
 libs/kml/types_v3.hpp                         |    90 +-
 libs/kml/types_v6.hpp                         |    30 +-
 libs/kml/types_v7.hpp                         |    88 +-
 libs/kml/types_v8.hpp                         |    51 +-
 libs/kml/types_v8mm.hpp                       |   122 +-
 libs/kml/types_v9mm.hpp                       |    22 +-
 libs/kml/visitors.hpp                         |   206 +-
 libs/map/api_mark_point.cpp                   |    42 +-
 libs/map/api_mark_point.hpp                   |     5 +-
 libs/map/benchmark_tool/api.cpp               |    14 +-
 libs/map/benchmark_tool/api.hpp               |    56 +-
 libs/map/benchmark_tool/features_loading.cpp  |   128 +-
 libs/map/benchmark_tools.cpp                  |    38 +-
 libs/map/benchmark_tools.hpp                  |     2 +-
 libs/map/bookmark.cpp                         |    62 +-
 libs/map/bookmark.hpp                         |     1 +
 libs/map/bookmark_helpers.cpp                 |   317 +-
 libs/map/bookmark_helpers.hpp                 |    12 +-
 libs/map/bookmark_manager.cpp                 |   380 +-
 libs/map/bookmark_manager.hpp                 |    94 +-
 libs/map/chart_generator.cpp                  |    48 +-
 libs/map/chart_generator.hpp                  |    14 +-
 libs/map/elevation_info.hpp                   |    16 +-
 libs/map/everywhere_search_callback.cpp       |     4 +-
 libs/map/extrapolation/extrapolator.cpp       |    69 +-
 libs/map/extrapolation/extrapolator.hpp       |     6 +-
 .../extrapolation_benchmark.cpp               |    59 +-
 libs/map/features_fetcher.cpp                 |    23 +-
 libs/map/features_fetcher.hpp                 |     5 +-
 libs/map/framework.cpp                        |   423 +-
 libs/map/framework.hpp                        |   128 +-
 libs/map/framework_visualize.cpp              |    16 +-
 libs/map/gps_track.cpp                        |    19 +-
 libs/map/gps_track.hpp                        |    31 +-
 libs/map/gps_track_collection.cpp             |    17 +-
 libs/map/gps_track_collection.hpp             |     8 +-
 libs/map/gps_track_filter.cpp                 |    11 +-
 libs/map/gps_track_filter.hpp                 |     9 +-
 libs/map/gps_track_storage.cpp                |    13 +-
 libs/map/gps_tracker.cpp                      |    13 +-
 libs/map/gps_tracker.hpp                      |     5 +-
 libs/map/isolines_manager.cpp                 |     4 +-
 libs/map/isolines_manager.hpp                 |     5 +-
 .../interactive_search_test.cpp               |    54 +-
 libs/map/map_tests/address_tests.cpp          |     9 +-
 libs/map/map_tests/bookmarks_test.cpp         |   700 +-
 libs/map/map_tests/chart_generator_tests.cpp  |    81 +-
 libs/map/map_tests/check_mwms.cpp             |    13 +-
 libs/map/map_tests/countries_names_tests.cpp  |    20 +-
 libs/map/map_tests/elevation_info_tests.cpp   |    58 +-
 libs/map/map_tests/extrapolator_tests.cpp     |    15 +-
 libs/map/map_tests/feature_getters_tests.cpp  |    15 +-
 .../map_tests/gps_track_collection_test.cpp   |     2 +-
 libs/map/map_tests/gps_track_storage_test.cpp |    12 +-
 libs/map/map_tests/gps_track_test.cpp         |    19 +-
 libs/map/map_tests/kmz_unarchive_test.cpp     |     4 +-
 libs/map/map_tests/mwm_url_tests.cpp          |    61 +-
 libs/map/map_tests/power_manager_tests.cpp    |    33 +-
 libs/map/map_tests/search_api_tests.cpp       |    29 +-
 libs/map/map_tests/track_statistics_tests.cpp |   136 +-
 libs/map/map_tests/transliteration_test.cpp   |     6 +-
 libs/map/mwm_tests/multithread_mwm_test.cpp   |     3 +-
 libs/map/mwm_tests/mwm_foreach_test.cpp       |    74 +-
 libs/map/mwm_tests/mwm_index_test.cpp         |    11 +-
 libs/map/mwm_tests/world_map_test.cpp         |     2 +-
 libs/map/mwm_url.cpp                          |    62 +-
 libs/map/mwm_url.hpp                          |    10 +-
 libs/map/place_page_info.cpp                  |   102 +-
 libs/map/place_page_info.hpp                  |    49 +-
 .../power_management_schemas.cpp              |   126 +-
 libs/map/power_management/power_manager.cpp   |    44 +-
 libs/map/power_management/power_manager.hpp   |     1 +
 libs/map/routing_manager.cpp                  |   295 +-
 libs/map/routing_manager.hpp                  |    63 +-
 libs/map/routing_mark.cpp                     |    79 +-
 libs/map/routing_mark.hpp                     |     6 +-
 libs/map/search_api.cpp                       |    51 +-
 libs/map/search_api.hpp                       |    23 +-
 libs/map/search_mark.cpp                      |   392 +-
 libs/map/search_mark.hpp                      |    14 +-
 libs/map/search_product_info.hpp              |     5 +-
 libs/map/style_tests/classificator_tests.cpp  |   201 +-
 libs/map/style_tests/dashes_test.cpp          |     2 +-
 .../style_symbols_consistency_test.cpp        |    13 +-
 libs/map/track.cpp                            |     6 +-
 libs/map/track_mark.cpp                       |    10 +-
 libs/map/track_mark.hpp                       |     5 +-
 libs/map/track_statistics.cpp                 |    29 +-
 libs/map/track_statistics.hpp                 |     1 +
 libs/map/traffic_manager.cpp                  |    64 +-
 libs/map/traffic_manager.hpp                  |     5 +-
 libs/map/transit/transit_display.cpp          |   148 +-
 libs/map/transit/transit_display.hpp          |    28 +-
 libs/map/transit/transit_reader.cpp           |    20 +-
 libs/map/transit/transit_reader.hpp           |    14 +-
 libs/map/user_mark.cpp                        |    15 +-
 libs/map/user_mark.hpp                        |     4 +-
 libs/map/user_mark_id_storage.cpp             |    12 +-
 libs/map/user_mark_layer.cpp                  |     6 +-
 libs/map/user_mark_layer.hpp                  |     1 -
 libs/map/viewport_search_callback.cpp         |     4 +-
 libs/mwm_diff/diff.cpp                        |    20 +-
 libs/mwm_diff/diff.hpp                        |     6 +-
 libs/mwm_diff/mwm_diff_tests/diff_tests.cpp   |    18 +-
 libs/mwm_diff/mwm_diff_tool/mwm_diff_tool.cpp |    18 +-
 libs/platform/battery_tracker.cpp             |    12 +-
 libs/platform/battery_tracker.hpp             |     3 +-
 libs/platform/chunks_download_strategy.cpp    |    31 +-
 libs/platform/chunks_download_strategy.hpp    |    18 +-
 libs/platform/constants.hpp                   |     5 +-
 libs/platform/country_file.cpp                |    12 +-
 libs/platform/country_file.hpp                |    11 +-
 libs/platform/distance.cpp                    |    56 +-
 libs/platform/downloader_defines.hpp          |    13 +-
 libs/platform/downloader_utils.cpp            |     5 +-
 libs/platform/downloader_utils.hpp            |     1 -
 libs/platform/duration.cpp                    |    50 +-
 libs/platform/duration.hpp                    |     9 +-
 libs/platform/get_text_by_id.cpp              |     9 +-
 libs/platform/get_text_by_id.hpp              |     4 +-
 libs/platform/http_client.cpp                 |     9 +-
 libs/platform/http_client.hpp                 |     9 +-
 libs/platform/http_client_curl.cpp            |    17 +-
 libs/platform/http_request.cpp                |   122 +-
 libs/platform/http_request.hpp                |    17 +-
 libs/platform/http_thread_callback.hpp        |     2 +-
 libs/platform/http_thread_qt.cpp              |    40 +-
 libs/platform/http_thread_qt.hpp              |    13 +-
 libs/platform/http_uploader_dummy.cpp         |     2 +-
 libs/platform/languages.hpp                   |    92 +-
 libs/platform/local_country_file.cpp          |    18 +-
 libs/platform/local_country_file.hpp          |     2 +-
 libs/platform/local_country_file_utils.cpp    |    22 +-
 libs/platform/local_country_file_utils.hpp    |    18 +-
 libs/platform/locale.hpp                      |     2 +-
 libs/platform/locale_std.cpp                  |     9 +-
 libs/platform/localization.cpp                |     2 +-
 libs/platform/localization_dummy.cpp          |    22 +-
 libs/platform/location.hpp                    |   247 +-
 .../location_service/location_service.cpp     |    88 +-
 .../location_service/location_service.hpp     |     3 +-
 .../location_service/qt_location_service.cpp  |    42 +-
 .../location_service/qt_location_service.hpp  |     8 +-
 libs/platform/measurement_utils.cpp           |    41 +-
 libs/platform/measurement_utils.hpp           |    72 +-
 libs/platform/mwm_traits.cpp                  |    15 +-
 libs/platform/mwm_version.cpp                 |     3 +-
 libs/platform/network_policy.hpp              |     2 +-
 libs/platform/platform.cpp                    |    85 +-
 libs/platform/platform.hpp                    |    28 +-
 libs/platform/platform_android.cpp            |    27 +-
 libs/platform/platform_linux.cpp              |   115 +-
 libs/platform/platform_qt.cpp                 |    16 +-
 .../platform_tests/country_file_tests.cpp     |     2 +-
 .../platform_tests/distance_tests.cpp         |     3 +-
 .../downloader_tests/downloader_test.cpp      |    95 +-
 .../platform_tests/downloader_utils_tests.cpp |     5 +-
 .../platform_tests/duration_tests.cpp         |    78 +-
 libs/platform/platform_tests/jansson_test.cpp |     7 +-
 .../platform/platform_tests/language_test.cpp |     4 +-
 .../local_country_file_tests.cpp              |    42 +-
 .../platform/platform_tests/location_test.cpp |     1 -
 .../platform_tests/measurement_tests.cpp      |    16 +-
 .../platform/platform_tests/platform_test.cpp |    47 +-
 .../platform_tests/products_tests.cpp         |     1 -
 .../platform_tests/utm_mgrs_utils_tests.cpp   |     6 +-
 .../async_gui_thread.hpp                      |     9 +-
 .../platform_tests_support/scoped_dir.cpp     |    37 +-
 .../platform_tests_support/scoped_file.cpp    |    14 +-
 .../platform_tests_support/scoped_mwm.cpp     |     2 +-
 .../platform_tests_support/test_socket.cpp    |    18 +-
 .../writable_dir_changer.hpp                  |     6 +-
 libs/platform/platform_unix_impl.cpp          |    17 +-
 libs/platform/platform_unix_impl.hpp          |     3 +-
 libs/platform/platform_win.cpp                |    29 +-
 libs/platform/preferred_languages.cpp         |   444 +-
 libs/platform/products.cpp                    |     9 +-
 libs/platform/products.hpp                    |    13 +-
 libs/platform/remote_file.cpp                 |    13 +-
 libs/platform/remote_file.hpp                 |     6 +-
 libs/platform/safe_callback.hpp               |    15 +-
 libs/platform/servers_list.cpp                |    14 +-
 libs/platform/settings.cpp                    |    12 +-
 libs/platform/settings.hpp                    |    12 +-
 libs/platform/string_storage_base.cpp         |     6 +-
 libs/platform/trace.hpp                       |    14 +-
 libs/platform/trace_android.cpp               |    23 +-
 libs/platform/utm_mgrs_utils.cpp              |    76 +-
 libs/pyhelpers/pair.hpp                       |     2 +-
 libs/pyhelpers/vector_list_conversion.hpp     |     3 +-
 libs/pyhelpers/vector_uint8.hpp               |     9 +-
 libs/qt_tstfrm/test_main_loop.cpp             |    13 +-
 libs/qt_tstfrm/test_main_loop.hpp             |     4 +-
 libs/routing/absent_regions_finder.cpp        |    21 +-
 libs/routing/absent_regions_finder.hpp        |     3 +-
 libs/routing/async_router.cpp                 |   123 +-
 libs/routing/async_router.hpp                 |    24 +-
 libs/routing/base/astar_algorithm.hpp         |   243 +-
 libs/routing/base/astar_graph.hpp             |    18 +-
 libs/routing/base/astar_progress.cpp          |    28 +-
 libs/routing/base/astar_progress.hpp          |     3 +-
 libs/routing/base/astar_vertex_data.hpp       |     7 +-
 libs/routing/base/bfs.hpp                     |    12 +-
 libs/routing/base/followed_polyline.cpp       |    25 +-
 libs/routing/base/followed_polyline.hpp       |     7 +-
 libs/routing/base/routing_result.hpp          |     5 +-
 libs/routing/base/small_list.cpp              |     7 +-
 libs/routing/base/small_list.hpp              |     7 +-
 libs/routing/car_directions.cpp               |   106 +-
 libs/routing/car_directions.hpp               |     9 +-
 libs/routing/checkpoint_predictor.cpp         |    12 +-
 libs/routing/checkpoint_predictor.hpp         |     5 +-
 libs/routing/checkpoints.cpp                  |     3 +-
 libs/routing/city_roads.cpp                   |     3 +-
 libs/routing/city_roads_serialization.hpp     |    10 +-
 libs/routing/coding.hpp                       |    10 +-
 libs/routing/cross_border_graph.cpp           |    18 +-
 libs/routing/cross_border_graph.hpp           |    17 +-
 libs/routing/cross_mwm_connector.hpp          |    54 +-
 .../cross_mwm_connector_serialization.hpp     |   125 +-
 libs/routing/cross_mwm_graph.cpp              |    33 +-
 libs/routing/cross_mwm_graph.hpp              |    13 +-
 libs/routing/cross_mwm_ids.hpp                |    14 +-
 libs/routing/cross_mwm_index_graph.hpp        |    50 +-
 libs/routing/data_source.hpp                  |    13 +-
 libs/routing/directions_engine.cpp            |    65 +-
 libs/routing/directions_engine.hpp            |    28 +-
 libs/routing/directions_engine_helpers.cpp    |    24 +-
 libs/routing/directions_engine_helpers.hpp    |    11 +-
 libs/routing/dummy_world_graph.hpp            |    61 +-
 libs/routing/edge_estimator.cpp               |   161 +-
 libs/routing/edge_estimator.hpp               |    33 +-
 libs/routing/fake_edges_container.hpp         |     3 +-
 libs/routing/fake_ending.cpp                  |    27 +-
 libs/routing/fake_ending.hpp                  |    15 +-
 libs/routing/fake_feature_ids.hpp             |    12 +-
 libs/routing/fake_graph.cpp                   |    39 +-
 libs/routing/fake_graph.hpp                   |     5 +-
 libs/routing/fake_vertex.hpp                  |    21 +-
 libs/routing/features_road_graph.cpp          |    46 +-
 libs/routing/features_road_graph.hpp          |    13 +-
 libs/routing/following_info.hpp               |    13 +-
 libs/routing/geometry.cpp                     |    41 +-
 libs/routing/geometry.hpp                     |    23 +-
 libs/routing/guides_connections.cpp           |    84 +-
 libs/routing/guides_connections.hpp           |    13 +-
 libs/routing/guides_graph.cpp                 |    46 +-
 libs/routing/guides_graph.hpp                 |     9 +-
 libs/routing/index_graph.cpp                  |   179 +-
 libs/routing/index_graph.hpp                  |   111 +-
 libs/routing/index_graph_loader.cpp           |    34 +-
 libs/routing/index_graph_loader.hpp           |     9 +-
 libs/routing/index_graph_serialization.cpp    |    21 +-
 libs/routing/index_graph_serialization.hpp    |    46 +-
 libs/routing/index_graph_starter.cpp          |   166 +-
 libs/routing/index_graph_starter.hpp          |    74 +-
 libs/routing/index_graph_starter_joints.hpp   |   129 +-
 libs/routing/index_road_graph.cpp             |    47 +-
 libs/routing/index_road_graph.hpp             |     9 +-
 libs/routing/index_router.cpp                 |   634 +-
 libs/routing/index_router.hpp                 |    77 +-
 libs/routing/joint_index.cpp                  |    12 +-
 libs/routing/joint_segment.cpp                |    15 +-
 libs/routing/joint_segment.hpp                |    10 +-
 libs/routing/junction_visitor.cpp             |    44 +-
 libs/routing/junction_visitor.hpp             |    12 +-
 libs/routing/latlon_with_altitude.cpp         |     4 +-
 libs/routing/latlon_with_altitude.hpp         |     5 +-
 libs/routing/leaps_graph.cpp                  |     9 +-
 libs/routing/leaps_graph.hpp                  |     6 +-
 libs/routing/leaps_postprocessor.cpp          |    62 +-
 libs/routing/loaded_path_segment.hpp          |    10 +-
 libs/routing/maxspeeds.cpp                    |    10 +-
 libs/routing/maxspeeds.hpp                    |     3 +-
 libs/routing/maxspeeds_serialization.cpp      |     4 +-
 libs/routing/maxspeeds_serialization.hpp      |    27 +-
 libs/routing/mwm_hierarchy_handler.cpp        |    35 +-
 libs/routing/mwm_hierarchy_handler.hpp        |     3 +-
 libs/routing/nearest_edge_finder.cpp          |    23 +-
 libs/routing/nearest_edge_finder.hpp          |     2 +-
 libs/routing/opening_hours_serdes.cpp         |    81 +-
 libs/routing/opening_hours_serdes.hpp         |    45 +-
 libs/routing/pedestrian_directions.cpp        |    14 +-
 libs/routing/pedestrian_directions.hpp        |     4 +-
 libs/routing/position_accumulator.cpp         |     5 +-
 libs/routing/position_accumulator.hpp         |     2 +-
 libs/routing/regions_decl.hpp                 |     2 +-
 libs/routing/regions_router.cpp               |    38 +-
 libs/routing/regions_router.hpp               |     9 +-
 libs/routing/regions_sparse_graph.cpp         |    48 +-
 libs/routing/regions_sparse_graph.hpp         |     7 +-
 libs/routing/restriction_loader.cpp           |    62 +-
 libs/routing/restriction_loader.hpp           |     6 +-
 libs/routing/restrictions_serialization.cpp   |     8 +-
 libs/routing/restrictions_serialization.hpp   |    61 +-
 libs/routing/road_access.cpp                  |    31 +-
 libs/routing/road_access.hpp                  |    38 +-
 libs/routing/road_access_serialization.cpp    |     1 -
 libs/routing/road_access_serialization.hpp    |    75 +-
 libs/routing/road_graph.cpp                   |   101 +-
 libs/routing/road_graph.hpp                   |   112 +-
 libs/routing/road_index.hpp                   |     2 -
 libs/routing/road_point.hpp                   |    10 +-
 libs/routing/route.cpp                        |    56 +-
 libs/routing/route.hpp                        |    90 +-
 libs/routing/route_point.hpp                  |     2 +-
 libs/routing/route_weight.cpp                 |    30 +-
 libs/routing/route_weight.hpp                 |    13 +-
 libs/routing/router.cpp                       |     9 +-
 libs/routing/router.hpp                       |    12 +-
 libs/routing/router_delegate.hpp              |     2 +-
 .../routing/routes_builder/routes_builder.cpp |    55 +-
 .../routing/routes_builder/routes_builder.hpp |    10 +-
 .../routes_builder_tool.cpp                   |    45 +-
 .../routes_builder_tool/utils.cpp             |    29 +-
 .../routes_builder_tool/utils.hpp             |    20 +-
 .../bicycle_routing_tests.cpp                 |     6 +-
 .../routing_benchmarks/car_routing_tests.cpp  |     5 +-
 libs/routing/routing_benchmarks/helpers.cpp   |    33 +-
 libs/routing/routing_benchmarks/helpers.hpp   |     7 +-
 .../pedestrian_routing_tests.cpp              |    38 +-
 libs/routing/routing_callbacks.hpp            |    20 +-
 .../routing_consistency_tests.cpp             |    22 +-
 libs/routing/routing_helpers.cpp              |    23 +-
 libs/routing/routing_helpers.hpp              |     8 +-
 .../absent_regions_finder_tests.cpp           |   108 +-
 .../bicycle_route_test.cpp                    |   238 +-
 .../bicycle_turn_test.cpp                     |    83 +-
 .../concurrent_feature_parsing_test.cpp       |     6 +-
 .../cross_country_routing_tests.cpp           |    42 +-
 .../get_altitude_test.cpp                     |     6 +-
 .../guides_tests.cpp                          |    18 +-
 .../pedestrian_route_test.cpp                 |   478 +-
 .../road_graph_tests.cpp                      |     5 +-
 .../roundabouts_tests.cpp                     |    15 +-
 .../routing_integration_tests/route_test.cpp  |   571 +-
 .../routing_test_tools.cpp                    |    94 +-
 .../routing_test_tools.hpp                    |    85 +-
 .../small_routes.cpp                          |    21 +-
 .../speed_camera_notifications_tests.cpp      |    64 +-
 .../street_names_test.cpp                     |     9 +-
 .../transit_route_test.cpp                    |    79 +-
 .../routing_integration_tests/turn_test.cpp   |   611 +-
 libs/routing/routing_options.cpp              |    35 +-
 libs/routing/routing_options.hpp              |    10 +-
 libs/routing/routing_quality/api/api.cpp      |     4 +-
 .../routing_quality/api/google/google_api.cpp |    12 +-
 .../routing_quality/api/google/google_api.hpp |     2 +-
 .../routing_quality/api/google/types.cpp      |     2 +-
 .../routing_quality/api/google/types.hpp      |    12 +-
 .../routing_quality/api/mapbox/mapbox_api.cpp |     9 +-
 .../routing_quality/api/mapbox/mapbox_api.hpp |     1 -
 .../routing_quality/api/mapbox/types.hpp      |     4 +-
 .../routing_quality_tests/barriers_tests.cpp  |     4 +-
 .../bigger_roads_tests.cpp                    |    17 +-
 .../routing_quality_tests/ferry_tests.cpp     |     2 +-
 .../passby_roads_tests.cpp                    |    10 +-
 .../routing_quality_tests/waypoints_tests.cpp |     4 +-
 .../routing_quality_tool/benchmark_stat.cpp   |    71 +-
 .../routing_quality_tool/benchmark_stat.hpp   |     7 +-
 .../error_type_counter.cpp                    |     6 +-
 .../error_type_counter.hpp                    |     6 +-
 .../routing_quality_tool.cpp                  |    40 +-
 .../routing_quality_tool/utils.cpp            |   125 +-
 .../routing_quality_tool/utils.hpp            |    27 +-
 libs/routing/routing_quality/waypoints.cpp    |    12 +-
 libs/routing/routing_quality/waypoints.hpp    |     9 +-
 libs/routing/routing_result_graph.hpp         |     2 +-
 libs/routing/routing_session.cpp              |    79 +-
 libs/routing/routing_session.hpp              |    26 +-
 libs/routing/routing_settings.cpp             |    19 +-
 libs/routing/routing_settings.hpp             |    10 +-
 .../routing_tests/applying_traffic_test.cpp   |    57 +-
 .../routing_tests/astar_algorithm_test.cpp    |    17 +-
 .../routing_tests/astar_progress_test.cpp     |     6 +-
 .../routing_tests/astar_router_test.cpp       |   229 +-
 .../routing_tests/async_router_test.cpp       |    13 +-
 libs/routing/routing_tests/bfs_tests.cpp      |    48 +-
 .../checkpoint_predictor_test.cpp             |    16 +-
 libs/routing/routing_tests/coding_test.cpp    |    46 +-
 .../cross_border_graph_tests.cpp              |    15 +-
 .../cross_mwm_connector_test.cpp              |    72 +-
 .../cumulative_restriction_test.cpp           |   172 +-
 .../routing/routing_tests/fake_graph_test.cpp |    38 +-
 .../routing_tests/followed_polyline_test.cpp  |    16 +-
 libs/routing/routing_tests/guides_tests.cpp   |     3 +-
 .../routing_tests/index_graph_test.cpp        |   241 +-
 .../routing_tests/index_graph_tools.cpp       |   144 +-
 .../routing_tests/index_graph_tools.hpp       |    77 +-
 .../routing/routing_tests/maxspeeds_tests.cpp |    25 +-
 .../routing_tests/mwm_hierarchy_test.cpp      |    37 +-
 .../nearest_edge_finder_tests.cpp             |     7 +-
 .../opening_hours_serdes_tests.cpp            |    20 +-
 .../position_accumulator_tests.cpp            |    18 +-
 .../routing_tests/restriction_test.cpp        |   439 +-
 .../routing_tests/road_access_test.cpp        |   424 +-
 .../routing_tests/road_graph_builder.cpp      |    17 +-
 .../routing_tests/road_graph_builder.hpp      |     6 +-
 .../road_graph_nearest_edges_test.cpp         |     3 +-
 libs/routing/routing_tests/route_tests.cpp    |   106 +-
 .../routing_tests/routing_algorithm.cpp       |    47 +-
 .../routing_tests/routing_algorithm.hpp       |    14 +-
 .../routing_tests/routing_helpers_tests.cpp   |    43 +-
 .../routing_tests/routing_options_tests.cpp   |    21 +-
 .../routing_tests/routing_session_test.cpp    |   290 +-
 .../routing_tests/speed_cameras_tests.cpp     |     4 +-
 libs/routing/routing_tests/tools.cpp          |     6 +-
 libs/routing/routing_tests/tools.hpp          |     3 +-
 .../routing_tests/turns_generator_test.cpp    |   188 +-
 .../routing_tests/turns_sound_test.cpp        |   133 +-
 .../routing_tests/turns_tts_text_tests.cpp    |    85 +-
 .../routing_tests/uturn_restriction_tests.cpp |    53 +-
 .../routing_tests/world_graph_builder.cpp     |    18 +-
 .../routing_tests/world_graph_builder.hpp     |     1 -
 libs/routing/ruler_router.cpp                 |    31 +-
 libs/routing/ruler_router.hpp                 |    13 +-
 libs/routing/segment.cpp                      |    10 +-
 libs/routing/segment.hpp                      |    20 +-
 libs/routing/segmented_route.cpp              |     7 +-
 libs/routing/segmented_route.hpp              |     5 +-
 libs/routing/single_vehicle_world_graph.cpp   |    76 +-
 libs/routing/single_vehicle_world_graph.hpp   |    36 +-
 libs/routing/speed_camera.hpp                 |     4 +-
 libs/routing/speed_camera_manager.cpp         |    44 +-
 libs/routing/speed_camera_manager.hpp         |    15 +-
 libs/routing/speed_camera_prohibition.cpp     |    14 +-
 libs/routing/speed_camera_prohibition.hpp     |     2 +-
 libs/routing/speed_camera_ser_des.cpp         |     3 +-
 libs/routing/speed_camera_ser_des.hpp         |    29 +-
 libs/routing/traffic_stash.cpp                |     6 +-
 libs/routing/traffic_stash.hpp                |     4 +-
 libs/routing/transit_graph.cpp                |   209 +-
 libs/routing/transit_graph.hpp                |    33 +-
 libs/routing/transit_graph_loader.cpp         |     9 +-
 libs/routing/transit_graph_loader.hpp         |     3 +-
 libs/routing/transit_info.hpp                 |    22 +-
 libs/routing/transit_world_graph.cpp          |    53 +-
 libs/routing/transit_world_graph.hpp          |    28 +-
 libs/routing/turn_candidate.hpp               |    16 +-
 libs/routing/turns.cpp                        |   179 +-
 libs/routing/turns.hpp                        |    67 +-
 libs/routing/turns_generator.cpp              |    69 +-
 libs/routing/turns_generator.hpp              |    28 +-
 libs/routing/turns_generator_utils.cpp        |    87 +-
 libs/routing/turns_generator_utils.hpp        |    13 +-
 libs/routing/turns_notification_manager.cpp   |    57 +-
 libs/routing/turns_notification_manager.hpp   |     7 +-
 libs/routing/turns_sound_settings.cpp         |    68 +-
 libs/routing/turns_sound_settings.hpp         |    35 +-
 libs/routing/turns_tts_text.cpp               |    81 +-
 libs/routing/turns_tts_text.hpp               |     1 -
 libs/routing/turns_tts_text_i18n.cpp          |     3 +-
 libs/routing/vehicle_mask.cpp                 |     5 +-
 libs/routing/world_graph.cpp                  |    14 +-
 libs/routing/world_graph.hpp                  |    26 +-
 libs/routing_common/bicycle_model.cpp         |    52 +-
 libs/routing_common/car_model.cpp             |    70 +-
 libs/routing_common/car_model_coefs.hpp       |    12 +-
 libs/routing_common/maxspeed_conversion.cpp   |    27 +-
 libs/routing_common/maxspeed_conversion.hpp   |    16 +-
 libs/routing_common/num_mwm_id.hpp            |    12 +-
 libs/routing_common/pedestrian_model.cpp      |    55 +-
 libs/routing_common/pedestrian_model.hpp      |     3 +-
 .../bicycle_model_test.cpp                    |     7 +-
 .../vehicle_model_for_country_test.cpp        |    18 +-
 .../vehicle_model_test.cpp                    |   149 +-
 libs/routing_common/vehicle_model.cpp         |    20 +-
 libs/routing_common/vehicle_model.hpp         |    86 +-
 libs/search/algos.hpp                         |   106 +-
 libs/search/approximate_string_match.hpp      |     9 +-
 libs/search/base/mem_search_index.hpp         |    17 +-
 libs/search/base/text_index/mem.hpp           |     6 +-
 libs/search/base/text_index/merger.cpp        |    13 +-
 libs/search/base/text_index/merger.hpp        |     3 +-
 libs/search/base/text_index/postings.hpp      |     6 +-
 libs/search/base/text_index/reader.hpp        |     4 +-
 libs/search/base/text_index/text_index.cpp    |     5 +-
 libs/search/bookmarks/data.hpp                |    13 +-
 libs/search/bookmarks/processor.cpp           |    46 +-
 libs/search/bookmarks/processor.hpp           |     6 +-
 libs/search/categories_cache.cpp              |    29 +-
 libs/search/categories_cache.hpp              |     3 +-
 libs/search/cbv.cpp                           |     5 +-
 libs/search/cities_boundaries_table.cpp       |     3 +-
 libs/search/cities_boundaries_table.hpp       |    12 +-
 libs/search/city_finder.cpp                   |     8 +-
 libs/search/cuisine_filter.cpp                |    32 +-
 libs/search/cuisine_filter.hpp                |     6 +-
 libs/search/displayed_categories.cpp          |    34 +-
 libs/search/displayed_categories.hpp          |     2 +-
 libs/search/doc_vec.cpp                       |    36 +-
 libs/search/doc_vec.hpp                       |    12 +-
 libs/search/downloader_search_callback.cpp    |    22 +-
 libs/search/downloader_search_callback.hpp    |     3 +-
 libs/search/dummy_rank_table.cpp              |     5 +-
 libs/search/editor_delegate.cpp               |     3 +-
 libs/search/editor_delegate.hpp               |     6 +-
 libs/search/emitter.hpp                       |     4 +-
 libs/search/engine.cpp                        |    79 +-
 libs/search/engine.hpp                        |    14 +-
 libs/search/feature_offset_match.hpp          |    48 +-
 libs/search/features_filter.cpp               |    15 +-
 libs/search/features_layer.cpp                |    15 +-
 libs/search/features_layer.hpp                |     2 +-
 libs/search/features_layer_matcher.cpp        |    20 +-
 libs/search/features_layer_matcher.hpp        |   122 +-
 libs/search/features_layer_path_finder.cpp    |    26 +-
 libs/search/features_layer_path_finder.hpp    |    13 +-
 libs/search/filtering_params.hpp              |     2 +-
 libs/search/geocoder.cpp                      |   289 +-
 libs/search/geocoder.hpp                      |    31 +-
 libs/search/geocoder_context.cpp              |     7 -
 libs/search/geocoder_locality.hpp             |    13 +-
 libs/search/geometry_cache.cpp                |    37 +-
 libs/search/geometry_cache.hpp                |     3 +-
 libs/search/highlighting.cpp                  |    20 +-
 libs/search/highlighting.hpp                  |     3 +-
 libs/search/house_detector.cpp                |   116 +-
 libs/search/house_detector.hpp                |    16 +-
 libs/search/house_numbers_matcher.cpp         |   152 +-
 libs/search/house_numbers_matcher.hpp         |     8 +-
 libs/search/house_to_street_table.cpp         |     7 +-
 libs/search/idf_map.cpp                       |     3 +-
 libs/search/intermediate_result.cpp           |    69 +-
 libs/search/intermediate_result.hpp           |    14 +-
 libs/search/intersection_result.cpp           |     4 +-
 libs/search/intersection_result.hpp           |    10 +-
 libs/search/interval_set.hpp                  |     3 +-
 libs/search/keyword_lang_matcher.cpp          |    21 +-
 libs/search/keyword_lang_matcher.hpp          |     7 +-
 libs/search/keyword_matcher.cpp               |    16 +-
 libs/search/latlon_match.cpp                  |    42 +-
 libs/search/lazy_centers_table.cpp            |    13 +-
 libs/search/locality_finder.cpp               |    56 +-
 libs/search/locality_finder.hpp               |    11 +-
 libs/search/locality_scorer.cpp               |    59 +-
 libs/search/locality_scorer.hpp               |     4 +-
 libs/search/model.cpp                         |    51 +-
 libs/search/model.hpp                         |     5 +-
 libs/search/mwm_context.cpp                   |    10 +-
 libs/search/mwm_context.hpp                   |    36 +-
 libs/search/nested_rects_cache.cpp            |    12 +-
 libs/search/point_rect_matcher.hpp            |    14 +-
 libs/search/postcode_points.cpp               |    35 +-
 libs/search/postcode_points.hpp               |     3 +-
 libs/search/pre_ranker.cpp                    |    39 +-
 libs/search/pre_ranker.hpp                    |     9 +-
 libs/search/pre_ranking_info.cpp              |    13 +-
 libs/search/pre_ranking_info.hpp              |     5 +-
 libs/search/processor.cpp                     |   104 +-
 libs/search/processor.hpp                     |    10 +-
 libs/search/projection_on_street.cpp          |    14 +-
 libs/search/pysearch/bindings.cpp             |     9 +-
 libs/search/query_params.cpp                  |    45 +-
 libs/search/query_params.hpp                  |     1 -
 libs/search/query_saver.cpp                   |    23 +-
 libs/search/ranker.cpp                        |   149 +-
 libs/search/ranker.hpp                        |    11 +-
 libs/search/ranking_info.cpp                  |   177 +-
 libs/search/ranking_info.hpp                  |     5 +-
 libs/search/ranking_utils.cpp                 |    34 +-
 libs/search/ranking_utils.hpp                 |    61 +-
 libs/search/region_address_getter.cpp         |    13 +-
 libs/search/region_info_getter.cpp            |    13 +-
 libs/search/result.cpp                        |    13 +-
 libs/search/result.hpp                        |    17 +-
 libs/search/retrieval.cpp                     |    49 +-
 libs/search/retrieval.hpp                     |    26 +-
 libs/search/reverse_geocoder.cpp              |    95 +-
 libs/search/reverse_geocoder.hpp              |    55 +-
 libs/search/search_index_values.hpp           |    15 +-
 .../downloader_search_test.cpp                |    22 +-
 .../generate_tests.cpp                        |     6 +-
 .../postcode_points_tests.cpp                 |   106 +-
 .../pre_ranker_test.cpp                       |    18 +-
 .../processor_test.cpp                        |   353 +-
 .../search_integration_tests/ranker_test.cpp  |    35 +-
 .../search_edited_features_test.cpp           |    22 +-
 .../search_integration_tests/smoke_test.cpp   |    39 +-
 .../search_integration_tests/tracer_tests.cpp |    21 +-
 .../search_integration_tests/utils_test.cpp   |     9 +-
 .../assessment_tool/context.cpp               |    35 +-
 .../assessment_tool/context.hpp               |    20 +-
 .../search_quality/assessment_tool/edits.cpp  |    41 +-
 .../search_quality/assessment_tool/edits.hpp  |    19 +-
 .../assessment_tool/feature_info_dialog.cpp   |     3 +-
 .../assessment_tool/feature_info_dialog.hpp   |     6 +-
 .../assessment_tool/main_model.cpp            |    67 +-
 .../assessment_tool/main_view.cpp             |   110 +-
 .../assessment_tool/main_view.hpp             |    14 +-
 .../assessment_tool/result_view.cpp           |    15 +-
 .../assessment_tool/result_view.hpp           |     6 +-
 .../assessment_tool/results_view.cpp          |    21 +-
 .../assessment_tool/sample_view.cpp           |    32 +-
 .../assessment_tool/sample_view.hpp           |     3 +-
 .../assessment_tool/samples_view.cpp          |     7 +-
 .../assessment_tool/search_request_runner.cpp |    28 +-
 .../assessment_tool/search_request_runner.hpp |     3 +-
 .../search_quality/assessment_tool/view.hpp   |    11 +-
 .../features_collector_tool.cpp               |    12 +-
 libs/search/search_quality/helpers.cpp        |    21 +-
 libs/search/search_quality/helpers.hpp        |     5 +-
 libs/search/search_quality/helpers_json.hpp   |     3 +-
 libs/search/search_quality/matcher.cpp        |    14 +-
 libs/search/search_quality/matcher.hpp        |     7 +-
 libs/search/search_quality/sample.cpp         |    10 +-
 libs/search/search_quality/sample.hpp         |     6 +-
 .../samples_generation_tool.cpp               |    73 +-
 .../search_quality_tests/benchmark_tests.cpp  |     4 +-
 .../search_quality_tests/real_mwm_tests.cpp   |    97 +-
 .../search_quality_tests/sample_test.cpp      |     5 +-
 .../search_quality_tool.cpp                   |    61 +-
 libs/search/search_tests/algos_tests.cpp      |    10 +-
 .../bookmarks_processor_tests.cpp             |    27 +-
 .../feature_offset_match_tests.cpp            |     4 +-
 .../search_tests/highlighting_tests.cpp       |     6 +-
 .../search_tests/house_detector_tests.cpp     |    34 +-
 .../house_numbers_matcher_test.cpp            |     5 +-
 .../search/search_tests/interval_set_test.cpp |     3 +-
 .../keyword_lang_matcher_test.cpp             |     2 +-
 .../search_tests/keyword_matcher_test.cpp     |   175 +-
 .../search/search_tests/latlon_match_test.cpp |     6 +-
 .../search_tests/locality_finder_test.cpp     |    44 +-
 .../search_tests/locality_scorer_test.cpp     |    35 +-
 .../search_tests/locality_selector_test.cpp   |    10 +-
 .../search_tests/mem_search_index_tests.cpp   |     6 +-
 .../search_tests/point_rect_matcher_tests.cpp |    41 +-
 .../search/search_tests/query_saver_tests.cpp |     2 +-
 libs/search/search_tests/ranking_tests.cpp    |    19 +-
 libs/search/search_tests/results_tests.cpp    |     4 +-
 .../search_tests/segment_tree_tests.cpp       |    10 +-
 .../search/search_tests/string_match_test.cpp |    32 +-
 libs/search/search_tests/suggest_tests.cpp    |     7 +-
 libs/search/search_tests/text_index_tests.cpp |     9 +-
 .../utm_mgrs_coords_match_test.cpp            |     2 +-
 libs/search/search_tests_support/helpers.cpp  |    18 +-
 libs/search/search_tests_support/helpers.hpp  |    24 +-
 .../test_results_matching.cpp                 |    37 +-
 .../test_results_matching.hpp                 |    14 +-
 .../test_search_engine.cpp                    |     8 +-
 .../test_search_request.cpp                   |    12 +-
 .../test_search_request.hpp                   |     9 +-
 .../test_with_custom_mwms.hpp                 |     5 +-
 libs/search/search_trie.hpp                   |     4 +-
 libs/search/segment_tree.cpp                  |     3 +-
 libs/search/segment_tree.hpp                  |     5 +-
 libs/search/stats_cache.hpp                   |    13 +-
 libs/search/street_vicinity_loader.cpp        |    30 +-
 libs/search/street_vicinity_loader.hpp        |     2 +-
 libs/search/streets_matcher.cpp               |    38 +-
 libs/search/streets_matcher.hpp               |     8 +-
 libs/search/string_utils.cpp                  |     2 +-
 libs/search/string_utils.hpp                  |     2 +-
 libs/search/suggest.hpp                       |     7 +-
 libs/search/token_range.hpp                   |     8 +-
 libs/search/token_slice.cpp                   |    14 +-
 libs/search/token_slice.hpp                   |     5 +-
 libs/search/tracer.cpp                        |    16 +-
 libs/search/tracer.hpp                        |    10 +-
 libs/search/types_skipper.cpp                 |    15 +-
 libs/search/types_skipper.hpp                 |     1 -
 libs/search/utils.cpp                         |    16 +-
 libs/search/utils.hpp                         |    18 +-
 libs/search/utm_mgrs_coords_match.cpp         |    13 +-
 libs/shaders/gl_program_info.hpp              |     6 +-
 libs/shaders/gl_program_params.cpp            |    61 +-
 libs/shaders/gl_program_params.hpp            |    44 +-
 libs/shaders/gl_program_pool.cpp              |    15 +-
 libs/shaders/gl_program_pool.hpp              |     5 +-
 libs/shaders/metal_program_pool.hpp           |    14 +-
 libs/shaders/program_manager.cpp              |     4 +-
 libs/shaders/program_manager.hpp              |     7 +-
 libs/shaders/program_params.hpp               |   167 +-
 libs/shaders/programs.hpp                     |     3 +-
 .../shaders_tests/gl_program_params_tests.cpp |     9 +-
 .../gl_shaders_desktop_compile_tests.cpp      |     2 -
 .../gl_shaders_mobile_compile_test.cpp        |   487 +-
 libs/shaders/vulkan_program_params.cpp        |    66 +-
 libs/shaders/vulkan_program_params.hpp        |    10 +-
 libs/shaders/vulkan_program_pool.cpp          |    50 +-
 libs/std/target_os.hpp                        |    66 +-
 libs/std/windows.hpp                          |     6 +-
 .../downloader_queue.hpp                      |    34 +-
 libs/storage/country.hpp                      |     6 +-
 libs/storage/country_decl.cpp                 |     2 +-
 libs/storage/country_decl.hpp                 |    11 +-
 libs/storage/country_info_getter.cpp          |    73 +-
 libs/storage/country_info_reader_light.cpp    |     5 +-
 libs/storage/country_parent_getter.cpp        |     3 +-
 libs/storage/country_parent_getter.hpp        |     3 +-
 libs/storage/country_tree.cpp                 |    78 +-
 libs/storage/country_tree.hpp                 |    15 +-
 libs/storage/country_tree_helpers.cpp         |     8 +-
 libs/storage/diff_scheme/apply_diff.cpp       |    38 +-
 libs/storage/diff_scheme/apply_diff.hpp       |     3 +-
 .../diff_scheme/diff_scheme_loader.cpp        |     9 +-
 .../storage/diff_scheme/diffs_data_source.cpp |     4 +-
 libs/storage/downloader.hpp                   |     2 +-
 libs/storage/downloader_queue_interface.hpp   |     2 +-
 libs/storage/downloader_queue_universal.cpp   |     6 +-
 libs/storage/downloader_search_params.hpp     |     6 +-
 libs/storage/downloading_policy.cpp           |     8 +-
 libs/storage/downloading_policy.hpp           |     8 +-
 libs/storage/http_map_files_downloader.cpp    |     9 +-
 libs/storage/http_map_files_downloader.hpp    |     3 +-
 libs/storage/map_files_downloader.cpp         |    39 +-
 libs/storage/map_files_downloader.hpp         |     4 +-
 .../map_files_downloader_with_ping.cpp        |     2 +-
 libs/storage/pinger.cpp                       |    20 +-
 libs/storage/queued_country.cpp               |     5 +-
 libs/storage/queued_country.hpp               |     6 +-
 libs/storage/routing_helpers.cpp              |    14 +-
 libs/storage/routing_helpers.hpp              |     6 +-
 libs/storage/storage.cpp                      |   324 +-
 libs/storage/storage.hpp                      |    74 +-
 libs/storage/storage_defines.cpp              |   107 +-
 libs/storage/storage_defines.hpp              |    18 +-
 libs/storage/storage_helpers.cpp              |    22 +-
 libs/storage/storage_helpers.hpp              |     3 +-
 .../download_calc_size_test.cpp               |    14 +-
 .../lightweight_matching_tests.cpp            |     8 +-
 .../storage_3levels_tests.cpp                 |    13 +-
 .../storage_downloading_tests.cpp             |    46 +-
 .../storage_group_download_tests.cpp          |    37 +-
 .../storage_http_tests.cpp                    |    45 +-
 .../storage_update_tests.cpp                  |    11 +-
 .../storage/storage_tests/countries_tests.cpp |     2 +-
 .../country_info_getter_tests.cpp             |    62 +-
 .../storage_tests/downloader_tests.cpp        |     6 +-
 .../fake_map_files_downloader.cpp             |     8 +-
 .../fake_map_files_downloader.hpp             |     3 +-
 libs/storage/storage_tests/helpers.hpp        |     2 +-
 libs/storage/storage_tests/storage_tests.cpp  |   210 +-
 libs/storage/storage_tests/task_runner.cpp    |     5 +-
 libs/testing/benchmark.hpp                    |    10 +-
 libs/testing/testing.hpp                      |   339 +-
 libs/testing/testingmain.cpp                  |    56 +-
 libs/testing/testregister.hpp                 |     5 +-
 libs/tracking/archival_file.cpp               |    18 +-
 libs/tracking/archival_manager.cpp            |    22 +-
 libs/tracking/archival_reporter.cpp           |     3 +-
 libs/tracking/archive.cpp                     |    26 +-
 libs/tracking/archive.hpp                     |    36 +-
 libs/tracking/connection.cpp                  |    11 +-
 libs/tracking/connection.hpp                  |     8 +-
 libs/tracking/protocol.cpp                    |    19 +-
 libs/tracking/pytracking/bindings.cpp         |    14 +-
 libs/tracking/reporter.cpp                    |    26 +-
 libs/tracking/reporter.hpp                    |     2 +-
 .../tracking_fuzz_tests.cpp                   |     4 +-
 .../archival_reporter_tests.cpp               |     3 +-
 .../tracking/tracking_tests/protocol_test.cpp |     3 +-
 .../tracking/tracking_tests/reporter_test.cpp |    14 +-
 libs/traffic/pytraffic/bindings.cpp           |    21 +-
 libs/traffic/speed_groups.cpp                 |     2 -
 libs/traffic/traffic_cache.hpp                |     2 +-
 libs/traffic/traffic_info.cpp                 |    53 +-
 libs/traffic/traffic_info.hpp                 |     8 +-
 .../traffic_tests/traffic_info_test.cpp       |    16 +-
 libs/transit/experimental/transit_data.cpp    |    52 +-
 .../transit_types_experimental.cpp            |   418 +-
 .../transit_types_experimental.hpp            |    55 +-
 libs/transit/transit_display_info.hpp         |     6 +-
 libs/transit/transit_entities.hpp             |    66 +-
 .../parse_transit_from_json_tests.cpp         |    54 +-
 .../transit_serdes_tests.cpp                  |   116 +-
 libs/transit/transit_graph_data.cpp           |    77 +-
 libs/transit/transit_graph_data.hpp           |    12 +-
 libs/transit/transit_schedule.cpp             |    65 +-
 libs/transit/transit_schedule.hpp             |    33 +-
 libs/transit/transit_serdes.hpp               |    45 +-
 .../transit_tests/transit_graph_test.cpp      |   509 +-
 .../transit_json_parsing_test.cpp             |    69 +-
 .../transit_tests/transit_schedule_tests.cpp  |    92 +-
 libs/transit/transit_tests/transit_test.cpp   |    77 +-
 libs/transit/transit_tests/transit_tools.hpp  |    40 +-
 libs/transit/transit_types.cpp                |   133 +-
 libs/transit/transit_types.hpp                |    99 +-
 libs/transit/transit_version.cpp              |     3 +-
 libs/transit/transit_version.hpp              |     3 +-
 libs/transit/world_feed/color_picker.cpp      |     7 +-
 libs/transit/world_feed/date_time_helpers.cpp |    41 +-
 libs/transit/world_feed/date_time_helpers.hpp |     6 +-
 libs/transit/world_feed/feed_helpers.cpp      |   110 +-
 libs/transit/world_feed/feed_helpers.hpp      |    22 +-
 .../gtfs_converter/gtfs_converter.cpp         |    30 +-
 libs/transit/world_feed/subway_converter.cpp  |   144 +-
 libs/transit/world_feed/subway_converter.hpp  |    12 +-
 libs/transit/world_feed/world_feed.cpp        |   275 +-
 libs/transit/world_feed/world_feed.hpp        |    17 +-
 .../subway_converter_tests.cpp                |    16 +-
 .../world_feed_tests/world_feed_tests.cpp     |   129 +-
 qt/about.cpp                                  |     6 +-
 qt/about.hpp                                  |     1 +
 qt/bookmark_dialog.cpp                        |    14 +-
 qt/build_style/build_common.cpp               |    21 +-
 qt/build_style/build_drules.cpp               |    17 +-
 qt/build_style/build_phone_pack.cpp           |     9 +-
 qt/build_style/build_skins.cpp                |    74 +-
 qt/build_style/build_statistics.cpp           |    12 +-
 qt/build_style/build_style.cpp                |    20 +-
 qt/build_style/run_tests.cpp                  |     8 +-
 qt/create_feature_dialog.cpp                  |     3 +-
 qt/create_feature_dialog.hpp                  |     1 +
 qt/draw_widget.cpp                            |   170 +-
 qt/draw_widget.hpp                            |     6 +-
 qt/editor_dialog.cpp                          |    55 +-
 qt/editor_dialog.hpp                          |     1 +
 qt/info_dialog.cpp                            |    94 +-
 qt/info_dialog.hpp                            |    28 +-
 qt/main.cpp                                   |    80 +-
 qt/mainwindow.cpp                             |   154 +-
 qt/mainwindow.hpp                             |    31 +-
 qt/mwms_borders_selection.cpp                 |     8 +-
 qt/osm_auth_dialog.cpp                        |     2 +-
 qt/osm_auth_dialog.hpp                        |     3 +-
 qt/place_page_dialog_common.cpp               |    28 +-
 qt/place_page_dialog_common.hpp               |     5 +-
 qt/place_page_dialog_developer.cpp            |     9 +-
 qt/place_page_dialog_developer.hpp            |     1 +
 qt/place_page_dialog_user.cpp                 |    47 +-
 qt/place_page_dialog_user.hpp                 |     1 +
 qt/popup_menu_holder.cpp                      |     7 +-
 qt/popup_menu_holder.hpp                      |    24 +-
 qt/preferences_dialog.cpp                     |   339 +-
 qt/preferences_dialog.hpp                     |    16 +-
 qt/qt_common/helpers.cpp                      |    27 +-
 qt/qt_common/helpers.hpp                      |     2 +-
 qt/qt_common/map_widget.cpp                   |   115 +-
 qt/qt_common/map_widget.hpp                   |     6 +-
 qt/qt_common/proxy_style.cpp                  |    83 +-
 qt/qt_common/proxy_style.hpp                  |    32 +-
 qt/qt_common/qtoglcontext.cpp                 |    19 +-
 qt/qt_common/qtoglcontext.hpp                 |     2 +-
 qt/qt_common/scale_slider.cpp                 |    10 +-
 qt/qt_common/spinner.cpp                      |     3 +-
 qt/qt_common/text_dialog.cpp                  |    11 +-
 qt/qt_common/text_dialog.hpp                  |     1 +
 qt/routing_settings_dialog.cpp                |     6 +-
 qt/routing_turns_visualizer.cpp               |     7 +-
 qt/ruler.cpp                                  |    18 +-
 qt/screenshoter.cpp                           |    55 +-
 qt/screenshoter.hpp                           |     3 +-
 qt/search_panel.cpp                           |    71 +-
 qt/selection.hpp                              |     2 +-
 qt/update_dialog.cpp                          |   848 +-
 qt/update_dialog.hpp                          |    91 +-
 tools/feature_list/feature_list.cpp           |   124 +-
 tools/openlr/cache_line_size.hpp              |     2 +-
 tools/openlr/candidate_paths_getter.cpp       |    53 +-
 tools/openlr/candidate_paths_getter.hpp       |    31 +-
 tools/openlr/candidate_points_getter.cpp      |    26 +-
 tools/openlr/candidate_points_getter.hpp      |     3 +-
 tools/openlr/decoded_path.cpp                 |    23 +-
 tools/openlr/decoded_path.hpp                 |    10 +-
 tools/openlr/graph.cpp                        |    18 +-
 tools/openlr/graph.hpp                        |     1 +
 tools/openlr/helpers.cpp                      |    56 +-
 tools/openlr/helpers.hpp                      |    18 +-
 tools/openlr/openlr_decoder.cpp               |   109 +-
 tools/openlr/openlr_decoder.hpp               |     9 +-
 .../openlr_assessment_tool/mainwindow.cpp     |   141 +-
 .../openlr_assessment_tool/mainwindow.hpp     |     4 +-
 .../openlr_assessment_tool/map_widget.cpp     |     5 +-
 .../openlr_assessment_tool/map_widget.hpp     |     5 +-
 .../points_controller_delegate_base.hpp       |     6 +-
 .../segment_correspondence.cpp                |     8 +-
 .../segment_correspondence.hpp                |     9 +-
 .../openlr_assessment_tool/traffic_mode.cpp   |    82 +-
 .../openlr_assessment_tool/traffic_mode.hpp   |    24 +-
 .../openlr_assessment_tool/traffic_panel.cpp  |    18 +-
 .../openlr_assessment_tool/traffic_panel.hpp  |     3 +-
 .../trafficmodeinitdlg.cpp                    |    12 +-
 tools/openlr/openlr_model_xml.cpp             |    38 +-
 tools/openlr/openlr_stat/openlr_stat.cpp      |    35 +-
 .../openlr/openlr_tests/decoded_path_test.cpp |    42 +-
 tools/openlr/paths_connector.cpp              |    40 +-
 tools/openlr/paths_connector.hpp              |    12 +-
 tools/openlr/road_info_getter.cpp             |    10 +-
 tools/openlr/road_info_getter.hpp             |     3 +-
 tools/openlr/router.cpp                       |   181 +-
 tools/openlr/router.hpp                       |    35 +-
 tools/openlr/score_candidate_paths_getter.cpp |    82 +-
 tools/openlr/score_candidate_paths_getter.hpp |    47 +-
 .../openlr/score_candidate_points_getter.cpp  |    29 +-
 .../openlr/score_candidate_points_getter.hpp  |     6 +-
 tools/openlr/score_paths_connector.cpp        |    88 +-
 tools/openlr/score_paths_connector.hpp        |    11 +-
 tools/openlr/score_types.hpp                  |    10 +-
 tools/openlr/stats.hpp                        |     2 +-
 tools/openlr/way_point.hpp                    |     3 +-
 tools/poly_borders/borders_data.cpp           |    42 +-
 tools/poly_borders/borders_data.hpp           |    11 +-
 tools/poly_borders/help_structures.cpp        |     5 +-
 tools/poly_borders/help_structures.hpp        |    22 +-
 .../poly_borders_tests/mark_points_tests.cpp  |    91 +-
 .../remove_empty_spaces_tests.cpp             |    51 +-
 .../poly_borders/poly_borders_tests/tools.cpp |     8 +-
 .../poly_borders/poly_borders_tests/tools.hpp |     7 +-
 .../poly_borders_tool/poly_borders_tool.cpp   |    17 +-
 tools/skin_generator/generator.cpp            |    35 +-
 tools/skin_generator/generator.hpp            |    13 +-
 tools/skin_generator/main.cpp                 |    11 +-
 tools/topography_generator/filters_impl.hpp   |    36 +-
 tools/topography_generator/generator.cpp      |   146 +-
 tools/topography_generator/generator.hpp      |    30 +-
 .../topography_generator/isolines_profile.hpp |    22 +-
 tools/topography_generator/main.cpp           |    95 +-
 .../marching_squares/contours_builder.cpp     |     6 -
 .../marching_squares/contours_builder.hpp     |     8 +-
 .../marching_squares/marching_squares.hpp     |    24 +-
 .../marching_squares/square.hpp               |    81 +-
 tools/topography_generator/tile_filter.hpp    |    21 +-
 tools/topography_generator/utils/contours.hpp |    11 +-
 .../utils/contours_serdes.hpp                 |    15 +-
 tools/track_analyzing/log_parser.cpp          |    31 +-
 tools/track_analyzing/log_parser.hpp          |     4 +-
 tools/track_analyzing/serialization.hpp       |    13 +-
 tools/track_analyzing/temporary_file.cpp      |     3 +-
 tools/track_analyzing/temporary_file.hpp      |     5 +-
 tools/track_analyzing/track.cpp               |     9 +-
 tools/track_analyzing/track.hpp               |     9 +-
 .../track_analyzer/cmd_balance_csv.cpp        |    53 +-
 .../track_analyzer/cmd_balance_csv.hpp        |    22 +-
 .../track_analyzer/cmd_cpp_track.cpp          |    11 +-
 .../track_analyzer/cmd_gpx.cpp                |     5 +-
 .../track_analyzer/cmd_match.cpp              |    25 +-
 .../track_analyzer/cmd_table.cpp              |    98 +-
 .../track_analyzer/cmd_track.cpp              |    23 +-
 .../track_analyzer/cmd_tracks.cpp             |    48 +-
 .../track_analyzer/crossroad_checker.cpp      |    28 +-
 .../track_analyzer/crossroad_checker.hpp      |     3 +-
 .../track_analyzer/track_analyzer.cpp         |    56 +-
 .../track_analyzing/track_analyzer/utils.cpp  |    40 +-
 .../track_analyzing/track_analyzer/utils.hpp  |    13 +-
 .../track_analyzing_tests/balance_tests.cpp   |    43 +-
 .../statistics_tests.cpp                      |    40 +-
 .../track_archive_reader_tests.cpp            |    24 +-
 .../track_analyzing/track_archive_reader.cpp  |    26 +-
 tools/track_analyzing/track_matcher.cpp       |    62 +-
 tools/track_analyzing/track_matcher.hpp       |    16 +-
 tools/track_analyzing/utils.cpp               |    28 +-
 tools/track_analyzing/utils.hpp               |    15 +-
 .../track_generator/track_generator_tool.cpp  |    20 +-
 2169 files changed, 56441 insertions(+), 64188 deletions(-)
 mode change 100755 => 100644 libs/drape/vulkan/vulkan_layers.cpp
 mode change 100755 => 100644 libs/drape/vulkan/vulkan_layers.hpp
 mode change 100755 => 100644 libs/drape_frontend/frontend_renderer.cpp
 mode change 100755 => 100644 libs/drape_frontend/frontend_renderer.hpp
 mode change 100755 => 100644 libs/drape_frontend/read_manager.cpp
 mode change 100755 => 100644 libs/drape_frontend/read_manager.hpp
 mode change 100755 => 100644 libs/drape_frontend/render_group.cpp
 mode change 100755 => 100644 libs/drape_frontend/render_group.hpp
 mode change 100755 => 100644 libs/drape_frontend/requested_tiles.cpp
 mode change 100755 => 100644 libs/drape_frontend/requested_tiles.hpp
 mode change 100755 => 100644 libs/drape_frontend/tile_key.cpp
 mode change 100755 => 100644 libs/drape_frontend/tile_key.hpp
 mode change 100755 => 100644 libs/drape_frontend/tile_utils.cpp

diff --git a/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java b/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java
index afbb787d5..55038a5ec 100644
--- a/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java
+++ b/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java
@@ -150,14 +150,12 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
 
         switch (item.newStatus)
         {
-          case CountryItem.STATUS_DONE:
-            mAreResourcesDownloaded = true;
-            showMap();
-            return;
+        case CountryItem.STATUS_DONE:
+          mAreResourcesDownloaded = true;
+          showMap();
+          return;
 
-          case CountryItem.STATUS_FAILED:
-            MapManager.showError(DownloadResourcesLegacyActivity.this, item, null);
-            return;
+        case CountryItem.STATUS_FAILED: MapManager.showError(DownloadResourcesLegacyActivity.this, item, null); return;
         }
       }
     }
diff --git a/android/app/src/main/java/app/organicmaps/MapFragment.java b/android/app/src/main/java/app/organicmaps/MapFragment.java
index af1626859..b76d97292 100644
--- a/android/app/src/main/java/app/organicmaps/MapFragment.java
+++ b/android/app/src/main/java/app/organicmaps/MapFragment.java
@@ -163,24 +163,24 @@ public class MapFragment extends BaseMwmFragment implements View.OnTouchListener
     int pointerIndex = event.getActionIndex();
     switch (action)
     {
-      case MotionEvent.ACTION_POINTER_UP -> action = Map.NATIVE_ACTION_UP;
-      case MotionEvent.ACTION_UP ->
-      {
-        action = Map.NATIVE_ACTION_UP;
-        pointerIndex = 0;
-      }
-      case MotionEvent.ACTION_POINTER_DOWN -> action = Map.NATIVE_ACTION_DOWN;
-      case MotionEvent.ACTION_DOWN ->
-      {
-        action = Map.NATIVE_ACTION_DOWN;
-        pointerIndex = 0;
-      }
-      case MotionEvent.ACTION_MOVE ->
-      {
-        action = Map.NATIVE_ACTION_MOVE;
-        pointerIndex = Map.INVALID_POINTER_MASK;
-      }
-      case MotionEvent.ACTION_CANCEL -> action = Map.NATIVE_ACTION_CANCEL;
+    case MotionEvent.ACTION_POINTER_UP -> action = Map.NATIVE_ACTION_UP;
+    case MotionEvent.ACTION_UP ->
+    {
+      action = Map.NATIVE_ACTION_UP;
+      pointerIndex = 0;
+    }
+    case MotionEvent.ACTION_POINTER_DOWN -> action = Map.NATIVE_ACTION_DOWN;
+    case MotionEvent.ACTION_DOWN ->
+    {
+      action = Map.NATIVE_ACTION_DOWN;
+      pointerIndex = 0;
+    }
+    case MotionEvent.ACTION_MOVE ->
+    {
+      action = Map.NATIVE_ACTION_MOVE;
+      pointerIndex = Map.INVALID_POINTER_MASK;
+    }
+    case MotionEvent.ACTION_CANCEL -> action = Map.NATIVE_ACTION_CANCEL;
     }
     Map.onTouch(action, event, pointerIndex);
     return true;
diff --git a/android/app/src/main/java/app/organicmaps/MwmActivity.java b/android/app/src/main/java/app/organicmaps/MwmActivity.java
index 3e48cfd3a..9239c5f50 100644
--- a/android/app/src/main/java/app/organicmaps/MwmActivity.java
+++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java
@@ -683,29 +683,29 @@ public class MwmActivity extends BaseMwmFragmentActivity
     mPointChooser.findViewById(R.id.done).setOnClickListener(v -> {
       switch (ChoosePositionMode.get())
       {
-        case Api:
-          final Intent apiResult = new Intent();
-          final double[] center = Framework.nativeGetScreenRectCenter();
-          apiResult.putExtra(Const.EXTRA_POINT_LAT, center[0]);
-          apiResult.putExtra(Const.EXTRA_POINT_LON, center[1]);
-          apiResult.putExtra(Const.EXTRA_ZOOM_LEVEL, Framework.nativeGetDrawScale());
-          setResult(Activity.RESULT_OK, apiResult);
-          finish();
-          break;
-        case Editor:
-          if (Framework.nativeIsDownloadedMapAtScreenCenter())
-            startActivity(new Intent(MwmActivity.this, FeatureCategoryActivity.class));
-          else
-          {
-            dismissAlertDialog();
-            mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
-                               .setTitle(R.string.message_invalid_feature_position)
-                               .setPositiveButton(R.string.ok, null)
-                               .setOnDismissListener(dialog -> mAlertDialog = null)
-                               .show();
-          }
-          break;
-        case None: throw new IllegalStateException("Unexpected Framework.nativeGetChoosePositionMode()");
+      case Api:
+        final Intent apiResult = new Intent();
+        final double[] center = Framework.nativeGetScreenRectCenter();
+        apiResult.putExtra(Const.EXTRA_POINT_LAT, center[0]);
+        apiResult.putExtra(Const.EXTRA_POINT_LON, center[1]);
+        apiResult.putExtra(Const.EXTRA_ZOOM_LEVEL, Framework.nativeGetDrawScale());
+        setResult(Activity.RESULT_OK, apiResult);
+        finish();
+        break;
+      case Editor:
+        if (Framework.nativeIsDownloadedMapAtScreenCenter())
+          startActivity(new Intent(MwmActivity.this, FeatureCategoryActivity.class));
+        else
+        {
+          dismissAlertDialog();
+          mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
+                             .setTitle(R.string.message_invalid_feature_position)
+                             .setPositiveButton(R.string.ok, null)
+                             .setOnDismissListener(dialog -> mAlertDialog = null)
+                             .show();
+        }
+        break;
+      case None: throw new IllegalStateException("Unexpected Framework.nativeGetChoosePositionMode()");
       }
       closePositionChooser();
     });
@@ -972,24 +972,24 @@ public class MwmActivity extends BaseMwmFragmentActivity
   {
     switch (button)
     {
-      case zoomIn -> Map.zoomIn();
-      case zoomOut -> Map.zoomOut();
-      case myPosition ->
-      {
-        Logger.i(LOCATION_TAG, "The location button pressed");
-        // Calls onMyPositionModeChanged(mode + 1).
-        LocationState.nativeSwitchToNextMode();
-      }
-      case toggleMapLayer -> toggleMapLayerBottomSheet();
-      case bookmarks -> showBookmarks();
-      case search -> showSearch("");
-      case menu ->
-      {
-        closeFloatingPanels();
-        showBottomSheet(MAIN_MENU_ID);
-      }
-      case help -> showHelp();
-      case trackRecordingStatus -> showTrackSaveDialog();
+    case zoomIn -> Map.zoomIn();
+    case zoomOut -> Map.zoomOut();
+    case myPosition ->
+    {
+      Logger.i(LOCATION_TAG, "The location button pressed");
+      // Calls onMyPositionModeChanged(mode + 1).
+      LocationState.nativeSwitchToNextMode();
+    }
+    case toggleMapLayer -> toggleMapLayerBottomSheet();
+    case bookmarks -> showBookmarks();
+    case search -> showSearch("");
+    case menu ->
+    {
+      closeFloatingPanels();
+      showBottomSheet(MAIN_MENU_ID);
+    }
+    case help -> showHelp();
+    case trackRecordingStatus -> showTrackSaveDialog();
     }
   }
 
@@ -2429,18 +2429,18 @@ public class MwmActivity extends BaseMwmFragmentActivity
   {
     switch (keyCode)
     {
-      case KeyEvent.KEYCODE_DPAD_DOWN: Map.zoomOut(); return true;
-      case KeyEvent.KEYCODE_DPAD_UP: Map.zoomIn(); return true;
-      case KeyEvent.KEYCODE_ESCAPE:
-        final Intent currIntent = getIntent();
-        final String backUrl = Framework.nativeGetParsedBackUrl();
-        if (TextUtils.isEmpty(backUrl) || (currIntent != null && Factory.isStartedForApiResult(currIntent)))
-        {
-          finish();
-          return true;
-        }
-        return super.onKeyUp(keyCode, event);
-      default: return super.onKeyUp(keyCode, event);
+    case KeyEvent.KEYCODE_DPAD_DOWN: Map.zoomOut(); return true;
+    case KeyEvent.KEYCODE_DPAD_UP: Map.zoomIn(); return true;
+    case KeyEvent.KEYCODE_ESCAPE:
+      final Intent currIntent = getIntent();
+      final String backUrl = Framework.nativeGetParsedBackUrl();
+      if (TextUtils.isEmpty(backUrl) || (currIntent != null && Factory.isStartedForApiResult(currIntent)))
+      {
+        finish();
+        return true;
+      }
+      return super.onKeyUp(keyCode, event);
+    default: return super.onKeyUp(keyCode, event);
     }
   }
 
diff --git a/android/app/src/main/java/app/organicmaps/backup/LocalBackupManager.java b/android/app/src/main/java/app/organicmaps/backup/LocalBackupManager.java
index f1a8cad85..e31287b54 100644
--- a/android/app/src/main/java/app/organicmaps/backup/LocalBackupManager.java
+++ b/android/app/src/main/java/app/organicmaps/backup/LocalBackupManager.java
@@ -62,39 +62,39 @@ public class LocalBackupManager implements BookmarkManager.BookmarksSharingListe
       ErrorCode errorCode = null;
       switch (result.getCode())
       {
-        case BookmarkSharingResult.SUCCESS ->
-        {
-          if (!saveBackup(result))
-          {
-            Logger.e(TAG, "Failed to save backup. See system log above");
-            errorCode = ErrorCode.FILE_ERROR;
-          }
-          else
-          {
-            Logger.i(TAG, "Backup was created and saved successfully");
-          }
-        }
-        case BookmarkSharingResult.EMPTY_CATEGORY ->
-        {
-          errorCode = ErrorCode.EMPTY_CATEGORY;
-          Logger.e(TAG, "Failed to create backup. Category is empty");
-        }
-        case BookmarkSharingResult.ARCHIVE_ERROR ->
-        {
-          errorCode = ErrorCode.ARCHIVE_ERROR;
-          Logger.e(TAG, "Failed to create archive of bookmarks");
-        }
-        case BookmarkSharingResult.FILE_ERROR ->
+      case BookmarkSharingResult.SUCCESS ->
+      {
+        if (!saveBackup(result))
         {
+          Logger.e(TAG, "Failed to save backup. See system log above");
           errorCode = ErrorCode.FILE_ERROR;
-          Logger.e(TAG, "Failed create file for archive");
         }
-        default ->
+        else
         {
-          errorCode = ErrorCode.UNSUPPORTED;
-          Logger.e(TAG, "Failed to create backup. Unknown error");
+          Logger.i(TAG, "Backup was created and saved successfully");
         }
       }
+      case BookmarkSharingResult.EMPTY_CATEGORY ->
+      {
+        errorCode = ErrorCode.EMPTY_CATEGORY;
+        Logger.e(TAG, "Failed to create backup. Category is empty");
+      }
+      case BookmarkSharingResult.ARCHIVE_ERROR ->
+      {
+        errorCode = ErrorCode.ARCHIVE_ERROR;
+        Logger.e(TAG, "Failed to create archive of bookmarks");
+      }
+      case BookmarkSharingResult.FILE_ERROR ->
+      {
+        errorCode = ErrorCode.FILE_ERROR;
+        Logger.e(TAG, "Failed create file for archive");
+      }
+      default ->
+      {
+        errorCode = ErrorCode.UNSUPPORTED;
+        Logger.e(TAG, "Failed to create backup. Unknown error");
+      }
+      }
 
       ErrorCode finalErrorCode = errorCode;
       UiThread.run(() -> {
diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesAdapter.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesAdapter.java
index cd9fa68db..559277dde 100644
--- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesAdapter.java
@@ -66,47 +66,47 @@ public class BookmarkCategoriesAdapter extends BaseBookmarkCategoryAdapter<Recyc
     LayoutInflater inflater = LayoutInflater.from(parent.getContext());
     switch (viewType)
     {
-      case TYPE_ACTION_HEADER ->
-      {
-        View header = inflater.inflate(R.layout.item_bookmark_group_list_header, parent, false);
-        return new HeaderViewHolder(header);
-      }
-      case TYPE_CATEGORY_ITEM ->
-      {
-        View view = inflater.inflate(R.layout.item_bookmark_category, parent, false);
-        final CategoryViewHolder holder = new CategoryViewHolder(view);
-        view.setOnClickListener(new CategoryItemClickListener(holder));
-        view.setOnLongClickListener(new LongClickListener(holder));
-        return holder;
-      }
-      case TYPE_ACTION_ADD ->
-      {
-        View item = inflater.inflate(R.layout.item_bookmark_button, parent, false);
-        item.setOnClickListener(v -> {
-          if (mCategoryListCallback != null)
-            mCategoryListCallback.onAddButtonClick();
-        });
-        return new Holders.GeneralViewHolder(item);
-      }
-      case TYPE_ACTION_IMPORT ->
-      {
-        View item = inflater.inflate(R.layout.item_bookmark_button, parent, false);
-        item.setOnClickListener(v -> {
-          if (mCategoryListCallback != null)
-            mCategoryListCallback.onImportButtonClick();
-        });
-        return new Holders.GeneralViewHolder(item);
-      }
-      case TYPE_ACTION_EXPORT_ALL_AS_KMZ ->
-      {
-        View item = inflater.inflate(R.layout.item_bookmark_button, parent, false);
-        item.setOnClickListener(v -> {
-          if (mCategoryListCallback != null)
-            mCategoryListCallback.onExportButtonClick();
-        });
-        return new Holders.GeneralViewHolder(item);
-      }
-      default -> throw new AssertionError("Invalid item type: " + viewType);
+    case TYPE_ACTION_HEADER ->
+    {
+      View header = inflater.inflate(R.layout.item_bookmark_group_list_header, parent, false);
+      return new HeaderViewHolder(header);
+    }
+    case TYPE_CATEGORY_ITEM ->
+    {
+      View view = inflater.inflate(R.layout.item_bookmark_category, parent, false);
+      final CategoryViewHolder holder = new CategoryViewHolder(view);
+      view.setOnClickListener(new CategoryItemClickListener(holder));
+      view.setOnLongClickListener(new LongClickListener(holder));
+      return holder;
+    }
+    case TYPE_ACTION_ADD ->
+    {
+      View item = inflater.inflate(R.layout.item_bookmark_button, parent, false);
+      item.setOnClickListener(v -> {
+        if (mCategoryListCallback != null)
+          mCategoryListCallback.onAddButtonClick();
+      });
+      return new Holders.GeneralViewHolder(item);
+    }
+    case TYPE_ACTION_IMPORT ->
+    {
+      View item = inflater.inflate(R.layout.item_bookmark_button, parent, false);
+      item.setOnClickListener(v -> {
+        if (mCategoryListCallback != null)
+          mCategoryListCallback.onImportButtonClick();
+      });
+      return new Holders.GeneralViewHolder(item);
+    }
+    case TYPE_ACTION_EXPORT_ALL_AS_KMZ ->
+    {
+      View item = inflater.inflate(R.layout.item_bookmark_button, parent, false);
+      item.setOnClickListener(v -> {
+        if (mCategoryListCallback != null)
+          mCategoryListCallback.onExportButtonClick();
+      });
+      return new Holders.GeneralViewHolder(item);
+    }
+    default -> throw new AssertionError("Invalid item type: " + viewType);
     }
   }
 
@@ -116,44 +116,44 @@ public class BookmarkCategoriesAdapter extends BaseBookmarkCategoryAdapter<Recyc
     int type = getItemViewType(position);
     switch (type)
     {
-      case TYPE_ACTION_HEADER ->
-      {
-        HeaderViewHolder headerViewHolder = (HeaderViewHolder) holder;
-        headerViewHolder.setAction(mMassOperationAction, BookmarkManager.INSTANCE.areAllCategoriesInvisible());
-        headerViewHolder.getText().setText(R.string.bookmark_lists);
-      }
-      case TYPE_CATEGORY_ITEM ->
-      {
-        final BookmarkCategory category = getCategoryByPosition(toCategoryPosition(position));
-        CategoryViewHolder categoryHolder = (CategoryViewHolder) holder;
-        categoryHolder.setEntity(category);
-        categoryHolder.setName(category.getName());
-        categoryHolder.setSize();
-        categoryHolder.setVisibilityState(category.isVisible());
-        ToggleVisibilityClickListener visibilityListener = new ToggleVisibilityClickListener(categoryHolder);
-        categoryHolder.setVisibilityListener(visibilityListener);
-        CategoryItemMoreClickListener moreClickListener = new CategoryItemMoreClickListener(categoryHolder);
-        categoryHolder.setMoreButtonClickListener(moreClickListener);
-      }
-      case TYPE_ACTION_ADD ->
-      {
-        Holders.GeneralViewHolder generalViewHolder = (Holders.GeneralViewHolder) holder;
-        generalViewHolder.getImage().setImageResource(R.drawable.ic_add_list);
-        generalViewHolder.getText().setText(R.string.bookmarks_create_new_group);
-      }
-      case TYPE_ACTION_IMPORT ->
-      {
-        Holders.GeneralViewHolder generalViewHolder = (Holders.GeneralViewHolder) holder;
-        generalViewHolder.getImage().setImageResource(R.drawable.ic_import);
-        generalViewHolder.getText().setText(R.string.bookmarks_import);
-      }
-      case TYPE_ACTION_EXPORT_ALL_AS_KMZ ->
-      {
-        Holders.GeneralViewHolder generalViewHolder = (Holders.GeneralViewHolder) holder;
-        generalViewHolder.getImage().setImageResource(R.drawable.ic_export);
-        generalViewHolder.getText().setText(R.string.bookmarks_export);
-      }
-      default -> throw new AssertionError("Invalid item type: " + type);
+    case TYPE_ACTION_HEADER ->
+    {
+      HeaderViewHolder headerViewHolder = (HeaderViewHolder) holder;
+      headerViewHolder.setAction(mMassOperationAction, BookmarkManager.INSTANCE.areAllCategoriesInvisible());
+      headerViewHolder.getText().setText(R.string.bookmark_lists);
+    }
+    case TYPE_CATEGORY_ITEM ->
+    {
+      final BookmarkCategory category = getCategoryByPosition(toCategoryPosition(position));
+      CategoryViewHolder categoryHolder = (CategoryViewHolder) holder;
+      categoryHolder.setEntity(category);
+      categoryHolder.setName(category.getName());
+      categoryHolder.setSize();
+      categoryHolder.setVisibilityState(category.isVisible());
+      ToggleVisibilityClickListener visibilityListener = new ToggleVisibilityClickListener(categoryHolder);
+      categoryHolder.setVisibilityListener(visibilityListener);
+      CategoryItemMoreClickListener moreClickListener = new CategoryItemMoreClickListener(categoryHolder);
+      categoryHolder.setMoreButtonClickListener(moreClickListener);
+    }
+    case TYPE_ACTION_ADD ->
+    {
+      Holders.GeneralViewHolder generalViewHolder = (Holders.GeneralViewHolder) holder;
+      generalViewHolder.getImage().setImageResource(R.drawable.ic_add_list);
+      generalViewHolder.getText().setText(R.string.bookmarks_create_new_group);
+    }
+    case TYPE_ACTION_IMPORT ->
+    {
+      Holders.GeneralViewHolder generalViewHolder = (Holders.GeneralViewHolder) holder;
+      generalViewHolder.getImage().setImageResource(R.drawable.ic_import);
+      generalViewHolder.getText().setText(R.string.bookmarks_import);
+    }
+    case TYPE_ACTION_EXPORT_ALL_AS_KMZ ->
+    {
+      Holders.GeneralViewHolder generalViewHolder = (Holders.GeneralViewHolder) holder;
+      generalViewHolder.getImage().setImageResource(R.drawable.ic_export);
+      generalViewHolder.getText().setText(R.string.bookmarks_export);
+    }
+    default -> throw new AssertionError("Invalid item type: " + type);
     }
   }
 
diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListAdapter.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListAdapter.java
index 76a73c529..31b49aad7 100644
--- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListAdapter.java
@@ -442,37 +442,37 @@ public class BookmarkListAdapter extends RecyclerView.Adapter<Holders.BaseBookma
     Holders.BaseBookmarkHolder holder = null;
     switch (viewType)
     {
-      case TYPE_TRACK:
-        Holders.TrackViewHolder trackHolder =
-            new Holders.TrackViewHolder(inflater.inflate(R.layout.item_track, parent, false));
-        trackHolder.setOnClickListener(mClickListener);
-        trackHolder.setOnLongClickListener(mLongClickListener);
-        trackHolder.setTrackIconClickListener(mIconClickListener);
-        trackHolder.setMoreButtonClickListener(mMoreClickListener);
-        holder = trackHolder;
-        break;
-      case TYPE_BOOKMARK:
-        Holders.BookmarkViewHolder bookmarkHolder =
-            new Holders.BookmarkViewHolder(inflater.inflate(R.layout.item_bookmark, parent, false));
-        bookmarkHolder.setOnClickListener(mClickListener);
-        bookmarkHolder.setOnLongClickListener(mLongClickListener);
-        holder = bookmarkHolder;
-        break;
-      case TYPE_SECTION:
-        MaterialTextView tv = (MaterialTextView) inflater.inflate(R.layout.item_category_title, parent, false);
-        holder = new Holders.SectionViewHolder(tv);
-        break;
-      case TYPE_DESC:
-        View desc = inflater.inflate(R.layout.item_category_description, parent, false);
-        MaterialTextView moreBtn = desc.findViewById(R.id.more_btn);
-        MaterialTextView text = desc.findViewById(R.id.text);
-        MaterialTextView title = desc.findViewById(R.id.title);
-        setMoreButtonVisibility(text, moreBtn);
-        holder = new Holders.DescriptionViewHolder(desc, mSectionsDataSource.getCategory());
-        text.setOnClickListener(v -> onMoreButtonClicked(text, moreBtn));
-        moreBtn.setOnClickListener(v -> onMoreButtonClicked(text, moreBtn));
-        title.setOnClickListener(v -> onMoreButtonClicked(text, moreBtn));
-        break;
+    case TYPE_TRACK:
+      Holders.TrackViewHolder trackHolder =
+          new Holders.TrackViewHolder(inflater.inflate(R.layout.item_track, parent, false));
+      trackHolder.setOnClickListener(mClickListener);
+      trackHolder.setOnLongClickListener(mLongClickListener);
+      trackHolder.setTrackIconClickListener(mIconClickListener);
+      trackHolder.setMoreButtonClickListener(mMoreClickListener);
+      holder = trackHolder;
+      break;
+    case TYPE_BOOKMARK:
+      Holders.BookmarkViewHolder bookmarkHolder =
+          new Holders.BookmarkViewHolder(inflater.inflate(R.layout.item_bookmark, parent, false));
+      bookmarkHolder.setOnClickListener(mClickListener);
+      bookmarkHolder.setOnLongClickListener(mLongClickListener);
+      holder = bookmarkHolder;
+      break;
+    case TYPE_SECTION:
+      MaterialTextView tv = (MaterialTextView) inflater.inflate(R.layout.item_category_title, parent, false);
+      holder = new Holders.SectionViewHolder(tv);
+      break;
+    case TYPE_DESC:
+      View desc = inflater.inflate(R.layout.item_category_description, parent, false);
+      MaterialTextView moreBtn = desc.findViewById(R.id.more_btn);
+      MaterialTextView text = desc.findViewById(R.id.text);
+      MaterialTextView title = desc.findViewById(R.id.title);
+      setMoreButtonVisibility(text, moreBtn);
+      holder = new Holders.DescriptionViewHolder(desc, mSectionsDataSource.getCategory());
+      text.setOnClickListener(v -> onMoreButtonClicked(text, moreBtn));
+      moreBtn.setOnClickListener(v -> onMoreButtonClicked(text, moreBtn));
+      title.setOnClickListener(v -> onMoreButtonClicked(text, moreBtn));
+      break;
     }
 
     if (holder == null)
diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java
index 98bad6b1d..db7e3eda0 100644
--- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java
@@ -552,12 +552,12 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
 
     switch (adapter.getItemViewType(position))
     {
-      case BookmarkListAdapter.TYPE_SECTION, BookmarkListAdapter.TYPE_DESC ->
-      {
-        return;
-      }
-      case BookmarkListAdapter.TYPE_BOOKMARK -> onBookmarkClicked(position, intent, adapter);
-      case BookmarkListAdapter.TYPE_TRACK -> onTrackClicked(position, intent, adapter);
+    case BookmarkListAdapter.TYPE_SECTION, BookmarkListAdapter.TYPE_DESC ->
+    {
+      return;
+    }
+    case BookmarkListAdapter.TYPE_BOOKMARK -> onBookmarkClicked(position, intent, adapter);
+    case BookmarkListAdapter.TYPE_TRACK -> onTrackClicked(position, intent, adapter);
     }
 
     intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
@@ -622,22 +622,22 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
 
     switch (type)
     {
-      case BookmarkListAdapter.TYPE_SECTION:
-      case BookmarkListAdapter.TYPE_DESC:
-        // Do nothing here?
-        break;
+    case BookmarkListAdapter.TYPE_SECTION:
+    case BookmarkListAdapter.TYPE_DESC:
+      // Do nothing here?
+      break;
 
-      case BookmarkListAdapter.TYPE_BOOKMARK:
-        final BookmarkInfo bookmark = (BookmarkInfo) adapter.getItem(mSelectedPosition);
-        MenuBottomSheetFragment.newInstance(BOOKMARKS_MENU_ID, bookmark.getName())
-            .show(getChildFragmentManager(), BOOKMARKS_MENU_ID);
-        break;
+    case BookmarkListAdapter.TYPE_BOOKMARK:
+      final BookmarkInfo bookmark = (BookmarkInfo) adapter.getItem(mSelectedPosition);
+      MenuBottomSheetFragment.newInstance(BOOKMARKS_MENU_ID, bookmark.getName())
+          .show(getChildFragmentManager(), BOOKMARKS_MENU_ID);
+      break;
 
-      case BookmarkListAdapter.TYPE_TRACK:
-        final Track track = (Track) adapter.getItem(mSelectedPosition);
-        MenuBottomSheetFragment.newInstance(TRACK_MENU_ID, track.getName())
-            .show(getChildFragmentManager(), TRACK_MENU_ID);
-        break;
+    case BookmarkListAdapter.TYPE_TRACK:
+      final Track track = (Track) adapter.getItem(mSelectedPosition);
+      MenuBottomSheetFragment.newInstance(TRACK_MENU_ID, track.getName())
+          .show(getChildFragmentManager(), TRACK_MENU_ID);
+      break;
     }
   }
 
@@ -844,19 +844,19 @@ public class BookmarksListFragment extends BaseMwmRecyclerFragment<ConcatAdapter
   {
     switch (id)
     {
-      case BOOKMARKS_MENU_ID ->
-      {
-        return getBookmarkMenuItems();
-      }
-      case TRACK_MENU_ID ->
-      {
-        final Track track = (Track) getBookmarkListAdapter().getItem(mSelectedPosition);
-        return getTrackMenuItems(track);
-      }
-      case OPTIONS_MENU_ID ->
-      {
-        return getOptionsMenuItems();
-      }
+    case BOOKMARKS_MENU_ID ->
+    {
+      return getBookmarkMenuItems();
+    }
+    case TRACK_MENU_ID ->
+    {
+      final Track track = (Track) getBookmarkListAdapter().getItem(mSelectedPosition);
+      return getTrackMenuItems(track);
+    }
+    case OPTIONS_MENU_ID ->
+    {
+      return getOptionsMenuItems();
+    }
     }
     return null;
   }
diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksSharingHelper.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksSharingHelper.java
index 33ae76970..423ad9f40 100644
--- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksSharingHelper.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksSharingHelper.java
@@ -57,27 +57,27 @@ public enum BookmarksSharingHelper
 
     switch (result.getCode())
     {
-      case BookmarkSharingResult.SUCCESS ->
-        SharingUtils.shareBookmarkFile(context, launcher, result.getSharingPath(), result.getMimeType());
-      case BookmarkSharingResult.EMPTY_CATEGORY ->
-        new MaterialAlertDialogBuilder(context, R.style.MwmTheme_AlertDialog)
-            .setTitle(R.string.bookmarks_error_title_share_empty)
-            .setMessage(R.string.bookmarks_error_message_share_empty)
-            .setPositiveButton(R.string.ok, null)
-            .show();
-      case BookmarkSharingResult.ARCHIVE_ERROR, BookmarkSharingResult.FILE_ERROR ->
-      {
-        new MaterialAlertDialogBuilder(context, R.style.MwmTheme_AlertDialog)
-            .setTitle(R.string.dialog_routing_system_error)
-            .setMessage(R.string.bookmarks_error_message_share_general)
-            .setPositiveButton(R.string.ok, null)
-            .show();
-        List<String> names = new ArrayList<>();
-        for (long categoryId : result.getCategoriesIds())
-          names.add(BookmarkManager.INSTANCE.getCategoryById(categoryId).getName());
-        Logger.e(TAG, "Failed to share bookmark categories " + names + ", error code: " + result.getCode());
-      }
-      default -> throw new AssertionError("Unsupported bookmark sharing code: " + result.getCode());
+    case BookmarkSharingResult.SUCCESS ->
+      SharingUtils.shareBookmarkFile(context, launcher, result.getSharingPath(), result.getMimeType());
+    case BookmarkSharingResult.EMPTY_CATEGORY ->
+      new MaterialAlertDialogBuilder(context, R.style.MwmTheme_AlertDialog)
+          .setTitle(R.string.bookmarks_error_title_share_empty)
+          .setMessage(R.string.bookmarks_error_message_share_empty)
+          .setPositiveButton(R.string.ok, null)
+          .show();
+    case BookmarkSharingResult.ARCHIVE_ERROR, BookmarkSharingResult.FILE_ERROR ->
+    {
+      new MaterialAlertDialogBuilder(context, R.style.MwmTheme_AlertDialog)
+          .setTitle(R.string.dialog_routing_system_error)
+          .setMessage(R.string.bookmarks_error_message_share_general)
+          .setPositiveButton(R.string.ok, null)
+          .show();
+      List<String> names = new ArrayList<>();
+      for (long categoryId : result.getCategoriesIds())
+        names.add(BookmarkManager.INSTANCE.getCategoryById(categoryId).getName());
+      Logger.e(TAG, "Failed to share bookmark categories " + names + ", error code: " + result.getCode());
+    }
+    default -> throw new AssertionError("Unsupported bookmark sharing code: " + result.getCode());
     }
   }
 
diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarksSortingTypeFragment.java b/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarksSortingTypeFragment.java
index 16c520d59..cf8904d17 100644
--- a/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarksSortingTypeFragment.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarksSortingTypeFragment.java
@@ -64,10 +64,10 @@ public class ChooseBookmarksSortingTypeFragment
     {
       switch (sortingType)
       {
-        case BookmarkManager.SORT_BY_TYPE: return R.id.sort_by_type;
-        case BookmarkManager.SORT_BY_DISTANCE: return R.id.sort_by_distance;
-        case BookmarkManager.SORT_BY_TIME: return R.id.sort_by_time;
-        case BookmarkManager.SORT_BY_NAME: return R.id.sort_by_name;
+      case BookmarkManager.SORT_BY_TYPE: return R.id.sort_by_type;
+      case BookmarkManager.SORT_BY_DISTANCE: return R.id.sort_by_distance;
+      case BookmarkManager.SORT_BY_TIME: return R.id.sort_by_time;
+      case BookmarkManager.SORT_BY_NAME: return R.id.sort_by_name;
       }
     }
     return R.id.sort_by_default;
diff --git a/android/app/src/main/java/app/organicmaps/car/screens/search/SearchUiHelpers.java b/android/app/src/main/java/app/organicmaps/car/screens/search/SearchUiHelpers.java
index d673c84ed..6deeb1a67 100644
--- a/android/app/src/main/java/app/organicmaps/car/screens/search/SearchUiHelpers.java
+++ b/android/app/src/main/java/app/organicmaps/car/screens/search/SearchUiHelpers.java
@@ -62,29 +62,29 @@ public final class SearchUiHelpers
     CarColor color = Colors.DEFAULT;
     switch (searchResult.description.openNow)
     {
-      case SearchResult.OPEN_NOW_YES:
-        if (searchResult.description.minutesUntilClosed < 60) // less than 1 hour
-        {
-          final String time = searchResult.description.minutesUntilClosed + " " + carContext.getString(R.string.minute);
-          text = carContext.getString(R.string.closes_in, time);
-          color = Colors.OPENING_HOURS_CLOSES_SOON;
-        }
-        else
-        {
-          text = carContext.getString(R.string.editor_time_open);
-          color = Colors.OPENING_HOURS_OPEN;
-        }
-        break;
-      case SearchResult.OPEN_NOW_NO:
-        if (searchResult.description.minutesUntilOpen < 60) // less than 1 hour
-        {
-          final String time = searchResult.description.minutesUntilOpen + " " + carContext.getString(R.string.minute);
-          text = carContext.getString(R.string.opens_in, time);
-        }
-        else
-          text = carContext.getString(R.string.closed);
-        color = Colors.OPENING_HOURS_CLOSED;
-        break;
+    case SearchResult.OPEN_NOW_YES:
+      if (searchResult.description.minutesUntilClosed < 60) // less than 1 hour
+      {
+        final String time = searchResult.description.minutesUntilClosed + " " + carContext.getString(R.string.minute);
+        text = carContext.getString(R.string.closes_in, time);
+        color = Colors.OPENING_HOURS_CLOSES_SOON;
+      }
+      else
+      {
+        text = carContext.getString(R.string.editor_time_open);
+        color = Colors.OPENING_HOURS_OPEN;
+      }
+      break;
+    case SearchResult.OPEN_NOW_NO:
+      if (searchResult.description.minutesUntilOpen < 60) // less than 1 hour
+      {
+        final String time = searchResult.description.minutesUntilOpen + " " + carContext.getString(R.string.minute);
+        text = carContext.getString(R.string.opens_in, time);
+      }
+      else
+        text = carContext.getString(R.string.closed);
+      color = Colors.OPENING_HOURS_CLOSED;
+      break;
     }
 
     result.append(text);
diff --git a/android/app/src/main/java/app/organicmaps/car/util/IntentUtils.java b/android/app/src/main/java/app/organicmaps/car/util/IntentUtils.java
index 02d55fb34..ab37fbd72 100644
--- a/android/app/src/main/java/app/organicmaps/car/util/IntentUtils.java
+++ b/android/app/src/main/java/app/organicmaps/car/util/IntentUtils.java
@@ -65,36 +65,36 @@ public final class IntentUtils
     final ScreenManager screenManager = carContext.getCarService(ScreenManager.class);
     switch (Framework.nativeParseAndSetApiUrl(uri.toString()))
     {
-      case RequestType.INCORRECT: return;
-      case RequestType.MAP:
-        screenManager.popToRoot();
-        Map.executeMapApiRequest();
-        return;
-      case RequestType.SEARCH:
-        screenManager.popToRoot();
-        final ParsedSearchRequest request = Framework.nativeGetParsedSearchRequest();
-        final double[] latlon = Framework.nativeGetParsedCenterLatLon();
-        if (latlon != null)
-        {
-          Framework.nativeStopLocationFollow();
-          Framework.nativeSetViewportCenter(latlon[0], latlon[1], SEARCH_IN_VIEWPORT_ZOOM);
-          // We need to update viewport for search api manually because of drape engine
-          // will not notify subscribers when search activity is shown.
-          if (!request.mIsSearchOnMap)
-            Framework.nativeSetSearchViewport(latlon[0], latlon[1], SEARCH_IN_VIEWPORT_ZOOM);
-        }
-        final SearchScreen.Builder builder = new SearchScreen.Builder(carContext, surfaceRenderer);
-        builder.setQuery(request.mQuery);
-        if (request.mLocale != null)
-          builder.setLocale(request.mLocale);
+    case RequestType.INCORRECT: return;
+    case RequestType.MAP:
+      screenManager.popToRoot();
+      Map.executeMapApiRequest();
+      return;
+    case RequestType.SEARCH:
+      screenManager.popToRoot();
+      final ParsedSearchRequest request = Framework.nativeGetParsedSearchRequest();
+      final double[] latlon = Framework.nativeGetParsedCenterLatLon();
+      if (latlon != null)
+      {
+        Framework.nativeStopLocationFollow();
+        Framework.nativeSetViewportCenter(latlon[0], latlon[1], SEARCH_IN_VIEWPORT_ZOOM);
+        // We need to update viewport for search api manually because of drape engine
+        // will not notify subscribers when search activity is shown.
+        if (!request.mIsSearchOnMap)
+          Framework.nativeSetSearchViewport(latlon[0], latlon[1], SEARCH_IN_VIEWPORT_ZOOM);
+      }
+      final SearchScreen.Builder builder = new SearchScreen.Builder(carContext, surfaceRenderer);
+      builder.setQuery(request.mQuery);
+      if (request.mLocale != null)
+        builder.setLocale(request.mLocale);
 
-        screenManager.popToRoot();
-        screenManager.push(builder.build());
-        return;
-      case RequestType.ROUTE: Logger.e(TAG, "Route API is not supported by Android Auto: " + uri); return;
-      case RequestType.CROSSHAIR: Logger.e(TAG, "Crosshair API is not supported by Android Auto: " + uri); return;
-      case RequestType.MENU: Logger.e(TAG, "Menu API is not supported by Android Auto: " + uri); return;
-      case RequestType.SETTINGS: Logger.e(TAG, "Settings API is not supported by Android Auto: " + uri);
+      screenManager.popToRoot();
+      screenManager.push(builder.build());
+      return;
+    case RequestType.ROUTE: Logger.e(TAG, "Route API is not supported by Android Auto: " + uri); return;
+    case RequestType.CROSSHAIR: Logger.e(TAG, "Crosshair API is not supported by Android Auto: " + uri); return;
+    case RequestType.MENU: Logger.e(TAG, "Menu API is not supported by Android Auto: " + uri); return;
+    case RequestType.SETTINGS: Logger.e(TAG, "Settings API is not supported by Android Auto: " + uri);
     }
   }
 
diff --git a/android/app/src/main/java/app/organicmaps/car/util/UiHelpers.java b/android/app/src/main/java/app/organicmaps/car/util/UiHelpers.java
index 063041606..ada151fcb 100644
--- a/android/app/src/main/java/app/organicmaps/car/util/UiHelpers.java
+++ b/android/app/src/main/java/app/organicmaps/car/util/UiHelpers.java
@@ -171,20 +171,20 @@ public final class UiHelpers
     int drawableRes;
     switch (locationMode)
     {
-      case LocationState.PENDING_POSITION, LocationState.NOT_FOLLOW_NO_POSITION ->
-        drawableRes = R.drawable.ic_location_off;
-      case LocationState.NOT_FOLLOW -> drawableRes = R.drawable.ic_not_follow;
-      case LocationState.FOLLOW ->
-      {
-        drawableRes = R.drawable.ic_follow;
-        tintColor = Colors.LOCATION_TINT;
-      }
-      case LocationState.FOLLOW_AND_ROTATE ->
-      {
-        drawableRes = R.drawable.ic_follow_and_rotate;
-        tintColor = Colors.LOCATION_TINT;
-      }
-      default -> throw new IllegalArgumentException("Invalid button mode: " + locationMode);
+    case LocationState.PENDING_POSITION, LocationState.NOT_FOLLOW_NO_POSITION ->
+      drawableRes = R.drawable.ic_location_off;
+    case LocationState.NOT_FOLLOW -> drawableRes = R.drawable.ic_not_follow;
+    case LocationState.FOLLOW ->
+    {
+      drawableRes = R.drawable.ic_follow;
+      tintColor = Colors.LOCATION_TINT;
+    }
+    case LocationState.FOLLOW_AND_ROTATE ->
+    {
+      drawableRes = R.drawable.ic_follow_and_rotate;
+      tintColor = Colors.LOCATION_TINT;
+    }
+    default -> throw new IllegalArgumentException("Invalid button mode: " + locationMode);
     }
 
     final CarIcon icon =
diff --git a/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java b/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java
index 90c95e401..2cf9b99e8 100644
--- a/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java
@@ -115,15 +115,15 @@ class BottomPanel
       {
         switch (status)
         {
-          case STATUS_UPDATABLE ->
-          {
-            UpdateInfo info = MapManager.nativeGetUpdateInfo(root);
-            setUpdateAllState(info);
-          } // Special case for "Countries" node when no maps currently downloaded.
-          case STATUS_DOWNLOADABLE, STATUS_DONE, STATUS_PARTLY -> show = false;
-          case STATUS_PROGRESS, STATUS_APPLYING, STATUS_ENQUEUED -> setCancelState();
-          case STATUS_FAILED -> setRetryFailedStates();
-          default -> throw new IllegalArgumentException("Inappropriate status for \"" + root + "\": " + status);
+        case STATUS_UPDATABLE ->
+        {
+          UpdateInfo info = MapManager.nativeGetUpdateInfo(root);
+          setUpdateAllState(info);
+        } // Special case for "Countries" node when no maps currently downloaded.
+        case STATUS_DOWNLOADABLE, STATUS_DONE, STATUS_PARTLY -> show = false;
+        case STATUS_PROGRESS, STATUS_APPLYING, STATUS_ENQUEUED -> setCancelState();
+        case STATUS_FAILED -> setRetryFailedStates();
+        default -> throw new IllegalArgumentException("Inappropriate status for \"" + root + "\": " + status);
         }
       }
       else
@@ -133,15 +133,15 @@ class BottomPanel
         {
           switch (status)
           {
-            case STATUS_UPDATABLE ->
-            {
-              UpdateInfo info = MapManager.nativeGetUpdateInfo(root);
-              setUpdateAllState(info);
-            }
-            case STATUS_DONE -> show = false;
-            case STATUS_PROGRESS, STATUS_APPLYING, STATUS_ENQUEUED -> setCancelState();
-            case STATUS_FAILED -> setRetryFailedStates();
-            default -> setDownloadAllState();
+          case STATUS_UPDATABLE ->
+          {
+            UpdateInfo info = MapManager.nativeGetUpdateInfo(root);
+            setUpdateAllState(info);
+          }
+          case STATUS_DONE -> show = false;
+          case STATUS_PROGRESS, STATUS_APPLYING, STATUS_ENQUEUED -> setCancelState();
+          case STATUS_FAILED -> setRetryFailedStates();
+          default -> setDownloadAllState();
           }
         }
       }
diff --git a/android/app/src/main/java/app/organicmaps/downloader/CountrySuggestFragment.java b/android/app/src/main/java/app/organicmaps/downloader/CountrySuggestFragment.java
index 7a9b0155e..a128e275e 100644
--- a/android/app/src/main/java/app/organicmaps/downloader/CountrySuggestFragment.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/CountrySuggestFragment.java
@@ -70,9 +70,9 @@ public class CountrySuggestFragment extends BaseMwmFragment implements View.OnCl
 
           switch (item.newStatus)
           {
-            case CountryItem.STATUS_FAILED: updateViews(); return;
+          case CountryItem.STATUS_FAILED: updateViews(); return;
 
-            case CountryItem.STATUS_DONE: exitFragment(); return;
+          case CountryItem.STATUS_DONE: exitFragment(); return;
           }
 
           break;
diff --git a/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java b/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java
index 597a78b45..e41f45a7e 100644
--- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java
@@ -287,41 +287,41 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
     ArrayList<MenuBottomSheetItem> items = new ArrayList<>();
     switch (mSelectedItem.status)
     {
-      case CountryItem.STATUS_DOWNLOADABLE: items.add(getDownloadMenuItem()); break;
+    case CountryItem.STATUS_DOWNLOADABLE: items.add(getDownloadMenuItem()); break;
 
-      case CountryItem.STATUS_UPDATABLE:
-        items.add(getUpdateMenuItem());
-        // Fallthrough
+    case CountryItem.STATUS_UPDATABLE:
+      items.add(getUpdateMenuItem());
+      // Fallthrough
 
-      case CountryItem.STATUS_DONE:
-        if (!mSelectedItem.isExpandable())
-          items.add(getExploreMenuItem());
+    case CountryItem.STATUS_DONE:
+      if (!mSelectedItem.isExpandable())
+        items.add(getExploreMenuItem());
+      appendDeleteMenuItem(items);
+      break;
+
+    case CountryItem.STATUS_FAILED:
+      items.add(getCancelMenuItem());
+
+      if (mSelectedItem.present)
+      {
         appendDeleteMenuItem(items);
-        break;
+        items.add(getExploreMenuItem());
+      }
+      break;
 
-      case CountryItem.STATUS_FAILED:
-        items.add(getCancelMenuItem());
+    case CountryItem.STATUS_PROGRESS:
+    case CountryItem.STATUS_APPLYING:
+    case CountryItem.STATUS_ENQUEUED:
+      items.add(getCancelMenuItem());
 
-        if (mSelectedItem.present)
-        {
-          appendDeleteMenuItem(items);
-          items.add(getExploreMenuItem());
-        }
-        break;
+      if (mSelectedItem.present)
+        items.add(getExploreMenuItem());
+      break;
 
-      case CountryItem.STATUS_PROGRESS:
-      case CountryItem.STATUS_APPLYING:
-      case CountryItem.STATUS_ENQUEUED:
-        items.add(getCancelMenuItem());
-
-        if (mSelectedItem.present)
-          items.add(getExploreMenuItem());
-        break;
-
-      case CountryItem.STATUS_PARTLY:
-        items.add(getDownloadMenuItem());
-        appendDeleteMenuItem(items);
-        break;
+    case CountryItem.STATUS_PARTLY:
+      items.add(getDownloadMenuItem());
+      appendDeleteMenuItem(items);
+      break;
     }
     return items;
   }
@@ -372,20 +372,20 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
     {
       switch (mItem.status)
       {
-        case CountryItem.STATUS_DONE, CountryItem.STATUS_PROGRESS, CountryItem.STATUS_APPLYING,
-            CountryItem.STATUS_ENQUEUED ->
+      case CountryItem.STATUS_DONE, CountryItem.STATUS_PROGRESS, CountryItem.STATUS_APPLYING,
+          CountryItem.STATUS_ENQUEUED ->
+        processLongClick();
+      case CountryItem.STATUS_DOWNLOADABLE, CountryItem.STATUS_PARTLY ->
+      {
+        if (clickOnStatus)
+          onDownloadActionSelected(mItem, DownloaderAdapter.this);
+        else
           processLongClick();
-        case CountryItem.STATUS_DOWNLOADABLE, CountryItem.STATUS_PARTLY ->
-        {
-          if (clickOnStatus)
-            onDownloadActionSelected(mItem, DownloaderAdapter.this);
-          else
-            processLongClick();
-        }
-        case CountryItem.STATUS_FAILED -> MapManager.warn3gAndRetry(mActivity, mItem.id, null);
-        case CountryItem.STATUS_UPDATABLE ->
-          MapManager.warnOn3gUpdate(mActivity, mItem.id, () -> MapManager.startUpdate(mItem.id));
-        default -> throw new IllegalArgumentException("Inappropriate item status: " + mItem.status);
+      }
+      case CountryItem.STATUS_FAILED -> MapManager.warn3gAndRetry(mActivity, mItem.id, null);
+      case CountryItem.STATUS_UPDATABLE ->
+        MapManager.warnOn3gUpdate(mActivity, mItem.id, () -> MapManager.startUpdate(mItem.id));
+      default -> throw new IllegalArgumentException("Inappropriate item status: " + mItem.status);
       }
     }
 
@@ -535,33 +535,33 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
       {
         switch (ci.category)
         {
-          case CountryItem.CATEGORY_NEAR_ME ->
+        case CountryItem.CATEGORY_NEAR_ME ->
+        {
+          if (ci.category != prev)
           {
-            if (ci.category != prev)
-            {
-              headerId = CountryItem.CATEGORY_NEAR_ME;
-              mItemsAndHeader.add(new GenericItem(mActivity.getString(R.string.downloader_near_me_subtitle)));
-              prev = ci.category;
-            }
-          }
-          case CountryItem.CATEGORY_DOWNLOADED ->
-          {
-            if (ci.category != prev)
-            {
-              headerId = CountryItem.CATEGORY_DOWNLOADED;
-              mItemsAndHeader.add(new GenericItem(mActivity.getString(R.string.downloader_downloaded_subtitle)));
-              prev = ci.category;
-            }
-          }
-          default ->
-          {
-            int prevHeader = headerId;
-            headerId = CountryItem.CATEGORY_AVAILABLE + ci.name.charAt(0);
-            if (headerId != prevHeader)
-              mItemsAndHeader.add(new GenericItem(StringUtils.toUpperCase(ci.name.substring(0, 1))));
+            headerId = CountryItem.CATEGORY_NEAR_ME;
+            mItemsAndHeader.add(new GenericItem(mActivity.getString(R.string.downloader_near_me_subtitle)));
             prev = ci.category;
           }
         }
+        case CountryItem.CATEGORY_DOWNLOADED ->
+        {
+          if (ci.category != prev)
+          {
+            headerId = CountryItem.CATEGORY_DOWNLOADED;
+            mItemsAndHeader.add(new GenericItem(mActivity.getString(R.string.downloader_downloaded_subtitle)));
+            prev = ci.category;
+          }
+        }
+        default ->
+        {
+          int prevHeader = headerId;
+          headerId = CountryItem.CATEGORY_AVAILABLE + ci.name.charAt(0);
+          if (headerId != prevHeader)
+            mItemsAndHeader.add(new GenericItem(StringUtils.toUpperCase(ci.name.substring(0, 1))));
+          prev = ci.category;
+        }
+        }
         ci.headerId = headerId;
       }
       mItemsAndHeader.add(new GenericItem(ci));
diff --git a/android/app/src/main/java/app/organicmaps/downloader/DownloaderFragment.java b/android/app/src/main/java/app/organicmaps/downloader/DownloaderFragment.java
index 688d0ada6..8e52cc25a 100644
--- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderFragment.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderFragment.java
@@ -24,8 +24,8 @@ import app.organicmaps.widget.PlaceholderView;
 import java.util.ArrayList;
 import java.util.List;
 
-public class DownloaderFragment extends BaseMwmRecyclerFragment<DownloaderAdapter>
-    implements MenuBottomSheetFragment.MenuBottomSheetInterface
+public class DownloaderFragment
+    extends BaseMwmRecyclerFragment<DownloaderAdapter> implements MenuBottomSheetFragment.MenuBottomSheetInterface
 {
   private DownloaderToolbarController mToolbarController;
 
@@ -153,7 +153,8 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment<DownloaderAdapte
 
     mBottomPanel = new BottomPanel(this, view);
     mToolbarController = new DownloaderToolbarController(view, requireActivity(), this);
-    requireActivity().getOnBackPressedDispatcher().addCallback(getViewLifecycleOwner(), mToolbarController.getBackPressedCallback());
+    requireActivity().getOnBackPressedDispatcher().addCallback(getViewLifecycleOwner(),
+                                                               mToolbarController.getBackPressedCallback());
 
     update();
   }
@@ -195,7 +196,8 @@ public class DownloaderFragment extends BaseMwmRecyclerFragment<DownloaderAdapte
   {
     if (mAdapter == null)
       mAdapter = new DownloaderAdapter(this);
-    requireActivity().getOnBackPressedDispatcher().addCallback(getViewLifecycleOwner(), mAdapter.getBackPressedCallback());
+    requireActivity().getOnBackPressedDispatcher().addCallback(getViewLifecycleOwner(),
+                                                               mAdapter.getBackPressedCallback());
 
     return mAdapter;
   }
diff --git a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
index 2f9b02caa..7d408a54e 100644
--- a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
@@ -20,13 +20,13 @@ import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmFragment;
 import app.organicmaps.dialog.EditTextDialogFragment;
+import app.organicmaps.editor.data.TimeFormatUtils;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.bookmarks.data.Metadata;
 import app.organicmaps.sdk.editor.Editor;
 import app.organicmaps.sdk.editor.OpeningHours;
 import app.organicmaps.sdk.editor.data.LocalizedName;
 import app.organicmaps.sdk.editor.data.LocalizedStreet;
-import app.organicmaps.editor.data.TimeFormatUtils;
 import app.organicmaps.sdk.editor.data.Timetable;
 import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.sdk.util.UiUtils;
@@ -623,11 +623,11 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
 
     switch (Editor.nativeGetMapObjectStatus())
     {
-      case Editor.CREATED -> mReset.setText(R.string.editor_remove_place_button);
-      case Editor.MODIFIED -> mReset.setText(R.string.editor_reset_edits_button);
-      case Editor.UNTOUCHED -> mReset.setText(R.string.editor_place_doesnt_exist);
-      case Editor.DELETED -> throw new IllegalStateException("Can't delete already deleted feature.");
-      case Editor.OBSOLETE -> throw new IllegalStateException("Obsolete objects cannot be reverted.");
+    case Editor.CREATED -> mReset.setText(R.string.editor_remove_place_button);
+    case Editor.MODIFIED -> mReset.setText(R.string.editor_reset_edits_button);
+    case Editor.UNTOUCHED -> mReset.setText(R.string.editor_place_doesnt_exist);
+    case Editor.DELETED -> throw new IllegalStateException("Can't delete already deleted feature.");
+    case Editor.OBSOLETE -> throw new IllegalStateException("Obsolete objects cannot be reverted.");
     }
   }
 
@@ -641,11 +641,11 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
 
     switch (Editor.nativeGetMapObjectStatus())
     {
-      case Editor.CREATED -> rollback(Editor.CREATED);
-      case Editor.MODIFIED -> rollback(Editor.MODIFIED);
-      case Editor.UNTOUCHED -> placeDoesntExist();
-      case Editor.DELETED -> throw new IllegalStateException("Can't delete already deleted feature.");
-      case Editor.OBSOLETE -> throw new IllegalStateException("Obsolete objects cannot be reverted.");
+    case Editor.CREATED -> rollback(Editor.CREATED);
+    case Editor.MODIFIED -> rollback(Editor.MODIFIED);
+    case Editor.UNTOUCHED -> placeDoesntExist();
+    case Editor.DELETED -> throw new IllegalStateException("Can't delete already deleted feature.");
+    case Editor.OBSOLETE -> throw new IllegalStateException("Obsolete objects cannot be reverted.");
     }
   }
 
diff --git a/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java b/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
index 3a7cab0c3..cdc0ffdfd 100644
--- a/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
@@ -173,8 +173,8 @@ public class EditorHostFragment
   {
     switch (mMode)
     {
-      case OPENING_HOURS, STREET, CUISINE, LANGUAGE, PHONE, SELF_SERVICE -> editMapObject();
-      default -> Utils.navigateToParent(requireActivity());
+    case OPENING_HOURS, STREET, CUISINE, LANGUAGE, PHONE, SELF_SERVICE -> editMapObject();
+    default -> Utils.navigateToParent(requireActivity());
     }
     return true;
   }
@@ -283,57 +283,57 @@ public class EditorHostFragment
     {
       switch (mMode)
       {
-        case OPENING_HOURS ->
-        {
-          final String timetables = ((TimetableContainerFragment) getChildFragmentManager().findFragmentByTag(
-                                         TimetableContainerFragment.class.getName()))
-                                        .getTimetable();
-          Editor.nativeSetOpeningHours(timetables);
-          editMapObject();
-        }
-        case STREET ->
-          setStreet(((StreetFragment) getChildFragmentManager().findFragmentByTag(StreetFragment.class.getName()))
-                        .getStreet());
-        case CUISINE ->
-        {
-          String[] cuisines =
-              ((CuisineFragment) getChildFragmentManager().findFragmentByTag(CuisineFragment.class.getName()))
-                  .getCuisines();
-          Editor.nativeSetSelectedCuisines(cuisines);
-          editMapObject();
-        }
-        case SELF_SERVICE ->
-          setSelection(
-              Metadata.MetadataType.FMD_SELF_SERVICE,
-              ((SelfServiceFragment) getChildFragmentManager().findFragmentByTag(SelfServiceFragment.class.getName()))
-                  .getSelection());
-        case LANGUAGE -> editMapObject();
-        case MAP_OBJECT ->
-        {
-          if (!setEdits())
-            return;
+      case OPENING_HOURS ->
+      {
+        final String timetables = ((TimetableContainerFragment) getChildFragmentManager().findFragmentByTag(
+                                       TimetableContainerFragment.class.getName()))
+                                      .getTimetable();
+        Editor.nativeSetOpeningHours(timetables);
+        editMapObject();
+      }
+      case STREET ->
+        setStreet(
+            ((StreetFragment) getChildFragmentManager().findFragmentByTag(StreetFragment.class.getName())).getStreet());
+      case CUISINE ->
+      {
+        String[] cuisines =
+            ((CuisineFragment) getChildFragmentManager().findFragmentByTag(CuisineFragment.class.getName()))
+                .getCuisines();
+        Editor.nativeSetSelectedCuisines(cuisines);
+        editMapObject();
+      }
+      case SELF_SERVICE ->
+        setSelection(
+            Metadata.MetadataType.FMD_SELF_SERVICE,
+            ((SelfServiceFragment) getChildFragmentManager().findFragmentByTag(SelfServiceFragment.class.getName()))
+                .getSelection());
+      case LANGUAGE -> editMapObject();
+      case MAP_OBJECT ->
+      {
+        if (!setEdits())
+          return;
 
-          // Save object edits
-          if (!MwmApplication.prefs(requireContext()).contains(NOOB_ALERT_SHOWN))
-          {
-            showNoobDialog();
-          }
-          else
-          {
-            saveNote();
-            saveMapObjectEdits();
-          }
-        }
-        case PHONE ->
+        // Save object edits
+        if (!MwmApplication.prefs(requireContext()).contains(NOOB_ALERT_SHOWN))
         {
-          final String phone =
-              ((PhoneFragment) getChildFragmentManager().findFragmentByTag(PhoneFragment.class.getName())).getPhone();
-          if (Editor.nativeIsPhoneValid(phone))
-          {
-            Editor.nativeSetPhone(phone);
-            editMapObject();
-          }
+          showNoobDialog();
         }
+        else
+        {
+          saveNote();
+          saveMapObjectEdits();
+        }
+      }
+      case PHONE ->
+      {
+        final String phone =
+            ((PhoneFragment) getChildFragmentManager().findFragmentByTag(PhoneFragment.class.getName())).getPhone();
+        if (Editor.nativeIsPhoneValid(phone))
+        {
+          Editor.nativeSetPhone(phone);
+          editMapObject();
+        }
+      }
       }
     }
   }
diff --git a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryAdapter.java b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryAdapter.java
index 7541f042e..7ae679850 100644
--- a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryAdapter.java
@@ -7,13 +7,11 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.RecyclerView;
-
-import com.google.android.material.textfield.TextInputEditText;
-
 import app.organicmaps.R;
 import app.organicmaps.sdk.editor.data.FeatureCategory;
 import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.sdk.util.UiUtils;
+import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textview.MaterialTextView;
 
 public class FeatureCategoryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder>
@@ -59,17 +57,18 @@ public class FeatureCategoryAdapter extends RecyclerView.Adapter<RecyclerView.Vi
   {
     switch (viewType)
     {
-      case TYPE_CATEGORY ->
-      {
-        return new FeatureViewHolder(
-            LayoutInflater.from(parent.getContext()).inflate(R.layout.item_feature_category, parent, false));
-      }
-      case TYPE_FOOTER ->
-      {
-        return new FooterViewHolder(
-            LayoutInflater.from(parent.getContext()).inflate(R.layout.item_feature_category_footer, parent, false), (FooterListener) mFragment);
-      }
-      default -> throw new IllegalArgumentException("Unsupported");
+    case TYPE_CATEGORY ->
+    {
+      return new FeatureViewHolder(
+          LayoutInflater.from(parent.getContext()).inflate(R.layout.item_feature_category, parent, false));
+    }
+    case TYPE_FOOTER ->
+    {
+      return new FooterViewHolder(
+          LayoutInflater.from(parent.getContext()).inflate(R.layout.item_feature_category_footer, parent, false),
+          (FooterListener) mFragment);
+    }
+    default -> throw new IllegalArgumentException("Unsupported");
     }
   }
 
diff --git a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java
index ec1cdcce3..6a445d308 100644
--- a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java
@@ -1,34 +1,35 @@
 package app.organicmaps.editor;
 
 import static app.organicmaps.sdk.util.Utils.getLocalizedFeatureType;
+
+import android.content.Intent;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Toast;
 import androidx.annotation.CallSuper;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import app.organicmaps.MwmApplication;
-import app.organicmaps.sdk.editor.Editor;
-import app.organicmaps.sdk.editor.data.FeatureCategory;
-import app.organicmaps.sdk.util.Language;
-import app.organicmaps.sdk.editor.OsmOAuth;
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import android.text.TextUtils;
-import android.content.Intent;
-import android.widget.Toast;
-
-import app.organicmaps.sdk.Framework;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmRecyclerFragment;
 import app.organicmaps.dialog.EditTextDialogFragment;
+import app.organicmaps.sdk.Framework;
+import app.organicmaps.sdk.editor.Editor;
+import app.organicmaps.sdk.editor.OsmOAuth;
+import app.organicmaps.sdk.editor.data.FeatureCategory;
+import app.organicmaps.sdk.util.Language;
 import app.organicmaps.util.Utils;
 import app.organicmaps.widget.SearchToolbarController;
 import app.organicmaps.widget.ToolbarController;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import java.util.Arrays;
 import java.util.Comparator;
 
-public class FeatureCategoryFragment extends BaseMwmRecyclerFragment<FeatureCategoryAdapter> implements FeatureCategoryAdapter.FooterListener
+public class FeatureCategoryFragment
+    extends BaseMwmRecyclerFragment<FeatureCategoryAdapter> implements FeatureCategoryAdapter.FooterListener
 {
   private FeatureCategory mSelectedCategory;
   protected ToolbarController mToolbarController;
@@ -58,8 +59,7 @@ public class FeatureCategoryFragment extends BaseMwmRecyclerFragment<FeatureCate
       mSelectedCategory =
           Utils.getParcelable(args, FeatureCategoryActivity.EXTRA_FEATURE_CATEGORY, FeatureCategory.class);
     }
-    mToolbarController = new SearchToolbarController(view, requireActivity())
-    {
+    mToolbarController = new SearchToolbarController(view, requireActivity()) {
       @Override
       protected void onTextChanged(String query)
       {
@@ -158,19 +158,21 @@ public class FeatureCategoryFragment extends BaseMwmRecyclerFragment<FeatureCate
   private void showNoteConfirmationDialog(double lat, double lon, String noteText)
   {
     new MaterialAlertDialogBuilder(requireActivity(), R.style.MwmTheme_AlertDialog)
-      .setTitle(R.string.editor_share_to_all_dialog_title)
-      .setMessage(getString(R.string.editor_share_to_all_dialog_message_1)
-        + " " + getString(R.string.editor_share_to_all_dialog_message_2))
-      .setPositiveButton(android.R.string.ok, (dlg, which) -> {
-        MwmApplication.prefs(requireContext().getApplicationContext()).edit()
-          .putBoolean(NOTE_CONFIRMATION_SHOWN, true)
-          .apply();
-        Editor.nativeCreateStandaloneNote(lat, lon, noteText);
-        mPendingNoteText = "";
-        Toast.makeText(requireContext(), R.string.osm_note_toast, Toast.LENGTH_SHORT).show();
-        requireActivity().finish();
-      })
-      .setNegativeButton(R.string.cancel, null)
-      .show();
+        .setTitle(R.string.editor_share_to_all_dialog_title)
+        .setMessage(getString(R.string.editor_share_to_all_dialog_message_1) + " "
+                    + getString(R.string.editor_share_to_all_dialog_message_2))
+        .setPositiveButton(android.R.string.ok,
+                           (dlg, which) -> {
+                             MwmApplication.prefs(requireContext().getApplicationContext())
+                                 .edit()
+                                 .putBoolean(NOTE_CONFIRMATION_SHOWN, true)
+                                 .apply();
+                             Editor.nativeCreateStandaloneNote(lat, lon, noteText);
+                             mPendingNoteText = "";
+                             Toast.makeText(requireContext(), R.string.osm_note_toast, Toast.LENGTH_SHORT).show();
+                             requireActivity().finish();
+                           })
+        .setNegativeButton(R.string.cancel, null)
+        .show();
   }
 }
diff --git a/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java b/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java
index 0b2d20002..8e37fc3d1 100644
--- a/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java
@@ -13,9 +13,9 @@ import androidx.appcompat.widget.SwitchCompat;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.R;
+import app.organicmaps.editor.data.TimeFormatUtils;
 import app.organicmaps.sdk.editor.OpeningHours;
 import app.organicmaps.sdk.editor.data.HoursMinutes;
-import app.organicmaps.editor.data.TimeFormatUtils;
 import app.organicmaps.sdk.editor.data.Timespan;
 import app.organicmaps.sdk.editor.data.Timetable;
 import app.organicmaps.sdk.util.UiUtils;
diff --git a/android/app/src/main/java/app/organicmaps/editor/TimetableContainerFragment.java b/android/app/src/main/java/app/organicmaps/editor/TimetableContainerFragment.java
index 3012d0d88..307919667 100644
--- a/android/app/src/main/java/app/organicmaps/editor/TimetableContainerFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/TimetableContainerFragment.java
@@ -162,8 +162,8 @@ public class TimetableContainerFragment extends BaseMwmFragment implements Timet
 
     switch (mMode)
     {
-      case SIMPLE -> setMode(Mode.ADVANCED, filledTimetables);
-      case ADVANCED -> setMode(Mode.SIMPLE, filledTimetables);
+    case SIMPLE -> setMode(Mode.ADVANCED, filledTimetables);
+    case ADVANCED -> setMode(Mode.SIMPLE, filledTimetables);
     }
   }
 
diff --git a/android/app/src/main/java/app/organicmaps/help/FaqFragment.java b/android/app/src/main/java/app/organicmaps/help/FaqFragment.java
index 94585eaca..5532020a1 100644
--- a/android/app/src/main/java/app/organicmaps/help/FaqFragment.java
+++ b/android/app/src/main/java/app/organicmaps/help/FaqFragment.java
@@ -42,8 +42,8 @@ public class FaqFragment extends BaseMwmFragment
     {
       switch (which)
       {
-        case 0 -> sendGeneralFeedback();
-        case 1 -> reportBug();
+      case 0 -> sendGeneralFeedback();
+      case 1 -> reportBug();
       }
     }
   };
diff --git a/android/app/src/main/java/app/organicmaps/intent/Factory.java b/android/app/src/main/java/app/organicmaps/intent/Factory.java
index 5a2677fdd..da6c76b20 100644
--- a/android/app/src/main/java/app/organicmaps/intent/Factory.java
+++ b/android/app/src/main/java/app/organicmaps/intent/Factory.java
@@ -78,67 +78,67 @@ public class Factory
 
       switch (Framework.nativeParseAndSetApiUrl(uri.toString()))
       {
-        case RequestType.INCORRECT: return false;
+      case RequestType.INCORRECT: return false;
 
-        case RequestType.MAP:
-          SearchEngine.INSTANCE.cancelInteractiveSearch();
-          Map.executeMapApiRequest();
-          return true;
+      case RequestType.MAP:
+        SearchEngine.INSTANCE.cancelInteractiveSearch();
+        Map.executeMapApiRequest();
+        return true;
 
-        case RequestType.ROUTE:
-          SearchEngine.INSTANCE.cancelInteractiveSearch();
-          final ParsedRoutingData data = Framework.nativeGetParsedRoutingData();
-          RoutingController.get().setRouterType(data.mRouterType);
-          final RoutePoint from = data.mPoints[0];
-          final RoutePoint to = data.mPoints[1];
-          RoutingController.get().prepare(
-              MapObject.createMapObject(FeatureId.EMPTY, MapObject.API_POINT, from.mName, "", from.mLat, from.mLon),
-              MapObject.createMapObject(FeatureId.EMPTY, MapObject.API_POINT, to.mName, "", to.mLat, to.mLon));
-          return true;
-        case RequestType.SEARCH:
+      case RequestType.ROUTE:
+        SearchEngine.INSTANCE.cancelInteractiveSearch();
+        final ParsedRoutingData data = Framework.nativeGetParsedRoutingData();
+        RoutingController.get().setRouterType(data.mRouterType);
+        final RoutePoint from = data.mPoints[0];
+        final RoutePoint to = data.mPoints[1];
+        RoutingController.get().prepare(
+            MapObject.createMapObject(FeatureId.EMPTY, MapObject.API_POINT, from.mName, "", from.mLat, from.mLon),
+            MapObject.createMapObject(FeatureId.EMPTY, MapObject.API_POINT, to.mName, "", to.mLat, to.mLon));
+        return true;
+      case RequestType.SEARCH:
+      {
+        SearchEngine.INSTANCE.cancelInteractiveSearch();
+        final ParsedSearchRequest request = Framework.nativeGetParsedSearchRequest();
+        final double[] latlon = Framework.nativeGetParsedCenterLatLon();
+        if (latlon != null)
         {
-          SearchEngine.INSTANCE.cancelInteractiveSearch();
-          final ParsedSearchRequest request = Framework.nativeGetParsedSearchRequest();
-          final double[] latlon = Framework.nativeGetParsedCenterLatLon();
-          if (latlon != null)
-          {
-            Framework.nativeStopLocationFollow();
-            Framework.nativeSetViewportCenter(latlon[0], latlon[1], SEARCH_IN_VIEWPORT_ZOOM);
-            // We need to update viewport for search api manually because of drape engine
-            // will not notify subscribers when search activity is shown.
-            if (!request.mIsSearchOnMap)
-              Framework.nativeSetSearchViewport(latlon[0], latlon[1], SEARCH_IN_VIEWPORT_ZOOM);
-          }
-          SearchActivity.start(target, request.mQuery, request.mLocale, request.mIsSearchOnMap);
-          return true;
+          Framework.nativeStopLocationFollow();
+          Framework.nativeSetViewportCenter(latlon[0], latlon[1], SEARCH_IN_VIEWPORT_ZOOM);
+          // We need to update viewport for search api manually because of drape engine
+          // will not notify subscribers when search activity is shown.
+          if (!request.mIsSearchOnMap)
+            Framework.nativeSetSearchViewport(latlon[0], latlon[1], SEARCH_IN_VIEWPORT_ZOOM);
         }
-        case RequestType.CROSSHAIR:
+        SearchActivity.start(target, request.mQuery, request.mLocale, request.mIsSearchOnMap);
+        return true;
+      }
+      case RequestType.CROSSHAIR:
+      {
+        SearchEngine.INSTANCE.cancelInteractiveSearch();
+        target.showPositionChooserForAPI(Framework.nativeGetParsedAppName());
+
+        final double[] latlon = Framework.nativeGetParsedCenterLatLon();
+        if (latlon != null)
         {
-          SearchEngine.INSTANCE.cancelInteractiveSearch();
-          target.showPositionChooserForAPI(Framework.nativeGetParsedAppName());
-
-          final double[] latlon = Framework.nativeGetParsedCenterLatLon();
-          if (latlon != null)
-          {
-            Framework.nativeStopLocationFollow();
-            Framework.nativeSetViewportCenter(latlon[0], latlon[1], SEARCH_IN_VIEWPORT_ZOOM);
-          }
-
-          return true;
-        }
-        case RequestType.OAUTH2:
-        {
-          SearchEngine.INSTANCE.cancelInteractiveSearch();
-
-          final String oauth2code = Framework.nativeGetParsedOAuth2Code();
-          OsmLoginActivity.OAuth2Callback(target, oauth2code);
-
-          return true;
+          Framework.nativeStopLocationFollow();
+          Framework.nativeSetViewportCenter(latlon[0], latlon[1], SEARCH_IN_VIEWPORT_ZOOM);
         }
 
-        // Menu and Settings url types should be implemented to support deeplinking.
-        case RequestType.MENU:
-        case RequestType.SETTINGS:
+        return true;
+      }
+      case RequestType.OAUTH2:
+      {
+        SearchEngine.INSTANCE.cancelInteractiveSearch();
+
+        final String oauth2code = Framework.nativeGetParsedOAuth2Code();
+        OsmLoginActivity.OAuth2Callback(target, oauth2code);
+
+        return true;
+      }
+
+      // Menu and Settings url types should be implemented to support deeplinking.
+      case RequestType.MENU:
+      case RequestType.SETTINGS:
       }
 
       return false;
diff --git a/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java b/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java
index 4cdd7fdca..a8b06d26c 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/LayerBottomSheetItem.java
@@ -42,26 +42,26 @@ public class LayerBottomSheetItem
     int buttonTextResource = R.string.layers_title;
     switch (mode)
     {
-      case OUTDOORS:
-        disabledResource = R.attr.outdoorsMenuDisabled;
-        enabledResource = R.attr.outdoorsMenuEnabled;
-        buttonTextResource = R.string.button_layer_outdoor;
-        break;
-      case SUBWAY:
-        disabledResource = R.attr.subwayMenuDisabled;
-        enabledResource = R.attr.subwayMenuEnabled;
-        buttonTextResource = R.string.subway;
-        break;
-      case ISOLINES:
-        disabledResource = R.attr.isoLinesMenuDisabled;
-        enabledResource = R.attr.isoLinesMenuEnabled;
-        buttonTextResource = R.string.button_layer_isolines;
-        break;
-      case TRAFFIC:
-        disabledResource = R.attr.trafficMenuDisabled;
-        enabledResource = R.attr.trafficMenuEnabled;
-        buttonTextResource = R.string.button_layer_traffic;
-        break;
+    case OUTDOORS:
+      disabledResource = R.attr.outdoorsMenuDisabled;
+      enabledResource = R.attr.outdoorsMenuEnabled;
+      buttonTextResource = R.string.button_layer_outdoor;
+      break;
+    case SUBWAY:
+      disabledResource = R.attr.subwayMenuDisabled;
+      enabledResource = R.attr.subwayMenuEnabled;
+      buttonTextResource = R.string.subway;
+      break;
+    case ISOLINES:
+      disabledResource = R.attr.isoLinesMenuDisabled;
+      enabledResource = R.attr.isoLinesMenuEnabled;
+      buttonTextResource = R.string.button_layer_isolines;
+      break;
+    case TRAFFIC:
+      disabledResource = R.attr.trafficMenuDisabled;
+      enabledResource = R.attr.trafficMenuEnabled;
+      buttonTextResource = R.string.button_layer_traffic;
+      break;
     }
     int disabled = ThemeUtils.getResource(mContext, disabledResource);
     int enabled = ThemeUtils.getResource(mContext, enabledResource);
diff --git a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
index 9dd0e4380..200ac7082 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
@@ -230,21 +230,21 @@ public class MapButtonsController extends Fragment
       return;
     switch (button)
     {
-      case zoom: UiUtils.showIf(show && Config.showZoomButtons(), buttonView); break;
-      case toggleMapLayer:
-        if (mToggleMapLayerButton != null)
-          UiUtils.showIf(show && !isInNavigationMode(), mToggleMapLayerButton);
-        break;
-      case myPosition:
-        if (mNavMyPosition != null)
-          mNavMyPosition.showButton(show);
-        break;
-      case search: mSearchWheel.show(show);
-      case bookmarks:
-      case menu: UiUtils.showIf(show, buttonView); break;
-      case trackRecordingStatus:
-        UiUtils.showIf(show, buttonView);
-        animateIconBlinking(show, (FloatingActionButton) buttonView);
+    case zoom: UiUtils.showIf(show && Config.showZoomButtons(), buttonView); break;
+    case toggleMapLayer:
+      if (mToggleMapLayerButton != null)
+        UiUtils.showIf(show && !isInNavigationMode(), mToggleMapLayerButton);
+      break;
+    case myPosition:
+      if (mNavMyPosition != null)
+        mNavMyPosition.showButton(show);
+      break;
+    case search: mSearchWheel.show(show);
+    case bookmarks:
+    case menu: UiUtils.showIf(show, buttonView); break;
+    case trackRecordingStatus:
+      UiUtils.showIf(show, buttonView);
+      animateIconBlinking(show, (FloatingActionButton) buttonView);
     }
   }
 
diff --git a/android/app/src/main/java/app/organicmaps/routing/ManageRouteAdapter.java b/android/app/src/main/java/app/organicmaps/routing/ManageRouteAdapter.java
index bf7f32769..b86032375 100644
--- a/android/app/src/main/java/app/organicmaps/routing/ManageRouteAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/routing/ManageRouteAdapter.java
@@ -11,14 +11,14 @@ import android.view.ViewGroup;
 import androidx.annotation.NonNull;
 import androidx.appcompat.content.res.AppCompatResources;
 import androidx.recyclerview.widget.RecyclerView;
-import com.google.android.material.imageview.ShapeableImageView;
-import com.google.android.material.textview.MaterialTextView;
 import app.organicmaps.R;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
 import app.organicmaps.sdk.routing.RouteMarkData;
 import app.organicmaps.sdk.routing.RouteMarkType;
 import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.sdk.util.UiUtils;
+import com.google.android.material.imageview.ShapeableImageView;
+import com.google.android.material.textview.MaterialTextView;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -63,26 +63,26 @@ public class ManageRouteAdapter extends RecyclerView.Adapter<ManageRouteAdapter.
 
     switch (mRoutePoints.get(position).mPointType)
     {
-      case Start: // Starting point.
-        if (mRoutePoints.get(position).mIsMyPosition)
-          iconId = R.drawable.ic_location_arrow_blue;
-        else
-          iconId = R.drawable.route_point_start;
-        break;
+    case Start: // Starting point.
+      if (mRoutePoints.get(position).mIsMyPosition)
+        iconId = R.drawable.ic_location_arrow_blue;
+      else
+        iconId = R.drawable.route_point_start;
+      break;
 
-      case Intermediate: // Intermediate stop.
-        TypedArray iconArray = mContext.getResources().obtainTypedArray(R.array.route_stop_icons);
-        iconId = iconArray.getResourceId(mRoutePoints.get(position).mIntermediateIndex, R.drawable.route_point_20);
-        iconArray.recycle();
-        break;
+    case Intermediate: // Intermediate stop.
+      TypedArray iconArray = mContext.getResources().obtainTypedArray(R.array.route_stop_icons);
+      iconId = iconArray.getResourceId(mRoutePoints.get(position).mIntermediateIndex, R.drawable.route_point_20);
+      iconArray.recycle();
+      break;
 
-      case Finish: // Destination point.
-        iconId = R.drawable.route_point_finish;
-        break;
+    case Finish: // Destination point.
+      iconId = R.drawable.route_point_finish;
+      break;
 
-      default: // Unknown route type.
-        iconId = R.drawable.warning_icon;
-        break;
+    default: // Unknown route type.
+      iconId = R.drawable.warning_icon;
+      break;
     }
 
     // Set icon widget.
diff --git a/android/app/src/main/java/app/organicmaps/routing/ResultCodesHelper.java b/android/app/src/main/java/app/organicmaps/routing/ResultCodesHelper.java
index b06255377..0bfb7d4cb 100644
--- a/android/app/src/main/java/app/organicmaps/routing/ResultCodesHelper.java
+++ b/android/app/src/main/java/app/organicmaps/routing/ResultCodesHelper.java
@@ -23,76 +23,76 @@ public class ResultCodesHelper
     int cancelBtnResId = android.R.string.cancel;
     switch (errorCode)
     {
-      case ResultCodes.NO_POSITION:
-        if (!MwmApplication.from(context).getLocationHelper().isActive())
-        {
-          titleRes = R.string.dialog_routing_location_turn_on;
-          messages.add(resources.getString(R.string.dialog_routing_location_unknown_turn_on));
-        }
-        else
-        {
-          titleRes = R.string.dialog_routing_check_gps;
-          messages.add(resources.getString(R.string.dialog_routing_error_location_not_found));
-          messages.add(resources.getString(R.string.dialog_routing_location_turn_wifi));
-        }
-        break;
-      case ResultCodes.INCONSISTENT_MWM_ROUTE:
-      case ResultCodes.ROUTING_FILE_NOT_EXIST:
+    case ResultCodes.NO_POSITION:
+      if (!MwmApplication.from(context).getLocationHelper().isActive())
+      {
+        titleRes = R.string.dialog_routing_location_turn_on;
+        messages.add(resources.getString(R.string.dialog_routing_location_unknown_turn_on));
+      }
+      else
+      {
+        titleRes = R.string.dialog_routing_check_gps;
+        messages.add(resources.getString(R.string.dialog_routing_error_location_not_found));
+        messages.add(resources.getString(R.string.dialog_routing_location_turn_wifi));
+      }
+      break;
+    case ResultCodes.INCONSISTENT_MWM_ROUTE:
+    case ResultCodes.ROUTING_FILE_NOT_EXIST:
+      titleRes = R.string.routing_download_maps_along;
+      messages.add(resources.getString(R.string.routing_requires_all_map));
+      break;
+    case ResultCodes.START_POINT_NOT_FOUND:
+      titleRes = R.string.dialog_routing_change_start;
+      messages.add(resources.getString(R.string.dialog_routing_start_not_determined));
+      messages.add(resources.getString(R.string.dialog_routing_select_closer_start));
+      break;
+    case ResultCodes.END_POINT_NOT_FOUND:
+      titleRes = R.string.dialog_routing_change_end;
+      messages.add(resources.getString(R.string.dialog_routing_end_not_determined));
+      messages.add(resources.getString(R.string.dialog_routing_select_closer_end));
+      break;
+    case ResultCodes.INTERMEDIATE_POINT_NOT_FOUND:
+      titleRes = R.string.dialog_routing_change_intermediate;
+      messages.add(resources.getString(R.string.dialog_routing_intermediate_not_determined));
+      break;
+    case ResultCodes.DIFFERENT_MWM:
+      messages.add(resources.getString(R.string.routing_failed_cross_mwm_building));
+      break;
+    case ResultCodes.FILE_TOO_OLD:
+      titleRes = R.string.downloader_update_maps;
+      messages.add(resources.getString(R.string.downloader_mwm_migration_dialog));
+      break;
+    case ResultCodes.TRANSIT_ROUTE_NOT_FOUND_NO_NETWORK:
+      messages.add(resources.getString(R.string.transit_not_found));
+      break;
+    case ResultCodes.TRANSIT_ROUTE_NOT_FOUND_TOO_LONG_PEDESTRIAN:
+      titleRes = R.string.dialog_pedestrian_route_is_long_header;
+      messages.add(resources.getString(R.string.dialog_pedestrian_route_is_long_message));
+      cancelBtnResId = R.string.ok;
+      break;
+    case ResultCodes.ROUTE_NOT_FOUND:
+    case ResultCodes.ROUTE_NOT_FOUND_REDRESS_ROUTE_ERROR:
+      if (missingCount == 0)
+      {
+        titleRes = R.string.dialog_routing_unable_locate_route;
+        messages.add(resources.getString(R.string.dialog_routing_cant_build_route));
+        messages.add(resources.getString(R.string.dialog_routing_change_start_or_end));
+      }
+      else
+      {
         titleRes = R.string.routing_download_maps_along;
         messages.add(resources.getString(R.string.routing_requires_all_map));
-        break;
-      case ResultCodes.START_POINT_NOT_FOUND:
-        titleRes = R.string.dialog_routing_change_start;
-        messages.add(resources.getString(R.string.dialog_routing_start_not_determined));
-        messages.add(resources.getString(R.string.dialog_routing_select_closer_start));
-        break;
-      case ResultCodes.END_POINT_NOT_FOUND:
-        titleRes = R.string.dialog_routing_change_end;
-        messages.add(resources.getString(R.string.dialog_routing_end_not_determined));
-        messages.add(resources.getString(R.string.dialog_routing_select_closer_end));
-        break;
-      case ResultCodes.INTERMEDIATE_POINT_NOT_FOUND:
-        titleRes = R.string.dialog_routing_change_intermediate;
-        messages.add(resources.getString(R.string.dialog_routing_intermediate_not_determined));
-        break;
-      case ResultCodes.DIFFERENT_MWM:
-        messages.add(resources.getString(R.string.routing_failed_cross_mwm_building));
-        break;
-      case ResultCodes.FILE_TOO_OLD:
-        titleRes = R.string.downloader_update_maps;
-        messages.add(resources.getString(R.string.downloader_mwm_migration_dialog));
-        break;
-      case ResultCodes.TRANSIT_ROUTE_NOT_FOUND_NO_NETWORK:
-        messages.add(resources.getString(R.string.transit_not_found));
-        break;
-      case ResultCodes.TRANSIT_ROUTE_NOT_FOUND_TOO_LONG_PEDESTRIAN:
-        titleRes = R.string.dialog_pedestrian_route_is_long_header;
-        messages.add(resources.getString(R.string.dialog_pedestrian_route_is_long_message));
-        cancelBtnResId = R.string.ok;
-        break;
-      case ResultCodes.ROUTE_NOT_FOUND:
-      case ResultCodes.ROUTE_NOT_FOUND_REDRESS_ROUTE_ERROR:
-        if (missingCount == 0)
-        {
-          titleRes = R.string.dialog_routing_unable_locate_route;
-          messages.add(resources.getString(R.string.dialog_routing_cant_build_route));
-          messages.add(resources.getString(R.string.dialog_routing_change_start_or_end));
-        }
-        else
-        {
-          titleRes = R.string.routing_download_maps_along;
-          messages.add(resources.getString(R.string.routing_requires_all_map));
-        }
-        break;
-      case ResultCodes.INTERNAL_ERROR:
-        titleRes = R.string.dialog_routing_system_error;
-        messages.add(resources.getString(R.string.dialog_routing_application_error));
-        messages.add(resources.getString(R.string.dialog_routing_try_again));
-        break;
-      case ResultCodes.NEED_MORE_MAPS:
-        titleRes = R.string.dialog_routing_download_and_build_cross_route;
-        messages.add(resources.getString(R.string.dialog_routing_download_cross_route));
-        break;
+      }
+      break;
+    case ResultCodes.INTERNAL_ERROR:
+      titleRes = R.string.dialog_routing_system_error;
+      messages.add(resources.getString(R.string.dialog_routing_application_error));
+      messages.add(resources.getString(R.string.dialog_routing_try_again));
+      break;
+    case ResultCodes.NEED_MORE_MAPS:
+      titleRes = R.string.dialog_routing_download_and_build_cross_route;
+      messages.add(resources.getString(R.string.dialog_routing_download_cross_route));
+      break;
     }
 
     StringBuilder builder = new StringBuilder();
diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java b/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
index d6242c8df..d9b4b3019 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
@@ -119,10 +119,11 @@ final class RoutingBottomMenuController implements View.OnClickListener
 
   private RoutingBottomMenuController(@NonNull Activity context, @NonNull View altitudeChartFrame,
                                       @NonNull View timeElevationLine, @NonNull View transitFrame,
-                                      @NonNull MaterialTextView error, @NonNull Button start, @NonNull ImageView altitudeChart,
-                                      @NonNull MaterialTextView time, @NonNull MaterialTextView altitudeDifference,
-                                      @NonNull TextView timeVehicle, @Nullable MaterialTextView arrival,
-                                      @NonNull View actionFrame, @Nullable RoutingBottomMenuListener listener)
+                                      @NonNull MaterialTextView error, @NonNull Button start,
+                                      @NonNull ImageView altitudeChart, @NonNull MaterialTextView time,
+                                      @NonNull MaterialTextView altitudeDifference, @NonNull TextView timeVehicle,
+                                      @Nullable MaterialTextView arrival, @NonNull View actionFrame,
+                                      @Nullable RoutingBottomMenuListener listener)
   {
     mContext = context;
     mAltitudeChartFrame = altitudeChartFrame;
diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingErrorDialogFragment.java b/android/app/src/main/java/app/organicmaps/routing/RoutingErrorDialogFragment.java
index dd129000d..2e1b7eebe 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingErrorDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingErrorDialogFragment.java
@@ -13,11 +13,11 @@ import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.FragmentFactory;
 import androidx.fragment.app.FragmentManager;
-import com.google.android.material.textview.MaterialTextView;
 import app.organicmaps.R;
 import app.organicmaps.sdk.downloader.CountryItem;
 import app.organicmaps.sdk.downloader.MapManager;
 import app.organicmaps.sdk.util.UiUtils;
+import com.google.android.material.textview.MaterialTextView;
 
 public class RoutingErrorDialogFragment extends BaseRoutingErrorDialogFragment
 {
diff --git a/android/app/src/main/java/app/organicmaps/sdk/location/SensorHelper.java b/android/app/src/main/java/app/organicmaps/sdk/location/SensorHelper.java
index 22ffd9cfc..7061127a3 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/location/SensorHelper.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/location/SensorHelper.java
@@ -45,16 +45,16 @@ public class SensorHelper implements SensorEventListener
       mLastAccuracy = event.accuracy;
       switch (mLastAccuracy)
       {
-        case SensorManager.SENSOR_STATUS_ACCURACY_HIGH: break;
-        case SensorManager.SENSOR_STATUS_ACCURACY_MEDIUM:
-          for (SensorListener listener : mListeners)
-            listener.onCompassCalibrationRecommended();
-          break;
-        case SensorManager.SENSOR_STATUS_ACCURACY_LOW:
-        case SensorManager.SENSOR_STATUS_UNRELIABLE:
-        default:
-          for (SensorListener listener : mListeners)
-            listener.onCompassCalibrationRequired();
+      case SensorManager.SENSOR_STATUS_ACCURACY_HIGH: break;
+      case SensorManager.SENSOR_STATUS_ACCURACY_MEDIUM:
+        for (SensorListener listener : mListeners)
+          listener.onCompassCalibrationRecommended();
+        break;
+      case SensorManager.SENSOR_STATUS_ACCURACY_LOW:
+      case SensorManager.SENSOR_STATUS_UNRELIABLE:
+      default:
+        for (SensorListener listener : mListeners)
+          listener.onCompassCalibrationRequired();
       }
     }
 
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/RoutePointInfo.java b/android/app/src/main/java/app/organicmaps/sdk/routing/RoutePointInfo.java
index c5997f8e1..67c6800f2 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/routing/RoutePointInfo.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/routing/RoutePointInfo.java
@@ -34,10 +34,10 @@ public final class RoutePointInfo implements Parcelable
   {
     switch (markType)
     {
-      case 0: mMarkType = RouteMarkType.Start; break;
-      case 1: mMarkType = RouteMarkType.Intermediate; break;
-      case 2: mMarkType = RouteMarkType.Finish; break;
-      default: throw new IllegalArgumentException("Mark type is not valid = " + markType);
+    case 0: mMarkType = RouteMarkType.Start; break;
+    case 1: mMarkType = RouteMarkType.Intermediate; break;
+    case 2: mMarkType = RouteMarkType.Finish; break;
+    default: throw new IllegalArgumentException("Mark type is not valid = " + markType);
     }
 
     mIntermediateIndex = intermediateIndex;
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/LocationUtils.java b/android/app/src/main/java/app/organicmaps/sdk/util/LocationUtils.java
index 85d947ec9..e50d9aa93 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/util/LocationUtils.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/util/LocationUtils.java
@@ -28,13 +28,13 @@ public class LocationUtils
     double correction = 0;
     switch (displayOrientation)
     {
-      case Surface.ROTATION_0 ->
-      {
-        return angle;
-      }
-      case Surface.ROTATION_90 -> correction = Math.PI / 2.0;
-      case Surface.ROTATION_180 -> correction = Math.PI;
-      case Surface.ROTATION_270 -> correction = (3.0 * Math.PI / 2.0);
+    case Surface.ROTATION_0 ->
+    {
+      return angle;
+    }
+    case Surface.ROTATION_90 -> correction = Math.PI / 2.0;
+    case Surface.ROTATION_180 -> correction = Math.PI;
+    case Surface.ROTATION_270 -> correction = (3.0 * Math.PI / 2.0);
     }
 
     return correctAngle(angle, correction);
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/log/Logger.java b/android/app/src/main/java/app/organicmaps/sdk/util/log/Logger.java
index 2058e4cb2..edc0c28b9 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/util/log/Logger.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/util/log/Logger.java
@@ -146,11 +146,11 @@ public final class Logger
   {
     switch (level)
     {
-      case Log.VERBOSE: return 'V';
-      case Log.DEBUG: return 'D';
-      case Log.INFO: return 'I';
-      case Log.WARN: return 'W';
-      case Log.ERROR: return 'E';
+    case Log.VERBOSE: return 'V';
+    case Log.DEBUG: return 'D';
+    case Log.INFO: return 'I';
+    case Log.WARN: return 'W';
+    case Log.ERROR: return 'E';
     }
     assert false : "Unknown log level " + level;
     return '_';
diff --git a/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java b/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java
index 7ce6cedfe..acf8095be 100644
--- a/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java
@@ -149,39 +149,39 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
 
       switch (result.description.openNow)
       {
-        case SearchResult.OPEN_NOW_YES ->
+      case SearchResult.OPEN_NOW_YES ->
+      {
+        if (result.description.minutesUntilClosed < 60) // less than 1 hour
         {
-          if (result.description.minutesUntilClosed < 60) // less than 1 hour
-          {
-            final String time = result.description.minutesUntilClosed + " " + resources.getString(R.string.minute);
-            final String string = resources.getString(R.string.closes_in, time);
+          final String time = result.description.minutesUntilClosed + " " + resources.getString(R.string.minute);
+          final String string = resources.getString(R.string.closes_in, time);
 
-            UiUtils.setTextAndShow(mOpen, string);
-            mOpen.setTextColor(ContextCompat.getColor(mSearchFragment.getContext(), R.color.base_yellow));
-          }
-          else
-          {
-            UiUtils.setTextAndShow(mOpen, resources.getString(R.string.editor_time_open));
-            mOpen.setTextColor(ContextCompat.getColor(mSearchFragment.getContext(), R.color.base_green));
-          }
+          UiUtils.setTextAndShow(mOpen, string);
+          mOpen.setTextColor(ContextCompat.getColor(mSearchFragment.getContext(), R.color.base_yellow));
         }
-        case SearchResult.OPEN_NOW_NO ->
+        else
         {
-          if (result.description.minutesUntilOpen < 60) // less than 1 hour
-          {
-            final String time = result.description.minutesUntilOpen + " " + resources.getString(R.string.minute);
-            final String string = resources.getString(R.string.opens_in, time);
-
-            UiUtils.setTextAndShow(mOpen, string);
-            mOpen.setTextColor(ContextCompat.getColor(mSearchFragment.getContext(), R.color.base_red));
-          }
-          else
-          {
-            UiUtils.setTextAndShow(mOpen, resources.getString(R.string.closed));
-            mOpen.setTextColor(ContextCompat.getColor(mSearchFragment.getContext(), R.color.base_red));
-          }
+          UiUtils.setTextAndShow(mOpen, resources.getString(R.string.editor_time_open));
+          mOpen.setTextColor(ContextCompat.getColor(mSearchFragment.getContext(), R.color.base_green));
         }
-        default -> UiUtils.hide(mOpen);
+      }
+      case SearchResult.OPEN_NOW_NO ->
+      {
+        if (result.description.minutesUntilOpen < 60) // less than 1 hour
+        {
+          final String time = result.description.minutesUntilOpen + " " + resources.getString(R.string.minute);
+          final String string = resources.getString(R.string.opens_in, time);
+
+          UiUtils.setTextAndShow(mOpen, string);
+          mOpen.setTextColor(ContextCompat.getColor(mSearchFragment.getContext(), R.color.base_red));
+        }
+        else
+        {
+          UiUtils.setTextAndShow(mOpen, resources.getString(R.string.closed));
+          mOpen.setTextColor(ContextCompat.getColor(mSearchFragment.getContext(), R.color.base_red));
+        }
+      }
+      default -> UiUtils.hide(mOpen);
       }
     }
 
diff --git a/android/app/src/main/java/app/organicmaps/search/SearchHistoryAdapter.java b/android/app/src/main/java/app/organicmaps/search/SearchHistoryAdapter.java
index 368d845a8..506b2757a 100644
--- a/android/app/src/main/java/app/organicmaps/search/SearchHistoryAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/search/SearchHistoryAdapter.java
@@ -49,32 +49,32 @@ class SearchHistoryAdapter extends RecyclerView.Adapter<SearchHistoryAdapter.Vie
 
     switch (type)
     {
-      case TYPE_ITEM:
-        res = new ViewHolder(
-            LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.item_search_recent, viewGroup, false));
-        res.mText.setOnClickListener(v -> mSearchToolbarController.setQuery(res.mText.getText()));
-        break;
+    case TYPE_ITEM:
+      res = new ViewHolder(
+          LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.item_search_recent, viewGroup, false));
+      res.mText.setOnClickListener(v -> mSearchToolbarController.setQuery(res.mText.getText()));
+      break;
 
-      case TYPE_CLEAR:
-        res = new ViewHolder(
-            LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.item_search_clear_history, viewGroup, false));
-        res.mText.setOnClickListener(v -> {
-          SearchRecents.clear();
-          notifyDataSetChanged();
-        });
-        break;
+    case TYPE_CLEAR:
+      res = new ViewHolder(
+          LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.item_search_clear_history, viewGroup, false));
+      res.mText.setOnClickListener(v -> {
+        SearchRecents.clear();
+        notifyDataSetChanged();
+      });
+      break;
 
-      case TYPE_MY_POSITION:
-        res = new ViewHolder(
-            LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.item_search_my_position, viewGroup, false));
-        res.mText.setOnClickListener(v -> {
-          RoutingController.get().onPoiSelected(
-              MwmApplication.from(viewGroup.getContext()).getLocationHelper().getMyPosition());
-          mSearchToolbarController.onUpClick();
-        });
-        break;
+    case TYPE_MY_POSITION:
+      res = new ViewHolder(
+          LayoutInflater.from(viewGroup.getContext()).inflate(R.layout.item_search_my_position, viewGroup, false));
+      res.mText.setOnClickListener(v -> {
+        RoutingController.get().onPoiSelected(
+            MwmApplication.from(viewGroup.getContext()).getLocationHelper().getMyPosition());
+        mSearchToolbarController.onUpClick();
+      });
+      break;
 
-      default: throw new IllegalArgumentException("Unsupported ViewHolder type given");
+    default: throw new IllegalArgumentException("Unsupported ViewHolder type given");
     }
 
     Graphics.tint(res.mText);
diff --git a/android/app/src/main/java/app/organicmaps/settings/VoiceInstructionsSettingsFragment.java b/android/app/src/main/java/app/organicmaps/settings/VoiceInstructionsSettingsFragment.java
index 4e3bea88e..e0e00d130 100644
--- a/android/app/src/main/java/app/organicmaps/settings/VoiceInstructionsSettingsFragment.java
+++ b/android/app/src/main/java/app/organicmaps/settings/VoiceInstructionsSettingsFragment.java
@@ -326,10 +326,10 @@ public class VoiceInstructionsSettingsFragment extends BaseXmlSettingsFragment
     final String ttsLinkText = getString(R.string.prefs_languages_information_off_link);
     final Spannable link = new SpannableString(ttsLinkText + "↗");
     // Set link color.
-    link.setSpan(
-        new ForegroundColorSpan(ContextCompat.getColor(
-            requireContext(), UiUtils.getStyledResourceId(requireContext(), com.google.android.material.R.attr.colorSecondary))),
-        0, ttsLinkText.length(), 0);
+    link.setSpan(new ForegroundColorSpan(ContextCompat.getColor(
+                     requireContext(),
+                     UiUtils.getStyledResourceId(requireContext(), com.google.android.material.R.attr.colorSecondary))),
+                 0, ttsLinkText.length(), 0);
     ttsLangInfoLink.setSummary(link);
 
     final String ttsInfoUrl = requireActivity().getString(R.string.tts_info_link);
diff --git a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
index f5c01d931..6f96fd355 100644
--- a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
+++ b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
@@ -166,9 +166,9 @@ public class NavMenu
 
   public void refreshTts()
   {
-    mTts.setImageDrawable(TtsPlayer.isEnabled()
-                              ? Graphics.tint(mActivity, R.drawable.ic_voice_on, com.google.android.material.R.attr.colorSecondary)
-                              : Graphics.tint(mActivity, R.drawable.ic_voice_off));
+    mTts.setImageDrawable(TtsPlayer.isEnabled() ? Graphics.tint(mActivity, R.drawable.ic_voice_on,
+                                                                com.google.android.material.R.attr.colorSecondary)
+                                                : Graphics.tint(mActivity, R.drawable.ic_voice_off));
   }
 
   private void updateTime(int seconds)
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
index 8ffc5ab53..ac43efb83 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
@@ -156,23 +156,23 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
 
     switch (mType)
     {
-      case TYPE_BOOKMARK ->
-      {
-        mBookmark = BookmarkManager.INSTANCE.getBookmarkInfo(id);
-        if (savedInstanceState != null && savedInstanceState.getParcelable(STATE_ICON) != null)
-          mIcon = savedInstanceState.getParcelable(STATE_ICON);
-        else if (mBookmark != null)
-          mIcon = mBookmark.getIcon();
-        refreshBookmark();
-      }
-      case TYPE_TRACK ->
-      {
-        mTrack = BookmarkManager.INSTANCE.getTrack(id);
-        mColor = mTrack.getColor();
-        if (savedInstanceState != null)
-          mColor = savedInstanceState.getInt(STATE_COLOR, mColor);
-        refreshTrack();
-      }
+    case TYPE_BOOKMARK ->
+    {
+      mBookmark = BookmarkManager.INSTANCE.getBookmarkInfo(id);
+      if (savedInstanceState != null && savedInstanceState.getParcelable(STATE_ICON) != null)
+        mIcon = savedInstanceState.getParcelable(STATE_ICON);
+      else if (mBookmark != null)
+        mIcon = mBookmark.getIcon();
+      refreshBookmark();
+    }
+    case TYPE_TRACK ->
+    {
+      mTrack = BookmarkManager.INSTANCE.getTrack(id);
+      mColor = mTrack.getColor();
+      if (savedInstanceState != null)
+        mColor = savedInstanceState.getInt(STATE_COLOR, mColor);
+      refreshTrack();
+    }
     }
     initToolbar(view);
   }
@@ -210,16 +210,16 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
     final ShapeableImageView imageView = toolbar.findViewById(R.id.save);
     switch (mType)
     {
-      case TYPE_BOOKMARK ->
-      {
-        imageView.setOnClickListener(v -> saveBookmark());
-        toolbar.setTitle(R.string.placepage_edit_bookmark_button);
-      }
-      case TYPE_TRACK ->
-      {
-        imageView.setOnClickListener(v -> saveTrack());
-        toolbar.setTitle(R.string.edit_track);
-      }
+    case TYPE_BOOKMARK ->
+    {
+      imageView.setOnClickListener(v -> saveBookmark());
+      toolbar.setTitle(R.string.placepage_edit_bookmark_button);
+    }
+    case TYPE_TRACK ->
+    {
+      imageView.setOnClickListener(v -> saveTrack());
+      toolbar.setTitle(R.string.edit_track);
+    }
     }
     UiUtils.showHomeUpButton(toolbar);
     toolbar.setNavigationOnClickListener(v -> dismiss());
@@ -319,23 +319,23 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
     dialogFragment.setArguments(args);
     switch (mType)
     {
-      case TYPE_BOOKMARK ->
-        dialogFragment.setOnColorSetListener(colorPos -> {
-          if (mIcon != null && mIcon.getColor() == colorPos)
-            return;
+    case TYPE_BOOKMARK ->
+      dialogFragment.setOnColorSetListener(colorPos -> {
+        if (mIcon != null && mIcon.getColor() == colorPos)
+          return;
 
-          mIcon = new Icon(colorPos, mIcon.getType());
-          refreshColorMarker();
-        });
-      case TYPE_TRACK ->
-        dialogFragment.setOnColorSetListener(colorPos -> {
-          int from = mTrack.getColor();
-          int to = PredefinedColors.getColor(colorPos);
-          if (from == to)
-            return;
-          mColor = to;
-          refreshTrackColor();
-        });
+        mIcon = new Icon(colorPos, mIcon.getType());
+        refreshColorMarker();
+      });
+    case TYPE_TRACK ->
+      dialogFragment.setOnColorSetListener(colorPos -> {
+        int from = mTrack.getColor();
+        int to = PredefinedColors.getColor(colorPos);
+        if (from == to)
+          return;
+        mColor = to;
+        refreshTrackColor();
+      });
     }
 
     dialogFragment.show(requireActivity().getSupportFragmentManager(), null);
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
index c85225f6c..a7751ebf3 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
@@ -414,15 +414,15 @@ public class PlacePageController
   {
     switch (item)
     {
-      case BOOKMARK_SAVE, BOOKMARK_DELETE -> onBookmarkBtnClicked();
-      case BACK -> onBackBtnClicked();
-      case ROUTE_FROM -> onRouteFromBtnClicked();
-      case ROUTE_TO -> onRouteToBtnClicked();
-      case ROUTE_ADD -> onRouteAddBtnClicked();
-      case ROUTE_REMOVE -> onRouteRemoveBtnClicked();
-      case ROUTE_AVOID_TOLL -> onAvoidTollBtnClicked();
-      case ROUTE_AVOID_UNPAVED -> onAvoidUnpavedBtnClicked();
-      case ROUTE_AVOID_FERRY -> onAvoidFerryBtnClicked();
+    case BOOKMARK_SAVE, BOOKMARK_DELETE -> onBookmarkBtnClicked();
+    case BACK -> onBackBtnClicked();
+    case ROUTE_FROM -> onRouteFromBtnClicked();
+    case ROUTE_TO -> onRouteToBtnClicked();
+    case ROUTE_ADD -> onRouteAddBtnClicked();
+    case ROUTE_REMOVE -> onRouteRemoveBtnClicked();
+    case ROUTE_AVOID_TOLL -> onAvoidTollBtnClicked();
+    case ROUTE_AVOID_UNPAVED -> onAvoidUnpavedBtnClicked();
+    case ROUTE_AVOID_FERRY -> onAvoidFerryBtnClicked();
     }
   }
 
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
index 7a41c5e17..7187c253d 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
@@ -478,8 +478,9 @@ public class PlacePageView extends Fragment
       MaterialTextView mTvAddPlace = mAddPlace.findViewById(R.id.tv__editor);
       final int editPlaceButtonColor =
           Editor.nativeShouldEnableEditPlace()
-              ? ContextCompat.getColor(getContext(),
-                                       UiUtils.getStyledResourceId(getContext(), com.google.android.material.R.attr.colorSecondary))
+              ? ContextCompat.getColor(
+                    getContext(),
+                    UiUtils.getStyledResourceId(getContext(), com.google.android.material.R.attr.colorSecondary))
               : getResources().getColor(R.color.button_accent_text_disabled);
       mTvEditPlace.setTextColor(editPlaceButtonColor);
       mTvAddBusiness.setTextColor(editPlaceButtonColor);
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/DownloadResourcesLegacyActivity.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/DownloadResourcesLegacyActivity.cpp
index da1cc89c5..cd23a3a15 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/DownloadResourcesLegacyActivity.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/DownloadResourcesLegacyActivity.cpp
@@ -31,13 +31,13 @@ using namespace std::placeholders;
 
 /// Special error codes to notify GUI about free space
 //@{
-#define ERR_DOWNLOAD_SUCCESS         0
-#define ERR_DISK_ERROR              -1
-#define ERR_NOT_ENOUGH_FREE_SPACE   -2
-#define ERR_STORAGE_DISCONNECTED    -3
-#define ERR_DOWNLOAD_ERROR          -4
-#define ERR_NO_MORE_FILES           -5
-#define ERR_FILE_IN_PROGRESS        -6
+#define ERR_DOWNLOAD_SUCCESS      0
+#define ERR_DISK_ERROR            -1
+#define ERR_NOT_ENOUGH_FREE_SPACE -2
+#define ERR_STORAGE_DISCONNECTED  -3
+#define ERR_DOWNLOAD_ERROR        -4
+#define ERR_NO_MORE_FILES         -5
+#define ERR_FILE_IN_PROGRESS      -6
 //@}
 
 namespace
@@ -52,135 +52,129 @@ static std::shared_ptr<HttpRequest> g_currentRequest;
 
 extern "C"
 {
-  using Callback = HttpRequest::Callback;
+using Callback = HttpRequest::Callback;
 
-  static int HasSpaceForFiles(Platform & pl, std::string const & sdcardPath, size_t fileSize)
+static int HasSpaceForFiles(Platform & pl, std::string const & sdcardPath, size_t fileSize)
+{
+  switch (pl.GetWritableStorageStatus(fileSize))
   {
-    switch (pl.GetWritableStorageStatus(fileSize))
-    {
-      case Platform::STORAGE_DISCONNECTED:
-        return ERR_STORAGE_DISCONNECTED;
+  case Platform::STORAGE_DISCONNECTED: return ERR_STORAGE_DISCONNECTED;
 
-      case Platform::NOT_ENOUGH_SPACE:
-        return ERR_NOT_ENOUGH_FREE_SPACE;
+  case Platform::NOT_ENOUGH_SPACE: return ERR_NOT_ENOUGH_FREE_SPACE;
 
-      default:
-        return static_cast<int>(fileSize);
-    }
-  }
-
-  JNIEXPORT jint JNICALL
-  Java_app_organicmaps_sdk_DownloadResourcesLegacyActivity_nativeGetBytesToDownload(JNIEnv * env, jclass clazz)
-  {
-    // clear all
-    g_filesToDownload.clear();
-    g_totalBytesToDownload = 0;
-    g_totalDownloadedBytes = 0;
-
-    using namespace storage;
-    Storage const & storage = g_framework->GetStorage();
-    auto const status = storage.GetForceDownloadWorlds(g_filesToDownload);
-
-    for (auto const & cf : g_filesToDownload)
-      g_totalBytesToDownload += cf.GetRemoteSize();
-
-    int res;
-    if (status == Storage::WorldStatus::ERROR_CREATE_FOLDER ||
-        status == Storage::WorldStatus::ERROR_MOVE_FILE)
-    {
-      res = ERR_DISK_ERROR;
-    }
-    else
-    {
-      Platform & pl = GetPlatform();
-      res = HasSpaceForFiles(pl, pl.WritableDir(), g_totalBytesToDownload);
-    }
-
-    if (res == ERR_STORAGE_DISCONNECTED)
-      LOG(LWARNING, ("External file system is not available"));
-    else if (res == ERR_NOT_ENOUGH_FREE_SPACE)
-      LOG(LWARNING, ("Not enough space to extract files"));
-
-    g_currentRequest.reset();
-
-    if (status == Storage::WorldStatus::WAS_MOVED)
-    {
-      g_framework->ReloadWorldMaps();
-      res = ERR_DOWNLOAD_SUCCESS;  // reset possible storage error if we moved files
-    }
-
-    return res;
-  }
-
-  static void DownloadFileFinished(std::shared_ptr<jobject> obj, HttpRequest const & req)
-  {
-    auto const status = req.GetStatus();
-    ASSERT_NOT_EQUAL(status, DownloadStatus::InProgress, ());
-
-    int errorCode = ERR_DOWNLOAD_ERROR;
-    if (status == DownloadStatus::Completed)
-      errorCode = ERR_DOWNLOAD_SUCCESS;
-
-    g_currentRequest.reset();
-
-    if (errorCode == ERR_DOWNLOAD_SUCCESS)
-    {
-      auto const & curFile = g_filesToDownload.back();
-      size_t const sz = curFile.GetRemoteSize();
-      LOG(LDEBUG, ("finished downloading", curFile.GetName(), "size", sz, "bytes"));
-
-      g_totalDownloadedBytes += sz;
-      LOG(LDEBUG, ("totalDownloadedBytes:", g_totalDownloadedBytes));
-
-      g_filesToDownload.pop_back();
-    }
-
-    JNIEnv * env = jni::GetEnv();
-
-    jmethodID methodID = jni::GetMethodID(env, *obj, "onFinish", "(I)V");
-    env->CallVoidMethod(*obj, methodID, errorCode);
-  }
-
-  static void DownloadFileProgress(std::shared_ptr<jobject> listener, HttpRequest const & req)
-  {
-    JNIEnv * env = jni::GetEnv();
-    static jmethodID methodID = jni::GetMethodID(env, *listener, "onProgress", "(I)V");
-    env->CallVoidMethod(*listener, methodID, static_cast<jint>(g_totalDownloadedBytes + req.GetProgress().m_bytesDownloaded));
-  }
-
-  JNIEXPORT jint JNICALL
-  Java_app_organicmaps_sdk_DownloadResourcesLegacyActivity_nativeStartNextFileDownload(JNIEnv * env, jclass clazz, jobject listener)
-  {
-    if (g_filesToDownload.empty())
-      return ERR_NO_MORE_FILES;
-
-    /// @todo One downloader instance with cached servers. All this routine will be refactored some time.
-    static auto downloader = storage::GetDownloader();
-    storage::Storage const & storage = g_framework->GetStorage();
-    downloader->SetDataVersion(storage.GetCurrentDataVersion());
-
-    downloader->EnsureMetaConfigReady([&storage, ptr = jni::make_global_ref(listener)]()
-    {
-      auto const & curFile = g_filesToDownload.back();
-      auto const fileName = curFile.GetFileName(MapFileType::Map);
-      LOG(LINFO, ("Downloading file", fileName));
-
-      g_currentRequest.reset(HttpRequest::GetFile(
-          downloader->MakeUrlListLegacy(fileName),
-          storage.GetFilePath(curFile.GetName(), MapFileType::Map),
-          curFile.GetRemoteSize(),
-          std::bind(&DownloadFileFinished, ptr, _1),
-          std::bind(&DownloadFileProgress, ptr, _1),
-          0, false));
-    });
-
-    return ERR_FILE_IN_PROGRESS;
-  }
-
-  JNIEXPORT void JNICALL
-  Java_app_organicmaps_sdk_DownloadResourcesLegacyActivity_nativeCancelCurrentFile(JNIEnv * env, jclass clazz)
-  {
-    LOG(LDEBUG, ("cancelCurrentFile, currentRequest=", g_currentRequest));
-    g_currentRequest.reset();
+  default: return static_cast<int>(fileSize);
   }
 }
+
+JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_DownloadResourcesLegacyActivity_nativeGetBytesToDownload(JNIEnv * env,
+                                                                                                         jclass clazz)
+{
+  // clear all
+  g_filesToDownload.clear();
+  g_totalBytesToDownload = 0;
+  g_totalDownloadedBytes = 0;
+
+  using namespace storage;
+  Storage const & storage = g_framework->GetStorage();
+  auto const status = storage.GetForceDownloadWorlds(g_filesToDownload);
+
+  for (auto const & cf : g_filesToDownload)
+    g_totalBytesToDownload += cf.GetRemoteSize();
+
+  int res;
+  if (status == Storage::WorldStatus::ERROR_CREATE_FOLDER || status == Storage::WorldStatus::ERROR_MOVE_FILE)
+  {
+    res = ERR_DISK_ERROR;
+  }
+  else
+  {
+    Platform & pl = GetPlatform();
+    res = HasSpaceForFiles(pl, pl.WritableDir(), g_totalBytesToDownload);
+  }
+
+  if (res == ERR_STORAGE_DISCONNECTED)
+    LOG(LWARNING, ("External file system is not available"));
+  else if (res == ERR_NOT_ENOUGH_FREE_SPACE)
+    LOG(LWARNING, ("Not enough space to extract files"));
+
+  g_currentRequest.reset();
+
+  if (status == Storage::WorldStatus::WAS_MOVED)
+  {
+    g_framework->ReloadWorldMaps();
+    res = ERR_DOWNLOAD_SUCCESS;  // reset possible storage error if we moved files
+  }
+
+  return res;
+}
+
+static void DownloadFileFinished(std::shared_ptr<jobject> obj, HttpRequest const & req)
+{
+  auto const status = req.GetStatus();
+  ASSERT_NOT_EQUAL(status, DownloadStatus::InProgress, ());
+
+  int errorCode = ERR_DOWNLOAD_ERROR;
+  if (status == DownloadStatus::Completed)
+    errorCode = ERR_DOWNLOAD_SUCCESS;
+
+  g_currentRequest.reset();
+
+  if (errorCode == ERR_DOWNLOAD_SUCCESS)
+  {
+    auto const & curFile = g_filesToDownload.back();
+    size_t const sz = curFile.GetRemoteSize();
+    LOG(LDEBUG, ("finished downloading", curFile.GetName(), "size", sz, "bytes"));
+
+    g_totalDownloadedBytes += sz;
+    LOG(LDEBUG, ("totalDownloadedBytes:", g_totalDownloadedBytes));
+
+    g_filesToDownload.pop_back();
+  }
+
+  JNIEnv * env = jni::GetEnv();
+
+  jmethodID methodID = jni::GetMethodID(env, *obj, "onFinish", "(I)V");
+  env->CallVoidMethod(*obj, methodID, errorCode);
+}
+
+static void DownloadFileProgress(std::shared_ptr<jobject> listener, HttpRequest const & req)
+{
+  JNIEnv * env = jni::GetEnv();
+  static jmethodID methodID = jni::GetMethodID(env, *listener, "onProgress", "(I)V");
+  env->CallVoidMethod(*listener, methodID,
+                      static_cast<jint>(g_totalDownloadedBytes + req.GetProgress().m_bytesDownloaded));
+}
+
+JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_DownloadResourcesLegacyActivity_nativeStartNextFileDownload(
+    JNIEnv * env, jclass clazz, jobject listener)
+{
+  if (g_filesToDownload.empty())
+    return ERR_NO_MORE_FILES;
+
+  /// @todo One downloader instance with cached servers. All this routine will be refactored some time.
+  static auto downloader = storage::GetDownloader();
+  storage::Storage const & storage = g_framework->GetStorage();
+  downloader->SetDataVersion(storage.GetCurrentDataVersion());
+
+  downloader->EnsureMetaConfigReady([&storage, ptr = jni::make_global_ref(listener)]()
+  {
+    auto const & curFile = g_filesToDownload.back();
+    auto const fileName = curFile.GetFileName(MapFileType::Map);
+    LOG(LINFO, ("Downloading file", fileName));
+
+    g_currentRequest.reset(HttpRequest::GetFile(downloader->MakeUrlListLegacy(fileName),
+                                                storage.GetFilePath(curFile.GetName(), MapFileType::Map),
+                                                curFile.GetRemoteSize(), std::bind(&DownloadFileFinished, ptr, _1),
+                                                std::bind(&DownloadFileProgress, ptr, _1), 0, false));
+  });
+
+  return ERR_FILE_IN_PROGRESS;
+}
+
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_DownloadResourcesLegacyActivity_nativeCancelCurrentFile(JNIEnv * env,
+                                                                                                        jclass clazz)
+{
+  LOG(LDEBUG, ("cancelCurrentFile, currentRequest=", g_currentRequest));
+  g_currentRequest.reset();
+}
+}
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.cpp
index 8eed02401..9fb589b4d 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.cpp
@@ -1,7 +1,7 @@
 #include "app/organicmaps/sdk/Framework.hpp"
 
-#include "app/organicmaps/sdk/core/jni_helper.hpp"
 #include "app/organicmaps/sdk/UserMarkHelper.hpp"
+#include "app/organicmaps/sdk/core/jni_helper.hpp"
 #include "app/organicmaps/sdk/opengl/androidoglcontextfactory.hpp"
 #include "app/organicmaps/sdk/platform/AndroidPlatform.hpp"
 #include "app/organicmaps/sdk/routing/JunctionInfo.hpp"
@@ -46,8 +46,8 @@
 #include "platform/local_country_file.hpp"
 #include "platform/local_country_file_utils.hpp"
 #include "platform/locale.hpp"
-#include "platform/location.hpp"
 #include "platform/localization.hpp"
+#include "platform/location.hpp"
 #include "platform/measurement_utils.hpp"
 #include "platform/network_policy.hpp"
 #include "platform/platform.hpp"
@@ -91,7 +91,10 @@ using platform::ToNativeNetworkPolicy;
 
 static_assert(sizeof(int) >= 4, "Size of jint in less than 4 bytes.");
 
-::Framework * frm() { return g_framework->NativeFramework(); }
+::Framework * frm()
+{
+  return g_framework->NativeFramework();
+}
 
 namespace
 {
@@ -108,14 +111,13 @@ namespace android
 
 enum MultiTouchAction
 {
-  MULTITOUCH_UP    =   0x00000001,
-  MULTITOUCH_DOWN  =   0x00000002,
-  MULTITOUCH_MOVE  =   0x00000003,
-  MULTITOUCH_CANCEL =  0x00000004
+  MULTITOUCH_UP = 0x00000001,
+  MULTITOUCH_DOWN = 0x00000002,
+  MULTITOUCH_MOVE = 0x00000003,
+  MULTITOUCH_CANCEL = 0x00000004
 };
 
-Framework::Framework(std::function<void()> && afterMapsLoaded)
-: m_work({} /* params */, false /* loadMaps */)
+Framework::Framework(std::function<void()> && afterMapsLoaded) : m_work({} /* params */, false /* loadMaps */)
 {
   m_work.LoadMapsAsync(std::move(afterMapsLoaded));
 
@@ -187,8 +189,8 @@ bool Framework::CreateDrapeEngine(JNIEnv * env, jobject jSurface, int densityDpi
   int constexpr kMinSdkVersionForVulkan = 26;
   int const sdkVersion = android_get_device_api_level();
   LOG(LINFO, ("Android SDK version in the Drape Engine:", sdkVersion));
-  auto const vulkanForbidden = sdkVersion < kMinSdkVersionForVulkan ||
-                               dp::SupportManager::Instance().IsVulkanForbidden();
+  auto const vulkanForbidden =
+      sdkVersion < kMinSdkVersionForVulkan || dp::SupportManager::Instance().IsVulkanForbidden();
   if (vulkanForbidden)
     LOG(LWARNING, ("Vulkan API is forbidden on this device."));
 
@@ -474,7 +476,10 @@ Storage & Framework::GetStorage()
   return m_work.GetStorage();
 }
 
-DataSource const & Framework::GetDataSource() { return m_work.GetDataSource(); }
+DataSource const & Framework::GetDataSource()
+{
+  return m_work.GetDataSource();
+}
 
 void Framework::ShowNode(CountryId const & idx, bool zoomToDownloadButton)
 {
@@ -504,22 +509,13 @@ void Framework::Touch(int action, Finger const & f1, Finger const & f2, uint8_t
   MultiTouchAction eventType = static_cast<MultiTouchAction>(action);
   df::TouchEvent event;
 
-  switch(eventType)
+  switch (eventType)
   {
-  case MULTITOUCH_DOWN:
-    event.SetTouchType(df::TouchEvent::TOUCH_DOWN);
-    break;
-  case MULTITOUCH_MOVE:
-    event.SetTouchType(df::TouchEvent::TOUCH_MOVE);
-    break;
-  case MULTITOUCH_UP:
-    event.SetTouchType(df::TouchEvent::TOUCH_UP);
-    break;
-  case MULTITOUCH_CANCEL:
-    event.SetTouchType(df::TouchEvent::TOUCH_CANCEL);
-    break;
-  default:
-    return;
+  case MULTITOUCH_DOWN: event.SetTouchType(df::TouchEvent::TOUCH_DOWN); break;
+  case MULTITOUCH_MOVE: event.SetTouchType(df::TouchEvent::TOUCH_MOVE); break;
+  case MULTITOUCH_UP: event.SetTouchType(df::TouchEvent::TOUCH_UP); break;
+  case MULTITOUCH_CANCEL: event.SetTouchType(df::TouchEvent::TOUCH_CANCEL); break;
+  default: return;
   }
 
   df::Touch touch;
@@ -689,7 +685,7 @@ void Framework::SetMyPositionModeListener(location::TMyPositionModeChanged const
 location::EMyPositionMode Framework::GetMyPositionMode() const
 {
   // No need in assertion here, return location::PendingPosition if no engine created.
-  //ASSERT(IsDrapeEngineCreated(), ());
+  // ASSERT(IsDrapeEngineCreated(), ());
 
   return m_work.GetMyPositionMode();
 }
@@ -787,14 +783,14 @@ FeatureID Framework::BuildFeatureId(JNIEnv * env, jobject featureId)
 
 extern "C"
 {
-void CallRoutingListener(shared_ptr<jobject> listener, int errorCode,
-                         storage::CountriesSet const & absentMaps)
+void CallRoutingListener(shared_ptr<jobject> listener, int errorCode, storage::CountriesSet const & absentMaps)
 {
   JNIEnv * env = jni::GetEnv();
   jmethodID const method = jni::GetMethodID(env, *listener, "onRoutingEvent", "(I[Ljava/lang/String;)V");
   ASSERT(method, ());
 
-  env->CallVoidMethod(*listener, method, errorCode, jni::TScopedLocalObjectArrayRef(env, jni::ToJavaStringArray(env, absentMaps)).get());
+  env->CallVoidMethod(*listener, method, errorCode,
+                      jni::TScopedLocalObjectArrayRef(env, jni::ToJavaStringArray(env, absentMaps)).get());
 }
 
 void CallRouteProgressListener(shared_ptr<jobject> listener, float progress)
@@ -804,11 +800,11 @@ void CallRouteProgressListener(shared_ptr<jobject> listener, float progress)
   env->CallVoidMethod(*listener, methodId, progress);
 }
 
-void CallRouteRecommendationListener(shared_ptr<jobject> listener,
-                                     RoutingManager::Recommendation recommendation)
+void CallRouteRecommendationListener(shared_ptr<jobject> listener, RoutingManager::Recommendation recommendation)
 {
   JNIEnv * env = jni::GetEnv();
-  jmethodID const methodId = jni::GetMethodID(env, *listener, "onRecommend", "(Lapp/organicmaps/sdk/routing/RouteRecommendationType;)V");
+  jmethodID const methodId =
+      jni::GetMethodID(env, *listener, "onRecommend", "(Lapp/organicmaps/sdk/routing/RouteRecommendationType;)V");
   env->CallVoidMethod(*listener, methodId, GetRouteRecommendationType(env, recommendation));
 }
 
@@ -822,27 +818,25 @@ void CallSetRoutingLoadPointsListener(shared_ptr<jobject> listener, bool success
 RoutingManager::LoadRouteHandler g_loadRouteHandler;
 
 /// @name JNI EXPORTS
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_Framework_nativeGetAddress(JNIEnv * env, jclass clazz, jdouble lat, jdouble lon)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_Framework_nativeGetAddress(JNIEnv * env, jclass clazz, jdouble lat,
+                                                                              jdouble lon)
 {
   auto const info = frm()->GetAddressAtPoint(mercator::FromLatLon(lat, lon));
   return jni::ToJavaString(env, info.FormatAddress());
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeClearApiPoints(JNIEnv * env, jclass clazz)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeClearApiPoints(JNIEnv * env, jclass clazz)
 {
   frm()->GetBookmarkManager().GetEditSession().ClearGroup(UserMark::Type::API);
 }
 
-JNIEXPORT jint JNICALL
-Java_app_organicmaps_sdk_Framework_nativeParseAndSetApiUrl(JNIEnv * env, jclass clazz, jstring url)
+JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_Framework_nativeParseAndSetApiUrl(JNIEnv * env, jclass clazz,
+                                                                                  jstring url)
 {
   return static_cast<jint>(frm()->ParseAndSetApiURL(jni::ToNativeString(env, url)));
 }
 
-JNIEXPORT jobject JNICALL
-Java_app_organicmaps_sdk_Framework_nativeGetParsedRoutingData(JNIEnv * env, jclass clazz)
+JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_Framework_nativeGetParsedRoutingData(JNIEnv * env, jclass clazz)
 {
   using namespace url_scheme;
   static jclass const pointClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/api/RoutePoint");
@@ -851,23 +845,22 @@ Java_app_organicmaps_sdk_Framework_nativeGetParsedRoutingData(JNIEnv * env, jcla
 
   static jclass const routeDataClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/api/ParsedRoutingData");
   // Java signature : ParsedRoutingData(RoutePoint[] points, int routerType) {
-  static jmethodID const routeDataConstructor = jni::GetConstructorID(env, routeDataClazz, "([Lapp/organicmaps/sdk/api/RoutePoint;I)V");
+  static jmethodID const routeDataConstructor =
+      jni::GetConstructorID(env, routeDataClazz, "([Lapp/organicmaps/sdk/api/RoutePoint;I)V");
 
   auto const & routingData = frm()->GetParsedRoutingData();
-  jobjectArray points = jni::ToJavaArray(env, pointClazz, routingData.m_points,
-                                         [](JNIEnv * env, RoutePoint const & point)
-                                         {
-                                           jni::TScopedLocalRef const name(env, jni::ToJavaString(env, point.m_name));
-                                           return env->NewObject(pointClazz, pointConstructor,
-                                                                 mercator::YToLat(point.m_org.y),
-                                                                 mercator::XToLon(point.m_org.x), name.get());
-                                         });
+  jobjectArray points =
+      jni::ToJavaArray(env, pointClazz, routingData.m_points, [](JNIEnv * env, RoutePoint const & point)
+  {
+    jni::TScopedLocalRef const name(env, jni::ToJavaString(env, point.m_name));
+    return env->NewObject(pointClazz, pointConstructor, mercator::YToLat(point.m_org.y),
+                          mercator::XToLon(point.m_org.x), name.get());
+  });
 
   return env->NewObject(routeDataClazz, routeDataConstructor, points, routingData.m_type);
 }
 
-JNIEXPORT jobject JNICALL
-Java_app_organicmaps_sdk_Framework_nativeGetParsedSearchRequest(JNIEnv * env, jclass clazz)
+JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_Framework_nativeGetParsedSearchRequest(JNIEnv * env, jclass clazz)
 {
   using namespace url_scheme;
   static jclass const cl = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/api/ParsedSearchRequest");
@@ -875,32 +868,29 @@ Java_app_organicmaps_sdk_Framework_nativeGetParsedSearchRequest(JNIEnv * env, jc
   static jmethodID const ctor = jni::GetConstructorID(env, cl, "(Ljava/lang/String;Ljava/lang/String;DDZ)V");
   auto const & r = frm()->GetParsedSearchRequest();
   ms::LatLon const center = frm()->GetParsedCenterLatLon();
-  return env->NewObject(cl, ctor, jni::ToJavaString(env, r.m_query), jni::ToJavaString(env, r.m_locale), center.m_lat, center.m_lon, r.m_isSearchOnMap);
+  return env->NewObject(cl, ctor, jni::ToJavaString(env, r.m_query), jni::ToJavaString(env, r.m_locale), center.m_lat,
+                        center.m_lon, r.m_isSearchOnMap);
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_Framework_nativeGetParsedAppName(JNIEnv * env, jclass)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_Framework_nativeGetParsedAppName(JNIEnv * env, jclass)
 {
   std::string const & appName = frm()->GetParsedAppName();
   return (appName.empty()) ? nullptr : jni::ToJavaString(env, appName);
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_Framework_nativeGetParsedOAuth2Code(JNIEnv * env, jclass)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_Framework_nativeGetParsedOAuth2Code(JNIEnv * env, jclass)
 {
   std::string const & code = frm()->GetParsedOAuth2Code();
   return jni::ToJavaString(env, code);
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_Framework_nativeGetParsedBackUrl(JNIEnv * env, jclass)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_Framework_nativeGetParsedBackUrl(JNIEnv * env, jclass)
 {
   std::string const & backUrl = frm()->GetParsedBackUrl();
   return (backUrl.empty()) ? nullptr : jni::ToJavaString(env, backUrl);
 }
 
-JNIEXPORT jdoubleArray JNICALL
-Java_app_organicmaps_sdk_Framework_nativeGetParsedCenterLatLon(JNIEnv * env, jclass)
+JNIEXPORT jdoubleArray JNICALL Java_app_organicmaps_sdk_Framework_nativeGetParsedCenterLatLon(JNIEnv * env, jclass)
 {
   ms::LatLon const center = frm()->GetParsedCenterLatLon();
   if (!center.IsValid())
@@ -913,21 +903,19 @@ Java_app_organicmaps_sdk_Framework_nativeGetParsedCenterLatLon(JNIEnv * env, jcl
   return jLatLon;
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativePlacePageActivationListener(JNIEnv *env, jclass, jobject jListener)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativePlacePageActivationListener(JNIEnv * env, jclass,
+                                                                                            jobject jListener)
 {
   LOG(LINFO, ("Set global map object listener"));
   g_placePageActivationListener = env->NewGlobalRef(jListener);
   // void onPlacePageActivated(MapObject object);
-  jmethodID const activatedId = jni::GetMethodID(env, g_placePageActivationListener,
-                                                 "onPlacePageActivated",
+  jmethodID const activatedId = jni::GetMethodID(env, g_placePageActivationListener, "onPlacePageActivated",
                                                  "(Lapp/organicmaps/sdk/widget/placepage/PlacePageData;)V");
   // void onPlacePageDeactivated();
-  jmethodID const deactivateId = jni::GetMethodID(env, g_placePageActivationListener,
-                                                  "onPlacePageDeactivated", "()V");
+  jmethodID const deactivateId = jni::GetMethodID(env, g_placePageActivationListener, "onPlacePageDeactivated", "()V");
   // void onPlacePageDeactivated();
-  jmethodID const switchFullscreenId = jni::GetMethodID(env, g_placePageActivationListener,
-                                                        "onSwitchFullScreenMode", "()V");
+  jmethodID const switchFullscreenId =
+      jni::GetMethodID(env, g_placePageActivationListener, "onSwitchFullScreenMode", "()V");
   auto const fillPlacePage = [activatedId]()
   {
     JNIEnv * env = jni::GetEnv();
@@ -960,8 +948,8 @@ Java_app_organicmaps_sdk_Framework_nativePlacePageActivationListener(JNIEnv *env
   frm()->SetPlacePageListeners(fillPlacePage, closePlacePage, fillPlacePage, switchFullscreen);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeRemovePlacePageActivationListener(JNIEnv *env, jclass, jobject jListener)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeRemovePlacePageActivationListener(JNIEnv * env, jclass,
+                                                                                                  jobject jListener)
 {
   if (g_placePageActivationListener == nullptr)
     return;
@@ -975,8 +963,9 @@ Java_app_organicmaps_sdk_Framework_nativeRemovePlacePageActivationListener(JNIEn
   g_placePageActivationListener = nullptr;
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_Framework_nativeGetGe0Url(JNIEnv * env, jclass, jdouble lat, jdouble lon, jdouble zoomLevel, jstring name)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_Framework_nativeGetGe0Url(JNIEnv * env, jclass, jdouble lat,
+                                                                             jdouble lon, jdouble zoomLevel,
+                                                                             jstring name)
 {
   ::Framework * fr = frm();
   double const scale = (zoomLevel > 0 ? zoomLevel : fr->GetDrawScale());
@@ -984,8 +973,9 @@ Java_app_organicmaps_sdk_Framework_nativeGetGe0Url(JNIEnv * env, jclass, jdouble
   return jni::ToJavaString(env, url);
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_Framework_nativeGetGeoUri(JNIEnv * env, jclass, jdouble lat, jdouble lon, jdouble zoomLevel, jstring name)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_Framework_nativeGetGeoUri(JNIEnv * env, jclass, jdouble lat,
+                                                                             jdouble lon, jdouble zoomLevel,
+                                                                             jstring name)
 {
   ::Framework * fr = frm();
   double const scale = (zoomLevel > 0 ? zoomLevel : fr->GetDrawScale());
@@ -993,9 +983,10 @@ Java_app_organicmaps_sdk_Framework_nativeGetGeoUri(JNIEnv * env, jclass, jdouble
   return jni::ToJavaString(env, url);
 }
 
-JNIEXPORT jobject JNICALL
-Java_app_organicmaps_sdk_Framework_nativeGetDistanceAndAzimuth(
-    JNIEnv * env, jclass, jdouble merX, jdouble merY, jdouble cLat, jdouble cLon, jdouble north)
+JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_Framework_nativeGetDistanceAndAzimuth(JNIEnv * env, jclass,
+                                                                                         jdouble merX, jdouble merY,
+                                                                                         jdouble cLat, jdouble cLon,
+                                                                                         jdouble north)
 {
   platform::Distance distance;
   double azimut = -1.0;
@@ -1005,13 +996,10 @@ Java_app_organicmaps_sdk_Framework_nativeGetDistanceAndAzimuth(
   // Java signature : DistanceAndAzimut(Distance distance, double azimuth)
   static jmethodID const methodID = jni::GetConstructorID(env, daClazz, "(Lapp/organicmaps/sdk/util/Distance;D)V");
 
-  return env->NewObject(daClazz, methodID,
-                        ToJavaDistance(env, distance),
-                        static_cast<jdouble>(azimut));
+  return env->NewObject(daClazz, methodID, ToJavaDistance(env, distance), static_cast<jdouble>(azimut));
 }
 
-JNIEXPORT jobject JNICALL
-Java_app_organicmaps_sdk_Framework_nativeGetDistanceAndAzimuthFromLatLon(
+JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_Framework_nativeGetDistanceAndAzimuthFromLatLon(
     JNIEnv * env, jclass clazz, jdouble lat, jdouble lon, jdouble cLat, jdouble cLon, jdouble north)
 {
   double const merY = mercator::LatToY(lat);
@@ -1019,51 +1007,49 @@ Java_app_organicmaps_sdk_Framework_nativeGetDistanceAndAzimuthFromLatLon(
   return Java_app_organicmaps_sdk_Framework_nativeGetDistanceAndAzimuth(env, clazz, merX, merY, cLat, cLon, north);
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_Framework_nativeFormatLatLon(JNIEnv * env, jclass, jdouble lat, jdouble lon, int coordsFormat)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_Framework_nativeFormatLatLon(JNIEnv * env, jclass, jdouble lat,
+                                                                                jdouble lon, int coordsFormat)
 {
   switch (static_cast<android::CoordinatesFormat>(coordsFormat))
   {
-    default:
-    case android::CoordinatesFormat::LatLonDMS: // DMS, comma separated
-      return jni::ToJavaString(env, measurement_utils::FormatLatLonAsDMS(lat, lon, true /*withComma*/, 2));
-    case android::CoordinatesFormat::LatLonDecimal: // Decimal, comma separated
-      return jni::ToJavaString(env, measurement_utils::FormatLatLon(lat, lon, true /* withComma */, 6));
-    case android::CoordinatesFormat::OLCFull: // Open location code, long format
-      return jni::ToJavaString(env, openlocationcode::Encode({lat, lon}));
-    case android::CoordinatesFormat::OSMLink: // Link to osm.org
-      return jni::ToJavaString(env, measurement_utils::FormatOsmLink(lat, lon, 14));
-    case android::CoordinatesFormat::UTM:  // Universal Transverse Mercator
-    {
-      string utmFormat = utm_mgrs_utils::FormatUTM(lat, lon);
-      if (!utmFormat.empty())
-        return jni::ToJavaString(env, utmFormat);
-      else
-        return nullptr;
-    }
-    case android::CoordinatesFormat::MGRS: // Military Grid Reference System
-    {
-      string mgrsFormat = utm_mgrs_utils::FormatMGRS(lat, lon, 5);
-      if (!mgrsFormat.empty())
-         return jni::ToJavaString(env, mgrsFormat);
-      else
-         return nullptr;
-    }
+  default:
+  case android::CoordinatesFormat::LatLonDMS:  // DMS, comma separated
+    return jni::ToJavaString(env, measurement_utils::FormatLatLonAsDMS(lat, lon, true /*withComma*/, 2));
+  case android::CoordinatesFormat::LatLonDecimal:  // Decimal, comma separated
+    return jni::ToJavaString(env, measurement_utils::FormatLatLon(lat, lon, true /* withComma */, 6));
+  case android::CoordinatesFormat::OLCFull:  // Open location code, long format
+    return jni::ToJavaString(env, openlocationcode::Encode({lat, lon}));
+  case android::CoordinatesFormat::OSMLink:  // Link to osm.org
+    return jni::ToJavaString(env, measurement_utils::FormatOsmLink(lat, lon, 14));
+  case android::CoordinatesFormat::UTM:  // Universal Transverse Mercator
+  {
+    string utmFormat = utm_mgrs_utils::FormatUTM(lat, lon);
+    if (!utmFormat.empty())
+      return jni::ToJavaString(env, utmFormat);
+    else
+      return nullptr;
+  }
+  case android::CoordinatesFormat::MGRS:  // Military Grid Reference System
+  {
+    string mgrsFormat = utm_mgrs_utils::FormatMGRS(lat, lon, 5);
+    if (!mgrsFormat.empty())
+      return jni::ToJavaString(env, mgrsFormat);
+    else
+      return nullptr;
+  }
   }
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_Framework_nativeFormatAltitude(JNIEnv * env, jclass, jdouble alt)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_Framework_nativeFormatAltitude(JNIEnv * env, jclass, jdouble alt)
 {
   return jni::ToJavaString(env, platform::Distance::FormatAltitude(alt));
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_Framework_nativeFormatSpeed(JNIEnv * env, jclass, jdouble speed)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_Framework_nativeFormatSpeed(JNIEnv * env, jclass, jdouble speed)
 {
   auto const units = measurement_utils::GetMeasurementUnits();
-  return jni::ToJavaString(env, measurement_utils::FormatSpeedNumeric(speed, units) + " " +
-                                platform::GetLocalizedSpeedUnits(units));
+  return jni::ToJavaString(
+      env, measurement_utils::FormatSpeedNumeric(speed, units) + " " + platform::GetLocalizedSpeedUnits(units));
 }
 
 /*
@@ -1106,26 +1092,22 @@ Java_app_organicmaps_sdk_Framework_nativeUpdateSavedDataVersion(JNIEnv * env, jc
 }
 */
 
-JNIEXPORT jlong JNICALL
-Java_app_organicmaps_sdk_Framework_nativeGetDataVersion(JNIEnv * env, jclass)
+JNIEXPORT jlong JNICALL Java_app_organicmaps_sdk_Framework_nativeGetDataVersion(JNIEnv * env, jclass)
 {
   return frm()->GetCurrentDataVersion();
 }
 
-JNIEXPORT jint JNICALL
-Java_app_organicmaps_sdk_Framework_nativeGetDrawScale(JNIEnv * env, jclass)
+JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_Framework_nativeGetDrawScale(JNIEnv * env, jclass)
 {
   return static_cast<jint>(frm()->GetDrawScale());
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativePokeSearchInViewport(JNIEnv * env, jclass)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativePokeSearchInViewport(JNIEnv * env, jclass)
 {
   frm()->GetSearchAPI().PokeSearchInViewport();
 }
 
-JNIEXPORT jdoubleArray JNICALL
-Java_app_organicmaps_sdk_Framework_nativeGetScreenRectCenter(JNIEnv * env, jclass)
+JNIEXPORT jdoubleArray JNICALL Java_app_organicmaps_sdk_Framework_nativeGetScreenRectCenter(JNIEnv * env, jclass)
 {
   m2::PointD const center = frm()->GetViewportCenter();
 
@@ -1136,65 +1118,53 @@ Java_app_organicmaps_sdk_Framework_nativeGetScreenRectCenter(JNIEnv * env, jclas
   return jLatLon;
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeShowTrackRect(JNIEnv * env, jclass, jlong track)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeShowTrackRect(JNIEnv * env, jclass, jlong track)
 {
   frm()->ShowTrack(static_cast<kml::TrackId>(track));
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeSaveRoute(JNIEnv *, jclass)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSaveRoute(JNIEnv *, jclass)
 {
   frm()->SaveRoute();
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_Framework_nativeGetBookmarkDir(JNIEnv * env, jclass)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_Framework_nativeGetBookmarkDir(JNIEnv * env, jclass)
 {
   return jni::ToJavaString(env, GetPlatform().SettingsDir().c_str());
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_Framework_nativeGetWritableDir(JNIEnv * env, jclass)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_Framework_nativeGetWritableDir(JNIEnv * env, jclass)
 {
   return jni::ToJavaString(env, GetPlatform().WritableDir().c_str());
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_Framework_nativeGetSettingsDir(JNIEnv * env, jclass)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_Framework_nativeGetSettingsDir(JNIEnv * env, jclass)
 {
   return jni::ToJavaString(env, GetPlatform().SettingsDir().c_str());
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_Framework_nativeGetDataFileExt(JNIEnv * env, jclass)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_Framework_nativeGetDataFileExt(JNIEnv * env, jclass)
 {
   return jni::ToJavaString(env, DATA_FILE_EXTENSION);
 }
 
-JNIEXPORT jobjectArray JNICALL
-Java_app_organicmaps_sdk_Framework_nativeGetMovableFilesExts(JNIEnv * env, jclass)
+JNIEXPORT jobjectArray JNICALL Java_app_organicmaps_sdk_Framework_nativeGetMovableFilesExts(JNIEnv * env, jclass)
 {
-  vector<string> exts = { DATA_FILE_EXTENSION, FONT_FILE_EXTENSION };
+  vector<string> exts = {DATA_FILE_EXTENSION, FONT_FILE_EXTENSION};
   platform::CountryIndexes::GetIndexesExts(exts);
   return jni::ToJavaStringArray(env, exts);
 }
 
-JNIEXPORT jobjectArray JNICALL
-Java_app_organicmaps_sdk_Framework_nativeGetBookmarksFilesExts(JNIEnv * env, jclass)
+JNIEXPORT jobjectArray JNICALL Java_app_organicmaps_sdk_Framework_nativeGetBookmarksFilesExts(JNIEnv * env, jclass)
 {
   static std::array<std::string, 4> const kBookmarkExtensions = {
-    std::string{kKmzExtension},
-    std::string{kKmlExtension},
-    std::string{kKmbExtension},
-    std::string{kGpxExtension}
-  };
+      std::string{kKmzExtension}, std::string{kKmlExtension}, std::string{kKmbExtension}, std::string{kGpxExtension}};
 
   return jni::ToJavaStringArray(env, kBookmarkExtensions);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeChangeWritableDir(JNIEnv * env, jclass, jstring jNewPath)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeChangeWritableDir(JNIEnv * env, jclass,
+                                                                                  jstring jNewPath)
 {
   string newPath = jni::ToNativeString(env, jNewPath);
   g_framework->RemoveLocalMaps();
@@ -1202,56 +1172,48 @@ Java_app_organicmaps_sdk_Framework_nativeChangeWritableDir(JNIEnv * env, jclass,
   g_framework->AddLocalMaps();
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_Framework_nativeIsRoutingActive(JNIEnv * env, jclass)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_Framework_nativeIsRoutingActive(JNIEnv * env, jclass)
 {
   return frm()->GetRoutingManager().IsRoutingActive();
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_Framework_nativeIsRouteBuilding(JNIEnv * env, jclass)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_Framework_nativeIsRouteBuilding(JNIEnv * env, jclass)
 {
   return frm()->GetRoutingManager().IsRouteBuilding();
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_Framework_nativeIsRouteBuilt(JNIEnv * env, jclass)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_Framework_nativeIsRouteBuilt(JNIEnv * env, jclass)
 {
   return frm()->GetRoutingManager().IsRouteBuilt();
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeCloseRouting(JNIEnv * env, jclass)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeCloseRouting(JNIEnv * env, jclass)
 {
   frm()->GetRoutingManager().CloseRouting(true /* remove route points */);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeBuildRoute(JNIEnv * env, jclass)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeBuildRoute(JNIEnv * env, jclass)
 {
   frm()->GetRoutingManager().BuildRoute();
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeRemoveRoute(JNIEnv * env, jclass)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeRemoveRoute(JNIEnv * env, jclass)
 {
   frm()->GetRoutingManager().RemoveRoute(false /* deactivateFollowing */);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeFollowRoute(JNIEnv * env, jclass)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeFollowRoute(JNIEnv * env, jclass)
 {
   frm()->GetRoutingManager().FollowRoute();
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeDisableFollowing(JNIEnv * env, jclass)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeDisableFollowing(JNIEnv * env, jclass)
 {
   frm()->GetRoutingManager().DisableFollowMode();
 }
 
-JNIEXPORT jobjectArray JNICALL
-Java_app_organicmaps_sdk_Framework_nativeGenerateNotifications(JNIEnv * env, jclass, jboolean announceStreets)
+JNIEXPORT jobjectArray JNICALL Java_app_organicmaps_sdk_Framework_nativeGenerateNotifications(JNIEnv * env, jclass,
+                                                                                              jboolean announceStreets)
 {
   ::Framework * fr = frm();
   if (!fr->GetRoutingManager().IsRoutingActive())
@@ -1265,21 +1227,17 @@ Java_app_organicmaps_sdk_Framework_nativeGenerateNotifications(JNIEnv * env, jcl
   return jni::ToJavaStringArray(env, notifications);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeSetSpeedCamManagerMode(JNIEnv * env, jclass, jint mode)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSetSpeedCamManagerMode(JNIEnv * env, jclass, jint mode)
 {
-  frm()->GetRoutingManager().GetSpeedCamManager().SetMode(
-    static_cast<routing::SpeedCameraManagerMode>(mode));
+  frm()->GetRoutingManager().GetSpeedCamManager().SetMode(static_cast<routing::SpeedCameraManagerMode>(mode));
 }
 
-JNIEXPORT jint JNICALL
-Java_app_organicmaps_sdk_Framework_nativeGetSpeedCamManagerMode(JNIEnv * env, jclass)
+JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_Framework_nativeGetSpeedCamManagerMode(JNIEnv * env, jclass)
 {
   return static_cast<jint>(frm()->GetRoutingManager().GetSpeedCamManager().GetMode());
 }
 
-JNIEXPORT jobject JNICALL
-Java_app_organicmaps_sdk_Framework_nativeGetRouteFollowingInfo(JNIEnv * env, jclass)
+JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_Framework_nativeGetRouteFollowingInfo(JNIEnv * env, jclass)
 {
   RoutingManager & rm = frm()->GetRoutingManager();
   if (!rm.IsRoutingActive())
@@ -1293,8 +1251,7 @@ Java_app_organicmaps_sdk_Framework_nativeGetRouteFollowingInfo(JNIEnv * env, jcl
   return CreateRoutingInfo(env, info, rm);
 }
 
-JNIEXPORT jobjectArray JNICALL
-Java_app_organicmaps_sdk_Framework_nativeGetRouteJunctionPoints(JNIEnv * env, jclass)
+JNIEXPORT jobjectArray JNICALL Java_app_organicmaps_sdk_Framework_nativeGetRouteJunctionPoints(JNIEnv * env, jclass)
 {
   vector<geometry::PointWithAltitude> junctionPoints;
   if (!frm()->GetRoutingManager().RoutingSession().GetRouteJunctionPoints(junctionPoints))
@@ -1306,8 +1263,8 @@ Java_app_organicmaps_sdk_Framework_nativeGetRouteJunctionPoints(JNIEnv * env, jc
   return CreateJunctionInfoArray(env, junctionPoints);
 }
 
-JNIEXPORT jintArray JNICALL
-Java_app_organicmaps_sdk_Framework_nativeGenerateRouteAltitudeChartBits(JNIEnv * env, jclass, jint width, jint height, jobject routeAltitudeLimits)
+JNIEXPORT jintArray JNICALL Java_app_organicmaps_sdk_Framework_nativeGenerateRouteAltitudeChartBits(
+    JNIEnv * env, jclass, jint width, jint height, jobject routeAltitudeLimits)
 {
   RoutingManager::DistanceAltitude altitudes;
   if (!frm()->GetRoutingManager().GetRouteAltitudesAndDistancesM(altitudes))
@@ -1354,11 +1311,13 @@ Java_app_organicmaps_sdk_Framework_nativeGenerateRouteAltitudeChartBits(JNIEnv *
   ASSERT(totalDescentField, ());
   env->SetIntField(routeAltitudeLimits, totalDescentField, static_cast<jint>(totalDescent));
 
-  static jfieldID const totalAscentStringField = env->GetFieldID(routeAltitudeLimitsClass, "totalAscentString", "Ljava/lang/String;");
+  static jfieldID const totalAscentStringField =
+      env->GetFieldID(routeAltitudeLimitsClass, "totalAscentString", "Ljava/lang/String;");
   ASSERT(totalAscentStringField, ());
   env->SetObjectField(routeAltitudeLimits, totalAscentStringField, totalAscentString.get());
 
-  static jfieldID const totalDescentStringField = env->GetFieldID(routeAltitudeLimitsClass, "totalDescentString", "Ljava/lang/String;");
+  static jfieldID const totalDescentStringField =
+      env->GetFieldID(routeAltitudeLimitsClass, "totalDescentString", "Ljava/lang/String;");
   ASSERT(totalDescentStringField, ());
   env->SetObjectField(routeAltitudeLimits, totalDescentStringField, totalDescentString.get());
 
@@ -1367,12 +1326,14 @@ Java_app_organicmaps_sdk_Framework_nativeGenerateRouteAltitudeChartBits(JNIEnv *
   env->SetBooleanField(routeAltitudeLimits, isMetricUnitsField, units == Units::Metric);
 
   size_t const imageRGBADataSize = imageRGBAData.size();
-  ASSERT_NOT_EQUAL(imageRGBADataSize, 0, ("GenerateRouteAltitudeChart returns true but the vector with altitude image bits is empty."));
+  ASSERT_NOT_EQUAL(imageRGBADataSize, 0,
+                   ("GenerateRouteAltitudeChart returns true but the vector with altitude image bits is empty."));
 
   size_t const pxlCount = width * height;
   if (maps::kAltitudeChartBPP * pxlCount != imageRGBADataSize)
   {
-    LOG(LWARNING, ("Wrong size of vector with altitude image bits. Expected size:", pxlCount, ". Real size:", imageRGBADataSize));
+    LOG(LWARNING,
+        ("Wrong size of vector with altitude image bits. Expected size:", pxlCount, ". Real size:", imageRGBADataSize));
     return nullptr;
   }
 
@@ -1384,54 +1345,51 @@ Java_app_organicmaps_sdk_Framework_nativeGenerateRouteAltitudeChartBits(JNIEnv *
   for (size_t i = 0; i < pxlCount; ++i)
   {
     size_t const shiftInBytes = i * maps::kAltitudeChartBPP;
-    // Type of |imageRGBAData| elements is uint8_t. But uint8_t is promoted to unsinged int in code below before shifting.
-    // So there's no data lost in code below.
+    // Type of |imageRGBAData| elements is uint8_t. But uint8_t is promoted to unsinged int in code below before
+    // shifting. So there's no data lost in code below.
     arrayElements[i] = (imageRGBAData[shiftInBytes + 3] << 24) /* alpha */
-        | (imageRGBAData[shiftInBytes] << 16) /* red */
-        | (imageRGBAData[shiftInBytes + 1] << 8) /* green */
-        | (imageRGBAData[shiftInBytes + 2]); /* blue */
+                     | (imageRGBAData[shiftInBytes] << 16)     /* red */
+                     | (imageRGBAData[shiftInBytes + 1] << 8)  /* green */
+                     | (imageRGBAData[shiftInBytes + 2]);      /* blue */
   }
   env->ReleaseIntArrayElements(imageRGBADataArray, arrayElements, 0);
 
   return imageRGBADataArray;
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeShowCountry(JNIEnv * env, jclass, jstring countryId, jboolean zoomToDownloadButton)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeShowCountry(JNIEnv * env, jclass, jstring countryId,
+                                                                            jboolean zoomToDownloadButton)
 {
-  g_framework->ShowNode(jni::ToNativeString(env, countryId), (bool) zoomToDownloadButton);
+  g_framework->ShowNode(jni::ToNativeString(env, countryId), (bool)zoomToDownloadButton);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeSetRoutingListener(JNIEnv * env, jclass, jobject listener)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSetRoutingListener(JNIEnv * env, jclass,
+                                                                                   jobject listener)
 {
   CHECK(g_framework, ("Framework isn't created yet!"));
   frm()->GetRoutingManager().SetRouteBuildingListener(
-      [rf = jni::make_global_ref(listener)](routing::RouterResultCode e, storage::CountriesSet const & countries) {
-        CallRoutingListener(rf, static_cast<int>(e), countries);
-      });
+      [rf = jni::make_global_ref(listener)](routing::RouterResultCode e, storage::CountriesSet const & countries)
+  { CallRoutingListener(rf, static_cast<int>(e), countries); });
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeSetRouteProgressListener(JNIEnv * env, jclass, jobject listener)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSetRouteProgressListener(JNIEnv * env, jclass,
+                                                                                         jobject listener)
 {
   CHECK(g_framework, ("Framework isn't created yet!"));
   frm()->GetRoutingManager().SetRouteProgressListener(
       bind(&CallRouteProgressListener, jni::make_global_ref(listener), _1));
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeSetRoutingRecommendationListener(JNIEnv * env, jclass,
-                                                                          jobject listener)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSetRoutingRecommendationListener(JNIEnv * env, jclass,
+                                                                                                 jobject listener)
 {
   CHECK(g_framework, ("Framework isn't created yet!"));
   frm()->GetRoutingManager().SetRouteRecommendationListener(
       bind(&CallRouteRecommendationListener, jni::make_global_ref(listener), _1));
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeSetRoutingLoadPointsListener(
-        JNIEnv *, jclass, jobject listener)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSetRoutingLoadPointsListener(JNIEnv *, jclass,
+                                                                                             jobject listener)
 {
   CHECK(g_framework, ("Framework isn't created yet!"));
   if (listener != nullptr)
@@ -1440,25 +1398,20 @@ Java_app_organicmaps_sdk_Framework_nativeSetRoutingLoadPointsListener(
     g_loadRouteHandler = nullptr;
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeDeactivatePopup(JNIEnv * env, jclass)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeDeactivatePopup(JNIEnv * env, jclass)
 {
   return g_framework->DeactivatePopup();
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeDeactivateMapSelectionCircle(JNIEnv * env, jclass, jboolean restoreViewport)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeDeactivateMapSelectionCircle(JNIEnv * env, jclass,
+                                                                                             jboolean restoreViewport)
 {
   return g_framework->DeactivateMapSelectionCircle(restoreViewport);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeAddRoutePoint(JNIEnv * env, jclass, jstring title,
-                                                       jstring subtitle, jobject markType,
-                                                       jint intermediateIndex,
-                                                       jboolean isMyPosition,
-                                                       jdouble lat, jdouble lon,
-                                                       jboolean reorderIntermediatePoints)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeAddRoutePoint(
+    JNIEnv * env, jclass, jstring title, jstring subtitle, jobject markType, jint intermediateIndex,
+    jboolean isMyPosition, jdouble lat, jdouble lon, jboolean reorderIntermediatePoints)
 {
   RouteMarkData data;
   data.m_title = jni::ToNativeString(env, title);
@@ -1471,65 +1424,58 @@ Java_app_organicmaps_sdk_Framework_nativeAddRoutePoint(JNIEnv * env, jclass, jst
   frm()->GetRoutingManager().AddRoutePoint(std::move(data), reorderIntermediatePoints);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeRemoveRoutePoints(JNIEnv * env, jclass)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeRemoveRoutePoints(JNIEnv * env, jclass)
 {
   frm()->GetRoutingManager().RemoveRoutePoints();
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeRemoveRoutePoint(JNIEnv * env, jclass, jobject markType, jint intermediateIndex)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeRemoveRoutePoint(JNIEnv * env, jclass, jobject markType,
+                                                                                 jint intermediateIndex)
 {
-  frm()->GetRoutingManager().RemoveRoutePoint(GetRouteMarkType(env, markType),
-                                              static_cast<size_t>(intermediateIndex));
+  frm()->GetRoutingManager().RemoveRoutePoint(GetRouteMarkType(env, markType), static_cast<size_t>(intermediateIndex));
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeRemoveIntermediateRoutePoints(JNIEnv * env, jclass)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeRemoveIntermediateRoutePoints(JNIEnv * env, jclass)
 {
   frm()->GetRoutingManager().RemoveIntermediateRoutePoints();
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_Framework_nativeCouldAddIntermediatePoint(JNIEnv * env, jclass)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_Framework_nativeCouldAddIntermediatePoint(JNIEnv * env, jclass)
 {
   return frm()->GetRoutingManager().CouldAddIntermediatePoint();
 }
 
-JNIEXPORT jobjectArray JNICALL
-Java_app_organicmaps_sdk_Framework_nativeGetRoutePoints(JNIEnv * env, jclass)
+JNIEXPORT jobjectArray JNICALL Java_app_organicmaps_sdk_Framework_nativeGetRoutePoints(JNIEnv * env, jclass)
 {
   return CreateRouteMarkDataArray(env, frm()->GetRoutingManager().GetRoutePoints());
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeMoveRoutePoint(JNIEnv * env, jclass,
-                                                    jint currentIndex, jint targetIndex)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeMoveRoutePoint(JNIEnv * env, jclass, jint currentIndex,
+                                                                               jint targetIndex)
 {
   frm()->GetRoutingManager().MoveRoutePoint(currentIndex, targetIndex);
 }
 
-JNIEXPORT jobject JNICALL
-Java_app_organicmaps_sdk_Framework_nativeGetTransitRouteInfo(JNIEnv * env, jclass)
+JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_Framework_nativeGetTransitRouteInfo(JNIEnv * env, jclass)
 {
   return CreateTransitRouteInfo(env, frm()->GetRoutingManager().GetTransitRouteInfo());
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeReloadWorldMaps(JNIEnv * env, jclass)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeReloadWorldMaps(JNIEnv * env, jclass)
 {
   g_framework->ReloadWorldMaps();
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_Framework_nativeIsDayTime(JNIEnv * env, jclass, jlong utcTimeSeconds, jdouble lat, jdouble lon)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_Framework_nativeIsDayTime(JNIEnv * env, jclass,
+                                                                              jlong utcTimeSeconds, jdouble lat,
+                                                                              jdouble lon)
 {
   DayTimeType const dt = GetDayTime(static_cast<time_t>(utcTimeSeconds), lat, lon);
   return (dt == DayTimeType::Day || dt == DayTimeType::PolarDay);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeSet3dMode(JNIEnv * env, jclass, jboolean allow, jboolean allowBuildings)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSet3dMode(JNIEnv * env, jclass, jboolean allow,
+                                                                          jboolean allowBuildings)
 {
   bool const allow3d = static_cast<bool>(allow);
   bool const allow3dBuildings = static_cast<bool>(allowBuildings);
@@ -1538,8 +1484,7 @@ Java_app_organicmaps_sdk_Framework_nativeSet3dMode(JNIEnv * env, jclass, jboolea
   g_framework->Set3dMode(allow3d, allow3dBuildings);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeGet3dMode(JNIEnv * env, jclass, jobject result)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeGet3dMode(JNIEnv * env, jclass, jobject result)
 {
   bool enabled;
   bool buildings;
@@ -1554,73 +1499,68 @@ Java_app_organicmaps_sdk_Framework_nativeGet3dMode(JNIEnv * env, jclass, jobject
   env->SetBooleanField(result, buildingsField, buildings);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeSetAutoZoomEnabled(JNIEnv * env, jclass, jboolean enabled)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSetAutoZoomEnabled(JNIEnv * env, jclass,
+                                                                                   jboolean enabled)
 {
   bool const autoZoomEnabled = static_cast<bool>(enabled);
   frm()->SaveAutoZoom(autoZoomEnabled);
   frm()->AllowAutoZoom(autoZoomEnabled);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeSetTransitSchemeEnabled(JNIEnv * env, jclass, jboolean enabled)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSetTransitSchemeEnabled(JNIEnv * env, jclass,
+                                                                                        jboolean enabled)
 {
   frm()->GetTransitManager().EnableTransitSchemeMode(static_cast<bool>(enabled));
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_Framework_nativeIsTransitSchemeEnabled(JNIEnv * env, jclass)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_Framework_nativeIsTransitSchemeEnabled(JNIEnv * env, jclass)
 {
   return static_cast<jboolean>(frm()->LoadTransitSchemeEnabled());
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeSetIsolinesLayerEnabled(JNIEnv * env, jclass, jboolean enabled)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSetIsolinesLayerEnabled(JNIEnv * env, jclass,
+                                                                                        jboolean enabled)
 {
   auto const isolinesEnabled = static_cast<bool>(enabled);
   frm()->GetIsolinesManager().SetEnabled(isolinesEnabled);
   frm()->SaveIsolinesEnabled(isolinesEnabled);
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_Framework_nativeIsIsolinesLayerEnabled(JNIEnv * env, jclass)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_Framework_nativeIsIsolinesLayerEnabled(JNIEnv * env, jclass)
 {
   return static_cast<jboolean>(frm()->LoadIsolinesEnabled());
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeSetOutdoorsLayerEnabled(JNIEnv * env, jclass, jboolean enabled)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSetOutdoorsLayerEnabled(JNIEnv * env, jclass,
+                                                                                        jboolean enabled)
 {
   frm()->SaveOutdoorsEnabled(enabled);
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_Framework_nativeIsOutdoorsLayerEnabled(JNIEnv * env, jclass)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_Framework_nativeIsOutdoorsLayerEnabled(JNIEnv * env, jclass)
 {
   return static_cast<jboolean>(frm()->LoadOutdoorsEnabled());
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeSaveSettingSchemeEnabled(JNIEnv * env, jclass, jboolean enabled)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSaveSettingSchemeEnabled(JNIEnv * env, jclass,
+                                                                                         jboolean enabled)
 {
   frm()->SaveTransitSchemeEnabled(static_cast<bool>(enabled));
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_Framework_nativeGetAutoZoomEnabled(JNIEnv *, jclass)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_Framework_nativeGetAutoZoomEnabled(JNIEnv *, jclass)
 {
   return frm()->LoadAutoZoom();
 }
 
 // static void nativeZoomToPoint(double lat, double lon, int zoom, boolean animate);
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeZoomToPoint(JNIEnv * env, jclass, jdouble lat, jdouble lon, jint zoom, jboolean animate)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeZoomToPoint(JNIEnv * env, jclass, jdouble lat,
+                                                                            jdouble lon, jint zoom, jboolean animate)
 {
   g_framework->Scale(m2::PointD(mercator::FromLatLon(lat, lon)), zoom, animate);
 }
 
-JNIEXPORT jobject JNICALL
-Java_app_organicmaps_sdk_Framework_nativeDeleteBookmarkFromMapObject(JNIEnv * env, jclass)
+JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_Framework_nativeDeleteBookmarkFromMapObject(JNIEnv * env, jclass)
 {
   if (!frm()->HasPlacePageInfo())
     return nullptr;
@@ -1638,8 +1578,7 @@ Java_app_organicmaps_sdk_Framework_nativeDeleteBookmarkFromMapObject(JNIEnv * en
   return usermark_helper::CreateMapObject(env, g_framework->GetPlacePageInfo());
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_Framework_nativeGetPoiContactUrl(JNIEnv *env, jclass, jint id)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_Framework_nativeGetPoiContactUrl(JNIEnv * env, jclass, jint id)
 {
   auto const metaID = static_cast<osm::MapObject::MetadataID>(id);
   string_view const value = g_framework->GetPlacePageInfo().GetMetadata(metaID);
@@ -1648,15 +1587,13 @@ Java_app_organicmaps_sdk_Framework_nativeGetPoiContactUrl(JNIEnv *env, jclass, j
   return jni::ToJavaString(env, value);
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_Framework_nativeIsDownloadedMapAtScreenCenter(JNIEnv *, jclass)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_Framework_nativeIsDownloadedMapAtScreenCenter(JNIEnv *, jclass)
 {
   ::Framework * fr = frm();
   return storage::IsPointCoveredByDownloadedMaps(fr->GetViewportCenter(), fr->GetStorage(), fr->GetCountryInfoGetter());
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_Framework_nativeGetActiveObjectFormattedCuisine(JNIEnv * env, jclass)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_Framework_nativeGetActiveObjectFormattedCuisine(JNIEnv * env, jclass)
 {
   ::Framework * frm = g_framework->NativeFramework();
   if (!frm->HasPlacePageInfo())
@@ -1665,76 +1602,65 @@ Java_app_organicmaps_sdk_Framework_nativeGetActiveObjectFormattedCuisine(JNIEnv
   return jni::ToJavaString(env, g_framework->GetPlacePageInfo().FormatCuisines());
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeSetVisibleRect(JNIEnv * env, jclass, jint left, jint top, jint right, jint bottom)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSetVisibleRect(JNIEnv * env, jclass, jint left,
+                                                                               jint top, jint right, jint bottom)
 {
   frm()->SetVisibleViewport(m2::RectD(left, top, right, bottom));
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_Framework_nativeIsRouteFinished(JNIEnv * env, jclass)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_Framework_nativeIsRouteFinished(JNIEnv * env, jclass)
 {
   return frm()->GetRoutingManager().IsRouteFinished();
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeRunFirstLaunchAnimation(JNIEnv * env, jclass)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeRunFirstLaunchAnimation(JNIEnv * env, jclass)
 {
   frm()->RunFirstLaunchAnimation();
 }
 
-JNIEXPORT jint JNICALL
-Java_app_organicmaps_sdk_Framework_nativeOpenRoutePointsTransaction(JNIEnv * env, jclass)
+JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_Framework_nativeOpenRoutePointsTransaction(JNIEnv * env, jclass)
 {
   return frm()->GetRoutingManager().OpenRoutePointsTransaction();
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeApplyRoutePointsTransaction(JNIEnv * env, jclass,
-                                                                     jint transactionId)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeApplyRoutePointsTransaction(JNIEnv * env, jclass,
+                                                                                            jint transactionId)
 {
   frm()->GetRoutingManager().ApplyRoutePointsTransaction(transactionId);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeCancelRoutePointsTransaction(JNIEnv * env, jclass,
-                                                                      jint transactionId)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeCancelRoutePointsTransaction(JNIEnv * env, jclass,
+                                                                                             jint transactionId)
 {
   frm()->GetRoutingManager().CancelRoutePointsTransaction(transactionId);
 }
 
-JNIEXPORT jint JNICALL
-Java_app_organicmaps_sdk_Framework_nativeInvalidRoutePointsTransactionId(JNIEnv * env, jclass)
+JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_Framework_nativeInvalidRoutePointsTransactionId(JNIEnv * env, jclass)
 {
   return frm()->GetRoutingManager().InvalidRoutePointsTransactionId();
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_Framework_nativeHasSavedRoutePoints(JNIEnv *, jclass)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_Framework_nativeHasSavedRoutePoints(JNIEnv *, jclass)
 {
   return frm()->GetRoutingManager().HasSavedRoutePoints();
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeLoadRoutePoints(JNIEnv *, jclass)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeLoadRoutePoints(JNIEnv *, jclass)
 {
   frm()->GetRoutingManager().LoadRoutePoints(g_loadRouteHandler);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeSaveRoutePoints(JNIEnv *, jclass)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSaveRoutePoints(JNIEnv *, jclass)
 {
   frm()->GetRoutingManager().SaveRoutePoints();
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeDeleteSavedRoutePoints(JNIEnv *, jclass)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeDeleteSavedRoutePoints(JNIEnv *, jclass)
 {
   frm()->GetRoutingManager().DeleteSavedRoutePoints();
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeShowFeature(JNIEnv * env, jclass, jobject featureId)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeShowFeature(JNIEnv * env, jclass, jobject featureId)
 {
   auto const f = g_framework->BuildFeatureId(env, featureId);
 
@@ -1742,63 +1668,54 @@ Java_app_organicmaps_sdk_Framework_nativeShowFeature(JNIEnv * env, jclass, jobje
     frm()->ShowFeature(f);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeMakeCrash(JNIEnv *env, jclass type)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeMakeCrash(JNIEnv * env, jclass type)
 {
   CHECK(false, ("Diagnostic native crash!"));
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeSetPowerManagerFacility(JNIEnv *, jclass,
-                                                                 jint facilityType, jboolean state)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSetPowerManagerFacility(JNIEnv *, jclass,
+                                                                                        jint facilityType,
+                                                                                        jboolean state)
 {
-  frm()->GetPowerManager().SetFacility(static_cast<power_management::Facility>(facilityType),
-                                       static_cast<bool>(state));
+  frm()->GetPowerManager().SetFacility(static_cast<power_management::Facility>(facilityType), static_cast<bool>(state));
 }
 
-JNIEXPORT jint JNICALL
-Java_app_organicmaps_sdk_Framework_nativeGetPowerManagerScheme(JNIEnv *, jclass)
+JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_Framework_nativeGetPowerManagerScheme(JNIEnv *, jclass)
 {
   return static_cast<jint>(frm()->GetPowerManager().GetScheme());
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeSetPowerManagerScheme(JNIEnv *, jclass, jint schemeType)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSetPowerManagerScheme(JNIEnv *, jclass, jint schemeType)
 {
   frm()->GetPowerManager().SetScheme(static_cast<power_management::Scheme>(schemeType));
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeSetViewportCenter(JNIEnv *, jclass, jdouble lat, jdouble lon, jint zoom)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSetViewportCenter(JNIEnv *, jclass, jdouble lat,
+                                                                                  jdouble lon, jint zoom)
 {
   // isAnim = true because of previous nativeSetChoosePositionMode animations.
   frm()->SetViewportCenter(mercator::FromLatLon(lat, lon), static_cast<int>(zoom), true /* isAnim */);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeStopLocationFollow(JNIEnv *, jclass)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeStopLocationFollow(JNIEnv *, jclass)
 {
   frm()->StopLocationFollow();
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeSetSearchViewport(JNIEnv *, jclass, jdouble lat,
-                                                           jdouble lon, jint zoom)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeSetSearchViewport(JNIEnv *, jclass, jdouble lat,
+                                                                                  jdouble lon, jint zoom)
 {
-  auto const center = mercator::FromLatLon(static_cast<double>(lat),
-                                           static_cast<double>(lon));
+  auto const center = mercator::FromLatLon(static_cast<double>(lat), static_cast<double>(lon));
   auto const rect = df::GetRectForDrawScale(static_cast<int>(zoom), center);
   frm()->GetSearchAPI().OnViewportChanged(rect);
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_Framework_nativeHasPlacePageInfo(JNIEnv *, jclass)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_Framework_nativeHasPlacePageInfo(JNIEnv *, jclass)
 {
   return static_cast<jboolean>(frm()->HasPlacePageInfo());
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Framework_nativeMemoryWarning(JNIEnv *, jclass)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativeMemoryWarning(JNIEnv *, jclass)
 {
   return frm()->MemoryWarning();
 }
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.hpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.hpp
index debc312c8..1531c0924 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.hpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.hpp
@@ -10,9 +10,8 @@
 
 #include "drape_frontend/gui/skin.hpp"
 
-#include "drape/pointers.hpp"
 #include "drape/graphics_context_factory.hpp"
-
+#include "drape/pointers.hpp"
 
 #include "indexer/feature_decl.hpp"
 #include "indexer/map_style.hpp"
@@ -39,184 +38,176 @@ struct EverywhereSearchParams;
 
 namespace android
 {
-  enum CoordinatesFormat // See Java enum app.organicmaps.widget.placepage.CoordinatesFormat for all possible values.
+enum CoordinatesFormat  // See Java enum app.organicmaps.widget.placepage.CoordinatesFormat for all possible values.
+{
+  LatLonDMS = 0,      // Latitude, Longitude in degrees minutes seconds format, comma separated
+  LatLonDecimal = 1,  // Latitude, Longitude in decimal format, comma separated
+  OLCFull = 2,        // Open location code, full format
+  OSMLink = 3,        // Link to the OSM. E.g. https://osm.org/go/xcXjyqQlq-?m=
+  UTM = 4,            // Universal Transverse Mercator
+  MGRS = 5            // Military Grid Reference System
+};
+
+// Keep in sync `public @interface ChoosePositionMode`in Framework.java.
+enum class ChoosePositionMode
+{
+  None = 0,
+  Editor = 1,
+  Api = 2,
+};
+
+class Framework : private power_management::PowerManager::Subscriber
+{
+private:
+  drape_ptr<dp::ThreadSafeFactory> m_oglContextFactory;
+  drape_ptr<dp::GraphicsContextFactory> m_vulkanContextFactory;
+  ::Framework m_work;
+
+  math::LowPassVector<float, 3> m_sensors[2];
+  double m_lastCompass = 0;
+
+  std::string m_searchQuery;
+
+  std::map<gui::EWidget, gui::Position> m_guiPositions;
+
+  void TrafficStateChanged(TrafficManager::TrafficState state);
+  void TransitSchemeStateChanged(TransitReadManager::TransitSchemeState state);
+  void IsolinesSchemeStateChanged(IsolinesManager::IsolinesState state);
+
+  void MyPositionModeChanged(location::EMyPositionMode mode, bool routingActive);
+
+  location::TMyPositionModeChanged m_myPositionModeSignal;
+
+  TrafficManager::TrafficStateChangedFn m_onTrafficStateChangedFn;
+  TransitReadManager::TransitStateChangedFn m_onTransitStateChangedFn;
+  IsolinesManager::IsolinesStateChangedFn m_onIsolinesStateChangedFn;
+
+  ChoosePositionMode m_isChoosePositionMode = ChoosePositionMode::None;
+  bool m_isSurfaceDestroyed = false;
+
+public:
+  Framework(std::function<void()> && afterMapsLoaded);
+
+  storage::Storage & GetStorage();
+  DataSource const & GetDataSource();
+
+  void ShowNode(storage::CountryId const & countryId, bool zoomToDownloadButton);
+
+  void OnLocationError(int /* == location::TLocationStatus*/ newStatus);
+  void OnLocationUpdated(location::GpsInfo const & info);
+  void OnCompassUpdated(location::CompassInfo const & info, bool forceRedraw);
+
+  bool CreateDrapeEngine(JNIEnv * env, jobject jSurface, int densityDpi, bool firstLaunch, bool launchByDeepLink,
+                         uint32_t appVersionCode, bool isCustomROM);
+  bool IsDrapeEngineCreated() const;
+  void UpdateDpi(int dpi);
+  bool DestroySurfaceOnDetach();
+  void DetachSurface(bool destroySurface);
+  bool AttachSurface(JNIEnv * env, jobject jSurface);
+  void PauseSurfaceRendering();
+  void ResumeSurfaceRendering();
+
+  void SetMapStyle(MapStyle mapStyle);
+  void MarkMapStyle(MapStyle mapStyle);
+  MapStyle GetMapStyle() const;
+
+  void SetupMeasurementSystem();
+
+  RoutingManager & GetRoutingManager() { return m_work.GetRoutingManager(); }
+  void SetRouter(routing::RouterType type) { m_work.GetRoutingManager().SetRouter(type); }
+  routing::RouterType GetRouter() const { return m_work.GetRoutingManager().GetRouter(); }
+  routing::RouterType GetLastUsedRouter() const { return m_work.GetRoutingManager().GetLastUsedRouter(); }
+
+  void Resize(JNIEnv * env, jobject jSurface, int w, int h);
+
+  struct Finger
   {
-    LatLonDMS = 0,     // Latitude, Longitude in degrees minutes seconds format, comma separated
-    LatLonDecimal = 1, // Latitude, Longitude in decimal format, comma separated
-    OLCFull = 2,       // Open location code, full format
-    OSMLink = 3,       // Link to the OSM. E.g. https://osm.org/go/xcXjyqQlq-?m=
-    UTM = 4,           // Universal Transverse Mercator
-    MGRS = 5           // Military Grid Reference System
+    Finger(int64_t id, float x, float y) : m_id(id), m_x(x), m_y(y) {}
+
+    int64_t m_id;
+    float m_x, m_y;
   };
 
-  // Keep in sync `public @interface ChoosePositionMode`in Framework.java.
-  enum class ChoosePositionMode
-  {
-    None = 0,
-    Editor = 1,
-    Api = 2,
-  };
+  void Scale(double factor, m2::PointD const & pxPoint, bool isAnim);
 
-  class Framework : private power_management::PowerManager::Subscriber
-  {
-  private:
-    drape_ptr<dp::ThreadSafeFactory> m_oglContextFactory;
-    drape_ptr<dp::GraphicsContextFactory> m_vulkanContextFactory;
-    ::Framework m_work;
+  void Scroll(double distanceX, double distanceY);
 
-    math::LowPassVector<float, 3> m_sensors[2];
-    double m_lastCompass = 0;
+  void Touch(int action, Finger const & f1, Finger const & f2, uint8_t maskedPointer);
 
-    std::string m_searchQuery;
+  bool Search(search::EverywhereSearchParams const & params);
+  std::string GetLastSearchQuery() { return m_searchQuery; }
+  void ClearLastSearchQuery() { m_searchQuery.clear(); }
 
-    std::map<gui::EWidget, gui::Position> m_guiPositions;
+  void AddLocalMaps();
+  void RemoveLocalMaps();
+  void ReloadWorldMaps();
 
-    void TrafficStateChanged(TrafficManager::TrafficState state);
-    void TransitSchemeStateChanged(TransitReadManager::TransitSchemeState state);
-    void IsolinesSchemeStateChanged(IsolinesManager::IsolinesState state);
+  m2::PointD GetViewportCenter() const;
 
-    void MyPositionModeChanged(location::EMyPositionMode mode, bool routingActive);
+  void AddString(std::string const & name, std::string const & value);
 
-    location::TMyPositionModeChanged m_myPositionModeSignal;
+  void Scale(::Framework::EScaleMode mode);
+  void Scale(m2::PointD const & centerPt, int targetZoom, bool animate);
 
-    TrafficManager::TrafficStateChangedFn m_onTrafficStateChangedFn;
-    TransitReadManager::TransitStateChangedFn m_onTransitStateChangedFn;
-    IsolinesManager::IsolinesStateChangedFn m_onIsolinesStateChangedFn;
+  void ChangeTrackColor(kml::TrackId trackId, dp::Color color);
+  void ReplaceBookmark(kml::MarkId markId, kml::BookmarkData & bm);
+  void ReplaceTrack(kml::TrackId trackId, kml::TrackData & trackData);
+  void MoveBookmark(kml::MarkId markId, kml::MarkGroupId curCat, kml::MarkGroupId newCat);
+  void MoveTrack(kml::TrackId trackId, kml::MarkGroupId curCat, kml::MarkGroupId newCat);
 
-    ChoosePositionMode m_isChoosePositionMode = ChoosePositionMode::None;
-    bool m_isSurfaceDestroyed = false;
+  ::Framework * NativeFramework();
 
-  public:
-    Framework(std::function<void()> && afterMapsLoaded);
+  bool IsDownloadingActive();
 
-    storage::Storage & GetStorage();
-    DataSource const & GetDataSource();
+  void ExecuteMapApiRequest();
 
-    void ShowNode(storage::CountryId const & countryId, bool zoomToDownloadButton);
+  void DeactivatePopup();
+  void DeactivateMapSelectionCircle(bool restoreViewport);
 
-    void OnLocationError(int/* == location::TLocationStatus*/ newStatus);
-    void OnLocationUpdated(location::GpsInfo const & info);
-    void OnCompassUpdated(location::CompassInfo const & info, bool forceRedraw);
+  //    std::string GetOutdatedCountriesString();
 
-    bool CreateDrapeEngine(JNIEnv * env, jobject jSurface, int densityDpi, bool firstLaunch,
-                           bool launchByDeepLink, uint32_t appVersionCode, bool isCustomROM);
-    bool IsDrapeEngineCreated() const;
-    void UpdateDpi(int dpi);
-    bool DestroySurfaceOnDetach();
-    void DetachSurface(bool destroySurface);
-    bool AttachSurface(JNIEnv * env, jobject jSurface);
-    void PauseSurfaceRendering();
-    void ResumeSurfaceRendering();
+  void SetMyPositionModeListener(location::TMyPositionModeChanged const & fn);
+  location::EMyPositionMode GetMyPositionMode() const;
+  void SwitchMyPositionNextMode();
 
-    void SetMapStyle(MapStyle mapStyle);
-    void MarkMapStyle(MapStyle mapStyle);
-    MapStyle GetMapStyle() const;
+  void SetTrafficStateListener(TrafficManager::TrafficStateChangedFn const & fn);
+  void SetTransitSchemeListener(TransitReadManager::TransitStateChangedFn const & fn);
+  void SetIsolinesListener(IsolinesManager::IsolinesStateChangedFn const & fn);
 
-    void SetupMeasurementSystem();
+  bool IsTrafficEnabled();
+  void EnableTraffic();
+  void DisableTraffic();
 
-    RoutingManager & GetRoutingManager() { return m_work.GetRoutingManager(); }
-    void SetRouter(routing::RouterType type) { m_work.GetRoutingManager().SetRouter(type); }
-    routing::RouterType GetRouter() const { return m_work.GetRoutingManager().GetRouter(); }
-    routing::RouterType GetLastUsedRouter() const
-    {
-      return m_work.GetRoutingManager().GetLastUsedRouter();
-    }
+  void Save3dMode(bool allow3d, bool allow3dBuildings);
+  void Set3dMode(bool allow3d, bool allow3dBuildings);
+  void Get3dMode(bool & allow3d, bool & allow3dBuildings);
 
-    void Resize(JNIEnv * env, jobject jSurface, int w, int h);
+  void SetMapLanguageCode(std::string const & languageCode);
+  std::string GetMapLanguageCode();
 
-    struct Finger
-    {
-      Finger(int64_t id, float x, float y)
-        : m_id(id)
-        , m_x(x)
-        , m_y(y)
-      {
-      }
+  void SetChoosePositionMode(ChoosePositionMode mode, bool isBusiness, m2::PointD const * optionalPosition);
+  ChoosePositionMode GetChoosePositionMode();
 
-      int64_t m_id;
-      float m_x, m_y;
-    };
+  void UpdateMyPositionRoutingOffset(int offsetY);
+  void SetupWidget(gui::EWidget widget, float x, float y, dp::Anchor anchor);
+  void ApplyWidgets();
+  void CleanWidgets();
 
-    void Scale(double factor, m2::PointD const & pxPoint, bool isAnim);
+  place_page::Info & GetPlacePageInfo();
 
-    void Scroll(double distanceX, double distanceY);
+  bool IsAutoRetryDownloadFailed();
+  bool IsDownloadOn3gEnabled();
+  void EnableDownloadOn3g();
 
-    void Touch(int action, Finger const & f1, Finger const & f2, uint8_t maskedPointer);
+  //    int ToDoAfterUpdate() const;
 
-    bool Search(search::EverywhereSearchParams const & params);
-    std::string GetLastSearchQuery() { return m_searchQuery; }
-    void ClearLastSearchQuery() { m_searchQuery.clear(); }
+  // PowerManager::Subscriber overrides:
+  void OnPowerFacilityChanged(power_management::Facility const facility, bool enabled) override;
+  void OnPowerSchemeChanged(power_management::Scheme const actualScheme) override;
 
-    void AddLocalMaps();
-    void RemoveLocalMaps();
-    void ReloadWorldMaps();
-
-    m2::PointD GetViewportCenter() const;
-
-    void AddString(std::string const & name, std::string const & value);
-
-    void Scale(::Framework::EScaleMode mode);
-    void Scale(m2::PointD const & centerPt, int targetZoom, bool animate);
-
-    void ChangeTrackColor(kml::TrackId trackId, dp::Color color);
-    void ReplaceBookmark(kml::MarkId markId, kml::BookmarkData & bm);
-    void ReplaceTrack(kml::TrackId trackId, kml::TrackData & trackData);
-    void MoveBookmark(kml::MarkId markId, kml::MarkGroupId curCat, kml::MarkGroupId newCat);
-    void MoveTrack(kml::TrackId trackId, kml::MarkGroupId curCat, kml::MarkGroupId newCat);
-
-    ::Framework * NativeFramework();
-
-    bool IsDownloadingActive();
-
-    void ExecuteMapApiRequest();
-
-    void DeactivatePopup();
-    void DeactivateMapSelectionCircle(bool restoreViewport);
-
-//    std::string GetOutdatedCountriesString();
-
-    void SetMyPositionModeListener(location::TMyPositionModeChanged const & fn);
-    location::EMyPositionMode GetMyPositionMode() const;
-    void SwitchMyPositionNextMode();
-
-    void SetTrafficStateListener(TrafficManager::TrafficStateChangedFn const & fn);
-    void SetTransitSchemeListener(TransitReadManager::TransitStateChangedFn const & fn);
-    void SetIsolinesListener(IsolinesManager::IsolinesStateChangedFn const & fn);
-
-    bool IsTrafficEnabled();
-    void EnableTraffic();
-    void DisableTraffic();
-
-    void Save3dMode(bool allow3d, bool allow3dBuildings);
-    void Set3dMode(bool allow3d, bool allow3dBuildings);
-    void Get3dMode(bool & allow3d, bool & allow3dBuildings);
-
-    void SetMapLanguageCode(std::string const & languageCode);
-    std::string GetMapLanguageCode();
-
-    void SetChoosePositionMode(ChoosePositionMode mode, bool isBusiness, m2::PointD const * optionalPosition);
-    ChoosePositionMode GetChoosePositionMode();
-
-    void UpdateMyPositionRoutingOffset(int offsetY);
-    void SetupWidget(gui::EWidget widget, float x, float y, dp::Anchor anchor);
-    void ApplyWidgets();
-    void CleanWidgets();
-
-    place_page::Info & GetPlacePageInfo();
-
-    bool IsAutoRetryDownloadFailed();
-    bool IsDownloadOn3gEnabled();
-    void EnableDownloadOn3g();
-
-//    int ToDoAfterUpdate() const;
-
-    // PowerManager::Subscriber overrides:
-    void OnPowerFacilityChanged(power_management::Facility const facility, bool enabled) override;
-    void OnPowerSchemeChanged(power_management::Scheme const actualScheme) override;
-
-    FeatureID BuildFeatureId(JNIEnv * env, jobject featureId);
-  };
-}
+  FeatureID BuildFeatureId(JNIEnv * env, jobject featureId);
+};
+}  // namespace android
 
 extern std::unique_ptr<android::Framework> g_framework;
 ::Framework * frm();
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/LocationState.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/LocationState.cpp
index 8e12965b7..d89967c7c 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/LocationState.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/LocationState.cpp
@@ -7,26 +7,23 @@
 
 extern "C"
 {
-
-static void LocationStateModeChanged(location::EMyPositionMode mode,
-                                     std::shared_ptr<jobject> const & listener)
+static void LocationStateModeChanged(location::EMyPositionMode mode, std::shared_ptr<jobject> const & listener)
 {
   JNIEnv * env = jni::GetEnv();
-  env->CallVoidMethod(*listener, jni::GetMethodID(env, *listener.get(),
-                      "onMyPositionModeChanged", "(I)V"), static_cast<jint>(mode));
+  env->CallVoidMethod(*listener, jni::GetMethodID(env, *listener.get(), "onMyPositionModeChanged", "(I)V"),
+                      static_cast<jint>(mode));
 }
 
 //  public static void nativeSwitchToNextMode();
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_location_LocationState_nativeSwitchToNextMode(JNIEnv * env, jclass clazz)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_location_LocationState_nativeSwitchToNextMode(JNIEnv * env,
+                                                                                              jclass clazz)
 {
   ASSERT(g_framework, ());
   g_framework->SwitchMyPositionNextMode();
 }
 
 // private static int nativeGetMode();
-JNIEXPORT jint JNICALL
-Java_app_organicmaps_sdk_location_LocationState_nativeGetMode(JNIEnv * env, jclass clazz)
+JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_location_LocationState_nativeGetMode(JNIEnv * env, jclass clazz)
 {
   // GetMyPositionMode() is initialized only after drape creation.
   // https://github.com/organicmaps/organicmaps/issues/1128#issuecomment-1784435190
@@ -35,34 +32,31 @@ Java_app_organicmaps_sdk_location_LocationState_nativeGetMode(JNIEnv * env, jcla
 }
 
 //  public static void nativeSetListener(ModeChangeListener listener);
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_location_LocationState_nativeSetListener(JNIEnv * env, jclass clazz,
-                                                                  jobject listener)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_location_LocationState_nativeSetListener(JNIEnv * env, jclass clazz,
+                                                                                         jobject listener)
 {
   ASSERT(g_framework, ());
-  g_framework->SetMyPositionModeListener(std::bind(&LocationStateModeChanged, std::placeholders::_1,
-                                                   jni::make_global_ref(listener)));
+  g_framework->SetMyPositionModeListener(
+      std::bind(&LocationStateModeChanged, std::placeholders::_1, jni::make_global_ref(listener)));
 }
 
 //  public static void nativeRemoveListener();
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_location_LocationState_nativeRemoveListener(JNIEnv * env, jclass clazz)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_location_LocationState_nativeRemoveListener(JNIEnv * env, jclass clazz)
 {
   ASSERT(g_framework, ());
   g_framework->SetMyPositionModeListener(location::TMyPositionModeChanged());
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_location_LocationState_nativeOnLocationError(JNIEnv * env, jclass clazz, int errorCode)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_location_LocationState_nativeOnLocationError(JNIEnv * env, jclass clazz,
+                                                                                             int errorCode)
 {
   ASSERT(g_framework, ());
   g_framework->OnLocationError(errorCode);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_location_LocationState_nativeLocationUpdated(JNIEnv * env, jclass clazz, jlong time,
-                                                                  jdouble lat, jdouble lon, jfloat accuracy,
-                                                                  jdouble altitude, jfloat speed, jfloat bearing)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_location_LocationState_nativeLocationUpdated(
+    JNIEnv * env, jclass clazz, jlong time, jdouble lat, jdouble lon, jfloat accuracy, jdouble altitude, jfloat speed,
+    jfloat bearing)
 {
   ASSERT(g_framework, ());
   location::GpsInfo info;
@@ -90,4 +84,4 @@ Java_app_organicmaps_sdk_location_LocationState_nativeLocationUpdated(JNIEnv * e
   g_framework->OnLocationUpdated(info);
   GpsTracker::Instance().OnLocationUpdated(info);
 }
-} // extern "C"
+}  // extern "C"
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/Map.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/Map.cpp
index f5332f3d9..3cb064527 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/Map.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/Map.cpp
@@ -15,51 +15,43 @@ namespace
 void OnRenderingInitializationFinished(std::shared_ptr<jobject> const & listener)
 {
   JNIEnv * env = jni::GetEnv();
-  env->CallVoidMethod(*listener, jni::GetMethodID(env, *listener.get(),
-                      "onRenderingInitializationFinished", "()V"));
+  env->CallVoidMethod(*listener, jni::GetMethodID(env, *listener.get(), "onRenderingInitializationFinished", "()V"));
 }
 }  // namespace
 
 extern "C"
 {
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_Map_nativeCreateEngine(JNIEnv * env, jclass,
-                                            jobject surface, jint density,
-                                            jboolean firstLaunch,
-                                            jboolean isLaunchByDeepLink,
-                                            jint appVersionCode,
-                                            jboolean isCustomROM)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_Map_nativeCreateEngine(JNIEnv * env, jclass, jobject surface,
+                                                                           jint density, jboolean firstLaunch,
+                                                                           jboolean isLaunchByDeepLink,
+                                                                           jint appVersionCode, jboolean isCustomROM)
 {
   return g_framework->CreateDrapeEngine(env, surface, density, firstLaunch, isLaunchByDeepLink,
                                         base::asserted_cast<uint32_t>(appVersionCode), isCustomROM);
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_Map_nativeIsEngineCreated(JNIEnv *, jclass)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_Map_nativeIsEngineCreated(JNIEnv *, jclass)
 {
   return g_framework->IsDrapeEngineCreated();
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Map_nativeUpdateEngineDpi(JNIEnv *, jclass, jint dpi)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Map_nativeUpdateEngineDpi(JNIEnv *, jclass, jint dpi)
 {
   return g_framework->UpdateDpi(dpi);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Map_nativeExecuteMapApiRequest(JNIEnv * env, jclass)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Map_nativeExecuteMapApiRequest(JNIEnv * env, jclass)
 {
   return g_framework->ExecuteMapApiRequest();
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Map_nativeSetRenderingInitializationFinishedListener(
-  JNIEnv *, jclass, jobject listener)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Map_nativeSetRenderingInitializationFinishedListener(JNIEnv *, jclass,
+                                                                                                     jobject listener)
 {
   if (listener)
   {
     g_framework->NativeFramework()->SetGraphicsContextInitializationHandler(
-      std::bind(&OnRenderingInitializationFinished, jni::make_global_ref(listener)));
+        std::bind(&OnRenderingInitializationFinished, jni::make_global_ref(listener)));
   }
   else
   {
@@ -67,69 +59,61 @@ Java_app_organicmaps_sdk_Map_nativeSetRenderingInitializationFinishedListener(
   }
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_Map_nativeAttachSurface(JNIEnv * env, jclass, jobject surface)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_Map_nativeAttachSurface(JNIEnv * env, jclass, jobject surface)
 {
   return g_framework->AttachSurface(env, surface);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Map_nativeDetachSurface(JNIEnv *, jclass, jboolean destroySurface)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Map_nativeDetachSurface(JNIEnv *, jclass, jboolean destroySurface)
 {
   g_framework->DetachSurface(destroySurface);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Map_nativeSurfaceChanged(JNIEnv * env, jclass, jobject surface, jint w, jint h)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Map_nativeSurfaceChanged(JNIEnv * env, jclass, jobject surface, jint w,
+                                                                         jint h)
 {
   g_framework->Resize(env, surface, w, h);
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_Map_nativeDestroySurfaceOnDetach(JNIEnv *, jclass)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_Map_nativeDestroySurfaceOnDetach(JNIEnv *, jclass)
 {
   return g_framework->DestroySurfaceOnDetach();
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Map_nativePauseSurfaceRendering(JNIEnv *, jclass)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Map_nativePauseSurfaceRendering(JNIEnv *, jclass)
 {
   g_framework->PauseSurfaceRendering();
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Map_nativeResumeSurfaceRendering(JNIEnv *, jclass)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Map_nativeResumeSurfaceRendering(JNIEnv *, jclass)
 {
   g_framework->ResumeSurfaceRendering();
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Map_nativeUpdateMyPositionRoutingOffset(JNIEnv * env, jclass clazz, int offsetY)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Map_nativeUpdateMyPositionRoutingOffset(JNIEnv * env, jclass clazz,
+                                                                                        int offsetY)
 {
   g_framework->UpdateMyPositionRoutingOffset(offsetY);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Map_nativeApplyWidgets(JNIEnv *, jclass)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Map_nativeApplyWidgets(JNIEnv *, jclass)
 {
   g_framework->ApplyWidgets();
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Map_nativeCleanWidgets(JNIEnv *, jclass)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Map_nativeCleanWidgets(JNIEnv *, jclass)
 {
   g_framework->CleanWidgets();
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Map_nativeSetupWidget(
-  JNIEnv *, jclass, jint widget, jfloat x, jfloat y, jint anchor)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Map_nativeSetupWidget(JNIEnv *, jclass, jint widget, jfloat x, jfloat y,
+                                                                      jint anchor)
 {
   g_framework->SetupWidget(static_cast<gui::EWidget>(widget), x, y, static_cast<dp::Anchor>(anchor));
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Map_nativeCompassUpdated(JNIEnv *, jclass, jdouble north, jboolean forceRedraw)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Map_nativeCompassUpdated(JNIEnv *, jclass, jdouble north,
+                                                                         jboolean forceRedraw)
 {
   location::CompassInfo info;
   info.m_bearing = north;
@@ -137,54 +121,45 @@ Java_app_organicmaps_sdk_Map_nativeCompassUpdated(JNIEnv *, jclass, jdouble nort
   g_framework->OnCompassUpdated(info, forceRedraw);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Map_nativeScalePlus(JNIEnv *, jclass)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Map_nativeScalePlus(JNIEnv *, jclass)
 {
   g_framework->Scale(::Framework::SCALE_MAG);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Map_nativeScaleMinus(JNIEnv *, jclass)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Map_nativeScaleMinus(JNIEnv *, jclass)
 {
   g_framework->Scale(::Framework::SCALE_MIN);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Map_nativeOnScroll(
-  JNIEnv *, jclass, jdouble distanceX, jdouble distanceY)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Map_nativeOnScroll(JNIEnv *, jclass, jdouble distanceX,
+                                                                   jdouble distanceY)
 {
   g_framework->Scroll(distanceX, distanceY);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Map_nativeOnScale(
-  JNIEnv *, jclass, jdouble factor, jdouble focusX, jdouble focusY, jboolean isAnim)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Map_nativeOnScale(JNIEnv *, jclass, jdouble factor, jdouble focusX,
+                                                                  jdouble focusY, jboolean isAnim)
 {
   g_framework->Scale(factor, {focusX, focusY}, isAnim);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Map_nativeOnTouch(JNIEnv *, jclass, jint action,
-                                       jint id1, jfloat x1, jfloat y1,
-                                       jint id2, jfloat x2, jfloat y2,
-                                       jint maskedPointer)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Map_nativeOnTouch(JNIEnv *, jclass, jint action, jint id1, jfloat x1,
+                                                                  jfloat y1, jint id2, jfloat x2, jfloat y2,
+                                                                  jint maskedPointer)
 {
-  g_framework->Touch(action,
-                     android::Framework::Finger(id1, x1, y1),
-                     android::Framework::Finger(id2, x2, y2), maskedPointer);
+  g_framework->Touch(action, android::Framework::Finger(id1, x1, y1), android::Framework::Finger(id2, x2, y2),
+                     maskedPointer);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Map_nativeStorageConnected(JNIEnv *, jclass)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Map_nativeStorageConnected(JNIEnv *, jclass)
 {
   android::Platform::Instance().OnExternalStorageStatusChanged(true);
   g_framework->AddLocalMaps();
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_Map_nativeStorageDisconnected(JNIEnv *, jclass)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Map_nativeStorageDisconnected(JNIEnv *, jclass)
 {
   android::Platform::Instance().OnExternalStorageStatusChanged(false);
   g_framework->RemoveLocalMaps();
 }
-} // extern "C"
+}  // extern "C"
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/MapManager.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/MapManager.cpp
index 75083bb58..b8f1e2fe5 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/MapManager.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/MapManager.cpp
@@ -21,7 +21,6 @@
 #include <unordered_map>
 #include <vector>
 
-
 namespace
 {
 // The last 5% are left for applying diffs.
@@ -44,7 +43,10 @@ struct TBatchedData
 
   TBatchedData(storage::CountryId const & countryId, storage::NodeStatus const newStatus,
                storage::NodeErrorCode const errorCode, bool isLeaf)
-    : m_countryId(countryId), m_newStatus(newStatus), m_errorCode(errorCode), m_isLeaf(isLeaf)
+    : m_countryId(countryId)
+    , m_newStatus(newStatus)
+    , m_errorCode(errorCode)
+    , m_isLeaf(isLeaf)
   {}
 };
 
@@ -64,11 +66,11 @@ struct CountryItemBuilder
 {
   jclass m_class;
   jmethodID m_ctor;
-  jfieldID m_Id, m_Name, m_DirectParentId, m_TopmostParentId, m_DirectParentName, m_TopmostParentName,
-          m_Description, m_Size, m_EnqueuedSize, m_TotalSize, m_ChildCount, m_TotalChildCount,
-          m_Present, m_Progress, m_DownloadedBytes, m_BytesToDownload, m_Category, m_Status, m_ErrorCode;
+  jfieldID m_Id, m_Name, m_DirectParentId, m_TopmostParentId, m_DirectParentName, m_TopmostParentName, m_Description,
+      m_Size, m_EnqueuedSize, m_TotalSize, m_ChildCount, m_TotalChildCount, m_Present, m_Progress, m_DownloadedBytes,
+      m_BytesToDownload, m_Category, m_Status, m_ErrorCode;
 
-  CountryItemBuilder(JNIEnv *env)
+  CountryItemBuilder(JNIEnv * env)
   {
     m_class = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/downloader/CountryItem");
     m_ctor = jni::GetConstructorID(env, m_class, "(Ljava/lang/String;)V");
@@ -95,10 +97,7 @@ struct CountryItemBuilder
   }
 
   DECLARE_BUILDER_INSTANCE(CountryItemBuilder);
-  jobject Create(JNIEnv * env, jobject id) const
-  {
-    return env->NewObject(m_class, m_ctor, id);
-  }
+  jobject Create(JNIEnv * env, jobject id) const { return env->NewObject(m_class, m_ctor, id); }
 };
 
 static storage::CountryId const GetRootId(JNIEnv * env, jstring root)
@@ -109,52 +108,54 @@ static storage::CountryId const GetRootId(JNIEnv * env, jstring root)
 
 extern "C"
 {
-
 // static String nativeGetRoot();
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_downloader_MapManager_nativeGetRoot(JNIEnv * env, jclass clazz)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeGetRoot(JNIEnv * env, jclass clazz)
 {
   return jni::ToJavaString(env, GetStorage().GetRootId());
 }
 
 // static boolean nativeMoveFile(String oldFile, String newFile);
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_downloader_MapManager_nativeMoveFile(JNIEnv * env, jclass clazz, jstring oldFile, jstring newFile)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeMoveFile(JNIEnv * env, jclass clazz,
+                                                                                         jstring oldFile,
+                                                                                         jstring newFile)
 {
   return base::MoveFileX(jni::ToNativeString(env, oldFile), jni::ToNativeString(env, newFile));
 }
 
 // static boolean nativeHasSpaceToDownloadAmount(long bytes);
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_downloader_MapManager_nativeHasSpaceToDownloadAmount(JNIEnv * env, jclass clazz, jlong bytes)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeHasSpaceToDownloadAmount(JNIEnv * env,
+                                                                                                         jclass clazz,
+                                                                                                         jlong bytes)
 {
   return storage::IsEnoughSpaceForDownload(bytes);
 }
 
 // static boolean nativeHasSpaceToDownloadCountry(String root);
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_downloader_MapManager_nativeHasSpaceToDownloadCountry(JNIEnv * env, jclass clazz, jstring root)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeHasSpaceToDownloadCountry(JNIEnv * env,
+                                                                                                          jclass clazz,
+                                                                                                          jstring root)
 {
   return storage::IsEnoughSpaceForDownload(jni::ToNativeString(env, root), GetStorage());
 }
 
 // static boolean nativeHasSpaceToUpdate(String root);
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_downloader_MapManager_nativeHasSpaceToUpdate(JNIEnv * env, jclass clazz, jstring root)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeHasSpaceToUpdate(JNIEnv * env,
+                                                                                                 jclass clazz,
+                                                                                                 jstring root)
 {
   return IsEnoughSpaceForUpdate(jni::ToNativeString(env, root), GetStorage());
 }
 
 // static int nativeGetDownloadedCount();
-JNIEXPORT jint JNICALL
-Java_app_organicmaps_sdk_downloader_MapManager_nativeGetDownloadedCount(JNIEnv * env, jclass clazz)
+JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeGetDownloadedCount(JNIEnv * env,
+                                                                                               jclass clazz)
 {
   return static_cast<jint>(GetStorage().GetDownloadedFilesCount());
 }
 
 // static @Nullable UpdateInfo nativeGetUpdateInfo(@Nullable String root);
-JNIEXPORT jobject JNICALL
-Java_app_organicmaps_sdk_downloader_MapManager_nativeGetUpdateInfo(JNIEnv * env, jclass clazz, jstring root)
+JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeGetUpdateInfo(JNIEnv * env, jclass clazz,
+                                                                                             jstring root)
 {
   storage::Storage::UpdateInfo info;
   if (!GetStorage().GetUpdateInfo(GetRootId(env, root), info))
@@ -168,7 +169,8 @@ Java_app_organicmaps_sdk_downloader_MapManager_nativeGetUpdateInfo(JNIEnv * env,
   return env->NewObject(infoClass, ctor, info.m_numberOfMwmFilesToUpdate, info.m_totalDownloadSizeInBytes);
 }
 
-static void UpdateItemShort(JNIEnv * env, jobject item, storage::NodeStatus const status, storage::NodeErrorCode const error)
+static void UpdateItemShort(JNIEnv * env, jobject item, storage::NodeStatus const status,
+                            storage::NodeErrorCode const error)
 {
   auto const & ciBuilder = CountryItemBuilder::Instance(env);
 
@@ -211,7 +213,8 @@ static void UpdateItem(JNIEnv * env, jobject item, storage::NodeAttrs const & at
   }
 
   // Description
-  env->SetObjectField(item, ciBuilder.m_Description, SLR(env, jni::ToJavaString(env, attrs.m_nodeLocalDescription)).get());
+  env->SetObjectField(item, ciBuilder.m_Description,
+                      SLR(env, jni::ToJavaString(env, attrs.m_nodeLocalDescription)).get());
 
   // Sizes
   env->SetLongField(item, ciBuilder.m_Size, attrs.m_localMwmSize);
@@ -267,18 +270,21 @@ static void PutItemsToList(
   }
 }
 
-// static void nativeListItems(@Nullable String root, double lat, double lon, boolean hasLocation, boolean myMapsMode, List<CountryItem> result);
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_downloader_MapManager_nativeListItems(JNIEnv * env, jclass clazz, jstring parent, jdouble lat, jdouble lon, jboolean hasLocation, jboolean myMapsMode, jobject result)
+// static void nativeListItems(@Nullable String root, double lat, double lon, boolean hasLocation, boolean myMapsMode,
+// List<CountryItem> result);
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeListItems(JNIEnv * env, jclass clazz,
+                                                                                      jstring parent, jdouble lat,
+                                                                                      jdouble lon, jboolean hasLocation,
+                                                                                      jboolean myMapsMode,
+                                                                                      jobject result)
 {
   if (hasLocation && !myMapsMode)
   {
     storage::CountriesVec near;
     g_framework->NativeFramework()->GetCountryInfoGetter().GetRegionsCountryId(mercator::FromLatLon(lat, lon), near);
     PutItemsToList(env, result, near, ItemCategory::NEAR_ME,
-                   [](storage::CountryId const & countryId, storage::NodeAttrs const & attrs) -> bool {
-                     return !attrs.m_present;
-                   });
+                   [](storage::CountryId const & countryId, storage::NodeAttrs const & attrs) -> bool
+    { return !attrs.m_present; });
   }
 
   storage::CountriesVec downloaded, available;
@@ -291,8 +297,8 @@ Java_app_organicmaps_sdk_downloader_MapManager_nativeListItems(JNIEnv * env, jcl
 }
 
 // static void nativeUpdateItem(CountryItem item);
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_downloader_MapManager_nativeGetAttributes(JNIEnv * env, jclass, jobject item)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeGetAttributes(JNIEnv * env, jclass,
+                                                                                          jobject item)
 {
   auto const & ciBuilder = CountryItemBuilder::Instance(env);
   jstring id = static_cast<jstring>(env->GetObjectField(item, ciBuilder.m_Id));
@@ -304,8 +310,8 @@ Java_app_organicmaps_sdk_downloader_MapManager_nativeGetAttributes(JNIEnv * env,
 }
 
 // static void nativeGetStatus(String root);
-JNIEXPORT jint JNICALL
-Java_app_organicmaps_sdk_downloader_MapManager_nativeGetStatus(JNIEnv * env, jclass clazz, jstring root)
+JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeGetStatus(JNIEnv * env, jclass clazz,
+                                                                                      jstring root)
 {
   storage::NodeStatuses ns;
   GetStorage().GetNodeStatuses(jni::ToNativeString(env, root), ns);
@@ -313,8 +319,8 @@ Java_app_organicmaps_sdk_downloader_MapManager_nativeGetStatus(JNIEnv * env, jcl
 }
 
 // static void nativeGetError(String root);
-JNIEXPORT jint JNICALL
-Java_app_organicmaps_sdk_downloader_MapManager_nativeGetError(JNIEnv * env, jclass clazz, jstring root)
+JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeGetError(JNIEnv * env, jclass clazz,
+                                                                                     jstring root)
 {
   storage::NodeStatuses ns;
   GetStorage().GetNodeStatuses(jni::ToNativeString(env, root), ns);
@@ -322,22 +328,23 @@ Java_app_organicmaps_sdk_downloader_MapManager_nativeGetError(JNIEnv * env, jcla
 }
 
 // static String nativeGetName(String root);
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_downloader_MapManager_nativeGetName(JNIEnv * env, jclass clazz, jstring root)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeGetName(JNIEnv * env, jclass clazz,
+                                                                                       jstring root)
 {
   return jni::ToJavaString(env, GetStorage().GetNodeLocalName(jni::ToNativeString(env, root)));
 }
 
 // static @Nullable String nativeFindCountry(double lat, double lon);
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_downloader_MapManager_nativeFindCountry(JNIEnv * env, jclass clazz, jdouble lat, jdouble lon)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeFindCountry(JNIEnv * env, jclass clazz,
+                                                                                           jdouble lat, jdouble lon)
 {
-  return jni::ToJavaString(env, g_framework->NativeFramework()->GetCountryInfoGetter().GetRegionCountryId(mercator::FromLatLon(lat, lon)));
+  return jni::ToJavaString(
+      env, g_framework->NativeFramework()->GetCountryInfoGetter().GetRegionCountryId(mercator::FromLatLon(lat, lon)));
 }
 
 // static boolean nativeIsDownloading();
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_downloader_MapManager_nativeIsDownloading(JNIEnv * env, jclass clazz)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeIsDownloading(JNIEnv * env,
+                                                                                              jclass clazz)
 {
   return static_cast<jboolean>(GetStorage().IsDownloadInProgress());
 }
@@ -365,14 +372,14 @@ static void EndBatchingCallbacks(JNIEnv * env)
     for (TBatchedData const & dataItem : key.second)
     {
       // Create StorageCallbackData instance…
-      static jclass batchDataClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/downloader/MapManager$StorageCallbackData");
+      static jclass batchDataClass =
+          jni::GetGlobalClassRef(env, "app/organicmaps/sdk/downloader/MapManager$StorageCallbackData");
       static jmethodID batchDataCtor = jni::GetConstructorID(env, batchDataClass, "(Ljava/lang/String;IIZ)V");
 
       jni::TScopedLocalRef const id(env, jni::ToJavaString(env, dataItem.m_countryId));
-      jni::TScopedLocalRef const item(env, env->NewObject(batchDataClass, batchDataCtor, id.get(),
-                                                                                         static_cast<jint>(dataItem.m_newStatus),
-                                                                                         static_cast<jint>(dataItem.m_errorCode),
-                                                                                         dataItem.m_isLeaf));
+      jni::TScopedLocalRef const item(
+          env, env->NewObject(batchDataClass, batchDataCtor, id.get(), static_cast<jint>(dataItem.m_newStatus),
+                              static_cast<jint>(dataItem.m_errorCode), dataItem.m_isLeaf));
       // …and put it into the resulting list
       env->CallBooleanMethod(list.get(), listBuilder.m_add, item.get());
     }
@@ -387,8 +394,8 @@ static void EndBatchingCallbacks(JNIEnv * env)
 }
 
 // static void nativeDownload(String root);
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_downloader_MapManager_nativeDownload(JNIEnv * env, jclass clazz, jstring root)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeDownload(JNIEnv * env, jclass clazz,
+                                                                                     jstring root)
 {
   StartBatchingCallbacks();
   GetStorage().DownloadNode(jni::ToNativeString(env, root));
@@ -396,8 +403,8 @@ Java_app_organicmaps_sdk_downloader_MapManager_nativeDownload(JNIEnv * env, jcla
 }
 
 // static boolean nativeRetry(String root);
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_downloader_MapManager_nativeRetry(JNIEnv * env, jclass clazz, jstring root)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeRetry(JNIEnv * env, jclass clazz,
+                                                                                  jstring root)
 {
   StartBatchingCallbacks();
   GetStorage().RetryDownloadNode(jni::ToNativeString(env, root));
@@ -405,8 +412,8 @@ Java_app_organicmaps_sdk_downloader_MapManager_nativeRetry(JNIEnv * env, jclass
 }
 
 // static void nativeUpdate(String root);
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_downloader_MapManager_nativeUpdate(JNIEnv * env, jclass clazz, jstring root)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeUpdate(JNIEnv * env, jclass clazz,
+                                                                                   jstring root)
 {
   StartBatchingCallbacks();
   GetStorage().UpdateNode(GetRootId(env, root));
@@ -414,8 +421,8 @@ Java_app_organicmaps_sdk_downloader_MapManager_nativeUpdate(JNIEnv * env, jclass
 }
 
 // static void nativeCancel(String root);
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_downloader_MapManager_nativeCancel(JNIEnv * env, jclass clazz, jstring root)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeCancel(JNIEnv * env, jclass clazz,
+                                                                                   jstring root)
 {
   StartBatchingCallbacks();
   GetStorage().CancelDownloadNode(GetRootId(env, root));
@@ -423,8 +430,8 @@ Java_app_organicmaps_sdk_downloader_MapManager_nativeCancel(JNIEnv * env, jclass
 }
 
 // static void nativeDelete(String root);
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_downloader_MapManager_nativeDelete(JNIEnv * env, jclass clazz, jstring root)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeDelete(JNIEnv * env, jclass clazz,
+                                                                                   jstring root)
 {
   StartBatchingCallbacks();
   auto const countryId = jni::ToNativeString(env, root);
@@ -432,8 +439,7 @@ Java_app_organicmaps_sdk_downloader_MapManager_nativeDelete(JNIEnv * env, jclass
   EndBatchingCallbacks(env);
 }
 
-static void StatusChangedCallback(std::shared_ptr<jobject> const & listenerRef,
-                                  storage::CountryId const & countryId)
+static void StatusChangedCallback(std::shared_ptr<jobject> const & listenerRef, storage::CountryId const & countryId)
 {
   storage::NodeStatuses ns;
   GetStorage().GetNodeStatuses(countryId, ns);
@@ -445,42 +451,48 @@ static void StatusChangedCallback(std::shared_ptr<jobject> const & listenerRef,
     EndBatchingCallbacks(jni::GetEnv());
 }
 
-static void ProgressChangedCallback(std::shared_ptr<jobject> const & listenerRef,
-                                    storage::CountryId const & countryId, downloader::Progress const & progress)
+static void ProgressChangedCallback(std::shared_ptr<jobject> const & listenerRef, storage::CountryId const & countryId,
+                                    downloader::Progress const & progress)
 {
   JNIEnv * env = jni::GetEnv();
 
   jmethodID const methodID = jni::GetMethodID(env, *listenerRef, "onProgress", "(Ljava/lang/String;JJ)V");
-  env->CallVoidMethod(*listenerRef, methodID, jni::ToJavaString(env, countryId),
-                      progress.m_bytesDownloaded, progress.m_bytesTotal);
+  env->CallVoidMethod(*listenerRef, methodID, jni::ToJavaString(env, countryId), progress.m_bytesDownloaded,
+                      progress.m_bytesTotal);
 }
 
 // static int nativeSubscribe(StorageCallback listener);
-JNIEXPORT jint JNICALL
-Java_app_organicmaps_sdk_downloader_MapManager_nativeSubscribe(JNIEnv * env, jclass clazz, jobject listener)
+JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeSubscribe(JNIEnv * env, jclass clazz,
+                                                                                      jobject listener)
 {
-  return GetStorage().Subscribe(std::bind(&StatusChangedCallback, jni::make_global_ref(listener), std::placeholders::_1),
-                                std::bind(&ProgressChangedCallback, jni::make_global_ref(listener), std::placeholders::_1, std::placeholders::_2));
+  return GetStorage().Subscribe(
+      std::bind(&StatusChangedCallback, jni::make_global_ref(listener), std::placeholders::_1),
+      std::bind(&ProgressChangedCallback, jni::make_global_ref(listener), std::placeholders::_1,
+                std::placeholders::_2));
 }
 
 // static void nativeUnsubscribe(int slot);
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_downloader_MapManager_nativeUnsubscribe(JNIEnv * env, jclass clazz, jint slot)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeUnsubscribe(JNIEnv * env, jclass clazz,
+                                                                                        jint slot)
 {
   GetStorage().Unsubscribe(slot);
 }
 
 // static void nativeSubscribeOnCountryChanged(CurrentCountryChangedListener listener);
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_downloader_MapManager_nativeSubscribeOnCountryChanged(JNIEnv * env, jclass clazz, jobject listener)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeSubscribeOnCountryChanged(JNIEnv * env,
+                                                                                                      jclass clazz,
+                                                                                                      jobject listener)
 {
   ASSERT(!g_countryChangedListener, ());
   g_countryChangedListener = env->NewGlobalRef(listener);
 
-  auto const callback = [](storage::CountryId const & countryId) {
+  auto const callback = [](storage::CountryId const & countryId)
+  {
     JNIEnv * env = jni::GetEnv();
-    jmethodID methodID = jni::GetMethodID(env, g_countryChangedListener, "onCurrentCountryChanged", "(Ljava/lang/String;)V");
-    env->CallVoidMethod(g_countryChangedListener, methodID, jni::TScopedLocalRef(env, jni::ToJavaString(env, countryId)).get());
+    jmethodID methodID =
+        jni::GetMethodID(env, g_countryChangedListener, "onCurrentCountryChanged", "(Ljava/lang/String;)V");
+    env->CallVoidMethod(g_countryChangedListener, methodID,
+                        jni::TScopedLocalRef(env, jni::ToJavaString(env, countryId)).get());
   };
 
   storage::CountryId const & prev = g_framework->NativeFramework()->GetLastReportedCountry();
@@ -491,8 +503,8 @@ Java_app_organicmaps_sdk_downloader_MapManager_nativeSubscribeOnCountryChanged(J
 }
 
 // static void nativeUnsubscribeOnCountryChanged();
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_downloader_MapManager_nativeUnsubscribeOnCountryChanged(JNIEnv * env, jclass clazz)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeUnsubscribeOnCountryChanged(JNIEnv * env,
+                                                                                                        jclass clazz)
 {
   g_framework->NativeFramework()->SetCurrentCountryChangedListener(nullptr);
 
@@ -501,15 +513,16 @@ Java_app_organicmaps_sdk_downloader_MapManager_nativeUnsubscribeOnCountryChanged
 }
 
 // static boolean nativeHasUnsavedEditorChanges(String root);
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_downloader_MapManager_nativeHasUnsavedEditorChanges(JNIEnv * env, jclass clazz, jstring root)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeHasUnsavedEditorChanges(JNIEnv * env,
+                                                                                                        jclass clazz,
+                                                                                                        jstring root)
 {
   return g_framework->NativeFramework()->HasUnsavedEdits(jni::ToNativeString(env, root));
 }
 
 // static void nativeGetPathTo(String root, List<String> result);
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_downloader_MapManager_nativeGetPathTo(JNIEnv * env, jclass clazz, jstring root, jobject result)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeGetPathTo(JNIEnv * env, jclass clazz,
+                                                                                      jstring root, jobject result)
 {
   auto const listAddMethod = jni::ListBuilder::Instance(env).m_add;
 
@@ -520,8 +533,9 @@ Java_app_organicmaps_sdk_downloader_MapManager_nativeGetPathTo(JNIEnv * env, jcl
 }
 
 // static int nativeGetOverallProgress(String[] countries);
-JNIEXPORT jint JNICALL
-Java_app_organicmaps_sdk_downloader_MapManager_nativeGetOverallProgress(JNIEnv * env, jclass clazz, jobjectArray jcountries)
+JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeGetOverallProgress(JNIEnv * env,
+                                                                                               jclass clazz,
+                                                                                               jobjectArray jcountries)
 {
   int const size = env->GetArrayLength(jcountries);
   storage::CountriesVec countries;
@@ -543,29 +557,29 @@ Java_app_organicmaps_sdk_downloader_MapManager_nativeGetOverallProgress(JNIEnv *
 }
 
 // static boolean nativeIsAutoretryFailed();
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_downloader_MapManager_nativeIsAutoretryFailed(JNIEnv * env, jclass clazz)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeIsAutoretryFailed(JNIEnv * env,
+                                                                                                  jclass clazz)
 {
   return g_framework->IsAutoRetryDownloadFailed();
 }
 
 // static boolean nativeIsDownloadOn3gEnabled();
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_downloader_MapManager_nativeIsDownloadOn3gEnabled(JNIEnv * env, jclass clazz)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeIsDownloadOn3gEnabled(JNIEnv * env,
+                                                                                                      jclass clazz)
 {
   return g_framework->IsDownloadOn3gEnabled();
 }
 
 // static void nativeEnableDownloadOn3g();
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_downloader_MapManager_nativeEnableDownloadOn3g(JNIEnv * env, jclass clazz)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeEnableDownloadOn3g(JNIEnv * env,
+                                                                                               jclass clazz)
 {
   g_framework->EnableDownloadOn3g();
 }
 
 // static @Nullable String nativeGetSelectedCountry();
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_downloader_MapManager_nativeGetSelectedCountry(JNIEnv * env, jclass clazz)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_downloader_MapManager_nativeGetSelectedCountry(JNIEnv * env,
+                                                                                                  jclass clazz)
 {
   if (!g_framework->NativeFramework()->HasPlacePageInfo())
     return nullptr;
@@ -573,4 +587,4 @@ Java_app_organicmaps_sdk_downloader_MapManager_nativeGetSelectedCountry(JNIEnv *
   storage::CountryId const & res = g_framework->GetPlacePageInfo().GetCountryId();
   return (res == storage::kInvalidCountryId ? nullptr : jni::ToJavaString(env, res));
 }
-} // extern "C"
+}  // extern "C"
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp
index a54c78142..2c628ba25 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp
@@ -16,8 +16,8 @@ JNIEXPORT void JNICALL Java_app_organicmaps_sdk_OrganicMaps_nativeSetSettingsDir
 // static void nativeInitPlatform(Context context, String apkPath, String storagePath, String privatePath, String
 // tmpPath, String flavorName, String buildType, boolean isTablet);
 JNIEXPORT void JNICALL Java_app_organicmaps_sdk_OrganicMaps_nativeInitPlatform(
-  JNIEnv * env, jclass clazz, jobject context, jstring apkPath, jstring writablePath, jstring privatePath,
-  jstring tmpPath, jstring flavorName, jstring buildType, jboolean isTablet)
+    JNIEnv * env, jclass clazz, jobject context, jstring apkPath, jstring writablePath, jstring privatePath,
+    jstring tmpPath, jstring flavorName, jstring buildType, jboolean isTablet)
 {
   android::Platform::Instance().Initialize(env, context, apkPath, writablePath, privatePath, tmpPath, flavorName,
                                            buildType, isTablet);
@@ -29,13 +29,12 @@ JNIEXPORT void JNICALL Java_app_organicmaps_sdk_OrganicMaps_nativeInitFramework(
 {
   if (!g_framework)
   {
-    g_framework = std::make_unique<android::Framework>(
-      [onComplete = jni::make_global_ref(onComplete)]()
-      {
-        JNIEnv * env = jni::GetEnv();
-        jmethodID const methodId = jni::GetMethodID(env, *onComplete, "run", "()V");
-        env->CallVoidMethod(*onComplete, methodId);
-      });
+    g_framework = std::make_unique<android::Framework>([onComplete = jni::make_global_ref(onComplete)]()
+    {
+      JNIEnv * env = jni::GetEnv();
+      jmethodID const methodId = jni::GetMethodID(env, *onComplete, "run", "()V");
+      env->CallVoidMethod(*onComplete, methodId);
+    });
   }
 }
 
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/TrackRecorder.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/TrackRecorder.cpp
index 5a9df5298..f57252f06 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/TrackRecorder.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/TrackRecorder.cpp
@@ -8,52 +8,52 @@
 
 extern "C"
 {
-  JNIEXPORT void JNICALL
-  Java_app_organicmaps_sdk_location_TrackRecorder_nativeSetEnabled(JNIEnv * env, jclass clazz, jboolean enable)
-  {
-    GpsTracker::Instance().SetEnabled(enable);
-    Framework * const f = frm();
-    if (f == nullptr)
-      return;
-    if (enable)
-      f->ConnectToGpsTracker();
-    else
-      f->DisconnectFromGpsTracker();
-  }
-
-  JNIEXPORT jboolean JNICALL
-  Java_app_organicmaps_sdk_location_TrackRecorder_nativeIsEnabled(JNIEnv * env, jclass clazz)
-  {
-    return GpsTracker::Instance().IsEnabled();
-  }
-
-  JNIEXPORT void JNICALL
-  Java_app_organicmaps_sdk_location_TrackRecorder_nativeStartTrackRecording(JNIEnv * env, jclass clazz)
-  {
-    frm()->StartTrackRecording();
-  }
-
-  JNIEXPORT void JNICALL
-  Java_app_organicmaps_sdk_location_TrackRecorder_nativeStopTrackRecording(JNIEnv * env, jclass clazz)
-  {
-    frm()->StopTrackRecording();
-  }
-
-  JNIEXPORT void JNICALL
-  Java_app_organicmaps_sdk_location_TrackRecorder_nativeSaveTrackRecordingWithName(JNIEnv * env, jclass clazz, jstring name)
-  {
-    frm()->SaveTrackRecordingWithName(jni::ToNativeString(env, name));
-  }
-
-  JNIEXPORT jboolean JNICALL
-  Java_app_organicmaps_sdk_location_TrackRecorder_nativeIsTrackRecordingEmpty(JNIEnv * env, jclass clazz)
-  {
-    return frm()->IsTrackRecordingEmpty();
-  }
-
-  JNIEXPORT jboolean JNICALL
-  Java_app_organicmaps_sdk_location_TrackRecorder_nativeIsTrackRecordingEnabled(JNIEnv * env, jclass clazz)
-  {
-    return frm()->IsTrackRecordingEnabled();
-  }
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_location_TrackRecorder_nativeSetEnabled(JNIEnv * env, jclass clazz,
+                                                                                        jboolean enable)
+{
+  GpsTracker::Instance().SetEnabled(enable);
+  Framework * const f = frm();
+  if (f == nullptr)
+    return;
+  if (enable)
+    f->ConnectToGpsTracker();
+  else
+    f->DisconnectFromGpsTracker();
+}
+
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_location_TrackRecorder_nativeIsEnabled(JNIEnv * env, jclass clazz)
+{
+  return GpsTracker::Instance().IsEnabled();
+}
+
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_location_TrackRecorder_nativeStartTrackRecording(JNIEnv * env,
+                                                                                                 jclass clazz)
+{
+  frm()->StartTrackRecording();
+}
+
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_location_TrackRecorder_nativeStopTrackRecording(JNIEnv * env,
+                                                                                                jclass clazz)
+{
+  frm()->StopTrackRecording();
+}
+
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_location_TrackRecorder_nativeSaveTrackRecordingWithName(JNIEnv * env,
+                                                                                                        jclass clazz,
+                                                                                                        jstring name)
+{
+  frm()->SaveTrackRecordingWithName(jni::ToNativeString(env, name));
+}
+
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_location_TrackRecorder_nativeIsTrackRecordingEmpty(JNIEnv * env,
+                                                                                                       jclass clazz)
+{
+  return frm()->IsTrackRecordingEmpty();
+}
+
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_location_TrackRecorder_nativeIsTrackRecordingEnabled(JNIEnv * env,
+                                                                                                         jclass clazz)
+{
+  return frm()->IsTrackRecordingEnabled();
+}
 }
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/TrafficState.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/TrafficState.cpp
index 6206f6d3e..c0b29926e 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/TrafficState.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/TrafficState.cpp
@@ -9,41 +9,42 @@ extern "C"
 static void TrafficStateChanged(TrafficManager::TrafficState state, std::shared_ptr<jobject> const & listener)
 {
   JNIEnv * env = jni::GetEnv();
-  env->CallVoidMethod(*listener, jni::GetMethodID(env, *listener, "onTrafficStateChanged", "(I)V"), static_cast<jint>(state));
+  env->CallVoidMethod(*listener, jni::GetMethodID(env, *listener, "onTrafficStateChanged", "(I)V"),
+                      static_cast<jint>(state));
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_maplayer_traffic_TrafficState_nativeSetListener(JNIEnv * env, jclass clazz, jobject listener)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_maplayer_traffic_TrafficState_nativeSetListener(JNIEnv * env,
+                                                                                                jclass clazz,
+                                                                                                jobject listener)
 {
   CHECK(g_framework, ("Framework isn't created yet!"));
-  g_framework->SetTrafficStateListener(std::bind(&TrafficStateChanged, std::placeholders::_1, jni::make_global_ref(listener)));
+  g_framework->SetTrafficStateListener(
+      std::bind(&TrafficStateChanged, std::placeholders::_1, jni::make_global_ref(listener)));
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_maplayer_traffic_TrafficState_nativeRemoveListener(JNIEnv * env, jclass clazz)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_maplayer_traffic_TrafficState_nativeRemoveListener(JNIEnv * env,
+                                                                                                   jclass clazz)
 {
   CHECK(g_framework, ("Framework isn't created yet!"));
   g_framework->SetTrafficStateListener(TrafficManager::TrafficStateChangedFn());
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_maplayer_traffic_TrafficState_nativeEnable(JNIEnv * env, jclass clazz)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_maplayer_traffic_TrafficState_nativeEnable(JNIEnv * env, jclass clazz)
 {
   CHECK(g_framework, ("Framework isn't created yet!"));
   g_framework->EnableTraffic();
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_maplayer_traffic_TrafficState_nativeIsEnabled(JNIEnv * env, jclass clazz)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_maplayer_traffic_TrafficState_nativeIsEnabled(JNIEnv * env,
+                                                                                                  jclass clazz)
 {
   CHECK(g_framework, ("Framework isn't created yet!"));
   return static_cast<jboolean>(g_framework->IsTrafficEnabled());
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_maplayer_traffic_TrafficState_nativeDisable(JNIEnv * env, jclass clazz)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_maplayer_traffic_TrafficState_nativeDisable(JNIEnv * env, jclass clazz)
 {
   CHECK(g_framework, ("Framework isn't created yet!"));
   g_framework->DisableTraffic();
 }
-} // extern "C"
+}  // extern "C"
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.cpp
index 44d6424c3..455ccb557 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.cpp
@@ -27,107 +27,98 @@ void InjectMetadata(JNIEnv * env, jclass const clazz, jobject const mapObject, o
   });
 }
 
-//jobject CreatePopularity(JNIEnv * env, place_page::Info const & info)
+// jobject CreatePopularity(JNIEnv * env, place_page::Info const & info)
 //{
-//  static jclass const popularityClass =
-//    jni::GetGlobalClassRef(env, "app/organicmaps/sdk/search/Popularity");
-//  static jmethodID const popularityConstructor =
-//    jni::GetConstructorID(env, popularityClass, "(I)V");
-//  auto const popularityValue = info.GetPopularity();
-//  return env->NewObject(popularityClass, popularityConstructor, static_cast<jint>(popularityValue));
-//}
+//   static jclass const popularityClass =
+//     jni::GetGlobalClassRef(env, "app/organicmaps/sdk/search/Popularity");
+//   static jmethodID const popularityConstructor =
+//     jni::GetConstructorID(env, popularityClass, "(I)V");
+//   auto const popularityValue = info.GetPopularity();
+//   return env->NewObject(popularityClass, popularityConstructor, static_cast<jint>(popularityValue));
+// }
 
-jobject CreateMapObject(JNIEnv * env, place_page::Info const & info, int mapObjectType,
-                        double lat, double lon, bool parseMeta, bool parseApi,
-                        jobject const & routingPointInfo, jobject const & popularity, jobjectArray jrawTypes)
+jobject CreateMapObject(JNIEnv * env, place_page::Info const & info, int mapObjectType, double lat, double lon,
+                        bool parseMeta, bool parseApi, jobject const & routingPointInfo, jobject const & popularity,
+                        jobjectArray jrawTypes)
 {
   //  public MapObject(@NonNull FeatureId featureId, @MapObjectType int mapObjectType, String title,
   //                   @Nullable String secondaryTitle, String subtitle, String address,
   //                   double lat, double lon, String apiId, @Nullable RoutePointInfo routePointInfo,
   //                   @OpeningMode int openingMode, @NonNull Popularity popularity, @NonNull String description,
   //                   int roadWarningType, @Nullable String[] rawTypes)
-  static jmethodID const ctorId = jni::GetConstructorID(
-      env, g_mapObjectClazz,
-      "("
-      "Lapp/organicmaps/sdk/bookmarks/data/FeatureId;"  // featureId
-      "I"                                               // mapObjectType
-      "Ljava/lang/String;"                              // title
-      "Ljava/lang/String;"                              // secondaryTitle
-      "Ljava/lang/String;"                              // subtitle
-      "Ljava/lang/String;"                              // address
-      "DD"                                              // lat, lon
-      "Ljava/lang/String;"                              // appId
-      "Lapp/organicmaps/sdk/routing/RoutePointInfo;"    // routePointInfo
-      "I"                                               // openingMode
-      "Lapp/organicmaps/sdk/search/Popularity;"         // popularity
-      "Ljava/lang/String;"                              // description
-      "I"                                               // roadWarnType
-      "[Ljava/lang/String;"                             // rawTypes
-      ")V");
+  static jmethodID const ctorId =
+      jni::GetConstructorID(env, g_mapObjectClazz,
+                            "("
+                            "Lapp/organicmaps/sdk/bookmarks/data/FeatureId;"  // featureId
+                            "I"                                               // mapObjectType
+                            "Ljava/lang/String;"                              // title
+                            "Ljava/lang/String;"                              // secondaryTitle
+                            "Ljava/lang/String;"                              // subtitle
+                            "Ljava/lang/String;"                              // address
+                            "DD"                                              // lat, lon
+                            "Ljava/lang/String;"                              // appId
+                            "Lapp/organicmaps/sdk/routing/RoutePointInfo;"    // routePointInfo
+                            "I"                                               // openingMode
+                            "Lapp/organicmaps/sdk/search/Popularity;"         // popularity
+                            "Ljava/lang/String;"                              // description
+                            "I"                                               // roadWarnType
+                            "[Ljava/lang/String;"                             // rawTypes
+                            ")V");
 
-  //public FeatureId(@NonNull String mwmName, long mwmVersion, int featureIndex)
-  static jmethodID const featureCtorId =
-      jni::GetConstructorID(env, g_featureIdClazz, "(Ljava/lang/String;JI)V");
+  // public FeatureId(@NonNull String mwmName, long mwmVersion, int featureIndex)
+  static jmethodID const featureCtorId = jni::GetConstructorID(env, g_featureIdClazz, "(Ljava/lang/String;JI)V");
 
   auto const fID = info.GetID();
   jni::TScopedLocalRef jMwmName(env, jni::ToJavaString(env, fID.GetMwmName()));
-  jni::TScopedLocalRef jFeatureId(
-      env, env->NewObject(g_featureIdClazz, featureCtorId, jMwmName.get(), (jlong)fID.GetMwmVersion(),
-                          (jint)fID.m_index));
+  jni::TScopedLocalRef jFeatureId(env, env->NewObject(g_featureIdClazz, featureCtorId, jMwmName.get(),
+                                                      (jlong)fID.GetMwmVersion(), (jint)fID.m_index));
   jni::TScopedLocalRef jTitle(env, jni::ToJavaString(env, info.GetTitle()));
   jni::TScopedLocalRef jSecondaryTitle(env, jni::ToJavaString(env, info.GetSecondaryTitle()));
   jni::TScopedLocalRef jSubtitle(env, jni::ToJavaStringWithSupplementalCharsFix(env, info.GetSubtitle()));
   jni::TScopedLocalRef jAddress(env, jni::ToJavaString(env, info.GetSecondarySubtitle()));
   jni::TScopedLocalRef jApiId(env, jni::ToJavaString(env, parseApi ? info.GetApiUrl() : ""));
   jni::TScopedLocalRef jWikiDescription(env, jni::ToJavaString(env, info.GetWikiDescription()));
-  jobject mapObject =
-      env->NewObject(g_mapObjectClazz, ctorId, jFeatureId.get(), mapObjectType, jTitle.get(),
-                     jSecondaryTitle.get(), jSubtitle.get(), jAddress.get(), lat, lon, jApiId.get(),
-                     routingPointInfo,
-                     static_cast<jint>(info.GetOpeningMode()), popularity, jWikiDescription.get(),
-                     static_cast<jint>(info.GetRoadType()), jrawTypes);
+  jobject mapObject = env->NewObject(g_mapObjectClazz, ctorId, jFeatureId.get(), mapObjectType, jTitle.get(),
+                                     jSecondaryTitle.get(), jSubtitle.get(), jAddress.get(), lat, lon, jApiId.get(),
+                                     routingPointInfo, static_cast<jint>(info.GetOpeningMode()), popularity,
+                                     jWikiDescription.get(), static_cast<jint>(info.GetRoadType()), jrawTypes);
 
   if (parseMeta)
     InjectMetadata(env, g_mapObjectClazz, mapObject, info);
   return mapObject;
 }
 
-jobject CreateBookmark(JNIEnv *env, const place_page::Info &info,
-                       const jni::TScopedLocalObjectArrayRef &jrawTypes,
-                       const jni::TScopedLocalRef &routingPointInfo,
-                       jobject const & popularity)
+jobject CreateBookmark(JNIEnv * env, place_page::Info const & info, jni::TScopedLocalObjectArrayRef const & jrawTypes,
+                       jni::TScopedLocalRef const & routingPointInfo, jobject const & popularity)
 {
-  //public Bookmark(@NonNull FeatureId featureId, @IntRange(from = 0) long categoryId,
-  //                @IntRange(from = 0) long bookmarkId, String title, @Nullable String secondaryTitle,
-  //                @Nullable String subtitle, @Nullable String address, @Nullable RoutePointInfo routePointInfo,
-  //                @OpeningMode int openingMode, @NonNull Popularity popularity, @NonNull String description,
-  //                @Nullable String[] rawTypes)
+  // public Bookmark(@NonNull FeatureId featureId, @IntRange(from = 0) long categoryId,
+  //                 @IntRange(from = 0) long bookmarkId, String title, @Nullable String secondaryTitle,
+  //                 @Nullable String subtitle, @Nullable String address, @Nullable RoutePointInfo routePointInfo,
+  //                 @OpeningMode int openingMode, @NonNull Popularity popularity, @NonNull String description,
+  //                 @Nullable String[] rawTypes)
   static jmethodID const ctorId =
-          jni::GetConstructorID(env, g_bookmarkClazz,
-                                "(Lapp/organicmaps/sdk/bookmarks/data/FeatureId;JJLjava/lang/String;"
-                                "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;"
-                                "Lapp/organicmaps/sdk/routing/RoutePointInfo;"
-                                "ILapp/organicmaps/sdk/search/Popularity;Ljava/lang/String;"
-                                "[Ljava/lang/String;)V");
-  static jmethodID const featureCtorId =
-          jni::GetConstructorID(env, g_featureIdClazz, "(Ljava/lang/String;JI)V");
+      jni::GetConstructorID(env, g_bookmarkClazz,
+                            "(Lapp/organicmaps/sdk/bookmarks/data/FeatureId;JJLjava/lang/String;"
+                            "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;"
+                            "Lapp/organicmaps/sdk/routing/RoutePointInfo;"
+                            "ILapp/organicmaps/sdk/search/Popularity;Ljava/lang/String;"
+                            "[Ljava/lang/String;)V");
+  static jmethodID const featureCtorId = jni::GetConstructorID(env, g_featureIdClazz, "(Ljava/lang/String;JI)V");
 
   auto const bookmarkId = info.GetBookmarkId();
   auto const categoryId = info.GetBookmarkCategoryId();
   jni::TScopedLocalRef jMwmName(env, jni::ToJavaString(env, info.GetID().GetMwmName()));
-  jni::TScopedLocalRef jFeatureId(
-          env, env->NewObject(g_featureIdClazz, featureCtorId, jMwmName.get(),
-                              (jlong)info.GetID().GetMwmVersion(), (jint)info.GetID().m_index));
+  jni::TScopedLocalRef jFeatureId(env, env->NewObject(g_featureIdClazz, featureCtorId, jMwmName.get(),
+                                                      (jlong)info.GetID().GetMwmVersion(), (jint)info.GetID().m_index));
   jni::TScopedLocalRef jTitle(env, jni::ToJavaString(env, info.GetTitle()));
   jni::TScopedLocalRef jSecondaryTitle(env, jni::ToJavaString(env, info.GetSecondaryTitle()));
   jni::TScopedLocalRef jSubtitle(env, jni::ToJavaStringWithSupplementalCharsFix(env, info.GetSubtitle()));
   jni::TScopedLocalRef jAddress(env, jni::ToJavaString(env, info.GetSecondarySubtitle()));
   jni::TScopedLocalRef jWikiDescription(env, jni::ToJavaString(env, info.GetWikiDescription()));
-  jobject mapObject = env->NewObject(
-          g_bookmarkClazz, ctorId, jFeatureId.get(), static_cast<jlong>(categoryId),
-          static_cast<jlong>(bookmarkId), jTitle.get(), jSecondaryTitle.get(), jSubtitle.get(),
-          jAddress.get(), routingPointInfo.get(), info.GetOpeningMode(), popularity,
-          jWikiDescription.get(), jrawTypes.get());
+  jobject mapObject = env->NewObject(g_bookmarkClazz, ctorId, jFeatureId.get(), static_cast<jlong>(categoryId),
+                                     static_cast<jlong>(bookmarkId), jTitle.get(), jSecondaryTitle.get(),
+                                     jSubtitle.get(), jAddress.get(), routingPointInfo.get(), info.GetOpeningMode(),
+                                     popularity, jWikiDescription.get(), jrawTypes.get());
 
   if (info.HasMetadata())
     InjectMetadata(env, g_mapObjectClazz, mapObject, info);
@@ -139,9 +130,8 @@ jobject CreateElevationPoint(JNIEnv * env, ElevationInfo::Point const & point)
   static jclass const pointClass =
       jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/ElevationInfo$Point");
   // public Point(double distance, int altitude)
-  static jmethodID const pointCtorId =
-      jni::GetConstructorID(env, pointClass, "(DI)V");
-  return env->NewObject(pointClass, pointCtorId, static_cast<jdouble >(point.m_distance),
+  static jmethodID const pointCtorId = jni::GetConstructorID(env, pointClass, "(DI)V");
+  return env->NewObject(pointClass, pointCtorId, static_cast<jdouble>(point.m_distance),
                         static_cast<jint>(point.m_point.GetAltitude()));
 }
 
@@ -150,11 +140,8 @@ jobjectArray ToElevationPointArray(JNIEnv * env, ElevationInfo::Points const & p
   CHECK(!points.empty(), ("Elevation points must be non empty!"));
   static jclass const pointClass =
       jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/ElevationInfo$Point");
-  return jni::ToJavaArray(env, pointClass, points,
-                         [](JNIEnv * env, ElevationInfo::Point const & item)
-                         {
-                           return CreateElevationPoint(env, item);
-                         });
+  return jni::ToJavaArray(env, pointClass, points, [](JNIEnv * env, ElevationInfo::Point const & item)
+  { return CreateElevationPoint(env, item); });
 }
 
 jobject CreateElevationInfo(JNIEnv * env, ElevationInfo const & info)
@@ -162,18 +149,18 @@ jobject CreateElevationInfo(JNIEnv * env, ElevationInfo const & info)
   // public ElevationInfo(long trackId, @NonNull String name, @NonNull Point[] points,
   //                      int ascent, int descent, int minAltitude, int maxAltitude, int difficulty,
   //                      long m_duration)
-  static jmethodID const ctorId =
-      jni::GetConstructorID(env, g_elevationInfoClazz, "(JLjava/lang/String;Ljava/lang/String;"
-                                                       "[Lapp/organicmaps/sdk/bookmarks/data/ElevationInfo$Point;"
-                                                       "IIIIIJ)V");
+  static jmethodID const ctorId = jni::GetConstructorID(env, g_elevationInfoClazz,
+                                                        "(JLjava/lang/String;Ljava/lang/String;"
+                                                        "[Lapp/organicmaps/sdk/bookmarks/data/ElevationInfo$Point;"
+                                                        "IIIIIJ)V");
   jni::TScopedLocalObjectArrayRef jPoints(env, ToElevationPointArray(env, info.GetPoints()));
-  // TODO (KK): elevation info should have only the elevation data - see the https://github.com/organicmaps/organicmaps/pull/10063
-  return env->NewObject(g_elevationInfoClazz, ctorId,
-                        jPoints.get(),
-//                        static_cast<jint>(info.GetAscent()),
-//                        static_cast<jint>(info.GetDescent()),
-//                        static_cast<jint>(info.GetMinAltitude()),
-//                        static_cast<jint>(info.GetMaxAltitude()),
+  // TODO (KK): elevation info should have only the elevation data - see the
+  // https://github.com/organicmaps/organicmaps/pull/10063
+  return env->NewObject(g_elevationInfoClazz, ctorId, jPoints.get(),
+                        //                        static_cast<jint>(info.GetAscent()),
+                        //                        static_cast<jint>(info.GetDescent()),
+                        //                        static_cast<jint>(info.GetMinAltitude()),
+                        //                        static_cast<jint>(info.GetMaxAltitude()),
                         static_cast<jint>(info.GetDifficulty()));
 }
 
@@ -185,46 +172,39 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info)
   if (info.IsRoutePoint())
     routingPointInfo.reset(CreateRoutePointInfo(env, info));
 
-  //jni::TScopedLocalRef popularity(env, CreatePopularity(env, info));
+  // jni::TScopedLocalRef popularity(env, CreatePopularity(env, info));
   jobject popularity = nullptr;
 
   if (info.IsBookmark())
-  {
     return CreateBookmark(env, info, jrawTypes, routingPointInfo, popularity);
-  }
 
   ms::LatLon const ll = info.GetLatLon();
   // TODO(yunikkk): object can be POI + API + search result + bookmark simultaneously.
   // TODO(yunikkk): Should we pass localized strings here and in other methods as byte arrays?
   if (info.IsMyPosition())
   {
-    return CreateMapObject(env, info, kMyPosition, ll.m_lat, ll.m_lon,
-                           false /* parseMeta */, false /* parseApi */,
+    return CreateMapObject(env, info, kMyPosition, ll.m_lat, ll.m_lon, false /* parseMeta */, false /* parseApi */,
                            routingPointInfo.get(), popularity, jrawTypes.get());
   }
 
   if (info.HasApiUrl())
   {
-    return CreateMapObject(env, info, kApiPoint, ll.m_lat, ll.m_lon,
-                           true /* parseMeta */, true /* parseApi */,
+    return CreateMapObject(env, info, kApiPoint, ll.m_lat, ll.m_lon, true /* parseMeta */, true /* parseApi */,
                            routingPointInfo.get(), popularity, jrawTypes.get());
   }
 
-  return CreateMapObject(env, info, kPoi, ll.m_lat, ll.m_lon,
-                         true /* parseMeta */, false /* parseApi */,
+  return CreateMapObject(env, info, kPoi, ll.m_lat, ll.m_lon, true /* parseMeta */, false /* parseApi */,
                          routingPointInfo.get(), popularity, jrawTypes.get());
 }
 
 jobject CreateFeatureId(JNIEnv * env, FeatureID const & fid)
 {
-  static jmethodID const featureCtorId =
-    jni::GetConstructorID(env, g_featureIdClazz, "(Ljava/lang/String;JI)V");
+  static jmethodID const featureCtorId = jni::GetConstructorID(env, g_featureIdClazz, "(Ljava/lang/String;JI)V");
 
   auto const & info = fid.m_mwmId.GetInfo();
   jni::TScopedLocalRef jMwmName(env, jni::ToJavaString(env, info ? info->GetCountryName() : ""));
   return env->NewObject(g_featureIdClazz, featureCtorId, jMwmName.get(),
-                        info ? static_cast<jlong>(info->GetVersion()) : 0,
-                        static_cast<jint>(fid.m_index));
+                        info ? static_cast<jlong>(info->GetVersion()) : 0, static_cast<jint>(fid.m_index));
 }
 
 jobjectArray ToFeatureIdArray(JNIEnv * env, std::vector<FeatureID> const & ids)
@@ -233,8 +213,6 @@ jobjectArray ToFeatureIdArray(JNIEnv * env, std::vector<FeatureID> const & ids)
     return nullptr;
 
   return jni::ToJavaArray(env, g_featureIdClazz, ids,
-                          [](JNIEnv * env, FeatureID const & fid) {
-                            return CreateFeatureId(env, fid);
-                          });
+                          [](JNIEnv * env, FeatureID const & fid) { return CreateFeatureId(env, fid); });
 }
 }  // namespace usermark_helper
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.hpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.hpp
index e67e0254d..242d3ef53 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.hpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.hpp
@@ -2,8 +2,8 @@
 
 #include <jni.h>
 
-#include "app/organicmaps/sdk/core/jni_helper.hpp"
 #include "app/organicmaps/sdk/Framework.hpp"
+#include "app/organicmaps/sdk/core/jni_helper.hpp"
 
 #include <vector>
 
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/BookmarkManager.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/BookmarkManager.cpp
index 8048629be..15a997d6e 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/BookmarkManager.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/BookmarkManager.cpp
@@ -1,12 +1,11 @@
-#include "app/organicmaps/sdk/core/jni_helper.hpp"
 #include "app/organicmaps/sdk/Framework.hpp"
 #include "app/organicmaps/sdk/UserMarkHelper.hpp"
+#include "app/organicmaps/sdk/core/jni_helper.hpp"
 #include "app/organicmaps/sdk/util/Distance.hpp"
 
 #include "map/bookmark_helpers.hpp"
 #include "map/place_page_info.hpp"
 
-
 #include "coding/zip_creator.hpp"
 
 #include "platform/localization.hpp"
@@ -44,70 +43,56 @@ jmethodID g_onBookmarksSortingCancelled;
 jmethodID g_bookmarkInfoConstructor;
 jclass g_bookmarkInfoClass;
 
-
 void PrepareClassRefs(JNIEnv * env)
 {
   if (g_bookmarkManagerClass)
     return;
 
-  g_bookmarkManagerClass =
-    jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/BookmarkManager");
+  g_bookmarkManagerClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/BookmarkManager");
   g_bookmarkManagerInstanceField = jni::GetStaticFieldID(env, g_bookmarkManagerClass, "INSTANCE",
-    "Lapp/organicmaps/sdk/bookmarks/data/BookmarkManager;");
+                                                         "Lapp/organicmaps/sdk/bookmarks/data/BookmarkManager;");
 
-  jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass,
-                                                              g_bookmarkManagerInstanceField);
-  g_onBookmarksChangedMethod =
-    jni::GetMethodID(env, bookmarkManagerInstance, "onBookmarksChanged", "()V");
+  jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass, g_bookmarkManagerInstanceField);
+  g_onBookmarksChangedMethod = jni::GetMethodID(env, bookmarkManagerInstance, "onBookmarksChanged", "()V");
   g_onBookmarksLoadingStartedMethod =
-    jni::GetMethodID(env, bookmarkManagerInstance, "onBookmarksLoadingStarted", "()V");
+      jni::GetMethodID(env, bookmarkManagerInstance, "onBookmarksLoadingStarted", "()V");
   g_onBookmarksLoadingFinishedMethod =
-    jni::GetMethodID(env, bookmarkManagerInstance, "onBookmarksLoadingFinished", "()V");
+      jni::GetMethodID(env, bookmarkManagerInstance, "onBookmarksLoadingFinished", "()V");
   g_onBookmarksFileLoadedMethod =
-    jni::GetMethodID(env, bookmarkManagerInstance, "onBookmarksFileLoaded",
-                     "(ZLjava/lang/String;Z)V");
-  g_onPreparedFileForSharingMethod =
-    jni::GetMethodID(env, bookmarkManagerInstance, "onPreparedFileForSharing",
-                     "(Lapp/organicmaps/sdk/bookmarks/data/BookmarkSharingResult;)V");
+      jni::GetMethodID(env, bookmarkManagerInstance, "onBookmarksFileLoaded", "(ZLjava/lang/String;Z)V");
+  g_onPreparedFileForSharingMethod = jni::GetMethodID(env, bookmarkManagerInstance, "onPreparedFileForSharing",
+                                                      "(Lapp/organicmaps/sdk/bookmarks/data/BookmarkSharingResult;)V");
 
-  g_longClass = jni::GetGlobalClassRef(env,"java/lang/Long");
+  g_longClass = jni::GetGlobalClassRef(env, "java/lang/Long");
   g_longConstructor = jni::GetConstructorID(env, g_longClass, "(J)V");
-  g_sortedBlockClass =
-    jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/SortedBlock");
+  g_sortedBlockClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/SortedBlock");
   g_sortedBlockConstructor =
-    jni::GetConstructorID(env, g_sortedBlockClass,
-                          "(Ljava/lang/String;[Ljava/lang/Long;[Ljava/lang/Long;)V");
+      jni::GetConstructorID(env, g_sortedBlockClass, "(Ljava/lang/String;[Ljava/lang/Long;[Ljava/lang/Long;)V");
 
+  g_onBookmarksSortingCompleted = jni::GetMethodID(env, bookmarkManagerInstance, "onBookmarksSortingCompleted",
+                                                   "([Lapp/organicmaps/sdk/bookmarks/data/SortedBlock;J)V");
+  g_onBookmarksSortingCancelled = jni::GetMethodID(env, bookmarkManagerInstance, "onBookmarksSortingCancelled", "(J)V");
+  g_bookmarkInfoClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/BookmarkInfo");
+  g_bookmarkInfoConstructor = jni::GetConstructorID(env, g_bookmarkInfoClass, "(JJ)V");
+  g_bookmarkCategoryClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/BookmarkCategory");
 
-  g_onBookmarksSortingCompleted = jni::GetMethodID(env, bookmarkManagerInstance,
-    "onBookmarksSortingCompleted", "([Lapp/organicmaps/sdk/bookmarks/data/SortedBlock;J)V");
-  g_onBookmarksSortingCancelled = jni::GetMethodID(env, bookmarkManagerInstance,
-    "onBookmarksSortingCancelled", "(J)V");
-  g_bookmarkInfoClass =
-    jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/BookmarkInfo");
-  g_bookmarkInfoConstructor =
-    jni::GetConstructorID(env, g_bookmarkInfoClass, "(JJ)V" );
-  g_bookmarkCategoryClass =
-    jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/BookmarkCategory");
-
-//public BookmarkCategory(long id,
-//                          String name,
-//                          String annotation,
-//                          String desc,
-//                          int tracksCount,
-//                          int bookmarksCount,
-//                          boolean isVisible)
-  g_bookmarkCategoryConstructor =
-      jni::GetConstructorID(env, g_bookmarkCategoryClass,
-                            "("
-                            "J"                   // id
-                            "Ljava/lang/String;"  // name
-                            "Ljava/lang/String;"  // annotation
-                            "Ljava/lang/String;"  // desc
-                            "I"                   // tracksCount
-                            "I"                   // bookmarksCount
-                            "Z"                   // isVisible
-                            ")V");
+  // public BookmarkCategory(long id,
+  //                           String name,
+  //                           String annotation,
+  //                           String desc,
+  //                           int tracksCount,
+  //                           int bookmarksCount,
+  //                           boolean isVisible)
+  g_bookmarkCategoryConstructor = jni::GetConstructorID(env, g_bookmarkCategoryClass,
+                                                        "("
+                                                        "J"                   // id
+                                                        "Ljava/lang/String;"  // name
+                                                        "Ljava/lang/String;"  // annotation
+                                                        "Ljava/lang/String;"  // desc
+                                                        "I"                   // tracksCount
+                                                        "I"                   // bookmarksCount
+                                                        "Z"                   // isVisible
+                                                        ")V");
   g_onElevationCurrentPositionChangedMethod =
       jni::GetMethodID(env, bookmarkManagerInstance, "onElevationCurrentPositionChanged", "()V");
   g_onElevationActivePointChangedMethod =
@@ -117,8 +102,7 @@ void PrepareClassRefs(JNIEnv * env)
 void OnElevationCurPositionChanged(JNIEnv * env)
 {
   ASSERT(g_bookmarkManagerClass, ());
-  jobject bookmarkManagerInstance =
-      env->GetStaticObjectField(g_bookmarkManagerClass, g_bookmarkManagerInstanceField);
+  jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass, g_bookmarkManagerInstanceField);
   env->CallVoidMethod(bookmarkManagerInstance, g_onElevationCurrentPositionChangedMethod);
   jni::HandleJavaException(env);
 }
@@ -126,8 +110,7 @@ void OnElevationCurPositionChanged(JNIEnv * env)
 void OnElevationActivePointChanged(JNIEnv * env)
 {
   ASSERT(g_bookmarkManagerClass, ());
-  jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass,
-                                                              g_bookmarkManagerInstanceField);
+  jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass, g_bookmarkManagerInstanceField);
   env->CallVoidMethod(bookmarkManagerInstance, g_onElevationActivePointChangedMethod);
   jni::HandleJavaException(env);
 }
@@ -135,8 +118,7 @@ void OnElevationActivePointChanged(JNIEnv * env)
 void OnBookmarksChanged(JNIEnv * env)
 {
   ASSERT(g_bookmarkManagerClass, ());
-  jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass,
-                                                              g_bookmarkManagerInstanceField);
+  jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass, g_bookmarkManagerInstanceField);
   env->CallVoidMethod(bookmarkManagerInstance, g_onBookmarksChangedMethod);
   jni::HandleJavaException(env);
 }
@@ -144,8 +126,7 @@ void OnBookmarksChanged(JNIEnv * env)
 void OnAsyncLoadingStarted(JNIEnv * env)
 {
   ASSERT(g_bookmarkManagerClass, ());
-  jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass,
-                                                              g_bookmarkManagerInstanceField);
+  jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass, g_bookmarkManagerInstanceField);
   env->CallVoidMethod(bookmarkManagerInstance, g_onBookmarksLoadingStartedMethod);
   jni::HandleJavaException(env);
 }
@@ -153,8 +134,7 @@ void OnAsyncLoadingStarted(JNIEnv * env)
 void OnAsyncLoadingFinished(JNIEnv * env)
 {
   ASSERT(g_bookmarkManagerClass, ());
-  jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass,
-                                                              g_bookmarkManagerInstanceField);
+  jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass, g_bookmarkManagerInstanceField);
   env->CallVoidMethod(bookmarkManagerInstance, g_onBookmarksLoadingFinishedMethod);
   jni::HandleJavaException(env);
 }
@@ -162,41 +142,44 @@ void OnAsyncLoadingFinished(JNIEnv * env)
 void OnAsyncLoadingFileSuccess(JNIEnv * env, std::string const & fileName, bool isTemporaryFile)
 {
   ASSERT(g_bookmarkManagerClass, ());
-  jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass,
-                                                              g_bookmarkManagerInstanceField);
+  jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass, g_bookmarkManagerInstanceField);
   jni::TScopedLocalRef jFileName(env, jni::ToJavaString(env, fileName));
-  env->CallVoidMethod(bookmarkManagerInstance, g_onBookmarksFileLoadedMethod,
-                      true /* success */, jFileName.get(), isTemporaryFile);
+  env->CallVoidMethod(bookmarkManagerInstance, g_onBookmarksFileLoadedMethod, true /* success */, jFileName.get(),
+                      isTemporaryFile);
   jni::HandleJavaException(env);
 }
 
 void OnAsyncLoadingFileError(JNIEnv * env, std::string const & fileName, bool isTemporaryFile)
 {
   ASSERT(g_bookmarkManagerClass, ());
-  jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass,
-                                                              g_bookmarkManagerInstanceField);
+  jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass, g_bookmarkManagerInstanceField);
   jni::TScopedLocalRef jFileName(env, jni::ToJavaString(env, fileName));
-  env->CallVoidMethod(bookmarkManagerInstance, g_onBookmarksFileLoadedMethod,
-                      false /* success */, jFileName.get(), isTemporaryFile);
+  env->CallVoidMethod(bookmarkManagerInstance, g_onBookmarksFileLoadedMethod, false /* success */, jFileName.get(),
+                      isTemporaryFile);
   jni::HandleJavaException(env);
 }
 
 void OnPreparedFileForSharing(JNIEnv * env, BookmarkManager::SharingResult const & result)
 {
-  static jclass const classBookmarkSharingResult = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/BookmarkSharingResult");
-  // BookmarkSharingResult(long[] categoriesIds, @Code int code, @NonNull String sharingPath, @NonNull String mimeType, @NonNull String errorString)
-  static jmethodID const ctorBookmarkSharingResult = jni::GetConstructorID(env, classBookmarkSharingResult, "([JILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
+  static jclass const classBookmarkSharingResult =
+      jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/BookmarkSharingResult");
+  // BookmarkSharingResult(long[] categoriesIds, @Code int code, @NonNull String sharingPath, @NonNull String mimeType,
+  // @NonNull String errorString)
+  static jmethodID const ctorBookmarkSharingResult = jni::GetConstructorID(
+      env, classBookmarkSharingResult, "([JILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
 
   static_assert(sizeof(jlong) == sizeof(decltype(result.m_categoriesIds)::value_type));
   jsize const categoriesIdsSize = static_cast<jsize>(result.m_categoriesIds.size());
   jni::ScopedLocalRef<jlongArray> categoriesIds(env, env->NewLongArray(categoriesIdsSize));
-  env->SetLongArrayRegion(categoriesIds.get(), 0, categoriesIdsSize, reinterpret_cast<jlong const *>(result.m_categoriesIds.data()));
+  env->SetLongArrayRegion(categoriesIds.get(), 0, categoriesIdsSize,
+                          reinterpret_cast<jlong const *>(result.m_categoriesIds.data()));
   jni::TScopedLocalRef const sharingPath(env, jni::ToJavaString(env, result.m_sharingPath));
   jni::TScopedLocalRef const mimeType(env, jni::ToJavaString(env, result.m_mimeType));
   jni::TScopedLocalRef const errorString(env, jni::ToJavaString(env, result.m_errorString));
 
-  jni::TScopedLocalRef const sharingResult(env, env->NewObject(classBookmarkSharingResult, ctorBookmarkSharingResult,
-      categoriesIds.get(), static_cast<jint>(result.m_code), sharingPath.get(), mimeType.get(), errorString.get()));
+  jni::TScopedLocalRef const sharingResult(
+      env, env->NewObject(classBookmarkSharingResult, ctorBookmarkSharingResult, categoriesIds.get(),
+                          static_cast<jint>(result.m_code), sharingPath.get(), mimeType.get(), errorString.get()));
 
   ASSERT(g_bookmarkManagerClass, ());
   jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass, g_bookmarkManagerInstanceField);
@@ -212,45 +195,34 @@ void OnCategorySortingResults(JNIEnv * env, long long timestamp,
   ASSERT(g_sortedBlockClass, ());
   ASSERT(g_sortedBlockConstructor, ());
 
-  jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass,
-                                                              g_bookmarkManagerInstanceField);
+  jobject bookmarkManagerInstance = env->GetStaticObjectField(g_bookmarkManagerClass, g_bookmarkManagerInstanceField);
 
   if (status == BookmarkManager::SortParams::Status::Cancelled)
   {
-    env->CallVoidMethod(bookmarkManagerInstance, g_onBookmarksSortingCancelled,
-                        static_cast<jlong>(timestamp));
+    env->CallVoidMethod(bookmarkManagerInstance, g_onBookmarksSortingCancelled, static_cast<jlong>(timestamp));
     jni::HandleJavaException(env);
     return;
   }
 
-  jni::TScopedLocalObjectArrayRef blocksRef(env,
-      jni::ToJavaArray(env, g_sortedBlockClass, sortedBlocks,
-          [](JNIEnv * env, BookmarkManager::SortedBlock const & block)
-          {
-            jni::TScopedLocalRef blockNameRef(env, jni::ToJavaString(env, block.m_blockName));
+  jni::TScopedLocalObjectArrayRef blocksRef(
+      env, jni::ToJavaArray(env, g_sortedBlockClass, sortedBlocks,
+                            [](JNIEnv * env, BookmarkManager::SortedBlock const & block)
+  {
+    jni::TScopedLocalRef blockNameRef(env, jni::ToJavaString(env, block.m_blockName));
 
-            jni::TScopedLocalObjectArrayRef marksRef(env,
-                jni::ToJavaArray(env, g_longClass, block.m_markIds,
-                    [](JNIEnv * env, kml::MarkId const & markId)
-                    {
-                      return env->NewObject(g_longClass, g_longConstructor,
-                          static_cast<jlong>(markId));
-                    }));
+    jni::TScopedLocalObjectArrayRef marksRef(
+        env, jni::ToJavaArray(env, g_longClass, block.m_markIds, [](JNIEnv * env, kml::MarkId const & markId)
+    { return env->NewObject(g_longClass, g_longConstructor, static_cast<jlong>(markId)); }));
 
-            jni::TScopedLocalObjectArrayRef tracksRef(env,
-                jni::ToJavaArray(env, g_longClass, block.m_trackIds,
-                    [](JNIEnv * env, kml::TrackId const & trackId)
-                    {
-                      return env->NewObject(g_longClass, g_longConstructor,
-                          static_cast<jlong>(trackId));
-                    }));
+    jni::TScopedLocalObjectArrayRef tracksRef(
+        env, jni::ToJavaArray(env, g_longClass, block.m_trackIds, [](JNIEnv * env, kml::TrackId const & trackId)
+    { return env->NewObject(g_longClass, g_longConstructor, static_cast<jlong>(trackId)); }));
 
-            return env->NewObject(g_sortedBlockClass, g_sortedBlockConstructor,
-                                 blockNameRef.get(), marksRef.get(), tracksRef.get());
-
-          }));
-  env->CallVoidMethod(bookmarkManagerInstance, g_onBookmarksSortingCompleted,
-                      blocksRef.get(), static_cast<jlong>(timestamp));
+    return env->NewObject(g_sortedBlockClass, g_sortedBlockConstructor, blockNameRef.get(), marksRef.get(),
+                          tracksRef.get());
+  }));
+  env->CallVoidMethod(bookmarkManagerInstance, g_onBookmarksSortingCompleted, blocksRef.get(),
+                      static_cast<jlong>(timestamp));
   jni::HandleJavaException(env);
 }
 
@@ -277,14 +249,9 @@ jobject MakeCategory(JNIEnv * env, kml::MarkGroupId id)
   jni::TScopedLocalRef annotationRef(env, jni::ToJavaString(env, annotation));
   jni::TScopedLocalRef descriptionRef(env, jni::ToJavaString(env, description));
 
-  return env->NewObject(g_bookmarkCategoryClass,
-                        g_bookmarkCategoryConstructor,
-                        static_cast<jlong>(data.m_id),
-                        preferBookmarkStrRef.get(),
-                        annotationRef.get(),
-                        descriptionRef.get(),
-                        static_cast<jint>(tracksCount),
-                        static_cast<jint>(bookmarksCount),
+  return env->NewObject(g_bookmarkCategoryClass, g_bookmarkCategoryConstructor, static_cast<jlong>(data.m_id),
+                        preferBookmarkStrRef.get(), annotationRef.get(), descriptionRef.get(),
+                        static_cast<jint>(tracksCount), static_cast<jint>(bookmarksCount),
                         static_cast<jboolean>(isVisible));
 }
 
@@ -296,22 +263,20 @@ jobjectArray MakeCategories(JNIEnv * env, kml::GroupIdCollection const & ids)
 
 extern "C"
 {
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeShowBookmarkOnMap(
-    JNIEnv *, jobject, jlong bmkId)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeShowBookmarkOnMap(JNIEnv *,
+                                                                                                       jobject,
+                                                                                                       jlong bmkId)
 {
   frm()->ShowBookmark(static_cast<kml::MarkId>(bmkId));
 }
 
 JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeShowBookmarkCategoryOnMap(
-    JNIEnv *, jobject, jlong catId)
+Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeShowBookmarkCategoryOnMap(JNIEnv *, jobject, jlong catId)
 {
   frm()->ShowBookmarkCategory(static_cast<kml::MarkGroupId>(catId), true /* animated */);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeLoadBookmarks(JNIEnv * env, jclass)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeLoadBookmarks(JNIEnv * env, jclass)
 {
   PrepareClassRefs(env);
   BookmarkManager::AsyncLoadingCallbacks callbacks;
@@ -326,39 +291,38 @@ Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeLoadBookmarks(JNIE
   frm()->LoadBookmarks();
 }
 
-JNIEXPORT jlong JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeCreateCategory(
-     JNIEnv * env, jobject, jstring name)
+JNIEXPORT jlong JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeCreateCategory(JNIEnv * env,
+                                                                                                     jobject,
+                                                                                                     jstring name)
 {
   auto const categoryId = frm()->GetBookmarkManager().CreateBookmarkCategory(ToNativeString(env, name));
   frm()->GetBookmarkManager().SetLastEditedBmCategory(categoryId);
   return static_cast<jlong>(categoryId);
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeDeleteCategory(
-     JNIEnv *, jobject, jlong catId)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeDeleteCategory(JNIEnv *,
+                                                                                                        jobject,
+                                                                                                        jlong catId)
 {
   auto const categoryId = static_cast<kml::MarkGroupId>(catId);
   // `permanently` should be set to false when the Recently Deleted Lists feature be implemented
-  return static_cast<jboolean>(frm()->GetBookmarkManager().GetEditSession().DeleteBmCategory(categoryId, true /* permanently */));
+  return static_cast<jboolean>(
+      frm()->GetBookmarkManager().GetEditSession().DeleteBmCategory(categoryId, true /* permanently */));
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeDeleteBookmark(JNIEnv *, jobject, jlong bmkId)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeDeleteBookmark(JNIEnv *, jobject,
+                                                                                                    jlong bmkId)
 {
   frm()->GetBookmarkManager().GetEditSession().DeleteBookmark(static_cast<kml::MarkId>(bmkId));
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeDeleteTrack(
-    JNIEnv *, jobject, jlong trkId)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeDeleteTrack(JNIEnv *, jobject,
+                                                                                                 jlong trkId)
 {
   frm()->GetBookmarkManager().GetEditSession().DeleteTrack(static_cast<kml::TrackId>(trkId));
 }
 
-JNIEXPORT jobject JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeAddBookmarkToLastEditedCategory(
+JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeAddBookmarkToLastEditedCategory(
     JNIEnv * env, jobject, double lat, double lon)
 {
   if (!frm()->HasPlacePageInfo())
@@ -377,8 +341,7 @@ Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeAddBookmarkToLastE
   if (info.IsFeature())
     SaveFeatureTypes(info.GetTypes(), bmData);
 
-  auto const * createdBookmark = bmMng.GetEditSession().CreateBookmark(std::move(bmData),
-    lastEditedCategory);
+  auto const * createdBookmark = bmMng.GetEditSession().CreateBookmark(std::move(bmData), lastEditedCategory);
 
   auto buildInfo = info.GetBuildInfo();
   buildInfo.m_match = place_page::BuildInfo::Match::Everything;
@@ -388,23 +351,20 @@ Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeAddBookmarkToLastE
   return usermark_helper::CreateMapObject(env, g_framework->GetPlacePageInfo());
 }
 
-JNIEXPORT jlong JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetLastEditedCategory(
-      JNIEnv *, jobject)
+JNIEXPORT jlong JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetLastEditedCategory(JNIEnv *,
+                                                                                                            jobject)
 {
   return static_cast<jlong>(frm()->LastEditedBMCategory());
 }
 
-JNIEXPORT jint JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetLastEditedColor(
-        JNIEnv *, jobject)
+JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetLastEditedColor(JNIEnv *,
+                                                                                                        jobject)
 {
   return static_cast<jint>(frm()->LastEditedBMColor());
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeLoadBookmarksFile(JNIEnv * env, jclass,
-                                                                                jstring path, jboolean isTemporaryFile)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeLoadBookmarksFile(
+    JNIEnv * env, jclass, jstring path, jboolean isTemporaryFile)
 {
   frm()->AddBookmarksFile(ToNativeString(env, path), isTemporaryFile);
 }
@@ -415,40 +375,36 @@ Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeIsAsyncBookmarksLo
   return static_cast<jboolean>(frm()->GetBookmarkManager().IsAsyncLoadingInProgress());
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeIsVisible(
-    JNIEnv *, jobject, jlong catId)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeIsVisible(JNIEnv *, jobject,
+                                                                                                   jlong catId)
 {
   return static_cast<jboolean>(frm()->GetBookmarkManager().IsVisible(static_cast<kml::MarkGroupId>(catId)));
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetVisibility(
-    JNIEnv *, jobject, jlong catId, jboolean isVisible)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetVisibility(JNIEnv *, jobject,
+                                                                                                   jlong catId,
+                                                                                                   jboolean isVisible)
 {
   frm()->GetBookmarkManager().GetEditSession().SetIsVisible(static_cast<kml::MarkGroupId>(catId), isVisible);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetCategoryName(
-    JNIEnv * env, jobject, jlong catId, jstring name)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetCategoryName(JNIEnv * env,
+                                                                                                     jobject,
+                                                                                                     jlong catId,
+                                                                                                     jstring name)
 {
   frm()->GetBookmarkManager().GetEditSession().SetCategoryName(static_cast<kml::MarkGroupId>(catId),
                                                                jni::ToNativeString(env, name));
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetCategoryDescription(JNIEnv * env,
-                                                                                     jobject,
-                                                                                     jlong catId,
-                                                                                     jstring desc)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetCategoryDescription(
+    JNIEnv * env, jobject, jlong catId, jstring desc)
 {
-  frm()->GetBookmarkManager().GetEditSession().SetCategoryDescription(
-      static_cast<kml::MarkGroupId>(catId), jni::ToNativeString(env, desc));
+  frm()->GetBookmarkManager().GetEditSession().SetCategoryDescription(static_cast<kml::MarkGroupId>(catId),
+                                                                      jni::ToNativeString(env, desc));
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetCategoryTags(
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetCategoryTags(
     JNIEnv * env, jobject, jlong catId, jobjectArray tagsIds)
 {
   auto const size = env->GetArrayLength(tagsIds);
@@ -460,29 +416,25 @@ Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetCategoryTags(
     categoryTags.push_back(jni::ToNativeString(env, static_cast<jstring>(item.get())));
   }
 
-  frm()->GetBookmarkManager().GetEditSession().SetCategoryTags(static_cast<kml::MarkGroupId>(catId),
-                                                               categoryTags);
+  frm()->GetBookmarkManager().GetEditSession().SetCategoryTags(static_cast<kml::MarkGroupId>(catId), categoryTags);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetCategoryAccessRules(
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetCategoryAccessRules(
     JNIEnv *, jobject, jlong catId, jint accessRules)
 {
-  frm()->GetBookmarkManager().GetEditSession().SetCategoryAccessRules(
-    static_cast<kml::MarkGroupId>(catId), static_cast<kml::AccessRules>(accessRules));
+  frm()->GetBookmarkManager().GetEditSession().SetCategoryAccessRules(static_cast<kml::MarkGroupId>(catId),
+                                                                      static_cast<kml::AccessRules>(accessRules));
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetCategoryCustomProperty(
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetCategoryCustomProperty(
     JNIEnv * env, jobject, jlong catId, jstring key, jstring value)
 {
   frm()->GetBookmarkManager().GetEditSession().SetCategoryCustomProperty(
-    static_cast<kml::MarkGroupId>(catId), ToNativeString(env, key), ToNativeString(env, value));
+      static_cast<kml::MarkGroupId>(catId), ToNativeString(env, key), ToNativeString(env, value));
 }
 
-JNIEXPORT jobject JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeUpdateBookmarkPlacePage(
-     JNIEnv * env, jobject, jlong bmkId)
+JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeUpdateBookmarkPlacePage(
+    JNIEnv * env, jobject, jlong bmkId)
 {
   if (!frm()->HasPlacePageInfo())
     return nullptr;
@@ -495,21 +447,19 @@ Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeUpdateBookmarkPlac
   return usermark_helper::CreateMapObject(env, g_framework->GetPlacePageInfo());
 }
 
-JNIEXPORT jobject JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkInfo(
-  JNIEnv * env, jobject, jlong bmkId)
+JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkInfo(JNIEnv * env,
+                                                                                                        jobject,
+                                                                                                        jlong bmkId)
 {
   auto const bookmark = frm()->GetBookmarkManager().GetBookmark(static_cast<kml::MarkId>(bmkId));
   if (!bookmark)
     return nullptr;
-  return env->NewObject(g_bookmarkInfoClass,
-                        g_bookmarkInfoConstructor, static_cast<jlong>(bookmark->GetGroupId()),
+  return env->NewObject(g_bookmarkInfoClass, g_bookmarkInfoConstructor, static_cast<jlong>(bookmark->GetGroupId()),
                         static_cast<jlong>(bmkId));
 }
 
-JNIEXPORT jlong JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkIdByPosition(
-        JNIEnv *, jobject, jlong catId, jint positionInCategory)
+JNIEXPORT jlong JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkIdByPosition(
+    JNIEnv *, jobject, jlong catId, jint positionInCategory)
 {
   auto const & ids = frm()->GetBookmarkManager().GetUserMarkIds(static_cast<kml::MarkGroupId>(catId));
   if (positionInCategory >= static_cast<jlong>(ids.size()))
@@ -519,15 +469,18 @@ Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkIdByPos
   return static_cast<jlong>(*it);
 }
 
-static uint32_t shift(uint32_t v, uint8_t bitCount) { return v << bitCount; }
+static uint32_t shift(uint32_t v, uint8_t bitCount)
+{
+  return v << bitCount;
+}
 
-JNIEXPORT jobject JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetTrack(
-      JNIEnv * env, jobject, jlong trackId, jclass trackClazz)
+JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetTrack(JNIEnv * env, jobject,
+                                                                                                 jlong trackId,
+                                                                                                 jclass trackClazz)
 {
   // Track(long trackId, long categoryId, String name, String lengthString, int color)
-  static jmethodID const cId = jni::GetConstructorID(env, trackClazz,
-                                                     "(JJLjava/lang/String;Lapp/organicmaps/sdk/util/Distance;I)V");
+  static jmethodID const cId =
+      jni::GetConstructorID(env, trackClazz, "(JJLjava/lang/String;Lapp/organicmaps/sdk/util/Distance;I)V");
   auto const * nTrack = frm()->GetBookmarkManager().GetTrack(static_cast<kml::TrackId>(trackId));
 
   ASSERT(nTrack, ("Track must not be null with id:)", trackId));
@@ -538,9 +491,8 @@ Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetTrack(
                         nTrack->GetColor(0).GetARGB());
 }
 
-JNIEXPORT jlong JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetTrackIdByPosition(
-        JNIEnv *, jobject, jlong catId, jint positionInCategory)
+JNIEXPORT jlong JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetTrackIdByPosition(
+    JNIEnv *, jobject, jlong catId, jint positionInCategory)
 {
   auto const & ids = frm()->GetBookmarkManager().GetTrackIds(static_cast<kml::MarkGroupId>(catId));
   if (positionInCategory >= static_cast<jlong>(ids.size()))
@@ -551,92 +503,82 @@ Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetTrackIdByPositi
 }
 
 JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeIsUsedCategoryName(
-        JNIEnv * env, jclass, jstring name)
+Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeIsUsedCategoryName(JNIEnv * env, jclass, jstring name)
 {
   return static_cast<jboolean>(frm()->GetBookmarkManager().IsUsedCategoryName(ToNativeString(env, name)));
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativePrepareForSearch(
-        JNIEnv *, jclass, jlong catId)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativePrepareForSearch(JNIEnv *, jclass,
+                                                                                                      jlong catId)
 {
   frm()->GetBookmarkManager().PrepareForSearch(static_cast<kml::MarkGroupId>(catId));
 }
 
 JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeAreAllCategoriesInvisible(
-        JNIEnv *, jclass)
+Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeAreAllCategoriesInvisible(JNIEnv *, jclass)
 {
   return static_cast<jboolean>(frm()->GetBookmarkManager().AreAllCategoriesInvisible());
 }
 
 JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeAreAllCategoriesVisible(
-        JNIEnv *, jclass)
+Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeAreAllCategoriesVisible(JNIEnv *, jclass)
 {
   return static_cast<jboolean>(frm()->GetBookmarkManager().AreAllCategoriesVisible());
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetAllCategoriesVisibility(
-        JNIEnv *, jclass, jboolean visible)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetAllCategoriesVisibility(
+    JNIEnv *, jclass, jboolean visible)
 {
   frm()->GetBookmarkManager().SetAllCategoriesVisibility(static_cast<bool>(visible));
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativePrepareTrackFileForSharing(JNIEnv * env, jclass, jlong trackId, jint kmlFileType)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativePrepareTrackFileForSharing(
+    JNIEnv * env, jclass, jlong trackId, jint kmlFileType)
 {
-  frm()->GetBookmarkManager().PrepareTrackFileForSharing(static_cast<kml::TrackId>(trackId), [env](BookmarkManager::SharingResult const & result)
-                                                    {
-                                                      OnPreparedFileForSharing(env, result);
-                                                    }, static_cast<KmlFileType>(kmlFileType));
+  frm()->GetBookmarkManager().PrepareTrackFileForSharing(static_cast<kml::TrackId>(trackId),
+                                                         [env](BookmarkManager::SharingResult const & result)
+  { OnPreparedFileForSharing(env, result); }, static_cast<KmlFileType>(kmlFileType));
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativePrepareFileForSharing(JNIEnv * env, jclass, jlongArray catIds, jint kmlFileType)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativePrepareFileForSharing(
+    JNIEnv * env, jclass, jlongArray catIds, jint kmlFileType)
 {
   auto const size = env->GetArrayLength(catIds);
   kml::GroupIdCollection catIdsVector(size);
   static_assert(sizeof(jlong) == sizeof(decltype(catIdsVector)::value_type));
   env->GetLongArrayRegion(catIds, 0, size, reinterpret_cast<jlong *>(catIdsVector.data()));
-  frm()->GetBookmarkManager().PrepareFileForSharing(std::move(catIdsVector), [env](BookmarkManager::SharingResult const & result)
-  {
-    OnPreparedFileForSharing(env, result);
-  }, static_cast<KmlFileType>(kmlFileType));
+  frm()->GetBookmarkManager().PrepareFileForSharing(std::move(catIdsVector),
+                                                    [env](BookmarkManager::SharingResult const & result)
+  { OnPreparedFileForSharing(env, result); }, static_cast<KmlFileType>(kmlFileType));
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeIsCategoryEmpty(
-        JNIEnv *, jclass, jlong catId)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeIsCategoryEmpty(JNIEnv *,
+                                                                                                         jclass,
+                                                                                                         jlong catId)
 {
-  return static_cast<jboolean>(frm()->GetBookmarkManager().IsCategoryEmpty(
-    static_cast<kml::MarkGroupId>(catId)));
+  return static_cast<jboolean>(frm()->GetBookmarkManager().IsCategoryEmpty(static_cast<kml::MarkGroupId>(catId)));
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetNotificationsEnabled(
-        JNIEnv *, jclass, jboolean enabled)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetNotificationsEnabled(
+    JNIEnv *, jclass, jboolean enabled)
 {
   frm()->GetBookmarkManager().SetNotificationsEnabled(static_cast<bool>(enabled));
 }
 
 JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeAreNotificationsEnabled(
-        JNIEnv *, jclass)
+Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeAreNotificationsEnabled(JNIEnv *, jclass)
 {
   return static_cast<jboolean>(frm()->GetBookmarkManager().AreNotificationsEnabled());
 }
 
 JNIEXPORT jobject JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkCategory(JNIEnv *env, jobject, jlong id)
+Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkCategory(JNIEnv * env, jobject, jlong id)
 {
   return MakeCategory(env, static_cast<kml::MarkGroupId>(id));
 }
 
 JNIEXPORT jobjectArray JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkCategories(JNIEnv *env, jobject)
+Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkCategories(JNIEnv * env, jobject)
 {
   auto const & bm = frm()->GetBookmarkManager();
   auto const & ids = bm.GetSortedBmGroupIdList();
@@ -645,16 +587,16 @@ Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkCategor
 }
 
 JNIEXPORT jint JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkCategoriesCount(JNIEnv *env, jobject)
+Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkCategoriesCount(JNIEnv * env, jobject)
 {
-   auto const & bm = frm()->GetBookmarkManager();
-   auto const count = bm.GetBmGroupsCount();
+  auto const & bm = frm()->GetBookmarkManager();
+  auto const count = bm.GetBmGroupsCount();
 
-   return static_cast<jint>(count);
+  return static_cast<jint>(count);
 }
 
-JNIEXPORT jobjectArray JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetChildrenCategories(JNIEnv *env, jobject, jlong parentId)
+JNIEXPORT jobjectArray JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetChildrenCategories(
+    JNIEnv * env, jobject, jlong parentId)
 {
   auto const & bm = frm()->GetBookmarkManager();
   auto const ids = bm.GetChildrenCategories(static_cast<kml::MarkGroupId>(parentId));
@@ -662,18 +604,18 @@ Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetChildrenCategor
   return MakeCategories(env, ids);
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeHasLastSortingType(
-    JNIEnv *, jobject, jlong catId)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeHasLastSortingType(JNIEnv *,
+                                                                                                            jobject,
+                                                                                                            jlong catId)
 {
   auto const & bm = frm()->GetBookmarkManager();
   BookmarkManager::SortingType type;
   return static_cast<jboolean>(bm.GetLastSortingType(static_cast<kml::MarkGroupId>(catId), type));
 }
 
-JNIEXPORT jint JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetLastSortingType(
-    JNIEnv *, jobject, jlong catId)
+JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetLastSortingType(JNIEnv *,
+                                                                                                        jobject,
+                                                                                                        jlong catId)
 {
   auto const & bm = frm()->GetBookmarkManager();
   BookmarkManager::SortingType type;
@@ -683,30 +625,29 @@ Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetLastSortingType
   return static_cast<jint>(type);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetLastSortingType(
-    JNIEnv *, jobject, jlong catId, jint type)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetLastSortingType(JNIEnv *,
+                                                                                                        jobject,
+                                                                                                        jlong catId,
+                                                                                                        jint type)
 {
   auto & bm = frm()->GetBookmarkManager();
-  bm.SetLastSortingType(static_cast<kml::MarkGroupId>(catId),
-      static_cast<BookmarkManager::SortingType>(type));
+  bm.SetLastSortingType(static_cast<kml::MarkGroupId>(catId), static_cast<BookmarkManager::SortingType>(type));
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeResetLastSortingType(
-    JNIEnv *, jobject, jlong catId)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeResetLastSortingType(JNIEnv *,
+                                                                                                          jobject,
+                                                                                                          jlong catId)
 {
   auto & bm = frm()->GetBookmarkManager();
   bm.ResetLastSortingType(static_cast<kml::MarkGroupId>(catId));
 }
 
-JNIEXPORT jintArray JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetAvailableSortingTypes(JNIEnv *env,
-    jobject, jlong catId, jboolean hasMyPosition)
+JNIEXPORT jintArray JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetAvailableSortingTypes(
+    JNIEnv * env, jobject, jlong catId, jboolean hasMyPosition)
 {
   auto const & bm = frm()->GetBookmarkManager();
-  auto const types =  bm.GetAvailableSortingTypes(static_cast<kml::MarkGroupId>(catId),
-                                                  static_cast<bool>(hasMyPosition));
+  auto const types =
+      bm.GetAvailableSortingTypes(static_cast<kml::MarkGroupId>(catId), static_cast<bool>(hasMyPosition));
   int const size = static_cast<int>(types.size());
   jintArray jTypes = env->NewIntArray(size);
   jint * arr = env->GetIntArrayElements(jTypes, 0);
@@ -717,9 +658,8 @@ Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetAvailableSortin
   return jTypes;
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetSortedCategory(JNIEnv *env,
-    jobject, jlong catId, jint sortingType, jboolean hasMyPosition, jdouble lat, jdouble lon,
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetSortedCategory(
+    JNIEnv * env, jobject, jlong catId, jint sortingType, jboolean hasMyPosition, jdouble lat, jdouble lon,
     jlong timestamp)
 {
   auto & bm = frm()->GetBookmarkManager();
@@ -727,57 +667,47 @@ Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetSortedCategory(
   sortParams.m_groupId = static_cast<kml::MarkGroupId>(catId);
   sortParams.m_sortingType = static_cast<BookmarkManager::SortingType>(sortingType);
   sortParams.m_hasMyPosition = static_cast<bool>(hasMyPosition);
-  sortParams.m_myPosition = mercator::FromLatLon(static_cast<double>(lat),
-      static_cast<double>(lon));
+  sortParams.m_myPosition = mercator::FromLatLon(static_cast<double>(lat), static_cast<double>(lon));
   sortParams.m_onResults = bind(&OnCategorySortingResults, env, timestamp, _1, _2);
 
   bm.GetSortedCategory(sortParams);
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkName(
-  JNIEnv * env, jclass, jlong bmk)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkName(JNIEnv * env,
+                                                                                                        jclass,
+                                                                                                        jlong bmk)
 {
   return jni::ToJavaString(env, getBookmark(bmk)->GetPreferredName());
 }
 
 JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkFeatureType(
-  JNIEnv * env, jclass, jlong bmk)
+Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkFeatureType(JNIEnv * env, jclass, jlong bmk)
 {
-  return jni::ToJavaString(env,
-    kml::GetLocalizedFeatureType(getBookmark(bmk)->GetData().m_featureTypes));
+  return jni::ToJavaString(env, kml::GetLocalizedFeatureType(getBookmark(bmk)->GetData().m_featureTypes));
 }
 
 JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkDescription(
-  JNIEnv * env, jclass, jlong bmk)
+Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkDescription(JNIEnv * env, jclass, jlong bmk)
 {
   return jni::ToJavaString(env, getBookmark(bmk)->GetDescription());
 }
 
-JNIEXPORT jint JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkColor(
-  JNIEnv *, jclass, jlong bmk)
+JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkColor(JNIEnv *, jclass,
+                                                                                                      jlong bmk)
 {
   auto const * mark = getBookmark(bmk);
-  return static_cast<jint>(mark != nullptr ? mark->GetColor()
-                                           : frm()->LastEditedBMColor());
+  return static_cast<jint>(mark != nullptr ? mark->GetColor() : frm()->LastEditedBMColor());
 }
 
-JNIEXPORT jint JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkIcon(
-  JNIEnv *, jclass, jlong bmk)
+JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkIcon(JNIEnv *, jclass,
+                                                                                                     jlong bmk)
 {
   auto const * mark = getBookmark(bmk);
-  return static_cast<jint>(mark != nullptr ? mark->GetData().m_icon
-                                           : kml::BookmarkIcon::None);
+  return static_cast<jint>(mark != nullptr ? mark->GetData().m_icon : kml::BookmarkIcon::None);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetBookmarkParams(
-  JNIEnv * env, jclass, jlong bmk,
-  jstring name, jint color, jstring descr)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetBookmarkParams(
+    JNIEnv * env, jclass, jlong bmk, jstring name, jint color, jstring descr)
 {
   auto const * mark = getBookmark(bmk);
 
@@ -793,12 +723,13 @@ Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetBookmarkParams(
   g_framework->ReplaceBookmark(static_cast<kml::MarkId>(bmk), bmData);
 }
 
-constexpr static uint8_t ExtractByte(uint32_t number, uint8_t byteIdx) { return (number >> (8 * byteIdx)) & 0xFF; }
+constexpr static uint8_t ExtractByte(uint32_t number, uint8_t byteIdx)
+{
+  return (number >> (8 * byteIdx)) & 0xFF;
+}
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetTrackParams(
-    JNIEnv * env, jclass, jlong trackId,
-    jstring name, jint color, jstring descr)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetTrackParams(
+    JNIEnv * env, jclass, jlong trackId, jstring name, jint color, jstring descr)
 {
   auto const * nTrack = frm()->GetBookmarkManager().GetTrack(static_cast<kml::TrackId>(trackId));
   CHECK(nTrack, ("Track must not be null with id:", trackId));
@@ -809,73 +740,69 @@ Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetTrackParams(
   kml::SetDefaultStr(trackData.m_description, jni::ToNativeString(env, descr));
 
   uint8_t alpha = ExtractByte(color, 3);
-  trackData.m_layers[0].m_color.m_rgba = static_cast<uint32_t>(shift(color,8) + alpha);
+  trackData.m_layers[0].m_color.m_rgba = static_cast<uint32_t>(shift(color, 8) + alpha);
 
   g_framework->ReplaceTrack(static_cast<kml::TrackId>(trackId), trackData);
 }
 
 JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetTrackDescription(
-    JNIEnv * env, jclass, jlong trackId)
+Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetTrackDescription(JNIEnv * env, jclass, jlong trackId)
 {
-  return jni::ToJavaString(env, frm()->GetBookmarkManager().GetTrack(static_cast<kml::TrackId>(trackId))->GetDescription());
+  return jni::ToJavaString(env,
+                           frm()->GetBookmarkManager().GetTrack(static_cast<kml::TrackId>(trackId))->GetDescription());
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeChangeBookmarkCategory(
-  JNIEnv *, jclass, jlong oldCat, jlong newCat, jlong bmk)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeChangeBookmarkCategory(
+    JNIEnv *, jclass, jlong oldCat, jlong newCat, jlong bmk)
 {
   g_framework->MoveBookmark(static_cast<kml::MarkId>(bmk), static_cast<kml::MarkGroupId>(oldCat),
                             static_cast<kml::MarkGroupId>(newCat));
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeChangeTrackCategory(
-  JNIEnv *, jclass, jlong oldCat, jlong newCat, jlong trackId)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeChangeTrackCategory(
+    JNIEnv *, jclass, jlong oldCat, jlong newCat, jlong trackId)
 {
   g_framework->MoveTrack(static_cast<kml::TrackId>(trackId), static_cast<kml::MarkGroupId>(oldCat),
-                            static_cast<kml::MarkGroupId>(newCat));
+                         static_cast<kml::MarkGroupId>(newCat));
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeChangeTrackColor(
-  JNIEnv *, jclass, jlong trackId, jint color)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeChangeTrackColor(JNIEnv *, jclass,
+                                                                                                      jlong trackId,
+                                                                                                      jint color)
 {
   uint8_t alpha = ExtractByte(color, 3);
-  g_framework->ChangeTrackColor(static_cast<kml::TrackId>(trackId), static_cast<dp::Color>(shift(color,8) + alpha));
+  g_framework->ChangeTrackColor(static_cast<kml::TrackId>(trackId), static_cast<dp::Color>(shift(color, 8) + alpha));
 }
 
-JNIEXPORT jobject JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkXY(
-  JNIEnv * env, jclass, jlong bmk)
+JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkXY(JNIEnv * env,
+                                                                                                      jclass, jlong bmk)
 {
   return jni::GetNewParcelablePointD(env, getBookmark(bmk)->GetPivot());
 }
 
-JNIEXPORT jdouble JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkScale(
-  JNIEnv *, jclass, jlong bmk)
+JNIEXPORT jdouble JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkScale(JNIEnv *,
+                                                                                                         jclass,
+                                                                                                         jlong bmk)
 {
   return getBookmark(bmk)->GetScale();
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeEncode2Ge0Url(
-  JNIEnv * env, jclass, jlong bmk, jboolean addName)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeEncode2Ge0Url(JNIEnv * env,
+                                                                                                      jclass, jlong bmk,
+                                                                                                      jboolean addName)
 {
   return jni::ToJavaString(env, frm()->CodeGe0url(getBookmark(bmk), addName));
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkAddress(
-  JNIEnv * env, jclass, jlong bmkId)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkAddress(JNIEnv * env,
+                                                                                                           jclass,
+                                                                                                           jlong bmkId)
 {
   auto const address = frm()->GetAddressAtPoint(getBookmark(bmkId)->GetPivot()).FormatAddress();
   return jni::ToJavaString(env, address);
 }
 
-JNIEXPORT jdouble JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetElevationCurPositionDistance(
+JNIEXPORT jdouble JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetElevationCurPositionDistance(
     JNIEnv *, jclass, jlong trackId)
 {
   auto const & bm = frm()->GetBookmarkManager();
@@ -883,48 +810,45 @@ Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetElevationCurPos
 }
 
 JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetElevationCurrentPositionChangedListener(
-        JNIEnv * env, jclass)
+Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetElevationCurrentPositionChangedListener(JNIEnv * env,
+                                                                                                         jclass)
 {
-  frm()->GetBookmarkManager().SetElevationMyPositionChangedCallback(
-      std::bind(&OnElevationCurPositionChanged, env));
+  frm()->GetBookmarkManager().SetElevationMyPositionChangedCallback(std::bind(&OnElevationCurPositionChanged, env));
 }
 
 JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeRemoveElevationCurrentPositionChangedListener(
-        JNIEnv *, jclass)
+Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeRemoveElevationCurrentPositionChangedListener(JNIEnv *,
+                                                                                                            jclass)
 {
   frm()->GetBookmarkManager().SetElevationMyPositionChangedCallback(nullptr);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetElevationActivePoint(
-  JNIEnv *, jclass, jlong trackId, jdouble distanceInMeters)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetElevationActivePoint(
+    JNIEnv *, jclass, jlong trackId, jdouble distanceInMeters)
 {
   auto & bm = frm()->GetBookmarkManager();
-  bm.SetElevationActivePoint(static_cast<kml::TrackId>(trackId),
-                             {0,0}, // todo(KK): replace with coordinates from the elevation profile point to show selection mark on the track
-                             static_cast<double>(distanceInMeters));
+  bm.SetElevationActivePoint(
+      static_cast<kml::TrackId>(trackId),
+      {0,
+       0},  // todo(KK): replace with coordinates from the elevation profile point to show selection mark on the track
+      static_cast<double>(distanceInMeters));
 }
 
-JNIEXPORT jdouble JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetElevationActivePointDistance(
-  JNIEnv *, jclass, jlong trackId)
+JNIEXPORT jdouble JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetElevationActivePointDistance(
+    JNIEnv *, jclass, jlong trackId)
 {
   auto & bm = frm()->GetBookmarkManager();
   return static_cast<jdouble>(bm.GetElevationActivePoint(static_cast<kml::TrackId>(trackId)));
 }
 
 JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetElevationActiveChangedListener(
-   JNIEnv *env, jclass)
+Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetElevationActiveChangedListener(JNIEnv * env, jclass)
 {
   frm()->GetBookmarkManager().SetElevationActivePointChangedCallback(std::bind(&OnElevationActivePointChanged, env));
 }
 
 JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeRemoveElevationActiveChangedListener(
-        JNIEnv *, jclass)
+Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeRemoveElevationActiveChangedListener(JNIEnv *, jclass)
 {
   frm()->GetBookmarkManager().SetElevationActivePointChangedCallback(nullptr);
 }
@@ -934,4 +858,4 @@ Java_app_organicmaps_sdk_widget_placepage_PlacePageButtonFactory_nativeHasRecent
 {
   return frm()->GetBookmarkManager().HasRecentlyDeletedBookmark();
 }
-}  // extern "C"
\ No newline at end of file
+}  // extern "C"
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/core/ScopedLocalRef.hpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/core/ScopedLocalRef.hpp
index 312c0ccc2..17932b0bd 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/core/ScopedLocalRef.hpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/core/ScopedLocalRef.hpp
@@ -6,7 +6,8 @@ namespace jni
 {
 // A smart pointer that deletes a JNI local reference when it goes out of scope.
 template <typename T>
-class ScopedLocalRef {
+class ScopedLocalRef
+{
 public:
   ScopedLocalRef(JNIEnv * env, T localRef) : m_env(env), m_localRef(localRef) {}
 
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.cpp
index c315cc7cc..62ef0ddc4 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.cpp
@@ -6,8 +6,8 @@
 #include "base/exception.hpp"
 #include "base/string_utils.hpp"
 
-#include "app/organicmaps/sdk/bookmarks/data/PredefinedColors.hpp"
 #include "app/organicmaps/sdk/bookmarks/data/Icon.hpp"
+#include "app/organicmaps/sdk/bookmarks/data/PredefinedColors.hpp"
 
 #include <vector>
 
@@ -36,7 +36,7 @@ int __system_property_get(char const * name, char * value);
 
 static bool IsAndroidApiLowerThan(int apiLevel)
 {
-  char value[92] = { 0 };
+  char value[92] = {0};
   if (__system_property_get("ro.build.version.sdk", value) < 1)
     return false;
   int const deviceApiLevel = atoi(value);
@@ -78,8 +78,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM * jvm, void *)
   return JNI_VERSION_1_6;
 }
 
-JNIEXPORT void JNICALL
-JNI_OnUnload(JavaVM *, void *)
+JNIEXPORT void JNICALL JNI_OnUnload(JavaVM *, void *)
 {
   g_jvm = 0;
   JNIEnv * env = jni::GetEnv();
@@ -187,11 +186,11 @@ jstring ToJavaStringWithSupplementalCharsFix(JNIEnv * env, std::string const & s
   if (g_isAndroidLowerThan7)
   {
     // Detect 4-byte sequence start marker to avoid unnecessary allocation + copy.
-    for (const auto c : s)
+    for (auto const c : s)
     {
       if (0b11110000 == (c & 0b11111000))
       {
-        const auto utf16 = strings::ToUtf16(s);
+        auto const utf16 = strings::ToUtf16(s);
         return env->NewString(reinterpret_cast<jchar const *>(utf16.data()), utf16.size());
       }
     }
@@ -219,39 +218,36 @@ std::shared_ptr<jobject> make_global_ref(jobject obj)
   });
 }
 
-std::string ToNativeString(JNIEnv * env, const jthrowable & e)
+std::string ToNativeString(JNIEnv * env, jthrowable const & e)
 {
   jni::TScopedLocalClassRef logClassRef(env, env->FindClass("android/util/Log"));
   ASSERT(logClassRef.get(), ());
-  static jmethodID const getStacktraceMethod =
-    jni::GetStaticMethodID(env, logClassRef.get(), "getStackTraceString",
-                           "(Ljava/lang/Throwable;)Ljava/lang/String;");
+  static jmethodID const getStacktraceMethod = jni::GetStaticMethodID(env, logClassRef.get(), "getStackTraceString",
+                                                                      "(Ljava/lang/Throwable;)Ljava/lang/String;");
   ASSERT(getStacktraceMethod, ());
   TScopedLocalRef resultRef(env, env->CallStaticObjectMethod(logClassRef.get(), getStacktraceMethod, e));
-  return ToNativeString(env, (jstring) resultRef.get());
+  return ToNativeString(env, (jstring)resultRef.get());
 }
 
-
 bool HandleJavaException(JNIEnv * env)
 {
   if (env->ExceptionCheck())
-   {
-     jni::ScopedLocalRef<jthrowable> const e(env, env->ExceptionOccurred());
-     env->ExceptionDescribe();
-     env->ExceptionClear();
-     base::LogLevel level = GetLogLevelForException(env, e.get());
-     LOG(level, (ToNativeString(env, e.get())));
-     return true;
-   }
-   return false;
+  {
+    jni::ScopedLocalRef<jthrowable> const e(env, env->ExceptionOccurred());
+    env->ExceptionDescribe();
+    env->ExceptionClear();
+    base::LogLevel level = GetLogLevelForException(env, e.get());
+    LOG(level, (ToNativeString(env, e.get())));
+    return true;
+  }
+  return false;
 }
 
-base::LogLevel GetLogLevelForException(JNIEnv * env, const jthrowable & e)
+base::LogLevel GetLogLevelForException(JNIEnv * env, jthrowable const & e)
 {
   static jclass const errorClass = jni::GetGlobalClassRef(env, "java/lang/Error");
   ASSERT(errorClass, (jni::DescribeException()));
-  static jclass const runtimeExceptionClass =
-    jni::GetGlobalClassRef(env, "java/lang/RuntimeException");
+  static jclass const runtimeExceptionClass = jni::GetGlobalClassRef(env, "java/lang/RuntimeException");
   ASSERT(runtimeExceptionClass, (jni::DescribeException()));
   // If Unchecked Exception or Error is occurred during Java call the app should fail immediately.
   // In other cases, just a warning message about exception (Checked Exception)
@@ -281,12 +277,10 @@ std::string DescribeException()
 jobject GetNewParcelablePointD(JNIEnv * env, m2::PointD const & point)
 {
   jclass klass = env->FindClass("app/organicmaps/sdk/bookmarks/data/ParcelablePointD");
-  ASSERT ( klass, () );
+  ASSERT(klass, ());
   jmethodID methodID = GetConstructorID(env, klass, "(DD)V");
 
-  return env->NewObject(klass, methodID,
-                        static_cast<jdouble>(point.x),
-                        static_cast<jdouble>(point.y));
+  return env->NewObject(klass, methodID, static_cast<jdouble>(point.x), static_cast<jdouble>(point.y));
 }
 
 jobject GetNewPoint(JNIEnv * env, m2::PointD const & point)
@@ -297,12 +291,10 @@ jobject GetNewPoint(JNIEnv * env, m2::PointD const & point)
 jobject GetNewPoint(JNIEnv * env, m2::PointI const & point)
 {
   jclass klass = env->FindClass("android/graphics/Point");
-  ASSERT ( klass, () );
+  ASSERT(klass, ());
   jmethodID methodID = GetConstructorID(env, klass, "(II)V");
 
-  return env->NewObject(klass, methodID,
-                        static_cast<jint>(point.x),
-                        static_cast<jint>(point.y));
+  return env->NewObject(klass, methodID, static_cast<jint>(point.x), static_cast<jint>(point.y));
 }
 
 // This util method dumps content of local and global reference jni tables to logcat for debug and testing purposes
@@ -317,8 +309,8 @@ void DumpDalvikReferenceTables()
 
 jobject ToKeyValue(JNIEnv * env, std::pair<std::string, std::string> src)
 {
-  static jmethodID const keyValueInit = jni::GetConstructorID(
-    env, g_keyValueClazz, "(Ljava/lang/String;Ljava/lang/String;)V");
+  static jmethodID const keyValueInit =
+      jni::GetConstructorID(env, g_keyValueClazz, "(Ljava/lang/String;Ljava/lang/String;)V");
 
   jni::TScopedLocalRef key(env, jni::ToJavaString(env, src.first));
   jni::TScopedLocalRef value(env, jni::ToJavaString(env, src.second));
@@ -328,16 +320,12 @@ jobject ToKeyValue(JNIEnv * env, std::pair<std::string, std::string> src)
 
 std::pair<std::string, std::string> ToNativeKeyValue(JNIEnv * env, jobject pairOfStrings)
 {
-  static jfieldID const keyId = env->GetFieldID(g_keyValueClazz, "mKey",
-                                                  "Ljava/lang/String;");
-  static jfieldID const valueId = env->GetFieldID(g_keyValueClazz, "mValue",
-                                                   "Ljava/lang/String;");
+  static jfieldID const keyId = env->GetFieldID(g_keyValueClazz, "mKey", "Ljava/lang/String;");
+  static jfieldID const valueId = env->GetFieldID(g_keyValueClazz, "mValue", "Ljava/lang/String;");
 
-  jni::ScopedLocalRef<jstring> const key(
-    env, static_cast<jstring>(env->GetObjectField(pairOfStrings, keyId)));
-  jni::ScopedLocalRef<jstring> const value(
-    env, static_cast<jstring>(env->GetObjectField(pairOfStrings, valueId)));
+  jni::ScopedLocalRef<jstring> const key(env, static_cast<jstring>(env->GetObjectField(pairOfStrings, keyId)));
+  jni::ScopedLocalRef<jstring> const value(env, static_cast<jstring>(env->GetObjectField(pairOfStrings, valueId)));
 
-  return { jni::ToNativeString(env, key.get()), jni::ToNativeString(env, value.get()) };
+  return {jni::ToNativeString(env, key.get()), jni::ToNativeString(env, value.get())};
 }
 }  // namespace jni
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.hpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.hpp
index 3753e7b08..4da33cbd5 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.hpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.hpp
@@ -41,8 +41,8 @@ jfieldID GetStaticFieldID(JNIEnv * env, jclass clazz, char const * name, char co
 jclass GetGlobalClassRef(JNIEnv * env, char const * s);
 
 std::string ToNativeString(JNIEnv * env, jstring str);
-// Converts UTF-8 array to native UTF-8 string. Result differs from simple GetStringUTFChars call for characters greater than U+10000,
-// since jni uses modified UTF (MUTF-8) for strings.
+// Converts UTF-8 array to native UTF-8 string. Result differs from simple GetStringUTFChars call for characters greater
+// than U+10000, since jni uses modified UTF (MUTF-8) for strings.
 std::string ToNativeString(JNIEnv * env, jbyteArray const & utfBytes);
 jstring ToJavaString(JNIEnv * env, char const * s);
 inline jstring ToJavaString(JNIEnv * env, std::string const & s)
@@ -63,7 +63,7 @@ char const * GetStringClassName();
 
 std::string DescribeException();
 bool HandleJavaException(JNIEnv * env);
-base::LogLevel GetLogLevelForException(JNIEnv * env, const jthrowable & e);
+base::LogLevel GetLogLevelForException(JNIEnv * env, jthrowable const & e);
 
 std::shared_ptr<jobject> make_global_ref(jobject obj);
 using TScopedLocalRef = ScopedLocalRef<jobject>;
@@ -77,10 +77,10 @@ jobject GetNewParcelablePointD(JNIEnv * env, m2::PointD const & point);
 jobject GetNewPoint(JNIEnv * env, m2::PointD const & point);
 jobject GetNewPoint(JNIEnv * env, m2::PointI const & point);
 
-template<typename TIt, typename TToJavaFn>
+template <typename TIt, typename TToJavaFn>
 jobjectArray ToJavaArray(JNIEnv * env, jclass clazz, TIt begin, TIt end, size_t const size, TToJavaFn && toJavaFn)
 {
-  jobjectArray jArray = env->NewObjectArray((jint) size, clazz, 0);
+  jobjectArray jArray = env->NewObjectArray((jint)size, clazz, 0);
   jint i = 0;
   for (auto it = begin; it != end; ++it)
   {
@@ -92,21 +92,17 @@ jobjectArray ToJavaArray(JNIEnv * env, jclass clazz, TIt begin, TIt end, size_t
   return jArray;
 }
 
-template<typename TContainer, typename TToJavaFn>
+template <typename TContainer, typename TToJavaFn>
 jobjectArray ToJavaArray(JNIEnv * env, jclass clazz, TContainer const & src, TToJavaFn && toJavaFn)
 {
-  return ToJavaArray(env, clazz, std::begin(src), std::end(src), src.size(),
-                     std::forward<TToJavaFn>(toJavaFn));
+  return ToJavaArray(env, clazz, std::begin(src), std::end(src), src.size(), std::forward<TToJavaFn>(toJavaFn));
 }
 
 template <typename Cont>
 jobjectArray ToJavaStringArray(JNIEnv * env, Cont const & src)
 {
   return ToJavaArray(env, GetStringClass(env), src,
-                     [](JNIEnv * env, std::string const & item)
-                     {
-                       return ToJavaString(env, item.c_str());
-                     });
+                     [](JNIEnv * env, std::string const & item) { return ToJavaString(env, item.c_str()); });
 }
 
 void DumpDalvikReferenceTables();
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_java_methods.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_java_methods.cpp
index 3c735e05e..fa467e477 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_java_methods.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_java_methods.cpp
@@ -29,4 +29,4 @@ jobject ListBuilder::CreateArray(JNIEnv * env, size_t sz) const
 {
   return env->NewObject(m_arrayClass, m_arrayCtor, sz);
 }
-} // namespace jni
+}  // namespace jni
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_java_methods.hpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_java_methods.hpp
index a343ab987..af992a48c 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_java_methods.hpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_java_methods.hpp
@@ -2,8 +2,12 @@
 
 #include <jni.h>
 
-#define DECLARE_BUILDER_INSTANCE(BuilderType) static BuilderType const & Instance(JNIEnv * env) { \
-                                              static BuilderType const inst(env); return inst; }
+#define DECLARE_BUILDER_INSTANCE(BuilderType)       \
+  static BuilderType const & Instance(JNIEnv * env) \
+  {                                                 \
+    static BuilderType const inst(env);             \
+    return inst;                                    \
+  }
 
 namespace jni
 {
@@ -34,4 +38,4 @@ public:
   jobject CreateArray(JNIEnv * env, size_t sz) const;
 };
 
-} // namespace jni
+}  // namespace jni
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/core/logging.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/core/logging.cpp
index 857d49aca..d5c433db3 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/core/logging.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/core/logging.cpp
@@ -3,9 +3,9 @@
 #include "base/exception.hpp"
 #include "base/logging.hpp"
 
+#include "app/organicmaps/sdk/core/ScopedEnv.hpp"
 #include "app/organicmaps/sdk/core/jni_helper.hpp"
 #include "app/organicmaps/sdk/core/logging.hpp"
-#include "app/organicmaps/sdk/core/ScopedEnv.hpp"
 
 #include <android/log.h>
 #include <cassert>
@@ -22,17 +22,17 @@ void AndroidMessage(LogLevel level, SrcPoint const & src, std::string const & s)
 
   switch (level)
   {
-    case LINFO: pr = ANDROID_LOG_INFO; break;
-    case LDEBUG: pr = ANDROID_LOG_DEBUG; break;
-    case LWARNING: pr = ANDROID_LOG_WARN; break;
-    case LERROR: pr = ANDROID_LOG_ERROR; break;
-    case LCRITICAL: pr = ANDROID_LOG_ERROR; break;
-    case NUM_LOG_LEVELS: break;
+  case LINFO: pr = ANDROID_LOG_INFO; break;
+  case LDEBUG: pr = ANDROID_LOG_DEBUG; break;
+  case LWARNING: pr = ANDROID_LOG_WARN; break;
+  case LERROR: pr = ANDROID_LOG_ERROR; break;
+  case LCRITICAL: pr = ANDROID_LOG_ERROR; break;
+  case NUM_LOG_LEVELS: break;
   }
 
   ScopedEnv env(jni::GetJVM());
-  static jmethodID const logMethod = jni::GetStaticMethodID(env.get(), g_loggerClazz,
-     "log", "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V");
+  static jmethodID const logMethod = jni::GetStaticMethodID(
+      env.get(), g_loggerClazz, "log", "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;)V");
 
   std::string const out = DebugPrint(src) + s;
   jni::TScopedLocalRef msg(env.get(), jni::ToJavaString(env.get(), out));
@@ -68,4 +68,4 @@ void ToggleDebugLogs(bool enabled)
   else
     g_LogLevel = LINFO;
 }
-}
+}  // namespace jni
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/core/logging.hpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/core/logging.hpp
index c7538e332..55548abf2 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/core/logging.hpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/core/logging.hpp
@@ -2,7 +2,7 @@
 
 namespace jni
 {
-  void InitSystemLog();
-  void InitAssertLog();
-  void ToggleDebugLogs(bool enabled);
-}
+void InitSystemLog();
+void InitAssertLog();
+void ToggleDebugLogs(bool enabled);
+}  // namespace jni
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/core/render_context.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/core/render_context.cpp
index 978ca4053..3a73d4dc9 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/core/render_context.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/core/render_context.cpp
@@ -2,16 +2,12 @@
 
 namespace android
 {
-  void RenderContext::makeCurrent()
-  {
-  }
+void RenderContext::makeCurrent() {}
 
-  graphics::RenderContext * RenderContext::createShared()
-  {
-    RenderContext * rc = new RenderContext();
-    rc->setResourceManager(resourceManager());
-    return rc;
-  }
+graphics::RenderContext * RenderContext::createShared()
+{
+  RenderContext * rc = new RenderContext();
+  rc->setResourceManager(resourceManager());
+  return rc;
 }
-
-
+}  // namespace android
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/core/render_context.hpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/core/render_context.hpp
index 4d13bc9c1..9ab8d665a 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/core/render_context.hpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/core/render_context.hpp
@@ -6,12 +6,11 @@
 
 namespace android
 {
-  class RenderContext : public graphics::gl::RenderContext
-  {
-  public:
+class RenderContext : public graphics::gl::RenderContext
+{
+public:
+  void makeCurrent();
 
-    void makeCurrent();
-
-    graphics::RenderContext * createShared();
-  };
-}
+  graphics::RenderContext * createShared();
+};
+}  // namespace android
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp
index b225381cc..7b65cee98 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp
@@ -1,7 +1,7 @@
 #include <jni.h>
 
-#include "app/organicmaps/sdk/core/jni_helper.hpp"
 #include "app/organicmaps/sdk/Framework.hpp"
+#include "app/organicmaps/sdk/core/jni_helper.hpp"
 
 #include "editor/osm_editor.hpp"
 
@@ -43,8 +43,7 @@ jobject ToJavaName(JNIEnv * env, osm::LocalizedName const & name)
   jni::TScopedLocalRef jName(env, jni::ToJavaString(env, name.m_name));
   jni::TScopedLocalRef jLang(env, jni::ToJavaString(env, name.m_lang));
   jni::TScopedLocalRef jLangName(env, jni::ToJavaString(env, name.m_langName));
-  return env->NewObject(g_localNameClazz, g_localNameCtor, name.m_code,
-                        jName.get(), jLang.get(), jLangName.get());
+  return env->NewObject(g_localNameClazz, g_localNameCtor, name.m_code, jName.get(), jLang.get(), jLangName.get());
 }
 
 jobject ToJavaStreet(JNIEnv * env, osm::LocalizedStreet const & street)
@@ -65,12 +64,12 @@ extern "C"
 {
 using osm::Editor;
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeInit(JNIEnv * env, jclass)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeInit(JNIEnv * env, jclass)
 {
   g_localNameClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/editor/data/LocalizedName");
   // LocalizedName(int code, @NonNull String name, @NonNull String lang, @NonNull String langName)
-  g_localNameCtor = jni::GetConstructorID(env, g_localNameClazz, "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
+  g_localNameCtor =
+      jni::GetConstructorID(env, g_localNameClazz, "(ILjava/lang/String;Ljava/lang/String;Ljava/lang/String;)V");
   g_localNameFieldCode = env->GetFieldID(g_localNameClazz, "code", "I");
   g_localNameFieldName = env->GetFieldID(g_localNameClazz, "name", "Ljava/lang/String;");
 
@@ -81,30 +80,28 @@ Java_app_organicmaps_sdk_editor_Editor_nativeInit(JNIEnv * env, jclass)
   g_localStreetFieldLoc = env->GetFieldID(g_localStreetClazz, "localizedName", "Ljava/lang/String;");
 
   g_namesDataSourceClassID = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/editor/data/NamesDataSource");
-  g_namesDataSourceConstructorID = jni::GetConstructorID(env, g_namesDataSourceClassID, "([Lapp/organicmaps/sdk/editor/data/LocalizedName;I)V");
+  g_namesDataSourceConstructorID =
+      jni::GetConstructorID(env, g_namesDataSourceClassID, "([Lapp/organicmaps/sdk/editor/data/LocalizedName;I)V");
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeGetOpeningHours(JNIEnv * env, jclass)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeGetOpeningHours(JNIEnv * env, jclass)
 {
   return jni::ToJavaString(env, g_editableMapObject.GetOpeningHours());
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeSetOpeningHours(JNIEnv * env, jclass, jstring value)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeSetOpeningHours(JNIEnv * env, jclass, jstring value)
 {
   g_editableMapObject.SetOpeningHours(jni::ToNativeString(env, value));
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeGetMetadata(JNIEnv * env, jclass, jint id)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeGetMetadata(JNIEnv * env, jclass, jint id)
 {
   auto const metaID = static_cast<osm::MapObject::MetadataID>(id);
   ASSERT_LESS(metaID, osm::MapObject::MetadataID::FMD_COUNT, ());
   if (osm::isSocialContactTag(metaID))
   {
     auto const value = g_editableMapObject.GetMetadata(metaID);
-    if (value.find('/') == std::string::npos) // `value` contains pagename.
+    if (value.find('/') == std::string::npos)  // `value` contains pagename.
       return jni::ToJavaString(env, value);
     // `value` contains URL.
     return jni::ToJavaString(env, osm::socialContactToURL(metaID, value));
@@ -112,64 +109,56 @@ Java_app_organicmaps_sdk_editor_Editor_nativeGetMetadata(JNIEnv * env, jclass, j
   return jni::ToJavaString(env, g_editableMapObject.GetMetadata(metaID));
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeIsMetadataValid(JNIEnv * env, jclass, jint id, jstring value)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeIsMetadataValid(JNIEnv * env, jclass, jint id,
+                                                                                        jstring value)
 {
   auto const metaID = static_cast<osm::MapObject::MetadataID>(id);
   ASSERT_LESS(metaID, osm::MapObject::MetadataID::FMD_COUNT, ());
   return osm::EditableMapObject::IsValidMetadata(metaID, jni::ToNativeString(env, value));
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeSetMetadata(JNIEnv * env, jclass, jint id, jstring value)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeSetMetadata(JNIEnv * env, jclass, jint id,
+                                                                                jstring value)
 {
   auto const metaID = static_cast<osm::MapObject::MetadataID>(id);
   ASSERT_LESS(metaID, osm::MapObject::MetadataID::FMD_COUNT, ());
   g_editableMapObject.SetMetadata(metaID, jni::ToNativeString(env, value));
 }
 
-JNIEXPORT jint JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeGetStars(JNIEnv * env, jclass)
+JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeGetStars(JNIEnv * env, jclass)
 {
   return g_editableMapObject.GetStars();
 }
 
-JNIEXPORT jint JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeGetMaxEditableBuildingLevels(JNIEnv *, jclass)
+JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeGetMaxEditableBuildingLevels(JNIEnv *, jclass)
 {
   return osm::EditableMapObject::kMaximumLevelsEditableByUsers;
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeHasWifi(JNIEnv *, jclass)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeHasWifi(JNIEnv *, jclass)
 {
   return g_editableMapObject.GetInternet() == feature::Internet::Wlan;
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeSetHasWifi(JNIEnv *, jclass, jboolean hasWifi)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeSetHasWifi(JNIEnv *, jclass, jboolean hasWifi)
 {
   if (hasWifi != (g_editableMapObject.GetInternet() == feature::Internet::Wlan))
     g_editableMapObject.SetInternet(hasWifi ? feature::Internet::Wlan : feature::Internet::Unknown);
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeSaveEditedFeature(JNIEnv *, jclass)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeSaveEditedFeature(JNIEnv *, jclass)
 {
   switch (g_framework->NativeFramework()->SaveEditedMapObject(g_editableMapObject))
   {
   case osm::Editor::SaveResult::NothingWasChanged:
-  case osm::Editor::SaveResult::SavedSuccessfully:
-    return true;
+  case osm::Editor::SaveResult::SavedSuccessfully: return true;
   case osm::Editor::SaveResult::NoFreeSpaceError:
   case osm::Editor::SaveResult::NoUnderlyingMapError:
-  case osm::Editor::SaveResult::SavingError:
-    return false;
+  case osm::Editor::SaveResult::SavingError: return false;
   }
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeShouldShowEditPlace(JNIEnv *, jclass)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeShouldShowEditPlace(JNIEnv *, jclass)
 {
   ::Framework * frm = g_framework->NativeFramework();
   if (!frm->HasPlacePageInfo())
@@ -178,8 +167,7 @@ Java_app_organicmaps_sdk_editor_Editor_nativeShouldShowEditPlace(JNIEnv *, jclas
   return g_framework->GetPlacePageInfo().ShouldShowEditPlace();
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeShouldShowAddBusiness(JNIEnv *, jclass)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeShouldShowAddBusiness(JNIEnv *, jclass)
 {
   ::Framework * frm = g_framework->NativeFramework();
   if (!frm->HasPlacePageInfo())
@@ -188,8 +176,7 @@ Java_app_organicmaps_sdk_editor_Editor_nativeShouldShowAddBusiness(JNIEnv *, jcl
   return g_framework->GetPlacePageInfo().ShouldShowAddBusiness();
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeShouldShowAddPlace(JNIEnv *, jclass)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeShouldShowAddPlace(JNIEnv *, jclass)
 {
   ::Framework * frm = g_framework->NativeFramework();
   if (!frm->HasPlacePageInfo())
@@ -198,8 +185,7 @@ Java_app_organicmaps_sdk_editor_Editor_nativeShouldShowAddPlace(JNIEnv *, jclass
   return g_framework->GetPlacePageInfo().ShouldShowAddPlace();
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeShouldEnableEditPlace(JNIEnv *, jclass)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeShouldEnableEditPlace(JNIEnv *, jclass)
 {
   ::Framework * frm = g_framework->NativeFramework();
   if (!frm->HasPlacePageInfo())
@@ -208,8 +194,7 @@ Java_app_organicmaps_sdk_editor_Editor_nativeShouldEnableEditPlace(JNIEnv *, jcl
   return g_framework->GetPlacePageInfo().ShouldEnableEditPlace();
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeShouldEnableAddPlace(JNIEnv *, jclass)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeShouldEnableAddPlace(JNIEnv *, jclass)
 {
   ::Framework * frm = g_framework->NativeFramework();
   if (!frm->HasPlacePageInfo())
@@ -218,8 +203,8 @@ Java_app_organicmaps_sdk_editor_Editor_nativeShouldEnableAddPlace(JNIEnv *, jcla
   return g_framework->GetPlacePageInfo().ShouldEnableAddPlace();
 }
 
-JNIEXPORT jintArray JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeGetEditableProperties(JNIEnv * env, jclass clazz)
+JNIEXPORT jintArray JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeGetEditableProperties(JNIEnv * env,
+                                                                                               jclass clazz)
 {
   auto const & editable = g_editableMapObject.GetEditableProperties();
   size_t const size = editable.size();
@@ -232,32 +217,27 @@ Java_app_organicmaps_sdk_editor_Editor_nativeGetEditableProperties(JNIEnv * env,
   return jEditableFields;
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeIsAddressEditable(JNIEnv * env, jclass clazz)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeIsAddressEditable(JNIEnv * env, jclass clazz)
 {
   return g_editableMapObject.IsAddressEditable();
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeIsNameEditable(JNIEnv * env, jclass clazz)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeIsNameEditable(JNIEnv * env, jclass clazz)
 {
   return g_editableMapObject.IsNameEditable();
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeIsPointType(JNIEnv * env, jclass clazz)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeIsPointType(JNIEnv * env, jclass clazz)
 {
   return g_editableMapObject.IsPointType();
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeIsBuilding(JNIEnv * env, jclass clazz)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeIsBuilding(JNIEnv * env, jclass clazz)
 {
   return g_editableMapObject.IsBuilding();
 }
 
-JNIEXPORT jobject JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeGetNamesDataSource(JNIEnv * env, jclass)
+JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeGetNamesDataSource(JNIEnv * env, jclass)
 {
   auto const namesDataSource = g_editableMapObject.GetNamesDataSource();
 
@@ -267,82 +247,79 @@ Java_app_organicmaps_sdk_editor_Editor_nativeGetNamesDataSource(JNIEnv * env, jc
   return env->NewObject(g_namesDataSourceClassID, g_namesDataSourceConstructorID, names, mandatoryNamesCount);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeSetNames(JNIEnv * env, jclass, jobjectArray names)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeSetNames(JNIEnv * env, jclass, jobjectArray names)
 {
   int const length = env->GetArrayLength(names);
   for (int i = 0; i < length; i++)
   {
     auto jName = env->GetObjectArrayElement(names, i);
-    g_editableMapObject.SetName(jni::ToNativeString(env, static_cast<jstring>(env->GetObjectField(jName, g_localNameFieldName))),
-                                env->GetIntField(jName, g_localNameFieldCode));
+    g_editableMapObject.SetName(
+        jni::ToNativeString(env, static_cast<jstring>(env->GetObjectField(jName, g_localNameFieldName))),
+        env->GetIntField(jName, g_localNameFieldCode));
   }
 }
 
-JNIEXPORT jobject JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeGetStreet(JNIEnv * env, jclass)
+JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeGetStreet(JNIEnv * env, jclass)
 {
   return ToJavaStreet(env, g_editableMapObject.GetStreet());
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeSetStreet(JNIEnv * env, jclass, jobject street)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeSetStreet(JNIEnv * env, jclass, jobject street)
 {
-  g_editableMapObject.SetStreet({jni::ToNativeString(env, (jstring) env->GetObjectField(street, g_localStreetFieldDef)),
-                                 jni::ToNativeString(env, (jstring) env->GetObjectField(street, g_localStreetFieldLoc))});
+  g_editableMapObject.SetStreet(
+      {jni::ToNativeString(env, (jstring)env->GetObjectField(street, g_localStreetFieldDef)),
+       jni::ToNativeString(env, (jstring)env->GetObjectField(street, g_localStreetFieldLoc))});
 }
-JNIEXPORT jobjectArray JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeGetNearbyStreets(JNIEnv * env, jclass clazz)
+JNIEXPORT jobjectArray JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeGetNearbyStreets(JNIEnv * env, jclass clazz)
 {
   return jni::ToJavaArray(env, g_localStreetClazz, g_editableMapObject.GetNearbyStreets(), ToJavaStreet);
 }
 
-JNIEXPORT jobjectArray JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeGetSupportedLanguages(JNIEnv * env, jclass clazz, jboolean includeServiceLangs)
+JNIEXPORT jobjectArray JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeGetSupportedLanguages(
+    JNIEnv * env, jclass clazz, jboolean includeServiceLangs)
 {
   using TLang = StringUtf8Multilang::Lang;
-  //public Language(@NonNull String code, @NonNull String name)
+  // public Language(@NonNull String code, @NonNull String name)
   static jclass const langClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/editor/data/Language");
   static jmethodID const langCtor = jni::GetConstructorID(env, langClass, "(Ljava/lang/String;Ljava/lang/String;)V");
 
   return jni::ToJavaArray(env, langClass, StringUtf8Multilang::GetSupportedLanguages(includeServiceLangs),
                           [](JNIEnv * env, TLang const & lang)
-                          {
-                            jni::TScopedLocalRef const code(env, jni::ToJavaString(env, lang.m_code));
-                            jni::TScopedLocalRef const name(env, jni::ToJavaString(env, lang.m_name));
-                            return env->NewObject(langClass, langCtor, code.get(), name.get());
-                          });
+  {
+    jni::TScopedLocalRef const code(env, jni::ToJavaString(env, lang.m_code));
+    jni::TScopedLocalRef const name(env, jni::ToJavaString(env, lang.m_name));
+    return env->NewObject(langClass, langCtor, code.get(), name.get());
+  });
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeGetHouseNumber(JNIEnv * env, jclass)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeGetHouseNumber(JNIEnv * env, jclass)
 {
   return jni::ToJavaString(env, g_editableMapObject.GetHouseNumber());
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeSetHouseNumber(JNIEnv * env, jclass, jstring houseNumber)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeSetHouseNumber(JNIEnv * env, jclass,
+                                                                                   jstring houseNumber)
 {
   g_editableMapObject.SetHouseNumber(jni::ToNativeString(env, houseNumber));
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeHasSomethingToUpload(JNIEnv * env, jclass clazz)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeHasSomethingToUpload(JNIEnv * env, jclass clazz)
 {
   return Editor::Instance().HaveMapEditsOrNotesToUpload();
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeUploadChanges(JNIEnv * env, jclass clazz, jstring token, jstring appVersion, jstring appId)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeUploadChanges(JNIEnv * env, jclass clazz,
+                                                                                  jstring token, jstring appVersion,
+                                                                                  jstring appId)
 {
   // TODO: Handle upload status in callback
   Editor::Instance().UploadChanges(jni::ToNativeString(env, token),
-      {{"created_by", "CoMaps " OMIM_OS_NAME " " + jni::ToNativeString(env, appVersion)},
-       {"bundle_id", jni::ToNativeString(env, appId)}}, nullptr);
+                                   {{"created_by", "CoMaps " OMIM_OS_NAME " " + jni::ToNativeString(env, appVersion)},
+                                    {"bundle_id", jni::ToNativeString(env, appId)}},
+                                   nullptr);
 }
 
-JNIEXPORT jlongArray JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeGetStats(JNIEnv * env, jclass clazz)
+JNIEXPORT jlongArray JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeGetStats(JNIEnv * env, jclass clazz)
 {
   auto const stats = Editor::Instance().GetStats();
   jlongArray result = env->NewLongArray(3);
@@ -352,14 +329,12 @@ Java_app_organicmaps_sdk_editor_Editor_nativeGetStats(JNIEnv * env, jclass clazz
   return result;
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeClearLocalEdits(JNIEnv * env, jclass clazz)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeClearLocalEdits(JNIEnv * env, jclass clazz)
 {
   Editor::Instance().ClearAllLocalEdits();
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeStartEdit(JNIEnv *, jclass)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeStartEdit(JNIEnv *, jclass)
 {
   ::Framework * frm = g_framework->NativeFramework();
   if (!frm->HasPlacePageInfo())
@@ -373,9 +348,8 @@ Java_app_organicmaps_sdk_editor_Editor_nativeStartEdit(JNIEnv *, jclass)
   CHECK(frm->GetEditableMapObject(info.GetID(), g_editableMapObject), ("Invalid feature in the place page."));
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeCreateMapObject(JNIEnv * env, jclass,
-                                                             jstring featureType)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeCreateMapObject(JNIEnv * env, jclass,
+                                                                                    jstring featureType)
 {
   ::Framework * frm = g_framework->NativeFramework();
   auto const type = classif().GetTypeByReadableObjectName(jni::ToNativeString(env, featureType));
@@ -384,11 +358,10 @@ Java_app_organicmaps_sdk_editor_Editor_nativeCreateMapObject(JNIEnv * env, jclas
 }
 
 // static void nativeCreateNote(String text);
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeCreateNote(JNIEnv * env, jclass clazz, jstring text)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeCreateNote(JNIEnv * env, jclass clazz, jstring text)
 {
-  g_framework->NativeFramework()->CreateNote(
-      g_editableMapObject, osm::Editor::NoteProblemType::General, jni::ToNativeString(env, text));
+  g_framework->NativeFramework()->CreateNote(g_editableMapObject, osm::Editor::NoteProblemType::General,
+                                             jni::ToNativeString(env, text));
 }
 
 JNIEXPORT void JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeCreateStandaloneNote(JNIEnv * env, jclass clazz,
@@ -399,23 +372,21 @@ JNIEXPORT void JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeCreateStanda
 }
 
 // static void nativePlaceDoesNotExist(String comment);
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativePlaceDoesNotExist(JNIEnv * env, jclass clazz, jstring comment)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_editor_Editor_nativePlaceDoesNotExist(JNIEnv * env, jclass clazz,
+                                                                                      jstring comment)
 {
-  g_framework->NativeFramework()->CreateNote(g_editableMapObject,
-                                             osm::Editor::NoteProblemType::PlaceDoesNotExist,
+  g_framework->NativeFramework()->CreateNote(g_editableMapObject, osm::Editor::NoteProblemType::PlaceDoesNotExist,
                                              jni::ToNativeString(env, comment));
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeRollbackMapObject(JNIEnv * env, jclass clazz)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeRollbackMapObject(JNIEnv * env, jclass clazz)
 {
   g_framework->NativeFramework()->RollBackChanges(g_editableMapObject.GetID());
 }
 
-JNIEXPORT jobjectArray JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeGetAllCreatableFeatureTypes(JNIEnv * env, jclass clazz,
-                                                                         jstring jLang)
+JNIEXPORT jobjectArray JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeGetAllCreatableFeatureTypes(JNIEnv * env,
+                                                                                                        jclass clazz,
+                                                                                                        jstring jLang)
 {
   std::string const & lang = jni::ToNativeString(env, jLang);
   auto & categories = GetFeatureCategories();
@@ -424,10 +395,10 @@ Java_app_organicmaps_sdk_editor_Editor_nativeGetAllCreatableFeatureTypes(JNIEnv
   return jni::ToJavaStringArray(env, categories.GetAllCreatableTypeNames());
 }
 
-JNIEXPORT jobjectArray JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeSearchCreatableFeatureTypes(JNIEnv * env, jclass clazz,
-                                                                         jstring query,
-                                                                         jstring jLang)
+JNIEXPORT jobjectArray JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeSearchCreatableFeatureTypes(JNIEnv * env,
+                                                                                                        jclass clazz,
+                                                                                                        jstring query,
+                                                                                                        jstring jLang)
 {
   std::string const & lang = jni::ToNativeString(env, jLang);
   auto & categories = GetFeatureCategories();
@@ -436,8 +407,7 @@ Java_app_organicmaps_sdk_editor_Editor_nativeSearchCreatableFeatureTypes(JNIEnv
   return jni::ToJavaStringArray(env, categories.Search(jni::ToNativeString(env, query)));
 }
 
-JNIEXPORT jobjectArray JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeGetCuisines(JNIEnv * env, jclass clazz)
+JNIEXPORT jobjectArray JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeGetCuisines(JNIEnv * env, jclass clazz)
 {
   osm::AllCuisines const & cuisines = osm::Cuisines::Instance().AllSupportedCuisines();
   std::vector<std::string> keys;
@@ -447,14 +417,15 @@ Java_app_organicmaps_sdk_editor_Editor_nativeGetCuisines(JNIEnv * env, jclass cl
   return jni::ToJavaStringArray(env, keys);
 }
 
-JNIEXPORT jobjectArray JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeGetSelectedCuisines(JNIEnv * env, jclass clazz)
+JNIEXPORT jobjectArray JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeGetSelectedCuisines(JNIEnv * env,
+                                                                                                jclass clazz)
 {
   return jni::ToJavaStringArray(env, g_editableMapObject.GetCuisines());
 }
 
-JNIEXPORT jobjectArray JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeFilterCuisinesKeys(JNIEnv * env, jclass thiz, jstring jSubstr)
+JNIEXPORT jobjectArray JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeFilterCuisinesKeys(JNIEnv * env,
+                                                                                               jclass thiz,
+                                                                                               jstring jSubstr)
 {
   std::string const substr = jni::ToNativeString(env, jSubstr);
   bool const noFilter = substr.length() == 0;
@@ -473,8 +444,9 @@ Java_app_organicmaps_sdk_editor_Editor_nativeFilterCuisinesKeys(JNIEnv * env, jc
   return jni::ToJavaStringArray(env, keys);
 }
 
-JNIEXPORT jobjectArray JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeTranslateCuisines(JNIEnv * env, jclass clazz, jobjectArray jKeys)
+JNIEXPORT jobjectArray JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeTranslateCuisines(JNIEnv * env,
+                                                                                              jclass clazz,
+                                                                                              jobjectArray jKeys)
 {
   int const length = env->GetArrayLength(jKeys);
   auto const & cuisines = osm::Cuisines::Instance();
@@ -488,8 +460,8 @@ Java_app_organicmaps_sdk_editor_Editor_nativeTranslateCuisines(JNIEnv * env, jcl
   return jni::ToJavaStringArray(env, translations);
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeSetSelectedCuisines(JNIEnv * env, jclass clazz, jobjectArray jKeys)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeSetSelectedCuisines(JNIEnv * env, jclass clazz,
+                                                                                        jobjectArray jKeys)
 {
   int const length = env->GetArrayLength(jKeys);
   std::vector<std::string> cuisines;
@@ -499,39 +471,35 @@ Java_app_organicmaps_sdk_editor_Editor_nativeSetSelectedCuisines(JNIEnv * env, j
   g_editableMapObject.SetCuisines(cuisines);
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeGetFormattedCuisine(JNIEnv * env, jclass clazz)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeGetFormattedCuisine(JNIEnv * env, jclass clazz)
 {
   return jni::ToJavaString(env, g_editableMapObject.FormatCuisines());
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeGetMwmName(JNIEnv * env, jclass clazz)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeGetMwmName(JNIEnv * env, jclass clazz)
 {
   return jni::ToJavaString(env, g_editableMapObject.GetID().GetMwmName());
 }
 
-JNIEXPORT jlong JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeGetMwmVersion(JNIEnv * env, jclass clazz)
+JNIEXPORT jlong JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeGetMwmVersion(JNIEnv * env, jclass clazz)
 {
   return g_editableMapObject.GetID().GetMwmVersion();
 }
 
 // static boolean nativeIsHouseValid(String houseNumber);
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeIsHouseValid(JNIEnv * env, jclass clazz, jstring houseNumber)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeIsHouseValid(JNIEnv * env, jclass clazz,
+                                                                                     jstring houseNumber)
 {
   return osm::EditableMapObject::ValidateHouseNumber(jni::ToNativeString(env, houseNumber));
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeIsNameValid(JNIEnv * env, jclass clazz, jstring name)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeIsNameValid(JNIEnv * env, jclass clazz,
+                                                                                    jstring name)
 {
   return osm::EditableMapObject::ValidateName(jni::ToNativeString(env, name));
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeGetCategory(JNIEnv * env, jclass clazz)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeGetCategory(JNIEnv * env, jclass clazz)
 {
   auto types = g_editableMapObject.GetTypes();
   types.SortBySpec();
@@ -540,23 +508,22 @@ Java_app_organicmaps_sdk_editor_Editor_nativeGetCategory(JNIEnv * env, jclass cl
 
 // @FeatureStatus
 // static native int nativeGetMapObjectStatus();
-JNIEXPORT jint JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeGetMapObjectStatus(JNIEnv * env, jclass clazz)
+JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeGetMapObjectStatus(JNIEnv * env, jclass clazz)
 {
   return static_cast<jint>(osm::Editor::Instance().GetFeatureStatus(g_editableMapObject.GetID()));
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeIsMapObjectUploaded(JNIEnv * env, jclass clazz)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeIsMapObjectUploaded(JNIEnv * env, jclass clazz)
 {
-  return osm::Editor::Instance().IsFeatureUploaded(g_editableMapObject.GetID().m_mwmId, g_editableMapObject.GetID().m_index);
+  return osm::Editor::Instance().IsFeatureUploaded(g_editableMapObject.GetID().m_mwmId,
+                                                   g_editableMapObject.GetID().m_index);
 }
 
 // static nativeMakeLocalizedName(String langCode, String name);
-JNIEXPORT jobject JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeMakeLocalizedName(JNIEnv * env, jclass clazz, jstring code, jstring name)
+JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeMakeLocalizedName(JNIEnv * env, jclass clazz,
+                                                                                         jstring code, jstring name)
 {
   osm::LocalizedName localizedName(jni::ToNativeString(env, code), jni::ToNativeString(env, name));
   return ToJavaName(env, localizedName);
 }
-} // extern "C"
+}  // extern "C"
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/OpeningHours.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/OpeningHours.cpp
index ec16b2abc..c06d332d8 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/OpeningHours.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/OpeningHours.cpp
@@ -14,7 +14,6 @@
 #include <set>
 #include <vector>
 
-
 namespace
 {
 using namespace editor;
@@ -43,22 +42,12 @@ jfieldID g_fidWeekdays;
 
 jobject JavaHoursMinutes(JNIEnv * env, jlong hours, jlong minutes)
 {
-  static const jclass dateUtilsClass = jni::GetGlobalClassRef(env,
-                                                              "app/organicmaps/sdk/util/DateUtils");
+  static jclass const dateUtilsClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/DateUtils");
   static jmethodID const is24HourFormatMethod =
-    jni::GetStaticMethodID(env,
-                           dateUtilsClass,
-                           "is24HourFormat",
-                           "(Landroid/content/Context;)Z");
+      jni::GetStaticMethodID(env, dateUtilsClass, "is24HourFormat", "(Landroid/content/Context;)Z");
   jobject context = android::Platform::Instance().GetContext();
-  jboolean const is24HourFormat = env->CallStaticBooleanMethod(dateUtilsClass,
-                                                               is24HourFormatMethod,
-                                                               context);
-  jobject const hoursMinutes = env->NewObject(g_clazzHoursMinutes,
-                                              g_ctorHoursMinutes,
-                                              hours,
-                                              minutes,
-                                              is24HourFormat);
+  jboolean const is24HourFormat = env->CallStaticBooleanMethod(dateUtilsClass, is24HourFormatMethod, context);
+  jobject const hoursMinutes = env->NewObject(g_clazzHoursMinutes, g_ctorHoursMinutes, hours, minutes, is24HourFormat);
   ASSERT(hoursMinutes, (jni::DescribeException()));
   return hoursMinutes;
 }
@@ -74,8 +63,7 @@ jobject JavaTimespan(JNIEnv * env, osmoh::Timespan const & timespan)
 {
   auto const start = timespan.GetStart();
   auto const end = timespan.GetEnd();
-  return JavaTimespan(env,
-                      JavaHoursMinutes(env, start.GetHoursCount(), start.GetMinutesCount()),
+  return JavaTimespan(env, JavaHoursMinutes(env, start.GetHoursCount(), start.GetMinutesCount()),
                       JavaHoursMinutes(env, end.GetHoursCount(), end.GetMinutesCount()));
 }
 
@@ -92,22 +80,16 @@ jobject JavaTimetable(JNIEnv * env, TimeTable const & tt)
   std::set<Weekday> weekdays = tt.GetOpeningDays();
   std::vector<int> weekdaysVector;
   weekdaysVector.reserve(weekdays.size());
-  std::transform(weekdays.begin(), weekdays.end(), std::back_inserter(weekdaysVector), [](Weekday weekday)
-  {
-    return static_cast<int>(weekday);
-  });
+  std::transform(weekdays.begin(), weekdays.end(), std::back_inserter(weekdaysVector),
+                 [](Weekday weekday) { return static_cast<int>(weekday); });
   jintArray jWeekdays = env->NewIntArray(static_cast<jsize>(weekdays.size()));
-  env->SetIntArrayRegion(jWeekdays, 0, static_cast<jsize>(weekdaysVector.size()),
-                         &weekdaysVector[0]);
+  env->SetIntArrayRegion(jWeekdays, 0, static_cast<jsize>(weekdaysVector.size()), &weekdaysVector[0]);
 
-  return JavaTimetable(env,
-                       JavaTimespan(env, tt.GetOpeningTime()),
-                       jni::ToJavaArray(env, g_clazzTimespan, tt.GetExcludeTime(), [](JNIEnv * env, osmoh::Timespan const & timespan)
-                       {
-                         return JavaTimespan(env, timespan);
-                       }),
-                       tt.IsTwentyFourHours(),
-                       jWeekdays);
+  return JavaTimetable(
+      env, JavaTimespan(env, tt.GetOpeningTime()),
+      jni::ToJavaArray(env, g_clazzTimespan, tt.GetExcludeTime(),
+                       [](JNIEnv * env, osmoh::Timespan const & timespan) { return JavaTimespan(env, timespan); }),
+      tt.IsTwentyFourHours(), jWeekdays);
 }
 
 jobjectArray JavaTimetables(JNIEnv * env, TimeTableSet & tts)
@@ -142,7 +124,7 @@ TimeTable NativeTimetable(JNIEnv * env, jobject jTimetable)
 {
   TimeTable tt = TimeTable::GetPredefinedTimeTable();
   jintArray const jWeekdays = static_cast<jintArray>(env->GetObjectField(jTimetable, g_fidWeekdays));
-  int * weekdaysArr = static_cast<int*>(env->GetIntArrayElements(jWeekdays, nullptr));
+  int * weekdaysArr = static_cast<int *>(env->GetIntArrayElements(jWeekdays, nullptr));
   jint size = env->GetArrayLength(jWeekdays);
   std::set<Weekday> weekdays;
   for (int i = 0; i < size; i++)
@@ -181,8 +163,7 @@ TimeTableSet NativeTimetableSet(JNIEnv * env, jobjectArray jTimetables)
 
 extern "C"
 {
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_editor_OpeningHours_nativeInit(JNIEnv * env, jclass clazz)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_editor_OpeningHours_nativeInit(JNIEnv * env, jclass clazz)
 {
   g_clazzHoursMinutes = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/editor/data/HoursMinutes");
   // Java signature : HoursMinutes(@IntRange(from = 0, to = 24) long hours, @IntRange(from = 0, to = 60) long minutes)
@@ -195,8 +176,9 @@ Java_app_organicmaps_sdk_editor_OpeningHours_nativeInit(JNIEnv * env, jclass cla
 
   g_clazzTimespan = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/editor/data/Timespan");
   // Java signature : Timespan(HoursMinutes start, HoursMinutes end)
-  g_ctorTimespan =
-      env->GetMethodID(g_clazzTimespan, "<init>","(Lapp/organicmaps/sdk/editor/data/HoursMinutes;Lapp/organicmaps/sdk/editor/data/HoursMinutes;)V");
+  g_ctorTimespan = env->GetMethodID(
+      g_clazzTimespan, "<init>",
+      "(Lapp/organicmaps/sdk/editor/data/HoursMinutes;Lapp/organicmaps/sdk/editor/data/HoursMinutes;)V");
   ASSERT(g_ctorTimespan, (jni::DescribeException()));
   g_fidStart = env->GetFieldID(g_clazzTimespan, "start", "Lapp/organicmaps/sdk/editor/data/HoursMinutes;");
   ASSERT(g_fidStart, (jni::DescribeException()));
@@ -206,11 +188,14 @@ Java_app_organicmaps_sdk_editor_OpeningHours_nativeInit(JNIEnv * env, jclass cla
   g_clazzTimetable = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/editor/data/Timetable");
   // Java signature : Timetable(Timespan workingTime, Timespan[] closedHours, boolean isFullday, int weekdays[])
   g_ctorTimetable =
-      env->GetMethodID(g_clazzTimetable, "<init>","(Lapp/organicmaps/sdk/editor/data/Timespan;[Lapp/organicmaps/sdk/editor/data/Timespan;Z[I)V");
+      env->GetMethodID(g_clazzTimetable, "<init>",
+                       "(Lapp/organicmaps/sdk/editor/data/Timespan;[Lapp/organicmaps/sdk/editor/data/Timespan;Z[I)V");
   ASSERT(g_ctorTimetable, (jni::DescribeException()));
-  g_fidWorkingTimespan = env->GetFieldID(g_clazzTimetable, "workingTimespan", "Lapp/organicmaps/sdk/editor/data/Timespan;");
+  g_fidWorkingTimespan =
+      env->GetFieldID(g_clazzTimetable, "workingTimespan", "Lapp/organicmaps/sdk/editor/data/Timespan;");
   ASSERT(g_fidWorkingTimespan, (jni::DescribeException()));
-  g_fidClosedTimespans = env->GetFieldID(g_clazzTimetable, "closedTimespans", "[Lapp/organicmaps/sdk/editor/data/Timespan;");
+  g_fidClosedTimespans =
+      env->GetFieldID(g_clazzTimetable, "closedTimespans", "[Lapp/organicmaps/sdk/editor/data/Timespan;");
   ASSERT(g_fidClosedTimespans, (jni::DescribeException()));
   g_fidIsFullday = env->GetFieldID(g_clazzTimetable, "isFullday", "Z");
   ASSERT(g_fidIsFullday, (jni::DescribeException()));
@@ -218,23 +203,22 @@ Java_app_organicmaps_sdk_editor_OpeningHours_nativeInit(JNIEnv * env, jclass cla
   ASSERT(g_fidWeekdays, (jni::DescribeException()));
 }
 
-JNIEXPORT jobjectArray JNICALL
-Java_app_organicmaps_sdk_editor_OpeningHours_nativeGetDefaultTimetables(JNIEnv * env, jclass clazz)
+JNIEXPORT jobjectArray JNICALL Java_app_organicmaps_sdk_editor_OpeningHours_nativeGetDefaultTimetables(JNIEnv * env,
+                                                                                                       jclass clazz)
 {
   TimeTableSet tts;
   return JavaTimetables(env, tts);
 }
 
-JNIEXPORT jobject JNICALL
-Java_app_organicmaps_sdk_editor_OpeningHours_nativeGetComplementTimetable(JNIEnv * env, jclass clazz, jobjectArray timetables)
+JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_editor_OpeningHours_nativeGetComplementTimetable(
+    JNIEnv * env, jclass clazz, jobjectArray timetables)
 {
   TimeTableSet const tts = NativeTimetableSet(env, timetables);
   return JavaTimetable(env, tts.GetComplementTimeTable());
 }
 
-JNIEXPORT jobjectArray JNICALL
-Java_app_organicmaps_sdk_editor_OpeningHours_nativeRemoveWorkingDay(JNIEnv * env, jclass clazz,
-                                                                jobjectArray timetables, jint ttIndex, jint dayIndex)
+JNIEXPORT jobjectArray JNICALL Java_app_organicmaps_sdk_editor_OpeningHours_nativeRemoveWorkingDay(
+    JNIEnv * env, jclass clazz, jobjectArray timetables, jint ttIndex, jint dayIndex)
 {
   TimeTableSet tts = NativeTimetableSet(env, timetables);
   auto tt = tts.Get(ttIndex);
@@ -243,9 +227,8 @@ Java_app_organicmaps_sdk_editor_OpeningHours_nativeRemoveWorkingDay(JNIEnv * env
   return JavaTimetables(env, tts);
 }
 
-JNIEXPORT jobjectArray JNICALL
-Java_app_organicmaps_sdk_editor_OpeningHours_nativeAddWorkingDay(JNIEnv * env, jclass clazz,
-                                                             jobjectArray timetables, jint ttIndex, jint dayIndex)
+JNIEXPORT jobjectArray JNICALL Java_app_organicmaps_sdk_editor_OpeningHours_nativeAddWorkingDay(
+    JNIEnv * env, jclass clazz, jobjectArray timetables, jint ttIndex, jint dayIndex)
 {
   TimeTableSet tts = NativeTimetableSet(env, timetables);
   auto tt = tts.Get(ttIndex);
@@ -254,9 +237,9 @@ Java_app_organicmaps_sdk_editor_OpeningHours_nativeAddWorkingDay(JNIEnv * env, j
   return JavaTimetables(env, tts);
 }
 
-JNIEXPORT jobject JNICALL
-Java_app_organicmaps_sdk_editor_OpeningHours_nativeSetIsFullday(JNIEnv * env, jclass clazz,
-                                                            jobject jTimetable, jboolean jIsFullday)
+JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_editor_OpeningHours_nativeSetIsFullday(JNIEnv * env, jclass clazz,
+                                                                                          jobject jTimetable,
+                                                                                          jboolean jIsFullday)
 {
   TimeTable tt = NativeTimetable(env, jTimetable);
   if (jIsFullday)
@@ -269,46 +252,49 @@ Java_app_organicmaps_sdk_editor_OpeningHours_nativeSetIsFullday(JNIEnv * env, jc
   return JavaTimetable(env, tt);
 }
 
-JNIEXPORT jobject JNICALL
-Java_app_organicmaps_sdk_editor_OpeningHours_nativeSetOpeningTime(JNIEnv * env, jclass clazz,
-                                                              jobject jTimetable, jobject jOpeningTime)
+JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_editor_OpeningHours_nativeSetOpeningTime(JNIEnv * env, jclass clazz,
+                                                                                            jobject jTimetable,
+                                                                                            jobject jOpeningTime)
 {
   TimeTable tt = NativeTimetable(env, jTimetable);
   tt.SetOpeningTime(NativeTimespan(env, jOpeningTime));
   return JavaTimetable(env, tt);
 }
 
-JNIEXPORT jobject JNICALL
-Java_app_organicmaps_sdk_editor_OpeningHours_nativeAddClosedSpan(JNIEnv * env, jclass clazz,
-                                                             jobject jTimetable, jobject jClosedSpan)
+JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_editor_OpeningHours_nativeAddClosedSpan(JNIEnv * env, jclass clazz,
+                                                                                           jobject jTimetable,
+                                                                                           jobject jClosedSpan)
 {
   TimeTable tt = NativeTimetable(env, jTimetable);
   tt.AddExcludeTime(NativeTimespan(env, jClosedSpan));
   return JavaTimetable(env, tt);
 }
 
-JNIEXPORT jobject JNICALL
-Java_app_organicmaps_sdk_editor_OpeningHours_nativeRemoveClosedSpan(JNIEnv * env, jclass clazz,
-                                                                jobject jTimetable, jint jClosedSpanIndex)
+JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_editor_OpeningHours_nativeRemoveClosedSpan(JNIEnv * env,
+                                                                                              jclass clazz,
+                                                                                              jobject jTimetable,
+                                                                                              jint jClosedSpanIndex)
 {
   TimeTable tt = NativeTimetable(env, jTimetable);
   tt.RemoveExcludeTime(static_cast<size_t>(jClosedSpanIndex));
   return JavaTimetable(env, tt);
 }
 
-JNIEXPORT jobjectArray JNICALL
-Java_app_organicmaps_sdk_editor_OpeningHours_nativeTimetablesFromString(JNIEnv * env, jclass clazz, jstring jSource)
+JNIEXPORT jobjectArray JNICALL Java_app_organicmaps_sdk_editor_OpeningHours_nativeTimetablesFromString(JNIEnv * env,
+                                                                                                       jclass clazz,
+                                                                                                       jstring jSource)
 {
   TimeTableSet tts;
   std::string const source = jni::ToNativeString(env, jSource);
-  if (!source.empty()  && MakeTimeTableSet(OpeningHours(source), tts))
+  if (!source.empty() && MakeTimeTableSet(OpeningHours(source), tts))
     return JavaTimetables(env, tts);
 
   return nullptr;
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_editor_OpeningHours_nativeTimetablesToString(JNIEnv * env, jclass clazz, jobjectArray jTts)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_editor_OpeningHours_nativeTimetablesToString(JNIEnv * env,
+                                                                                                jclass clazz,
+                                                                                                jobjectArray jTts)
 {
   TimeTableSet tts = NativeTimetableSet(env, jTts);
   std::stringstream sstr;
@@ -316,15 +302,15 @@ Java_app_organicmaps_sdk_editor_OpeningHours_nativeTimetablesToString(JNIEnv * e
   return jni::ToJavaString(env, sstr.str());
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_editor_OpeningHours_nativeIsTimetableStringValid(JNIEnv * env, jclass clazz, jstring jSource)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_OpeningHours_nativeIsTimetableStringValid(JNIEnv * env,
+                                                                                                     jclass clazz,
+                                                                                                     jstring jSource)
 {
   return OpeningHours(jni::ToNativeString(env, jSource)).IsValid();
 }
 
-
-JNIEXPORT jobject JNICALL
-Java_app_organicmaps_sdk_editor_OpeningHours_nativeCurrentState(JNIEnv * env, jclass clazz, jobjectArray jTts)
+JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_editor_OpeningHours_nativeCurrentState(JNIEnv * env, jclass clazz,
+                                                                                          jobjectArray jTts)
 {
   TimeTableSet tts = NativeTimetableSet(env, jTts);
   time_t const now = time(nullptr);
@@ -334,17 +320,16 @@ Java_app_organicmaps_sdk_editor_OpeningHours_nativeCurrentState(JNIEnv * env, jc
   jclass ohStateClass = jni::GetGlobalClassRef(env, "app/organicmaps/editor/OhState");
   jclass ruleStateClass = jni::GetGlobalClassRef(env, "app/organicmaps/editor/OhState$State");
 
-  static const std::unordered_map<RuleState, const char*> ruleState = {
-      {RuleState::Open, "Open"},
-      {RuleState::Closed, "Closed"},
-      {RuleState::Unknown, "Unknown"}
-  };
+  static std::unordered_map<RuleState, char const *> const ruleState = {
+      {RuleState::Open, "Open"}, {RuleState::Closed, "Closed"}, {RuleState::Unknown, "Unknown"}};
 
-  jfieldID stateField = env->GetStaticFieldID(ruleStateClass, ruleState.at(ohInfo.state), "Lapp/organicmaps/editor/OhState$State;");
+  jfieldID stateField =
+      env->GetStaticFieldID(ruleStateClass, ruleState.at(ohInfo.state), "Lapp/organicmaps/editor/OhState$State;");
   jobject stateObj = env->GetStaticObjectField(ruleStateClass, stateField);
   jmethodID constructor = env->GetMethodID(ohStateClass, "<init>", "(Lapp/organicmaps/editor/OhState$State;JJ)V");
-  jobject javaOhState = env->NewObject(ohStateClass, constructor, stateObj, (jlong) ohInfo.nextTimeOpen, (jlong) ohInfo.nextTimeClosed);
+  jobject javaOhState =
+      env->NewObject(ohStateClass, constructor, stateObj, (jlong)ohInfo.nextTimeOpen, (jlong)ohInfo.nextTimeClosed);
 
   return javaOhState;
 }
-} // extern "C"
+}  // extern "C"
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/OsmOAuth.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/OsmOAuth.cpp
index 9ef2078af..6dbfb257a 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/OsmOAuth.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/OsmOAuth.cpp
@@ -1,7 +1,7 @@
 #include <jni.h>
 
-#include "app/organicmaps/sdk/core/jni_helper.hpp"
 #include "app/organicmaps/sdk/Framework.hpp"
+#include "app/organicmaps/sdk/core/jni_helper.hpp"
 
 #include "base/logging.hpp"
 #include "base/string_utils.hpp"
@@ -25,17 +25,15 @@ bool LoadOsmUserPreferences(std::string const & oauthToken, UserPreferences & ou
 
 extern "C"
 {
-
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_editor_OsmOAuth_nativeGetOAuth2Url(JNIEnv * env, jclass)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_editor_OsmOAuth_nativeGetOAuth2Url(JNIEnv * env, jclass)
 {
   auto const auth = OsmOAuth::ServerAuth();
   return ToJavaString(env, auth.BuildOAuth2Url());
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_editor_OsmOAuth_nativeAuthWithPassword(JNIEnv * env, jclass clazz,
-                                                                jstring login, jstring password)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_editor_OsmOAuth_nativeAuthWithPassword(JNIEnv * env, jclass clazz,
+                                                                                          jstring login,
+                                                                                          jstring password)
 {
   OsmOAuth auth = OsmOAuth::ServerAuth();
   try
@@ -51,8 +49,8 @@ Java_app_organicmaps_sdk_editor_OsmOAuth_nativeAuthWithPassword(JNIEnv * env, jc
   return nullptr;
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_editor_OsmOAuth_nativeAuthWithOAuth2Code(JNIEnv * env, jclass, jstring oauth2code)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_editor_OsmOAuth_nativeAuthWithOAuth2Code(JNIEnv * env, jclass,
+                                                                                            jstring oauth2code)
 {
   OsmOAuth auth = OsmOAuth::ServerAuth();
   try
@@ -60,8 +58,8 @@ Java_app_organicmaps_sdk_editor_OsmOAuth_nativeAuthWithOAuth2Code(JNIEnv * env,
     auto token = auth.FinishAuthorization(ToNativeString(env, oauth2code));
     if (!token.empty())
     {
-        auth.SetAuthToken(token);
-        return ToJavaString(env, token);
+      auth.SetAuthToken(token);
+      return ToJavaString(env, token);
     }
     LOG(LWARNING, ("nativeAuthWithOAuth2Code: invalid OAuth2 code", oauth2code));
   }
@@ -72,8 +70,8 @@ Java_app_organicmaps_sdk_editor_OsmOAuth_nativeAuthWithOAuth2Code(JNIEnv * env,
   return nullptr;
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_editor_OsmOAuth_nativeGetOsmUsername(JNIEnv * env, jclass, jstring oauthToken)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_editor_OsmOAuth_nativeGetOsmUsername(JNIEnv * env, jclass,
+                                                                                        jstring oauthToken)
 {
   UserPreferences prefs;
   if (LoadOsmUserPreferences(jni::ToNativeString(env, oauthToken), prefs))
@@ -81,8 +79,8 @@ Java_app_organicmaps_sdk_editor_OsmOAuth_nativeGetOsmUsername(JNIEnv * env, jcla
   return nullptr;
 }
 
-JNIEXPORT jint JNICALL
-Java_app_organicmaps_sdk_editor_OsmOAuth_nativeGetOsmChangesetsCount(JNIEnv * env, jclass, jstring oauthToken)
+JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_editor_OsmOAuth_nativeGetOsmChangesetsCount(JNIEnv * env, jclass,
+                                                                                            jstring oauthToken)
 {
   UserPreferences prefs;
   if (LoadOsmUserPreferences(jni::ToNativeString(env, oauthToken), prefs))
@@ -90,8 +88,8 @@ Java_app_organicmaps_sdk_editor_OsmOAuth_nativeGetOsmChangesetsCount(JNIEnv * en
   return -1;
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_editor_OsmOAuth_nativeGetOsmProfilePictureUrl(JNIEnv * env, jclass, jstring oauthToken)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_editor_OsmOAuth_nativeGetOsmProfilePictureUrl(JNIEnv * env, jclass,
+                                                                                                 jstring oauthToken)
 {
   UserPreferences prefs;
   if (LoadOsmUserPreferences(jni::ToNativeString(env, oauthToken), prefs))
@@ -99,15 +97,14 @@ Java_app_organicmaps_sdk_editor_OsmOAuth_nativeGetOsmProfilePictureUrl(JNIEnv *
   return nullptr;
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_editor_OsmOAuth_nativeGetHistoryUrl(JNIEnv * env, jclass, jstring user)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_editor_OsmOAuth_nativeGetHistoryUrl(JNIEnv * env, jclass,
+                                                                                       jstring user)
 {
   return jni::ToJavaString(env, OsmOAuth::ServerAuth().GetHistoryURL(jni::ToNativeString(env, user)));
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_editor_OsmOAuth_nativeGetNotesUrl(JNIEnv * env, jclass, jstring user)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_editor_OsmOAuth_nativeGetNotesUrl(JNIEnv * env, jclass, jstring user)
 {
   return jni::ToJavaString(env, OsmOAuth::ServerAuth().GetNotesURL(jni::ToNativeString(env, user)));
 }
-} // extern "C"
+}  // extern "C"
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/isolines/IsolinesManager.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/isolines/IsolinesManager.cpp
index 72c462f47..e51f63d07 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/isolines/IsolinesManager.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/isolines/IsolinesManager.cpp
@@ -7,39 +7,34 @@ using namespace std::placeholders;
 
 extern "C"
 {
-static void IsolinesStateChanged(IsolinesManager::IsolinesState state,
-                                 std::shared_ptr<jobject> const & listener)
+static void IsolinesStateChanged(IsolinesManager::IsolinesState state, std::shared_ptr<jobject> const & listener)
 {
   LOG(LINFO, (static_cast<int>(state)));
   JNIEnv * env = jni::GetEnv();
-  env->CallVoidMethod(*listener,
-                      jni::GetMethodID(env, *listener, "onStateChanged", "(I)V"),
-                      static_cast<jint>(state));
+  env->CallVoidMethod(*listener, jni::GetMethodID(env, *listener, "onStateChanged", "(I)V"), static_cast<jint>(state));
 }
 
-
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_maplayer_isolines_IsolinesManager_nativeAddListener(JNIEnv *env, jclass clazz, jobject listener)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_maplayer_isolines_IsolinesManager_nativeAddListener(JNIEnv * env,
+                                                                                                    jclass clazz,
+                                                                                                    jobject listener)
 {
   CHECK(g_framework, ("Framework isn't created yet!"));
-  g_framework->SetIsolinesListener(std::bind(&IsolinesStateChanged,
-                                   std::placeholders::_1,
-                                   jni::make_global_ref(listener)));
+  g_framework->SetIsolinesListener(
+      std::bind(&IsolinesStateChanged, std::placeholders::_1, jni::make_global_ref(listener)));
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_maplayer_isolines_IsolinesManager_nativeRemoveListener(JNIEnv * env, jclass clazz)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_maplayer_isolines_IsolinesManager_nativeRemoveListener(JNIEnv * env,
+                                                                                                       jclass clazz)
 {
   CHECK(g_framework, ("Framework isn't created yet!"));
   g_framework->SetIsolinesListener(nullptr);
 }
 
 JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_maplayer_isolines_IsolinesManager_nativeShouldShowNotification(JNIEnv *env,
-        jclass clazz)
+Java_app_organicmaps_sdk_maplayer_isolines_IsolinesManager_nativeShouldShowNotification(JNIEnv * env, jclass clazz)
 {
   CHECK(g_framework, ("Framework isn't created yet!"));
-  auto const &manager = g_framework->NativeFramework()->GetIsolinesManager();
+  auto const & manager = g_framework->NativeFramework()->GetIsolinesManager();
   auto const visible = manager.IsVisible();
   auto const enabled = manager.GetState() == IsolinesManager::IsolinesState::Enabled;
   return static_cast<jboolean>(!visible && enabled);
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/android_gl_utils.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/android_gl_utils.cpp
index b26cc51e1..27485def9 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/android_gl_utils.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/android_gl_utils.cpp
@@ -7,10 +7,7 @@
 namespace android
 {
 
-ConfigComparator::ConfigComparator(EGLDisplay display)
-  : m_display(display)
-{
-}
+ConfigComparator::ConfigComparator(EGLDisplay display) : m_display(display) {}
 
 bool ConfigComparator::operator()(EGLConfig const & l, EGLConfig const & r) const
 {
@@ -28,14 +25,10 @@ int ConfigComparator::configWeight(EGLConfig const & config) const
 
   switch (val)
   {
-    case EGL_NONE:
-      return 0;
-    case EGL_SLOW_CONFIG:
-      return 1;
-    case EGL_NON_CONFORMANT_CONFIG:
-      return 2;
-    default:
-      return 0;
+  case EGL_NONE: return 0;
+  case EGL_SLOW_CONFIG: return 1;
+  case EGL_NON_CONFORMANT_CONFIG: return 2;
+  default: return 0;
   }
 }
 
@@ -53,21 +46,21 @@ std::string GetEglError(EGLint error)
 {
   switch (error)
   {
-  case EGL_NOT_INITIALIZED :      return "EGL_NOT_INITIALIZED";
-  case EGL_BAD_ACCESS :           return "EGL_BAD_ACCESS";
-  case EGL_BAD_ALLOC :            return "EGL_BAD_ALLOC";
-  case EGL_BAD_ATTRIBUTE :        return "EGL_BAD_ATTRIBUTE";
-  case EGL_BAD_CONFIG :           return "EGL_BAD_CONFIG";
-  case EGL_BAD_CONTEXT :          return "EGL_BAD_CONTEXT";
-  case EGL_BAD_CURRENT_SURFACE :  return "EGL_BAD_CURRENT_SURFACE";
-  case EGL_BAD_DISPLAY :          return "EGL_BAD_DISPLAY";
-  case EGL_BAD_MATCH :            return "EGL_BAD_MATCH";
-  case EGL_BAD_NATIVE_PIXMAP :    return "EGL_BAD_NATIVE_PIXMAP";
-  case EGL_BAD_NATIVE_WINDOW :    return "EGL_BAD_NATIVE_WINDOW";
-  case EGL_BAD_PARAMETER :        return "EGL_BAD_PARAMETER";
-  case EGL_BAD_SURFACE :          return "EGL_BAD_SURFACE";
-  case EGL_CONTEXT_LOST :         return "EGL_CONTEXT_LOST";
-  default:                        return strings::to_string(error);
+  case EGL_NOT_INITIALIZED: return "EGL_NOT_INITIALIZED";
+  case EGL_BAD_ACCESS: return "EGL_BAD_ACCESS";
+  case EGL_BAD_ALLOC: return "EGL_BAD_ALLOC";
+  case EGL_BAD_ATTRIBUTE: return "EGL_BAD_ATTRIBUTE";
+  case EGL_BAD_CONFIG: return "EGL_BAD_CONFIG";
+  case EGL_BAD_CONTEXT: return "EGL_BAD_CONTEXT";
+  case EGL_BAD_CURRENT_SURFACE: return "EGL_BAD_CURRENT_SURFACE";
+  case EGL_BAD_DISPLAY: return "EGL_BAD_DISPLAY";
+  case EGL_BAD_MATCH: return "EGL_BAD_MATCH";
+  case EGL_BAD_NATIVE_PIXMAP: return "EGL_BAD_NATIVE_PIXMAP";
+  case EGL_BAD_NATIVE_WINDOW: return "EGL_BAD_NATIVE_WINDOW";
+  case EGL_BAD_PARAMETER: return "EGL_BAD_PARAMETER";
+  case EGL_BAD_SURFACE: return "EGL_BAD_SURFACE";
+  case EGL_CONTEXT_LOST: return "EGL_CONTEXT_LOST";
+  default: return strings::to_string(error);
   }
 }
 
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/android_gl_utils.hpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/android_gl_utils.hpp
index 9ee372ca7..77148cb63 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/android_gl_utils.hpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/android_gl_utils.hpp
@@ -25,5 +25,16 @@ private:
 void CheckEGL(base::SrcPoint const & src);
 }  // namespace android
 
-#define CHECK_EGL(x) do { (x); android::CheckEGL(SRC());} while(false);
-#define CHECK_EGL_CALL() do { android::CheckEGL(SRC());} while (false);
+#define CHECK_EGL(x)          \
+  do                          \
+  {                           \
+    (x);                      \
+    android::CheckEGL(SRC()); \
+  }                           \
+  while (false);
+#define CHECK_EGL_CALL()      \
+  do                          \
+  {                           \
+    android::CheckEGL(SRC()); \
+  }                           \
+  while (false);
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontext.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontext.cpp
index bfe5b3841..381e33796 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontext.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontext.cpp
@@ -10,15 +10,12 @@ namespace android
 
 static EGLint * getContextAttributesList()
 {
-  static EGLint contextAttrList[] = {
-    EGL_CONTEXT_CLIENT_VERSION, 3,
-    EGL_NONE
-  };
+  static EGLint contextAttrList[] = {EGL_CONTEXT_CLIENT_VERSION, 3, EGL_NONE};
   return contextAttrList;
 }
 
-AndroidOGLContext::AndroidOGLContext(EGLDisplay display, EGLSurface surface,
-                                     EGLConfig config, AndroidOGLContext * contextToShareWith)
+AndroidOGLContext::AndroidOGLContext(EGLDisplay display, EGLSurface surface, EGLConfig config,
+                                     AndroidOGLContext * contextToShareWith)
   : m_nativeContext(EGL_NO_CONTEXT)
   , m_surface(surface)
   , m_display(display)
@@ -82,8 +79,7 @@ bool AndroidOGLContext::Validate()
 {
   if (!m_presentAvailable)
     return false;
-  return eglGetCurrentDisplay() != EGL_NO_DISPLAY &&
-         eglGetCurrentSurface(EGL_DRAW) != EGL_NO_SURFACE &&
+  return eglGetCurrentDisplay() != EGL_NO_DISPLAY && eglGetCurrentSurface(EGL_DRAW) != EGL_NO_SURFACE &&
          eglGetCurrentContext() != EGL_NO_CONTEXT;
 }
 
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontext.hpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontext.hpp
index 6f7885b64..6fb9679eb 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontext.hpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontext.hpp
@@ -10,8 +10,7 @@ namespace android
 class AndroidOGLContext : public dp::OGLContext
 {
 public:
-  AndroidOGLContext(EGLDisplay display, EGLSurface surface,
-                    EGLConfig config, AndroidOGLContext * contextToShareWith);
+  AndroidOGLContext(EGLDisplay display, EGLSurface surface, EGLConfig config, AndroidOGLContext * contextToShareWith);
   ~AndroidOGLContext();
 
   void MakeCurrent() override;
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontextfactory.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontextfactory.cpp
index 4cdedf081..71861d5df 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontextfactory.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontextfactory.cpp
@@ -22,17 +22,23 @@ namespace
 {
 static EGLint * getConfigAttributesListRGB8()
 {
-  static EGLint attr_list[] = {
-    EGL_RED_SIZE, 8,
-    EGL_GREEN_SIZE, 8,
-    EGL_BLUE_SIZE, 8,
-    EGL_ALPHA_SIZE, 0,
-    EGL_STENCIL_SIZE, 0,
-    EGL_DEPTH_SIZE, 16,
-    EGL_RENDERABLE_TYPE, EGL_OPENGL_ES3_BIT,
-    EGL_SURFACE_TYPE, EGL_PBUFFER_BIT | EGL_WINDOW_BIT,
-    EGL_NONE
-  };
+  static EGLint attr_list[] = {EGL_RED_SIZE,
+                               8,
+                               EGL_GREEN_SIZE,
+                               8,
+                               EGL_BLUE_SIZE,
+                               8,
+                               EGL_ALPHA_SIZE,
+                               0,
+                               EGL_STENCIL_SIZE,
+                               0,
+                               EGL_DEPTH_SIZE,
+                               16,
+                               EGL_RENDERABLE_TYPE,
+                               EGL_OPENGL_ES3_BIT,
+                               EGL_SURFACE_TYPE,
+                               EGL_PBUFFER_BIT | EGL_WINDOW_BIT,
+                               EGL_NONE};
   return attr_list;
 }
 
@@ -42,8 +48,8 @@ bool IsSupportedRGB8(EGLDisplay display)
 {
   EGLConfig configs[kMaxConfigCount];
   int count = 0;
-  return eglChooseConfig(display, getConfigAttributesListRGB8(), configs,
-                         kMaxConfigCount, &count) == EGL_TRUE && count != 0;
+  return eglChooseConfig(display, getConfigAttributesListRGB8(), configs, kMaxConfigCount, &count) == EGL_TRUE &&
+         count != 0;
 }
 
 size_t constexpr kGLThreadsCount = 2;
@@ -189,8 +195,7 @@ int AndroidOGLContextFactory::GetHeight() const
 void AndroidOGLContextFactory::UpdateSurfaceSize(int w, int h)
 {
   ASSERT(IsValid(), ());
-  if ((m_surfaceWidth != w && m_surfaceWidth != h) ||
-      (m_surfaceHeight != w && m_surfaceHeight != h))
+  if ((m_surfaceWidth != w && m_surfaceWidth != h) || (m_surfaceHeight != w && m_surfaceHeight != h))
   {
     LOG(LINFO, ("Surface size changed and must be re-queried."));
     if (!QuerySurfaceSize())
@@ -231,10 +236,7 @@ dp::GraphicsContext * AndroidOGLContextFactory::GetDrawContext()
   ASSERT(IsValid(), ());
   ASSERT(m_windowSurface != EGL_NO_SURFACE, ());
   if (m_drawContext == nullptr)
-  {
-    m_drawContext = new AndroidOGLContext(m_display, m_windowSurface,
-                                          m_config, m_uploadContext);
-  }
+    m_drawContext = new AndroidOGLContext(m_display, m_windowSurface, m_config, m_uploadContext);
   return m_drawContext;
 }
 
@@ -243,10 +245,7 @@ dp::GraphicsContext * AndroidOGLContextFactory::GetResourcesUploadContext()
   ASSERT(IsValid(), ());
   ASSERT(m_pixelbufferSurface != EGL_NO_SURFACE, ());
   if (m_uploadContext == nullptr)
-  {
-    m_uploadContext = new AndroidOGLContext(m_display, m_pixelbufferSurface,
-                                            m_config, m_drawContext);
-  }
+    m_uploadContext = new AndroidOGLContext(m_display, m_pixelbufferSurface, m_config, m_drawContext);
   return m_uploadContext;
 }
 
@@ -288,8 +287,7 @@ bool AndroidOGLContextFactory::CreateWindowSurface()
 {
   EGLConfig configs[kMaxConfigCount];
   int count = 0;
-  if (eglChooseConfig(m_display, getConfigAttributesListRGB8(), configs,
-                      kMaxConfigCount, &count) == EGL_TRUE)
+  if (eglChooseConfig(m_display, getConfigAttributesListRGB8(), configs, kMaxConfigCount, &count) == EGL_TRUE)
   {
     CHECK(IsSupportedRGB8(m_display), ("RGB8 is not suported on this device"));
     LOG(LDEBUG, ("Backbuffer format: RGB8"));
@@ -309,7 +307,7 @@ bool AndroidOGLContextFactory::CreateWindowSurface()
     eglGetConfigAttrib(m_display, currentConfig, EGL_NATIVE_VISUAL_ID, &format);
     ANativeWindow_setBuffersGeometry(m_nativeWindow, 0, 0, format);
 
-    EGLint surfaceAttributes[] = { EGL_RENDER_BUFFER, EGL_BACK_BUFFER, EGL_NONE };
+    EGLint surfaceAttributes[] = {EGL_RENDER_BUFFER, EGL_BACK_BUFFER, EGL_NONE};
     m_windowSurface = eglCreateWindowSurface(m_display, currentConfig, m_nativeWindow, surfaceAttributes);
     if (m_windowSurface == EGL_NO_SURFACE)
       continue;
@@ -330,14 +328,10 @@ bool AndroidOGLContextFactory::CreateWindowSurface()
 
 bool AndroidOGLContextFactory::CreatePixelbufferSurface()
 {
-  //ASSERT(m_config != NULL, ());
+  // ASSERT(m_config != NULL, ());
 
-  const GLuint size = 1; // yes, 1 is the correct size, we dont really draw on it
-  static EGLint surfaceConfig[] = {
-      EGL_WIDTH, size,
-      EGL_HEIGHT, size,
-      EGL_NONE
-  };
+  GLuint const size = 1;  // yes, 1 is the correct size, we dont really draw on it
+  static EGLint surfaceConfig[] = {EGL_WIDTH, size, EGL_HEIGHT, size, EGL_NONE};
 
   m_pixelbufferSurface = eglCreatePbufferSurface(m_display, m_config, surfaceConfig);
 
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontextfactory.hpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontextfactory.hpp
index 44015dcb0..764544e1c 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontextfactory.hpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/androidoglcontextfactory.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "app/organicmaps/sdk/core/jni_helper.hpp"
 #include "androidoglcontext.hpp"
+#include "app/organicmaps/sdk/core/jni_helper.hpp"
 #include "drape/graphics_context_factory.hpp"
 
 #include "base/src_point.hpp"
@@ -45,7 +45,7 @@ private:
 
   EGLSurface m_windowSurface;
   EGLSurface m_pixelbufferSurface;
-  EGLConfig  m_config;
+  EGLConfig m_config;
 
   ANativeWindow * m_nativeWindow;
   EGLDisplay m_display;
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/gl3stub.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/gl3stub.cpp
index 73651a432..4fa24998f 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/gl3stub.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/gl3stub.cpp
@@ -16,327 +16,289 @@
 
 #include "gl3stub.h"
 
-GLboolean gl3stubInit() {
-    #define FIND_PROC(s) s = reinterpret_cast<decltype(s)>(eglGetProcAddress(#s))
-    FIND_PROC(glReadBuffer);
-    FIND_PROC(glDrawRangeElements);
-    FIND_PROC(glTexImage3D);
-    FIND_PROC(glTexSubImage3D);
-    FIND_PROC(glCopyTexSubImage3D);
-    FIND_PROC(glCompressedTexImage3D);
-    FIND_PROC(glCompressedTexSubImage3D);
-    FIND_PROC(glGenQueries);
-    FIND_PROC(glDeleteQueries);
-    FIND_PROC(glIsQuery);
-    FIND_PROC(glBeginQuery);
-    FIND_PROC(glEndQuery);
-    FIND_PROC(glGetQueryiv);
-    FIND_PROC(glGetQueryObjectuiv);
-    FIND_PROC(glUnmapBuffer);
-    FIND_PROC(glGetBufferPointerv);
-    FIND_PROC(glDrawBuffers);
-    FIND_PROC(glUniformMatrix2x3fv);
-    FIND_PROC(glUniformMatrix3x2fv);
-    FIND_PROC(glUniformMatrix2x4fv);
-    FIND_PROC(glUniformMatrix4x2fv);
-    FIND_PROC(glUniformMatrix3x4fv);
-    FIND_PROC(glUniformMatrix4x3fv);
-    FIND_PROC(glBlitFramebuffer);
-    FIND_PROC(glRenderbufferStorageMultisample);
-    FIND_PROC(glFramebufferTextureLayer);
-    FIND_PROC(glMapBufferRange);
-    FIND_PROC(glFlushMappedBufferRange);
-    FIND_PROC(glBindVertexArray);
-    FIND_PROC(glDeleteVertexArrays);
-    FIND_PROC(glGenVertexArrays);
-    FIND_PROC(glIsVertexArray);
-    FIND_PROC(glGetIntegeri_v);
-    FIND_PROC(glBeginTransformFeedback);
-    FIND_PROC(glEndTransformFeedback);
-    FIND_PROC(glBindBufferRange);
-    FIND_PROC(glBindBufferBase);
-    FIND_PROC(glTransformFeedbackVaryings);
-    FIND_PROC(glGetTransformFeedbackVarying);
-    FIND_PROC(glVertexAttribIPointer);
-    FIND_PROC(glGetVertexAttribIiv);
-    FIND_PROC(glGetVertexAttribIuiv);
-    FIND_PROC(glVertexAttribI4i);
-    FIND_PROC(glVertexAttribI4ui);
-    FIND_PROC(glVertexAttribI4iv);
-    FIND_PROC(glVertexAttribI4uiv);
-    FIND_PROC(glGetUniformuiv);
-    FIND_PROC(glGetFragDataLocation);
-    FIND_PROC(glUniform1ui);
-    FIND_PROC(glUniform2ui);
-    FIND_PROC(glUniform3ui);
-    FIND_PROC(glUniform4ui);
-    FIND_PROC(glUniform1uiv);
-    FIND_PROC(glUniform2uiv);
-    FIND_PROC(glUniform3uiv);
-    FIND_PROC(glUniform4uiv);
-    FIND_PROC(glClearBufferiv);
-    FIND_PROC(glClearBufferuiv);
-    FIND_PROC(glClearBufferfv);
-    FIND_PROC(glClearBufferfi);
-    FIND_PROC(glGetStringi);
-    FIND_PROC(glCopyBufferSubData);
-    FIND_PROC(glGetUniformIndices);
-    FIND_PROC(glGetActiveUniformsiv);
-    FIND_PROC(glGetUniformBlockIndex);
-    FIND_PROC(glGetActiveUniformBlockiv);
-    FIND_PROC(glGetActiveUniformBlockName);
-    FIND_PROC(glUniformBlockBinding);
-    FIND_PROC(glDrawArraysInstanced);
-    FIND_PROC(glDrawElementsInstanced);
-    FIND_PROC(glFenceSync);
-    FIND_PROC(glIsSync);
-    FIND_PROC(glDeleteSync);
-    FIND_PROC(glClientWaitSync);
-    FIND_PROC(glWaitSync);
-    FIND_PROC(glGetInteger64v);
-    FIND_PROC(glGetSynciv);
-    FIND_PROC(glGetInteger64i_v);
-    FIND_PROC(glGetBufferParameteri64v);
-    FIND_PROC(glGenSamplers);
-    FIND_PROC(glDeleteSamplers);
-    FIND_PROC(glIsSampler);
-    FIND_PROC(glBindSampler);
-    FIND_PROC(glSamplerParameteri);
-    FIND_PROC(glSamplerParameteriv);
-    FIND_PROC(glSamplerParameterf);
-    FIND_PROC(glSamplerParameterfv);
-    FIND_PROC(glGetSamplerParameteriv);
-    FIND_PROC(glGetSamplerParameterfv);
-    FIND_PROC(glVertexAttribDivisor);
-    FIND_PROC(glBindTransformFeedback);
-    FIND_PROC(glDeleteTransformFeedbacks);
-    FIND_PROC(glGenTransformFeedbacks);
-    FIND_PROC(glIsTransformFeedback);
-    FIND_PROC(glPauseTransformFeedback);
-    FIND_PROC(glResumeTransformFeedback);
-    FIND_PROC(glGetProgramBinary);
-    FIND_PROC(glProgramBinary);
-    FIND_PROC(glProgramParameteri);
-    FIND_PROC(glInvalidateFramebuffer);
-    FIND_PROC(glInvalidateSubFramebuffer);
-    FIND_PROC(glTexStorage2D);
-    FIND_PROC(glTexStorage3D);
-    FIND_PROC(glGetInternalformativ);
-    #undef FIND_PROC
+GLboolean gl3stubInit()
+{
+#define FIND_PROC(s) s = reinterpret_cast<decltype(s)>(eglGetProcAddress(#s))
+  FIND_PROC(glReadBuffer);
+  FIND_PROC(glDrawRangeElements);
+  FIND_PROC(glTexImage3D);
+  FIND_PROC(glTexSubImage3D);
+  FIND_PROC(glCopyTexSubImage3D);
+  FIND_PROC(glCompressedTexImage3D);
+  FIND_PROC(glCompressedTexSubImage3D);
+  FIND_PROC(glGenQueries);
+  FIND_PROC(glDeleteQueries);
+  FIND_PROC(glIsQuery);
+  FIND_PROC(glBeginQuery);
+  FIND_PROC(glEndQuery);
+  FIND_PROC(glGetQueryiv);
+  FIND_PROC(glGetQueryObjectuiv);
+  FIND_PROC(glUnmapBuffer);
+  FIND_PROC(glGetBufferPointerv);
+  FIND_PROC(glDrawBuffers);
+  FIND_PROC(glUniformMatrix2x3fv);
+  FIND_PROC(glUniformMatrix3x2fv);
+  FIND_PROC(glUniformMatrix2x4fv);
+  FIND_PROC(glUniformMatrix4x2fv);
+  FIND_PROC(glUniformMatrix3x4fv);
+  FIND_PROC(glUniformMatrix4x3fv);
+  FIND_PROC(glBlitFramebuffer);
+  FIND_PROC(glRenderbufferStorageMultisample);
+  FIND_PROC(glFramebufferTextureLayer);
+  FIND_PROC(glMapBufferRange);
+  FIND_PROC(glFlushMappedBufferRange);
+  FIND_PROC(glBindVertexArray);
+  FIND_PROC(glDeleteVertexArrays);
+  FIND_PROC(glGenVertexArrays);
+  FIND_PROC(glIsVertexArray);
+  FIND_PROC(glGetIntegeri_v);
+  FIND_PROC(glBeginTransformFeedback);
+  FIND_PROC(glEndTransformFeedback);
+  FIND_PROC(glBindBufferRange);
+  FIND_PROC(glBindBufferBase);
+  FIND_PROC(glTransformFeedbackVaryings);
+  FIND_PROC(glGetTransformFeedbackVarying);
+  FIND_PROC(glVertexAttribIPointer);
+  FIND_PROC(glGetVertexAttribIiv);
+  FIND_PROC(glGetVertexAttribIuiv);
+  FIND_PROC(glVertexAttribI4i);
+  FIND_PROC(glVertexAttribI4ui);
+  FIND_PROC(glVertexAttribI4iv);
+  FIND_PROC(glVertexAttribI4uiv);
+  FIND_PROC(glGetUniformuiv);
+  FIND_PROC(glGetFragDataLocation);
+  FIND_PROC(glUniform1ui);
+  FIND_PROC(glUniform2ui);
+  FIND_PROC(glUniform3ui);
+  FIND_PROC(glUniform4ui);
+  FIND_PROC(glUniform1uiv);
+  FIND_PROC(glUniform2uiv);
+  FIND_PROC(glUniform3uiv);
+  FIND_PROC(glUniform4uiv);
+  FIND_PROC(glClearBufferiv);
+  FIND_PROC(glClearBufferuiv);
+  FIND_PROC(glClearBufferfv);
+  FIND_PROC(glClearBufferfi);
+  FIND_PROC(glGetStringi);
+  FIND_PROC(glCopyBufferSubData);
+  FIND_PROC(glGetUniformIndices);
+  FIND_PROC(glGetActiveUniformsiv);
+  FIND_PROC(glGetUniformBlockIndex);
+  FIND_PROC(glGetActiveUniformBlockiv);
+  FIND_PROC(glGetActiveUniformBlockName);
+  FIND_PROC(glUniformBlockBinding);
+  FIND_PROC(glDrawArraysInstanced);
+  FIND_PROC(glDrawElementsInstanced);
+  FIND_PROC(glFenceSync);
+  FIND_PROC(glIsSync);
+  FIND_PROC(glDeleteSync);
+  FIND_PROC(glClientWaitSync);
+  FIND_PROC(glWaitSync);
+  FIND_PROC(glGetInteger64v);
+  FIND_PROC(glGetSynciv);
+  FIND_PROC(glGetInteger64i_v);
+  FIND_PROC(glGetBufferParameteri64v);
+  FIND_PROC(glGenSamplers);
+  FIND_PROC(glDeleteSamplers);
+  FIND_PROC(glIsSampler);
+  FIND_PROC(glBindSampler);
+  FIND_PROC(glSamplerParameteri);
+  FIND_PROC(glSamplerParameteriv);
+  FIND_PROC(glSamplerParameterf);
+  FIND_PROC(glSamplerParameterfv);
+  FIND_PROC(glGetSamplerParameteriv);
+  FIND_PROC(glGetSamplerParameterfv);
+  FIND_PROC(glVertexAttribDivisor);
+  FIND_PROC(glBindTransformFeedback);
+  FIND_PROC(glDeleteTransformFeedbacks);
+  FIND_PROC(glGenTransformFeedbacks);
+  FIND_PROC(glIsTransformFeedback);
+  FIND_PROC(glPauseTransformFeedback);
+  FIND_PROC(glResumeTransformFeedback);
+  FIND_PROC(glGetProgramBinary);
+  FIND_PROC(glProgramBinary);
+  FIND_PROC(glProgramParameteri);
+  FIND_PROC(glInvalidateFramebuffer);
+  FIND_PROC(glInvalidateSubFramebuffer);
+  FIND_PROC(glTexStorage2D);
+  FIND_PROC(glTexStorage3D);
+  FIND_PROC(glGetInternalformativ);
+#undef FIND_PROC
 
-    if (!glReadBuffer ||
-        !glDrawRangeElements ||
-        !glTexImage3D ||
-        !glTexSubImage3D ||
-        !glCopyTexSubImage3D ||
-        !glCompressedTexImage3D ||
-        !glCompressedTexSubImage3D ||
-        !glGenQueries ||
-        !glDeleteQueries ||
-        !glIsQuery ||
-        !glBeginQuery ||
-        !glEndQuery ||
-        !glGetQueryiv ||
-        !glGetQueryObjectuiv ||
-        !glUnmapBuffer ||
-        !glGetBufferPointerv ||
-        !glDrawBuffers ||
-        !glUniformMatrix2x3fv ||
-        !glUniformMatrix3x2fv ||
-        !glUniformMatrix2x4fv ||
-        !glUniformMatrix4x2fv ||
-        !glUniformMatrix3x4fv ||
-        !glUniformMatrix4x3fv ||
-        !glBlitFramebuffer ||
-        !glRenderbufferStorageMultisample ||
-        !glFramebufferTextureLayer ||
-        !glMapBufferRange ||
-        !glFlushMappedBufferRange ||
-        !glBindVertexArray ||
-        !glDeleteVertexArrays ||
-        !glGenVertexArrays ||
-        !glIsVertexArray ||
-        !glGetIntegeri_v ||
-        !glBeginTransformFeedback ||
-        !glEndTransformFeedback ||
-        !glBindBufferRange ||
-        !glBindBufferBase ||
-        !glTransformFeedbackVaryings ||
-        !glGetTransformFeedbackVarying ||
-        !glVertexAttribIPointer ||
-        !glGetVertexAttribIiv ||
-        !glGetVertexAttribIuiv ||
-        !glVertexAttribI4i ||
-        !glVertexAttribI4ui ||
-        !glVertexAttribI4iv ||
-        !glVertexAttribI4uiv ||
-        !glGetUniformuiv ||
-        !glGetFragDataLocation ||
-        !glUniform1ui ||
-        !glUniform2ui ||
-        !glUniform3ui ||
-        !glUniform4ui ||
-        !glUniform1uiv ||
-        !glUniform2uiv ||
-        !glUniform3uiv ||
-        !glUniform4uiv ||
-        !glClearBufferiv ||
-        !glClearBufferuiv ||
-        !glClearBufferfv ||
-        !glClearBufferfi ||
-        !glGetStringi ||
-        !glCopyBufferSubData ||
-        !glGetUniformIndices ||
-        !glGetActiveUniformsiv ||
-        !glGetUniformBlockIndex ||
-        !glGetActiveUniformBlockiv ||
-        !glGetActiveUniformBlockName ||
-        !glUniformBlockBinding ||
-        !glDrawArraysInstanced ||
-        !glDrawElementsInstanced ||
-        !glFenceSync ||
-        !glIsSync ||
-        !glDeleteSync ||
-        !glClientWaitSync ||
-        !glWaitSync ||
-        !glGetInteger64v ||
-        !glGetSynciv ||
-        !glGetInteger64i_v ||
-        !glGetBufferParameteri64v ||
-        !glGenSamplers ||
-        !glDeleteSamplers ||
-        !glIsSampler ||
-        !glBindSampler ||
-        !glSamplerParameteri ||
-        !glSamplerParameteriv ||
-        !glSamplerParameterf ||
-        !glSamplerParameterfv ||
-        !glGetSamplerParameteriv ||
-        !glGetSamplerParameterfv ||
-        !glVertexAttribDivisor ||
-        !glBindTransformFeedback ||
-        !glDeleteTransformFeedbacks ||
-        !glGenTransformFeedbacks ||
-        !glIsTransformFeedback ||
-        !glPauseTransformFeedback ||
-        !glResumeTransformFeedback ||
-        !glGetProgramBinary ||
-        !glProgramBinary ||
-        !glProgramParameteri ||
-        !glInvalidateFramebuffer ||
-        !glInvalidateSubFramebuffer ||
-        !glTexStorage2D ||
-        !glTexStorage3D ||
-        !glGetInternalformativ)
-    {
-        return GL_FALSE;
-    }
+  if (!glReadBuffer || !glDrawRangeElements || !glTexImage3D || !glTexSubImage3D || !glCopyTexSubImage3D ||
+      !glCompressedTexImage3D || !glCompressedTexSubImage3D || !glGenQueries || !glDeleteQueries || !glIsQuery ||
+      !glBeginQuery || !glEndQuery || !glGetQueryiv || !glGetQueryObjectuiv || !glUnmapBuffer || !glGetBufferPointerv ||
+      !glDrawBuffers || !glUniformMatrix2x3fv || !glUniformMatrix3x2fv || !glUniformMatrix2x4fv ||
+      !glUniformMatrix4x2fv || !glUniformMatrix3x4fv || !glUniformMatrix4x3fv || !glBlitFramebuffer ||
+      !glRenderbufferStorageMultisample || !glFramebufferTextureLayer || !glMapBufferRange ||
+      !glFlushMappedBufferRange || !glBindVertexArray || !glDeleteVertexArrays || !glGenVertexArrays ||
+      !glIsVertexArray || !glGetIntegeri_v || !glBeginTransformFeedback || !glEndTransformFeedback ||
+      !glBindBufferRange || !glBindBufferBase || !glTransformFeedbackVaryings || !glGetTransformFeedbackVarying ||
+      !glVertexAttribIPointer || !glGetVertexAttribIiv || !glGetVertexAttribIuiv || !glVertexAttribI4i ||
+      !glVertexAttribI4ui || !glVertexAttribI4iv || !glVertexAttribI4uiv || !glGetUniformuiv ||
+      !glGetFragDataLocation || !glUniform1ui || !glUniform2ui || !glUniform3ui || !glUniform4ui || !glUniform1uiv ||
+      !glUniform2uiv || !glUniform3uiv || !glUniform4uiv || !glClearBufferiv || !glClearBufferuiv || !glClearBufferfv ||
+      !glClearBufferfi || !glGetStringi || !glCopyBufferSubData || !glGetUniformIndices || !glGetActiveUniformsiv ||
+      !glGetUniformBlockIndex || !glGetActiveUniformBlockiv || !glGetActiveUniformBlockName || !glUniformBlockBinding ||
+      !glDrawArraysInstanced || !glDrawElementsInstanced || !glFenceSync || !glIsSync || !glDeleteSync ||
+      !glClientWaitSync || !glWaitSync || !glGetInteger64v || !glGetSynciv || !glGetInteger64i_v ||
+      !glGetBufferParameteri64v || !glGenSamplers || !glDeleteSamplers || !glIsSampler || !glBindSampler ||
+      !glSamplerParameteri || !glSamplerParameteriv || !glSamplerParameterf || !glSamplerParameterfv ||
+      !glGetSamplerParameteriv || !glGetSamplerParameterfv || !glVertexAttribDivisor || !glBindTransformFeedback ||
+      !glDeleteTransformFeedbacks || !glGenTransformFeedbacks || !glIsTransformFeedback || !glPauseTransformFeedback ||
+      !glResumeTransformFeedback || !glGetProgramBinary || !glProgramBinary || !glProgramParameteri ||
+      !glInvalidateFramebuffer || !glInvalidateSubFramebuffer || !glTexStorage2D || !glTexStorage3D ||
+      !glGetInternalformativ)
+  {
+    return GL_FALSE;
+  }
 
-    return GL_TRUE;
+  return GL_TRUE;
 }
 
 /* Function pointer definitions */
-GL_APICALL void           (* GL_APIENTRY glReadBuffer) (GLenum mode);
-GL_APICALL void           (* GL_APIENTRY glDrawRangeElements) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid* indices);
-GL_APICALL void           (* GL_APIENTRY glTexImage3D) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* pixels);
-GL_APICALL void           (* GL_APIENTRY glTexSubImage3D) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* pixels);
-GL_APICALL void           (* GL_APIENTRY glCopyTexSubImage3D) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
-GL_APICALL void           (* GL_APIENTRY glCompressedTexImage3D) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid* data);
-GL_APICALL void           (* GL_APIENTRY glCompressedTexSubImage3D) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid* data);
-GL_APICALL void           (* GL_APIENTRY glGenQueries) (GLsizei n, GLuint* ids);
-GL_APICALL void           (* GL_APIENTRY glDeleteQueries) (GLsizei n, const GLuint* ids);
-GL_APICALL GLboolean      (* GL_APIENTRY glIsQuery) (GLuint id);
-GL_APICALL void           (* GL_APIENTRY glBeginQuery) (GLenum target, GLuint id);
-GL_APICALL void           (* GL_APIENTRY glEndQuery) (GLenum target);
-GL_APICALL void           (* GL_APIENTRY glGetQueryiv) (GLenum target, GLenum pname, GLint* params);
-GL_APICALL void           (* GL_APIENTRY glGetQueryObjectuiv) (GLuint id, GLenum pname, GLuint* params);
-GL_APICALL GLboolean      (* GL_APIENTRY glUnmapBuffer) (GLenum target);
-GL_APICALL void           (* GL_APIENTRY glGetBufferPointerv) (GLenum target, GLenum pname, GLvoid** params);
-GL_APICALL void           (* GL_APIENTRY glDrawBuffers) (GLsizei n, const GLenum* bufs);
-GL_APICALL void           (* GL_APIENTRY glUniformMatrix2x3fv) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-GL_APICALL void           (* GL_APIENTRY glUniformMatrix3x2fv) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-GL_APICALL void           (* GL_APIENTRY glUniformMatrix2x4fv) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-GL_APICALL void           (* GL_APIENTRY glUniformMatrix4x2fv) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-GL_APICALL void           (* GL_APIENTRY glUniformMatrix3x4fv) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-GL_APICALL void           (* GL_APIENTRY glUniformMatrix4x3fv) (GLint location, GLsizei count, GLboolean transpose, const GLfloat* value);
-GL_APICALL void           (* GL_APIENTRY glBlitFramebuffer) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
-GL_APICALL void           (* GL_APIENTRY glRenderbufferStorageMultisample) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height);
-GL_APICALL void           (* GL_APIENTRY glFramebufferTextureLayer) (GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer);
-GL_APICALL GLvoid*        (* GL_APIENTRY glMapBufferRange) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
-GL_APICALL void           (* GL_APIENTRY glFlushMappedBufferRange) (GLenum target, GLintptr offset, GLsizeiptr length);
-GL_APICALL void           (* GL_APIENTRY glBindVertexArray) (GLuint array);
-GL_APICALL void           (* GL_APIENTRY glDeleteVertexArrays) (GLsizei n, const GLuint* arrays);
-GL_APICALL void           (* GL_APIENTRY glGenVertexArrays) (GLsizei n, GLuint* arrays);
-GL_APICALL GLboolean      (* GL_APIENTRY glIsVertexArray) (GLuint array);
-GL_APICALL void           (* GL_APIENTRY glGetIntegeri_v) (GLenum target, GLuint index, GLint* data);
-GL_APICALL void           (* GL_APIENTRY glBeginTransformFeedback) (GLenum primitiveMode);
-GL_APICALL void           (* GL_APIENTRY glEndTransformFeedback) (void);
-GL_APICALL void           (* GL_APIENTRY glBindBufferRange) (GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size);
-GL_APICALL void           (* GL_APIENTRY glBindBufferBase) (GLenum target, GLuint index, GLuint buffer);
-GL_APICALL void           (* GL_APIENTRY glTransformFeedbackVaryings) (GLuint program, GLsizei count, const GLchar* const* varyings, GLenum bufferMode);
-GL_APICALL void           (* GL_APIENTRY glGetTransformFeedbackVarying) (GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLsizei* size, GLenum* type, GLchar* name);
-GL_APICALL void           (* GL_APIENTRY glVertexAttribIPointer) (GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid* pointer);
-GL_APICALL void           (* GL_APIENTRY glGetVertexAttribIiv) (GLuint index, GLenum pname, GLint* params);
-GL_APICALL void           (* GL_APIENTRY glGetVertexAttribIuiv) (GLuint index, GLenum pname, GLuint* params);
-GL_APICALL void           (* GL_APIENTRY glVertexAttribI4i) (GLuint index, GLint x, GLint y, GLint z, GLint w);
-GL_APICALL void           (* GL_APIENTRY glVertexAttribI4ui) (GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
-GL_APICALL void           (* GL_APIENTRY glVertexAttribI4iv) (GLuint index, const GLint* v);
-GL_APICALL void           (* GL_APIENTRY glVertexAttribI4uiv) (GLuint index, const GLuint* v);
-GL_APICALL void           (* GL_APIENTRY glGetUniformuiv) (GLuint program, GLint location, GLuint* params);
-GL_APICALL GLint          (* GL_APIENTRY glGetFragDataLocation) (GLuint program, const GLchar *name);
-GL_APICALL void           (* GL_APIENTRY glUniform1ui) (GLint location, GLuint v0);
-GL_APICALL void           (* GL_APIENTRY glUniform2ui) (GLint location, GLuint v0, GLuint v1);
-GL_APICALL void           (* GL_APIENTRY glUniform3ui) (GLint location, GLuint v0, GLuint v1, GLuint v2);
-GL_APICALL void           (* GL_APIENTRY glUniform4ui) (GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
-GL_APICALL void           (* GL_APIENTRY glUniform1uiv) (GLint location, GLsizei count, const GLuint* value);
-GL_APICALL void           (* GL_APIENTRY glUniform2uiv) (GLint location, GLsizei count, const GLuint* value);
-GL_APICALL void           (* GL_APIENTRY glUniform3uiv) (GLint location, GLsizei count, const GLuint* value);
-GL_APICALL void           (* GL_APIENTRY glUniform4uiv) (GLint location, GLsizei count, const GLuint* value);
-GL_APICALL void           (* GL_APIENTRY glClearBufferiv) (GLenum buffer, GLint drawbuffer, const GLint* value);
-GL_APICALL void           (* GL_APIENTRY glClearBufferuiv) (GLenum buffer, GLint drawbuffer, const GLuint* value);
-GL_APICALL void           (* GL_APIENTRY glClearBufferfv) (GLenum buffer, GLint drawbuffer, const GLfloat* value);
-GL_APICALL void           (* GL_APIENTRY glClearBufferfi) (GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
-GL_APICALL const GLubyte* (* GL_APIENTRY glGetStringi) (GLenum name, GLuint index);
-GL_APICALL void           (* GL_APIENTRY glCopyBufferSubData) (GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size);
-GL_APICALL void           (* GL_APIENTRY glGetUniformIndices) (GLuint program, GLsizei uniformCount, const GLchar* const* uniformNames, GLuint* uniformIndices);
-GL_APICALL void           (* GL_APIENTRY glGetActiveUniformsiv) (GLuint program, GLsizei uniformCount, const GLuint* uniformIndices, GLenum pname, GLint* params);
-GL_APICALL GLuint         (* GL_APIENTRY glGetUniformBlockIndex) (GLuint program, const GLchar* uniformBlockName);
-GL_APICALL void           (* GL_APIENTRY glGetActiveUniformBlockiv) (GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint* params);
-GL_APICALL void           (* GL_APIENTRY glGetActiveUniformBlockName) (GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei* length, GLchar* uniformBlockName);
-GL_APICALL void           (* GL_APIENTRY glUniformBlockBinding) (GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding);
-GL_APICALL void           (* GL_APIENTRY glDrawArraysInstanced) (GLenum mode, GLint first, GLsizei count, GLsizei instanceCount);
-GL_APICALL void           (* GL_APIENTRY glDrawElementsInstanced) (GLenum mode, GLsizei count, GLenum type, const GLvoid* indices, GLsizei instanceCount);
-GL_APICALL GLsync         (* GL_APIENTRY glFenceSync) (GLenum condition, GLbitfield flags);
-GL_APICALL GLboolean      (* GL_APIENTRY glIsSync) (GLsync sync);
-GL_APICALL void           (* GL_APIENTRY glDeleteSync) (GLsync sync);
-GL_APICALL GLenum         (* GL_APIENTRY glClientWaitSync) (GLsync sync, GLbitfield flags, GLuint64 timeout);
-GL_APICALL void           (* GL_APIENTRY glWaitSync) (GLsync sync, GLbitfield flags, GLuint64 timeout);
-GL_APICALL void           (* GL_APIENTRY glGetInteger64v) (GLenum pname, GLint64* params);
-GL_APICALL void           (* GL_APIENTRY glGetSynciv) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei* length, GLint* values);
-GL_APICALL void           (* GL_APIENTRY glGetInteger64i_v) (GLenum target, GLuint index, GLint64* data);
-GL_APICALL void           (* GL_APIENTRY glGetBufferParameteri64v) (GLenum target, GLenum pname, GLint64* params);
-GL_APICALL void           (* GL_APIENTRY glGenSamplers) (GLsizei count, GLuint* samplers);
-GL_APICALL void           (* GL_APIENTRY glDeleteSamplers) (GLsizei count, const GLuint* samplers);
-GL_APICALL GLboolean      (* GL_APIENTRY glIsSampler) (GLuint sampler);
-GL_APICALL void           (* GL_APIENTRY glBindSampler) (GLuint unit, GLuint sampler);
-GL_APICALL void           (* GL_APIENTRY glSamplerParameteri) (GLuint sampler, GLenum pname, GLint param);
-GL_APICALL void           (* GL_APIENTRY glSamplerParameteriv) (GLuint sampler, GLenum pname, const GLint* param);
-GL_APICALL void           (* GL_APIENTRY glSamplerParameterf) (GLuint sampler, GLenum pname, GLfloat param);
-GL_APICALL void           (* GL_APIENTRY glSamplerParameterfv) (GLuint sampler, GLenum pname, const GLfloat* param);
-GL_APICALL void           (* GL_APIENTRY glGetSamplerParameteriv) (GLuint sampler, GLenum pname, GLint* params);
-GL_APICALL void           (* GL_APIENTRY glGetSamplerParameterfv) (GLuint sampler, GLenum pname, GLfloat* params);
-GL_APICALL void           (* GL_APIENTRY glVertexAttribDivisor) (GLuint index, GLuint divisor);
-GL_APICALL void           (* GL_APIENTRY glBindTransformFeedback) (GLenum target, GLuint id);
-GL_APICALL void           (* GL_APIENTRY glDeleteTransformFeedbacks) (GLsizei n, const GLuint* ids);
-GL_APICALL void           (* GL_APIENTRY glGenTransformFeedbacks) (GLsizei n, GLuint* ids);
-GL_APICALL GLboolean      (* GL_APIENTRY glIsTransformFeedback) (GLuint id);
-GL_APICALL void           (* GL_APIENTRY glPauseTransformFeedback) (void);
-GL_APICALL void           (* GL_APIENTRY glResumeTransformFeedback) (void);
-GL_APICALL void           (* GL_APIENTRY glGetProgramBinary) (GLuint program, GLsizei bufSize, GLsizei* length, GLenum* binaryFormat, GLvoid* binary);
-GL_APICALL void           (* GL_APIENTRY glProgramBinary) (GLuint program, GLenum binaryFormat, const GLvoid* binary, GLsizei length);
-GL_APICALL void           (* GL_APIENTRY glProgramParameteri) (GLuint program, GLenum pname, GLint value);
-GL_APICALL void           (* GL_APIENTRY glInvalidateFramebuffer) (GLenum target, GLsizei numAttachments, const GLenum* attachments);
-GL_APICALL void           (* GL_APIENTRY glInvalidateSubFramebuffer) (GLenum target, GLsizei numAttachments, const GLenum* attachments, GLint x, GLint y, GLsizei width, GLsizei height);
-GL_APICALL void           (* GL_APIENTRY glTexStorage2D) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height);
-GL_APICALL void           (* GL_APIENTRY glTexStorage3D) (GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth);
-GL_APICALL void           (* GL_APIENTRY glGetInternalformativ) (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint* params);
+GL_APICALL void (*GL_APIENTRY glReadBuffer)(GLenum mode);
+GL_APICALL void (*GL_APIENTRY glDrawRangeElements)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type,
+                                                   GLvoid const * indices);
+GL_APICALL void (*GL_APIENTRY glTexImage3D)(GLenum target, GLint level, GLint internalformat, GLsizei width,
+                                            GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type,
+                                            GLvoid const * pixels);
+GL_APICALL void (*GL_APIENTRY glTexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset,
+                                               GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type,
+                                               GLvoid const * pixels);
+GL_APICALL void (*GL_APIENTRY glCopyTexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset,
+                                                   GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height);
+GL_APICALL void (*GL_APIENTRY glCompressedTexImage3D)(GLenum target, GLint level, GLenum internalformat, GLsizei width,
+                                                      GLsizei height, GLsizei depth, GLint border, GLsizei imageSize,
+                                                      GLvoid const * data);
+GL_APICALL void (*GL_APIENTRY glCompressedTexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset,
+                                                         GLint zoffset, GLsizei width, GLsizei height, GLsizei depth,
+                                                         GLenum format, GLsizei imageSize, GLvoid const * data);
+GL_APICALL void (*GL_APIENTRY glGenQueries)(GLsizei n, GLuint * ids);
+GL_APICALL void (*GL_APIENTRY glDeleteQueries)(GLsizei n, GLuint const * ids);
+GL_APICALL GLboolean (*GL_APIENTRY glIsQuery)(GLuint id);
+GL_APICALL void (*GL_APIENTRY glBeginQuery)(GLenum target, GLuint id);
+GL_APICALL void (*GL_APIENTRY glEndQuery)(GLenum target);
+GL_APICALL void (*GL_APIENTRY glGetQueryiv)(GLenum target, GLenum pname, GLint * params);
+GL_APICALL void (*GL_APIENTRY glGetQueryObjectuiv)(GLuint id, GLenum pname, GLuint * params);
+GL_APICALL GLboolean (*GL_APIENTRY glUnmapBuffer)(GLenum target);
+GL_APICALL void (*GL_APIENTRY glGetBufferPointerv)(GLenum target, GLenum pname, GLvoid ** params);
+GL_APICALL void (*GL_APIENTRY glDrawBuffers)(GLsizei n, GLenum const * bufs);
+GL_APICALL void (*GL_APIENTRY glUniformMatrix2x3fv)(GLint location, GLsizei count, GLboolean transpose,
+                                                    GLfloat const * value);
+GL_APICALL void (*GL_APIENTRY glUniformMatrix3x2fv)(GLint location, GLsizei count, GLboolean transpose,
+                                                    GLfloat const * value);
+GL_APICALL void (*GL_APIENTRY glUniformMatrix2x4fv)(GLint location, GLsizei count, GLboolean transpose,
+                                                    GLfloat const * value);
+GL_APICALL void (*GL_APIENTRY glUniformMatrix4x2fv)(GLint location, GLsizei count, GLboolean transpose,
+                                                    GLfloat const * value);
+GL_APICALL void (*GL_APIENTRY glUniformMatrix3x4fv)(GLint location, GLsizei count, GLboolean transpose,
+                                                    GLfloat const * value);
+GL_APICALL void (*GL_APIENTRY glUniformMatrix4x3fv)(GLint location, GLsizei count, GLboolean transpose,
+                                                    GLfloat const * value);
+GL_APICALL void (*GL_APIENTRY glBlitFramebuffer)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0,
+                                                 GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter);
+GL_APICALL void (*GL_APIENTRY glRenderbufferStorageMultisample)(GLenum target, GLsizei samples, GLenum internalformat,
+                                                                GLsizei width, GLsizei height);
+GL_APICALL void (*GL_APIENTRY glFramebufferTextureLayer)(GLenum target, GLenum attachment, GLuint texture, GLint level,
+                                                         GLint layer);
+GL_APICALL GLvoid * (*GL_APIENTRY glMapBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length,
+                                                    GLbitfield access);
+GL_APICALL void (*GL_APIENTRY glFlushMappedBufferRange)(GLenum target, GLintptr offset, GLsizeiptr length);
+GL_APICALL void (*GL_APIENTRY glBindVertexArray)(GLuint array);
+GL_APICALL void (*GL_APIENTRY glDeleteVertexArrays)(GLsizei n, GLuint const * arrays);
+GL_APICALL void (*GL_APIENTRY glGenVertexArrays)(GLsizei n, GLuint * arrays);
+GL_APICALL GLboolean (*GL_APIENTRY glIsVertexArray)(GLuint array);
+GL_APICALL void (*GL_APIENTRY glGetIntegeri_v)(GLenum target, GLuint index, GLint * data);
+GL_APICALL void (*GL_APIENTRY glBeginTransformFeedback)(GLenum primitiveMode);
+GL_APICALL void (*GL_APIENTRY glEndTransformFeedback)(void);
+GL_APICALL void (*GL_APIENTRY glBindBufferRange)(GLenum target, GLuint index, GLuint buffer, GLintptr offset,
+                                                 GLsizeiptr size);
+GL_APICALL void (*GL_APIENTRY glBindBufferBase)(GLenum target, GLuint index, GLuint buffer);
+GL_APICALL void (*GL_APIENTRY glTransformFeedbackVaryings)(GLuint program, GLsizei count,
+                                                           GLchar const * const * varyings, GLenum bufferMode);
+GL_APICALL void (*GL_APIENTRY glGetTransformFeedbackVarying)(GLuint program, GLuint index, GLsizei bufSize,
+                                                             GLsizei * length, GLsizei * size, GLenum * type,
+                                                             GLchar * name);
+GL_APICALL void (*GL_APIENTRY glVertexAttribIPointer)(GLuint index, GLint size, GLenum type, GLsizei stride,
+                                                      GLvoid const * pointer);
+GL_APICALL void (*GL_APIENTRY glGetVertexAttribIiv)(GLuint index, GLenum pname, GLint * params);
+GL_APICALL void (*GL_APIENTRY glGetVertexAttribIuiv)(GLuint index, GLenum pname, GLuint * params);
+GL_APICALL void (*GL_APIENTRY glVertexAttribI4i)(GLuint index, GLint x, GLint y, GLint z, GLint w);
+GL_APICALL void (*GL_APIENTRY glVertexAttribI4ui)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w);
+GL_APICALL void (*GL_APIENTRY glVertexAttribI4iv)(GLuint index, GLint const * v);
+GL_APICALL void (*GL_APIENTRY glVertexAttribI4uiv)(GLuint index, GLuint const * v);
+GL_APICALL void (*GL_APIENTRY glGetUniformuiv)(GLuint program, GLint location, GLuint * params);
+GL_APICALL GLint (*GL_APIENTRY glGetFragDataLocation)(GLuint program, GLchar const * name);
+GL_APICALL void (*GL_APIENTRY glUniform1ui)(GLint location, GLuint v0);
+GL_APICALL void (*GL_APIENTRY glUniform2ui)(GLint location, GLuint v0, GLuint v1);
+GL_APICALL void (*GL_APIENTRY glUniform3ui)(GLint location, GLuint v0, GLuint v1, GLuint v2);
+GL_APICALL void (*GL_APIENTRY glUniform4ui)(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3);
+GL_APICALL void (*GL_APIENTRY glUniform1uiv)(GLint location, GLsizei count, GLuint const * value);
+GL_APICALL void (*GL_APIENTRY glUniform2uiv)(GLint location, GLsizei count, GLuint const * value);
+GL_APICALL void (*GL_APIENTRY glUniform3uiv)(GLint location, GLsizei count, GLuint const * value);
+GL_APICALL void (*GL_APIENTRY glUniform4uiv)(GLint location, GLsizei count, GLuint const * value);
+GL_APICALL void (*GL_APIENTRY glClearBufferiv)(GLenum buffer, GLint drawbuffer, GLint const * value);
+GL_APICALL void (*GL_APIENTRY glClearBufferuiv)(GLenum buffer, GLint drawbuffer, GLuint const * value);
+GL_APICALL void (*GL_APIENTRY glClearBufferfv)(GLenum buffer, GLint drawbuffer, GLfloat const * value);
+GL_APICALL void (*GL_APIENTRY glClearBufferfi)(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil);
+GL_APICALL const GLubyte * (*GL_APIENTRY glGetStringi)(GLenum name, GLuint index);
+GL_APICALL void (*GL_APIENTRY glCopyBufferSubData)(GLenum readTarget, GLenum writeTarget, GLintptr readOffset,
+                                                   GLintptr writeOffset, GLsizeiptr size);
+GL_APICALL void (*GL_APIENTRY glGetUniformIndices)(GLuint program, GLsizei uniformCount,
+                                                   GLchar const * const * uniformNames, GLuint * uniformIndices);
+GL_APICALL void (*GL_APIENTRY glGetActiveUniformsiv)(GLuint program, GLsizei uniformCount,
+                                                     GLuint const * uniformIndices, GLenum pname, GLint * params);
+GL_APICALL GLuint (*GL_APIENTRY glGetUniformBlockIndex)(GLuint program, GLchar const * uniformBlockName);
+GL_APICALL void (*GL_APIENTRY glGetActiveUniformBlockiv)(GLuint program, GLuint uniformBlockIndex, GLenum pname,
+                                                         GLint * params);
+GL_APICALL void (*GL_APIENTRY glGetActiveUniformBlockName)(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize,
+                                                           GLsizei * length, GLchar * uniformBlockName);
+GL_APICALL void (*GL_APIENTRY glUniformBlockBinding)(GLuint program, GLuint uniformBlockIndex,
+                                                     GLuint uniformBlockBinding);
+GL_APICALL void (*GL_APIENTRY glDrawArraysInstanced)(GLenum mode, GLint first, GLsizei count, GLsizei instanceCount);
+GL_APICALL void (*GL_APIENTRY glDrawElementsInstanced)(GLenum mode, GLsizei count, GLenum type, GLvoid const * indices,
+                                                       GLsizei instanceCount);
+GL_APICALL GLsync (*GL_APIENTRY glFenceSync)(GLenum condition, GLbitfield flags);
+GL_APICALL GLboolean (*GL_APIENTRY glIsSync)(GLsync sync);
+GL_APICALL void (*GL_APIENTRY glDeleteSync)(GLsync sync);
+GL_APICALL GLenum (*GL_APIENTRY glClientWaitSync)(GLsync sync, GLbitfield flags, GLuint64 timeout);
+GL_APICALL void (*GL_APIENTRY glWaitSync)(GLsync sync, GLbitfield flags, GLuint64 timeout);
+GL_APICALL void (*GL_APIENTRY glGetInteger64v)(GLenum pname, GLint64 * params);
+GL_APICALL void (*GL_APIENTRY glGetSynciv)(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei * length,
+                                           GLint * values);
+GL_APICALL void (*GL_APIENTRY glGetInteger64i_v)(GLenum target, GLuint index, GLint64 * data);
+GL_APICALL void (*GL_APIENTRY glGetBufferParameteri64v)(GLenum target, GLenum pname, GLint64 * params);
+GL_APICALL void (*GL_APIENTRY glGenSamplers)(GLsizei count, GLuint * samplers);
+GL_APICALL void (*GL_APIENTRY glDeleteSamplers)(GLsizei count, GLuint const * samplers);
+GL_APICALL GLboolean (*GL_APIENTRY glIsSampler)(GLuint sampler);
+GL_APICALL void (*GL_APIENTRY glBindSampler)(GLuint unit, GLuint sampler);
+GL_APICALL void (*GL_APIENTRY glSamplerParameteri)(GLuint sampler, GLenum pname, GLint param);
+GL_APICALL void (*GL_APIENTRY glSamplerParameteriv)(GLuint sampler, GLenum pname, GLint const * param);
+GL_APICALL void (*GL_APIENTRY glSamplerParameterf)(GLuint sampler, GLenum pname, GLfloat param);
+GL_APICALL void (*GL_APIENTRY glSamplerParameterfv)(GLuint sampler, GLenum pname, GLfloat const * param);
+GL_APICALL void (*GL_APIENTRY glGetSamplerParameteriv)(GLuint sampler, GLenum pname, GLint * params);
+GL_APICALL void (*GL_APIENTRY glGetSamplerParameterfv)(GLuint sampler, GLenum pname, GLfloat * params);
+GL_APICALL void (*GL_APIENTRY glVertexAttribDivisor)(GLuint index, GLuint divisor);
+GL_APICALL void (*GL_APIENTRY glBindTransformFeedback)(GLenum target, GLuint id);
+GL_APICALL void (*GL_APIENTRY glDeleteTransformFeedbacks)(GLsizei n, GLuint const * ids);
+GL_APICALL void (*GL_APIENTRY glGenTransformFeedbacks)(GLsizei n, GLuint * ids);
+GL_APICALL GLboolean (*GL_APIENTRY glIsTransformFeedback)(GLuint id);
+GL_APICALL void (*GL_APIENTRY glPauseTransformFeedback)(void);
+GL_APICALL void (*GL_APIENTRY glResumeTransformFeedback)(void);
+GL_APICALL void (*GL_APIENTRY glGetProgramBinary)(GLuint program, GLsizei bufSize, GLsizei * length,
+                                                  GLenum * binaryFormat, GLvoid * binary);
+GL_APICALL void (*GL_APIENTRY glProgramBinary)(GLuint program, GLenum binaryFormat, GLvoid const * binary,
+                                               GLsizei length);
+GL_APICALL void (*GL_APIENTRY glProgramParameteri)(GLuint program, GLenum pname, GLint value);
+GL_APICALL void (*GL_APIENTRY glInvalidateFramebuffer)(GLenum target, GLsizei numAttachments,
+                                                       GLenum const * attachments);
+GL_APICALL void (*GL_APIENTRY glInvalidateSubFramebuffer)(GLenum target, GLsizei numAttachments,
+                                                          GLenum const * attachments, GLint x, GLint y, GLsizei width,
+                                                          GLsizei height);
+GL_APICALL void (*GL_APIENTRY glTexStorage2D)(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width,
+                                              GLsizei height);
+GL_APICALL void (*GL_APIENTRY glTexStorage3D)(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width,
+                                              GLsizei height, GLsizei depth);
+GL_APICALL void (*GL_APIENTRY glGetInternalformativ)(GLenum target, GLenum internalformat, GLenum pname,
+                                                     GLsizei bufSize, GLint * params);
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/platform/AndroidPlatform.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/platform/AndroidPlatform.cpp
index 67754578e..dde89ade5 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/platform/AndroidPlatform.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/platform/AndroidPlatform.cpp
@@ -22,17 +22,15 @@ std::string Platform::GetMemoryInfo() const
   if (env == nullptr)
     return std::string();
 
-  static std::shared_ptr<jobject> classLogsManager = jni::make_global_ref(env->FindClass("app/organicmaps/sdk/util/log/LogsManager"));
+  static std::shared_ptr<jobject> classLogsManager =
+      jni::make_global_ref(env->FindClass("app/organicmaps/sdk/util/log/LogsManager"));
   ASSERT(classLogsManager, ());
 
   jobject context = android::Platform::Instance().GetContext();
-  static jmethodID const getMemoryInfoId
-    = jni::GetStaticMethodID(env,
-                             static_cast<jclass>(*classLogsManager),
-                             "getMemoryInfo",
-                             "(Landroid/content/Context;)Ljava/lang/String;");
-  jstring const memInfoString = static_cast<jstring>(env->CallStaticObjectMethod(
-    static_cast<jclass>(*classLogsManager), getMemoryInfoId, context));
+  static jmethodID const getMemoryInfoId = jni::GetStaticMethodID(
+      env, static_cast<jclass>(*classLogsManager), "getMemoryInfo", "(Landroid/content/Context;)Ljava/lang/String;");
+  jstring const memInfoString = static_cast<jstring>(
+      env->CallStaticObjectMethod(static_cast<jclass>(*classLogsManager), getMemoryInfoId, context));
   ASSERT(memInfoString, ());
 
   return jni::ToNativeString(env, memInfoString);
@@ -41,20 +39,18 @@ std::string Platform::GetMemoryInfo() const
 std::string Platform::DeviceName() const
 {
   JNIEnv * env = jni::GetEnv();
-  static jmethodID const getDeviceNameId = jni::GetStaticMethodID(env, g_utilsClazz, "getDeviceName",
-                                                                  "()Ljava/lang/String;");
-  auto const deviceName = static_cast<jstring>(env->CallStaticObjectMethod(g_utilsClazz,
-                                                                           getDeviceNameId));
+  static jmethodID const getDeviceNameId =
+      jni::GetStaticMethodID(env, g_utilsClazz, "getDeviceName", "()Ljava/lang/String;");
+  auto const deviceName = static_cast<jstring>(env->CallStaticObjectMethod(g_utilsClazz, getDeviceNameId));
   return jni::ToNativeString(env, deviceName);
 }
 
 std::string Platform::DeviceModel() const
 {
   JNIEnv * env = jni::GetEnv();
-  static jmethodID const getDeviceModelId = jni::GetStaticMethodID(env, g_utilsClazz, "getDeviceModel",
-                                                                  "()Ljava/lang/String;");
-  auto const deviceModel = static_cast<jstring>(env->CallStaticObjectMethod(g_utilsClazz,
-                                                                            getDeviceModelId));
+  static jmethodID const getDeviceModelId =
+      jni::GetStaticMethodID(env, g_utilsClazz, "getDeviceModel", "()Ljava/lang/String;");
+  auto const deviceModel = static_cast<jstring>(env->CallStaticObjectMethod(g_utilsClazz, getDeviceModelId));
   return jni::ToNativeString(env, deviceModel);
 }
 
@@ -79,11 +75,14 @@ Platform::EConnectionType Platform::ConnectionStatus()
   if (env == nullptr)
     return EConnectionType::CONNECTION_NONE;
 
-  static std::shared_ptr<jobject> clazzConnectionState = jni::make_global_ref(env->FindClass("app/organicmaps/sdk/util/ConnectionState"));
+  static std::shared_ptr<jobject> clazzConnectionState =
+      jni::make_global_ref(env->FindClass("app/organicmaps/sdk/util/ConnectionState"));
   ASSERT(clazzConnectionState, ());
 
-  static jmethodID const getConnectionMethodId = jni::GetStaticMethodID(env, static_cast<jclass>(*clazzConnectionState), "getConnectionState", "()B");
-  return static_cast<Platform::EConnectionType>(env->CallStaticByteMethod(static_cast<jclass>(*clazzConnectionState), getConnectionMethodId));
+  static jmethodID const getConnectionMethodId =
+      jni::GetStaticMethodID(env, static_cast<jclass>(*clazzConnectionState), "getConnectionState", "()B");
+  return static_cast<Platform::EConnectionType>(
+      env->CallStaticByteMethod(static_cast<jclass>(*clazzConnectionState), getConnectionMethodId));
 }
 
 Platform::ChargingStatus Platform::GetChargingStatus()
@@ -92,8 +91,7 @@ Platform::ChargingStatus Platform::GetChargingStatus()
   if (env == nullptr)
     return Platform::ChargingStatus::Unknown;
 
-  static jclass const clazzBatteryState =
-      jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/BatteryState");
+  static jclass const clazzBatteryState = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/BatteryState");
   ASSERT(clazzBatteryState, ());
 
   static jmethodID const getChargingMethodId =
@@ -109,8 +107,7 @@ uint8_t Platform::GetBatteryLevel()
   if (env == nullptr)
     return 100;
 
-  static auto const clazzBatteryState =
-      jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/BatteryState");
+  static auto const clazzBatteryState = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/BatteryState");
   ASSERT(clazzBatteryState, ());
 
   static auto const getLevelMethodId =
@@ -123,22 +120,21 @@ namespace platform
 {
 platform::NetworkPolicy GetCurrentNetworkPolicy()
 {
-  JNIEnv *env = jni::GetEnv();
+  JNIEnv * env = jni::GetEnv();
   return platform::NetworkPolicy(network_policy::GetCurrentNetworkUsageStatus(env));
 }
-}
+}  // namespace platform
 
 namespace android
 {
 Platform::~Platform()
 {
-  JNIEnv *env = jni::GetEnv();
+  JNIEnv * env = jni::GetEnv();
   env->DeleteGlobalRef(m_context);
 }
 
-void Platform::Initialize(JNIEnv * env, jobject context, jstring apkPath,
-                          jstring writablePath, jstring privatePath, jstring tmpPath,
-                          jstring flavorName, jstring buildType, bool isTablet)
+void Platform::Initialize(JNIEnv * env, jobject context, jstring apkPath, jstring writablePath, jstring privatePath,
+                          jstring tmpPath, jstring flavorName, jstring buildType, bool isTablet)
 {
   m_context = env->NewGlobalRef(context);
   m_guiThread = std::make_unique<GuiThread>();
@@ -156,12 +152,10 @@ void Platform::Initialize(JNIEnv * env, jobject context, jstring apkPath,
   LOG(LINFO, ("Temporary path = ", m_tmpDir));
 
   // IMPORTANT: This method SHOULD be called from UI thread to cache static jni ID-s inside.
-  (void) ConnectionStatus();
+  (void)ConnectionStatus();
 }
 
-void Platform::OnExternalStorageStatusChanged(bool isAvailable)
-{
-}
+void Platform::OnExternalStorageStatusChanged(bool isAvailable) {}
 
 void Platform::SetWritableDir(std::string const & dir)
 {
@@ -173,7 +167,7 @@ void Platform::SetSettingsDir(std::string const & dir)
 {
   m_settingsDir = dir;
   // Logger is not fully initialized here.
-  //LOG(LINFO, ("Settings path = ", m_settingsDir));
+  // LOG(LINFO, ("Settings path = ", m_settingsDir));
 }
 
 bool Platform::HasAvailableSpaceForWriting(uint64_t size) const
@@ -209,13 +203,11 @@ void Platform::AndroidSecureStorage::Save(std::string const & key, std::string c
 
   Init(env);
 
-  static jmethodID const saveMethodId =
-    jni::GetStaticMethodID(env, m_secureStorageClass, "save",
-                           "(Landroid/content/Context;Ljava/lang/String;"
-                           "Ljava/lang/String;)V");
+  static jmethodID const saveMethodId = jni::GetStaticMethodID(env, m_secureStorageClass, "save",
+                                                               "(Landroid/content/Context;Ljava/lang/String;"
+                                                               "Ljava/lang/String;)V");
   jobject context = android::Platform::Instance().GetContext();
-  env->CallStaticVoidMethod(m_secureStorageClass, saveMethodId,
-                            context,
+  env->CallStaticVoidMethod(m_secureStorageClass, saveMethodId, context,
                             jni::TScopedLocalRef(env, jni::ToJavaString(env, key)).get(),
                             jni::TScopedLocalRef(env, jni::ToJavaString(env, value)).get());
 }
@@ -228,14 +220,12 @@ bool Platform::AndroidSecureStorage::Load(std::string const & key, std::string &
 
   Init(env);
 
-  static jmethodID const loadMethodId =
-    jni::GetStaticMethodID(env, m_secureStorageClass, "load",
-                           "(Landroid/content/Context;Ljava/lang/String;)"
-                           "Ljava/lang/String;");
+  static jmethodID const loadMethodId = jni::GetStaticMethodID(env, m_secureStorageClass, "load",
+                                                               "(Landroid/content/Context;Ljava/lang/String;)"
+                                                               "Ljava/lang/String;");
   jobject context = android::Platform::Instance().GetContext();
-  auto const resultString = static_cast<jstring>(env->CallStaticObjectMethod(m_secureStorageClass,
-    loadMethodId, context,
-    jni::TScopedLocalRef(env, jni::ToJavaString(env, key)).get()));
+  auto const resultString = static_cast<jstring>(env->CallStaticObjectMethod(
+      m_secureStorageClass, loadMethodId, context, jni::TScopedLocalRef(env, jni::ToJavaString(env, key)).get()));
   if (resultString == nullptr)
     return false;
 
@@ -252,8 +242,7 @@ void Platform::AndroidSecureStorage::Remove(std::string const & key)
   Init(env);
 
   static jmethodID const removeMethodId =
-    jni::GetStaticMethodID(env, m_secureStorageClass, "remove",
-                           "(Landroid/content/Context;Ljava/lang/String;)V");
+      jni::GetStaticMethodID(env, m_secureStorageClass, "remove", "(Landroid/content/Context;Ljava/lang/String;)V");
   jobject context = android::Platform::Instance().GetContext();
   env->CallStaticVoidMethod(m_secureStorageClass, removeMethodId, context,
                             jni::TScopedLocalRef(env, jni::ToJavaString(env, key)).get());
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/platform/AndroidPlatform.hpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/platform/AndroidPlatform.hpp
index 4a4b34f27..08d13a2c3 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/platform/AndroidPlatform.hpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/platform/AndroidPlatform.hpp
@@ -20,8 +20,7 @@ public:
   ~Platform() override;
 
   void Initialize(JNIEnv * env, jobject functorProcessObject, jstring apkPath, jstring writablePath,
-                  jstring privatePath, jstring tmpPath, jstring flavorName,
-                  jstring buildType, bool isTablet);
+                  jstring privatePath, jstring tmpPath, jstring flavorName, jstring buildType, bool isTablet);
 
   void OnExternalStorageStatusChanged(bool isAvailable);
 
@@ -53,4 +52,4 @@ private:
   AndroidSecureStorage m_secureStorage;
   jobject m_context;
 };
-} // namespace android
+}  // namespace android
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/platform/HttpThread.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/platform/HttpThread.cpp
index 534f9414b..41f90a737 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/platform/HttpThread.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/platform/HttpThread.cpp
@@ -11,12 +11,8 @@ private:
   jclass m_klass;
 
 public:
-  HttpThread(std::string const & url,
-             downloader::IHttpThreadCallback & cb,
-             int64_t beg,
-             int64_t end,
-             int64_t expectedFileSize,
-             std::string const & pb)
+  HttpThread(std::string const & url, downloader::IHttpThreadCallback & cb, int64_t beg, int64_t end,
+             int64_t expectedFileSize, std::string const & pb)
   {
     JNIEnv * env = jni::GetEnv();
     static jclass const klass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/downloader/ChunkTask");
@@ -35,14 +31,9 @@ public:
     }
 
     jni::TScopedLocalRef jUrl(env, jni::ToJavaString(env, url.c_str()));
-    jni::TScopedLocalRef localSelf(env, env->NewObject(klass,
-                                                       initMethodId,
-                                                       reinterpret_cast<jlong>(&cb),
-                                                       jUrl.get(),
-                                                       static_cast<jlong>(beg),
-                                                       static_cast<jlong>(end),
-                                                       static_cast<jlong>(expectedFileSize),
-                                                       postBody.get()));
+    jni::TScopedLocalRef localSelf(
+        env, env->NewObject(klass, initMethodId, reinterpret_cast<jlong>(&cb), jUrl.get(), static_cast<jlong>(beg),
+                            static_cast<jlong>(end), static_cast<jlong>(expectedFileSize), postBody.get()));
     m_self = env->NewGlobalRef(localSelf.get());
     ASSERT(m_self, ());
 
@@ -60,29 +51,26 @@ public:
 
 namespace downloader
 {
-  HttpThread * CreateNativeHttpThread(std::string const & url,
-                                      downloader::IHttpThreadCallback & cb,
-                                      int64_t beg,
-                                      int64_t end,
-                                      int64_t size,
-                                      std::string const & pb)
-  {
-    return new HttpThread(url, cb, beg, end, size, pb);
-  }
+HttpThread * CreateNativeHttpThread(std::string const & url, downloader::IHttpThreadCallback & cb, int64_t beg,
+                                    int64_t end, int64_t size, std::string const & pb)
+{
+  return new HttpThread(url, cb, beg, end, size, pb);
+}
 
-  void DeleteNativeHttpThread(HttpThread * request)
-  {
-    delete request;
-  }
+void DeleteNativeHttpThread(HttpThread * request)
+{
+  delete request;
+}
 
 }  // namespace downloader
 
 extern "C"
 {
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_downloader_ChunkTask_nativeOnWrite(JNIEnv * env, jclass clazz, jlong httpCallbackID, jlong beg, jbyteArray data, jlong size)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_downloader_ChunkTask_nativeOnWrite(JNIEnv * env, jclass clazz,
+                                                                                       jlong httpCallbackID, jlong beg,
+                                                                                       jbyteArray data, jlong size)
 {
-  downloader::IHttpThreadCallback * cb = reinterpret_cast<downloader::IHttpThreadCallback*>(httpCallbackID);
+  downloader::IHttpThreadCallback * cb = reinterpret_cast<downloader::IHttpThreadCallback *>(httpCallbackID);
   jbyte * buf = env->GetByteArrayElements(data, 0);
   ASSERT(buf, ());
 
@@ -100,10 +88,12 @@ Java_app_organicmaps_sdk_downloader_ChunkTask_nativeOnWrite(JNIEnv * env, jclass
   return ret;
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_downloader_ChunkTask_nativeOnFinish(JNIEnv * env, jclass clazz, jlong httpCallbackID, jlong httpCode, jlong beg, jlong end)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_downloader_ChunkTask_nativeOnFinish(JNIEnv * env, jclass clazz,
+                                                                                    jlong httpCallbackID,
+                                                                                    jlong httpCode, jlong beg,
+                                                                                    jlong end)
 {
-  downloader::IHttpThreadCallback * cb = reinterpret_cast<downloader::IHttpThreadCallback*>(httpCallbackID);
+  downloader::IHttpThreadCallback * cb = reinterpret_cast<downloader::IHttpThreadCallback *>(httpCallbackID);
   cb->OnFinish(static_cast<long>(httpCode), beg, end);
 }
-} // extern "C"
+}  // extern "C"
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/platform/Language.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/platform/Language.cpp
index 9c24f2f95..38035bddc 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/platform/Language.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/platform/Language.cpp
@@ -1,5 +1,5 @@
-#include "android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.hpp"
 #include "android/sdk/src/main/cpp/app/organicmaps/sdk/core/ScopedLocalRef.hpp"
+#include "android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.hpp"
 
 #include "platform/locale.hpp"
 
@@ -22,11 +22,12 @@ std::string GetAndroidSystemLanguage()
   }
 
   static jclass const languageClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/Language");
-  static jmethodID const getDefaultLocaleId = jni::GetStaticMethodID(env, languageClass, "getDefaultLocale", "()Ljava/lang/String;");
+  static jmethodID const getDefaultLocaleId =
+      jni::GetStaticMethodID(env, languageClass, "getDefaultLocale", "()Ljava/lang/String;");
 
   jni::TScopedLocalRef localeRef(env, env->CallStaticObjectMethod(languageClass, getDefaultLocaleId));
 
-  std::string res = jni::ToNativeString(env, (jstring) localeRef.get());
+  std::string res = jni::ToNativeString(env, (jstring)localeRef.get());
   if (res.empty())
     res = DEFAULT_LANG;
 
@@ -38,24 +39,24 @@ namespace platform
 Locale GetCurrentLocale()
 {
   JNIEnv * env = jni::GetEnv();
-  static jmethodID const getLanguageCodeId = jni::GetStaticMethodID(env, g_utilsClazz, "getLanguageCode",
-                                                                    "()Ljava/lang/String;");
+  static jmethodID const getLanguageCodeId =
+      jni::GetStaticMethodID(env, g_utilsClazz, "getLanguageCode", "()Ljava/lang/String;");
   jni::ScopedLocalRef languageCode(env, env->CallStaticObjectMethod(g_utilsClazz, getLanguageCodeId));
 
-  static jmethodID const getCountryCodeId = jni::GetStaticMethodID(env, g_utilsClazz, "getCountryCode",
-                                                                   "()Ljava/lang/String;");
+  static jmethodID const getCountryCodeId =
+      jni::GetStaticMethodID(env, g_utilsClazz, "getCountryCode", "()Ljava/lang/String;");
   jni::ScopedLocalRef countryCode(env, env->CallStaticObjectMethod(g_utilsClazz, getCountryCodeId));
 
-  static jmethodID const getCurrencyCodeId = jni::GetStaticMethodID(env, g_utilsClazz, "getCurrencyCode",
-                                                                    "()Ljava/lang/String;");
+  static jmethodID const getCurrencyCodeId =
+      jni::GetStaticMethodID(env, g_utilsClazz, "getCurrencyCode", "()Ljava/lang/String;");
   jni::ScopedLocalRef currencyCode(env, env->CallStaticObjectMethod(g_utilsClazz, getCurrencyCodeId));
 
-  static jmethodID const getDecimalSeparatorId = jni::GetStaticMethodID(env, g_utilsClazz, "getDecimalSeparator",
-                                                                        "()Ljava/lang/String;");
-  jni::ScopedLocalRef decimalSeparatorChar(env,  env->CallStaticObjectMethod(g_utilsClazz, getDecimalSeparatorId));
+  static jmethodID const getDecimalSeparatorId =
+      jni::GetStaticMethodID(env, g_utilsClazz, "getDecimalSeparator", "()Ljava/lang/String;");
+  jni::ScopedLocalRef decimalSeparatorChar(env, env->CallStaticObjectMethod(g_utilsClazz, getDecimalSeparatorId));
 
-  static jmethodID const getGroupingSeparatorId = jni::GetStaticMethodID(env, g_utilsClazz, "getGroupingSeparator",
-                                                                         "()Ljava/lang/String;");
+  static jmethodID const getGroupingSeparatorId =
+      jni::GetStaticMethodID(env, g_utilsClazz, "getGroupingSeparator", "()Ljava/lang/String;");
   jni::ScopedLocalRef groupingSeparatorChar(env, env->CallStaticObjectMethod(g_utilsClazz, getGroupingSeparatorId));
 
   return {jni::ToNativeString(env, static_cast<jstring>(languageCode.get())),
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/platform/Localization.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/platform/Localization.cpp
index 11229602c..2441c73ed 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/platform/Localization.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/platform/Localization.cpp
@@ -1,7 +1,7 @@
 #include <jni.h>
 
-#include "app/organicmaps/sdk/core/jni_helper.hpp"
 #include "app/organicmaps/sdk/core/ScopedLocalRef.hpp"
+#include "app/organicmaps/sdk/core/jni_helper.hpp"
 #include "app/organicmaps/sdk/platform/AndroidPlatform.hpp"
 
 #include "platform/localization.hpp"
@@ -23,8 +23,7 @@ std::string GetLocalizedStringByUtil(jmethodID const & methodId, std::string con
 
   jni::TScopedLocalRef strRef(env, jni::ToJavaString(env, str));
   jobject context = android::Platform::Instance().GetContext();
-  jni::TScopedLocalRef localizedStrRef(env, env->CallStaticObjectMethod(g_utilsClazz, methodId,
-                                                                        context, strRef.get()));
+  jni::TScopedLocalRef localizedStrRef(env, env->CallStaticObjectMethod(g_utilsClazz, methodId, context, strRef.get()));
   return jni::ToNativeString(env, static_cast<jstring>(localizedStrRef.get()));
 }
 }  // namespace
@@ -52,12 +51,11 @@ std::string GetLocalizedString(std::string const & key)
 std::string GetCurrencySymbol(std::string const & currencyCode)
 {
   JNIEnv * env = jni::GetEnv();
-  static auto const methodId = jni::GetStaticMethodID(env, g_utilsClazz, "getCurrencySymbol",
-                                                      "(Ljava/lang/String;)Ljava/lang/String;");
+  static auto const methodId =
+      jni::GetStaticMethodID(env, g_utilsClazz, "getCurrencySymbol", "(Ljava/lang/String;)Ljava/lang/String;");
 
   jni::TScopedLocalRef currencyCodeRef(env, jni::ToJavaString(env, currencyCode));
-  jni::TScopedLocalRef localizedStrRef(
-      env, env->CallStaticObjectMethod(g_utilsClazz, methodId, currencyCodeRef.get()));
+  jni::TScopedLocalRef localizedStrRef(env, env->CallStaticObjectMethod(g_utilsClazz, methodId, currencyCodeRef.get()));
   return jni::ToNativeString(env, static_cast<jstring>(localizedStrRef.get()));
 }
 
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/platform/SocketImpl.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/platform/SocketImpl.cpp
index e9c7e0f75..49610e9db 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/platform/SocketImpl.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/platform/SocketImpl.cpp
@@ -30,8 +30,7 @@ public:
   bool Open(std::string const & host, uint16_t port)
   {
     JNIEnv * env = jni::GetEnv();
-    static jmethodID const openMethod =
-        jni::GetMethodID(env, m_self, "open", "(Ljava/lang/String;I)Z");
+    static jmethodID const openMethod = jni::GetMethodID(env, m_self, "open", "(Ljava/lang/String;I)Z");
     jni::TScopedLocalRef hostRef(env, jni::ToJavaString(env, host));
     jboolean result = env->CallBooleanMethod(m_self, openMethod, hostRef.get(), static_cast<jint>(port));
     if (jni::HandleJavaException(env))
@@ -55,7 +54,7 @@ public:
     jboolean result = env->CallBooleanMethod(m_self, readMethod, array, static_cast<jint>(count));
     if (jni::HandleJavaException(env))
       return false;
-    //this call copies java byte array to native buffer
+    // this call copies java byte array to native buffer
     env->GetByteArrayRegion(array, 0, count, reinterpret_cast<jbyte *>(data));
     if (jni::HandleJavaException(env))
       return false;
@@ -66,8 +65,8 @@ public:
   {
     JNIEnv * env = jni::GetEnv();
     jni::TScopedLocalByteArrayRef arrayRef(env, env->NewByteArray(count));
-    //this call copies native buffer to java byte array
-    env->SetByteArrayRegion(arrayRef.get(), 0, count, reinterpret_cast<const jbyte *>(data));
+    // this call copies native buffer to java byte array
+    env->SetByteArrayRegion(arrayRef.get(), 0, count, reinterpret_cast<jbyte const *>(data));
     static jmethodID const writeMethod = jni::GetMethodID(env, m_self, "write", "([BI)Z");
     jboolean result = env->CallBooleanMethod(m_self, writeMethod, arrayRef.get(), static_cast<jint>(count));
     if (jni::HandleJavaException(env))
@@ -81,11 +80,14 @@ public:
     static jmethodID const setTimeoutMethod = jni::GetMethodID(env, m_self, "setTimeout", "(I)V");
     env->CallVoidMethod(m_self, setTimeoutMethod, static_cast<jint>(milliseconds));
     jni::HandleJavaException(env);
-  };
+  }
 
 private:
   jobject m_self;
 };
 
-std::unique_ptr<Socket> CreateSocket() { return std::make_unique<SocketImpl>(); }
+std::unique_ptr<Socket> CreateSocket()
+{
+  return std::make_unique<SocketImpl>();
 }
+}  // namespace platform
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/routing/JunctionInfo.hpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/routing/JunctionInfo.hpp
index be93da80f..e73a3f52a 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/routing/JunctionInfo.hpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/routing/JunctionInfo.hpp
@@ -14,9 +14,8 @@ jobjectArray CreateJunctionInfoArray(JNIEnv * env, std::vector<geometry::PointWi
 
   return jni::ToJavaArray(env, junctionClazz, junctionPoints,
                           [](JNIEnv * env, geometry::PointWithAltitude const & pointWithAltitude)
-                          {
-                            auto & point = pointWithAltitude.GetPoint();
-                            return env->NewObject(junctionClazz, junctionConstructor, mercator::YToLat(point.y),
-                                                  mercator::XToLon(point.x));
-                          });
+  {
+    auto & point = pointWithAltitude.GetPoint();
+    return env->NewObject(junctionClazz, junctionConstructor, mercator::YToLat(point.y), mercator::XToLon(point.x));
+  });
 }
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/routing/RouteMarkData.hpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/routing/RouteMarkData.hpp
index 7599841b9..951b18a22 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/routing/RouteMarkData.hpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/routing/RouteMarkData.hpp
@@ -13,17 +13,15 @@ jobjectArray CreateRouteMarkDataArray(JNIEnv * env, std::vector<RouteMarkData> c
   //                                int intermediateIndex, boolean isVisible, boolean isMyPosition,
   //                                boolean isPassed, double lat, double lon)
   static jmethodID const pointConstructor =
-    jni::GetConstructorID(env, pointClazz, "(Ljava/lang/String;Ljava/lang/String;IIZZZDD)V");
-  return jni::ToJavaArray(env, pointClazz, points,
-                          [&](JNIEnv * jEnv, RouteMarkData const & data)
-                          {
-                            jni::TScopedLocalRef const title(env, jni::ToJavaString(env, data.m_title));
-                            jni::TScopedLocalRef const subtitle(env, jni::ToJavaString(env, data.m_subTitle));
-                            return env->NewObject(
-                              pointClazz, pointConstructor, title.get(), subtitle.get(),
-                              static_cast<jint>(data.m_pointType), static_cast<jint>(data.m_intermediateIndex),
-                              static_cast<jboolean>(data.m_isVisible), static_cast<jboolean>(data.m_isMyPosition),
-                              static_cast<jboolean>(data.m_isPassed), mercator::YToLat(data.m_position.y),
-                              mercator::XToLon(data.m_position.x));
-                          });
+      jni::GetConstructorID(env, pointClazz, "(Ljava/lang/String;Ljava/lang/String;IIZZZDD)V");
+  return jni::ToJavaArray(env, pointClazz, points, [&](JNIEnv * jEnv, RouteMarkData const & data)
+  {
+    jni::TScopedLocalRef const title(env, jni::ToJavaString(env, data.m_title));
+    jni::TScopedLocalRef const subtitle(env, jni::ToJavaString(env, data.m_subTitle));
+    return env->NewObject(pointClazz, pointConstructor, title.get(), subtitle.get(),
+                          static_cast<jint>(data.m_pointType), static_cast<jint>(data.m_intermediateIndex),
+                          static_cast<jboolean>(data.m_isVisible), static_cast<jboolean>(data.m_isMyPosition),
+                          static_cast<jboolean>(data.m_isPassed), mercator::YToLat(data.m_position.y),
+                          mercator::XToLon(data.m_position.x));
+  });
 }
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/routing/RoutingInfo.hpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/routing/RoutingInfo.hpp
index d200d93bf..3dc84846f 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/routing/RoutingInfo.hpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/routing/RoutingInfo.hpp
@@ -15,21 +15,21 @@ jobject CreateRoutingInfo(JNIEnv * env, routing::FollowingInfo const & info, Rou
   //                              vehicleNextTurnOrdinal, int pedestrianTurnOrdinal, int exitNum,
   //                              int totalTime, SingleLaneInfo[] lanes)
   static jmethodID const ctorRouteInfoID =
-    jni::GetConstructorID(env, klass,
-                          "(Lapp/organicmaps/sdk/util/Distance;Lapp/organicmaps/sdk/util/Distance;"
-                          "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;DIIIII"
-                          "[Lapp/organicmaps/sdk/routing/SingleLaneInfo;DZZ)V");
+      jni::GetConstructorID(env, klass,
+                            "(Lapp/organicmaps/sdk/util/Distance;Lapp/organicmaps/sdk/util/Distance;"
+                            "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;DIIIII"
+                            "[Lapp/organicmaps/sdk/routing/SingleLaneInfo;DZZ)V");
 
   jobjectArray jLanes = CreateLanesInfo(env, info.m_lanes);
 
   auto const isSpeedCamLimitExceeded = rm.IsSpeedCamLimitExceeded();
   auto const shouldPlaySignal = rm.GetSpeedCamManager().ShouldPlayBeepSignal();
   jobject const result = env->NewObject(
-    klass, ctorRouteInfoID, ToJavaDistance(env, info.m_distToTarget), ToJavaDistance(env, info.m_distToTurn),
-    jni::ToJavaString(env, info.m_currentStreetName), jni::ToJavaString(env, info.m_nextStreetName),
-    jni::ToJavaString(env, info.m_nextNextStreetName), info.m_completionPercent, info.m_turn, info.m_nextTurn,
-    info.m_pedestrianTurn, info.m_exitNum, info.m_time, jLanes, info.m_speedLimitMps,
-    static_cast<jboolean>(isSpeedCamLimitExceeded), static_cast<jboolean>(shouldPlaySignal));
+      klass, ctorRouteInfoID, ToJavaDistance(env, info.m_distToTarget), ToJavaDistance(env, info.m_distToTurn),
+      jni::ToJavaString(env, info.m_currentStreetName), jni::ToJavaString(env, info.m_nextStreetName),
+      jni::ToJavaString(env, info.m_nextNextStreetName), info.m_completionPercent, info.m_turn, info.m_nextTurn,
+      info.m_pedestrianTurn, info.m_exitNum, info.m_time, jLanes, info.m_speedLimitMps,
+      static_cast<jboolean>(isSpeedCamLimitExceeded), static_cast<jboolean>(shouldPlaySignal));
   ASSERT(result, (jni::DescribeException()));
   return result;
 }
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/routing/SingleLaneInfo.hpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/routing/SingleLaneInfo.hpp
index 8574e4c99..2852d2f3d 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/routing/SingleLaneInfo.hpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/routing/SingleLaneInfo.hpp
@@ -25,7 +25,7 @@ jobjectArray CreateLanesInfo(JNIEnv * env, std::vector<routing::FollowingInfo::S
     env->SetByteArrayRegion(singleLane.get(), 0, laneSize, lanes[j].m_lane.data());
 
     jni::TScopedLocalRef singleLaneInfo(
-      env, env->NewObject(laneClass, ctorSingleLaneInfoID, singleLane.get(), lanes[j].m_isRecommended));
+        env, env->NewObject(laneClass, ctorSingleLaneInfoID, singleLane.get(), lanes[j].m_isRecommended));
     ASSERT(singleLaneInfo.get(), (jni::DescribeException()));
     env->SetObjectArrayElement(jLanes, j, singleLaneInfo.get());
   }
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/routing/TransitRouteInfo.hpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/routing/TransitRouteInfo.hpp
index c2ef0afb8..48b813c97 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/routing/TransitRouteInfo.hpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/routing/TransitRouteInfo.hpp
@@ -11,16 +11,16 @@ jobject CreateTransitRouteInfo(JNIEnv * env, TransitRouteInfo const & routeInfo)
   jobjectArray steps = CreateTransitStepInfoArray(env, routeInfo.m_steps);
 
   static jclass const transitRouteInfoClass =
-    jni::GetGlobalClassRef(env, "app/organicmaps/sdk/routing/TransitRouteInfo");
+      jni::GetGlobalClassRef(env, "app/organicmaps/sdk/routing/TransitRouteInfo");
   // Java signature : TransitRouteInfo(@NonNull String totalDistance, @NonNull String totalDistanceUnits,
   //                                   int totalTimeInSec, @NonNull String totalPedestrianDistance, @NonNull String
   //                                   totalPedestrianDistanceUnits, int totalPedestrianTimeInSec, @NonNull
   //                                   TransitStepInfo[] steps)
   static jmethodID const transitRouteInfoConstructor =
-    jni::GetConstructorID(env, transitRouteInfoClass,
-                          "(Ljava/lang/String;Ljava/lang/String;I"
-                          "Ljava/lang/String;Ljava/lang/String;I"
-                          "[Lapp/organicmaps/sdk/routing/TransitStepInfo;)V");
+      jni::GetConstructorID(env, transitRouteInfoClass,
+                            "(Ljava/lang/String;Ljava/lang/String;I"
+                            "Ljava/lang/String;Ljava/lang/String;I"
+                            "[Lapp/organicmaps/sdk/routing/TransitStepInfo;)V");
   jni::TScopedLocalRef const distance(env, jni::ToJavaString(env, routeInfo.m_totalDistanceStr));
   jni::TScopedLocalRef const distanceUnits(env, jni::ToJavaString(env, routeInfo.m_totalDistanceUnitsSuffix));
   jni::TScopedLocalRef const distancePedestrian(env, jni::ToJavaString(env, routeInfo.m_totalPedestrianDistanceStr));
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/routing/TransitStepInfo.hpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/routing/TransitStepInfo.hpp
index 37f3776e2..5e7395700 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/routing/TransitStepInfo.hpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/routing/TransitStepInfo.hpp
@@ -12,17 +12,15 @@ jobjectArray CreateTransitStepInfoArray(JNIEnv * env, std::vector<TransitStepInf
   // Java signature : TransitStepInfo(int type, @Nullable String distance, @Nullable String distanceUnits,
   //                                  int timeInSec, @Nullable String number, int color, int intermediateIndex)
   static jmethodID const transitStepConstructor =
-    jni::GetConstructorID(env, transitStepClass, "(ILjava/lang/String;Ljava/lang/String;ILjava/lang/String;II)V");
+      jni::GetConstructorID(env, transitStepClass, "(ILjava/lang/String;Ljava/lang/String;ILjava/lang/String;II)V");
 
-  return jni::ToJavaArray(
-    env, transitStepClass, steps,
-    [&](JNIEnv * jEnv, TransitStepInfo const & stepInfo)
-    {
-      jni::TScopedLocalRef const distance(env, jni::ToJavaString(env, stepInfo.m_distanceStr));
-      jni::TScopedLocalRef const distanceUnits(env, jni::ToJavaString(env, stepInfo.m_distanceUnitsSuffix));
-      jni::TScopedLocalRef const number(env, jni::ToJavaString(env, stepInfo.m_number));
-      return env->NewObject(transitStepClass, transitStepConstructor, static_cast<jint>(stepInfo.m_type),
-                            distance.get(), distanceUnits.get(), static_cast<jint>(stepInfo.m_timeInSec), number.get(),
-                            static_cast<jint>(stepInfo.m_colorARGB), static_cast<jint>(stepInfo.m_intermediateIndex));
-    });
+  return jni::ToJavaArray(env, transitStepClass, steps, [&](JNIEnv * jEnv, TransitStepInfo const & stepInfo)
+  {
+    jni::TScopedLocalRef const distance(env, jni::ToJavaString(env, stepInfo.m_distanceStr));
+    jni::TScopedLocalRef const distanceUnits(env, jni::ToJavaString(env, stepInfo.m_distanceUnitsSuffix));
+    jni::TScopedLocalRef const number(env, jni::ToJavaString(env, stepInfo.m_number));
+    return env->NewObject(transitStepClass, transitStepConstructor, static_cast<jint>(stepInfo.m_type), distance.get(),
+                          distanceUnits.get(), static_cast<jint>(stepInfo.m_timeInSec), number.get(),
+                          static_cast<jint>(stepInfo.m_colorARGB), static_cast<jint>(stepInfo.m_intermediateIndex));
+  });
 }
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/search/DisplayedCategories.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/search/DisplayedCategories.cpp
index 65706b500..5b2490dab 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/search/DisplayedCategories.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/search/DisplayedCategories.cpp
@@ -13,8 +13,9 @@ JNIEXPORT jobjectArray JNICALL Java_app_organicmaps_sdk_search_DisplayedCategori
   return jni::ToJavaStringArray(env, categories.GetKeys());
 }
 
-JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_search_DisplayedCategories_nativeIsLangSupported(
-        JNIEnv * env, jclass, jstring langCode)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_search_DisplayedCategories_nativeIsLangSupported(JNIEnv * env,
+                                                                                                     jclass,
+                                                                                                     jstring langCode)
 {
   return search::DisplayedCategories::IsLanguageSupported(jni::ToNativeString(env, langCode));
 }
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/search/SearchEngine.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/search/SearchEngine.cpp
index db983caac..25147b5a7 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/search/SearchEngine.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/search/SearchEngine.cpp
@@ -65,13 +65,12 @@ bool PopularityHasHigherPriority(bool hasPosition, double distanceInMeters)
   return !hasPosition || distanceInMeters > search::Result::kPopularityHighPriorityMinDistance;
 }
 
-jobject ToJavaResult(Result const & result, search::ProductInfo const & productInfo,
-                     bool hasPosition, double lat, double lon)
+jobject ToJavaResult(Result const & result, search::ProductInfo const & productInfo, bool hasPosition, double lat,
+                     double lon)
 {
   JNIEnv * env = jni::GetEnv();
 
-  jni::TScopedLocalIntArrayRef ranges(
-      env, env->NewIntArray(static_cast<jsize>(result.GetHighlightRangesCount() * 2)));
+  jni::TScopedLocalIntArrayRef ranges(env, env->NewIntArray(static_cast<jsize>(result.GetHighlightRangesCount() * 2)));
   jint * rawArr = env->GetIntArrayElements(ranges, nullptr);
   for (size_t i = 0; i < result.GetHighlightRangesCount(); i++)
   {
@@ -81,8 +80,8 @@ jobject ToJavaResult(Result const & result, search::ProductInfo const & productI
   }
   env->ReleaseIntArrayElements(ranges.get(), rawArr, 0);
 
-  jni::TScopedLocalIntArrayRef descRanges(env, env->NewIntArray(
-          static_cast<jsize>(result.GetDescHighlightRangesCount() * 2)));
+  jni::TScopedLocalIntArrayRef descRanges(
+      env, env->NewIntArray(static_cast<jsize>(result.GetDescHighlightRangesCount() * 2)));
   jint * rawArr2 = env->GetIntArrayElements(descRanges, nullptr);
   for (size_t i = 0; i < result.GetDescHighlightRangesCount(); i++)
   {
@@ -100,7 +99,8 @@ jobject ToJavaResult(Result const & result, search::ProductInfo const & productI
   {
     jni::TScopedLocalRef name(env, jni::ToJavaString(env, result.GetString()));
     jni::TScopedLocalRef suggest(env, jni::ToJavaString(env, result.GetSuggestionString()));
-    return env->NewObject(g_resultClass, g_suggestConstructor, name.get(), suggest.get(), ll.m_lat, ll.m_lon, ranges.get(),descRanges.get());
+    return env->NewObject(g_resultClass, g_suggestConstructor, name.get(), suggest.get(), ll.m_lat, ll.m_lon,
+                          ranges.get(), descRanges.get());
   }
 
   platform::Distance distance;
@@ -113,34 +113,31 @@ jobject ToJavaResult(Result const & result, search::ProductInfo const & productI
 
   bool const popularityHasHigherPriority = PopularityHasHigherPriority(hasPosition, distanceInMeters);
   bool const isFeature = result.GetResultType() == Result::Type::Feature;
-  jni::TScopedLocalRef featureId(env, usermark_helper::CreateFeatureId(env, isFeature ?
-                                                                            result.GetFeatureID() :
-                                                                            kEmptyFeatureId));
+  jni::TScopedLocalRef featureId(
+      env, usermark_helper::CreateFeatureId(env, isFeature ? result.GetFeatureID() : kEmptyFeatureId));
 
   jni::TScopedLocalRef featureType(env, jni::ToJavaString(env, result.GetLocalizedFeatureType()));
   jni::TScopedLocalRef address(env, jni::ToJavaString(env, result.GetAddress()));
   jni::TScopedLocalRef dist(env, ToJavaDistance(env, distance));
   jni::TScopedLocalRef description(env, jni::ToJavaString(env, result.GetFeatureDescription()));
 
-  jni::TScopedLocalRef desc(env, env->NewObject(g_descriptionClass, g_descriptionConstructor,
-                                                featureId.get(), featureType.get(), address.get(),
-                                                dist.get(), description.get(),
-                                                static_cast<jint>(result.IsOpenNow()),
-                                                result.GetMinutesUntilOpen(),result.GetMinutesUntilClosed(),
-                                                static_cast<jboolean>(popularityHasHigherPriority)));
+  jni::TScopedLocalRef desc(
+      env,
+      env->NewObject(g_descriptionClass, g_descriptionConstructor, featureId.get(), featureType.get(), address.get(),
+                     dist.get(), description.get(), static_cast<jint>(result.IsOpenNow()), result.GetMinutesUntilOpen(),
+                     result.GetMinutesUntilClosed(), static_cast<jboolean>(popularityHasHigherPriority)));
 
   jni::TScopedLocalRef name(env, jni::ToJavaString(env, result.GetString()));
-  jni::TScopedLocalRef popularity(env, env->NewObject(g_popularityClass,
-                                                      g_popularityConstructor,
+  jni::TScopedLocalRef popularity(env, env->NewObject(g_popularityClass, g_popularityConstructor,
                                                       /// @todo Restore when popularity will be available
-                                                      0/*static_cast<jint>(result.GetRankingInfo().m_popularity)*/));
+                                                      0 /*static_cast<jint>(result.GetRankingInfo().m_popularity)*/));
 
-  return env->NewObject(g_resultClass, g_resultConstructor, name.get(), desc.get(), ll.m_lat, ll.m_lon,
-                        ranges.get(), descRanges.get(), popularity.get());
+  return env->NewObject(g_resultClass, g_resultConstructor, name.get(), desc.get(), ll.m_lat, ll.m_lon, ranges.get(),
+                        descRanges.get(), popularity.get());
 }
 
-jobjectArray BuildSearchResults(vector<search::ProductInfo> const & productInfo,
-                                bool hasPosition, double lat, double lon)
+jobjectArray BuildSearchResults(vector<search::ProductInfo> const & productInfo, bool hasPosition, double lat,
+                                double lon)
 {
   JNIEnv * env = jni::GetEnv();
 
@@ -154,8 +151,8 @@ jobjectArray BuildSearchResults(vector<search::ProductInfo> const & productInfo,
   return jResults;
 }
 
-void OnResults(Results results, vector<search::ProductInfo> const & productInfo,
-               jlong timestamp, bool isMapAndTable, bool hasPosition, double lat, double lon)
+void OnResults(Results results, vector<search::ProductInfo> const & productInfo, jlong timestamp, bool isMapAndTable,
+               bool hasPosition, double lat, double lon)
 {
   // Ignore results from obsolete searches.
   if (g_queryTimestamp > timestamp)
@@ -203,8 +200,8 @@ void OnMapSearchResults(storage::DownloaderSearchResults const & results, long l
 
   JNIEnv * env = jni::GetEnv();
   jni::TScopedLocalObjectArrayRef jResults(env, BuildJavaMapResults(results.m_results));
-  env->CallVoidMethod(g_javaListener, g_mapResultsMethod, jResults.get(),
-                      static_cast<jlong>(timestamp), results.m_endMarker);
+  env->CallVoidMethod(g_javaListener, g_mapResultsMethod, jResults.get(), static_cast<jlong>(timestamp),
+                      results.m_endMarker);
 }
 
 void OnBookmarksSearchResults(search::BookmarksSearchParams::Results results,
@@ -221,8 +218,8 @@ void OnBookmarksSearchResults(search::BookmarksSearchParams::Results results,
   vector<jlong> const tmp(results.cbegin(), results.cend());
   env->SetLongArrayRegion(jResults.get(), 0, static_cast<jsize>(tmp.size()), tmp.data());
 
-  auto const method = (status == search::BookmarksSearchParams::Status::InProgress) ?
-                      g_updateBookmarksResultsId : g_endBookmarksResultsId;
+  auto const method = (status == search::BookmarksSearchParams::Status::InProgress) ? g_updateBookmarksResultsId
+                                                                                    : g_endBookmarksResultsId;
 
   env->CallVoidMethod(g_javaListener, method, jResults.get(), static_cast<jlong>(timestamp));
 }
@@ -231,151 +228,139 @@ void OnBookmarksSearchResults(search::BookmarksSearchParams::Results results,
 
 extern "C"
 {
-  JNIEXPORT void JNICALL
-  Java_app_organicmaps_sdk_search_SearchEngine_nativeInit(JNIEnv * env, jobject thiz)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_search_SearchEngine_nativeInit(JNIEnv * env, jobject thiz)
+{
+  g_javaListener = env->NewGlobalRef(thiz);
+  // public void onResultsUpdate(@NonNull SearchResult[] results, long timestamp)
+  g_updateResultsId =
+      jni::GetMethodID(env, g_javaListener, "onResultsUpdate", "([Lapp/organicmaps/sdk/search/SearchResult;J)V");
+  // public void onResultsEnd(long timestamp)
+  g_endResultsId = jni::GetMethodID(env, g_javaListener, "onResultsEnd", "(J)V");
+  g_resultClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/search/SearchResult");
+  g_resultConstructor =
+      jni::GetConstructorID(env, g_resultClass,
+                            "(Ljava/lang/String;Lapp/organicmaps/sdk/search/SearchResult$Description;DD[I[I"
+                            "Lapp/organicmaps/sdk/search/Popularity;)V");
+  g_suggestConstructor = jni::GetConstructorID(env, g_resultClass, "(Ljava/lang/String;Ljava/lang/String;DD[I[I)V");
+  g_descriptionClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/search/SearchResult$Description");
+  /*
+      Description(FeatureId featureId, String featureType, String region, Distance distance,
+                  String description, int openNow, int minutesUntilOpen, int minutesUntilClosed,
+                  boolean hasPopularityHigherPriority)
+  */
+  g_descriptionConstructor =
+      jni::GetConstructorID(env, g_descriptionClass,
+                            "(Lapp/organicmaps/sdk/bookmarks/data/FeatureId;"
+                            "Ljava/lang/String;Ljava/lang/String;Lapp/organicmaps/sdk/util/Distance;"
+                            "Ljava/lang/String;IIIZ)V");
+
+  g_popularityClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/search/Popularity");
+  g_popularityConstructor = jni::GetConstructorID(env, g_popularityClass, "(I)V");
+
+  g_mapResultsMethod = jni::GetMethodID(env, g_javaListener, "onMapSearchResults",
+                                        "([Lapp/organicmaps/sdk/search/MapSearchListener$Result;JZ)V");
+  g_mapResultClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/search/MapSearchListener$Result");
+  g_mapResultCtor = jni::GetConstructorID(env, g_mapResultClass, "(Ljava/lang/String;Ljava/lang/String;)V");
+
+  g_updateBookmarksResultsId = jni::GetMethodID(env, g_javaListener, "onBookmarkSearchResultsUpdate", "([JJ)V");
+  g_endBookmarksResultsId = jni::GetMethodID(env, g_javaListener, "onBookmarkSearchResultsEnd", "([JJ)V");
+}
+
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_search_SearchEngine_nativeRunSearch(
+    JNIEnv * env, jclass clazz, jbyteArray bytes, jboolean isCategory, jstring lang, jlong timestamp,
+    jboolean hasPosition, jdouble lat, jdouble lon)
+{
+  search::EverywhereSearchParams params{jni::ToNativeString(env, bytes),
+                                        jni::ToNativeString(env, lang),
+                                        {},  // default timeout
+                                        static_cast<bool>(isCategory),
+                                        bind(&OnResults, _1, _2, timestamp, false, hasPosition, lat, lon)};
+  bool const searchStarted = g_framework->NativeFramework()->GetSearchAPI().SearchEverywhere(std::move(params));
+  if (searchStarted)
+    g_queryTimestamp = timestamp;
+  return searchStarted;
+}
+
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_search_SearchEngine_nativeRunInteractiveSearch(
+    JNIEnv * env, jclass clazz, jbyteArray bytes, jboolean isCategory, jstring lang, jlong timestamp,
+    jboolean isMapAndTable, jboolean hasPosition, jdouble lat, jdouble lon)
+{
+  search::ViewportSearchParams vparams{
+      jni::ToNativeString(env, bytes),
+      jni::ToNativeString(env, lang),
+      {},  // Default timeout
+      static_cast<bool>(isCategory),
+      {},  // Empty m_onStarted callback
+      {},  // Empty m_onCompleted callback
+  };
+
+  // TODO (@alexzatsepin): set up vparams.m_onCompleted here and use
+  // HotelsClassifier for hotel queries detection.
+  // Don't move vparams here, because it's used below.
+  g_framework->NativeFramework()->GetSearchAPI().SearchInViewport(vparams);
+
+  if (isMapAndTable)
   {
-    g_javaListener = env->NewGlobalRef(thiz);
-    // public void onResultsUpdate(@NonNull SearchResult[] results, long timestamp)
-    g_updateResultsId = jni::GetMethodID(env, g_javaListener, "onResultsUpdate",
-                                         "([Lapp/organicmaps/sdk/search/SearchResult;J)V");
-    // public void onResultsEnd(long timestamp)
-    g_endResultsId = jni::GetMethodID(env, g_javaListener, "onResultsEnd", "(J)V");
-    g_resultClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/search/SearchResult");
-    g_resultConstructor = jni::GetConstructorID(
-        env, g_resultClass,
-        "(Ljava/lang/String;Lapp/organicmaps/sdk/search/SearchResult$Description;DD[I[I"
-        "Lapp/organicmaps/sdk/search/Popularity;)V");
-    g_suggestConstructor = jni::GetConstructorID(env, g_resultClass, "(Ljava/lang/String;Ljava/lang/String;DD[I[I)V");
-    g_descriptionClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/search/SearchResult$Description");
-    /*
-        Description(FeatureId featureId, String featureType, String region, Distance distance,
-                    String description, int openNow, int minutesUntilOpen, int minutesUntilClosed,
-                    boolean hasPopularityHigherPriority)
-    */
-    g_descriptionConstructor = jni::GetConstructorID(env, g_descriptionClass,
-                                                     "(Lapp/organicmaps/sdk/bookmarks/data/FeatureId;"
-                                                     "Ljava/lang/String;Ljava/lang/String;Lapp/organicmaps/sdk/util/Distance;"
-                                                     "Ljava/lang/String;IIIZ)V");
+    search::EverywhereSearchParams eparams{std::move(vparams.m_query),
+                                           std::move(vparams.m_inputLocale),
+                                           {},  // default timeout
+                                           static_cast<bool>(isCategory),
+                                           bind(&OnResults, _1, _2, timestamp, isMapAndTable, hasPosition, lat, lon)};
 
-    g_popularityClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/search/Popularity");
-    g_popularityConstructor = jni::GetConstructorID(env, g_popularityClass, "(I)V");
-
-    g_mapResultsMethod = jni::GetMethodID(env, g_javaListener, "onMapSearchResults",
-                                          "([Lapp/organicmaps/sdk/search/MapSearchListener$Result;JZ)V");
-    g_mapResultClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/search/MapSearchListener$Result");
-    g_mapResultCtor = jni::GetConstructorID(env, g_mapResultClass, "(Ljava/lang/String;Ljava/lang/String;)V");
-
-    g_updateBookmarksResultsId =
-      jni::GetMethodID(env, g_javaListener, "onBookmarkSearchResultsUpdate", "([JJ)V");
-    g_endBookmarksResultsId =
-      jni::GetMethodID(env, g_javaListener, "onBookmarkSearchResultsEnd", "([JJ)V");
-  }
-
-  JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_search_SearchEngine_nativeRunSearch(
-      JNIEnv * env, jclass clazz, jbyteArray bytes, jboolean isCategory,
-      jstring lang, jlong timestamp, jboolean hasPosition, jdouble lat, jdouble lon)
-  {
-    search::EverywhereSearchParams params{
-        jni::ToNativeString(env, bytes),
-        jni::ToNativeString(env, lang),
-        {},   // default timeout
-        static_cast<bool>(isCategory),
-        bind(&OnResults, _1, _2, timestamp, false, hasPosition, lat, lon)
-    };
-    bool const searchStarted = g_framework->NativeFramework()->GetSearchAPI().SearchEverywhere(std::move(params));
-    if (searchStarted)
-      g_queryTimestamp = timestamp;
-    return searchStarted;
-  }
-
-  JNIEXPORT void JNICALL Java_app_organicmaps_sdk_search_SearchEngine_nativeRunInteractiveSearch(
-      JNIEnv * env, jclass clazz, jbyteArray bytes, jboolean isCategory,
-      jstring lang, jlong timestamp, jboolean isMapAndTable, jboolean hasPosition, jdouble lat, jdouble lon)
-  {
-    search::ViewportSearchParams vparams{
-        jni::ToNativeString(env, bytes),
-        jni::ToNativeString(env, lang),
-        {},  // Default timeout
-        static_cast<bool>(isCategory),
-        {},  // Empty m_onStarted callback
-        {},  // Empty m_onCompleted callback
-    };
-
-    // TODO (@alexzatsepin): set up vparams.m_onCompleted here and use
-    // HotelsClassifier for hotel queries detection.
-    // Don't move vparams here, because it's used below.
-    g_framework->NativeFramework()->GetSearchAPI().SearchInViewport(vparams);
-
-    if (isMapAndTable)
-    {
-      search::EverywhereSearchParams eparams{
-          std::move(vparams.m_query),
-          std::move(vparams.m_inputLocale),
-          {},   // default timeout
-          static_cast<bool>(isCategory),
-          bind(&OnResults, _1, _2, timestamp, isMapAndTable, hasPosition, lat, lon)
-      };
-
-      if (g_framework->NativeFramework()->GetSearchAPI().SearchEverywhere(std::move(eparams)))
-        g_queryTimestamp = timestamp;
-    }
-  }
-
-  JNIEXPORT void JNICALL Java_app_organicmaps_sdk_search_SearchEngine_nativeRunSearchMaps(
-      JNIEnv * env, jclass clazz, jbyteArray bytes, jstring lang, jlong timestamp)
-  {
-    storage::DownloaderSearchParams params{
-        jni::ToNativeString(env, bytes),
-        jni::ToNativeString(env, lang),
-        bind(&OnMapSearchResults, _1, timestamp)
-    };
-
-    if (g_framework->NativeFramework()->GetSearchAPI().SearchInDownloader(std::move(params)))
+    if (g_framework->NativeFramework()->GetSearchAPI().SearchEverywhere(std::move(eparams)))
       g_queryTimestamp = timestamp;
   }
+}
 
-  JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_search_SearchEngine_nativeRunSearchInBookmarks(
-      JNIEnv * env, jclass clazz, jbyteArray query, jlong catId, jlong timestamp)
-  {
-    search::BookmarksSearchParams params{
-        jni::ToNativeString(env, query),
-        static_cast<kml::MarkGroupId>(catId),
-        bind(&OnBookmarksSearchResults, _1, _2, timestamp)
-    };
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_search_SearchEngine_nativeRunSearchMaps(JNIEnv * env, jclass clazz,
+                                                                                        jbyteArray bytes, jstring lang,
+                                                                                        jlong timestamp)
+{
+  storage::DownloaderSearchParams params{jni::ToNativeString(env, bytes), jni::ToNativeString(env, lang),
+                                         bind(&OnMapSearchResults, _1, timestamp)};
 
-    bool const searchStarted = g_framework->NativeFramework()->GetSearchAPI().SearchInBookmarks(std::move(params));
-    if (searchStarted)
-      g_queryTimestamp = timestamp;
-    return searchStarted;
-  }
+  if (g_framework->NativeFramework()->GetSearchAPI().SearchInDownloader(std::move(params)))
+    g_queryTimestamp = timestamp;
+}
 
-  JNIEXPORT void JNICALL
-  Java_app_organicmaps_sdk_search_SearchEngine_nativeShowResult(JNIEnv * env, jclass clazz, jint index)
-  {
-    g_framework->NativeFramework()->ShowSearchResult(g_results[index]);
-  }
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_search_SearchEngine_nativeRunSearchInBookmarks(
+    JNIEnv * env, jclass clazz, jbyteArray query, jlong catId, jlong timestamp)
+{
+  search::BookmarksSearchParams params{jni::ToNativeString(env, query), static_cast<kml::MarkGroupId>(catId),
+                                       bind(&OnBookmarksSearchResults, _1, _2, timestamp)};
 
-  JNIEXPORT void JNICALL
-  Java_app_organicmaps_sdk_search_SearchEngine_nativeCancelInteractiveSearch(JNIEnv * env, jclass clazz)
-  {
-    g_framework->NativeFramework()->GetSearchAPI().CancelSearch(search::Mode::Viewport);
-  }
+  bool const searchStarted = g_framework->NativeFramework()->GetSearchAPI().SearchInBookmarks(std::move(params));
+  if (searchStarted)
+    g_queryTimestamp = timestamp;
+  return searchStarted;
+}
 
-  JNIEXPORT void JNICALL
-  Java_app_organicmaps_sdk_search_SearchEngine_nativeCancelEverywhereSearch(JNIEnv * env, jclass clazz)
-  {
-    g_framework->NativeFramework()->GetSearchAPI().CancelSearch(search::Mode::Everywhere);
-  }
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_search_SearchEngine_nativeShowResult(JNIEnv * env, jclass clazz,
+                                                                                     jint index)
+{
+  g_framework->NativeFramework()->ShowSearchResult(g_results[index]);
+}
 
-  JNIEXPORT void JNICALL
-  Java_app_organicmaps_sdk_search_SearchEngine_nativeCancelAllSearches(JNIEnv * env, jclass clazz)
-  {
-    g_framework->NativeFramework()->GetSearchAPI().CancelAllSearches();
-  }
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_search_SearchEngine_nativeCancelInteractiveSearch(JNIEnv * env,
+                                                                                                  jclass clazz)
+{
+  g_framework->NativeFramework()->GetSearchAPI().CancelSearch(search::Mode::Viewport);
+}
 
-  JNIEXPORT void JNICALL
-  Java_app_organicmaps_sdk_search_SearchEngine_nativeUpdateViewportWithLastResults(JNIEnv * env, jclass clazz)
-  {
-    g_framework->NativeFramework()->UpdateViewport(g_results);
-  }
-} // extern "C"
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_search_SearchEngine_nativeCancelEverywhereSearch(JNIEnv * env,
+                                                                                                 jclass clazz)
+{
+  g_framework->NativeFramework()->GetSearchAPI().CancelSearch(search::Mode::Everywhere);
+}
+
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_search_SearchEngine_nativeCancelAllSearches(JNIEnv * env, jclass clazz)
+{
+  g_framework->NativeFramework()->GetSearchAPI().CancelAllSearches();
+}
+
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_search_SearchEngine_nativeUpdateViewportWithLastResults(JNIEnv * env,
+                                                                                                        jclass clazz)
+{
+  g_framework->NativeFramework()->UpdateViewport(g_results);
+}
+}  // extern "C"
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/settings/MapLanguageCode.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/settings/MapLanguageCode.cpp
index f384c6cd7..c3ad1f7c5 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/settings/MapLanguageCode.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/settings/MapLanguageCode.cpp
@@ -6,14 +6,13 @@
 
 extern "C"
 {
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_settings_MapLanguageCode_setMapLanguageCode(JNIEnv * env, jobject, jstring languageCode)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_settings_MapLanguageCode_setMapLanguageCode(JNIEnv * env, jobject,
+                                                                                            jstring languageCode)
 {
   g_framework->SetMapLanguageCode(jni::ToNativeString(env, languageCode));
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_settings_MapLanguageCode_getMapLanguageCode(JNIEnv * env, jobject)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_settings_MapLanguageCode_getMapLanguageCode(JNIEnv * env, jobject)
 {
   return jni::ToJavaString(env, g_framework->GetMapLanguageCode());
 }
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/settings/UnitLocale.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/settings/UnitLocale.cpp
index 4c5dd801d..918dc8d67 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/settings/UnitLocale.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/settings/UnitLocale.cpp
@@ -5,19 +5,17 @@
 
 extern "C"
 {
-  JNIEXPORT void JNICALL
-  Java_app_organicmaps_sdk_settings_UnitLocale_setCurrentUnits(JNIEnv * env, jobject thiz, jint units)
-  {
-    measurement_utils::Units const u = static_cast<measurement_utils::Units>(units);
-    settings::Set(settings::kMeasurementUnits, u);
-    g_framework->SetupMeasurementSystem();
-  }
-
-  JNIEXPORT jint JNICALL
-  Java_app_organicmaps_sdk_settings_UnitLocale_getCurrentUnits(JNIEnv * env, jobject thiz)
-  {
-    measurement_utils::Units u;
-    return static_cast<jint>(
-        settings::Get(settings::kMeasurementUnits, u) ? u : measurement_utils::Units::Metric);
-  }
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_settings_UnitLocale_setCurrentUnits(JNIEnv * env, jobject thiz,
+                                                                                    jint units)
+{
+  measurement_utils::Units const u = static_cast<measurement_utils::Units>(units);
+  settings::Set(settings::kMeasurementUnits, u);
+  g_framework->SetupMeasurementSystem();
+}
+
+JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_settings_UnitLocale_getCurrentUnits(JNIEnv * env, jobject thiz)
+{
+  measurement_utils::Units u;
+  return static_cast<jint>(settings::Get(settings::kMeasurementUnits, u) ? u : measurement_utils::Units::Metric);
+}
 }
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/sound/tts.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/sound/tts.cpp
index a40287c90..5c77cfe22 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/sound/tts.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/sound/tts.cpp
@@ -7,32 +7,30 @@
 
 extern "C"
 {
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_sound_TtsPlayer_nativeEnableTurnNotifications(JNIEnv *, jclass, jboolean enable)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_sound_TtsPlayer_nativeEnableTurnNotifications(JNIEnv *, jclass,
+                                                                                              jboolean enable)
 {
   return frm()->GetRoutingManager().EnableTurnNotifications(static_cast<bool>(enable));
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_sound_TtsPlayer_nativeAreTurnNotificationsEnabled(JNIEnv *, jclass)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_sound_TtsPlayer_nativeAreTurnNotificationsEnabled(JNIEnv *, jclass)
 {
   return static_cast<jboolean>(frm()->GetRoutingManager().AreTurnNotificationsEnabled());
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_sound_TtsPlayer_nativeSetTurnNotificationsLocale(JNIEnv * env, jclass, jstring jLocale)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_sound_TtsPlayer_nativeSetTurnNotificationsLocale(JNIEnv * env, jclass,
+                                                                                                 jstring jLocale)
 {
   frm()->GetRoutingManager().SetTurnNotificationsLocale(jni::ToNativeString(env, jLocale));
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_sound_TtsPlayer_nativeGetTurnNotificationsLocale(JNIEnv * env, jclass)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_sound_TtsPlayer_nativeGetTurnNotificationsLocale(JNIEnv * env,
+                                                                                                    jclass)
 {
   return jni::ToJavaString(env, frm()->GetRoutingManager().GetTurnNotificationsLocale());
 }
 
-JNIEXPORT jobject JNICALL
-Java_app_organicmaps_sdk_sound_TtsPlayer_nativeGetSupportedLanguages(JNIEnv * env, jclass)
+JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_sound_TtsPlayer_nativeGetSupportedLanguages(JNIEnv * env, jclass)
 {
   auto const & supportedLanguages = routing::turns::sound::kLanguageList;
 
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/subway/SubwayManager.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/subway/SubwayManager.cpp
index fe70b9a58..cb79bc7b1 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/subway/SubwayManager.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/subway/SubwayManager.cpp
@@ -9,22 +9,21 @@ static void TransitSchemeStateChanged(TransitReadManager::TransitSchemeState sta
                                       std::shared_ptr<jobject> const & listener)
 {
   JNIEnv * env = jni::GetEnv();
-  env->CallVoidMethod(*listener,
-                      jni::GetMethodID(env, *listener, "onTransitStateChanged", "(I)V"),
+  env->CallVoidMethod(*listener, jni::GetMethodID(env, *listener, "onTransitStateChanged", "(I)V"),
                       static_cast<jint>(state));
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_maplayer_subway_SubwayManager_nativeAddListener(JNIEnv *env, jclass clazz, jobject listener)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_maplayer_subway_SubwayManager_nativeAddListener(JNIEnv * env,
+                                                                                                jclass clazz,
+                                                                                                jobject listener)
 {
   CHECK(g_framework, ("Framework isn't created yet!"));
-  g_framework->SetTransitSchemeListener(std::bind(&TransitSchemeStateChanged,
-                                                  std::placeholders::_1,
-                                                  jni::make_global_ref(listener)));
+  g_framework->SetTransitSchemeListener(
+      std::bind(&TransitSchemeStateChanged, std::placeholders::_1, jni::make_global_ref(listener)));
 }
 
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_maplayer_subway_SubwayManager_nativeRemoveListener(JNIEnv * env, jclass clazz)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_maplayer_subway_SubwayManager_nativeRemoveListener(JNIEnv * env,
+                                                                                                   jclass clazz)
 {
   CHECK(g_framework, ("Framework isn't created yet!"));
   g_framework->SetTransitSchemeListener(TransitReadManager::TransitStateChangedFn());
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/util/Config.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/util/Config.cpp
index 02a3b4e50..e9fba5f82 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/util/Config.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/util/Config.cpp
@@ -1,126 +1,122 @@
-#include "app/organicmaps/sdk/core/jni_helper.hpp"
 #include "app/organicmaps/sdk/Framework.hpp"
+#include "app/organicmaps/sdk/core/jni_helper.hpp"
 #include "platform/settings.hpp"
 
 extern "C"
 {
-  JNIEXPORT jboolean JNICALL
-  Java_app_organicmaps_sdk_util_Config_nativeHasConfigValue(JNIEnv * env, jclass thiz, jstring name)
-  {
-    std::string value;
-    return settings::Get(jni::ToNativeString(env, name), value);
-  }
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_util_Config_nativeHasConfigValue(JNIEnv * env, jclass thiz,
+                                                                                     jstring name)
+{
+  std::string value;
+  return settings::Get(jni::ToNativeString(env, name), value);
+}
 
-  JNIEXPORT void JNICALL
-  Java_app_organicmaps_sdk_util_Config_nativeDeleteConfigValue(JNIEnv * env, jclass thiz, jstring name)
-  {
-    settings::Delete(jni::ToNativeString(env, name));
-  }
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_util_Config_nativeDeleteConfigValue(JNIEnv * env, jclass thiz,
+                                                                                    jstring name)
+{
+  settings::Delete(jni::ToNativeString(env, name));
+}
 
-  JNIEXPORT jboolean JNICALL
-  Java_app_organicmaps_sdk_util_Config_nativeGetBoolean(JNIEnv * env, jclass thiz, jstring name, jboolean defaultVal)
-  {
-    bool val;
-    if (settings::Get(jni::ToNativeString(env, name), val))
-      return static_cast<jboolean>(val);
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_util_Config_nativeGetBoolean(JNIEnv * env, jclass thiz,
+                                                                                 jstring name, jboolean defaultVal)
+{
+  bool val;
+  if (settings::Get(jni::ToNativeString(env, name), val))
+    return static_cast<jboolean>(val);
 
-    return defaultVal;
-  }
+  return defaultVal;
+}
 
-  JNIEXPORT void JNICALL
-  Java_app_organicmaps_sdk_util_Config_nativeSetBoolean(JNIEnv * env, jclass thiz, jstring name, jboolean val)
-  {
-    (void)settings::Set(jni::ToNativeString(env, name), static_cast<bool>(val));
-  }
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_util_Config_nativeSetBoolean(JNIEnv * env, jclass thiz, jstring name,
+                                                                             jboolean val)
+{
+  (void)settings::Set(jni::ToNativeString(env, name), static_cast<bool>(val));
+}
 
-  JNIEXPORT jint JNICALL
-  Java_app_organicmaps_sdk_util_Config_nativeGetInt(JNIEnv * env, jclass thiz, jstring name, jint defaultValue)
-  {
-    int32_t value;
-    if (settings::Get(jni::ToNativeString(env, name), value))
-      return static_cast<jint>(value);
+JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_util_Config_nativeGetInt(JNIEnv * env, jclass thiz, jstring name,
+                                                                         jint defaultValue)
+{
+  int32_t value;
+  if (settings::Get(jni::ToNativeString(env, name), value))
+    return static_cast<jint>(value);
 
-    return defaultValue;
-  }
+  return defaultValue;
+}
 
-  JNIEXPORT void JNICALL
-  Java_app_organicmaps_sdk_util_Config_nativeSetInt(JNIEnv * env, jclass thiz, jstring name, jint value)
-  {
-    (void)settings::Set(jni::ToNativeString(env, name), static_cast<int32_t>(value));
-  }
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_util_Config_nativeSetInt(JNIEnv * env, jclass thiz, jstring name,
+                                                                         jint value)
+{
+  (void)settings::Set(jni::ToNativeString(env, name), static_cast<int32_t>(value));
+}
 
-  JNIEXPORT jlong JNICALL
-  Java_app_organicmaps_sdk_util_Config_nativeGetLong(JNIEnv * env, jclass thiz, jstring name, jlong defaultValue)
-  {
-    int64_t value;
-    if (settings::Get(jni::ToNativeString(env, name), value))
-      return static_cast<jlong>(value);
+JNIEXPORT jlong JNICALL Java_app_organicmaps_sdk_util_Config_nativeGetLong(JNIEnv * env, jclass thiz, jstring name,
+                                                                           jlong defaultValue)
+{
+  int64_t value;
+  if (settings::Get(jni::ToNativeString(env, name), value))
+    return static_cast<jlong>(value);
 
-    return defaultValue;
-  }
+  return defaultValue;
+}
 
-  JNIEXPORT void JNICALL
-  Java_app_organicmaps_sdk_util_Config_nativeSetLong(JNIEnv * env, jclass thiz, jstring name, jlong value)
-  {
-    (void)settings::Set(jni::ToNativeString(env, name), static_cast<int64_t>(value));
-  }
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_util_Config_nativeSetLong(JNIEnv * env, jclass thiz, jstring name,
+                                                                          jlong value)
+{
+  (void)settings::Set(jni::ToNativeString(env, name), static_cast<int64_t>(value));
+}
 
-  JNIEXPORT jdouble JNICALL
-  Java_app_organicmaps_sdk_util_Config_nativeGetDouble(JNIEnv * env, jclass thiz, jstring name, jdouble defaultValue)
-  {
-    double value;
-    if (settings::Get(jni::ToNativeString(env, name), value))
-      return static_cast<jdouble>(value);
+JNIEXPORT jdouble JNICALL Java_app_organicmaps_sdk_util_Config_nativeGetDouble(JNIEnv * env, jclass thiz, jstring name,
+                                                                               jdouble defaultValue)
+{
+  double value;
+  if (settings::Get(jni::ToNativeString(env, name), value))
+    return static_cast<jdouble>(value);
 
-    return defaultValue;
-  }
+  return defaultValue;
+}
 
-  JNIEXPORT void JNICALL
-  Java_app_organicmaps_sdk_util_Config_nativeSetDouble(JNIEnv * env, jclass thiz, jstring name, jdouble value)
-  {
-    (void)settings::Set(jni::ToNativeString(env, name), static_cast<double>(value));
-  }
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_util_Config_nativeSetDouble(JNIEnv * env, jclass thiz, jstring name,
+                                                                            jdouble value)
+{
+  (void)settings::Set(jni::ToNativeString(env, name), static_cast<double>(value));
+}
 
-  JNIEXPORT jstring JNICALL
-  Java_app_organicmaps_sdk_util_Config_nativeGetString(JNIEnv * env, jclass thiz, jstring name, jstring defaultValue)
-  {
-    std::string value;
-    if (settings::Get(jni::ToNativeString(env, name), value))
-      return jni::ToJavaString(env, value);
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_util_Config_nativeGetString(JNIEnv * env, jclass thiz, jstring name,
+                                                                               jstring defaultValue)
+{
+  std::string value;
+  if (settings::Get(jni::ToNativeString(env, name), value))
+    return jni::ToJavaString(env, value);
 
-    return defaultValue;
-  }
+  return defaultValue;
+}
 
-    JNIEXPORT void JNICALL
-    Java_app_organicmaps_sdk_util_Config_nativeSetString(JNIEnv * env, jclass thiz, jstring name, jstring value)
-    {
-      (void)settings::Set(jni::ToNativeString(env, name), jni::ToNativeString(env, value));
-    }
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_util_Config_nativeSetString(JNIEnv * env, jclass thiz, jstring name,
+                                                                            jstring value)
+{
+  (void)settings::Set(jni::ToNativeString(env, name), jni::ToNativeString(env, value));
+}
 
-    JNIEXPORT jboolean JNICALL
-    Java_app_organicmaps_sdk_util_Config_nativeGetLargeFontsSize(JNIEnv * env, jclass thiz)
-    {
-      return frm()->LoadLargeFontsSize();
-    }
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_util_Config_nativeGetLargeFontsSize(JNIEnv * env, jclass thiz)
+{
+  return frm()->LoadLargeFontsSize();
+}
 
-    JNIEXPORT void JNICALL
-    Java_app_organicmaps_sdk_util_Config_nativeSetLargeFontsSize(JNIEnv * env, jclass thiz,
-                                                            jboolean value)
-    {
-      frm()->SetLargeFontsSize(value);
-    }
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_util_Config_nativeSetLargeFontsSize(JNIEnv * env, jclass thiz,
+                                                                                    jboolean value)
+{
+  frm()->SetLargeFontsSize(value);
+}
 
-    JNIEXPORT jboolean JNICALL
-    Java_app_organicmaps_sdk_util_Config_nativeGetTransliteration(JNIEnv * env, jclass thiz)
-    {
-      return frm()->LoadTransliteration();
-    }
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_util_Config_nativeGetTransliteration(JNIEnv * env, jclass thiz)
+{
+  return frm()->LoadTransliteration();
+}
 
-    JNIEXPORT void JNICALL
-    Java_app_organicmaps_sdk_util_Config_nativeSetTransliteration(JNIEnv * env, jclass thiz,
-                                                             jboolean value)
-    {
-      frm()->SaveTransliteration(value);
-      frm()->AllowTransliteration(value);
-    }
-} // extern "C"
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_util_Config_nativeSetTransliteration(JNIEnv * env, jclass thiz,
+                                                                                     jboolean value)
+{
+  frm()->SaveTransliteration(value);
+  frm()->AllowTransliteration(value);
+}
+}  // extern "C"
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/util/Distance.hpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/util/Distance.hpp
index fbe8676a1..c6399b9f7 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/util/Distance.hpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/util/Distance.hpp
@@ -10,9 +10,9 @@ inline jobject ToJavaDistance(JNIEnv * env, platform::Distance const & distance)
 
   static jmethodID const distanceConstructor = jni::GetConstructorID(env, distanceClass, "(DLjava/lang/String;B)V");
 
-  jobject distanceObject = env->NewObject(
-      distanceClass, distanceConstructor,
-      distance.GetDistance(), jni::ToJavaString(env, distance.GetDistanceString()), static_cast<uint8_t>(distance.GetUnits()));
+  jobject distanceObject =
+      env->NewObject(distanceClass, distanceConstructor, distance.GetDistance(),
+                     jni::ToJavaString(env, distance.GetDistanceString()), static_cast<uint8_t>(distance.GetUnits()));
 
   return distanceObject;
 }
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/util/GeoUtils.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/util/GeoUtils.cpp
index bf8d03f36..3a3b3b1d8 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/util/GeoUtils.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/util/GeoUtils.cpp
@@ -4,9 +4,8 @@
 
 extern "C"
 {
-JNIEXPORT jobject JNICALL
-  Java_app_organicmaps_sdk_util_GeoUtils_nativeToLatLon(
-  JNIEnv * env, jobject thiz, jdouble mercX, jdouble mercY)
+JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_util_GeoUtils_nativeToLatLon(JNIEnv * env, jobject thiz,
+                                                                                jdouble mercX, jdouble mercY)
 {
   auto const mercPoint = m2::PointD(static_cast<double>(mercX), static_cast<double>(mercY));
   auto const latLon = mercator::ToLatLon(mercPoint);
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/util/HttpClient.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/util/HttpClient.cpp
index ca49c6354..8b22f3d0b 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/util/HttpClient.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/util/HttpClient.cpp
@@ -23,9 +23,9 @@ SOFTWARE.
 *******************************************************************************/
 #include <jni.h>
 
-#include "app/organicmaps/sdk/core/jni_helper.hpp"
 #include "app/organicmaps/sdk/core/ScopedEnv.hpp"
 #include "app/organicmaps/sdk/core/ScopedLocalRef.hpp"
+#include "app/organicmaps/sdk/core/jni_helper.hpp"
 
 #include "platform/http_client.hpp"
 
@@ -33,8 +33,8 @@ SOFTWARE.
 #include "base/exception.hpp"
 #include "base/logging.hpp"
 
-#include <string>
 #include <iterator>
+#include <string>
 #include <unordered_map>
 
 DECLARE_EXCEPTION(JniException, RootException);
@@ -51,8 +51,7 @@ void RethrowOnJniException(ScopedEnv & env)
   MYTHROW(JniException, ());
 }
 
-jfieldID GetHttpParamsFieldId(ScopedEnv & env, const char * name,
-                              const char * signature = "Ljava/lang/String;")
+jfieldID GetHttpParamsFieldId(ScopedEnv & env, char const * name, char const * signature = "Ljava/lang/String;")
 {
   return env->GetFieldID(g_httpParamsClazz, name, signature);
 }
@@ -85,8 +84,8 @@ void SetInt(ScopedEnv & env, jobject params, jfieldID const fieldId, int const v
 // Get string value from HttpClient.Params object, throws JniException.
 void GetString(ScopedEnv & env, jobject const params, jfieldID const fieldId, std::string & result)
 {
-  jni::ScopedLocalRef<jstring> const wrappedValue(
-      env.get(), static_cast<jstring>(env->GetObjectField(params, fieldId)));
+  jni::ScopedLocalRef<jstring> const wrappedValue(env.get(),
+                                                  static_cast<jstring>(env->GetObjectField(params, fieldId)));
   RethrowOnJniException(env);
   if (wrappedValue)
     result = jni::ToNativeString(env.get(), wrappedValue.get());
@@ -103,8 +102,8 @@ void SetHeaders(ScopedEnv & env, jobject const params, platform::HttpClient::Hea
   if (headers.empty())
     return;
 
-  static jmethodID const setHeaders = env->GetMethodID(
-      g_httpParamsClazz, "setHeaders", "([Lapp/organicmaps/sdk/util/KeyValue;)V");
+  static jmethodID const setHeaders =
+      env->GetMethodID(g_httpParamsClazz, "setHeaders", "([Lapp/organicmaps/sdk/util/KeyValue;)V");
 
   RethrowOnJniException(env);
 
@@ -115,8 +114,7 @@ void SetHeaders(ScopedEnv & env, jobject const params, platform::HttpClient::Hea
 
 void LoadHeaders(ScopedEnv & env, jobject const params, platform::HttpClient::Headers & headers)
 {
-  static jmethodID const getHeaders =
-      env->GetMethodID(g_httpParamsClazz, "getHeaders", "()[Ljava/lang/Object;");
+  static jmethodID const getHeaders = env->GetMethodID(g_httpParamsClazz, "getHeaders", "()[Ljava/lang/Object;");
 
   jni::ScopedLocalRef<jobjectArray> const headersArray(
       env.get(), static_cast<jobjectArray>(env->CallObjectMethod(params, getHeaders)));
@@ -134,16 +132,15 @@ class Ids
 public:
   explicit Ids(ScopedEnv & env)
   {
-    m_fieldIds =
-    {{"httpMethod", GetHttpParamsFieldId(env, "httpMethod")},
-    {"inputFilePath", GetHttpParamsFieldId(env, "inputFilePath")},
-    {"outputFilePath", GetHttpParamsFieldId(env, "outputFilePath")},
-    {"cookies", GetHttpParamsFieldId(env, "cookies")},
-    {"receivedUrl", GetHttpParamsFieldId(env, "receivedUrl")},
-    {"followRedirects", GetHttpParamsFieldId(env, "followRedirects", "Z")},
-    {"loadHeaders", GetHttpParamsFieldId(env, "loadHeaders", "Z")},
-    {"httpResponseCode", GetHttpParamsFieldId(env, "httpResponseCode", "I")},
-    {"timeoutMillisec", GetHttpParamsFieldId(env, "timeoutMillisec", "I")}};
+    m_fieldIds = {{"httpMethod", GetHttpParamsFieldId(env, "httpMethod")},
+                  {"inputFilePath", GetHttpParamsFieldId(env, "inputFilePath")},
+                  {"outputFilePath", GetHttpParamsFieldId(env, "outputFilePath")},
+                  {"cookies", GetHttpParamsFieldId(env, "cookies")},
+                  {"receivedUrl", GetHttpParamsFieldId(env, "receivedUrl")},
+                  {"followRedirects", GetHttpParamsFieldId(env, "followRedirects", "Z")},
+                  {"loadHeaders", GetHttpParamsFieldId(env, "loadHeaders", "Z")},
+                  {"httpResponseCode", GetHttpParamsFieldId(env, "httpResponseCode", "I")},
+                  {"timeoutMillisec", GetHttpParamsFieldId(env, "timeoutMillisec", "I")}};
   }
 
   jfieldID GetId(std::string const & fieldName) const
@@ -173,8 +170,7 @@ bool HttpClient::RunHttpRequest()
   static Ids ids(env);
 
   // Create and fill request params.
-  jni::ScopedLocalRef<jstring> const jniUrl(env.get(),
-                                            jni::ToJavaString(env.get(), m_urlRequested));
+  jni::ScopedLocalRef<jstring> const jniUrl(env.get(), jni::ToJavaString(env.get(), m_urlRequested));
   if (jni::HandleJavaException(env.get()))
     return false;
 
@@ -190,14 +186,14 @@ bool HttpClient::RunHttpRequest()
   static jfieldID const dataField = env->GetFieldID(g_httpParamsClazz, "data", "[B");
   if (!m_bodyData.empty())
   {
-    jni::ScopedLocalRef<jbyteArray> const jniPostData(
-        env.get(), env->NewByteArray(static_cast<jsize>(m_bodyData.size())));
+    jni::ScopedLocalRef<jbyteArray> const jniPostData(env.get(),
+                                                      env->NewByteArray(static_cast<jsize>(m_bodyData.size())));
 
     if (jni::HandleJavaException(env.get()))
       return false;
 
     env->SetByteArrayRegion(jniPostData.get(), 0, static_cast<jsize>(m_bodyData.size()),
-                            reinterpret_cast<const jbyte *>(m_bodyData.data()));
+                            reinterpret_cast<jbyte const *>(m_bodyData.data()));
     if (jni::HandleJavaException(env.get()))
       return false;
 
@@ -216,8 +212,7 @@ bool HttpClient::RunHttpRequest()
     SetString(env, httpParamsObject.get(), ids.GetId("cookies"), m_cookies);
     SetBoolean(env, httpParamsObject.get(), ids.GetId("followRedirects"), m_followRedirects);
     SetBoolean(env, httpParamsObject.get(), ids.GetId("loadHeaders"), m_loadHeaders);
-    SetInt(env, httpParamsObject.get(), ids.GetId("timeoutMillisec"),
-           static_cast<int>(m_timeoutSec * 1000));
+    SetInt(env, httpParamsObject.get(), ids.GetId("timeoutMillisec"), static_cast<int>(m_timeoutSec * 1000));
 
     SetHeaders(env, httpParamsObject.get(), m_headers);
   }
@@ -226,12 +221,12 @@ bool HttpClient::RunHttpRequest()
     return false;
   }
 
-  static jmethodID const httpClientClassRun =
-    env->GetStaticMethodID(g_httpClientClazz, "run",
-        "(Lapp/organicmaps/sdk/util/HttpClient$Params;)Lapp/organicmaps/sdk/util/HttpClient$Params;");
+  static jmethodID const httpClientClassRun = env->GetStaticMethodID(
+      g_httpClientClazz, "run",
+      "(Lapp/organicmaps/sdk/util/HttpClient$Params;)Lapp/organicmaps/sdk/util/HttpClient$Params;");
 
-  jni::ScopedLocalRef<jobject> const response(env.get(), env->CallStaticObjectMethod(g_httpClientClazz,
-                                              httpClientClassRun, httpParamsObject.get()));
+  jni::ScopedLocalRef<jobject> const response(
+      env.get(), env->CallStaticObjectMethod(g_httpClientClazz, httpClientClassRun, httpParamsObject.get()));
   if (jni::HandleJavaException(env.get()))
     return false;
 
@@ -247,8 +242,8 @@ bool HttpClient::RunHttpRequest()
   }
 
   // dataField is already cached above.
-  jni::ScopedLocalRef<jbyteArray> const jniData(
-      env.get(), static_cast<jbyteArray>(env->GetObjectField(response, dataField)));
+  jni::ScopedLocalRef<jbyteArray> const jniData(env.get(),
+                                                static_cast<jbyteArray>(env->GetObjectField(response, dataField)));
   if (jni::HandleJavaException(env.get()))
     return false;
   if (jniData)
@@ -256,7 +251,7 @@ bool HttpClient::RunHttpRequest()
     jbyte * buffer = env->GetByteArrayElements(jniData.get(), nullptr);
     if (buffer)
     {
-      m_serverResponse.assign(reinterpret_cast<const char *>(buffer), env->GetArrayLength(jniData.get()));
+      m_serverResponse.assign(reinterpret_cast<char const *>(buffer), env->GetArrayLength(jniData.get()));
       env->ReleaseByteArrayElements(jniData.get(), buffer, JNI_ABORT);
     }
   }
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/util/Language.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/util/Language.cpp
index 6b0bd0353..800ff30d2 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/util/Language.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/util/Language.cpp
@@ -3,8 +3,8 @@
 
 extern "C"
 {
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_util_Language_nativeNormalize(JNIEnv *env, jclass type, jstring lang)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_util_Language_nativeNormalize(JNIEnv * env, jclass type,
+                                                                                 jstring lang)
 {
   std::string locale = languages::Normalize(jni::ToNativeString(env, lang));
   return jni::ToJavaString(env, locale);
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/util/LogsManager.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/util/LogsManager.cpp
index 272c94eda..1f35552e8 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/util/LogsManager.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/util/LogsManager.cpp
@@ -1,10 +1,11 @@
 #include <jni.h>
 #include "app/organicmaps/sdk/core/logging.hpp"
 
-extern "C" {
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_util_log_LogsManager_nativeToggleCoreDebugLogs(
-    JNIEnv * /*env*/, jclass /*clazz*/, jboolean enabled)
+extern "C"
+{
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_util_log_LogsManager_nativeToggleCoreDebugLogs(JNIEnv * /*env*/,
+                                                                                               jclass /*clazz*/,
+                                                                                               jboolean enabled)
 {
   jni::ToggleDebugLogs(enabled);
 }
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/util/NetworkPolicy.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/util/NetworkPolicy.cpp
index 585bf6837..48aa184b7 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/util/NetworkPolicy.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/util/NetworkPolicy.cpp
@@ -4,15 +4,14 @@ namespace network_policy
 {
 bool GetNetworkPolicyStatus(JNIEnv * env, jobject obj)
 {
-  static jmethodID const networkPolicyCanUseMethod =
-      jni::GetMethodID(env, obj, "canUseNetwork", "()Z");
+  static jmethodID const networkPolicyCanUseMethod = jni::GetMethodID(env, obj, "canUseNetwork", "()Z");
   return env->CallBooleanMethod(obj, networkPolicyCanUseMethod);
 }
 
 bool GetCurrentNetworkUsageStatus(JNIEnv * env)
 {
   static jmethodID const method =
-    jni::GetStaticMethodID(env, g_networkPolicyClazz, "getCurrentNetworkUsageStatus", "()Z");
+      jni::GetStaticMethodID(env, g_networkPolicyClazz, "getCurrentNetworkUsageStatus", "()Z");
   return env->CallStaticBooleanMethod(g_networkPolicyClazz, method);
 }
 }  // namespace network_policy
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/util/NetworkPolicy.hpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/util/NetworkPolicy.hpp
index 8c6bed5d7..684a4bdf7 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/util/NetworkPolicy.hpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/util/NetworkPolicy.hpp
@@ -4,4 +4,4 @@ namespace network_policy
 {
 bool GetNetworkPolicyStatus(JNIEnv * env, jobject obj);
 bool GetCurrentNetworkUsageStatus(JNIEnv * env);
-}
+}  // namespace network_policy
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/util/StringUtils.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/util/StringUtils.cpp
index a72f9e2d2..56e5b7ff4 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/util/StringUtils.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/util/StringUtils.cpp
@@ -20,20 +20,21 @@ jobject MakeJavaPair(JNIEnv * env, std::string const & first, std::string const
 
 extern "C"
 {
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_util_StringUtils_nativeIsHtml(JNIEnv * env, jclass thiz, jstring text)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_util_StringUtils_nativeIsHtml(JNIEnv * env, jclass thiz,
+                                                                                  jstring text)
 {
   return strings::IsHTML(jni::ToNativeString(env, text));
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_util_StringUtils_nativeContainsNormalized(JNIEnv * env, jclass thiz, jstring str, jstring substr)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_util_StringUtils_nativeContainsNormalized(JNIEnv * env, jclass thiz,
+                                                                                              jstring str,
+                                                                                              jstring substr)
 {
   return search::ContainsNormalized(jni::ToNativeString(env, str), jni::ToNativeString(env, substr));
 }
 
-JNIEXPORT jobjectArray JNICALL
-Java_app_organicmaps_sdk_util_StringUtils_nativeFilterContainsNormalized(JNIEnv * env, jclass thiz, jobjectArray src, jstring jSubstr)
+JNIEXPORT jobjectArray JNICALL Java_app_organicmaps_sdk_util_StringUtils_nativeFilterContainsNormalized(
+    JNIEnv * env, jclass thiz, jobjectArray src, jstring jSubstr)
 {
   std::string const substr = jni::ToNativeString(env, jSubstr);
   int const length = env->GetArrayLength(src);
@@ -49,43 +50,42 @@ Java_app_organicmaps_sdk_util_StringUtils_nativeFilterContainsNormalized(JNIEnv
   return jni::ToJavaStringArray(env, filtered);
 }
 
-JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_util_StringUtils_nativeFormatSpeed(
-    JNIEnv * env, jclass thiz, jdouble metersPerSecond)
+JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_util_StringUtils_nativeFormatSpeed(JNIEnv * env, jclass thiz,
+                                                                                   jdouble metersPerSecond)
 {
   return measurement_utils::FormatSpeed(metersPerSecond, measurement_utils::GetMeasurementUnits());
 }
 
-JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_util_StringUtils_nativeFormatSpeedAndUnits(
-    JNIEnv * env, jclass thiz, jdouble metersPerSecond)
+JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_util_StringUtils_nativeFormatSpeedAndUnits(JNIEnv * env, jclass thiz,
+                                                                                              jdouble metersPerSecond)
 {
   auto const units = measurement_utils::GetMeasurementUnits();
   return MakeJavaPair(env, measurement_utils::FormatSpeedNumeric(metersPerSecond, units),
                       platform::GetLocalizedSpeedUnits(units));
 }
 
-JNIEXPORT jobject JNICALL
-Java_app_organicmaps_sdk_util_StringUtils_nativeFormatDistance(JNIEnv * env, jclass, jdouble distanceInMeters)
+JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_util_StringUtils_nativeFormatDistance(JNIEnv * env, jclass,
+                                                                                         jdouble distanceInMeters)
 {
   return ToJavaDistance(env, platform::Distance::CreateFormatted(distanceInMeters));
 }
 
-JNIEXPORT jobject JNICALL
-Java_app_organicmaps_sdk_util_StringUtils_nativeGetLocalizedDistanceUnits(JNIEnv * env, jclass)
+JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_util_StringUtils_nativeGetLocalizedDistanceUnits(JNIEnv * env,
+                                                                                                    jclass)
 {
   auto const localizedUnits = platform::GetLocalizedDistanceUnits();
   return MakeJavaPair(env, localizedUnits.m_high, localizedUnits.m_low);
 }
 
-JNIEXPORT jobject JNICALL
-Java_app_organicmaps_sdk_util_StringUtils_nativeGetLocalizedAltitudeUnits(JNIEnv * env, jclass)
+JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_util_StringUtils_nativeGetLocalizedAltitudeUnits(JNIEnv * env,
+                                                                                                    jclass)
 {
   auto const localizedUnits = platform::GetLocalizedAltitudeUnits();
   return MakeJavaPair(env, localizedUnits.m_high, localizedUnits.m_low);
 }
 
-JNIEXPORT jstring JNICALL
-Java_app_organicmaps_sdk_util_StringUtils_nativeGetLocalizedSpeedUnits(JNIEnv * env, jclass)
+JNIEXPORT jstring JNICALL Java_app_organicmaps_sdk_util_StringUtils_nativeGetLocalizedSpeedUnits(JNIEnv * env, jclass)
 {
   return jni::ToJavaString(env, platform::GetLocalizedSpeedUnits());
 }
-} // extern "C"
+}  // extern "C"
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/util/UiThread.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/util/UiThread.cpp
index a6c313620..0072910ed 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/util/UiThread.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/util/UiThread.cpp
@@ -4,8 +4,8 @@
 extern "C"
 {
 // static void nativeProcessTask(long taskPointer);
-JNIEXPORT void JNICALL
-Java_app_organicmaps_sdk_util_concurrency_UiThread_nativeProcessTask(JNIEnv * env, jclass clazz, jlong taskPointer)
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_util_concurrency_UiThread_nativeProcessTask(JNIEnv * env, jclass clazz,
+                                                                                            jlong taskPointer)
 {
   android::GuiThread::ProcessTask(taskPointer);
 }
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/vulkan/android_vulkan_context_factory.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/vulkan/android_vulkan_context_factory.cpp
index 07551d254..4f72a8595 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/vulkan/android_vulkan_context_factory.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/vulkan/android_vulkan_context_factory.cpp
@@ -43,8 +43,7 @@ void AndroidVulkanContextFactory::SetVulkanSurface()
   createInfo.window = m_nativeWindow;
 
   VkResult statusCode;
-  statusCode = vkCreateAndroidSurfaceKHR(m_vulkanInstance, &createInfo, nullptr,
-                                         &m_surface);
+  statusCode = vkCreateAndroidSurfaceKHR(m_vulkanInstance, &createInfo, nullptr, &m_surface);
   if (statusCode != VK_SUCCESS)
   {
     LOG_ERROR_VK_CALL(vkCreateAndroidSurfaceKHR, statusCode);
diff --git a/dev_sandbox/imgui_renderer.cpp b/dev_sandbox/imgui_renderer.cpp
index 689b2cb47..3d676f03e 100644
--- a/dev_sandbox/imgui_renderer.cpp
+++ b/dev_sandbox/imgui_renderer.cpp
@@ -12,8 +12,7 @@
 #include <cstring>
 #include <limits>
 
-ImguiRenderer::ImguiRenderer()
-  : m_state(df::CreateRenderState(gpu::Program::ImGui, df::DepthLayer::GuiLayer))
+ImguiRenderer::ImguiRenderer() : m_state(df::CreateRenderState(gpu::Program::ImGui, df::DepthLayer::GuiLayer))
 {
   m_state.SetDepthTestEnabled(false);
   m_state.SetBlending(dp::Blending(true));
@@ -91,21 +90,20 @@ void ImguiRenderer::Render(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Tex
 
   gpu::ImGuiProgramParams const params{.m_projection = m_projection};
   context->PushDebugLabel("ImGui Rendering");
-  m_mesh->Render(context, gpuProgram, m_state, programManager->GetParamsSetter(), params,
-                 [&, this]()
-                 {
-                   context->SetCullingEnabled(false);
-                   for (auto const & drawCall : dataBuffer.m_drawCalls)
-                   {
-                     uint32_t y = drawCall.clipRect.y;
-                     if (context->GetApiVersion() == dp::ApiVersion::OpenGLES3)
-                       y = dataBuffer.m_height - y - drawCall.clipRect.w;
-                     context->SetScissor(drawCall.clipRect.x, y, drawCall.clipRect.z, drawCall.clipRect.w);
-                     m_mesh->DrawPrimitivesSubsetIndexed(context, drawCall.indexCount, drawCall.startIndex);
-                   }
-                   context->SetCullingEnabled(true);
-                   context->SetScissor(0, 0, dataBuffer.m_width, dataBuffer.m_height);
-                 });
+  m_mesh->Render(context, gpuProgram, m_state, programManager->GetParamsSetter(), params, [&, this]()
+  {
+    context->SetCullingEnabled(false);
+    for (auto const & drawCall : dataBuffer.m_drawCalls)
+    {
+      uint32_t y = drawCall.clipRect.y;
+      if (context->GetApiVersion() == dp::ApiVersion::OpenGLES3)
+        y = dataBuffer.m_height - y - drawCall.clipRect.w;
+      context->SetScissor(drawCall.clipRect.x, y, drawCall.clipRect.z, drawCall.clipRect.w);
+      m_mesh->DrawPrimitivesSubsetIndexed(context, drawCall.indexCount, drawCall.startIndex);
+    }
+    context->SetCullingEnabled(true);
+    context->SetScissor(0, 0, dataBuffer.m_width, dataBuffer.m_height);
+  });
   context->PopDebugLabel();
 }
 
@@ -209,7 +207,7 @@ void ImguiRenderer::UpdateBuffers()
 
     for (int cmdIndex = 0; cmdIndex < cmdList->CmdBuffer.Size; ++cmdIndex)
     {
-      const ImDrawCmd cmd = cmdList->CmdBuffer[cmdIndex];
+      ImDrawCmd const cmd = cmdList->CmdBuffer[cmdIndex];
       ImVec2 clipMin((cmd.ClipRect.x - clipOff.x) * clipScale.x, (cmd.ClipRect.y - clipOff.y) * clipScale.y);
       ImVec2 clipMax((cmd.ClipRect.z - clipOff.x) * clipScale.x, (cmd.ClipRect.w - clipOff.y) * clipScale.y);
       if (clipMin.x < 0.0f)
diff --git a/dev_sandbox/imgui_renderer.hpp b/dev_sandbox/imgui_renderer.hpp
index 6e048c8e0..c68d70e27 100644
--- a/dev_sandbox/imgui_renderer.hpp
+++ b/dev_sandbox/imgui_renderer.hpp
@@ -18,8 +18,7 @@ class ImguiRenderer
 {
 public:
   ImguiRenderer();
-  void Render(ref_ptr<dp::GraphicsContext> context, 
-              ref_ptr<dp::TextureManager> textureManager,
+  void Render(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::TextureManager> textureManager,
               ref_ptr<gpu::ProgramManager> programManager);
   void Update(std::function<void()> const & uiCallback);
   void Reset();
diff --git a/dev_sandbox/main.cpp b/dev_sandbox/main.cpp
index e1ce599fb..ebeb0dbb2 100644
--- a/dev_sandbox/main.cpp
+++ b/dev_sandbox/main.cpp
@@ -7,9 +7,9 @@
 
 #include "coding/reader.hpp"
 
-#include "base/math.hpp"
 #include "base/logging.hpp"
 #include "base/macros.hpp"
+#include "base/math.hpp"
 
 #include "std/target_os.hpp"
 
@@ -81,7 +81,10 @@ bool ValidateLogAbortLevel(char const * flagname, std::string const & value)
 
 bool const g_logAbortLevelDummy = gflags::RegisterFlagValidator(&FLAGS_log_abort_level, &ValidateLogAbortLevel);
 
-void errorCallback(int error, char const * description) { LOG(LERROR, ("GLFW (", error, "):", description)); }
+void errorCallback(int error, char const * description)
+{
+  LOG(LERROR, ("GLFW (", error, "):", description));
+}
 
 struct WindowHandlers
 {
@@ -143,7 +146,7 @@ void FormatMapSize(uint64_t sizeInBytes, std::string & units, size_t & sizeToDow
 
 std::string_view GetMyPoisitionText(location::EMyPositionMode mode)
 {
-  switch(mode)
+  switch (mode)
   {
   case location::EMyPositionMode::PendingPosition: return "Pending";
   case location::EMyPositionMode::NotFollowNoPosition: return "No position";
@@ -157,9 +160,12 @@ std::string_view GetMyPoisitionText(location::EMyPositionMode mode)
 dp::ApiVersion GetApiVersion(char const * apiLabel)
 {
   std::string_view v(apiLabel);
-  if (v == "Metal") return dp::ApiVersion::Metal;
-  if (v == "Vulkan") return dp::ApiVersion::Vulkan;
-  if (v == "OpenGL") return  dp::ApiVersion::OpenGLES3;
+  if (v == "Metal")
+    return dp::ApiVersion::Metal;
+  if (v == "Vulkan")
+    return dp::ApiVersion::Vulkan;
+  if (v == "OpenGL")
+    return dp::ApiVersion::OpenGLES3;
   return dp::ApiVersion::Invalid;
 }
 
@@ -231,17 +237,14 @@ int main(int argc, char * argv[])
   // Init GLFW.
   glfwSetErrorCallback(errorCallback);
   if (!glfwInit())
-  {
     return -1;
-  }
   glfwWindowHint(GLFW_CLIENT_API, GLFW_NO_API);
 #if defined(OMIM_OS_WINDOWS)
   glfwWindowHint(GLFW_SCALE_TO_MONITOR, GLFW_TRUE);
 #endif
   auto monitor = glfwGetPrimaryMonitor();
   auto mode = glfwGetVideoMode(monitor);
-  GLFWwindow * window =
-      glfwCreateWindow(mode->width, mode->height, "Developer Render Sandbox", nullptr, nullptr);
+  GLFWwindow * window = glfwCreateWindow(mode->width, mode->height, "Developer Render Sandbox", nullptr, nullptr);
   int fbWidth = 0, fbHeight = 0;
   glfwGetFramebufferSize(window, &fbWidth, &fbHeight);
   float xs = 1.0f, ys = 1.0f;
@@ -277,16 +280,14 @@ int main(int argc, char * argv[])
       .m_visualScale = visualScale,
       .m_surfaceWidth = fbWidth,
       .m_surfaceHeight = fbHeight,
-      .m_renderInjectionHandler = [&](ref_ptr<dp::GraphicsContext> context,
-                                      ref_ptr<dp::TextureManager> textureManager,
-                                      ref_ptr<gpu::ProgramManager> programManager,
-                                      bool shutdown)
-      {
-        if (shutdown)
-          imguiRenderer.Reset();
-        else
-          imguiRenderer.Render(context, textureManager, programManager);
-      }};
+      .m_renderInjectionHandler = [&](ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::TextureManager> textureManager,
+                                      ref_ptr<gpu::ProgramManager> programManager, bool shutdown)
+  {
+    if (shutdown)
+      imguiRenderer.Reset();
+    else
+      imguiRenderer.Render(context, textureManager, programManager);
+  }};
   gui::Skin guiSkin(gui::ResolveGuiSkinFile("default"), visualScale);
   guiSkin.Resize(fbWidth, fbHeight);
   guiSkin.ForEach([&](gui::EWidget widget, gui::Position const & pos) { drapeParams.m_widgetsInitInfo[widget] = pos; });
@@ -301,7 +302,7 @@ int main(int argc, char * argv[])
     drapeParams.m_surfaceHeight = fbHeight;
     contextFactory = CreateContextFactory(window, drapeParams.m_apiVersion,
                                           m2::PointU(static_cast<uint32_t>(drapeParams.m_surfaceWidth),
-                                          static_cast<uint32_t>(drapeParams.m_surfaceHeight)));
+                                                     static_cast<uint32_t>(drapeParams.m_surfaceHeight)));
     auto params = drapeParams;
     framework.CreateDrapeEngine(make_ref(contextFactory), std::move(params));
     OnCreateDrapeEngine(window, version, make_ref(contextFactory));
@@ -360,10 +361,8 @@ int main(int argc, char * argv[])
       framework.OnSize(fbWidth, fbHeight);
     }
   };
-  glfwSetWindowContentScaleCallback(window, [](GLFWwindow *, float xscale, float yscale)
-  {
-    handlers.onContentScale(xscale, yscale);
-  });
+  glfwSetWindowContentScaleCallback(
+      window, [](GLFWwindow *, float xscale, float yscale) { handlers.onContentScale(xscale, yscale); });
 
   // Location handler
   std::optional<ms::LatLon> lastLatLon;
@@ -384,9 +383,7 @@ int main(int argc, char * argv[])
                             .m_horizontalAccuracy = 10,
                             .m_bearing = bearingEnabled ? bearing : -1.0f});
       if (bearingEnabled)
-      {
         framework.OnCompassUpdate(location::CompassInfo{.m_bearing = math::DegToRad(bearing)});
-      }
     }
   };
 
@@ -436,19 +433,17 @@ int main(int argc, char * argv[])
 
   framework.GetStorage().Subscribe(
       [&](storage::CountryId const & countryId)
-      {
-        // Storage also calls notifications for parents, but we are interested in leafs only.
-        if (framework.GetStorage().IsLeaf(countryId))
-          onCountryChanged(countryId);
-      },
-      [&](storage::CountryId const & countryId, downloader::Progress const & progress)
-      {
-        std::stringstream str;
-        str << "Downloading (" << countryId << ") " << (progress.m_bytesDownloaded * 100 / progress.m_bytesTotal)
-            << "%";
-        downloadStatusLabel = str.str();
-        framework.MakeFrameActive();
-      });
+  {
+    // Storage also calls notifications for parents, but we are interested in leafs only.
+    if (framework.GetStorage().IsLeaf(countryId))
+      onCountryChanged(countryId);
+  }, [&](storage::CountryId const & countryId, downloader::Progress const & progress)
+  {
+    std::stringstream str;
+    str << "Downloading (" << countryId << ") " << (progress.m_bytesDownloaded * 100 / progress.m_bytesTotal) << "%";
+    downloadStatusLabel = str.str();
+    framework.MakeFrameActive();
+  });
 
   // Handle mouse buttons.
   bool touchActive = false;
@@ -491,13 +486,12 @@ int main(int argc, char * argv[])
       touchMods = 0;
     }
   };
-  glfwSetMouseButtonCallback(window,
-                             [](GLFWwindow * wnd, int button, int action, int mods)
-                             {
-                               double x, y;
-                               glfwGetCursorPos(wnd, &x, &y);
-                               handlers.onMouseButton(x, y, button, action, mods);
-                             });
+  glfwSetMouseButtonCallback(window, [](GLFWwindow * wnd, int button, int action, int mods)
+  {
+    double x, y;
+    glfwGetCursorPos(wnd, &x, &y);
+    handlers.onMouseButton(x, y, button, action, mods);
+  });
 
   // Handle mouse moving.
   handlers.onMouseMove = [&](double x, double y)
@@ -509,19 +503,13 @@ int main(int argc, char * argv[])
       framework.MakeFrameActive();
 
     if (touchActive)
-    {
 #if defined(OMIM_OS_MAC)
       x *= visualScale;
-      y *= visualScale;
+    y *= visualScale;
 #endif
-      framework.TouchEvent(
-          GetTouchEvent(framework, x, y, touchMods, df::TouchEvent::TOUCH_MOVE));
-    }
+    framework.TouchEvent(GetTouchEvent(framework, x, y, touchMods, df::TouchEvent::TOUCH_MOVE));
   };
-  glfwSetCursorPosCallback(window, [](GLFWwindow *, double x, double y)
-  {
-    handlers.onMouseMove(x, y);
-  });
+  glfwSetCursorPosCallback(window, [](GLFWwindow *, double x, double y) { handlers.onMouseMove(x, y); });
 
   // Handle scroll.
   handlers.onScroll = [&](double x, double y, double xOffset, double yOffset)
@@ -543,20 +531,17 @@ int main(int argc, char * argv[])
     double const factor = yOffset * kSensitivity;
     framework.Scale(exp(factor), m2::PointD(x, y), false);
   };
-  glfwSetScrollCallback(window,
-                        [](GLFWwindow * wnd, double xoffset, double yoffset)
-                        {
-                          double x, y;
-                          glfwGetCursorPos(wnd, &x, &y);
-                          handlers.onScroll(x, y, xoffset, yoffset);
-                        });
+  glfwSetScrollCallback(window, [](GLFWwindow * wnd, double xoffset, double yoffset)
+  {
+    double x, y;
+    glfwGetCursorPos(wnd, &x, &y);
+    handlers.onScroll(x, y, xoffset, yoffset);
+  });
 
   // Keys.
   handlers.onKeyboardButton = [&](int key, int scancode, int action, int mods) {};
   glfwSetKeyCallback(window, [](GLFWwindow *, int key, int scancode, int action, int mods)
-  {
-    handlers.onKeyboardButton(key, scancode, action, mods);
-  });
+  { handlers.onKeyboardButton(key, scancode, action, mods); });
 
   // imGui UI
   bool enableDebugRectRendering = false;
@@ -569,12 +554,9 @@ int main(int argc, char * argv[])
     // Drape controls
     char const * apiLabels[] = {
 #if defined(OMIM_OS_MAC)
-      "Metal",
-      "Vulkan",
-      "OpenGL"
+        "Metal", "Vulkan", "OpenGL"
 #elif defined(OMIM_OS_LINUX)
-      "Vulkan",
-      "OpenGL"
+        "Vulkan", "OpenGL"
 #endif
     };
     static int currentAPI = 0;
@@ -656,7 +638,7 @@ int main(int argc, char * argv[])
 
     // Render imGui UI
     ImGui_ImplGlfw_NewFrame();
-    ImGuiIO& io = ImGui::GetIO();
+    ImGuiIO & io = ImGui::GetIO();
 #if defined(OMIM_OS_LINUX)
     // Apply correct visual scale on Linux
     // In glfw for Linux, window size and framebuffer size are the same,
diff --git a/dev_sandbox/main_linux.cpp b/dev_sandbox/main_linux.cpp
index 40dd14873..2cdaf897b 100644
--- a/dev_sandbox/main_linux.cpp
+++ b/dev_sandbox/main_linux.cpp
@@ -8,8 +8,8 @@
 #define GLFW_EXPOSE_NATIVE_X11
 #include <GLFW/glfw3native.h>
 
-#include <dlfcn.h>
 #include <X11/X.h>
+#include <dlfcn.h>
 
 #include <vulkan_wrapper.h>
 // Workaround for TestFunction::Always compilation issue:
@@ -80,23 +80,23 @@ public:
 
 // Based on: https://github.com/glfw/glfw/blob/master/src/glx_context.c
 #define GLX_CONTEXT_CORE_PROFILE_BIT_ARB 0x00000001
-#define GLX_CONTEXT_PROFILE_MASK_ARB 0x9126
-#define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091
-#define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092
-#define GLX_PBUFFER_HEIGHT 0x8040
-#define GLX_PBUFFER_WIDTH 0x8041
-#define GLX_DOUBLEBUFFER 5
-#define GLX_DRAWABLE_TYPE 0x8010
-#define GLX_RENDER_TYPE 0x8011
-#define GLX_WINDOW_BIT 0x00000001
-#define GLX_PBUFFER_BIT 0x00000004
-#define GLX_RGBA_BIT 0x00000001
-#define GLX_RED_SIZE 8
-#define GLX_GREEN_SIZE 9
-#define GLX_BLUE_SIZE 10
-#define GLX_ALPHA_SIZE 11
-#define GLX_DEPTH_SIZE 12
-#define GLX_STENCIL_SIZE 13
+#define GLX_CONTEXT_PROFILE_MASK_ARB     0x9126
+#define GLX_CONTEXT_MAJOR_VERSION_ARB    0x2091
+#define GLX_CONTEXT_MINOR_VERSION_ARB    0x2092
+#define GLX_PBUFFER_HEIGHT               0x8040
+#define GLX_PBUFFER_WIDTH                0x8041
+#define GLX_DOUBLEBUFFER                 5
+#define GLX_DRAWABLE_TYPE                0x8010
+#define GLX_RENDER_TYPE                  0x8011
+#define GLX_WINDOW_BIT                   0x00000001
+#define GLX_PBUFFER_BIT                  0x00000004
+#define GLX_RGBA_BIT                     0x00000001
+#define GLX_RED_SIZE                     8
+#define GLX_GREEN_SIZE                   9
+#define GLX_BLUE_SIZE                    10
+#define GLX_ALPHA_SIZE                   11
+#define GLX_DEPTH_SIZE                   12
+#define GLX_STENCIL_SIZE                 13
 
 typedef XID GLXDrawable;
 typedef struct __GLXcontext * GLXContext;
@@ -104,13 +104,13 @@ typedef XID GLXPbuffer;
 typedef struct __GLXFBConfig * GLXFBConfig;
 typedef void (*__GLXextproc)(void);
 
-typedef __GLXextproc (*PFNGLXGETPROCADDRESSPROC)(const GLubyte * procName);
+typedef __GLXextproc (*PFNGLXGETPROCADDRESSPROC)(GLubyte const * procName);
 
 typedef int (*PFNXFREE)(void *);
-typedef GLXFBConfig * (*PFNGLXCHOOSEFBCONFIGPROC)(Display *, int, const int *, int *);
-typedef GLXContext (*PFNGLXCREATECONTEXTATTRIBSARB)(Display *, GLXFBConfig, GLXContext, Bool, const int *);
+typedef GLXFBConfig * (*PFNGLXCHOOSEFBCONFIGPROC)(Display *, int, int const *, int *);
+typedef GLXContext (*PFNGLXCREATECONTEXTATTRIBSARB)(Display *, GLXFBConfig, GLXContext, Bool, int const *);
 typedef void (*PFNGLXDESTROYCONTEXT)(Display *, GLXContext);
-typedef GLXPbuffer (*PFNGLXCREATEPBUFFERPROC)(Display *, GLXFBConfig, const int *);
+typedef GLXPbuffer (*PFNGLXCREATEPBUFFERPROC)(Display *, GLXFBConfig, int const *);
 typedef void (*PFNGLXDESTROYPBUFFER)(Display *, GLXPbuffer);
 typedef Bool (*PFNGLXMAKECURRENTPROC)(Display *, GLXDrawable, GLXContext);
 typedef void (*PFNGLXSWAPBUFFERSPROC)(Display *, GLXDrawable);
@@ -129,9 +129,7 @@ struct GLXFunctions
     {
       m_module = dlopen(lib, RTLD_LAZY | RTLD_LOCAL);
       if (m_module)
-      {
         break;
-      }
     }
 
     CHECK(m_module != nullptr, ("Failed to initialize GLX"));
@@ -154,9 +152,7 @@ struct GLXFunctions
   ~GLXFunctions()
   {
     if (m_module)
-    {
       dlclose(m_module);
-    }
   }
 
   PFNXFREE XFree = nullptr;
@@ -201,30 +197,41 @@ class LinuxGLContext : public dp::OGLContext
 public:
   LinuxGLContext(GLXFunctions const & glx, Display * display, Window window, LinuxGLContext * contextToShareWith,
                  bool usePixelBuffer)
-    : m_glx(glx), m_display(display), m_window(window)
+    : m_glx(glx)
+    , m_display(display)
+    , m_window(window)
   {
-    int visualAttribs[] = {
-      GLX_DOUBLEBUFFER, True,
-      GLX_RENDER_TYPE, GLX_RGBA_BIT,
-      GLX_DRAWABLE_TYPE, (usePixelBuffer ? GLX_PBUFFER_BIT : GLX_WINDOW_BIT),
-      GLX_RED_SIZE, 8,
-      GLX_GREEN_SIZE, 8,
-      GLX_BLUE_SIZE, 8,
-      GLX_ALPHA_SIZE, 8,
-      GLX_DEPTH_SIZE, 24,
-      GLX_STENCIL_SIZE, 8,
-      None
-    };
-    int contextAttribs[] = {
-      GLX_CONTEXT_PROFILE_MASK_ARB, GLX_CONTEXT_CORE_PROFILE_BIT_ARB,
-      GLX_CONTEXT_MAJOR_VERSION_ARB, 4, 
-      GLX_CONTEXT_MINOR_VERSION_ARB, 1,
-      None};
+    int visualAttribs[] = {GLX_DOUBLEBUFFER,
+                           True,
+                           GLX_RENDER_TYPE,
+                           GLX_RGBA_BIT,
+                           GLX_DRAWABLE_TYPE,
+                           (usePixelBuffer ? GLX_PBUFFER_BIT : GLX_WINDOW_BIT),
+                           GLX_RED_SIZE,
+                           8,
+                           GLX_GREEN_SIZE,
+                           8,
+                           GLX_BLUE_SIZE,
+                           8,
+                           GLX_ALPHA_SIZE,
+                           8,
+                           GLX_DEPTH_SIZE,
+                           24,
+                           GLX_STENCIL_SIZE,
+                           8,
+                           None};
+    int contextAttribs[] = {GLX_CONTEXT_PROFILE_MASK_ARB,
+                            GLX_CONTEXT_CORE_PROFILE_BIT_ARB,
+                            GLX_CONTEXT_MAJOR_VERSION_ARB,
+                            4,
+                            GLX_CONTEXT_MINOR_VERSION_ARB,
+                            1,
+                            None};
     int fbcount = 0;
     if (GLXFBConfig * config = m_glx.glXChooseFBConfig(display, DefaultScreen(display), visualAttribs, &fbcount))
     {
-      m_context =
-          m_glx.glXCreateContextAttribsARB(display, config[0], contextToShareWith ? contextToShareWith->m_context : 0, True, contextAttribs);
+      m_context = m_glx.glXCreateContextAttribsARB(
+          display, config[0], contextToShareWith ? contextToShareWith->m_context : 0, True, contextAttribs);
       CHECK(m_context != nullptr, ("Failed to create GLX context"));
 
       if (usePixelBuffer)
@@ -368,9 +375,7 @@ drape_ptr<dp::GraphicsContextFactory> CreateContextFactory(GLFWwindow * window,
   }
 
   if (api == dp::ApiVersion::OpenGLES3)
-  {
     return make_unique_dp<LinuxContextFactory>(glfwGetX11Display(), glfwGetX11Window(window));
-  }
 
   ASSERT(false, ("API is not available yet"));
   return nullptr;
diff --git a/generator/address_enricher.cpp b/generator/address_enricher.cpp
index 4fdc59696..438ac270d 100644
--- a/generator/address_enricher.cpp
+++ b/generator/address_enricher.cpp
@@ -34,22 +34,19 @@ std::pair<uint64_t, uint64_t> AddressEnricher::RawEntryBase::GetHNRange() const
   if (f.m_type != Token::TYPE_NUMBER || t.m_type != Token::TYPE_NUMBER)
     return kInvalidRange;
 
-  return { ToUInt(f.m_value), ToUInt(t.m_value) };
+  return {ToUInt(f.m_value), ToUInt(t.m_value)};
 }
 
 std::string DebugPrint(AddressEnricher::Stats const & s)
 {
-  return
-    "{ m_noStreet = " + std::to_string(s.m_noStreet) +
-    "; m_existInterpol = " + std::to_string(s.m_existInterpol) +
-    "; m_existSingle = " + std::to_string(s.m_existSingle) +
-    "; m_enoughAddrs = " + std::to_string(s.m_enoughAddrs) +
-    "; m_addedSingle = " + std::to_string(s.m_addedSingle) +
-    "; m_addedBegEnd = " + std::to_string(s.m_addedBegEnd) +
-    "; m_addedInterpol = " + std::to_string(s.m_addedInterpol) + " }";
+  return "{ m_noStreet = " + std::to_string(s.m_noStreet) + "; m_existInterpol = " + std::to_string(s.m_existInterpol) +
+         "; m_existSingle = " + std::to_string(s.m_existSingle) +
+         "; m_enoughAddrs = " + std::to_string(s.m_enoughAddrs) +
+         "; m_addedSingle = " + std::to_string(s.m_addedSingle) +
+         "; m_addedBegEnd = " + std::to_string(s.m_addedBegEnd) +
+         "; m_addedInterpol = " + std::to_string(s.m_addedInterpol) + " }";
 }
 
-
 AddressEnricher::AddressEnricher()
 {
   auto const & cl = classif();
@@ -223,7 +220,7 @@ AddressEnricher::FoundT AddressEnricher::Match(Entry & e) const
   std::vector<m2::ParametrizedSegment<m2::PointD>> eSegs;
   eSegs.reserve(e.m_points.size() - 1);
   for (size_t i = 1; i < e.m_points.size(); ++i)
-    eSegs.emplace_back(e.m_points[i-1], e.m_points[i]);
+    eSegs.emplace_back(e.m_points[i - 1], e.m_points[i]);
 
   /// @todo Check nodes distance for now. Should make more honest algo.
   auto const isClose = [&e, &eSegs](feature::FeatureBuilder const & fb)
@@ -237,9 +234,7 @@ AddressEnricher::FoundT AddressEnricher::Match(Entry & e) const
 
       auto const ll = mercator::ToLatLon(p);
       auto const check = [&ll](m2::PointD const & p)
-      {
-        return ms::DistanceOnEarth(ll, mercator::ToLatLon(p)) < kDistanceThresholdM;
-      };
+      { return ms::DistanceOnEarth(ll, mercator::ToLatLon(p)) < kDistanceThresholdM; };
 
       if (!eSegs.empty())
       {
@@ -268,7 +263,7 @@ AddressEnricher::FoundT AddressEnricher::Match(Entry & e) const
 
     // First of all - compare street's name.
     strings::UniString fbStreetKey = search::GetNormalizedStreetName(params.GetStreet());
-    std::string streetName; // original street's name, valid if isStreet == true
+    std::string streetName;  // original street's name, valid if isStreet == true
     if (isStreet)
     {
       // Fancy object, highway=pedestrian with addr: https://www.openstreetmap.org/way/415336229
@@ -323,7 +318,7 @@ AddressEnricher::FoundT AddressEnricher::Match(Entry & e) const
       auto const & geom = fb.GetOuterGeometry();
       for (size_t i = 1; i < geom.size(); ++i)
       {
-        m2::ParametrizedSegment<m2::PointD> seg(geom[i-1], geom[i]);
+        m2::ParametrizedSegment<m2::PointD> seg(geom[i - 1], geom[i]);
         /// @todo Calculate e.m_points LL once?
         for (auto const & p : e.m_points)
           if (mercator::DistanceOnEarth(p, seg.ClosestPointTo(p)) < kDistanceThresholdM)
@@ -349,8 +344,8 @@ AddressEnricher::FoundT AddressEnricher::Match(Entry & e) const
         size_t const i = hnRange.find(':');
         CHECK(i != std::string::npos, (hnRange));
         uint64_t left, right;
-        CHECK(strings::to_uint(hnRange.substr(0, i), left) &&
-              strings::to_uint(hnRange.substr(i + 1), right), (hnRange));
+        CHECK(strings::to_uint(hnRange.substr(0, i), left) && strings::to_uint(hnRange.substr(i + 1), right),
+              (hnRange));
 
         res.interpol = !(left >= range.second || right <= range.first);
       }
@@ -360,4 +355,4 @@ AddressEnricher::FoundT AddressEnricher::Match(Entry & e) const
   return res;
 }
 
-} // namespace generator
+}  // namespace generator
diff --git a/generator/address_enricher.hpp b/generator/address_enricher.hpp
index 75d54537d..b8df2d8f3 100644
--- a/generator/address_enricher.hpp
+++ b/generator/address_enricher.hpp
@@ -32,7 +32,8 @@ public:
     std::pair<uint64_t, uint64_t> GetHNRange() const;
     /// @}
 
-    template <class TSink> void Save(TSink & sink) const
+    template <class TSink>
+    void Save(TSink & sink) const
     {
       rw::Write(sink, m_from);
       rw::Write(sink, m_to);
@@ -42,7 +43,8 @@ public:
       WriteToSink(sink, static_cast<uint8_t>(m_interpol));
     }
 
-    template <class TSource> void Load(TSource & src)
+    template <class TSource>
+    void Load(TSource & src)
     {
       rw::Read(src, m_from);
       rw::Read(src, m_to);
@@ -62,7 +64,7 @@ public:
 
   void AddSrc(feature::FeatureBuilder && fb);
 
-  using TFBCollectFn = std::function<void (feature::FeatureBuilder &&)>;
+  using TFBCollectFn = std::function<void(feature::FeatureBuilder &&)>;
   void ProcessRawEntries(std::string const & path, TFBCollectFn const & fn);
 
   // Public for tests.
@@ -99,4 +101,4 @@ private:
   std::map<feature::InterpolType, uint32_t> m_interpolType;
 };
 
-} // namespace generator
+}  // namespace generator
diff --git a/generator/address_parser/address_parser_tests/parser_tests.cpp b/generator/address_parser/address_parser_tests/parser_tests.cpp
index a2566a98c..d293151a7 100644
--- a/generator/address_parser/address_parser_tests/parser_tests.cpp
+++ b/generator/address_parser/address_parser_tests/parser_tests.cpp
@@ -25,7 +25,9 @@ UNIT_TEST(TigerParser_Smoke)
   TEST(tiger::ParseLine("9587;9619;all;;Platte;MO;64152;LINESTRING(-94.691917 39.210393,-94.692370 39.210351)", e), ());
 
   e = {};
-  TEST(tiger::ParseLine("698;600;all;Boston St;Berkeley;WV;25401;LINESTRING(-77.970484 39.464604,-77.970540 39.464630)", e), ());
+  TEST(tiger::ParseLine("698;600;all;Boston St;Berkeley;WV;25401;LINESTRING(-77.970484 39.464604,-77.970540 39.464630)",
+                        e),
+       ());
   TEST_EQUAL(e.m_from, "600", ());
   TEST_EQUAL(e.m_to, "698", ());
   TEST_EQUAL(e.m_street, "Boston St", ());
@@ -33,10 +35,14 @@ UNIT_TEST(TigerParser_Smoke)
   TEST_EQUAL(e.m_interpol, feature::InterpolType::Any, ());
   TEST_EQUAL(e.m_geom.size(), 1, ());
 
-  TEST(ms::LatLon((39.464604 + 39.464630) / 2.0, (-77.970484 -77.970540) / 2.0).EqualDxDy(e.m_geom.back(), kEpsLL), ());
+  TEST(ms::LatLon((39.464604 + 39.464630) / 2.0, (-77.970484 - 77.970540) / 2.0).EqualDxDy(e.m_geom.back(), kEpsLL),
+       ());
 
   e = {};
-  TEST(tiger::ParseLine("798;700;all;Boston St;Berkeley;WV;25401;LINESTRING(-77.968929 39.463906,-77.969118 39.463990,-77.969427 39.464129,-77.969946 39.464353,-77.970027 39.464389)", e), ());
+  TEST(tiger::ParseLine("798;700;all;Boston St;Berkeley;WV;25401;LINESTRING(-77.968929 39.463906,-77.969118 "
+                        "39.463990,-77.969427 39.464129,-77.969946 39.464353,-77.970027 39.464389)",
+                        e),
+       ());
   TEST_EQUAL(e.m_from, "700", ());
   TEST_EQUAL(e.m_to, "798", ());
   TEST_EQUAL(e.m_street, "Boston St", ());
@@ -47,7 +53,11 @@ UNIT_TEST(TigerParser_Smoke)
   TEST(ms::LatLon(39.463906, -77.968929).EqualDxDy(e.m_geom.back(), kEpsLL), ());
   TEST(ms::LatLon(39.464389, -77.970027).EqualDxDy(e.m_geom.front(), kEpsLL), ());
 
-  TEST(tiger::ParseLine("0;98;even;Austin Ln;Mifflin;PA;17044;LINESTRING(-77.634119 40.597239,-77.634200 40.597288,-77.634679 40.598169,-77.634835 40.598393,-77.635116 40.598738,-77.635518 40.599388,-77.635718 40.599719,-77.635833 40.599871,-77.635856 40.599920)", e), ());
+  TEST(tiger::ParseLine("0;98;even;Austin Ln;Mifflin;PA;17044;LINESTRING(-77.634119 40.597239,-77.634200 "
+                        "40.597288,-77.634679 40.598169,-77.634835 40.598393,-77.635116 40.598738,-77.635518 "
+                        "40.599388,-77.635718 40.599719,-77.635833 40.599871,-77.635856 40.599920)",
+                        e),
+       ());
   TEST_EQUAL(e.m_from, "0", ());
   TEST_EQUAL(e.m_to, "98", ());
 }
@@ -55,6 +65,7 @@ UNIT_TEST(TigerParser_Smoke)
 class TmpDir
 {
   std::string const m_path = "./addrs";
+
 public:
   std::string const & Get() const { return m_path; }
 
@@ -63,10 +74,7 @@ public:
     (void)Platform::RmDirRecursively(m_path);
     TEST(Platform::MkDirChecked(m_path), ());
   }
-  ~TmpDir()
-  {
-    TEST(Platform::RmDirRecursively(m_path), ());
-  }
+  ~TmpDir() { TEST(Platform::RmDirRecursively(m_path), ()); }
 };
 
 UNIT_TEST(Processor_Smoke)
@@ -160,7 +168,9 @@ UNIT_CLASS_TEST(TestFixture, Generator_Smoke)
 {
   std::stringstream ss;
   ss << "698;600;all;Boston St;Berkeley;WV;25401;LINESTRING(-77.970484 39.464604,-77.970540 39.464630)" << "\n"
-     << "798;700;all;Boston St;Berkeley;WV;25401;LINESTRING(-77.968929 39.463906,-77.969118 39.463990,-77.969427 39.464129,-77.969946 39.464353,-77.970027 39.464389)" << "\n";
+     << "798;700;all;Boston St;Berkeley;WV;25401;LINESTRING(-77.968929 39.463906,-77.969118 39.463990,-77.969427 "
+        "39.464129,-77.969946 39.464353,-77.970027 39.464389)"
+     << "\n";
 
   Parse(ss);
 
@@ -170,7 +180,8 @@ UNIT_CLASS_TEST(TestFixture, Generator_Smoke)
 UNIT_CLASS_TEST(TestFixture, Generator_Filter_SF1)
 {
   std::stringstream ss;
-  ss << "601;699;all;Francisco St;San Francisco;CA;94133;LINESTRING(-122.416189 37.804256,-122.416526 37.804215)" << "\n";
+  ss << "601;699;all;Francisco St;San Francisco;CA;94133;LINESTRING(-122.416189 37.804256,-122.416526 37.804215)"
+     << "\n";
 
   Parse(ss);
 
@@ -190,8 +201,10 @@ UNIT_CLASS_TEST(TestFixture, Generator_Filter_NY)
 UNIT_CLASS_TEST(TestFixture, Generator_Filter_SF2)
 {
   std::stringstream ss;
-  ss << "744;752;all;Francisco St;San Francisco;CA;94133;LINESTRING(-122.417593 37.804248,-122.417686 37.804236)" << "\n"
-     << "754;798;even;Francisco St;San Francisco;CA;94133;LINESTRING(-122.417933 37.804205,-122.418204 37.804171)" << "\n";
+  ss << "744;752;all;Francisco St;San Francisco;CA;94133;LINESTRING(-122.417593 37.804248,-122.417686 37.804236)"
+     << "\n"
+     << "754;798;even;Francisco St;San Francisco;CA;94133;LINESTRING(-122.417933 37.804205,-122.418204 37.804171)"
+     << "\n";
 
   Parse(ss);
 
@@ -201,8 +214,12 @@ UNIT_CLASS_TEST(TestFixture, Generator_Filter_SF2)
 UNIT_CLASS_TEST(TestFixture, Generator_Street_Name)
 {
   std::stringstream ss;
-  ss << "599;501;odd;Seventh St;Marshall;MN;56757;LINESTRING(-96.878165 48.451707,-96.878047 48.451722,-96.877150 48.451844,-96.877034 48.451860)" << "\n"
-     << "598;500;even;Seventh St;Marshall;MN;56757;LINESTRING(-96.878214 48.451868,-96.878097 48.451884,-96.877200 48.452006,-96.877084 48.452022)" << "\n";
+  ss << "599;501;odd;Seventh St;Marshall;MN;56757;LINESTRING(-96.878165 48.451707,-96.878047 48.451722,-96.877150 "
+        "48.451844,-96.877034 48.451860)"
+     << "\n"
+     << "598;500;even;Seventh St;Marshall;MN;56757;LINESTRING(-96.878214 48.451868,-96.878097 48.451884,-96.877200 "
+        "48.452006,-96.877084 48.452022)"
+     << "\n";
 
   Parse(ss);
 
@@ -240,4 +257,4 @@ UNIT_CLASS_TEST(TestFixture, Generator_Street_Name)
   TEST_EQUAL(count, 2, ());
 }
 
-} // namespace addr_parser_tests
+}  // namespace addr_parser_tests
diff --git a/generator/address_parser/parser_tool.cpp b/generator/address_parser/parser_tool.cpp
index 2b91daff5..073284f0e 100644
--- a/generator/address_parser/parser_tool.cpp
+++ b/generator/address_parser/parser_tool.cpp
@@ -8,16 +8,15 @@
 
 #include <iostream>
 
-
 DEFINE_string(data_path, "./data", "Data path with 'borders' folder inside");
 DEFINE_string(output_path, "", "Output files path");
 DEFINE_uint64(threads_count, 0, "Desired number of threads. 0 - number of threads is set automatically");
 
-
 MAIN_WITH_ERROR_HANDLING([](int argc, char ** argv)
 {
   std::string usage("Tiger addresses processor. Sample usage:\n");
-  gflags::SetUsageMessage(usage + "tar -xOzf tiger-nominatim-preprocessed-latest.csv.tar.gz | " + argv[0] + " --output_path=... ");
+  gflags::SetUsageMessage(usage + "tar -xOzf tiger-nominatim-preprocessed-latest.csv.tar.gz | " + argv[0] +
+                          " --output_path=... ");
 
   gflags::ParseCommandLineFlags(&argc, &argv, true);
 
diff --git a/generator/address_parser/processor.cpp b/generator/address_parser/processor.cpp
index b3c3a1b2d..230761c01 100644
--- a/generator/address_parser/processor.cpp
+++ b/generator/address_parser/processor.cpp
@@ -10,7 +10,6 @@
 
 #include "defines.hpp"
 
-
 namespace addr_generator
 {
 
@@ -18,8 +17,7 @@ Processor::Processor(std::string const & dataPath, std::string const & outputPat
   : m_affiliation(dataPath, true /* haveBordersForWholeWorld */)
   , m_workers(numThreads)
   , m_outputPath(outputPath)
-{
-}
+{}
 
 FileWriter & Processor::GetWriter(std::string const & country)
 {
@@ -90,4 +88,4 @@ void Processor::Run(std::istream & is)
   LOG(LINFO, ("Total entries:", total, "Incomplete:", incomplete));
 }
 
-} // namespace addr_generator
+}  // namespace addr_generator
diff --git a/generator/address_parser/processor.hpp b/generator/address_parser/processor.hpp
index db9b1e687..920937db2 100644
--- a/generator/address_parser/processor.hpp
+++ b/generator/address_parser/processor.hpp
@@ -29,4 +29,4 @@ public:
   void Run(std::istream & is);
 };
 
-} // namespace addr_generator
+}  // namespace addr_generator
diff --git a/generator/address_parser/tiger_parser.cpp b/generator/address_parser/tiger_parser.cpp
index 2a5dbbfbf..aefa9cbbd 100644
--- a/generator/address_parser/tiger_parser.cpp
+++ b/generator/address_parser/tiger_parser.cpp
@@ -30,7 +30,7 @@ void ParseGeometry(std::string_view s, std::vector<ms::LatLon> & geom)
     CHECK(i != std::string_view::npos, (s));
 
     CHECK(to_double(s.substr(0, i), last.m_lon), (s));
-    CHECK(to_double(s.substr(i+1), last.m_lat), (s));
+    CHECK(to_double(s.substr(i + 1), last.m_lat), (s));
 
     if (!skipPoint())
       geom.push_back(last);
@@ -42,7 +42,7 @@ void ParseGeometry(std::string_view s, std::vector<ms::LatLon> & geom)
     if (geom.size() == 1)
     {
       // Set one middle point address.
-      back = ms::LatLon{ (back.m_lat + last.m_lat) / 2.0, (back.m_lon + last.m_lon) / 2.0 };
+      back = ms::LatLon{(back.m_lat + last.m_lat) / 2.0, (back.m_lon + last.m_lon) / 2.0};
     }
     else
     {
@@ -71,15 +71,21 @@ bool ParseLine(std::string_view line, AddressEntry & e)
   if (std::count(line.begin(), line.end(), ';') != 7)
     return false;
 
-  TokenizeIterator<SimpleDelimiter, std::string_view::const_iterator, true /* KeepEmptyTokens */> it(
-      line.begin(), line.end(), ";");
+  TokenizeIterator<SimpleDelimiter, std::string_view::const_iterator, true /* KeepEmptyTokens */> it(line.begin(),
+                                                                                                     line.end(), ";");
 
-  e.m_from = *it; ++it;
-  e.m_to = *it; ++it;
-  e.m_interpol = ParseInterpolation(*it); ++it;
-  e.m_street = *it; ++it;
-  ++it; ++it;
-  e.m_postcode = *it; ++it;
+  e.m_from = *it;
+  ++it;
+  e.m_to = *it;
+  ++it;
+  e.m_interpol = ParseInterpolation(*it);
+  ++it;
+  e.m_street = *it;
+  ++it;
+  ++it;
+  ++it;
+  e.m_postcode = *it;
+  ++it;
   ParseGeometry(*it, e.m_geom);
 
   if (e.m_interpol == feature::InterpolType::None || e.m_geom.empty())
@@ -99,7 +105,7 @@ bool ParseLine(std::string_view line, AddressEntry & e)
   return true;
 }
 
-} // namespace tiger
+}  // namespace tiger
 
 namespace feature
 {
@@ -114,4 +120,4 @@ std::string DebugPrint(InterpolType type)
   }
   UNREACHABLE();
 }
-} // namespace feature
+}  // namespace feature
diff --git a/generator/address_parser/tiger_parser.hpp b/generator/address_parser/tiger_parser.hpp
index 05ced61c4..2dfb2682c 100644
--- a/generator/address_parser/tiger_parser.hpp
+++ b/generator/address_parser/tiger_parser.hpp
@@ -18,9 +18,9 @@ struct AddressEntry : public generator::AddressEnricher::RawEntryBase
 void ParseGeometry(std::string_view s, std::vector<ms::LatLon> & geom);
 feature::InterpolType ParseInterpolation(std::string_view s);
 bool ParseLine(std::string_view line, AddressEntry & e);
-} // namespace tiger
+}  // namespace tiger
 
 namespace feature
 {
 std::string DebugPrint(InterpolType type);
-} // namespace feature
+}  // namespace feature
diff --git a/generator/addresses_collector.cpp b/generator/addresses_collector.cpp
index ed3281674..6355278e9 100644
--- a/generator/addresses_collector.cpp
+++ b/generator/addresses_collector.cpp
@@ -24,7 +24,7 @@ uint64_t GetOsmID(FeatureBuilder const & fb)
 AddressesHolder::AddressInfo FromFB(FeatureBuilder const & fb)
 {
   auto const & params = fb.GetParams();
-  return { params.house.Get(), std::string(params.GetStreet()), std::string(params.GetPostcode()), {} };
+  return {params.house.Get(), std::string(params.GetStreet()), std::string(params.GetPostcode()), {}};
 }
 
 // Current stats:
@@ -35,8 +35,7 @@ void LogWarning(std::string const & msg, uint64_t id)
 {
   LOG(LWARNING, ("addr:interpolation: " + msg, id));
 }
-} // namespace
-
+}  // namespace
 
 std::string AddressesHolder::AddressInfo::FormatRange() const
 {
@@ -81,7 +80,6 @@ std::string AddressesHolder::AddressInfo::FormatRange() const
   }
 }
 
-
 void AddressesHolder::Add(FeatureBuilder const & fb)
 {
   CHECK(fb.IsPoint(), ());
@@ -160,11 +158,7 @@ void AddressesHolder::Deserialize(std::string const & filePath)
   }
 }
 
-
-AddressesCollector::AddressesCollector(std::string const & filename)
-  : CollectorInterface(filename)
-{
-}
+AddressesCollector::AddressesCollector(std::string const & filename) : CollectorInterface(filename) {}
 
 std::shared_ptr<CollectorInterface> AddressesCollector::Clone(IDRInterfacePtr const & cache) const
 {
@@ -231,4 +225,4 @@ void AddressesCollector::MergeInto(AddressesCollector & collector) const
     collector.m_interpolWays.emplace(e.first, e.second);
 }
 
-} // namespace generator
+}  // namespace generator
diff --git a/generator/addresses_collector.hpp b/generator/addresses_collector.hpp
index 5e877ed50..1e4ee3e36 100644
--- a/generator/addresses_collector.hpp
+++ b/generator/addresses_collector.hpp
@@ -12,7 +12,7 @@ public:
   struct AddressInfo
   {
     std::string m_house, m_street, m_postcode;
-    std::string m_house2;   // end point house number for the 2nd stage
+    std::string m_house2;  // end point house number for the 2nd stage
 
     std::string FormatRange() const;
   };
@@ -64,4 +64,4 @@ public:
   void MergeInto(AddressesCollector & collector) const;
 };
 
-} // namespace generator
+}  // namespace generator
diff --git a/generator/affiliation.cpp b/generator/affiliation.cpp
index 423112e91..2ed1bca47 100644
--- a/generator/affiliation.cpp
+++ b/generator/affiliation.cpp
@@ -9,10 +9,9 @@
 
 #include <functional>
 
-#include "std/boost_geometry.hpp"
-#include <boost/geometry/geometries/register/ring.hpp>
 #include <boost/geometry/geometries/register/point.hpp>
-
+#include <boost/geometry/geometries/register/ring.hpp>
+#include "std/boost_geometry.hpp"
 
 BOOST_GEOMETRY_REGISTER_POINT_2D(m2::PointD, double, boost::geometry::cs::cartesian, x, y)
 BOOST_GEOMETRY_REGISTER_RING(std::vector<m2::PointD>)
@@ -34,16 +33,16 @@ template <typename T>
 m2::RectD GetLimitRect(T && t)
 {
   using Type = RemoveCvrefT<T>;
-  if constexpr(std::is_same_v<Type, FeatureBuilder>)
+  if constexpr (std::is_same_v<Type, FeatureBuilder>)
     return t.GetLimitRect();
-  if constexpr(std::is_same_v<Type, std::vector<m2::PointD>>)
+  if constexpr (std::is_same_v<Type, std::vector<m2::PointD>>)
   {
     m2::RectD r;
     for (auto const & p : t)
       r.Add(p);
     return r;
   }
-  if constexpr(std::is_same_v<Type, m2::PointD>)
+  if constexpr (std::is_same_v<Type, m2::PointD>)
     return m2::RectD(t, t);
 
   UNREACHABLE();
@@ -53,11 +52,11 @@ template <typename T, typename F>
 bool ForAnyPoint(T && t, F && f)
 {
   using Type = RemoveCvrefT<T>;
-  if constexpr(std::is_same_v<Type, FeatureBuilder>)
+  if constexpr (std::is_same_v<Type, FeatureBuilder>)
     return t.ForAnyPoint(f);
-  if constexpr(std::is_same_v<Type, std::vector<m2::PointD>>)
+  if constexpr (std::is_same_v<Type, std::vector<m2::PointD>>)
     return base::AnyOf(t, f);
-  if constexpr(std::is_same_v<Type, m2::PointD>)
+  if constexpr (std::is_same_v<Type, m2::PointD>)
     return f(t);
 
   UNREACHABLE();
@@ -67,9 +66,9 @@ template <typename T, typename F>
 void ForEachPoint(T && t, F && f)
 {
   using Type = RemoveCvrefT<T>;
-  if constexpr(std::is_same_v<Type, FeatureBuilder>)
+  if constexpr (std::is_same_v<Type, FeatureBuilder>)
     t.ForEachPoint(std::forward<F>(f));
-  else if constexpr(std::is_same_v<Type, m2::PointD>)
+  else if constexpr (std::is_same_v<Type, m2::PointD>)
     f(std::forward<T>(t));
   else
     UNREACHABLE();
@@ -77,16 +76,13 @@ void ForEachPoint(T && t, F && f)
 
 // An implementation for CountriesFilesAffiliation class.
 template <typename T>
-std::vector<std::string> GetAffiliations(T const & t,
-                                         borders::CountryPolygonsCollection const & countryPolygonsTree,
+std::vector<std::string> GetAffiliations(T const & t, borders::CountryPolygonsCollection const & countryPolygonsTree,
                                          bool haveBordersForWholeWorld)
 {
   std::vector<std::string> countries;
   std::vector<std::reference_wrapper<borders::CountryPolygons const>> countriesContainer;
-  countryPolygonsTree.ForEachCountryInRect(GetLimitRect(t), [&](auto const & countryPolygons)
-  {
-    countriesContainer.emplace_back(countryPolygons);
-  });
+  countryPolygonsTree.ForEachCountryInRect(
+      GetLimitRect(t), [&](auto const & countryPolygons) { countriesContainer.emplace_back(countryPolygons); });
 
   // todo(m.andrianov): We need to explore this optimization better. There is a hypothesis: some
   // elements belong to a rectangle, but do not belong to the exact boundary.
@@ -99,10 +95,7 @@ std::vector<std::string> GetAffiliations(T const & t,
 
   for (borders::CountryPolygons const & countryPolygons : countriesContainer)
   {
-    auto const need = ForAnyPoint(t, [&](auto const & point)
-    {
-      return countryPolygons.Contains(point);
-    });
+    auto const need = ForAnyPoint(t, [&](auto const & point) { return countryPolygons.Contains(point); });
 
     if (need)
       countries.emplace_back(countryPolygons.GetName());
@@ -119,23 +112,19 @@ CountriesFilesIndexAffiliation::Box MakeBox(m2::RectD const & rect)
   return {rect.LeftBottom(), rect.RightTop()};
 }
 
-std::optional<std::string> IsOneCountryForLimitRect(m2::RectD const & limitRect,
-                                                    IndexSharedPtr const & index)
+std::optional<std::string> IsOneCountryForLimitRect(m2::RectD const & limitRect, IndexSharedPtr const & index)
 {
   borders::CountryPolygons const * country = nullptr;
   std::vector<CountriesFilesIndexAffiliation::Value> values;
   auto const bbox = MakeBox(limitRect);
-  boost::geometry::index::query(*index, boost::geometry::index::covers(bbox),
-                                std::back_inserter(values));
+  boost::geometry::index::query(*index, boost::geometry::index::covers(bbox), std::back_inserter(values));
   for (auto const & v : values)
   {
     for (borders::CountryPolygons const & c : v.second)
-    {
       if (!country)
         country = &c;
       else if (country != &c)
         return {};
-    }
   }
   return country ? country->GetName() : std::optional<std::string>{};
 }
@@ -145,10 +134,10 @@ std::vector<std::string> GetHonestAffiliations(T && t, IndexSharedPtr const & in
 {
   std::vector<std::string> affiliations;
   std::unordered_set<borders::CountryPolygons const *> countires;
-  ForEachPoint(t, [&](auto const & point) {
+  ForEachPoint(t, [&](auto const & point)
+  {
     std::vector<CountriesFilesIndexAffiliation::Value> values;
-    boost::geometry::index::query(*index, boost::geometry::index::covers(point),
-                                  std::back_inserter(values));
+    boost::geometry::index::query(*index, boost::geometry::index::covers(point), std::back_inserter(values));
     for (auto const & v : values)
     {
       if (v.second.size() == 1)
@@ -160,10 +149,8 @@ std::vector<std::string> GetHonestAffiliations(T && t, IndexSharedPtr const & in
       else
       {
         for (borders::CountryPolygons const & cp : v.second)
-        {
           if (cp.Contains(point) && countires.insert(&cp).second)
             affiliations.emplace_back(cp.GetName());
-        }
       }
     }
   });
@@ -182,8 +169,7 @@ std::vector<std::string> GetAffiliations(T && t, IndexSharedPtr const & index)
 CountriesFilesAffiliation::CountriesFilesAffiliation(std::string const & borderPath, bool haveBordersForWholeWorld)
   : m_countryPolygonsTree(borders::GetOrCreateCountryPolygonsTree(borderPath))
   , m_haveBordersForWholeWorld(haveBordersForWholeWorld)
-{
-}
+{}
 
 std::vector<std::string> CountriesFilesAffiliation::GetAffiliations(FeatureBuilder const & fb) const
 {
@@ -222,8 +208,7 @@ CountriesFilesIndexAffiliation::CountriesFilesIndexAffiliation(std::string const
     return;
   }
 
-  auto const net = generator::cells_merger::MakeNet(0.2 /* step */,
-                                                    mercator::Bounds::kMinX, mercator::Bounds::kMinY,
+  auto const net = generator::cells_merger::MakeNet(0.2 /* step */, mercator::Bounds::kMinX, mercator::Bounds::kMinY,
                                                     mercator::Bounds::kMaxX, mercator::Bounds::kMaxY);
   auto const index = BuildIndex(net);
   m_index = index;
@@ -240,8 +225,8 @@ std::vector<std::string> CountriesFilesIndexAffiliation::GetAffiliations(m2::Poi
   return affiliation::GetAffiliations(point, m_index);
 }
 
-std::shared_ptr<CountriesFilesIndexAffiliation::Tree>
-CountriesFilesIndexAffiliation::BuildIndex(const std::vector<m2::RectD> & net)
+std::shared_ptr<CountriesFilesIndexAffiliation::Tree> CountriesFilesIndexAffiliation::BuildIndex(
+    std::vector<m2::RectD> const & net)
 {
   std::unordered_map<borders::CountryPolygons const *, std::vector<m2::RectD>> countriesRects;
   std::mutex countriesRectsMutex;
@@ -252,11 +237,11 @@ CountriesFilesIndexAffiliation::BuildIndex(const std::vector<m2::RectD> & net)
     base::ComputationalThreadPool pool(numThreads);
     for (auto const & rect : net)
     {
-      pool.SubmitWork([&, rect]() {
+      pool.SubmitWork([&, rect]()
+      {
         std::vector<std::reference_wrapper<borders::CountryPolygons const>> countries;
-        m_countryPolygonsTree.ForEachCountryInRect(rect, [&](auto const & country) {
-          countries.emplace_back(country);
-        });
+        m_countryPolygonsTree.ForEachCountryInRect(rect,
+                                                   [&](auto const & country) { countries.emplace_back(country); });
         if (m_haveBordersForWholeWorld && countries.size() == 1)
         {
           borders::CountryPolygons const & country = countries.front();
@@ -269,7 +254,8 @@ CountriesFilesIndexAffiliation::BuildIndex(const std::vector<m2::RectD> & net)
           std::vector<std::reference_wrapper<borders::CountryPolygons const>> interCountries;
           for (borders::CountryPolygons const & cp : countries)
           {
-            cp.ForAnyPolygon([&](auto const & polygon) {
+            cp.ForAnyPolygon([&](auto const & polygon)
+            {
               if (!boost::geometry::intersects(polygon.Data(), box))
                 return false;
               interCountries.emplace_back(cp);
@@ -297,7 +283,8 @@ CountriesFilesIndexAffiliation::BuildIndex(const std::vector<m2::RectD> & net)
     base::ComputationalThreadPool pool(numThreads);
     for (auto & pair : countriesRects)
     {
-      pool.SubmitWork([&, countryPtr{pair.first}, rects{std::move(pair.second)}]() mutable {
+      pool.SubmitWork([&, countryPtr{pair.first}, rects{std::move(pair.second)}]() mutable
+      {
         generator::cells_merger::CellsMerger merger(std::move(rects));
         auto const merged = merger.Merge();
         for (auto const & rect : merged)
@@ -312,10 +299,7 @@ CountriesFilesIndexAffiliation::BuildIndex(const std::vector<m2::RectD> & net)
   return std::make_shared<Tree>(treeCells);
 }
 
-SingleAffiliation::SingleAffiliation(std::string const & filename)
-  : m_filename(filename)
-{
-}
+SingleAffiliation::SingleAffiliation(std::string const & filename) : m_filename(filename) {}
 
 std::vector<std::string> SingleAffiliation::GetAffiliations(FeatureBuilder const &) const
 {
@@ -327,8 +311,7 @@ bool SingleAffiliation::HasCountryByName(std::string const & name) const
   return name == m_filename;
 }
 
-std::vector<std::string>
-SingleAffiliation::GetAffiliations(m2::PointD const &) const
+std::vector<std::string> SingleAffiliation::GetAffiliations(m2::PointD const &) const
 {
   return {m_filename};
 }
diff --git a/generator/affiliation.hpp b/generator/affiliation.hpp
index ce92f8c61..65cc67338 100644
--- a/generator/affiliation.hpp
+++ b/generator/affiliation.hpp
@@ -20,7 +20,6 @@ public:
   virtual std::vector<std::string> GetAffiliations(m2::PointD const & point) const = 0;
 
   virtual bool HasCountryByName(std::string const & name) const = 0;
-
 };
 
 class CountriesFilesAffiliation : public AffiliationInterface
diff --git a/generator/altitude_generator.cpp b/generator/altitude_generator.cpp
index e30c0a7ce..68f15a438 100644
--- a/generator/altitude_generator.cpp
+++ b/generator/altitude_generator.cpp
@@ -35,10 +35,7 @@ public:
   explicit SrtmGetter(std::string const & srtmDir) : m_srtmManager(srtmDir) {}
 
   // AltitudeGetter overrides:
-  Altitude GetAltitude(m2::PointD const & p) override
-  {
-    return m_srtmManager.GetAltitude(mercator::ToLatLon(p));
-  }
+  Altitude GetAltitude(m2::PointD const & p) override { return m_srtmManager.GetAltitude(mercator::ToLatLon(p)); }
 
   void PrintStatsAndPurge() override
   {
@@ -56,18 +53,18 @@ public:
   struct FeatureAltitude
   {
     FeatureAltitude(uint32_t featureId, geometry::Altitudes && altitudes)
-      : m_featureId(featureId), m_altitudes(std::move(altitudes))
-    {
-    }
+      : m_featureId(featureId)
+      , m_altitudes(std::move(altitudes))
+    {}
 
     uint32_t m_featureId;
     feature::Altitudes m_altitudes;
   };
 
   explicit Processor(AltitudeGetter & altitudeGetter)
-    : m_minAltitude(geometry::kInvalidAltitude), m_altitudeGetter(altitudeGetter)
-  {
-  }
+    : m_minAltitude(geometry::kInvalidAltitude)
+    , m_altitudeGetter(altitudeGetter)
+  {}
 
   void operator()(FeatureType & f, uint32_t id)
   {
@@ -75,8 +72,7 @@ public:
     CHECK_EQUAL(id, m_altitudeAvailabilityBuilder.size(), ());
 
     bool hasAltitude = false;
-    SCOPE_GUARD(altitudeAvailabilityBuilding,
-                [&]() { m_altitudeAvailabilityBuilder.push_back(hasAltitude); });
+    SCOPE_GUARD(altitudeAvailabilityBuilding, [&]() { m_altitudeAvailabilityBuilder.push_back(hasAltitude); });
 
     if (!routing::IsRoad(feature::TypesHolder(f)))
       return;
diff --git a/generator/borders.cpp b/generator/borders.cpp
index b9bcc1f39..55e2a6db0 100644
--- a/generator/borders.cpp
+++ b/generator/borders.cpp
@@ -39,8 +39,7 @@ template <class ToDo>
 void ForEachCountry(std::string const & baseDir, ToDo && toDo)
 {
   std::string const bordersDir = base::JoinPath(baseDir, BORDERS_DIR);
-  CHECK(Platform::IsFileExistsByFullPath(bordersDir),
-        ("Cannot read borders directory", bordersDir));
+  CHECK(Platform::IsFileExistsByFullPath(bordersDir), ("Cannot read borders directory", bordersDir));
 
   Platform::FilesList files;
   Platform::GetFilesByExt(bordersDir, BORDERS_EXTENSION, files);
@@ -58,9 +57,7 @@ void ForEachCountry(std::string const & baseDir, ToDo && toDo)
 class PackedBordersGenerator
 {
 public:
-  explicit PackedBordersGenerator(std::string const & baseDir) : m_writer(baseDir + PACKED_POLYGONS_FILE)
-  {
-  }
+  explicit PackedBordersGenerator(std::string const & baseDir) : m_writer(baseDir + PACKED_POLYGONS_FILE) {}
 
   void operator()(std::string name, PolygonsList && borders)
   {
@@ -138,9 +135,7 @@ bool ReadPolygon(std::istream & stream, Polygon & poly, std::string const & file
 bool CountryPolygons::Contains(m2::PointD const & point) const
 {
   return m_polygons.ForAnyInRect(m2::RectD(point, point), [&](auto const & rgn)
-  {
-    return rgn.Contains(point, ContainsCompareFn(GetContainsEpsilon()));
-  });
+  { return rgn.Contains(point, ContainsCompareFn(GetContainsEpsilon())); });
 }
 
 bool LoadBorders(std::string const & borderFile, PolygonsList & outBorders)
@@ -165,8 +160,7 @@ bool LoadBorders(std::string const & borderFile, PolygonsList & outBorders)
   return true;
 }
 
-bool GetBordersRect(std::string const & baseDir, std::string const & country,
-                    m2::RectD & bordersRect)
+bool GetBordersRect(std::string const & baseDir, std::string const & country, m2::RectD & bordersRect)
 {
   auto const bordersFile = base::JoinPath(baseDir, BORDERS_DIR, country + BORDERS_EXTENSION);
   if (!Platform::IsFileExistsByFullPath(bordersFile))
diff --git a/generator/borders.hpp b/generator/borders.hpp
index 3ad6e38ad..49c899f3f 100644
--- a/generator/borders.hpp
+++ b/generator/borders.hpp
@@ -14,7 +14,7 @@
 #include <unordered_set>
 #include <vector>
 
-#define BORDERS_DIR "borders/"
+#define BORDERS_DIR       "borders/"
 #define BORDERS_EXTENSION ".poly"
 
 namespace borders
@@ -44,9 +44,9 @@ class CountryPolygons
 public:
   CountryPolygons() = default;
   explicit CountryPolygons(std::string && name, PolygonsTree && regions)
-      : m_name(std::move(name)), m_polygons(std::move(regions))
-  {
-  }
+    : m_name(std::move(name))
+    , m_polygons(std::move(regions))
+  {}
 
   std::string const & GetName() const { return m_name; }
   bool IsEmpty() const { return m_polygons.IsEmpty(); }
@@ -61,16 +61,12 @@ public:
     double m_eps, m_squareEps;
 
   public:
-    explicit ContainsCompareFn(double eps) : m_eps(eps), m_squareEps(eps*eps) {}
+    explicit ContainsCompareFn(double eps) : m_eps(eps), m_squareEps(eps * eps) {}
     bool EqualPoints(m2::PointD const & p1, m2::PointD const & p2) const
     {
-      return AlmostEqualAbs(p1.x, p2.x, m_eps) &&
-             AlmostEqualAbs(p1.y, p2.y, m_eps);
-    }
-    bool EqualZeroSquarePrecision(double val) const
-    {
-      return AlmostEqualAbs(val, 0.0, m_squareEps);
+      return AlmostEqualAbs(p1.x, p2.x, m_eps) && AlmostEqualAbs(p1.y, p2.y, m_eps);
     }
+    bool EqualZeroSquarePrecision(double val) const { return AlmostEqualAbs(val, 0.0, m_squareEps); }
   };
 
   static double GetContainsEpsilon() { return 1.0E-4; }
@@ -108,9 +104,7 @@ public:
 
     auto const & inserted = res.first->second;
     inserted.ForEachPolygon([&inserted, this](Polygon const & polygon)
-    {
-      m_regionsTree.Add(inserted, polygon.GetRect());
-    });
+    { m_regionsTree.Add(inserted, polygon.GetRect()); });
   }
 
   size_t GetSize() const { return m_countryPolygonsMap.size(); }
@@ -126,10 +120,7 @@ public:
     });
   }
 
-  bool HasRegionByName(std::string const & name) const
-  {
-    return m_countryPolygonsMap.count(name) != 0;
-  }
+  bool HasRegionByName(std::string const & name) const { return m_countryPolygonsMap.count(name) != 0; }
 
   CountryPolygons const & GetRegionByName(std::string const & name) const
   {
@@ -139,7 +130,7 @@ public:
   }
 
 private:
-  m4::Tree<std::reference_wrapper<const CountryPolygons>> m_regionsTree;
+  m4::Tree<std::reference_wrapper<CountryPolygons const>> m_regionsTree;
   std::unordered_map<std::string, CountryPolygons> m_countryPolygonsMap;
 };
 
@@ -148,8 +139,7 @@ using PolygonsList = std::vector<Polygon>;
 /// @return false if borderFile can't be opened
 bool LoadBorders(std::string const & borderFile, PolygonsList & outBorders);
 
-bool GetBordersRect(std::string const & baseDir, std::string const & country,
-                    m2::RectD & bordersRect);
+bool GetBordersRect(std::string const & baseDir, std::string const & country, m2::RectD & bordersRect);
 
 bool LoadCountriesList(std::string const & baseDir, CountryPolygonsCollection & countries);
 
diff --git a/generator/boundary_postcodes_enricher.cpp b/generator/boundary_postcodes_enricher.cpp
index 54045ddc4..e7b6488af 100644
--- a/generator/boundary_postcodes_enricher.cpp
+++ b/generator/boundary_postcodes_enricher.cpp
@@ -28,8 +28,7 @@ BoundaryPostcodesEnricher::BoundaryPostcodesEnricher(std::string const & boundar
     CHECK(!postcode.empty() && !geometry.empty(), ());
 
     m_boundaryPostcodes.emplace_back(std::move(postcode), std::move(geometry));
-    m_boundariesTree.Add(m_boundaryPostcodes.size() - 1,
-                         m_boundaryPostcodes.back().second.GetRect());
+    m_boundariesTree.Add(m_boundaryPostcodes.size() - 1, m_boundaryPostcodes.back().second.GetRect());
   }
 }
 
diff --git a/generator/brands_loader.cpp b/generator/brands_loader.cpp
index 43be651e3..1bc49a939 100644
--- a/generator/brands_loader.cpp
+++ b/generator/brands_loader.cpp
@@ -23,7 +23,7 @@ using std::pair, std::string, std::unordered_map, std::vector;
 DECLARE_EXCEPTION(ParsingError, RootException);
 
 static void ParseFeatureToBrand(json_t * root, string const & field, GeoObjectId::Type type,
-                         vector<pair<GeoObjectId, uint32_t>> & result)
+                                vector<pair<GeoObjectId, uint32_t>> & result)
 {
   auto arr = base::GetJSONOptionalField(root, field);
   if (arr == nullptr)
@@ -42,8 +42,7 @@ static void ParseFeatureToBrand(json_t * root, string const & field, GeoObjectId
   }
 }
 
-void ParseTranslations(json_t * root, std::set<string> const & keys,
-                       unordered_map<uint32_t, string> & idToKey)
+void ParseTranslations(json_t * root, std::set<string> const & keys, unordered_map<uint32_t, string> & idToKey)
 {
   string const empty;
   auto getKey = [&](string & translation) -> string const &
diff --git a/generator/camera_info_collector.cpp b/generator/camera_info_collector.cpp
index 486e7bbd4..016e98f59 100644
--- a/generator/camera_info_collector.cpp
+++ b/generator/camera_info_collector.cpp
@@ -18,8 +18,7 @@
 
 namespace generator
 {
-CamerasInfoCollector::CamerasInfoCollector(std::string const & dataFilePath,
-                                           std::string const & camerasInfoPath,
+CamerasInfoCollector::CamerasInfoCollector(std::string const & dataFilePath, std::string const & camerasInfoPath,
                                            std::string const & osmIdsToFeatureIdsPath)
 {
   routing::OsmIdToFeatureIds osmIdToFeatureIds;
@@ -90,8 +89,8 @@ void CamerasInfoCollector::Serialize(FileWriter & writer) const
     camera.Serialize(writer, prevFeatureId);
 }
 
-bool CamerasInfoCollector::ParseIntermediateInfo(
-    std::string const & camerasInfoPath, routing::OsmIdToFeatureIds const & osmIdToFeatureIds)
+bool CamerasInfoCollector::ParseIntermediateInfo(std::string const & camerasInfoPath,
+                                                 routing::OsmIdToFeatureIds const & osmIdToFeatureIds)
 {
   FileReader reader(camerasInfoPath);
   ReaderSource<FileReader> src(reader);
@@ -131,8 +130,8 @@ bool CamerasInfoCollector::ParseIntermediateInfo(
     if (relatedWaysNumber > std::numeric_limits<uint8_t>::max())
     {
       badCamera = true;
-      LOG(LERROR, ("Number of related to camera ways should be interval from 0 to 255.",
-                   "lat(", lat, "), lon(", lon, ")"));
+      LOG(LERROR,
+          ("Number of related to camera ways should be interval from 0 to 255.", "lat(", lat, "), lon(", lon, ")"));
     }
 
     std::vector<routing::SpeedCameraMwmPosition> ways;
@@ -159,8 +158,7 @@ bool CamerasInfoCollector::ParseIntermediateInfo(
   return true;
 }
 
-void CamerasInfoCollector::Camera::FindClosestSegment(FrozenDataSource const & dataSource,
-                                                      MwmSet::MwmId const & mwmId)
+void CamerasInfoCollector::Camera::FindClosestSegment(FrozenDataSource const & dataSource, MwmSet::MwmId const & mwmId)
 {
   if (!m_data.m_ways.empty() && FindClosestSegmentInInnerWays(dataSource, mwmId))
     return;
@@ -168,7 +166,6 @@ void CamerasInfoCollector::Camera::FindClosestSegment(FrozenDataSource const & d
   FindClosestSegmentWithGeometryIndex(dataSource);
 }
 
-
 bool CamerasInfoCollector::Camera::FindClosestSegmentInInnerWays(FrozenDataSource const & dataSource,
                                                                  MwmSet::MwmId const & mwmId)
 {
@@ -201,7 +198,8 @@ void CamerasInfoCollector::Camera::FindClosestSegmentWithGeometryIndex(FrozenDat
   double bestCoef = 0.0;
 
   // Look at each segment of roads and find the closest.
-  auto const updateClosestFeatureCallback = [&](FeatureType & ft) {
+  auto const updateClosestFeatureCallback = [&](FeatureType & ft)
+  {
     if (ft.GetGeomType() != feature::GeomType::Line)
       return;
 
@@ -243,30 +241,32 @@ void CamerasInfoCollector::Camera::FindClosestSegmentWithGeometryIndex(FrozenDat
     }
   };
 
-  dataSource.ForEachInRect(
-    updateClosestFeatureCallback,
-    mercator::RectByCenterXYAndSizeInMeters(m_data.m_center, kSearchCameraRadiusMeters),
-    scales::GetUpperScale());
+  dataSource.ForEachInRect(updateClosestFeatureCallback,
+                           mercator::RectByCenterXYAndSizeInMeters(m_data.m_center, kSearchCameraRadiusMeters),
+                           scales::GetUpperScale());
 
   if (found)
     m_data.m_ways.emplace_back(bestFeatureId, bestSegmentId, bestCoef);
 }
 
-std::optional<std::pair<double, uint32_t>> CamerasInfoCollector::Camera::FindMyself(
-    uint32_t wayFeatureId, FrozenDataSource const & dataSource, MwmSet::MwmId const & mwmId) const
+std::optional<std::pair<double, uint32_t>> CamerasInfoCollector::Camera::FindMyself(uint32_t wayFeatureId,
+                                                                                    FrozenDataSource const & dataSource,
+                                                                                    MwmSet::MwmId const & mwmId) const
 {
   double coef = 0.0;
   bool isRoad = true;
   uint32_t result = 0;
   bool cannotFindMyself = false;
 
-  auto const readFeature = [&](FeatureType & ft) {
+  auto const readFeature = [&](FeatureType & ft)
+  {
     bool found = false;
     isRoad = routing::IsRoad(feature::TypesHolder(ft));
     if (!isRoad)
       return;
 
-    auto const findPoint = [&result, &found, this](m2::PointD const & pt) {
+    auto const findPoint = [&result, &found, this](m2::PointD const & pt)
+    {
       if (found)
         return;
 
@@ -317,14 +317,12 @@ std::optional<std::pair<double, uint32_t>> CamerasInfoCollector::Camera::FindMys
   return {};
 }
 
-void CamerasInfoCollector::Camera::Serialize(FileWriter & writer,
-                                             uint32_t & prevFeatureId) const
+void CamerasInfoCollector::Camera::Serialize(FileWriter & writer, uint32_t & prevFeatureId) const
 {
   routing::SerializeSpeedCamera(writer, m_data, prevFeatureId);
 }
 
-void BuildCamerasInfo(std::string const & dataFilePath,
-                      std::string const & camerasInfoPath,
+void BuildCamerasInfo(std::string const & dataFilePath, std::string const & camerasInfoPath,
                       std::string const & osmIdsToFeatureIdsPath)
 {
   LOG(LINFO, ("Generating cameras info for", dataFilePath));
diff --git a/generator/camera_info_collector.hpp b/generator/camera_info_collector.hpp
index e4c321f81..3770c0505 100644
--- a/generator/camera_info_collector.hpp
+++ b/generator/camera_info_collector.hpp
@@ -32,8 +32,7 @@ private:
 
     Camera(m2::PointD const & center, uint8_t maxSpeed, std::vector<routing::SpeedCameraMwmPosition> && ways)
       : m_data(center, maxSpeed, std::move(ways))
-    {
-    }
+    {}
 
     void ParseDirection()
     {
@@ -56,8 +55,7 @@ private:
     // Returns empty object, if current feature - |wayId| is not the car road.
     // Otherwise returns id of segment from feature with id - |wayId|, which starts (or ends) at camera's
     // center and coefficient - where it placed at the segment: 0.0 (or 1.0).
-    std::optional<std::pair<double, uint32_t>> FindMyself(uint32_t wayFeatureId,
-                                                          FrozenDataSource const & dataSource,
+    std::optional<std::pair<double, uint32_t>> FindMyself(uint32_t wayFeatureId, FrozenDataSource const & dataSource,
                                                           MwmSet::MwmId const & mwmId) const;
 
     void Serialize(FileWriter & writer, uint32_t & prevFeatureId) const;
@@ -68,8 +66,7 @@ private:
   inline static double constexpr kMaxDistFromCameraToClosestSegmentMeters = 20.0;
   inline static double constexpr kSearchCameraRadiusMeters = 10.0;
 
-  bool ParseIntermediateInfo(std::string const & camerasInfoPath,
-                             routing::OsmIdToFeatureIds const & osmIdToFeatureIds);
+  bool ParseIntermediateInfo(std::string const & camerasInfoPath, routing::OsmIdToFeatureIds const & osmIdToFeatureIds);
 
   std::vector<Camera> m_cameras;
 };
diff --git a/generator/cells_merger.cpp b/generator/cells_merger.cpp
index fd6ff45bf..87da41156 100644
--- a/generator/cells_merger.cpp
+++ b/generator/cells_merger.cpp
@@ -11,18 +11,16 @@ namespace
 double GetMinX(std::vector<m2::RectD> const & cells)
 {
   CHECK(!cells.empty(), ());
-  auto const minElementX =
-      std::min_element(std::cbegin(cells), std::cend(cells),
-                       [](auto const & l, auto const & r) { return l.minX() < r.minX(); });
+  auto const minElementX = std::min_element(std::cbegin(cells), std::cend(cells),
+                                            [](auto const & l, auto const & r) { return l.minX() < r.minX(); });
   return minElementX->minX();
 }
 
 double GetMinY(std::vector<m2::RectD> const & cells)
 {
   CHECK(!cells.empty(), ());
-  auto const minElementY =
-      std::min_element(std::cbegin(cells), std::cend(cells),
-                       [](auto const & l, auto const & r) { return l.minY() < r.minY(); });
+  auto const minElementY = std::min_element(std::cbegin(cells), std::cend(cells),
+                                            [](auto const & l, auto const & r) { return l.minY() < r.minY(); });
   return minElementY->minY();
 }
 }  // namespace
@@ -70,10 +68,9 @@ void CellsMerger::CalcSum()
       if (!Has(x, y))
         continue;
       auto & cell = Get(x, y);
-      cell.SetBottomLeft(
-          std::min({TryGet(x - 1, y).GetBottomLeft(), TryGet(x, y - 1).GetBottomLeft(),
-                    TryGet(x - 1, y - 1).GetBottomLeft()}) +
-          1);
+      cell.SetBottomLeft(std::min({TryGet(x - 1, y).GetBottomLeft(), TryGet(x, y - 1).GetBottomLeft(),
+                                   TryGet(x - 1, y - 1).GetBottomLeft()}) +
+                         1);
     }
   }
   // Bottom right
@@ -84,10 +81,9 @@ void CellsMerger::CalcSum()
       if (!Has(x, y))
         continue;
       auto & cell = Get(x, y);
-      cell.SetBottomRight(
-          std::min({TryGet(x + 1, y).GetBottomRight(), TryGet(x, y - 1).GetBottomRight(),
-                    TryGet(x + 1, y - 1).GetBottomRight()}) +
-          1);
+      cell.SetBottomRight(std::min({TryGet(x + 1, y).GetBottomRight(), TryGet(x, y - 1).GetBottomRight(),
+                                    TryGet(x + 1, y - 1).GetBottomRight()}) +
+                          1);
     }
   }
   // Top left
@@ -98,9 +94,9 @@ void CellsMerger::CalcSum()
       if (!Has(x, y))
         continue;
       auto & cell = Get(x, y);
-      cell.SetTopLeft(std::min({TryGet(x - 1, y).GetTopLeft(), TryGet(x, y + 1).GetTopLeft(),
-                                TryGet(x - 1, y + 1).GetTopLeft()}) +
-                      1);
+      cell.SetTopLeft(
+          std::min({TryGet(x - 1, y).GetTopLeft(), TryGet(x, y + 1).GetTopLeft(), TryGet(x - 1, y + 1).GetTopLeft()}) +
+          1);
     }
   }
   // Top right
@@ -127,10 +123,12 @@ CellWrapper & CellsMerger::Get(m2::PointI const & xy)
   return it->second;
 }
 
-CellWrapper & CellsMerger::Get(int32_t x, int32_t y) { return Get({x, y}); }
+CellWrapper & CellsMerger::Get(int32_t x, int32_t y)
+{
+  return Get({x, y});
+}
 
-CellWrapper const & CellsMerger::TryGet(int32_t x, int32_t y,
-                                        CellWrapper const & defaultValue) const
+CellWrapper const & CellsMerger::TryGet(int32_t x, int32_t y, CellWrapper const & defaultValue) const
 {
   auto const it = m_matrix.find({x, y});
   return it == std::cend(m_matrix) ? defaultValue : it->second;
@@ -144,16 +142,12 @@ m2::PointI CellsMerger::FindBigSquare(m2::PointI const & xy, m2::PointI const &
   {
     auto const xMinMax = std::minmax(currXy.x, xy.x);
     for (int32_t x = xMinMax.first; x <= xMinMax.second; ++x)
-    {
       if (!Has({x, currXy.y}))
         return prevXy;
-    }
     auto const yMinMax = std::minmax(currXy.y, xy.y);
     for (int32_t y = yMinMax.first; y <= yMinMax.second; ++y)
-    {
       if (!Has({currXy.x, y}))
         return prevXy;
-    }
     prevXy = currXy;
     currXy += direction;
   }
@@ -163,16 +157,14 @@ std::optional<m2::PointI> CellsMerger::FindDirection(m2::PointI const & startXy)
 {
   std::array<std::pair<size_t, m2::PointI>, 4> directionsWithWeight;
   std::array<m2::PointI, 4> const directions{{{1, 1}, {-1, 1}, {1, -1}, {-1, -1}}};
-  base::Transform(directions, std::begin(directionsWithWeight),
-                  [&](auto const & direction) {
-                    return std::make_pair(
-                        TryGet(startXy.x + direction.x, startXy.y).GetSum() +
-                            TryGet(startXy.x, startXy.y + direction.y).GetSum() +
-                            TryGet(startXy.x + direction.x, startXy.y + direction.y).GetSum(),
-                        direction);
-                 });
-  auto const direction =
-      std::max_element(std::cbegin(directionsWithWeight), std::cend(directionsWithWeight))->second;
+  base::Transform(directions, std::begin(directionsWithWeight), [&](auto const & direction)
+  {
+    return std::make_pair(TryGet(startXy.x + direction.x, startXy.y).GetSum() +
+                              TryGet(startXy.x, startXy.y + direction.y).GetSum() +
+                              TryGet(startXy.x + direction.x, startXy.y + direction.y).GetSum(),
+                          direction);
+  });
+  auto const direction = std::max_element(std::cbegin(directionsWithWeight), std::cend(directionsWithWeight))->second;
   return Has(startXy + direction) ? direction : std::optional<m2::PointI>{};
 }
 
@@ -181,15 +173,19 @@ void CellsMerger::Remove(m2::PointI const & minXy, m2::PointI const & maxXy)
   auto const xMinMax = std::minmax(minXy.x, maxXy.x);
   auto const yMinMax = std::minmax(minXy.y, maxXy.y);
   for (int32_t x = xMinMax.first; x <= xMinMax.second; ++x)
-  {
     for (int32_t y = yMinMax.first; y <= yMinMax.second; ++y)
       m_matrix.erase({x, y});
-  }
 }
 
-bool CellsMerger::Has(int32_t x, int32_t y) const { return m_matrix.count({x, y}) != 0; }
+bool CellsMerger::Has(int32_t x, int32_t y) const
+{
+  return m_matrix.count({x, y}) != 0;
+}
 
-bool CellsMerger::Has(const m2::PointI & xy) const { return Has(xy.x, xy.y); }
+bool CellsMerger::Has(m2::PointI const & xy) const
+{
+  return Has(xy.x, xy.y);
+}
 
 std::optional<m2::PointI> CellsMerger::FindMax() const
 {
diff --git a/generator/cells_merger.hpp b/generator/cells_merger.hpp
index 86b97dba0..05b4979cd 100644
--- a/generator/cells_merger.hpp
+++ b/generator/cells_merger.hpp
@@ -58,8 +58,7 @@ private:
   bool Has(m2::PointI const & xy) const;
   CellWrapper & Get(m2::PointI const & xy);
   CellWrapper & Get(int32_t x, int32_t y);
-  CellWrapper const & TryGet(int32_t x, int32_t y,
-                             CellWrapper const & defaultValue = CellWrapper::kEmpty) const;
+  CellWrapper const & TryGet(int32_t x, int32_t y, CellWrapper const & defaultValue = CellWrapper::kEmpty) const;
 
   void CalcSum();
   std::optional<m2::PointI> FindMax() const;
diff --git a/generator/centers_table_builder.cpp b/generator/centers_table_builder.cpp
index 1fd1574cc..88ef1f6fd 100644
--- a/generator/centers_table_builder.cpp
+++ b/generator/centers_table_builder.cpp
@@ -35,10 +35,7 @@ bool BuildCentersTableFromDataFile(std::string const & filename, bool forceRebui
       FeaturesVector const features(rcont, header, table.get(), nullptr);
 
       builder.SetGeometryParams(header.GetBounds());
-      features.ForEach([&](FeatureType & ft, uint32_t featureId)
-      {
-        builder.Put(featureId, feature::GetCenter(ft));
-      });
+      features.ForEach([&](FeatureType & ft, uint32_t featureId) { builder.Put(featureId, feature::GetCenter(ft)); });
     }
 
     {
diff --git a/generator/check_model.cpp b/generator/check_model.cpp
index e4581a025..8992169da 100644
--- a/generator/check_model.cpp
+++ b/generator/check_model.cpp
@@ -2,9 +2,9 @@
 
 #include "defines.hpp"
 
-#include "indexer/features_vector.hpp"
 #include "indexer/classificator.hpp"
 #include "indexer/feature_visibility.hpp"
+#include "indexer/features_vector.hpp"
 
 #include "base/logging.hpp"
 
@@ -44,4 +44,4 @@ void ReadFeatures(std::string const & fName)
 
   LOG(LINFO, ("OK"));
 }
-} // namespace check_model
+}  // namespace check_model
diff --git a/generator/cities_boundaries_builder.hpp b/generator/cities_boundaries_builder.hpp
index cfa854692..16e8be990 100644
--- a/generator/cities_boundaries_builder.hpp
+++ b/generator/cities_boundaries_builder.hpp
@@ -10,8 +10,7 @@
 namespace generator
 {
 // todo(@m) Make test ids a new source in base::GeoObjectId?
-using OsmIdToBoundariesTable =
-    base::ClusteringMap<base::GeoObjectId, indexer::CityBoundary>;
+using OsmIdToBoundariesTable = base::ClusteringMap<base::GeoObjectId, indexer::CityBoundary>;
 using TestIdToBoundariesTable = base::ClusteringMap<uint64_t, indexer::CityBoundary>;
 
 bool BuildCitiesBoundaries(std::string const & dataPath, OsmIdToBoundariesTable & table);
diff --git a/generator/cities_boundaries_checker.cpp b/generator/cities_boundaries_checker.cpp
index c56e23f98..428d062b8 100644
--- a/generator/cities_boundaries_checker.cpp
+++ b/generator/cities_boundaries_checker.cpp
@@ -13,7 +13,8 @@ CitiesBoundariesChecker::CitiesBoundariesChecker(CitiesBoundaries const & cities
 bool CitiesBoundariesChecker::InCity(m2::PointD const & point) const
 {
   bool result = false;
-  m_tree.ForEachInRect(m2::RectD(point, point), [&](indexer::CityBoundary const & cityBoundary) {
+  m_tree.ForEachInRect(m2::RectD(point, point), [&](indexer::CityBoundary const & cityBoundary)
+  {
     if (result)
       return;
 
diff --git a/generator/cities_ids_builder.cpp b/generator/cities_ids_builder.cpp
index c8b6a5fd7..8552ae05e 100644
--- a/generator/cities_ids_builder.cpp
+++ b/generator/cities_ids_builder.cpp
@@ -11,8 +11,8 @@
 #include "search/localities_source.hpp"
 #include "search/mwm_context.hpp"
 
-#include "coding/files_container.hpp"
 #include "coding/file_writer.hpp"
+#include "coding/files_container.hpp"
 
 #include "base/cancellable.hpp"
 #include "base/checked_cast.hpp"
@@ -44,7 +44,8 @@ void WriteCitiesIdsSectionToFile(std::string const & dataPath,
 {
   indexer::FeatureIdToGeoObjectIdBimapMem map;
   auto const localities = generator::GetLocalities(dataPath);
-  localities.ForEach([&](uint64_t fid64) {
+  localities.ForEach([&](uint64_t fid64)
+  {
     auto const fid = base::checked_cast<uint32_t>(fid64);
     auto const it = mapping.find(fid);
     if (it == mapping.end())
@@ -58,10 +59,9 @@ void WriteCitiesIdsSectionToFile(std::string const & dataPath,
       auto const hasOldOsmId = map.GetValue(fid, oldOsmId);
       auto const hasOldFid = map.GetKey(osmId, oldFid);
 
-      LOG(LWARNING,
-          ("Could not add the pair (", fid, ",", osmId,
-           ") to the cities ids section; old fid:", (hasOldFid ? DebugPrint(oldFid) : "none"),
-           "old osmId:", (hasOldOsmId ? DebugPrint(oldOsmId) : "none")));
+      LOG(LWARNING, ("Could not add the pair (", fid, ",", osmId,
+                     ") to the cities ids section; old fid:", (hasOldFid ? DebugPrint(oldFid) : "none"),
+                     "old osmId:", (hasOldOsmId ? DebugPrint(oldOsmId) : "none")));
     }
   });
 
@@ -73,8 +73,7 @@ void WriteCitiesIdsSectionToFile(std::string const & dataPath,
   indexer::FeatureIdToGeoObjectIdSerDes::Serialize(*sink, map);
   auto const pos1 = sink->Pos();
 
-  LOG(LINFO,
-      ("Serialized cities ids. Number of entries:", map.Size(), "Size in bytes:", pos1 - pos0));
+  LOG(LINFO, ("Serialized cities ids. Number of entries:", map.Size(), "Size in bytes:", pos1 - pos0));
 }
 }  // namespace
 
diff --git a/generator/city_roads_generator.cpp b/generator/city_roads_generator.cpp
index 89b401612..6437cd94e 100644
--- a/generator/city_roads_generator.cpp
+++ b/generator/city_roads_generator.cpp
@@ -23,8 +23,7 @@ namespace routing_builder
 using generator::CitiesBoundariesChecker;
 using std::string, std::vector;
 
-void LoadCitiesBoundariesGeometry(string const & boundariesPath,
-                                  CitiesBoundariesChecker::CitiesBoundaries & result)
+void LoadCitiesBoundariesGeometry(string const & boundariesPath, CitiesBoundariesChecker::CitiesBoundaries & result)
 {
   if (!Platform::IsFileExistsByFullPath(boundariesPath))
   {
@@ -44,8 +43,8 @@ void LoadCitiesBoundariesGeometry(string const & boundariesPath,
     {
       ++points;
       double const radiusM = ftypes::GetRadiusByPopulationForRouting(loc.GetPopulation(), loc.GetPlace());
-      result.emplace_back(ms::CreateCircleGeometryOnEarth(
-                            mercator::ToLatLon(loc.m_center), radiusM, 30.0 /* angleStepDegree */));
+      result.emplace_back(
+          ms::CreateCircleGeometryOnEarth(mercator::ToLatLon(loc.m_center), radiusM, 30.0 /* angleStepDegree */));
     }
     else
     {
@@ -63,7 +62,6 @@ void LoadCitiesBoundariesGeometry(string const & boundariesPath,
 /// according to |table|.
 vector<uint32_t> CalcRoadFeatureIds(string const & dataPath, string const & boundariesPath)
 {
-
   CitiesBoundariesChecker::CitiesBoundaries citiesBoundaries;
   LoadCitiesBoundariesGeometry(boundariesPath, citiesBoundaries);
   CitiesBoundariesChecker const checker(citiesBoundaries);
@@ -80,10 +78,8 @@ vector<uint32_t> CalcRoadFeatureIds(string const & dataPath, string const & boun
     size_t inCityPointsCounter = 0;
     size_t const count = ft.GetPointsCount();
     for (size_t i = 0; i < count; ++i)
-    {
       if (checker.InCity(ft.GetPoint(i)))
         ++inCityPointsCounter;
-    }
 
     // Our approximation of boundary overestimates it, because of different
     // bounding boxes (in order to increase performance). So we don't want
diff --git a/generator/cluster_finder.hpp b/generator/cluster_finder.hpp
index fa1cc6b3f..2b24b7f0b 100644
--- a/generator/cluster_finder.hpp
+++ b/generator/cluster_finder.hpp
@@ -14,7 +14,8 @@ namespace generator
 {
 // The class ClustersFinder finds clusters of objects for which IsSameFunc returns true.
 // RadiusFunc should return the same radius for all objects in one cluster.
-template <class T> class ClustersFinder
+template <class T>
+class ClustersFinder
 {
 public:
   using PtrT = T const *;
@@ -22,7 +23,9 @@ public:
   using IsSameFunc = std::function<bool(T const &, T const &)>;
 
   ClustersFinder(std::vector<T> const & container, RadiusFunc radiusFunc, IsSameFunc isSameFunc)
-    : m_container(container), m_radiusFunc(std::move(radiusFunc)), m_isSameFunc(std::move(isSameFunc))
+    : m_container(container)
+    , m_radiusFunc(std::move(radiusFunc))
+    , m_isSameFunc(std::move(isSameFunc))
   {
     for (auto const & e : m_container)
       m_tree.Add(&e);
@@ -78,10 +81,7 @@ private:
   {
     m2::RectD bbox;
     auto const dist = m_radiusFunc(*p);
-    GetLimitRect(*p).ForEachCorner([&](auto const & p)
-    {
-      bbox.Add(mercator::RectByCenterXYAndSizeInMeters(p, dist));
-    });
+    GetLimitRect(*p).ForEachCorner([&](auto const & p) { bbox.Add(mercator::RectByCenterXYAndSizeInMeters(p, dist)); });
     return bbox;
   }
 
@@ -93,7 +93,8 @@ private:
 
 /// @return Vector of equal place clusters, like pointers from input \a container.
 template <class T, class RadiusFnT, class IsSameFnT>
-std::vector<std::vector<T const *>> GetClusters(std::vector<T> const & container, RadiusFnT && radiusFunc, IsSameFnT && isSameFunc)
+std::vector<std::vector<T const *>> GetClusters(std::vector<T> const & container, RadiusFnT && radiusFunc,
+                                                IsSameFnT && isSameFunc)
 {
   return ClustersFinder<T>(container, std::forward<RadiusFnT>(radiusFunc), std::forward<IsSameFnT>(isSameFunc)).Find();
 }
diff --git a/generator/coastlines_generator.cpp b/generator/coastlines_generator.cpp
index 2e4441027..e6f19e432 100644
--- a/generator/coastlines_generator.cpp
+++ b/generator/coastlines_generator.cpp
@@ -15,7 +15,6 @@
 #include <functional>
 #include <thread>
 
-
 namespace coastlines_generator
 {
 using RegionT = m2::RegionI;
@@ -53,9 +52,12 @@ class DoAddToTree : public FeatureEmitterIFace
 
 public:
   explicit DoAddToTree(CoastlineFeaturesGenerator & rMain)
-    : m_rMain(rMain), m_notMergedCoastsCount(0), m_totalNotMergedCoastsPoints(0) {}
+    : m_rMain(rMain)
+    , m_notMergedCoastsCount(0)
+    , m_totalNotMergedCoastsPoints(0)
+  {}
 
-  virtual void operator() (feature::FeatureBuilder const & fb)
+  virtual void operator()(feature::FeatureBuilder const & fb)
   {
     if (fb.IsGeometryClosed())
       m_rMain.AddRegionToTree(fb);
@@ -64,30 +66,20 @@ public:
       base::GeoObjectId const firstWay = fb.GetFirstOsmId();
       base::GeoObjectId const lastWay = fb.GetLastOsmId();
       if (firstWay == lastWay)
-        LOG(LINFO, ("Not merged coastline, way", firstWay.GetSerialId(), "(", fb.GetPointsCount(),
-                    "points)"));
+        LOG(LINFO, ("Not merged coastline, way", firstWay.GetSerialId(), "(", fb.GetPointsCount(), "points)"));
       else
-        LOG(LINFO, ("Not merged coastline, ways", firstWay.GetSerialId(), "to",
-                    lastWay.GetSerialId(), "(", fb.GetPointsCount(), "points)"));
+        LOG(LINFO, ("Not merged coastline, ways", firstWay.GetSerialId(), "to", lastWay.GetSerialId(), "(",
+                    fb.GetPointsCount(), "points)"));
       ++m_notMergedCoastsCount;
       m_totalNotMergedCoastsPoints += fb.GetPointsCount();
     }
   }
 
-  bool HasNotMergedCoasts() const
-  {
-    return m_notMergedCoastsCount != 0;
-  }
+  bool HasNotMergedCoasts() const { return m_notMergedCoastsCount != 0; }
 
-  size_t GetNotMergedCoastsCount() const
-  {
-    return m_notMergedCoastsCount;
-  }
+  size_t GetNotMergedCoastsCount() const { return m_notMergedCoastsCount; }
 
-  size_t GetNotMergedCoastsPoints() const
-  {
-    return m_totalNotMergedCoastsPoints;
-  }
+  size_t GetNotMergedCoastsPoints() const { return m_totalNotMergedCoastsPoints; }
 };
 
 class DoDifference
@@ -129,8 +121,8 @@ public:
 
       m_res[i].ForEachPoint([&points](PointT const & p)
       {
-        points.push_back(PointUToPointD(
-            m2::PointU(static_cast<uint32_t>(p.x), static_cast<uint32_t>(p.y)), kPointCoordBits));
+        points.push_back(
+            PointUToPointD(m2::PointU(static_cast<uint32_t>(p.x), static_cast<uint32_t>(p.y)), kPointCoordBits));
       });
 
       fb.AddPolygon(std::move(points));
@@ -139,8 +131,7 @@ public:
 };
 }  // namespace coastlines_generator
 
-CoastlineFeaturesGenerator::CoastlineFeaturesGenerator()
-  : m_merger(kPointCoordBits) {}
+CoastlineFeaturesGenerator::CoastlineFeaturesGenerator() : m_merger(kPointCoordBits) {}
 
 void CoastlineFeaturesGenerator::AddRegionToTree(feature::FeatureBuilder const & fb)
 {
@@ -206,13 +197,10 @@ protected:
   Context & m_ctx;
   TIndex const & m_index;
 
-  RegionInCellSplitter(Context & ctx,TIndex const & index)
-  : m_ctx(ctx), m_index(index)
-  {}
+  RegionInCellSplitter(Context & ctx, TIndex const & index) : m_ctx(ctx), m_index(index) {}
 
 public:
-  static bool Process(size_t numThreads, size_t baseScale, TIndex const & index,
-                      TProcessResultFunc funcResult)
+  static bool Process(size_t numThreads, size_t baseScale, TIndex const & index, TProcessResultFunc funcResult)
   {
     /// @todo Replace with base::ComputationalThreadPool
 
@@ -246,8 +234,8 @@ public:
 
     using namespace coastlines_generator;
     // create rect region
-    PointT arr[] = {D2I(m2::PointD(minX, minY)), D2I(m2::PointD(minX, maxY)),
-                    D2I(m2::PointD(maxX, maxY)), D2I(m2::PointD(maxX, minY))};
+    PointT arr[] = {D2I(m2::PointD(minX, minY)), D2I(m2::PointD(minX, maxY)), D2I(m2::PointD(maxX, maxY)),
+                    D2I(m2::PointD(maxX, minY))};
     RegionT rectR(arr, arr + ARRAY_SIZE(arr));
 
     // Do 'and' with all regions and accumulate the result, including bound region.
@@ -269,7 +257,7 @@ public:
     while (true)
     {
       std::unique_lock lock(m_ctx.mutexTasks);
-      m_ctx.listCondVar.wait(lock, [&]{return (!m_ctx.listTasks.empty() || m_ctx.inWork == 0);});
+      m_ctx.listCondVar.wait(lock, [&] { return (!m_ctx.listTasks.empty() || m_ctx.inWork == 0); });
       if (m_ctx.listTasks.empty())
         break;
 
@@ -283,10 +271,8 @@ public:
       lock.lock();
       // return to queue not ready cells
       if (!done)
-      {
         for (int8_t i = 0; i < TCell::MAX_CHILDREN; ++i)
           m_ctx.listTasks.push_back(currentCell.Child(i));
-      }
       --m_ctx.inWork;
       m_ctx.listCondVar.notify_all();
     }
@@ -300,23 +286,24 @@ std::vector<feature::FeatureBuilder> CoastlineFeaturesGenerator::GetFeatures(siz
   std::vector<feature::FeatureBuilder> features;
   std::mutex featuresMutex;
 
-  RegionInCellSplitter::Process(maxThreads, RegionInCellSplitter::kStartLevel, m_tree,
+  RegionInCellSplitter::Process(
+      maxThreads, RegionInCellSplitter::kStartLevel, m_tree,
       [&](RegionInCellSplitter::TCell const & cell, coastlines_generator::DoDifference & cellData)
-      {
-        feature::FeatureBuilder fb;
-        fb.SetCoastCell(cell.ToInt64(RegionInCellSplitter::kHighLevel + 1));
+  {
+    feature::FeatureBuilder fb;
+    fb.SetCoastCell(cell.ToInt64(RegionInCellSplitter::kHighLevel + 1));
 
-        cellData.AssignGeometry(fb);
-        fb.SetArea();
-        fb.AddType(coastType);
+    cellData.AssignGeometry(fb);
+    fb.SetArea();
+    fb.AddType(coastType);
 
-        // Should represent non-empty geometry
-        CHECK_GREATER(fb.GetPolygonsCount(), 0, ());
-        CHECK_GREATER_OR_EQUAL(fb.GetPointsCount(), 3, ());
+    // Should represent non-empty geometry
+    CHECK_GREATER(fb.GetPolygonsCount(), 0, ());
+    CHECK_GREATER_OR_EQUAL(fb.GetPointsCount(), 3, ());
 
-        std::lock_guard lock(featuresMutex);
-        features.emplace_back(std::move(fb));
-      });
+    std::lock_guard lock(featuresMutex);
+    features.emplace_back(std::move(fb));
+  });
 
   return features;
 }
diff --git a/generator/coastlines_generator.hpp b/generator/coastlines_generator.hpp
index 6dbebe03c..0deb4b8ac 100644
--- a/generator/coastlines_generator.hpp
+++ b/generator/coastlines_generator.hpp
@@ -2,8 +2,8 @@
 
 #include "generator/feature_merger.hpp"
 
-#include "geometry/tree4d.hpp"
 #include "geometry/region2d.hpp"
+#include "geometry/tree4d.hpp"
 
 #include <vector>
 
@@ -35,4 +35,4 @@ namespace coastlines_generator
 {
 /// @param[in]  poly  Closed polygon where poly.frotn() == poly.back() like in FeatureBuilder.
 m2::RegionI CreateRegionI(std::vector<m2::PointD> const & poly);
-} // namespace coastlines_generator
+}  // namespace coastlines_generator
diff --git a/generator/collection_base.hpp b/generator/collection_base.hpp
index 94acb8c32..e62ba453d 100644
--- a/generator/collection_base.hpp
+++ b/generator/collection_base.hpp
@@ -9,26 +9,16 @@ template <typename T>
 class CollectionBase
 {
 public:
-  void Append(T const & collector)
-  {
-    m_collection.push_back(collector);
-  }
+  void Append(T const & collector) { m_collection.push_back(collector); }
 
   void AddCollection(CollectionBase<T> const & collection)
   {
-    std::copy(std::begin(collection.m_collection), std::end(collection.m_collection),
-              std::back_inserter(m_collection));
+    std::copy(std::begin(collection.m_collection), std::end(collection.m_collection), std::back_inserter(m_collection));
   }
 
-  std::vector<T> const & GetCollection() const
-  {
-    return m_collection;
-  }
+  std::vector<T> const & GetCollection() const { return m_collection; }
 
-  bool Empty() const
-  {
-    return m_collection.empty();
-  }
+  bool Empty() const { return m_collection.empty(); }
 
 protected:
   std::vector<T> m_collection;
diff --git a/generator/collector_boundary_postcode.cpp b/generator/collector_boundary_postcode.cpp
index 726913b0d..d5f5c25b7 100644
--- a/generator/collector_boundary_postcode.cpp
+++ b/generator/collector_boundary_postcode.cpp
@@ -14,8 +14,7 @@ BoundaryPostcodeCollector::BoundaryPostcodeCollector(std::string const & filenam
   : CollectorInterface(filename)
   , m_cache(cache)
   , m_featureMakerSimple(cache)
-{
-}
+{}
 
 std::shared_ptr<CollectorInterface> BoundaryPostcodeCollector::Clone(IDRInterfacePtr const & cache) const
 {
diff --git a/generator/collector_building_parts.cpp b/generator/collector_building_parts.cpp
index af3cbaba8..901bd56e7 100644
--- a/generator/collector_building_parts.cpp
+++ b/generator/collector_building_parts.cpp
@@ -59,8 +59,7 @@ void BuildingPartsCollector::BuildingParts::Write(FileWriter & writer, BuildingP
 }
 
 // static
-BuildingPartsCollector::BuildingParts BuildingPartsCollector::BuildingParts::Read(
-    ReaderSource<FileReader> & src)
+BuildingPartsCollector::BuildingParts BuildingPartsCollector::BuildingParts::Read(ReaderSource<FileReader> & src)
 {
   BuildingParts bp;
   auto const first = base::GeoObjectId(ReadPrimitiveFromSource<uint64_t>(src));
@@ -78,8 +77,7 @@ BuildingPartsCollector::BuildingPartsCollector(std::string const & filename, IDR
   : CollectorInterface(filename)
   , m_cache(cache)
   , m_writer(std::make_unique<FileWriter>(GetTmpFilename()))
-{
-}
+{}
 
 std::shared_ptr<CollectorInterface> BuildingPartsCollector::Clone(IDRInterfacePtr const & cache) const
 {
@@ -107,8 +105,7 @@ void BuildingPartsCollector::CollectFeature(feature::FeatureBuilder const & fb,
   }
 }
 
-std::vector<base::GeoObjectId> BuildingPartsCollector::FindAllBuildingParts(
-    base::GeoObjectId const & id)
+std::vector<base::GeoObjectId> BuildingPartsCollector::FindAllBuildingParts(base::GeoObjectId const & id)
 {
   std::vector<base::GeoObjectId> buildingParts;
   RelationElement relation;
@@ -119,16 +116,12 @@ std::vector<base::GeoObjectId> BuildingPartsCollector::FindAllBuildingParts(
   }
 
   for (auto const & v : relation.m_ways)
-  {
     if (v.second == "part")
       buildingParts.emplace_back(base::MakeOsmWay(v.first));
-  }
 
   for (auto const & v : relation.m_relations)
-  {
     if (v.second == "part")
       buildingParts.emplace_back(base::MakeOsmRelation(v.first));
-  }
   return buildingParts;
 }
 
@@ -143,22 +136,23 @@ base::GeoObjectId BuildingPartsCollector::FindTopRelation(base::GeoObjectId elId
   if (elId.GetType() == base::GeoObjectId::Type::ObsoleteOsmWay)
   {
     m_cache->ForEachRelationByWayCached(serialId, wrapper);
-    it = base::FindIf(elements, [&](auto const & idRelation) {
-      return idRelation.second.GetWayRole(serialId) == "outline";
-    });
+    it = base::FindIf(elements,
+                      [&](auto const & idRelation) { return idRelation.second.GetWayRole(serialId) == "outline"; });
   }
   else if (elId.GetType() == base::GeoObjectId::Type::ObsoleteOsmRelation)
   {
     m_cache->ForEachRelationByRelationCached(serialId, wrapper);
-    it = base::FindIf(elements, [&](auto const & idRelation) {
-      return idRelation.second.GetRelationRole(serialId) == "outline";
-    });
+    it = base::FindIf(
+        elements, [&](auto const & idRelation) { return idRelation.second.GetRelationRole(serialId) == "outline"; });
   }
 
   return it != std::end(elements) ? base::MakeOsmRelation(it->first) : base::GeoObjectId();
 }
 
-void BuildingPartsCollector::Finish() { m_writer.reset(); }
+void BuildingPartsCollector::Finish()
+{
+  m_writer.reset();
+}
 
 void BuildingPartsCollector::Save()
 {
@@ -197,8 +191,7 @@ BuildingToBuildingPartsMap::BuildingToBuildingPartsMap(std::string const & filen
     auto const buildingParts = BuildingPartsCollector::BuildingParts::Read(src);
     m_buildingParts.insert(std::end(m_buildingParts), std::begin(buildingParts.m_buildingParts),
                            std::end(buildingParts.m_buildingParts));
-    m_outlineToBuildingPart.emplace_back(buildingParts.m_id,
-                                         std::move(buildingParts.m_buildingParts));
+    m_outlineToBuildingPart.emplace_back(buildingParts.m_id, std::move(buildingParts.m_buildingParts));
   }
 
   m_outlineToBuildingPart.shrink_to_fit();
@@ -212,12 +205,10 @@ bool BuildingToBuildingPartsMap::HasBuildingPart(base::GeoObjectId const & id)
   return std::binary_search(std::cbegin(m_buildingParts), std::cend(m_buildingParts), id);
 }
 
-std::vector<base::GeoObjectId> const & BuildingToBuildingPartsMap::GetBuildingPartsByOutlineId(
-    CompositeId const & id)
+std::vector<base::GeoObjectId> const & BuildingToBuildingPartsMap::GetBuildingPartsByOutlineId(CompositeId const & id)
 {
-  auto const it =
-      std::lower_bound(std::cbegin(m_outlineToBuildingPart), std::cend(m_outlineToBuildingPart), id,
-                       [](auto const & lhs, auto const & rhs) { return lhs.first < rhs; });
+  auto const it = std::lower_bound(std::cbegin(m_outlineToBuildingPart), std::cend(m_outlineToBuildingPart), id,
+                                   [](auto const & lhs, auto const & rhs) { return lhs.first < rhs; });
 
   if (it != std::cend(m_outlineToBuildingPart) && it->first == id)
     return it->second;
diff --git a/generator/collector_camera.cpp b/generator/collector_camera.cpp
index 80e3864ae..a56fec5d1 100644
--- a/generator/collector_camera.cpp
+++ b/generator/collector_camera.cpp
@@ -26,7 +26,6 @@
 
 #include <algorithm>
 
-
 namespace routing_builder
 {
 
@@ -82,12 +81,10 @@ CameraCollector::CameraInfo CameraCollector::CameraInfo::Read(ReaderSource<FileR
 // static
 void CameraCollector::CameraInfo::Write(FileWriter & writer, CameraInfo const & camera)
 {
-  uint32_t const lat =
-      DoubleToUint32(camera.m_lat, ms::LatLon::kMinLat, ms::LatLon::kMaxLat, kPointCoordBits);
+  uint32_t const lat = DoubleToUint32(camera.m_lat, ms::LatLon::kMinLat, ms::LatLon::kMaxLat, kPointCoordBits);
   WriteToSink(writer, lat);
 
-  uint32_t const lon =
-      DoubleToUint32(camera.m_lon, ms::LatLon::kMinLon, ms::LatLon::kMaxLon, kPointCoordBits);
+  uint32_t const lon = DoubleToUint32(camera.m_lon, ms::LatLon::kMinLon, ms::LatLon::kMaxLon, kPointCoordBits);
   WriteToSink(writer, lon);
 
   WriteToSink(writer, camera.m_speedKmPH);
@@ -159,9 +156,9 @@ void CameraCollector::OrderCollectedData()
 }
 
 CameraCollector::CameraCollector(std::string const & filename, IDRInterfacePtr cache)
-  : generator::CollectorInterface(filename), m_cache(std::move(cache))
-{
-}
+  : generator::CollectorInterface(filename)
+  , m_cache(std::move(cache))
+{}
 
 std::shared_ptr<generator::CollectorInterface> CameraCollector::Clone(IDRInterfacePtr const & cache) const
 {
diff --git a/generator/collector_camera.hpp b/generator/collector_camera.hpp
index 2662eba77..346bb6784 100644
--- a/generator/collector_camera.hpp
+++ b/generator/collector_camera.hpp
@@ -28,7 +28,6 @@ class TestCameraCollector;
 /// for more details about input string.
 std::optional<double> GetMaxSpeedKmPH(std::string const & maxSpeedString);
 
-
 class CameraCollector : public generator::CollectorInterface
 {
   friend class TestCameraCollector;
@@ -72,7 +71,8 @@ protected:
 
   void FillCameraInWays();
 
-  template <typename Fn> void ForEachCamera(Fn && toDo)
+  template <typename Fn>
+  void ForEachCamera(Fn && toDo)
   {
     for (auto & p : m_speedCameras)
       toDo(p.second);
diff --git a/generator/collector_collection.hpp b/generator/collector_collection.hpp
index fd82917ab..077596797 100644
--- a/generator/collector_collection.hpp
+++ b/generator/collector_collection.hpp
@@ -17,7 +17,9 @@ namespace generator
 {
 
 // This class allows you to work with a group of collectors as with one.
-class CollectorCollection : public CollectionBase<std::shared_ptr<CollectorInterface>>, public CollectorInterface
+class CollectorCollection
+  : public CollectionBase<std::shared_ptr<CollectorInterface>>
+  , public CollectorInterface
 {
 public:
   // CollectorInterface overrides:
diff --git a/generator/collector_interface.hpp b/generator/collector_interface.hpp
index 0cd14869c..c09a68b8c 100644
--- a/generator/collector_interface.hpp
+++ b/generator/collector_interface.hpp
@@ -82,8 +82,8 @@ private:
 };
 }  // namespace generator
 
-#define IMPLEMENT_COLLECTOR_IFACE(className)                \
-  void Merge(CollectorInterface const & ci) override        \
-  {                                                         \
-    dynamic_cast<className const &>(ci).MergeInto(*this);   \
+#define IMPLEMENT_COLLECTOR_IFACE(className)              \
+  void Merge(CollectorInterface const & ci) override      \
+  {                                                       \
+    dynamic_cast<className const &>(ci).MergeInto(*this); \
   }
diff --git a/generator/collector_mini_roundabout.cpp b/generator/collector_mini_roundabout.cpp
index 7ecae1bd9..8b2270eb7 100644
--- a/generator/collector_mini_roundabout.cpp
+++ b/generator/collector_mini_roundabout.cpp
@@ -10,9 +10,9 @@ namespace generator
 using namespace feature;
 
 MiniRoundaboutCollector::MiniRoundaboutCollector(std::string const & filename, IDRInterfacePtr cache)
-  : generator::CollectorInterface(filename), m_cache(std::move(cache))
-{
-}
+  : generator::CollectorInterface(filename)
+  , m_cache(std::move(cache))
+{}
 
 std::shared_ptr<generator::CollectorInterface> MiniRoundaboutCollector::Clone(IDRInterfacePtr const & cache) const
 {
@@ -39,8 +39,7 @@ void MiniRoundaboutCollector::Collect(OsmElement const & element)
   }
 }
 
-void MiniRoundaboutCollector::CollectFeature(FeatureBuilder const & feature,
-                                             OsmElement const & element)
+void MiniRoundaboutCollector::CollectFeature(FeatureBuilder const & feature, OsmElement const & element)
 {
   if (MiniRoundaboutInfo::IsProcessRoad(feature))
     m_roads.AddWay(element);
diff --git a/generator/collector_mini_roundabout.hpp b/generator/collector_mini_roundabout.hpp
index 9c3e8f349..084681447 100644
--- a/generator/collector_mini_roundabout.hpp
+++ b/generator/collector_mini_roundabout.hpp
@@ -31,10 +31,8 @@ protected:
   void ForEachMiniRoundabout(Fn && toDo)
   {
     for (auto & p : m_miniRoundabouts)
-    {
       if (m_miniRoundaboutsExceptions.count(p.first) == 0)
         toDo(p.second);
-    }
   }
 
 private:
diff --git a/generator/collector_routing_city_boundaries.cpp b/generator/collector_routing_city_boundaries.cpp
index 3292e6676..e6f8be401 100644
--- a/generator/collector_routing_city_boundaries.cpp
+++ b/generator/collector_routing_city_boundaries.cpp
@@ -28,10 +28,10 @@ PlaceBoundariesHolder::Locality::Locality(std::string const & placeType, OsmElem
   , m_name(elem.GetTag("name"))
   , m_population(osm_element::GetPopulation(elem))
   , m_place(ftypes::LocalityFromString(placeType))
-{
-}
+{}
 
-template <class Sink> void PlaceBoundariesHolder::Locality::Serialize(Sink & sink) const
+template <class Sink>
+void PlaceBoundariesHolder::Locality::Serialize(Sink & sink) const
 {
   CHECK(TestValid(), ());
 
@@ -49,7 +49,8 @@ template <class Sink> void PlaceBoundariesHolder::Locality::Serialize(Sink & sin
     rw::WriteVectorOfPOD(sink, e);
 }
 
-template <class Source> void PlaceBoundariesHolder::Locality::Deserialize(Source & src)
+template <class Source>
+void PlaceBoundariesHolder::Locality::Deserialize(Source & src)
 {
   m_place = static_cast<LocalityType>(ReadPrimitiveFromSource<int8_t>(src));
   m_placeFromNode = static_cast<LocalityType>(ReadPrimitiveFromSource<int8_t>(src));
@@ -228,8 +229,8 @@ int PlaceBoundariesHolder::GetIndex(IDType id) const
   return -1;
 }
 
-PlaceBoundariesHolder::Locality const *
-PlaceBoundariesHolder::GetBestBoundary(std::vector<IDType> const & ids, m2::PointD const & center) const
+PlaceBoundariesHolder::Locality const * PlaceBoundariesHolder::GetBestBoundary(std::vector<IDType> const & ids,
+                                                                               m2::PointD const & center) const
 {
   Locality const * bestLoc = nullptr;
 
@@ -311,8 +312,7 @@ void PlaceBoundariesBuilder::Save(std::string const & fileName)
     for (auto const & relID : ids)
     {
       auto const & loc = m_id2loc[relID];
-      if ((best == nullptr || loc.IsBetterBoundary(*best, e.second.m_name)) &&
-          loc.IsInBoundary(e.second.m_center))
+      if ((best == nullptr || loc.IsBetterBoundary(*best, e.second.m_name)) && loc.IsInBoundary(e.second.m_center))
       {
         best = &loc;
         bestID = relID;
@@ -348,22 +348,20 @@ void PlaceBoundariesBuilder::Save(std::string const & fileName)
 
   // Add remaining localities.
   for (auto & e : m_id2loc)
-  {
     if (e.second.IsHonestCity())
       holder.Add(e.first, std::move(e.second), IDType());
-  }
 
   holder.Serialize(fileName);
 }
 
 // RoutingCityBoundariesCollector ------------------------------------------------------------------
 
-RoutingCityBoundariesCollector::RoutingCityBoundariesCollector(std::string const & filename, IDRInterfacePtr const & cache)
+RoutingCityBoundariesCollector::RoutingCityBoundariesCollector(std::string const & filename,
+                                                               IDRInterfacePtr const & cache)
   : CollectorInterface(filename)
   , m_cache(cache)
   , m_featureMakerSimple(cache)
-{
-}
+{}
 
 std::shared_ptr<CollectorInterface> RoutingCityBoundariesCollector::Clone(IDRInterfacePtr const & cache) const
 {
@@ -425,9 +423,7 @@ void RoutingCityBoundariesCollector::Collect(OsmElement const & elem)
   {
     switch (fb.GetGeomType())
     {
-    case GeomType::Point:
-      loc.m_center = fb.GetKeyPoint();
-      break;
+    case GeomType::Point: loc.m_center = fb.GetKeyPoint(); break;
     case GeomType::Area:
       /// @todo Move geometry or make parsing geometry without FeatureBuilder class.
       loc.m_boundary.push_back(fb.GetOuterGeometry());
diff --git a/generator/collector_routing_city_boundaries.hpp b/generator/collector_routing_city_boundaries.hpp
index eace4fde3..7255313ed 100644
--- a/generator/collector_routing_city_boundaries.hpp
+++ b/generator/collector_routing_city_boundaries.hpp
@@ -20,8 +20,10 @@ public:
     Locality(std::string const & placeType, OsmElement const & elem);
 
     // Used in cpp module only.
-    template <class Sink> void Serialize(Sink & sink) const;
-    template <class Source> void Deserialize(Source & src);
+    template <class Sink>
+    void Serialize(Sink & sink) const;
+    template <class Source>
+    void Deserialize(Source & src);
 
     /// @param[in]  placeName Original Node place's name if available to match.
     /// @return Is this boundary better than rhs.
@@ -69,7 +71,8 @@ public:
   void Add(IDType id, Locality && loc, IDType nodeID);
 
   /// @note Mutable function!
-  template <class FnT> void ForEachLocality(FnT && fn)
+  template <class FnT>
+  void ForEachLocality(FnT && fn)
   {
     for (auto & loc : m_data)
       fn(loc);
diff --git a/generator/collector_tag.cpp b/generator/collector_tag.cpp
index 187c7ee92..79c34d127 100644
--- a/generator/collector_tag.cpp
+++ b/generator/collector_tag.cpp
@@ -14,8 +14,7 @@
 
 namespace generator
 {
-CollectorTag::CollectorTag(std::string const & filename, std::string const & tagKey,
-                           Validator const & validator)
+CollectorTag::CollectorTag(std::string const & filename, std::string const & tagKey, Validator const & validator)
   : CollectorInterface(filename)
   , m_tagKey(tagKey)
   , m_validator(validator)
@@ -49,7 +48,10 @@ void CollectorTag::Save()
     CHECK(base::CopyFileX(GetTmpFilename(), GetFilename()), ());
 }
 
-void CollectorTag::OrderCollectedData() { OrderTextFileByLine(GetFilename()); }
+void CollectorTag::OrderCollectedData()
+{
+  OrderTextFileByLine(GetFilename());
+}
 
 void CollectorTag::MergeInto(CollectorTag & collector) const
 {
diff --git a/generator/collector_tag.hpp b/generator/collector_tag.hpp
index 3ae6a997e..3317cd699 100644
--- a/generator/collector_tag.hpp
+++ b/generator/collector_tag.hpp
@@ -23,8 +23,7 @@ class CollectorTag : public CollectorInterface
 public:
   using Validator = std::function<bool(std::string const & tagValue)>;
 
-  explicit CollectorTag(std::string const & filename, std::string const & tagKey,
-                        Validator const & validator);
+  explicit CollectorTag(std::string const & filename, std::string const & tagKey, Validator const & validator);
 
   // CollectorInterface overrides:
   std::shared_ptr<CollectorInterface> Clone(IDRInterfacePtr const & = {}) const override;
diff --git a/generator/complex_generator/complex_generator.cpp b/generator/complex_generator/complex_generator.cpp
index 806019aa9..0c4723a8d 100644
--- a/generator/complex_generator/complex_generator.cpp
+++ b/generator/complex_generator/complex_generator.cpp
@@ -45,8 +45,7 @@
 
 #include <gflags/gflags.h>
 
-DEFINE_string(node_storage, "map",
-              "Type of storage for intermediate points representation. Available: raw, map, mem.");
+DEFINE_string(node_storage, "map", "Type of storage for intermediate points representation. Available: raw, map, mem.");
 DEFINE_string(user_resource_path, "", "User defined resource path for classificator.txt and etc.");
 DEFINE_string(maps_build_path, "",
               "Directory of any of the previous map generations. It is assumed that it will "
@@ -56,7 +55,8 @@ DEFINE_bool(popularity, false, "Build complexes for calculation of popularity of
 DEFINE_string(output, "", "Output filename");
 DEFINE_bool(debug, false, "Debug mode.");
 
-MAIN_WITH_ERROR_HANDLING([](int argc, char ** argv) {
+MAIN_WITH_ERROR_HANDLING([](int argc, char ** argv)
+{
   CHECK(IsLittleEndian(), ("Only little-endian architectures are supported."));
 
   Platform & pl = GetPlatform();
@@ -86,15 +86,9 @@ MAIN_WITH_ERROR_HANDLING([](int argc, char ** argv) {
   std::shared_ptr<generator::FilterInterface> filter = std::make_shared<generator::FilterComplex>();
 
   if (FLAGS_debug)
-  {
     print = static_cast<std::string (*)(generator::HierarchyEntry const &)>(generator::DebugPrint);
-  }
   else
-  {
-    print = [](auto const & entry) {
-      return generator::hierarchy::HierarchyEntryToCsvString(entry);
-    };
-  }
+    print = [](auto const & entry) { return generator::hierarchy::HierarchyEntryToCsvString(entry); };
 
   generator::RawGenerator rawGenerator(genInfo, threadsCount);
   auto processor = CreateProcessor(generator::ProcessorType::Complex, rawGenerator.GetQueue(),
@@ -102,15 +96,14 @@ MAIN_WITH_ERROR_HANDLING([](int argc, char ** argv) {
   generator::cache::IntermediateDataObjectsCache objectsCache;
   auto const cache = std::make_shared<generator::cache::IntermediateData>(objectsCache, genInfo);
   auto translator = CreateTranslator(generator::TranslatorType::Complex, processor, cache, genInfo);
-  auto finalProcessor = std::make_shared<generator::ComplexFinalProcessor>(
-      genInfo.m_tmpDir, FLAGS_output, threadsCount);
+  auto finalProcessor =
+      std::make_shared<generator::ComplexFinalProcessor>(genInfo.m_tmpDir, FLAGS_output, threadsCount);
 
   finalProcessor->SetPrintFunction(print);
   finalProcessor->SetGetMainTypeFunction(getMainType);
   finalProcessor->SetGetNameFunction(generator::hierarchy::GetName);
   finalProcessor->SetFilter(filter);
-  finalProcessor->UseBuildingPartsInfo(
-      genInfo.GetIntermediateFileName(BUILDING_PARTS_MAPPING_FILE));
+  finalProcessor->UseBuildingPartsInfo(genInfo.GetIntermediateFileName(BUILDING_PARTS_MAPPING_FILE));
 
   if (FLAGS_popularity)
   {
diff --git a/generator/complex_loader.cpp b/generator/complex_loader.cpp
index 27b5978d2..5d96f4bc4 100644
--- a/generator/complex_loader.cpp
+++ b/generator/complex_loader.cpp
@@ -18,7 +18,8 @@ bool IsComplex(tree_node::types::Ptr<HierarchyEntry> const & tree)
 {
   size_t constexpr kNumRequiredTypes = 3;
 
-  return tree_node::CountIf(tree, [&](auto const & e) {
+  return tree_node::CountIf(tree, [&](auto const & e)
+  {
     auto const & isAttraction = ftypes::AttractionsChecker::Instance();
     return isAttraction(e.m_type);
   }) >= kNumRequiredTypes;
@@ -32,13 +33,12 @@ storage::CountryId GetCountry(tree_node::types::Ptr<HierarchyEntry> const & tree
 ComplexLoader::ComplexLoader(std::string const & filename)
 {
   auto trees = hierarchy::LoadHierachy(filename);
-  base::EraseIf(trees, [](auto const & e){ return !IsComplex(e); });
+  base::EraseIf(trees, [](auto const & e) { return !IsComplex(e); });
   for (auto const & tree : trees)
     m_forests[GetCountry(tree)].Append(tree);
 }
 
-tree_node::Forest<HierarchyEntry> const & ComplexLoader::GetForest(
-    storage::CountryId const & country) const
+tree_node::Forest<HierarchyEntry> const & ComplexLoader::GetForest(storage::CountryId const & country) const
 {
   static tree_node::Forest<HierarchyEntry> const kEmpty;
   auto const it = m_forests.find(country);
@@ -48,10 +48,10 @@ tree_node::Forest<HierarchyEntry> const & ComplexLoader::GetForest(
 std::unordered_set<CompositeId> ComplexLoader::GetIdsSet() const
 {
   std::unordered_set<CompositeId> set;
-  ForEach([&](auto const &, auto const & forest) {
-    forest.ForEachTree([&](auto const & tree) {
-      tree_node::ForEach(tree, [&](auto const & entry) { set.emplace(entry.m_id); });
-    });
+  ForEach([&](auto const &, auto const & forest)
+  {
+    forest.ForEachTree([&](auto const & tree)
+    { tree_node::ForEach(tree, [&](auto const & entry) { set.emplace(entry.m_id); }); });
   });
   return set;
 }
diff --git a/generator/complex_loader.hpp b/generator/complex_loader.hpp
index 876050b55..4da0f99b3 100644
--- a/generator/complex_loader.hpp
+++ b/generator/complex_loader.hpp
@@ -54,13 +54,10 @@ storage::CountryId GetCountry(tree_node::types::Ptr<HierarchyEntry> const & tree
 ComplexLoader const & GetOrCreateComplexLoader(std::string const & filename);
 
 template <typename Fn>
-tree_node::Forest<complex::Ids> TraformToIdsForest(
-    tree_node::Forest<HierarchyEntry> const & forest, Fn && fn)
+tree_node::Forest<complex::Ids> TraformToIdsForest(tree_node::Forest<HierarchyEntry> const & forest, Fn && fn)
 {
   tree_node::Forest<complex::Ids> res;
-  forest.ForEachTree([&](auto const & tree) {
-    res.Append(tree_node::TransformToTree(tree, std::forward<Fn>(fn)));
-  });
+  forest.ForEachTree([&](auto const & tree) { res.Append(tree_node::TransformToTree(tree, std::forward<Fn>(fn))); });
   return res;
 }
 }  // namespace generator
diff --git a/generator/composite_id.cpp b/generator/composite_id.cpp
index f81399c79..a47ea1592 100644
--- a/generator/composite_id.cpp
+++ b/generator/composite_id.cpp
@@ -14,14 +14,11 @@ CompositeId::CompositeId(std::string const & str)
 }
 
 CompositeId::CompositeId(base::GeoObjectId mainId, base::GeoObjectId additionalId)
-  : m_mainId(mainId), m_additionalId(additionalId)
-{
-}
+  : m_mainId(mainId)
+  , m_additionalId(additionalId)
+{}
 
-CompositeId::CompositeId(base::GeoObjectId mainId)
-  : CompositeId(mainId, base::GeoObjectId() /* additionalId */)
-{
-}
+CompositeId::CompositeId(base::GeoObjectId mainId) : CompositeId(mainId, base::GeoObjectId() /* additionalId */) {}
 
 bool CompositeId::operator<(CompositeId const & other) const
 {
diff --git a/generator/composite_id.hpp b/generator/composite_id.hpp
index e61a52bcd..c85bacd2f 100644
--- a/generator/composite_id.hpp
+++ b/generator/composite_id.hpp
@@ -34,9 +34,6 @@ namespace std
 template <>
 struct hash<generator::CompositeId>
 {
-  size_t operator()(generator::CompositeId const & id) const
-  {
-    return math::Hash(id.m_mainId, id.m_additionalId);
-  }
+  size_t operator()(generator::CompositeId const & id) const { return math::Hash(id.m_mainId, id.m_additionalId); }
 };
 }  // namespace std
diff --git a/generator/cross_mwm_osm_ways_collector.cpp b/generator/cross_mwm_osm_ways_collector.cpp
index 265db028d..d01cb20e0 100644
--- a/generator/cross_mwm_osm_ways_collector.cpp
+++ b/generator/cross_mwm_osm_ways_collector.cpp
@@ -18,19 +18,17 @@ namespace generator
 {
 // CrossMwmOsmWaysCollector ------------------------------------------------------------------------
 
-CrossMwmOsmWaysCollector::CrossMwmOsmWaysCollector(
-    std::string intermediateDir, AffiliationInterfacePtr affiliation)
-  : m_intermediateDir(std::move(intermediateDir)), m_affiliation(std::move(affiliation))
-{
-}
+CrossMwmOsmWaysCollector::CrossMwmOsmWaysCollector(std::string intermediateDir, AffiliationInterfacePtr affiliation)
+  : m_intermediateDir(std::move(intermediateDir))
+  , m_affiliation(std::move(affiliation))
+{}
 
 std::shared_ptr<CollectorInterface> CrossMwmOsmWaysCollector::Clone(IDRInterfacePtr const &) const
 {
   return std::make_shared<CrossMwmOsmWaysCollector>(m_intermediateDir, m_affiliation);
 }
 
-void CrossMwmOsmWaysCollector::CollectFeature(feature::FeatureBuilder const & fb,
-                                              OsmElement const & element)
+void CrossMwmOsmWaysCollector::CollectFeature(feature::FeatureBuilder const & fb, OsmElement const & element)
 {
   if (element.m_type != OsmElement::EntityType::Way)
     return;
@@ -84,26 +82,18 @@ void CrossMwmOsmWaysCollector::CollectFeature(feature::FeatureBuilder const & fb
       // And belongs to both. So we consider such segment as cross mwm segment.
       // So the condition that segment certainly lies inside of mwm is:
       // both points inside and both points belong to only this mwm.
-      if (prevPointIn && curPointIn &&
-          pointsAffiliationsNumber[i] == 1 && pointsAffiliationsNumber[i - 1] == 1)
-      {
+      if (prevPointIn && curPointIn && pointsAffiliationsNumber[i] == 1 && pointsAffiliationsNumber[i - 1] == 1)
         continue;
-      }
 
       bool forwardIsEnter;
       if (prevPointIn != curPointIn)
-      {
         forwardIsEnter = curPointIn;
-      }
+      else if (pointsAffiliationsNumber[i - 1] != 1)
+        forwardIsEnter = curPointIn;
+      else if (pointsAffiliationsNumber[i] != 1)
+        forwardIsEnter = !prevPointIn;
       else
-      {
-        if (pointsAffiliationsNumber[i - 1] != 1)
-          forwardIsEnter = curPointIn;
-        else if (pointsAffiliationsNumber[i] != 1)
-          forwardIsEnter = !prevPointIn;
-        else
-          UNREACHABLE();
-      }
+        UNREACHABLE();
       prevPointIn = curPointIn;
       crossMwmSegments.emplace_back(i - 1 /* segmentId */, forwardIsEnter);
     }
@@ -171,8 +161,8 @@ void CrossMwmOsmWaysCollector::CrossMwmInfo::Dump(CrossMwmInfo const & info, std
 }
 
 // static
-std::set<CrossMwmOsmWaysCollector::CrossMwmInfo>
-CrossMwmOsmWaysCollector::CrossMwmInfo::LoadFromFileToSet(std::string const & path)
+std::set<CrossMwmOsmWaysCollector::CrossMwmInfo> CrossMwmOsmWaysCollector::CrossMwmInfo::LoadFromFileToSet(
+    std::string const & path)
 {
   std::ifstream input(path);
   if (!input)
diff --git a/generator/cross_mwm_osm_ways_collector.hpp b/generator/cross_mwm_osm_ways_collector.hpp
index 2901599b1..4001bf3c0 100644
--- a/generator/cross_mwm_osm_ways_collector.hpp
+++ b/generator/cross_mwm_osm_ways_collector.hpp
@@ -21,8 +21,7 @@ public:
     struct SegmentInfo
     {
       SegmentInfo() = default;
-      SegmentInfo(uint32_t id, bool forwardIsEnter)
-          : m_segmentId(id), m_forwardIsEnter(forwardIsEnter) {}
+      SegmentInfo(uint32_t id, bool forwardIsEnter) : m_segmentId(id), m_forwardIsEnter(forwardIsEnter) {}
 
       uint32_t m_segmentId = 0;
       bool m_forwardIsEnter = false;
@@ -30,7 +29,9 @@ public:
 
     explicit CrossMwmInfo(uint64_t osmId) : m_osmId(osmId) {}
     CrossMwmInfo(uint64_t osmId, std::vector<SegmentInfo> crossMwmSegments)
-        : m_osmId(osmId), m_crossMwmSegments(std::move(crossMwmSegments)) {}
+      : m_osmId(osmId)
+      , m_crossMwmSegments(std::move(crossMwmSegments))
+    {}
 
     bool operator<(CrossMwmInfo const & rhs) const;
 
diff --git a/generator/descriptions_section_builder.cpp b/generator/descriptions_section_builder.cpp
index 67be16254..49aae076a 100644
--- a/generator/descriptions_section_builder.cpp
+++ b/generator/descriptions_section_builder.cpp
@@ -6,8 +6,8 @@
 
 #include "platform/platform.hpp"
 
-#include "coding/files_container.hpp"
 #include "coding/file_writer.hpp"
+#include "coding/files_container.hpp"
 #include "coding/string_utf8_multilang.hpp"
 
 #include "base/file_name_utils.hpp"
@@ -78,23 +78,22 @@ std::string DescriptionsCollectionBuilderStat::LangStatisticsToString() const
     if (m_langsStat[code] == 0)
       continue;
 
-    stream << StringUtf8Multilang::GetLangByCode(static_cast<int8_t>(code))
-           << ":" << m_langsStat[code] << " ";
+    stream << StringUtf8Multilang::GetLangByCode(static_cast<int8_t>(code)) << ":" << m_langsStat[code] << " ";
   }
 
   return stream.str();
 }
 
-void DescriptionsCollector::operator() (FeatureType & ft, uint32_t featureId)
+void DescriptionsCollector::operator()(FeatureType & ft, uint32_t featureId)
 {
-//  auto const & attractionsChecker = ftypes::AttractionsChecker::Instance();
-//  if (!attractionsChecker(ft))
-//    return;
+  //  auto const & attractionsChecker = ftypes::AttractionsChecker::Instance();
+  //  if (!attractionsChecker(ft))
+  //    return;
 
   (*this)(ft.GetMetadata().GetWikiURL(), featureId);
 }
 
-void DescriptionsCollector::operator() (std::string const & wikiUrl, uint32_t featureId)
+void DescriptionsCollector::operator()(std::string const & wikiUrl, uint32_t featureId)
 {
   descriptions::LangMeta langsMeta;
 
@@ -127,7 +126,7 @@ void DescriptionsCollector::operator() (std::string const & wikiUrl, uint32_t fe
   else
     m_stat.IncNumberWikidataIds();
 
-  m_collection.m_features.push_back({ featureId, std::move(langsMeta) });
+  m_collection.m_features.push_back({featureId, std::move(langsMeta)});
 }
 
 // static
@@ -143,8 +142,7 @@ std::string DescriptionsCollector::MakePathForWikipedia(std::string const & wiki
 }
 
 // static
-std::string DescriptionsCollector::MakePathForWikidata(std::string const & wikipediaDir,
-                                                       std::string const & wikidataId)
+std::string DescriptionsCollector::MakePathForWikidata(std::string const & wikipediaDir, std::string const & wikidataId)
 {
   return base::JoinPath(wikipediaDir, "wikidata", wikidataId);
 }
@@ -217,10 +215,8 @@ void DescriptionsSectionBuilder::BuildSection(std::string const & mwmFile, Descr
 {
   auto const & stat = collector.m_stat;
   size_t const size = stat.GetTotalSize();
-  LOG(LINFO, ("Wiki descriptions for", mwmFile,
-              "Wikipedia urls =", stat.GetNumberOfWikipediaUrls(),
-              "Wikidata ids =", stat.GetNumberOfWikidataIds(),
-              "Total number of pages =", stat.GetNumberOfPages(),
+  LOG(LINFO, ("Wiki descriptions for", mwmFile, "Wikipedia urls =", stat.GetNumberOfWikipediaUrls(),
+              "Wikidata ids =", stat.GetNumberOfWikidataIds(), "Total number of pages =", stat.GetNumberOfPages(),
               "Total size of added pages (before writing to section) =", size, "bytes"));
   if (size == 0)
   {
@@ -240,9 +236,7 @@ void DescriptionsSectionBuilder::BuildSection(std::string const & mwmFile, Descr
     sectionSize = writer->Pos() - sectionSize;
   }
 
-  LOG(LINFO, ("Section", DESCRIPTIONS_FILE_TAG, "is built.",
-              "Disk size =", sectionSize, "bytes",
-              "Compression ratio =", size / double(sectionSize),
-              stat.LangStatisticsToString()));
+  LOG(LINFO, ("Section", DESCRIPTIONS_FILE_TAG, "is built.", "Disk size =", sectionSize, "bytes",
+              "Compression ratio =", size / double(sectionSize), stat.LangStatisticsToString()));
 }
 }  // namespace generator
diff --git a/generator/descriptions_section_builder.hpp b/generator/descriptions_section_builder.hpp
index 49c1b9c1f..0a74071b1 100644
--- a/generator/descriptions_section_builder.hpp
+++ b/generator/descriptions_section_builder.hpp
@@ -33,7 +33,7 @@ public:
 
   DescriptionsCollectionBuilderStat()
   {
-    CHECK_EQUAL(m_langsStat.size(), StringUtf8Multilang::kMaxSupportedLanguages , ());
+    CHECK_EQUAL(m_langsStat.size(), StringUtf8Multilang::kMaxSupportedLanguages, ());
   }
 
   std::string LangStatisticsToString() const;
@@ -67,11 +67,13 @@ class DescriptionsCollector
 public:
   DescriptionsCollector(std::string const & wikipediaDir, std::string const & mwmFile,
                         std::string const & idToWikidataPath = {})
-  : m_wikidataHelper(mwmFile, idToWikidataPath), m_wikipediaDir(wikipediaDir), m_mwmFile(mwmFile)
+    : m_wikidataHelper(mwmFile, idToWikidataPath)
+    , m_wikipediaDir(wikipediaDir)
+    , m_mwmFile(mwmFile)
   {}
 
-  void operator() (FeatureType & ft, uint32_t featureId);
-  void operator() (std::string const & wikiUrl, uint32_t featureId);
+  void operator()(FeatureType & ft, uint32_t featureId);
+  void operator()(std::string const & wikiUrl, uint32_t featureId);
 
   static std::string MakePathForWikipedia(std::string const & wikipediaDir, std::string wikipediaUrl);
   static std::string MakePathForWikidata(std::string const & wikipediaDir, std::string const & wikidataId);
diff --git a/generator/dumper.cpp b/generator/dumper.cpp
index fdfc053ac..146696d44 100644
--- a/generator/dumper.cpp
+++ b/generator/dumper.cpp
@@ -4,8 +4,8 @@
 
 #include "indexer/classificator.hpp"
 #include "indexer/feature_processor.hpp"
-#include "indexer/trie_reader.hpp"
 #include "indexer/search_string_utils.hpp"
+#include "indexer/trie_reader.hpp"
 
 #include "coding/string_utf8_multilang.hpp"
 
@@ -50,167 +50,161 @@ struct SearchTokensCollector
   uint32_t m_currentCount;
 };
 
-  class TypesCollector
+class TypesCollector
+{
+  vector<uint32_t> m_currFeatureTypes;
+
+public:
+  typedef std::map<vector<uint32_t>, size_t> value_type;
+  value_type m_stats;
+  size_t m_namesCount;
+  size_t m_totalCount;
+
+  TypesCollector() : m_namesCount(0), m_totalCount(0) {}
+
+  void operator()(FeatureType & f, uint32_t)
   {
-    vector<uint32_t> m_currFeatureTypes;
+    ++m_totalCount;
+    auto const primary = f.GetReadableName();
+    if (!primary.empty())
+      ++m_namesCount;
 
-  public:
-    typedef std::map<vector<uint32_t>, size_t> value_type;
-    value_type m_stats;
-    size_t m_namesCount;
-    size_t m_totalCount;
+    m_currFeatureTypes.clear();
+    f.ForEachType([this](uint32_t type) { m_currFeatureTypes.push_back(type); });
+    CHECK(!m_currFeatureTypes.empty(), ("Feature without any type???"));
 
-    TypesCollector() : m_namesCount(0), m_totalCount(0) {}
+    auto found = m_stats.insert(make_pair(m_currFeatureTypes, 1));
+    if (!found.second)
+      found.first->second++;
+  }
+};
 
-    void operator()(FeatureType & f, uint32_t)
+template <class T>
+static bool SortFunc(T const & first, T const & second)
+{
+  return first.second > second.second;
+}
+
+void DumpTypes(string const & fPath)
+{
+  TypesCollector doClass;
+  feature::ForEachFeature(fPath, doClass);
+
+  typedef pair<vector<uint32_t>, size_t> stats_elem_type;
+  typedef vector<stats_elem_type> vec_to_sort;
+  vec_to_sort vecToSort(doClass.m_stats.begin(), doClass.m_stats.end());
+  sort(vecToSort.begin(), vecToSort.end(), &SortFunc<stats_elem_type>);
+
+  for (auto const & el : vecToSort)
+  {
+    cout << el.second << " ";
+    for (uint32_t i : el.first)
+      cout << classif().GetFullObjectName(i) << " ";
+    cout << endl;
+  }
+  cout << "Total features: " << doClass.m_totalCount << endl;
+  cout << "Features with names: " << doClass.m_namesCount << endl;
+}
+
+///////////////////////////////////////////////////////////////////
+
+typedef std::map<int8_t, std::map<strings::UniString, pair<unsigned int, string>>> TokensContainerT;
+class PrefixesCollector
+{
+public:
+  TokensContainerT m_stats;
+
+  void operator()(int8_t langCode, std::string_view name)
+  {
+    CHECK(!name.empty(), ("Feature name is empty"));
+
+    auto const tokens = search::NormalizeAndTokenizeString(name);
+    for (size_t i = 1; i < tokens.size(); ++i)
     {
-      ++m_totalCount;
-      auto const primary = f.GetReadableName();
-      if (!primary.empty())
-        ++m_namesCount;
-
-      m_currFeatureTypes.clear();
-      f.ForEachType([this](uint32_t type)
+      strings::UniString s;
+      for (size_t numTokens = 0; numTokens < i; ++numTokens)
       {
-        m_currFeatureTypes.push_back(type);
-      });
-      CHECK(!m_currFeatureTypes.empty(), ("Feature without any type???"));
-
-      auto found = m_stats.insert(make_pair(m_currFeatureTypes, 1));
-      if (!found.second)
-        found.first->second++;
+        s.append(tokens[numTokens].begin(), tokens[numTokens].end());
+        s.push_back(' ');
+      }
+      auto [iter, found] = m_stats[langCode].emplace(s, std::make_pair(1U, name));
+      if (!found)
+        iter->second.first++;
     }
-  };
-
-  template <class T>
-  static bool SortFunc(T const & first, T const & second)
-  {
-    return first.second > second.second;
   }
 
-  void DumpTypes(string const & fPath)
+  void operator()(FeatureType & f, uint32_t) { f.ForEachName(*this); }
+};
+
+static size_t constexpr MIN_OCCURRENCE = 3;
+
+void Print(int8_t langCode, TokensContainerT::mapped_type const & container)
+{
+  typedef pair<strings::UniString, pair<unsigned int, string>> NameElemT;
+  typedef vector<NameElemT> VecToSortT;
+
+  VecToSortT v(container.begin(), container.end());
+  std::sort(v.begin(), v.end(), &SortFunc<NameElemT>);
+
+  // do not display prefixes with low occurrences
+  if (v[0].second.first > MIN_OCCURRENCE)
   {
-    TypesCollector doClass;
-    feature::ForEachFeature(fPath, doClass);
+    cout << "Language code: " << StringUtf8Multilang::GetLangByCode(langCode) << endl;
 
-    typedef pair<vector<uint32_t>, size_t> stats_elem_type;
-    typedef vector<stats_elem_type> vec_to_sort;
-    vec_to_sort vecToSort(doClass.m_stats.begin(), doClass.m_stats.end());
-    sort(vecToSort.begin(), vecToSort.end(), &SortFunc<stats_elem_type>);
-
-    for (auto const & el : vecToSort)
+    for (auto const & el : v)
     {
-      cout << el.second << " ";
-      for (uint32_t i : el.first)
-        cout << classif().GetFullObjectName(i) << " ";
-      cout << endl;
+      if (el.second.first <= MIN_OCCURRENCE)
+        break;
+      cout << el.second.first << " " << strings::ToUtf8(el.first);
+      cout << " \"" << el.second.second << "\"" << endl;
     }
-    cout << "Total features: " << doClass.m_totalCount << endl;
-    cout << "Features with names: " << doClass.m_namesCount << endl;
   }
+}
 
-  ///////////////////////////////////////////////////////////////////
+void DumpPrefixes(string const & fPath)
+{
+  PrefixesCollector doClass;
+  feature::ForEachFeature(fPath, doClass);
+  for (auto const & [langCode, container] : doClass.m_stats)
+    Print(langCode, container);
+}
 
-  typedef std::map<int8_t, std::map<strings::UniString, pair<unsigned int, string> > > TokensContainerT;
-  class PrefixesCollector
+void DumpSearchTokens(string const & fPath, size_t maxTokensToShow)
+{
+  using Value = Uint64IndexValue;
+
+  FilesContainerR container(std::make_unique<FileReader>(fPath));
+  feature::DataHeader header(container);
+
+  auto const trieRoot = trie::ReadTrie<ModelReaderPtr, ValueList<Value>>(container.GetReader(SEARCH_INDEX_FILE_TAG),
+                                                                         SingleValueSerializer<Value>());
+
+  SearchTokensCollector<Value> f;
+  trie::ForEachRef(*trieRoot, f, strings::UniString());
+  f.Finish();
+
+  for (size_t i = 0; i < std::min(maxTokensToShow, f.m_tokens.size()); ++i)
   {
-  public:
-    TokensContainerT m_stats;
+    auto const & s = f.m_tokens[i].second;
+    cout << f.m_tokens[i].first << " " << strings::ToUtf8(s) << endl;
+  }
+}
 
-    void operator()(int8_t langCode, std::string_view name)
+void DumpFeatureNames(string const & fPath, string const & lang)
+{
+  int8_t const langIndex = StringUtf8Multilang::GetLangIndex(lang);
+
+  feature::ForEachFeature(fPath, [&](FeatureType & f, uint32_t)
+  {
+    f.ForEachName([&](int8_t langCode, std::string_view name)
     {
       CHECK(!name.empty(), ("Feature name is empty"));
 
-      auto const tokens = search::NormalizeAndTokenizeString(name);
-      for (size_t i = 1; i < tokens.size(); ++i)
-      {
-        strings::UniString s;
-        for (size_t numTokens = 0; numTokens < i; ++numTokens)
-        {
-          s.append(tokens[numTokens].begin(), tokens[numTokens].end());
-          s.push_back(' ');
-        }
-        auto [iter, found] = m_stats[langCode].emplace(s, std::make_pair(1U, name));
-        if (!found)
-          iter->second.first++;
-      }
-    }
-
-    void operator()(FeatureType & f, uint32_t)
-    {
-      f.ForEachName(*this);
-    }
-  };
-
-  static size_t constexpr MIN_OCCURRENCE = 3;
-
-  void Print(int8_t langCode, TokensContainerT::mapped_type const & container)
-  {
-    typedef pair<strings::UniString, pair<unsigned int, string> > NameElemT;
-    typedef vector<NameElemT> VecToSortT;
-
-    VecToSortT v(container.begin(), container.end());
-    std::sort(v.begin(), v.end(), &SortFunc<NameElemT>);
-
-    // do not display prefixes with low occurrences
-    if (v[0].second.first > MIN_OCCURRENCE)
-    {
-      cout << "Language code: " << StringUtf8Multilang::GetLangByCode(langCode) << endl;
-
-      for (auto const & el : v)
-      {
-        if (el.second.first <= MIN_OCCURRENCE)
-          break;
-        cout << el.second.first << " " << strings::ToUtf8(el.first);
-        cout << " \"" << el.second.second << "\"" << endl;
-      }
-    }
-  }
-
-  void DumpPrefixes(string const & fPath)
-  {
-    PrefixesCollector doClass;
-    feature::ForEachFeature(fPath, doClass);
-    for (auto const & [langCode, container] : doClass.m_stats)
-      Print(langCode, container);
-  }
-
-  void DumpSearchTokens(string const & fPath, size_t maxTokensToShow)
-  {
-    using Value = Uint64IndexValue;
-
-    FilesContainerR container(std::make_unique<FileReader>(fPath));
-    feature::DataHeader header(container);
-
-    auto const trieRoot = trie::ReadTrie<ModelReaderPtr, ValueList<Value>>(
-        container.GetReader(SEARCH_INDEX_FILE_TAG), SingleValueSerializer<Value>());
-
-    SearchTokensCollector<Value> f;
-    trie::ForEachRef(*trieRoot, f, strings::UniString());
-    f.Finish();
-
-    for (size_t i = 0; i < std::min(maxTokensToShow, f.m_tokens.size()); ++i)
-    {
-      auto const & s = f.m_tokens[i].second;
-      cout << f.m_tokens[i].first << " " << strings::ToUtf8(s) << endl;
-    }
-  }
-
-  void DumpFeatureNames(string const & fPath, string const & lang)
-  {
-    int8_t const langIndex = StringUtf8Multilang::GetLangIndex(lang);
-
-    feature::ForEachFeature(fPath, [&](FeatureType & f, uint32_t)
-    {
-      f.ForEachName([&](int8_t langCode, std::string_view name)
-      {
-        CHECK(!name.empty(), ("Feature name is empty"));
-
-        if (langIndex == StringUtf8Multilang::kUnsupportedLanguageCode)
-          cout << StringUtf8Multilang::GetLangByCode(langCode) << ' ' << name << endl;
-        else if (langCode == langIndex)
-          cout << name << endl;
-      });
+      if (langIndex == StringUtf8Multilang::kUnsupportedLanguageCode)
+        cout << StringUtf8Multilang::GetLangByCode(langCode) << ' ' << name << endl;
+      else if (langCode == langIndex)
+        cout << name << endl;
     });
-  }
-} // namespace features_dumper
+  });
+}
+}  // namespace features_dumper
diff --git a/generator/dumper.hpp b/generator/dumper.hpp
index 7f900b9e4..db37dc268 100644
--- a/generator/dumper.hpp
+++ b/generator/dumper.hpp
@@ -4,16 +4,16 @@
 
 namespace features_dumper
 {
-  void DumpTypes(std::string const & fPath);
-  void DumpPrefixes(std::string const & fPath);
+void DumpTypes(std::string const & fPath);
+void DumpPrefixes(std::string const & fPath);
 
-  // Writes top maxTokensToShow tokens sorted by their
-  // frequency, i.e. by the number of features in
-  // an mwm that contain the token in their name.
-  void DumpSearchTokens(std::string const & fPath, size_t maxTokensToShow);
+// Writes top maxTokensToShow tokens sorted by their
+// frequency, i.e. by the number of features in
+// an mwm that contain the token in their name.
+void DumpSearchTokens(std::string const & fPath, size_t maxTokensToShow);
 
-  // Writes the names of all features in the locale provided by lang
-  // (e.g. "en", "ru", "sv"). If the locale is not recognized, writes all names
-  // preceded by their locales.
-  void DumpFeatureNames(std::string const & fPath, std::string const & lang);
-}
+// Writes the names of all features in the locale provided by lang
+// (e.g. "en", "ru", "sv"). If the locale is not recognized, writes all names
+// preceded by their locales.
+void DumpFeatureNames(std::string const & fPath, std::string const & lang);
+}  // namespace features_dumper
diff --git a/generator/factory_utils.hpp b/generator/factory_utils.hpp
index fbb0f9622..7752d0c62 100644
--- a/generator/factory_utils.hpp
+++ b/generator/factory_utils.hpp
@@ -6,16 +6,14 @@
 namespace generator
 {
 template <typename T, typename... Args>
-std::enable_if_t<std::is_constructible<T, Args...>::value, std::shared_ptr<T>>
-create(Args&&... args)
+std::enable_if_t<std::is_constructible<T, Args...>::value, std::shared_ptr<T>> create(Args &&... args)
 {
   return std::make_shared<T>(std::forward<Args>(args)...);
 }
 
 // impossible to construct
 template <typename T, typename... Args>
-std::enable_if_t<!std::is_constructible<T, Args...>::value, std::shared_ptr<T>>
-create(Args&&... )
+std::enable_if_t<!std::is_constructible<T, Args...>::value, std::shared_ptr<T>> create(Args &&...)
 {
   return nullptr;
 }
diff --git a/generator/feature_builder.cpp b/generator/feature_builder.cpp
index 38bf4a934..47e7880b2 100644
--- a/generator/feature_builder.cpp
+++ b/generator/feature_builder.cpp
@@ -39,9 +39,7 @@ bool IsEqual(m2::PointD const & p1, m2::PointD const & p2)
 
 bool IsEqual(m2::RectD const & r1, m2::RectD const & r2)
 {
-  return (IsEqual(r1.minX(), r2.minX()) &&
-          IsEqual(r1.minY(), r2.minY()) &&
-          IsEqual(r1.maxX(), r2.maxX()) &&
+  return (IsEqual(r1.minX(), r2.minX()) && IsEqual(r1.minY(), r2.minY()) && IsEqual(r1.maxX(), r2.maxX()) &&
           IsEqual(r1.maxY(), r2.maxY()));
 }
 
@@ -52,10 +50,7 @@ bool IsEqual(std::vector<m2::PointD> const & v1, std::vector<m2::PointD> const &
 }
 }  // namespace
 
-FeatureBuilder::FeatureBuilder()
-  : m_coastCell(-1)
-{
-}
+FeatureBuilder::FeatureBuilder() : m_coastCell(-1) {}
 
 bool FeatureBuilder::IsGeometryClosed() const
 {
@@ -76,14 +71,10 @@ m2::PointD FeatureBuilder::GetKeyPoint() const
 {
   switch (GetGeomType())
   {
-  case GeomType::Point:
-    return m_center;
+  case GeomType::Point: return m_center;
   case GeomType::Line:
-  case GeomType::Area:
-    return GetGeometryCenter();
-  default:
-    CHECK(false, ());
-    return m2::PointD();
+  case GeomType::Area: return GetGeometryCenter();
+  default: CHECK(false, ()); return m2::PointD();
   }
 }
 
@@ -128,7 +119,7 @@ void FeatureBuilder::AssignArea(PointSeq && outline, Geometry const & holes)
 
   for (PointSeq const & points : holes)
   {
-    ASSERT ( !points.empty(), (*this) );
+    ASSERT(!points.empty(), (*this));
 
     size_t j = 0;
     size_t const count = points.size();
@@ -222,10 +213,8 @@ bool FeatureBuilder::PreSerialize()
       auto const & types = GetTypes();
       if (ftypes::IsMotorwayJunctionChecker::Instance()(types) ||
           (m_params.name.IsEmpty() &&
-           (ftypes::IsPostPoiChecker::Instance()(types) ||
-            ftypes::IsRailwaySubwayEntranceChecker::Instance()(types) ||
-            ftypes::IsEntranceChecker::Instance()(types) ||
-            ftypes::IsAerowayGateChecker::Instance()(types) ||
+           (ftypes::IsPostPoiChecker::Instance()(types) || ftypes::IsRailwaySubwayEntranceChecker::Instance()(types) ||
+            ftypes::IsEntranceChecker::Instance()(types) || ftypes::IsAerowayGateChecker::Instance()(types) ||
             ftypes::IsPlatformChecker::Instance()(types))))
       {
         m_params.name.AddString(StringUtf8Multilang::kDefaultCode, m_params.ref);
@@ -253,11 +242,8 @@ bool FeatureBuilder::PreSerialize()
     if (!m_params.ref.empty())
     {
       auto const & types = GetTypes();
-      if (m_params.name.IsEmpty() &&
-          (ftypes::IsPlatformChecker::Instance()(types)))
-      {
+      if (m_params.name.IsEmpty() && (ftypes::IsPlatformChecker::Instance()(types)))
         m_params.name.AddString(StringUtf8Multilang::kDefaultCode, m_params.ref);
-      }
 
       m_params.ref.clear();
     }
@@ -265,8 +251,7 @@ bool FeatureBuilder::PreSerialize()
     m_params.rank = 0;
     break;
 
-  default:
-    return false;
+  default: return false;
   }
 
   // Stats shows that 1706197 POIs out of 2258011 have name == brand.
@@ -298,7 +283,7 @@ bool FeatureBuilder::PreSerializeAndRemoveUselessNamesForIntermediate()
   // Clear name for features with invisible texts.
   // AlexZ: Commented this line to enable captions on subway exits, which
   // are not drawn but should be visible in balloons and search results
-  //RemoveNameIfInvisible();
+  // RemoveNameIfInvisible();
   RemoveUselessNames();
 
   return true;
@@ -312,7 +297,7 @@ void FeatureBuilder::RemoveUselessNames()
     // AFAIR, they were very messy in search because they contain places' names.
     auto const typeRemover = [](uint32_t type)
     {
-      static TypeSetChecker const checkBoundary({ "boundary", "administrative" });
+      static TypeSetChecker const checkBoundary({"boundary", "administrative"});
       return checkBoundary.IsEqual(type);
     };
 
@@ -367,10 +352,8 @@ bool FeatureBuilder::operator==(FeatureBuilder const & fb) const
     return false;
 
   for (auto i = m_polygons.cbegin(), j = fb.m_polygons.cbegin(); i != m_polygons.cend(); ++i, ++j)
-  {
     if (!IsEqual(*i, *j))
       return false;
-  }
 
   return true;
 }
@@ -380,8 +363,8 @@ bool FeatureBuilder::IsExactEq(FeatureBuilder const & fb) const
   if (m_params.GetGeomType() == GeomType::Point && m_center != fb.m_center)
     return false;
 
-  return (m_polygons == fb.m_polygons && m_limitRect == fb.m_limitRect &&
-          m_osmIds == fb.m_osmIds && m_params == fb.m_params && m_coastCell == fb.m_coastCell);
+  return (m_polygons == fb.m_polygons && m_limitRect == fb.m_limitRect && m_osmIds == fb.m_osmIds &&
+          m_params == fb.m_params && m_coastCell == fb.m_coastCell);
 }
 
 void FeatureBuilder::SerializeForIntermediate(Buffer & data) const
@@ -485,7 +468,7 @@ void FeatureBuilder::SerializeAccuratelyForIntermediate(Buffer & data) const
   Buffer tmp(data);
   FeatureBuilder fb;
   fb.DeserializeAccuratelyFromIntermediate(tmp);
-  ASSERT ( fb == *this, ("Source feature: ", *this, "Deserialized feature: ", fb) );
+  ASSERT(fb == *this, ("Source feature: ", *this, "Deserialized feature: ", fb));
 #endif
 }
 
@@ -522,9 +505,15 @@ void FeatureBuilder::DeserializeAccuratelyFromIntermediate(Buffer & data)
   CHECK(IsValid(), (*this));
 }
 
-void FeatureBuilder::AddOsmId(base::GeoObjectId id) { m_osmIds.push_back(id); }
+void FeatureBuilder::AddOsmId(base::GeoObjectId id)
+{
+  m_osmIds.push_back(id);
+}
 
-void FeatureBuilder::SetOsmId(base::GeoObjectId id) { m_osmIds.assign(1, id); }
+void FeatureBuilder::SetOsmId(base::GeoObjectId id)
+{
+  m_osmIds.assign(1, id);
+}
 
 base::GeoObjectId FeatureBuilder::GetFirstOsmId() const
 {
@@ -597,10 +586,8 @@ bool FeatureBuilder::IsDrawableInRange(int lowScale, int highScale) const
 {
   auto const types = GetTypesHolder();
   while (lowScale <= highScale)
-  {
     if (IsDrawableForIndex(types, m_limitRect, lowScale++))
       return true;
-  }
   return false;
 }
 
@@ -636,8 +623,7 @@ bool FeatureBuilder::PreSerializeAndRemoveUselessNamesForMwm(SupportingData cons
   return true;
 }
 
-void FeatureBuilder::SerializeForMwm(SupportingData & data,
-                                     serial::GeometryCodingParams const & params) const
+void FeatureBuilder::SerializeForMwm(SupportingData & data, serial::GeometryCodingParams const & params) const
 {
   data.m_buffer.clear();
 
@@ -654,7 +640,7 @@ void FeatureBuilder::SerializeForMwm(SupportingData & data,
   uint8_t trgCount = base::asserted_cast<uint8_t>(data.m_innerTrg.size());
   if (trgCount > 0)
   {
-    ASSERT_GREATER ( trgCount, 2, () );
+    ASSERT_GREATER(trgCount, 2, ());
     trgCount -= 2;
   }
 
@@ -735,10 +721,8 @@ bool FeatureBuilder::IsValid() const
       return false;
 
     for (auto const & points : geom)
-    {
       if (points.size() < 3)
         return false;
-    }
   }
 
   return true;
@@ -756,9 +740,8 @@ std::string DebugPrint(FeatureBuilder const & fb)
   default: out << "ERROR: unknown geometry type"; break;
   }
 
-  out << " " << DebugPrint(mercator::ToLatLon(fb.GetLimitRect()))
-      << " " << DebugPrint(fb.GetParams())
-      << " " << fb.DebugPrintIDs();
+  out << " " << DebugPrint(mercator::ToLatLon(fb.GetLimitRect())) << " " << DebugPrint(fb.GetParams()) << " "
+      << fb.DebugPrintIDs();
   return out.str();
 }
 
diff --git a/generator/feature_builder.hpp b/generator/feature_builder.hpp
index ec21926c1..c8a6342bc 100644
--- a/generator/feature_builder.hpp
+++ b/generator/feature_builder.hpp
@@ -70,10 +70,7 @@ public:
   bool IsGeometryClosed() const;
 
   static m2::PointD GetGeometryCenter(PointSeq const & pts);
-  m2::PointD GetGeometryCenter() const
-  {
-    return GetGeometryCenter(GetOuterGeometry());
-  }
+  m2::PointD GetGeometryCenter() const { return GetGeometryCenter(GetOuterGeometry()); }
   m2::PointD GetKeyPoint() const;
   size_t GetPointsCount() const;
   size_t GetPolygonsCount() const { return m_polygons.size(); }
@@ -89,10 +86,8 @@ public:
     else
     {
       for (auto const & points : m_polygons)
-      {
         for (auto const & pt : points)
           toDo(pt);
-      }
     }
   }
 
@@ -103,10 +98,8 @@ public:
       return toDo(m_center);
 
     for (auto const & points : m_polygons)
-    {
       if (base::AnyOf(points, std::forward<ToDo>(toDo)))
         return true;
-    }
 
     return false;
   }
@@ -236,24 +229,16 @@ using TypeSerializationVersion = typename std::underlying_type<SerializationVers
 
 struct MinSize
 {
-  auto static const kSerializationVersion =
-      static_cast<TypeSerializationVersion>(SerializationVersion::MinSize);
+  auto static const kSerializationVersion = static_cast<TypeSerializationVersion>(SerializationVersion::MinSize);
 
-  static void Serialize(FeatureBuilder const & fb, FeatureBuilder::Buffer & data)
-  {
-    fb.SerializeForIntermediate(data);
-  }
+  static void Serialize(FeatureBuilder const & fb, FeatureBuilder::Buffer & data) { fb.SerializeForIntermediate(data); }
 
-  static void Deserialize(FeatureBuilder & fb, FeatureBuilder::Buffer & data)
-  {
-    fb.DeserializeFromIntermediate(data);
-  }
+  static void Deserialize(FeatureBuilder & fb, FeatureBuilder::Buffer & data) { fb.DeserializeFromIntermediate(data); }
 };
 
 struct MaxAccuracy
 {
-  auto static const kSerializationVersion =
-      static_cast<TypeSerializationVersion>(SerializationVersion::MinSize);
+  auto static const kSerializationVersion = static_cast<TypeSerializationVersion>(SerializationVersion::MinSize);
 
   static void Serialize(FeatureBuilder const & fb, FeatureBuilder::Buffer & data)
   {
@@ -321,10 +306,8 @@ std::vector<FeatureBuilder> ReadAllDatRawFormat(std::string const & fileName)
   // Happens in tests when World or Country file is empty (no valid Features to emit).
   if (Platform::IsFileExistsByFullPath(fileName))
   {
-    ForEachFeatureRawFormat<SerializationPolicy>(fileName, [&](FeatureBuilder && fb, uint64_t)
-    {
-      fbs.emplace_back(std::move(fb));
-    });
+    ForEachFeatureRawFormat<SerializationPolicy>(
+        fileName, [&](FeatureBuilder && fb, uint64_t) { fbs.emplace_back(std::move(fb)); });
   }
   return fbs;
 }
@@ -333,12 +316,11 @@ template <class SerializationPolicy = serialization_policy::MaxAccuracy, class W
 class FeatureBuilderWriter
 {
 public:
-  explicit FeatureBuilderWriter(std::string const & filename,
-                                bool mangleName = false,
+  explicit FeatureBuilderWriter(std::string const & filename, bool mangleName = false,
                                 FileWriter::Op op = FileWriter::Op::OP_WRITE_TRUNCATE)
     : m_filename(filename)
     , m_mangleName(mangleName)
-    , m_writer(std::make_unique<Writer>(m_mangleName ? m_filename  + "_" : m_filename, op))
+    , m_writer(std::make_unique<Writer>(m_mangleName ? m_filename + "_" : m_filename, op))
   {
     // TODO(maksimandrianov): I would like to support the verification of serialization versions,
     // but this requires reworking of FeatureCollector class and its derived classes. It is in
@@ -346,11 +328,9 @@ public:
     // static_cast<serialization_policy::TypeSerializationVersion>(SerializationPolicy::kSerializationVersion));
   }
 
-  explicit FeatureBuilderWriter(std::string const & filename,
-                                FileWriter::Op op)
+  explicit FeatureBuilderWriter(std::string const & filename, FileWriter::Op op)
     : FeatureBuilderWriter(filename, false /* mangleName */, op)
-  {
-  }
+  {}
 
   ~FeatureBuilderWriter()
   {
@@ -363,10 +343,7 @@ public:
     }
   }
 
-  void Write(FeatureBuilder const & fb)
-  {
-    Write(*m_writer, fb);
-  }
+  void Write(FeatureBuilder const & fb) { Write(*m_writer, fb); }
 
   template <typename Sink>
   static void Write(Sink & writer, FeatureBuilder const & fb)
diff --git a/generator/feature_emitter_iface.hpp b/generator/feature_emitter_iface.hpp
index 7a4df4d68..148fbc352 100644
--- a/generator/feature_emitter_iface.hpp
+++ b/generator/feature_emitter_iface.hpp
@@ -8,9 +8,10 @@ class FeatureBuilder;
 class FeatureEmitterIFace
 {
   // Disable deletion via this interface, because some dtors in derived classes are noexcept(false).
+
 protected:
   ~FeatureEmitterIFace() = default;
 
 public:
-  virtual void operator() (feature::FeatureBuilder const &) = 0;
+  virtual void operator()(feature::FeatureBuilder const &) = 0;
 };
diff --git a/generator/feature_generator.cpp b/generator/feature_generator.cpp
index 5df2a18e5..23185cef6 100644
--- a/generator/feature_generator.cpp
+++ b/generator/feature_generator.cpp
@@ -5,9 +5,9 @@
 #include "generator/intermediate_data.hpp"
 #include "generator/intermediate_elements.hpp"
 
+#include "geometry/mercator.hpp"
 #include "indexer/cell_id.hpp"
 #include "indexer/data_header.hpp"
-#include "geometry/mercator.hpp"
 
 #include "coding/varint.hpp"
 
@@ -27,9 +27,9 @@
 namespace feature
 {
 FeaturesCollector::FeaturesCollector(std::string const & fName, FileWriter::Op op)
-  : m_dataFile(fName, op), m_writeBuffer(kBufferSize)
-{
-}
+  : m_dataFile(fName, op)
+  , m_writeBuffer(kBufferSize)
+{}
 
 FeaturesCollector::~FeaturesCollector()
 {
@@ -77,7 +77,8 @@ void FeaturesCollector::Write(char const * src, size_t size)
     m_writePosition += part_size;
     size -= part_size;
     src += part_size;
-  } while (size > 0);
+  }
+  while (size > 0);
 }
 
 uint32_t FeaturesCollector::WriteFeatureBase(std::vector<char> const & bytes, FeatureBuilder const & fb)
@@ -104,7 +105,9 @@ uint32_t FeaturesCollector::Collect(FeatureBuilder const & fb)
 
 FeaturesAndRawGeometryCollector::FeaturesAndRawGeometryCollector(std::string const & featuresFileName,
                                                                  std::string const & rawGeometryFileName)
-  : FeaturesCollector(featuresFileName), m_rawGeometryFileStream(rawGeometryFileName) {}
+  : FeaturesCollector(featuresFileName)
+  , m_rawGeometryFileStream(rawGeometryFileName)
+{}
 
 FeaturesAndRawGeometryCollector::~FeaturesAndRawGeometryCollector()
 {
@@ -128,8 +131,7 @@ uint32_t FeaturesAndRawGeometryCollector::Collect(FeatureBuilder const & fb)
   {
     uint64_t numPoints = points.size();
     m_rawGeometryFileStream.Write(&numPoints, sizeof(numPoints));
-    m_rawGeometryFileStream.Write(points.data(),
-                                  sizeof(FeatureBuilder::PointSeq::value_type) * points.size());
+    m_rawGeometryFileStream.Write(points.data(), sizeof(FeatureBuilder::PointSeq::value_type) * points.size());
   }
   return featureId;
 }
diff --git a/generator/feature_generator.hpp b/generator/feature_generator.hpp
index 0f20816da..eae09de7c 100644
--- a/generator/feature_generator.hpp
+++ b/generator/feature_generator.hpp
@@ -52,8 +52,7 @@ class FeaturesAndRawGeometryCollector : public FeaturesCollector
   size_t m_rawGeometryCounter = 0;
 
 public:
-  FeaturesAndRawGeometryCollector(std::string const & featuresFileName,
-                                  std::string const & rawGeometryFileName);
+  FeaturesAndRawGeometryCollector(std::string const & featuresFileName, std::string const & rawGeometryFileName);
   ~FeaturesAndRawGeometryCollector() override;
 
   uint32_t Collect(FeatureBuilder const & f) override;
diff --git a/generator/feature_helpers.cpp b/generator/feature_helpers.cpp
index 08a7bcfd8..3a03cb956 100644
--- a/generator/feature_helpers.cpp
+++ b/generator/feature_helpers.cpp
@@ -12,9 +12,7 @@ namespace feature
 CalculateMidPoints::CalculateMidPoints()
 {
   m_minDrawableScaleFn = [](FeatureBuilder const & fb)
-  {
-    return GetMinDrawableScale(fb.GetTypesHolder(), fb.GetLimitRect());
-  };
+  { return GetMinDrawableScale(fb.GetTypesHolder(), fb.GetLimitRect()); };
 }
 
 void CalculateMidPoints::operator()(FeatureBuilder const & ft, uint64_t pos)
diff --git a/generator/feature_helpers.hpp b/generator/feature_helpers.hpp
index 57b4b9aff..8faf3251c 100644
--- a/generator/feature_helpers.hpp
+++ b/generator/feature_helpers.hpp
@@ -25,7 +25,7 @@ class CalculateMidPoints
 {
 public:
   using CellAndOffset = std::pair<uint64_t, uint64_t>;
-  using MinDrawableScaleFn = std::function<int (FeatureBuilder const & fb)>;
+  using MinDrawableScaleFn = std::function<int(FeatureBuilder const & fb)>;
 
   CalculateMidPoints();
 
@@ -68,10 +68,8 @@ public:
   // p is close to the borders of |m_rect|, in which case returns a very large number.
   double operator()(m2::PointD const & a, m2::PointD const & b, m2::PointD const & p) const
   {
-    if (AlmostEqualAbs(p.x, m_rect.minX(), m_eps) ||
-        AlmostEqualAbs(p.x, m_rect.maxX(), m_eps) ||
-        AlmostEqualAbs(p.y, m_rect.minY(), m_eps) ||
-        AlmostEqualAbs(p.y, m_rect.maxY(), m_eps))
+    if (AlmostEqualAbs(p.x, m_rect.minX(), m_eps) || AlmostEqualAbs(p.x, m_rect.maxX(), m_eps) ||
+        AlmostEqualAbs(p.y, m_rect.minY(), m_eps) || AlmostEqualAbs(p.y, m_rect.maxY(), m_eps))
     {
       // Points near rect should be in a result simplified vector.
       return std::numeric_limits<double>::max();
diff --git a/generator/feature_maker.cpp b/generator/feature_maker.cpp
index 762ad1c59..8a4e56225 100644
--- a/generator/feature_maker.cpp
+++ b/generator/feature_maker.cpp
@@ -11,7 +11,6 @@
 
 #include "geometry/mercator.hpp"
 
-
 namespace generator
 {
 using namespace feature;
@@ -24,8 +23,7 @@ std::shared_ptr<FeatureMakerBase> FeatureMakerSimple::Clone() const
 void FeatureMakerSimple::ParseParams(FeatureBuilderParams & params, OsmElement & p) const
 {
   auto const & cl = classif();
-  ftype::GetNameAndType(&p, params,
-                        [&cl] (uint32_t type) { return cl.IsTypeValid(type); },
+  ftype::GetNameAndType(&p, params, [&cl](uint32_t type) { return cl.IsTypeValid(type); },
                         [this](OsmElement const * p) { return GetOrigin(*p); });
 }
 
@@ -59,10 +57,8 @@ std::optional<m2::PointD> FeatureMakerSimple::GetOrigin(OsmElement const & e) co
       return {};
     }
     for (auto const & m : e.m_members)
-    {
       if (m.m_type == OsmElement::EntityType::Node)
         return ReadNode(m.m_ref);
-    }
 
     for (auto const & m : e.m_members)
     {
@@ -149,17 +145,12 @@ bool FeatureMakerSimple::BuildFromRelation(OsmElement & p, FeatureBuilderParams
     m_queue.push(std::move(fb));
   };
 
-  helper.GetOuter().ForEachArea(true /* collectID */, [&](auto && pts, auto && ids)
-  {
-    createFB(std::move(pts), ids);
-  });
+  helper.GetOuter().ForEachArea(true /* collectID */, [&](auto && pts, auto && ids) { createFB(std::move(pts), ids); });
 
   return size != m_queue.size();
 }
 
-
-FeatureMaker::FeatureMaker(IDRInterfacePtr const & cache)
-  : FeatureMakerSimple(cache)
+FeatureMaker::FeatureMaker(IDRInterfacePtr const & cache) : FeatureMakerSimple(cache)
 {
   m_placeClass = classif().GetTypeByPath({"place"});
 }
@@ -171,8 +162,7 @@ std::shared_ptr<FeatureMakerBase> FeatureMaker::Clone() const
 
 void FeatureMaker::ParseParams(FeatureBuilderParams & params, OsmElement & p) const
 {
-  ftype::GetNameAndType(&p, params, &feature::IsUsefulType,
-                        [this](OsmElement const * p) { return GetOrigin(*p); });
+  ftype::GetNameAndType(&p, params, &feature::IsUsefulType, [this](OsmElement const * p) { return GetOrigin(*p); });
 }
 
 bool FeatureMaker::BuildFromRelation(OsmElement & p, FeatureBuilderParams const & params)
diff --git a/generator/feature_maker.hpp b/generator/feature_maker.hpp
index a05a573e7..b90c7241b 100644
--- a/generator/feature_maker.hpp
+++ b/generator/feature_maker.hpp
@@ -2,14 +2,13 @@
 
 #include "generator/feature_maker_base.hpp"
 
-
 struct OsmElement;
 
 namespace generator
 {
 // FeatureMakerSimple is suitable for most cases for simple features.
 // It filters features for bad geometry only.
-class FeatureMakerSimple: public FeatureMakerBase
+class FeatureMakerSimple : public FeatureMakerBase
 {
 public:
   using FeatureMakerBase::FeatureMakerBase;
diff --git a/generator/feature_maker_base.cpp b/generator/feature_maker_base.cpp
index b2db19a89..3ee594104 100644
--- a/generator/feature_maker_base.cpp
+++ b/generator/feature_maker_base.cpp
@@ -17,14 +17,10 @@ bool FeatureMakerBase::Add(OsmElement & element)
   ParseParams(params, element);
   switch (element.m_type)
   {
-  case OsmElement::EntityType::Node:
-    return BuildFromNode(element, params);
-  case OsmElement::EntityType::Way:
-    return BuildFromWay(element, params);
-  case OsmElement::EntityType::Relation:
-    return BuildFromRelation(element, params);
-  default:
-    return false;
+  case OsmElement::EntityType::Node: return BuildFromNode(element, params);
+  case OsmElement::EntityType::Way: return BuildFromWay(element, params);
+  case OsmElement::EntityType::Relation: return BuildFromRelation(element, params);
+  default: return false;
   }
 }
 
diff --git a/generator/feature_merger.cpp b/generator/feature_merger.cpp
index c4f20552c..8f6b9b8bf 100644
--- a/generator/feature_merger.cpp
+++ b/generator/feature_merger.cpp
@@ -8,8 +8,7 @@
 
 using namespace feature;
 
-MergedFeatureBuilder::MergedFeatureBuilder(FeatureBuilder const & fb)
-  : FeatureBuilder(fb), m_isRound(false)
+MergedFeatureBuilder::MergedFeatureBuilder(FeatureBuilder const & fb) : FeatureBuilder(fb), m_isRound(false)
 {
   m_params.FinishAddingTypes();
 }
@@ -60,18 +59,15 @@ void MergedFeatureBuilder::AppendFeature(MergedFeatureBuilder const & fb, bool f
       CalcRect(fbG.begin(), fbG.end() - 1, m_limitRect);
     }
   }
+  else if (toBack)
+  {
+    thisG.insert(thisG.end(), fbG.rbegin() + 1, fbG.rend());
+    CalcRect(fbG.rbegin() + 1, fbG.rend(), m_limitRect);
+  }
   else
   {
-    if (toBack)
-    {
-      thisG.insert(thisG.end(), fbG.rbegin() + 1, fbG.rend());
-      CalcRect(fbG.rbegin() + 1, fbG.rend(), m_limitRect);
-    }
-    else
-    {
-      thisG.insert(thisG.begin(), fbG.rbegin(), fbG.rend() - 1);
-      CalcRect(fbG.rbegin(), fbG.rend() - 1, m_limitRect);
-    }
+    thisG.insert(thisG.begin(), fbG.rbegin(), fbG.rend() - 1);
+    CalcRect(fbG.rbegin(), fbG.rend() - 1, m_limitRect);
   }
 }
 
@@ -100,7 +96,7 @@ std::pair<m2::PointD, bool> MergedFeatureBuilder::GetKeyPoint(size_t i) const
   i -= sz;
 
   // 4. return last point
-  ASSERT_EQUAL ( i, 0, () );
+  ASSERT_EQUAL(i, 0, ());
   return std::make_pair(LastPoint(), true);
 }
 
@@ -115,27 +111,23 @@ double MergedFeatureBuilder::GetSquaredLength() const
 
   double sqLen = 0.0;
   for (size_t i = 1; i < poly.size(); ++i)
-    sqLen += poly[i-1].SquaredLength(poly[i]);
+    sqLen += poly[i - 1].SquaredLength(poly[i]);
   return sqLen;
 }
 
-
 FeatureMergeProcessor::Key FeatureMergeProcessor::GetKey(m2::PointD const & p)
 {
   return PointToInt64Obsolete(p, m_coordBits);
 }
 
-FeatureMergeProcessor::FeatureMergeProcessor(uint32_t coordBits)
-: m_coordBits(coordBits)
+FeatureMergeProcessor::FeatureMergeProcessor(uint32_t coordBits) : m_coordBits(coordBits) {}
+
+void FeatureMergeProcessor::operator()(FeatureBuilder const & fb)
 {
+  this->operator()(new MergedFeatureBuilder(fb));
 }
 
-void FeatureMergeProcessor::operator() (FeatureBuilder const & fb)
-{
-  this->operator() (new MergedFeatureBuilder(fb));
-}
-
-void FeatureMergeProcessor::operator() (MergedFeatureBuilder * p)
+void FeatureMergeProcessor::operator()(MergedFeatureBuilder * p)
 {
   Key const k1 = GetKey(p->FirstPoint());
   Key const k2 = GetKey(p->LastPoint());
@@ -166,7 +158,8 @@ void FeatureMergeProcessor::Remove(Key key, MergedFeatureBuilder const * p)
   {
     MergedFeatureBuilders & v = i->second;
     v.erase(remove(v.begin(), v.end(), p), v.end());
-    if (v.empty()) m_map.erase(i);
+    if (v.empty())
+      m_map.erase(i);
   }
 }
 
@@ -180,7 +173,7 @@ void FeatureMergeProcessor::Remove(MergedFeatureBuilder const * p)
     Remove(k2, p);
   else
   {
-    ASSERT ( p->IsRound(), () );
+    ASSERT(p->IsRound(), ());
 
     p->ForEachMiddlePoints(std::bind(&FeatureMergeProcessor::Remove1, this, std::placeholders::_1, p));
   }
@@ -276,7 +269,8 @@ void FeatureMergeProcessor::DoMerge(FeatureEmitterIFace & emitter)
     }
 
     // Delete if the feature was removed from map.
-    if (isRemoved) delete p;
+    if (isRemoved)
+      delete p;
   }
 
   if (m_last.NotEmpty())
@@ -292,7 +286,8 @@ uint32_t FeatureTypesProcessor::GetType(char const * arr[], size_t n)
 
 void FeatureTypesProcessor::CorrectType(uint32_t & t) const
 {
-  if (m_dontNormalize.count(t) > 0) return;
+  if (m_dontNormalize.count(t) > 0)
+    return;
 
   // 1. get normalized type:
   // highway-motorway-bridge => highway-motorway
@@ -309,7 +304,7 @@ void FeatureTypesProcessor::SetMappingTypes(char const * arr1[2], char const * a
   m_mapping[GetType(arr1, 2)] = GetType(arr2, 2);
 }
 
-MergedFeatureBuilder * FeatureTypesProcessor::operator() (FeatureBuilder const & fb)
+MergedFeatureBuilder * FeatureTypesProcessor::operator()(FeatureBuilder const & fb)
 {
   MergedFeatureBuilder * p = new MergedFeatureBuilder(fb);
 
@@ -340,22 +335,13 @@ protected:
 public:
   int m_lowScale, m_upScale;
 
-  TypeCheckBase(int lowScale, int upScale)
-    : m_lowScale(lowScale), m_upScale(upScale)
-  {
-  }
+  TypeCheckBase(int lowScale, int upScale) : m_lowScale(lowScale), m_upScale(upScale) {}
 
   using RangeT = std::pair<int, int>;
-  static RangeT GetScaleRange(uint32_t type)
-  {
-    return feature::GetDrawableScaleRange(type);
-  }
+  static RangeT GetScaleRange(uint32_t type) { return feature::GetDrawableScaleRange(type); }
 
   static bool IsEmptyRange(RangeT const & range) { return range.first == -1; }
-  bool IsBadRange(RangeT const & range) const
-  {
-    return (range.first > m_upScale || range.second < m_lowScale);
-  }
+  bool IsBadRange(RangeT const & range) const { return (range.first > m_upScale || range.second < m_lowScale); }
 };
 
 class TypeCheckWorld : public TypeCheckBase
@@ -363,12 +349,10 @@ class TypeCheckWorld : public TypeCheckBase
 public:
   bool m_isRegion = false;
 
-  TypeCheckWorld() : TypeCheckBase(0, scales::GetUpperWorldScale())
-  {
-  }
+  TypeCheckWorld() : TypeCheckBase(0, scales::GetUpperWorldScale()) {}
 
   /// @return true If |type| should be removed.
-  bool operator() (uint32_t type)
+  bool operator()(uint32_t type)
   {
     // Keep place=region types in World.mwm for search, even when they are not visible.
     if (type == GetRegionType())
@@ -385,12 +369,10 @@ public:
 class TypeCheckCountry : public TypeCheckBase
 {
 public:
-  TypeCheckCountry() : TypeCheckBase(scales::GetUpperWorldScale() + 1, scales::GetUpperStyleScale())
-  {
-  }
+  TypeCheckCountry() : TypeCheckBase(scales::GetUpperWorldScale() + 1, scales::GetUpperStyleScale()) {}
 
   /// @return true If |type| should be removed.
-  bool operator() (uint32_t type) const
+  bool operator()(uint32_t type) const
   {
     // Do not keep place=region in countries.
     if (type == GetRegionType())
@@ -427,4 +409,4 @@ bool PreprocessForCountryMap(FeatureBuilder & fb)
 {
   return !fb.RemoveTypesIf(TypeCheckCountry());
 }
-} // namespace feature
+}  // namespace feature
diff --git a/generator/feature_merger.hpp b/generator/feature_merger.hpp
index 0392ff0c5..f53b9319a 100644
--- a/generator/feature_merger.hpp
+++ b/generator/feature_merger.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "generator/feature_emitter_iface.hpp"
 #include "generator/feature_builder.hpp"
+#include "generator/feature_emitter_iface.hpp"
 
 #include <map>
 #include <set>
@@ -35,16 +35,18 @@ public:
 
   inline bool PopAnyType(uint32_t & type) { return m_params.PopAnyType(type); }
 
-  template <class ToDo> void ForEachChangeTypes(ToDo toDo)
+  template <class ToDo>
+  void ForEachChangeTypes(ToDo toDo)
   {
     for_each(m_params.m_types.begin(), m_params.m_types.end(), toDo);
     m_params.FinishAddingTypes();
   }
 
-  template <class ToDo> void ForEachMiddlePoints(ToDo toDo) const
+  template <class ToDo>
+  void ForEachMiddlePoints(ToDo toDo) const
   {
     PointSeq const & poly = GetOuterGeometry();
-    for (size_t i = 1; i < poly.size()-1; ++i)
+    for (size_t i = 1; i < poly.size() - 1; ++i)
       toDo(poly[i]);
   }
 
@@ -58,7 +60,7 @@ public:
 /// Feature merger.
 class FeatureMergeProcessor
 {
-  using Key = int64_t ;
+  using Key = int64_t;
   Key GetKey(m2::PointD const & p);
 
   MergedFeatureBuilder m_last;
@@ -70,10 +72,7 @@ class FeatureMergeProcessor
   void Insert(m2::PointD const & pt, MergedFeatureBuilder * p);
 
   void Remove(Key key, MergedFeatureBuilder const * p);
-  inline void Remove1(m2::PointD const & pt, MergedFeatureBuilder const * p)
-  {
-    Remove(GetKey(pt), p);
-  }
+  inline void Remove1(m2::PointD const & pt, MergedFeatureBuilder const * p) { Remove(GetKey(pt), p); }
   void Remove(MergedFeatureBuilder const * p);
 
   uint8_t m_coordBits;
@@ -81,13 +80,12 @@ class FeatureMergeProcessor
 public:
   FeatureMergeProcessor(uint32_t coordBits);
 
-  void operator() (feature::FeatureBuilder const & fb);
-  void operator() (MergedFeatureBuilder * p);
+  void operator()(feature::FeatureBuilder const & fb);
+  void operator()(MergedFeatureBuilder * p);
 
   void DoMerge(FeatureEmitterIFace & emitter);
 };
 
-
 /// Feature types corrector.
 class FeatureTypesProcessor
 {
@@ -101,9 +99,10 @@ class FeatureTypesProcessor
   class do_change_types
   {
     FeatureTypesProcessor const & m_pr;
+
   public:
     do_change_types(FeatureTypesProcessor const & pr) : m_pr(pr) {}
-    void operator() (uint32_t & t) { m_pr.CorrectType(t); }
+    void operator()(uint32_t & t) { m_pr.CorrectType(t); }
   };
 
 public:
@@ -111,19 +110,20 @@ public:
   void SetMappingTypes(char const * arr1[2], char const * arr2[2]);
 
   /// Leave original types, for example: boundary-administrative-2.
-  template <size_t N> void SetDontNormalizeType(char const * (&arr)[N])
+  template <size_t N>
+  void SetDontNormalizeType(char const * (&arr)[N])
   {
     m_dontNormalize.insert(GetType(arr, N));
   }
 
-  MergedFeatureBuilder * operator() (feature::FeatureBuilder const & fb);
+  MergedFeatureBuilder * operator()(feature::FeatureBuilder const & fb);
 };
 
 namespace feature
 {
-  /// @return false If fb became invalid (no any suitable types).
-  //@{
-  bool PreprocessForWorldMap(FeatureBuilder & fb);
-  bool PreprocessForCountryMap(FeatureBuilder & fb);
-  //@}
-}
+/// @return false If fb became invalid (no any suitable types).
+//@{
+bool PreprocessForWorldMap(FeatureBuilder & fb);
+bool PreprocessForCountryMap(FeatureBuilder & fb);
+//@}
+}  // namespace feature
diff --git a/generator/feature_processing_layers.cpp b/generator/feature_processing_layers.cpp
index cd8439b79..6bf0aa13b 100644
--- a/generator/feature_processing_layers.cpp
+++ b/generator/feature_processing_layers.cpp
@@ -63,8 +63,8 @@ void LayerBase::Add(std::shared_ptr<LayerBase> next)
 
 void RepresentationLayer::Handle(FeatureBuilder & fb)
 {
-//  if (m_complexFeaturesMixer)
-//    m_complexFeaturesMixer->Process([&](FeatureBuilder & fb){ LayerBase::Handle(fb); }, fb);
+  //  if (m_complexFeaturesMixer)
+  //    m_complexFeaturesMixer->Process([&](FeatureBuilder & fb){ LayerBase::Handle(fb); }, fb);
 
   auto const sourceType = fb.GetMostGenericOsmId().GetType();
   auto const geomType = fb.GetGeomType();
@@ -73,9 +73,7 @@ void RepresentationLayer::Handle(FeatureBuilder & fb)
   auto const params = fb.GetParams();
   switch (sourceType)
   {
-  case base::GeoObjectId::Type::ObsoleteOsmNode:
-    LayerBase::Handle(fb);
-    break;
+  case base::GeoObjectId::Type::ObsoleteOsmNode: LayerBase::Handle(fb); break;
   case base::GeoObjectId::Type::ObsoleteOsmWay:
   {
     switch (geomType)
@@ -104,12 +102,8 @@ void RepresentationLayer::Handle(FeatureBuilder & fb)
       }
       break;
     }
-    case GeomType::Line:
-      LayerBase::Handle(fb);
-      break;
-    default:
-      UNREACHABLE();
-      break;
+    case GeomType::Line: LayerBase::Handle(fb); break;
+    default: UNREACHABLE(); break;
     }
     break;
   }
@@ -117,22 +111,14 @@ void RepresentationLayer::Handle(FeatureBuilder & fb)
   {
     switch (geomType)
     {
-    case GeomType::Area:
-      HandleArea(fb, params);
-      break;
+    case GeomType::Area: HandleArea(fb, params); break;
     // We transform place relations into points (see BuildFromRelation).
-    case GeomType::Point:
-      LayerBase::Handle(fb);
-      break;
-    default:
-      UNREACHABLE();
-      break;
+    case GeomType::Point: LayerBase::Handle(fb); break;
+    default: UNREACHABLE(); break;
     }
     break;
   }
-  default:
-    UNREACHABLE();
-    break;
+  default: UNREACHABLE(); break;
   }
 }
 
@@ -185,31 +171,22 @@ void RepresentationCoastlineLayer::Handle(FeatureBuilder & fb)
   auto const geomType = fb.GetGeomType();
   switch (sourceType)
   {
-  case base::GeoObjectId::Type::ObsoleteOsmNode:
-    break;
+  case base::GeoObjectId::Type::ObsoleteOsmNode: break;
   case base::GeoObjectId::Type::ObsoleteOsmWay:
   {
     switch (geomType)
     {
     case GeomType::Area:
-    case GeomType::Line:
-      LayerBase::Handle(fb);
-      break;
-    default:
-      UNREACHABLE();
-      break;
+    case GeomType::Line: LayerBase::Handle(fb); break;
+    default: UNREACHABLE(); break;
     }
     break;
   }
-  case base::GeoObjectId::Type::ObsoleteOsmRelation:
-    break;
-  default:
-    UNREACHABLE();
-    break;
+  case base::GeoObjectId::Type::ObsoleteOsmRelation: break;
+  default: UNREACHABLE(); break;
   }
 }
 
-
 void PrepareCoastlineFeatureLayer::Handle(FeatureBuilder & fb)
 {
   if (fb.IsArea())
@@ -225,10 +202,7 @@ void PrepareCoastlineFeatureLayer::Handle(FeatureBuilder & fb)
   LayerBase::Handle(fb);
 }
 
-WorldLayer::WorldLayer(std::string const & popularityFilename)
-  : m_filter(popularityFilename)
-{
-}
+WorldLayer::WorldLayer(std::string const & popularityFilename) : m_filter(popularityFilename) {}
 
 void WorldLayer::Handle(FeatureBuilder & fb)
 {
diff --git a/generator/feature_processing_layers.hpp b/generator/feature_processing_layers.hpp
index e99933839..da15874db 100644
--- a/generator/feature_processing_layers.hpp
+++ b/generator/feature_processing_layers.hpp
@@ -50,7 +50,7 @@ public:
 private:
   void HandleArea(feature::FeatureBuilder & fb, FeatureBuilderParams const & params);
 
-  //std::shared_ptr<ComplexFeaturesMixer> m_complexFeaturesMixer;
+  // std::shared_ptr<ComplexFeaturesMixer> m_complexFeaturesMixer;
 };
 
 // Responsibility of class PrepareFeatureLayer is the removal of unused types and names,
@@ -112,7 +112,7 @@ class AffiliationsFeatureLayer : public LayerBase
 {
 public:
   AffiliationsFeatureLayer(size_t bufferSize, AffiliationInterfacePtr affiliation,
-                          std::shared_ptr<FeatureProcessorQueue> queue)
+                           std::shared_ptr<FeatureProcessorQueue> queue)
     : m_bufferSize(bufferSize)
     , m_affiliation(std::move(affiliation))
     , m_queue(std::move(queue))
diff --git a/generator/feature_segments_checker/feature_segments_checker.cpp b/generator/feature_segments_checker/feature_segments_checker.cpp
index 660b7dfae..ce8e79a75 100644
--- a/generator/feature_segments_checker/feature_segments_checker.cpp
+++ b/generator/feature_segments_checker/feature_segments_checker.cpp
@@ -44,16 +44,13 @@ int32_t Coord2RoughCoord(double d)
 
 struct RoughPoint
 {
-  explicit RoughPoint(m2::PointD const & point)
-    : x(Coord2RoughCoord(point.x)), y(Coord2RoughCoord(point.y))
-  {
-  }
+  explicit RoughPoint(m2::PointD const & point) : x(Coord2RoughCoord(point.x)), y(Coord2RoughCoord(point.y)) {}
 
   int32_t x;
   int32_t y;
 };
 
-bool operator< (RoughPoint const & l, RoughPoint const & r)
+bool operator<(RoughPoint const & l, RoughPoint const & r)
 {
   if (l.x != r.x)
     return l.x < r.x;
@@ -61,8 +58,7 @@ bool operator< (RoughPoint const & l, RoughPoint const & r)
 }
 
 template <typename Cont>
-void PrintCont(Cont const & cont, std::string const & title, std::string const & msgText1,
-               std::string const & msgText2)
+void PrintCont(Cont const & cont, std::string const & title, std::string const & msgText1, std::string const & msgText2)
 {
   std::cout << std::endl << title << std::endl;
   for (auto const & a : cont)
@@ -78,13 +74,15 @@ void WriteCSV(Cont const & cont, std::string const & fileName)
 }
 
 /// \returns y = k * x + b. It's the expected altitude in meters.
-double GetY(double k, double b, double x) { return k * x + b; }
+double GetY(double k, double b, double x)
+{
+  return k * x + b;
+}
 
 /// \brief Calculates factors |k| and |b| of a line using linear least squares method.
 /// \returns false in case of error (e.g. if the line is parallel to the vertical axis)
 /// and true otherwise.
-bool LinearLeastSquaresFactors(std::vector<double> const & xs, std::vector<double> const & ys, double & k,
-                               double & b)
+bool LinearLeastSquaresFactors(std::vector<double> const & xs, std::vector<double> const & ys, double & k, double & b)
 {
   double constexpr kEpsilon = 1e-6;
   size_t const n = xs.size();
@@ -154,8 +152,7 @@ public:
     , m_emptyRoadCount(0)
     , m_roadPointCount(0)
     , m_notRoadCount(0)
-  {
-  }
+  {}
 
   void operator()(FeatureType & f, uint32_t const & id)
   {
@@ -196,8 +193,7 @@ public:
         continue;
       }
       // Feature segment length.
-      double const segmentLengthMeters =
-          mercator::DistanceOnEarth(f.GetPoint(i - 1), f.GetPoint(i));
+      double const segmentLengthMeters = mercator::DistanceOnEarth(f.GetPoint(i - 1), f.GetPoint(i));
       distFromStartMeters += segmentLengthMeters;
       pointDists[i] = distFromStartMeters;
     }
@@ -272,8 +268,7 @@ public:
     for (uint32_t i = 1; i + 1 < numPoints; ++i)
     {
       int32_t const deviation =
-          static_cast<geometry::Altitude>(GetY(k, startAltitude, pointDists[i])) -
-          pointAltitudes[i];
+          static_cast<geometry::Altitude>(GetY(k, startAltitude, pointDists[i])) - pointAltitudes[i];
       m_diffFromLinear[deviation]++;
     }
 
@@ -337,8 +332,7 @@ int main(int argc, char ** argv)
   PrintCont(processor.m_featureLength, "Feature length.", " feature(s) with length ", " meter(s)");
   WriteCSV(processor.m_featureLength, "feature_length.csv");
 
-  PrintCont(processor.m_segLength, "Feature segment length.", " segment(s) with length ",
-            " meter(s)");
+  PrintCont(processor.m_segLength, "Feature segment length.", " segment(s) with length ", " meter(s)");
 
   PrintCont(processor.m_featureWave, "Wave factor", " feature(s) with wave factor ", "");
   WriteCSV(processor.m_featureWave, "feature_wave.csv");
@@ -352,8 +346,7 @@ int main(int argc, char ** argv)
   PrintCont(processor.m_diffFromLinear, "Altitude deviation of internal feature points from linear model.",
             " internal feature point(s) deviate from linear model with ", " meter(s)");
 
-  PrintCont(processor.m_leastSquaresDiff,
-            "Altitude deviation of feature points from least squares line.",
+  PrintCont(processor.m_leastSquaresDiff, "Altitude deviation of feature points from least squares line.",
             " internal feature point(s) deviate from linear model with ", " meter(s)");
 
   using std::cout, std::endl;
diff --git a/generator/feature_sorter.cpp b/generator/feature_sorter.cpp
index 44f96c8e3..13f7ee080 100644
--- a/generator/feature_sorter.cpp
+++ b/generator/feature_sorter.cpp
@@ -35,7 +35,6 @@
 #include <memory>
 #include <vector>
 
-
 namespace feature
 {
 
@@ -58,7 +57,8 @@ public:
       m_trgFile.push_back(std::make_unique<TmpFile>(info.GetIntermediateFileName(name, TRIANGLE_FILE_TAG + postfix)));
     }
 
-    m_addrFile = std::make_unique<FileWriter>(info.GetIntermediateFileName(name + DATA_FILE_EXTENSION, TEMP_ADDR_EXTENSION));
+    m_addrFile =
+        std::make_unique<FileWriter>(info.GetIntermediateFileName(name + DATA_FILE_EXTENSION, TEMP_ADDR_EXTENSION));
   }
 
   void Finish() override
@@ -104,8 +104,7 @@ public:
       header.m_featuresOffset = base::asserted_cast<uint32_t>(w->Pos() - startOffset);
       ReaderSource<ModelReaderPtr> src(std::make_unique<FileReader>(m_dataFile.GetName()));
       rw::ReadAndWrite(src, *w);
-      header.m_featuresSize =
-          base::asserted_cast<uint32_t>(w->Pos() - header.m_featuresOffset - startOffset);
+      header.m_featuresSize = base::asserted_cast<uint32_t>(w->Pos() - header.m_featuresOffset - startOffset);
 
       auto const endOffset = w->Pos();
       w->Seek(startOffset);
@@ -134,8 +133,7 @@ public:
       m_metadataBuilder.Freeze(*w);
     }
 
-    if (m_header.GetType() == DataHeader::MapType::Country ||
-        m_header.GetType() == DataHeader::MapType::World)
+    if (m_header.GetType() == DataHeader::MapType::Country || m_header.GetType() == DataHeader::MapType::World)
     {
       FileWriter osm2ftWriter(m_filename + OSM2FEATURE_FILE_EXTENSION);
       m_osm2ft.Write(osm2ftWriter);
@@ -219,8 +217,8 @@ public:
             }
             else
             {
-              LOG(LDEBUG, ("Area: too small or degenerate 1st (outer) polygon of", polys.size(),
-                           ", points count", points.size(), "at scale", i, DebugPrint(fb)));
+              LOG(LDEBUG, ("Area: too small or degenerate 1st (outer) polygon of", polys.size(), ", points count",
+                           points.size(), "at scale", i, DebugPrint(fb)));
               continue;
             }
 
@@ -239,8 +237,8 @@ public:
               }
               else
               {
-                LOG(LDEBUG, ("Area: too small or degenerate 2nd+ (inner) polygon of", polys.size(),
-                             ", points count", points.size(), "at scale", i, DebugPrint(fb)));
+                LOG(LDEBUG, ("Area: too small or degenerate 2nd+ (inner) polygon of", polys.size(), ", points count",
+                             points.size(), "at scale", i, DebugPrint(fb)));
               }
             }
 
@@ -255,11 +253,8 @@ public:
     /// @todo Probably, we should store and index OSM's short_name tag.
     if (indexer::SynonymsHolder::CanApply(fb.GetTypes()))
     {
-      int8_t const langs[] = {
-        StringUtf8Multilang::kDefaultCode,
-        StringUtf8Multilang::kEnglishCode,
-        StringUtf8Multilang::kInternationalCode
-      };
+      int8_t const langs[] = {StringUtf8Multilang::kDefaultCode, StringUtf8Multilang::kEnglishCode,
+                              StringUtf8Multilang::kInternationalCode};
 
       bool added = false;
       for (int8_t lang : langs)
@@ -314,9 +309,9 @@ private:
   class TmpFile
   {
     std::unique_ptr<FileWriter> m_writer;
+
   public:
-    explicit TmpFile(std::string const & filePath)
-      : m_writer(std::make_unique<FileWriter>(filePath)) {}
+    explicit TmpFile(std::string const & filePath) : m_writer(std::make_unique<FileWriter>(filePath)) {}
 
     FileWriter & GetWriter() { return *m_writer; }
 
@@ -371,10 +366,7 @@ bool GenerateFinalFeatures(feature::GenerateInfo const & info, std::string const
   LOG(LINFO, ("Calculating middle points"));
   // Store cellIds for middle points.
   CalculateMidPoints midPoints;
-  ForEachFeatureRawFormat(srcFilePath, [&midPoints](FeatureBuilder const & fb, uint64_t pos)
-  {
-    midPoints(fb, pos);
-  });
+  ForEachFeatureRawFormat(srcFilePath, [&midPoints](FeatureBuilder const & fb, uint64_t pos) { midPoints(fb, pos); });
 
   // Sort features by their middle point.
   midPoints.Sort();
diff --git a/generator/features_processing_helpers.hpp b/generator/features_processing_helpers.hpp
index 369ddbe83..863216346 100644
--- a/generator/features_processing_helpers.hpp
+++ b/generator/features_processing_helpers.hpp
@@ -6,8 +6,8 @@
 
 #include <cstddef>
 #include <optional>
-#include <utility>
 #include <string>
+#include <utility>
 #include <vector>
 
 namespace generator
@@ -16,9 +16,10 @@ size_t static const kAffiliationsBufferSize = 512;
 
 struct ProcessedData
 {
-  explicit ProcessedData(feature::FeatureBuilder::Buffer && buffer,
-                         std::vector<std::string> && affiliations)
-    : m_buffer(std::move(buffer)), m_affiliations(std::move(affiliations)) {}
+  explicit ProcessedData(feature::FeatureBuilder::Buffer && buffer, std::vector<std::string> && affiliations)
+    : m_buffer(std::move(buffer))
+    , m_affiliations(std::move(affiliations))
+  {}
 
   feature::FeatureBuilder::Buffer m_buffer;
   std::vector<std::string> m_affiliations;
diff --git a/generator/filter_collection.cpp b/generator/filter_collection.cpp
index 9d136d397..da7556a35 100644
--- a/generator/filter_collection.cpp
+++ b/generator/filter_collection.cpp
@@ -14,11 +14,11 @@ std::shared_ptr<FilterInterface> FilterCollection::Clone() const
 
 bool FilterCollection::IsAccepted(OsmElement const & element) const
 {
-  return base::AllOf(m_collection, [&] (auto const & filter) { return filter->IsAccepted(element); });
+  return base::AllOf(m_collection, [&](auto const & filter) { return filter->IsAccepted(element); });
 }
 
 bool FilterCollection::IsAccepted(feature::FeatureBuilder const & feature) const
 {
-  return base::AllOf(m_collection, [&] (auto const & filter) { return filter->IsAccepted(feature); });
+  return base::AllOf(m_collection, [&](auto const & filter) { return filter->IsAccepted(feature); });
 }
 }  // namespace generator
diff --git a/generator/filter_collection.hpp b/generator/filter_collection.hpp
index c53d65e74..29ff3492b 100644
--- a/generator/filter_collection.hpp
+++ b/generator/filter_collection.hpp
@@ -6,7 +6,9 @@
 namespace generator
 {
 // This class allows you to work with a group of filters as with one.
-class FilterCollection : public CollectionBase<std::shared_ptr<FilterInterface>>, public FilterInterface
+class FilterCollection
+  : public CollectionBase<std::shared_ptr<FilterInterface>>
+  , public FilterInterface
 {
 public:
   // FilterInterface overrides:
diff --git a/generator/filter_elements.cpp b/generator/filter_elements.cpp
index 7248b54cb..2dbcd4fc3 100644
--- a/generator/filter_elements.cpp
+++ b/generator/filter_elements.cpp
@@ -22,10 +22,7 @@ public:
     return true;
   }
 
-  bool Contains(T const & key) const
-  {
-    return base::IsExist(m_vec, key);
-  }
+  bool Contains(T const & key) const { return base::IsExist(m_vec, key); }
 
 private:
   std::vector<T> m_vec;
@@ -36,10 +33,9 @@ namespace generator
 {
 bool FilterData::IsMatch(Tags const & elementTags, Tags const & tags)
 {
-  return base::AllOf(tags, [&](OsmElement::Tag const & t) {
-    auto const it = base::FindIf(elementTags, [&](OsmElement::Tag const & tag) {
-      return tag.m_key == t.m_key;
-    });
+  return base::AllOf(tags, [&](OsmElement::Tag const & t)
+  {
+    auto const it = base::FindIf(elementTags, [&](OsmElement::Tag const & tag) { return tag.m_key == t.m_key; });
     return it == std::end(elementTags) ? false : t.m_value == "*" || it->m_value == t.m_value;
   });
 }
@@ -149,8 +145,7 @@ bool FilterElements::ParseTags(json_t * json, FilterData & fdata)
   return true;
 }
 
-FilterElements::FilterElements(std::string const & filename)
-  : m_filename(filename)
+FilterElements::FilterElements(std::string const & filename) : m_filename(filename)
 {
   std::ifstream stream(m_filename);
   std::string str((std::istreambuf_iterator<char>(stream)), std::istreambuf_iterator<char>());
@@ -179,7 +174,7 @@ bool FilterElements::NeedSkip(OsmElement const & element) const
   }
 }
 
-bool FilterElements::NeedSkip(OsmElement const & element,  FilterData const & fdata) const
+bool FilterElements::NeedSkip(OsmElement const & element, FilterData const & fdata) const
 {
   return fdata.NeedSkipWithId(element.m_id) || fdata.NeedSkipWithTags(element.Tags());
 }
diff --git a/generator/filter_elements.hpp b/generator/filter_elements.hpp
index 6fefb387c..637de9e99 100644
--- a/generator/filter_elements.hpp
+++ b/generator/filter_elements.hpp
@@ -71,7 +71,7 @@ private:
 class FilterElements : public FilterInterface
 {
 public:
-  explicit FilterElements(const std::string & filename);
+  explicit FilterElements(std::string const & filename);
 
   // FilterInterface overrides:
   std::shared_ptr<FilterInterface> Clone() const override;
diff --git a/generator/filter_world.cpp b/generator/filter_world.cpp
index 73641b884..8308e18ee 100644
--- a/generator/filter_world.cpp
+++ b/generator/filter_world.cpp
@@ -31,9 +31,7 @@ bool FilterWorld::IsAccepted(feature::FeatureBuilder const & fb) const
   if (m_isCityTownVillage(fb.GetTypes()))
     return false;
 
-  return (IsGoodScale(fb) ||
-          IsPopularAttraction(fb, m_popularityFilename) ||
-          IsInternationalAirport(fb));
+  return (IsGoodScale(fb) || IsPopularAttraction(fb, m_popularityFilename) || IsInternationalAirport(fb));
 }
 
 // static
diff --git a/generator/final_processor_cities.cpp b/generator/final_processor_cities.cpp
index bf6099d0a..26fa489ca 100644
--- a/generator/final_processor_cities.cpp
+++ b/generator/final_processor_cities.cpp
@@ -1,6 +1,6 @@
 #include "generator/final_processor_cities.hpp"
-#include "generator/final_processor_utils.hpp"
 #include "generator/filter_world.hpp"
+#include "generator/final_processor_utils.hpp"
 #include "generator/place_processor.hpp"
 
 #include <mutex>
@@ -8,14 +8,13 @@
 namespace generator
 {
 
-FinalProcessorCities::FinalProcessorCities(AffiliationInterfacePtr const & affiliation,
-                                           std::string const & mwmPath, size_t threadsCount)
+FinalProcessorCities::FinalProcessorCities(AffiliationInterfacePtr const & affiliation, std::string const & mwmPath,
+                                           size_t threadsCount)
   : FinalProcessorIntermediateMwmInterface(FinalProcessorPriority::Places)
   , m_temporaryMwmPath(mwmPath)
   , m_affiliation(affiliation)
   , m_threadsCount(threadsCount)
-{
-}
+{}
 
 void FinalProcessorCities::Process()
 {
@@ -52,10 +51,8 @@ void FinalProcessorCities::Process()
     FeatureBuilderWriter writer(base::JoinPath(m_temporaryMwmPath, WORLD_FILE_NAME DATA_FILE_EXTENSION_TMP),
                                 FileWriter::Op::OP_APPEND);
     for (auto const & fb : result)
-    {
       if (FilterWorld::IsGoodScale(fb))
         writer.Write(fb);
-    }
   }
 
   if (!m_boundariesOutFile.empty())
@@ -65,4 +62,4 @@ void FinalProcessorCities::Process()
   }
 }
 
-} // namespace generator
+}  // namespace generator
diff --git a/generator/final_processor_cities.hpp b/generator/final_processor_cities.hpp
index 74b29de14..009f61dfe 100644
--- a/generator/final_processor_cities.hpp
+++ b/generator/final_processor_cities.hpp
@@ -8,8 +8,8 @@ namespace generator
 class FinalProcessorCities : public FinalProcessorIntermediateMwmInterface
 {
 public:
-  FinalProcessorCities(AffiliationInterfacePtr const & affiliation,
-                       std::string const & mwmPath, size_t threadsCount = 1);
+  FinalProcessorCities(AffiliationInterfacePtr const & affiliation, std::string const & mwmPath,
+                       size_t threadsCount = 1);
 
   void SetCityBoundariesFiles(std::string const & collectorFile, std::string const & boundariesOutFile)
   {
@@ -25,4 +25,4 @@ private:
   size_t m_threadsCount;
 };
 
-} // namespace generator
+}  // namespace generator
diff --git a/generator/final_processor_coastline.cpp b/generator/final_processor_coastline.cpp
index a6c3528c9..7a6abbb59 100644
--- a/generator/final_processor_coastline.cpp
+++ b/generator/final_processor_coastline.cpp
@@ -3,16 +3,15 @@
 #include "generator/feature_builder.hpp"
 #include "generator/feature_generator.hpp"
 
-
 namespace generator
 {
 using namespace feature;
 
 CoastlineFinalProcessor::CoastlineFinalProcessor(std::string const & filename, size_t threadsCount)
   : FinalProcessorIntermediateMwmInterface(FinalProcessorPriority::WorldCoasts)
-  , m_filename(filename), m_threadsCount(threadsCount)
-{
-}
+  , m_filename(filename)
+  , m_threadsCount(threadsCount)
+{}
 
 void CoastlineFinalProcessor::SetCoastlinesFilenames(std::string const & geomFilename,
                                                      std::string const & rawGeomFilename)
@@ -23,10 +22,8 @@ void CoastlineFinalProcessor::SetCoastlinesFilenames(std::string const & geomFil
 
 void CoastlineFinalProcessor::Process()
 {
-  ForEachFeatureRawFormat<serialization_policy::MaxAccuracy>(m_filename, [this](FeatureBuilder const & fb, uint64_t)
-  {
-    m_generator.Process(fb);
-  });
+  ForEachFeatureRawFormat<serialization_policy::MaxAccuracy>(
+      m_filename, [this](FeatureBuilder const & fb, uint64_t) { m_generator.Process(fb); });
 
   FeaturesAndRawGeometryCollector collector(m_coastlineGeomFilename, m_coastlineRawGeomFilename);
   // Check and stop if some coasts were not merged.
diff --git a/generator/final_processor_coastline.hpp b/generator/final_processor_coastline.hpp
index 6c4e82972..0051b9d8c 100644
--- a/generator/final_processor_coastline.hpp
+++ b/generator/final_processor_coastline.hpp
@@ -12,8 +12,7 @@ class CoastlineFinalProcessor : public FinalProcessorIntermediateMwmInterface
 public:
   CoastlineFinalProcessor(std::string const & filename, size_t threadsCount);
 
-  void SetCoastlinesFilenames(std::string const & geomFilename,
-                              std::string const & rawGeomFilename);
+  void SetCoastlinesFilenames(std::string const & geomFilename, std::string const & rawGeomFilename);
 
   // FinalProcessorIntermediateMwmInterface overrides:
   void Process() override;
diff --git a/generator/final_processor_complex.cpp b/generator/final_processor_complex.cpp
index 0e18aa872..08b31f34b 100644
--- a/generator/final_processor_complex.cpp
+++ b/generator/final_processor_complex.cpp
@@ -13,14 +13,13 @@ using namespace feature;
 
 namespace generator
 {
-ComplexFinalProcessor::ComplexFinalProcessor(std::string const & mwmTmpPath,
-                                             std::string const & outFilename, size_t threadsCount)
+ComplexFinalProcessor::ComplexFinalProcessor(std::string const & mwmTmpPath, std::string const & outFilename,
+                                             size_t threadsCount)
   : FinalProcessorIntermediateMwmInterface(FinalProcessorPriority::Complex)
   , m_mwmTmpPath(mwmTmpPath)
   , m_outFilename(outFilename)
   , m_threadsCount(threadsCount)
-{
-}
+{}
 
 void ComplexFinalProcessor::SetGetMainTypeFunction(hierarchy::GetMainTypeFn const & getMainType)
 {
@@ -42,8 +41,7 @@ void ComplexFinalProcessor::SetPrintFunction(hierarchy::PrintFn const & printFun
   m_printFunction = printFunction;
 }
 
-void ComplexFinalProcessor::UseCentersEnricher(std::string const & mwmPath,
-                                               std::string const & osm2ftPath)
+void ComplexFinalProcessor::UseCentersEnricher(std::string const & mwmPath, std::string const & osm2ftPath)
 {
   m_useCentersEnricher = true;
   m_mwmPath = mwmPath;
@@ -70,7 +68,8 @@ void ComplexFinalProcessor::Process()
 
   std::mutex mutex;
   std::vector<HierarchyEntry> allLines;
-  ForEachMwmTmp(m_mwmTmpPath, [&](auto const & name, auto const & path) {
+  ForEachMwmTmp(m_mwmTmpPath, [&](auto const & name, auto const & path)
+  {
     // https://wiki.openstreetmap.org/wiki/Simple_3D_buildings
     // An object with tag 'building:part' is a part of a relation with outline 'building' or
     // is contained in an object with tag 'building'. We will split data and work with
@@ -87,7 +86,8 @@ void ComplexFinalProcessor::Process()
     auto trees = hierarchy::BuildHierarchy(std::move(fbs), m_getMainType, m_filter);
 
     // We remove tree roots with tag 'building:part'.
-    base::EraseIf(trees, [](auto const & node) {
+    base::EraseIf(trees, [](auto const & node)
+    {
       static auto const & buildingPartChecker = ftypes::IsBuildingPartChecker::Instance();
       return buildingPartChecker(node->GetData().GetTypes());
     });
@@ -104,7 +104,8 @@ void ComplexFinalProcessor::Process()
     // In the end we add objects, which were saved by the collector.
     if (m_buildingToParts)
     {
-      hierarchy::AddChildrenTo(trees, [&](auto const & compositeId) {
+      hierarchy::AddChildrenTo(trees, [&](auto const & compositeId)
+      {
         auto const & ids = m_buildingToParts->GetBuildingPartsByOutlineId(compositeId);
         std::vector<hierarchy::HierarchyPlace> places;
         places.reserve(ids.size());
@@ -138,23 +139,22 @@ void ComplexFinalProcessor::Process()
   WriteLines(allLines);
 }
 
-std::unordered_map<base::GeoObjectId, FeatureBuilder>
-ComplexFinalProcessor::RemoveRelationBuildingParts(std::vector<FeatureBuilder> & fbs)
+std::unordered_map<base::GeoObjectId, FeatureBuilder> ComplexFinalProcessor::RemoveRelationBuildingParts(
+    std::vector<FeatureBuilder> & fbs)
 {
   CHECK(m_buildingToParts, ());
 
-  auto it = std::partition(std::begin(fbs), std::end(fbs), [&](auto const & fb) {
-    return !m_buildingToParts->HasBuildingPart(fb.GetMostGenericOsmId());
-  });
+  auto it = std::partition(std::begin(fbs), std::end(fbs), [&](auto const & fb)
+  { return !m_buildingToParts->HasBuildingPart(fb.GetMostGenericOsmId()); });
 
   std::unordered_map<base::GeoObjectId, FeatureBuilder> buildingParts;
   buildingParts.reserve(static_cast<size_t>(std::distance(it, std::end(fbs))));
 
-  std::transform(it, std::end(fbs), std::inserter(buildingParts, std::begin(buildingParts)),
-                 [](auto && fb) {
-                   auto const id = fb.GetMostGenericOsmId();
-                   return std::make_pair(id, std::move(fb));
-                 });
+  std::transform(it, std::end(fbs), std::inserter(buildingParts, std::begin(buildingParts)), [](auto && fb)
+  {
+    auto const id = fb.GetMostGenericOsmId();
+    return std::make_pair(id, std::move(fb));
+  });
 
   fbs.resize(static_cast<size_t>(std::distance(std::begin(fbs), it)));
   return buildingParts;
diff --git a/generator/final_processor_complex.hpp b/generator/final_processor_complex.hpp
index 17f09f72e..b5d8f7476 100644
--- a/generator/final_processor_complex.hpp
+++ b/generator/final_processor_complex.hpp
@@ -21,8 +21,7 @@ namespace generator
 class ComplexFinalProcessor : public FinalProcessorIntermediateMwmInterface
 {
 public:
-  ComplexFinalProcessor(std::string const & mwmTmpPath, std::string const & outFilename,
-                        size_t threadsCount);
+  ComplexFinalProcessor(std::string const & mwmTmpPath, std::string const & outFilename, size_t threadsCount);
 
   void SetGetMainTypeFunction(hierarchy::GetMainTypeFn const & getMainType);
   void SetFilter(std::shared_ptr<FilterInterface> const & filter);
@@ -36,8 +35,7 @@ public:
   void Process() override;
 
 private:
-  std::unique_ptr<hierarchy::HierarchyEntryEnricher> CreateEnricher(
-      std::string const & countryName) const;
+  std::unique_ptr<hierarchy::HierarchyEntryEnricher> CreateEnricher(std::string const & countryName) const;
   void WriteLines(std::vector<HierarchyEntry> const & lines);
   std::unordered_map<base::GeoObjectId, feature::FeatureBuilder> RemoveRelationBuildingParts(
       std::vector<feature::FeatureBuilder> & fbs);
diff --git a/generator/final_processor_country.cpp b/generator/final_processor_country.cpp
index 86ad25d01..40ea56841 100644
--- a/generator/final_processor_country.cpp
+++ b/generator/final_processor_country.cpp
@@ -1,7 +1,7 @@
 #include "generator/final_processor_country.hpp"
 
-#include "generator/addresses_collector.hpp"
 #include "generator/address_enricher.hpp"
+#include "generator/addresses_collector.hpp"
 #include "generator/affiliation.hpp"
 #include "generator/coastlines_generator.hpp"
 #include "generator/feature_builder.hpp"
@@ -20,13 +20,12 @@
 #include "geometry/mercator.hpp"
 #include "geometry/region2d/binary_operators.hpp"
 
-
 namespace generator
 {
 using namespace feature;
 
-CountryFinalProcessor::CountryFinalProcessor(AffiliationInterfacePtr affiliations,
-                                             std::string const & temporaryMwmPath, size_t threadsCount)
+CountryFinalProcessor::CountryFinalProcessor(AffiliationInterfacePtr affiliations, std::string const & temporaryMwmPath,
+                                             size_t threadsCount)
   : FinalProcessorIntermediateMwmInterface(FinalProcessorPriority::CountriesOrWorld)
   , m_temporaryMwmPath(temporaryMwmPath)
   , m_affiliations(std::move(affiliations))
@@ -42,7 +41,7 @@ bool CountryFinalProcessor::IsCountry(std::string const & filename)
 
 void CountryFinalProcessor::Process()
 {
-  //Order();
+  // Order();
 
   /// @todo Make "straight-way" processing. There is no need to make many functions and
   /// many read-write FeatureBuilder ops here.
@@ -64,10 +63,10 @@ void CountryFinalProcessor::Process()
   if (!m_isolinesPath.empty())
     AddIsolines();
 
-  //DropProhibitedSpeedCameras();
+  // DropProhibitedSpeedCameras();
   ProcessBuildingParts();
 
-  //Finish();
+  // Finish();
 }
 
 /*
@@ -133,15 +132,11 @@ void CountryFinalProcessor::ProcessRoundabouts()
 
     // Adds new way features generated from mini-roundabout nodes with those nodes ids.
     // Transforms points on roads to connect them with these new roundabout junctions.
-    transformer.ProcessRoundabouts([&writer](FeatureBuilder const & fb)
-    {
-      writer.Write(fb);
-    });
+    transformer.ProcessRoundabouts([&writer](FeatureBuilder const & fb) { writer.Write(fb); });
   }, m_threadsCount);
 }
 
-bool DoesBuildingConsistOfParts(FeatureBuilder const & fbBuilding,
-                                m4::Tree<m2::RegionI> const & buildingPartsKDTree)
+bool DoesBuildingConsistOfParts(FeatureBuilder const & fbBuilding, m4::Tree<m2::RegionI> const & buildingPartsKDTree)
 {
   m2::RegionI building;
   m2::MultiRegionI partsUnion;
@@ -204,7 +199,7 @@ bool DoesBuildingConsistOfParts(FeatureBuilder const & fbBuilding,
 
   uint64_t const isectArea = m2::Area(m2::IntersectRegions(building, partsUnion));
   // That doesn't work with *very* degenerated polygons like https://www.openstreetmap.org/way/629725974.
-  //CHECK(isectArea * 0.95 <= buildingArea, (isectArea, buildingArea, fbBuilding.DebugPrintIDs()));
+  // CHECK(isectArea * 0.95 <= buildingArea, (isectArea, buildingArea, fbBuilding.DebugPrintIDs()));
 
   // Consider building as consisting of parts if the building footprint is covered with parts at least by 90%.
   return isectArea >= 0.9 * buildingArea;
@@ -236,9 +231,7 @@ void CountryFinalProcessor::ProcessBuildingParts()
     FeatureBuilderWriter<serialization_policy::MaxAccuracy> writer(path, true /* mangleName */);
     ForEachFeatureRawFormat<serialization_policy::MaxAccuracy>(path, [&](FeatureBuilder && fb, uint64_t)
     {
-      if (fb.IsArea() &&
-          buildingChecker(fb.GetTypes()) &&
-          DoesBuildingConsistOfParts(fb, buildingPartsKDTree))
+      if (fb.IsArea() && buildingChecker(fb.GetTypes()) && DoesBuildingConsistOfParts(fb, buildingPartsKDTree))
       {
         fb.AddType(buildingHasPartsChecker.GetType());
         fb.GetParams().FinishAddingTypes();
@@ -280,10 +273,8 @@ void CountryFinalProcessor::AddAddresses()
     AddressEnricher enricher;
 
     // Collect existing addresses and streets.
-    ForEachFeatureRawFormat<serialization_policy::MaxAccuracy>(path, [&](FeatureBuilder && fb, uint64_t)
-    {
-      enricher.AddSrc(std::move(fb));
-    });
+    ForEachFeatureRawFormat<serialization_policy::MaxAccuracy>(
+        path, [&](FeatureBuilder && fb, uint64_t) { enricher.AddSrc(std::move(fb)); });
 
     // Append new addresses.
     FeatureBuilderWriter<serialization_policy::MaxAccuracy> writer(path, FileWriter::Op::OP_APPEND);
diff --git a/generator/final_processor_country.hpp b/generator/final_processor_country.hpp
index a0152287c..7f6b270ea 100644
--- a/generator/final_processor_country.hpp
+++ b/generator/final_processor_country.hpp
@@ -10,41 +10,22 @@ namespace generator
 class CountryFinalProcessor : public FinalProcessorIntermediateMwmInterface
 {
 public:
-  CountryFinalProcessor(AffiliationInterfacePtr affiliations,
-                        std::string const & temporaryMwmPath, size_t threadsCount);
+  CountryFinalProcessor(AffiliationInterfacePtr affiliations, std::string const & temporaryMwmPath,
+                        size_t threadsCount);
 
-  void SetCoastlines(std::string const & coastlineGeomFilename,
-                     std::string const & worldCoastsFilename)
+  void SetCoastlines(std::string const & coastlineGeomFilename, std::string const & worldCoastsFilename)
   {
     m_coastlineGeomFilename = coastlineGeomFilename;
     m_worldCoastsFilename = worldCoastsFilename;
   }
-  void SetFakeNodes(std::string const & filename)
-  {
-    m_fakeNodesFilename = filename;
-  }
-  void SetMiniRoundabouts(std::string const & filename)
-  {
-    m_miniRoundaboutsFilename = filename;
-  }
-  void SetAddrInterpolation(std::string const & filename)
-  {
-    m_addrInterpolFilename = filename;
-  }
+  void SetFakeNodes(std::string const & filename) { m_fakeNodesFilename = filename; }
+  void SetMiniRoundabouts(std::string const & filename) { m_miniRoundaboutsFilename = filename; }
+  void SetAddrInterpolation(std::string const & filename) { m_addrInterpolFilename = filename; }
 
-  void SetIsolinesDir(std::string const & dir)
-  {
-    m_isolinesPath = dir;
-  }
-  void SetAddressesDir(std::string const & dir)
-  {
-    m_addressPath = dir;
-  }
+  void SetIsolinesDir(std::string const & dir) { m_isolinesPath = dir; }
+  void SetAddressesDir(std::string const & dir) { m_addressPath = dir; }
 
-  void SetCityBoundariesFiles(std::string const & collectorFile)
-  {
-    m_boundariesCollectorFile = collectorFile;
-  }
+  void SetCityBoundariesFiles(std::string const & collectorFile) { m_boundariesCollectorFile = collectorFile; }
 
   // FinalProcessorIntermediateMwmInterface overrides:
   void Process() override;
@@ -52,14 +33,14 @@ public:
   void ProcessBuildingParts();
 
 private:
-  //void Order();
+  // void Order();
   void ProcessCoastline();
   void ProcessRoundabouts();
   void AddFakeNodes();
   void AddIsolines();
   void AddAddresses();
   void DropProhibitedSpeedCameras();
-  //void Finish();
+  // void Finish();
 
   bool IsCountry(std::string const & filename);
 
diff --git a/generator/final_processor_interface.hpp b/generator/final_processor_interface.hpp
index 509229f84..ff055e395 100644
--- a/generator/final_processor_interface.hpp
+++ b/generator/final_processor_interface.hpp
@@ -20,18 +20,12 @@ enum class FinalProcessorPriority : uint8_t
 class FinalProcessorIntermediateMwmInterface
 {
 public:
-  explicit FinalProcessorIntermediateMwmInterface(FinalProcessorPriority priority)
-    : m_priority(priority)
-  {
-  }
+  explicit FinalProcessorIntermediateMwmInterface(FinalProcessorPriority priority) : m_priority(priority) {}
   virtual ~FinalProcessorIntermediateMwmInterface() = default;
 
   virtual void Process() = 0;
 
-  bool operator<(FinalProcessorIntermediateMwmInterface const & other) const
-  {
-    return m_priority < other.m_priority;
-  }
+  bool operator<(FinalProcessorIntermediateMwmInterface const & other) const { return m_priority < other.m_priority; }
 
 protected:
   FinalProcessorPriority m_priority;
diff --git a/generator/final_processor_utils.cpp b/generator/final_processor_utils.cpp
index 552358d7e..a9ae1f62a 100644
--- a/generator/final_processor_utils.cpp
+++ b/generator/final_processor_utils.cpp
@@ -24,11 +24,13 @@ bool Less(FeatureBuilder const & lhs, FeatureBuilder const & rhs)
   auto const lKeyPoint = lhs.GetKeyPoint();
   auto const rKeyPoint = rhs.GetKeyPoint();
 
-  return std::tie(lGeomType, lId, lPointsCount, lKeyPoint) <
-         std::tie(rGeomType, rId, rPointsCount, rKeyPoint);
+  return std::tie(lGeomType, lId, lPointsCount, lKeyPoint) < std::tie(rGeomType, rId, rPointsCount, rKeyPoint);
 }
 
-void Order(std::vector<FeatureBuilder> & fbs) { std::sort(std::begin(fbs), std::end(fbs), Less); }
+void Order(std::vector<FeatureBuilder> & fbs)
+{
+  std::sort(std::begin(fbs), std::end(fbs), Less);
+}
 
 void OrderTextFileByLine(std::string const & filename)
 {
@@ -50,8 +52,7 @@ void OrderTextFileByLine(std::string const & filename)
 }
 
 std::vector<std::vector<std::string>> GetAffiliations(std::vector<FeatureBuilder> const & fbs,
-                                                      AffiliationInterface const & affiliation,
-                                                      size_t threadsCount)
+                                                      AffiliationInterface const & affiliation, size_t threadsCount)
 {
   base::ComputationalThreadPool pool(threadsCount);
   std::vector<std::future<std::vector<std::string>>> futuresAffiliations;
diff --git a/generator/final_processor_utils.hpp b/generator/final_processor_utils.hpp
index 8ce2d47af..4986144e9 100644
--- a/generator/final_processor_utils.hpp
+++ b/generator/final_processor_utils.hpp
@@ -33,23 +33,21 @@ void ForEachMwmTmp(std::string const & temporaryMwmPath, ToDo && toDo, size_t th
   }
 }
 
-std::vector<std::vector<std::string>> GetAffiliations(
-    std::vector<feature::FeatureBuilder> const & fbs,
-    feature::AffiliationInterface const & affiliation, size_t threadsCount);
+std::vector<std::vector<std::string>> GetAffiliations(std::vector<feature::FeatureBuilder> const & fbs,
+                                                      feature::AffiliationInterface const & affiliation,
+                                                      size_t threadsCount);
 
 // Writes |fbs| to countries mwm.tmp files. Returns affiliations - country matches for |fbs|.
 template <class SerializationPolicy = feature::serialization_policy::MaxAccuracy>
 std::vector<std::vector<std::string>> AppendToMwmTmp(std::vector<feature::FeatureBuilder> const & fbs,
-                       feature::AffiliationInterface const & affiliation,
-                       std::string const & temporaryMwmPath, size_t threadsCount = 1)
+                                                     feature::AffiliationInterface const & affiliation,
+                                                     std::string const & temporaryMwmPath, size_t threadsCount = 1)
 {
   auto affiliations = GetAffiliations(fbs, affiliation, threadsCount);
   std::unordered_map<std::string, std::vector<size_t>> countryToFbsIndexes;
   for (size_t i = 0; i < fbs.size(); ++i)
-  {
     for (auto const & country : affiliations[i])
       countryToFbsIndexes[country].emplace_back(i);
-  }
 
   base::ComputationalThreadPool pool(threadsCount);
   for (auto && p : countryToFbsIndexes)
diff --git a/generator/final_processor_world.cpp b/generator/final_processor_world.cpp
index ab420d238..4a6916eea 100644
--- a/generator/final_processor_world.cpp
+++ b/generator/final_processor_world.cpp
@@ -14,11 +14,9 @@ WorldFinalProcessor::WorldFinalProcessor(std::string const & temporaryMwmPath,
                                          std::string const & coastlineGeomFilename)
   : FinalProcessorIntermediateMwmInterface(FinalProcessorPriority::CountriesOrWorld)
   , m_temporaryMwmPath(temporaryMwmPath)
-  , m_worldTmpFilename(base::JoinPath(m_temporaryMwmPath, WORLD_FILE_NAME) +
-                       DATA_FILE_EXTENSION_TMP)
+  , m_worldTmpFilename(base::JoinPath(m_temporaryMwmPath, WORLD_FILE_NAME) + DATA_FILE_EXTENSION_TMP)
   , m_coastlineGeomFilename(coastlineGeomFilename)
-{
-}
+{}
 
 void WorldFinalProcessor::Process()
 {
diff --git a/generator/final_processor_world.hpp b/generator/final_processor_world.hpp
index db1ef7dee..bb93587f4 100644
--- a/generator/final_processor_world.hpp
+++ b/generator/final_processor_world.hpp
@@ -16,10 +16,7 @@ public:
   /// @param[in]  coastGeomFilename   Can be empty if you don't care about cutting borders by water.
   WorldFinalProcessor(std::string const & temporaryMwmPath, std::string const & coastGeomFilename);
 
-  void SetPopularPlaces(std::string const & filename)
-  {
-    m_popularPlacesFilename = filename;
-  }
+  void SetPopularPlaces(std::string const & filename) { m_popularPlacesFilename = filename; }
 
   // FinalProcessorIntermediateMwmInterface overrides:
   void Process() override;
diff --git a/generator/gen_mwm_info.cpp b/generator/gen_mwm_info.cpp
index baab804a6..7bbdaf102 100644
--- a/generator/gen_mwm_info.cpp
+++ b/generator/gen_mwm_info.cpp
@@ -13,7 +13,10 @@ uint32_t const OsmID2FeatureID::kHeaderMagic;
 
 OsmID2FeatureID::OsmID2FeatureID() : m_version(Version::V1) {}
 
-OsmID2FeatureID::Version OsmID2FeatureID::GetVersion() const { return m_version; }
+OsmID2FeatureID::Version OsmID2FeatureID::GetVersion() const
+{
+  return m_version;
+}
 
 bool OsmID2FeatureID::ReadFromFile(std::string const & filename)
 {
@@ -25,8 +28,7 @@ bool OsmID2FeatureID::ReadFromFile(std::string const & filename)
   }
   catch (FileReader::Exception const & e)
   {
-    LOG(LERROR, ("Exception while reading osm id to feature id mapping from file", filename,
-                 ". Msg:", e.Msg()));
+    LOG(LERROR, ("Exception while reading osm id to feature id mapping from file", filename, ". Msg:", e.Msg()));
     return false;
   }
 
@@ -60,4 +62,3 @@ std::vector<uint32_t> OsmID2FeatureID::GetFeatureIds(base::GeoObjectId mainId) c
   return ids;
 }
 }  // namespace generator
-
diff --git a/generator/generate_info.hpp b/generator/generate_info.hpp
index 8bdfe943a..8400352d8 100644
--- a/generator/generate_info.hpp
+++ b/generator/generate_info.hpp
@@ -96,20 +96,17 @@ struct GenerateInfo
       LOG(LCRITICAL, ("Incorrect node_storage type:", type));
   }
 
-  std::string GetTmpFileName(std::string const & fileName,
-                             std::string const & ext = DATA_FILE_EXTENSION_TMP) const
+  std::string GetTmpFileName(std::string const & fileName, std::string const & ext = DATA_FILE_EXTENSION_TMP) const
   {
     return base::JoinPath(m_tmpDir, fileName + ext);
   }
 
-  std::string GetTargetFileName(std::string const & fileName,
-                                std::string const & ext = DATA_FILE_EXTENSION) const
+  std::string GetTargetFileName(std::string const & fileName, std::string const & ext = DATA_FILE_EXTENSION) const
   {
     return base::JoinPath(m_targetDir, fileName + ext);
   }
 
-  std::string GetIntermediateFileName(std::string const & fileName,
-                                      std::string const & ext = "") const
+  std::string GetIntermediateFileName(std::string const & fileName, std::string const & ext = "") const
   {
     return base::JoinPath(m_intermediateDir, fileName + ext);
   }
diff --git a/generator/generator_integration_tests/features_tests.cpp b/generator/generator_integration_tests/features_tests.cpp
index 31413d7fb..e42550da6 100644
--- a/generator/generator_integration_tests/features_tests.cpp
+++ b/generator/generator_integration_tests/features_tests.cpp
@@ -39,8 +39,8 @@ struct CountryFeaturesCounters
 
   CountryFeaturesCounters() = default;
 
-  constexpr CountryFeaturesCounters(int64_t fbs, int64_t geometryPoints, int64_t point, int64_t line,
-                                    int64_t area, int64_t poi, int64_t cityTownOrVillage)
+  constexpr CountryFeaturesCounters(int64_t fbs, int64_t geometryPoints, int64_t point, int64_t line, int64_t area,
+                                    int64_t poi, int64_t cityTownOrVillage)
     : m_fbs(fbs)
     , m_geometryPoints(geometryPoints)
     , m_point(point)
@@ -48,28 +48,27 @@ struct CountryFeaturesCounters
     , m_area(area)
     , m_poi(poi)
     , m_cityTownOrVillage(cityTownOrVillage)
-  {
-  }
+  {}
 
   CountryFeaturesCounters operator+(CountryFeaturesCounters const & rhs) const
   {
-    return CountryFeaturesCounters(m_fbs + rhs.m_fbs, m_geometryPoints + rhs.m_geometryPoints,
-                                   m_point + rhs.m_point, m_line + rhs.m_line, m_area + rhs.m_area,
-                                   m_poi + rhs.m_poi, m_cityTownOrVillage + rhs.m_cityTownOrVillage);
+    return CountryFeaturesCounters(m_fbs + rhs.m_fbs, m_geometryPoints + rhs.m_geometryPoints, m_point + rhs.m_point,
+                                   m_line + rhs.m_line, m_area + rhs.m_area, m_poi + rhs.m_poi,
+                                   m_cityTownOrVillage + rhs.m_cityTownOrVillage);
   }
 
   CountryFeaturesCounters operator-(CountryFeaturesCounters const & rhs) const
   {
-    return CountryFeaturesCounters(m_fbs - rhs.m_fbs, m_geometryPoints - rhs.m_geometryPoints,
-                                   m_point - rhs.m_point, m_line - rhs.m_line, m_area - rhs.m_area,
-                                   m_poi - rhs.m_poi, m_cityTownOrVillage - rhs.m_cityTownOrVillage);
+    return CountryFeaturesCounters(m_fbs - rhs.m_fbs, m_geometryPoints - rhs.m_geometryPoints, m_point - rhs.m_point,
+                                   m_line - rhs.m_line, m_area - rhs.m_area, m_poi - rhs.m_poi,
+                                   m_cityTownOrVillage - rhs.m_cityTownOrVillage);
   }
 
   bool operator==(CountryFeaturesCounters const & rhs) const
   {
-    return m_fbs == rhs.m_fbs && m_geometryPoints == rhs.m_geometryPoints &&
-           m_point == rhs.m_point && m_line == rhs.m_line && m_area == rhs.m_area &&
-           m_poi == rhs.m_poi && m_cityTownOrVillage == rhs.m_cityTownOrVillage;
+    return m_fbs == rhs.m_fbs && m_geometryPoints == rhs.m_geometryPoints && m_point == rhs.m_point &&
+           m_line == rhs.m_line && m_area == rhs.m_area && m_poi == rhs.m_poi &&
+           m_cityTownOrVillage == rhs.m_cityTownOrVillage;
   }
 
   bool operator!=(CountryFeaturesCounters const & rhs) const { return !(*this == rhs); }
@@ -79,9 +78,9 @@ struct CountryFeatureResults
 {
   CountryFeatureResults() = default;
   CountryFeatureResults(CountryFeaturesCounters actual, CountryFeaturesCounters expected)
-    : m_actual(actual), m_expected(expected)
-  {
-  }
+    : m_actual(actual)
+    , m_expected(expected)
+  {}
 
   CountryFeaturesCounters m_actual;
   CountryFeaturesCounters m_expected;
@@ -93,9 +92,8 @@ void TestAndLogCountryFeatures(std::map<std::string, CountryFeatureResults> cons
   {
     if (result.second.m_actual != result.second.m_expected)
     {
-      LOG(LINFO, ("Unexpectad result for", result.first, "actual:", result.second.m_actual,
-                  "expected:", result.second.m_expected,
-                  "the difference is:", result.second.m_actual - result.second.m_expected));
+      LOG(LINFO, ("Unexpectad result for", result.first, "actual:", result.second.m_actual, "expected:",
+                  result.second.m_expected, "the difference is:", result.second.m_actual - result.second.m_expected));
     }
   }
 
@@ -115,45 +113,45 @@ std::string DebugPrint(CountryFeaturesCounters const & cnt)
   return out.str();
 }
 
-CountryFeaturesCounters constexpr kWorldCounters(945 /* fbs */, 364406 /* geometryPoints */,
-                                                 334 /* point */, 598 /* line */, 13 /* area */,
-                                                 428 /* poi */, 172 /* cityTownOrVillage */);
+CountryFeaturesCounters constexpr kWorldCounters(945 /* fbs */, 364406 /* geometryPoints */, 334 /* point */,
+                                                 598 /* line */, 13 /* area */, 428 /* poi */,
+                                                 172 /* cityTownOrVillage */);
 
-CountryFeaturesCounters constexpr kNorthAucklandCounters(
-    1812144 /* fbs */, 12195444 /* geometryPoints */, 1007580 /* point */, 205448 /* line */,
-    599116 /* area */, 212424 /* poi */, 521 /* cityTownOrVillage */);
+CountryFeaturesCounters constexpr kNorthAucklandCounters(1812144 /* fbs */, 12195444 /* geometryPoints */,
+                                                         1007580 /* point */, 205448 /* line */, 599116 /* area */,
+                                                         212424 /* poi */, 521 /* cityTownOrVillage */);
 
-CountryFeaturesCounters constexpr kNorthWellingtonCounters(
-    797814 /* fbs */, 7771530 /* geometryPoints */, 460560 /* point */, 86978 /* line */,
-    250276 /* area */, 95863 /* poi */, 297 /* cityTownOrVillage */);
+CountryFeaturesCounters constexpr kNorthWellingtonCounters(797814 /* fbs */, 7771530 /* geometryPoints */,
+                                                           460560 /* point */, 86978 /* line */, 250276 /* area */,
+                                                           95863 /* poi */, 297 /* cityTownOrVillage */);
 
-CountryFeaturesCounters constexpr kSouthCanterburyCounters(
-    637239 /* fbs */, 6984183 /* geometryPoints */, 397964 /* point */, 81688 /* line */,
-    157587 /* area */, 89690 /* poi */, 331 /* cityTownOrVillage */);
+CountryFeaturesCounters constexpr kSouthCanterburyCounters(637239 /* fbs */, 6984183 /* geometryPoints */,
+                                                           397964 /* point */, 81688 /* line */, 157587 /* area */,
+                                                           89690 /* poi */, 331 /* cityTownOrVillage */);
 
-CountryFeaturesCounters constexpr kSouthSouthlandCounters(
-    340644 /* fbs */, 5342380 /* geometryPoints */, 186000 /* point */, 40118 /* line */,
-    114526 /* area */, 40671 /* poi */, 297 /* cityTownOrVillage */);
+CountryFeaturesCounters constexpr kSouthSouthlandCounters(340644 /* fbs */, 5342380 /* geometryPoints */,
+                                                          186000 /* point */, 40118 /* line */, 114526 /* area */,
+                                                          40671 /* poi */, 297 /* cityTownOrVillage */);
 
-CountryFeaturesCounters constexpr kSouthSouthlandMixedNodesCounters(
-    2 /* fbs */, 2 /* geometryPoints */, 2 /* point */, 0 /* line */, 0 /* area */, 0 /* poi */,
-    0 /* cityTownOrVillage */);
+CountryFeaturesCounters constexpr kSouthSouthlandMixedNodesCounters(2 /* fbs */, 2 /* geometryPoints */, 2 /* point */,
+                                                                    0 /* line */, 0 /* area */, 0 /* poi */,
+                                                                    0 /* cityTownOrVillage */);
 
-CountryFeaturesCounters constexpr kNorthAucklandComplexFeaturesCounters(
-    288 /* fbs */, 16119 /* geometryPoints */, 0 /* point */, 252 /* line */, 36 /* area */,
-    0 /* poi */, 0 /* cityTownOrVillage */);
+CountryFeaturesCounters constexpr kNorthAucklandComplexFeaturesCounters(288 /* fbs */, 16119 /* geometryPoints */,
+                                                                        0 /* point */, 252 /* line */, 36 /* area */,
+                                                                        0 /* poi */, 0 /* cityTownOrVillage */);
 
-CountryFeaturesCounters constexpr kNorthWellingtonComplexFeaturesCounters(
-    254 /* fbs */, 18434 /* geometryPoints */, 0 /* point */, 244 /* line */, 10 /* area */,
-    0 /* poi */, 0 /* cityTownOrVillage */);
+CountryFeaturesCounters constexpr kNorthWellingtonComplexFeaturesCounters(254 /* fbs */, 18434 /* geometryPoints */,
+                                                                          0 /* point */, 244 /* line */, 10 /* area */,
+                                                                          0 /* poi */, 0 /* cityTownOrVillage */);
 
-CountryFeaturesCounters constexpr kSouthCanterburyComplexFeaturesCounters(
-    1037 /* fbs */, 73854 /* geometryPoints */, 0 /* point */, 1016 /* line */, 21 /* area */,
-    0 /* poi */, 0 /* cityTownOrVillage */);
+CountryFeaturesCounters constexpr kSouthCanterburyComplexFeaturesCounters(1037 /* fbs */, 73854 /* geometryPoints */,
+                                                                          0 /* point */, 1016 /* line */, 21 /* area */,
+                                                                          0 /* poi */, 0 /* cityTownOrVillage */);
 
-CountryFeaturesCounters constexpr kSouthSouthlandComplexFeaturesCounters(
-    1252 /* fbs */, 141706 /* geometryPoints */, 0 /* point */, 1245 /* line */, 7 /* area */,
-    0 /* poi */, 0 /* cityTownOrVillage */);
+CountryFeaturesCounters constexpr kSouthSouthlandComplexFeaturesCounters(1252 /* fbs */, 141706 /* geometryPoints */,
+                                                                         0 /* point */, 1245 /* line */, 7 /* area */,
+                                                                         0 /* poi */, 0 /* cityTownOrVillage */);
 
 class FeatureIntegrationTests
 {
@@ -172,19 +170,14 @@ public:
     CHECK(Platform::RmDirRecursively(m_testPath), ());
     CHECK(Platform::RemoveFileIfExists(m_mixedNodesFilenames.first), ());
     CHECK(Platform::RemoveFileIfExists(m_mixedTagsFilenames.first), ());
-    CHECK_EQUAL(
-        std::rename(m_mixedNodesFilenames.second.c_str(), m_mixedNodesFilenames.first.c_str()), 0,
-        ());
-    CHECK_EQUAL(
-        std::rename(m_mixedTagsFilenames.second.c_str(), m_mixedTagsFilenames.first.c_str()), 0,
-        ());
+    CHECK_EQUAL(std::rename(m_mixedNodesFilenames.second.c_str(), m_mixedNodesFilenames.first.c_str()), 0, ());
+    CHECK_EQUAL(std::rename(m_mixedTagsFilenames.second.c_str(), m_mixedTagsFilenames.first.c_str()), 0, ());
   }
 
   void BuildCoasts()
   {
     auto const worldCoastsGeom = m_genInfo.GetIntermediateFileName(WORLD_COASTS_FILE_NAME ".geom");
-    auto const worldCoastsRawGeom =
-        m_genInfo.GetIntermediateFileName(WORLD_COASTS_FILE_NAME ".rawgeom");
+    auto const worldCoastsRawGeom = m_genInfo.GetIntermediateFileName(WORLD_COASTS_FILE_NAME ".rawgeom");
 
     CHECK(!Platform::IsFileExistsByFullPath(worldCoastsGeom), ());
     CHECK(!Platform::IsFileExistsByFullPath(worldCoastsRawGeom), ());
@@ -235,8 +228,7 @@ public:
   void BuildCountries()
   {
     m_genInfo.m_emitCoasts = true;
-    m_genInfo.m_citiesBoundariesFilename =
-        m_genInfo.GetIntermediateFileName("citiesboundaries.bin");
+    m_genInfo.m_citiesBoundariesFilename = m_genInfo.GetIntermediateFileName("citiesboundaries.bin");
 
     auto const northAuckland = m_genInfo.GetTmpFileName("New Zealand North_Auckland");
     auto const northWellington = m_genInfo.GetTmpFileName("New Zealand North_Wellington");
@@ -265,8 +257,7 @@ public:
   void BuildCountriesWithComplex()
   {
     m_genInfo.m_emitCoasts = true;
-    m_genInfo.m_citiesBoundariesFilename =
-        m_genInfo.GetIntermediateFileName("citiesboundaries.bin");
+    m_genInfo.m_citiesBoundariesFilename = m_genInfo.GetIntermediateFileName("citiesboundaries.bin");
     m_genInfo.m_complexHierarchyFilename = base::JoinPath(m_testPath, "hierarchy.csv");
 
     auto const northAuckland = m_genInfo.GetTmpFileName("New Zealand North_Auckland");
@@ -282,26 +273,21 @@ public:
     TEST(rawGenerator.Execute(), ());
 
     std::map<std::string, CountryFeatureResults> results;
-    results["kNorthAucklandCounters + kNorthAucklandComplexFeaturesCounters"] =
-        CountryFeatureResults(GetCountersForCountry(northAuckland),
-                              kNorthAucklandCounters + kNorthAucklandComplexFeaturesCounters);
-    results["kNorthWellingtonCounters + kNorthWellingtonComplexFeaturesCounters"] =
-        CountryFeatureResults(GetCountersForCountry(northWellington),
-                              kNorthWellingtonCounters + kNorthWellingtonComplexFeaturesCounters);
-    results["kSouthCanterburyCounters + kSouthCanterburyComplexFeaturesCounters"] =
-        CountryFeatureResults(GetCountersForCountry(southCanterbury),
-                              kSouthCanterburyCounters + kSouthCanterburyComplexFeaturesCounters);
-    results["kSouthSouthlandCounters + kSouthSouthlandComplexFeaturesCounters"] =
-        CountryFeatureResults(GetCountersForCountry(southSouthland),
-                              kSouthSouthlandCounters + kSouthSouthlandComplexFeaturesCounters);
+    results["kNorthAucklandCounters + kNorthAucklandComplexFeaturesCounters"] = CountryFeatureResults(
+        GetCountersForCountry(northAuckland), kNorthAucklandCounters + kNorthAucklandComplexFeaturesCounters);
+    results["kNorthWellingtonCounters + kNorthWellingtonComplexFeaturesCounters"] = CountryFeatureResults(
+        GetCountersForCountry(northWellington), kNorthWellingtonCounters + kNorthWellingtonComplexFeaturesCounters);
+    results["kSouthCanterburyCounters + kSouthCanterburyComplexFeaturesCounters"] = CountryFeatureResults(
+        GetCountersForCountry(southCanterbury), kSouthCanterburyCounters + kSouthCanterburyComplexFeaturesCounters);
+    results["kSouthSouthlandCounters + kSouthSouthlandComplexFeaturesCounters"] = CountryFeatureResults(
+        GetCountersForCountry(southSouthland), kSouthSouthlandCounters + kSouthSouthlandComplexFeaturesCounters);
     TestAndLogCountryFeatures(results);
   }
 
   void CheckMixedTagsAndNodes()
   {
     m_genInfo.m_emitCoasts = true;
-    m_genInfo.m_citiesBoundariesFilename =
-        m_genInfo.GetIntermediateFileName("citiesboundaries.bin");
+    m_genInfo.m_citiesBoundariesFilename = m_genInfo.GetIntermediateFileName("citiesboundaries.bin");
 
     auto const northAuckland = m_genInfo.GetTmpFileName("New Zealand North_Auckland");
     auto const northWellington = m_genInfo.GetTmpFileName("New Zealand North_Wellington");
@@ -325,9 +311,8 @@ public:
         CountryFeatureResults(GetCountersForCountry(northWellington), kNorthWellingtonCounters);
     results["kSouthCanterburyCounters"] =
         CountryFeatureResults(GetCountersForCountry(southCanterbury), kSouthCanterburyCounters);
-    results["kSouthSouthlandCounters + kSouthSouthlandMixedNodesCounters"] =
-        CountryFeatureResults(GetCountersForCountry(southSouthland),
-        kSouthSouthlandCounters + kSouthSouthlandMixedNodesCounters);
+    results["kSouthSouthlandCounters + kSouthSouthlandMixedNodesCounters"] = CountryFeatureResults(
+        GetCountersForCountry(southSouthland), kSouthSouthlandCounters + kSouthSouthlandMixedNodesCounters);
     results["kWorldCounters"] = CountryFeatureResults(GetCountersForCountry(world), kWorldCounters);
 
     TestAndLogCountryFeatures(results);
@@ -336,8 +321,7 @@ public:
   void CheckGeneratedData()
   {
     m_genInfo.m_emitCoasts = true;
-    m_genInfo.m_citiesBoundariesFilename =
-        m_genInfo.GetIntermediateFileName("citiesboundaries.bin");
+    m_genInfo.m_citiesBoundariesFilename = m_genInfo.GetIntermediateFileName("citiesboundaries.bin");
     auto const cameraToWays = m_genInfo.GetIntermediateFileName(CAMERAS_TO_WAYS_FILENAME);
     auto const cityBoundaries = m_genInfo.GetIntermediateFileName(CITY_BOUNDARIES_COLLECTOR_FILENAME);
     auto const maxSpeeds = m_genInfo.GetIntermediateFileName(MAXSPEEDS_FILENAME);
@@ -345,9 +329,8 @@ public:
     auto const restrictions = m_genInfo.GetIntermediateFileName(RESTRICTIONS_FILENAME);
     auto const roadAccess = m_genInfo.GetIntermediateFileName(ROAD_ACCESS_FILENAME);
 
-    for (auto const & generatedFile :
-         {cameraToWays, cityBoundaries, maxSpeeds, metalines, restrictions, roadAccess,
-          m_genInfo.m_citiesBoundariesFilename})
+    for (auto const & generatedFile : {cameraToWays, cityBoundaries, maxSpeeds, metalines, restrictions, roadAccess,
+                                       m_genInfo.m_citiesBoundariesFilename})
     {
       CHECK(!Platform::IsFileExistsByFullPath(generatedFile), (generatedFile));
     }
@@ -385,9 +368,9 @@ public:
   }
 
 private:
-  CountryFeaturesCounters GetCountersForCountry(
-      std::string const & path, std::function<void(feature::FeatureBuilder const &)> const & fn =
-                                    [](feature::FeatureBuilder const &) {})
+  CountryFeaturesCounters GetCountersForCountry(std::string const & path,
+                                                std::function<void(feature::FeatureBuilder const &)> const & fn =
+                                                    [](feature::FeatureBuilder const &) {})
   {
     CHECK(Platform::IsFileExistsByFullPath(path), ());
     auto const fbs = feature::ReadAllDatRawFormat(path);
@@ -449,12 +432,8 @@ private:
     m_mixedTagsFilenames.first = base::JoinPath(platform.ResourcesDir(), MIXED_TAGS_FILE);
     m_mixedTagsFilenames.second = base::JoinPath(platform.ResourcesDir(), MIXED_TAGS_FILE "_");
 
-    CHECK_EQUAL(
-        std::rename(m_mixedNodesFilenames.first.c_str(), m_mixedNodesFilenames.second.c_str()), 0,
-        ());
-    CHECK_EQUAL(
-        std::rename(m_mixedTagsFilenames.first.c_str(), m_mixedTagsFilenames.second.c_str()), 0,
-        ());
+    CHECK_EQUAL(std::rename(m_mixedNodesFilenames.first.c_str(), m_mixedNodesFilenames.second.c_str()), 0, ());
+    CHECK_EQUAL(std::rename(m_mixedTagsFilenames.first.c_str(), m_mixedTagsFilenames.second.c_str()), 0, ());
   }
 
   void WriteToFile(std::string const & filename, std::string const & data)
diff --git a/generator/generator_integration_tests/mwm_playground.cpp b/generator/generator_integration_tests/mwm_playground.cpp
index 676234961..bed88edac 100644
--- a/generator/generator_integration_tests/mwm_playground.cpp
+++ b/generator/generator_integration_tests/mwm_playground.cpp
@@ -18,10 +18,9 @@ namespace
 {
 platform::LocalCountryFile MakeFile(std::string name, int64_t version)
 {
-  return { GetPlatform().WritableDir() + std::to_string(version),
-           platform::CountryFile(std::move(name)), version };
+  return {GetPlatform().WritableDir() + std::to_string(version), platform::CountryFile(std::move(name)), version};
 }
-} // namespace
+}  // namespace
 
 UNIT_TEST(CrossMwmWeights)
 {
@@ -43,7 +42,7 @@ UNIT_TEST(CrossMwmWeights)
   builder.DeserializeTransitions(VehicleType::Car, reader);
   builder.DeserializeWeights(reader);
 
-  //std::vector<connector::Weight> weights(connector.GetNumEnters() * connector.GetNumExits());
+  // std::vector<connector::Weight> weights(connector.GetNumEnters() * connector.GetNumExits());
 
   using IdxWeightT = std::pair<uint32_t, uint32_t>;
   std::vector<IdxWeightT> idx2weight;
@@ -54,7 +53,7 @@ UNIT_TEST(CrossMwmWeights)
     {
       uint32_t const idx = connector.GetWeightIndex(enterIdx, exitIdx);
       uint32_t const weight = connector.GetWeight(enterIdx, exitIdx);
-      //weights[idx] = weight;
+      // weights[idx] = weight;
 
       if (weight > 0)
         idx2weight.emplace_back(idx, weight);
diff --git a/generator/generator_integration_tests/towns_tests.cpp b/generator/generator_integration_tests/towns_tests.cpp
index 954c2f84c..ff4c7630b 100644
--- a/generator/generator_integration_tests/towns_tests.cpp
+++ b/generator/generator_integration_tests/towns_tests.cpp
@@ -48,12 +48,9 @@ class TestAffiliation : public feature::AffiliationInterface
   std::vector<std::string> GetAffiliations(feature::FeatureBuilder const & fb) const override { return {}; }
   std::vector<std::string> GetAffiliations(m2::PointD const & point) const override { return {}; }
 
-  bool HasCountryByName(std::string const & name) const override
-  {
-    return !name.starts_with("World");
-  }
+  bool HasCountryByName(std::string const & name) const override { return !name.starts_with("World"); }
 };
-} // namespace
+}  // namespace
 
 UNIT_TEST(CountryFinalProcessor_ProcessBuildingParts)
 {
diff --git a/generator/generator_tests/affiliation_tests.cpp b/generator/generator_tests/affiliation_tests.cpp
index 018cd79e5..d1056e7b6 100644
--- a/generator/generator_tests/affiliation_tests.cpp
+++ b/generator/generator_tests/affiliation_tests.cpp
@@ -23,8 +23,8 @@ namespace
 class AffiliationTests
 {
 public:
-  static const std::string kOne;
-  static const std::string kTwo;
+  static std::string const kOne;
+  static std::string const kTwo;
 
   static constexpr m2::PointD kPointInsideOne1{3.0, 3.0};
   static constexpr m2::PointD kPointInsideOne2{4.0, 4.0};
@@ -89,8 +89,8 @@ private:
 };
 
 // static
-const std::string AffiliationTests::kOne = "One";
-const std::string AffiliationTests::kTwo = "Two";
+std::string const AffiliationTests::kOne = "One";
+std::string const AffiliationTests::kTwo = "Two";
 
 bool Test(std::vector<std::string> && res, std::set<std::string> const & answ)
 {
@@ -104,41 +104,29 @@ bool Test(std::vector<std::string> && res, std::set<std::string> const & answ)
 
 void TestCountriesAffiliationInsideBorders(feature::AffiliationInterface const & affiliation)
 {
-  TEST(Test(affiliation.GetAffiliations(AffiliationTests::kPointInsideOne1),
-            {AffiliationTests::kOne}),
-       ());
-  TEST(Test(affiliation.GetAffiliations(AffiliationTests::kPointInsideOne2),
-            {AffiliationTests::kOne}),
-       ());
-  TEST(Test(affiliation.GetAffiliations(AffiliationTests::kPointOnBorderOne),
-            {AffiliationTests::kOne}),
-       ());
-  TEST(Test(affiliation.GetAffiliations(AffiliationTests::kPointInsideTwo1),
-            {AffiliationTests::kTwo}),
-       ());
-  TEST(Test(affiliation.GetAffiliations(AffiliationTests::kPointInsideTwo2),
-            {AffiliationTests::kTwo}),
-       ());
+  TEST(Test(affiliation.GetAffiliations(AffiliationTests::kPointInsideOne1), {AffiliationTests::kOne}), ());
+  TEST(Test(affiliation.GetAffiliations(AffiliationTests::kPointInsideOne2), {AffiliationTests::kOne}), ());
+  TEST(Test(affiliation.GetAffiliations(AffiliationTests::kPointOnBorderOne), {AffiliationTests::kOne}), ());
+  TEST(Test(affiliation.GetAffiliations(AffiliationTests::kPointInsideTwo1), {AffiliationTests::kTwo}), ());
+  TEST(Test(affiliation.GetAffiliations(AffiliationTests::kPointInsideTwo2), {AffiliationTests::kTwo}), ());
   TEST(Test(affiliation.GetAffiliations(AffiliationTests::kPointInsideOneAndTwo1),
             {AffiliationTests::kOne, AffiliationTests::kTwo}),
        ());
   TEST(Test(affiliation.GetAffiliations(AffiliationTests::kPointInsideOneAndTwo2),
             {AffiliationTests::kOne, AffiliationTests::kTwo}),
        ());
-  TEST(Test(affiliation.GetAffiliations(AffiliationTests::kPointOnBorderTwo),
-            {AffiliationTests::kTwo}),
-       ());
+  TEST(Test(affiliation.GetAffiliations(AffiliationTests::kPointOnBorderTwo), {AffiliationTests::kTwo}), ());
 
-  TEST(Test(affiliation.GetAffiliations(AffiliationTests::MakeLineFb(
-                {AffiliationTests::kPointInsideOne1, AffiliationTests::kPointInsideOne2})),
+  TEST(Test(affiliation.GetAffiliations(
+                AffiliationTests::MakeLineFb({AffiliationTests::kPointInsideOne1, AffiliationTests::kPointInsideOne2})),
             {AffiliationTests::kOne}),
        ());
-  TEST(Test(affiliation.GetAffiliations(AffiliationTests::MakeLineFb(
-                {AffiliationTests::kPointInsideTwo1, AffiliationTests::kPointInsideTwo2})),
+  TEST(Test(affiliation.GetAffiliations(
+                AffiliationTests::MakeLineFb({AffiliationTests::kPointInsideTwo1, AffiliationTests::kPointInsideTwo2})),
             {AffiliationTests::kTwo}),
        ());
-  TEST(Test(affiliation.GetAffiliations(AffiliationTests::MakeLineFb(
-                {AffiliationTests::kPointInsideOne1, AffiliationTests::kPointInsideTwo1})),
+  TEST(Test(affiliation.GetAffiliations(
+                AffiliationTests::MakeLineFb({AffiliationTests::kPointInsideOne1, AffiliationTests::kPointInsideTwo1})),
             {AffiliationTests::kOne, AffiliationTests::kTwo}),
        ());
 }
@@ -159,16 +147,12 @@ void TestCountriesFilesAffiliation(std::string const & borderPath)
 
     TestCountriesAffiliationInsideBorders(affiliation);
 
-    TEST(Test(affiliation.GetAffiliations(AffiliationTests::kPointInsideOneBoundingBox),
-              {AffiliationTests::kOne}),
-         ());
-    TEST(Test(affiliation.GetAffiliations(AffiliationTests::kPointInsideTwoBoundingBox),
-              {AffiliationTests::kTwo}),
-         ());
+    TEST(Test(affiliation.GetAffiliations(AffiliationTests::kPointInsideOneBoundingBox), {AffiliationTests::kOne}), ());
+    TEST(Test(affiliation.GetAffiliations(AffiliationTests::kPointInsideTwoBoundingBox), {AffiliationTests::kTwo}), ());
   }
 }
 
-} // namespace
+}  // namespace
 
 UNIT_CLASS_TEST(AffiliationTests, SingleAffiliationTests)
 {
@@ -179,8 +163,8 @@ UNIT_CLASS_TEST(AffiliationTests, SingleAffiliationTests)
 
   TEST(Test(affiliation.GetAffiliations(AffiliationTests::kPointInsideOneAndTwo1), {kName}), ());
 
-  TEST(Test(affiliation.GetAffiliations(AffiliationTests::MakeLineFb(
-                {AffiliationTests::kPointInsideOne1, AffiliationTests::kPointInsideTwo1})),
+  TEST(Test(affiliation.GetAffiliations(
+                AffiliationTests::MakeLineFb({AffiliationTests::kPointInsideOne1, AffiliationTests::kPointInsideTwo1})),
             {kName}),
        ());
 
@@ -190,14 +174,12 @@ UNIT_CLASS_TEST(AffiliationTests, SingleAffiliationTests)
 
 UNIT_CLASS_TEST(AffiliationTests, CountriesFilesAffiliationTests)
 {
-  TestCountriesFilesAffiliation<feature::CountriesFilesAffiliation>(
-      AffiliationTests::GetBorderPath());
+  TestCountriesFilesAffiliation<feature::CountriesFilesAffiliation>(AffiliationTests::GetBorderPath());
 }
 
 UNIT_CLASS_TEST(AffiliationTests, CountriesFilesIndexAffiliationTests)
 {
-  TestCountriesFilesAffiliation<feature::CountriesFilesIndexAffiliation>(
-      AffiliationTests::GetBorderPath());
+  TestCountriesFilesAffiliation<feature::CountriesFilesIndexAffiliation>(AffiliationTests::GetBorderPath());
 }
 
 UNIT_TEST(Lithuania_Belarus_Border)
@@ -211,11 +193,11 @@ UNIT_TEST(Lithuania_Belarus_Border)
   for (auto const country : {"Lithuania_East", "Belarus_Hrodna Region"})
   {
     std::vector<m2::RegionD> regions;
-    LoadBorders(bordersDir +  country + BORDERS_EXTENSION, regions);
+    LoadBorders(bordersDir + country + BORDERS_EXTENSION, regions);
     TEST_EQUAL(regions.size(), 1, ());
 
     bool found = false;
-    for (auto const eps : { 1.0E-5, 5.0E-5, 1.0E-4 })
+    for (auto const eps : {1.0E-5, 5.0E-5, 1.0E-4})
     {
       if (regions[0].Contains(point, CountryPolygons::ContainsCompareFn(eps)))
       {
diff --git a/generator/generator_tests/altitude_test.cpp b/generator/generator_tests/altitude_test.cpp
index 055b4edf5..15e86b5f1 100644
--- a/generator/generator_tests/altitude_test.cpp
+++ b/generator/generator_tests/altitude_test.cpp
@@ -83,8 +83,7 @@ public:
         auto const it = m_altitudes.find(g.m_point);
         if (it != m_altitudes.cend())
         {
-          CHECK_EQUAL(it->second, g.m_altitude,
-                      ("Point", it->first, "is set with two different altitudes."));
+          CHECK_EQUAL(it->second, g.m_altitude, ("Point", it->first, "is set with two different altitudes."));
           continue;
         }
         m_altitudes[g.m_point] = g.m_altitude;
@@ -104,7 +103,6 @@ public:
   }
 
 private:
-
   TMockAltitudes m_altitudes;
 };
 
@@ -130,9 +128,8 @@ void BuildMwmWithoutAltitudes(std::vector<TPoint3DList> const & roads, LocalCoun
     builder.Add(generator::tests_support::TestStreet(ExtractPoints(geom3D), std::string(), std::string()));
 }
 
-void TestAltitudes(DataSource const & dataSource, MwmSet::MwmId const & mwmId,
-                   std::string const & mwmPath, bool hasAltitudeExpected,
-                   AltitudeGetter & expectedAltitudes)
+void TestAltitudes(DataSource const & dataSource, MwmSet::MwmId const & mwmId, std::string const & mwmPath,
+                   bool hasAltitudeExpected, AltitudeGetter & expectedAltitudes)
 {
   auto const handle = dataSource.GetMwmHandleById(mwmId);
   TEST(handle.IsAlive(), ());
@@ -157,8 +154,7 @@ void TestAltitudes(DataSource const & dataSource, MwmSet::MwmId const & mwmId,
     {
       geometry::Altitude const fromGetter = expectedAltitudes.GetAltitude(f.GetPoint(i));
       geometry::Altitude const expected =
-          (fromGetter == geometry::kInvalidAltitude ? geometry::kDefaultAltitudeMeters
-                                                    : fromGetter);
+          (fromGetter == geometry::kInvalidAltitude ? geometry::kDefaultAltitudeMeters : fromGetter);
       TEST_EQUAL(expected, altitudes[i], ("A wrong altitude"));
     }
   };
@@ -175,8 +171,7 @@ void TestAltitudesBuilding(std::vector<TPoint3DList> const & roads, bool hasAlti
   // Building mwm without altitude section.
   LocalCountryFile country(testDirFullPath, CountryFile(kTestMwm), 1);
   ScopedDir testScopedDir(kTestDir);
-  ScopedFile testScopedMwm(base::JoinPath(kTestDir, kTestMwm + DATA_FILE_EXTENSION),
-                           ScopedFile::Mode::Create);
+  ScopedFile testScopedMwm(base::JoinPath(kTestDir, kTestMwm + DATA_FILE_EXTENSION), ScopedFile::Mode::Create);
 
   BuildMwmWithoutAltitudes(roads, country);
 
diff --git a/generator/generator_tests/brands_loader_test.cpp b/generator/generator_tests/brands_loader_test.cpp
index 4720962c1..20e451c67 100644
--- a/generator/generator_tests/brands_loader_test.cpp
+++ b/generator/generator_tests/brands_loader_test.cpp
@@ -18,16 +18,16 @@ using platform::tests_support::ScopedFile;
 char const kBrandsJson[] =
     "{\n"
     "\"nodes\": {\n"
-      "\"2132500347\": 13,\n"
-      "\"5321137826\": 12\n"
+    "\"2132500347\": 13,\n"
+    "\"5321137826\": 12\n"
     "},\n"
     "\"ways\": {\n"
-      "\"440527172\": 13,\n"
-      "\"149816366\": 12\n"
+    "\"440527172\": 13,\n"
+    "\"149816366\": 12\n"
     "},\n"
     "\"relations\": {\n"
-      "\"6018309\": 13,\n"
-      "\"6228042\": 12\n"
+    "\"6018309\": 13,\n"
+    "\"6228042\": 12\n"
     "}\n"
     "}";
 
@@ -36,13 +36,13 @@ char const kBrandTranslationsJson[] =
     "\"12\": {\n"
     "\"en\": [\"subway\"],\n"
     "\"ru\": [\"\u0441\u0430\u0431\u0432\u044d\u0439\",\n"
-             "\"\u0441\u0430\u0431\u0432\u0435\u0439\"]\n"
-            "},\n"
+    "\"\u0441\u0430\u0431\u0432\u0435\u0439\"]\n"
+    "},\n"
     "\"13\": {\n"
     "\"en\": [\"mcdonalds\",\"mc donalds\"],\n"
     "\"ru\": [\"\u043c\u0430\u043a\u0434\u043e\u043d\u0430\u043b\u044c\u0434\u0441\",\n"
-             "\"\u043c\u0430\u043a\u0434\u043e\u043d\u0430\u043b\u0434\u0441\"]\n"
-            "}\n"
+    "\"\u043c\u0430\u043a\u0434\u043e\u043d\u0430\u043b\u0434\u0441\"]\n"
+    "}\n"
     "}";
 
 UNIT_TEST(LoadBrands)
@@ -52,11 +52,11 @@ UNIT_TEST(LoadBrands)
 
   std::unordered_map<GeoObjectId, std::string> brands;
   TEST(LoadBrands(brandsFile.GetFullPath(), translationsFile.GetFullPath(), brands), ());
-  TEST_EQUAL(brands[GeoObjectId(GeoObjectId::Type::ObsoleteOsmNode,     2132500347)], "mcdonalds", ());
-  TEST_EQUAL(brands[GeoObjectId(GeoObjectId::Type::ObsoleteOsmWay,      440527172)],  "mcdonalds", ());
-  TEST_EQUAL(brands[GeoObjectId(GeoObjectId::Type::ObsoleteOsmRelation, 6018309)],    "mcdonalds", ());
-  TEST_EQUAL(brands[GeoObjectId(GeoObjectId::Type::ObsoleteOsmNode,     5321137826)], "subway", ());
-  TEST_EQUAL(brands[GeoObjectId(GeoObjectId::Type::ObsoleteOsmWay,      149816366)],  "subway", ());
-  TEST_EQUAL(brands[GeoObjectId(GeoObjectId::Type::ObsoleteOsmRelation, 6228042)],    "subway", ());
+  TEST_EQUAL(brands[GeoObjectId(GeoObjectId::Type::ObsoleteOsmNode, 2132500347)], "mcdonalds", ());
+  TEST_EQUAL(brands[GeoObjectId(GeoObjectId::Type::ObsoleteOsmWay, 440527172)], "mcdonalds", ());
+  TEST_EQUAL(brands[GeoObjectId(GeoObjectId::Type::ObsoleteOsmRelation, 6018309)], "mcdonalds", ());
+  TEST_EQUAL(brands[GeoObjectId(GeoObjectId::Type::ObsoleteOsmNode, 5321137826)], "subway", ());
+  TEST_EQUAL(brands[GeoObjectId(GeoObjectId::Type::ObsoleteOsmWay, 149816366)], "subway", ());
+  TEST_EQUAL(brands[GeoObjectId(GeoObjectId::Type::ObsoleteOsmRelation, 6228042)], "subway", ());
 }
 }  // namespace brands_loader_test
diff --git a/generator/generator_tests/camera_collector_tests.cpp b/generator/generator_tests/camera_collector_tests.cpp
index 4517a2a13..27e8fcaf6 100644
--- a/generator/generator_tests/camera_collector_tests.cpp
+++ b/generator/generator_tests/camera_collector_tests.cpp
@@ -13,8 +13,8 @@
 #include "generator/translator.hpp"
 
 #include "indexer/classificator_loader.hpp"
-#include "indexer/map_style_reader.hpp"
 #include "indexer/map_style.hpp"
+#include "indexer/map_style_reader.hpp"
 
 #include "platform/platform.hpp"
 #include "platform/platform_tests_support/scoped_dir.hpp"
@@ -25,7 +25,6 @@
 
 #include "defines.hpp"
 
-
 namespace routing_builder
 {
 using namespace generator;
@@ -58,10 +57,7 @@ public:
     return {};
   }
 
-  void Merge(TranslatorInterface const &) override
-  {
-    CHECK(false, ());
-  }
+  void Merge(TranslatorInterface const &) override { CHECK(false, ()); }
 
 protected:
   using Translator::Translator;
@@ -105,7 +101,8 @@ public:
     // Test load this data from cached file.
     generator::cache::IntermediateDataObjectsCache objectsCache;
     auto cache = std::make_shared<generator::cache::IntermediateData>(objectsCache, genInfo);
-    auto collector = std::make_shared<CameraCollector>(genInfo.GetIntermediateFileName(CAMERAS_TO_WAYS_FILENAME), cache->GetCache());
+    auto collector =
+        std::make_shared<CameraCollector>(genInfo.GetIntermediateFileName(CAMERAS_TO_WAYS_FILENAME), cache->GetCache());
     auto processor = CreateProcessor(ProcessorType::Noop);
     auto translator = std::make_shared<TranslatorForTest>(processor, cache);
     translator->SetCollector(collector);
@@ -131,8 +128,8 @@ UNIT_CLASS_TEST(TestCameraCollector, test_1)
 {
   string const osmSourceXML =
       R"(<osm version="0.6" generator="osmconvert 0.8.4" timestamp="2018-07-16T02:00:00Z">
-      <node id="1" lat="55.779384" lon="37.3699375" version="1">)" + kSpeedCameraTag +
-      R"(</node><node id="2" lat="55.779304" lon="37.3699375" version="1">)" + kSpeedCameraTag +
+      <node id="1" lat="55.779384" lon="37.3699375" version="1">)" +
+      kSpeedCameraTag + R"(</node><node id="2" lat="55.779304" lon="37.3699375" version="1">)" + kSpeedCameraTag +
       R"(</node><node id="3" lat="55.773084" lon="37.3699375" version="1">)" + kSpeedCameraTag +
       R"(</node><node id="4" lat="55.773084" lon="37.3699375" version="1">
       </node>
@@ -149,9 +146,7 @@ UNIT_CLASS_TEST(TestCameraCollector, test_1)
       </way>
       </osm>)";
 
-  std::set<pair<uint64_t, uint64_t>> trueAnswers = {
-    {1, 10}, {1, 20}, {2, 20}, {3, 20}
-  };
+  std::set<pair<uint64_t, uint64_t>> trueAnswers = {{1, 10}, {1, 20}, {2, 20}, {3, 20}};
 
   TEST(TestCameraCollector::Test(osmSourceXML, trueAnswers), ());
 }
@@ -160,8 +155,8 @@ UNIT_CLASS_TEST(TestCameraCollector, test_2)
 {
   string const osmSourceXML =
       R"(<osm version="0.6" generator="osmconvert 0.8.4" timestamp="2018-07-16T02:00:00Z">
-      <node id="1" lat="55.779384" lon="37.3699375" version="1">)" + kSpeedCameraTag +
-      R"(</node><node id="2" lat="55.779304" lon="37.3699375" version="1">)" + kSpeedCameraTag +
+      <node id="1" lat="55.779384" lon="37.3699375" version="1">)" +
+      kSpeedCameraTag + R"(</node><node id="2" lat="55.779304" lon="37.3699375" version="1">)" + kSpeedCameraTag +
       R"(</node><node id="3" lat="55.773084" lon="37.3699375" version="1">)" + kSpeedCameraTag +
       R"(</node><node id="4" lat="55.773024" lon="37.3699375" version="1">)" + kSpeedCameraTag +
       R"(</node><node id="5" lat="55.773014" lon="37.3699375" version="1">)" + kSpeedCameraTag +
@@ -185,9 +180,8 @@ UNIT_CLASS_TEST(TestCameraCollector, test_2)
       </way>
       </osm>)";
 
-  std::set<pair<uint64_t, uint64_t>> trueAnswers = {
-    {1, 10}, {2, 10}, {1, 20}, {3, 20}, {1, 30}, {3, 30}, {4, 30}, {5, 30}
-  };
+  std::set<pair<uint64_t, uint64_t>> trueAnswers = {{1, 10}, {2, 10}, {1, 20}, {3, 20},
+                                                    {1, 30}, {3, 30}, {4, 30}, {5, 30}};
 
   TEST(TestCameraCollector::Test(osmSourceXML, trueAnswers), ());
 }
@@ -196,7 +190,8 @@ UNIT_CLASS_TEST(TestCameraCollector, test_3)
 {
   string const osmSourceXML =
       R"(<osm version="0.6" generator="osmconvert 0.8.4" timestamp="2018-07-16T02:00:00Z">
-      <node id="1" lat="55.779384" lon="37.3699375" version="1">)" + kSpeedCameraTag +
+      <node id="1" lat="55.779384" lon="37.3699375" version="1">)" +
+      kSpeedCameraTag +
       R"(</node><node id="2" lat="55.779384" lon="37.3699375" version="1">
       </node>
       <way id="10" version="1">
@@ -211,9 +206,7 @@ UNIT_CLASS_TEST(TestCameraCollector, test_3)
       </way>
       </osm>)";
 
-  std::set<pair<uint64_t, uint64_t>> trueAnswers = {
-    {1, 10}, {1, 20}
-  };
+  std::set<pair<uint64_t, uint64_t>> trueAnswers = {{1, 10}, {1, 20}};
 
   TEST(TestCameraCollector::Test(osmSourceXML, trueAnswers), ());
 }
@@ -222,7 +215,8 @@ UNIT_CLASS_TEST(TestCameraCollector, test_4)
 {
   string const osmSourceXML =
       R"(<osm version="0.6" generator="osmconvert 0.8.4" timestamp="2018-07-16T02:00:00Z">
-      <node id="1" lat="55.779384" lon="37.3699375" version="1">)" + kSpeedCameraTag +
+      <node id="1" lat="55.779384" lon="37.3699375" version="1">)" +
+      kSpeedCameraTag +
       R"(</node><way id="10" version="1">
       <tag k="highway" v="unclassified"/>
       </way>
@@ -252,4 +246,4 @@ UNIT_CLASS_TEST(TestCameraCollector, test_5)
   TEST(TestCameraCollector::Test(osmSourceXML, trueAnswers), ());
 }
 
-} // namespace routing_builder
+}  // namespace routing_builder
diff --git a/generator/generator_tests/cells_merger_tests.cpp b/generator/generator_tests/cells_merger_tests.cpp
index ab0c2b416..6992fd2b9 100644
--- a/generator/generator_tests/cells_merger_tests.cpp
+++ b/generator/generator_tests/cells_merger_tests.cpp
@@ -24,20 +24,16 @@ UNIT_TEST(CellsMerger_One)
 
 UNIT_TEST(CellsMerger_Two)
 {
-  generator::cells_merger::CellsMerger merger({{{0.0, 0.0}, {1.0, 1.0}},
-                                               {{1.0, 0.0}, {2.0, 1.0}}});
-  std::vector<m2::RectD> expected{{{0.0, 0.0}, {1.0, 1.0}},
-                                  {{1.0, 0.0}, {2.0, 1.0}}};
+  generator::cells_merger::CellsMerger merger({{{0.0, 0.0}, {1.0, 1.0}}, {{1.0, 0.0}, {2.0, 1.0}}});
+  std::vector<m2::RectD> expected{{{0.0, 0.0}, {1.0, 1.0}}, {{1.0, 0.0}, {2.0, 1.0}}};
   auto const result = merger.Merge();
   TEST_EQUAL(result, expected, ());
 }
 
 UNIT_TEST(CellsMerger_Four)
 {
-  generator::cells_merger::CellsMerger merger({{{0.0, 0.0}, {1.0, 1.0}},
-                                               {{1.0, 0.0}, {2.0, 1.0}},
-                                               {{0.0, 1.0}, {1.0, 2.0}},
-                                               {{1.0, 1.0}, {2.0, 2.0}}});
+  generator::cells_merger::CellsMerger merger(
+      {{{0.0, 0.0}, {1.0, 1.0}}, {{1.0, 0.0}, {2.0, 1.0}}, {{0.0, 1.0}, {1.0, 2.0}}, {{1.0, 1.0}, {2.0, 2.0}}});
   std::vector<m2::RectD> expected{{{0.0, 0.0}, {2.0, 2.0}}};
   auto const result = merger.Merge();
   TEST_EQUAL(result, expected, ());
@@ -45,23 +41,31 @@ UNIT_TEST(CellsMerger_Four)
 
 UNIT_TEST(CellsMerger_Six)
 {
-  generator::cells_merger::CellsMerger merger({{{0.0, 0.0}, {1.0, 1.0}}, {{1.0, 0.0}, {2.0, 1.0}},
-                                               {{0.0, 1.0}, {1.0, 2.0}}, {{1.0, 1.0}, {2.0, 2.0}},
-                                               {{2.0, 0.0}, {3.0, 1.0}}, {{2.0, 1.0}, {3.0, 2.0}}});
-  std::vector<m2::RectD> expected{{{1.0, 0.0}, {3.0, 2.0}}, {{0.0, 0.0}, {1.0, 1.0}},
-                                  {{0.0, 1.0}, {1.0, 2.0}}};
+  generator::cells_merger::CellsMerger merger({{{0.0, 0.0}, {1.0, 1.0}},
+                                               {{1.0, 0.0}, {2.0, 1.0}},
+                                               {{0.0, 1.0}, {1.0, 2.0}},
+                                               {{1.0, 1.0}, {2.0, 2.0}},
+                                               {{2.0, 0.0}, {3.0, 1.0}},
+                                               {{2.0, 1.0}, {3.0, 2.0}}});
+  std::vector<m2::RectD> expected{{{1.0, 0.0}, {3.0, 2.0}}, {{0.0, 0.0}, {1.0, 1.0}}, {{0.0, 1.0}, {1.0, 2.0}}};
   auto const result = merger.Merge();
   TEST_EQUAL(result, expected, ());
 }
 
 UNIT_TEST(CellsMerger_Eight)
 {
-  generator::cells_merger::CellsMerger merger({{{0.0, 0.0}, {1.0, 1.0}}, {{1.0, 0.0}, {2.0, 1.0}},
-                                               {{0.0, 1.0}, {1.0, 2.0}}, {{1.0, 1.0}, {2.0, 2.0}},
-                                               {{2.0, 0.0}, {3.0, 1.0}}, {{2.0, 1.0}, {3.0, 2.0}},
-                                               {{3.0, 0.0}, {4.0, 1.0}}, {{3.0, 1.0}, {4.0, 2.0}}});
-  std::vector<m2::RectD> expected{{{1.0, 0.0}, {3.0, 2.0}}, {{0.0, 0.0}, {1.0, 1.0}},
-                                  {{0.0, 1.0}, {1.0, 2.0}}, {{3.0, 0.0}, {4.0, 1.0}},
+  generator::cells_merger::CellsMerger merger({{{0.0, 0.0}, {1.0, 1.0}},
+                                               {{1.0, 0.0}, {2.0, 1.0}},
+                                               {{0.0, 1.0}, {1.0, 2.0}},
+                                               {{1.0, 1.0}, {2.0, 2.0}},
+                                               {{2.0, 0.0}, {3.0, 1.0}},
+                                               {{2.0, 1.0}, {3.0, 2.0}},
+                                               {{3.0, 0.0}, {4.0, 1.0}},
+                                               {{3.0, 1.0}, {4.0, 2.0}}});
+  std::vector<m2::RectD> expected{{{1.0, 0.0}, {3.0, 2.0}},
+                                  {{0.0, 0.0}, {1.0, 1.0}},
+                                  {{0.0, 1.0}, {1.0, 2.0}},
+                                  {{3.0, 0.0}, {4.0, 1.0}},
                                   {{3.0, 1.0}, {4.0, 2.0}}};
   auto const result = merger.Merge();
   TEST_EQUAL(result, expected, ());
diff --git a/generator/generator_tests/cities_boundaries_checker_tests.cpp b/generator/generator_tests/cities_boundaries_checker_tests.cpp
index a2a4691cf..953dacde0 100644
--- a/generator/generator_tests/cities_boundaries_checker_tests.cpp
+++ b/generator/generator_tests/cities_boundaries_checker_tests.cpp
@@ -14,8 +14,7 @@ using namespace indexer;
 
 UNIT_TEST(CitiesBoundariesChecker_Square)
 {
-  auto const checker =
-      CitiesBoundariesChecker({CityBoundary({{0.0, 0.0}, {1.0, 0.0}, {1.0, 1.0}, {0.0, 1.0}})});
+  auto const checker = CitiesBoundariesChecker({CityBoundary({{0.0, 0.0}, {1.0, 0.0}, {1.0, 1.0}, {0.0, 1.0}})});
 
   TEST(checker.InCity({0.5, 0.5}), ());
   TEST(checker.InCity({0.0001, 0.0001}), ());
@@ -42,9 +41,9 @@ UNIT_TEST(CitiesBoundariesChecker_NotConvexPolygon)
 
 UNIT_TEST(CitiesBoundariesChecker_IntersectedPolygons)
 {
-  auto const checker = CitiesBoundariesChecker(
-      {CityBoundary({{0.0, 0.0}, {1.0, -1.0}, {0.5, 0.0}, {1.0, 1.0}, {0.0, 1.0}}),
-       CityBoundary({{0.0, 0.0}, {1.0, -1.0}, {0.5, 0.0}, {1.0, 1.0}, {0.0, 1.0}})});
+  auto const checker =
+      CitiesBoundariesChecker({CityBoundary({{0.0, 0.0}, {1.0, -1.0}, {0.5, 0.0}, {1.0, 1.0}, {0.0, 1.0}}),
+                               CityBoundary({{0.0, 0.0}, {1.0, -1.0}, {0.5, 0.0}, {1.0, 1.0}, {0.0, 1.0}})});
 
   TEST(checker.InCity({0.3, 0.3}), ());
   TEST(checker.InCity({0.0001, 0.0001}), ());
@@ -57,10 +56,10 @@ UNIT_TEST(CitiesBoundariesChecker_IntersectedPolygons)
 
 UNIT_TEST(CitiesBoundariesChecker_SeveralPolygons)
 {
-  auto const checker = CitiesBoundariesChecker(
-      {CityBoundary({{0.0, 0.0}, {1.0, -1.0}, {0.5, 0.0}, {1.0, 1.0}, {0.0, 1.0}}),
-       CityBoundary({{10.0, 0.0}, {11.0, -1.0}, {10.5, 0.0}, {11.0, 1.0}, {10.0, 1.0}}),
-       CityBoundary({{0.0, 10.0}, {1.0, -11.0}, {0.5, 10.0}, {1.0, 11.0}, {0.0, 11.0}})});
+  auto const checker =
+      CitiesBoundariesChecker({CityBoundary({{0.0, 0.0}, {1.0, -1.0}, {0.5, 0.0}, {1.0, 1.0}, {0.0, 1.0}}),
+                               CityBoundary({{10.0, 0.0}, {11.0, -1.0}, {10.5, 0.0}, {11.0, 1.0}, {10.0, 1.0}}),
+                               CityBoundary({{0.0, 10.0}, {1.0, -11.0}, {0.5, 10.0}, {1.0, 11.0}, {0.0, 11.0}})});
 
   TEST(checker.InCity({0.3, 0.3}), ());
   TEST(checker.InCity({0.0001, 0.0001}), ());
diff --git a/generator/generator_tests/cities_ids_tests.cpp b/generator/generator_tests/cities_ids_tests.cpp
index 92fa9d895..ccf16449a 100644
--- a/generator/generator_tests/cities_ids_tests.cpp
+++ b/generator/generator_tests/cities_ids_tests.cpp
@@ -42,7 +42,8 @@ UNIT_CLASS_TEST(CitiesIdsTest, BuildCitiesIds)
   TestCity wien(m2::PointD(1, 1), "Wien", "de", 100 /* rank */);
   TestSea marCaribe(m2::PointD(2, 2), "Mar Caribe", "es");
 
-  auto testWorldId = BuildWorld([&](TestMwmBuilder & builder) {
+  auto testWorldId = BuildWorld([&](TestMwmBuilder & builder)
+  {
     builder.Add(paris);
     builder.Add(wien);
     builder.Add(marCaribe);
@@ -62,7 +63,8 @@ UNIT_CLASS_TEST(CitiesIdsTest, BuildCitiesIds)
   {
     size_t numFeatures = 0;
     size_t numLocalities = 0;
-    auto const test = [&](FeatureType & ft, uint32_t index) {
+    auto const test = [&](FeatureType & ft, uint32_t index)
+    {
       ++numFeatures;
       FeatureID const fid(testWorldId, index);
       base::GeoObjectId gid;
@@ -90,4 +92,4 @@ UNIT_CLASS_TEST(CitiesIdsTest, BuildCitiesIds)
   }
 }
 
-} // namespace cities_ids_tests
+}  // namespace cities_ids_tests
diff --git a/generator/generator_tests/city_roads_tests.cpp b/generator/generator_tests/city_roads_tests.cpp
index 2f05fe03f..91dbbd0c9 100644
--- a/generator/generator_tests/city_roads_tests.cpp
+++ b/generator/generator_tests/city_roads_tests.cpp
@@ -67,8 +67,7 @@ void TestCityRoadsBuilding(vector<uint32_t> && cityRoadFeatureIds)
   string const writableDir = GetPlatform().WritableDir();
 
   // Building empty mwm.
-  LocalCountryFile country(base::JoinPath(writableDir, kTestDir), CountryFile(kTestMwm),
-                           0 /* version */);
+  LocalCountryFile country(base::JoinPath(writableDir, kTestDir), CountryFile(kTestMwm), 0 /* version */);
   ScopedDir const scopedDir(kTestDir);
 
   string const mwmRelativePath = base::JoinPath(kTestDir, kTestMwm + DATA_FILE_EXTENSION);
@@ -98,8 +97,7 @@ void TestCityRoadsBuilding(vector<uint32_t> && cityRoadFeatureIds)
   // Note. 2 is added below to test all the if-branches of CityRoads::IsCityRoad() method.
   for (uint32_t fid = 0; fid < kMaxRoadFeatureId + 2; ++fid)
   {
-    bool const isCityRoad =
-        binary_search(originalCityRoadFeatureIds.cbegin(), originalCityRoadFeatureIds.cend(), fid);
+    bool const isCityRoad = binary_search(originalCityRoadFeatureIds.cbegin(), originalCityRoadFeatureIds.cend(), fid);
     TEST_EQUAL(cityRoads->IsCityRoad(fid), isCityRoad, (fid));
   }
 }
@@ -121,15 +119,13 @@ UNIT_TEST(CityRoadsGenerationTest_CommonCase)
 
 UNIT_TEST(CityRoadsGenerationTest_SortedIds1)
 {
-  TestCityRoadsBuilding(
-      vector<uint32_t>({1000,  1203,  11004,  11008, 11009, 11010, 11011, 11012, 11013, 11014, 11015,
-                        11016, 11017, 11018, 11019, 11020, 11021, 11022, 11023, 11024, 11025}));
+  TestCityRoadsBuilding(vector<uint32_t>({1000,  1203,  11004, 11008, 11009, 11010, 11011, 11012, 11013, 11014, 11015,
+                                          11016, 11017, 11018, 11019, 11020, 11021, 11022, 11023, 11024, 11025}));
 }
 
 UNIT_TEST(CityRoadsGenerationTest_SortedIds2)
 {
-  TestCityRoadsBuilding(
-      vector<uint32_t>({75000,  75001,  75004,  250000, 250001, 330003, 330007}));
+  TestCityRoadsBuilding(vector<uint32_t>({75000, 75001, 75004, 250000, 250001, 330003, 330007}));
 }
 
 UNIT_TEST(CityRoadsGenerationTest_UnsortedIds)
@@ -140,31 +136,27 @@ UNIT_TEST(CityRoadsGenerationTest_UnsortedIds)
 UNIT_TEST(CityRoadsGenerationTest_UnsortedIds2)
 {
   TestCityRoadsBuilding(
-      vector<uint32_t>({1000,  1203, 1, 11004,  11, 11009, 11010, 1011, 11012, 11013, 4, 11015,
+      vector<uint32_t>({1000,  1203,  1,     11004, 11,    11009, 11010, 1011,  11012, 11013, 4, 11015,
                         11016, 11017, 11018, 11019, 11020, 11021, 11022, 11023, 11024, 11025, 2}));
 }
 
 UNIT_TEST(CityRoadsGenerationTest_UnsortedIds3)
 {
   TestCityRoadsBuilding(vector<uint32_t>(
-      {181998, 354195, 470394, 356217, 331537, 272789, 449031, 420305, 139273, 482371, 85866,
-       142591, 105206, 217360, 380898, 390284, 96547, 110547, 201338, 428964, 246086, 29141,
-       179975, 493052, 53822, 238723, 316810, 349592, 154010, 107966, 113307, 97285, 145351,
-       1153, 433747, 3176, 294890, 52537, 412384, 67264, 102626, 129329, 49219, 289549,
-       68559, 364318, 211462, 170032, 59900, 257505, 164691, 75922, 209439, 308889, 143329,
-       140010, 17175, 385681, 147374, 362296, 483109, 257221, 78957, 246540, 111001, 150408,
-       399397, 285220, 260539, 201792, 378034, 349308, 68275, 278584, 14869, 71593, 34209,
-       146363, 177111, 319287, 25550, 39549, 130341, 225177, 175089, 458144, 108978, 289265,
-       482825, 167725, 113023, 11551, 315969, 402715, 408055, 392033, 440099, 295901, 228495,
-       297924, 89638, 214496, 207133, 362012, 397374, 424077, 343967, 84297, 230518, 159067,
-       6210, 331991, 354649, 52253, 326650, 370671, 4187, 103637, 305287, 434759, 311923,
-       180429, 442122, 157044, 145067, 415419, 237154, 404737, 269198, 308605, 57594, 310628,
-       418737, 359989, 36231, 7505, 226473, 436781, 173066, 97001, 59617, 171771, 335309,
-       477484, 183747, 64957, 155749, 383375, 333286, 116341, 134386, 447463, 141022, 193133,
-       271221, 169748, 474166, 60912, 66253, 50231, 98297, 321309, 386693, 456121, 247835,
-       372693, 365330, 20209, 55571, 82275, 2165, 242495, 388715, 317264, 164407, 490188,
-       12846, 210451, 484847, 28868, 162385, 129045, 463485, 92956, 337331, 338627, 100319,
-       182452, 303265, 73616, 262562, 62935, 294606, 466803, 215791, 468825, 76934, 18187,
-       194429, 32913}));
+      {181998, 354195, 470394, 356217, 331537, 272789, 449031, 420305, 139273, 482371, 85866,  142591, 105206, 217360,
+       380898, 390284, 96547,  110547, 201338, 428964, 246086, 29141,  179975, 493052, 53822,  238723, 316810, 349592,
+       154010, 107966, 113307, 97285,  145351, 1153,   433747, 3176,   294890, 52537,  412384, 67264,  102626, 129329,
+       49219,  289549, 68559,  364318, 211462, 170032, 59900,  257505, 164691, 75922,  209439, 308889, 143329, 140010,
+       17175,  385681, 147374, 362296, 483109, 257221, 78957,  246540, 111001, 150408, 399397, 285220, 260539, 201792,
+       378034, 349308, 68275,  278584, 14869,  71593,  34209,  146363, 177111, 319287, 25550,  39549,  130341, 225177,
+       175089, 458144, 108978, 289265, 482825, 167725, 113023, 11551,  315969, 402715, 408055, 392033, 440099, 295901,
+       228495, 297924, 89638,  214496, 207133, 362012, 397374, 424077, 343967, 84297,  230518, 159067, 6210,   331991,
+       354649, 52253,  326650, 370671, 4187,   103637, 305287, 434759, 311923, 180429, 442122, 157044, 145067, 415419,
+       237154, 404737, 269198, 308605, 57594,  310628, 418737, 359989, 36231,  7505,   226473, 436781, 173066, 97001,
+       59617,  171771, 335309, 477484, 183747, 64957,  155749, 383375, 333286, 116341, 134386, 447463, 141022, 193133,
+       271221, 169748, 474166, 60912,  66253,  50231,  98297,  321309, 386693, 456121, 247835, 372693, 365330, 20209,
+       55571,  82275,  2165,   242495, 388715, 317264, 164407, 490188, 12846,  210451, 484847, 28868,  162385, 129045,
+       463485, 92956,  337331, 338627, 100319, 182452, 303265, 73616,  262562, 62935,  294606, 466803, 215791, 468825,
+       76934,  18187,  194429, 32913}));
 }
 }  // namespace city_roads_tests
diff --git a/generator/generator_tests/cluster_finder_tests.cpp b/generator/generator_tests/cluster_finder_tests.cpp
index 07d2a152e..8e2c4b9d9 100644
--- a/generator/generator_tests/cluster_finder_tests.cpp
+++ b/generator/generator_tests/cluster_finder_tests.cpp
@@ -15,7 +15,12 @@
 
 namespace cluster_finder_tests
 {
-enum class Type { T1 = 1, T2, T3 };
+enum class Type
+{
+  T1 = 1,
+  T2,
+  T3
+};
 
 std::string DebugPrint(Type const & t)
 {
@@ -25,7 +30,10 @@ std::string DebugPrint(Type const & t)
 struct NamedPoint
 {
   NamedPoint(m2::PointD const & point, Type const & type, std::string const & name)
-    : m_point(point), m_type(type), m_name(name) {}
+    : m_point(point)
+    , m_type(type)
+    , m_name(name)
+  {}
 
   size_t m_id = m_counter++;
   m2::PointD m_point;
@@ -55,7 +63,8 @@ std::string DebugPrint(NamedPoint const & t)
 
 auto const getRadiusMFunction = [](NamedPoint const & p)
 {
-  switch (p.m_type) {
+  switch (p.m_type)
+  {
   case Type::T1: return 4000;
   case Type::T2: return 8000;
   case Type::T3: return 16000;
@@ -64,21 +73,14 @@ auto const getRadiusMFunction = [](NamedPoint const & p)
 };
 
 auto const isSameFunction = [](NamedPoint const & left, NamedPoint const & right)
-{
-  return left.m_name == right.m_name && left.m_type == right.m_type;
-};
+{ return left.m_name == right.m_name && left.m_type == right.m_type; };
 
 using ClusterT = std::vector<NamedPoint const *>;
 
 void Sort(std::vector<ClusterT> & data)
 {
   for (auto & d : data)
-  {
-    std::sort(std::begin(d), std::end(d), [](NamedPoint const * l, NamedPoint const * r)
-    {
-      return l->m_id < r->m_id;
-    });
-  }
+    std::sort(std::begin(d), std::end(d), [](NamedPoint const * l, NamedPoint const * r) { return l->m_id < r->m_id; });
   std::sort(std::begin(data), std::end(data), [](ClusterT const & l, ClusterT const & r)
   {
     TEST(!l.empty(), ());
@@ -111,10 +113,7 @@ UNIT_TEST(ClustersFinder_OneElement)
 
 UNIT_TEST(ClustersFinder_TwoElements)
 {
-  std::vector<NamedPoint> in{
-    NamedPoint({0.0, 0.0}, Type::T1, "name"),
-    NamedPoint({0.0001, 0.0001}, Type::T1, "name")
-  };
+  std::vector<NamedPoint> in{NamedPoint({0.0, 0.0}, Type::T1, "name"), NamedPoint({0.0001, 0.0001}, Type::T1, "name")};
 
   std::vector<ClusterT> expected{{&in[0], &in[1]}};
   Test(in, expected);
@@ -123,19 +122,14 @@ UNIT_TEST(ClustersFinder_TwoElements)
 UNIT_TEST(ClustersFinder_TwoClusters)
 {
   {
-    std::vector<NamedPoint> in{
-      NamedPoint({0.0, 0.0}, Type::T1, "name1"),
-      NamedPoint({0.0001, 0.0001}, Type::T1, "name2")
-    };
+    std::vector<NamedPoint> in{NamedPoint({0.0, 0.0}, Type::T1, "name1"),
+                               NamedPoint({0.0001, 0.0001}, Type::T1, "name2")};
 
     std::vector<ClusterT> expected{{&in[1]}, {&in[0]}};
     Test(in, expected);
   }
   {
-    std::vector<NamedPoint> in{
-      NamedPoint({0.0, 0.0}, Type::T1, "name"),
-      NamedPoint({0.1, 0.1}, Type::T1, "name")
-    };
+    std::vector<NamedPoint> in{NamedPoint({0.0, 0.0}, Type::T1, "name"), NamedPoint({0.1, 0.1}, Type::T1, "name")};
 
     std::vector<ClusterT> expected{{&in[0]}, {&in[1]}};
     Test(in, expected);
@@ -145,16 +139,13 @@ UNIT_TEST(ClustersFinder_TwoClusters)
 UNIT_TEST(ClustersFinder_ThreeClusters)
 {
   std::vector<NamedPoint> in{
-    NamedPoint({0.0, 0.0}, Type::T1, "name"),
-    NamedPoint({0.0, 0.00001}, Type::T1, "name"),
-    NamedPoint({0.0001, 0.0000}, Type::T1, "name"),
+      NamedPoint({0.0, 0.0}, Type::T1, "name"),       NamedPoint({0.0, 0.00001}, Type::T1, "name"),
+      NamedPoint({0.0001, 0.0000}, Type::T1, "name"),
 
-    NamedPoint({0.0, 0.0}, Type::T2, "name"),
-    NamedPoint({0.0, 0.001}, Type::T2, "name"),
-    NamedPoint({0.001, 0.0000}, Type::T2, "name"),
+      NamedPoint({0.0, 0.0}, Type::T2, "name"),       NamedPoint({0.0, 0.001}, Type::T2, "name"),
+      NamedPoint({0.001, 0.0000}, Type::T2, "name"),
 
-    NamedPoint({0.0, 0.0}, Type::T1, "name21")
-  };
+      NamedPoint({0.0, 0.0}, Type::T1, "name21")};
 
   std::vector<ClusterT> expected{{&in[1], &in[0], &in[2]}, {&in[3], &in[5], &in[4]}, {&in[6]}};
   Test(in, expected);
diff --git a/generator/generator_tests/coasts_test.cpp b/generator/generator_tests/coasts_test.cpp
index 17e1846c5..01c2d3b02 100644
--- a/generator/generator_tests/coasts_test.cpp
+++ b/generator/generator_tests/coasts_test.cpp
@@ -22,7 +22,10 @@ namespace coasts_test
 {
 using feature::FeatureBuilder;
 
-static m2::PointU D2I(double x, double y) { return PointDToPointU(m2::PointD(x, y), kPointCoordBits); }
+static m2::PointU D2I(double x, double y)
+{
+  return PointDToPointU(m2::PointD(x, y), kPointCoordBits);
+}
 
 class ProcessCoastsBase
 {
@@ -90,9 +93,9 @@ class DoCopyCoasts : public ProcessCoastsBase
 {
 public:
   DoCopyCoasts(std::string const & fName, std::vector<std::string> const & vID)
-    : ProcessCoastsBase(vID), m_collector(fName)
-  {
-  }
+    : ProcessCoastsBase(vID)
+    , m_collector(fName)
+  {}
 
   void operator()(FeatureBuilder const & fb1, uint64_t)
   {
@@ -116,7 +119,7 @@ UNIT_TEST(CellID_CheckRectPoints)
   {
     Id const cell = Id::FromBitsAndLevel(i, level);
     std::pair<uint32_t, uint32_t> const xy = cell.XY();
-    uint32_t const r = 2*cell.Radius();
+    uint32_t const r = 2 * cell.Radius();
     uint32_t const bound = (1 << level) * r;
 
     double minX, minY, maxX, maxY;
diff --git a/generator/generator_tests/collector_boundary_postcode_tests.cpp b/generator/generator_tests/collector_boundary_postcode_tests.cpp
index dda184c12..33649e34c 100644
--- a/generator/generator_tests/collector_boundary_postcode_tests.cpp
+++ b/generator/generator_tests/collector_boundary_postcode_tests.cpp
@@ -21,8 +21,8 @@
 
 namespace collector_boundary_postcode_tests
 {
-using std::string, std::vector, std::unordered_map;
 using generator::tests_support::TestWithClassificator;
+using std::string, std::vector, std::unordered_map;
 
 static string const kDumpFileName = "dump.bin";
 
@@ -32,26 +32,19 @@ static string const kDumpFileName = "dump.bin";
 // |  |  |
 // 6--7--8
 unordered_map<uint64_t, m2::PointD> const kNodes = {
-    {0, m2::PointD{-1.0, 1.0}},
-    {1, m2::PointD{0.0, 1.0}},
-    {2, m2::PointD{1.0, 1.0}},
-    {3, m2::PointD{-1.0, 0.0}},
-    {4, m2::PointD{0.0, 0.0}},
-    {5, m2::PointD{1.0, 0.0}},
-    {6, m2::PointD{-1.0, -1.0}},
-    {7, m2::PointD{0.0, -1.0}},
-    {8, m2::PointD{1.0, -1.0}}};
+    {0, m2::PointD{-1.0, 1.0}},  {1, m2::PointD{0.0, 1.0}},  {2, m2::PointD{1.0, 1.0}},
+    {3, m2::PointD{-1.0, 0.0}},  {4, m2::PointD{0.0, 0.0}},  {5, m2::PointD{1.0, 0.0}},
+    {6, m2::PointD{-1.0, -1.0}}, {7, m2::PointD{0.0, -1.0}}, {8, m2::PointD{1.0, -1.0}}};
 
 vector<uint64_t> const kPolygon1 = {4, 5, 2, 1, 4};
 vector<uint64_t> const kPolygon2 = {6, 3, 4, 7, 6};
 vector<uint64_t> const kPolygon3 = {8, 7, 4, 5, 8};
 vector<uint64_t> const kPolygon4 = {0, 1, 4, 4, 0};
 
-unordered_map<uint64_t, WayElement> const kWays = {
-    {1, WayElement{1, kPolygon1}},
-    {2, WayElement{2, kPolygon2}},
-    {3, WayElement{3, kPolygon3}},
-    {4, WayElement{4, kPolygon4}}};
+unordered_map<uint64_t, WayElement> const kWays = {{1, WayElement{1, kPolygon1}},
+                                                   {2, WayElement{2, kPolygon2}},
+                                                   {3, WayElement{3, kPolygon3}},
+                                                   {4, WayElement{4, kPolygon4}}};
 
 class IntermediateDataReaderTest : public generator::cache::IntermediateDataReaderInterface
 {
@@ -72,29 +65,22 @@ class IntermediateDataReaderTest : public generator::cache::IntermediateDataRead
     return true;
   }
 
-  bool GetRelation(uint64_t /* id */, RelationElement & /* e */) override
-  {
-    return false;
-  }
+  bool GetRelation(uint64_t /* id */, RelationElement & /* e */) override { return false; }
 };
 
 OsmElement MakePostcodeAreaRelation(uint64_t id, string postcode, uint64_t wayId)
 {
-  auto postcodeAreaRelation =
-      generator_tests::MakeOsmElement(id, {{"type", "boundary"}, {"boundary", "postal_code"}, {"postal_code", postcode}},
-                                      OsmElement::EntityType::Relation);
+  auto postcodeAreaRelation = generator_tests::MakeOsmElement(
+      id, {{"type", "boundary"}, {"boundary", "postal_code"}, {"postal_code", postcode}},
+      OsmElement::EntityType::Relation);
   postcodeAreaRelation.AddMember(wayId, OsmElement::EntityType::Way, "outer");
   return postcodeAreaRelation;
 }
 
-auto const postcodeAreaRelation1 =
-    MakePostcodeAreaRelation(1 /* id */, "127001" /* postcode */, 1 /* wayId */);
-auto const postcodeAreaRelation2 =
-    MakePostcodeAreaRelation(2 /* id */, "127002" /* postcode */, 2 /* wayId */);
-auto const postcodeAreaRelation3 =
-    MakePostcodeAreaRelation(3 /* id */, "127003" /* postcode */, 3 /* wayId */);
-auto const postcodeAreaRelation4 =
-    MakePostcodeAreaRelation(4 /* id */, "127004" /* postcode */, 4 /* wayId */);
+auto const postcodeAreaRelation1 = MakePostcodeAreaRelation(1 /* id */, "127001" /* postcode */, 1 /* wayId */);
+auto const postcodeAreaRelation2 = MakePostcodeAreaRelation(2 /* id */, "127002" /* postcode */, 2 /* wayId */);
+auto const postcodeAreaRelation3 = MakePostcodeAreaRelation(3 /* id */, "127003" /* postcode */, 3 /* wayId */);
+auto const postcodeAreaRelation4 = MakePostcodeAreaRelation(4 /* id */, "127004" /* postcode */, 4 /* wayId */);
 
 unordered_map<string, vector<m2::PointD>> Read(string const & dumpFilename)
 {
@@ -114,8 +100,8 @@ unordered_map<string, vector<m2::PointD>> Read(string const & dumpFilename)
   return result;
 }
 
-bool CheckPostcodeExists(unordered_map<string, vector<m2::PointD>> const & data,
-                         string const & postcode, vector<m2::PointD> const & geometry)
+bool CheckPostcodeExists(unordered_map<string, vector<m2::PointD>> const & data, string const & postcode,
+                         vector<m2::PointD> const & geometry)
 {
   auto const it = data.find(postcode);
   if (it == data.end())
@@ -125,10 +111,8 @@ bool CheckPostcodeExists(unordered_map<string, vector<m2::PointD>> const & data,
     return false;
 
   for (size_t i = 0; i < geometry.size(); ++i)
-  {
     if (!AlmostEqualAbs(geometry[i], it->second[i], kMwmPointAccuracy))
       return false;
-  }
 
   return true;
 }
@@ -155,7 +139,6 @@ void Check(string const & dumpFilename)
   TEST(CheckPostcodeExists(data, "127004", ConvertIdsToPoints(kPolygon4)), (data));
 }
 
-
 UNIT_CLASS_TEST(TestWithClassificator, CollectorBoundaryPostcode_1)
 {
   SCOPE_GUARD(rmDump, std::bind(Platform::RemoveFileIfExists, cref(kDumpFileName)));
diff --git a/generator/generator_tests/collector_building_parts_tests.cpp b/generator/generator_tests/collector_building_parts_tests.cpp
index cc8470b0b..2e8518554 100644
--- a/generator/generator_tests/collector_building_parts_tests.cpp
+++ b/generator/generator_tests/collector_building_parts_tests.cpp
@@ -21,16 +21,10 @@ using namespace generator::tests_support;
 class TestOSMElementCacheReader : public generator::cache::OSMElementCacheReaderInterface
 {
 public:
-  TestOSMElementCacheReader(std::unordered_map<generator::cache::Key, RelationElement> & m)
-    : m_mapping(m)
-  {
-  }
+  TestOSMElementCacheReader(std::unordered_map<generator::cache::Key, RelationElement> & m) : m_mapping(m) {}
 
   // OSMElementCacheReaderInterface overrides:
-  bool Read(generator::cache::Key /* id */, WayElement & /* value */) override
-  {
-    UNREACHABLE();
-  }
+  bool Read(generator::cache::Key /* id */, WayElement & /* value */) override { UNREACHABLE(); }
 
   bool Read(generator::cache::Key id, RelationElement & value) override
   {
@@ -99,10 +93,7 @@ public:
   }
 
   // IntermediateDataReaderBase overrides:
-  bool GetNode(generator::cache::Key, double &, double &) const override
-  {
-    UNREACHABLE();
-  }
+  bool GetNode(generator::cache::Key, double &, double &) const override { UNREACHABLE(); }
 
   bool GetWay(generator::cache::Key /* id */, WayElement & /* e */) override { UNREACHABLE(); }
 
@@ -199,8 +190,7 @@ UNIT_CLASS_TEST(TestWithClassificator, CollectorBuildingParts_Case1)
     collector.Finish();
     collector.Finalize();
   }
-  TestCollector(file.GetFullPath(), fb, *intermediateReader,
-                IntermediateDataReaderTest::kTopRelationId1);
+  TestCollector(file.GetFullPath(), fb, *intermediateReader, IntermediateDataReaderTest::kTopRelationId1);
 }
 
 UNIT_CLASS_TEST(TestWithClassificator, CollectorBuildingParts_Case2)
@@ -220,8 +210,7 @@ UNIT_CLASS_TEST(TestWithClassificator, CollectorBuildingParts_Case2)
 
   auto intermediateReader = std::make_shared<IntermediateDataReaderTest>();
   {
-    auto collector1 =
-        std::make_shared<generator::BuildingPartsCollector>(file.GetFullPath(), intermediateReader);
+    auto collector1 = std::make_shared<generator::BuildingPartsCollector>(file.GetFullPath(), intermediateReader);
     // We don't clone cache, because it isn't mutable.
     auto collector2 = collector1->Clone(intermediateReader);
 
@@ -235,9 +224,7 @@ UNIT_CLASS_TEST(TestWithClassificator, CollectorBuildingParts_Case2)
     collector1->Finalize();
   }
 
-  TestCollector(file.GetFullPath(), fb1, *intermediateReader,
-                IntermediateDataReaderTest::kTopRelationId1);
-  TestCollector(file.GetFullPath(), fb2, *intermediateReader,
-                IntermediateDataReaderTest::kTopRelationId2);
+  TestCollector(file.GetFullPath(), fb1, *intermediateReader, IntermediateDataReaderTest::kTopRelationId1);
+  TestCollector(file.GetFullPath(), fb2, *intermediateReader, IntermediateDataReaderTest::kTopRelationId2);
 }
 }  // namespace collector_building_parts_tests
diff --git a/generator/generator_tests/collector_routing_city_boundaries_tests.cpp b/generator/generator_tests/collector_routing_city_boundaries_tests.cpp
index c8072fa79..690f94ce1 100644
--- a/generator/generator_tests/collector_routing_city_boundaries_tests.cpp
+++ b/generator/generator_tests/collector_routing_city_boundaries_tests.cpp
@@ -64,10 +64,14 @@ auto const placeRelation2 = MakeOsmElement(2 /* id */, {{"place", "town"}}, OsmE
 auto const placeRelation3 = MakeOsmElement(3 /* id */, {{"place", "village"}}, OsmElement::EntityType::Relation);
 auto const placeRelation4 = MakeOsmElement(4 /* id */, {{"place", "country"}}, OsmElement::EntityType::Relation);
 
-auto const placeNode1 = MakeOsmElement(9 /* id */, {{"place", "city"}, {"population", "200.000"}}, OsmElement::EntityType::Node);
-auto const placeNode2 = MakeOsmElement(10 /* id */, {{"place", "town"}, {"population", "10 000"}}, OsmElement::EntityType::Node);
-auto const placeNode3 = MakeOsmElement(11 /* id */, {{"place", "village"}, {"population", "1000"}}, OsmElement::EntityType::Node);
-auto const placeNode4 = MakeOsmElement(12 /* id */, {{"place", "country"}, {"population", "147000000"}}, OsmElement::EntityType::Node);
+auto const placeNode1 =
+    MakeOsmElement(9 /* id */, {{"place", "city"}, {"population", "200.000"}}, OsmElement::EntityType::Node);
+auto const placeNode2 =
+    MakeOsmElement(10 /* id */, {{"place", "town"}, {"population", "10 000"}}, OsmElement::EntityType::Node);
+auto const placeNode3 =
+    MakeOsmElement(11 /* id */, {{"place", "village"}, {"population", "1000"}}, OsmElement::EntityType::Node);
+auto const placeNode4 =
+    MakeOsmElement(12 /* id */, {{"place", "country"}, {"population", "147000000"}}, OsmElement::EntityType::Node);
 
 auto const relationWithLabel1 = MakeAreaWithPlaceNode(5 /* id */, 9 /* placeId */, "label" /* role */);
 auto const relationWithLabel2 = MakeAreaWithPlaceNode(6 /* id */, 10 /* placeId */, "admin_centre" /* role */);
@@ -257,28 +261,19 @@ UNIT_TEST(AreaOnEarth_Convex_Polygon_1)
   std::vector<ms::LatLon> const latlons = {a, b, c, d, e};
   std::vector<m2::PointD> const points = FromLatLons(latlons);
 
-  double const areaTriangulated =
-      ms::AreaOnEarth(a, b, c) + ms::AreaOnEarth(a, c, d) + ms::AreaOnEarth(a, d, e);
+  double const areaTriangulated = ms::AreaOnEarth(a, b, c) + ms::AreaOnEarth(a, c, d) + ms::AreaOnEarth(a, d, e);
 
   double const areaOnEarth = generator::AreaOnEarth(points);
 
-  TEST(AlmostEqualRel(areaTriangulated,
-                            areaOnEarth,
-                            1e-6), (areaTriangulated, areaOnEarth));
+  TEST(AlmostEqualRel(areaTriangulated, areaOnEarth, 1e-6), (areaTriangulated, areaOnEarth));
 }
 
 UNIT_TEST(AreaOnEarth_Convex_Polygon_2)
 {
   std::vector<ms::LatLon> const latlons = {
-      {55.6348484, 36.025526},
-      {55.0294112, 36.8959709},
-      {54.9262448, 38.3719426},
-      {55.3561515, 39.3275397},
-      {55.7548279, 39.4458067},
-      {56.3020039, 39.3322704},
-      {56.5140099, 38.6368606},
-      {56.768935, 37.0473526},
-      {56.4330113, 35.6234183},
+      {55.6348484, 36.025526},  {55.0294112, 36.8959709}, {54.9262448, 38.3719426},
+      {55.3561515, 39.3275397}, {55.7548279, 39.4458067}, {56.3020039, 39.3322704},
+      {56.5140099, 38.6368606}, {56.768935, 37.0473526},  {56.4330113, 35.6234183},
   };
 
   std::vector<m2::PointD> const points = FromLatLons(latlons);
@@ -286,9 +281,7 @@ UNIT_TEST(AreaOnEarth_Convex_Polygon_2)
   double const areaOnEarth = generator::AreaOnEarth(points);
   double const areaForConvexPolygon = CalculateEarthAreaForConvexPolygon(latlons);
 
-  TEST(AlmostEqualRel(areaForConvexPolygon,
-                            areaOnEarth,
-                            1e-6), (areaForConvexPolygon, areaOnEarth));
+  TEST(AlmostEqualRel(areaForConvexPolygon, areaOnEarth, 1e-6), (areaForConvexPolygon, areaOnEarth));
 }
 
 UNIT_TEST(AreaOnEarth_Concave_Polygon)
@@ -307,20 +300,12 @@ UNIT_TEST(AreaOnEarth_Concave_Polygon)
   std::vector<ms::LatLon> const latlons = {a, b, c, d, e, f, g, h, i, j};
   std::vector<m2::PointD> const points = FromLatLons(latlons);
 
-  double areaTriangulated =
-      ms::AreaOnEarth(a, b, c) +
-      ms::AreaOnEarth(a, c, d) +
-      ms::AreaOnEarth(a, d, f) +
-      ms::AreaOnEarth(d, e, f) +
-      ms::AreaOnEarth(a, f, j) +
-      ms::AreaOnEarth(f, h, j) +
-      ms::AreaOnEarth(f, g, h) +
-      ms::AreaOnEarth(h, i, j);
+  double areaTriangulated = ms::AreaOnEarth(a, b, c) + ms::AreaOnEarth(a, c, d) + ms::AreaOnEarth(a, d, f) +
+                            ms::AreaOnEarth(d, e, f) + ms::AreaOnEarth(a, f, j) + ms::AreaOnEarth(f, h, j) +
+                            ms::AreaOnEarth(f, g, h) + ms::AreaOnEarth(h, i, j);
 
   double const areaOnEarth = generator::AreaOnEarth(points);
 
-  TEST(AlmostEqualRel(areaTriangulated,
-                            areaOnEarth,
-                            1e-6), ());
+  TEST(AlmostEqualRel(areaTriangulated, areaOnEarth, 1e-6), ());
 }
 }  // namespace collector_routing_city_boundaries_tests
diff --git a/generator/generator_tests/complex_loader_tests.cpp b/generator/generator_tests/complex_loader_tests.cpp
index e50ce4a31..7d5311fa6 100644
--- a/generator/generator_tests/complex_loader_tests.cpp
+++ b/generator/generator_tests/complex_loader_tests.cpp
@@ -110,12 +110,10 @@ std::string const kCsv1 =
     "ShakeUp;"
     "Russia_Moscow\n";
 
-
 void SortForest(tree_node::types::Ptrs<generator::HierarchyEntry> & forest)
 {
-  std::sort(std::begin(forest), std::end(forest), [](auto const & lhs, auto const & rhs) {
-    return lhs->GetData().m_id < rhs->GetData().m_id;
-  });
+  std::sort(std::begin(forest), std::end(forest),
+            [](auto const & lhs, auto const & rhs) { return lhs->GetData().m_id < rhs->GetData().m_id; });
 }
 
 UNIT_CLASS_TEST(TestWithClassificator, Complex_IsComplex)
diff --git a/generator/generator_tests/cross_mwm_osm_ways_collector_tests.cpp b/generator/generator_tests/cross_mwm_osm_ways_collector_tests.cpp
index feb0874e8..11506e819 100644
--- a/generator/generator_tests/cross_mwm_osm_ways_collector_tests.cpp
+++ b/generator/generator_tests/cross_mwm_osm_ways_collector_tests.cpp
@@ -31,8 +31,7 @@ using namespace generator_tests;
 std::string const kTmpDirName = "cross_mwm_ways";
 
 std::vector<std::string> const kHighwayUnclassifiedPath = {"highway", "unclassified"};
-std::vector<std::pair<std::string, std::string>> const kHighwayUnclassified = {
-    {"highway", "unclassified"}};
+std::vector<std::pair<std::string, std::string>> const kHighwayUnclassified = {{"highway", "unclassified"}};
 
 std::string const kOsmWayId_1 = std::to_string(base::MakeOsmWay(1).GetEncodedId());
 std::string const kOsmWayId_2 = std::to_string(base::MakeOsmWay(2).GetEncodedId());
@@ -46,8 +45,7 @@ public:
     classificator::Load();
     auto const targetDir = GetPlatform().WritableDir();
 
-    m_affiliation = std::make_shared<feature::CountriesFilesAffiliation>(
-          targetDir, true /*haveBordersForWholeWorld*/);
+    m_affiliation = std::make_shared<feature::CountriesFilesAffiliation>(targetDir, true /*haveBordersForWholeWorld*/);
 
     auto const intermediateDir = base::JoinPath(targetDir, kTmpDirName);
     if (!Platform::MkDirChecked(intermediateDir))
@@ -96,19 +94,14 @@ public:
   // osmId crossMwmSegmentsNumber [crossMwmSegmentsId forwardIsEnter]+
   void Checker()
   {
-    std::vector<std::string> answersFor_RomaniaNorth_West = {
-        kOsmWayId_1 + " 1 1 0 ", kOsmWayId_2 + " 1 0 0 "};
+    std::vector<std::string> answersFor_RomaniaNorth_West = {kOsmWayId_1 + " 1 1 0 ", kOsmWayId_2 + " 1 0 0 "};
 
-    std::vector<std::string> answersFor_Hungary_Northern_Great_Plain = {
-        kOsmWayId_1 + " 1 1 1 ", kOsmWayId_2 + " 1 0 1 "};
+    std::vector<std::string> answersFor_Hungary_Northern_Great_Plain = {kOsmWayId_1 + " 1 1 1 ",
+                                                                        kOsmWayId_2 + " 1 0 1 "};
 
-    std::vector<std::string> answersFor_Russia_Moscow = {
-        kOsmWayId_3 + " 1 0 1 "
-    };
+    std::vector<std::string> answersFor_Russia_Moscow = {kOsmWayId_3 + " 1 0 1 "};
 
-    std::vector<std::string> answersFor_Russia_Moscow_Oblast_West = {
-        kOsmWayId_3 + " 1 0 0 "
-    };
+    std::vector<std::string> answersFor_Russia_Moscow_Oblast_West = {kOsmWayId_3 + " 1 0 0 "};
 
     Check("Romania_North_West", answersFor_RomaniaNorth_West);
     Check("Hungary_Northern Great Plain", answersFor_Hungary_Northern_Great_Plain);
@@ -123,10 +116,7 @@ feature::FeatureBuilder CreateFeatureBuilderFromOsmWay(uint64_t osmId, std::vect
   fb.AddOsmId(base::MakeOsmWay(osmId));
 
   std::vector<m2::PointD> points;
-  base::Transform(llPoints, std::back_inserter(points), [](ms::LatLon const & ll)
-  {
-    return mercator::FromLatLon(ll);
-  });
+  base::Transform(llPoints, std::back_inserter(points), [](ms::LatLon const & ll) { return mercator::FromLatLon(ll); });
   fb.AssignPoints(std::move(points));
   fb.SetLinear();
 
@@ -138,7 +128,7 @@ void AddOsmWayByPoints(uint64_t osmId, std::vector<ms::LatLon> const & points,
                        std::shared_ptr<CollectorInterface> const & collection)
 {
   collection->CollectFeature(CreateFeatureBuilderFromOsmWay(osmId, points),
-      MakeOsmElement(osmId, kHighwayUnclassified, OsmElement::EntityType::Way));
+                             MakeOsmElement(osmId, kHighwayUnclassified, OsmElement::EntityType::Way));
 }
 
 void AppendFirstWayFromRomaniaToHungary(std::shared_ptr<CollectorInterface> const & collection)
@@ -215,15 +205,15 @@ UNIT_CLASS_TEST(CrossMwmWayCollectorTest, Lithuania_Belarus_Kamenny_Log)
   TEST_EQUAL(countries.size(), 1, ());
 
   // https://www.openstreetmap.org/way/614091318 should present in Lithuania and Belarus
-  AddOsmWayByPoints(1, {
-                        {54.5460103, 25.6945156},
-                        {54.5454276, 25.6952895},
-                        {54.5453567, 25.6953987},
-                        {54.5453056, 25.6955672},
-                        {54.5443252, 25.6994996},
-                        {54.5443107, 25.6995562}, // 5 segId starts here
-                        connected
-                    }, collection);
+  AddOsmWayByPoints(1,
+                    {{54.5460103, 25.6945156},
+                     {54.5454276, 25.6952895},
+                     {54.5453567, 25.6953987},
+                     {54.5453056, 25.6955672},
+                     {54.5443252, 25.6994996},
+                     {54.5443107, 25.6995562},  // 5 segId starts here
+                     connected},
+                    collection);
 
   collection->Finalize();
 
@@ -240,23 +230,27 @@ UNIT_CLASS_TEST(CrossMwmWayCollectorTest, Belarus_Lithuania_Kamenny_Log)
   TEST_EQUAL(countries.size(), 2, ());
 
   // https://www.openstreetmap.org/way/533044131
-  AddOsmWayByPoints(1, {
+  AddOsmWayByPoints(1,
+                    {
                         {54.5442277, 25.7001698},
                         {54.5442419, 25.7001125},
                         connected,
-                    }, collection);
+                    },
+                    collection);
 
   // https://www.openstreetmap.org/way/489294139
-  AddOsmWayByPoints(2, {
+  AddOsmWayByPoints(2,
+                    {
                         connected,
                         {54.5443587, 25.6996293},
                         {54.5443765, 25.6995660},
-                    }, collection);
+                    },
+                    collection);
 
   collection->Finalize();
 
   Check("Belarus_Hrodna Region", {kOsmWayId_1 + " 1 1 0 ", kOsmWayId_2 + " 2 0 1 1 0 "});
-  Check("Lithuania_East",        {kOsmWayId_1 + " 1 1 1 ", kOsmWayId_2 + " 2 0 1 1 1 "});
+  Check("Lithuania_East", {kOsmWayId_1 + " 1 1 1 ", kOsmWayId_2 + " 2 0 1 1 1 "});
 }
 
 }  // namespace cross_mwm_osm_ways_collector_tests
diff --git a/generator/generator_tests/descriptions_section_builder_tests.cpp b/generator/generator_tests/descriptions_section_builder_tests.cpp
index 28b914fe5..753772582 100644
--- a/generator/generator_tests/descriptions_section_builder_tests.cpp
+++ b/generator/generator_tests/descriptions_section_builder_tests.cpp
@@ -63,10 +63,7 @@ public:
     classificator::Load();
   }
 
-  ~TestDescriptionSectionBuilder()
-  {
-    CHECK(Platform::RmDirRecursively(m_wikiDir), ());
-  }
+  ~TestDescriptionSectionBuilder() { CHECK(Platform::RmDirRecursively(m_wikiDir), ()); }
 
   void MakeDescriptions() const
   {
@@ -196,10 +193,8 @@ private:
     for (auto const & m : kWikiData)
     {
       for (auto const & d : m.m_pages)
-      {
         if (IsSupportedLang(d.first))
           langs[d.first] += 1;
-      }
     }
 
     return langs;
@@ -224,10 +219,8 @@ private:
     for (auto const & m : kWikiData)
     {
       for (auto const & d : m.m_pages)
-      {
         if (IsSupportedLang(d.first))
           size += d.second.size();
-      }
     }
 
     return size;
@@ -240,10 +233,8 @@ private:
 
   static int SumPageSizes(std::vector<PageT> const & p)
   {
-    return std::accumulate(std::begin(p), std::end(p), 0, [] (int acc, PageT const & p)
-    {
-      return acc + p.second.size();
-    });
+    return std::accumulate(std::begin(p), std::end(p), 0,
+                           [](int acc, PageT const & p) { return acc + p.second.size(); });
   }
 
   static bool CheckLangs(DescriptionsCollectionBuilderStat::LangStatistics const & stat)
@@ -269,10 +260,8 @@ private:
   {
     for (auto const & [lang, _] : meta)
     {
-      auto const it = base::FindIf(p, [lang = lang](auto const & p)
-      {
-        return StringUtf8Multilang::GetLangIndex(p.first) == lang;
-      });
+      auto const it =
+          base::FindIf(p, [lang = lang](auto const & p) { return StringUtf8Multilang::GetLangIndex(p.first) == lang; });
       if (it == std::end(p))
         return false;
     }
@@ -286,7 +275,6 @@ private:
 std::string const TestDescriptionSectionBuilder::kMwmFile = "MwmFile";
 std::string const TestDescriptionSectionBuilder::kDirPages = "wiki";
 
-
 UNIT_CLASS_TEST(TestDescriptionSectionBuilder, MakeDescriptions)
 {
   TestDescriptionSectionBuilder::MakeDescriptions();
@@ -317,14 +305,11 @@ UNIT_CLASS_TEST(TestDescriptionSectionBuilder, BuildDescriptionsSection)
   TestDescriptionSectionBuilder::BuildDescriptionsSection();
 }
 
-
 // http://en.wikipedia.org/wiki/Helsinki_Olympic_Stadium/ -  en, de, ru, fr
 // https://en.wikipedia.org/wiki/Turku_Cathedral - en, ru
 std::vector<TestDescriptionSectionBuilder::WikiData> const TestDescriptionSectionBuilder::kWikiData = {
-  {"http://en.wikipedia.org/wiki/Helsinki_Olympic_Stadium/",
-   {
-     {
-       "en",
+    {"http://en.wikipedia.org/wiki/Helsinki_Olympic_Stadium/",
+     {{"en",
        R"(
        <p class="mw-empty-elt">
        </p>
@@ -373,10 +358,8 @@ std::vector<TestDescriptionSectionBuilder::WikiData> const TestDescriptionSectio
        <li>Stadion.fi – Official site</li>
        <li>History of the stadium</li>
        <li>Panoramic virtual tour from the stadium tower</li></ul>
-       )"
-     },
-     {
-       "de",
+       )"},
+      {"de",
        R"(
        <p>Das <b>Olympiastadion Helsinki</b> (<span>finnisch</span> <span lang="fi-Latn"><i>Helsingin olympiastadion</i></span>, <span>schwedisch</span> <span lang="sv-Latn"><i>Helsingfors Olympiastadion</i></span>) ist das größte Stadion Finnlands. Das Stadionrund mit Leichtathletikanlage ist die Heimstätte der finnischen Fußballnationalmannschaft. Es liegt rund zwei Kilometer vom Stadtzentrum von Helsinki entfernt im Stadtteil Töölö. 2006 wurde es unter Denkmalschutz gestellt. Das Nationalstadion wird ab 2016 umfangreich renoviert und soll nach drei Jahren 2019 wiedereröffnet werden.</p>
 
@@ -398,10 +381,8 @@ std::vector<TestDescriptionSectionBuilder::WikiData> const TestDescriptionSectio
        <li>stadionwelt.de: Bildergalerie</li></ul>
 
        <h2>Einzelnachweise</h2>
-       )"
-     },
-     {
-       "ru",
+       )"},
+      {"ru",
        R"(
        <p><b>Олимпийский стадион Хельсинки</b> (фин. <span lang="fi">Helsingin olympiastadion</span>, швед. <span lang="sv">Helsingfors Olympiastadion</span>) — крупнейшая спортивная арена Финляндии. Стадион расположен в районе Тёёлё, примерно в двух километрах от исторического центра Хельсинки. В летнее время, помимо спортивных мероприятий, на стадионе проводят и музыкальные концерты.
        </p>
@@ -472,10 +453,8 @@ std::vector<TestDescriptionSectionBuilder::WikiData> const TestDescriptionSectio
        <h2>Ссылки</h2>
        <ul><li>Olympiastadion</li>
        <li>Suomen Urheilumuseo</li></ul>
-       )"
-     },
-     {
-       "fr",
+       )"},
+      {"fr",
        R"(
        <p>Le <b>stade olympique d'Helsinki</b> (en finnois et en suédois : <i>Olympiastadion</i>) situé dans le quartier de Töölö, à environ 2 <abbr class="abbr" title="kilomètre">km</abbr> du centre-ville d'Helsinki est le plus grand stade en Finlande. C'est le stade principal des Jeux olympiques d'été de 1952. Il a été construit pour y célébrer les Jeux olympiques d'été de 1940 qui ont été finalement annulés (auparavant attribués à Tokyo) en raison de la Seconde Guerre mondiale.
        </p><p>Le stade a également été le siège des Championnats du monde d'athlétisme, les tout premiers en 1983 et à nouveau en 2005. Il hébergera pour la <abbr class="abbr" title="Troisième">3<sup>e</sup></abbr> fois les Championnats d'Europe d'athlétisme en 2012, après les éditions de 1971 et de 1994. C'est aussi le stade de l'Équipe de Finlande de football.
@@ -537,16 +516,10 @@ std::vector<TestDescriptionSectionBuilder::WikiData> const TestDescriptionSectio
        <h3>Liens internes</h3>
        <ul><li>Piscine olympique d'Helsinki</li></ul><p><br></p>
        <ul id="bandeau-portail" class="bandeau-portail"><li><span><span></span> <span>Portail de l’architecture et de l’urbanisme</span> </span></li> <li><span><span></span> <span>Portail du football</span> </span></li> <li><span><span></span> <span>Portail de l’athlétisme</span> </span></li> <li><span><span></span> <span>Portail des Jeux olympiques</span> </span></li> <li><span><span></span> <span>Portail d’Helsinki</span> </span></li>                </ul>
-       )"
-     }
-   }
-  },
-  {
-    "https://en.wikipedia.org/wiki/Turku_Cathedral",
-    {
-      {
-        "en",
-        R"(
+       )"}}},
+    {"https://en.wikipedia.org/wiki/Turku_Cathedral",
+     {{"en",
+       R"(
         <p><b>Turku Cathedral</b> (Finnish: <i lang="fi">Turun tuomiokirkko</i>, Swedish: <i lang="sv">Åbo domkyrka</i>) is the previous catholic cathedral of Finland, today the Mother Church of the Evangelical Lutheran Church of Finland. It is the central church of the Lutheran Archdiocese of Turku and the seat of the Lutheran Archbishop of Finland, Kari Mäkinen. It is also regarded as one of the major records of Finnish architectural history.
         </p><p>Considered to be the most important religious building in Finland, the cathedral has borne witness to many important events in the nation's history and has become one of the city's most recognizable symbols. The cathedral is situated in the heart of Turku next to the Old Great Square, by the river Aura. Its presence extends beyond the local precinct by having the sound of its bells chiming at noon broadcast on national radio. It is also central to Finland's annual Christmas celebrations.
         </p><p>The cathedral was originally built out of wood in the late 13th century, and was dedicated as the main cathedral of Finland in 1300, the seat of the Catholic bishop of Turku. It was considerably expanded in the 14th and 15th centuries, mainly using stone as the construction material. The cathedral was badly damaged during the Great Fire of Turku in 1827, and was rebuilt to a great extent afterwards.
@@ -594,11 +567,9 @@ std::vector<TestDescriptionSectionBuilder::WikiData> const TestDescriptionSectio
         <li>Medieval Turku</li>
         <li>Turku Cathedral – photos</li>
         <li>Turku church organs</li></ul>
-        )"
-      },
-      {
-        "ru",
-        R"(
+        )"},
+      {"ru",
+       R"(
         <p><b>Кафедра́льный собо́р Ту́рку</b> (швед. <span lang="sv">Åbo domkyrka</span>, фин. <span lang="fi">Turun tuomiokirkko</span>) — главный лютеранский храм в Финляндии. Построен во второй половине XIII века, освящён в 1300 году в честь Девы Марии и первого епископа страны — святого Генриха, крестившего Финляндию.
         </p>
 
@@ -618,9 +589,5 @@ std::vector<TestDescriptionSectionBuilder::WikiData> const TestDescriptionSectio
         <ul><li class="mw-empty-elt">
         <li> На Викискладе есть медиафайлы по теме Абосский собор</li></ul>
         <p><br></p>
-        )"
-      }
-    }
-  }
-};
+        )"}}}};
 }  // namespace generator_tests
diff --git a/generator/generator_tests/feature_builder_test.cpp b/generator/generator_tests/feature_builder_test.cpp
index 9f75d74ea..dbfc3b6c1 100644
--- a/generator/generator_tests/feature_builder_test.cpp
+++ b/generator/generator_tests/feature_builder_test.cpp
@@ -26,14 +26,14 @@ UNIT_CLASS_TEST(TestWithClassificator, FBuilder_ManyTypes)
   FeatureBuilderParams params;
 
   base::StringIL arr[] = {
-    { "building" },
-    { "place", "country" },
-    { "place", "state" },
-    /// @todo Can't realize is it deprecated or we forgot to add clear styles for it.
-    //{ "place", "county" },
-    { "place", "region" },
-    { "place", "city" },
-    { "place", "town" },
+      {"building"},
+      {"place", "country"},
+      {"place", "state"},
+      /// @todo Can't realize is it deprecated or we forgot to add clear styles for it.
+      //{ "place", "county" },
+      {"place", "region"},
+      {"place", "city"},
+      {"place", "town"},
   };
   AddTypes(params, arr);
 
@@ -65,18 +65,15 @@ UNIT_CLASS_TEST(TestWithClassificator, FBuilder_LineTypes)
   FeatureBuilderParams params;
 
   base::StringIL arr[] = {
-    { "railway", "rail" },
-    { "highway", "motorway" },
-    { "hwtag", "oneway" },
-    { "psurface", "paved_good" },
-    { "junction", "roundabout" },
+      {"railway", "rail"},        {"highway", "motorway"},    {"hwtag", "oneway"},
+      {"psurface", "paved_good"}, {"junction", "roundabout"},
   };
 
   AddTypes(params, arr);
   params.FinishAddingTypes();
   fb1.SetParams(params);
 
-  fb1.AssignPoints({ {0, 0}, {1, 1} });
+  fb1.AssignPoints({{0, 0}, {1, 1}});
   fb1.SetLinear();
 
   TEST(fb1.RemoveInvalidTypes(), ());
@@ -146,8 +143,8 @@ UNIT_CLASS_TEST(TestWithClassificator, FVisibility_RemoveUselessTypes)
 
   {
     std::vector<uint32_t> types;
-    types.push_back(c.GetTypeByPath({ "building" }));
-    types.push_back(c.GetTypeByPath({ "amenity", "theatre" }));
+    types.push_back(c.GetTypeByPath({"building"}));
+    types.push_back(c.GetTypeByPath({"amenity", "theatre"}));
 
     TEST(RemoveUselessTypes(types, GeomType::Area), ());
     TEST_EQUAL(types.size(), 2, ());
@@ -155,12 +152,12 @@ UNIT_CLASS_TEST(TestWithClassificator, FVisibility_RemoveUselessTypes)
 
   {
     std::vector<uint32_t> types;
-    types.push_back(c.GetTypeByPath({ "highway", "primary" }));
-    types.push_back(c.GetTypeByPath({ "building" }));
+    types.push_back(c.GetTypeByPath({"highway", "primary"}));
+    types.push_back(c.GetTypeByPath({"building"}));
 
     TEST(RemoveUselessTypes(types, GeomType::Area, true /* emptyName */), ());
     TEST_EQUAL(types.size(), 1, ());
-    TEST_EQUAL(types[0], c.GetTypeByPath({ "building" }), ());
+    TEST_EQUAL(types[0], c.GetTypeByPath({"building"}), ());
   }
 }
 
@@ -168,10 +165,7 @@ UNIT_CLASS_TEST(TestWithClassificator, FBuilder_RemoveUselessNames)
 {
   FeatureBuilderParams params;
 
-  base::StringIL arr[] = {
-    { "boundary", "administrative", "2" },
-    { "barrier", "fence" }
-  };
+  base::StringIL arr[] = {{"boundary", "administrative", "2"}, {"barrier", "fence"}};
   AddTypes(params, arr);
   params.FinishAddingTypes();
 
@@ -181,7 +175,7 @@ UNIT_CLASS_TEST(TestWithClassificator, FBuilder_RemoveUselessNames)
   FeatureBuilder fb1;
   fb1.SetParams(params);
 
-  fb1.AssignPoints({ {0, 0}, {1, 1} });
+  fb1.AssignPoints({{0, 0}, {1, 1}});
   fb1.SetLinear();
 
   TEST(!fb1.GetName(0).empty(), ());
@@ -218,7 +212,7 @@ UNIT_CLASS_TEST(TestWithClassificator, FBuilder_SerializeLocalityObjectForBuildi
   FeatureBuilderParams params;
 
   base::StringIL arr[] = {
-    { "building" },
+      {"building"},
   };
   AddTypes(params, arr);
 
@@ -261,7 +255,7 @@ UNIT_CLASS_TEST(TestWithClassificator, FBuilder_HouseName)
   FeatureBuilder fb;
   FeatureBuilderParams params;
 
-  base::StringIL arr[] = {{ "building" }};
+  base::StringIL arr[] = {{"building"}};
   AddTypes(params, arr);
   params.FinishAddingTypes();
 
@@ -286,11 +280,8 @@ UNIT_CLASS_TEST(TestWithClassificator, FBuilder_SerializeAccuratelyForIntermedia
   FeatureBuilderParams params;
 
   base::StringIL arr[] = {
-    { "railway", "rail" },
-    { "highway", "motorway" },
-    { "hwtag", "oneway" },
-    { "psurface", "paved_good" },
-    { "junction", "circular" },
+      {"railway", "rail"},        {"highway", "motorway"},  {"hwtag", "oneway"},
+      {"psurface", "paved_good"}, {"junction", "circular"},
   };
 
   AddTypes(params, arr);
@@ -300,7 +291,7 @@ UNIT_CLASS_TEST(TestWithClassificator, FBuilder_SerializeAccuratelyForIntermedia
   auto const diff = 0.33333333334567;
   std::vector<m2::PointD> points;
   for (size_t i = 0; i < 100; ++i)
-    points.push_back({ i + diff, i + 1 + diff });
+    points.push_back({i + diff, i + 1 + diff});
 
   fb1.AssignPoints(std::move(points));
   fb1.SetLinear();
@@ -386,9 +377,7 @@ UNIT_CLASS_TEST(TestWithClassificator, FBuilder_RemoveInconsistentTypes)
   FeatureBuilderParams params;
 
   base::StringIL arr[] = {
-    {"highway", "cycleway"}, {"hwtag", "onedir_bicycle"},
-    {"hwtag", "nobicycle"}, {"hwtag", "yesbicycle"}
-  };
+      {"highway", "cycleway"}, {"hwtag", "onedir_bicycle"}, {"hwtag", "nobicycle"}, {"hwtag", "yesbicycle"}};
   AddTypes(params, arr);
   TEST_EQUAL(params.m_types.size(), 4, ());
 
diff --git a/generator/generator_tests/feature_merger_test.cpp b/generator/generator_tests/feature_merger_test.cpp
index 8e6877cd0..eaef54118 100644
--- a/generator/generator_tests/feature_merger_test.cpp
+++ b/generator/generator_tests/feature_merger_test.cpp
@@ -12,44 +12,42 @@ using namespace feature;
 
 namespace
 {
-  typedef m2::PointD P;
+typedef m2::PointD P;
 
-  class VectorEmitter : public FeatureEmitterIFace
+class VectorEmitter : public FeatureEmitterIFace
+{
+  std::vector<FeatureBuilder> m_vec;
+
+public:
+  virtual void operator()(FeatureBuilder const & fb) { m_vec.push_back(fb); }
+
+  size_t GetSize() const { return m_vec.size(); }
+
+  void Check(uint32_t type, size_t count) const
   {
-    std::vector<FeatureBuilder> m_vec;
-  public:
-    virtual void operator() (FeatureBuilder const & fb)
-    {
-      m_vec.push_back(fb);
-    }
+    size_t test = 0;
+    for (size_t i = 0; i < m_vec.size(); ++i)
+      if (m_vec[i].HasType(type))
+        ++test;
 
-    size_t GetSize() const { return m_vec.size(); }
-
-    void Check(uint32_t type, size_t count) const
-    {
-      size_t test = 0;
-      for (size_t i = 0; i < m_vec.size(); ++i)
-        if (m_vec[i].HasType(type))
-          ++test;
-
-      TEST_EQUAL(test, count, ());
-    }
-  };
-}
+    TEST_EQUAL(test, count, ());
+  }
+};
+}  // namespace
 
 UNIT_TEST(FeatureMerger_MultipleTypes)
 {
   classificator::Load();
 
-  P arrPt[] = { P(0, 0), P(1, 1), P(2, 2), P(3, 3) };
-  size_t const count = ARRAY_SIZE(arrPt)-1;
+  P arrPt[] = {P(0, 0), P(1, 1), P(2, 2), P(3, 3)};
+  size_t const count = ARRAY_SIZE(arrPt) - 1;
 
   FeatureBuilder arrF[count];
 
   for (size_t i = 0; i < count; ++i)
   {
     arrF[i].SetLinear();
-    arrF[i].AssignPoints({ arrPt[i], arrPt[i+1] });
+    arrF[i].AssignPoints({arrPt[i], arrPt[i + 1]});
 
     arrF[i].AddType(0);
   }
@@ -96,28 +94,28 @@ UNIT_TEST(FeatureMerger_Branches)
   std::vector<FeatureBuilder> vF;
 
   vF.push_back(FeatureBuilder());
-  vF.back().AssignPoints({ P(-2, 0), P(-1, 0) });
+  vF.back().AssignPoints({P(-2, 0), P(-1, 0)});
 
   vF.push_back(FeatureBuilder());
-  vF.back().AssignPoints({ P(-1, 0), P(0, 1) });
+  vF.back().AssignPoints({P(-1, 0), P(0, 1)});
 
   vF.push_back(FeatureBuilder());
-  vF.back().AssignPoints({ P(-1, 0), P(0, 0) });
+  vF.back().AssignPoints({P(-1, 0), P(0, 0)});
 
   vF.push_back(FeatureBuilder());
-  vF.back().AssignPoints({ P(-1, 0), P(0, -1) });
+  vF.back().AssignPoints({P(-1, 0), P(0, -1)});
 
   vF.push_back(FeatureBuilder());
-  vF.back().AssignPoints({ P(0, 1), P(1, 0) });
+  vF.back().AssignPoints({P(0, 1), P(1, 0)});
 
   vF.push_back(FeatureBuilder());
-  vF.back().AssignPoints({ P(0, 0), P(1, 0) });
+  vF.back().AssignPoints({P(0, 0), P(1, 0)});
 
   vF.push_back(FeatureBuilder());
-  vF.back().AssignPoints({ P(0, -1), P(1, 0) });
+  vF.back().AssignPoints({P(0, -1), P(1, 0)});
 
   vF.push_back(FeatureBuilder());
-  vF.back().AssignPoints({ P(1, 0), P(2, 0) });
+  vF.back().AssignPoints({P(1, 0), P(2, 0)});
 
   FeatureMergeProcessor processor(kPointCoordBits);
 
@@ -142,21 +140,21 @@ UNIT_TEST(FeatureMerger_Rounds)
   std::vector<FeatureBuilder> vF;
 
   vF.push_back(FeatureBuilder());
-  vF.back().AssignPoints({ P(-10, 0), P(-5, 0) });
+  vF.back().AssignPoints({P(-10, 0), P(-5, 0)});
 
   // make first round feature
   vF.push_back(FeatureBuilder());
-  vF.back().AssignPoints({ P(-4, 1), P(-3, 0), P(-4, -1), P(-5, 0), P(-4, 1) });
+  vF.back().AssignPoints({P(-4, 1), P(-3, 0), P(-4, -1), P(-5, 0), P(-4, 1)});
 
   vF.push_back(FeatureBuilder());
-  vF.back().AssignPoints({ P(-3, 0), P(3, 0) });
+  vF.back().AssignPoints({P(-3, 0), P(3, 0)});
 
   // make second round feature
   vF.push_back(FeatureBuilder());
-  vF.back().AssignPoints({ P(4, -1), P(3, 0), P(4, 1), P(5, 0), P(4, -1) });
+  vF.back().AssignPoints({P(4, -1), P(3, 0), P(4, 1), P(5, 0), P(4, -1)});
 
   vF.push_back(FeatureBuilder());
-  vF.back().AssignPoints({ P(5, 0), P(10, 0) });
+  vF.back().AssignPoints({P(5, 0), P(10, 0)});
 
   FeatureMergeProcessor processor(kPointCoordBits);
 
diff --git a/generator/generator_tests/filter_elements_tests.cpp b/generator/generator_tests/filter_elements_tests.cpp
index c2302cf09..0bc280c43 100644
--- a/generator/generator_tests/filter_elements_tests.cpp
+++ b/generator/generator_tests/filter_elements_tests.cpp
@@ -13,14 +13,10 @@ using namespace platform::tests_support;
 namespace
 {
 auto const kOsmElementEmpty = MakeOsmElement(0, {}, OsmElement::EntityType::Node);
-auto const kOsmElementCity = MakeOsmElement(1, {{"place", "city"},
-                                                {"admin_level", "6"}},
-                                            OsmElement::EntityType::Node);
-auto const kOsmElementCountry = MakeOsmElement(2, {{"admin_level", "2"},
-                                                   {"ISO3166-1:alpha2", "RU"},
-                                                   {"ISO3166-1:alpha3", "RUS"},
-                                                   {"ISO3166-1:numeric", "643"}},
-                                               OsmElement::EntityType::Relation);
+auto const kOsmElementCity = MakeOsmElement(1, {{"place", "city"}, {"admin_level", "6"}}, OsmElement::EntityType::Node);
+auto const kOsmElementCountry = MakeOsmElement(
+    2, {{"admin_level", "2"}, {"ISO3166-1:alpha2", "RU"}, {"ISO3166-1:alpha3", "RUS"}, {"ISO3166-1:numeric", "643"}},
+    OsmElement::EntityType::Relation);
 }  // namespace
 
 UNIT_TEST(FilterData_Ids)
@@ -35,9 +31,7 @@ UNIT_TEST(FilterData_Ids)
 UNIT_TEST(FilterData_Tags)
 {
   FilterData fd;
-  FilterData::Tags tags{
-    {"admin_level", "2"}
-  };
+  FilterData::Tags tags{{"admin_level", "2"}};
 
   fd.AddSkippedTags(tags);
   TEST(fd.NeedSkipWithTags(kOsmElementCountry.Tags()), ());
diff --git a/generator/generator_tests/gen_mwm_info_tests.cpp b/generator/generator_tests/gen_mwm_info_tests.cpp
index ce2e11fee..87ce7508d 100644
--- a/generator/generator_tests/gen_mwm_info_tests.cpp
+++ b/generator/generator_tests/gen_mwm_info_tests.cpp
@@ -30,7 +30,8 @@ UNIT_TEST(OsmID2FeatureID_AddIds)
 
   std::vector<std::pair<generator::CompositeId, uint32_t>> const answer{kPId1, kPId2, kPId3};
   size_t index = 0;
-  mapping.ForEach([&](auto const & pair) {
+  mapping.ForEach([&](auto const & pair)
+  {
     TEST_EQUAL(pair, answer[index], ());
     ++index;
   });
@@ -64,9 +65,7 @@ UNIT_TEST(OsmID2FeatureID_GetFeatureId)
     TEST_EQUAL(mapping.GetFeatureIds(kCid1), answer, ());
   }
   {
-    std::vector<uint32_t> const answer{
-        kId2
-    };
+    std::vector<uint32_t> const answer{kId2};
     TEST_EQUAL(mapping.GetFeatureIds(kCid2), answer, ());
   }
   {
@@ -100,7 +99,8 @@ UNIT_TEST(OsmID2FeatureID_ReadWrite)
     mapping.ReadFromFile(sf.GetFullPath());
     std::vector<std::pair<generator::CompositeId, uint32_t>> const answer{kPId1, kPId2, kPId3};
     size_t index = 0;
-    mapping.ForEach([&](auto const & pair) {
+    mapping.ForEach([&](auto const & pair)
+    {
       TEST_EQUAL(pair, answer[index], ());
       ++index;
     });
@@ -123,7 +123,8 @@ UNIT_TEST(OsmID2FeatureID_WorkingWithOldFormat)
     generator::OsmID2FeatureID mapping;
     mapping.ReadFromFile(sf.GetFullPath());
     size_t index = 0;
-    mapping.ForEach([&](auto const & pair) {
+    mapping.ForEach([&](auto const & pair)
+    {
       TEST_EQUAL(pair.first.m_mainId, answer[index].first, ());
       TEST_EQUAL(pair.second, answer[index].second, ());
       ++index;
diff --git a/generator/generator_tests/hierarchy_entry_tests.cpp b/generator/generator_tests/hierarchy_entry_tests.cpp
index bc69bdab6..91d6013d4 100644
--- a/generator/generator_tests/hierarchy_entry_tests.cpp
+++ b/generator/generator_tests/hierarchy_entry_tests.cpp
@@ -121,29 +121,24 @@ UNIT_CLASS_TEST(TestWithClassificator, Complex_LoadHierachy)
   LOG(LINFO, (tree));
 
   TEST_EQUAL(tree_node::Size(tree), 7, ());
-  auto node = tree_node::FindIf(tree, [](auto const & e) {
-    return e.m_id == MakeId(13835058055284963881ull, 9223372037111861697ull);
-  });
+  auto node = tree_node::FindIf(
+      tree, [](auto const & e) { return e.m_id == MakeId(13835058055284963881ull, 9223372037111861697ull); });
   TEST(node, ());
   TEST(!node->HasParent(), ());
   TEST_EQUAL(node->GetChildren().size(), 4, ());
 
-  node = tree_node::FindIf(tree, [](auto const & e) {
-    return e.m_id == MakeId(9223372036879747192ull, 9223372036879747192ull);
-  });
+  node = tree_node::FindIf(
+      tree, [](auto const & e) { return e.m_id == MakeId(9223372036879747192ull, 9223372036879747192ull); });
   TEST(node, ());
   TEST(node->HasParent(), ());
-  TEST_EQUAL(node->GetParent()->GetData().m_id,
-             MakeId(13835058055284963881ull, 9223372037111861697ull), ());
+  TEST_EQUAL(node->GetParent()->GetData().m_id, MakeId(13835058055284963881ull, 9223372037111861697ull), ());
   TEST_EQUAL(node->GetChildren().size(), 2, ());
 
-  node = tree_node::FindIf(tree, [](auto const & e) {
-    return e.m_id == MakeId(9223372036938640141ull, 9223372036938640141ull);
-  });
+  node = tree_node::FindIf(
+      tree, [](auto const & e) { return e.m_id == MakeId(9223372036938640141ull, 9223372036938640141ull); });
   TEST(node, ());
   TEST_EQUAL(node->GetData().m_depth, tree_node::GetDepth(node), ());
-  TEST_EQUAL(node->GetParent()->GetData().m_id,
-             MakeId(9223372036879747192ull, 9223372036879747192ull), ());
+  TEST_EQUAL(node->GetParent()->GetData().m_id, MakeId(9223372036879747192ull, 9223372036879747192ull), ());
   TEST_EQUAL(node->GetChildren().size(), 0, ());
 }
 }  // namespace hierarchy_entry_tests
diff --git a/generator/generator_tests/hierarchy_tests.cpp b/generator/generator_tests/hierarchy_tests.cpp
index 932e29cdb..231aa8f93 100644
--- a/generator/generator_tests/hierarchy_tests.cpp
+++ b/generator/generator_tests/hierarchy_tests.cpp
@@ -56,20 +56,17 @@ std::vector<feature::FeatureBuilder> MakeTestSet1()
   return fbs;
 }
 
-void TestDepthNodeById(generator::hierarchy::HierarchyLinker::Node::Ptr const & tree, uint64_t id,
-                       size_t depth)
+void TestDepthNodeById(generator::hierarchy::HierarchyLinker::Node::Ptr const & tree, uint64_t id, size_t depth)
 {
   auto osmId = base::MakeOsmWay(id);
-  TEST_EQUAL(tree_node::GetDepth(tree_node::FindIf(
-                 tree, [&](auto const & data) { return data.GetCompositeId().m_mainId == osmId; })),
+  TEST_EQUAL(tree_node::GetDepth(
+                 tree_node::FindIf(tree, [&](auto const & data) { return data.GetCompositeId().m_mainId == osmId; })),
              depth, ());
 }
 
 UNIT_CLASS_TEST(TestWithClassificator, ComplexHierarchy_FlattenBuildingParts)
 {
-
-  auto trees = generator::hierarchy::BuildHierarchy(MakeTestSet1(),
-                                                    generator::hierarchy::GetMainType,
+  auto trees = generator::hierarchy::BuildHierarchy(MakeTestSet1(), generator::hierarchy::GetMainType,
                                                     std::make_shared<generator::FilterComplex>());
   TEST_EQUAL(trees.size(), 1, ());
   TEST_EQUAL(tree_node::Size(trees[0]), 4, ());
@@ -90,14 +87,14 @@ UNIT_CLASS_TEST(TestWithClassificator, ComplexHierarchy_FlattenBuildingParts)
 
 UNIT_CLASS_TEST(TestWithClassificator, ComplexHierarchy_AddChildrenTo)
 {
-  auto trees = generator::hierarchy::BuildHierarchy(MakeTestSet1(),
-                                                    generator::hierarchy::GetMainType,
+  auto trees = generator::hierarchy::BuildHierarchy(MakeTestSet1(), generator::hierarchy::GetMainType,
                                                     std::make_shared<generator::FilterComplex>());
   TEST_EQUAL(trees.size(), 1, ());
   TEST_EQUAL(tree_node::Size(trees[0]), 4, ());
 
   auto osmId = base::MakeOsmWay(3);
-  generator::hierarchy::AddChildrenTo(trees, [&](auto const & compositeId) {
+  generator::hierarchy::AddChildrenTo(trees, [&](auto const & compositeId)
+  {
     std::vector<generator::hierarchy::HierarchyPlace> fbs;
     if (compositeId.m_mainId == osmId)
     {
@@ -111,23 +108,20 @@ UNIT_CLASS_TEST(TestWithClassificator, ComplexHierarchy_AddChildrenTo)
     return fbs;
   });
 
-  auto node = tree_node::FindIf(
-      trees[0], [&](auto const & data) { return data.GetCompositeId().m_mainId == osmId; });
+  auto node = tree_node::FindIf(trees[0], [&](auto const & data) { return data.GetCompositeId().m_mainId == osmId; });
 
   TEST(node, ());
 
   auto const children = node->GetChildren();
   TEST_EQUAL(children.size(), 2, ());
 
-  auto it = base::FindIf(children, [](auto const & node) {
-    return node->GetData().GetCompositeId().m_mainId == base::MakeOsmWay(4);
-  });
+  auto it = base::FindIf(
+      children, [](auto const & node) { return node->GetData().GetCompositeId().m_mainId == base::MakeOsmWay(4); });
   CHECK(it != std::end(children), ());
   CHECK((*it)->HasParent() && (*it)->GetParent()->GetData().GetCompositeId().m_mainId == osmId, ());
 
-  it = base::FindIf(children, [](auto const & node) {
-    return node->GetData().GetCompositeId().m_mainId == base::MakeOsmWay(5);
-  });
+  it = base::FindIf(children,
+                    [](auto const & node) { return node->GetData().GetCompositeId().m_mainId == base::MakeOsmWay(5); });
   CHECK(it != std::end(children), ());
   CHECK((*it)->HasParent() && (*it)->GetParent()->GetData().GetCompositeId().m_mainId == osmId, ());
 }
diff --git a/generator/generator_tests/intermediate_data_test.cpp b/generator/generator_tests/intermediate_data_test.cpp
index 14352a710..09bf44f20 100644
--- a/generator/generator_tests/intermediate_data_test.cpp
+++ b/generator/generator_tests/intermediate_data_test.cpp
@@ -63,10 +63,7 @@ UNIT_TEST(Intermediate_Data_way_element_save_load_test)
 
 UNIT_TEST(Intermediate_Data_relation_element_save_load_test)
 {
-  std::vector<RelationElement::Member> testData = {{1, "inner"},
-                                                   {2, "outer"},
-                                                   {3, "unknown"},
-                                                   {4, "inner role"}};
+  std::vector<RelationElement::Member> testData = {{1, "inner"}, {2, "outer"}, {3, "unknown"}, {4, "inner role"}};
 
   RelationElement e1;
 
diff --git a/generator/generator_tests/maxspeeds_tests.cpp b/generator/generator_tests/maxspeeds_tests.cpp
index a989612e0..8bf6377a1 100644
--- a/generator/generator_tests/maxspeeds_tests.cpp
+++ b/generator/generator_tests/maxspeeds_tests.cpp
@@ -11,8 +11,8 @@
 #include "generator/restriction_generator.hpp"
 #include "generator/routing_helpers.hpp"
 
-#include "routing/maxspeeds_serialization.hpp"
 #include "routing/maxspeeds.hpp"
+#include "routing/maxspeeds_serialization.hpp"
 #include "routing/routing_helpers.hpp"
 
 #include "routing_common/maxspeed_conversion.hpp"
@@ -94,8 +94,7 @@ void TestMaxspeedsSection(Features const & roads, string const & maxspeedsCsvCon
   TEST(routingGraph, ());
 
   // Creating maxspeed section in test.mwm.
-  BuildMaxspeedsSection(routingGraph.get(), testMwmFullPath, featureIdToOsmId,
-                        base::JoinPath(testDirFullPath, kCsv));
+  BuildMaxspeedsSection(routingGraph.get(), testMwmFullPath, featureIdToOsmId, base::JoinPath(testDirFullPath, kCsv));
 
   // Loading maxspeed section.
   FrozenDataSource dataSource;
@@ -111,7 +110,8 @@ void TestMaxspeedsSection(Features const & roads, string const & maxspeedsCsvCon
   // Testing maxspeed section content.
   OsmIdToMaxspeed osmIdToMaxspeed;
   TEST(ParseMaxspeeds(base::JoinPath(testDirFullPath, kCsv), osmIdToMaxspeed), ());
-  auto processor = [&](FeatureType & f, uint32_t const & id) {
+  auto processor = [&](FeatureType & f, uint32_t const & id)
+  {
     TEST(IsRoad(feature::TypesHolder(f)), ());
 
     // Looking for maxspeed from csv.
@@ -120,7 +120,7 @@ void TestMaxspeedsSection(Features const & roads, string const & maxspeedsCsvCon
 
     auto const itMaxspeedCsv = osmIdToMaxspeed.find(itOsmId->second);
     if (itMaxspeedCsv == osmIdToMaxspeed.cend())
-      return; // No maxspeed for feature |id|.
+      return;  // No maxspeed for feature |id|.
 
     Maxspeed const maxspeedCsv = itMaxspeedCsv->second;
     Maxspeed const maxspeedMwm = maxspeeds->GetMaxspeed(id);
@@ -201,9 +201,8 @@ UNIT_TEST(Maxspeed_Parse1)
 {
   string const maxspeedsCsvContent = R"(10,Metric,60
                                         11,Metric,90)";
-  OsmIdToMaxspeed const expectedMapping = {
-      {base::MakeOsmWay(10), {Units::Metric, 60, kInvalidSpeed}},
-      {base::MakeOsmWay(11), {Units::Metric, 90, kInvalidSpeed}}};
+  OsmIdToMaxspeed const expectedMapping = {{base::MakeOsmWay(10), {Units::Metric, 60, kInvalidSpeed}},
+                                           {base::MakeOsmWay(11), {Units::Metric, 90, kInvalidSpeed}}};
   OsmIdToMaxspeed osmIdToMaxspeed;
   TEST(ParseCsv(maxspeedsCsvContent, osmIdToMaxspeed), ());
   TEST_EQUAL(osmIdToMaxspeed, expectedMapping, ());
@@ -213,9 +212,8 @@ UNIT_TEST(Maxspeed_Parse2)
 {
   string const maxspeedsCsvContent = R"(10,Metric,60,80
                                         11,Metric,120)";
-  OsmIdToMaxspeed const expectedMapping = {
-      {base::MakeOsmWay(10), {Units::Metric, 60, 80}},
-      {base::MakeOsmWay(11), {Units::Metric, 120, kInvalidSpeed}}};
+  OsmIdToMaxspeed const expectedMapping = {{base::MakeOsmWay(10), {Units::Metric, 60, 80}},
+                                           {base::MakeOsmWay(11), {Units::Metric, 120, kInvalidSpeed}}};
   OsmIdToMaxspeed osmIdToMaxspeed;
   TEST(ParseCsv(maxspeedsCsvContent, osmIdToMaxspeed), ());
   TEST_EQUAL(osmIdToMaxspeed, expectedMapping, ());
@@ -226,9 +224,8 @@ UNIT_TEST(Maxspeed_Parse3)
   string const maxspeedsCsvContent = R"(184467440737095516,Imperial,60,80
                                         184467440737095517,Metric,120)";
 
-  OsmIdToMaxspeed const expectedMapping = {
-      {base::MakeOsmWay(184467440737095516), {Units::Imperial, 60, 80}},
-      {base::MakeOsmWay(184467440737095517), {Units::Metric, 120, kInvalidSpeed}}};
+  OsmIdToMaxspeed const expectedMapping = {{base::MakeOsmWay(184467440737095516), {Units::Imperial, 60, 80}},
+                                           {base::MakeOsmWay(184467440737095517), {Units::Metric, 120, kInvalidSpeed}}};
   OsmIdToMaxspeed osmIdToMaxspeed;
   TEST(ParseCsv(maxspeedsCsvContent, osmIdToMaxspeed), ());
   TEST_EQUAL(osmIdToMaxspeed, expectedMapping, ());
@@ -239,9 +236,8 @@ UNIT_TEST(Maxspeed_Parse4)
   // Note. kNoneMaxSpeed == 65534 and kWalkMaxSpeed == 65533.
   string const maxspeedsCsvContent = R"(1,Metric,200,65534
                                         2,Metric,65533)";
-  OsmIdToMaxspeed const expectedMapping = {
-      {base::MakeOsmWay(1), {Units::Metric, 200, kNoneMaxSpeed}},
-      {base::MakeOsmWay(2), {Units::Metric, kWalkMaxSpeed, kInvalidSpeed}}};
+  OsmIdToMaxspeed const expectedMapping = {{base::MakeOsmWay(1), {Units::Metric, 200, kNoneMaxSpeed}},
+                                           {base::MakeOsmWay(2), {Units::Metric, kWalkMaxSpeed, kInvalidSpeed}}};
   OsmIdToMaxspeed osmIdToMaxspeed;
   TEST(ParseCsv(maxspeedsCsvContent, osmIdToMaxspeed), ());
   TEST_EQUAL(osmIdToMaxspeed, expectedMapping, ());
@@ -250,8 +246,7 @@ UNIT_TEST(Maxspeed_Parse4)
 UNIT_TEST(Maxspeed_Parse5)
 {
   string const maxspeedsCsvContent = R"(2,Metric,10)";
-  OsmIdToMaxspeed const expectedMapping = {
-      {base::MakeOsmWay(2), {Units::Metric, 10, kInvalidSpeed}}};
+  OsmIdToMaxspeed const expectedMapping = {{base::MakeOsmWay(2), {Units::Metric, 10, kInvalidSpeed}}};
 
   OsmIdToMaxspeed osmIdToMaxspeed;
   TEST(ParseCsv(maxspeedsCsvContent, osmIdToMaxspeed), ());
@@ -286,11 +281,10 @@ UNIT_TEST(Maxspeed_ParseBig)
                                         101,Metric,60,90
                                         102,Metric,60
                                         103,Metric,90)";
-  OsmIdToMaxspeed const expectedMapping = {
-      {base::MakeOsmWay(100), {Units::Metric, 200, kNoneMaxSpeed}},
-      {base::MakeOsmWay(101), {Units::Metric, 60, 90}},
-      {base::MakeOsmWay(102), {Units::Metric, 60, kInvalidSpeed}},
-      {base::MakeOsmWay(103), {Units::Metric, 90, kInvalidSpeed}}};
+  OsmIdToMaxspeed const expectedMapping = {{base::MakeOsmWay(100), {Units::Metric, 200, kNoneMaxSpeed}},
+                                           {base::MakeOsmWay(101), {Units::Metric, 60, 90}},
+                                           {base::MakeOsmWay(102), {Units::Metric, 60, kInvalidSpeed}},
+                                           {base::MakeOsmWay(103), {Units::Metric, 90, kInvalidSpeed}}};
   OsmIdToMaxspeed osmIdToMaxspeed;
   TEST(ParseCsv(maxspeedsCsvContent, osmIdToMaxspeed), ());
   TEST_EQUAL(osmIdToMaxspeed, expectedMapping, ());
@@ -310,9 +304,8 @@ UNIT_TEST(Maxspeed_Section1)
                           {{1.0, 0.0}, {1.0, 1.0}, {1.0, 2.0}} /* Points of feature 1 */};
   string const maxspeedsCsvContent = R"(25258932,Metric,60
                                         25258943,Metric,90)";
-  FeatureIdToOsmId const featureIdToOsmId = {
-      {0 /* feature id */, base::MakeOsmWay(25258932)},
-      {1 /* feature id */, base::MakeOsmWay(25258943)}};
+  FeatureIdToOsmId const featureIdToOsmId = {{0 /* feature id */, base::MakeOsmWay(25258932)},
+                                             {1 /* feature id */, base::MakeOsmWay(25258943)}};
   TestMaxspeedsSection(roads, maxspeedsCsvContent, featureIdToOsmId);
 }
 
@@ -323,10 +316,9 @@ UNIT_TEST(Maxspeed_Section2)
                           {{1.0, 2.0}, {1.0, 3.0}} /* Points of feature 2 */};
   string const maxspeedsCsvContent = R"(25258932,Metric,60,40
                                         32424,Metric,120)";
-  FeatureIdToOsmId const featureIdToOsmId = {
-      {0 /* feature id */, base::MakeOsmWay(25258932)},
-      {1 /* feature id */, base::MakeOsmWay(25258943)},
-      {2 /* feature id */, base::MakeOsmWay(32424)}};
+  FeatureIdToOsmId const featureIdToOsmId = {{0 /* feature id */, base::MakeOsmWay(25258932)},
+                                             {1 /* feature id */, base::MakeOsmWay(25258943)},
+                                             {2 /* feature id */, base::MakeOsmWay(32424)}};
   TestMaxspeedsSection(roads, maxspeedsCsvContent, featureIdToOsmId);
 }
 
@@ -339,10 +331,9 @@ UNIT_TEST(Maxspeed_Section3)
   string const maxspeedsCsvContent = R"(25252,Metric,120,65534
                                         258943,Metric,65533
                                         32424,Metric,10,65533)";
-  FeatureIdToOsmId const featureIdToOsmId = {
-      {0 /* feature id */, base::MakeOsmWay(25252)},
-      {1 /* feature id */, base::MakeOsmWay(258943)},
-      {2 /* feature id */, base::MakeOsmWay(32424)}};
+  FeatureIdToOsmId const featureIdToOsmId = {{0 /* feature id */, base::MakeOsmWay(25252)},
+                                             {1 /* feature id */, base::MakeOsmWay(258943)},
+                                             {2 /* feature id */, base::MakeOsmWay(32424)}};
   TestMaxspeedsSection(roads, maxspeedsCsvContent, featureIdToOsmId);
 }
 
@@ -352,9 +343,8 @@ UNIT_TEST(Maxspeed_Section4)
                           {{1.0, 0.0}, {0.0, 0.0}} /* Points of feature 1 */};
   string const maxspeedsCsvContent = R"(50000000000,Imperial,30
                                         50000000001,Imperial,50)";
-  FeatureIdToOsmId const featureIdToOsmId = {
-      {0 /* feature id */, base::MakeOsmWay(50000000000)},
-      {1 /* feature id */, base::MakeOsmWay(50000000001)}};
+  FeatureIdToOsmId const featureIdToOsmId = {{0 /* feature id */, base::MakeOsmWay(50000000000)},
+                                             {1 /* feature id */, base::MakeOsmWay(50000000001)}};
   TestMaxspeedsSection(roads, maxspeedsCsvContent, featureIdToOsmId);
 }
 
@@ -373,7 +363,7 @@ UNIT_TEST(Maxspeed_SectionBig)
                                         300,Imperial,30
                                         400,Imperial,10,20
                                         600,)"
-      "Imperial,50,20\n700,Imperial,10\n";
+                                     "Imperial,50,20\n700,Imperial,10\n";
   FeatureIdToOsmId const featureIdToOsmId = {
       {0 /* feature id */, base::MakeOsmWay(100)}, {1 /* feature id */, base::MakeOsmWay(200)},
       {2 /* feature id */, base::MakeOsmWay(300)}, {3 /* feature id */, base::MakeOsmWay(400)},
@@ -417,17 +407,22 @@ UNIT_TEST(Maxspeed_CollectorSmoke)
   feature::FeatureBuilder builder;
 
   auto c1 = std::make_shared<MaxspeedsCollector>(filename);
-  c1->CollectFeature(builder, MakeOsmElement(1 /* id */, {{"maxspeed:forward", "50"}} /* tags */, OsmElement::EntityType::Way));
-  c1->CollectFeature(builder, MakeOsmElement(2 /* id */, {{"maxspeed:backward", "50"}} /* tags */, OsmElement::EntityType::Way));
+  c1->CollectFeature(builder,
+                     MakeOsmElement(1 /* id */, {{"maxspeed:forward", "50"}} /* tags */, OsmElement::EntityType::Way));
+  c1->CollectFeature(builder,
+                     MakeOsmElement(2 /* id */, {{"maxspeed:backward", "50"}} /* tags */, OsmElement::EntityType::Way));
 
   builder.SetType(classif().GetTypeByPath({"highway", "motorway_link"}));
-  c1->CollectFeature(builder, MakeOsmElement(3 /* id */, {{"maxspeed:advisory", "70"}} /* tags */, OsmElement::EntityType::Way));
+  c1->CollectFeature(builder,
+                     MakeOsmElement(3 /* id */, {{"maxspeed:advisory", "70"}} /* tags */, OsmElement::EntityType::Way));
 
   builder.SetType(classif().GetTypeByPath({"highway", "trunk"}));
-  c1->CollectFeature(builder, MakeOsmElement(4 /* id */, {{"maxspeed:advisory", "70"}} /* tags */, OsmElement::EntityType::Way));
+  c1->CollectFeature(builder,
+                     MakeOsmElement(4 /* id */, {{"maxspeed:advisory", "70"}} /* tags */, OsmElement::EntityType::Way));
 
   builder.SetType(classif().GetTypeByPath({"highway", "trunk_link"}));
-  c1->CollectFeature(builder, MakeOsmElement(5 /* id */, {{"maxspeed:advisory", "10"}, {"maxspeed", "20"}} /* tags */, OsmElement::EntityType::Way));
+  c1->CollectFeature(builder, MakeOsmElement(5 /* id */, {{"maxspeed:advisory", "10"}, {"maxspeed", "20"}} /* tags */,
+                                             OsmElement::EntityType::Way));
 
   c1->Finish();
   c1->Finalize();
@@ -444,4 +439,4 @@ UNIT_TEST(Maxspeed_CollectorSmoke)
 
   TEST_EQUAL(osmIdToMaxspeed[base::MakeOsmWay(5)].GetForward(), static_cast<MaxspeedType>(20), ());
 }
-} // namespace maxspeeds_tests
+}  // namespace maxspeeds_tests
diff --git a/generator/generator_tests/merge_collectors_tests.cpp b/generator/generator_tests/merge_collectors_tests.cpp
index 1926a50bb..75beb4dea 100644
--- a/generator/generator_tests/merge_collectors_tests.cpp
+++ b/generator/generator_tests/merge_collectors_tests.cpp
@@ -22,7 +22,7 @@ using namespace generator_tests;
 namespace
 {
 auto const kEmptyValidator = [](auto const &) { return true; };
-}
+}  // namespace
 
 UNIT_TEST(MergeCollector_MergeCase1)
 {
@@ -44,10 +44,10 @@ UNIT_TEST(MergeCollector_MergeCase1)
   collector1->Finalize();
 
   std::vector<std::string> const answers = {
-    std::to_string(GeoObjectId(GeoObjectId::Type::ObsoleteOsmRelation, 1 /* id */).GetEncodedId()) + "\t1",
-    std::to_string(GeoObjectId(GeoObjectId::Type::ObsoleteOsmRelation, 2 /* id */).GetEncodedId()) + "\t2",
-    std::to_string(GeoObjectId(GeoObjectId::Type::ObsoleteOsmRelation, 3 /* id */).GetEncodedId()) + "\t3",
-    std::to_string(GeoObjectId(GeoObjectId::Type::ObsoleteOsmRelation, 4 /* id */).GetEncodedId()) + "\t4",
+      std::to_string(GeoObjectId(GeoObjectId::Type::ObsoleteOsmRelation, 1 /* id */).GetEncodedId()) + "\t1",
+      std::to_string(GeoObjectId(GeoObjectId::Type::ObsoleteOsmRelation, 2 /* id */).GetEncodedId()) + "\t2",
+      std::to_string(GeoObjectId(GeoObjectId::Type::ObsoleteOsmRelation, 3 /* id */).GetEncodedId()) + "\t3",
+      std::to_string(GeoObjectId(GeoObjectId::Type::ObsoleteOsmRelation, 4 /* id */).GetEncodedId()) + "\t4",
   };
 
   std::ifstream stream;
@@ -80,10 +80,10 @@ UNIT_TEST(MergeCollector_MergeCase2)
   collection1->Finalize();
 
   std::vector<std::string> const answers = {
-    std::to_string(GeoObjectId(GeoObjectId::Type::ObsoleteOsmRelation, 1 /* id */).GetEncodedId()) + "\t1",
-    std::to_string(GeoObjectId(GeoObjectId::Type::ObsoleteOsmRelation, 2 /* id */).GetEncodedId()) + "\t2",
-    std::to_string(GeoObjectId(GeoObjectId::Type::ObsoleteOsmRelation, 3 /* id */).GetEncodedId()) + "\t3",
-    std::to_string(GeoObjectId(GeoObjectId::Type::ObsoleteOsmRelation, 4 /* id */).GetEncodedId()) + "\t4",
+      std::to_string(GeoObjectId(GeoObjectId::Type::ObsoleteOsmRelation, 1 /* id */).GetEncodedId()) + "\t1",
+      std::to_string(GeoObjectId(GeoObjectId::Type::ObsoleteOsmRelation, 2 /* id */).GetEncodedId()) + "\t2",
+      std::to_string(GeoObjectId(GeoObjectId::Type::ObsoleteOsmRelation, 3 /* id */).GetEncodedId()) + "\t3",
+      std::to_string(GeoObjectId(GeoObjectId::Type::ObsoleteOsmRelation, 4 /* id */).GetEncodedId()) + "\t4",
   };
 
   std::ifstream stream;
diff --git a/generator/generator_tests/metadata_parser_test.cpp b/generator/generator_tests/metadata_parser_test.cpp
index bd535a729..977f16770 100644
--- a/generator/generator_tests/metadata_parser_test.cpp
+++ b/generator/generator_tests/metadata_parser_test.cpp
@@ -70,7 +70,6 @@ UNIT_TEST(Metadata_ValidateAndFormat_stars)
   p("stars", "5s");
   TEST_EQUAL(md.Get(Metadata::FMD_STARS), "5", ());
   md.Drop(Metadata::FMD_STARS);
-
 }
 
 UNIT_CLASS_TEST(TestWithClassificator, Metadata_ValidateAndFormat_operator)
@@ -142,9 +141,9 @@ UNIT_TEST(Metadata_ValidateAndFormat_wikipedia)
   Metadata & md = params.GetMetadata();
 
 #ifdef OMIM_OS_MOBILE
-  #define WIKIHOST "m.wikipedia.org"
+#define WIKIHOST "m.wikipedia.org"
 #else
-  #define WIKIHOST "wikipedia.org"
+#define WIKIHOST "wikipedia.org"
 #endif
 
   struct Test
@@ -154,11 +153,13 @@ UNIT_TEST(Metadata_ValidateAndFormat_wikipedia)
     char const * url;
   };
   constexpr Test tests[] = {
-    {"en:Bad %20Data", "en:Bad %20Data", "https://en." WIKIHOST "/wiki/Bad_%2520Data"},
-    {"ru:Это тест_со знаками %, ? (и скобками)", "ru:Это тест со знаками %, ? (и скобками)", "https://ru." WIKIHOST "/wiki/Это_тест_со_знаками_%25,_%3F_(и_скобками)"},
-    {"https://be-tarask.wikipedia.org/wiki/Вялікае_Княства_Літоўскае", "be-tarask:Вялікае Княства Літоўскае", "https://be-tarask." WIKIHOST "/wiki/Вялікае_Княства_Літоўскае"},
-    // Final link points to https and mobile version.
-    {"http://en.wikipedia.org/wiki/A#id", "en:A#id", "https://en." WIKIHOST "/wiki/A#id"},
+      {"en:Bad %20Data", "en:Bad %20Data", "https://en." WIKIHOST "/wiki/Bad_%2520Data"},
+      {"ru:Это тест_со знаками %, ? (и скобками)", "ru:Это тест со знаками %, ? (и скобками)",
+       "https://ru." WIKIHOST "/wiki/Это_тест_со_знаками_%25,_%3F_(и_скобками)"},
+      {"https://be-tarask.wikipedia.org/wiki/Вялікае_Княства_Літоўскае", "be-tarask:Вялікае Княства Літоўскае",
+       "https://be-tarask." WIKIHOST "/wiki/Вялікае_Княства_Літоўскае"},
+      // Final link points to https and mobile version.
+      {"http://en.wikipedia.org/wiki/A#id", "en:A#id", "https://en." WIKIHOST "/wiki/A#id"},
   };
 
   for (auto [source, validated, url] : tests)
@@ -227,7 +228,8 @@ UNIT_CLASS_TEST(TestWithClassificator, Metadata_ValidateAndFormat_duration)
   MetadataTagProcessor p(params);
   Metadata & md = params.GetMetadata();
 
-  auto const test = [&](std::string const & osm, std::string const & expected) {
+  auto const test = [&](std::string const & osm, std::string const & expected)
+  {
     p("duration", osm);
 
     if (expected.empty())
@@ -288,7 +290,6 @@ UNIT_CLASS_TEST(TestWithClassificator, Metadata_ValidateAndFormat_duration)
   test("PT50:20", "");
 }
 
-
 UNIT_CLASS_TEST(TestWithClassificator, ValidateAndFormat_facebook)
 {
   FeatureBuilderParams params;
@@ -645,21 +646,20 @@ UNIT_TEST(Metadata_ValidateAndFormat_building_levels)
 
 UNIT_TEST(Metadata_ValidateAndFormat_url)
 {
-  std::array<std::pair<char const*, char const*>, 9> constexpr kTests =
-  {{
-    {"a.by", "a.by"},
-    {"http://test.com", "http://test.com"},
-    {"https://test.com", "https://test.com"},
-    {"test.com", "test.com"},
-    {"http://test.com/", "http://test.com"},
-    {"https://test.com/", "https://test.com"},
-    {"test.com/", "test.com"},
-    {"test.com/path", "test.com/path"},
-    {"test.com/path/", "test.com/path/"},
+  std::array<std::pair<char const *, char const *>, 9> constexpr kTests = {{
+      {"a.by", "a.by"},
+      {"http://test.com", "http://test.com"},
+      {"https://test.com", "https://test.com"},
+      {"test.com", "test.com"},
+      {"http://test.com/", "http://test.com"},
+      {"https://test.com/", "https://test.com"},
+      {"test.com/", "test.com"},
+      {"test.com/path", "test.com/path"},
+      {"test.com/path/", "test.com/path/"},
   }};
 
   FeatureBuilderParams params;
   MetadataTagProcessorImpl tp(params);
-  for (auto const& [input, output] : kTests)
+  for (auto const & [input, output] : kTests)
     TEST_EQUAL(tp.ValidateAndFormat_url(input), output, ());
 }
diff --git a/generator/generator_tests/metalines_tests.cpp b/generator/generator_tests/metalines_tests.cpp
index fdfc545ae..c3633f17e 100644
--- a/generator/generator_tests/metalines_tests.cpp
+++ b/generator/generator_tests/metalines_tests.cpp
@@ -61,7 +61,7 @@ LineStringMerger::InputData MakeInputData(std::vector<OsmElement> const & elemen
     inputData.emplace(MakeKey(element), std::make_shared<LineString>(element));
 
   return inputData;
-};
+}
 
 bool IsEqual(LineStringMerger::LinePtr const & lineString, std::vector<int32_t> const & ways)
 {
@@ -69,20 +69,19 @@ bool IsEqual(LineStringMerger::LinePtr const & lineString, std::vector<int32_t>
   return w == ways;
 }
 
-auto const w1 = MakeHighway(1/* id */, "w" /* name */, {1, 2, 3} /* nodes */);
-auto const w2 = MakeHighway(2/* id */, "w" /* name */, {3, 4, 5} /* nodes */);
-auto const w3 = MakeHighway(3/* id */, "w" /* name */, {5, 6, 7} /* nodes */);
+auto const w1 = MakeHighway(1 /* id */, "w" /* name */, {1, 2, 3} /* nodes */);
+auto const w2 = MakeHighway(2 /* id */, "w" /* name */, {3, 4, 5} /* nodes */);
+auto const w3 = MakeHighway(3 /* id */, "w" /* name */, {5, 6, 7} /* nodes */);
 
-auto const w4 = MakeHighway(4/* id */, "w" /* name */, {7, 8, 9} /* nodes */);
-auto const w5 = MakeHighway(5/* id */, "w" /* name */, {9, 10, 11} /* nodes */);
+auto const w4 = MakeHighway(4 /* id */, "w" /* name */, {7, 8, 9} /* nodes */);
+auto const w5 = MakeHighway(5 /* id */, "w" /* name */, {9, 10, 11} /* nodes */);
 
-auto const wo6 = MakeHighway(6/* id */, "w" /* name */, {13, 12, 3} /* nodes */, true /* isOneway */);
-auto const wo7 = MakeHighway(7/* id */, "w" /* name */, {15, 14, 13} /* nodes */, true /* isOneway */);
-auto const wo8 = MakeHighway(8/* id */, "w" /* name */, {17, 16, 15} /* nodes */, true /* isOneway */);
-
-auto const b1 = MakeHighway(1/* id */, "b" /* name */, {1, 2, 3} /* nodes */);
-auto const b2 = MakeHighway(2/* id */, "b" /* name */, {3, 4, 5} /* nodes */);
+auto const wo6 = MakeHighway(6 /* id */, "w" /* name */, {13, 12, 3} /* nodes */, true /* isOneway */);
+auto const wo7 = MakeHighway(7 /* id */, "w" /* name */, {15, 14, 13} /* nodes */, true /* isOneway */);
+auto const wo8 = MakeHighway(8 /* id */, "w" /* name */, {17, 16, 15} /* nodes */, true /* isOneway */);
 
+auto const b1 = MakeHighway(1 /* id */, "b" /* name */, {1, 2, 3} /* nodes */);
+auto const b2 = MakeHighway(2 /* id */, "b" /* name */, {3, 4, 5} /* nodes */);
 
 UNIT_TEST(MetalinesTest_Case0)
 {
@@ -118,7 +117,12 @@ UNIT_TEST(MetalinesTest_Case2)
 
 UNIT_TEST(MetalinesTest_Case3)
 {
-  auto const inputData = MakeInputData({w1, w4, w2, w5,});
+  auto const inputData = MakeInputData({
+      w1,
+      w4,
+      w2,
+      w5,
+  });
   auto const outputData = LineStringMerger::Merge(inputData);
 
   auto const key = MakeKey(w1);
@@ -134,7 +138,10 @@ UNIT_TEST(MetalinesTest_Case3)
 
 UNIT_TEST(MetalinesTest_Case4)
 {
-  auto const inputData = MakeInputData({w1, wo6,});
+  auto const inputData = MakeInputData({
+      w1,
+      wo6,
+  });
   auto const outputData = LineStringMerger::Merge(inputData);
 
   auto const key = MakeKey(w1);
@@ -145,7 +152,11 @@ UNIT_TEST(MetalinesTest_Case4)
 
 UNIT_TEST(MetalinesTest_Case5)
 {
-  auto const inputData = MakeInputData({w1, w2, wo6,});
+  auto const inputData = MakeInputData({
+      w1,
+      w2,
+      wo6,
+  });
   auto const outputData = LineStringMerger::Merge(inputData);
 
   auto const key = MakeKey(w1);
@@ -156,7 +167,12 @@ UNIT_TEST(MetalinesTest_Case5)
 
 UNIT_TEST(MetalinesTest_Case6)
 {
-  auto const inputData = MakeInputData({w1, b1, w2, b2,});
+  auto const inputData = MakeInputData({
+      w1,
+      b1,
+      w2,
+      b2,
+  });
   auto const outputData = LineStringMerger::Merge(inputData);
 
   auto const keyW = MakeKey(w1);
diff --git a/generator/generator_tests/mini_roundabout_tests.cpp b/generator/generator_tests/mini_roundabout_tests.cpp
index 65d696d29..c94aba217 100644
--- a/generator/generator_tests/mini_roundabout_tests.cpp
+++ b/generator/generator_tests/mini_roundabout_tests.cpp
@@ -49,8 +49,7 @@ OsmElement RoadNode(uint64_t id, double lat, double lon)
   return node;
 }
 
-void TestRunCmpPoints(std::vector<m2::PointD> const & pointsFact,
-                      std::vector<m2::PointD> const & pointsPlan, double r)
+void TestRunCmpPoints(std::vector<m2::PointD> const & pointsFact, std::vector<m2::PointD> const & pointsPlan, double r)
 {
   TEST_EQUAL(pointsFact.size(), pointsPlan.size(), ());
   TEST_GREATER(pointsFact.size(), 2, ());
@@ -74,8 +73,7 @@ UNIT_TEST(PointToPolygon_GeneralProperties)
   {
     for (size_t verticesCount = 3; verticesCount < 30; ++verticesCount)
     {
-      std::vector<m2::PointD> const circlePlain =
-          PointToPolygon(center, r, verticesCount, angleDeg);
+      std::vector<m2::PointD> const circlePlain = PointToPolygon(center, r, verticesCount, angleDeg);
       double const vertexLenght = DistanceOnPlain(circlePlain.front(), circlePlain.back());
 
       for (size_t i = 0; i < circlePlain.size() - 1; ++i)
@@ -126,9 +124,8 @@ UNIT_TEST(PointToCircle_ZeroMeridian)
   double const r = mercator::MetersToMercator(100.0);
   auto const circlePlain = PointToPolygon(center, r, 6, 30.0);
 
-  std::vector<m2::PointD> const circlePlainExpected{{0.00077, 59.48054},  {0.00000, 59.48100},
-                                                    {-0.00077, 59.48054}, {-0.00077, 59.47964},
-                                                    {0.00000, 59.47920},  {0.00077, 59.47964}};
+  std::vector<m2::PointD> const circlePlainExpected{{0.00077, 59.48054},  {0.00000, 59.48100}, {-0.00077, 59.48054},
+                                                    {-0.00077, 59.47964}, {0.00000, 59.47920}, {0.00077, 59.47964}};
 
   TestRunCmpPoints(circlePlain, circlePlainExpected, r);
 }
@@ -140,9 +137,8 @@ UNIT_TEST(PointToCircle_LargeRadius)
   double const r = mercator::MetersToMercator(500000.0);
   auto const circlePlain = PointToPolygon(center, r, 6, 30.0);
 
-  std::vector<m2::PointD> const circlePlainExpected{{3.99631, 114.67859},  {0.10000, 116.92812},
-                                                    {-3.79631, 114.67859}, {-3.79631, 110.17951},
-                                                    {0.10000, 107.92998},  {3.99631, 110.17951}};
+  std::vector<m2::PointD> const circlePlainExpected{{3.99631, 114.67859},  {0.10000, 116.92812}, {-3.79631, 114.67859},
+                                                    {-3.79631, 110.17951}, {0.10000, 107.92998}, {3.99631, 110.17951}};
 
   TestRunCmpPoints(circlePlain, circlePlainExpected, r);
 }
@@ -168,8 +164,8 @@ UNIT_TEST(TrimSegment_Radius3)
   m2::PointD const pointRoundabout(15.0, 17.0);
   double const r = 3.0;
 
-  m2::PointD const nextPointOnRoad = GetPointAtDistFromTarget(
-      pointOnRoad /* source */, pointRoundabout /* target */, r /* dist */);
+  m2::PointD const nextPointOnRoad =
+      GetPointAtDistFromTarget(pointOnRoad /* source */, pointRoundabout /* target */, r /* dist */);
   double const dist = DistanceOnPlain(nextPointOnRoad, pointRoundabout);
   TestRunCmpNumbers(dist, r);
 }
@@ -192,29 +188,20 @@ UNIT_TEST(Manage_MiniRoundabout_1Road)
 
   // Check for "diameters" equality.
   double const diameter = r * 2.;
-  TEST(AlmostEqualAbs(DistanceOnPlain(circlePlain[0], circlePlain[3]), diameter,
-                            kMwmPointAccuracy),
-       ());
-  TEST(AlmostEqualAbs(DistanceOnPlain(circlePlain[1], circlePlain[4]), diameter,
-                            kMwmPointAccuracy),
-       ());
-  TEST(AlmostEqualAbs(DistanceOnPlain(circlePlain[2], circlePlain[5]), diameter,
-                            kMwmPointAccuracy),
-       ());
+  TEST(AlmostEqualAbs(DistanceOnPlain(circlePlain[0], circlePlain[3]), diameter, kMwmPointAccuracy), ());
+  TEST(AlmostEqualAbs(DistanceOnPlain(circlePlain[1], circlePlain[4]), diameter, kMwmPointAccuracy), ());
+  TEST(AlmostEqualAbs(DistanceOnPlain(circlePlain[2], circlePlain[5]), diameter, kMwmPointAccuracy), ());
 
   double const edgeLen = DistanceOnPlain(circlePlain[0], circlePlain[1]);
   for (size_t i = 1; i < circlePlain.size(); ++i)
-    TEST(AlmostEqualAbs(DistanceOnPlain(circlePlain[i - 1], circlePlain[i]), edgeLen,
-                              kMwmPointAccuracy),
-         ());
+    TEST(AlmostEqualAbs(DistanceOnPlain(circlePlain[i - 1], circlePlain[i]), edgeLen, kMwmPointAccuracy), ());
 
-  m2::PointD const newPointOnRoad =
-      GetPointAtDistFromTarget(nearest /* source */, center /* target */, r /* dist */);
+  m2::PointD const newPointOnRoad = GetPointAtDistFromTarget(nearest /* source */, center /* target */, r /* dist */);
   AddPointToCircle(circlePlain, newPointOnRoad);
 
-  std::vector<m2::PointD> const circlePlainExpected{
-      {11.50013, 85.06309}, {11.50012, 85.06310}, {11.50011, 85.06310}, {11.50010, 85.06309},
-      {11.50010, 85.06306}, {11.50012, 85.06305}, {11.50013, 85.06306}};
+  std::vector<m2::PointD> const circlePlainExpected{{11.50013, 85.06309}, {11.50012, 85.06310}, {11.50011, 85.06310},
+                                                    {11.50010, 85.06309}, {11.50010, 85.06306}, {11.50012, 85.06305},
+                                                    {11.50013, 85.06306}};
 
   TestRunCmpPoints(circlePlain, circlePlainExpected, r);
 }
@@ -230,34 +217,28 @@ UNIT_TEST(Manage_MiniRoundabout_4Roads)
   auto const stationRoadLeftNode = RoadNode(4, 51.7460327, -0.4739356);  // End of road
   auto const plaughRoundaboutRightNode = RoadNode(5, 51.7458321, -0.4732662);
 
-  m2::PointD const center =
-      mercator::FromLatLon({miniRoundabout.m_lat, miniRoundabout.m_lon});
+  m2::PointD const center = mercator::FromLatLon({miniRoundabout.m_lat, miniRoundabout.m_lon});
 
   double const r = mercator::MetersToMercator(2.5);
 
   auto circlePlain = PointToPolygon(center, r, 6, 30.0);
 
   AddPointToCircle(circlePlain, GetPointAtDistFromTarget(
-                                    mercator::FromLatLon(stationRoadNode.m_lat,
-                                                         stationRoadNode.m_lon) /* source */,
+                                    mercator::FromLatLon(stationRoadNode.m_lat, stationRoadNode.m_lon) /* source */,
                                     center /* target */, r /* dist */));
-  AddPointToCircle(circlePlain, GetPointAtDistFromTarget(
-                                    mercator::FromLatLon(plaughRoundaboutNode.m_lat,
-                                                         plaughRoundaboutNode.m_lon) /* source */,
-                                    center /* target */, r /* dist */));
-  AddPointToCircle(circlePlain, GetPointAtDistFromTarget(
-                                    mercator::FromLatLon(stationRoadLeftNode.m_lat,
-                                                         stationRoadLeftNode.m_lon) /* source */,
-                                    center /* target */, r /* dist */));
-  AddPointToCircle(circlePlain,
-                   GetPointAtDistFromTarget(mercator::FromLatLon(plaughRoundaboutRightNode.m_lat,
-                                                                 plaughRoundaboutRightNode.m_lon),
-                                            center, r));
+  AddPointToCircle(circlePlain, GetPointAtDistFromTarget(mercator::FromLatLon(plaughRoundaboutNode.m_lat,
+                                                                              plaughRoundaboutNode.m_lon) /* source */,
+                                                         center /* target */, r /* dist */));
+  AddPointToCircle(circlePlain, GetPointAtDistFromTarget(mercator::FromLatLon(stationRoadLeftNode.m_lat,
+                                                                              stationRoadLeftNode.m_lon) /* source */,
+                                                         center /* target */, r /* dist */));
+  AddPointToCircle(circlePlain, GetPointAtDistFromTarget(mercator::FromLatLon(plaughRoundaboutRightNode.m_lat,
+                                                                              plaughRoundaboutRightNode.m_lon),
+                                                         center, r));
 
   std::vector<m2::PointD> const circlePlainExpected{
-      {-0.47381, 60.67520}, {-0.47383, 60.67521}, {-0.47384, 60.67521}, {-0.47385, 60.67520},
-      {-0.47386, 60.67520}, {-0.47385, 60.67518}, {-0.47385, 60.67518}, {-0.47383, 60.67517},
-      {-0.47381, 60.67518}, {-0.47381, 60.67518}};
+      {-0.47381, 60.67520}, {-0.47383, 60.67521}, {-0.47384, 60.67521}, {-0.47385, 60.67520}, {-0.47386, 60.67520},
+      {-0.47385, 60.67518}, {-0.47385, 60.67518}, {-0.47383, 60.67517}, {-0.47381, 60.67518}, {-0.47381, 60.67518}};
   TestRunCmpPoints(circlePlain, circlePlainExpected, r);
 }
 
diff --git a/generator/generator_tests/node_mixer_test.cpp b/generator/generator_tests/node_mixer_test.cpp
index b9184cc1b..30885830b 100644
--- a/generator/generator_tests/node_mixer_test.cpp
+++ b/generator/generator_tests/node_mixer_test.cpp
@@ -8,23 +8,21 @@
 UNIT_TEST(NodeMixerTests)
 {
   std::istringstream stream1("");
-  generator::MixFakeNodes(stream1, [](OsmElement & p) {
-    TEST(false, ("Returned an object for an empty input stream."));
-  });
+  generator::MixFakeNodes(stream1,
+                          [](OsmElement & p) { TEST(false, ("Returned an object for an empty input stream.")); });
 
   std::istringstream stream2("shop=gift\nname=Shop\n");
-  generator::MixFakeNodes(stream2, [](OsmElement & p) {
-    TEST(false, ("Returned an object for a source without coordinates."));
-  });
+  generator::MixFakeNodes(
+      stream2, [](OsmElement & p) { TEST(false, ("Returned an object for a source without coordinates.")); });
 
   std::istringstream stream3("lat=4.0\nlon=-4.1\n");
-  generator::MixFakeNodes(stream3, [](OsmElement & p) {
-    TEST(false, ("Returned an object for a source without tags."));
-  });
+  generator::MixFakeNodes(stream3,
+                          [](OsmElement & p) { TEST(false, ("Returned an object for a source without tags.")); });
 
   std::istringstream stream4("lat=10.0\nlon=-4.8\nshop=gift\nname=Shop");
   int count4 = 0;
-  generator::MixFakeNodes(stream4, [&](OsmElement & p) {
+  generator::MixFakeNodes(stream4, [&](OsmElement & p)
+  {
     count4++;
     TEST_EQUAL(p.m_type, OsmElement::EntityType::Node, ());
     TEST_EQUAL(p.m_lat, 10.0, ());
@@ -36,7 +34,8 @@ UNIT_TEST(NodeMixerTests)
 
   std::istringstream stream5("lat=10.0\nlon=-4.8\nid=1\nname=First\n\nid=2\nlat=60\nlon=1\nname=Second\n\n\n");
   int count5 = 0;
-  generator::MixFakeNodes(stream5, [&](OsmElement & p) {
+  generator::MixFakeNodes(stream5, [&](OsmElement & p)
+  {
     count5++;
     TEST_EQUAL(p.m_type, OsmElement::EntityType::Node, ());
     TEST_EQUAL(p.Tags().size(), 2, ());
@@ -48,7 +47,8 @@ UNIT_TEST(NodeMixerTests)
 
   std::istringstream stream6("lat=0\nlon=-4.8\nshop=mall");
   int count6 = 0;
-  generator::MixFakeNodes(stream6, [&](OsmElement & p) {
+  generator::MixFakeNodes(stream6, [&](OsmElement & p)
+  {
     count6++;
     TEST_EQUAL(p.m_lat, 0.0, ());
     TEST_EQUAL(p.m_lon, -4.8, ());
diff --git a/generator/generator_tests/osm_o5m_source_test.cpp b/generator/generator_tests/osm_o5m_source_test.cpp
index 39856f570..84748d5e8 100644
--- a/generator/generator_tests/osm_o5m_source_test.cpp
+++ b/generator/generator_tests/osm_o5m_source_test.cpp
@@ -19,9 +19,7 @@ UNIT_TEST(OSM_O5M_Source_Node_read_test)
   std::stringstream ss(data);
 
   osm::O5MSource dataset([&ss](uint8_t * buffer, size_t size)
-  {
-    return ss.read(reinterpret_cast<char *>(buffer), size).gcount();
-  }, 10 /* buffer size */);
+  { return ss.read(reinterpret_cast<char *>(buffer), size).gcount(); }, 10 /* buffer size */);
 
   osm::O5MSource::Iterator it = dataset.begin();
   osm::O5MSource::Entity const & em = *it;
@@ -52,49 +50,43 @@ UNIT_TEST(OSM_O5M_Source_Way_read_test)
   std::stringstream ss(data);
 
   osm::O5MSource dataset([&ss](uint8_t * buffer, size_t size)
-  {
-    return ss.read(reinterpret_cast<char *>(buffer), size).gcount();
-  }, 10 /* buffer size */);
+  { return ss.read(reinterpret_cast<char *>(buffer), size).gcount(); }, 10 /* buffer size */);
 
   std::set<int64_t> nodes;
 
-  vector<pair<string, string>> const validTags = {
-      {"name", "Yukon River"}, {"name:ru", "Юкон"}, {"waterway", "river"}};
+  vector<pair<string, string>> const validTags = {{"name", "Yukon River"}, {"name:ru", "Юкон"}, {"waterway", "river"}};
 
   for (auto const & em : dataset)
   {
     switch (em.type)
     {
-      case osm::O5MSource::EntityType::Node:
+    case osm::O5MSource::EntityType::Node:
+    {
+      nodes.insert(em.id);
+      for (auto const & tag : em.Tags())
+        TEST(false, ("Unexpected tag:", tag.key, tag.value));
+      break;
+    }
+    case osm::O5MSource::EntityType::Way:
+    {
+      size_t ndCounter = 0;
+      size_t tagCounter = 0;
+      for (auto const & nd : em.Nodes())
       {
-        nodes.insert(em.id);
-        for (auto const & tag : em.Tags())
-        {
-          TEST(false, ("Unexpected tag:", tag.key, tag.value));
-        }
-        break;
+        ndCounter++;
+        TEST(nodes.count(nd), ());
       }
-      case osm::O5MSource::EntityType::Way:
+      TEST_EQUAL(nodes.size(), ndCounter, ());
+      for (auto const & tag : em.Tags())
       {
-        size_t ndCounter = 0;
-        size_t tagCounter = 0;
-        for (auto const & nd : em.Nodes())
-        {
-          ndCounter++;
-          TEST(nodes.count(nd), ());
-        }
-        TEST_EQUAL(nodes.size(), ndCounter, ());
-        for (auto const & tag : em.Tags())
-        {
-          TEST_EQUAL(tag.key, validTags[tagCounter].first, ());
-          TEST_EQUAL(tag.value, validTags[tagCounter].second, ());
-          tagCounter++;
-        }
-        TEST_EQUAL(validTags.size(), tagCounter, ());
-        break;
+        TEST_EQUAL(tag.key, validTags[tagCounter].first, ());
+        TEST_EQUAL(tag.value, validTags[tagCounter].second, ());
+        tagCounter++;
       }
-      default:
-        break;
+      TEST_EQUAL(validTags.size(), tagCounter, ());
+      break;
+    }
+    default: break;
     }
   }
 }
@@ -105,26 +97,18 @@ UNIT_TEST(OSM_O5M_Source_Relation_read_test)
   std::stringstream ss(data);
 
   osm::O5MSource dataset([&ss](uint8_t * buffer, size_t size)
-  {
-    return ss.read(reinterpret_cast<char *>(buffer), size).gcount();
-  }, 10 /* buffer size */);
+  { return ss.read(reinterpret_cast<char *>(buffer), size).gcount(); }, 10 /* buffer size */);
 
   std::set<int64_t> nodes;
   std::set<int64_t> entities;
 
-  vector<pair<string, string>> const validNodeTags = {
-    {"name", "Whitehorse"}
-    , {"place", "town"}};
+  vector<pair<string, string>> const validNodeTags = {{"name", "Whitehorse"}, {"place", "town"}};
 
   vector<pair<string, string>> const validRelationTags = {
-      {"name", "Whitehorse"}
-    , {"place", "town"}
-    , {"type", "multipolygon"}};
+      {"name", "Whitehorse"}, {"place", "town"}, {"type", "multipolygon"}};
 
   using TType = osm::O5MSource::EntityType;
-  vector<pair<TType, string>> const relationMembers = {
-      {TType::Way, "outer"}
-    , {TType::Node, ""}};
+  vector<pair<TType, string>> const relationMembers = {{TType::Way, "outer"}, {TType::Node, ""}};
 
   for (auto const & em : dataset)
   {
@@ -132,58 +116,53 @@ UNIT_TEST(OSM_O5M_Source_Relation_read_test)
 
     switch (em.type)
     {
-      case TType::Node:
+    case TType::Node:
+    {
+      nodes.insert(em.id);
+      size_t tagCounter = 0;
+      for (auto const & tag : em.Tags())
       {
-        nodes.insert(em.id);
-        size_t tagCounter = 0;
-        for (auto const & tag : em.Tags())
-        {
-          TEST_EQUAL(tag.key, validNodeTags[tagCounter].first, ());
-          TEST_EQUAL(tag.value, validNodeTags[tagCounter].second, ());
-          tagCounter++;
-        }
-        break;
+        TEST_EQUAL(tag.key, validNodeTags[tagCounter].first, ());
+        TEST_EQUAL(tag.value, validNodeTags[tagCounter].second, ());
+        tagCounter++;
       }
-      case TType::Way:
+      break;
+    }
+    case TType::Way:
+    {
+      size_t ndCounter = 0;
+      for (auto const & nd : em.Nodes())
       {
-        size_t ndCounter = 0;
-        for (auto const & nd : em.Nodes())
-        {
-          ndCounter++;
-          TEST(nodes.count(nd), ());
-        }
-        TEST_EQUAL(nodes.size(), ndCounter, ());
-        for (auto const & tag : em.Tags())
-        {
-          TEST(false, ("Unexpected tag:", tag.key, tag.value));
-        }
-        break;
+        ndCounter++;
+        TEST(nodes.count(nd), ());
       }
-      case TType::Relation:
+      TEST_EQUAL(nodes.size(), ndCounter, ());
+      for (auto const & tag : em.Tags())
+        TEST(false, ("Unexpected tag:", tag.key, tag.value));
+      break;
+    }
+    case TType::Relation:
+    {
+      size_t memberCounter = 0;
+      size_t tagCounter = 0;
+      for (auto const & member : em.Members())
       {
-        size_t memberCounter = 0;
-        size_t tagCounter = 0;
-        for (auto const & member : em.Members())
-        {
-          TEST(entities.count(member.ref), ());
-          TEST_EQUAL(relationMembers[memberCounter].first, member.type,
-                      ("Current member:", memberCounter));
-          TEST_EQUAL(relationMembers[memberCounter].second, member.role,
-                      ("Current member:", memberCounter));
-          memberCounter++;
-        }
-        TEST_EQUAL(memberCounter, 2, ());
-        for (auto const & tag : em.Tags())
-        {
-          TEST_EQUAL(tag.key, validRelationTags[tagCounter].first, ());
-          TEST_EQUAL(tag.value, validRelationTags[tagCounter].second, ());
-          tagCounter++;
-        }
-        TEST_EQUAL(validRelationTags.size(), tagCounter, ());
-        break;
+        TEST(entities.count(member.ref), ());
+        TEST_EQUAL(relationMembers[memberCounter].first, member.type, ("Current member:", memberCounter));
+        TEST_EQUAL(relationMembers[memberCounter].second, member.role, ("Current member:", memberCounter));
+        memberCounter++;
       }
-      default:
-        break;
+      TEST_EQUAL(memberCounter, 2, ());
+      for (auto const & tag : em.Tags())
+      {
+        TEST_EQUAL(tag.key, validRelationTags[tagCounter].first, ());
+        TEST_EQUAL(tag.value, validRelationTags[tagCounter].second, ());
+        tagCounter++;
+      }
+      TEST_EQUAL(validRelationTags.size(), tagCounter, ());
+      break;
+    }
+    default: break;
     }
   }
 }
diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp
index 6eb5cac99..f00733e86 100644
--- a/generator/generator_tests/osm_type_test.cpp
+++ b/generator/generator_tests/osm_type_test.cpp
@@ -2,16 +2,16 @@
 
 #include "generator/generator_tests/types_helper.hpp"
 #include "generator/generator_tests_support/test_with_classificator.hpp"
-#include "generator/osm_element.hpp"
 #include "generator/osm2type.hpp"
+#include "generator/osm_element.hpp"
 #include "generator/tag_admixer.hpp"
 
 #include "routing_common/bicycle_model.hpp"
 #include "routing_common/car_model.hpp"
 #include "routing_common/pedestrian_model.hpp"
 
-#include "indexer/feature_data.hpp"
 #include "indexer/classificator.hpp"
+#include "indexer/feature_data.hpp"
 
 #include "platform/platform.hpp"
 
@@ -27,8 +27,8 @@ using namespace tests;
 
 using Tags = std::vector<OsmElement::Tag>;
 
-void TestSurfaceTypes(std::string const & surface, std::string const & smoothness,
-                      std::string const & grade, char const * value)
+void TestSurfaceTypes(std::string const & surface, std::string const & smoothness, std::string const & grade,
+                      char const * value)
 {
   OsmElement e;
   e.AddTag("highway", "unclassified");
@@ -49,13 +49,11 @@ void TestSurfaceTypes(std::string const & surface, std::string const & smoothnes
       psurface = rtype.substr(9);
   }
   TEST(params.IsTypeExist(GetType({"psurface", value})),
-        ("Surface:", surface, "Smoothness:", smoothness, "Grade:", grade, "Expected:", value,
-        "Got:", psurface));
+       ("Surface:", surface, "Smoothness:", smoothness, "Grade:", grade, "Expected:", value, "Got:", psurface));
 }
 
-FeatureBuilderParams GetFeatureBuilderParams(
-    Tags const & tags,
-    OsmElement::EntityType type = OsmElement::EntityType::Unknown)
+FeatureBuilderParams GetFeatureBuilderParams(Tags const & tags,
+                                             OsmElement::EntityType type = OsmElement::EntityType::Unknown)
 {
   OsmElement e;
   e.m_type = type;
@@ -69,15 +67,10 @@ FeatureBuilderParams GetFeatureBuilderParams(
   return params;
 }
 
-
 UNIT_CLASS_TEST(TestWithClassificator, OsmType_SkipDummy)
 {
   Tags const tags = {
-    { "abutters", "residential" },
-    { "highway", "primary" },
-    { "osmarender:renderRef", "no" },
-    { "ref", "E51" }
-  };
+      {"abutters", "residential"}, {"highway", "primary"}, {"osmarender:renderRef", "no"}, {"ref", "E51"}};
 
   auto const params = GetFeatureBuilderParams(tags);
 
@@ -88,12 +81,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SkipDummy)
 UNIT_CLASS_TEST(TestWithClassificator, OsmType_Oneway)
 {
   {
-    Tags const tags = {
-      { "highway", "primary" },
-      { "motorroad", "yes" },
-      { "name", "Каширское шоссе" },
-      { "oneway", "yes" }
-    };
+    Tags const tags = {{"highway", "primary"}, {"motorroad", "yes"}, {"name", "Каширское шоссе"}, {"oneway", "yes"}};
 
     auto const params = GetFeatureBuilderParams(tags);
 
@@ -103,12 +91,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Oneway)
   }
 
   {
-    Tags const tags = {
-      { "highway", "primary" },
-      { "name", "Каширское шоссе" },
-      { "oneway", "-1" },
-      { "motorroad", "yes" }
-    };
+    Tags const tags = {{"highway", "primary"}, {"name", "Каширское шоссе"}, {"oneway", "-1"}, {"motorroad", "yes"}};
 
     auto const params = GetFeatureBuilderParams(tags);
 
@@ -122,9 +105,9 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Location)
 {
   {
     Tags const tags = {
-      { "power", "line" },
-      { "location", "underground" },
-      { "man_made", "pipeline" },
+        {"power", "line"},
+        {"location", "underground"},
+        {"man_made", "pipeline"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -134,8 +117,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Location)
 
   {
     Tags const tags = {
-      { "power", "line" },
-      { "man_made", "pipeline" },
+        {"power", "line"},
+        {"man_made", "pipeline"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -143,14 +126,14 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Location)
     TEST_EQUAL(params.m_types.size(), 1, (params));
     TEST(params.IsTypeExist(GetType({"power", "line"})), ());
     // We don't have drawing rules now for pipeline.
-    //TEST(params.IsTypeExist(GetType({"man_made", "pipeline"})), ());
+    // TEST(params.IsTypeExist(GetType({"man_made", "pipeline"})), ());
   }
 
   {
     Tags const tags = {
-      { "power", "line" },
-      { "location", "overground" },
-      { "man_made", "pipeline" },
+        {"power", "line"},
+        {"location", "overground"},
+        {"man_made", "pipeline"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -163,13 +146,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Location)
 UNIT_CLASS_TEST(TestWithClassificator, OsmType_Combined)
 {
   Tags const tags = {
-    { "addr:housenumber", "84" },
-    { "addr:postcode", "220100" },
-    { "addr:street", "ул. Максима Богдановича" },
-    { "amenity", "school" },
-    { "building", "yes" },
-    { "name", "Гимназия 15" }
-  };
+      {"addr:housenumber", "84"}, {"addr:postcode", "220100"}, {"addr:street", "ул. Максима Богдановича"},
+      {"amenity", "school"},      {"building", "yes"},         {"name", "Гимназия 15"}};
 
   auto const params = GetFeatureBuilderParams(tags);
 
@@ -189,7 +167,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Address)
   uint32_t const addrType = GetType({"building", "address"});
   {
     // Single house number tag is transformed into address type.
-    Tags const tags = { {"addr:housenumber", "42"} };
+    Tags const tags = {{"addr:housenumber", "42"}};
 
     auto const params = GetFeatureBuilderParams(tags);
 
@@ -200,15 +178,9 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Address)
   }
 
   {
-    Tags const tags = {
-      { "addr:conscriptionnumber", "223" },
-      { "addr:housenumber", "223/5" },
-      { "addr:postcode", "11000" },
-      { "addr:street", "Řetězová" },
-      { "addr:streetnumber", "5" },
-      { "source:addr", "uir_adr" },
-      { "uir_adr:ADRESA_KOD", "21717036" }
-    };
+    Tags const tags = {{"addr:conscriptionnumber", "223"}, {"addr:housenumber", "223/5"}, {"addr:postcode", "11000"},
+                       {"addr:street", "Řetězová"},        {"addr:streetnumber", "5"},    {"source:addr", "uir_adr"},
+                       {"uir_adr:ADRESA_KOD", "21717036"}};
 
     auto const params = GetFeatureBuilderParams(tags);
 
@@ -222,14 +194,10 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Address)
 
   {
     Tags const tags = {
-      {"addr:city", "Zürich"},
-      {"addr:housenumber", "41"},
-      {"addr:postcode", "8050"},
-      {"addr:street", "Leutschenbachstrasse"},
-      {"entrance", "main"},
-      {"survey:date", "2020-12-17"},
-      {"wheelchair", "no"},
-      {"internet_access", "wlan"},
+        {"addr:city", "Zürich"},   {"addr:housenumber", "41"},
+        {"addr:postcode", "8050"}, {"addr:street", "Leutschenbachstrasse"},
+        {"entrance", "main"},      {"survey:date", "2020-12-17"},
+        {"wheelchair", "no"},      {"internet_access", "wlan"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -246,13 +214,9 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Address)
 
   {
     Tags const tags = {
-      {"addr:city", "Šķaune"},
-      {"addr:country", "LV"},
-      {"addr:district", "Krāslavas novads"},
-      {"addr:housename", "Rozemnieki"},
-      {"addr:postcode", "LV-5695"},
-      {"addr:subdistrict", "Šķaunes pagasts"},
-      {"ref:LV:addr", "104934702"},
+        {"addr:city", "Šķaune"},          {"addr:country", "LV"},       {"addr:district", "Krāslavas novads"},
+        {"addr:housename", "Rozemnieki"}, {"addr:postcode", "LV-5695"}, {"addr:subdistrict", "Šķaunes pagasts"},
+        {"ref:LV:addr", "104934702"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -267,19 +231,19 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Address)
 
   {
     Tags const tags = {
-      {"building", "yes"},
-      {"contact:city", "Paris"},
-      {"contact:housenumber", "13"},
-      {"contact:phone", "+33 1 44 77 60 60"},
-      {"contact:postcode", "75001"},
-      {"contact:street", "Place Vendôme"},
-      {"contact:website", "https://www.justice.gouv.fr/"},
-      {"government", "ministry"},
-      {"historic", "manor"},
-      {"layer", "1"},
-      {"name", "Ministère de la Justice"},
-      {"office", "government"},
-      {"wikidata", "Q3145763"},
+        {"building", "yes"},
+        {"contact:city", "Paris"},
+        {"contact:housenumber", "13"},
+        {"contact:phone", "+33 1 44 77 60 60"},
+        {"contact:postcode", "75001"},
+        {"contact:street", "Place Vendôme"},
+        {"contact:website", "https://www.justice.gouv.fr/"},
+        {"government", "ministry"},
+        {"historic", "manor"},
+        {"layer", "1"},
+        {"name", "Ministère de la Justice"},
+        {"office", "government"},
+        {"wikidata", "Q3145763"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -292,15 +256,9 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Address)
 
   {
     Tags const tags = {
-      {"addr:city", "München"},
-      {"addr:country", "DE"},
-      {"addr:housenumber", "27"},
-      {"addr:postcode", "80339"},
-      {"addr:street", "Ligsalzstraße"},
-      {"clothes", "children"},
-      {"disused:shop", "clothes"},
-      {"name", "Westendprinz"},
-      {"operator", "Meike Hannig"},
+        {"addr:city", "München"},    {"addr:country", "DE"},           {"addr:housenumber", "27"},
+        {"addr:postcode", "80339"},  {"addr:street", "Ligsalzstraße"}, {"clothes", "children"},
+        {"disused:shop", "clothes"}, {"name", "Westendprinz"},         {"operator", "Meike Hannig"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -318,17 +276,15 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Address)
 
 UNIT_CLASS_TEST(TestWithClassificator, OsmType_PlaceState)
 {
-  Tags const tags = {
-    { "alt_name:vi", "California" },
-    { "is_in", "USA" },
-    { "is_in:continent", "North America" },
-    { "is_in:country", "USA" },
-    { "is_in:country_code", "us" },
-    { "name", "California" },
-    { "place", "state" },
-    { "population", "37253956" },
-    { "ref", "CA" }
-  };
+  Tags const tags = {{"alt_name:vi", "California"},
+                     {"is_in", "USA"},
+                     {"is_in:continent", "North America"},
+                     {"is_in:country", "USA"},
+                     {"is_in:country_code", "us"},
+                     {"name", "California"},
+                     {"place", "state"},
+                     {"population", "37253956"},
+                     {"ref", "CA"}};
 
   auto const params = GetFeatureBuilderParams(tags);
 
@@ -343,36 +299,31 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_PlaceState)
 
 UNIT_CLASS_TEST(TestWithClassificator, OsmType_AlabamaRiver)
 {
-  Tags const tags1 = {
-    { "NHD:FCode", "55800" },
-    { "NHD:FType", "558" },
-    { "NHD:RESOLUTION", "2" },
-    { "NHD:way_id", "139286586;139286577;139286596;139286565;139286574;139286508;139286600;139286591;139286507;139286505;139286611;139286602;139286594;139286604;139286615;139286616;139286608;139286514;139286511;139286564;139286576;139286521;139286554" },
-    { "attribution", "NHD" },
-    { "boat", "yes" },
-    { "deep_draft", "no" },
-    { "gnis:feature_id", "00517033" },
-    { "name", "Tennessee River" },
-    { "ship", "yes" },
-    { "source", "NHD_import_v0.4_20100913205417" },
-    { "source:deep_draft", "National Transportation Atlas Database 2011" },
-    { "waterway", "river" }
-  };
+  Tags const tags1 = {{"NHD:FCode", "55800"},
+                      {"NHD:FType", "558"},
+                      {"NHD:RESOLUTION", "2"},
+                      {"NHD:way_id",
+                       "139286586;139286577;139286596;139286565;139286574;139286508;139286600;139286591;139286507;"
+                       "139286505;139286611;139286602;139286594;139286604;139286615;139286616;139286608;139286514;"
+                       "139286511;139286564;139286576;139286521;139286554"},
+                      {"attribution", "NHD"},
+                      {"boat", "yes"},
+                      {"deep_draft", "no"},
+                      {"gnis:feature_id", "00517033"},
+                      {"name", "Tennessee River"},
+                      {"ship", "yes"},
+                      {"source", "NHD_import_v0.4_20100913205417"},
+                      {"source:deep_draft", "National Transportation Atlas Database 2011"},
+                      {"waterway", "river"}};
 
   Tags const tags2 = {
-    { "destination", "Ohio River" },
-    { "name", "Tennessee River" },
-    { "type", "waterway" },
-    { "waterway", "river" }
-  };
+      {"destination", "Ohio River"}, {"name", "Tennessee River"}, {"type", "waterway"}, {"waterway", "river"}};
 
-  Tags const tags3 = {
-    { "name", "Tennessee River" },
-    { "network", "inland waterways" },
-    { "route", "boat" },
-    { "ship", "yes" },
-    { "type", "route" }
-  };
+  Tags const tags3 = {{"name", "Tennessee River"},
+                      {"network", "inland waterways"},
+                      {"route", "boat"},
+                      {"ship", "yes"},
+                      {"type", "route"}};
 
   OsmElement e;
   FillXmlElement(tags1, &e);
@@ -391,13 +342,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Synonyms)
   // Smoke test.
   {
     Tags const tags = {
-      { "building", "yes" },
-      { "atm", "yes" },
-      { "shop", "yes" },
-      { "restaurant", "yes" },
-      { "hotel", "yes" },
-      { "toilets", "yes" },
-      { "drinkable", "yes"},
+        {"building", "yes"}, {"atm", "yes"},     {"shop", "yes"},      {"restaurant", "yes"},
+        {"hotel", "yes"},    {"toilets", "yes"}, {"drinkable", "yes"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -415,10 +361,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Synonyms)
 
   // Duplicating test.
   {
-    Tags const tags = {
-      { "amenity", "atm" },
-      { "atm", "yes" }
-    };
+    Tags const tags = {{"amenity", "atm"}, {"atm", "yes"}};
 
     auto const params = GetFeatureBuilderParams(tags);
 
@@ -428,11 +371,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Synonyms)
 
   // "NO" tag test.
   {
-    Tags const tags = {
-      { "building", "yes" },
-      { "shop", "no" },
-      { "atm", "no" }
-    };
+    Tags const tags = {{"building", "yes"}, {"shop", "no"}, {"atm", "no"}};
 
     auto const params = GetFeatureBuilderParams(tags);
 
@@ -445,8 +384,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Capital)
 {
   {
     Tags const tags = {
-      { "capital", "6" },
-      { "place", "city" },
+        {"capital", "6"},
+        {"place", "city"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -457,9 +396,9 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Capital)
 
   {
     Tags const tags = {
-      { "admin_level", "6" },
-      { "capital", "no" },
-      { "place", "city" },
+        {"admin_level", "6"},
+        {"capital", "no"},
+        {"place", "city"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -470,10 +409,10 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Capital)
 
   {
     Tags const tags = {
-      {"boundary", "administrative"},
-      {"capital", "2"},
-      {"place", "city"},
-      {"admin_level", "4"},
+        {"boundary", "administrative"},
+        {"capital", "2"},
+        {"place", "city"},
+        {"admin_level", "4"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -486,9 +425,9 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Capital)
 
   {
     Tags const tags = {
-      {"capital", "yes"},
-      {"place", "town"},
-      {"admin_level", "7"},
+        {"capital", "yes"},
+        {"place", "town"},
+        {"admin_level", "7"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -500,8 +439,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Capital)
 
   {
     Tags const tags = {
-      {"capital", "yes"},
-      {"admin_level", "7"},
+        {"capital", "yes"},
+        {"admin_level", "7"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -514,8 +453,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_DePlace)
 {
   {
     Tags const tags = {
-      {"de:place", "town"},
-      {"name", "xyz"},
+        {"de:place", "town"},
+        {"name", "xyz"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -529,15 +468,12 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_DePlace)
 UNIT_CLASS_TEST(TestWithClassificator, OsmType_Route)
 {
   {
-    Tags const tags = {
-      { "highway", "motorway" },
-      { "ref", "I 95" }
-    };
+    Tags const tags = {{"highway", "motorway"}, {"ref", "I 95"}};
 
     auto const params = GetFeatureBuilderParams(tags);
 
     TEST_EQUAL(params.m_types.size(), 1, (params));
-    TEST(params.IsTypeExist(GetType({ "highway", "motorway" })), ());
+    TEST(params.IsTypeExist(GetType({"highway", "motorway"})), ());
     TEST_EQUAL(params.ref, "I 95", ());
   }
 }
@@ -546,9 +482,9 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Layer)
 {
   {
     Tags const tags = {
-      { "highway", "motorway" },
-      { "bridge", "yes" },
-      { "layer", "2" },
+        {"highway", "motorway"},
+        {"bridge", "yes"},
+        {"layer", "2"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -560,9 +496,9 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Layer)
 
   {
     Tags const tags = {
-      { "highway", "trunk" },
-      { "tunnel", "yes" },
-      { "layer", "-1" },
+        {"highway", "trunk"},
+        {"tunnel", "yes"},
+        {"layer", "-1"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -574,8 +510,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Layer)
 
   {
     Tags const tags = {
-      { "highway", "secondary" },
-      { "bridge", "yes" },
+        {"highway", "secondary"},
+        {"bridge", "yes"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -602,8 +538,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Layer)
 
   {
     Tags const tags = {
-      { "highway", "primary" },
-      { "tunnel", "yes" },
+        {"highway", "primary"},
+        {"tunnel", "yes"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -615,7 +551,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Layer)
 
   {
     Tags const tags = {
-      { "highway", "living_street" },
+        {"highway", "living_street"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -630,8 +566,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Amenity)
 {
   {
     Tags const tags = {
-      { "amenity", "bbq" },
-      { "fuel", "wood" },
+        {"amenity", "bbq"},
+        {"fuel", "wood"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -645,9 +581,9 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Hwtag)
 {
   {
     Tags const tags = {
-      { "railway", "light_rail" },
-      { "access", "private" },
-      { "oneway", "true" },
+        {"railway", "light_rail"},
+        {"access", "private"},
+        {"oneway", "true"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -658,14 +594,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Hwtag)
 
   {
     Tags const tags = {
-        {"oneway", "-1"},
-        {"highway", "primary"},
-        {"access", "private"},
-        {"lit", "no"},
-        {"foot", "no"},
-        {"bicycle", "yes"},
-        {"oneway:bicycle", "no"},
-        {"motor_vehicle", "yes"},
+        {"oneway", "-1"}, {"highway", "primary"}, {"access", "private"},    {"lit", "no"},
+        {"foot", "no"},   {"bicycle", "yes"},     {"oneway:bicycle", "no"}, {"motor_vehicle", "yes"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -678,7 +608,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Hwtag)
     TEST(params.IsTypeExist(GetType({"hwtag", "yesbicycle"})), ());
     TEST(params.IsTypeExist(GetType({"hwtag", "bidir_bicycle"})), ());
     // We don't put yescar tag for features that already Yes by default.
-    //TEST(params.IsTypeExist(GetType({"hwtag", "yescar"})), ());
+    // TEST(params.IsTypeExist(GetType({"hwtag", "yescar"})), ());
   }
 
   {
@@ -711,7 +641,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Hwtag)
     TEST(params.IsTypeExist(GetType({"hwtag", "nofoot"})), ());
     TEST(params.IsTypeExist(GetType({"hwtag", "nocycleway"})), ());
     // No cycleway doesn't mean that bicycle is not allowed.
-    //TEST(params.IsTypeExist(GetType({"hwtag", "nobicycle"})), ());
+    // TEST(params.IsTypeExist(GetType({"hwtag", "nobicycle"})), ());
   }
 
   {
@@ -743,12 +673,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Hwtag)
 
   {
     Tags const tags = {
-        {"foot", "no"},
-        {"bicycle", "no"},
-        {"sidewalk:left", "yes"},
-        {"cycleway:right", "yes"},
-        {"highway", "trunk"},
-        {"motorcar", "designated"},
+        {"foot", "no"},       {"bicycle", "no"},          {"sidewalk:left", "yes"}, {"cycleway:right", "yes"},
+        {"highway", "trunk"}, {"motorcar", "designated"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -757,16 +683,12 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Hwtag)
     TEST(params.IsTypeExist(GetType({"highway", "trunk"})), ());
     TEST(params.IsTypeExist(GetType({"hwtag", "nofoot"})), ());
     TEST(params.IsTypeExist(GetType({"hwtag", "nobicycle"})), ());
-    //TEST(params.IsTypeExist(GetType({"hwtag", "yescar"})), ());
+    // TEST(params.IsTypeExist(GetType({"hwtag", "yescar"})), ());
   }
 
   {
     Tags const tags = {
-        {"foot", "yes"},
-        {"bicycle", "yes"},
-        {"sidewalk", "no"},
-        {"cycleway", "no"},
-        {"highway", "path"},
+        {"foot", "yes"}, {"bicycle", "yes"}, {"sidewalk", "no"}, {"cycleway", "no"}, {"highway", "path"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -794,20 +716,20 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Hwtag)
 
   {
     Tags const tags = {
-      {"bench", "yes"},
-      {"bicycle", "yes"},
-      {"bin", "yes"},
-      {"foot", "designated"},
-      {"highway", "footway"},
-      {"lit", "yes"},
-      {"public_transport", "platform"},
-      {"railway", "platform"},
-      {"shelter", "yes"},
-      {"smoothness", "good"},
-      {"surface", "paving_stones"},
-      {"tactile_paving", "yes"},
-      {"traffic_sign", "DE:239,DE:1022-10"},
-      {"tram", "yes"},
+        {"bench", "yes"},
+        {"bicycle", "yes"},
+        {"bin", "yes"},
+        {"foot", "designated"},
+        {"highway", "footway"},
+        {"lit", "yes"},
+        {"public_transport", "platform"},
+        {"railway", "platform"},
+        {"shelter", "yes"},
+        {"smoothness", "good"},
+        {"surface", "paving_stones"},
+        {"tactile_paving", "yes"},
+        {"traffic_sign", "DE:239,DE:1022-10"},
+        {"tram", "yes"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -930,9 +852,9 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Surface)
 
   {
     Tags const tags = {
-      {"highway", "track"},
-      {"tracktype", "grade1"},
-      {"smoothness", "intermediate"},
+        {"highway", "track"},
+        {"tracktype", "grade1"},
+        {"smoothness", "intermediate"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -956,7 +878,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Ferry)
 
   {
     Tags const tags = {
-      { "route", "ferry" },
+        {"route", "ferry"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -968,16 +890,16 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Ferry)
 
   uint32_t const shuttleType = GetType({"route", "shuttle_train"});
   /// @todo Strange, but they are processed by foot/bicycle=yes/no in VehicleModel.
-  //TEST(routing::PedestrianModel::AllLimitsInstance().IsRoadType(shuttleType), ());
-  //TEST(routing::BicycleModel::AllLimitsInstance().IsRoadType(shuttleType), ());
+  // TEST(routing::PedestrianModel::AllLimitsInstance().IsRoadType(shuttleType), ());
+  // TEST(routing::BicycleModel::AllLimitsInstance().IsRoadType(shuttleType), ());
   TEST(routing::CarModel::AllLimitsInstance().IsRoadType(shuttleType), ());
 
   {
     Tags const tags = {
-      { "route", "shuttle_train" },
-      { "bicycle", "yes" },
-      { "foot", "no" },
-      { "motorcar", "yes" },
+        {"route", "shuttle_train"},
+        {"bicycle", "yes"},
+        {"foot", "no"},
+        {"motorcar", "yes"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -991,9 +913,9 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Ferry)
 
   {
     Tags const tags = {
-      { "route", "train" },
-      { "shuttle", "yes" },
-      { "motor_vehicle", "yes" },
+        {"route", "train"},
+        {"shuttle", "yes"},
+        {"motor_vehicle", "yes"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -1005,8 +927,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Ferry)
 
   {
     Tags const tags = {
-      { "route", "train" },
-      { "shuttle", "no" },
+        {"route", "train"},
+        {"shuttle", "no"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -1016,10 +938,10 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Ferry)
 
   {
     Tags const tags = {
-      { "foot", "no" },
-      { "bicycle", "no" },
-      { "motorcar", "yes" },
-      { "route", "ferry" },
+        {"foot", "no"},
+        {"bicycle", "no"},
+        {"motorcar", "yes"},
+        {"route", "ferry"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -1055,10 +977,10 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Boundary)
 {
   {
     Tags const tags = {
-      { "admin_level", "4" },
-      { "boundary", "administrative" },
-      { "admin_level", "2" },
-      { "boundary", "administrative" },
+        {"admin_level", "4"},
+        {"boundary", "administrative"},
+        {"admin_level", "2"},
+        {"boundary", "administrative"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -1070,8 +992,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Boundary)
 
   {
     Tags const tags = {
-      { "protect_class", "1b" },
-      { "boundary", "protected_area" },
+        {"protect_class", "1b"},
+        {"boundary", "protected_area"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -1084,15 +1006,15 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Boundary)
 UNIT_CLASS_TEST(TestWithClassificator, OsmType_Dibrugarh)
 {
   Tags const tags = {
-    { "AND_a_c", "10001373" },
-    { "addr:city", "Dibrugarh" },
-    { "addr:housenumber", "hotel vishal" },
-    { "addr:postcode", "786001" },
-    { "addr:street", "Marwari Patty,Puja Ghat" },
-    { "name", "Dibrugarh" },
-    { "phone", "03732320016" },
-    { "place", "city" },
-    { "website", "http://www.hotelvishal.in" },
+      {"AND_a_c", "10001373"},
+      {"addr:city", "Dibrugarh"},
+      {"addr:housenumber", "hotel vishal"},
+      {"addr:postcode", "786001"},
+      {"addr:street", "Marwari Patty,Puja Ghat"},
+      {"name", "Dibrugarh"},
+      {"phone", "03732320016"},
+      {"place", "city"},
+      {"website", "http://www.hotelvishal.in"},
   };
 
   auto const params = GetFeatureBuilderParams(tags);
@@ -1108,11 +1030,11 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Subway)
 {
   {
     Tags const tags = {
-      { "network", "Московский метрополитен" },
-      { "operator", "ГУП «Московский метрополитен»" },
-      { "railway", "station" },
-      { "station", "subway" },
-      { "transport", "subway" },
+        {"network", "Московский метрополитен"},
+        {"operator", "ГУП «Московский метрополитен»"},
+        {"railway", "station"},
+        {"station", "subway"},
+        {"transport", "subway"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -1123,11 +1045,11 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Subway)
 
   {
     Tags const tags = {
-      {"name", "14th Street-8th Avenue (A,C,E,L)"},
-      {"network", "New York City Subway"},
-      {"railway", "station"},
-      {"wheelchair", "yes"},
-      {"transport", "subway"},
+        {"name", "14th Street-8th Avenue (A,C,E,L)"},
+        {"network", "New York City Subway"},
+        {"railway", "station"},
+        {"wheelchair", "yes"},
+        {"transport", "subway"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -1138,12 +1060,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Subway)
 
   {
     Tags const tags = {
-      { "name", "S Landsberger Allee" },
-      { "phone", "030 29743333" },
-      { "public_transport", "stop_position" },
-      { "railway", "station" },
-      { "network", "New York City Subway" },
-      { "station", "light_rail" },
+        {"name", "S Landsberger Allee"}, {"phone", "030 29743333"},           {"public_transport", "stop_position"},
+        {"railway", "station"},          {"network", "New York City Subway"}, {"station", "light_rail"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -1154,14 +1072,14 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Subway)
 
   {
     Tags const tags = {
-      { "monorail", "yes" },
-      { "name", "Улица Академика Королёва" },
-      { "network", "Московский метрополитен" },
-      { "operator", "ГУП «Московский метрополитен»" },
-      { "public_transport", "stop_position" },
-      { "railway", "station" },
-      { "station", "monorail" },
-      { "transport", "monorail" },
+        {"monorail", "yes"},
+        {"name", "Улица Академика Королёва"},
+        {"network", "Московский метрополитен"},
+        {"operator", "ГУП «Московский метрополитен»"},
+        {"public_transport", "stop_position"},
+        {"railway", "station"},
+        {"station", "monorail"},
+        {"transport", "monorail"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -1172,11 +1090,11 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Subway)
 
   {
     Tags const tags = {
-      { "line",	"Northern, Bakerloo" },
-      { "name",	"Charing Cross" },
-      { "network", "London Underground" },
-      { "operator", "TfL" },
-      { "railway", "station" },
+        {"line", "Northern, Bakerloo"},
+        {"name", "Charing Cross"},
+        {"network", "London Underground"},
+        {"operator", "TfL"},
+        {"railway", "station"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -1187,25 +1105,25 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Subway)
 
   {
     Tags const tags = {
-      { "artist_name", "Архитекторы: Н.Лопато, В.Шкарупин, В.Телепнев Скульптор: Л.Зильбер. Дизайнер: Н.Грибов" },
-      { "colour", "red" },
-      { "int_name", "Frunzienskaja" },
-      { "name", "Фрунзенская" },
-      { "name:be", "Фрунзенская" },
-      { "name:en", "Frunzienskaja" },
-      { "name:ru", "Фрунзенская" },
-      { "network", "Минский метрополитен" },
-      { "operator", "КУП «Минский метрополитен»" },
-      { "public_transport", "stop_position" },
-      { "railway", "station" },
-      { "ref", "218" },
-      { "start_date", "1990-12-31" },
-      { "station", "subway" },
-      { "subway", "yes" },
-      { "transport", "subway" },
-      { "website", "https://metropoliten.by/sxema-linii/54/224/" },
-      { "wheelchair", "no" },
-      { "wikidata", "Q2445504" },
+        {"artist_name", "Архитекторы: Н.Лопато, В.Шкарупин, В.Телепнев Скульптор: Л.Зильбер. Дизайнер: Н.Грибов"},
+        {"colour", "red"},
+        {"int_name", "Frunzienskaja"},
+        {"name", "Фрунзенская"},
+        {"name:be", "Фрунзенская"},
+        {"name:en", "Frunzienskaja"},
+        {"name:ru", "Фрунзенская"},
+        {"network", "Минский метрополитен"},
+        {"operator", "КУП «Минский метрополитен»"},
+        {"public_transport", "stop_position"},
+        {"railway", "station"},
+        {"ref", "218"},
+        {"start_date", "1990-12-31"},
+        {"station", "subway"},
+        {"subway", "yes"},
+        {"transport", "subway"},
+        {"website", "https://metropoliten.by/sxema-linii/54/224/"},
+        {"wheelchair", "no"},
+        {"wikidata", "Q2445504"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -1217,26 +1135,26 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Subway)
 
   {
     Tags const tags = {
-      { "artist_name", "Архитектор: В. Лопато" },
-      { "colour", "green" },
-      { "int_name", "Jubiliejnaja plošča" },
-      { "layer", "-5" },
-      { "line", "Зеленый Луг" },
-      { "name", "Юбілейная плошча" },
-      { "name:be", "Юбілейная плошча" },
-      { "name:ru", "Юбилейная площадь" },
-      { "network", "Минский метрополитен" },
-      { "operator", "КУП «Минский метрополитен»" },
-      { "public_transport", "stop_position" },
-      { "railway", "station" },
-      { "ref", "316" },
-      { "start_date", "2020-11-06" },
-      { "station", "subway" },
-      { "subway", "yes" },
-      { "transport", "subway" },
-      { "website", "https://metropoliten.by/sxema-linii/91/2781/" },
-      { "wikidata", "Q4365831" },
-      { "wikipedia", "be:Юбілейная плошча (станцыя метро)" },
+        {"artist_name", "Архитектор: В. Лопато"},
+        {"colour", "green"},
+        {"int_name", "Jubiliejnaja plošča"},
+        {"layer", "-5"},
+        {"line", "Зеленый Луг"},
+        {"name", "Юбілейная плошча"},
+        {"name:be", "Юбілейная плошча"},
+        {"name:ru", "Юбилейная площадь"},
+        {"network", "Минский метрополитен"},
+        {"operator", "КУП «Минский метрополитен»"},
+        {"public_transport", "stop_position"},
+        {"railway", "station"},
+        {"ref", "316"},
+        {"start_date", "2020-11-06"},
+        {"station", "subway"},
+        {"subway", "yes"},
+        {"transport", "subway"},
+        {"website", "https://metropoliten.by/sxema-linii/91/2781/"},
+        {"wikidata", "Q4365831"},
+        {"wikipedia", "be:Юбілейная плошча (станцыя метро)"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -1250,9 +1168,9 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_PublicTransport)
 {
   {
     Tags const tags = {
-      { "name", "Платонава" },
-      { "public_transport", "stop_position" },
-      { "tram", "yes" },
+        {"name", "Платонава"},
+        {"public_transport", "stop_position"},
+        {"tram", "yes"},
     };
 
     auto const params = GetFeatureBuilderParams(tags, OsmElement::EntityType::Node);
@@ -1263,9 +1181,9 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_PublicTransport)
 
   {
     Tags const tags = {
-      { "funicular", "yes" },
-      { "name", "Gare Pfaffenthal-Kirchberg" },
-      { "public_transport", "stop_position" },
+        {"funicular", "yes"},
+        {"name", "Gare Pfaffenthal-Kirchberg"},
+        {"public_transport", "stop_position"},
     };
 
     auto const params = GetFeatureBuilderParams(tags, OsmElement::EntityType::Node);
@@ -1279,7 +1197,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Hospital)
 {
   {
     Tags const tags = {
-      { "building", "hospital" },
+        {"building", "hospital"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -1290,8 +1208,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Hospital)
 
   {
     Tags const tags = {
-      { "building", "yes" },
-      { "amenity", "hospital" },
+        {"building", "yes"},
+        {"amenity", "hospital"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -1306,8 +1224,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Entrance)
 {
   {
     Tags const tags = {
-      { "building", "entrance" },
-      { "barrier", "entrance" },
+        {"building", "entrance"},
+        {"barrier", "entrance"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -1322,24 +1240,24 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Moscow)
 {
   {
     Tags const tags = {
-      { "addr:country", "RU" },
-      { "addr:region", "Москва" },
-      { "admin_level", "2" },
-      { "alt_name:vi", "Mạc Tư Khoa" },
-      { "capital", "yes" },
-      { "ele", "156" },
-      { "int_name", "Moscow" },
-      { "is_capital", "country" },
-      { "ISO3166-2", "RU-MOW" },
-      { "name", "Москва" },
-      { "note", "эта точка должна быть здесь, в историческом центре Москвы" },
-      { "official_status", "ru:город" },
-      { "okato:user", "none" },
-      { "place", "city" },
-      { "population", "12108257" },
-      { "population:date", "2014-01-01" },
-      { "rank", "0" },
-      { "wikipedia", "ru:Москва" },
+        {"addr:country", "RU"},
+        {"addr:region", "Москва"},
+        {"admin_level", "2"},
+        {"alt_name:vi", "Mạc Tư Khoa"},
+        {"capital", "yes"},
+        {"ele", "156"},
+        {"int_name", "Moscow"},
+        {"is_capital", "country"},
+        {"ISO3166-2", "RU-MOW"},
+        {"name", "Москва"},
+        {"note", "эта точка должна быть здесь, в историческом центре Москвы"},
+        {"official_status", "ru:город"},
+        {"okato:user", "none"},
+        {"place", "city"},
+        {"population", "12108257"},
+        {"population:date", "2014-01-01"},
+        {"rank", "0"},
+        {"wikipedia", "ru:Москва"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -1353,15 +1271,13 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Moscow)
 
 UNIT_CLASS_TEST(TestWithClassificator, OsmType_Translations)
 {
-  Tags const tags = {
-    { "name", "Paris" },
-    { "name:ru", "Париж" },
-    { "name:en", "Paris" },
-    { "name:en:pronunciation", "ˈpæɹ.ɪs" },
-    { "name:fr:pronunciation", "paʁi" },
-    { "place", "city" },
-    { "population", "2243833" }
-  };
+  Tags const tags = {{"name", "Paris"},
+                     {"name:ru", "Париж"},
+                     {"name:en", "Paris"},
+                     {"name:en:pronunciation", "ˈpæɹ.ɪs"},
+                     {"name:fr:pronunciation", "paʁi"},
+                     {"place", "city"},
+                     {"population", "2243833"}};
 
   auto const params = GetFeatureBuilderParams(tags);
 
@@ -1382,7 +1298,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Cuisine)
 {
   {
     Tags const tags = {
-      { "cuisine", "indian ; steak,coffee  shop " },
+        {"cuisine", "indian ; steak,coffee  shop "},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -1397,20 +1313,18 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Cuisine)
 UNIT_CLASS_TEST(TestWithClassificator, OsmType_Hotel)
 {
   using Type = std::vector<std::string>;
-  std::vector<std::pair<std::vector<Type>, Tags>> const types = {
-    {
-      {{"tourism", "hotel"}},
-      {{"tourism", "hotel"}},
-    },
-    {
-      {{"building"}},
-      {{"building", "hotel"}},
-    },
-    {
-      {{"tourism", "hotel"}},
-      {{"hotel", "yes"}},
-    }
-  };
+  std::vector<std::pair<std::vector<Type>, Tags>> const types = {{
+                                                                     {{"tourism", "hotel"}},
+                                                                     {{"tourism", "hotel"}},
+                                                                 },
+                                                                 {
+                                                                     {{"building"}},
+                                                                     {{"building", "hotel"}},
+                                                                 },
+                                                                 {
+                                                                     {{"tourism", "hotel"}},
+                                                                     {{"hotel", "yes"}},
+                                                                 }};
 
   for (auto const & t : types)
   {
@@ -1424,11 +1338,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Hotel)
 UNIT_CLASS_TEST(TestWithClassificator, OsmType_OldName)
 {
   {
-    Tags const tags = {
-      {"highway", "residential"},
-      {"name", "Улица Веткина"},
-      {"old_name", "Царская Ветка"}
-    };
+    Tags const tags = {{"highway", "residential"}, {"name", "Улица Веткина"}, {"old_name", "Царская Ветка"}};
 
     auto const params = GetFeatureBuilderParams(tags);
 
@@ -1462,10 +1372,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_AltName)
 {
   {
     Tags const tags = {
-      {"tourism", "museum"},
-      {"name", "Московский музей современного искусства"},
-      {"alt_name", "MMOMA"}
-    };
+        {"tourism", "museum"}, {"name", "Московский музей современного искусства"}, {"alt_name", "MMOMA"}};
 
     auto const params = GetFeatureBuilderParams(tags);
 
@@ -1477,10 +1384,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_AltName)
   }
   {
     Tags const tags = {
-      {"tourism", "museum"},
-      {"name", "Московский музей современного искусства"},
-      {"alt_name:en", "MMOMA"}
-    };
+        {"tourism", "museum"}, {"name", "Московский музей современного искусства"}, {"alt_name:en", "MMOMA"}};
 
     auto const params = GetFeatureBuilderParams(tags);
 
@@ -1495,11 +1399,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_AltName)
 UNIT_CLASS_TEST(TestWithClassificator, OsmType_NameJaKana)
 {
   {
-    Tags const tags = {
-      {"place", "city"},
-      {"name", "Tokyo"},
-      {"name:ja_kana", "トウキョウト"}
-    };
+    Tags const tags = {{"place", "city"}, {"name", "Tokyo"}, {"name:ja_kana", "トウキョウト"}};
 
     auto const params = GetFeatureBuilderParams(tags);
 
@@ -1510,11 +1410,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_NameJaKana)
     TEST_EQUAL(s, "トウキョウト", ());
   }
   {
-    Tags const tags = {
-      {"place", "city"},
-      {"name", "Tokyo"},
-      {"name:ja-Hira", "とうきょうと"}
-    };
+    Tags const tags = {{"place", "city"}, {"name", "Tokyo"}, {"name:ja-Hira", "とうきょうと"}};
 
     auto const params = GetFeatureBuilderParams(tags);
 
@@ -1527,11 +1423,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_NameJaKana)
   }
   {
     Tags const tags = {
-      {"place", "city"},
-      {"name", "Tokyo"},
-      {"name:ja_kana", "トウキョウト"},
-      {"name:ja-Hira", "とうきょうと"}
-    };
+        {"place", "city"}, {"name", "Tokyo"}, {"name:ja_kana", "トウキョウト"}, {"name:ja-Hira", "とうきょうと"}};
 
     auto const params = GetFeatureBuilderParams(tags);
 
@@ -1544,11 +1436,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_NameJaKana)
   }
   {
     Tags const tags = {
-      {"place", "city"},
-      {"name", "Tokyo"},
-      {"name:ja-Hira", "とうきょうと"},
-      {"name:ja_kana", "トウキョウト"}
-    };
+        {"place", "city"}, {"name", "Tokyo"}, {"name:ja-Hira", "とうきょうと"}, {"name:ja_kana", "トウキョウト"}};
 
     auto const params = GetFeatureBuilderParams(tags);
 
@@ -1735,11 +1623,9 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_NoExit)
 
 UNIT_CLASS_TEST(TestWithClassificator, OsmType_Junctions)
 {
-  for (char const * value : { "yes", "jughandle" })
+  for (char const * value : {"yes", "jughandle"})
   {
-    Tags const tags = {
-        {"junction", value }
-    };
+    Tags const tags = {{"junction", value}};
 
     // Useless now, because they don't have any rules and are not set as an exception.
     auto const params = GetFeatureBuilderParams(tags);
@@ -1752,9 +1638,9 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Recycling)
 {
   {
     Tags const tags = {
-      {"amenity", "recycling" },
-      {"recycling:glass_bottles", "yes"},
-      {"recycling:green_waste", "yes"},
+        {"amenity", "recycling"},
+        {"recycling:glass_bottles", "yes"},
+        {"recycling:green_waste", "yes"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -1767,11 +1653,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Recycling)
 
   {
     Tags const tags = {
-      {"amenity", "recycling" },
-      {"recycling_type", "centre"},
-      {"recycling:garden_waste", "no"},
-      {"recycling:organic", "no"},
-      {"recycling:glass", "yes"},
+        {"amenity", "recycling"},    {"recycling_type", "centre"}, {"recycling:garden_waste", "no"},
+        {"recycling:organic", "no"}, {"recycling:glass", "yes"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -1783,10 +1666,10 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Recycling)
 
   {
     Tags const tags = {
-      {"amenity", "recycling" },
-      {"recycling_type", "container"},
-      {"recycling:metal", "yes"},
-      {"recycling:batteries", "yes"},
+        {"amenity", "recycling"},
+        {"recycling_type", "container"},
+        {"recycling:metal", "yes"},
+        {"recycling:batteries", "yes"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -1813,8 +1696,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Metadata)
 
   {
     Tags const tags = {
-      {"amenity", "restaurant" },
-      {"description:ru", "Хорошие настойки"},
+        {"amenity", "restaurant"},
+        {"description:ru", "Хорошие настойки"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -1826,13 +1709,13 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Metadata)
 
   {
     Tags const tags = {
-      {"amenity", "atm" },
-      {"operator", "Default"},
-      {"operator:en", "English"},
-      {"brand::kk", "KK language"},
-      {"brand:en", "English"},
-      {"description", "Default"},
-      {"description::kk", "KK language"},
+        {"amenity", "atm"},
+        {"operator", "Default"},
+        {"operator:en", "English"},
+        {"brand::kk", "KK language"},
+        {"brand:en", "English"},
+        {"description", "Default"},
+        {"description::kk", "KK language"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -1845,11 +1728,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Metadata)
 
   {
     Tags const tags = {
-      {"amenity", "cafe"},
-      {"internet_access", "wlan"},
-      {"internet_access:password", "corrientes4199"},
-      {"name", "Jimbo"},
-      {"wifi", "corrientes4199"},
+        {"amenity", "cafe"}, {"internet_access", "wlan"}, {"internet_access:password", "corrientes4199"},
+        {"name", "Jimbo"},   {"wifi", "corrientes4199"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -1864,8 +1744,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Vending)
 {
   {
     Tags const tags = {
-      {"amenity", "vending_machine" },
-      {"vending", "parcel_pickup;parcel_mail_in"},
+        {"amenity", "vending_machine"},
+        {"vending", "parcel_pickup;parcel_mail_in"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -1879,8 +1759,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Cliff)
 {
   {
     Tags const tags = {
-      {"cliff", "yes"},
-      {"natural", "ridge" },
+        {"cliff", "yes"},
+        {"natural", "ridge"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -1893,8 +1773,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Organic)
 {
   {
     Tags const tags = {
-      {"organic", "only"},
-      {"amenity", "cafe" },
+        {"organic", "only"},
+        {"amenity", "cafe"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -1906,8 +1786,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Organic)
 
   {
     Tags const tags = {
-      {"organic", "no"},
-      {"shop", "bakery" },
+        {"organic", "no"},
+        {"shop", "bakery"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -1921,9 +1801,9 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Internet)
 {
   {
     Tags const tags = {
-      {"internet_access", "no"},
-      {"wifi", "no"},
-      {"amenity", "cafe"},
+        {"internet_access", "no"},
+        {"wifi", "no"},
+        {"amenity", "cafe"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -1934,8 +1814,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Internet)
 
   {
     Tags const tags = {
-      {"internet_access", "wlan"},
-      {"office", "it"},
+        {"internet_access", "wlan"},
+        {"office", "it"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -1947,29 +1827,29 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_Internet)
 
   {
     Tags const tags = {
-      {"wifi", "free"},
-      {"internet_access", "yes"},
-      {"shop", "clothes"},
+        {"wifi", "free"},
+        {"internet_access", "yes"},
+        {"shop", "clothes"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
 
     TEST_EQUAL(params.m_types.size(), 2, (params));
-    TEST(params.IsTypeExist(GetType({"shop", "clothes" })), (params));
+    TEST(params.IsTypeExist(GetType({"shop", "clothes"})), (params));
     TEST(params.IsTypeExist(GetType({"internet_access", "wlan"})), (params));
   }
 
   {
     Tags const tags = {
-      {"wifi", "no"},
-      {"internet_access", "terminal"},
-      {"amenity", "internet_cafe"},
+        {"wifi", "no"},
+        {"internet_access", "terminal"},
+        {"amenity", "internet_cafe"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
 
     TEST_EQUAL(params.m_types.size(), 2, (params));
-    TEST(params.IsTypeExist(GetType({"amenity", "internet_cafe" })), (params));
+    TEST(params.IsTypeExist(GetType({"amenity", "internet_cafe"})), (params));
     TEST(params.IsTypeExist(GetType({"internet_access"})), (params));
   }
 }
@@ -1979,9 +1859,9 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_MilitaryDanger)
 {
   {
     Tags const tags = {
-      {"landuse", "military"},
-      {"military", "danger_area"},
-      {"wikipedia", "xxx"},
+        {"landuse", "military"},
+        {"military", "danger_area"},
+        {"wikipedia", "xxx"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -1992,9 +1872,9 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_MilitaryDanger)
 
   {
     Tags const tags = {
-      {"landuse", "military"},
-      {"military", "cordon"},
-      {"wikipedia", "xxx"},
+        {"landuse", "military"},
+        {"military", "cordon"},
+        {"wikipedia", "xxx"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -2005,8 +1885,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_MilitaryDanger)
 
   {
     Tags const tags = {
-      {"landuse", "military"},
-      {"military", "danger_area"},
+        {"landuse", "military"},
+        {"military", "danger_area"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -2021,8 +1901,8 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ChargingStation)
 {
   {
     Tags const tags = {
-      {"amenity", "charging_station"},
-      {"motorcar", "no"},
+        {"amenity", "charging_station"},
+        {"motorcar", "no"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -2033,9 +1913,9 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ChargingStation)
 
   {
     Tags const tags = {
-      {"amenity", "charging_station"},
-      {"bicycle", "yes"},
-      {"motorcar", "yes"},
+        {"amenity", "charging_station"},
+        {"bicycle", "yes"},
+        {"motorcar", "yes"},
     };
 
     auto const params = GetFeatureBuilderParams(tags);
@@ -2050,70 +1930,102 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_RailwayRail)
 {
   using Type = std::vector<std::string>;
   std::vector<std::pair<Type, Tags>> const railTypes = {
-    {{"railway", "rail", "highspeed"}, {{"railway", "rail"}, {"highspeed", "positive_value"}}},
-    {{"railway", "rail", "highspeed"}, {{"railway", "rail"}, {"usage", "main"}, {"highspeed", "positive_value"}}},
-    {{"railway", "rail", "tourism"}, {{"railway", "rail"}, {"usage", "tourism"}}},
-    {{"railway", "rail", "main"}, {{"railway", "rail"}, {"usage", "main"}}},
-    {{"railway", "rail", "branch"}, {{"railway", "rail"}, {"usage", "branch"}}},
-    {{"railway", "rail", "branch"}, {{"railway", "rail"}}},
-    {{"railway", "rail", "utility"}, {{"railway", "rail"}, {"usage", "military"}}},
-    {{"railway", "rail", "utility"}, {{"railway", "rail"}, {"usage", "industrial"}, {"service", "spur"}}},
-    {{"railway", "rail", "spur"}, {{"railway", "rail"}, {"service", "spur"}}},
-    {{"railway", "rail", "service"}, {{"railway", "rail"}, {"service", "siding"}}},
-    {{"railway", "rail", "service"}, {{"railway", "rail"}, {"highspeed", "positive_value"}, {"service", "siding"}}},
-    {{"railway", "rail", "service"}, {{"railway", "rail"}, {"usage", "main"}, {"service", "siding"}}},
-    {{"railway", "rail", "service"}, {{"railway", "rail"}, {"usage", "branch"}, {"service", "yard"}}},
-    {{"railway", "rail", "service"}, {{"railway", "rail"}, {"usage", "unsupported_value"}, {"service", "crossover"}}},
-    // TODO: better match to railway-rail-spur:
-    {{"railway", "rail"}, {{"railway", "rail"}, {"usage", "unsupported_value"}}},
-    // TODO: better match following 3 cases to railway-rail-service:
-    {{"railway", "rail"}, {{"railway", "rail"}, {"service", "unsupported_value"}}},
-    {{"railway", "rail"}, {{"railway", "rail"}, {"usage", "main"}, {"service", "unsupported_value"}}},
-    {{"railway", "rail"}, {{"railway", "rail"}, {"usage", "unsupported_value"}, {"service", "unsupported_value"}}},
+      {{"railway", "rail", "highspeed"}, {{"railway", "rail"}, {"highspeed", "positive_value"}}},
+      {{"railway", "rail", "highspeed"}, {{"railway", "rail"}, {"usage", "main"}, {"highspeed", "positive_value"}}},
+      {{"railway", "rail", "tourism"}, {{"railway", "rail"}, {"usage", "tourism"}}},
+      {{"railway", "rail", "main"}, {{"railway", "rail"}, {"usage", "main"}}},
+      {{"railway", "rail", "branch"}, {{"railway", "rail"}, {"usage", "branch"}}},
+      {{"railway", "rail", "branch"}, {{"railway", "rail"}}},
+      {{"railway", "rail", "utility"}, {{"railway", "rail"}, {"usage", "military"}}},
+      {{"railway", "rail", "utility"}, {{"railway", "rail"}, {"usage", "industrial"}, {"service", "spur"}}},
+      {{"railway", "rail", "spur"}, {{"railway", "rail"}, {"service", "spur"}}},
+      {{"railway", "rail", "service"}, {{"railway", "rail"}, {"service", "siding"}}},
+      {{"railway", "rail", "service"}, {{"railway", "rail"}, {"highspeed", "positive_value"}, {"service", "siding"}}},
+      {{"railway", "rail", "service"}, {{"railway", "rail"}, {"usage", "main"}, {"service", "siding"}}},
+      {{"railway", "rail", "service"}, {{"railway", "rail"}, {"usage", "branch"}, {"service", "yard"}}},
+      {{"railway", "rail", "service"}, {{"railway", "rail"}, {"usage", "unsupported_value"}, {"service", "crossover"}}},
+      // TODO: better match to railway-rail-spur:
+      {{"railway", "rail"}, {{"railway", "rail"}, {"usage", "unsupported_value"}}},
+      // TODO: better match following 3 cases to railway-rail-service:
+      {{"railway", "rail"}, {{"railway", "rail"}, {"service", "unsupported_value"}}},
+      {{"railway", "rail"}, {{"railway", "rail"}, {"usage", "main"}, {"service", "unsupported_value"}}},
+      {{"railway", "rail"}, {{"railway", "rail"}, {"usage", "unsupported_value"}, {"service", "unsupported_value"}}},
 
-    // Bridges (note, railway-rail-bridge should be never matched).
-    {{"railway", "rail", "highspeed", "bridge"}, {{"railway", "rail"}, {"highspeed", "positive_value"}, {"bridge", "positive_value"}}},
-    {{"railway", "rail", "highspeed", "bridge"}, {{"railway", "rail"}, {"usage", "main"}, {"highspeed", "positive_value"}, {"bridge", "positive_value"}}},
-    {{"railway", "rail", "tourism", "bridge"}, {{"railway", "rail"}, {"usage", "tourism"}, {"bridge", "positive_value"}}},
-    {{"railway", "rail", "main", "bridge"}, {{"railway", "rail"}, {"usage", "main"}, {"bridge", "positive_value"}}},
-    {{"railway", "rail", "branch", "bridge"}, {{"railway", "rail"}, {"usage", "branch"}, {"bridge", "positive_value"}}},
-    {{"railway", "rail", "branch", "bridge"}, {{"railway", "rail"}, {"bridge", "positive_value"}}},
-    {{"railway", "rail", "utility", "bridge"}, {{"railway", "rail"}, {"usage", "industrial"}, {"bridge", "positive_value"}}},
-    {{"railway", "rail", "utility", "bridge"}, {{"railway", "rail"}, {"usage", "military"}, {"service", "spur"}, {"bridge", "positive_value"}}},
-    {{"railway", "rail", "spur", "bridge"}, {{"railway", "rail"}, {"service", "spur"}, {"bridge", "positive_value"}}},
-    {{"railway", "rail", "service", "bridge"}, {{"railway", "rail"}, {"service", "yard"}, {"bridge", "positive_value"}}},
-    {{"railway", "rail", "service", "bridge"}, {{"railway", "rail"}, {"highspeed", "positive_value"}, {"service", "siding"}, {"bridge", "positive_value"}}},
-    {{"railway", "rail", "service", "bridge"}, {{"railway", "rail"}, {"usage", "main"}, {"service", "yard"}, {"bridge", "positive_value"}}},
-    {{"railway", "rail", "service", "bridge"}, {{"railway", "rail"}, {"usage", "branch"}, {"service", "crossover"}, {"bridge", "positive_value"}}},
-    {{"railway", "rail", "service", "bridge"}, {{"railway", "rail"}, {"usage", "unsupported_value"}, {"service", "siding"}, {"bridge", "positive_value"}}},
-    // TODO: better match to railway-rail-spur-bridge:
-    {{"railway", "rail"}, {{"railway", "rail"}, {"usage", "unsupported_value"}, {"bridge", "positive_value"}}},
-    // TODO: better match following 3 cases to railway-rail-service-bridge:
-    {{"railway", "rail"}, {{"railway", "rail"}, {"service", "unsupported_value"}, {"bridge", "positive_value"}}},
-    {{"railway", "rail"}, {{"railway", "rail"}, {"usage", "main"}, {"service", "unsupported_value"}, {"bridge", "positive_value"}}},
-    {{"railway", "rail"}, {{"railway", "rail"}, {"usage", "unsupported_value"}, {"service", "unsupported_value"}, {"bridge", "positive_value"}}},
+      // Bridges (note, railway-rail-bridge should be never matched).
+      {{"railway", "rail", "highspeed", "bridge"},
+       {{"railway", "rail"}, {"highspeed", "positive_value"}, {"bridge", "positive_value"}}},
+      {{"railway", "rail", "highspeed", "bridge"},
+       {{"railway", "rail"}, {"usage", "main"}, {"highspeed", "positive_value"}, {"bridge", "positive_value"}}},
+      {{"railway", "rail", "tourism", "bridge"},
+       {{"railway", "rail"}, {"usage", "tourism"}, {"bridge", "positive_value"}}},
+      {{"railway", "rail", "main", "bridge"}, {{"railway", "rail"}, {"usage", "main"}, {"bridge", "positive_value"}}},
+      {{"railway", "rail", "branch", "bridge"},
+       {{"railway", "rail"}, {"usage", "branch"}, {"bridge", "positive_value"}}},
+      {{"railway", "rail", "branch", "bridge"}, {{"railway", "rail"}, {"bridge", "positive_value"}}},
+      {{"railway", "rail", "utility", "bridge"},
+       {{"railway", "rail"}, {"usage", "industrial"}, {"bridge", "positive_value"}}},
+      {{"railway", "rail", "utility", "bridge"},
+       {{"railway", "rail"}, {"usage", "military"}, {"service", "spur"}, {"bridge", "positive_value"}}},
+      {{"railway", "rail", "spur", "bridge"}, {{"railway", "rail"}, {"service", "spur"}, {"bridge", "positive_value"}}},
+      {{"railway", "rail", "service", "bridge"},
+       {{"railway", "rail"}, {"service", "yard"}, {"bridge", "positive_value"}}},
+      {{"railway", "rail", "service", "bridge"},
+       {{"railway", "rail"}, {"highspeed", "positive_value"}, {"service", "siding"}, {"bridge", "positive_value"}}},
+      {{"railway", "rail", "service", "bridge"},
+       {{"railway", "rail"}, {"usage", "main"}, {"service", "yard"}, {"bridge", "positive_value"}}},
+      {{"railway", "rail", "service", "bridge"},
+       {{"railway", "rail"}, {"usage", "branch"}, {"service", "crossover"}, {"bridge", "positive_value"}}},
+      {{"railway", "rail", "service", "bridge"},
+       {{"railway", "rail"}, {"usage", "unsupported_value"}, {"service", "siding"}, {"bridge", "positive_value"}}},
+      // TODO: better match to railway-rail-spur-bridge:
+      {{"railway", "rail"}, {{"railway", "rail"}, {"usage", "unsupported_value"}, {"bridge", "positive_value"}}},
+      // TODO: better match following 3 cases to railway-rail-service-bridge:
+      {{"railway", "rail"}, {{"railway", "rail"}, {"service", "unsupported_value"}, {"bridge", "positive_value"}}},
+      {{"railway", "rail"},
+       {{"railway", "rail"}, {"usage", "main"}, {"service", "unsupported_value"}, {"bridge", "positive_value"}}},
+      {{"railway", "rail"},
+       {{"railway", "rail"},
+        {"usage", "unsupported_value"},
+        {"service", "unsupported_value"},
+        {"bridge", "positive_value"}}},
 
-    // Tunnels (note, railway-rail-tunnel should be never matched).
-    {{"railway", "rail", "highspeed", "tunnel"}, {{"railway", "rail"}, {"highspeed", "positive_value"}, {"tunnel", "positive_value"}}},
-    {{"railway", "rail", "highspeed", "tunnel"}, {{"railway", "rail"}, {"usage", "main"}, {"highspeed", "positive_value"}, {"tunnel", "positive_value"}}},
-    {{"railway", "rail", "tourism", "tunnel"}, {{"railway", "rail"}, {"usage", "tourism"}, {"tunnel", "positive_value"}}},
-    {{"railway", "rail", "main", "tunnel"}, {{"railway", "rail"}, {"usage", "main"}, {"tunnel", "positive_value"}}},
-    {{"railway", "rail", "branch", "tunnel"}, {{"railway", "rail"}, {"usage", "branch"}, {"tunnel", "positive_value"}}},
-    {{"railway", "rail", "branch", "tunnel"}, {{"railway", "rail"}, {"tunnel", "positive_value"}}},
-    {{"railway", "rail", "utility", "tunnel"}, {{"railway", "rail"}, {"usage", "industrial"}, {"tunnel", "positive_value"}}},
-    {{"railway", "rail", "utility", "tunnel"}, {{"railway", "rail"}, {"usage", "military"}, {"service", "spur"}, {"tunnel", "positive_value"}}},
-    {{"railway", "rail", "spur", "tunnel"}, {{"railway", "rail"}, {"service", "spur"}, {"tunnel", "positive_value"}}},
-    {{"railway", "rail", "service", "tunnel"}, {{"railway", "rail"}, {"service", "yard"}, {"tunnel", "positive_value"}}},
-    {{"railway", "rail", "service", "tunnel"}, {{"railway", "rail"}, {"highspeed", "positive_value"}, {"service", "siding"}, {"tunnel", "positive_value"}}},
-    {{"railway", "rail", "service", "tunnel"}, {{"railway", "rail"}, {"usage", "main"}, {"service", "yard"}, {"tunnel", "positive_value"}}},
-    {{"railway", "rail", "service", "tunnel"}, {{"railway", "rail"}, {"usage", "branch"}, {"service", "crossover"}, {"tunnel", "positive_value"}}},
-    {{"railway", "rail", "service", "tunnel"}, {{"railway", "rail"}, {"usage", "unsupported_value"}, {"service", "siding"}, {"tunnel", "positive_value"}}},
-    // TODO: better match to railway-rail-spur-tunnel:
-    {{"railway", "rail"}, {{"railway", "rail"}, {"usage", "unsupported_value"}, {"tunnel", "positive_value"}}},
-    // TODO: better match following 3 cases to railway-rail-service-tunnel:
-    {{"railway", "rail"}, {{"railway", "rail"}, {"service", "unsupported_value"}, {"tunnel", "positive_value"}}},
-    {{"railway", "rail"}, {{"railway", "rail"}, {"usage", "main"}, {"service", "unsupported_value"}, {"tunnel", "positive_value"}}},
-    {{"railway", "rail"}, {{"railway", "rail"}, {"usage", "unsupported_value"}, {"service", "unsupported_value"}, {"tunnel", "positive_value"}}},
+      // Tunnels (note, railway-rail-tunnel should be never matched).
+      {{"railway", "rail", "highspeed", "tunnel"},
+       {{"railway", "rail"}, {"highspeed", "positive_value"}, {"tunnel", "positive_value"}}},
+      {{"railway", "rail", "highspeed", "tunnel"},
+       {{"railway", "rail"}, {"usage", "main"}, {"highspeed", "positive_value"}, {"tunnel", "positive_value"}}},
+      {{"railway", "rail", "tourism", "tunnel"},
+       {{"railway", "rail"}, {"usage", "tourism"}, {"tunnel", "positive_value"}}},
+      {{"railway", "rail", "main", "tunnel"}, {{"railway", "rail"}, {"usage", "main"}, {"tunnel", "positive_value"}}},
+      {{"railway", "rail", "branch", "tunnel"},
+       {{"railway", "rail"}, {"usage", "branch"}, {"tunnel", "positive_value"}}},
+      {{"railway", "rail", "branch", "tunnel"}, {{"railway", "rail"}, {"tunnel", "positive_value"}}},
+      {{"railway", "rail", "utility", "tunnel"},
+       {{"railway", "rail"}, {"usage", "industrial"}, {"tunnel", "positive_value"}}},
+      {{"railway", "rail", "utility", "tunnel"},
+       {{"railway", "rail"}, {"usage", "military"}, {"service", "spur"}, {"tunnel", "positive_value"}}},
+      {{"railway", "rail", "spur", "tunnel"}, {{"railway", "rail"}, {"service", "spur"}, {"tunnel", "positive_value"}}},
+      {{"railway", "rail", "service", "tunnel"},
+       {{"railway", "rail"}, {"service", "yard"}, {"tunnel", "positive_value"}}},
+      {{"railway", "rail", "service", "tunnel"},
+       {{"railway", "rail"}, {"highspeed", "positive_value"}, {"service", "siding"}, {"tunnel", "positive_value"}}},
+      {{"railway", "rail", "service", "tunnel"},
+       {{"railway", "rail"}, {"usage", "main"}, {"service", "yard"}, {"tunnel", "positive_value"}}},
+      {{"railway", "rail", "service", "tunnel"},
+       {{"railway", "rail"}, {"usage", "branch"}, {"service", "crossover"}, {"tunnel", "positive_value"}}},
+      {{"railway", "rail", "service", "tunnel"},
+       {{"railway", "rail"}, {"usage", "unsupported_value"}, {"service", "siding"}, {"tunnel", "positive_value"}}},
+      // TODO: better match to railway-rail-spur-tunnel:
+      {{"railway", "rail"}, {{"railway", "rail"}, {"usage", "unsupported_value"}, {"tunnel", "positive_value"}}},
+      // TODO: better match following 3 cases to railway-rail-service-tunnel:
+      {{"railway", "rail"}, {{"railway", "rail"}, {"service", "unsupported_value"}, {"tunnel", "positive_value"}}},
+      {{"railway", "rail"},
+       {{"railway", "rail"}, {"usage", "main"}, {"service", "unsupported_value"}, {"tunnel", "positive_value"}}},
+      {{"railway", "rail"},
+       {{"railway", "rail"},
+        {"usage", "unsupported_value"},
+        {"service", "unsupported_value"},
+        {"tunnel", "positive_value"}}},
   };
 
   for (auto const & type : railTypes)
@@ -2127,607 +2039,607 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_RailwayRail)
 UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
 {
   Tags const oneTypes = {
-    // Filtered out by MatchTypes filter because have no styles.
-    // {"aeroway", "apron"},
-    // {"area:highway", "cycleway"},
-    // {"area:highway", "motorway"},
-    // {"area:highway", "path"},
-    // {"area:highway", "primary"},
-    // {"area:highway", "residential"},
-    // {"area:highway", "secondary"},
-    // {"area:highway", "service"},
-    // {"area:highway", "steps"},
-    // {"area:highway", "tertiary"},
-    // {"area:highway", "track"},
-    // {"area:highway", "trunk"},
-    // {"area:highway", "unclassified"},
-    {"barrier", "cycle_barrier"},
-    // {"boundary", "administrative"},
-    // {"communication", "line"},
-    // {"earthquake:damage", "spontaneous_camp"},
-    // {"highway", "traffic_signals"},
-    // {"historic", "battlefield"},
-    // {"landuse", "brownfield"},
-    // {"landuse", "farmyard"},
-    // {"landuse", "greenfield"},
-    // {"landuse", "greenhouse_horticulture"},
-    // {"landuse", "retail"},
-    // {"man_made", "pipeline"},
-    // {"man_made", "surveillance"},
-    // {"man_made", "wastewater_plant"},
-    // {"mapswithme", "grid"},
-    // {"military", "bunker"},
-    // {"natural", "cliff"},
-    // {"natural", "meadow"},
-    // {"natural", "orchard"},
-    // {"natural", "tree"},
-    // {"natural", "tree_row"},
-    // {"natural", "vineyard"},
-    // {"noexit"},
-    // {"place", "county"},
-    // {"railway", "crossing"},
-    // {"railway", "razed"},
-    // {"railway", "siding"},
-    // {"railway", "spur"},
-    // {"railway", "subway"},
-    // {"traffic_calming", "bump"},
-    // {"traffic_calming", "hump"},
-    {"addr:interpolation", "even"},
-    {"addr:interpolation", "odd"},
-    {"aerialway", "cable_car"},
-    {"aerialway", "chair_lift"},
-    {"aerialway", "drag_lift"},
-    {"aerialway", "gondola"},
-    {"aerialway", "mixed_lift"},
-    {"aerialway", "station"},
-    {"aeroway", "aerodrome"},
-    {"aeroway", "gate"},
-    {"aeroway", "helipad"},
-    {"aeroway", "runway"},
-    {"aeroway", "taxiway"},
-    {"aeroway", "terminal"},
-    {"amenity", "arts_centre"},
-    {"amenity", "atm"},
-    {"amenity", "bank"},
-    {"amenity", "bar"},
-    {"amenity", "bbq"},
-    {"amenity", "bench"},
-    {"amenity", "bicycle_parking"},
-    {"amenity", "bicycle_rental"},
-    {"amenity", "biergarten"},
-    {"amenity", "brothel"},
-    {"amenity", "love_hotel"},
-    {"amenity", "bureau_de_change"},
-    {"amenity", "bus_station"},
-    {"amenity", "cafe"},
-    {"amenity", "car_rental"},
-    {"amenity", "car_sharing"},
-    {"amenity", "car_wash"},
-    {"amenity", "casino"},
-    {"amenity", "charging_station"},
-    {"amenity", "childcare"},
-    {"amenity", "cinema"},
-    {"amenity", "studio"},
-    {"amenity", "clinic"},
-    {"amenity", "college"},
-    {"amenity", "community_centre"},
-    {"amenity", "courthouse"},
-    {"amenity", "dentist"},
-    {"amenity", "doctors"},
-    {"amenity", "drinking_water"},
-    {"amenity", "driving_school"},
-    {"amenity", "fast_food"},
-    {"amenity", "ferry_terminal"},
-    {"amenity", "fire_station"},
-    {"amenity", "food_court"},
-    {"amenity", "fountain"},
-    {"amenity", "fuel"},
-    {"amenity", "grave_yard"},
-    {"amenity", "hospital"},
-    {"amenity", "hunting_stand"},
-    {"amenity", "ice_cream"},
-    {"amenity", "internet_cafe"},
-    {"amenity", "kindergarten"},
-    {"amenity", "library"},
-    {"amenity", "marketplace"},
-    {"amenity", "motorcycle_parking"},
-    {"amenity", "motorcycle_rental"},
-    {"amenity", "nightclub"},
-    {"amenity", "nursing_home"},
-    {"amenity", "parking"},
-    {"amenity", "parking_space"},
-    {"amenity", "payment_terminal"},
-    {"amenity", "pharmacy"},
-    {"amenity", "place_of_worship"},
-    {"amenity", "police"},
-    {"amenity", "post_box"},
-    {"amenity", "post_office"},
-    {"amenity", "prison"},
-    {"amenity", "pub"},
-    {"amenity", "public_bookcase"},
-    {"amenity", "restaurant"},
-    {"amenity", "school"},
-    {"amenity", "shelter"},
-    {"amenity", "shower"},
-    {"amenity", "taxi"},
-    {"amenity", "telephone"},
-    {"amenity", "theatre"},
-    {"amenity", "toilets"},
-    {"amenity", "townhall"},
-    {"amenity", "university"},
-    {"amenity", "veterinary"},
-    {"amenity", "waste_basket"},
-    {"amenity", "waste_disposal"},
-    {"amenity", "water_point"},
-    {"area:highway", "footway"},
-    {"area:highway", "living_street"},
-    {"area:highway", "pedestrian"},
-    {"barrier", "block"},
-    {"barrier", "bollard"},
-    {"barrier", "border_control"},
-    {"barrier", "chain"},
-    {"barrier", "city_wall"},
-    {"barrier", "entrance"},
-    {"barrier", "fence"},
-    {"barrier", "gate"},
-    {"barrier", "hedge"},
-    {"barrier", "lift_gate"},
-    {"barrier", "retaining_wall"},
-    {"barrier", "stile"},
-    {"barrier", "swing_gate"},
-    {"barrier", "toll_booth"},
-    {"barrier", "wall"},
-    {"boundary", "national_park"},
-    {"boundary", "protected_area"},
-    {"building", "has_parts"},
-    {"building", "train_station"},
-    {"cemetery", "grave"},
-    {"craft", "beekeeper"},
-    {"craft", "blacksmith"},
-    {"craft", "brewery"},
-    {"craft", "carpenter"},
-    {"craft", "confectionery"},
-    {"craft", "electrician"},
-    {"craft", "electronics_repair"},
-    {"craft", "gardener"},
-    {"craft", "handicraft"},
-    {"craft", "hvac"},
-    {"craft", "metal_construction"},
-    {"craft", "painter"},
-    {"craft", "photographer"},
-    {"craft", "plumber"},
-    {"craft", "sawmill"},
-    {"craft", "shoemaker"},
-    {"craft", "tailor"},
-    {"craft", "winery"},
-    {"cuisine", "african"},
-    {"cuisine", "american"},
-    {"cuisine", "arab"},
-    {"cuisine", "argentinian"},
-    {"cuisine", "asian"},
-    {"cuisine", "austrian"},
-    {"cuisine", "bagel"},
-    {"cuisine", "balkan"},
-    {"cuisine", "barbecue"},
-    {"cuisine", "bavarian"},
-    {"cuisine", "beef_bowl"},
-    {"cuisine", "brazilian"},
-    {"cuisine", "breakfast"},
-    {"cuisine", "burger"},
-    {"cuisine", "buschenschank"},
-    {"cuisine", "cake"},
-    {"cuisine", "caribbean"},
-    {"cuisine", "chicken"},
-    {"cuisine", "chinese"},
-    {"cuisine", "coffee_shop"},
-    {"cuisine", "crepe"},
-    {"cuisine", "croatian"},
-    {"cuisine", "curry"},
-    {"cuisine", "deli"},
-    {"cuisine", "diner"},
-    {"cuisine", "donut"},
-    {"cuisine", "ethiopian"},
-    {"cuisine", "filipino"},
-    {"cuisine", "fine_dining"},
-    {"cuisine", "fish"},
-    {"cuisine", "fish_and_chips"},
-    {"cuisine", "french"},
-    {"cuisine", "friture"},
-    {"cuisine", "georgian"},
-    {"cuisine", "german"},
-    {"cuisine", "greek"},
-    {"cuisine", "grill"},
-    {"cuisine", "heuriger"},
-    {"cuisine", "hotdog"},
-    {"cuisine", "hungarian"},
-    {"cuisine", "ice_cream"},
-    {"cuisine", "indian"},
-    {"cuisine", "indonesian"},
-    {"cuisine", "international"},
-    {"cuisine", "irish"},
-    {"cuisine", "italian"},
-    {"cuisine", "italian_pizza"},
-    {"cuisine", "japanese"},
-    {"cuisine", "kebab"},
-    {"cuisine", "korean"},
-    {"cuisine", "lao"},
-    {"cuisine", "lebanese"},
-    {"cuisine", "local"},
-    {"cuisine", "malagasy"},
-    {"cuisine", "malaysian"},
-    {"cuisine", "mediterranean"},
-    {"cuisine", "mexican"},
-    {"cuisine", "moroccan"},
-    {"cuisine", "noodles"},
-    {"cuisine", "oriental"},
-    {"cuisine", "pancake"},
-    {"cuisine", "pasta"},
-    {"cuisine", "persian"},
-    {"cuisine", "peruvian"},
-    {"cuisine", "pizza"},
-    {"cuisine", "polish"},
-    {"cuisine", "portuguese"},
-    {"cuisine", "ramen"},
-    {"cuisine", "regional"},
-    {"cuisine", "russian"},
-    {"cuisine", "sandwich"},
-    {"cuisine", "sausage"},
-    {"cuisine", "savory_pancakes"},
-    {"cuisine", "seafood"},
-    {"cuisine", "soba"},
-    {"cuisine", "spanish"},
-    {"cuisine", "steak_house"},
-    {"cuisine", "sushi"},
-    {"cuisine", "tapas"},
-    {"cuisine", "tea"},
-    {"cuisine", "thai"},
-    {"cuisine", "turkish"},
-    {"cuisine", "vegan"},
-    {"cuisine", "vegetarian"},
-    {"cuisine", "vietnamese"},
-    {"emergency", "defibrillator"},
-    {"emergency", "fire_hydrant"},
-    {"emergency", "lifeguard"},
-    {"emergency", "mountain_rescue"},
-    {"emergency", "phone"},
-    {"fee", "no"},
-    {"fee", "yes"},
-    {"highway", "bridleway"},
-    {"highway", "busway"},
-    {"highway", "bus_stop"},
-    {"highway", "construction"},
-    {"highway", "cycleway"},
-    {"highway", "footway"},
-    {"highway", "ford"},
-    {"highway", "living_street"},
-    {"highway", "motorway"},
-    {"highway", "motorway_junction"},
-    {"highway", "motorway_link"},
-    {"highway", "path"},
-    {"highway", "pedestrian"},
-    {"highway", "primary"},
-    {"highway", "primary_link"},
-    {"highway", "raceway"},
-    {"highway", "residential"},
-    {"highway", "rest_area"},
-    {"highway", "road"},
-    {"highway", "secondary"},
-    {"highway", "secondary_link"},
-    {"highway", "service"},
-    {"highway", "services"},
-    {"highway", "speed_camera"},
-    {"highway", "steps"},
-    {"highway", "tertiary"},
-    {"highway", "tertiary_link"},
-    {"highway", "track"},
-    {"highway", "trunk"},
-    {"highway", "trunk_link"},
-    {"highway", "unclassified"},
-    {"highway", "world_level"},
-    {"highway", "world_towns_level"},
-    {"historic", "archaeological_site"},
-    {"historic", "boundary_stone"},
-    {"historic", "castle"},
-    {"historic", "city_gate"},
-    {"historic", "citywalls"},
-    {"historic", "fort"},
-    {"historic", "memorial"},
-    {"historic", "monument"},
-    {"historic", "ruins"},
-    {"historic", "ship"},
-    {"historic", "tomb"},
-    {"historic", "wayside_cross"},
-    {"historic", "wayside_shrine"},
-    {"hwtag", "bidir_bicycle"},
-    {"hwtag", "lit"},
-    {"hwtag", "nobicycle"},
-    {"hwtag", "nocar"},
-    {"hwtag", "nofoot"},
-    {"hwtag", "oneway"},
-    {"hwtag", "private"},
-    {"hwtag", "toll"},
-    {"hwtag", "yesbicycle"},
-    {"hwtag", "yescar"},
-    {"hwtag", "yesfoot"},
-    {"internet_access", "wlan"},
-    {"junction", "circular"},
-    {"junction", "roundabout"},
-    {"landuse", "allotments"},
-    {"landuse", "basin"},
-    {"landuse", "cemetery"},
-    {"landuse", "commercial"},
-    {"landuse", "construction"},
-    {"landuse", "farmland"},
-    {"landuse", "garages"},
-    {"landuse", "grass"},
-    {"landuse", "industrial"},
-    {"landuse", "landfill"},
-    {"landuse", "meadow"},
-    {"landuse", "military"},
-    {"landuse", "orchard"},
-    {"landuse", "quarry"},
-    {"landuse", "railway"},
-    {"landuse", "recreation_ground"},
-    {"landuse", "religious"},
-    {"landuse", "reservoir"},
-    {"landuse", "residential"},
-    {"landuse", "salt_pond"},
-    {"landuse", "village_green"},
-    {"landuse", "vineyard"},
-    {"leisure", "common"},
-    {"leisure", "dog_park"},
-    {"leisure", "fitness_centre"},
-    {"leisure", "fitness_station"},
-    {"leisure", "garden"},
-    {"leisure", "firepit"},
-    {"leisure", "golf_course"},
-    {"leisure", "ice_rink"},
-    {"leisure", "marina"},
-    {"leisure", "nature_reserve"},
-    {"leisure", "park"},
-    {"leisure", "pitch"},
-    {"leisure", "playground"},
-    {"leisure", "recreation_ground"},
-    {"leisure", "resort"},
-    {"leisure", "sauna"},
-    {"leisure", "slipway"},
-    {"leisure", "sports_centre"},
-    {"leisure", "dance"},
-    {"leisure", "stadium"},
-    {"leisure", "swimming_pool"},
-    {"leisure", "track"},
-    {"leisure", "water_park"},
-    {"man_made", "breakwater"},
-    {"man_made", "cairn"},
-    {"man_made", "chimney"},
-    {"man_made", "communications_tower"},
-    {"man_made", "cross"},
-    {"man_made", "cutline"},
-    {"man_made", "embankment"},
-    {"man_made", "flare"},
-    {"man_made", "lighthouse"},
-    {"man_made", "petroleum_well"},
-    {"man_made", "pier"},
-    {"man_made", "survey_point"},
-    {"man_made", "silo"},
-    {"man_made", "storage_tank"},
-    {"man_made", "tower"},
-    // {"man_made", "utility_pole"}, // In the outdoor style only.
-    {"man_made", "water_tap"},
-    {"man_made", "water_tower"},
-    {"man_made", "water_well"},
-    {"man_made", "windmill"},
-    {"man_made", "works"},
-    {"natural", "bare_rock"},
-    {"natural", "bay"},
-    {"natural", "beach"},
-    {"natural", "cape"},
-    {"natural", "cave_entrance"},
-    {"natural", "cliff"},
-    {"natural", "coastline"},
-    {"natural", "desert"},
-    {"natural", "earth_bank"},
-    {"natural", "geyser"},
-    {"natural", "glacier"},
-    {"natural", "grassland"},
-    {"natural", "heath"},
-    {"natural", "hot_spring"},
-    {"natural", "land"},
-    {"natural", "peak"},
-    {"natural", "rock"},
-    {"natural", "saddle"},
-    {"natural", "scrub"},
-    {"natural", "spring"},
-    {"natural", "volcano"},
-    {"natural", "water"},
-    {"natural", "wetland"},
-    {"office", "company"},
-    {"office", "diplomatic"},
-    {"office", "estate_agent"},
-    {"office", "government"},
-    {"office", "insurance"},
-    {"office", "lawyer"},
-    {"office", "ngo"},
-    {"office", "telecommunication"},
-    {"organic", "only"},
-    {"organic", "yes"},
-    {"aerialway", "j-bar"},
-    {"aerialway", "magic_carpet"},
-    {"aerialway", "platter"},
-    {"aerialway", "rope_tow"},
-    {"aerialway", "t-bar"},
-    {"piste:type", "downhill"},
-    {"piste:type", "nordic"},
-    {"piste:type", "sled"},
-    {"place", "city"},
-    {"place", "continent"},
-    {"place", "country"},
-    {"place", "farm"},
-    {"place", "hamlet"},
-    {"place", "island"},
-    {"place", "islet"},
-    {"place", "isolated_dwelling"},
-    {"place", "locality"},
-    {"place", "neighbourhood"},
-    {"place", "ocean"},
-    {"place", "region"},
-    {"place", "sea"},
-    {"place", "square"},
-    {"place", "state"},
-    {"place", "suburb"},
-    {"place", "town"},
-    {"place", "village"},
-    {"power", "generator"},
-    {"power", "line"},
-    {"power", "minor_line"},
-    {"power", "pole"},
-    {"power", "station"},
-    {"power", "substation"},
-    {"power", "tower"},
-    {"psurface", "paved_bad"},
-    {"psurface", "paved_good"},
-    {"psurface", "unpaved_bad"},
-    {"psurface", "unpaved_good"},
-    {"public_transport", "platform"},
-    {"railway", "abandoned"},
-    {"railway", "construction"},
-    {"railway", "disused"},
-    {"railway", "funicular"},
-    {"railway", "halt"},
-    {"railway", "level_crossing"},
-    {"railway", "light_rail"},
-    {"railway", "monorail"},
-    {"railway", "narrow_gauge"},
-    {"railway", "platform"},
-    {"railway", "preserved"},
-    {"railway", "station"},
-    {"railway", "subway_entrance"},
-    {"railway", "tram"},
-    {"railway", "tram_stop"},
-    {"shop", "alcohol"},
-    {"shop", "bakery"},
-    {"shop", "beauty"},
-    {"shop", "beverages"},
-    {"shop", "bicycle"},
-    {"shop", "bookmaker"},
-    {"shop", "books"},
-    {"shop", "butcher"},
-    {"shop", "car"},
-    {"shop", "car_parts"},
-    {"shop", "car_repair"},
-    {"shop", "chemist"},
-    {"shop", "chocolate"},
-    {"shop", "coffee"},
-    {"shop", "computer"},
-    {"shop", "confectionery"},
-    {"shop", "convenience"},
-    {"shop", "copyshop"},
-    {"shop", "cosmetics"},
-    {"shop", "deli"},
-    {"shop", "department_store"},
-    {"shop", "doityourself"},
-    {"shop", "dry_cleaning"},
-    {"shop", "electronics"},
-    {"shop", "erotic"},
-    {"shop", "fabric"},
-    {"shop", "farm"},
-    {"shop", "florist"},
-    {"shop", "funeral_directors"},
-    {"shop", "furniture"},
-    {"shop", "garden_centre"},
-    {"shop", "gift"},
-    {"shop", "greengrocer"},
-    {"shop", "grocery"},
-    {"shop", "hairdresser"},
-    {"shop", "hardware"},
-    {"shop", "houseware"},
-    {"shop", "health_food"},
-    {"shop", "jewelry"},
-    {"shop", "kiosk"},
-    {"shop", "kitchen"},
-    {"shop", "laundry"},
-    {"shop", "mall"},
-    {"shop", "massage"},
-    {"shop", "mobile_phone"},
-    {"shop", "money_lender"},
-    {"shop", "motorcycle"},
-    {"shop", "music"},
-    {"shop", "musical_instrument"},
-    {"shop", "newsagent"},
-    {"shop", "optician"},
-    {"shop", "outdoor"},
-    {"shop", "pastry"},
-    {"shop", "pawnbroker"},
-    {"shop", "pet"},
-    {"shop", "photo"},
-    {"shop", "seafood"},
-    {"shop", "second_hand"},
-    {"shop", "sewing"},
-    {"shop", "shoes"},
-    {"shop", "sports"},
-    {"shop", "stationery"},
-    {"shop", "supermarket"},
-    {"shop", "tattoo"},
-    {"shop", "tea"},
-    {"shop", "ticket"},
-    {"shop", "toys"},
-    {"shop", "travel_agency"},
-    {"shop", "tyres"},
-    {"shop", "variety_store"},
-    {"shop", "video"},
-    {"shop", "wine"},
-    {"sport", "american_football"},
-    {"sport", "archery"},
-    {"sport", "athletics"},
-    {"sport", "australian_football"},
-    {"sport", "baseball"},
-    {"sport", "basketball"},
-    {"sport", "bowls"},
-    {"sport", "cricket"},
-    {"sport", "curling"},
-    {"sport", "diving"},
-    {"sport", "equestrian"},
-    {"sport", "gymnastics"},
-    {"sport", "handball"},
-    {"sport", "multi"},
-    {"sport", "scuba_diving"},
-    {"sport", "shooting"},
-    {"sport", "skiing"},
-    {"sport", "soccer"},
-    {"sport", "swimming"},
-    {"sport", "tennis"},
-    {"tourism", "alpine_hut"},
-    {"tourism", "apartment"},
-    {"tourism", "artwork"},
-    {"tourism", "attraction"},
-    {"tourism", "camp_site"},
-    {"tourism", "caravan_site"},
-    {"tourism", "chalet"},
-    {"tourism", "gallery"},
-    {"tourism", "guest_house"},
-    {"tourism", "hostel"},
-    {"tourism", "hotel"},
-    {"tourism", "information"},
-    {"tourism", "motel"},
-    {"tourism", "museum"},
-    {"tourism", "picnic_site"},
-    {"tourism", "theme_park"},
-    {"tourism", "viewpoint"},
-    {"tourism", "wilderness_hut"},
-    {"tourism", "zoo"},
-    {"waterway", "canal"},
-    {"waterway", "dam"},
-    {"waterway", "ditch"},
-    {"waterway", "dock"},
-    {"waterway", "drain"},
-    {"waterway", "lock_gate"},
-    {"waterway", "river"},
-    {"waterway", "stream"},
-    {"waterway", "waterfall"},
-    {"waterway", "weir"},
-    {"wheelchair", "limited"},
-    {"wheelchair", "no"},
-    {"wheelchair", "yes"},
+      // Filtered out by MatchTypes filter because have no styles.
+      // {"aeroway", "apron"},
+      // {"area:highway", "cycleway"},
+      // {"area:highway", "motorway"},
+      // {"area:highway", "path"},
+      // {"area:highway", "primary"},
+      // {"area:highway", "residential"},
+      // {"area:highway", "secondary"},
+      // {"area:highway", "service"},
+      // {"area:highway", "steps"},
+      // {"area:highway", "tertiary"},
+      // {"area:highway", "track"},
+      // {"area:highway", "trunk"},
+      // {"area:highway", "unclassified"},
+      {"barrier", "cycle_barrier"},
+      // {"boundary", "administrative"},
+      // {"communication", "line"},
+      // {"earthquake:damage", "spontaneous_camp"},
+      // {"highway", "traffic_signals"},
+      // {"historic", "battlefield"},
+      // {"landuse", "brownfield"},
+      // {"landuse", "farmyard"},
+      // {"landuse", "greenfield"},
+      // {"landuse", "greenhouse_horticulture"},
+      // {"landuse", "retail"},
+      // {"man_made", "pipeline"},
+      // {"man_made", "surveillance"},
+      // {"man_made", "wastewater_plant"},
+      // {"mapswithme", "grid"},
+      // {"military", "bunker"},
+      // {"natural", "cliff"},
+      // {"natural", "meadow"},
+      // {"natural", "orchard"},
+      // {"natural", "tree"},
+      // {"natural", "tree_row"},
+      // {"natural", "vineyard"},
+      // {"noexit"},
+      // {"place", "county"},
+      // {"railway", "crossing"},
+      // {"railway", "razed"},
+      // {"railway", "siding"},
+      // {"railway", "spur"},
+      // {"railway", "subway"},
+      // {"traffic_calming", "bump"},
+      // {"traffic_calming", "hump"},
+      {"addr:interpolation", "even"},
+      {"addr:interpolation", "odd"},
+      {"aerialway", "cable_car"},
+      {"aerialway", "chair_lift"},
+      {"aerialway", "drag_lift"},
+      {"aerialway", "gondola"},
+      {"aerialway", "mixed_lift"},
+      {"aerialway", "station"},
+      {"aeroway", "aerodrome"},
+      {"aeroway", "gate"},
+      {"aeroway", "helipad"},
+      {"aeroway", "runway"},
+      {"aeroway", "taxiway"},
+      {"aeroway", "terminal"},
+      {"amenity", "arts_centre"},
+      {"amenity", "atm"},
+      {"amenity", "bank"},
+      {"amenity", "bar"},
+      {"amenity", "bbq"},
+      {"amenity", "bench"},
+      {"amenity", "bicycle_parking"},
+      {"amenity", "bicycle_rental"},
+      {"amenity", "biergarten"},
+      {"amenity", "brothel"},
+      {"amenity", "love_hotel"},
+      {"amenity", "bureau_de_change"},
+      {"amenity", "bus_station"},
+      {"amenity", "cafe"},
+      {"amenity", "car_rental"},
+      {"amenity", "car_sharing"},
+      {"amenity", "car_wash"},
+      {"amenity", "casino"},
+      {"amenity", "charging_station"},
+      {"amenity", "childcare"},
+      {"amenity", "cinema"},
+      {"amenity", "studio"},
+      {"amenity", "clinic"},
+      {"amenity", "college"},
+      {"amenity", "community_centre"},
+      {"amenity", "courthouse"},
+      {"amenity", "dentist"},
+      {"amenity", "doctors"},
+      {"amenity", "drinking_water"},
+      {"amenity", "driving_school"},
+      {"amenity", "fast_food"},
+      {"amenity", "ferry_terminal"},
+      {"amenity", "fire_station"},
+      {"amenity", "food_court"},
+      {"amenity", "fountain"},
+      {"amenity", "fuel"},
+      {"amenity", "grave_yard"},
+      {"amenity", "hospital"},
+      {"amenity", "hunting_stand"},
+      {"amenity", "ice_cream"},
+      {"amenity", "internet_cafe"},
+      {"amenity", "kindergarten"},
+      {"amenity", "library"},
+      {"amenity", "marketplace"},
+      {"amenity", "motorcycle_parking"},
+      {"amenity", "motorcycle_rental"},
+      {"amenity", "nightclub"},
+      {"amenity", "nursing_home"},
+      {"amenity", "parking"},
+      {"amenity", "parking_space"},
+      {"amenity", "payment_terminal"},
+      {"amenity", "pharmacy"},
+      {"amenity", "place_of_worship"},
+      {"amenity", "police"},
+      {"amenity", "post_box"},
+      {"amenity", "post_office"},
+      {"amenity", "prison"},
+      {"amenity", "pub"},
+      {"amenity", "public_bookcase"},
+      {"amenity", "restaurant"},
+      {"amenity", "school"},
+      {"amenity", "shelter"},
+      {"amenity", "shower"},
+      {"amenity", "taxi"},
+      {"amenity", "telephone"},
+      {"amenity", "theatre"},
+      {"amenity", "toilets"},
+      {"amenity", "townhall"},
+      {"amenity", "university"},
+      {"amenity", "veterinary"},
+      {"amenity", "waste_basket"},
+      {"amenity", "waste_disposal"},
+      {"amenity", "water_point"},
+      {"area:highway", "footway"},
+      {"area:highway", "living_street"},
+      {"area:highway", "pedestrian"},
+      {"barrier", "block"},
+      {"barrier", "bollard"},
+      {"barrier", "border_control"},
+      {"barrier", "chain"},
+      {"barrier", "city_wall"},
+      {"barrier", "entrance"},
+      {"barrier", "fence"},
+      {"barrier", "gate"},
+      {"barrier", "hedge"},
+      {"barrier", "lift_gate"},
+      {"barrier", "retaining_wall"},
+      {"barrier", "stile"},
+      {"barrier", "swing_gate"},
+      {"barrier", "toll_booth"},
+      {"barrier", "wall"},
+      {"boundary", "national_park"},
+      {"boundary", "protected_area"},
+      {"building", "has_parts"},
+      {"building", "train_station"},
+      {"cemetery", "grave"},
+      {"craft", "beekeeper"},
+      {"craft", "blacksmith"},
+      {"craft", "brewery"},
+      {"craft", "carpenter"},
+      {"craft", "confectionery"},
+      {"craft", "electrician"},
+      {"craft", "electronics_repair"},
+      {"craft", "gardener"},
+      {"craft", "handicraft"},
+      {"craft", "hvac"},
+      {"craft", "metal_construction"},
+      {"craft", "painter"},
+      {"craft", "photographer"},
+      {"craft", "plumber"},
+      {"craft", "sawmill"},
+      {"craft", "shoemaker"},
+      {"craft", "tailor"},
+      {"craft", "winery"},
+      {"cuisine", "african"},
+      {"cuisine", "american"},
+      {"cuisine", "arab"},
+      {"cuisine", "argentinian"},
+      {"cuisine", "asian"},
+      {"cuisine", "austrian"},
+      {"cuisine", "bagel"},
+      {"cuisine", "balkan"},
+      {"cuisine", "barbecue"},
+      {"cuisine", "bavarian"},
+      {"cuisine", "beef_bowl"},
+      {"cuisine", "brazilian"},
+      {"cuisine", "breakfast"},
+      {"cuisine", "burger"},
+      {"cuisine", "buschenschank"},
+      {"cuisine", "cake"},
+      {"cuisine", "caribbean"},
+      {"cuisine", "chicken"},
+      {"cuisine", "chinese"},
+      {"cuisine", "coffee_shop"},
+      {"cuisine", "crepe"},
+      {"cuisine", "croatian"},
+      {"cuisine", "curry"},
+      {"cuisine", "deli"},
+      {"cuisine", "diner"},
+      {"cuisine", "donut"},
+      {"cuisine", "ethiopian"},
+      {"cuisine", "filipino"},
+      {"cuisine", "fine_dining"},
+      {"cuisine", "fish"},
+      {"cuisine", "fish_and_chips"},
+      {"cuisine", "french"},
+      {"cuisine", "friture"},
+      {"cuisine", "georgian"},
+      {"cuisine", "german"},
+      {"cuisine", "greek"},
+      {"cuisine", "grill"},
+      {"cuisine", "heuriger"},
+      {"cuisine", "hotdog"},
+      {"cuisine", "hungarian"},
+      {"cuisine", "ice_cream"},
+      {"cuisine", "indian"},
+      {"cuisine", "indonesian"},
+      {"cuisine", "international"},
+      {"cuisine", "irish"},
+      {"cuisine", "italian"},
+      {"cuisine", "italian_pizza"},
+      {"cuisine", "japanese"},
+      {"cuisine", "kebab"},
+      {"cuisine", "korean"},
+      {"cuisine", "lao"},
+      {"cuisine", "lebanese"},
+      {"cuisine", "local"},
+      {"cuisine", "malagasy"},
+      {"cuisine", "malaysian"},
+      {"cuisine", "mediterranean"},
+      {"cuisine", "mexican"},
+      {"cuisine", "moroccan"},
+      {"cuisine", "noodles"},
+      {"cuisine", "oriental"},
+      {"cuisine", "pancake"},
+      {"cuisine", "pasta"},
+      {"cuisine", "persian"},
+      {"cuisine", "peruvian"},
+      {"cuisine", "pizza"},
+      {"cuisine", "polish"},
+      {"cuisine", "portuguese"},
+      {"cuisine", "ramen"},
+      {"cuisine", "regional"},
+      {"cuisine", "russian"},
+      {"cuisine", "sandwich"},
+      {"cuisine", "sausage"},
+      {"cuisine", "savory_pancakes"},
+      {"cuisine", "seafood"},
+      {"cuisine", "soba"},
+      {"cuisine", "spanish"},
+      {"cuisine", "steak_house"},
+      {"cuisine", "sushi"},
+      {"cuisine", "tapas"},
+      {"cuisine", "tea"},
+      {"cuisine", "thai"},
+      {"cuisine", "turkish"},
+      {"cuisine", "vegan"},
+      {"cuisine", "vegetarian"},
+      {"cuisine", "vietnamese"},
+      {"emergency", "defibrillator"},
+      {"emergency", "fire_hydrant"},
+      {"emergency", "lifeguard"},
+      {"emergency", "mountain_rescue"},
+      {"emergency", "phone"},
+      {"fee", "no"},
+      {"fee", "yes"},
+      {"highway", "bridleway"},
+      {"highway", "busway"},
+      {"highway", "bus_stop"},
+      {"highway", "construction"},
+      {"highway", "cycleway"},
+      {"highway", "footway"},
+      {"highway", "ford"},
+      {"highway", "living_street"},
+      {"highway", "motorway"},
+      {"highway", "motorway_junction"},
+      {"highway", "motorway_link"},
+      {"highway", "path"},
+      {"highway", "pedestrian"},
+      {"highway", "primary"},
+      {"highway", "primary_link"},
+      {"highway", "raceway"},
+      {"highway", "residential"},
+      {"highway", "rest_area"},
+      {"highway", "road"},
+      {"highway", "secondary"},
+      {"highway", "secondary_link"},
+      {"highway", "service"},
+      {"highway", "services"},
+      {"highway", "speed_camera"},
+      {"highway", "steps"},
+      {"highway", "tertiary"},
+      {"highway", "tertiary_link"},
+      {"highway", "track"},
+      {"highway", "trunk"},
+      {"highway", "trunk_link"},
+      {"highway", "unclassified"},
+      {"highway", "world_level"},
+      {"highway", "world_towns_level"},
+      {"historic", "archaeological_site"},
+      {"historic", "boundary_stone"},
+      {"historic", "castle"},
+      {"historic", "city_gate"},
+      {"historic", "citywalls"},
+      {"historic", "fort"},
+      {"historic", "memorial"},
+      {"historic", "monument"},
+      {"historic", "ruins"},
+      {"historic", "ship"},
+      {"historic", "tomb"},
+      {"historic", "wayside_cross"},
+      {"historic", "wayside_shrine"},
+      {"hwtag", "bidir_bicycle"},
+      {"hwtag", "lit"},
+      {"hwtag", "nobicycle"},
+      {"hwtag", "nocar"},
+      {"hwtag", "nofoot"},
+      {"hwtag", "oneway"},
+      {"hwtag", "private"},
+      {"hwtag", "toll"},
+      {"hwtag", "yesbicycle"},
+      {"hwtag", "yescar"},
+      {"hwtag", "yesfoot"},
+      {"internet_access", "wlan"},
+      {"junction", "circular"},
+      {"junction", "roundabout"},
+      {"landuse", "allotments"},
+      {"landuse", "basin"},
+      {"landuse", "cemetery"},
+      {"landuse", "commercial"},
+      {"landuse", "construction"},
+      {"landuse", "farmland"},
+      {"landuse", "garages"},
+      {"landuse", "grass"},
+      {"landuse", "industrial"},
+      {"landuse", "landfill"},
+      {"landuse", "meadow"},
+      {"landuse", "military"},
+      {"landuse", "orchard"},
+      {"landuse", "quarry"},
+      {"landuse", "railway"},
+      {"landuse", "recreation_ground"},
+      {"landuse", "religious"},
+      {"landuse", "reservoir"},
+      {"landuse", "residential"},
+      {"landuse", "salt_pond"},
+      {"landuse", "village_green"},
+      {"landuse", "vineyard"},
+      {"leisure", "common"},
+      {"leisure", "dog_park"},
+      {"leisure", "fitness_centre"},
+      {"leisure", "fitness_station"},
+      {"leisure", "garden"},
+      {"leisure", "firepit"},
+      {"leisure", "golf_course"},
+      {"leisure", "ice_rink"},
+      {"leisure", "marina"},
+      {"leisure", "nature_reserve"},
+      {"leisure", "park"},
+      {"leisure", "pitch"},
+      {"leisure", "playground"},
+      {"leisure", "recreation_ground"},
+      {"leisure", "resort"},
+      {"leisure", "sauna"},
+      {"leisure", "slipway"},
+      {"leisure", "sports_centre"},
+      {"leisure", "dance"},
+      {"leisure", "stadium"},
+      {"leisure", "swimming_pool"},
+      {"leisure", "track"},
+      {"leisure", "water_park"},
+      {"man_made", "breakwater"},
+      {"man_made", "cairn"},
+      {"man_made", "chimney"},
+      {"man_made", "communications_tower"},
+      {"man_made", "cross"},
+      {"man_made", "cutline"},
+      {"man_made", "embankment"},
+      {"man_made", "flare"},
+      {"man_made", "lighthouse"},
+      {"man_made", "petroleum_well"},
+      {"man_made", "pier"},
+      {"man_made", "survey_point"},
+      {"man_made", "silo"},
+      {"man_made", "storage_tank"},
+      {"man_made", "tower"},
+      // {"man_made", "utility_pole"}, // In the outdoor style only.
+      {"man_made", "water_tap"},
+      {"man_made", "water_tower"},
+      {"man_made", "water_well"},
+      {"man_made", "windmill"},
+      {"man_made", "works"},
+      {"natural", "bare_rock"},
+      {"natural", "bay"},
+      {"natural", "beach"},
+      {"natural", "cape"},
+      {"natural", "cave_entrance"},
+      {"natural", "cliff"},
+      {"natural", "coastline"},
+      {"natural", "desert"},
+      {"natural", "earth_bank"},
+      {"natural", "geyser"},
+      {"natural", "glacier"},
+      {"natural", "grassland"},
+      {"natural", "heath"},
+      {"natural", "hot_spring"},
+      {"natural", "land"},
+      {"natural", "peak"},
+      {"natural", "rock"},
+      {"natural", "saddle"},
+      {"natural", "scrub"},
+      {"natural", "spring"},
+      {"natural", "volcano"},
+      {"natural", "water"},
+      {"natural", "wetland"},
+      {"office", "company"},
+      {"office", "diplomatic"},
+      {"office", "estate_agent"},
+      {"office", "government"},
+      {"office", "insurance"},
+      {"office", "lawyer"},
+      {"office", "ngo"},
+      {"office", "telecommunication"},
+      {"organic", "only"},
+      {"organic", "yes"},
+      {"aerialway", "j-bar"},
+      {"aerialway", "magic_carpet"},
+      {"aerialway", "platter"},
+      {"aerialway", "rope_tow"},
+      {"aerialway", "t-bar"},
+      {"piste:type", "downhill"},
+      {"piste:type", "nordic"},
+      {"piste:type", "sled"},
+      {"place", "city"},
+      {"place", "continent"},
+      {"place", "country"},
+      {"place", "farm"},
+      {"place", "hamlet"},
+      {"place", "island"},
+      {"place", "islet"},
+      {"place", "isolated_dwelling"},
+      {"place", "locality"},
+      {"place", "neighbourhood"},
+      {"place", "ocean"},
+      {"place", "region"},
+      {"place", "sea"},
+      {"place", "square"},
+      {"place", "state"},
+      {"place", "suburb"},
+      {"place", "town"},
+      {"place", "village"},
+      {"power", "generator"},
+      {"power", "line"},
+      {"power", "minor_line"},
+      {"power", "pole"},
+      {"power", "station"},
+      {"power", "substation"},
+      {"power", "tower"},
+      {"psurface", "paved_bad"},
+      {"psurface", "paved_good"},
+      {"psurface", "unpaved_bad"},
+      {"psurface", "unpaved_good"},
+      {"public_transport", "platform"},
+      {"railway", "abandoned"},
+      {"railway", "construction"},
+      {"railway", "disused"},
+      {"railway", "funicular"},
+      {"railway", "halt"},
+      {"railway", "level_crossing"},
+      {"railway", "light_rail"},
+      {"railway", "monorail"},
+      {"railway", "narrow_gauge"},
+      {"railway", "platform"},
+      {"railway", "preserved"},
+      {"railway", "station"},
+      {"railway", "subway_entrance"},
+      {"railway", "tram"},
+      {"railway", "tram_stop"},
+      {"shop", "alcohol"},
+      {"shop", "bakery"},
+      {"shop", "beauty"},
+      {"shop", "beverages"},
+      {"shop", "bicycle"},
+      {"shop", "bookmaker"},
+      {"shop", "books"},
+      {"shop", "butcher"},
+      {"shop", "car"},
+      {"shop", "car_parts"},
+      {"shop", "car_repair"},
+      {"shop", "chemist"},
+      {"shop", "chocolate"},
+      {"shop", "coffee"},
+      {"shop", "computer"},
+      {"shop", "confectionery"},
+      {"shop", "convenience"},
+      {"shop", "copyshop"},
+      {"shop", "cosmetics"},
+      {"shop", "deli"},
+      {"shop", "department_store"},
+      {"shop", "doityourself"},
+      {"shop", "dry_cleaning"},
+      {"shop", "electronics"},
+      {"shop", "erotic"},
+      {"shop", "fabric"},
+      {"shop", "farm"},
+      {"shop", "florist"},
+      {"shop", "funeral_directors"},
+      {"shop", "furniture"},
+      {"shop", "garden_centre"},
+      {"shop", "gift"},
+      {"shop", "greengrocer"},
+      {"shop", "grocery"},
+      {"shop", "hairdresser"},
+      {"shop", "hardware"},
+      {"shop", "houseware"},
+      {"shop", "health_food"},
+      {"shop", "jewelry"},
+      {"shop", "kiosk"},
+      {"shop", "kitchen"},
+      {"shop", "laundry"},
+      {"shop", "mall"},
+      {"shop", "massage"},
+      {"shop", "mobile_phone"},
+      {"shop", "money_lender"},
+      {"shop", "motorcycle"},
+      {"shop", "music"},
+      {"shop", "musical_instrument"},
+      {"shop", "newsagent"},
+      {"shop", "optician"},
+      {"shop", "outdoor"},
+      {"shop", "pastry"},
+      {"shop", "pawnbroker"},
+      {"shop", "pet"},
+      {"shop", "photo"},
+      {"shop", "seafood"},
+      {"shop", "second_hand"},
+      {"shop", "sewing"},
+      {"shop", "shoes"},
+      {"shop", "sports"},
+      {"shop", "stationery"},
+      {"shop", "supermarket"},
+      {"shop", "tattoo"},
+      {"shop", "tea"},
+      {"shop", "ticket"},
+      {"shop", "toys"},
+      {"shop", "travel_agency"},
+      {"shop", "tyres"},
+      {"shop", "variety_store"},
+      {"shop", "video"},
+      {"shop", "wine"},
+      {"sport", "american_football"},
+      {"sport", "archery"},
+      {"sport", "athletics"},
+      {"sport", "australian_football"},
+      {"sport", "baseball"},
+      {"sport", "basketball"},
+      {"sport", "bowls"},
+      {"sport", "cricket"},
+      {"sport", "curling"},
+      {"sport", "diving"},
+      {"sport", "equestrian"},
+      {"sport", "gymnastics"},
+      {"sport", "handball"},
+      {"sport", "multi"},
+      {"sport", "scuba_diving"},
+      {"sport", "shooting"},
+      {"sport", "skiing"},
+      {"sport", "soccer"},
+      {"sport", "swimming"},
+      {"sport", "tennis"},
+      {"tourism", "alpine_hut"},
+      {"tourism", "apartment"},
+      {"tourism", "artwork"},
+      {"tourism", "attraction"},
+      {"tourism", "camp_site"},
+      {"tourism", "caravan_site"},
+      {"tourism", "chalet"},
+      {"tourism", "gallery"},
+      {"tourism", "guest_house"},
+      {"tourism", "hostel"},
+      {"tourism", "hotel"},
+      {"tourism", "information"},
+      {"tourism", "motel"},
+      {"tourism", "museum"},
+      {"tourism", "picnic_site"},
+      {"tourism", "theme_park"},
+      {"tourism", "viewpoint"},
+      {"tourism", "wilderness_hut"},
+      {"tourism", "zoo"},
+      {"waterway", "canal"},
+      {"waterway", "dam"},
+      {"waterway", "ditch"},
+      {"waterway", "dock"},
+      {"waterway", "drain"},
+      {"waterway", "lock_gate"},
+      {"waterway", "river"},
+      {"waterway", "stream"},
+      {"waterway", "waterfall"},
+      {"waterway", "weir"},
+      {"wheelchair", "limited"},
+      {"wheelchair", "no"},
+      {"wheelchair", "yes"},
   };
 
   using SV = std::string_view;
@@ -2757,301 +2669,314 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke)
 {
   using Type = std::vector<std::string>;
   std::vector<std::pair<Type, Tags>> const complexTypes = {
-    // Filtered out by MatchTypes filter because have no styles.
-    // {{"communication", "line", "underground"}, {{"communication", "line"}, {"location", "underground"}}},
-    // {{"man_made", "pipeline", "overground"}, {{"man_made", "pipeline"}, {"location", "overground"}}},
-    // {{"railway", "siding", "bridge"}, {{"railway", "siding"}, {"bridge", "any_value"}}},
-    // {{"railway", "siding", "tunnel"}, {{"railway", "siding"}, {"tunnel", "any_value"}}},
-    // {{"railway", "spur", "bridge"}, {{"railway", "spur"}, {"bridge", "any_value"}}},
-    // {{"railway", "spur", "tunnel"}, {{"railway", "spur"}, {"tunnel", "any_value"}}},
-    // {{"waterway", "ditch", "tunnel"}, {{"waterway", "ditch"}, {"tunnel", "any_value"}}},
-    // {{"waterway", "drain", "tunnel"}, {{"waterway", "drain"}, {"tunnel", "any_value"}}},
-    // {{"waterway", "stream", "tunnel"}, {{"waterway", "stream"}, {"tunnel", "any_value"}}},
-    //
-    // two types (+hwtag yesbicycle) {{"highway", "path", "bicycle"}, {{"highway", "path"}, {"bicycle", "any_value"}}},
-    // two types (+hwtag-private) {{"highway", "track", "no-access"}, {{"highway", "track"}, {"access", "no"}}},
-    // two types (+office) {{"tourism", "information", "office"}, {{"tourism", "information"}, {"office", "any_value"}}},
-    // two types (+sport-*) {{"leisure", "sports_centre"}, {{"leisure", "sports_centre"}, {"sport", "any_value"}}},
-    //
-    // Manually constructed type, not parsed from osm.
-    // {{"building", "address"}, {{"addr:housenumber", "any_value"}, {"addr:street", "any_value"}}},
-    {{"addr:interpolation"}, {{"addr:interpolation", "all"}}},
-    {{"aeroway", "aerodrome", "international"}, {{"aeroway", "aerodrome"}, {"aerodrome", "international"}}},
-    {{"amenity", "grave_yard", "christian"}, {{"amenity", "grave_yard"}, {"religion", "christian"}}},
-    {{"amenity", "parking", "lane"}, {{"amenity", "parking"}, {"parking", "lane"}}},
-    {{"amenity", "parking", "multi-storey"}, {{"amenity", "parking"}, {"parking", "multi-storey"}}},
-    {{"amenity", "parking", "no-access"}, {{"amenity", "parking"}, {"access", "no"}}},
-    {{"amenity", "parking", "park_and_ride"}, {{"amenity", "parking"}, {"parking", "park_and_ride"}}},
-    {{"amenity", "parking", "permissive"}, {{"amenity", "parking"}, {"access", "permissive"}}},
-    {{"amenity", "parking", "private"}, {{"amenity", "parking"}, {"access", "private"}}},
-    {{"amenity", "parking", "street_side"}, {{"amenity", "parking"}, {"parking", "street_side"}}},
-    {{"amenity", "parking", "underground"}, {{"amenity", "parking"}, {"location", "underground"}}},
-    {{"amenity", "parking_space", "permissive"}, {{"amenity", "parking_space"}, {"access", "permissive"}}},
-    {{"amenity", "parking_space", "private"}, {{"amenity", "parking_space"}, {"access", "private"}}},
-    {{"amenity", "parking_space", "underground"}, {{"amenity", "parking_space"}, {"parking", "underground"}}},
-    {{"amenity", "place_of_worship", "buddhist"}, {{"amenity", "place_of_worship"}, {"religion", "buddhist"}}},
-    {{"amenity", "place_of_worship", "christian"}, {{"amenity", "place_of_worship"}, {"religion", "christian"}}},
-    {{"amenity", "place_of_worship", "hindu"}, {{"amenity", "place_of_worship"}, {"religion", "hindu"}}},
-    {{"amenity", "place_of_worship", "jewish"}, {{"amenity", "place_of_worship"}, {"religion", "jewish"}}},
-    {{"amenity", "place_of_worship", "muslim"}, {{"amenity", "place_of_worship"}, {"religion", "muslim"}}},
-    {{"amenity", "place_of_worship", "shinto"}, {{"amenity", "place_of_worship"}, {"religion", "shinto"}}},
-    {{"amenity", "place_of_worship", "taoist"}, {{"amenity", "place_of_worship"}, {"religion", "taoist"}}},
-    {{"amenity", "recycling", "centre"}, {{"amenity", "recycling"}, {"recycling_type","centre"}}},
-    {{"amenity", "recycling", "container"}, {{"amenity", "recycling"}, {"recycling_type","container"}}},
-    {{"amenity", "recycling"}, {{"amenity", "recycling"}}},
-    {{"amenity", "parcel_locker"}, {{"amenity", "parcel_locker"}}},
-    {{"amenity", "vending_machine", "cigarettes"}, {{"amenity", "vending_machine"}, {"vending", "cigarettes"}}},
-    {{"amenity", "vending_machine", "coffee"}, {{"amenity", "vending_machine"}, {"vending", "coffee"}}},
-    {{"amenity", "vending_machine", "condoms"}, {{"amenity", "vending_machine"}, {"vending", "condoms"}}},
-    {{"amenity", "vending_machine", "drinks"}, {{"amenity", "vending_machine"}, {"vending", "drinks"}}},
-    {{"amenity", "vending_machine", "food"}, {{"amenity", "vending_machine"}, {"vending", "food"}}},
-    {{"amenity", "vending_machine", "parking_tickets"}, {{"amenity", "vending_machine"}, {"vending", "parking_tickets"}}},
-    {{"amenity", "vending_machine", "public_transport_tickets"}, {{"amenity", "vending_machine"}, {"vending", "public_transport_tickets"}}},
-    {{"amenity", "vending_machine", "newspapers"}, {{"amenity", "vending_machine"}, {"vending", "newspapers"}}},
-    {{"amenity", "vending_machine", "sweets"}, {{"amenity", "vending_machine"}, {"vending", "sweets"}}},
-    {{"amenity"}, {{"amenity", "any_value"}}},
-    {{"boundary", "administrative", "2"}, {{"boundary", "administrative"}, {"admin_level", "2"}}},
-    {{"boundary", "administrative", "3"}, {{"boundary", "administrative"}, {"admin_level", "3"}}},
-    {{"boundary", "administrative", "4"}, {{"boundary", "administrative"}, {"admin_level", "4"}}},
-    {{"building", "garage"}, {{"building", "garage"}}},
-    {{"building", "garage"}, {{"building", "yes"}, {"garage", "any_value"}}},
-    {{"building"}, {{"building", "any_value"}}},
-    {{"building:part"}, {{"building:part", "any_value"}}},
-    {{"entrance"}, {{"entrance", "any_value"}}},
-    {{"highway", "bridleway", "bridge"}, {{"highway", "bridleway"}, {"bridge", "any_value"}}},
-    {{"highway", "bridleway", "tunnel"}, {{"highway", "bridleway"}, {"tunnel", "any_value"}}},
-    {{"highway", "busway"}, {{"highway", "service"}, {"service", "bus"}}},
-    {{"highway", "busway"}, {{"highway", "service"}, {"service", "busway"}}},
-    {{"highway", "busway", "bridge"}, {{"highway", "busway"}, {"bridge", "any_value"}}},
-    {{"highway", "busway", "tunnel"}, {{"highway", "busway"}, {"tunnel", "any_value"}}},
-    {{"highway", "cycleway", "bridge"}, {{"highway", "cycleway"}, {"bridge", "any_value"}}},
-    {{"highway", "cycleway", "tunnel"}, {{"highway", "cycleway"}, {"tunnel", "any_value"}}},
-    {{"highway", "footway", "area"}, {{"highway", "footway"}, {"area", "any_value"}}},
-    {{"highway", "footway", "bridge"}, {{"highway", "footway"}, {"bridge", "any_value"}}},
-    {{"highway", "footway"}, {{"highway", "footway"}, {"footway", "unsupported_value"}}},
-    {{"highway", "footway", "sidewalk"}, {{"highway", "footway"}, {"footway", "sidewalk"}}},
-    {{"highway", "footway", "crossing"}, {{"highway", "footway"}, {"footway", "crossing"}}},
-    {{"highway", "footway", "tunnel"}, {{"highway", "footway"}, {"tunnel", "any_value"}}},
-    {{"highway", "footway", "tunnel"}, {{"highway", "footway"}, {"location", "underground"}}},
-    {{"highway", "living_street", "bridge"}, {{"highway", "living_street"}, {"bridge", "any_value"}}},
-    {{"highway", "living_street", "tunnel"}, {{"highway", "living_street"}, {"tunnel", "any_value"}}},
-    {{"highway", "motorway", "bridge"}, {{"highway", "motorway"}, {"bridge", "any_value"}}},
-    {{"highway", "motorway", "tunnel"}, {{"highway", "motorway"}, {"tunnel", "any_value"}}},
-    {{"highway", "motorway_link", "bridge"}, {{"highway", "motorway_link"}, {"bridge", "any_value"}}},
-    {{"highway", "motorway_link", "tunnel"}, {{"highway", "motorway_link"}, {"tunnel", "any_value"}}},
-    {{"highway", "path", "bridge"}, {{"highway", "path"}, {"bridge", "any_value"}}},
-    {{"highway", "path", "horse"}, {{"highway", "path"}, {"horse", "any_value"}}},
-    {{"highway", "path", "tunnel"}, {{"highway", "path"}, {"tunnel", "any_value"}}},
-    {{"highway", "path", "difficult"}, {{"highway", "path"}, {"_path_grade", "difficult"}}},
-    {{"highway", "path", "expert"}, {{"highway", "path"}, {"_path_grade", "expert"}}},
-    {{"highway", "pedestrian", "area"}, {{"highway", "pedestrian"}, {"area", "any_value"}}},
-    {{"highway", "pedestrian", "bridge"}, {{"highway", "pedestrian"}, {"bridge", "any_value"}}},
-    {{"highway", "pedestrian", "tunnel"}, {{"highway", "pedestrian"}, {"tunnel", "any_value"}}},
-    {{"highway", "primary", "bridge"}, {{"highway", "primary"}, {"bridge", "any_value"}}},
-    {{"highway", "primary", "tunnel"}, {{"highway", "primary"}, {"tunnel", "any_value"}}},
-    {{"highway", "primary_link", "bridge"}, {{"highway", "primary_link"}, {"bridge", "any_value"}}},
-    {{"highway", "primary_link", "tunnel"}, {{"highway", "primary_link"}, {"tunnel", "any_value"}}},
-    {{"highway", "residential", "area"}, {{"highway", "residential"}, {"area", "any_value"}}},
-    {{"highway", "residential", "bridge"}, {{"highway", "residential"}, {"bridge", "any_value"}}},
-    {{"highway", "residential", "tunnel"}, {{"highway", "residential"}, {"tunnel", "any_value"}}},
-    {{"highway", "road", "bridge"}, {{"highway", "road"}, {"bridge", "any_value"}}},
-    {{"highway", "road", "tunnel"}, {{"highway", "road"}, {"tunnel", "any_value"}}},
-    {{"highway", "secondary", "bridge"}, {{"highway", "secondary"}, {"bridge", "any_value"}}},
-    {{"highway", "secondary", "tunnel"}, {{"highway", "secondary"}, {"tunnel", "any_value"}}},
-    {{"highway", "secondary_link", "bridge"}, {{"highway", "secondary_link"}, {"bridge", "any_value"}}},
-    {{"highway", "secondary_link", "tunnel"}, {{"highway", "secondary_link"}, {"tunnel", "any_value"}}},
-    {{"highway", "service", "area"}, {{"highway", "service"}, {"area", "any_value"}}},
-    {{"highway", "service", "bridge"}, {{"highway", "service"}, {"bridge", "any_value"}}},
-    {{"highway", "service", "driveway"}, {{"highway", "service"}, {"service", "driveway"}}},
-    {{"highway", "service", "parking_aisle"}, {{"highway", "service"}, {"service", "parking_aisle"}}},
-    {{"highway", "service", "tunnel"}, {{"highway", "service"}, {"tunnel", "any_value"}}},
-    {{"highway", "steps", "bridge"}, {{"highway", "steps"}, {"bridge", "any_value"}}},
-    {{"highway", "steps", "tunnel"}, {{"highway", "steps"}, {"tunnel", "any_value"}}},
-    {{"highway", "tertiary", "bridge"}, {{"highway", "tertiary"}, {"bridge", "any_value"}}},
-    {{"highway", "tertiary", "tunnel"}, {{"highway", "tertiary"}, {"tunnel", "any_value"}}},
-    {{"highway", "tertiary_link", "bridge"}, {{"highway", "tertiary_link"}, {"bridge", "any_value"}}},
-    {{"highway", "tertiary_link", "tunnel"}, {{"highway", "tertiary_link"}, {"tunnel", "any_value"}}},
-    {{"highway", "track", "area"}, {{"highway", "track"}, {"area", "any_value"}}},
-    {{"highway", "track", "bridge"}, {{"highway", "track"}, {"bridge", "any_value"}}},
-    {{"highway", "track", "tunnel"}, {{"highway", "track"}, {"tunnel", "any_value"}}},
-    {{"highway", "trunk", "bridge"}, {{"highway", "trunk"}, {"bridge", "any_value"}}},
-    {{"highway", "trunk", "tunnel"}, {{"highway", "trunk"}, {"tunnel", "any_value"}}},
-    {{"highway", "trunk_link", "bridge"}, {{"highway", "trunk_link"}, {"bridge", "any_value"}}},
-    {{"highway", "trunk_link", "tunnel"}, {{"highway", "trunk_link"}, {"tunnel", "any_value"}}},
-    {{"highway", "unclassified", "area"}, {{"highway", "unclassified"}, {"area", "any_value"}}},
-    {{"highway", "unclassified", "bridge"}, {{"highway", "unclassified"}, {"bridge", "any_value"}}},
-    {{"highway", "unclassified", "tunnel"}, {{"highway", "unclassified"}, {"tunnel", "any_value"}}},
-    {{"historic", "castle", "defensive"}, {{"historic", "castle"}, {"castle_type", "defensive"}}},
-    {{"historic", "castle", "fortress"}, {{"historic", "castle"}, {"castle_type", "fortress"}}},
-    {{"historic", "castle", "fortress"}, {{"historic", "fortress"}}},
-    {{"historic", "castle", "manor"}, {{"historic", "castle"}, {"castle_type", "manor"}}},
-    {{"historic", "castle", "manor"}, {{"historic", "manor"}}},
-    {{"historic", "castle", "stately"}, {{"historic", "castle"}, {"castle_type", "stately"}}},
-    {{"historic", "memorial", "cross"}, {{"historic", "memorial"}, {"memorial", "cross"}}},
-    {{"historic", "memorial", "plaque"}, {{"historic", "memorial"}, {"memorial", "plaque"}}},
-    {{"historic", "memorial", "plaque"}, {{"historic", "memorial"}, {"memorial:type", "plaque"}}},
-    {{"historic", "memorial", "plaque"}, {{"historic", "memorial"}, {"memorial:type", "plate"}}},
-    {{"historic", "memorial", "sculpture"}, {{"historic", "memorial"}, {"memorial", "sculpture"}}},
-    {{"historic", "memorial", "sculpture"}, {{"historic", "memorial"}, {"memorial:type", "sculpture"}}},
-    {{"historic", "memorial", "statue"}, {{"historic", "memorial"}, {"memorial", "statue"}}},
-    {{"historic", "memorial", "statue"}, {{"historic", "memorial"}, {"memorial:type", "statue"}}},
-    {{"historic", "memorial", "stolperstein"}, {{"historic", "memorial"}, {"memorial", "stolperstein"}}},
-    {{"historic", "memorial", "stolperstein"}, {{"historic", "memorial"}, {"memorial:type", "stolperstein"}}},
-    {{"historic", "memorial", "war_memorial"}, {{"historic", "memorial"}, {"memorial", "war_memorial"}}},
-    {{"historic", "memorial", "war_memorial"}, {{"historic", "memorial"}, {"memorial:type", "war_memorial"}}},
-    {{"internet_access"}, {{"internet_access", "any_value"}}},
-    {{"landuse", "cemetery", "christian"}, {{"landuse", "cemetery"}, {"religion", "christian"}}},
-    {{"landuse", "forest"}, {{"landuse", "forest"}}},
-    {{"landuse", "forest"}, {{"natural", "wood"}}},
-    {{"landuse", "forest", "coniferous"}, {{"landuse", "forest"}, {"leaf_type", "coniferous"}}},
-    {{"landuse", "forest", "coniferous"}, {{"landuse", "forest"}, {"wood", "coniferous"}}},
-    {{"landuse", "forest", "coniferous"}, {{"natural", "wood"}, {"leaf_type", "coniferous"}}},
-    {{"landuse", "forest", "coniferous"}, {{"natural", "wood"}, {"wood", "coniferous"}}},
-    {{"landuse", "forest", "deciduous"}, {{"landuse", "forest"}, {"leaf_cycle", "deciduous"}}},
-    {{"landuse", "forest", "deciduous"}, {{"landuse", "forest"}, {"leaf_type", "deciduous"}}},
-    {{"landuse", "forest", "deciduous"}, {{"landuse", "forest"}, {"wood", "deciduous"}}},
-    {{"landuse", "forest", "deciduous"}, {{"natural", "wood"}, {"leaf_cycle", "deciduous"}}},
-    {{"landuse", "forest", "deciduous"}, {{"natural", "wood"}, {"leaf_type", "deciduous"}}},
-    {{"landuse", "forest", "deciduous"}, {{"natural", "wood"}, {"wood", "deciduous"}}},
-    {{"landuse", "forest", "mixed"}, {{"landuse", "forest"}, {"leaf_cycle", "mixed"}}},
-    {{"landuse", "forest", "mixed"}, {{"landuse", "forest"}, {"leaf_type", "mixed"}}},
-    {{"landuse", "forest", "mixed"}, {{"landuse", "forest"}, {"wood", "mixed"}}},
-    {{"landuse", "forest", "mixed"}, {{"natural", "wood"}, {"leaf_cycle", "mixed"}}},
-    {{"landuse", "forest", "mixed"}, {{"natural", "wood"}, {"leaf_type", "mixed"}}},
-    {{"landuse", "forest", "mixed"}, {{"natural", "wood"}, {"wood", "mixed"}}},
-    {{"leisure", "park", "no-access"}, {{"leisure", "park"}, {"access", "no"}}},
-    {{"leisure", "park", "private"}, {{"leisure", "park"}, {"access", "private"}}},
-    {{"leisure", "park", "private"}, {{"leisure", "park"}, {"access", "private"}}},
-    {{"leisure", "sports_centre"}, {{"leisure", "sports_centre"}}},
-    {{"leisure", "track", "area"}, {{"leisure", "track"}, {"area", "any_value"}}},
-    {{"mountain_pass"}, {{"mountain_pass", "any_value"}}},
-    {{"natural", "desert"}, {{"natural", "sand"}, {"desert", "erg"}}},
-    {{"natural", "water", "pond"}, {{"natural", "water"}, {"water", "pond"}}},
-    {{"natural", "water", "lake"}, {{"natural", "water"}, {"water", "lake"}}},
-    {{"natural", "water", "reservoir"}, {{"natural", "water"}, {"water", "reservoir"}}},
-    {{"natural", "water", "river"}, {{"natural", "water"}, {"water", "river"}}},
-    {{"natural", "water", "basin"}, {{"natural", "water"}, {"water", "basin"}}},
-    {{"natural", "water", "lock"}, {{"natural", "water"}, {"water", "lock"}}},
-    {{"natural", "wetland", "bog"}, {{"natural", "wetland"}, {"wetland", "bog"}}},
-    {{"natural", "wetland", "marsh"}, {{"natural", "wetland"}, {"wetland", "marsh"}}},
-    {{"natural", "wetland", "marsh"}, {{"natural", "wetland"}, {"wetland", "wet_meadow"}}},
-    {{"natural", "wetland", "saltmarsh"}, {{"natural", "wetland"}, {"wetland", "saltmarsh"}}},
-    {{"natural", "wetland", "saltmarsh", "tidal"}, {{"natural", "wetland"}, {"wetland", "saltmarsh"}, {"tidal", "yes"}}},
-    {{"natural", "wetland", "fen"}, {{"natural", "wetland"}, {"wetland", "fen"}}},
-    {{"natural", "wetland", "reedbed"}, {{"natural", "wetland"}, {"wetland", "reedbed"}}},
-    {{"natural", "wetland", "swamp"}, {{"natural", "wetland"}, {"wetland", "swamp"}}},
-    {{"natural", "wetland", "mangrove"}, {{"natural", "wetland"}, {"wetland", "mangrove"}}},
-    {{"natural", "wetland", "tidalflat"}, {{"natural", "wetland"}, {"wetland", "tidalflat"}}},
-    {{"office"}, {{"office", "any_value"}}},
-    {{"piste:type", "downhill", "advanced"}, {{"piste:type", "downhill"}, {"piste:difficulty", "advanced"}}},
-    {{"piste:type", "downhill", "easy"}, {{"piste:type", "downhill"}, {"piste:difficulty", "easy"}}},
-    {{"piste:type", "downhill", "expert"}, {{"piste:type", "downhill"}, {"piste:difficulty", "expert"}}},
-    {{"piste:type", "downhill", "freeride"}, {{"piste:type", "downhill"}, {"piste:difficulty", "freeride"}}},
-    {{"piste:type", "downhill", "intermediate"}, {{"piste:type", "downhill"}, {"piste:difficulty", "intermediate"}}},
-    {{"piste:type", "downhill", "novice"}, {{"piste:type", "downhill"}, {"piste:difficulty", "novice"}}},
-    {{"place", "city", "capital", "10"}, {{"place", "city"}, {"capital", "10"}}},
-    {{"place", "city", "capital", "10"}, {{"place", "city"}, {"capital", "any_value"}, {"admin_level", "10"}}},
-    {{"place", "city", "capital", "11"}, {{"place", "city"}, {"capital", "11"}}},
-    {{"place", "city", "capital", "11"}, {{"place", "city"}, {"capital", "any_value"}, {"admin_level", "11"}}},
-    {{"place", "city", "capital", "2"}, {{"place", "city"}, {"capital", "2"}}},
-    {{"place", "city", "capital", "2"}, {{"place", "city"}, {"capital", "any_value"}, {"admin_level", "2"}}},
-    {{"place", "city", "capital", "3"}, {{"place", "city"}, {"capital", "3"}}},
-    {{"place", "city", "capital", "3"}, {{"place", "city"}, {"capital", "any_value"}, {"admin_level", "3"}}},
-    {{"place", "city", "capital", "4"}, {{"place", "city"}, {"capital", "4"}}},
-    {{"place", "city", "capital", "4"}, {{"place", "city"}, {"capital", "any_value"}, {"admin_level", "4"}}},
-    {{"place", "city", "capital", "5"}, {{"place", "city"}, {"capital", "5"}}},
-    {{"place", "city", "capital", "5"}, {{"place", "city"}, {"capital", "any_value"}, {"admin_level", "5"}}},
-    {{"place", "city", "capital", "6"}, {{"place", "city"}, {"capital", "6"}}},
-    {{"place", "city", "capital", "6"}, {{"place", "city"}, {"capital", "any_value"}, {"admin_level", "6"}}},
-    {{"place", "city", "capital", "7"}, {{"place", "city"}, {"capital", "7"}}},
-    {{"place", "city", "capital", "7"}, {{"place", "city"}, {"capital", "any_value"}, {"admin_level", "7"}}},
-    {{"place", "city", "capital", "8"}, {{"place", "city"}, {"capital", "8"}}},
-    {{"place", "city", "capital", "8"}, {{"place", "city"}, {"capital", "any_value"}, {"admin_level", "8"}}},
-    {{"place", "city", "capital", "9"}, {{"place", "city"}, {"capital", "9"}}},
-    {{"place", "city", "capital", "9"}, {{"place", "city"}, {"capital", "any_value"}, {"admin_level", "9"}}},
-    {{"place", "city", "capital"}, {{"place", "city"}, {"capital", "any_value"}}},
-    {{"place", "state", "USA"}, {{"place", "state"}, {"addr:country", "US"}}},
-    {{"place", "state", "USA"}, {{"place", "state"}, {"is_in", "USA"}}},
-    {{"place", "state", "USA"}, {{"place", "state"}, {"is_in:country", "USA"}}},
-    {{"place", "state", "USA"}, {{"place", "state"}, {"is_in:country_code", "us"}}},
-    {{"railway", "abandoned", "bridge"}, {{"railway", "abandoned"}, {"bridge", "any_value"}}},
-    {{"railway", "abandoned", "tunnel"}, {{"railway", "abandoned"}, {"tunnel", "any_value"}}},
-    {{"railway", "funicular", "bridge"}, {{"railway", "funicular"}, {"bridge", "any_value"}}},
-    {{"railway", "funicular", "tunnel"}, {{"railway", "funicular"}, {"tunnel", "any_value"}}},
-    {{"railway", "light_rail", "bridge"}, {{"railway", "light_rail"}, {"bridge", "any_value"}}},
-    //{{"railway", "light_rail", "tunnel"}, {{"railway", "light_rail"}, {"tunnel", "any_value"}}},
-    {{"railway", "monorail", "bridge"}, {{"railway", "monorail"}, {"bridge", "any_value"}}},
-    {{"railway", "monorail", "tunnel"}, {{"railway", "monorail"}, {"tunnel", "any_value"}}},
-    {{"railway", "narrow_gauge", "bridge"}, {{"railway", "narrow_gauge"}, {"bridge", "any_value"}}},
-    {{"railway", "narrow_gauge", "tunnel"}, {{"railway", "narrow_gauge"}, {"tunnel", "any_value"}}},
-    {{"railway", "preserved", "bridge"}, {{"railway", "preserved"}, {"bridge", "any_value"}}},
-    {{"railway", "preserved", "tunnel"}, {{"railway", "preserved"}, {"tunnel", "any_value"}}},
-    {{"railway", "station", "light_rail"}, {{"railway", "station"}, {"station", "light_rail"}}},
-    {{"railway", "station", "light_rail"}, {{"railway", "station"}, {"transport", "light_rail"}}},
-    {{"railway", "station", "monorail"}, {{"railway", "station"}, {"station", "monorail"}}},
-    {{"railway", "station", "monorail"}, {{"railway", "station"}, {"transport", "monorail"}}},
-    {{"railway", "station", "subway", "barcelona"}, {{"railway", "station"}, {"station", "subway"}, {"city", "barcelona"}}},
-    {{"railway", "station", "subway", "barcelona"}, {{"railway", "station"}, {"transport", "subway"}, {"city", "barcelona"}}},
-    {{"railway", "station", "subway", "berlin"}, {{"railway", "station"}, {"station", "subway"}, {"city", "berlin"}}},
-    {{"railway", "station", "subway", "berlin"}, {{"railway", "station"}, {"transport", "subway"}, {"city", "berlin"}}},
-    {{"railway", "station", "subway", "kiev"}, {{"railway", "station"}, {"station", "subway"}, {"city", "kiev"}}},
-    {{"railway", "station", "subway", "kiev"}, {{"railway", "station"}, {"transport", "subway"}, {"city", "kiev"}}},
-    {{"railway", "station", "subway", "london"}, {{"railway", "station"}, {"station", "subway"}, {"city", "london"}}},
-    {{"railway", "station", "subway", "london"}, {{"railway", "station"}, {"transport", "subway"}, {"city", "london"}}},
-    {{"railway", "station", "subway", "madrid"}, {{"railway", "station"}, {"station", "subway"}, {"city", "madrid"}}},
-    {{"railway", "station", "subway", "madrid"}, {{"railway", "station"}, {"transport", "subway"}, {"city", "madrid"}}},
-    {{"railway", "station", "subway", "minsk"}, {{"railway", "station"}, {"station", "subway"}, {"city", "minsk"}}},
-    {{"railway", "station", "subway", "minsk"}, {{"railway", "station"}, {"transport", "subway"}, {"city", "minsk"}}},
-    {{"railway", "station", "subway", "moscow"}, {{"railway", "station"}, {"station", "subway"}, {"city", "moscow"}}},
-    {{"railway", "station", "subway", "moscow"}, {{"railway", "station"}, {"transport", "subway"}, {"city", "moscow"}}},
-    {{"railway", "station", "subway", "newyork"}, {{"railway", "station"}, {"station", "subway"}, {"city", "newyork"}}},
-    {{"railway", "station", "subway", "newyork"}, {{"railway", "station"}, {"transport", "subway"}, {"city", "newyork"}}},
-    {{"railway", "station", "subway", "paris"}, {{"railway", "station"}, {"station", "subway"}, {"city", "paris"}}},
-    {{"railway", "station", "subway", "paris"}, {{"railway", "station"}, {"transport", "subway"}, {"city", "paris"}}},
-    {{"railway", "station", "subway", "roma"}, {{"railway", "station"}, {"station", "subway"}, {"city", "roma"}}},
-    {{"railway", "station", "subway", "roma"}, {{"railway", "station"}, {"transport", "subway"}, {"city", "roma"}}},
-    {{"railway", "station", "subway", "spb"}, {{"railway", "station"}, {"station", "subway"}, {"city", "spb"}}},
-    {{"railway", "station", "subway", "spb"}, {{"railway", "station"}, {"transport", "subway"}, {"city", "spb"}}},
-    {{"railway", "station", "subway"}, {{"railway", "station"}, {"station", "subway"}}},
-    {{"railway", "station", "subway"}, {{"railway", "station"}, {"transport", "subway"}}},
-    {{"railway", "subway", "bridge"}, {{"railway", "subway"}, {"bridge", "any_value"}}},
-    //{{"railway", "subway", "tunnel"}, {{"railway", "subway"}, {"tunnel", "any_value"}}},
-    {{"railway", "subway_entrance", "barcelona"}, {{"railway", "subway_entrance"}, {"city", "barcelona"}}},
-    {{"railway", "subway_entrance", "berlin"}, {{"railway", "subway_entrance"}, {"city", "berlin"}}},
-    {{"railway", "subway_entrance", "kiev"}, {{"railway", "subway_entrance"}, {"city", "kiev"}}},
-    {{"railway", "subway_entrance", "london"}, {{"railway", "subway_entrance"}, {"city", "london"}}},
-    {{"railway", "subway_entrance", "madrid"}, {{"railway", "subway_entrance"}, {"city", "madrid"}}},
-    {{"railway", "subway_entrance", "minsk"}, {{"railway", "subway_entrance"}, {"city", "minsk"}}},
-    {{"railway", "subway_entrance", "moscow"}, {{"railway", "subway_entrance"}, {"city", "moscow"}}},
-    {{"railway", "subway_entrance", "newyork"}, {{"railway", "subway_entrance"}, {"city", "newyork"}}},
-    {{"railway", "subway_entrance", "paris"}, {{"railway", "subway_entrance"}, {"city", "paris"}}},
-    {{"railway", "subway_entrance", "roma"}, {{"railway", "subway_entrance"}, {"city", "roma"}}},
-    {{"railway", "subway_entrance", "spb"}, {{"railway", "subway_entrance"}, {"city", "spb"}}},
-    {{"railway", "tram", "bridge"}, {{"railway", "tram"}, {"bridge", "any_value"}}},
-    {{"railway", "tram", "tunnel"}, {{"railway", "tram"}, {"tunnel", "any_value"}}},
-    {{"shop", "car_repair", "tyres"}, {{"shop", "car_repair"}, {"service", "tyres"}}},
-    {{"shop", "clothes"}, {{"shop", "clothes"}}},
-    {{"shop", "clothes"}, {{"shop", "fashion"}}},
-    {{"shop"}, {{"shop", "any_value"}}},
-    {{"sport", "golf"}, {{"sport", "golf"}}},
-    {{"sport", "golf"}, {{"sport", "miniature_golf"}}},
-    {{"tourism", "artwork", "architecture"}, {{"tourism", "artwork"}, {"artwork_type", "architecture"}}},
-    {{"tourism", "artwork", "architecture"}, {{"tourism", "artwork"}, {"type", "architecture"}}},
-    {{"tourism", "artwork", "painting"}, {{"tourism", "artwork"}, {"artwork_type", "painting"}}},
-    {{"tourism", "artwork", "painting"}, {{"tourism", "artwork"}, {"type", "painting"}}},
-    {{"tourism", "artwork", "sculpture"}, {{"tourism", "artwork"}, {"artwork_type", "sculpture"}}},
-    {{"tourism", "artwork", "sculpture"}, {{"tourism", "artwork"}, {"type", "sculpture"}}},
-    {{"tourism", "artwork", "statue"}, {{"tourism", "artwork"}, {"artwork_type", "statue"}}},
-    {{"tourism", "artwork", "statue"}, {{"tourism", "artwork"}, {"type", "statue"}}},
-    {{"attraction", "animal"}, {{"attraction", "animal"}}},
-    {{"tourism", "information", "board"}, {{"tourism", "information"}, {"information", "board"}}},
-    {{"tourism", "information", "guidepost"}, {{"tourism", "information"}, {"information", "guidepost"}}},
-    {{"tourism", "information", "map"}, {{"tourism", "information"}, {"information", "map"}}},
-    {{"tourism", "information", "office"}, {{"tourism", "information"}, {"information", "office"}}},
-    //{{"waterway", "canal", "tunnel"}, {{"waterway", "canal"}, {"tunnel", "any_value"}}},
-    //{{"waterway", "river", "tunnel"}, {{"waterway", "river"}, {"tunnel", "any_value"}}},
-    {{"waterway", "stream", "ephemeral"}, {{"waterway", "stream"}, {"intermittent", "ephemeral"}}},
-    {{"waterway", "stream", "intermittent"}, {{"waterway", "stream"}, {"intermittent", "yes"}}},
+      // Filtered out by MatchTypes filter because have no styles.
+      // {{"communication", "line", "underground"}, {{"communication", "line"}, {"location", "underground"}}},
+      // {{"man_made", "pipeline", "overground"}, {{"man_made", "pipeline"}, {"location", "overground"}}},
+      // {{"railway", "siding", "bridge"}, {{"railway", "siding"}, {"bridge", "any_value"}}},
+      // {{"railway", "siding", "tunnel"}, {{"railway", "siding"}, {"tunnel", "any_value"}}},
+      // {{"railway", "spur", "bridge"}, {{"railway", "spur"}, {"bridge", "any_value"}}},
+      // {{"railway", "spur", "tunnel"}, {{"railway", "spur"}, {"tunnel", "any_value"}}},
+      // {{"waterway", "ditch", "tunnel"}, {{"waterway", "ditch"}, {"tunnel", "any_value"}}},
+      // {{"waterway", "drain", "tunnel"}, {{"waterway", "drain"}, {"tunnel", "any_value"}}},
+      // {{"waterway", "stream", "tunnel"}, {{"waterway", "stream"}, {"tunnel", "any_value"}}},
+      //
+      // two types (+hwtag yesbicycle) {{"highway", "path", "bicycle"}, {{"highway", "path"}, {"bicycle",
+      // "any_value"}}},
+      // two types (+hwtag-private) {{"highway", "track", "no-access"}, {{"highway", "track"}, {"access", "no"}}},
+      // two types (+office) {{"tourism", "information", "office"}, {{"tourism", "information"}, {"office",
+      // "any_value"}}},
+      // two types (+sport-*) {{"leisure", "sports_centre"}, {{"leisure", "sports_centre"}, {"sport", "any_value"}}},
+      //
+      // Manually constructed type, not parsed from osm.
+      // {{"building", "address"}, {{"addr:housenumber", "any_value"}, {"addr:street", "any_value"}}},
+      {{"addr:interpolation"}, {{"addr:interpolation", "all"}}},
+      {{"aeroway", "aerodrome", "international"}, {{"aeroway", "aerodrome"}, {"aerodrome", "international"}}},
+      {{"amenity", "grave_yard", "christian"}, {{"amenity", "grave_yard"}, {"religion", "christian"}}},
+      {{"amenity", "parking", "lane"}, {{"amenity", "parking"}, {"parking", "lane"}}},
+      {{"amenity", "parking", "multi-storey"}, {{"amenity", "parking"}, {"parking", "multi-storey"}}},
+      {{"amenity", "parking", "no-access"}, {{"amenity", "parking"}, {"access", "no"}}},
+      {{"amenity", "parking", "park_and_ride"}, {{"amenity", "parking"}, {"parking", "park_and_ride"}}},
+      {{"amenity", "parking", "permissive"}, {{"amenity", "parking"}, {"access", "permissive"}}},
+      {{"amenity", "parking", "private"}, {{"amenity", "parking"}, {"access", "private"}}},
+      {{"amenity", "parking", "street_side"}, {{"amenity", "parking"}, {"parking", "street_side"}}},
+      {{"amenity", "parking", "underground"}, {{"amenity", "parking"}, {"location", "underground"}}},
+      {{"amenity", "parking_space", "permissive"}, {{"amenity", "parking_space"}, {"access", "permissive"}}},
+      {{"amenity", "parking_space", "private"}, {{"amenity", "parking_space"}, {"access", "private"}}},
+      {{"amenity", "parking_space", "underground"}, {{"amenity", "parking_space"}, {"parking", "underground"}}},
+      {{"amenity", "place_of_worship", "buddhist"}, {{"amenity", "place_of_worship"}, {"religion", "buddhist"}}},
+      {{"amenity", "place_of_worship", "christian"}, {{"amenity", "place_of_worship"}, {"religion", "christian"}}},
+      {{"amenity", "place_of_worship", "hindu"}, {{"amenity", "place_of_worship"}, {"religion", "hindu"}}},
+      {{"amenity", "place_of_worship", "jewish"}, {{"amenity", "place_of_worship"}, {"religion", "jewish"}}},
+      {{"amenity", "place_of_worship", "muslim"}, {{"amenity", "place_of_worship"}, {"religion", "muslim"}}},
+      {{"amenity", "place_of_worship", "shinto"}, {{"amenity", "place_of_worship"}, {"religion", "shinto"}}},
+      {{"amenity", "place_of_worship", "taoist"}, {{"amenity", "place_of_worship"}, {"religion", "taoist"}}},
+      {{"amenity", "recycling", "centre"}, {{"amenity", "recycling"}, {"recycling_type", "centre"}}},
+      {{"amenity", "recycling", "container"}, {{"amenity", "recycling"}, {"recycling_type", "container"}}},
+      {{"amenity", "recycling"}, {{"amenity", "recycling"}}},
+      {{"amenity", "parcel_locker"}, {{"amenity", "parcel_locker"}}},
+      {{"amenity", "vending_machine", "cigarettes"}, {{"amenity", "vending_machine"}, {"vending", "cigarettes"}}},
+      {{"amenity", "vending_machine", "coffee"}, {{"amenity", "vending_machine"}, {"vending", "coffee"}}},
+      {{"amenity", "vending_machine", "condoms"}, {{"amenity", "vending_machine"}, {"vending", "condoms"}}},
+      {{"amenity", "vending_machine", "drinks"}, {{"amenity", "vending_machine"}, {"vending", "drinks"}}},
+      {{"amenity", "vending_machine", "food"}, {{"amenity", "vending_machine"}, {"vending", "food"}}},
+      {{"amenity", "vending_machine", "parking_tickets"},
+       {{"amenity", "vending_machine"}, {"vending", "parking_tickets"}}},
+      {{"amenity", "vending_machine", "public_transport_tickets"},
+       {{"amenity", "vending_machine"}, {"vending", "public_transport_tickets"}}},
+      {{"amenity", "vending_machine", "newspapers"}, {{"amenity", "vending_machine"}, {"vending", "newspapers"}}},
+      {{"amenity", "vending_machine", "sweets"}, {{"amenity", "vending_machine"}, {"vending", "sweets"}}},
+      {{"amenity"}, {{"amenity", "any_value"}}},
+      {{"boundary", "administrative", "2"}, {{"boundary", "administrative"}, {"admin_level", "2"}}},
+      {{"boundary", "administrative", "3"}, {{"boundary", "administrative"}, {"admin_level", "3"}}},
+      {{"boundary", "administrative", "4"}, {{"boundary", "administrative"}, {"admin_level", "4"}}},
+      {{"building", "garage"}, {{"building", "garage"}}},
+      {{"building", "garage"}, {{"building", "yes"}, {"garage", "any_value"}}},
+      {{"building"}, {{"building", "any_value"}}},
+      {{"building:part"}, {{"building:part", "any_value"}}},
+      {{"entrance"}, {{"entrance", "any_value"}}},
+      {{"highway", "bridleway", "bridge"}, {{"highway", "bridleway"}, {"bridge", "any_value"}}},
+      {{"highway", "bridleway", "tunnel"}, {{"highway", "bridleway"}, {"tunnel", "any_value"}}},
+      {{"highway", "busway"}, {{"highway", "service"}, {"service", "bus"}}},
+      {{"highway", "busway"}, {{"highway", "service"}, {"service", "busway"}}},
+      {{"highway", "busway", "bridge"}, {{"highway", "busway"}, {"bridge", "any_value"}}},
+      {{"highway", "busway", "tunnel"}, {{"highway", "busway"}, {"tunnel", "any_value"}}},
+      {{"highway", "cycleway", "bridge"}, {{"highway", "cycleway"}, {"bridge", "any_value"}}},
+      {{"highway", "cycleway", "tunnel"}, {{"highway", "cycleway"}, {"tunnel", "any_value"}}},
+      {{"highway", "footway", "area"}, {{"highway", "footway"}, {"area", "any_value"}}},
+      {{"highway", "footway", "bridge"}, {{"highway", "footway"}, {"bridge", "any_value"}}},
+      {{"highway", "footway"}, {{"highway", "footway"}, {"footway", "unsupported_value"}}},
+      {{"highway", "footway", "sidewalk"}, {{"highway", "footway"}, {"footway", "sidewalk"}}},
+      {{"highway", "footway", "crossing"}, {{"highway", "footway"}, {"footway", "crossing"}}},
+      {{"highway", "footway", "tunnel"}, {{"highway", "footway"}, {"tunnel", "any_value"}}},
+      {{"highway", "footway", "tunnel"}, {{"highway", "footway"}, {"location", "underground"}}},
+      {{"highway", "living_street", "bridge"}, {{"highway", "living_street"}, {"bridge", "any_value"}}},
+      {{"highway", "living_street", "tunnel"}, {{"highway", "living_street"}, {"tunnel", "any_value"}}},
+      {{"highway", "motorway", "bridge"}, {{"highway", "motorway"}, {"bridge", "any_value"}}},
+      {{"highway", "motorway", "tunnel"}, {{"highway", "motorway"}, {"tunnel", "any_value"}}},
+      {{"highway", "motorway_link", "bridge"}, {{"highway", "motorway_link"}, {"bridge", "any_value"}}},
+      {{"highway", "motorway_link", "tunnel"}, {{"highway", "motorway_link"}, {"tunnel", "any_value"}}},
+      {{"highway", "path", "bridge"}, {{"highway", "path"}, {"bridge", "any_value"}}},
+      {{"highway", "path", "horse"}, {{"highway", "path"}, {"horse", "any_value"}}},
+      {{"highway", "path", "tunnel"}, {{"highway", "path"}, {"tunnel", "any_value"}}},
+      {{"highway", "path", "difficult"}, {{"highway", "path"}, {"_path_grade", "difficult"}}},
+      {{"highway", "path", "expert"}, {{"highway", "path"}, {"_path_grade", "expert"}}},
+      {{"highway", "pedestrian", "area"}, {{"highway", "pedestrian"}, {"area", "any_value"}}},
+      {{"highway", "pedestrian", "bridge"}, {{"highway", "pedestrian"}, {"bridge", "any_value"}}},
+      {{"highway", "pedestrian", "tunnel"}, {{"highway", "pedestrian"}, {"tunnel", "any_value"}}},
+      {{"highway", "primary", "bridge"}, {{"highway", "primary"}, {"bridge", "any_value"}}},
+      {{"highway", "primary", "tunnel"}, {{"highway", "primary"}, {"tunnel", "any_value"}}},
+      {{"highway", "primary_link", "bridge"}, {{"highway", "primary_link"}, {"bridge", "any_value"}}},
+      {{"highway", "primary_link", "tunnel"}, {{"highway", "primary_link"}, {"tunnel", "any_value"}}},
+      {{"highway", "residential", "area"}, {{"highway", "residential"}, {"area", "any_value"}}},
+      {{"highway", "residential", "bridge"}, {{"highway", "residential"}, {"bridge", "any_value"}}},
+      {{"highway", "residential", "tunnel"}, {{"highway", "residential"}, {"tunnel", "any_value"}}},
+      {{"highway", "road", "bridge"}, {{"highway", "road"}, {"bridge", "any_value"}}},
+      {{"highway", "road", "tunnel"}, {{"highway", "road"}, {"tunnel", "any_value"}}},
+      {{"highway", "secondary", "bridge"}, {{"highway", "secondary"}, {"bridge", "any_value"}}},
+      {{"highway", "secondary", "tunnel"}, {{"highway", "secondary"}, {"tunnel", "any_value"}}},
+      {{"highway", "secondary_link", "bridge"}, {{"highway", "secondary_link"}, {"bridge", "any_value"}}},
+      {{"highway", "secondary_link", "tunnel"}, {{"highway", "secondary_link"}, {"tunnel", "any_value"}}},
+      {{"highway", "service", "area"}, {{"highway", "service"}, {"area", "any_value"}}},
+      {{"highway", "service", "bridge"}, {{"highway", "service"}, {"bridge", "any_value"}}},
+      {{"highway", "service", "driveway"}, {{"highway", "service"}, {"service", "driveway"}}},
+      {{"highway", "service", "parking_aisle"}, {{"highway", "service"}, {"service", "parking_aisle"}}},
+      {{"highway", "service", "tunnel"}, {{"highway", "service"}, {"tunnel", "any_value"}}},
+      {{"highway", "steps", "bridge"}, {{"highway", "steps"}, {"bridge", "any_value"}}},
+      {{"highway", "steps", "tunnel"}, {{"highway", "steps"}, {"tunnel", "any_value"}}},
+      {{"highway", "tertiary", "bridge"}, {{"highway", "tertiary"}, {"bridge", "any_value"}}},
+      {{"highway", "tertiary", "tunnel"}, {{"highway", "tertiary"}, {"tunnel", "any_value"}}},
+      {{"highway", "tertiary_link", "bridge"}, {{"highway", "tertiary_link"}, {"bridge", "any_value"}}},
+      {{"highway", "tertiary_link", "tunnel"}, {{"highway", "tertiary_link"}, {"tunnel", "any_value"}}},
+      {{"highway", "track", "area"}, {{"highway", "track"}, {"area", "any_value"}}},
+      {{"highway", "track", "bridge"}, {{"highway", "track"}, {"bridge", "any_value"}}},
+      {{"highway", "track", "tunnel"}, {{"highway", "track"}, {"tunnel", "any_value"}}},
+      {{"highway", "trunk", "bridge"}, {{"highway", "trunk"}, {"bridge", "any_value"}}},
+      {{"highway", "trunk", "tunnel"}, {{"highway", "trunk"}, {"tunnel", "any_value"}}},
+      {{"highway", "trunk_link", "bridge"}, {{"highway", "trunk_link"}, {"bridge", "any_value"}}},
+      {{"highway", "trunk_link", "tunnel"}, {{"highway", "trunk_link"}, {"tunnel", "any_value"}}},
+      {{"highway", "unclassified", "area"}, {{"highway", "unclassified"}, {"area", "any_value"}}},
+      {{"highway", "unclassified", "bridge"}, {{"highway", "unclassified"}, {"bridge", "any_value"}}},
+      {{"highway", "unclassified", "tunnel"}, {{"highway", "unclassified"}, {"tunnel", "any_value"}}},
+      {{"historic", "castle", "defensive"}, {{"historic", "castle"}, {"castle_type", "defensive"}}},
+      {{"historic", "castle", "fortress"}, {{"historic", "castle"}, {"castle_type", "fortress"}}},
+      {{"historic", "castle", "fortress"}, {{"historic", "fortress"}}},
+      {{"historic", "castle", "manor"}, {{"historic", "castle"}, {"castle_type", "manor"}}},
+      {{"historic", "castle", "manor"}, {{"historic", "manor"}}},
+      {{"historic", "castle", "stately"}, {{"historic", "castle"}, {"castle_type", "stately"}}},
+      {{"historic", "memorial", "cross"}, {{"historic", "memorial"}, {"memorial", "cross"}}},
+      {{"historic", "memorial", "plaque"}, {{"historic", "memorial"}, {"memorial", "plaque"}}},
+      {{"historic", "memorial", "plaque"}, {{"historic", "memorial"}, {"memorial:type", "plaque"}}},
+      {{"historic", "memorial", "plaque"}, {{"historic", "memorial"}, {"memorial:type", "plate"}}},
+      {{"historic", "memorial", "sculpture"}, {{"historic", "memorial"}, {"memorial", "sculpture"}}},
+      {{"historic", "memorial", "sculpture"}, {{"historic", "memorial"}, {"memorial:type", "sculpture"}}},
+      {{"historic", "memorial", "statue"}, {{"historic", "memorial"}, {"memorial", "statue"}}},
+      {{"historic", "memorial", "statue"}, {{"historic", "memorial"}, {"memorial:type", "statue"}}},
+      {{"historic", "memorial", "stolperstein"}, {{"historic", "memorial"}, {"memorial", "stolperstein"}}},
+      {{"historic", "memorial", "stolperstein"}, {{"historic", "memorial"}, {"memorial:type", "stolperstein"}}},
+      {{"historic", "memorial", "war_memorial"}, {{"historic", "memorial"}, {"memorial", "war_memorial"}}},
+      {{"historic", "memorial", "war_memorial"}, {{"historic", "memorial"}, {"memorial:type", "war_memorial"}}},
+      {{"internet_access"}, {{"internet_access", "any_value"}}},
+      {{"landuse", "cemetery", "christian"}, {{"landuse", "cemetery"}, {"religion", "christian"}}},
+      {{"landuse", "forest"}, {{"landuse", "forest"}}},
+      {{"landuse", "forest"}, {{"natural", "wood"}}},
+      {{"landuse", "forest", "coniferous"}, {{"landuse", "forest"}, {"leaf_type", "coniferous"}}},
+      {{"landuse", "forest", "coniferous"}, {{"landuse", "forest"}, {"wood", "coniferous"}}},
+      {{"landuse", "forest", "coniferous"}, {{"natural", "wood"}, {"leaf_type", "coniferous"}}},
+      {{"landuse", "forest", "coniferous"}, {{"natural", "wood"}, {"wood", "coniferous"}}},
+      {{"landuse", "forest", "deciduous"}, {{"landuse", "forest"}, {"leaf_cycle", "deciduous"}}},
+      {{"landuse", "forest", "deciduous"}, {{"landuse", "forest"}, {"leaf_type", "deciduous"}}},
+      {{"landuse", "forest", "deciduous"}, {{"landuse", "forest"}, {"wood", "deciduous"}}},
+      {{"landuse", "forest", "deciduous"}, {{"natural", "wood"}, {"leaf_cycle", "deciduous"}}},
+      {{"landuse", "forest", "deciduous"}, {{"natural", "wood"}, {"leaf_type", "deciduous"}}},
+      {{"landuse", "forest", "deciduous"}, {{"natural", "wood"}, {"wood", "deciduous"}}},
+      {{"landuse", "forest", "mixed"}, {{"landuse", "forest"}, {"leaf_cycle", "mixed"}}},
+      {{"landuse", "forest", "mixed"}, {{"landuse", "forest"}, {"leaf_type", "mixed"}}},
+      {{"landuse", "forest", "mixed"}, {{"landuse", "forest"}, {"wood", "mixed"}}},
+      {{"landuse", "forest", "mixed"}, {{"natural", "wood"}, {"leaf_cycle", "mixed"}}},
+      {{"landuse", "forest", "mixed"}, {{"natural", "wood"}, {"leaf_type", "mixed"}}},
+      {{"landuse", "forest", "mixed"}, {{"natural", "wood"}, {"wood", "mixed"}}},
+      {{"leisure", "park", "no-access"}, {{"leisure", "park"}, {"access", "no"}}},
+      {{"leisure", "park", "private"}, {{"leisure", "park"}, {"access", "private"}}},
+      {{"leisure", "park", "private"}, {{"leisure", "park"}, {"access", "private"}}},
+      {{"leisure", "sports_centre"}, {{"leisure", "sports_centre"}}},
+      {{"leisure", "track", "area"}, {{"leisure", "track"}, {"area", "any_value"}}},
+      {{"mountain_pass"}, {{"mountain_pass", "any_value"}}},
+      {{"natural", "desert"}, {{"natural", "sand"}, {"desert", "erg"}}},
+      {{"natural", "water", "pond"}, {{"natural", "water"}, {"water", "pond"}}},
+      {{"natural", "water", "lake"}, {{"natural", "water"}, {"water", "lake"}}},
+      {{"natural", "water", "reservoir"}, {{"natural", "water"}, {"water", "reservoir"}}},
+      {{"natural", "water", "river"}, {{"natural", "water"}, {"water", "river"}}},
+      {{"natural", "water", "basin"}, {{"natural", "water"}, {"water", "basin"}}},
+      {{"natural", "water", "lock"}, {{"natural", "water"}, {"water", "lock"}}},
+      {{"natural", "wetland", "bog"}, {{"natural", "wetland"}, {"wetland", "bog"}}},
+      {{"natural", "wetland", "marsh"}, {{"natural", "wetland"}, {"wetland", "marsh"}}},
+      {{"natural", "wetland", "marsh"}, {{"natural", "wetland"}, {"wetland", "wet_meadow"}}},
+      {{"natural", "wetland", "saltmarsh"}, {{"natural", "wetland"}, {"wetland", "saltmarsh"}}},
+      {{"natural", "wetland", "saltmarsh", "tidal"},
+       {{"natural", "wetland"}, {"wetland", "saltmarsh"}, {"tidal", "yes"}}},
+      {{"natural", "wetland", "fen"}, {{"natural", "wetland"}, {"wetland", "fen"}}},
+      {{"natural", "wetland", "reedbed"}, {{"natural", "wetland"}, {"wetland", "reedbed"}}},
+      {{"natural", "wetland", "swamp"}, {{"natural", "wetland"}, {"wetland", "swamp"}}},
+      {{"natural", "wetland", "mangrove"}, {{"natural", "wetland"}, {"wetland", "mangrove"}}},
+      {{"natural", "wetland", "tidalflat"}, {{"natural", "wetland"}, {"wetland", "tidalflat"}}},
+      {{"office"}, {{"office", "any_value"}}},
+      {{"piste:type", "downhill", "advanced"}, {{"piste:type", "downhill"}, {"piste:difficulty", "advanced"}}},
+      {{"piste:type", "downhill", "easy"}, {{"piste:type", "downhill"}, {"piste:difficulty", "easy"}}},
+      {{"piste:type", "downhill", "expert"}, {{"piste:type", "downhill"}, {"piste:difficulty", "expert"}}},
+      {{"piste:type", "downhill", "freeride"}, {{"piste:type", "downhill"}, {"piste:difficulty", "freeride"}}},
+      {{"piste:type", "downhill", "intermediate"}, {{"piste:type", "downhill"}, {"piste:difficulty", "intermediate"}}},
+      {{"piste:type", "downhill", "novice"}, {{"piste:type", "downhill"}, {"piste:difficulty", "novice"}}},
+      {{"place", "city", "capital", "10"}, {{"place", "city"}, {"capital", "10"}}},
+      {{"place", "city", "capital", "10"}, {{"place", "city"}, {"capital", "any_value"}, {"admin_level", "10"}}},
+      {{"place", "city", "capital", "11"}, {{"place", "city"}, {"capital", "11"}}},
+      {{"place", "city", "capital", "11"}, {{"place", "city"}, {"capital", "any_value"}, {"admin_level", "11"}}},
+      {{"place", "city", "capital", "2"}, {{"place", "city"}, {"capital", "2"}}},
+      {{"place", "city", "capital", "2"}, {{"place", "city"}, {"capital", "any_value"}, {"admin_level", "2"}}},
+      {{"place", "city", "capital", "3"}, {{"place", "city"}, {"capital", "3"}}},
+      {{"place", "city", "capital", "3"}, {{"place", "city"}, {"capital", "any_value"}, {"admin_level", "3"}}},
+      {{"place", "city", "capital", "4"}, {{"place", "city"}, {"capital", "4"}}},
+      {{"place", "city", "capital", "4"}, {{"place", "city"}, {"capital", "any_value"}, {"admin_level", "4"}}},
+      {{"place", "city", "capital", "5"}, {{"place", "city"}, {"capital", "5"}}},
+      {{"place", "city", "capital", "5"}, {{"place", "city"}, {"capital", "any_value"}, {"admin_level", "5"}}},
+      {{"place", "city", "capital", "6"}, {{"place", "city"}, {"capital", "6"}}},
+      {{"place", "city", "capital", "6"}, {{"place", "city"}, {"capital", "any_value"}, {"admin_level", "6"}}},
+      {{"place", "city", "capital", "7"}, {{"place", "city"}, {"capital", "7"}}},
+      {{"place", "city", "capital", "7"}, {{"place", "city"}, {"capital", "any_value"}, {"admin_level", "7"}}},
+      {{"place", "city", "capital", "8"}, {{"place", "city"}, {"capital", "8"}}},
+      {{"place", "city", "capital", "8"}, {{"place", "city"}, {"capital", "any_value"}, {"admin_level", "8"}}},
+      {{"place", "city", "capital", "9"}, {{"place", "city"}, {"capital", "9"}}},
+      {{"place", "city", "capital", "9"}, {{"place", "city"}, {"capital", "any_value"}, {"admin_level", "9"}}},
+      {{"place", "city", "capital"}, {{"place", "city"}, {"capital", "any_value"}}},
+      {{"place", "state", "USA"}, {{"place", "state"}, {"addr:country", "US"}}},
+      {{"place", "state", "USA"}, {{"place", "state"}, {"is_in", "USA"}}},
+      {{"place", "state", "USA"}, {{"place", "state"}, {"is_in:country", "USA"}}},
+      {{"place", "state", "USA"}, {{"place", "state"}, {"is_in:country_code", "us"}}},
+      {{"railway", "abandoned", "bridge"}, {{"railway", "abandoned"}, {"bridge", "any_value"}}},
+      {{"railway", "abandoned", "tunnel"}, {{"railway", "abandoned"}, {"tunnel", "any_value"}}},
+      {{"railway", "funicular", "bridge"}, {{"railway", "funicular"}, {"bridge", "any_value"}}},
+      {{"railway", "funicular", "tunnel"}, {{"railway", "funicular"}, {"tunnel", "any_value"}}},
+      {{"railway", "light_rail", "bridge"}, {{"railway", "light_rail"}, {"bridge", "any_value"}}},
+      //{{"railway", "light_rail", "tunnel"}, {{"railway", "light_rail"}, {"tunnel", "any_value"}}},
+      {{"railway", "monorail", "bridge"}, {{"railway", "monorail"}, {"bridge", "any_value"}}},
+      {{"railway", "monorail", "tunnel"}, {{"railway", "monorail"}, {"tunnel", "any_value"}}},
+      {{"railway", "narrow_gauge", "bridge"}, {{"railway", "narrow_gauge"}, {"bridge", "any_value"}}},
+      {{"railway", "narrow_gauge", "tunnel"}, {{"railway", "narrow_gauge"}, {"tunnel", "any_value"}}},
+      {{"railway", "preserved", "bridge"}, {{"railway", "preserved"}, {"bridge", "any_value"}}},
+      {{"railway", "preserved", "tunnel"}, {{"railway", "preserved"}, {"tunnel", "any_value"}}},
+      {{"railway", "station", "light_rail"}, {{"railway", "station"}, {"station", "light_rail"}}},
+      {{"railway", "station", "light_rail"}, {{"railway", "station"}, {"transport", "light_rail"}}},
+      {{"railway", "station", "monorail"}, {{"railway", "station"}, {"station", "monorail"}}},
+      {{"railway", "station", "monorail"}, {{"railway", "station"}, {"transport", "monorail"}}},
+      {{"railway", "station", "subway", "barcelona"},
+       {{"railway", "station"}, {"station", "subway"}, {"city", "barcelona"}}},
+      {{"railway", "station", "subway", "barcelona"},
+       {{"railway", "station"}, {"transport", "subway"}, {"city", "barcelona"}}},
+      {{"railway", "station", "subway", "berlin"}, {{"railway", "station"}, {"station", "subway"}, {"city", "berlin"}}},
+      {{"railway", "station", "subway", "berlin"},
+       {{"railway", "station"}, {"transport", "subway"}, {"city", "berlin"}}},
+      {{"railway", "station", "subway", "kiev"}, {{"railway", "station"}, {"station", "subway"}, {"city", "kiev"}}},
+      {{"railway", "station", "subway", "kiev"}, {{"railway", "station"}, {"transport", "subway"}, {"city", "kiev"}}},
+      {{"railway", "station", "subway", "london"}, {{"railway", "station"}, {"station", "subway"}, {"city", "london"}}},
+      {{"railway", "station", "subway", "london"},
+       {{"railway", "station"}, {"transport", "subway"}, {"city", "london"}}},
+      {{"railway", "station", "subway", "madrid"}, {{"railway", "station"}, {"station", "subway"}, {"city", "madrid"}}},
+      {{"railway", "station", "subway", "madrid"},
+       {{"railway", "station"}, {"transport", "subway"}, {"city", "madrid"}}},
+      {{"railway", "station", "subway", "minsk"}, {{"railway", "station"}, {"station", "subway"}, {"city", "minsk"}}},
+      {{"railway", "station", "subway", "minsk"}, {{"railway", "station"}, {"transport", "subway"}, {"city", "minsk"}}},
+      {{"railway", "station", "subway", "moscow"}, {{"railway", "station"}, {"station", "subway"}, {"city", "moscow"}}},
+      {{"railway", "station", "subway", "moscow"},
+       {{"railway", "station"}, {"transport", "subway"}, {"city", "moscow"}}},
+      {{"railway", "station", "subway", "newyork"},
+       {{"railway", "station"}, {"station", "subway"}, {"city", "newyork"}}},
+      {{"railway", "station", "subway", "newyork"},
+       {{"railway", "station"}, {"transport", "subway"}, {"city", "newyork"}}},
+      {{"railway", "station", "subway", "paris"}, {{"railway", "station"}, {"station", "subway"}, {"city", "paris"}}},
+      {{"railway", "station", "subway", "paris"}, {{"railway", "station"}, {"transport", "subway"}, {"city", "paris"}}},
+      {{"railway", "station", "subway", "roma"}, {{"railway", "station"}, {"station", "subway"}, {"city", "roma"}}},
+      {{"railway", "station", "subway", "roma"}, {{"railway", "station"}, {"transport", "subway"}, {"city", "roma"}}},
+      {{"railway", "station", "subway", "spb"}, {{"railway", "station"}, {"station", "subway"}, {"city", "spb"}}},
+      {{"railway", "station", "subway", "spb"}, {{"railway", "station"}, {"transport", "subway"}, {"city", "spb"}}},
+      {{"railway", "station", "subway"}, {{"railway", "station"}, {"station", "subway"}}},
+      {{"railway", "station", "subway"}, {{"railway", "station"}, {"transport", "subway"}}},
+      {{"railway", "subway", "bridge"}, {{"railway", "subway"}, {"bridge", "any_value"}}},
+      //{{"railway", "subway", "tunnel"}, {{"railway", "subway"}, {"tunnel", "any_value"}}},
+      {{"railway", "subway_entrance", "barcelona"}, {{"railway", "subway_entrance"}, {"city", "barcelona"}}},
+      {{"railway", "subway_entrance", "berlin"}, {{"railway", "subway_entrance"}, {"city", "berlin"}}},
+      {{"railway", "subway_entrance", "kiev"}, {{"railway", "subway_entrance"}, {"city", "kiev"}}},
+      {{"railway", "subway_entrance", "london"}, {{"railway", "subway_entrance"}, {"city", "london"}}},
+      {{"railway", "subway_entrance", "madrid"}, {{"railway", "subway_entrance"}, {"city", "madrid"}}},
+      {{"railway", "subway_entrance", "minsk"}, {{"railway", "subway_entrance"}, {"city", "minsk"}}},
+      {{"railway", "subway_entrance", "moscow"}, {{"railway", "subway_entrance"}, {"city", "moscow"}}},
+      {{"railway", "subway_entrance", "newyork"}, {{"railway", "subway_entrance"}, {"city", "newyork"}}},
+      {{"railway", "subway_entrance", "paris"}, {{"railway", "subway_entrance"}, {"city", "paris"}}},
+      {{"railway", "subway_entrance", "roma"}, {{"railway", "subway_entrance"}, {"city", "roma"}}},
+      {{"railway", "subway_entrance", "spb"}, {{"railway", "subway_entrance"}, {"city", "spb"}}},
+      {{"railway", "tram", "bridge"}, {{"railway", "tram"}, {"bridge", "any_value"}}},
+      {{"railway", "tram", "tunnel"}, {{"railway", "tram"}, {"tunnel", "any_value"}}},
+      {{"shop", "car_repair", "tyres"}, {{"shop", "car_repair"}, {"service", "tyres"}}},
+      {{"shop", "clothes"}, {{"shop", "clothes"}}},
+      {{"shop", "clothes"}, {{"shop", "fashion"}}},
+      {{"shop"}, {{"shop", "any_value"}}},
+      {{"sport", "golf"}, {{"sport", "golf"}}},
+      {{"sport", "golf"}, {{"sport", "miniature_golf"}}},
+      {{"tourism", "artwork", "architecture"}, {{"tourism", "artwork"}, {"artwork_type", "architecture"}}},
+      {{"tourism", "artwork", "architecture"}, {{"tourism", "artwork"}, {"type", "architecture"}}},
+      {{"tourism", "artwork", "painting"}, {{"tourism", "artwork"}, {"artwork_type", "painting"}}},
+      {{"tourism", "artwork", "painting"}, {{"tourism", "artwork"}, {"type", "painting"}}},
+      {{"tourism", "artwork", "sculpture"}, {{"tourism", "artwork"}, {"artwork_type", "sculpture"}}},
+      {{"tourism", "artwork", "sculpture"}, {{"tourism", "artwork"}, {"type", "sculpture"}}},
+      {{"tourism", "artwork", "statue"}, {{"tourism", "artwork"}, {"artwork_type", "statue"}}},
+      {{"tourism", "artwork", "statue"}, {{"tourism", "artwork"}, {"type", "statue"}}},
+      {{"attraction", "animal"}, {{"attraction", "animal"}}},
+      {{"tourism", "information", "board"}, {{"tourism", "information"}, {"information", "board"}}},
+      {{"tourism", "information", "guidepost"}, {{"tourism", "information"}, {"information", "guidepost"}}},
+      {{"tourism", "information", "map"}, {{"tourism", "information"}, {"information", "map"}}},
+      {{"tourism", "information", "office"}, {{"tourism", "information"}, {"information", "office"}}},
+      //{{"waterway", "canal", "tunnel"}, {{"waterway", "canal"}, {"tunnel", "any_value"}}},
+      //{{"waterway", "river", "tunnel"}, {{"waterway", "river"}, {"tunnel", "any_value"}}},
+      {{"waterway", "stream", "ephemeral"}, {{"waterway", "stream"}, {"intermittent", "ephemeral"}}},
+      {{"waterway", "stream", "intermittent"}, {{"waterway", "stream"}, {"intermittent", "yes"}}},
   };
 
   for (auto const & type : complexTypes)
@@ -3066,46 +2991,47 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_HighwayTypesConversion)
 {
   using Type = std::vector<std::string>;
   std::vector<std::pair<Type, Tags>> const conversions = {
-    {{"highway", "cycleway"}, {{"highway", "path"}, {"foot", "no"}, {"bicycle", "designated"}}},
+      {{"highway", "cycleway"}, {{"highway", "path"}, {"foot", "no"}, {"bicycle", "designated"}}},
 
-    // Paved etc. paths to footways.
-    {{"highway", "footway"}, {{"highway", "path"}, {"surface", "paved"}}},
-    {{"highway", "footway"}, {{"highway", "path"}, {"surface", "paved"}, {"smoothness", "bad"}}},
-    {{"highway", "footway"}, {{"highway", "path"}, {"surface", "compacted"}, {"smoothness", "intermediate"}}},
-    {{"highway", "footway"}, {{"highway", "path"}, {"surface", "gravel"}, {"smoothness", "good"}}},
-    {{"highway", "footway", "sidewalk"}, {{"highway", "path"}, {"surface", "gravel"}, {"footway", "sidewalk"}}},
-    {{"highway", "footway"}, {{"highway", "path"}, {"smoothness", "good"}}},
-    {{"highway", "footway", "crossing"}, {{"highway", "path"}, {"footway", "crossing"}}},
-    {{"highway", "footway"}, {{"highway", "path"}, {"lit", "yes"}}},
-    {{"highway", "footway"}, {{"highway", "path"}, {"segregated", "no"}}},
-    // No conversion.
-    {{"highway", "path"}, {{"highway", "path"}, {"surface", "unpaved"}}},
-    {{"highway", "path"}, {{"highway", "path"}, {"surface", "compacted"}, {"smoothness", "bad"}}},
-    {{"highway", "path"}, {{"highway", "path"}, {"surface", "gravel"}, {"tracktype", "grade3"}}},
-    {{"highway", "path"}, {{"highway", "path"}, {"surface", "gravel"}, {"tracktype", "grade1"}, {"sac_scale", "hiking"}}},
-    {{"highway", "path"}, {{"highway", "path"}, {"smoothness", "good"}, {"tracktype", "grade3"}}},
-    {{"highway", "path"}, {{"highway", "path"}, {"tracktype", "grade3"}, {"footway", "sidewalk"}}},
-    {{"highway", "path"}, {{"highway", "path"}, {"smoothness", "intermediate"}}},
-    {{"highway", "path"}, {{"highway", "path"}, {"lit", "no"}}},
+      // Paved etc. paths to footways.
+      {{"highway", "footway"}, {{"highway", "path"}, {"surface", "paved"}}},
+      {{"highway", "footway"}, {{"highway", "path"}, {"surface", "paved"}, {"smoothness", "bad"}}},
+      {{"highway", "footway"}, {{"highway", "path"}, {"surface", "compacted"}, {"smoothness", "intermediate"}}},
+      {{"highway", "footway"}, {{"highway", "path"}, {"surface", "gravel"}, {"smoothness", "good"}}},
+      {{"highway", "footway", "sidewalk"}, {{"highway", "path"}, {"surface", "gravel"}, {"footway", "sidewalk"}}},
+      {{"highway", "footway"}, {{"highway", "path"}, {"smoothness", "good"}}},
+      {{"highway", "footway", "crossing"}, {{"highway", "path"}, {"footway", "crossing"}}},
+      {{"highway", "footway"}, {{"highway", "path"}, {"lit", "yes"}}},
+      {{"highway", "footway"}, {{"highway", "path"}, {"segregated", "no"}}},
+      // No conversion.
+      {{"highway", "path"}, {{"highway", "path"}, {"surface", "unpaved"}}},
+      {{"highway", "path"}, {{"highway", "path"}, {"surface", "compacted"}, {"smoothness", "bad"}}},
+      {{"highway", "path"}, {{"highway", "path"}, {"surface", "gravel"}, {"tracktype", "grade3"}}},
+      {{"highway", "path"},
+       {{"highway", "path"}, {"surface", "gravel"}, {"tracktype", "grade1"}, {"sac_scale", "hiking"}}},
+      {{"highway", "path"}, {{"highway", "path"}, {"smoothness", "good"}, {"tracktype", "grade3"}}},
+      {{"highway", "path"}, {{"highway", "path"}, {"tracktype", "grade3"}, {"footway", "sidewalk"}}},
+      {{"highway", "path"}, {{"highway", "path"}, {"smoothness", "intermediate"}}},
+      {{"highway", "path"}, {{"highway", "path"}, {"lit", "no"}}},
 
-    // Unpaved etc. footways to paths.
-    {{"highway", "path"}, {{"highway", "footway"}, {"surface", "unpaved"}}},
-    {{"highway", "path"}, {{"highway", "footway"}, {"surface", "unpaved"}, {"smoothness", "excellent"}}},
-    {{"highway", "path"}, {{"highway", "footway"}, {"surface", "compacted"}, {"smoothness", "bad"}}},
-    {{"highway", "path"}, {{"highway", "footway"}, {"smoothness", "bad"}}},
-    {{"highway", "path"}, {{"highway", "footway"}, {"sac_scale", "hiking"}}},
-    {{"highway", "path"}, {{"highway", "footway"}, {"trail_visibility", "good"}}},
-    {{"highway", "path"}, {{"highway", "footway"}, {"tracktype", "grade2"}, {"sac_scale", "hiking"}}},
-    // TODO(@pastk): ford=* is converted to highway=ford via replaced_tags.txt; get rid of highway=ford
-    {{"highway", "footway"}, {{"highway", "footway"}, {"ford", "stepping_stones"}}},
-    {{"highway", "path"}, {{"highway", "footway"}, {"informal", "yes"}}},
-    // No conversion.
-    {{"highway", "footway"}, {{"highway", "footway"}, {"surface", "paved"}}},
-    {{"highway", "footway"}, {{"highway", "footway"}, {"surface", "compacted"}, {"smoothness", "good"}}},
-    {{"highway", "footway"}, {{"highway", "footway"}, {"smoothness", "good"}, {"tracktype", "grade2"}}},
-    {{"highway", "footway"}, {{"highway", "footway"}, {"tracktype", "grade1"}, {"sac_scale", "hiking"}}},
-    {{"highway", "footway", "sidewalk"}, {{"highway", "footway"}, {"tracktype", "grade2"}, {"footway", "sidewalk"}}},
-    {{"highway", "footway"}, {{"highway", "footway"}, {"lit", "no"}}},
+      // Unpaved etc. footways to paths.
+      {{"highway", "path"}, {{"highway", "footway"}, {"surface", "unpaved"}}},
+      {{"highway", "path"}, {{"highway", "footway"}, {"surface", "unpaved"}, {"smoothness", "excellent"}}},
+      {{"highway", "path"}, {{"highway", "footway"}, {"surface", "compacted"}, {"smoothness", "bad"}}},
+      {{"highway", "path"}, {{"highway", "footway"}, {"smoothness", "bad"}}},
+      {{"highway", "path"}, {{"highway", "footway"}, {"sac_scale", "hiking"}}},
+      {{"highway", "path"}, {{"highway", "footway"}, {"trail_visibility", "good"}}},
+      {{"highway", "path"}, {{"highway", "footway"}, {"tracktype", "grade2"}, {"sac_scale", "hiking"}}},
+      // TODO(@pastk): ford=* is converted to highway=ford via replaced_tags.txt; get rid of highway=ford
+      {{"highway", "footway"}, {{"highway", "footway"}, {"ford", "stepping_stones"}}},
+      {{"highway", "path"}, {{"highway", "footway"}, {"informal", "yes"}}},
+      // No conversion.
+      {{"highway", "footway"}, {{"highway", "footway"}, {"surface", "paved"}}},
+      {{"highway", "footway"}, {{"highway", "footway"}, {"surface", "compacted"}, {"smoothness", "good"}}},
+      {{"highway", "footway"}, {{"highway", "footway"}, {"smoothness", "good"}, {"tracktype", "grade2"}}},
+      {{"highway", "footway"}, {{"highway", "footway"}, {"tracktype", "grade1"}, {"sac_scale", "hiking"}}},
+      {{"highway", "footway", "sidewalk"}, {{"highway", "footway"}, {"tracktype", "grade2"}, {"footway", "sidewalk"}}},
+      {{"highway", "footway"}, {{"highway", "footway"}, {"lit", "no"}}},
   };
 
   for (auto const & type : conversions)
@@ -3115,16 +3041,19 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_HighwayTypesConversion)
   }
 
   std::vector<std::pair<std::vector<Type>, Tags>> const complexConversions = {
-    // Add an explicit footway to a segregated cycleway.
-    {{{"highway", "cycleway"}, {"highway", "footway"}}, {{"highway", "cycleway"}, {"segregated", "yes"}}},
-    {{{"highway", "cycleway"}, {"highway", "footway"}, {"hwtag", "yesfoot"}}, {{"highway", "cycleway"}, {"sidewalk", "right"}}},
+      // Add an explicit footway to a segregated cycleway.
+      {{{"highway", "cycleway"}, {"highway", "footway"}}, {{"highway", "cycleway"}, {"segregated", "yes"}}},
+      {{{"highway", "cycleway"}, {"highway", "footway"}, {"hwtag", "yesfoot"}},
+       {{"highway", "cycleway"}, {"sidewalk", "right"}}},
 
-    // Segregated path becomes cycleway + footway.
-    {{{"highway", "cycleway"}, {"highway", "footway"}}, {{"highway", "path"}, {"segregated", "yes"}}},
+      // Segregated path becomes cycleway + footway.
+      {{{"highway", "cycleway"}, {"highway", "footway"}}, {{"highway", "path"}, {"segregated", "yes"}}},
 
-    // A non-segregated cycleway becomes shared path/footway + bicycle=designated.
-    {{{"highway", "footway", "bicycle"}, {"hwtag", "yesbicycle"}}, {{"highway", "cycleway"}, {"segregated", "no"}, {"foot", "designated"}}},
-    {{{"highway", "path", "bicycle"}, {"hwtag", "yesbicycle"}, {"hwtag", "yesfoot"}, {"psurface", "unpaved_good"}}, {{"highway", "cycleway"}, {"foot", "yes"}, {"surface", "unpaved"}}},
+      // A non-segregated cycleway becomes shared path/footway + bicycle=designated.
+      {{{"highway", "footway", "bicycle"}, {"hwtag", "yesbicycle"}},
+       {{"highway", "cycleway"}, {"segregated", "no"}, {"foot", "designated"}}},
+      {{{"highway", "path", "bicycle"}, {"hwtag", "yesbicycle"}, {"hwtag", "yesfoot"}, {"psurface", "unpaved_good"}},
+       {{"highway", "cycleway"}, {"foot", "yes"}, {"surface", "unpaved"}}},
   };
 
   for (auto const & type : complexConversions)
@@ -3133,9 +3062,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_HighwayTypesConversion)
     auto const params = GetFeatureBuilderParams(type.second);
     TEST_EQUAL(params.m_types.size(), results.size(), (type, params));
     for (auto const & result : results)
-    {
       TEST(params.IsTypeExist(GetType(result)), (type, params));
-    }
   }
 }
 
@@ -3143,15 +3070,19 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_PathGrades)
 {
   using Type = std::vector<std::string>;
   std::vector<std::pair<Type, Tags>> const conversions = {
-    {{"highway", "path"}, {{"highway", "path"}, {"sac_scale", "mountain_hiking"}, {"trail_visibility", "intermediate"}}},
-    {{"highway", "path"}, {{"highway", "path"}, {"sac_scale", "unsupported_value"}, {"trail_visibility", "unsupported_value"}}},
+      {{"highway", "path"},
+       {{"highway", "path"}, {"sac_scale", "mountain_hiking"}, {"trail_visibility", "intermediate"}}},
+      {{"highway", "path"},
+       {{"highway", "path"}, {"sac_scale", "unsupported_value"}, {"trail_visibility", "unsupported_value"}}},
 
-    {{"highway", "path", "difficult"}, {{"highway", "path"}, {"sac_scale", "demanding_mountain_hiking"}, {"trail_visibility", "excellent"}}},
-    {{"highway", "path", "difficult"}, {{"highway", "path"}, {"trail_visibility", "bad"}}},
+      {{"highway", "path", "difficult"},
+       {{"highway", "path"}, {"sac_scale", "demanding_mountain_hiking"}, {"trail_visibility", "excellent"}}},
+      {{"highway", "path", "difficult"}, {{"highway", "path"}, {"trail_visibility", "bad"}}},
 
-    {{"highway", "path", "expert"}, {{"highway", "path"}, {"sac_scale", "alpine_hiking"}}},
-    {{"highway", "path", "expert"}, {{"highway", "path"}, {"trail_visibility", "horrible"}}},
-    {{"highway", "path", "expert"}, {{"highway", "path"}, {"sac_scale", "difficult_alpine_hiking"}, {"trail_visibility", "no"}}},
+      {{"highway", "path", "expert"}, {{"highway", "path"}, {"sac_scale", "alpine_hiking"}}},
+      {{"highway", "path", "expert"}, {{"highway", "path"}, {"trail_visibility", "horrible"}}},
+      {{"highway", "path", "expert"},
+       {{"highway", "path"}, {"sac_scale", "difficult_alpine_hiking"}, {"trail_visibility", "no"}}},
   };
 
   for (auto const & type : conversions)
@@ -3165,12 +3096,16 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_MultipleComplexTypesSmoke)
 {
   using Type = std::vector<std::string>;
   std::vector<std::pair<std::vector<Type>, Tags>> const complexTypes = {
-    {{{"amenity", "parking"}, {"fee", "no"}}, {{"amenity", "parking"}, {"fee", "no"}}},
-    {{{"amenity", "parking", "fee"}, {"fee", "yes"}}, {{"amenity", "parking"}, {"fee", "any_value"}}},
-    {{{"amenity", "parking", "lane", "fee"}, {"fee", "yes"}}, {{"amenity", "parking"}, {"parking", "lane"}, {"fee", "any_value"}}},
-    {{{"amenity", "parking", "multi-storey", "fee"}, {"fee", "yes"}}, {{"amenity", "parking"}, {"parking", "multi-storey"}, {"fee", "any_value"}}},
-    {{{"amenity", "parking", "street_side", "fee"}, {"fee", "yes"}}, {{"amenity", "parking"}, {"parking", "street_side"}, {"fee", "any_value"}}},
-    {{{"amenity", "parking", "underground", "fee"}, {"fee", "yes"}}, {{"amenity", "parking"}, {"parking", "underground"}, {"fee", "any_value"}}},
+      {{{"amenity", "parking"}, {"fee", "no"}}, {{"amenity", "parking"}, {"fee", "no"}}},
+      {{{"amenity", "parking", "fee"}, {"fee", "yes"}}, {{"amenity", "parking"}, {"fee", "any_value"}}},
+      {{{"amenity", "parking", "lane", "fee"}, {"fee", "yes"}},
+       {{"amenity", "parking"}, {"parking", "lane"}, {"fee", "any_value"}}},
+      {{{"amenity", "parking", "multi-storey", "fee"}, {"fee", "yes"}},
+       {{"amenity", "parking"}, {"parking", "multi-storey"}, {"fee", "any_value"}}},
+      {{{"amenity", "parking", "street_side", "fee"}, {"fee", "yes"}},
+       {{"amenity", "parking"}, {"parking", "street_side"}, {"fee", "any_value"}}},
+      {{{"amenity", "parking", "underground", "fee"}, {"fee", "yes"}},
+       {{"amenity", "parking"}, {"parking", "underground"}, {"fee", "any_value"}}},
   };
 
   for (auto const & type : complexTypes)
@@ -3179,9 +3114,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_MultipleComplexTypesSmoke)
     auto const params = GetFeatureBuilderParams(type.second);
     TEST_EQUAL(params.m_types.size(), results.size(), (type, params));
     for (auto const & result : results)
-    {
       TEST(params.IsTypeExist(GetType(result)), (type, params));
-    }
   }
 }
 
diff --git a/generator/generator_tests/place_processor_tests.cpp b/generator/generator_tests/place_processor_tests.cpp
index 117fba203..4c75bf6ad 100644
--- a/generator/generator_tests/place_processor_tests.cpp
+++ b/generator/generator_tests/place_processor_tests.cpp
@@ -68,8 +68,7 @@ feature::FeatureBuilder MakeFbForTest(generator_tests::Tags const & tags, OsmEle
     CHECK(result.IsGeometryClosed(), ());
     result.SetArea();
 
-    result.SetOsmId(element.IsRelation() ? base::MakeOsmRelation(element.m_id)
-                                         : base::MakeOsmWay(element.m_id));
+    result.SetOsmId(element.IsRelation() ? base::MakeOsmRelation(element.m_id) : base::MakeOsmWay(element.m_id));
   }
   return result;
 }
@@ -78,7 +77,8 @@ bool TestTable(generator::OsmIdToBoundariesTable & table,
                std::set<std::pair<std::vector<base::GeoObjectId>, size_t>> const & answer)
 {
   bool result = true;
-  table.ForEachCluster([&](auto & ids, auto const & boundaries) {
+  table.ForEachCluster([&](auto & ids, auto const & boundaries)
+  {
     if (!result)
       return;
 
@@ -110,9 +110,7 @@ using PlaceWithIDs = std::pair<feature::FeatureBuilder, generator::PlaceProcesso
 void Sort(std::vector<PlaceWithIDs> & value)
 {
   std::sort(value.begin(), value.end(), [](auto const & left, auto const & right)
-  {
-    return left.first.GetMostGenericOsmId() < right.first.GetMostGenericOsmId();
-  });
+  { return left.first.GetMostGenericOsmId() < right.first.GetMostGenericOsmId(); });
 
   for (auto & [_, ids] : value)
   {
@@ -163,16 +161,15 @@ UNIT_CLASS_TEST(TestPlaceProcessor, EmptyTest)
 
 UNIT_CLASS_TEST(TestPlaceProcessor, OnePlacePointTest)
 {
-  auto const point =
-      MakeFbForTest({{"name", "City"}, {"place", "city"}}, OsmElement::EntityType::Node,
-                    {{172.6314353942871, -43.493592271503786}});
+  auto const point = MakeFbForTest({{"name", "City"}, {"place", "city"}}, OsmElement::EntityType::Node,
+                                   {{172.6314353942871, -43.493592271503786}});
 
   PlaceProcessorTestFixture pp;
   pp.Add(point);
 
   std::vector<PlaceWithIDs> expected{{point, {point.GetMostGenericOsmId()}}};
   Test(pp, expected);
-  //TEST(TestTable(*table, {}), ());
+  // TEST(TestTable(*table, {}), ());
 }
 
 UNIT_CLASS_TEST(TestPlaceProcessor, OnePlaceAreaTest)
@@ -180,50 +177,44 @@ UNIT_CLASS_TEST(TestPlaceProcessor, OnePlaceAreaTest)
   PlaceProcessorTestFixture pp;
   pp.Add(kArea);
 
-  std::vector<PlaceWithIDs> expected{
-      {generator::MakePoint(kArea), {kArea.GetMostGenericOsmId()}}};
+  std::vector<PlaceWithIDs> expected{{generator::MakePoint(kArea), {kArea.GetMostGenericOsmId()}}};
   Test(pp, expected);
-  //TEST(TestTable(*table, {{{kArea.GetMostGenericOsmId()}, 1 /* cluster size */}}), ());
+  // TEST(TestTable(*table, {{{kArea.GetMostGenericOsmId()}, 1 /* cluster size */}}), ());
 }
 
 UNIT_CLASS_TEST(TestPlaceProcessor, PointInAreaTest)
 {
-  auto const point =
-      MakeFbForTest({{"name", "City"}, {"place", "city"}}, OsmElement::EntityType::Node,
-                    {{172.6314353942871, -43.493592271503786}});
+  auto const point = MakeFbForTest({{"name", "City"}, {"place", "city"}}, OsmElement::EntityType::Node,
+                                   {{172.6314353942871, -43.493592271503786}});
 
   PlaceProcessorTestFixture pp;
   pp.Add(kArea);
   pp.Add(point);
 
-  std::vector<PlaceWithIDs> expected{
-      {point, {point.GetMostGenericOsmId(), kArea.GetMostGenericOsmId()}}};
+  std::vector<PlaceWithIDs> expected{{point, {point.GetMostGenericOsmId(), kArea.GetMostGenericOsmId()}}};
   Test(pp, expected);
-  //TEST(TestTable(*table, {{{point.GetMostGenericOsmId(), kArea.GetMostGenericOsmId()}, 1 /* cluster size */}}), ());
+  // TEST(TestTable(*table, {{{point.GetMostGenericOsmId(), kArea.GetMostGenericOsmId()}, 1 /* cluster size */}}), ());
 }
 
 UNIT_CLASS_TEST(TestPlaceProcessor, SameNamesButDifferentPlacesTest)
 {
-  auto const point =
-      MakeFbForTest({{"name", "City"}, {"place", "city"}}, OsmElement::EntityType::Node,
-                    {{162.6314353942871, -33.493592271503786}});
+  auto const point = MakeFbForTest({{"name", "City"}, {"place", "city"}}, OsmElement::EntityType::Node,
+                                   {{162.6314353942871, -33.493592271503786}});
 
   PlaceProcessorTestFixture pp;
   pp.Add(kArea);
   pp.Add(point);
 
-  std::vector<PlaceWithIDs> expected{
-      {point, {point.GetMostGenericOsmId()}},
-      {generator::MakePoint(kArea), {kArea.GetMostGenericOsmId()}}};
+  std::vector<PlaceWithIDs> expected{{point, {point.GetMostGenericOsmId()}},
+                                     {generator::MakePoint(kArea), {kArea.GetMostGenericOsmId()}}};
   Test(pp, expected);
-  //TEST(TestTable(*table, {{{kArea.GetMostGenericOsmId()}, 1 /* cluster size */}}), ());
+  // TEST(TestTable(*table, {{{kArea.GetMostGenericOsmId()}, 1 /* cluster size */}}), ());
 }
 
 UNIT_CLASS_TEST(TestPlaceProcessor, SelectBestPlaceTest)
 {
-  auto const point1 =
-      MakeFbForTest({{"name", "City"}, {"place", "city"}}, OsmElement::EntityType::Node,
-                    {{162.6314353942871, -33.493592271503786}});
+  auto const point1 = MakeFbForTest({{"name", "City"}, {"place", "city"}}, OsmElement::EntityType::Node,
+                                    {{162.6314353942871, -33.493592271503786}});
   auto const point2 = MakeFbForTest({{"name", "City"}, {"place", "city"}, {"capital", "yes"}},
                                     OsmElement::EntityType::Node, {{162.63145, -33.4935}});
 
@@ -231,10 +222,9 @@ UNIT_CLASS_TEST(TestPlaceProcessor, SelectBestPlaceTest)
   pp.Add(point1);
   pp.Add(point2);
 
-  std::vector<PlaceWithIDs> expected{
-      {point2, {point1.GetMostGenericOsmId(), point2.GetMostGenericOsmId()}}};
+  std::vector<PlaceWithIDs> expected{{point2, {point1.GetMostGenericOsmId(), point2.GetMostGenericOsmId()}}};
   Test(pp, expected);
-  //TEST(TestTable(*table, {}), ());
+  // TEST(TestTable(*table, {}), ());
 }
 
 // Correct city Relations processing is not in PlaceProcessor only, but also in RoutingCityBoundariesCollector.
@@ -1341,53 +1331,50 @@ UNIT_CLASS_TEST(TestPlaceProcessor, VoronezhDuplicatingCityFeatureTest)
 
 UNIT_CLASS_TEST(TestPlaceProcessor, KuznetsovoNearbyHamletsTest)
 {
-  auto const point1 = MakeFbForTest({{"name", "Кузнецово"}, {"place", "hamlet"}},
-                                    OsmElement::EntityType::Node, {{39.5338039, 71.44840478}});
+  auto const point1 = MakeFbForTest({{"name", "Кузнецово"}, {"place", "hamlet"}}, OsmElement::EntityType::Node,
+                                    {{39.5338039, 71.44840478}});
 
-  auto const way1 =
-      MakeFbForTest({{"name", "Кузнецово"}, {"place", "hamlet"}}, OsmElement::EntityType::Way,
-                    {{39.5300791, 71.4499322},
-                     {39.5360952, 71.449952},
-                     {39.5358614, 71.4481361},
-                     {39.533932, 71.4479877},
-                     {39.5334559, 71.4466931},
-                     {39.5328246, 71.4468055},
-                     {39.531898, 71.447587},
-                     {39.5305723, 71.4482665},
-                     {39.5300791, 71.4499322}});
+  auto const way1 = MakeFbForTest({{"name", "Кузнецово"}, {"place", "hamlet"}}, OsmElement::EntityType::Way,
+                                  {{39.5300791, 71.4499322},
+                                   {39.5360952, 71.449952},
+                                   {39.5358614, 71.4481361},
+                                   {39.533932, 71.4479877},
+                                   {39.5334559, 71.4466931},
+                                   {39.5328246, 71.4468055},
+                                   {39.531898, 71.447587},
+                                   {39.5305723, 71.4482665},
+                                   {39.5300791, 71.4499322}});
 
-  auto const point2 = MakeFbForTest({{"name", "Кузнецово"}, {"place", "hamlet"}},
-                                    OsmElement::EntityType::Node, {{39.6701222, 71.52284624}});
+  auto const point2 = MakeFbForTest({{"name", "Кузнецово"}, {"place", "hamlet"}}, OsmElement::EntityType::Node,
+                                    {{39.6701222, 71.52284624}});
 
-  auto const way2 =
-      MakeFbForTest({{"name", "Кузнецово"}, {"place", "hamlet"}}, OsmElement::EntityType::Way,
-                    {{39.6670159, 71.5224511},
-                     {39.6719028, 71.525375},
-                     {39.6732332, 71.5231513},
-                     {39.6683465, 71.5202275},
-                     {39.6670159, 71.5224511}});
+  auto const way2 = MakeFbForTest({{"name", "Кузнецово"}, {"place", "hamlet"}}, OsmElement::EntityType::Way,
+                                  {{39.6670159, 71.5224511},
+                                   {39.6719028, 71.525375},
+                                   {39.6732332, 71.5231513},
+                                   {39.6683465, 71.5202275},
+                                   {39.6670159, 71.5224511}});
 
-  auto const point3 = MakeFbForTest({{"name", "Кузнецово"}, {"place", "hamlet"}},
-                                    OsmElement::EntityType::Node, {{39.9688407, 71.45936188}});
+  auto const point3 = MakeFbForTest({{"name", "Кузнецово"}, {"place", "hamlet"}}, OsmElement::EntityType::Node,
+                                    {{39.9688407, 71.45936188}});
 
-  auto const way3 =
-      MakeFbForTest({{"name", "Кузнецово"}, {"place", "hamlet"}}, OsmElement::EntityType::Way,
-                    {{39.9694614, 71.4609508},
-                     {39.9695483, 71.460343},
-                     {39.9698434, 71.4598916},
-                     {39.970373, 71.4583027},
-                     {39.9703469, 71.458025},
-                     {39.9701473, 71.4578426},
-                     {39.969036, 71.458485},
-                     {39.9685064, 71.4579208},
-                     {39.968246, 71.4578946},
-                     {39.967647, 71.4588411},
-                     {39.9676383, 71.4589973},
-                     {39.9680029, 71.4591536},
-                     {39.9681505, 71.459414},
-                     {39.9670826, 71.4609508},
-                     {39.9690534, 71.461055},
-                     {39.9694614, 71.4609508}});
+  auto const way3 = MakeFbForTest({{"name", "Кузнецово"}, {"place", "hamlet"}}, OsmElement::EntityType::Way,
+                                  {{39.9694614, 71.4609508},
+                                   {39.9695483, 71.460343},
+                                   {39.9698434, 71.4598916},
+                                   {39.970373, 71.4583027},
+                                   {39.9703469, 71.458025},
+                                   {39.9701473, 71.4578426},
+                                   {39.969036, 71.458485},
+                                   {39.9685064, 71.4579208},
+                                   {39.968246, 71.4578946},
+                                   {39.967647, 71.4588411},
+                                   {39.9676383, 71.4589973},
+                                   {39.9680029, 71.4591536},
+                                   {39.9681505, 71.459414},
+                                   {39.9670826, 71.4609508},
+                                   {39.9690534, 71.461055},
+                                   {39.9694614, 71.4609508}});
 
   PlaceProcessorTestFixture pp;
   pp.Add(point1);
@@ -1396,16 +1383,15 @@ UNIT_CLASS_TEST(TestPlaceProcessor, KuznetsovoNearbyHamletsTest)
   pp.Add(way1);
   pp.Add(way2);
   pp.Add(way3);
-  std::vector<PlaceWithIDs> expected{
-      {point1, {point1.GetMostGenericOsmId(), way1.GetMostGenericOsmId()}},
-      {point2, {point2.GetMostGenericOsmId(), way2.GetMostGenericOsmId()}},
-      {point3, {point3.GetMostGenericOsmId(), way3.GetMostGenericOsmId()}}};
+  std::vector<PlaceWithIDs> expected{{point1, {point1.GetMostGenericOsmId(), way1.GetMostGenericOsmId()}},
+                                     {point2, {point2.GetMostGenericOsmId(), way2.GetMostGenericOsmId()}},
+                                     {point3, {point3.GetMostGenericOsmId(), way3.GetMostGenericOsmId()}}};
   Test(pp, expected);
-//  TEST(TestTable(
-//           *table,
-//           {{{point1.GetMostGenericOsmId(), way1.GetMostGenericOsmId()}, 1 /* cluster size */},
-//            {{point2.GetMostGenericOsmId(), way2.GetMostGenericOsmId()}, 1 /* cluster size */},
-//            {{point3.GetMostGenericOsmId(), way3.GetMostGenericOsmId()}, 1 /* cluster size */}}),
-//       ());
+  //  TEST(TestTable(
+  //           *table,
+  //           {{{point1.GetMostGenericOsmId(), way1.GetMostGenericOsmId()}, 1 /* cluster size */},
+  //            {{point2.GetMostGenericOsmId(), way2.GetMostGenericOsmId()}, 1 /* cluster size */},
+  //            {{point3.GetMostGenericOsmId(), way3.GetMostGenericOsmId()}, 1 /* cluster size */}}),
+  //       ());
 }
-} // namespace place_processor_tests
+}  // namespace place_processor_tests
diff --git a/generator/generator_tests/raw_generator_test.cpp b/generator/generator_tests/raw_generator_test.cpp
index ebdab66a3..eab507436 100644
--- a/generator/generator_tests/raw_generator_test.cpp
+++ b/generator/generator_tests/raw_generator_test.cpp
@@ -1,7 +1,7 @@
 #include "testing/testing.hpp"
 
-#include "generator/generator_tests_support/test_generator.hpp"
 #include "generator/descriptions_section_builder.hpp"
+#include "generator/generator_tests_support/test_generator.hpp"
 
 #include "search/cities_boundaries_table.hpp"
 #include "search/house_to_street_table.hpp"
@@ -43,7 +43,7 @@ UNIT_CLASS_TEST(TestRawGenerator, Towns)
   ForEachFB(mwmName, [&](feature::FeatureBuilder const & fb)
   {
     ++count;
-    //LOG(LINFO, (fb));
+    // LOG(LINFO, (fb));
 
     TEST(!fb.HasType(cityType), ());
 
@@ -69,7 +69,7 @@ UNIT_CLASS_TEST(TestRawGenerator, Towns)
   // Prepare features data source.
   FrozenDataSource dataSource;
   std::vector<MwmSet::MwmId> mwmIDs;
-  for (auto const & name : { mwmName, mwmWorld })
+  for (auto const & name : {mwmName, mwmWorld})
   {
     BuildFeatures(name);
     BuildSearch(name);
@@ -123,15 +123,13 @@ UNIT_CLASS_TEST(TestRawGenerator, HighwayLinks)
   auto const fid2osm = LoadFID2OsmID(mwmName);
 
   using namespace routing;
-  MaxspeedType from120 = 104; // like SpeedMacro::Speed104KmPH
+  MaxspeedType from120 = 104;  // like SpeedMacro::Speed104KmPH
   std::unordered_map<uint64_t, uint16_t> osmID2Speed = {
-    { 23011515, from120 }, { 23011492, from120 }, { 10689329, from120 }, { 371581901, from120 },
-    { 1017695671, from120 }, { 577365212, from120 }, { 23011612, from120 }, { 1017695670, from120 },
-    { 304871606, from120 }, { 1017695669, from120 }, { 577365213, from120 }, { 369541035, from120 },
-    { 1014336646, from120 }, { 466365947, from120 }, { 23011511, from120 }
-  };
+      {23011515, from120},  {23011492, from120},  {10689329, from120},   {371581901, from120}, {1017695671, from120},
+      {577365212, from120}, {23011612, from120},  {1017695670, from120}, {304871606, from120}, {1017695669, from120},
+      {577365213, from120}, {369541035, from120}, {1014336646, from120}, {466365947, from120}, {23011511, from120}};
   /// @todo Actually, better to assign speed for this way too.
-  std::unordered_set<uint64_t> osmNoSpeed = { 23691193, 1017695668 };
+  std::unordered_set<uint64_t> osmNoSpeed = {23691193, 1017695668};
 
   FrozenDataSource dataSource;
   auto const res = dataSource.RegisterMap(platform::LocalCountryFile::MakeTemporary(GetMwmPath(mwmName)));
@@ -296,7 +294,7 @@ UNIT_CLASS_TEST(TestRawGenerator, Place_Region)
   worldRegions = 0;
 
   // Prepare features data source.
-  for (auto const & name : { mwmName, worldMwmName })
+  for (auto const & name : {mwmName, worldMwmName})
   {
     BuildFeatures(name);
     BuildSearch(name);
@@ -391,7 +389,7 @@ std::string_view GetPostcode(FeatureType & ft)
 {
   return ft.GetMetadata(feature::Metadata::FMD_POSTCODE);
 }
-} // namespace
+}  // namespace
 
 UNIT_CLASS_TEST(TestRawGenerator, Postcode_Relations)
 {
@@ -477,15 +475,15 @@ UNIT_TEST(Relation_Wiki)
   std::string const mwmName = "Relation";
 
   std::string const arrFiles[] = {
-    "./data/test_data/osm/village_relation.osm",
-    "./data/test_data/osm/novenkoe_village.osm",
-    "./data/test_data/osm/nikolaevka_village.osm",
+      "./data/test_data/osm/village_relation.osm",
+      "./data/test_data/osm/novenkoe_village.osm",
+      "./data/test_data/osm/nikolaevka_village.osm",
   };
 
   std::string const arrWiki[] = {
-    "fr:Charmois-l'Orgueilleux",
-    "ru:Новенькое (Локтевский район)",
-    "ru:Николаевка (Локтевский район)",
+      "fr:Charmois-l'Orgueilleux",
+      "ru:Новенькое (Локтевский район)",
+      "ru:Николаевка (Локтевский район)",
   };
 
   for (size_t i = 0; i < std::size(arrFiles); ++i)
@@ -564,56 +562,51 @@ UNIT_TEST(Place_CityRelations)
   std::string const worldMwmName = WORLD_FILE_NAME;
 
   std::string const arrFiles[] = {
-    // 1 Relation with many polygons + 1 Node.
-    "./data/test_data/osm/gorlovka_city.osm",
-    // 2 Relations + 1 Node
-    "./data/test_data/osm/tver_city.osm",
-    // 1 Relation + 1 Node with _different_ names.
-    "./data/test_data/osm/reykjavik_city.osm",
-    "./data/test_data/osm/berlin_city.osm",
-    // Relation boundary is place=suburb, but border_type=city
-    "./data/test_data/osm/riviera_beach_city.osm",
-    "./data/test_data/osm/hotchkiss_town.osm",
-    "./data/test_data/osm/voronezh_city.osm",
-    "./data/test_data/osm/minsk_city.osm",
+      // 1 Relation with many polygons + 1 Node.
+      "./data/test_data/osm/gorlovka_city.osm",
+      // 2 Relations + 1 Node
+      "./data/test_data/osm/tver_city.osm",
+      // 1 Relation + 1 Node with _different_ names.
+      "./data/test_data/osm/reykjavik_city.osm", "./data/test_data/osm/berlin_city.osm",
+      // Relation boundary is place=suburb, but border_type=city
+      "./data/test_data/osm/riviera_beach_city.osm", "./data/test_data/osm/hotchkiss_town.osm",
+      "./data/test_data/osm/voronezh_city.osm", "./data/test_data/osm/minsk_city.osm",
 
-    // 1 boundary-only Relation + 1 Node
-    "./data/test_data/osm/kadikoy_town.osm",
-    // 2 Relations + 1 Node
-    "./data/test_data/osm/stolbtcy_town.osm",
-    // 1 Way + 1 Relation + 1 Node
-    "./data/test_data/osm/dmitrov_town.osm",
-    "./data/test_data/osm/lesnoy_town.osm",
+      // 1 boundary-only Relation + 1 Node
+      "./data/test_data/osm/kadikoy_town.osm",
+      // 2 Relations + 1 Node
+      "./data/test_data/osm/stolbtcy_town.osm",
+      // 1 Way + 1 Relation + 1 Node
+      "./data/test_data/osm/dmitrov_town.osm", "./data/test_data/osm/lesnoy_town.osm",
 
-    "./data/test_data/osm/pushkino_city.osm",
-    "./data/test_data/osm/korday_town.osm",
-    "./data/test_data/osm/bad_neustadt_town.osm",
+      "./data/test_data/osm/pushkino_city.osm", "./data/test_data/osm/korday_town.osm",
+      "./data/test_data/osm/bad_neustadt_town.osm",
 
-    /// @todo We don't store villages in World now, but for the future!
-    // 1 Relation + 1 Node (not linked with each other)
-    //"./data/test_data/osm/palm_beach_village.osm",
+      /// @todo We don't store villages in World now, but for the future!
+      // 1 Relation + 1 Node (not linked with each other)
+      //"./data/test_data/osm/palm_beach_village.osm",
   };
 
   ms::LatLon arrNotInBoundary[] = {
-    {48.2071448, 37.9729054},   // gorlovka
-    {56.9118261, 36.2258988},   // tver
-    {64.0469397, -21.9772409},  // reykjavik
-    {52.4013879, 13.0601531},   // berlin
-    {26.7481191, -80.0836532},  // riviera beach
-    {38.7981690, -107.7347750}, // hotchkiss
-    {51.7505379, 39.5894547},   // voronezh
-    {53.9170050, 27.8576710},   // minsk
+      {48.2071448, 37.9729054},    // gorlovka
+      {56.9118261, 36.2258988},    // tver
+      {64.0469397, -21.9772409},   // reykjavik
+      {52.4013879, 13.0601531},    // berlin
+      {26.7481191, -80.0836532},   // riviera beach
+      {38.7981690, -107.7347750},  // hotchkiss
+      {51.7505379, 39.5894547},    // voronezh
+      {53.9170050, 27.8576710},    // minsk
 
-    {41.0150982, 29.0213844},   // kadikoy
-    {53.5086454, 26.6979711},   // stolbtcy
-    {56.3752679, 37.3288391},   // dmitrov
-    {54.0026933, 27.6356912},   // lesnoy
+      {41.0150982, 29.0213844},  // kadikoy
+      {53.5086454, 26.6979711},  // stolbtcy
+      {56.3752679, 37.3288391},  // dmitrov
+      {54.0026933, 27.6356912},  // lesnoy
 
-    {56.0807652, 37.9277319},   // pushkino
-    {43.2347760, 74.7573240},   // korday
-    {50.4006992, 10.2020744},   // bad_neustadt
+      {56.0807652, 37.9277319},  // pushkino
+      {43.2347760, 74.7573240},  // korday
+      {50.4006992, 10.2020744},  // bad_neustadt
 
-    //{26.6757006, -80.0547346},  // palm beach
+      //{26.6757006, -80.0547346},  // palm beach
   };
 
   size_t constexpr kManyBoundriesUpperIndex = 8;
@@ -659,7 +652,8 @@ UNIT_TEST(Place_CityRelations)
 
     // Check that we have valid boundary in World.
     FrozenDataSource dataSource;
-    auto const res = dataSource.RegisterMap(platform::LocalCountryFile::MakeTemporary(generator.GetMwmPath(worldMwmName)));
+    auto const res =
+        dataSource.RegisterMap(platform::LocalCountryFile::MakeTemporary(generator.GetMwmPath(worldMwmName)));
     TEST_EQUAL(res.second, MwmSet::RegResult::Success, ());
 
     search::CitiesBoundariesTable table(dataSource);
@@ -700,11 +694,11 @@ UNIT_TEST(Place_CityRelations_IncludePoint)
   std::string const worldMwmName = WORLD_FILE_NAME;
 
   std::string const arrFiles[] = {
-    "./data/test_data/osm/valentin_alsina_town.osm",
+      "./data/test_data/osm/valentin_alsina_town.osm",
   };
 
   ms::LatLon arrInBoundary[] = {
-    {-34.6699107, -58.4302163},   // valentin_alsina
+      {-34.6699107, -58.4302163},  // valentin_alsina
   };
 
   for (size_t i = 0; i < std::size(arrFiles); ++i)
@@ -734,7 +728,8 @@ UNIT_TEST(Place_CityRelations_IncludePoint)
 
     // Check that we have valid boundary in World.
     FrozenDataSource dataSource;
-    auto const res = dataSource.RegisterMap(platform::LocalCountryFile::MakeTemporary(generator.GetMwmPath(worldMwmName)));
+    auto const res =
+        dataSource.RegisterMap(platform::LocalCountryFile::MakeTemporary(generator.GetMwmPath(worldMwmName)));
     TEST_EQUAL(res.second, MwmSet::RegResult::Success, ());
 
     search::CitiesBoundariesTable table(dataSource);
@@ -779,9 +774,9 @@ UNIT_CLASS_TEST(TestRawGenerator, Place_NoCityBoundaries)
   TestDataSample const arrInput[] = {
       // Check that we have only 2 cities without duplicates (Pargas, Қордай).
       // Boundaries are removed because of "very big".
-      { "./data/test_data/osm/no_boundary_towns.osm", 2, 2 },
+      {"./data/test_data/osm/no_boundary_towns.osm", 2, 2},
       // 3 villages in country and 0 in World.
-      { "./data/test_data/osm/us_villages_like_towns.osm", 0, 3 },
+      {"./data/test_data/osm/us_villages_like_towns.osm", 0, 3},
   };
 
   for (size_t i = 0; i < std::size(arrInput); ++i)
@@ -820,7 +815,8 @@ UNIT_CLASS_TEST(TestRawGenerator, Place_NoCityBoundaries)
 
     // Check that we have NO boundaries in World.
     FrozenDataSource dataSource;
-    auto const res = dataSource.RegisterMap(platform::LocalCountryFile::MakeTemporary(generator.GetMwmPath(worldMwmName)));
+    auto const res =
+        dataSource.RegisterMap(platform::LocalCountryFile::MakeTemporary(generator.GetMwmPath(worldMwmName)));
     TEST_EQUAL(res.second, MwmSet::RegResult::Success, ());
 
     search::CitiesBoundariesTable table(dataSource);
@@ -901,9 +897,9 @@ UNIT_TEST(MiniRoundabout_Connectivity)
   std::string const mwmName = "MiniRoundabout";
 
   std::string const arrFiles[] = {
-    "./data/test_data/osm/mini_roundabout_1.osm",
-    "./data/test_data/osm/mini_roundabout_2.osm",
-    "./data/test_data/osm/mini_roundabout_3.osm",
+      "./data/test_data/osm/mini_roundabout_1.osm",
+      "./data/test_data/osm/mini_roundabout_2.osm",
+      "./data/test_data/osm/mini_roundabout_3.osm",
   };
 
   for (auto const & fileName : arrFiles)
@@ -927,10 +923,8 @@ UNIT_TEST(MiniRoundabout_Connectivity)
     auto const IsPointInRoundabout = [&roundabout](m2::PointD const & pt)
     {
       for (auto const & p : roundabout)
-      {
         if (AlmostEqualAbs(p, pt, kMwmPointAccuracy))
           return true;
-      }
       return false;
     };
 
@@ -1138,10 +1132,10 @@ UNIT_CLASS_TEST(TestRawGenerator, Addr_Street_Place)
     bool m_checkStreet, m_checkPlace;
   };
   TestData const arrFiles[] = {
-    { "./data/test_data/osm/addr_street_place.osm", 1, true, true },
-    { "./data/test_data/osm/addr_street_very_far.osm", 2, true, false },
-    { "./data/test_data/osm/zelenograd.osm", 1, false, true },
-    { "./data/test_data/osm/addr_area_street.osm", 1, true, false },
+      {"./data/test_data/osm/addr_street_place.osm", 1, true, true},
+      {"./data/test_data/osm/addr_street_very_far.osm", 2, true, false},
+      {"./data/test_data/osm/zelenograd.osm", 1, false, true},
+      {"./data/test_data/osm/addr_area_street.osm", 1, true, false},
   };
 
   for (auto const & data : arrFiles)
@@ -1234,4 +1228,4 @@ UNIT_CLASS_TEST(TestRawGenerator, Railway_Station)
   TEST_EQUAL(count, 1, ());
 }
 
-} // namespace raw_generator_tests
+}  // namespace raw_generator_tests
diff --git a/generator/generator_tests/relation_tags_tests.cpp b/generator/generator_tests/relation_tags_tests.cpp
index 65eeab14d..4c91378da 100644
--- a/generator/generator_tests/relation_tags_tests.cpp
+++ b/generator/generator_tests/relation_tags_tests.cpp
@@ -1,8 +1,8 @@
 #include "testing/testing.hpp"
 
 #include "generator/generator_tests/common.hpp"
-#include "generator/relation_tags.hpp"
 #include "generator/intermediate_data.hpp"
+#include "generator/relation_tags.hpp"
 
 #include "indexer/classificator_loader.hpp"
 
@@ -18,16 +18,10 @@ using namespace generator_tests;
 class TestOSMElementCacheReader : public OSMElementCacheReaderInterface
 {
 public:
-  TestOSMElementCacheReader(std::unordered_map<Key, RelationElement> & m)
-    : m_mapping(m)
-  {
-  }
+  TestOSMElementCacheReader(std::unordered_map<Key, RelationElement> & m) : m_mapping(m) {}
 
   // OSMElementCacheReaderInterface overrides:
-  bool Read(Key /* id */, WayElement & /* value */) override
-  {
-    UNREACHABLE();
-  }
+  bool Read(Key /* id */, WayElement & /* value */) override { UNREACHABLE(); }
 
   bool Read(Key id, RelationElement & value) override
   {
@@ -135,7 +129,7 @@ UNIT_TEST(Process_route_with_ref_network)
 
   // Verify roads tags.
   TEST_EQUAL(road10.GetTag("ref"), "IT:RA/SP60", ());
-  TEST_EQUAL(road11.GetTag("ref"), "SP62", ()); // TODO: Check refs inheritance (expected "IT:RA/SP60;SP62")
+  TEST_EQUAL(road11.GetTag("ref"), "SP62", ());  // TODO: Check refs inheritance (expected "IT:RA/SP60;SP62")
 }
 
 UNIT_TEST(Process_associatedStreet)
@@ -170,9 +164,13 @@ UNIT_TEST(Process_associatedStreet)
   TestOSMElementCacheReader reader(m_IdToRelation);
 
   // Create buildings polygons.
-  auto buildingWay2 = MakeOsmElement(2, {{"building", "yes"}, {"addr:housenumber", "121"}}, OsmElement::EntityType::Way);
-  auto buildingWay3 = MakeOsmElement(3, {{"shop", "convenience"}, {"addr:housenumber", "123"},
-                                         {"addr:street", "The Main Street"}, {"wikipedia", "en:Mega Theater"}},
+  auto buildingWay2 =
+      MakeOsmElement(2, {{"building", "yes"}, {"addr:housenumber", "121"}}, OsmElement::EntityType::Way);
+  auto buildingWay3 = MakeOsmElement(3,
+                                     {{"shop", "convenience"},
+                                      {"addr:housenumber", "123"},
+                                      {"addr:street", "The Main Street"},
+                                      {"wikipedia", "en:Mega Theater"}},
                                      OsmElement::EntityType::Way);
   auto highway4 = MakeOsmElement(4, {{"highway", "residential"}}, OsmElement::EntityType::Way);
 
@@ -207,7 +205,8 @@ UNIT_TEST(RelationTags_GoodBoundary)
   std::vector<RelationElement::Member> nodes = {{2, "admin_centre"}, {3, "label"}};
 
   auto way1 = MakeOsmElement(1, {{"boundary", "administrative"}}, OsmElement::EntityType::Way);
-  auto node2 = MakeOsmElement(2, {{"place", "town"}, {"name", "Vaduz"}, {"wikidata", "Q1844"}}, OsmElement::EntityType::Node);
+  auto node2 =
+      MakeOsmElement(2, {{"place", "town"}, {"name", "Vaduz"}, {"wikidata", "Q1844"}}, OsmElement::EntityType::Node);
   auto node3 = MakeOsmElement(3, {{"place", "country"}}, OsmElement::EntityType::Node);
 
   RelationElement e1;
@@ -306,4 +305,4 @@ UNIT_TEST(RelationTags_BadBoundary)
   TEST(outerWay7.GetTag("wikidata").empty(), ());
 }
 
-} // namespace relation_tags_tests
+}  // namespace relation_tags_tests
diff --git a/generator/generator_tests/restriction_collector_test.cpp b/generator/generator_tests/restriction_collector_test.cpp
index def97a79b..3bfbd5f61 100644
--- a/generator/generator_tests/restriction_collector_test.cpp
+++ b/generator/generator_tests/restriction_collector_test.cpp
@@ -75,8 +75,8 @@ std::unique_ptr<IndexGraph> BuildTwoCubeGraph()
 
   std::vector<Joint> const joints = {
       // {{/* feature id */, /* point id */}, ... }
-      MakeJoint({{7, 0}}),                 /* joint at point (-1, 0) */
-      MakeJoint({{0, 0}, {6, 0}, {7, 1}}), /* joint at point (0, 0) */
+      MakeJoint({{7, 0}}),                  /* joint at point (-1, 0) */
+      MakeJoint({{0, 0}, {6, 0}, {7, 1}}),  /* joint at point (0, 0) */
       MakeJoint({{0, 1}, {1, 0}}),          /* joint at point (1, 0) */
       MakeJoint({{1, 1}, {2, 0}, {9, 0}}),  /* joint at point (2, 0) */
       MakeJoint({{2, 1}, {3, 1}, {8, 0}}),  /* joint at point (2, 1) */
@@ -120,9 +120,7 @@ RelationElement MakeRelationElement(std::vector<RelationElement::Member> const &
 class TestRestrictionCollector
 {
 public:
-
-  TestRestrictionCollector()
-    : m_scopedDir(kTestDir)
+  TestRestrictionCollector() : m_scopedDir(kTestDir)
   {
     // Creating osm ids to feature ids mapping.
     std::string const mappingRelativePath = base::JoinPath(kTestDir, kOsmIdsToFeatureIdsName);
@@ -130,8 +128,7 @@ public:
     m_scopedFile = std::make_shared<ScopedFile>(mappingRelativePath, ScopedFile::Mode::Create);
     m_osmIdsToFeatureIdFullPath = m_scopedFile->GetFullPath();
 
-    ReEncodeOsmIdsToFeatureIdsMapping(kosmIdsToFeatureIdsContentForTwoCubeGraph,
-                                      m_osmIdsToFeatureIdFullPath);
+    ReEncodeOsmIdsToFeatureIdsMapping(kosmIdsToFeatureIdsContentForTwoCubeGraph, m_osmIdsToFeatureIdFullPath);
   }
 
   void ValidCase()
@@ -141,19 +138,21 @@ public:
 
     // Adding restrictions.
     TEST(restrictionCollector.AddRestriction(
-        {2.0, 0.0} /* coords of intersection feature with id = 1 and feature with id = 2 */,
-        Restriction::Type::No, /* restriction type */
-        {base::MakeOsmWay(1), base::MakeOsmWay(2)} /* features in format {from, (via*)?, to} */
-    ), ());
+             {2.0, 0.0} /* coords of intersection feature with id = 1 and feature with id = 2 */,
+             Restriction::Type::No,                     /* restriction type */
+             {base::MakeOsmWay(1), base::MakeOsmWay(2)} /* features in format {from, (via*)?, to} */
+             ),
+         ());
 
     TEST(restrictionCollector.AddRestriction({2.0, 1.0}, Restriction::Type::Only,
-                                             {base::MakeOsmWay(2), base::MakeOsmWay(3)}), ());
+                                             {base::MakeOsmWay(2), base::MakeOsmWay(3)}),
+         ());
 
-    TEST(restrictionCollector.AddRestriction(
-        RestrictionCollector::kNoCoords, /* no coords in case of way as via */
-        Restriction::Type::No,
-        /*      from                via                    to         */
-        {base::MakeOsmWay(0), base::MakeOsmWay(1), base::MakeOsmWay(2)}), ());
+    TEST(restrictionCollector.AddRestriction(RestrictionCollector::kNoCoords, /* no coords in case of way as via */
+                                             Restriction::Type::No,
+                                             /*      from                via                    to         */
+                                             {base::MakeOsmWay(0), base::MakeOsmWay(1), base::MakeOsmWay(2)}),
+         ());
 
     base::SortUnique(restrictionCollector.m_restrictions);
 
@@ -175,7 +174,8 @@ public:
 
     // No such feature - 2809
     TEST(!restrictionCollector.AddRestriction({2.0, 1.0}, Restriction::Type::No,
-                                              {base::MakeOsmWay(2809), base::MakeOsmWay(1)}), ());
+                                              {base::MakeOsmWay(2809), base::MakeOsmWay(1)}),
+         ());
 
     TEST(!restrictionCollector.HasRestrictions(), ());
   }
@@ -187,14 +187,14 @@ public:
 
     // Fetures with id 1 and 2 do not intersect in {2.0, 1.0}
     TEST(!restrictionCollector.AddRestriction({2.0, 1.0}, Restriction::Type::No,
-                                              {base::MakeOsmWay(1), base::MakeOsmWay(2)}), ());
+                                              {base::MakeOsmWay(1), base::MakeOsmWay(2)}),
+         ());
 
     // No such chain of features (1 => 2 => 4),
     // because feature with id 2 and 4 do not have common joint.
-    TEST(!restrictionCollector.AddRestriction(
-        RestrictionCollector::kNoCoords,
-        Restriction::Type::No,
-        {base::MakeOsmWay(1), base::MakeOsmWay(2), base::MakeOsmWay(4)}), ());
+    TEST(!restrictionCollector.AddRestriction(RestrictionCollector::kNoCoords, Restriction::Type::No,
+                                              {base::MakeOsmWay(1), base::MakeOsmWay(2), base::MakeOsmWay(4)}),
+         ());
 
     TEST(!restrictionCollector.HasRestrictions(), ());
   }
@@ -205,7 +205,6 @@ private:
   std::string m_osmIdsToFeatureIdFullPath;
 };
 
-
 UNIT_CLASS_TEST(TestRestrictionCollector, ValidCase)
 {
   TestRestrictionCollector::ValidCase();
@@ -230,11 +229,15 @@ UNIT_TEST(RestrictionWriter_Merge)
   auto c1 = std::make_shared<RestrictionWriter>(filename, nullptr /* cache */);
   auto c2 = c1->Clone();
   std::map<std::string, std::string, std::less<>> const tags = {{"type", "restriction"},
-                                                   {"restriction", "no_right_turn"}};
-  c1->CollectRelation(MakeRelationElement({} /* nodes */, {{1, "via"}, {11, "from"}, {21, "to"}} /* ways */, tags /* tags */));
-  c2->CollectRelation(MakeRelationElement({} /* nodes */, {{2, "via"}, {12, "from"}, {22, "to"}} /* ways */, tags /* tags */));
-  c1->CollectRelation(MakeRelationElement({} /* nodes */, {{3, "via"}, {13, "from"}, {23, "to"}} /* ways */, tags /* tags */));
-  c2->CollectRelation(MakeRelationElement({} /* nodes */, {{4, "via"}, {14, "from"}, {24, "to"}} /* ways */, tags /* tags */));
+                                                                {"restriction", "no_right_turn"}};
+  c1->CollectRelation(
+      MakeRelationElement({} /* nodes */, {{1, "via"}, {11, "from"}, {21, "to"}} /* ways */, tags /* tags */));
+  c2->CollectRelation(
+      MakeRelationElement({} /* nodes */, {{2, "via"}, {12, "from"}, {22, "to"}} /* ways */, tags /* tags */));
+  c1->CollectRelation(
+      MakeRelationElement({} /* nodes */, {{3, "via"}, {13, "from"}, {23, "to"}} /* ways */, tags /* tags */));
+  c2->CollectRelation(
+      MakeRelationElement({} /* nodes */, {{4, "via"}, {14, "from"}, {24, "to"}} /* ways */, tags /* tags */));
   c1->Finish();
   c2->Finish();
   c1->Merge(*c2);
@@ -246,10 +249,11 @@ UNIT_TEST(RestrictionWriter_Merge)
   std::stringstream buffer;
   buffer << stream.rdbuf();
 
-  std::string const correctAnswer = "No,way,11,1,21\n"
-                                    "No,way,13,3,23\n"
-                                    "No,way,12,2,22\n"
-                                    "No,way,14,4,24\n";
+  std::string const correctAnswer =
+      "No,way,11,1,21\n"
+      "No,way,13,3,23\n"
+      "No,way,12,2,22\n"
+      "No,way,14,4,24\n";
   TEST_EQUAL(buffer.str(), correctAnswer, ());
 }
 }  // namespace routing_builder
diff --git a/generator/generator_tests/restriction_test.cpp b/generator/generator_tests/restriction_test.cpp
index 6cccb4d70..fec4612a6 100644
--- a/generator/generator_tests/restriction_test.cpp
+++ b/generator/generator_tests/restriction_test.cpp
@@ -48,17 +48,16 @@ string const kOsmIdsToFeatureIdsName = "osm_ids_to_feature_ids" OSM2FEATURE_FILE
 struct RestrictionUTurnForTests
 {
   RestrictionUTurnForTests(Restriction::Type type, uint32_t featureId, bool viaIsFirstPoint)
-    : m_type(type),
-      m_featureId(featureId),
-      m_viaIsFirstPoint(viaIsFirstPoint)
+    : m_type(type)
+    , m_featureId(featureId)
+    , m_viaIsFirstPoint(viaIsFirstPoint)
   {
     CHECK(m_type == Restriction::Type::NoUTurn || m_type == Restriction::Type::OnlyUTurn, ());
   }
 
   bool operator==(RestrictionUTurnForTests const & rhs) const
   {
-    return m_type == rhs.m_type && m_featureId == rhs.m_featureId &&
-           m_viaIsFirstPoint == rhs.m_viaIsFirstPoint;
+    return m_type == rhs.m_type && m_featureId == rhs.m_featureId && m_viaIsFirstPoint == rhs.m_viaIsFirstPoint;
   }
 
   bool operator<(RestrictionUTurnForTests const & rhs) const
@@ -92,8 +91,7 @@ void BuildEmptyMwm(LocalCountryFile & country)
   generator::tests_support::TestMwmBuilder builder(country, feature::DataHeader::MapType::Country);
 }
 
-void LoadRestrictions(string const & mwmFilePath,
-                      vector<Restriction> & restrictions,
+void LoadRestrictions(string const & mwmFilePath, vector<Restriction> & restrictions,
                       vector<RestrictionUTurnForTests> & restrictionsUTurn)
 {
   FilesContainerR const cont(mwmFilePath);
@@ -111,8 +109,8 @@ void LoadRestrictions(string const & mwmFilePath,
     RestrictionVec restrictionsOnly;
     vector<RestrictionUTurn> restrictionsNoUTurn;
     vector<RestrictionUTurn> restrictionsOnlyUTurn;
-    RestrictionSerializer::Deserialize(header, restrictionsNo, restrictionsOnly,
-                                       restrictionsNoUTurn, restrictionsOnlyUTurn, src);
+    RestrictionSerializer::Deserialize(header, restrictionsNo, restrictionsOnly, restrictionsNoUTurn,
+                                       restrictionsOnlyUTurn, src);
 
     for (auto const & r : restrictionsNo)
       restrictions.emplace_back(Restriction::Type::No, vector<uint32_t>(r.begin(), r.end()));
@@ -136,10 +134,8 @@ void LoadRestrictions(string const & mwmFilePath,
 /// loads the restriction section and test loaded restrictions.
 /// \param |restrictionPath| comma separated text with restrictions in osm id terms.
 /// \param |osmIdsToFeatureIdContent| comma separated text with mapping from osm ids to feature ids.
-void TestRestrictionBuilding(string const & restrictionPath,
-                             string const & osmIdsToFeatureIdContent,
-                             unique_ptr<IndexGraph> graph,
-                             vector<Restriction> & expectedNotUTurn,
+void TestRestrictionBuilding(string const & restrictionPath, string const & osmIdsToFeatureIdContent,
+                             unique_ptr<IndexGraph> graph, vector<Restriction> & expectedNotUTurn,
                              vector<RestrictionUTurnForTests> & expectedUTurn)
 {
   Platform & platform = GetPlatform();
@@ -167,7 +163,8 @@ void TestRestrictionBuilding(string const & restrictionPath,
   string const & mwmFullPath = scopedMwm.GetFullPath();
 
   // Prepare data to collector.
-  auto restrictionCollector = std::make_unique<routing_builder::RestrictionCollector>(osmIdsToFeatureIdFullPath, *graph);
+  auto restrictionCollector =
+      std::make_unique<routing_builder::RestrictionCollector>(osmIdsToFeatureIdFullPath, *graph);
 
   TEST(restrictionCollector->Process(restrictionFullPath), ("Bad restrictions were given."));
 
@@ -229,8 +226,8 @@ std::pair<unique_ptr<IndexGraph>, string> BuildTwoCubeGraph()
 
   vector<Joint> const joints = {
       // {{/* feature id */, /* point id */}, ... }
-      MakeJoint({{7, 0}}),                 /* joint at point (-1, 0) */
-      MakeJoint({{0, 0}, {6, 0}, {7, 1}}), /* joint at point (0, 0) */
+      MakeJoint({{7, 0}}),                  /* joint at point (-1, 0) */
+      MakeJoint({{0, 0}, {6, 0}, {7, 1}}),  /* joint at point (0, 0) */
       MakeJoint({{0, 1}, {1, 0}}),          /* joint at point (1, 0) */
       MakeJoint({{1, 1}, {2, 0}, {9, 0}}),  /* joint at point (2, 0) */
       MakeJoint({{2, 1}, {3, 1}, {8, 0}}),  /* joint at point (2, 1) */
@@ -269,13 +266,11 @@ UNIT_TEST(RestrictionGenerationTest_1)
       /* Type  ViaType  ViaNodeCoords: x    y   from  to */
       R"(Only, node,                   1.0, 0.0,  0,  1)";
 
-  vector<Restriction> expectedNotUTurn = {
-      {Restriction::Type::Only, {0, 1}}
-  };
+  vector<Restriction> expectedNotUTurn = {{Restriction::Type::Only, {0, 1}}};
   vector<RestrictionUTurnForTests> expectedUTurn;
 
-  TestRestrictionBuilding(restrictionPath, osmIdsToFeatureIdsContent, std::move(indexGraph),
-                          expectedNotUTurn, expectedUTurn);
+  TestRestrictionBuilding(restrictionPath, osmIdsToFeatureIdsContent, std::move(indexGraph), expectedNotUTurn,
+                          expectedUTurn);
 }
 
 UNIT_TEST(RestrictionGenerationTest_2)
@@ -288,13 +283,11 @@ UNIT_TEST(RestrictionGenerationTest_2)
       /* Type  ViaType from  ViaWayId to */
       R"(Only, way,      0,     1     2)";
 
-  vector<Restriction> expectedNotUTurn = {
-      {Restriction::Type::Only, {0, 1, 2}}
-  };
+  vector<Restriction> expectedNotUTurn = {{Restriction::Type::Only, {0, 1, 2}}};
   vector<RestrictionUTurnForTests> expectedUTurn;
 
-  TestRestrictionBuilding(restrictionPath, osmIdsToFeatureIdsContent, std::move(indexGraph),
-                          expectedNotUTurn, expectedUTurn);
+  TestRestrictionBuilding(restrictionPath, osmIdsToFeatureIdsContent, std::move(indexGraph), expectedNotUTurn,
+                          expectedUTurn);
 }
 
 UNIT_TEST(RestrictionGenerationTest_3)
@@ -308,14 +301,11 @@ UNIT_TEST(RestrictionGenerationTest_3)
       R"(Only, node,                  0.0, 0.0,  7,      6
          No,   way,                              2,   8, 10)";
 
-  vector<Restriction> expectedNotUTurn = {
-      {Restriction::Type::Only, {7, 6}},
-      {Restriction::Type::No,   {2, 8, 10}}
-  };
+  vector<Restriction> expectedNotUTurn = {{Restriction::Type::Only, {7, 6}}, {Restriction::Type::No, {2, 8, 10}}};
   vector<RestrictionUTurnForTests> expectedUTurn;
 
-  TestRestrictionBuilding(restrictionPath, osmIdsToFeatureIdsContent, std::move(indexGraph),
-                          expectedNotUTurn, expectedUTurn);
+  TestRestrictionBuilding(restrictionPath, osmIdsToFeatureIdsContent, std::move(indexGraph), expectedNotUTurn,
+                          expectedUTurn);
 }
 
 UNIT_TEST(RestrictionGenerationTest_BadConnection_1)
@@ -331,13 +321,11 @@ UNIT_TEST(RestrictionGenerationTest_BadConnection_1)
          No,   way,                              2,   8, 10)";
 
   // So we don't expect first restriction here.
-  vector<Restriction> expectedNotUTurn = {
-      {Restriction::Type::No,   {2, 8, 10}}
-  };
+  vector<Restriction> expectedNotUTurn = {{Restriction::Type::No, {2, 8, 10}}};
   vector<RestrictionUTurnForTests> expectedUTurn;
 
-  TestRestrictionBuilding(restrictionPath, osmIdsToFeatureIdsContent, std::move(indexGraph),
-                          expectedNotUTurn, expectedUTurn);
+  TestRestrictionBuilding(restrictionPath, osmIdsToFeatureIdsContent, std::move(indexGraph), expectedNotUTurn,
+                          expectedUTurn);
 }
 
 UNIT_TEST(RestrictionGenerationTest_BadConnection_2)
@@ -353,13 +341,11 @@ UNIT_TEST(RestrictionGenerationTest_BadConnection_2)
          No,   way,                              0,   1, 3)";
 
   // So we don't expect second restriction here.
-  vector<Restriction> expectedNotUTurn = {
-      {Restriction::Type::Only,   {7, 6}}
-  };
+  vector<Restriction> expectedNotUTurn = {{Restriction::Type::Only, {7, 6}}};
   vector<RestrictionUTurnForTests> expectedUTurn;
 
-  TestRestrictionBuilding(restrictionPath, osmIdsToFeatureIdsContent, std::move(indexGraph),
-                          expectedNotUTurn, expectedUTurn);
+  TestRestrictionBuilding(restrictionPath, osmIdsToFeatureIdsContent, std::move(indexGraph), expectedNotUTurn,
+                          expectedUTurn);
 }
 
 UNIT_TEST(RestrictionGenerationTest_WithUTurn_1)
@@ -369,19 +355,18 @@ UNIT_TEST(RestrictionGenerationTest_WithUTurn_1)
   tie(indexGraph, osmIdsToFeatureIdsContent) = BuildTwoCubeGraph();
 
   string const restrictionPath =
-    /* Type     ViaType ViaNodeCoords: x    y   from  to */
-    R"(NoUTurn,   node,                2.0, 1.0,  3,   3
+      /* Type     ViaType ViaNodeCoords: x    y   from  to */
+      R"(NoUTurn,   node,                2.0, 1.0,  3,   3
        OnlyUTurn, node,                0.0, 0.0,  6,   6)";
 
   // So we don't expect second restriction here.
   vector<Restriction> expectedNotUTurn;
   vector<RestrictionUTurnForTests> expectedUTurn = {
-    {Restriction::Type::NoUTurn, 3 /* featureId */, false /* viaIsFirstPoint */},
-    {Restriction::Type::OnlyUTurn, 6 /* featureId */, true /* viaIsFirstPoint */}
-  };
+      {Restriction::Type::NoUTurn, 3 /* featureId */, false /* viaIsFirstPoint */},
+      {Restriction::Type::OnlyUTurn, 6 /* featureId */, true /* viaIsFirstPoint */}};
 
-  TestRestrictionBuilding(restrictionPath, osmIdsToFeatureIdsContent, std::move(indexGraph),
-                          expectedNotUTurn, expectedUTurn);
+  TestRestrictionBuilding(restrictionPath, osmIdsToFeatureIdsContent, std::move(indexGraph), expectedNotUTurn,
+                          expectedUTurn);
 }
 
 UNIT_TEST(RestrictionGenerationTest_WithUTurn_2)
@@ -401,17 +386,13 @@ UNIT_TEST(RestrictionGenerationTest_WithUTurn_2)
 
   // So we don't expect second restriction here.
   vector<Restriction> expectedNotUTurn = {
-      {Restriction::Type::No, {2, 8}},
-      {Restriction::Type::No, {2, 8, 10}},
-      {Restriction::Type::Only, {6, 5, 4}}
-  };
+      {Restriction::Type::No, {2, 8}}, {Restriction::Type::No, {2, 8, 10}}, {Restriction::Type::Only, {6, 5, 4}}};
 
   vector<RestrictionUTurnForTests> expectedUTurn = {
-      {Restriction::Type::OnlyUTurn, 6 /* featureId */, false /* viaIsFirstPoint */}
-  };
+      {Restriction::Type::OnlyUTurn, 6 /* featureId */, false /* viaIsFirstPoint */}};
 
-  TestRestrictionBuilding(restrictionPath, osmIdsToFeatureIdsContent, std::move(indexGraph),
-                          expectedNotUTurn, expectedUTurn);
+  TestRestrictionBuilding(restrictionPath, osmIdsToFeatureIdsContent, std::move(indexGraph), expectedNotUTurn,
+                          expectedUTurn);
 }
 
 UNIT_TEST(RestrictionGenerationTest_WithUTurn_BadConnection_1)
@@ -431,7 +412,7 @@ UNIT_TEST(RestrictionGenerationTest_WithUTurn_BadConnection_1)
   vector<Restriction> expectedNotUTurn;
   vector<RestrictionUTurnForTests> expectedUTurn;
 
-  TestRestrictionBuilding(restrictionPath, osmIdsToFeatureIdsContent, std::move(indexGraph),
-                          expectedNotUTurn, expectedUTurn);
+  TestRestrictionBuilding(restrictionPath, osmIdsToFeatureIdsContent, std::move(indexGraph), expectedNotUTurn,
+                          expectedUTurn);
 }
 }  // namespace restriction_test
diff --git a/generator/generator_tests/road_access_test.cpp b/generator/generator_tests/road_access_test.cpp
index c0a920408..932e360aa 100644
--- a/generator/generator_tests/road_access_test.cpp
+++ b/generator/generator_tests/road_access_test.cpp
@@ -107,8 +107,8 @@ RoadAccessByVehicleType SaveAndLoadRoadAccess(
 }
 */
 
-OsmElement MakeOsmElementWithNodes(uint64_t id, generator_tests::Tags const & tags,
-                                   OsmElement::EntityType t, std::vector<uint64_t> const & nodes)
+OsmElement MakeOsmElementWithNodes(uint64_t id, generator_tests::Tags const & tags, OsmElement::EntityType t,
+                                   std::vector<uint64_t> const & nodes)
 {
   auto r = generator_tests::MakeOsmElement(id, tags, t);
   r.m_nodes = nodes;
@@ -133,13 +133,9 @@ public:
   }
   virtual bool GetRelation(cache::Key id, RelationElement & e) { UNREACHABLE(); }
 
-  void Add(OsmElement const & e)
-  {
-    TEST(m_map.try_emplace(e.m_id, e.m_id, e.m_nodes).second, ());
-  }
+  void Add(OsmElement const & e) { TEST(m_map.try_emplace(e.m_id, e.m_id, e.m_nodes).second, ()); }
 };
 
-
 /*
 UNIT_TEST(RoadAccess_Smoke)
 {
@@ -199,12 +195,12 @@ class TestAccessFixture
   class Way2Feature : public OsmWay2FeaturePoint
   {
   public:
-    virtual void ForEachFeature(uint64_t wayID, std::function<void (uint32_t)> const & fn) override
+    virtual void ForEachFeature(uint64_t wayID, std::function<void(uint32_t)> const & fn) override
     {
       fn(base::checked_cast<uint32_t>(wayID));
     }
     virtual void ForEachNodeIdx(uint64_t wayID, uint32_t candidateIdx, m2::PointU pt,
-                                std::function<void (uint32_t, uint32_t)> const & fn) override
+                                std::function<void(uint32_t, uint32_t)> const & fn) override
     {
       auto const ll = mercator::ToLatLon(PointUToPointD(pt, kPointCoordBits, mercator::Bounds::FullRect()));
 
@@ -225,10 +221,7 @@ public:
   {
     classificator::Load();
   }
-  ~TestAccessFixture()
-  {
-    TEST(Platform::RemoveFileIfExists(m_fileName), ());
-  }
+  ~TestAccessFixture() { TEST(Platform::RemoveFileIfExists(m_fileName), ()); }
 
   void CreateCollectors(size_t count = 1)
   {
@@ -272,17 +265,13 @@ public:
     ReadRoadAccess(m_fileName, m_wya2feature, m_roadAccess);
   }
 
-  RoadAccess const & Get(VehicleType vehicle) const
-  {
-    return m_roadAccess[static_cast<uint8_t>(vehicle)];
-  }
+  RoadAccess const & Get(VehicleType vehicle) const { return m_roadAccess[static_cast<uint8_t>(vehicle)]; }
 };
 
 UNIT_CLASS_TEST(TestAccessFixture, CarPermit)
 {
   CreateCollectors();
-  AddWay(MakeOsmElementWithNodes(1 /* id */,
-                                 {{"highway", "motorway"}, {"access", "no"}, {"motor_vehicle", "permit"}},
+  AddWay(MakeOsmElementWithNodes(1 /* id */, {{"highway", "motorway"}, {"access", "no"}, {"motor_vehicle", "permit"}},
                                  OsmElement::EntityType::Way, {1, 2}));
   Finish();
 
@@ -299,13 +288,17 @@ UNIT_CLASS_TEST(TestAccessFixture, HgvDesignated)
 {
   CreateCollectors();
   AddWay(MakeOsmElementWithNodes(1 /* id */,
-                                 {{"highway", "motorway"}, {"access", "no"}, {"emergency", "yes"},
-                                  {"bus", "yes"}, {"hgv", "designated"}, {"motor_vehicle", "yes"}},
+                                 {{"highway", "motorway"},
+                                  {"access", "no"},
+                                  {"emergency", "yes"},
+                                  {"bus", "yes"},
+                                  {"hgv", "designated"},
+                                  {"motor_vehicle", "yes"}},
                                  OsmElement::EntityType::Way, {1, 2}));
-  AddWay(MakeOsmElementWithNodes(2 /* id */,
-                                 {{"highway", "motorway"}, {"access", "no"}, {"emergency", "yes"},
-                                  {"bus", "yes"}, {"hgv", "designated"}},
-                                 OsmElement::EntityType::Way, {2, 3}));
+  AddWay(MakeOsmElementWithNodes(
+      2 /* id */,
+      {{"highway", "motorway"}, {"access", "no"}, {"emergency", "yes"}, {"bus", "yes"}, {"hgv", "designated"}},
+      OsmElement::EntityType::Way, {2, 3}));
   Finish();
 
   auto const noSure = make_pair(RoadAccess::Type::No, RoadAccess::Confidence::Sure);
@@ -322,26 +315,31 @@ UNIT_CLASS_TEST(TestAccessFixture, Merge)
 {
   CreateCollectors(3);
 
-  AddWay(MakeOsmElementWithNodes(1 /* id */, {{"highway", "service"}} /* tags */,
-                                 OsmElement::EntityType::Way, {10, 11, 12, 13}), 0);
-  AddWay(MakeOsmElementWithNodes(2 /* id */, {{"highway", "service"}} /* tags */,
-                                 OsmElement::EntityType::Way, {20, 21, 22, 23}), 1);
-  AddWay(MakeOsmElementWithNodes(3 /* id */, {{"highway", "motorway"}} /* tags */,
-                                 OsmElement::EntityType::Way, {30, 31, 32, 33}), 2);
+  AddWay(MakeOsmElementWithNodes(1 /* id */, {{"highway", "service"}} /* tags */, OsmElement::EntityType::Way,
+                                 {10, 11, 12, 13}),
+         0);
+  AddWay(MakeOsmElementWithNodes(2 /* id */, {{"highway", "service"}} /* tags */, OsmElement::EntityType::Way,
+                                 {20, 21, 22, 23}),
+         1);
+  AddWay(MakeOsmElementWithNodes(3 /* id */, {{"highway", "motorway"}} /* tags */, OsmElement::EntityType::Way,
+                                 {30, 31, 32, 33}),
+         2);
 
   AddNode(MakeOsmElement(11 /* id */, {{"barrier", "lift_gate"}, {"motor_vehicle", "private"}},
-                         OsmElement::EntityType::Node), 0);
+                         OsmElement::EntityType::Node),
+          0);
 
   AddNode(MakeOsmElement(22 /* id */, {{"barrier", "lift_gate"}, {"motor_vehicle", "private"}},
-                         OsmElement::EntityType::Node), 1);
+                         OsmElement::EntityType::Node),
+          1);
 
   // We should ignore this barrier because it's without access tag and placed on highway-motorway.
-  AddNode(MakeOsmElement(32 /* id */, {{"barrier", "lift_gate"}},
-                         OsmElement::EntityType::Node), 2);
+  AddNode(MakeOsmElement(32 /* id */, {{"barrier", "lift_gate"}}, OsmElement::EntityType::Node), 2);
 
   // Ignore all motorway_junction access.
   AddNode(MakeOsmElement(31 /* id */, {{"highway", "motorway_junction"}, {"access", "private"}},
-                         OsmElement::EntityType::Node), 0);
+                         OsmElement::EntityType::Node),
+          0);
 
   Finish();
 
@@ -361,23 +359,17 @@ UNIT_TEST(RoadAccessCoditional_Parse)
 
   using ConditionalVector = std::vector<AccessConditional>;
   std::vector<std::pair<string, ConditionalVector>> const tests = {
-      {"no @ Mo-Su",
-       {{RoadAccess::Type::No, "Mo-Su"}}},
+      {"no @ Mo-Su", {{RoadAccess::Type::No, "Mo-Su"}}},
 
-      {"no @ Mo-Su;",
-       {{RoadAccess::Type::No, "Mo-Su"}}},
+      {"no @ Mo-Su;", {{RoadAccess::Type::No, "Mo-Su"}}},
 
-      {"yes @ (10:00 - 20:00)",
-       {{RoadAccess::Type::Yes, "10:00 - 20:00"}}},
+      {"yes @ (10:00 - 20:00)", {{RoadAccess::Type::Yes, "10:00 - 20:00"}}},
 
-      {"private @ Mo-Fr 15:00-20:00",
-       {{RoadAccess::Type::Private, "Mo-Fr 15:00-20:00"}}},
+      {"private @ Mo-Fr 15:00-20:00", {{RoadAccess::Type::Private, "Mo-Fr 15:00-20:00"}}},
 
-      {"destination @ 10:00-20:00",
-       {{RoadAccess::Type::Destination, "10:00-20:00"}}},
+      {"destination @ 10:00-20:00", {{RoadAccess::Type::Destination, "10:00-20:00"}}},
 
-      {"yes @ Mo-Fr ; Sa-Su",
-       {{RoadAccess::Type::Yes, "Mo-Fr ; Sa-Su"}}},
+      {"yes @ Mo-Fr ; Sa-Su", {{RoadAccess::Type::Yes, "Mo-Fr ; Sa-Su"}}},
 
       {"no @ (Mo-Su) ; yes @ (Fr-Su)",
        {{RoadAccess::Type::No, "Mo-Su"},
@@ -386,23 +378,19 @@ UNIT_TEST(RoadAccessCoditional_Parse)
       {"private @ (18:00-09:00; Oct-Mar)", {{RoadAccess::Type::Private, "18:00-09:00; Oct-Mar"}}},
 
       {"no @ (Nov-May); no @ (20:00-07:00)",
-       {{RoadAccess::Type::No, "Nov-May"},
-        {RoadAccess::Type::No, "20:00-07:00"}}},
+       {{RoadAccess::Type::No, "Nov-May"}, {RoadAccess::Type::No, "20:00-07:00"}}},
 
-      {"no @ 22:30-05:00",
-       {{RoadAccess::Type::No, "22:30-05:00"}}},
+      {"no @ 22:30-05:00", {{RoadAccess::Type::No, "22:30-05:00"}}},
 
       {"destination @ (Mo-Fr 06:00-15:00); yes @ (Mo-Fr 15:00-21:00; Sa,Su,SH,PH 09:00-21:00)",
        {{RoadAccess::Type::Destination, "Mo-Fr 06:00-15:00"},
         {RoadAccess::Type::Yes, "Mo-Fr 15:00-21:00; Sa,Su,SH,PH 09:00-21:00"}}},
 
       {"no @ (Mar 15-Jul 15); private @ (Jan- Dec)",
-       {{RoadAccess::Type::No, "Mar 15-Jul 15"},
-        {RoadAccess::Type::Private, "Jan- Dec"}}},
+       {{RoadAccess::Type::No, "Mar 15-Jul 15"}, {RoadAccess::Type::Private, "Jan- Dec"}}},
 
       {"no @ (06:30-08:30);destination @ (06:30-08:30 AND agricultural)",
-       {{RoadAccess::Type::No, "06:30-08:30"},
-        {RoadAccess::Type::Destination, "06:30-08:30 AND agricultural"}}},
+       {{RoadAccess::Type::No, "06:30-08:30"}, {RoadAccess::Type::Destination, "06:30-08:30 AND agricultural"}}},
 
       {"no @ (Mo-Fr 00:00-08:00,20:00-24:00; Sa-Su 00:00-24:00; PH 00:00-24:00)",
        {{RoadAccess::Type::No, "Mo-Fr 00:00-08:00,20:00-24:00; Sa-Su 00:00-24:00; PH 00:00-24:00"}}},
@@ -412,16 +400,10 @@ UNIT_TEST(RoadAccessCoditional_Parse)
       {"yes Mo-Fr", {}},
       {"yes (Mo-Fr)", {}},
       {"no ; Mo-Fr", {}},
-      {"asdsadasdasd", {}}
-  };
+      {"asdsadasdasd", {}}};
 
-  std::vector<string> tags = {
-      "motorcar:conditional",
-      "vehicle:conditional",
-      "motor_vehicle:conditional",
-      "bicycle:conditional",
-      "foot:conditional"
-  };
+  std::vector<string> tags = {"motorcar:conditional", "vehicle:conditional", "motor_vehicle:conditional",
+                              "bicycle:conditional", "foot:conditional"};
 
   for (auto const & tag : tags)
   {
@@ -451,20 +433,21 @@ UNIT_CLASS_TEST(TestAccessFixture, ConditionalMerge)
 {
   CreateCollectors(3);
 
-  AddWay(MakeOsmElementWithNodes(
-      1 /* id */, {{"highway", "primary"}, {"vehicle:conditional", "no @ (Mo-Su)"}} /* tags */,
-      OsmElement::EntityType::Way, {10, 11, 12, 13}), 0);
+  AddWay(
+      MakeOsmElementWithNodes(1 /* id */, {{"highway", "primary"}, {"vehicle:conditional", "no @ (Mo-Su)"}} /* tags */,
+                              OsmElement::EntityType::Way, {10, 11, 12, 13}),
+      0);
 
   AddWay(MakeOsmElementWithNodes(
-      2 /* id */,
-      {{"highway", "service"}, {"vehicle:conditional", "private @ (10:00-20:00)"}} /* tags */,
-      OsmElement::EntityType::Way, {20, 21, 22, 23}), 1);
+             2 /* id */, {{"highway", "service"}, {"vehicle:conditional", "private @ (10:00-20:00)"}} /* tags */,
+             OsmElement::EntityType::Way, {20, 21, 22, 23}),
+         1);
 
   AddWay(MakeOsmElementWithNodes(
-      3 /* id */,
-      {{"highway", "service"},
-       {"vehicle:conditional", "private @ (12:00-19:00) ; no @ (Mo-Su)"}} /* tags */,
-      OsmElement::EntityType::Way, {30, 31, 32, 33}), 2);
+             3 /* id */,
+             {{"highway", "service"}, {"vehicle:conditional", "private @ (12:00-19:00) ; no @ (Mo-Su)"}} /* tags */,
+             OsmElement::EntityType::Way, {30, 31, 32, 33}),
+         2);
 
   Finish();
 
@@ -483,18 +466,15 @@ UNIT_CLASS_TEST(TestAccessFixture, WinterRoads)
 {
   CreateCollectors();
 
-  AddWay(MakeOsmElementWithNodes(
-      1 /* id */, {{"highway", "primary"}, {"ice_road", "yes"}} /* tags */,
-      OsmElement::EntityType::Way, {10, 11, 12, 13}));
+  AddWay(MakeOsmElementWithNodes(1 /* id */, {{"highway", "primary"}, {"ice_road", "yes"}} /* tags */,
+                                 OsmElement::EntityType::Way, {10, 11, 12, 13}));
 
-  AddWay(MakeOsmElementWithNodes(
-      2 /* id */,
-      {{"highway", "service"}, {"winter_road", "yes"}} /* tags */,
-      OsmElement::EntityType::Way, {20, 21, 22, 23}));
+  AddWay(MakeOsmElementWithNodes(2 /* id */, {{"highway", "service"}, {"winter_road", "yes"}} /* tags */,
+                                 OsmElement::EntityType::Way, {20, 21, 22, 23}));
 
   Finish();
 
-  for (auto vehicle : { VehicleType::Pedestrian, VehicleType::Bicycle, VehicleType::Car })
+  for (auto vehicle : {VehicleType::Pedestrian, VehicleType::Bicycle, VehicleType::Car})
   {
     auto const & ra = Get(vehicle);
     for (uint64_t id = 1; id <= 2; ++id)
@@ -514,13 +494,12 @@ UNIT_CLASS_TEST(TestAccessFixture, Locked)
 {
   CreateCollectors();
 
-  AddWay(MakeOsmElementWithNodes(1 /* id */, {{"highway", "service"}} /* tags */,
-                                 OsmElement::EntityType::Way, {10, 11, 12, 13}));
-  AddWay(MakeOsmElementWithNodes(2 /* id */, {{"highway", "secondary"}} /* tags */,
-                                 OsmElement::EntityType::Way, {20, 21, 22, 23}));
+  AddWay(MakeOsmElementWithNodes(1 /* id */, {{"highway", "service"}} /* tags */, OsmElement::EntityType::Way,
+                                 {10, 11, 12, 13}));
+  AddWay(MakeOsmElementWithNodes(2 /* id */, {{"highway", "secondary"}} /* tags */, OsmElement::EntityType::Way,
+                                 {20, 21, 22, 23}));
 
-  AddNode(MakeOsmElement(11 /* id */, {{"barrier", "gate"}, {"locked", "yes"}},
-                         OsmElement::EntityType::Node));
+  AddNode(MakeOsmElement(11 /* id */, {{"barrier", "gate"}, {"locked", "yes"}}, OsmElement::EntityType::Node));
   AddNode(MakeOsmElement(21 /* id */, {{"barrier", "gate"}, {"locked", "yes"}, {"access", "permissive"}},
                          OsmElement::EntityType::Node));
 
@@ -541,22 +520,18 @@ UNIT_CLASS_TEST(TestAccessFixture, CycleBarrier)
 {
   CreateCollectors();
 
-  AddWay(MakeOsmElementWithNodes(1, {{"highway", "track"}},
-                                 OsmElement::EntityType::Way, {10, 11, 12}));
-  AddNode(MakeOsmElement(10, {{"barrier", "cycle_barrier"}},
-                         OsmElement::EntityType::Node));
-  AddNode(MakeOsmElement(11, {{"barrier", "cycle_barrier"}, {"bicycle", "dismount"}},
-                         OsmElement::EntityType::Node));
-  AddNode(MakeOsmElement(12, {{"barrier", "cycle_barrier"}, {"bicycle", "no"}},
-                         OsmElement::EntityType::Node));
+  AddWay(MakeOsmElementWithNodes(1, {{"highway", "track"}}, OsmElement::EntityType::Way, {10, 11, 12}));
+  AddNode(MakeOsmElement(10, {{"barrier", "cycle_barrier"}}, OsmElement::EntityType::Node));
+  AddNode(MakeOsmElement(11, {{"barrier", "cycle_barrier"}, {"bicycle", "dismount"}}, OsmElement::EntityType::Node));
+  AddNode(MakeOsmElement(12, {{"barrier", "cycle_barrier"}, {"bicycle", "no"}}, OsmElement::EntityType::Node));
   Finish();
   auto const bicycle = Get(VehicleType::Bicycle);
   TEST_EQUAL(bicycle.GetAccessWithoutConditional({1, 0}),
              make_pair(RoadAccess::Type::Yes, RoadAccess::Confidence::Sure), ());
   TEST_EQUAL(bicycle.GetAccessWithoutConditional({1, 1}),
              make_pair(RoadAccess::Type::Yes, RoadAccess::Confidence::Sure), ());
-  TEST_EQUAL(bicycle.GetAccessWithoutConditional({1, 2}),
-             make_pair(RoadAccess::Type::No, RoadAccess::Confidence::Sure), ());
+  TEST_EQUAL(bicycle.GetAccessWithoutConditional({1, 2}), make_pair(RoadAccess::Type::No, RoadAccess::Confidence::Sure),
+             ());
 }
 
 }  // namespace road_access_test
diff --git a/generator/generator_tests/source_data.cpp b/generator/generator_tests/source_data.cpp
index 3e467129c..aabf76c6c 100644
--- a/generator/generator_tests/source_data.cpp
+++ b/generator/generator_tests/source_data.cpp
@@ -1,6 +1,7 @@
 #include "source_data.hpp"
 
-char const node_xml_data[] = "<?xml version='1.0' encoding='UTF-8'?>\
+char const node_xml_data[] =
+    "<?xml version='1.0' encoding='UTF-8'?>\
 <osm version='0.6' upload='true' generator='JOSM'>\
 <node id='-273105' action='modify' visible='true' lat='62.18269750679' lon='-134.28965517091'>\
 <tag k='name' v='Продуктовый' />\
@@ -11,17 +12,15 @@ char const node_xml_data[] = "<?xml version='1.0' encoding='UTF-8'?>\
 
 // binary data: node.o5m
 unsigned char const node_o5m_data[] = /* 92 */ {
-  0xFF, 0xE0, 0x04, 0x6F, 0x35, 0x6D, 0x32, 0xFF, 0x10, 0x51, 0xA1, 0xAB, 0x21, 0x00, 0xCD, 0xE6,
-  0xD7, 0x80, 0x0A, 0xBE, 0xCE, 0x82, 0xD1, 0x04, 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x00, 0xD0, 0x9F,
-  0xD1, 0x80, 0xD0, 0xBE, 0xD0, 0xB4, 0xD1, 0x83, 0xD0, 0xBA, 0xD1, 0x82, 0xD0, 0xBE, 0xD0, 0xB2,
-  0xD1, 0x8B, 0xD0, 0xB9, 0x00, 0x00, 0x6F, 0x70, 0x65, 0x6E, 0x69, 0x6E, 0x67, 0x5F, 0x68, 0x6F,
-  0x75, 0x72, 0x73, 0x00, 0x32, 0x34, 0x2F, 0x37, 0x00, 0x00, 0x73, 0x68, 0x6F, 0x70, 0x00, 0x63,
-  0x6F, 0x6E, 0x76, 0x65, 0x6E, 0x69, 0x65, 0x6E, 0x63, 0x65, 0x00, 0xFE
-};
+    0xFF, 0xE0, 0x04, 0x6F, 0x35, 0x6D, 0x32, 0xFF, 0x10, 0x51, 0xA1, 0xAB, 0x21, 0x00, 0xCD, 0xE6, 0xD7, 0x80, 0x0A,
+    0xBE, 0xCE, 0x82, 0xD1, 0x04, 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x00, 0xD0, 0x9F, 0xD1, 0x80, 0xD0, 0xBE, 0xD0, 0xB4,
+    0xD1, 0x83, 0xD0, 0xBA, 0xD1, 0x82, 0xD0, 0xBE, 0xD0, 0xB2, 0xD1, 0x8B, 0xD0, 0xB9, 0x00, 0x00, 0x6F, 0x70, 0x65,
+    0x6E, 0x69, 0x6E, 0x67, 0x5F, 0x68, 0x6F, 0x75, 0x72, 0x73, 0x00, 0x32, 0x34, 0x2F, 0x37, 0x00, 0x00, 0x73, 0x68,
+    0x6F, 0x70, 0x00, 0x63, 0x6F, 0x6E, 0x76, 0x65, 0x6E, 0x69, 0x65, 0x6E, 0x63, 0x65, 0x00, 0xFE};
 static_assert(sizeof(node_o5m_data) == 92, "Size check failed");
 
-
-char const node2_xml_data[] = "<?xml version='1.0' encoding='UTF-8'?>\
+char const node2_xml_data[] =
+    "<?xml version='1.0' encoding='UTF-8'?>\
 <osm version='0.6' generator='CGImap 0.3.3 (31790 thorn-03.openstreetmap.org)' \
 copyright='OpenStreetMap and contributors' attribution='https://www.openstreetmap.org/copyright' \
 license='http://opendatacommons.org/licenses/odbl/1-0/'>\
@@ -34,16 +33,15 @@ timestamp='2012-06-29T18:09:47Z' user='Xmypblu' uid='395071' lat='55.0927062' lo
 
 // binary data: node2.o5m
 unsigned char const node2_o5m_data[] = /* 93 */
-{0xFF, 0xE0, 0x04, 0x6F, 0x35, 0x6D, 0x32, 0xFF, 0x10, 0x52, 0x94, 0xDD, 0xF4, 0xE9, 0x03, 0x08,
-  0xD6, 0xBD, 0xEF, 0xFE, 0x09, 0xF0, 0x87, 0xC0, 0x0B, 0x00, 0xBF, 0x8E, 0x18, 0x00, 0x58, 0x6D,
-  0x79, 0x70, 0x62, 0x6C, 0x75, 0x00, 0xA0, 0xCC, 0xDA, 0xF1, 0x02, 0xAC, 0xEB, 0xB3, 0x8D, 0x04,
-  0x00, 0x61, 0x6D, 0x65, 0x6E, 0x69, 0x74, 0x79, 0x00, 0x63, 0x69, 0x6E, 0x65, 0x6D, 0x61, 0x00,
-  0x00, 0x6E, 0x61, 0x6D, 0x65, 0x00, 0xD0, 0x9A, 0xD0, 0xA2, 0x20, 0xD0, 0x93, 0xD0, 0xBE, 0xD1,
-  0x80, 0xD0, 0xB8, 0xD0, 0xB7, 0xD0, 0xBE, 0xD0, 0xBD, 0xD1, 0x82, 0x00, 0xFE};
+    {0xFF, 0xE0, 0x04, 0x6F, 0x35, 0x6D, 0x32, 0xFF, 0x10, 0x52, 0x94, 0xDD, 0xF4, 0xE9, 0x03, 0x08, 0xD6, 0xBD, 0xEF,
+     0xFE, 0x09, 0xF0, 0x87, 0xC0, 0x0B, 0x00, 0xBF, 0x8E, 0x18, 0x00, 0x58, 0x6D, 0x79, 0x70, 0x62, 0x6C, 0x75, 0x00,
+     0xA0, 0xCC, 0xDA, 0xF1, 0x02, 0xAC, 0xEB, 0xB3, 0x8D, 0x04, 0x00, 0x61, 0x6D, 0x65, 0x6E, 0x69, 0x74, 0x79, 0x00,
+     0x63, 0x69, 0x6E, 0x65, 0x6D, 0x61, 0x00, 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x00, 0xD0, 0x9A, 0xD0, 0xA2, 0x20, 0xD0,
+     0x93, 0xD0, 0xBE, 0xD1, 0x80, 0xD0, 0xB8, 0xD0, 0xB7, 0xD0, 0xBE, 0xD0, 0xBD, 0xD1, 0x82, 0x00, 0xFE};
 static_assert(sizeof(node2_o5m_data) == 93, "Size check failed");
 
-
-char const way_xml_data[] = "<?xml version='1.0' encoding='UTF-8'?>\
+char const way_xml_data[] =
+    "<?xml version='1.0' encoding='UTF-8'?>\
 <osm version='0.6' upload='true' generator='JOSM'>\
 <node id='-273141' action='modify' visible='true' lat='60.73662144558' lon='-135.06327391353' />\
 <node id='-273139' action='modify' visible='true' lat='60.73186582163' lon='-135.05498459176' />\
@@ -70,23 +68,22 @@ char const way_xml_data[] = "<?xml version='1.0' encoding='UTF-8'?>\
 </way>\
 </osm>";
 
-
 // binary data: way.o5m
 unsigned char const way_o5m_data[] = /* 175 */
-{0xFF, 0xE0, 0x04, 0x6F, 0x35, 0x6D, 0x32, 0xFF, 0x10, 0x0E, 0xE9, 0xAB, 0x21, 0x00, 0xC5, 0x94,
-  0x88, 0x88, 0x0A, 0x8C, 0xB1, 0x9D, 0xC3, 0x04, 0x10, 0x08, 0x04, 0x00, 0x9C, 0x8F, 0x0A, 0x87,
-  0xE7, 0x05, 0x10, 0x07, 0x04, 0x00, 0xF6, 0x4A, 0xFD, 0x92, 0x03, 0x10, 0x08, 0x04, 0x00, 0xF6,
-  0xA1, 0x04, 0xF5, 0x80, 0x04, 0x10, 0x08, 0x04, 0x00, 0xB4, 0xB6, 0x02, 0x89, 0xBB, 0x06, 0x10,
-  0x08, 0x04, 0x00, 0xB4, 0xEC, 0x03, 0xD9, 0xCC, 0x03, 0x10, 0x08, 0x04, 0x00, 0xD6, 0xC0, 0x01,
-  0xB7, 0x83, 0x03, 0x10, 0x08, 0x06, 0x00, 0xDB, 0xAB, 0x02, 0x9F, 0xFE, 0x02, 0x10, 0x08, 0x02,
-  0x00, 0x87, 0xAD, 0x05, 0xEB, 0xA5, 0x04, 0xFF, 0x11, 0x44, 0xCD, 0xAB, 0x21, 0x00, 0x0B, 0xC9,
-  0xAB, 0x21, 0x01, 0x05, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x00,
-  0x59, 0x75, 0x6B, 0x6F, 0x6E, 0x20, 0x52, 0x69, 0x76, 0x65, 0x72, 0x00, 0x00, 0x6E, 0x61, 0x6D,
-  0x65, 0x3A, 0x72, 0x75, 0x00, 0xD0, 0xAE, 0xD0, 0xBA, 0xD0, 0xBE, 0xD0, 0xBD, 0x00, 0x00, 0x77,
-  0x61, 0x74, 0x65, 0x72, 0x77, 0x61, 0x79, 0x00, 0x72, 0x69, 0x76, 0x65, 0x72, 0x00, 0xFE};
+    {0xFF, 0xE0, 0x04, 0x6F, 0x35, 0x6D, 0x32, 0xFF, 0x10, 0x0E, 0xE9, 0xAB, 0x21, 0x00, 0xC5, 0x94, 0x88, 0x88,
+     0x0A, 0x8C, 0xB1, 0x9D, 0xC3, 0x04, 0x10, 0x08, 0x04, 0x00, 0x9C, 0x8F, 0x0A, 0x87, 0xE7, 0x05, 0x10, 0x07,
+     0x04, 0x00, 0xF6, 0x4A, 0xFD, 0x92, 0x03, 0x10, 0x08, 0x04, 0x00, 0xF6, 0xA1, 0x04, 0xF5, 0x80, 0x04, 0x10,
+     0x08, 0x04, 0x00, 0xB4, 0xB6, 0x02, 0x89, 0xBB, 0x06, 0x10, 0x08, 0x04, 0x00, 0xB4, 0xEC, 0x03, 0xD9, 0xCC,
+     0x03, 0x10, 0x08, 0x04, 0x00, 0xD6, 0xC0, 0x01, 0xB7, 0x83, 0x03, 0x10, 0x08, 0x06, 0x00, 0xDB, 0xAB, 0x02,
+     0x9F, 0xFE, 0x02, 0x10, 0x08, 0x02, 0x00, 0x87, 0xAD, 0x05, 0xEB, 0xA5, 0x04, 0xFF, 0x11, 0x44, 0xCD, 0xAB,
+     0x21, 0x00, 0x0B, 0xC9, 0xAB, 0x21, 0x01, 0x05, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x00, 0x6E, 0x61, 0x6D,
+     0x65, 0x00, 0x59, 0x75, 0x6B, 0x6F, 0x6E, 0x20, 0x52, 0x69, 0x76, 0x65, 0x72, 0x00, 0x00, 0x6E, 0x61, 0x6D,
+     0x65, 0x3A, 0x72, 0x75, 0x00, 0xD0, 0xAE, 0xD0, 0xBA, 0xD0, 0xBE, 0xD0, 0xBD, 0x00, 0x00, 0x77, 0x61, 0x74,
+     0x65, 0x72, 0x77, 0x61, 0x79, 0x00, 0x72, 0x69, 0x76, 0x65, 0x72, 0x00, 0xFE};
 static_assert(sizeof(way_o5m_data) == 175, "Size check failed");
 
-char const relation_xml_data[] = "<?xml version='1.0' encoding='UTF-8'?>\
+char const relation_xml_data[] =
+    "<?xml version='1.0' encoding='UTF-8'?>\
 <osm version='0.6' upload='true' generator='JOSM'>\
 <node id='-273196' action='modify' visible='true' lat='60.71960512058' lon='-135.0538199763'>\
 <tag k='name' v='Whitehorse' />\
@@ -122,19 +119,16 @@ char const relation_xml_data[] = "<?xml version='1.0' encoding='UTF-8'?>\
 
 // binary data: relation.o5m
 unsigned char const relation_o5m_data[] = /* 224 */
-{0xFF, 0xE0, 0x04, 0x6F, 0x35, 0x6D, 0x32, 0xFF, 0x10, 0x2B, 0xD7, 0xAC, 0x21, 0x00, 0xAD,
-  0xCF, 0xFC, 0x87, 0x0A, 0xA6, 0xCE, 0x88, 0xC3, 0x04, 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x00,
-  0x57, 0x68, 0x69, 0x74, 0x65, 0x68, 0x6F, 0x72, 0x73, 0x65, 0x00, 0x00, 0x70, 0x6C, 0x61,
-  0x63, 0x65, 0x00, 0x74, 0x6F, 0x77, 0x6E, 0x00, 0x10, 0x07, 0x2C, 0x00, 0x9A, 0x90, 0x24,
-  0xD9, 0x68, 0x10, 0x08, 0x04, 0x00, 0xDE, 0xCD, 0x1E, 0xF7, 0xF6, 0x15, 0x10, 0x08, 0x04,
-  0x00, 0x91, 0xD3, 0x2A, 0xFB, 0xCC, 0x11, 0x10, 0x08, 0x04, 0x00, 0xE7, 0x95, 0x60, 0xFE,
-  0x9A, 0x02, 0x10, 0x08, 0x04, 0x00, 0x97, 0xDE, 0x13, 0xC0, 0xA7, 0x0F, 0x10, 0x08, 0x04,
-  0x00, 0xB6, 0x9E, 0x14, 0xD2, 0xC3, 0x19, 0x10, 0x08, 0x04, 0x00, 0xA6, 0x8F, 0x22, 0xE0,
-  0xDD, 0x16, 0x10, 0x07, 0x02, 0x00, 0xA6, 0xF6, 0x19, 0x9F, 0x49, 0xFF, 0x11, 0x10, 0x95,
-  0xAC, 0x21, 0x00, 0x0B, 0x91, 0xAC, 0x21, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x1A,
-  0xFF, 0x12, 0x46, 0xB1, 0xAC, 0x21, 0x00, 0x11, 0x95, 0xAC, 0x21, 0x00, 0x31, 0x6F, 0x75,
-  0x74, 0x65, 0x72, 0x00, 0xD7, 0xAC, 0x21, 0x00, 0x30, 0x00, 0x00, 0x6E, 0x61, 0x6D, 0x65,
-  0x00, 0x57, 0x68, 0x69, 0x74, 0x65, 0x68, 0x6F, 0x72, 0x73, 0x65, 0x00, 0x00, 0x70, 0x6C,
-  0x61, 0x63, 0x65, 0x00, 0x74, 0x6F, 0x77, 0x6E, 0x00, 0x00, 0x74, 0x79, 0x70, 0x65, 0x00,
-  0x6D, 0x75, 0x6C, 0x74, 0x69, 0x70, 0x6F, 0x6C, 0x79, 0x67, 0x6F, 0x6E, 0x00, 0xFE};
+    {0xFF, 0xE0, 0x04, 0x6F, 0x35, 0x6D, 0x32, 0xFF, 0x10, 0x2B, 0xD7, 0xAC, 0x21, 0x00, 0xAD, 0xCF, 0xFC, 0x87, 0x0A,
+     0xA6, 0xCE, 0x88, 0xC3, 0x04, 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x00, 0x57, 0x68, 0x69, 0x74, 0x65, 0x68, 0x6F, 0x72,
+     0x73, 0x65, 0x00, 0x00, 0x70, 0x6C, 0x61, 0x63, 0x65, 0x00, 0x74, 0x6F, 0x77, 0x6E, 0x00, 0x10, 0x07, 0x2C, 0x00,
+     0x9A, 0x90, 0x24, 0xD9, 0x68, 0x10, 0x08, 0x04, 0x00, 0xDE, 0xCD, 0x1E, 0xF7, 0xF6, 0x15, 0x10, 0x08, 0x04, 0x00,
+     0x91, 0xD3, 0x2A, 0xFB, 0xCC, 0x11, 0x10, 0x08, 0x04, 0x00, 0xE7, 0x95, 0x60, 0xFE, 0x9A, 0x02, 0x10, 0x08, 0x04,
+     0x00, 0x97, 0xDE, 0x13, 0xC0, 0xA7, 0x0F, 0x10, 0x08, 0x04, 0x00, 0xB6, 0x9E, 0x14, 0xD2, 0xC3, 0x19, 0x10, 0x08,
+     0x04, 0x00, 0xA6, 0x8F, 0x22, 0xE0, 0xDD, 0x16, 0x10, 0x07, 0x02, 0x00, 0xA6, 0xF6, 0x19, 0x9F, 0x49, 0xFF, 0x11,
+     0x10, 0x95, 0xAC, 0x21, 0x00, 0x0B, 0x91, 0xAC, 0x21, 0x01, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x1A, 0xFF, 0x12,
+     0x46, 0xB1, 0xAC, 0x21, 0x00, 0x11, 0x95, 0xAC, 0x21, 0x00, 0x31, 0x6F, 0x75, 0x74, 0x65, 0x72, 0x00, 0xD7, 0xAC,
+     0x21, 0x00, 0x30, 0x00, 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x00, 0x57, 0x68, 0x69, 0x74, 0x65, 0x68, 0x6F, 0x72, 0x73,
+     0x65, 0x00, 0x00, 0x70, 0x6C, 0x61, 0x63, 0x65, 0x00, 0x74, 0x6F, 0x77, 0x6E, 0x00, 0x00, 0x74, 0x79, 0x70, 0x65,
+     0x00, 0x6D, 0x75, 0x6C, 0x74, 0x69, 0x70, 0x6F, 0x6C, 0x79, 0x67, 0x6F, 0x6E, 0x00, 0xFE};
 static_assert(sizeof(relation_o5m_data) == 224, "Size check failed");
diff --git a/generator/generator_tests/source_to_element_test.cpp b/generator/generator_tests/source_to_element_test.cpp
index 301273e3a..b2fdd3bac 100644
--- a/generator/generator_tests/source_to_element_test.cpp
+++ b/generator/generator_tests/source_to_element_test.cpp
@@ -21,10 +21,7 @@ UNIT_TEST(Source_To_Element_create_from_xml_test)
   SourceReader reader(ss);
 
   std::vector<OsmElement> elements;
-  ProcessOsmElementsFromXML(reader, [&elements](OsmElement && e)
-  {
-    elements.push_back(std::move(e));
-  });
+  ProcessOsmElementsFromXML(reader, [&elements](OsmElement && e) { elements.push_back(std::move(e)); });
 
   TEST_EQUAL(elements.size(), 10, (elements));
 }
@@ -36,10 +33,7 @@ UNIT_TEST(Source_To_Element_create_from_o5m_test)
   SourceReader reader(ss);
 
   std::vector<OsmElement> elements;
-  ProcessOsmElementsFromO5M(reader, [&elements](OsmElement && e)
-  {
-    elements.push_back(std::move(e));
-  });
+  ProcessOsmElementsFromO5M(reader, [&elements](OsmElement && e) { elements.push_back(std::move(e)); });
   TEST_EQUAL(elements.size(), 11, (elements));
 
   std::cout << DebugPrint(elements);
@@ -51,25 +45,17 @@ UNIT_TEST(Source_To_Element_check_equivalence)
   SourceReader readerXML(ss1);
 
   std::vector<OsmElement> elementsXML;
-  ProcessOsmElementsFromXML(readerXML, [&elementsXML](OsmElement && e)
-  {
-    elementsXML.push_back(std::move(e));
-  });
+  ProcessOsmElementsFromXML(readerXML, [&elementsXML](OsmElement && e) { elementsXML.push_back(std::move(e)); });
 
   std::string src(std::begin(relation_o5m_data), std::end(relation_o5m_data));
   std::istringstream ss2(src);
   SourceReader readerO5M(ss2);
 
   std::vector<OsmElement> elementsO5M;
-  ProcessOsmElementsFromO5M(readerO5M, [&elementsO5M](OsmElement && e)
-  {
-    elementsO5M.push_back(std::move(e));
-  });
+  ProcessOsmElementsFromO5M(readerO5M, [&elementsO5M](OsmElement && e) { elementsO5M.push_back(std::move(e)); });
 
   TEST_EQUAL(elementsXML.size(), elementsO5M.size(), ());
 
   for (size_t i = 0; i < elementsO5M.size(); ++i)
-  {
     TEST_EQUAL(elementsXML[i], elementsO5M[i], ());
-  }
 }
diff --git a/generator/generator_tests/speed_cameras_test.cpp b/generator/generator_tests/speed_cameras_test.cpp
index 961d06d23..72848a53b 100644
--- a/generator/generator_tests/speed_cameras_test.cpp
+++ b/generator/generator_tests/speed_cameras_test.cpp
@@ -75,10 +75,8 @@ std::vector<CameraMapItem> UnpackMapToVector(CameraMap const & cameraMap)
 {
   std::vector<CameraMapItem> result;
   for (auto const & mapIter : cameraMap)
-  {
     for (auto const & vectorIter : mapIter.second)
       result.push_back({mapIter.first, vectorIter});
-  }
 
   sort(result.begin(), result.end());
   return result;
@@ -101,8 +99,7 @@ void CheckCameraMapsEquality(CameraMap const & lhs, CameraMap const & rhs, doubl
   }
 }
 
-void TestSpeedCameraSectionBuilding(string const & osmContent, CameraMap const & answer,
-                                    double epsilon)
+void TestSpeedCameraSectionBuilding(string const & osmContent, CameraMap const & answer, double epsilon)
 {
   // ScopedFile takes relative path only?! and makes WritableDir() + kOsmFileName.
   // Replace WritebleDir here with temporary path.
@@ -189,9 +186,7 @@ UNIT_TEST(SpeedCameraGenerationTest_CameraIsOnePointOfFeature_1)
   //                      coef - position on segment (at the beginning of segment) - 0,
   //                      maxSpeed - 100.
 
-  CameraMap const answer = {
-    {SegmentCoord(0, 0), std::vector<RouteSegment::SpeedCamera>{{0, 100}}}
-  };
+  CameraMap const answer = {{SegmentCoord(0, 0), std::vector<RouteSegment::SpeedCamera>{{0, 100}}}};
   TestSpeedCameraSectionBuilding(osmContent, answer, kCoefEqualityEpsilon);
 }
 
@@ -222,9 +217,7 @@ UNIT_TEST(SpeedCameraGenerationTest_CameraIsOnePointOfFeature_2)
   //                      coef - position on segment (at the beginning of segment) - 0,
   //                      maxSpeed - 100.
 
-  CameraMap const answer = {
-    {SegmentCoord(0, 1), std::vector<RouteSegment::SpeedCamera>{{0, 100}}}
-  };
+  CameraMap const answer = {{SegmentCoord(0, 1), std::vector<RouteSegment::SpeedCamera>{{0, 100}}}};
   TestSpeedCameraSectionBuilding(osmContent, answer, kCoefEqualityEpsilon);
 }
 
@@ -255,9 +248,7 @@ UNIT_TEST(SpeedCameraGenerationTest_CameraIsOnePointOfFeature_3)
   //                      coef - position on segment (at the end of segment) - 1,
   //                      maxSpeed - 100.
 
-  CameraMap const answer = {
-    {SegmentCoord(0, 1), std::vector<RouteSegment::SpeedCamera>{{1, 100}}}
-  };
+  CameraMap const answer = {{SegmentCoord(0, 1), std::vector<RouteSegment::SpeedCamera>{{1, 100}}}};
   TestSpeedCameraSectionBuilding(osmContent, answer, kCoefEqualityEpsilon);
 }
 
@@ -311,10 +302,8 @@ UNIT_TEST(SpeedCameraGenerationTest_CameraIsOnePointOfFeature_4)
   //                      coef - position on segment (at the beginning of segment) - 0,
   //                      maxSpeed - 100.
 
-  CameraMap const answer = {
-    {SegmentCoord(0, 1), std::vector<RouteSegment::SpeedCamera>{{1, 100}}},
-    {SegmentCoord(1, 1), std::vector<RouteSegment::SpeedCamera>{{0, 100}}}
-  };
+  CameraMap const answer = {{SegmentCoord(0, 1), std::vector<RouteSegment::SpeedCamera>{{1, 100}}},
+                            {SegmentCoord(1, 1), std::vector<RouteSegment::SpeedCamera>{{0, 100}}}};
   TestSpeedCameraSectionBuilding(osmContent, answer, kCoefEqualityEpsilon);
 }
 
@@ -353,8 +342,7 @@ UNIT_TEST(SpeedCameraGenerationTest_CameraIsNearFeature_1)
                  mercator::DistanceOnEarth(mercator::FromLatLon(55.7793100, 37.3699100),
                                            mercator::FromLatLon(55.7793300, 37.3699300));
   epsilon = math::Clamp(epsilon, 0.0, 1.0);
-  CameraMap const answer = {
-      {SegmentCoord(0, 0), std::vector<RouteSegment::SpeedCamera>{{0.5, 100}}}};
+  CameraMap const answer = {{SegmentCoord(0, 0), std::vector<RouteSegment::SpeedCamera>{{0.5, 100}}}};
   TestSpeedCameraSectionBuilding(osmContent, answer, epsilon);
 }
 
@@ -391,9 +379,7 @@ UNIT_TEST(SpeedCameraGenerationTest_CameraIsNearFeature_2)
                                            mercator::FromLatLon(55.7793300, 37.3699300));
   epsilon = math::Clamp(epsilon, 0.0, 1.0);
 
-  CameraMap const answer = {
-    {SegmentCoord(0, 0), std::vector<RouteSegment::SpeedCamera>{{0.25, 100}}}
-  };
+  CameraMap const answer = {{SegmentCoord(0, 0), std::vector<RouteSegment::SpeedCamera>{{0.25, 100}}}};
   TestSpeedCameraSectionBuilding(osmContent, answer, epsilon);
 }
 
diff --git a/generator/generator_tests/srtm_parser_test.cpp b/generator/generator_tests/srtm_parser_test.cpp
index 427e7db59..e9de44a46 100644
--- a/generator/generator_tests/srtm_parser_test.cpp
+++ b/generator/generator_tests/srtm_parser_test.cpp
@@ -112,18 +112,99 @@ UNIT_TEST(SRTM_SamplesTest)
   SrtmTileManager manager("/Users/vng/SRTM");
 
   std::initializer_list<ms::LatLon> arr[] = {
-    {{ 41.899802800880578957, 12.498703841110341273}, { 41.899748897914214751, 12.498642150302543996}, { 41.899315676124750496, 12.498172763721441925}, { 41.899207869324136766, 12.498057428732948893 }},
-    {{ 41.900315874986389986, 12.499267105007675127}, { 41.900234022973513959, 12.499175909900486658}, { 41.899802800880578957, 12.498703841110341273 }},
-    {{ 41.899317672545265623, 12.499556783583443575}, { 41.899704976945002954, 12.498910371206022774}, { 41.899716955394147533, 12.49888623132471821}, { 41.899730930248637151, 12.498862091443413647}, { 41.899744905100071435, 12.49882990493497914}, { 41.899760876355117034, 12.498797718426573056}, { 41.899772854793766896, 12.498768214127181864}, { 41.899788826041820755, 12.498736027618775779}, { 41.899802800880578957, 12.498703841110341273 }},
-    {{ 41.900297907480371862, 12.497869674100513748}, { 41.900259976062137923, 12.497931364908311025}, { 41.899866685818835776, 12.498593870539906447}, { 41.899834743357700972, 12.498647514720602203}, { 41.899818772121129484, 12.498674336810950081}, { 41.899802800880578957, 12.498703841110341273 }},
-    {{ 41.899728933841061007, 12.497309092412223208}, { 41.900224041013551357, 12.497850898637267392}, { 41.90023202658165502, 12.49786430968242712}, { 41.900224041013551357, 12.497888449563731683}, { 41.899826757739916161, 12.498548272986312213}, { 41.899808790096251698, 12.498556319613442156}, { 41.899802800880578957, 12.498550955195355527}, { 41.89979281885320006, 12.498545590777297321}, { 41.899307690442057606, 12.498009148970311344}, { 41.899301701179375357, 12.497995737925151616}, { 41.899309686862821422, 12.497976962461905259}, { 41.899716955394147533, 12.497311774621238101}, { 41.899728933841061007, 12.497309092412223208 }},
-    {{ 41.899802800880578957, 12.498550955195355527}, { 41.899748897914214751, 12.498642150302543996}, { 41.899681020039992063, 12.498754803082022136 }},
-    {{ 41.899912603078725226, 12.498650196929645517}, { 41.899866685818835776, 12.498593870539906447}, { 41.899826757739916161, 12.498548272986312213 }},
-    {{ 41.899994455503602353, 12.498516086477906128}, { 41.899912603078725226, 12.498650196929645517}, { 41.899912603078725226, 12.498685065647094916}, { 41.900285929140210328, 12.499090079211356397}, { 41.90030589303923847, 12.499111536883646068}, { 41.90070516970908443, 12.498435620206862495}, { 41.900711158840110215, 12.49842489137071766}, { 41.900715151593857399, 12.498408798116514618}, { 41.900713155217019334, 12.498398069280369782}, { 41.90056342677709722, 12.498237136738282516}, { 41.900327853320931126, 12.497979644670920152}, { 41.900317871375655443, 12.497976962461905259}, { 41.900307889428788144, 12.497982326879963466}, { 41.899994455503602353, 12.498516086477906128 }},
+    {{ 41.899802800880578957, 12.498703841110341273}, { 41.899748897914214751, 12.498642150302543996},
+{ 41.899315676124750496, 12.498172763721441925}, { 41.899207869324136766, 12.498057428732948893 }},
+    {{ 41.900315874986389986, 12.499267105007675127}, { 41.900234022973513959, 12.499175909900486658},
+{ 41.899802800880578957, 12.498703841110341273 }},
+    {{ 41.899317672545265623, 12.499556783583443575}, { 41.899704976945002954, 12.498910371206022774},
+{ 41.899716955394147533, 12.49888623132471821}, { 41.899730930248637151, 12.498862091443413647},
+{ 41.899744905100071435, 12.49882990493497914}, { 41.899760876355117034, 12.498797718426573056},
+{ 41.899772854793766896, 12.498768214127181864}, { 41.899788826041820755, 12.498736027618775779},
+{ 41.899802800880578957, 12.498703841110341273 }},
+    {{ 41.900297907480371862, 12.497869674100513748}, { 41.900259976062137923, 12.497931364908311025},
+{ 41.899866685818835776, 12.498593870539906447}, { 41.899834743357700972, 12.498647514720602203},
+{ 41.899818772121129484, 12.498674336810950081}, { 41.899802800880578957, 12.498703841110341273 }},
+    {{ 41.899728933841061007, 12.497309092412223208}, { 41.900224041013551357, 12.497850898637267392},
+{ 41.90023202658165502, 12.49786430968242712}, { 41.900224041013551357, 12.497888449563731683},
+{ 41.899826757739916161, 12.498548272986312213}, { 41.899808790096251698, 12.498556319613442156},
+{ 41.899802800880578957, 12.498550955195355527}, { 41.89979281885320006, 12.498545590777297321},
+{ 41.899307690442057606, 12.498009148970311344}, { 41.899301701179375357, 12.497995737925151616},
+{ 41.899309686862821422, 12.497976962461905259}, { 41.899716955394147533, 12.497311774621238101},
+{ 41.899728933841061007, 12.497309092412223208 }},
+    {{ 41.899802800880578957, 12.498550955195355527}, { 41.899748897914214751, 12.498642150302543996},
+{ 41.899681020039992063, 12.498754803082022136 }},
+    {{ 41.899912603078725226, 12.498650196929645517}, { 41.899866685818835776, 12.498593870539906447},
+{ 41.899826757739916161, 12.498548272986312213 }},
+    {{ 41.899994455503602353, 12.498516086477906128}, { 41.899912603078725226, 12.498650196929645517},
+{ 41.899912603078725226, 12.498685065647094916}, { 41.900285929140210328, 12.499090079211356397},
+{ 41.90030589303923847, 12.499111536883646068}, { 41.90070516970908443, 12.498435620206862495},
+{ 41.900711158840110215, 12.49842489137071766}, { 41.900715151593857399, 12.498408798116514618},
+{ 41.900713155217019334, 12.498398069280369782}, { 41.90056342677709722, 12.498237136738282516},
+{ 41.900327853320931126, 12.497979644670920152}, { 41.900317871375655443, 12.497976962461905259},
+{ 41.900307889428788144, 12.497982326879963466}, { 41.899994455503602353, 12.498516086477906128 }},
 
-    {{ 44.759886801735603967, 34.316046940654871378 }, { 44.759500178870737841, 34.315553414192436321 }, { 44.759132599068138347, 34.315443443622029918 }, { 44.758765016927078761, 34.315430032576841768 }, { 44.758071746835689453, 34.315253006780551459 }, { 44.758037464032938146, 34.315255688989566352 }, { 44.757483222565575431, 34.315306650961247215 }, { 44.756708037437867631, 34.315676795808059296 }, { 44.756323297960172169, 34.315652655926726311 }, { 44.755963316624225001, 34.315430032576841768 }, { 44.755833798981250027, 34.315153765046261469 }, { 44.755789991477485046, 34.314949917159594861 }},
-    {{ 44.759886801735603967, 34.316046940654871378 }, { 44.760006787615907342, 34.315175222718522718 }, { 44.760048687388419353, 34.315011607967392138 }, { 44.760260090322724125, 34.314772891363304552 }, { 44.760437211104594724, 34.314665603001913041 }, { 44.760572431981174191, 34.314383971053246114 }, { 44.760701939002856875, 34.314300822573159166 }, { 44.761223773178279828, 34.314088928059419459 }, { 44.761292334982400121, 34.314091610268434351 }, { 44.761376132632506142, 34.314011143997390718 }, { 44.761667518969709079, 34.313895809008897686 }, { 44.761739889204726239, 34.31379924948365101 }, { 44.761739889204726239, 34.313705372167419227 }, { 44.76183130410882427, 34.313568579506636524 }, { 44.761930336758403826, 34.313549804043390168 }, { 44.761981757490261202, 34.313442515681998657 }, { 44.762050318394869919, 34.313396918128404423 }, { 44.762176013175370315, 34.313391553710346216 }, { 44.762316943361625476, 34.313359367201911709 }, { 44.762610229403847484, 34.313332545111563832 }, { 44.762627369451166714, 34.313343273947708667 }, { 44.762663553978839559, 34.313313769648317475 }, { 44.762673076219179791, 34.313278900930868076 }, { 44.762678789562635018, 34.313233303377273842 }, { 44.762692120695184883, 34.31320379907788265 }, { 44.762720687397411723, 34.313182341405621401 }, { 44.762734018520298207, 34.313107239552635974 }, { 44.762747349640086725, 34.313091146298432932 }, { 44.7628063874193316, 34.313101875134577767 }, { 44.76292065391750441, 34.313123332806839016 }, { 44.762977787081830172, 34.313056277580983533 }, { 44.763063486722373341, 34.313107239552635974 }, { 44.763282496337311045, 34.313088464089389618 }},
-    {{ 44.756521381971580809, 34.332137512655094724 }, { 44.756469956380023234, 34.331619846311355104 }, { 44.756412816780184016, 34.331308710063325407 }, { 44.756359486436011252, 34.331040489159818208 }, { 44.75633282124546497, 34.330965387306861203 }, { 44.756294728094793811, 34.330860781154484584 }, { 44.756264253556160781, 34.330694484194339111 }, { 44.756294728094793811, 34.330608653505208849 }, { 44.756323297960172169, 34.330533551652223423 }, { 44.756433767973362592, 34.330359208064976428 }, { 44.756555665673857902, 34.330109762624715586 }, { 44.756641374840555159, 34.329940783455526798 }, { 44.756755653531747896, 34.329755711032106547 }, { 44.757010875126020721, 34.329463350247323206 }, { 44.757180387352946127, 34.329117345281815687 }, { 44.757266095593031707, 34.32893495506743875 }, { 44.757448939413642108, 34.328564810220626669 }, { 44.757591785745901802, 34.328301953735206098 }, { 44.757746059388104243, 34.327797698436654628 }, { 44.757807006886359602, 34.327470468934393466 }, { 44.75787366813893442, 34.327239798957407402 }, { 44.757986039790637278, 34.327089595251464971 }, { 44.758026036427494887, 34.326995717935233188 }, { 44.758113648011466523, 34.326907205037088033 }, { 44.75817078592944398, 34.326783823421465058 }, { 44.758237446762365153, 34.326400267529493249 }, { 44.758264111073970071, 34.3263519877668557 }, { 44.758357436067782942, 34.326177644179608706 }, { 44.758412669156371066, 34.325909423276101506 }, { 44.758505993910240761, 34.325775312824362118 }, { 44.758526944344453113, 34.325598287028071809 }, { 44.758479329710219474, 34.325461494367289106 }, { 44.758391718680712756, 34.325370299260100637 }, { 44.758429810449001707, 34.32524423543546277 }, { 44.75854789477109108, 34.325085985102390396 }, { 44.758637410144764601, 34.324914323724158294 }, { 44.758685024648755757, 34.324734615718824671 }, { 44.758707879596705936, 34.324613916312273432 }, { 44.758766921503791991, 34.324568318758679197 }, { 44.758749780311177346, 34.32444225493404133 }, { 44.758799299298182461, 34.324206220538968637 }, { 44.75882786792522694, 34.323988961607142301 }, { 44.758825963350531651, 34.323667096522939346 }, { 44.758843104520543932, 34.323423015500765132 }, { 44.758862150259034252, 34.323181616687634232 }, { 44.758915478293424428, 34.322983133219054253 }, { 44.758944046863021526, 34.322875844857662742 }, { 44.759084984933011242, 34.322862433812474592 }, { 44.758966901708539865, 34.32266126813487972 }, { 44.758865959405987667, 34.32256202640058973 }, { 44.758753589465527511, 34.322331356423575244 }, { 44.75867359717138072, 34.322089957610444344 }, { 44.758690738386590624, 34.321875380887661322 }, { 44.758690738386590624, 34.321754681481081661 }, { 44.758698356702829813, 34.321642028701631943 }, { 44.758643123887310367, 34.321379172216211373 }, { 44.758641219306547043, 34.321231650719283834 }, { 44.758665978851873035, 34.321027802832645648 }, { 44.758732639113461005, 34.320837365991167189 }, { 44.75867359717138072, 34.320502089861804507 }, { 44.75867931091034535, 34.320392119291369681 }, { 44.758808822175438991, 34.320268737675775128 }, { 44.758793585571083895, 34.320099758506557919 }, { 44.758978329127899087, 34.319783257840441593 }, { 44.759109744288181787, 34.319584774371861613 }, { 44.75926782299799811, 34.31950430810081798 }, { 44.759357337256332698, 34.319305824632238 }, { 44.759387810163708821, 34.319016146056469552 }, { 44.759481133342561066, 34.318686234345193498 }, { 44.75951351073673834, 34.318530666221164438 }, { 44.759524938047988485, 34.318332182752584458 }, { 44.759637306488322395, 34.317903029306989993 }, { 44.759671588341880977, 34.317436324934931235 }, { 44.759871565415501493, 34.317044722415829483 }, { 44.759902038051663453, 34.316647755478669524 }, { 44.759915369824923914, 34.316167640061422617 }, { 44.759886801735603967, 34.316046940654871378 }},
+    {{ 44.759886801735603967, 34.316046940654871378 }, { 44.759500178870737841, 34.315553414192436321 },
+{ 44.759132599068138347, 34.315443443622029918 }, { 44.758765016927078761, 34.315430032576841768 },
+{ 44.758071746835689453, 34.315253006780551459 }, { 44.758037464032938146, 34.315255688989566352 },
+{ 44.757483222565575431, 34.315306650961247215 }, { 44.756708037437867631, 34.315676795808059296 },
+{ 44.756323297960172169, 34.315652655926726311 }, { 44.755963316624225001, 34.315430032576841768 },
+{ 44.755833798981250027, 34.315153765046261469 }, { 44.755789991477485046, 34.314949917159594861 }},
+    {{ 44.759886801735603967, 34.316046940654871378 }, { 44.760006787615907342, 34.315175222718522718 },
+{ 44.760048687388419353, 34.315011607967392138 }, { 44.760260090322724125, 34.314772891363304552 },
+{ 44.760437211104594724, 34.314665603001913041 }, { 44.760572431981174191, 34.314383971053246114 },
+{ 44.760701939002856875, 34.314300822573159166 }, { 44.761223773178279828, 34.314088928059419459 },
+{ 44.761292334982400121, 34.314091610268434351 }, { 44.761376132632506142, 34.314011143997390718 },
+{ 44.761667518969709079, 34.313895809008897686 }, { 44.761739889204726239, 34.31379924948365101 },
+{ 44.761739889204726239, 34.313705372167419227 }, { 44.76183130410882427, 34.313568579506636524 },
+{ 44.761930336758403826, 34.313549804043390168 }, { 44.761981757490261202, 34.313442515681998657 },
+{ 44.762050318394869919, 34.313396918128404423 }, { 44.762176013175370315, 34.313391553710346216 },
+{ 44.762316943361625476, 34.313359367201911709 }, { 44.762610229403847484, 34.313332545111563832 },
+{ 44.762627369451166714, 34.313343273947708667 }, { 44.762663553978839559, 34.313313769648317475 },
+{ 44.762673076219179791, 34.313278900930868076 }, { 44.762678789562635018, 34.313233303377273842 },
+{ 44.762692120695184883, 34.31320379907788265 }, { 44.762720687397411723, 34.313182341405621401 },
+{ 44.762734018520298207, 34.313107239552635974 }, { 44.762747349640086725, 34.313091146298432932 },
+{ 44.7628063874193316, 34.313101875134577767 }, { 44.76292065391750441, 34.313123332806839016 },
+{ 44.762977787081830172, 34.313056277580983533 }, { 44.763063486722373341, 34.313107239552635974 },
+{ 44.763282496337311045, 34.313088464089389618 }},
+    {{ 44.756521381971580809, 34.332137512655094724 }, { 44.756469956380023234, 34.331619846311355104 },
+{ 44.756412816780184016, 34.331308710063325407 }, { 44.756359486436011252, 34.331040489159818208 },
+{ 44.75633282124546497, 34.330965387306861203 }, { 44.756294728094793811, 34.330860781154484584 },
+{ 44.756264253556160781, 34.330694484194339111 }, { 44.756294728094793811, 34.330608653505208849 },
+{ 44.756323297960172169, 34.330533551652223423 }, { 44.756433767973362592, 34.330359208064976428 },
+{ 44.756555665673857902, 34.330109762624715586 }, { 44.756641374840555159, 34.329940783455526798 },
+{ 44.756755653531747896, 34.329755711032106547 }, { 44.757010875126020721, 34.329463350247323206 },
+{ 44.757180387352946127, 34.329117345281815687 }, { 44.757266095593031707, 34.32893495506743875 },
+{ 44.757448939413642108, 34.328564810220626669 }, { 44.757591785745901802, 34.328301953735206098 },
+{ 44.757746059388104243, 34.327797698436654628 }, { 44.757807006886359602, 34.327470468934393466 },
+{ 44.75787366813893442, 34.327239798957407402 }, { 44.757986039790637278, 34.327089595251464971 },
+{ 44.758026036427494887, 34.326995717935233188 }, { 44.758113648011466523, 34.326907205037088033 },
+{ 44.75817078592944398, 34.326783823421465058 }, { 44.758237446762365153, 34.326400267529493249 },
+{ 44.758264111073970071, 34.3263519877668557 }, { 44.758357436067782942, 34.326177644179608706 },
+{ 44.758412669156371066, 34.325909423276101506 }, { 44.758505993910240761, 34.325775312824362118 },
+{ 44.758526944344453113, 34.325598287028071809 }, { 44.758479329710219474, 34.325461494367289106 },
+{ 44.758391718680712756, 34.325370299260100637 }, { 44.758429810449001707, 34.32524423543546277 },
+{ 44.75854789477109108, 34.325085985102390396 }, { 44.758637410144764601, 34.324914323724158294 },
+{ 44.758685024648755757, 34.324734615718824671 }, { 44.758707879596705936, 34.324613916312273432 },
+{ 44.758766921503791991, 34.324568318758679197 }, { 44.758749780311177346, 34.32444225493404133 },
+{ 44.758799299298182461, 34.324206220538968637 }, { 44.75882786792522694, 34.323988961607142301 },
+{ 44.758825963350531651, 34.323667096522939346 }, { 44.758843104520543932, 34.323423015500765132 },
+{ 44.758862150259034252, 34.323181616687634232 }, { 44.758915478293424428, 34.322983133219054253 },
+{ 44.758944046863021526, 34.322875844857662742 }, { 44.759084984933011242, 34.322862433812474592 },
+{ 44.758966901708539865, 34.32266126813487972 }, { 44.758865959405987667, 34.32256202640058973 },
+{ 44.758753589465527511, 34.322331356423575244 }, { 44.75867359717138072, 34.322089957610444344 },
+{ 44.758690738386590624, 34.321875380887661322 }, { 44.758690738386590624, 34.321754681481081661 },
+{ 44.758698356702829813, 34.321642028701631943 }, { 44.758643123887310367, 34.321379172216211373 },
+{ 44.758641219306547043, 34.321231650719283834 }, { 44.758665978851873035, 34.321027802832645648 },
+{ 44.758732639113461005, 34.320837365991167189 }, { 44.75867359717138072, 34.320502089861804507 },
+{ 44.75867931091034535, 34.320392119291369681 }, { 44.758808822175438991, 34.320268737675775128 },
+{ 44.758793585571083895, 34.320099758506557919 }, { 44.758978329127899087, 34.319783257840441593 },
+{ 44.759109744288181787, 34.319584774371861613 }, { 44.75926782299799811, 34.31950430810081798 },
+{ 44.759357337256332698, 34.319305824632238 }, { 44.759387810163708821, 34.319016146056469552 },
+{ 44.759481133342561066, 34.318686234345193498 }, { 44.75951351073673834, 34.318530666221164438 },
+{ 44.759524938047988485, 34.318332182752584458 }, { 44.759637306488322395, 34.317903029306989993 },
+{ 44.759671588341880977, 34.317436324934931235 }, { 44.759871565415501493, 34.317044722415829483 },
+{ 44.759902038051663453, 34.316647755478669524 }, { 44.759915369824923914, 34.316167640061422617 },
+{ 44.759886801735603967, 34.316046940654871378 }},
   };
 
   using namespace std;
@@ -135,4 +216,4 @@ UNIT_TEST(SRTM_SamplesTest)
   }
 }
 */
-} // namespace srtm_parser_test
+}  // namespace srtm_parser_test
diff --git a/generator/generator_tests/tag_admixer_test.cpp b/generator/generator_tests/tag_admixer_test.cpp
index e8d86d972..f11b31a1c 100644
--- a/generator/generator_tests/tag_admixer_test.cpp
+++ b/generator/generator_tests/tag_admixer_test.cpp
@@ -49,7 +49,8 @@ UNIT_TEST(CapitalsParserTests)
 {
   std::set<uint64_t> capitals;
   CapitalsParserHelper parser(capitals);
-  std::istringstream stream("-21.1343401;-175.201808;1082208696;t\n-16.6934156;-179.87995;242715809;f\n19.0534159;169.919199;448768937;t");
+  std::istringstream stream(
+      "-21.1343401;-175.201808;1082208696;t\n-16.6934156;-179.87995;242715809;f\n19.0534159;169.919199;448768937;t");
   parser.ParseStream(stream);
   TEST(capitals.find(1082208696) != capitals.end(), ());
   TEST(capitals.find(242715809) != capitals.end(), ());
@@ -68,8 +69,7 @@ UNIT_TEST(TagsReplacer_Smoke)
     TestReplacer(source, {{{"aerodrome:type", "international"}, {{"aerodrome", "international"}}}});
   }
   {
-    std::string const source =
-        "  aerodrome:type   =   international   :    aerodrome   =  international   ";
+    std::string const source = "  aerodrome:type   =   international   :    aerodrome   =  international   ";
     TestReplacer(source, {{{"aerodrome:type", "international"}, {{"aerodrome", "international"}}}});
   }
   {
@@ -79,9 +79,8 @@ UNIT_TEST(TagsReplacer_Smoke)
         "cliff=yes : natural=cliff | u\n"
         "\n"
         "office=travel_agent : shop=travel_agency";
-    TestReplacer(source, {
-        {{"cliff", "yes"}, {{"natural", "cliff"}}},
-        {{"natural", "forest"}, {{"natural", "wood"}}},
-        {{"office", "travel_agent"}, {{"shop", "travel_agency"}}}});
+    TestReplacer(source, {{{"cliff", "yes"}, {{"natural", "cliff"}}},
+                          {{"natural", "forest"}, {{"natural", "wood"}}},
+                          {{"office", "travel_agent"}, {{"shop", "travel_agency"}}}});
   }
 }
diff --git a/generator/generator_tests/tesselator_test.cpp b/generator/generator_tests/tesselator_test.cpp
index f09253771..09f0e0a40 100644
--- a/generator/generator_tests/tesselator_test.cpp
+++ b/generator/generator_tests/tesselator_test.cpp
@@ -11,19 +11,17 @@ typedef m2::PointD P;
 class DoDump
 {
   size_t & m_count;
+
 public:
-  explicit DoDump(size_t & count) : m_count(count)
-  {
-    m_count = 0;
-  }
-  void operator() (P const & p1, P const & p2, P const & p3)
+  explicit DoDump(size_t & count) : m_count(count) { m_count = 0; }
+  void operator()(P const & p1, P const & p2, P const & p3)
   {
     ++m_count;
     LOG(LINFO, (p1, p2, p3));
   }
 };
 
-size_t RunTest(std::list<std::vector<P> > const & l)
+size_t RunTest(std::list<std::vector<P>> const & l)
 {
   tesselator::TrianglesInfo info;
   int const trianglesCount = tesselator::TesselateInterior(l, info);
@@ -36,7 +34,7 @@ size_t RunTest(std::list<std::vector<P> > const & l)
 
 size_t RunTess(P const * arr, size_t count)
 {
-  std::list<std::vector<P> > l;
+  std::list<std::vector<P>> l;
   l.emplace_back();
   l.back().assign(arr, arr + count);
 
@@ -45,17 +43,17 @@ size_t RunTess(P const * arr, size_t count)
 
 UNIT_TEST(Tesselator_SelfISect)
 {
-  P arr[] = { P(0, 0), P(0, 4), P(4, 4), P(1, 1), P(1, 3), P(4, 0), P(0, 0) };
+  P arr[] = {P(0, 0), P(0, 4), P(4, 4), P(1, 1), P(1, 3), P(4, 0), P(0, 0)};
   TEST_EQUAL(6, RunTess(arr, ARRAY_SIZE(arr)), ());
 }
 
 UNIT_TEST(Tesselator_Odd)
 {
-  P arr[] = { P(-100, -100), P(100, 100), P(100, -100) };
+  P arr[] = {P(-100, -100), P(100, 100), P(100, -100)};
 
   size_t const count = ARRAY_SIZE(arr);
 
-  std::list<std::vector<P> > l;
+  std::list<std::vector<P>> l;
   l.emplace_back();
   l.back().assign(arr, arr + count);
   l.emplace_back();
@@ -63,7 +61,7 @@ UNIT_TEST(Tesselator_Odd)
 
   TEST_EQUAL(0, RunTest(l), ());
 
-  P arr1[] = { P(-100, -100), P(100, -100), P(100, 100), P(-100, 100) };
+  P arr1[] = {P(-100, -100), P(100, -100), P(100, 100), P(-100, 100)};
 
   l.emplace_back();
   l.back().assign(arr1, arr1 + ARRAY_SIZE(arr1));
diff --git a/generator/generator_tests/triangles_tree_coding_test.cpp b/generator/generator_tests/triangles_tree_coding_test.cpp
index 4504bcfb9..622785012 100644
--- a/generator/generator_tests/triangles_tree_coding_test.cpp
+++ b/generator/generator_tests/triangles_tree_coding_test.cpp
@@ -25,9 +25,8 @@ bool FindTriangle(serial::OutPointsT const & test, P arr[])
   {
     for (int base = 0; base < 3; ++base)
     {
-      if (IsEqual(test[i], arr[base])
-          && IsEqual(test[i + 1], arr[(base + 1) % 3])
-          && IsEqual(test[i + 2], arr[(base + 2) % 3]))
+      if (IsEqual(test[i], arr[base]) && IsEqual(test[i + 1], arr[(base + 1) % 3]) &&
+          IsEqual(test[i + 2], arr[(base + 2) % 3]))
       {
         return true;
       }
@@ -94,11 +93,8 @@ UNIT_TEST(TrianglesCoding_Smoke)
 
 UNIT_TEST(TrianglesCoding_Rect)
 {
-  P arrP[] = {
-      P(-16.874999848078005, -44.999999874271452),
-      P(-16.874999848078005, -39.374999869032763),
-      P(-11.249999842839316, -39.374999869032763),
-      P(-11.249999842839316, -44.999999874271452)};
+  P arrP[] = {P(-16.874999848078005, -44.999999874271452), P(-16.874999848078005, -39.374999869032763),
+              P(-11.249999842839316, -39.374999869032763), P(-11.249999842839316, -44.999999874271452)};
 
   int arrT[][3] = {{2, 0, 1}, {0, 2, 3}};
 
diff --git a/generator/generator_tests/types_helper.hpp b/generator/generator_tests/types_helper.hpp
index a8fce0ea7..35980b4f8 100644
--- a/generator/generator_tests/types_helper.hpp
+++ b/generator/generator_tests/types_helper.hpp
@@ -36,4 +36,4 @@ inline uint32_t GetType(base::StringIL const & lst)
 {
   return classif().GetTypeByPath(lst);
 }
-} // namespace tests
+}  // namespace tests
diff --git a/generator/generator_tests_support/routing_helpers.cpp b/generator/generator_tests_support/routing_helpers.cpp
index 1c9caea27..fa051b4db 100644
--- a/generator/generator_tests_support/routing_helpers.cpp
+++ b/generator/generator_tests_support/routing_helpers.cpp
@@ -57,8 +57,7 @@ void TestGeometryLoader::Load(uint32_t featureId, RoadGeometry & road)
   road = it->second;
 }
 
-void TestGeometryLoader::AddRoad(uint32_t featureId, bool oneWay, float speed,
-                                 RoadGeometry::Points const & points)
+void TestGeometryLoader::AddRoad(uint32_t featureId, bool oneWay, float speed, RoadGeometry::Points const & points)
 {
   auto const it = m_roads.find(featureId);
   CHECK(it == m_roads.end(), ("Already contains feature", featureId));
@@ -76,8 +75,8 @@ void TestGeometryLoader::SetPassThroughAllowed(uint32_t featureId, bool passThro
 std::shared_ptr<EdgeEstimator> CreateEstimatorForCar(std::shared_ptr<TrafficStash> trafficStash)
 {
   auto const carModel = CarModelFactory({}).GetVehicleModel();
-  return EdgeEstimator::Create(VehicleType::Car, *carModel, trafficStash,
-    nullptr /* DataSource */, nullptr /* NumMwmIds */);
+  return EdgeEstimator::Create(VehicleType::Car, *carModel, trafficStash, nullptr /* DataSource */,
+                               nullptr /* NumMwmIds */);
 }
 
 std::shared_ptr<EdgeEstimator> CreateEstimatorForCar(traffic::TrafficCache const & trafficCache)
@@ -97,11 +96,9 @@ Joint MakeJoint(std::vector<RoadPoint> const & points)
 }
 
 std::unique_ptr<IndexGraph> BuildIndexGraph(std::unique_ptr<TestGeometryLoader> geometryLoader,
-                                            std::shared_ptr<EdgeEstimator> estimator,
-                                            std::vector<Joint> const & joints)
+                                            std::shared_ptr<EdgeEstimator> estimator, std::vector<Joint> const & joints)
 {
-  auto graph = std::make_unique<IndexGraph>(std::make_shared<Geometry>(std::move(geometryLoader)),
-                                       estimator);
+  auto graph = std::make_unique<IndexGraph>(std::make_shared<Geometry>(std::move(geometryLoader)), estimator);
   graph->Import(joints);
   return graph;
 }
diff --git a/generator/generator_tests_support/routing_helpers.hpp b/generator/generator_tests_support/routing_helpers.hpp
index c9cd2ad84..ae25980b2 100644
--- a/generator/generator_tests_support/routing_helpers.hpp
+++ b/generator/generator_tests_support/routing_helpers.hpp
@@ -21,11 +21,13 @@ namespace generator
 /// 30, 3,
 /// 40, 4
 /// \param outputFilePath full path to an output file where the mapping is saved.
-void ReEncodeOsmIdsToFeatureIdsMapping(std::string const & mappingContent,
-                                       std::string const & outputFilePath);
+void ReEncodeOsmIdsToFeatureIdsMapping(std::string const & mappingContent, std::string const & outputFilePath);
 }  // namespace generator
 
-namespace traffic { class TrafficCache; }
+namespace traffic
+{
+class TrafficCache;
+}
 
 namespace routing
 {
@@ -35,8 +37,7 @@ public:
   // GeometryLoader overrides:
   void Load(uint32_t featureId, routing::RoadGeometry & road) override;
 
-  void AddRoad(uint32_t featureId, bool oneWay, float speed,
-               routing::RoadGeometry::Points const & points);
+  void AddRoad(uint32_t featureId, bool oneWay, float speed, routing::RoadGeometry::Points const & points);
 
   void SetPassThroughAllowed(uint32_t featureId, bool passThroughAllowed);
 
@@ -53,4 +54,3 @@ std::unique_ptr<IndexGraph> BuildIndexGraph(std::unique_ptr<TestGeometryLoader>
                                             std::shared_ptr<EdgeEstimator> estimator,
                                             std::vector<Joint> const & joints);
 }  // namespace routing
-
diff --git a/generator/generator_tests_support/test_feature.cpp b/generator/generator_tests_support/test_feature.cpp
index ba01e4a25..f3ae628e9 100644
--- a/generator/generator_tests_support/test_feature.cpp
+++ b/generator/generator_tests_support/test_feature.cpp
@@ -37,7 +37,7 @@ uint64_t GenUniqueId()
 
 vector<m2::PointD> MakePoly(m2::RectD const & rect)
 {
-  return { rect.LeftBottom(), rect.RightBottom(), rect.RightTop(), rect.LeftTop(), rect.LeftBottom() };
+  return {rect.LeftBottom(), rect.RightBottom(), rect.RightTop(), rect.LeftTop(), rect.LeftBottom()};
 }
 
 StringUtf8Multilang MakeName(string const & name, string const & lang)
@@ -54,16 +54,25 @@ StringUtf8Multilang MakeName(string const & name, string const & lang)
 }  // namespace
 
 // TestFeature -------------------------------------------------------------------------------------
-TestFeature::TestFeature() : m_id(GenUniqueId()), m_center(0, 0), m_type(Type::Unknown) { Init(); }
+TestFeature::TestFeature() : m_id(GenUniqueId()), m_center(0, 0), m_type(Type::Unknown)
+{
+  Init();
+}
 
 TestFeature::TestFeature(StringUtf8Multilang name)
-  : m_id(GenUniqueId()), m_center(0, 0), m_type(Type::Unknown), m_names(std::move(name))
+  : m_id(GenUniqueId())
+  , m_center(0, 0)
+  , m_type(Type::Unknown)
+  , m_names(std::move(name))
 {
   Init();
 }
 
 TestFeature::TestFeature(m2::PointD const & center, StringUtf8Multilang name)
-  : m_id(GenUniqueId()), m_center(center), m_type(Type::Point), m_names(std::move(name))
+  : m_id(GenUniqueId())
+  , m_center(center)
+  , m_type(Type::Point)
+  , m_names(std::move(name))
 {
   Init();
 }
@@ -75,7 +84,11 @@ TestFeature::TestFeature(m2::RectD const & boundary, StringUtf8Multilang name)
 }
 
 TestFeature::TestFeature(vector<m2::PointD> geometry, StringUtf8Multilang name, Type type)
-  : m_id(GenUniqueId()), m_center(0, 0), m_geometry(std::move(geometry)), m_type(type), m_names(std::move(name))
+  : m_id(GenUniqueId())
+  , m_center(0, 0)
+  , m_geometry(std::move(geometry))
+  , m_type(type)
+  , m_names(std::move(name))
 {
   ASSERT(!m_geometry.empty(), ());
   Init();
@@ -145,23 +158,25 @@ void TestFeature::Serialize(FeatureBuilder & fb) const
 }
 
 // TestPlace -------------------------------------------------------------------------------------
-TestPlace::TestPlace(m2::PointD const & center, string const & name, string const & lang,
-                     uint32_t type, uint8_t rank /* = 0 */)
-  : TestFeature(center, MakeName(name, lang)), m_type(type), m_rank(rank)
-{
-}
+TestPlace::TestPlace(m2::PointD const & center, string const & name, string const & lang, uint32_t type,
+                     uint8_t rank /* = 0 */)
+  : TestFeature(center, MakeName(name, lang))
+  , m_type(type)
+  , m_rank(rank)
+{}
 
-TestPlace::TestPlace(m2::PointD const & center, StringUtf8Multilang const & name,
-                     uint32_t type, uint8_t rank)
-  : TestFeature(center, name), m_type(type), m_rank(rank)
-{
-}
+TestPlace::TestPlace(m2::PointD const & center, StringUtf8Multilang const & name, uint32_t type, uint8_t rank)
+  : TestFeature(center, name)
+  , m_type(type)
+  , m_rank(rank)
+{}
 
 TestPlace::TestPlace(std::vector<m2::PointD> const & boundary, std::string const & name, std::string const & lang,
                      uint32_t type, uint8_t rank)
-  : TestFeature(boundary, MakeName(name, lang), Type::Area), m_type(type), m_rank(rank)
-{
-}
+  : TestFeature(boundary, MakeName(name, lang), Type::Area)
+  , m_type(type)
+  , m_rank(rank)
+{}
 
 void TestPlace::Serialize(FeatureBuilder & fb) const
 {
@@ -191,13 +206,11 @@ TestCountry::TestCountry(m2::PointD const & center, std::string const & name, st
 
 TestState::TestState(m2::PointD const & center, string const & name, string const & lang)
   : TestPlace(center, name, lang, classif().GetTypeByPath({"place", "state"}))
-{
-}
+{}
 
 TestSea::TestSea(m2::PointD const & center, std::string const & name, std::string const & lang)
   : TestPlace(center, name, lang, classif().GetTypeByPath({"place", "sea"}))
-{
-}
+{}
 
 uint32_t TestCity::GetCityType()
 {
@@ -206,40 +219,35 @@ uint32_t TestCity::GetCityType()
 
 TestCity::TestCity(m2::PointD const & center, string const & name, string const & lang, uint8_t rank)
   : TestPlace(center, name, lang, GetCityType(), rank)
-{
-}
+{}
 
 TestCity::TestCity(m2::PointD const & center, StringUtf8Multilang const & name, uint8_t rank)
   : TestPlace(center, name, GetCityType(), rank)
-{
-}
+{}
 
 TestCity::TestCity(vector<m2::PointD> const & boundary, string const & name, string const & lang, uint8_t rank)
   : TestPlace(boundary, name, lang, GetCityType(), rank)
-{
-}
+{}
 
 TestVillage::TestVillage(m2::PointD const & center, string const & name, string const & lang, uint8_t rank)
   : TestPlace(center, name, lang, classif().GetTypeByPath({"place", "village"}), rank)
-{
-}
+{}
 
 TestSuburb::TestSuburb(m2::PointD const & center, string const & name, string const & lang)
   : TestPlace(center, name, lang, classif().GetTypeByPath({"place", "suburb"}))
-{
-}
+{}
 
 // TestStreet --------------------------------------------------------------------------------------
 TestStreet::TestStreet(vector<m2::PointD> const & points, string const & name, string const & lang)
   : TestFeature(points, MakeName(name, lang), Type::Line)
 {
-  SetType({ "highway", "living_street" });
+  SetType({"highway", "living_street"});
 }
 
 TestStreet::TestStreet(vector<m2::PointD> const & points, StringUtf8Multilang const & name)
   : TestFeature(points, name, Type::Line)
 {
-  SetType({ "highway", "living_street" });
+  SetType({"highway", "living_street"});
 }
 
 void TestStreet::SetType(base::StringIL const & e)
@@ -266,8 +274,7 @@ string TestStreet::ToDebugString() const
 // TestSquare --------------------------------------------------------------------------------------
 TestSquare::TestSquare(m2::RectD const & rect, string const & name, string const & lang)
   : TestFeature(rect, MakeName(name, lang))
-{
-}
+{}
 
 void TestSquare::Serialize(FeatureBuilder & fb) const
 {
@@ -354,9 +361,9 @@ void TestPOI::SetTypes(std::initializer_list<base::StringIL> const & types)
 // TestMultilingualPOI -----------------------------------------------------------------------------
 TestMultilingualPOI::TestMultilingualPOI(m2::PointD const & center, string const & defaultName,
                                          std::map<string, string> const & multilingualNames)
-  : TestPOI(center, defaultName, "default"), m_multilingualNames(multilingualNames)
-{
-}
+  : TestPOI(center, defaultName, "default")
+  , m_multilingualNames(multilingualNames)
+{}
 
 void TestMultilingualPOI::Serialize(FeatureBuilder & fb) const
 {
@@ -382,21 +389,22 @@ string TestMultilingualPOI::ToDebugString() const
 }
 
 // TestBuilding ------------------------------------------------------------------------------------
-TestBuilding::TestBuilding(m2::PointD const & center, string const & name,
-                           string const & houseNumber, string const & lang)
-  : TestFeature(center, MakeName(name, lang)), m_houseNumber(houseNumber)
-{
-}
+TestBuilding::TestBuilding(m2::PointD const & center, string const & name, string const & houseNumber,
+                           string const & lang)
+  : TestFeature(center, MakeName(name, lang))
+  , m_houseNumber(houseNumber)
+{}
 
-TestBuilding::TestBuilding(m2::PointD const & center, string const & name,
-                           string const & houseNumber, string_view street, string const & lang)
-  : TestFeature(center, MakeName(name, lang)), m_houseNumber(houseNumber)
+TestBuilding::TestBuilding(m2::PointD const & center, string const & name, string const & houseNumber,
+                           string_view street, string const & lang)
+  : TestFeature(center, MakeName(name, lang))
+  , m_houseNumber(houseNumber)
 {
   m_addr.Set(AddressData::Type::Street, street);
 }
 
-TestBuilding::TestBuilding(m2::RectD const & boundary, string const & name,
-                           string const & houseNumber, string_view street, string const & lang)
+TestBuilding::TestBuilding(m2::RectD const & boundary, string const & name, string const & houseNumber,
+                           string_view street, string const & lang)
   : TestFeature(boundary, MakeName(name, lang))
   , m_houseNumber(houseNumber)
 {
@@ -422,16 +430,14 @@ void TestBuilding::Serialize(FeatureBuilder & fb) const
 string TestBuilding::ToDebugString() const
 {
   ostringstream os;
-  os << "TestBuilding [" << DebugPrint(m_names) << ", " << m_houseNumber << ", "
-     << DebugPrint(m_center) << "]";
+  os << "TestBuilding [" << DebugPrint(m_names) << ", " << m_houseNumber << ", " << DebugPrint(m_center) << "]";
   return os.str();
 }
 
 // TestPark ----------------------------------------------------------------------------------------
 TestPark::TestPark(vector<m2::PointD> const & boundary, string const & name, string const & lang)
   : TestFeature(boundary, MakeName(name, lang), Type::Area)
-{
-}
+{}
 
 void TestPark::Serialize(FeatureBuilder & fb) const
 {
@@ -452,8 +458,7 @@ string TestPark::ToDebugString() const
 // TestRoad ----------------------------------------------------------------------------------------
 TestRoad::TestRoad(vector<m2::PointD> const & points, string const & name, string const & lang)
   : TestFeature(points, MakeName(name, lang), Type::Line)
-{
-}
+{}
 
 void TestRoad::Serialize(FeatureBuilder & fb) const
 {
@@ -471,6 +476,9 @@ string TestRoad::ToDebugString() const
 }
 
 // Functions ---------------------------------------------------------------------------------------
-string DebugPrint(TestFeature const & feature) { return feature.ToDebugString(); }
+string DebugPrint(TestFeature const & feature)
+{
+  return feature.ToDebugString();
+}
 }  // namespace tests_support
 }  // namespace generator
diff --git a/generator/generator_tests_support/test_feature.hpp b/generator/generator_tests_support/test_feature.hpp
index cc5642069..d5e1d6b65 100644
--- a/generator/generator_tests_support/test_feature.hpp
+++ b/generator/generator_tests_support/test_feature.hpp
@@ -15,8 +15,14 @@
 #include <vector>
 
 class FeatureType;
-namespace feature { class FeatureBuilder; }
-namespace osm { class Editor; }
+namespace feature
+{
+class FeatureBuilder;
+}
+namespace osm
+{
+class Editor;
+}
 
 namespace generator
 {
@@ -76,12 +82,11 @@ private:
 class TestPlace : public TestFeature
 {
 public:
-  TestPlace(m2::PointD const & center, std::string const & name, std::string const & lang,
-            uint32_t type, uint8_t rank = 0);
-  TestPlace(m2::PointD const & center, StringUtf8Multilang const & name,
-            uint32_t type, uint8_t rank);
-  TestPlace(std::vector<m2::PointD> const & boundary, std::string const & name, std::string const & lang,
-            uint32_t type, uint8_t rank);
+  TestPlace(m2::PointD const & center, std::string const & name, std::string const & lang, uint32_t type,
+            uint8_t rank = 0);
+  TestPlace(m2::PointD const & center, StringUtf8Multilang const & name, uint32_t type, uint8_t rank);
+  TestPlace(std::vector<m2::PointD> const & boundary, std::string const & name, std::string const & lang, uint32_t type,
+            uint8_t rank);
 
   // TestFeature overrides:
   void Serialize(feature::FeatureBuilder & fb) const override;
@@ -116,6 +121,7 @@ public:
 class TestCity : public TestPlace
 {
   static uint32_t GetCityType();
+
 public:
   TestCity(m2::PointD const & center, std::string const & name, std::string const & lang, uint8_t rank);
   TestCity(m2::PointD const & center, StringUtf8Multilang const & name, uint8_t rank);
@@ -167,10 +173,8 @@ class TestPOI : public TestFeature
 public:
   TestPOI(m2::PointD const & center, std::string const & name, std::string const & lang);
 
-  static std::pair<TestPOI, FeatureID> AddWithEditor(osm::Editor & editor,
-                                                     MwmSet::MwmId const & mwmId,
-                                                     std::string const & enName,
-                                                     m2::PointD const & pt);
+  static std::pair<TestPOI, FeatureID> AddWithEditor(osm::Editor & editor, MwmSet::MwmId const & mwmId,
+                                                     std::string const & enName, m2::PointD const & pt);
 
   // TestFeature overrides:
   void Serialize(feature::FeatureBuilder & fb) const override;
@@ -217,10 +221,7 @@ public:
   std::string ToDebugString() const override;
 
   void SetType(uint32_t type) { m_type = type; }
-  void SetPlace(std::string_view place)
-  {
-    m_addr.Set(feature::AddressData::Type::Place, place);
-  }
+  void SetPlace(std::string_view place) { m_addr.Set(feature::AddressData::Type::Place, place); }
 
 private:
   std::string m_houseNumber;
diff --git a/generator/generator_tests_support/test_generator.cpp b/generator/generator_tests_support/test_generator.cpp
index 58e755249..a80470373 100644
--- a/generator/generator_tests_support/test_generator.cpp
+++ b/generator/generator_tests_support/test_generator.cpp
@@ -34,9 +34,7 @@ bool MakeFakeBordersFile(std::string const & intemediatePath, std::string const
   if (code != Platform::EError::ERR_OK && code != Platform::EError::ERR_FILE_ALREADY_EXISTS)
     return false;
 
-  std::vector<m2::PointD> points = {
-    {-180.0, -90.0}, {180.0, -90.0}, {180.0, 90.0}, {-180.0, 90.0}, {-180.0, -90.0}
-  };
+  std::vector<m2::PointD> points = {{-180.0, -90.0}, {180.0, -90.0}, {180.0, 90.0}, {-180.0, 90.0}, {-180.0, -90.0}};
   borders::DumpBorderToPolyFile(borderPath, filename, {m2::RegionD{std::move(points)}});
   return true;
 }
@@ -61,7 +59,8 @@ void TestRawGenerator::SetupTmpFolder(std::string const & tmpPath)
   CHECK(Platform::MkDirChecked(tmpPath), ());
 }
 
-void TestRawGenerator::BuildFB(std::string const & osmFilePath, std::string const & mwmName, bool makeWorld /* = false */)
+void TestRawGenerator::BuildFB(std::string const & osmFilePath, std::string const & mwmName,
+                               bool makeWorld /* = false */)
 {
   m_genInfo.m_nodeStorageType = feature::GenerateInfo::NodeStorageType::Index;
   m_genInfo.m_osmFileName = osmFilePath;
@@ -69,7 +68,7 @@ void TestRawGenerator::BuildFB(std::string const & osmFilePath, std::string cons
 
   CHECK(GenerateIntermediateData(m_genInfo), ());
 
-  //CHECK(MakeFakeBordersFile(GetTmpPath(), mwmName), ());
+  // CHECK(MakeFakeBordersFile(GetTmpPath(), mwmName), ());
 
   m_genInfo.m_tmpDir = m_genInfo.m_targetDir = GetTmpPath();
   m_genInfo.m_fileName = mwmName;
@@ -115,9 +114,7 @@ void TestRawGenerator::BuildRouting(std::string const & mwmName, std::string con
 {
   using namespace routing_builder;
   CountryParentNameGetterFn const parentGetter = [&countryName](std::string const & name)
-  {
-    return (name != countryName ? countryName : std::string());
-  };
+  { return (name != countryName ? countryName : std::string()); };
 
   std::string const filePath = GetMwmPath(mwmName);
   std::string const osmToFeatureFilename = filePath + OSM2FEATURE_FILE_EXTENSION;
@@ -159,5 +156,5 @@ bool TestRawGenerator::IsWorld(std::string const & mwmName) const
   return (mwmName == WORLD_FILE_NAME);
 }
 
-} // namespace tests_support
-} // namespace generator
+}  // namespace tests_support
+}  // namespace generator
diff --git a/generator/generator_tests_support/test_generator.hpp b/generator/generator_tests_support/test_generator.hpp
index b04d33408..54422232b 100644
--- a/generator/generator_tests_support/test_generator.hpp
+++ b/generator/generator_tests_support/test_generator.hpp
@@ -31,16 +31,15 @@ public:
 
   routing::FeatureIdToOsmId LoadFID2OsmID(std::string const & mwmName);
 
-  template <class FnT> void ForEachFB(std::string const & mwmName, FnT && fn)
+  template <class FnT>
+  void ForEachFB(std::string const & mwmName, FnT && fn)
   {
     using namespace feature;
-    ForEachFeatureRawFormat(m_genInfo.GetTmpFileName(mwmName), [&fn](FeatureBuilder const & fb, uint64_t)
-    {
-      fn(fb);
-    });
+    ForEachFeatureRawFormat(m_genInfo.GetTmpFileName(mwmName), [&fn](FeatureBuilder const & fb, uint64_t) { fn(fb); });
   }
 
-  template <class FnT> void ForEachFeature(std::string const & mwmName, FnT && fn)
+  template <class FnT>
+  void ForEachFeature(std::string const & mwmName, FnT && fn)
   {
     FrozenDataSource dataSource;
     auto const res = dataSource.RegisterMap(platform::LocalCountryFile::MakeTemporary(GetMwmPath(mwmName)));
@@ -61,5 +60,5 @@ public:
   static char const * kWikidataFilename;
 };
 
-} // namespace tests_support
-} // namespace generator
+}  // namespace tests_support
+}  // namespace generator
diff --git a/generator/generator_tests_support/test_mwm_builder.cpp b/generator/generator_tests_support/test_mwm_builder.cpp
index b6004c041..c520961ce 100644
--- a/generator/generator_tests_support/test_mwm_builder.cpp
+++ b/generator/generator_tests_support/test_mwm_builder.cpp
@@ -28,7 +28,6 @@
 
 #include "defines.hpp"
 
-
 namespace generator
 {
 namespace tests_support
@@ -57,15 +56,12 @@ bool WriteRegionDataForTests(string const & path, vector<string> const & languag
 }
 }  // namespace
 
-TestMwmBuilder::TestMwmBuilder(platform::LocalCountryFile & file, DataHeader::MapType type,
-                               uint32_t version)
+TestMwmBuilder::TestMwmBuilder(platform::LocalCountryFile & file, DataHeader::MapType type, uint32_t version)
   : m_file(file)
   , m_type(type)
-  , m_collector(
-        std::make_unique<FeaturesCollector>(m_file.GetPath(MapFileType::Map) + EXTENSION_TMP))
+  , m_collector(std::make_unique<FeaturesCollector>(m_file.GetPath(MapFileType::Map) + EXTENSION_TMP))
   , m_version(version)
-{
-}
+{}
 
 TestMwmBuilder::~TestMwmBuilder()
 {
@@ -101,9 +97,7 @@ bool TestMwmBuilder::Add(FeatureBuilder & fb)
     if (!feature::PreprocessForWorldMap(fb))
       return false;
     break;
-  case DataHeader::MapType::WorldCoasts:
-    CHECK(false, ("Coasts are not supported in test builder"));
-    break;
+  case DataHeader::MapType::WorldCoasts: CHECK(false, ("Coasts are not supported in test builder")); break;
   }
 
   auto const & isCityTownOrVillage = ftypes::IsCityTownOrVillageChecker::Instance();
@@ -127,8 +121,7 @@ bool TestMwmBuilder::Add(FeatureBuilder & fb)
   return true;
 }
 
-void TestMwmBuilder::SetPostcodesData(string const & postcodesPath,
-                                      indexer::PostcodePointsDatasetType postcodesType,
+void TestMwmBuilder::SetPostcodesData(string const & postcodesPath, indexer::PostcodePointsDatasetType postcodesType,
                                       std::shared_ptr<storage::CountryInfoGetter> const & countryInfoGetter)
 {
   m_postcodesPath = postcodesPath;
@@ -153,8 +146,7 @@ void TestMwmBuilder::Finish()
   info.m_tmpDir = m_file.GetDirectory();
   info.m_intermediateDir = m_file.GetDirectory();
   info.m_versionDate = static_cast<uint32_t>(base::YYMMDDToSecondsSinceEpoch(m_version));
-  CHECK(GenerateFinalFeatures(info, m_file.GetCountryFile().GetName(), m_type),
-        ("Can't sort features."));
+  CHECK(GenerateFinalFeatures(info, m_file.GetCountryFile().GetName(), m_type), ("Can't sort features."));
 
   CHECK(base::DeleteFileX(tmpFilePath), ());
 
@@ -165,14 +157,13 @@ void TestMwmBuilder::Finish()
 
   CHECK(indexer::BuildIndexFromDataFile(path, path), ("Can't build geometry index."));
 
-  CHECK(indexer::BuildSearchIndexFromDataFile(m_file.GetCountryName(), info,
-                                              true /* forceRebuild */, 1 /* threadsCount */),
+  CHECK(indexer::BuildSearchIndexFromDataFile(m_file.GetCountryName(), info, true /* forceRebuild */,
+                                              1 /* threadsCount */),
         ("Can't build search index."));
 
   if (!m_postcodesPath.empty() && m_postcodesCountryInfoGetter)
   {
-    CHECK(indexer::BuildPostcodePointsWithInfoGetter(m_file.GetDirectory(), m_file.GetCountryName(),
-                                                     m_postcodesType,
+    CHECK(indexer::BuildPostcodePointsWithInfoGetter(m_file.GetDirectory(), m_file.GetCountryName(), m_postcodesType,
                                                      m_postcodesPath, true /* forceRebuild */,
                                                      *m_postcodesCountryInfoGetter),
           ("Can't build postcodes section."));
@@ -186,8 +177,7 @@ void TestMwmBuilder::Finish()
     CHECK(generator::BuildCitiesIdsForTesting(path), ());
   }
 
-  CHECK(indexer::BuildCentersTableFromDataFile(path, true /* forceRebuild */),
-        ("Can't build centers table."));
+  CHECK(indexer::BuildCentersTableFromDataFile(path, true /* forceRebuild */), ("Can't build centers table."));
 
   CHECK(search::SearchRankTableBuilder::CreateIfNotExists(path), ());
 
diff --git a/generator/generator_tests_support/test_mwm_builder.hpp b/generator/generator_tests_support/test_mwm_builder.hpp
index 7b5295006..f7a97d860 100644
--- a/generator/generator_tests_support/test_mwm_builder.hpp
+++ b/generator/generator_tests_support/test_mwm_builder.hpp
@@ -15,7 +15,7 @@ namespace feature
 {
 class FeaturesCollector;
 class FeatureBuilder;
-}
+}  // namespace feature
 namespace platform
 {
 class LocalCountryFile;
@@ -42,8 +42,7 @@ public:
   void AddSafe(TestFeature const & feature);
   bool Add(feature::FeatureBuilder & fb);
 
-  void SetPostcodesData(std::string const & postcodesPath,
-                        indexer::PostcodePointsDatasetType postcodesType,
+  void SetPostcodesData(std::string const & postcodesPath, indexer::PostcodePointsDatasetType postcodesType,
                         std::shared_ptr<storage::CountryInfoGetter> const & countryInfoGetter);
 
   void SetMwmLanguages(std::vector<std::string> const & languages);
diff --git a/generator/generator_tests_support/test_with_custom_mwms.cpp b/generator/generator_tests_support/test_with_custom_mwms.cpp
index 3776676a0..efca588d8 100644
--- a/generator/generator_tests_support/test_with_custom_mwms.cpp
+++ b/generator/generator_tests_support/test_with_custom_mwms.cpp
@@ -35,10 +35,7 @@ void TestWithCustomMwms::Cleanup(LocalCountryFile const & file)
 void TestWithCustomMwms::DeregisterMap(std::string const & name)
 {
   auto const file = CountryFile(name);
-  auto it = base::FindIf(m_files, [&file](LocalCountryFile const & f)
-  {
-    return f.GetCountryFile() == file;
-  });
+  auto it = base::FindIf(m_files, [&file](LocalCountryFile const & f) { return f.GetCountryFile() == file; });
 
   if (it == m_files.end())
     return;
@@ -77,17 +74,12 @@ void TestWithCustomMwms::RegisterLocalMapsInViewport(m2::RectD const & viewport)
   auto const countriesInfo = storage::CountryInfoReader::CreateCountryInfoGetter(GetPlatform());
 
   RegisterLocalMapsImpl([&](std::string const & name)
-  {
-    return countriesInfo->GetLimitRectForLeaf(name).IsIntersect(viewport);
-  });
+  { return countriesInfo->GetLimitRectForLeaf(name).IsIntersect(viewport); });
 }
 
 void TestWithCustomMwms::RegisterLocalMapsByPrefix(std::string const & prefix)
 {
-  RegisterLocalMapsImpl([&](std::string const & name)
-  {
-    return name.starts_with(prefix);
-  });
+  RegisterLocalMapsImpl([&](std::string const & name) { return name.starts_with(prefix); });
 }
 
 }  // namespace tests_support
diff --git a/generator/generator_tests_support/test_with_custom_mwms.hpp b/generator/generator_tests_support/test_with_custom_mwms.hpp
index 869d975b0..e2731c6aa 100644
--- a/generator/generator_tests_support/test_with_custom_mwms.hpp
+++ b/generator/generator_tests_support/test_with_custom_mwms.hpp
@@ -75,7 +75,8 @@ public:
   void RegisterLocalMapsByPrefix(std::string const & prefix);
 
 protected:
-  template <class FnT> void RegisterLocalMapsImpl(FnT && check);
+  template <class FnT>
+  void RegisterLocalMapsImpl(FnT && check);
 
   static void Cleanup(platform::LocalCountryFile const & file);
 
diff --git a/generator/generator_tool/generator_tool.cpp b/generator/generator_tool/generator_tool.cpp
index d292aaa40..2853d8158 100644
--- a/generator/generator_tool/generator_tool.cpp
+++ b/generator/generator_tool/generator_tool.cpp
@@ -67,10 +67,8 @@ char const * GetDataPathHelp()
 
 // Coastlines.
 DEFINE_bool(make_coasts, false, "Create intermediate file with coasts data.");
-DEFINE_bool(fail_on_coasts, false,
-            "Stop and exit with '255' code if some coastlines are not merged.");
-DEFINE_bool(emit_coasts, false,
-            "Push coasts features from intermediate file to out files/countries.");
+DEFINE_bool(fail_on_coasts, false, "Stop and exit with '255' code if some coastlines are not merged.");
+DEFINE_bool(emit_coasts, false, "Push coasts features from intermediate file to out files/countries.");
 
 // Generator settings and paths.
 DEFINE_string(osm_file_name, "", "Input osm area file.");
@@ -83,16 +81,13 @@ DEFINE_string(cache_path, "",
               "If 'cache_path' is empty, caches are stored to 'intermediate_data_path'.");
 DEFINE_string(output, "", "File name for process (without 'mwm' ext).");
 DEFINE_bool(preload_cache, false, "Preload all ways and relations cache.");
-DEFINE_string(node_storage, "map",
-              "Type of storage for intermediate points representation. Available: raw, map, mem.");
-DEFINE_uint64(planet_version, base::SecondsSinceEpoch(),
-              "Version as seconds since epoch, by default - now.");
+DEFINE_string(node_storage, "map", "Type of storage for intermediate points representation. Available: raw, map, mem.");
+DEFINE_uint64(planet_version, base::SecondsSinceEpoch(), "Version as seconds since epoch, by default - now.");
 
 // Preprocessing and feature generator.
 DEFINE_bool(preprocess, false, "1st pass - create nodes/ways/relations data.");
 DEFINE_bool(generate_features, false, "2nd pass - generate intermediate features.");
-DEFINE_bool(generate_geometry, false,
-            "3rd pass - split and simplify geometry and triangles for features.");
+DEFINE_bool(generate_geometry, false, "3rd pass - split and simplify geometry and triangles for features.");
 DEFINE_bool(generate_index, false, "4rd pass - generate index.");
 DEFINE_bool(generate_search_index, false, "5th pass - generate search index.");
 DEFINE_bool(generate_cities_boundaries, false, "Generate the cities boundaries section");
@@ -105,9 +100,8 @@ DEFINE_bool(have_borders_for_whole_world, false,
             "If it is set to true, the optimization of checking that the "
             "fb belongs to the country border will be applied.");
 
-DEFINE_string(
-    nodes_list_path, "",
-    "Path to file containing list of node ids we need to add to locality index. May be empty.");
+DEFINE_string(nodes_list_path, "",
+              "Path to file containing list of node ids we need to add to locality index. May be empty.");
 
 DEFINE_bool(generate_isolines_info, false, "Generate the isolines info section");
 DEFINE_string(isolines_path, "", "Path to isolines directory. If set, adds isolines linear features.");
@@ -115,8 +109,7 @@ DEFINE_string(addresses_path, "", "Path to addresses directory. If set, adds add
 
 // Routing.
 DEFINE_bool(make_routing_index, false, "Make sections with the routing information.");
-DEFINE_bool(make_cross_mwm, false,
-            "Make section for cross mwm routing (for dynamic indexed routing).");
+DEFINE_bool(make_cross_mwm, false, "Make section for cross mwm routing (for dynamic indexed routing).");
 DEFINE_bool(make_transit_cross_mwm, false, "Make section for cross mwm transit routing.");
 DEFINE_bool(make_transit_cross_mwm_experimental, false,
             "Experimental parameter. If set the new version of transit cross-mwm section will be "
@@ -133,9 +126,8 @@ DEFINE_string(transit_path_experimental, "",
               "Experimental parameter. If set the new version of transit section will be "
               "generated. Path to directory with json generated from GTFS.");
 DEFINE_bool(generate_cameras, false, "Generate section with speed cameras info.");
-DEFINE_bool(
-    make_city_roads, false,
-    "Calculates which roads lie inside cities and makes a section with ids of these roads.");
+DEFINE_bool(make_city_roads, false,
+            "Calculates which roads lie inside cities and makes a section with ids of these roads.");
 DEFINE_bool(generate_maxspeed, false, "Generate section with maxspeed of road features.");
 
 // Sponsored-related.
@@ -159,9 +151,11 @@ DEFINE_string(us_postcodes_dataset, "", "Path to dataset with US postcodes.");
 // Printing stuff.
 DEFINE_bool(stats_general, false, "Print file and feature stats.");
 DEFINE_bool(stats_geometry, false, "Print outer geometry stats.");
-DEFINE_uint64(stats_geom_min_diff, 5, "Consider feature's geometry scale "
+DEFINE_uint64(stats_geom_min_diff, 5,
+              "Consider feature's geometry scale "
               "similar to a more detailed one if it has <min_diff less elements.");
-DEFINE_double(stats_geom_min_factor, 2.0f, "Consider feature's geometry scale "
+DEFINE_double(stats_geom_min_factor, 2.0f,
+              "Consider feature's geometry scale "
               "similar to a more detailed one if it has <min_factor times less elements.");
 DEFINE_bool(stats_types, false, "Print feature stats by type.");
 DEFINE_bool(dump_types, false, "Prints all types combinations and their total count.");
@@ -172,20 +166,18 @@ DEFINE_string(dump_feature_names, "", "Print all feature names by 2-letter local
 // Service functions.
 DEFINE_bool(generate_classif, false, "Generate classificator.");
 DEFINE_bool(generate_packed_borders, false, "Generate packed file with country polygons.");
-DEFINE_string(unpack_borders, "",
-              "Convert packed_polygons to a directory of polygon files (specify folder).");
-DEFINE_bool(unpack_mwm, false,
-            "Unpack each section of mwm into a separate file with name filePath.sectionName.");
+DEFINE_string(unpack_borders, "", "Convert packed_polygons to a directory of polygon files (specify folder).");
+DEFINE_bool(unpack_mwm, false, "Unpack each section of mwm into a separate file with name filePath.sectionName.");
 DEFINE_bool(check_mwm, false, "Check map file to be correct.");
 DEFINE_string(delete_section, "", "Delete specified section (defines.hpp) from container.");
-DEFINE_bool(generate_traffic_keys, false,
-            "Generate keys for the traffic map (road segment -> speed group).");
+DEFINE_bool(generate_traffic_keys, false, "Generate keys for the traffic map (road segment -> speed group).");
 
 DEFINE_bool(dump_mwm_tmp, false, "Prints feature builder objects from .mwm.tmp");
 
 // Common.
-DEFINE_uint64(threads_count, 0, "Desired count of threads. If count equals zero, count of "
-                                "threads is set automatically.");
+DEFINE_uint64(threads_count, 0,
+              "Desired count of threads. If count equals zero, count of "
+              "threads is set automatically.");
 DEFINE_bool(verbose, false, "Provide more detailed output.");
 
 MAIN_WITH_ERROR_HANDLING([](int argc, char ** argv)
@@ -197,13 +189,11 @@ MAIN_WITH_ERROR_HANDLING([](int argc, char ** argv)
 
   Platform & pl = GetPlatform();
 
-  gflags::SetUsageMessage(
-      "Takes OSM XML data from stdin and creates data and index files in several passes.");
+  gflags::SetUsageMessage("Takes OSM XML data from stdin and creates data and index files in several passes.");
   gflags::SetVersionString(pl.Version());
   gflags::ParseCommandLineFlags(&argc, &argv, true);
 
-  unsigned threadsCount = FLAGS_threads_count != 0 ? static_cast<unsigned>(FLAGS_threads_count)
-                                                   : pl.CpuCores();
+  unsigned threadsCount = FLAGS_threads_count != 0 ? static_cast<unsigned>(FLAGS_threads_count) : pl.CpuCores();
 
   if (!FLAGS_user_resource_path.empty())
   {
@@ -218,11 +208,9 @@ MAIN_WITH_ERROR_HANDLING([](int argc, char ** argv)
 
   feature::GenerateInfo genInfo;
   genInfo.m_verbose = FLAGS_verbose;
-  genInfo.m_intermediateDir = FLAGS_intermediate_data_path.empty()
-                                  ? path
-                                  : base::AddSlashIfNeeded(FLAGS_intermediate_data_path);
-  genInfo.m_cacheDir = FLAGS_cache_path.empty() ? genInfo.m_intermediateDir
-                                                : base::AddSlashIfNeeded(FLAGS_cache_path);
+  genInfo.m_intermediateDir =
+      FLAGS_intermediate_data_path.empty() ? path : base::AddSlashIfNeeded(FLAGS_intermediate_data_path);
+  genInfo.m_cacheDir = FLAGS_cache_path.empty() ? genInfo.m_intermediateDir : base::AddSlashIfNeeded(FLAGS_cache_path);
   genInfo.m_targetDir = genInfo.m_tmpDir = path;
 
   /// @todo Probably, it's better to add separate option for .mwm.tmp files.
@@ -289,10 +277,8 @@ MAIN_WITH_ERROR_HANDLING([](int argc, char ** argv)
     genInfo.m_bucketNames.push_back(FLAGS_output);
 
   if (FLAGS_dump_mwm_tmp)
-  {
     for (auto const & fb : feature::ReadAllDatRawFormat(genInfo.GetTmpFileName(FLAGS_output)))
       std::cout << DebugPrint(fb) << std::endl;
-  }
 
   // Load mwm tree only if we need it
   std::unique_ptr<storage::CountryParentGetter> countryParentGetter;
@@ -369,11 +355,8 @@ MAIN_WITH_ERROR_HANDLING([](int argc, char ** argv)
       LOG(LINFO, ("Generating search index for", dataFile));
 
       /// @todo Make threads count according to environment (single mwm build or planet build).
-      if (!indexer::BuildSearchIndexFromDataFile(country, genInfo, true /* forceRebuild */,
-                                                 threadsCount))
-      {
+      if (!indexer::BuildSearchIndexFromDataFile(country, genInfo, true /* forceRebuild */, threadsCount))
         LOG(LCRITICAL, ("Error generating search index."));
-      }
 
       if (!FLAGS_uk_postcodes_dataset.empty() || !FLAGS_us_postcodes_dataset.empty())
       {
@@ -427,8 +410,8 @@ MAIN_WITH_ERROR_HANDLING([](int argc, char ** argv)
 
     if (!FLAGS_transit_path_experimental.empty())
     {
-      transitEdgeFeatureIds = transit::experimental::BuildTransit(
-          path, country, osmToFeatureFilename, FLAGS_transit_path_experimental);
+      transitEdgeFeatureIds =
+          transit::experimental::BuildTransit(path, country, osmToFeatureFilename, FLAGS_transit_path_experimental);
     }
     else if (!FLAGS_transit_path.empty())
     {
@@ -437,17 +420,17 @@ MAIN_WITH_ERROR_HANDLING([](int argc, char ** argv)
 
     if (FLAGS_generate_cameras)
     {
-//      if (routing::AreSpeedCamerasProhibited(platform::CountryFile(country)))
-//      {
-//        LOG(LINFO,
-//            ("Cameras info is prohibited for", country, "and speedcams section is not generated."));
-//      }
-//      else
-//      {
-        string const camerasFilename = genInfo.GetIntermediateFileName(CAMERAS_TO_WAYS_FILENAME);
+      //      if (routing::AreSpeedCamerasProhibited(platform::CountryFile(country)))
+      //      {
+      //        LOG(LINFO,
+      //            ("Cameras info is prohibited for", country, "and speedcams section is not generated."));
+      //      }
+      //      else
+      //      {
+      string const camerasFilename = genInfo.GetIntermediateFileName(CAMERAS_TO_WAYS_FILENAME);
 
-        BuildCamerasInfo(dataFile, camerasFilename, osmToFeatureFilename);
-//      }
+      BuildCamerasInfo(dataFile, camerasFilename, osmToFeatureFilename);
+      //      }
     }
 
     if (country == WORLD_FILE_NAME && !FLAGS_world_roads_path.empty())
@@ -467,9 +450,8 @@ MAIN_WITH_ERROR_HANDLING([](int argc, char ** argv)
       if (!countryParentGetter)
       {
         // All the mwms should use proper VehicleModels.
-        LOG(LCRITICAL,
-            ("Countries file is needed. Please set countries file name (countries.txt). "
-             "File must be located in data directory."));
+        LOG(LCRITICAL, ("Countries file is needed. Please set countries file name (countries.txt). "
+                        "File must be located in data directory."));
         return EXIT_FAILURE;
       }
 
@@ -511,31 +493,28 @@ MAIN_WITH_ERROR_HANDLING([](int argc, char ** argv)
       if (!countryParentGetter)
       {
         // All the mwms should use proper VehicleModels.
-        LOG(LCRITICAL,
-            ("Countries file is needed. Please set countries file name (countries.txt). "
-             "File must be located in data directory."));
+        LOG(LCRITICAL, ("Countries file is needed. Please set countries file name (countries.txt). "
+                        "File must be located in data directory."));
         return EXIT_FAILURE;
       }
 
       if (FLAGS_make_cross_mwm)
       {
-        BuildRoutingCrossMwmSection(path, dataFile, country, genInfo.m_intermediateDir,
-                                    *countryParentGetter, osmToFeatureFilename);
+        BuildRoutingCrossMwmSection(path, dataFile, country, genInfo.m_intermediateDir, *countryParentGetter,
+                                    osmToFeatureFilename);
       }
 
       if (FLAGS_make_transit_cross_mwm_experimental)
       {
         if (!transitEdgeFeatureIds.empty())
         {
-          BuildTransitCrossMwmSection(path, dataFile, country, *countryParentGetter,
-                                      transitEdgeFeatureIds,
+          BuildTransitCrossMwmSection(path, dataFile, country, *countryParentGetter, transitEdgeFeatureIds,
                                       true /* experimentalTransit */);
         }
       }
       else if (FLAGS_make_transit_cross_mwm)
       {
-        BuildTransitCrossMwmSection(path, dataFile, country, *countryParentGetter,
-                                    transitEdgeFeatureIds,
+        BuildTransitCrossMwmSection(path, dataFile, country, *countryParentGetter, transitEdgeFeatureIds,
                                     false /* experimentalTransit */);
       }
     }
diff --git a/generator/geometry_holder.hpp b/generator/geometry_holder.hpp
index 2f51d6a4d..c409f1af1 100644
--- a/generator/geometry_holder.hpp
+++ b/generator/geometry_holder.hpp
@@ -37,24 +37,21 @@ public:
   using Points = std::vector<m2::PointD>;
   using Polygons = std::list<Points>;
 
-  GeometryHolder(FileGetter geoFileGetter, FileGetter trgFileGetter, FeatureBuilder & fb,
-                 DataHeader const & header)
+  GeometryHolder(FileGetter geoFileGetter, FileGetter trgFileGetter, FeatureBuilder & fb, DataHeader const & header)
     : m_geoFileGetter(geoFileGetter)
     , m_trgFileGetter(trgFileGetter)
     , m_fb(fb)
     , m_ptsInner(true)
     , m_trgInner(true)
     , m_header(header)
-  {
-  }
+  {}
 
   GeometryHolder(FeatureBuilder & fb, DataHeader const & header)
     : m_fb(fb)
     , m_ptsInner(true)
     , m_trgInner(true)
     , m_header(header)
-  {
-  }
+  {}
 
   FeatureBuilder::SupportingData & GetBuffer() { return m_buffer; }
 
@@ -173,10 +170,7 @@ private:
   class StripEmitter
   {
   public:
-    StripEmitter(Points const & src, Points & dest) : m_src(src), m_dest(dest)
-    {
-      m_dest.reserve(m_src.size());
-    }
+    StripEmitter(Points const & src, Points & dest) : m_src(src), m_dest(dest) { m_dest.reserve(m_src.size()); }
     void operator()(size_t i) { m_dest.push_back(m_src[i]); }
 
   private:
diff --git a/generator/hierarchy.cpp b/generator/hierarchy.cpp
index f7068c1ef..30e58acf0 100644
--- a/generator/hierarchy.cpp
+++ b/generator/hierarchy.cpp
@@ -17,9 +17,9 @@
 #include <limits>
 #include <numeric>
 
-#include "std/boost_geometry.hpp"
 #include <boost/geometry/geometries/register/point.hpp>
 #include <boost/geometry/geometries/register/ring.hpp>
+#include "std/boost_geometry.hpp"
 
 BOOST_GEOMETRY_REGISTER_POINT_2D(m2::PointD, double, boost::geometry::cs::cartesian, x, y)
 BOOST_GEOMETRY_REGISTER_RING(std::vector<m2::PointD>)
@@ -32,8 +32,7 @@ using namespace feature;
 
 namespace
 {
-double CalculateOverlapPercentage(std::vector<m2::PointD> const & lhs,
-                                  std::vector<m2::PointD> const & rhs)
+double CalculateOverlapPercentage(std::vector<m2::PointD> const & lhs, std::vector<m2::PointD> const & rhs)
 {
   if (!boost::geometry::intersects(lhs, rhs))
     return 0.0;
@@ -49,7 +48,10 @@ double CalculateOverlapPercentage(std::vector<m2::PointD> const & lhs,
 }
 }  // namespace
 
-bool FilterFeatureDefault(feature::FeatureBuilder const &) { return true; }
+bool FilterFeatureDefault(feature::FeatureBuilder const &)
+{
+  return true;
+}
 
 HierarchyPlace::HierarchyPlace(FeatureBuilder const & fb)
   : m_id(MakeCompositeId(fb))
@@ -78,8 +80,7 @@ bool HierarchyPlace::Contains(HierarchyPlace const & smaller) const
   if (smaller.IsPoint())
     return Contains(smaller.GetCenter());
 
-  return smaller.GetArea() <= GetArea() &&
-         CalculateOverlapPercentage(m_polygon, smaller.m_polygon) > 80.0;
+  return smaller.GetArea() <= GetArea() && CalculateOverlapPercentage(m_polygon, smaller.m_polygon) > 80.0;
 }
 
 bool HierarchyPlace::Contains(m2::PointD const & point) const
@@ -87,10 +88,7 @@ bool HierarchyPlace::Contains(m2::PointD const & point) const
   return boost::geometry::covered_by(point, m_polygon);
 }
 
-HierarchyLinker::HierarchyLinker(Node::Ptrs && nodes)
-  : m_nodes(std::move(nodes)), m_tree(MakeTree4d(m_nodes))
-{
-}
+HierarchyLinker::HierarchyLinker(Node::Ptrs && nodes) : m_nodes(std::move(nodes)), m_tree(MakeTree4d(m_nodes)) {}
 
 // static
 HierarchyLinker::Tree4d HierarchyLinker::MakeTree4d(Node::Ptrs const & nodes)
@@ -106,7 +104,8 @@ HierarchyLinker::Node::Ptr HierarchyLinker::FindPlaceParent(HierarchyPlace const
   Node::Ptr parent = nullptr;
   auto minArea = std::numeric_limits<double>::max();
   auto const point = place.GetCenter();
-  m_tree.ForEachInRect({point, point}, [&](auto const & candidateNode) {
+  m_tree.ForEachInRect({point, point}, [&](auto const & candidateNode)
+  {
     // https://wiki.openstreetmap.org/wiki/Simple_3D_buildings
     // An object with tag 'building:part' is a part of a relation with outline 'building' or
     // is contained in a object with tag 'building'. This case is second. We suppose a building part is
@@ -160,8 +159,7 @@ HierarchyLinker::Node::Ptrs HierarchyLinker::Link()
   return m_nodes;
 }
 
-HierarchyEntryEnricher::HierarchyEntryEnricher(std::string const & osm2FtIdsPath,
-                                             std::string const & countryFullPath)
+HierarchyEntryEnricher::HierarchyEntryEnricher(std::string const & osm2FtIdsPath, std::string const & countryFullPath)
   : m_featureGetter(countryFullPath)
 {
   CHECK(m_osm2FtIds.ReadFromFile(osm2FtIdsPath), (osm2FtIdsPath));
@@ -185,14 +183,11 @@ std::optional<m2::PointD> HierarchyEntryEnricher::GetFeatureCenter(CompositeId c
     if (!ftPtr)
       continue;
 
-    CHECK(m.emplace(base::Underlying(ftPtr->GetGeomType()), feature::GetCenter(*ftPtr)).second,
-          (id, optIds));
+    CHECK(m.emplace(base::Underlying(ftPtr->GetGeomType()), feature::GetCenter(*ftPtr)).second, (id, optIds));
   }
 
-  for (auto type : {
-       base::Underlying(feature::GeomType::Point),
-       base::Underlying(feature::GeomType::Area),
-       base::Underlying(feature::GeomType::Line)})
+  for (auto type : {base::Underlying(feature::GeomType::Point), base::Underlying(feature::GeomType::Area),
+                    base::Underlying(feature::GeomType::Line)})
   {
     if (m.count(type) != 0)
       return m[type];
@@ -201,25 +196,24 @@ std::optional<m2::PointD> HierarchyEntryEnricher::GetFeatureCenter(CompositeId c
   return {};
 }
 
-HierarchyLinesBuilder::HierarchyLinesBuilder(HierarchyLinker::Node::Ptrs && trees)
-  : m_trees(std::move(trees))
-{
-}
+HierarchyLinesBuilder::HierarchyLinesBuilder(HierarchyLinker::Node::Ptrs && trees) : m_trees(std::move(trees)) {}
 
 void HierarchyLinesBuilder::SetGetMainTypeFunction(GetMainTypeFn const & getMainType)
 {
   m_getMainType = getMainType;
 }
 
-void HierarchyLinesBuilder::SetGetNameFunction(GetNameFn const & getName) { m_getName = getName; }
+void HierarchyLinesBuilder::SetGetNameFunction(GetNameFn const & getName)
+{
+  m_getName = getName;
+}
 
 void HierarchyLinesBuilder::SetCountry(storage::CountryId const & country)
 {
   m_countryName = country;
 }
 
-void HierarchyLinesBuilder::SetHierarchyEntryEnricher(
-    std::unique_ptr<HierarchyEntryEnricher> && enricher)
+void HierarchyLinesBuilder::SetHierarchyEntryEnricher(std::unique_ptr<HierarchyEntryEnricher> && enricher)
 {
   m_enricher = std::move(enricher);
 }
@@ -231,11 +225,7 @@ std::vector<HierarchyEntry> HierarchyLinesBuilder::GetHierarchyLines()
 
   std::vector<HierarchyEntry> lines;
   for (auto const & tree : m_trees)
-  {
-    tree_node::PreOrderVisit(tree, [&](auto const & node) {
-      lines.emplace_back(Transform(node));
-    });
-  }
+    tree_node::PreOrderVisit(tree, [&](auto const & node) { lines.emplace_back(Transform(node)); });
 
   return lines;
 }
@@ -274,18 +264,14 @@ HierarchyLinker::Node::Ptrs BuildHierarchy(std::vector<feature::FeatureBuilder>
   base::EraseIf(fbs, [&](auto const & fb) { return !filter->IsAccepted(fb); });
   HierarchyLinker::Node::Ptrs places;
   places.reserve(fbs.size());
-  base::Transform(fbs, std::back_inserter(places), [](auto const & fb) {
-    return tree_node::MakeTreeNode(HierarchyPlace(fb));
-  });
+  base::Transform(fbs, std::back_inserter(places),
+                  [](auto const & fb) { return tree_node::MakeTreeNode(HierarchyPlace(fb)); });
   auto nodes = HierarchyLinker(std::move(places)).Link();
   // We leave only the trees.
-  base::EraseIf(nodes, [](auto const & node) {
-    return node->HasParent();
-  });
+  base::EraseIf(nodes, [](auto const & node) { return node->HasParent(); });
   return nodes;
 }
 
-
 void AddChildrenTo(HierarchyLinker::Node::Ptrs & trees,
                    std::function<std::vector<HierarchyPlace>(CompositeId const &)> const & fn)
 {
@@ -293,7 +279,8 @@ void AddChildrenTo(HierarchyLinker::Node::Ptrs & trees,
   {
     CHECK(!tree->HasParent(), ());
 
-    tree_node::PostOrderVisit(tree, [&](auto const & n) {
+    tree_node::PostOrderVisit(tree, [&](auto const & n)
+    {
       auto const id = n->GetData().GetCompositeId();
       auto const & places = fn(id);
       for (auto place : places)
@@ -309,16 +296,15 @@ void FlattenBuildingParts(HierarchyLinker::Node::Ptrs & trees)
 {
   for (auto & tree : trees)
   {
-
     CHECK(!tree->HasParent(), ());
 
-    std::vector<
-        std::pair<hierarchy::HierarchyLinker::Node::Ptr, hierarchy::HierarchyLinker::Node::Ptr>>
+    std::vector<std::pair<hierarchy::HierarchyLinker::Node::Ptr, hierarchy::HierarchyLinker::Node::Ptr>>
         buildingPartsTrees;
 
     static auto const & buildingPartChecker = ftypes::IsBuildingPartChecker::Instance();
     std::function<void(hierarchy::HierarchyLinker::Node::Ptr const &)> visit;
-    visit = [&](auto const & n) {
+    visit = [&](auto const & n)
+    {
       if (buildingPartChecker(n->GetData().GetTypes()))
       {
         CHECK(n->HasParent(), ());
@@ -337,7 +323,8 @@ void FlattenBuildingParts(HierarchyLinker::Node::Ptrs & trees)
     for (auto const & buildingAndParts : buildingPartsTrees)
     {
       Unlink(buildingAndParts.second, buildingAndParts.first);
-      tree_node::PostOrderVisit(buildingAndParts.second, [&](auto const & buildingPartNode) {
+      tree_node::PostOrderVisit(buildingAndParts.second, [&](auto const & buildingPartNode)
+      {
         CHECK(buildingPartChecker(buildingPartNode->GetData().GetTypes()), ());
         buildingPartNode->RemoveChildren();
         tree_node::Link(buildingPartNode, buildingAndParts.first);
diff --git a/generator/hierarchy_entry.cpp b/generator/hierarchy_entry.cpp
index 42c243d6d..bdf9549a0 100644
--- a/generator/hierarchy_entry.cpp
+++ b/generator/hierarchy_entry.cpp
@@ -6,8 +6,8 @@
 #include "coding/string_utf8_multilang.hpp"
 
 #include "base/assert.hpp"
-#include "base/string_utils.hpp"
 #include "base/stl_helpers.hpp"
+#include "base/string_utils.hpp"
 
 #include <algorithm>
 #include <sstream>
@@ -23,7 +23,7 @@ namespace
 std::string GetRussianName(StringUtf8Multilang const & str)
 {
   feature::NameParamsOut out;
-  feature::GetReadableName({ str, {} /* regionData */, "ru", false /* allowTranslit */ }, out);
+  feature::GetReadableName({str, {} /* regionData */, "ru", false /* allowTranslit */}, out);
   std::string result(out.primary);
 
   for (auto const & ch : {';', '\n', '\t'})
@@ -37,8 +37,8 @@ namespace generator
 bool operator==(HierarchyEntry const & lhs, HierarchyEntry const & rhs)
 {
   return AlmostEqualAbs(lhs.m_center, rhs.m_center, 1e-7) &&
-      (std::tie(lhs.m_id, lhs.m_parentId, lhs.m_depth, lhs.m_name, lhs.m_country, lhs.m_type) ==
-       std::tie(rhs.m_id, rhs.m_parentId, rhs.m_depth, rhs.m_name, rhs.m_country, rhs.m_type));
+         (std::tie(lhs.m_id, lhs.m_parentId, lhs.m_depth, lhs.m_name, lhs.m_country, lhs.m_type) ==
+          std::tie(rhs.m_id, rhs.m_parentId, rhs.m_depth, rhs.m_name, rhs.m_country, rhs.m_type));
 }
 
 std::string DebugPrint(HierarchyEntry const & entry)
@@ -83,7 +83,10 @@ uint32_t GetMainType(FeatureParams::Types const & types)
   return it != std::cend(types) ? *it : ftype::GetEmptyValue();
 }
 
-std::string GetName(StringUtf8Multilang const & str) { return GetRussianName(str); }
+std::string GetName(StringUtf8Multilang const & str)
+{
+  return GetRussianName(str);
+}
 
 std::string HierarchyEntryToCsvString(HierarchyEntry const & entry, char delim)
 {
@@ -138,8 +141,7 @@ HierarchyEntry HierarchyEntryFromCsvRow(coding::CSVReader::Row const & row)
 tree_node::types::Ptrs<HierarchyEntry> LoadHierachy(std::string const & filename)
 {
   std::unordered_map<CompositeId, tree_node::types::Ptr<HierarchyEntry>> nodes;
-  for (auto const & row : coding::CSVRunner(
-         coding::CSVReader(filename, false /* hasHeader */, kCsvDelimiter)))
+  for (auto const & row : coding::CSVRunner(coding::CSVReader(filename, false /* hasHeader */, kCsvDelimiter)))
   {
     auto entry = HierarchyEntryFromCsvRow(row);
     auto const id = entry.m_id;
diff --git a/generator/holes.cpp b/generator/holes.cpp
index 07e378bbd..8fa602e41 100644
--- a/generator/holes.cpp
+++ b/generator/holes.cpp
@@ -9,30 +9,25 @@ using namespace feature;
 
 namespace generator
 {
-HolesAccumulator::HolesAccumulator(
-    std::shared_ptr<cache::IntermediateDataReaderInterface> const & cache)
+HolesAccumulator::HolesAccumulator(std::shared_ptr<cache::IntermediateDataReaderInterface> const & cache)
   : m_merger(cache)
-{
-}
+{}
 
 FeatureBuilder::Geometry & HolesAccumulator::GetHoles()
 {
   ASSERT(m_holes.empty(), ("It is allowed to call only once."));
-  m_merger.ForEachArea(false, [this](FeatureBuilder::PointSeq const & v,
-                       std::vector<uint64_t> const & /* way osm ids */)
-  {
-    m_holes.push_back(std::move(v));
-  });
+  m_merger.ForEachArea(false,
+                       [this](FeatureBuilder::PointSeq const & v, std::vector<uint64_t> const & /* way osm ids */)
+  { m_holes.push_back(std::move(v)); });
   return m_holes;
 }
 
-HolesProcessor::HolesProcessor(
-    uint64_t id, std::shared_ptr<cache::IntermediateDataReaderInterface> const & cache)
-  : m_id(id), m_holes(cache)
-{
-}
+HolesProcessor::HolesProcessor(uint64_t id, std::shared_ptr<cache::IntermediateDataReaderInterface> const & cache)
+  : m_id(id)
+  , m_holes(cache)
+{}
 
-base::ControlFlow HolesProcessor::operator() (uint64_t /* id */, RelationElement const & e)
+base::ControlFlow HolesProcessor::operator()(uint64_t /* id */, RelationElement const & e)
 {
   auto const type = e.GetType();
   if (!(type == "multipolygon" || type == "boundary"))
@@ -47,16 +42,16 @@ base::ControlFlow HolesProcessor::operator() (uint64_t /* id */, RelationElement
   return base::ControlFlow::Continue;
 }
 
-void HolesProcessor::operator() (uint64_t id, std::string const & role)
+void HolesProcessor::operator()(uint64_t id, std::string const & role)
 {
   if (id != m_id && role == "inner")
     m_holes(id);
 }
 
 HolesRelation::HolesRelation(std::shared_ptr<cache::IntermediateDataReaderInterface> const & cache)
-  : m_holes(cache), m_outer(cache)
-{
-}
+  : m_holes(cache)
+  , m_outer(cache)
+{}
 
 void HolesRelation::Build(OsmElement const * p)
 {
diff --git a/generator/holes.hpp b/generator/holes.hpp
index ade4fef06..686efc22a 100644
--- a/generator/holes.hpp
+++ b/generator/holes.hpp
@@ -21,7 +21,7 @@ class HolesAccumulator
 public:
   explicit HolesAccumulator(std::shared_ptr<cache::IntermediateDataReaderInterface> const & cache);
 
-  void operator() (uint64_t id) { m_merger.AddWay(id); }
+  void operator()(uint64_t id) { m_merger.AddWay(id); }
   feature::FeatureBuilder::Geometry & GetHoles();
 
 private:
@@ -33,17 +33,16 @@ private:
 class HolesProcessor
 {
 public:
-  explicit HolesProcessor(uint64_t id,
-                          std::shared_ptr<cache::IntermediateDataReaderInterface> const & cache);
+  explicit HolesProcessor(uint64_t id, std::shared_ptr<cache::IntermediateDataReaderInterface> const & cache);
 
   /// 1. relations process function
-  base::ControlFlow operator() (uint64_t /* id */, RelationElement const & e);
+  base::ControlFlow operator()(uint64_t /* id */, RelationElement const & e);
   /// 2. "ways in relation" process function
-  void operator() (uint64_t id, std::string const & role);
+  void operator()(uint64_t id, std::string const & role);
   feature::FeatureBuilder::Geometry & GetHoles() { return m_holes.GetHoles(); }
 
 private:
-  uint64_t m_id;      ///< id of way to find it's holes
+  uint64_t m_id;  ///< id of way to find it's holes
   HolesAccumulator m_holes;
 };
 
diff --git a/generator/intermediate_data.cpp b/generator/intermediate_data.cpp
index 8e3032117..5957270f8 100644
--- a/generator/intermediate_data.cpp
+++ b/generator/intermediate_data.cpp
@@ -2,8 +2,8 @@
 
 #include "base/checked_cast.hpp"
 
-#include <future>
 #include <execution>
+#include <future>
 
 namespace generator::cache
 {
@@ -62,9 +62,7 @@ protected:
 class RawFilePointStorageMmapReader : public PointStorageReaderInterface
 {
 public:
-  explicit RawFilePointStorageMmapReader(string const & name)
-    : m_mmapReader(name, MmapReader::Advice::Random)
-  {}
+  explicit RawFilePointStorageMmapReader(string const & name) : m_mmapReader(name, MmapReader::Advice::Random) {}
 
   // PointStorageReaderInterface overrides:
   bool GetPoint(uint64_t id, double & lat, double & lon) const override
@@ -85,9 +83,7 @@ private:
 class RawFilePointStorageWriter : public PointStorageWriterBase
 {
 public:
-  explicit RawFilePointStorageWriter(string const & name)
-    : m_fileWriter(name)
-  {}
+  explicit RawFilePointStorageWriter(string const & name) : m_fileWriter(name) {}
 
   // PointStorageWriterInterface overrides:
   void AddPoint(uint64_t id, double lat, double lon) override
@@ -108,8 +104,7 @@ private:
 class RawMemPointStorageReader : public PointStorageReaderInterface
 {
 public:
-  explicit RawMemPointStorageReader(string const & name)
-    : m_fileReader(name)
+  explicit RawMemPointStorageReader(string const & name) : m_fileReader(name)
   {
     uint64_t const fileSize = m_fileReader.Size();
     CHECK_EQUAL(fileSize % sizeof(LatLon), 0, ("Node's coordinates file is broken"));
@@ -141,16 +136,9 @@ class RawMemPointStorageWriter : public PointStorageWriterBase
   static constexpr size_t kBufferSize = 1000000000;
 
 public:
-  explicit RawMemPointStorageWriter(string const & name)
-    : m_fileWriter(name)
-  {
-    m_buffer.reserve(kBufferSize);
-  }
+  explicit RawMemPointStorageWriter(string const & name) : m_fileWriter(name) { m_buffer.reserve(kBufferSize); }
 
-  ~RawMemPointStorageWriter() noexcept(false) override
-  {
-    Flush();
-  }
+  ~RawMemPointStorageWriter() noexcept(false) override { Flush(); }
 
   // PointStorageWriterInterface overrides:
   void AddPoint(uint64_t id, double lat, double lon) override
@@ -173,11 +161,8 @@ private:
     // Sort, according to the seek pos in file.
 
     /// @todo Try parallel sort when clang will be able.
-    //std::sort(std::execution::par, buffer.begin(), buffer.end(), [](LatLonPos const & l, LatLonPos const & r)
-    std::sort(buffer.begin(), buffer.end(), [](LatLonPos const & l, LatLonPos const & r)
-    {
-      return l.m_pos < r.m_pos;
-    });
+    // std::sort(std::execution::par, buffer.begin(), buffer.end(), [](LatLonPos const & l, LatLonPos const & r)
+    std::sort(buffer.begin(), buffer.end(), [](LatLonPos const & l, LatLonPos const & r) { return l.m_pos < r.m_pos; });
 
     size_t constexpr structSize = sizeof(LatLon);
     for (auto const & llp : buffer)
@@ -219,10 +204,7 @@ private:
     uint64_t m_pos = 0;
 
   public:
-    explicit CachedPosWriter(std::string const & fPath) : m_writer(fPath)
-    {
-      CHECK_EQUAL(m_pos, m_writer.Pos(), ());
-    }
+    explicit CachedPosWriter(std::string const & fPath) : m_writer(fPath) { CHECK_EQUAL(m_pos, m_writer.Pos(), ()); }
 
     void Write(uint64_t pos, void const * p, size_t size)
     {
@@ -245,8 +227,7 @@ private:
 class MapFilePointStorageReader : public PointStorageReaderInterface
 {
 public:
-  explicit MapFilePointStorageReader(string const & name)
-    : m_fileReader(name + kShortExtension)
+  explicit MapFilePointStorageReader(string const & name) : m_fileReader(name + kShortExtension)
   {
     LOG(LINFO, ("Nodes reading is started"));
 
@@ -273,10 +254,7 @@ public:
       return false;
     bool ret = FromLatLon(i->second, lat, lon);
     if (!ret)
-    {
-      LOG(LERROR, ("Inconsistent MapFilePointStorageReader. Node with id =", id,
-                   "must exist but was not found"));
-    }
+      LOG(LERROR, ("Inconsistent MapFilePointStorageReader. Node with id =", id, "must exist but was not found"));
     return ret;
   }
 
@@ -288,10 +266,7 @@ private:
 class MapFilePointStorageWriter : public PointStorageWriterBase
 {
 public:
-  explicit MapFilePointStorageWriter(string const & name)
-    : m_fileWriter(name + kShortExtension)
-  {
-  }
+  explicit MapFilePointStorageWriter(string const & name) : m_fileWriter(name + kShortExtension) {}
 
   // PointStorageWriterInterface overrides:
   void AddPoint(uint64_t id, double lat, double lon) override
@@ -351,10 +326,7 @@ bool IndexFileReader::GetValueByKey(Key key, Value & value) const
 }
 
 // IndexFileWriter ---------------------------------------------------------------------------------
-IndexFileWriter::IndexFileWriter(string const & name) :
-  m_fileWriter(name)
-{
-}
+IndexFileWriter::IndexFileWriter(string const & name) : m_fileWriter(name) {}
 
 void IndexFileWriter::WriteAll()
 {
@@ -390,15 +362,18 @@ OSMElementCacheReader::OSMElementCacheReader(IntermediateDataObjectsCache::Alloc
 
 // OSMElementCacheWriter ---------------------------------------------------------------------------
 OSMElementCacheWriter::OSMElementCacheWriter(string const & name)
-  : m_fileWriter(name), m_offsets(name + OFFSET_EXT), m_name(name)
+  : m_fileWriter(name)
+  , m_offsets(name + OFFSET_EXT)
+  , m_name(name)
+{}
+
+void OSMElementCacheWriter::SaveOffsets()
 {
+  m_offsets.WriteAll();
 }
 
-void OSMElementCacheWriter::SaveOffsets() { m_offsets.WriteAll(); }
-
 // IntermediateDataObjectsCache --------------------------------------------------------------------
-IntermediateDataObjectsCache::AllocatedObjects &
-IntermediateDataObjectsCache::GetOrCreatePointStorageReader(
+IntermediateDataObjectsCache::AllocatedObjects & IntermediateDataObjectsCache::GetOrCreatePointStorageReader(
     feature::GenerateInfo::NodeStorageType type, string const & name)
 {
   auto const strType = std::to_string(static_cast<int>(type));
@@ -418,14 +393,13 @@ void IntermediateDataObjectsCache::Clear()
   std::unordered_map<string, AllocatedObjects>().swap(m_objects);
 }
 
-IntermediateDataObjectsCache::AllocatedObjects::AllocatedObjects(
-    feature::GenerateInfo::NodeStorageType type, string const & name)
+IntermediateDataObjectsCache::AllocatedObjects::AllocatedObjects(feature::GenerateInfo::NodeStorageType type,
+                                                                 string const & name)
 {
   m_storageReader = CreatePointStorageReader(type, name);
 }
 
-IndexFileReader const & IntermediateDataObjectsCache::AllocatedObjects::GetOrCreateIndexReader(
-    std::string const & name)
+IndexFileReader const & IntermediateDataObjectsCache::AllocatedObjects::GetOrCreateIndexReader(std::string const & name)
 {
   static std::mutex m;
   std::lock_guard lock(m);
@@ -434,20 +408,18 @@ IndexFileReader const & IntermediateDataObjectsCache::AllocatedObjects::GetOrCre
 }
 
 // IntermediateDataReader --------------------------------------------------------------------------
-IntermediateDataReader::IntermediateDataReader(
-    IntermediateDataObjectsCache::AllocatedObjects & objs, feature::GenerateInfo const & info)
+IntermediateDataReader::IntermediateDataReader(IntermediateDataObjectsCache::AllocatedObjects & objs,
+                                               feature::GenerateInfo const & info)
   : m_nodes(objs.GetPointStorageReader())
   , m_ways(objs, info.GetCacheFileName(WAYS_FILE), info.m_preloadCache)
   , m_relations(objs, info.GetCacheFileName(RELATIONS_FILE), info.m_preloadCache)
   , m_nodeToRelations(objs.GetOrCreateIndexReader(info.GetCacheFileName(NODES_FILE, ID2REL_EXT)))
   , m_wayToRelations(objs.GetOrCreateIndexReader(info.GetCacheFileName(WAYS_FILE, ID2REL_EXT)))
-  , m_relationToRelations(
-        objs.GetOrCreateIndexReader(info.GetCacheFileName(RELATIONS_FILE, ID2REL_EXT)))
+  , m_relationToRelations(objs.GetOrCreateIndexReader(info.GetCacheFileName(RELATIONS_FILE, ID2REL_EXT)))
 {}
 
 // IntermediateDataWriter --------------------------------------------------------------------------
-IntermediateDataWriter::IntermediateDataWriter(PointStorageWriterInterface & nodes,
-                                               feature::GenerateInfo const & info)
+IntermediateDataWriter::IntermediateDataWriter(PointStorageWriterInterface & nodes, feature::GenerateInfo const & info)
   : m_nodes(nodes)
   , m_ways(info.GetCacheFileName(WAYS_FILE))
   , m_relations(info.GetCacheFileName(RELATIONS_FILE))
@@ -458,8 +430,8 @@ IntermediateDataWriter::IntermediateDataWriter(PointStorageWriterInterface & nod
 
 void IntermediateDataWriter::AddRelation(Key id, RelationElement const & e)
 {
-  static std::set<std::string_view> const types = {"multipolygon", "route", "boundary",
-                                    "associatedStreet", "building", "restriction"};
+  static std::set<std::string_view> const types = {"multipolygon",     "route",    "boundary",
+                                                   "associatedStreet", "building", "restriction"};
   auto const relationType = e.GetType();
   if (!types.count(relationType))
     return;
@@ -481,43 +453,36 @@ void IntermediateDataWriter::SaveIndex()
 }
 
 // Functions
-std::unique_ptr<PointStorageReaderInterface>
-CreatePointStorageReader(feature::GenerateInfo::NodeStorageType type, string const & name)
+std::unique_ptr<PointStorageReaderInterface> CreatePointStorageReader(feature::GenerateInfo::NodeStorageType type,
+                                                                      string const & name)
 {
   switch (type)
   {
-  case feature::GenerateInfo::NodeStorageType::File:
-    return std::make_unique<RawFilePointStorageMmapReader>(name);
-  case feature::GenerateInfo::NodeStorageType::Index:
-    return std::make_unique<MapFilePointStorageReader>(name);
-  case feature::GenerateInfo::NodeStorageType::Memory:
-    return std::make_unique<RawMemPointStorageReader>(name);
+  case feature::GenerateInfo::NodeStorageType::File: return std::make_unique<RawFilePointStorageMmapReader>(name);
+  case feature::GenerateInfo::NodeStorageType::Index: return std::make_unique<MapFilePointStorageReader>(name);
+  case feature::GenerateInfo::NodeStorageType::Memory: return std::make_unique<RawMemPointStorageReader>(name);
   }
   UNREACHABLE();
 }
 
-std::unique_ptr<PointStorageWriterInterface>
-CreatePointStorageWriter(feature::GenerateInfo::NodeStorageType type, string const & name)
+std::unique_ptr<PointStorageWriterInterface> CreatePointStorageWriter(feature::GenerateInfo::NodeStorageType type,
+                                                                      string const & name)
 {
   switch (type)
   {
-  case feature::GenerateInfo::NodeStorageType::File:
-    return std::make_unique<RawFilePointStorageWriter>(name);
-  case feature::GenerateInfo::NodeStorageType::Index:
-    return std::make_unique<MapFilePointStorageWriter>(name);
-  case feature::GenerateInfo::NodeStorageType::Memory:
-    return std::make_unique<RawMemPointStorageWriter>(name);
+  case feature::GenerateInfo::NodeStorageType::File: return std::make_unique<RawFilePointStorageWriter>(name);
+  case feature::GenerateInfo::NodeStorageType::Index: return std::make_unique<MapFilePointStorageWriter>(name);
+  case feature::GenerateInfo::NodeStorageType::Memory: return std::make_unique<RawMemPointStorageWriter>(name);
   }
   UNREACHABLE();
 }
 
-IntermediateData::IntermediateData(IntermediateDataObjectsCache & objectsCache,
-                                   feature::GenerateInfo const & info)
+IntermediateData::IntermediateData(IntermediateDataObjectsCache & objectsCache, feature::GenerateInfo const & info)
   : m_objectsCache(objectsCache)
   , m_info(info)
 {
-  auto & allocatedObjects = m_objectsCache.GetOrCreatePointStorageReader(
-      info.m_nodeStorageType, info.GetCacheFileName(NODES_FILE));
+  auto & allocatedObjects =
+      m_objectsCache.GetOrCreatePointStorageReader(info.m_nodeStorageType, info.GetCacheFileName(NODES_FILE));
   m_reader = std::make_shared<IntermediateDataReader>(allocatedObjects, info);
 }
 
@@ -530,4 +495,4 @@ std::shared_ptr<IntermediateData> IntermediateData::Clone() const
 {
   return std::make_shared<IntermediateData>(m_objectsCache, m_info);
 }
-}  // namespace generator
+}  // namespace generator::cache
diff --git a/generator/intermediate_data.hpp b/generator/intermediate_data.hpp
index 84280e452..aad9e8b5b 100644
--- a/generator/intermediate_data.hpp
+++ b/generator/intermediate_data.hpp
@@ -53,7 +53,7 @@ static_assert(std::is_trivially_copyable<LatLonPos>::value, "");
 class PointStorageWriterInterface
 {
 public:
-  virtual ~PointStorageWriterInterface() noexcept(false) {};
+  virtual ~PointStorageWriterInterface() noexcept(false) {}
   virtual void AddPoint(uint64_t id, double lat, double lon) = 0;
   virtual uint64_t GetNumProcessedPoints() const = 0;
 };
@@ -80,10 +80,8 @@ public:
   {
     auto range = std::equal_range(m_elements.begin(), m_elements.end(), k, ElementComparator());
     for (; range.first != range.second; ++range.first)
-    {
       if (toDo((*range.first).second) == base::ControlFlow::Break)
         break;
-    }
   }
 
 private:
@@ -102,7 +100,6 @@ private:
   std::vector<Element> m_elements;
 };
 
-
 class IndexFileWriter
 {
 public:
@@ -138,9 +135,9 @@ public:
   public:
     AllocatedObjects(feature::GenerateInfo::NodeStorageType type, std::string const & name);
 
-   PointStorageReaderInterface const & GetPointStorageReader() const { return *m_storageReader; }
+    PointStorageReaderInterface const & GetPointStorageReader() const { return *m_storageReader; }
 
-   IndexFileReader const & GetOrCreateIndexReader(std::string const & name);
+    IndexFileReader const & GetOrCreateIndexReader(std::string const & name);
 
   private:
     std::unique_ptr<PointStorageReaderInterface> m_storageReader;
@@ -255,14 +252,10 @@ public:
   // Constructs IntermediateDataReader.
   // objs - intermediate allocated objects. It's used for control allocated objects.
   // info - information about the generation.
-  IntermediateDataReader(IntermediateDataObjectsCache::AllocatedObjects & objs,
-                         feature::GenerateInfo const & info);
+  IntermediateDataReader(IntermediateDataObjectsCache::AllocatedObjects & objs, feature::GenerateInfo const & info);
 
   /// \a x \a y are in mercator projection coordinates. @see IntermediateDataWriter::AddNode.
-  bool GetNode(Key id, double & y, double & x) const override
-  {
-    return m_nodes.GetPoint(id, y, x);
-  }
+  bool GetNode(Key id, double & y, double & x) const override { return m_nodes.GetPoint(id, y, x); }
 
   bool GetWay(Key id, WayElement & e) override { return m_ways.Read(id, e); }
   bool GetRelation(Key id, RelationElement & e) override { return m_relations.Read(id, e); }
@@ -292,11 +285,7 @@ private:
   class ElementProcessorBase
   {
   public:
-    ElementProcessorBase(CacheReader & reader, ToDo & toDo)
-      : m_reader(reader)
-      , m_toDo(toDo)
-    {
-    }
+    ElementProcessorBase(CacheReader & reader, ToDo & toDo) : m_reader(reader), m_toDo(toDo) {}
 
     base::ControlFlow operator()(uint64_t id)
     {
@@ -309,16 +298,12 @@ private:
     ToDo & m_toDo;
   };
 
-
   template <typename ToDo>
   struct CachedRelationProcessor : public ElementProcessorBase<RelationElement, ToDo>
   {
     using Base = ElementProcessorBase<RelationElement, ToDo>;
 
-    CachedRelationProcessor(CacheReader & reader, ToDo & toDo)
-      : Base(reader, toDo)
-    {
-    }
+    CachedRelationProcessor(CacheReader & reader, ToDo & toDo) : Base(reader, toDo) {}
 
     base::ControlFlow operator()(uint64_t id) { return this->m_toDo(id, this->m_reader); }
   };
@@ -365,17 +350,16 @@ private:
   cache::IndexFileWriter m_relationToRelations;
 };
 
-std::unique_ptr<PointStorageReaderInterface>
-CreatePointStorageReader(feature::GenerateInfo::NodeStorageType type, std::string const & name);
+std::unique_ptr<PointStorageReaderInterface> CreatePointStorageReader(feature::GenerateInfo::NodeStorageType type,
+                                                                      std::string const & name);
 
-std::unique_ptr<PointStorageWriterInterface>
-CreatePointStorageWriter(feature::GenerateInfo::NodeStorageType type, std::string const & name);
+std::unique_ptr<PointStorageWriterInterface> CreatePointStorageWriter(feature::GenerateInfo::NodeStorageType type,
+                                                                      std::string const & name);
 
 class IntermediateData
 {
 public:
-  explicit IntermediateData(IntermediateDataObjectsCache & objectsCache,
-                            feature::GenerateInfo const & info);
+  explicit IntermediateData(IntermediateDataObjectsCache & objectsCache, feature::GenerateInfo const & info);
   std::shared_ptr<IntermediateDataReader> const & GetCache() const;
   std::shared_ptr<IntermediateData> Clone() const;
 
diff --git a/generator/intermediate_elements.hpp b/generator/intermediate_elements.hpp
index 496dc8400..caf57ce32 100644
--- a/generator/intermediate_elements.hpp
+++ b/generator/intermediate_elements.hpp
@@ -22,10 +22,7 @@ struct WayElement
   std::vector<uint64_t> m_nodes;
 
   explicit WayElement(uint64_t osmId) : m_wayOsmId(osmId) {}
-  WayElement(uint64_t osmId, std::vector<uint64_t> const & nodes)
-    : m_wayOsmId(osmId), m_nodes(nodes)
-  {
-  }
+  WayElement(uint64_t osmId, std::vector<uint64_t> const & nodes) : m_wayOsmId(osmId), m_nodes(nodes) {}
 
   bool IsValid() const { return !m_nodes.empty(); }
 
@@ -219,10 +216,8 @@ protected:
   static std::string_view FindRoleImpl(std::vector<Member> const & container, uint64_t id)
   {
     for (auto const & e : container)
-    {
       if (e.first == id)
         return e.second;
-    }
     return {};
   }
 };
diff --git a/generator/isolines_generator.cpp b/generator/isolines_generator.cpp
index 88c360afd..4ef7fef07 100644
--- a/generator/isolines_generator.cpp
+++ b/generator/isolines_generator.cpp
@@ -18,18 +18,13 @@ std::string_view const kTypeZero = "zero";
 
 std::string GetIsolineName(int altitude, int step, int minAltitude, int maxAltitude)
 {
-  if (step > 10 ||
-      abs(altitude) % kNamedAltStep == 0 ||
-      maxAltitude - minAltitude <= kNamedAltRange)
-  {
+  if (step > 10 || abs(altitude) % kNamedAltStep == 0 || maxAltitude - minAltitude <= kNamedAltRange)
     return strings::to_string(altitude);
-  }
   return "";
 }
 }  // namespace
 
-IsolineFeaturesGenerator::IsolineFeaturesGenerator(std::string const & isolinesDir)
-  : m_isolinesDir(isolinesDir)
+IsolineFeaturesGenerator::IsolineFeaturesGenerator(std::string const & isolinesDir) : m_isolinesDir(isolinesDir)
 {
   ASSERT(std::is_sorted(kAltClasses.cbegin(), kAltClasses.cend(), std::greater<int>()), ());
   Classificator const & c = classif();
@@ -48,18 +43,14 @@ uint32_t IsolineFeaturesGenerator::GetIsolineType(int altitude) const
     return m_altClassToType.at(0);
 
   for (auto altStep : kAltClasses)
-  {
     if (abs(altitude) % altStep == 0)
       return m_altClassToType.at(altStep);
-  }
   return ftype::GetEmptyValue();
 }
 
-void IsolineFeaturesGenerator::GenerateIsolines(std::string const & countryName,
-                                                FeaturesCollectFn const & fn) const
+void IsolineFeaturesGenerator::GenerateIsolines(std::string const & countryName, FeaturesCollectFn const & fn) const
 {
-  auto const isolinesPath = topography_generator::GetIsolinesFilePath(countryName,
-                                                                      m_isolinesDir);
+  auto const isolinesPath = topography_generator::GetIsolinesFilePath(countryName, m_isolinesDir);
   topography_generator::Contours<topography_generator::Altitude> countryIsolines;
   if (!topography_generator::LoadContours(isolinesPath, countryIsolines))
   {
@@ -70,8 +61,8 @@ void IsolineFeaturesGenerator::GenerateIsolines(std::string const & countryName,
   for (auto & levelIsolines : countryIsolines.m_contours)
   {
     auto const altitude = levelIsolines.first;
-    auto const isolineName = GetIsolineName(altitude, countryIsolines.m_valueStep,
-                                            countryIsolines.m_minValue, countryIsolines.m_maxValue);
+    auto const isolineName =
+        GetIsolineName(altitude, countryIsolines.m_valueStep, countryIsolines.m_minValue, countryIsolines.m_maxValue);
     auto const isolineType = GetIsolineType(altitude);
     if (isolineType == ftype::GetEmptyValue())
     {
diff --git a/generator/maxspeeds_builder.cpp b/generator/maxspeeds_builder.cpp
index efd56129b..60be8b4cd 100644
--- a/generator/maxspeeds_builder.cpp
+++ b/generator/maxspeeds_builder.cpp
@@ -14,8 +14,8 @@
 #include "indexer/feature_data.hpp"
 #include "indexer/feature_processor.hpp"
 
-#include "coding/files_container.hpp"
 #include "coding/file_writer.hpp"
+#include "coding/files_container.hpp"
 
 #include "platform/measurement_utils.hpp"
 
@@ -44,7 +44,8 @@ double constexpr kMaxPossibleDefSpeedKmH = 400.0;
 // This factor should be greater than sqrt(2) / 2 - prefer diagonal link to square path.
 double constexpr kLinkToMainSpeedFactor = 0.85;
 
-template <class TokenizerT> bool ParseOneSpeedValue(TokenizerT & iter, MaxspeedType & value)
+template <class TokenizerT>
+bool ParseOneSpeedValue(TokenizerT & iter, MaxspeedType & value)
 {
   if (!iter)
     return false;
@@ -98,21 +99,19 @@ class MaxspeedsMwmCollector
     return osmIdIt->second;
   }
 
-  routing::RoadGeometry const & GetRoad(uint32_t fid) const
-  {
-    return m_graph->GetRoadGeometry(fid);
-  }
+  routing::RoadGeometry const & GetRoad(uint32_t fid) const { return m_graph->GetRoadGeometry(fid); }
 
   // OSM data related warning tag for convenient grep.
   std::string m_logTag;
 
 public:
   MaxspeedsMwmCollector(string const & dataPath, FeatureIdToOsmId const & ft2osm, IndexGraph * graph)
-    : m_dataPath(dataPath), m_ft2osm(ft2osm), m_graph(graph)
+    : m_dataPath(dataPath)
+    , m_ft2osm(ft2osm)
+    , m_graph(graph)
     , m_converter(MaxspeedConverter::Instance())
     , m_logTag("SpeedsBuilder")
-  {
-  }
+  {}
 
   void Process(string const & maxspeedCsvPath)
   {
@@ -131,24 +130,19 @@ public:
 
       return &maxspeedIt->second;
     };
-    auto const GetLastIndex = [&](uint32_t fid)
-    {
-      return GetRoad(fid).GetPointsCount() - 2;
-    };
+    auto const GetLastIndex = [&](uint32_t fid) { return GetRoad(fid).GetPointsCount() - 2; };
     auto const GetOpposite = [&](Segment const & seg)
     {
       // Assume that links are connected with main roads in first or last point, always.
       uint32_t const fid = seg.GetFeatureId();
       return Segment(0, fid, seg.GetSegmentIdx() > 0 ? 0 : GetLastIndex(fid), seg.IsForward());
     };
-    auto const GetHighwayType = [&](uint32_t fid)
-    {
-      return GetRoad(fid).GetHighwayType();
-    };
+    auto const GetHighwayType = [&](uint32_t fid) { return GetRoad(fid).GetHighwayType(); };
 
     auto const & converter = GetMaxspeedConverter();
     using HwTypeT = std::optional<routing::HighwayType>;
-    auto const CalculateSpeed = [&](uint32_t parentFID, Maxspeed const & s, HwTypeT hwType) -> std::optional<SpeedInUnits>
+    auto const CalculateSpeed = [&](uint32_t parentFID, Maxspeed const & s,
+                                    HwTypeT hwType) -> std::optional<SpeedInUnits>
     {
       HwTypeT const parentHwType = GetHighwayType(parentFID);
       if (!parentHwType)
@@ -167,7 +161,7 @@ public:
       {
         // Reduce factor from parent road. See DontUseLinksWhenRidingOnMotorway test.
         return converter.ClosestValidMacro(
-              { base::asserted_cast<MaxspeedType>(std::lround(s.GetForward() * kLinkToMainSpeedFactor)), s.GetUnits() });
+            {base::asserted_cast<MaxspeedType>(std::lround(s.GetForward() * kLinkToMainSpeedFactor)), s.GetUnits()});
       }
 
       return {};
@@ -180,7 +174,7 @@ public:
 
       Maxspeed * maxSpeed = GetSpeed(fid);
       if (!maxSpeed)
-          return;
+        return;
 
       auto const osmID = GetOsmID(fid).GetSerialId();
 
@@ -190,7 +184,9 @@ public:
         return;
       }
 
-#define LOG_MAX_SPEED(msg) if (false) LOG(LINFO, msg)
+#define LOG_MAX_SPEED(msg) \
+  if (false)               \
+  LOG(LINFO, msg)
 
       LOG_MAX_SPEED(("Start osmid =", osmID));
 
@@ -208,7 +204,7 @@ public:
         HwTypeT const hwType = GetHighwayType(fid);
 
         // Check ingoing first, then - outgoing.
-        for (bool direction : { false, true })
+        for (bool direction : {false, true})
         {
           LOG_MAX_SPEED(("Search dir =", direction));
 
@@ -253,9 +249,8 @@ public:
                   }
                 }
                 else if (s->GetForward() == routing::kCommonMaxSpeedValue &&
-                         reviewed.size() < 4 &&   // limit with some reasonable transitions
-                         reviewed.find(targetFID) == reviewed.end() &&
-                         hwType == GetHighwayType(targetFID))
+                         reviewed.size() < 4 &&  // limit with some reasonable transitions
+                         reviewed.find(targetFID) == reviewed.end() && hwType == GetHighwayType(targetFID))
                 {
                   LOG_MAX_SPEED(("Add reviewed"));
 
@@ -265,7 +260,8 @@ public:
                 }
               }
             }
-          } while (status == 1);
+          }
+          while (status == 1);
 
           if (status == 2)
             break;
@@ -309,9 +305,7 @@ private:
       return;
     }
     if (backward.IsValid() && backwardMacro == SpeedMacro::Undefined)
-    {
       LOG(LWARNING, (m_logTag, "Undefined backward speed macro", backward, "for way", osmID));
-    }
 
     m_maxspeeds.push_back(ftSpeed);
 
@@ -328,7 +322,7 @@ private:
       auto & info = m_avgSpeeds[rd.IsInCity() ? 1 : 0][*hwType];
 
       double const lenKM = rd.GetRoadLengthM() / 1000.0;
-      for (auto const & s : { forward, backward })
+      for (auto const & s : {forward, backward})
       {
         if (s.IsNumeric())
         {
@@ -344,17 +338,17 @@ private:
 public:
   void CalculateDefaultTypeSpeeds(MaxspeedsSerializer::HW2SpeedMap typeSpeeds[])
   {
-    std::vector<std::pair<HighwayType, InOutCitySpeedKMpH>> baseSpeeds(
-        kHighwayBasedSpeeds.begin(), kHighwayBasedSpeeds.end());
+    std::vector<std::pair<HighwayType, InOutCitySpeedKMpH>> baseSpeeds(kHighwayBasedSpeeds.begin(),
+                                                                       kHighwayBasedSpeeds.end());
     // Remove links, because they don't conform speed consistency.
-    baseSpeeds.erase(std::remove_if(baseSpeeds.begin(), baseSpeeds.end(), [](auto const & e)
+    baseSpeeds.erase(std::remove_if(baseSpeeds.begin(), baseSpeeds.end(),
+                                    [](auto const & e)
     {
-      return (e.first == HighwayType::HighwayMotorwayLink ||
-              e.first == HighwayType::HighwayTrunkLink ||
-              e.first == HighwayType::HighwayPrimaryLink ||
-              e.first == HighwayType::HighwaySecondaryLink ||
+      return (e.first == HighwayType::HighwayMotorwayLink || e.first == HighwayType::HighwayTrunkLink ||
+              e.first == HighwayType::HighwayPrimaryLink || e.first == HighwayType::HighwaySecondaryLink ||
               e.first == HighwayType::HighwayTertiaryLink);
-    }), baseSpeeds.end());
+    }),
+                     baseSpeeds.end());
 
     for (int ind = 0; ind < kSpeedsCount; ++ind)
     {
@@ -441,8 +435,8 @@ public:
         double constexpr eps = 1.0;
         if (primaryS + eps < secondaryS || secondaryS + eps < tertiaryS || tertiaryS + eps < residentialS)
         {
-          LOG(LWARNING, (m_logTag, "Ignore primary, secondary, tertiary, residential speeds:",
-                                    primaryS, secondaryS, tertiaryS, residentialS));
+          LOG(LWARNING, (m_logTag, "Ignore primary, secondary, tertiary, residential speeds:", primaryS, secondaryS,
+                         tertiaryS, residentialS));
 
           m_avgSpeeds[ind][HighwayType::HighwayPrimary].m_speed = -1;
           m_avgSpeeds[ind][HighwayType::HighwaySecondary].m_speed = -1;
@@ -453,11 +447,11 @@ public:
 
       // Update links.
       std::pair<HighwayType, HighwayType> arrLinks[] = {
-        {HighwayType::HighwayMotorway, HighwayType::HighwayMotorwayLink},
-        {HighwayType::HighwayTrunk, HighwayType::HighwayTrunkLink},
-        {HighwayType::HighwayPrimary, HighwayType::HighwayPrimaryLink},
-        {HighwayType::HighwaySecondary, HighwayType::HighwaySecondaryLink},
-        {HighwayType::HighwayTertiary, HighwayType::HighwayTertiaryLink},
+          {HighwayType::HighwayMotorway, HighwayType::HighwayMotorwayLink},
+          {HighwayType::HighwayTrunk, HighwayType::HighwayTrunkLink},
+          {HighwayType::HighwayPrimary, HighwayType::HighwayPrimaryLink},
+          {HighwayType::HighwaySecondary, HighwayType::HighwaySecondaryLink},
+          {HighwayType::HighwayTertiary, HighwayType::HighwayTertiaryLink},
       };
       for (auto const & e : arrLinks)
       {
@@ -477,7 +471,7 @@ public:
         {
           // Store type speeds in Metric system, like VehicleModel profiles.
           auto const speedInUnits = m_converter.ClosestValidMacro(
-                { static_cast<MaxspeedType>(e.second.m_speed), measurement_utils::Units::Metric });
+              {static_cast<MaxspeedType>(e.second.m_speed), measurement_utils::Units::Metric});
 
           LOG(LINFO, ("*", e.first, "=", speedInUnits));
 
@@ -561,8 +555,7 @@ bool ParseMaxspeeds(string const & filePath, OsmIdToMaxspeed & osmIdToMaxspeed)
   return true;
 }
 
-void BuildMaxspeedsSection(IndexGraph * graph, string const & dataPath,
-                           FeatureIdToOsmId const & featureIdToOsmId,
+void BuildMaxspeedsSection(IndexGraph * graph, string const & dataPath, FeatureIdToOsmId const & featureIdToOsmId,
                            string const & maxspeedsFilename)
 {
   MaxspeedsMwmCollector collector(dataPath, featureIdToOsmId, graph);
@@ -571,8 +564,8 @@ void BuildMaxspeedsSection(IndexGraph * graph, string const & dataPath,
   collector.SerializeMaxspeeds();
 }
 
-void BuildMaxspeedsSection(IndexGraph * graph, string const & dataPath,
-                           string const & osmToFeaturePath, string const & maxspeedsFilename)
+void BuildMaxspeedsSection(IndexGraph * graph, string const & dataPath, string const & osmToFeaturePath,
+                           string const & maxspeedsFilename)
 {
   FeatureIdToOsmId featureIdToOsmId;
   ParseWaysFeatureIdToOsmIdMapping(osmToFeaturePath, featureIdToOsmId);
diff --git a/generator/maxspeeds_builder.hpp b/generator/maxspeeds_builder.hpp
index af924dd1f..938cdbd2e 100644
--- a/generator/maxspeeds_builder.hpp
+++ b/generator/maxspeeds_builder.hpp
@@ -13,7 +13,7 @@ namespace routing
 {
 class IndexGraph;
 using OsmIdToMaxspeed = std::map<base::GeoObjectId, Maxspeed>;
-} // namesoace routing
+}  // namespace routing
 
 namespace routing_builder
 {
@@ -22,8 +22,7 @@ namespace routing_builder
 bool ParseMaxspeeds(std::string const & filePath, routing::OsmIdToMaxspeed & osmIdToMaxspeed);
 
 void BuildMaxspeedsSection(routing::IndexGraph * graph, std::string const & dataPath,
-                           routing::FeatureIdToOsmId const & featureIdToOsmId,
-                           std::string const & maxspeedsFilename);
+                           routing::FeatureIdToOsmId const & featureIdToOsmId, std::string const & maxspeedsFilename);
 
 /// \brief Builds maxspeeds section in mwm with |dataPath|. This section contains max speed limits
 /// if they are available in file |maxspeedsFilename|.
diff --git a/generator/maxspeeds_collector.cpp b/generator/maxspeeds_collector.cpp
index 59a8a92ac..34c757982 100644
--- a/generator/maxspeeds_collector.cpp
+++ b/generator/maxspeeds_collector.cpp
@@ -23,8 +23,7 @@ namespace generator
 {
 namespace
 {
-bool ParseMaxspeedAndWriteToStream(std::string const & maxspeed, routing::SpeedInUnits & speed,
-                                   std::ostringstream & ss)
+bool ParseMaxspeedAndWriteToStream(std::string const & maxspeed, routing::SpeedInUnits & speed, std::ostringstream & ss)
 {
   if (maxspeed.empty() || !ParseMaxspeedTag(maxspeed, speed))
     return false;
@@ -34,8 +33,7 @@ bool ParseMaxspeedAndWriteToStream(std::string const & maxspeed, routing::SpeedI
 }
 }  // namespace
 
-MaxspeedsCollector::MaxspeedsCollector(std::string const & filename)
-  : CollectorInterface(filename)
+MaxspeedsCollector::MaxspeedsCollector(std::string const & filename) : CollectorInterface(filename)
 {
   m_stream.exceptions(std::fstream::failbit | std::fstream::badbit);
   m_stream.open(GetTmpFilename());
@@ -91,11 +89,8 @@ void MaxspeedsCollector::CollectFeature(feature::FeatureBuilder const & ft, OsmE
     // like "none" or "walk". In that case units mean nothing and the values should
     // be processed in a special way.
     routing::SpeedInUnits maxspeedBackward;
-    if (ParseMaxspeedTag(maxspeedBackwardStr, maxspeedBackward) &&
-        HaveSameUnits(maxspeed, maxspeedBackward))
-    {
+    if (ParseMaxspeedTag(maxspeedBackwardStr, maxspeedBackward) && HaveSameUnits(maxspeed, maxspeedBackward))
       ss << "," << strings::to_string(maxspeedBackward.GetSpeed());
-    }
   }
   else if (ftypes::IsLinkChecker::Instance()(ft.GetTypes()))
   {
@@ -132,7 +127,10 @@ void MaxspeedsCollector::Save()
     CHECK(base::CopyFileX(GetTmpFilename(), GetFilename()), ());
 }
 
-void MaxspeedsCollector::OrderCollectedData() { OrderTextFileByLine(GetFilename()); }
+void MaxspeedsCollector::OrderCollectedData()
+{
+  OrderTextFileByLine(GetFilename());
+}
 
 void MaxspeedsCollector::MergeInto(MaxspeedsCollector & collector) const
 {
diff --git a/generator/maxspeeds_parser.cpp b/generator/maxspeeds_parser.cpp
index 928f61d88..072777117 100644
--- a/generator/maxspeeds_parser.cpp
+++ b/generator/maxspeeds_parser.cpp
@@ -115,13 +115,13 @@ static std::unordered_map<std::string, routing::SpeedInUnits> const kRoadCategor
     {"SE:trunk", {90, Units::Metric}},
     {"SE:motorway", {110, Units::Metric}},
 
-    {"GB:motorway", {70, Units::Imperial}},   // 70 mph = 112.65408 kmph
-    {"GB:nsl_dual", {70, Units::Imperial}},   // 70 mph = 112.65408 kmph
-    {"GB:nsl_single", {60, Units::Imperial}}, // 60 mph = 96.56064 kmph
+    {"GB:motorway", {70, Units::Imperial}},    // 70 mph = 112.65408 kmph
+    {"GB:nsl_dual", {70, Units::Imperial}},    // 70 mph = 112.65408 kmph
+    {"GB:nsl_single", {60, Units::Imperial}},  // 60 mph = 96.56064 kmph
 
-    {"UK:motorway", {70, Units::Imperial}},   // 70 mph
-    {"UK:nsl_dual", {70, Units::Imperial}},   // 70 mph
-    {"UK:nsl_single", {60, Units::Imperial}}, // 60 mph
+    {"UK:motorway", {70, Units::Imperial}},    // 70 mph
+    {"UK:nsl_dual", {70, Units::Imperial}},    // 70 mph
+    {"UK:nsl_single", {60, Units::Imperial}},  // 60 mph
 
     {"UA:urban", {50, Units::Metric}},
     {"UA:rural", {90, Units::Metric}},
@@ -151,14 +151,14 @@ bool ParseMaxspeedTag(std::string const & maxspeedValue, routing::SpeedInUnits &
   if (maxspeedValue == "none")
   {
     speed.SetSpeed(routing::kNoneMaxSpeed);
-    speed.SetUnits(Units::Metric); // It's dummy value in case of kNoneMaxSpeed
+    speed.SetUnits(Units::Metric);  // It's dummy value in case of kNoneMaxSpeed
     return true;
   }
 
   if (maxspeedValue == "walk")
   {
     speed.SetSpeed(routing::kWalkMaxSpeed);
-    speed.SetUnits(Units::Metric); // It's dummy value in case of kWalkMaxSpeed
+    speed.SetUnits(Units::Metric);  // It's dummy value in case of kWalkMaxSpeed
     return true;
   }
 
diff --git a/generator/metalines_builder.cpp b/generator/metalines_builder.cpp
index ae669834b..9bbee4795 100644
--- a/generator/metalines_builder.cpp
+++ b/generator/metalines_builder.cpp
@@ -152,7 +152,8 @@ LineStringMerger::OutputData LineStringMerger::OrderData(InputData const & data)
   for (auto & p : intermediateData)
   {
     auto & lineStrings = intermediateData[p.first];
-    std::sort(std::begin(lineStrings), std::end(lineStrings), [](auto const & l, auto const & r) {
+    std::sort(std::begin(lineStrings), std::end(lineStrings), [](auto const & l, auto const & r)
+    {
       auto const & lways = l->GetWays();
       auto const & rways = r->GetWays();
       return lways.size() == rways.size() ? lways.front() < rways.front() : lways.size() > rways.size();
@@ -166,8 +167,7 @@ LineStringMerger::OutputData LineStringMerger::OrderData(InputData const & data)
 MetalinesBuilder::MetalinesBuilder(std::string const & filename)
   : generator::CollectorInterface(filename)
   , m_writer(std::make_unique<FileWriter>(GetTmpFilename()))
-{
-}
+{}
 
 std::shared_ptr<generator::CollectorInterface> MetalinesBuilder::Clone(IDRInterfacePtr const &) const
 {
@@ -192,7 +192,10 @@ void MetalinesBuilder::CollectFeature(FeatureBuilder const & feature, OsmElement
   LineString(element).Serialize(*m_writer);
 }
 
-void MetalinesBuilder::Finish() { m_writer.reset(); }
+void MetalinesBuilder::Finish()
+{
+  m_writer.reset();
+}
 
 void MetalinesBuilder::Save()
 {
@@ -220,8 +223,8 @@ void MetalinesBuilder::Save()
     }
   }
 
-  LOG_SHORT(LINFO, ("Wrote", countLines, "metalines [with",  countWays ,
-                    "ways] with OSM IDs for the entire planet to", GetFilename()));
+  LOG_SHORT(LINFO, ("Wrote", countLines, "metalines [with", countWays, "ways] with OSM IDs for the entire planet to",
+                    GetFilename()));
 }
 
 void MetalinesBuilder::OrderCollectedData()
diff --git a/generator/metalines_builder.hpp b/generator/metalines_builder.hpp
index f4a6b4768..eacedcaa3 100644
--- a/generator/metalines_builder.hpp
+++ b/generator/metalines_builder.hpp
@@ -4,8 +4,8 @@
 #include "generator/feature_builder.hpp"
 #include "generator/osm_element.hpp"
 
-#include "coding/reader.hpp"
 #include "coding/read_write_utils.hpp"
+#include "coding/reader.hpp"
 #include "coding/write_to_sink.hpp"
 
 #include <map>
@@ -105,4 +105,4 @@ private:
 // Read an intermediate file from MetalinesBuilder and convert it to an mwm section.
 bool WriteMetalinesSection(std::string const & mwmPath, std::string const & metalinesPath,
                            std::string const & osmIdsToFeatureIdsPath);
-} // namespace feature
+}  // namespace feature
diff --git a/generator/mini_roundabout_info.cpp b/generator/mini_roundabout_info.cpp
index b99bb50d3..eb6c2b4e9 100644
--- a/generator/mini_roundabout_info.cpp
+++ b/generator/mini_roundabout_info.cpp
@@ -11,9 +11,9 @@
 namespace generator
 {
 MiniRoundaboutInfo::MiniRoundaboutInfo(OsmElement const & element)
-  : m_id(element.m_id), m_coord(element.m_lat, element.m_lon)
-{
-}
+  : m_id(element.m_id)
+  , m_coord(element.m_lat, element.m_lon)
+{}
 
 bool MiniRoundaboutInfo::Normalize()
 {
@@ -30,8 +30,7 @@ bool MiniRoundaboutInfo::IsProcessRoad(feature::FeatureBuilder const & fb)
   return fb.IsLine() && routing::IsCarRoad(fb.GetTypes());
 }
 
-MiniRoundaboutData::MiniRoundaboutData(std::vector<MiniRoundaboutInfo> && data)
-  : m_data(std::move(data))
+MiniRoundaboutData::MiniRoundaboutData(std::vector<MiniRoundaboutInfo> && data) : m_data(std::move(data))
 {
   for (auto const & d : m_data)
     m_ways.insert(std::end(m_ways), std::cbegin(d.m_ways), std::cend(d.m_ways));
diff --git a/generator/mini_roundabout_info.hpp b/generator/mini_roundabout_info.hpp
index db830176b..bc582237e 100644
--- a/generator/mini_roundabout_info.hpp
+++ b/generator/mini_roundabout_info.hpp
@@ -10,7 +10,10 @@
 
 #include <vector>
 
-namespace feature { class FeatureBuilder; }
+namespace feature
+{
+class FeatureBuilder;
+}
 
 namespace generator
 {
diff --git a/generator/mini_roundabout_transformer.cpp b/generator/mini_roundabout_transformer.cpp
index d82ed5e1f..d812c78d7 100644
--- a/generator/mini_roundabout_transformer.cpp
+++ b/generator/mini_roundabout_transformer.cpp
@@ -45,17 +45,14 @@ feature::FeatureBuilder::PointSeq::iterator GetIterOnRoad(m2::PointD const & poi
                                                           feature::FeatureBuilder::PointSeq & road)
 {
   return std::find_if(road.begin(), road.end(), [&point](m2::PointD const & pointOnRoad)
-  {
-    return AlmostEqualAbs(pointOnRoad, point, kMwmPointAccuracy);
-  });
+  { return AlmostEqualAbs(pointOnRoad, point, kMwmPointAccuracy); });
 }
-} // namespace
+}  // namespace
 
 MiniRoundaboutTransformer::MiniRoundaboutTransformer(std::vector<MiniRoundaboutInfo> const & data,
                                                      feature::AffiliationInterface const & affiliation)
   : MiniRoundaboutTransformer(data, affiliation, kDefaultRadiusMeters)
-{
-}
+{}
 
 MiniRoundaboutTransformer::MiniRoundaboutTransformer(std::vector<MiniRoundaboutInfo> const & data,
                                                      feature::AffiliationInterface const & affiliation,
@@ -63,8 +60,7 @@ MiniRoundaboutTransformer::MiniRoundaboutTransformer(std::vector<MiniRoundaboutI
   : m_roundabouts(data)
   , m_radiusMercator(mercator::MetersToMercator(radiusMeters))
   , m_affiliation(&affiliation)
-{
-}
+{}
 
 /// \brief Sets |roadType| with one of |foundTypes| if it is more important.
 /// (E.g. if roundabout connects motorway and tertiary ways, roundabout Feature will have motorway type).
@@ -73,22 +69,14 @@ bool UpdateRoadType(FeatureParams::Types const & foundTypes, uint32_t & roadType
   // Highways are sorted from the most to least important.
   auto const & cl = classif();
   static std::array<uint32_t, 16> const kHighwayTypes = {
-      cl.GetTypeByPath({"highway", "motorway"}),
-      cl.GetTypeByPath({"highway", "motorway_link"}),
-      cl.GetTypeByPath({"highway", "trunk"}),
-      cl.GetTypeByPath({"highway", "trunk_link"}),
-      cl.GetTypeByPath({"highway", "primary"}),
-      cl.GetTypeByPath({"highway", "primary_link"}),
-      cl.GetTypeByPath({"highway", "secondary"}),
-      cl.GetTypeByPath({"highway", "secondary_link"}),
-      cl.GetTypeByPath({"highway", "tertiary"}),
-      cl.GetTypeByPath({"highway", "tertiary_link"}),
-      cl.GetTypeByPath({"highway", "unclassified"}),
-      cl.GetTypeByPath({"highway", "road"}),
-      cl.GetTypeByPath({"highway", "residential"}),
-      cl.GetTypeByPath({"highway", "living_street"}),
-      cl.GetTypeByPath({"highway", "service"}),
-      cl.GetTypeByPath({"highway", "track"}),
+      cl.GetTypeByPath({"highway", "motorway"}),     cl.GetTypeByPath({"highway", "motorway_link"}),
+      cl.GetTypeByPath({"highway", "trunk"}),        cl.GetTypeByPath({"highway", "trunk_link"}),
+      cl.GetTypeByPath({"highway", "primary"}),      cl.GetTypeByPath({"highway", "primary_link"}),
+      cl.GetTypeByPath({"highway", "secondary"}),    cl.GetTypeByPath({"highway", "secondary_link"}),
+      cl.GetTypeByPath({"highway", "tertiary"}),     cl.GetTypeByPath({"highway", "tertiary_link"}),
+      cl.GetTypeByPath({"highway", "unclassified"}), cl.GetTypeByPath({"highway", "road"}),
+      cl.GetTypeByPath({"highway", "residential"}),  cl.GetTypeByPath({"highway", "living_street"}),
+      cl.GetTypeByPath({"highway", "service"}),      cl.GetTypeByPath({"highway", "track"}),
   };
 
   for (uint32_t t : foundTypes)
@@ -137,8 +125,8 @@ feature::FeatureBuilder MiniRoundaboutTransformer::CreateRoundaboutFb(PointsT &&
 }
 
 MiniRoundaboutTransformer::PointsT MiniRoundaboutTransformer::CreateSurrogateRoad(
-    RoundaboutUnit const & roundaboutOnRoad, PointsT & roundaboutCircle,
-    PointsT & road, PointsT::iterator & itPointUpd) const
+    RoundaboutUnit const & roundaboutOnRoad, PointsT & roundaboutCircle, PointsT & road,
+    PointsT::iterator & itPointUpd) const
 {
   PointsT surrogateRoad(itPointUpd, road.end());
   auto itPointOnSurrogateRoad = surrogateRoad.begin();
@@ -146,8 +134,7 @@ MiniRoundaboutTransformer::PointsT MiniRoundaboutTransformer::CreateSurrogateRoa
   ++itPointOnSurrogateRoad;
 
   m2::PointD const nextPointOnSurrogateRoad = GetPointAtDistFromTarget(
-      *itPointOnSurrogateRoad /* source */, roundaboutOnRoad.m_location /* target */,
-      m_radiusMercator /* dist */);
+      *itPointOnSurrogateRoad /* source */, roundaboutOnRoad.m_location /* target */, m_radiusMercator /* dist */);
 
   if (AlmostEqualAbs(nextPointOnSurrogateRoad, *itPointOnSurrogateRoad, kMwmPointAccuracy))
     return {};
@@ -159,8 +146,8 @@ MiniRoundaboutTransformer::PointsT MiniRoundaboutTransformer::CreateSurrogateRoa
   return surrogateRoad;
 }
 
-bool MiniRoundaboutTransformer::AddRoundaboutToRoad(RoundaboutUnit const & roundaboutOnRoad,
-                                                    PointsT & roundaboutCircle, PointsT & road,
+bool MiniRoundaboutTransformer::AddRoundaboutToRoad(RoundaboutUnit const & roundaboutOnRoad, PointsT & roundaboutCircle,
+                                                    PointsT & road,
                                                     std::vector<feature::FeatureBuilder> & newRoads) const
 {
   auto const roundaboutCenter = roundaboutOnRoad.m_location;
@@ -170,9 +157,8 @@ bool MiniRoundaboutTransformer::AddRoundaboutToRoad(RoundaboutUnit const & round
 
   auto itPointNearRoundabout = itPointUpd;
   bool const isMiddlePoint = MoveIterAwayFromRoundabout(itPointNearRoundabout, road);
-  m2::PointD const nextPointOnRoad =
-      GetPointAtDistFromTarget(*itPointNearRoundabout /* source */, roundaboutCenter /* target */,
-                               m_radiusMercator /* dist */);
+  m2::PointD const nextPointOnRoad = GetPointAtDistFromTarget(
+      *itPointNearRoundabout /* source */, roundaboutCenter /* target */, m_radiusMercator /* dist */);
 
   if (isMiddlePoint && !AlmostEqualAbs(nextPointOnRoad, *itPointNearRoundabout, kMwmPointAccuracy))
   {
@@ -197,12 +183,12 @@ void MiniRoundaboutTransformer::AddRoad(feature::FeatureBuilder && road)
   CHECK(m_roads.emplace(id, std::move(road)).second, ());
 }
 
-void MiniRoundaboutTransformer::ProcessRoundabouts(std::function<void (feature::FeatureBuilder const &)> const & fn)
+void MiniRoundaboutTransformer::ProcessRoundabouts(std::function<void(feature::FeatureBuilder const &)> const & fn)
 {
   // Some mini-roundabouts are mapped in the middle of the road. These roads should be split
   // in two parts on the opposite sides of the roundabout. New roads are saved in |fbsRoads|.
   std::vector<feature::FeatureBuilder> fbsRoads;
-  size_t constexpr kReserveSize = 4*1024;
+  size_t constexpr kReserveSize = 4 * 1024;
   fbsRoads.reserve(kReserveSize);
 
   size_t transformed = 0;
@@ -296,10 +282,12 @@ void MiniRoundaboutTransformer::ProcessRoundabouts(std::function<void (feature::
     fn(fb.second);
 }
 
-double DistanceOnPlain(m2::PointD const & a, m2::PointD const & b) { return a.Length(b); }
+double DistanceOnPlain(m2::PointD const & a, m2::PointD const & b)
+{
+  return a.Length(b);
+}
 
-m2::PointD GetPointAtDistFromTarget(m2::PointD const & source, m2::PointD const & target,
-                                    double dist)
+m2::PointD GetPointAtDistFromTarget(m2::PointD const & source, m2::PointD const & target, double dist)
 {
   double const len = DistanceOnPlain(source, target);
   if (len < dist)
@@ -309,8 +297,8 @@ m2::PointD GetPointAtDistFromTarget(m2::PointD const & source, m2::PointD const
   return (source + target * k) / (1.0 + k);
 }
 
-std::vector<m2::PointD> PointToPolygon(m2::PointD const & center, double radiusMercator,
-                                       size_t verticesCount, double initAngleDeg)
+std::vector<m2::PointD> PointToPolygon(m2::PointD const & center, double radiusMercator, size_t verticesCount,
+                                       double initAngleDeg)
 {
   CHECK_GREATER(verticesCount, 2, ());
   CHECK_GREATER(radiusMercator, 0.0, ());
@@ -323,8 +311,7 @@ std::vector<m2::PointD> PointToPolygon(m2::PointD const & center, double radiusM
 
   for (size_t i = 0; i < verticesCount; ++i)
   {
-    vertices.emplace_back(center.x + radiusMercator * cos(angle),
-                          center.y + radiusMercator * sin(angle));
+    vertices.emplace_back(center.x + radiusMercator * cos(angle), center.y + radiusMercator * sin(angle));
     angle += kAngularPitch;
   }
 
diff --git a/generator/mini_roundabout_transformer.hpp b/generator/mini_roundabout_transformer.hpp
index 76bdd2842..9a5792bdd 100644
--- a/generator/mini_roundabout_transformer.hpp
+++ b/generator/mini_roundabout_transformer.hpp
@@ -25,39 +25,35 @@ public:
   MiniRoundaboutTransformer(std::vector<MiniRoundaboutInfo> const & data,
                             feature::AffiliationInterface const & affiliation);
   MiniRoundaboutTransformer(std::vector<MiniRoundaboutInfo> const & data,
-                            feature::AffiliationInterface const & affiliation,
-                            double radiusMeters);
+                            feature::AffiliationInterface const & affiliation, double radiusMeters);
 
   void AddRoad(feature::FeatureBuilder && road);
 
   /// \brief Generates ways with junction=roundabout.
   /// These features are obtained from points with highway=mini_roundabout.
-  void ProcessRoundabouts(std::function<void (feature::FeatureBuilder const &)> const & fn);
+  void ProcessRoundabouts(std::function<void(feature::FeatureBuilder const &)> const & fn);
 
   void SetLeftHandTraffic(bool isLeftHand) { m_leftHandTraffic = isLeftHand; }
 
 private:
   using PointsT = feature::FeatureBuilder::PointSeq;
-  feature::FeatureBuilder CreateRoundaboutFb(PointsT && way,uint32_t roadType);
+  feature::FeatureBuilder CreateRoundaboutFb(PointsT && way, uint32_t roadType);
 
   /// \brief Splits |road| in two parts: part before the |roundabout| and after.
   /// Returns second road to |newRoads| - the artificial one.
-  PointsT CreateSurrogateRoad(
-      RoundaboutUnit const & roundaboutOnRoad, PointsT & roundaboutCircle,
-      PointsT & road, PointsT::iterator & itPointUpd) const;
+  PointsT CreateSurrogateRoad(RoundaboutUnit const & roundaboutOnRoad, PointsT & roundaboutCircle, PointsT & road,
+                              PointsT::iterator & itPointUpd) const;
 
   /// \brief Creates new point and adds it to |roundabout| circle and to the |road|.
-  bool AddRoundaboutToRoad(RoundaboutUnit const & roundaboutOnRoad,
-                           PointsT & roundaboutCircle, PointsT & road,
+  bool AddRoundaboutToRoad(RoundaboutUnit const & roundaboutOnRoad, PointsT & roundaboutCircle, PointsT & road,
                            std::vector<feature::FeatureBuilder> & newRoads) const;
 
-
   std::vector<MiniRoundaboutInfo> const & m_roundabouts;
   double const m_radiusMercator = 0.0;
   feature::AffiliationInterface const * m_affiliation = nullptr;
   std::unordered_map<base::GeoObjectId, feature::FeatureBuilder> m_roads;
   // Skip 2 bytes to satisfy base::GeoObjectId constraints.
-  uint64_t m_newWayId = 1ULL << (63-16);
+  uint64_t m_newWayId = 1ULL << (63 - 16);
   bool m_leftHandTraffic = false;
 };
 
@@ -66,14 +62,13 @@ double DistanceOnPlain(m2::PointD const & a, m2::PointD const & b);
 
 /// \returns The point that is located on the segment (|source|, |target|) and lies in |dist|
 /// or less from |target|.
-m2::PointD GetPointAtDistFromTarget(m2::PointD const & source, m2::PointD const & target,
-                                    double dist);
+m2::PointD GetPointAtDistFromTarget(m2::PointD const & source, m2::PointD const & target, double dist);
 
 /// \brief Creates a regular polygon with |verticesCount| inscribed in a circle with |center| and
 /// |radiusMercator|. The polygon is rotated by an angle |initAngleDeg| CCW.
 /// \returns vector of polygon vertices.
-std::vector<m2::PointD> PointToPolygon(m2::PointD const & center, double radiusMercator,
-                                       size_t verticesCount = 12, double initAngleDeg = 0.0);
+std::vector<m2::PointD> PointToPolygon(m2::PointD const & center, double radiusMercator, size_t verticesCount = 12,
+                                       double initAngleDeg = 0.0);
 
 /// \brief Inserts point (which lies on circle) between 2 points already present in the circle.
 void AddPointToCircle(std::vector<m2::PointD> & circle, m2::PointD const & point);
diff --git a/generator/osm2meta.cpp b/generator/osm2meta.cpp
index 26e3537b1..e225cbe90 100644
--- a/generator/osm2meta.cpp
+++ b/generator/osm2meta.cpp
@@ -1,8 +1,8 @@
 #include "generator/osm2meta.hpp"
 
 #include "indexer/classificator.hpp"
-#include "indexer/ftypes_matcher.hpp"
 #include "indexer/editable_map_object.hpp"
+#include "indexer/ftypes_matcher.hpp"
 
 #include "platform/measurement_utils.hpp"
 
@@ -61,6 +61,7 @@ public:
     RemoveDuplicatesAndKeepOrder(m_values);
     return strings::JoinStrings(m_values, kOSMMultivalueDelimiter);
   }
+
 private:
   std::vector<std::string> m_values;
 };
@@ -68,8 +69,8 @@ private:
 bool IsNoNameNoAddressBuilding(FeatureParams const & params)
 {
   static uint32_t const buildingType = classif().GetTypeByPath({"building"});
-  return params.m_types.size() == 1 && params.m_types[0] == buildingType &&
-         params.house.Get().empty() && params.name.IsEmpty();
+  return params.m_types.size() == 1 && params.m_types[0] == buildingType && params.house.Get().empty() &&
+         params.name.IsEmpty();
 }
 
 bool Prefix2Double(std::string const & str, double & d)
@@ -103,10 +104,8 @@ std::string MetadataTagProcessorImpl::ValidateAndFormat_operator(std::string con
 {
   using namespace ftypes;
   auto const & t = m_params.m_types;
-  if (IsATMChecker::Instance()(t) ||
-      IsRecyclingCentreChecker::Instance()(t) ||
-      IsRecyclingContainerChecker::Instance()(t) ||
-      IsPostPoiChecker::Instance()(t) ||
+  if (IsATMChecker::Instance()(t) || IsRecyclingCentreChecker::Instance()(t) ||
+      IsRecyclingContainerChecker::Instance()(t) || IsPostPoiChecker::Instance()(t) ||
       IsOperatorOthersPoiChecker::Instance()(t))
   {
     return v;
@@ -223,7 +222,10 @@ std::string MetadataTagProcessorImpl::ValidateAndFormat_email(std::string const
   return v;
 }
 
-std::string MetadataTagProcessorImpl::ValidateAndFormat_postcode(std::string const & v) { return v; }
+std::string MetadataTagProcessorImpl::ValidateAndFormat_postcode(std::string const & v)
+{
+  return v;
+}
 
 std::string MetadataTagProcessorImpl::ValidateAndFormat_flats(std::string const & v)
 {
@@ -335,16 +337,16 @@ std::string MetadataTagProcessorImpl::ValidateAndFormat_panoramax(std::string v)
 {
   static auto const s_panoramaxRegex = std::regex(R"(^([a-z0-9]{8}(-[a-z0-9]{4}){3}-[a-z0-9]{12})$)");
 
-    if (std::regex_match(v, s_panoramaxRegex))
+  if (std::regex_match(v, s_panoramaxRegex))
     return v;
-    url::Url const parsedUrl = url::Url::FromString(v);
-    if (const std::string* paramValue = parsedUrl.GetParamValue("pic"))
-    {
-        if (std::regex_match(*paramValue, s_panoramaxRegex))
-            return v;
-    }
-    LOG(LDEBUG, ("Invalid Panoramax tag value:", v));
-    return {};
+  url::Url const parsedUrl = url::Url::FromString(v);
+  if (std::string const * paramValue = parsedUrl.GetParamValue("pic"))
+  {
+    if (std::regex_match(*paramValue, s_panoramaxRegex))
+      return v;
+  }
+  LOG(LDEBUG, ("Invalid Panoramax tag value:", v));
+  return {};
 }
 
 std::string MetadataTagProcessorImpl::ValidateAndFormat_airport_iata(std::string const & v) const
@@ -409,7 +411,8 @@ std::string MetadataTagProcessorImpl::ValidateAndFormat_duration(std::string con
   if (!ftypes::IsWayWithDurationChecker::Instance()(m_params.m_types))
     return {};
 
-  auto const format = [](double hours) -> std::string {
+  auto const format = [](double hours) -> std::string
+  {
     if (AlmostEqualAbs(hours, 0.0, 1e-5))
       return {};
 
@@ -419,7 +422,8 @@ std::string MetadataTagProcessorImpl::ValidateAndFormat_duration(std::string con
     return ss.str();
   };
 
-  auto const readNumber = [&v](size_t & pos) -> std::optional<uint32_t> {
+  auto const readNumber = [&v](size_t & pos) -> std::optional<uint32_t>
+  {
     uint32_t number = 0;
     size_t const startPos = pos;
     while (pos < v.size() && isdigit(v[pos]))
@@ -435,7 +439,8 @@ std::string MetadataTagProcessorImpl::ValidateAndFormat_duration(std::string con
     return {number};
   };
 
-  auto const convert = [](char type, uint32_t number) -> std::optional<double> {
+  auto const convert = [](char type, uint32_t number) -> std::optional<double>
+  {
     switch (type)
     {
     case 'H': return number;
@@ -509,7 +514,6 @@ std::string MetadataTagProcessorImpl::ValidateAndFormat_duration(std::string con
   return format(hours);
 }
 
-
 MetadataTagProcessor::~MetadataTagProcessor()
 {
   if (!m_description.IsEmpty())
@@ -622,7 +626,7 @@ void MetadataTagProcessor::operator()(std::string const & k, std::string const &
   case Metadata::FMD_NETWORK: valid = ValidateAndFormat_operator(v); break;
   // Metadata types we do not get from OSM.
   case Metadata::FMD_CUISINE:
-  case Metadata::FMD_DESCRIPTION:   // processed separately
+  case Metadata::FMD_DESCRIPTION:  // processed separately
   case Metadata::FMD_TEST_ID:
   case Metadata::FMD_CUSTOM_IDS:
   case Metadata::FMD_PRICE_RATES:
diff --git a/generator/osm2meta.hpp b/generator/osm2meta.hpp
index f9bd112ab..6c29019cb 100644
--- a/generator/osm2meta.hpp
+++ b/generator/osm2meta.hpp
@@ -10,31 +10,31 @@ struct MetadataTagProcessorImpl
   MetadataTagProcessorImpl(FeatureBuilderParams & params) : m_params(params) {}
 
   std::string ValidateAndFormat_maxspeed(std::string const & v) const;
-  static std::string ValidateAndFormat_stars(std::string const & v) ;
+  static std::string ValidateAndFormat_stars(std::string const & v);
   std::string ValidateAndFormat_operator(std::string const & v) const;
-  static std::string ValidateAndFormat_url(std::string const & v) ;
-  static std::string ValidateAndFormat_phone(std::string const & v) ;
-  static std::string ValidateAndFormat_opening_hours(std::string const & v) ;
-  static std::string ValidateAndFormat_date(std::string const & v) ;
+  static std::string ValidateAndFormat_url(std::string const & v);
+  static std::string ValidateAndFormat_phone(std::string const & v);
+  static std::string ValidateAndFormat_opening_hours(std::string const & v);
+  static std::string ValidateAndFormat_date(std::string const & v);
   std::string ValidateAndFormat_ele(std::string const & v) const;
-  static std::string ValidateAndFormat_destination(std::string const & v) ;
-  static std::string ValidateAndFormat_local_ref(std::string const & v) ;
-  static std::string ValidateAndFormat_destination_ref(std::string const & v) ;
-  static std::string ValidateAndFormat_junction_ref(std::string const & v) ;
-  static std::string ValidateAndFormat_turn_lanes(std::string const & v) ;
-  static std::string ValidateAndFormat_turn_lanes_forward(std::string const & v) ;
-  static std::string ValidateAndFormat_turn_lanes_backward(std::string const & v) ;
-  static std::string ValidateAndFormat_email(std::string const & v) ;
-  static std::string ValidateAndFormat_postcode(std::string const & v) ;
-  static std::string ValidateAndFormat_flats(std::string const & v) ;
-  static std::string ValidateAndFormat_internet(std::string v) ;
-  static std::string ValidateAndFormat_height(std::string const & v) ;
-  static std::string ValidateAndFormat_building_levels(std::string v) ;
-  static std::string ValidateAndFormat_level(std::string v) ;
-  static std::string ValidateAndFormat_denomination(std::string const & v) ;
-  static std::string ValidateAndFormat_wikipedia(std::string v) ;
-  static std::string ValidateAndFormat_wikimedia_commons(std::string v) ;
-  static std::string ValidateAndFormat_panoramax(std::string v) ;
+  static std::string ValidateAndFormat_destination(std::string const & v);
+  static std::string ValidateAndFormat_local_ref(std::string const & v);
+  static std::string ValidateAndFormat_destination_ref(std::string const & v);
+  static std::string ValidateAndFormat_junction_ref(std::string const & v);
+  static std::string ValidateAndFormat_turn_lanes(std::string const & v);
+  static std::string ValidateAndFormat_turn_lanes_forward(std::string const & v);
+  static std::string ValidateAndFormat_turn_lanes_backward(std::string const & v);
+  static std::string ValidateAndFormat_email(std::string const & v);
+  static std::string ValidateAndFormat_postcode(std::string const & v);
+  static std::string ValidateAndFormat_flats(std::string const & v);
+  static std::string ValidateAndFormat_internet(std::string v);
+  static std::string ValidateAndFormat_height(std::string const & v);
+  static std::string ValidateAndFormat_building_levels(std::string v);
+  static std::string ValidateAndFormat_level(std::string v);
+  static std::string ValidateAndFormat_denomination(std::string const & v);
+  static std::string ValidateAndFormat_wikipedia(std::string v);
+  static std::string ValidateAndFormat_wikimedia_commons(std::string v);
+  static std::string ValidateAndFormat_panoramax(std::string v);
   std::string ValidateAndFormat_airport_iata(std::string const & v) const;
   static std::string ValidateAndFormat_brand(std::string const & v);
   std::string ValidateAndFormat_duration(std::string const & v) const;
diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp
index f5a1a1855..09f871139 100644
--- a/generator/osm2type.cpp
+++ b/generator/osm2type.cpp
@@ -208,29 +208,23 @@ private:
   static bool IsNegative(string const & value)
   {
     for (char const * s : {"no", "none", "false"})
-    {
       if (value == s)
         return true;
-    }
     return false;
   }
   static bool IsNegativeRouting(string const & value)
   {
     for (char const * s : {"use_sidepath", "separate"})
-    {
       if (value == s)
         return true;
-    }
     return IsNegative(value);
   }
   static bool IsPositiveRouting(string const & value)
   {
     // This values neither positive and neither negative.
     for (char const * s : {"unknown", "dismount"})
-    {
       if (value == s)
         return false;
-    }
     return !IsNegativeRouting(value);
   }
 
@@ -250,10 +244,10 @@ public:
     Lit,
     NoFoot,
     YesFoot,
-    NoSidewalk,   // no dedicated sidewalk, doesn't mean that foot is not allowed, just lower weight
+    NoSidewalk,  // no dedicated sidewalk, doesn't mean that foot is not allowed, just lower weight
     NoBicycle,
     YesBicycle,
-    NoCycleway,   // no dedicated cycleway, doesn't mean that bicycle is not allowed, just lower weight
+    NoCycleway,  // no dedicated cycleway, doesn't mean that bicycle is not allowed, just lower weight
     BicycleBidir,
     SurfacePavedGood,
     SurfacePavedBad,
@@ -281,37 +275,37 @@ public:
     Classificator const & c = classif();
 
     static std::map<Type, std::vector<string>> const kTypeToName = {
-        {Entrance,           {"entrance"}},
-        {Highway,            {"highway"}},
-        {Address,            {"building", "address"}},
-        {OneWay,             {"hwtag", "oneway"}},
-        {Private,            {"hwtag", "private"}},
-        {Lit,                {"hwtag", "lit"}},
-        {NoFoot,             {"hwtag", "nofoot"}},
-        {YesFoot,            {"hwtag", "yesfoot"}},
-        {NoSidewalk,         {"hwtag", "nosidewalk"}},
-        {NoBicycle,          {"hwtag", "nobicycle"}},
-        {YesBicycle,         {"hwtag", "yesbicycle"}},
-        {NoCycleway,         {"hwtag", "nocycleway"}},
-        {BicycleBidir,       {"hwtag", "bidir_bicycle"}},
-        {SurfacePavedGood,   {"psurface", "paved_good"}},
-        {SurfacePavedBad,    {"psurface", "paved_bad"}},
+        {Entrance, {"entrance"}},
+        {Highway, {"highway"}},
+        {Address, {"building", "address"}},
+        {OneWay, {"hwtag", "oneway"}},
+        {Private, {"hwtag", "private"}},
+        {Lit, {"hwtag", "lit"}},
+        {NoFoot, {"hwtag", "nofoot"}},
+        {YesFoot, {"hwtag", "yesfoot"}},
+        {NoSidewalk, {"hwtag", "nosidewalk"}},
+        {NoBicycle, {"hwtag", "nobicycle"}},
+        {YesBicycle, {"hwtag", "yesbicycle"}},
+        {NoCycleway, {"hwtag", "nocycleway"}},
+        {BicycleBidir, {"hwtag", "bidir_bicycle"}},
+        {SurfacePavedGood, {"psurface", "paved_good"}},
+        {SurfacePavedBad, {"psurface", "paved_bad"}},
         {SurfaceUnpavedGood, {"psurface", "unpaved_good"}},
-        {SurfaceUnpavedBad,  {"psurface", "unpaved_bad"}},
-        {HasParts,           {"building", "has_parts"}},
-        {NoCar,              {"hwtag", "nocar"}},
-        {YesCar,             {"hwtag", "yescar"}},
-        {InternetAny,        {"internet_access"}},
-        {Wlan,               {"internet_access", "wlan"}},
-        {RailwayStation,     {"railway", "station"}},
-        {SubwayStation,      {"railway", "station", "subway"}},
-        {WheelchairAny,      {"wheelchair"}},
-        {WheelchairYes,      {"wheelchair", "yes"}},
-        {BarrierGate,        {"barrier", "gate"}},
-        {Toll,               {"hwtag", "toll"}},
-        {BicycleOnedir,      {"hwtag", "onedir_bicycle"}},
-        {Ferry,              {"route", "ferry"}},
-        {ShuttleTrain,       {"route", "shuttle_train"}},
+        {SurfaceUnpavedBad, {"psurface", "unpaved_bad"}},
+        {HasParts, {"building", "has_parts"}},
+        {NoCar, {"hwtag", "nocar"}},
+        {YesCar, {"hwtag", "yescar"}},
+        {InternetAny, {"internet_access"}},
+        {Wlan, {"internet_access", "wlan"}},
+        {RailwayStation, {"railway", "station"}},
+        {SubwayStation, {"railway", "station", "subway"}},
+        {WheelchairAny, {"wheelchair"}},
+        {WheelchairYes, {"wheelchair", "yes"}},
+        {BarrierGate, {"barrier", "gate"}},
+        {Toll, {"hwtag", "toll"}},
+        {BicycleOnedir, {"hwtag", "onedir_bicycle"}},
+        {Ferry, {"route", "ferry"}},
+        {ShuttleTrain, {"route", "shuttle_train"}},
     };
 
     m_types.resize(static_cast<size_t>(Count));
@@ -319,10 +313,7 @@ public:
       m_types[static_cast<size_t>(kv.first)] = c.GetTypeByPath(kv.second);
   }
 
-  uint32_t Get(CachedTypes::Type t) const
-  {
-    return m_types[static_cast<size_t>(t)];
-  }
+  uint32_t Get(CachedTypes::Type t) const { return m_types[static_cast<size_t>(t)]; }
 
   bool IsHighway(uint32_t t) const
   {
@@ -336,10 +327,7 @@ public:
     return t == Get(Ferry) || t == Get(ShuttleTrain);
   }
 
-  bool IsRailwayStation(uint32_t t) const
-  {
-    return t == Get(RailwayStation);
-  }
+  bool IsRailwayStation(uint32_t t) const { return t == Get(RailwayStation); }
 
   bool IsSubwayStation(uint32_t t) const
   {
@@ -399,10 +387,8 @@ void MatchTypes(OsmElement * p, FeatureBuilderParams & params, TypesFilterFnT co
 
   std::vector<generator::TypeStrings> matchedTypes;
   for (auto const & [typeString, rule] : rules)
-  {
     if (rule.Matches(p->m_tags))
       matchedTypes.push_back(typeString);
-  }
 
   LeaveLongestTypes(matchedTypes);
 
@@ -436,72 +422,72 @@ string MatchCity(ms::LatLon const & ll)
   // Draw boundary around metro with http://bboxfinder.com (set to Lon/Lat)
   // City name should be equal with railway-station-subway-CITY classifier types.
   static std::map<string, m2::RectD> const cities = {
-      {"adana", {35.216442,36.934693,35.425525,37.065481}},
+      {"adana", {35.216442, 36.934693, 35.425525, 37.065481}},
       {"algiers", {2.949538, 36.676777, 3.256914, 36.826518}},
       {"almaty", {76.7223358154, 43.1480920701, 77.123336792, 43.4299852362}},
       {"amsterdam", {4.65682983398, 52.232846171, 5.10040283203, 52.4886341706}},
       {"ankara", {32.4733, 39.723, 33.0499, 40.086}},
       {"athens", {23.518075, 37.849188, 23.993853, 38.129109}},
-      {"baku", {49.7315,40.319728,49.978006,40.453619}},
+      {"baku", {49.7315, 40.319728, 49.978006, 40.453619}},
       {"bangkok", {100.159606934, 13.4363737155, 100.909423828, 14.3069694978}},
       {"barcelona", {1.94458007812, 41.2489025224, 2.29614257812, 41.5414776668}},
       {"beijing", {115.894775391, 39.588757277, 117.026367187, 40.2795256688}},
       {"berlin", {13.061007, 52.290099, 13.91399, 52.760803}},
       {"boston", {-71.2676239014, 42.2117365893, -70.8879089355, 42.521711682}},
-      {"bengalore", {77.393079,12.807501,77.806439,13.17014}},
-      {"bilbao", {-3.129730,43.202673,-2.859879,43.420011}},
+      {"bengalore", {77.393079, 12.807501, 77.806439, 13.17014}},
+      {"bilbao", {-3.129730, 43.202673, -2.859879, 43.420011}},
       {"brasilia", {-48.334467, -16.036627, -47.358264, -15.50321}},
-      {"brescia", {10.128068,45.478792,10.312432,45.595665}},
+      {"brescia", {10.128068, 45.478792, 10.312432, 45.595665}},
       {"brussels", {4.2448425293, 50.761653413, 4.52499389648, 50.9497757762}},
       {"bucharest", {25.905198, 44.304636, 26.29032, 44.588137}},
       {"budapest", {18.7509155273, 47.3034470439, 19.423828125, 47.7023684666}},
       {"buenos_aires", {-58.9910888672, -35.1221551064, -57.8045654297, -34.2685661867}},
-      {"bursa", {28.771425,40.151234,29.297395,40.315832}},
+      {"bursa", {28.771425, 40.151234, 29.297395, 40.315832}},
       {"cairo", {30.3232, 29.6163, 31.9891, 30.6445}},
-      {"caracas", {-67.109144,10.317298,-66.754835,10.551623}},
-      {"catania", {14.94978,37.443756,15.126343,37.540221}},
-      {"changchun", {124.6144,43.6274,125.9163,44.1578}},
-      {"chengdu", {103.6074,30.3755,104.4863,31.0462}},
+      {"caracas", {-67.109144, 10.317298, -66.754835, 10.551623}},
+      {"catania", {14.94978, 37.443756, 15.126343, 37.540221}},
+      {"changchun", {124.6144, 43.6274, 125.9163, 44.1578}},
+      {"chengdu", {103.6074, 30.3755, 104.4863, 31.0462}},
       {"chicago", {-88.3163452148, 41.3541338721, -87.1270751953, 42.2691794924}},
-      {"chongqing", {105.9873,29.1071,107.0255,30.0102}},
-      {"dalian", {121.284679,38.752352,121.90678,39.167744}},
+      {"chongqing", {105.9873, 29.1071, 107.0255, 30.0102}},
+      {"dalian", {121.284679, 38.752352, 121.90678, 39.167744}},
       {"delhi", {76.8026733398, 28.3914003758, 77.5511169434, 28.9240352884}},
       {"dnepro", {34.7937011719, 48.339820521, 35.2798461914, 48.6056737841}},
       {"dubai", {55.01953125, 24.9337667594, 55.637512207, 25.6068559937}},
       {"ekb", {60.3588867188, 56.6622647682, 61.0180664062, 57.0287738515}},
       {"frankfurt", {8.36334228516, 49.937079757, 8.92364501953, 50.2296379179}},
-      {"fukuoka", {130.285484,33.544873,130.51757,33.70268}},
-      {"glasgow", {-4.542417,55.753178,-3.943662,55.982611}},
+      {"fukuoka", {130.285484, 33.544873, 130.51757, 33.70268}},
+      {"glasgow", {-4.542417, 55.753178, -3.943662, 55.982611}},
       {"guangzhou", {112.560424805, 22.4313401564, 113.766174316, 23.5967112789}},
       {"hamburg", {9.75860595703, 53.39151869, 10.2584838867, 53.6820686709}},
       {"helsinki", {24.3237304688, 59.9989861206, 25.48828125, 60.44638186}},
-      {"hiroshima", {132.256736,34.312824,132.621345,34.55182}},
-      {"hongkong", {113.934086,22.150767,114.424924,22.515215}},
-      {"isfahan", {51.472344,32.504644,51.865369,32.820396}},
+      {"hiroshima", {132.256736, 34.312824, 132.621345, 34.55182}},
+      {"hongkong", {113.934086, 22.150767, 114.424924, 22.515215}},
+      {"isfahan", {51.472344, 32.504644, 51.865369, 32.820396}},
       {"istanbul", {28.4155, 40.7172, 29.7304, 41.4335}},
-      {"izmir", {26.953591,38.262044,27.318199,38.543469}},
+      {"izmir", {26.953591, 38.262044, 27.318199, 38.543469}},
       {"kazan", {48.8067626953, 55.6372985742, 49.39453125, 55.9153515154}},
       {"kharkiv", {36.078138, 49.854027, 36.51107, 50.141277}},
       {"kiev", {30.1354980469, 50.2050332649, 31.025390625, 50.6599083609}},
-      {"kobe", {135.066888,34.617728,135.32232,34.776364}},
-      {"kolkata", {88.240623,22.450324,88.458955,22.632536}},
+      {"kobe", {135.066888, 34.617728, 135.32232, 34.776364}},
+      {"kolkata", {88.240623, 22.450324, 88.458955, 22.632536}},
       {"koln", {6.7943572998, 50.8445380881, 7.12669372559, 51.0810964366}},
-      {"kunming", {102.0983,24.3319,103.5969,25.7119}},
+      {"kunming", {102.0983, 24.3319, 103.5969, 25.7119}},
       {"kyoto", {135.619598, 34.874916, 135.878442, 35.113709}},
-      {"lausanne", {6.583868,46.504301,6.720813,46.602578}},
-      {"lille", {2.789132,50.441626,3.329113,50.794609}},
+      {"lausanne", {6.583868, 46.504301, 6.720813, 46.602578}},
+      {"lille", {2.789132, 50.441626, 3.329113, 50.794609}},
       {"lima", {-77.2750854492, -12.3279274859, -76.7999267578, -11.7988014362}},
       {"lisboa", {-9.42626953125, 38.548165423, -8.876953125, 38.9166815364}},
       {"london", {-0.4833984375, 51.3031452592, 0.2197265625, 51.6929902115}},
       {"la", {-118.944112, 32.806553, -117.644787, 34.822766}},
       {"lyon", {4.5741, 45.5842, 5.1603, 45.9393}},
       {"madrid", {-4.00451660156, 40.1536868578, -3.32885742188, 40.6222917831}},
-      {"malaga", {-5.611777,36.310352,-3.765967,37.282445}},
-      {"manila", {120.936229,14.550825,121.026167,14.639547}},
-      {"maracaibo", {-71.812942,10.570632,-71.581199,10.758897}},
-      {"mashhad", {59.302159,36.13267,59.83225,36.530945}},
+      {"malaga", {-5.611777, 36.310352, -3.765967, 37.282445}},
+      {"manila", {120.936229, 14.550825, 121.026167, 14.639547}},
+      {"maracaibo", {-71.812942, 10.570632, -71.581199, 10.758897}},
+      {"mashhad", {59.302159, 36.13267, 59.83225, 36.530945}},
       {"mecca", {39.663307, 21.274985, 40.056236, 21.564195}},
-      {"medellin", {-75.719423,6.162617,-75.473408,6.376421}},
+      {"medellin", {-75.719423, 6.162617, -75.473408, 6.376421}},
       {"mexico", {-99.3630981445, 19.2541083164, -98.879699707, 19.5960192403}},
       {"milan", {9.02252197266, 45.341528405, 9.35760498047, 45.5813674681}},
       {"minsk", {27.2845458984, 53.777934972, 27.8393554688, 54.0271334441}},
@@ -509,43 +495,43 @@ string MatchCity(ms::LatLon const & ll)
       {"moscow", {36.9964599609, 55.3962717136, 38.1884765625, 56.1118730004}},
       {"mumbai", {72.7514648437, 18.8803004445, 72.9862976074, 19.2878132403}},
       {"munchen", {11.3433837891, 47.9981928195, 11.7965698242, 48.2730267576}},
-      {"nagoya", {136.791969,35.025951,137.060899,35.260229}},
+      {"nagoya", {136.791969, 35.025951, 137.060899, 35.260229}},
       {"newyork", {-74.4104003906, 40.4134960497, -73.4600830078, 41.1869224229}},
       {"nnov", {43.6431884766, 56.1608472541, 44.208984375, 56.4245355509}},
       {"novosibirsk", {82.4578857422, 54.8513152597, 83.2983398438, 55.2540770671}},
       {"osaka", {134.813232422, 34.1981730963, 136.076660156, 35.119908571}},
       {"oslo", {10.3875732422, 59.7812868211, 10.9286499023, 60.0401604652}},
-      {"palma", {2.556669,39.503227,2.841284,39.670445}},
+      {"palma", {2.556669, 39.503227, 2.841284, 39.670445}},
       {"panama", {-79.633827, 8.880788, -79.367367, 9.149179}},
       {"paris", {2.09014892578, 48.6637569323, 2.70538330078, 49.0414689141}},
       {"philadelphia", {-75.276761, 39.865446, -74.964493, 40.137768}},
-      {"porto", {-8.758979,41.095783,-8.540001,41.378495}},
+      {"porto", {-8.758979, 41.095783, -8.540001, 41.378495}},
       {"pyongyang", {125.48888, 38.780932, 126.12748, 39.298738}},
       {"qingdao", {119.708, 35.668, 120.758, 36.480}},
-      {"rennes", {-2.28897,47.934093,-1.283944,48.379636}},
+      {"rennes", {-2.28897, 47.934093, -1.283944, 48.379636}},
       {"rio", {-43.4873199463, -23.0348745407, -43.1405639648, -22.7134898498}},
       {"roma", {12.3348999023, 41.7672146942, 12.6397705078, 42.0105298189}},
       {"rotterdam", {3.940749, 51.842118, 4.601808, 52.004528}},
       {"samara", {50.001145, 53.070867, 50.434992, 53.339216}},
       {"santiago", {-71.015625, -33.8133843291, -70.3372192383, -33.1789392606}},
-      {"santo_domingo", {-70.029669,18.390645,-69.831571,18.573966}},
+      {"santo_domingo", {-70.029669, 18.390645, -69.831571, 18.573966}},
       {"saopaulo", {-46.9418334961, -23.8356009866, -46.2963867187, -23.3422558351}},
-      {"sapporo", {141.160343,42.945651,141.577136,43.243986}},
-      {"sendai", {140.469472,38.050849,141.260304,38.454699}},
+      {"sapporo", {141.160343, 42.945651, 141.577136, 43.243986}},
+      {"sendai", {140.469472, 38.050849, 141.260304, 38.454699}},
       {"seoul", {126.540527344, 37.3352243593, 127.23815918, 37.6838203267}},
       {"sf", {-122.72277832, 37.1690715771, -121.651611328, 38.0307856938}},
       {"shanghai", {119.849853516, 30.5291450367, 122.102050781, 32.1523618947}},
-      {"shenzhen", {113.747866,22.464779,114.477038,22.816068}},
-      {"shiraz", {52.382254,29.498738,52.667513,29.840346}},
+      {"shenzhen", {113.747866, 22.464779, 114.477038, 22.816068}},
+      {"shiraz", {52.382254, 29.498738, 52.667513, 29.840346}},
       {"singapore", {103.624420166, 1.21389843409, 104.019927979, 1.45278619819}},
       {"sofia", {23.195085, 42.574041, 23.503569, 42.835375}},
       {"spb", {29.70703125, 59.5231755354, 31.3110351562, 60.2725145948}},
       {"stockholm", {17.5726318359, 59.1336814082, 18.3966064453, 59.5565918857}},
       {"stuttgart", {9.0877532959, 48.7471343254, 9.29306030273, 48.8755544436}},
       {"sydney", {150.42755127, -34.3615762875, 151.424560547, -33.4543597895}},
-      {"tabriz", {46.18432,38.015584,46.4126,38.15366}},
+      {"tabriz", {46.18432, 38.015584, 46.4126, 38.15366}},
       {"taipei", {121.368713379, 24.9312761454, 121.716156006, 25.1608229799}},
-      {"taoyuan", {110.8471,28.4085,111.6109,29.4019}},
+      {"taoyuan", {110.8471, 28.4085, 111.6109, 29.4019}},
       {"tashkent", {69.12171, 41.163421, 69.476967, 41.398638}},
       {"tbilisi", {44.596922, 41.619315, 45.019694, 41.843421}},
       {"tehran", {50.6575, 35.353216, 52.007904, 35.974672}},
@@ -555,17 +541,15 @@ string MatchCity(ms::LatLon const & ll)
       {"vienna", {16.0894775391, 48.0633965378, 16.6387939453, 48.3525987075}},
       {"warszawa", {20.7202148438, 52.0322181041, 21.3024902344, 52.4091212523}},
       {"washington", {-77.4920654297, 38.5954071994, -76.6735839844, 39.2216149801}},
-      {"wuhan", {113.6925,29.972,115.0769,31.3622}},
+      {"wuhan", {113.6925, 29.972, 115.0769, 31.3622}},
       {"yerevan", {44.359899, 40.065411, 44.645352, 40.26398}},
       {"yokohama", {139.464781, 35.312501, 139.776935, 35.592738}},
   };
 
   m2::PointD const pt(ll.m_lon, ll.m_lat);
   for (auto const & city : cities)
-  {
     if (city.second.IsPointInside(pt))
       return city.first;
-  }
   return {};
 }
 
@@ -573,17 +557,16 @@ string DetermineSurfaceAndHighwayType(OsmElement * p)
 {
   string surface;
   string smoothness;
-  double surfaceGrade = 2; // default is "normal"
+  double surfaceGrade = 2;  // default is "normal"
   string highway;
   string trackGrade;
 
   for (auto const & tag : p->m_tags)
-  {
     if (tag.m_key == "surface")
       surface = tag.m_value;
     else if (tag.m_key == "smoothness")
       smoothness = tag.m_value;
-    else if (tag.m_key == "surface:grade") // discouraged, 25k usages as of 2024
+    else if (tag.m_key == "surface:grade")  // discouraged, 25k usages as of 2024
       (void)strings::to_double(tag.m_value, surfaceGrade);
     else if (tag.m_key == "tracktype")
       trackGrade = tag.m_value;
@@ -591,36 +574,46 @@ string DetermineSurfaceAndHighwayType(OsmElement * p)
       highway = tag.m_value;
     else if (tag.m_key == "4wd_only" && (tag.m_value == "yes" || tag.m_value == "recommended"))
       return "unpaved_bad";
-  }
 
   // According to https://wiki.openstreetmap.org/wiki/Key:surface
   static base::StringIL pavedSurfaces = {
-      "asphalt", "cobblestone", "chipseal", "concrete", "grass_paver", "stone",
-      "metal", "paved", "paving_stones", "sett", "brick", "bricks", "unhewn_cobblestone", "wood"
-  };
+      "asphalt",       "cobblestone", "chipseal", "concrete", "grass_paver",        "stone", "metal", "paved",
+      "paving_stones", "sett",        "brick",    "bricks",   "unhewn_cobblestone", "wood"};
 
   // All not explicitly listed surface types are considered unpaved good, e.g. "compacted", "fine_gravel".
-  static base::StringIL badSurfaces = {
-      "cobblestone", "dirt", "earth", "soil", "grass", "gravel", "ground", "metal", "mud", "rock", "stone", "unpaved",
-      "pebblestone", "sand", "sett", "brick", "bricks", "snow", "stepping_stones", "unhewn_cobblestone",
-      "grass_paver", "wood", "woodchips"
-  };
+  static base::StringIL badSurfaces = {"cobblestone",
+                                       "dirt",
+                                       "earth",
+                                       "soil",
+                                       "grass",
+                                       "gravel",
+                                       "ground",
+                                       "metal",
+                                       "mud",
+                                       "rock",
+                                       "stone",
+                                       "unpaved",
+                                       "pebblestone",
+                                       "sand",
+                                       "sett",
+                                       "brick",
+                                       "bricks",
+                                       "snow",
+                                       "stepping_stones",
+                                       "unhewn_cobblestone",
+                                       "grass_paver",
+                                       "wood",
+                                       "woodchips"};
 
-  static base::StringIL veryBadSurfaces = {
-      "dirt", "earth", "soil", "grass", "ground", "mud", "rock", "sand", "snow",
-      "stepping_stones", "woodchips"
-  };
+  static base::StringIL veryBadSurfaces = {"dirt", "earth", "soil", "grass",           "ground",   "mud",
+                                           "rock", "sand",  "snow", "stepping_stones", "woodchips"};
 
   // surface=tartan/artificial_turf/clay are not used for highways (but for sport pitches etc).
 
-  static base::StringIL veryBadSmoothness = {
-      "very_bad",       "horrible",        "very_horrible", "impassable",
-      "robust_wheels", "high_clearance", "off_road_wheels", "rough"
-  };
+  static base::StringIL veryBadSmoothness = {"very_bad",      "horrible",       "very_horrible",   "impassable",
+                                             "robust_wheels", "high_clearance", "off_road_wheels", "rough"};
 
-  static base::StringIL midSmoothness = {
-      "unknown", "intermediate"
-  };
+  static base::StringIL midSmoothness = {"unknown", "intermediate"};
 
   auto const Has = [](base::StringIL const & il, string const & v)
   {
@@ -648,17 +641,15 @@ string DetermineSurfaceAndHighwayType(OsmElement * p)
   string const kPath = "path";
   if (highway == kFootway || highway == kPath || highway == kCycleway)
   {
-    static base::StringIL goodPathSmoothness = {
-        "excellent", "good", "very_good", "intermediate"
-    };
+    static base::StringIL goodPathSmoothness = {"excellent", "good", "very_good", "intermediate"};
     bool const hasQuality = !smoothness.empty() || !trackGrade.empty();
     bool const isGood = (smoothness.empty() || Has(goodPathSmoothness, smoothness)) &&
                         (trackGrade.empty() || trackGrade == "grade1" || trackGrade == "grade2");
     bool const isMed = (smoothness == "intermediate" || trackGrade == "grade2");
-    bool const hasTrailTags = p->HasTag("sac_scale") || p->HasTag("trail_visibility") ||
-                              p->HasTag("ford") || p->HasTag("informal", "yes");
-    bool const hasUrbanTags = p->HasTag("footway") || p->HasTag("segregated") ||
-                              (p->HasTag("lit") && !p->HasTag("lit", "no"));
+    bool const hasTrailTags =
+        p->HasTag("sac_scale") || p->HasTag("trail_visibility") || p->HasTag("ford") || p->HasTag("informal", "yes");
+    bool const hasUrbanTags =
+        p->HasTag("footway") || p->HasTag("segregated") || (p->HasTag("lit") && !p->HasTag("lit", "no"));
 
     bool isFormed = !surface.empty() && Has(pavedSurfaces, surface);
     // Treat "compacted" and "fine_gravel" as formed when in good or default quality.
@@ -671,7 +662,8 @@ string DetermineSurfaceAndHighwayType(OsmElement * p)
     auto const ConvertTo = [&](string const & newType)
     {
       // TODO(@pastk): remove redundant tags, e.g. if converted to cycleway then remove "bicycle=yes".
-      LOG(LDEBUG, ("Convert", DebugPrintID(*p), "to", newType, isFormed, isGood, hasTrailTags, hasUrbanTags, p->m_tags));
+      LOG(LDEBUG,
+          ("Convert", DebugPrintID(*p), "to", newType, isFormed, isGood, hasTrailTags, hasUrbanTags, p->m_tags));
       p->UpdateTag("highway", newType);
     };
 
@@ -683,23 +675,18 @@ string DetermineSurfaceAndHighwayType(OsmElement * p)
         if (toPath ? !isFormed : isFormed)
           ConvertTo(toType);
       }
-      else
+      else if (hasQuality && !isMed)
       {
-        if (hasQuality && !isMed)
-        {
-          if (toPath ? !isGood : isGood)
-            ConvertTo(toType);
-        }
-        else if (toPath ? (hasTrailTags && !hasUrbanTags) : (!hasTrailTags && hasUrbanTags))
+        if (toPath ? !isGood : isGood)
           ConvertTo(toType);
       }
+      else if (toPath ? (hasTrailTags && !hasUrbanTags) : (!hasTrailTags && hasUrbanTags))
+        ConvertTo(toType);
     };
 
     if (highway == kCycleway)
     {
-      static base::StringIL segregatedSidewalks = {
-          "right", "left", "both"
-      };
+      static base::StringIL segregatedSidewalks = {"right", "left", "both"};
       if (p->HasTag("segregated", "yes") || Has(segregatedSidewalks, p->GetTag("sidewalk")))
       {
         LOG(LDEBUG, ("Add a separate footway to", DebugPrintID(*p), p->m_tags));
@@ -713,7 +700,7 @@ string DetermineSurfaceAndHighwayType(OsmElement * p)
           // A non-segregated shared footway/cycleway.
           ConvertTo(kFootway);
           p->AddTag("bicycle", "designated");
-          ConvertPathOrFootway(true /* toPath */); // In case its unpaved.
+          ConvertPathOrFootway(true /* toPath */);  // In case its unpaved.
         }
       }
     }
@@ -767,12 +754,10 @@ string DetermineSurfaceAndHighwayType(OsmElement * p)
     if (Has(midSmoothness, smoothness))
     {
       if (isPaved)
-      {
         if (highway == "motorway" || highway == "trunk")
           return {};
         else
           isGood = false;
-      }
       else
         isGood = !Has(badSurfaces, surface);
     }
@@ -800,14 +785,12 @@ string DeterminePathGrade(OsmElement * p)
   if (scale.empty() && visibility.empty())
     return {};
 
-  static base::StringIL expertScales = {
-      "alpine_hiking", "demanding_alpine_hiking", "difficult_alpine_hiking"
-  };
+  static base::StringIL expertScales = {"alpine_hiking", "demanding_alpine_hiking", "difficult_alpine_hiking"};
   static base::StringIL difficultVisibilities = {
-      "bad", "poor" // poor is not official
+      "bad", "poor"  // poor is not official
   };
   static base::StringIL expertVisibilities = {
-      "horrible", "no", "very_bad" // very_bad is not official
+      "horrible", "no", "very_bad"  // very_bad is not official
   };
 
   if (base::IsExist(expertScales, scale) || base::IsExist(expertVisibilities, visibility))
@@ -1033,10 +1016,8 @@ bool IsCarDesignatedHighway(uint32_t type)
   {
   case ftypes::IsWayChecker::Motorway:
   case ftypes::IsWayChecker::Regular:
-  case ftypes::IsWayChecker::Minors:
-    return true;
-  default:
-    return false;
+  case ftypes::IsWayChecker::Minors: return true;
+  default: return false;
   }
 }
 
@@ -1054,10 +1035,7 @@ void PostprocessElement(OsmElement * p, FeatureBuilderParams & params)
 {
   static CachedTypes const types;
 
-  auto const AddParam = [&params](ftype::CachedTypes::Type type)
-  {
-    params.AddType(types.Get(type));
-  };
+  auto const AddParam = [&params](ftype::CachedTypes::Type type) { params.AddType(types.Get(type)); };
 
   if (!params.house.IsEmpty())
   {
@@ -1068,8 +1046,7 @@ void PostprocessElement(OsmElement * p, FeatureBuilderParams & params)
     {
       /// @todo Make a function like HaveAddressLikeType ?
       ftype::TruncValue(t, 1);
-      if (t != types.Get(CachedTypes::WheelchairAny) &&
-          t != types.Get(CachedTypes::InternetAny))
+      if (t != types.Get(CachedTypes::WheelchairAny) && t != types.Get(CachedTypes::InternetAny))
       {
         hasSuitableType = true;
         break;
@@ -1093,14 +1070,13 @@ void PostprocessElement(OsmElement * p, FeatureBuilderParams & params)
           }
         }
       }
-      exit:;
+    exit:;
     }
   }
 
   // Process yes/no tags.
   TagProcessor(p).ApplyRules({
-      {"wheelchair", "designated",
-       [&AddParam] { AddParam(CachedTypes::WheelchairYes); }},
+      {"wheelchair", "designated", [&AddParam] { AddParam(CachedTypes::WheelchairYes); }},
       {"wifi", "~", [&AddParam] { AddParam(CachedTypes::Wlan); }},
   });
 
@@ -1116,8 +1092,20 @@ void PostprocessElement(OsmElement * p, FeatureBuilderParams & params)
   // Foot attr is stronger than Sidewalk,
   // Bicycle attr is stronger than Cycleway,
   // MotorCar attr is stronger than MotorVehicle.
-  struct Flags { enum Type { Foot = 0, Sidewalk, Bicycle, Cycleway, MotorCar, MotorVehicle, Count }; };
-  int flags[Flags::Count] = {0}; // 1 for Yes, -1 for No, 0 for Undefined
+  struct Flags
+  {
+    enum Type
+    {
+      Foot = 0,
+      Sidewalk,
+      Bicycle,
+      Cycleway,
+      MotorCar,
+      MotorVehicle,
+      Count
+    };
+  };
+  int flags[Flags::Count] = {0};  // 1 for Yes, -1 for No, 0 for Undefined
 
   for (uint32_t const vType : vTypes)
   {
@@ -1130,31 +1118,34 @@ void PostprocessElement(OsmElement * p, FeatureBuilderParams & params)
           {"oneway", "yes", [&addOneway] { addOneway = true; }},
           {"oneway", "1", [&addOneway] { addOneway = true; }},
           {"oneway", "-1",
-           [&addOneway, &params] {
-             addOneway = true;
-             params.SetReversedGeometry(true);
-           }},
+           [&addOneway, &params]
+      {
+        addOneway = true;
+        params.SetReversedGeometry(true);
+      }},
           {"oneway", "!", [&noOneway] { noOneway = true; }},
-// Unlike "roundabout", "circular" is not assumed to force oneway=yes
-// (https://wiki.openstreetmap.org/wiki/Tag:junction%3Dcircular), but!
-// There are a lot of junction=circular without oneway tag, which is a mapping error (run overpass under England).
-// And most of this junctions are assumed to be oneway.
+          // Unlike "roundabout", "circular" is not assumed to force oneway=yes
+          // (https://wiki.openstreetmap.org/wiki/Tag:junction%3Dcircular), but!
+          // There are a lot of junction=circular without oneway tag, which is a mapping error (run overpass under
+          // England). And most of this junctions are assumed to be oneway.
           {"junction", "circular", [&addOneway] { addOneway = true; }},
           {"junction", "roundabout", [&addOneway] { addOneway = true; }},
-// Add faux oneways as access keys don't support forward/backward modifiers
-// Bicycles are not motor vehicles, so don't add oneways for them.
+          // Add faux oneways as access keys don't support forward/backward modifiers
+          // Bicycles are not motor vehicles, so don't add oneways for them.
           {"motor_vehicle:backward", "no", [&addOneway] { addOneway = true; }},
           {"vehicle:backward", "no", [&addOneway] { addOneway = true; }},
           {"motor_vehicle:forward", "no",
-           [&addOneway, &params] {
-             addOneway = true;
-             params.SetReversedGeometry(true);
-           }},
+           [&addOneway, &params]
+      {
+        addOneway = true;
+        params.SetReversedGeometry(true);
+      }},
           {"vehicle:forward", "no",
-           [&addOneway, &params] {
-             addOneway = true;
-             params.SetReversedGeometry(true);
-           }},
+           [&addOneway, &params]
+      {
+        addOneway = true;
+        params.SetReversedGeometry(true);
+      }},
           {"motor_vehicle:backward", "no", [&AddParam] { AddParam(CachedTypes::BicycleBidir); }},
           {"motor_vehicle:forward", "no", [&AddParam] { AddParam(CachedTypes::BicycleBidir); }},
           {"access", "private", [&AddParam] { AddParam(CachedTypes::Private); }},
@@ -1204,9 +1195,8 @@ void PostprocessElement(OsmElement * p, FeatureBuilderParams & params)
       if (addOneway && !noOneway)
         params.AddType(types.Get(CachedTypes::OneWay));
 
-      auto const ApplyFlag = [&flags, &AddParam](Flags::Type f, CachedTypes::Type yes,
-                                                 CachedTypes::Type no0, CachedTypes::Type no1,
-                                                 bool isDesignated)
+      auto const ApplyFlag = [&flags, &AddParam](Flags::Type f, CachedTypes::Type yes, CachedTypes::Type no0,
+                                                 CachedTypes::Type no1, bool isDesignated)
       {
         if (flags[f] == 1 && !isDesignated)
           AddParam(yes);
@@ -1238,10 +1228,12 @@ void PostprocessElement(OsmElement * p, FeatureBuilderParams & params)
           {"foot", "~", [&AddParam] { AddParam(CachedTypes::YesFoot); }},
           {"ferry", "footway", [&AddParam] { AddParam(CachedTypes::YesFoot); }},
           {"ferry", "pedestrian", [&AddParam] { AddParam(CachedTypes::YesFoot); }},
-          {"ferry", "path", [&params] {
-             params.AddType(types.Get(CachedTypes::YesFoot));
-             params.AddType(types.Get(CachedTypes::YesBicycle));
-          }},
+          {"ferry", "path",
+           [&params]
+      {
+        params.AddType(types.Get(CachedTypes::YesFoot));
+        params.AddType(types.Get(CachedTypes::YesBicycle));
+      }},
 
           {"bicycle", "!", [&AddParam] { AddParam(CachedTypes::NoBicycle); }},
           {"bicycle", "~", [&AddParam] { AddParam(CachedTypes::YesBicycle); }},
@@ -1277,13 +1269,11 @@ void PostprocessElement(OsmElement * p, FeatureBuilderParams & params)
           {"network", "New York City Subway", [&params] { params.SetRwSubwayType("newyork"); }},
           {"network", "Московский метрополитен", [&params] { params.SetRwSubwayType("moscow"); }},
           {"network", "Петербургский метрополитен", [&params] { params.SetRwSubwayType("spb"); }},
-          {"network", "Verkehrsverbund Berlin-Brandenburg",
-           [&params] { params.SetRwSubwayType("berlin"); }},
+          {"network", "Verkehrsverbund Berlin-Brandenburg", [&params] { params.SetRwSubwayType("berlin"); }},
           {"network", "Минский метрополитен", [&params] { params.SetRwSubwayType("minsk"); }},
 
           {"network", "Київський метрополітен", [&params] { params.SetRwSubwayType("kiev"); }},
-          {"operator", "КП «Київський метрополітен»",
-           [&params] { params.SetRwSubwayType("kiev"); }},
+          {"operator", "КП «Київський метрополітен»", [&params] { params.SetRwSubwayType("kiev"); }},
 
           {"network", "RATP", [&params] { params.SetRwSubwayType("paris"); }},
           {"network", "Metro de Barcelona", [&params] { params.SetRwSubwayType("barcelona"); }},
@@ -1310,8 +1300,8 @@ void PostprocessElement(OsmElement * p, FeatureBuilderParams & params)
 }
 }  // namespace
 
-void GetNameAndType(OsmElement * p, FeatureBuilderParams & params,
-                    TypesFilterFnT const & filterType, CalculateOriginFnT const & calcOrg)
+void GetNameAndType(OsmElement * p, FeatureBuilderParams & params, TypesFilterFnT const & filterType,
+                    CalculateOriginFnT const & calcOrg)
 {
   // At this point, some preprocessing could've been done to the tags already
   // in TranslatorInterface::Preprocess(), e.g. converting tags according to replaced_tags.txt.
@@ -1328,89 +1318,60 @@ void GetNameAndType(OsmElement * p, FeatureBuilderParams & params,
   std::string houseName, houseNumber, conscriptionHN, streetHN, addrPostcode;
   std::string addrCity, addrSuburb;
   feature::AddressData addr;
-  TagProcessor(p).ApplyRules<void(string &, string &)>(
+  TagProcessor(p).ApplyRules<void(string &, string &)>({
+      {"addr:housenumber", "*", [&houseNumber](string & k, string & v) { houseNumber = std::move(v); }},
+      {"addr:conscriptionnumber", "*", [&conscriptionHN](string & k, string & v) { conscriptionHN = std::move(v); }},
+      {"addr:provisionalnumber", "*", [&conscriptionHN](string & k, string & v) { conscriptionHN = std::move(v); }},
+      {"addr:streetnumber", "*", [&streetHN](string & k, string & v) { streetHN = std::move(v); }},
+      {"contact:housenumber", "*",
+       [&houseNumber](string & k, string & v)
   {
-      {"addr:housenumber", "*", [&houseNumber](string & k, string & v)
-      {
-        houseNumber = std::move(v);
-      }},
-      {"addr:conscriptionnumber", "*", [&conscriptionHN](string & k, string & v)
-      {
-        conscriptionHN = std::move(v);
-      }},
-      {"addr:provisionalnumber", "*", [&conscriptionHN](string & k, string & v)
-      {
-        conscriptionHN = std::move(v);
-      }},
-      {"addr:streetnumber", "*", [&streetHN](string & k, string & v)
-      {
-        streetHN = std::move(v);
-      }},
-      {"contact:housenumber", "*", [&houseNumber](string & k, string & v)
-      {
-        if (houseNumber.empty())
-          houseNumber = std::move(v);
-      }},
-      {"addr:housename", "*", [&houseName](string & k, string & v)
-      {
-        houseName = std::move(v);
-      }},
-      {"addr:street", "*", [&addr](string & k, string & v)
-      {
-        addr.Set(feature::AddressData::Type::Street, std::move(v));
-      }},
-      {"contact:street", "*", [&addr](string & k, string & v)
-      {
-        addr.SetIfAbsent(feature::AddressData::Type::Street, std::move(v));
-      }},
-      {"addr:place", "*", [&addr](string & k, string & v)
-      {
-        addr.Set(feature::AddressData::Type::Place, std::move(v));
-      }},
-      {"addr:city", "*", [&addrCity](string & k, string & v)
-       {
-         addrCity = std::move(v);
-      }},
-      {"addr:suburb", "*", [&addrSuburb](string & k, string & v)
-      {
-        addrSuburb = std::move(v);
-      }},
-      {"addr:postcode", "*", [&addrPostcode](string & k, string & v)
-      {
-        addrPostcode = std::move(v);
-      }},
-      {"postal_code", "*", [&addrPostcode](string & k, string & v)
-      {
-        addrPostcode = std::move(v);
-      }},
-      {"contact:postcode", "*", [&addrPostcode](string & k, string & v)
-      {
-        if (addrPostcode.empty())
-          addrPostcode = std::move(v);
-      }},
-      {"population", "*", [&params](string & k, string & v)
-      {
-        // Get population rank.
-        uint64_t const population = generator::osm_element::GetPopulation(v);
-        if (population != 0)
-          params.rank = feature::PopulationToRank(population);
-      }},
-      {"ref", "*", [&params](string & k, string & v)
-      {
-        // Get reference; its used for selected types only, see FeatureBuilder::PreSerialize().
-        params.ref = std::move(v);
-      }},
-      {"layer", "*", [&params](string & k, string & v)
-      {
-        // Get layer.
-        if (params.layer == feature::LAYER_EMPTY)
-        {
-          // atoi error value (0) should match empty layer constant.
-          static_assert(feature::LAYER_EMPTY == 0);
-          params.layer = atoi(v.c_str());
-          params.layer = math::Clamp(params.layer, int8_t{feature::LAYER_LOW}, int8_t{feature::LAYER_HIGH});
-        }
-      }},
+    if (houseNumber.empty())
+      houseNumber = std::move(v);
+  }},
+      {"addr:housename", "*", [&houseName](string & k, string & v) { houseName = std::move(v); }},
+      {"addr:street", "*",
+       [&addr](string & k, string & v) { addr.Set(feature::AddressData::Type::Street, std::move(v)); }},
+      {"contact:street", "*",
+       [&addr](string & k, string & v) { addr.SetIfAbsent(feature::AddressData::Type::Street, std::move(v)); }},
+      {"addr:place", "*",
+       [&addr](string & k, string & v) { addr.Set(feature::AddressData::Type::Place, std::move(v)); }},
+      {"addr:city", "*", [&addrCity](string & k, string & v) { addrCity = std::move(v); }},
+      {"addr:suburb", "*", [&addrSuburb](string & k, string & v) { addrSuburb = std::move(v); }},
+      {"addr:postcode", "*", [&addrPostcode](string & k, string & v) { addrPostcode = std::move(v); }},
+      {"postal_code", "*", [&addrPostcode](string & k, string & v) { addrPostcode = std::move(v); }},
+      {"contact:postcode", "*",
+       [&addrPostcode](string & k, string & v)
+  {
+    if (addrPostcode.empty())
+      addrPostcode = std::move(v);
+  }},
+      {"population", "*",
+       [&params](string & k, string & v)
+  {
+    // Get population rank.
+    uint64_t const population = generator::osm_element::GetPopulation(v);
+    if (population != 0)
+      params.rank = feature::PopulationToRank(population);
+  }},
+      {"ref", "*",
+       [&params](string & k, string & v)
+  {
+    // Get reference; its used for selected types only, see FeatureBuilder::PreSerialize().
+    params.ref = std::move(v);
+  }},
+      {"layer", "*",
+       [&params](string & k, string & v)
+  {
+    // Get layer.
+    if (params.layer == feature::LAYER_EMPTY)
+    {
+      // atoi error value (0) should match empty layer constant.
+      static_assert(feature::LAYER_EMPTY == 0);
+      params.layer = atoi(v.c_str());
+      params.layer = math::Clamp(params.layer, int8_t{feature::LAYER_LOW}, int8_t{feature::LAYER_HIGH});
+    }
+  }},
   });
 
   // OSM consistency check with house numbers.
@@ -1424,7 +1385,8 @@ void GetNameAndType(OsmElement * p, FeatureBuilderParams & params,
       auto i = houseNumber.find('/');
       if (i == std::string::npos)
       {
-        LOG(LWARNING, (kHNLogTag, "Override housenumber for:", DebugPrintID(*p), houseNumber, conscriptionHN, streetHN));
+        LOG(LWARNING,
+            (kHNLogTag, "Override housenumber for:", DebugPrintID(*p), houseNumber, conscriptionHN, streetHN));
         houseNumber = conscriptionHN + "/" + streetHN;
       }
     }
@@ -1450,6 +1412,7 @@ void GetNameAndType(OsmElement * p, FeatureBuilderParams & params,
       class CityBBox
       {
         std::vector<m2::RectD> m_rects;
+
       public:
         CityBBox()
         {
@@ -1462,10 +1425,8 @@ void GetNameAndType(OsmElement * p, FeatureBuilderParams & params,
         {
           auto const ll = mercator::ToLatLon(pt);
           for (auto const & r : m_rects)
-          {
             if (r.IsPointInside({ll.m_lon, ll.m_lat}))
               return true;
-          }
           return false;
         }
       };
@@ -1485,17 +1446,14 @@ void GetNameAndType(OsmElement * p, FeatureBuilderParams & params,
   params.SetHouseNumberAndHouseName(std::move(houseNumber), std::move(houseName));
 
   // Fetch piste:name and piste:ref if there are no other name/ref values.
-  TagProcessor(p).ApplyRules<void(string &, string &)>(
+  TagProcessor(p).ApplyRules<void(string &, string &)>({
+      {"piste:ref", "*",
+       [&params](string & k, string & v)
   {
-      {"piste:ref", "*", [&params](string & k, string & v)
-      {
-        if (params.ref.empty())
-          params.ref = std::move(v);
-      }},
-      {"piste:name", "*", [&params](string & k, string & v)
-      {
-        params.SetDefaultNameIfEmpty(std::move(v));
-      }},
+    if (params.ref.empty())
+      params.ref = std::move(v);
+  }},
+      {"piste:name", "*", [&params](string & k, string & v) { params.SetDefaultNameIfEmpty(std::move(v)); }},
   });
 
   // Stage4: Match tags to classificator feature types via mapcss-mapping.csv.
diff --git a/generator/osm2type.hpp b/generator/osm2type.hpp
index 83c37e599..7647d735b 100644
--- a/generator/osm2type.hpp
+++ b/generator/osm2type.hpp
@@ -11,12 +11,12 @@ struct OsmElement;
 
 namespace ftype
 {
-using TypesFilterFnT = std::function<bool (uint32_t)>;
-using CalculateOriginFnT = std::function<std::optional<m2::PointD> (OsmElement const * p)>;
+using TypesFilterFnT = std::function<bool(uint32_t)>;
+using CalculateOriginFnT = std::function<std::optional<m2::PointD>(OsmElement const * p)>;
 
 /// Get the types, name and layer for feature with the tree of tags.
 /// @param[in]  calcOrg Not empty in generator, maybe empty in unit tests.
 void GetNameAndType(OsmElement * p, FeatureBuilderParams & params,
                     TypesFilterFnT const & filterType = &feature::IsUsefulType,
                     CalculateOriginFnT const & calcOrg = {});
-} // namespace ftype
+}  // namespace ftype
diff --git a/generator/osm_element.cpp b/generator/osm_element.cpp
index 62f2a7104..27872da3c 100644
--- a/generator/osm_element.cpp
+++ b/generator/osm_element.cpp
@@ -4,8 +4,8 @@
 
 #include "base/logging.hpp"
 #include "base/math.hpp"
-#include "base/string_utils.hpp"
 #include "base/stl_helpers.hpp"
+#include "base/string_utils.hpp"
 
 #include <sstream>
 
@@ -13,24 +13,15 @@ std::string DebugPrint(OsmElement::EntityType type)
 {
   switch (type)
   {
-  case OsmElement::EntityType::Unknown:
-    return "unknown";
-  case OsmElement::EntityType::Bounds:
-    return "bounds";
-  case OsmElement::EntityType::Way:
-    return "way";
-  case OsmElement::EntityType::Tag:
-    return "tag";
-  case OsmElement::EntityType::Relation:
-    return "relation";
-  case OsmElement::EntityType::Osm:
-    return "osm";
-  case OsmElement::EntityType::Node:
-    return "node";
-  case OsmElement::EntityType::Nd:
-    return "nd";
-  case OsmElement::EntityType::Member:
-    return "member";
+  case OsmElement::EntityType::Unknown: return "unknown";
+  case OsmElement::EntityType::Bounds: return "bounds";
+  case OsmElement::EntityType::Way: return "way";
+  case OsmElement::EntityType::Tag: return "tag";
+  case OsmElement::EntityType::Relation: return "relation";
+  case OsmElement::EntityType::Osm: return "osm";
+  case OsmElement::EntityType::Node: return "node";
+  case OsmElement::EntityType::Nd: return "nd";
+  case OsmElement::EntityType::Member: return "member";
   }
   UNREACHABLE();
 }
@@ -38,15 +29,14 @@ std::string DebugPrint(OsmElement::EntityType type)
 namespace
 {
 std::string_view constexpr kUselessKeys[] = {
-  "created_by", "source", "odbl", "note", "fixme", "iemv",
+    "created_by", "source", "odbl", "note", "fixme", "iemv",
 
-  // Skip tags for speedup, now we don't use it
-  "not:", "artist_name", "whitewater",// https://wiki.openstreetmap.org/wiki/Whitewater_sports
+    // Skip tags for speedup, now we don't use it
+    "not:", "artist_name", "whitewater",  // https://wiki.openstreetmap.org/wiki/Whitewater_sports
 
-  // In future we can use this tags for improve our search
-  "nat_name", "reg_name", "loc_name", "lock_name", "local_name", "short_name", "official_name"
-};
-} // namespace
+    // In future we can use this tags for improve our search
+    "nat_name", "reg_name", "loc_name", "lock_name", "local_name", "short_name", "official_name"};
+}  // namespace
 
 void OsmElement::AddTag(std::string_view key, std::string_view value)
 {
@@ -58,10 +48,8 @@ void OsmElement::AddTag(std::string_view key, std::string_view value)
     return;
 
   for (auto const & useless : kUselessKeys)
-  {
     if (key == useless)
       return;
-  }
 
   m_tags.emplace_back(key, value);
 }
@@ -83,10 +71,7 @@ void OsmElement::Validate()
 
   struct MembersCompare
   {
-    bool operator()(Member const * l, Member const * r) const
-    {
-      return *l < *r;
-    }
+    bool operator()(Member const * l, Member const * r) const { return *l < *r; }
   };
 
   // Don't to change the initial order of m_members, so make intermediate set.
@@ -105,10 +90,8 @@ void OsmElement::Validate()
 
   if (theSet.size() != m_members.size())
   {
-    m_members.erase(std::remove_if(m_members.begin(), m_members.end(), [](Member const & m)
-    {
-      return m.m_ref == 0;
-    }), m_members.end());
+    m_members.erase(std::remove_if(m_members.begin(), m_members.end(), [](Member const & m) { return m.m_ref == 0; }),
+                    m_members.end());
   }
 }
 
@@ -139,9 +122,7 @@ std::string OsmElement::ToString(std::string const & shift) const
     ss << "Node: " << m_id << " (" << std::fixed << std::setw(7) << m_lat << ", " << m_lon << ")"
        << " tags: " << m_tags.size();
     break;
-  case EntityType::Nd:
-    ss << "Nd ref: " << m_ref;
-    break;
+  case EntityType::Nd: ss << "Nd ref: " << m_ref; break;
   case EntityType::Way:
     ss << "Way: " << m_id << " nds: " << m_nodes.size() << " tags: " << m_tags.size();
     if (!m_nodes.empty())
@@ -162,15 +143,11 @@ std::string OsmElement::ToString(std::string const & shift) const
         ss << shift2 << e.m_ref << " " << DebugPrint(e.m_type) << " " << e.m_role;
     }
     break;
-  case EntityType::Tag:
-    ss << "Tag: " << m_k << " = " << m_v;
-    break;
+  case EntityType::Tag: ss << "Tag: " << m_k << " = " << m_v; break;
   case EntityType::Member:
     ss << "Member: " << m_ref << " type: " << DebugPrint(m_memberType) << " role: " << m_role;
     break;
-  default:
-    UNREACHABLE();
-    break;
+  default: UNREACHABLE(); break;
   }
 
   if (!m_tags.empty())
@@ -185,18 +162,11 @@ std::string OsmElement::ToString(std::string const & shift) const
 
 bool OsmElement::operator==(OsmElement const & other) const
 {
-  return m_type == other.m_type
-         && m_id == other.m_id
-         && AlmostEqualAbs(m_lon, other.m_lon, mercator::kPointEqualityEps)
-         && AlmostEqualAbs(m_lat, other.m_lat, mercator::kPointEqualityEps)
-         && m_ref == other.m_ref
-         && m_k == other.m_k
-         && m_v == other.m_v
-         && m_memberType == other.m_memberType
-         && m_role == other.m_role
-         && m_nodes == other.m_nodes
-         && m_members == other.m_members
-         && m_tags == other.m_tags;
+  return m_type == other.m_type && m_id == other.m_id &&
+         AlmostEqualAbs(m_lon, other.m_lon, mercator::kPointEqualityEps) &&
+         AlmostEqualAbs(m_lat, other.m_lat, mercator::kPointEqualityEps) && m_ref == other.m_ref && m_k == other.m_k &&
+         m_v == other.m_v && m_memberType == other.m_memberType && m_role == other.m_role && m_nodes == other.m_nodes &&
+         m_members == other.m_members && m_tags == other.m_tags;
 }
 
 std::string OsmElement::GetTag(std::string const & key) const
@@ -221,15 +191,10 @@ base::GeoObjectId GetGeoObjectId(OsmElement const & element)
 {
   switch (element.m_type)
   {
-  case OsmElement::EntityType::Node:
-    return base::MakeOsmNode(element.m_id);
-  case OsmElement::EntityType::Way:
-    return base::MakeOsmWay(element.m_id);
-  case OsmElement::EntityType::Relation:
-    return base::MakeOsmRelation(element.m_id);
-  default:
-    UNREACHABLE();
-    return base::GeoObjectId();
+  case OsmElement::EntityType::Node: return base::MakeOsmNode(element.m_id);
+  case OsmElement::EntityType::Way: return base::MakeOsmWay(element.m_id);
+  case OsmElement::EntityType::Relation: return base::MakeOsmRelation(element.m_id);
+  default: UNREACHABLE(); return base::GeoObjectId();
   }
 }
 
diff --git a/generator/osm_element.hpp b/generator/osm_element.hpp
index 28d1a89a8..f8d59c6cc 100644
--- a/generator/osm_element.hpp
+++ b/generator/osm_element.hpp
@@ -11,21 +11,20 @@ struct OsmElement
   enum class EntityType
   {
     Unknown = 0x0,
-    Bounds = 0x6F62, // "bo"
-    Node = 0x6F6E, // "no"
-    Way = 0x6177, // "wa"
-    Relation = 0x6572, // "re"
-    Tag = 0x6174, // "ta"
-    Nd = 0x646E, // "nd"
-    Member = 0x656D, // "me"
-    Osm = 0x736F, // "os"
+    Bounds = 0x6F62,    // "bo"
+    Node = 0x6F6E,      // "no"
+    Way = 0x6177,       // "wa"
+    Relation = 0x6572,  // "re"
+    Tag = 0x6174,       // "ta"
+    Nd = 0x646E,        // "nd"
+    Member = 0x656D,    // "me"
+    Osm = 0x736F,       // "os"
   };
 
   struct Member
   {
     Member() = default;
-    Member(uint64_t ref, EntityType type, std::string const & role)
-      : m_ref(ref), m_type(type), m_role(role) {}
+    Member(uint64_t ref, EntityType type, std::string const & role) : m_ref(ref), m_type(type), m_role(role) {}
 
     bool operator==(Member const & other) const
     {
@@ -50,10 +49,7 @@ struct OsmElement
     Tag() = default;
     Tag(std::string_view key, std::string_view value) : m_key(key), m_value(value) {}
 
-    bool operator==(Tag const & other) const
-    {
-      return m_key == other.m_key && m_value == other.m_value;
-    }
+    bool operator==(Tag const & other) const { return m_key == other.m_key && m_value == other.m_value; }
 
     bool operator<(Tag const & other) const
     {
@@ -83,11 +79,11 @@ struct OsmElement
   std::string ToString(std::string const & shift = std::string()) const;
 
   std::vector<uint64_t> const & Nodes() const { return m_nodes; }
-  std::vector<uint64_t> &       NodesRef()    { return m_nodes; }
+  std::vector<uint64_t> & NodesRef() { return m_nodes; }
   std::vector<Member> const & Members() const { return m_members; }
-  std::vector<Member> &       MembersRef()    { return m_members; }
+  std::vector<Member> & MembersRef() { return m_members; }
   std::vector<Tag> const & Tags() const { return m_tags; }
-  std::vector<Tag> &       TagsRef()    { return m_tags; }
+  std::vector<Tag> & TagsRef() { return m_tags; }
 
   bool IsNode() const { return m_type == EntityType::Node; }
   bool IsWay() const { return m_type == EntityType::Way; }
@@ -97,10 +93,7 @@ struct OsmElement
   bool operator==(OsmElement const & other) const;
 
   void AddNd(uint64_t ref) { m_nodes.emplace_back(ref); }
-  void AddMember(uint64_t ref, EntityType type, std::string const & role)
-  {
-    m_members.emplace_back(ref, type, role);
-  }
+  void AddMember(uint64_t ref, EntityType type, std::string const & role) { m_members.emplace_back(ref, type, role); }
 
   void AddTag(std::string_view key, std::string_view value);
   void AddTag(Tag const & tag) { AddTag(tag.m_key, tag.m_value); }
diff --git a/generator/osm_element_helpers.cpp b/generator/osm_element_helpers.cpp
index ea3f72f09..5991699ce 100644
--- a/generator/osm_element_helpers.cpp
+++ b/generator/osm_element_helpers.cpp
@@ -11,14 +11,12 @@ uint64_t GetPopulation(std::string const & str)
 {
   std::string number;
   for (auto const c : str)
-  {
     if (isdigit(c))
       number += c;
     else if (c == '.' || c == ',' || c == ' ')
       continue;
     else
       break;
-  }
 
   if (number.empty())
     return 0;
@@ -69,7 +67,7 @@ uint8_t GetAdminLevel(OsmElement const & elem)
       return static_cast<uint8_t>(res);
 
     // There are too many custom admin_level value.
-    //LOG(LWARNING, ("Failed to get admin_level from", str, elem.m_id));
+    // LOG(LWARNING, ("Failed to get admin_level from", str, elem.m_id));
   }
   return 0;
 }
diff --git a/generator/osm_o5m_source.hpp b/generator/osm_o5m_source.hpp
index b2aa53525..0bdb440a0 100644
--- a/generator/osm_o5m_source.hpp
+++ b/generator/osm_o5m_source.hpp
@@ -26,13 +26,16 @@ class StreamBuffer
   TReadFunc m_reader;
   TBuffer m_buffer;
   size_t const m_maxBufferSize;
-  size_t m_recap; // recap read bytes
+  size_t m_recap;  // recap read bytes
 
   TBuffer::const_iterator m_position;
 
 public:
   StreamBuffer(TReadFunc reader, size_t readBufferSizeInBytes)
-  : m_reader(reader), m_buffer(readBufferSizeInBytes), m_maxBufferSize(readBufferSizeInBytes), m_recap(0)
+    : m_reader(reader)
+    , m_buffer(readBufferSizeInBytes)
+    , m_maxBufferSize(readBufferSizeInBytes)
+    , m_recap(0)
   {
     Refill();
   }
@@ -109,7 +112,6 @@ private:
   }
 };
 
-
 class O5MSource
 {
 public:
@@ -127,33 +129,35 @@ public:
     Reset = 0xff
   };
 
-  friend std::ostream & operator << (std::ostream & s, EntityType const & type)
+  friend std::ostream & operator<<(std::ostream & s, EntityType const & type)
   {
     switch (type)
     {
-      case EntityType::End:       s << "O5M_CMD_END"; break;
-      case EntityType::Node:      s << "O5M_CMD_NODE"; break;
-      case EntityType::Way:       s << "O5M_CMD_WAY"; break;
-      case EntityType::Relation:  s << "O5M_CMD_REL"; break;
-      case EntityType::BBox:      s << "O5M_CMD_BBOX"; break;
-      case EntityType::Timestamp: s << "O5M_CMD_TSTAMP"; break;
-      case EntityType::Header:    s << "O5M_CMD_HEADER"; break;
-      case EntityType::Sync:      s << "O5M_CMD_SYNC"; break;
-      case EntityType::Jump:      s << "O5M_CMD_JUMP"; break;
-      case EntityType::Reset:     s << "O5M_CMD_RESET"; break;
-      default: return s << "Unknown command: " << std::hex << base::Underlying(type);
+    case EntityType::End: s << "O5M_CMD_END"; break;
+    case EntityType::Node: s << "O5M_CMD_NODE"; break;
+    case EntityType::Way: s << "O5M_CMD_WAY"; break;
+    case EntityType::Relation: s << "O5M_CMD_REL"; break;
+    case EntityType::BBox: s << "O5M_CMD_BBOX"; break;
+    case EntityType::Timestamp: s << "O5M_CMD_TSTAMP"; break;
+    case EntityType::Header: s << "O5M_CMD_HEADER"; break;
+    case EntityType::Sync: s << "O5M_CMD_SYNC"; break;
+    case EntityType::Jump: s << "O5M_CMD_JUMP"; break;
+    case EntityType::Reset: s << "O5M_CMD_RESET"; break;
+    default: return s << "Unknown command: " << std::hex << base::Underlying(type);
     }
     return s;
   }
 
 protected:
-
   struct StringTableRecord
   {
     // This important value got from
     // documentation ( https://wiki.openstreetmap.org/wiki/O5m#Strings ) on O5M format.
     // If change it all will be broken.
-    enum { MaxEntrySize = 252 };
+    enum
+    {
+      MaxEntrySize = 252
+    };
 
     char key[MaxEntrySize];
     char value[MaxEntrySize];
@@ -188,10 +192,9 @@ protected:
   int32_t m_lat = 0;
   uint64_t m_timestamp = 0;
   uint64_t m_changeset = 0;
-  int64_t m_middlePartSize = 0; // Length of the references section
+  int64_t m_middlePartSize = 0;  // Length of the references section
 
 public:
-
   template <typename TValue>
   class SubElements
   {
@@ -209,8 +212,7 @@ public:
 
     public:
       Iterator() : m_reader(nullptr) {}
-      explicit Iterator(O5MSource * reader, TSubElementGetter const & func)
-      : m_reader(reader), m_func(func)
+      explicit Iterator(O5MSource * reader, TSubElementGetter const & func) : m_reader(reader), m_func(func)
       {
         NextValue();
       }
@@ -218,7 +220,11 @@ public:
       bool operator==(Iterator const & iter) const { return m_reader == iter.m_reader; }
       bool operator!=(Iterator const & iter) const { return !(*this == iter); }
 
-      Iterator & operator++() { NextValue(); return *this; }
+      Iterator & operator++()
+      {
+        NextValue();
+        return *this;
+      }
 
       void NextValue() { m_reader = m_reader ? m_func(&m_val) : nullptr; }
 
@@ -227,7 +233,12 @@ public:
 
     SubElements(O5MSource * reader, TSubElementGetter const & func) : m_reader(reader), m_func(func) {}
 
-    void Skip() { while (m_reader && m_func(nullptr)) { /* no-op */ } }
+    void Skip()
+    {
+      while (m_reader && m_func(nullptr))
+      { /* no-op */
+      }
+    }
 
     Iterator const begin() const { return Iterator(m_reader, m_func); }
     Iterator const end() const { return Iterator(); }
@@ -252,18 +263,14 @@ public:
 
     TRefs Members() const
     {
-      return TRefs((type == EntityType::Relation) ? m_reader : nullptr, [this](Member * val)
-      {
-        return (m_reader) ? m_reader->ReadMember(val) : nullptr;
-      });
+      return TRefs((type == EntityType::Relation) ? m_reader : nullptr,
+                   [this](Member * val) { return (m_reader) ? m_reader->ReadMember(val) : nullptr; });
     }
 
     TNodes Nodes() const
     {
-      return TNodes((type == EntityType::Way) ? m_reader : nullptr, [this](int64_t * val)
-      {
-        return (m_reader) ? m_reader->ReadNd(val) : nullptr;
-      });
+      return TNodes((type == EntityType::Way) ? m_reader : nullptr,
+                    [this](int64_t * val) { return (m_reader) ? m_reader->ReadNd(val) : nullptr; });
     }
 
     TTags Tags() const
@@ -271,10 +278,8 @@ public:
       Members().Skip();
       Nodes().Skip();
       bool const validType = (type == EntityType::Node || type == EntityType::Way || type == EntityType::Relation);
-      return TTags(validType ? m_reader : nullptr, [this](KeyValue * val)
-      {
-        return (m_reader) ? m_reader->ReadStringPair(val) : nullptr;
-      });
+      return TTags(validType ? m_reader : nullptr,
+                   [this](KeyValue * val) { return (m_reader) ? m_reader->ReadStringPair(val) : nullptr; });
     }
 
     void SkipRemainder() const
@@ -285,11 +290,14 @@ public:
       if (!(type == EntityType::Node || type == EntityType::Way || type == EntityType::Relation))
         return;
       if (type == EntityType::Way)
-        while (m_reader->ReadNd(nullptr));
+        while (m_reader->ReadNd(nullptr))
+          ;
       if (type == EntityType::Relation)
-        while (m_reader->ReadMember(nullptr));
+        while (m_reader->ReadMember(nullptr))
+          ;
 
-      while (m_reader->ReadStringPair(nullptr));
+      while (m_reader->ReadStringPair(nullptr))
+        ;
     }
 
     Entity() : m_reader(nullptr) {}
@@ -309,7 +317,8 @@ public:
     {
       b = m_buffer.Get();
       ret |= (uint64_t)(b & 0x7f) << (i++ * 7);
-    } while (b & 0x80);
+    }
+    while (b & 0x80);
     size_t const rb = m_buffer.Recap();
     m_remainder -= rb;
     m_middlePartSize -= rb;
@@ -334,27 +343,27 @@ public:
     int64_t current = 0;
     EntityType type = EntityType::Reset;
 
-    switch (kv.key[0]) {
-      case '0':
-      {
-        current = (m_currentNodeRef += delta);
-        type = EntityType::Node;
-        break;
-      }
-      case '1':
-      {
-        current = (m_currentWayRef += delta);
-        type = EntityType::Way;
-        break;
-      }
-      case '2':
-      {
-        current = (m_currentRelationRef += delta);
-        type = EntityType::Relation;
-        break;
-      }
-      default:
-        CHECK(false, ("Unexpected relation type:", kv.key));
+    switch (kv.key[0])
+    {
+    case '0':
+    {
+      current = (m_currentNodeRef += delta);
+      type = EntityType::Node;
+      break;
+    }
+    case '1':
+    {
+      current = (m_currentWayRef += delta);
+      type = EntityType::Way;
+      break;
+    }
+    case '2':
+    {
+      current = (m_currentRelationRef += delta);
+      type = EntityType::Relation;
+      break;
+    }
+    default: CHECK(false, ("Unexpected relation type:", kv.key));
     }
     if (ref)
     {
@@ -401,7 +410,8 @@ public:
       {
         *pBuf = m_buffer.Get();
         sizes[i]++;
-      } while (*(pBuf++));
+      }
+      while (*(pBuf++));
     }
     size_t const rb = m_buffer.Recap();
     m_remainder -= rb;
@@ -478,52 +488,51 @@ public:
     entity->user = nullptr;
     m_middlePartSize = 0;
 
-    m_remainder = ReadVarUInt(); // entity size
+    m_remainder = ReadVarUInt();  // entity size
 
     switch (entity->type)
     {
-      case EntityType::Node:
-      {
-        ReadIdAndVersion(entity);
-        ReadLonLat(entity);
-      }
-      break;
-      case EntityType::Way:
-      {
-        ReadIdAndVersion(entity);
-        m_middlePartSize = ReadVarUInt();
-      }
-      break;
-      case EntityType::Relation:
-      {
-        ReadIdAndVersion(entity);
-        m_middlePartSize = ReadVarUInt();
-      }
-      break;
-      case EntityType::BBox:
-      {
-      }
-      break;
-      case EntityType::Timestamp:
-      {
-        ReadVarUInt();
-      }
-      break;
-      case EntityType::Header:
-      {
-      }
-      break;
-      case EntityType::Sync:
-      {
-      }
-      break;
-      case EntityType::Jump:
-      {
-      }
-      break;
+    case EntityType::Node:
+    {
+      ReadIdAndVersion(entity);
+      ReadLonLat(entity);
+    }
+    break;
+    case EntityType::Way:
+    {
+      ReadIdAndVersion(entity);
+      m_middlePartSize = ReadVarUInt();
+    }
+    break;
+    case EntityType::Relation:
+    {
+      ReadIdAndVersion(entity);
+      m_middlePartSize = ReadVarUInt();
+    }
+    break;
+    case EntityType::BBox:
+    {
+    }
+    break;
+    case EntityType::Timestamp:
+    {
+      ReadVarUInt();
+    }
+    break;
+    case EntityType::Header:
+    {
+    }
+    break;
+    case EntityType::Sync:
+    {
+    }
+    break;
+    case EntityType::Jump:
+    {
+    }
+    break;
 
-      default:
-        break;
+    default: break;
     }
     return this;
   }
@@ -554,7 +563,6 @@ public:
   }
 
 public:
-
   class Iterator
   {
     O5MSource * m_reader;
@@ -570,7 +578,11 @@ public:
 
     bool operator==(Iterator const & iter) const { return m_reader == iter.m_reader; }
     bool operator!=(Iterator const & iter) const { return !(*this == iter); }
-    Iterator & operator++() { NextValue(); return *this; }
+    Iterator & operator++()
+    {
+      NextValue();
+      return *this;
+    }
 
     void NextValue() { m_reader = m_reader->ReadEntity(&m_entity) ? m_reader : nullptr; }
 
@@ -583,9 +595,7 @@ public:
   O5MSource(TReadFunc reader, size_t readBufferSizeInBytes = 60000) : m_buffer(reader, readBufferSizeInBytes)
   {
     if (EntityType::Reset != EntityType(m_buffer.Get()))
-    {
       throw std::runtime_error("Incorrect o5m start");
-    }
     CheckHeader();
     InitStringTable();
   }
@@ -608,17 +618,15 @@ public:
     s << EntityType(em.type) << " ID: " << em.id;
     if (em.version)
     {
-//      time_t timestamp = em.timestamp;
-//      tm stm = *gmtime(&timestamp);
-//      s << " Version: " << em.version << " timestamp: " << asctime_r(&stm, "%FT%TZ");
+      //      time_t timestamp = em.timestamp;
+      //      tm stm = *gmtime(&timestamp);
+      //      s << " Version: " << em.version << " timestamp: " << asctime_r(&stm, "%FT%TZ");
 
       s << " Version: " << em.version << " timestamp: " << em.timestamp;
       s << " changeset: " << em.changeset << " uid: " << em.uid << " user: " << em.user;
     }
     if (em.type == EntityType::Node)
-    {
       s << std::endl << " lon: " << em.lon << " lat: " << em.lat;
-    }
     return s;
   }
 };
diff --git a/generator/osm_source.cpp b/generator/osm_source.cpp
index a5f0e2510..f32a6b151 100644
--- a/generator/osm_source.cpp
+++ b/generator/osm_source.cpp
@@ -73,17 +73,12 @@ void AddElementToCache(cache::IntermediateDataWriter & cache, OsmElement && elem
     {
       switch (member.m_type)
       {
-      case OsmElement::EntityType::Node:
-        relation.m_nodes.emplace_back(member.m_ref, std::move(member.m_role));
-        break;
-      case OsmElement::EntityType::Way:
-        relation.m_ways.emplace_back(member.m_ref, std::move(member.m_role));
-        break;
+      case OsmElement::EntityType::Node: relation.m_nodes.emplace_back(member.m_ref, std::move(member.m_role)); break;
+      case OsmElement::EntityType::Way: relation.m_ways.emplace_back(member.m_ref, std::move(member.m_role)); break;
       case OsmElement::EntityType::Relation:
         relation.m_relations.emplace_back(member.m_ref, std::move(member.m_role));
         break;
-      default:
-        break;
+      default: break;
       }
     }
 
@@ -95,8 +90,7 @@ void AddElementToCache(cache::IntermediateDataWriter & cache, OsmElement && elem
 
     break;
   }
-  default:
-    break;
+  default: break;
   }
 }
 
@@ -126,12 +120,9 @@ void ProcessOsmElementsFromO5M(SourceReader & stream, std::function<void(OsmElem
 
 ProcessorOsmElementsFromO5M::ProcessorOsmElementsFromO5M(SourceReader & stream)
   : m_stream(stream)
-  , m_dataset([&](uint8_t * buffer, size_t size) {
-      return m_stream.Read(reinterpret_cast<char *>(buffer), size);
-  })
+  , m_dataset([&](uint8_t * buffer, size_t size) { return m_stream.Read(reinterpret_cast<char *>(buffer), size); })
   , m_pos(m_dataset.begin())
-{
-}
+{}
 
 bool ProcessorOsmElementsFromO5M::TryRead(OsmElement & element)
 {
@@ -139,7 +130,8 @@ bool ProcessorOsmElementsFromO5M::TryRead(OsmElement & element)
     return false;
 
   using Type = osm::O5MSource::EntityType;
-  auto const translate = [](Type t) -> OsmElement::EntityType {
+  auto const translate = [](Type t) -> OsmElement::EntityType
+  {
     switch (t)
     {
     case Type::Node: return OsmElement::EntityType::Node;
@@ -191,13 +183,9 @@ bool ProcessorOsmElementsFromO5M::TryRead(OsmElement & element)
 }
 
 ProcessorOsmElementsFromXml::ProcessorOsmElementsFromXml(SourceReader & stream)
-  : m_xmlSource([&, this](OsmElement && e)
-    {
-      m_queue.emplace(std::move(e));
-    })
+  : m_xmlSource([&, this](OsmElement && e) { m_queue.emplace(std::move(e)); })
   , m_parser(stream, m_xmlSource)
-{
-}
+{}
 
 bool ProcessorOsmElementsFromXml::TryReadFromQueue(OsmElement & element)
 {
@@ -217,7 +205,8 @@ bool ProcessorOsmElementsFromXml::TryRead(OsmElement & element)
   {
     if (TryReadFromQueue(element))
       return true;
-  } while (m_parser.Read());
+  }
+  while (m_parser.Read());
 
   return TryReadFromQueue(element);
 }
@@ -228,8 +217,7 @@ bool ProcessorOsmElementsFromXml::TryRead(OsmElement & element)
 
 bool GenerateIntermediateData(feature::GenerateInfo & info)
 {
-  auto nodes =
-      cache::CreatePointStorageWriter(info.m_nodeStorageType, info.GetCacheFileName(NODES_FILE));
+  auto nodes = cache::CreatePointStorageWriter(info.m_nodeStorageType, info.GetCacheFileName(NODES_FILE));
   cache::IntermediateDataWriter cache(*nodes, info);
   TownsDumper towns;
   SourceReader reader = info.m_osmFileName.empty() ? SourceReader() : SourceReader(info.m_osmFileName);
@@ -244,12 +232,8 @@ bool GenerateIntermediateData(feature::GenerateInfo & info)
 
   switch (info.m_osmFileType)
   {
-  case feature::GenerateInfo::OsmSourceType::XML:
-    ProcessOsmElementsFromXML(reader, processor);
-    break;
-  case feature::GenerateInfo::OsmSourceType::O5M:
-    ProcessOsmElementsFromO5M(reader, processor);
-    break;
+  case feature::GenerateInfo::OsmSourceType::XML: ProcessOsmElementsFromXML(reader, processor); break;
+  case feature::GenerateInfo::OsmSourceType::O5M: ProcessOsmElementsFromO5M(reader, processor); break;
   }
 
   cache.SaveIndex();
diff --git a/generator/osm_source.hpp b/generator/osm_source.hpp
index 2b7c0359a..e79bd8ea2 100644
--- a/generator/osm_source.hpp
+++ b/generator/osm_source.hpp
@@ -47,8 +47,8 @@ public:
 
 bool GenerateIntermediateData(feature::GenerateInfo & info);
 
-void ProcessOsmElementsFromO5M(SourceReader & stream, std::function<void (OsmElement &&)> const & processor);
-void ProcessOsmElementsFromXML(SourceReader & stream, std::function<void (OsmElement &&)> const & processor);
+void ProcessOsmElementsFromO5M(SourceReader & stream, std::function<void(OsmElement &&)> const & processor);
+void ProcessOsmElementsFromXML(SourceReader & stream, std::function<void(OsmElement &&)> const & processor);
 
 class ProcessorOsmElementsInterface
 {
diff --git a/generator/osm_xml_source.hpp b/generator/osm_xml_source.hpp
index a57ff5469..541e152e5 100644
--- a/generator/osm_xml_source.hpp
+++ b/generator/osm_xml_source.hpp
@@ -6,8 +6,8 @@
 #include "base/string_utils.hpp"
 
 #include <functional>
-#include <utility>
 #include <string>
+#include <utility>
 
 class XMLSource
 {
@@ -55,9 +55,7 @@ public:
 
     switch (++m_depth)
     {
-    case 1:
-      m_current = nullptr;
-      break;
+    case 1: m_current = nullptr; break;
     case 2:
       m_current = &m_parent;
       m_current->m_type = tagKey;
@@ -74,8 +72,7 @@ public:
   {
     switch (--m_depth)
     {
-    case 0:
-      break;
+    case 0: break;
 
     case 1:
       // Skip useless tags. See XMLSource::Push function above.
@@ -93,14 +90,9 @@ public:
       case OsmElement::EntityType::Member:
         m_parent.AddMember(m_child.m_ref, m_child.m_memberType, m_child.m_role);
         break;
-      case OsmElement::EntityType::Tag:
-        m_parent.AddTag(m_child.m_k, m_child.m_v);
-        break;
-      case OsmElement::EntityType::Nd:
-        m_parent.AddNd(m_child.m_ref);
-        break;
-      default:
-        break;
+      case OsmElement::EntityType::Tag: m_parent.AddTag(m_child.m_k, m_child.m_v); break;
+      case OsmElement::EntityType::Nd: m_parent.AddNd(m_child.m_ref); break;
+      default: break;
       }
       m_current = &m_parent;
       m_child.Clear();
diff --git a/generator/place_processor.cpp b/generator/place_processor.cpp
index f50b0dbef..bf722aaf7 100644
--- a/generator/place_processor.cpp
+++ b/generator/place_processor.cpp
@@ -14,7 +14,6 @@
 #include <algorithm>
 #include <limits>
 
-
 namespace generator
 {
 using namespace feature;
@@ -66,15 +65,10 @@ bool IsWorsePlace(FeaturePlace const & left, FeaturePlace const & right)
   double constexpr kIsAreaTooBigCoeff = -0.5;
 
   auto const normalizeRank = [](uint8_t rank)
-  {
-    return static_cast<double>(rank) / static_cast<double>(std::numeric_limits<uint8_t>::max());
-  };
+  { return static_cast<double>(rank) / static_cast<double>(std::numeric_limits<uint8_t>::max()); };
 
   auto const normalizeLangsCount = [](uint8_t langsCount)
-  {
-    return static_cast<double>(langsCount) /
-           static_cast<double>(StringUtf8Multilang::kMaxSupportedLanguages);
-  };
+  { return static_cast<double>(langsCount) / static_cast<double>(StringUtf8Multilang::kMaxSupportedLanguages); };
 
   auto const normalizeArea = [](double area)
   {
@@ -125,18 +119,14 @@ bool IsWorsePlace(FeaturePlace const & left, FeaturePlace const & right)
     auto const isCapital = ftypes::IsCapitalChecker::Instance()(placeType);
 
     auto const type = place.m_fb.GetMostGenericOsmId().GetType();
-    auto const isNode = (type == base::GeoObjectId::Type::OsmNode) ||
-                        (type == base::GeoObjectId::Type::ObsoleteOsmNode);
+    auto const isNode =
+        (type == base::GeoObjectId::Type::OsmNode) || (type == base::GeoObjectId::Type::ObsoleteOsmNode);
 
-    auto const tooBig =
-        isAreaTooBig(ftypes::IsLocalityChecker::Instance().GetType(placeType), area);
+    auto const tooBig = isAreaTooBig(ftypes::IsLocalityChecker::Instance().GetType(placeType), area);
 
-    return kRankCoeff * normalizeRank(rank) +
-           kLangsCountCoeff * normalizeLangsCount(langsCount) +
-           kAreaCoeff * normalizeArea(area) +
-           kIsCapitalCoeff * (isCapital ? 1.0 : 0.0) +
-           kIsNodeCoeff * (isNode ? 1.0 : 0.0) +
-           kIsAreaTooBigCoeff * (tooBig ? 1.0 : 0.0);
+    return kRankCoeff * normalizeRank(rank) + kLangsCountCoeff * normalizeLangsCount(langsCount) +
+           kAreaCoeff * normalizeArea(area) + kIsCapitalCoeff * (isCapital ? 1.0 : 0.0) +
+           kIsNodeCoeff * (isNode ? 1.0 : 0.0) + kIsAreaTooBigCoeff * (tooBig ? 1.0 : 0.0);
   };
 
   return getScore(left) < getScore(right);
@@ -147,9 +137,7 @@ std::vector<std::vector<FeaturePlace const *>> FindClusters(std::vector<FeatureP
   auto const & localityChecker = ftypes::IsLocalityChecker::Instance();
 
   auto getRaduis = [&localityChecker](FeaturePlace const & fp)
-  {
-    return GetRadiusM(localityChecker.GetType(fp.GetPlaceType()));
-  };
+  { return GetRadiusM(localityChecker.GetType(fp.GetPlaceType())); };
 
   auto isSamePlace = [&localityChecker](FeaturePlace const & lFP, FeaturePlace const & rFP)
   {
@@ -175,14 +163,13 @@ std::vector<std::vector<FeaturePlace const *>> FindClusters(std::vector<FeatureP
   return GetClusters(places, std::move(getRaduis), std::move(isSamePlace));
 }
 
-PlaceProcessor::PlaceProcessor(std::string const & filename)
-  : m_logTag("PlaceProcessor")
+PlaceProcessor::PlaceProcessor(std::string const & filename) : m_logTag("PlaceProcessor")
 {
   if (!filename.empty())
     m_boundariesHolder.Deserialize(filename);
 }
 
-std::vector<FeatureBuilder> PlaceProcessor::ProcessPlaces(std::vector<IDsContainerT> * ids/* = nullptr*/)
+std::vector<FeatureBuilder> PlaceProcessor::ProcessPlaces(std::vector<IDsContainerT> * ids /* = nullptr*/)
 {
   std::vector<FeatureBuilder> finalPlaces;
   for (auto const & name2PlacesEntry : m_nameToPlaces)
@@ -190,10 +177,7 @@ std::vector<FeatureBuilder> PlaceProcessor::ProcessPlaces(std::vector<IDsContain
     for (auto const & cluster : FindClusters(name2PlacesEntry.second))
     {
       auto best = std::max_element(cluster.begin(), cluster.end(),
-          [](FeaturePlace const * l, FeaturePlace const * r)
-          {
-            return IsWorsePlace(*l, *r);
-          });
+                                   [](FeaturePlace const * l, FeaturePlace const * r) { return IsWorsePlace(*l, *r); });
 
       auto bestFb = (*best)->m_fb;
 
@@ -203,10 +187,8 @@ std::vector<FeatureBuilder> PlaceProcessor::ProcessPlaces(std::vector<IDsContain
 
       IDsContainerT fbIDs;
       fbIDs.reserve(cluster.size());
-      base::Transform(cluster, std::back_inserter(fbIDs), [](FeaturePlace const * fp)
-      {
-        return fp->m_fb.GetMostGenericOsmId();
-      });
+      base::Transform(cluster, std::back_inserter(fbIDs),
+                      [](FeaturePlace const * fp) { return fp->m_fb.GetMostGenericOsmId(); });
 
       auto const bestBnd = m_boundariesHolder.GetBestBoundary(fbIDs, bestFb.GetKeyPoint());
       if (bestBnd)
@@ -242,8 +224,8 @@ std::vector<FeatureBuilder> PlaceProcessor::ProcessPlaces(std::vector<IDsContain
           // https://www.openstreetmap.org/relation/2374222
           // https://www.openstreetmap.org/relation/3388660
 
-          double const circleArea = ms::CircleAreaOnEarth(
-                GetRadiusByPopulationForRouting(bestBnd->GetPopulation(), bndLocality));
+          double const circleArea =
+              ms::CircleAreaOnEarth(GetRadiusByPopulationForRouting(bestBnd->GetPopulation(), bndLocality));
           if (exactArea > circleArea * 20.0)
           {
             LOG(LWARNING, (m_logTag, "Delete big boundary for", id, exactArea / circleArea));
@@ -276,8 +258,8 @@ FeaturePlace PlaceProcessor::CreatePlace(feature::FeatureBuilder && fb) const
     {
       if (!r.IsIntersect(rect))
       {
-        LOG(LERROR, (m_logTag, "FB center not in polygon's bound for:", id,
-                    mercator::ToLatLon(rect), mercator::ToLatLon(r)));
+        LOG(LERROR,
+            (m_logTag, "FB center not in polygon's bound for:", id, mercator::ToLatLon(rect), mercator::ToLatLon(r)));
       }
       rect.Add(r);
     }
diff --git a/generator/place_processor.hpp b/generator/place_processor.hpp
index da438290e..2cfeeef9b 100644
--- a/generator/place_processor.hpp
+++ b/generator/place_processor.hpp
@@ -60,4 +60,4 @@ private:
 
   std::string m_logTag;
 };
-} // namespace generator
+}  // namespace generator
diff --git a/generator/popular_places_section_builder.cpp b/generator/popular_places_section_builder.cpp
index 89b6335d5..8f56681c9 100644
--- a/generator/popular_places_section_builder.cpp
+++ b/generator/popular_places_section_builder.cpp
@@ -42,8 +42,7 @@ void LoadPopularPlaces(std::string const & srcFilename, PopularPlaces & places)
 
     if (popularityIndex > std::numeric_limits<PopularityIndex>::max())
     {
-      LOG(LERROR, ("The popularity index value is higher than max supported value:", srcFilename,
-                   "parsed row:", row));
+      LOG(LERROR, ("The popularity index value is higher than max supported value:", srcFilename, "parsed row:", row));
       return;
     }
 
@@ -60,7 +59,8 @@ void LoadPopularPlaces(std::string const & srcFilename, PopularPlaces & places)
 
 namespace
 {
-template <class RankGetterT> void BuildPopularPlacesImpl(std::string const & mwmFile, RankGetterT && getter)
+template <class RankGetterT>
+void BuildPopularPlacesImpl(std::string const & mwmFile, RankGetterT && getter)
 {
   bool popularPlaceFound = false;
 
@@ -97,7 +97,7 @@ PopularityIndex CalcRank(std::string const & str)
   return std::min(1.0, charsNum / 100000.0) * std::numeric_limits<PopularityIndex>::max();
 }
 
-} // namespace
+}  // namespace
 
 void BuildPopularPlacesFromDescriptions(std::string const & mwmFile)
 {
@@ -126,8 +126,8 @@ void BuildPopularPlacesFromDescriptions(std::string const & mwmFile)
   });
 }
 
-void BuildPopularPlacesFromWikiDump(std::string const & mwmFile,
-                                    std::string const & wikipediaDir, std::string const & idToWikidataPath)
+void BuildPopularPlacesFromWikiDump(std::string const & mwmFile, std::string const & wikipediaDir,
+                                    std::string const & idToWikidataPath)
 {
   LOG(LINFO, ("Build Popular Places section"));
 
@@ -152,7 +152,6 @@ void BuildPopularPlacesFromWikiDump(std::string const & mwmFile,
   });
 }
 
-
 PopularPlaces const & GetOrLoadPopularPlaces(std::string const & filename)
 {
   static std::mutex m;
diff --git a/generator/popular_places_section_builder.hpp b/generator/popular_places_section_builder.hpp
index 876652b64..cd6ededae 100644
--- a/generator/popular_places_section_builder.hpp
+++ b/generator/popular_places_section_builder.hpp
@@ -13,8 +13,8 @@ using PopularPlaces = std::unordered_map<base::GeoObjectId, PopularityIndex>;
 void LoadPopularPlaces(std::string const & srcFilename, PopularPlaces & places);
 
 void BuildPopularPlacesFromDescriptions(std::string const & mwmFile);
-void BuildPopularPlacesFromWikiDump(std::string const & mwmFile,
-                                    std::string const & wikipediaDir, std::string const & idToWikidataPath);
+void BuildPopularPlacesFromWikiDump(std::string const & mwmFile, std::string const & wikipediaDir,
+                                    std::string const & idToWikidataPath);
 
 PopularPlaces const & GetOrLoadPopularPlaces(std::string const & filename);
 }  // namespace generator
diff --git a/generator/postcode_points_builder.cpp b/generator/postcode_points_builder.cpp
index 39692d527..40ddad990 100644
--- a/generator/postcode_points_builder.cpp
+++ b/generator/postcode_points_builder.cpp
@@ -44,9 +44,8 @@ struct FieldIndices
 
 using ZipIndexValue = std::pair<strings::UniString, Uint64IndexValue>;
 
-void GetPostcodes(std::string const & filename, storage::CountryId const & countryId,
-                  FieldIndices const & fieldIndices, char const * separator, bool hasHeader,
-                  storage::CountryInfoGetter const & infoGetter,
+void GetPostcodes(std::string const & filename, storage::CountryId const & countryId, FieldIndices const & fieldIndices,
+                  char const * separator, bool hasHeader, storage::CountryInfoGetter const & infoGetter,
                   std::vector<m2::PointD> & valueMapping, std::vector<ZipIndexValue> & keyValuePairs)
 {
   ASSERT(!filename.empty(), ());
@@ -93,8 +92,8 @@ void GetPostcodes(std::string const & filename, storage::CountryId const & count
 }
 
 void GetUKPostcodes(std::string const & filename, storage::CountryId const & countryId,
-                    storage::CountryInfoGetter const & infoGetter,
-                    std::vector<m2::PointD> & valueMapping, std::vector<ZipIndexValue> & keyValuePairs)
+                    storage::CountryInfoGetter const & infoGetter, std::vector<m2::PointD> & valueMapping,
+                    std::vector<ZipIndexValue> & keyValuePairs)
 {
   // * Follow these steps to prepare GB dataset: https://github.com/osm-search/gb-postcode-data
   // * Direct from Nominatim: https://nominatim.org/data/gb_postcodes.csv.gz
@@ -105,13 +104,13 @@ void GetUKPostcodes(std::string const & filename, storage::CountryId const & cou
   ukFieldIndices.m_longIndex = 2;
   ukFieldIndices.m_datasetCount = 3;
 
-  GetPostcodes(filename, countryId, ukFieldIndices, "," /* separator */, true /* hasHeader */,
-               infoGetter, valueMapping, keyValuePairs);
+  GetPostcodes(filename, countryId, ukFieldIndices, "," /* separator */, true /* hasHeader */, infoGetter, valueMapping,
+               keyValuePairs);
 }
 
 void GetUSPostcodes(std::string const & filename, storage::CountryId const & countryId,
-                    storage::CountryInfoGetter const & infoGetter,
-                    std::vector<m2::PointD> & valueMapping, std::vector<ZipIndexValue> & keyValuePairs)
+                    storage::CountryInfoGetter const & infoGetter, std::vector<m2::PointD> & valueMapping,
+                    std::vector<ZipIndexValue> & keyValuePairs)
 {
   // * Get data source from here: https://simplemaps.com/data/us-zips
   //    "zip","lat","lng","city","state_id","state_name", ...
@@ -121,11 +120,11 @@ void GetUSPostcodes(std::string const & filename, storage::CountryId const & cou
   usFieldIndices.m_postcodeIndex = 0;
   usFieldIndices.m_latIndex = 1;
   usFieldIndices.m_longIndex = 2;
-  usFieldIndices.m_datasetCount = 3;    // actually, there are more fields, but doesn't matter here
+  usFieldIndices.m_datasetCount = 3;  // actually, there are more fields, but doesn't matter here
 
   // US dataset may contain complex json values, but doesn't matter for parsing first 3 entries.
-  GetPostcodes(filename, countryId, usFieldIndices, "," /* separator */, true /* hasHeader */,
-               infoGetter, valueMapping, keyValuePairs);
+  GetPostcodes(filename, countryId, usFieldIndices, "," /* separator */, true /* hasHeader */, infoGetter, valueMapping,
+               keyValuePairs);
 }
 
 bool BuildPostcodePointsImpl(FilesContainerR & container, storage::CountryId const & country,
@@ -164,8 +163,8 @@ bool BuildPostcodePointsImpl(FilesContainerR & container, storage::CountryId con
   {
     FileWriter tmpWriter(tmpName);
     SingleValueSerializer<typename ZipIndexValue::second_type> serializer;
-    trie::Build<Writer, typename ZipIndexValue::first_type, SingleUint64Value>(
-        tmpWriter, serializer, postcodesKeyValuePairs);
+    trie::Build<Writer, typename ZipIndexValue::first_type, SingleUint64Value>(tmpWriter, serializer,
+                                                                               postcodesKeyValuePairs);
   }
 
   rw_ops::Reverse(FileReader(tmpName), writer);
@@ -198,8 +197,7 @@ bool BuildPostcodePointsImpl(FilesContainerR & container, storage::CountryId con
 
 bool BuildPostcodePointsWithInfoGetter(std::string const & path, storage::CountryId const & country,
                                        PostcodePointsDatasetType type, std::string const & datasetPath,
-                                       bool forceRebuild,
-                                       storage::CountryInfoGetter const & infoGetter)
+                                       bool forceRebuild, storage::CountryInfoGetter const & infoGetter)
 {
   auto const filename = base::JoinPath(path, country + DATA_FILE_EXTENSION);
   Platform & platform = GetPlatform();
@@ -209,16 +207,15 @@ bool BuildPostcodePointsWithInfoGetter(std::string const & path, storage::Countr
 
   auto const postcodesFilePath = filename + "." + POSTCODE_POINTS_FILE_TAG EXTENSION_TMP;
   // Temporary file used to reverse trie part of postcodes section.
-  auto const trieTmpFilePath =
-      filename + "." + POSTCODE_POINTS_FILE_TAG + "_trie" + EXTENSION_TMP;
+  auto const trieTmpFilePath = filename + "." + POSTCODE_POINTS_FILE_TAG + "_trie" + EXTENSION_TMP;
   SCOPE_GUARD(postcodesFileGuard, std::bind(&FileWriter::DeleteFileX, postcodesFilePath));
   SCOPE_GUARD(trieTmpFileGuard, std::bind(&FileWriter::DeleteFileX, trieTmpFilePath));
 
   try
   {
     FileWriter writer(postcodesFilePath);
-    if (!BuildPostcodePointsImpl(readContainer, storage::CountryId(country), type, datasetPath,
-                                 trieTmpFilePath, infoGetter, writer))
+    if (!BuildPostcodePointsImpl(readContainer, storage::CountryId(country), type, datasetPath, trieTmpFilePath,
+                                 infoGetter, writer))
     {
       // No postcodes for country.
       return true;
@@ -242,15 +239,13 @@ bool BuildPostcodePointsWithInfoGetter(std::string const & path, storage::Countr
   return true;
 }
 
-bool BuildPostcodePoints(std::string const & path, storage::CountryId const & country,
-                         PostcodePointsDatasetType type, std::string const & datasetPath,
-                         bool forceRebuild)
+bool BuildPostcodePoints(std::string const & path, storage::CountryId const & country, PostcodePointsDatasetType type,
+                         std::string const & datasetPath, bool forceRebuild)
 {
   auto const & platform = GetPlatform();
   auto const infoGetter = storage::CountryInfoReader::CreateCountryInfoGetter(platform);
   CHECK(infoGetter, ());
-  return BuildPostcodePointsWithInfoGetter(path, country, type, datasetPath, forceRebuild,
-                                           *infoGetter);
+  return BuildPostcodePointsWithInfoGetter(path, country, type, datasetPath, forceRebuild, *infoGetter);
 }
 
 }  // namespace indexer
diff --git a/generator/postcode_points_builder.hpp b/generator/postcode_points_builder.hpp
index f698cc34d..689ce4f69 100644
--- a/generator/postcode_points_builder.hpp
+++ b/generator/postcode_points_builder.hpp
@@ -16,12 +16,10 @@ enum class PostcodePointsDatasetType
 };
 
 // Builds postcodes section with external postcodes data and writes it to the mwm file.
-bool BuildPostcodePoints(std::string const & path, std::string const & country,
-                         PostcodePointsDatasetType type, std::string const & datasetPath,
-                         bool forceRebuild);
+bool BuildPostcodePoints(std::string const & path, std::string const & country, PostcodePointsDatasetType type,
+                         std::string const & datasetPath, bool forceRebuild);
 // Exposed for testing.
 bool BuildPostcodePointsWithInfoGetter(std::string const & path, std::string const & country,
-                                       PostcodePointsDatasetType type,
-                                       std::string const & datasetPath, bool forceRebuild,
-                                       storage::CountryInfoGetter const & infoGetter);
+                                       PostcodePointsDatasetType type, std::string const & datasetPath,
+                                       bool forceRebuild, storage::CountryInfoGetter const & infoGetter);
 }  // namespace indexer
diff --git a/generator/processor_booking.hpp b/generator/processor_booking.hpp
index bbf3ed531..40bf5c6ba 100644
--- a/generator/processor_booking.hpp
+++ b/generator/processor_booking.hpp
@@ -18,11 +18,10 @@ template <typename Dataset>
 class ProcessorBooking : public FeatureProcessorInterface
 {
 public:
-  ProcessorBooking(Dataset const & dataset,
-                   std::map<base::GeoObjectId, feature::FeatureBuilder> & features)
-    : m_dataset(dataset), m_features(features)
-  {
-  }
+  ProcessorBooking(Dataset const & dataset, std::map<base::GeoObjectId, feature::FeatureBuilder> & features)
+    : m_dataset(dataset)
+    , m_features(features)
+  {}
 
   // FeatureProcessorInterface overrides:
   std::shared_ptr<FeatureProcessorInterface> Clone() const override
diff --git a/generator/processor_coastline.cpp b/generator/processor_coastline.cpp
index d53e42e40..00da86817 100644
--- a/generator/processor_coastline.cpp
+++ b/generator/processor_coastline.cpp
@@ -6,14 +6,12 @@
 
 namespace generator
 {
-ProcessorCoastline::ProcessorCoastline(std::shared_ptr<FeatureProcessorQueue> const & queue)
-  : m_queue(queue)
+ProcessorCoastline::ProcessorCoastline(std::shared_ptr<FeatureProcessorQueue> const & queue) : m_queue(queue)
 {
   m_processingChain = std::make_shared<RepresentationCoastlineLayer>();
   m_processingChain->Add(std::make_shared<PrepareCoastlineFeatureLayer>());
   auto affiliation = std::make_shared<feature::SingleAffiliation>(WORLD_COASTS_FILE_NAME);
-  m_affiliationsLayer =
-      std::make_shared<AffiliationsFeatureLayer>(kAffiliationsBufferSize, affiliation, m_queue);
+  m_affiliationsLayer = std::make_shared<AffiliationsFeatureLayer>(kAffiliationsBufferSize, affiliation, m_queue);
   m_processingChain->Add(m_affiliationsLayer);
 }
 
@@ -27,5 +25,8 @@ void ProcessorCoastline::Process(feature::FeatureBuilder & feature)
   m_processingChain->Handle(feature);
 }
 
-void ProcessorCoastline::Finish() { m_affiliationsLayer->AddBufferToQueue(); }
+void ProcessorCoastline::Finish()
+{
+  m_affiliationsLayer->AddBufferToQueue();
+}
 }  // namespace generator
diff --git a/generator/processor_complex.cpp b/generator/processor_complex.cpp
index 02b5a88e3..358ee051d 100644
--- a/generator/processor_complex.cpp
+++ b/generator/processor_complex.cpp
@@ -16,10 +16,8 @@ ProcessorComplex::ProcessorComplex(std::shared_ptr<FeatureProcessorQueue> const
   , m_haveBordersForWholeWorld(haveBordersForWholeWorld)
 {
   m_processingChain = std::make_shared<PrepareFeatureLayer>();
-  auto affiliation = std::make_shared<feature::CountriesFilesIndexAffiliation>(
-      bordersPath, haveBordersForWholeWorld);
-  m_affiliationsLayer =
-      std::make_shared<AffiliationsFeatureLayer<>>(kAffiliationsBufferSize, affiliation, m_queue);
+  auto affiliation = std::make_shared<feature::CountriesFilesIndexAffiliation>(bordersPath, haveBordersForWholeWorld);
+  m_affiliationsLayer = std::make_shared<AffiliationsFeatureLayer<>>(kAffiliationsBufferSize, affiliation, m_queue);
   m_processingChain->Add(m_affiliationsLayer);
 }
 
@@ -33,5 +31,8 @@ void ProcessorComplex::Process(feature::FeatureBuilder & feature)
   m_processingChain->Handle(feature);
 }
 
-void ProcessorComplex::Finish() { m_affiliationsLayer->AddBufferToQueue(); }
+void ProcessorComplex::Finish()
+{
+  m_affiliationsLayer->AddBufferToQueue();
+}
 }  // namespace generator
diff --git a/generator/processor_complex.hpp b/generator/processor_complex.hpp
index 8961d0e1d..46db61473 100644
--- a/generator/processor_complex.hpp
+++ b/generator/processor_complex.hpp
@@ -18,8 +18,8 @@ namespace generator
 class ProcessorComplex : public FeatureProcessorInterface
 {
 public:
-  explicit ProcessorComplex(std::shared_ptr<FeatureProcessorQueue> const & queue,
-                            std::string const & bordersPath, bool haveBordersForWholeWorld);
+  explicit ProcessorComplex(std::shared_ptr<FeatureProcessorQueue> const & queue, std::string const & bordersPath,
+                            bool haveBordersForWholeWorld);
 
   // FeatureProcessorInterface overrides:
   std::shared_ptr<FeatureProcessorInterface> Clone() const override;
diff --git a/generator/processor_country.cpp b/generator/processor_country.cpp
index c13d75335..b8e4f4b30 100644
--- a/generator/processor_country.cpp
+++ b/generator/processor_country.cpp
@@ -5,8 +5,8 @@
 namespace generator
 {
 ProcessorCountry::ProcessorCountry(AffiliationInterfacePtr affiliations, std::shared_ptr<FeatureProcessorQueue> queue)
-: m_affiliations(std::move(affiliations))
-, m_queue(std::move(queue))
+  : m_affiliations(std::move(affiliations))
+  , m_queue(std::move(queue))
 {
   ASSERT(m_affiliations && m_queue, ());
 
@@ -28,5 +28,8 @@ void ProcessorCountry::Process(feature::FeatureBuilder & feature)
   m_processingChain->Handle(feature);
 }
 
-void ProcessorCountry::Finish() { m_affiliationsLayer->AddBufferToQueue(); }
+void ProcessorCountry::Finish()
+{
+  m_affiliationsLayer->AddBufferToQueue();
+}
 }  // namespace generator
diff --git a/generator/processor_country.hpp b/generator/processor_country.hpp
index f12296290..e2b19f2eb 100644
--- a/generator/processor_country.hpp
+++ b/generator/processor_country.hpp
@@ -26,7 +26,7 @@ private:
 
   std::shared_ptr<AffiliationsFeatureLayer> m_affiliationsLayer;
   std::shared_ptr<LayerBase> m_processingChain;
-  //std::shared_ptr<ComplexFeaturesMixer> m_complexFeaturesMixer;
+  // std::shared_ptr<ComplexFeaturesMixer> m_complexFeaturesMixer;
 };
 
 }  // namespace generator
diff --git a/generator/processor_factory.hpp b/generator/processor_factory.hpp
index c12e7aef7..1be56db76 100644
--- a/generator/processor_factory.hpp
+++ b/generator/processor_factory.hpp
@@ -3,11 +3,11 @@
 #include "generator/factory_utils.hpp"
 #include "generator/processor_booking.hpp"
 #include "generator/processor_coastline.hpp"
-//#include "generator/processor_complex.hpp"
+// #include "generator/processor_complex.hpp"
 #include "generator/processor_country.hpp"
 #include "generator/processor_interface.hpp"
 #include "generator/processor_noop.hpp"
-//#include "generator/processor_simple.hpp"
+// #include "generator/processor_simple.hpp"
 #include "generator/processor_world.hpp"
 
 #include "base/assert.hpp"
@@ -19,13 +19,13 @@ namespace generator
 {
 enum class ProcessorType
 {
-  //Simple,
+  // Simple,
   Country,
   Coastline,
   World,
   Noop,
-  //Complex,
-  //Booking,
+  // Complex,
+  // Booking,
 };
 
 template <class... Args>
@@ -35,10 +35,11 @@ std::shared_ptr<FeatureProcessorInterface> CreateProcessor(ProcessorType type, A
   {
   case ProcessorType::Coastline: return create<ProcessorCoastline>(std::forward<Args>(args)...);
   case ProcessorType::Country: return create<ProcessorCountry>(std::forward<Args>(args)...);
-  //case ProcessorType::Simple: return create<ProcessorSimple>(std::forward<Args>(args)...);
+  // case ProcessorType::Simple: return create<ProcessorSimple>(std::forward<Args>(args)...);
   case ProcessorType::World: return create<ProcessorWorld>(std::forward<Args>(args)...);
-  case ProcessorType::Noop: return create<ProcessorNoop>(std::forward<Args>(args)...);
-  //case ProcessorType::Complex: return create<ProcessorComplex>(std::forward<Args>(args)...);
+  case ProcessorType::Noop:
+    return create<ProcessorNoop>(std::forward<Args>(args)...);
+    // case ProcessorType::Complex: return create<ProcessorComplex>(std::forward<Args>(args)...);
   }
   UNREACHABLE();
 }
diff --git a/generator/processor_noop.hpp b/generator/processor_noop.hpp
index 7e0e1ecd5..f96ab43dd 100644
--- a/generator/processor_noop.hpp
+++ b/generator/processor_noop.hpp
@@ -13,10 +13,7 @@ class ProcessorNoop : public FeatureProcessorInterface
 {
 public:
   // FeatureProcessorInterface overrides:
-  std::shared_ptr<FeatureProcessorInterface> Clone() const override
-  {
-    return std::make_shared<ProcessorNoop>();
-  }
+  std::shared_ptr<FeatureProcessorInterface> Clone() const override { return std::make_shared<ProcessorNoop>(); }
 
   void Process(feature::FeatureBuilder &) override {}
   void Finish() override {}
diff --git a/generator/processor_simple.cpp b/generator/processor_simple.cpp
index f5a004913..615425678 100644
--- a/generator/processor_simple.cpp
+++ b/generator/processor_simple.cpp
@@ -7,15 +7,14 @@
 
 namespace generator
 {
-ProcessorSimple::ProcessorSimple(std::shared_ptr<FeatureProcessorQueue> const & queue,
-                                 std::string const & name)
-  : m_name(name), m_queue(queue)
+ProcessorSimple::ProcessorSimple(std::shared_ptr<FeatureProcessorQueue> const & queue, std::string const & name)
+  : m_name(name)
+  , m_queue(queue)
 {
   m_processingChain = std::make_shared<PreserializeLayer>();
   auto affiliation = std::make_shared<feature::SingleAffiliation>(name);
-  m_affiliationsLayer =
-      std::make_shared<AffiliationsFeatureLayer<feature::serialization_policy::MinSize>>(
-          kAffiliationsBufferSize, affiliation, m_queue);
+  m_affiliationsLayer = std::make_shared<AffiliationsFeatureLayer<feature::serialization_policy::MinSize>>(
+      kAffiliationsBufferSize, affiliation, m_queue);
   m_processingChain->Add(m_affiliationsLayer);
 }
 
@@ -24,7 +23,13 @@ std::shared_ptr<FeatureProcessorInterface> ProcessorSimple::Clone() const
   return std::make_shared<ProcessorSimple>(m_queue, m_name);
 }
 
-void ProcessorSimple::Process(feature::FeatureBuilder & fb) { m_processingChain->Handle(fb); }
+void ProcessorSimple::Process(feature::FeatureBuilder & fb)
+{
+  m_processingChain->Handle(fb);
+}
 
-void ProcessorSimple::Finish() { m_affiliationsLayer->AddBufferToQueue(); }
+void ProcessorSimple::Finish()
+{
+  m_affiliationsLayer->AddBufferToQueue();
+}
 }  // namespace generator
diff --git a/generator/processor_simple.hpp b/generator/processor_simple.hpp
index 60d536c4d..4badf8ae5 100644
--- a/generator/processor_simple.hpp
+++ b/generator/processor_simple.hpp
@@ -14,8 +14,7 @@ class ProcessorSimple : public FeatureProcessorInterface
 {
 public:
   // |name| is bucket name. For example it may be "World", "geo_objects", "regions" etc.
-  explicit ProcessorSimple(std::shared_ptr<FeatureProcessorQueue> const & queue,
-                           std::string const & name);
+  explicit ProcessorSimple(std::shared_ptr<FeatureProcessorQueue> const & queue, std::string const & name);
 
   // FeatureProcessorInterface overrides:
   std::shared_ptr<FeatureProcessorInterface> Clone() const override;
@@ -27,8 +26,7 @@ public:
 
 private:
   std::string m_name;
-  std::shared_ptr<AffiliationsFeatureLayer<feature::serialization_policy::MinSize>>
-      m_affiliationsLayer;
+  std::shared_ptr<AffiliationsFeatureLayer<feature::serialization_policy::MinSize>> m_affiliationsLayer;
   std::shared_ptr<FeatureProcessorQueue> m_queue;
   std::shared_ptr<LayerBase> m_processingChain;
 };
diff --git a/generator/processor_world.cpp b/generator/processor_world.cpp
index b7407acee..de6e93588 100644
--- a/generator/processor_world.cpp
+++ b/generator/processor_world.cpp
@@ -8,14 +8,14 @@ namespace generator
 {
 ProcessorWorld::ProcessorWorld(std::shared_ptr<FeatureProcessorQueue> const & queue,
                                std::string const & popularityFilename)
-  : m_popularityFilename(popularityFilename), m_queue(queue)
+  : m_popularityFilename(popularityFilename)
+  , m_queue(queue)
 {
   m_processingChain = std::make_shared<RepresentationLayer>();
   m_processingChain->Add(std::make_shared<PrepareFeatureLayer>());
   m_processingChain->Add(std::make_shared<WorldLayer>(popularityFilename));
   auto affiliation = std::make_shared<feature::SingleAffiliation>(WORLD_FILE_NAME);
-  m_affiliationsLayer =
-      std::make_shared<AffiliationsFeatureLayer>(kAffiliationsBufferSize, affiliation, m_queue);
+  m_affiliationsLayer = std::make_shared<AffiliationsFeatureLayer>(kAffiliationsBufferSize, affiliation, m_queue);
   m_processingChain->Add(m_affiliationsLayer);
 }
 
@@ -29,5 +29,8 @@ void ProcessorWorld::Process(feature::FeatureBuilder & feature)
   m_processingChain->Handle(feature);
 }
 
-void ProcessorWorld::Finish() { m_affiliationsLayer->AddBufferToQueue(); }
+void ProcessorWorld::Finish()
+{
+  m_affiliationsLayer->AddBufferToQueue();
+}
 }  // namespace generator
diff --git a/generator/processor_world.hpp b/generator/processor_world.hpp
index f070e07ff..44c15cce5 100644
--- a/generator/processor_world.hpp
+++ b/generator/processor_world.hpp
@@ -18,8 +18,7 @@ namespace generator
 class ProcessorWorld : public FeatureProcessorInterface
 {
 public:
-  explicit ProcessorWorld(std::shared_ptr<FeatureProcessorQueue> const & queue,
-                          std::string const & popularityFilename);
+  explicit ProcessorWorld(std::shared_ptr<FeatureProcessorQueue> const & queue, std::string const & popularityFilename);
 
   // FeatureProcessorInterface overrides:
   std::shared_ptr<FeatureProcessorInterface> Clone() const override;
diff --git a/generator/pygen/pygen.cpp b/generator/pygen/pygen.cpp
index 0c9da540b..9d668fb3b 100644
--- a/generator/pygen/pygen.cpp
+++ b/generator/pygen/pygen.cpp
@@ -47,18 +47,18 @@ uint32_t const kInvalidIndex = std::numeric_limits<uint32_t>::max();
 class FeatureTypeWrapper
 {
 public:
-  explicit FeatureTypeWrapper(boost::shared_ptr<Mwm> const & mwm,
-                              boost::shared_ptr<FeatureType> const & feature)
-    : m_mwm(mwm), m_feature(feature)
-  {
-  }
+  explicit FeatureTypeWrapper(boost::shared_ptr<Mwm> const & mwm, boost::shared_ptr<FeatureType> const & feature)
+    : m_mwm(mwm)
+    , m_feature(feature)
+  {}
 
   uint32_t GetIndex() const { return m_feature->GetID().m_index; }
 
   bp::list GetTypes()
   {
     bp::list types;
-    m_feature->ForEachType([&](auto t) {
+    m_feature->ForEachType([&](auto t)
+    {
       // A type can be invalid because the type was marked as deprecated in mapcss file.
       types.append(classif().IsTypeValid(t) ? classif().GetIndexForType(t) : kInvalidIndex);
     });
@@ -79,9 +79,7 @@ public:
   {
     bp::dict mnames;
     auto const & name = m_feature->GetNames();
-    name.ForEach([&](auto code, auto && str) {
-      mnames[StringUtf8Multilang::GetLangByCode(code)] = str;
-    });
+    name.ForEach([&](auto code, auto && str) { mnames[StringUtf8Multilang::GetLangByCode(code)] = str; });
 
     return mnames;
   }
@@ -113,17 +111,13 @@ public:
     case GeomType::Point:
     case GeomType::Line:
     {
-      m_feature->ForEachPoint([&](auto const & p) { geometry.append(p); },
-                              FeatureType::BEST_GEOMETRY);
+      m_feature->ForEachPoint([&](auto const & p) { geometry.append(p); }, FeatureType::BEST_GEOMETRY);
     }
     break;
     case GeomType::Area:
     {
-      m_feature->ForEachTriangle(
-          [&](auto const & p1, auto const & p2, auto const & p3) {
-            geometry.append(m2::TriangleD(p1, p2, p3));
-          },
-          FeatureType::BEST_GEOMETRY);
+      m_feature->ForEachTriangle([&](auto const & p1, auto const & p2, auto const & p3)
+      { geometry.append(m2::TriangleD(p1, p2, p3)); }, FeatureType::BEST_GEOMETRY);
     }
     break;
     case GeomType::Undefined: break;
@@ -207,8 +201,7 @@ private:
     , m_mwmValue(m_ds.GetLocalCountryFile())
     , m_guard(std::make_unique<FeaturesLoaderGuard>(m_ds.GetDataSource(), m_ds.GetMwmId()))
     , m_parse(parse)
-  {
-  }
+  {}
 
   void SetSelfPtr(boost::weak_ptr<Mwm> const & self) { m_self = self; }
 
@@ -219,8 +212,7 @@ private:
   bool m_parse = false;
 };
 
-BOOST_PYTHON_FUNCTION_OVERLOADS(MwmCreateOverloads, Mwm::Create, 1 /* min_args */,
-                                2 /* max_args */);
+BOOST_PYTHON_FUNCTION_OVERLOADS(MwmCreateOverloads, Mwm::Create, 1 /* min_args */, 2 /* max_args */);
 
 class MwmIter
 {
@@ -243,7 +235,10 @@ private:
   uint32_t m_current = 0;
 };
 
-MwmIter Mwm::MakeMwmIter() { return MwmIter(m_self.lock()); }
+MwmIter Mwm::MakeMwmIter()
+{
+  return MwmIter(m_self.lock());
+}
 
 std::string ReadAll(std::string const & filename)
 {
@@ -255,23 +250,18 @@ std::string ReadAll(std::string const & filename)
 
 void InitClassificator(std::string const & resourcePath)
 {
-  classificator::LoadTypes(
-        ReadAll(base::JoinPath(resourcePath, "classificator.txt")),
-        ReadAll(base::JoinPath(resourcePath, "types.txt"))
-  );
+  classificator::LoadTypes(ReadAll(base::JoinPath(resourcePath, "classificator.txt")),
+                           ReadAll(base::JoinPath(resourcePath, "types.txt")));
 }
 
 struct GeometryNamespace
-{
-};
+{};
 
 struct MwmNamespace
-{
-};
+{};
 
 struct ClassifNamespace
-{
-};
+{};
 }  // namespace
 
 BOOST_PYTHON_MODULE(pygen)
@@ -298,19 +288,18 @@ BOOST_PYTHON_MODULE(pygen)
         .add_property("min_y", &m2::RectD::minY, &m2::RectD::setMinY)
         .add_property("max_x", &m2::RectD::maxX, &m2::RectD::setMaxX)
         .add_property("max_y", &m2::RectD::maxY, &m2::RectD::setMaxY)
-        .add_property(
-            "right_top", &m2::RectD::RightTop,
-            +[](m2::RectD & self, m2::RectD const & p) {
-              self.setMaxX(p.maxX());
-              self.setMaxY(p.maxY());
-            })
-        .add_property(
-            "left_bottom", &m2::RectD::LeftBottom,
-            +[](m2::RectD & self, m2::RectD const & p) {
-              self.setMinX(p.minX());
-              self.setMinY(p.minY());
-            })
-        .def("__repr__", static_cast<std::string (*)(m2::RectD const &)>(m2::DebugPrint));
+        .add_property("right_top", &m2::RectD::RightTop,
+                      +[](m2::RectD & self, m2::RectD const & p)
+    {
+      self.setMaxX(p.maxX());
+      self.setMaxY(p.maxY());
+    })
+        .add_property("left_bottom", &m2::RectD::LeftBottom,
+                      +[](m2::RectD & self, m2::RectD const & p)
+    {
+      self.setMinX(p.minX());
+      self.setMinY(p.minY());
+    }).def("__repr__", static_cast<std::string (*)(m2::RectD const &)>(m2::DebugPrint));
   }
   {
     bp::scope mwmNamespace = bp::class_<MwmNamespace>("mwm");
@@ -330,15 +319,13 @@ BOOST_PYTHON_MODULE(pygen)
         .def_readwrite("tag", &FilesContainerR::TagInfo::m_tag)
         .def_readwrite("offset", &FilesContainerR::TagInfo::m_offset)
         .def_readwrite("size", &FilesContainerR::TagInfo::m_size)
-        .def("__repr__",
-             static_cast<std::string (*)(FilesContainerR::TagInfo const &)>(DebugPrint));
+        .def("__repr__", static_cast<std::string (*)(FilesContainerR::TagInfo const &)>(DebugPrint));
 
     bp::class_<version::MwmVersion>("MwmVersion", bp::no_init)
         .def("format", &version::MwmVersion::GetFormat)
         .def("seconds_since_epoch", &version::MwmVersion::GetSecondsSinceEpoch)
         .def("version", &version::MwmVersion::GetVersion)
-        .def("__repr__",
-             static_cast<std::string (*)(version::MwmVersion const &)>(version::DebugPrint));
+        .def("__repr__", static_cast<std::string (*)(version::MwmVersion const &)>(version::DebugPrint));
 
     bp::class_<FeatureTypeWrapper>("FeatureType", bp::no_init)
         .def("index", &FeatureTypeWrapper::GetIndex)
@@ -355,17 +342,14 @@ BOOST_PYTHON_MODULE(pygen)
         .def("center", &FeatureTypeWrapper::GetCenter)
         .def("geometry", &FeatureTypeWrapper::GetGeometry)
         .def("limit_rect", &FeatureTypeWrapper::GetLimitRect)
-        .def(
-            "parse",
-            +[](FeatureTypeWrapper & self) {
-              self.ParseAll();
-              return self;
-            })
-        .def("__repr__", &FeatureTypeWrapper::DebugString);
+        .def("parse", +[](FeatureTypeWrapper & self)
+    {
+      self.ParseAll();
+      return self;
+    }).def("__repr__", &FeatureTypeWrapper::DebugString);
 
     bp::class_<MwmIter>("MwmIter", bp::no_init)
-        .def(
-            "__iter__", +[](MwmIter self) { return self; })
+        .def("__iter__", +[](MwmIter self) { return self; })
         .def("__next__", &MwmIter::Next)
         .def("next", &MwmIter::Next);
 
@@ -384,11 +368,7 @@ BOOST_PYTHON_MODULE(pygen)
 
     bp::def("init_classificator", InitClassificator);
 
-    bp::def(
-        "readable_type", +[](uint32_t index) {
-          return index == kInvalidIndex
-                     ? "unknown"
-                     : classif().GetReadableObjectName(classif().GetTypeForIndex(index));
-        });
+    bp::def("readable_type", +[](uint32_t index)
+    { return index == kInvalidIndex ? "unknown" : classif().GetReadableObjectName(classif().GetTypeForIndex(index)); });
   }
 }
diff --git a/generator/raw_generator.cpp b/generator/raw_generator.cpp
index 32da41033..3f284ad65 100644
--- a/generator/raw_generator.cpp
+++ b/generator/raw_generator.cpp
@@ -1,6 +1,6 @@
 #include "generator/raw_generator.hpp"
 
-//#include "generator/complex_loader.hpp"
+// #include "generator/complex_loader.hpp"
 #include "generator/features_processing_helpers.hpp"
 #include "generator/final_processor_cities.hpp"
 #include "generator/final_processor_coastline.hpp"
@@ -23,22 +23,17 @@ namespace
 class Stats
 {
 public:
-  Stats(size_t logCallCountThreshold)
-    : m_timer(true /* start */), m_logCallCountThreshold(logCallCountThreshold)
-  {
-  }
+  Stats(size_t logCallCountThreshold) : m_timer(true /* start */), m_logCallCountThreshold(logCallCountThreshold) {}
 
   void Log(std::vector<OsmElement> const & elements, uint64_t pos, bool forcePrint = false)
   {
     for (auto const & e : elements)
-    {
       if (e.IsNode())
         ++m_nodeCounter;
       else if (e.IsWay())
         ++m_wayCounter;
       else if (e.IsRelation())
         ++m_relationCounter;
-    }
 
     m_element_counter += elements.size();
     if (!forcePrint && m_callCount != m_logCallCountThreshold)
@@ -51,12 +46,11 @@ public:
     auto const posMiB = pos / kBytesInMiB;
     auto const elapsedSeconds = m_timer.ElapsedSeconds();
     auto const avgSpeedMiBPerSec = posMiB / elapsedSeconds;
-    auto const speedMiBPerSec =
-        (pos - m_prevFilePos) / (elapsedSeconds - m_prevElapsedSeconds) / kBytesInMiB;
+    auto const speedMiBPerSec = (pos - m_prevFilePos) / (elapsedSeconds - m_prevElapsedSeconds) / kBytesInMiB;
 
-    LOG(LINFO, ("Read", m_element_counter, "elements [pos:", posMiB,
-                "MiB, avg read speed:", avgSpeedMiBPerSec, " MiB/s, read speed:", speedMiBPerSec,
-                "MiB/s [n:", m_nodeCounter, ", w:", m_wayCounter, ", r:", m_relationCounter, "]]"));
+    LOG(LINFO, ("Read", m_element_counter, "elements [pos:", posMiB, "MiB, avg read speed:", avgSpeedMiBPerSec,
+                " MiB/s, read speed:", speedMiBPerSec, "MiB/s [n:", m_nodeCounter, ", w:", m_wayCounter,
+                ", r:", m_relationCounter, "]]"));
 
     m_prevFilePos = pos;
     m_prevElapsedSeconds = elapsedSeconds;
@@ -86,8 +80,7 @@ RawGenerator::RawGenerator(feature::GenerateInfo & genInfo, size_t threadsCount,
   , m_cache(std::make_shared<generator::cache::IntermediateData>(m_intermediateDataObjectsCache, genInfo))
   , m_queue(std::make_shared<FeatureProcessorQueue>())
   , m_translators(std::make_shared<TranslatorCollection>())
-{
-}
+{}
 
 void RawGenerator::ForceReloadCache()
 {
@@ -95,11 +88,11 @@ void RawGenerator::ForceReloadCache()
   m_cache = std::make_shared<cache::IntermediateData>(m_intermediateDataObjectsCache, m_genInfo);
 }
 
-void RawGenerator::GenerateCountries(bool isTests/* = false*/)
+void RawGenerator::GenerateCountries(bool isTests /* = false*/)
 {
-//  if (!m_genInfo.m_complexHierarchyFilename.empty())
-//    m_hierarchyNodesSet = GetOrCreateComplexLoader(m_genInfo.m_complexHierarchyFilename).GetIdsSet();
-//  auto const complexFeaturesMixer = std::make_shared<ComplexFeaturesMixer>(m_hierarchyNodesSet);
+  //  if (!m_genInfo.m_complexHierarchyFilename.empty())
+  //    m_hierarchyNodesSet = GetOrCreateComplexLoader(m_genInfo.m_complexHierarchyFilename).GetIdsSet();
+  //  auto const complexFeaturesMixer = std::make_shared<ComplexFeaturesMixer>(m_hierarchyNodesSet);
 
   AffiliationInterfacePtr affiliation;
   if (isTests)
@@ -108,8 +101,8 @@ void RawGenerator::GenerateCountries(bool isTests/* = false*/)
   }
   else
   {
-    affiliation = std::make_shared<feature::CountriesFilesIndexAffiliation>(
-        m_genInfo.m_targetDir, m_genInfo.m_haveBordersForWholeWorld);
+    affiliation = std::make_shared<feature::CountriesFilesIndexAffiliation>(m_genInfo.m_targetDir,
+                                                                            m_genInfo.m_haveBordersForWholeWorld);
   }
 
   auto processor = CreateProcessor(ProcessorType::Country, affiliation, m_queue);
@@ -118,14 +111,14 @@ void RawGenerator::GenerateCountries(bool isTests/* = false*/)
   /// and dispatches FB into Coastline, World, Country, City processors.
   /// Now we have at least 2x similar work in OsmElement->GetNameAndType->FeatureBuilder (for Country and World).
 
-  m_translators->Append(CreateTranslator(TranslatorType::Country, processor, m_cache, m_genInfo,
-                                         isTests ? nullptr : affiliation));
+  m_translators->Append(
+      CreateTranslator(TranslatorType::Country, processor, m_cache, m_genInfo, isTests ? nullptr : affiliation));
 
   m_finalProcessors.emplace(CreateCountryFinalProcessor(affiliation, false));
   m_finalProcessors.emplace(CreatePlacesFinalProcessor(affiliation));
 }
 
-void RawGenerator::GenerateWorld(bool cutBordersByWater/* = true */)
+void RawGenerator::GenerateWorld(bool cutBordersByWater /* = true */)
 {
   auto processor = CreateProcessor(ProcessorType::World, m_queue, m_genInfo.m_popularPlacesFilename);
   m_translators->Append(CreateTranslator(TranslatorType::World, processor, m_cache, m_genInfo));
@@ -144,9 +137,8 @@ void RawGenerator::GenerateCustom(std::shared_ptr<TranslatorInterface> const & t
   m_translators->Append(translator);
 }
 
-void RawGenerator::GenerateCustom(
-    std::shared_ptr<TranslatorInterface> const & translator,
-    std::shared_ptr<FinalProcessorIntermediateMwmInterface> const & finalProcessor)
+void RawGenerator::GenerateCustom(std::shared_ptr<TranslatorInterface> const & translator,
+                                  std::shared_ptr<FinalProcessorIntermediateMwmInterface> const & finalProcessor)
 {
   m_translators->Append(translator);
   m_finalProcessors.emplace(finalProcessor);
@@ -184,8 +176,8 @@ RawGenerator::FinalProcessorPtr RawGenerator::CreateCoslineFinalProcessor()
   return finalProcessor;
 }
 
-RawGenerator::FinalProcessorPtr RawGenerator::CreateCountryFinalProcessor(
-    AffiliationInterfacePtr const & affiliations, bool addAds)
+RawGenerator::FinalProcessorPtr RawGenerator::CreateCountryFinalProcessor(AffiliationInterfacePtr const & affiliations,
+                                                                          bool addAds)
 {
   auto finalProcessor = std::make_shared<CountryFinalProcessor>(affiliations, m_genInfo.m_tmpDir, m_threadsCount);
   finalProcessor->SetIsolinesDir(m_genInfo.m_isolinesDir);
@@ -197,9 +189,8 @@ RawGenerator::FinalProcessorPtr RawGenerator::CreateCountryFinalProcessor(
 
   if (m_genInfo.m_emitCoasts)
   {
-    finalProcessor->SetCoastlines(
-        m_genInfo.GetIntermediateFileName(WORLD_COASTS_FILE_NAME, ".geom"),
-        m_genInfo.GetTmpFileName(WORLD_COASTS_FILE_NAME));
+    finalProcessor->SetCoastlines(m_genInfo.GetIntermediateFileName(WORLD_COASTS_FILE_NAME, ".geom"),
+                                  m_genInfo.GetTmpFileName(WORLD_COASTS_FILE_NAME));
   }
 
   finalProcessor->SetCityBoundariesFiles(m_genInfo.GetIntermediateFileName(CITY_BOUNDARIES_COLLECTOR_FILENAME));
@@ -212,7 +203,7 @@ RawGenerator::FinalProcessorPtr RawGenerator::CreateWorldFinalProcessor(bool cut
   if (cutBordersByWater)
   {
     // This file should exist or read exception will be thrown otherwise.
-    coastlineGeom  = m_genInfo.GetIntermediateFileName(WORLD_COASTS_FILE_NAME, RAW_GEOM_FILE_EXTENSION);
+    coastlineGeom = m_genInfo.GetIntermediateFileName(WORLD_COASTS_FILE_NAME, RAW_GEOM_FILE_EXTENSION);
   }
   auto finalProcessor = std::make_shared<WorldFinalProcessor>(m_genInfo.m_tmpDir, coastlineGeom);
 
@@ -230,8 +221,7 @@ RawGenerator::FinalProcessorPtr RawGenerator::CreatePlacesFinalProcessor(Affilia
 
 bool RawGenerator::GenerateFilteredFeatures()
 {
-  SourceReader reader =
-      m_genInfo.m_osmFileName.empty() ? SourceReader() : SourceReader(m_genInfo.m_osmFileName);
+  SourceReader reader = m_genInfo.m_osmFileName.empty() ? SourceReader() : SourceReader(m_genInfo.m_osmFileName);
 
   std::unique_ptr<ProcessorOsmElementsInterface> sourceProcessor;
   switch (m_genInfo.m_osmFileType)
@@ -266,13 +256,13 @@ bool RawGenerator::GenerateFilteredFeatures()
       ++idx;
 
     isEnd = idx < m_chunkSize;
-    stats.Log(elements, reader.Pos(), isEnd/* forcePrint */);
+    stats.Log(elements, reader.Pos(), isEnd /* forcePrint */);
 
     if (isEnd)
       elements.resize(idx);
     translators.Emit(std::move(elements));
-
-  } while (!isEnd);
+  }
+  while (!isEnd);
 
   LOG(LINFO, ("OSM source input was processed."));
   if (!translators.Finish())
diff --git a/generator/raw_generator.hpp b/generator/raw_generator.hpp
index 7ba959f6e..ec786382c 100644
--- a/generator/raw_generator.hpp
+++ b/generator/raw_generator.hpp
@@ -19,16 +19,14 @@ namespace generator
 class RawGenerator
 {
 public:
-  explicit RawGenerator(feature::GenerateInfo & genInfo, size_t threadsCount = 1,
-                        size_t chunkSize = 1024);
+  explicit RawGenerator(feature::GenerateInfo & genInfo, size_t threadsCount = 1, size_t chunkSize = 1024);
 
   void GenerateCountries(bool isTests = false);
   void GenerateWorld(bool cutBordersByWater = true);
   void GenerateCoasts();
   void GenerateCustom(std::shared_ptr<TranslatorInterface> const & translator);
-  void GenerateCustom(
-      std::shared_ptr<TranslatorInterface> const & translator,
-      std::shared_ptr<FinalProcessorIntermediateMwmInterface> const & finalProcessor);
+  void GenerateCustom(std::shared_ptr<TranslatorInterface> const & translator,
+                      std::shared_ptr<FinalProcessorIntermediateMwmInterface> const & finalProcessor);
   bool Execute();
   std::vector<std::string> const & GetNames() const { return m_names; }
   std::shared_ptr<FeatureProcessorQueue> GetQueue() { return m_queue; }
@@ -56,9 +54,8 @@ private:
   std::shared_ptr<cache::IntermediateData> m_cache;
   std::shared_ptr<FeatureProcessorQueue> m_queue;
   std::shared_ptr<TranslatorCollection> m_translators;
-  std::priority_queue<FinalProcessorPtr, std::vector<FinalProcessorPtr>, FinalProcessorPtrCmp>
-      m_finalProcessors;
+  std::priority_queue<FinalProcessorPtr, std::vector<FinalProcessorPtr>, FinalProcessorPtrCmp> m_finalProcessors;
   std::vector<std::string> m_names;
-  //std::unordered_set<CompositeId> m_hierarchyNodesSet;
+  // std::unordered_set<CompositeId> m_hierarchyNodesSet;
 };
 }  // namespace generator
diff --git a/generator/raw_generator_writer.cpp b/generator/raw_generator_writer.cpp
index bb9c7ff41..e5361caa1 100644
--- a/generator/raw_generator_writer.cpp
+++ b/generator/raw_generator_writer.cpp
@@ -8,17 +8,20 @@
 
 namespace generator
 {
-RawGeneratorWriter::RawGeneratorWriter(std::shared_ptr<FeatureProcessorQueue> const & queue,
-                                       std::string const & path)
-  : m_queue(queue), m_path(path)
-{
-}
+RawGeneratorWriter::RawGeneratorWriter(std::shared_ptr<FeatureProcessorQueue> const & queue, std::string const & path)
+  : m_queue(queue)
+  , m_path(path)
+{}
 
-RawGeneratorWriter::~RawGeneratorWriter() { ShutdownAndJoin(); }
+RawGeneratorWriter::~RawGeneratorWriter()
+{
+  ShutdownAndJoin();
+}
 
 void RawGeneratorWriter::Run()
 {
-  m_thread = std::thread([&]() {
+  m_thread = std::thread([&]()
+  {
     while (true)
     {
       FeatureProcessorChunk chunk;
@@ -39,7 +42,7 @@ std::vector<std::string> RawGeneratorWriter::GetNames()
 
   std::vector<std::string> names;
   names.reserve(m_writers.size());
-  for (const auto & p : m_writers)
+  for (auto const & p : m_writers)
     names.emplace_back(p.first);
 
   return names;
diff --git a/generator/raw_generator_writer.hpp b/generator/raw_generator_writer.hpp
index 037e29f19..c80fd81d6 100644
--- a/generator/raw_generator_writer.hpp
+++ b/generator/raw_generator_writer.hpp
@@ -14,8 +14,7 @@ namespace generator
 class RawGeneratorWriter
 {
 public:
-  RawGeneratorWriter(std::shared_ptr<FeatureProcessorQueue> const & queue,
-                     std::string const & path);
+  RawGeneratorWriter(std::shared_ptr<FeatureProcessorQueue> const & queue, std::string const & path);
   ~RawGeneratorWriter();
 
   void Run();
@@ -23,8 +22,7 @@ public:
   std::vector<std::string> GetNames();
 
 private:
-  using FeatureBuilderWriter =
-      feature::FeatureBuilderWriter<feature::serialization_policy::MaxAccuracy>;
+  using FeatureBuilderWriter = feature::FeatureBuilderWriter<feature::serialization_policy::MaxAccuracy>;
 
   void Write(std::vector<ProcessedData> const & vecChanks);
 
diff --git a/generator/relation_tags.cpp b/generator/relation_tags.cpp
index 14b77a383..119ecd19c 100644
--- a/generator/relation_tags.cpp
+++ b/generator/relation_tags.cpp
@@ -6,7 +6,6 @@
 
 #include "base/string_utils.hpp"
 
-
 namespace generator
 {
 RelationTagsBase::RelationTagsBase() : m_cache(14 /* logCacheSize */) {}
@@ -50,16 +49,15 @@ void RelationTagsNode::Process(RelationElement const & e)
 
   bool const isBoundary = (type == "boundary");
   bool const isPlaceDest = Base::IsKeyTagExists("place") || Base::IsKeyTagExists("de:place");
-  bool const processAssociatedStreet = type == "associatedStreet" &&
-                                       Base::IsKeyTagExists("addr:housenumber") &&
-                                       !Base::IsKeyTagExists("addr:street");
+  bool const processAssociatedStreet =
+      type == "associatedStreet" && Base::IsKeyTagExists("addr:housenumber") && !Base::IsKeyTagExists("addr:street");
   for (auto const & p : e.m_tags)
   {
     // - used in railway station processing
     // - used in routing information
     // - used in building addresses matching
-    if (p.first == "network" || p.first == "operator" || p.first == "route" ||
-        p.first == "maxspeed" || p.first.starts_with("addr:"))
+    if (p.first == "network" || p.first == "operator" || p.first == "route" || p.first == "maxspeed" ||
+        p.first.starts_with("addr:"))
     {
       if (!Base::IsKeyTagExists(p.first))
         Base::AddCustomTag(p);
@@ -87,7 +85,7 @@ bool RelationTagsWay::IsAcceptBoundary(RelationElement const & e) const
   // Skip religious_administration, political, etc ...
   // https://github.com/organicmaps/organicmaps/issues/4702
   auto const v = e.GetTagValue("boundary");
-  return (!v.empty () && classif().GetTypeByPathSafe({"boundary", v}) != Classificator::INVALID_TYPE);
+  return (!v.empty() && classif().GetTypeByPathSafe({"boundary", v}) != Classificator::INVALID_TYPE);
 }
 
 void RelationTagsWay::Process(RelationElement const & e)
@@ -169,9 +167,8 @@ void RelationTagsWay::Process(RelationElement const & e)
 
   bool const isPlaceDest = Base::IsKeyTagExists("place") || Base::IsKeyTagExists("de:place");
   bool const isAssociatedStreet = type == "associatedStreet";
-  bool const processAssociatedStreet = isAssociatedStreet &&
-                                       Base::IsKeyTagExists("addr:housenumber") &&
-                                       !Base::IsKeyTagExists("addr:street");
+  bool const processAssociatedStreet =
+      isAssociatedStreet && Base::IsKeyTagExists("addr:housenumber") && !Base::IsKeyTagExists("addr:street");
 
   for (auto const & p : e.m_tags)
   {
@@ -189,8 +186,8 @@ void RelationTagsWay::Process(RelationElement const & e)
       Base::AddCustomTag("addr:street", p.second);
 
     // All "name" tags should be skipped.
-    if (p.first.starts_with("name") || p.first.starts_with("int_name") ||
-        p.first.starts_with("old_name") || p.first.starts_with("alt_name"))
+    if (p.first.starts_with("name") || p.first.starts_with("int_name") || p.first.starts_with("old_name") ||
+        p.first.starts_with("alt_name"))
     {
       continue;
     }
diff --git a/generator/relation_tags.hpp b/generator/relation_tags.hpp
index 946513cf4..2d5671c9b 100644
--- a/generator/relation_tags.hpp
+++ b/generator/relation_tags.hpp
@@ -26,7 +26,7 @@ public:
   void Reset(uint64_t fID, OsmElement * p);
 
   template <class Reader>
-  base::ControlFlow operator() (uint64_t id, Reader & reader)
+  base::ControlFlow operator()(uint64_t id, Reader & reader)
   {
     bool exists = false;
     RelationElement & e = m_cache.Find(id, exists);
@@ -41,10 +41,7 @@ protected:
   static bool IsSkipRelation(std::string_view type);
   bool IsKeyTagExists(std::string_view const & key) const;
   void AddCustomTag(std::string_view key, std::string_view value);
-  void AddCustomTag(std::pair<std::string, std::string> const & p)
-  {
-    AddCustomTag(p.first, p.second);
-  }
+  void AddCustomTag(std::pair<std::string, std::string> const & p) { AddCustomTag(p.first, p.second); }
   void AddTagIfNotExist(std::string_view key, std::string_view value);
 
   virtual void Process(RelationElement const & e) = 0;
@@ -62,7 +59,7 @@ protected:
   void Process(RelationElement const & e) override;
 
 private:
-    using Base = RelationTagsBase;
+  using Base = RelationTagsBase;
 };
 
 class RelationTagsWay : public RelationTagsBase
diff --git a/generator/relation_tags_enricher.cpp b/generator/relation_tags_enricher.cpp
index 0c9ab0904..fd572af61 100644
--- a/generator/relation_tags_enricher.cpp
+++ b/generator/relation_tags_enricher.cpp
@@ -6,7 +6,8 @@
 namespace generator
 {
 RelationTagsEnricher::RelationTagsEnricher(std::shared_ptr<cache::IntermediateDataReader> const & cache)
-  : m_cache(cache) {}
+  : m_cache(cache)
+{}
 
 void RelationTagsEnricher::operator()(OsmElement & p)
 {
diff --git a/generator/restriction_collector.cpp b/generator/restriction_collector.cpp
index 7ee00f048..a5aa148e5 100644
--- a/generator/restriction_collector.cpp
+++ b/generator/restriction_collector.cpp
@@ -30,7 +30,8 @@ char const kOnly[] = "Only";
 char const kNoUTurn[] = "NoUTurn";
 char const kOnlyUTurn[] = "OnlyUTurn";
 
-template <class TokenizerT> bool ParseLineOfWayIds(TokenizerT & iter, std::vector<base::GeoObjectId> & numbers)
+template <class TokenizerT>
+bool ParseLineOfWayIds(TokenizerT & iter, std::vector<base::GeoObjectId> & numbers)
 {
   uint64_t number = 0;
   for (; iter; ++iter)
@@ -52,14 +53,15 @@ RestrictionCollector::RestrictionCollector(std::string const & osmIdsToFeatureId
 
 bool RestrictionCollector::Process(std::string const & restrictionPath)
 {
-  SCOPE_GUARD(clean, [this]() {
+  SCOPE_GUARD(clean, [this]()
+  {
     m_osmIdToFeatureIds.clear();
     m_restrictions.clear();
   });
 
   if (!ParseRestrictions(restrictionPath))
   {
-    LOG(LWARNING, ("An error happened while parsing restrictions from file:",  restrictionPath));
+    LOG(LWARNING, ("An error happened while parsing restrictions from file:", restrictionPath));
     return false;
   }
 
@@ -117,8 +119,7 @@ bool RestrictionCollector::ParseRestrictions(std::string const & path)
   return true;
 }
 
-Joint::Id RestrictionCollector::GetFirstCommonJoint(uint32_t firstFeatureId,
-                                                    uint32_t secondFeatureId) const
+Joint::Id RestrictionCollector::GetFirstCommonJoint(uint32_t firstFeatureId, uint32_t secondFeatureId) const
 {
   uint32_t const firstLen = m_indexGraph.GetRoadGeometry(firstFeatureId).GetPointsCount();
   uint32_t const secondLen = m_indexGraph.GetRoadGeometry(secondFeatureId).GetPointsCount();
@@ -128,22 +129,17 @@ Joint::Id RestrictionCollector::GetFirstCommonJoint(uint32_t firstFeatureId,
 
   std::unordered_set<Joint::Id> used;
   for (uint32_t i = 0; i < firstLen; ++i)
-  {
     if (firstRoad.GetJointId(i) != Joint::kInvalidId)
       used.emplace(firstRoad.GetJointId(i));
-  }
 
   for (uint32_t i = 0; i < secondLen; ++i)
-  {
     if (used.count(secondRoad.GetJointId(i)) != 0)
       return secondRoad.GetJointId(i);
-  }
 
   return Joint::kInvalidId;
 }
 
-bool RestrictionCollector::FeatureHasPointWithCoords(uint32_t featureId,
-                                                     m2::PointD const & coords) const
+bool RestrictionCollector::FeatureHasPointWithCoords(uint32_t featureId, m2::PointD const & coords) const
 {
   auto const & roadGeometry = m_indexGraph.GetRoadGeometry(featureId);
   uint32_t const pointsCount = roadGeometry.GetPointsCount();
@@ -157,8 +153,7 @@ bool RestrictionCollector::FeatureHasPointWithCoords(uint32_t featureId,
   return false;
 }
 
-bool RestrictionCollector::FeaturesAreCross(m2::PointD const & coords,
-                                            uint32_t prev, uint32_t cur) const
+bool RestrictionCollector::FeaturesAreCross(m2::PointD const & coords, uint32_t prev, uint32_t cur) const
 {
   if (coords == kNoCoords)
     return GetFirstCommonJoint(prev, cur) != Joint::kInvalidId;
@@ -177,8 +172,7 @@ Restriction::Type ConvertUTurnToSimpleRestriction(Restriction::Type type)
   // OsmId of |from| member is differ from |to| member.
   // So we "convert" such no_u_turn to any no_* restriction.
   // And we do the same thing with only_u_turn.
-  return type == Restriction::Type::NoUTurn ? Restriction::Type::No
-                                            : Restriction::Type::Only;
+  return type == Restriction::Type::NoUTurn ? Restriction::Type::No : Restriction::Type::Only;
 }
 
 void ConvertToUTurnIfPossible(Restriction::Type & type, m2::PointD const & coords,
@@ -194,17 +188,11 @@ void ConvertToUTurnIfPossible(Restriction::Type & type, m2::PointD const & coord
   // with the same |from| and |to| member with node as |via|):
   //
   // So we "convert" such relations to no_u_turn or only_u_turn restrictions.
-  if (featureIds.size() == 2 &&
-      featureIds.front() == featureIds.back() &&
-      coords != RestrictionCollector::kNoCoords)
-  {
-    type = type == Restriction::Type::No ? Restriction::Type::NoUTurn
-                                         : Restriction::Type::OnlyUTurn;
-  }
+  if (featureIds.size() == 2 && featureIds.front() == featureIds.back() && coords != RestrictionCollector::kNoCoords)
+    type = type == Restriction::Type::No ? Restriction::Type::NoUTurn : Restriction::Type::OnlyUTurn;
 }
 
-bool RestrictionCollector::CheckAndProcessUTurn(Restriction::Type & restrictionType,
-                                                m2::PointD const & coords,
+bool RestrictionCollector::CheckAndProcessUTurn(Restriction::Type & restrictionType, m2::PointD const & coords,
                                                 std::vector<uint32_t> & featureIds) const
 {
   CHECK(IsUTurnType(restrictionType), ());
@@ -245,10 +233,8 @@ bool RestrictionCollector::CheckAndProcessUTurn(Restriction::Type & restrictionT
     // According to the wiki: via must be at the end or at the beginning of feature.
     // https://wiki.openstreetmap.org/wiki/Relation:restriction
     static auto constexpr kEps = 1e-5;
-    bool const viaIsFirstNode =
-        AlmostEqualAbs(coords, mercator::FromLatLon(road.GetPoint(0)), kEps);
-    bool const viaIsLastNode =
-        AlmostEqualAbs(coords, mercator::FromLatLon(road.GetPoint(n - 1)), kEps);
+    bool const viaIsFirstNode = AlmostEqualAbs(coords, mercator::FromLatLon(road.GetPoint(0)), kEps);
+    bool const viaIsLastNode = AlmostEqualAbs(coords, mercator::FromLatLon(road.GetPoint(n - 1)), kEps);
 
     if (viaIsFirstNode)
     {
@@ -268,8 +254,7 @@ bool RestrictionCollector::CheckAndProcessUTurn(Restriction::Type & restrictionT
   return true;
 }
 
-bool RestrictionCollector::IsRestrictionValid(Restriction::Type & restrictionType,
-                                              m2::PointD const & coords,
+bool RestrictionCollector::IsRestrictionValid(Restriction::Type & restrictionType, m2::PointD const & coords,
                                               std::vector<uint32_t> & featureIds) const
 {
   if (featureIds.empty() || !m_indexGraph.IsRoad(featureIds[0]))
@@ -294,8 +279,7 @@ bool RestrictionCollector::IsRestrictionValid(Restriction::Type & restrictionTyp
   return CheckAndProcessUTurn(restrictionType, coords, featureIds);
 }
 
-bool RestrictionCollector::AddRestriction(m2::PointD const & coords,
-                                          Restriction::Type restrictionType,
+bool RestrictionCollector::AddRestriction(m2::PointD const & coords, Restriction::Type restrictionType,
                                           std::vector<base::GeoObjectId> const & osmIds)
 {
   std::vector<uint32_t> featureIds(osmIds.size());
@@ -353,8 +337,7 @@ void FromString(std::string_view str, Restriction::Type & type)
     return;
   }
 
-  CHECK(false,
-        ("Invalid line:", str, "expected:", kNo, "or", kOnly, "or", kNoUTurn, "or", kOnlyUTurn));
+  CHECK(false, ("Invalid line:", str, "expected:", kNo, "or", kOnly, "or", kNoUTurn, "or", kOnlyUTurn));
   UNREACHABLE();
 }
 
@@ -372,8 +355,8 @@ void FromString(std::string_view str, RestrictionWriter::ViaType & type)
     return;
   }
 
-  CHECK(false, ("Invalid line:", str, "expected:", RestrictionWriter::kNodeString,
-                "or", RestrictionWriter::kWayString));
+  CHECK(false,
+        ("Invalid line:", str, "expected:", RestrictionWriter::kNodeString, "or", RestrictionWriter::kWayString));
 }
 
 void FromString(std::string_view str, double & number)
diff --git a/generator/restriction_collector.hpp b/generator/restriction_collector.hpp
index 7e23e852c..2d3eb0cb7 100644
--- a/generator/restriction_collector.hpp
+++ b/generator/restriction_collector.hpp
@@ -73,8 +73,7 @@ private:
   /// junctions.
   bool FeaturesAreCross(m2::PointD const & coords, uint32_t prev, uint32_t cur) const;
 
-  bool IsRestrictionValid(Restriction::Type & restrictionType,
-                          m2::PointD const & coords,
+  bool IsRestrictionValid(Restriction::Type & restrictionType, m2::PointD const & coords,
                           std::vector<uint32_t> & featureIds) const;
 
   bool CheckAndProcessUTurn(Restriction::Type & restrictionType, m2::PointD const & coords,
@@ -89,8 +88,7 @@ private:
   /// \note This method should be called to add a restriction when feature ids of the restriction
   /// are unknown. The feature ids should be set later with a call of |SetFeatureId(...)| method.
   /// \returns true if restriction is add and false otherwise.
-  bool AddRestriction(m2::PointD const & coords, Restriction::Type type,
-                      std::vector<base::GeoObjectId> const & osmIds);
+  bool AddRestriction(m2::PointD const & coords, Restriction::Type type, std::vector<base::GeoObjectId> const & osmIds);
 
   std::vector<Restriction> m_restrictions;
   routing::OsmIdToFeatureIds m_osmIdToFeatureIds;
diff --git a/generator/restriction_generator.cpp b/generator/restriction_generator.cpp
index c91442fe8..0cae221c0 100644
--- a/generator/restriction_generator.cpp
+++ b/generator/restriction_generator.cpp
@@ -10,8 +10,8 @@
 #include "platform/country_file.hpp"
 #include "platform/local_country_file.hpp"
 
-#include "coding/files_container.hpp"
 #include "coding/file_writer.hpp"
+#include "coding/files_container.hpp"
 
 #include "base/checked_cast.hpp"
 #include "base/logging.hpp"
@@ -38,17 +38,16 @@ std::unique_ptr<IndexGraph> CreateIndexGraph(std::string const & mwmPath, std::s
 
   MwmValue mwmValue(platform::LocalCountryFile::MakeTemporary(mwmPath));
 
-  auto graph = std::make_unique<IndexGraph>(
-      std::make_shared<Geometry>(GeometryLoader::CreateFromFile(mwmPath, vehicleModel)),
-      EdgeEstimator::Create(VehicleType::Car, *vehicleModel, nullptr /* trafficStash */,
-        nullptr /* dataSource */, nullptr /* numMvmIds */));
+  auto graph =
+      std::make_unique<IndexGraph>(std::make_shared<Geometry>(GeometryLoader::CreateFromFile(mwmPath, vehicleModel)),
+                                   EdgeEstimator::Create(VehicleType::Car, *vehicleModel, nullptr /* trafficStash */,
+                                                         nullptr /* dataSource */, nullptr /* numMvmIds */));
 
   DeserializeIndexGraph(mwmValue, VehicleType::Car, *graph);
   return graph;
 }
 
-void SerializeRestrictions(RestrictionCollector & restrictionCollector,
-                           std::string const & mwmPath)
+void SerializeRestrictions(RestrictionCollector & restrictionCollector, std::string const & mwmPath)
 {
   std::vector<Restriction> restrictions = restrictionCollector.StealRestrictions();
   CHECK(std::is_sorted(restrictions.cbegin(), restrictions.cend()), ());
@@ -61,10 +60,9 @@ void SerializeRestrictions(RestrictionCollector & restrictionCollector,
     decltype(restrictions.cbegin()) firstNextType;
     if (i != RestrictionHeader::kRestrictionTypes.size())
     {
-      firstNextType =
-          std::lower_bound(restrictions.cbegin(), restrictions.cend(),
-                           Restriction(RestrictionHeader::kRestrictionTypes[i], {} /* links */),
-                           base::LessBy(&Restriction::m_type));
+      firstNextType = std::lower_bound(restrictions.cbegin(), restrictions.cend(),
+                                       Restriction(RestrictionHeader::kRestrictionTypes[i], {} /* links */),
+                                       base::LessBy(&Restriction::m_type));
     }
     else
     {
@@ -73,8 +71,7 @@ void SerializeRestrictions(RestrictionCollector & restrictionCollector,
 
     CHECK_GREATER_OR_EQUAL(i, 1, ("Unexpected overflow."));
     auto const prevType = RestrictionHeader::kRestrictionTypes[i - 1];
-    header.SetNumberOf(prevType,
-                       base::checked_cast<uint32_t>(std::distance(prevTypeEndIt, firstNextType)));
+    header.SetNumberOf(prevType, base::checked_cast<uint32_t>(std::distance(prevTypeEndIt, firstNextType)));
 
     prevTypeEndIt = firstNextType;
   }
@@ -89,9 +86,7 @@ void SerializeRestrictions(RestrictionCollector & restrictionCollector,
   RestrictionSerializer::Serialize(header, restrictions.begin(), restrictions.end(), *w);
 }
 
-bool BuildRoadRestrictions(IndexGraph & graph,
-                           std::string const & mwmPath,
-                           std::string const & restrictionPath,
+bool BuildRoadRestrictions(IndexGraph & graph, std::string const & mwmPath, std::string const & restrictionPath,
                            std::string const & osmIdsToFeatureIdsPath)
 {
   LOG(LINFO, ("Generating restrictions for", restrictionPath));
@@ -102,7 +97,8 @@ bool BuildRoadRestrictions(IndexGraph & graph,
 
   if (!collector->HasRestrictions())
   {
-    LOG(LWARNING, ("No restrictions created. Check that", restrictionPath, "and", osmIdsToFeatureIdsPath, "are available."));
+    LOG(LWARNING,
+        ("No restrictions created. Check that", restrictionPath, "and", osmIdsToFeatureIdsPath, "are available."));
     return false;
   }
 
diff --git a/generator/restriction_generator.hpp b/generator/restriction_generator.hpp
index fcce889da..33e520ff9 100644
--- a/generator/restriction_generator.hpp
+++ b/generator/restriction_generator.hpp
@@ -11,8 +11,7 @@ namespace routing_builder
 std::unique_ptr<routing::IndexGraph> CreateIndexGraph(std::string const & mwmPath, std::string const & country,
                                                       CountryParentNameGetterFn const & countryParentNameGetterFn);
 
-void SerializeRestrictions(RestrictionCollector & restrictionCollector,
-                           std::string const & mwmPath);
+void SerializeRestrictions(RestrictionCollector & restrictionCollector, std::string const & mwmPath);
 // This function is the generator tool's interface to building the mwm
 // section which contains road restrictions. (See https://wiki.openstreetmap.org/wiki/Restriction)
 // As long as the restrictions are built later than the road features themselves
@@ -38,8 +37,6 @@ void SerializeRestrictions(RestrictionCollector & restrictionCollector,
 /// \param osmIdsToFeatureIdsPath a binary file with mapping form osm ids to feature ids.
 /// One osm id is mapped to one feature id. The file should be saved with the help of
 /// OsmID2FeatureID class or using a similar way.
-bool BuildRoadRestrictions(routing::IndexGraph & graph,
-                           std::string const & mwmPath,
-                           std::string const & restrictionPath,
-                           std::string const & osmIdsToFeatureIdsPath);
+bool BuildRoadRestrictions(routing::IndexGraph & graph, std::string const & mwmPath,
+                           std::string const & restrictionPath, std::string const & osmIdsToFeatureIdsPath);
 }  // namespace routing_builder
diff --git a/generator/restriction_writer.cpp b/generator/restriction_writer.cpp
index 9628a46da..1a982e666 100644
--- a/generator/restriction_writer.cpp
+++ b/generator/restriction_writer.cpp
@@ -26,49 +26,36 @@ namespace routing_builder
 {
 using namespace routing;
 
-std::vector<std::pair<std::string, Restriction::Type>> const kRestrictionTypes ={
-    {"no_entry", Restriction::Type::No},
-    {"no_exit", Restriction::Type::No},
-    {"no_left_turn", Restriction::Type::No},
-    {"no_right_turn", Restriction::Type::No},
-    {"no_straight_on", Restriction::Type::No},
-    {"no_u_turn", Restriction::Type::NoUTurn},
-    {"only_left_turn", Restriction::Type::Only},
-    {"only_right_turn", Restriction::Type::Only},
-    {"only_straight_on", Restriction::Type::Only},
-    {"only_u_turn", Restriction::Type::OnlyUTurn}
-};
+std::vector<std::pair<std::string, Restriction::Type>> const kRestrictionTypes = {
+    {"no_entry", Restriction::Type::No},           {"no_exit", Restriction::Type::No},
+    {"no_left_turn", Restriction::Type::No},       {"no_right_turn", Restriction::Type::No},
+    {"no_straight_on", Restriction::Type::No},     {"no_u_turn", Restriction::Type::NoUTurn},
+    {"only_left_turn", Restriction::Type::Only},   {"only_right_turn", Restriction::Type::Only},
+    {"only_straight_on", Restriction::Type::Only}, {"only_u_turn", Restriction::Type::OnlyUTurn}};
 
 /// \brief Converts restriction type form string to RestrictionCollector::Type.
 /// \returns true if conversion was successful and false otherwise.
 bool TagToType(std::string const & tag, Restriction::Type & type)
 {
   auto const it = base::FindIf(kRestrictionTypes,
-                               [&tag](std::pair<std::string, Restriction::Type> const & v) {
-    return v.first == tag;
-  });
+                               [&tag](std::pair<std::string, Restriction::Type> const & v) { return v.first == tag; });
   if (it == kRestrictionTypes.cend())
-    return false; // Unsupported restriction type.
+    return false;  // Unsupported restriction type.
 
   type = it->second;
   return true;
 }
 
-std::vector<RelationElement::Member> GetMembersByTag(RelationElement const & relationElement,
-                                                     std::string const & tag)
+std::vector<RelationElement::Member> GetMembersByTag(RelationElement const & relationElement, std::string const & tag)
 {
   std::vector<RelationElement::Member> result;
   for (auto const & member : relationElement.m_ways)
-  {
     if (member.second == tag)
       result.emplace_back(member);
-  }
 
   for (auto const & member : relationElement.m_nodes)
-  {
     if (member.second == tag)
       result.emplace_back(member);
-  }
 
   return result;
 }
@@ -76,16 +63,12 @@ std::vector<RelationElement::Member> GetMembersByTag(RelationElement const & rel
 OsmElement::EntityType GetType(RelationElement const & relationElement, uint64_t osmId)
 {
   for (auto const & member : relationElement.m_ways)
-  {
     if (member.first == osmId)
       return OsmElement::EntityType::Way;
-  }
 
   for (auto const & member : relationElement.m_nodes)
-  {
     if (member.first == osmId)
       return OsmElement::EntityType::Node;
-  }
 
   UNREACHABLE();
 }
@@ -94,7 +77,8 @@ std::string const RestrictionWriter::kNodeString = "node";
 std::string const RestrictionWriter::kWayString = "way";
 
 RestrictionWriter::RestrictionWriter(std::string const & filename, IDRInterfacePtr const & cache)
-  : generator::CollectorInterface(filename), m_cache(cache)
+  : generator::CollectorInterface(filename)
+  , m_cache(cache)
 {
   m_stream.exceptions(std::fstream::failbit | std::fstream::badbit);
   m_stream.open(GetTmpFilename());
@@ -106,7 +90,7 @@ std::shared_ptr<generator::CollectorInterface> RestrictionWriter::Clone(IDRInter
   return std::make_shared<RestrictionWriter>(GetFilename(), cache ? cache : m_cache);
 }
 
-//static
+// static
 RestrictionWriter::ViaType RestrictionWriter::ConvertFromString(std::string const & str)
 {
   if (str == kNodeString)
@@ -118,10 +102,8 @@ RestrictionWriter::ViaType RestrictionWriter::ConvertFromString(std::string cons
   UNREACHABLE();
 }
 
-bool ValidateOsmRestriction(std::vector<RelationElement::Member> & from,
-                            std::vector<RelationElement::Member> & via,
-                            std::vector<RelationElement::Member> & to,
-                            RelationElement const & relationElement)
+bool ValidateOsmRestriction(std::vector<RelationElement::Member> & from, std::vector<RelationElement::Member> & via,
+                            std::vector<RelationElement::Member> & to, RelationElement const & relationElement)
 {
   if (relationElement.GetType() != "restriction")
     return false;
@@ -138,9 +120,8 @@ bool ValidateOsmRestriction(std::vector<RelationElement::Member> & from,
   // https://wiki.openstreetmap.org/wiki/Relation:restriction#Members
   if (via.size() != 1)
   {
-    bool const allMembersAreWays = base::AllOf(via, [&](auto const & member) {
-      return GetType(relationElement, member.first) == OsmElement::EntityType::Way;
-    });
+    bool const allMembersAreWays = base::AllOf(via, [&](auto const & member)
+    { return GetType(relationElement, member.first) == OsmElement::EntityType::Way; });
 
     if (!allMembersAreWays)
       return false;
@@ -171,12 +152,9 @@ void RestrictionWriter::CollectRelation(RelationElement const & relationElement)
     return;
 
   auto const viaType =
-      GetType(relationElement, via.back().first) == OsmElement::EntityType::Node ? ViaType::Node
-                                                                                 : ViaType::Way;
+      GetType(relationElement, via.back().first) == OsmElement::EntityType::Node ? ViaType::Node : ViaType::Way;
 
-  auto const printHeader = [&]() {
-    m_stream << DebugPrint(type) << "," << DebugPrint(viaType) << ",";
-  };
+  auto const printHeader = [&]() { m_stream << DebugPrint(type) << "," << DebugPrint(viaType) << ","; };
 
   if (viaType == ViaType::Way)
   {
@@ -214,7 +192,10 @@ void RestrictionWriter::Save()
     CHECK(base::CopyFileX(GetTmpFilename(), GetFilename()), ());
 }
 
-void RestrictionWriter::OrderCollectedData() { generator::OrderTextFileByLine(GetFilename()); }
+void RestrictionWriter::OrderCollectedData()
+{
+  generator::OrderTextFileByLine(GetFilename());
+}
 
 void RestrictionWriter::MergeInto(RestrictionWriter & collector) const
 {
diff --git a/generator/restriction_writer.hpp b/generator/restriction_writer.hpp
index 6b94a4cd7..f04ea9115 100644
--- a/generator/restriction_writer.hpp
+++ b/generator/restriction_writer.hpp
@@ -12,7 +12,6 @@ namespace routing_builder
 class RestrictionWriter : public generator::CollectorInterface
 {
 public:
-
   enum class ViaType
   {
     Node,
@@ -49,4 +48,3 @@ private:
 
 std::string DebugPrint(RestrictionWriter::ViaType const & type);
 }  // namespace routing_builder
-
diff --git a/generator/road_access_generator.cpp b/generator/road_access_generator.cpp
index af2fa6d70..8fd948714 100644
--- a/generator/road_access_generator.cpp
+++ b/generator/road_access_generator.cpp
@@ -24,7 +24,6 @@
 
 #include "3party/opening_hours/opening_hours.hpp"
 
-
 namespace routing_builder
 {
 using std::string, std::vector;
@@ -35,20 +34,16 @@ using ConditionalTagsList = RoadAccessTagProcessor::ConditionalTagsList;
 /// @name Got from: https://taginfo.openstreetmap.org/search?q=%3Aconditional
 /// @{
 vector<string> const kCarAccessConditionalTags = {
-    "motor_vehicle:conditional", "motorcar:conditional", "vehicle:conditional",
+    "motor_vehicle:conditional",
+    "motorcar:conditional",
+    "vehicle:conditional",
 };
 
-vector<string> const kDefaultAccessConditionalTags = {
-    "access:conditional", "locked:conditional"
-};
+vector<string> const kDefaultAccessConditionalTags = {"access:conditional", "locked:conditional"};
 
-vector<string> const kPedestrianAccessConditionalTags = {
-    "foot:conditional"
-};
+vector<string> const kPedestrianAccessConditionalTags = {"foot:conditional"};
 
-vector<string> const kBycicleAccessConditionalTags = {
-    "bicycle:conditional"
-};
+vector<string> const kBycicleAccessConditionalTags = {"bicycle:conditional"};
 /// @}
 
 // Some tags assume access:conditional in fact, but doesn't have it.
@@ -56,8 +51,7 @@ vector<string> const kBycicleAccessConditionalTags = {
 // for routing it is like: "access:conditional = no @ (Feb - Dec)"
 std::map<OsmElement::Tag, string> kTagToAccessConditional = {
     {OsmElement::Tag("winter_road", "yes"), "no @ (Mar - Nov)"},
-    {OsmElement::Tag("ice_road", "yes"), "no @ (Mar - Nov)"}
-};
+    {OsmElement::Tag("ice_road", "yes"), "no @ (Mar - Nov)"}};
 
 TagMapping const kMotorCarTagMapping = {
     {OsmElement::Tag("motorcar", "yes"), RoadAccess::Type::Yes},
@@ -147,43 +141,26 @@ TagMapping const kDefaultTagMapping = {
 
 // Removed secondary, tertiary from car list. Example https://www.openstreetmap.org/node/8169922700
 std::set<OsmElement::Tag> const kHighwaysWhereIgnoreBarriersWithoutAccessCar = {
-    {"highway", "motorway"},
-    {"highway", "motorway_link"},
-    {"highway", "trunk"},
-    {"highway", "trunk_link"},
-    {"highway", "primary"},
-    {"highway", "primary_link"},
+    {"highway", "motorway"},   {"highway", "motorway_link"}, {"highway", "trunk"},
+    {"highway", "trunk_link"}, {"highway", "primary"},       {"highway", "primary_link"},
 };
 
 /// @todo Looks controversial for secondary/tertiary, but leave as-is for bicycle.
 std::set<OsmElement::Tag> const kHighwaysWhereIgnoreBarriersWithoutAccessBicycle = {
-    {"highway", "motorway"},
-    {"highway", "motorway_link"},
-    {"highway", "trunk"},
-    {"highway", "trunk_link"},
-    {"highway", "primary"},
-    {"highway", "primary_link"},
-    {"highway", "secondary"},
-    {"highway", "secondary_link"},
-    {"highway", "tertiary"},
-    {"highway", "tertiary_link"},
-    {"highway", "cycleway"},  // Bicycle barriers without access on cycleway are ignored :)
+    {"highway", "motorway"}, {"highway", "motorway_link"}, {"highway", "trunk"},     {"highway", "trunk_link"},
+    {"highway", "primary"},  {"highway", "primary_link"},  {"highway", "secondary"}, {"highway", "secondary_link"},
+    {"highway", "tertiary"}, {"highway", "tertiary_link"}, {"highway", "cycleway"},  // Bicycle barriers without access
+                                                                                     // on cycleway are ignored :)
 };
 
 // motorway_junction blocks not only highway link, but main road also.
 // Actually, tagging motorway_junction with access is not used, see https://overpass-turbo.eu/s/1d1t
 // https://github.com/organicmaps/organicmaps/issues/1389
-std::set<OsmElement::Tag> const kIgnoreAccess = {
-    {"highway", "motorway_junction"}
-};
+std::set<OsmElement::Tag> const kIgnoreAccess = {{"highway", "motorway_junction"}};
 
 std::set<OsmElement::Tag> const kHighwaysWhereIgnoreAccessDestination = {
-    {"highway", "motorway"},
-    {"highway", "motorway_link"},
-    {"highway", "trunk"},
-    {"highway", "trunk_link"},
-    {"highway", "primary"},
-    {"highway", "primary_link"},
+    {"highway", "motorway"},   {"highway", "motorway_link"}, {"highway", "trunk"},
+    {"highway", "trunk_link"}, {"highway", "primary"},       {"highway", "primary_link"},
 };
 
 auto const kEmptyAccess = RoadAccess::Type::Count;
@@ -207,8 +184,8 @@ RoadAccess::Type GetAccessTypeFromMapping(OsmElement const & elem, TagMapping co
   return (isLocked ? RoadAccess::Type::Locked : kEmptyAccess);
 }
 
-std::optional<std::pair<string, string>> GetTagValueConditionalAccess(
-    OsmElement const & elem, vector<ConditionalTagsList> const & tagsList)
+std::optional<std::pair<string, string>> GetTagValueConditionalAccess(OsmElement const & elem,
+                                                                      vector<ConditionalTagsList> const & tagsList)
 {
   if (tagsList.empty())
     return {};
@@ -216,17 +193,13 @@ std::optional<std::pair<string, string>> GetTagValueConditionalAccess(
   for (auto const & tags : tagsList)
   {
     for (auto const & tag : tags)
-    {
       if (elem.HasTag(tag))
         return std::make_pair(tag, elem.GetTag(tag));
-    }
   }
 
   for (auto const & [tag, access] : kTagToAccessConditional)
-  {
     if (elem.HasTag(tag.m_key, tag.m_value))
       return std::make_pair(kDefaultAccessConditionalTags.front(), access);
-  }
 
   return {};
 }
@@ -242,8 +215,7 @@ string GetVehicleTypeForAccessConditional(string const & accessConditionalTag)
 }
 
 // RoadAccessTagProcessor --------------------------------------------------------------------------
-RoadAccessTagProcessor::RoadAccessTagProcessor(VehicleType vehicleType)
-  : m_vehicleType(vehicleType)
+RoadAccessTagProcessor::RoadAccessTagProcessor(VehicleType vehicleType) : m_vehicleType(vehicleType)
 {
   switch (vehicleType)
   {
@@ -283,9 +255,7 @@ RoadAccessTagProcessor::RoadAccessTagProcessor(VehicleType vehicleType)
     m_accessMappings.push_back(&kTransitTagMapping);
     break;
 
-  case VehicleType::Count:
-    CHECK(false, ("Bad vehicle type"));
-    break;
+  case VehicleType::Count: CHECK(false, ("Bad vehicle type")); break;
   }
 }
 
@@ -301,11 +271,8 @@ void RoadAccessTagProcessor::Process(OsmElement const & elem)
       {
         switch (accessType)
         {
-        case RoadAccess::Type::Permit:
-          isPermit = true;
-          break;
-        case RoadAccess::Type::Locked:
-          return RoadAccess::Type::Private;
+        case RoadAccess::Type::Permit: isPermit = true; break;
+        case RoadAccess::Type::Locked: return RoadAccess::Type::Private;
         default:
           // Patch: (permit + access=no) -> private.
           if (accessType == RoadAccess::Type::No && isPermit)
@@ -327,10 +294,8 @@ void RoadAccessTagProcessor::Process(OsmElement const & elem)
     if (op == RoadAccess::Type::Destination)
     {
       for (auto const & tag : elem.m_tags)
-      {
         if (kHighwaysWhereIgnoreAccessDestination.count(tag))
           return;
-      }
     }
 
     if (elem.IsNode())
@@ -373,10 +338,8 @@ void RoadAccessTagProcessor::ProcessConditional(OsmElement const & elem)
 
   auto const & parser = AccessConditionalTagParser::Instance();
   for (auto & access : parser.ParseAccessConditionalTag(op->first, op->second))
-  {
     if (access.m_accessType != kEmptyAccess)
       m_wayToAccessConditional.FindOrInsert(elem.m_id)->emplace_back(std::move(access));
-  }
 }
 
 void RoadAccessTagProcessor::SetIgnoreBarriers(OsmElement const & elem)
@@ -415,13 +378,14 @@ void RoadAccessTagProcessor::MergeInto(RoadAccessTagProcessor & processor) const
   m_wayToAccess.MergeInto(processor.m_wayToAccess);
   m_wayToAccessConditional.MergeInto(processor.m_wayToAccessConditional);
 
-  processor.m_ignoreWABarriers.insert(processor.m_ignoreWABarriers.end(),
-                                      m_ignoreWABarriers.begin(), m_ignoreWABarriers.end());
+  processor.m_ignoreWABarriers.insert(processor.m_ignoreWABarriers.end(), m_ignoreWABarriers.begin(),
+                                      m_ignoreWABarriers.end());
 }
 
 // RoadAccessCollector ------------------------------------------------------------
 RoadAccessCollector::RoadAccessCollector(string const & filename, IDRInterfacePtr cache)
-  : generator::CollectorInterface(filename), m_cache(std::move(cache))
+  : generator::CollectorInterface(filename)
+  , m_cache(std::move(cache))
 {
   for (uint8_t i = 0; i < static_cast<uint8_t>(VehicleType::Count); ++i)
     m_tagProcessors.emplace_back(static_cast<VehicleType>(i));
@@ -438,10 +402,8 @@ void RoadAccessCollector::CollectFeature(feature::FeatureBuilder const & fb, Osm
   /// Can't say for sure is it good or not, but as it is.
 
   for (auto const & tag : elem.m_tags)
-  {
     if (kIgnoreAccess.count(tag))
       return;
-  }
 
   for (auto & p : m_tagProcessors)
   {
@@ -626,8 +588,8 @@ AccessConditionalTagParser::AccessConditionalTagParser()
   m_vehiclesToRoadAccess.push_back(kDefaultTagMapping);
 }
 
-vector<AccessConditional> AccessConditionalTagParser::ParseAccessConditionalTag(
-    string const & tag, string const & value) const
+vector<AccessConditional> AccessConditionalTagParser::ParseAccessConditionalTag(string const & tag,
+                                                                                string const & value) const
 {
   size_t pos = 0;
 
@@ -688,8 +650,8 @@ vector<AccessConditional> AccessConditionalTagParser::ParseAccessConditionalTag(
 }
 
 // static
-std::optional<std::pair<size_t, string>>
-AccessConditionalTagParser::ReadUntilSymbol(string const & input, size_t startPos, char symbol)
+std::optional<std::pair<size_t, string>> AccessConditionalTagParser::ReadUntilSymbol(string const & input,
+                                                                                     size_t startPos, char symbol)
 {
   string result;
   while (startPos < input.size() && input[startPos] != symbol)
@@ -704,8 +666,8 @@ AccessConditionalTagParser::ReadUntilSymbol(string const & input, size_t startPo
   return {};
 }
 
-RoadAccess::Type AccessConditionalTagParser::GetAccessByVehicleAndStringValue(
-    string const & vehicleFromTag, string const & stringAccessValue) const
+RoadAccess::Type AccessConditionalTagParser::GetAccessByVehicleAndStringValue(string const & vehicleFromTag,
+                                                                              string const & stringAccessValue) const
 {
   bool isPermit = false;
   for (auto const & vehicleToAccess : m_vehiclesToRoadAccess)
@@ -715,11 +677,8 @@ RoadAccess::Type AccessConditionalTagParser::GetAccessByVehicleAndStringValue(
     {
       switch (it->second)
       {
-      case RoadAccess::Type::Permit:
-        isPermit = true;
-        break;
-      case RoadAccess::Type::Locked:
-        return RoadAccess::Type::Private;
+      case RoadAccess::Type::Permit: isPermit = true; break;
+      case RoadAccess::Type::Locked: return RoadAccess::Type::Private;
       default:
         // Patch: (permit + access=no) -> private.
         if (it->second == RoadAccess::Type::No && isPermit)
diff --git a/generator/road_access_generator.hpp b/generator/road_access_generator.hpp
index b543c4320..766291a06 100644
--- a/generator/road_access_generator.hpp
+++ b/generator/road_access_generator.hpp
@@ -21,18 +21,20 @@ namespace routing
 {
 class OsmWay2FeaturePoint;
 
-template <class Sink> void Save(Sink & sink, RoadAccess::Type const & ac)
+template <class Sink>
+void Save(Sink & sink, RoadAccess::Type const & ac)
 {
   WriteToSink(sink, static_cast<uint8_t>(ac));
 }
 
-template <class Source> void Load(Source & src, RoadAccess::Type & ac)
+template <class Source>
+void Load(Source & src, RoadAccess::Type & ac)
 {
   uint8_t const res = ReadPrimitiveFromSource<uint8_t>(src);
   CHECK_LESS(res, uint8_t(RoadAccess::Type::Count), ());
   ac = static_cast<RoadAccess::Type>(res);
 }
-} // namspace routing
+}  // namespace routing
 
 namespace routing_builder
 {
@@ -45,9 +47,9 @@ struct AccessConditional
 {
   AccessConditional() = default;
   AccessConditional(RoadAccess::Type accessType, std::string const & openingHours)
-      : m_accessType(accessType), m_openingHours(openingHours)
-  {
-  }
+    : m_accessType(accessType)
+    , m_openingHours(openingHours)
+  {}
 
   bool operator==(AccessConditional const & rhs) const
   {
@@ -65,7 +67,8 @@ struct AccessConditional
 
 using ConditionalRAVectorT = std::vector<AccessConditional>;
 
-template <class Sink> void Save(Sink & sink, ConditionalRAVectorT const & ac)
+template <class Sink>
+void Save(Sink & sink, ConditionalRAVectorT const & ac)
 {
   WriteToSink(sink, uint32_t(ac.size()));
   for (auto const & e : ac)
@@ -75,7 +78,8 @@ template <class Sink> void Save(Sink & sink, ConditionalRAVectorT const & ac)
   }
 }
 
-template <class Source> void Load(Source & src, ConditionalRAVectorT & vec)
+template <class Source>
+void Load(Source & src, ConditionalRAVectorT & vec)
 {
   uint32_t const count = ReadPrimitiveFromSource<uint32_t>(src);
   vec.resize(count);
@@ -154,16 +158,15 @@ public:
   static AccessConditionalTagParser const & Instance();
 
   AccessConditionalTagParser();
-  std::vector<AccessConditional> ParseAccessConditionalTag(
-      std::string const & tag, std::string const & value) const;
+  std::vector<AccessConditional> ParseAccessConditionalTag(std::string const & tag, std::string const & value) const;
 
 private:
   RoadAccess::Type GetAccessByVehicleAndStringValue(std::string const & vehicleFromTag,
                                                     std::string const & stringAccessValue) const;
 
-  static std::optional<std::pair<size_t, std::string>> ReadUntilSymbol(std::string const & input,
-                                                                size_t startPos, char symbol) ;
-  static std::string TrimAndDropAroundParentheses(std::string input) ;
+  static std::optional<std::pair<size_t, std::string>> ReadUntilSymbol(std::string const & input, size_t startPos,
+                                                                       char symbol);
+  static std::string TrimAndDropAroundParentheses(std::string input);
 
   std::vector<RoadAccessTagProcessor::TagMapping> m_vehiclesToRoadAccess;
 };
diff --git a/generator/routing_city_boundaries_processor.cpp b/generator/routing_city_boundaries_processor.cpp
index e64bb1f8c..a2f962de9 100644
--- a/generator/routing_city_boundaries_processor.cpp
+++ b/generator/routing_city_boundaries_processor.cpp
@@ -3,9 +3,9 @@
 #include "geometry/distance_on_sphere.hpp"
 #include "geometry/mercator.hpp"
 
-#include "std/boost_geometry.hpp"
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
+#include "std/boost_geometry.hpp"
 
 namespace generator
 {
@@ -16,7 +16,8 @@ double AreaOnEarth(std::vector<m2::PointD> const & points)
   using LonLatCoords = bg::cs::spherical_equatorial<bg::degree>;
   bg::model::ring<bg::model::point<double, 2, LonLatCoords>> sphericalPolygon;
 
-  auto const addPoint = [&sphericalPolygon](auto const & point) {
+  auto const addPoint = [&sphericalPolygon](auto const & point)
+  {
     auto const latlon = mercator::ToLatLon(point);
     sphericalPolygon.emplace_back(latlon.m_lon, latlon.m_lat);
   };
diff --git a/generator/routing_city_boundaries_processor.hpp b/generator/routing_city_boundaries_processor.hpp
index a5a491261..f6525cb2a 100644
--- a/generator/routing_city_boundaries_processor.hpp
+++ b/generator/routing_city_boundaries_processor.hpp
@@ -7,4 +7,4 @@
 namespace generator
 {
 double AreaOnEarth(std::vector<m2::PointD> const & points);
-}  // namespace routing_city_boundaries
+}  // namespace generator
diff --git a/generator/routing_helpers.cpp b/generator/routing_helpers.cpp
index d1ee367df..dabce7fe2 100644
--- a/generator/routing_helpers.cpp
+++ b/generator/routing_helpers.cpp
@@ -16,31 +16,27 @@ void ForEachWayFromFile(std::string const & filename, ToDo && toDo)
 {
   using namespace generator;
   CHECK(ForEachOsmId2FeatureId(filename,
-      [&](CompositeId const & compositeOsmId, uint32_t featureId)
-      {
-        auto const osmId = compositeOsmId.m_mainId;
-        if (osmId.GetType() == base::GeoObjectId::Type::ObsoleteOsmWay)
-          toDo(featureId, osmId);
-      }), ("Can't load osm id mapping from", filename));
+                               [&](CompositeId const & compositeOsmId, uint32_t featureId)
+  {
+    auto const osmId = compositeOsmId.m_mainId;
+    if (osmId.GetType() == base::GeoObjectId::Type::ObsoleteOsmWay)
+      toDo(featureId, osmId);
+  }),
+        ("Can't load osm id mapping from", filename));
 }
 
-void AddFeatureId(base::GeoObjectId osmId, uint32_t featureId,
-                  OsmIdToFeatureIds & osmIdToFeatureIds)
+void AddFeatureId(base::GeoObjectId osmId, uint32_t featureId, OsmIdToFeatureIds & osmIdToFeatureIds)
 {
   osmIdToFeatureIds[osmId].push_back(featureId);
 }
 
-void ParseWaysOsmIdToFeatureIdMapping(std::string const & osmIdsToFeatureIdPath,
-                                      OsmIdToFeatureIds & osmIdToFeatureIds)
+void ParseWaysOsmIdToFeatureIdMapping(std::string const & osmIdsToFeatureIdPath, OsmIdToFeatureIds & osmIdToFeatureIds)
 {
   ForEachWayFromFile(osmIdsToFeatureIdPath, [&](uint32_t featureId, base::GeoObjectId osmId)
-  {
-    AddFeatureId(osmId, featureId, osmIdToFeatureIds);
-  });
+  { AddFeatureId(osmId, featureId, osmIdToFeatureIds); });
 }
 
-void ParseWaysFeatureIdToOsmIdMapping(std::string const & osmIdsToFeatureIdPath,
-                                      FeatureIdToOsmId & featureIdToOsmId)
+void ParseWaysFeatureIdToOsmIdMapping(std::string const & osmIdsToFeatureIdPath, FeatureIdToOsmId & featureIdToOsmId)
 {
   featureIdToOsmId.clear();
 
@@ -63,14 +59,12 @@ public:
     ParseWaysOsmIdToFeatureIdMapping(osmIdsToFeatureIdsPath, m_osm2features);
   }
 
-  virtual void ForEachFeature(uint64_t wayID, std::function<void (uint32_t)> const & fn) override
+  virtual void ForEachFeature(uint64_t wayID, std::function<void(uint32_t)> const & fn) override
   {
     auto it = m_osm2features.find(base::MakeOsmWay(wayID));
     if (it != m_osm2features.end())
-    {
       for (uint32_t featureID : it->second)
         fn(featureID);
-    }
   }
 
   virtual void ForEachNodeIdx(uint64_t wayID, uint32_t candidateIdx, m2::PointU pt,
@@ -125,8 +119,8 @@ public:
   }
 };
 
-std::unique_ptr<OsmWay2FeaturePoint> CreateWay2FeatureMapper(
-    std::string const & dataFilePath, std::string const & osmIdsToFeatureIdsPath)
+std::unique_ptr<OsmWay2FeaturePoint> CreateWay2FeatureMapper(std::string const & dataFilePath,
+                                                             std::string const & osmIdsToFeatureIdsPath)
 {
   return std::make_unique<OsmWay2FeaturePointImpl>(dataFilePath, osmIdsToFeatureIdsPath);
 }
diff --git a/generator/routing_helpers.hpp b/generator/routing_helpers.hpp
index 3c50e4608..4142bd13b 100644
--- a/generator/routing_helpers.hpp
+++ b/generator/routing_helpers.hpp
@@ -11,7 +11,10 @@
 #include <string>
 #include <vector>
 
-namespace feature { class FeatureBuilder; }
+namespace feature
+{
+class FeatureBuilder;
+}
 
 namespace routing
 {
@@ -25,32 +28,29 @@ using FeatureIdToOsmId = std::map<uint32_t, base::GeoObjectId>;
 // when an area and its boundary may correspond to the same osm id.
 /// @note As for road features a road |osmId| may correspond to several feature ids if
 /// the |osmId| is split by a mini_roundabout or a turning_loop.
-void AddFeatureId(base::GeoObjectId osmId, uint32_t featureId,
-                  OsmIdToFeatureIds & osmIdToFeatureIds);
+void AddFeatureId(base::GeoObjectId osmId, uint32_t featureId, OsmIdToFeatureIds & osmIdToFeatureIds);
 
 // These methods fill |osmIdToFeatureIds| and |featureIdToOsmId| with features of
 // type base::GeoObjectId::Type::ObsoleteOsmWay. This type contains all the roads
 // and besides that other linear objects like streams and fences.
 /// @note One osm id can be mapped on several feature ids, as described above in AddFeatureId.
-void ParseWaysOsmIdToFeatureIdMapping(std::string const & osmIdsToFeatureIdPath,
-                                      OsmIdToFeatureIds & osmIdToFeatureIds);
-void ParseWaysFeatureIdToOsmIdMapping(std::string const & osmIdsToFeatureIdPath,
-                                      FeatureIdToOsmId & featureIdToOsmId);
+void ParseWaysOsmIdToFeatureIdMapping(std::string const & osmIdsToFeatureIdPath, OsmIdToFeatureIds & osmIdToFeatureIds);
+void ParseWaysFeatureIdToOsmIdMapping(std::string const & osmIdsToFeatureIdPath, FeatureIdToOsmId & featureIdToOsmId);
 
 class OsmWay2FeaturePoint
 {
 public:
   virtual ~OsmWay2FeaturePoint() = default;
 
-  virtual void ForEachFeature(uint64_t wayID, std::function<void (uint32_t)> const & fn) = 0;
+  virtual void ForEachFeature(uint64_t wayID, std::function<void(uint32_t)> const & fn) = 0;
   /// Pass (featureID, nodeIdx) for the correspondent point |pt| in OSM |wayID|.
   /// @param[in]  candidateIdx  Used as a hint (like it was in original OSM way).
   virtual void ForEachNodeIdx(uint64_t wayID, uint32_t candidateIdx, m2::PointU pt,
-                              std::function<void (uint32_t, uint32_t)> const & fn) = 0;
+                              std::function<void(uint32_t, uint32_t)> const & fn) = 0;
 };
 
-std::unique_ptr<OsmWay2FeaturePoint> CreateWay2FeatureMapper(
-    std::string const & dataFilePath, std::string const & osmIdsToFeatureIdsPath);
+std::unique_ptr<OsmWay2FeaturePoint> CreateWay2FeatureMapper(std::string const & dataFilePath,
+                                                             std::string const & osmIdsToFeatureIdsPath);
 
 bool IsRoadWay(feature::FeatureBuilder const & fb);
 }  // namespace routing
diff --git a/generator/routing_index_generator.cpp b/generator/routing_index_generator.cpp
index ebcb63a17..5b7588f8d 100644
--- a/generator/routing_index_generator.cpp
+++ b/generator/routing_index_generator.cpp
@@ -73,19 +73,13 @@ public:
     if (types.HasWithSubclass(m_constructionType))
       return 0;
 
-    return CalcMask([&](VehicleModelInterface const & model)
-    {
-      return model.IsRoad(types);
-    });
+    return CalcMask([&](VehicleModelInterface const & model) { return model.IsRoad(types); });
   }
 
   VehicleMask CalcOneWayMask(FeatureType & f) const
   {
     feature::TypesHolder const types(f);
-    return CalcMask([&](VehicleModelInterface const & model)
-    {
-      return model.IsOneWay(types);
-    });
+    return CalcMask([&](VehicleModelInterface const & model) { return model.IsOneWay(types); });
   }
 
 private:
@@ -113,11 +107,9 @@ private:
 class Processor final
 {
 public:
-  Processor(string const & country,
-            CountryParentNameGetterFn const & countryParentNameGetterFn)
+  Processor(string const & country, CountryParentNameGetterFn const & countryParentNameGetterFn)
     : m_maskBuilder(country, countryParentNameGetterFn)
-  {
-  }
+  {}
 
   void ProcessAllFeatures(string const & filename)
   {
@@ -165,57 +157,41 @@ private:
 class IndexGraphWrapper final
 {
 public:
-  IndexGraphWrapper(IndexGraph & graph, Segment const & start)
-    : m_graph(graph), m_start(start)
-  {
-  }
+  IndexGraphWrapper(IndexGraph & graph, Segment const & start) : m_graph(graph), m_start(start) {}
 
   /// @name For compatibility with IndexGraphStarterJoints
   /// @{
   Segment GetStartSegment() const { return m_start; }
   Segment GetFinishSegment() const { return {}; }
   bool ConvertToReal(Segment const & /* segment */) const { return false; }
-  RouteWeight HeuristicCostEstimate(Segment const & /* from */,
-                                             ms::LatLon const & /* to */)
+  RouteWeight HeuristicCostEstimate(Segment const & /* from */, ms::LatLon const & /* to */)
   {
     CHECK(false, ("This method exists only for compatibility with IndexGraphStarterJoints"));
     return GetAStarWeightZero<RouteWeight>();
   }
 
-  bool AreWavesConnectible(
-      IndexGraph::Parents<JointSegment> const & /* forwardParents */,
-      JointSegment const & /* commonVertex */,
-      IndexGraph::Parents<JointSegment> const & /* backwardParents */,
-      WorldGraph::FakeConverterT const & /* fakeFeatureConverter */)
+  bool AreWavesConnectible(IndexGraph::Parents<JointSegment> const & /* forwardParents */,
+                           JointSegment const & /* commonVertex */,
+                           IndexGraph::Parents<JointSegment> const & /* backwardParents */,
+                           WorldGraph::FakeConverterT const & /* fakeFeatureConverter */)
   {
     return true;
   }
 
-  void SetAStarParents(bool /* forward */,
-                       IndexGraph::Parents<JointSegment> & parents)
-  {
-    m_AStarParents = &parents;
-  }
+  void SetAStarParents(bool /* forward */, IndexGraph::Parents<JointSegment> & parents) { m_AStarParents = &parents; }
 
-  void DropAStarParents()
-  {
-    m_AStarParents = nullptr;
-  }
+  void DropAStarParents() { m_AStarParents = nullptr; }
 
   RouteWeight GetAStarWeightEpsilon() { return RouteWeight(0.0); }
 
   RouteWeight GetCrossBorderPenalty(NumMwmId mwmId1, NumMwmId mwmId2) { return RouteWeight(0); }
   /// @}
 
-  ms::LatLon const & GetPoint(Segment const & s, bool forward)
-  {
-    return m_graph.GetPoint(s, forward);
-  }
+  ms::LatLon const & GetPoint(Segment const & s, bool forward) { return m_graph.GetPoint(s, forward); }
 
   using SegmentEdgeListT = IndexGraph::SegmentEdgeListT;
   using EdgeListT = SegmentEdgeListT;
-  void GetEdgesList(Segment const & child, bool isOutgoing,
-                    SegmentEdgeListT & edges)
+  void GetEdgesList(Segment const & child, bool isOutgoing, SegmentEdgeListT & edges)
   {
     m_graph.GetEdgeList(child, isOutgoing, true /* useRoutingOptions */, edges);
   }
@@ -223,25 +199,16 @@ public:
   using JointEdgeListT = IndexGraph::JointEdgeListT;
   using WeightListT = IndexGraph::WeightListT;
 
-  void GetEdgeList(
-      astar::VertexData<JointSegment, RouteWeight> const & vertexData,
-      Segment const & parent, bool isOutgoing, JointEdgeListT & edges,
-      WeightListT & parentWeights) const
+  void GetEdgeList(astar::VertexData<JointSegment, RouteWeight> const & vertexData, Segment const & parent,
+                   bool isOutgoing, JointEdgeListT & edges, WeightListT & parentWeights) const
   {
     CHECK(m_AStarParents, ());
-    return m_graph.GetEdgeList(vertexData.m_vertex, parent, isOutgoing, edges, parentWeights,
-                               *m_AStarParents);
+    return m_graph.GetEdgeList(vertexData.m_vertex, parent, isOutgoing, edges, parentWeights, *m_AStarParents);
   }
 
-  bool IsJoint(Segment const & segment, bool fromStart) const
-  {
-    return IsJointOrEnd(segment, fromStart);
-  }
+  bool IsJoint(Segment const & segment, bool fromStart) const { return IsJointOrEnd(segment, fromStart); }
 
-  bool IsJointOrEnd(Segment const & segment, bool fromStart) const
-  {
-    return m_graph.IsJointOrEnd(segment, fromStart);
-  }
+  bool IsJointOrEnd(Segment const & segment, bool fromStart) const { return m_graph.IsJointOrEnd(segment, fromStart); }
 
   template <typename Vertex>
   RouteWeight HeuristicCostEstimate(Vertex const & /* from */, m2::PointD const & /* to */)
@@ -263,8 +230,7 @@ class DijkstraWrapperJoints : public IndexGraphStarterJoints<IndexGraphWrapper>
 public:
   DijkstraWrapperJoints(IndexGraphWrapper & graph, Segment const & start)
     : IndexGraphStarterJoints<IndexGraphWrapper>(graph, start)
-  {
-  }
+  {}
 
   Weight HeuristicCostEstimate(Vertex const & /* from */, Vertex const & /* to */) override
   {
@@ -275,11 +241,10 @@ public:
 /// \brief Fills |transitions| for osm id case. That means |Transition::m_roadMask| for items in
 /// |transitions| will be combination of |VehicleType::Pedestrian|, |VehicleType::Bicycle|
 /// and |VehicleType::Car|.
-void CalcCrossMwmTransitions(
-    string const & mwmFile, string const & intermediateDir, string const & mappingFile,
-    vector<m2::RegionD> const & borders, string const & country,
-    CountryParentNameGetterFn const & countryParentNameGetterFn,
-    CrossMwmConnectorBuilderEx<base::GeoObjectId> & builder)
+void CalcCrossMwmTransitions(string const & mwmFile, string const & intermediateDir, string const & mappingFile,
+                             vector<m2::RegionD> const & borders, string const & country,
+                             CountryParentNameGetterFn const & countryParentNameGetterFn,
+                             CrossMwmConnectorBuilderEx<base::GeoObjectId> & builder)
 {
   VehicleMaskBuilder const maskMaker(country, countryParentNameGetterFn);
   std::map<uint32_t, base::GeoObjectId> featureIdToOsmId;
@@ -290,7 +255,8 @@ void CalcCrossMwmTransitions(
   using CrossMwmInfoT = generator::CrossMwmOsmWaysCollector::CrossMwmInfo;
   auto const crossMwmOsmIdWays = CrossMwmInfoT::LoadFromFileToSet(path);
 
-  ForEachFeature(mwmFile, [&](FeatureType & f, uint32_t featureId) {
+  ForEachFeature(mwmFile, [&](FeatureType & f, uint32_t featureId)
+  {
     VehicleMask const roadMask = maskMaker.CalcRoadMask(f);
     if (roadMask == 0)
       return;
@@ -315,11 +281,10 @@ void CalcCrossMwmTransitions(
 
 /// \brief Fills |transitions| for transit case. That means Transition::m_roadMask for items in
 /// |transitions| will be equal to VehicleType::Transit after call of this method.
-void CalcCrossMwmTransitions(
-    string const & mwmFile, string const & intermediateDir, string const & mappingFile,
-    vector<m2::RegionD> const & borders, string const & country,
-    CountryParentNameGetterFn const & /* countryParentNameGetterFn */,
-    CrossMwmConnectorBuilderEx<connector::TransitId> & builder)
+void CalcCrossMwmTransitions(string const & mwmFile, string const & intermediateDir, string const & mappingFile,
+                             vector<m2::RegionD> const & borders, string const & country,
+                             CountryParentNameGetterFn const & /* countryParentNameGetterFn */,
+                             CrossMwmConnectorBuilderEx<connector::TransitId> & builder)
 {
   CHECK(mappingFile.empty(), ());
   CHECK(intermediateDir.empty(), ());
@@ -328,8 +293,7 @@ void CalcCrossMwmTransitions(
     FilesContainerR cont(mwmFile);
     if (!cont.IsExist(TRANSIT_FILE_TAG))
     {
-      LOG(LINFO, ("Transit cross mwm section is not generated because no transit section in mwm:",
-                  mwmFile));
+      LOG(LINFO, ("Transit cross mwm section is not generated because no transit section in mwm:", mwmFile));
       return;
     }
     auto reader = cont.GetReader(TRANSIT_FILE_TAG);
@@ -341,11 +305,11 @@ void CalcCrossMwmTransitions(
     auto const & stops = graphData.GetStops();
     auto const & edges = graphData.GetEdges();
 
-    auto const getStopIdPoint = [&stops](StopId stopId) -> m2::PointD const & {
+    auto const getStopIdPoint = [&stops](StopId stopId) -> m2::PointD const &
+    {
       auto const it = equal_range(stops.cbegin(), stops.cend(), Stop(stopId));
-      CHECK_EQUAL(
-          distance(it.first, it.second), 1,
-          ("A stop with id:", stopId, "is not unique or there's no such item in stops:", stops));
+      CHECK_EQUAL(distance(it.first, it.second), 1,
+                  ("A stop with id:", stopId, "is not unique or there's no such item in stops:", stops));
       return it.first->GetPoint();
     };
 
@@ -363,10 +327,9 @@ void CalcCrossMwmTransitions(
         continue;
 
       // Note. One way mask is set to kTransitMask because all transit edges are one way edges.
-      builder.AddTransition(
-          connector::TransitId(e.GetStop1Id(), e.GetStop2Id(), e.GetLineId()),
-          i /* feature id */, 0 /* segment index */, kTransitMask,
-          kTransitMask /* one way mask */, stop2In /* forward is enter */);
+      builder.AddTransition(connector::TransitId(e.GetStop1Id(), e.GetStop2Id(), e.GetLineId()), i /* feature id */,
+                            0 /* segment index */, kTransitMask, kTransitMask /* one way mask */,
+                            stop2In /* forward is enter */);
     }
   }
   catch (Reader::OpenException const & e)
@@ -379,11 +342,11 @@ void CalcCrossMwmTransitions(
 /// CalcCrossMwmTransitions() when we abandon support of "subway" transit section version.
 /// \brief Fills |transitions| for experimental transit case. It means that Transition::m_roadMask
 /// for items in |transitions| will be equal to VehicleType::Transit after the call of this method.
-void CalcCrossMwmTransitionsExperimental(
-    string const & mwmFile, vector<m2::RegionD> const & borders, string const & country,
-    CountryParentNameGetterFn const & /* countryParentNameGetterFn */,
-    ::transit::experimental::EdgeIdToFeatureId const & edgeIdToFeatureId,
-    CrossMwmConnectorBuilderEx<connector::TransitId> & builder)
+void CalcCrossMwmTransitionsExperimental(string const & mwmFile, vector<m2::RegionD> const & borders,
+                                         string const & country,
+                                         CountryParentNameGetterFn const & /* countryParentNameGetterFn */,
+                                         ::transit::experimental::EdgeIdToFeatureId const & edgeIdToFeatureId,
+                                         CrossMwmConnectorBuilderEx<connector::TransitId> & builder)
 {
   try
   {
@@ -402,13 +365,12 @@ void CalcCrossMwmTransitionsExperimental(
     auto const & stops = transitData.GetStops();
     auto const & edges = transitData.GetEdges();
 
-    auto const getStopIdPoint = [&stops](::transit::TransitId stopId) {
-      auto const it = find_if(
-          stops.begin(), stops.end(),
-          [stopId](::transit::experimental::Stop const & stop) { return stop.GetId() == stopId; });
+    auto const getStopIdPoint = [&stops](::transit::TransitId stopId)
+    {
+      auto const it = find_if(stops.begin(), stops.end(),
+                              [stopId](::transit::experimental::Stop const & stop) { return stop.GetId() == stopId; });
 
-      CHECK(it != stops.end(),
-            ("stopId:", stopId, "is not found in stops. Size of stops:", stops.size()));
+      CHECK(it != stops.end(), ("stopId:", stopId, "is not found in stops. Size of stops:", stops.size()));
       return it->GetPoint();
     };
 
@@ -422,17 +384,14 @@ void CalcCrossMwmTransitionsExperimental(
       if (m2::RegionsContain(borders, stop1Point) == stop2In)
         continue;
 
-      auto const it =
-          edgeIdToFeatureId.find(::transit::EdgeId(e.GetStop1Id(), e.GetStop2Id(), e.GetLineId()));
-      CHECK(it != edgeIdToFeatureId.end(),
-            ("Each edge in transitData corresponds to the edgeIdToFeatureId key."));
+      auto const it = edgeIdToFeatureId.find(::transit::EdgeId(e.GetStop1Id(), e.GetStop2Id(), e.GetLineId()));
+      CHECK(it != edgeIdToFeatureId.end(), ("Each edge in transitData corresponds to the edgeIdToFeatureId key."));
 
       uint32_t const featureId = it->second;
       // Note. One way mask is set to kTransitMask because all transit edges are one way edges.
-      builder.AddTransition(
-          connector::TransitId(e.GetStop1Id(), e.GetStop2Id(), e.GetLineId()),
-          featureId /* feature id */, 0 /* segment index */, kTransitMask,
-          kTransitMask /* one way mask */, stop2In /* forward is enter */);
+      builder.AddTransition(connector::TransitId(e.GetStop1Id(), e.GetStop2Id(), e.GetLineId()),
+                            featureId /* feature id */, 0 /* segment index */, kTransitMask,
+                            kTransitMask /* one way mask */, stop2In /* forward is enter */);
     }
   }
   catch (Reader::OpenException const & e)
@@ -442,11 +401,11 @@ void CalcCrossMwmTransitionsExperimental(
 }
 
 // Dummy specialization. We need it to compile this function overload for experimental transit.
-void CalcCrossMwmTransitionsExperimental(
-    string const & mwmFile, vector<m2::RegionD> const & borders, string const & country,
-    CountryParentNameGetterFn const & countryParentNameGetterFn,
-    ::transit::experimental::EdgeIdToFeatureId const & edgeIdToFeatureId,
-    CrossMwmConnectorBuilderEx<base::GeoObjectId> & builder)
+void CalcCrossMwmTransitionsExperimental(string const & mwmFile, vector<m2::RegionD> const & borders,
+                                         string const & country,
+                                         CountryParentNameGetterFn const & countryParentNameGetterFn,
+                                         ::transit::experimental::EdgeIdToFeatureId const & edgeIdToFeatureId,
+                                         CrossMwmConnectorBuilderEx<base::GeoObjectId> & builder)
 {
   CHECK(false, ("This is dummy specialization and it shouldn't be called."));
 }
@@ -457,13 +416,11 @@ void CalcCrossMwmTransitionsExperimental(
 /// are applicable for |connector::OsmId|.
 /// And |VehicleType::Transit| is applicable for |connector::TransitId|.
 template <typename CrossMwmId>
-void CalcCrossMwmConnectors(
-    string const & path, string const & mwmFile, string const & intermediateDir,
-    string const & country, CountryParentNameGetterFn const & countryParentNameGetterFn,
-    string const & mappingFile,
-    ::transit::experimental::EdgeIdToFeatureId const & edgeIdToFeatureId,
-    CrossMwmConnectorBuilderEx<CrossMwmId> & builder,
-    bool experimentalTransit = false)
+void CalcCrossMwmConnectors(string const & path, string const & mwmFile, string const & intermediateDir,
+                            string const & country, CountryParentNameGetterFn const & countryParentNameGetterFn,
+                            string const & mappingFile,
+                            ::transit::experimental::EdgeIdToFeatureId const & edgeIdToFeatureId,
+                            CrossMwmConnectorBuilderEx<CrossMwmId> & builder, bool experimentalTransit = false)
 {
   base::Timer timer;
   string const polyFile = base::JoinPath(path, BORDERS_DIR, country + BORDERS_EXTENSION);
@@ -484,15 +441,15 @@ void CalcCrossMwmConnectors(
   {
     CHECK(!edgeIdToFeatureId.empty(),
           ("Edge id to feature id must be filled before building cross-mwm transit section."));
-    CalcCrossMwmTransitionsExperimental(mwmFile, borders, country, countryParentNameGetterFn,
-                                        edgeIdToFeatureId, builder);
+    CalcCrossMwmTransitionsExperimental(mwmFile, borders, country, countryParentNameGetterFn, edgeIdToFeatureId,
+                                        builder);
   }
   else
   {
     CHECK(edgeIdToFeatureId.empty(),
           ("Edge id to feature id must not be filled for subway vesion of transit section."));
-    CalcCrossMwmTransitions(mwmFile, intermediateDir, mappingFile, borders, country,
-                            countryParentNameGetterFn, builder);
+    CalcCrossMwmTransitions(mwmFile, intermediateDir, mappingFile, borders, country, countryParentNameGetterFn,
+                            builder);
   }
 
   LOG(LINFO, ("Transitions count =", builder.GetTransitionsCount(), "elapsed:", timer.ElapsedSeconds(), "seconds"));
@@ -514,10 +471,8 @@ void FillWeights(string const & path, string const & mwmFile, string const & cou
   MwmValue mwmValue(LocalCountryFile(path, platform::CountryFile(country), 0 /* version */));
   uint32_t mwmNumRoads = DeserializeIndexGraphNumRoads(mwmValue, vhType);
   IndexGraph graph(std::make_shared<Geometry>(GeometryLoader::CreateFromFile(mwmFile, vehicleModel), mwmNumRoads),
-                                              EdgeEstimator::Create(vhType, *vehicleModel,
-                                                                    nullptr /* trafficStash */,
-                                                                    nullptr /* dataSource */,
-                                                                    nullptr /* numMvmIds */));
+                   EdgeEstimator::Create(vhType, *vehicleModel, nullptr /* trafficStash */, nullptr /* dataSource */,
+                                         nullptr /* numMvmIds */));
   graph.SetCurrentTimeGetter([time = GetCurrentTimestamp()] { return time; });
   DeserializeIndexGraph(mwmValue, vhType, graph);
 
@@ -623,11 +578,9 @@ void FillWeights(string const & path, string const & mwmFile, string const & cou
     return weight;
   });
 
-  LOG(LINFO, ("Leaps finished, elapsed =", timer.ElapsedSeconds(), "seconds.",
-              "Entries count =", connector.GetNumEnters(),
-              "Exits count =", connector.GetNumExits(),
-              "Edges count =", edgesCount,
-              "Bad weights count =", badWeightsCount));
+  LOG(LINFO,
+      ("Leaps finished, elapsed =", timer.ElapsedSeconds(), "seconds.", "Entries count =", connector.GetNumEnters(),
+       "Exits count =", connector.GetNumExits(), "Edges count =", edgesCount, "Bad weights count =", badWeightsCount));
 
   size_t pointsCount = 0;
   size_t roadsCount = 0;
@@ -637,8 +590,7 @@ void FillWeights(string const & path, string const & mwmFile, string const & cou
     pointsCount += graph.GetRoadGeometry(featureID).GetPointsCount();
   });
 
-  LOG(LINFO, ("Points count = ", pointsCount,
-              "Roads count = ", roadsCount,
+  LOG(LINFO, ("Points count = ", pointsCount, "Roads count = ", roadsCount,
               "Avg points = ", pointsCount / double(roadsCount)));
 }
 
@@ -661,8 +613,8 @@ bool BuildRoutingIndex(string const & filename, string const & country,
     IndexGraphSerializer::Serialize(graph, processor.GetMasks(), *writer);
     auto const sectionSize = writer->Pos() - startPos;
 
-    LOG(LINFO, ("Routing section created:", sectionSize, "bytes,", graph.GetNumRoads(), "roads,",
-                graph.GetNumJoints(), "joints,", graph.GetNumPoints(), "points"));
+    LOG(LINFO, ("Routing section created:", sectionSize, "bytes,", graph.GetNumRoads(), "roads,", graph.GetNumJoints(),
+                "joints,", graph.GetNumPoints(), "points"));
     return true;
   }
   catch (RootException const & e)
@@ -689,16 +641,16 @@ void SerializeCrossMwm(string const & mwmFile, string const & sectionName,
   LOG(LINFO, ("Cross mwm section generated, size:", sectionSize, "bytes"));
 }
 
-void BuildRoutingCrossMwmSection(string const & path, string const & mwmFile,
-                                 string const & country, string const & intermediateDir,
+void BuildRoutingCrossMwmSection(string const & path, string const & mwmFile, string const & country,
+                                 string const & intermediateDir,
                                  CountryParentNameGetterFn const & countryParentNameGetterFn,
                                  string const & osmToFeatureFile)
 {
   LOG(LINFO, ("Building cross mwm section for", country));
   CrossMwmConnectorBuilderEx<base::GeoObjectId> builder;
 
-  CalcCrossMwmConnectors(path, mwmFile, intermediateDir, country, countryParentNameGetterFn,
-                         osmToFeatureFile, {} /* edgeIdToFeatureId */, builder);
+  CalcCrossMwmConnectors(path, mwmFile, intermediateDir, country, countryParentNameGetterFn, osmToFeatureFile,
+                         {} /* edgeIdToFeatureId */, builder);
 
   // We use leaps for cars only. To use leaps for other vehicle types add weights generation
   // here and change WorldGraph mode selection rule in IndexRouter::CalculateSubroute.
@@ -707,17 +659,16 @@ void BuildRoutingCrossMwmSection(string const & path, string const & mwmFile,
   SerializeCrossMwm(mwmFile, CROSS_MWM_FILE_TAG, builder);
 }
 
-void BuildTransitCrossMwmSection(
-    string const & path, string const & mwmFile, string const & country,
-    CountryParentNameGetterFn const & countryParentNameGetterFn,
-    ::transit::experimental::EdgeIdToFeatureId const & edgeIdToFeatureId, bool experimentalTransit)
+void BuildTransitCrossMwmSection(string const & path, string const & mwmFile, string const & country,
+                                 CountryParentNameGetterFn const & countryParentNameGetterFn,
+                                 ::transit::experimental::EdgeIdToFeatureId const & edgeIdToFeatureId,
+                                 bool experimentalTransit)
 {
   LOG(LINFO, ("Building transit cross mwm section for", country));
   CrossMwmConnectorBuilderEx<connector::TransitId> builder;
 
-  CalcCrossMwmConnectors(path, mwmFile, "" /* intermediateDir */, country,
-                         countryParentNameGetterFn, "" /* mapping file */, edgeIdToFeatureId,
-                         builder, experimentalTransit);
+  CalcCrossMwmConnectors(path, mwmFile, "" /* intermediateDir */, country, countryParentNameGetterFn,
+                         "" /* mapping file */, edgeIdToFeatureId, builder, experimentalTransit);
 
   SerializeCrossMwm(mwmFile, TRANSIT_CROSS_MWM_FILE_TAG, builder);
 }
diff --git a/generator/routing_index_generator.hpp b/generator/routing_index_generator.hpp
index 82df5010e..642dc48e7 100644
--- a/generator/routing_index_generator.hpp
+++ b/generator/routing_index_generator.hpp
@@ -17,16 +17,15 @@ bool BuildRoutingIndex(std::string const & filename, std::string const & country
 /// \note Before call of this method
 /// * all features and feature geometry should be generated
 /// * city_roads section should be generated
-void BuildRoutingCrossMwmSection(std::string const & path, std::string const & mwmFile,
-                                 std::string const & country, std::string const & intermediateDir,
+void BuildRoutingCrossMwmSection(std::string const & path, std::string const & mwmFile, std::string const & country,
+                                 std::string const & intermediateDir,
                                  CountryParentNameGetterFn const & countryParentNameGetterFn,
                                  std::string const & osmToFeatureFile);
 
 /// \brief Builds TRANSIT_CROSS_MWM_FILE_TAG section.
 /// \note Before a call of this method TRANSIT_FILE_TAG should be built.
-void BuildTransitCrossMwmSection(
-    std::string const & path, std::string const & mwmFile, std::string const & country,
-    CountryParentNameGetterFn const & countryParentNameGetterFn,
-    ::transit::experimental::EdgeIdToFeatureId const & edgeIdToFeatureId,
-    bool experimentalTransit = false);
-}  // namespace routing
+void BuildTransitCrossMwmSection(std::string const & path, std::string const & mwmFile, std::string const & country,
+                                 CountryParentNameGetterFn const & countryParentNameGetterFn,
+                                 ::transit::experimental::EdgeIdToFeatureId const & edgeIdToFeatureId,
+                                 bool experimentalTransit = false);
+}  // namespace routing_builder
diff --git a/generator/routing_world_roads_generator.cpp b/generator/routing_world_roads_generator.cpp
index e2a8434f6..ef2f85ecd 100644
--- a/generator/routing_world_roads_generator.cpp
+++ b/generator/routing_world_roads_generator.cpp
@@ -58,7 +58,8 @@ bool FillRoadsFromFile(CrossBorderGraph & graph, std::string const & roadsFilePa
   {
     auto reader = coding::CSVReader(roadsFilePath, false /* hasHeader */, ' ' /* delimiter */);
 
-    reader.ForEachRow([&](auto const & row) {
+    reader.ForEachRow([&](auto const & row)
+    {
       auto const & [segId, seg] = ReadSegment(row);
       graph.AddCrossBorderSegment(segId, seg);
     });
@@ -84,8 +85,7 @@ bool BuildWorldRoads(std::string const & mwmFilePath, std::string const & roadsF
     return false;
   }
 
-  CHECK(!graph.m_segments.empty(),
-        ("Road segments for CrossBorderGraph should be set.", roadsFilePath));
+  CHECK(!graph.m_segments.empty(), ("Road segments for CrossBorderGraph should be set.", roadsFilePath));
 
   FilesContainerW cont(mwmFilePath, FileWriter::OP_WRITE_EXISTING);
   auto writer = cont.GetWriter(ROUTING_WORLD_FILE_TAG);
diff --git a/generator/search_index_builder.cpp b/generator/search_index_builder.cpp
index 03d66fc05..a20cef037 100644
--- a/generator/search_index_builder.cpp
+++ b/generator/search_index_builder.cpp
@@ -46,16 +46,12 @@
 #include <unordered_map>
 #include <vector>
 
-
 namespace indexer
 {
 using namespace strings;
 using namespace search;
 
-SynonymsHolder::SynonymsHolder()
-  : SynonymsHolder(base::JoinPath(GetPlatform().ResourcesDir(), "synonyms.txt"))
-{
-}
+SynonymsHolder::SynonymsHolder() : SynonymsHolder(base::JoinPath(GetPlatform().ResourcesDir(), "synonyms.txt")) {}
 
 SynonymsHolder::SynonymsHolder(std::string const & fPath)
 {
@@ -130,11 +126,7 @@ class FeatureNameInserter
   base::TopStatsCounter<std::string> m_stats;
 
 public:
-  explicit FeatureNameInserter(ContT & keyValuePairs)
-    : m_suffixes(GetDACHStreets())
-    , m_keyValuePairs(keyValuePairs)
-  {
-  }
+  explicit FeatureNameInserter(ContT & keyValuePairs) : m_suffixes(GetDACHStreets()), m_keyValuePairs(keyValuePairs) {}
   ~FeatureNameInserter()
   {
     LOG(LINFO, ("Top street's name tokens:"));
@@ -202,10 +194,8 @@ public:
     if (m_synonyms)
     {
       /// @todo Avoid creating temporary std::string.
-      m_synonyms->ForEach(std::string(name), [&](std::string const & utf8str)
-      {
-        tokens.push_back(NormalizeAndSimplifyString(utf8str));
-      });
+      m_synonyms->ForEach(std::string(name),
+                          [&](std::string const & utf8str) { tokens.push_back(NormalizeAndSimplifyString(utf8str)); });
     }
 
     static_assert(kMaxNumTokens > 0);
@@ -218,10 +208,8 @@ public:
 
     if (m_hasStreetType)
     {
-      StreetTokensFilter filter([this, lang](UniString const & token, size_t)
-      {
-        AddToken(lang, token);
-      }, false /* withMisprints */);
+      StreetTokensFilter filter([this, lang](UniString const & token, size_t) { AddToken(lang, token); },
+                                false /* withMisprints */);
 
       for (auto const & token : tokens)
       {
@@ -250,7 +238,8 @@ private:
 };
 
 // Returns true iff feature name was indexed as postcode and should be ignored for name indexing.
-template <class FnT> bool InsertPostcodes(FeatureType & f, FnT && fn)
+template <class FnT>
+bool InsertPostcodes(FeatureType & f, FnT && fn)
 {
   using namespace search;
 
@@ -286,14 +275,13 @@ template <class ContT>
 class FeatureInserter
 {
 public:
-  FeatureInserter(SynonymsHolder * synonyms, ContT & keyValuePairs,
-                  CategoriesHolder const & catHolder, std::pair<int, int> const & scales)
+  FeatureInserter(SynonymsHolder * synonyms, ContT & keyValuePairs, CategoriesHolder const & catHolder,
+                  std::pair<int, int> const & scales)
     : m_synonyms(synonyms)
     , m_categories(catHolder)
     , m_scales(scales)
     , m_inserter(keyValuePairs)
-  {
-  }
+  {}
 
   void operator()(FeatureType & f, uint32_t index)
   {
@@ -317,10 +305,8 @@ public:
     // Init inserter with Feature's index.
     m_inserter.SetFeature(index, synonyms, hasStreetType);
 
-    bool const useNameAsPostcode = InsertPostcodes(f, [this](auto const & token)
-    {
-      m_inserter.AddToken(search::kPostcodesLang, token);
-    });
+    bool const useNameAsPostcode =
+        InsertPostcodes(f, [this](auto const & token) { m_inserter.AddToken(search::kPostcodesLang, token); });
 
     if (!useNameAsPostcode)
     {
@@ -331,10 +317,8 @@ public:
 
     // Road number.
     if (hasStreetType)
-    {
       for (auto const & shield : ftypes::GetRoadShieldsNames(f))
         m_inserter(StringUtf8Multilang::kDefaultCode, shield);
-    }
 
     if (ftypes::IsAirportChecker::Instance()(types))
     {
@@ -351,10 +335,8 @@ public:
     auto const brand = f.GetMetadata(feature::Metadata::FMD_BRAND);
     if (!brand.empty())
     {
-      ForEachLocalizedBrands(brand, [this](BrandsHolder::Brand::Name const & name)
-      {
-        m_inserter(name.m_locale, name.m_name);
-      });
+      ForEachLocalizedBrands(
+          brand, [this](BrandsHolder::Brand::Name const & name) { m_inserter(name.m_locale, name.m_name); });
     }
 
     // Check for empty name just before categories indexing. After postcodes, and other meta ..
@@ -365,9 +347,7 @@ public:
 
     Classificator const & c = classif();
     GetCategoryTypes(m_categories, m_scales, types, [this, &c](uint32_t t)
-    {
-      m_inserter.AddToken(search::kCategoriesLang, search::FeatureTypeToString(c.GetIndexForType(t)));
-    });
+    { m_inserter.AddToken(search::kCategoriesLang, search::FeatureTypeToString(c.GetIndexForType(t))); });
   }
 
 private:
@@ -381,8 +361,7 @@ private:
 };
 
 template <class ContT>
-void AddFeatureNameIndexPairs(FeaturesVectorTest const & features,
-                              CategoriesHolder const & categoriesHolder,
+void AddFeatureNameIndexPairs(FeaturesVectorTest const & features, CategoriesHolder const & categoriesHolder,
                               ContT & keyValuePairs)
 {
   feature::DataHeader const & header = features.GetHeader();
@@ -391,7 +370,8 @@ void AddFeatureNameIndexPairs(FeaturesVectorTest const & features,
   if (header.GetType() == feature::DataHeader::MapType::World)
     synonyms = std::make_unique<SynonymsHolder>();
 
-  features.GetVector().ForEach(FeatureInserter(synonyms.get(), keyValuePairs, categoriesHolder, header.GetScaleRange()));
+  features.GetVector().ForEach(
+      FeatureInserter(synonyms.get(), keyValuePairs, categoriesHolder, header.GetScaleRange()));
 }
 
 void ReadAddressData(std::string const & filename, std::vector<feature::AddressData> & addrs)
@@ -406,8 +386,7 @@ void ReadAddressData(std::string const & filename, std::vector<feature::AddressD
 }
 
 template <class ObjT, class GetKeyFnT>
-std::optional<uint32_t> MatchObjectByName(std::string_view keyName, std::vector<ObjT> const & objs,
-                                          GetKeyFnT && getKey)
+std::optional<uint32_t> MatchObjectByName(std::string_view keyName, std::vector<ObjT> const & objs, GetKeyFnT && getKey)
 {
   size_t constexpr kSimilarityThresholdPercent = 10;
 
@@ -458,8 +437,8 @@ std::optional<uint32_t> MatchObjectByName(std::string_view keyName, std::vector<
   return {};
 }
 
-void BuildAddressTable(FilesContainerR & container, std::string const & addressDataFile,
-                       Writer & streetsWriter, Writer & placesWriter, uint32_t threadsCount)
+void BuildAddressTable(FilesContainerR & container, std::string const & addressDataFile, Writer & streetsWriter,
+                       Writer & placesWriter, uint32_t threadsCount)
 {
   std::vector<feature::AddressData> addrs;
   ReadAddressData(addressDataFile, addrs);
@@ -470,8 +449,7 @@ void BuildAddressTable(FilesContainerR & container, std::string const & addressD
   FrozenDataSource dataSource;
   MwmSet::MwmId mwmId;
   {
-    auto const regResult =
-        dataSource.RegisterMap(platform::LocalCountryFile::MakeTemporary(container.GetFileName()));
+    auto const regResult = dataSource.RegisterMap(platform::LocalCountryFile::MakeTemporary(container.GetFileName()));
     ASSERT_EQUAL(regResult.second, MwmSet::RegResult::Success, ());
     mwmId = regResult.first;
   }
@@ -514,26 +492,19 @@ void BuildAddressTable(FilesContainerR & container, std::string const & addressD
       {
         auto const streets = search::ReverseGeocoder::GetNearbyStreets(*contexts[threadIdx], center, kStreetRadiusM);
         streetId = MatchObjectByName(street, streets, [](std::string_view name)
-        {
-          return search::GetStreetNameAsKey(name, false /* ignoreStreetSynonyms */);
-        });
+        { return search::GetStreetNameAsKey(name, false /* ignoreStreetSynonyms */); });
 
         if (!streetId)
         {
           streetId = MatchObjectByName(street, streets, [](std::string_view name)
-          {
-            return search::GetStreetNameAsKey(name, true /* ignoreStreetSynonyms */);
-          });
+          { return search::GetStreetNameAsKey(name, true /* ignoreStreetSynonyms */); });
         }
       }
 
       if (!place.empty())
       {
         auto const places = search::ReverseGeocoder::GetNearbyPlaces(*contexts[threadIdx], center, kPlaceRadiusM);
-        placeId = MatchObjectByName(place, places, [](std::string_view name)
-        {
-          return strings::MakeUniString(name);
-        });
+        placeId = MatchObjectByName(place, places, [](std::string_view name) { return strings::MakeUniString(name); });
       }
 
       if (streetId || placeId)
@@ -589,11 +560,10 @@ void BuildAddressTable(FilesContainerR & container, std::string const & addressD
 }
 }  // namespace
 
-
 void BuildSearchIndex(FilesContainerR & container, Writer & indexWriter);
 
-bool BuildSearchIndexFromDataFile(std::string const & country, feature::GenerateInfo const & info,
-                                  bool forceRebuild, uint32_t threadsCount)
+bool BuildSearchIndexFromDataFile(std::string const & country, feature::GenerateInfo const & info, bool forceRebuild,
+                                  uint32_t threadsCount)
 {
   Platform & platform = GetPlatform();
 
@@ -693,8 +663,8 @@ void BuildSearchIndex(FilesContainerR & container, Writer & indexWriter)
   std::sort(searchIndexKeyValuePairs.begin(), searchIndexKeyValuePairs.end());
   LOG(LINFO, ("End sorting strings:", timer.ElapsedSeconds()));
 
-  trie::Build<Writer, Key, ValueList<Value>, SingleValueSerializer<Value>>(
-      indexWriter, serializer, searchIndexKeyValuePairs);
+  trie::Build<Writer, Key, ValueList<Value>, SingleValueSerializer<Value>>(indexWriter, serializer,
+                                                                           searchIndexKeyValuePairs);
 
   LOG(LINFO, ("End building search index, elapsed seconds:", timer.ElapsedSeconds()));
 }
diff --git a/generator/search_index_builder.hpp b/generator/search_index_builder.hpp
index b575e2a97..b2baac942 100644
--- a/generator/search_index_builder.hpp
+++ b/generator/search_index_builder.hpp
@@ -5,8 +5,8 @@
 #include "indexer/ftypes_matcher.hpp"
 
 #include <string>
-#include <vector>
 #include <unordered_map>
+#include <vector>
 
 namespace indexer
 {
@@ -22,13 +22,12 @@ public:
   {
     auto it = m_map.find(key);
     if (it != m_map.end())
-    {
       for (auto const & v : it->second)
         toDo(v);
-    }
   }
 
-  template <class Types> static bool CanApply(Types const & types)
+  template <class Types>
+  static bool CanApply(Types const & types)
   {
     auto const type = ftypes::IsLocalityChecker::Instance().GetType(types);
     return (type == ftypes::LocalityType::Country || type == ftypes::LocalityType::State);
@@ -42,6 +41,6 @@ private:
 // An attempt to rewrite the search index of an old mwm may result in a future crash
 // when using search because this function does not update mwm's version. This results
 // in version mismatch when trying to read the index.
-bool BuildSearchIndexFromDataFile(std::string const & country, feature::GenerateInfo const & info,
-                                  bool forceRebuild, uint32_t threadsCount);
+bool BuildSearchIndexFromDataFile(std::string const & country, feature::GenerateInfo const & info, bool forceRebuild,
+                                  uint32_t threadsCount);
 }  // namespace indexer
diff --git a/generator/srtm_coverage_checker/srtm_coverage_checker.cpp b/generator/srtm_coverage_checker/srtm_coverage_checker.cpp
index e2d54442d..f095fa1b8 100644
--- a/generator/srtm_coverage_checker/srtm_coverage_checker.cpp
+++ b/generator/srtm_coverage_checker/srtm_coverage_checker.cpp
@@ -61,7 +61,8 @@ public:
   }
 };
 
-template <class FnT> void ForEachMWM(SafeTileManager & manager, FnT && fn)
+template <class FnT>
+void ForEachMWM(SafeTileManager & manager, FnT && fn)
 {
   std::vector<platform::LocalCountryFile> localFiles;
   FindAllLocalMapsAndCleanup(std::numeric_limits<int64_t>::max() /* latestVersion */, localFiles);
@@ -127,8 +128,8 @@ void CheckCoverage(SafeTileManager & manager)
 
     auto const bad = all - good;
     auto const percent = (all == 0) ? 0.0 : bad * 100.0 / all;
-    LOG_SHORT(LINFO, (percent > 10.0 ? "Huge" : "Low", "error rate in:", file.GetCountryName(),
-              "good:", good, "bad:", bad, "all:", all, "%:", percent));
+    LOG_SHORT(LINFO, (percent > 10.0 ? "Huge" : "Low", "error rate in:", file.GetCountryName(), "good:", good,
+                      "bad:", bad, "all:", all, "%:", percent));
   });
 }
 
@@ -149,7 +150,7 @@ void CheckDistance(SafeTileManager & manager)
 
       for (size_t i = 1; i < ft.GetPointsCount(); ++i)
       {
-        auto const ll1 = mercator::ToLatLon(ft.GetPoint(i-1));
+        auto const ll1 = mercator::ToLatLon(ft.GetPoint(i - 1));
         auto const alt1 = manager.GetAltitude(ll1);
         auto const ll2 = mercator::ToLatLon(ft.GetPoint(i));
         auto const alt2 = manager.GetAltitude(ll2);
@@ -180,7 +181,7 @@ void CheckDistance(SafeTileManager & manager)
           else
           {
             auto const approxAlt = static_cast<geometry::Altitude>(std::round(alt2 * a + alt1 * (1 - a)));
-            if (abs(alt - approxAlt) >= std::max(1, abs(alt)/10))  // 10%
+            if (abs(alt - approxAlt) >= std::max(1, abs(alt) / 10))  // 10%
               ++added;
           }
         }
@@ -243,9 +244,8 @@ int main(int argc, char * argv[])
       else
       {
         auto const & tile = manager.GetTile({lat, lon});
-        cout << "H = " << tile.GetHeight({lat, lon}) <<
-                "; Trg = " << tile.GetTriangleHeight({lat, lon}) <<
-                "; Bilinear = " << tile.GetBilinearHeight({lat, lon});
+        cout << "H = " << tile.GetHeight({lat, lon}) << "; Trg = " << tile.GetTriangleHeight({lat, lon})
+             << "; Bilinear = " << tile.GetBilinearHeight({lat, lon});
         cout << endl;
       }
     }
diff --git a/generator/srtm_parser.cpp b/generator/srtm_parser.cpp
index 2b70dbbcb..53ebe8050 100644
--- a/generator/srtm_parser.cpp
+++ b/generator/srtm_parser.cpp
@@ -28,10 +28,7 @@ struct UnzipMemDelegate : public ZipFileReader::Delegate
   }
 
   // ZipFileReader::Delegate overrides:
-  void OnBlockUnzipped(size_t size, char const * data) override
-  {
-    m_buffer.insert(m_buffer.end(), data, data + size);
-  }
+  void OnBlockUnzipped(size_t size, char const * data) override { m_buffer.insert(m_buffer.end(), data, data + size); }
 
   void OnStarted() override
   {
@@ -116,7 +113,7 @@ ms::LatLon SrtmTile::GetCoordInSeconds(ms::LatLon const & coord)
     lt += 1;
   lt = 1 - lt;  // from North to South
 
-  return { kArcSecondsInDegree * lt, kArcSecondsInDegree * ln };
+  return {kArcSecondsInDegree * lt, kArcSecondsInDegree * ln};
 }
 
 geometry::Altitude SrtmTile::GetHeight(ms::LatLon const & coord) const
@@ -205,7 +202,8 @@ double SrtmTile::GetBilinearHeight(ms::LatLon const & coord) const
   return (GetHeightRC(p1.y, p1.x) * (p2.x - ll.m_lon) * (p2.y - ll.m_lat) +
           GetHeightRC(p1.y, p2.x) * (ll.m_lon - p1.x) * (p2.y - ll.m_lat) +
           GetHeightRC(p2.y, p1.x) * (p2.x - ll.m_lon) * (ll.m_lat - p1.y) +
-          GetHeightRC(p2.y, p2.x) * (ll.m_lon - p1.x) * (ll.m_lat - p1.y)) / denom;
+          GetHeightRC(p2.y, p2.x) * (ll.m_lon - p1.x) * (ll.m_lat - p1.y)) /
+         denom;
 }
 
 // static
diff --git a/generator/srtm_parser.hpp b/generator/srtm_parser.hpp
index 7a86ebc01..5bd23f3ed 100644
--- a/generator/srtm_parser.hpp
+++ b/generator/srtm_parser.hpp
@@ -14,7 +14,6 @@
 #include <utility>
 #include <vector>
 
-
 namespace generator
 {
 class SrtmTile
@@ -54,10 +53,7 @@ private:
   static ms::LatLon GetCoordInSeconds(ms::LatLon const & coord);
   geometry::Altitude GetHeightRC(size_t row, size_t col) const;
 
-  inline geometry::Altitude const * Data() const
-  {
-    return reinterpret_cast<geometry::Altitude const *>(m_data.data());
-  }
+  inline geometry::Altitude const * Data() const { return reinterpret_cast<geometry::Altitude const *>(m_data.data()); }
 
   inline size_t Size() const { return m_data.size() / sizeof(geometry::Altitude); }
   void Invalidate();
@@ -75,10 +71,7 @@ public:
 
   SrtmTile const & GetTile(ms::LatLon const & coord);
 
-  geometry::Altitude GetAltitude(ms::LatLon const & coord)
-  {
-    return GetTile(coord).GetAltitude(coord);
-  }
+  geometry::Altitude GetAltitude(ms::LatLon const & coord) { return GetTile(coord).GetAltitude(coord); }
 
   size_t GeTilesNumber() const { return m_tiles.size(); }
 
diff --git a/generator/statistics.cpp b/generator/statistics.cpp
index ca7c5067a..c0a58d9fc 100644
--- a/generator/statistics.cpp
+++ b/generator/statistics.cpp
@@ -13,331 +13,299 @@
 
 namespace stats
 {
-  using namespace feature;
+using namespace feature;
 
-  void PrintFileContainerStats(std::ostream & os, std::string const & fPath)
+void PrintFileContainerStats(std::ostream & os, std::string const & fPath)
+{
+  os << "File section sizes\n";
+  try
   {
-    os << "File section sizes\n";
-    try
-    {
-      FilesContainerR cont(fPath);
-      cont.ForEachTag([&] (FilesContainerR::Tag const & tag)
-      {
-        os << std::setw(18) << tag << " : "
-           << std::setw(10) << cont.GetReader(tag).Size() << "\n";
-      });
-    }
-    catch (Reader::Exception const & ex)
-    {
-      LOG(LWARNING, ("Error reading file:", fPath, ex.Msg()));
-    }
-    os << "\n";
+    FilesContainerR cont(fPath);
+    cont.ForEachTag([&](FilesContainerR::Tag const & tag)
+    { os << std::setw(18) << tag << " : " << std::setw(10) << cont.GetReader(tag).Size() << "\n"; });
   }
-
-  // 0.001 deg² ≈ 12.392 km² * cos(lat)
-  static constexpr double kAreas[] = { 10, 20, 50, 100, 200, 500, 1000, 5000, 360*360*12400 };
-
-  size_t GetAreaIndex(double s)
+  catch (Reader::Exception const & ex)
   {
-    double const sInKm2 = s / 1000000;
-    auto const i = std::lower_bound(std::begin(kAreas), std::end(kAreas), sInKm2);
-    ASSERT(i != std::end(kAreas), ());
-    return std::distance(kAreas, i);
+    LOG(LWARNING, ("Error reading file:", fPath, ex.Msg()));
   }
+  os << "\n";
+}
 
-  class AccumulateStatistic
+// 0.001 deg² ≈ 12.392 km² * cos(lat)
+static constexpr double kAreas[] = {10, 20, 50, 100, 200, 500, 1000, 5000, 360 * 360 * 12400};
+
+size_t GetAreaIndex(double s)
+{
+  double const sInKm2 = s / 1000000;
+  auto const i = std::lower_bound(std::begin(kAreas), std::end(kAreas), sInKm2);
+  ASSERT(i != std::end(kAreas), ());
+  return std::distance(kAreas, i);
+}
+
+class AccumulateStatistic
+{
+  MapInfo & m_info;
+
+public:
+  explicit AccumulateStatistic(MapInfo & info) : m_info(info) {}
+
+  void operator()(FeatureType & f, uint32_t)
   {
-    MapInfo & m_info;
+    f.ParseHeader2();
 
-  public:
-    explicit AccumulateStatistic(MapInfo & info) : m_info(info) {}
+    FeatureType::InnerGeomStat const innerStats = f.GetInnerStats();
 
-    void operator() (FeatureType & f, uint32_t)
-    {
-      f.ParseHeader2();
+    m_info.m_innerPoints.Add(innerStats.m_points);
+    m_info.m_innerFirstPoints.Add(innerStats.m_firstPoints);
+    m_info.m_innerStrips.Add(innerStats.m_strips);
+    m_info.m_innerSize.Add(innerStats.m_size);
 
-      FeatureType::InnerGeomStat const innerStats = f.GetInnerStats();
+    // Get size stats and load the best geometry.
+    FeatureType::GeomStat const geom = f.GetOuterGeometryStats();
+    FeatureType::GeomStat const trg = f.GetOuterTrianglesStats();
 
-      m_info.m_innerPoints.Add(innerStats.m_points);
-      m_info.m_innerFirstPoints.Add(innerStats.m_firstPoints);
-      m_info.m_innerStrips.Add(innerStats.m_strips);
-      m_info.m_innerSize.Add(innerStats.m_size);
-
-      // Get size stats and load the best geometry.
-      FeatureType::GeomStat const geom = f.GetOuterGeometryStats();
-      FeatureType::GeomStat const trg = f.GetOuterTrianglesStats();
-
-      uint32_t outerGeomSize = 0, outerTrgSize = 0;
-      for (size_t ind = 0; ind < DataHeader::kMaxScalesCount; ++ind)
-      {
-        auto const geomSize = geom.m_sizes[ind], geomElems = geom.m_elements[ind],
-                   trgSize = trg.m_sizes[ind], trgElems = trg.m_elements[ind];
-        m_info.m_byLineGeom[ind].Add(geomSize, geomElems);
-        outerGeomSize += geomSize;
-        m_info.m_byAreaGeom[ind].Add(trgSize, trgElems);
-        outerTrgSize += trgSize;
-
-        if (ind > 0)
-        {
-          // If a feature has a more simplified version of current geometry.
-          if (geom.m_elements[ind - 1] > 0)
-            m_info.m_byLineGeomComparedS[ind].Add(geomSize, geomElems);
-          if (trg.m_elements[ind - 1] > 0)
-            m_info.m_byAreaGeomComparedS[ind].Add(trgSize, trgElems);
-        }
-
-        if (ind < DataHeader::kMaxScalesCount - 1)
-        {
-          // If a feature has a more detailed version of current geometry.
-          if (geom.m_elements[ind + 1] > 0)
-          {
-            m_info.m_byLineGeomComparedD[ind].Add(geomSize, geomElems);
-            // If feature's current geometry is very similar to a more detailed one
-            // (number of elements is <geomMinDiff less or <geomMinFactor times less).
-            if (geomElems + m_info.m_geomMinDiff > geom.m_elements[ind + 1] ||
-                geomElems * m_info.m_geomMinFactor > geom.m_elements[ind + 1])
-              m_info.m_byLineGeomDup[ind].Add(geomSize, geomElems);
-          }
-          if (trg.m_elements[ind + 1] > 0)
-          {
-            m_info.m_byAreaGeomComparedD[ind].Add(trgSize, trgElems);
-            if (trgElems + m_info.m_geomMinDiff > trg.m_elements[ind + 1] ||
-                trgElems * m_info.m_geomMinFactor > trg.m_elements[ind + 1])
-              m_info.m_byAreaGeomDup[ind].Add(trgSize, trgElems);
-          }
-        }
-      }
-
-      m_info.m_byPointsCount[CountType(geom.m_elements[DataHeader::kMaxScalesCount - 1])]
-        .Add(innerStats.m_points + outerGeomSize);
-      m_info.m_byTrgCount[CountType(trg.m_elements[DataHeader::kMaxScalesCount - 1])]
-        .Add(innerStats.m_strips + outerTrgSize);
-
-      // Header size (incl. inner geometry) + outer geometry size.
-      uint32_t const allSize = innerStats.m_size + outerGeomSize + outerTrgSize;
-
-      double len = 0.0;
-      double area = 0.0;
-
-      if (f.GetGeomType() == feature::GeomType::Line)
-      {
-        m2::PointD lastPoint;
-        bool firstPoint = true;
-        f.ForEachPoint([&len, &firstPoint, &lastPoint](const m2::PointD & pt)
-        {
-          if (firstPoint)
-            firstPoint = false;
-          else
-            len += mercator::DistanceOnEarth(lastPoint, pt);
-          lastPoint = pt;
-        }, FeatureType::BEST_GEOMETRY);
-      }
-      else if (f.GetGeomType() == feature::GeomType::Area)
-      {
-        f.ForEachTriangle([&area](m2::PointD const & p1, m2::PointD const & p2, m2::PointD const & p3)
-        {
-          area += mercator::AreaOnEarth(p1, p2, p3);
-        }, FeatureType::BEST_GEOMETRY);
-      }
-
-      auto const hasName = f.GetNames().CountLangs() != 0;
-
-      m_info.m_byGeomType[f.GetGeomType()].Add(allSize, len, area, hasName);
-
-      f.ForEachType([this, allSize, len, area, hasName](uint32_t type)
-      {
-        m_info.m_byClassifType[ClassifType(type)].Add(allSize, len, area, hasName);
-      });
-
-      m_info.m_byAreaSize[AreaType(GetAreaIndex(area))].Add(allSize, len, area, hasName);
-    }
-  };
-
-  void CalcStats(std::string const & fPath, MapInfo & info)
-  {
-    AccumulateStatistic doProcess(info);
-    feature::ForEachFeature(fPath, doProcess);
-  }
-
-  void PrintInfo(std::ostream & os, std::string const & prefix,
-                 GeneralInfo const & info, uint8_t prefixWidth = 1,
-                 bool names = false, bool measurements = false)
-  {
-    os << std::setw(prefixWidth) << prefix
-       << ": size = " << std::setw(9) << info.m_size
-       << "; features = " << std::setw(7) << info.m_count
-       << "; bytes/feats = " << std::setw(6) << info.m_size / static_cast<double>(info.m_count);
-
-    if (measurements)
-    {
-      os << "; length = " << std::setw(10) << static_cast<uint64_t>(info.m_length)
-         << " m; area = " << std::setw(10) << static_cast<uint64_t>(info.m_area) << " m²";
-    }
-    if (names)
-      os << "; w/names = " << std::setw(8) << info.m_names;
-
-    os << "\n";
-  }
-
-  std::string GetKey(GeomType type)
-  {
-    switch (type)
-    {
-    case GeomType::Line: return "Line";
-    case GeomType::Area: return "Area";
-    default: return "Point";
-    }
-  }
-
-  std::string GetKey(CountType t)
-  {
-    return strings::to_string(t.m_val);
-  }
-
-  std::string GetKey(ClassifType t)
-  {
-    return classif().GetReadableObjectName(t.m_val);
-  }
-
-  std::string GetKey(AreaType t)
-  {
-    return strings::to_string(kAreas[t.m_val]);
-  }
-
-  template <class TSortCr, class TSet>
-  void PrintTop(std::ostream & os, char const * prefix, TSet const & theSet,
-                uint8_t prefixWidth = 5, bool names = false)
-  {
-    os << "\n" << prefix << "\n";
-
-    std::vector<std::pair<typename TSet::key_type, typename TSet::mapped_type>> vec(theSet.begin(), theSet.end());
-
-    sort(vec.begin(), vec.end(), TSortCr());
-
-    size_t const count = std::min(static_cast<size_t>(20), vec.size());
-    for (size_t i = 0; i < count; ++i)
-    {
-      os << std::setw(2) << i << ". ";
-      PrintInfo(os, GetKey(vec[i].first), vec[i].second, prefixWidth, names);
-    }
-  }
-
-  struct greater_size
-  {
-    template <class TInfo>
-    bool operator() (TInfo const & r1, TInfo const & r2) const
-    {
-      return r1.second.m_size > r2.second.m_size;
-    }
-  };
-
-  struct greater_count
-  {
-    template <class TInfo>
-    bool operator() (TInfo const & r1, TInfo const & r2) const
-    {
-      return r1.second.m_count > r2.second.m_count;
-    }
-  };
-
-  void PrintStats(std::ostream & os, MapInfo & info)
-  {
-    PrintInfo(os, "Feature headers", info.m_innerSize, 30);
-    PrintInfo(os, "incl. inner points", info.m_innerPoints, 30);
-    PrintInfo(os, "incl. first/base outer points", info.m_innerFirstPoints, 30);
-    PrintInfo(os, "incl. inner triangles (strips)", info.m_innerStrips, 30);
-
-    PrintTop<greater_size>(os, "Top SIZE by Geometry Type", info.m_byGeomType, 5, true);
-    PrintTop<greater_size>(os, "Top SIZE by Classificator Type\n"
-                           "(a single feature's size may be included in several types)",
-                           info.m_byClassifType, 30, true);
-    PrintTop<greater_size>(os, "Top SIZE by Points Count", info.m_byPointsCount);
-    PrintTop<greater_size>(os, "Top SIZE by Triangles Count", info.m_byTrgCount);
-    PrintTop<greater_size>(os, "Top SIZE by Area", info.m_byAreaSize, 5, true);
-    os << "\n";
-  }
-
-  /// @note If you gonna change this function, take into account
-  /// ./tools/python/maps_generator/generator/statistics.py
-  void PrintTypeStats(std::ostream & os, MapInfo & info)
-  {
-    os << "Feature stats by Classificator Type\n"
-       << "(a single feature can contain several types and thus its size can be included in several type lines)\n";
-
-    for (auto const & e : info.m_byClassifType)
-      PrintInfo(os, GetKey(e.first), e.second, 30, true, true);
-
-    os << "\n";
-  }
-
-  void PrintGeometryInfo(std::ostream & os, char const * prefix,
-                         size_t geomMinDiff, double geomMinFactor,
-                         GeomStats const & geomStats, GeomStats const & comparedStatsS,
-                         GeomStats const & comparedStatsD, GeomStats const & dupStats)
-  {
+    uint32_t outerGeomSize = 0, outerTrgSize = 0;
     for (size_t ind = 0; ind < DataHeader::kMaxScalesCount; ++ind)
     {
-      GeomInfo const & info = geomStats[ind];
-      os << "    " << prefix << ind
-         << ": size = " << std::setw(9) << info.m_size
-         << ": elements = " << std::setw(9) << info.m_elements
-         << "; features = " << std::setw(7) << info.m_count
-         << "; elems/feats = " << std::setw(5)
-         << info.m_elements / static_cast<double>(info.m_count)
-         << "; bytes/elems = " << std::setw(4)
-         << info.m_size / static_cast<double>(info.m_elements)
-         << "\n";
+      auto const geomSize = geom.m_sizes[ind], geomElems = geom.m_elements[ind], trgSize = trg.m_sizes[ind],
+                 trgElems = trg.m_elements[ind];
+      m_info.m_byLineGeom[ind].Add(geomSize, geomElems);
+      outerGeomSize += geomSize;
+      m_info.m_byAreaGeom[ind].Add(trgSize, trgElems);
+      outerTrgSize += trgSize;
+
+      if (ind > 0)
+      {
+        // If a feature has a more simplified version of current geometry.
+        if (geom.m_elements[ind - 1] > 0)
+          m_info.m_byLineGeomComparedS[ind].Add(geomSize, geomElems);
+        if (trg.m_elements[ind - 1] > 0)
+          m_info.m_byAreaGeomComparedS[ind].Add(trgSize, trgElems);
+      }
+
+      if (ind < DataHeader::kMaxScalesCount - 1)
+      {
+        // If a feature has a more detailed version of current geometry.
+        if (geom.m_elements[ind + 1] > 0)
+        {
+          m_info.m_byLineGeomComparedD[ind].Add(geomSize, geomElems);
+          // If feature's current geometry is very similar to a more detailed one
+          // (number of elements is <geomMinDiff less or <geomMinFactor times less).
+          if (geomElems + m_info.m_geomMinDiff > geom.m_elements[ind + 1] ||
+              geomElems * m_info.m_geomMinFactor > geom.m_elements[ind + 1])
+            m_info.m_byLineGeomDup[ind].Add(geomSize, geomElems);
+        }
+        if (trg.m_elements[ind + 1] > 0)
+        {
+          m_info.m_byAreaGeomComparedD[ind].Add(trgSize, trgElems);
+          if (trgElems + m_info.m_geomMinDiff > trg.m_elements[ind + 1] ||
+              trgElems * m_info.m_geomMinFactor > trg.m_elements[ind + 1])
+            m_info.m_byAreaGeomDup[ind].Add(trgSize, trgElems);
+        }
+      }
     }
 
-    os << "Geometry of features present on adjacent geom scales incl. very similar geometries\n"
-       << "(when number of elements is <" << geomMinDiff
-       << " less or <" << geomMinFactor << "x times less)\n";
-    for (size_t ind = 0; ind < DataHeader::kMaxScalesCount - 1; ++ind)
+    m_info.m_byPointsCount[CountType(geom.m_elements[DataHeader::kMaxScalesCount - 1])].Add(innerStats.m_points +
+                                                                                            outerGeomSize);
+    m_info.m_byTrgCount[CountType(trg.m_elements[DataHeader::kMaxScalesCount - 1])].Add(innerStats.m_strips +
+                                                                                        outerTrgSize);
+
+    // Header size (incl. inner geometry) + outer geometry size.
+    uint32_t const allSize = innerStats.m_size + outerGeomSize + outerTrgSize;
+
+    double len = 0.0;
+    double area = 0.0;
+
+    if (f.GetGeomType() == feature::GeomType::Line)
     {
-      GeomInfo const & compInfoD = comparedStatsD[ind],
-                       compInfoS = comparedStatsS[ind + 1],
-                       dupInfo = dupStats[ind];
-      CHECK_EQUAL(compInfoD.m_count, compInfoS.m_count, ());
-      os << prefix << ind << " vs " << prefix << ind + 1
-         << ": size difference = " << std::setw(4)
-         << compInfoS.m_size / static_cast<double>(compInfoD.m_size)
-         << "x; elems difference = " << std::setw(4)
-         << compInfoS.m_elements / static_cast<double>(compInfoD.m_elements)
-         << "x; features = " << std::setw(7) << compInfoD.m_count
-         << "\n";
-      os << "    " << prefix << ind
-         << ": size = " << std::setw(9) << compInfoD.m_size
-         << "; elements = " << std::setw(9) << compInfoD.m_elements
-         << "; elems/feats = " << std::setw(5)
-         << compInfoD.m_elements / static_cast<double>(compInfoD.m_count)
-         << "\n";
-      os << "    " << prefix << ind + 1
-         << ": size = " << std::setw(9) << compInfoS.m_size
-         << "; elements = " << std::setw(9) << compInfoS.m_elements
-         << "; elems/feats = " << std::setw(5)
-         << compInfoS.m_elements / static_cast<double>(compInfoS.m_count)
-         << "\n";
-      os << "    similar: size = " << std::setw(9) << dupInfo.m_size
-         << " (" << std::setw(2) << 100 * dupInfo.m_size / static_cast<double>(compInfoD.m_size)
-         << "%); elements = " << std::setw(9) << dupInfo.m_elements
-         << "; features = " << std::setw(7) << dupInfo.m_count
-         << "; elems/feats = " << std::setw(5)
-         << dupInfo.m_elements / static_cast<double>(dupInfo.m_count)
-         << "\n";
+      m2::PointD lastPoint;
+      bool firstPoint = true;
+      f.ForEachPoint([&len, &firstPoint, &lastPoint](m2::PointD const & pt)
+      {
+        if (firstPoint)
+          firstPoint = false;
+        else
+          len += mercator::DistanceOnEarth(lastPoint, pt);
+        lastPoint = pt;
+      }, FeatureType::BEST_GEOMETRY);
     }
+    else if (f.GetGeomType() == feature::GeomType::Area)
+    {
+      f.ForEachTriangle([&area](m2::PointD const & p1, m2::PointD const & p2, m2::PointD const & p3)
+      { area += mercator::AreaOnEarth(p1, p2, p3); }, FeatureType::BEST_GEOMETRY);
+    }
+
+    auto const hasName = f.GetNames().CountLangs() != 0;
+
+    m_info.m_byGeomType[f.GetGeomType()].Add(allSize, len, area, hasName);
+
+    f.ForEachType([this, allSize, len, area, hasName](uint32_t type)
+    { m_info.m_byClassifType[ClassifType(type)].Add(allSize, len, area, hasName); });
+
+    m_info.m_byAreaSize[AreaType(GetAreaIndex(area))].Add(allSize, len, area, hasName);
   }
+};
 
-  void PrintOuterGeometryStats(std::ostream & os, MapInfo & info)
+void CalcStats(std::string const & fPath, MapInfo & info)
+{
+  AccumulateStatistic doProcess(info);
+  feature::ForEachFeature(fPath, doProcess);
+}
+
+void PrintInfo(std::ostream & os, std::string const & prefix, GeneralInfo const & info, uint8_t prefixWidth = 1,
+               bool names = false, bool measurements = false)
+{
+  os << std::setw(prefixWidth) << prefix << ": size = " << std::setw(9) << info.m_size
+     << "; features = " << std::setw(7) << info.m_count << "; bytes/feats = " << std::setw(6)
+     << info.m_size / static_cast<double>(info.m_count);
+
+  if (measurements)
   {
-    os << "Outer LINE geometry\n";
-    PrintGeometryInfo(os, "geom", info.m_geomMinDiff, info.m_geomMinFactor,
-                      info.m_byLineGeom, info.m_byLineGeomComparedS,
-                      info.m_byLineGeomComparedD, info.m_byLineGeomDup);
+    os << "; length = " << std::setw(10) << static_cast<uint64_t>(info.m_length) << " m; area = " << std::setw(10)
+       << static_cast<uint64_t>(info.m_area) << " m²";
+  }
+  if (names)
+    os << "; w/names = " << std::setw(8) << info.m_names;
 
-    os << "\nOuter AREA geometry\n";
-    PrintGeometryInfo(os, "trg", info.m_geomMinDiff, info.m_geomMinFactor,
-                      info.m_byAreaGeom, info.m_byAreaGeomComparedS,
-                      info.m_byAreaGeomComparedD, info.m_byAreaGeomDup);
-    os << "\n";
+  os << "\n";
+}
+
+std::string GetKey(GeomType type)
+{
+  switch (type)
+  {
+  case GeomType::Line: return "Line";
+  case GeomType::Area: return "Area";
+  default: return "Point";
   }
 }
+
+std::string GetKey(CountType t)
+{
+  return strings::to_string(t.m_val);
+}
+
+std::string GetKey(ClassifType t)
+{
+  return classif().GetReadableObjectName(t.m_val);
+}
+
+std::string GetKey(AreaType t)
+{
+  return strings::to_string(kAreas[t.m_val]);
+}
+
+template <class TSortCr, class TSet>
+void PrintTop(std::ostream & os, char const * prefix, TSet const & theSet, uint8_t prefixWidth = 5, bool names = false)
+{
+  os << "\n" << prefix << "\n";
+
+  std::vector<std::pair<typename TSet::key_type, typename TSet::mapped_type>> vec(theSet.begin(), theSet.end());
+
+  sort(vec.begin(), vec.end(), TSortCr());
+
+  size_t const count = std::min(static_cast<size_t>(20), vec.size());
+  for (size_t i = 0; i < count; ++i)
+  {
+    os << std::setw(2) << i << ". ";
+    PrintInfo(os, GetKey(vec[i].first), vec[i].second, prefixWidth, names);
+  }
+}
+
+struct greater_size
+{
+  template <class TInfo>
+  bool operator()(TInfo const & r1, TInfo const & r2) const
+  {
+    return r1.second.m_size > r2.second.m_size;
+  }
+};
+
+struct greater_count
+{
+  template <class TInfo>
+  bool operator()(TInfo const & r1, TInfo const & r2) const
+  {
+    return r1.second.m_count > r2.second.m_count;
+  }
+};
+
+void PrintStats(std::ostream & os, MapInfo & info)
+{
+  PrintInfo(os, "Feature headers", info.m_innerSize, 30);
+  PrintInfo(os, "incl. inner points", info.m_innerPoints, 30);
+  PrintInfo(os, "incl. first/base outer points", info.m_innerFirstPoints, 30);
+  PrintInfo(os, "incl. inner triangles (strips)", info.m_innerStrips, 30);
+
+  PrintTop<greater_size>(os, "Top SIZE by Geometry Type", info.m_byGeomType, 5, true);
+  PrintTop<greater_size>(os,
+                         "Top SIZE by Classificator Type\n"
+                         "(a single feature's size may be included in several types)",
+                         info.m_byClassifType, 30, true);
+  PrintTop<greater_size>(os, "Top SIZE by Points Count", info.m_byPointsCount);
+  PrintTop<greater_size>(os, "Top SIZE by Triangles Count", info.m_byTrgCount);
+  PrintTop<greater_size>(os, "Top SIZE by Area", info.m_byAreaSize, 5, true);
+  os << "\n";
+}
+
+/// @note If you gonna change this function, take into account
+/// ./tools/python/maps_generator/generator/statistics.py
+void PrintTypeStats(std::ostream & os, MapInfo & info)
+{
+  os << "Feature stats by Classificator Type\n"
+     << "(a single feature can contain several types and thus its size can be included in several type lines)\n";
+
+  for (auto const & e : info.m_byClassifType)
+    PrintInfo(os, GetKey(e.first), e.second, 30, true, true);
+
+  os << "\n";
+}
+
+void PrintGeometryInfo(std::ostream & os, char const * prefix, size_t geomMinDiff, double geomMinFactor,
+                       GeomStats const & geomStats, GeomStats const & comparedStatsS, GeomStats const & comparedStatsD,
+                       GeomStats const & dupStats)
+{
+  for (size_t ind = 0; ind < DataHeader::kMaxScalesCount; ++ind)
+  {
+    GeomInfo const & info = geomStats[ind];
+    os << "    " << prefix << ind << ": size = " << std::setw(9) << info.m_size << ": elements = " << std::setw(9)
+       << info.m_elements << "; features = " << std::setw(7) << info.m_count << "; elems/feats = " << std::setw(5)
+       << info.m_elements / static_cast<double>(info.m_count) << "; bytes/elems = " << std::setw(4)
+       << info.m_size / static_cast<double>(info.m_elements) << "\n";
+  }
+
+  os << "Geometry of features present on adjacent geom scales incl. very similar geometries\n"
+     << "(when number of elements is <" << geomMinDiff << " less or <" << geomMinFactor << "x times less)\n";
+  for (size_t ind = 0; ind < DataHeader::kMaxScalesCount - 1; ++ind)
+  {
+    GeomInfo const &compInfoD = comparedStatsD[ind], compInfoS = comparedStatsS[ind + 1], dupInfo = dupStats[ind];
+    CHECK_EQUAL(compInfoD.m_count, compInfoS.m_count, ());
+    os << prefix << ind << " vs " << prefix << ind + 1 << ": size difference = " << std::setw(4)
+       << compInfoS.m_size / static_cast<double>(compInfoD.m_size) << "x; elems difference = " << std::setw(4)
+       << compInfoS.m_elements / static_cast<double>(compInfoD.m_elements) << "x; features = " << std::setw(7)
+       << compInfoD.m_count << "\n";
+    os << "    " << prefix << ind << ": size = " << std::setw(9) << compInfoD.m_size << "; elements = " << std::setw(9)
+       << compInfoD.m_elements << "; elems/feats = " << std::setw(5)
+       << compInfoD.m_elements / static_cast<double>(compInfoD.m_count) << "\n";
+    os << "    " << prefix << ind + 1 << ": size = " << std::setw(9) << compInfoS.m_size
+       << "; elements = " << std::setw(9) << compInfoS.m_elements << "; elems/feats = " << std::setw(5)
+       << compInfoS.m_elements / static_cast<double>(compInfoS.m_count) << "\n";
+    os << "    similar: size = " << std::setw(9) << dupInfo.m_size << " (" << std::setw(2)
+       << 100 * dupInfo.m_size / static_cast<double>(compInfoD.m_size) << "%); elements = " << std::setw(9)
+       << dupInfo.m_elements << "; features = " << std::setw(7) << dupInfo.m_count << "; elems/feats = " << std::setw(5)
+       << dupInfo.m_elements / static_cast<double>(dupInfo.m_count) << "\n";
+  }
+}
+
+void PrintOuterGeometryStats(std::ostream & os, MapInfo & info)
+{
+  os << "Outer LINE geometry\n";
+  PrintGeometryInfo(os, "geom", info.m_geomMinDiff, info.m_geomMinFactor, info.m_byLineGeom, info.m_byLineGeomComparedS,
+                    info.m_byLineGeomComparedD, info.m_byLineGeomDup);
+
+  os << "\nOuter AREA geometry\n";
+  PrintGeometryInfo(os, "trg", info.m_geomMinDiff, info.m_geomMinFactor, info.m_byAreaGeom, info.m_byAreaGeomComparedS,
+                    info.m_byAreaGeomComparedD, info.m_byAreaGeomDup);
+  os << "\n";
+}
+}  // namespace stats
diff --git a/generator/statistics.hpp b/generator/statistics.hpp
index 2c0f1540d..284a359d6 100644
--- a/generator/statistics.hpp
+++ b/generator/statistics.hpp
@@ -9,86 +9,82 @@
 
 namespace stats
 {
-  struct GeneralInfo
-  {
-    GeneralInfo() : m_count(0), m_size(0), m_names(0), m_length(0), m_area(0) {}
+struct GeneralInfo
+{
+  GeneralInfo() : m_count(0), m_size(0), m_names(0), m_length(0), m_area(0) {}
 
-    void Add(uint64_t szBytes, double len = 0, double area = 0, bool hasName = false)
+  void Add(uint64_t szBytes, double len = 0, double area = 0, bool hasName = false)
+  {
+    if (szBytes > 0)
     {
-      if (szBytes > 0)
-      {
-        ++m_count;
-        m_size += szBytes;
-        m_length += len;
-        m_area += area;
-        if (hasName)
-          ++m_names;
-      }
+      ++m_count;
+      m_size += szBytes;
+      m_length += len;
+      m_area += area;
+      if (hasName)
+        ++m_names;
     }
+  }
 
-    uint64_t m_count;
-    uint64_t m_size;
-    uint64_t m_names;
-    double m_length;
-    double m_area;
-  };
+  uint64_t m_count;
+  uint64_t m_size;
+  uint64_t m_names;
+  double m_length;
+  double m_area;
+};
 
-  struct GeomInfo
+struct GeomInfo
+{
+  void Add(uint64_t szBytes, uint32_t elements)
   {
-    void Add(uint64_t szBytes, uint32_t elements)
+    if (szBytes > 0)
     {
-      if (szBytes > 0)
-      {
-        ++m_count;
-        m_size += szBytes;
-        m_elements += elements;
-      }
+      ++m_count;
+      m_size += szBytes;
+      m_elements += elements;
     }
+  }
 
-    uint64_t m_count = 0, m_size = 0, m_elements = 0;
-  };
+  uint64_t m_count = 0, m_size = 0, m_elements = 0;
+};
 
-  using GeomStats = GeomInfo[feature::DataHeader::kMaxScalesCount];
+using GeomStats = GeomInfo[feature::DataHeader::kMaxScalesCount];
 
-  template <class T, int Tag>
-  struct IntegralType
-  {
-    T m_val;
-    explicit IntegralType(T v) : m_val(v) {}
-    bool operator<(IntegralType const & rhs) const { return m_val < rhs.m_val; }
-  };
+template <class T, int Tag>
+struct IntegralType
+{
+  T m_val;
+  explicit IntegralType(T v) : m_val(v) {}
+  bool operator<(IntegralType const & rhs) const { return m_val < rhs.m_val; }
+};
 
-  using ClassifType = IntegralType<uint32_t, 0>;
-  using CountType = IntegralType<uint32_t, 1>;
-  using AreaType = IntegralType<size_t, 2>;
+using ClassifType = IntegralType<uint32_t, 0>;
+using CountType = IntegralType<uint32_t, 1>;
+using AreaType = IntegralType<size_t, 2>;
 
-  struct MapInfo
-  {
-    explicit MapInfo(int geomMinDiff, double geomMinFactor)
-      : m_geomMinDiff(geomMinDiff)
-      , m_geomMinFactor(geomMinFactor)
-    {}
+struct MapInfo
+{
+  explicit MapInfo(int geomMinDiff, double geomMinFactor) : m_geomMinDiff(geomMinDiff), m_geomMinFactor(geomMinFactor)
+  {}
 
-    size_t m_geomMinDiff;
-    double m_geomMinFactor;
+  size_t m_geomMinDiff;
+  double m_geomMinFactor;
 
-    std::map<feature::GeomType, GeneralInfo> m_byGeomType;
-    std::map<ClassifType, GeneralInfo> m_byClassifType;
-    std::map<CountType, GeneralInfo> m_byPointsCount, m_byTrgCount;
-    std::map<AreaType, GeneralInfo> m_byAreaSize;
+  std::map<feature::GeomType, GeneralInfo> m_byGeomType;
+  std::map<ClassifType, GeneralInfo> m_byClassifType;
+  std::map<CountType, GeneralInfo> m_byPointsCount, m_byTrgCount;
+  std::map<AreaType, GeneralInfo> m_byAreaSize;
 
-    GeomStats m_byLineGeom, m_byAreaGeom,
-              m_byLineGeomComparedS, m_byLineGeomComparedD,
-              m_byAreaGeomComparedS, m_byAreaGeomComparedD,
-              m_byLineGeomDup, m_byAreaGeomDup;
+  GeomStats m_byLineGeom, m_byAreaGeom, m_byLineGeomComparedS, m_byLineGeomComparedD, m_byAreaGeomComparedS,
+      m_byAreaGeomComparedD, m_byLineGeomDup, m_byAreaGeomDup;
 
-    GeneralInfo m_innerPoints, m_innerFirstPoints, m_innerStrips, m_innerSize;
-  };
+  GeneralInfo m_innerPoints, m_innerFirstPoints, m_innerStrips, m_innerSize;
+};
 
-  void PrintFileContainerStats(std::ostream & os, std::string const & fPath);
+void PrintFileContainerStats(std::ostream & os, std::string const & fPath);
 
-  void CalcStats(std::string const & fPath, MapInfo & info);
-  void PrintStats(std::ostream & os, MapInfo & info);
-  void PrintTypeStats(std::ostream & os, MapInfo & info);
-  void PrintOuterGeometryStats(std::ostream & os, MapInfo & info);
-}
+void CalcStats(std::string const & fPath, MapInfo & info);
+void PrintStats(std::ostream & os, MapInfo & info);
+void PrintTypeStats(std::ostream & os, MapInfo & info);
+void PrintOuterGeometryStats(std::ostream & os, MapInfo & info);
+}  // namespace stats
diff --git a/generator/tag_admixer.hpp b/generator/tag_admixer.hpp
index 11059239c..91666dc2c 100644
--- a/generator/tag_admixer.hpp
+++ b/generator/tag_admixer.hpp
@@ -14,7 +14,6 @@
 #include <string>
 #include <utility>
 
-
 class WaysParserHelper
 {
 public:
@@ -30,7 +29,7 @@ public:
       if (pos != std::string::npos)
       {
         uint64_t wayId;
-        CHECK(strings::to_uint64(oneLine.substr(0, pos), wayId),());
+        CHECK(strings::to_uint64(oneLine.substr(0, pos), wayId), ());
         m_ways[wayId] = oneLine.substr(pos + 1, oneLine.length() - pos - 1);
       }
     }
@@ -111,13 +110,12 @@ public:
       if (!base::IsExist(tags, kFerryTag))
         element.AddTag("highway", it->second);
     }
-    else if (element.m_type == OsmElement::EntityType::Node &&
-             m_capitals.find(element.m_id) != m_capitals.cend())
+    else if (element.m_type == OsmElement::EntityType::Node && m_capitals.find(element.m_id) != m_capitals.cend())
     {
       // Our goal here - to make some capitals visible in World map.
       // The simplest way is to upgrade population to 45000,
       // according to our visibility rules in mapcss files.
-      element.UpdateTagFn("population", [] (std::string & v)
+      element.UpdateTagFn("population", [](std::string & v)
       {
         uint64_t n;
         if (!strings::to_uint64(v, n) || n < 45000)
@@ -213,12 +211,10 @@ public:
     for (auto const & r : replace)
     {
       for (auto const & tag : r->m_tags)
-      {
         if (r->m_update)
           element.UpdateTag(tag.m_key, tag.m_value);
         else
           element.AddTag(tag);
-      }
     }
   }
 
@@ -283,10 +279,8 @@ public:
   {
     auto const elements = m_elements.find({element.m_type, element.m_id});
     if (elements != m_elements.end())
-    {
       for (OsmElement::Tag const & tag : elements->second)
         element.UpdateTag(tag.m_key, tag.m_value);
-    }
   }
 
 private:
diff --git a/generator/tesselator.cpp b/generator/tesselator.cpp
index ef8240468..bd1e192c2 100644
--- a/generator/tesselator.cpp
+++ b/generator/tesselator.cpp
@@ -21,7 +21,7 @@ int TesselateInterior(PolygonsT const & polys, TrianglesInfo & info)
   int constexpr kCoordinatesPerVertex = 2;
   int constexpr kVerticesInPolygon = 3;
 
-  auto const deleter = [](TESStesselator * tess) {tessDeleteTess(tess);};
+  auto const deleter = [](TESStesselator * tess) { tessDeleteTess(tess); };
   std::unique_ptr<TESStesselator, decltype(deleter)> tess(tessNewTess(nullptr), deleter);
 
   for (auto const & contour : polys)
@@ -30,8 +30,8 @@ int TesselateInterior(PolygonsT const & polys, TrianglesInfo & info)
                    static_cast<int>(contour.size()));
   }
 
-  if (0 == tessTesselate(tess.get(), TESS_WINDING_ODD, TESS_CONSTRAINED_DELAUNAY_TRIANGLES,
-                         kVerticesInPolygon, kCoordinatesPerVertex, nullptr))
+  if (0 == tessTesselate(tess.get(), TESS_WINDING_ODD, TESS_CONSTRAINED_DELAUNAY_TRIANGLES, kVerticesInPolygon,
+                         kCoordinatesPerVertex, nullptr))
   {
     LOG(LERROR, ("Tesselator error for polygon", polys));
     return 0;
@@ -49,211 +49,195 @@ int TesselateInterior(PolygonsT const & polys, TrianglesInfo & info)
     TESSindex const * elements = tessGetElements(tess.get());
     info.Reserve(elementCount);
     for (int i = 0; i < elementCount; ++i)
-    {
       if (!info.Add(elements[i * 3], elements[i * 3 + 1], elements[i * 3 + 2]))
         return 0;
-    }
   }
   return elementCount;
 }
 
-  ///////////////////////////////////////////////////////////////////////////////////////////////////////////
-  // TrianglesInfo::ListInfo implementation
-  ///////////////////////////////////////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////////////////////////////////////
+// TrianglesInfo::ListInfo implementation
+///////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-  int TrianglesInfo::ListInfo::empty_key = -1;
+int TrianglesInfo::ListInfo::empty_key = -1;
 
-  bool TrianglesInfo::ListInfo::AddNeighbour(int p1, int p2, int trg)
+bool TrianglesInfo::ListInfo::AddNeighbour(int p1, int p2, int trg)
+{
+  return m_neighbors.insert({{p1, p2}, trg}).second;
+}
+
+bool TrianglesInfo::ListInfo::Add(int p0, int p1, int p2)
+{
+  int const trg = static_cast<int>(m_triangles.size());
+  if (!AddNeighbour(p0, p1, trg) || !AddNeighbour(p1, p2, trg) || !AddNeighbour(p2, p0, trg))
   {
-    return m_neighbors.insert({{p1, p2}, trg}).second;
+    LOG(LERROR, ("Duplicating triangle {", p0, p1, p2, "}"));
+    return false;
   }
 
-  bool TrianglesInfo::ListInfo::Add(int p0, int p1, int p2)
+  m_triangles.emplace_back(p0, p1, p2);
+  return true;
+}
+
+template <class IterT>
+size_t GetBufferSize(IterT b, IterT e)
+{
+  std::vector<char> buffer;
+  MemWriter<std::vector<char>> writer(buffer);
+  while (b != e)
+    WriteVarUint(writer, *b++);
+  return buffer.size();
+}
+
+/// Find best (cheap in serialization) start edge for processing.
+TrianglesInfo::ListInfo::TIterator TrianglesInfo::ListInfo::FindStartTriangle(PointsInfo const & points) const
+{
+  TIterator ret = m_neighbors.end();
+  size_t cr = std::numeric_limits<size_t>::max();
+
+  for (TIterator i = m_neighbors.begin(); i != m_neighbors.end(); ++i)
   {
-    int const trg = static_cast<int>(m_triangles.size());
-    if (!AddNeighbour(p0, p1, trg) || !AddNeighbour(p1, p2, trg) || !AddNeighbour(p2, p0, trg))
+    if (!m_visited[i->second] && m_neighbors.find(std::make_pair(i->first.second, i->first.first)) == m_neighbors.end())
     {
-      LOG(LERROR, ("Duplicating triangle {", p0, p1, p2, "}"));
-      return false;
-    }
+      uint64_t deltas[3];
+      deltas[0] = coding::EncodePointDeltaAsUint(points.m_points[i->first.first], points.m_base);
+      deltas[1] = coding::EncodePointDeltaAsUint(points.m_points[i->first.second], points.m_points[i->first.first]);
+      deltas[2] = coding::EncodePointDeltaAsUint(points.m_points[m_triangles[i->second].GetPoint3(i->first)],
+                                                 points.m_points[i->first.second]);
 
-    m_triangles.emplace_back(p0, p1, p2);
-    return true;
-  }
-
-  template <class IterT> size_t GetBufferSize(IterT b, IterT e)
-  {
-    std::vector<char> buffer;
-    MemWriter<std::vector<char> > writer(buffer);
-    while (b != e) WriteVarUint(writer, *b++);
-    return buffer.size();
-  }
-
-  /// Find best (cheap in serialization) start edge for processing.
-  TrianglesInfo::ListInfo::TIterator
-  TrianglesInfo::ListInfo::FindStartTriangle(PointsInfo const & points) const
-  {
-    TIterator ret = m_neighbors.end();
-    size_t cr = std::numeric_limits<size_t>::max();
-
-    for (TIterator i = m_neighbors.begin(); i != m_neighbors.end(); ++i)
-    {
-      if (!m_visited[i->second] &&
-          m_neighbors.find(std::make_pair(i->first.second, i->first.first)) == m_neighbors.end())
+      size_t const sz = GetBufferSize(deltas, deltas + 3);
+      if (sz < cr)
       {
-        uint64_t deltas[3];
-        deltas[0] = coding::EncodePointDeltaAsUint(points.m_points[i->first.first], points.m_base);
-        deltas[1] = coding::EncodePointDeltaAsUint(points.m_points[i->first.second],
-                                                   points.m_points[i->first.first]);
-        deltas[2] = coding::EncodePointDeltaAsUint(
-            points.m_points[m_triangles[i->second].GetPoint3(i->first)],
-            points.m_points[i->first.second]);
-
-        size_t const sz = GetBufferSize(deltas, deltas + 3);
-        if (sz < cr)
-        {
-          ret = i;
-          cr = sz;
-        }
+        ret = i;
+        cr = sz;
       }
     }
-
-    ASSERT ( ret != m_neighbors.end(), ("?WTF? There is no border triangles!") );
-    return ret;
   }
 
-  /// Return indexes of common edges of [to, from] triangles.
-  std::pair<int, int> CommonEdge(Triangle const & to, Triangle const & from)
-  {
-    for (int i = 0; i < 3; ++i)
-    {
-      for (int j = 0; j < 3; ++j)
-      {
-        if (to.m_p[i] == from.m_p[math::NextModN(j, 3)] && to.m_p[math::NextModN(i, 3)] == from.m_p[j])
-          return std::make_pair(i, j);
-      }
-    }
+  ASSERT(ret != m_neighbors.end(), ("?WTF? There is no border triangles!"));
+  return ret;
+}
 
-    ASSERT ( false, ("?WTF? Triangles not neighbors!") );
-    return std::make_pair(-1, -1);
+/// Return indexes of common edges of [to, from] triangles.
+std::pair<int, int> CommonEdge(Triangle const & to, Triangle const & from)
+{
+  for (int i = 0; i < 3; ++i)
+  {
+    for (int j = 0; j < 3; ++j)
+      if (to.m_p[i] == from.m_p[math::NextModN(j, 3)] && to.m_p[math::NextModN(i, 3)] == from.m_p[j])
+        return std::make_pair(i, j);
   }
 
-  /// Get neighbors of 'trg' triangle, which was achieved from 'from' triangle.
-  /// @param[out] nb  neighbors indexes of 'trg' if 0->1 is common edge with'from':
-  /// - nb[0] - by 1->2 edge;
-  /// - nb[1] - by 2->0 edge;
-  void TrianglesInfo::ListInfo::GetNeighbors(
-      Triangle const & trg, Triangle const & from, int * nb) const
+  ASSERT(false, ("?WTF? Triangles not neighbors!"));
+  return std::make_pair(-1, -1);
+}
+
+/// Get neighbors of 'trg' triangle, which was achieved from 'from' triangle.
+/// @param[out] nb  neighbors indexes of 'trg' if 0->1 is common edge with'from':
+/// - nb[0] - by 1->2 edge;
+/// - nb[1] - by 2->0 edge;
+void TrianglesInfo::ListInfo::GetNeighbors(Triangle const & trg, Triangle const & from, int * nb) const
+{
+  int i = math::NextModN(CommonEdge(trg, from).first, 3);
+  int j = math::NextModN(i, 3);
+
+  int ind = 0;
+  TIterator it = m_neighbors.find(std::make_pair(trg.m_p[j], trg.m_p[i]));
+  nb[ind++] = (it != m_neighbors.end()) ? it->second : empty_key;
+
+  it = m_neighbors.find(std::make_pair(trg.m_p[math::NextModN(j, 3)], trg.m_p[j]));
+  nb[ind++] = (it != m_neighbors.end()) ? it->second : empty_key;
+}
+
+/// Calc delta of 'from'->'to' graph edge.
+uint64_t TrianglesInfo::ListInfo::CalcDelta(PointsInfo const & points, Triangle const & from, Triangle const & to) const
+{
+  std::pair<int, int> const p = CommonEdge(to, from);
+
+  m2::PointU const prediction = coding::PredictPointInTriangle(points.m_max,
+                                                               // common edge with 'to'
+                                                               points.m_points[from.m_p[(p.second + 1) % 3]],
+                                                               points.m_points[from.m_p[(p.second)]],
+                                                               // diagonal point of 'from'
+                                                               points.m_points[from.m_p[(p.second + 2) % 3]]);
+
+  // delta from prediction to diagonal point of 'to'
+  return coding::EncodePointDeltaAsUint(points.m_points[to.m_p[(p.first + 2) % 3]], prediction);
+}
+
+template <class TPopOrder>
+void TrianglesInfo::ListInfo::MakeTrianglesChainImpl(PointsInfo const & points, TIterator start,
+                                                     std::vector<Edge> & chain) const
+{
+  chain.clear();
+
+  Triangle const fictive(start->first.second, start->first.first, -1);
+
+  std::priority_queue<Edge, std::vector<Edge>, TPopOrder> q;
+  q.push(Edge(-1, start->second, 0, -1));
+
+  while (!q.empty())
   {
-    int i = math::NextModN(CommonEdge(trg, from).first, 3);
-    int j = math::NextModN(i, 3);
+    // pop current element
+    Edge e = q.top();
+    q.pop();
 
-    int ind = 0;
-    TIterator it = m_neighbors.find(std::make_pair(trg.m_p[j], trg.m_p[i]));
-    nb[ind++] = (it != m_neighbors.end()) ? it->second : empty_key;
+    // check if already processed
+    if (m_visited[e.m_p[1]])
+      continue;
+    m_visited[e.m_p[1]] = true;
 
-    it = m_neighbors.find(std::make_pair(trg.m_p[math::NextModN(j, 3)], trg.m_p[j]));
-    nb[ind++] = (it != m_neighbors.end()) ? it->second : empty_key;
-  }
+    // push to chain
+    chain.push_back(e);
 
-  /// Calc delta of 'from'->'to' graph edge.
-  uint64_t TrianglesInfo::ListInfo::CalcDelta(
-      PointsInfo const & points, Triangle const & from, Triangle const & to) const
-  {
-    std::pair<int, int> const p = CommonEdge(to, from);
+    Triangle const & trg = m_triangles[e.m_p[1]];
 
-    m2::PointU const prediction = coding::PredictPointInTriangle(
-        points.m_max,
-        // common edge with 'to'
-        points.m_points[from.m_p[(p.second + 1) % 3]], points.m_points[from.m_p[(p.second)]],
-        // diagonal point of 'from'
-        points.m_points[from.m_p[(p.second + 2) % 3]]);
+    // get neighbors
+    int nb[2];
+    GetNeighbors(trg, (e.m_p[0] == -1) ? fictive : m_triangles[e.m_p[0]], nb);
 
-    // delta from prediction to diagonal point of 'to'
-    return coding::EncodePointDeltaAsUint(points.m_points[to.m_p[(p.first + 2) % 3]], prediction);
-  }
-
-  template <class TPopOrder>
-  void TrianglesInfo::ListInfo::MakeTrianglesChainImpl(
-      PointsInfo const & points, TIterator start, std::vector<Edge> & chain) const
-  {
-    chain.clear();
-
-    Triangle const fictive(start->first.second, start->first.first, -1);
-
-    std::priority_queue<Edge, std::vector<Edge>, TPopOrder> q;
-    q.push(Edge(-1, start->second, 0, -1));
-
-    while (!q.empty())
-    {
-      // pop current element
-      Edge e = q.top();
-      q.pop();
-
-      // check if already processed
-      if (m_visited[e.m_p[1]])
-        continue;
-      m_visited[e.m_p[1]] = true;
-
-      // push to chain
-      chain.push_back(e);
-
-      Triangle const & trg = m_triangles[e.m_p[1]];
-
-      // get neighbors
-      int nb[2];
-      GetNeighbors(trg, (e.m_p[0] == -1) ? fictive : m_triangles[e.m_p[0]], nb);
-
-      // push neighbors to queue
-      for (int i = 0; i < 2; ++i)
-        if (nb[i] != empty_key && !m_visited[nb[i]])
-          q.push(Edge(e.m_p[1], nb[i], CalcDelta(points, trg, m_triangles[nb[i]]), i));
-    }
-  }
-
-  // Element with less m_delta is better than another one.
-  struct edge_greater_delta
-  {
-    bool operator() (Edge const & e1, Edge const & e2) const
-    {
-      return (e1.m_delta > e2.m_delta);
-    }
-  };
-
-  // Experimental ...
-  struct edge_less_delta
-  {
-    bool operator() (Edge const & e1, Edge const & e2) const
-    {
-      return (e1.m_delta < e2.m_delta);
-    }
-  };
-
-  void TrianglesInfo::ListInfo::MakeTrianglesChain(
-    PointsInfo const & points, TIterator start, std::vector<Edge> & chain, bool /*goodOrder*/) const
-  {
-    //if (goodOrder)
-      MakeTrianglesChainImpl<edge_greater_delta>(points, start, chain);
-    //else
-    //  MakeTrianglesChainImpl<edge_less_delta>(points, start, chain);
-  }
-
-  bool TrianglesInfo::Add(int p0, int p1, int p2)
-  {
-    return m_triangles.back().Add(p0, p1, p2);
-  }
-
-  void TrianglesInfo::GetPointsInfo(m2::PointU const & baseP,
-                                    m2::PointU const & maxP,
-                                    std::function<m2::PointU (m2::PointD)> const & convert,
-                                    PointsInfo & info) const
-  {
-    info.m_base = baseP;
-    info.m_max = m2::PointD(maxP);
-
-    size_t const count = m_points.size();
-    info.m_points.reserve(count);
-    for (size_t i = 0; i < count; ++i)
-      info.m_points.push_back(convert(m_points[i]));
+    // push neighbors to queue
+    for (int i = 0; i < 2; ++i)
+      if (nb[i] != empty_key && !m_visited[nb[i]])
+        q.push(Edge(e.m_p[1], nb[i], CalcDelta(points, trg, m_triangles[nb[i]]), i));
   }
 }
+
+// Element with less m_delta is better than another one.
+struct edge_greater_delta
+{
+  bool operator()(Edge const & e1, Edge const & e2) const { return (e1.m_delta > e2.m_delta); }
+};
+
+// Experimental ...
+struct edge_less_delta
+{
+  bool operator()(Edge const & e1, Edge const & e2) const { return (e1.m_delta < e2.m_delta); }
+};
+
+void TrianglesInfo::ListInfo::MakeTrianglesChain(PointsInfo const & points, TIterator start, std::vector<Edge> & chain,
+                                                 bool /*goodOrder*/) const
+{
+  // if (goodOrder)
+  MakeTrianglesChainImpl<edge_greater_delta>(points, start, chain);
+  // else
+  //   MakeTrianglesChainImpl<edge_less_delta>(points, start, chain);
+}
+
+bool TrianglesInfo::Add(int p0, int p1, int p2)
+{
+  return m_triangles.back().Add(p0, p1, p2);
+}
+
+void TrianglesInfo::GetPointsInfo(m2::PointU const & baseP, m2::PointU const & maxP,
+                                  std::function<m2::PointU(m2::PointD)> const & convert, PointsInfo & info) const
+{
+  info.m_base = baseP;
+  info.m_max = m2::PointD(maxP);
+
+  size_t const count = m_points.size();
+  info.m_points.reserve(count);
+  for (size_t i = 0; i < count; ++i)
+    info.m_points.push_back(convert(m_points[i]));
+}
+}  // namespace tesselator
diff --git a/generator/tesselator.hpp b/generator/tesselator.hpp
index 29d92c851..192a8506c 100644
--- a/generator/tesselator.hpp
+++ b/generator/tesselator.hpp
@@ -13,176 +13,170 @@
 
 namespace tesselator
 {
-  typedef std::vector<m2::PointD> PointsT;
-  typedef std::list<PointsT> PolygonsT;
+typedef std::vector<m2::PointD> PointsT;
+typedef std::list<PointsT> PolygonsT;
 
-  struct Triangle
+struct Triangle
+{
+  int m_p[3];
+
+  Triangle(int p0, int p1, int p2)
   {
-    int m_p[3];
+    m_p[0] = p0;
+    m_p[1] = p1;
+    m_p[2] = p2;
+  }
 
-    Triangle(int p0, int p1, int p2)
-    {
-      m_p[0] = p0;
-      m_p[1] = p1;
-      m_p[2] = p2;
-    }
-
-    Triangle(int const * p)
-    {
-      for (int i = 0; i < 3; ++i)
-        m_p[i] = p[i];
-    }
-
-    int GetPoint3(std::pair<int, int> const & p) const
-    {
-      for (int i = 0; i < 3; ++i)
-        if (m_p[i] != p.first && m_p[i] != p.second)
-          return m_p[i];
-
-      ASSERT ( false, ("Triangle with equal points") );
-      return -1;
-    }
-  };
-
-  // Converted points, prepared for serialization.
-  struct PointsInfo
+  Triangle(int const * p)
   {
-    std::vector<m2::PointU> m_points;
-    m2::PointU m_base;
-    m2::PointD m_max;
-  };
+    for (int i = 0; i < 3; ++i)
+      m_p[i] = p[i];
+  }
 
-  class TrianglesInfo
+  int GetPoint3(std::pair<int, int> const & p) const
   {
-    PointsT m_points;
+    for (int i = 0; i < 3; ++i)
+      if (m_p[i] != p.first && m_p[i] != p.second)
+        return m_p[i];
 
-    class ListInfo
+    ASSERT(false, ("Triangle with equal points"));
+    return -1;
+  }
+};
+
+// Converted points, prepared for serialization.
+struct PointsInfo
+{
+  std::vector<m2::PointU> m_points;
+  m2::PointU m_base;
+  m2::PointD m_max;
+};
+
+class TrianglesInfo
+{
+  PointsT m_points;
+
+  class ListInfo
+  {
+    static int empty_key;
+
+    std::vector<Triangle> m_triangles;
+
+    mutable std::vector<bool> m_visited;
+
+    // directed edge -> triangle
+    template <typename T1, typename T2>
+    struct HashPair
     {
-      static int empty_key;
-
-      std::vector<Triangle> m_triangles;
-
-      mutable std::vector<bool> m_visited;
-
-      // directed edge -> triangle
-      template <typename T1, typename T2> struct HashPair
-      {
-        size_t operator()(std::pair<T1, T2> const & p) const
-        {
-          return math::Hash(p.first, p.second);
-        }
-      };
-
-      using TNeighbours = std::unordered_map<std::pair<int, int>, int, HashPair<int, int>>;
-      TNeighbours m_neighbors;
-
-      bool AddNeighbour(int p1, int p2, int trg);
-
-      void GetNeighbors(
-          Triangle const & trg, Triangle const & from, int * nb) const;
-
-      uint64_t CalcDelta(
-          PointsInfo const & points, Triangle const & from, Triangle const & to) const;
-
-    public:
-      using TIterator = TNeighbours::const_iterator;
-
-      explicit ListInfo(size_t count)
-      {
-        m_triangles.reserve(count);
-      }
-
-      bool Add(int p0, int p1, int p2);
-
-      void Start() const
-      {
-        m_visited.resize(m_triangles.size());
-      }
-
-      bool HasUnvisited() const
-      {
-        std::vector<bool> test;
-        test.assign(m_triangles.size(), true);
-        return (m_visited != test);
-      }
-
-      TIterator FindStartTriangle(PointsInfo const & points) const;
-
-    private:
-      template <class TPopOrder>
-      void MakeTrianglesChainImpl(PointsInfo const & points, TIterator start, std::vector<Edge> & chain) const;
-    public:
-      void MakeTrianglesChain(PointsInfo const & points, TIterator start, std::vector<Edge> & chain, bool goodOrder) const;
-
-      size_t GetCount() const { return m_triangles.size(); }
-      Triangle GetTriangle(size_t i) const { return m_triangles[i]; }
+      size_t operator()(std::pair<T1, T2> const & p) const { return math::Hash(p.first, p.second); }
     };
 
-    std::list<ListInfo> m_triangles;
+    using TNeighbours = std::unordered_map<std::pair<int, int>, int, HashPair<int, int>>;
+    TNeighbours m_neighbors;
 
-//    int m_isCCW;  // 0 - uninitialized; -1 - false; 1 - true
+    bool AddNeighbour(int p1, int p2, int trg);
+
+    void GetNeighbors(Triangle const & trg, Triangle const & from, int * nb) const;
+
+    uint64_t CalcDelta(PointsInfo const & points, Triangle const & from, Triangle const & to) const;
 
   public:
-    TrianglesInfo()// : m_isCCW(0)
-    {}
+    using TIterator = TNeighbours::const_iterator;
 
-    /// @name Making functions.
-    template <class IterT> void AssignPoints(IterT b, IterT e)
-    {
-      m_points.assign(b, e);
-    }
-
-    void Reserve(size_t count) { m_triangles.push_back(ListInfo(count)); }
+    explicit ListInfo(size_t count) { m_triangles.reserve(count); }
 
     bool Add(int p0, int p1, int p2);
-    //@}
 
-    inline bool IsEmpty() const { return m_triangles.empty(); }
+    void Start() const { m_visited.resize(m_triangles.size()); }
 
-    template <class ToDo> void ForEachTriangle(ToDo && toDo) const
+    bool HasUnvisited() const
     {
-      for (auto i = m_triangles.begin(); i != m_triangles.end(); ++i)
-      {
-        size_t const count = i->GetCount();
-        for (size_t j = 0; j < count; ++j)
-        {
-          Triangle const t = i->GetTriangle(j);
-          toDo(m_points[t.m_p[0]], m_points[t.m_p[1]], m_points[t.m_p[2]]);
-        }
-      }
+      std::vector<bool> test;
+      test.assign(m_triangles.size(), true);
+      return (m_visited != test);
     }
 
-    // Convert points from double to uint.
-    void GetPointsInfo(m2::PointU const & baseP, m2::PointU const & maxP,
-                       std::function<m2::PointU (m2::PointD)> const & convert, PointsInfo & info) const;
+    TIterator FindStartTriangle(PointsInfo const & points) const;
 
-    /// Triangles chains processing function.
-    template <class EmitterT>
-    void ProcessPortions(PointsInfo const & points, EmitterT & emitter, bool goodOrder = true) const
-    {
-      // process portions and push out result chains
-      for (auto const & trg : m_triangles)
-      {
-        trg.Start();
+  private:
+    template <class TPopOrder>
+    void MakeTrianglesChainImpl(PointsInfo const & points, TIterator start, std::vector<Edge> & chain) const;
 
-        do
-        {
-          auto start = trg.FindStartTriangle(points);
+  public:
+    void MakeTrianglesChain(PointsInfo const & points, TIterator start, std::vector<Edge> & chain,
+                            bool goodOrder) const;
 
-          std::vector<Edge> chain;
-          trg.MakeTrianglesChain(points, start, chain, goodOrder);
-
-          m2::PointU arr[] = { points.m_points[start->first.first],
-                               points.m_points[start->first.second],
-                               points.m_points[trg.GetTriangle(start->second).GetPoint3(start->first)] };
-
-          emitter(arr, std::move(chain));
-        } while (trg.HasUnvisited());
-      }
-    }
+    size_t GetCount() const { return m_triangles.size(); }
+    Triangle GetTriangle(size_t i) const { return m_triangles[i]; }
   };
 
-  /// Main tesselate function.
-  /// @returns number of resulting triangles after triangulation.
-  int TesselateInterior(PolygonsT const & polys, TrianglesInfo & info);
-}
+  std::list<ListInfo> m_triangles;
+
+  //    int m_isCCW;  // 0 - uninitialized; -1 - false; 1 - true
+
+public:
+  TrianglesInfo()  // : m_isCCW(0)
+  {}
+
+  /// @name Making functions.
+  template <class IterT>
+  void AssignPoints(IterT b, IterT e)
+  {
+    m_points.assign(b, e);
+  }
+
+  void Reserve(size_t count) { m_triangles.push_back(ListInfo(count)); }
+
+  bool Add(int p0, int p1, int p2);
+  //@}
+
+  inline bool IsEmpty() const { return m_triangles.empty(); }
+
+  template <class ToDo>
+  void ForEachTriangle(ToDo && toDo) const
+  {
+    for (auto i = m_triangles.begin(); i != m_triangles.end(); ++i)
+    {
+      size_t const count = i->GetCount();
+      for (size_t j = 0; j < count; ++j)
+      {
+        Triangle const t = i->GetTriangle(j);
+        toDo(m_points[t.m_p[0]], m_points[t.m_p[1]], m_points[t.m_p[2]]);
+      }
+    }
+  }
+
+  // Convert points from double to uint.
+  void GetPointsInfo(m2::PointU const & baseP, m2::PointU const & maxP,
+                     std::function<m2::PointU(m2::PointD)> const & convert, PointsInfo & info) const;
+
+  /// Triangles chains processing function.
+  template <class EmitterT>
+  void ProcessPortions(PointsInfo const & points, EmitterT & emitter, bool goodOrder = true) const
+  {
+    // process portions and push out result chains
+    for (auto const & trg : m_triangles)
+    {
+      trg.Start();
+
+      do
+      {
+        auto start = trg.FindStartTriangle(points);
+
+        std::vector<Edge> chain;
+        trg.MakeTrianglesChain(points, start, chain, goodOrder);
+
+        m2::PointU arr[] = {points.m_points[start->first.first], points.m_points[start->first.second],
+                            points.m_points[trg.GetTriangle(start->second).GetPoint3(start->first)]};
+
+        emitter(arr, std::move(chain));
+      }
+      while (trg.HasUnvisited());
+    }
+  }
+};
+
+/// Main tesselate function.
+/// @returns number of resulting triangles after triangulation.
+int TesselateInterior(PolygonsT const & polys, TrianglesInfo & info);
+}  // namespace tesselator
diff --git a/generator/towns_dumper.cpp b/generator/towns_dumper.cpp
index 6f448674b..e2b2184fc 100644
--- a/generator/towns_dumper.cpp
+++ b/generator/towns_dumper.cpp
@@ -10,7 +10,6 @@
 
 #include <fstream>
 
-
 double TownsDumper::GetDistanceThreshold()
 {
   return 500000;
@@ -23,12 +22,10 @@ void TownsDumper::FilterTowns()
   std::vector<Town> towns;
   towns.reserve(m_records.size());
   for (auto const & town : m_records)
-  {
     if (town.capital)
       resultTree.Add(town);
     else
       towns.push_back(town);
-  }
   sort(towns.begin(), towns.end());
 
   LOG(LINFO, ("Capital's tree size =", resultTree.GetSize(), "; Town's vector size =", towns.size()));
@@ -44,22 +41,19 @@ void TownsDumper::FilterTowns()
     resultTree.ForEachInRect(
         mercator::RectByCenterXYAndSizeInMeters(mercator::FromLatLon(top.point), distanceThreshold),
         [&top, &isUniq, &distanceThreshold](Town const & candidate)
-        {
-          // The idea behind that is to collect all capitals and unique major cities in 500 km radius
-          // for upgrading in World map visibility. See TOWNS_FILE usage.
-          if (ms::DistanceOnEarth(top.point, candidate.point) < distanceThreshold)
-            isUniq = false;
-        });
+    {
+      // The idea behind that is to collect all capitals and unique major cities in 500 km radius
+      // for upgrading in World map visibility. See TOWNS_FILE usage.
+      if (ms::DistanceOnEarth(top.point, candidate.point) < distanceThreshold)
+        isUniq = false;
+    });
 
     if (isUniq)
       resultTree.Add(top);
     towns.pop_back();
   }
 
-  resultTree.ForEach([this](Town const & town)
-                     {
-                       m_records.push_back(town);
-                     });
+  resultTree.ForEach([this](Town const & town) { m_records.push_back(town); });
   LOG(LINFO, ("Preprocessing finished. Have", m_records.size(), "towns."));
 }
 
@@ -81,21 +75,13 @@ void TownsDumper::CheckElement(OsmElement const & em)
     auto const & key = tag.m_key;
     auto const & value = tag.m_value;
     if (key == "population")
-    {
       UNUSED_VALUE(strings::to_uint64(value, population));
-    }
     else if (key == "admin_level")
-    {
       UNUSED_VALUE(strings::to_int(value, admin_level));
-    }
     else if (key == "capital" && value == "yes")
-    {
       capital = true;
-    }
     else if (key == "place" && (value == "city" || value == "town"))
-    {
       town = true;
-    }
   }
 
   // Ignore regional capitals.
@@ -116,6 +102,6 @@ void TownsDumper::Dump(std::string const & filePath)
   for (auto const & record : m_records)
   {
     std::string const isCapital = record.capital ? "t" : "f";
-    stream << record.point.m_lat << ";" << record.point.m_lon << ";" << record.id << ";" << isCapital <<  std::endl;
+    stream << record.point.m_lat << ";" << record.point.m_lon << ";" << record.id << ";" << isCapital << std::endl;
   }
 }
diff --git a/generator/towns_dumper.hpp b/generator/towns_dumper.hpp
index 393908429..6e958b9b6 100644
--- a/generator/towns_dumper.hpp
+++ b/generator/towns_dumper.hpp
@@ -27,9 +27,11 @@ private:
     uint64_t population;
 
     Town(double lat, double lon, uint64_t id, bool isCapital, uint64_t population)
-      : point(lat, lon), id(id), capital(isCapital), population(population)
-    {
-    }
+      : point(lat, lon)
+      , id(id)
+      , capital(isCapital)
+      , population(population)
+    {}
 
     bool operator<(Town const & rhs) const { return population < rhs.population; }
     m2::RectD GetLimitRect() const
diff --git a/generator/traffic_generator.cpp b/generator/traffic_generator.cpp
index 11c3a9ad4..c2dd80217 100644
--- a/generator/traffic_generator.cpp
+++ b/generator/traffic_generator.cpp
@@ -12,8 +12,8 @@
 #include "indexer/feature_processor.hpp"
 #include "indexer/features_offsets_table.hpp"
 
-#include "coding/files_container.hpp"
 #include "coding/file_writer.hpp"
+#include "coding/files_container.hpp"
 
 #include <vector>
 
diff --git a/generator/transit_generator.cpp b/generator/transit_generator.cpp
index 2dcccaf55..6754d64aa 100644
--- a/generator/transit_generator.cpp
+++ b/generator/transit_generator.cpp
@@ -53,10 +53,8 @@ void LoadBorders(std::string const & dir, CountryId const & countryId, std::vect
 
 void FillOsmIdToFeatureIdsMap(std::string const & osmIdToFeatureIdsPath, OsmIdToFeatureIdsMap & mapping)
 {
-  CHECK(ForEachOsmId2FeatureId(osmIdToFeatureIdsPath,
-                               [&mapping](auto const & compositeId, auto featureId) {
-                                 mapping[compositeId.m_mainId].push_back(featureId);
-                               }),
+  CHECK(ForEachOsmId2FeatureId(osmIdToFeatureIdsPath, [&mapping](auto const & compositeId, auto featureId)
+  { mapping[compositeId.m_mainId].push_back(featureId); }),
         (osmIdToFeatureIdsPath));
 }
 
@@ -69,8 +67,7 @@ std::string GetMwmPath(std::string const & mwmDir, CountryId const & countryId)
 /// The result of the calculation is set to |Gate::m_bestPedestrianSegment| of every gate
 /// from |graphData.m_gates|.
 /// \note All gates in |graphData.m_gates| must have a valid |m_point| field before the call.
-void CalculateBestPedestrianSegments(std::string const & mwmPath, CountryId const & countryId,
-                                     GraphData & graphData)
+void CalculateBestPedestrianSegments(std::string const & mwmPath, CountryId const & countryId, GraphData & graphData)
 {
   // Creating IndexRouter.
   SingleMwmDataSource dataSource(mwmPath);
@@ -78,11 +75,10 @@ void CalculateBestPedestrianSegments(std::string const & mwmPath, CountryId cons
   auto infoGetter = storage::CountryInfoReader::CreateCountryInfoGetter(GetPlatform());
   CHECK(infoGetter, ());
 
-  auto const countryFileGetter = [&infoGetter](m2::PointD const & pt) {
-    return infoGetter->GetRegionCountryId(pt);
-  };
+  auto const countryFileGetter = [&infoGetter](m2::PointD const & pt) { return infoGetter->GetRegionCountryId(pt); };
 
-  auto const getMwmRectByName = [&](std::string const & c) -> m2::RectD {
+  auto const getMwmRectByName = [&](std::string const & c) -> m2::RectD
+  {
     CHECK_EQUAL(countryId, c, ());
     return infoGetter->GetLimitRectForLeaf(c);
   };
@@ -92,9 +88,8 @@ void CalculateBestPedestrianSegments(std::string const & mwmPath, CountryId cons
   numMwmIds->RegisterFile(CountryFile(countryId));
 
   // Note. |indexRouter| is valid while |dataSource| is valid.
-  IndexRouter indexRouter(VehicleType::Pedestrian, false /* load altitudes */,
-                          CountryParentNameGetterFn(), countryFileGetter, getMwmRectByName,
-                          numMwmIds, MakeNumMwmTree(*numMwmIds, *infoGetter),
+  IndexRouter indexRouter(VehicleType::Pedestrian, false /* load altitudes */, CountryParentNameGetterFn(),
+                          countryFileGetter, getMwmRectByName, numMwmIds, MakeNumMwmTree(*numMwmIds, *infoGetter),
                           traffic::TrafficCache(), dataSource.GetDataSource());
   auto worldGraph = indexRouter.MakeSingleMwmWorldGraph();
 
@@ -118,32 +113,31 @@ void CalculateBestPedestrianSegments(std::string const & mwmPath, CountryId cons
       if (indexRouter.GetBestOutgoingEdges(gate.GetPoint(), *worldGraph, bestEdges))
       {
         CHECK(!bestEdges.empty(), ());
-        IndexRouter::BestEdgeComparator bestEdgeComparator(gate.GetPoint(),
-                                                           m2::PointD::Zero() /* direction */);
+        IndexRouter::BestEdgeComparator bestEdgeComparator(gate.GetPoint(), m2::PointD::Zero() /* direction */);
         // Looking for the edge which is the closest to |gate.GetPoint()|.
         // @TODO It should be considered to change the format of transit section to keep all
         // candidates for every gate.
-        auto const & bestEdge = *min_element(
-            bestEdges.cbegin(), bestEdges.cend(),
-            [&bestEdgeComparator](routing::Edge const & lhs, routing::Edge const & rhs) {
-              return bestEdgeComparator.Compare(lhs, rhs) < 0;
-            });
+        auto const & bestEdge = *min_element(bestEdges.cbegin(), bestEdges.cend(),
+                                             [&bestEdgeComparator](routing::Edge const & lhs, routing::Edge const & rhs)
+        { return bestEdgeComparator.Compare(lhs, rhs) < 0; });
 
         CHECK(bestEdge.GetFeatureId().IsValid(), ());
 
-        graphData.SetGateBestPedestrianSegment(i, SingleMwmSegment(
-            bestEdge.GetFeatureId().m_index, bestEdge.GetSegId(), bestEdge.IsForward()));
+        graphData.SetGateBestPedestrianSegment(
+            i, SingleMwmSegment(bestEdge.GetFeatureId().m_index, bestEdge.GetSegId(), bestEdge.IsForward()));
       }
     }
     catch (MwmIsNotAliveException const & e)
     {
-      LOG(LCRITICAL, ("Point of a gate belongs to the processed mwm:", countryId, ","
-          "but the mwm is not alive. Gate:", gate, e.what()));
+      LOG(LCRITICAL, ("Point of a gate belongs to the processed mwm:", countryId,
+                      ","
+                      "but the mwm is not alive. Gate:",
+                      gate, e.what()));
     }
     catch (RootException const & e)
     {
-      LOG(LCRITICAL, ("Exception while looking for the best segment of a gate. CountryId:",
-          countryId, ". Gate:", gate, e.what()));
+      LOG(LCRITICAL,
+          ("Exception while looking for the best segment of a gate. CountryId:", countryId, ". Gate:", gate, e.what()));
     }
   }
 }
@@ -151,14 +145,12 @@ void CalculateBestPedestrianSegments(std::string const & mwmPath, CountryId cons
 
 namespace routing::transit
 {
-void DeserializeFromJson(OsmIdToFeatureIdsMap const & mapping,
-                         std::string const & transitJsonPath, GraphData & data)
+void DeserializeFromJson(OsmIdToFeatureIdsMap const & mapping, std::string const & transitJsonPath, GraphData & data)
 {
   Platform::EFileType fileType;
   Platform::EError const errCode = Platform::GetFileType(transitJsonPath, fileType);
   CHECK_EQUAL(errCode, Platform::EError::ERR_OK, ("Transit graph was not found:", transitJsonPath));
-  CHECK_EQUAL(fileType, Platform::EFileType::Regular,
-              ("Transit graph was not found:", transitJsonPath));
+  CHECK_EQUAL(fileType, Platform::EFileType::Regular, ("Transit graph was not found:", transitJsonPath));
 
   std::string jsonBuffer;
   try
@@ -192,8 +184,8 @@ void ProcessGraph(std::string const & mwmPath, CountryId const & countryId,
   data.CheckValidSortedUnique();
 }
 
-void BuildTransit(std::string const & mwmDir, CountryId const & countryId,
-                  std::string const & osmIdToFeatureIdsPath, std::string const & transitDir)
+void BuildTransit(std::string const & mwmDir, CountryId const & countryId, std::string const & osmIdToFeatureIdsPath,
+                  std::string const & transitDir)
 {
   std::string const mwmPath = GetMwmPath(mwmDir, countryId);
   LOG(LINFO, ("Building transit section for", mwmPath));
@@ -218,7 +210,7 @@ void BuildTransit(std::string const & mwmDir, CountryId const & countryId,
   }
 
   if (jointData.IsEmpty())
-    return; // Empty transit section.
+    return;  // Empty transit section.
 
   ProcessGraph(mwmPath, countryId, mapping, jointData);
   jointData.CheckValidSortedUnique();
diff --git a/generator/transit_generator.hpp b/generator/transit_generator.hpp
index b67fe05b5..fb8f2eb0c 100644
--- a/generator/transit_generator.hpp
+++ b/generator/transit_generator.hpp
@@ -13,8 +13,7 @@ namespace transit
 /// \brief Fills |data| according to a transit graph (|transitJsonPath|).
 /// \note Some fields of |data| contain feature ids of a certain mwm. These fields are filled
 /// iff the mapping (|osmIdToFeatureIdsPath|) contains them. Otherwise the fields have default value.
-void DeserializeFromJson(OsmIdToFeatureIdsMap const & mapping, std::string const & transitJsonPath,
-                         GraphData & data);
+void DeserializeFromJson(OsmIdToFeatureIdsMap const & mapping, std::string const & transitJsonPath, GraphData & data);
 
 /// \brief Calculates and adds some information to transit graph (|data|) after deserializing
 /// from json.
diff --git a/generator/transit_generator_experimental.cpp b/generator/transit_generator_experimental.cpp
index d034410ee..3b5ad2a8e 100644
--- a/generator/transit_generator_experimental.cpp
+++ b/generator/transit_generator_experimental.cpp
@@ -21,8 +21,8 @@
 
 #include "coding/file_writer.hpp"
 
-#include "geometry/point2d.hpp"
 #include "geometry/mercator.hpp"
+#include "geometry/point2d.hpp"
 
 #include "base/assert.hpp"
 #include "base/exception.hpp"
@@ -45,13 +45,11 @@ namespace transit
 {
 namespace experimental
 {
-void FillOsmIdToFeatureIdsMap(std::string const & osmIdToFeatureIdsPath,
-                              OsmIdToFeatureIdsMap & mapping)
+void FillOsmIdToFeatureIdsMap(std::string const & osmIdToFeatureIdsPath, OsmIdToFeatureIdsMap & mapping)
 {
-  bool const mappedIds = ForEachOsmId2FeatureId(
-      osmIdToFeatureIdsPath, [&mapping](auto const & compositeId, auto featureId) {
-        mapping[compositeId.m_mainId].push_back(featureId);
-      });
+  bool const mappedIds =
+      ForEachOsmId2FeatureId(osmIdToFeatureIdsPath, [&mapping](auto const & compositeId, auto featureId)
+  { mapping[compositeId.m_mainId].push_back(featureId); });
   CHECK(mappedIds, (osmIdToFeatureIdsPath));
 }
 
@@ -73,8 +71,7 @@ std::vector<SingleMwmSegment> GetSegmentsFromEdges(std::vector<routing::Edge> &&
 
 template <class D, class C>
 std::vector<routing::Edge> GetBestPedestrianEdges(D const & destination, C && countryFileGetter,
-                                                  IndexRouter & indexRouter,
-                                                  std::unique_ptr<WorldGraph> & worldGraph,
+                                                  IndexRouter & indexRouter, std::unique_ptr<WorldGraph> & worldGraph,
                                                   CountryId const & countryId)
 {
   std::vector<routing::Edge> edges;
@@ -100,8 +97,8 @@ std::vector<routing::Edge> GetBestPedestrianEdges(D const & destination, C && co
   }
   catch (RootException const & e)
   {
-    LOG(LCRITICAL, ("Exception while looking for the best segment in mwm", countryId,
-                    "Destination", mercator::ToLatLon(destination.GetPoint()), e.what()));
+    LOG(LCRITICAL, ("Exception while looking for the best segment in mwm", countryId, "Destination",
+                    mercator::ToLatLon(destination.GetPoint()), e.what()));
   }
 
   return edges;
@@ -117,11 +114,10 @@ void CalculateBestPedestrianSegments(std::string const & mwmPath, CountryId cons
   auto infoGetter = storage::CountryInfoReader::CreateCountryInfoGetter(GetPlatform());
   CHECK(infoGetter, ());
 
-  auto const countryFileGetter = [&infoGetter](m2::PointD const & pt) {
-    return infoGetter->GetRegionCountryId(pt);
-  };
+  auto const countryFileGetter = [&infoGetter](m2::PointD const & pt) { return infoGetter->GetRegionCountryId(pt); };
 
-  auto const getMwmRectByName = [&](std::string const & c) {
+  auto const getMwmRectByName = [&](std::string const & c)
+  {
     CHECK_EQUAL(countryId, c, ());
     return infoGetter->GetLimitRectForLeaf(c);
   };
@@ -131,38 +127,33 @@ void CalculateBestPedestrianSegments(std::string const & mwmPath, CountryId cons
   numMwmIds->RegisterFile(CountryFile(countryId));
 
   // |indexRouter| is valid while |dataSource| is valid.
-  IndexRouter indexRouter(VehicleType::Pedestrian, false /* load altitudes */,
-                          CountryParentNameGetterFn(), countryFileGetter, getMwmRectByName,
-                          numMwmIds, MakeNumMwmTree(*numMwmIds, *infoGetter),
+  IndexRouter indexRouter(VehicleType::Pedestrian, false /* load altitudes */, CountryParentNameGetterFn(),
+                          countryFileGetter, getMwmRectByName, numMwmIds, MakeNumMwmTree(*numMwmIds, *infoGetter),
                           traffic::TrafficCache(), dataSource.GetDataSource());
   auto worldGraph = indexRouter.MakeSingleMwmWorldGraph();
 
   auto const & gates = transitData.GetGates();
   for (size_t i = 0; i < gates.size(); ++i)
   {
-    auto edges =
-        GetBestPedestrianEdges(gates[i], countryFileGetter, indexRouter, worldGraph, countryId);
+    auto edges = GetBestPedestrianEdges(gates[i], countryFileGetter, indexRouter, worldGraph, countryId);
     transitData.SetGatePedestrianSegments(i, GetSegmentsFromEdges(std::move(edges)));
   }
 
   auto const & stops = transitData.GetStops();
   for (size_t i = 0; i < stops.size(); ++i)
   {
-    auto edges =
-        GetBestPedestrianEdges(stops[i], countryFileGetter, indexRouter, worldGraph, countryId);
+    auto edges = GetBestPedestrianEdges(stops[i], countryFileGetter, indexRouter, worldGraph, countryId);
     transitData.SetStopPedestrianSegments(i, GetSegmentsFromEdges(std::move(edges)));
   }
 }
 
-void DeserializeFromJson(OsmIdToFeatureIdsMap const & mapping, std::string const & transitJsonsPath,
-                         TransitData & data)
+void DeserializeFromJson(OsmIdToFeatureIdsMap const & mapping, std::string const & transitJsonsPath, TransitData & data)
 {
   data.DeserializeFromJson(transitJsonsPath, mapping);
 }
 
 EdgeIdToFeatureId BuildTransit(std::string const & mwmDir, CountryId const & countryId,
-                               std::string const & osmIdToFeatureIdsPath,
-                               std::string const & transitDir)
+                               std::string const & osmIdToFeatureIdsPath, std::string const & transitDir)
 {
   LOG(LINFO, ("Building experimental transit section for", countryId, "mwmDir:", mwmDir));
   std::string const mwmPath = GetMwmPath(mwmDir, countryId);
diff --git a/generator/transit_generator_experimental.hpp b/generator/transit_generator_experimental.hpp
index 603fecf5c..a97222c82 100644
--- a/generator/transit_generator_experimental.hpp
+++ b/generator/transit_generator_experimental.hpp
@@ -28,7 +28,6 @@ void DeserializeFromJson(OsmIdToFeatureIdsMap const & mapping, std::string const
 /// * feature geometry
 /// * index graph (ROUTING_FILE_TAG)
 EdgeIdToFeatureId BuildTransit(std::string const & mwmDir, storage::CountryId const & countryId,
-                               std::string const & osmIdToFeatureIdsPath,
-                               std::string const & transitDir);
+                               std::string const & osmIdToFeatureIdsPath, std::string const & transitDir);
 }  // namespace experimental
 }  // namespace transit
diff --git a/generator/translator.cpp b/generator/translator.cpp
index 662b27f9b..2af743f39 100644
--- a/generator/translator.cpp
+++ b/generator/translator.cpp
@@ -4,13 +4,11 @@
 #include "generator/filter_collection.hpp"
 #include "generator/osm_element.hpp"
 
-
 namespace generator
 {
 Translator::Translator(std::shared_ptr<FeatureProcessorInterface> const & processor,
                        std::shared_ptr<cache::IntermediateData> const & cache,
-                       std::shared_ptr<FeatureMakerBase> const & maker,
-                       std::shared_ptr<FilterInterface> const & filter,
+                       std::shared_ptr<FeatureMakerBase> const & maker, std::shared_ptr<FilterInterface> const & filter,
                        std::shared_ptr<CollectorInterface> const & collector)
   : m_filter(filter)
   , m_collector(collector)
@@ -25,30 +23,31 @@ Translator::Translator(std::shared_ptr<FeatureProcessorInterface> const & proces
 Translator::Translator(std::shared_ptr<FeatureProcessorInterface> const & processor,
                        std::shared_ptr<cache::IntermediateData> const & cache,
                        std::shared_ptr<FeatureMakerBase> const & maker)
-  : Translator(processor, cache, maker, std::make_shared<FilterCollection>(),
-               std::make_shared<CollectorCollection>())
-{
-}
+  : Translator(processor, cache, maker, std::make_shared<FilterCollection>(), std::make_shared<CollectorCollection>())
+{}
 
 void Translator::SetCollector(std::shared_ptr<CollectorInterface> const & collector)
 {
   m_collector = collector;
 }
 
-void Translator::SetFilter(std::shared_ptr<FilterInterface> const & filter) { m_filter = filter; }
+void Translator::SetFilter(std::shared_ptr<FilterInterface> const & filter)
+{
+  m_filter = filter;
+}
 
 void Translator::Emit(OsmElement const & src)
 {
   // Make a copy because it will be modified below.
   OsmElement element(src);
 
-  Preprocess(element); // Might use replaced_tags.txt via a TagReplacer.
+  Preprocess(element);  // Might use replaced_tags.txt via a TagReplacer.
   if (!m_filter->IsAccepted(element))
     return;
 
   m_tagsEnricher(element);
   m_collector->Collect(element);
-  m_featureMaker->Add(element); // A feature is created from OSM tags.
+  m_featureMaker->Add(element);  // A feature is created from OSM tags.
   feature::FeatureBuilder feature;
   while (m_featureMaker->GetNextFeature(feature))
   {
diff --git a/generator/translator.hpp b/generator/translator.hpp
index 665d74ebd..5238cee78 100644
--- a/generator/translator.hpp
+++ b/generator/translator.hpp
@@ -28,8 +28,7 @@ class Translator : public TranslatorInterface
 public:
   explicit Translator(std::shared_ptr<FeatureProcessorInterface> const & processor,
                       std::shared_ptr<cache::IntermediateData> const & cache,
-                      std::shared_ptr<FeatureMakerBase> const & maker,
-                      std::shared_ptr<FilterInterface> const & filter,
+                      std::shared_ptr<FeatureMakerBase> const & maker, std::shared_ptr<FilterInterface> const & filter,
                       std::shared_ptr<CollectorInterface> const & collector);
   explicit Translator(std::shared_ptr<FeatureProcessorInterface> const & processor,
                       std::shared_ptr<cache::IntermediateData> const & cache,
@@ -55,10 +54,7 @@ protected:
     return std::make_shared<T>(processor, cache, featureMaker, filter, collector);
   }
 
-  void MergeIntoBase(Translator & other) const
-  {
-    other.m_collector->Merge(*m_collector);
-  }
+  void MergeIntoBase(Translator & other) const { other.m_collector->Merge(*m_collector); }
 
   std::shared_ptr<FilterInterface> m_filter;
   std::shared_ptr<CollectorInterface> m_collector;
diff --git a/generator/translator_coastline.cpp b/generator/translator_coastline.cpp
index c6abfedee..f971f0e96 100644
--- a/generator/translator_coastline.cpp
+++ b/generator/translator_coastline.cpp
@@ -22,10 +22,7 @@ class CoastlineFilter : public FilterInterface
 {
 public:
   // FilterInterface overrides:
-  std::shared_ptr<FilterInterface> Clone() const override
-  {
-    return std::make_shared<CoastlineFilter>();
-  }
+  std::shared_ptr<FilterInterface> Clone() const override { return std::make_shared<CoastlineFilter>(); }
 
   bool IsAccepted(feature::FeatureBuilder const & feature) const override
   {
@@ -35,16 +32,15 @@ public:
 };
 }  // namespace
 
-TranslatorCoastline::TranslatorCoastline(
-    std::shared_ptr<FeatureProcessorInterface> const & processor,
-    std::shared_ptr<cache::IntermediateData> const & cache)
+TranslatorCoastline::TranslatorCoastline(std::shared_ptr<FeatureProcessorInterface> const & processor,
+                                         std::shared_ptr<cache::IntermediateData> const & cache)
   : Translator(processor, cache, std::make_shared<FeatureMaker>(cache->GetCache()))
 {
   auto filters = std::make_shared<FilterCollection>();
   filters->Append(std::make_shared<FilterPlanet>());
   filters->Append(std::make_shared<CoastlineFilter>());
-  filters->Append(std::make_shared<FilterElements>(
-      base::JoinPath(GetPlatform().ResourcesDir(), SKIPPED_ELEMENTS_FILE)));
+  filters->Append(
+      std::make_shared<FilterElements>(base::JoinPath(GetPlatform().ResourcesDir(), SKIPPED_ELEMENTS_FILE)));
   SetFilter(filters);
 }
 
@@ -53,5 +49,8 @@ std::shared_ptr<TranslatorInterface> TranslatorCoastline::Clone() const
   return Translator::CloneBase<TranslatorCoastline>();
 }
 
-void TranslatorCoastline::MergeInto(TranslatorCoastline & other) const { MergeIntoBase(other); }
+void TranslatorCoastline::MergeInto(TranslatorCoastline & other) const
+{
+  MergeIntoBase(other);
+}
 }  // namespace generator
diff --git a/generator/translator_collection.hpp b/generator/translator_collection.hpp
index 7b2a0d390..3847e0c67 100644
--- a/generator/translator_collection.hpp
+++ b/generator/translator_collection.hpp
@@ -8,8 +8,9 @@
 namespace generator
 {
 // This class allows you to work with a group of translators as with one.
-class TranslatorCollection : public CollectionBase<std::shared_ptr<TranslatorInterface>>,
-                             public TranslatorInterface
+class TranslatorCollection
+  : public CollectionBase<std::shared_ptr<TranslatorInterface>>
+  , public TranslatorInterface
 {
 public:
   // TranslatorInterface overrides:
diff --git a/generator/translator_complex.cpp b/generator/translator_complex.cpp
index e217fb19c..fc4df73d3 100644
--- a/generator/translator_complex.cpp
+++ b/generator/translator_complex.cpp
@@ -21,18 +21,17 @@ TranslatorComplex::TranslatorComplex(std::shared_ptr<FeatureProcessorInterface>
                                      std::shared_ptr<cache::IntermediateData> const & cache,
                                      feature::GenerateInfo const & info)
   : Translator(processor, cache, std::make_shared<FeatureMaker>(cache->GetCache()))
-  , m_tagReplacer(std::make_shared<TagReplacer>(
-                    base::JoinPath(GetPlatform().ResourcesDir(), REPLACED_TAGS_FILE)))
+  , m_tagReplacer(std::make_shared<TagReplacer>(base::JoinPath(GetPlatform().ResourcesDir(), REPLACED_TAGS_FILE)))
 {
   auto filters = std::make_shared<FilterCollection>();
   filters->Append(std::make_shared<FilterPlanet>());
   filters->Append(std::make_shared<FilterComplex>());
-  filters->Append(std::make_shared<FilterElements>(
-      base::JoinPath(GetPlatform().ResourcesDir(), SKIPPED_ELEMENTS_FILE)));
+  filters->Append(
+      std::make_shared<FilterElements>(base::JoinPath(GetPlatform().ResourcesDir(), SKIPPED_ELEMENTS_FILE)));
   SetFilter(filters);
 
-  SetCollector(std::make_shared<BuildingPartsCollector>(
-                 info.GetIntermediateFileName(BUILDING_PARTS_MAPPING_FILE), cache->GetCache()));
+  SetCollector(std::make_shared<BuildingPartsCollector>(info.GetIntermediateFileName(BUILDING_PARTS_MAPPING_FILE),
+                                                        cache->GetCache()));
 }
 
 void TranslatorComplex::Preprocess(OsmElement & element)
@@ -47,7 +46,13 @@ std::shared_ptr<TranslatorInterface> TranslatorComplex::Clone() const
   return copy;
 }
 
-void TranslatorComplex::Merge(TranslatorInterface const & other) { other.MergeInto(*this); }
+void TranslatorComplex::Merge(TranslatorInterface const & other)
+{
+  other.MergeInto(*this);
+}
 
-void TranslatorComplex::MergeInto(TranslatorComplex & other) const { MergeIntoBase(other); }
+void TranslatorComplex::MergeInto(TranslatorComplex & other) const
+{
+  MergeIntoBase(other);
+}
 }  // namespace generator
diff --git a/generator/translator_country.cpp b/generator/translator_country.cpp
index 8931b17f3..442d28459 100644
--- a/generator/translator_country.cpp
+++ b/generator/translator_country.cpp
@@ -18,7 +18,7 @@
 #include "generator/intermediate_data.hpp"
 #include "generator/maxspeeds_collector.hpp"
 #include "generator/metalines_builder.hpp"
-//#include "generator/node_mixer.hpp"
+// #include "generator/node_mixer.hpp"
 #include "generator/restriction_writer.hpp"
 #include "generator/road_access_generator.hpp"
 
@@ -36,10 +36,7 @@ namespace
 class RelationCollector
 {
 public:
-  explicit RelationCollector(std::shared_ptr<CollectorInterface> const & collectors)
-    : m_collectors(collectors)
-  {
-  }
+  explicit RelationCollector(std::shared_ptr<CollectorInterface> const & collectors) : m_collectors(collectors) {}
 
   template <class Reader>
   base::ControlFlow operator()(uint64_t id, Reader & reader)
@@ -66,10 +63,8 @@ bool WikiDataValidator(std::string const & tagValue)
     return false;
 
   while (pos != tagValue.size())
-  {
     if (!std::isdigit(tagValue[pos++]))
       return false;
-  }
 
   return true;
 }
@@ -77,32 +72,30 @@ bool WikiDataValidator(std::string const & tagValue)
 
 TranslatorCountry::TranslatorCountry(std::shared_ptr<FeatureProcessorInterface> const & processor,
                                      std::shared_ptr<cache::IntermediateData> const & cache,
-                                     feature::GenerateInfo const & info,
-                                     AffiliationInterfacePtr affiliation)
+                                     feature::GenerateInfo const & info, AffiliationInterfacePtr affiliation)
   : Translator(processor, cache, std::make_shared<FeatureMaker>(cache->GetCache()))
   /// @todo Looks like ways.csv was in some MM proprietary generator routine?!
   , m_tagAdmixer(std::make_shared<TagAdmixer>(info.GetIntermediateFileName("ways", ".csv"),
                                               info.GetIntermediateFileName(TOWNS_FILE)))
-  , m_tagReplacer(std::make_shared<TagReplacer>(
-        base::JoinPath(GetPlatform().ResourcesDir(), REPLACED_TAGS_FILE)))
+  , m_tagReplacer(std::make_shared<TagReplacer>(base::JoinPath(GetPlatform().ResourcesDir(), REPLACED_TAGS_FILE)))
 {
   /// @todo This option is not used, but may be useful in future?
-//  if (needMixTags)
-//  {
-//    m_osmTagMixer = std::make_shared<OsmTagMixer>(
-//        base::JoinPath(GetPlatform().ResourcesDir(), MIXED_TAGS_FILE));
-//  }
+  //  if (needMixTags)
+  //  {
+  //    m_osmTagMixer = std::make_shared<OsmTagMixer>(
+  //        base::JoinPath(GetPlatform().ResourcesDir(), MIXED_TAGS_FILE));
+  //  }
 
   auto filters = std::make_shared<FilterCollection>();
   filters->Append(std::make_shared<FilterPlanet>());
   filters->Append(std::make_shared<FilterRoads>());
-  filters->Append(std::make_shared<FilterElements>(base::JoinPath(GetPlatform().ResourcesDir(), SKIPPED_ELEMENTS_FILE)));
+  filters->Append(
+      std::make_shared<FilterElements>(base::JoinPath(GetPlatform().ResourcesDir(), SKIPPED_ELEMENTS_FILE)));
 
   SetFilter(filters);
 
   auto collectors = std::make_shared<CollectorCollection>();
-  collectors->Append(std::make_shared<feature::MetalinesBuilder>(
-      info.GetIntermediateFileName(METALINES_FILENAME)));
+  collectors->Append(std::make_shared<feature::MetalinesBuilder>(info.GetIntermediateFileName(METALINES_FILENAME)));
   collectors->Append(std::make_shared<BoundaryPostcodeCollector>(
       info.GetIntermediateFileName(BOUNDARY_POSTCODES_FILENAME), cache->GetCache()));
 
@@ -116,8 +109,8 @@ TranslatorCountry::TranslatorCountry(std::shared_ptr<FeatureProcessorInterface>
       info.GetIntermediateFileName(ROAD_ACCESS_FILENAME), cache->GetCache()));
   collectors->Append(std::make_shared<routing_builder::CameraCollector>(
       info.GetIntermediateFileName(CAMERAS_TO_WAYS_FILENAME), cache->GetCache()));
-  collectors->Append(std::make_shared<MiniRoundaboutCollector>(
-      info.GetIntermediateFileName(MINI_ROUNDABOUTS_FILENAME), cache->GetCache()));
+  collectors->Append(std::make_shared<MiniRoundaboutCollector>(info.GetIntermediateFileName(MINI_ROUNDABOUTS_FILENAME),
+                                                               cache->GetCache()));
   collectors->Append(std::make_shared<AddressesCollector>(info.GetIntermediateFileName(ADDR_INTERPOL_FILENAME)));
 
   if (affiliation)
@@ -125,8 +118,8 @@ TranslatorCountry::TranslatorCountry(std::shared_ptr<FeatureProcessorInterface>
 
   if (!info.m_idToWikidataFilename.empty())
   {
-    collectors->Append(std::make_shared<CollectorTag>(info.m_idToWikidataFilename,
-                                                      "wikidata" /* tagKey */, WikiDataValidator));
+    collectors->Append(
+        std::make_shared<CollectorTag>(info.m_idToWikidataFilename, "wikidata" /* tagKey */, WikiDataValidator));
   }
 
   SetCollector(collectors);
@@ -151,7 +144,10 @@ void TranslatorCountry::Preprocess(OsmElement & element)
   CollectFromRelations(element);
 }
 
-void TranslatorCountry::MergeInto(TranslatorCountry & other) const { MergeIntoBase(other); }
+void TranslatorCountry::MergeInto(TranslatorCountry & other) const
+{
+  MergeIntoBase(other);
+}
 
 void TranslatorCountry::CollectFromRelations(OsmElement const & element)
 {
diff --git a/generator/translator_country.hpp b/generator/translator_country.hpp
index 9b0d11c50..798ab2f59 100644
--- a/generator/translator_country.hpp
+++ b/generator/translator_country.hpp
@@ -24,8 +24,8 @@ class TranslatorCountry : public Translator
 {
 public:
   TranslatorCountry(std::shared_ptr<FeatureProcessorInterface> const & processor,
-                    std::shared_ptr<cache::IntermediateData> const & cache,
-                    feature::GenerateInfo const & info, AffiliationInterfacePtr affiliation);
+                    std::shared_ptr<cache::IntermediateData> const & cache, feature::GenerateInfo const & info,
+                    AffiliationInterfacePtr affiliation);
 
   // TranslatorInterface overrides:
   void Preprocess(OsmElement & element) override;
diff --git a/generator/translator_factory.hpp b/generator/translator_factory.hpp
index da543a20b..f53ca053d 100644
--- a/generator/translator_factory.hpp
+++ b/generator/translator_factory.hpp
@@ -2,7 +2,7 @@
 
 #include "generator/factory_utils.hpp"
 #include "generator/translator_coastline.hpp"
-//#include "generator/translator_complex.hpp"
+// #include "generator/translator_complex.hpp"
 #include "generator/translator_country.hpp"
 #include "generator/translator_interface.hpp"
 #include "generator/translator_world.hpp"
@@ -19,7 +19,7 @@ enum class TranslatorType
   Country,
   Coastline,
   World,
-  //Complex
+  // Complex
 };
 
 template <class... Args>
@@ -29,8 +29,9 @@ std::shared_ptr<TranslatorInterface> CreateTranslator(TranslatorType type, Args
   {
   case TranslatorType::Coastline: return create<TranslatorCoastline>(std::forward<Args>(args)...);
   case TranslatorType::Country: return create<TranslatorCountry>(std::forward<Args>(args)...);
-  case TranslatorType::World: return create<TranslatorWorld>(std::forward<Args>(args)...);
-  //case TranslatorType::Complex: return create<TranslatorComplex>(std::forward<Args>(args)...);
+  case TranslatorType::World:
+    return create<TranslatorWorld>(std::forward<Args>(args)...);
+    // case TranslatorType::Complex: return create<TranslatorComplex>(std::forward<Args>(args)...);
   }
   UNREACHABLE();
 }
diff --git a/generator/translator_interface.hpp b/generator/translator_interface.hpp
index d958b4a93..1899239f5 100644
--- a/generator/translator_interface.hpp
+++ b/generator/translator_interface.hpp
@@ -38,8 +38,8 @@ public:
 };
 }  // namespace generator
 
-#define IMPLEMENT_TRANSLATOR_IFACE(className)               \
-  void Merge(TranslatorInterface const & ti) override       \
-  {                                                         \
-    dynamic_cast<className const &>(ti).MergeInto(*this);   \
+#define IMPLEMENT_TRANSLATOR_IFACE(className)             \
+  void Merge(TranslatorInterface const & ti) override     \
+  {                                                       \
+    dynamic_cast<className const &>(ti).MergeInto(*this); \
   }
diff --git a/generator/translator_world.cpp b/generator/translator_world.cpp
index 5c6196c60..2c466f8f6 100644
--- a/generator/translator_world.cpp
+++ b/generator/translator_world.cpp
@@ -7,7 +7,7 @@
 #include "generator/filter_roads.hpp"
 #include "generator/generate_info.hpp"
 #include "generator/intermediate_data.hpp"
-//#include "generator/node_mixer.hpp"
+// #include "generator/node_mixer.hpp"
 
 #include "platform/platform.hpp"
 
@@ -26,21 +26,20 @@ TranslatorWorld::TranslatorWorld(std::shared_ptr<FeatureProcessorInterface> cons
   : Translator(processor, cache, std::make_shared<FeatureMaker>(cache->GetCache()))
   , m_tagAdmixer(std::make_shared<TagAdmixer>(info.GetIntermediateFileName("ways", ".csv"),
                                               info.GetIntermediateFileName(TOWNS_FILE)))
-  , m_tagReplacer(std::make_shared<TagReplacer>(
-        base::JoinPath(GetPlatform().ResourcesDir(), REPLACED_TAGS_FILE)))
+  , m_tagReplacer(std::make_shared<TagReplacer>(base::JoinPath(GetPlatform().ResourcesDir(), REPLACED_TAGS_FILE)))
 {
   /// @todo This option is not used, but may be useful in future?
-//  if (needMixTags)
-//  {
-//    m_osmTagMixer = std::make_shared<OsmTagMixer>(
-//        base::JoinPath(GetPlatform().ResourcesDir(), MIXED_TAGS_FILE));
-//  }
+  //  if (needMixTags)
+  //  {
+  //    m_osmTagMixer = std::make_shared<OsmTagMixer>(
+  //        base::JoinPath(GetPlatform().ResourcesDir(), MIXED_TAGS_FILE));
+  //  }
 
   auto filters = std::make_shared<FilterCollection>();
   filters->Append(std::make_shared<FilterPlanet>());
   filters->Append(std::make_shared<FilterRoads>());
-  filters->Append(std::make_shared<FilterElements>(base::JoinPath(GetPlatform().ResourcesDir(),
-      SKIPPED_ELEMENTS_FILE)));
+  filters->Append(
+      std::make_shared<FilterElements>(base::JoinPath(GetPlatform().ResourcesDir(), SKIPPED_ELEMENTS_FILE)));
   SetFilter(filters);
 }
 
@@ -62,5 +61,8 @@ void TranslatorWorld::Preprocess(OsmElement & element)
     m_osmTagMixer->Process(element);
 }
 
-void TranslatorWorld::MergeInto(TranslatorWorld & other) const { MergeIntoBase(other); }
+void TranslatorWorld::MergeInto(TranslatorWorld & other) const
+{
+  MergeIntoBase(other);
+}
 }  // namespace generator
diff --git a/generator/translator_world.hpp b/generator/translator_world.hpp
index 337bbd042..7036d006e 100644
--- a/generator/translator_world.hpp
+++ b/generator/translator_world.hpp
@@ -23,8 +23,7 @@ class TranslatorWorld : public Translator
 {
 public:
   explicit TranslatorWorld(std::shared_ptr<FeatureProcessorInterface> const & processor,
-                           std::shared_ptr<cache::IntermediateData> const & cache,
-                           feature::GenerateInfo const & info);
+                           std::shared_ptr<cache::IntermediateData> const & cache, feature::GenerateInfo const & info);
 
   // TranslatorInterface overrides:
   void Preprocess(OsmElement & element) override;
diff --git a/generator/translators_pool.cpp b/generator/translators_pool.cpp
index 92015dcd5..b5388dfb6 100644
--- a/generator/translators_pool.cpp
+++ b/generator/translators_pool.cpp
@@ -4,8 +4,7 @@
 
 namespace generator
 {
-TranslatorsPool::TranslatorsPool(std::shared_ptr<TranslatorInterface> const & original,
-                                 size_t threadCount)
+TranslatorsPool::TranslatorsPool(std::shared_ptr<TranslatorInterface> const & original, size_t threadCount)
   : m_threadPool(threadCount)
 {
   CHECK_GREATER_OR_EQUAL(threadCount, 1, ());
@@ -62,7 +61,8 @@ bool TranslatorsPool::Finish()
     state->left = std::move(left);
     state->right = std::move(right);
 
-    queue.Push(pool.Submit([state = std::move(state)]() mutable {
+    queue.Push(pool.Submit([state = std::move(state)]() mutable
+    {
       auto leftTranslator = state->left.get();
       auto rigthTranslator = state->right.get();
       rigthTranslator->Finish();
diff --git a/generator/translators_pool.hpp b/generator/translators_pool.hpp
index 2353cc072..363cd980e 100644
--- a/generator/translators_pool.hpp
+++ b/generator/translators_pool.hpp
@@ -15,8 +15,7 @@ namespace generator
 class TranslatorsPool
 {
 public:
-  explicit TranslatorsPool(std::shared_ptr<TranslatorInterface> const & original,
-                           size_t threadCount);
+  explicit TranslatorsPool(std::shared_ptr<TranslatorInterface> const & original, size_t threadCount);
 
   void Emit(std::vector<OsmElement> && elements);
   bool Finish();
diff --git a/generator/unpack_mwm.cpp b/generator/unpack_mwm.cpp
index a04444720..ba5930ce5 100644
--- a/generator/unpack_mwm.cpp
+++ b/generator/unpack_mwm.cpp
@@ -1,7 +1,7 @@
 #include "generator/unpack_mwm.hpp"
 
-#include "coding/files_container.hpp"
 #include "coding/file_writer.hpp"
+#include "coding/files_container.hpp"
 #include "coding/read_write_utils.hpp"
 
 #include "base/logging.hpp"
diff --git a/generator/unpack_mwm.hpp b/generator/unpack_mwm.hpp
index 278943521..8a0069361 100644
--- a/generator/unpack_mwm.hpp
+++ b/generator/unpack_mwm.hpp
@@ -4,7 +4,6 @@
 
 #include <string>
 
-
 namespace generator
 {
 // Unpack each section of mwm into a separate file with name filePath.sectionName
diff --git a/generator/utils.cpp b/generator/utils.cpp
index 26d7f5ccf..b4e0da376 100644
--- a/generator/utils.cpp
+++ b/generator/utils.cpp
@@ -91,26 +91,23 @@ SingleMwmDataSource::SingleMwmDataSource(std::string const & mwmPath)
 FeatureGetter::FeatureGetter(std::string const & countryFullPath)
   : m_mwm(countryFullPath)
   , m_guard(std::make_unique<FeaturesLoaderGuard>(m_mwm.GetDataSource(), m_mwm.GetMwmId()))
-{
-}
+{}
 
 std::unique_ptr<FeatureType> FeatureGetter::GetFeatureByIndex(uint32_t index) const
 {
   return m_guard->GetFeatureByIndex(index);
 }
 
-bool ParseFeatureIdToOsmIdMapping(std::string const & path,
-                                  std::unordered_map<uint32_t, base::GeoObjectId> & mapping)
+bool ParseFeatureIdToOsmIdMapping(std::string const & path, std::unordered_map<uint32_t, base::GeoObjectId> & mapping)
 {
-  return ForEachOsmId2FeatureId(
-      path, [&](auto const & compositeId, auto featureId) {
-        CHECK(mapping.emplace(featureId, compositeId.m_mainId).second,
-              ("Several osm ids for feature", featureId, "in file", path));
-      });
+  return ForEachOsmId2FeatureId(path, [&](auto const & compositeId, auto featureId)
+  {
+    CHECK(mapping.emplace(featureId, compositeId.m_mainId).second,
+          ("Several osm ids for feature", featureId, "in file", path));
+  });
 }
 
-bool ParseFeatureIdToTestIdMapping(std::string const & path,
-                                   std::unordered_map<uint32_t, uint64_t> & mapping)
+bool ParseFeatureIdToTestIdMapping(std::string const & path, std::unordered_map<uint32_t, uint64_t> & mapping)
 {
   bool success = true;
   feature::ForEachFeature(path, [&](FeatureType & feature, uint32_t fid)
@@ -142,24 +139,18 @@ search::CBV GetLocalities(std::string const & dataPath)
 bool MapcssRule::Matches(std::vector<OsmElement::Tag> const & tags) const
 {
   for (auto const & tag : m_tags)
-  {
     if (!base::AnyOf(tags, [&](auto const & t) { return t == tag; }))
       return false;
-  }
 
   /// @todo Should we also take into account "none", "false" here?
 
   for (auto const & key : m_mandatoryKeys)
-  {
     if (!base::AnyOf(tags, [&](auto const & t) { return t.m_key == key && t.m_value != "no"; }))
       return false;
-  }
 
   for (auto const & key : m_forbiddenKeys)
-  {
     if (!base::AllOf(tags, [&](auto const & t) { return t.m_key != key || t.m_value == "no"; }))
       return false;
-  }
 
   return true;
 }
@@ -182,8 +173,7 @@ MapcssRules ParseMapCSS(std::unique_ptr<Reader> reader)
     rules.emplace_back(std::move(typeTokens), std::move(rule));
   };
 
-  auto const processFull = [&rules](std::string const & typeString,
-                                    std::string const & selectorsString)
+  auto const processFull = [&rules](std::string const & typeString, std::string const & selectorsString)
   {
     ASSERT(!typeString.empty(), ());
     ASSERT(!selectorsString.empty(), ());
diff --git a/generator/utils.hpp b/generator/utils.hpp
index 5923bca81..e558f1b49 100644
--- a/generator/utils.hpp
+++ b/generator/utils.hpp
@@ -83,16 +83,12 @@ bool ForEachOsmId2FeatureId(std::string const & path, ToDo && toDo)
     return false;
   }
 
-  mapping.ForEach([&](auto const & p) {
-    toDo(p.first /* osm id */, p.second /* feature id */);
-  });
+  mapping.ForEach([&](auto const & p) { toDo(p.first /* osm id */, p.second /* feature id */); });
   return true;
 }
 
-bool ParseFeatureIdToOsmIdMapping(std::string const & path,
-                                  std::unordered_map<uint32_t, base::GeoObjectId> & mapping);
-bool ParseFeatureIdToTestIdMapping(std::string const & path,
-                                   std::unordered_map<uint32_t, uint64_t> & mapping);
+bool ParseFeatureIdToOsmIdMapping(std::string const & path, std::unordered_map<uint32_t, base::GeoObjectId> & mapping);
+bool ParseFeatureIdToTestIdMapping(std::string const & path, std::unordered_map<uint32_t, uint64_t> & mapping);
 
 search::CBV GetLocalities(std::string const & dataPath);
 
diff --git a/generator/water_boundary_checker.hpp b/generator/water_boundary_checker.hpp
index 5653f1edc..f16a852e2 100644
--- a/generator/water_boundary_checker.hpp
+++ b/generator/water_boundary_checker.hpp
@@ -6,7 +6,6 @@
 #include "geometry/region2d.hpp"
 #include "geometry/tree4d.hpp"
 
-
 class WaterBoundaryChecker
 {
   struct RegionTraits
diff --git a/generator/way_nodes_mapper.hpp b/generator/way_nodes_mapper.hpp
index 16f479048..4a3b35563 100644
--- a/generator/way_nodes_mapper.hpp
+++ b/generator/way_nodes_mapper.hpp
@@ -13,8 +13,8 @@
 #include <array>
 #include <cstdint>
 #include <functional>
-#include <vector>
 #include <unordered_map>
+#include <vector>
 
 namespace generator
 {
@@ -32,7 +32,8 @@ public:
   }
 
   using IDRInterfacePtr = std::shared_ptr<cache::IntermediateDataReaderInterface>;
-  template <class FnT> void ForEachWayWithIndex(FnT && fn, IDRInterfacePtr const & cache) const
+  template <class FnT>
+  void ForEachWayWithIndex(FnT && fn, IDRInterfacePtr const & cache) const
   {
     for (size_t i = 0; i < m_ways.size(); ++i)
     {
@@ -47,12 +48,10 @@ public:
     }
   }
 
-  template <class FnT> void ForEachWay(FnT && fn, IDRInterfacePtr const & cache) const
+  template <class FnT>
+  void ForEachWay(FnT && fn, IDRInterfacePtr const & cache) const
   {
-    ForEachWayWithIndex([&fn](uint64_t id, std::vector<uint64_t> const & nodes, size_t)
-    {
-      fn(id, nodes);
-    }, cache);
+    ForEachWayWithIndex([&fn](uint64_t id, std::vector<uint64_t> const & nodes, size_t) { fn(id, nodes); }, cache);
   }
 
   void MergeInto(WaysIDHolder & holder) const
@@ -61,7 +60,8 @@ public:
   }
 };
 
-template <class T> class WayNodesMapper
+template <class T>
+class WayNodesMapper
 {
 public:
   struct Entry
@@ -69,7 +69,8 @@ public:
     m2::PointU m_coord;
     T m_t;
 
-    template <class Sink> void Write(Sink & sink, uint64_t wayID, uint32_t nodeIdx) const
+    template <class Sink>
+    void Write(Sink & sink, uint64_t wayID, uint32_t nodeIdx) const
     {
       WriteToSink(sink, wayID);
       WriteToSink(sink, nodeIdx);
@@ -78,7 +79,8 @@ public:
       Save(sink, m_t);
     }
 
-    template <class Source> void Read(Source & src, uint64_t & wayID, uint32_t & nodeIdx)
+    template <class Source>
+    void Read(Source & src, uint64_t & wayID, uint32_t & nodeIdx)
     {
       wayID = ReadPrimitiveFromSource<uint64_t>(src);
       nodeIdx = ReadPrimitiveFromSource<uint32_t>(src);
@@ -103,10 +105,7 @@ public:
     CHECK(m_nodes.emplace(id, Entry{EncodePoint(ll), std::move(t)}).second, ());
   }
 
-  void MergeInto(WayNodesMapper & mapper) const
-  {
-    mapper.m_nodes.insert(m_nodes.begin(), m_nodes.end());
-  }
+  void MergeInto(WayNodesMapper & mapper) const { mapper.m_nodes.insert(m_nodes.begin(), m_nodes.end()); }
 
   Entry const * Find(uint64_t id) const
   {
@@ -116,7 +115,8 @@ public:
     return nullptr;
   }
 
-  template <class Source, class FnT> static void Deserialize(Source & src, FnT && fn)
+  template <class Source, class FnT>
+  static void Deserialize(Source & src, FnT && fn)
   {
     size_t count = ReadPrimitiveFromSource<uint64_t>(src);
     while (count-- > 0)
@@ -130,15 +130,13 @@ public:
   }
 };
 
-template <class T> class WaysMapper
+template <class T>
+class WaysMapper
 {
   std::unordered_map<uint64_t, T> m_ways;
 
 public:
-  void Add(uint64_t id, T t)
-  {
-    CHECK(m_ways.emplace(id, std::move(t)).second, ());
-  }
+  void Add(uint64_t id, T t) { CHECK(m_ways.emplace(id, std::move(t)).second, ()); }
 
   T * FindOrInsert(uint64_t id)
   {
@@ -146,12 +144,10 @@ public:
     return &(it->second);
   }
 
-  void MergeInto(WaysMapper & mapper) const
-  {
-    mapper.m_ways.insert(m_ways.begin(), m_ways.end());
-  }
+  void MergeInto(WaysMapper & mapper) const { mapper.m_ways.insert(m_ways.begin(), m_ways.end()); }
 
-  template <class Sink> void Serialize(Sink & sink) const
+  template <class Sink>
+  void Serialize(Sink & sink) const
   {
     WriteToSink(sink, uint64_t(m_ways.size()));
     for (auto const & e : m_ways)
@@ -161,7 +157,8 @@ public:
     }
   }
 
-  template <class Source, class FnT> static void Deserialize(Source & src, FnT && fn)
+  template <class Source, class FnT>
+  static void Deserialize(Source & src, FnT && fn)
   {
     size_t count = ReadPrimitiveFromSource<uint64_t>(src);
     while (count-- > 0)
@@ -174,18 +171,21 @@ public:
   }
 };
 
-template <typename SizeT> class SizeWriter
+template <typename SizeT>
+class SizeWriter
 {
   SizeT m_sizePos;
 
 public:
-  template <class Sink> void Reserve(Sink & sink)
+  template <class Sink>
+  void Reserve(Sink & sink)
   {
     m_sizePos = sink.Pos();
     WriteToSink(sink, SizeT(0));
   }
 
-  template <class Sink> void Write(Sink & sink, SizeT sz)
+  template <class Sink>
+  void Write(Sink & sink, SizeT sz)
   {
     auto const savedPos = sink.Pos();
     sink.Seek(m_sizePos);
@@ -194,4 +194,4 @@ public:
   }
 };
 
-} // namespace generator
+}  // namespace generator
diff --git a/generator/ways_merger.cpp b/generator/ways_merger.cpp
index 9e10c5050..f0b8f477e 100644
--- a/generator/ways_merger.cpp
+++ b/generator/ways_merger.cpp
@@ -2,10 +2,7 @@
 
 namespace generator
 {
-AreaWayMerger::AreaWayMerger(std::shared_ptr<cache::IntermediateDataReaderInterface> const & cache)
-  : m_cache(cache)
-{
-}
+AreaWayMerger::AreaWayMerger(std::shared_ptr<cache::IntermediateDataReaderInterface> const & cache) : m_cache(cache) {}
 
 void AreaWayMerger::AddWay(uint64_t id)
 {
diff --git a/generator/ways_merger.hpp b/generator/ways_merger.hpp
index 0c34caf5e..c8d01a800 100644
--- a/generator/ways_merger.hpp
+++ b/generator/ways_merger.hpp
@@ -57,16 +57,15 @@ public:
         // finally erase element 'e' and find next way in chain
         i = r.second;
         while (r.first != r.second)
-        {
           if (r.first->second == e)
             m_map.erase(r.first++);
           else
             i = r.first++;
-        }
 
         if (i == r.second)
           break;
-      } while (true);
+      }
+      while (true);
 
       if (points.size() > 2 && points.front() == points.back())
         toDo(std::move(points), std::move(ids));
diff --git a/generator/wiki_url_dumper.cpp b/generator/wiki_url_dumper.cpp
index b55bd4ba2..58b320115 100644
--- a/generator/wiki_url_dumper.cpp
+++ b/generator/wiki_url_dumper.cpp
@@ -19,7 +19,9 @@ using namespace feature;
 namespace generator
 {
 WikiUrlDumper::WikiUrlDumper(std::string const & path, std::vector<std::string> const & dataFiles)
-  : m_path(path), m_dataFiles(dataFiles) {}
+  : m_path(path)
+  , m_dataFiles(dataFiles)
+{}
 
 void WikiUrlDumper::Dump(size_t cpuCount) const
 {
@@ -29,7 +31,8 @@ void WikiUrlDumper::Dump(size_t cpuCount) const
   std::vector<std::future<std::string>> futures;
   futures.reserve(m_dataFiles.size());
 
-  auto const fn = [](std::string const & filename) {
+  auto const fn = [](std::string const & filename)
+  {
     std::stringstream stringStream;
     DumpOne(filename, stringStream);
     return stringStream.str();
@@ -55,21 +58,23 @@ void WikiUrlDumper::Dump(size_t cpuCount) const
 // static
 void WikiUrlDumper::DumpOne(std::string const & path, std::ostream & stream)
 {
-  //auto const & needWikiUrl = ftypes::AttractionsChecker::Instance();
-  feature::ForEachFeatureRawFormat(path, [&](FeatureBuilder const & feature, uint64_t /* pos */) {
-//    if (!needWikiUrl(feature.GetTypesHolder()))
-//      return;
+  // auto const & needWikiUrl = ftypes::AttractionsChecker::Instance();
+  feature::ForEachFeatureRawFormat(path, [&](FeatureBuilder const & feature, uint64_t /* pos */)
+  {
+    //    if (!needWikiUrl(feature.GetTypesHolder()))
+    //      return;
 
     auto const wikiUrl = feature.GetMetadata().GetWikiURL();
     if (wikiUrl.empty())
       return;
 
-    stream << path << "\t" << feature.GetMostGenericOsmId() << "\t" <<  wikiUrl << "\n";
+    stream << path << "\t" << feature.GetMostGenericOsmId() << "\t" << wikiUrl << "\n";
   });
 }
 
 WikiDataFilter::WikiDataFilter(std::string const & path, std::vector<std::string> const & dataFiles)
-  :  m_path(path), m_dataFiles(dataFiles)
+  : m_path(path)
+  , m_dataFiles(dataFiles)
 {
   std::ifstream stream(m_path);
   if (!stream)
@@ -89,10 +94,11 @@ WikiDataFilter::WikiDataFilter(std::string const & path, std::vector<std::string
 void WikiDataFilter::FilterOne(std::string const & path, std::map<base::GeoObjectId, std::string> const & idToWikiData,
                                std::ostream & stream)
 {
-  //auto const & needWikiUrl = ftypes::AttractionsChecker::Instance();
-  feature::ForEachFeatureRawFormat(path, [&](FeatureBuilder const & feature, uint64_t /* pos */) {
-//    if (!needWikiUrl(feature.GetTypesHolder()))
-//      return;
+  // auto const & needWikiUrl = ftypes::AttractionsChecker::Instance();
+  feature::ForEachFeatureRawFormat(path, [&](FeatureBuilder const & feature, uint64_t /* pos */)
+  {
+    //    if (!needWikiUrl(feature.GetTypesHolder()))
+    //      return;
 
     auto const it = idToWikiData.find(feature.GetMostGenericOsmId());
     if (it == std::end(idToWikiData))
@@ -110,7 +116,8 @@ void WikiDataFilter::Filter(size_t cpuCount)
   std::vector<std::future<std::string>> futures;
   futures.reserve(m_dataFiles.size());
 
-  auto const fn = [&](std::string const & filename) {
+  auto const fn = [&](std::string const & filename)
+  {
     std::stringstream stringStream;
     FilterOne(filename, m_idToWikiData, stringStream);
     return stringStream.str();
diff --git a/generator/world_map_generator.hpp b/generator/world_map_generator.hpp
index 91e6897ba..37d85285a 100644
--- a/generator/world_map_generator.hpp
+++ b/generator/world_map_generator.hpp
@@ -33,8 +33,7 @@ class WorldMapGenerator
     std::map<uint32_t, size_t> m_mapTypes;
 
   public:
-    explicit EmitterImpl(std::string const & worldFilename)
-      : m_output(worldFilename)
+    explicit EmitterImpl(std::string const & worldFilename) : m_output(worldFilename)
     {
       LOG_SHORT(LINFO, ("Output World file:", worldFilename));
     }
@@ -46,16 +45,16 @@ class WorldMapGenerator
       std::stringstream ss;
       ss << std::endl;
       for (auto const & p : m_mapTypes)
-        ss << c.GetReadableObjectName(p.first) << " : " <<  p.second << std::endl;
+        ss << c.GetReadableObjectName(p.first) << " : " << p.second << std::endl;
       LOG_SHORT(LINFO, ("World types:", ss.str()));
     }
 
     // This functor is called by m_merger after merging linear features.
     void operator()(feature::FeatureBuilder const & fb) override
     {
-      static const uint32_t ferryType = classif().GetTypeByPath({"route", "ferry"});
-      static const uint32_t boundaryType = classif().GetTypeByPath({"boundary", "administrative"});
-      static const uint32_t highwayType = classif().GetTypeByPath({"highway"});
+      static uint32_t const ferryType = classif().GetTypeByPath({"route", "ferry"});
+      static uint32_t const boundaryType = classif().GetTypeByPath({"boundary", "administrative"});
+      static uint32_t const highwayType = classif().GetTypeByPath({"highway"});
 
       int thresholdLevel = scales::GetUpperWorldScale();
       if (fb.HasType(ferryType) || fb.HasType(boundaryType, 2))
@@ -83,10 +82,7 @@ class WorldMapGenerator
         ++m_mapTypes[type];
     }
 
-    bool NeedPushToWorld(feature::FeatureBuilder const & fb) const
-    {
-      return generator::FilterWorld::IsGoodScale(fb);
-    }
+    bool NeedPushToWorld(feature::FeatureBuilder const & fb) const { return generator::FilterWorld::IsGoodScale(fb); }
 
     void PushSure(feature::FeatureBuilder const & fb)
     {
@@ -112,17 +108,15 @@ public:
   {
     // Do not strip last types for given tags,
     // for example, do not cut 'admin_level' in  'boundary-administrative-XXX'.
-    char const * arr1[][3] = {{"boundary", "administrative", "2"},
-                              {"boundary", "administrative", "3"},
-                              {"boundary", "administrative", "4"}};
+    char const * arr1[][3] = {
+        {"boundary", "administrative", "2"}, {"boundary", "administrative", "3"}, {"boundary", "administrative", "4"}};
 
     for (size_t i = 0; i < ARRAY_SIZE(arr1); ++i)
       m_typesCorrector.SetDontNormalizeType(arr1[i]);
 
     // Merge motorways into trunks.
     // TODO : merge e.g. highway-trunk_link into highway-trunk?
-    char const * marr1[2] = {"highway", "motorway"},
-               * marr2[2] = {"highway", "trunk"};
+    char const *marr1[2] = {"highway", "motorway"}, *marr2[2] = {"highway", "trunk"};
     m_typesCorrector.SetMappingTypes(marr1, marr2);
 
     if (popularPlacesFilename.empty())
@@ -186,8 +180,7 @@ public:
       if (GetPolygonArea(geometry.begin(), geometry.end()) < 0.0025)
         return false;
     }
-    default:
-      break;
+    default: break;
     }
 
     if (feature::PreprocessForWorldMap(fb))
diff --git a/generator/world_roads_builder/world_roads_builder.cpp b/generator/world_roads_builder/world_roads_builder.cpp
index 2b567b38e..7b24327a8 100644
--- a/generator/world_roads_builder/world_roads_builder.cpp
+++ b/generator/world_roads_builder/world_roads_builder.cpp
@@ -16,8 +16,7 @@ double constexpr kMinSegmentLengthM = 200.0;
 double constexpr kHalfSegmentLengthM = kMinSegmentLengthM / 2.0;
 
 // Returns true if roads count between |mwmId1| and |mwmId2| in |graph| exceeds max value.
-bool MwmRoadsAreFilled(routing::NumMwmId const & mwmId1, routing::NumMwmId const & mwmId2,
-                       CrossBorderGraph & graph)
+bool MwmRoadsAreFilled(routing::NumMwmId const & mwmId1, routing::NumMwmId const & mwmId2, CrossBorderGraph & graph)
 {
   auto const it = graph.m_mwms.find(mwmId1);
   if (it == graph.m_mwms.end())
@@ -44,8 +43,7 @@ void WriteEndingToSteam(CrossBorderSegmentEnding const & segEnding, std::ofstrea
   output << kDelim << point.m_lat << kDelim << point.m_lon << kDelim << segEnding.m_numMwmId;
 }
 
-void WriteSegmentToStream(RegionSegmentId const & segId, CrossBorderSegment const & seg,
-                          std::ofstream & output)
+void WriteSegmentToStream(RegionSegmentId const & segId, CrossBorderSegment const & seg, std::ofstream & output)
 {
   CHECK(output.is_open(), ());
 
@@ -58,8 +56,7 @@ void WriteSegmentToStream(RegionSegmentId const & segId, CrossBorderSegment cons
 
 namespace routing
 {
-RoadsFromOsm GetRoadsFromOsm(generator::SourceReader & reader,
-                             feature::CountriesFilesAffiliation const & mwmMatcher,
+RoadsFromOsm GetRoadsFromOsm(generator::SourceReader & reader, feature::CountriesFilesAffiliation const & mwmMatcher,
                              std::vector<std::string> const & highways)
 {
   RoadsFromOsm roadsFromOsm;
@@ -173,8 +170,7 @@ std::pair<NodePoints, CrossBorderIndexes> GetCrossBorderPoints(
   return std::make_pair(nodePoints, crossBorderIndexes);
 }
 
-std::optional<std::pair<m2::PointD, double>> GetPointInMwm(NodePoints const & points, size_t index,
-                                                           bool forward)
+std::optional<std::pair<m2::PointD, double>> GetPointInMwm(NodePoints const & points, size_t index, bool forward)
 {
   auto const & pointOnBorder = points[index];
 
@@ -206,13 +202,11 @@ std::optional<std::pair<m2::PointD, double>> GetPointInMwm(NodePoints const & po
 }
 
 bool FillCrossBorderGraph(CrossBorderGraph & graph, RegionSegmentId & curSegmentId,
-                          std::vector<uint64_t> const & nodeIds,
-                          std::unordered_map<uint64_t, ms::LatLon> const & nodes,
+                          std::vector<uint64_t> const & nodeIds, std::unordered_map<uint64_t, ms::LatLon> const & nodes,
                           feature::CountriesFilesAffiliation const & mwmMatcher,
                           std::unordered_map<std::string, NumMwmId> const & regionToIdMap)
 {
-  auto const & [nodePoints, crossBorderIndexes] =
-      GetCrossBorderPoints(nodeIds, nodes, mwmMatcher, regionToIdMap);
+  auto const & [nodePoints, crossBorderIndexes] = GetCrossBorderPoints(nodeIds, nodes, mwmMatcher, regionToIdMap);
 
   bool insertedRoad = false;
 
diff --git a/generator/world_roads_builder/world_roads_builder.hpp b/generator/world_roads_builder/world_roads_builder.hpp
index 434f4da53..49a734d82 100644
--- a/generator/world_roads_builder/world_roads_builder.hpp
+++ b/generator/world_roads_builder/world_roads_builder.hpp
@@ -27,10 +27,7 @@ struct RoadData
 {
   RoadData() = default;
 
-  RoadData(std::set<std::string> regions, OsmElement && way)
-    : m_regions(std::move(regions)), m_way(std::move(way))
-  {
-  }
+  RoadData(std::set<std::string> regions, OsmElement && way) : m_regions(std::move(regions)), m_way(std::move(way)) {}
 
   std::set<std::string> m_regions;
   OsmElement m_way;
@@ -47,15 +44,13 @@ struct RoadsFromOsm
 };
 
 // Reads roads from |reader| and finds its mwms with |mwmMatcher|.
-RoadsFromOsm GetRoadsFromOsm(generator::SourceReader & reader,
-                             feature::CountriesFilesAffiliation const & mwmMatcher,
+RoadsFromOsm GetRoadsFromOsm(generator::SourceReader & reader, feature::CountriesFilesAffiliation const & mwmMatcher,
                              std::vector<std::string> const & highways);
 
 // Fills |graph| with new segments starting from |curSegmentId|. Segments are calculated from the
 // road consisting of |nodeIds| from OSM.
 bool FillCrossBorderGraph(CrossBorderGraph & graph, RegionSegmentId & curSegmentId,
-                          std::vector<uint64_t> const & nodeIds,
-                          std::unordered_map<uint64_t, ms::LatLon> const & nodes,
+                          std::vector<uint64_t> const & nodeIds, std::unordered_map<uint64_t, ms::LatLon> const & nodes,
                           feature::CountriesFilesAffiliation const & mwmMatcher,
                           std::unordered_map<std::string, routing::NumMwmId> const & regionToIdMap);
 
@@ -63,6 +58,5 @@ bool FillCrossBorderGraph(CrossBorderGraph & graph, RegionSegmentId & curSegment
 bool WriteGraphToFile(CrossBorderGraph const & graph, std::string const & path, bool overwrite);
 
 // Logs statistics about segments in |graph|.
-void ShowRegionsStats(CrossBorderGraph const & graph,
-                      std::shared_ptr<routing::NumMwmIds> numMwmIds);
+void ShowRegionsStats(CrossBorderGraph const & graph, std::shared_ptr<routing::NumMwmIds> numMwmIds);
 }  // namespace routing
diff --git a/generator/world_roads_builder/world_roads_builder_tool/world_roads_builder_tool.cpp b/generator/world_roads_builder/world_roads_builder_tool/world_roads_builder_tool.cpp
index 726c41c03..0040fb387 100644
--- a/generator/world_roads_builder/world_roads_builder_tool/world_roads_builder_tool.cpp
+++ b/generator/world_roads_builder/world_roads_builder_tool/world_roads_builder_tool.cpp
@@ -22,7 +22,6 @@
 
 #include <gflags/gflags.h>
 
-
 DEFINE_string(path_resources, "", "CoMaps resources directory");
 DEFINE_string(path_roads_file, "", "OSM file in o5m format.");
 DEFINE_string(path_res_file, "", "Path to the resulting file with roads for generator_tool.");
@@ -31,13 +30,12 @@ int main(int argc, char ** argv)
 {
   using namespace routing;
 
-  gflags::SetUsageMessage(
-      "Reads OSM file, generates text file with main cross-mwm roads for generator_tool.");
+  gflags::SetUsageMessage("Reads OSM file, generates text file with main cross-mwm roads for generator_tool.");
   gflags::ParseCommandLineFlags(&argc, &argv, true);
   auto const toolName = base::FileNameFromFullPath(argv[0]);
 
-  if (FLAGS_path_resources.empty() || !Platform::IsDirectory(FLAGS_path_resources) ||
-      FLAGS_path_roads_file.empty() || FLAGS_path_res_file.empty())
+  if (FLAGS_path_resources.empty() || !Platform::IsDirectory(FLAGS_path_resources) || FLAGS_path_roads_file.empty() ||
+      FLAGS_path_res_file.empty())
   {
     gflags::ShowUsageWithFlagsRestrict(argv[0], toolName.c_str());
     return EXIT_FAILURE;
@@ -45,12 +43,10 @@ int main(int argc, char ** argv)
 
   GetPlatform().SetResourceDir(FLAGS_path_resources);
 
-  feature::CountriesFilesAffiliation mwmMatcher(GetPlatform().ResourcesDir(),
-                                                false /* haveBordersForWholeWorld */);
+  feature::CountriesFilesAffiliation mwmMatcher(GetPlatform().ResourcesDir(), false /* haveBordersForWholeWorld */);
 
   // These types are used in maps_generator (maps_generator/genrator/steps.py in filter_roads function).
-  std::vector<std::string> const highwayTypes{"motorway", "trunk", "primary", "secondary",
-                                              "tertiary"};
+  std::vector<std::string> const highwayTypes{"motorway", "trunk", "primary", "secondary", "tertiary"};
 
   generator::SourceReader reader(FLAGS_path_roads_file);
   RoadsFromOsm const & roadsFromOsm = GetRoadsFromOsm(reader, mwmMatcher, highwayTypes);
@@ -60,7 +56,8 @@ int main(int argc, char ** argv)
 
   std::unordered_map<std::string, NumMwmId> regionsToIds;
 
-  numMwmIds->ForEachId([&regionsToIds, &numMwmIds](NumMwmId id) {
+  numMwmIds->ForEachId([&regionsToIds, &numMwmIds](NumMwmId id)
+  {
     std::string const & region = numMwmIds->GetFile(id).GetName();
     CHECK(regionsToIds.emplace(region, id).second, (id, region));
   });
@@ -81,9 +78,8 @@ int main(int argc, char ** argv)
       if (wayData.m_regions.size() == 1)
         continue;
 
-      bool const foundSegments =
-          FillCrossBorderGraph(graph, curSegmentId, wayData.m_way.Nodes(), roadsFromOsm.m_nodes,
-                               mwmMatcher, regionsToIds);
+      bool const foundSegments = FillCrossBorderGraph(graph, curSegmentId, wayData.m_way.Nodes(), roadsFromOsm.m_nodes,
+                                                      mwmMatcher, regionsToIds);
 
       LOG(LINFO, ("Found segments for", wayId, ":", foundSegments));
     }
diff --git a/libs/base/array_adapters.hpp b/libs/base/array_adapters.hpp
index 576b03df3..cb210eccd 100644
--- a/libs/base/array_adapters.hpp
+++ b/libs/base/array_adapters.hpp
@@ -4,44 +4,43 @@
 
 namespace detail
 {
-  template <class T, class TPtr> class array_impl
+template <class T, class TPtr>
+class array_impl
+{
+protected:
+  TPtr m_p;
+  size_t m_size;
+
+public:
+  typedef T value_type;
+  typedef T const & const_reference;
+  typedef T & reference;
+
+  array_impl(TPtr p, size_t sz) : m_p(p), m_size(sz) {}
+
+  T const & operator[](size_t i) const
   {
-  protected:
-    TPtr m_p;
-    size_t m_size;
+    ASSERT_LESS(i, m_size, ());
+    return m_p[i];
+  }
 
-  public:
-    typedef T value_type;
-    typedef T const & const_reference;
-    typedef T & reference;
+  T const & back() const
+  {
+    ASSERT_GREATER(m_size, 0, ());
+    return m_p[m_size - 1];
+  }
 
-    array_impl(TPtr p, size_t sz) : m_p(p), m_size(sz) {}
+  size_t size() const { return m_size; }
 
-    T const & operator[](size_t i) const
-    {
-      ASSERT_LESS ( i, m_size, () );
-      return m_p[i]; 
-    }
+  bool empty() const { return (m_size == 0); }
+};
+}  // namespace detail
 
-    T const & back() const
-    {
-      ASSERT_GREATER ( m_size, 0, () );
-      return m_p[m_size-1];
-    }
-
-    size_t size() const { return m_size; }
-
-    bool empty() const { return (m_size == 0); }
-  };
-}
-
-template <class T> class array_read : public detail::array_impl<T, T const *>
+template <class T>
+class array_read : public detail::array_impl<T, T const *>
 {
 public:
-  array_read(T const * p, size_t sz)
-    : detail::array_impl<T, T const *>(p, sz)
-  {
-  }
+  array_read(T const * p, size_t sz) : detail::array_impl<T, T const *>(p, sz) {}
 };
 
 template <class TCont>
@@ -50,21 +49,23 @@ array_read<typename TCont::value_type> make_read_adapter(TCont const & cont)
   return array_read<typename TCont::value_type>(cont.empty() ? 0 : &cont[0], cont.size());
 }
 
-template <class T> class array_write : public detail::array_impl<T, T *>
+template <class T>
+class array_write : public detail::array_impl<T, T *>
 {
   size_t m_capacity;
 
   typedef detail::array_impl<T, T *> base_t;
 
 public:
-  template <class TCont> explicit array_write(TCont & cont)
-    : detail::array_impl<T, T *>(cont.empty() ? 0 : &cont[0], 0), m_capacity(cont.size())
-  {
-  }
+  template <class TCont>
+  explicit array_write(TCont & cont)
+    : detail::array_impl<T, T *>(cont.empty() ? 0 : &cont[0], 0)
+    , m_capacity(cont.size())
+  {}
 
   void push_back(T const & t)
   {
-    ASSERT_LESS ( base_t::m_size, m_capacity, () );
+    ASSERT_LESS(base_t::m_size, m_capacity, ());
     base_t::m_p[base_t::m_size++] = t;
   }
 };
diff --git a/libs/base/assert.hpp b/libs/base/assert.hpp
index a072892bf..1e0743574 100644
--- a/libs/base/assert.hpp
+++ b/libs/base/assert.hpp
@@ -32,55 +32,117 @@ AssertFailedFn SetAssertFunction(AssertFailedFn fn);
     ASSERT_CRASH();
 
 // TODO: Evaluate X only once in CHECK().
-#define CHECK(X, msg) do { if (X) {} else { \
-  ASSERT_FAIL(::base::Message("CHECK("#X")", ::base::Message msg));} } while(false)
+#define CHECK(X, msg)                                                     \
+  do                                                                      \
+  {                                                                       \
+    if (X)                                                                \
+    {}                                                                    \
+    else                                                                  \
+    {                                                                     \
+      ASSERT_FAIL(::base::Message("CHECK(" #X ")", ::base::Message msg)); \
+    }                                                                     \
+  }                                                                       \
+  while (false)
 
-#define CHECK_EQUAL(X, Y, msg) do { if ((X) == (Y)) {} else { \
-  ASSERT_FAIL(::base::Message("CHECK("#X" == "#Y")", \
-                              ::base::Message(X, Y), \
-                              ::base::Message msg));} } while (false)
+#define CHECK_EQUAL(X, Y, msg)                                                                             \
+  do                                                                                                       \
+  {                                                                                                        \
+    if ((X) == (Y))                                                                                        \
+    {}                                                                                                     \
+    else                                                                                                   \
+    {                                                                                                      \
+      ASSERT_FAIL(::base::Message("CHECK(" #X " == " #Y ")", ::base::Message(X, Y), ::base::Message msg)); \
+    }                                                                                                      \
+  }                                                                                                        \
+  while (false)
 
-#define CHECK_NOT_EQUAL(X, Y, msg) do { if ((X) != (Y)) {} else { \
-  ASSERT_FAIL(::base::Message("CHECK("#X" != "#Y")", \
-                              ::base::Message(X, Y), \
-                              ::base::Message msg));} } while (false)
+#define CHECK_NOT_EQUAL(X, Y, msg)                                                                         \
+  do                                                                                                       \
+  {                                                                                                        \
+    if ((X) != (Y))                                                                                        \
+    {}                                                                                                     \
+    else                                                                                                   \
+    {                                                                                                      \
+      ASSERT_FAIL(::base::Message("CHECK(" #X " != " #Y ")", ::base::Message(X, Y), ::base::Message msg)); \
+    }                                                                                                      \
+  }                                                                                                        \
+  while (false)
 
-#define CHECK_LESS(X, Y, msg) do { if ((X) < (Y)) {} else { \
-  ASSERT_FAIL(::base::Message("CHECK("#X" < "#Y")", \
-                              ::base::Message(X, Y), \
-                              ::base::Message msg));} } while (false)
+#define CHECK_LESS(X, Y, msg)                                                                             \
+  do                                                                                                      \
+  {                                                                                                       \
+    if ((X) < (Y))                                                                                        \
+    {}                                                                                                    \
+    else                                                                                                  \
+    {                                                                                                     \
+      ASSERT_FAIL(::base::Message("CHECK(" #X " < " #Y ")", ::base::Message(X, Y), ::base::Message msg)); \
+    }                                                                                                     \
+  }                                                                                                       \
+  while (false)
 
-#define CHECK_LESS_OR_EQUAL(X, Y, msg) do { if ((X) <= (Y)) {} else { \
-  ASSERT_FAIL(::base::Message("CHECK("#X" <= "#Y")", \
-                              ::base::Message(X, Y), \
-                              ::base::Message msg));} } while (false)
+#define CHECK_LESS_OR_EQUAL(X, Y, msg)                                                                     \
+  do                                                                                                       \
+  {                                                                                                        \
+    if ((X) <= (Y))                                                                                        \
+    {}                                                                                                     \
+    else                                                                                                   \
+    {                                                                                                      \
+      ASSERT_FAIL(::base::Message("CHECK(" #X " <= " #Y ")", ::base::Message(X, Y), ::base::Message msg)); \
+    }                                                                                                      \
+  }                                                                                                        \
+  while (false)
 
-#define CHECK_GREATER(X, Y, msg) do { if ((X) > (Y)) {} else { \
-  ASSERT_FAIL(::base::Message("CHECK("#X" > "#Y")", \
-                              ::base::Message(X, Y), \
-                              ::base::Message msg));} } while (false)
+#define CHECK_GREATER(X, Y, msg)                                                                          \
+  do                                                                                                      \
+  {                                                                                                       \
+    if ((X) > (Y))                                                                                        \
+    {}                                                                                                    \
+    else                                                                                                  \
+    {                                                                                                     \
+      ASSERT_FAIL(::base::Message("CHECK(" #X " > " #Y ")", ::base::Message(X, Y), ::base::Message msg)); \
+    }                                                                                                     \
+  }                                                                                                       \
+  while (false)
 
-#define CHECK_GREATER_OR_EQUAL(X, Y, msg) do { if ((X) >= (Y)) {} else { \
-  ASSERT_FAIL(::base::Message("CHECK("#X" >= "#Y")", \
-                              ::base::Message(X, Y), \
-                              ::base::Message msg));} } while (false)
+#define CHECK_GREATER_OR_EQUAL(X, Y, msg)                                                                  \
+  do                                                                                                       \
+  {                                                                                                        \
+    if ((X) >= (Y))                                                                                        \
+    {}                                                                                                     \
+    else                                                                                                   \
+    {                                                                                                      \
+      ASSERT_FAIL(::base::Message("CHECK(" #X " >= " #Y ")", ::base::Message(X, Y), ::base::Message msg)); \
+    }                                                                                                      \
+  }                                                                                                        \
+  while (false)
 
-#define CHECK_OR_CALL(fail, call, X, msg) do { if (X) {} else { \
-  if (fail) {\
-    ASSERT_FAIL(::base::Message(::base::Message("CHECK("#X")"), \
-                                ::base::Message msg)); \
-  } else { \
-    call(); \
-  } } } while (false)
+#define CHECK_OR_CALL(fail, call, X, msg)                                                    \
+  do                                                                                         \
+  {                                                                                          \
+    if (X)                                                                                   \
+    {}                                                                                       \
+    else                                                                                     \
+    {                                                                                        \
+      if (fail)                                                                              \
+      {                                                                                      \
+        ASSERT_FAIL(::base::Message(::base::Message("CHECK(" #X ")"), ::base::Message msg)); \
+      }                                                                                      \
+      else                                                                                   \
+      {                                                                                      \
+        call();                                                                              \
+      }                                                                                      \
+    }                                                                                        \
+  }                                                                                          \
+  while (false)
 
 #ifdef DEBUG
-#define ASSERT(X, msg) CHECK(X, msg)
-#define VERIFY(X, msg) CHECK(X, msg)
-#define ASSERT_EQUAL(X, Y, msg) CHECK_EQUAL(X, Y, msg)
-#define ASSERT_NOT_EQUAL(X, Y, msg) CHECK_NOT_EQUAL(X, Y, msg)
-#define ASSERT_LESS(X, Y, msg) CHECK_LESS(X, Y, msg)
-#define ASSERT_LESS_OR_EQUAL(X, Y, msg) CHECK_LESS_OR_EQUAL(X, Y, msg)
-#define ASSERT_GREATER(X, Y, msg) CHECK_GREATER(X, Y, msg)
+#define ASSERT(X, msg)                     CHECK(X, msg)
+#define VERIFY(X, msg)                     CHECK(X, msg)
+#define ASSERT_EQUAL(X, Y, msg)            CHECK_EQUAL(X, Y, msg)
+#define ASSERT_NOT_EQUAL(X, Y, msg)        CHECK_NOT_EQUAL(X, Y, msg)
+#define ASSERT_LESS(X, Y, msg)             CHECK_LESS(X, Y, msg)
+#define ASSERT_LESS_OR_EQUAL(X, Y, msg)    CHECK_LESS_OR_EQUAL(X, Y, msg)
+#define ASSERT_GREATER(X, Y, msg)          CHECK_GREATER(X, Y, msg)
 #define ASSERT_GREATER_OR_EQUAL(X, Y, msg) CHECK_GREATER_OR_EQUAL(X, Y, msg)
 #else
 #define ASSERT(X, msg)
@@ -100,6 +162,7 @@ AssertFailedFn SetAssertFunction(AssertFailedFn fn);
   {                                           \
     CHECK(false, ("Unreachable statement.")); \
     std::abort();                             \
-  } while (false)
+  }                                           \
+  while (false)
 
 // NOLINTEND(misc-static-assert)
diff --git a/libs/base/base.cpp b/libs/base/base.cpp
index c73cfbe13..d9c37fc24 100644
--- a/libs/base/base.cpp
+++ b/libs/base/base.cpp
@@ -13,8 +13,9 @@ bool OnAssertFailedDefault(SrcPoint const & srcPoint, std::string const & msg)
   auto & logger = LogHelper::Instance();
 
   std::cerr << '(' << logger.GetThreadID() << ") ASSERT FAILED" << '\n'
-            << srcPoint.FileName() << ':' << srcPoint.Line() << '\n' << msg
-            << std::endl << std::flush;
+            << srcPoint.FileName() << ':' << srcPoint.Line() << '\n'
+            << msg << std::endl
+            << std::flush;
   return true;
 }
 
diff --git a/libs/base/base.hpp b/libs/base/base.hpp
index e8543cb02..43632fcd9 100644
--- a/libs/base/base.hpp
+++ b/libs/base/base.hpp
@@ -18,17 +18,17 @@ static_assert(MY_DEBUG_DEFINED ^ MY_RELEASE_DEFINED, "Either Debug or Release sh
 
 // #define DEBUG macro, which should be used with #ifdef.
 #if !MY_RELEASE_DEFINED
-  #ifndef DEBUG
-    #define DEBUG 1
-  #endif
+#ifndef DEBUG
+#define DEBUG 1
+#endif
 #endif
 
 #ifdef DEBUG
 // #include "internal/debug_new.hpp"
 // TODO: STL debug mode.
-  #define IF_DEBUG_ELSE(a, b) (a)
+#define IF_DEBUG_ELSE(a, b) (a)
 #else
-  #define IF_DEBUG_ELSE(a, b) (b)
+#define IF_DEBUG_ELSE(a, b) (b)
 #endif
 
 // platform macroses
diff --git a/libs/base/base_tests/assert_test.cpp b/libs/base/base_tests/assert_test.cpp
index 0df32cc5d..afd4b4c57 100644
--- a/libs/base/base_tests/assert_test.cpp
+++ b/libs/base/base_tests/assert_test.cpp
@@ -4,7 +4,6 @@
 #include "base/exception.hpp"
 #include "base/logging.hpp"
 
-
 UNIT_TEST(Assert_Smoke)
 {
   int x = 5;
@@ -12,17 +11,17 @@ UNIT_TEST(Assert_Smoke)
 #ifdef RELEASE
   UNUSED_VALUE(x);
 #endif
-  ASSERT_EQUAL ( x, 5, () );
-  ASSERT_NOT_EQUAL ( x, 6, () );
-  //ASSERT_EQUAL ( x, 666, ("Skip this to continue test") );
+  ASSERT_EQUAL(x, 5, ());
+  ASSERT_NOT_EQUAL(x, 6, ());
+  // ASSERT_EQUAL ( x, 666, ("Skip this to continue test") );
 }
 
 UNIT_TEST(Check_Smoke)
 {
   int x = 5;
-  CHECK_EQUAL ( x, 5, () );
-  CHECK_NOT_EQUAL ( x, 6, () );
-  //CHECK_EQUAL ( x, 666, ("Skip this to continue test") );
+  CHECK_EQUAL(x, 5, ());
+  CHECK_NOT_EQUAL(x, 6, ());
+  // CHECK_EQUAL ( x, 666, ("Skip this to continue test") );
 }
 
 UNIT_TEST(Exception_Formatting)
diff --git a/libs/base/base_tests/beam_tests.cpp b/libs/base/base_tests/beam_tests.cpp
index 0cb4705c3..cd67823f3 100644
--- a/libs/base/base_tests/beam_tests.cpp
+++ b/libs/base/base_tests/beam_tests.cpp
@@ -44,12 +44,10 @@ void Smoke()
 }
 
 template <template <typename, typename> class Beam>
-void Benchmark(string const & beamType, uint64_t const numResets, size_t const capacity,
-               uint64_t const numEvents)
+void Benchmark(string const & beamType, uint64_t const numResets, size_t const capacity, uint64_t const numEvents)
 {
   base::Timer timer;
-  SCOPE_GUARD(timerGuard,
-              [&] { LOG(LINFO, ("type:", beamType, "\ttime passed:", timer.ElapsedSeconds())); });
+  SCOPE_GUARD(timerGuard, [&] { LOG(LINFO, ("type:", beamType, "\ttime passed:", timer.ElapsedSeconds())); });
 
   CHECK_LESS_OR_EQUAL(capacity, numEvents, ());
 
diff --git a/libs/base/base_tests/bits_test.cpp b/libs/base/base_tests/bits_test.cpp
index 380b7897e..831b6c244 100644
--- a/libs/base/base_tests/bits_test.cpp
+++ b/libs/base/base_tests/bits_test.cpp
@@ -33,7 +33,8 @@ UNIT_TEST(BitwiseMerge)
   TEST_EQUAL(bits::BitwiseMerge(1, 3), 11, ());
   TEST_EQUAL(bits::BitwiseMerge(uint32_t{1} << 31, uint32_t{1} << 31), uint64_t{3} << 62, ());
 
-  auto bitwiseMergeSlow = [](uint32_t x, uint32_t y) -> uint64_t {
+  auto bitwiseMergeSlow = [](uint32_t x, uint32_t y) -> uint64_t
+  {
     uint64_t result = 0;
     for (uint32_t i = 0; i < 32; ++i)
     {
@@ -46,34 +47,32 @@ UNIT_TEST(BitwiseMerge)
   };
 
   for (uint32_t x = 0; x < 16; ++x)
-  {
     for (uint32_t y = 0; y < 16; ++y)
       TEST_EQUAL(bits::BitwiseMerge(x, y), bitwiseMergeSlow(x, y), (x, y));
-  }
 }
 
 UNIT_TEST(ZigZagEncode)
 {
-  TEST_EQUAL(bits::ZigZagEncode(0),  0, ());
+  TEST_EQUAL(bits::ZigZagEncode(0), 0, ());
   TEST_EQUAL(bits::ZigZagEncode(-1), 1, ());
-  TEST_EQUAL(bits::ZigZagEncode(1),  2, ());
+  TEST_EQUAL(bits::ZigZagEncode(1), 2, ());
   TEST_EQUAL(bits::ZigZagEncode(-2), 3, ());
-  TEST_EQUAL(bits::ZigZagEncode(2),  4, ());
-  TEST_EQUAL(bits::ZigZagEncode(127),  254, ());
+  TEST_EQUAL(bits::ZigZagEncode(2), 4, ());
+  TEST_EQUAL(bits::ZigZagEncode(127), 254, ());
   TEST_EQUAL(bits::ZigZagEncode(-128), 255, ());
-  TEST_EQUAL(bits::ZigZagEncode(128),  256, ());
+  TEST_EQUAL(bits::ZigZagEncode(128), 256, ());
 }
 
 UNIT_TEST(ZigZagDecode)
 {
   TEST_EQUAL(bits::ZigZagDecode(0U), 0, ());
   TEST_EQUAL(bits::ZigZagDecode(1U), -1, ());
-  TEST_EQUAL(bits::ZigZagDecode(2U),  1, ());
+  TEST_EQUAL(bits::ZigZagDecode(2U), 1, ());
   TEST_EQUAL(bits::ZigZagDecode(3U), -2, ());
-  TEST_EQUAL(bits::ZigZagDecode(4U),  2, ());
-  TEST_EQUAL(bits::ZigZagDecode(254U),  127, ());
+  TEST_EQUAL(bits::ZigZagDecode(4U), 2, ());
+  TEST_EQUAL(bits::ZigZagDecode(254U), 127, ());
   TEST_EQUAL(bits::ZigZagDecode(255U), -128, ());
-  TEST_EQUAL(bits::ZigZagDecode(256U),  128, ());
+  TEST_EQUAL(bits::ZigZagDecode(256U), 128, ());
 }
 
 UNIT_TEST(NumHiZeroBits32)
diff --git a/libs/base/base_tests/buffer_vector_test.cpp b/libs/base/base_tests/buffer_vector_test.cpp
index 0f143fdc6..1d31375f6 100644
--- a/libs/base/base_tests/buffer_vector_test.cpp
+++ b/libs/base/base_tests/buffer_vector_test.cpp
@@ -9,13 +9,13 @@
 
 namespace buffer_vector_test
 {
-  template <class TCont>
-  void CheckVector(TCont & cont, size_t count)
-  {
-    TEST_EQUAL ( cont.size(), count, () );
-    for (size_t i = 0; i < count; ++i)
-      TEST_EQUAL ( cont[i], i, () );
-  }
+template <class TCont>
+void CheckVector(TCont & cont, size_t count)
+{
+  TEST_EQUAL(cont.size(), count, ());
+  for (size_t i = 0; i < count; ++i)
+    TEST_EQUAL(cont[i], i, ());
+}
 
 UNIT_TEST(BufferVector_PushBackAndRealloc)
 {
@@ -54,7 +54,7 @@ UNIT_TEST(BufferVector_Bounds)
   for (size_t i = 0; i < 5; ++i)
   {
     v.push_back(i);
-    CheckVector(v, i+1);
+    CheckVector(v, i + 1);
   }
 
   v.resize(2);
@@ -91,8 +91,8 @@ UNIT_TEST(BufferVector_Swap)
   value_t const * d2 = v2.data();
 
   swap(v1, v2);
-  TEST_EQUAL ( d1, v2.data(), () );
-  TEST_EQUAL ( d2, v1.data(), () );
+  TEST_EQUAL(d1, v2.data(), ());
+  TEST_EQUAL(d2, v1.data(), ());
 
   // check swap in resized data
   {
@@ -102,13 +102,13 @@ UNIT_TEST(BufferVector_Swap)
 
     // resize from 5 to 1 => v[0] will stay at the same place
     v1.resize(1);
-    TEST_EQUAL ( v1[0].size(), 1, () );
-    TEST_EQUAL ( v1[0][0], 666, () );
-    TEST_EQUAL ( dd1, v1[0].data(), () );
+    TEST_EQUAL(v1[0].size(), 1, ());
+    TEST_EQUAL(v1[0][0], 666, ());
+    TEST_EQUAL(dd1, v1[0].data(), ());
 
     v1.resize(7);
-    TEST_EQUAL ( v1[0].size(), 1, () );
-    TEST_EQUAL ( v1[0][0], 666, () );
+    TEST_EQUAL(v1[0].size(), 1, ());
+    TEST_EQUAL(v1[0][0], 666, ());
   }
 
   {
@@ -120,12 +120,12 @@ UNIT_TEST(BufferVector_Swap)
     auto const * dd2 = v2[0].data();
 
     v2.resize(1);
-    TEST_EQUAL ( v2[0].size(), 5, () );
-    TEST_EQUAL ( dd2, v2[0].data(), () );
+    TEST_EQUAL(v2[0].size(), 5, ());
+    TEST_EQUAL(dd2, v2[0].data(), ());
 
     v1.resize(7);
-    TEST_EQUAL ( v2[0].size(), 5, () );
-    TEST_EQUAL ( dd2, v2[0].data(), () );
+    TEST_EQUAL(v2[0].size(), 5, ());
+    TEST_EQUAL(dd2, v2[0].data(), ());
   }
 
   // check resize from static to dynamic buffer
@@ -140,8 +140,8 @@ UNIT_TEST(BufferVector_Swap)
 
     // resize from static to dynamic buffer => v3[0] will stay at the same place
     v1.resize(7);
-    TEST_EQUAL ( v3[0].size(), 5, () );
-    TEST_EQUAL ( dd3, v3[0].data(), () );
+    TEST_EQUAL(v3[0].size(), 5, ());
+    TEST_EQUAL(dd3, v3[0].data(), ());
   }
 }
 
@@ -253,9 +253,9 @@ UNIT_TEST(BufferVector_PopBack)
       TEST(!v.empty(), (len, i));
       TEST_EQUAL(v.size(), i, ());
       TEST_EQUAL(v.front(), 0, ());
-      TEST_EQUAL(v.back(), i-1, ());
+      TEST_EQUAL(v.back(), i - 1, ());
       v.pop_back();
-      TEST_EQUAL(v.size(), i-1, ());
+      TEST_EQUAL(v.size(), i - 1, ());
     }
     TEST(v.empty(), ());
   }
@@ -266,16 +266,12 @@ UNIT_TEST(BufferVector_Assign)
   int const arr5[] = {1, 2, 3, 4, 5};
   buffer_vector<int, 5> v(&arr5[0], &arr5[0] + ARRAY_SIZE(arr5));
   for (size_t i = 0; i < ARRAY_SIZE(arr5); ++i)
-  {
     TEST_EQUAL(arr5[i], v[i], ());
-  }
 
-  int const arr10[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
+  int const arr10[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
   v.assign(&arr10[0], &arr10[0] + ARRAY_SIZE(arr10));
   for (size_t i = 0; i < ARRAY_SIZE(arr10); ++i)
-  {
     TEST_EQUAL(arr10[i], v[i], ());
-  }
 }
 
 UNIT_TEST(BufferVector_Equality)
@@ -337,7 +333,7 @@ void TestVector(VectorT const & v, size_t sz)
     TEST_EQUAL(v[i].m_s, strings::to_string(i), ());
 }
 
-} // namespace
+}  // namespace
 
 UNIT_TEST(BufferVector_Move)
 {
@@ -345,7 +341,7 @@ UNIT_TEST(BufferVector_Move)
   TestVector(v1, 2);
 
   // Make intermediate array to avoid warning (moving to itself).
-  std::array<VectorT *, 2> arr = { &v1, &v1 };
+  std::array<VectorT *, 2> arr = {&v1, &v1};
   *arr[0] = std::move(*arr[1]);
   TestVector(v1, 2);
 
@@ -366,18 +362,18 @@ UNIT_TEST(BufferVector_EraseIf)
   buffer_vector<int, 2> v;
   v.push_back(1);
   v.push_back(2);
-  v.erase_if([] (int x) { return x == 1; });
+  v.erase_if([](int x) { return x == 1; });
   TEST_EQUAL(v.size(), 1, ());
   TEST_EQUAL(v[0], 2, ());
 
   v.push_back(3);
   v.push_back(4);
-  v.erase_if([] (int x) { return x == 3; });
+  v.erase_if([](int x) { return x == 3; });
   TEST_EQUAL(v.size(), 2, ());
   TEST_EQUAL(v[0], 2, ());
   TEST_EQUAL(v[1], 4, ());
 
-  v.erase_if([] (int) { return true; });
+  v.erase_if([](int) { return true; });
   TEST_EQUAL(v.size(), 0, ());
 }
 
@@ -405,8 +401,8 @@ UNIT_TEST(BufferVector_Erase)
 
   while (v1.size() > 1)
   {
-    v1.erase(v1.begin() + v1.size() / 3, v1.begin() + 2 * v1.size () / 3);
-    v2.erase(v2.begin() + v2.size() / 3, v2.begin() + 2 * v2.size () / 3);
+    v1.erase(v1.begin() + v1.size() / 3, v1.begin() + 2 * v1.size() / 3);
+    v2.erase(v2.begin() + v2.size() / 3, v2.begin() + 2 * v2.size() / 3);
 
     TEST_EQUAL(v1.size(), v2.size(), ());
     for (size_t i = 0; i < v1.size(); ++i)
diff --git a/libs/base/base_tests/cache_test.cpp b/libs/base/base_tests/cache_test.cpp
index 013d8acac..9fae263a7 100644
--- a/libs/base/base_tests/cache_test.cpp
+++ b/libs/base/base_tests/cache_test.cpp
@@ -15,10 +15,7 @@ class SimpleFunctor
 public:
   SimpleFunctor() {}
 
-  void operator() (char c)
-  {
-    m_v.push_back(c);
-  }
+  void operator()(char c) { m_v.push_back(c); }
 
   std::vector<char> m_v;
 
@@ -34,8 +31,8 @@ public:
 
   SimpleMovableFunctor(SimpleMovableFunctor && other)
   {
-      m_v = other.m_v;
-      other.m_v = nullptr;
+    m_v = other.m_v;
+    other.m_v = nullptr;
   }
 
   SimpleMovableFunctor & operator=(SimpleMovableFunctor && other)
@@ -45,10 +42,7 @@ public:
     return *this;
   }
 
-  void operator() (char c)
-  {
-    m_v->push_back(c);
-  }
+  void operator()(char c) { m_v->push_back(c); }
 
 private:
   std::vector<char> * m_v;
@@ -61,8 +55,8 @@ double constexpr kEpsilon = 1e-6;
 
 UNIT_TEST(CacheSmoke)
 {
-  char const s     [] = "1123212434445";
-  char const isNew [] = "1011???1??001";
+  char const s[] = "1123212434445";
+  char const isNew[] = "1011???1??001";
   size_t const n = ARRAY_SIZE(s) - 1;
   for (int logCacheSize = 2; logCacheSize < 6; ++logCacheSize)
   {
@@ -72,24 +66,18 @@ UNIT_TEST(CacheSmoke)
       bool found = false;
       char & c = cache.Find(s[i], found);
       if (isNew[i] != '?')
-      {
         TEST_EQUAL(found, isNew[i] == '0', (i, s[i]));
-      }
       if (found)
-      {
         TEST_EQUAL(c, s[i], (i));
-      }
       else
-      {
         c = s[i];
-      }
     }
   }
 }
 
 UNIT_TEST(CacheSmoke_0)
 {
-  base::Cache<uint32_t, char> cache(3); // it contains 2^3=8 elements
+  base::Cache<uint32_t, char> cache(3);  // it contains 2^3=8 elements
   bool found = true;
   cache.Find(0, found);
   TEST(!found, ());
@@ -100,23 +88,23 @@ UNIT_TEST(CacheSmoke_0)
 
 UNIT_TEST(CacheSmoke_1)
 {
-  base::Cache<uint32_t, char> cache(3); // it contains 2^3=8 elements
+  base::Cache<uint32_t, char> cache(3);  // it contains 2^3=8 elements
   SimpleFunctor f;
-  cache.ForEachValue(f); // f passed by reference
+  cache.ForEachValue(f);  // f passed by reference
   TEST_EQUAL(f.m_v, std::vector<char>(8, 0), ());
 }
 
 UNIT_TEST(CacheSmoke_2)
 {
-  base::Cache<uint32_t, char> cache(3); // it contains 2^3=8 elements
+  base::Cache<uint32_t, char> cache(3);  // it contains 2^3=8 elements
   SimpleFunctor f;
-  cache.ForEachValue(std::ref(f)); // f passed by reference
+  cache.ForEachValue(std::ref(f));  // f passed by reference
   TEST_EQUAL(f.m_v, std::vector<char>(8, 0), ());
 }
 
 UNIT_TEST(CacheSmoke_3)
 {
-  base::CacheWithStat<uint32_t, char> cache(3); // it contains 2^3=8 elements
+  base::CacheWithStat<uint32_t, char> cache(3);  // it contains 2^3=8 elements
 
   // 0 access, cache miss is 0
   TEST(AlmostEqualAbs(0.0, cache.GetCacheMiss(), kEpsilon), ());
@@ -137,7 +125,7 @@ UNIT_TEST(CacheSmoke_3)
   cache.Find(2, found);
   TEST(!found, ());
   // 3 access, 2 miss, cache miss = 2/3 = 0.6(6)
-  TEST(AlmostEqualAbs(2.0/3.0, cache.GetCacheMiss(), kEpsilon), ());
+  TEST(AlmostEqualAbs(2.0 / 3.0, cache.GetCacheMiss(), kEpsilon), ());
 
   cache.Reset();
 
@@ -147,23 +135,23 @@ UNIT_TEST(CacheSmoke_3)
 
 UNIT_TEST(CacheSmoke_4)
 {
-  base::CacheWithStat<uint32_t, char> cache(3); // it contains 2^3=8 elements
+  base::CacheWithStat<uint32_t, char> cache(3);  // it contains 2^3=8 elements
   SimpleFunctor f;
-  cache.ForEachValue(f); // f passed by reference
+  cache.ForEachValue(f);  // f passed by reference
   TEST_EQUAL(f.m_v, std::vector<char>(8, 0), ());
 }
 
 UNIT_TEST(CacheSmoke_5)
 {
-  base::CacheWithStat<uint32_t, char> cache(3); // it contains 2^3=8 elements
+  base::CacheWithStat<uint32_t, char> cache(3);  // it contains 2^3=8 elements
   SimpleFunctor f;
-  cache.ForEachValue(std::ref(f)); // f passed by reference
+  cache.ForEachValue(std::ref(f));  // f passed by reference
   TEST_EQUAL(f.m_v, std::vector<char>(8, 0), ());
 }
 
 UNIT_TEST(CacheSmoke_6)
 {
-  base::CacheWithStat<uint32_t, char> cache(3); // it contains 2^3=8 elements
+  base::CacheWithStat<uint32_t, char> cache(3);  // it contains 2^3=8 elements
   std::vector<char> v;
   cache.ForEachValue(SimpleMovableFunctor(&v));
   TEST_EQUAL(v, std::vector<char>(8, 0), ());
diff --git a/libs/base/base_tests/cancellable_tests.cpp b/libs/base/base_tests/cancellable_tests.cpp
index 97bb42979..0391e0cbf 100644
--- a/libs/base/base_tests/cancellable_tests.cpp
+++ b/libs/base/base_tests/cancellable_tests.cpp
@@ -21,7 +21,8 @@ UNIT_TEST(Cancellable_Smoke)
 
   double x = 0.123;
 
-  auto const fn = [&] {
+  auto const fn = [&]
+  {
     for (size_t it = 0;; it++)
     {
       if (it > 100 && cancellable.IsCancelled())
@@ -54,7 +55,8 @@ UNIT_TEST(Cancellable_Deadline)
 
   double x = 0.123;
 
-  auto const fn = [&] {
+  auto const fn = [&]
+  {
     while (true)
     {
       if (cancellable.IsCancelled())
diff --git a/libs/base/base_tests/clustering_map_tests.cpp b/libs/base/base_tests/clustering_map_tests.cpp
index 3ed71659b..9420da4b9 100644
--- a/libs/base/base_tests/clustering_map_tests.cpp
+++ b/libs/base/base_tests/clustering_map_tests.cpp
@@ -27,7 +27,7 @@ class ClusteringMapAdapter
 public:
   struct Cluster
   {
-    Cluster(Key const & key, Value const & value): m_keys({key}), m_values({value}) {}
+    Cluster(Key const & key, Value const & value) : m_keys({key}), m_values({value}) {}
 
     Cluster(vector<Key> const & keys, vector<Value> const & values) : m_keys(keys), m_values(values)
     {
@@ -42,10 +42,7 @@ public:
       return m_values < rhs.m_values;
     }
 
-    bool operator==(Cluster const & rhs) const
-    {
-      return m_keys == rhs.m_keys && m_values == rhs.m_values;
-    }
+    bool operator==(Cluster const & rhs) const { return m_keys == rhs.m_keys && m_values == rhs.m_values; }
 
     friend string DebugPrint(Cluster const & cluster)
     {
@@ -75,9 +72,8 @@ public:
   {
     vector<Cluster> clusters;
 
-    m_m.ForEachCluster([&](vector<Key> const & keys, vector<Value> const & values) {
-      clusters.emplace_back(keys, values);
-    });
+    m_m.ForEachCluster([&](vector<Key> const & keys, vector<Value> const & values)
+    { clusters.emplace_back(keys, values); });
     sort(clusters.begin(), clusters.end());
     return clusters;
   }
@@ -151,16 +147,15 @@ UNIT_TEST(ClusteringMap_ForEach)
     m.Append(4, "gamma");
 
     {
-      vector<Cluster> const expected = {{Cluster{0, "Hello"}, Cluster{1, "World!"},
-                                         Cluster{2, "alpha"}, Cluster{3, "beta"},
-                                         Cluster{4, "gamma"}}};
+      vector<Cluster> const expected = {
+          {Cluster{0, "Hello"}, Cluster{1, "World!"}, Cluster{2, "alpha"}, Cluster{3, "beta"}, Cluster{4, "gamma"}}};
       TEST_EQUAL(expected, m.Clusters(), ());
     }
 
     m.Union(0, 1);
     {
-      vector<Cluster> const expected = {{Cluster{{0, 1}, {"Hello", "World!"}}, Cluster{2, "alpha"},
-                                         Cluster{3, "beta"}, Cluster{4, "gamma"}}};
+      vector<Cluster> const expected = {
+          {Cluster{{0, 1}, {"Hello", "World!"}}, Cluster{2, "alpha"}, Cluster{3, "beta"}, Cluster{4, "gamma"}}};
       TEST_EQUAL(expected, m.Clusters(), ());
     }
 
@@ -174,8 +169,7 @@ UNIT_TEST(ClusteringMap_ForEach)
 
     m.Union(0, 3);
     {
-      vector<Cluster> const expected = {
-          {Cluster{{0, 1, 2, 3, 4}, {"Hello", "World!", "alpha", "beta", "gamma"}}}};
+      vector<Cluster> const expected = {{Cluster{{0, 1, 2, 3, 4}, {"Hello", "World!", "alpha", "beta", "gamma"}}}};
       TEST_EQUAL(expected, m.Clusters(), ());
     }
   }
diff --git a/libs/base/base_tests/collection_cast_test.cpp b/libs/base/base_tests/collection_cast_test.cpp
index 6646d627a..493718e22 100644
--- a/libs/base/base_tests/collection_cast_test.cpp
+++ b/libs/base/base_tests/collection_cast_test.cpp
@@ -7,5 +7,11 @@
 
 UNIT_TEST(collection_cast)
 {
-  TEST_EQUAL((std::list<int>{1, 2, 3, 4, }),  base::collection_cast<std::list>(std::vector<int> {1, 2, 3, 4}), ());
+  TEST_EQUAL((std::list<int>{
+                 1,
+                 2,
+                 3,
+                 4,
+             }),
+             base::collection_cast<std::list>(std::vector<int>{1, 2, 3, 4}), ());
 }
diff --git a/libs/base/base_tests/control_flow_tests.cpp b/libs/base/base_tests/control_flow_tests.cpp
index bbe6abd22..6016aadac 100644
--- a/libs/base/base_tests/control_flow_tests.cpp
+++ b/libs/base/base_tests/control_flow_tests.cpp
@@ -44,7 +44,8 @@ UNIT_TEST(ControlFlow_Smoke)
   {
     Repeater repeater(10);
     uint32_t c = 0;
-    repeater.ForEach([&c] {
+    repeater.ForEach([&c]
+    {
       ++c;
       if (c == 5)
         return ControlFlow::Break;
diff --git a/libs/base/base_tests/exception_tests.cpp b/libs/base/base_tests/exception_tests.cpp
index ed7ccb5f3..750908d40 100644
--- a/libs/base/base_tests/exception_tests.cpp
+++ b/libs/base/base_tests/exception_tests.cpp
@@ -7,28 +7,66 @@
 
 namespace
 {
-int FuncDoesNotThrow() noexcept { return 1; }
-int FuncThrowsRootException() { throw RootException("RootException", "RootException"); }
-int FuncThrowsException() { throw std::exception(); }
-int FuncThrowsRuntimeError() { throw std::runtime_error("runtime_error"); }
-int FuncThrowsNumber() { throw 1; };
+int FuncDoesNotThrow() noexcept
+{
+  return 1;
+}
+int FuncThrowsRootException()
+{
+  throw RootException("RootException", "RootException");
+}
+int FuncThrowsException()
+{
+  throw std::exception();
+}
+int FuncThrowsRuntimeError()
+{
+  throw std::runtime_error("runtime_error");
+}
+int FuncThrowsNumber()
+{
+  throw 1;
+}
 
-int FuncDoesNotThrowArg(int) noexcept { return 1; }
-int FuncThrowsRootExceptionArg(int) { throw RootException("RootException", "RootException"); }
-int FuncThrowsExceptionArg(int) { throw std::exception(); }
-int FuncThrowsNumberArg(int) { throw 1; };
+int FuncDoesNotThrowArg(int) noexcept
+{
+  return 1;
+}
+int FuncThrowsRootExceptionArg(int)
+{
+  throw RootException("RootException", "RootException");
+}
+int FuncThrowsExceptionArg(int)
+{
+  throw std::exception();
+}
+int FuncThrowsNumberArg(int)
+{
+  throw 1;
+}
 
-void FuncDoesNotThrowVoid(int) noexcept { return; }
-void FuncThrowsRootExceptionVoid(int) { throw RootException("RootException", "RootException"); }
-void FuncThrowsExceptionVoid() { throw std::exception(); }
-void FuncThrowsNumberVoid() { throw 1; };
+void FuncDoesNotThrowVoid(int) noexcept
+{
+  return;
+}
+void FuncThrowsRootExceptionVoid(int)
+{
+  throw RootException("RootException", "RootException");
+}
+void FuncThrowsExceptionVoid()
+{
+  throw std::exception();
+}
+void FuncThrowsNumberVoid()
+{
+  throw 1;
+}
 
 std::string const & ReturnsByRef(std::string const & str)
 {
   bool exception = true;
-  return ExceptionCatcher(
-      "ReturnsByRef().", exception,
-      [](std::string const & str) -> std::string const & { return str; }, str);
+  return ExceptionCatcher("ReturnsByRef().", exception,
+                          [](std::string const & str) -> std::string const & { return str; }, str);
 }
 
 UNIT_TEST(ExceptionCatcher_FunctionsWithoutArgs)
@@ -63,43 +101,35 @@ UNIT_TEST(ExceptionCatcher_LambdasReturnInt)
 {
   bool exception = false;
   size_t callCount = 0;
-  ExceptionCatcher(
-      "Lambda", exception,
-      [&callCount](int) {
-        ++callCount;
-        return 1;
-      },
-      7);
+  ExceptionCatcher("Lambda", exception, [&callCount](int)
+  {
+    ++callCount;
+    return 1;
+  }, 7);
   TEST(!exception, ());
   TEST_EQUAL(callCount, 1, ());
 
-  ExceptionCatcher(
-      "Lambda", exception,
-      [&callCount](int) -> int {
-        ++callCount;
-        throw RootException("RootException", "RootException");
-      },
-      7);
+  ExceptionCatcher("Lambda", exception, [&callCount](int) -> int
+  {
+    ++callCount;
+    throw RootException("RootException", "RootException");
+  }, 7);
   TEST(exception, ());
   TEST_EQUAL(callCount, 2, ());
 
-  ExceptionCatcher(
-      "Lambda", exception,
-      [&callCount](int) -> int {
-        ++callCount;
-        throw std::exception();
-      },
-      7);
+  ExceptionCatcher("Lambda", exception, [&callCount](int) -> int
+  {
+    ++callCount;
+    throw std::exception();
+  }, 7);
   TEST(exception, ());
   TEST_EQUAL(callCount, 3, ());
 
-  ExceptionCatcher(
-      "Lambda", exception,
-      [&callCount](int) -> int {
-        ++callCount;
-        throw 1;
-      },
-      7);
+  ExceptionCatcher("Lambda", exception, [&callCount](int) -> int
+  {
+    ++callCount;
+    throw 1;
+  }, 7);
   TEST(exception, ());
   TEST_EQUAL(callCount, 4, ());
 }
@@ -108,42 +138,31 @@ UNIT_TEST(ExceptionCatcher_LambdasReturnVoid)
 {
   bool exception = false;
   size_t callCount = 0;
-  ExceptionCatcher(
-      "Lambda", exception,
-      [&callCount](int) {
-        ++callCount;
-      },
-      7);
+  ExceptionCatcher("Lambda", exception, [&callCount](int) { ++callCount; }, 7);
   TEST(!exception, ());
   TEST_EQUAL(callCount, 1, ());
 
-  ExceptionCatcher(
-      "Lambda", exception,
-      [&callCount](int) {
-        ++callCount;
-        throw RootException("RootException", "RootException");
-      },
-      7);
+  ExceptionCatcher("Lambda", exception, [&callCount](int)
+  {
+    ++callCount;
+    throw RootException("RootException", "RootException");
+  }, 7);
   TEST(exception, ());
   TEST_EQUAL(callCount, 2, ());
 
-  ExceptionCatcher(
-      "Lambda", exception,
-      [&callCount](int) {
-        ++callCount;
-        throw std::exception();
-      },
-      7);
+  ExceptionCatcher("Lambda", exception, [&callCount](int)
+  {
+    ++callCount;
+    throw std::exception();
+  }, 7);
   TEST(exception, ());
   TEST_EQUAL(callCount, 3, ());
 
-  ExceptionCatcher(
-      "Lambda", exception,
-      [&callCount](int) {
-        ++callCount;
-        throw 1;
-      },
-      7);
+  ExceptionCatcher("Lambda", exception, [&callCount](int)
+  {
+    ++callCount;
+    throw 1;
+  }, 7);
   TEST(exception, ());
   TEST_EQUAL(callCount, 4, ());
 }
diff --git a/libs/base/base_tests/fifo_cache_test.cpp b/libs/base/base_tests/fifo_cache_test.cpp
index b8747af6f..ae6bf58fb 100644
--- a/libs/base/base_tests/fifo_cache_test.cpp
+++ b/libs/base/base_tests/fifo_cache_test.cpp
@@ -21,10 +21,7 @@ template <typename Key, typename Value>
 class FifoCacheTest
 {
 public:
-  FifoCacheTest(size_t capacity, typename FifoCache<Key, Value>::Loader const & loader)
-      : m_cache(capacity, loader)
-  {
-  }
+  FifoCacheTest(size_t capacity, typename FifoCache<Key, Value>::Loader const & loader) : m_cache(capacity, loader) {}
 
   Value const & GetValue(Key const & key) { return m_cache.GetValue(key); }
   unordered_map<Key, Value> const & GetMap() const { return m_cache.m_map; }
@@ -93,7 +90,8 @@ UNIT_TEST(FifoCache_LoaderCalls)
   using Key = int;
   using Value = int;
   bool shouldLoadBeCalled = true;
-  auto loader = [&shouldLoadBeCalled](Key k, Value & v) {
+  auto loader = [&shouldLoadBeCalled](Key k, Value & v)
+  {
     TEST(shouldLoadBeCalled, ());
     v = k;
   };
diff --git a/libs/base/base_tests/file_name_utils_tests.cpp b/libs/base/base_tests/file_name_utils_tests.cpp
index 9fafc175a..c0ff14ce8 100644
--- a/libs/base/base_tests/file_name_utils_tests.cpp
+++ b/libs/base/base_tests/file_name_utils_tests.cpp
@@ -83,4 +83,4 @@ UNIT_TEST(FilePath_Join)
   TEST_EQUAL("../../omim/strings.txt", base::JoinPath("../", "..", "omim/", "strings.txt"), ());
 }
 
-#endif // OMIM_OS_WINDOWS
+#endif  // OMIM_OS_WINDOWS
diff --git a/libs/base/base_tests/geo_object_id_tests.cpp b/libs/base/base_tests/geo_object_id_tests.cpp
index f56f26e2a..afca57ed8 100644
--- a/libs/base/base_tests/geo_object_id_tests.cpp
+++ b/libs/base/base_tests/geo_object_id_tests.cpp
@@ -50,18 +50,18 @@ UNIT_TEST(GeoObjectId_Print)
   // https://www.openstreetmap.org/#map=19/54.54438/25.69932
 
   // Belarus -> Lithuania                                  B          L
-  LOG(LINFO, (MakeOsmWay(533044131).GetEncodedId())); // 1 3 0
-  LOG(LINFO, (MakeOsmWay(489294139).GetEncodedId())); //            1 0 1
+  LOG(LINFO, (MakeOsmWay(533044131).GetEncodedId()));  // 1 3 0
+  LOG(LINFO, (MakeOsmWay(489294139).GetEncodedId()));  //            1 0 1
 
   // Lithuania -> Belarus
-  LOG(LINFO, (MakeOsmWay(614091318).GetEncodedId())); // 1 5 1      1 5 0
+  LOG(LINFO, (MakeOsmWay(614091318).GetEncodedId()));  // 1 5 1      1 5 0
   LOG(LINFO, (MakeOsmWay(148247387).GetEncodedId()));
 
   // https://www.openstreetmap.org/#map=19/55.30215/10.86668
 
   // Denmark_Zealand -> Denmark_Southern                 Z            S
-  LOG(LINFO, (MakeOsmWay(2032610).GetEncodedId())); // 1 6 0        1 6 1
+  LOG(LINFO, (MakeOsmWay(2032610).GetEncodedId()));  // 1 6 0        1 6 1
 
   // Denmark_Southern -> Denmark_Zealand
-  LOG(LINFO, (MakeOsmWay(4360600).GetEncodedId())); // 1 18 1       1 18 0
+  LOG(LINFO, (MakeOsmWay(4360600).GetEncodedId()));  // 1 18 1       1 18 0
 }
diff --git a/libs/base/base_tests/levenshtein_dfa_test.cpp b/libs/base/base_tests/levenshtein_dfa_test.cpp
index 33aed9414..b3d822260 100644
--- a/libs/base/base_tests/levenshtein_dfa_test.cpp
+++ b/libs/base/base_tests/levenshtein_dfa_test.cpp
@@ -23,14 +23,14 @@ struct Result
 {
   Result() = default;
   Result(Status status, size_t errorsMade = 0, size_t prefixErrorsMade = 0)
-    : m_status(status), m_errorsMade(errorsMade), m_prefixErrorsMade(prefixErrorsMade)
-  {
-  }
+    : m_status(status)
+    , m_errorsMade(errorsMade)
+    , m_prefixErrorsMade(prefixErrorsMade)
+  {}
 
   bool operator==(Result const & rhs) const
   {
-    return m_status == rhs.m_status &&
-           (m_errorsMade == rhs.m_errorsMade || m_status == Status::Rejects) &&
+    return m_status == rhs.m_status && (m_errorsMade == rhs.m_errorsMade || m_status == Status::Rejects) &&
            (m_prefixErrorsMade == rhs.m_prefixErrorsMade || m_status == Status::Rejects);
   }
 
@@ -160,30 +160,24 @@ UNIT_TEST(LevenshteinDFA_ErrorsMade)
   {
     LevenshteinDFA dfa("москва", 1 /* prefixSize */, 2 /* maxErrors */);
 
-    TEST_EQUAL(GetResult(dfa, "москва"),
-               Result(Status::Accepts, 0 /* errorsMade */, 0 /* prefixErrorsMade */), ());
-    TEST_EQUAL(GetResult(dfa, "москв"),
-               Result(Status::Accepts, 1 /* errorsMade */, 0 /* prefixErrorsMade */), ());
-    TEST_EQUAL(GetResult(dfa, "моск"),
-               Result(Status::Accepts, 2 /* errorsMade */, 0 /* prefixErrorsMade */), ());
+    TEST_EQUAL(GetResult(dfa, "москва"), Result(Status::Accepts, 0 /* errorsMade */, 0 /* prefixErrorsMade */), ());
+    TEST_EQUAL(GetResult(dfa, "москв"), Result(Status::Accepts, 1 /* errorsMade */, 0 /* prefixErrorsMade */), ());
+    TEST_EQUAL(GetResult(dfa, "моск"), Result(Status::Accepts, 2 /* errorsMade */, 0 /* prefixErrorsMade */), ());
     TEST_EQUAL(GetResult(dfa, "мос").m_status, Status::Intermediate, ());
     TEST_EQUAL(GetResult(dfa, "мос").m_prefixErrorsMade, 0, ());
 
-    TEST_EQUAL(GetResult(dfa, "моксав"),
-               Result(Status::Accepts, 2 /* errorsMade */, 2 /* prefixErrorsMade */), ());
+    TEST_EQUAL(GetResult(dfa, "моксав"), Result(Status::Accepts, 2 /* errorsMade */, 2 /* prefixErrorsMade */), ());
     TEST_EQUAL(GetResult(dfa, "максав").m_status, Status::Rejects, ());
 
     TEST_EQUAL(GetResult(dfa, "мсовк").m_status, Status::Intermediate, ());
     TEST_EQUAL(GetResult(dfa, "мсовк").m_prefixErrorsMade, 2, ());
-    TEST_EQUAL(GetResult(dfa, "мсовка"),
-               Result(Status::Accepts, 2 /* errorsMade */, 2 /* prefixErrorsMade */), ());
+    TEST_EQUAL(GetResult(dfa, "мсовка"), Result(Status::Accepts, 2 /* errorsMade */, 2 /* prefixErrorsMade */), ());
     TEST_EQUAL(GetResult(dfa, "мсовкб").m_status, Status::Rejects, ());
   }
 
   {
     LevenshteinDFA dfa("aa", 0 /* prefixSize */, 2 /* maxErrors */);
-    TEST_EQUAL(GetResult(dfa, "abab"),
-               Result(Status::Accepts, 2 /* errorsMade */, 2 /* prefixErrorsMade */), ());
+    TEST_EQUAL(GetResult(dfa, "abab"), Result(Status::Accepts, 2 /* errorsMade */, 2 /* prefixErrorsMade */), ());
   }
 
   {
@@ -191,8 +185,8 @@ UNIT_TEST(LevenshteinDFA_ErrorsMade)
     TEST_EQUAL(GetResult(dfa, "misisipi").m_status, Status::Rejects, ());
     TEST_EQUAL(GetResult(dfa, "mississipp").m_status, Status::Intermediate, ());
     TEST_EQUAL(GetResult(dfa, "mississipp").m_prefixErrorsMade, 0, ());
-    TEST_EQUAL(GetResult(dfa, "mississippi"),
-               Result(Status::Accepts, 0 /* errorsMade */, 0 /* prefixErrorsMade */), ());
+    TEST_EQUAL(GetResult(dfa, "mississippi"), Result(Status::Accepts, 0 /* errorsMade */, 0 /* prefixErrorsMade */),
+               ());
   }
 
   {
@@ -215,10 +209,8 @@ UNIT_TEST(LevenshteinDFA_ErrorsMade)
 
   {
     LevenshteinDFA dfa("кафе", 1 /* prefixSize */, 1 /* maxErrors */);
-    TEST_EQUAL(GetResult(dfa, "кафе"),
-               Result(Status::Accepts, 0 /* errorsMade */, 0 /* prefixErrorsMade */), ());
-    TEST_EQUAL(GetResult(dfa, "кафер"),
-               Result(Status::Accepts, 1 /* errorsMade */, 1 /* prefixErrorsMade */), ());
+    TEST_EQUAL(GetResult(dfa, "кафе"), Result(Status::Accepts, 0 /* errorsMade */, 0 /* prefixErrorsMade */), ());
+    TEST_EQUAL(GetResult(dfa, "кафер"), Result(Status::Accepts, 1 /* errorsMade */, 1 /* prefixErrorsMade */), ());
   }
 }
 
@@ -271,7 +263,7 @@ UNIT_TEST(LevenshteinDFA_PrefixDFASmoke)
   {
     result.clear();
     result.resize(math::PowUint(alphabet.size(), size));
-    for (size_t letterNumber = 0;  letterNumber < size; ++letterNumber)
+    for (size_t letterNumber = 0; letterNumber < size; ++letterNumber)
     {
       for (size_t i = 0; i < result.size(); ++i)
       {
diff --git a/libs/base/base_tests/logging_test.cpp b/libs/base/base_tests/logging_test.cpp
index 463e8f5ad..b847c7050 100644
--- a/libs/base/base_tests/logging_test.cpp
+++ b/libs/base/base_tests/logging_test.cpp
@@ -5,27 +5,24 @@
 #include <utility>
 #include <vector>
 
-
 namespace
 {
-  void TestLogMessage(base::LogLevel, base::SrcPoint const &, std::string const &)
-  {
-  }
+void TestLogMessage(base::LogLevel, base::SrcPoint const &, std::string const &) {}
 
-  bool g_SomeFunctionCalled;
-  int SomeFunction()
-  {
-    g_SomeFunctionCalled = true;
-    return 3;
-  }
-
-  bool BoolFunction(bool result, bool & called)
-  {
-     called = true;
-     return result;
-  }
+bool g_SomeFunctionCalled;
+int SomeFunction()
+{
+  g_SomeFunctionCalled = true;
+  return 3;
 }
 
+bool BoolFunction(bool result, bool & called)
+{
+  called = true;
+  return result;
+}
+}  // namespace
+
 UNIT_TEST(Logging_Level)
 {
   base::LogLevel const logLevelSaved = base::g_LogLevel;
diff --git a/libs/base/base_tests/lru_cache_tests.cpp b/libs/base/base_tests/lru_cache_tests.cpp
index 41ca034bd..5e1b47ed2 100644
--- a/libs/base/base_tests/lru_cache_tests.cpp
+++ b/libs/base/base_tests/lru_cache_tests.cpp
@@ -11,9 +11,7 @@ class LruCacheTest
 public:
   using Loader = std::function<void(Key const & key, Value & value)>;
 
-  LruCacheTest(size_t maxCacheSize, Loader const & loader) : m_cache(maxCacheSize), m_loader(loader)
-  {
-  }
+  LruCacheTest(size_t maxCacheSize, Loader const & loader) : m_cache(maxCacheSize), m_loader(loader) {}
 
   Value const & GetValue(Key const & key)
   {
@@ -42,17 +40,16 @@ public:
   bool IsValid() const { return m_keyAge.IsValidForTesting(); }
 
   size_t GetAge() const { return m_keyAge.m_age; }
-  std::map<size_t, Key> const & GetAgeToKey() const { return m_keyAge.m_ageToKey; };
-  std::unordered_map<Key, size_t> const & GetKeyToAge() const { return m_keyAge.m_keyToAge; };
+  std::map<size_t, Key> const & GetAgeToKey() const { return m_keyAge.m_ageToKey; }
+  std::unordered_map<Key, size_t> const & GetKeyToAge() const { return m_keyAge.m_keyToAge; }
 
 private:
   typename LruCache<Key, Value>::KeyAge m_keyAge;
 };
 
 template <typename Key, typename Value>
-void TestAge(LruCacheKeyAgeTest<Key, Value> const & keyAge,
-             size_t expectedAge, std::map<size_t, Key> const & expectedAgeToKey,
-             std::unordered_map<Key, size_t> const & expectedKeyToAge)
+void TestAge(LruCacheKeyAgeTest<Key, Value> const & keyAge, size_t expectedAge,
+             std::map<size_t, Key> const & expectedAgeToKey, std::unordered_map<Key, size_t> const & expectedKeyToAge)
 {
   TEST(keyAge.IsValid(), ());
   TEST_EQUAL(keyAge.GetAge(), expectedAge, ());
@@ -151,7 +148,8 @@ UNIT_TEST(LruCacheLoaderCallsTest)
   using Key = int;
   using Value = int;
   bool shouldLoadBeCalled = true;
-  auto loader = [&shouldLoadBeCalled](Key k, Value & v) {
+  auto loader = [&shouldLoadBeCalled](Key k, Value & v)
+  {
     TEST(shouldLoadBeCalled, ());
     v = k;
   };
diff --git a/libs/base/base_tests/math_test.cpp b/libs/base/base_tests/math_test.cpp
index 0e44bef15..469140754 100644
--- a/libs/base/base_tests/math_test.cpp
+++ b/libs/base/base_tests/math_test.cpp
@@ -77,9 +77,9 @@ UNIT_TEST(AlmostEqualULPs_double)
 
   TEST_ALMOST_EQUAL_ULPS(dmax, dmax, ());
   TEST_ALMOST_EQUAL_ULPS(-dmax, -dmax, ());
-  TEST_ALMOST_EQUAL_ULPS(dmax/2.0, dmax/2.0, ());
-  TEST_ALMOST_EQUAL_ULPS(1.0/dmax, 1.0/dmax, ());
-  TEST_ALMOST_EQUAL_ULPS(-1.0/dmax, -1.0/dmax, ());
+  TEST_ALMOST_EQUAL_ULPS(dmax / 2.0, dmax / 2.0, ());
+  TEST_ALMOST_EQUAL_ULPS(1.0 / dmax, 1.0 / dmax, ());
+  TEST_ALMOST_EQUAL_ULPS(-1.0 / dmax, -1.0 / dmax, ());
 
   TEST(!AlmostEqualULPs(1.0, -1.0), ());
   TEST(!AlmostEqualULPs(2.0, -2.0), ());
@@ -88,7 +88,7 @@ UNIT_TEST(AlmostEqualULPs_double)
   // That's why AlmostEqualULPs is a strange function, IMHO.
   TEST(!AlmostEqualULPs(0.0, eps), ());
   TEST(!AlmostEqualULPs(-eps, 0.0), ());
-  TEST(!AlmostEqualULPs(eps, 2.0*eps), ());
+  TEST(!AlmostEqualULPs(eps, 2.0 * eps), ());
 }
 
 UNIT_TEST(AlmostEqualULPs_float)
@@ -105,9 +105,9 @@ UNIT_TEST(AlmostEqualULPs_float)
 
   TEST_ALMOST_EQUAL_ULPS(dmax, dmax, ());
   TEST_ALMOST_EQUAL_ULPS(-dmax, -dmax, ());
-  TEST_ALMOST_EQUAL_ULPS(dmax/2.0f, dmax/2.0f, ());
-  TEST_ALMOST_EQUAL_ULPS(1.0f/dmax, 1.0f/dmax, ());
-  TEST_ALMOST_EQUAL_ULPS(-1.0f/dmax, -1.0f/dmax, ());
+  TEST_ALMOST_EQUAL_ULPS(dmax / 2.0f, dmax / 2.0f, ());
+  TEST_ALMOST_EQUAL_ULPS(1.0f / dmax, 1.0f / dmax, ());
+  TEST_ALMOST_EQUAL_ULPS(-1.0f / dmax, -1.0f / dmax, ());
 
   TEST(!AlmostEqualULPs(1.0f, -1.0f), ());
   TEST(!AlmostEqualULPs(2.0f, -2.0f), ());
@@ -116,7 +116,7 @@ UNIT_TEST(AlmostEqualULPs_float)
   // That's why AlmostEqualULPs is a strange function, IMHO.
   TEST(!AlmostEqualULPs(0.0f, eps), ());
   TEST(!AlmostEqualULPs(-eps, 0.0f), ());
-  TEST(!AlmostEqualULPs(eps, 2.0f*eps), ());
+  TEST(!AlmostEqualULPs(eps, 2.0f * eps), ());
 }
 
 UNIT_TEST(AlmostEqual_Smoke)
@@ -199,14 +199,14 @@ UNIT_TEST(is_finite)
 
   TEST(!is_finite(Nan()), ());
   TEST(!is_finite(Infinity()), ());
-  TEST(!is_finite(DBL_MAX*2.0), ());
+  TEST(!is_finite(DBL_MAX * 2.0), ());
 
   TEST(is_finite(0.0), ());
   TEST(is_finite(1.0), ());
   TEST(is_finite(-2.0), ());
   TEST(is_finite(DBL_MIN), ());
   TEST(is_finite(DBL_MAX), ());
-  TEST(is_finite(DBL_MIN/2.0), ("As in cppreference example"));
+  TEST(is_finite(DBL_MIN / 2.0), ("As in cppreference example"));
 }
 
 }  // namespace math_test
diff --git a/libs/base/base_tests/matrix_test.cpp b/libs/base/base_tests/matrix_test.cpp
index 6ec3a38a3..4de0f8971 100644
--- a/libs/base/base_tests/matrix_test.cpp
+++ b/libs/base/base_tests/matrix_test.cpp
@@ -2,7 +2,6 @@
 
 #include "base/matrix.hpp"
 
-
 UNIT_TEST(Matrix_Inverse_Simple)
 {
   math::Matrix<double, 3, 3> m;
@@ -19,9 +18,15 @@ UNIT_TEST(Matrix_Inverse_Simple)
 UNIT_TEST(Matrix_Inverse_AllElementsNonZero)
 {
   math::Matrix<double, 3, 3> m;
-  m(0, 0) = 5; m(0, 1) = 3; m(0, 2) = 6;
-  m(1, 0) = 1; m(1, 1) = 7; m(1, 2) = 9;
-  m(2, 0) = 2; m(2, 1) = 13; m(2, 2) = 4;
+  m(0, 0) = 5;
+  m(0, 1) = 3;
+  m(0, 2) = 6;
+  m(1, 0) = 1;
+  m(1, 1) = 7;
+  m(1, 2) = 9;
+  m(2, 0) = 2;
+  m(2, 1) = 13;
+  m(2, 2) = 4;
 
   math::Matrix<double, 3, 3> m1 = math::Inverse(m);
 
diff --git a/libs/base/base_tests/mem_trie_test.cpp b/libs/base/base_tests/mem_trie_test.cpp
index fc4e01dcd..1560e95da 100644
--- a/libs/base/base_tests/mem_trie_test.cpp
+++ b/libs/base/base_tests/mem_trie_test.cpp
@@ -50,8 +50,7 @@ public:
   Data GetContentsByPrefix(Key const & prefix) const
   {
     Data data;
-    m_trie.ForEachInSubtree(prefix,
-                            [&data](Key const & k, Value const & v) { data.emplace_back(k, v); });
+    m_trie.ForEachInSubtree(prefix, [&data](Key const & k, Value const & v) { data.emplace_back(k, v); });
     sort(data.begin(), data.end());
     return data;
   }
diff --git a/libs/base/base_tests/range_iterator_test.cpp b/libs/base/base_tests/range_iterator_test.cpp
index db3bd0469..7029ae84b 100644
--- a/libs/base/base_tests/range_iterator_test.cpp
+++ b/libs/base/base_tests/range_iterator_test.cpp
@@ -37,7 +37,6 @@ UNIT_TEST(RangeIterator)
   }
 
   {
-    TEST_EQUAL(std::vector<int>(MakeRangeIterator(0), MakeRangeIterator(5)),
-               (std::vector<int>{0, 1, 2, 3, 4}), ());
+    TEST_EQUAL(std::vector<int>(MakeRangeIterator(0), MakeRangeIterator(5)), (std::vector<int>{0, 1, 2, 3, 4}), ());
   }
 }
diff --git a/libs/base/base_tests/regexp_test.cpp b/libs/base/base_tests/regexp_test.cpp
index 5408cc51d..96b52f2b7 100644
--- a/libs/base/base_tests/regexp_test.cpp
+++ b/libs/base/base_tests/regexp_test.cpp
@@ -4,7 +4,6 @@
 
 #include <regex>
 
-
 namespace regexp_test
 {
 template <typename Fn>
@@ -84,4 +83,4 @@ UNIT_TEST(RegExp_ForEachMatched)
   }
 }
 
-} // namespace regexp_test
+}  // namespace regexp_test
diff --git a/libs/base/base_tests/rolling_hash_test.cpp b/libs/base/base_tests/rolling_hash_test.cpp
index 21eb1caa1..fe85f379e 100644
--- a/libs/base/base_tests/rolling_hash_test.cpp
+++ b/libs/base/base_tests/rolling_hash_test.cpp
@@ -1,16 +1,16 @@
+#include "base/rolling_hash.hpp"
 #include "testing/benchmark.hpp"
 #include "testing/testing.hpp"
-#include "base/rolling_hash.hpp"
 
 #include "base/base.hpp"
 #include "base/logging.hpp"
 #include "base/macros.hpp"
 
-
 namespace
 {
 
-template <class RollingHasherT> void SmokeTest1RollingHasher()
+template <class RollingHasherT>
+void SmokeTest1RollingHasher()
 {
   typedef typename RollingHasherT::hash_type hash_type;
   RollingHasherT hash;
@@ -18,7 +18,8 @@ template <class RollingHasherT> void SmokeTest1RollingHasher()
   TEST_EQUAL(h0, hash.Scroll('a', 'a'), (sizeof(hash_type)));
 }
 
-template <class RollingHasherT> void SmokeTest2RollingHasher()
+template <class RollingHasherT>
+void SmokeTest2RollingHasher()
 {
   typedef typename RollingHasherT::hash_type hash_type;
   RollingHasherT hash;
@@ -30,12 +31,13 @@ template <class RollingHasherT> void SmokeTest2RollingHasher()
   TEST_EQUAL(hBA, hBA1, (sizeof(hash_type)));
 }
 
-template <class RollingHasherT> void TestRollingHasher()
+template <class RollingHasherT>
+void TestRollingHasher()
 {
   SmokeTest1RollingHasher<RollingHasherT>();
   SmokeTest2RollingHasher<RollingHasherT>();
   //                 01234567890123
-  char const s [] = "abcdefghaabcde";
+  char const s[] = "abcdefghaabcde";
   size_t const len = ARRAY_SIZE(s) - 1;
   for (uint32_t size = 1; size <= 6; ++size)
   {
@@ -49,34 +51,34 @@ template <class RollingHasherT> void TestRollingHasher()
     switch (size)
     {
     case 6:
-      {
-        // Test that there are no collisions.
-        sort(hashes.begin(), hashes.end());
-        TEST(hashes.end() == unique(hashes.begin(), hashes.end()), (size, hashes));
-      }
-      break;
+    {
+      // Test that there are no collisions.
+      sort(hashes.begin(), hashes.end());
+      TEST(hashes.end() == unique(hashes.begin(), hashes.end()), (size, hashes));
+    }
+    break;
     case 1:
-      {
-        TEST_EQUAL(hashes[0], hashes[8], (size, len, sizeof(hash_type)));
-        TEST_EQUAL(hashes[0], hashes[9], (size, len, sizeof(hash_type)));
-        TEST_EQUAL(hashes[1], hashes[10], (size, len, sizeof(hash_type)));
-        TEST_EQUAL(hashes[2], hashes[11], (size, len, sizeof(hash_type)));
-        TEST_EQUAL(hashes[3], hashes[12], (size, len, sizeof(hash_type)));
-        TEST_EQUAL(hashes[4], hashes[13], (size, len, sizeof(hash_type)));
-      }
-      break;
+    {
+      TEST_EQUAL(hashes[0], hashes[8], (size, len, sizeof(hash_type)));
+      TEST_EQUAL(hashes[0], hashes[9], (size, len, sizeof(hash_type)));
+      TEST_EQUAL(hashes[1], hashes[10], (size, len, sizeof(hash_type)));
+      TEST_EQUAL(hashes[2], hashes[11], (size, len, sizeof(hash_type)));
+      TEST_EQUAL(hashes[3], hashes[12], (size, len, sizeof(hash_type)));
+      TEST_EQUAL(hashes[4], hashes[13], (size, len, sizeof(hash_type)));
+    }
+    break;
     default:
-      {
-        for (unsigned int i = 0; i < 6 - size; ++i)
-          TEST_EQUAL(hashes[i], hashes[i + 9], (i, size, len, sizeof(hash_type)));
-        sort(hashes.begin(), hashes.end());
-        TEST((hashes.end() - (6 - size)) == unique(hashes.begin(), hashes.end()), (size, hashes));
-      }
+    {
+      for (unsigned int i = 0; i < 6 - size; ++i)
+        TEST_EQUAL(hashes[i], hashes[i + 9], (i, size, len, sizeof(hash_type)));
+      sort(hashes.begin(), hashes.end());
+      TEST((hashes.end() - (6 - size)) == unique(hashes.begin(), hashes.end()), (size, hashes));
+    }
     }
   }
 }
 
-}
+}  // namespace
 
 UNIT_TEST(RabinKarpRollingHasher32)
 {
diff --git a/libs/base/base_tests/scope_guard_test.cpp b/libs/base/base_tests/scope_guard_test.cpp
index 0c40ddfbd..fc41ef098 100644
--- a/libs/base/base_tests/scope_guard_test.cpp
+++ b/libs/base/base_tests/scope_guard_test.cpp
@@ -6,26 +6,26 @@ static bool b = false;
 
 void SetB()
 {
-    b = true;
+  b = true;
 }
 
 UNIT_TEST(ScopeGuard)
 {
-    {
-        b = false;
-        SCOPE_GUARD(guard, &SetB);
-        TEST_EQUAL(b, false, ("Start test condition"));
-    }
-    TEST_EQUAL(b, true, ("scope_guard works in destructor"));
+  {
+    b = false;
+    SCOPE_GUARD(guard, &SetB);
+    TEST_EQUAL(b, false, ("Start test condition"));
+  }
+  TEST_EQUAL(b, true, ("scope_guard works in destructor"));
 }
 
 UNIT_TEST(ScopeGuardRelease)
 {
-    {
-        b = false;
-        SCOPE_GUARD(guard, &SetB);
-        TEST_EQUAL(b, false, ("Start test condition"));
-        guard.release();
-    }
-    TEST_EQUAL(b, false, ("If relese() was called then scope_guard shouldn't work"));
+  {
+    b = false;
+    SCOPE_GUARD(guard, &SetB);
+    TEST_EQUAL(b, false, ("Start test condition"));
+    guard.release();
+  }
+  TEST_EQUAL(b, false, ("If relese() was called then scope_guard shouldn't work"));
 }
diff --git a/libs/base/base_tests/small_set_test.cpp b/libs/base/base_tests/small_set_test.cpp
index dbe8a262f..24566fee2 100644
--- a/libs/base/base_tests/small_set_test.cpp
+++ b/libs/base/base_tests/small_set_test.cpp
@@ -7,8 +7,8 @@
 #include <algorithm>
 #include <iterator>
 #include <random>
-#include <vector>
 #include <unordered_map>
+#include <vector>
 
 namespace small_set_test
 {
@@ -97,13 +97,10 @@ UNIT_TEST(SmallMap_Benchmark1)
   // 1. Init maps.
   // Dataset is similar to routing::VehicleModel.
   std::unordered_map<uint32_t, bool> uMap = {
-    {1, true}, {2, false}, {4, false}, {6, true}, {7, true},
-    {8, true}, {12, false}, {15, false}, {26, true}, {30, false},
-    {36, false}, {43, false}, {54, false}, {57, true}, {58, true},
-    {65, true}, {69, true}, {90, true}, {95, false}, {119, false},
-    {167, true}, {176, false}, {259, true}, {272, false}, {994, true},
-    {1054, false}
-  };
+      {1, true},    {2, false},  {4, false},   {6, true},   {7, true},    {8, true},    {12, false},
+      {15, false},  {26, true},  {30, false},  {36, false}, {43, false},  {54, false},  {57, true},
+      {58, true},   {65, true},  {69, true},   {90, true},  {95, false},  {119, false}, {167, true},
+      {176, false}, {259, true}, {272, false}, {994, true}, {1054, false}};
 
   base::SmallMap<uint32_t, bool> sMap(uMap.begin(), uMap.end());
 
@@ -142,31 +139,31 @@ UNIT_TEST(SmallMap_Benchmark2)
   uint32_t i = 0;
   // Dataset is similar to routing::VehicleModelFactory.
   unordered_map<string, shared_ptr<int>> uMap = {
-    {"", make_shared<int>(i++)},
-    {"Australia", make_shared<int>(i++)},
-    {"Austria", make_shared<int>(i++)},
-    {"Belarus", make_shared<int>(i++)},
-    {"Belgium", make_shared<int>(i++)},
-    {"Brazil", make_shared<int>(i++)},
-    {"Denmark", make_shared<int>(i++)},
-    {"France", make_shared<int>(i++)},
-    {"Finland", make_shared<int>(i++)},
-    {"Germany", make_shared<int>(i++)},
-    {"Hungary", make_shared<int>(i++)},
-    {"Iceland", make_shared<int>(i++)},
-    {"Netherlands", make_shared<int>(i++)},
-    {"Norway", make_shared<int>(i++)},
-    {"Oman", make_shared<int>(i++)},
-    {"Poland", make_shared<int>(i++)},
-    {"Romania", make_shared<int>(i++)},
-    {"Russian Federation", make_shared<int>(i++)},
-    {"Slovakia", make_shared<int>(i++)},
-    {"Spain", make_shared<int>(i++)},
-    {"Switzerland", make_shared<int>(i++)},
-    {"Turkey", make_shared<int>(i++)},
-    {"Ukraine", make_shared<int>(i++)},
-    {"United Kingdom", make_shared<int>(i++)},
-    {"United States of America", make_shared<int>(i++)},
+      {"", make_shared<int>(i++)},
+      {"Australia", make_shared<int>(i++)},
+      {"Austria", make_shared<int>(i++)},
+      {"Belarus", make_shared<int>(i++)},
+      {"Belgium", make_shared<int>(i++)},
+      {"Brazil", make_shared<int>(i++)},
+      {"Denmark", make_shared<int>(i++)},
+      {"France", make_shared<int>(i++)},
+      {"Finland", make_shared<int>(i++)},
+      {"Germany", make_shared<int>(i++)},
+      {"Hungary", make_shared<int>(i++)},
+      {"Iceland", make_shared<int>(i++)},
+      {"Netherlands", make_shared<int>(i++)},
+      {"Norway", make_shared<int>(i++)},
+      {"Oman", make_shared<int>(i++)},
+      {"Poland", make_shared<int>(i++)},
+      {"Romania", make_shared<int>(i++)},
+      {"Russian Federation", make_shared<int>(i++)},
+      {"Slovakia", make_shared<int>(i++)},
+      {"Spain", make_shared<int>(i++)},
+      {"Switzerland", make_shared<int>(i++)},
+      {"Turkey", make_shared<int>(i++)},
+      {"Ukraine", make_shared<int>(i++)},
+      {"United Kingdom", make_shared<int>(i++)},
+      {"United States of America", make_shared<int>(i++)},
   };
 
   base::SmallMap<std::string, std::shared_ptr<int>> sMap(uMap.begin(), uMap.end());
diff --git a/libs/base/base_tests/stl_helpers_tests.cpp b/libs/base/base_tests/stl_helpers_tests.cpp
index 5972989da..49d59369c 100644
--- a/libs/base/base_tests/stl_helpers_tests.cpp
+++ b/libs/base/base_tests/stl_helpers_tests.cpp
@@ -7,7 +7,6 @@
 #include <map>
 #include <vector>
 
-
 namespace stl_helpers_tests
 {
 using namespace base;
@@ -35,8 +34,7 @@ void TestSortUnique()
   {
     using Value = int;
     using Pair = std::pair<Value, int>;
-    Cont<Pair> d =
-        {{1, 22}, {2, 33}, {1, 23}, {4, 54}, {3, 34}, {5, 23}, {2, 23}, {7, 32}, {1, 12}};
+    Cont<Pair> d = {{1, 22}, {2, 33}, {1, 23}, {4, 54}, {3, 34}, {5, 23}, {2, 23}, {7, 32}, {1, 12}};
 
     SortUnique(d, LessBy(&Pair::first), EqualsBy(&Pair::first));
 
@@ -48,8 +46,7 @@ void TestSortUnique()
   {
     using Value = double;
     using Pair = std::pair<Value, int>;
-    Cont<Pair> d =
-        {{0.5, 11}, {1000.99, 234}, {0.5, 23}, {1234.56789, 54}, {1000.99, 34}};
+    Cont<Pair> d = {{0.5, 11}, {1000.99, 234}, {0.5, 23}, {1234.56789, 54}, {1000.99, 34}};
 
     SortUnique(d, LessBy(&Pair::first), EqualsBy(&Pair::first));
 
@@ -155,17 +152,18 @@ UNIT_TEST(IgnoreFirstArgument)
 
 namespace
 {
-  struct EqualZero
-  {
-    bool operator() (int x) { return (x == 0); }
-  };
+struct EqualZero
+{
+  bool operator()(int x) { return (x == 0); }
+};
 
-  template <class ContT> void CheckNoZero(ContT & c, typename ContT::iterator i)
-  {
-    c.erase(i, c.end());
-    TEST(find_if(c.begin(), c.end(), EqualZero()) == c.end(), ());
-  }
+template <class ContT>
+void CheckNoZero(ContT & c, typename ContT::iterator i)
+{
+  c.erase(i, c.end());
+  TEST(find_if(c.begin(), c.end(), EqualZero()) == c.end(), ());
 }
+}  // namespace
 
 UNIT_TEST(RemoveIfKeepValid)
 {
@@ -222,20 +220,18 @@ UNIT_TEST(RemoveIfKeepValid)
 
 namespace
 {
-  template <class T, size_t N1, size_t N2, size_t N3>
-  void CheckAccumulateIntervals(size_t & idTest,
-                                std::pair<T, T> (&arr1)[N1],
-                                std::pair<T, T> (&arr2)[N2],
-                                std::pair<T, T> (&arr3)[N3])
-  {
-    std::vector<std::pair<T, T> > res;
-    AccumulateIntervals1With2(arr1, arr1 + N1, arr2, arr2 + N2, back_inserter(res));
+template <class T, size_t N1, size_t N2, size_t N3>
+void CheckAccumulateIntervals(size_t & idTest, std::pair<T, T> (&arr1)[N1], std::pair<T, T> (&arr2)[N2],
+                              std::pair<T, T> (&arr3)[N3])
+{
+  std::vector<std::pair<T, T>> res;
+  AccumulateIntervals1With2(arr1, arr1 + N1, arr2, arr2 + N2, back_inserter(res));
 
-    ++idTest;
-    TEST_EQUAL(N3, res.size(), ("Test", idTest, res));
-    TEST(equal(res.begin(), res.end(), arr3), ("Test", idTest, res));
-  }
+  ++idTest;
+  TEST_EQUAL(N3, res.size(), ("Test", idTest, res));
+  TEST(equal(res.begin(), res.end(), arr3), ("Test", idTest, res));
 }
+}  // namespace
 
 UNIT_TEST(AccumulateIntervals)
 {
@@ -245,7 +241,7 @@ UNIT_TEST(AccumulateIntervals)
   // bound cases
   {
     std::vector<T> res;
-    T arr[] = { T(10, 20) };
+    T arr[] = {T(10, 20)};
 
     res.clear();
     AccumulateIntervals1With2(arr, arr + 1, arr, arr, back_inserter(res));
@@ -258,71 +254,65 @@ UNIT_TEST(AccumulateIntervals)
 
   // check splice overlapped
   {
-    T arr1[] = { T(10, 20), T(30, 40) };
-    T arr2[] = { T(19, 31) };
-    T res[] = { T(10, 40) };
+    T arr1[] = {T(10, 20), T(30, 40)};
+    T arr2[] = {T(19, 31)};
+    T res[] = {T(10, 40)};
     CheckAccumulateIntervals(idTest, arr1, arr2, res);
   }
 
   // check skip not overlapped
   {
-    T arr1[] = { T(10, 20), T(30, 40) };
-    T arr2[] = { T(0, 9), T(21, 29), T(41, 50) };
-    T res[2] = { T(10, 20), T(30, 40) };
+    T arr1[] = {T(10, 20), T(30, 40)};
+    T arr2[] = {T(0, 9), T(21, 29), T(41, 50)};
+    T res[2] = {T(10, 20), T(30, 40)};
     CheckAccumulateIntervals(idTest, arr1, arr2, res);
   }
   {
-    T arr1[] = { T(10, 20), T(30, 40) };
-    T arr2[] = { T(1, 2), T(3, 4), T(5, 6),
-                 T(21, 22), T(23, 24), T(25, 26),
-                 T(41, 42), T(43, 44), T(45, 46)
-               };
-    T res[] = { T(10, 20), T(30, 40) };
+    T arr1[] = {T(10, 20), T(30, 40)};
+    T arr2[] = {T(1, 2), T(3, 4), T(5, 6), T(21, 22), T(23, 24), T(25, 26), T(41, 42), T(43, 44), T(45, 46)};
+    T res[] = {T(10, 20), T(30, 40)};
     CheckAccumulateIntervals(idTest, arr1, arr2, res);
   }
 
   // check equal bounds
   {
-    T arr1[] = { T(20, 30) };
-    T arr2[] = { T(10, 20), T(30, 40) };
-    T res[] = { T(20, 30) };
+    T arr1[] = {T(20, 30)};
+    T arr2[] = {T(10, 20), T(30, 40)};
+    T res[] = {T(20, 30)};
     CheckAccumulateIntervals(idTest, arr1, arr2, res);
   }
   {
-    T arr1[] = { T(10, 20), T(30, 40) };
-    T arr2[] = { T(20, 30) };
-    T res[] = { T(10, 20), T(30, 40) };
+    T arr1[] = {T(10, 20), T(30, 40)};
+    T arr2[] = {T(20, 30)};
+    T res[] = {T(10, 20), T(30, 40)};
     CheckAccumulateIntervals(idTest, arr1, arr2, res);
   }
 
   // check large overlap interval
   {
-    T arr1[] = { T(10, 20), T(30, 40), T(50, 60) };
-    T arr2[] = { T(0, 100) };
-    T res[] = { T(0, 100) };
+    T arr1[] = {T(10, 20), T(30, 40), T(50, 60)};
+    T arr2[] = {T(0, 100)};
+    T res[] = {T(0, 100)};
     CheckAccumulateIntervals(idTest, arr1, arr2, res);
   }
   {
-    T arr1[] = { T(0, 100) };
-    T arr2[] = { T(10, 20), T(30, 40), T(50, 60) };
-    T res[] = { T(0, 100) };
+    T arr1[] = {T(0, 100)};
+    T arr2[] = {T(10, 20), T(30, 40), T(50, 60)};
+    T res[] = {T(0, 100)};
     CheckAccumulateIntervals(idTest, arr1, arr2, res);
   }
 
   // check splice overlapped
   {
-    T arr1[] = { T(10, 20), T(30, 40) };
-    T arr2[] = { T(5, 15), T(35, 45) };
-    T res[] = { T(5, 20), T(30, 45) };
+    T arr1[] = {T(10, 20), T(30, 40)};
+    T arr2[] = {T(5, 15), T(35, 45)};
+    T res[] = {T(5, 20), T(30, 45)};
     CheckAccumulateIntervals(idTest, arr1, arr2, res);
   }
   {
-    T arr1[] = { T(10, 20), T(30, 40) };
-    T arr2[] = { T(1, 2), T(3, 4), T(5, 15),
-                 T(17, 25), T(26, 27), T(28, 32),
-                 T(38, 45), T(46, 50)
-               };
-    T res[] = { T(5, 25), T(28, 45) };
+    T arr1[] = {T(10, 20), T(30, 40)};
+    T arr2[] = {T(1, 2), T(3, 4), T(5, 15), T(17, 25), T(26, 27), T(28, 32), T(38, 45), T(46, 50)};
+    T res[] = {T(5, 25), T(28, 45)};
     CheckAccumulateIntervals(idTest, arr1, arr2, res);
   }
 }
@@ -353,6 +343,7 @@ UNIT_TEST(Map_EmplaceOrAssign)
 
       Obj(Obj const &) = delete;
       Obj & operator=(Obj const &) = delete;
+
     public:
       Obj(int v) : m_v(v) {}
       Obj(Obj &&) = default;
@@ -370,4 +361,4 @@ UNIT_TEST(Map_EmplaceOrAssign)
   }
 }
 
-}  // namespace stl_helpers_test
+}  // namespace stl_helpers_tests
diff --git a/libs/base/base_tests/string_utils_test.cpp b/libs/base/base_tests/string_utils_test.cpp
index 391419034..00490c447 100644
--- a/libs/base/base_tests/string_utils_test.cpp
+++ b/libs/base/base_tests/string_utils_test.cpp
@@ -114,7 +114,7 @@ UNIT_TEST(MakeLowerCase)
   TEST_EQUAL(MakeLowerCase("this_is_lower"), "this_is_lower", ());
 
   TEST_EQUAL(MakeLowerCase("Hola! 99-\xD0\xA3\xD0\x9F\xD0\xAF\xD0\xA7\xD0\x9A\xD0\x90"),
-                           "hola! 99-\xD1\x83\xD0\xBF\xD1\x8F\xD1\x87\xD0\xBA\xD0\xB0", ());
+             "hola! 99-\xD1\x83\xD0\xBF\xD1\x8F\xD1\x87\xD0\xBA\xD0\xB0", ());
 
   // es-cet
   TEST_EQUAL(MakeLowerCase("\xc3\x9f"), "ss", ());
@@ -249,7 +249,7 @@ void ToUIntTest(char const * p, bool good = false, uint32_t expected = 0)
   if (good)
     TEST(expected == i1 && expected == i2 && expected == i3, (s, i1, i2, i3));
 }
-} // namespace
+}  // namespace
 
 UNIT_TEST(to_uint)
 {
@@ -661,16 +661,12 @@ UNIT_TEST(to_string_width)
   TEST_EQUAL(strings::to_string_width(1073741824, 0), "1073741824", ());
 }
 
-
 struct FunctorTester
 {
   size_t & m_index;
   std::vector<std::string> const & m_tokens;
 
-  FunctorTester(size_t & counter, std::vector<std::string> const & tokens)
-    : m_index(counter), m_tokens(tokens)
-  {
-  }
+  FunctorTester(size_t & counter, std::vector<std::string> const & tokens) : m_index(counter), m_tokens(tokens) {}
 
   void operator()(std::string_view s) { TEST_EQUAL(s, m_tokens[m_index++], ()); }
 };
@@ -692,12 +688,11 @@ void TestIter(std::string const & s, char const * delims, std::vector<std::strin
   TEST_EQUAL(counter, tokens.size(), ());
 }
 
-void TestIterWithEmptyTokens(std::string const & s, char const * delims,
-                             std::vector<std::string> const & tokens)
+void TestIterWithEmptyTokens(std::string const & s, char const * delims, std::vector<std::string> const & tokens)
 {
   using namespace strings;
-  TokenizeIterator<SimpleDelimiter, std::string::const_iterator, true /* KeepEmptyTokens */>
-      it(s.begin(), s.end(), delims);
+  TokenizeIterator<SimpleDelimiter, std::string::const_iterator, true /* KeepEmptyTokens */> it(s.begin(), s.end(),
+                                                                                                delims);
 
   for (size_t i = 0; i < tokens.size(); ++i)
   {
@@ -728,8 +723,7 @@ UNIT_TEST(SimpleTokenizer)
   }
 
   {
-    char const * s[] = {"\xD9\x80", "\xD8\xA7\xD9\x84\xD9\x85\xD9\x88\xD8\xA7\xD9\x81\xD9\x82",
-                        "\xD8\xAC"};
+    char const * s[] = {"\xD9\x80", "\xD8\xA7\xD9\x84\xD9\x85\xD9\x88\xD8\xA7\xD9\x81\xD9\x82", "\xD8\xAC"};
     tokens.assign(&s[0], &s[0] + ARRAY_SIZE(s));
     TestIter(
         "\xD9\x87\xD9\x80 - \xD8\xA7\xD9\x84\xD9\x85\xD9\x88\xD8\xA7\xD9\x81\xD9\x82 "
@@ -826,8 +820,7 @@ UNIT_TEST(Normalize)
 {
   strings::UniChar const s[] = {0x1f101, 'H', 0xfef0, 0xfdfc, 0x2150};
   strings::UniString us(&s[0], &s[0] + ARRAY_SIZE(s));
-  strings::UniChar const r[] = {0x30,  0x2c,  'H',  0x649,  0x631, 0x6cc,
-                                0x627, 0x644, 0x31, 0x2044, 0x37};
+  strings::UniChar const r[] = {0x30, 0x2c, 'H', 0x649, 0x631, 0x6cc, 0x627, 0x644, 0x31, 0x2044, 0x37};
   strings::UniString result(&r[0], &r[0] + ARRAY_SIZE(r));
   strings::NormalizeInplace(us);
   TEST_EQUAL(us, result, ());
@@ -837,8 +830,7 @@ UNIT_TEST(Normalize_Special)
 {
   {
     std::string const utf8 = "ąĄćłŁÓŻźŃĘęĆ";
-    TEST_EQUAL(strings::ToUtf8(strings::Normalize(strings::MakeUniString(utf8))), "aAclLOZzNEeC",
-               ());
+    TEST_EQUAL(strings::ToUtf8(strings::Normalize(strings::MakeUniString(utf8))), "aAclLOZzNEeC", ());
   }
 
   {
@@ -847,69 +839,69 @@ UNIT_TEST(Normalize_Special)
   }
 }
 
-
 UNIT_TEST(Normalize_Arabic)
 {
   {
     // Test Arabic-Indic digits normalization
-    std::string const utf8       = "٠١٢٣٤٥٦٧٨٩";
+    std::string const utf8 = "٠١٢٣٤٥٦٧٨٩";
     std::string const normalized = "0123456789";
     TEST_EQUAL(strings::ToUtf8(strings::Normalize(strings::MakeUniString(utf8))), normalized, ());
   }
 
   {
     // Test Extended Arabic-Indic digits normalization
-    std::string const utf8       = "۰۱۲۳۴۵۶۷۸۹";
+    std::string const utf8 = "۰۱۲۳۴۵۶۷۸۹";
     std::string const normalized = "0123456789";
     TEST_EQUAL(strings::ToUtf8(strings::Normalize(strings::MakeUniString(utf8))), normalized, ());
   }
 
   {
     // All Arabic Letters (all of these are standalone unicode characters)
-    std::string const utf8       = "ء أ إ ا آ ٱ ٲ ٳ ٵ ب ت ة ۃ ث ج ح خ د ذ ر ز س ش ص ط ظ ع غ ف ق ك ل م ن ه ۀ ۂ ؤ ٶ ٷ و ي ى ئ ٸ ے ۓ";
-    std::string const normalized = "ء ا ا ا ا ا ا ا ا ب ت ه ه ث ج ح خ د ذ ر ز س ش ص ط ظ ع غ ف ق ك ل م ن ه ه ه و و و و ي ي ي ي ے ے";
-    TEST_EQUAL(strings::ToUtf8(strings::Normalize(strings::MakeUniString(utf8))), normalized , ());
+    std::string const utf8 =
+        "ء أ إ ا آ ٱ ٲ ٳ ٵ ب ت ة ۃ ث ج ح خ د ذ ر ز س ش ص ط ظ ع غ ف ق ك ل م ن ه ۀ ۂ ؤ ٶ ٷ و ي ى ئ ٸ ے ۓ";
+    std::string const normalized =
+        "ء ا ا ا ا ا ا ا ا ب ت ه ه ث ج ح خ د ذ ر ز س ش ص ط ظ ع غ ف ق ك ل م ن ه ه ه و و و و ي ي ي ي ے ے";
+    TEST_EQUAL(strings::ToUtf8(strings::Normalize(strings::MakeUniString(utf8))), normalized, ());
   }
 
   {
     // Test Removing Arabic Diacritics (Tashkeel), we can add multiple diacritics to the same letter
     // Each diacritic is a standalone unicode character
-    std::string const utf8       = "هَذِهْٜ تَّجُّرًّبهٌ عَلَىٰ إِزَالْهٍ ألتَشٗكُيٓلُ وَّ ليٙسٝت دقٞيٛقٚه لُغَويًّاً";
+    std::string const utf8 = "هَذِهْٜ تَّجُّرًّبهٌ عَلَىٰ إِزَالْهٍ ألتَشٗكُيٓلُ وَّ ليٙسٝت دقٞيٛقٚه لُغَويًّاً";
     std::string const normalized = "هذه تجربه علي ازاله التشكيل و ليست دقيقه لغويا";
-    TEST_EQUAL(strings::ToUtf8(strings::Normalize(strings::MakeUniString(utf8))), normalized , ());
+    TEST_EQUAL(strings::ToUtf8(strings::Normalize(strings::MakeUniString(utf8))), normalized, ());
   }
 
   {
     // Test Removing Arabic Islamic Honorifics
     // These are standalone unicode characters that can be applied to a letter
-    std::string const utf8       = "صؐلي  عنؑه رحؒمه رضؓي سؔ طؕ الىؖ زؗ اؘ اؙ ؚا";
+    std::string const utf8 = "صؐلي  عنؑه رحؒمه رضؓي سؔ طؕ الىؖ زؗ اؘ اؙ ؚا";
     std::string const normalized = "صلي  عنه رحمه رضي س ط الي ز ا ا ا";
-    TEST_EQUAL(strings::ToUtf8(strings::Normalize(strings::MakeUniString(utf8))), normalized , ());
+    TEST_EQUAL(strings::ToUtf8(strings::Normalize(strings::MakeUniString(utf8))), normalized, ());
   }
 
   {
     // Test Removing Arabic Quranic Annotations
     // These are standalone unicode characters that can be applied to a letter
-    std::string const utf8       = "نۖ بۗ مۘ لۙا جۛ جۚ سۜ ا۟ ا۠ اۡ مۢ  ۣس  نۤ  ك۪  ك۫  ك۬ مۭ";
+    std::string const utf8 = "نۖ بۗ مۘ لۙا جۛ جۚ سۜ ا۟ ا۠ اۡ مۢ  ۣس  نۤ  ك۪  ك۫  ك۬ مۭ";
     std::string const normalized = "ن ب م لا ج ج س ا ا ا م  س  ن  ك  ك  ك م";
-    TEST_EQUAL(strings::ToUtf8(strings::Normalize(strings::MakeUniString(utf8))), normalized , ());
+    TEST_EQUAL(strings::ToUtf8(strings::Normalize(strings::MakeUniString(utf8))), normalized, ());
   }
 
   {
     // Tests Arabic Tatweel (Kashida) normalization
     // This character is used to elongate text in Arabic script, (used in justifing/aligning text)
-    std::string const utf8       = "اميـــــن";
-    std::string const normalized =      "امين";
-    TEST_EQUAL(strings::ToUtf8(strings::Normalize(strings::MakeUniString(utf8))), normalized , ());
+    std::string const utf8 = "اميـــــن";
+    std::string const normalized = "امين";
+    TEST_EQUAL(strings::ToUtf8(strings::Normalize(strings::MakeUniString(utf8))), normalized, ());
   }
 
   {
     // Tests Arabic Comma normalization
-    std::string const utf8       = "،";
+    std::string const utf8 = "،";
     std::string const normalized = ",";
-    TEST_EQUAL(strings::ToUtf8(strings::Normalize(strings::MakeUniString(utf8))), normalized , ());
+    TEST_EQUAL(strings::ToUtf8(strings::Normalize(strings::MakeUniString(utf8))), normalized, ());
   }
-
 }
 
 UNIT_TEST(UniStringToUtf8)
@@ -957,27 +949,15 @@ UNIT_TEST(EatPrefix_EatSuffix)
 {
   // <original string, prefix/suffix to cut, success, string after cutting>
   std::vector<std::tuple<std::string, std::string, bool, std::string>> kPrefixTestcases = {
-    {"abc", "a", true, "bc"},
-    {"abc", "b", false, "abc"},
-    {"abc", "", true, "abc"},
-    {"abc", "abc", true, ""},
-    {"abc", "abc00", false, "abc"},
-    {"", "", true, ""},
-    {"абв", "а", true, "бв"},
-    {"абв", "б", false, "абв"},
-    {"字符串", "字", true, "符串"},
+      {"abc", "a", true, "bc"}, {"abc", "b", false, "abc"},     {"abc", "", true, "abc"},
+      {"abc", "abc", true, ""}, {"abc", "abc00", false, "abc"}, {"", "", true, ""},
+      {"абв", "а", true, "бв"}, {"абв", "б", false, "абв"},     {"字符串", "字", true, "符串"},
   };
 
   std::vector<std::tuple<std::string, std::string, bool, std::string>> kSuffixTestcases = {
-    {"abc", "c", true, "ab"},
-    {"abc", "b", false, "abc"},
-    {"abc", "", true, "abc"},
-    {"abc", "abc", true, ""},
-    {"abc", "00abc", false, "abc"},
-    {"", "", true, ""},
-    {"абв", "в", true, "аб"},
-    {"абв", "б", false, "абв"},
-    {"字符串", "串", true, "字符"},
+      {"abc", "c", true, "ab"}, {"abc", "b", false, "abc"},     {"abc", "", true, "abc"},
+      {"abc", "abc", true, ""}, {"abc", "00abc", false, "abc"}, {"", "", true, ""},
+      {"абв", "в", true, "аб"}, {"абв", "б", false, "абв"},     {"字符串", "串", true, "字符"},
   };
 
   for (auto const & [original, toCut, success, afterCutting] : kPrefixTestcases)
@@ -1121,9 +1101,8 @@ UNIT_TEST(AlmostEqual)
 
 UNIT_TEST(EditDistance)
 {
-  auto testEditDistance = [](std::string const & s1, std::string const & s2, uint32_t expected) {
-    TEST_EQUAL(strings::EditDistance(s1.begin(), s1.end(), s2.begin(), s2.end()), expected, ());
-  };
+  auto testEditDistance = [](std::string const & s1, std::string const & s2, uint32_t expected)
+  { TEST_EQUAL(strings::EditDistance(s1.begin(), s1.end(), s2.begin(), s2.end()), expected, ()); };
 
   testEditDistance("", "wwwww", 5);
   testEditDistance("", "", 0);
@@ -1135,8 +1114,8 @@ UNIT_TEST(EditDistance)
   testEditDistance("aaaab", "aaaac", 1);
   testEditDistance("a spaces test", "aspacestest", 2);
 
-  auto testUniStringEditDistance = [](std::string const & utf1, std::string const & utf2,
-                                      uint32_t expected) {
+  auto testUniStringEditDistance = [](std::string const & utf1, std::string const & utf2, uint32_t expected)
+  {
     auto s1 = strings::MakeUniString(utf1);
     auto s2 = strings::MakeUniString(utf2);
     TEST_EQUAL(strings::EditDistance(s1.begin(), s1.end(), s2.begin(), s2.end()), expected, ());
@@ -1148,7 +1127,8 @@ UNIT_TEST(EditDistance)
 
 UNIT_TEST(NormalizeDigits)
 {
-  auto const nd = [](std::string str) -> std::string {
+  auto const nd = [](std::string str) -> std::string
+  {
     strings::NormalizeDigits(str);
     return str;
   };
@@ -1160,7 +1140,8 @@ UNIT_TEST(NormalizeDigits)
 
 UNIT_TEST(NormalizeDigits_UniString)
 {
-  auto const nd = [](std::string const & utf8) -> std::string {
+  auto const nd = [](std::string const & utf8) -> std::string
+  {
     strings::UniString us = strings::MakeUniString(utf8);
     strings::NormalizeDigits(us);
     return strings::ToUtf8(us);
@@ -1187,34 +1168,32 @@ UNIT_TEST(CSV)
 
 UNIT_TEST(UniString_Replace)
 {
-  std::vector<std::string> const testStrings = {
-      "longlong",
-      "ss",
-      "samesize",
-      "sometext longlong",
-      "sometext ss",
-      "sometext samesize",
-      "longlong sometext",
-      "ss sometext",
-      "samesize sometext",
-      "longlong ss samesize",
-      "sometext longlong sometext ss samesize sometext",
-      "длинная строка",
-      "к с",
-      "такая же строка",
-      "sometext длинная строка",
-      "sometext к с",
-      "sometext такая же строка",
-      "длинная строка sometext",
-      "к с sometext",
-      "samesize sometext",
-      "длинная строка к с samesize",
-      "sometext длинная строка sometext к с такая же строка sometext"};
+  std::vector<std::string> const testStrings = {"longlong",
+                                                "ss",
+                                                "samesize",
+                                                "sometext longlong",
+                                                "sometext ss",
+                                                "sometext samesize",
+                                                "longlong sometext",
+                                                "ss sometext",
+                                                "samesize sometext",
+                                                "longlong ss samesize",
+                                                "sometext longlong sometext ss samesize sometext",
+                                                "длинная строка",
+                                                "к с",
+                                                "такая же строка",
+                                                "sometext длинная строка",
+                                                "sometext к с",
+                                                "sometext такая же строка",
+                                                "длинная строка sometext",
+                                                "к с sometext",
+                                                "samesize sometext",
+                                                "длинная строка к с samesize",
+                                                "sometext длинная строка sometext к с такая же строка sometext"};
 
   std::vector<std::pair<std::string, std::string>> const replacements = {
-      {"longlong", "ll"},         {"ss", "shortshort"},
-      {"samesize", "sizesame"},   {"длинная строка", "д с"},
-      {"к с", "короткая строка"}, {"такая же строка", "строка такая же"}};
+      {"longlong", "ll"},        {"ss", "shortshort"},       {"samesize", "sizesame"},
+      {"длинная строка", "д с"}, {"к с", "короткая строка"}, {"такая же строка", "строка такая же"}};
 
   for (auto testString : testStrings)
   {
@@ -1260,7 +1239,7 @@ void TestTrim(std::string const & str, std::string const & expected)
 
   TEST(expected == copy && expected == sv, (str));
 }
-} // namespace
+}  // namespace
 
 UNIT_TEST(Trim)
 {
diff --git a/libs/base/base_tests/suffix_array_tests.cpp b/libs/base/base_tests/suffix_array_tests.cpp
index 8d368b18a..4259b66d3 100644
--- a/libs/base/base_tests/suffix_array_tests.cpp
+++ b/libs/base/base_tests/suffix_array_tests.cpp
@@ -13,7 +13,10 @@ using namespace std;
 
 namespace
 {
-UNIT_TEST(Skew_Smoke) { Skew(0, nullptr /* s */, nullptr /* sa */); }
+UNIT_TEST(Skew_Smoke)
+{
+  Skew(0, nullptr /* s */, nullptr /* sa */);
+}
 
 UNIT_TEST(Skew_Simple)
 {
@@ -71,7 +74,7 @@ UNIT_TEST(Skew_Classic)
   TEST_EQUAL(n, 11, ());
 
   vector<size_t> pos(n);
-  Skew(n, reinterpret_cast<const uint8_t *>(s), pos.data());
+  Skew(n, reinterpret_cast<uint8_t const *>(s), pos.data());
 
   TEST_STR_EQUAL("i", s + pos[0], ());
   TEST_STR_EQUAL("ippi", s + pos[1], ());
diff --git a/libs/base/base_tests/thread_pool_computational_tests.cpp b/libs/base/base_tests/thread_pool_computational_tests.cpp
index 8c13a14a0..a5780dc22 100644
--- a/libs/base/base_tests/thread_pool_computational_tests.cpp
+++ b/libs/base/base_tests/thread_pool_computational_tests.cpp
@@ -23,7 +23,8 @@ UNIT_TEST(ThreadPoolComputational_SomeThreads)
       base::ComputationalThreadPool threadPool(threadCount);
       for (size_t i = 0; i < threadCount; ++i)
       {
-        threadPool.Submit([&]() {
+        threadPool.Submit([&]()
+        {
           threads::Sleep(1);
           ++counter;
         });
@@ -44,7 +45,8 @@ UNIT_TEST(ThreadPoolComputational_OneThread)
       base::ComputationalThreadPool threadPool(threadCount);
       for (size_t i = 0; i < threadCount; ++i)
       {
-        threadPool.Submit([&]() {
+        threadPool.Submit([&]()
+        {
           threads::Sleep(1);
           ++counter;
         });
@@ -67,7 +69,8 @@ UNIT_TEST(ThreadPoolComputational_ManyThread)
       base::ComputationalThreadPool threadPool(threadCount);
       for (size_t i = 0; i < threadCount; ++i)
       {
-        threadPool.Submit([&]() {
+        threadPool.Submit([&]()
+        {
           threads::Sleep(1);
           ++counter;
         });
@@ -87,7 +90,8 @@ UNIT_TEST(ThreadPoolComputational_ReturnValue)
     std::vector<std::future<size_t>> futures;
     for (size_t i = 0; i < threadCount; ++i)
     {
-      auto f = threadPool.Submit([=]() {
+      auto f = threadPool.Submit([=]()
+      {
         threads::Sleep(1);
         return i;
       });
@@ -110,7 +114,8 @@ UNIT_TEST(ThreadPoolComputational_ManyTasks)
       base::ComputationalThreadPool threadPool(4);
       for (size_t i = 0; i < taskCount; ++i)
       {
-        threadPool.Submit([&]() {
+        threadPool.Submit([&]()
+        {
           threads::Sleep(1);
           ++counter;
         });
diff --git a/libs/base/base_tests/thread_pool_delayed_tests.cpp b/libs/base/base_tests/thread_pool_delayed_tests.cpp
index 5ca47d625..6ada441aa 100644
--- a/libs/base/base_tests/thread_pool_delayed_tests.cpp
+++ b/libs/base/base_tests/thread_pool_delayed_tests.cpp
@@ -2,12 +2,11 @@
 
 #include "base/thread_pool_delayed.hpp"
 
-#include <condition_variable>
 #include <chrono>
+#include <condition_variable>
 #include <future>
 #include <mutex>
 
-
 namespace thread_pool_delayed_tests
 {
 using namespace base;
@@ -52,7 +51,8 @@ UNIT_TEST(ThreadPoolDelayed_SimpleSync)
   TEST(pushResult.m_isSuccess, ());
   TEST_NOT_EQUAL(pushResult.m_id, DelayedThreadPool::kNoId, ());
 
-  pushResult = thread.Push([&]() {
+  pushResult = thread.Push([&]()
+  {
     lock_guard<mutex> lk(mu);
     done = true;
     cv.notify_one();
@@ -77,7 +77,8 @@ UNIT_TEST(ThreadPoolDelayed_SimpleFlush)
     TEST(pushResult.m_isSuccess, ());
     TEST_NOT_EQUAL(pushResult.m_id, DelayedThreadPool::kNoId, ());
 
-    pushResult = thread.Push([&value]() {
+    pushResult = thread.Push([&value]()
+    {
       for (int i = 0; i < 10; ++i)
         value *= 2;
     });
@@ -97,7 +98,8 @@ UNIT_TEST(ThreadPoolDelayed_PushFromPendingTask)
   auto f = p.get_future();
 
   DelayedThreadPool thread;
-  auto const pushResult = thread.Push([&f, &thread]() {
+  auto const pushResult = thread.Push([&f, &thread]()
+  {
     f.get();
     auto const innerPushResult = thread.Push([]() { TEST(false, ("This task should not be executed")); });
     TEST(!innerPushResult.m_isSuccess, ());
@@ -157,10 +159,7 @@ UNIT_TEST(ThreadPoolDelayed_DelayedAndImmediateTasks)
   }
 
   for (int i = 1; i < kNumTasks; ++i)
-  {
-    TEST(immediateEntries[i] >= immediateEntries[i - 1],
-         ("Failed delay for the immediate task", i));
-  }
+    TEST(immediateEntries[i] >= immediateEntries[i - 1], ("Failed delay for the immediate task", i));
 }
 
 UNIT_TEST(ThreadPoolDelayed_CancelImmediate)
@@ -171,7 +170,8 @@ UNIT_TEST(ThreadPoolDelayed_CancelImmediate)
     TaskLoop::TaskId cancelTaskId;
     DelayedThreadPool thread;
     {
-      auto const pushResult = thread.Push([&value]() {
+      auto const pushResult = thread.Push([&value]()
+      {
         ++value;
         testing::Wait();
       });
@@ -246,4 +246,4 @@ UNIT_TEST(ThreadPoolDelayed_CancelDelayed)
   TEST_EQUAL(value, 2, ());
 }
 
-} // namespace thread_pool_delayed_tests
+}  // namespace thread_pool_delayed_tests
diff --git a/libs/base/base_tests/thread_pool_tests.cpp b/libs/base/base_tests/thread_pool_tests.cpp
index c61811ce6..3b7e8a1c4 100644
--- a/libs/base/base_tests/thread_pool_tests.cpp
+++ b/libs/base/base_tests/thread_pool_tests.cpp
@@ -6,48 +6,39 @@
 #include <condition_variable>
 #include <functional>
 
-
 namespace
 {
-  const int TASK_COUNT = 10;
-  class CanceledTask : public threads::IRoutine
-  {
-  public:
-    CanceledTask()
-    {
-      Cancel();
-    }
+int const TASK_COUNT = 10;
+class CanceledTask : public threads::IRoutine
+{
+public:
+  CanceledTask() { Cancel(); }
 
-    virtual void Do()
-    {
-      TEST_EQUAL(true, false, ());
-    }
-  };
-  struct Condition
-  {
-    std::mutex m;
-    std::condition_variable cv;
-  };
+  virtual void Do() { TEST_EQUAL(true, false, ()); }
+};
+struct Condition
+{
+  std::mutex m;
+  std::condition_variable cv;
+};
 
-  void JoinFinishFunction(threads::IRoutine * routine,
-                          int & finishCounter,
-                          Condition & cond)
-  {
-    cond.m.lock();
-    finishCounter++;
-    cond.m.unlock();
+void JoinFinishFunction(threads::IRoutine * routine, int & finishCounter, Condition & cond)
+{
+  cond.m.lock();
+  finishCounter++;
+  cond.m.unlock();
 
-    delete routine;
-    cond.cv.notify_one();
-  }
+  delete routine;
+  cond.cv.notify_one();
 }
+}  // namespace
 
 UNIT_TEST(ThreadPool_CanceledTaskTest)
 {
   int finishCounter = 0;
   Condition cond;
-  base::ThreadPool pool(4, std::bind(&JoinFinishFunction, std::placeholders::_1,
-                                     std::ref(finishCounter), std::ref(cond)));
+  base::ThreadPool pool(4,
+                        std::bind(&JoinFinishFunction, std::placeholders::_1, std::ref(finishCounter), std::ref(cond)));
 
   for (int i = 0; i < TASK_COUNT; ++i)
     pool.PushBack(new CanceledTask());
@@ -57,42 +48,34 @@ UNIT_TEST(ThreadPool_CanceledTaskTest)
   TEST_EQUAL(finishCounter, TASK_COUNT, ());
 }
 
-
 namespace
 {
-  class CancelTestTask : public threads::IRoutine
+class CancelTestTask : public threads::IRoutine
+{
+public:
+  explicit CancelTestTask(bool isWaitDoCall) : m_waitDoCall(isWaitDoCall), m_doCalled(false) {}
+
+  ~CancelTestTask() { TEST_EQUAL(m_waitDoCall, m_doCalled, ()); }
+
+  virtual void Do()
   {
-  public:
-    explicit CancelTestTask(bool isWaitDoCall)
-      : m_waitDoCall(isWaitDoCall)
-      , m_doCalled(false)
-    {
-    }
+    TEST_EQUAL(m_waitDoCall, true, ());
+    m_doCalled = true;
+    threads::Sleep(100);
+  }
 
-    ~CancelTestTask()
-    {
-      TEST_EQUAL(m_waitDoCall, m_doCalled, ());
-    }
-
-    virtual void Do()
-    {
-      TEST_EQUAL(m_waitDoCall, true, ());
-      m_doCalled = true;
-      threads::Sleep(100);
-    }
-
-  private:
-    bool m_waitDoCall;
-    bool m_doCalled;
-  };
-}
+private:
+  bool m_waitDoCall;
+  bool m_doCalled;
+};
+}  // namespace
 
 UNIT_TEST(ThreadPool_ExecutionTaskTest)
 {
   int finishCounter = 0;
   Condition cond;
-  base::ThreadPool pool(4, std::bind(&JoinFinishFunction, std::placeholders::_1,
-                                     std::ref(finishCounter), std::ref(cond)));
+  base::ThreadPool pool(4,
+                        std::bind(&JoinFinishFunction, std::placeholders::_1, std::ref(finishCounter), std::ref(cond)));
 
   for (int i = 0; i < TASK_COUNT - 1; ++i)
     pool.PushBack(new CancelTestTask(true));
@@ -102,7 +85,7 @@ UNIT_TEST(ThreadPool_ExecutionTaskTest)
   pool.PushBack(p);
   p->Cancel();
 
-  while(true)
+  while (true)
   {
     std::unique_lock lock(cond.m);
     if (finishCounter == TASK_COUNT)
@@ -115,8 +98,8 @@ UNIT_TEST(ThreadPool_EmptyTest)
 {
   int finishCouter = 0;
   Condition cond;
-  base::ThreadPool pool(4, std::bind(&JoinFinishFunction, std::placeholders::_1,
-                                     std::ref(finishCouter), std::ref(cond)));
+  base::ThreadPool pool(4,
+                        std::bind(&JoinFinishFunction, std::placeholders::_1, std::ref(finishCouter), std::ref(cond)));
 
   threads::Sleep(100);
   pool.Stop();
diff --git a/libs/base/base_tests/thread_safe_queue_tests.cpp b/libs/base/base_tests/thread_safe_queue_tests.cpp
index 2e4a5a776..d401eb9f6 100644
--- a/libs/base/base_tests/thread_safe_queue_tests.cpp
+++ b/libs/base/base_tests/thread_safe_queue_tests.cpp
@@ -6,7 +6,6 @@
 #include <optional>
 #include <thread>
 
-
 UNIT_TEST(ThreadSafeQueue_ThreadSafeQueue)
 {
   threads::ThreadSafeQueue<size_t> queue;
@@ -21,11 +20,7 @@ UNIT_TEST(ThreadSafeQueue_Push)
   threads::ThreadSafeQueue<size_t> queue;
   base::DelayedThreadPool pool(2, base::DelayedThreadPool::Exit::ExecPending);
   for (size_t i = 0; i < kSize; ++i)
-  {
-    pool.Push([&, i](){
-      queue.Push(i);
-    });
-  }
+    pool.Push([&, i]() { queue.Push(i); });
 
   pool.ShutdownAndJoin();
 
@@ -38,7 +33,8 @@ UNIT_TEST(ThreadSafeQueue_WaitAndPop)
   threads::ThreadSafeQueue<size_t> queue;
   size_t const value = 101;
   size_t result;
-  auto thread = std::thread([&]() {
+  auto thread = std::thread([&]()
+  {
     std::this_thread::sleep_for(10ms);
     queue.Push(value);
   });
@@ -56,7 +52,8 @@ UNIT_TEST(ThreadSafeQueue_TryPop)
   threads::ThreadSafeQueue<size_t> queue;
   size_t const value = 101;
   size_t result;
-  auto thread = std::thread([&]() {
+  auto thread = std::thread([&]()
+  {
     std::this_thread::sleep_for(10ms);
     queue.Push(value);
   });
@@ -73,7 +70,8 @@ UNIT_TEST(ThreadSafeQueue_ExampleWithDataWrapper)
   size_t const kSize = 100000;
   threads::ThreadSafeQueue<std::optional<size_t>> queue;
 
-  auto thread = std::thread([&]() {
+  auto thread = std::thread([&]()
+  {
     while (true)
     {
       std::optional<size_t> dw;
@@ -87,14 +85,8 @@ UNIT_TEST(ThreadSafeQueue_ExampleWithDataWrapper)
 
   base::DelayedThreadPool pool(4, base::DelayedThreadPool::Exit::ExecPending);
   for (size_t i = 0; i < kSize; ++i)
-  {
-    pool.Push([&, i](){
-      queue.Push(i);
-    });
-  }
-  pool.Push([&](){
-    queue.Push({});
-  });
+    pool.Push([&, i]() { queue.Push(i); });
+  pool.Push([&]() { queue.Push({}); });
 
   thread.join();
 }
diff --git a/libs/base/base_tests/threaded_list_test.cpp b/libs/base/base_tests/threaded_list_test.cpp
index 610017a76..a9e32471b 100644
--- a/libs/base/base_tests/threaded_list_test.cpp
+++ b/libs/base/base_tests/threaded_list_test.cpp
@@ -1,8 +1,8 @@
 #include "testing/testing.hpp"
 
-#include "base/threaded_list.hpp"
-#include "base/thread.hpp"
 #include "base/logging.hpp"
+#include "base/thread.hpp"
+#include "base/threaded_list.hpp"
 
 #include <memory>
 #include <mutex>
@@ -15,9 +15,11 @@ struct ThreadedListProcessor : public threads::IRoutine
   int m_id;
 
   ThreadedListProcessor(ThreadedList<int> & p, std::mutex & resMutex, std::list<int> & res, int id)
-      : m_p(p), m_resMutex(resMutex), m_res(res), m_id(id)
-  {
-  }
+    : m_p(p)
+    , m_resMutex(resMutex)
+    , m_res(res)
+    , m_id(id)
+  {}
 
   virtual void Do()
   {
diff --git a/libs/base/base_tests/threads_test.cpp b/libs/base/base_tests/threads_test.cpp
index 369008727..f4c2d1078 100644
--- a/libs/base/base_tests/threads_test.cpp
+++ b/libs/base/base_tests/threads_test.cpp
@@ -2,8 +2,8 @@
 
 #include "base/thread.hpp"
 
-#include <vector>
 #include <memory>
+#include <vector>
 
 using Vector = std::vector<int>;
 
@@ -38,20 +38,19 @@ struct ReaderThread : public threads::IRoutine
   Vector & m_vec;
 };
 
-
 UNIT_TEST(Simple_Threads)
 {
   Vector vec;
 
   threads::Thread reader;
   bool ok = reader.Create(std::make_unique<GeneratorThread>(vec));
-  TEST( ok, ("Create Generator thread") );
+  TEST(ok, ("Create Generator thread"));
 
   reader.Join();
 
   threads::Thread writer;
   ok = writer.Create(std::make_unique<ReaderThread>(vec));
-  TEST( ok, ("Create Reader thread") );
+  TEST(ok, ("Create Reader thread"));
 
   writer.Join();
 
@@ -65,10 +64,7 @@ class SomeClass
 
 public:
   SomeClass() {}
-  void Increment(int * a, int b)
-  {
-    *a = *a + b;
-  }
+  void Increment(int * a, int b) { *a = *a + b; }
 };
 
 static void Increment(int * a, int b)
@@ -80,7 +76,7 @@ UNIT_TEST(SimpleThreadTest1)
 {
   int a = 0;
 
-  auto fn = [&a](){ a = 1; };
+  auto fn = [&a]() { a = 1; };
 
   threads::SimpleThread t(fn);
   t.join();
@@ -92,7 +88,7 @@ UNIT_TEST(SimpleThreadTest2)
 {
   int a = 0;
 
-  threads::SimpleThread t([&a](){ a = 1; });
+  threads::SimpleThread t([&a]() { a = 1; });
   t.join();
 
   TEST_EQUAL(a, 1, ("test a"));
diff --git a/libs/base/base_tests/timer_test.cpp b/libs/base/base_tests/timer_test.cpp
index eaa083aeb..d9c680d66 100644
--- a/libs/base/base_tests/timer_test.cpp
+++ b/libs/base/base_tests/timer_test.cpp
@@ -1,8 +1,7 @@
 #include "testing/testing.hpp"
 
-#include "base/timer.hpp"
 #include "base/logging.hpp"
-
+#include "base/timer.hpp"
 
 UNIT_TEST(Timer_Seconds)
 {
@@ -11,7 +10,7 @@ UNIT_TEST(Timer_Seconds)
   double t1 = timer.ElapsedSeconds();
   double s = 0.0;
   for (int i = 0; i < 10000000; ++i)
-    s += i*0.01;
+    s += i * 0.01;
   double t2 = timer.ElapsedSeconds();
 
   TEST_NOT_EQUAL(s, 0.0, ("Fictive, to prevent loop optimization"));
diff --git a/libs/base/beam.hpp b/libs/base/beam.hpp
index cc633aada..d885c4ee5 100644
--- a/libs/base/beam.hpp
+++ b/libs/base/beam.hpp
@@ -103,10 +103,7 @@ public:
     bool operator<(Entry const & rhs) const { return m_value > rhs.m_value; }
   };
 
-  explicit HeapBeam(size_t capacity) : m_capacity(capacity), m_size(0)
-  {
-    m_entries.reserve(m_capacity);
-  }
+  explicit HeapBeam(size_t capacity) : m_capacity(capacity), m_size(0) { m_entries.reserve(m_capacity); }
 
   // Tries to add a key-value pair to the beam. Evicts the entry with the lowest
   // value if the insertion would result in an overspill.
diff --git a/libs/base/bidirectional_map.hpp b/libs/base/bidirectional_map.hpp
index 18bb902b0..95be7b196 100644
--- a/libs/base/bidirectional_map.hpp
+++ b/libs/base/bidirectional_map.hpp
@@ -7,10 +7,8 @@ namespace base
 {
 // A bidirectional map to store a one-to-one correspondence between
 // keys and values.
-template <typename K, typename V,
-          template <typename ...> typename KToVMap = std::unordered_map,
-          typename KToVHashOrComparator = std::hash<K>,
-          template <typename ...> typename VToKMap = std::unordered_map,
+template <typename K, typename V, template <typename...> typename KToVMap = std::unordered_map,
+          typename KToVHashOrComparator = std::hash<K>, template <typename...> typename VToKMap = std::unordered_map,
           typename VToKHashOrComparator = std::hash<V>>
 class BidirectionalMap
 {
diff --git a/libs/base/bits.hpp b/libs/base/bits.hpp
index 7c90a142b..b0b9d0503 100644
--- a/libs/base/bits.hpp
+++ b/libs/base/bits.hpp
@@ -10,7 +10,8 @@ namespace bits
 {
 static constexpr int SELECT1_ERROR = -1;
 
-template <typename T> unsigned int select1(T x, unsigned int i)
+template <typename T>
+unsigned int select1(T x, unsigned int i)
 {
   // TODO: Fast implementation of select1.
   ASSERT(i > 0 && i <= sizeof(T) * 8, (i));
@@ -104,17 +105,27 @@ inline void SetBitTo1(void * p, uint32_t offset)
 // Compute number of zero bits from the most significant bits side.
 constexpr uint32_t NumHiZeroBits32(uint32_t n)
 {
-  if (n == 0) return 32;
+  if (n == 0)
+    return 32;
   uint32_t result = 0;
-  while ((n & (uint32_t{1} << 31)) == 0) { ++result; n <<= 1; }
+  while ((n & (uint32_t{1} << 31)) == 0)
+  {
+    ++result;
+    n <<= 1;
+  }
   return result;
 }
 
 constexpr uint32_t NumHiZeroBits64(uint64_t n)
 {
-  if (n == 0) return 64;
+  if (n == 0)
+    return 64;
   uint32_t result = 0;
-  while ((n & (uint64_t{1} << 63)) == 0) { ++result; n <<= 1; }
+  while ((n & (uint64_t{1} << 63)) == 0)
+  {
+    ++result;
+    n <<= 1;
+  }
   return result;
 }
 
@@ -123,16 +134,22 @@ constexpr uint32_t NumHiZeroBits64(uint64_t n)
 constexpr uint32_t NumUsedBits(uint64_t n)
 {
   uint32_t result = 0;
-  while (n != 0) { ++result; n >>= 1; }
+  while (n != 0)
+  {
+    ++result;
+    n >>= 1;
+  }
   return result;
 }
 
 constexpr uint64_t GetFullMask(uint8_t numBits)
 {
   ASSERT_LESS_OR_EQUAL(numBits, 64, ());
-  return numBits == 64 ? std::numeric_limits<uint64_t>::max()
-                       : (static_cast<uint64_t>(1) << numBits) - 1;
+  return numBits == 64 ? std::numeric_limits<uint64_t>::max() : (static_cast<uint64_t>(1) << numBits) - 1;
 }
 
-constexpr bool IsPow2Minus1(uint64_t n) { return (n & (n + 1)) == 0; }
+constexpr bool IsPow2Minus1(uint64_t n)
+{
+  return (n & (n + 1)) == 0;
+}
 }  // namespace bits
diff --git a/libs/base/buffer_vector.hpp b/libs/base/buffer_vector.hpp
index 234852bae..5eb864a82 100644
--- a/libs/base/buffer_vector.hpp
+++ b/libs/base/buffer_vector.hpp
@@ -16,12 +16,14 @@ void Swap(T & a, T & b)
   swap(a, b);
 }
 
-
 template <class T, size_t N>
 class buffer_vector
 {
 private:
-  enum { USE_DYNAMIC = N + 1 };
+  enum
+  {
+    USE_DYNAMIC = N + 1
+  };
   // TODO (@gmoryes) consider std::aligned_storage
   T m_static[N];
   size_t m_size;
@@ -47,7 +49,7 @@ private:
     m_size = newSize;
   }
 
-  static constexpr size_t SwitchCapacity() { return 3*N/2 + 1; }
+  static constexpr size_t SwitchCapacity() { return 3 * N / 2 + 1; }
 
 public:
   typedef T value_type;
@@ -58,10 +60,7 @@ public:
   typedef T * iterator;
 
   buffer_vector() : m_size(0) {}
-  explicit buffer_vector(size_t n) : m_size(0)
-  {
-    resize(n);
-  }
+  explicit buffer_vector(size_t n) : m_size(0) { resize(n); }
 
   buffer_vector(std::initializer_list<T> init) : m_size(0)
   {
@@ -243,10 +242,10 @@ public:
 
   T const * begin() const { return data(); }
   T const * cbegin() const { return data(); }
-  T       * begin()       { return data(); }
+  T * begin() { return data(); }
   T const * end() const { return data() + size(); }
   T const * cend() const { return data() + size(); }
-  T       * end()       { return data() + size(); }
+  T * end() { return data() + size(); }
   //@}
 
   bool empty() const { return (IsDynamic() ? m_dynamic.empty() : m_size == 0); }
@@ -304,7 +303,7 @@ public:
       if (m_size < N)
       {
         m_static[m_size] = std::move(t);
-        ++m_size; // keep basic exception safety here
+        ++m_size;  // keep basic exception safety here
         return;
       }
       else
@@ -333,24 +332,22 @@ public:
     {
       m_dynamic.emplace_back(std::forward<Args>(args)...);
     }
+    else if (m_size < N)
+    {
+      m_static[m_size] = value_type(std::forward<Args>(args)...);
+      ++m_size;  // keep basic exception safety here
+    }
     else
     {
-      if (m_size < N)
-      {
-        m_static[m_size] = value_type(std::forward<Args>(args)...);
-        ++m_size; // keep basic exception safety here
-      }
-      else
-      {
-        // Construct value first in case of reallocation and m_vec.emplace_back(m_vec[0]).
-        value_type value(std::forward<Args>(args)...);
-        SwitchToDynamic(SwitchCapacity());
-        m_dynamic.push_back(std::move(value));
-      }
+      // Construct value first in case of reallocation and m_vec.emplace_back(m_vec[0]).
+      value_type value(std::forward<Args>(args)...);
+      SwitchToDynamic(SwitchCapacity());
+      m_dynamic.push_back(std::move(value));
     }
   }
 
-  template <typename TIt> void insert(const_iterator where, TIt beg, TIt end)
+  template <typename TIt>
+  void insert(const_iterator where, TIt beg, TIt end)
   {
     size_t const pos = base::asserted_cast<size_t>(where - data());
     ASSERT_LESS_OR_EQUAL(pos, size(), ());
@@ -365,10 +362,8 @@ public:
     if (m_size + n <= N)
     {
       if (pos != m_size)
-      {
         for (size_t i = m_size - 1; i >= pos && i < m_size; --i)
           Swap(m_static[i], m_static[i + n]);
-      }
 
       m_size += n;
       T * writableWhere = &m_static[0] + pos;
@@ -383,10 +378,7 @@ public:
     }
   }
 
-  void insert(const_iterator where, value_type const & value)
-  {
-    insert(where, &value, &value + 1);
-  }
+  void insert(const_iterator where, value_type const & value) { insert(where, &value, &value + 1); }
 
   template <class Fn>
   void erase_if(Fn && fn)
@@ -405,9 +397,7 @@ public:
 
     auto const numToErase = std::distance(first, last);
     for (; first != end() - numToErase; ++first)
-    {
       Swap(*first, *(first + numToErase));
-    }
     resize(std::distance(begin(), first));
   }
   void erase(iterator it) { erase(it, it + 1); }
@@ -483,7 +473,8 @@ typename buffer_vector<T, N>::const_iterator end(buffer_vector<T, N> const & v)
 }
 }  // namespace std
 
-template <class Dest, class Src> void assign_range(Dest & dest, Src const & src)
+template <class Dest, class Src>
+void assign_range(Dest & dest, Src const & src)
 {
   dest.assign(std::begin(src), std::end(src));
 }
diff --git a/libs/base/cache.hpp b/libs/base/cache.hpp
index 8eb541b64..f6bb80372 100644
--- a/libs/base/cache.hpp
+++ b/libs/base/cache.hpp
@@ -10,161 +10,148 @@
 
 namespace base
 {
-  // Simple cache that stores list of values.
-  template <typename KeyT, typename ValueT> class Cache
+// Simple cache that stores list of values.
+template <typename KeyT, typename ValueT>
+class Cache
+{
+  DISALLOW_COPY(Cache);
+
+public:
+  Cache() = default;
+  Cache(Cache && r) = default;
+
+  /// @param[in] logCacheSize is pow of two for number of elements in cache.
+  explicit Cache(uint32_t logCacheSize) { Init(logCacheSize); }
+
+  /// @param[in] logCacheSize is pow of two for number of elements in cache.
+  void Init(uint32_t logCacheSize)
   {
-    DISALLOW_COPY(Cache);
+    ASSERT(logCacheSize > 0 && logCacheSize < 32, (logCacheSize));
+    static_assert((std::is_same<KeyT, uint32_t>::value || std::is_same<KeyT, uint64_t>::value), "");
 
-  public:
-    Cache() = default;
-    Cache(Cache && r) = default;
+    m_cache.reset(new Data[1 << logCacheSize]);
+    m_hashMask = (1 << logCacheSize) - 1;
 
-    /// @param[in] logCacheSize is pow of two for number of elements in cache.
-    explicit Cache(uint32_t logCacheSize)
+    Reset();
+  }
+
+  uint32_t GetCacheSize() const { return m_hashMask + 1; }
+
+  // Find value by @key. If @key is found, returns reference to its value.
+  // If @key is not found, some other key is removed and it's value is reused without
+  // re-initialization. It's up to caller to re-initialize the new value if @found == false.
+  // TODO: Return pair<ValueT *, bool> instead?
+  ValueT & Find(KeyT const & key, bool & found)
+  {
+    Data & data = m_cache[Index(key)];
+    if (data.m_Key == key)
     {
-      Init(logCacheSize);
+      found = true;
     }
-
-    /// @param[in] logCacheSize is pow of two for number of elements in cache.
-    void Init(uint32_t logCacheSize)
+    else
     {
-      ASSERT(logCacheSize > 0 && logCacheSize < 32, (logCacheSize));
-      static_assert((std::is_same<KeyT, uint32_t>::value || std::is_same<KeyT, uint64_t>::value), "");
-
-      m_cache.reset(new Data[1 << logCacheSize]);
-      m_hashMask = (1 << logCacheSize) - 1;
-
-      Reset();
+      found = false;
+      data.m_Key = key;
     }
+    return data.m_Value;
+  }
 
-    uint32_t GetCacheSize() const
+  template <typename F>
+  void ForEachValue(F && f)
+  {
+    for (uint32_t i = 0; i <= m_hashMask; ++i)
+      f(m_cache[i].m_Value);
+  }
+
+  void Reset()
+  {
+    // Initialize m_Cache such, that Index(m_Cache[i].m_Key) != i.
+    for (uint32_t i = 0; i <= m_hashMask; ++i)
     {
-      return m_hashMask + 1;
+      KeyT & key = m_cache[i].m_Key;
+      for (key = 0; Index(key) == i; ++key)
+        ;
     }
+  }
 
-    // Find value by @key. If @key is found, returns reference to its value.
-    // If @key is not found, some other key is removed and it's value is reused without
-    // re-initialization. It's up to caller to re-initialize the new value if @found == false.
-    // TODO: Return pair<ValueT *, bool> instead?
-    ValueT & Find(KeyT const & key, bool & found)
-    {
-      Data & data = m_cache[Index(key)];
-      if (data.m_Key == key)
-      {
-        found = true;
-      }
-      else
-      {
-        found = false;
-        data.m_Key = key;
-      }
-      return data.m_Value;
-    }
+private:
+  size_t Index(KeyT const & key) const { return static_cast<size_t>(Hash(key) & m_hashMask); }
 
-    template <typename F>
-    void ForEachValue(F && f)
-    {
-      for (uint32_t i = 0; i <= m_hashMask; ++i)
-        f(m_cache[i].m_Value);
-    }
+  static uint32_t Hash(uint32_t x)
+  {
+    x = (x ^ 61) ^ (x >> 16);
+    x = x + (x << 3);
+    x = x ^ (x >> 4);
+    x = x * 0x27d4eb2d;
+    x = x ^ (x >> 15);
+    return x;
+  }
 
-    void Reset()
-    {
-      // Initialize m_Cache such, that Index(m_Cache[i].m_Key) != i.
-      for (uint32_t i = 0; i <= m_hashMask; ++i)
-      {
-        KeyT & key = m_cache[i].m_Key;
-        for (key = 0; Index(key) == i; ++key) ;
-      }
-    }
+  static uint32_t Hash(uint64_t x) { return Hash(uint32_t(x) ^ uint32_t(x >> 32)); }
 
-  private:
-    size_t Index(KeyT const & key) const
-    {
-      return static_cast<size_t>(Hash(key) & m_hashMask);
-    }
-
-    static uint32_t Hash(uint32_t x)
-    {
-      x = (x ^ 61) ^ (x >> 16);
-      x = x + (x << 3);
-      x = x ^ (x >> 4);
-      x = x * 0x27d4eb2d;
-      x = x ^ (x >> 15);
-      return x;
-    }
-
-    static uint32_t Hash(uint64_t x)
-    {
-      return Hash(uint32_t(x) ^ uint32_t(x >> 32));
-    }
-
-    // TODO: Consider using separate arrays for keys and values, to save on padding.
-    struct Data
-    {
-      Data() : m_Key(), m_Value() {}
-      KeyT m_Key;
-      ValueT m_Value;
-    };
-
-    std::unique_ptr<Data[]> m_cache;
-    uint32_t m_hashMask;
+  // TODO: Consider using separate arrays for keys and values, to save on padding.
+  struct Data
+  {
+    Data() : m_Key(), m_Value() {}
+    KeyT m_Key;
+    ValueT m_Value;
   };
 
-  // Simple cache that stores list of values and provides cache missing statistics.
-  // CacheWithStat class has the same interface as Cache class
-  template <typename TKey, typename TValue>
-  class CacheWithStat
+  std::unique_ptr<Data[]> m_cache;
+  uint32_t m_hashMask;
+};
+
+// Simple cache that stores list of values and provides cache missing statistics.
+// CacheWithStat class has the same interface as Cache class
+template <typename TKey, typename TValue>
+class CacheWithStat
+{
+public:
+  CacheWithStat() = default;
+
+  explicit CacheWithStat(uint32_t logCacheSize) : m_cache(logCacheSize), m_miss(0), m_access(0) {}
+
+  /// @param[in] logCacheSize is pow of two for number of elements in cache.
+  void Init(uint32_t logCacheSize)
   {
-  public:
-    CacheWithStat() = default;
+    m_cache.Init(logCacheSize);
+    m_miss = m_access = 0;
+  }
 
-    explicit CacheWithStat(uint32_t logCacheSize)
-      : m_cache(logCacheSize), m_miss(0), m_access(0)
-    {
-    }
+  double GetCacheMiss() const
+  {
+    if (m_access == 0)
+      return 0.0;
+    return static_cast<double>(m_miss) / static_cast<double>(m_access);
+  }
 
-    /// @param[in] logCacheSize is pow of two for number of elements in cache.
-    void Init(uint32_t logCacheSize)
-    {
-      m_cache.Init(logCacheSize);
-      m_miss = m_access = 0;
-    }
+  uint32_t GetCacheSize() const { return m_cache.GetCacheSize(); }
 
-    double GetCacheMiss() const
-    {
-      if (m_access == 0)
-        return 0.0;
-      return static_cast<double>(m_miss) / static_cast<double>(m_access);
-    }
+  TValue & Find(TKey const & key, bool & found)
+  {
+    ++m_access;
+    TValue & res = m_cache.Find(key, found);
+    if (!found)
+      ++m_miss;
+    return res;
+  }
 
-    uint32_t GetCacheSize() const { return m_cache.GetCacheSize(); }
+  template <typename F>
+  void ForEachValue(F && f)
+  {
+    m_cache.ForEachValue(std::forward<F>(f));
+  }
 
-    TValue & Find(TKey const & key, bool & found)
-    {
-      ++m_access;
-      TValue & res = m_cache.Find(key, found);
-      if (!found)
-        ++m_miss;
-      return res;
-    }
+  void Reset()
+  {
+    m_cache.Reset();
+    m_access = 0;
+    m_miss = 0;
+  }
 
-    template <typename F>
-    void ForEachValue(F && f)
-    {
-      m_cache.ForEachValue(std::forward<F>(f));
-    }
-
-    void Reset()
-    {
-      m_cache.Reset();
-      m_access = 0;
-      m_miss = 0;
-    }
-
-  private:
-    Cache<TKey, TValue> m_cache;
-    uint64_t m_miss;
-    uint64_t m_access;
-  };
+private:
+  Cache<TKey, TValue> m_cache;
+  uint64_t m_miss;
+  uint64_t m_access;
+};
 }  // namespace base
diff --git a/libs/base/cancellable.cpp b/libs/base/cancellable.cpp
index 687b88a3b..4fafd2237 100644
--- a/libs/base/cancellable.cpp
+++ b/libs/base/cancellable.cpp
@@ -42,11 +42,8 @@ Cancellable::Status Cancellable::CancellationStatus() const
 
 void Cancellable::CheckDeadline() const
 {
-  if (m_status == Status::Active &&
-      m_deadline && *m_deadline < std::chrono::steady_clock::now())
-  {
+  if (m_status == Status::Active && m_deadline && *m_deadline < std::chrono::steady_clock::now())
     m_status = Status::DeadlineExceeded;
-  }
 }
 
 std::string DebugPrint(Cancellable::Status status)
diff --git a/libs/base/clustering_map.hpp b/libs/base/clustering_map.hpp
index 57f8e1c2f..9951a101e 100644
--- a/libs/base/clustering_map.hpp
+++ b/libs/base/clustering_map.hpp
@@ -37,10 +37,7 @@ public:
     entry.m_values.push_back(std::forward<V>(value));
   }
 
-  void Delete(Key const & key)
-  {
-    m_table.erase(key);
-  }
+  void Delete(Key const & key) { m_table.erase(key); }
 
   // Unions clusters corresponding to |u| and |v|.
   //
@@ -75,10 +72,7 @@ public:
     {
       EntryWithKey(Entry const * entry, Key const & key) : m_entry(entry), m_key(key) {}
 
-      bool operator<(EntryWithKey const & rhs) const
-      {
-        return m_entry->m_root < rhs.m_entry->m_root;
-      }
+      bool operator<(EntryWithKey const & rhs) const { return m_entry->m_root < rhs.m_entry->m_root; }
 
       Entry const * m_entry;
       Key m_key;
diff --git a/libs/base/collection_cast.hpp b/libs/base/collection_cast.hpp
index 62a53cca2..bfa1589cb 100644
--- a/libs/base/collection_cast.hpp
+++ b/libs/base/collection_cast.hpp
@@ -21,7 +21,7 @@ using TValueType = typename ValueType<T>::TType;
 // More examples:
 // auto const mySet = collection_cast<set>("aaabcccd");
 // auto const myMap = collection_cast<map>(vector<pair<int, int>>{{1, 2}, {3, 4}});
-template <template<typename ... TArgs> class TTo, typename TFrom>
+template <template <typename... TArgs> class TTo, typename TFrom>
 auto collection_cast(TFrom && from) -> TTo<details::TValueType<TFrom>>
 {
   return TTo<details::TValueType<TFrom>>(begin(from), end(from));
diff --git a/libs/base/control_flow.hpp b/libs/base/control_flow.hpp
index fb2caf5b6..a0f9e5e32 100644
--- a/libs/base/control_flow.hpp
+++ b/libs/base/control_flow.hpp
@@ -20,19 +20,17 @@ class ControlFlowWrapper
 public:
   template <typename Gn>
   explicit ControlFlowWrapper(Gn && gn) : m_fn(std::forward<Gn>(gn))
-  {
-  }
+  {}
 
   template <typename... Args>
-  std::enable_if_t<std::is_same_v<std::invoke_result_t<Fn, Args...>, ControlFlow>, ControlFlow>
-  operator()(Args &&... args)
+  std::enable_if_t<std::is_same_v<std::invoke_result_t<Fn, Args...>, ControlFlow>, ControlFlow> operator()(
+      Args &&... args)
   {
     return m_fn(std::forward<Args>(args)...);
   }
 
   template <typename... Args>
-  std::enable_if_t<std::is_same_v<std::invoke_result_t<Fn, Args...>, void>, ControlFlow>
-  operator()(Args &&... args)
+  std::enable_if_t<std::is_same_v<std::invoke_result_t<Fn, Args...>, void>, ControlFlow> operator()(Args &&... args)
   {
     m_fn(std::forward<Args>(args)...);
     return ControlFlow::Continue;
diff --git a/libs/base/exception.cpp b/libs/base/exception.cpp
index b9333a910..0da5ed87c 100644
--- a/libs/base/exception.cpp
+++ b/libs/base/exception.cpp
@@ -5,10 +5,8 @@ RootException::RootException(char const * what, std::string const & msg) : m_msg
   std::string asciiMsg(m_msg.size(), '?');
 
   for (size_t i = 0; i < m_msg.size(); ++i)
-  {
     if (static_cast<unsigned char>(m_msg[i]) < 128)
       asciiMsg[i] = static_cast<char>(m_msg[i]);
-  }
 
   m_whatWithAscii = std::string(what) + ", \"" + asciiMsg + "\"";
 }
diff --git a/libs/base/exception.hpp b/libs/base/exception.hpp
index 8cd0ba602..28814a911 100644
--- a/libs/base/exception.hpp
+++ b/libs/base/exception.hpp
@@ -25,9 +25,8 @@ private:
 };
 
 template <typename Fn, typename... Args>
-std::invoke_result_t<Fn&&, Args&&...> ExceptionCatcher(std::string const & comment,
-                                                       bool & exceptionWasThrown, Fn && fn,
-                                                       Args &&... args) noexcept
+std::invoke_result_t<Fn &&, Args &&...> ExceptionCatcher(std::string const & comment, bool & exceptionWasThrown,
+                                                         Fn && fn, Args &&... args) noexcept
 {
   try
   {
@@ -48,24 +47,24 @@ std::invoke_result_t<Fn&&, Args&&...> ExceptionCatcher(std::string const & comme
   }
 
   exceptionWasThrown = true;
-  using ReturnType = std::decay_t<std::invoke_result_t<Fn&&, Args&&...>>;
+  using ReturnType = std::decay_t<std::invoke_result_t<Fn &&, Args &&...>>;
   if constexpr (!std::is_same_v<void, ReturnType>)
   {
-    static const ReturnType defaultResult = {};
+    static ReturnType const defaultResult = {};
     return defaultResult;
   }
 }
 
-#define DECLARE_EXCEPTION(exception_name, base_exception) \
-  class exception_name : public base_exception \
-  { \
-  public: \
+#define DECLARE_EXCEPTION(exception_name, base_exception)                                     \
+  class exception_name : public base_exception                                                \
+  {                                                                                           \
+  public:                                                                                     \
     exception_name(char const * what, std::string const & msg) : base_exception(what, msg) {} \
   }
 
 // TODO: Use SRC_LOGGING macro.
-#define MYTHROW(exception_name, msg) throw exception_name( \
-  #exception_name " " __FILE__ ":" TO_STRING(__LINE__), ::base::Message msg)
+#define MYTHROW(exception_name, msg)                                                              \
+  throw exception_name(#exception_name " " __FILE__ ":" TO_STRING(__LINE__), ::base::Message msg)
 
-#define MYTHROW1(exception_name, param1, msg) throw exception_name(param1, \
-  #exception_name " " __FILE__ ":" TO_STRING(__LINE__), ::base::Message msg)
+#define MYTHROW1(exception_name, param1, msg)                                                             \
+  throw exception_name(param1, #exception_name " " __FILE__ ":" TO_STRING(__LINE__), ::base::Message msg)
diff --git a/libs/base/fast_math.cpp b/libs/base/fast_math.cpp
index ca8d4b623..dfc91cee4 100644
--- a/libs/base/fast_math.cpp
+++ b/libs/base/fast_math.cpp
@@ -16,4 +16,4 @@ bool is_finite(double t)
 {
   return std::isfinite(t);
 }
-} // namespace base
+}  // namespace math
diff --git a/libs/base/fifo_cache.hpp b/libs/base/fifo_cache.hpp
index b89fd5dc0..5c03d20b6 100644
--- a/libs/base/fifo_cache.hpp
+++ b/libs/base/fifo_cache.hpp
@@ -15,20 +15,18 @@
 #pragma clang diagnostic pop
 #endif
 
-template<class Key, class Value, class HashContainer = std::unordered_map<Key, Value>>
+template <class Key, class Value, class HashContainer = std::unordered_map<Key, Value>>
 class FifoCache
 {
-  template <typename K, typename V> friend class FifoCacheTest;
+  template <typename K, typename V>
+  friend class FifoCacheTest;
 
 public:
   using Loader = std::function<void(Key const & key, Value & value)>;
 
   /// \param capacity maximum size of the cache in number of items.
   /// \param loader Function which is called if it's necessary to load a new item for the cache.
-  FifoCache(size_t capacity, Loader const & loader)
-    : m_fifo(capacity), m_capacity(capacity), m_loader(loader)
-  {
-  }
+  FifoCache(size_t capacity, Loader const & loader) : m_fifo(capacity), m_capacity(capacity), m_loader(loader) {}
 
   /// \brief Loads value, if it's necessary, by |key| with |m_loader|, puts it to cache and
   /// returns the reference to the value to |m_map|.
diff --git a/libs/base/file_name_utils.cpp b/libs/base/file_name_utils.cpp
index d2b58aeca..0f82a6c1a 100644
--- a/libs/base/file_name_utils.cpp
+++ b/libs/base/file_name_utils.cpp
@@ -27,7 +27,7 @@ void GetNameFromFullPath(string & name)
 {
   string::size_type const i = name.find_last_of("/\\");
   if (i != string::npos)
-    name = name.substr(i+1);
+    name = name.substr(i + 1);
 }
 
 std::string FileNameFromFullPath(std::string path)
@@ -59,9 +59,9 @@ string GetDirectory(string const & name)
 string::value_type GetNativeSeparator()
 {
 #ifdef OMIM_OS_WINDOWS
-    return '\\';
+  return '\\';
 #else
-    return '/';
+  return '/';
 #endif
 }
 
diff --git a/libs/base/file_name_utils.hpp b/libs/base/file_name_utils.hpp
index 71107f740..065d263b7 100644
--- a/libs/base/file_name_utils.hpp
+++ b/libs/base/file_name_utils.hpp
@@ -34,7 +34,10 @@ std::string AddSlashIfNeeded(std::string const & path);
 
 namespace impl
 {
-inline std::string JoinPath(std::string const & file) { return file; }
+inline std::string JoinPath(std::string const & file)
+{
+  return file;
+}
 
 template <typename... Args>
 std::string JoinPath(std::string const & folder, Args &&... args)
diff --git a/libs/base/geo_object_id.cpp b/libs/base/geo_object_id.cpp
index 6d7d12776..51227d0f2 100644
--- a/libs/base/geo_object_id.cpp
+++ b/libs/base/geo_object_id.cpp
@@ -10,17 +10,16 @@ namespace
 //          and add assertions about the highest bit.
 //          The old scheme used the highest bit and the new one does not.
 // uint64_t const kTypeMask = 0x7F00000000000000;
-uint64_t const kTypeMask      = 0xFF00000000000000;
-uint64_t const kReservedMask  = 0x00FF000000000000;
-uint64_t const kSerialMask    = 0x0000FFFFFFFFFFFF;
+uint64_t const kTypeMask = 0xFF00000000000000;
+uint64_t const kReservedMask = 0x00FF000000000000;
+uint64_t const kSerialMask = 0x0000FFFFFFFFFFFF;
 }  // namespace
 
 namespace base
 {
 GeoObjectId::GeoObjectId(uint64_t encodedId) : m_encodedId(encodedId) {}
 
-GeoObjectId::GeoObjectId(Type type, uint64_t id)
-  : m_encodedId((static_cast<uint64_t>(type) << 56) | id) {}
+GeoObjectId::GeoObjectId(Type type, uint64_t id) : m_encodedId((static_cast<uint64_t>(type) << 56) | id) {}
 
 uint64_t GeoObjectId::GetSerialId() const
 {
@@ -29,7 +28,10 @@ uint64_t GeoObjectId::GetSerialId() const
   return m_encodedId & kSerialMask;
 }
 
-uint64_t GeoObjectId::GetEncodedId() const { return m_encodedId; }
+uint64_t GeoObjectId::GetEncodedId() const
+{
+  return m_encodedId;
+}
 
 GeoObjectId::Type GeoObjectId::GetType() const
 {
diff --git a/libs/base/internal/message.hpp b/libs/base/internal/message.hpp
index c8191519d..5c820f5cb 100644
--- a/libs/base/internal/message.hpp
+++ b/libs/base/internal/message.hpp
@@ -22,11 +22,18 @@
 
 /// @name Declarations.
 //@{
-template <typename T> inline std::string DebugPrint(T const & t);
+template <typename T>
+inline std::string DebugPrint(T const & t);
 
-inline std::string DebugPrint(std::string s) { return s; }
+inline std::string DebugPrint(std::string s)
+{
+  return s;
+}
 inline std::string DebugPrint(char const * t);
-inline std::string DebugPrint(char * t) { return DebugPrint(static_cast<char const *>(t)); }
+inline std::string DebugPrint(char * t)
+{
+  return DebugPrint(static_cast<char const *>(t));
+}
 inline std::string DebugPrint(char t);
 inline std::string DebugPrint(char32_t t);
 
@@ -38,14 +45,22 @@ std::string DebugPrint(char32_t const * t) = delete;
 std::string DebugPrint(char32_t * t) = delete;
 /// @}
 
-template <typename U, typename V> inline std::string DebugPrint(std::pair<U, V> const & p);
-template <typename T> inline std::string DebugPrint(std::list<T> const & v);
-template <typename T> inline std::string DebugPrint(std::vector<T> const & v);
-template <typename T, typename C = std::less<T>> inline std::string DebugPrint(std::set<T, C> const & v);
-template <typename T, typename C = std::less<T>> inline std::string DebugPrint(std::multiset<T, C> const & v);
-template <typename U, typename V, typename C = std::less<U>> inline std::string DebugPrint(std::map<U, V, C> const & v);
-template <typename T> inline std::string DebugPrint(std::initializer_list<T> const & v);
-template <typename T> inline std::string DebugPrint(std::unique_ptr<T> const & v);
+template <typename U, typename V>
+inline std::string DebugPrint(std::pair<U, V> const & p);
+template <typename T>
+inline std::string DebugPrint(std::list<T> const & v);
+template <typename T>
+inline std::string DebugPrint(std::vector<T> const & v);
+template <typename T, typename C = std::less<T>>
+inline std::string DebugPrint(std::set<T, C> const & v);
+template <typename T, typename C = std::less<T>>
+inline std::string DebugPrint(std::multiset<T, C> const & v);
+template <typename U, typename V, typename C = std::less<U>>
+inline std::string DebugPrint(std::map<U, V, C> const & v);
+template <typename T>
+inline std::string DebugPrint(std::initializer_list<T> const & v);
+template <typename T>
+inline std::string DebugPrint(std::unique_ptr<T> const & v);
 
 template <class Key, class Hash = std::hash<Key>, class Pred = std::equal_to<Key>>
 inline std::string DebugPrint(std::unordered_set<Key, Hash, Pred> const & v);
@@ -53,7 +68,8 @@ template <class Key, class T, class Hash = std::hash<Key>, class Pred = std::equ
 inline std::string DebugPrint(std::unordered_map<Key, T, Hash, Pred> const & v);
 //@}
 
-template <typename T> inline std::string DebugPrint(T const & t)
+template <typename T>
+inline std::string DebugPrint(T const & t)
 {
   std::ostringstream out;
   out << t;
@@ -151,50 +167,58 @@ std::string inline DebugPrint(std::nullopt_t const & p)
 
 // Avoid calling it for string literals.
 template <typename T, size_t N,
-         typename = std::enable_if_t<!std::is_same<typename std::remove_cv<T>::type, char>::value &&
-                                     !std::is_same<typename std::remove_cv<T>::type, char16_t>::value &&
-                                     !std::is_same<typename std::remove_cv<T>::type, char32_t>::value>>
-inline std::string DebugPrint(T (&arr) [N])
+          typename = std::enable_if_t<!std::is_same<typename std::remove_cv<T>::type, char>::value &&
+                                      !std::is_same<typename std::remove_cv<T>::type, char16_t>::value &&
+                                      !std::is_same<typename std::remove_cv<T>::type, char32_t>::value>>
+inline std::string DebugPrint(T (&arr)[N])
 {
   return DebugPrintSequence(arr, arr + N);
 }
 
-template <typename T, size_t N> inline std::string DebugPrint(std::array<T, N> const & v)
+template <typename T, size_t N>
+inline std::string DebugPrint(std::array<T, N> const & v)
 {
   return DebugPrintSequence(v.begin(), v.end());
 }
 
-template <typename T> inline std::string DebugPrint(std::vector<T> const & v)
+template <typename T>
+inline std::string DebugPrint(std::vector<T> const & v)
 {
   return DebugPrintSequence(v.begin(), v.end());
 }
 
-template <typename T> inline std::string DebugPrint(std::deque<T> const & d)
+template <typename T>
+inline std::string DebugPrint(std::deque<T> const & d)
 {
   return DebugPrintSequence(d.begin(), d.end());
 }
 
-template <typename T> inline std::string DebugPrint(std::list<T> const & v)
+template <typename T>
+inline std::string DebugPrint(std::list<T> const & v)
 {
   return DebugPrintSequence(v.begin(), v.end());
 }
 
-template <typename T, typename C> inline std::string DebugPrint(std::set<T, C> const & v)
+template <typename T, typename C>
+inline std::string DebugPrint(std::set<T, C> const & v)
 {
   return DebugPrintSequence(v.begin(), v.end());
 }
 
-template <typename T, typename C> inline std::string DebugPrint(std::multiset<T, C> const & v)
+template <typename T, typename C>
+inline std::string DebugPrint(std::multiset<T, C> const & v)
 {
   return DebugPrintSequence(v.begin(), v.end());
 }
 
-template <typename U, typename V, typename C> inline std::string DebugPrint(std::map<U, V, C> const & v)
+template <typename U, typename V, typename C>
+inline std::string DebugPrint(std::map<U, V, C> const & v)
 {
   return DebugPrintSequence(v.begin(), v.end());
 }
 
-template <typename T> inline std::string DebugPrint(std::initializer_list<T> const & v)
+template <typename T>
+inline std::string DebugPrint(std::initializer_list<T> const & v)
 {
   return DebugPrintSequence(v.begin(), v.end());
 }
@@ -211,7 +235,8 @@ inline std::string DebugPrint(std::unordered_map<Key, T, Hash, Pred> const & v)
   return DebugPrintSequence(v.begin(), v.end());
 }
 
-template <typename T> inline std::string DebugPrint(std::unique_ptr<T> const & v)
+template <typename T>
+inline std::string DebugPrint(std::unique_ptr<T> const & v)
 {
   std::ostringstream out;
   if (v.get() != nullptr)
@@ -223,7 +248,10 @@ template <typename T> inline std::string DebugPrint(std::unique_ptr<T> const & v
 
 namespace base
 {
-inline std::string Message() { return {}; }
+inline std::string Message()
+{
+  return {};
+}
 
 template <typename T>
 std::string Message(T const & t)
diff --git a/libs/base/levenshtein_dfa.cpp b/libs/base/levenshtein_dfa.cpp
index 04c5ccf98..eeeea960a 100644
--- a/libs/base/levenshtein_dfa.cpp
+++ b/libs/base/levenshtein_dfa.cpp
@@ -13,16 +13,20 @@ namespace strings
 {
 namespace
 {
-size_t AbsDiff(size_t a, size_t b) { return a > b ? a - b : b - a; }
+size_t AbsDiff(size_t a, size_t b)
+{
+  return a > b ? a - b : b - a;
+}
 
 class TransitionTable
 {
 public:
-  TransitionTable(UniString const & s, std::vector<UniString> const & prefixMisprints,
-                  size_t prefixSize)
-    : m_s(s), m_size(s.size()), m_prefixMisprints(prefixMisprints), m_prefixSize(prefixSize)
-  {
-  }
+  TransitionTable(UniString const & s, std::vector<UniString> const & prefixMisprints, size_t prefixSize)
+    : m_s(s)
+    , m_size(s.size())
+    , m_prefixMisprints(prefixMisprints)
+    , m_prefixSize(prefixSize)
+  {}
 
   void Move(LevenshteinDFA::State const & s, UniChar c, LevenshteinDFA::State & t)
   {
@@ -87,10 +91,8 @@ private:
     size_t const limit = std::min(m_size - p.m_offset, p.m_errorsLeft + 1);
 
     for (i = 0; i < limit; ++i)
-    {
       if (m_s[p.m_offset + i] == c)
         return true;
-    }
     return false;
   }
 
@@ -99,10 +101,8 @@ private:
     CHECK_LESS(position, m_prefixSize, ());
 
     for (auto const & misprints : m_prefixMisprints)
-    {
       if (base::IsExist(misprints, c) && base::IsExist(misprints, m_s[position]))
         return true;
-    }
     return false;
   }
 
@@ -120,9 +120,10 @@ size_t const LevenshteinDFA::kRejectingState = 1;
 
 // LevenshteinDFA::Position ------------------------------------------------------------------------
 LevenshteinDFA::Position::Position(size_t offset, size_t errorsLeft, bool transposed)
-  : m_offset(offset), m_errorsLeft(errorsLeft), m_transposed(transposed)
-{
-}
+  : m_offset(offset)
+  , m_errorsLeft(errorsLeft)
+  , m_transposed(transposed)
+{}
 
 bool LevenshteinDFA::Position::SubsumedBy(Position const & rhs) const
 {
@@ -156,8 +157,7 @@ bool LevenshteinDFA::Position::operator<(Position const & rhs) const
 
 bool LevenshteinDFA::Position::operator==(Position const & rhs) const
 {
-  return m_offset == rhs.m_offset && m_errorsLeft == rhs.m_errorsLeft &&
-         m_transposed == rhs.m_transposed;
+  return m_offset == rhs.m_offset && m_errorsLeft == rhs.m_errorsLeft && m_transposed == rhs.m_transposed;
 }
 
 // LevenshteinDFA::State ---------------------------------------------------------------------------
@@ -190,31 +190,27 @@ void LevenshteinDFA::State::Normalize()
 
 // LevenshteinDFA ----------------------------------------------------------------------------------
 // static
-LevenshteinDFA::LevenshteinDFA(UniString const & s, size_t prefixSize,
-                               std::vector<UniString> const & prefixMisprints, size_t maxErrors)
-  : m_size(s.size()), m_maxErrors(maxErrors)
+LevenshteinDFA::LevenshteinDFA(UniString const & s, size_t prefixSize, std::vector<UniString> const & prefixMisprints,
+                               size_t maxErrors)
+  : m_size(s.size())
+  , m_maxErrors(maxErrors)
 {
   m_alphabet.assign(s.begin(), s.end());
   CHECK_LESS_OR_EQUAL(prefixSize, s.size(), ());
 
-  auto const pSize = static_cast<std::iterator_traits<
-          UniString::iterator>::difference_type>(prefixSize);
+  auto const pSize = static_cast<std::iterator_traits<UniString::iterator>::difference_type>(prefixSize);
   for (auto it = s.begin(); std::distance(s.begin(), it) < pSize; ++it)
   {
     for (auto const & misprints : prefixMisprints)
-    {
       if (base::IsExist(misprints, *it))
         m_alphabet.insert(m_alphabet.end(), misprints.begin(), misprints.end());
-    }
   }
   base::SortUnique(m_alphabet);
 
   UniChar missed = 0;
   for (size_t i = 0; i < m_alphabet.size() && missed >= m_alphabet[i]; ++i)
-  {
     if (missed == m_alphabet[i])
       ++missed;
-  }
   m_alphabet.push_back(missed);
 
   std::queue<State> states;
@@ -279,24 +275,20 @@ LevenshteinDFA::LevenshteinDFA(UniString const & s, size_t prefixSize,
 
 LevenshteinDFA::LevenshteinDFA(std::string const & s, size_t prefixSize, size_t maxErrors)
   : LevenshteinDFA(MakeUniString(s), prefixSize, {} /* prefixMisprints */, maxErrors)
-{
-}
+{}
 
 LevenshteinDFA::LevenshteinDFA(UniString const & s, size_t maxErrors)
   : LevenshteinDFA(s, 0 /* prefixSize */, {} /* prefixMisprints */, maxErrors)
-{
-}
+{}
 
 LevenshteinDFA::LevenshteinDFA(std::string const & s, size_t maxErrors)
   : LevenshteinDFA(MakeUniString(s), 0 /* prefixSize */, {} /* prefixMisprints */, maxErrors)
-{
-}
+{}
 
 LevenshteinDFA::State LevenshteinDFA::MakeStart()
 {
   State state;
-  state.m_positions.emplace_back(0 /* offset */, m_maxErrors /* errorsLeft */,
-                                 false /* transposed */);
+  state.m_positions.emplace_back(0 /* offset */, m_maxErrors /* errorsLeft */, false /* transposed */);
   return state;
 }
 
@@ -313,10 +305,8 @@ bool LevenshteinDFA::IsValid(Position const & p) const
 bool LevenshteinDFA::IsValid(State const & s) const
 {
   for (auto const & p : s.m_positions)
-  {
     if (!IsValid(p))
       return false;
-  }
   return true;
 }
 
@@ -328,10 +318,8 @@ bool LevenshteinDFA::IsAccepting(Position const & p) const
 bool LevenshteinDFA::IsAccepting(State const & s) const
 {
   for (auto const & p : s.m_positions)
-  {
     if (IsAccepting(p))
       return true;
-  }
   return false;
 }
 
diff --git a/libs/base/levenshtein_dfa.hpp b/libs/base/levenshtein_dfa.hpp
index 000bedefd..5c7329928 100644
--- a/libs/base/levenshtein_dfa.hpp
+++ b/libs/base/levenshtein_dfa.hpp
@@ -98,8 +98,8 @@ public:
   LevenshteinDFA(LevenshteinDFA &&) = default;
   LevenshteinDFA & operator=(LevenshteinDFA &&) = default;
 
-  LevenshteinDFA(UniString const & s, size_t prefixSize,
-                 std::vector<UniString> const & prefixMisprints, size_t maxErrors);
+  LevenshteinDFA(UniString const & s, size_t prefixSize, std::vector<UniString> const & prefixMisprints,
+                 size_t maxErrors);
   LevenshteinDFA(std::string const & s, size_t prefixSize, size_t maxErrors);
   LevenshteinDFA(UniString const & s, size_t maxErrors);
   LevenshteinDFA(std::string const & s, size_t maxErrors);
diff --git a/libs/base/limited_priority_queue.hpp b/libs/base/limited_priority_queue.hpp
index 140a61717..5fcb09acc 100644
--- a/libs/base/limited_priority_queue.hpp
+++ b/libs/base/limited_priority_queue.hpp
@@ -17,9 +17,9 @@ public:
   typedef typename std::vector<T>::const_iterator const_iterator;
 
   explicit limited_priority_queue(size_t maxSize = 1, CompareT compare = CompareT())
-    : m_maxSize(maxSize == 0 ? 1 : maxSize), m_compare(compare)
-  {
-  }
+    : m_maxSize(maxSize == 0 ? 1 : maxSize)
+    , m_compare(compare)
+  {}
 
   void push(T t)
   {
@@ -39,7 +39,7 @@ public:
 
   void pop()
   {
-    ASSERT ( !empty(), () );
+    ASSERT(!empty(), ());
     pop_heap(m_queue.begin(), m_queue.end(), m_compare);
     m_queue.pop_back();
   }
@@ -57,7 +57,7 @@ public:
   size_t size() const { return m_queue.size(); }
   T const & top() const
   {
-    ASSERT ( !empty(), () );
+    ASSERT(!empty(), ());
     return m_queue.front();
   }
 
diff --git a/libs/base/linked_map.hpp b/libs/base/linked_map.hpp
index a69ae9c7f..3ef1d13a8 100644
--- a/libs/base/linked_map.hpp
+++ b/libs/base/linked_map.hpp
@@ -45,10 +45,7 @@ public:
     return true;
   }
 
-  bool Contains(KeyType const & key) const
-  {
-    return m_map.find(key) != m_map.cend();
-  }
+  bool Contains(KeyType const & key) const { return m_map.find(key) != m_map.cend(); }
 
   ValueType const & Get(KeyType const & key) const
   {
@@ -58,15 +55,9 @@ public:
     return it->second->second;
   }
 
-  ValueType & Front()
-  {
-    return m_list.front().second;
-  }
+  ValueType & Front() { return m_list.front().second; }
 
-  ValueType const & Front() const
-  {
-    return m_list.front().second;
-  }
+  ValueType const & Front() const { return m_list.front().second; }
 
   void Swap(LinkedMap & linkedMap)
   {
@@ -74,15 +65,9 @@ public:
     m_list.swap(linkedMap.m_list);
   }
 
-  size_t Size() const
-  {
-    return m_list.size();
-  }
+  size_t Size() const { return m_list.size(); }
 
-  bool IsEmpty() const
-  {
-    return m_list.empty();
-  }
+  bool IsEmpty() const { return m_list.empty(); }
 
 private:
   ListType m_list;
diff --git a/libs/base/logging.cpp b/libs/base/logging.cpp
index ea511d107..6b84f4bff 100644
--- a/libs/base/logging.cpp
+++ b/libs/base/logging.cpp
@@ -31,7 +31,7 @@ std::optional<LogLevel> FromString(std::string const & s)
   ASSERT(!s.empty(), ("Log level should not be empty"));
 
   auto const & names = GetLogLevelNames();
-  const auto it = std::find(names.begin(), names.end(), std::toupper(s[0]));
+  auto const it = std::find(names.begin(), names.end(), std::toupper(s[0]));
   if (it == names.end())
     return {};
   return static_cast<LogLevel>(std::distance(names.begin(), it));
@@ -39,7 +39,7 @@ std::optional<LogLevel> FromString(std::string const & s)
 
 std::array<char, NUM_LOG_LEVELS> const & GetLogLevelNames()
 {
-  static std::array<char, NUM_LOG_LEVELS> constexpr kLogLevelNames {'D', 'I', 'W', 'E', 'C'};
+  static std::array<char, NUM_LOG_LEVELS> constexpr kLogLevelNames{'D', 'I', 'W', 'E', 'C'};
   return kLogLevelNames;
 }
 
diff --git a/libs/base/logging.hpp b/libs/base/logging.hpp
index d7bd8171d..8017eefec 100644
--- a/libs/base/logging.hpp
+++ b/libs/base/logging.hpp
@@ -91,11 +91,11 @@ struct ScopedLogAbortLevelChanger
 };
 }  // namespace base
 
+using base::LCRITICAL;
 using base::LDEBUG;
+using base::LERROR;
 using base::LINFO;
 using base::LWARNING;
-using base::LERROR;
-using base::LCRITICAL;
 using base::NUM_LOG_LEVELS;
 
 // Logging macro.
@@ -105,7 +105,8 @@ using base::NUM_LOG_LEVELS;
   {                                                          \
     if ((level) >= ::base::g_LogLevel)                       \
       ::base::LogMessage(level, SRC(), ::base::Message msg); \
-  } while (false)
+  }                                                          \
+  while (false)
 
 // Logging macro with short info (without entry point)
 #define LOG_SHORT(level, msg)                                           \
@@ -113,14 +114,16 @@ using base::NUM_LOG_LEVELS;
   {                                                                     \
     if ((level) >= ::base::g_LogLevel)                                  \
       ::base::LogMessage(level, base::SrcPoint(), ::base::Message msg); \
-  } while (false)
+  }                                                                     \
+  while (false)
 
 // Provides logging despite of |g_LogLevel|.
-#define LOG_FORCE(level, msg)                                         \
-  do                                                                  \
-  {                                                                   \
-    ::base::LogMessage(level, SRC(), ::base::Message msg);            \
-  } while (false)                                                     \
+#define LOG_FORCE(level, msg)                              \
+  do                                                       \
+  {                                                        \
+    ::base::LogMessage(level, SRC(), ::base::Message msg); \
+  }                                                        \
+  while (false)
 
 // Conditional log. Logs @msg with level @level in case when @X returns false.
 #define CLOG(level, X, msg)                                     \
@@ -128,4 +131,5 @@ using base::NUM_LOG_LEVELS;
   {                                                             \
     if (!(X))                                                   \
       LOG(level, (SRC(), "CLOG(" #X ")", ::base::Message msg)); \
-  } while (false)
+  }                                                             \
+  while (false)
diff --git a/libs/base/lower_case.cpp b/libs/base/lower_case.cpp
index b8e52e025..54d6bfc5e 100644
--- a/libs/base/lower_case.cpp
+++ b/libs/base/lower_case.cpp
@@ -7,57 +7,322 @@
 namespace strings
 {
 
-static uint16_t const small00[] = {0x0,0x1,0x2,0x3,0x4,0x5,0x6,0x7,0x8,0x9,0xa,0xb,0xc,0xd,0xe,0xf,0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x1e,0x1f,0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f,0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f,0x40,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6a,0x6b,0x6c,0x6d,0x6e,0x6f,0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7a,0x5b,0x5c,0x5d,0x5e,0x5f,0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6a,0x6b,0x6c,0x6d,0x6e,0x6f,0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7a,0x7b,0x7c,0x7d,0x7e,0x7f,0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9a,0x9b,0x9c,0x9d,0x9e,0x9f,0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,0x3bc,0xb6,0xb7,0xb8,0xb9,0xba,0xbb,0xbc,0xbd,0xbe,0xbf,0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xea,0xeb,0xec,0xed,0xee,0xef,0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xd7,0xf8,0xf9,0xfa,0xfb,0xfc,0xfd,0xfe,0x0,0xe0,0xe1,0xe2,0xe3,0xe4,0xe5,0xe6,0xe7,0xe8,0xe9,0xea,0xeb,0xec,0xed,0xee,0xef,0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0xf7,0xf8,0xf9,0xfa,0xfb,0xfc,0xfd,0xfe,0xff};
-static uint16_t const small01[] = {0x101,0x101,0x103,0x103,0x105,0x105,0x107,0x107,0x109,0x109,0x10b,0x10b,0x10d,0x10d,0x10f,0x10f,0x111,0x111,0x113,0x113,0x115,0x115,0x117,0x117,0x119,0x119,0x11b,0x11b,0x11d,0x11d,0x11f,0x11f,0x121,0x121,0x123,0x123,0x125,0x125,0x127,0x127,0x129,0x129,0x12b,0x12b,0x12d,0x12d,0x12f,0x12f,0x0,0x131,0x133,0x133,0x135,0x135,0x137,0x137,0x138,0x13a,0x13a,0x13c,0x13c,0x13e,0x13e,0x140,0x140,0x142,0x142,0x144,0x144,0x146,0x146,0x148,0x148,0x0,0x14b,0x14b,0x14d,0x14d,0x14f,0x14f,0x151,0x151,0x153,0x153,0x155,0x155,0x157,0x157,0x159,0x159,0x15b,0x15b,0x15d,0x15d,0x15f,0x15f,0x161,0x161,0x163,0x163,0x165,0x165,0x167,0x167,0x169,0x169,0x16b,0x16b,0x16d,0x16d,0x16f,0x16f,0x171,0x171,0x173,0x173,0x175,0x175,0x177,0x177,0xff,0x17a,0x17a,0x17c,0x17c,0x17e,0x17e,0x73,0x180,0x253,0x183,0x183,0x185,0x185,0x254,0x188,0x188,0x256,0x257,0x18c,0x18c,0x18d,0x1dd,0x259,0x25b,0x192,0x192,0x260,0x263,0x195,0x269,0x268,0x199,0x199,0x19a,0x19b,0x26f,0x272,0x19e,0x275,0x1a1,0x1a1,0x1a3,0x1a3,0x1a5,0x1a5,0x280,0x1a8,0x1a8,0x283,0x1aa,0x1ab,0x1ad,0x1ad,0x288,0x1b0,0x1b0,0x28a,0x28b,0x1b4,0x1b4,0x1b6,0x1b6,0x292,0x1b9,0x1b9,0x1ba,0x1bb,0x1bd,0x1bd,0x1be,0x1bf,0x1c0,0x1c1,0x1c2,0x1c3,0x1c6,0x1c6,0x1c6,0x1c9,0x1c9,0x1c9,0x1cc,0x1cc,0x1cc,0x1ce,0x1ce,0x1d0,0x1d0,0x1d2,0x1d2,0x1d4,0x1d4,0x1d6,0x1d6,0x1d8,0x1d8,0x1da,0x1da,0x1dc,0x1dc,0x1dd,0x1df,0x1df,0x1e1,0x1e1,0x1e3,0x1e3,0x1e5,0x1e5,0x1e7,0x1e7,0x1e9,0x1e9,0x1eb,0x1eb,0x1ed,0x1ed,0x1ef,0x1ef,0x0,0x1f3,0x1f3,0x1f3,0x1f5,0x1f5,0x195,0x1bf,0x1f9,0x1f9,0x1fb,0x1fb,0x1fd,0x1fd,0x1ff,0x1ff};
-static uint16_t const small02[] = {0x201,0x201,0x203,0x203,0x205,0x205,0x207,0x207,0x209,0x209,0x20b,0x20b,0x20d,0x20d,0x20f,0x20f,0x211,0x211,0x213,0x213,0x215,0x215,0x217,0x217,0x219,0x219,0x21b,0x21b,0x21d,0x21d,0x21f,0x21f,0x19e,0x221,0x223,0x223,0x225,0x225,0x227,0x227,0x229,0x229,0x22b,0x22b,0x22d,0x22d,0x22f,0x22f,0x231,0x231,0x233,0x233,0x234,0x235,0x236,0x237,0x238,0x239,0x2c65,0x23c,0x23c,0x19a,0x2c66,0x23f,0x240,0x242,0x242,0x180,0x289,0x28c,0x247,0x247,0x249,0x249,0x24b,0x24b,0x24d,0x24d,0x24f,0x24f,0x250,0x251,0x252,0x253,0x254,0x255,0x256,0x257,0x258,0x259,0x25a,0x25b,0x25c,0x25d,0x25e,0x25f,0x260,0x261,0x262,0x263,0x264,0x265,0x266,0x267,0x268,0x269,0x26a,0x26b,0x26c,0x26d,0x26e,0x26f,0x270,0x271,0x272,0x273,0x274,0x275,0x276,0x277,0x278,0x279,0x27a,0x27b,0x27c,0x27d,0x27e,0x27f,0x280,0x281,0x282,0x283,0x284,0x285,0x286,0x287,0x288,0x289,0x28a,0x28b,0x28c,0x28d,0x28e,0x28f,0x290,0x291,0x292,0x293,0x294,0x295,0x296,0x297,0x298,0x299,0x29a,0x29b,0x29c,0x29d,0x29e,0x29f,0x2a0,0x2a1,0x2a2,0x2a3,0x2a4,0x2a5,0x2a6,0x2a7,0x2a8,0x2a9,0x2aa,0x2ab,0x2ac,0x2ad,0x2ae,0x2af,0x2b0,0x2b1,0x2b2,0x2b3,0x2b4,0x2b5,0x2b6,0x2b7,0x2b8,0x2b9,0x2ba,0x2bb,0x2bc,0x2bd,0x2be,0x2bf,0x2c0,0x2c1,0x2c2,0x2c3,0x2c4,0x2c5,0x2c6,0x2c7,0x2c8,0x2c9,0x2ca,0x2cb,0x2cc,0x2cd,0x2ce,0x2cf,0x2d0,0x2d1,0x2d2,0x2d3,0x2d4,0x2d5,0x2d6,0x2d7,0x2d8,0x2d9,0x2da,0x2db,0x2dc,0x2dd,0x2de,0x2df,0x2e0,0x2e1,0x2e2,0x2e3,0x2e4,0x2e5,0x2e6,0x2e7,0x2e8,0x2e9,0x2ea,0x2eb,0x2ec,0x2ed,0x2ee,0x2ef,0x2f0,0x2f1,0x2f2,0x2f3,0x2f4,0x2f5,0x2f6,0x2f7,0x2f8,0x2f9,0x2fa,0x2fb,0x2fc,0x2fd,0x2fe,0x2ff};
-static uint16_t const small03[] = {0x300,0x301,0x302,0x303,0x304,0x305,0x306,0x307,0x308,0x309,0x30a,0x30b,0x30c,0x30d,0x30e,0x30f,0x310,0x311,0x312,0x313,0x314,0x315,0x316,0x317,0x318,0x319,0x31a,0x31b,0x31c,0x31d,0x31e,0x31f,0x320,0x321,0x322,0x323,0x324,0x325,0x326,0x327,0x328,0x329,0x32a,0x32b,0x32c,0x32d,0x32e,0x32f,0x330,0x331,0x332,0x333,0x334,0x335,0x336,0x337,0x338,0x339,0x33a,0x33b,0x33c,0x33d,0x33e,0x33f,0x340,0x341,0x342,0x343,0x344,0x3b9,0x346,0x347,0x348,0x349,0x34a,0x34b,0x34c,0x34d,0x34e,0x34f,0x350,0x351,0x352,0x353,0x354,0x355,0x356,0x357,0x358,0x359,0x35a,0x35b,0x35c,0x35d,0x35e,0x35f,0x360,0x361,0x362,0x363,0x364,0x365,0x366,0x367,0x368,0x369,0x36a,0x36b,0x36c,0x36d,0x36e,0x36f,0x371,0x371,0x373,0x373,0x374,0x375,0x377,0x377,0x378,0x379,0x37a,0x37b,0x37c,0x37d,0x37e,0x37f,0x380,0x381,0x382,0x383,0x384,0x385,0x3ac,0x387,0x3ad,0x3ae,0x3af,0x38b,0x3cc,0x38d,0x3cd,0x3ce,0x0,0x3b1,0x3b2,0x3b3,0x3b4,0x3b5,0x3b6,0x3b7,0x3b8,0x3b9,0x3ba,0x3bb,0x3bc,0x3bd,0x3be,0x3bf,0x3c0,0x3c1,0x3a2,0x3c3,0x3c4,0x3c5,0x3c6,0x3c7,0x3c8,0x3c9,0x3ca,0x3cb,0x3ac,0x3ad,0x3ae,0x3af,0x0,0x3b1,0x3b2,0x3b3,0x3b4,0x3b5,0x3b6,0x3b7,0x3b8,0x3b9,0x3ba,0x3bb,0x3bc,0x3bd,0x3be,0x3bf,0x3c0,0x3c1,0x3c3,0x3c3,0x3c4,0x3c5,0x3c6,0x3c7,0x3c8,0x3c9,0x3ca,0x3cb,0x3cc,0x3cd,0x3ce,0x3d7,0x3b2,0x3b8,0x3d2,0x3d3,0x3d4,0x3c6,0x3c0,0x3d7,0x3d9,0x3d9,0x3db,0x3db,0x3dd,0x3dd,0x3df,0x3df,0x3e1,0x3e1,0x3e3,0x3e3,0x3e5,0x3e5,0x3e7,0x3e7,0x3e9,0x3e9,0x3eb,0x3eb,0x3ed,0x3ed,0x3ef,0x3ef,0x3ba,0x3c1,0x3f2,0x3f3,0x3b8,0x3b5,0x3f6,0x3f8,0x3f8,0x3f2,0x3fb,0x3fb,0x3fc,0x37b,0x37c,0x37d};
-static uint16_t const small04[] = {0x450,0x451,0x452,0x453,0x454,0x455,0x456,0x457,0x458,0x459,0x45a,0x45b,0x45c,0x45d,0x45e,0x45f,0x430,0x431,0x432,0x433,0x434,0x435,0x436,0x437,0x438,0x439,0x43a,0x43b,0x43c,0x43d,0x43e,0x43f,0x440,0x441,0x442,0x443,0x444,0x445,0x446,0x447,0x448,0x449,0x44a,0x44b,0x44c,0x44d,0x44e,0x44f,0x430,0x431,0x432,0x433,0x434,0x435,0x436,0x437,0x438,0x439,0x43a,0x43b,0x43c,0x43d,0x43e,0x43f,0x440,0x441,0x442,0x443,0x444,0x445,0x446,0x447,0x448,0x449,0x44a,0x44b,0x44c,0x44d,0x44e,0x44f,0x450,0x451,0x452,0x453,0x454,0x455,0x456,0x457,0x458,0x459,0x45a,0x45b,0x45c,0x45d,0x45e,0x45f,0x461,0x461,0x463,0x463,0x465,0x465,0x467,0x467,0x469,0x469,0x46b,0x46b,0x46d,0x46d,0x46f,0x46f,0x471,0x471,0x473,0x473,0x475,0x475,0x477,0x477,0x479,0x479,0x47b,0x47b,0x47d,0x47d,0x47f,0x47f,0x481,0x481,0x482,0x483,0x484,0x485,0x486,0x487,0x488,0x489,0x48b,0x48b,0x48d,0x48d,0x48f,0x48f,0x491,0x491,0x493,0x493,0x495,0x495,0x497,0x497,0x499,0x499,0x49b,0x49b,0x49d,0x49d,0x49f,0x49f,0x4a1,0x4a1,0x4a3,0x4a3,0x4a5,0x4a5,0x4a7,0x4a7,0x4a9,0x4a9,0x4ab,0x4ab,0x4ad,0x4ad,0x4af,0x4af,0x4b1,0x4b1,0x4b3,0x4b3,0x4b5,0x4b5,0x4b7,0x4b7,0x4b9,0x4b9,0x4bb,0x4bb,0x4bd,0x4bd,0x4bf,0x4bf,0x4cf,0x4c2,0x4c2,0x4c4,0x4c4,0x4c6,0x4c6,0x4c8,0x4c8,0x4ca,0x4ca,0x4cc,0x4cc,0x4ce,0x4ce,0x4cf,0x4d1,0x4d1,0x4d3,0x4d3,0x4d5,0x4d5,0x4d7,0x4d7,0x4d9,0x4d9,0x4db,0x4db,0x4dd,0x4dd,0x4df,0x4df,0x4e1,0x4e1,0x4e3,0x4e3,0x4e5,0x4e5,0x4e7,0x4e7,0x4e9,0x4e9,0x4eb,0x4eb,0x4ed,0x4ed,0x4ef,0x4ef,0x4f1,0x4f1,0x4f3,0x4f3,0x4f5,0x4f5,0x4f7,0x4f7,0x4f9,0x4f9,0x4fb,0x4fb,0x4fd,0x4fd,0x4ff,0x4ff};
-static uint16_t const small05[] = {0x501,0x501,0x503,0x503,0x505,0x505,0x507,0x507,0x509,0x509,0x50b,0x50b,0x50d,0x50d,0x50f,0x50f,0x511,0x511,0x513,0x513,0x515,0x515,0x517,0x517,0x519,0x519,0x51b,0x51b,0x51d,0x51d,0x51f,0x51f,0x521,0x521,0x523,0x523,0x525,0x525,0x527,0x527,0x528,0x529,0x52a,0x52b,0x52c,0x52d,0x52e,0x52f,0x530,0x561,0x562,0x563,0x564,0x565,0x566,0x567,0x568,0x569,0x56a,0x56b,0x56c,0x56d,0x56e,0x56f,0x570,0x571,0x572,0x573,0x574,0x575,0x576,0x577,0x578,0x579,0x57a,0x57b,0x57c,0x57d,0x57e,0x57f,0x580,0x581,0x582,0x583,0x584,0x585,0x586,0x557,0x558,0x559,0x55a,0x55b,0x55c,0x55d,0x55e,0x55f,0x560,0x561,0x562,0x563,0x564,0x565,0x566,0x567,0x568,0x569,0x56a,0x56b,0x56c,0x56d,0x56e,0x56f,0x570,0x571,0x572,0x573,0x574,0x575,0x576,0x577,0x578,0x579,0x57a,0x57b,0x57c,0x57d,0x57e,0x57f,0x580,0x581,0x582,0x583,0x584,0x585,0x586,0x0,0x588,0x589,0x58a,0x58b,0x58c,0x58d,0x58e,0x58f,0x590,0x591,0x592,0x593,0x594,0x595,0x596,0x597,0x598,0x599,0x59a,0x59b,0x59c,0x59d,0x59e,0x59f,0x5a0,0x5a1,0x5a2,0x5a3,0x5a4,0x5a5,0x5a6,0x5a7,0x5a8,0x5a9,0x5aa,0x5ab,0x5ac,0x5ad,0x5ae,0x5af,0x5b0,0x5b1,0x5b2,0x5b3,0x5b4,0x5b5,0x5b6,0x5b7,0x5b8,0x5b9,0x5ba,0x5bb,0x5bc,0x5bd,0x5be,0x5bf,0x5c0,0x5c1,0x5c2,0x5c3,0x5c4,0x5c5,0x5c6,0x5c7,0x5c8,0x5c9,0x5ca,0x5cb,0x5cc,0x5cd,0x5ce,0x5cf,0x5d0,0x5d1,0x5d2,0x5d3,0x5d4,0x5d5,0x5d6,0x5d7,0x5d8,0x5d9,0x5da,0x5db,0x5dc,0x5dd,0x5de,0x5df,0x5e0,0x5e1,0x5e2,0x5e3,0x5e4,0x5e5,0x5e6,0x5e7,0x5e8,0x5e9,0x5ea,0x5eb,0x5ec,0x5ed,0x5ee,0x5ef,0x5f0,0x5f1,0x5f2,0x5f3,0x5f4,0x5f5,0x5f6,0x5f7,0x5f8,0x5f9,0x5fa,0x5fb,0x5fc,0x5fd,0x5fe,0x5ff};
-static uint16_t const small10[] = {0x1000,0x1001,0x1002,0x1003,0x1004,0x1005,0x1006,0x1007,0x1008,0x1009,0x100a,0x100b,0x100c,0x100d,0x100e,0x100f,0x1010,0x1011,0x1012,0x1013,0x1014,0x1015,0x1016,0x1017,0x1018,0x1019,0x101a,0x101b,0x101c,0x101d,0x101e,0x101f,0x1020,0x1021,0x1022,0x1023,0x1024,0x1025,0x1026,0x1027,0x1028,0x1029,0x102a,0x102b,0x102c,0x102d,0x102e,0x102f,0x1030,0x1031,0x1032,0x1033,0x1034,0x1035,0x1036,0x1037,0x1038,0x1039,0x103a,0x103b,0x103c,0x103d,0x103e,0x103f,0x1040,0x1041,0x1042,0x1043,0x1044,0x1045,0x1046,0x1047,0x1048,0x1049,0x104a,0x104b,0x104c,0x104d,0x104e,0x104f,0x1050,0x1051,0x1052,0x1053,0x1054,0x1055,0x1056,0x1057,0x1058,0x1059,0x105a,0x105b,0x105c,0x105d,0x105e,0x105f,0x1060,0x1061,0x1062,0x1063,0x1064,0x1065,0x1066,0x1067,0x1068,0x1069,0x106a,0x106b,0x106c,0x106d,0x106e,0x106f,0x1070,0x1071,0x1072,0x1073,0x1074,0x1075,0x1076,0x1077,0x1078,0x1079,0x107a,0x107b,0x107c,0x107d,0x107e,0x107f,0x1080,0x1081,0x1082,0x1083,0x1084,0x1085,0x1086,0x1087,0x1088,0x1089,0x108a,0x108b,0x108c,0x108d,0x108e,0x108f,0x1090,0x1091,0x1092,0x1093,0x1094,0x1095,0x1096,0x1097,0x1098,0x1099,0x109a,0x109b,0x109c,0x109d,0x109e,0x109f,0x2d00,0x2d01,0x2d02,0x2d03,0x2d04,0x2d05,0x2d06,0x2d07,0x2d08,0x2d09,0x2d0a,0x2d0b,0x2d0c,0x2d0d,0x2d0e,0x2d0f,0x2d10,0x2d11,0x2d12,0x2d13,0x2d14,0x2d15,0x2d16,0x2d17,0x2d18,0x2d19,0x2d1a,0x2d1b,0x2d1c,0x2d1d,0x2d1e,0x2d1f,0x2d20,0x2d21,0x2d22,0x2d23,0x2d24,0x2d25,0x10c6,0x10c7,0x10c8,0x10c9,0x10ca,0x10cb,0x10cc,0x10cd,0x10ce,0x10cf,0x10d0,0x10d1,0x10d2,0x10d3,0x10d4,0x10d5,0x10d6,0x10d7,0x10d8,0x10d9,0x10da,0x10db,0x10dc,0x10dd,0x10de,0x10df,0x10e0,0x10e1,0x10e2,0x10e3,0x10e4,0x10e5,0x10e6,0x10e7,0x10e8,0x10e9,0x10ea,0x10eb,0x10ec,0x10ed,0x10ee,0x10ef,0x10f0,0x10f1,0x10f2,0x10f3,0x10f4,0x10f5,0x10f6,0x10f7,0x10f8,0x10f9,0x10fa,0x10fb,0x10fc,0x10fd,0x10fe,0x10ff};
-static uint16_t const small1e[] = {0x1e01,0x1e01,0x1e03,0x1e03,0x1e05,0x1e05,0x1e07,0x1e07,0x1e09,0x1e09,0x1e0b,0x1e0b,0x1e0d,0x1e0d,0x1e0f,0x1e0f,0x1e11,0x1e11,0x1e13,0x1e13,0x1e15,0x1e15,0x1e17,0x1e17,0x1e19,0x1e19,0x1e1b,0x1e1b,0x1e1d,0x1e1d,0x1e1f,0x1e1f,0x1e21,0x1e21,0x1e23,0x1e23,0x1e25,0x1e25,0x1e27,0x1e27,0x1e29,0x1e29,0x1e2b,0x1e2b,0x1e2d,0x1e2d,0x1e2f,0x1e2f,0x1e31,0x1e31,0x1e33,0x1e33,0x1e35,0x1e35,0x1e37,0x1e37,0x1e39,0x1e39,0x1e3b,0x1e3b,0x1e3d,0x1e3d,0x1e3f,0x1e3f,0x1e41,0x1e41,0x1e43,0x1e43,0x1e45,0x1e45,0x1e47,0x1e47,0x1e49,0x1e49,0x1e4b,0x1e4b,0x1e4d,0x1e4d,0x1e4f,0x1e4f,0x1e51,0x1e51,0x1e53,0x1e53,0x1e55,0x1e55,0x1e57,0x1e57,0x1e59,0x1e59,0x1e5b,0x1e5b,0x1e5d,0x1e5d,0x1e5f,0x1e5f,0x1e61,0x1e61,0x1e63,0x1e63,0x1e65,0x1e65,0x1e67,0x1e67,0x1e69,0x1e69,0x1e6b,0x1e6b,0x1e6d,0x1e6d,0x1e6f,0x1e6f,0x1e71,0x1e71,0x1e73,0x1e73,0x1e75,0x1e75,0x1e77,0x1e77,0x1e79,0x1e79,0x1e7b,0x1e7b,0x1e7d,0x1e7d,0x1e7f,0x1e7f,0x1e81,0x1e81,0x1e83,0x1e83,0x1e85,0x1e85,0x1e87,0x1e87,0x1e89,0x1e89,0x1e8b,0x1e8b,0x1e8d,0x1e8d,0x1e8f,0x1e8f,0x1e91,0x1e91,0x1e93,0x1e93,0x1e95,0x1e95,0x0,0x0,0x0,0x0,0x0,0x1e61,0x1e9c,0x1e9d,0x0,0x1e9f,0x1ea1,0x1ea1,0x1ea3,0x1ea3,0x1ea5,0x1ea5,0x1ea7,0x1ea7,0x1ea9,0x1ea9,0x1eab,0x1eab,0x1ead,0x1ead,0x1eaf,0x1eaf,0x1eb1,0x1eb1,0x1eb3,0x1eb3,0x1eb5,0x1eb5,0x1eb7,0x1eb7,0x1eb9,0x1eb9,0x1ebb,0x1ebb,0x1ebd,0x1ebd,0x1ebf,0x1ebf,0x1ec1,0x1ec1,0x1ec3,0x1ec3,0x1ec5,0x1ec5,0x1ec7,0x1ec7,0x1ec9,0x1ec9,0x1ecb,0x1ecb,0x1ecd,0x1ecd,0x1ecf,0x1ecf,0x1ed1,0x1ed1,0x1ed3,0x1ed3,0x1ed5,0x1ed5,0x1ed7,0x1ed7,0x1ed9,0x1ed9,0x1edb,0x1edb,0x1edd,0x1edd,0x1edf,0x1edf,0x1ee1,0x1ee1,0x1ee3,0x1ee3,0x1ee5,0x1ee5,0x1ee7,0x1ee7,0x1ee9,0x1ee9,0x1eeb,0x1eeb,0x1eed,0x1eed,0x1eef,0x1eef,0x1ef1,0x1ef1,0x1ef3,0x1ef3,0x1ef5,0x1ef5,0x1ef7,0x1ef7,0x1ef9,0x1ef9,0x1efb,0x1efb,0x1efd,0x1efd,0x1eff,0x1eff};
-static uint16_t const small1f[] = {0x1f00,0x1f01,0x1f02,0x1f03,0x1f04,0x1f05,0x1f06,0x1f07,0x1f00,0x1f01,0x1f02,0x1f03,0x1f04,0x1f05,0x1f06,0x1f07,0x1f10,0x1f11,0x1f12,0x1f13,0x1f14,0x1f15,0x1f16,0x1f17,0x1f10,0x1f11,0x1f12,0x1f13,0x1f14,0x1f15,0x1f1e,0x1f1f,0x1f20,0x1f21,0x1f22,0x1f23,0x1f24,0x1f25,0x1f26,0x1f27,0x1f20,0x1f21,0x1f22,0x1f23,0x1f24,0x1f25,0x1f26,0x1f27,0x1f30,0x1f31,0x1f32,0x1f33,0x1f34,0x1f35,0x1f36,0x1f37,0x1f30,0x1f31,0x1f32,0x1f33,0x1f34,0x1f35,0x1f36,0x1f37,0x1f40,0x1f41,0x1f42,0x1f43,0x1f44,0x1f45,0x1f46,0x1f47,0x1f40,0x1f41,0x1f42,0x1f43,0x1f44,0x1f45,0x1f4e,0x1f4f,0x0,0x1f51,0x0,0x1f53,0x0,0x1f55,0x0,0x1f57,0x1f58,0x1f51,0x1f5a,0x1f53,0x1f5c,0x1f55,0x1f5e,0x1f57,0x1f60,0x1f61,0x1f62,0x1f63,0x1f64,0x1f65,0x1f66,0x1f67,0x1f60,0x1f61,0x1f62,0x1f63,0x1f64,0x1f65,0x1f66,0x1f67,0x1f70,0x1f71,0x1f72,0x1f73,0x1f74,0x1f75,0x1f76,0x1f77,0x1f78,0x1f79,0x1f7a,0x1f7b,0x1f7c,0x1f7d,0x1f7e,0x1f7f,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1fb0,0x1fb1,0x0,0x0,0x0,0x1fb5,0x0,0x0,0x1fb0,0x1fb1,0x1f70,0x1f71,0x0,0x1fbd,0x3b9,0x1fbf,0x1fc0,0x1fc1,0x0,0x0,0x0,0x1fc5,0x0,0x0,0x1f72,0x1f73,0x1f74,0x1f75,0x0,0x1fcd,0x1fce,0x1fcf,0x1fd0,0x1fd1,0x0,0x0,0x1fd4,0x1fd5,0x0,0x0,0x1fd0,0x1fd1,0x1f76,0x1f77,0x1fdc,0x1fdd,0x1fde,0x1fdf,0x1fe0,0x1fe1,0x0,0x0,0x0,0x1fe5,0x0,0x0,0x1fe0,0x1fe1,0x1f7a,0x1f7b,0x1fe5,0x1fed,0x1fee,0x1fef,0x1ff0,0x1ff1,0x0,0x0,0x0,0x1ff5,0x0,0x0,0x1f78,0x1f79,0x1f7c,0x1f7d,0x0,0x1ffd,0x1ffe,0x1fff};
-static uint16_t const small21[] = {0x2100,0x2101,0x2102,0x2103,0x2104,0x2105,0x2106,0x2107,0x2108,0x2109,0x210a,0x210b,0x210c,0x210d,0x210e,0x210f,0x2110,0x2111,0x2112,0x2113,0x2114,0x2115,0x2116,0x2117,0x2118,0x2119,0x211a,0x211b,0x211c,0x211d,0x211e,0x211f,0x2120,0x2121,0x2122,0x2123,0x2124,0x2125,0x3c9,0x2127,0x2128,0x2129,0x6b,0xe5,0x212c,0x212d,0x212e,0x212f,0x2130,0x2131,0x214e,0x2133,0x2134,0x2135,0x2136,0x2137,0x2138,0x2139,0x213a,0x213b,0x213c,0x213d,0x213e,0x213f,0x2140,0x2141,0x2142,0x2143,0x2144,0x2145,0x2146,0x2147,0x2148,0x2149,0x214a,0x214b,0x214c,0x214d,0x214e,0x214f,0x2150,0x2151,0x2152,0x2153,0x2154,0x2155,0x2156,0x2157,0x2158,0x2159,0x215a,0x215b,0x215c,0x215d,0x215e,0x215f,0x2170,0x2171,0x2172,0x2173,0x2174,0x2175,0x2176,0x2177,0x2178,0x2179,0x217a,0x217b,0x217c,0x217d,0x217e,0x217f,0x2170,0x2171,0x2172,0x2173,0x2174,0x2175,0x2176,0x2177,0x2178,0x2179,0x217a,0x217b,0x217c,0x217d,0x217e,0x217f,0x2180,0x2181,0x2182,0x2184,0x2184,0x2185,0x2186,0x2187,0x2188,0x2189,0x218a,0x218b,0x218c,0x218d,0x218e,0x218f,0x2190,0x2191,0x2192,0x2193,0x2194,0x2195,0x2196,0x2197,0x2198,0x2199,0x219a,0x219b,0x219c,0x219d,0x219e,0x219f,0x21a0,0x21a1,0x21a2,0x21a3,0x21a4,0x21a5,0x21a6,0x21a7,0x21a8,0x21a9,0x21aa,0x21ab,0x21ac,0x21ad,0x21ae,0x21af,0x21b0,0x21b1,0x21b2,0x21b3,0x21b4,0x21b5,0x21b6,0x21b7,0x21b8,0x21b9,0x21ba,0x21bb,0x21bc,0x21bd,0x21be,0x21bf,0x21c0,0x21c1,0x21c2,0x21c3,0x21c4,0x21c5,0x21c6,0x21c7,0x21c8,0x21c9,0x21ca,0x21cb,0x21cc,0x21cd,0x21ce,0x21cf,0x21d0,0x21d1,0x21d2,0x21d3,0x21d4,0x21d5,0x21d6,0x21d7,0x21d8,0x21d9,0x21da,0x21db,0x21dc,0x21dd,0x21de,0x21df,0x21e0,0x21e1,0x21e2,0x21e3,0x21e4,0x21e5,0x21e6,0x21e7,0x21e8,0x21e9,0x21ea,0x21eb,0x21ec,0x21ed,0x21ee,0x21ef,0x21f0,0x21f1,0x21f2,0x21f3,0x21f4,0x21f5,0x21f6,0x21f7,0x21f8,0x21f9,0x21fa,0x21fb,0x21fc,0x21fd,0x21fe,0x21ff};
-static uint16_t const small24[] = {0x2400,0x2401,0x2402,0x2403,0x2404,0x2405,0x2406,0x2407,0x2408,0x2409,0x240a,0x240b,0x240c,0x240d,0x240e,0x240f,0x2410,0x2411,0x2412,0x2413,0x2414,0x2415,0x2416,0x2417,0x2418,0x2419,0x241a,0x241b,0x241c,0x241d,0x241e,0x241f,0x2420,0x2421,0x2422,0x2423,0x2424,0x2425,0x2426,0x2427,0x2428,0x2429,0x242a,0x242b,0x242c,0x242d,0x242e,0x242f,0x2430,0x2431,0x2432,0x2433,0x2434,0x2435,0x2436,0x2437,0x2438,0x2439,0x243a,0x243b,0x243c,0x243d,0x243e,0x243f,0x2440,0x2441,0x2442,0x2443,0x2444,0x2445,0x2446,0x2447,0x2448,0x2449,0x244a,0x244b,0x244c,0x244d,0x244e,0x244f,0x2450,0x2451,0x2452,0x2453,0x2454,0x2455,0x2456,0x2457,0x2458,0x2459,0x245a,0x245b,0x245c,0x245d,0x245e,0x245f,0x2460,0x2461,0x2462,0x2463,0x2464,0x2465,0x2466,0x2467,0x2468,0x2469,0x246a,0x246b,0x246c,0x246d,0x246e,0x246f,0x2470,0x2471,0x2472,0x2473,0x2474,0x2475,0x2476,0x2477,0x2478,0x2479,0x247a,0x247b,0x247c,0x247d,0x247e,0x247f,0x2480,0x2481,0x2482,0x2483,0x2484,0x2485,0x2486,0x2487,0x2488,0x2489,0x248a,0x248b,0x248c,0x248d,0x248e,0x248f,0x2490,0x2491,0x2492,0x2493,0x2494,0x2495,0x2496,0x2497,0x2498,0x2499,0x249a,0x249b,0x249c,0x249d,0x249e,0x249f,0x24a0,0x24a1,0x24a2,0x24a3,0x24a4,0x24a5,0x24a6,0x24a7,0x24a8,0x24a9,0x24aa,0x24ab,0x24ac,0x24ad,0x24ae,0x24af,0x24b0,0x24b1,0x24b2,0x24b3,0x24b4,0x24b5,0x24d0,0x24d1,0x24d2,0x24d3,0x24d4,0x24d5,0x24d6,0x24d7,0x24d8,0x24d9,0x24da,0x24db,0x24dc,0x24dd,0x24de,0x24df,0x24e0,0x24e1,0x24e2,0x24e3,0x24e4,0x24e5,0x24e6,0x24e7,0x24e8,0x24e9,0x24d0,0x24d1,0x24d2,0x24d3,0x24d4,0x24d5,0x24d6,0x24d7,0x24d8,0x24d9,0x24da,0x24db,0x24dc,0x24dd,0x24de,0x24df,0x24e0,0x24e1,0x24e2,0x24e3,0x24e4,0x24e5,0x24e6,0x24e7,0x24e8,0x24e9,0x24ea,0x24eb,0x24ec,0x24ed,0x24ee,0x24ef,0x24f0,0x24f1,0x24f2,0x24f3,0x24f4,0x24f5,0x24f6,0x24f7,0x24f8,0x24f9,0x24fa,0x24fb,0x24fc,0x24fd,0x24fe,0x24ff};
-static uint16_t const small2c[] = {0x2c30,0x2c31,0x2c32,0x2c33,0x2c34,0x2c35,0x2c36,0x2c37,0x2c38,0x2c39,0x2c3a,0x2c3b,0x2c3c,0x2c3d,0x2c3e,0x2c3f,0x2c40,0x2c41,0x2c42,0x2c43,0x2c44,0x2c45,0x2c46,0x2c47,0x2c48,0x2c49,0x2c4a,0x2c4b,0x2c4c,0x2c4d,0x2c4e,0x2c4f,0x2c50,0x2c51,0x2c52,0x2c53,0x2c54,0x2c55,0x2c56,0x2c57,0x2c58,0x2c59,0x2c5a,0x2c5b,0x2c5c,0x2c5d,0x2c5e,0x2c2f,0x2c30,0x2c31,0x2c32,0x2c33,0x2c34,0x2c35,0x2c36,0x2c37,0x2c38,0x2c39,0x2c3a,0x2c3b,0x2c3c,0x2c3d,0x2c3e,0x2c3f,0x2c40,0x2c41,0x2c42,0x2c43,0x2c44,0x2c45,0x2c46,0x2c47,0x2c48,0x2c49,0x2c4a,0x2c4b,0x2c4c,0x2c4d,0x2c4e,0x2c4f,0x2c50,0x2c51,0x2c52,0x2c53,0x2c54,0x2c55,0x2c56,0x2c57,0x2c58,0x2c59,0x2c5a,0x2c5b,0x2c5c,0x2c5d,0x2c5e,0x2c5f,0x2c61,0x2c61,0x26b,0x1d7d,0x27d,0x2c65,0x2c66,0x2c68,0x2c68,0x2c6a,0x2c6a,0x2c6c,0x2c6c,0x251,0x271,0x250,0x252,0x2c71,0x2c73,0x2c73,0x2c74,0x2c76,0x2c76,0x2c77,0x2c78,0x2c79,0x2c7a,0x2c7b,0x2c7c,0x2c7d,0x23f,0x240,0x2c81,0x2c81,0x2c83,0x2c83,0x2c85,0x2c85,0x2c87,0x2c87,0x2c89,0x2c89,0x2c8b,0x2c8b,0x2c8d,0x2c8d,0x2c8f,0x2c8f,0x2c91,0x2c91,0x2c93,0x2c93,0x2c95,0x2c95,0x2c97,0x2c97,0x2c99,0x2c99,0x2c9b,0x2c9b,0x2c9d,0x2c9d,0x2c9f,0x2c9f,0x2ca1,0x2ca1,0x2ca3,0x2ca3,0x2ca5,0x2ca5,0x2ca7,0x2ca7,0x2ca9,0x2ca9,0x2cab,0x2cab,0x2cad,0x2cad,0x2caf,0x2caf,0x2cb1,0x2cb1,0x2cb3,0x2cb3,0x2cb5,0x2cb5,0x2cb7,0x2cb7,0x2cb9,0x2cb9,0x2cbb,0x2cbb,0x2cbd,0x2cbd,0x2cbf,0x2cbf,0x2cc1,0x2cc1,0x2cc3,0x2cc3,0x2cc5,0x2cc5,0x2cc7,0x2cc7,0x2cc9,0x2cc9,0x2ccb,0x2ccb,0x2ccd,0x2ccd,0x2ccf,0x2ccf,0x2cd1,0x2cd1,0x2cd3,0x2cd3,0x2cd5,0x2cd5,0x2cd7,0x2cd7,0x2cd9,0x2cd9,0x2cdb,0x2cdb,0x2cdd,0x2cdd,0x2cdf,0x2cdf,0x2ce1,0x2ce1,0x2ce3,0x2ce3,0x2ce4,0x2ce5,0x2ce6,0x2ce7,0x2ce8,0x2ce9,0x2cea,0x2cec,0x2cec,0x2cee,0x2cee,0x2cef,0x2cf0,0x2cf1,0x2cf2,0x2cf3,0x2cf4,0x2cf5,0x2cf6,0x2cf7,0x2cf8,0x2cf9,0x2cfa,0x2cfb,0x2cfc,0x2cfd,0x2cfe,0x2cff};
-static uint16_t const smalla6[] = {0xa600,0xa601,0xa602,0xa603,0xa604,0xa605,0xa606,0xa607,0xa608,0xa609,0xa60a,0xa60b,0xa60c,0xa60d,0xa60e,0xa60f,0xa610,0xa611,0xa612,0xa613,0xa614,0xa615,0xa616,0xa617,0xa618,0xa619,0xa61a,0xa61b,0xa61c,0xa61d,0xa61e,0xa61f,0xa620,0xa621,0xa622,0xa623,0xa624,0xa625,0xa626,0xa627,0xa628,0xa629,0xa62a,0xa62b,0xa62c,0xa62d,0xa62e,0xa62f,0xa630,0xa631,0xa632,0xa633,0xa634,0xa635,0xa636,0xa637,0xa638,0xa639,0xa63a,0xa63b,0xa63c,0xa63d,0xa63e,0xa63f,0xa641,0xa641,0xa643,0xa643,0xa645,0xa645,0xa647,0xa647,0xa649,0xa649,0xa64b,0xa64b,0xa64d,0xa64d,0xa64f,0xa64f,0xa651,0xa651,0xa653,0xa653,0xa655,0xa655,0xa657,0xa657,0xa659,0xa659,0xa65b,0xa65b,0xa65d,0xa65d,0xa65f,0xa65f,0xa661,0xa661,0xa663,0xa663,0xa665,0xa665,0xa667,0xa667,0xa669,0xa669,0xa66b,0xa66b,0xa66d,0xa66d,0xa66e,0xa66f,0xa670,0xa671,0xa672,0xa673,0xa674,0xa675,0xa676,0xa677,0xa678,0xa679,0xa67a,0xa67b,0xa67c,0xa67d,0xa67e,0xa67f,0xa681,0xa681,0xa683,0xa683,0xa685,0xa685,0xa687,0xa687,0xa689,0xa689,0xa68b,0xa68b,0xa68d,0xa68d,0xa68f,0xa68f,0xa691,0xa691,0xa693,0xa693,0xa695,0xa695,0xa697,0xa697,0xa698,0xa699,0xa69a,0xa69b,0xa69c,0xa69d,0xa69e,0xa69f,0xa6a0,0xa6a1,0xa6a2,0xa6a3,0xa6a4,0xa6a5,0xa6a6,0xa6a7,0xa6a8,0xa6a9,0xa6aa,0xa6ab,0xa6ac,0xa6ad,0xa6ae,0xa6af,0xa6b0,0xa6b1,0xa6b2,0xa6b3,0xa6b4,0xa6b5,0xa6b6,0xa6b7,0xa6b8,0xa6b9,0xa6ba,0xa6bb,0xa6bc,0xa6bd,0xa6be,0xa6bf,0xa6c0,0xa6c1,0xa6c2,0xa6c3,0xa6c4,0xa6c5,0xa6c6,0xa6c7,0xa6c8,0xa6c9,0xa6ca,0xa6cb,0xa6cc,0xa6cd,0xa6ce,0xa6cf,0xa6d0,0xa6d1,0xa6d2,0xa6d3,0xa6d4,0xa6d5,0xa6d6,0xa6d7,0xa6d8,0xa6d9,0xa6da,0xa6db,0xa6dc,0xa6dd,0xa6de,0xa6df,0xa6e0,0xa6e1,0xa6e2,0xa6e3,0xa6e4,0xa6e5,0xa6e6,0xa6e7,0xa6e8,0xa6e9,0xa6ea,0xa6eb,0xa6ec,0xa6ed,0xa6ee,0xa6ef,0xa6f0,0xa6f1,0xa6f2,0xa6f3,0xa6f4,0xa6f5,0xa6f6,0xa6f7,0xa6f8,0xa6f9,0xa6fa,0xa6fb,0xa6fc,0xa6fd,0xa6fe,0xa6ff};
-static uint16_t const smalla7[] = {0xa700,0xa701,0xa702,0xa703,0xa704,0xa705,0xa706,0xa707,0xa708,0xa709,0xa70a,0xa70b,0xa70c,0xa70d,0xa70e,0xa70f,0xa710,0xa711,0xa712,0xa713,0xa714,0xa715,0xa716,0xa717,0xa718,0xa719,0xa71a,0xa71b,0xa71c,0xa71d,0xa71e,0xa71f,0xa720,0xa721,0xa723,0xa723,0xa725,0xa725,0xa727,0xa727,0xa729,0xa729,0xa72b,0xa72b,0xa72d,0xa72d,0xa72f,0xa72f,0xa730,0xa731,0xa733,0xa733,0xa735,0xa735,0xa737,0xa737,0xa739,0xa739,0xa73b,0xa73b,0xa73d,0xa73d,0xa73f,0xa73f,0xa741,0xa741,0xa743,0xa743,0xa745,0xa745,0xa747,0xa747,0xa749,0xa749,0xa74b,0xa74b,0xa74d,0xa74d,0xa74f,0xa74f,0xa751,0xa751,0xa753,0xa753,0xa755,0xa755,0xa757,0xa757,0xa759,0xa759,0xa75b,0xa75b,0xa75d,0xa75d,0xa75f,0xa75f,0xa761,0xa761,0xa763,0xa763,0xa765,0xa765,0xa767,0xa767,0xa769,0xa769,0xa76b,0xa76b,0xa76d,0xa76d,0xa76f,0xa76f,0xa770,0xa771,0xa772,0xa773,0xa774,0xa775,0xa776,0xa777,0xa778,0xa77a,0xa77a,0xa77c,0xa77c,0x1d79,0xa77f,0xa77f,0xa781,0xa781,0xa783,0xa783,0xa785,0xa785,0xa787,0xa787,0xa788,0xa789,0xa78a,0xa78c,0xa78c,0x265,0xa78e,0xa78f,0xa791,0xa791,0xa792,0xa793,0xa794,0xa795,0xa796,0xa797,0xa798,0xa799,0xa79a,0xa79b,0xa79c,0xa79d,0xa79e,0xa79f,0xa7a1,0xa7a1,0xa7a3,0xa7a3,0xa7a5,0xa7a5,0xa7a7,0xa7a7,0xa7a9,0xa7a9,0xa7aa,0xa7ab,0xa7ac,0xa7ad,0xa7ae,0xa7af,0xa7b0,0xa7b1,0xa7b2,0xa7b3,0xa7b4,0xa7b5,0xa7b6,0xa7b7,0xa7b8,0xa7b9,0xa7ba,0xa7bb,0xa7bc,0xa7bd,0xa7be,0xa7bf,0xa7c0,0xa7c1,0xa7c2,0xa7c3,0xa7c4,0xa7c5,0xa7c6,0xa7c7,0xa7c8,0xa7c9,0xa7ca,0xa7cb,0xa7cc,0xa7cd,0xa7ce,0xa7cf,0xa7d0,0xa7d1,0xa7d2,0xa7d3,0xa7d4,0xa7d5,0xa7d6,0xa7d7,0xa7d8,0xa7d9,0xa7da,0xa7db,0xa7dc,0xa7dd,0xa7de,0xa7df,0xa7e0,0xa7e1,0xa7e2,0xa7e3,0xa7e4,0xa7e5,0xa7e6,0xa7e7,0xa7e8,0xa7e9,0xa7ea,0xa7eb,0xa7ec,0xa7ed,0xa7ee,0xa7ef,0xa7f0,0xa7f1,0xa7f2,0xa7f3,0xa7f4,0xa7f5,0xa7f6,0xa7f7,0xa7f8,0xa7f9,0xa7fa,0xa7fb,0xa7fc,0xa7fd,0xa7fe,0xa7ff};
-static uint16_t const smallff[] = {0xff00,0xff01,0xff02,0xff03,0xff04,0xff05,0xff06,0xff07,0xff08,0xff09,0xff0a,0xff0b,0xff0c,0xff0d,0xff0e,0xff0f,0xff10,0xff11,0xff12,0xff13,0xff14,0xff15,0xff16,0xff17,0xff18,0xff19,0xff1a,0xff1b,0xff1c,0xff1d,0xff1e,0xff1f,0xff20,0xff41,0xff42,0xff43,0xff44,0xff45,0xff46,0xff47,0xff48,0xff49,0xff4a,0xff4b,0xff4c,0xff4d,0xff4e,0xff4f,0xff50,0xff51,0xff52,0xff53,0xff54,0xff55,0xff56,0xff57,0xff58,0xff59,0xff5a,0xff3b,0xff3c,0xff3d,0xff3e,0xff3f,0xff40,0xff41,0xff42,0xff43,0xff44,0xff45,0xff46,0xff47,0xff48,0xff49,0xff4a,0xff4b,0xff4c,0xff4d,0xff4e,0xff4f,0xff50,0xff51,0xff52,0xff53,0xff54,0xff55,0xff56,0xff57,0xff58,0xff59,0xff5a,0xff5b,0xff5c,0xff5d,0xff5e,0xff5f,0xff60,0xff61,0xff62,0xff63,0xff64,0xff65,0xff66,0xff67,0xff68,0xff69,0xff6a,0xff6b,0xff6c,0xff6d,0xff6e,0xff6f,0xff70,0xff71,0xff72,0xff73,0xff74,0xff75,0xff76,0xff77,0xff78,0xff79,0xff7a,0xff7b,0xff7c,0xff7d,0xff7e,0xff7f,0xff80,0xff81,0xff82,0xff83,0xff84,0xff85,0xff86,0xff87,0xff88,0xff89,0xff8a,0xff8b,0xff8c,0xff8d,0xff8e,0xff8f,0xff90,0xff91,0xff92,0xff93,0xff94,0xff95,0xff96,0xff97,0xff98,0xff99,0xff9a,0xff9b,0xff9c,0xff9d,0xff9e,0xff9f,0xffa0,0xffa1,0xffa2,0xffa3,0xffa4,0xffa5,0xffa6,0xffa7,0xffa8,0xffa9,0xffaa,0xffab,0xffac,0xffad,0xffae,0xffaf,0xffb0,0xffb1,0xffb2,0xffb3,0xffb4,0xffb5,0xffb6,0xffb7,0xffb8,0xffb9,0xffba,0xffbb,0xffbc,0xffbd,0xffbe,0xffbf,0xffc0,0xffc1,0xffc2,0xffc3,0xffc4,0xffc5,0xffc6,0xffc7,0xffc8,0xffc9,0xffca,0xffcb,0xffcc,0xffcd,0xffce,0xffcf,0xffd0,0xffd1,0xffd2,0xffd3,0xffd4,0xffd5,0xffd6,0xffd7,0xffd8,0xffd9,0xffda,0xffdb,0xffdc,0xffdd,0xffde,0xffdf,0xffe0,0xffe1,0xffe2,0xffe3,0xffe4,0xffe5,0xffe6,0xffe7,0xffe8,0xffe9,0xffea,0xffeb,0xffec,0xffed,0xffee,0xffef,0xfff0,0xfff1,0xfff2,0xfff3,0xfff4,0xfff5,0xfff6,0xfff7,0xfff8,0xfff9,0xfffa,0xfffb,0xfffc,0xfffd,0xfffe,0xffff};
+static uint16_t const small00[] = {
+    0x0,  0x1,  0x2,  0x3,  0x4,  0x5,  0x6,  0x7,  0x8,  0x9,  0xa,   0xb,  0xc,  0xd,  0xe,  0xf,  0x10, 0x11, 0x12,
+    0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d,  0x1e, 0x1f, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25,
+    0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30,  0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38,
+    0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f, 0x40, 0x61, 0x62, 0x63,  0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6a, 0x6b,
+    0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76,  0x77, 0x78, 0x79, 0x7a, 0x5b, 0x5c, 0x5d, 0x5e,
+    0x5f, 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,  0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f, 0x70, 0x71,
+    0x72, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, 0x7a, 0x7b, 0x7c,  0x7d, 0x7e, 0x7f, 0x80, 0x81, 0x82, 0x83, 0x84,
+    0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,  0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
+    0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f, 0xa0, 0xa1, 0xa2,  0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa,
+    0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0x3bc, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd,
+    0xbe, 0xbf, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8,  0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef, 0xf0,
+    0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xd7, 0xf8, 0xf9, 0xfa, 0xfb,  0xfc, 0xfd, 0xfe, 0x0,  0xe0, 0xe1, 0xe2, 0xe3,
+    0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee,  0xef, 0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6,
+    0xf7, 0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff};
+static uint16_t const small01[] = {
+    0x101, 0x101, 0x103, 0x103, 0x105, 0x105, 0x107, 0x107, 0x109, 0x109, 0x10b, 0x10b, 0x10d, 0x10d, 0x10f, 0x10f,
+    0x111, 0x111, 0x113, 0x113, 0x115, 0x115, 0x117, 0x117, 0x119, 0x119, 0x11b, 0x11b, 0x11d, 0x11d, 0x11f, 0x11f,
+    0x121, 0x121, 0x123, 0x123, 0x125, 0x125, 0x127, 0x127, 0x129, 0x129, 0x12b, 0x12b, 0x12d, 0x12d, 0x12f, 0x12f,
+    0x0,   0x131, 0x133, 0x133, 0x135, 0x135, 0x137, 0x137, 0x138, 0x13a, 0x13a, 0x13c, 0x13c, 0x13e, 0x13e, 0x140,
+    0x140, 0x142, 0x142, 0x144, 0x144, 0x146, 0x146, 0x148, 0x148, 0x0,   0x14b, 0x14b, 0x14d, 0x14d, 0x14f, 0x14f,
+    0x151, 0x151, 0x153, 0x153, 0x155, 0x155, 0x157, 0x157, 0x159, 0x159, 0x15b, 0x15b, 0x15d, 0x15d, 0x15f, 0x15f,
+    0x161, 0x161, 0x163, 0x163, 0x165, 0x165, 0x167, 0x167, 0x169, 0x169, 0x16b, 0x16b, 0x16d, 0x16d, 0x16f, 0x16f,
+    0x171, 0x171, 0x173, 0x173, 0x175, 0x175, 0x177, 0x177, 0xff,  0x17a, 0x17a, 0x17c, 0x17c, 0x17e, 0x17e, 0x73,
+    0x180, 0x253, 0x183, 0x183, 0x185, 0x185, 0x254, 0x188, 0x188, 0x256, 0x257, 0x18c, 0x18c, 0x18d, 0x1dd, 0x259,
+    0x25b, 0x192, 0x192, 0x260, 0x263, 0x195, 0x269, 0x268, 0x199, 0x199, 0x19a, 0x19b, 0x26f, 0x272, 0x19e, 0x275,
+    0x1a1, 0x1a1, 0x1a3, 0x1a3, 0x1a5, 0x1a5, 0x280, 0x1a8, 0x1a8, 0x283, 0x1aa, 0x1ab, 0x1ad, 0x1ad, 0x288, 0x1b0,
+    0x1b0, 0x28a, 0x28b, 0x1b4, 0x1b4, 0x1b6, 0x1b6, 0x292, 0x1b9, 0x1b9, 0x1ba, 0x1bb, 0x1bd, 0x1bd, 0x1be, 0x1bf,
+    0x1c0, 0x1c1, 0x1c2, 0x1c3, 0x1c6, 0x1c6, 0x1c6, 0x1c9, 0x1c9, 0x1c9, 0x1cc, 0x1cc, 0x1cc, 0x1ce, 0x1ce, 0x1d0,
+    0x1d0, 0x1d2, 0x1d2, 0x1d4, 0x1d4, 0x1d6, 0x1d6, 0x1d8, 0x1d8, 0x1da, 0x1da, 0x1dc, 0x1dc, 0x1dd, 0x1df, 0x1df,
+    0x1e1, 0x1e1, 0x1e3, 0x1e3, 0x1e5, 0x1e5, 0x1e7, 0x1e7, 0x1e9, 0x1e9, 0x1eb, 0x1eb, 0x1ed, 0x1ed, 0x1ef, 0x1ef,
+    0x0,   0x1f3, 0x1f3, 0x1f3, 0x1f5, 0x1f5, 0x195, 0x1bf, 0x1f9, 0x1f9, 0x1fb, 0x1fb, 0x1fd, 0x1fd, 0x1ff, 0x1ff};
+static uint16_t const small02[] = {
+    0x201, 0x201, 0x203, 0x203, 0x205, 0x205, 0x207, 0x207, 0x209, 0x209, 0x20b,  0x20b, 0x20d, 0x20d, 0x20f,  0x20f,
+    0x211, 0x211, 0x213, 0x213, 0x215, 0x215, 0x217, 0x217, 0x219, 0x219, 0x21b,  0x21b, 0x21d, 0x21d, 0x21f,  0x21f,
+    0x19e, 0x221, 0x223, 0x223, 0x225, 0x225, 0x227, 0x227, 0x229, 0x229, 0x22b,  0x22b, 0x22d, 0x22d, 0x22f,  0x22f,
+    0x231, 0x231, 0x233, 0x233, 0x234, 0x235, 0x236, 0x237, 0x238, 0x239, 0x2c65, 0x23c, 0x23c, 0x19a, 0x2c66, 0x23f,
+    0x240, 0x242, 0x242, 0x180, 0x289, 0x28c, 0x247, 0x247, 0x249, 0x249, 0x24b,  0x24b, 0x24d, 0x24d, 0x24f,  0x24f,
+    0x250, 0x251, 0x252, 0x253, 0x254, 0x255, 0x256, 0x257, 0x258, 0x259, 0x25a,  0x25b, 0x25c, 0x25d, 0x25e,  0x25f,
+    0x260, 0x261, 0x262, 0x263, 0x264, 0x265, 0x266, 0x267, 0x268, 0x269, 0x26a,  0x26b, 0x26c, 0x26d, 0x26e,  0x26f,
+    0x270, 0x271, 0x272, 0x273, 0x274, 0x275, 0x276, 0x277, 0x278, 0x279, 0x27a,  0x27b, 0x27c, 0x27d, 0x27e,  0x27f,
+    0x280, 0x281, 0x282, 0x283, 0x284, 0x285, 0x286, 0x287, 0x288, 0x289, 0x28a,  0x28b, 0x28c, 0x28d, 0x28e,  0x28f,
+    0x290, 0x291, 0x292, 0x293, 0x294, 0x295, 0x296, 0x297, 0x298, 0x299, 0x29a,  0x29b, 0x29c, 0x29d, 0x29e,  0x29f,
+    0x2a0, 0x2a1, 0x2a2, 0x2a3, 0x2a4, 0x2a5, 0x2a6, 0x2a7, 0x2a8, 0x2a9, 0x2aa,  0x2ab, 0x2ac, 0x2ad, 0x2ae,  0x2af,
+    0x2b0, 0x2b1, 0x2b2, 0x2b3, 0x2b4, 0x2b5, 0x2b6, 0x2b7, 0x2b8, 0x2b9, 0x2ba,  0x2bb, 0x2bc, 0x2bd, 0x2be,  0x2bf,
+    0x2c0, 0x2c1, 0x2c2, 0x2c3, 0x2c4, 0x2c5, 0x2c6, 0x2c7, 0x2c8, 0x2c9, 0x2ca,  0x2cb, 0x2cc, 0x2cd, 0x2ce,  0x2cf,
+    0x2d0, 0x2d1, 0x2d2, 0x2d3, 0x2d4, 0x2d5, 0x2d6, 0x2d7, 0x2d8, 0x2d9, 0x2da,  0x2db, 0x2dc, 0x2dd, 0x2de,  0x2df,
+    0x2e0, 0x2e1, 0x2e2, 0x2e3, 0x2e4, 0x2e5, 0x2e6, 0x2e7, 0x2e8, 0x2e9, 0x2ea,  0x2eb, 0x2ec, 0x2ed, 0x2ee,  0x2ef,
+    0x2f0, 0x2f1, 0x2f2, 0x2f3, 0x2f4, 0x2f5, 0x2f6, 0x2f7, 0x2f8, 0x2f9, 0x2fa,  0x2fb, 0x2fc, 0x2fd, 0x2fe,  0x2ff};
+static uint16_t const small03[] = {
+    0x300, 0x301, 0x302, 0x303, 0x304, 0x305, 0x306, 0x307, 0x308, 0x309, 0x30a, 0x30b, 0x30c, 0x30d, 0x30e, 0x30f,
+    0x310, 0x311, 0x312, 0x313, 0x314, 0x315, 0x316, 0x317, 0x318, 0x319, 0x31a, 0x31b, 0x31c, 0x31d, 0x31e, 0x31f,
+    0x320, 0x321, 0x322, 0x323, 0x324, 0x325, 0x326, 0x327, 0x328, 0x329, 0x32a, 0x32b, 0x32c, 0x32d, 0x32e, 0x32f,
+    0x330, 0x331, 0x332, 0x333, 0x334, 0x335, 0x336, 0x337, 0x338, 0x339, 0x33a, 0x33b, 0x33c, 0x33d, 0x33e, 0x33f,
+    0x340, 0x341, 0x342, 0x343, 0x344, 0x3b9, 0x346, 0x347, 0x348, 0x349, 0x34a, 0x34b, 0x34c, 0x34d, 0x34e, 0x34f,
+    0x350, 0x351, 0x352, 0x353, 0x354, 0x355, 0x356, 0x357, 0x358, 0x359, 0x35a, 0x35b, 0x35c, 0x35d, 0x35e, 0x35f,
+    0x360, 0x361, 0x362, 0x363, 0x364, 0x365, 0x366, 0x367, 0x368, 0x369, 0x36a, 0x36b, 0x36c, 0x36d, 0x36e, 0x36f,
+    0x371, 0x371, 0x373, 0x373, 0x374, 0x375, 0x377, 0x377, 0x378, 0x379, 0x37a, 0x37b, 0x37c, 0x37d, 0x37e, 0x37f,
+    0x380, 0x381, 0x382, 0x383, 0x384, 0x385, 0x3ac, 0x387, 0x3ad, 0x3ae, 0x3af, 0x38b, 0x3cc, 0x38d, 0x3cd, 0x3ce,
+    0x0,   0x3b1, 0x3b2, 0x3b3, 0x3b4, 0x3b5, 0x3b6, 0x3b7, 0x3b8, 0x3b9, 0x3ba, 0x3bb, 0x3bc, 0x3bd, 0x3be, 0x3bf,
+    0x3c0, 0x3c1, 0x3a2, 0x3c3, 0x3c4, 0x3c5, 0x3c6, 0x3c7, 0x3c8, 0x3c9, 0x3ca, 0x3cb, 0x3ac, 0x3ad, 0x3ae, 0x3af,
+    0x0,   0x3b1, 0x3b2, 0x3b3, 0x3b4, 0x3b5, 0x3b6, 0x3b7, 0x3b8, 0x3b9, 0x3ba, 0x3bb, 0x3bc, 0x3bd, 0x3be, 0x3bf,
+    0x3c0, 0x3c1, 0x3c3, 0x3c3, 0x3c4, 0x3c5, 0x3c6, 0x3c7, 0x3c8, 0x3c9, 0x3ca, 0x3cb, 0x3cc, 0x3cd, 0x3ce, 0x3d7,
+    0x3b2, 0x3b8, 0x3d2, 0x3d3, 0x3d4, 0x3c6, 0x3c0, 0x3d7, 0x3d9, 0x3d9, 0x3db, 0x3db, 0x3dd, 0x3dd, 0x3df, 0x3df,
+    0x3e1, 0x3e1, 0x3e3, 0x3e3, 0x3e5, 0x3e5, 0x3e7, 0x3e7, 0x3e9, 0x3e9, 0x3eb, 0x3eb, 0x3ed, 0x3ed, 0x3ef, 0x3ef,
+    0x3ba, 0x3c1, 0x3f2, 0x3f3, 0x3b8, 0x3b5, 0x3f6, 0x3f8, 0x3f8, 0x3f2, 0x3fb, 0x3fb, 0x3fc, 0x37b, 0x37c, 0x37d};
+static uint16_t const small04[] = {
+    0x450, 0x451, 0x452, 0x453, 0x454, 0x455, 0x456, 0x457, 0x458, 0x459, 0x45a, 0x45b, 0x45c, 0x45d, 0x45e, 0x45f,
+    0x430, 0x431, 0x432, 0x433, 0x434, 0x435, 0x436, 0x437, 0x438, 0x439, 0x43a, 0x43b, 0x43c, 0x43d, 0x43e, 0x43f,
+    0x440, 0x441, 0x442, 0x443, 0x444, 0x445, 0x446, 0x447, 0x448, 0x449, 0x44a, 0x44b, 0x44c, 0x44d, 0x44e, 0x44f,
+    0x430, 0x431, 0x432, 0x433, 0x434, 0x435, 0x436, 0x437, 0x438, 0x439, 0x43a, 0x43b, 0x43c, 0x43d, 0x43e, 0x43f,
+    0x440, 0x441, 0x442, 0x443, 0x444, 0x445, 0x446, 0x447, 0x448, 0x449, 0x44a, 0x44b, 0x44c, 0x44d, 0x44e, 0x44f,
+    0x450, 0x451, 0x452, 0x453, 0x454, 0x455, 0x456, 0x457, 0x458, 0x459, 0x45a, 0x45b, 0x45c, 0x45d, 0x45e, 0x45f,
+    0x461, 0x461, 0x463, 0x463, 0x465, 0x465, 0x467, 0x467, 0x469, 0x469, 0x46b, 0x46b, 0x46d, 0x46d, 0x46f, 0x46f,
+    0x471, 0x471, 0x473, 0x473, 0x475, 0x475, 0x477, 0x477, 0x479, 0x479, 0x47b, 0x47b, 0x47d, 0x47d, 0x47f, 0x47f,
+    0x481, 0x481, 0x482, 0x483, 0x484, 0x485, 0x486, 0x487, 0x488, 0x489, 0x48b, 0x48b, 0x48d, 0x48d, 0x48f, 0x48f,
+    0x491, 0x491, 0x493, 0x493, 0x495, 0x495, 0x497, 0x497, 0x499, 0x499, 0x49b, 0x49b, 0x49d, 0x49d, 0x49f, 0x49f,
+    0x4a1, 0x4a1, 0x4a3, 0x4a3, 0x4a5, 0x4a5, 0x4a7, 0x4a7, 0x4a9, 0x4a9, 0x4ab, 0x4ab, 0x4ad, 0x4ad, 0x4af, 0x4af,
+    0x4b1, 0x4b1, 0x4b3, 0x4b3, 0x4b5, 0x4b5, 0x4b7, 0x4b7, 0x4b9, 0x4b9, 0x4bb, 0x4bb, 0x4bd, 0x4bd, 0x4bf, 0x4bf,
+    0x4cf, 0x4c2, 0x4c2, 0x4c4, 0x4c4, 0x4c6, 0x4c6, 0x4c8, 0x4c8, 0x4ca, 0x4ca, 0x4cc, 0x4cc, 0x4ce, 0x4ce, 0x4cf,
+    0x4d1, 0x4d1, 0x4d3, 0x4d3, 0x4d5, 0x4d5, 0x4d7, 0x4d7, 0x4d9, 0x4d9, 0x4db, 0x4db, 0x4dd, 0x4dd, 0x4df, 0x4df,
+    0x4e1, 0x4e1, 0x4e3, 0x4e3, 0x4e5, 0x4e5, 0x4e7, 0x4e7, 0x4e9, 0x4e9, 0x4eb, 0x4eb, 0x4ed, 0x4ed, 0x4ef, 0x4ef,
+    0x4f1, 0x4f1, 0x4f3, 0x4f3, 0x4f5, 0x4f5, 0x4f7, 0x4f7, 0x4f9, 0x4f9, 0x4fb, 0x4fb, 0x4fd, 0x4fd, 0x4ff, 0x4ff};
+static uint16_t const small05[] = {
+    0x501, 0x501, 0x503, 0x503, 0x505, 0x505, 0x507, 0x507, 0x509, 0x509, 0x50b, 0x50b, 0x50d, 0x50d, 0x50f, 0x50f,
+    0x511, 0x511, 0x513, 0x513, 0x515, 0x515, 0x517, 0x517, 0x519, 0x519, 0x51b, 0x51b, 0x51d, 0x51d, 0x51f, 0x51f,
+    0x521, 0x521, 0x523, 0x523, 0x525, 0x525, 0x527, 0x527, 0x528, 0x529, 0x52a, 0x52b, 0x52c, 0x52d, 0x52e, 0x52f,
+    0x530, 0x561, 0x562, 0x563, 0x564, 0x565, 0x566, 0x567, 0x568, 0x569, 0x56a, 0x56b, 0x56c, 0x56d, 0x56e, 0x56f,
+    0x570, 0x571, 0x572, 0x573, 0x574, 0x575, 0x576, 0x577, 0x578, 0x579, 0x57a, 0x57b, 0x57c, 0x57d, 0x57e, 0x57f,
+    0x580, 0x581, 0x582, 0x583, 0x584, 0x585, 0x586, 0x557, 0x558, 0x559, 0x55a, 0x55b, 0x55c, 0x55d, 0x55e, 0x55f,
+    0x560, 0x561, 0x562, 0x563, 0x564, 0x565, 0x566, 0x567, 0x568, 0x569, 0x56a, 0x56b, 0x56c, 0x56d, 0x56e, 0x56f,
+    0x570, 0x571, 0x572, 0x573, 0x574, 0x575, 0x576, 0x577, 0x578, 0x579, 0x57a, 0x57b, 0x57c, 0x57d, 0x57e, 0x57f,
+    0x580, 0x581, 0x582, 0x583, 0x584, 0x585, 0x586, 0x0,   0x588, 0x589, 0x58a, 0x58b, 0x58c, 0x58d, 0x58e, 0x58f,
+    0x590, 0x591, 0x592, 0x593, 0x594, 0x595, 0x596, 0x597, 0x598, 0x599, 0x59a, 0x59b, 0x59c, 0x59d, 0x59e, 0x59f,
+    0x5a0, 0x5a1, 0x5a2, 0x5a3, 0x5a4, 0x5a5, 0x5a6, 0x5a7, 0x5a8, 0x5a9, 0x5aa, 0x5ab, 0x5ac, 0x5ad, 0x5ae, 0x5af,
+    0x5b0, 0x5b1, 0x5b2, 0x5b3, 0x5b4, 0x5b5, 0x5b6, 0x5b7, 0x5b8, 0x5b9, 0x5ba, 0x5bb, 0x5bc, 0x5bd, 0x5be, 0x5bf,
+    0x5c0, 0x5c1, 0x5c2, 0x5c3, 0x5c4, 0x5c5, 0x5c6, 0x5c7, 0x5c8, 0x5c9, 0x5ca, 0x5cb, 0x5cc, 0x5cd, 0x5ce, 0x5cf,
+    0x5d0, 0x5d1, 0x5d2, 0x5d3, 0x5d4, 0x5d5, 0x5d6, 0x5d7, 0x5d8, 0x5d9, 0x5da, 0x5db, 0x5dc, 0x5dd, 0x5de, 0x5df,
+    0x5e0, 0x5e1, 0x5e2, 0x5e3, 0x5e4, 0x5e5, 0x5e6, 0x5e7, 0x5e8, 0x5e9, 0x5ea, 0x5eb, 0x5ec, 0x5ed, 0x5ee, 0x5ef,
+    0x5f0, 0x5f1, 0x5f2, 0x5f3, 0x5f4, 0x5f5, 0x5f6, 0x5f7, 0x5f8, 0x5f9, 0x5fa, 0x5fb, 0x5fc, 0x5fd, 0x5fe, 0x5ff};
+static uint16_t const small10[] = {
+    0x1000, 0x1001, 0x1002, 0x1003, 0x1004, 0x1005, 0x1006, 0x1007, 0x1008, 0x1009, 0x100a, 0x100b, 0x100c, 0x100d,
+    0x100e, 0x100f, 0x1010, 0x1011, 0x1012, 0x1013, 0x1014, 0x1015, 0x1016, 0x1017, 0x1018, 0x1019, 0x101a, 0x101b,
+    0x101c, 0x101d, 0x101e, 0x101f, 0x1020, 0x1021, 0x1022, 0x1023, 0x1024, 0x1025, 0x1026, 0x1027, 0x1028, 0x1029,
+    0x102a, 0x102b, 0x102c, 0x102d, 0x102e, 0x102f, 0x1030, 0x1031, 0x1032, 0x1033, 0x1034, 0x1035, 0x1036, 0x1037,
+    0x1038, 0x1039, 0x103a, 0x103b, 0x103c, 0x103d, 0x103e, 0x103f, 0x1040, 0x1041, 0x1042, 0x1043, 0x1044, 0x1045,
+    0x1046, 0x1047, 0x1048, 0x1049, 0x104a, 0x104b, 0x104c, 0x104d, 0x104e, 0x104f, 0x1050, 0x1051, 0x1052, 0x1053,
+    0x1054, 0x1055, 0x1056, 0x1057, 0x1058, 0x1059, 0x105a, 0x105b, 0x105c, 0x105d, 0x105e, 0x105f, 0x1060, 0x1061,
+    0x1062, 0x1063, 0x1064, 0x1065, 0x1066, 0x1067, 0x1068, 0x1069, 0x106a, 0x106b, 0x106c, 0x106d, 0x106e, 0x106f,
+    0x1070, 0x1071, 0x1072, 0x1073, 0x1074, 0x1075, 0x1076, 0x1077, 0x1078, 0x1079, 0x107a, 0x107b, 0x107c, 0x107d,
+    0x107e, 0x107f, 0x1080, 0x1081, 0x1082, 0x1083, 0x1084, 0x1085, 0x1086, 0x1087, 0x1088, 0x1089, 0x108a, 0x108b,
+    0x108c, 0x108d, 0x108e, 0x108f, 0x1090, 0x1091, 0x1092, 0x1093, 0x1094, 0x1095, 0x1096, 0x1097, 0x1098, 0x1099,
+    0x109a, 0x109b, 0x109c, 0x109d, 0x109e, 0x109f, 0x2d00, 0x2d01, 0x2d02, 0x2d03, 0x2d04, 0x2d05, 0x2d06, 0x2d07,
+    0x2d08, 0x2d09, 0x2d0a, 0x2d0b, 0x2d0c, 0x2d0d, 0x2d0e, 0x2d0f, 0x2d10, 0x2d11, 0x2d12, 0x2d13, 0x2d14, 0x2d15,
+    0x2d16, 0x2d17, 0x2d18, 0x2d19, 0x2d1a, 0x2d1b, 0x2d1c, 0x2d1d, 0x2d1e, 0x2d1f, 0x2d20, 0x2d21, 0x2d22, 0x2d23,
+    0x2d24, 0x2d25, 0x10c6, 0x10c7, 0x10c8, 0x10c9, 0x10ca, 0x10cb, 0x10cc, 0x10cd, 0x10ce, 0x10cf, 0x10d0, 0x10d1,
+    0x10d2, 0x10d3, 0x10d4, 0x10d5, 0x10d6, 0x10d7, 0x10d8, 0x10d9, 0x10da, 0x10db, 0x10dc, 0x10dd, 0x10de, 0x10df,
+    0x10e0, 0x10e1, 0x10e2, 0x10e3, 0x10e4, 0x10e5, 0x10e6, 0x10e7, 0x10e8, 0x10e9, 0x10ea, 0x10eb, 0x10ec, 0x10ed,
+    0x10ee, 0x10ef, 0x10f0, 0x10f1, 0x10f2, 0x10f3, 0x10f4, 0x10f5, 0x10f6, 0x10f7, 0x10f8, 0x10f9, 0x10fa, 0x10fb,
+    0x10fc, 0x10fd, 0x10fe, 0x10ff};
+static uint16_t const small1e[] = {
+    0x1e01, 0x1e01, 0x1e03, 0x1e03, 0x1e05, 0x1e05, 0x1e07, 0x1e07, 0x1e09, 0x1e09, 0x1e0b, 0x1e0b, 0x1e0d, 0x1e0d,
+    0x1e0f, 0x1e0f, 0x1e11, 0x1e11, 0x1e13, 0x1e13, 0x1e15, 0x1e15, 0x1e17, 0x1e17, 0x1e19, 0x1e19, 0x1e1b, 0x1e1b,
+    0x1e1d, 0x1e1d, 0x1e1f, 0x1e1f, 0x1e21, 0x1e21, 0x1e23, 0x1e23, 0x1e25, 0x1e25, 0x1e27, 0x1e27, 0x1e29, 0x1e29,
+    0x1e2b, 0x1e2b, 0x1e2d, 0x1e2d, 0x1e2f, 0x1e2f, 0x1e31, 0x1e31, 0x1e33, 0x1e33, 0x1e35, 0x1e35, 0x1e37, 0x1e37,
+    0x1e39, 0x1e39, 0x1e3b, 0x1e3b, 0x1e3d, 0x1e3d, 0x1e3f, 0x1e3f, 0x1e41, 0x1e41, 0x1e43, 0x1e43, 0x1e45, 0x1e45,
+    0x1e47, 0x1e47, 0x1e49, 0x1e49, 0x1e4b, 0x1e4b, 0x1e4d, 0x1e4d, 0x1e4f, 0x1e4f, 0x1e51, 0x1e51, 0x1e53, 0x1e53,
+    0x1e55, 0x1e55, 0x1e57, 0x1e57, 0x1e59, 0x1e59, 0x1e5b, 0x1e5b, 0x1e5d, 0x1e5d, 0x1e5f, 0x1e5f, 0x1e61, 0x1e61,
+    0x1e63, 0x1e63, 0x1e65, 0x1e65, 0x1e67, 0x1e67, 0x1e69, 0x1e69, 0x1e6b, 0x1e6b, 0x1e6d, 0x1e6d, 0x1e6f, 0x1e6f,
+    0x1e71, 0x1e71, 0x1e73, 0x1e73, 0x1e75, 0x1e75, 0x1e77, 0x1e77, 0x1e79, 0x1e79, 0x1e7b, 0x1e7b, 0x1e7d, 0x1e7d,
+    0x1e7f, 0x1e7f, 0x1e81, 0x1e81, 0x1e83, 0x1e83, 0x1e85, 0x1e85, 0x1e87, 0x1e87, 0x1e89, 0x1e89, 0x1e8b, 0x1e8b,
+    0x1e8d, 0x1e8d, 0x1e8f, 0x1e8f, 0x1e91, 0x1e91, 0x1e93, 0x1e93, 0x1e95, 0x1e95, 0x0,    0x0,    0x0,    0x0,
+    0x0,    0x1e61, 0x1e9c, 0x1e9d, 0x0,    0x1e9f, 0x1ea1, 0x1ea1, 0x1ea3, 0x1ea3, 0x1ea5, 0x1ea5, 0x1ea7, 0x1ea7,
+    0x1ea9, 0x1ea9, 0x1eab, 0x1eab, 0x1ead, 0x1ead, 0x1eaf, 0x1eaf, 0x1eb1, 0x1eb1, 0x1eb3, 0x1eb3, 0x1eb5, 0x1eb5,
+    0x1eb7, 0x1eb7, 0x1eb9, 0x1eb9, 0x1ebb, 0x1ebb, 0x1ebd, 0x1ebd, 0x1ebf, 0x1ebf, 0x1ec1, 0x1ec1, 0x1ec3, 0x1ec3,
+    0x1ec5, 0x1ec5, 0x1ec7, 0x1ec7, 0x1ec9, 0x1ec9, 0x1ecb, 0x1ecb, 0x1ecd, 0x1ecd, 0x1ecf, 0x1ecf, 0x1ed1, 0x1ed1,
+    0x1ed3, 0x1ed3, 0x1ed5, 0x1ed5, 0x1ed7, 0x1ed7, 0x1ed9, 0x1ed9, 0x1edb, 0x1edb, 0x1edd, 0x1edd, 0x1edf, 0x1edf,
+    0x1ee1, 0x1ee1, 0x1ee3, 0x1ee3, 0x1ee5, 0x1ee5, 0x1ee7, 0x1ee7, 0x1ee9, 0x1ee9, 0x1eeb, 0x1eeb, 0x1eed, 0x1eed,
+    0x1eef, 0x1eef, 0x1ef1, 0x1ef1, 0x1ef3, 0x1ef3, 0x1ef5, 0x1ef5, 0x1ef7, 0x1ef7, 0x1ef9, 0x1ef9, 0x1efb, 0x1efb,
+    0x1efd, 0x1efd, 0x1eff, 0x1eff};
+static uint16_t const small1f[] = {
+    0x1f00, 0x1f01, 0x1f02, 0x1f03, 0x1f04, 0x1f05, 0x1f06, 0x1f07, 0x1f00, 0x1f01, 0x1f02, 0x1f03, 0x1f04, 0x1f05,
+    0x1f06, 0x1f07, 0x1f10, 0x1f11, 0x1f12, 0x1f13, 0x1f14, 0x1f15, 0x1f16, 0x1f17, 0x1f10, 0x1f11, 0x1f12, 0x1f13,
+    0x1f14, 0x1f15, 0x1f1e, 0x1f1f, 0x1f20, 0x1f21, 0x1f22, 0x1f23, 0x1f24, 0x1f25, 0x1f26, 0x1f27, 0x1f20, 0x1f21,
+    0x1f22, 0x1f23, 0x1f24, 0x1f25, 0x1f26, 0x1f27, 0x1f30, 0x1f31, 0x1f32, 0x1f33, 0x1f34, 0x1f35, 0x1f36, 0x1f37,
+    0x1f30, 0x1f31, 0x1f32, 0x1f33, 0x1f34, 0x1f35, 0x1f36, 0x1f37, 0x1f40, 0x1f41, 0x1f42, 0x1f43, 0x1f44, 0x1f45,
+    0x1f46, 0x1f47, 0x1f40, 0x1f41, 0x1f42, 0x1f43, 0x1f44, 0x1f45, 0x1f4e, 0x1f4f, 0x0,    0x1f51, 0x0,    0x1f53,
+    0x0,    0x1f55, 0x0,    0x1f57, 0x1f58, 0x1f51, 0x1f5a, 0x1f53, 0x1f5c, 0x1f55, 0x1f5e, 0x1f57, 0x1f60, 0x1f61,
+    0x1f62, 0x1f63, 0x1f64, 0x1f65, 0x1f66, 0x1f67, 0x1f60, 0x1f61, 0x1f62, 0x1f63, 0x1f64, 0x1f65, 0x1f66, 0x1f67,
+    0x1f70, 0x1f71, 0x1f72, 0x1f73, 0x1f74, 0x1f75, 0x1f76, 0x1f77, 0x1f78, 0x1f79, 0x1f7a, 0x1f7b, 0x1f7c, 0x1f7d,
+    0x1f7e, 0x1f7f, 0x0,    0x0,    0x0,    0x0,    0x0,    0x0,    0x0,    0x0,    0x0,    0x0,    0x0,    0x0,
+    0x0,    0x0,    0x0,    0x0,    0x0,    0x0,    0x0,    0x0,    0x0,    0x0,    0x0,    0x0,    0x0,    0x0,
+    0x0,    0x0,    0x0,    0x0,    0x0,    0x0,    0x0,    0x0,    0x0,    0x0,    0x0,    0x0,    0x0,    0x0,
+    0x0,    0x0,    0x0,    0x0,    0x0,    0x0,    0x0,    0x0,    0x1fb0, 0x1fb1, 0x0,    0x0,    0x0,    0x1fb5,
+    0x0,    0x0,    0x1fb0, 0x1fb1, 0x1f70, 0x1f71, 0x0,    0x1fbd, 0x3b9,  0x1fbf, 0x1fc0, 0x1fc1, 0x0,    0x0,
+    0x0,    0x1fc5, 0x0,    0x0,    0x1f72, 0x1f73, 0x1f74, 0x1f75, 0x0,    0x1fcd, 0x1fce, 0x1fcf, 0x1fd0, 0x1fd1,
+    0x0,    0x0,    0x1fd4, 0x1fd5, 0x0,    0x0,    0x1fd0, 0x1fd1, 0x1f76, 0x1f77, 0x1fdc, 0x1fdd, 0x1fde, 0x1fdf,
+    0x1fe0, 0x1fe1, 0x0,    0x0,    0x0,    0x1fe5, 0x0,    0x0,    0x1fe0, 0x1fe1, 0x1f7a, 0x1f7b, 0x1fe5, 0x1fed,
+    0x1fee, 0x1fef, 0x1ff0, 0x1ff1, 0x0,    0x0,    0x0,    0x1ff5, 0x0,    0x0,    0x1f78, 0x1f79, 0x1f7c, 0x1f7d,
+    0x0,    0x1ffd, 0x1ffe, 0x1fff};
+static uint16_t const small21[] = {
+    0x2100, 0x2101, 0x2102, 0x2103, 0x2104, 0x2105, 0x2106, 0x2107, 0x2108, 0x2109, 0x210a, 0x210b, 0x210c, 0x210d,
+    0x210e, 0x210f, 0x2110, 0x2111, 0x2112, 0x2113, 0x2114, 0x2115, 0x2116, 0x2117, 0x2118, 0x2119, 0x211a, 0x211b,
+    0x211c, 0x211d, 0x211e, 0x211f, 0x2120, 0x2121, 0x2122, 0x2123, 0x2124, 0x2125, 0x3c9,  0x2127, 0x2128, 0x2129,
+    0x6b,   0xe5,   0x212c, 0x212d, 0x212e, 0x212f, 0x2130, 0x2131, 0x214e, 0x2133, 0x2134, 0x2135, 0x2136, 0x2137,
+    0x2138, 0x2139, 0x213a, 0x213b, 0x213c, 0x213d, 0x213e, 0x213f, 0x2140, 0x2141, 0x2142, 0x2143, 0x2144, 0x2145,
+    0x2146, 0x2147, 0x2148, 0x2149, 0x214a, 0x214b, 0x214c, 0x214d, 0x214e, 0x214f, 0x2150, 0x2151, 0x2152, 0x2153,
+    0x2154, 0x2155, 0x2156, 0x2157, 0x2158, 0x2159, 0x215a, 0x215b, 0x215c, 0x215d, 0x215e, 0x215f, 0x2170, 0x2171,
+    0x2172, 0x2173, 0x2174, 0x2175, 0x2176, 0x2177, 0x2178, 0x2179, 0x217a, 0x217b, 0x217c, 0x217d, 0x217e, 0x217f,
+    0x2170, 0x2171, 0x2172, 0x2173, 0x2174, 0x2175, 0x2176, 0x2177, 0x2178, 0x2179, 0x217a, 0x217b, 0x217c, 0x217d,
+    0x217e, 0x217f, 0x2180, 0x2181, 0x2182, 0x2184, 0x2184, 0x2185, 0x2186, 0x2187, 0x2188, 0x2189, 0x218a, 0x218b,
+    0x218c, 0x218d, 0x218e, 0x218f, 0x2190, 0x2191, 0x2192, 0x2193, 0x2194, 0x2195, 0x2196, 0x2197, 0x2198, 0x2199,
+    0x219a, 0x219b, 0x219c, 0x219d, 0x219e, 0x219f, 0x21a0, 0x21a1, 0x21a2, 0x21a3, 0x21a4, 0x21a5, 0x21a6, 0x21a7,
+    0x21a8, 0x21a9, 0x21aa, 0x21ab, 0x21ac, 0x21ad, 0x21ae, 0x21af, 0x21b0, 0x21b1, 0x21b2, 0x21b3, 0x21b4, 0x21b5,
+    0x21b6, 0x21b7, 0x21b8, 0x21b9, 0x21ba, 0x21bb, 0x21bc, 0x21bd, 0x21be, 0x21bf, 0x21c0, 0x21c1, 0x21c2, 0x21c3,
+    0x21c4, 0x21c5, 0x21c6, 0x21c7, 0x21c8, 0x21c9, 0x21ca, 0x21cb, 0x21cc, 0x21cd, 0x21ce, 0x21cf, 0x21d0, 0x21d1,
+    0x21d2, 0x21d3, 0x21d4, 0x21d5, 0x21d6, 0x21d7, 0x21d8, 0x21d9, 0x21da, 0x21db, 0x21dc, 0x21dd, 0x21de, 0x21df,
+    0x21e0, 0x21e1, 0x21e2, 0x21e3, 0x21e4, 0x21e5, 0x21e6, 0x21e7, 0x21e8, 0x21e9, 0x21ea, 0x21eb, 0x21ec, 0x21ed,
+    0x21ee, 0x21ef, 0x21f0, 0x21f1, 0x21f2, 0x21f3, 0x21f4, 0x21f5, 0x21f6, 0x21f7, 0x21f8, 0x21f9, 0x21fa, 0x21fb,
+    0x21fc, 0x21fd, 0x21fe, 0x21ff};
+static uint16_t const small24[] = {
+    0x2400, 0x2401, 0x2402, 0x2403, 0x2404, 0x2405, 0x2406, 0x2407, 0x2408, 0x2409, 0x240a, 0x240b, 0x240c, 0x240d,
+    0x240e, 0x240f, 0x2410, 0x2411, 0x2412, 0x2413, 0x2414, 0x2415, 0x2416, 0x2417, 0x2418, 0x2419, 0x241a, 0x241b,
+    0x241c, 0x241d, 0x241e, 0x241f, 0x2420, 0x2421, 0x2422, 0x2423, 0x2424, 0x2425, 0x2426, 0x2427, 0x2428, 0x2429,
+    0x242a, 0x242b, 0x242c, 0x242d, 0x242e, 0x242f, 0x2430, 0x2431, 0x2432, 0x2433, 0x2434, 0x2435, 0x2436, 0x2437,
+    0x2438, 0x2439, 0x243a, 0x243b, 0x243c, 0x243d, 0x243e, 0x243f, 0x2440, 0x2441, 0x2442, 0x2443, 0x2444, 0x2445,
+    0x2446, 0x2447, 0x2448, 0x2449, 0x244a, 0x244b, 0x244c, 0x244d, 0x244e, 0x244f, 0x2450, 0x2451, 0x2452, 0x2453,
+    0x2454, 0x2455, 0x2456, 0x2457, 0x2458, 0x2459, 0x245a, 0x245b, 0x245c, 0x245d, 0x245e, 0x245f, 0x2460, 0x2461,
+    0x2462, 0x2463, 0x2464, 0x2465, 0x2466, 0x2467, 0x2468, 0x2469, 0x246a, 0x246b, 0x246c, 0x246d, 0x246e, 0x246f,
+    0x2470, 0x2471, 0x2472, 0x2473, 0x2474, 0x2475, 0x2476, 0x2477, 0x2478, 0x2479, 0x247a, 0x247b, 0x247c, 0x247d,
+    0x247e, 0x247f, 0x2480, 0x2481, 0x2482, 0x2483, 0x2484, 0x2485, 0x2486, 0x2487, 0x2488, 0x2489, 0x248a, 0x248b,
+    0x248c, 0x248d, 0x248e, 0x248f, 0x2490, 0x2491, 0x2492, 0x2493, 0x2494, 0x2495, 0x2496, 0x2497, 0x2498, 0x2499,
+    0x249a, 0x249b, 0x249c, 0x249d, 0x249e, 0x249f, 0x24a0, 0x24a1, 0x24a2, 0x24a3, 0x24a4, 0x24a5, 0x24a6, 0x24a7,
+    0x24a8, 0x24a9, 0x24aa, 0x24ab, 0x24ac, 0x24ad, 0x24ae, 0x24af, 0x24b0, 0x24b1, 0x24b2, 0x24b3, 0x24b4, 0x24b5,
+    0x24d0, 0x24d1, 0x24d2, 0x24d3, 0x24d4, 0x24d5, 0x24d6, 0x24d7, 0x24d8, 0x24d9, 0x24da, 0x24db, 0x24dc, 0x24dd,
+    0x24de, 0x24df, 0x24e0, 0x24e1, 0x24e2, 0x24e3, 0x24e4, 0x24e5, 0x24e6, 0x24e7, 0x24e8, 0x24e9, 0x24d0, 0x24d1,
+    0x24d2, 0x24d3, 0x24d4, 0x24d5, 0x24d6, 0x24d7, 0x24d8, 0x24d9, 0x24da, 0x24db, 0x24dc, 0x24dd, 0x24de, 0x24df,
+    0x24e0, 0x24e1, 0x24e2, 0x24e3, 0x24e4, 0x24e5, 0x24e6, 0x24e7, 0x24e8, 0x24e9, 0x24ea, 0x24eb, 0x24ec, 0x24ed,
+    0x24ee, 0x24ef, 0x24f0, 0x24f1, 0x24f2, 0x24f3, 0x24f4, 0x24f5, 0x24f6, 0x24f7, 0x24f8, 0x24f9, 0x24fa, 0x24fb,
+    0x24fc, 0x24fd, 0x24fe, 0x24ff};
+static uint16_t const small2c[] = {
+    0x2c30, 0x2c31, 0x2c32, 0x2c33, 0x2c34, 0x2c35, 0x2c36, 0x2c37, 0x2c38, 0x2c39, 0x2c3a, 0x2c3b, 0x2c3c, 0x2c3d,
+    0x2c3e, 0x2c3f, 0x2c40, 0x2c41, 0x2c42, 0x2c43, 0x2c44, 0x2c45, 0x2c46, 0x2c47, 0x2c48, 0x2c49, 0x2c4a, 0x2c4b,
+    0x2c4c, 0x2c4d, 0x2c4e, 0x2c4f, 0x2c50, 0x2c51, 0x2c52, 0x2c53, 0x2c54, 0x2c55, 0x2c56, 0x2c57, 0x2c58, 0x2c59,
+    0x2c5a, 0x2c5b, 0x2c5c, 0x2c5d, 0x2c5e, 0x2c2f, 0x2c30, 0x2c31, 0x2c32, 0x2c33, 0x2c34, 0x2c35, 0x2c36, 0x2c37,
+    0x2c38, 0x2c39, 0x2c3a, 0x2c3b, 0x2c3c, 0x2c3d, 0x2c3e, 0x2c3f, 0x2c40, 0x2c41, 0x2c42, 0x2c43, 0x2c44, 0x2c45,
+    0x2c46, 0x2c47, 0x2c48, 0x2c49, 0x2c4a, 0x2c4b, 0x2c4c, 0x2c4d, 0x2c4e, 0x2c4f, 0x2c50, 0x2c51, 0x2c52, 0x2c53,
+    0x2c54, 0x2c55, 0x2c56, 0x2c57, 0x2c58, 0x2c59, 0x2c5a, 0x2c5b, 0x2c5c, 0x2c5d, 0x2c5e, 0x2c5f, 0x2c61, 0x2c61,
+    0x26b,  0x1d7d, 0x27d,  0x2c65, 0x2c66, 0x2c68, 0x2c68, 0x2c6a, 0x2c6a, 0x2c6c, 0x2c6c, 0x251,  0x271,  0x250,
+    0x252,  0x2c71, 0x2c73, 0x2c73, 0x2c74, 0x2c76, 0x2c76, 0x2c77, 0x2c78, 0x2c79, 0x2c7a, 0x2c7b, 0x2c7c, 0x2c7d,
+    0x23f,  0x240,  0x2c81, 0x2c81, 0x2c83, 0x2c83, 0x2c85, 0x2c85, 0x2c87, 0x2c87, 0x2c89, 0x2c89, 0x2c8b, 0x2c8b,
+    0x2c8d, 0x2c8d, 0x2c8f, 0x2c8f, 0x2c91, 0x2c91, 0x2c93, 0x2c93, 0x2c95, 0x2c95, 0x2c97, 0x2c97, 0x2c99, 0x2c99,
+    0x2c9b, 0x2c9b, 0x2c9d, 0x2c9d, 0x2c9f, 0x2c9f, 0x2ca1, 0x2ca1, 0x2ca3, 0x2ca3, 0x2ca5, 0x2ca5, 0x2ca7, 0x2ca7,
+    0x2ca9, 0x2ca9, 0x2cab, 0x2cab, 0x2cad, 0x2cad, 0x2caf, 0x2caf, 0x2cb1, 0x2cb1, 0x2cb3, 0x2cb3, 0x2cb5, 0x2cb5,
+    0x2cb7, 0x2cb7, 0x2cb9, 0x2cb9, 0x2cbb, 0x2cbb, 0x2cbd, 0x2cbd, 0x2cbf, 0x2cbf, 0x2cc1, 0x2cc1, 0x2cc3, 0x2cc3,
+    0x2cc5, 0x2cc5, 0x2cc7, 0x2cc7, 0x2cc9, 0x2cc9, 0x2ccb, 0x2ccb, 0x2ccd, 0x2ccd, 0x2ccf, 0x2ccf, 0x2cd1, 0x2cd1,
+    0x2cd3, 0x2cd3, 0x2cd5, 0x2cd5, 0x2cd7, 0x2cd7, 0x2cd9, 0x2cd9, 0x2cdb, 0x2cdb, 0x2cdd, 0x2cdd, 0x2cdf, 0x2cdf,
+    0x2ce1, 0x2ce1, 0x2ce3, 0x2ce3, 0x2ce4, 0x2ce5, 0x2ce6, 0x2ce7, 0x2ce8, 0x2ce9, 0x2cea, 0x2cec, 0x2cec, 0x2cee,
+    0x2cee, 0x2cef, 0x2cf0, 0x2cf1, 0x2cf2, 0x2cf3, 0x2cf4, 0x2cf5, 0x2cf6, 0x2cf7, 0x2cf8, 0x2cf9, 0x2cfa, 0x2cfb,
+    0x2cfc, 0x2cfd, 0x2cfe, 0x2cff};
+static uint16_t const smalla6[] = {
+    0xa600, 0xa601, 0xa602, 0xa603, 0xa604, 0xa605, 0xa606, 0xa607, 0xa608, 0xa609, 0xa60a, 0xa60b, 0xa60c, 0xa60d,
+    0xa60e, 0xa60f, 0xa610, 0xa611, 0xa612, 0xa613, 0xa614, 0xa615, 0xa616, 0xa617, 0xa618, 0xa619, 0xa61a, 0xa61b,
+    0xa61c, 0xa61d, 0xa61e, 0xa61f, 0xa620, 0xa621, 0xa622, 0xa623, 0xa624, 0xa625, 0xa626, 0xa627, 0xa628, 0xa629,
+    0xa62a, 0xa62b, 0xa62c, 0xa62d, 0xa62e, 0xa62f, 0xa630, 0xa631, 0xa632, 0xa633, 0xa634, 0xa635, 0xa636, 0xa637,
+    0xa638, 0xa639, 0xa63a, 0xa63b, 0xa63c, 0xa63d, 0xa63e, 0xa63f, 0xa641, 0xa641, 0xa643, 0xa643, 0xa645, 0xa645,
+    0xa647, 0xa647, 0xa649, 0xa649, 0xa64b, 0xa64b, 0xa64d, 0xa64d, 0xa64f, 0xa64f, 0xa651, 0xa651, 0xa653, 0xa653,
+    0xa655, 0xa655, 0xa657, 0xa657, 0xa659, 0xa659, 0xa65b, 0xa65b, 0xa65d, 0xa65d, 0xa65f, 0xa65f, 0xa661, 0xa661,
+    0xa663, 0xa663, 0xa665, 0xa665, 0xa667, 0xa667, 0xa669, 0xa669, 0xa66b, 0xa66b, 0xa66d, 0xa66d, 0xa66e, 0xa66f,
+    0xa670, 0xa671, 0xa672, 0xa673, 0xa674, 0xa675, 0xa676, 0xa677, 0xa678, 0xa679, 0xa67a, 0xa67b, 0xa67c, 0xa67d,
+    0xa67e, 0xa67f, 0xa681, 0xa681, 0xa683, 0xa683, 0xa685, 0xa685, 0xa687, 0xa687, 0xa689, 0xa689, 0xa68b, 0xa68b,
+    0xa68d, 0xa68d, 0xa68f, 0xa68f, 0xa691, 0xa691, 0xa693, 0xa693, 0xa695, 0xa695, 0xa697, 0xa697, 0xa698, 0xa699,
+    0xa69a, 0xa69b, 0xa69c, 0xa69d, 0xa69e, 0xa69f, 0xa6a0, 0xa6a1, 0xa6a2, 0xa6a3, 0xa6a4, 0xa6a5, 0xa6a6, 0xa6a7,
+    0xa6a8, 0xa6a9, 0xa6aa, 0xa6ab, 0xa6ac, 0xa6ad, 0xa6ae, 0xa6af, 0xa6b0, 0xa6b1, 0xa6b2, 0xa6b3, 0xa6b4, 0xa6b5,
+    0xa6b6, 0xa6b7, 0xa6b8, 0xa6b9, 0xa6ba, 0xa6bb, 0xa6bc, 0xa6bd, 0xa6be, 0xa6bf, 0xa6c0, 0xa6c1, 0xa6c2, 0xa6c3,
+    0xa6c4, 0xa6c5, 0xa6c6, 0xa6c7, 0xa6c8, 0xa6c9, 0xa6ca, 0xa6cb, 0xa6cc, 0xa6cd, 0xa6ce, 0xa6cf, 0xa6d0, 0xa6d1,
+    0xa6d2, 0xa6d3, 0xa6d4, 0xa6d5, 0xa6d6, 0xa6d7, 0xa6d8, 0xa6d9, 0xa6da, 0xa6db, 0xa6dc, 0xa6dd, 0xa6de, 0xa6df,
+    0xa6e0, 0xa6e1, 0xa6e2, 0xa6e3, 0xa6e4, 0xa6e5, 0xa6e6, 0xa6e7, 0xa6e8, 0xa6e9, 0xa6ea, 0xa6eb, 0xa6ec, 0xa6ed,
+    0xa6ee, 0xa6ef, 0xa6f0, 0xa6f1, 0xa6f2, 0xa6f3, 0xa6f4, 0xa6f5, 0xa6f6, 0xa6f7, 0xa6f8, 0xa6f9, 0xa6fa, 0xa6fb,
+    0xa6fc, 0xa6fd, 0xa6fe, 0xa6ff};
+static uint16_t const smalla7[] = {
+    0xa700, 0xa701, 0xa702, 0xa703, 0xa704, 0xa705, 0xa706, 0xa707, 0xa708, 0xa709, 0xa70a, 0xa70b, 0xa70c, 0xa70d,
+    0xa70e, 0xa70f, 0xa710, 0xa711, 0xa712, 0xa713, 0xa714, 0xa715, 0xa716, 0xa717, 0xa718, 0xa719, 0xa71a, 0xa71b,
+    0xa71c, 0xa71d, 0xa71e, 0xa71f, 0xa720, 0xa721, 0xa723, 0xa723, 0xa725, 0xa725, 0xa727, 0xa727, 0xa729, 0xa729,
+    0xa72b, 0xa72b, 0xa72d, 0xa72d, 0xa72f, 0xa72f, 0xa730, 0xa731, 0xa733, 0xa733, 0xa735, 0xa735, 0xa737, 0xa737,
+    0xa739, 0xa739, 0xa73b, 0xa73b, 0xa73d, 0xa73d, 0xa73f, 0xa73f, 0xa741, 0xa741, 0xa743, 0xa743, 0xa745, 0xa745,
+    0xa747, 0xa747, 0xa749, 0xa749, 0xa74b, 0xa74b, 0xa74d, 0xa74d, 0xa74f, 0xa74f, 0xa751, 0xa751, 0xa753, 0xa753,
+    0xa755, 0xa755, 0xa757, 0xa757, 0xa759, 0xa759, 0xa75b, 0xa75b, 0xa75d, 0xa75d, 0xa75f, 0xa75f, 0xa761, 0xa761,
+    0xa763, 0xa763, 0xa765, 0xa765, 0xa767, 0xa767, 0xa769, 0xa769, 0xa76b, 0xa76b, 0xa76d, 0xa76d, 0xa76f, 0xa76f,
+    0xa770, 0xa771, 0xa772, 0xa773, 0xa774, 0xa775, 0xa776, 0xa777, 0xa778, 0xa77a, 0xa77a, 0xa77c, 0xa77c, 0x1d79,
+    0xa77f, 0xa77f, 0xa781, 0xa781, 0xa783, 0xa783, 0xa785, 0xa785, 0xa787, 0xa787, 0xa788, 0xa789, 0xa78a, 0xa78c,
+    0xa78c, 0x265,  0xa78e, 0xa78f, 0xa791, 0xa791, 0xa792, 0xa793, 0xa794, 0xa795, 0xa796, 0xa797, 0xa798, 0xa799,
+    0xa79a, 0xa79b, 0xa79c, 0xa79d, 0xa79e, 0xa79f, 0xa7a1, 0xa7a1, 0xa7a3, 0xa7a3, 0xa7a5, 0xa7a5, 0xa7a7, 0xa7a7,
+    0xa7a9, 0xa7a9, 0xa7aa, 0xa7ab, 0xa7ac, 0xa7ad, 0xa7ae, 0xa7af, 0xa7b0, 0xa7b1, 0xa7b2, 0xa7b3, 0xa7b4, 0xa7b5,
+    0xa7b6, 0xa7b7, 0xa7b8, 0xa7b9, 0xa7ba, 0xa7bb, 0xa7bc, 0xa7bd, 0xa7be, 0xa7bf, 0xa7c0, 0xa7c1, 0xa7c2, 0xa7c3,
+    0xa7c4, 0xa7c5, 0xa7c6, 0xa7c7, 0xa7c8, 0xa7c9, 0xa7ca, 0xa7cb, 0xa7cc, 0xa7cd, 0xa7ce, 0xa7cf, 0xa7d0, 0xa7d1,
+    0xa7d2, 0xa7d3, 0xa7d4, 0xa7d5, 0xa7d6, 0xa7d7, 0xa7d8, 0xa7d9, 0xa7da, 0xa7db, 0xa7dc, 0xa7dd, 0xa7de, 0xa7df,
+    0xa7e0, 0xa7e1, 0xa7e2, 0xa7e3, 0xa7e4, 0xa7e5, 0xa7e6, 0xa7e7, 0xa7e8, 0xa7e9, 0xa7ea, 0xa7eb, 0xa7ec, 0xa7ed,
+    0xa7ee, 0xa7ef, 0xa7f0, 0xa7f1, 0xa7f2, 0xa7f3, 0xa7f4, 0xa7f5, 0xa7f6, 0xa7f7, 0xa7f8, 0xa7f9, 0xa7fa, 0xa7fb,
+    0xa7fc, 0xa7fd, 0xa7fe, 0xa7ff};
+static uint16_t const smallff[] = {
+    0xff00, 0xff01, 0xff02, 0xff03, 0xff04, 0xff05, 0xff06, 0xff07, 0xff08, 0xff09, 0xff0a, 0xff0b, 0xff0c, 0xff0d,
+    0xff0e, 0xff0f, 0xff10, 0xff11, 0xff12, 0xff13, 0xff14, 0xff15, 0xff16, 0xff17, 0xff18, 0xff19, 0xff1a, 0xff1b,
+    0xff1c, 0xff1d, 0xff1e, 0xff1f, 0xff20, 0xff41, 0xff42, 0xff43, 0xff44, 0xff45, 0xff46, 0xff47, 0xff48, 0xff49,
+    0xff4a, 0xff4b, 0xff4c, 0xff4d, 0xff4e, 0xff4f, 0xff50, 0xff51, 0xff52, 0xff53, 0xff54, 0xff55, 0xff56, 0xff57,
+    0xff58, 0xff59, 0xff5a, 0xff3b, 0xff3c, 0xff3d, 0xff3e, 0xff3f, 0xff40, 0xff41, 0xff42, 0xff43, 0xff44, 0xff45,
+    0xff46, 0xff47, 0xff48, 0xff49, 0xff4a, 0xff4b, 0xff4c, 0xff4d, 0xff4e, 0xff4f, 0xff50, 0xff51, 0xff52, 0xff53,
+    0xff54, 0xff55, 0xff56, 0xff57, 0xff58, 0xff59, 0xff5a, 0xff5b, 0xff5c, 0xff5d, 0xff5e, 0xff5f, 0xff60, 0xff61,
+    0xff62, 0xff63, 0xff64, 0xff65, 0xff66, 0xff67, 0xff68, 0xff69, 0xff6a, 0xff6b, 0xff6c, 0xff6d, 0xff6e, 0xff6f,
+    0xff70, 0xff71, 0xff72, 0xff73, 0xff74, 0xff75, 0xff76, 0xff77, 0xff78, 0xff79, 0xff7a, 0xff7b, 0xff7c, 0xff7d,
+    0xff7e, 0xff7f, 0xff80, 0xff81, 0xff82, 0xff83, 0xff84, 0xff85, 0xff86, 0xff87, 0xff88, 0xff89, 0xff8a, 0xff8b,
+    0xff8c, 0xff8d, 0xff8e, 0xff8f, 0xff90, 0xff91, 0xff92, 0xff93, 0xff94, 0xff95, 0xff96, 0xff97, 0xff98, 0xff99,
+    0xff9a, 0xff9b, 0xff9c, 0xff9d, 0xff9e, 0xff9f, 0xffa0, 0xffa1, 0xffa2, 0xffa3, 0xffa4, 0xffa5, 0xffa6, 0xffa7,
+    0xffa8, 0xffa9, 0xffaa, 0xffab, 0xffac, 0xffad, 0xffae, 0xffaf, 0xffb0, 0xffb1, 0xffb2, 0xffb3, 0xffb4, 0xffb5,
+    0xffb6, 0xffb7, 0xffb8, 0xffb9, 0xffba, 0xffbb, 0xffbc, 0xffbd, 0xffbe, 0xffbf, 0xffc0, 0xffc1, 0xffc2, 0xffc3,
+    0xffc4, 0xffc5, 0xffc6, 0xffc7, 0xffc8, 0xffc9, 0xffca, 0xffcb, 0xffcc, 0xffcd, 0xffce, 0xffcf, 0xffd0, 0xffd1,
+    0xffd2, 0xffd3, 0xffd4, 0xffd5, 0xffd6, 0xffd7, 0xffd8, 0xffd9, 0xffda, 0xffdb, 0xffdc, 0xffdd, 0xffde, 0xffdf,
+    0xffe0, 0xffe1, 0xffe2, 0xffe3, 0xffe4, 0xffe5, 0xffe6, 0xffe7, 0xffe8, 0xffe9, 0xffea, 0xffeb, 0xffec, 0xffed,
+    0xffee, 0xffef, 0xfff0, 0xfff1, 0xfff2, 0xfff3, 0xfff4, 0xfff5, 0xfff6, 0xfff7, 0xfff8, 0xfff9, 0xfffa, 0xfffb,
+    0xfffc, 0xfffd, 0xfffe, 0xffff};
 
 /// @return 0 if char should be replaced with 2 or more chars
 UniChar LowerUniChar(UniChar c)
 {
   switch (c & 0xffffff00)
   {
-    case 0x0000: return small00[static_cast<uint8_t>(c & 0x00ff)];
-    case 0x0100: return small01[static_cast<uint8_t>(c & 0x00ff)];
-    case 0x0200: return small02[static_cast<uint8_t>(c & 0x00ff)];
-    case 0x0300: return small03[static_cast<uint8_t>(c & 0x00ff)];
-    case 0x0400: return small04[static_cast<uint8_t>(c & 0x00ff)];
-    case 0x0500: return small05[static_cast<uint8_t>(c & 0x00ff)];
-    case 0x1000: return small10[static_cast<uint8_t>(c & 0x00ff)];
-    case 0x1e00: return small1e[static_cast<uint8_t>(c & 0x00ff)];
-    case 0x1f00: return small1f[static_cast<uint8_t>(c & 0x00ff)];
-    case 0x2100: return small21[static_cast<uint8_t>(c & 0x00ff)];
-    case 0x2400: return small24[static_cast<uint8_t>(c & 0x00ff)];
-    case 0x2c00: return small2c[static_cast<uint8_t>(c & 0x00ff)];
-    case 0xa600: return smalla6[static_cast<uint8_t>(c & 0x00ff)];
-    case 0xa700: return smalla7[static_cast<uint8_t>(c & 0x00ff)];
-    case 0xfb00:
-    {
-      if (c >= 0xfb00 && c <= 0xfb06)
-        return 0;
-      if (c >= 0xfb13 && c <= 0xfb17)
-        return 0;
-      return c;
-    }
-    case 0xff00: return smallff[static_cast<uint8_t>(c & 0x00ff)];
-    case 0x10400:
-    {
-      if (c >= 0x10400 && c <= 0x10427)
-        return c + 0x28;
-      return c;
-    }
-    default: return c;
+  case 0x0000: return small00[static_cast<uint8_t>(c & 0x00ff)];
+  case 0x0100: return small01[static_cast<uint8_t>(c & 0x00ff)];
+  case 0x0200: return small02[static_cast<uint8_t>(c & 0x00ff)];
+  case 0x0300: return small03[static_cast<uint8_t>(c & 0x00ff)];
+  case 0x0400: return small04[static_cast<uint8_t>(c & 0x00ff)];
+  case 0x0500: return small05[static_cast<uint8_t>(c & 0x00ff)];
+  case 0x1000: return small10[static_cast<uint8_t>(c & 0x00ff)];
+  case 0x1e00: return small1e[static_cast<uint8_t>(c & 0x00ff)];
+  case 0x1f00: return small1f[static_cast<uint8_t>(c & 0x00ff)];
+  case 0x2100: return small21[static_cast<uint8_t>(c & 0x00ff)];
+  case 0x2400: return small24[static_cast<uint8_t>(c & 0x00ff)];
+  case 0x2c00: return small2c[static_cast<uint8_t>(c & 0x00ff)];
+  case 0xa600: return smalla6[static_cast<uint8_t>(c & 0x00ff)];
+  case 0xa700: return smalla7[static_cast<uint8_t>(c & 0x00ff)];
+  case 0xfb00:
+  {
+    if (c >= 0xfb00 && c <= 0xfb06)
+      return 0;
+    if (c >= 0xfb13 && c <= 0xfb17)
+      return 0;
+    return c;
+  }
+  case 0xff00: return smallff[static_cast<uint8_t>(c & 0x00ff)];
+  case 0x10400:
+  {
+    if (c >= 0x10400 && c <= 0x10427)
+      return c + 0x28;
+    return c;
+  }
+  default: return c;
   }
 }
 
@@ -65,111 +330,439 @@ static size_t w(UniChar c, UniChar * buf)
 {
   switch (c)
   {
-    case 0xdf: *buf++ = 0x73; *buf++ = 0x73; return 2;
-    case 0x130: *buf++ = 0x69; *buf++ = 0x307; return 2;
-    case 0x149: *buf++ = 0x2bc; *buf++ = 0x6e; return 2;
-    case 0x1f0: *buf++ = 0x6a; *buf++ = 0x30c; return 2;
-    case 0x390: *buf++ = 0x3b9; *buf++ = 0x308; *buf++ = 0x301; return 3;
-    case 0x3B0: *buf++ = 0x3c5; *buf++ = 0x308; *buf++ = 0x301; return 3;
-    case 0x587: *buf++ = 0x565; *buf++ = 0x582; return 2;
-    case 0x1e96: *buf++ = 0x68; *buf++ = 0x331; return 2;
-    case 0x1e97: *buf++ = 0x74; *buf++ = 0x308; return 2;
-    case 0x1e98: *buf++ = 0x77; *buf++ = 0x30a; return 2;
-    case 0x1e99: *buf++ = 0x79; *buf++ = 0x30a; return 2;
-    case 0x1e9a: *buf++ = 0x61; *buf++ = 0x2be; return 2;
-    case 0x1e9e: *buf++ = 0x73; *buf++ = 0x73; return 2;
-    case 0x1f50: *buf++ = 0x3c5; *buf++ = 0x313; return 2;
-    case 0x1f52: *buf++ = 0x3c5; *buf++ = 0x313; *buf++ = 0x300; return 3;
-    case 0x1f54: *buf++ = 0x3c5; *buf++ = 0x313; *buf++ = 0x301; return 3;
-    case 0x1f56: *buf++ = 0x3c5; *buf++ = 0x313; *buf++ = 0x342; return 3;
-    case 0x1f80: *buf++ = 0x1f00; *buf++ = 0x3b9; return 2;
-    case 0x1f81: *buf++ = 0x1f01; *buf++ = 0x3b9; return 2;
-    case 0x1f82: *buf++ = 0x1f02; *buf++ = 0x3b9; return 2;
-    case 0x1f83: *buf++ = 0x1f03; *buf++ = 0x3b9; return 2;
-    case 0x1f84: *buf++ = 0x1f04; *buf++ = 0x3b9; return 2;
-    case 0x1f85: *buf++ = 0x1f05; *buf++ = 0x3b9; return 2;
-    case 0x1f86: *buf++ = 0x1f06; *buf++ = 0x3b9; return 2;
-    case 0x1f87: *buf++ = 0x1f07; *buf++ = 0x3b9; return 2;
-    case 0x1f88: *buf++ = 0x1f00; *buf++ = 0x3b9; return 2;
-    case 0x1f89: *buf++ = 0x1f01; *buf++ = 0x3b9; return 2;
-    case 0x1f8a: *buf++ = 0x1f02; *buf++ = 0x3b9; return 2;
-    case 0x1f8b: *buf++ = 0x1f03; *buf++ = 0x3b9; return 2;
-    case 0x1f8c: *buf++ = 0x1f04; *buf++ = 0x3b9; return 2;
-    case 0x1f8d: *buf++ = 0x1f05; *buf++ = 0x3b9; return 2;
-    case 0x1f8e: *buf++ = 0x1f06; *buf++ = 0x3b9; return 2;
-    case 0x1f8f: *buf++ = 0x1f07; *buf++ = 0x3b9; return 2;
-    case 0x1f90: *buf++ = 0x1f20; *buf++ = 0x3b9; return 2;
-    case 0x1f91: *buf++ = 0x1f21; *buf++ = 0x3b9; return 2;
-    case 0x1f92: *buf++ = 0x1f22; *buf++ = 0x3b9; return 2;
-    case 0x1f93: *buf++ = 0x1f23; *buf++ = 0x3b9; return 2;
-    case 0x1f94: *buf++ = 0x1f24; *buf++ = 0x3b9; return 2;
-    case 0x1f95: *buf++ = 0x1f25; *buf++ = 0x3b9; return 2;
-    case 0x1f96: *buf++ = 0x1f26; *buf++ = 0x3b9; return 2;
-    case 0x1f97: *buf++ = 0x1f27; *buf++ = 0x3b9; return 2;
-    case 0x1f98: *buf++ = 0x1f20; *buf++ = 0x3b9; return 2;
-    case 0x1f99: *buf++ = 0x1f21; *buf++ = 0x3b9; return 2;
-    case 0x1f9a: *buf++ = 0x1f22; *buf++ = 0x3b9; return 2;
-    case 0x1f9b: *buf++ = 0x1f23; *buf++ = 0x3b9; return 2;
-    case 0x1f9c: *buf++ = 0x1f24; *buf++ = 0x3b9; return 2;
-    case 0x1f9d: *buf++ = 0x1f25; *buf++ = 0x3b9; return 2;
-    case 0x1f9e: *buf++ = 0x1f26; *buf++ = 0x3b9; return 2;
-    case 0x1f9f: *buf++ = 0x1f27; *buf++ = 0x3b9; return 2;
-    case 0x1fa0: *buf++ = 0x1f60; *buf++ = 0x3b9; return 2;
-    case 0x1fa1: *buf++ = 0x1f61; *buf++ = 0x3b9; return 2;
-    case 0x1fa2: *buf++ = 0x1f62; *buf++ = 0x3b9; return 2;
-    case 0x1fa3: *buf++ = 0x1f63; *buf++ = 0x3b9; return 2;
-    case 0x1fa4: *buf++ = 0x1f64; *buf++ = 0x3b9; return 2;
-    case 0x1fa5: *buf++ = 0x1f65; *buf++ = 0x3b9; return 2;
-    case 0x1fa6: *buf++ = 0x1f66; *buf++ = 0x3b9; return 2;
-    case 0x1fa7: *buf++ = 0x1f67; *buf++ = 0x3b9; return 2;
-    case 0x1fa8: *buf++ = 0x1f60; *buf++ = 0x3b9; return 2;
-    case 0x1fa9: *buf++ = 0x1f61; *buf++ = 0x3b9; return 2;
-    case 0x1faa: *buf++ = 0x1f62; *buf++ = 0x3b9; return 2;
-    case 0x1fab: *buf++ = 0x1f63; *buf++ = 0x3b9; return 2;
-    case 0x1fac: *buf++ = 0x1f64; *buf++ = 0x3b9; return 2;
-    case 0x1fad: *buf++ = 0x1f65; *buf++ = 0x3b9; return 2;
-    case 0x1fae: *buf++ = 0x1f66; *buf++ = 0x3b9; return 2;
-    case 0x1faf: *buf++ = 0x1f67; *buf++ = 0x3b9; return 2;
-    case 0x1fb2: *buf++ = 0x1f70; *buf++ = 0x3b9; return 2;
-    case 0x1fb3: *buf++ = 0x3b1; *buf++ = 0x3b9; return 2;
-    case 0x1fb4: *buf++ = 0x3ac; *buf++ = 0x3b9; return 2;
-    case 0x1fb6: *buf++ = 0x3b1; *buf++ = 0x342; return 2;
-    case 0x1fb7: *buf++ = 0x3b1; *buf++ = 0x342; *buf++ = 0x3b9; return 3;
-    case 0x1fbc: *buf++ = 0x3b1; *buf++ = 0x3b9; return 2;
-    case 0x1fc2: *buf++ = 0x1f74; *buf++ = 0x3b9; return 2;
-    case 0x1fc3: *buf++ = 0x3b7; *buf++ = 0x3b9; return 2;
-    case 0x1fc4: *buf++ = 0x3ae; *buf++ = 0x3b9; return 2;
-    case 0x1fc6: *buf++ = 0x3b7; *buf++ = 0x342; return 2;
-    case 0x1fc7: *buf++ = 0x3b7; *buf++ = 0x342; *buf++ = 0x3b9; return 3;
-    case 0x1fcc: *buf++ = 0x3b7; *buf++ = 0x3b9; return 2;
-    case 0x1fd2: *buf++ = 0x3b9; *buf++ = 0x308; *buf++ = 0x300; return 3;
-    case 0x1fd3: *buf++ = 0x3b9; *buf++ = 0x308; *buf++ = 0x301; return 3;
-    case 0x1fd6: *buf++ = 0x3b9; *buf++ = 0x342; return 2;
-    case 0x1fd7: *buf++ = 0x3b9; *buf++ = 0x308; *buf++ = 0x342; return 3;
-    case 0x1fe2: *buf++ = 0x3c5; *buf++ = 0x308; *buf++ = 0x300; return 3;
-    case 0x1fe3: *buf++ = 0x3c5; *buf++ = 0x308; *buf++ = 0x301; return 3;
-    case 0x1fe4: *buf++ = 0x3c1; *buf++ = 0x313; return 2;
-    case 0x1fe6: *buf++ = 0x3c5; *buf++ = 0x342; return 2;
-    case 0x1fe7: *buf++ = 0x3c5; *buf++ = 0x308; *buf++ = 0x342; return 3;
-    case 0x1ff2: *buf++ = 0x1f7c; *buf++ = 0x3b9; return 2;
-    case 0x1ff3: *buf++ = 0x3c9; *buf++ = 0x3b9; return 2;
-    case 0x1ff4: *buf++ = 0x3ce; *buf++ = 0x3b9; return 2;
-    case 0x1ff6: *buf++ = 0x3c9; *buf++ = 0x342; return 2;
-    case 0x1ff7: *buf++ = 0x3c9; *buf++ = 0x342; *buf++ = 0x3b9; return 3;
-    case 0x1ffc: *buf++ = 0x3c9; *buf++ = 0x3b9; return 2;
-    case 0xfb00: *buf++ = 0x66; *buf++ = 0x66; return 2;
-    case 0xfb01: *buf++ = 0x66; *buf++ = 0x69; return 2;
-    case 0xfb02: *buf++ = 0x66; *buf++ = 0x6c; return 2;
-    case 0xfb03: *buf++ = 0x66; *buf++ = 0x66; *buf++ = 0x69; return 3;
-    case 0xfb04: *buf++ = 0x66; *buf++ = 0x66; *buf++ = 0x6c; return 3;
-    case 0xfb05: *buf++ = 0x73; *buf++ = 0x74; return 2;
-    case 0xfb06: *buf++ = 0x73; *buf++ = 0x74; return 2;
-    case 0xfb13: *buf++ = 0x574; *buf++ = 0x576; return 2;
-    case 0xfb14: *buf++ = 0x574; *buf++ = 0x565; return 2;
-    case 0xfb15: *buf++ = 0x574; *buf++ = 0x56b; return 2;
-    case 0xfb16: *buf++ = 0x57e; *buf++ = 0x576; return 2;
-    case 0xfb17: *buf++ = 0x574; *buf++ = 0x56d; return 2;
-    default: ASSERT(false, ("Invalid UniChar", c));
+  case 0xdf:
+    *buf++ = 0x73;
+    *buf++ = 0x73;
+    return 2;
+  case 0x130:
+    *buf++ = 0x69;
+    *buf++ = 0x307;
+    return 2;
+  case 0x149:
+    *buf++ = 0x2bc;
+    *buf++ = 0x6e;
+    return 2;
+  case 0x1f0:
+    *buf++ = 0x6a;
+    *buf++ = 0x30c;
+    return 2;
+  case 0x390:
+    *buf++ = 0x3b9;
+    *buf++ = 0x308;
+    *buf++ = 0x301;
+    return 3;
+  case 0x3B0:
+    *buf++ = 0x3c5;
+    *buf++ = 0x308;
+    *buf++ = 0x301;
+    return 3;
+  case 0x587:
+    *buf++ = 0x565;
+    *buf++ = 0x582;
+    return 2;
+  case 0x1e96:
+    *buf++ = 0x68;
+    *buf++ = 0x331;
+    return 2;
+  case 0x1e97:
+    *buf++ = 0x74;
+    *buf++ = 0x308;
+    return 2;
+  case 0x1e98:
+    *buf++ = 0x77;
+    *buf++ = 0x30a;
+    return 2;
+  case 0x1e99:
+    *buf++ = 0x79;
+    *buf++ = 0x30a;
+    return 2;
+  case 0x1e9a:
+    *buf++ = 0x61;
+    *buf++ = 0x2be;
+    return 2;
+  case 0x1e9e:
+    *buf++ = 0x73;
+    *buf++ = 0x73;
+    return 2;
+  case 0x1f50:
+    *buf++ = 0x3c5;
+    *buf++ = 0x313;
+    return 2;
+  case 0x1f52:
+    *buf++ = 0x3c5;
+    *buf++ = 0x313;
+    *buf++ = 0x300;
+    return 3;
+  case 0x1f54:
+    *buf++ = 0x3c5;
+    *buf++ = 0x313;
+    *buf++ = 0x301;
+    return 3;
+  case 0x1f56:
+    *buf++ = 0x3c5;
+    *buf++ = 0x313;
+    *buf++ = 0x342;
+    return 3;
+  case 0x1f80:
+    *buf++ = 0x1f00;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1f81:
+    *buf++ = 0x1f01;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1f82:
+    *buf++ = 0x1f02;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1f83:
+    *buf++ = 0x1f03;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1f84:
+    *buf++ = 0x1f04;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1f85:
+    *buf++ = 0x1f05;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1f86:
+    *buf++ = 0x1f06;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1f87:
+    *buf++ = 0x1f07;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1f88:
+    *buf++ = 0x1f00;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1f89:
+    *buf++ = 0x1f01;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1f8a:
+    *buf++ = 0x1f02;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1f8b:
+    *buf++ = 0x1f03;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1f8c:
+    *buf++ = 0x1f04;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1f8d:
+    *buf++ = 0x1f05;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1f8e:
+    *buf++ = 0x1f06;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1f8f:
+    *buf++ = 0x1f07;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1f90:
+    *buf++ = 0x1f20;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1f91:
+    *buf++ = 0x1f21;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1f92:
+    *buf++ = 0x1f22;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1f93:
+    *buf++ = 0x1f23;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1f94:
+    *buf++ = 0x1f24;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1f95:
+    *buf++ = 0x1f25;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1f96:
+    *buf++ = 0x1f26;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1f97:
+    *buf++ = 0x1f27;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1f98:
+    *buf++ = 0x1f20;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1f99:
+    *buf++ = 0x1f21;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1f9a:
+    *buf++ = 0x1f22;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1f9b:
+    *buf++ = 0x1f23;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1f9c:
+    *buf++ = 0x1f24;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1f9d:
+    *buf++ = 0x1f25;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1f9e:
+    *buf++ = 0x1f26;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1f9f:
+    *buf++ = 0x1f27;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1fa0:
+    *buf++ = 0x1f60;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1fa1:
+    *buf++ = 0x1f61;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1fa2:
+    *buf++ = 0x1f62;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1fa3:
+    *buf++ = 0x1f63;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1fa4:
+    *buf++ = 0x1f64;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1fa5:
+    *buf++ = 0x1f65;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1fa6:
+    *buf++ = 0x1f66;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1fa7:
+    *buf++ = 0x1f67;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1fa8:
+    *buf++ = 0x1f60;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1fa9:
+    *buf++ = 0x1f61;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1faa:
+    *buf++ = 0x1f62;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1fab:
+    *buf++ = 0x1f63;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1fac:
+    *buf++ = 0x1f64;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1fad:
+    *buf++ = 0x1f65;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1fae:
+    *buf++ = 0x1f66;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1faf:
+    *buf++ = 0x1f67;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1fb2:
+    *buf++ = 0x1f70;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1fb3:
+    *buf++ = 0x3b1;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1fb4:
+    *buf++ = 0x3ac;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1fb6:
+    *buf++ = 0x3b1;
+    *buf++ = 0x342;
+    return 2;
+  case 0x1fb7:
+    *buf++ = 0x3b1;
+    *buf++ = 0x342;
+    *buf++ = 0x3b9;
+    return 3;
+  case 0x1fbc:
+    *buf++ = 0x3b1;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1fc2:
+    *buf++ = 0x1f74;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1fc3:
+    *buf++ = 0x3b7;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1fc4:
+    *buf++ = 0x3ae;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1fc6:
+    *buf++ = 0x3b7;
+    *buf++ = 0x342;
+    return 2;
+  case 0x1fc7:
+    *buf++ = 0x3b7;
+    *buf++ = 0x342;
+    *buf++ = 0x3b9;
+    return 3;
+  case 0x1fcc:
+    *buf++ = 0x3b7;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1fd2:
+    *buf++ = 0x3b9;
+    *buf++ = 0x308;
+    *buf++ = 0x300;
+    return 3;
+  case 0x1fd3:
+    *buf++ = 0x3b9;
+    *buf++ = 0x308;
+    *buf++ = 0x301;
+    return 3;
+  case 0x1fd6:
+    *buf++ = 0x3b9;
+    *buf++ = 0x342;
+    return 2;
+  case 0x1fd7:
+    *buf++ = 0x3b9;
+    *buf++ = 0x308;
+    *buf++ = 0x342;
+    return 3;
+  case 0x1fe2:
+    *buf++ = 0x3c5;
+    *buf++ = 0x308;
+    *buf++ = 0x300;
+    return 3;
+  case 0x1fe3:
+    *buf++ = 0x3c5;
+    *buf++ = 0x308;
+    *buf++ = 0x301;
+    return 3;
+  case 0x1fe4:
+    *buf++ = 0x3c1;
+    *buf++ = 0x313;
+    return 2;
+  case 0x1fe6:
+    *buf++ = 0x3c5;
+    *buf++ = 0x342;
+    return 2;
+  case 0x1fe7:
+    *buf++ = 0x3c5;
+    *buf++ = 0x308;
+    *buf++ = 0x342;
+    return 3;
+  case 0x1ff2:
+    *buf++ = 0x1f7c;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1ff3:
+    *buf++ = 0x3c9;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1ff4:
+    *buf++ = 0x3ce;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0x1ff6:
+    *buf++ = 0x3c9;
+    *buf++ = 0x342;
+    return 2;
+  case 0x1ff7:
+    *buf++ = 0x3c9;
+    *buf++ = 0x342;
+    *buf++ = 0x3b9;
+    return 3;
+  case 0x1ffc:
+    *buf++ = 0x3c9;
+    *buf++ = 0x3b9;
+    return 2;
+  case 0xfb00:
+    *buf++ = 0x66;
+    *buf++ = 0x66;
+    return 2;
+  case 0xfb01:
+    *buf++ = 0x66;
+    *buf++ = 0x69;
+    return 2;
+  case 0xfb02:
+    *buf++ = 0x66;
+    *buf++ = 0x6c;
+    return 2;
+  case 0xfb03:
+    *buf++ = 0x66;
+    *buf++ = 0x66;
+    *buf++ = 0x69;
+    return 3;
+  case 0xfb04:
+    *buf++ = 0x66;
+    *buf++ = 0x66;
+    *buf++ = 0x6c;
+    return 3;
+  case 0xfb05:
+    *buf++ = 0x73;
+    *buf++ = 0x74;
+    return 2;
+  case 0xfb06:
+    *buf++ = 0x73;
+    *buf++ = 0x74;
+    return 2;
+  case 0xfb13:
+    *buf++ = 0x574;
+    *buf++ = 0x576;
+    return 2;
+  case 0xfb14:
+    *buf++ = 0x574;
+    *buf++ = 0x565;
+    return 2;
+  case 0xfb15:
+    *buf++ = 0x574;
+    *buf++ = 0x56b;
+    return 2;
+  case 0xfb16:
+    *buf++ = 0x57e;
+    *buf++ = 0x576;
+    return 2;
+  case 0xfb17:
+    *buf++ = 0x574;
+    *buf++ = 0x56d;
+    return 2;
+  default: ASSERT(false, ("Invalid UniChar", c));
   }
   return 0;
 }
@@ -207,7 +800,7 @@ size_t CountNormLowerSymbols(UniString const & s, UniString const & lowStr)
   while (lowIdx < lowSize)
   {
     if (sIdx == size)
-      return 0; // low_s has more length than s
+      return 0;  // low_s has more length than s
 
     UniString strCharNorm;
     strCharNorm.push_back(s[sIdx++]);
@@ -215,16 +808,13 @@ size_t CountNormLowerSymbols(UniString const & s, UniString const & lowStr)
     NormalizeInplace(strCharNorm);
 
     for (size_t i = 0; i < strCharNorm.size(); ++i)
-    {
       if (lowIdx >= lowSize)
         return sIdx;
-      else
-        if (lowStr[lowIdx++] != strCharNorm[i])
-          return 0;
-    }
+      else if (lowStr[lowIdx++] != strCharNorm[i])
+        return 0;
   }
 
   return sIdx;
 }
 
-} // namespace strings
+}  // namespace strings
diff --git a/libs/base/lru_cache.hpp b/libs/base/lru_cache.hpp
index 8272a65c3..a17b227a2 100644
--- a/libs/base/lru_cache.hpp
+++ b/libs/base/lru_cache.hpp
@@ -11,16 +11,16 @@
 template <typename Key, typename Value>
 class LruCache
 {
-  template <typename K, typename V> friend class LruCacheTest;
-  template <typename K, typename V> friend class LruCacheKeyAgeTest;
+  template <typename K, typename V>
+  friend class LruCacheTest;
+  template <typename K, typename V>
+  friend class LruCacheKeyAgeTest;
+
 public:
   /// \param maxCacheSize Maximum size of the cache in number of items. It should be one or greater.
   /// \param loader Function which is called if it's necessary to load a new item for the cache.
   /// For the same |key| should be loaded the same |value|.
-  explicit LruCache(size_t maxCacheSize) : m_maxCacheSize(maxCacheSize)
-  {
-    CHECK_GREATER(maxCacheSize, 0, ());
-  }
+  explicit LruCache(size_t maxCacheSize) : m_maxCacheSize(maxCacheSize) { CHECK_GREATER(maxCacheSize, 0, ()); }
 
   // Find value by @key. If @key is found, returns reference to its value.
   Value & Find(Key const & key, bool & found)
@@ -59,10 +59,8 @@ public:
       return false;
 
     for (auto const & kv : m_cache)
-    {
       if (!m_keyAge.IsKeyValidForTesting(kv.first))
         return false;
-    }
 
     return true;
   }
@@ -77,7 +75,8 @@ private:
   /// \note Ages should be unique for all keys.
   class KeyAge
   {
-    template <typename K, typename V> friend class LruCacheKeyAgeTest;
+    template <typename K, typename V>
+    friend class LruCacheKeyAgeTest;
 
   public:
     void Clear()
diff --git a/libs/base/macros.hpp b/libs/base/macros.hpp
index 8dde449ab..cc6eae201 100644
--- a/libs/base/macros.hpp
+++ b/libs/base/macros.hpp
@@ -7,32 +7,32 @@ namespace base
 namespace impl
 {
 // http://rsdn.ru/Forum/?mid=1025325
-template <typename T, unsigned int N> char(&ArraySize(T(&)[N]))[N];
+template <typename T, unsigned int N>
+char (&ArraySize(T (&)[N]))[N];
 }  // namespace impl
-} // namespace base
+}  // namespace base
 
 // Number of elements in array. Compilation error if the type passed is not an array.
 #define ARRAY_SIZE(X) sizeof(::base::impl::ArraySize(X))
 
-#define DISALLOW_COPY(className)                             \
-  className(className const &) = delete;                     \
+#define DISALLOW_COPY(className)                    \
+  className(className const &) = delete;            \
   className & operator=(className const &) = delete
 
-
-#define DISALLOW_MOVE(className)                             \
-  className(className &&) = delete;                          \
+#define DISALLOW_MOVE(className)               \
+  className(className &&) = delete;            \
   className & operator=(className &&) = delete
 
-#define DISALLOW_COPY_AND_MOVE(className)                    \
-  DISALLOW_COPY(className);                                  \
+#define DISALLOW_COPY_AND_MOVE(className) \
+  DISALLOW_COPY(className);               \
   DISALLOW_MOVE(className)
 
 /////////////////////////////////////////////////////////////
 
 #define TO_STRING_IMPL(x) #x
-#define TO_STRING(x) TO_STRING_IMPL(x)
+#define TO_STRING(x)      TO_STRING_IMPL(x)
 
-#define UNUSED_VALUE(x) static_cast<void>(x)
+#define UNUSED_VALUE(x)   static_cast<void>(x)
 
 namespace base
 {
@@ -41,7 +41,7 @@ namespace impl
 template <typename T>
 void ForceUseValue(T const & t)
 {
-  volatile T dummy = t;
+  T volatile dummy = t;
   UNUSED_VALUE(dummy);
 }
 }  // namespace impl
@@ -53,28 +53,27 @@ void ForceUseValue(T const & t)
 #ifdef __GNUC__
 // https://gcc.gnu.org/onlinedocs/gcc/Other-Builtins.html
 #define PREDICT(x, prediction) __builtin_expect(static_cast<long>(x), static_cast<long>(prediction))
-#define PREDICT_TRUE(x) __builtin_expect(x, 1)
-#define PREDICT_FALSE(x) __builtin_expect(x, 0)
+#define PREDICT_TRUE(x)        __builtin_expect(x, 1)
+#define PREDICT_FALSE(x)       __builtin_expect(x, 0)
 #else
 #define PREDICT(x, prediction) (x)
-#define PREDICT_TRUE(x) (x)
-#define PREDICT_FALSE(x) (x)
+#define PREDICT_TRUE(x)        (x)
+#define PREDICT_FALSE(x)       (x)
 #endif
 
-#define UINT16_FROM_UINT8(hi, lo) ((static_cast<uint16_t>(hi) << 8) | lo)
-#define UINT32_FROM_UINT16(hi, lo) ((static_cast<uint32_t>(hi) << 16) | lo)
-#define UINT64_FROM_UINT32(hi, lo) ((static_cast<uint64_t>(hi) << 32) | lo)
+#define UINT16_FROM_UINT8(hi, lo)         ((static_cast<uint16_t>(hi) << 8) | lo)
+#define UINT32_FROM_UINT16(hi, lo)        ((static_cast<uint32_t>(hi) << 16) | lo)
+#define UINT64_FROM_UINT32(hi, lo)        ((static_cast<uint64_t>(hi) << 32) | lo)
 
-#define UINT32_FROM_UINT8(u3, u2, u1, u0) \
-  UINT32_FROM_UINT16(UINT16_FROM_UINT8(u3, u2), UINT16_FROM_UINT8(u1, u0))
-#define UINT64_FROM_UINT8(u7, u6, u5, u4, u3, u2, u1, u0) \
+#define UINT32_FROM_UINT8(u3, u2, u1, u0) UINT32_FROM_UINT16(UINT16_FROM_UINT8(u3, u2), UINT16_FROM_UINT8(u1, u0))
+#define UINT64_FROM_UINT8(u7, u6, u5, u4, u3, u2, u1, u0)                                  \
   UINT64_FROM_UINT32(UINT32_FROM_UINT8(u7, u6, u5, u4), UINT32_FROM_UINT8(u3, u2, u1, u0))
 
-#define UINT16_LO(x) (static_cast<uint8_t>(x & 0xFF))
-#define UINT16_HI(x) (static_cast<uint8_t>(x >> 8))
-#define UINT32_LO(x) (static_cast<uint16_t>(x & 0xFFFF))
-#define UINT32_HI(x) (static_cast<uint16_t>(x >> 16))
-#define UINT64_LO(x) (static_cast<uint32_t>(x & 0xFFFFFFFF))
-#define UINT64_HI(x) (static_cast<uint32_t>(x >> 32))
+#define UINT16_LO(x)     (static_cast<uint8_t>(x & 0xFF))
+#define UINT16_HI(x)     (static_cast<uint8_t>(x >> 8))
+#define UINT32_LO(x)     (static_cast<uint16_t>(x & 0xFFFF))
+#define UINT32_HI(x)     (static_cast<uint16_t>(x >> 16))
+#define UINT64_LO(x)     (static_cast<uint32_t>(x & 0xFFFFFFFF))
+#define UINT64_HI(x)     (static_cast<uint32_t>(x >> 32))
 
 #define NOTIMPLEMENTED() ASSERT(false, ("Function", __func__, "is not implemented!"))
diff --git a/libs/base/math.hpp b/libs/base/math.hpp
index f2996bb7d..b813a5089 100644
--- a/libs/base/math.hpp
+++ b/libs/base/math.hpp
@@ -2,9 +2,9 @@
 
 #include "base/assert.hpp"
 
-#include <algorithm>    // std::max
+#include <algorithm>  // std::max
 #include <cmath>
-#include <functional>   // std::hash
+#include <functional>  // std::hash
 #include <type_traits>
 
 namespace math
@@ -25,9 +25,8 @@ T Abs(T x)
   return (x < 0 ? -x : x);
 }
 
-template <typename Number,
-          typename EnableIf = typename std::enable_if_t<
-              std::is_integral_v<Number> || std::is_floating_point_v<Number>, void>>
+template <typename Number, typename EnableIf = typename std::enable_if_t<
+                               std::is_integral_v<Number> || std::is_floating_point_v<Number>, void>>
 int constexpr Sign(Number const number) noexcept
 {
   return number == 0 ? 0 : number > 0 ? 1 : -1;
@@ -110,10 +109,8 @@ T PowUint(T x, uint64_t n)
 {
   T res = 1;
   for (T t = x; n > 0; n >>= 1, t *= t)
-  {
     if (n & 1)
       res *= t;
-  }
   return res;
 }
 
@@ -150,16 +147,14 @@ inline uint32_t NextPowOf2(uint32_t v)
 }
 
 // Greatest Common Divisor.
-template <typename Number,
-          typename EnableIf = typename std::enable_if_t<std::is_integral_v<Number>, void>>
+template <typename Number, typename EnableIf = typename std::enable_if_t<std::is_integral_v<Number>, void>>
 Number constexpr GCD(Number const a, Number const b)
 {
   return b == 0 ? a : GCD(b, a % b);
 }
 
 // Least Common Multiple.
-template <typename Number,
-          typename EnableIf = typename std::enable_if_t<std::is_integral_v<Number>, void>>
+template <typename Number, typename EnableIf = typename std::enable_if_t<std::is_integral_v<Number>, void>>
 Number constexpr LCM(Number const a, Number const b)
 {
   return a / GCD(a, b) * b;
diff --git a/libs/base/matrix.hpp b/libs/base/matrix.hpp
index 3d574f8c9..43ac35691 100644
--- a/libs/base/matrix.hpp
+++ b/libs/base/matrix.hpp
@@ -7,207 +7,197 @@
 
 namespace math
 {
-  template <typename T, unsigned Rows, unsigned Cols>
-  struct Matrix
+template <typename T, unsigned Rows, unsigned Cols>
+struct Matrix
+{
+  T m_data[Rows * Cols];
+
+  Matrix() {}
+
+  template <typename U>
+  Matrix(Matrix<U, Rows, Cols> const & src)
   {
-    T m_data[Rows * Cols];
+    for (size_t i = 0; i < Rows * Cols; ++i)
+      m_data[i] = src.m_data[i];
+  }
 
-    Matrix() {}
+  Matrix(T * data) { copy(data, data + Rows * Cols, m_data); }
 
-    template <typename U>
-    Matrix(Matrix<U, Rows, Cols> const & src)
-    {
+  Matrix(std::initializer_list<T> const & initList)
+  {
+    ASSERT(initList.size() == Rows * Cols, ());
+    std::copy(initList.begin(), initList.end(), m_data);
+  }
+
+  template <typename U>
+  Matrix & operator=(Matrix<U, Rows, Cols> const & src)
+  {
+    if ((void *)this != (void *)&src)
       for (size_t i = 0; i < Rows * Cols; ++i)
         m_data[i] = src.m_data[i];
-    }
+    return *this;
+  }
 
-    Matrix(T * data)
-    {
-      copy(data, data + Rows * Cols, m_data);
-    }
+  T const & operator()(size_t row, size_t col) const { return m_data[row * Cols + col]; }
 
-    Matrix(std::initializer_list<T> const & initList)
-    {
-      ASSERT(initList.size() == Rows * Cols, ());
-      std::copy(initList.begin(), initList.end(), m_data);
-    }
+  T & operator()(size_t row, size_t col) { return m_data[row * Cols + col]; }
 
-    template <typename U>
-    Matrix & operator=(Matrix<U, Rows, Cols> const & src)
-    {
-      if ((void*)this != (void*)&src)
+  template <typename U>
+  bool operator==(Matrix<U, Rows, Cols> const & m) const
+  {
+    for (size_t i = 0; i < Rows; ++i)
+      for (size_t j = 0; j < Cols; ++j)
+        if (m_data[i * Cols + j] != m(i, j))
+          return false;
+    return true;
+  }
+
+  template <typename U>
+  bool Equal(Matrix<U, Rows, Cols> const & m, T eps = 0.0001) const
+  {
+    for (size_t i = 0; i < Rows; ++i)
+      for (size_t j = 0; j < Cols; ++j)
+        if (Abs(m_data[i * Cols + j] - m(i, j)) > eps)
+          return false;
+
+    return true;
+  }
+
+  template <typename U>
+  bool operator!=(Matrix<U, Rows, Cols> const & m) const
+  {
+    return !(*this == m);
+  }
+
+  template <typename U>
+  bool operator<(Matrix<U, Rows, Cols> const & m) const
+  {
+    for (size_t i = 0; i < Rows; ++i)
+      for (size_t j = 0; j < Cols; ++j)
       {
-        for (size_t i = 0; i < Rows * Cols; ++i)
-          m_data[i] = src.m_data[i];
+        if (m_data[i * Cols + j] > m(i, j))
+          return false;
+        if (m_data[i * Cols + j] < m(i, j))
+          return true;
       }
-      return *this;
-    }
 
-    T const & operator()(size_t row, size_t col) const
-    {
-      return m_data[row * Cols + col];
-    }
+    /// All elements are equal
+    return false;
+  }
+};
 
-    T & operator()(size_t row, size_t col)
-    {
-      return m_data[row * Cols + col];
-    }
+template <typename T>
+T Determinant(Matrix<T, 1, 1> const & m)
+{
+  return m(0, 0);
+}
 
-    template <typename U>
-    bool operator == (Matrix<U, Rows, Cols> const & m) const
-    {
-      for (size_t i = 0; i < Rows; ++i)
-        for (size_t j = 0; j < Cols; ++j)
-          if (m_data[i * Cols + j] != m(i, j))
-            return false;
-      return true;
-    }
+template <typename T, unsigned M>
+T Determinant(Matrix<T, M, M> const & m)
+{
+  T sign = 1;
+  T res = 0;
+  for (size_t i = 0; i < M; ++i, sign *= -1)
+    res += sign * m(0, i) * Determinant(Splice(m, 0, i));
+  return res;
+}
 
-    template <typename U>
-        bool Equal(Matrix<U, Rows, Cols> const & m, T eps = 0.0001) const
-    {
-      for (size_t i = 0; i < Rows; ++i)
-        for (size_t j = 0; j < Cols; ++j)
-          if (Abs(m_data[i * Cols + j] - m(i, j)) > eps)
-            return false;
+template <typename T, unsigned Rows, unsigned Cols>
+Matrix<T, Rows - 1, Cols - 1> const Splice(Matrix<T, Rows, Cols> const & m, size_t Row, size_t Col)
+{
+  Matrix<T, Rows - 1, Cols - 1> res;
 
-      return true;
-    }
-
-    template <typename U>
-    bool operator != (Matrix<U, Rows, Cols> const & m) const
-    {
-      return !(*this == m);
-    }
-
-    template <typename U>
-    bool operator<(Matrix<U, Rows, Cols> const & m) const
-    {
-      for (size_t i = 0; i < Rows; ++i)
-        for (size_t j = 0; j < Cols; ++j)
-        {
-          if (m_data[i * Cols + j] > m(i, j))
-            return false;
-          if (m_data[i * Cols + j] < m(i, j))
-            return true;
-        }
-
-      /// All elements are equal
-      return false;
-    }
-  };
-
-  template <typename T>
-  T Determinant(Matrix<T, 1, 1> const & m)
+  for (size_t i = 0; i < Row; ++i)
   {
-    return m(0, 0);
+    for (size_t j = 0; j < Col; ++j)
+      res(i, j) = m(i, j);
+    for (size_t j = Col + 1; j < Cols; ++j)
+      res(i, j - 1) = m(i, j);
   }
 
-  template <typename T, unsigned M>
-  T Determinant(Matrix<T, M, M> const & m)
+  for (size_t i = Row + 1; i < Rows; ++i)
   {
-    T sign = 1;
-    T res = 0;
-    for (size_t i = 0; i < M; ++i, sign *= -1)
-      res += sign * m(0, i) * Determinant(Splice(m, 0, i));
-    return res;
+    for (size_t j = 0; j < Col; ++j)
+      res(i - 1, j) = m(i, j);
+    for (size_t j = Col + 1; j < Cols; ++j)
+      res(i - 1, j - 1) = m(i, j);
   }
 
-  template <typename T, unsigned Rows, unsigned Cols>
-  Matrix<T, Rows - 1, Cols - 1> const Splice(Matrix<T, Rows, Cols> const & m, size_t Row, size_t Col)
-  {
-    Matrix<T, Rows - 1, Cols - 1> res;
+  return res;
+}
 
-    for (size_t i = 0; i < Row; ++i)
-    {
-      for (size_t j = 0; j < Col; ++j)
-        res(i, j) = m(i, j);
-      for (size_t j = Col + 1; j < Cols; ++j)
-        res(i, j - 1)  = m(i, j);
-    }
+template <typename T, unsigned M>
+Matrix<T, M, M> const Inverse(Matrix<T, M, M> const & m)
+{
+  T det = Determinant(m);
+  Matrix<T, M, M> res;
 
-    for (size_t i = Row + 1; i < Rows; ++i)
-    {
-      for (size_t j = 0; j < Col; ++j)
-        res(i - 1, j) = m(i, j);
-      for (size_t j = Col + 1; j < Cols; ++j)
-        res(i - 1, j - 1) = m(i, j);
-    }
-
-    return res;
-  }
-
-  template <typename T, unsigned M>
-  Matrix<T, M, M> const Inverse(Matrix<T, M, M> const & m)
-  {
-    T det = Determinant(m);
-    Matrix<T, M, M> res;
-
-    for (size_t i = 0; i < M; ++i)
-      for (size_t j = 0; j < M; ++j)
+  for (size_t i = 0; i < M; ++i)
+    for (size_t j = 0; j < M; ++j)
     {
       T sign = 1.0 - 2.0 * ((i + j) % 2);
       res(j, i) = sign * Determinant(Splice(m, i, j)) / det;
     }
 
-    return res;
-  }
-
-  template <typename T, unsigned M>
-  Matrix<T, M, M> const Identity()
-  {
-    Matrix<T, M, M> res;
-
-    for (size_t i = 0; i < M; ++i)
-      for (size_t j = 0; j < M; ++j)
-        res(i, j) = 0;
-
-    for (size_t i = 0; i < M; ++i)
-      res(i, i) = 1;
-
-    return res;
-  }
-
-  template <typename T, unsigned M>
-  Matrix<T, M, M> const Zero()
-  {
-    Matrix<T, M, M> res;
-
-    for (size_t i = 0; i < M; ++i)
-      for (size_t j = 0; j < M; ++j)
-        res(i, j) = 0;
-
-    return res;
-  }
-
-  template <typename T, unsigned M, unsigned N, unsigned K>
-  Matrix<T, M, K> operator*(Matrix<T, M, N> const & l, Matrix<T, N, K> const & r)
-  {
-    Matrix<T, M, K> res;
-    for (size_t m = 0; m < M; ++m)
-      for (size_t k = 0; k < K; ++k)
-      {
-        T sum = 0;
-        for (size_t n = 0; n < N; ++n)
-          sum += l(m, n) * r(n, k);
-        res(m, k) = sum;
-      }
-    return res;
-  }
-
-  template <typename T, unsigned M, unsigned N> std::string DebugPrint(Matrix<T, M, N> const & m)
-  {
-    std::ostringstream ss;
-
-    ss << ":" << std::endl;
-
-    for (unsigned i = 0; i < M; ++i)
-    {
-      for (unsigned j = 0; j < N; ++j)
-        ss << std::setfill(' ') << std::setw(10) << m(i, j) << " ";
-      ss << std::endl;
-    }
-
-    return ss.str();
-  }
+  return res;
 }
+
+template <typename T, unsigned M>
+Matrix<T, M, M> const Identity()
+{
+  Matrix<T, M, M> res;
+
+  for (size_t i = 0; i < M; ++i)
+    for (size_t j = 0; j < M; ++j)
+      res(i, j) = 0;
+
+  for (size_t i = 0; i < M; ++i)
+    res(i, i) = 1;
+
+  return res;
+}
+
+template <typename T, unsigned M>
+Matrix<T, M, M> const Zero()
+{
+  Matrix<T, M, M> res;
+
+  for (size_t i = 0; i < M; ++i)
+    for (size_t j = 0; j < M; ++j)
+      res(i, j) = 0;
+
+  return res;
+}
+
+template <typename T, unsigned M, unsigned N, unsigned K>
+Matrix<T, M, K> operator*(Matrix<T, M, N> const & l, Matrix<T, N, K> const & r)
+{
+  Matrix<T, M, K> res;
+  for (size_t m = 0; m < M; ++m)
+    for (size_t k = 0; k < K; ++k)
+    {
+      T sum = 0;
+      for (size_t n = 0; n < N; ++n)
+        sum += l(m, n) * r(n, k);
+      res(m, k) = sum;
+    }
+  return res;
+}
+
+template <typename T, unsigned M, unsigned N>
+std::string DebugPrint(Matrix<T, M, N> const & m)
+{
+  std::ostringstream ss;
+
+  ss << ":" << std::endl;
+
+  for (unsigned i = 0; i < M; ++i)
+  {
+    for (unsigned j = 0; j < N; ++j)
+      ss << std::setfill(' ') << std::setw(10) << m(i, j) << " ";
+    ss << std::endl;
+  }
+
+  return ss.str();
+}
+}  // namespace math
diff --git a/libs/base/mem_trie.hpp b/libs/base/mem_trie.hpp
index d1745e02f..03f8b2a17 100644
--- a/libs/base/mem_trie.hpp
+++ b/libs/base/mem_trie.hpp
@@ -126,14 +126,12 @@ private:
 
   typename Entries::iterator Find(Char const & c)
   {
-    return std::find_if(m_subtrees.begin(), m_subtrees.end(),
-                        [&c](Entry const & entry) { return entry.first == c; });
+    return std::find_if(m_subtrees.begin(), m_subtrees.end(), [&c](Entry const & entry) { return entry.first == c; });
   }
 
   typename Entries::const_iterator Find(Char const & c) const
   {
-    return std::find_if(m_subtrees.cbegin(), m_subtrees.cend(),
-                        [&c](Entry const & entry) { return entry.first == c; });
+    return std::find_if(m_subtrees.cbegin(), m_subtrees.cend(), [&c](Entry const & entry) { return entry.first == c; });
   }
 
   Entries m_subtrees;
@@ -278,10 +276,7 @@ public:
     curr->AddValue(std::forward<Args>(args)...);
   }
 
-  void Erase(String const & key, Value const & value)
-  {
-    Erase(m_root, key.begin(), key.end(), value);
-  }
+  void Erase(String const & key, Value const & value) { Erase(m_root, key.begin(), key.end(), value); }
 
   // Traverses all key-value pairs in the trie and calls |toDo| on each of them.
   template <typename ToDo>
@@ -298,16 +293,14 @@ public:
   void ForEachInNode(String const & prefix, ToDo && toDo) const
   {
     MoveTo(prefix, true /* fullMatch */,
-           [&](Node const & node, Edge const & /* edge */, size_t /* offset */) {
-             node.m_values.ForEach(toDo);
-           });
+           [&](Node const & node, Edge const & /* edge */, size_t /* offset */) { node.m_values.ForEach(toDo); });
   }
 
   template <typename ToDo>
   void WithValuesHolder(String const & prefix, ToDo && toDo) const
   {
-    MoveTo(prefix, true /* fullMatch */, [&toDo](Node const & node, Edge const & /* edge */,
-                                                 size_t /* offset */) { toDo(node.m_values); });
+    MoveTo(prefix, true /* fullMatch */,
+           [&toDo](Node const & node, Edge const & /* edge */, size_t /* offset */) { toDo(node.m_values); });
   }
 
   // Calls |toDo| for each key-value pair in a subtree that is
@@ -316,7 +309,8 @@ public:
   template <typename ToDo>
   void ForEachInSubtree(String const & prefix, ToDo && toDo) const
   {
-    MoveTo(prefix, false /* fullMatch */, [&](Node const & node, Edge const & edge, size_t offset) {
+    MoveTo(prefix, false /* fullMatch */, [&](Node const & node, Edge const & edge, size_t offset)
+    {
       String p = prefix;
       for (; offset < edge.Size(); ++offset)
         p.push_back(edge[offset]);
@@ -328,17 +322,15 @@ public:
   {
     bool exists = false;
     MoveTo(key, true /* fullMatch */,
-           [&](Node const & node, Edge const & /* edge */, size_t /* offset */) {
-             exists = !node.m_values.Empty();
-           });
+           [&](Node const & node, Edge const & /* edge */, size_t /* offset */) { exists = !node.m_values.Empty(); });
     return exists;
   }
 
   bool HasPrefix(String const & prefix) const
   {
     bool exists = false;
-    MoveTo(prefix, false /* fullMatch */, [&](Node const & node, Edge const & /* edge */,
-                                              size_t /* offset */) { exists = !node.Empty(); });
+    MoveTo(prefix, false /* fullMatch */,
+           [&](Node const & node, Edge const & /* edge */, size_t /* offset */) { exists = !node.Empty(); });
     return exists;
   }
 
@@ -392,10 +384,7 @@ private:
     // Prepends |prefix| to the edge.
     //
     // Complexity: amortized O(|prefix|)
-    void Prepend(Edge const & prefix)
-    {
-      m_label.insert(m_label.end(), prefix.m_label.cbegin(), prefix.m_label.cend());
-    }
+    void Prepend(Edge const & prefix) { m_label.insert(m_label.end(), prefix.m_label.cbegin(), prefix.m_label.cend()); }
 
     Char operator[](size_t i) const
     {
@@ -410,7 +399,10 @@ private:
     void Swap(Edge & rhs) { m_label.swap(rhs.m_label); }
 
     template <typename Sequence>
-    Sequence As() const { return {m_label.rbegin(), m_label.rend()}; }
+    Sequence As() const
+    {
+      return {m_label.rbegin(), m_label.rend()};
+    }
 
     friend std::string DebugPrint(Edge const & edge) { return edge.template As<std::string>(); }
 
@@ -425,17 +417,11 @@ private:
 
     Node & operator=(Node && /* rhs */) = default;
 
-    Node & GetOrCreateMove(Char const & c, bool & created)
-    {
-      return m_moves.GetOrCreateSubtree(c, created);
-    }
+    Node & GetOrCreateMove(Char const & c, bool & created) { return m_moves.GetOrCreateSubtree(c, created); }
 
     Node * GetMove(Char const & c) const { return m_moves.GetSubtree(c); }
 
-    void AddChild(Char const & c, std::unique_ptr<Node> node)
-    {
-      m_moves.AddSubtree(c, std::move(node));
-    }
+    void AddChild(Char const & c, std::unique_ptr<Node> node) { m_moves.AddSubtree(c, std::move(node)); }
 
     void EraseMove(Char const & c) { m_moves.EraseSubtree(c); }
 
@@ -445,10 +431,7 @@ private:
       m_values.Add(std::forward<Args>(args)...);
     }
 
-    void EraseValue(Value const & value)
-    {
-      m_values.Erase(value);
-    }
+    void EraseValue(Value const & value) { m_values.Erase(value); }
 
     bool Empty() const { return m_moves.Empty() && m_values.Empty(); }
 
@@ -461,8 +444,7 @@ private:
     size_t GetNumNodes() const
     {
       size_t size = 1;
-      m_moves.ForEach(
-          [&size](Char const & /* c */, Node const & child) { size += child.GetNumNodes(); });
+      m_moves.ForEach([&size](Char const & /* c */, Node const & child) { size += child.GetNumNodes(); });
       return size;
     }
 
@@ -533,7 +515,8 @@ private:
       {
         Node child;
         Char c;
-        root.m_moves.ForEach([&](Char const & mc, Node & mn) {
+        root.m_moves.ForEach([&](Char const & mc, Node & mn)
+        {
           c = mc;
           child.Swap(mn);
         });
@@ -571,19 +554,17 @@ private:
   template <typename ToDo>
   void ForEachInSubtree(Node const & node, String & prefix, ToDo && toDo) const
   {
-    node.m_values.ForEach([&prefix, &toDo](Value const & value) {
-      toDo(static_cast<String const &>(prefix), value);
-    });
+    node.m_values.ForEach([&prefix, &toDo](Value const & value) { toDo(static_cast<String const &>(prefix), value); });
 
     node.m_moves.ForEach([&](Char const & c, Node const & node)
-                         {
-                           auto const size = prefix.size();
-                           auto const edge = node.m_edge.template As<String>();
-                           prefix.push_back(c);
-                           prefix.insert(prefix.end(), edge.begin(), edge.end());
-                           ForEachInSubtree(node, prefix, toDo);
-                           prefix.resize(size);
-                         });
+    {
+      auto const size = prefix.size();
+      auto const edge = node.m_edge.template As<String>();
+      prefix.push_back(c);
+      prefix.insert(prefix.end(), edge.begin(), edge.end());
+      ForEachInSubtree(node, prefix, toDo);
+      prefix.resize(size);
+    });
   }
 
   template <typename It>
diff --git a/libs/base/newtype.hpp b/libs/base/newtype.hpp
index 8d892e78e..273fb4f59 100644
--- a/libs/base/newtype.hpp
+++ b/libs/base/newtype.hpp
@@ -24,8 +24,7 @@ public:
 
   template <typename V, impl::IsConvertibleGuard<V, Type> = nullptr>
   constexpr explicit NewType(V const & v) : m_value(v)
-  {
-  }
+  {}
 
   constexpr NewType() = default;
 
@@ -155,8 +154,8 @@ std::string SimpleDebugPrint(NewType<Type, Tag> const & nt)
 }  // namespace newtype_default_output
 }  // namespace base
 
-#define NEWTYPE(REPR, NAME) \
-  struct NAME##_tag;        \
+#define NEWTYPE(REPR, NAME)                    \
+  struct NAME##_tag;                           \
   using NAME = base::NewType<REPR, NAME##_tag>
 
 #define NEWTYPE_SIMPLE_OUTPUT(NAME)                                     \
diff --git a/libs/base/non_intersecting_intervals.hpp b/libs/base/non_intersecting_intervals.hpp
index b9a1c96de..d7db0de51 100644
--- a/libs/base/non_intersecting_intervals.hpp
+++ b/libs/base/non_intersecting_intervals.hpp
@@ -64,15 +64,14 @@ bool NonIntersectingIntervals<T>::AddInterval(T left, T right)
 }
 
 template <typename T>
-NonIntersectingIntervals<T>::Interval::Interval(T left, T right)
-  : m_left(left), m_right(right)
+NonIntersectingIntervals<T>::Interval::Interval(T left, T right) : m_left(left)
+                                                                 , m_right(right)
 {
   CHECK_LESS_OR_EQUAL(left, right, ());
 }
 
 template <typename T>
-bool NonIntersectingIntervals<T>::Interval::LessByLeftEnd::operator()(Interval const & lhs,
-                                                                      Interval const & rhs) const
+bool NonIntersectingIntervals<T>::Interval::LessByLeftEnd::operator()(Interval const & lhs, Interval const & rhs) const
 {
   return lhs.m_left < rhs.m_left;
 }
@@ -82,4 +81,4 @@ bool NonIntersectingIntervals<T>::Interval::Intersects(Interval const & rhs) con
 {
   return std::max(m_left, rhs.m_left) <= std::min(m_right, rhs.m_right);
 }
-}  // namespace coding
+}  // namespace base
diff --git a/libs/base/normalize_unicode.cpp b/libs/base/normalize_unicode.cpp
index e97fd0d0d..50586d8d3 100644
--- a/libs/base/normalize_unicode.cpp
+++ b/libs/base/normalize_unicode.cpp
@@ -7,7 +7,181 @@
 namespace strings
 {
 
-UniChar constexpr normSymbols[] = {0x635,0x644,0x649,0x20,0x627,0x644,0x644,0x647,0x20,0x639,0x644,0x64a,0x647,0x20,0x648,0x633,0x644,0x645,0x62c,0x644,0x20,0x62c,0x644,0x627,0x644,0x647,0x28,0x110b,0x1169,0x110c,0x1165,0x11ab,0x29,0x28,0x110b,0x1169,0x1112,0x116e,0x29,0x72,0x61,0x64,0x2215,0x73,0x32,0x30ad,0x30ed,0x30e1,0x30fc,0x30c8,0x30eb,0x30ec,0x30f3,0x30c8,0x30b1,0x30f3,0x30d5,0x30a1,0x30e9,0x30c3,0x30c8,0x30d2,0x30a2,0x30b9,0x30c8,0x30eb,0x30cf,0x30fc,0x30bb,0x30f3,0x30c8,0x30b5,0x30f3,0x30c1,0x30fc,0x30e0,0x30df,0x30ea,0x30cf,0x30fc,0x30eb,0x30af,0x30eb,0x30bb,0x30a4,0x30ed,0x30af,0x30e9,0x30e0,0x30c8,0x30f3,0x30ad,0x30ed,0x30ef,0x30c3,0x30c8,0x30ad,0x30ed,0x30af,0x30e9,0x30e0,0x30de,0x30f3,0x30b7,0x30e7,0x30f3,0x30a8,0x30b9,0x30af,0x30fc,0x30c8,0x30d8,0x30af,0x30bf,0x30fc,0x30eb,0x30d5,0x30c3,0x30b7,0x30a7,0x30eb,0x110e,0x1161,0x11b7,0x1100,0x1169,0x30df,0x30af,0x30ed,0x30f3,0x2032,0x2032,0x2032,0x2032,0x30e1,0x30ab,0x30c8,0x30f3,0x30de,0x30a4,0x30af,0x30ed,0x30db,0x30a4,0x30f3,0x30c8,0x30ea,0x30c3,0x30c8,0x30eb,0x30d5,0x30a3,0x30fc,0x30c8,0x30eb,0x30fc,0x30d5,0x30eb,0x31,0x2044,0x31,0x30,0x56,0x49,0x49,0x49,0x76,0x69,0x69,0x69,0x28,0x31,0x30,0x29,0x28,0x31,0x31,0x29,0x28,0x31,0x32,0x29,0x28,0x31,0x33,0x29,0x28,0x31,0x34,0x29,0x28,0x31,0x35,0x29,0x28,0x31,0x36,0x29,0x28,0x31,0x37,0x29,0x28,0x31,0x38,0x29,0x28,0x31,0x39,0x29,0x28,0x32,0x30,0x29,0x110c,0x116e,0x110b,0x1174,0x30a2,0x30cf,0x30fc,0x30c8,0x30a2,0x30eb,0x30d5,0x30a1,0x30a2,0x30f3,0x30d8,0x30a2,0x30a4,0x30cb,0x30f3,0x30af,0x30a8,0x30fc,0x30ab,0x30fc,0x30ab,0x30e9,0x30c3,0x30c8,0x30ab,0x30ed,0x30ea,0x30fc,0x30ad,0x30e5,0x30ea,0x30fc,0x30ad,0x30eb,0x30bf,0x30fc,0x30af,0x30ed,0x30fc,0x30cd,0x30b5,0x30a4,0x30af,0x30eb,0x30b7,0x30ea,0x30f3,0x30af,0x30cf,0x30fc,0x30ec,0x30eb,0x28,0x110c,0x116e,0x29,0x28,0x1112,0x1161,0x29,0x28,0x1111,0x1161,0x29,0x28,0x1110,0x1161,0x29,0x28,0x110f,0x1161,0x29,0x28,0x110e,0x1161,0x29,0x28,0x110c,0x1161,0x29,0x28,0x110b,0x1161,0x29,0x28,0x1109,0x1161,0x29,0x28,0x1107,0x1161,0x29,0x28,0x1106,0x1161,0x29,0x28,0x1105,0x1161,0x29,0x28,0x1103,0x1161,0x29,0x28,0x1102,0x1161,0x29,0x28,0x1100,0x1161,0x29,0x6b,0x63,0x61,0x6c,0x6d,0x2215,0x73,0x32,0x631,0x6cc,0x627,0x644,0x631,0x633,0x648,0x644,0x61,0x2e,0x6d,0x2e,0x635,0x644,0x639,0x645,0x645,0x62d,0x645,0x62f,0x43,0x2215,0x6b,0x67,0x627,0x643,0x628,0x631,0x70,0x2e,0x6d,0x2e,0x222b,0x222b,0x222b,0x222b,0x633,0x645,0x62d,0x633,0x645,0x62c,0x68,0x50,0x61,0x62,0x61,0x72,0x64,0x6d,0x32,0x2e,0x2e,0x2e,0x64,0x6d,0x33,0x639,0x62c,0x645,0x6b,0x48,0x7a,0x4d,0x48,0x7a,0x47,0x48,0x7a,0x54,0x48,0x7a,0x6d,0x6d,0x32,0x63,0x6d,0x32,0x30d2,0x30af,0x30eb,0x6b,0x6d,0x32,0x642,0x644,0x6d2,0x30de,0x30a4,0x30eb,0x30db,0x30fc,0x30f3,0x30db,0x30fc,0x30eb,0x30db,0x30f3,0x30c8,0x30db,0x30eb,0x30c8,0x30de,0x30c3,0x30cf,0x30d8,0x30fc,0x30bf,0x30d8,0x30fc,0x30b7,0x30d8,0x30f3,0x30b9,0x30d8,0x30eb,0x30c4,0x30d8,0x30cb,0x30d2,0x30de,0x30eb,0x30af,0x635,0x644,0x6d2,0x30d5,0x30e9,0x30f3,0x646,0x62c,0x64a,0x633,0x62e,0x64a,0x635,0x645,0x645,0x633,0x62c,0x649,0x43,0x6f,0x2e,0x30ab,0x30a4,0x30ea,0x30aa,0x30fc,0x30e0,0x30aa,0x30f3,0x30b9,0x41,0x2215,0x6d,0x56,0x2215,0x6d,0x30a6,0x30a9,0x30f3,0x30a4,0x30f3,0x30c1,0x6c,0x6f,0x67,0x30a2,0x30fc,0x30eb,0x50,0x50,0x4d,0x6d,0x6f,0x6c,0x4c,0x54,0x44,0x65,0x72,0x67,0x633,0x62c,0x62d,0x633,0x62d,0x62c,0x62d,0x645,0x649,0x62d,0x645,0x64a,0x62c,0x645,0x62d,0x62c,0x645,0x62d,0x62a,0x645,0x62e,0x62a,0x645,0x62d,0x62a,0x645,0x62c,0x6d,0x69,0x6c,0x6d,0x6d,0x33,0x30cf,0x30fc,0x30c4,0x63,0x6d,0x33,0x30cf,0x30a4,0x30c4,0x30ce,0x30c3,0x30c8,0x30bf,0x30fc,0x30b9,0x30bb,0x30f3,0x30c1,0x6b,0x6d,0x33,0x30b3,0x30fc,0x30db,0x30b3,0x30eb,0x30ca,0x30b1,0x30fc,0x30b9,0x6b,0x50,0x61,0x4d,0x50,0x61,0x47,0x50,0x61,0x66,0x66,0x6c,0x66,0x66,0x69,0x67,0x61,0x6c,0x30ad,0x30cb,0x30fc,0x30ab,0x30f3,0x30de,0x30ab,0x30ed,0x30f3,0x62a,0x645,0x64a,0x62a,0x62e,0x649,0x62a,0x62e,0x64a,0x62a,0x62c,0x649,0x62a,0x62c,0x64a,0x628,0x62e,0x64a,0x64a,0x645,0x645,0x64a,0x645,0x645,0x646,0x645,0x649,0x646,0x645,0x64a,0x646,0x62c,0x649,0x646,0x62c,0x645,0x646,0x62c,0x645,0x646,0x62d,0x649,0x646,0x62d,0x645,0x647,0x645,0x645,0x647,0x645,0x62c,0x645,0x62c,0x62e,0x645,0x62e,0x645,0x645,0x62e,0x62c,0x645,0x62c,0x62d,0x645,0x62d,0x64a,0x646,0x62c,0x62d,0x64a,0x645,0x64a,0x64a,0x62c,0x64a,0x64a,0x62d,0x64a,0x644,0x645,0x64a,0x644,0x62c,0x64a,0x636,0x62d,0x64a,0x642,0x645,0x64a,0x646,0x62d,0x64a,0x642,0x645,0x62d,0x644,0x62d,0x645,0x639,0x645,0x64a,0x643,0x645,0x64a,0x645,0x62e,0x64a,0x644,0x62c,0x645,0x643,0x645,0x645,0x634,0x62d,0x64a,0x635,0x62d,0x64a,0x633,0x62e,0x649,0x62c,0x645,0x649,0x62c,0x62d,0x649,0x62c,0x645,0x64a,0x62a,0x645,0x649,0x636,0x62e,0x645,0x636,0x62e,0x645,0x636,0x62d,0x649,0x62d,0x62c,0x64a,0x634,0x645,0x645,0x634,0x645,0x645,0x634,0x645,0x62e,0x634,0x645,0x62e,0x634,0x62c,0x64a,0x634,0x62d,0x645,0x634,0x62d,0x645,0x635,0x62d,0x62d,0x635,0x62d,0x62d,0x633,0x645,0x645,0x633,0x645,0x645,0x645,0x62c,0x64a,0x641,0x645,0x64a,0x30eb,0x30d2,0x30fc,0x628,0x62d,0x64a,0x30e6,0x30a2,0x30f3,0x30e4,0x30fc,0x30eb,0x30e4,0x30fc,0x30c8,0x644,0x645,0x62d,0x644,0x645,0x62d,0x644,0x62e,0x645,0x644,0x62e,0x645,0x644,0x62c,0x62c,0x644,0x62c,0x62c,0x644,0x62d,0x649,0x644,0x62d,0x64a,0x642,0x645,0x645,0x641,0x62e,0x645,0x641,0x62e,0x645,0x63a,0x645,0x649,0x63a,0x645,0x64a,0x63a,0x645,0x645,0x639,0x645,0x649,0x637,0x645,0x64a,0x637,0x645,0x645,0x637,0x645,0x62d,0x637,0x645,0x62d,0x58,0x49,0x49,0x78,0x69,0x69,0x30,0x2044,0x33,0x222e,0x222e,0x222e,0x28,0x31,0x29,0x28,0x32,0x29,0x28,0x33,0x29,0x28,0x34,0x29,0x28,0x35,0x29,0x28,0x36,0x29,0x28,0x37,0x29,0x28,0x38,0x29,0x28,0x39,0x29,0x28,0x41,0x29,0x28,0x42,0x29,0x28,0x43,0x29,0x28,0x44,0x29,0x28,0x45,0x29,0x28,0x46,0x29,0x28,0x47,0x29,0x28,0x48,0x29,0x28,0x49,0x29,0x28,0x4a,0x29,0x28,0x4b,0x29,0x28,0x1106,0x29,0x28,0x1105,0x29,0x28,0x1103,0x29,0x28,0x1102,0x29,0x28,0x1100,0x29,0x61,0x2f,0x63,0x61,0x2f,0x73,0x63,0x2f,0x6f,0x63,0x2f,0x75,0x54,0x45,0x4c,0x62a,0x62d,0x645,0x46,0x41,0x58,0x31,0x2044,0x37,0x31,0x2044,0x39,0x31,0x2044,0x33,0x32,0x2044,0x33,0x31,0x2044,0x35,0x32,0x2044,0x35,0x33,0x2044,0x35,0x34,0x2044,0x35,0x31,0x2044,0x36,0x35,0x2044,0x36,0x31,0x2044,0x38,0x33,0x2044,0x38,0x35,0x2044,0x38,0x37,0x2044,0x38,0x62a,0x62d,0x62c,0x62a,0x62d,0x62c,0x62a,0x62c,0x645,0x28,0x64,0x29,0x28,0x65,0x29,0x28,0x66,0x29,0x28,0x67,0x29,0x28,0x68,0x29,0x28,0x69,0x29,0x28,0x6a,0x29,0x28,0x6b,0x29,0x28,0x6c,0x29,0x28,0x6d,0x29,0x28,0x6e,0x29,0x50,0x50,0x56,0x28,0x6f,0x29,0x28,0x70,0x29,0x28,0x71,0x29,0x28,0x72,0x29,0x28,0x73,0x29,0x33,0x2044,0x34,0x31,0x2044,0x32,0x31,0x2044,0x34,0x28,0x74,0x29,0x28,0x75,0x29,0x28,0x76,0x29,0x28,0x77,0x29,0x28,0x78,0x29,0x28,0x79,0x29,0x28,0x7a,0x29,0x3d,0x3d,0x3d,0x3a,0x3a,0x3d,0x28,0x4c,0x29,0x28,0x4d,0x29,0x28,0x4e,0x29,0x28,0x4f,0x29,0x28,0x50,0x29,0x28,0x51,0x29,0x28,0x52,0x29,0x28,0x53,0x29,0x28,0x54,0x29,0x28,0x55,0x29,0x28,0x56,0x29,0x28,0x57,0x29,0x28,0x58,0x29,0x28,0x59,0x29,0x28,0x5a,0x29,0x3014,0x53,0x3015,0x31,0x30,0x2e,0x31,0x31,0x2e,0x31,0x32,0x2e,0x31,0x33,0x2e,0x31,0x34,0x2e,0x31,0x35,0x2e,0x31,0x36,0x2e,0x31,0x37,0x2e,0x31,0x38,0x2e,0x31,0x39,0x2e,0x32,0x30,0x2e,0x28,0x61,0x29,0x28,0x62,0x29,0x28,0x63,0x29,0x62a,0x62e,0x645,0x28,0x4e00,0x29,0x28,0x1112,0x29,0x28,0x1111,0x29,0x28,0x1110,0x29,0x28,0x110f,0x29,0x50,0x54,0x45,0x28,0x1109,0x29,0x28,0x110e,0x29,0x2035,0x2035,0x2035,0x28,0x110c,0x29,0x28,0x1107,0x29,0x28,0x110b,0x29,0x3bc,0x67,0x3bc,0x46,0x6e,0x46,0x70,0x46,0x34,0x33,0x6d,0x67,0x61,0x2be,0x3bc,0x6d,0x6e,0x6d,0x66,0x6d,0x6b,0x6c,0x64,0x6c,0x6d,0x6c,0x3bc,0x6c,0x33,0x30,0x32,0x39,0x32,0x38,0x34,0x32,0x32,0x37,0x48,0x67,0x35,0x30,0x32,0x33,0x32,0x34,0x34,0x39,0x64,0x61,0x41,0x55,0x47,0x42,0x4d,0x42,0x4b,0x42,0x6b,0x41,0x6d,0x41,0x3bc,0x41,0x6e,0x41,0x70,0x41,0x49,0x55,0x34,0x35,0x34,0x36,0x34,0x37,0x70,0x63,0x6f,0x56,0x34,0x38,0x6d,0x57,0x6b,0x57,0x4d,0x57,0x6b,0x3a9,0x4d,0x3a9,0x42,0x71,0x63,0x63,0x63,0x64,0x64,0x42,0x47,0x79,0x68,0x61,0x48,0x50,0x69,0x6e,0x4b,0x4b,0x4b,0x4d,0x6b,0x74,0x6c,0x6e,0x6c,0x78,0x6d,0x62,0x33,0x33,0x33,0x34,0x33,0x35,0x34,0x30,0x33,0x39,0x33,0x38,0x33,0x37,0x33,0x36,0x110b,0x116e,0x70,0x73,0x6e,0x73,0x3bc,0x73,0x6d,0x73,0x70,0x56,0x6e,0x56,0x3bc,0x56,0x6b,0x56,0x4d,0x56,0x70,0x57,0x6e,0x57,0x3bc,0x57,0x30d8,0x30bd,0x30d2,0x30eb,0x30d2,0x30b3,0x28,0x29,0x28,0x29,0x49,0x56,0x49,0x58,0x30ca,0x30ce,0x69,0x76,0x21,0x3f,0x3f,0x21,0x21,0x21,0x52,0x73,0xb0,0x43,0xb0,0x46,0x30ea,0x30e9,0x4e,0x6f,0x30ec,0x30e0,0x53,0x4d,0x54,0x4d,0x30ad,0x30ab,0x32,0x35,0x32,0x36,0x65,0x56,0x69,0x78,0x30c6,0x30b7,0x30b3,0x30c8,0x3088,0x308a,0x63a,0x62c,0x638,0x645,0x637,0x62d,0x636,0x645,0x636,0x62c,0x635,0x62e,0x628,0x645,0x628,0x647,0x64,0x7a,0x44,0x7a,0x44,0x5a,0x62a,0x647,0x62b,0x645,0x646,0x62e,0x643,0x644,0x643,0x62e,0x641,0x62c,0x641,0x62d,0x642,0x62d,0x643,0x62c,0x643,0x62d,0x6e,0x6a,0x4e,0x6a,0x4e,0x4a,0x6c,0x6a,0x4c,0x6a,0x4c,0x4a,0x62b,0x64a,0x62b,0x649,0x62b,0x646,0x62b,0x632,0x62b,0x631,0x62a,0x64a,0x62a,0x649,0x62a,0x646,0x62a,0x632,0x62a,0x631,0x628,0x64a,0x628,0x649,0x628,0x646,0x647,0x649,0x647,0x64a,0x64a,0x62e,0x64a,0x649,0x64a,0x631,0x64a,0x632,0x628,0x632,0x646,0x646,0x646,0x649,0x646,0x64a,0x628,0x62c,0x641,0x649,0x641,0x64a,0x642,0x649,0x642,0x64a,0x643,0x627,0x643,0x649,0x643,0x64a,0x645,0x627,0x646,0x631,0x646,0x632,0x633,0x631,0x634,0x631,0x634,0x62e,0x636,0x64a,0x636,0x649,0x635,0x64a,0x635,0x649,0x57,0x5a,0x43,0x44,0x39,0x2c,0x633,0x649,0x633,0x64a,0x634,0x649,0x634,0x64a,0x30,0x2c,0x31,0x2c,0x32,0x2c,0x33,0x2c,0x34,0x2c,0x35,0x2c,0x36,0x2c,0x37,0x2c,0x38,0x2c,0x53,0x44,0x53,0x53,0x57,0x43,0x44,0x4a,0x307b,0x304b,0x30b3,0x30b3,0x3014,0x3015,0x3014,0x3015,0x635,0x631,0x636,0x631,0x633,0x647,0x634,0x647,0x48,0x56,0x63a,0x649,0x639,0x64a,0x639,0x649,0x637,0x64a,0x637,0x649,0x647,0x62c,0x62b,0x647,0x69,0x6a,0x49,0x4a,0x63a,0x64a,0x2bc,0x6e,0x6c,0xb7,0x4c,0xb7,0x62e,0x62d,0x62b,0x62c,0x64a,0x674,0x64a,0x6d0,0x64a,0x6d0,0x64a,0x6c8,0x64a,0x6c8,0x64a,0x6c6,0x64a,0x6c6,0x64a,0x6c7,0x64a,0x6c7,0x64a,0x648,0x64a,0x648,0x64a,0x6d5,0x64a,0x6d5,0x64a,0x627,0x64a,0x627,0xeab,0xe99,0xeab,0xea1,0x6c7,0x674,0x5d0,0x5dc,0x73,0x74,0x73,0x74,0x574,0x576,0x574,0x565,0x574,0x56b,0x57e,0x576,0x574,0x56d,0x565,0x582,0x627,0x674,0x648,0x674,0x50,0x48,0x50,0x52,0x73,0x72,0x57,0x62,0x53,0x76,0x5c,0x5e,0x5b,0x5d,0x30f2,0x30a5,0x30e3,0x60,0x7b,0x5f,0x2013,0x2014,0x40,0x3b,0x3001,0x7d,0x23,0x26,0x2a,0x2b,0x2d,0x3c,0x3e,0x7c,0x30fb,0x300f,0x300e,0x300d,0x300c,0x3009,0x3008,0x300b,0x300a,0x3011,0x3010,0x7e,0x2985,0x2986,0x3002,0x640,0x640,0x621,0x630,0x630,0x629,0x629,0x25,0x27,0x3017,0x3016,0x24,0x24,0x22,0x39e,0x39d,0x39c,0x39b,0x39a,0x399,0x398,0x397,0x396,0x395,0x394,0x393,0x392,0x391,0x237,0x131,0x3c0,0x3c1,0x3c6,0x3ba,0x3b8,0x3b5,0x2202,0x3c9,0x3b2,0x3b1,0x2207,0x3a8,0x3a7,0x3a6,0x3a5,0x3a4,0x3a3,0x3a1,0x3a0,0x39f,0x3b6,0x3b4,0x3b3,0x3c8,0x3c7,0x3c5,0x3c4,0x3c3,0x3c2,0x3bf,0x3be,0x3bd,0x3bb,0x3b9,0x3b7,0x3dd,0x3dc,0x11b3,0x11b2,0x11b1,0x11b0,0x1104,0x11ad,0x11ac,0x11aa,0x1101,0x1160,0x110d,0x110a,0x1121,0x1108,0x111a,0x11b5,0x11b4,0x30cc,0x30e8,0x30e2,0x1d1ba,0x1d1b9,0x1d1b9,0x1d158,0x1d158,0x1d157,0x110a5,0x1173,0x1172,0x1171,0x1170,0x116f,0x116d,0x116c,0x116b,0x116a,0x1168,0x1167,0x1166,0x1164,0x1163,0x1162,0x1109b,0x11099,0x25cb,0x25a0,0x2193,0x2192,0x2191,0x2190,0x2502,0x20a9,0xa5,0xa6,0xac,0xa3,0xa2,0x1175,0x292,0x250,0x251,0x1d02,0x259,0x25b,0x25c,0x14b,0x254,0x1d16,0x1d17,0x1d1d,0x26f,0x1025,0x10dc,0x1b05,0x1b07,0x1b09,0x1b0b,0x1b0d,0x1b11,0xc6,0x18e,0x222,0x268,0x269,0x26a,0x1d7b,0x29d,0x26d,0x1d85,0x29f,0x271,0x270,0x272,0x273,0x274,0x275,0x278,0x282,0x283,0x1ab,0x289,0x28a,0x1d1c,0x28b,0x28c,0x290,0x291,0x1d25,0x43d,0x252,0x255,0xf0,0x25f,0x261,0x265,0xe6,0x438,0x443,0x474,0x475,0x416,0x436,0x410,0x430,0x430,0x415,0x435,0x4d8,0x4d9,0x417,0x437,0x418,0x418,0x41e,0x43e,0x4e8,0x4e9,0x413,0x406,0x41a,0x423,0x433,0x456,0x43a,0x91c,0x921,0x922,0x92b,0x92f,0x9a1,0x9a2,0x9af,0xa32,0xa38,0xa16,0xa17,0xa1c,0xa2b,0xb21,0xb22,0xb92,0xe32,0xeb2,0xf0b,0xf42,0xf4c,0xf51,0xf56,0xf5b,0xf40,0x42d,0x44d,0x427,0x447,0x42b,0x44b,0x6c1,0x928,0x930,0x933,0x915,0x916,0x917,0x1b7,0xd8,0xf8,0x266,0x279,0x27b,0x281,0x263,0x295,0x2b9,0x1158,0x1159,0x1184,0x1185,0x1188,0x1191,0x1192,0x1194,0x119e,0x11a1,0x11d3,0x11d7,0x11d9,0x111c,0x11dd,0x11df,0x111d,0x111e,0x1120,0x1122,0x1123,0x1127,0x1129,0x112b,0x112c,0x112d,0x112e,0x112f,0x1132,0x1136,0x1140,0x1147,0x114c,0x11f1,0x11f2,0x1157,0x30f0,0x30f1,0x30fd,0x3068,0x306f,0x306f,0x3072,0x3072,0x3075,0x3075,0x3078,0x3078,0x3046,0x309d,0x1114,0x1115,0x11c7,0x11c8,0x11cc,0x11ce,0x691,0x6a9,0x6a9,0x6af,0x6af,0x6b3,0x6b3,0x6b1,0x6b1,0x6ba,0x6ba,0x6bb,0x6bb,0x684,0x684,0x683,0x683,0x686,0x686,0x687,0x687,0x68d,0x68d,0x68c,0x68c,0x68e,0x68e,0x688,0x688,0x698,0x698,0x6c9,0x6be,0x6be,0x6ad,0x6ad,0x6cb,0x6cb,0x6c5,0x6c5,0x5f2,0x5e2,0x5d3,0x5d4,0x5db,0x5dd,0x5e8,0x5ea,0x5e9,0x5e9,0x5d1,0x5d2,0x5d5,0x5d6,0x5d8,0x5d9,0xa76f,0x67e,0x680,0x680,0x67a,0x67a,0x67f,0x67f,0x679,0x679,0x6a4,0x6a4,0x6a6,0x6a6,0x5da,0x5de,0x5e0,0x5e1,0x5e3,0x5e4,0x5e6,0x5e7,0x671,0x671,0x67b,0x67b,0x2212,0x2010,0x2277,0x227a,0x227b,0x2282,0x2283,0x2286,0x2287,0x22a2,0x22a8,0x22a9,0x22ab,0x227c,0x227d,0x2291,0x2292,0x22b2,0x22b3,0x22b4,0x22b5,0x2add,0x2d61,0x3012,0x304d,0x304f,0x3051,0x3053,0x3055,0x3057,0x3059,0x305b,0x305d,0x305f,0x3061,0x3064,0x3066,0x127,0x190,0x2194,0x21d0,0x21d4,0x21d2,0x2203,0x2208,0x220b,0x2223,0x2225,0x223c,0x2243,0x2245,0x2248,0x2261,0x224d,0x2264,0x2265,0x2272,0x2273,0x2276,0x2211};
+UniChar constexpr normSymbols[] = {
+    0x635,   0x644,   0x649,  0x20,   0x627,   0x644,   0x644,  0x647,  0x20,    0x639,   0x644,   0x64a,   0x647,
+    0x20,    0x648,   0x633,  0x644,  0x645,   0x62c,   0x644,  0x20,   0x62c,   0x644,   0x627,   0x644,   0x647,
+    0x28,    0x110b,  0x1169, 0x110c, 0x1165,  0x11ab,  0x29,   0x28,   0x110b,  0x1169,  0x1112,  0x116e,  0x29,
+    0x72,    0x61,    0x64,   0x2215, 0x73,    0x32,    0x30ad, 0x30ed, 0x30e1,  0x30fc,  0x30c8,  0x30eb,  0x30ec,
+    0x30f3,  0x30c8,  0x30b1, 0x30f3, 0x30d5,  0x30a1,  0x30e9, 0x30c3, 0x30c8,  0x30d2,  0x30a2,  0x30b9,  0x30c8,
+    0x30eb,  0x30cf,  0x30fc, 0x30bb, 0x30f3,  0x30c8,  0x30b5, 0x30f3, 0x30c1,  0x30fc,  0x30e0,  0x30df,  0x30ea,
+    0x30cf,  0x30fc,  0x30eb, 0x30af, 0x30eb,  0x30bb,  0x30a4, 0x30ed, 0x30af,  0x30e9,  0x30e0,  0x30c8,  0x30f3,
+    0x30ad,  0x30ed,  0x30ef, 0x30c3, 0x30c8,  0x30ad,  0x30ed, 0x30af, 0x30e9,  0x30e0,  0x30de,  0x30f3,  0x30b7,
+    0x30e7,  0x30f3,  0x30a8, 0x30b9, 0x30af,  0x30fc,  0x30c8, 0x30d8, 0x30af,  0x30bf,  0x30fc,  0x30eb,  0x30d5,
+    0x30c3,  0x30b7,  0x30a7, 0x30eb, 0x110e,  0x1161,  0x11b7, 0x1100, 0x1169,  0x30df,  0x30af,  0x30ed,  0x30f3,
+    0x2032,  0x2032,  0x2032, 0x2032, 0x30e1,  0x30ab,  0x30c8, 0x30f3, 0x30de,  0x30a4,  0x30af,  0x30ed,  0x30db,
+    0x30a4,  0x30f3,  0x30c8, 0x30ea, 0x30c3,  0x30c8,  0x30eb, 0x30d5, 0x30a3,  0x30fc,  0x30c8,  0x30eb,  0x30fc,
+    0x30d5,  0x30eb,  0x31,   0x2044, 0x31,    0x30,    0x56,   0x49,   0x49,    0x49,    0x76,    0x69,    0x69,
+    0x69,    0x28,    0x31,   0x30,   0x29,    0x28,    0x31,   0x31,   0x29,    0x28,    0x31,    0x32,    0x29,
+    0x28,    0x31,    0x33,   0x29,   0x28,    0x31,    0x34,   0x29,   0x28,    0x31,    0x35,    0x29,    0x28,
+    0x31,    0x36,    0x29,   0x28,   0x31,    0x37,    0x29,   0x28,   0x31,    0x38,    0x29,    0x28,    0x31,
+    0x39,    0x29,    0x28,   0x32,   0x30,    0x29,    0x110c, 0x116e, 0x110b,  0x1174,  0x30a2,  0x30cf,  0x30fc,
+    0x30c8,  0x30a2,  0x30eb, 0x30d5, 0x30a1,  0x30a2,  0x30f3, 0x30d8, 0x30a2,  0x30a4,  0x30cb,  0x30f3,  0x30af,
+    0x30a8,  0x30fc,  0x30ab, 0x30fc, 0x30ab,  0x30e9,  0x30c3, 0x30c8, 0x30ab,  0x30ed,  0x30ea,  0x30fc,  0x30ad,
+    0x30e5,  0x30ea,  0x30fc, 0x30ad, 0x30eb,  0x30bf,  0x30fc, 0x30af, 0x30ed,  0x30fc,  0x30cd,  0x30b5,  0x30a4,
+    0x30af,  0x30eb,  0x30b7, 0x30ea, 0x30f3,  0x30af,  0x30cf, 0x30fc, 0x30ec,  0x30eb,  0x28,    0x110c,  0x116e,
+    0x29,    0x28,    0x1112, 0x1161, 0x29,    0x28,    0x1111, 0x1161, 0x29,    0x28,    0x1110,  0x1161,  0x29,
+    0x28,    0x110f,  0x1161, 0x29,   0x28,    0x110e,  0x1161, 0x29,   0x28,    0x110c,  0x1161,  0x29,    0x28,
+    0x110b,  0x1161,  0x29,   0x28,   0x1109,  0x1161,  0x29,   0x28,   0x1107,  0x1161,  0x29,    0x28,    0x1106,
+    0x1161,  0x29,    0x28,   0x1105, 0x1161,  0x29,    0x28,   0x1103, 0x1161,  0x29,    0x28,    0x1102,  0x1161,
+    0x29,    0x28,    0x1100, 0x1161, 0x29,    0x6b,    0x63,   0x61,   0x6c,    0x6d,    0x2215,  0x73,    0x32,
+    0x631,   0x6cc,   0x627,  0x644,  0x631,   0x633,   0x648,  0x644,  0x61,    0x2e,    0x6d,    0x2e,    0x635,
+    0x644,   0x639,   0x645,  0x645,  0x62d,   0x645,   0x62f,  0x43,   0x2215,  0x6b,    0x67,    0x627,   0x643,
+    0x628,   0x631,   0x70,   0x2e,   0x6d,    0x2e,    0x222b, 0x222b, 0x222b,  0x222b,  0x633,   0x645,   0x62d,
+    0x633,   0x645,   0x62c,  0x68,   0x50,    0x61,    0x62,   0x61,   0x72,    0x64,    0x6d,    0x32,    0x2e,
+    0x2e,    0x2e,    0x64,   0x6d,   0x33,    0x639,   0x62c,  0x645,  0x6b,    0x48,    0x7a,    0x4d,    0x48,
+    0x7a,    0x47,    0x48,   0x7a,   0x54,    0x48,    0x7a,   0x6d,   0x6d,    0x32,    0x63,    0x6d,    0x32,
+    0x30d2,  0x30af,  0x30eb, 0x6b,   0x6d,    0x32,    0x642,  0x644,  0x6d2,   0x30de,  0x30a4,  0x30eb,  0x30db,
+    0x30fc,  0x30f3,  0x30db, 0x30fc, 0x30eb,  0x30db,  0x30f3, 0x30c8, 0x30db,  0x30eb,  0x30c8,  0x30de,  0x30c3,
+    0x30cf,  0x30d8,  0x30fc, 0x30bf, 0x30d8,  0x30fc,  0x30b7, 0x30d8, 0x30f3,  0x30b9,  0x30d8,  0x30eb,  0x30c4,
+    0x30d8,  0x30cb,  0x30d2, 0x30de, 0x30eb,  0x30af,  0x635,  0x644,  0x6d2,   0x30d5,  0x30e9,  0x30f3,  0x646,
+    0x62c,   0x64a,   0x633,  0x62e,  0x64a,   0x635,   0x645,  0x645,  0x633,   0x62c,   0x649,   0x43,    0x6f,
+    0x2e,    0x30ab,  0x30a4, 0x30ea, 0x30aa,  0x30fc,  0x30e0, 0x30aa, 0x30f3,  0x30b9,  0x41,    0x2215,  0x6d,
+    0x56,    0x2215,  0x6d,   0x30a6, 0x30a9,  0x30f3,  0x30a4, 0x30f3, 0x30c1,  0x6c,    0x6f,    0x67,    0x30a2,
+    0x30fc,  0x30eb,  0x50,   0x50,   0x4d,    0x6d,    0x6f,   0x6c,   0x4c,    0x54,    0x44,    0x65,    0x72,
+    0x67,    0x633,   0x62c,  0x62d,  0x633,   0x62d,   0x62c,  0x62d,  0x645,   0x649,   0x62d,   0x645,   0x64a,
+    0x62c,   0x645,   0x62d,  0x62c,  0x645,   0x62d,   0x62a,  0x645,  0x62e,   0x62a,   0x645,   0x62d,   0x62a,
+    0x645,   0x62c,   0x6d,   0x69,   0x6c,    0x6d,    0x6d,   0x33,   0x30cf,  0x30fc,  0x30c4,  0x63,    0x6d,
+    0x33,    0x30cf,  0x30a4, 0x30c4, 0x30ce,  0x30c3,  0x30c8, 0x30bf, 0x30fc,  0x30b9,  0x30bb,  0x30f3,  0x30c1,
+    0x6b,    0x6d,    0x33,   0x30b3, 0x30fc,  0x30db,  0x30b3, 0x30eb, 0x30ca,  0x30b1,  0x30fc,  0x30b9,  0x6b,
+    0x50,    0x61,    0x4d,   0x50,   0x61,    0x47,    0x50,   0x61,   0x66,    0x66,    0x6c,    0x66,    0x66,
+    0x69,    0x67,    0x61,   0x6c,   0x30ad,  0x30cb,  0x30fc, 0x30ab, 0x30f3,  0x30de,  0x30ab,  0x30ed,  0x30f3,
+    0x62a,   0x645,   0x64a,  0x62a,  0x62e,   0x649,   0x62a,  0x62e,  0x64a,   0x62a,   0x62c,   0x649,   0x62a,
+    0x62c,   0x64a,   0x628,  0x62e,  0x64a,   0x64a,   0x645,  0x645,  0x64a,   0x645,   0x645,   0x646,   0x645,
+    0x649,   0x646,   0x645,  0x64a,  0x646,   0x62c,   0x649,  0x646,  0x62c,   0x645,   0x646,   0x62c,   0x645,
+    0x646,   0x62d,   0x649,  0x646,  0x62d,   0x645,   0x647,  0x645,  0x645,   0x647,   0x645,   0x62c,   0x645,
+    0x62c,   0x62e,   0x645,  0x62e,  0x645,   0x645,   0x62e,  0x62c,  0x645,   0x62c,   0x62d,   0x645,   0x62d,
+    0x64a,   0x646,   0x62c,  0x62d,  0x64a,   0x645,   0x64a,  0x64a,  0x62c,   0x64a,   0x64a,   0x62d,   0x64a,
+    0x644,   0x645,   0x64a,  0x644,  0x62c,   0x64a,   0x636,  0x62d,  0x64a,   0x642,   0x645,   0x64a,   0x646,
+    0x62d,   0x64a,   0x642,  0x645,  0x62d,   0x644,   0x62d,  0x645,  0x639,   0x645,   0x64a,   0x643,   0x645,
+    0x64a,   0x645,   0x62e,  0x64a,  0x644,   0x62c,   0x645,  0x643,  0x645,   0x645,   0x634,   0x62d,   0x64a,
+    0x635,   0x62d,   0x64a,  0x633,  0x62e,   0x649,   0x62c,  0x645,  0x649,   0x62c,   0x62d,   0x649,   0x62c,
+    0x645,   0x64a,   0x62a,  0x645,  0x649,   0x636,   0x62e,  0x645,  0x636,   0x62e,   0x645,   0x636,   0x62d,
+    0x649,   0x62d,   0x62c,  0x64a,  0x634,   0x645,   0x645,  0x634,  0x645,   0x645,   0x634,   0x645,   0x62e,
+    0x634,   0x645,   0x62e,  0x634,  0x62c,   0x64a,   0x634,  0x62d,  0x645,   0x634,   0x62d,   0x645,   0x635,
+    0x62d,   0x62d,   0x635,  0x62d,  0x62d,   0x633,   0x645,  0x645,  0x633,   0x645,   0x645,   0x645,   0x62c,
+    0x64a,   0x641,   0x645,  0x64a,  0x30eb,  0x30d2,  0x30fc, 0x628,  0x62d,   0x64a,   0x30e6,  0x30a2,  0x30f3,
+    0x30e4,  0x30fc,  0x30eb, 0x30e4, 0x30fc,  0x30c8,  0x644,  0x645,  0x62d,   0x644,   0x645,   0x62d,   0x644,
+    0x62e,   0x645,   0x644,  0x62e,  0x645,   0x644,   0x62c,  0x62c,  0x644,   0x62c,   0x62c,   0x644,   0x62d,
+    0x649,   0x644,   0x62d,  0x64a,  0x642,   0x645,   0x645,  0x641,  0x62e,   0x645,   0x641,   0x62e,   0x645,
+    0x63a,   0x645,   0x649,  0x63a,  0x645,   0x64a,   0x63a,  0x645,  0x645,   0x639,   0x645,   0x649,   0x637,
+    0x645,   0x64a,   0x637,  0x645,  0x645,   0x637,   0x645,  0x62d,  0x637,   0x645,   0x62d,   0x58,    0x49,
+    0x49,    0x78,    0x69,   0x69,   0x30,    0x2044,  0x33,   0x222e, 0x222e,  0x222e,  0x28,    0x31,    0x29,
+    0x28,    0x32,    0x29,   0x28,   0x33,    0x29,    0x28,   0x34,   0x29,    0x28,    0x35,    0x29,    0x28,
+    0x36,    0x29,    0x28,   0x37,   0x29,    0x28,    0x38,   0x29,   0x28,    0x39,    0x29,    0x28,    0x41,
+    0x29,    0x28,    0x42,   0x29,   0x28,    0x43,    0x29,   0x28,   0x44,    0x29,    0x28,    0x45,    0x29,
+    0x28,    0x46,    0x29,   0x28,   0x47,    0x29,    0x28,   0x48,   0x29,    0x28,    0x49,    0x29,    0x28,
+    0x4a,    0x29,    0x28,   0x4b,   0x29,    0x28,    0x1106, 0x29,   0x28,    0x1105,  0x29,    0x28,    0x1103,
+    0x29,    0x28,    0x1102, 0x29,   0x28,    0x1100,  0x29,   0x61,   0x2f,    0x63,    0x61,    0x2f,    0x73,
+    0x63,    0x2f,    0x6f,   0x63,   0x2f,    0x75,    0x54,   0x45,   0x4c,    0x62a,   0x62d,   0x645,   0x46,
+    0x41,    0x58,    0x31,   0x2044, 0x37,    0x31,    0x2044, 0x39,   0x31,    0x2044,  0x33,    0x32,    0x2044,
+    0x33,    0x31,    0x2044, 0x35,   0x32,    0x2044,  0x35,   0x33,   0x2044,  0x35,    0x34,    0x2044,  0x35,
+    0x31,    0x2044,  0x36,   0x35,   0x2044,  0x36,    0x31,   0x2044, 0x38,    0x33,    0x2044,  0x38,    0x35,
+    0x2044,  0x38,    0x37,   0x2044, 0x38,    0x62a,   0x62d,  0x62c,  0x62a,   0x62d,   0x62c,   0x62a,   0x62c,
+    0x645,   0x28,    0x64,   0x29,   0x28,    0x65,    0x29,   0x28,   0x66,    0x29,    0x28,    0x67,    0x29,
+    0x28,    0x68,    0x29,   0x28,   0x69,    0x29,    0x28,   0x6a,   0x29,    0x28,    0x6b,    0x29,    0x28,
+    0x6c,    0x29,    0x28,   0x6d,   0x29,    0x28,    0x6e,   0x29,   0x50,    0x50,    0x56,    0x28,    0x6f,
+    0x29,    0x28,    0x70,   0x29,   0x28,    0x71,    0x29,   0x28,   0x72,    0x29,    0x28,    0x73,    0x29,
+    0x33,    0x2044,  0x34,   0x31,   0x2044,  0x32,    0x31,   0x2044, 0x34,    0x28,    0x74,    0x29,    0x28,
+    0x75,    0x29,    0x28,   0x76,   0x29,    0x28,    0x77,   0x29,   0x28,    0x78,    0x29,    0x28,    0x79,
+    0x29,    0x28,    0x7a,   0x29,   0x3d,    0x3d,    0x3d,   0x3a,   0x3a,    0x3d,    0x28,    0x4c,    0x29,
+    0x28,    0x4d,    0x29,   0x28,   0x4e,    0x29,    0x28,   0x4f,   0x29,    0x28,    0x50,    0x29,    0x28,
+    0x51,    0x29,    0x28,   0x52,   0x29,    0x28,    0x53,   0x29,   0x28,    0x54,    0x29,    0x28,    0x55,
+    0x29,    0x28,    0x56,   0x29,   0x28,    0x57,    0x29,   0x28,   0x58,    0x29,    0x28,    0x59,    0x29,
+    0x28,    0x5a,    0x29,   0x3014, 0x53,    0x3015,  0x31,   0x30,   0x2e,    0x31,    0x31,    0x2e,    0x31,
+    0x32,    0x2e,    0x31,   0x33,   0x2e,    0x31,    0x34,   0x2e,   0x31,    0x35,    0x2e,    0x31,    0x36,
+    0x2e,    0x31,    0x37,   0x2e,   0x31,    0x38,    0x2e,   0x31,   0x39,    0x2e,    0x32,    0x30,    0x2e,
+    0x28,    0x61,    0x29,   0x28,   0x62,    0x29,    0x28,   0x63,   0x29,    0x62a,   0x62e,   0x645,   0x28,
+    0x4e00,  0x29,    0x28,   0x1112, 0x29,    0x28,    0x1111, 0x29,   0x28,    0x1110,  0x29,    0x28,    0x110f,
+    0x29,    0x50,    0x54,   0x45,   0x28,    0x1109,  0x29,   0x28,   0x110e,  0x29,    0x2035,  0x2035,  0x2035,
+    0x28,    0x110c,  0x29,   0x28,   0x1107,  0x29,    0x28,   0x110b, 0x29,    0x3bc,   0x67,    0x3bc,   0x46,
+    0x6e,    0x46,    0x70,   0x46,   0x34,    0x33,    0x6d,   0x67,   0x61,    0x2be,   0x3bc,   0x6d,    0x6e,
+    0x6d,    0x66,    0x6d,   0x6b,   0x6c,    0x64,    0x6c,   0x6d,   0x6c,    0x3bc,   0x6c,    0x33,    0x30,
+    0x32,    0x39,    0x32,   0x38,   0x34,    0x32,    0x32,   0x37,   0x48,    0x67,    0x35,    0x30,    0x32,
+    0x33,    0x32,    0x34,   0x34,   0x39,    0x64,    0x61,   0x41,   0x55,    0x47,    0x42,    0x4d,    0x42,
+    0x4b,    0x42,    0x6b,   0x41,   0x6d,    0x41,    0x3bc,  0x41,   0x6e,    0x41,    0x70,    0x41,    0x49,
+    0x55,    0x34,    0x35,   0x34,   0x36,    0x34,    0x37,   0x70,   0x63,    0x6f,    0x56,    0x34,    0x38,
+    0x6d,    0x57,    0x6b,   0x57,   0x4d,    0x57,    0x6b,   0x3a9,  0x4d,    0x3a9,   0x42,    0x71,    0x63,
+    0x63,    0x63,    0x64,   0x64,   0x42,    0x47,    0x79,   0x68,   0x61,    0x48,    0x50,    0x69,    0x6e,
+    0x4b,    0x4b,    0x4b,   0x4d,   0x6b,    0x74,    0x6c,   0x6e,   0x6c,    0x78,    0x6d,    0x62,    0x33,
+    0x33,    0x33,    0x34,   0x33,   0x35,    0x34,    0x30,   0x33,   0x39,    0x33,    0x38,    0x33,    0x37,
+    0x33,    0x36,    0x110b, 0x116e, 0x70,    0x73,    0x6e,   0x73,   0x3bc,   0x73,    0x6d,    0x73,    0x70,
+    0x56,    0x6e,    0x56,   0x3bc,  0x56,    0x6b,    0x56,   0x4d,   0x56,    0x70,    0x57,    0x6e,    0x57,
+    0x3bc,   0x57,    0x30d8, 0x30bd, 0x30d2,  0x30eb,  0x30d2, 0x30b3, 0x28,    0x29,    0x28,    0x29,    0x49,
+    0x56,    0x49,    0x58,   0x30ca, 0x30ce,  0x69,    0x76,   0x21,   0x3f,    0x3f,    0x21,    0x21,    0x21,
+    0x52,    0x73,    0xb0,   0x43,   0xb0,    0x46,    0x30ea, 0x30e9, 0x4e,    0x6f,    0x30ec,  0x30e0,  0x53,
+    0x4d,    0x54,    0x4d,   0x30ad, 0x30ab,  0x32,    0x35,   0x32,   0x36,    0x65,    0x56,    0x69,    0x78,
+    0x30c6,  0x30b7,  0x30b3, 0x30c8, 0x3088,  0x308a,  0x63a,  0x62c,  0x638,   0x645,   0x637,   0x62d,   0x636,
+    0x645,   0x636,   0x62c,  0x635,  0x62e,   0x628,   0x645,  0x628,  0x647,   0x64,    0x7a,    0x44,    0x7a,
+    0x44,    0x5a,    0x62a,  0x647,  0x62b,   0x645,   0x646,  0x62e,  0x643,   0x644,   0x643,   0x62e,   0x641,
+    0x62c,   0x641,   0x62d,  0x642,  0x62d,   0x643,   0x62c,  0x643,  0x62d,   0x6e,    0x6a,    0x4e,    0x6a,
+    0x4e,    0x4a,    0x6c,   0x6a,   0x4c,    0x6a,    0x4c,   0x4a,   0x62b,   0x64a,   0x62b,   0x649,   0x62b,
+    0x646,   0x62b,   0x632,  0x62b,  0x631,   0x62a,   0x64a,  0x62a,  0x649,   0x62a,   0x646,   0x62a,   0x632,
+    0x62a,   0x631,   0x628,  0x64a,  0x628,   0x649,   0x628,  0x646,  0x647,   0x649,   0x647,   0x64a,   0x64a,
+    0x62e,   0x64a,   0x649,  0x64a,  0x631,   0x64a,   0x632,  0x628,  0x632,   0x646,   0x646,   0x646,   0x649,
+    0x646,   0x64a,   0x628,  0x62c,  0x641,   0x649,   0x641,  0x64a,  0x642,   0x649,   0x642,   0x64a,   0x643,
+    0x627,   0x643,   0x649,  0x643,  0x64a,   0x645,   0x627,  0x646,  0x631,   0x646,   0x632,   0x633,   0x631,
+    0x634,   0x631,   0x634,  0x62e,  0x636,   0x64a,   0x636,  0x649,  0x635,   0x64a,   0x635,   0x649,   0x57,
+    0x5a,    0x43,    0x44,   0x39,   0x2c,    0x633,   0x649,  0x633,  0x64a,   0x634,   0x649,   0x634,   0x64a,
+    0x30,    0x2c,    0x31,   0x2c,   0x32,    0x2c,    0x33,   0x2c,   0x34,    0x2c,    0x35,    0x2c,    0x36,
+    0x2c,    0x37,    0x2c,   0x38,   0x2c,    0x53,    0x44,   0x53,   0x53,    0x57,    0x43,    0x44,    0x4a,
+    0x307b,  0x304b,  0x30b3, 0x30b3, 0x3014,  0x3015,  0x3014, 0x3015, 0x635,   0x631,   0x636,   0x631,   0x633,
+    0x647,   0x634,   0x647,  0x48,   0x56,    0x63a,   0x649,  0x639,  0x64a,   0x639,   0x649,   0x637,   0x64a,
+    0x637,   0x649,   0x647,  0x62c,  0x62b,   0x647,   0x69,   0x6a,   0x49,    0x4a,    0x63a,   0x64a,   0x2bc,
+    0x6e,    0x6c,    0xb7,   0x4c,   0xb7,    0x62e,   0x62d,  0x62b,  0x62c,   0x64a,   0x674,   0x64a,   0x6d0,
+    0x64a,   0x6d0,   0x64a,  0x6c8,  0x64a,   0x6c8,   0x64a,  0x6c6,  0x64a,   0x6c6,   0x64a,   0x6c7,   0x64a,
+    0x6c7,   0x64a,   0x648,  0x64a,  0x648,   0x64a,   0x6d5,  0x64a,  0x6d5,   0x64a,   0x627,   0x64a,   0x627,
+    0xeab,   0xe99,   0xeab,  0xea1,  0x6c7,   0x674,   0x5d0,  0x5dc,  0x73,    0x74,    0x73,    0x74,    0x574,
+    0x576,   0x574,   0x565,  0x574,  0x56b,   0x57e,   0x576,  0x574,  0x56d,   0x565,   0x582,   0x627,   0x674,
+    0x648,   0x674,   0x50,   0x48,   0x50,    0x52,    0x73,   0x72,   0x57,    0x62,    0x53,    0x76,    0x5c,
+    0x5e,    0x5b,    0x5d,   0x30f2, 0x30a5,  0x30e3,  0x60,   0x7b,   0x5f,    0x2013,  0x2014,  0x40,    0x3b,
+    0x3001,  0x7d,    0x23,   0x26,   0x2a,    0x2b,    0x2d,   0x3c,   0x3e,    0x7c,    0x30fb,  0x300f,  0x300e,
+    0x300d,  0x300c,  0x3009, 0x3008, 0x300b,  0x300a,  0x3011, 0x3010, 0x7e,    0x2985,  0x2986,  0x3002,  0x640,
+    0x640,   0x621,   0x630,  0x630,  0x629,   0x629,   0x25,   0x27,   0x3017,  0x3016,  0x24,    0x24,    0x22,
+    0x39e,   0x39d,   0x39c,  0x39b,  0x39a,   0x399,   0x398,  0x397,  0x396,   0x395,   0x394,   0x393,   0x392,
+    0x391,   0x237,   0x131,  0x3c0,  0x3c1,   0x3c6,   0x3ba,  0x3b8,  0x3b5,   0x2202,  0x3c9,   0x3b2,   0x3b1,
+    0x2207,  0x3a8,   0x3a7,  0x3a6,  0x3a5,   0x3a4,   0x3a3,  0x3a1,  0x3a0,   0x39f,   0x3b6,   0x3b4,   0x3b3,
+    0x3c8,   0x3c7,   0x3c5,  0x3c4,  0x3c3,   0x3c2,   0x3bf,  0x3be,  0x3bd,   0x3bb,   0x3b9,   0x3b7,   0x3dd,
+    0x3dc,   0x11b3,  0x11b2, 0x11b1, 0x11b0,  0x1104,  0x11ad, 0x11ac, 0x11aa,  0x1101,  0x1160,  0x110d,  0x110a,
+    0x1121,  0x1108,  0x111a, 0x11b5, 0x11b4,  0x30cc,  0x30e8, 0x30e2, 0x1d1ba, 0x1d1b9, 0x1d1b9, 0x1d158, 0x1d158,
+    0x1d157, 0x110a5, 0x1173, 0x1172, 0x1171,  0x1170,  0x116f, 0x116d, 0x116c,  0x116b,  0x116a,  0x1168,  0x1167,
+    0x1166,  0x1164,  0x1163, 0x1162, 0x1109b, 0x11099, 0x25cb, 0x25a0, 0x2193,  0x2192,  0x2191,  0x2190,  0x2502,
+    0x20a9,  0xa5,    0xa6,   0xac,   0xa3,    0xa2,    0x1175, 0x292,  0x250,   0x251,   0x1d02,  0x259,   0x25b,
+    0x25c,   0x14b,   0x254,  0x1d16, 0x1d17,  0x1d1d,  0x26f,  0x1025, 0x10dc,  0x1b05,  0x1b07,  0x1b09,  0x1b0b,
+    0x1b0d,  0x1b11,  0xc6,   0x18e,  0x222,   0x268,   0x269,  0x26a,  0x1d7b,  0x29d,   0x26d,   0x1d85,  0x29f,
+    0x271,   0x270,   0x272,  0x273,  0x274,   0x275,   0x278,  0x282,  0x283,   0x1ab,   0x289,   0x28a,   0x1d1c,
+    0x28b,   0x28c,   0x290,  0x291,  0x1d25,  0x43d,   0x252,  0x255,  0xf0,    0x25f,   0x261,   0x265,   0xe6,
+    0x438,   0x443,   0x474,  0x475,  0x416,   0x436,   0x410,  0x430,  0x430,   0x415,   0x435,   0x4d8,   0x4d9,
+    0x417,   0x437,   0x418,  0x418,  0x41e,   0x43e,   0x4e8,  0x4e9,  0x413,   0x406,   0x41a,   0x423,   0x433,
+    0x456,   0x43a,   0x91c,  0x921,  0x922,   0x92b,   0x92f,  0x9a1,  0x9a2,   0x9af,   0xa32,   0xa38,   0xa16,
+    0xa17,   0xa1c,   0xa2b,  0xb21,  0xb22,   0xb92,   0xe32,  0xeb2,  0xf0b,   0xf42,   0xf4c,   0xf51,   0xf56,
+    0xf5b,   0xf40,   0x42d,  0x44d,  0x427,   0x447,   0x42b,  0x44b,  0x6c1,   0x928,   0x930,   0x933,   0x915,
+    0x916,   0x917,   0x1b7,  0xd8,   0xf8,    0x266,   0x279,  0x27b,  0x281,   0x263,   0x295,   0x2b9,   0x1158,
+    0x1159,  0x1184,  0x1185, 0x1188, 0x1191,  0x1192,  0x1194, 0x119e, 0x11a1,  0x11d3,  0x11d7,  0x11d9,  0x111c,
+    0x11dd,  0x11df,  0x111d, 0x111e, 0x1120,  0x1122,  0x1123, 0x1127, 0x1129,  0x112b,  0x112c,  0x112d,  0x112e,
+    0x112f,  0x1132,  0x1136, 0x1140, 0x1147,  0x114c,  0x11f1, 0x11f2, 0x1157,  0x30f0,  0x30f1,  0x30fd,  0x3068,
+    0x306f,  0x306f,  0x3072, 0x3072, 0x3075,  0x3075,  0x3078, 0x3078, 0x3046,  0x309d,  0x1114,  0x1115,  0x11c7,
+    0x11c8,  0x11cc,  0x11ce, 0x691,  0x6a9,   0x6a9,   0x6af,  0x6af,  0x6b3,   0x6b3,   0x6b1,   0x6b1,   0x6ba,
+    0x6ba,   0x6bb,   0x6bb,  0x684,  0x684,   0x683,   0x683,  0x686,  0x686,   0x687,   0x687,   0x68d,   0x68d,
+    0x68c,   0x68c,   0x68e,  0x68e,  0x688,   0x688,   0x698,  0x698,  0x6c9,   0x6be,   0x6be,   0x6ad,   0x6ad,
+    0x6cb,   0x6cb,   0x6c5,  0x6c5,  0x5f2,   0x5e2,   0x5d3,  0x5d4,  0x5db,   0x5dd,   0x5e8,   0x5ea,   0x5e9,
+    0x5e9,   0x5d1,   0x5d2,  0x5d5,  0x5d6,   0x5d8,   0x5d9,  0xa76f, 0x67e,   0x680,   0x680,   0x67a,   0x67a,
+    0x67f,   0x67f,   0x679,  0x679,  0x6a4,   0x6a4,   0x6a6,  0x6a6,  0x5da,   0x5de,   0x5e0,   0x5e1,   0x5e3,
+    0x5e4,   0x5e6,   0x5e7,  0x671,  0x671,   0x67b,   0x67b,  0x2212, 0x2010,  0x2277,  0x227a,  0x227b,  0x2282,
+    0x2283,  0x2286,  0x2287, 0x22a2, 0x22a8,  0x22a9,  0x22ab, 0x227c, 0x227d,  0x2291,  0x2292,  0x22b2,  0x22b3,
+    0x22b4,  0x22b5,  0x2add, 0x2d61, 0x3012,  0x304d,  0x304f, 0x3051, 0x3053,  0x3055,  0x3057,  0x3059,  0x305b,
+    0x305d,  0x305f,  0x3061, 0x3064, 0x3066,  0x127,   0x190,  0x2194, 0x21d0,  0x21d4,  0x21d2,  0x2203,  0x2208,
+    0x220b,  0x2223,  0x2225, 0x223c, 0x2243,  0x2245,  0x2248, 0x2261, 0x224d,  0x2264,  0x2265,  0x2272,  0x2273,
+    0x2276,  0x2211};
 
 static void w(UniString & r, uint16_t startIndex, int count)
 {
@@ -26,4663 +200,4670 @@ void NormalizeInplace(UniString & s)
     UniChar const c = s[i];
     // ASCII optimization
     if (c < 0xa0)
-       r.push_back(c);
+      r.push_back(c);
     else
     {
       switch (c & 0xffff0000)
       {
-        case 0x0000:
+      case 0x0000:
+      {
+        switch (static_cast<uint16_t>(c & 0x0000ff00))
         {
-          switch (static_cast<uint16_t>(c & 0x0000ff00))
+        case 0x0:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
           {
-          case 0x0:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0xa0: w(r,3,1); break;
-              case 0xa8: w(r,3,1); break;
-              case 0xaa: w(r,40,1); break;
-              case 0xaf: w(r,3,1); break;
-              case 0xb2: w(r,44,1); break;
-              case 0xb3: w(r,184,1); break;
-              case 0xb4: w(r,3,1); break;
-              case 0xb5: w(r,1244,1); break;
-              case 0xb8: w(r,3,1); break;
-              case 0xb9: w(r,158,1); break;
-              case 0xba: w(r,480,1); break;
-              case 0xbc: w(r,1085,3); break;
-              case 0xbd: w(r,1082,3); break;
-              case 0xbe: w(r,1079,3); break;
-              case 0xc0: w(r,491,1); break;
-              case 0xc1: w(r,491,1); break;
-              case 0xc2: w(r,491,1); break;
-              case 0xc3: w(r,491,1); break;
-              case 0xc4: w(r,491,1); break;
-              case 0xc5: w(r,491,1); break;
-              case 0xc7: w(r,358,1); break;
-              case 0xc8: w(r,921,1); break;
-              case 0xc9: w(r,921,1); break;
-              case 0xca: w(r,921,1); break;
-              case 0xcb: w(r,921,1); break;
-              case 0xcc: w(r,163,1); break;
-              case 0xcd: w(r,163,1); break;
-              case 0xce: w(r,163,1); break;
-              case 0xcf: w(r,163,1); break;
-              case 0xd1: w(r,1122,1); break;
-              case 0xd2: w(r,1125,1); break;
-              case 0xd3: w(r,1125,1); break;
-              case 0xd4: w(r,1125,1); break;
-              case 0xd5: w(r,1125,1); break;
-              case 0xd6: w(r,1125,1); break;
-              case 0xd9: w(r,1143,1); break;
-              case 0xda: w(r,1143,1); break;
-              case 0xdb: w(r,1143,1); break;
-              case 0xdc: w(r,1143,1); break;
-              case 0xdd: w(r,1155,1); break;
-              case 0xe0: w(r,40,1); break;
-              case 0xe1: w(r,40,1); break;
-              case 0xe2: w(r,40,1); break;
-              case 0xe3: w(r,40,1); break;
-              case 0xe4: w(r,40,1); break;
-              case 0xe5: w(r,40,1); break;
-              case 0xe7: w(r,331,1); break;
-              case 0xe8: w(r,518,1); break;
-              case 0xe9: w(r,518,1); break;
-              case 0xea: w(r,518,1); break;
-              case 0xeb: w(r,518,1); break;
-              case 0xec: w(r,167,1); break;
-              case 0xed: w(r,167,1); break;
-              case 0xee: w(r,167,1); break;
-              case 0xef: w(r,167,1); break;
-              case 0xf1: w(r,1059,1); break;
-              case 0xf2: w(r,480,1); break;
-              case 0xf3: w(r,480,1); break;
-              case 0xf4: w(r,480,1); break;
-              case 0xf5: w(r,480,1); break;
-              case 0xf6: w(r,480,1); break;
-              case 0xf9: w(r,967,1); break;
-              case 0xfa: w(r,967,1); break;
-              case 0xfb: w(r,967,1); break;
-              case 0xfc: w(r,967,1); break;
-              case 0xfd: w(r,1104,1); break;
-              case 0xff: w(r,1104,1); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0x100:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x0: w(r,491,1); break;
-              case 0x1: w(r,40,1); break;
-              case 0x2: w(r,491,1); break;
-              case 0x3: w(r,40,1); break;
-              case 0x4: w(r,491,1); break;
-              case 0x5: w(r,40,1); break;
-              case 0x6: w(r,358,1); break;
-              case 0x7: w(r,331,1); break;
-              case 0x8: w(r,358,1); break;
-              case 0x9: w(r,331,1); break;
-              case 0xa: w(r,358,1); break;
-              case 0xb: w(r,331,1); break;
-              case 0xc: w(r,358,1); break;
-              case 0xd: w(r,331,1); break;
-              case 0xe: w(r,517,1); break;
-              case 0xf: w(r,41,1); break;
-              case 0x12: w(r,921,1); break;
-              case 0x13: w(r,518,1); break;
-              case 0x14: w(r,921,1); break;
-              case 0x15: w(r,518,1); break;
-              case 0x16: w(r,921,1); break;
-              case 0x17: w(r,518,1); break;
-              case 0x18: w(r,921,1); break;
-              case 0x19: w(r,518,1); break;
-              case 0x1a: w(r,921,1); break;
-              case 0x1b: w(r,518,1); break;
-              case 0x1c: w(r,404,1); break;
-              case 0x1d: w(r,361,1); break;
-              case 0x1e: w(r,404,1); break;
-              case 0x1f: w(r,361,1); break;
-              case 0x20: w(r,404,1); break;
-              case 0x21: w(r,361,1); break;
-              case 0x22: w(r,404,1); break;
-              case 0x23: w(r,361,1); break;
-              case 0x24: w(r,399,1); break;
-              case 0x25: w(r,380,1); break;
-              case 0x28: w(r,163,1); break;
-              case 0x29: w(r,167,1); break;
-              case 0x2a: w(r,163,1); break;
-              case 0x2b: w(r,167,1); break;
-              case 0x2c: w(r,163,1); break;
-              case 0x2d: w(r,167,1); break;
-              case 0x2e: w(r,163,1); break;
-              case 0x2f: w(r,167,1); break;
-              case 0x30: w(r,163,1); break;
-              case 0x32: w(r,1672,2); break;
-              case 0x33: w(r,1670,2); break;
-              case 0x34: w(r,936,1); break;
-              case 0x35: w(r,1047,1); break;
-              case 0x36: w(r,939,1); break;
-              case 0x37: w(r,330,1); break;
-              case 0x39: w(r,515,1); break;
-              case 0x3a: w(r,333,1); break;
-              case 0x3b: w(r,515,1); break;
-              case 0x3c: w(r,333,1); break;
-              case 0x3d: w(r,515,1); break;
-              case 0x3e: w(r,333,1); break;
-              case 0x3f: w(r,1680,2); break;
-              case 0x40: w(r,1678,2); break;
-              // @HACK Special case for Polish Ł
-              case 0x41: w(r,515,1); break;
-              // @HACK Special case for Polish ł
-              case 0x42: w(r,333,1); break;
-              case 0x43: w(r,1122,1); break;
-              case 0x44: w(r,1059,1); break;
-              case 0x45: w(r,1122,1); break;
-              case 0x46: w(r,1059,1); break;
-              case 0x47: w(r,1122,1); break;
-              case 0x48: w(r,1059,1); break;
-              case 0x49: w(r,1676,2); break;
-              case 0x4c: w(r,1125,1); break;
-              case 0x4d: w(r,480,1); break;
-              case 0x4e: w(r,1125,1); break;
-              case 0x4f: w(r,480,1); break;
-              case 0x50: w(r,1125,1); break;
-              case 0x51: w(r,480,1); break;
-              case 0x54: w(r,1134,1); break;
-              case 0x55: w(r,39,1); break;
-              case 0x56: w(r,1134,1); break;
-              case 0x57: w(r,39,1); break;
-              case 0x58: w(r,1134,1); break;
-              case 0x59: w(r,39,1); break;
-              case 0x5a: w(r,1137,1); break;
-              case 0x5b: w(r,43,1); break;
-              case 0x5c: w(r,1137,1); break;
-              case 0x5d: w(r,43,1); break;
-              case 0x5e: w(r,1137,1); break;
-              case 0x5f: w(r,43,1); break;
-              case 0x60: w(r,1137,1); break;
-              case 0x61: w(r,43,1); break;
-              case 0x62: w(r,407,1); break;
-              case 0x63: w(r,1089,1); break;
-              case 0x64: w(r,407,1); break;
-              case 0x65: w(r,1089,1); break;
-              case 0x68: w(r,1143,1); break;
-              case 0x69: w(r,967,1); break;
-              case 0x6a: w(r,1143,1); break;
-              case 0x6b: w(r,967,1); break;
-              case 0x6c: w(r,1143,1); break;
-              case 0x6d: w(r,967,1); break;
-              case 0x6e: w(r,1143,1); break;
-              case 0x6f: w(r,967,1); break;
-              case 0x70: w(r,1143,1); break;
-              case 0x71: w(r,967,1); break;
-              case 0x72: w(r,1143,1); break;
-              case 0x73: w(r,967,1); break;
-              case 0x74: w(r,1149,1); break;
-              case 0x75: w(r,1098,1); break;
-              case 0x76: w(r,1155,1); break;
-              case 0x77: w(r,1104,1); break;
-              case 0x78: w(r,1155,1); break;
-              case 0x79: w(r,1158,1); break;
-              case 0x7a: w(r,400,1); break;
-              case 0x7b: w(r,1158,1); break;
-              case 0x7c: w(r,400,1); break;
-              case 0x7d: w(r,1158,1); break;
-              case 0x7e: w(r,400,1); break;
-              case 0x7f: w(r,43,1); break;
-              case 0xa0: w(r,1125,1); break;
-              case 0xa1: w(r,480,1); break;
-              case 0xaf: w(r,1143,1); break;
-              case 0xb0: w(r,967,1); break;
-              case 0xc4: w(r,1482,2); break;
-              case 0xc5: w(r,1480,2); break;
-              case 0xc6: w(r,1478,2); break;
-              case 0xc7: w(r,1514,2); break;
-              case 0xc8: w(r,1512,2); break;
-              case 0xc9: w(r,1510,2); break;
-              case 0xca: w(r,1508,2); break;
-              case 0xcb: w(r,1506,2); break;
-              case 0xcc: w(r,1504,2); break;
-              case 0xcd: w(r,491,1); break;
-              case 0xce: w(r,40,1); break;
-              case 0xcf: w(r,163,1); break;
-              case 0xd0: w(r,167,1); break;
-              case 0xd1: w(r,1125,1); break;
-              case 0xd2: w(r,480,1); break;
-              case 0xd3: w(r,1143,1); break;
-              case 0xd4: w(r,967,1); break;
-              case 0xd5: w(r,1143,1); break;
-              case 0xd6: w(r,967,1); break;
-              case 0xd7: w(r,1143,1); break;
-              case 0xd8: w(r,967,1); break;
-              case 0xd9: w(r,1143,1); break;
-              case 0xda: w(r,967,1); break;
-              case 0xdb: w(r,1143,1); break;
-              case 0xdc: w(r,967,1); break;
-              case 0xde: w(r,491,1); break;
-              case 0xdf: w(r,40,1); break;
-              case 0xe0: w(r,491,1); break;
-              case 0xe1: w(r,40,1); break;
-              case 0xe2: w(r,1939,1); break;
-              case 0xe3: w(r,1975,1); break;
-              case 0xe6: w(r,404,1); break;
-              case 0xe7: w(r,361,1); break;
-              case 0xe8: w(r,939,1); break;
-              case 0xe9: w(r,330,1); break;
-              case 0xea: w(r,1125,1); break;
-              case 0xeb: w(r,480,1); break;
-              case 0xec: w(r,1125,1); break;
-              case 0xed: w(r,480,1); break;
-              case 0xee: w(r,2043,1); break;
-              case 0xef: w(r,1918,1); break;
-              case 0xf0: w(r,1047,1); break;
-              case 0xf1: w(r,1482,2); break;
-              case 0xf2: w(r,1480,2); break;
-              case 0xf3: w(r,1478,2); break;
-              case 0xf4: w(r,404,1); break;
-              case 0xf5: w(r,361,1); break;
-              case 0xf8: w(r,1122,1); break;
-              case 0xf9: w(r,1059,1); break;
-              case 0xfa: w(r,491,1); break;
-              case 0xfb: w(r,40,1); break;
-              case 0xfc: w(r,1939,1); break;
-              case 0xfd: w(r,1975,1); break;
-              case 0xfe: w(r,2044,1); break;
-              case 0xff: w(r,2045,1); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0x200:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x0: w(r,491,1); break;
-              case 0x1: w(r,40,1); break;
-              case 0x2: w(r,491,1); break;
-              case 0x3: w(r,40,1); break;
-              case 0x4: w(r,921,1); break;
-              case 0x5: w(r,518,1); break;
-              case 0x6: w(r,921,1); break;
-              case 0x7: w(r,518,1); break;
-              case 0x8: w(r,163,1); break;
-              case 0x9: w(r,167,1); break;
-              case 0xa: w(r,163,1); break;
-              case 0xb: w(r,167,1); break;
-              case 0xc: w(r,1125,1); break;
-              case 0xd: w(r,480,1); break;
-              case 0xe: w(r,1125,1); break;
-              case 0xf: w(r,480,1); break;
-              case 0x10: w(r,1134,1); break;
-              case 0x11: w(r,39,1); break;
-              case 0x12: w(r,1134,1); break;
-              case 0x13: w(r,39,1); break;
-              case 0x14: w(r,1143,1); break;
-              case 0x15: w(r,967,1); break;
-              case 0x16: w(r,1143,1); break;
-              case 0x17: w(r,967,1); break;
-              case 0x18: w(r,1137,1); break;
-              case 0x19: w(r,43,1); break;
-              case 0x1a: w(r,407,1); break;
-              case 0x1b: w(r,1089,1); break;
-              case 0x1e: w(r,399,1); break;
-              case 0x1f: w(r,380,1); break;
-              case 0x26: w(r,491,1); break;
-              case 0x27: w(r,40,1); break;
-              case 0x28: w(r,921,1); break;
-              case 0x29: w(r,518,1); break;
-              case 0x2a: w(r,1125,1); break;
-              case 0x2b: w(r,480,1); break;
-              case 0x2c: w(r,1125,1); break;
-              case 0x2d: w(r,480,1); break;
-              case 0x2e: w(r,1125,1); break;
-              case 0x2f: w(r,480,1); break;
-              case 0x30: w(r,1125,1); break;
-              case 0x31: w(r,480,1); break;
-              case 0x32: w(r,1155,1); break;
-              case 0x33: w(r,1104,1); break;
-              case 0xb0: w(r,380,1); break;
-              case 0xb1: w(r,2046,1); break;
-              case 0xb2: w(r,1047,1); break;
-              case 0xb3: w(r,39,1); break;
-              case 0xb4: w(r,2047,1); break;
-              case 0xb5: w(r,2048,1); break;
-              case 0xb6: w(r,2049,1); break;
-              case 0xb7: w(r,1098,1); break;
-              case 0xb8: w(r,1104,1); break;
-              case 0xd8: w(r,3,1); break;
-              case 0xd9: w(r,3,1); break;
-              case 0xda: w(r,3,1); break;
-              case 0xdb: w(r,3,1); break;
-              case 0xdc: w(r,3,1); break;
-              case 0xdd: w(r,3,1); break;
-              case 0xe0: w(r,2050,1); break;
-              case 0xe1: w(r,333,1); break;
-              case 0xe2: w(r,43,1); break;
-              case 0xe3: w(r,872,1); break;
-              case 0xe4: w(r,2051,1); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0x300:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x74: w(r,2052,1); break;
-              case 0x7a: w(r,3,1); break;
-              case 0x7e: w(r,1767,1); break;
-              case 0x84: w(r,3,1); break;
-              case 0x85: w(r,3,1); break;
-              case 0x86: w(r,1820,1); break;
-              case 0x87: w(r,1679,1); break;
-              case 0x88: w(r,1816,1); break;
-              case 0x89: w(r,1814,1); break;
-              case 0x8a: w(r,1812,1); break;
-              case 0x8c: w(r,1842,1); break;
-              case 0x8e: w(r,1837,1); break;
-              case 0x8f: w(r,1333,1); break;
-              case 0x90: w(r,1856,1); break;
-              case 0xaa: w(r,1812,1); break;
-              case 0xab: w(r,1837,1); break;
-              case 0xac: w(r,1832,1); break;
-              case 0xad: w(r,1828,1); break;
-              case 0xae: w(r,1857,1); break;
-              case 0xaf: w(r,1856,1); break;
-              case 0xb0: w(r,1848,1); break;
-              case 0xca: w(r,1856,1); break;
-              case 0xcb: w(r,1848,1); break;
-              case 0xcc: w(r,1852,1); break;
-              case 0xcd: w(r,1848,1); break;
-              case 0xce: w(r,1830,1); break;
-              case 0xd0: w(r,1831,1); break;
-              case 0xd1: w(r,1827,1); break;
-              case 0xd2: w(r,1837,1); break;
-              case 0xd3: w(r,1837,1); break;
-              case 0xd4: w(r,1837,1); break;
-              case 0xd5: w(r,1825,1); break;
-              case 0xd6: w(r,1823,1); break;
-              case 0xf0: w(r,1826,1); break;
-              case 0xf1: w(r,1824,1); break;
-              case 0xf2: w(r,1851,1); break;
-              case 0xf4: w(r,1813,1); break;
-              case 0xf5: w(r,1828,1); break;
-              case 0xf9: w(r,1839,1); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0x400:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x0: w(r,1985,1); break;
-              case 0x1: w(r,1985,1); break;
-              case 0x3: w(r,1997,1); break;
-              case 0x7: w(r,1998,1); break;
-              case 0xc: w(r,1999,1); break;
-              case 0xd: w(r,1991,1); break;
-              case 0xe: w(r,2000,1); break;
-              case 0x19: w(r,1991,1); break;
-              case 0x39: w(r,1976,1); break;
-              case 0x50: w(r,1986,1); break;
-              case 0x51: w(r,1986,1); break;
-              case 0x53: w(r,2001,1); break;
-              case 0x57: w(r,2002,1); break;
-              case 0x5c: w(r,2003,1); break;
-              case 0x5d: w(r,1976,1); break;
-              case 0x5e: w(r,1977,1); break;
-              case 0x76: w(r,1978,1); break;
-              case 0x77: w(r,1979,1); break;
-              case 0xc1: w(r,1980,1); break;
-              case 0xc2: w(r,1981,1); break;
-              case 0xd0: w(r,1982,1); break;
-              case 0xd1: w(r,1983,1); break;
-              case 0xd2: w(r,1982,1); break;
-              case 0xd3: w(r,1983,1); break;
-              case 0xd6: w(r,1985,1); break;
-              case 0xd7: w(r,1986,1); break;
-              case 0xda: w(r,1987,1); break;
-              case 0xdb: w(r,1988,1); break;
-              case 0xdc: w(r,1980,1); break;
-              case 0xdd: w(r,1981,1); break;
-              case 0xde: w(r,1989,1); break;
-              case 0xdf: w(r,1990,1); break;
-              case 0xe2: w(r,1991,1); break;
-              case 0xe3: w(r,1976,1); break;
-              case 0xe4: w(r,1991,1); break;
-              case 0xe5: w(r,1976,1); break;
-              case 0xe6: w(r,1993,1); break;
-              case 0xe7: w(r,1994,1); break;
-              case 0xea: w(r,1995,1); break;
-              case 0xeb: w(r,1996,1); break;
-              case 0xec: w(r,2030,1); break;
-              case 0xed: w(r,2031,1); break;
-              case 0xee: w(r,2000,1); break;
-              case 0xef: w(r,1977,1); break;
-              case 0xf0: w(r,2000,1); break;
-              case 0xf1: w(r,1977,1); break;
-              case 0xf2: w(r,2000,1); break;
-              case 0xf3: w(r,1977,1); break;
-              case 0xf4: w(r,2032,1); break;
-              case 0xf5: w(r,2033,1); break;
-              case 0xf8: w(r,2034,1); break;
-              case 0xf9: w(r,2035,1); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0x500:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x87: w(r,1738,2); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0x600:  /* Arabic Language */
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x0c: w(r,1603,1); break;  // ARABIC COMMA
-              case 0x22: w(r,4,1); break;     // ARABIC LETTER ALEF WITH MADDA ABOVE
-              case 0x23: w(r,4,1); break;     // ARABIC LETTER ALEF WITH HAMZA ABOVE
-              case 0x24: w(r,14,1); break;    // ARABIC LETTER WAW WITH HAMZA ABOVE
-              case 0x25: w(r,4,1); break;     // ARABIC LETTER ALEF WITH HAMZA BELOW
-              case 0x26: w(r,11,1); break;    // ARABIC LETTER YEH WITH HAMZA ABOVE
-              case 0x29: w(r,7,1); break;     // ARABIC LETTER TEH MARBUTA
-              case 0x49: w(r,11,1); break;    // ARABIC LETTER ALEF MAKSURA
-              case 0x71: w(r,4,1); break;     // ARABIC LETTER ALEF WASLA
-              case 0x72: w(r,4,1); break;     // ARABIC LETTER ALEF WITH WAVY HAMZA ABOVE
-              case 0x73: w(r,4,1); break;     // ARABIC LETTER ALEF WITH WAVY HAMZA BELOW
-              case 0x75: w(r,1740,1); break;  // ARABIC LETTER HIGH HAMZA ALEF
-              case 0x76: w(r,1742,1); break;  // ARABIC LETTER HIGH HAMZA WAW
-              case 0x77: w(r,1742,1); break;  // ARABIC LETTER U WITH HAMZA ABOVE
-              case 0x78: w(r,1686,1); break;  // ARABIC LETTER HIGH HAMZA YEH
-              case 0xc0: w(r,7,1); break;     // ARABIC LETTER HEH WITH YEH ABOVE
-              case 0xc2: w(r,7,1); break;     // ARABIC LETTER HEH GOAL WITH HAMZA ABOVE
-              case 0xc3: w(r,7,1); break;     // ARABIC LETTER TEH MARBUTA GOAL
-              case 0xd3: w(r,424,1); break;   // ARABIC LETTER YEH BARREE WITH HAMZA ABOVE
-
-
-              //  ARABIC-INDIC DIGITS
-              case 0x60: w(r,172,1); break;  // ARABIC-INDIC DIGIT ZERO
-              case 0x61: w(r,176,1); break;  // ARABIC-INDIC DIGIT ONE
-              case 0x62: w(r,180,1); break;  // ARABIC-INDIC DIGIT TWO
-              case 0x63: w(r,184,1); break;  // ARABIC-INDIC DIGIT THREE
-              case 0x64: w(r,188,1); break;  // ARABIC-INDIC DIGIT FOUR
-              case 0x65: w(r,192,1); break;  // ARABIC-INDIC DIGIT FIVE
-              case 0x66: w(r,196,1); break;  // ARABIC-INDIC DIGIT SIX
-              case 0x67: w(r,200,1); break;  // ARABIC-INDIC DIGIT SEVEN
-              case 0x68: w(r,204,1); break;  // ARABIC-INDIC DIGIT EIGHT
-              case 0x69: w(r,208,1); break;  // ARABIC-INDIC DIGIT NINE
-
-              // EXTENDED ARABIC-INDIC DIGITS
-              case 0xf0: w(r,172,1); break; // EXTENDED ARABIC-INDIC DIGIT ZERO
-              case 0xf1: w(r,176,1); break; // EXTENDED ARABIC-INDIC DIGIT ONE
-              case 0xf2: w(r,180,1); break; // EXTENDED ARABIC-INDIC DIGIT TWO
-              case 0xf3: w(r,184,1); break; // EXTENDED ARABIC-INDIC DIGIT THREE
-              case 0xf4: w(r,188,1); break; // EXTENDED ARABIC-INDIC DIGIT FOUR
-              case 0xf5: w(r,192,1); break; // EXTENDED ARABIC-INDIC DIGIT FIVE
-              case 0xf6: w(r,196,1); break; // EXTENDED ARABIC-INDIC DIGIT SIX
-              case 0xf7: w(r,200,1); break; // EXTENDED ARABIC-INDIC DIGIT SEVEN
-              case 0xf8: w(r,204,1); break; // EXTENDED ARABIC-INDIC DIGIT EIGHT
-              case 0xf9: w(r,208,1); break; // EXTENDED ARABIC-INDIC DIGIT NINE
-
-              // Remove Arabic Diacritics (Tashkeel)
-              case 0x40: break; // ARABIC TATWEEL
-              case 0x4b: break; // ARABIC FATHATAN
-              case 0x4c: break; // ARABIC DAMMATAN
-              case 0x4d: break; // ARABIC KASRATAN
-              case 0x4e: break; // ARABIC FATHA
-              case 0x4f: break; // ARABIC DAMMA
-              case 0x50: break; // ARABIC KASRA
-              case 0x51: break; // ARABIC SHADDA
-              case 0x52: break; // ARABIC SUKUN
-              case 0x53: break; // ARABIC MADDAH ABOVE
-              case 0x54: break; // ARABIC HAMZA ABOVE
-              case 0x55: break; // ARABIC HAMZA BELOW
-              case 0x56: break; // ARABIC SUBSCRIPT ALEF
-              case 0x57: break; // ARABIC INVERTED DAMMA
-              case 0x58: break; // ARABIC MARK NOON GHUNNA
-              case 0x59: break; // ARABIC ZWARAKAY
-              case 0x5a: break; // ARABIC VOWEL SIGN SMALL V ABOVE
-              case 0x5b: break; // ARABIC VOWEL SIGN INVERTED SMALL V ABOVE
-              case 0x5c: break; // ARABIC VOWEL SIGN DOT BELOW
-              case 0x5d: break; // ARABIC REVERSED DAMMA
-              case 0x5e: break; // ARABIC FATHA WITH TWO DOTS
-              case 0x5f: break; // ARABIC WAVY HAMZA BELOW
-              case 0x70: break; // ARABIC LETTER SUPERSCRIPT ALEF
-
-              // Remove Arabic Islamic Honorifics
-              case 0x10: break; // ARABIC SIGN SALLALLAHOU ALAYHE WASSALLAM
-              case 0x11: break; // ARABIC SIGN ALAYHE ASSALLAM
-              case 0x12: break; // ARABIC SIGN RAHMATULLAH ALAYHE
-              case 0x13: break; // ARABIC SIGN RADI ALLAHU ANHU
-              case 0x14: break; // ARABIC SIGN TAKHALLUS
-              case 0x15: break; // ARABIC SMALL HIGH TAH
-              case 0x16: break; // ARABIC SMALL HIGH LIGATURE ALEF WITH LAM WITH YEH
-              case 0x17: break; // ARABIC SMALL HIGH ZAIN
-              case 0x18: break; // ARABIC SMALL FATHA
-              case 0x19: break; // ARABIC SMALL DAMMA
-              case 0x1a: break; // ARABIC SMALL KASRA
-
-              // Remove Arabic Quranic Annotations
-              case 0xd6: break; // ARABIC SMALL HIGH LIGATURE SAD WITH LAM WITH ALEF MAKSURA
-              case 0xd7: break; // ARABIC SMALL HIGH LIGATURE QAF WITH LAM WITH ALEF MAKSURA
-              case 0xd8: break; // ARABIC SMALL HIGH MEEM INITIAL FORM
-              case 0xd9: break; // ARABIC SMALL HIGH LAM ALEF
-              case 0xda: break; // ARABIC SMALL HIGH JEEM
-              case 0xdb: break; // ARABIC SMALL HIGH THREE DOTS
-              case 0xdc: break; // ARABIC SMALL HIGH SEEN
-              case 0xdd: break; // ARABIC END OF AYAH
-              case 0xde: break; // ARABIC START OF RUB EL HIZB
-              case 0xdf: break; // ARABIC SMALL HIGH ROUNDED ZERO
-              case 0xe0: break; // ARABIC SMALL HIGH UPRIGHT RECTANGULAR ZERO
-              case 0xe1: break; // ARABIC SMALL HIGH DOTLESS HEAD OF KHAH
-              case 0xe2: break; // ARABIC SMALL HIGH MEEM ISOLATED FORM
-              case 0xe3: break; // ARABIC SMALL LOW SEEN
-              case 0xe4: break; // ARABIC SMALL HIGH MADDA
-              case 0xe5: break; // ARABIC SMALL WAW
-              case 0xe6: break; // ARABIC SMALL YEH
-              case 0xe7: break; // ARABIC SMALL HIGH YEH
-              case 0xe8: break; // ARABIC SMALL HIGH NOON
-              case 0xe9: break; // ARABIC PLACE OF SAJDAH
-              case 0xea: break; // ARABIC EMPTY CENTRE LOW STOP
-              case 0xeb: break; // ARABIC EMPTY CENTRE HIGH STOP
-              case 0xec: break; // ARABIC ROUNDED HIGH STOP WITH FILLED CENTRE
-              case 0xed: break; // ARABIC SMALL LOW MEEM
-
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0x900:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x29: w(r,2037,1); break;
-              case 0x31: w(r,2038,1); break;
-              case 0x34: w(r,2039,1); break;
-              case 0x58: w(r,2040,1); break;
-              case 0x59: w(r,2041,1); break;
-              case 0x5a: w(r,2042,1); break;
-              case 0x5b: w(r,2004,1); break;
-              case 0x5c: w(r,2005,1); break;
-              case 0x5d: w(r,2006,1); break;
-              case 0x5e: w(r,2007,1); break;
-              case 0x5f: w(r,2008,1); break;
-              case 0xdc: w(r,2009,1); break;
-              case 0xdd: w(r,2010,1); break;
-              case 0xdf: w(r,2011,1); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0xa00:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x33: w(r,2012,1); break;
-              case 0x36: w(r,2013,1); break;
-              case 0x59: w(r,2014,1); break;
-              case 0x5a: w(r,2015,1); break;
-              case 0x5b: w(r,2016,1); break;
-              case 0x5e: w(r,2017,1); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0xb00:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x5c: w(r,2018,1); break;
-              case 0x5d: w(r,2019,1); break;
-              case 0x94: w(r,2020,1); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0xe00:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x33: w(r,2021,1); break;
-              case 0xb3: w(r,2022,1); break;
-              case 0xdc: w(r,1716,2); break;
-              case 0xdd: w(r,1718,2); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0xf00:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0xc: w(r,2023,1); break;
-              case 0x43: w(r,2024,1); break;
-              case 0x4d: w(r,2025,1); break;
-              case 0x52: w(r,2026,1); break;
-              case 0x57: w(r,2027,1); break;
-              case 0x5c: w(r,2028,1); break;
-              case 0x69: w(r,2029,1); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0x1000:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x26: w(r,1931,1); break;
-              case 0xfc: w(r,1932,1); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0x1b00:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x6: w(r,1933,1); break;
-              case 0x8: w(r,1934,1); break;
-              case 0xa: w(r,1935,1); break;
-              case 0xc: w(r,1936,1); break;
-              case 0xe: w(r,1937,1); break;
-              case 0x12: w(r,1938,1); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0x1d00:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x2c: w(r,491,1); break;
-              case 0x2d: w(r,1939,1); break;
-              case 0x2e: w(r,912,1); break;
-              case 0x30: w(r,517,1); break;
-              case 0x31: w(r,921,1); break;
-              case 0x32: w(r,1940,1); break;
-              case 0x33: w(r,404,1); break;
-              case 0x34: w(r,399,1); break;
-              case 0x35: w(r,163,1); break;
-              case 0x36: w(r,936,1); break;
-              case 0x37: w(r,939,1); break;
-              case 0x38: w(r,515,1); break;
-              case 0x39: w(r,401,1); break;
-              case 0x3a: w(r,1122,1); break;
-              case 0x3c: w(r,1125,1); break;
-              case 0x3d: w(r,1941,1); break;
-              case 0x3e: w(r,381,1); break;
-              case 0x3f: w(r,1134,1); break;
-              case 0x40: w(r,407,1); break;
-              case 0x41: w(r,1143,1); break;
-              case 0x42: w(r,1149,1); break;
-              case 0x43: w(r,40,1); break;
-              case 0x44: w(r,1919,1); break;
-              case 0x45: w(r,1920,1); break;
-              case 0x46: w(r,1921,1); break;
-              case 0x47: w(r,383,1); break;
-              case 0x48: w(r,41,1); break;
-              case 0x49: w(r,518,1); break;
-              case 0x4a: w(r,1922,1); break;
-              case 0x4b: w(r,1923,1); break;
-              case 0x4c: w(r,1924,1); break;
-              case 0x4d: w(r,361,1); break;
-              case 0x4f: w(r,330,1); break;
-              case 0x50: w(r,334,1); break;
-              case 0x51: w(r,1925,1); break;
-              case 0x52: w(r,480,1); break;
-              case 0x53: w(r,1926,1); break;
-              case 0x54: w(r,1927,1); break;
-              case 0x55: w(r,1928,1); break;
-              case 0x56: w(r,366,1); break;
-              case 0x57: w(r,1089,1); break;
-              case 0x58: w(r,967,1); break;
-              case 0x59: w(r,1929,1); break;
-              case 0x5a: w(r,1930,1); break;
-              case 0x5b: w(r,166,1); break;
-              case 0x5c: w(r,1967,1); break;
-              case 0x5d: w(r,1831,1); break;
-              case 0x5e: w(r,1845,1); break;
-              case 0x5f: w(r,1844,1); break;
-              case 0x60: w(r,1825,1); break;
-              case 0x61: w(r,1847,1); break;
-              case 0x62: w(r,167,1); break;
-              case 0x63: w(r,39,1); break;
-              case 0x64: w(r,967,1); break;
-              case 0x65: w(r,166,1); break;
-              case 0x66: w(r,1831,1); break;
-              case 0x67: w(r,1845,1); break;
-              case 0x68: w(r,1824,1); break;
-              case 0x69: w(r,1825,1); break;
-              case 0x6a: w(r,1847,1); break;
-              case 0x78: w(r,1968,1); break;
-              case 0x9b: w(r,1969,1); break;
-              case 0x9c: w(r,331,1); break;
-              case 0x9d: w(r,1970,1); break;
-              case 0x9e: w(r,1971,1); break;
-              case 0x9f: w(r,1924,1); break;
-              case 0xa0: w(r,593,1); break;
-              case 0xa1: w(r,1972,1); break;
-              case 0xa2: w(r,1973,1); break;
-              case 0xa3: w(r,1974,1); break;
-              case 0xa4: w(r,1942,1); break;
-              case 0xa5: w(r,1943,1); break;
-              case 0xa6: w(r,1944,1); break;
-              case 0xa7: w(r,1945,1); break;
-              case 0xa8: w(r,1946,1); break;
-              case 0xa9: w(r,1947,1); break;
-              case 0xaa: w(r,1948,1); break;
-              case 0xab: w(r,1949,1); break;
-              case 0xac: w(r,1950,1); break;
-              case 0xad: w(r,1951,1); break;
-              case 0xae: w(r,1952,1); break;
-              case 0xaf: w(r,1953,1); break;
-              case 0xb0: w(r,1954,1); break;
-              case 0xb1: w(r,1955,1); break;
-              case 0xb2: w(r,1956,1); break;
-              case 0xb3: w(r,1957,1); break;
-              case 0xb4: w(r,1958,1); break;
-              case 0xb5: w(r,1959,1); break;
-              case 0xb6: w(r,1960,1); break;
-              case 0xb7: w(r,1961,1); break;
-              case 0xb8: w(r,1962,1); break;
-              case 0xb9: w(r,1963,1); break;
-              case 0xba: w(r,1964,1); break;
-              case 0xbb: w(r,400,1); break;
-              case 0xbc: w(r,1965,1); break;
-              case 0xbd: w(r,1966,1); break;
-              case 0xbe: w(r,1918,1); break;
-              case 0xbf: w(r,1827,1); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0x1e00:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x0: w(r,491,1); break;
-              case 0x1: w(r,40,1); break;
-              case 0x2: w(r,912,1); break;
-              case 0x3: w(r,383,1); break;
-              case 0x4: w(r,912,1); break;
-              case 0x5: w(r,383,1); break;
-              case 0x6: w(r,912,1); break;
-              case 0x7: w(r,383,1); break;
-              case 0x8: w(r,358,1); break;
-              case 0x9: w(r,331,1); break;
-              case 0xa: w(r,517,1); break;
-              case 0xb: w(r,41,1); break;
-              case 0xc: w(r,517,1); break;
-              case 0xd: w(r,41,1); break;
-              case 0xe: w(r,517,1); break;
-              case 0xf: w(r,41,1); break;
-              case 0x10: w(r,517,1); break;
-              case 0x11: w(r,41,1); break;
-              case 0x12: w(r,517,1); break;
-              case 0x13: w(r,41,1); break;
-              case 0x14: w(r,921,1); break;
-              case 0x15: w(r,518,1); break;
-              case 0x16: w(r,921,1); break;
-              case 0x17: w(r,518,1); break;
-              case 0x18: w(r,921,1); break;
-              case 0x19: w(r,518,1); break;
-              case 0x1a: w(r,921,1); break;
-              case 0x1b: w(r,518,1); break;
-              case 0x1c: w(r,921,1); break;
-              case 0x1d: w(r,518,1); break;
-              case 0x1e: w(r,924,1); break;
-              case 0x1f: w(r,593,1); break;
-              case 0x20: w(r,404,1); break;
-              case 0x21: w(r,361,1); break;
-              case 0x22: w(r,399,1); break;
-              case 0x23: w(r,380,1); break;
-              case 0x24: w(r,399,1); break;
-              case 0x25: w(r,380,1); break;
-              case 0x26: w(r,399,1); break;
-              case 0x27: w(r,380,1); break;
-              case 0x28: w(r,399,1); break;
-              case 0x29: w(r,380,1); break;
-              case 0x2a: w(r,399,1); break;
-              case 0x2b: w(r,380,1); break;
-              case 0x2c: w(r,163,1); break;
-              case 0x2d: w(r,167,1); break;
-              case 0x2e: w(r,163,1); break;
-              case 0x2f: w(r,167,1); break;
-              case 0x30: w(r,939,1); break;
-              case 0x31: w(r,330,1); break;
-              case 0x32: w(r,939,1); break;
-              case 0x33: w(r,330,1); break;
-              case 0x34: w(r,939,1); break;
-              case 0x35: w(r,330,1); break;
-              case 0x36: w(r,515,1); break;
-              case 0x37: w(r,333,1); break;
-              case 0x38: w(r,515,1); break;
-              case 0x39: w(r,333,1); break;
-              case 0x3a: w(r,515,1); break;
-              case 0x3b: w(r,333,1); break;
-              case 0x3c: w(r,515,1); break;
-              case 0x3d: w(r,333,1); break;
-              case 0x3e: w(r,401,1); break;
-              case 0x3f: w(r,334,1); break;
-              case 0x40: w(r,401,1); break;
-              case 0x41: w(r,334,1); break;
-              case 0x42: w(r,401,1); break;
-              case 0x43: w(r,334,1); break;
-              case 0x44: w(r,1122,1); break;
-              case 0x45: w(r,1059,1); break;
-              case 0x46: w(r,1122,1); break;
-              case 0x47: w(r,1059,1); break;
-              case 0x48: w(r,1122,1); break;
-              case 0x49: w(r,1059,1); break;
-              case 0x4a: w(r,1122,1); break;
-              case 0x4b: w(r,1059,1); break;
-              case 0x4c: w(r,1125,1); break;
-              case 0x4d: w(r,480,1); break;
-              case 0x4e: w(r,1125,1); break;
-              case 0x4f: w(r,480,1); break;
-              case 0x50: w(r,1125,1); break;
-              case 0x51: w(r,480,1); break;
-              case 0x52: w(r,1125,1); break;
-              case 0x53: w(r,480,1); break;
-              case 0x54: w(r,381,1); break;
-              case 0x55: w(r,366,1); break;
-              case 0x56: w(r,381,1); break;
-              case 0x57: w(r,366,1); break;
-              case 0x58: w(r,1134,1); break;
-              case 0x59: w(r,39,1); break;
-              case 0x5a: w(r,1134,1); break;
-              case 0x5b: w(r,39,1); break;
-              case 0x5c: w(r,1134,1); break;
-              case 0x5d: w(r,39,1); break;
-              case 0x5e: w(r,1134,1); break;
-              case 0x5f: w(r,39,1); break;
-              case 0x60: w(r,1137,1); break;
-              case 0x61: w(r,43,1); break;
-              case 0x62: w(r,1137,1); break;
-              case 0x63: w(r,43,1); break;
-              case 0x64: w(r,1137,1); break;
-              case 0x65: w(r,43,1); break;
-              case 0x66: w(r,1137,1); break;
-              case 0x67: w(r,43,1); break;
-              case 0x68: w(r,1137,1); break;
-              case 0x69: w(r,43,1); break;
-              case 0x6a: w(r,407,1); break;
-              case 0x6b: w(r,1089,1); break;
-              case 0x6c: w(r,407,1); break;
-              case 0x6d: w(r,1089,1); break;
-              case 0x6e: w(r,407,1); break;
-              case 0x6f: w(r,1089,1); break;
-              case 0x70: w(r,407,1); break;
-              case 0x71: w(r,1089,1); break;
-              case 0x72: w(r,1143,1); break;
-              case 0x73: w(r,967,1); break;
-              case 0x74: w(r,1143,1); break;
-              case 0x75: w(r,967,1); break;
-              case 0x76: w(r,1143,1); break;
-              case 0x77: w(r,967,1); break;
-              case 0x78: w(r,1143,1); break;
-              case 0x79: w(r,967,1); break;
-              case 0x7a: w(r,1143,1); break;
-              case 0x7b: w(r,967,1); break;
-              case 0x7c: w(r,162,1); break;
-              case 0x7d: w(r,166,1); break;
-              case 0x7e: w(r,162,1); break;
-              case 0x7f: w(r,166,1); break;
-              case 0x80: w(r,1149,1); break;
-              case 0x81: w(r,1098,1); break;
-              case 0x82: w(r,1149,1); break;
-              case 0x83: w(r,1098,1); break;
-              case 0x84: w(r,1149,1); break;
-              case 0x85: w(r,1098,1); break;
-              case 0x86: w(r,1149,1); break;
-              case 0x87: w(r,1098,1); break;
-              case 0x88: w(r,1149,1); break;
-              case 0x89: w(r,1098,1); break;
-              case 0x8a: w(r,869,1); break;
-              case 0x8b: w(r,872,1); break;
-              case 0x8c: w(r,869,1); break;
-              case 0x8d: w(r,872,1); break;
-              case 0x8e: w(r,1155,1); break;
-              case 0x8f: w(r,1104,1); break;
-              case 0x90: w(r,1158,1); break;
-              case 0x91: w(r,400,1); break;
-              case 0x92: w(r,1158,1); break;
-              case 0x93: w(r,400,1); break;
-              case 0x94: w(r,1158,1); break;
-              case 0x95: w(r,400,1); break;
-              case 0x96: w(r,380,1); break;
-              case 0x97: w(r,1089,1); break;
-              case 0x98: w(r,1098,1); break;
-              case 0x99: w(r,1104,1); break;
-              case 0x9a: w(r,1256,2); break;
-              case 0x9b: w(r,43,1); break;
-              case 0xa0: w(r,491,1); break;
-              case 0xa1: w(r,40,1); break;
-              case 0xa2: w(r,491,1); break;
-              case 0xa3: w(r,40,1); break;
-              case 0xa4: w(r,491,1); break;
-              case 0xa5: w(r,40,1); break;
-              case 0xa6: w(r,491,1); break;
-              case 0xa7: w(r,40,1); break;
-              case 0xa8: w(r,491,1); break;
-              case 0xa9: w(r,40,1); break;
-              case 0xaa: w(r,491,1); break;
-              case 0xab: w(r,40,1); break;
-              case 0xac: w(r,491,1); break;
-              case 0xad: w(r,40,1); break;
-              case 0xae: w(r,491,1); break;
-              case 0xaf: w(r,40,1); break;
-              case 0xb0: w(r,491,1); break;
-              case 0xb1: w(r,40,1); break;
-              case 0xb2: w(r,491,1); break;
-              case 0xb3: w(r,40,1); break;
-              case 0xb4: w(r,491,1); break;
-              case 0xb5: w(r,40,1); break;
-              case 0xb6: w(r,491,1); break;
-              case 0xb7: w(r,40,1); break;
-              case 0xb8: w(r,921,1); break;
-              case 0xb9: w(r,518,1); break;
-              case 0xba: w(r,921,1); break;
-              case 0xbb: w(r,518,1); break;
-              case 0xbc: w(r,921,1); break;
-              case 0xbd: w(r,518,1); break;
-              case 0xbe: w(r,921,1); break;
-              case 0xbf: w(r,518,1); break;
-              case 0xc0: w(r,921,1); break;
-              case 0xc1: w(r,518,1); break;
-              case 0xc2: w(r,921,1); break;
-              case 0xc3: w(r,518,1); break;
-              case 0xc4: w(r,921,1); break;
-              case 0xc5: w(r,518,1); break;
-              case 0xc6: w(r,921,1); break;
-              case 0xc7: w(r,518,1); break;
-              case 0xc8: w(r,163,1); break;
-              case 0xc9: w(r,167,1); break;
-              case 0xca: w(r,163,1); break;
-              case 0xcb: w(r,167,1); break;
-              case 0xcc: w(r,1125,1); break;
-              case 0xcd: w(r,480,1); break;
-              case 0xce: w(r,1125,1); break;
-              case 0xcf: w(r,480,1); break;
-              case 0xd0: w(r,1125,1); break;
-              case 0xd1: w(r,480,1); break;
-              case 0xd2: w(r,1125,1); break;
-              case 0xd3: w(r,480,1); break;
-              case 0xd4: w(r,1125,1); break;
-              case 0xd5: w(r,480,1); break;
-              case 0xd6: w(r,1125,1); break;
-              case 0xd7: w(r,480,1); break;
-              case 0xd8: w(r,1125,1); break;
-              case 0xd9: w(r,480,1); break;
-              case 0xda: w(r,1125,1); break;
-              case 0xdb: w(r,480,1); break;
-              case 0xdc: w(r,1125,1); break;
-              case 0xdd: w(r,480,1); break;
-              case 0xde: w(r,1125,1); break;
-              case 0xdf: w(r,480,1); break;
-              case 0xe0: w(r,1125,1); break;
-              case 0xe1: w(r,480,1); break;
-              case 0xe2: w(r,1125,1); break;
-              case 0xe3: w(r,480,1); break;
-              case 0xe4: w(r,1143,1); break;
-              case 0xe5: w(r,967,1); break;
-              case 0xe6: w(r,1143,1); break;
-              case 0xe7: w(r,967,1); break;
-              case 0xe8: w(r,1143,1); break;
-              case 0xe9: w(r,967,1); break;
-              case 0xea: w(r,1143,1); break;
-              case 0xeb: w(r,967,1); break;
-              case 0xec: w(r,1143,1); break;
-              case 0xed: w(r,967,1); break;
-              case 0xee: w(r,1143,1); break;
-              case 0xef: w(r,967,1); break;
-              case 0xf0: w(r,1143,1); break;
-              case 0xf1: w(r,967,1); break;
-              case 0xf2: w(r,1155,1); break;
-              case 0xf3: w(r,1104,1); break;
-              case 0xf4: w(r,1155,1); break;
-              case 0xf5: w(r,1104,1); break;
-              case 0xf6: w(r,1155,1); break;
-              case 0xf7: w(r,1104,1); break;
-              case 0xf8: w(r,1155,1); break;
-              case 0xf9: w(r,1104,1); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0x1f00:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x0: w(r,1832,1); break;
-              case 0x1: w(r,1832,1); break;
-              case 0x2: w(r,1832,1); break;
-              case 0x3: w(r,1832,1); break;
-              case 0x4: w(r,1832,1); break;
-              case 0x5: w(r,1832,1); break;
-              case 0x6: w(r,1832,1); break;
-              case 0x7: w(r,1832,1); break;
-              case 0x8: w(r,1820,1); break;
-              case 0x9: w(r,1820,1); break;
-              case 0xa: w(r,1820,1); break;
-              case 0xb: w(r,1820,1); break;
-              case 0xc: w(r,1820,1); break;
-              case 0xd: w(r,1820,1); break;
-              case 0xe: w(r,1820,1); break;
-              case 0xf: w(r,1820,1); break;
-              case 0x10: w(r,1828,1); break;
-              case 0x11: w(r,1828,1); break;
-              case 0x12: w(r,1828,1); break;
-              case 0x13: w(r,1828,1); break;
-              case 0x14: w(r,1828,1); break;
-              case 0x15: w(r,1828,1); break;
-              case 0x18: w(r,1816,1); break;
-              case 0x19: w(r,1816,1); break;
-              case 0x1a: w(r,1816,1); break;
-              case 0x1b: w(r,1816,1); break;
-              case 0x1c: w(r,1816,1); break;
-              case 0x1d: w(r,1816,1); break;
-              case 0x20: w(r,1857,1); break;
-              case 0x21: w(r,1857,1); break;
-              case 0x22: w(r,1857,1); break;
-              case 0x23: w(r,1857,1); break;
-              case 0x24: w(r,1857,1); break;
-              case 0x25: w(r,1857,1); break;
-              case 0x26: w(r,1857,1); break;
-              case 0x27: w(r,1857,1); break;
-              case 0x28: w(r,1814,1); break;
-              case 0x29: w(r,1814,1); break;
-              case 0x2a: w(r,1814,1); break;
-              case 0x2b: w(r,1814,1); break;
-              case 0x2c: w(r,1814,1); break;
-              case 0x2d: w(r,1814,1); break;
-              case 0x2e: w(r,1814,1); break;
-              case 0x2f: w(r,1814,1); break;
-              case 0x30: w(r,1856,1); break;
-              case 0x31: w(r,1856,1); break;
-              case 0x32: w(r,1856,1); break;
-              case 0x33: w(r,1856,1); break;
-              case 0x34: w(r,1856,1); break;
-              case 0x35: w(r,1856,1); break;
-              case 0x36: w(r,1856,1); break;
-              case 0x37: w(r,1856,1); break;
-              case 0x38: w(r,1812,1); break;
-              case 0x39: w(r,1812,1); break;
-              case 0x3a: w(r,1812,1); break;
-              case 0x3b: w(r,1812,1); break;
-              case 0x3c: w(r,1812,1); break;
-              case 0x3d: w(r,1812,1); break;
-              case 0x3e: w(r,1812,1); break;
-              case 0x3f: w(r,1812,1); break;
-              case 0x40: w(r,1852,1); break;
-              case 0x41: w(r,1852,1); break;
-              case 0x42: w(r,1852,1); break;
-              case 0x43: w(r,1852,1); break;
-              case 0x44: w(r,1852,1); break;
-              case 0x45: w(r,1852,1); break;
-              case 0x48: w(r,1842,1); break;
-              case 0x49: w(r,1842,1); break;
-              case 0x4a: w(r,1842,1); break;
-              case 0x4b: w(r,1842,1); break;
-              case 0x4c: w(r,1842,1); break;
-              case 0x4d: w(r,1842,1); break;
-              case 0x50: w(r,1848,1); break;
-              case 0x51: w(r,1848,1); break;
-              case 0x52: w(r,1848,1); break;
-              case 0x53: w(r,1848,1); break;
-              case 0x54: w(r,1848,1); break;
-              case 0x55: w(r,1848,1); break;
-              case 0x56: w(r,1848,1); break;
-              case 0x57: w(r,1848,1); break;
-              case 0x59: w(r,1837,1); break;
-              case 0x5b: w(r,1837,1); break;
-              case 0x5d: w(r,1837,1); break;
-              case 0x5f: w(r,1837,1); break;
-              case 0x60: w(r,1830,1); break;
-              case 0x61: w(r,1830,1); break;
-              case 0x62: w(r,1830,1); break;
-              case 0x63: w(r,1830,1); break;
-              case 0x64: w(r,1830,1); break;
-              case 0x65: w(r,1830,1); break;
-              case 0x66: w(r,1830,1); break;
-              case 0x67: w(r,1830,1); break;
-              case 0x68: w(r,1333,1); break;
-              case 0x69: w(r,1333,1); break;
-              case 0x6a: w(r,1333,1); break;
-              case 0x6b: w(r,1333,1); break;
-              case 0x6c: w(r,1333,1); break;
-              case 0x6d: w(r,1333,1); break;
-              case 0x6e: w(r,1333,1); break;
-              case 0x6f: w(r,1333,1); break;
-              case 0x70: w(r,1832,1); break;
-              case 0x71: w(r,1832,1); break;
-              case 0x72: w(r,1828,1); break;
-              case 0x73: w(r,1828,1); break;
-              case 0x74: w(r,1857,1); break;
-              case 0x75: w(r,1857,1); break;
-              case 0x76: w(r,1856,1); break;
-              case 0x77: w(r,1856,1); break;
-              case 0x78: w(r,1852,1); break;
-              case 0x79: w(r,1852,1); break;
-              case 0x7a: w(r,1848,1); break;
-              case 0x7b: w(r,1848,1); break;
-              case 0x7c: w(r,1830,1); break;
-              case 0x7d: w(r,1830,1); break;
-              case 0x80: w(r,1832,1); break;
-              case 0x81: w(r,1832,1); break;
-              case 0x82: w(r,1832,1); break;
-              case 0x83: w(r,1832,1); break;
-              case 0x84: w(r,1832,1); break;
-              case 0x85: w(r,1832,1); break;
-              case 0x86: w(r,1832,1); break;
-              case 0x87: w(r,1832,1); break;
-              case 0x88: w(r,1820,1); break;
-              case 0x89: w(r,1820,1); break;
-              case 0x8a: w(r,1820,1); break;
-              case 0x8b: w(r,1820,1); break;
-              case 0x8c: w(r,1820,1); break;
-              case 0x8d: w(r,1820,1); break;
-              case 0x8e: w(r,1820,1); break;
-              case 0x8f: w(r,1820,1); break;
-              case 0x90: w(r,1857,1); break;
-              case 0x91: w(r,1857,1); break;
-              case 0x92: w(r,1857,1); break;
-              case 0x93: w(r,1857,1); break;
-              case 0x94: w(r,1857,1); break;
-              case 0x95: w(r,1857,1); break;
-              case 0x96: w(r,1857,1); break;
-              case 0x97: w(r,1857,1); break;
-              case 0x98: w(r,1814,1); break;
-              case 0x99: w(r,1814,1); break;
-              case 0x9a: w(r,1814,1); break;
-              case 0x9b: w(r,1814,1); break;
-              case 0x9c: w(r,1814,1); break;
-              case 0x9d: w(r,1814,1); break;
-              case 0x9e: w(r,1814,1); break;
-              case 0x9f: w(r,1814,1); break;
-              case 0xa0: w(r,1830,1); break;
-              case 0xa1: w(r,1830,1); break;
-              case 0xa2: w(r,1830,1); break;
-              case 0xa3: w(r,1830,1); break;
-              case 0xa4: w(r,1830,1); break;
-              case 0xa5: w(r,1830,1); break;
-              case 0xa6: w(r,1830,1); break;
-              case 0xa7: w(r,1830,1); break;
-              case 0xa8: w(r,1333,1); break;
-              case 0xa9: w(r,1333,1); break;
-              case 0xaa: w(r,1333,1); break;
-              case 0xab: w(r,1333,1); break;
-              case 0xac: w(r,1333,1); break;
-              case 0xad: w(r,1333,1); break;
-              case 0xae: w(r,1333,1); break;
-              case 0xaf: w(r,1333,1); break;
-              case 0xb0: w(r,1832,1); break;
-              case 0xb1: w(r,1832,1); break;
-              case 0xb2: w(r,1832,1); break;
-              case 0xb3: w(r,1832,1); break;
-              case 0xb4: w(r,1832,1); break;
-              case 0xb6: w(r,1832,1); break;
-              case 0xb7: w(r,1832,1); break;
-              case 0xb8: w(r,1820,1); break;
-              case 0xb9: w(r,1820,1); break;
-              case 0xba: w(r,1820,1); break;
-              case 0xbb: w(r,1820,1); break;
-              case 0xbc: w(r,1820,1); break;
-              case 0xbd: w(r,3,1); break;
-              case 0xbe: w(r,1856,1); break;
-              case 0xbf: w(r,3,1); break;
-              case 0xc0: w(r,3,1); break;
-              case 0xc1: w(r,3,1); break;
-              case 0xc2: w(r,1857,1); break;
-              case 0xc3: w(r,1857,1); break;
-              case 0xc4: w(r,1857,1); break;
-              case 0xc6: w(r,1857,1); break;
-              case 0xc7: w(r,1857,1); break;
-              case 0xc8: w(r,1816,1); break;
-              case 0xc9: w(r,1816,1); break;
-              case 0xca: w(r,1814,1); break;
-              case 0xcb: w(r,1814,1); break;
-              case 0xcc: w(r,1814,1); break;
-              case 0xcd: w(r,3,1); break;
-              case 0xce: w(r,3,1); break;
-              case 0xcf: w(r,3,1); break;
-              case 0xd0: w(r,1856,1); break;
-              case 0xd1: w(r,1856,1); break;
-              case 0xd2: w(r,1856,1); break;
-              case 0xd3: w(r,1856,1); break;
-              case 0xd6: w(r,1856,1); break;
-              case 0xd7: w(r,1856,1); break;
-              case 0xd8: w(r,1812,1); break;
-              case 0xd9: w(r,1812,1); break;
-              case 0xda: w(r,1812,1); break;
-              case 0xdb: w(r,1812,1); break;
-              case 0xdd: w(r,3,1); break;
-              case 0xde: w(r,3,1); break;
-              case 0xdf: w(r,3,1); break;
-              case 0xe0: w(r,1848,1); break;
-              case 0xe1: w(r,1848,1); break;
-              case 0xe2: w(r,1848,1); break;
-              case 0xe3: w(r,1848,1); break;
-              case 0xe4: w(r,1824,1); break;
-              case 0xe5: w(r,1824,1); break;
-              case 0xe6: w(r,1848,1); break;
-              case 0xe7: w(r,1848,1); break;
-              case 0xe8: w(r,1837,1); break;
-              case 0xe9: w(r,1837,1); break;
-              case 0xea: w(r,1837,1); break;
-              case 0xeb: w(r,1837,1); break;
-              case 0xec: w(r,1840,1); break;
-              case 0xed: w(r,3,1); break;
-              case 0xee: w(r,3,1); break;
-              case 0xef: w(r,1761,1); break;
-              case 0xf2: w(r,1830,1); break;
-              case 0xf3: w(r,1830,1); break;
-              case 0xf4: w(r,1830,1); break;
-              case 0xf6: w(r,1830,1); break;
-              case 0xf7: w(r,1830,1); break;
-              case 0xf8: w(r,1842,1); break;
-              case 0xf9: w(r,1842,1); break;
-              case 0xfa: w(r,1333,1); break;
-              case 0xfb: w(r,1333,1); break;
-              case 0xfc: w(r,1333,1); break;
-              case 0xfd: w(r,3,1); break;
-              case 0xfe: w(r,3,1); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0x2000:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x0: w(r,3,1); break;
-              case 0x1: w(r,3,1); break;
-              case 0x2: w(r,3,1); break;
-              case 0x3: w(r,3,1); break;
-              case 0x4: w(r,3,1); break;
-              case 0x5: w(r,3,1); break;
-              case 0x6: w(r,3,1); break;
-              case 0x7: w(r,3,1); break;
-              case 0x8: w(r,3,1); break;
-              case 0x9: w(r,3,1); break;
-              case 0xa: w(r,3,1); break;
-              case 0x11: w(r,2192,1); break;
-              case 0x17: w(r,3,1); break;
-              case 0x24: w(r,347,1); break;
-              case 0x25: w(r,389,2); break;
-              case 0x26: w(r,389,3); break;
-              case 0x2f: w(r,3,1); break;
-              case 0x33: w(r,130,2); break;
-              case 0x34: w(r,130,3); break;
-              case 0x36: w(r,1232,2); break;
-              case 0x37: w(r,1232,3); break;
-              case 0x3c: w(r,1427,2); break;
-              case 0x3e: w(r,3,1); break;
-              case 0x47: w(r,1425,2); break;
-              case 0x48: w(r,1426,2); break;
-              case 0x49: w(r,1424,2); break;
-              case 0x57: w(r,130,4); break;
-              case 0x5f: w(r,3,1); break;
-              case 0x70: w(r,161,1); break;
-              case 0x71: w(r,167,1); break;
-              case 0x74: w(r,188,1); break;
-              case 0x75: w(r,192,1); break;
-              case 0x76: w(r,196,1); break;
-              case 0x77: w(r,200,1); break;
-              case 0x78: w(r,204,1); break;
-              case 0x79: w(r,208,1); break;
-              case 0x7a: w(r,1773,1); break;
-              case 0x7b: w(r,2191,1); break;
-              case 0x7c: w(r,1109,1); break;
-              case 0x7d: w(r,26,1); break;
-              case 0x7e: w(r,32,1); break;
-              case 0x7f: w(r,1059,1); break;
-              case 0x80: w(r,161,1); break;
-              case 0x81: w(r,158,1); break;
-              case 0x82: w(r,44,1); break;
-              case 0x83: w(r,184,1); break;
-              case 0x84: w(r,188,1); break;
-              case 0x85: w(r,192,1); break;
-              case 0x86: w(r,196,1); break;
-              case 0x87: w(r,200,1); break;
-              case 0x88: w(r,204,1); break;
-              case 0x89: w(r,208,1); break;
-              case 0x8a: w(r,1773,1); break;
-              case 0x8b: w(r,2191,1); break;
-              case 0x8c: w(r,1109,1); break;
-              case 0x8d: w(r,26,1); break;
-              case 0x8e: w(r,32,1); break;
-              case 0x90: w(r,40,1); break;
-              case 0x91: w(r,518,1); break;
-              case 0x92: w(r,480,1); break;
-              case 0x93: w(r,872,1); break;
-              case 0x94: w(r,1922,1); break;
-              case 0x95: w(r,380,1); break;
-              case 0x96: w(r,330,1); break;
-              case 0x97: w(r,333,1); break;
-              case 0x98: w(r,334,1); break;
-              case 0x99: w(r,1059,1); break;
-              case 0x9a: w(r,366,1); break;
-              case 0x9b: w(r,43,1); break;
-              case 0x9c: w(r,1089,1); break;
-              case 0xa8: w(r,1430,2); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0x2100:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x0: w(r,956,3); break;
-              case 0x1: w(r,959,3); break;
-              case 0x2: w(r,358,1); break;
-              case 0x3: w(r,1432,2); break;
-              case 0x5: w(r,962,3); break;
-              case 0x6: w(r,965,3); break;
-              case 0x7: w(r,2229,1); break;
-              case 0x9: w(r,1434,2); break;
-              case 0xa: w(r,361,1); break;
-              case 0xb: w(r,399,1); break;
-              case 0xc: w(r,399,1); break;
-              case 0xd: w(r,399,1); break;
-              case 0xe: w(r,380,1); break;
-              case 0xf: w(r,2228,1); break;
-              case 0x10: w(r,163,1); break;
-              case 0x11: w(r,163,1); break;
-              case 0x12: w(r,515,1); break;
-              case 0x13: w(r,333,1); break;
-              case 0x15: w(r,1122,1); break;
-              case 0x16: w(r,1438,2); break;
-              case 0x19: w(r,381,1); break;
-              case 0x1a: w(r,1131,1); break;
-              case 0x1b: w(r,1134,1); break;
-              case 0x1c: w(r,1134,1); break;
-              case 0x1d: w(r,1134,1); break;
-              case 0x20: w(r,1442,2); break;
-              case 0x21: w(r,968,3); break;
-              case 0x22: w(r,1444,2); break;
-              case 0x24: w(r,1158,1); break;
-              case 0x26: w(r,1333,1); break;
-              case 0x28: w(r,1158,1); break;
-              case 0x2a: w(r,939,1); break;
-              case 0x2b: w(r,491,1); break;
-              case 0x2c: w(r,912,1); break;
-              case 0x2d: w(r,358,1); break;
-              case 0x2f: w(r,518,1); break;
-              case 0x30: w(r,921,1); break;
-              case 0x31: w(r,924,1); break;
-              case 0x33: w(r,401,1); break;
-              case 0x34: w(r,480,1); break;
-              case 0x35: w(r,1722,1); break;
-              case 0x36: w(r,2159,1); break;
-              case 0x37: w(r,2160,1); break;
-              case 0x38: w(r,2151,1); break;
-              case 0x39: w(r,167,1); break;
-              case 0x3b: w(r,974,3); break;
-              case 0x3c: w(r,1823,1); break;
-              case 0x3d: w(r,1845,1); break;
-              case 0x3e: w(r,1818,1); break;
-              case 0x3f: w(r,1841,1); break;
-              case 0x40: w(r,2250,1); break;
-              case 0x45: w(r,517,1); break;
-              case 0x46: w(r,41,1); break;
-              case 0x47: w(r,518,1); break;
-              case 0x48: w(r,167,1); break;
-              case 0x49: w(r,1047,1); break;
-              case 0x50: w(r,977,3); break;
-              case 0x51: w(r,980,3); break;
-              case 0x52: w(r,158,4); break;
-              case 0x53: w(r,983,3); break;
-              case 0x54: w(r,986,3); break;
-              case 0x55: w(r,989,3); break;
-              case 0x56: w(r,992,3); break;
-              case 0x57: w(r,995,3); break;
-              case 0x58: w(r,998,3); break;
-              case 0x59: w(r,1001,3); break;
-              case 0x5a: w(r,1004,3); break;
-              case 0x5b: w(r,1007,3); break;
-              case 0x5c: w(r,1010,3); break;
-              case 0x5d: w(r,1013,3); break;
-              case 0x5e: w(r,1016,3); break;
-              case 0x5f: w(r,158,2); break;
-              case 0x60: w(r,163,1); break;
-              case 0x61: w(r,163,2); break;
-              case 0x62: w(r,163,3); break;
-              case 0x63: w(r,1416,2); break;
-              case 0x64: w(r,162,1); break;
-              case 0x65: w(r,162,2); break;
-              case 0x66: w(r,162,3); break;
-              case 0x67: w(r,162,4); break;
-              case 0x68: w(r,1418,2); break;
-              case 0x69: w(r,869,1); break;
-              case 0x6a: w(r,869,2); break;
-              case 0x6b: w(r,869,3); break;
-              case 0x6c: w(r,515,1); break;
-              case 0x6d: w(r,358,1); break;
-              case 0x6e: w(r,517,1); break;
-              case 0x6f: w(r,401,1); break;
-              case 0x70: w(r,167,1); break;
-              case 0x71: w(r,167,2); break;
-              case 0x72: w(r,167,3); break;
-              case 0x73: w(r,1422,2); break;
-              case 0x74: w(r,166,1); break;
-              case 0x75: w(r,166,2); break;
-              case 0x76: w(r,166,3); break;
-              case 0x77: w(r,166,4); break;
-              case 0x78: w(r,1454,2); break;
-              case 0x79: w(r,872,1); break;
-              case 0x7a: w(r,872,2); break;
-              case 0x7b: w(r,872,3); break;
-              case 0x7c: w(r,333,1); break;
-              case 0x7d: w(r,331,1); break;
-              case 0x7e: w(r,41,1); break;
-              case 0x7f: w(r,334,1); break;
-              case 0x89: w(r,875,3); break;
-              case 0x9a: w(r,1909,1); break;
-              case 0x9b: w(r,1907,1); break;
-              case 0xae: w(r,2230,1); break;
-              case 0xcd: w(r,2231,1); break;
-              case 0xce: w(r,2232,1); break;
-              case 0xcf: w(r,2233,1); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0x2200:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x4: w(r,2234,1); break;
-              case 0x9: w(r,2235,1); break;
-              case 0xc: w(r,2236,1); break;
-              case 0x24: w(r,2237,1); break;
-              case 0x26: w(r,2238,1); break;
-              case 0x2c: w(r,370,2); break;
-              case 0x2d: w(r,370,3); break;
-              case 0x2f: w(r,878,2); break;
-              case 0x30: w(r,878,3); break;
-              case 0x41: w(r,2239,1); break;
-              case 0x44: w(r,2240,1); break;
-              case 0x47: w(r,2241,1); break;
-              case 0x49: w(r,2242,1); break;
-              case 0x60: w(r,1109,1); break;
-              case 0x62: w(r,2243,1); break;
-              case 0x6d: w(r,2244,1); break;
-              case 0x6e: w(r,1775,1); break;
-              case 0x6f: w(r,1776,1); break;
-              case 0x70: w(r,2245,1); break;
-              case 0x71: w(r,2246,1); break;
-              case 0x74: w(r,2247,1); break;
-              case 0x75: w(r,2248,1); break;
-              case 0x78: w(r,2249,1); break;
-              case 0x79: w(r,2193,1); break;
-              case 0x80: w(r,2194,1); break;
-              case 0x81: w(r,2195,1); break;
-              case 0x84: w(r,2196,1); break;
-              case 0x85: w(r,2197,1); break;
-              case 0x88: w(r,2198,1); break;
-              case 0x89: w(r,2199,1); break;
-              case 0xac: w(r,2200,1); break;
-              case 0xad: w(r,2201,1); break;
-              case 0xae: w(r,2202,1); break;
-              case 0xaf: w(r,2203,1); break;
-              case 0xe0: w(r,2204,1); break;
-              case 0xe1: w(r,2205,1); break;
-              case 0xe2: w(r,2206,1); break;
-              case 0xe3: w(r,2207,1); break;
-              case 0xea: w(r,2208,1); break;
-              case 0xeb: w(r,2209,1); break;
-              case 0xec: w(r,2210,1); break;
-              case 0xed: w(r,2211,1); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0x2300:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x29: w(r,1784,1); break;
-              case 0x2a: w(r,1783,1); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0x2400:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x60: w(r,158,1); break;
-              case 0x61: w(r,44,1); break;
-              case 0x62: w(r,184,1); break;
-              case 0x63: w(r,188,1); break;
-              case 0x64: w(r,192,1); break;
-              case 0x65: w(r,196,1); break;
-              case 0x66: w(r,200,1); break;
-              case 0x67: w(r,204,1); break;
-              case 0x68: w(r,208,1); break;
-              case 0x69: w(r,160,2); break;
-              case 0x6a: w(r,175,2); break;
-              case 0x6b: w(r,179,2); break;
-              case 0x6c: w(r,183,2); break;
-              case 0x6d: w(r,187,2); break;
-              case 0x6e: w(r,191,2); break;
-              case 0x6f: w(r,195,2); break;
-              case 0x70: w(r,199,2); break;
-              case 0x71: w(r,203,2); break;
-              case 0x72: w(r,207,2); break;
-              case 0x73: w(r,211,2); break;
-              case 0x74: w(r,881,3); break;
-              case 0x75: w(r,884,3); break;
-              case 0x76: w(r,887,3); break;
-              case 0x77: w(r,890,3); break;
-              case 0x78: w(r,893,3); break;
-              case 0x79: w(r,896,3); break;
-              case 0x7a: w(r,899,3); break;
-              case 0x7b: w(r,902,3); break;
-              case 0x7c: w(r,905,3); break;
-              case 0x7d: w(r,170,4); break;
-              case 0x7e: w(r,174,4); break;
-              case 0x7f: w(r,178,4); break;
-              case 0x80: w(r,182,4); break;
-              case 0x81: w(r,186,4); break;
-              case 0x82: w(r,190,4); break;
-              case 0x83: w(r,194,4); break;
-              case 0x84: w(r,198,4); break;
-              case 0x85: w(r,202,4); break;
-              case 0x86: w(r,206,4); break;
-              case 0x87: w(r,210,4); break;
-              case 0x88: w(r,1167,2); break;
-              case 0x89: w(r,388,2); break;
-              case 0x8a: w(r,1173,2); break;
-              case 0x8b: w(r,1176,2); break;
-              case 0x8c: w(r,1179,2); break;
-              case 0x8d: w(r,1182,2); break;
-              case 0x8e: w(r,1185,2); break;
-              case 0x8f: w(r,1188,2); break;
-              case 0x90: w(r,1191,2); break;
-              case 0x91: w(r,1163,3); break;
-              case 0x92: w(r,1166,3); break;
-              case 0x93: w(r,1169,3); break;
-              case 0x94: w(r,1172,3); break;
-              case 0x95: w(r,1175,3); break;
-              case 0x96: w(r,1178,3); break;
-              case 0x97: w(r,1181,3); break;
-              case 0x98: w(r,1184,3); break;
-              case 0x99: w(r,1187,3); break;
-              case 0x9a: w(r,1190,3); break;
-              case 0x9b: w(r,1193,3); break;
-              case 0x9c: w(r,1196,3); break;
-              case 0x9d: w(r,1199,3); break;
-              case 0x9e: w(r,1202,3); break;
-              case 0x9f: w(r,1028,3); break;
-              case 0xa0: w(r,1031,3); break;
-              case 0xa1: w(r,1034,3); break;
-              case 0xa2: w(r,1037,3); break;
-              case 0xa3: w(r,1040,3); break;
-              case 0xa4: w(r,1043,3); break;
-              case 0xa5: w(r,1046,3); break;
-              case 0xa6: w(r,1049,3); break;
-              case 0xa7: w(r,1052,3); break;
-              case 0xa8: w(r,1055,3); break;
-              case 0xa9: w(r,1058,3); break;
-              case 0xaa: w(r,1064,3); break;
-              case 0xab: w(r,1067,3); break;
-              case 0xac: w(r,1070,3); break;
-              case 0xad: w(r,1073,3); break;
-              case 0xae: w(r,1076,3); break;
-              case 0xaf: w(r,1088,3); break;
-              case 0xb0: w(r,1091,3); break;
-              case 0xb1: w(r,1094,3); break;
-              case 0xb2: w(r,1097,3); break;
-              case 0xb3: w(r,1100,3); break;
-              case 0xb4: w(r,1103,3); break;
-              case 0xb5: w(r,1106,3); break;
-              case 0xb6: w(r,491,1); break;
-              case 0xb7: w(r,912,1); break;
-              case 0xb8: w(r,358,1); break;
-              case 0xb9: w(r,517,1); break;
-              case 0xba: w(r,921,1); break;
-              case 0xbb: w(r,924,1); break;
-              case 0xbc: w(r,404,1); break;
-              case 0xbd: w(r,399,1); break;
-              case 0xbe: w(r,163,1); break;
-              case 0xbf: w(r,936,1); break;
-              case 0xc0: w(r,939,1); break;
-              case 0xc1: w(r,515,1); break;
-              case 0xc2: w(r,401,1); break;
-              case 0xc3: w(r,1122,1); break;
-              case 0xc4: w(r,1125,1); break;
-              case 0xc5: w(r,381,1); break;
-              case 0xc6: w(r,1131,1); break;
-              case 0xc7: w(r,1134,1); break;
-              case 0xc8: w(r,1137,1); break;
-              case 0xc9: w(r,407,1); break;
-              case 0xca: w(r,1143,1); break;
-              case 0xcb: w(r,162,1); break;
-              case 0xcc: w(r,1149,1); break;
-              case 0xcd: w(r,869,1); break;
-              case 0xce: w(r,1155,1); break;
-              case 0xcf: w(r,1158,1); break;
-              case 0xd0: w(r,40,1); break;
-              case 0xd1: w(r,383,1); break;
-              case 0xd2: w(r,331,1); break;
-              case 0xd3: w(r,41,1); break;
-              case 0xd4: w(r,518,1); break;
-              case 0xd5: w(r,593,1); break;
-              case 0xd6: w(r,361,1); break;
-              case 0xd7: w(r,380,1); break;
-              case 0xd8: w(r,167,1); break;
-              case 0xd9: w(r,1047,1); break;
-              case 0xda: w(r,330,1); break;
-              case 0xdb: w(r,333,1); break;
-              case 0xdc: w(r,334,1); break;
-              case 0xdd: w(r,1059,1); break;
-              case 0xde: w(r,480,1); break;
-              case 0xdf: w(r,366,1); break;
-              case 0xe0: w(r,1071,1); break;
-              case 0xe1: w(r,39,1); break;
-              case 0xe2: w(r,43,1); break;
-              case 0xe3: w(r,1089,1); break;
-              case 0xe4: w(r,967,1); break;
-              case 0xe5: w(r,166,1); break;
-              case 0xe6: w(r,1098,1); break;
-              case 0xe7: w(r,872,1); break;
-              case 0xe8: w(r,1104,1); break;
-              case 0xe9: w(r,400,1); break;
-              case 0xea: w(r,161,1); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0x2a00:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0xc: w(r,370,4); break;
-              case 0x74: w(r,1112,3); break;
-              case 0x75: w(r,1109,2); break;
-              case 0x76: w(r,1109,3); break;
-              case 0xdc: w(r,2212,1); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0x2c00:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x7c: w(r,1047,1); break;
-              case 0x7d: w(r,162,1); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0x2d00:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x6f: w(r,2213,1); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0x2f00:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x0: w(r,1209,1); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0x3000:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x0: w(r,3,1); break;
-              case 0x36: w(r,2214,1); break;
-              case 0x4c: w(r,1639,1); break;
-              case 0x4e: w(r,2215,1); break;
-              case 0x50: w(r,2216,1); break;
-              case 0x52: w(r,2217,1); break;
-              case 0x54: w(r,2218,1); break;
-              case 0x56: w(r,2219,1); break;
-              case 0x58: w(r,2220,1); break;
-              case 0x5a: w(r,2221,1); break;
-              case 0x5c: w(r,2222,1); break;
-              case 0x5e: w(r,2223,1); break;
-              case 0x60: w(r,2224,1); break;
-              case 0x62: w(r,2225,1); break;
-              case 0x65: w(r,2226,1); break;
-              case 0x67: w(r,2227,1); break;
-              case 0x69: w(r,2092,1); break;
-              case 0x70: w(r,2093,1); break;
-              case 0x71: w(r,2093,1); break;
-              case 0x73: w(r,2095,1); break;
-              case 0x74: w(r,2095,1); break;
-              case 0x76: w(r,2097,1); break;
-              case 0x77: w(r,2097,1); break;
-              case 0x79: w(r,2099,1); break;
-              case 0x7a: w(r,2099,1); break;
-              case 0x7c: w(r,1638,1); break;
-              case 0x7d: w(r,1638,1); break;
-              case 0x94: w(r,2101,1); break;
-              case 0x9b: w(r,3,1); break;
-              case 0x9c: w(r,3,1); break;
-              case 0x9e: w(r,2102,1); break;
-              case 0x9f: w(r,1460,2); break;
-              case 0xac: w(r,135,1); break;
-              case 0xae: w(r,45,1); break;
-              case 0xb0: w(r,81,1); break;
-              case 0xb2: w(r,54,1); break;
-              case 0xb4: w(r,575,1); break;
-              case 0xb6: w(r,71,1); break;
-              case 0xb8: w(r,103,1); break;
-              case 0xba: w(r,63,1); break;
-              case 0xbc: w(r,68,1); break;
-              case 0xbe: w(r,1407,1); break;
-              case 0xc0: w(r,113,1); break;
-              case 0xc2: w(r,73,1); break;
-              case 0xc5: w(r,454,1); break;
-              case 0xc7: w(r,1456,1); break;
-              case 0xc9: w(r,49,1); break;
-              case 0xd0: w(r,66,1); break;
-              case 0xd1: w(r,66,1); break;
-              case 0xd3: w(r,61,1); break;
-              case 0xd4: w(r,61,1); break;
-              case 0xd6: w(r,56,1); break;
-              case 0xd7: w(r,56,1); break;
-              case 0xd9: w(r,111,1); break;
-              case 0xda: w(r,111,1); break;
-              case 0xdc: w(r,142,1); break;
-              case 0xdd: w(r,142,1); break;
-              case 0xf4: w(r,497,1); break;
-              case 0xf7: w(r,93,1); break;
-              case 0xf8: w(r,2089,1); break;
-              case 0xf9: w(r,2090,1); break;
-              case 0xfa: w(r,1758,1); break;
-              case 0xfe: w(r,2091,1); break;
-              case 0xff: w(r,1458,2); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0x3100:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x31: w(r,124,1); break;
-              case 0x32: w(r,1868,1); break;
-              case 0x33: w(r,1867,1); break;
-              case 0x34: w(r,323,1); break;
-              case 0x35: w(r,1866,1); break;
-              case 0x36: w(r,1865,1); break;
-              case 0x37: w(r,319,1); break;
-              case 0x38: w(r,1864,1); break;
-              case 0x39: w(r,315,1); break;
-              case 0x3a: w(r,1863,1); break;
-              case 0x3b: w(r,1862,1); break;
-              case 0x3c: w(r,1861,1); break;
-              case 0x3d: w(r,1860,1); break;
-              case 0x3e: w(r,1876,1); break;
-              case 0x3f: w(r,1875,1); break;
-              case 0x40: w(r,1874,1); break;
-              case 0x41: w(r,311,1); break;
-              case 0x42: w(r,307,1); break;
-              case 0x43: w(r,1873,1); break;
-              case 0x44: w(r,1872,1); break;
-              case 0x45: w(r,303,1); break;
-              case 0x46: w(r,1871,1); break;
-              case 0x47: w(r,27,1); break;
-              case 0x48: w(r,29,1); break;
-              case 0x49: w(r,1870,1); break;
-              case 0x4a: w(r,121,1); break;
-              case 0x4b: w(r,287,1); break;
-              case 0x4c: w(r,283,1); break;
-              case 0x4d: w(r,279,1); break;
-              case 0x4e: w(r,36,1); break;
-              case 0x4f: w(r,122,1); break;
-              case 0x50: w(r,1901,1); break;
-              case 0x51: w(r,1900,1); break;
-              case 0x52: w(r,1899,1); break;
-              case 0x53: w(r,30,1); break;
-              case 0x54: w(r,1898,1); break;
-              case 0x55: w(r,1897,1); break;
-              case 0x56: w(r,1896,1); break;
-              case 0x57: w(r,28,1); break;
-              case 0x58: w(r,1895,1); break;
-              case 0x59: w(r,1894,1); break;
-              case 0x5a: w(r,1893,1); break;
-              case 0x5b: w(r,1892,1); break;
-              case 0x5c: w(r,37,1); break;
-              case 0x5d: w(r,1891,1); break;
-              case 0x5e: w(r,1890,1); break;
-              case 0x5f: w(r,1889,1); break;
-              case 0x60: w(r,1888,1); break;
-              case 0x61: w(r,1887,1); break;
-              case 0x62: w(r,217,1); break;
-              case 0x63: w(r,1917,1); break;
-              case 0x64: w(r,1869,1); break;
-              case 0x65: w(r,2103,1); break;
-              case 0x66: w(r,2104,1); break;
-              case 0x67: w(r,2105,1); break;
-              case 0x68: w(r,2106,1); break;
-              case 0x69: w(r,2107,1); break;
-              case 0x6a: w(r,2108,1); break;
-              case 0x6b: w(r,2063,1); break;
-              case 0x6c: w(r,2064,1); break;
-              case 0x6d: w(r,2065,1); break;
-              case 0x6e: w(r,2066,1); break;
-              case 0x6f: w(r,2067,1); break;
-              case 0x70: w(r,2068,1); break;
-              case 0x71: w(r,2069,1); break;
-              case 0x72: w(r,2070,1); break;
-              case 0x73: w(r,2071,1); break;
-              case 0x74: w(r,2072,1); break;
-              case 0x75: w(r,2073,1); break;
-              case 0x76: w(r,2074,1); break;
-              case 0x77: w(r,2075,1); break;
-              case 0x78: w(r,2076,1); break;
-              case 0x79: w(r,2077,1); break;
-              case 0x7a: w(r,2078,1); break;
-              case 0x7b: w(r,2079,1); break;
-              case 0x7c: w(r,2080,1); break;
-              case 0x7d: w(r,2081,1); break;
-              case 0x7e: w(r,2082,1); break;
-              case 0x7f: w(r,2083,1); break;
-              case 0x80: w(r,2084,1); break;
-              case 0x81: w(r,2085,1); break;
-              case 0x82: w(r,2086,1); break;
-              case 0x83: w(r,2087,1); break;
-              case 0x84: w(r,2088,1); break;
-              case 0x85: w(r,2053,1); break;
-              case 0x86: w(r,2054,1); break;
-              case 0x87: w(r,2055,1); break;
-              case 0x88: w(r,2056,1); break;
-              case 0x89: w(r,2057,1); break;
-              case 0x8a: w(r,2058,1); break;
-              case 0x8b: w(r,2059,1); break;
-              case 0x8c: w(r,2060,1); break;
-              case 0x8d: w(r,2061,1); break;
-              case 0x8e: w(r,2062,1); break;
-              case 0x92: w(r,1209,1); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0x3200:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x0: w(r,953,3); break;
-              case 0x1: w(r,950,3); break;
-              case 0x2: w(r,947,3); break;
-              case 0x3: w(r,944,3); break;
-              case 0x4: w(r,941,3); break;
-              case 0x5: w(r,1238,3); break;
-              case 0x6: w(r,1226,3); break;
-              case 0x7: w(r,1241,3); break;
-              case 0x8: w(r,1235,3); break;
-              case 0x9: w(r,1229,3); break;
-              case 0xa: w(r,1220,3); break;
-              case 0xb: w(r,1217,3); break;
-              case 0xc: w(r,1214,3); break;
-              case 0xd: w(r,1211,3); break;
-              case 0xe: w(r,326,4); break;
-              case 0xf: w(r,322,4); break;
-              case 0x10: w(r,318,4); break;
-              case 0x11: w(r,314,4); break;
-              case 0x12: w(r,310,4); break;
-              case 0x13: w(r,306,4); break;
-              case 0x14: w(r,302,4); break;
-              case 0x15: w(r,298,4); break;
-              case 0x16: w(r,294,4); break;
-              case 0x17: w(r,290,4); break;
-              case 0x18: w(r,286,4); break;
-              case 0x19: w(r,282,4); break;
-              case 0x1a: w(r,278,4); break;
-              case 0x1b: w(r,274,4); break;
-              case 0x1c: w(r,270,4); break;
-              case 0x1d: w(r,26,7); break;
-              case 0x1e: w(r,33,6); break;
-              case 0x20: w(r,1208,3); break;
-              case 0x21: w(r,1412,2); break;
-              case 0x22: w(r,1412,2); break;
-              case 0x23: w(r,1412,2); break;
-              case 0x24: w(r,1412,2); break;
-              case 0x25: w(r,1412,2); break;
-              case 0x26: w(r,1412,2); break;
-              case 0x27: w(r,1412,2); break;
-              case 0x28: w(r,1412,2); break;
-              case 0x29: w(r,1412,2); break;
-              case 0x2a: w(r,1412,2); break;
-              case 0x2b: w(r,1412,2); break;
-              case 0x2c: w(r,1412,2); break;
-              case 0x2d: w(r,1412,2); break;
-              case 0x2e: w(r,1412,2); break;
-              case 0x2f: w(r,1412,2); break;
-              case 0x30: w(r,1412,2); break;
-              case 0x31: w(r,1412,2); break;
-              case 0x32: w(r,1412,2); break;
-              case 0x33: w(r,1412,2); break;
-              case 0x34: w(r,1412,2); break;
-              case 0x35: w(r,1412,2); break;
-              case 0x36: w(r,1412,2); break;
-              case 0x37: w(r,1412,2); break;
-              case 0x38: w(r,1412,2); break;
-              case 0x39: w(r,1412,2); break;
-              case 0x3a: w(r,1412,2); break;
-              case 0x3b: w(r,1412,2); break;
-              case 0x3c: w(r,1412,2); break;
-              case 0x3d: w(r,1412,2); break;
-              case 0x3e: w(r,1412,2); break;
-              case 0x3f: w(r,1412,2); break;
-              case 0x40: w(r,1412,2); break;
-              case 0x41: w(r,1412,2); break;
-              case 0x42: w(r,1412,2); break;
-              case 0x43: w(r,1412,2); break;
-              case 0x50: w(r,1223,3); break;
-              case 0x51: w(r,1084,2); break;
-              case 0x52: w(r,1279,2); break;
-              case 0x53: w(r,1286,2); break;
-              case 0x54: w(r,1288,2); break;
-              case 0x55: w(r,1448,2); break;
-              case 0x56: w(r,1450,2); break;
-              case 0x57: w(r,1280,2); break;
-              case 0x58: w(r,1276,2); break;
-              case 0x59: w(r,1274,2); break;
-              case 0x5a: w(r,1272,2); break;
-              case 0x5b: w(r,988,2); break;
-              case 0x5c: w(r,985,2); break;
-              case 0x5d: w(r,1364,2); break;
-              case 0x5e: w(r,1366,2); break;
-              case 0x5f: w(r,1368,2); break;
-              case 0x60: w(r,124,1); break;
-              case 0x61: w(r,323,1); break;
-              case 0x62: w(r,319,1); break;
-              case 0x63: w(r,315,1); break;
-              case 0x64: w(r,311,1); break;
-              case 0x65: w(r,307,1); break;
-              case 0x66: w(r,303,1); break;
-              case 0x67: w(r,27,1); break;
-              case 0x68: w(r,29,1); break;
-              case 0x69: w(r,121,1); break;
-              case 0x6a: w(r,287,1); break;
-              case 0x6b: w(r,283,1); break;
-              case 0x6c: w(r,279,1); break;
-              case 0x6d: w(r,36,1); break;
-              case 0x6e: w(r,327,2); break;
-              case 0x6f: w(r,323,2); break;
-              case 0x70: w(r,319,2); break;
-              case 0x71: w(r,315,2); break;
-              case 0x72: w(r,311,2); break;
-              case 0x73: w(r,307,2); break;
-              case 0x74: w(r,303,2); break;
-              case 0x75: w(r,299,2); break;
-              case 0x76: w(r,295,2); break;
-              case 0x77: w(r,121,2); break;
-              case 0x78: w(r,287,2); break;
-              case 0x79: w(r,283,2); break;
-              case 0x7a: w(r,279,2); break;
-              case 0x7b: w(r,275,2); break;
-              case 0x7c: w(r,121,5); break;
-              case 0x7d: w(r,214,4); break;
-              case 0x7e: w(r,1380,2); break;
-              case 0x80: w(r,1209,1); break;
-              case 0xb1: w(r,1378,2); break;
-              case 0xb2: w(r,1376,2); break;
-              case 0xb3: w(r,1374,2); break;
-              case 0xb4: w(r,1372,2); break;
-              case 0xb5: w(r,1370,2); break;
-              case 0xb6: w(r,1081,2); break;
-              case 0xb7: w(r,1278,2); break;
-              case 0xb8: w(r,1252,2); break;
-              case 0xb9: w(r,1289,2); break;
-              case 0xba: w(r,1314,2); break;
-              case 0xbb: w(r,1316,2); break;
-              case 0xbc: w(r,1318,2); break;
-              case 0xbd: w(r,1324,2); break;
-              case 0xbe: w(r,1290,2); break;
-              case 0xbf: w(r,1284,2); break;
-              case 0xc0: w(r,158,1); break;
-              case 0xc1: w(r,44,1); break;
-              case 0xc2: w(r,184,1); break;
-              case 0xc3: w(r,188,1); break;
-              case 0xc4: w(r,192,1); break;
-              case 0xc5: w(r,196,1); break;
-              case 0xc6: w(r,200,1); break;
-              case 0xc7: w(r,204,1); break;
-              case 0xc8: w(r,208,1); break;
-              case 0xc9: w(r,160,2); break;
-              case 0xca: w(r,175,2); break;
-              case 0xcb: w(r,179,2); break;
-              case 0xcc: w(r,1282,2); break;
-              case 0xcd: w(r,518,3); break;
-              case 0xce: w(r,1452,2); break;
-              case 0xcf: w(r,515,3); break;
-              case 0xd0: w(r,62,1); break;
-              case 0xd1: w(r,84,1); break;
-              case 0xd2: w(r,497,1); break;
-              case 0xd3: w(r,106,1); break;
-              case 0xd4: w(r,485,1); break;
-              case 0xd5: w(r,135,1); break;
-              case 0xd6: w(r,45,1); break;
-              case 0xd7: w(r,81,1); break;
-              case 0xd8: w(r,54,1); break;
-              case 0xd9: w(r,575,1); break;
-              case 0xda: w(r,71,1); break;
-              case 0xdb: w(r,103,1); break;
-              case 0xdc: w(r,63,1); break;
-              case 0xdd: w(r,68,1); break;
-              case 0xde: w(r,1407,1); break;
-              case 0xdf: w(r,113,1); break;
-              case 0xe0: w(r,73,1); break;
-              case 0xe1: w(r,454,1); break;
-              case 0xe2: w(r,1456,1); break;
-              case 0xe3: w(r,49,1); break;
-              case 0xe4: w(r,580,1); break;
-              case 0xe5: w(r,231,1); break;
-              case 0xe6: w(r,1877,1); break;
-              case 0xe7: w(r,257,1); break;
-              case 0xe8: w(r,563,1); break;
-              case 0xe9: w(r,66,1); break;
-              case 0xea: w(r,61,1); break;
-              case 0xeb: w(r,56,1); break;
-              case 0xec: w(r,111,1); break;
-              case 0xed: w(r,142,1); break;
-              case 0xee: w(r,101,1); break;
-              case 0xef: w(r,76,1); break;
-              case 0xf0: w(r,75,1); break;
-              case 0xf1: w(r,47,1); break;
-              case 0xf2: w(r,1879,1); break;
-              case 0xf3: w(r,806,1); break;
-              case 0xf4: w(r,803,1); break;
-              case 0xf5: w(r,1878,1); break;
-              case 0xf6: w(r,58,1); break;
-              case 0xf7: w(r,77,1); break;
-              case 0xf8: w(r,50,1); break;
-              case 0xf9: w(r,51,1); break;
-              case 0xfa: w(r,46,1); break;
-              case 0xfb: w(r,93,1); break;
-              case 0xfc: w(r,2089,1); break;
-              case 0xfd: w(r,2090,1); break;
-              case 0xfe: w(r,1758,1); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0x3300:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x0: w(r,218,4); break;
-              case 0x1: w(r,222,4); break;
-              case 0x2: w(r,226,4); break;
-              case 0x3: w(r,506,3); break;
-              case 0x4: w(r,230,4); break;
-              case 0x5: w(r,500,3); break;
-              case 0x6: w(r,497,3); break;
-              case 0x7: w(r,106,5); break;
-              case 0x8: w(r,234,4); break;
-              case 0x9: w(r,488,3); break;
-              case 0xa: w(r,485,3); break;
-              case 0xb: w(r,482,3); break;
-              case 0xc: w(r,238,4); break;
-              case 0xd: w(r,242,4); break;
-              case 0xe: w(r,608,3); break;
-              case 0xf: w(r,605,3); break;
-              case 0x10: w(r,1446,2); break;
-              case 0x11: w(r,602,3); break;
-              case 0x12: w(r,246,4); break;
-              case 0x13: w(r,250,4); break;
-              case 0x14: w(r,45,2); break;
-              case 0x15: w(r,96,5); break;
-              case 0x16: w(r,45,6); break;
-              case 0x17: w(r,91,5); break;
-              case 0x18: w(r,86,3); break;
-              case 0x19: w(r,86,5); break;
-              case 0x1a: w(r,81,5); break;
-              case 0x1b: w(r,254,4); break;
-              case 0x1c: w(r,581,3); break;
-              case 0x1d: w(r,578,3); break;
-              case 0x1e: w(r,575,3); break;
-              case 0x1f: w(r,258,4); break;
-              case 0x20: w(r,71,5); break;
-              case 0x21: w(r,262,4); break;
-              case 0x22: w(r,569,3); break;
-              case 0x23: w(r,68,3); break;
-              case 0x24: w(r,566,3); break;
-              case 0x25: w(r,1456,2); break;
-              case 0x26: w(r,49,2); break;
-              case 0x27: w(r,89,2); break;
-              case 0x28: w(r,1420,2); break;
-              case 0x29: w(r,563,3); break;
-              case 0x2a: w(r,560,3); break;
-              case 0x2b: w(r,66,5); break;
-              case 0x2c: w(r,554,3); break;
-              case 0x2d: w(r,266,4); break;
-              case 0x2e: w(r,61,5); break;
-              case 0x2f: w(r,416,3); break;
-              case 0x30: w(r,1410,2); break;
-              case 0x31: w(r,1408,2); break;
-              case 0x32: w(r,56,5); break;
-              case 0x33: w(r,150,4); break;
-              case 0x34: w(r,116,5); break;
-              case 0x35: w(r,464,3); break;
-              case 0x36: w(r,111,5); break;
-              case 0x37: w(r,1406,2); break;
-              case 0x38: w(r,455,3); break;
-              case 0x39: w(r,452,3); break;
-              case 0x3a: w(r,449,3); break;
-              case 0x3b: w(r,446,3); break;
-              case 0x3c: w(r,443,3); break;
-              case 0x3d: w(r,142,4); break;
-              case 0x3e: w(r,437,3); break;
-              case 0x3f: w(r,434,2); break;
-              case 0x40: w(r,434,3); break;
-              case 0x41: w(r,431,3); break;
-              case 0x42: w(r,428,3); break;
-              case 0x43: w(r,138,4); break;
-              case 0x44: w(r,425,3); break;
-              case 0x45: w(r,440,3); break;
-              case 0x46: w(r,458,3); break;
-              case 0x47: w(r,101,5); break;
-              case 0x48: w(r,126,4); break;
-              case 0x49: w(r,76,2); break;
-              case 0x4a: w(r,76,5); break;
-              case 0x4b: w(r,134,2); break;
-              case 0x4c: w(r,134,4); break;
-              case 0x4d: w(r,47,4); break;
-              case 0x4e: w(r,809,3); break;
-              case 0x4f: w(r,806,3); break;
-              case 0x50: w(r,803,3); break;
-              case 0x51: w(r,146,4); break;
-              case 0x52: w(r,1436,2); break;
-              case 0x53: w(r,797,3); break;
-              case 0x54: w(r,154,4); break;
-              case 0x55: w(r,1440,2); break;
-              case 0x56: w(r,51,5); break;
-              case 0x57: w(r,93,3); break;
-              case 0x58: w(r,161,1); break;
-              case 0x59: w(r,158,1); break;
-              case 0x5a: w(r,44,1); break;
-              case 0x5b: w(r,184,1); break;
-              case 0x5c: w(r,188,1); break;
-              case 0x5d: w(r,192,1); break;
-              case 0x5e: w(r,196,1); break;
-              case 0x5f: w(r,200,1); break;
-              case 0x60: w(r,204,1); break;
-              case 0x61: w(r,208,1); break;
-              case 0x62: w(r,160,2); break;
-              case 0x63: w(r,175,2); break;
-              case 0x64: w(r,179,2); break;
-              case 0x65: w(r,183,2); break;
-              case 0x66: w(r,187,2); break;
-              case 0x67: w(r,191,2); break;
-              case 0x68: w(r,195,2); break;
-              case 0x69: w(r,199,2); break;
-              case 0x6a: w(r,203,2); break;
-              case 0x6b: w(r,207,2); break;
-              case 0x6c: w(r,211,2); break;
-              case 0x6d: w(r,1084,2); break;
-              case 0x6e: w(r,1279,2); break;
-              case 0x6f: w(r,1286,2); break;
-              case 0x70: w(r,1288,2); break;
-              case 0x71: w(r,380,3); break;
-              case 0x72: w(r,1292,2); break;
-              case 0x73: w(r,1294,2); break;
-              case 0x74: w(r,383,3); break;
-              case 0x75: w(r,1322,2); break;
-              case 0x76: w(r,1320,2); break;
-              case 0x77: w(r,386,2); break;
-              case 0x78: w(r,386,3); break;
-              case 0x79: w(r,392,3); break;
-              case 0x7a: w(r,1312,2); break;
-              case 0x80: w(r,1310,2); break;
-              case 0x81: w(r,1308,2); break;
-              case 0x82: w(r,1306,2); break;
-              case 0x83: w(r,1304,2); break;
-              case 0x84: w(r,1302,2); break;
-              case 0x85: w(r,1300,2); break;
-              case 0x86: w(r,1298,2); break;
-              case 0x87: w(r,1296,2); break;
-              case 0x88: w(r,331,3); break;
-              case 0x89: w(r,330,4); break;
-              case 0x8a: w(r,1250,2); break;
-              case 0x8b: w(r,1248,2); break;
-              case 0x8c: w(r,1246,2); break;
-              case 0x8d: w(r,1244,2); break;
-              case 0x8e: w(r,1254,2); break;
-              case 0x8f: w(r,360,2); break;
-              case 0x90: w(r,399,2); break;
-              case 0x91: w(r,398,3); break;
-              case 0x92: w(r,401,3); break;
-              case 0x93: w(r,404,3); break;
-              case 0x94: w(r,407,3); break;
-              case 0x95: w(r,1270,2); break;
-              case 0x96: w(r,1268,2); break;
-              case 0x97: w(r,1266,2); break;
-              case 0x98: w(r,1264,2); break;
-              case 0x99: w(r,1262,2); break;
-              case 0x9a: w(r,1260,2); break;
-              case 0x9b: w(r,1258,2); break;
-              case 0x9c: w(r,410,2); break;
-              case 0x9d: w(r,413,2); break;
-              case 0x9e: w(r,419,2); break;
-              case 0x9f: w(r,410,3); break;
-              case 0xa0: w(r,413,3); break;
-              case 0xa1: w(r,387,2); break;
-              case 0xa2: w(r,419,3); break;
-              case 0xa3: w(r,551,3); break;
-              case 0xa4: w(r,557,3); break;
-              case 0xa5: w(r,393,2); break;
-              case 0xa6: w(r,572,3); break;
-              case 0xa7: w(r,334,3); break;
-              case 0xa8: w(r,334,4); break;
-              case 0xa9: w(r,381,2); break;
-              case 0xaa: w(r,584,3); break;
-              case 0xab: w(r,587,3); break;
-              case 0xac: w(r,590,3); break;
-              case 0xad: w(r,39,3); break;
-              case 0xae: w(r,39,5); break;
-              case 0xaf: w(r,39,6); break;
-              case 0xb0: w(r,1382,2); break;
-              case 0xb1: w(r,1384,2); break;
-              case 0xb2: w(r,1386,2); break;
-              case 0xb3: w(r,1388,2); break;
-              case 0xb4: w(r,1390,2); break;
-              case 0xb5: w(r,1392,2); break;
-              case 0xb6: w(r,1394,2); break;
-              case 0xb7: w(r,493,2); break;
-              case 0xb8: w(r,1396,2); break;
-              case 0xb9: w(r,1398,2); break;
-              case 0xba: w(r,1400,2); break;
-              case 0xbb: w(r,1402,2); break;
-              case 0xbc: w(r,1404,2); break;
-              case 0xbd: w(r,1326,2); break;
-              case 0xbe: w(r,1328,2); break;
-              case 0xbf: w(r,1330,2); break;
-              case 0xc0: w(r,1332,2); break;
-              case 0xc1: w(r,1334,2); break;
-              case 0xc2: w(r,346,4); break;
-              case 0xc3: w(r,1336,2); break;
-              case 0xc4: w(r,1338,2); break;
-              case 0xc5: w(r,1340,2); break;
-              case 0xc6: w(r,358,4); break;
-              case 0xc7: w(r,479,3); break;
-              case 0xc8: w(r,1342,2); break;
-              case 0xc9: w(r,1344,2); break;
-              case 0xca: w(r,1346,2); break;
-              case 0xcb: w(r,1348,2); break;
-              case 0xcc: w(r,1350,2); break;
-              case 0xcd: w(r,1352,2); break;
-              case 0xce: w(r,1354,2); break;
-              case 0xcf: w(r,1356,2); break;
-              case 0xd0: w(r,333,2); break;
-              case 0xd1: w(r,1358,2); break;
-              case 0xd2: w(r,503,3); break;
-              case 0xd3: w(r,1360,2); break;
-              case 0xd4: w(r,1362,2); break;
-              case 0xd5: w(r,548,3); break;
-              case 0xd6: w(r,512,3); break;
-              case 0xd7: w(r,1744,2); break;
-              case 0xd8: w(r,366,4); break;
-              case 0xd9: w(r,509,3); break;
-              case 0xda: w(r,1746,2); break;
-              case 0xdb: w(r,1748,2); break;
-              case 0xdc: w(r,1752,2); break;
-              case 0xdd: w(r,1750,2); break;
-              case 0xde: w(r,494,3); break;
-              case 0xdf: w(r,491,3); break;
-              case 0xe0: w(r,158,1); break;
-              case 0xe1: w(r,44,1); break;
-              case 0xe2: w(r,184,1); break;
-              case 0xe3: w(r,188,1); break;
-              case 0xe4: w(r,192,1); break;
-              case 0xe5: w(r,196,1); break;
-              case 0xe6: w(r,200,1); break;
-              case 0xe7: w(r,204,1); break;
-              case 0xe8: w(r,208,1); break;
-              case 0xe9: w(r,160,2); break;
-              case 0xea: w(r,175,2); break;
-              case 0xeb: w(r,179,2); break;
-              case 0xec: w(r,183,2); break;
-              case 0xed: w(r,187,2); break;
-              case 0xee: w(r,191,2); break;
-              case 0xef: w(r,195,2); break;
-              case 0xf0: w(r,199,2); break;
-              case 0xf1: w(r,203,2); break;
-              case 0xf2: w(r,207,2); break;
-              case 0xf3: w(r,211,2); break;
-              case 0xf4: w(r,1084,2); break;
-              case 0xf5: w(r,1279,2); break;
-              case 0xf6: w(r,1286,2); break;
-              case 0xf7: w(r,1288,2); break;
-              case 0xf8: w(r,1448,2); break;
-              case 0xf9: w(r,1450,2); break;
-              case 0xfa: w(r,1280,2); break;
-              case 0xfb: w(r,1276,2); break;
-              case 0xfc: w(r,1274,2); break;
-              case 0xfd: w(r,1272,2); break;
-              case 0xfe: w(r,988,2); break;
-              case 0xff: w(r,599,3); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0xa700:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x70: w(r,2165,1); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0xfb00:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x0: w(r,593,2); break;
-              case 0x1: w(r,597,2); break;
-              case 0x2: w(r,594,2); break;
-              case 0x3: w(r,596,3); break;
-              case 0x4: w(r,593,3); break;
-              case 0x5: w(r,1724,2); break;
-              case 0x6: w(r,1724,2); break;
-              case 0x13: w(r,1728,2); break;
-              case 0x14: w(r,1730,2); break;
-              case 0x15: w(r,1732,2); break;
-              case 0x16: w(r,1734,2); break;
-              case 0x17: w(r,1736,2); break;
-              case 0x1d: w(r,2164,1); break;
-              case 0x1f: w(r,2149,1); break;
-              case 0x20: w(r,2150,1); break;
-              case 0x21: w(r,1722,1); break;
-              case 0x22: w(r,2151,1); break;
-              case 0x23: w(r,2152,1); break;
-              case 0x24: w(r,2153,1); break;
-              case 0x25: w(r,1723,1); break;
-              case 0x26: w(r,2154,1); break;
-              case 0x27: w(r,2155,1); break;
-              case 0x28: w(r,2156,1); break;
-              case 0x29: w(r,1773,1); break;
-              case 0x2a: w(r,2157,1); break;
-              case 0x2b: w(r,2157,1); break;
-              case 0x2c: w(r,2157,1); break;
-              case 0x2d: w(r,2157,1); break;
-              case 0x2e: w(r,1722,1); break;
-              case 0x2f: w(r,1722,1); break;
-              case 0x30: w(r,1722,1); break;
-              case 0x31: w(r,2159,1); break;
-              case 0x32: w(r,2160,1); break;
-              case 0x33: w(r,2151,1); break;
-              case 0x34: w(r,2152,1); break;
-              case 0x35: w(r,2161,1); break;
-              case 0x36: w(r,2162,1); break;
-              case 0x38: w(r,2163,1); break;
-              case 0x39: w(r,2164,1); break;
-              case 0x3a: w(r,2179,1); break;
-              case 0x3b: w(r,2153,1); break;
-              case 0x3c: w(r,1723,1); break;
-              case 0x3e: w(r,2180,1); break;
-              case 0x40: w(r,2181,1); break;
-              case 0x41: w(r,2182,1); break;
-              case 0x43: w(r,2183,1); break;
-              case 0x44: w(r,2184,1); break;
-              case 0x46: w(r,2185,1); break;
-              case 0x47: w(r,2186,1); break;
-              case 0x48: w(r,2155,1); break;
-              case 0x49: w(r,2157,1); break;
-              case 0x4a: w(r,2156,1); break;
-              case 0x4b: w(r,2161,1); break;
-              case 0x4c: w(r,2159,1); break;
-              case 0x4d: w(r,2153,1); break;
-              case 0x4e: w(r,2184,1); break;
-              case 0x4f: w(r,1722,2); break;
-              case 0x50: w(r,2187,1); break;
-              case 0x51: w(r,2187,1); break;
-              case 0x52: w(r,2189,1); break;
-              case 0x53: w(r,2189,1); break;
-              case 0x54: w(r,2189,1); break;
-              case 0x55: w(r,2189,1); break;
-              case 0x56: w(r,2166,1); break;
-              case 0x57: w(r,2166,1); break;
-              case 0x58: w(r,2166,1); break;
-              case 0x59: w(r,2166,1); break;
-              case 0x5a: w(r,2167,1); break;
-              case 0x5b: w(r,2167,1); break;
-              case 0x5c: w(r,2167,1); break;
-              case 0x5d: w(r,2167,1); break;
-              case 0x5e: w(r,2169,1); break;
-              case 0x5f: w(r,2169,1); break;
-              case 0x60: w(r,2169,1); break;
-              case 0x61: w(r,2169,1); break;
-              case 0x62: w(r,2171,1); break;
-              case 0x63: w(r,2171,1); break;
-              case 0x64: w(r,2171,1); break;
-              case 0x65: w(r,2171,1); break;
-              case 0x66: w(r,2173,1); break;
-              case 0x67: w(r,2173,1); break;
-              case 0x68: w(r,2173,1); break;
-              case 0x69: w(r,2173,1); break;
-              case 0x6a: w(r,2175,1); break;
-              case 0x6b: w(r,2175,1); break;
-              case 0x6c: w(r,2175,1); break;
-              case 0x6d: w(r,2175,1); break;
-              case 0x6e: w(r,2177,1); break;
-              case 0x6f: w(r,2177,1); break;
-              case 0x70: w(r,2177,1); break;
-              case 0x71: w(r,2177,1); break;
-              case 0x72: w(r,2122,1); break;
-              case 0x73: w(r,2122,1); break;
-              case 0x74: w(r,2122,1); break;
-              case 0x75: w(r,2122,1); break;
-              case 0x76: w(r,2124,1); break;
-              case 0x77: w(r,2124,1); break;
-              case 0x78: w(r,2124,1); break;
-              case 0x79: w(r,2124,1); break;
-              case 0x7a: w(r,2126,1); break;
-              case 0x7b: w(r,2126,1); break;
-              case 0x7c: w(r,2126,1); break;
-              case 0x7d: w(r,2126,1); break;
-              case 0x7e: w(r,2128,1); break;
-              case 0x7f: w(r,2128,1); break;
-              case 0x80: w(r,2128,1); break;
-              case 0x81: w(r,2128,1); break;
-              case 0x82: w(r,2130,1); break;
-              case 0x83: w(r,2130,1); break;
-              case 0x84: w(r,2132,1); break;
-              case 0x85: w(r,2132,1); break;
-              case 0x86: w(r,2134,1); break;
-              case 0x87: w(r,2134,1); break;
-              case 0x88: w(r,2136,1); break;
-              case 0x89: w(r,2136,1); break;
-              case 0x8a: w(r,2138,1); break;
-              case 0x8b: w(r,2138,1); break;
-              case 0x8c: w(r,2109,1); break;
-              case 0x8d: w(r,2109,1); break;
-              case 0x8e: w(r,2110,1); break;
-              case 0x8f: w(r,2110,1); break;
-              case 0x90: w(r,2110,1); break;
-              case 0x91: w(r,2110,1); break;
-              case 0x92: w(r,2112,1); break;
-              case 0x93: w(r,2112,1); break;
-              case 0x94: w(r,2112,1); break;
-              case 0x95: w(r,2112,1); break;
-              case 0x96: w(r,2114,1); break;
-              case 0x97: w(r,2114,1); break;
-              case 0x98: w(r,2114,1); break;
-              case 0x99: w(r,2114,1); break;
-              case 0x9a: w(r,2116,1); break;
-              case 0x9b: w(r,2116,1); break;
-              case 0x9c: w(r,2116,1); break;
-              case 0x9d: w(r,2116,1); break;
-              case 0x9e: w(r,2118,1); break;
-              case 0x9f: w(r,2118,1); break;
-              case 0xa0: w(r,2120,1); break;
-              case 0xa1: w(r,2120,1); break;
-              case 0xa2: w(r,2120,1); break;
-              case 0xa3: w(r,2120,1); break;
-              case 0xa4: w(r,1709,1); break;
-              case 0xa5: w(r,1709,1); break;
-              case 0xa6: w(r,2036,1); break;
-              case 0xa7: w(r,2036,1); break;
-              case 0xa8: w(r,2036,1); break;
-              case 0xa9: w(r,2036,1); break;
-              case 0xaa: w(r,2141,1); break;
-              case 0xab: w(r,2141,1); break;
-              case 0xac: w(r,2141,1); break;
-              case 0xad: w(r,2141,1); break;
-              case 0xae: w(r,424,1); break;
-              case 0xaf: w(r,424,1); break;
-              case 0xb0: w(r,424,1); break;
-              case 0xb1: w(r,424,1); break;
-              case 0xd3: w(r,2143,1); break;
-              case 0xd4: w(r,2143,1); break;
-              case 0xd5: w(r,2143,1); break;
-              case 0xd6: w(r,2143,1); break;
-              case 0xd7: w(r,1701,1); break;
-              case 0xd8: w(r,1701,1); break;
-              case 0xd9: w(r,1697,1); break;
-              case 0xda: w(r,1697,1); break;
-              case 0xdb: w(r,1693,1); break;
-              case 0xdc: w(r,1693,1); break;
-              case 0xdd: w(r,1720,2); break;
-              case 0xde: w(r,2145,1); break;
-              case 0xdf: w(r,2145,1); break;
-              case 0xe0: w(r,2147,1); break;
-              case 0xe1: w(r,2147,1); break;
-              case 0xe2: w(r,2140,1); break;
-              case 0xe3: w(r,2140,1); break;
-              case 0xe4: w(r,1689,1); break;
-              case 0xe5: w(r,1689,1); break;
-              case 0xe6: w(r,1689,1); break;
-              case 0xe7: w(r,1689,1); break;
-              case 0xe8: w(r,2,1); break;
-              case 0xe9: w(r,2,1); break;
-              case 0xea: w(r,1712,2); break;
-              case 0xeb: w(r,1712,2); break;
-              case 0xec: w(r,1708,2); break;
-              case 0xed: w(r,1708,2); break;
-              case 0xee: w(r,1704,2); break;
-              case 0xef: w(r,1704,2); break;
-              case 0xf0: w(r,1700,2); break;
-              case 0xf1: w(r,1700,2); break;
-              case 0xf2: w(r,1696,2); break;
-              case 0xf3: w(r,1696,2); break;
-              case 0xf4: w(r,1692,2); break;
-              case 0xf5: w(r,1692,2); break;
-              case 0xf6: w(r,1688,2); break;
-              case 0xf7: w(r,1688,2); break;
-              case 0xf8: w(r,1688,2); break;
-              case 0xf9: w(r,1548,2); break;
-              case 0xfa: w(r,1548,2); break;
-              case 0xfb: w(r,1548,2); break;
-              case 0xfc: w(r,339,1); break;
-              case 0xfd: w(r,339,1); break;
-              case 0xfe: w(r,339,1); break;
-              case 0xff: w(r,339,1); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0xfc00:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x0: w(r,532,2); break;
-              case 0x1: w(r,686,2); break;
-              case 0x2: w(r,629,2); break;
-              case 0x3: w(r,1548,2); break;
-              case 0x4: w(r,628,2); break;
-              case 0x5: w(r,1562,2); break;
-              case 0x6: w(r,800,2); break;
-              case 0x7: w(r,626,2); break;
-              case 0x8: w(r,1474,2); break;
-              case 0x9: w(r,1538,2); break;
-              case 0xa: w(r,1536,2); break;
-              case 0xb: w(r,620,2); break;
-              case 0xc: w(r,971,2); break;
-              case 0xd: w(r,614,2); break;
-              case 0xe: w(r,539,2); break;
-              case 0xf: w(r,1528,2); break;
-              case 0x10: w(r,1526,2); break;
-              case 0x11: w(r,1684,2); break;
-              case 0x12: w(r,1486,2); break;
-              case 0x13: w(r,1518,2); break;
-              case 0x14: w(r,1516,2); break;
-              case 0x15: w(r,522,2); break;
-              case 0x16: w(r,396,2); break;
-              case 0x17: w(r,525,2); break;
-              case 0x18: w(r,355,2); break;
-              case 0x19: w(r,669,2); break;
-              case 0x1a: w(r,1682,2); break;
-              case 0x1b: w(r,664,2); break;
-              case 0x1c: w(r,476,2); break;
-              case 0x1d: w(r,524,2); break;
-              case 0x1e: w(r,470,2); break;
-              case 0x1f: w(r,374,2); break;
-              case 0x20: w(r,728,2); break;
-              case 0x21: w(r,473,2); break;
-              case 0x22: w(r,1470,2); break;
-              case 0x23: w(r,695,2); break;
-              case 0x24: w(r,746,2); break;
-              case 0x25: w(r,1468,2); break;
-              case 0x26: w(r,1466,2); break;
-              case 0x27: w(r,857,2); break;
-              case 0x28: w(r,1464,2); break;
-              case 0x29: w(r,395,2); break;
-              case 0x2a: w(r,352,2); break;
-              case 0x2b: w(r,1462,2); break;
-              case 0x2c: w(r,845,2); break;
-              case 0x2d: w(r,1494,2); break;
-              case 0x2e: w(r,1496,2); break;
-              case 0x2f: w(r,839,2); break;
-              case 0x30: w(r,794,2); break;
-              case 0x31: w(r,1564,2); break;
-              case 0x32: w(r,1566,2); break;
-              case 0x33: w(r,1498,2); break;
-              case 0x34: w(r,698,2); break;
-              case 0x35: w(r,1568,2); break;
-              case 0x36: w(r,1570,2); break;
-              case 0x37: w(r,1572,2); break;
-              case 0x38: w(r,1500,2); break;
-              case 0x39: w(r,1502,2); break;
-              case 0x3a: w(r,1492,2); break;
-              case 0x3b: w(r,1490,2); break;
-              case 0x3c: w(r,713,2); break;
-              case 0x3d: w(r,1574,2); break;
-              case 0x3e: w(r,1576,2); break;
-              case 0x3f: w(r,692,2); break;
-              case 0x40: w(r,707,2); break;
-              case 0x41: w(r,818,2); break;
-              case 0x42: w(r,16,2); break;
-              case 0x43: w(r,1,2); break;
-              case 0x44: w(r,10,2); break;
-              case 0x45: w(r,17,2); break;
-              case 0x46: w(r,354,2); break;
-              case 0x47: w(r,540,2); break;
-              case 0x48: w(r,353,2); break;
-              case 0x49: w(r,528,2); break;
-              case 0x4a: w(r,531,2); break;
-              case 0x4b: w(r,467,2); break;
-              case 0x4c: w(r,650,2); break;
-              case 0x4d: w(r,1488,2); break;
-              case 0x4e: w(r,635,2); break;
-              case 0x4f: w(r,1558,2); break;
-              case 0x50: w(r,1560,2); break;
-              case 0x51: w(r,1666,2); break;
-              case 0x52: w(r,656,2); break;
-              case 0x53: w(r,1542,2); break;
-              case 0x54: w(r,1544,2); break;
-              case 0x55: w(r,532,2); break;
-              case 0x56: w(r,686,2); break;
-              case 0x57: w(r,1546,2); break;
-              case 0x58: w(r,629,2); break;
-              case 0x59: w(r,1548,2); break;
-              case 0x5a: w(r,628,2); break;
-              case 0x5b: w(r,1796,1); break;
-              case 0x5c: w(r,338,1); break;
-              case 0x5d: w(r,2,1); break;
-              case 0x5e: w(r,3,1); break;
-              case 0x5f: w(r,3,1); break;
-              case 0x60: w(r,3,1); break;
-              case 0x61: w(r,3,1); break;
-              case 0x62: w(r,3,1); break;
-              case 0x63: w(r,3,1); break;
-              case 0x64: w(r,1550,2); break;
-              case 0x65: w(r,1552,2); break;
-              case 0x66: w(r,629,2); break;
-              case 0x67: w(r,640,2); break;
-              case 0x68: w(r,1548,2); break;
-              case 0x69: w(r,628,2); break;
-              case 0x6a: w(r,364,2); break;
-              case 0x6b: w(r,1554,2); break;
-              case 0x6c: w(r,1474,2); break;
-              case 0x6d: w(r,1540,2); break;
-              case 0x6e: w(r,1538,2); break;
-              case 0x6f: w(r,1536,2); break;
-              case 0x70: w(r,1534,2); break;
-              case 0x71: w(r,1532,2); break;
-              case 0x72: w(r,539,2); break;
-              case 0x73: w(r,1530,2); break;
-              case 0x74: w(r,1528,2); break;
-              case 0x75: w(r,1526,2); break;
-              case 0x76: w(r,1524,2); break;
-              case 0x77: w(r,1522,2); break;
-              case 0x78: w(r,1486,2); break;
-              case 0x79: w(r,1520,2); break;
-              case 0x7a: w(r,1518,2); break;
-              case 0x7b: w(r,1516,2); break;
-              case 0x7c: w(r,1564,2); break;
-              case 0x7d: w(r,1566,2); break;
-              case 0x7e: w(r,1568,2); break;
-              case 0x7f: w(r,1570,2); break;
-              case 0x80: w(r,1572,2); break;
-              case 0x81: w(r,1490,2); break;
-              case 0x82: w(r,713,2); break;
-              case 0x83: w(r,1574,2); break;
-              case 0x84: w(r,1576,2); break;
-              case 0x85: w(r,16,2); break;
-              case 0x86: w(r,1,2); break;
-              case 0x87: w(r,10,2); break;
-              case 0x88: w(r,1578,2); break;
-              case 0x89: w(r,353,2); break;
-              case 0x8a: w(r,1580,2); break;
-              case 0x8b: w(r,1582,2); break;
-              case 0x8c: w(r,635,2); break;
-              case 0x8d: w(r,1556,2); break;
-              case 0x8e: w(r,1558,2); break;
-              case 0x8f: w(r,1560,2); break;
-              case 0x90: w(r,2,1); break;
-              case 0x91: w(r,1550,2); break;
-              case 0x92: w(r,1552,2); break;
-              case 0x93: w(r,629,2); break;
-              case 0x94: w(r,640,2); break;
-              case 0x95: w(r,1548,2); break;
-              case 0x96: w(r,628,2); break;
-              case 0x97: w(r,532,2); break;
-              case 0x98: w(r,686,2); break;
-              case 0x99: w(r,1546,2); break;
-              case 0x9a: w(r,629,2); break;
-              case 0x9b: w(r,11,2); break;
-              case 0x9c: w(r,1562,2); break;
-              case 0x9d: w(r,800,2); break;
-              case 0x9e: w(r,626,2); break;
-              case 0x9f: w(r,1474,2); break;
-              case 0xa0: w(r,1476,2); break;
-              case 0xa1: w(r,620,2); break;
-              case 0xa2: w(r,971,2); break;
-              case 0xa3: w(r,614,2); break;
-              case 0xa4: w(r,539,2); break;
-              case 0xa5: w(r,1484,2); break;
-              case 0xa6: w(r,1486,2); break;
-              case 0xa7: w(r,522,2); break;
-              case 0xa8: w(r,396,2); break;
-              case 0xa9: w(r,525,2); break;
-              case 0xaa: w(r,355,2); break;
-              case 0xab: w(r,669,2); break;
-              case 0xac: w(r,664,2); break;
-              case 0xad: w(r,476,2); break;
-              case 0xae: w(r,524,2); break;
-              case 0xaf: w(r,470,2); break;
-              case 0xb0: w(r,374,2); break;
-              case 0xb1: w(r,728,2); break;
-              case 0xb2: w(r,1472,2); break;
-              case 0xb3: w(r,473,2); break;
-              case 0xb4: w(r,1470,2); break;
-              case 0xb5: w(r,695,2); break;
-              case 0xb6: w(r,746,2); break;
-              case 0xb7: w(r,1468,2); break;
-              case 0xb8: w(r,1466,2); break;
-              case 0xb9: w(r,1464,2); break;
-              case 0xba: w(r,395,2); break;
-              case 0xbb: w(r,352,2); break;
-              case 0xbc: w(r,1462,2); break;
-              case 0xbd: w(r,845,2); break;
-              case 0xbe: w(r,1494,2); break;
-              case 0xbf: w(r,1496,2); break;
-              case 0xc0: w(r,839,2); break;
-              case 0xc1: w(r,794,2); break;
-              case 0xc2: w(r,1498,2); break;
-              case 0xc3: w(r,698,2); break;
-              case 0xc4: w(r,1500,2); break;
-              case 0xc5: w(r,1502,2); break;
-              case 0xc6: w(r,1492,2); break;
-              case 0xc7: w(r,1490,2); break;
-              case 0xc8: w(r,713,2); break;
-              case 0xc9: w(r,692,2); break;
-              case 0xca: w(r,707,2); break;
-              case 0xcb: w(r,818,2); break;
-              case 0xcc: w(r,16,2); break;
-              case 0xcd: w(r,6,2); break;
-              case 0xce: w(r,17,2); break;
-              case 0xcf: w(r,354,2); break;
-              case 0xd0: w(r,540,2); break;
-              case 0xd1: w(r,353,2); break;
-              case 0xd2: w(r,467,2); break;
-              case 0xd3: w(r,650,2); break;
-              case 0xd4: w(r,1488,2); break;
-              case 0xd5: w(r,635,2); break;
-              case 0xd6: w(r,1541,2); break;
-              case 0xd7: w(r,1666,2); break;
-              case 0xd8: w(r,656,2); break;
-              case 0xd9: w(r,7,1); break;
-              case 0xda: w(r,532,2); break;
-              case 0xdb: w(r,686,2); break;
-              case 0xdc: w(r,1546,2); break;
-              case 0xdd: w(r,629,2); break;
-              case 0xde: w(r,11,2); break;
-              case 0xdf: w(r,629,2); break;
-              case 0xe0: w(r,11,2); break;
-              case 0xe1: w(r,1474,2); break;
-              case 0xe2: w(r,1476,2); break;
-              case 0xe3: w(r,539,2); break;
-              case 0xe4: w(r,1484,2); break;
-              case 0xe5: w(r,1486,2); break;
-              case 0xe6: w(r,1668,2); break;
-              case 0xe7: w(r,374,2); break;
-              case 0xe8: w(r,1650,2); break;
-              case 0xe9: w(r,758,2); break;
-              case 0xea: w(r,1652,2); break;
-              case 0xeb: w(r,1490,2); break;
-              case 0xec: w(r,713,2); break;
-              case 0xed: w(r,16,2); break;
-              case 0xee: w(r,635,2); break;
-              case 0xef: w(r,1541,2); break;
-              case 0xf0: w(r,629,2); break;
-              case 0xf1: w(r,11,2); break;
-              case 0xf2: w(r,1793,1); break;
-              case 0xf3: w(r,1793,1); break;
-              case 0xf4: w(r,1793,1); break;
-              case 0xf5: w(r,1664,2); break;
-              case 0xf6: w(r,1662,2); break;
-              case 0xf7: w(r,1660,2); break;
-              case 0xf8: w(r,1658,2); break;
-              case 0xf9: w(r,1656,2); break;
-              case 0xfa: w(r,1674,2); break;
-              case 0xfb: w(r,1604,2); break;
-              case 0xfc: w(r,1606,2); break;
-              case 0xfd: w(r,1608,2); break;
-              case 0xfe: w(r,1610,2); break;
-              case 0xff: w(r,651,2); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0xfd00:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x0: w(r,675,2); break;
-              case 0x1: w(r,477,2); break;
-              case 0x2: w(r,468,2); break;
-              case 0x3: w(r,615,2); break;
-              case 0x4: w(r,471,2); break;
-              case 0x5: w(r,1596,2); break;
-              case 0x6: w(r,1594,2); break;
-              case 0x7: w(r,1592,2); break;
-              case 0x8: w(r,1590,2); break;
-              case 0x9: w(r,770,2); break;
-              case 0xa: w(r,725,2); break;
-              case 0xb: w(r,1588,2); break;
-              case 0xc: w(r,758,2); break;
-              case 0xd: w(r,1586,2); break;
-              case 0xe: w(r,1584,2); break;
-              case 0xf: w(r,1646,2); break;
-              case 0x10: w(r,1648,2); break;
-              case 0x11: w(r,1664,2); break;
-              case 0x12: w(r,1662,2); break;
-              case 0x13: w(r,1660,2); break;
-              case 0x14: w(r,1658,2); break;
-              case 0x15: w(r,1656,2); break;
-              case 0x16: w(r,1674,2); break;
-              case 0x17: w(r,1604,2); break;
-              case 0x18: w(r,1606,2); break;
-              case 0x19: w(r,1608,2); break;
-              case 0x1a: w(r,1610,2); break;
-              case 0x1b: w(r,651,2); break;
-              case 0x1c: w(r,675,2); break;
-              case 0x1d: w(r,477,2); break;
-              case 0x1e: w(r,468,2); break;
-              case 0x1f: w(r,615,2); break;
-              case 0x20: w(r,471,2); break;
-              case 0x21: w(r,1596,2); break;
-              case 0x22: w(r,1594,2); break;
-              case 0x23: w(r,1592,2); break;
-              case 0x24: w(r,1590,2); break;
-              case 0x25: w(r,770,2); break;
-              case 0x26: w(r,725,2); break;
-              case 0x27: w(r,1588,2); break;
-              case 0x28: w(r,758,2); break;
-              case 0x29: w(r,1586,2); break;
-              case 0x2a: w(r,1584,2); break;
-              case 0x2b: w(r,1646,2); break;
-              case 0x2c: w(r,1648,2); break;
-              case 0x2d: w(r,770,2); break;
-              case 0x2e: w(r,725,2); break;
-              case 0x2f: w(r,1588,2); break;
-              case 0x30: w(r,758,2); break;
-              case 0x31: w(r,1650,2); break;
-              case 0x32: w(r,1652,2); break;
-              case 0x33: w(r,857,2); break;
-              case 0x34: w(r,476,2); break;
-              case 0x35: w(r,524,2); break;
-              case 0x36: w(r,470,2); break;
-              case 0x37: w(r,770,2); break;
-              case 0x38: w(r,725,2); break;
-              case 0x39: w(r,1588,2); break;
-              case 0x3a: w(r,857,2); break;
-              case 0x3b: w(r,1464,2); break;
-              case 0x3c: w(r,4,1); break;
-              case 0x3d: w(r,4,1); break;
-              case 0x50: w(r,1025,3); break;
-              case 0x51: w(r,1019,3); break;
-              case 0x52: w(r,1019,3); break;
-              case 0x53: w(r,971,3); break;
-              case 0x54: w(r,1205,3); break;
-              case 0x55: w(r,545,3); break;
-              case 0x56: w(r,542,3); break;
-              case 0x57: w(r,539,3); break;
-              case 0x58: w(r,533,3); break;
-              case 0x59: w(r,533,3); break;
-              case 0x5a: w(r,530,3); break;
-              case 0x5b: w(r,527,3); break;
-              case 0x5c: w(r,524,3); break;
-              case 0x5d: w(r,521,3); break;
-              case 0x5e: w(r,476,3); break;
-              case 0x5f: w(r,374,3); break;
-              case 0x60: w(r,374,3); break;
-              case 0x61: w(r,377,3); break;
-              case 0x62: w(r,785,3); break;
-              case 0x63: w(r,785,3); break;
-              case 0x64: w(r,779,3); break;
-              case 0x65: w(r,779,3); break;
-              case 0x66: w(r,473,3); break;
-              case 0x67: w(r,773,3); break;
-              case 0x68: w(r,773,3); break;
-              case 0x69: w(r,770,3); break;
-              case 0x6a: w(r,764,3); break;
-              case 0x6b: w(r,764,3); break;
-              case 0x6c: w(r,758,3); break;
-              case 0x6d: w(r,758,3); break;
-              case 0x6e: w(r,752,3); break;
-              case 0x6f: w(r,746,3); break;
-              case 0x70: w(r,746,3); break;
-              case 0x71: w(r,863,3); break;
-              case 0x72: w(r,863,3); break;
-              case 0x73: w(r,860,3); break;
-              case 0x74: w(r,857,3); break;
-              case 0x75: w(r,395,3); break;
-              case 0x76: w(r,352,3); break;
-              case 0x77: w(r,352,3); break;
-              case 0x78: w(r,854,3); break;
-              case 0x79: w(r,851,3); break;
-              case 0x7a: w(r,848,3); break;
-              case 0x7b: w(r,845,3); break;
-              case 0x7c: w(r,839,3); break;
-              case 0x7d: w(r,839,3); break;
-              case 0x7e: w(r,704,3); break;
-              case 0x7f: w(r,836,3); break;
-              case 0x80: w(r,707,3); break;
-              case 0x81: w(r,833,3); break;
-              case 0x82: w(r,830,3); break;
-              case 0x83: w(r,824,3); break;
-              case 0x84: w(r,824,3); break;
-              case 0x85: w(r,818,3); break;
-              case 0x86: w(r,818,3); break;
-              case 0x87: w(r,812,3); break;
-              case 0x88: w(r,812,3); break;
-              case 0x89: w(r,534,3); break;
-              case 0x8a: w(r,354,3); break;
-              case 0x8b: w(r,674,3); break;
-              case 0x8c: w(r,671,3); break;
-              case 0x8d: w(r,660,3); break;
-              case 0x8e: w(r,668,3); break;
-              case 0x8f: w(r,665,3); break;
-              case 0x92: w(r,662,3); break;
-              case 0x93: w(r,659,3); break;
-              case 0x94: w(r,656,3); break;
-              case 0x95: w(r,653,3); break;
-              case 0x96: w(r,650,3); break;
-              case 0x97: w(r,644,3); break;
-              case 0x98: w(r,644,3); break;
-              case 0x99: w(r,641,3); break;
-              case 0x9a: w(r,638,3); break;
-              case 0x9b: w(r,635,3); break;
-              case 0x9c: w(r,629,3); break;
-              case 0x9d: w(r,629,3); break;
-              case 0x9e: w(r,626,3); break;
-              case 0x9f: w(r,623,3); break;
-              case 0xa0: w(r,620,3); break;
-              case 0xa1: w(r,617,3); break;
-              case 0xa2: w(r,614,3); break;
-              case 0xa3: w(r,611,3); break;
-              case 0xa4: w(r,743,3); break;
-              case 0xa5: w(r,740,3); break;
-              case 0xa6: w(r,737,3); break;
-              case 0xa7: w(r,734,3); break;
-              case 0xa8: w(r,731,3); break;
-              case 0xa9: w(r,728,3); break;
-              case 0xaa: w(r,725,3); break;
-              case 0xab: w(r,695,3); break;
-              case 0xac: w(r,692,3); break;
-              case 0xad: w(r,689,3); break;
-              case 0xae: w(r,686,3); break;
-              case 0xaf: w(r,683,3); break;
-              case 0xb0: w(r,680,3); break;
-              case 0xb1: w(r,630,3); break;
-              case 0xb2: w(r,698,3); break;
-              case 0xb3: w(r,701,3); break;
-              case 0xb4: w(r,704,3); break;
-              case 0xb5: w(r,707,3); break;
-              case 0xb6: w(r,710,3); break;
-              case 0xb7: w(r,713,3); break;
-              case 0xb8: w(r,677,3); break;
-              case 0xb9: w(r,716,3); break;
-              case 0xba: w(r,719,3); break;
-              case 0xbb: w(r,722,3); break;
-              case 0xbc: w(r,719,3); break;
-              case 0xbd: w(r,677,3); break;
-              case 0xbe: w(r,678,3); break;
-              case 0xbf: w(r,755,3); break;
-              case 0xc0: w(r,791,3); break;
-              case 0xc1: w(r,794,3); break;
-              case 0xc2: w(r,800,3); break;
-              case 0xc3: w(r,722,3); break;
-              case 0xc4: w(r,395,3); break;
-              case 0xc5: w(r,473,3); break;
-              case 0xc6: w(r,470,3); break;
-              case 0xc7: w(r,467,3); break;
-              case 0xf0: w(r,461,3); break;
-              case 0xf1: w(r,422,3); break;
-              case 0xf2: w(r,4,4); break;
-              case 0xf3: w(r,362,4); break;
-              case 0xf4: w(r,354,4); break;
-              case 0xf5: w(r,350,4); break;
-              case 0xf6: w(r,342,4); break;
-              case 0xf7: w(r,9,4); break;
-              case 0xf8: w(r,14,4); break;
-              case 0xf9: w(r,0,3); break;
-              case 0xfa: w(r,0,18); break;
-              case 0xfb: w(r,18,8); break;
-              case 0xfc: w(r,338,4); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0xfe00:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x10: w(r,1603,1); break;
-              case 0x11: w(r,1768,1); break;
-              case 0x12: w(r,1792,1); break;
-              case 0x13: w(r,1112,1); break;
-              case 0x14: w(r,1767,1); break;
-              case 0x15: w(r,1424,1); break;
-              case 0x16: w(r,1425,1); break;
-              case 0x17: w(r,1803,1); break;
-              case 0x18: w(r,1802,1); break;
-              case 0x19: w(r,389,3); break;
-              case 0x30: w(r,389,2); break;
-              case 0x31: w(r,1765,1); break;
-              case 0x32: w(r,1764,1); break;
-              case 0x33: w(r,1763,1); break;
-              case 0x34: w(r,1763,1); break;
-              case 0x35: w(r,26,1); break;
-              case 0x36: w(r,32,1); break;
-              case 0x37: w(r,1762,1); break;
-              case 0x38: w(r,1769,1); break;
-              case 0x39: w(r,1160,1); break;
-              case 0x3a: w(r,1162,1); break;
-              case 0x3b: w(r,1788,1); break;
-              case 0x3c: w(r,1787,1); break;
-              case 0x3d: w(r,1786,1); break;
-              case 0x3e: w(r,1785,1); break;
-              case 0x3f: w(r,1784,1); break;
-              case 0x40: w(r,1783,1); break;
-              case 0x41: w(r,1782,1); break;
-              case 0x42: w(r,1781,1); break;
-              case 0x43: w(r,1780,1); break;
-              case 0x44: w(r,1779,1); break;
-              case 0x47: w(r,1756,1); break;
-              case 0x48: w(r,1757,1); break;
-              case 0x49: w(r,3,1); break;
-              case 0x4a: w(r,3,1); break;
-              case 0x4b: w(r,3,1); break;
-              case 0x4c: w(r,3,1); break;
-              case 0x4d: w(r,1763,1); break;
-              case 0x4e: w(r,1763,1); break;
-              case 0x4f: w(r,1763,1); break;
-              case 0x50: w(r,1603,1); break;
-              case 0x51: w(r,1768,1); break;
-              case 0x52: w(r,347,1); break;
-              case 0x54: w(r,1767,1); break;
-              case 0x55: w(r,1112,1); break;
-              case 0x56: w(r,1425,1); break;
-              case 0x57: w(r,1424,1); break;
-              case 0x58: w(r,1765,1); break;
-              case 0x59: w(r,26,1); break;
-              case 0x5a: w(r,32,1); break;
-              case 0x5b: w(r,1762,1); break;
-              case 0x5c: w(r,1769,1); break;
-              case 0x5d: w(r,1160,1); break;
-              case 0x5e: w(r,1162,1); break;
-              case 0x5f: w(r,1770,1); break;
-              case 0x60: w(r,1771,1); break;
-              case 0x61: w(r,1772,1); break;
-              case 0x62: w(r,1773,1); break;
-              case 0x63: w(r,1774,1); break;
-              case 0x64: w(r,1775,1); break;
-              case 0x65: w(r,1776,1); break;
-              case 0x66: w(r,1109,1); break;
-              case 0x68: w(r,1754,1); break;
-              case 0x69: w(r,1804,1); break;
-              case 0x6a: w(r,1800,1); break;
-              case 0x6b: w(r,1766,1); break;
-              case 0x70: w(r,3,1); break;
-              case 0x71: w(r,1793,1); break;
-              case 0x72: w(r,3,1); break;
-              case 0x74: w(r,3,1); break;
-              case 0x76: w(r,3,1); break;
-              case 0x77: w(r,1793,1); break;
-              case 0x78: w(r,3,1); break;
-              case 0x79: w(r,1793,1); break;
-              case 0x7a: w(r,3,1); break;
-              case 0x7b: w(r,1793,1); break;
-              case 0x7c: w(r,3,1); break;
-              case 0x7d: w(r,1793,1); break;
-              case 0x7e: w(r,3,1); break;
-              case 0x7f: w(r,1793,1); break;
-              case 0x80: w(r,1795,1); break;
-              case 0x81: w(r,4,1); break;
-              case 0x82: w(r,4,1); break;
-              case 0x83: w(r,4,1); break;
-              case 0x84: w(r,4,1); break;
-              case 0x85: w(r,14,1); break;
-              case 0x86: w(r,14,1); break;
-              case 0x87: w(r,4,1); break;
-              case 0x88: w(r,4,1); break;
-              case 0x89: w(r,11,1); break;
-              case 0x8a: w(r,11,1); break;
-              case 0x8b: w(r,11,1); break;
-              case 0x8c: w(r,11,1); break;
-              case 0x8d: w(r,4,1); break;
-              case 0x8e: w(r,4,1); break;
-              case 0x8f: w(r,364,1); break;
-              case 0x90: w(r,364,1); break;
-              case 0x91: w(r,364,1); break;
-              case 0x92: w(r,364,1); break;
-              case 0x93: w(r,1798,1); break;
-              case 0x94: w(r,1798,1); break;
-              case 0x95: w(r,539,1); break;
-              case 0x96: w(r,539,1); break;
-              case 0x97: w(r,539,1); break;
-              case 0x98: w(r,539,1); break;
-              case 0x99: w(r,1486,1); break;
-              case 0x9a: w(r,1486,1); break;
-              case 0x9b: w(r,1486,1); break;
-              case 0x9c: w(r,1486,1); break;
-              case 0x9d: w(r,18,1); break;
-              case 0x9e: w(r,18,1); break;
-              case 0x9f: w(r,18,1); break;
-              case 0xa0: w(r,18,1); break;
-              case 0xa1: w(r,355,1); break;
-              case 0xa2: w(r,355,1); break;
-              case 0xa3: w(r,355,1); break;
-              case 0xa4: w(r,355,1); break;
-              case 0xa5: w(r,471,1); break;
-              case 0xa6: w(r,471,1); break;
-              case 0xa7: w(r,471,1); break;
-              case 0xa8: w(r,471,1); break;
-              case 0xa9: w(r,357,1); break;
-              case 0xaa: w(r,357,1); break;
-              case 0xab: w(r,1796,1); break;
-              case 0xac: w(r,1796,1); break;
-              case 0xad: w(r,338,1); break;
-              case 0xae: w(r,338,1); break;
-              case 0xaf: w(r,1523,1); break;
-              case 0xb0: w(r,1523,1); break;
-              case 0xb1: w(r,15,1); break;
-              case 0xb2: w(r,15,1); break;
-              case 0xb3: w(r,15,1); break;
-              case 0xb4: w(r,15,1); break;
-              case 0xb5: w(r,725,1); break;
-              case 0xb6: w(r,725,1); break;
-              case 0xb7: w(r,725,1); break;
-              case 0xb8: w(r,725,1); break;
-              case 0xb9: w(r,0,1); break;
-              case 0xba: w(r,0,1); break;
-              case 0xbb: w(r,0,1); break;
-              case 0xbc: w(r,0,1); break;
-              case 0xbd: w(r,695,1); break;
-              case 0xbe: w(r,695,1); break;
-              case 0xbf: w(r,695,1); break;
-              case 0xc0: w(r,695,1); break;
-              case 0xc1: w(r,857,1); break;
-              case 0xc2: w(r,857,1); break;
-              case 0xc3: w(r,857,1); break;
-              case 0xc4: w(r,857,1); break;
-              case 0xc5: w(r,1464,1); break;
-              case 0xc6: w(r,1464,1); break;
-              case 0xc7: w(r,1464,1); break;
-              case 0xc8: w(r,1464,1); break;
-              case 0xc9: w(r,9,1); break;
-              case 0xca: w(r,9,1); break;
-              case 0xcb: w(r,9,1); break;
-              case 0xcc: w(r,9,1); break;
-              case 0xcd: w(r,845,1); break;
-              case 0xce: w(r,845,1); break;
-              case 0xcf: w(r,845,1); break;
-              case 0xd0: w(r,845,1); break;
-              case 0xd1: w(r,794,1); break;
-              case 0xd2: w(r,794,1); break;
-              case 0xd3: w(r,794,1); break;
-              case 0xd4: w(r,794,1); break;
-              case 0xd5: w(r,422,1); break;
-              case 0xd6: w(r,422,1); break;
-              case 0xd7: w(r,422,1); break;
-              case 0xd8: w(r,422,1); break;
-              case 0xd9: w(r,363,1); break;
-              case 0xda: w(r,363,1); break;
-              case 0xdb: w(r,363,1); break;
-              case 0xdc: w(r,363,1); break;
-              case 0xdd: w(r,1,1); break;
-              case 0xde: w(r,1,1); break;
-              case 0xdf: w(r,1,1); break;
-              case 0xe0: w(r,1,1); break;
-              case 0xe1: w(r,17,1); break;
-              case 0xe2: w(r,17,1); break;
-              case 0xe3: w(r,17,1); break;
-              case 0xe4: w(r,17,1); break;
-              case 0xe5: w(r,467,1); break;
-              case 0xe6: w(r,467,1); break;
-              case 0xe7: w(r,467,1); break;
-              case 0xe8: w(r,467,1); break;
-              case 0xe9: w(r,7,1); break;
-              case 0xea: w(r,7,1); break;
-              case 0xeb: w(r,7,1); break;
-              case 0xec: w(r,7,1); break;
-              case 0xed: w(r,14,1); break;
-              case 0xee: w(r,14,1); break;
-              case 0xef: w(r,2,1); break;
-              case 0xf0: w(r,2,1); break;
-              case 0xf1: w(r,11,1); break;
-              case 0xf2: w(r,11,1); break;
-              case 0xf3: w(r,11,1); break;
-              case 0xf4: w(r,11,1); break;
-              case 0xf5: w(r,22,2); break;
-              case 0xf6: w(r,22,2); break;
-              case 0xf7: w(r,22,2); break;
-              case 0xf8: w(r,22,2); break;
-              case 0xf9: w(r,22,2); break;
-              case 0xfa: w(r,22,2); break;
-              case 0xfb: w(r,22,2); break;
-              case 0xfc: w(r,22,2); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0xff00:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x1: w(r,1424,1); break;
-              case 0x2: w(r,1806,1); break;
-              case 0x3: w(r,1770,1); break;
-              case 0x4: w(r,1804,1); break;
-              case 0x5: w(r,1800,1); break;
-              case 0x6: w(r,1771,1); break;
-              case 0x7: w(r,1801,1); break;
-              case 0x8: w(r,26,1); break;
-              case 0x9: w(r,32,1); break;
-              case 0xa: w(r,1772,1); break;
-              case 0xb: w(r,1773,1); break;
-              case 0xc: w(r,1603,1); break;
-              case 0xd: w(r,1774,1); break;
-              case 0xe: w(r,347,1); break;
-              case 0xf: w(r,957,1); break;
-              case 0x10: w(r,161,1); break;
-              case 0x11: w(r,158,1); break;
-              case 0x12: w(r,44,1); break;
-              case 0x13: w(r,184,1); break;
-              case 0x14: w(r,188,1); break;
-              case 0x15: w(r,192,1); break;
-              case 0x16: w(r,196,1); break;
-              case 0x17: w(r,200,1); break;
-              case 0x18: w(r,204,1); break;
-              case 0x19: w(r,208,1); break;
-              case 0x1a: w(r,1112,1); break;
-              case 0x1b: w(r,1767,1); break;
-              case 0x1c: w(r,1775,1); break;
-              case 0x1d: w(r,1109,1); break;
-              case 0x1e: w(r,1776,1); break;
-              case 0x1f: w(r,1425,1); break;
-              case 0x20: w(r,1766,1); break;
-              case 0x21: w(r,491,1); break;
-              case 0x22: w(r,912,1); break;
-              case 0x23: w(r,358,1); break;
-              case 0x24: w(r,517,1); break;
-              case 0x25: w(r,921,1); break;
-              case 0x26: w(r,924,1); break;
-              case 0x27: w(r,404,1); break;
-              case 0x28: w(r,399,1); break;
-              case 0x29: w(r,163,1); break;
-              case 0x2a: w(r,936,1); break;
-              case 0x2b: w(r,939,1); break;
-              case 0x2c: w(r,515,1); break;
-              case 0x2d: w(r,401,1); break;
-              case 0x2e: w(r,1122,1); break;
-              case 0x2f: w(r,1125,1); break;
-              case 0x30: w(r,381,1); break;
-              case 0x31: w(r,1131,1); break;
-              case 0x32: w(r,1134,1); break;
-              case 0x33: w(r,1137,1); break;
-              case 0x34: w(r,407,1); break;
-              case 0x35: w(r,1143,1); break;
-              case 0x36: w(r,162,1); break;
-              case 0x37: w(r,1149,1); break;
-              case 0x38: w(r,869,1); break;
-              case 0x39: w(r,1155,1); break;
-              case 0x3a: w(r,1158,1); break;
-              case 0x3b: w(r,1756,1); break;
-              case 0x3c: w(r,1754,1); break;
-              case 0x3d: w(r,1757,1); break;
-              case 0x3e: w(r,1755,1); break;
-              case 0x3f: w(r,1763,1); break;
-              case 0x40: w(r,1761,1); break;
-              case 0x41: w(r,40,1); break;
-              case 0x42: w(r,383,1); break;
-              case 0x43: w(r,331,1); break;
-              case 0x44: w(r,41,1); break;
-              case 0x45: w(r,518,1); break;
-              case 0x46: w(r,593,1); break;
-              case 0x47: w(r,361,1); break;
-              case 0x48: w(r,380,1); break;
-              case 0x49: w(r,167,1); break;
-              case 0x4a: w(r,1047,1); break;
-              case 0x4b: w(r,330,1); break;
-              case 0x4c: w(r,333,1); break;
-              case 0x4d: w(r,334,1); break;
-              case 0x4e: w(r,1059,1); break;
-              case 0x4f: w(r,480,1); break;
-              case 0x50: w(r,366,1); break;
-              case 0x51: w(r,1071,1); break;
-              case 0x52: w(r,39,1); break;
-              case 0x53: w(r,43,1); break;
-              case 0x54: w(r,1089,1); break;
-              case 0x55: w(r,967,1); break;
-              case 0x56: w(r,166,1); break;
-              case 0x57: w(r,1098,1); break;
-              case 0x58: w(r,872,1); break;
-              case 0x59: w(r,1104,1); break;
-              case 0x5a: w(r,400,1); break;
-              case 0x5b: w(r,1762,1); break;
-              case 0x5c: w(r,1777,1); break;
-              case 0x5d: w(r,1769,1); break;
-              case 0x5e: w(r,1789,1); break;
-              case 0x5f: w(r,1790,1); break;
-              case 0x60: w(r,1791,1); break;
-              case 0x61: w(r,1792,1); break;
-              case 0x62: w(r,1782,1); break;
-              case 0x63: w(r,1781,1); break;
-              case 0x64: w(r,1768,1); break;
-              case 0x65: w(r,1778,1); break;
-              case 0x66: w(r,1758,1); break;
-              case 0x67: w(r,57,1); break;
-              case 0x68: w(r,151,1); break;
-              case 0x69: w(r,1759,1); break;
-              case 0x6a: w(r,119,1); break;
-              case 0x6b: w(r,498,1); break;
-              case 0x6c: w(r,1760,1); break;
-              case 0x6d: w(r,247,1); break;
-              case 0x6e: w(r,104,1); break;
-              case 0x6f: w(r,59,1); break;
-              case 0x70: w(r,48,1); break;
-              case 0x71: w(r,62,1); break;
-              case 0x72: w(r,84,1); break;
-              case 0x73: w(r,497,1); break;
-              case 0x74: w(r,106,1); break;
-              case 0x75: w(r,485,1); break;
-              case 0x76: w(r,135,1); break;
-              case 0x77: w(r,45,1); break;
-              case 0x78: w(r,81,1); break;
-              case 0x79: w(r,54,1); break;
-              case 0x7a: w(r,575,1); break;
-              case 0x7b: w(r,71,1); break;
-              case 0x7c: w(r,103,1); break;
-              case 0x7d: w(r,63,1); break;
-              case 0x7e: w(r,68,1); break;
-              case 0x7f: w(r,1407,1); break;
-              case 0x80: w(r,113,1); break;
-              case 0x81: w(r,73,1); break;
-              case 0x82: w(r,454,1); break;
-              case 0x83: w(r,1456,1); break;
-              case 0x84: w(r,49,1); break;
-              case 0x85: w(r,580,1); break;
-              case 0x86: w(r,231,1); break;
-              case 0x87: w(r,1877,1); break;
-              case 0x88: w(r,257,1); break;
-              case 0x89: w(r,563,1); break;
-              case 0x8a: w(r,66,1); break;
-              case 0x8b: w(r,61,1); break;
-              case 0x8c: w(r,56,1); break;
-              case 0x8d: w(r,111,1); break;
-              case 0x8e: w(r,142,1); break;
-              case 0x8f: w(r,101,1); break;
-              case 0x90: w(r,76,1); break;
-              case 0x91: w(r,75,1); break;
-              case 0x92: w(r,47,1); break;
-              case 0x93: w(r,1879,1); break;
-              case 0x94: w(r,806,1); break;
-              case 0x95: w(r,803,1); break;
-              case 0x96: w(r,1878,1); break;
-              case 0x97: w(r,58,1); break;
-              case 0x98: w(r,77,1); break;
-              case 0x99: w(r,50,1); break;
-              case 0x9a: w(r,51,1); break;
-              case 0x9b: w(r,46,1); break;
-              case 0x9c: w(r,93,1); break;
-              case 0x9d: w(r,52,1); break;
-              case 0xa0: w(r,1869,1); break;
-              case 0xa1: w(r,124,1); break;
-              case 0xa2: w(r,1868,1); break;
-              case 0xa3: w(r,1867,1); break;
-              case 0xa4: w(r,323,1); break;
-              case 0xa5: w(r,1866,1); break;
-              case 0xa6: w(r,1865,1); break;
-              case 0xa7: w(r,319,1); break;
-              case 0xa8: w(r,1864,1); break;
-              case 0xa9: w(r,315,1); break;
-              case 0xaa: w(r,1863,1); break;
-              case 0xab: w(r,1862,1); break;
-              case 0xac: w(r,1861,1); break;
-              case 0xad: w(r,1860,1); break;
-              case 0xae: w(r,1876,1); break;
-              case 0xaf: w(r,1875,1); break;
-              case 0xb0: w(r,1874,1); break;
-              case 0xb1: w(r,311,1); break;
-              case 0xb2: w(r,307,1); break;
-              case 0xb3: w(r,1873,1); break;
-              case 0xb4: w(r,1872,1); break;
-              case 0xb5: w(r,303,1); break;
-              case 0xb6: w(r,1871,1); break;
-              case 0xb7: w(r,27,1); break;
-              case 0xb8: w(r,29,1); break;
-              case 0xb9: w(r,1870,1); break;
-              case 0xba: w(r,121,1); break;
-              case 0xbb: w(r,287,1); break;
-              case 0xbc: w(r,283,1); break;
-              case 0xbd: w(r,279,1); break;
-              case 0xbe: w(r,36,1); break;
-              case 0xc2: w(r,122,1); break;
-              case 0xc3: w(r,1901,1); break;
-              case 0xc4: w(r,1900,1); break;
-              case 0xc5: w(r,1899,1); break;
-              case 0xc6: w(r,30,1); break;
-              case 0xc7: w(r,1898,1); break;
-              case 0xca: w(r,1897,1); break;
-              case 0xcb: w(r,1896,1); break;
-              case 0xcc: w(r,28,1); break;
-              case 0xcd: w(r,1895,1); break;
-              case 0xce: w(r,1894,1); break;
-              case 0xcf: w(r,1893,1); break;
-              case 0xd2: w(r,1892,1); break;
-              case 0xd3: w(r,37,1); break;
-              case 0xd4: w(r,1891,1); break;
-              case 0xd5: w(r,1890,1); break;
-              case 0xd6: w(r,1889,1); break;
-              case 0xd7: w(r,1888,1); break;
-              case 0xda: w(r,1887,1); break;
-              case 0xdb: w(r,217,1); break;
-              case 0xdc: w(r,1917,1); break;
-              case 0xe0: w(r,1916,1); break;
-              case 0xe1: w(r,1915,1); break;
-              case 0xe2: w(r,1914,1); break;
-              case 0xe3: w(r,3,1); break;
-              case 0xe4: w(r,1913,1); break;
-              case 0xe5: w(r,1912,1); break;
-              case 0xe6: w(r,1911,1); break;
-              case 0xe8: w(r,1910,1); break;
-              case 0xe9: w(r,1909,1); break;
-              case 0xea: w(r,1908,1); break;
-              case 0xeb: w(r,1907,1); break;
-              case 0xec: w(r,1906,1); break;
-              case 0xed: w(r,1905,1); break;
-              case 0xee: w(r,1904,1); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-            default: r.push_back(c);
+          case 0xa0: w(r, 3, 1); break;
+          case 0xa8: w(r, 3, 1); break;
+          case 0xaa: w(r, 40, 1); break;
+          case 0xaf: w(r, 3, 1); break;
+          case 0xb2: w(r, 44, 1); break;
+          case 0xb3: w(r, 184, 1); break;
+          case 0xb4: w(r, 3, 1); break;
+          case 0xb5: w(r, 1244, 1); break;
+          case 0xb8: w(r, 3, 1); break;
+          case 0xb9: w(r, 158, 1); break;
+          case 0xba: w(r, 480, 1); break;
+          case 0xbc: w(r, 1085, 3); break;
+          case 0xbd: w(r, 1082, 3); break;
+          case 0xbe: w(r, 1079, 3); break;
+          case 0xc0: w(r, 491, 1); break;
+          case 0xc1: w(r, 491, 1); break;
+          case 0xc2: w(r, 491, 1); break;
+          case 0xc3: w(r, 491, 1); break;
+          case 0xc4: w(r, 491, 1); break;
+          case 0xc5: w(r, 491, 1); break;
+          case 0xc7: w(r, 358, 1); break;
+          case 0xc8: w(r, 921, 1); break;
+          case 0xc9: w(r, 921, 1); break;
+          case 0xca: w(r, 921, 1); break;
+          case 0xcb: w(r, 921, 1); break;
+          case 0xcc: w(r, 163, 1); break;
+          case 0xcd: w(r, 163, 1); break;
+          case 0xce: w(r, 163, 1); break;
+          case 0xcf: w(r, 163, 1); break;
+          case 0xd1: w(r, 1122, 1); break;
+          case 0xd2: w(r, 1125, 1); break;
+          case 0xd3: w(r, 1125, 1); break;
+          case 0xd4: w(r, 1125, 1); break;
+          case 0xd5: w(r, 1125, 1); break;
+          case 0xd6: w(r, 1125, 1); break;
+          case 0xd9: w(r, 1143, 1); break;
+          case 0xda: w(r, 1143, 1); break;
+          case 0xdb: w(r, 1143, 1); break;
+          case 0xdc: w(r, 1143, 1); break;
+          case 0xdd: w(r, 1155, 1); break;
+          case 0xe0: w(r, 40, 1); break;
+          case 0xe1: w(r, 40, 1); break;
+          case 0xe2: w(r, 40, 1); break;
+          case 0xe3: w(r, 40, 1); break;
+          case 0xe4: w(r, 40, 1); break;
+          case 0xe5: w(r, 40, 1); break;
+          case 0xe7: w(r, 331, 1); break;
+          case 0xe8: w(r, 518, 1); break;
+          case 0xe9: w(r, 518, 1); break;
+          case 0xea: w(r, 518, 1); break;
+          case 0xeb: w(r, 518, 1); break;
+          case 0xec: w(r, 167, 1); break;
+          case 0xed: w(r, 167, 1); break;
+          case 0xee: w(r, 167, 1); break;
+          case 0xef: w(r, 167, 1); break;
+          case 0xf1: w(r, 1059, 1); break;
+          case 0xf2: w(r, 480, 1); break;
+          case 0xf3: w(r, 480, 1); break;
+          case 0xf4: w(r, 480, 1); break;
+          case 0xf5: w(r, 480, 1); break;
+          case 0xf6: w(r, 480, 1); break;
+          case 0xf9: w(r, 967, 1); break;
+          case 0xfa: w(r, 967, 1); break;
+          case 0xfb: w(r, 967, 1); break;
+          case 0xfc: w(r, 967, 1); break;
+          case 0xfd: w(r, 1104, 1); break;
+          case 0xff: w(r, 1104, 1); break;
+          default: r.push_back(c);
           }
         }
         break;
-        case 0x10000:
+        case 0x100:
         {
-          switch (static_cast<uint16_t>(c & 0x0000ff00))
+          switch (static_cast<uint8_t>(c & 0xff))
           {
-          case 0x1000:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x9a: w(r,1903,1); break;
-              case 0x9c: w(r,1902,1); break;
-              case 0xab: w(r,1886,1); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0xd100:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x5e: w(r,1885,1); break;
-              case 0x5f: w(r,1883,1); break;
-              case 0x60: w(r,1883,1); break;
-              case 0x61: w(r,1883,1); break;
-              case 0x62: w(r,1883,1); break;
-              case 0x63: w(r,1883,1); break;
-              case 0x64: w(r,1883,1); break;
-              case 0xbb: w(r,1881,1); break;
-              case 0xbc: w(r,1880,1); break;
-              case 0xbd: w(r,1881,1); break;
-              case 0xbe: w(r,1880,1); break;
-              case 0xbf: w(r,1881,1); break;
-              case 0xc0: w(r,1880,1); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0xd400:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x0: w(r,491,1); break;
-              case 0x1: w(r,912,1); break;
-              case 0x2: w(r,358,1); break;
-              case 0x3: w(r,517,1); break;
-              case 0x4: w(r,921,1); break;
-              case 0x5: w(r,924,1); break;
-              case 0x6: w(r,404,1); break;
-              case 0x7: w(r,399,1); break;
-              case 0x8: w(r,163,1); break;
-              case 0x9: w(r,936,1); break;
-              case 0xa: w(r,939,1); break;
-              case 0xb: w(r,515,1); break;
-              case 0xc: w(r,401,1); break;
-              case 0xd: w(r,1122,1); break;
-              case 0xe: w(r,1125,1); break;
-              case 0xf: w(r,381,1); break;
-              case 0x10: w(r,1131,1); break;
-              case 0x11: w(r,1134,1); break;
-              case 0x12: w(r,1137,1); break;
-              case 0x13: w(r,407,1); break;
-              case 0x14: w(r,1143,1); break;
-              case 0x15: w(r,162,1); break;
-              case 0x16: w(r,1149,1); break;
-              case 0x17: w(r,869,1); break;
-              case 0x18: w(r,1155,1); break;
-              case 0x19: w(r,1158,1); break;
-              case 0x1a: w(r,40,1); break;
-              case 0x1b: w(r,383,1); break;
-              case 0x1c: w(r,331,1); break;
-              case 0x1d: w(r,41,1); break;
-              case 0x1e: w(r,518,1); break;
-              case 0x1f: w(r,593,1); break;
-              case 0x20: w(r,361,1); break;
-              case 0x21: w(r,380,1); break;
-              case 0x22: w(r,167,1); break;
-              case 0x23: w(r,1047,1); break;
-              case 0x24: w(r,330,1); break;
-              case 0x25: w(r,333,1); break;
-              case 0x26: w(r,334,1); break;
-              case 0x27: w(r,1059,1); break;
-              case 0x28: w(r,480,1); break;
-              case 0x29: w(r,366,1); break;
-              case 0x2a: w(r,1071,1); break;
-              case 0x2b: w(r,39,1); break;
-              case 0x2c: w(r,43,1); break;
-              case 0x2d: w(r,1089,1); break;
-              case 0x2e: w(r,967,1); break;
-              case 0x2f: w(r,166,1); break;
-              case 0x30: w(r,1098,1); break;
-              case 0x31: w(r,872,1); break;
-              case 0x32: w(r,1104,1); break;
-              case 0x33: w(r,400,1); break;
-              case 0x34: w(r,491,1); break;
-              case 0x35: w(r,912,1); break;
-              case 0x36: w(r,358,1); break;
-              case 0x37: w(r,517,1); break;
-              case 0x38: w(r,921,1); break;
-              case 0x39: w(r,924,1); break;
-              case 0x3a: w(r,404,1); break;
-              case 0x3b: w(r,399,1); break;
-              case 0x3c: w(r,163,1); break;
-              case 0x3d: w(r,936,1); break;
-              case 0x3e: w(r,939,1); break;
-              case 0x3f: w(r,515,1); break;
-              case 0x40: w(r,401,1); break;
-              case 0x41: w(r,1122,1); break;
-              case 0x42: w(r,1125,1); break;
-              case 0x43: w(r,381,1); break;
-              case 0x44: w(r,1131,1); break;
-              case 0x45: w(r,1134,1); break;
-              case 0x46: w(r,1137,1); break;
-              case 0x47: w(r,407,1); break;
-              case 0x48: w(r,1143,1); break;
-              case 0x49: w(r,162,1); break;
-              case 0x4a: w(r,1149,1); break;
-              case 0x4b: w(r,869,1); break;
-              case 0x4c: w(r,1155,1); break;
-              case 0x4d: w(r,1158,1); break;
-              case 0x4e: w(r,40,1); break;
-              case 0x4f: w(r,383,1); break;
-              case 0x50: w(r,331,1); break;
-              case 0x51: w(r,41,1); break;
-              case 0x52: w(r,518,1); break;
-              case 0x53: w(r,593,1); break;
-              case 0x54: w(r,361,1); break;
-              case 0x56: w(r,167,1); break;
-              case 0x57: w(r,1047,1); break;
-              case 0x58: w(r,330,1); break;
-              case 0x59: w(r,333,1); break;
-              case 0x5a: w(r,334,1); break;
-              case 0x5b: w(r,1059,1); break;
-              case 0x5c: w(r,480,1); break;
-              case 0x5d: w(r,366,1); break;
-              case 0x5e: w(r,1071,1); break;
-              case 0x5f: w(r,39,1); break;
-              case 0x60: w(r,43,1); break;
-              case 0x61: w(r,1089,1); break;
-              case 0x62: w(r,967,1); break;
-              case 0x63: w(r,166,1); break;
-              case 0x64: w(r,1098,1); break;
-              case 0x65: w(r,872,1); break;
-              case 0x66: w(r,1104,1); break;
-              case 0x67: w(r,400,1); break;
-              case 0x68: w(r,491,1); break;
-              case 0x69: w(r,912,1); break;
-              case 0x6a: w(r,358,1); break;
-              case 0x6b: w(r,517,1); break;
-              case 0x6c: w(r,921,1); break;
-              case 0x6d: w(r,924,1); break;
-              case 0x6e: w(r,404,1); break;
-              case 0x6f: w(r,399,1); break;
-              case 0x70: w(r,163,1); break;
-              case 0x71: w(r,936,1); break;
-              case 0x72: w(r,939,1); break;
-              case 0x73: w(r,515,1); break;
-              case 0x74: w(r,401,1); break;
-              case 0x75: w(r,1122,1); break;
-              case 0x76: w(r,1125,1); break;
-              case 0x77: w(r,381,1); break;
-              case 0x78: w(r,1131,1); break;
-              case 0x79: w(r,1134,1); break;
-              case 0x7a: w(r,1137,1); break;
-              case 0x7b: w(r,407,1); break;
-              case 0x7c: w(r,1143,1); break;
-              case 0x7d: w(r,162,1); break;
-              case 0x7e: w(r,1149,1); break;
-              case 0x7f: w(r,869,1); break;
-              case 0x80: w(r,1155,1); break;
-              case 0x81: w(r,1158,1); break;
-              case 0x82: w(r,40,1); break;
-              case 0x83: w(r,383,1); break;
-              case 0x84: w(r,331,1); break;
-              case 0x85: w(r,41,1); break;
-              case 0x86: w(r,518,1); break;
-              case 0x87: w(r,593,1); break;
-              case 0x88: w(r,361,1); break;
-              case 0x89: w(r,380,1); break;
-              case 0x8a: w(r,167,1); break;
-              case 0x8b: w(r,1047,1); break;
-              case 0x8c: w(r,330,1); break;
-              case 0x8d: w(r,333,1); break;
-              case 0x8e: w(r,334,1); break;
-              case 0x8f: w(r,1059,1); break;
-              case 0x90: w(r,480,1); break;
-              case 0x91: w(r,366,1); break;
-              case 0x92: w(r,1071,1); break;
-              case 0x93: w(r,39,1); break;
-              case 0x94: w(r,43,1); break;
-              case 0x95: w(r,1089,1); break;
-              case 0x96: w(r,967,1); break;
-              case 0x97: w(r,166,1); break;
-              case 0x98: w(r,1098,1); break;
-              case 0x99: w(r,872,1); break;
-              case 0x9a: w(r,1104,1); break;
-              case 0x9b: w(r,400,1); break;
-              case 0x9c: w(r,491,1); break;
-              case 0x9e: w(r,358,1); break;
-              case 0x9f: w(r,517,1); break;
-              case 0xa2: w(r,404,1); break;
-              case 0xa5: w(r,936,1); break;
-              case 0xa6: w(r,939,1); break;
-              case 0xa9: w(r,1122,1); break;
-              case 0xaa: w(r,1125,1); break;
-              case 0xab: w(r,381,1); break;
-              case 0xac: w(r,1131,1); break;
-              case 0xae: w(r,1137,1); break;
-              case 0xaf: w(r,407,1); break;
-              case 0xb0: w(r,1143,1); break;
-              case 0xb1: w(r,162,1); break;
-              case 0xb2: w(r,1149,1); break;
-              case 0xb3: w(r,869,1); break;
-              case 0xb4: w(r,1155,1); break;
-              case 0xb5: w(r,1158,1); break;
-              case 0xb6: w(r,40,1); break;
-              case 0xb7: w(r,383,1); break;
-              case 0xb8: w(r,331,1); break;
-              case 0xb9: w(r,41,1); break;
-              case 0xbb: w(r,593,1); break;
-              case 0xbd: w(r,380,1); break;
-              case 0xbe: w(r,167,1); break;
-              case 0xbf: w(r,1047,1); break;
-              case 0xc0: w(r,330,1); break;
-              case 0xc1: w(r,333,1); break;
-              case 0xc2: w(r,334,1); break;
-              case 0xc3: w(r,1059,1); break;
-              case 0xc5: w(r,366,1); break;
-              case 0xc6: w(r,1071,1); break;
-              case 0xc7: w(r,39,1); break;
-              case 0xc8: w(r,43,1); break;
-              case 0xc9: w(r,1089,1); break;
-              case 0xca: w(r,967,1); break;
-              case 0xcb: w(r,166,1); break;
-              case 0xcc: w(r,1098,1); break;
-              case 0xcd: w(r,872,1); break;
-              case 0xce: w(r,1104,1); break;
-              case 0xcf: w(r,400,1); break;
-              case 0xd0: w(r,491,1); break;
-              case 0xd1: w(r,912,1); break;
-              case 0xd2: w(r,358,1); break;
-              case 0xd3: w(r,517,1); break;
-              case 0xd4: w(r,921,1); break;
-              case 0xd5: w(r,924,1); break;
-              case 0xd6: w(r,404,1); break;
-              case 0xd7: w(r,399,1); break;
-              case 0xd8: w(r,163,1); break;
-              case 0xd9: w(r,936,1); break;
-              case 0xda: w(r,939,1); break;
-              case 0xdb: w(r,515,1); break;
-              case 0xdc: w(r,401,1); break;
-              case 0xdd: w(r,1122,1); break;
-              case 0xde: w(r,1125,1); break;
-              case 0xdf: w(r,381,1); break;
-              case 0xe0: w(r,1131,1); break;
-              case 0xe1: w(r,1134,1); break;
-              case 0xe2: w(r,1137,1); break;
-              case 0xe3: w(r,407,1); break;
-              case 0xe4: w(r,1143,1); break;
-              case 0xe5: w(r,162,1); break;
-              case 0xe6: w(r,1149,1); break;
-              case 0xe7: w(r,869,1); break;
-              case 0xe8: w(r,1155,1); break;
-              case 0xe9: w(r,1158,1); break;
-              case 0xea: w(r,40,1); break;
-              case 0xeb: w(r,383,1); break;
-              case 0xec: w(r,331,1); break;
-              case 0xed: w(r,41,1); break;
-              case 0xee: w(r,518,1); break;
-              case 0xef: w(r,593,1); break;
-              case 0xf0: w(r,361,1); break;
-              case 0xf1: w(r,380,1); break;
-              case 0xf2: w(r,167,1); break;
-              case 0xf3: w(r,1047,1); break;
-              case 0xf4: w(r,330,1); break;
-              case 0xf5: w(r,333,1); break;
-              case 0xf6: w(r,334,1); break;
-              case 0xf7: w(r,1059,1); break;
-              case 0xf8: w(r,480,1); break;
-              case 0xf9: w(r,366,1); break;
-              case 0xfa: w(r,1071,1); break;
-              case 0xfb: w(r,39,1); break;
-              case 0xfc: w(r,43,1); break;
-              case 0xfd: w(r,1089,1); break;
-              case 0xfe: w(r,967,1); break;
-              case 0xff: w(r,166,1); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0xd500:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x0: w(r,1098,1); break;
-              case 0x1: w(r,872,1); break;
-              case 0x2: w(r,1104,1); break;
-              case 0x3: w(r,400,1); break;
-              case 0x4: w(r,491,1); break;
-              case 0x5: w(r,912,1); break;
-              case 0x7: w(r,517,1); break;
-              case 0x8: w(r,921,1); break;
-              case 0x9: w(r,924,1); break;
-              case 0xa: w(r,404,1); break;
-              case 0xd: w(r,936,1); break;
-              case 0xe: w(r,939,1); break;
-              case 0xf: w(r,515,1); break;
-              case 0x10: w(r,401,1); break;
-              case 0x11: w(r,1122,1); break;
-              case 0x12: w(r,1125,1); break;
-              case 0x13: w(r,381,1); break;
-              case 0x14: w(r,1131,1); break;
-              case 0x16: w(r,1137,1); break;
-              case 0x17: w(r,407,1); break;
-              case 0x18: w(r,1143,1); break;
-              case 0x19: w(r,162,1); break;
-              case 0x1a: w(r,1149,1); break;
-              case 0x1b: w(r,869,1); break;
-              case 0x1c: w(r,1155,1); break;
-              case 0x1e: w(r,40,1); break;
-              case 0x1f: w(r,383,1); break;
-              case 0x20: w(r,331,1); break;
-              case 0x21: w(r,41,1); break;
-              case 0x22: w(r,518,1); break;
-              case 0x23: w(r,593,1); break;
-              case 0x24: w(r,361,1); break;
-              case 0x25: w(r,380,1); break;
-              case 0x26: w(r,167,1); break;
-              case 0x27: w(r,1047,1); break;
-              case 0x28: w(r,330,1); break;
-              case 0x29: w(r,333,1); break;
-              case 0x2a: w(r,334,1); break;
-              case 0x2b: w(r,1059,1); break;
-              case 0x2c: w(r,480,1); break;
-              case 0x2d: w(r,366,1); break;
-              case 0x2e: w(r,1071,1); break;
-              case 0x2f: w(r,39,1); break;
-              case 0x30: w(r,43,1); break;
-              case 0x31: w(r,1089,1); break;
-              case 0x32: w(r,967,1); break;
-              case 0x33: w(r,166,1); break;
-              case 0x34: w(r,1098,1); break;
-              case 0x35: w(r,872,1); break;
-              case 0x36: w(r,1104,1); break;
-              case 0x37: w(r,400,1); break;
-              case 0x38: w(r,491,1); break;
-              case 0x39: w(r,912,1); break;
-              case 0x3b: w(r,517,1); break;
-              case 0x3c: w(r,921,1); break;
-              case 0x3d: w(r,924,1); break;
-              case 0x3e: w(r,404,1); break;
-              case 0x40: w(r,163,1); break;
-              case 0x41: w(r,936,1); break;
-              case 0x42: w(r,939,1); break;
-              case 0x43: w(r,515,1); break;
-              case 0x44: w(r,401,1); break;
-              case 0x46: w(r,1125,1); break;
-              case 0x4a: w(r,1137,1); break;
-              case 0x4b: w(r,407,1); break;
-              case 0x4c: w(r,1143,1); break;
-              case 0x4d: w(r,162,1); break;
-              case 0x4e: w(r,1149,1); break;
-              case 0x4f: w(r,869,1); break;
-              case 0x50: w(r,1155,1); break;
-              case 0x52: w(r,40,1); break;
-              case 0x53: w(r,383,1); break;
-              case 0x54: w(r,331,1); break;
-              case 0x55: w(r,41,1); break;
-              case 0x56: w(r,518,1); break;
-              case 0x57: w(r,593,1); break;
-              case 0x58: w(r,361,1); break;
-              case 0x59: w(r,380,1); break;
-              case 0x5a: w(r,167,1); break;
-              case 0x5b: w(r,1047,1); break;
-              case 0x5c: w(r,330,1); break;
-              case 0x5d: w(r,333,1); break;
-              case 0x5e: w(r,334,1); break;
-              case 0x5f: w(r,1059,1); break;
-              case 0x60: w(r,480,1); break;
-              case 0x61: w(r,366,1); break;
-              case 0x62: w(r,1071,1); break;
-              case 0x63: w(r,39,1); break;
-              case 0x64: w(r,43,1); break;
-              case 0x65: w(r,1089,1); break;
-              case 0x66: w(r,967,1); break;
-              case 0x67: w(r,166,1); break;
-              case 0x68: w(r,1098,1); break;
-              case 0x69: w(r,872,1); break;
-              case 0x6a: w(r,1104,1); break;
-              case 0x6b: w(r,400,1); break;
-              case 0x6c: w(r,491,1); break;
-              case 0x6d: w(r,912,1); break;
-              case 0x6e: w(r,358,1); break;
-              case 0x6f: w(r,517,1); break;
-              case 0x70: w(r,921,1); break;
-              case 0x71: w(r,924,1); break;
-              case 0x72: w(r,404,1); break;
-              case 0x73: w(r,399,1); break;
-              case 0x74: w(r,163,1); break;
-              case 0x75: w(r,936,1); break;
-              case 0x76: w(r,939,1); break;
-              case 0x77: w(r,515,1); break;
-              case 0x78: w(r,401,1); break;
-              case 0x79: w(r,1122,1); break;
-              case 0x7a: w(r,1125,1); break;
-              case 0x7b: w(r,381,1); break;
-              case 0x7c: w(r,1131,1); break;
-              case 0x7d: w(r,1134,1); break;
-              case 0x7e: w(r,1137,1); break;
-              case 0x7f: w(r,407,1); break;
-              case 0x80: w(r,1143,1); break;
-              case 0x81: w(r,162,1); break;
-              case 0x82: w(r,1149,1); break;
-              case 0x83: w(r,869,1); break;
-              case 0x84: w(r,1155,1); break;
-              case 0x85: w(r,1158,1); break;
-              case 0x86: w(r,40,1); break;
-              case 0x87: w(r,383,1); break;
-              case 0x88: w(r,331,1); break;
-              case 0x89: w(r,41,1); break;
-              case 0x8a: w(r,518,1); break;
-              case 0x8b: w(r,593,1); break;
-              case 0x8c: w(r,361,1); break;
-              case 0x8d: w(r,380,1); break;
-              case 0x8e: w(r,167,1); break;
-              case 0x8f: w(r,1047,1); break;
-              case 0x90: w(r,330,1); break;
-              case 0x91: w(r,333,1); break;
-              case 0x92: w(r,334,1); break;
-              case 0x93: w(r,1059,1); break;
-              case 0x94: w(r,480,1); break;
-              case 0x95: w(r,366,1); break;
-              case 0x96: w(r,1071,1); break;
-              case 0x97: w(r,39,1); break;
-              case 0x98: w(r,43,1); break;
-              case 0x99: w(r,1089,1); break;
-              case 0x9a: w(r,967,1); break;
-              case 0x9b: w(r,166,1); break;
-              case 0x9c: w(r,1098,1); break;
-              case 0x9d: w(r,872,1); break;
-              case 0x9e: w(r,1104,1); break;
-              case 0x9f: w(r,400,1); break;
-              case 0xa0: w(r,491,1); break;
-              case 0xa1: w(r,912,1); break;
-              case 0xa2: w(r,358,1); break;
-              case 0xa3: w(r,517,1); break;
-              case 0xa4: w(r,921,1); break;
-              case 0xa5: w(r,924,1); break;
-              case 0xa6: w(r,404,1); break;
-              case 0xa7: w(r,399,1); break;
-              case 0xa8: w(r,163,1); break;
-              case 0xa9: w(r,936,1); break;
-              case 0xaa: w(r,939,1); break;
-              case 0xab: w(r,515,1); break;
-              case 0xac: w(r,401,1); break;
-              case 0xad: w(r,1122,1); break;
-              case 0xae: w(r,1125,1); break;
-              case 0xaf: w(r,381,1); break;
-              case 0xb0: w(r,1131,1); break;
-              case 0xb1: w(r,1134,1); break;
-              case 0xb2: w(r,1137,1); break;
-              case 0xb3: w(r,407,1); break;
-              case 0xb4: w(r,1143,1); break;
-              case 0xb5: w(r,162,1); break;
-              case 0xb6: w(r,1149,1); break;
-              case 0xb7: w(r,869,1); break;
-              case 0xb8: w(r,1155,1); break;
-              case 0xb9: w(r,1158,1); break;
-              case 0xba: w(r,40,1); break;
-              case 0xbb: w(r,383,1); break;
-              case 0xbc: w(r,331,1); break;
-              case 0xbd: w(r,41,1); break;
-              case 0xbe: w(r,518,1); break;
-              case 0xbf: w(r,593,1); break;
-              case 0xc0: w(r,361,1); break;
-              case 0xc1: w(r,380,1); break;
-              case 0xc2: w(r,167,1); break;
-              case 0xc3: w(r,1047,1); break;
-              case 0xc4: w(r,330,1); break;
-              case 0xc5: w(r,333,1); break;
-              case 0xc6: w(r,334,1); break;
-              case 0xc7: w(r,1059,1); break;
-              case 0xc8: w(r,480,1); break;
-              case 0xc9: w(r,366,1); break;
-              case 0xca: w(r,1071,1); break;
-              case 0xcb: w(r,39,1); break;
-              case 0xcc: w(r,43,1); break;
-              case 0xcd: w(r,1089,1); break;
-              case 0xce: w(r,967,1); break;
-              case 0xcf: w(r,166,1); break;
-              case 0xd0: w(r,1098,1); break;
-              case 0xd1: w(r,872,1); break;
-              case 0xd2: w(r,1104,1); break;
-              case 0xd3: w(r,400,1); break;
-              case 0xd4: w(r,491,1); break;
-              case 0xd5: w(r,912,1); break;
-              case 0xd6: w(r,358,1); break;
-              case 0xd7: w(r,517,1); break;
-              case 0xd8: w(r,921,1); break;
-              case 0xd9: w(r,924,1); break;
-              case 0xda: w(r,404,1); break;
-              case 0xdb: w(r,399,1); break;
-              case 0xdc: w(r,163,1); break;
-              case 0xdd: w(r,936,1); break;
-              case 0xde: w(r,939,1); break;
-              case 0xdf: w(r,515,1); break;
-              case 0xe0: w(r,401,1); break;
-              case 0xe1: w(r,1122,1); break;
-              case 0xe2: w(r,1125,1); break;
-              case 0xe3: w(r,381,1); break;
-              case 0xe4: w(r,1131,1); break;
-              case 0xe5: w(r,1134,1); break;
-              case 0xe6: w(r,1137,1); break;
-              case 0xe7: w(r,407,1); break;
-              case 0xe8: w(r,1143,1); break;
-              case 0xe9: w(r,162,1); break;
-              case 0xea: w(r,1149,1); break;
-              case 0xeb: w(r,869,1); break;
-              case 0xec: w(r,1155,1); break;
-              case 0xed: w(r,1158,1); break;
-              case 0xee: w(r,40,1); break;
-              case 0xef: w(r,383,1); break;
-              case 0xf0: w(r,331,1); break;
-              case 0xf1: w(r,41,1); break;
-              case 0xf2: w(r,518,1); break;
-              case 0xf3: w(r,593,1); break;
-              case 0xf4: w(r,361,1); break;
-              case 0xf5: w(r,380,1); break;
-              case 0xf6: w(r,167,1); break;
-              case 0xf7: w(r,1047,1); break;
-              case 0xf8: w(r,330,1); break;
-              case 0xf9: w(r,333,1); break;
-              case 0xfa: w(r,334,1); break;
-              case 0xfb: w(r,1059,1); break;
-              case 0xfc: w(r,480,1); break;
-              case 0xfd: w(r,366,1); break;
-              case 0xfe: w(r,1071,1); break;
-              case 0xff: w(r,39,1); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0xd600:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x0: w(r,43,1); break;
-              case 0x1: w(r,1089,1); break;
-              case 0x2: w(r,967,1); break;
-              case 0x3: w(r,166,1); break;
-              case 0x4: w(r,1098,1); break;
-              case 0x5: w(r,872,1); break;
-              case 0x6: w(r,1104,1); break;
-              case 0x7: w(r,400,1); break;
-              case 0x8: w(r,491,1); break;
-              case 0x9: w(r,912,1); break;
-              case 0xa: w(r,358,1); break;
-              case 0xb: w(r,517,1); break;
-              case 0xc: w(r,921,1); break;
-              case 0xd: w(r,924,1); break;
-              case 0xe: w(r,404,1); break;
-              case 0xf: w(r,399,1); break;
-              case 0x10: w(r,163,1); break;
-              case 0x11: w(r,936,1); break;
-              case 0x12: w(r,939,1); break;
-              case 0x13: w(r,515,1); break;
-              case 0x14: w(r,401,1); break;
-              case 0x15: w(r,1122,1); break;
-              case 0x16: w(r,1125,1); break;
-              case 0x17: w(r,381,1); break;
-              case 0x18: w(r,1131,1); break;
-              case 0x19: w(r,1134,1); break;
-              case 0x1a: w(r,1137,1); break;
-              case 0x1b: w(r,407,1); break;
-              case 0x1c: w(r,1143,1); break;
-              case 0x1d: w(r,162,1); break;
-              case 0x1e: w(r,1149,1); break;
-              case 0x1f: w(r,869,1); break;
-              case 0x20: w(r,1155,1); break;
-              case 0x21: w(r,1158,1); break;
-              case 0x22: w(r,40,1); break;
-              case 0x23: w(r,383,1); break;
-              case 0x24: w(r,331,1); break;
-              case 0x25: w(r,41,1); break;
-              case 0x26: w(r,518,1); break;
-              case 0x27: w(r,593,1); break;
-              case 0x28: w(r,361,1); break;
-              case 0x29: w(r,380,1); break;
-              case 0x2a: w(r,167,1); break;
-              case 0x2b: w(r,1047,1); break;
-              case 0x2c: w(r,330,1); break;
-              case 0x2d: w(r,333,1); break;
-              case 0x2e: w(r,334,1); break;
-              case 0x2f: w(r,1059,1); break;
-              case 0x30: w(r,480,1); break;
-              case 0x31: w(r,366,1); break;
-              case 0x32: w(r,1071,1); break;
-              case 0x33: w(r,39,1); break;
-              case 0x34: w(r,43,1); break;
-              case 0x35: w(r,1089,1); break;
-              case 0x36: w(r,967,1); break;
-              case 0x37: w(r,166,1); break;
-              case 0x38: w(r,1098,1); break;
-              case 0x39: w(r,872,1); break;
-              case 0x3a: w(r,1104,1); break;
-              case 0x3b: w(r,400,1); break;
-              case 0x3c: w(r,491,1); break;
-              case 0x3d: w(r,912,1); break;
-              case 0x3e: w(r,358,1); break;
-              case 0x3f: w(r,517,1); break;
-              case 0x40: w(r,921,1); break;
-              case 0x41: w(r,924,1); break;
-              case 0x42: w(r,404,1); break;
-              case 0x43: w(r,399,1); break;
-              case 0x44: w(r,163,1); break;
-              case 0x45: w(r,936,1); break;
-              case 0x46: w(r,939,1); break;
-              case 0x47: w(r,515,1); break;
-              case 0x48: w(r,401,1); break;
-              case 0x49: w(r,1122,1); break;
-              case 0x4a: w(r,1125,1); break;
-              case 0x4b: w(r,381,1); break;
-              case 0x4c: w(r,1131,1); break;
-              case 0x4d: w(r,1134,1); break;
-              case 0x4e: w(r,1137,1); break;
-              case 0x4f: w(r,407,1); break;
-              case 0x50: w(r,1143,1); break;
-              case 0x51: w(r,162,1); break;
-              case 0x52: w(r,1149,1); break;
-              case 0x53: w(r,869,1); break;
-              case 0x54: w(r,1155,1); break;
-              case 0x55: w(r,1158,1); break;
-              case 0x56: w(r,40,1); break;
-              case 0x57: w(r,383,1); break;
-              case 0x58: w(r,331,1); break;
-              case 0x59: w(r,41,1); break;
-              case 0x5a: w(r,518,1); break;
-              case 0x5b: w(r,593,1); break;
-              case 0x5c: w(r,361,1); break;
-              case 0x5d: w(r,380,1); break;
-              case 0x5e: w(r,167,1); break;
-              case 0x5f: w(r,1047,1); break;
-              case 0x60: w(r,330,1); break;
-              case 0x61: w(r,333,1); break;
-              case 0x62: w(r,334,1); break;
-              case 0x63: w(r,1059,1); break;
-              case 0x64: w(r,480,1); break;
-              case 0x65: w(r,366,1); break;
-              case 0x66: w(r,1071,1); break;
-              case 0x67: w(r,39,1); break;
-              case 0x68: w(r,43,1); break;
-              case 0x69: w(r,1089,1); break;
-              case 0x6a: w(r,967,1); break;
-              case 0x6b: w(r,166,1); break;
-              case 0x6c: w(r,1098,1); break;
-              case 0x6d: w(r,872,1); break;
-              case 0x6e: w(r,1104,1); break;
-              case 0x6f: w(r,400,1); break;
-              case 0x70: w(r,491,1); break;
-              case 0x71: w(r,912,1); break;
-              case 0x72: w(r,358,1); break;
-              case 0x73: w(r,517,1); break;
-              case 0x74: w(r,921,1); break;
-              case 0x75: w(r,924,1); break;
-              case 0x76: w(r,404,1); break;
-              case 0x77: w(r,399,1); break;
-              case 0x78: w(r,163,1); break;
-              case 0x79: w(r,936,1); break;
-              case 0x7a: w(r,939,1); break;
-              case 0x7b: w(r,515,1); break;
-              case 0x7c: w(r,401,1); break;
-              case 0x7d: w(r,1122,1); break;
-              case 0x7e: w(r,1125,1); break;
-              case 0x7f: w(r,381,1); break;
-              case 0x80: w(r,1131,1); break;
-              case 0x81: w(r,1134,1); break;
-              case 0x82: w(r,1137,1); break;
-              case 0x83: w(r,407,1); break;
-              case 0x84: w(r,1143,1); break;
-              case 0x85: w(r,162,1); break;
-              case 0x86: w(r,1149,1); break;
-              case 0x87: w(r,869,1); break;
-              case 0x88: w(r,1155,1); break;
-              case 0x89: w(r,1158,1); break;
-              case 0x8a: w(r,40,1); break;
-              case 0x8b: w(r,383,1); break;
-              case 0x8c: w(r,331,1); break;
-              case 0x8d: w(r,41,1); break;
-              case 0x8e: w(r,518,1); break;
-              case 0x8f: w(r,593,1); break;
-              case 0x90: w(r,361,1); break;
-              case 0x91: w(r,380,1); break;
-              case 0x92: w(r,167,1); break;
-              case 0x93: w(r,1047,1); break;
-              case 0x94: w(r,330,1); break;
-              case 0x95: w(r,333,1); break;
-              case 0x96: w(r,334,1); break;
-              case 0x97: w(r,1059,1); break;
-              case 0x98: w(r,480,1); break;
-              case 0x99: w(r,366,1); break;
-              case 0x9a: w(r,1071,1); break;
-              case 0x9b: w(r,39,1); break;
-              case 0x9c: w(r,43,1); break;
-              case 0x9d: w(r,1089,1); break;
-              case 0x9e: w(r,967,1); break;
-              case 0x9f: w(r,166,1); break;
-              case 0xa0: w(r,1098,1); break;
-              case 0xa1: w(r,872,1); break;
-              case 0xa2: w(r,1104,1); break;
-              case 0xa3: w(r,400,1); break;
-              case 0xa4: w(r,1822,1); break;
-              case 0xa5: w(r,1821,1); break;
-              case 0xa8: w(r,1820,1); break;
-              case 0xa9: w(r,1819,1); break;
-              case 0xaa: w(r,1818,1); break;
-              case 0xab: w(r,1817,1); break;
-              case 0xac: w(r,1816,1); break;
-              case 0xad: w(r,1815,1); break;
-              case 0xae: w(r,1814,1); break;
-              case 0xaf: w(r,1813,1); break;
-              case 0xb0: w(r,1812,1); break;
-              case 0xb1: w(r,1811,1); break;
-              case 0xb2: w(r,1810,1); break;
-              case 0xb3: w(r,1809,1); break;
-              case 0xb4: w(r,1808,1); break;
-              case 0xb5: w(r,1807,1); break;
-              case 0xb6: w(r,1842,1); break;
-              case 0xb7: w(r,1841,1); break;
-              case 0xb8: w(r,1840,1); break;
-              case 0xb9: w(r,1813,1); break;
-              case 0xba: w(r,1839,1); break;
-              case 0xbb: w(r,1838,1); break;
-              case 0xbc: w(r,1837,1); break;
-              case 0xbd: w(r,1836,1); break;
-              case 0xbe: w(r,1835,1); break;
-              case 0xbf: w(r,1834,1); break;
-              case 0xc0: w(r,1333,1); break;
-              case 0xc1: w(r,1833,1); break;
-              case 0xc2: w(r,1832,1); break;
-              case 0xc3: w(r,1831,1); break;
-              case 0xc4: w(r,1845,1); break;
-              case 0xc5: w(r,1844,1); break;
-              case 0xc6: w(r,1828,1); break;
-              case 0xc7: w(r,1843,1); break;
-              case 0xc8: w(r,1857,1); break;
-              case 0xc9: w(r,1827,1); break;
-              case 0xca: w(r,1856,1); break;
-              case 0xcb: w(r,1826,1); break;
-              case 0xcc: w(r,1855,1); break;
-              case 0xcd: w(r,1244,1); break;
-              case 0xce: w(r,1854,1); break;
-              case 0xcf: w(r,1853,1); break;
-              case 0xd0: w(r,1852,1); break;
-              case 0xd1: w(r,1823,1); break;
-              case 0xd2: w(r,1824,1); break;
-              case 0xd3: w(r,1851,1); break;
-              case 0xd4: w(r,1850,1); break;
-              case 0xd5: w(r,1849,1); break;
-              case 0xd6: w(r,1848,1); break;
-              case 0xd7: w(r,1825,1); break;
-              case 0xd8: w(r,1847,1); break;
-              case 0xd9: w(r,1846,1); break;
-              case 0xda: w(r,1830,1); break;
-              case 0xdb: w(r,1829,1); break;
-              case 0xdc: w(r,1828,1); break;
-              case 0xdd: w(r,1827,1); break;
-              case 0xde: w(r,1826,1); break;
-              case 0xdf: w(r,1825,1); break;
-              case 0xe0: w(r,1824,1); break;
-              case 0xe1: w(r,1823,1); break;
-              case 0xe2: w(r,1820,1); break;
-              case 0xe3: w(r,1819,1); break;
-              case 0xe4: w(r,1818,1); break;
-              case 0xe5: w(r,1817,1); break;
-              case 0xe6: w(r,1816,1); break;
-              case 0xe7: w(r,1815,1); break;
-              case 0xe8: w(r,1814,1); break;
-              case 0xe9: w(r,1813,1); break;
-              case 0xea: w(r,1812,1); break;
-              case 0xeb: w(r,1811,1); break;
-              case 0xec: w(r,1810,1); break;
-              case 0xed: w(r,1809,1); break;
-              case 0xee: w(r,1808,1); break;
-              case 0xef: w(r,1807,1); break;
-              case 0xf0: w(r,1842,1); break;
-              case 0xf1: w(r,1841,1); break;
-              case 0xf2: w(r,1840,1); break;
-              case 0xf3: w(r,1813,1); break;
-              case 0xf4: w(r,1839,1); break;
-              case 0xf5: w(r,1838,1); break;
-              case 0xf6: w(r,1837,1); break;
-              case 0xf7: w(r,1836,1); break;
-              case 0xf8: w(r,1835,1); break;
-              case 0xf9: w(r,1834,1); break;
-              case 0xfa: w(r,1333,1); break;
-              case 0xfb: w(r,1833,1); break;
-              case 0xfc: w(r,1832,1); break;
-              case 0xfd: w(r,1831,1); break;
-              case 0xfe: w(r,1845,1); break;
-              case 0xff: w(r,1844,1); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0xd700:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x0: w(r,1828,1); break;
-              case 0x1: w(r,1843,1); break;
-              case 0x2: w(r,1857,1); break;
-              case 0x3: w(r,1827,1); break;
-              case 0x4: w(r,1856,1); break;
-              case 0x5: w(r,1826,1); break;
-              case 0x6: w(r,1855,1); break;
-              case 0x7: w(r,1244,1); break;
-              case 0x8: w(r,1854,1); break;
-              case 0x9: w(r,1853,1); break;
-              case 0xa: w(r,1852,1); break;
-              case 0xb: w(r,1823,1); break;
-              case 0xc: w(r,1824,1); break;
-              case 0xd: w(r,1851,1); break;
-              case 0xe: w(r,1850,1); break;
-              case 0xf: w(r,1849,1); break;
-              case 0x10: w(r,1848,1); break;
-              case 0x11: w(r,1825,1); break;
-              case 0x12: w(r,1847,1); break;
-              case 0x13: w(r,1846,1); break;
-              case 0x14: w(r,1830,1); break;
-              case 0x15: w(r,1829,1); break;
-              case 0x16: w(r,1828,1); break;
-              case 0x17: w(r,1827,1); break;
-              case 0x18: w(r,1826,1); break;
-              case 0x19: w(r,1825,1); break;
-              case 0x1a: w(r,1824,1); break;
-              case 0x1b: w(r,1823,1); break;
-              case 0x1c: w(r,1820,1); break;
-              case 0x1d: w(r,1819,1); break;
-              case 0x1e: w(r,1818,1); break;
-              case 0x1f: w(r,1817,1); break;
-              case 0x20: w(r,1816,1); break;
-              case 0x21: w(r,1815,1); break;
-              case 0x22: w(r,1814,1); break;
-              case 0x23: w(r,1813,1); break;
-              case 0x24: w(r,1812,1); break;
-              case 0x25: w(r,1811,1); break;
-              case 0x26: w(r,1810,1); break;
-              case 0x27: w(r,1809,1); break;
-              case 0x28: w(r,1808,1); break;
-              case 0x29: w(r,1807,1); break;
-              case 0x2a: w(r,1842,1); break;
-              case 0x2b: w(r,1841,1); break;
-              case 0x2c: w(r,1840,1); break;
-              case 0x2d: w(r,1813,1); break;
-              case 0x2e: w(r,1839,1); break;
-              case 0x2f: w(r,1838,1); break;
-              case 0x30: w(r,1837,1); break;
-              case 0x31: w(r,1836,1); break;
-              case 0x32: w(r,1835,1); break;
-              case 0x33: w(r,1834,1); break;
-              case 0x34: w(r,1333,1); break;
-              case 0x35: w(r,1833,1); break;
-              case 0x36: w(r,1832,1); break;
-              case 0x37: w(r,1831,1); break;
-              case 0x38: w(r,1845,1); break;
-              case 0x39: w(r,1844,1); break;
-              case 0x3a: w(r,1828,1); break;
-              case 0x3b: w(r,1843,1); break;
-              case 0x3c: w(r,1857,1); break;
-              case 0x3d: w(r,1827,1); break;
-              case 0x3e: w(r,1856,1); break;
-              case 0x3f: w(r,1826,1); break;
-              case 0x40: w(r,1855,1); break;
-              case 0x41: w(r,1244,1); break;
-              case 0x42: w(r,1854,1); break;
-              case 0x43: w(r,1853,1); break;
-              case 0x44: w(r,1852,1); break;
-              case 0x45: w(r,1823,1); break;
-              case 0x46: w(r,1824,1); break;
-              case 0x47: w(r,1851,1); break;
-              case 0x48: w(r,1850,1); break;
-              case 0x49: w(r,1849,1); break;
-              case 0x4a: w(r,1848,1); break;
-              case 0x4b: w(r,1825,1); break;
-              case 0x4c: w(r,1847,1); break;
-              case 0x4d: w(r,1846,1); break;
-              case 0x4e: w(r,1830,1); break;
-              case 0x4f: w(r,1829,1); break;
-              case 0x50: w(r,1828,1); break;
-              case 0x51: w(r,1827,1); break;
-              case 0x52: w(r,1826,1); break;
-              case 0x53: w(r,1825,1); break;
-              case 0x54: w(r,1824,1); break;
-              case 0x55: w(r,1823,1); break;
-              case 0x56: w(r,1820,1); break;
-              case 0x57: w(r,1819,1); break;
-              case 0x58: w(r,1818,1); break;
-              case 0x59: w(r,1817,1); break;
-              case 0x5a: w(r,1816,1); break;
-              case 0x5b: w(r,1815,1); break;
-              case 0x5c: w(r,1814,1); break;
-              case 0x5d: w(r,1813,1); break;
-              case 0x5e: w(r,1812,1); break;
-              case 0x5f: w(r,1811,1); break;
-              case 0x60: w(r,1810,1); break;
-              case 0x61: w(r,1809,1); break;
-              case 0x62: w(r,1808,1); break;
-              case 0x63: w(r,1807,1); break;
-              case 0x64: w(r,1842,1); break;
-              case 0x65: w(r,1841,1); break;
-              case 0x66: w(r,1840,1); break;
-              case 0x67: w(r,1813,1); break;
-              case 0x68: w(r,1839,1); break;
-              case 0x69: w(r,1838,1); break;
-              case 0x6a: w(r,1837,1); break;
-              case 0x6b: w(r,1836,1); break;
-              case 0x6c: w(r,1835,1); break;
-              case 0x6d: w(r,1834,1); break;
-              case 0x6e: w(r,1333,1); break;
-              case 0x6f: w(r,1833,1); break;
-              case 0x70: w(r,1832,1); break;
-              case 0x71: w(r,1831,1); break;
-              case 0x72: w(r,1845,1); break;
-              case 0x73: w(r,1844,1); break;
-              case 0x74: w(r,1828,1); break;
-              case 0x75: w(r,1843,1); break;
-              case 0x76: w(r,1857,1); break;
-              case 0x77: w(r,1827,1); break;
-              case 0x78: w(r,1856,1); break;
-              case 0x79: w(r,1826,1); break;
-              case 0x7a: w(r,1855,1); break;
-              case 0x7b: w(r,1244,1); break;
-              case 0x7c: w(r,1854,1); break;
-              case 0x7d: w(r,1853,1); break;
-              case 0x7e: w(r,1852,1); break;
-              case 0x7f: w(r,1823,1); break;
-              case 0x80: w(r,1824,1); break;
-              case 0x81: w(r,1851,1); break;
-              case 0x82: w(r,1850,1); break;
-              case 0x83: w(r,1849,1); break;
-              case 0x84: w(r,1848,1); break;
-              case 0x85: w(r,1825,1); break;
-              case 0x86: w(r,1847,1); break;
-              case 0x87: w(r,1846,1); break;
-              case 0x88: w(r,1830,1); break;
-              case 0x89: w(r,1829,1); break;
-              case 0x8a: w(r,1828,1); break;
-              case 0x8b: w(r,1827,1); break;
-              case 0x8c: w(r,1826,1); break;
-              case 0x8d: w(r,1825,1); break;
-              case 0x8e: w(r,1824,1); break;
-              case 0x8f: w(r,1823,1); break;
-              case 0x90: w(r,1820,1); break;
-              case 0x91: w(r,1819,1); break;
-              case 0x92: w(r,1818,1); break;
-              case 0x93: w(r,1817,1); break;
-              case 0x94: w(r,1816,1); break;
-              case 0x95: w(r,1815,1); break;
-              case 0x96: w(r,1814,1); break;
-              case 0x97: w(r,1813,1); break;
-              case 0x98: w(r,1812,1); break;
-              case 0x99: w(r,1811,1); break;
-              case 0x9a: w(r,1810,1); break;
-              case 0x9b: w(r,1809,1); break;
-              case 0x9c: w(r,1808,1); break;
-              case 0x9d: w(r,1807,1); break;
-              case 0x9e: w(r,1842,1); break;
-              case 0x9f: w(r,1841,1); break;
-              case 0xa0: w(r,1840,1); break;
-              case 0xa1: w(r,1813,1); break;
-              case 0xa2: w(r,1839,1); break;
-              case 0xa3: w(r,1838,1); break;
-              case 0xa4: w(r,1837,1); break;
-              case 0xa5: w(r,1836,1); break;
-              case 0xa6: w(r,1835,1); break;
-              case 0xa7: w(r,1834,1); break;
-              case 0xa8: w(r,1333,1); break;
-              case 0xa9: w(r,1833,1); break;
-              case 0xaa: w(r,1832,1); break;
-              case 0xab: w(r,1831,1); break;
-              case 0xac: w(r,1845,1); break;
-              case 0xad: w(r,1844,1); break;
-              case 0xae: w(r,1828,1); break;
-              case 0xaf: w(r,1843,1); break;
-              case 0xb0: w(r,1857,1); break;
-              case 0xb1: w(r,1827,1); break;
-              case 0xb2: w(r,1856,1); break;
-              case 0xb3: w(r,1826,1); break;
-              case 0xb4: w(r,1855,1); break;
-              case 0xb5: w(r,1244,1); break;
-              case 0xb6: w(r,1854,1); break;
-              case 0xb7: w(r,1853,1); break;
-              case 0xb8: w(r,1852,1); break;
-              case 0xb9: w(r,1823,1); break;
-              case 0xba: w(r,1824,1); break;
-              case 0xbb: w(r,1851,1); break;
-              case 0xbc: w(r,1850,1); break;
-              case 0xbd: w(r,1849,1); break;
-              case 0xbe: w(r,1848,1); break;
-              case 0xbf: w(r,1825,1); break;
-              case 0xc0: w(r,1847,1); break;
-              case 0xc1: w(r,1846,1); break;
-              case 0xc2: w(r,1830,1); break;
-              case 0xc3: w(r,1829,1); break;
-              case 0xc4: w(r,1828,1); break;
-              case 0xc5: w(r,1827,1); break;
-              case 0xc6: w(r,1826,1); break;
-              case 0xc7: w(r,1825,1); break;
-              case 0xc8: w(r,1824,1); break;
-              case 0xc9: w(r,1823,1); break;
-              case 0xca: w(r,1859,1); break;
-              case 0xcb: w(r,1858,1); break;
-              case 0xce: w(r,161,1); break;
-              case 0xcf: w(r,158,1); break;
-              case 0xd0: w(r,44,1); break;
-              case 0xd1: w(r,184,1); break;
-              case 0xd2: w(r,188,1); break;
-              case 0xd3: w(r,192,1); break;
-              case 0xd4: w(r,196,1); break;
-              case 0xd5: w(r,200,1); break;
-              case 0xd6: w(r,204,1); break;
-              case 0xd7: w(r,208,1); break;
-              case 0xd8: w(r,161,1); break;
-              case 0xd9: w(r,158,1); break;
-              case 0xda: w(r,44,1); break;
-              case 0xdb: w(r,184,1); break;
-              case 0xdc: w(r,188,1); break;
-              case 0xdd: w(r,192,1); break;
-              case 0xde: w(r,196,1); break;
-              case 0xdf: w(r,200,1); break;
-              case 0xe0: w(r,204,1); break;
-              case 0xe1: w(r,208,1); break;
-              case 0xe2: w(r,161,1); break;
-              case 0xe3: w(r,158,1); break;
-              case 0xe4: w(r,44,1); break;
-              case 0xe5: w(r,184,1); break;
-              case 0xe6: w(r,188,1); break;
-              case 0xe7: w(r,192,1); break;
-              case 0xe8: w(r,196,1); break;
-              case 0xe9: w(r,200,1); break;
-              case 0xea: w(r,204,1); break;
-              case 0xeb: w(r,208,1); break;
-              case 0xec: w(r,161,1); break;
-              case 0xed: w(r,158,1); break;
-              case 0xee: w(r,44,1); break;
-              case 0xef: w(r,184,1); break;
-              case 0xf0: w(r,188,1); break;
-              case 0xf1: w(r,192,1); break;
-              case 0xf2: w(r,196,1); break;
-              case 0xf3: w(r,200,1); break;
-              case 0xf4: w(r,204,1); break;
-              case 0xf5: w(r,208,1); break;
-              case 0xf6: w(r,161,1); break;
-              case 0xf7: w(r,158,1); break;
-              case 0xf8: w(r,44,1); break;
-              case 0xf9: w(r,184,1); break;
-              case 0xfa: w(r,188,1); break;
-              case 0xfb: w(r,192,1); break;
-              case 0xfc: w(r,196,1); break;
-              case 0xfd: w(r,200,1); break;
-              case 0xfe: w(r,204,1); break;
-              case 0xff: w(r,208,1); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0xf100:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x0: w(r,1164,2); break;
-              case 0x1: w(r,1612,2); break;
-              case 0x2: w(r,1614,2); break;
-              case 0x3: w(r,1616,2); break;
-              case 0x4: w(r,1618,2); break;
-              case 0x5: w(r,1620,2); break;
-              case 0x6: w(r,1622,2); break;
-              case 0x7: w(r,1624,2); break;
-              case 0x8: w(r,1626,2); break;
-              case 0x9: w(r,1628,2); break;
-              case 0xa: w(r,1602,2); break;
-              case 0x10: w(r,908,3); break;
-              case 0x11: w(r,911,3); break;
-              case 0x12: w(r,914,3); break;
-              case 0x13: w(r,917,3); break;
-              case 0x14: w(r,920,3); break;
-              case 0x15: w(r,923,3); break;
-              case 0x16: w(r,926,3); break;
-              case 0x17: w(r,929,3); break;
-              case 0x18: w(r,932,3); break;
-              case 0x19: w(r,935,3); break;
-              case 0x1a: w(r,938,3); break;
-              case 0x1b: w(r,1115,3); break;
-              case 0x1c: w(r,1118,3); break;
-              case 0x1d: w(r,1121,3); break;
-              case 0x1e: w(r,1124,3); break;
-              case 0x1f: w(r,1127,3); break;
-              case 0x20: w(r,1130,3); break;
-              case 0x21: w(r,1133,3); break;
-              case 0x22: w(r,1136,3); break;
-              case 0x23: w(r,1139,3); break;
-              case 0x24: w(r,1142,3); break;
-              case 0x25: w(r,1145,3); break;
-              case 0x26: w(r,1148,3); break;
-              case 0x27: w(r,1151,3); break;
-              case 0x28: w(r,1154,3); break;
-              case 0x29: w(r,1157,3); break;
-              case 0x2a: w(r,1160,3); break;
-              case 0x2b: w(r,358,1); break;
-              case 0x2c: w(r,1134,1); break;
-              case 0x2d: w(r,1600,2); break;
-              case 0x2e: w(r,1598,2); break;
-              case 0x30: w(r,491,1); break;
-              case 0x31: w(r,912,1); break;
-              case 0x32: w(r,358,1); break;
-              case 0x33: w(r,517,1); break;
-              case 0x34: w(r,921,1); break;
-              case 0x35: w(r,924,1); break;
-              case 0x36: w(r,404,1); break;
-              case 0x37: w(r,399,1); break;
-              case 0x38: w(r,163,1); break;
-              case 0x39: w(r,936,1); break;
-              case 0x3a: w(r,939,1); break;
-              case 0x3b: w(r,515,1); break;
-              case 0x3c: w(r,401,1); break;
-              case 0x3d: w(r,1122,1); break;
-              case 0x3e: w(r,1125,1); break;
-              case 0x3f: w(r,381,1); break;
-              case 0x40: w(r,1131,1); break;
-              case 0x41: w(r,1134,1); break;
-              case 0x42: w(r,1137,1); break;
-              case 0x43: w(r,407,1); break;
-              case 0x44: w(r,1143,1); break;
-              case 0x45: w(r,162,1); break;
-              case 0x46: w(r,1149,1); break;
-              case 0x47: w(r,869,1); break;
-              case 0x48: w(r,1155,1); break;
-              case 0x49: w(r,1158,1); break;
-              case 0x4a: w(r,1654,2); break;
-              case 0x4b: w(r,1398,2); break;
-              case 0x4c: w(r,1630,2); break;
-              case 0x4d: w(r,1632,2); break;
-              case 0x4e: w(r,1061,3); break;
-              case 0x4f: w(r,1634,2); break;
-              case 0x90: w(r,1636,2); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-          case 0xf200:
-            {
-              switch (static_cast<uint8_t>(c & 0xff))
-              {
-              case 0x0: w(r,1638,2); break;
-              case 0x1: w(r,1640,2); break;
-              case 0x2: w(r,71,1); break;
-              case 0x13: w(r,1456,1); break;
-              case 0x29: w(r,1209,1); break;
-              case 0x40: w(r,1642,2); break;
-              case 0x41: w(r,1642,2); break;
-              case 0x42: w(r,1642,2); break;
-              case 0x43: w(r,1642,2); break;
-              case 0x44: w(r,1642,2); break;
-              case 0x45: w(r,1642,2); break;
-              case 0x46: w(r,1642,2); break;
-              case 0x47: w(r,1642,2); break;
-              case 0x48: w(r,1642,2); break;
-              default: r.push_back(c);
-              }
-            }
-            break;
-            default: r.push_back(c);
+          case 0x0: w(r, 491, 1); break;
+          case 0x1: w(r, 40, 1); break;
+          case 0x2: w(r, 491, 1); break;
+          case 0x3: w(r, 40, 1); break;
+          case 0x4: w(r, 491, 1); break;
+          case 0x5: w(r, 40, 1); break;
+          case 0x6: w(r, 358, 1); break;
+          case 0x7: w(r, 331, 1); break;
+          case 0x8: w(r, 358, 1); break;
+          case 0x9: w(r, 331, 1); break;
+          case 0xa: w(r, 358, 1); break;
+          case 0xb: w(r, 331, 1); break;
+          case 0xc: w(r, 358, 1); break;
+          case 0xd: w(r, 331, 1); break;
+          case 0xe: w(r, 517, 1); break;
+          case 0xf: w(r, 41, 1); break;
+          case 0x12: w(r, 921, 1); break;
+          case 0x13: w(r, 518, 1); break;
+          case 0x14: w(r, 921, 1); break;
+          case 0x15: w(r, 518, 1); break;
+          case 0x16: w(r, 921, 1); break;
+          case 0x17: w(r, 518, 1); break;
+          case 0x18: w(r, 921, 1); break;
+          case 0x19: w(r, 518, 1); break;
+          case 0x1a: w(r, 921, 1); break;
+          case 0x1b: w(r, 518, 1); break;
+          case 0x1c: w(r, 404, 1); break;
+          case 0x1d: w(r, 361, 1); break;
+          case 0x1e: w(r, 404, 1); break;
+          case 0x1f: w(r, 361, 1); break;
+          case 0x20: w(r, 404, 1); break;
+          case 0x21: w(r, 361, 1); break;
+          case 0x22: w(r, 404, 1); break;
+          case 0x23: w(r, 361, 1); break;
+          case 0x24: w(r, 399, 1); break;
+          case 0x25: w(r, 380, 1); break;
+          case 0x28: w(r, 163, 1); break;
+          case 0x29: w(r, 167, 1); break;
+          case 0x2a: w(r, 163, 1); break;
+          case 0x2b: w(r, 167, 1); break;
+          case 0x2c: w(r, 163, 1); break;
+          case 0x2d: w(r, 167, 1); break;
+          case 0x2e: w(r, 163, 1); break;
+          case 0x2f: w(r, 167, 1); break;
+          case 0x30: w(r, 163, 1); break;
+          case 0x32: w(r, 1672, 2); break;
+          case 0x33: w(r, 1670, 2); break;
+          case 0x34: w(r, 936, 1); break;
+          case 0x35: w(r, 1047, 1); break;
+          case 0x36: w(r, 939, 1); break;
+          case 0x37: w(r, 330, 1); break;
+          case 0x39: w(r, 515, 1); break;
+          case 0x3a: w(r, 333, 1); break;
+          case 0x3b: w(r, 515, 1); break;
+          case 0x3c: w(r, 333, 1); break;
+          case 0x3d: w(r, 515, 1); break;
+          case 0x3e: w(r, 333, 1); break;
+          case 0x3f: w(r, 1680, 2); break;
+          case 0x40: w(r, 1678, 2); break;
+          // @HACK Special case for Polish Ł
+          case 0x41: w(r, 515, 1); break;
+          // @HACK Special case for Polish ł
+          case 0x42: w(r, 333, 1); break;
+          case 0x43: w(r, 1122, 1); break;
+          case 0x44: w(r, 1059, 1); break;
+          case 0x45: w(r, 1122, 1); break;
+          case 0x46: w(r, 1059, 1); break;
+          case 0x47: w(r, 1122, 1); break;
+          case 0x48: w(r, 1059, 1); break;
+          case 0x49: w(r, 1676, 2); break;
+          case 0x4c: w(r, 1125, 1); break;
+          case 0x4d: w(r, 480, 1); break;
+          case 0x4e: w(r, 1125, 1); break;
+          case 0x4f: w(r, 480, 1); break;
+          case 0x50: w(r, 1125, 1); break;
+          case 0x51: w(r, 480, 1); break;
+          case 0x54: w(r, 1134, 1); break;
+          case 0x55: w(r, 39, 1); break;
+          case 0x56: w(r, 1134, 1); break;
+          case 0x57: w(r, 39, 1); break;
+          case 0x58: w(r, 1134, 1); break;
+          case 0x59: w(r, 39, 1); break;
+          case 0x5a: w(r, 1137, 1); break;
+          case 0x5b: w(r, 43, 1); break;
+          case 0x5c: w(r, 1137, 1); break;
+          case 0x5d: w(r, 43, 1); break;
+          case 0x5e: w(r, 1137, 1); break;
+          case 0x5f: w(r, 43, 1); break;
+          case 0x60: w(r, 1137, 1); break;
+          case 0x61: w(r, 43, 1); break;
+          case 0x62: w(r, 407, 1); break;
+          case 0x63: w(r, 1089, 1); break;
+          case 0x64: w(r, 407, 1); break;
+          case 0x65: w(r, 1089, 1); break;
+          case 0x68: w(r, 1143, 1); break;
+          case 0x69: w(r, 967, 1); break;
+          case 0x6a: w(r, 1143, 1); break;
+          case 0x6b: w(r, 967, 1); break;
+          case 0x6c: w(r, 1143, 1); break;
+          case 0x6d: w(r, 967, 1); break;
+          case 0x6e: w(r, 1143, 1); break;
+          case 0x6f: w(r, 967, 1); break;
+          case 0x70: w(r, 1143, 1); break;
+          case 0x71: w(r, 967, 1); break;
+          case 0x72: w(r, 1143, 1); break;
+          case 0x73: w(r, 967, 1); break;
+          case 0x74: w(r, 1149, 1); break;
+          case 0x75: w(r, 1098, 1); break;
+          case 0x76: w(r, 1155, 1); break;
+          case 0x77: w(r, 1104, 1); break;
+          case 0x78: w(r, 1155, 1); break;
+          case 0x79: w(r, 1158, 1); break;
+          case 0x7a: w(r, 400, 1); break;
+          case 0x7b: w(r, 1158, 1); break;
+          case 0x7c: w(r, 400, 1); break;
+          case 0x7d: w(r, 1158, 1); break;
+          case 0x7e: w(r, 400, 1); break;
+          case 0x7f: w(r, 43, 1); break;
+          case 0xa0: w(r, 1125, 1); break;
+          case 0xa1: w(r, 480, 1); break;
+          case 0xaf: w(r, 1143, 1); break;
+          case 0xb0: w(r, 967, 1); break;
+          case 0xc4: w(r, 1482, 2); break;
+          case 0xc5: w(r, 1480, 2); break;
+          case 0xc6: w(r, 1478, 2); break;
+          case 0xc7: w(r, 1514, 2); break;
+          case 0xc8: w(r, 1512, 2); break;
+          case 0xc9: w(r, 1510, 2); break;
+          case 0xca: w(r, 1508, 2); break;
+          case 0xcb: w(r, 1506, 2); break;
+          case 0xcc: w(r, 1504, 2); break;
+          case 0xcd: w(r, 491, 1); break;
+          case 0xce: w(r, 40, 1); break;
+          case 0xcf: w(r, 163, 1); break;
+          case 0xd0: w(r, 167, 1); break;
+          case 0xd1: w(r, 1125, 1); break;
+          case 0xd2: w(r, 480, 1); break;
+          case 0xd3: w(r, 1143, 1); break;
+          case 0xd4: w(r, 967, 1); break;
+          case 0xd5: w(r, 1143, 1); break;
+          case 0xd6: w(r, 967, 1); break;
+          case 0xd7: w(r, 1143, 1); break;
+          case 0xd8: w(r, 967, 1); break;
+          case 0xd9: w(r, 1143, 1); break;
+          case 0xda: w(r, 967, 1); break;
+          case 0xdb: w(r, 1143, 1); break;
+          case 0xdc: w(r, 967, 1); break;
+          case 0xde: w(r, 491, 1); break;
+          case 0xdf: w(r, 40, 1); break;
+          case 0xe0: w(r, 491, 1); break;
+          case 0xe1: w(r, 40, 1); break;
+          case 0xe2: w(r, 1939, 1); break;
+          case 0xe3: w(r, 1975, 1); break;
+          case 0xe6: w(r, 404, 1); break;
+          case 0xe7: w(r, 361, 1); break;
+          case 0xe8: w(r, 939, 1); break;
+          case 0xe9: w(r, 330, 1); break;
+          case 0xea: w(r, 1125, 1); break;
+          case 0xeb: w(r, 480, 1); break;
+          case 0xec: w(r, 1125, 1); break;
+          case 0xed: w(r, 480, 1); break;
+          case 0xee: w(r, 2043, 1); break;
+          case 0xef: w(r, 1918, 1); break;
+          case 0xf0: w(r, 1047, 1); break;
+          case 0xf1: w(r, 1482, 2); break;
+          case 0xf2: w(r, 1480, 2); break;
+          case 0xf3: w(r, 1478, 2); break;
+          case 0xf4: w(r, 404, 1); break;
+          case 0xf5: w(r, 361, 1); break;
+          case 0xf8: w(r, 1122, 1); break;
+          case 0xf9: w(r, 1059, 1); break;
+          case 0xfa: w(r, 491, 1); break;
+          case 0xfb: w(r, 40, 1); break;
+          case 0xfc: w(r, 1939, 1); break;
+          case 0xfd: w(r, 1975, 1); break;
+          case 0xfe: w(r, 2044, 1); break;
+          case 0xff: w(r, 2045, 1); break;
+          default: r.push_back(c);
           }
         }
-        //default: r.push_back(c);
+        break;
+        case 0x200:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x0: w(r, 491, 1); break;
+          case 0x1: w(r, 40, 1); break;
+          case 0x2: w(r, 491, 1); break;
+          case 0x3: w(r, 40, 1); break;
+          case 0x4: w(r, 921, 1); break;
+          case 0x5: w(r, 518, 1); break;
+          case 0x6: w(r, 921, 1); break;
+          case 0x7: w(r, 518, 1); break;
+          case 0x8: w(r, 163, 1); break;
+          case 0x9: w(r, 167, 1); break;
+          case 0xa: w(r, 163, 1); break;
+          case 0xb: w(r, 167, 1); break;
+          case 0xc: w(r, 1125, 1); break;
+          case 0xd: w(r, 480, 1); break;
+          case 0xe: w(r, 1125, 1); break;
+          case 0xf: w(r, 480, 1); break;
+          case 0x10: w(r, 1134, 1); break;
+          case 0x11: w(r, 39, 1); break;
+          case 0x12: w(r, 1134, 1); break;
+          case 0x13: w(r, 39, 1); break;
+          case 0x14: w(r, 1143, 1); break;
+          case 0x15: w(r, 967, 1); break;
+          case 0x16: w(r, 1143, 1); break;
+          case 0x17: w(r, 967, 1); break;
+          case 0x18: w(r, 1137, 1); break;
+          case 0x19: w(r, 43, 1); break;
+          case 0x1a: w(r, 407, 1); break;
+          case 0x1b: w(r, 1089, 1); break;
+          case 0x1e: w(r, 399, 1); break;
+          case 0x1f: w(r, 380, 1); break;
+          case 0x26: w(r, 491, 1); break;
+          case 0x27: w(r, 40, 1); break;
+          case 0x28: w(r, 921, 1); break;
+          case 0x29: w(r, 518, 1); break;
+          case 0x2a: w(r, 1125, 1); break;
+          case 0x2b: w(r, 480, 1); break;
+          case 0x2c: w(r, 1125, 1); break;
+          case 0x2d: w(r, 480, 1); break;
+          case 0x2e: w(r, 1125, 1); break;
+          case 0x2f: w(r, 480, 1); break;
+          case 0x30: w(r, 1125, 1); break;
+          case 0x31: w(r, 480, 1); break;
+          case 0x32: w(r, 1155, 1); break;
+          case 0x33: w(r, 1104, 1); break;
+          case 0xb0: w(r, 380, 1); break;
+          case 0xb1: w(r, 2046, 1); break;
+          case 0xb2: w(r, 1047, 1); break;
+          case 0xb3: w(r, 39, 1); break;
+          case 0xb4: w(r, 2047, 1); break;
+          case 0xb5: w(r, 2048, 1); break;
+          case 0xb6: w(r, 2049, 1); break;
+          case 0xb7: w(r, 1098, 1); break;
+          case 0xb8: w(r, 1104, 1); break;
+          case 0xd8: w(r, 3, 1); break;
+          case 0xd9: w(r, 3, 1); break;
+          case 0xda: w(r, 3, 1); break;
+          case 0xdb: w(r, 3, 1); break;
+          case 0xdc: w(r, 3, 1); break;
+          case 0xdd: w(r, 3, 1); break;
+          case 0xe0: w(r, 2050, 1); break;
+          case 0xe1: w(r, 333, 1); break;
+          case 0xe2: w(r, 43, 1); break;
+          case 0xe3: w(r, 872, 1); break;
+          case 0xe4: w(r, 2051, 1); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0x300:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x74: w(r, 2052, 1); break;
+          case 0x7a: w(r, 3, 1); break;
+          case 0x7e: w(r, 1767, 1); break;
+          case 0x84: w(r, 3, 1); break;
+          case 0x85: w(r, 3, 1); break;
+          case 0x86: w(r, 1820, 1); break;
+          case 0x87: w(r, 1679, 1); break;
+          case 0x88: w(r, 1816, 1); break;
+          case 0x89: w(r, 1814, 1); break;
+          case 0x8a: w(r, 1812, 1); break;
+          case 0x8c: w(r, 1842, 1); break;
+          case 0x8e: w(r, 1837, 1); break;
+          case 0x8f: w(r, 1333, 1); break;
+          case 0x90: w(r, 1856, 1); break;
+          case 0xaa: w(r, 1812, 1); break;
+          case 0xab: w(r, 1837, 1); break;
+          case 0xac: w(r, 1832, 1); break;
+          case 0xad: w(r, 1828, 1); break;
+          case 0xae: w(r, 1857, 1); break;
+          case 0xaf: w(r, 1856, 1); break;
+          case 0xb0: w(r, 1848, 1); break;
+          case 0xca: w(r, 1856, 1); break;
+          case 0xcb: w(r, 1848, 1); break;
+          case 0xcc: w(r, 1852, 1); break;
+          case 0xcd: w(r, 1848, 1); break;
+          case 0xce: w(r, 1830, 1); break;
+          case 0xd0: w(r, 1831, 1); break;
+          case 0xd1: w(r, 1827, 1); break;
+          case 0xd2: w(r, 1837, 1); break;
+          case 0xd3: w(r, 1837, 1); break;
+          case 0xd4: w(r, 1837, 1); break;
+          case 0xd5: w(r, 1825, 1); break;
+          case 0xd6: w(r, 1823, 1); break;
+          case 0xf0: w(r, 1826, 1); break;
+          case 0xf1: w(r, 1824, 1); break;
+          case 0xf2: w(r, 1851, 1); break;
+          case 0xf4: w(r, 1813, 1); break;
+          case 0xf5: w(r, 1828, 1); break;
+          case 0xf9: w(r, 1839, 1); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0x400:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x0: w(r, 1985, 1); break;
+          case 0x1: w(r, 1985, 1); break;
+          case 0x3: w(r, 1997, 1); break;
+          case 0x7: w(r, 1998, 1); break;
+          case 0xc: w(r, 1999, 1); break;
+          case 0xd: w(r, 1991, 1); break;
+          case 0xe: w(r, 2000, 1); break;
+          case 0x19: w(r, 1991, 1); break;
+          case 0x39: w(r, 1976, 1); break;
+          case 0x50: w(r, 1986, 1); break;
+          case 0x51: w(r, 1986, 1); break;
+          case 0x53: w(r, 2001, 1); break;
+          case 0x57: w(r, 2002, 1); break;
+          case 0x5c: w(r, 2003, 1); break;
+          case 0x5d: w(r, 1976, 1); break;
+          case 0x5e: w(r, 1977, 1); break;
+          case 0x76: w(r, 1978, 1); break;
+          case 0x77: w(r, 1979, 1); break;
+          case 0xc1: w(r, 1980, 1); break;
+          case 0xc2: w(r, 1981, 1); break;
+          case 0xd0: w(r, 1982, 1); break;
+          case 0xd1: w(r, 1983, 1); break;
+          case 0xd2: w(r, 1982, 1); break;
+          case 0xd3: w(r, 1983, 1); break;
+          case 0xd6: w(r, 1985, 1); break;
+          case 0xd7: w(r, 1986, 1); break;
+          case 0xda: w(r, 1987, 1); break;
+          case 0xdb: w(r, 1988, 1); break;
+          case 0xdc: w(r, 1980, 1); break;
+          case 0xdd: w(r, 1981, 1); break;
+          case 0xde: w(r, 1989, 1); break;
+          case 0xdf: w(r, 1990, 1); break;
+          case 0xe2: w(r, 1991, 1); break;
+          case 0xe3: w(r, 1976, 1); break;
+          case 0xe4: w(r, 1991, 1); break;
+          case 0xe5: w(r, 1976, 1); break;
+          case 0xe6: w(r, 1993, 1); break;
+          case 0xe7: w(r, 1994, 1); break;
+          case 0xea: w(r, 1995, 1); break;
+          case 0xeb: w(r, 1996, 1); break;
+          case 0xec: w(r, 2030, 1); break;
+          case 0xed: w(r, 2031, 1); break;
+          case 0xee: w(r, 2000, 1); break;
+          case 0xef: w(r, 1977, 1); break;
+          case 0xf0: w(r, 2000, 1); break;
+          case 0xf1: w(r, 1977, 1); break;
+          case 0xf2: w(r, 2000, 1); break;
+          case 0xf3: w(r, 1977, 1); break;
+          case 0xf4: w(r, 2032, 1); break;
+          case 0xf5: w(r, 2033, 1); break;
+          case 0xf8: w(r, 2034, 1); break;
+          case 0xf9: w(r, 2035, 1); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0x500:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x87: w(r, 1738, 2); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0x600: /* Arabic Language */
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x0c: w(r, 1603, 1); break;  // ARABIC COMMA
+          case 0x22: w(r, 4, 1); break;     // ARABIC LETTER ALEF WITH MADDA ABOVE
+          case 0x23: w(r, 4, 1); break;     // ARABIC LETTER ALEF WITH HAMZA ABOVE
+          case 0x24: w(r, 14, 1); break;    // ARABIC LETTER WAW WITH HAMZA ABOVE
+          case 0x25: w(r, 4, 1); break;     // ARABIC LETTER ALEF WITH HAMZA BELOW
+          case 0x26: w(r, 11, 1); break;    // ARABIC LETTER YEH WITH HAMZA ABOVE
+          case 0x29: w(r, 7, 1); break;     // ARABIC LETTER TEH MARBUTA
+          case 0x49: w(r, 11, 1); break;    // ARABIC LETTER ALEF MAKSURA
+          case 0x71: w(r, 4, 1); break;     // ARABIC LETTER ALEF WASLA
+          case 0x72: w(r, 4, 1); break;     // ARABIC LETTER ALEF WITH WAVY HAMZA ABOVE
+          case 0x73: w(r, 4, 1); break;     // ARABIC LETTER ALEF WITH WAVY HAMZA BELOW
+          case 0x75: w(r, 1740, 1); break;  // ARABIC LETTER HIGH HAMZA ALEF
+          case 0x76: w(r, 1742, 1); break;  // ARABIC LETTER HIGH HAMZA WAW
+          case 0x77: w(r, 1742, 1); break;  // ARABIC LETTER U WITH HAMZA ABOVE
+          case 0x78: w(r, 1686, 1); break;  // ARABIC LETTER HIGH HAMZA YEH
+          case 0xc0: w(r, 7, 1); break;     // ARABIC LETTER HEH WITH YEH ABOVE
+          case 0xc2: w(r, 7, 1); break;     // ARABIC LETTER HEH GOAL WITH HAMZA ABOVE
+          case 0xc3: w(r, 7, 1); break;     // ARABIC LETTER TEH MARBUTA GOAL
+          case 0xd3:
+            w(r, 424, 1);
+            break;  // ARABIC LETTER YEH BARREE WITH HAMZA ABOVE
+
+          //  ARABIC-INDIC DIGITS
+          case 0x60: w(r, 172, 1); break;  // ARABIC-INDIC DIGIT ZERO
+          case 0x61: w(r, 176, 1); break;  // ARABIC-INDIC DIGIT ONE
+          case 0x62: w(r, 180, 1); break;  // ARABIC-INDIC DIGIT TWO
+          case 0x63: w(r, 184, 1); break;  // ARABIC-INDIC DIGIT THREE
+          case 0x64: w(r, 188, 1); break;  // ARABIC-INDIC DIGIT FOUR
+          case 0x65: w(r, 192, 1); break;  // ARABIC-INDIC DIGIT FIVE
+          case 0x66: w(r, 196, 1); break;  // ARABIC-INDIC DIGIT SIX
+          case 0x67: w(r, 200, 1); break;  // ARABIC-INDIC DIGIT SEVEN
+          case 0x68: w(r, 204, 1); break;  // ARABIC-INDIC DIGIT EIGHT
+          case 0x69:
+            w(r, 208, 1);
+            break;  // ARABIC-INDIC DIGIT NINE
+
+          // EXTENDED ARABIC-INDIC DIGITS
+          case 0xf0: w(r, 172, 1); break;  // EXTENDED ARABIC-INDIC DIGIT ZERO
+          case 0xf1: w(r, 176, 1); break;  // EXTENDED ARABIC-INDIC DIGIT ONE
+          case 0xf2: w(r, 180, 1); break;  // EXTENDED ARABIC-INDIC DIGIT TWO
+          case 0xf3: w(r, 184, 1); break;  // EXTENDED ARABIC-INDIC DIGIT THREE
+          case 0xf4: w(r, 188, 1); break;  // EXTENDED ARABIC-INDIC DIGIT FOUR
+          case 0xf5: w(r, 192, 1); break;  // EXTENDED ARABIC-INDIC DIGIT FIVE
+          case 0xf6: w(r, 196, 1); break;  // EXTENDED ARABIC-INDIC DIGIT SIX
+          case 0xf7: w(r, 200, 1); break;  // EXTENDED ARABIC-INDIC DIGIT SEVEN
+          case 0xf8: w(r, 204, 1); break;  // EXTENDED ARABIC-INDIC DIGIT EIGHT
+          case 0xf9:
+            w(r, 208, 1);
+            break;  // EXTENDED ARABIC-INDIC DIGIT NINE
+
+          // Remove Arabic Diacritics (Tashkeel)
+          case 0x40: break;  // ARABIC TATWEEL
+          case 0x4b: break;  // ARABIC FATHATAN
+          case 0x4c: break;  // ARABIC DAMMATAN
+          case 0x4d: break;  // ARABIC KASRATAN
+          case 0x4e: break;  // ARABIC FATHA
+          case 0x4f: break;  // ARABIC DAMMA
+          case 0x50: break;  // ARABIC KASRA
+          case 0x51: break;  // ARABIC SHADDA
+          case 0x52: break;  // ARABIC SUKUN
+          case 0x53: break;  // ARABIC MADDAH ABOVE
+          case 0x54: break;  // ARABIC HAMZA ABOVE
+          case 0x55: break;  // ARABIC HAMZA BELOW
+          case 0x56: break;  // ARABIC SUBSCRIPT ALEF
+          case 0x57: break;  // ARABIC INVERTED DAMMA
+          case 0x58: break;  // ARABIC MARK NOON GHUNNA
+          case 0x59: break;  // ARABIC ZWARAKAY
+          case 0x5a: break;  // ARABIC VOWEL SIGN SMALL V ABOVE
+          case 0x5b: break;  // ARABIC VOWEL SIGN INVERTED SMALL V ABOVE
+          case 0x5c: break;  // ARABIC VOWEL SIGN DOT BELOW
+          case 0x5d: break;  // ARABIC REVERSED DAMMA
+          case 0x5e: break;  // ARABIC FATHA WITH TWO DOTS
+          case 0x5f: break;  // ARABIC WAVY HAMZA BELOW
+          case 0x70:
+            break;  // ARABIC LETTER SUPERSCRIPT ALEF
+
+          // Remove Arabic Islamic Honorifics
+          case 0x10: break;  // ARABIC SIGN SALLALLAHOU ALAYHE WASSALLAM
+          case 0x11: break;  // ARABIC SIGN ALAYHE ASSALLAM
+          case 0x12: break;  // ARABIC SIGN RAHMATULLAH ALAYHE
+          case 0x13: break;  // ARABIC SIGN RADI ALLAHU ANHU
+          case 0x14: break;  // ARABIC SIGN TAKHALLUS
+          case 0x15: break;  // ARABIC SMALL HIGH TAH
+          case 0x16: break;  // ARABIC SMALL HIGH LIGATURE ALEF WITH LAM WITH YEH
+          case 0x17: break;  // ARABIC SMALL HIGH ZAIN
+          case 0x18: break;  // ARABIC SMALL FATHA
+          case 0x19: break;  // ARABIC SMALL DAMMA
+          case 0x1a:
+            break;  // ARABIC SMALL KASRA
+
+          // Remove Arabic Quranic Annotations
+          case 0xd6: break;  // ARABIC SMALL HIGH LIGATURE SAD WITH LAM WITH ALEF MAKSURA
+          case 0xd7: break;  // ARABIC SMALL HIGH LIGATURE QAF WITH LAM WITH ALEF MAKSURA
+          case 0xd8: break;  // ARABIC SMALL HIGH MEEM INITIAL FORM
+          case 0xd9: break;  // ARABIC SMALL HIGH LAM ALEF
+          case 0xda: break;  // ARABIC SMALL HIGH JEEM
+          case 0xdb: break;  // ARABIC SMALL HIGH THREE DOTS
+          case 0xdc: break;  // ARABIC SMALL HIGH SEEN
+          case 0xdd: break;  // ARABIC END OF AYAH
+          case 0xde: break;  // ARABIC START OF RUB EL HIZB
+          case 0xdf: break;  // ARABIC SMALL HIGH ROUNDED ZERO
+          case 0xe0: break;  // ARABIC SMALL HIGH UPRIGHT RECTANGULAR ZERO
+          case 0xe1: break;  // ARABIC SMALL HIGH DOTLESS HEAD OF KHAH
+          case 0xe2: break;  // ARABIC SMALL HIGH MEEM ISOLATED FORM
+          case 0xe3: break;  // ARABIC SMALL LOW SEEN
+          case 0xe4: break;  // ARABIC SMALL HIGH MADDA
+          case 0xe5: break;  // ARABIC SMALL WAW
+          case 0xe6: break;  // ARABIC SMALL YEH
+          case 0xe7: break;  // ARABIC SMALL HIGH YEH
+          case 0xe8: break;  // ARABIC SMALL HIGH NOON
+          case 0xe9: break;  // ARABIC PLACE OF SAJDAH
+          case 0xea: break;  // ARABIC EMPTY CENTRE LOW STOP
+          case 0xeb: break;  // ARABIC EMPTY CENTRE HIGH STOP
+          case 0xec: break;  // ARABIC ROUNDED HIGH STOP WITH FILLED CENTRE
+          case 0xed: break;  // ARABIC SMALL LOW MEEM
+
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0x900:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x29: w(r, 2037, 1); break;
+          case 0x31: w(r, 2038, 1); break;
+          case 0x34: w(r, 2039, 1); break;
+          case 0x58: w(r, 2040, 1); break;
+          case 0x59: w(r, 2041, 1); break;
+          case 0x5a: w(r, 2042, 1); break;
+          case 0x5b: w(r, 2004, 1); break;
+          case 0x5c: w(r, 2005, 1); break;
+          case 0x5d: w(r, 2006, 1); break;
+          case 0x5e: w(r, 2007, 1); break;
+          case 0x5f: w(r, 2008, 1); break;
+          case 0xdc: w(r, 2009, 1); break;
+          case 0xdd: w(r, 2010, 1); break;
+          case 0xdf: w(r, 2011, 1); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0xa00:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x33: w(r, 2012, 1); break;
+          case 0x36: w(r, 2013, 1); break;
+          case 0x59: w(r, 2014, 1); break;
+          case 0x5a: w(r, 2015, 1); break;
+          case 0x5b: w(r, 2016, 1); break;
+          case 0x5e: w(r, 2017, 1); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0xb00:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x5c: w(r, 2018, 1); break;
+          case 0x5d: w(r, 2019, 1); break;
+          case 0x94: w(r, 2020, 1); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0xe00:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x33: w(r, 2021, 1); break;
+          case 0xb3: w(r, 2022, 1); break;
+          case 0xdc: w(r, 1716, 2); break;
+          case 0xdd: w(r, 1718, 2); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0xf00:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0xc: w(r, 2023, 1); break;
+          case 0x43: w(r, 2024, 1); break;
+          case 0x4d: w(r, 2025, 1); break;
+          case 0x52: w(r, 2026, 1); break;
+          case 0x57: w(r, 2027, 1); break;
+          case 0x5c: w(r, 2028, 1); break;
+          case 0x69: w(r, 2029, 1); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0x1000:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x26: w(r, 1931, 1); break;
+          case 0xfc: w(r, 1932, 1); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0x1b00:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x6: w(r, 1933, 1); break;
+          case 0x8: w(r, 1934, 1); break;
+          case 0xa: w(r, 1935, 1); break;
+          case 0xc: w(r, 1936, 1); break;
+          case 0xe: w(r, 1937, 1); break;
+          case 0x12: w(r, 1938, 1); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0x1d00:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x2c: w(r, 491, 1); break;
+          case 0x2d: w(r, 1939, 1); break;
+          case 0x2e: w(r, 912, 1); break;
+          case 0x30: w(r, 517, 1); break;
+          case 0x31: w(r, 921, 1); break;
+          case 0x32: w(r, 1940, 1); break;
+          case 0x33: w(r, 404, 1); break;
+          case 0x34: w(r, 399, 1); break;
+          case 0x35: w(r, 163, 1); break;
+          case 0x36: w(r, 936, 1); break;
+          case 0x37: w(r, 939, 1); break;
+          case 0x38: w(r, 515, 1); break;
+          case 0x39: w(r, 401, 1); break;
+          case 0x3a: w(r, 1122, 1); break;
+          case 0x3c: w(r, 1125, 1); break;
+          case 0x3d: w(r, 1941, 1); break;
+          case 0x3e: w(r, 381, 1); break;
+          case 0x3f: w(r, 1134, 1); break;
+          case 0x40: w(r, 407, 1); break;
+          case 0x41: w(r, 1143, 1); break;
+          case 0x42: w(r, 1149, 1); break;
+          case 0x43: w(r, 40, 1); break;
+          case 0x44: w(r, 1919, 1); break;
+          case 0x45: w(r, 1920, 1); break;
+          case 0x46: w(r, 1921, 1); break;
+          case 0x47: w(r, 383, 1); break;
+          case 0x48: w(r, 41, 1); break;
+          case 0x49: w(r, 518, 1); break;
+          case 0x4a: w(r, 1922, 1); break;
+          case 0x4b: w(r, 1923, 1); break;
+          case 0x4c: w(r, 1924, 1); break;
+          case 0x4d: w(r, 361, 1); break;
+          case 0x4f: w(r, 330, 1); break;
+          case 0x50: w(r, 334, 1); break;
+          case 0x51: w(r, 1925, 1); break;
+          case 0x52: w(r, 480, 1); break;
+          case 0x53: w(r, 1926, 1); break;
+          case 0x54: w(r, 1927, 1); break;
+          case 0x55: w(r, 1928, 1); break;
+          case 0x56: w(r, 366, 1); break;
+          case 0x57: w(r, 1089, 1); break;
+          case 0x58: w(r, 967, 1); break;
+          case 0x59: w(r, 1929, 1); break;
+          case 0x5a: w(r, 1930, 1); break;
+          case 0x5b: w(r, 166, 1); break;
+          case 0x5c: w(r, 1967, 1); break;
+          case 0x5d: w(r, 1831, 1); break;
+          case 0x5e: w(r, 1845, 1); break;
+          case 0x5f: w(r, 1844, 1); break;
+          case 0x60: w(r, 1825, 1); break;
+          case 0x61: w(r, 1847, 1); break;
+          case 0x62: w(r, 167, 1); break;
+          case 0x63: w(r, 39, 1); break;
+          case 0x64: w(r, 967, 1); break;
+          case 0x65: w(r, 166, 1); break;
+          case 0x66: w(r, 1831, 1); break;
+          case 0x67: w(r, 1845, 1); break;
+          case 0x68: w(r, 1824, 1); break;
+          case 0x69: w(r, 1825, 1); break;
+          case 0x6a: w(r, 1847, 1); break;
+          case 0x78: w(r, 1968, 1); break;
+          case 0x9b: w(r, 1969, 1); break;
+          case 0x9c: w(r, 331, 1); break;
+          case 0x9d: w(r, 1970, 1); break;
+          case 0x9e: w(r, 1971, 1); break;
+          case 0x9f: w(r, 1924, 1); break;
+          case 0xa0: w(r, 593, 1); break;
+          case 0xa1: w(r, 1972, 1); break;
+          case 0xa2: w(r, 1973, 1); break;
+          case 0xa3: w(r, 1974, 1); break;
+          case 0xa4: w(r, 1942, 1); break;
+          case 0xa5: w(r, 1943, 1); break;
+          case 0xa6: w(r, 1944, 1); break;
+          case 0xa7: w(r, 1945, 1); break;
+          case 0xa8: w(r, 1946, 1); break;
+          case 0xa9: w(r, 1947, 1); break;
+          case 0xaa: w(r, 1948, 1); break;
+          case 0xab: w(r, 1949, 1); break;
+          case 0xac: w(r, 1950, 1); break;
+          case 0xad: w(r, 1951, 1); break;
+          case 0xae: w(r, 1952, 1); break;
+          case 0xaf: w(r, 1953, 1); break;
+          case 0xb0: w(r, 1954, 1); break;
+          case 0xb1: w(r, 1955, 1); break;
+          case 0xb2: w(r, 1956, 1); break;
+          case 0xb3: w(r, 1957, 1); break;
+          case 0xb4: w(r, 1958, 1); break;
+          case 0xb5: w(r, 1959, 1); break;
+          case 0xb6: w(r, 1960, 1); break;
+          case 0xb7: w(r, 1961, 1); break;
+          case 0xb8: w(r, 1962, 1); break;
+          case 0xb9: w(r, 1963, 1); break;
+          case 0xba: w(r, 1964, 1); break;
+          case 0xbb: w(r, 400, 1); break;
+          case 0xbc: w(r, 1965, 1); break;
+          case 0xbd: w(r, 1966, 1); break;
+          case 0xbe: w(r, 1918, 1); break;
+          case 0xbf: w(r, 1827, 1); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0x1e00:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x0: w(r, 491, 1); break;
+          case 0x1: w(r, 40, 1); break;
+          case 0x2: w(r, 912, 1); break;
+          case 0x3: w(r, 383, 1); break;
+          case 0x4: w(r, 912, 1); break;
+          case 0x5: w(r, 383, 1); break;
+          case 0x6: w(r, 912, 1); break;
+          case 0x7: w(r, 383, 1); break;
+          case 0x8: w(r, 358, 1); break;
+          case 0x9: w(r, 331, 1); break;
+          case 0xa: w(r, 517, 1); break;
+          case 0xb: w(r, 41, 1); break;
+          case 0xc: w(r, 517, 1); break;
+          case 0xd: w(r, 41, 1); break;
+          case 0xe: w(r, 517, 1); break;
+          case 0xf: w(r, 41, 1); break;
+          case 0x10: w(r, 517, 1); break;
+          case 0x11: w(r, 41, 1); break;
+          case 0x12: w(r, 517, 1); break;
+          case 0x13: w(r, 41, 1); break;
+          case 0x14: w(r, 921, 1); break;
+          case 0x15: w(r, 518, 1); break;
+          case 0x16: w(r, 921, 1); break;
+          case 0x17: w(r, 518, 1); break;
+          case 0x18: w(r, 921, 1); break;
+          case 0x19: w(r, 518, 1); break;
+          case 0x1a: w(r, 921, 1); break;
+          case 0x1b: w(r, 518, 1); break;
+          case 0x1c: w(r, 921, 1); break;
+          case 0x1d: w(r, 518, 1); break;
+          case 0x1e: w(r, 924, 1); break;
+          case 0x1f: w(r, 593, 1); break;
+          case 0x20: w(r, 404, 1); break;
+          case 0x21: w(r, 361, 1); break;
+          case 0x22: w(r, 399, 1); break;
+          case 0x23: w(r, 380, 1); break;
+          case 0x24: w(r, 399, 1); break;
+          case 0x25: w(r, 380, 1); break;
+          case 0x26: w(r, 399, 1); break;
+          case 0x27: w(r, 380, 1); break;
+          case 0x28: w(r, 399, 1); break;
+          case 0x29: w(r, 380, 1); break;
+          case 0x2a: w(r, 399, 1); break;
+          case 0x2b: w(r, 380, 1); break;
+          case 0x2c: w(r, 163, 1); break;
+          case 0x2d: w(r, 167, 1); break;
+          case 0x2e: w(r, 163, 1); break;
+          case 0x2f: w(r, 167, 1); break;
+          case 0x30: w(r, 939, 1); break;
+          case 0x31: w(r, 330, 1); break;
+          case 0x32: w(r, 939, 1); break;
+          case 0x33: w(r, 330, 1); break;
+          case 0x34: w(r, 939, 1); break;
+          case 0x35: w(r, 330, 1); break;
+          case 0x36: w(r, 515, 1); break;
+          case 0x37: w(r, 333, 1); break;
+          case 0x38: w(r, 515, 1); break;
+          case 0x39: w(r, 333, 1); break;
+          case 0x3a: w(r, 515, 1); break;
+          case 0x3b: w(r, 333, 1); break;
+          case 0x3c: w(r, 515, 1); break;
+          case 0x3d: w(r, 333, 1); break;
+          case 0x3e: w(r, 401, 1); break;
+          case 0x3f: w(r, 334, 1); break;
+          case 0x40: w(r, 401, 1); break;
+          case 0x41: w(r, 334, 1); break;
+          case 0x42: w(r, 401, 1); break;
+          case 0x43: w(r, 334, 1); break;
+          case 0x44: w(r, 1122, 1); break;
+          case 0x45: w(r, 1059, 1); break;
+          case 0x46: w(r, 1122, 1); break;
+          case 0x47: w(r, 1059, 1); break;
+          case 0x48: w(r, 1122, 1); break;
+          case 0x49: w(r, 1059, 1); break;
+          case 0x4a: w(r, 1122, 1); break;
+          case 0x4b: w(r, 1059, 1); break;
+          case 0x4c: w(r, 1125, 1); break;
+          case 0x4d: w(r, 480, 1); break;
+          case 0x4e: w(r, 1125, 1); break;
+          case 0x4f: w(r, 480, 1); break;
+          case 0x50: w(r, 1125, 1); break;
+          case 0x51: w(r, 480, 1); break;
+          case 0x52: w(r, 1125, 1); break;
+          case 0x53: w(r, 480, 1); break;
+          case 0x54: w(r, 381, 1); break;
+          case 0x55: w(r, 366, 1); break;
+          case 0x56: w(r, 381, 1); break;
+          case 0x57: w(r, 366, 1); break;
+          case 0x58: w(r, 1134, 1); break;
+          case 0x59: w(r, 39, 1); break;
+          case 0x5a: w(r, 1134, 1); break;
+          case 0x5b: w(r, 39, 1); break;
+          case 0x5c: w(r, 1134, 1); break;
+          case 0x5d: w(r, 39, 1); break;
+          case 0x5e: w(r, 1134, 1); break;
+          case 0x5f: w(r, 39, 1); break;
+          case 0x60: w(r, 1137, 1); break;
+          case 0x61: w(r, 43, 1); break;
+          case 0x62: w(r, 1137, 1); break;
+          case 0x63: w(r, 43, 1); break;
+          case 0x64: w(r, 1137, 1); break;
+          case 0x65: w(r, 43, 1); break;
+          case 0x66: w(r, 1137, 1); break;
+          case 0x67: w(r, 43, 1); break;
+          case 0x68: w(r, 1137, 1); break;
+          case 0x69: w(r, 43, 1); break;
+          case 0x6a: w(r, 407, 1); break;
+          case 0x6b: w(r, 1089, 1); break;
+          case 0x6c: w(r, 407, 1); break;
+          case 0x6d: w(r, 1089, 1); break;
+          case 0x6e: w(r, 407, 1); break;
+          case 0x6f: w(r, 1089, 1); break;
+          case 0x70: w(r, 407, 1); break;
+          case 0x71: w(r, 1089, 1); break;
+          case 0x72: w(r, 1143, 1); break;
+          case 0x73: w(r, 967, 1); break;
+          case 0x74: w(r, 1143, 1); break;
+          case 0x75: w(r, 967, 1); break;
+          case 0x76: w(r, 1143, 1); break;
+          case 0x77: w(r, 967, 1); break;
+          case 0x78: w(r, 1143, 1); break;
+          case 0x79: w(r, 967, 1); break;
+          case 0x7a: w(r, 1143, 1); break;
+          case 0x7b: w(r, 967, 1); break;
+          case 0x7c: w(r, 162, 1); break;
+          case 0x7d: w(r, 166, 1); break;
+          case 0x7e: w(r, 162, 1); break;
+          case 0x7f: w(r, 166, 1); break;
+          case 0x80: w(r, 1149, 1); break;
+          case 0x81: w(r, 1098, 1); break;
+          case 0x82: w(r, 1149, 1); break;
+          case 0x83: w(r, 1098, 1); break;
+          case 0x84: w(r, 1149, 1); break;
+          case 0x85: w(r, 1098, 1); break;
+          case 0x86: w(r, 1149, 1); break;
+          case 0x87: w(r, 1098, 1); break;
+          case 0x88: w(r, 1149, 1); break;
+          case 0x89: w(r, 1098, 1); break;
+          case 0x8a: w(r, 869, 1); break;
+          case 0x8b: w(r, 872, 1); break;
+          case 0x8c: w(r, 869, 1); break;
+          case 0x8d: w(r, 872, 1); break;
+          case 0x8e: w(r, 1155, 1); break;
+          case 0x8f: w(r, 1104, 1); break;
+          case 0x90: w(r, 1158, 1); break;
+          case 0x91: w(r, 400, 1); break;
+          case 0x92: w(r, 1158, 1); break;
+          case 0x93: w(r, 400, 1); break;
+          case 0x94: w(r, 1158, 1); break;
+          case 0x95: w(r, 400, 1); break;
+          case 0x96: w(r, 380, 1); break;
+          case 0x97: w(r, 1089, 1); break;
+          case 0x98: w(r, 1098, 1); break;
+          case 0x99: w(r, 1104, 1); break;
+          case 0x9a: w(r, 1256, 2); break;
+          case 0x9b: w(r, 43, 1); break;
+          case 0xa0: w(r, 491, 1); break;
+          case 0xa1: w(r, 40, 1); break;
+          case 0xa2: w(r, 491, 1); break;
+          case 0xa3: w(r, 40, 1); break;
+          case 0xa4: w(r, 491, 1); break;
+          case 0xa5: w(r, 40, 1); break;
+          case 0xa6: w(r, 491, 1); break;
+          case 0xa7: w(r, 40, 1); break;
+          case 0xa8: w(r, 491, 1); break;
+          case 0xa9: w(r, 40, 1); break;
+          case 0xaa: w(r, 491, 1); break;
+          case 0xab: w(r, 40, 1); break;
+          case 0xac: w(r, 491, 1); break;
+          case 0xad: w(r, 40, 1); break;
+          case 0xae: w(r, 491, 1); break;
+          case 0xaf: w(r, 40, 1); break;
+          case 0xb0: w(r, 491, 1); break;
+          case 0xb1: w(r, 40, 1); break;
+          case 0xb2: w(r, 491, 1); break;
+          case 0xb3: w(r, 40, 1); break;
+          case 0xb4: w(r, 491, 1); break;
+          case 0xb5: w(r, 40, 1); break;
+          case 0xb6: w(r, 491, 1); break;
+          case 0xb7: w(r, 40, 1); break;
+          case 0xb8: w(r, 921, 1); break;
+          case 0xb9: w(r, 518, 1); break;
+          case 0xba: w(r, 921, 1); break;
+          case 0xbb: w(r, 518, 1); break;
+          case 0xbc: w(r, 921, 1); break;
+          case 0xbd: w(r, 518, 1); break;
+          case 0xbe: w(r, 921, 1); break;
+          case 0xbf: w(r, 518, 1); break;
+          case 0xc0: w(r, 921, 1); break;
+          case 0xc1: w(r, 518, 1); break;
+          case 0xc2: w(r, 921, 1); break;
+          case 0xc3: w(r, 518, 1); break;
+          case 0xc4: w(r, 921, 1); break;
+          case 0xc5: w(r, 518, 1); break;
+          case 0xc6: w(r, 921, 1); break;
+          case 0xc7: w(r, 518, 1); break;
+          case 0xc8: w(r, 163, 1); break;
+          case 0xc9: w(r, 167, 1); break;
+          case 0xca: w(r, 163, 1); break;
+          case 0xcb: w(r, 167, 1); break;
+          case 0xcc: w(r, 1125, 1); break;
+          case 0xcd: w(r, 480, 1); break;
+          case 0xce: w(r, 1125, 1); break;
+          case 0xcf: w(r, 480, 1); break;
+          case 0xd0: w(r, 1125, 1); break;
+          case 0xd1: w(r, 480, 1); break;
+          case 0xd2: w(r, 1125, 1); break;
+          case 0xd3: w(r, 480, 1); break;
+          case 0xd4: w(r, 1125, 1); break;
+          case 0xd5: w(r, 480, 1); break;
+          case 0xd6: w(r, 1125, 1); break;
+          case 0xd7: w(r, 480, 1); break;
+          case 0xd8: w(r, 1125, 1); break;
+          case 0xd9: w(r, 480, 1); break;
+          case 0xda: w(r, 1125, 1); break;
+          case 0xdb: w(r, 480, 1); break;
+          case 0xdc: w(r, 1125, 1); break;
+          case 0xdd: w(r, 480, 1); break;
+          case 0xde: w(r, 1125, 1); break;
+          case 0xdf: w(r, 480, 1); break;
+          case 0xe0: w(r, 1125, 1); break;
+          case 0xe1: w(r, 480, 1); break;
+          case 0xe2: w(r, 1125, 1); break;
+          case 0xe3: w(r, 480, 1); break;
+          case 0xe4: w(r, 1143, 1); break;
+          case 0xe5: w(r, 967, 1); break;
+          case 0xe6: w(r, 1143, 1); break;
+          case 0xe7: w(r, 967, 1); break;
+          case 0xe8: w(r, 1143, 1); break;
+          case 0xe9: w(r, 967, 1); break;
+          case 0xea: w(r, 1143, 1); break;
+          case 0xeb: w(r, 967, 1); break;
+          case 0xec: w(r, 1143, 1); break;
+          case 0xed: w(r, 967, 1); break;
+          case 0xee: w(r, 1143, 1); break;
+          case 0xef: w(r, 967, 1); break;
+          case 0xf0: w(r, 1143, 1); break;
+          case 0xf1: w(r, 967, 1); break;
+          case 0xf2: w(r, 1155, 1); break;
+          case 0xf3: w(r, 1104, 1); break;
+          case 0xf4: w(r, 1155, 1); break;
+          case 0xf5: w(r, 1104, 1); break;
+          case 0xf6: w(r, 1155, 1); break;
+          case 0xf7: w(r, 1104, 1); break;
+          case 0xf8: w(r, 1155, 1); break;
+          case 0xf9: w(r, 1104, 1); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0x1f00:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x0: w(r, 1832, 1); break;
+          case 0x1: w(r, 1832, 1); break;
+          case 0x2: w(r, 1832, 1); break;
+          case 0x3: w(r, 1832, 1); break;
+          case 0x4: w(r, 1832, 1); break;
+          case 0x5: w(r, 1832, 1); break;
+          case 0x6: w(r, 1832, 1); break;
+          case 0x7: w(r, 1832, 1); break;
+          case 0x8: w(r, 1820, 1); break;
+          case 0x9: w(r, 1820, 1); break;
+          case 0xa: w(r, 1820, 1); break;
+          case 0xb: w(r, 1820, 1); break;
+          case 0xc: w(r, 1820, 1); break;
+          case 0xd: w(r, 1820, 1); break;
+          case 0xe: w(r, 1820, 1); break;
+          case 0xf: w(r, 1820, 1); break;
+          case 0x10: w(r, 1828, 1); break;
+          case 0x11: w(r, 1828, 1); break;
+          case 0x12: w(r, 1828, 1); break;
+          case 0x13: w(r, 1828, 1); break;
+          case 0x14: w(r, 1828, 1); break;
+          case 0x15: w(r, 1828, 1); break;
+          case 0x18: w(r, 1816, 1); break;
+          case 0x19: w(r, 1816, 1); break;
+          case 0x1a: w(r, 1816, 1); break;
+          case 0x1b: w(r, 1816, 1); break;
+          case 0x1c: w(r, 1816, 1); break;
+          case 0x1d: w(r, 1816, 1); break;
+          case 0x20: w(r, 1857, 1); break;
+          case 0x21: w(r, 1857, 1); break;
+          case 0x22: w(r, 1857, 1); break;
+          case 0x23: w(r, 1857, 1); break;
+          case 0x24: w(r, 1857, 1); break;
+          case 0x25: w(r, 1857, 1); break;
+          case 0x26: w(r, 1857, 1); break;
+          case 0x27: w(r, 1857, 1); break;
+          case 0x28: w(r, 1814, 1); break;
+          case 0x29: w(r, 1814, 1); break;
+          case 0x2a: w(r, 1814, 1); break;
+          case 0x2b: w(r, 1814, 1); break;
+          case 0x2c: w(r, 1814, 1); break;
+          case 0x2d: w(r, 1814, 1); break;
+          case 0x2e: w(r, 1814, 1); break;
+          case 0x2f: w(r, 1814, 1); break;
+          case 0x30: w(r, 1856, 1); break;
+          case 0x31: w(r, 1856, 1); break;
+          case 0x32: w(r, 1856, 1); break;
+          case 0x33: w(r, 1856, 1); break;
+          case 0x34: w(r, 1856, 1); break;
+          case 0x35: w(r, 1856, 1); break;
+          case 0x36: w(r, 1856, 1); break;
+          case 0x37: w(r, 1856, 1); break;
+          case 0x38: w(r, 1812, 1); break;
+          case 0x39: w(r, 1812, 1); break;
+          case 0x3a: w(r, 1812, 1); break;
+          case 0x3b: w(r, 1812, 1); break;
+          case 0x3c: w(r, 1812, 1); break;
+          case 0x3d: w(r, 1812, 1); break;
+          case 0x3e: w(r, 1812, 1); break;
+          case 0x3f: w(r, 1812, 1); break;
+          case 0x40: w(r, 1852, 1); break;
+          case 0x41: w(r, 1852, 1); break;
+          case 0x42: w(r, 1852, 1); break;
+          case 0x43: w(r, 1852, 1); break;
+          case 0x44: w(r, 1852, 1); break;
+          case 0x45: w(r, 1852, 1); break;
+          case 0x48: w(r, 1842, 1); break;
+          case 0x49: w(r, 1842, 1); break;
+          case 0x4a: w(r, 1842, 1); break;
+          case 0x4b: w(r, 1842, 1); break;
+          case 0x4c: w(r, 1842, 1); break;
+          case 0x4d: w(r, 1842, 1); break;
+          case 0x50: w(r, 1848, 1); break;
+          case 0x51: w(r, 1848, 1); break;
+          case 0x52: w(r, 1848, 1); break;
+          case 0x53: w(r, 1848, 1); break;
+          case 0x54: w(r, 1848, 1); break;
+          case 0x55: w(r, 1848, 1); break;
+          case 0x56: w(r, 1848, 1); break;
+          case 0x57: w(r, 1848, 1); break;
+          case 0x59: w(r, 1837, 1); break;
+          case 0x5b: w(r, 1837, 1); break;
+          case 0x5d: w(r, 1837, 1); break;
+          case 0x5f: w(r, 1837, 1); break;
+          case 0x60: w(r, 1830, 1); break;
+          case 0x61: w(r, 1830, 1); break;
+          case 0x62: w(r, 1830, 1); break;
+          case 0x63: w(r, 1830, 1); break;
+          case 0x64: w(r, 1830, 1); break;
+          case 0x65: w(r, 1830, 1); break;
+          case 0x66: w(r, 1830, 1); break;
+          case 0x67: w(r, 1830, 1); break;
+          case 0x68: w(r, 1333, 1); break;
+          case 0x69: w(r, 1333, 1); break;
+          case 0x6a: w(r, 1333, 1); break;
+          case 0x6b: w(r, 1333, 1); break;
+          case 0x6c: w(r, 1333, 1); break;
+          case 0x6d: w(r, 1333, 1); break;
+          case 0x6e: w(r, 1333, 1); break;
+          case 0x6f: w(r, 1333, 1); break;
+          case 0x70: w(r, 1832, 1); break;
+          case 0x71: w(r, 1832, 1); break;
+          case 0x72: w(r, 1828, 1); break;
+          case 0x73: w(r, 1828, 1); break;
+          case 0x74: w(r, 1857, 1); break;
+          case 0x75: w(r, 1857, 1); break;
+          case 0x76: w(r, 1856, 1); break;
+          case 0x77: w(r, 1856, 1); break;
+          case 0x78: w(r, 1852, 1); break;
+          case 0x79: w(r, 1852, 1); break;
+          case 0x7a: w(r, 1848, 1); break;
+          case 0x7b: w(r, 1848, 1); break;
+          case 0x7c: w(r, 1830, 1); break;
+          case 0x7d: w(r, 1830, 1); break;
+          case 0x80: w(r, 1832, 1); break;
+          case 0x81: w(r, 1832, 1); break;
+          case 0x82: w(r, 1832, 1); break;
+          case 0x83: w(r, 1832, 1); break;
+          case 0x84: w(r, 1832, 1); break;
+          case 0x85: w(r, 1832, 1); break;
+          case 0x86: w(r, 1832, 1); break;
+          case 0x87: w(r, 1832, 1); break;
+          case 0x88: w(r, 1820, 1); break;
+          case 0x89: w(r, 1820, 1); break;
+          case 0x8a: w(r, 1820, 1); break;
+          case 0x8b: w(r, 1820, 1); break;
+          case 0x8c: w(r, 1820, 1); break;
+          case 0x8d: w(r, 1820, 1); break;
+          case 0x8e: w(r, 1820, 1); break;
+          case 0x8f: w(r, 1820, 1); break;
+          case 0x90: w(r, 1857, 1); break;
+          case 0x91: w(r, 1857, 1); break;
+          case 0x92: w(r, 1857, 1); break;
+          case 0x93: w(r, 1857, 1); break;
+          case 0x94: w(r, 1857, 1); break;
+          case 0x95: w(r, 1857, 1); break;
+          case 0x96: w(r, 1857, 1); break;
+          case 0x97: w(r, 1857, 1); break;
+          case 0x98: w(r, 1814, 1); break;
+          case 0x99: w(r, 1814, 1); break;
+          case 0x9a: w(r, 1814, 1); break;
+          case 0x9b: w(r, 1814, 1); break;
+          case 0x9c: w(r, 1814, 1); break;
+          case 0x9d: w(r, 1814, 1); break;
+          case 0x9e: w(r, 1814, 1); break;
+          case 0x9f: w(r, 1814, 1); break;
+          case 0xa0: w(r, 1830, 1); break;
+          case 0xa1: w(r, 1830, 1); break;
+          case 0xa2: w(r, 1830, 1); break;
+          case 0xa3: w(r, 1830, 1); break;
+          case 0xa4: w(r, 1830, 1); break;
+          case 0xa5: w(r, 1830, 1); break;
+          case 0xa6: w(r, 1830, 1); break;
+          case 0xa7: w(r, 1830, 1); break;
+          case 0xa8: w(r, 1333, 1); break;
+          case 0xa9: w(r, 1333, 1); break;
+          case 0xaa: w(r, 1333, 1); break;
+          case 0xab: w(r, 1333, 1); break;
+          case 0xac: w(r, 1333, 1); break;
+          case 0xad: w(r, 1333, 1); break;
+          case 0xae: w(r, 1333, 1); break;
+          case 0xaf: w(r, 1333, 1); break;
+          case 0xb0: w(r, 1832, 1); break;
+          case 0xb1: w(r, 1832, 1); break;
+          case 0xb2: w(r, 1832, 1); break;
+          case 0xb3: w(r, 1832, 1); break;
+          case 0xb4: w(r, 1832, 1); break;
+          case 0xb6: w(r, 1832, 1); break;
+          case 0xb7: w(r, 1832, 1); break;
+          case 0xb8: w(r, 1820, 1); break;
+          case 0xb9: w(r, 1820, 1); break;
+          case 0xba: w(r, 1820, 1); break;
+          case 0xbb: w(r, 1820, 1); break;
+          case 0xbc: w(r, 1820, 1); break;
+          case 0xbd: w(r, 3, 1); break;
+          case 0xbe: w(r, 1856, 1); break;
+          case 0xbf: w(r, 3, 1); break;
+          case 0xc0: w(r, 3, 1); break;
+          case 0xc1: w(r, 3, 1); break;
+          case 0xc2: w(r, 1857, 1); break;
+          case 0xc3: w(r, 1857, 1); break;
+          case 0xc4: w(r, 1857, 1); break;
+          case 0xc6: w(r, 1857, 1); break;
+          case 0xc7: w(r, 1857, 1); break;
+          case 0xc8: w(r, 1816, 1); break;
+          case 0xc9: w(r, 1816, 1); break;
+          case 0xca: w(r, 1814, 1); break;
+          case 0xcb: w(r, 1814, 1); break;
+          case 0xcc: w(r, 1814, 1); break;
+          case 0xcd: w(r, 3, 1); break;
+          case 0xce: w(r, 3, 1); break;
+          case 0xcf: w(r, 3, 1); break;
+          case 0xd0: w(r, 1856, 1); break;
+          case 0xd1: w(r, 1856, 1); break;
+          case 0xd2: w(r, 1856, 1); break;
+          case 0xd3: w(r, 1856, 1); break;
+          case 0xd6: w(r, 1856, 1); break;
+          case 0xd7: w(r, 1856, 1); break;
+          case 0xd8: w(r, 1812, 1); break;
+          case 0xd9: w(r, 1812, 1); break;
+          case 0xda: w(r, 1812, 1); break;
+          case 0xdb: w(r, 1812, 1); break;
+          case 0xdd: w(r, 3, 1); break;
+          case 0xde: w(r, 3, 1); break;
+          case 0xdf: w(r, 3, 1); break;
+          case 0xe0: w(r, 1848, 1); break;
+          case 0xe1: w(r, 1848, 1); break;
+          case 0xe2: w(r, 1848, 1); break;
+          case 0xe3: w(r, 1848, 1); break;
+          case 0xe4: w(r, 1824, 1); break;
+          case 0xe5: w(r, 1824, 1); break;
+          case 0xe6: w(r, 1848, 1); break;
+          case 0xe7: w(r, 1848, 1); break;
+          case 0xe8: w(r, 1837, 1); break;
+          case 0xe9: w(r, 1837, 1); break;
+          case 0xea: w(r, 1837, 1); break;
+          case 0xeb: w(r, 1837, 1); break;
+          case 0xec: w(r, 1840, 1); break;
+          case 0xed: w(r, 3, 1); break;
+          case 0xee: w(r, 3, 1); break;
+          case 0xef: w(r, 1761, 1); break;
+          case 0xf2: w(r, 1830, 1); break;
+          case 0xf3: w(r, 1830, 1); break;
+          case 0xf4: w(r, 1830, 1); break;
+          case 0xf6: w(r, 1830, 1); break;
+          case 0xf7: w(r, 1830, 1); break;
+          case 0xf8: w(r, 1842, 1); break;
+          case 0xf9: w(r, 1842, 1); break;
+          case 0xfa: w(r, 1333, 1); break;
+          case 0xfb: w(r, 1333, 1); break;
+          case 0xfc: w(r, 1333, 1); break;
+          case 0xfd: w(r, 3, 1); break;
+          case 0xfe: w(r, 3, 1); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0x2000:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x0: w(r, 3, 1); break;
+          case 0x1: w(r, 3, 1); break;
+          case 0x2: w(r, 3, 1); break;
+          case 0x3: w(r, 3, 1); break;
+          case 0x4: w(r, 3, 1); break;
+          case 0x5: w(r, 3, 1); break;
+          case 0x6: w(r, 3, 1); break;
+          case 0x7: w(r, 3, 1); break;
+          case 0x8: w(r, 3, 1); break;
+          case 0x9: w(r, 3, 1); break;
+          case 0xa: w(r, 3, 1); break;
+          case 0x11: w(r, 2192, 1); break;
+          case 0x17: w(r, 3, 1); break;
+          case 0x24: w(r, 347, 1); break;
+          case 0x25: w(r, 389, 2); break;
+          case 0x26: w(r, 389, 3); break;
+          case 0x2f: w(r, 3, 1); break;
+          case 0x33: w(r, 130, 2); break;
+          case 0x34: w(r, 130, 3); break;
+          case 0x36: w(r, 1232, 2); break;
+          case 0x37: w(r, 1232, 3); break;
+          case 0x3c: w(r, 1427, 2); break;
+          case 0x3e: w(r, 3, 1); break;
+          case 0x47: w(r, 1425, 2); break;
+          case 0x48: w(r, 1426, 2); break;
+          case 0x49: w(r, 1424, 2); break;
+          case 0x57: w(r, 130, 4); break;
+          case 0x5f: w(r, 3, 1); break;
+          case 0x70: w(r, 161, 1); break;
+          case 0x71: w(r, 167, 1); break;
+          case 0x74: w(r, 188, 1); break;
+          case 0x75: w(r, 192, 1); break;
+          case 0x76: w(r, 196, 1); break;
+          case 0x77: w(r, 200, 1); break;
+          case 0x78: w(r, 204, 1); break;
+          case 0x79: w(r, 208, 1); break;
+          case 0x7a: w(r, 1773, 1); break;
+          case 0x7b: w(r, 2191, 1); break;
+          case 0x7c: w(r, 1109, 1); break;
+          case 0x7d: w(r, 26, 1); break;
+          case 0x7e: w(r, 32, 1); break;
+          case 0x7f: w(r, 1059, 1); break;
+          case 0x80: w(r, 161, 1); break;
+          case 0x81: w(r, 158, 1); break;
+          case 0x82: w(r, 44, 1); break;
+          case 0x83: w(r, 184, 1); break;
+          case 0x84: w(r, 188, 1); break;
+          case 0x85: w(r, 192, 1); break;
+          case 0x86: w(r, 196, 1); break;
+          case 0x87: w(r, 200, 1); break;
+          case 0x88: w(r, 204, 1); break;
+          case 0x89: w(r, 208, 1); break;
+          case 0x8a: w(r, 1773, 1); break;
+          case 0x8b: w(r, 2191, 1); break;
+          case 0x8c: w(r, 1109, 1); break;
+          case 0x8d: w(r, 26, 1); break;
+          case 0x8e: w(r, 32, 1); break;
+          case 0x90: w(r, 40, 1); break;
+          case 0x91: w(r, 518, 1); break;
+          case 0x92: w(r, 480, 1); break;
+          case 0x93: w(r, 872, 1); break;
+          case 0x94: w(r, 1922, 1); break;
+          case 0x95: w(r, 380, 1); break;
+          case 0x96: w(r, 330, 1); break;
+          case 0x97: w(r, 333, 1); break;
+          case 0x98: w(r, 334, 1); break;
+          case 0x99: w(r, 1059, 1); break;
+          case 0x9a: w(r, 366, 1); break;
+          case 0x9b: w(r, 43, 1); break;
+          case 0x9c: w(r, 1089, 1); break;
+          case 0xa8: w(r, 1430, 2); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0x2100:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x0: w(r, 956, 3); break;
+          case 0x1: w(r, 959, 3); break;
+          case 0x2: w(r, 358, 1); break;
+          case 0x3: w(r, 1432, 2); break;
+          case 0x5: w(r, 962, 3); break;
+          case 0x6: w(r, 965, 3); break;
+          case 0x7: w(r, 2229, 1); break;
+          case 0x9: w(r, 1434, 2); break;
+          case 0xa: w(r, 361, 1); break;
+          case 0xb: w(r, 399, 1); break;
+          case 0xc: w(r, 399, 1); break;
+          case 0xd: w(r, 399, 1); break;
+          case 0xe: w(r, 380, 1); break;
+          case 0xf: w(r, 2228, 1); break;
+          case 0x10: w(r, 163, 1); break;
+          case 0x11: w(r, 163, 1); break;
+          case 0x12: w(r, 515, 1); break;
+          case 0x13: w(r, 333, 1); break;
+          case 0x15: w(r, 1122, 1); break;
+          case 0x16: w(r, 1438, 2); break;
+          case 0x19: w(r, 381, 1); break;
+          case 0x1a: w(r, 1131, 1); break;
+          case 0x1b: w(r, 1134, 1); break;
+          case 0x1c: w(r, 1134, 1); break;
+          case 0x1d: w(r, 1134, 1); break;
+          case 0x20: w(r, 1442, 2); break;
+          case 0x21: w(r, 968, 3); break;
+          case 0x22: w(r, 1444, 2); break;
+          case 0x24: w(r, 1158, 1); break;
+          case 0x26: w(r, 1333, 1); break;
+          case 0x28: w(r, 1158, 1); break;
+          case 0x2a: w(r, 939, 1); break;
+          case 0x2b: w(r, 491, 1); break;
+          case 0x2c: w(r, 912, 1); break;
+          case 0x2d: w(r, 358, 1); break;
+          case 0x2f: w(r, 518, 1); break;
+          case 0x30: w(r, 921, 1); break;
+          case 0x31: w(r, 924, 1); break;
+          case 0x33: w(r, 401, 1); break;
+          case 0x34: w(r, 480, 1); break;
+          case 0x35: w(r, 1722, 1); break;
+          case 0x36: w(r, 2159, 1); break;
+          case 0x37: w(r, 2160, 1); break;
+          case 0x38: w(r, 2151, 1); break;
+          case 0x39: w(r, 167, 1); break;
+          case 0x3b: w(r, 974, 3); break;
+          case 0x3c: w(r, 1823, 1); break;
+          case 0x3d: w(r, 1845, 1); break;
+          case 0x3e: w(r, 1818, 1); break;
+          case 0x3f: w(r, 1841, 1); break;
+          case 0x40: w(r, 2250, 1); break;
+          case 0x45: w(r, 517, 1); break;
+          case 0x46: w(r, 41, 1); break;
+          case 0x47: w(r, 518, 1); break;
+          case 0x48: w(r, 167, 1); break;
+          case 0x49: w(r, 1047, 1); break;
+          case 0x50: w(r, 977, 3); break;
+          case 0x51: w(r, 980, 3); break;
+          case 0x52: w(r, 158, 4); break;
+          case 0x53: w(r, 983, 3); break;
+          case 0x54: w(r, 986, 3); break;
+          case 0x55: w(r, 989, 3); break;
+          case 0x56: w(r, 992, 3); break;
+          case 0x57: w(r, 995, 3); break;
+          case 0x58: w(r, 998, 3); break;
+          case 0x59: w(r, 1001, 3); break;
+          case 0x5a: w(r, 1004, 3); break;
+          case 0x5b: w(r, 1007, 3); break;
+          case 0x5c: w(r, 1010, 3); break;
+          case 0x5d: w(r, 1013, 3); break;
+          case 0x5e: w(r, 1016, 3); break;
+          case 0x5f: w(r, 158, 2); break;
+          case 0x60: w(r, 163, 1); break;
+          case 0x61: w(r, 163, 2); break;
+          case 0x62: w(r, 163, 3); break;
+          case 0x63: w(r, 1416, 2); break;
+          case 0x64: w(r, 162, 1); break;
+          case 0x65: w(r, 162, 2); break;
+          case 0x66: w(r, 162, 3); break;
+          case 0x67: w(r, 162, 4); break;
+          case 0x68: w(r, 1418, 2); break;
+          case 0x69: w(r, 869, 1); break;
+          case 0x6a: w(r, 869, 2); break;
+          case 0x6b: w(r, 869, 3); break;
+          case 0x6c: w(r, 515, 1); break;
+          case 0x6d: w(r, 358, 1); break;
+          case 0x6e: w(r, 517, 1); break;
+          case 0x6f: w(r, 401, 1); break;
+          case 0x70: w(r, 167, 1); break;
+          case 0x71: w(r, 167, 2); break;
+          case 0x72: w(r, 167, 3); break;
+          case 0x73: w(r, 1422, 2); break;
+          case 0x74: w(r, 166, 1); break;
+          case 0x75: w(r, 166, 2); break;
+          case 0x76: w(r, 166, 3); break;
+          case 0x77: w(r, 166, 4); break;
+          case 0x78: w(r, 1454, 2); break;
+          case 0x79: w(r, 872, 1); break;
+          case 0x7a: w(r, 872, 2); break;
+          case 0x7b: w(r, 872, 3); break;
+          case 0x7c: w(r, 333, 1); break;
+          case 0x7d: w(r, 331, 1); break;
+          case 0x7e: w(r, 41, 1); break;
+          case 0x7f: w(r, 334, 1); break;
+          case 0x89: w(r, 875, 3); break;
+          case 0x9a: w(r, 1909, 1); break;
+          case 0x9b: w(r, 1907, 1); break;
+          case 0xae: w(r, 2230, 1); break;
+          case 0xcd: w(r, 2231, 1); break;
+          case 0xce: w(r, 2232, 1); break;
+          case 0xcf: w(r, 2233, 1); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0x2200:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x4: w(r, 2234, 1); break;
+          case 0x9: w(r, 2235, 1); break;
+          case 0xc: w(r, 2236, 1); break;
+          case 0x24: w(r, 2237, 1); break;
+          case 0x26: w(r, 2238, 1); break;
+          case 0x2c: w(r, 370, 2); break;
+          case 0x2d: w(r, 370, 3); break;
+          case 0x2f: w(r, 878, 2); break;
+          case 0x30: w(r, 878, 3); break;
+          case 0x41: w(r, 2239, 1); break;
+          case 0x44: w(r, 2240, 1); break;
+          case 0x47: w(r, 2241, 1); break;
+          case 0x49: w(r, 2242, 1); break;
+          case 0x60: w(r, 1109, 1); break;
+          case 0x62: w(r, 2243, 1); break;
+          case 0x6d: w(r, 2244, 1); break;
+          case 0x6e: w(r, 1775, 1); break;
+          case 0x6f: w(r, 1776, 1); break;
+          case 0x70: w(r, 2245, 1); break;
+          case 0x71: w(r, 2246, 1); break;
+          case 0x74: w(r, 2247, 1); break;
+          case 0x75: w(r, 2248, 1); break;
+          case 0x78: w(r, 2249, 1); break;
+          case 0x79: w(r, 2193, 1); break;
+          case 0x80: w(r, 2194, 1); break;
+          case 0x81: w(r, 2195, 1); break;
+          case 0x84: w(r, 2196, 1); break;
+          case 0x85: w(r, 2197, 1); break;
+          case 0x88: w(r, 2198, 1); break;
+          case 0x89: w(r, 2199, 1); break;
+          case 0xac: w(r, 2200, 1); break;
+          case 0xad: w(r, 2201, 1); break;
+          case 0xae: w(r, 2202, 1); break;
+          case 0xaf: w(r, 2203, 1); break;
+          case 0xe0: w(r, 2204, 1); break;
+          case 0xe1: w(r, 2205, 1); break;
+          case 0xe2: w(r, 2206, 1); break;
+          case 0xe3: w(r, 2207, 1); break;
+          case 0xea: w(r, 2208, 1); break;
+          case 0xeb: w(r, 2209, 1); break;
+          case 0xec: w(r, 2210, 1); break;
+          case 0xed: w(r, 2211, 1); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0x2300:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x29: w(r, 1784, 1); break;
+          case 0x2a: w(r, 1783, 1); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0x2400:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x60: w(r, 158, 1); break;
+          case 0x61: w(r, 44, 1); break;
+          case 0x62: w(r, 184, 1); break;
+          case 0x63: w(r, 188, 1); break;
+          case 0x64: w(r, 192, 1); break;
+          case 0x65: w(r, 196, 1); break;
+          case 0x66: w(r, 200, 1); break;
+          case 0x67: w(r, 204, 1); break;
+          case 0x68: w(r, 208, 1); break;
+          case 0x69: w(r, 160, 2); break;
+          case 0x6a: w(r, 175, 2); break;
+          case 0x6b: w(r, 179, 2); break;
+          case 0x6c: w(r, 183, 2); break;
+          case 0x6d: w(r, 187, 2); break;
+          case 0x6e: w(r, 191, 2); break;
+          case 0x6f: w(r, 195, 2); break;
+          case 0x70: w(r, 199, 2); break;
+          case 0x71: w(r, 203, 2); break;
+          case 0x72: w(r, 207, 2); break;
+          case 0x73: w(r, 211, 2); break;
+          case 0x74: w(r, 881, 3); break;
+          case 0x75: w(r, 884, 3); break;
+          case 0x76: w(r, 887, 3); break;
+          case 0x77: w(r, 890, 3); break;
+          case 0x78: w(r, 893, 3); break;
+          case 0x79: w(r, 896, 3); break;
+          case 0x7a: w(r, 899, 3); break;
+          case 0x7b: w(r, 902, 3); break;
+          case 0x7c: w(r, 905, 3); break;
+          case 0x7d: w(r, 170, 4); break;
+          case 0x7e: w(r, 174, 4); break;
+          case 0x7f: w(r, 178, 4); break;
+          case 0x80: w(r, 182, 4); break;
+          case 0x81: w(r, 186, 4); break;
+          case 0x82: w(r, 190, 4); break;
+          case 0x83: w(r, 194, 4); break;
+          case 0x84: w(r, 198, 4); break;
+          case 0x85: w(r, 202, 4); break;
+          case 0x86: w(r, 206, 4); break;
+          case 0x87: w(r, 210, 4); break;
+          case 0x88: w(r, 1167, 2); break;
+          case 0x89: w(r, 388, 2); break;
+          case 0x8a: w(r, 1173, 2); break;
+          case 0x8b: w(r, 1176, 2); break;
+          case 0x8c: w(r, 1179, 2); break;
+          case 0x8d: w(r, 1182, 2); break;
+          case 0x8e: w(r, 1185, 2); break;
+          case 0x8f: w(r, 1188, 2); break;
+          case 0x90: w(r, 1191, 2); break;
+          case 0x91: w(r, 1163, 3); break;
+          case 0x92: w(r, 1166, 3); break;
+          case 0x93: w(r, 1169, 3); break;
+          case 0x94: w(r, 1172, 3); break;
+          case 0x95: w(r, 1175, 3); break;
+          case 0x96: w(r, 1178, 3); break;
+          case 0x97: w(r, 1181, 3); break;
+          case 0x98: w(r, 1184, 3); break;
+          case 0x99: w(r, 1187, 3); break;
+          case 0x9a: w(r, 1190, 3); break;
+          case 0x9b: w(r, 1193, 3); break;
+          case 0x9c: w(r, 1196, 3); break;
+          case 0x9d: w(r, 1199, 3); break;
+          case 0x9e: w(r, 1202, 3); break;
+          case 0x9f: w(r, 1028, 3); break;
+          case 0xa0: w(r, 1031, 3); break;
+          case 0xa1: w(r, 1034, 3); break;
+          case 0xa2: w(r, 1037, 3); break;
+          case 0xa3: w(r, 1040, 3); break;
+          case 0xa4: w(r, 1043, 3); break;
+          case 0xa5: w(r, 1046, 3); break;
+          case 0xa6: w(r, 1049, 3); break;
+          case 0xa7: w(r, 1052, 3); break;
+          case 0xa8: w(r, 1055, 3); break;
+          case 0xa9: w(r, 1058, 3); break;
+          case 0xaa: w(r, 1064, 3); break;
+          case 0xab: w(r, 1067, 3); break;
+          case 0xac: w(r, 1070, 3); break;
+          case 0xad: w(r, 1073, 3); break;
+          case 0xae: w(r, 1076, 3); break;
+          case 0xaf: w(r, 1088, 3); break;
+          case 0xb0: w(r, 1091, 3); break;
+          case 0xb1: w(r, 1094, 3); break;
+          case 0xb2: w(r, 1097, 3); break;
+          case 0xb3: w(r, 1100, 3); break;
+          case 0xb4: w(r, 1103, 3); break;
+          case 0xb5: w(r, 1106, 3); break;
+          case 0xb6: w(r, 491, 1); break;
+          case 0xb7: w(r, 912, 1); break;
+          case 0xb8: w(r, 358, 1); break;
+          case 0xb9: w(r, 517, 1); break;
+          case 0xba: w(r, 921, 1); break;
+          case 0xbb: w(r, 924, 1); break;
+          case 0xbc: w(r, 404, 1); break;
+          case 0xbd: w(r, 399, 1); break;
+          case 0xbe: w(r, 163, 1); break;
+          case 0xbf: w(r, 936, 1); break;
+          case 0xc0: w(r, 939, 1); break;
+          case 0xc1: w(r, 515, 1); break;
+          case 0xc2: w(r, 401, 1); break;
+          case 0xc3: w(r, 1122, 1); break;
+          case 0xc4: w(r, 1125, 1); break;
+          case 0xc5: w(r, 381, 1); break;
+          case 0xc6: w(r, 1131, 1); break;
+          case 0xc7: w(r, 1134, 1); break;
+          case 0xc8: w(r, 1137, 1); break;
+          case 0xc9: w(r, 407, 1); break;
+          case 0xca: w(r, 1143, 1); break;
+          case 0xcb: w(r, 162, 1); break;
+          case 0xcc: w(r, 1149, 1); break;
+          case 0xcd: w(r, 869, 1); break;
+          case 0xce: w(r, 1155, 1); break;
+          case 0xcf: w(r, 1158, 1); break;
+          case 0xd0: w(r, 40, 1); break;
+          case 0xd1: w(r, 383, 1); break;
+          case 0xd2: w(r, 331, 1); break;
+          case 0xd3: w(r, 41, 1); break;
+          case 0xd4: w(r, 518, 1); break;
+          case 0xd5: w(r, 593, 1); break;
+          case 0xd6: w(r, 361, 1); break;
+          case 0xd7: w(r, 380, 1); break;
+          case 0xd8: w(r, 167, 1); break;
+          case 0xd9: w(r, 1047, 1); break;
+          case 0xda: w(r, 330, 1); break;
+          case 0xdb: w(r, 333, 1); break;
+          case 0xdc: w(r, 334, 1); break;
+          case 0xdd: w(r, 1059, 1); break;
+          case 0xde: w(r, 480, 1); break;
+          case 0xdf: w(r, 366, 1); break;
+          case 0xe0: w(r, 1071, 1); break;
+          case 0xe1: w(r, 39, 1); break;
+          case 0xe2: w(r, 43, 1); break;
+          case 0xe3: w(r, 1089, 1); break;
+          case 0xe4: w(r, 967, 1); break;
+          case 0xe5: w(r, 166, 1); break;
+          case 0xe6: w(r, 1098, 1); break;
+          case 0xe7: w(r, 872, 1); break;
+          case 0xe8: w(r, 1104, 1); break;
+          case 0xe9: w(r, 400, 1); break;
+          case 0xea: w(r, 161, 1); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0x2a00:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0xc: w(r, 370, 4); break;
+          case 0x74: w(r, 1112, 3); break;
+          case 0x75: w(r, 1109, 2); break;
+          case 0x76: w(r, 1109, 3); break;
+          case 0xdc: w(r, 2212, 1); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0x2c00:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x7c: w(r, 1047, 1); break;
+          case 0x7d: w(r, 162, 1); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0x2d00:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x6f: w(r, 2213, 1); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0x2f00:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x0: w(r, 1209, 1); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0x3000:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x0: w(r, 3, 1); break;
+          case 0x36: w(r, 2214, 1); break;
+          case 0x4c: w(r, 1639, 1); break;
+          case 0x4e: w(r, 2215, 1); break;
+          case 0x50: w(r, 2216, 1); break;
+          case 0x52: w(r, 2217, 1); break;
+          case 0x54: w(r, 2218, 1); break;
+          case 0x56: w(r, 2219, 1); break;
+          case 0x58: w(r, 2220, 1); break;
+          case 0x5a: w(r, 2221, 1); break;
+          case 0x5c: w(r, 2222, 1); break;
+          case 0x5e: w(r, 2223, 1); break;
+          case 0x60: w(r, 2224, 1); break;
+          case 0x62: w(r, 2225, 1); break;
+          case 0x65: w(r, 2226, 1); break;
+          case 0x67: w(r, 2227, 1); break;
+          case 0x69: w(r, 2092, 1); break;
+          case 0x70: w(r, 2093, 1); break;
+          case 0x71: w(r, 2093, 1); break;
+          case 0x73: w(r, 2095, 1); break;
+          case 0x74: w(r, 2095, 1); break;
+          case 0x76: w(r, 2097, 1); break;
+          case 0x77: w(r, 2097, 1); break;
+          case 0x79: w(r, 2099, 1); break;
+          case 0x7a: w(r, 2099, 1); break;
+          case 0x7c: w(r, 1638, 1); break;
+          case 0x7d: w(r, 1638, 1); break;
+          case 0x94: w(r, 2101, 1); break;
+          case 0x9b: w(r, 3, 1); break;
+          case 0x9c: w(r, 3, 1); break;
+          case 0x9e: w(r, 2102, 1); break;
+          case 0x9f: w(r, 1460, 2); break;
+          case 0xac: w(r, 135, 1); break;
+          case 0xae: w(r, 45, 1); break;
+          case 0xb0: w(r, 81, 1); break;
+          case 0xb2: w(r, 54, 1); break;
+          case 0xb4: w(r, 575, 1); break;
+          case 0xb6: w(r, 71, 1); break;
+          case 0xb8: w(r, 103, 1); break;
+          case 0xba: w(r, 63, 1); break;
+          case 0xbc: w(r, 68, 1); break;
+          case 0xbe: w(r, 1407, 1); break;
+          case 0xc0: w(r, 113, 1); break;
+          case 0xc2: w(r, 73, 1); break;
+          case 0xc5: w(r, 454, 1); break;
+          case 0xc7: w(r, 1456, 1); break;
+          case 0xc9: w(r, 49, 1); break;
+          case 0xd0: w(r, 66, 1); break;
+          case 0xd1: w(r, 66, 1); break;
+          case 0xd3: w(r, 61, 1); break;
+          case 0xd4: w(r, 61, 1); break;
+          case 0xd6: w(r, 56, 1); break;
+          case 0xd7: w(r, 56, 1); break;
+          case 0xd9: w(r, 111, 1); break;
+          case 0xda: w(r, 111, 1); break;
+          case 0xdc: w(r, 142, 1); break;
+          case 0xdd: w(r, 142, 1); break;
+          case 0xf4: w(r, 497, 1); break;
+          case 0xf7: w(r, 93, 1); break;
+          case 0xf8: w(r, 2089, 1); break;
+          case 0xf9: w(r, 2090, 1); break;
+          case 0xfa: w(r, 1758, 1); break;
+          case 0xfe: w(r, 2091, 1); break;
+          case 0xff: w(r, 1458, 2); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0x3100:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x31: w(r, 124, 1); break;
+          case 0x32: w(r, 1868, 1); break;
+          case 0x33: w(r, 1867, 1); break;
+          case 0x34: w(r, 323, 1); break;
+          case 0x35: w(r, 1866, 1); break;
+          case 0x36: w(r, 1865, 1); break;
+          case 0x37: w(r, 319, 1); break;
+          case 0x38: w(r, 1864, 1); break;
+          case 0x39: w(r, 315, 1); break;
+          case 0x3a: w(r, 1863, 1); break;
+          case 0x3b: w(r, 1862, 1); break;
+          case 0x3c: w(r, 1861, 1); break;
+          case 0x3d: w(r, 1860, 1); break;
+          case 0x3e: w(r, 1876, 1); break;
+          case 0x3f: w(r, 1875, 1); break;
+          case 0x40: w(r, 1874, 1); break;
+          case 0x41: w(r, 311, 1); break;
+          case 0x42: w(r, 307, 1); break;
+          case 0x43: w(r, 1873, 1); break;
+          case 0x44: w(r, 1872, 1); break;
+          case 0x45: w(r, 303, 1); break;
+          case 0x46: w(r, 1871, 1); break;
+          case 0x47: w(r, 27, 1); break;
+          case 0x48: w(r, 29, 1); break;
+          case 0x49: w(r, 1870, 1); break;
+          case 0x4a: w(r, 121, 1); break;
+          case 0x4b: w(r, 287, 1); break;
+          case 0x4c: w(r, 283, 1); break;
+          case 0x4d: w(r, 279, 1); break;
+          case 0x4e: w(r, 36, 1); break;
+          case 0x4f: w(r, 122, 1); break;
+          case 0x50: w(r, 1901, 1); break;
+          case 0x51: w(r, 1900, 1); break;
+          case 0x52: w(r, 1899, 1); break;
+          case 0x53: w(r, 30, 1); break;
+          case 0x54: w(r, 1898, 1); break;
+          case 0x55: w(r, 1897, 1); break;
+          case 0x56: w(r, 1896, 1); break;
+          case 0x57: w(r, 28, 1); break;
+          case 0x58: w(r, 1895, 1); break;
+          case 0x59: w(r, 1894, 1); break;
+          case 0x5a: w(r, 1893, 1); break;
+          case 0x5b: w(r, 1892, 1); break;
+          case 0x5c: w(r, 37, 1); break;
+          case 0x5d: w(r, 1891, 1); break;
+          case 0x5e: w(r, 1890, 1); break;
+          case 0x5f: w(r, 1889, 1); break;
+          case 0x60: w(r, 1888, 1); break;
+          case 0x61: w(r, 1887, 1); break;
+          case 0x62: w(r, 217, 1); break;
+          case 0x63: w(r, 1917, 1); break;
+          case 0x64: w(r, 1869, 1); break;
+          case 0x65: w(r, 2103, 1); break;
+          case 0x66: w(r, 2104, 1); break;
+          case 0x67: w(r, 2105, 1); break;
+          case 0x68: w(r, 2106, 1); break;
+          case 0x69: w(r, 2107, 1); break;
+          case 0x6a: w(r, 2108, 1); break;
+          case 0x6b: w(r, 2063, 1); break;
+          case 0x6c: w(r, 2064, 1); break;
+          case 0x6d: w(r, 2065, 1); break;
+          case 0x6e: w(r, 2066, 1); break;
+          case 0x6f: w(r, 2067, 1); break;
+          case 0x70: w(r, 2068, 1); break;
+          case 0x71: w(r, 2069, 1); break;
+          case 0x72: w(r, 2070, 1); break;
+          case 0x73: w(r, 2071, 1); break;
+          case 0x74: w(r, 2072, 1); break;
+          case 0x75: w(r, 2073, 1); break;
+          case 0x76: w(r, 2074, 1); break;
+          case 0x77: w(r, 2075, 1); break;
+          case 0x78: w(r, 2076, 1); break;
+          case 0x79: w(r, 2077, 1); break;
+          case 0x7a: w(r, 2078, 1); break;
+          case 0x7b: w(r, 2079, 1); break;
+          case 0x7c: w(r, 2080, 1); break;
+          case 0x7d: w(r, 2081, 1); break;
+          case 0x7e: w(r, 2082, 1); break;
+          case 0x7f: w(r, 2083, 1); break;
+          case 0x80: w(r, 2084, 1); break;
+          case 0x81: w(r, 2085, 1); break;
+          case 0x82: w(r, 2086, 1); break;
+          case 0x83: w(r, 2087, 1); break;
+          case 0x84: w(r, 2088, 1); break;
+          case 0x85: w(r, 2053, 1); break;
+          case 0x86: w(r, 2054, 1); break;
+          case 0x87: w(r, 2055, 1); break;
+          case 0x88: w(r, 2056, 1); break;
+          case 0x89: w(r, 2057, 1); break;
+          case 0x8a: w(r, 2058, 1); break;
+          case 0x8b: w(r, 2059, 1); break;
+          case 0x8c: w(r, 2060, 1); break;
+          case 0x8d: w(r, 2061, 1); break;
+          case 0x8e: w(r, 2062, 1); break;
+          case 0x92: w(r, 1209, 1); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0x3200:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x0: w(r, 953, 3); break;
+          case 0x1: w(r, 950, 3); break;
+          case 0x2: w(r, 947, 3); break;
+          case 0x3: w(r, 944, 3); break;
+          case 0x4: w(r, 941, 3); break;
+          case 0x5: w(r, 1238, 3); break;
+          case 0x6: w(r, 1226, 3); break;
+          case 0x7: w(r, 1241, 3); break;
+          case 0x8: w(r, 1235, 3); break;
+          case 0x9: w(r, 1229, 3); break;
+          case 0xa: w(r, 1220, 3); break;
+          case 0xb: w(r, 1217, 3); break;
+          case 0xc: w(r, 1214, 3); break;
+          case 0xd: w(r, 1211, 3); break;
+          case 0xe: w(r, 326, 4); break;
+          case 0xf: w(r, 322, 4); break;
+          case 0x10: w(r, 318, 4); break;
+          case 0x11: w(r, 314, 4); break;
+          case 0x12: w(r, 310, 4); break;
+          case 0x13: w(r, 306, 4); break;
+          case 0x14: w(r, 302, 4); break;
+          case 0x15: w(r, 298, 4); break;
+          case 0x16: w(r, 294, 4); break;
+          case 0x17: w(r, 290, 4); break;
+          case 0x18: w(r, 286, 4); break;
+          case 0x19: w(r, 282, 4); break;
+          case 0x1a: w(r, 278, 4); break;
+          case 0x1b: w(r, 274, 4); break;
+          case 0x1c: w(r, 270, 4); break;
+          case 0x1d: w(r, 26, 7); break;
+          case 0x1e: w(r, 33, 6); break;
+          case 0x20: w(r, 1208, 3); break;
+          case 0x21: w(r, 1412, 2); break;
+          case 0x22: w(r, 1412, 2); break;
+          case 0x23: w(r, 1412, 2); break;
+          case 0x24: w(r, 1412, 2); break;
+          case 0x25: w(r, 1412, 2); break;
+          case 0x26: w(r, 1412, 2); break;
+          case 0x27: w(r, 1412, 2); break;
+          case 0x28: w(r, 1412, 2); break;
+          case 0x29: w(r, 1412, 2); break;
+          case 0x2a: w(r, 1412, 2); break;
+          case 0x2b: w(r, 1412, 2); break;
+          case 0x2c: w(r, 1412, 2); break;
+          case 0x2d: w(r, 1412, 2); break;
+          case 0x2e: w(r, 1412, 2); break;
+          case 0x2f: w(r, 1412, 2); break;
+          case 0x30: w(r, 1412, 2); break;
+          case 0x31: w(r, 1412, 2); break;
+          case 0x32: w(r, 1412, 2); break;
+          case 0x33: w(r, 1412, 2); break;
+          case 0x34: w(r, 1412, 2); break;
+          case 0x35: w(r, 1412, 2); break;
+          case 0x36: w(r, 1412, 2); break;
+          case 0x37: w(r, 1412, 2); break;
+          case 0x38: w(r, 1412, 2); break;
+          case 0x39: w(r, 1412, 2); break;
+          case 0x3a: w(r, 1412, 2); break;
+          case 0x3b: w(r, 1412, 2); break;
+          case 0x3c: w(r, 1412, 2); break;
+          case 0x3d: w(r, 1412, 2); break;
+          case 0x3e: w(r, 1412, 2); break;
+          case 0x3f: w(r, 1412, 2); break;
+          case 0x40: w(r, 1412, 2); break;
+          case 0x41: w(r, 1412, 2); break;
+          case 0x42: w(r, 1412, 2); break;
+          case 0x43: w(r, 1412, 2); break;
+          case 0x50: w(r, 1223, 3); break;
+          case 0x51: w(r, 1084, 2); break;
+          case 0x52: w(r, 1279, 2); break;
+          case 0x53: w(r, 1286, 2); break;
+          case 0x54: w(r, 1288, 2); break;
+          case 0x55: w(r, 1448, 2); break;
+          case 0x56: w(r, 1450, 2); break;
+          case 0x57: w(r, 1280, 2); break;
+          case 0x58: w(r, 1276, 2); break;
+          case 0x59: w(r, 1274, 2); break;
+          case 0x5a: w(r, 1272, 2); break;
+          case 0x5b: w(r, 988, 2); break;
+          case 0x5c: w(r, 985, 2); break;
+          case 0x5d: w(r, 1364, 2); break;
+          case 0x5e: w(r, 1366, 2); break;
+          case 0x5f: w(r, 1368, 2); break;
+          case 0x60: w(r, 124, 1); break;
+          case 0x61: w(r, 323, 1); break;
+          case 0x62: w(r, 319, 1); break;
+          case 0x63: w(r, 315, 1); break;
+          case 0x64: w(r, 311, 1); break;
+          case 0x65: w(r, 307, 1); break;
+          case 0x66: w(r, 303, 1); break;
+          case 0x67: w(r, 27, 1); break;
+          case 0x68: w(r, 29, 1); break;
+          case 0x69: w(r, 121, 1); break;
+          case 0x6a: w(r, 287, 1); break;
+          case 0x6b: w(r, 283, 1); break;
+          case 0x6c: w(r, 279, 1); break;
+          case 0x6d: w(r, 36, 1); break;
+          case 0x6e: w(r, 327, 2); break;
+          case 0x6f: w(r, 323, 2); break;
+          case 0x70: w(r, 319, 2); break;
+          case 0x71: w(r, 315, 2); break;
+          case 0x72: w(r, 311, 2); break;
+          case 0x73: w(r, 307, 2); break;
+          case 0x74: w(r, 303, 2); break;
+          case 0x75: w(r, 299, 2); break;
+          case 0x76: w(r, 295, 2); break;
+          case 0x77: w(r, 121, 2); break;
+          case 0x78: w(r, 287, 2); break;
+          case 0x79: w(r, 283, 2); break;
+          case 0x7a: w(r, 279, 2); break;
+          case 0x7b: w(r, 275, 2); break;
+          case 0x7c: w(r, 121, 5); break;
+          case 0x7d: w(r, 214, 4); break;
+          case 0x7e: w(r, 1380, 2); break;
+          case 0x80: w(r, 1209, 1); break;
+          case 0xb1: w(r, 1378, 2); break;
+          case 0xb2: w(r, 1376, 2); break;
+          case 0xb3: w(r, 1374, 2); break;
+          case 0xb4: w(r, 1372, 2); break;
+          case 0xb5: w(r, 1370, 2); break;
+          case 0xb6: w(r, 1081, 2); break;
+          case 0xb7: w(r, 1278, 2); break;
+          case 0xb8: w(r, 1252, 2); break;
+          case 0xb9: w(r, 1289, 2); break;
+          case 0xba: w(r, 1314, 2); break;
+          case 0xbb: w(r, 1316, 2); break;
+          case 0xbc: w(r, 1318, 2); break;
+          case 0xbd: w(r, 1324, 2); break;
+          case 0xbe: w(r, 1290, 2); break;
+          case 0xbf: w(r, 1284, 2); break;
+          case 0xc0: w(r, 158, 1); break;
+          case 0xc1: w(r, 44, 1); break;
+          case 0xc2: w(r, 184, 1); break;
+          case 0xc3: w(r, 188, 1); break;
+          case 0xc4: w(r, 192, 1); break;
+          case 0xc5: w(r, 196, 1); break;
+          case 0xc6: w(r, 200, 1); break;
+          case 0xc7: w(r, 204, 1); break;
+          case 0xc8: w(r, 208, 1); break;
+          case 0xc9: w(r, 160, 2); break;
+          case 0xca: w(r, 175, 2); break;
+          case 0xcb: w(r, 179, 2); break;
+          case 0xcc: w(r, 1282, 2); break;
+          case 0xcd: w(r, 518, 3); break;
+          case 0xce: w(r, 1452, 2); break;
+          case 0xcf: w(r, 515, 3); break;
+          case 0xd0: w(r, 62, 1); break;
+          case 0xd1: w(r, 84, 1); break;
+          case 0xd2: w(r, 497, 1); break;
+          case 0xd3: w(r, 106, 1); break;
+          case 0xd4: w(r, 485, 1); break;
+          case 0xd5: w(r, 135, 1); break;
+          case 0xd6: w(r, 45, 1); break;
+          case 0xd7: w(r, 81, 1); break;
+          case 0xd8: w(r, 54, 1); break;
+          case 0xd9: w(r, 575, 1); break;
+          case 0xda: w(r, 71, 1); break;
+          case 0xdb: w(r, 103, 1); break;
+          case 0xdc: w(r, 63, 1); break;
+          case 0xdd: w(r, 68, 1); break;
+          case 0xde: w(r, 1407, 1); break;
+          case 0xdf: w(r, 113, 1); break;
+          case 0xe0: w(r, 73, 1); break;
+          case 0xe1: w(r, 454, 1); break;
+          case 0xe2: w(r, 1456, 1); break;
+          case 0xe3: w(r, 49, 1); break;
+          case 0xe4: w(r, 580, 1); break;
+          case 0xe5: w(r, 231, 1); break;
+          case 0xe6: w(r, 1877, 1); break;
+          case 0xe7: w(r, 257, 1); break;
+          case 0xe8: w(r, 563, 1); break;
+          case 0xe9: w(r, 66, 1); break;
+          case 0xea: w(r, 61, 1); break;
+          case 0xeb: w(r, 56, 1); break;
+          case 0xec: w(r, 111, 1); break;
+          case 0xed: w(r, 142, 1); break;
+          case 0xee: w(r, 101, 1); break;
+          case 0xef: w(r, 76, 1); break;
+          case 0xf0: w(r, 75, 1); break;
+          case 0xf1: w(r, 47, 1); break;
+          case 0xf2: w(r, 1879, 1); break;
+          case 0xf3: w(r, 806, 1); break;
+          case 0xf4: w(r, 803, 1); break;
+          case 0xf5: w(r, 1878, 1); break;
+          case 0xf6: w(r, 58, 1); break;
+          case 0xf7: w(r, 77, 1); break;
+          case 0xf8: w(r, 50, 1); break;
+          case 0xf9: w(r, 51, 1); break;
+          case 0xfa: w(r, 46, 1); break;
+          case 0xfb: w(r, 93, 1); break;
+          case 0xfc: w(r, 2089, 1); break;
+          case 0xfd: w(r, 2090, 1); break;
+          case 0xfe: w(r, 1758, 1); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0x3300:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x0: w(r, 218, 4); break;
+          case 0x1: w(r, 222, 4); break;
+          case 0x2: w(r, 226, 4); break;
+          case 0x3: w(r, 506, 3); break;
+          case 0x4: w(r, 230, 4); break;
+          case 0x5: w(r, 500, 3); break;
+          case 0x6: w(r, 497, 3); break;
+          case 0x7: w(r, 106, 5); break;
+          case 0x8: w(r, 234, 4); break;
+          case 0x9: w(r, 488, 3); break;
+          case 0xa: w(r, 485, 3); break;
+          case 0xb: w(r, 482, 3); break;
+          case 0xc: w(r, 238, 4); break;
+          case 0xd: w(r, 242, 4); break;
+          case 0xe: w(r, 608, 3); break;
+          case 0xf: w(r, 605, 3); break;
+          case 0x10: w(r, 1446, 2); break;
+          case 0x11: w(r, 602, 3); break;
+          case 0x12: w(r, 246, 4); break;
+          case 0x13: w(r, 250, 4); break;
+          case 0x14: w(r, 45, 2); break;
+          case 0x15: w(r, 96, 5); break;
+          case 0x16: w(r, 45, 6); break;
+          case 0x17: w(r, 91, 5); break;
+          case 0x18: w(r, 86, 3); break;
+          case 0x19: w(r, 86, 5); break;
+          case 0x1a: w(r, 81, 5); break;
+          case 0x1b: w(r, 254, 4); break;
+          case 0x1c: w(r, 581, 3); break;
+          case 0x1d: w(r, 578, 3); break;
+          case 0x1e: w(r, 575, 3); break;
+          case 0x1f: w(r, 258, 4); break;
+          case 0x20: w(r, 71, 5); break;
+          case 0x21: w(r, 262, 4); break;
+          case 0x22: w(r, 569, 3); break;
+          case 0x23: w(r, 68, 3); break;
+          case 0x24: w(r, 566, 3); break;
+          case 0x25: w(r, 1456, 2); break;
+          case 0x26: w(r, 49, 2); break;
+          case 0x27: w(r, 89, 2); break;
+          case 0x28: w(r, 1420, 2); break;
+          case 0x29: w(r, 563, 3); break;
+          case 0x2a: w(r, 560, 3); break;
+          case 0x2b: w(r, 66, 5); break;
+          case 0x2c: w(r, 554, 3); break;
+          case 0x2d: w(r, 266, 4); break;
+          case 0x2e: w(r, 61, 5); break;
+          case 0x2f: w(r, 416, 3); break;
+          case 0x30: w(r, 1410, 2); break;
+          case 0x31: w(r, 1408, 2); break;
+          case 0x32: w(r, 56, 5); break;
+          case 0x33: w(r, 150, 4); break;
+          case 0x34: w(r, 116, 5); break;
+          case 0x35: w(r, 464, 3); break;
+          case 0x36: w(r, 111, 5); break;
+          case 0x37: w(r, 1406, 2); break;
+          case 0x38: w(r, 455, 3); break;
+          case 0x39: w(r, 452, 3); break;
+          case 0x3a: w(r, 449, 3); break;
+          case 0x3b: w(r, 446, 3); break;
+          case 0x3c: w(r, 443, 3); break;
+          case 0x3d: w(r, 142, 4); break;
+          case 0x3e: w(r, 437, 3); break;
+          case 0x3f: w(r, 434, 2); break;
+          case 0x40: w(r, 434, 3); break;
+          case 0x41: w(r, 431, 3); break;
+          case 0x42: w(r, 428, 3); break;
+          case 0x43: w(r, 138, 4); break;
+          case 0x44: w(r, 425, 3); break;
+          case 0x45: w(r, 440, 3); break;
+          case 0x46: w(r, 458, 3); break;
+          case 0x47: w(r, 101, 5); break;
+          case 0x48: w(r, 126, 4); break;
+          case 0x49: w(r, 76, 2); break;
+          case 0x4a: w(r, 76, 5); break;
+          case 0x4b: w(r, 134, 2); break;
+          case 0x4c: w(r, 134, 4); break;
+          case 0x4d: w(r, 47, 4); break;
+          case 0x4e: w(r, 809, 3); break;
+          case 0x4f: w(r, 806, 3); break;
+          case 0x50: w(r, 803, 3); break;
+          case 0x51: w(r, 146, 4); break;
+          case 0x52: w(r, 1436, 2); break;
+          case 0x53: w(r, 797, 3); break;
+          case 0x54: w(r, 154, 4); break;
+          case 0x55: w(r, 1440, 2); break;
+          case 0x56: w(r, 51, 5); break;
+          case 0x57: w(r, 93, 3); break;
+          case 0x58: w(r, 161, 1); break;
+          case 0x59: w(r, 158, 1); break;
+          case 0x5a: w(r, 44, 1); break;
+          case 0x5b: w(r, 184, 1); break;
+          case 0x5c: w(r, 188, 1); break;
+          case 0x5d: w(r, 192, 1); break;
+          case 0x5e: w(r, 196, 1); break;
+          case 0x5f: w(r, 200, 1); break;
+          case 0x60: w(r, 204, 1); break;
+          case 0x61: w(r, 208, 1); break;
+          case 0x62: w(r, 160, 2); break;
+          case 0x63: w(r, 175, 2); break;
+          case 0x64: w(r, 179, 2); break;
+          case 0x65: w(r, 183, 2); break;
+          case 0x66: w(r, 187, 2); break;
+          case 0x67: w(r, 191, 2); break;
+          case 0x68: w(r, 195, 2); break;
+          case 0x69: w(r, 199, 2); break;
+          case 0x6a: w(r, 203, 2); break;
+          case 0x6b: w(r, 207, 2); break;
+          case 0x6c: w(r, 211, 2); break;
+          case 0x6d: w(r, 1084, 2); break;
+          case 0x6e: w(r, 1279, 2); break;
+          case 0x6f: w(r, 1286, 2); break;
+          case 0x70: w(r, 1288, 2); break;
+          case 0x71: w(r, 380, 3); break;
+          case 0x72: w(r, 1292, 2); break;
+          case 0x73: w(r, 1294, 2); break;
+          case 0x74: w(r, 383, 3); break;
+          case 0x75: w(r, 1322, 2); break;
+          case 0x76: w(r, 1320, 2); break;
+          case 0x77: w(r, 386, 2); break;
+          case 0x78: w(r, 386, 3); break;
+          case 0x79: w(r, 392, 3); break;
+          case 0x7a: w(r, 1312, 2); break;
+          case 0x80: w(r, 1310, 2); break;
+          case 0x81: w(r, 1308, 2); break;
+          case 0x82: w(r, 1306, 2); break;
+          case 0x83: w(r, 1304, 2); break;
+          case 0x84: w(r, 1302, 2); break;
+          case 0x85: w(r, 1300, 2); break;
+          case 0x86: w(r, 1298, 2); break;
+          case 0x87: w(r, 1296, 2); break;
+          case 0x88: w(r, 331, 3); break;
+          case 0x89: w(r, 330, 4); break;
+          case 0x8a: w(r, 1250, 2); break;
+          case 0x8b: w(r, 1248, 2); break;
+          case 0x8c: w(r, 1246, 2); break;
+          case 0x8d: w(r, 1244, 2); break;
+          case 0x8e: w(r, 1254, 2); break;
+          case 0x8f: w(r, 360, 2); break;
+          case 0x90: w(r, 399, 2); break;
+          case 0x91: w(r, 398, 3); break;
+          case 0x92: w(r, 401, 3); break;
+          case 0x93: w(r, 404, 3); break;
+          case 0x94: w(r, 407, 3); break;
+          case 0x95: w(r, 1270, 2); break;
+          case 0x96: w(r, 1268, 2); break;
+          case 0x97: w(r, 1266, 2); break;
+          case 0x98: w(r, 1264, 2); break;
+          case 0x99: w(r, 1262, 2); break;
+          case 0x9a: w(r, 1260, 2); break;
+          case 0x9b: w(r, 1258, 2); break;
+          case 0x9c: w(r, 410, 2); break;
+          case 0x9d: w(r, 413, 2); break;
+          case 0x9e: w(r, 419, 2); break;
+          case 0x9f: w(r, 410, 3); break;
+          case 0xa0: w(r, 413, 3); break;
+          case 0xa1: w(r, 387, 2); break;
+          case 0xa2: w(r, 419, 3); break;
+          case 0xa3: w(r, 551, 3); break;
+          case 0xa4: w(r, 557, 3); break;
+          case 0xa5: w(r, 393, 2); break;
+          case 0xa6: w(r, 572, 3); break;
+          case 0xa7: w(r, 334, 3); break;
+          case 0xa8: w(r, 334, 4); break;
+          case 0xa9: w(r, 381, 2); break;
+          case 0xaa: w(r, 584, 3); break;
+          case 0xab: w(r, 587, 3); break;
+          case 0xac: w(r, 590, 3); break;
+          case 0xad: w(r, 39, 3); break;
+          case 0xae: w(r, 39, 5); break;
+          case 0xaf: w(r, 39, 6); break;
+          case 0xb0: w(r, 1382, 2); break;
+          case 0xb1: w(r, 1384, 2); break;
+          case 0xb2: w(r, 1386, 2); break;
+          case 0xb3: w(r, 1388, 2); break;
+          case 0xb4: w(r, 1390, 2); break;
+          case 0xb5: w(r, 1392, 2); break;
+          case 0xb6: w(r, 1394, 2); break;
+          case 0xb7: w(r, 493, 2); break;
+          case 0xb8: w(r, 1396, 2); break;
+          case 0xb9: w(r, 1398, 2); break;
+          case 0xba: w(r, 1400, 2); break;
+          case 0xbb: w(r, 1402, 2); break;
+          case 0xbc: w(r, 1404, 2); break;
+          case 0xbd: w(r, 1326, 2); break;
+          case 0xbe: w(r, 1328, 2); break;
+          case 0xbf: w(r, 1330, 2); break;
+          case 0xc0: w(r, 1332, 2); break;
+          case 0xc1: w(r, 1334, 2); break;
+          case 0xc2: w(r, 346, 4); break;
+          case 0xc3: w(r, 1336, 2); break;
+          case 0xc4: w(r, 1338, 2); break;
+          case 0xc5: w(r, 1340, 2); break;
+          case 0xc6: w(r, 358, 4); break;
+          case 0xc7: w(r, 479, 3); break;
+          case 0xc8: w(r, 1342, 2); break;
+          case 0xc9: w(r, 1344, 2); break;
+          case 0xca: w(r, 1346, 2); break;
+          case 0xcb: w(r, 1348, 2); break;
+          case 0xcc: w(r, 1350, 2); break;
+          case 0xcd: w(r, 1352, 2); break;
+          case 0xce: w(r, 1354, 2); break;
+          case 0xcf: w(r, 1356, 2); break;
+          case 0xd0: w(r, 333, 2); break;
+          case 0xd1: w(r, 1358, 2); break;
+          case 0xd2: w(r, 503, 3); break;
+          case 0xd3: w(r, 1360, 2); break;
+          case 0xd4: w(r, 1362, 2); break;
+          case 0xd5: w(r, 548, 3); break;
+          case 0xd6: w(r, 512, 3); break;
+          case 0xd7: w(r, 1744, 2); break;
+          case 0xd8: w(r, 366, 4); break;
+          case 0xd9: w(r, 509, 3); break;
+          case 0xda: w(r, 1746, 2); break;
+          case 0xdb: w(r, 1748, 2); break;
+          case 0xdc: w(r, 1752, 2); break;
+          case 0xdd: w(r, 1750, 2); break;
+          case 0xde: w(r, 494, 3); break;
+          case 0xdf: w(r, 491, 3); break;
+          case 0xe0: w(r, 158, 1); break;
+          case 0xe1: w(r, 44, 1); break;
+          case 0xe2: w(r, 184, 1); break;
+          case 0xe3: w(r, 188, 1); break;
+          case 0xe4: w(r, 192, 1); break;
+          case 0xe5: w(r, 196, 1); break;
+          case 0xe6: w(r, 200, 1); break;
+          case 0xe7: w(r, 204, 1); break;
+          case 0xe8: w(r, 208, 1); break;
+          case 0xe9: w(r, 160, 2); break;
+          case 0xea: w(r, 175, 2); break;
+          case 0xeb: w(r, 179, 2); break;
+          case 0xec: w(r, 183, 2); break;
+          case 0xed: w(r, 187, 2); break;
+          case 0xee: w(r, 191, 2); break;
+          case 0xef: w(r, 195, 2); break;
+          case 0xf0: w(r, 199, 2); break;
+          case 0xf1: w(r, 203, 2); break;
+          case 0xf2: w(r, 207, 2); break;
+          case 0xf3: w(r, 211, 2); break;
+          case 0xf4: w(r, 1084, 2); break;
+          case 0xf5: w(r, 1279, 2); break;
+          case 0xf6: w(r, 1286, 2); break;
+          case 0xf7: w(r, 1288, 2); break;
+          case 0xf8: w(r, 1448, 2); break;
+          case 0xf9: w(r, 1450, 2); break;
+          case 0xfa: w(r, 1280, 2); break;
+          case 0xfb: w(r, 1276, 2); break;
+          case 0xfc: w(r, 1274, 2); break;
+          case 0xfd: w(r, 1272, 2); break;
+          case 0xfe: w(r, 988, 2); break;
+          case 0xff: w(r, 599, 3); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0xa700:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x70: w(r, 2165, 1); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0xfb00:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x0: w(r, 593, 2); break;
+          case 0x1: w(r, 597, 2); break;
+          case 0x2: w(r, 594, 2); break;
+          case 0x3: w(r, 596, 3); break;
+          case 0x4: w(r, 593, 3); break;
+          case 0x5: w(r, 1724, 2); break;
+          case 0x6: w(r, 1724, 2); break;
+          case 0x13: w(r, 1728, 2); break;
+          case 0x14: w(r, 1730, 2); break;
+          case 0x15: w(r, 1732, 2); break;
+          case 0x16: w(r, 1734, 2); break;
+          case 0x17: w(r, 1736, 2); break;
+          case 0x1d: w(r, 2164, 1); break;
+          case 0x1f: w(r, 2149, 1); break;
+          case 0x20: w(r, 2150, 1); break;
+          case 0x21: w(r, 1722, 1); break;
+          case 0x22: w(r, 2151, 1); break;
+          case 0x23: w(r, 2152, 1); break;
+          case 0x24: w(r, 2153, 1); break;
+          case 0x25: w(r, 1723, 1); break;
+          case 0x26: w(r, 2154, 1); break;
+          case 0x27: w(r, 2155, 1); break;
+          case 0x28: w(r, 2156, 1); break;
+          case 0x29: w(r, 1773, 1); break;
+          case 0x2a: w(r, 2157, 1); break;
+          case 0x2b: w(r, 2157, 1); break;
+          case 0x2c: w(r, 2157, 1); break;
+          case 0x2d: w(r, 2157, 1); break;
+          case 0x2e: w(r, 1722, 1); break;
+          case 0x2f: w(r, 1722, 1); break;
+          case 0x30: w(r, 1722, 1); break;
+          case 0x31: w(r, 2159, 1); break;
+          case 0x32: w(r, 2160, 1); break;
+          case 0x33: w(r, 2151, 1); break;
+          case 0x34: w(r, 2152, 1); break;
+          case 0x35: w(r, 2161, 1); break;
+          case 0x36: w(r, 2162, 1); break;
+          case 0x38: w(r, 2163, 1); break;
+          case 0x39: w(r, 2164, 1); break;
+          case 0x3a: w(r, 2179, 1); break;
+          case 0x3b: w(r, 2153, 1); break;
+          case 0x3c: w(r, 1723, 1); break;
+          case 0x3e: w(r, 2180, 1); break;
+          case 0x40: w(r, 2181, 1); break;
+          case 0x41: w(r, 2182, 1); break;
+          case 0x43: w(r, 2183, 1); break;
+          case 0x44: w(r, 2184, 1); break;
+          case 0x46: w(r, 2185, 1); break;
+          case 0x47: w(r, 2186, 1); break;
+          case 0x48: w(r, 2155, 1); break;
+          case 0x49: w(r, 2157, 1); break;
+          case 0x4a: w(r, 2156, 1); break;
+          case 0x4b: w(r, 2161, 1); break;
+          case 0x4c: w(r, 2159, 1); break;
+          case 0x4d: w(r, 2153, 1); break;
+          case 0x4e: w(r, 2184, 1); break;
+          case 0x4f: w(r, 1722, 2); break;
+          case 0x50: w(r, 2187, 1); break;
+          case 0x51: w(r, 2187, 1); break;
+          case 0x52: w(r, 2189, 1); break;
+          case 0x53: w(r, 2189, 1); break;
+          case 0x54: w(r, 2189, 1); break;
+          case 0x55: w(r, 2189, 1); break;
+          case 0x56: w(r, 2166, 1); break;
+          case 0x57: w(r, 2166, 1); break;
+          case 0x58: w(r, 2166, 1); break;
+          case 0x59: w(r, 2166, 1); break;
+          case 0x5a: w(r, 2167, 1); break;
+          case 0x5b: w(r, 2167, 1); break;
+          case 0x5c: w(r, 2167, 1); break;
+          case 0x5d: w(r, 2167, 1); break;
+          case 0x5e: w(r, 2169, 1); break;
+          case 0x5f: w(r, 2169, 1); break;
+          case 0x60: w(r, 2169, 1); break;
+          case 0x61: w(r, 2169, 1); break;
+          case 0x62: w(r, 2171, 1); break;
+          case 0x63: w(r, 2171, 1); break;
+          case 0x64: w(r, 2171, 1); break;
+          case 0x65: w(r, 2171, 1); break;
+          case 0x66: w(r, 2173, 1); break;
+          case 0x67: w(r, 2173, 1); break;
+          case 0x68: w(r, 2173, 1); break;
+          case 0x69: w(r, 2173, 1); break;
+          case 0x6a: w(r, 2175, 1); break;
+          case 0x6b: w(r, 2175, 1); break;
+          case 0x6c: w(r, 2175, 1); break;
+          case 0x6d: w(r, 2175, 1); break;
+          case 0x6e: w(r, 2177, 1); break;
+          case 0x6f: w(r, 2177, 1); break;
+          case 0x70: w(r, 2177, 1); break;
+          case 0x71: w(r, 2177, 1); break;
+          case 0x72: w(r, 2122, 1); break;
+          case 0x73: w(r, 2122, 1); break;
+          case 0x74: w(r, 2122, 1); break;
+          case 0x75: w(r, 2122, 1); break;
+          case 0x76: w(r, 2124, 1); break;
+          case 0x77: w(r, 2124, 1); break;
+          case 0x78: w(r, 2124, 1); break;
+          case 0x79: w(r, 2124, 1); break;
+          case 0x7a: w(r, 2126, 1); break;
+          case 0x7b: w(r, 2126, 1); break;
+          case 0x7c: w(r, 2126, 1); break;
+          case 0x7d: w(r, 2126, 1); break;
+          case 0x7e: w(r, 2128, 1); break;
+          case 0x7f: w(r, 2128, 1); break;
+          case 0x80: w(r, 2128, 1); break;
+          case 0x81: w(r, 2128, 1); break;
+          case 0x82: w(r, 2130, 1); break;
+          case 0x83: w(r, 2130, 1); break;
+          case 0x84: w(r, 2132, 1); break;
+          case 0x85: w(r, 2132, 1); break;
+          case 0x86: w(r, 2134, 1); break;
+          case 0x87: w(r, 2134, 1); break;
+          case 0x88: w(r, 2136, 1); break;
+          case 0x89: w(r, 2136, 1); break;
+          case 0x8a: w(r, 2138, 1); break;
+          case 0x8b: w(r, 2138, 1); break;
+          case 0x8c: w(r, 2109, 1); break;
+          case 0x8d: w(r, 2109, 1); break;
+          case 0x8e: w(r, 2110, 1); break;
+          case 0x8f: w(r, 2110, 1); break;
+          case 0x90: w(r, 2110, 1); break;
+          case 0x91: w(r, 2110, 1); break;
+          case 0x92: w(r, 2112, 1); break;
+          case 0x93: w(r, 2112, 1); break;
+          case 0x94: w(r, 2112, 1); break;
+          case 0x95: w(r, 2112, 1); break;
+          case 0x96: w(r, 2114, 1); break;
+          case 0x97: w(r, 2114, 1); break;
+          case 0x98: w(r, 2114, 1); break;
+          case 0x99: w(r, 2114, 1); break;
+          case 0x9a: w(r, 2116, 1); break;
+          case 0x9b: w(r, 2116, 1); break;
+          case 0x9c: w(r, 2116, 1); break;
+          case 0x9d: w(r, 2116, 1); break;
+          case 0x9e: w(r, 2118, 1); break;
+          case 0x9f: w(r, 2118, 1); break;
+          case 0xa0: w(r, 2120, 1); break;
+          case 0xa1: w(r, 2120, 1); break;
+          case 0xa2: w(r, 2120, 1); break;
+          case 0xa3: w(r, 2120, 1); break;
+          case 0xa4: w(r, 1709, 1); break;
+          case 0xa5: w(r, 1709, 1); break;
+          case 0xa6: w(r, 2036, 1); break;
+          case 0xa7: w(r, 2036, 1); break;
+          case 0xa8: w(r, 2036, 1); break;
+          case 0xa9: w(r, 2036, 1); break;
+          case 0xaa: w(r, 2141, 1); break;
+          case 0xab: w(r, 2141, 1); break;
+          case 0xac: w(r, 2141, 1); break;
+          case 0xad: w(r, 2141, 1); break;
+          case 0xae: w(r, 424, 1); break;
+          case 0xaf: w(r, 424, 1); break;
+          case 0xb0: w(r, 424, 1); break;
+          case 0xb1: w(r, 424, 1); break;
+          case 0xd3: w(r, 2143, 1); break;
+          case 0xd4: w(r, 2143, 1); break;
+          case 0xd5: w(r, 2143, 1); break;
+          case 0xd6: w(r, 2143, 1); break;
+          case 0xd7: w(r, 1701, 1); break;
+          case 0xd8: w(r, 1701, 1); break;
+          case 0xd9: w(r, 1697, 1); break;
+          case 0xda: w(r, 1697, 1); break;
+          case 0xdb: w(r, 1693, 1); break;
+          case 0xdc: w(r, 1693, 1); break;
+          case 0xdd: w(r, 1720, 2); break;
+          case 0xde: w(r, 2145, 1); break;
+          case 0xdf: w(r, 2145, 1); break;
+          case 0xe0: w(r, 2147, 1); break;
+          case 0xe1: w(r, 2147, 1); break;
+          case 0xe2: w(r, 2140, 1); break;
+          case 0xe3: w(r, 2140, 1); break;
+          case 0xe4: w(r, 1689, 1); break;
+          case 0xe5: w(r, 1689, 1); break;
+          case 0xe6: w(r, 1689, 1); break;
+          case 0xe7: w(r, 1689, 1); break;
+          case 0xe8: w(r, 2, 1); break;
+          case 0xe9: w(r, 2, 1); break;
+          case 0xea: w(r, 1712, 2); break;
+          case 0xeb: w(r, 1712, 2); break;
+          case 0xec: w(r, 1708, 2); break;
+          case 0xed: w(r, 1708, 2); break;
+          case 0xee: w(r, 1704, 2); break;
+          case 0xef: w(r, 1704, 2); break;
+          case 0xf0: w(r, 1700, 2); break;
+          case 0xf1: w(r, 1700, 2); break;
+          case 0xf2: w(r, 1696, 2); break;
+          case 0xf3: w(r, 1696, 2); break;
+          case 0xf4: w(r, 1692, 2); break;
+          case 0xf5: w(r, 1692, 2); break;
+          case 0xf6: w(r, 1688, 2); break;
+          case 0xf7: w(r, 1688, 2); break;
+          case 0xf8: w(r, 1688, 2); break;
+          case 0xf9: w(r, 1548, 2); break;
+          case 0xfa: w(r, 1548, 2); break;
+          case 0xfb: w(r, 1548, 2); break;
+          case 0xfc: w(r, 339, 1); break;
+          case 0xfd: w(r, 339, 1); break;
+          case 0xfe: w(r, 339, 1); break;
+          case 0xff: w(r, 339, 1); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0xfc00:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x0: w(r, 532, 2); break;
+          case 0x1: w(r, 686, 2); break;
+          case 0x2: w(r, 629, 2); break;
+          case 0x3: w(r, 1548, 2); break;
+          case 0x4: w(r, 628, 2); break;
+          case 0x5: w(r, 1562, 2); break;
+          case 0x6: w(r, 800, 2); break;
+          case 0x7: w(r, 626, 2); break;
+          case 0x8: w(r, 1474, 2); break;
+          case 0x9: w(r, 1538, 2); break;
+          case 0xa: w(r, 1536, 2); break;
+          case 0xb: w(r, 620, 2); break;
+          case 0xc: w(r, 971, 2); break;
+          case 0xd: w(r, 614, 2); break;
+          case 0xe: w(r, 539, 2); break;
+          case 0xf: w(r, 1528, 2); break;
+          case 0x10: w(r, 1526, 2); break;
+          case 0x11: w(r, 1684, 2); break;
+          case 0x12: w(r, 1486, 2); break;
+          case 0x13: w(r, 1518, 2); break;
+          case 0x14: w(r, 1516, 2); break;
+          case 0x15: w(r, 522, 2); break;
+          case 0x16: w(r, 396, 2); break;
+          case 0x17: w(r, 525, 2); break;
+          case 0x18: w(r, 355, 2); break;
+          case 0x19: w(r, 669, 2); break;
+          case 0x1a: w(r, 1682, 2); break;
+          case 0x1b: w(r, 664, 2); break;
+          case 0x1c: w(r, 476, 2); break;
+          case 0x1d: w(r, 524, 2); break;
+          case 0x1e: w(r, 470, 2); break;
+          case 0x1f: w(r, 374, 2); break;
+          case 0x20: w(r, 728, 2); break;
+          case 0x21: w(r, 473, 2); break;
+          case 0x22: w(r, 1470, 2); break;
+          case 0x23: w(r, 695, 2); break;
+          case 0x24: w(r, 746, 2); break;
+          case 0x25: w(r, 1468, 2); break;
+          case 0x26: w(r, 1466, 2); break;
+          case 0x27: w(r, 857, 2); break;
+          case 0x28: w(r, 1464, 2); break;
+          case 0x29: w(r, 395, 2); break;
+          case 0x2a: w(r, 352, 2); break;
+          case 0x2b: w(r, 1462, 2); break;
+          case 0x2c: w(r, 845, 2); break;
+          case 0x2d: w(r, 1494, 2); break;
+          case 0x2e: w(r, 1496, 2); break;
+          case 0x2f: w(r, 839, 2); break;
+          case 0x30: w(r, 794, 2); break;
+          case 0x31: w(r, 1564, 2); break;
+          case 0x32: w(r, 1566, 2); break;
+          case 0x33: w(r, 1498, 2); break;
+          case 0x34: w(r, 698, 2); break;
+          case 0x35: w(r, 1568, 2); break;
+          case 0x36: w(r, 1570, 2); break;
+          case 0x37: w(r, 1572, 2); break;
+          case 0x38: w(r, 1500, 2); break;
+          case 0x39: w(r, 1502, 2); break;
+          case 0x3a: w(r, 1492, 2); break;
+          case 0x3b: w(r, 1490, 2); break;
+          case 0x3c: w(r, 713, 2); break;
+          case 0x3d: w(r, 1574, 2); break;
+          case 0x3e: w(r, 1576, 2); break;
+          case 0x3f: w(r, 692, 2); break;
+          case 0x40: w(r, 707, 2); break;
+          case 0x41: w(r, 818, 2); break;
+          case 0x42: w(r, 16, 2); break;
+          case 0x43: w(r, 1, 2); break;
+          case 0x44: w(r, 10, 2); break;
+          case 0x45: w(r, 17, 2); break;
+          case 0x46: w(r, 354, 2); break;
+          case 0x47: w(r, 540, 2); break;
+          case 0x48: w(r, 353, 2); break;
+          case 0x49: w(r, 528, 2); break;
+          case 0x4a: w(r, 531, 2); break;
+          case 0x4b: w(r, 467, 2); break;
+          case 0x4c: w(r, 650, 2); break;
+          case 0x4d: w(r, 1488, 2); break;
+          case 0x4e: w(r, 635, 2); break;
+          case 0x4f: w(r, 1558, 2); break;
+          case 0x50: w(r, 1560, 2); break;
+          case 0x51: w(r, 1666, 2); break;
+          case 0x52: w(r, 656, 2); break;
+          case 0x53: w(r, 1542, 2); break;
+          case 0x54: w(r, 1544, 2); break;
+          case 0x55: w(r, 532, 2); break;
+          case 0x56: w(r, 686, 2); break;
+          case 0x57: w(r, 1546, 2); break;
+          case 0x58: w(r, 629, 2); break;
+          case 0x59: w(r, 1548, 2); break;
+          case 0x5a: w(r, 628, 2); break;
+          case 0x5b: w(r, 1796, 1); break;
+          case 0x5c: w(r, 338, 1); break;
+          case 0x5d: w(r, 2, 1); break;
+          case 0x5e: w(r, 3, 1); break;
+          case 0x5f: w(r, 3, 1); break;
+          case 0x60: w(r, 3, 1); break;
+          case 0x61: w(r, 3, 1); break;
+          case 0x62: w(r, 3, 1); break;
+          case 0x63: w(r, 3, 1); break;
+          case 0x64: w(r, 1550, 2); break;
+          case 0x65: w(r, 1552, 2); break;
+          case 0x66: w(r, 629, 2); break;
+          case 0x67: w(r, 640, 2); break;
+          case 0x68: w(r, 1548, 2); break;
+          case 0x69: w(r, 628, 2); break;
+          case 0x6a: w(r, 364, 2); break;
+          case 0x6b: w(r, 1554, 2); break;
+          case 0x6c: w(r, 1474, 2); break;
+          case 0x6d: w(r, 1540, 2); break;
+          case 0x6e: w(r, 1538, 2); break;
+          case 0x6f: w(r, 1536, 2); break;
+          case 0x70: w(r, 1534, 2); break;
+          case 0x71: w(r, 1532, 2); break;
+          case 0x72: w(r, 539, 2); break;
+          case 0x73: w(r, 1530, 2); break;
+          case 0x74: w(r, 1528, 2); break;
+          case 0x75: w(r, 1526, 2); break;
+          case 0x76: w(r, 1524, 2); break;
+          case 0x77: w(r, 1522, 2); break;
+          case 0x78: w(r, 1486, 2); break;
+          case 0x79: w(r, 1520, 2); break;
+          case 0x7a: w(r, 1518, 2); break;
+          case 0x7b: w(r, 1516, 2); break;
+          case 0x7c: w(r, 1564, 2); break;
+          case 0x7d: w(r, 1566, 2); break;
+          case 0x7e: w(r, 1568, 2); break;
+          case 0x7f: w(r, 1570, 2); break;
+          case 0x80: w(r, 1572, 2); break;
+          case 0x81: w(r, 1490, 2); break;
+          case 0x82: w(r, 713, 2); break;
+          case 0x83: w(r, 1574, 2); break;
+          case 0x84: w(r, 1576, 2); break;
+          case 0x85: w(r, 16, 2); break;
+          case 0x86: w(r, 1, 2); break;
+          case 0x87: w(r, 10, 2); break;
+          case 0x88: w(r, 1578, 2); break;
+          case 0x89: w(r, 353, 2); break;
+          case 0x8a: w(r, 1580, 2); break;
+          case 0x8b: w(r, 1582, 2); break;
+          case 0x8c: w(r, 635, 2); break;
+          case 0x8d: w(r, 1556, 2); break;
+          case 0x8e: w(r, 1558, 2); break;
+          case 0x8f: w(r, 1560, 2); break;
+          case 0x90: w(r, 2, 1); break;
+          case 0x91: w(r, 1550, 2); break;
+          case 0x92: w(r, 1552, 2); break;
+          case 0x93: w(r, 629, 2); break;
+          case 0x94: w(r, 640, 2); break;
+          case 0x95: w(r, 1548, 2); break;
+          case 0x96: w(r, 628, 2); break;
+          case 0x97: w(r, 532, 2); break;
+          case 0x98: w(r, 686, 2); break;
+          case 0x99: w(r, 1546, 2); break;
+          case 0x9a: w(r, 629, 2); break;
+          case 0x9b: w(r, 11, 2); break;
+          case 0x9c: w(r, 1562, 2); break;
+          case 0x9d: w(r, 800, 2); break;
+          case 0x9e: w(r, 626, 2); break;
+          case 0x9f: w(r, 1474, 2); break;
+          case 0xa0: w(r, 1476, 2); break;
+          case 0xa1: w(r, 620, 2); break;
+          case 0xa2: w(r, 971, 2); break;
+          case 0xa3: w(r, 614, 2); break;
+          case 0xa4: w(r, 539, 2); break;
+          case 0xa5: w(r, 1484, 2); break;
+          case 0xa6: w(r, 1486, 2); break;
+          case 0xa7: w(r, 522, 2); break;
+          case 0xa8: w(r, 396, 2); break;
+          case 0xa9: w(r, 525, 2); break;
+          case 0xaa: w(r, 355, 2); break;
+          case 0xab: w(r, 669, 2); break;
+          case 0xac: w(r, 664, 2); break;
+          case 0xad: w(r, 476, 2); break;
+          case 0xae: w(r, 524, 2); break;
+          case 0xaf: w(r, 470, 2); break;
+          case 0xb0: w(r, 374, 2); break;
+          case 0xb1: w(r, 728, 2); break;
+          case 0xb2: w(r, 1472, 2); break;
+          case 0xb3: w(r, 473, 2); break;
+          case 0xb4: w(r, 1470, 2); break;
+          case 0xb5: w(r, 695, 2); break;
+          case 0xb6: w(r, 746, 2); break;
+          case 0xb7: w(r, 1468, 2); break;
+          case 0xb8: w(r, 1466, 2); break;
+          case 0xb9: w(r, 1464, 2); break;
+          case 0xba: w(r, 395, 2); break;
+          case 0xbb: w(r, 352, 2); break;
+          case 0xbc: w(r, 1462, 2); break;
+          case 0xbd: w(r, 845, 2); break;
+          case 0xbe: w(r, 1494, 2); break;
+          case 0xbf: w(r, 1496, 2); break;
+          case 0xc0: w(r, 839, 2); break;
+          case 0xc1: w(r, 794, 2); break;
+          case 0xc2: w(r, 1498, 2); break;
+          case 0xc3: w(r, 698, 2); break;
+          case 0xc4: w(r, 1500, 2); break;
+          case 0xc5: w(r, 1502, 2); break;
+          case 0xc6: w(r, 1492, 2); break;
+          case 0xc7: w(r, 1490, 2); break;
+          case 0xc8: w(r, 713, 2); break;
+          case 0xc9: w(r, 692, 2); break;
+          case 0xca: w(r, 707, 2); break;
+          case 0xcb: w(r, 818, 2); break;
+          case 0xcc: w(r, 16, 2); break;
+          case 0xcd: w(r, 6, 2); break;
+          case 0xce: w(r, 17, 2); break;
+          case 0xcf: w(r, 354, 2); break;
+          case 0xd0: w(r, 540, 2); break;
+          case 0xd1: w(r, 353, 2); break;
+          case 0xd2: w(r, 467, 2); break;
+          case 0xd3: w(r, 650, 2); break;
+          case 0xd4: w(r, 1488, 2); break;
+          case 0xd5: w(r, 635, 2); break;
+          case 0xd6: w(r, 1541, 2); break;
+          case 0xd7: w(r, 1666, 2); break;
+          case 0xd8: w(r, 656, 2); break;
+          case 0xd9: w(r, 7, 1); break;
+          case 0xda: w(r, 532, 2); break;
+          case 0xdb: w(r, 686, 2); break;
+          case 0xdc: w(r, 1546, 2); break;
+          case 0xdd: w(r, 629, 2); break;
+          case 0xde: w(r, 11, 2); break;
+          case 0xdf: w(r, 629, 2); break;
+          case 0xe0: w(r, 11, 2); break;
+          case 0xe1: w(r, 1474, 2); break;
+          case 0xe2: w(r, 1476, 2); break;
+          case 0xe3: w(r, 539, 2); break;
+          case 0xe4: w(r, 1484, 2); break;
+          case 0xe5: w(r, 1486, 2); break;
+          case 0xe6: w(r, 1668, 2); break;
+          case 0xe7: w(r, 374, 2); break;
+          case 0xe8: w(r, 1650, 2); break;
+          case 0xe9: w(r, 758, 2); break;
+          case 0xea: w(r, 1652, 2); break;
+          case 0xeb: w(r, 1490, 2); break;
+          case 0xec: w(r, 713, 2); break;
+          case 0xed: w(r, 16, 2); break;
+          case 0xee: w(r, 635, 2); break;
+          case 0xef: w(r, 1541, 2); break;
+          case 0xf0: w(r, 629, 2); break;
+          case 0xf1: w(r, 11, 2); break;
+          case 0xf2: w(r, 1793, 1); break;
+          case 0xf3: w(r, 1793, 1); break;
+          case 0xf4: w(r, 1793, 1); break;
+          case 0xf5: w(r, 1664, 2); break;
+          case 0xf6: w(r, 1662, 2); break;
+          case 0xf7: w(r, 1660, 2); break;
+          case 0xf8: w(r, 1658, 2); break;
+          case 0xf9: w(r, 1656, 2); break;
+          case 0xfa: w(r, 1674, 2); break;
+          case 0xfb: w(r, 1604, 2); break;
+          case 0xfc: w(r, 1606, 2); break;
+          case 0xfd: w(r, 1608, 2); break;
+          case 0xfe: w(r, 1610, 2); break;
+          case 0xff: w(r, 651, 2); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0xfd00:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x0: w(r, 675, 2); break;
+          case 0x1: w(r, 477, 2); break;
+          case 0x2: w(r, 468, 2); break;
+          case 0x3: w(r, 615, 2); break;
+          case 0x4: w(r, 471, 2); break;
+          case 0x5: w(r, 1596, 2); break;
+          case 0x6: w(r, 1594, 2); break;
+          case 0x7: w(r, 1592, 2); break;
+          case 0x8: w(r, 1590, 2); break;
+          case 0x9: w(r, 770, 2); break;
+          case 0xa: w(r, 725, 2); break;
+          case 0xb: w(r, 1588, 2); break;
+          case 0xc: w(r, 758, 2); break;
+          case 0xd: w(r, 1586, 2); break;
+          case 0xe: w(r, 1584, 2); break;
+          case 0xf: w(r, 1646, 2); break;
+          case 0x10: w(r, 1648, 2); break;
+          case 0x11: w(r, 1664, 2); break;
+          case 0x12: w(r, 1662, 2); break;
+          case 0x13: w(r, 1660, 2); break;
+          case 0x14: w(r, 1658, 2); break;
+          case 0x15: w(r, 1656, 2); break;
+          case 0x16: w(r, 1674, 2); break;
+          case 0x17: w(r, 1604, 2); break;
+          case 0x18: w(r, 1606, 2); break;
+          case 0x19: w(r, 1608, 2); break;
+          case 0x1a: w(r, 1610, 2); break;
+          case 0x1b: w(r, 651, 2); break;
+          case 0x1c: w(r, 675, 2); break;
+          case 0x1d: w(r, 477, 2); break;
+          case 0x1e: w(r, 468, 2); break;
+          case 0x1f: w(r, 615, 2); break;
+          case 0x20: w(r, 471, 2); break;
+          case 0x21: w(r, 1596, 2); break;
+          case 0x22: w(r, 1594, 2); break;
+          case 0x23: w(r, 1592, 2); break;
+          case 0x24: w(r, 1590, 2); break;
+          case 0x25: w(r, 770, 2); break;
+          case 0x26: w(r, 725, 2); break;
+          case 0x27: w(r, 1588, 2); break;
+          case 0x28: w(r, 758, 2); break;
+          case 0x29: w(r, 1586, 2); break;
+          case 0x2a: w(r, 1584, 2); break;
+          case 0x2b: w(r, 1646, 2); break;
+          case 0x2c: w(r, 1648, 2); break;
+          case 0x2d: w(r, 770, 2); break;
+          case 0x2e: w(r, 725, 2); break;
+          case 0x2f: w(r, 1588, 2); break;
+          case 0x30: w(r, 758, 2); break;
+          case 0x31: w(r, 1650, 2); break;
+          case 0x32: w(r, 1652, 2); break;
+          case 0x33: w(r, 857, 2); break;
+          case 0x34: w(r, 476, 2); break;
+          case 0x35: w(r, 524, 2); break;
+          case 0x36: w(r, 470, 2); break;
+          case 0x37: w(r, 770, 2); break;
+          case 0x38: w(r, 725, 2); break;
+          case 0x39: w(r, 1588, 2); break;
+          case 0x3a: w(r, 857, 2); break;
+          case 0x3b: w(r, 1464, 2); break;
+          case 0x3c: w(r, 4, 1); break;
+          case 0x3d: w(r, 4, 1); break;
+          case 0x50: w(r, 1025, 3); break;
+          case 0x51: w(r, 1019, 3); break;
+          case 0x52: w(r, 1019, 3); break;
+          case 0x53: w(r, 971, 3); break;
+          case 0x54: w(r, 1205, 3); break;
+          case 0x55: w(r, 545, 3); break;
+          case 0x56: w(r, 542, 3); break;
+          case 0x57: w(r, 539, 3); break;
+          case 0x58: w(r, 533, 3); break;
+          case 0x59: w(r, 533, 3); break;
+          case 0x5a: w(r, 530, 3); break;
+          case 0x5b: w(r, 527, 3); break;
+          case 0x5c: w(r, 524, 3); break;
+          case 0x5d: w(r, 521, 3); break;
+          case 0x5e: w(r, 476, 3); break;
+          case 0x5f: w(r, 374, 3); break;
+          case 0x60: w(r, 374, 3); break;
+          case 0x61: w(r, 377, 3); break;
+          case 0x62: w(r, 785, 3); break;
+          case 0x63: w(r, 785, 3); break;
+          case 0x64: w(r, 779, 3); break;
+          case 0x65: w(r, 779, 3); break;
+          case 0x66: w(r, 473, 3); break;
+          case 0x67: w(r, 773, 3); break;
+          case 0x68: w(r, 773, 3); break;
+          case 0x69: w(r, 770, 3); break;
+          case 0x6a: w(r, 764, 3); break;
+          case 0x6b: w(r, 764, 3); break;
+          case 0x6c: w(r, 758, 3); break;
+          case 0x6d: w(r, 758, 3); break;
+          case 0x6e: w(r, 752, 3); break;
+          case 0x6f: w(r, 746, 3); break;
+          case 0x70: w(r, 746, 3); break;
+          case 0x71: w(r, 863, 3); break;
+          case 0x72: w(r, 863, 3); break;
+          case 0x73: w(r, 860, 3); break;
+          case 0x74: w(r, 857, 3); break;
+          case 0x75: w(r, 395, 3); break;
+          case 0x76: w(r, 352, 3); break;
+          case 0x77: w(r, 352, 3); break;
+          case 0x78: w(r, 854, 3); break;
+          case 0x79: w(r, 851, 3); break;
+          case 0x7a: w(r, 848, 3); break;
+          case 0x7b: w(r, 845, 3); break;
+          case 0x7c: w(r, 839, 3); break;
+          case 0x7d: w(r, 839, 3); break;
+          case 0x7e: w(r, 704, 3); break;
+          case 0x7f: w(r, 836, 3); break;
+          case 0x80: w(r, 707, 3); break;
+          case 0x81: w(r, 833, 3); break;
+          case 0x82: w(r, 830, 3); break;
+          case 0x83: w(r, 824, 3); break;
+          case 0x84: w(r, 824, 3); break;
+          case 0x85: w(r, 818, 3); break;
+          case 0x86: w(r, 818, 3); break;
+          case 0x87: w(r, 812, 3); break;
+          case 0x88: w(r, 812, 3); break;
+          case 0x89: w(r, 534, 3); break;
+          case 0x8a: w(r, 354, 3); break;
+          case 0x8b: w(r, 674, 3); break;
+          case 0x8c: w(r, 671, 3); break;
+          case 0x8d: w(r, 660, 3); break;
+          case 0x8e: w(r, 668, 3); break;
+          case 0x8f: w(r, 665, 3); break;
+          case 0x92: w(r, 662, 3); break;
+          case 0x93: w(r, 659, 3); break;
+          case 0x94: w(r, 656, 3); break;
+          case 0x95: w(r, 653, 3); break;
+          case 0x96: w(r, 650, 3); break;
+          case 0x97: w(r, 644, 3); break;
+          case 0x98: w(r, 644, 3); break;
+          case 0x99: w(r, 641, 3); break;
+          case 0x9a: w(r, 638, 3); break;
+          case 0x9b: w(r, 635, 3); break;
+          case 0x9c: w(r, 629, 3); break;
+          case 0x9d: w(r, 629, 3); break;
+          case 0x9e: w(r, 626, 3); break;
+          case 0x9f: w(r, 623, 3); break;
+          case 0xa0: w(r, 620, 3); break;
+          case 0xa1: w(r, 617, 3); break;
+          case 0xa2: w(r, 614, 3); break;
+          case 0xa3: w(r, 611, 3); break;
+          case 0xa4: w(r, 743, 3); break;
+          case 0xa5: w(r, 740, 3); break;
+          case 0xa6: w(r, 737, 3); break;
+          case 0xa7: w(r, 734, 3); break;
+          case 0xa8: w(r, 731, 3); break;
+          case 0xa9: w(r, 728, 3); break;
+          case 0xaa: w(r, 725, 3); break;
+          case 0xab: w(r, 695, 3); break;
+          case 0xac: w(r, 692, 3); break;
+          case 0xad: w(r, 689, 3); break;
+          case 0xae: w(r, 686, 3); break;
+          case 0xaf: w(r, 683, 3); break;
+          case 0xb0: w(r, 680, 3); break;
+          case 0xb1: w(r, 630, 3); break;
+          case 0xb2: w(r, 698, 3); break;
+          case 0xb3: w(r, 701, 3); break;
+          case 0xb4: w(r, 704, 3); break;
+          case 0xb5: w(r, 707, 3); break;
+          case 0xb6: w(r, 710, 3); break;
+          case 0xb7: w(r, 713, 3); break;
+          case 0xb8: w(r, 677, 3); break;
+          case 0xb9: w(r, 716, 3); break;
+          case 0xba: w(r, 719, 3); break;
+          case 0xbb: w(r, 722, 3); break;
+          case 0xbc: w(r, 719, 3); break;
+          case 0xbd: w(r, 677, 3); break;
+          case 0xbe: w(r, 678, 3); break;
+          case 0xbf: w(r, 755, 3); break;
+          case 0xc0: w(r, 791, 3); break;
+          case 0xc1: w(r, 794, 3); break;
+          case 0xc2: w(r, 800, 3); break;
+          case 0xc3: w(r, 722, 3); break;
+          case 0xc4: w(r, 395, 3); break;
+          case 0xc5: w(r, 473, 3); break;
+          case 0xc6: w(r, 470, 3); break;
+          case 0xc7: w(r, 467, 3); break;
+          case 0xf0: w(r, 461, 3); break;
+          case 0xf1: w(r, 422, 3); break;
+          case 0xf2: w(r, 4, 4); break;
+          case 0xf3: w(r, 362, 4); break;
+          case 0xf4: w(r, 354, 4); break;
+          case 0xf5: w(r, 350, 4); break;
+          case 0xf6: w(r, 342, 4); break;
+          case 0xf7: w(r, 9, 4); break;
+          case 0xf8: w(r, 14, 4); break;
+          case 0xf9: w(r, 0, 3); break;
+          case 0xfa: w(r, 0, 18); break;
+          case 0xfb: w(r, 18, 8); break;
+          case 0xfc: w(r, 338, 4); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0xfe00:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x10: w(r, 1603, 1); break;
+          case 0x11: w(r, 1768, 1); break;
+          case 0x12: w(r, 1792, 1); break;
+          case 0x13: w(r, 1112, 1); break;
+          case 0x14: w(r, 1767, 1); break;
+          case 0x15: w(r, 1424, 1); break;
+          case 0x16: w(r, 1425, 1); break;
+          case 0x17: w(r, 1803, 1); break;
+          case 0x18: w(r, 1802, 1); break;
+          case 0x19: w(r, 389, 3); break;
+          case 0x30: w(r, 389, 2); break;
+          case 0x31: w(r, 1765, 1); break;
+          case 0x32: w(r, 1764, 1); break;
+          case 0x33: w(r, 1763, 1); break;
+          case 0x34: w(r, 1763, 1); break;
+          case 0x35: w(r, 26, 1); break;
+          case 0x36: w(r, 32, 1); break;
+          case 0x37: w(r, 1762, 1); break;
+          case 0x38: w(r, 1769, 1); break;
+          case 0x39: w(r, 1160, 1); break;
+          case 0x3a: w(r, 1162, 1); break;
+          case 0x3b: w(r, 1788, 1); break;
+          case 0x3c: w(r, 1787, 1); break;
+          case 0x3d: w(r, 1786, 1); break;
+          case 0x3e: w(r, 1785, 1); break;
+          case 0x3f: w(r, 1784, 1); break;
+          case 0x40: w(r, 1783, 1); break;
+          case 0x41: w(r, 1782, 1); break;
+          case 0x42: w(r, 1781, 1); break;
+          case 0x43: w(r, 1780, 1); break;
+          case 0x44: w(r, 1779, 1); break;
+          case 0x47: w(r, 1756, 1); break;
+          case 0x48: w(r, 1757, 1); break;
+          case 0x49: w(r, 3, 1); break;
+          case 0x4a: w(r, 3, 1); break;
+          case 0x4b: w(r, 3, 1); break;
+          case 0x4c: w(r, 3, 1); break;
+          case 0x4d: w(r, 1763, 1); break;
+          case 0x4e: w(r, 1763, 1); break;
+          case 0x4f: w(r, 1763, 1); break;
+          case 0x50: w(r, 1603, 1); break;
+          case 0x51: w(r, 1768, 1); break;
+          case 0x52: w(r, 347, 1); break;
+          case 0x54: w(r, 1767, 1); break;
+          case 0x55: w(r, 1112, 1); break;
+          case 0x56: w(r, 1425, 1); break;
+          case 0x57: w(r, 1424, 1); break;
+          case 0x58: w(r, 1765, 1); break;
+          case 0x59: w(r, 26, 1); break;
+          case 0x5a: w(r, 32, 1); break;
+          case 0x5b: w(r, 1762, 1); break;
+          case 0x5c: w(r, 1769, 1); break;
+          case 0x5d: w(r, 1160, 1); break;
+          case 0x5e: w(r, 1162, 1); break;
+          case 0x5f: w(r, 1770, 1); break;
+          case 0x60: w(r, 1771, 1); break;
+          case 0x61: w(r, 1772, 1); break;
+          case 0x62: w(r, 1773, 1); break;
+          case 0x63: w(r, 1774, 1); break;
+          case 0x64: w(r, 1775, 1); break;
+          case 0x65: w(r, 1776, 1); break;
+          case 0x66: w(r, 1109, 1); break;
+          case 0x68: w(r, 1754, 1); break;
+          case 0x69: w(r, 1804, 1); break;
+          case 0x6a: w(r, 1800, 1); break;
+          case 0x6b: w(r, 1766, 1); break;
+          case 0x70: w(r, 3, 1); break;
+          case 0x71: w(r, 1793, 1); break;
+          case 0x72: w(r, 3, 1); break;
+          case 0x74: w(r, 3, 1); break;
+          case 0x76: w(r, 3, 1); break;
+          case 0x77: w(r, 1793, 1); break;
+          case 0x78: w(r, 3, 1); break;
+          case 0x79: w(r, 1793, 1); break;
+          case 0x7a: w(r, 3, 1); break;
+          case 0x7b: w(r, 1793, 1); break;
+          case 0x7c: w(r, 3, 1); break;
+          case 0x7d: w(r, 1793, 1); break;
+          case 0x7e: w(r, 3, 1); break;
+          case 0x7f: w(r, 1793, 1); break;
+          case 0x80: w(r, 1795, 1); break;
+          case 0x81: w(r, 4, 1); break;
+          case 0x82: w(r, 4, 1); break;
+          case 0x83: w(r, 4, 1); break;
+          case 0x84: w(r, 4, 1); break;
+          case 0x85: w(r, 14, 1); break;
+          case 0x86: w(r, 14, 1); break;
+          case 0x87: w(r, 4, 1); break;
+          case 0x88: w(r, 4, 1); break;
+          case 0x89: w(r, 11, 1); break;
+          case 0x8a: w(r, 11, 1); break;
+          case 0x8b: w(r, 11, 1); break;
+          case 0x8c: w(r, 11, 1); break;
+          case 0x8d: w(r, 4, 1); break;
+          case 0x8e: w(r, 4, 1); break;
+          case 0x8f: w(r, 364, 1); break;
+          case 0x90: w(r, 364, 1); break;
+          case 0x91: w(r, 364, 1); break;
+          case 0x92: w(r, 364, 1); break;
+          case 0x93: w(r, 1798, 1); break;
+          case 0x94: w(r, 1798, 1); break;
+          case 0x95: w(r, 539, 1); break;
+          case 0x96: w(r, 539, 1); break;
+          case 0x97: w(r, 539, 1); break;
+          case 0x98: w(r, 539, 1); break;
+          case 0x99: w(r, 1486, 1); break;
+          case 0x9a: w(r, 1486, 1); break;
+          case 0x9b: w(r, 1486, 1); break;
+          case 0x9c: w(r, 1486, 1); break;
+          case 0x9d: w(r, 18, 1); break;
+          case 0x9e: w(r, 18, 1); break;
+          case 0x9f: w(r, 18, 1); break;
+          case 0xa0: w(r, 18, 1); break;
+          case 0xa1: w(r, 355, 1); break;
+          case 0xa2: w(r, 355, 1); break;
+          case 0xa3: w(r, 355, 1); break;
+          case 0xa4: w(r, 355, 1); break;
+          case 0xa5: w(r, 471, 1); break;
+          case 0xa6: w(r, 471, 1); break;
+          case 0xa7: w(r, 471, 1); break;
+          case 0xa8: w(r, 471, 1); break;
+          case 0xa9: w(r, 357, 1); break;
+          case 0xaa: w(r, 357, 1); break;
+          case 0xab: w(r, 1796, 1); break;
+          case 0xac: w(r, 1796, 1); break;
+          case 0xad: w(r, 338, 1); break;
+          case 0xae: w(r, 338, 1); break;
+          case 0xaf: w(r, 1523, 1); break;
+          case 0xb0: w(r, 1523, 1); break;
+          case 0xb1: w(r, 15, 1); break;
+          case 0xb2: w(r, 15, 1); break;
+          case 0xb3: w(r, 15, 1); break;
+          case 0xb4: w(r, 15, 1); break;
+          case 0xb5: w(r, 725, 1); break;
+          case 0xb6: w(r, 725, 1); break;
+          case 0xb7: w(r, 725, 1); break;
+          case 0xb8: w(r, 725, 1); break;
+          case 0xb9: w(r, 0, 1); break;
+          case 0xba: w(r, 0, 1); break;
+          case 0xbb: w(r, 0, 1); break;
+          case 0xbc: w(r, 0, 1); break;
+          case 0xbd: w(r, 695, 1); break;
+          case 0xbe: w(r, 695, 1); break;
+          case 0xbf: w(r, 695, 1); break;
+          case 0xc0: w(r, 695, 1); break;
+          case 0xc1: w(r, 857, 1); break;
+          case 0xc2: w(r, 857, 1); break;
+          case 0xc3: w(r, 857, 1); break;
+          case 0xc4: w(r, 857, 1); break;
+          case 0xc5: w(r, 1464, 1); break;
+          case 0xc6: w(r, 1464, 1); break;
+          case 0xc7: w(r, 1464, 1); break;
+          case 0xc8: w(r, 1464, 1); break;
+          case 0xc9: w(r, 9, 1); break;
+          case 0xca: w(r, 9, 1); break;
+          case 0xcb: w(r, 9, 1); break;
+          case 0xcc: w(r, 9, 1); break;
+          case 0xcd: w(r, 845, 1); break;
+          case 0xce: w(r, 845, 1); break;
+          case 0xcf: w(r, 845, 1); break;
+          case 0xd0: w(r, 845, 1); break;
+          case 0xd1: w(r, 794, 1); break;
+          case 0xd2: w(r, 794, 1); break;
+          case 0xd3: w(r, 794, 1); break;
+          case 0xd4: w(r, 794, 1); break;
+          case 0xd5: w(r, 422, 1); break;
+          case 0xd6: w(r, 422, 1); break;
+          case 0xd7: w(r, 422, 1); break;
+          case 0xd8: w(r, 422, 1); break;
+          case 0xd9: w(r, 363, 1); break;
+          case 0xda: w(r, 363, 1); break;
+          case 0xdb: w(r, 363, 1); break;
+          case 0xdc: w(r, 363, 1); break;
+          case 0xdd: w(r, 1, 1); break;
+          case 0xde: w(r, 1, 1); break;
+          case 0xdf: w(r, 1, 1); break;
+          case 0xe0: w(r, 1, 1); break;
+          case 0xe1: w(r, 17, 1); break;
+          case 0xe2: w(r, 17, 1); break;
+          case 0xe3: w(r, 17, 1); break;
+          case 0xe4: w(r, 17, 1); break;
+          case 0xe5: w(r, 467, 1); break;
+          case 0xe6: w(r, 467, 1); break;
+          case 0xe7: w(r, 467, 1); break;
+          case 0xe8: w(r, 467, 1); break;
+          case 0xe9: w(r, 7, 1); break;
+          case 0xea: w(r, 7, 1); break;
+          case 0xeb: w(r, 7, 1); break;
+          case 0xec: w(r, 7, 1); break;
+          case 0xed: w(r, 14, 1); break;
+          case 0xee: w(r, 14, 1); break;
+          case 0xef: w(r, 2, 1); break;
+          case 0xf0: w(r, 2, 1); break;
+          case 0xf1: w(r, 11, 1); break;
+          case 0xf2: w(r, 11, 1); break;
+          case 0xf3: w(r, 11, 1); break;
+          case 0xf4: w(r, 11, 1); break;
+          case 0xf5: w(r, 22, 2); break;
+          case 0xf6: w(r, 22, 2); break;
+          case 0xf7: w(r, 22, 2); break;
+          case 0xf8: w(r, 22, 2); break;
+          case 0xf9: w(r, 22, 2); break;
+          case 0xfa: w(r, 22, 2); break;
+          case 0xfb: w(r, 22, 2); break;
+          case 0xfc: w(r, 22, 2); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0xff00:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x1: w(r, 1424, 1); break;
+          case 0x2: w(r, 1806, 1); break;
+          case 0x3: w(r, 1770, 1); break;
+          case 0x4: w(r, 1804, 1); break;
+          case 0x5: w(r, 1800, 1); break;
+          case 0x6: w(r, 1771, 1); break;
+          case 0x7: w(r, 1801, 1); break;
+          case 0x8: w(r, 26, 1); break;
+          case 0x9: w(r, 32, 1); break;
+          case 0xa: w(r, 1772, 1); break;
+          case 0xb: w(r, 1773, 1); break;
+          case 0xc: w(r, 1603, 1); break;
+          case 0xd: w(r, 1774, 1); break;
+          case 0xe: w(r, 347, 1); break;
+          case 0xf: w(r, 957, 1); break;
+          case 0x10: w(r, 161, 1); break;
+          case 0x11: w(r, 158, 1); break;
+          case 0x12: w(r, 44, 1); break;
+          case 0x13: w(r, 184, 1); break;
+          case 0x14: w(r, 188, 1); break;
+          case 0x15: w(r, 192, 1); break;
+          case 0x16: w(r, 196, 1); break;
+          case 0x17: w(r, 200, 1); break;
+          case 0x18: w(r, 204, 1); break;
+          case 0x19: w(r, 208, 1); break;
+          case 0x1a: w(r, 1112, 1); break;
+          case 0x1b: w(r, 1767, 1); break;
+          case 0x1c: w(r, 1775, 1); break;
+          case 0x1d: w(r, 1109, 1); break;
+          case 0x1e: w(r, 1776, 1); break;
+          case 0x1f: w(r, 1425, 1); break;
+          case 0x20: w(r, 1766, 1); break;
+          case 0x21: w(r, 491, 1); break;
+          case 0x22: w(r, 912, 1); break;
+          case 0x23: w(r, 358, 1); break;
+          case 0x24: w(r, 517, 1); break;
+          case 0x25: w(r, 921, 1); break;
+          case 0x26: w(r, 924, 1); break;
+          case 0x27: w(r, 404, 1); break;
+          case 0x28: w(r, 399, 1); break;
+          case 0x29: w(r, 163, 1); break;
+          case 0x2a: w(r, 936, 1); break;
+          case 0x2b: w(r, 939, 1); break;
+          case 0x2c: w(r, 515, 1); break;
+          case 0x2d: w(r, 401, 1); break;
+          case 0x2e: w(r, 1122, 1); break;
+          case 0x2f: w(r, 1125, 1); break;
+          case 0x30: w(r, 381, 1); break;
+          case 0x31: w(r, 1131, 1); break;
+          case 0x32: w(r, 1134, 1); break;
+          case 0x33: w(r, 1137, 1); break;
+          case 0x34: w(r, 407, 1); break;
+          case 0x35: w(r, 1143, 1); break;
+          case 0x36: w(r, 162, 1); break;
+          case 0x37: w(r, 1149, 1); break;
+          case 0x38: w(r, 869, 1); break;
+          case 0x39: w(r, 1155, 1); break;
+          case 0x3a: w(r, 1158, 1); break;
+          case 0x3b: w(r, 1756, 1); break;
+          case 0x3c: w(r, 1754, 1); break;
+          case 0x3d: w(r, 1757, 1); break;
+          case 0x3e: w(r, 1755, 1); break;
+          case 0x3f: w(r, 1763, 1); break;
+          case 0x40: w(r, 1761, 1); break;
+          case 0x41: w(r, 40, 1); break;
+          case 0x42: w(r, 383, 1); break;
+          case 0x43: w(r, 331, 1); break;
+          case 0x44: w(r, 41, 1); break;
+          case 0x45: w(r, 518, 1); break;
+          case 0x46: w(r, 593, 1); break;
+          case 0x47: w(r, 361, 1); break;
+          case 0x48: w(r, 380, 1); break;
+          case 0x49: w(r, 167, 1); break;
+          case 0x4a: w(r, 1047, 1); break;
+          case 0x4b: w(r, 330, 1); break;
+          case 0x4c: w(r, 333, 1); break;
+          case 0x4d: w(r, 334, 1); break;
+          case 0x4e: w(r, 1059, 1); break;
+          case 0x4f: w(r, 480, 1); break;
+          case 0x50: w(r, 366, 1); break;
+          case 0x51: w(r, 1071, 1); break;
+          case 0x52: w(r, 39, 1); break;
+          case 0x53: w(r, 43, 1); break;
+          case 0x54: w(r, 1089, 1); break;
+          case 0x55: w(r, 967, 1); break;
+          case 0x56: w(r, 166, 1); break;
+          case 0x57: w(r, 1098, 1); break;
+          case 0x58: w(r, 872, 1); break;
+          case 0x59: w(r, 1104, 1); break;
+          case 0x5a: w(r, 400, 1); break;
+          case 0x5b: w(r, 1762, 1); break;
+          case 0x5c: w(r, 1777, 1); break;
+          case 0x5d: w(r, 1769, 1); break;
+          case 0x5e: w(r, 1789, 1); break;
+          case 0x5f: w(r, 1790, 1); break;
+          case 0x60: w(r, 1791, 1); break;
+          case 0x61: w(r, 1792, 1); break;
+          case 0x62: w(r, 1782, 1); break;
+          case 0x63: w(r, 1781, 1); break;
+          case 0x64: w(r, 1768, 1); break;
+          case 0x65: w(r, 1778, 1); break;
+          case 0x66: w(r, 1758, 1); break;
+          case 0x67: w(r, 57, 1); break;
+          case 0x68: w(r, 151, 1); break;
+          case 0x69: w(r, 1759, 1); break;
+          case 0x6a: w(r, 119, 1); break;
+          case 0x6b: w(r, 498, 1); break;
+          case 0x6c: w(r, 1760, 1); break;
+          case 0x6d: w(r, 247, 1); break;
+          case 0x6e: w(r, 104, 1); break;
+          case 0x6f: w(r, 59, 1); break;
+          case 0x70: w(r, 48, 1); break;
+          case 0x71: w(r, 62, 1); break;
+          case 0x72: w(r, 84, 1); break;
+          case 0x73: w(r, 497, 1); break;
+          case 0x74: w(r, 106, 1); break;
+          case 0x75: w(r, 485, 1); break;
+          case 0x76: w(r, 135, 1); break;
+          case 0x77: w(r, 45, 1); break;
+          case 0x78: w(r, 81, 1); break;
+          case 0x79: w(r, 54, 1); break;
+          case 0x7a: w(r, 575, 1); break;
+          case 0x7b: w(r, 71, 1); break;
+          case 0x7c: w(r, 103, 1); break;
+          case 0x7d: w(r, 63, 1); break;
+          case 0x7e: w(r, 68, 1); break;
+          case 0x7f: w(r, 1407, 1); break;
+          case 0x80: w(r, 113, 1); break;
+          case 0x81: w(r, 73, 1); break;
+          case 0x82: w(r, 454, 1); break;
+          case 0x83: w(r, 1456, 1); break;
+          case 0x84: w(r, 49, 1); break;
+          case 0x85: w(r, 580, 1); break;
+          case 0x86: w(r, 231, 1); break;
+          case 0x87: w(r, 1877, 1); break;
+          case 0x88: w(r, 257, 1); break;
+          case 0x89: w(r, 563, 1); break;
+          case 0x8a: w(r, 66, 1); break;
+          case 0x8b: w(r, 61, 1); break;
+          case 0x8c: w(r, 56, 1); break;
+          case 0x8d: w(r, 111, 1); break;
+          case 0x8e: w(r, 142, 1); break;
+          case 0x8f: w(r, 101, 1); break;
+          case 0x90: w(r, 76, 1); break;
+          case 0x91: w(r, 75, 1); break;
+          case 0x92: w(r, 47, 1); break;
+          case 0x93: w(r, 1879, 1); break;
+          case 0x94: w(r, 806, 1); break;
+          case 0x95: w(r, 803, 1); break;
+          case 0x96: w(r, 1878, 1); break;
+          case 0x97: w(r, 58, 1); break;
+          case 0x98: w(r, 77, 1); break;
+          case 0x99: w(r, 50, 1); break;
+          case 0x9a: w(r, 51, 1); break;
+          case 0x9b: w(r, 46, 1); break;
+          case 0x9c: w(r, 93, 1); break;
+          case 0x9d: w(r, 52, 1); break;
+          case 0xa0: w(r, 1869, 1); break;
+          case 0xa1: w(r, 124, 1); break;
+          case 0xa2: w(r, 1868, 1); break;
+          case 0xa3: w(r, 1867, 1); break;
+          case 0xa4: w(r, 323, 1); break;
+          case 0xa5: w(r, 1866, 1); break;
+          case 0xa6: w(r, 1865, 1); break;
+          case 0xa7: w(r, 319, 1); break;
+          case 0xa8: w(r, 1864, 1); break;
+          case 0xa9: w(r, 315, 1); break;
+          case 0xaa: w(r, 1863, 1); break;
+          case 0xab: w(r, 1862, 1); break;
+          case 0xac: w(r, 1861, 1); break;
+          case 0xad: w(r, 1860, 1); break;
+          case 0xae: w(r, 1876, 1); break;
+          case 0xaf: w(r, 1875, 1); break;
+          case 0xb0: w(r, 1874, 1); break;
+          case 0xb1: w(r, 311, 1); break;
+          case 0xb2: w(r, 307, 1); break;
+          case 0xb3: w(r, 1873, 1); break;
+          case 0xb4: w(r, 1872, 1); break;
+          case 0xb5: w(r, 303, 1); break;
+          case 0xb6: w(r, 1871, 1); break;
+          case 0xb7: w(r, 27, 1); break;
+          case 0xb8: w(r, 29, 1); break;
+          case 0xb9: w(r, 1870, 1); break;
+          case 0xba: w(r, 121, 1); break;
+          case 0xbb: w(r, 287, 1); break;
+          case 0xbc: w(r, 283, 1); break;
+          case 0xbd: w(r, 279, 1); break;
+          case 0xbe: w(r, 36, 1); break;
+          case 0xc2: w(r, 122, 1); break;
+          case 0xc3: w(r, 1901, 1); break;
+          case 0xc4: w(r, 1900, 1); break;
+          case 0xc5: w(r, 1899, 1); break;
+          case 0xc6: w(r, 30, 1); break;
+          case 0xc7: w(r, 1898, 1); break;
+          case 0xca: w(r, 1897, 1); break;
+          case 0xcb: w(r, 1896, 1); break;
+          case 0xcc: w(r, 28, 1); break;
+          case 0xcd: w(r, 1895, 1); break;
+          case 0xce: w(r, 1894, 1); break;
+          case 0xcf: w(r, 1893, 1); break;
+          case 0xd2: w(r, 1892, 1); break;
+          case 0xd3: w(r, 37, 1); break;
+          case 0xd4: w(r, 1891, 1); break;
+          case 0xd5: w(r, 1890, 1); break;
+          case 0xd6: w(r, 1889, 1); break;
+          case 0xd7: w(r, 1888, 1); break;
+          case 0xda: w(r, 1887, 1); break;
+          case 0xdb: w(r, 217, 1); break;
+          case 0xdc: w(r, 1917, 1); break;
+          case 0xe0: w(r, 1916, 1); break;
+          case 0xe1: w(r, 1915, 1); break;
+          case 0xe2: w(r, 1914, 1); break;
+          case 0xe3: w(r, 3, 1); break;
+          case 0xe4: w(r, 1913, 1); break;
+          case 0xe5: w(r, 1912, 1); break;
+          case 0xe6: w(r, 1911, 1); break;
+          case 0xe8: w(r, 1910, 1); break;
+          case 0xe9: w(r, 1909, 1); break;
+          case 0xea: w(r, 1908, 1); break;
+          case 0xeb: w(r, 1907, 1); break;
+          case 0xec: w(r, 1906, 1); break;
+          case 0xed: w(r, 1905, 1); break;
+          case 0xee: w(r, 1904, 1); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        default: r.push_back(c);
+        }
+      }
+      break;
+      case 0x10000:
+      {
+        switch (static_cast<uint16_t>(c & 0x0000ff00))
+        {
+        case 0x1000:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x9a: w(r, 1903, 1); break;
+          case 0x9c: w(r, 1902, 1); break;
+          case 0xab: w(r, 1886, 1); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0xd100:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x5e: w(r, 1885, 1); break;
+          case 0x5f: w(r, 1883, 1); break;
+          case 0x60: w(r, 1883, 1); break;
+          case 0x61: w(r, 1883, 1); break;
+          case 0x62: w(r, 1883, 1); break;
+          case 0x63: w(r, 1883, 1); break;
+          case 0x64: w(r, 1883, 1); break;
+          case 0xbb: w(r, 1881, 1); break;
+          case 0xbc: w(r, 1880, 1); break;
+          case 0xbd: w(r, 1881, 1); break;
+          case 0xbe: w(r, 1880, 1); break;
+          case 0xbf: w(r, 1881, 1); break;
+          case 0xc0: w(r, 1880, 1); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0xd400:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x0: w(r, 491, 1); break;
+          case 0x1: w(r, 912, 1); break;
+          case 0x2: w(r, 358, 1); break;
+          case 0x3: w(r, 517, 1); break;
+          case 0x4: w(r, 921, 1); break;
+          case 0x5: w(r, 924, 1); break;
+          case 0x6: w(r, 404, 1); break;
+          case 0x7: w(r, 399, 1); break;
+          case 0x8: w(r, 163, 1); break;
+          case 0x9: w(r, 936, 1); break;
+          case 0xa: w(r, 939, 1); break;
+          case 0xb: w(r, 515, 1); break;
+          case 0xc: w(r, 401, 1); break;
+          case 0xd: w(r, 1122, 1); break;
+          case 0xe: w(r, 1125, 1); break;
+          case 0xf: w(r, 381, 1); break;
+          case 0x10: w(r, 1131, 1); break;
+          case 0x11: w(r, 1134, 1); break;
+          case 0x12: w(r, 1137, 1); break;
+          case 0x13: w(r, 407, 1); break;
+          case 0x14: w(r, 1143, 1); break;
+          case 0x15: w(r, 162, 1); break;
+          case 0x16: w(r, 1149, 1); break;
+          case 0x17: w(r, 869, 1); break;
+          case 0x18: w(r, 1155, 1); break;
+          case 0x19: w(r, 1158, 1); break;
+          case 0x1a: w(r, 40, 1); break;
+          case 0x1b: w(r, 383, 1); break;
+          case 0x1c: w(r, 331, 1); break;
+          case 0x1d: w(r, 41, 1); break;
+          case 0x1e: w(r, 518, 1); break;
+          case 0x1f: w(r, 593, 1); break;
+          case 0x20: w(r, 361, 1); break;
+          case 0x21: w(r, 380, 1); break;
+          case 0x22: w(r, 167, 1); break;
+          case 0x23: w(r, 1047, 1); break;
+          case 0x24: w(r, 330, 1); break;
+          case 0x25: w(r, 333, 1); break;
+          case 0x26: w(r, 334, 1); break;
+          case 0x27: w(r, 1059, 1); break;
+          case 0x28: w(r, 480, 1); break;
+          case 0x29: w(r, 366, 1); break;
+          case 0x2a: w(r, 1071, 1); break;
+          case 0x2b: w(r, 39, 1); break;
+          case 0x2c: w(r, 43, 1); break;
+          case 0x2d: w(r, 1089, 1); break;
+          case 0x2e: w(r, 967, 1); break;
+          case 0x2f: w(r, 166, 1); break;
+          case 0x30: w(r, 1098, 1); break;
+          case 0x31: w(r, 872, 1); break;
+          case 0x32: w(r, 1104, 1); break;
+          case 0x33: w(r, 400, 1); break;
+          case 0x34: w(r, 491, 1); break;
+          case 0x35: w(r, 912, 1); break;
+          case 0x36: w(r, 358, 1); break;
+          case 0x37: w(r, 517, 1); break;
+          case 0x38: w(r, 921, 1); break;
+          case 0x39: w(r, 924, 1); break;
+          case 0x3a: w(r, 404, 1); break;
+          case 0x3b: w(r, 399, 1); break;
+          case 0x3c: w(r, 163, 1); break;
+          case 0x3d: w(r, 936, 1); break;
+          case 0x3e: w(r, 939, 1); break;
+          case 0x3f: w(r, 515, 1); break;
+          case 0x40: w(r, 401, 1); break;
+          case 0x41: w(r, 1122, 1); break;
+          case 0x42: w(r, 1125, 1); break;
+          case 0x43: w(r, 381, 1); break;
+          case 0x44: w(r, 1131, 1); break;
+          case 0x45: w(r, 1134, 1); break;
+          case 0x46: w(r, 1137, 1); break;
+          case 0x47: w(r, 407, 1); break;
+          case 0x48: w(r, 1143, 1); break;
+          case 0x49: w(r, 162, 1); break;
+          case 0x4a: w(r, 1149, 1); break;
+          case 0x4b: w(r, 869, 1); break;
+          case 0x4c: w(r, 1155, 1); break;
+          case 0x4d: w(r, 1158, 1); break;
+          case 0x4e: w(r, 40, 1); break;
+          case 0x4f: w(r, 383, 1); break;
+          case 0x50: w(r, 331, 1); break;
+          case 0x51: w(r, 41, 1); break;
+          case 0x52: w(r, 518, 1); break;
+          case 0x53: w(r, 593, 1); break;
+          case 0x54: w(r, 361, 1); break;
+          case 0x56: w(r, 167, 1); break;
+          case 0x57: w(r, 1047, 1); break;
+          case 0x58: w(r, 330, 1); break;
+          case 0x59: w(r, 333, 1); break;
+          case 0x5a: w(r, 334, 1); break;
+          case 0x5b: w(r, 1059, 1); break;
+          case 0x5c: w(r, 480, 1); break;
+          case 0x5d: w(r, 366, 1); break;
+          case 0x5e: w(r, 1071, 1); break;
+          case 0x5f: w(r, 39, 1); break;
+          case 0x60: w(r, 43, 1); break;
+          case 0x61: w(r, 1089, 1); break;
+          case 0x62: w(r, 967, 1); break;
+          case 0x63: w(r, 166, 1); break;
+          case 0x64: w(r, 1098, 1); break;
+          case 0x65: w(r, 872, 1); break;
+          case 0x66: w(r, 1104, 1); break;
+          case 0x67: w(r, 400, 1); break;
+          case 0x68: w(r, 491, 1); break;
+          case 0x69: w(r, 912, 1); break;
+          case 0x6a: w(r, 358, 1); break;
+          case 0x6b: w(r, 517, 1); break;
+          case 0x6c: w(r, 921, 1); break;
+          case 0x6d: w(r, 924, 1); break;
+          case 0x6e: w(r, 404, 1); break;
+          case 0x6f: w(r, 399, 1); break;
+          case 0x70: w(r, 163, 1); break;
+          case 0x71: w(r, 936, 1); break;
+          case 0x72: w(r, 939, 1); break;
+          case 0x73: w(r, 515, 1); break;
+          case 0x74: w(r, 401, 1); break;
+          case 0x75: w(r, 1122, 1); break;
+          case 0x76: w(r, 1125, 1); break;
+          case 0x77: w(r, 381, 1); break;
+          case 0x78: w(r, 1131, 1); break;
+          case 0x79: w(r, 1134, 1); break;
+          case 0x7a: w(r, 1137, 1); break;
+          case 0x7b: w(r, 407, 1); break;
+          case 0x7c: w(r, 1143, 1); break;
+          case 0x7d: w(r, 162, 1); break;
+          case 0x7e: w(r, 1149, 1); break;
+          case 0x7f: w(r, 869, 1); break;
+          case 0x80: w(r, 1155, 1); break;
+          case 0x81: w(r, 1158, 1); break;
+          case 0x82: w(r, 40, 1); break;
+          case 0x83: w(r, 383, 1); break;
+          case 0x84: w(r, 331, 1); break;
+          case 0x85: w(r, 41, 1); break;
+          case 0x86: w(r, 518, 1); break;
+          case 0x87: w(r, 593, 1); break;
+          case 0x88: w(r, 361, 1); break;
+          case 0x89: w(r, 380, 1); break;
+          case 0x8a: w(r, 167, 1); break;
+          case 0x8b: w(r, 1047, 1); break;
+          case 0x8c: w(r, 330, 1); break;
+          case 0x8d: w(r, 333, 1); break;
+          case 0x8e: w(r, 334, 1); break;
+          case 0x8f: w(r, 1059, 1); break;
+          case 0x90: w(r, 480, 1); break;
+          case 0x91: w(r, 366, 1); break;
+          case 0x92: w(r, 1071, 1); break;
+          case 0x93: w(r, 39, 1); break;
+          case 0x94: w(r, 43, 1); break;
+          case 0x95: w(r, 1089, 1); break;
+          case 0x96: w(r, 967, 1); break;
+          case 0x97: w(r, 166, 1); break;
+          case 0x98: w(r, 1098, 1); break;
+          case 0x99: w(r, 872, 1); break;
+          case 0x9a: w(r, 1104, 1); break;
+          case 0x9b: w(r, 400, 1); break;
+          case 0x9c: w(r, 491, 1); break;
+          case 0x9e: w(r, 358, 1); break;
+          case 0x9f: w(r, 517, 1); break;
+          case 0xa2: w(r, 404, 1); break;
+          case 0xa5: w(r, 936, 1); break;
+          case 0xa6: w(r, 939, 1); break;
+          case 0xa9: w(r, 1122, 1); break;
+          case 0xaa: w(r, 1125, 1); break;
+          case 0xab: w(r, 381, 1); break;
+          case 0xac: w(r, 1131, 1); break;
+          case 0xae: w(r, 1137, 1); break;
+          case 0xaf: w(r, 407, 1); break;
+          case 0xb0: w(r, 1143, 1); break;
+          case 0xb1: w(r, 162, 1); break;
+          case 0xb2: w(r, 1149, 1); break;
+          case 0xb3: w(r, 869, 1); break;
+          case 0xb4: w(r, 1155, 1); break;
+          case 0xb5: w(r, 1158, 1); break;
+          case 0xb6: w(r, 40, 1); break;
+          case 0xb7: w(r, 383, 1); break;
+          case 0xb8: w(r, 331, 1); break;
+          case 0xb9: w(r, 41, 1); break;
+          case 0xbb: w(r, 593, 1); break;
+          case 0xbd: w(r, 380, 1); break;
+          case 0xbe: w(r, 167, 1); break;
+          case 0xbf: w(r, 1047, 1); break;
+          case 0xc0: w(r, 330, 1); break;
+          case 0xc1: w(r, 333, 1); break;
+          case 0xc2: w(r, 334, 1); break;
+          case 0xc3: w(r, 1059, 1); break;
+          case 0xc5: w(r, 366, 1); break;
+          case 0xc6: w(r, 1071, 1); break;
+          case 0xc7: w(r, 39, 1); break;
+          case 0xc8: w(r, 43, 1); break;
+          case 0xc9: w(r, 1089, 1); break;
+          case 0xca: w(r, 967, 1); break;
+          case 0xcb: w(r, 166, 1); break;
+          case 0xcc: w(r, 1098, 1); break;
+          case 0xcd: w(r, 872, 1); break;
+          case 0xce: w(r, 1104, 1); break;
+          case 0xcf: w(r, 400, 1); break;
+          case 0xd0: w(r, 491, 1); break;
+          case 0xd1: w(r, 912, 1); break;
+          case 0xd2: w(r, 358, 1); break;
+          case 0xd3: w(r, 517, 1); break;
+          case 0xd4: w(r, 921, 1); break;
+          case 0xd5: w(r, 924, 1); break;
+          case 0xd6: w(r, 404, 1); break;
+          case 0xd7: w(r, 399, 1); break;
+          case 0xd8: w(r, 163, 1); break;
+          case 0xd9: w(r, 936, 1); break;
+          case 0xda: w(r, 939, 1); break;
+          case 0xdb: w(r, 515, 1); break;
+          case 0xdc: w(r, 401, 1); break;
+          case 0xdd: w(r, 1122, 1); break;
+          case 0xde: w(r, 1125, 1); break;
+          case 0xdf: w(r, 381, 1); break;
+          case 0xe0: w(r, 1131, 1); break;
+          case 0xe1: w(r, 1134, 1); break;
+          case 0xe2: w(r, 1137, 1); break;
+          case 0xe3: w(r, 407, 1); break;
+          case 0xe4: w(r, 1143, 1); break;
+          case 0xe5: w(r, 162, 1); break;
+          case 0xe6: w(r, 1149, 1); break;
+          case 0xe7: w(r, 869, 1); break;
+          case 0xe8: w(r, 1155, 1); break;
+          case 0xe9: w(r, 1158, 1); break;
+          case 0xea: w(r, 40, 1); break;
+          case 0xeb: w(r, 383, 1); break;
+          case 0xec: w(r, 331, 1); break;
+          case 0xed: w(r, 41, 1); break;
+          case 0xee: w(r, 518, 1); break;
+          case 0xef: w(r, 593, 1); break;
+          case 0xf0: w(r, 361, 1); break;
+          case 0xf1: w(r, 380, 1); break;
+          case 0xf2: w(r, 167, 1); break;
+          case 0xf3: w(r, 1047, 1); break;
+          case 0xf4: w(r, 330, 1); break;
+          case 0xf5: w(r, 333, 1); break;
+          case 0xf6: w(r, 334, 1); break;
+          case 0xf7: w(r, 1059, 1); break;
+          case 0xf8: w(r, 480, 1); break;
+          case 0xf9: w(r, 366, 1); break;
+          case 0xfa: w(r, 1071, 1); break;
+          case 0xfb: w(r, 39, 1); break;
+          case 0xfc: w(r, 43, 1); break;
+          case 0xfd: w(r, 1089, 1); break;
+          case 0xfe: w(r, 967, 1); break;
+          case 0xff: w(r, 166, 1); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0xd500:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x0: w(r, 1098, 1); break;
+          case 0x1: w(r, 872, 1); break;
+          case 0x2: w(r, 1104, 1); break;
+          case 0x3: w(r, 400, 1); break;
+          case 0x4: w(r, 491, 1); break;
+          case 0x5: w(r, 912, 1); break;
+          case 0x7: w(r, 517, 1); break;
+          case 0x8: w(r, 921, 1); break;
+          case 0x9: w(r, 924, 1); break;
+          case 0xa: w(r, 404, 1); break;
+          case 0xd: w(r, 936, 1); break;
+          case 0xe: w(r, 939, 1); break;
+          case 0xf: w(r, 515, 1); break;
+          case 0x10: w(r, 401, 1); break;
+          case 0x11: w(r, 1122, 1); break;
+          case 0x12: w(r, 1125, 1); break;
+          case 0x13: w(r, 381, 1); break;
+          case 0x14: w(r, 1131, 1); break;
+          case 0x16: w(r, 1137, 1); break;
+          case 0x17: w(r, 407, 1); break;
+          case 0x18: w(r, 1143, 1); break;
+          case 0x19: w(r, 162, 1); break;
+          case 0x1a: w(r, 1149, 1); break;
+          case 0x1b: w(r, 869, 1); break;
+          case 0x1c: w(r, 1155, 1); break;
+          case 0x1e: w(r, 40, 1); break;
+          case 0x1f: w(r, 383, 1); break;
+          case 0x20: w(r, 331, 1); break;
+          case 0x21: w(r, 41, 1); break;
+          case 0x22: w(r, 518, 1); break;
+          case 0x23: w(r, 593, 1); break;
+          case 0x24: w(r, 361, 1); break;
+          case 0x25: w(r, 380, 1); break;
+          case 0x26: w(r, 167, 1); break;
+          case 0x27: w(r, 1047, 1); break;
+          case 0x28: w(r, 330, 1); break;
+          case 0x29: w(r, 333, 1); break;
+          case 0x2a: w(r, 334, 1); break;
+          case 0x2b: w(r, 1059, 1); break;
+          case 0x2c: w(r, 480, 1); break;
+          case 0x2d: w(r, 366, 1); break;
+          case 0x2e: w(r, 1071, 1); break;
+          case 0x2f: w(r, 39, 1); break;
+          case 0x30: w(r, 43, 1); break;
+          case 0x31: w(r, 1089, 1); break;
+          case 0x32: w(r, 967, 1); break;
+          case 0x33: w(r, 166, 1); break;
+          case 0x34: w(r, 1098, 1); break;
+          case 0x35: w(r, 872, 1); break;
+          case 0x36: w(r, 1104, 1); break;
+          case 0x37: w(r, 400, 1); break;
+          case 0x38: w(r, 491, 1); break;
+          case 0x39: w(r, 912, 1); break;
+          case 0x3b: w(r, 517, 1); break;
+          case 0x3c: w(r, 921, 1); break;
+          case 0x3d: w(r, 924, 1); break;
+          case 0x3e: w(r, 404, 1); break;
+          case 0x40: w(r, 163, 1); break;
+          case 0x41: w(r, 936, 1); break;
+          case 0x42: w(r, 939, 1); break;
+          case 0x43: w(r, 515, 1); break;
+          case 0x44: w(r, 401, 1); break;
+          case 0x46: w(r, 1125, 1); break;
+          case 0x4a: w(r, 1137, 1); break;
+          case 0x4b: w(r, 407, 1); break;
+          case 0x4c: w(r, 1143, 1); break;
+          case 0x4d: w(r, 162, 1); break;
+          case 0x4e: w(r, 1149, 1); break;
+          case 0x4f: w(r, 869, 1); break;
+          case 0x50: w(r, 1155, 1); break;
+          case 0x52: w(r, 40, 1); break;
+          case 0x53: w(r, 383, 1); break;
+          case 0x54: w(r, 331, 1); break;
+          case 0x55: w(r, 41, 1); break;
+          case 0x56: w(r, 518, 1); break;
+          case 0x57: w(r, 593, 1); break;
+          case 0x58: w(r, 361, 1); break;
+          case 0x59: w(r, 380, 1); break;
+          case 0x5a: w(r, 167, 1); break;
+          case 0x5b: w(r, 1047, 1); break;
+          case 0x5c: w(r, 330, 1); break;
+          case 0x5d: w(r, 333, 1); break;
+          case 0x5e: w(r, 334, 1); break;
+          case 0x5f: w(r, 1059, 1); break;
+          case 0x60: w(r, 480, 1); break;
+          case 0x61: w(r, 366, 1); break;
+          case 0x62: w(r, 1071, 1); break;
+          case 0x63: w(r, 39, 1); break;
+          case 0x64: w(r, 43, 1); break;
+          case 0x65: w(r, 1089, 1); break;
+          case 0x66: w(r, 967, 1); break;
+          case 0x67: w(r, 166, 1); break;
+          case 0x68: w(r, 1098, 1); break;
+          case 0x69: w(r, 872, 1); break;
+          case 0x6a: w(r, 1104, 1); break;
+          case 0x6b: w(r, 400, 1); break;
+          case 0x6c: w(r, 491, 1); break;
+          case 0x6d: w(r, 912, 1); break;
+          case 0x6e: w(r, 358, 1); break;
+          case 0x6f: w(r, 517, 1); break;
+          case 0x70: w(r, 921, 1); break;
+          case 0x71: w(r, 924, 1); break;
+          case 0x72: w(r, 404, 1); break;
+          case 0x73: w(r, 399, 1); break;
+          case 0x74: w(r, 163, 1); break;
+          case 0x75: w(r, 936, 1); break;
+          case 0x76: w(r, 939, 1); break;
+          case 0x77: w(r, 515, 1); break;
+          case 0x78: w(r, 401, 1); break;
+          case 0x79: w(r, 1122, 1); break;
+          case 0x7a: w(r, 1125, 1); break;
+          case 0x7b: w(r, 381, 1); break;
+          case 0x7c: w(r, 1131, 1); break;
+          case 0x7d: w(r, 1134, 1); break;
+          case 0x7e: w(r, 1137, 1); break;
+          case 0x7f: w(r, 407, 1); break;
+          case 0x80: w(r, 1143, 1); break;
+          case 0x81: w(r, 162, 1); break;
+          case 0x82: w(r, 1149, 1); break;
+          case 0x83: w(r, 869, 1); break;
+          case 0x84: w(r, 1155, 1); break;
+          case 0x85: w(r, 1158, 1); break;
+          case 0x86: w(r, 40, 1); break;
+          case 0x87: w(r, 383, 1); break;
+          case 0x88: w(r, 331, 1); break;
+          case 0x89: w(r, 41, 1); break;
+          case 0x8a: w(r, 518, 1); break;
+          case 0x8b: w(r, 593, 1); break;
+          case 0x8c: w(r, 361, 1); break;
+          case 0x8d: w(r, 380, 1); break;
+          case 0x8e: w(r, 167, 1); break;
+          case 0x8f: w(r, 1047, 1); break;
+          case 0x90: w(r, 330, 1); break;
+          case 0x91: w(r, 333, 1); break;
+          case 0x92: w(r, 334, 1); break;
+          case 0x93: w(r, 1059, 1); break;
+          case 0x94: w(r, 480, 1); break;
+          case 0x95: w(r, 366, 1); break;
+          case 0x96: w(r, 1071, 1); break;
+          case 0x97: w(r, 39, 1); break;
+          case 0x98: w(r, 43, 1); break;
+          case 0x99: w(r, 1089, 1); break;
+          case 0x9a: w(r, 967, 1); break;
+          case 0x9b: w(r, 166, 1); break;
+          case 0x9c: w(r, 1098, 1); break;
+          case 0x9d: w(r, 872, 1); break;
+          case 0x9e: w(r, 1104, 1); break;
+          case 0x9f: w(r, 400, 1); break;
+          case 0xa0: w(r, 491, 1); break;
+          case 0xa1: w(r, 912, 1); break;
+          case 0xa2: w(r, 358, 1); break;
+          case 0xa3: w(r, 517, 1); break;
+          case 0xa4: w(r, 921, 1); break;
+          case 0xa5: w(r, 924, 1); break;
+          case 0xa6: w(r, 404, 1); break;
+          case 0xa7: w(r, 399, 1); break;
+          case 0xa8: w(r, 163, 1); break;
+          case 0xa9: w(r, 936, 1); break;
+          case 0xaa: w(r, 939, 1); break;
+          case 0xab: w(r, 515, 1); break;
+          case 0xac: w(r, 401, 1); break;
+          case 0xad: w(r, 1122, 1); break;
+          case 0xae: w(r, 1125, 1); break;
+          case 0xaf: w(r, 381, 1); break;
+          case 0xb0: w(r, 1131, 1); break;
+          case 0xb1: w(r, 1134, 1); break;
+          case 0xb2: w(r, 1137, 1); break;
+          case 0xb3: w(r, 407, 1); break;
+          case 0xb4: w(r, 1143, 1); break;
+          case 0xb5: w(r, 162, 1); break;
+          case 0xb6: w(r, 1149, 1); break;
+          case 0xb7: w(r, 869, 1); break;
+          case 0xb8: w(r, 1155, 1); break;
+          case 0xb9: w(r, 1158, 1); break;
+          case 0xba: w(r, 40, 1); break;
+          case 0xbb: w(r, 383, 1); break;
+          case 0xbc: w(r, 331, 1); break;
+          case 0xbd: w(r, 41, 1); break;
+          case 0xbe: w(r, 518, 1); break;
+          case 0xbf: w(r, 593, 1); break;
+          case 0xc0: w(r, 361, 1); break;
+          case 0xc1: w(r, 380, 1); break;
+          case 0xc2: w(r, 167, 1); break;
+          case 0xc3: w(r, 1047, 1); break;
+          case 0xc4: w(r, 330, 1); break;
+          case 0xc5: w(r, 333, 1); break;
+          case 0xc6: w(r, 334, 1); break;
+          case 0xc7: w(r, 1059, 1); break;
+          case 0xc8: w(r, 480, 1); break;
+          case 0xc9: w(r, 366, 1); break;
+          case 0xca: w(r, 1071, 1); break;
+          case 0xcb: w(r, 39, 1); break;
+          case 0xcc: w(r, 43, 1); break;
+          case 0xcd: w(r, 1089, 1); break;
+          case 0xce: w(r, 967, 1); break;
+          case 0xcf: w(r, 166, 1); break;
+          case 0xd0: w(r, 1098, 1); break;
+          case 0xd1: w(r, 872, 1); break;
+          case 0xd2: w(r, 1104, 1); break;
+          case 0xd3: w(r, 400, 1); break;
+          case 0xd4: w(r, 491, 1); break;
+          case 0xd5: w(r, 912, 1); break;
+          case 0xd6: w(r, 358, 1); break;
+          case 0xd7: w(r, 517, 1); break;
+          case 0xd8: w(r, 921, 1); break;
+          case 0xd9: w(r, 924, 1); break;
+          case 0xda: w(r, 404, 1); break;
+          case 0xdb: w(r, 399, 1); break;
+          case 0xdc: w(r, 163, 1); break;
+          case 0xdd: w(r, 936, 1); break;
+          case 0xde: w(r, 939, 1); break;
+          case 0xdf: w(r, 515, 1); break;
+          case 0xe0: w(r, 401, 1); break;
+          case 0xe1: w(r, 1122, 1); break;
+          case 0xe2: w(r, 1125, 1); break;
+          case 0xe3: w(r, 381, 1); break;
+          case 0xe4: w(r, 1131, 1); break;
+          case 0xe5: w(r, 1134, 1); break;
+          case 0xe6: w(r, 1137, 1); break;
+          case 0xe7: w(r, 407, 1); break;
+          case 0xe8: w(r, 1143, 1); break;
+          case 0xe9: w(r, 162, 1); break;
+          case 0xea: w(r, 1149, 1); break;
+          case 0xeb: w(r, 869, 1); break;
+          case 0xec: w(r, 1155, 1); break;
+          case 0xed: w(r, 1158, 1); break;
+          case 0xee: w(r, 40, 1); break;
+          case 0xef: w(r, 383, 1); break;
+          case 0xf0: w(r, 331, 1); break;
+          case 0xf1: w(r, 41, 1); break;
+          case 0xf2: w(r, 518, 1); break;
+          case 0xf3: w(r, 593, 1); break;
+          case 0xf4: w(r, 361, 1); break;
+          case 0xf5: w(r, 380, 1); break;
+          case 0xf6: w(r, 167, 1); break;
+          case 0xf7: w(r, 1047, 1); break;
+          case 0xf8: w(r, 330, 1); break;
+          case 0xf9: w(r, 333, 1); break;
+          case 0xfa: w(r, 334, 1); break;
+          case 0xfb: w(r, 1059, 1); break;
+          case 0xfc: w(r, 480, 1); break;
+          case 0xfd: w(r, 366, 1); break;
+          case 0xfe: w(r, 1071, 1); break;
+          case 0xff: w(r, 39, 1); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0xd600:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x0: w(r, 43, 1); break;
+          case 0x1: w(r, 1089, 1); break;
+          case 0x2: w(r, 967, 1); break;
+          case 0x3: w(r, 166, 1); break;
+          case 0x4: w(r, 1098, 1); break;
+          case 0x5: w(r, 872, 1); break;
+          case 0x6: w(r, 1104, 1); break;
+          case 0x7: w(r, 400, 1); break;
+          case 0x8: w(r, 491, 1); break;
+          case 0x9: w(r, 912, 1); break;
+          case 0xa: w(r, 358, 1); break;
+          case 0xb: w(r, 517, 1); break;
+          case 0xc: w(r, 921, 1); break;
+          case 0xd: w(r, 924, 1); break;
+          case 0xe: w(r, 404, 1); break;
+          case 0xf: w(r, 399, 1); break;
+          case 0x10: w(r, 163, 1); break;
+          case 0x11: w(r, 936, 1); break;
+          case 0x12: w(r, 939, 1); break;
+          case 0x13: w(r, 515, 1); break;
+          case 0x14: w(r, 401, 1); break;
+          case 0x15: w(r, 1122, 1); break;
+          case 0x16: w(r, 1125, 1); break;
+          case 0x17: w(r, 381, 1); break;
+          case 0x18: w(r, 1131, 1); break;
+          case 0x19: w(r, 1134, 1); break;
+          case 0x1a: w(r, 1137, 1); break;
+          case 0x1b: w(r, 407, 1); break;
+          case 0x1c: w(r, 1143, 1); break;
+          case 0x1d: w(r, 162, 1); break;
+          case 0x1e: w(r, 1149, 1); break;
+          case 0x1f: w(r, 869, 1); break;
+          case 0x20: w(r, 1155, 1); break;
+          case 0x21: w(r, 1158, 1); break;
+          case 0x22: w(r, 40, 1); break;
+          case 0x23: w(r, 383, 1); break;
+          case 0x24: w(r, 331, 1); break;
+          case 0x25: w(r, 41, 1); break;
+          case 0x26: w(r, 518, 1); break;
+          case 0x27: w(r, 593, 1); break;
+          case 0x28: w(r, 361, 1); break;
+          case 0x29: w(r, 380, 1); break;
+          case 0x2a: w(r, 167, 1); break;
+          case 0x2b: w(r, 1047, 1); break;
+          case 0x2c: w(r, 330, 1); break;
+          case 0x2d: w(r, 333, 1); break;
+          case 0x2e: w(r, 334, 1); break;
+          case 0x2f: w(r, 1059, 1); break;
+          case 0x30: w(r, 480, 1); break;
+          case 0x31: w(r, 366, 1); break;
+          case 0x32: w(r, 1071, 1); break;
+          case 0x33: w(r, 39, 1); break;
+          case 0x34: w(r, 43, 1); break;
+          case 0x35: w(r, 1089, 1); break;
+          case 0x36: w(r, 967, 1); break;
+          case 0x37: w(r, 166, 1); break;
+          case 0x38: w(r, 1098, 1); break;
+          case 0x39: w(r, 872, 1); break;
+          case 0x3a: w(r, 1104, 1); break;
+          case 0x3b: w(r, 400, 1); break;
+          case 0x3c: w(r, 491, 1); break;
+          case 0x3d: w(r, 912, 1); break;
+          case 0x3e: w(r, 358, 1); break;
+          case 0x3f: w(r, 517, 1); break;
+          case 0x40: w(r, 921, 1); break;
+          case 0x41: w(r, 924, 1); break;
+          case 0x42: w(r, 404, 1); break;
+          case 0x43: w(r, 399, 1); break;
+          case 0x44: w(r, 163, 1); break;
+          case 0x45: w(r, 936, 1); break;
+          case 0x46: w(r, 939, 1); break;
+          case 0x47: w(r, 515, 1); break;
+          case 0x48: w(r, 401, 1); break;
+          case 0x49: w(r, 1122, 1); break;
+          case 0x4a: w(r, 1125, 1); break;
+          case 0x4b: w(r, 381, 1); break;
+          case 0x4c: w(r, 1131, 1); break;
+          case 0x4d: w(r, 1134, 1); break;
+          case 0x4e: w(r, 1137, 1); break;
+          case 0x4f: w(r, 407, 1); break;
+          case 0x50: w(r, 1143, 1); break;
+          case 0x51: w(r, 162, 1); break;
+          case 0x52: w(r, 1149, 1); break;
+          case 0x53: w(r, 869, 1); break;
+          case 0x54: w(r, 1155, 1); break;
+          case 0x55: w(r, 1158, 1); break;
+          case 0x56: w(r, 40, 1); break;
+          case 0x57: w(r, 383, 1); break;
+          case 0x58: w(r, 331, 1); break;
+          case 0x59: w(r, 41, 1); break;
+          case 0x5a: w(r, 518, 1); break;
+          case 0x5b: w(r, 593, 1); break;
+          case 0x5c: w(r, 361, 1); break;
+          case 0x5d: w(r, 380, 1); break;
+          case 0x5e: w(r, 167, 1); break;
+          case 0x5f: w(r, 1047, 1); break;
+          case 0x60: w(r, 330, 1); break;
+          case 0x61: w(r, 333, 1); break;
+          case 0x62: w(r, 334, 1); break;
+          case 0x63: w(r, 1059, 1); break;
+          case 0x64: w(r, 480, 1); break;
+          case 0x65: w(r, 366, 1); break;
+          case 0x66: w(r, 1071, 1); break;
+          case 0x67: w(r, 39, 1); break;
+          case 0x68: w(r, 43, 1); break;
+          case 0x69: w(r, 1089, 1); break;
+          case 0x6a: w(r, 967, 1); break;
+          case 0x6b: w(r, 166, 1); break;
+          case 0x6c: w(r, 1098, 1); break;
+          case 0x6d: w(r, 872, 1); break;
+          case 0x6e: w(r, 1104, 1); break;
+          case 0x6f: w(r, 400, 1); break;
+          case 0x70: w(r, 491, 1); break;
+          case 0x71: w(r, 912, 1); break;
+          case 0x72: w(r, 358, 1); break;
+          case 0x73: w(r, 517, 1); break;
+          case 0x74: w(r, 921, 1); break;
+          case 0x75: w(r, 924, 1); break;
+          case 0x76: w(r, 404, 1); break;
+          case 0x77: w(r, 399, 1); break;
+          case 0x78: w(r, 163, 1); break;
+          case 0x79: w(r, 936, 1); break;
+          case 0x7a: w(r, 939, 1); break;
+          case 0x7b: w(r, 515, 1); break;
+          case 0x7c: w(r, 401, 1); break;
+          case 0x7d: w(r, 1122, 1); break;
+          case 0x7e: w(r, 1125, 1); break;
+          case 0x7f: w(r, 381, 1); break;
+          case 0x80: w(r, 1131, 1); break;
+          case 0x81: w(r, 1134, 1); break;
+          case 0x82: w(r, 1137, 1); break;
+          case 0x83: w(r, 407, 1); break;
+          case 0x84: w(r, 1143, 1); break;
+          case 0x85: w(r, 162, 1); break;
+          case 0x86: w(r, 1149, 1); break;
+          case 0x87: w(r, 869, 1); break;
+          case 0x88: w(r, 1155, 1); break;
+          case 0x89: w(r, 1158, 1); break;
+          case 0x8a: w(r, 40, 1); break;
+          case 0x8b: w(r, 383, 1); break;
+          case 0x8c: w(r, 331, 1); break;
+          case 0x8d: w(r, 41, 1); break;
+          case 0x8e: w(r, 518, 1); break;
+          case 0x8f: w(r, 593, 1); break;
+          case 0x90: w(r, 361, 1); break;
+          case 0x91: w(r, 380, 1); break;
+          case 0x92: w(r, 167, 1); break;
+          case 0x93: w(r, 1047, 1); break;
+          case 0x94: w(r, 330, 1); break;
+          case 0x95: w(r, 333, 1); break;
+          case 0x96: w(r, 334, 1); break;
+          case 0x97: w(r, 1059, 1); break;
+          case 0x98: w(r, 480, 1); break;
+          case 0x99: w(r, 366, 1); break;
+          case 0x9a: w(r, 1071, 1); break;
+          case 0x9b: w(r, 39, 1); break;
+          case 0x9c: w(r, 43, 1); break;
+          case 0x9d: w(r, 1089, 1); break;
+          case 0x9e: w(r, 967, 1); break;
+          case 0x9f: w(r, 166, 1); break;
+          case 0xa0: w(r, 1098, 1); break;
+          case 0xa1: w(r, 872, 1); break;
+          case 0xa2: w(r, 1104, 1); break;
+          case 0xa3: w(r, 400, 1); break;
+          case 0xa4: w(r, 1822, 1); break;
+          case 0xa5: w(r, 1821, 1); break;
+          case 0xa8: w(r, 1820, 1); break;
+          case 0xa9: w(r, 1819, 1); break;
+          case 0xaa: w(r, 1818, 1); break;
+          case 0xab: w(r, 1817, 1); break;
+          case 0xac: w(r, 1816, 1); break;
+          case 0xad: w(r, 1815, 1); break;
+          case 0xae: w(r, 1814, 1); break;
+          case 0xaf: w(r, 1813, 1); break;
+          case 0xb0: w(r, 1812, 1); break;
+          case 0xb1: w(r, 1811, 1); break;
+          case 0xb2: w(r, 1810, 1); break;
+          case 0xb3: w(r, 1809, 1); break;
+          case 0xb4: w(r, 1808, 1); break;
+          case 0xb5: w(r, 1807, 1); break;
+          case 0xb6: w(r, 1842, 1); break;
+          case 0xb7: w(r, 1841, 1); break;
+          case 0xb8: w(r, 1840, 1); break;
+          case 0xb9: w(r, 1813, 1); break;
+          case 0xba: w(r, 1839, 1); break;
+          case 0xbb: w(r, 1838, 1); break;
+          case 0xbc: w(r, 1837, 1); break;
+          case 0xbd: w(r, 1836, 1); break;
+          case 0xbe: w(r, 1835, 1); break;
+          case 0xbf: w(r, 1834, 1); break;
+          case 0xc0: w(r, 1333, 1); break;
+          case 0xc1: w(r, 1833, 1); break;
+          case 0xc2: w(r, 1832, 1); break;
+          case 0xc3: w(r, 1831, 1); break;
+          case 0xc4: w(r, 1845, 1); break;
+          case 0xc5: w(r, 1844, 1); break;
+          case 0xc6: w(r, 1828, 1); break;
+          case 0xc7: w(r, 1843, 1); break;
+          case 0xc8: w(r, 1857, 1); break;
+          case 0xc9: w(r, 1827, 1); break;
+          case 0xca: w(r, 1856, 1); break;
+          case 0xcb: w(r, 1826, 1); break;
+          case 0xcc: w(r, 1855, 1); break;
+          case 0xcd: w(r, 1244, 1); break;
+          case 0xce: w(r, 1854, 1); break;
+          case 0xcf: w(r, 1853, 1); break;
+          case 0xd0: w(r, 1852, 1); break;
+          case 0xd1: w(r, 1823, 1); break;
+          case 0xd2: w(r, 1824, 1); break;
+          case 0xd3: w(r, 1851, 1); break;
+          case 0xd4: w(r, 1850, 1); break;
+          case 0xd5: w(r, 1849, 1); break;
+          case 0xd6: w(r, 1848, 1); break;
+          case 0xd7: w(r, 1825, 1); break;
+          case 0xd8: w(r, 1847, 1); break;
+          case 0xd9: w(r, 1846, 1); break;
+          case 0xda: w(r, 1830, 1); break;
+          case 0xdb: w(r, 1829, 1); break;
+          case 0xdc: w(r, 1828, 1); break;
+          case 0xdd: w(r, 1827, 1); break;
+          case 0xde: w(r, 1826, 1); break;
+          case 0xdf: w(r, 1825, 1); break;
+          case 0xe0: w(r, 1824, 1); break;
+          case 0xe1: w(r, 1823, 1); break;
+          case 0xe2: w(r, 1820, 1); break;
+          case 0xe3: w(r, 1819, 1); break;
+          case 0xe4: w(r, 1818, 1); break;
+          case 0xe5: w(r, 1817, 1); break;
+          case 0xe6: w(r, 1816, 1); break;
+          case 0xe7: w(r, 1815, 1); break;
+          case 0xe8: w(r, 1814, 1); break;
+          case 0xe9: w(r, 1813, 1); break;
+          case 0xea: w(r, 1812, 1); break;
+          case 0xeb: w(r, 1811, 1); break;
+          case 0xec: w(r, 1810, 1); break;
+          case 0xed: w(r, 1809, 1); break;
+          case 0xee: w(r, 1808, 1); break;
+          case 0xef: w(r, 1807, 1); break;
+          case 0xf0: w(r, 1842, 1); break;
+          case 0xf1: w(r, 1841, 1); break;
+          case 0xf2: w(r, 1840, 1); break;
+          case 0xf3: w(r, 1813, 1); break;
+          case 0xf4: w(r, 1839, 1); break;
+          case 0xf5: w(r, 1838, 1); break;
+          case 0xf6: w(r, 1837, 1); break;
+          case 0xf7: w(r, 1836, 1); break;
+          case 0xf8: w(r, 1835, 1); break;
+          case 0xf9: w(r, 1834, 1); break;
+          case 0xfa: w(r, 1333, 1); break;
+          case 0xfb: w(r, 1833, 1); break;
+          case 0xfc: w(r, 1832, 1); break;
+          case 0xfd: w(r, 1831, 1); break;
+          case 0xfe: w(r, 1845, 1); break;
+          case 0xff: w(r, 1844, 1); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0xd700:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x0: w(r, 1828, 1); break;
+          case 0x1: w(r, 1843, 1); break;
+          case 0x2: w(r, 1857, 1); break;
+          case 0x3: w(r, 1827, 1); break;
+          case 0x4: w(r, 1856, 1); break;
+          case 0x5: w(r, 1826, 1); break;
+          case 0x6: w(r, 1855, 1); break;
+          case 0x7: w(r, 1244, 1); break;
+          case 0x8: w(r, 1854, 1); break;
+          case 0x9: w(r, 1853, 1); break;
+          case 0xa: w(r, 1852, 1); break;
+          case 0xb: w(r, 1823, 1); break;
+          case 0xc: w(r, 1824, 1); break;
+          case 0xd: w(r, 1851, 1); break;
+          case 0xe: w(r, 1850, 1); break;
+          case 0xf: w(r, 1849, 1); break;
+          case 0x10: w(r, 1848, 1); break;
+          case 0x11: w(r, 1825, 1); break;
+          case 0x12: w(r, 1847, 1); break;
+          case 0x13: w(r, 1846, 1); break;
+          case 0x14: w(r, 1830, 1); break;
+          case 0x15: w(r, 1829, 1); break;
+          case 0x16: w(r, 1828, 1); break;
+          case 0x17: w(r, 1827, 1); break;
+          case 0x18: w(r, 1826, 1); break;
+          case 0x19: w(r, 1825, 1); break;
+          case 0x1a: w(r, 1824, 1); break;
+          case 0x1b: w(r, 1823, 1); break;
+          case 0x1c: w(r, 1820, 1); break;
+          case 0x1d: w(r, 1819, 1); break;
+          case 0x1e: w(r, 1818, 1); break;
+          case 0x1f: w(r, 1817, 1); break;
+          case 0x20: w(r, 1816, 1); break;
+          case 0x21: w(r, 1815, 1); break;
+          case 0x22: w(r, 1814, 1); break;
+          case 0x23: w(r, 1813, 1); break;
+          case 0x24: w(r, 1812, 1); break;
+          case 0x25: w(r, 1811, 1); break;
+          case 0x26: w(r, 1810, 1); break;
+          case 0x27: w(r, 1809, 1); break;
+          case 0x28: w(r, 1808, 1); break;
+          case 0x29: w(r, 1807, 1); break;
+          case 0x2a: w(r, 1842, 1); break;
+          case 0x2b: w(r, 1841, 1); break;
+          case 0x2c: w(r, 1840, 1); break;
+          case 0x2d: w(r, 1813, 1); break;
+          case 0x2e: w(r, 1839, 1); break;
+          case 0x2f: w(r, 1838, 1); break;
+          case 0x30: w(r, 1837, 1); break;
+          case 0x31: w(r, 1836, 1); break;
+          case 0x32: w(r, 1835, 1); break;
+          case 0x33: w(r, 1834, 1); break;
+          case 0x34: w(r, 1333, 1); break;
+          case 0x35: w(r, 1833, 1); break;
+          case 0x36: w(r, 1832, 1); break;
+          case 0x37: w(r, 1831, 1); break;
+          case 0x38: w(r, 1845, 1); break;
+          case 0x39: w(r, 1844, 1); break;
+          case 0x3a: w(r, 1828, 1); break;
+          case 0x3b: w(r, 1843, 1); break;
+          case 0x3c: w(r, 1857, 1); break;
+          case 0x3d: w(r, 1827, 1); break;
+          case 0x3e: w(r, 1856, 1); break;
+          case 0x3f: w(r, 1826, 1); break;
+          case 0x40: w(r, 1855, 1); break;
+          case 0x41: w(r, 1244, 1); break;
+          case 0x42: w(r, 1854, 1); break;
+          case 0x43: w(r, 1853, 1); break;
+          case 0x44: w(r, 1852, 1); break;
+          case 0x45: w(r, 1823, 1); break;
+          case 0x46: w(r, 1824, 1); break;
+          case 0x47: w(r, 1851, 1); break;
+          case 0x48: w(r, 1850, 1); break;
+          case 0x49: w(r, 1849, 1); break;
+          case 0x4a: w(r, 1848, 1); break;
+          case 0x4b: w(r, 1825, 1); break;
+          case 0x4c: w(r, 1847, 1); break;
+          case 0x4d: w(r, 1846, 1); break;
+          case 0x4e: w(r, 1830, 1); break;
+          case 0x4f: w(r, 1829, 1); break;
+          case 0x50: w(r, 1828, 1); break;
+          case 0x51: w(r, 1827, 1); break;
+          case 0x52: w(r, 1826, 1); break;
+          case 0x53: w(r, 1825, 1); break;
+          case 0x54: w(r, 1824, 1); break;
+          case 0x55: w(r, 1823, 1); break;
+          case 0x56: w(r, 1820, 1); break;
+          case 0x57: w(r, 1819, 1); break;
+          case 0x58: w(r, 1818, 1); break;
+          case 0x59: w(r, 1817, 1); break;
+          case 0x5a: w(r, 1816, 1); break;
+          case 0x5b: w(r, 1815, 1); break;
+          case 0x5c: w(r, 1814, 1); break;
+          case 0x5d: w(r, 1813, 1); break;
+          case 0x5e: w(r, 1812, 1); break;
+          case 0x5f: w(r, 1811, 1); break;
+          case 0x60: w(r, 1810, 1); break;
+          case 0x61: w(r, 1809, 1); break;
+          case 0x62: w(r, 1808, 1); break;
+          case 0x63: w(r, 1807, 1); break;
+          case 0x64: w(r, 1842, 1); break;
+          case 0x65: w(r, 1841, 1); break;
+          case 0x66: w(r, 1840, 1); break;
+          case 0x67: w(r, 1813, 1); break;
+          case 0x68: w(r, 1839, 1); break;
+          case 0x69: w(r, 1838, 1); break;
+          case 0x6a: w(r, 1837, 1); break;
+          case 0x6b: w(r, 1836, 1); break;
+          case 0x6c: w(r, 1835, 1); break;
+          case 0x6d: w(r, 1834, 1); break;
+          case 0x6e: w(r, 1333, 1); break;
+          case 0x6f: w(r, 1833, 1); break;
+          case 0x70: w(r, 1832, 1); break;
+          case 0x71: w(r, 1831, 1); break;
+          case 0x72: w(r, 1845, 1); break;
+          case 0x73: w(r, 1844, 1); break;
+          case 0x74: w(r, 1828, 1); break;
+          case 0x75: w(r, 1843, 1); break;
+          case 0x76: w(r, 1857, 1); break;
+          case 0x77: w(r, 1827, 1); break;
+          case 0x78: w(r, 1856, 1); break;
+          case 0x79: w(r, 1826, 1); break;
+          case 0x7a: w(r, 1855, 1); break;
+          case 0x7b: w(r, 1244, 1); break;
+          case 0x7c: w(r, 1854, 1); break;
+          case 0x7d: w(r, 1853, 1); break;
+          case 0x7e: w(r, 1852, 1); break;
+          case 0x7f: w(r, 1823, 1); break;
+          case 0x80: w(r, 1824, 1); break;
+          case 0x81: w(r, 1851, 1); break;
+          case 0x82: w(r, 1850, 1); break;
+          case 0x83: w(r, 1849, 1); break;
+          case 0x84: w(r, 1848, 1); break;
+          case 0x85: w(r, 1825, 1); break;
+          case 0x86: w(r, 1847, 1); break;
+          case 0x87: w(r, 1846, 1); break;
+          case 0x88: w(r, 1830, 1); break;
+          case 0x89: w(r, 1829, 1); break;
+          case 0x8a: w(r, 1828, 1); break;
+          case 0x8b: w(r, 1827, 1); break;
+          case 0x8c: w(r, 1826, 1); break;
+          case 0x8d: w(r, 1825, 1); break;
+          case 0x8e: w(r, 1824, 1); break;
+          case 0x8f: w(r, 1823, 1); break;
+          case 0x90: w(r, 1820, 1); break;
+          case 0x91: w(r, 1819, 1); break;
+          case 0x92: w(r, 1818, 1); break;
+          case 0x93: w(r, 1817, 1); break;
+          case 0x94: w(r, 1816, 1); break;
+          case 0x95: w(r, 1815, 1); break;
+          case 0x96: w(r, 1814, 1); break;
+          case 0x97: w(r, 1813, 1); break;
+          case 0x98: w(r, 1812, 1); break;
+          case 0x99: w(r, 1811, 1); break;
+          case 0x9a: w(r, 1810, 1); break;
+          case 0x9b: w(r, 1809, 1); break;
+          case 0x9c: w(r, 1808, 1); break;
+          case 0x9d: w(r, 1807, 1); break;
+          case 0x9e: w(r, 1842, 1); break;
+          case 0x9f: w(r, 1841, 1); break;
+          case 0xa0: w(r, 1840, 1); break;
+          case 0xa1: w(r, 1813, 1); break;
+          case 0xa2: w(r, 1839, 1); break;
+          case 0xa3: w(r, 1838, 1); break;
+          case 0xa4: w(r, 1837, 1); break;
+          case 0xa5: w(r, 1836, 1); break;
+          case 0xa6: w(r, 1835, 1); break;
+          case 0xa7: w(r, 1834, 1); break;
+          case 0xa8: w(r, 1333, 1); break;
+          case 0xa9: w(r, 1833, 1); break;
+          case 0xaa: w(r, 1832, 1); break;
+          case 0xab: w(r, 1831, 1); break;
+          case 0xac: w(r, 1845, 1); break;
+          case 0xad: w(r, 1844, 1); break;
+          case 0xae: w(r, 1828, 1); break;
+          case 0xaf: w(r, 1843, 1); break;
+          case 0xb0: w(r, 1857, 1); break;
+          case 0xb1: w(r, 1827, 1); break;
+          case 0xb2: w(r, 1856, 1); break;
+          case 0xb3: w(r, 1826, 1); break;
+          case 0xb4: w(r, 1855, 1); break;
+          case 0xb5: w(r, 1244, 1); break;
+          case 0xb6: w(r, 1854, 1); break;
+          case 0xb7: w(r, 1853, 1); break;
+          case 0xb8: w(r, 1852, 1); break;
+          case 0xb9: w(r, 1823, 1); break;
+          case 0xba: w(r, 1824, 1); break;
+          case 0xbb: w(r, 1851, 1); break;
+          case 0xbc: w(r, 1850, 1); break;
+          case 0xbd: w(r, 1849, 1); break;
+          case 0xbe: w(r, 1848, 1); break;
+          case 0xbf: w(r, 1825, 1); break;
+          case 0xc0: w(r, 1847, 1); break;
+          case 0xc1: w(r, 1846, 1); break;
+          case 0xc2: w(r, 1830, 1); break;
+          case 0xc3: w(r, 1829, 1); break;
+          case 0xc4: w(r, 1828, 1); break;
+          case 0xc5: w(r, 1827, 1); break;
+          case 0xc6: w(r, 1826, 1); break;
+          case 0xc7: w(r, 1825, 1); break;
+          case 0xc8: w(r, 1824, 1); break;
+          case 0xc9: w(r, 1823, 1); break;
+          case 0xca: w(r, 1859, 1); break;
+          case 0xcb: w(r, 1858, 1); break;
+          case 0xce: w(r, 161, 1); break;
+          case 0xcf: w(r, 158, 1); break;
+          case 0xd0: w(r, 44, 1); break;
+          case 0xd1: w(r, 184, 1); break;
+          case 0xd2: w(r, 188, 1); break;
+          case 0xd3: w(r, 192, 1); break;
+          case 0xd4: w(r, 196, 1); break;
+          case 0xd5: w(r, 200, 1); break;
+          case 0xd6: w(r, 204, 1); break;
+          case 0xd7: w(r, 208, 1); break;
+          case 0xd8: w(r, 161, 1); break;
+          case 0xd9: w(r, 158, 1); break;
+          case 0xda: w(r, 44, 1); break;
+          case 0xdb: w(r, 184, 1); break;
+          case 0xdc: w(r, 188, 1); break;
+          case 0xdd: w(r, 192, 1); break;
+          case 0xde: w(r, 196, 1); break;
+          case 0xdf: w(r, 200, 1); break;
+          case 0xe0: w(r, 204, 1); break;
+          case 0xe1: w(r, 208, 1); break;
+          case 0xe2: w(r, 161, 1); break;
+          case 0xe3: w(r, 158, 1); break;
+          case 0xe4: w(r, 44, 1); break;
+          case 0xe5: w(r, 184, 1); break;
+          case 0xe6: w(r, 188, 1); break;
+          case 0xe7: w(r, 192, 1); break;
+          case 0xe8: w(r, 196, 1); break;
+          case 0xe9: w(r, 200, 1); break;
+          case 0xea: w(r, 204, 1); break;
+          case 0xeb: w(r, 208, 1); break;
+          case 0xec: w(r, 161, 1); break;
+          case 0xed: w(r, 158, 1); break;
+          case 0xee: w(r, 44, 1); break;
+          case 0xef: w(r, 184, 1); break;
+          case 0xf0: w(r, 188, 1); break;
+          case 0xf1: w(r, 192, 1); break;
+          case 0xf2: w(r, 196, 1); break;
+          case 0xf3: w(r, 200, 1); break;
+          case 0xf4: w(r, 204, 1); break;
+          case 0xf5: w(r, 208, 1); break;
+          case 0xf6: w(r, 161, 1); break;
+          case 0xf7: w(r, 158, 1); break;
+          case 0xf8: w(r, 44, 1); break;
+          case 0xf9: w(r, 184, 1); break;
+          case 0xfa: w(r, 188, 1); break;
+          case 0xfb: w(r, 192, 1); break;
+          case 0xfc: w(r, 196, 1); break;
+          case 0xfd: w(r, 200, 1); break;
+          case 0xfe: w(r, 204, 1); break;
+          case 0xff: w(r, 208, 1); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0xf100:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x0: w(r, 1164, 2); break;
+          case 0x1: w(r, 1612, 2); break;
+          case 0x2: w(r, 1614, 2); break;
+          case 0x3: w(r, 1616, 2); break;
+          case 0x4: w(r, 1618, 2); break;
+          case 0x5: w(r, 1620, 2); break;
+          case 0x6: w(r, 1622, 2); break;
+          case 0x7: w(r, 1624, 2); break;
+          case 0x8: w(r, 1626, 2); break;
+          case 0x9: w(r, 1628, 2); break;
+          case 0xa: w(r, 1602, 2); break;
+          case 0x10: w(r, 908, 3); break;
+          case 0x11: w(r, 911, 3); break;
+          case 0x12: w(r, 914, 3); break;
+          case 0x13: w(r, 917, 3); break;
+          case 0x14: w(r, 920, 3); break;
+          case 0x15: w(r, 923, 3); break;
+          case 0x16: w(r, 926, 3); break;
+          case 0x17: w(r, 929, 3); break;
+          case 0x18: w(r, 932, 3); break;
+          case 0x19: w(r, 935, 3); break;
+          case 0x1a: w(r, 938, 3); break;
+          case 0x1b: w(r, 1115, 3); break;
+          case 0x1c: w(r, 1118, 3); break;
+          case 0x1d: w(r, 1121, 3); break;
+          case 0x1e: w(r, 1124, 3); break;
+          case 0x1f: w(r, 1127, 3); break;
+          case 0x20: w(r, 1130, 3); break;
+          case 0x21: w(r, 1133, 3); break;
+          case 0x22: w(r, 1136, 3); break;
+          case 0x23: w(r, 1139, 3); break;
+          case 0x24: w(r, 1142, 3); break;
+          case 0x25: w(r, 1145, 3); break;
+          case 0x26: w(r, 1148, 3); break;
+          case 0x27: w(r, 1151, 3); break;
+          case 0x28: w(r, 1154, 3); break;
+          case 0x29: w(r, 1157, 3); break;
+          case 0x2a: w(r, 1160, 3); break;
+          case 0x2b: w(r, 358, 1); break;
+          case 0x2c: w(r, 1134, 1); break;
+          case 0x2d: w(r, 1600, 2); break;
+          case 0x2e: w(r, 1598, 2); break;
+          case 0x30: w(r, 491, 1); break;
+          case 0x31: w(r, 912, 1); break;
+          case 0x32: w(r, 358, 1); break;
+          case 0x33: w(r, 517, 1); break;
+          case 0x34: w(r, 921, 1); break;
+          case 0x35: w(r, 924, 1); break;
+          case 0x36: w(r, 404, 1); break;
+          case 0x37: w(r, 399, 1); break;
+          case 0x38: w(r, 163, 1); break;
+          case 0x39: w(r, 936, 1); break;
+          case 0x3a: w(r, 939, 1); break;
+          case 0x3b: w(r, 515, 1); break;
+          case 0x3c: w(r, 401, 1); break;
+          case 0x3d: w(r, 1122, 1); break;
+          case 0x3e: w(r, 1125, 1); break;
+          case 0x3f: w(r, 381, 1); break;
+          case 0x40: w(r, 1131, 1); break;
+          case 0x41: w(r, 1134, 1); break;
+          case 0x42: w(r, 1137, 1); break;
+          case 0x43: w(r, 407, 1); break;
+          case 0x44: w(r, 1143, 1); break;
+          case 0x45: w(r, 162, 1); break;
+          case 0x46: w(r, 1149, 1); break;
+          case 0x47: w(r, 869, 1); break;
+          case 0x48: w(r, 1155, 1); break;
+          case 0x49: w(r, 1158, 1); break;
+          case 0x4a: w(r, 1654, 2); break;
+          case 0x4b: w(r, 1398, 2); break;
+          case 0x4c: w(r, 1630, 2); break;
+          case 0x4d: w(r, 1632, 2); break;
+          case 0x4e: w(r, 1061, 3); break;
+          case 0x4f: w(r, 1634, 2); break;
+          case 0x90: w(r, 1636, 2); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        case 0xf200:
+        {
+          switch (static_cast<uint8_t>(c & 0xff))
+          {
+          case 0x0: w(r, 1638, 2); break;
+          case 0x1: w(r, 1640, 2); break;
+          case 0x2: w(r, 71, 1); break;
+          case 0x13: w(r, 1456, 1); break;
+          case 0x29: w(r, 1209, 1); break;
+          case 0x40: w(r, 1642, 2); break;
+          case 0x41: w(r, 1642, 2); break;
+          case 0x42: w(r, 1642, 2); break;
+          case 0x43: w(r, 1642, 2); break;
+          case 0x44: w(r, 1642, 2); break;
+          case 0x45: w(r, 1642, 2); break;
+          case 0x46: w(r, 1642, 2); break;
+          case 0x47: w(r, 1642, 2); break;
+          case 0x48: w(r, 1642, 2); break;
+          default: r.push_back(c);
+          }
+        }
+        break;
+        default: r.push_back(c);
+        }
+      }
+        // default: r.push_back(c);
       }
     }
   }
diff --git a/libs/base/random.hpp b/libs/base/random.hpp
index 4ba9d0284..799745102 100644
--- a/libs/base/random.hpp
+++ b/libs/base/random.hpp
@@ -5,7 +5,8 @@
 
 namespace base
 {
-template <class T> class UniformRandom
+template <class T>
+class UniformRandom
 {
   static_assert(std::is_integral<T>::value);
 
@@ -19,4 +20,4 @@ public:
 
   T operator()() { return m_distr(m_gen); }
 };
-} // namespace base
+}  // namespace base
diff --git a/libs/base/range_iterator.hpp b/libs/base/range_iterator.hpp
index 3a1290ac2..de314983d 100644
--- a/libs/base/range_iterator.hpp
+++ b/libs/base/range_iterator.hpp
@@ -16,9 +16,17 @@ template <typename TCounter>
 struct RangeIterator
 {
   explicit RangeIterator(TCounter const current) : m_current(current) {}
-  RangeIterator & operator++() { ++m_current; return *this; }
+  RangeIterator & operator++()
+  {
+    ++m_current;
+    return *this;
+  }
   RangeIterator operator++(int) { return RangeIterator(m_current++); }
-  RangeIterator & operator--() { --m_current; return *this; }
+  RangeIterator & operator--()
+  {
+    --m_current;
+    return *this;
+  }
   RangeIterator operator--(int) { return RangeIterator(m_current--); }
   bool operator==(RangeIterator const & it) const { return m_current == it.m_current; }
   bool operator!=(RangeIterator const & it) const { return !(*this == it); }
@@ -40,7 +48,7 @@ struct iterator_traits<base::RangeIterator<T>>
   using reference = T;
   using iterator_category = std::bidirectional_iterator_tag;
 };
-} // namespace std
+}  // namespace std
 
 namespace base
 {
@@ -51,11 +59,7 @@ struct RangeWrapper
   using iterator_base = RangeIterator<value_type>;
   using iterator = std::conditional_t<forward, iterator_base, std::reverse_iterator<iterator_base>>;
 
-  RangeWrapper(TCounter const from, TCounter const to):
-      m_begin(from),
-      m_end(to)
-  {
-  }
+  RangeWrapper(TCounter const from, TCounter const to) : m_begin(from), m_end(to) {}
 
   iterator begin() const { return iterator(iterator_base(m_begin)); }
   iterator end() const { return iterator(iterator_base(m_end)); }
diff --git a/libs/base/rolling_hash.hpp b/libs/base/rolling_hash.hpp
index 263789871..75132deca 100644
--- a/libs/base/rolling_hash.hpp
+++ b/libs/base/rolling_hash.hpp
@@ -7,16 +7,14 @@
 #include <queue>
 #endif
 
-template <typename T, typename HashT> class RabinKarpRollingHasher
+template <typename T, typename HashT>
+class RabinKarpRollingHasher
 {
 public:
   using value_type = T;
   using hash_type = HashT;
 
-  explicit RabinKarpRollingHasher(HashT multiplier)
-    : m_multiplier(multiplier)
-  {
-  }
+  explicit RabinKarpRollingHasher(HashT multiplier) : m_multiplier(multiplier) {}
 
   template <typename Iter>
   hash_type Init(Iter it, uint64_t windowSize)
@@ -25,7 +23,8 @@ public:
     m_windowSize = windowSize;
     m_removeMultiplier = math::PowUint(m_multiplier, m_windowSize - 1);
 #ifdef DEBUG
-    while (!m_queue.empty()) m_queue.pop();
+    while (!m_queue.empty())
+      m_queue.pop();
 #endif
     m_hash = 0;
     for (uint64_t i = 0; i < m_windowSize; ++it, ++i)
@@ -66,15 +65,13 @@ private:
 class RabinKarpRollingHasher32 : public RabinKarpRollingHasher<uint32_t, uint32_t>
 {
 public:
-  RabinKarpRollingHasher32()
-    : RabinKarpRollingHasher(1103515245U) {}
+  RabinKarpRollingHasher32() : RabinKarpRollingHasher(1103515245U) {}
 };
 
 class RabinKarpRollingHasher64 : public RabinKarpRollingHasher<uint64_t, uint64_t>
 {
 public:
-  RabinKarpRollingHasher64()
-    : RabinKarpRollingHasher(6364136223846793005ULL) {}
+  RabinKarpRollingHasher64() : RabinKarpRollingHasher(6364136223846793005ULL) {}
 };
 
 using RollingHasher32 = RabinKarpRollingHasher32;
diff --git a/libs/base/scope_guard.hpp b/libs/base/scope_guard.hpp
index 2ec6526b1..10bd9c01b 100644
--- a/libs/base/scope_guard.hpp
+++ b/libs/base/scope_guard.hpp
@@ -8,44 +8,37 @@ namespace base
 {
 namespace impl
 {
-  /// Base class for all ScopeGuards.
-  class GuardBase
+/// Base class for all ScopeGuards.
+class GuardBase
+{
+public:
+  /// Disable ScopeGuard functionality on it's destruction
+  void release() const { m_bDoRollback = false; }
+
+protected:
+  GuardBase() : m_bDoRollback(true) {}
+
+  // Do something in the destructor
+  mutable bool m_bDoRollback;
+};
+
+/// ScopeGuard for specific functor
+template <typename TFunctor>
+class GuardImpl : public GuardBase
+{
+public:
+  explicit GuardImpl(TFunctor const & F) : m_Functor(F) {}
+
+  ~GuardImpl()
   {
-  public:
-    /// Disable ScopeGuard functionality on it's destruction
-    void release() const
-    {
-      m_bDoRollback = false;
-    }
+    if (m_bDoRollback)
+      m_Functor();
+  }
 
-  protected:
-
-    GuardBase() : m_bDoRollback(true)
-    {
-    }
-
-    // Do something in the destructor
-    mutable bool m_bDoRollback;
-  };
-
-  /// ScopeGuard for specific functor
-  template <typename TFunctor> class GuardImpl : public GuardBase
-  {
-  public:
-    explicit GuardImpl(TFunctor const & F) : m_Functor(F)
-    {
-    }
-
-    ~GuardImpl()
-    {
-      if (m_bDoRollback)
-        m_Functor();
-    }
-
-  private:
-    TFunctor m_Functor;
-  };
-} // namespace impl
+private:
+  TFunctor m_Functor;
+};
+}  // namespace impl
 
 typedef impl::GuardBase const & scope_guard;
 
@@ -55,7 +48,7 @@ impl::GuardImpl<TFunctor> make_scope_guard(TFunctor const & F)
 {
   return impl::GuardImpl<TFunctor>(F);
 }
-} // namespace base
+}  // namespace base
 
 #define SCOPE_GUARD(name, func)                            \
   ::base::scope_guard name = base::make_scope_guard(func); \
diff --git a/libs/base/set_operations.hpp b/libs/base/set_operations.hpp
index f6279bb4a..43521fdc3 100644
--- a/libs/base/set_operations.hpp
+++ b/libs/base/set_operations.hpp
@@ -2,30 +2,28 @@
 
 // Similar to set_difference(), but if element is present n times in the first sequence and once in
 // the second sequence, all n copies are filtered, insted of one.
-template<typename Iter1T, typename Iter2T, typename OutIterT, typename LessT>
-OutIterT SetDifferenceUnlimited(Iter1T beg1, Iter1T end1,
-                                Iter2T beg2, Iter2T end2,
-                                OutIterT out, LessT lessCompare)
+template <typename Iter1T, typename Iter2T, typename OutIterT, typename LessT>
+OutIterT SetDifferenceUnlimited(Iter1T beg1, Iter1T end1, Iter2T beg2, Iter2T end2, OutIterT out, LessT lessCompare)
+{
+  while (beg1 != end1 && beg2 != end2)
   {
-    while (beg1 != end1 && beg2 != end2)
+    if (lessCompare(*beg1, *beg2))
     {
-      if (lessCompare(*beg1, *beg2))
-      {
-        *out = *beg1;
-        ++beg1;
-        ++out;
-      }
-      else if (lessCompare(*beg2, *beg1))
-      {
-        ++beg2;
-      }
-      else
-      {
-        ++beg1;
-        // This is the difference between set_difference and this function:
-        // In set_difference the commented line should be present.
-        // ++beg2;
-      }
+      *out = *beg1;
+      ++beg1;
+      ++out;
+    }
+    else if (lessCompare(*beg2, *beg1))
+    {
+      ++beg2;
+    }
+    else
+    {
+      ++beg1;
+      // This is the difference between set_difference and this function:
+      // In set_difference the commented line should be present.
+      // ++beg2;
     }
-    return std::copy(beg1, end1, out);
   }
+  return std::copy(beg1, end1, out);
+}
diff --git a/libs/base/shared_buffer_manager.hpp b/libs/base/shared_buffer_manager.hpp
index 92e1dd7e5..7b249bd24 100644
--- a/libs/base/shared_buffer_manager.hpp
+++ b/libs/base/shared_buffer_manager.hpp
@@ -13,8 +13,8 @@ public:
   typedef std::shared_ptr<shared_buffer_t> shared_buffer_ptr_t;
   typedef std::list<shared_buffer_ptr_t> shared_buffer_ptr_list_t;
   typedef std::map<size_t, shared_buffer_ptr_list_t> shared_buffers_t;
-private:
 
+private:
   std::mutex m_mutex;
   shared_buffers_t m_sharedBuffers;
 
diff --git a/libs/base/small_map.hpp b/libs/base/small_map.hpp
index 1eaf8fb4d..16e6c747d 100644
--- a/libs/base/small_map.hpp
+++ b/libs/base/small_map.hpp
@@ -9,14 +9,17 @@ namespace base
 
 /// Consider using as a replacement of unordered_map (map) when:
 /// - very small amount of elements (<8)
-template <class Key, class Value> class SmallMapBase
+template <class Key, class Value>
+class SmallMapBase
 {
 public:
   using ValueType = std::pair<Key, Value>;
 
   SmallMapBase() = default;
   SmallMapBase(std::initializer_list<ValueType> init) : m_map(std::move(init)) {}
-  template <class Iter> SmallMapBase(Iter beg, Iter end) : m_map(beg, end) {}
+  template <class Iter>
+  SmallMapBase(Iter beg, Iter end) : m_map(beg, end)
+  {}
 
   bool operator==(SmallMapBase const & rhs) const { return m_map == rhs.m_map; }
 
@@ -26,10 +29,8 @@ public:
   Value const * Find(Key const & k) const
   {
     for (auto const & e : m_map)
-    {
       if (e.first == k)
         return &e.second;
-    }
     return nullptr;
   }
 
@@ -45,7 +46,8 @@ protected:
 /// Consider using as a replacement of unordered_map (map) when:
 /// - initialize and don't modify
 /// - relatively small amount of elements (8-128)
-template <class Key, class Value> class SmallMap : public SmallMapBase<Key, Value>
+template <class Key, class Value>
+class SmallMap : public SmallMapBase<Key, Value>
 {
   using BaseT = SmallMapBase<Key, Value>;
 
@@ -53,13 +55,9 @@ public:
   using ValueType = typename BaseT::ValueType;
 
   SmallMap() = default;
-  SmallMap(std::initializer_list<ValueType> init)
-    : BaseT(std::move(init))
-  {
-    FinishBuilding();
-  }
-  template <class Iter> SmallMap(Iter beg, Iter end)
-    : BaseT(beg, end)
+  SmallMap(std::initializer_list<ValueType> init) : BaseT(std::move(init)) { FinishBuilding(); }
+  template <class Iter>
+  SmallMap(Iter beg, Iter end) : BaseT(beg, end)
   {
     FinishBuilding();
   }
@@ -67,20 +65,14 @@ public:
   void FinishBuilding()
   {
     auto & theMap = this->m_map;
-    std::sort(theMap.begin(), theMap.end(), [](ValueType const & l, ValueType const & r)
-    {
-      return l.first < r.first;
-    });
+    std::sort(theMap.begin(), theMap.end(), [](ValueType const & l, ValueType const & r) { return l.first < r.first; });
   }
 
   Value const * Find(Key const & k) const
   {
     auto const & theMap = this->m_map;
     auto const it = std::lower_bound(theMap.cbegin(), theMap.cend(), k,
-                                     [](ValueType const & l, Key const & r)
-    {
-      return l.first < r;
-    });
+                                     [](ValueType const & l, Key const & r) { return l.first < r; });
 
     if (it != theMap.cend() && it->first == k)
       return &(it->second);
@@ -91,10 +83,7 @@ public:
   {
     auto & theMap = this->m_map;
     auto it = std::lower_bound(theMap.begin(), theMap.end(), k,
-                               [](ValueType const & l, Key const & r)
-    {
-      return l.first < r;
-    });
+                               [](ValueType const & l, Key const & r) { return l.first < r; });
 
     ASSERT(it != theMap.end() && it->first == k, ());
     it->second = std::move(v);
@@ -108,4 +97,4 @@ public:
   }
 };
 
-} // namespace base
+}  // namespace base
diff --git a/libs/base/small_set.hpp b/libs/base/small_set.hpp
index acbaf4c70..dc37b25db 100644
--- a/libs/base/small_set.hpp
+++ b/libs/base/small_set.hpp
@@ -34,7 +34,9 @@ public:
     using iterator_category = std::forward_iterator_tag;
 
     Iterator(uint64_t const * blocks, uint64_t current_block_index)
-      : m_blocks(blocks), m_current_block_index(current_block_index), m_current_block(0)
+      : m_blocks(blocks)
+      , m_current_block_index(current_block_index)
+      , m_current_block(0)
     {
       ASSERT_LESS_OR_EQUAL(current_block_index, kNumBlocks, ());
       if (current_block_index < kNumBlocks)
diff --git a/libs/base/src_point.cpp b/libs/base/src_point.cpp
index 5e4d19ed9..265a4ae27 100644
--- a/libs/base/src_point.cpp
+++ b/libs/base/src_point.cpp
@@ -24,8 +24,7 @@ std::string DebugPrint(SrcPoint const & srcPoint)
 {
   std::ostringstream out;
   if (srcPoint.Line() > 0)
-    out << srcPoint.FileName() << ":" << srcPoint.Line() << " " << srcPoint.Function()
-        << srcPoint.Postfix() << ": ";
+    out << srcPoint.FileName() << ":" << srcPoint.Line() << " " << srcPoint.Function() << srcPoint.Postfix() << ": ";
   return out.str();
 }
 }  // namespace base
diff --git a/libs/base/src_point.hpp b/libs/base/src_point.hpp
index 9552f7572..01af85c66 100644
--- a/libs/base/src_point.hpp
+++ b/libs/base/src_point.hpp
@@ -24,7 +24,10 @@ public:
   SrcPoint() : m_fileName(""), m_line(-1), m_function(""), m_postfix("") { TruncateFileName(); }
 
   SrcPoint(char const * fileName, int line, char const * function, char const * postfix = "")
-    : m_fileName(fileName), m_line(line), m_function(function), m_postfix(postfix)
+    : m_fileName(fileName)
+    , m_line(line)
+    , m_function(function)
+    , m_postfix(postfix)
   {
     TruncateFileName();
   }
diff --git a/libs/base/stats.hpp b/libs/base/stats.hpp
index 559f895d9..f55221ab0 100644
--- a/libs/base/stats.hpp
+++ b/libs/base/stats.hpp
@@ -16,7 +16,7 @@ class NoopStats
 {
 public:
   NoopStats() {}
-  void operator() (T const &) {}
+  void operator()(T const &) {}
   std::string GetStatsStr() const { return ""; }
 };
 
@@ -25,7 +25,8 @@ class AverageStats
 {
 public:
   AverageStats() = default;
-  template <class ContT> explicit AverageStats(ContT const & cont)
+  template <class ContT>
+  explicit AverageStats(ContT const & cont)
   {
     for (auto const & e : cont)
       (*this)(e);
@@ -55,7 +56,8 @@ private:
   T m_sum = 0;
 };
 
-template <class T> class StatsCollector
+template <class T>
+class StatsCollector
 {
   std::vector<std::pair<std::string, AverageStats<T>>> m_vec;
 
@@ -74,7 +76,8 @@ public:
   AverageStats<T> & Get(size_t i) { return m_vec[i].second; }
 };
 
-template <class Key> class TopStatsCounter
+template <class Key>
+class TopStatsCounter
 {
   std::unordered_map<Key, size_t> m_data;
 
@@ -88,7 +91,7 @@ public:
     using PtrT = std::pair<Key const, size_t> const *;
     struct GreaterNumber
     {
-      bool operator() (PtrT l, PtrT r) const { return l->second > r->second; }
+      bool operator()(PtrT l, PtrT r) const { return l->second > r->second; }
     };
 
     std::priority_queue<PtrT, std::vector<PtrT>, GreaterNumber> queue;
diff --git a/libs/base/std_serialization.hpp b/libs/base/std_serialization.hpp
index eef7f8438..468b153d7 100644
--- a/libs/base/std_serialization.hpp
+++ b/libs/base/std_serialization.hpp
@@ -5,19 +5,18 @@
 #include <unordered_map>
 #include <vector>
 
-
 /// @name std containers serialization
 /// TArchive should be an archive class in global namespace.
 //@{
 template <class TArchive, class T1, class T2>
-TArchive & operator << (TArchive & ar, std::pair<T1, T2> const & t)
+TArchive & operator<<(TArchive & ar, std::pair<T1, T2> const & t)
 {
   ar << t.first << t.second;
   return ar;
 }
 
 template <class TArchive, class T1, class T2>
-TArchive & operator >> (TArchive & ar, std::pair<T1, T2> & t)
+TArchive & operator>>(TArchive & ar, std::pair<T1, T2> & t)
 {
   ar >> t.first >> t.second;
   return ar;
@@ -103,77 +102,77 @@ void load_like_set(TArchive & ar, TCont & rSet)
 }
 
 template <class TArchive, class T1, class T2>
-TArchive & operator << (TArchive & ar, std::map<T1, T2> const & rMap)
+TArchive & operator<<(TArchive & ar, std::map<T1, T2> const & rMap)
 {
   save_like_map(ar, rMap);
   return ar;
 }
 
 template <class TArchive, class T1, class T2>
-TArchive & operator >> (TArchive & ar, std::map<T1, T2> & rMap)
+TArchive & operator>>(TArchive & ar, std::map<T1, T2> & rMap)
 {
   load_like_map(ar, rMap);
   return ar;
 }
 
 template <class TArchive, class T1, class T2>
-TArchive & operator << (TArchive & ar, std::multimap<T1, T2> const & rMap)
+TArchive & operator<<(TArchive & ar, std::multimap<T1, T2> const & rMap)
 {
   save_like_map(ar, rMap);
   return ar;
 }
 
 template <class TArchive, class T1, class T2>
-TArchive & operator >> (TArchive & ar, std::multimap<T1, T2> & rMap)
+TArchive & operator>>(TArchive & ar, std::multimap<T1, T2> & rMap)
 {
   load_like_map(ar, rMap);
   return ar;
 }
 
 template <class TArchive, class T1, class T2>
-TArchive & operator << (TArchive & ar, std::unordered_map<T1, T2> const & rMap)
+TArchive & operator<<(TArchive & ar, std::unordered_map<T1, T2> const & rMap)
 {
   save_like_map(ar, rMap);
   return ar;
 }
 
 template <class TArchive, class T1, class T2>
-TArchive & operator >> (TArchive & ar, std::unordered_map<T1, T2> & rMap)
+TArchive & operator>>(TArchive & ar, std::unordered_map<T1, T2> & rMap)
 {
   load_like_map(ar, rMap);
   return ar;
 }
 
 template <class TArchive, class T>
-TArchive & operator << (TArchive & ar, std::vector<T> const & rVector)
+TArchive & operator<<(TArchive & ar, std::vector<T> const & rVector)
 {
   save_like_vector(ar, rVector);
   return ar;
 }
 
 template <class TArchive, class T>
-TArchive & operator >> (TArchive & ar, std::vector<T> & rVector)
+TArchive & operator>>(TArchive & ar, std::vector<T> & rVector)
 {
   load_like_vector(ar, rVector);
   return ar;
 }
 
 template <class TArchive, class T>
-TArchive & operator << (TArchive & ar, std::set<T> const & rSet)
+TArchive & operator<<(TArchive & ar, std::set<T> const & rSet)
 {
   save_like_set(ar, rSet);
   return ar;
 }
 
 template <class TArchive, class T>
-TArchive & operator >> (TArchive & ar, std::set<T> & rSet)
+TArchive & operator>>(TArchive & ar, std::set<T> & rSet)
 {
   load_like_set(ar, rSet);
   return ar;
 }
 
 template <class TArchive, class T, size_t N>
-TArchive & operator << (TArchive & ar, std::array<T, N> const & rArray)
+TArchive & operator<<(TArchive & ar, std::array<T, N> const & rArray)
 {
   for (size_t i = 0; i < N; ++i)
     ar << rArray[i];
@@ -181,7 +180,7 @@ TArchive & operator << (TArchive & ar, std::array<T, N> const & rArray)
 }
 
 template <class TArchive, class T, size_t N>
-TArchive & operator >> (TArchive & ar, std::array<T, N> & rArray)
+TArchive & operator>>(TArchive & ar, std::array<T, N> & rArray)
 {
   for (size_t i = 0; i < N; ++i)
     ar >> rArray[i];
diff --git a/libs/base/stl_helpers.hpp b/libs/base/stl_helpers.hpp
index c62070784..3fa4a2815 100644
--- a/libs/base/stl_helpers.hpp
+++ b/libs/base/stl_helpers.hpp
@@ -29,10 +29,7 @@ struct Less<true, T, C>
 
   bool operator()(C const & lhs, C const & rhs) const { return lhs.*m_p < rhs.*m_p; }
 
-  bool operator()(C const * const lhs, C const * const rhs) const
-  {
-    return lhs->*m_p < rhs->*m_p;
-  }
+  bool operator()(C const * const lhs, C const * const rhs) const { return lhs->*m_p < rhs->*m_p; }
 
   T C::* m_p;
 };
@@ -44,10 +41,7 @@ struct Less<false, T, C>
 
   bool operator()(C const & lhs, C const & rhs) const { return (lhs.*m_p)() < (rhs.*m_p)(); }
 
-  bool operator()(C const * const lhs, C const * const rhs) const
-  {
-    return (lhs->*m_p)() < (rhs->*m_p)();
-  }
+  bool operator()(C const * const lhs, C const * const rhs) const { return (lhs->*m_p)() < (rhs->*m_p)(); }
 
   T (C::*m_p)() const;
 };
@@ -62,10 +56,7 @@ struct Equals<true, T, C>
 
   bool operator()(C const & lhs, C const & rhs) const { return lhs.*m_p == rhs.*m_p; }
 
-  bool operator()(C const * const lhs, C const * const rhs) const
-  {
-    return lhs->*m_p == rhs->*m_p;
-  }
+  bool operator()(C const * const lhs, C const * const rhs) const { return lhs->*m_p == rhs->*m_p; }
 
   T C::* m_p;
 };
@@ -77,10 +68,7 @@ struct Equals<false, T, C>
 
   bool operator()(C const & lhs, C const & rhs) const { return (lhs.*m_p)() == (rhs.*m_p)(); }
 
-  bool operator()(C const * const lhs, C const * const rhs) const
-  {
-    return (lhs->*m_p)() == (rhs->*m_p)();
-  }
+  bool operator()(C const * const lhs, C const * const rhs) const { return (lhs->*m_p)() == (rhs->*m_p)(); }
 
   T (C::*m_p)() const;
 };
@@ -89,9 +77,7 @@ template <typename Container, typename Deletor>
 class DeleteRangeFunctor
 {
 public:
-  DeleteRangeFunctor(Container & cont, Deletor const & deletor) : m_cont(cont), m_deletor(deletor)
-  {
-  }
+  DeleteRangeFunctor(Container & cont, Deletor const & deletor) : m_cont(cont), m_deletor(deletor) {}
 
   void operator()()
   {
@@ -227,10 +213,11 @@ class IgnoreFirstArgument
 {
 public:
   template <typename Gn>
-  explicit IgnoreFirstArgument(Gn && gn) : m_fn(std::forward<Gn>(gn)) {}
+  explicit IgnoreFirstArgument(Gn && gn) : m_fn(std::forward<Gn>(gn))
+  {}
 
   template <typename Arg, typename... Args>
-  std::invoke_result_t<Fn, Args&&...> operator()(Arg &&, Args &&... args)
+  std::invoke_result_t<Fn, Args &&...> operator()(Arg &&, Args &&... args)
   {
     return m_fn(std::forward<Args>(args)...);
   }
@@ -246,28 +233,22 @@ IgnoreFirstArgument<Fn> MakeIgnoreFirstArgument(Fn && fn)
 }
 
 template <size_t I = 0, typename Fn, typename... Tp>
-std::enable_if_t<I == sizeof...(Tp), void>
-for_each_in_tuple(std::tuple<Tp...> &, Fn &&)
-{
-}
+std::enable_if_t<I == sizeof...(Tp), void> for_each_in_tuple(std::tuple<Tp...> &, Fn &&)
+{}
 
 template <size_t I = 0, typename Fn, typename... Tp>
-std::enable_if_t<I != sizeof...(Tp), void>
-for_each_in_tuple(std::tuple<Tp...> & t, Fn && fn)
+std::enable_if_t<I != sizeof...(Tp), void> for_each_in_tuple(std::tuple<Tp...> & t, Fn && fn)
 {
   fn(I, std::get<I>(t));
   for_each_in_tuple<I + 1, Fn, Tp...>(t, std::forward<Fn>(fn));
 }
 
 template <size_t I = 0, typename Fn, typename... Tp>
-std::enable_if_t<I == sizeof...(Tp), void>
-for_each_in_tuple_const(std::tuple<Tp...> const &, Fn &&)
-{
-}
+std::enable_if_t<I == sizeof...(Tp), void> for_each_in_tuple_const(std::tuple<Tp...> const &, Fn &&)
+{}
 
 template <size_t I = 0, typename Fn, typename... Tp>
-std::enable_if_t<I != sizeof...(Tp), void>
-for_each_in_tuple_const(std::tuple<Tp...> const & t, Fn && fn)
+std::enable_if_t<I != sizeof...(Tp), void> for_each_in_tuple_const(std::tuple<Tp...> const & t, Fn && fn)
 {
   fn(I, std::get<I>(t));
   for_each_in_tuple_const<I + 1, Fn, Tp...>(t, std::forward<Fn>(fn));
@@ -278,7 +259,11 @@ class BackInsertFunctor
 {
 public:
   explicit BackInsertFunctor(Container & container) : m_Container(container) {}
-  template <class T> void operator()(T && t) const { m_Container.push_back(std::forward<T>(t)); }
+  template <class T>
+  void operator()(T && t) const
+  {
+    m_Container.push_back(std::forward<T>(t));
+  }
 
 private:
   Container & m_Container;
@@ -295,10 +280,7 @@ class InsertFunctor
 {
 public:
   explicit InsertFunctor(Container & container) : m_Container(container) {}
-  void operator()(typename Container::value_type const & t) const
-  {
-    m_Container.insert(end(m_Container), t);
-  }
+  void operator()(typename Container::value_type const & t) const { m_Container.insert(end(m_Container), t); }
 
 private:
   Container & m_Container;
@@ -317,10 +299,8 @@ bool IsSortedAndUnique(Iter beg, Iter end, Compare comp)
     return true;
   Iter prev = beg;
   for (++beg; beg != end; ++beg, ++prev)
-  {
     if (!comp(*prev, *beg))
       return false;
-  }
   return true;
 }
 
@@ -364,8 +344,7 @@ struct DeleteFunctor
 };
 
 template <typename Container, typename Deletor>
-impl::DeleteRangeFunctor<Container, Deletor> GetRangeDeletor(Container & cont,
-                                                             Deletor const & deletor)
+impl::DeleteRangeFunctor<Container, Deletor> GetRangeDeletor(Container & cont, Deletor const & deletor)
 {
   return impl::DeleteRangeFunctor<Container, Deletor>(cont, deletor);
 }
@@ -473,7 +452,7 @@ void AccumulateIntervals1With2(Iter1 b1, Iter1 e1, Iter2 b2, Iter2 e2, InsertIte
 
 struct EnumClassHash
 {
-  template<typename T, std::enable_if_t<std::is_enum<T>::value> * = nullptr>
+  template <typename T, std::enable_if_t<std::is_enum<T>::value> * = nullptr>
   size_t operator()(T const & t) const noexcept
   {
     return static_cast<size_t>(t);
diff --git a/libs/base/stl_iterator.hpp b/libs/base/stl_iterator.hpp
index 9ea9c0be5..852d9194e 100644
--- a/libs/base/stl_iterator.hpp
+++ b/libs/base/stl_iterator.hpp
@@ -6,14 +6,19 @@ namespace stl_iterator_detail
 {
 struct Dummy
 {
-  template <class T> Dummy & operator=(T const &) { return *this; }
+  template <class T>
+  Dummy & operator=(T const &)
+  {
+    return *this;
+  }
 };
 }  // namespace stl_iterator_detail
 
-class CounterIterator :
-    public boost::iterator_facade<CounterIterator, stl_iterator_detail::Dummy, boost::forward_traversal_tag>
+class CounterIterator
+  : public boost::iterator_facade<CounterIterator, stl_iterator_detail::Dummy, boost::forward_traversal_tag>
 {
   size_t m_count;
+
 public:
   CounterIterator() : m_count(0) {}
   size_t GetCount() const { return m_count; }
diff --git a/libs/base/string_utils.cpp b/libs/base/string_utils.cpp
index c79529165..fb8e30c2f 100644
--- a/libs/base/string_utils.cpp
+++ b/libs/base/string_utils.cpp
@@ -10,8 +10,8 @@
 #include <iomanip>
 #include <iterator>
 
-#include <boost/algorithm/string/trim.hpp>
 #include <fast_double_parser.h>
+#include <boost/algorithm/string/trim.hpp>
 
 namespace strings
 {
@@ -75,7 +75,10 @@ SimpleDelimiter::SimpleDelimiter(char const * delims)
     m_delims.push_back(utf8::unchecked::next(it));
 }
 
-SimpleDelimiter::SimpleDelimiter(char delim) { m_delims.push_back(delim); }
+SimpleDelimiter::SimpleDelimiter(char delim)
+{
+  m_delims.push_back(delim);
+}
 
 bool SimpleDelimiter::operator()(UniChar c) const
 {
@@ -220,7 +223,7 @@ void AsciiToUpper(std::string & s)
     if (in >= 'a' && in <= 'z')
       return char(in - diff);
     return in;
- });
+  });
 }
 
 void Trim(std::string & s)
@@ -278,21 +281,13 @@ bool Truncate(std::string & utf8, size_t const maxTextLengthPlus1)
         uint8_t bytesInCodepoint = 1;
 
         if ((byte & 0x80) == 0x00)
-        {
           bytesInCodepoint = 1;
-        }
         else if ((byte & 0xE0) == 0xC0)
-        {
           bytesInCodepoint = 2;
-        }
         else if ((byte & 0xF0) == 0xE0)
-        {
           bytesInCodepoint = 3;
-        }
         else if ((byte & 0xF8) == 0xF0)
-        {
           bytesInCodepoint = 4;
-        }
 
         utf8.resize(i + bytesInCodepoint);
         return true;
@@ -351,21 +346,25 @@ std::u16string ToUtf16(std::string_view utf8)
 bool IsASCIIString(std::string_view sv)
 {
   for (auto c : sv)
-  {
     if (c & 0x80)
       return false;
-  }
   return true;
 }
 
-bool IsASCIIDigit(UniChar c) { return c >= '0' && c <= '9'; }
+bool IsASCIIDigit(UniChar c)
+{
+  return c >= '0' && c <= '9';
+}
 
 bool IsASCIISpace(UniChar c)
 {
   return c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v';
 }
 
-bool IsASCIILatin(UniChar c) { return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'); }
+bool IsASCIILatin(UniChar c)
+{
+  return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
+}
 
 bool StartsWith(UniString const & s, UniString const & p)
 {
@@ -460,8 +459,7 @@ bool AlmostEqual(std::string const & str1, std::string const & str2, size_t mism
 
   for (size_t i = 0; i <= mismatchedCount; ++i)
   {
-    auto const end =
-        mis.first + std::min(distance(mis.first, str1End), distance(mis.second, str2End));
+    auto const end = mis.first + std::min(distance(mis.first, str1End), distance(mis.second, str2End));
     mis = mismatch(mis.first, end, mis.second);
     if (mis.first == str1End && mis.second == str2End)
       return true;
@@ -499,7 +497,9 @@ void ParseCSVRow(std::string const & row, char const delimiter, std::vector<std:
   target.clear();
 
   std::string prevColumns;
-  for (TokenizeIterator<SimpleDelimiter, std::string::const_iterator, true /* KeepEmptyTokens */> it {row.begin(), row.end(), delimiter}; it; ++it)
+  for (TokenizeIterator<SimpleDelimiter, std::string::const_iterator, true /* KeepEmptyTokens */> it{
+           row.begin(), row.end(), delimiter};
+       it; ++it)
   {
     std::string_view column = *it;
     size_t const quotesCount = std::count(column.begin(), column.end(), '"');
@@ -512,7 +512,7 @@ void ParseCSVRow(std::string const & row, char const delimiter, std::vector<std:
           target.emplace_back(column);
         else
         {
-          std::string strColumn {column};
+          std::string strColumn{column};
           target.push_back(UnescapeCSVColumn(strColumn));
         }
       }
diff --git a/libs/base/string_utils.hpp b/libs/base/string_utils.hpp
index 8e56457b7..abf3d33d1 100644
--- a/libs/base/string_utils.hpp
+++ b/libs/base/string_utils.hpp
@@ -4,8 +4,8 @@
 #include "base/checked_cast.hpp"
 
 #include <algorithm>
-#include <charconv>
 #include <cerrno>
+#include <charconv>
 #include <cstdint>
 #include <cstdlib>
 #include <iomanip>
@@ -39,8 +39,7 @@ public:
 
   template <typename Iter>
   UniString(Iter b, Iter e) : BaseT(b, e)
-  {
-  }
+  {}
 
   bool IsEqualAscii(char const * s) const;
 
@@ -133,17 +132,25 @@ std::string ToUtf8(UniString const & s);
 std::u16string ToUtf16(std::string_view utf8);
 bool IsASCIIString(std::string_view sv);
 bool IsASCIIDigit(UniChar c);
-template <class StringT> bool IsASCIINumeric(StringT const & str)
+template <class StringT>
+bool IsASCIINumeric(StringT const & str)
 {
   return !std::empty(str) && std::all_of(std::begin(str), std::end(str), &IsASCIIDigit);
 }
-inline bool IsASCIINumeric(char const * s) { return IsASCIINumeric(std::string_view(s)); }
+inline bool IsASCIINumeric(char const * s)
+{
+  return IsASCIINumeric(std::string_view(s));
+}
 bool IsASCIISpace(UniChar c);
 bool IsASCIILatin(UniChar c);
 
-inline std::string DebugPrint(UniString const & s) { return ToUtf8(s); }
+inline std::string DebugPrint(UniString const & s)
+{
+  return ToUtf8(s);
+}
 
-template <typename DelimFn, typename Iter> class TokenizeIteratorBase
+template <typename DelimFn, typename Iter>
+class TokenizeIteratorBase
 {
 public:
   using difference_type = std::ptrdiff_t;
@@ -152,15 +159,23 @@ public:
   // Hack to get buffer pointer from any iterator.
   // Deliberately made non-static to simplify the call like this->ToCharPtr.
   char const * ToCharPtr(char const * p) const { return p; }
-  template <class T> auto ToCharPtr(T const & i) const { return ToCharPtr(i.base()); }
+  template <class T>
+  auto ToCharPtr(T const & i) const
+  {
+    return ToCharPtr(i.base());
+  }
 };
 
 template <typename DelimFn, typename Iter, bool KeepEmptyTokens = false>
 class TokenizeIterator : public TokenizeIteratorBase<DelimFn, Iter>
 {
 public:
-  template <class InIterT> TokenizeIterator(InIterT beg, InIterT end, DelimFn const & delimFn)
-    : m_start(beg), m_end(beg), m_finish(end), m_delimFn(delimFn)
+  template <class InIterT>
+  TokenizeIterator(InIterT beg, InIterT end, DelimFn const & delimFn)
+    : m_start(beg)
+    , m_end(beg)
+    , m_finish(end)
+    , m_delimFn(delimFn)
   {
     Move();
   }
@@ -233,8 +248,13 @@ template <typename DelimFn, typename Iter>
 class TokenizeIterator<DelimFn, Iter, true /* KeepEmptyTokens */> : public TokenizeIteratorBase<DelimFn, Iter>
 {
 public:
-  template <class InIterT> TokenizeIterator(InIterT beg, InIterT end, DelimFn const & delimFn)
-    : m_start(beg), m_end(beg), m_finish(end), m_delimFn(delimFn), m_finished(false)
+  template <class InIterT>
+  TokenizeIterator(InIterT beg, InIterT end, DelimFn const & delimFn)
+    : m_start(beg)
+    , m_end(beg)
+    , m_finish(end)
+    , m_delimFn(delimFn)
+    , m_finished(false)
   {
     while (m_end != m_finish && !m_delimFn(*m_end))
       ++m_end;
@@ -261,10 +281,7 @@ public:
     if (!*this && !rhs)
       return true;
     if (*this && rhs)
-    {
-      return m_start == rhs.m_start && m_end == rhs.m_end && m_finish == rhs.m_finish &&
-             m_finished == rhs.m_finished;
-    }
+      return m_start == rhs.m_start && m_end == rhs.m_end && m_finish == rhs.m_finish && m_finished == rhs.m_finished;
     return false;
   }
 
@@ -322,15 +339,16 @@ public:
   bool operator()(UniChar c) const;
 };
 
-template <class StringT> class SimpleTokenizer : public
-    TokenizeIterator<SimpleDelimiter, ::utf8::unchecked::iterator<typename StringT::const_iterator>, false /* KeepEmptyTokens */>
+template <class StringT>
+class SimpleTokenizer
+  : public TokenizeIterator<SimpleDelimiter, ::utf8::unchecked::iterator<typename StringT::const_iterator>,
+                            false /* KeepEmptyTokens */>
 {
-  using BaseT = TokenizeIterator<SimpleDelimiter, ::utf8::unchecked::iterator<typename StringT::const_iterator>, false /* KeepEmptyTokens */>;
+  using BaseT = TokenizeIterator<SimpleDelimiter, ::utf8::unchecked::iterator<typename StringT::const_iterator>,
+                                 false /* KeepEmptyTokens */>;
+
 public:
-  SimpleTokenizer(StringT const & str, SimpleDelimiter const & delims)
-    : BaseT(str.begin(), str.end(), delims)
-  {
-  }
+  SimpleTokenizer(StringT const & str, SimpleDelimiter const & delims) : BaseT(str.begin(), str.end(), delims) {}
 };
 
 template <typename TFunctor>
@@ -364,22 +382,19 @@ UniChar LastUniChar(std::string const & s);
 //@{
 namespace internal
 {
-template <typename T, typename = std::enable_if_t<std::is_signed<T>::value &&
-                                                  sizeof(T) < sizeof(long long)>>
+template <typename T, typename = std::enable_if_t<std::is_signed<T>::value && sizeof(T) < sizeof(long long)>>
 long IntConverter(char const * start, char ** stop, int base)
 {
   return std::strtol(start, stop, base);
 }
 
-template <typename T, typename = std::enable_if_t<std::is_unsigned<T>::value &&
-                                                  sizeof(T) < sizeof(unsigned long long)>>
+template <typename T, typename = std::enable_if_t<std::is_unsigned<T>::value && sizeof(T) < sizeof(unsigned long long)>>
 unsigned long IntConverter(char const * start, char ** stop, int base)
 {
   return std::strtoul(start, stop, base);
 }
 
-template <typename T, typename = std::enable_if_t<std::is_signed<T>::value &&
-                                                  sizeof(T) == sizeof(long long)>>
+template <typename T, typename = std::enable_if_t<std::is_signed<T>::value && sizeof(T) == sizeof(long long)>>
 long long IntConverter(char const * start, char ** stop, int base)
 {
 #ifdef OMIM_OS_WINDOWS_NATIVE
@@ -389,8 +404,8 @@ long long IntConverter(char const * start, char ** stop, int base)
 #endif
 }
 
-template <typename T, typename = std::enable_if_t<std::is_unsigned<T>::value &&
-                                                  sizeof(T) == sizeof(unsigned long long)>>
+template <typename T,
+          typename = std::enable_if_t<std::is_unsigned<T>::value && sizeof(T) == sizeof(unsigned long long)>>
 unsigned long long IntConverter(char const * start, char ** stop, int base)
 {
 #ifdef OMIM_OS_WINDOWS_NATIVE
@@ -400,8 +415,7 @@ unsigned long long IntConverter(char const * start, char ** stop, int base)
 #endif
 }
 
-template <typename T,
-          typename = std::enable_if_t<std::is_integral<T>::value>>
+template <typename T, typename = std::enable_if_t<std::is_integral<T>::value>>
 bool ToInteger(char const * start, T & result, int base = 10)
 {
   char * stop;
@@ -409,8 +423,7 @@ bool ToInteger(char const * start, T & result, int base = 10)
 
   auto const v = IntConverter<T>(start, &stop, base);
 
-  if (errno == EINVAL || errno == ERANGE || *stop != 0 || start == stop ||
-      !base::IsCastValid<T>(v))
+  if (errno == EINVAL || errno == ERANGE || *stop != 0 || start == stop || !base::IsCastValid<T>(v))
   {
     errno = 0;
     return false;
@@ -512,19 +525,19 @@ bool ToInteger(char const * start, T & result, int base = 10)
   return to_double(s.c_str(), d);
 }
 
-
 namespace impl
 {
-template <typename T> bool from_sv(std::string_view sv, T & t)
+template <typename T>
+bool from_sv(std::string_view sv, T & t)
 {
   auto const end = sv.data() + sv.size();
   auto const res = std::from_chars(sv.data(), end, t);
-  return (res.ec != std::errc::invalid_argument && res.ec != std::errc::result_out_of_range &&
-          res.ptr == end);
+  return (res.ec != std::errc::invalid_argument && res.ec != std::errc::result_out_of_range && res.ptr == end);
 }
-} // namespace impl
+}  // namespace impl
 
-template <class T> inline bool to_uint(std::string_view sv, T & i)
+template <class T>
+inline bool to_uint(std::string_view sv, T & i)
 {
   static_assert(std::is_unsigned<T>::value, "");
   return impl::from_sv(sv, i);
@@ -537,11 +550,16 @@ inline bool to_double(std::string_view sv, double & d)
 }
 //@}
 
-
 /// @name From numeric to string.
 //@{
-inline std::string to_string(std::string const & s) { return s; }
-inline std::string to_string(char const * s) { return s; }
+inline std::string to_string(std::string const & s)
+{
+  return s;
+}
+inline std::string to_string(char const * s)
+{
+  return s;
+}
 template <typename T>
 std::string to_string(T t)
 {
@@ -556,17 +574,32 @@ template <typename T, typename = std::enable_if_t<std::is_integral<T>::value>>
   return internal::ToInteger(s.c_str(), i);
 }
 
-[[nodiscard]] inline bool to_any(std::string const & s, float & f) { return to_float(s, f); }
-[[nodiscard]] inline bool to_any(std::string const & s, double & d) { return to_double(s, d); }
+[[nodiscard]] inline bool to_any(std::string const & s, float & f)
+{
+  return to_float(s, f);
+}
+[[nodiscard]] inline bool to_any(std::string const & s, double & d)
+{
+  return to_double(s, d);
+}
 [[nodiscard]] inline bool to_any(std::string const & s, std::string & result)
 {
   result = s;
   return true;
 }
 
-inline std::string to_string(int32_t i) { return std::to_string(i); }
-inline std::string to_string(int64_t i) { return std::to_string(i); }
-inline std::string to_string(uint64_t i) { return std::to_string(i); }
+inline std::string to_string(int32_t i)
+{
+  return std::to_string(i);
+}
+inline std::string to_string(int64_t i)
+{
+  return std::to_string(i);
+}
+inline std::string to_string(uint64_t i)
+{
+  return std::to_string(i);
+}
 /// Use this function to get string with fixed count of
 /// "Digits after comma".
 std::string to_string_dac(double d, int dac);
@@ -611,8 +644,8 @@ bool IsHTML(std::string const & utf8);
 bool AlmostEqual(std::string const & str1, std::string const & str2, size_t mismatchedCount);
 
 template <typename Iterator, typename Delimiter>
-typename std::iterator_traits<Iterator>::value_type
-JoinStrings(Iterator begin, Iterator end, Delimiter const & delimiter)
+typename std::iterator_traits<Iterator>::value_type JoinStrings(Iterator begin, Iterator end,
+                                                                Delimiter const & delimiter)
 {
   if (begin == end)
     return {};
diff --git a/libs/base/suffix_array.cpp b/libs/base/suffix_array.cpp
index b783364b0..1e7b9507f 100644
--- a/libs/base/suffix_array.cpp
+++ b/libs/base/suffix_array.cpp
@@ -23,8 +23,7 @@ bool LEQ(size_t a1, size_t a2, size_t a3, size_t b1, size_t b2, size_t b3)
 // Actually this is a counting sort, but the name RadixSort is used
 // here to keep the correspondence with the article about Skew|DC3.
 template <typename Values>
-void RadixSort(size_t numKeys, size_t const * keys, size_t numValues, Values const & values,
-               size_t * resultKeys)
+void RadixSort(size_t numKeys, size_t const * keys, size_t numValues, Values const & values, size_t * resultKeys)
 {
   std::vector<size_t> count(numValues, 0);
   for (size_t i = 0; i < numKeys; ++i)
@@ -39,7 +38,10 @@ void RadixSort(size_t numKeys, size_t const * keys, size_t numValues, Values con
     resultKeys[--count[values[keys[i]]]] = keys[i];
 }
 
-bool InLeftHalf(size_t middle, size_t pos) { return pos < middle; }
+bool InLeftHalf(size_t middle, size_t pos)
+{
+  return pos < middle;
+}
 
 size_t RestoreIndex(size_t middle, size_t pos)
 {
@@ -128,10 +130,8 @@ void RawSkew(size_t n, size_t maxValue, S const & s, size_t * sa)
   // should be the same as the number of =0 (mod 3) suffixes. That's
   // why we need that s[n] = s[n + 1] = s[n + 2] = 0.
   for (size_t i = 0, j = 0; i < n + fake1; ++i)
-  {
     if (i % 3 != 0)
       s12[j++] = i;
-  }
 
   // Following three lines perform a stable sorting of all triples
   // <s[i], s[i + 1], s[i + 2]> where i =(1|2) (mod 3), including
@@ -187,10 +187,8 @@ void RawSkew(size_t n, size_t maxValue, S const & s, size_t * sa)
   std::vector<size_t> s0(n0);
   std::vector<size_t> sa0(n0);
   for (size_t i = 0, j = 0; i < n02; ++i)
-  {
     if (sa12[i] < n0)
       s0[j++] = 3 * sa12[i];
-  }
 
   // s0 is pre-sorted now in accordance with their tails (=1 (mod 3)
   // suffixes). For full sorting we need to do a stable sort =0 (mod
@@ -211,10 +209,9 @@ void RawSkew(size_t n, size_t maxValue, S const & s, size_t * sa)
     size_t const p12 = RestoreIndex(n0, sa12[i12]);
     ASSERT_LESS(p12 / 3, n0, ());
 
-    bool const isLEQ =
-        InLeftHalf(n0, sa12[i12])
-            ? LEQ(s[p12], s12[sa12[i12] + n0], s[p0], s12[p0 / 3])
-            : LEQ(s[p12], s[p12 + 1], s12[sa12[i12] - n0 + 1], s[p0], s[p0 + 1], s12[p0 / 3 + n0]);
+    bool const isLEQ = InLeftHalf(n0, sa12[i12])
+                         ? LEQ(s[p12], s12[sa12[i12] + n0], s[p0], s12[p0 / 3])
+                         : LEQ(s[p12], s[p12 + 1], s12[sa12[i12] - n0 + 1], s[p0], s[p0 + 1], s12[p0 / 3 + n0]);
 
     if (isLEQ)
     {
diff --git a/libs/base/sunrise_sunset.cpp b/libs/base/sunrise_sunset.cpp
index fc4bc0e07..090b2984e 100644
--- a/libs/base/sunrise_sunset.cpp
+++ b/libs/base/sunrise_sunset.cpp
@@ -13,7 +13,7 @@ namespace
 //   civil        = 96 degrees
 //   nautical     = 102 degrees
 //   astronomical = 108 degrees
-double constexpr kZenith = 90 + 50. / 60.; // 90 degrees 50'
+double constexpr kZenith = 90 + 50. / 60.;  // 90 degrees 50'
 
 time_t constexpr kOneDaySeconds = 24 * 60 * 60;
 
@@ -83,9 +83,7 @@ enum class DayEventType
 // This function was taken from source http://williams.best.vwh.net/sunrise_sunset_algorithm.htm.
 // Notation is kept to have source close to source.
 // Original article is // http://babel.hathitrust.org/cgi/pt?id=uiug.30112059294311;view=1up;seq=25
-std::pair<DayEventType, time_t> CalculateDayEventTime(time_t timeUtc,
-                                                 double latitude, double longitude,
-                                                 bool sunrise)
+std::pair<DayEventType, time_t> CalculateDayEventTime(time_t timeUtc, double latitude, double longitude, bool sunrise)
 {
   tm const * const gmt = gmtime(&timeUtc);
   if (nullptr == gmt)
@@ -124,13 +122,13 @@ std::pair<DayEventType, time_t> CalculateDayEventTime(time_t timeUtc,
 
   // 5a. calculate the Sun's right ascension
 
-  double RA = math::RadToDeg( atan(0.91764 * tan(math::DegToRad(L))) );
+  double RA = math::RadToDeg(atan(0.91764 * tan(math::DegToRad(L))));
   // NOTE: RA potentially needs to be adjusted into the range [0,360) by adding/subtracting 360
   RA = NormalizeAngle(RA);
 
   // 5b. right ascension value needs to be in the same quadrant as L
 
-  double const Lquadrant = (floor( L / 90)) * 90;
+  double const Lquadrant = (floor(L / 90)) * 90;
   double const RAquadrant = (floor(RA / 90)) * 90;
   RA = RA + (Lquadrant - RAquadrant);
 
@@ -145,7 +143,8 @@ std::pair<DayEventType, time_t> CalculateDayEventTime(time_t timeUtc,
 
   // 7a. calculate the Sun's local hour angle
 
-  double cosH = (cos(math::DegToRad(kZenith)) - (sinDec * sin(math::DegToRad(latitude)))) / (cosDec * cos(math::DegToRad(latitude)));
+  double cosH = (cos(math::DegToRad(kZenith)) - (sinDec * sin(math::DegToRad(latitude)))) /
+                (cosDec * cos(math::DegToRad(latitude)));
 
   // if cosH > 1 then sun is never rises on this location on specified date (polar night)
   // if cosH < -1 then sun is never sets on this location on specified date (polar day)
@@ -156,7 +155,7 @@ std::pair<DayEventType, time_t> CalculateDayEventTime(time_t timeUtc,
     int const s = sunrise ? 0 : 59;
 
     return std::make_pair((cosH < -1) ? DayEventType::PolarDay : DayEventType::PolarNight,
-                     base::TimeGM(year, month, day, h, m, s));
+                          base::TimeGM(year, month, day, h, m, s));
   }
 
   // 7b. finish calculating H and convert into hours
@@ -195,15 +194,15 @@ std::pair<DayEventType, time_t> CalculateDayEventTime(time_t timeUtc,
 
   // UT - is a hour with fractional part of date year/month/day, in range of [0;24)
 
-  int const h = floor(UT); // [0;24)
-  int const m = floor((UT - h) * 60); // [0;60)
-  int const s = fmod(floor(UT * 60 * 60) /* number of seconds from 0:0 to UT */, 60); // [0;60)
+  int const h = floor(UT);                                                             // [0;24)
+  int const m = floor((UT - h) * 60);                                                  // [0;60)
+  int const s = fmod(floor(UT * 60 * 60) /* number of seconds from 0:0 to UT */, 60);  // [0;60)
 
   return std::make_pair(sunrise ? DayEventType::Sunrise : DayEventType::Sunset,
-                   base::TimeGM(year, month, day, h, m, s));
+                        base::TimeGM(year, month, day, h, m, s));
 }
 
-} // namespace
+}  // namespace
 
 DayTimeType GetDayTime(time_t timeUtc, double latitude, double longitude)
 {
diff --git a/libs/base/thread.cpp b/libs/base/thread.cpp
index 777a1ca82..68c7068bd 100644
--- a/libs/base/thread.cpp
+++ b/libs/base/thread.cpp
@@ -34,9 +34,7 @@ void RunRoutine(std::shared_ptr<IRoutine> routine)
 /////////////////////////////////////////////////////////////////////
 // Thread wrapper implementation
 
-Thread::Thread()
-{
-}
+Thread::Thread() {}
 
 Thread::~Thread()
 {
@@ -83,11 +81,20 @@ void Thread::Join()
     m_thread.join();
 }
 
-IRoutine * Thread::GetRoutine() { return m_routine.get(); }
+IRoutine * Thread::GetRoutine()
+{
+  return m_routine.get();
+}
 
-void Sleep(size_t ms) { std::this_thread::sleep_for(std::chrono::milliseconds(ms)); }
+void Sleep(size_t ms)
+{
+  std::this_thread::sleep_for(std::chrono::milliseconds(ms));
+}
 
-ThreadID GetCurrentThreadID() { return std::this_thread::get_id(); }
+ThreadID GetCurrentThreadID()
+{
+  return std::this_thread::get_id();
+}
 
 /////////////////////////////////////////////////////////////////////
 // SimpleThread implementation
diff --git a/libs/base/thread.hpp b/libs/base/thread.hpp
index 3a332e214..2bc7186fd 100644
--- a/libs/base/thread.hpp
+++ b/libs/base/thread.hpp
@@ -83,16 +83,14 @@ public:
   using native_handle_type = std::thread::native_handle_type;
 
   SimpleThread() noexcept {}
-  SimpleThread(SimpleThread && x) noexcept
-    : m_thread(std::move(x.m_thread))
-  {}
+  SimpleThread(SimpleThread && x) noexcept : m_thread(std::move(x.m_thread)) {}
 
   template <class Fn, class... Args>
   explicit SimpleThread(Fn && fn, Args &&... args)
-  : m_thread(&SimpleThread::ThreadFunc, std::bind(std::forward<Fn>(fn), std::forward<Args>(args)...))
+    : m_thread(&SimpleThread::ThreadFunc, std::bind(std::forward<Fn>(fn), std::forward<Args>(args)...))
   {}
 
-  SimpleThread & operator= (SimpleThread && x) noexcept
+  SimpleThread & operator=(SimpleThread && x) noexcept
   {
     m_thread = std::move(x.m_thread);
     return *this;
diff --git a/libs/base/thread_checker.cpp b/libs/base/thread_checker.cpp
index 84688b19b..06c36917a 100644
--- a/libs/base/thread_checker.cpp
+++ b/libs/base/thread_checker.cpp
@@ -2,4 +2,7 @@
 
 ThreadChecker::ThreadChecker() : m_id(std::this_thread::get_id()) {}
 
-bool ThreadChecker::CalledOnOriginalThread() const { return std::this_thread::get_id() == m_id; }
+bool ThreadChecker::CalledOnOriginalThread() const
+{
+  return std::this_thread::get_id() == m_id;
+}
diff --git a/libs/base/thread_checker.hpp b/libs/base/thread_checker.hpp
index a23985128..b497ab62d 100644
--- a/libs/base/thread_checker.hpp
+++ b/libs/base/thread_checker.hpp
@@ -23,10 +23,10 @@ private:
   DISALLOW_COPY_AND_MOVE(ThreadChecker);
 };
 
-#define DECLARE_THREAD_CHECKER(threadCheckerName) ThreadChecker threadCheckerName
+#define DECLARE_THREAD_CHECKER(threadCheckerName)    ThreadChecker threadCheckerName
 #define CHECK_THREAD_CHECKER(threadCheckerName, msg) CHECK(threadCheckerName.CalledOnOriginalThread(), msg)
-#define DECLARE_AND_CHECK_THREAD_CHECKER(msg) \
-{ \
-  static const ThreadChecker threadChecker; \
-  CHECK(threadChecker.CalledOnOriginalThread(), (msg)); \
-}
+#define DECLARE_AND_CHECK_THREAD_CHECKER(msg)             \
+  {                                                       \
+    static const ThreadChecker threadChecker;             \
+    CHECK(threadChecker.CalledOnOriginalThread(), (msg)); \
+  }
diff --git a/libs/base/thread_pool.cpp b/libs/base/thread_pool.cpp
index 64f52bbd5..c492c889f 100644
--- a/libs/base/thread_pool.cpp
+++ b/libs/base/thread_pool.cpp
@@ -7,7 +7,6 @@
 #include <memory>
 #include <vector>
 
-
 namespace base
 {
 namespace
@@ -17,11 +16,10 @@ typedef std::function<threads::IRoutine *()> TPopRoutineFn;
 class PoolRoutine : public threads::IRoutine
 {
 public:
-  PoolRoutine(const TPopRoutineFn & popFn, const ThreadPool::TFinishRoutineFn & finishFn)
+  PoolRoutine(TPopRoutineFn const & popFn, ThreadPool::TFinishRoutineFn const & finishFn)
     : m_popFn(popFn)
     , m_finishFn(finishFn)
-  {
-  }
+  {}
 
   virtual void Do()
   {
@@ -44,12 +42,12 @@ private:
   TPopRoutineFn m_popFn;
   ThreadPool::TFinishRoutineFn m_finishFn;
 };
-} // namespace
+}  // namespace
 
 class ThreadPool::Impl
 {
 public:
-  Impl(size_t size, const TFinishRoutineFn & finishFn) : m_finishFn(finishFn), m_threads(size)
+  Impl(size_t size, TFinishRoutineFn const & finishFn) : m_finishFn(finishFn), m_threads(size)
   {
     ASSERT_GREATER(size, 0, ());
     for (auto & thread : m_threads)
@@ -59,10 +57,7 @@ public:
     }
   }
 
-  ~Impl()
-  {
-    Stop();
-  }
+  ~Impl() { Stop(); }
 
   void PushBack(threads::IRoutine * routine)
   {
@@ -76,10 +71,7 @@ public:
     m_tasks.PushFront(routine);
   }
 
-  threads::IRoutine * PopFront()
-  {
-    return m_tasks.Front(true);
-  }
+  threads::IRoutine * PopFront() { return m_tasks.Front(true); }
 
   void Stop()
   {
@@ -109,8 +101,7 @@ private:
   std::vector<std::unique_ptr<threads::Thread>> m_threads;
 };
 
-ThreadPool::ThreadPool(size_t size, const TFinishRoutineFn & finishFn)
-  : m_impl(new Impl(size, finishFn)) {}
+ThreadPool::ThreadPool(size_t size, TFinishRoutineFn const & finishFn) : m_impl(new Impl(size, finishFn)) {}
 
 ThreadPool::~ThreadPool()
 {
@@ -132,4 +123,4 @@ void ThreadPool::Stop()
   m_impl->Stop();
 }
 
-} // namespace base
+}  // namespace base
diff --git a/libs/base/thread_pool.hpp b/libs/base/thread_pool.hpp
index b9db4e77b..63a7109d7 100644
--- a/libs/base/thread_pool.hpp
+++ b/libs/base/thread_pool.hpp
@@ -14,9 +14,9 @@ namespace base
 class ThreadPool
 {
 public:
-  typedef std::function<void (threads::IRoutine *)> TFinishRoutineFn;
+  typedef std::function<void(threads::IRoutine *)> TFinishRoutineFn;
 
-  ThreadPool(size_t size, const TFinishRoutineFn & finishFn);
+  ThreadPool(size_t size, TFinishRoutineFn const & finishFn);
   ~ThreadPool();
 
   // ThreadPool will not delete routine. You can delete it in TFinishRoutineFn.
@@ -33,4 +33,4 @@ private:
   Impl * m_impl;
 };
 
-} // namespace base
+}  // namespace base
diff --git a/libs/base/thread_pool_computational.hpp b/libs/base/thread_pool_computational.hpp
index 9e6d9f5e6..4f0b08400 100644
--- a/libs/base/thread_pool_computational.hpp
+++ b/libs/base/thread_pool_computational.hpp
@@ -63,8 +63,7 @@ public:
   auto Submit(F && func, Args &&... args) -> std::future<decltype(func(args...))>
   {
     using ResultType = decltype(func(args...));
-    std::packaged_task<ResultType()> task(std::bind(std::forward<F>(func),
-                                                    std::forward<Args>(args)...));
+    std::packaged_task<ResultType()> task(std::bind(std::forward<F>(func), std::forward<Args>(args)...));
     std::future<ResultType> result(task.get_future());
     {
       std::unique_lock lock(m_mutex);
@@ -128,9 +127,7 @@ private:
       FunctionType task;
       {
         std::unique_lock lock(m_mutex);
-        m_condition.wait(lock, [&] {
-          return m_done || !m_queue.empty();
-        });
+        m_condition.wait(lock, [&] { return m_done || !m_queue.empty(); });
 
         if (m_done && m_queue.empty())
           return;
@@ -154,4 +151,4 @@ private:
   ThreadsJoiner<> m_joiner;
 };
 
-} // namespace base
+}  // namespace base
diff --git a/libs/base/thread_pool_delayed.cpp b/libs/base/thread_pool_delayed.cpp
index bcf1abe90..0a1242871 100644
--- a/libs/base/thread_pool_delayed.cpp
+++ b/libs/base/thread_pool_delayed.cpp
@@ -52,7 +52,8 @@ TaskLoop::PushResult DelayedThreadPool::PushDelayed(Duration const & delay, Task
 template <typename T>
 TaskLoop::PushResult DelayedThreadPool::AddImmediate(T && task)
 {
-  return AddTask([&]() {
+  return AddTask([&]()
+  {
     auto const newId = MakeNextId(m_immediateLastId, kImmediateMinId, kImmediateMaxId);
     VERIFY(m_immediate.Emplace(newId, std::forward<T>(task)), ());
     m_immediateLastId = newId;
@@ -64,7 +65,8 @@ template <typename T>
 TaskLoop::PushResult DelayedThreadPool::AddDelayed(Duration const & delay, T && task)
 {
   auto const when = Now() + delay;
-  return AddTask([&]() {
+  return AddTask([&]()
+  {
     auto const newId = MakeNextId(m_delayedLastId, kDelayedMinId, kDelayedMaxId);
     m_delayed.Add(newId, std::make_shared<DelayedTask>(newId, when, std::forward<T>(task)));
     m_delayedLastId = newId;
@@ -113,8 +115,7 @@ void DelayedThreadPool::ProcessTasks()
       {
         // When there are no delayed tasks in the queue, we need to
         // wait until there is at least one immediate or delayed task.
-        m_cv.wait(lk,
-                  [this]() { return m_shutdown || !m_immediate.IsEmpty() || !m_delayed.IsEmpty(); });
+        m_cv.wait(lk, [this]() { return m_shutdown || !m_immediate.IsEmpty() || !m_delayed.IsEmpty(); });
       }
 
       if (m_shutdown)
@@ -135,8 +136,7 @@ void DelayedThreadPool::ProcessTasks()
       }
 
       auto const canExecImmediate = !m_immediate.IsEmpty();
-      auto const canExecDelayed =
-          !m_delayed.IsEmpty() && Now() >= m_delayed.GetFirstValue()->m_when;
+      auto const canExecDelayed = !m_delayed.IsEmpty() && Now() >= m_delayed.GetFirstValue()->m_when;
 
       if (canExecImmediate)
       {
@@ -152,10 +152,8 @@ void DelayedThreadPool::ProcessTasks()
     }
 
     for (auto const & task : tasks)
-    {
       if (task)
         task();
-    }
   }
 
   for (; !pendingImmediate.IsEmpty(); pendingImmediate.PopFront())
@@ -194,13 +192,10 @@ bool DelayedThreadPool::Cancel(TaskId id)
       return true;
     }
   }
-  else
+  else if (m_delayed.RemoveKey(id))
   {
-    if (m_delayed.RemoveKey(id))
-    {
-      m_cv.notify_one();
-      return true;
-    }
+    m_cv.notify_one();
+    return true;
   }
 
   return false;
@@ -221,10 +216,8 @@ void DelayedThreadPool::ShutdownAndJoin()
 {
   Shutdown(m_exit);
   for (auto & thread : m_threads)
-  {
     if (thread.joinable())
       thread.join();
-  }
   m_threads.clear();
 }
 
@@ -234,4 +227,4 @@ bool DelayedThreadPool::IsShutDown()
   return m_shutdown;
 }
 
-} // namespace base
+}  // namespace base
diff --git a/libs/base/thread_pool_delayed.hpp b/libs/base/thread_pool_delayed.hpp
index 2089cf827..b54a7aae6 100644
--- a/libs/base/thread_pool_delayed.hpp
+++ b/libs/base/thread_pool_delayed.hpp
@@ -90,12 +90,10 @@ private:
   struct DelayedTask
   {
     template <typename T>
-    DelayedTask(TaskId id, TimePoint const & when, T && task)
-      : m_id(id)
-      , m_when(when)
-      , m_task(std::forward<T>(task))
-    {
-    }
+    DelayedTask(TaskId id, TimePoint const & when, T && task) : m_id(id)
+                                                              , m_when(when)
+                                                              , m_task(std::forward<T>(task))
+    {}
 
     bool operator<(DelayedTask const & rhs) const
     {
@@ -120,9 +118,9 @@ private:
   using ImmediateQueue = LinkedMap<TaskId, Task>;
 
   using DelayedValue = std::shared_ptr<DelayedTask>;
-  class DelayedQueue : public BidirectionalMap<TaskId, DelayedValue,
-                                              std::unordered_map, std::hash<TaskId>,
-                                              std::multimap, DeRef<DelayedValue>>
+  class DelayedQueue
+    : public BidirectionalMap<TaskId, DelayedValue, std::unordered_map, std::hash<TaskId>, std::multimap,
+                              DeRef<DelayedValue>>
   {
   public:
     Value const & GetFirstValue() const
diff --git a/libs/base/thread_safe_queue.hpp b/libs/base/thread_safe_queue.hpp
index 49ad6614d..bf08f2756 100644
--- a/libs/base/thread_safe_queue.hpp
+++ b/libs/base/thread_safe_queue.hpp
@@ -38,7 +38,7 @@ public:
   void WaitAndPop(T & value)
   {
     std::unique_lock lk(m_mutex);
-    m_cond.wait(lk, [this]{ return !m_queue.empty(); });
+    m_cond.wait(lk, [this] { return !m_queue.empty(); });
     value = std::move(m_queue.front());
     m_queue.pop();
   }
@@ -52,7 +52,6 @@ public:
     value = std::move(m_queue.front());
     m_queue.pop();
     return true;
-
   }
 
   bool Empty() const
diff --git a/libs/base/thread_utils.hpp b/libs/base/thread_utils.hpp
index 8a7dc17e2..f50c5c1a5 100644
--- a/libs/base/thread_utils.hpp
+++ b/libs/base/thread_utils.hpp
@@ -16,16 +16,11 @@ public:
   void Join()
   {
     for (auto & thread : m_threads)
-    {
       if (thread.joinable())
         thread.join();
-    }
   }
 
-  ~ThreadsJoiner()
-  {
-    Join();
-  }
+  ~ThreadsJoiner() { Join(); }
 
 private:
   ThreadContainer & m_threads;
@@ -38,7 +33,8 @@ class FunctionWrapper
 {
 public:
   template <typename F>
-  FunctionWrapper(F && func) : m_impl(new ImplType<F>(std::move(func))) {}
+  FunctionWrapper(F && func) : m_impl(new ImplType<F>(std::move(func)))
+  {}
 
   FunctionWrapper() = default;
 
diff --git a/libs/base/threaded_list.hpp b/libs/base/threaded_list.hpp
index e4ed503a2..0c3e8d05f 100644
--- a/libs/base/threaded_list.hpp
+++ b/libs/base/threaded_list.hpp
@@ -18,7 +18,6 @@ private:
   }
 
 public:
-
   template <typename Fn>
   void ProcessList(Fn const & fn)
   {
diff --git a/libs/base/timegm.cpp b/libs/base/timegm.cpp
index e7a7a7a1f..917d3b2ca 100644
--- a/libs/base/timegm.cpp
+++ b/libs/base/timegm.cpp
@@ -16,17 +16,15 @@ namespace
 
 // Number of days elapsed since Jan 01 up to each month
 // (except for February in leap years).
-int const g_monoff[] = {
-  0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334
-};
+int const g_monoff[] = {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
 
 int LeapDaysCount(int y1, int y2)
 {
   --y1;
   --y2;
-  return (y2/4 - y1/4) - (y2/100 - y1/100) + (y2/400 - y1/400);
+  return (y2 / 4 - y1 / 4) - (y2 / 100 - y1 / 100) + (y2 / 400 - y1 / 400);
 }
-} // namespace
+}  // namespace
 
 namespace base
 {
@@ -37,7 +35,7 @@ int DaysOfMonth(int year, int month)
   ASSERT_LESS_OR_EQUAL(month, 12, ());
 
   int const february = base::IsLeapYear(year) ? 29 : 28;
-  int const daysPerMonth[12] = { 31, february, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+  int const daysPerMonth[12] = {31, february, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
   return daysPerMonth[month - 1];
 }
 
@@ -86,4 +84,4 @@ time_t TimeGM(int year, int month, int day, int hour, int min, int sec)
   t.tm_sec = sec;
   return TimeGM(t);
 }
-} // namespace base
+}  // namespace base
diff --git a/libs/base/timegm.hpp b/libs/base/timegm.hpp
index 03fdd8a63..735a181f4 100644
--- a/libs/base/timegm.hpp
+++ b/libs/base/timegm.hpp
@@ -23,4 +23,4 @@ time_t TimeGM(std::tm const & tm);
 // min - 0...59
 // sec - 0...59
 time_t TimeGM(int year, int month, int day, int hour, int min, int sec);
-} // base
+}  // namespace base
diff --git a/libs/base/timer.cpp b/libs/base/timer.cpp
index fa041ca12..387eeb676 100644
--- a/libs/base/timer.cpp
+++ b/libs/base/timer.cpp
@@ -88,11 +88,11 @@ std::string TimestampToString(time_t time)
   tm * t = gmtime(&time);
   char buf[100];
 #ifdef OMIM_OS_WINDOWS
-  sprintf_s(buf, ARRAY_SIZE(buf), "%04d-%02d-%02dT%02d:%02d:%02dZ", t->tm_year + 1900,
-            t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec);
+  sprintf_s(buf, ARRAY_SIZE(buf), "%04d-%02d-%02dT%02d:%02d:%02dZ", t->tm_year + 1900, t->tm_mon + 1, t->tm_mday,
+            t->tm_hour, t->tm_min, t->tm_sec);
 #else
-  ::snprintf(buf, ARRAY_SIZE(buf), "%04d-%02d-%02dT%02d:%02d:%02dZ", t->tm_year + 1900,
-             t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec);
+  ::snprintf(buf, ARRAY_SIZE(buf), "%04d-%02d-%02dT%02d:%02d:%02dZ", t->tm_year + 1900, t->tm_mon + 1, t->tm_mday,
+             t->tm_hour, t->tm_min, t->tm_sec);
 #endif
 
   return buf;
@@ -131,7 +131,8 @@ time_t StringToTimestamp(std::string const & s)
   // Fractional second values are dropped, as POSIX time_t doesn't hold them.
   if (signOrDotOrZ == '.')
   {
-    while (ss >> signOrDotOrZ && std::isdigit(signOrDotOrZ)) {}
+    while (ss >> signOrDotOrZ && std::isdigit(signOrDotOrZ))
+    {}
 
     if (ss.fail())
       return INVALID_TIME_STAMP;
@@ -171,9 +172,9 @@ uint64_t TimeTToSecondsSinceEpoch(time_t time)
 }
 
 ScopedTimerWithLog::ScopedTimerWithLog(std::string const & timerName, Measure measure)
-  : m_name(timerName), m_measure(measure)
-{
-}
+  : m_name(timerName)
+  , m_measure(measure)
+{}
 
 ScopedTimerWithLog::~ScopedTimerWithLog()
 {
diff --git a/libs/base/timer.hpp b/libs/base/timer.hpp
index bf3ac6a82..1435d9664 100644
--- a/libs/base/timer.hpp
+++ b/libs/base/timer.hpp
@@ -9,7 +9,8 @@ namespace base
 {
 namespace impl
 {
-template <class ClockT> class StdTimer
+template <class ClockT>
+class StdTimer
 {
   typename ClockT::time_point m_startTime;
 
@@ -36,8 +37,7 @@ public:
 
   void Reset() { m_startTime = ClockT::now(); }
 };
-} // namespace impl
-
+}  // namespace impl
 
 /// Cross platform timer
 class Timer : public impl::StdTimer<std::chrono::steady_clock>
@@ -77,7 +77,6 @@ time_t const INVALID_TIME_STAMP = -1;
 /// @return INVALID_TIME_STAMP if string is invalid
 time_t StringToTimestamp(std::string const & s);
 
-
 /// High resolution timer to use in comparison tests.
 using HighResTimer = impl::StdTimer<std::chrono::high_resolution_clock>;
 
@@ -90,8 +89,7 @@ public:
     Seconds,
   };
 
-  explicit ScopedTimerWithLog(std::string const & timerName,
-                              Measure measure = Measure::MilliSeconds);
+  explicit ScopedTimerWithLog(std::string const & timerName, Measure measure = Measure::MilliSeconds);
   ~ScopedTimerWithLog();
 
 private:
diff --git a/libs/base/waiter.hpp b/libs/base/waiter.hpp
index ead570e62..74ba59774 100644
--- a/libs/base/waiter.hpp
+++ b/libs/base/waiter.hpp
@@ -47,10 +47,7 @@ public:
     m_event.notify_all();
   }
 
-  void Reset()
-  {
-    SetNotified(false);
-  }
+  void Reset() { SetNotified(false); }
 
 private:
   void SetNotified(bool notified)
@@ -76,4 +73,4 @@ inline std::string DebugPrint(Waiter::Result result)
 
   return {};
 }
-} // namespace base
+}  // namespace base
diff --git a/libs/coding/base64.cpp b/libs/coding/base64.cpp
index ed1523808..3f46407d0 100644
--- a/libs/coding/base64.cpp
+++ b/libs/coding/base64.cpp
@@ -23,7 +23,7 @@ namespace base64
 {
 // From: http://stackoverflow.com/a/28471421
 
-std::string Decode(const std::string & val)
+std::string Decode(std::string const & val)
 {
   using namespace boost::archive::iterators;
   using It = transform_width<binary_from_base64<std::string::const_iterator>, 8, 6>;
diff --git a/libs/coding/bit_streams.hpp b/libs/coding/bit_streams.hpp
index d5b904f03..3f7c6162c 100644
--- a/libs/coding/bit_streams.hpp
+++ b/libs/coding/bit_streams.hpp
@@ -8,7 +8,6 @@
 #include <climits>
 #include <cstdint>
 
-
 static_assert(CHAR_BIT == 8);
 
 template <typename TWriter>
@@ -168,13 +167,12 @@ public:
     return result;
   }
 
-#define READ_BYTE(i)                                                                             \
-  {                                                                                              \
-    result =                                                                                     \
-        result | (static_cast<decltype(result)>(Read(std::min(n, kMinBits))) << (i * kMinBits)); \
-    if (n <= kMinBits)                                                                           \
-      return result;                                                                             \
-    n -= kMinBits;                                                                               \
+#define READ_BYTE(i)                                                                                  \
+  {                                                                                                   \
+    result = result | (static_cast<decltype(result)>(Read(std::min(n, kMinBits))) << (i * kMinBits)); \
+    if (n <= kMinBits)                                                                                \
+      return result;                                                                                  \
+    n -= kMinBits;                                                                                    \
   }
 
   // Same as Read but accept up to 32 bits to read.
diff --git a/libs/coding/buffer_reader.hpp b/libs/coding/buffer_reader.hpp
index 8bb7c8e30..99cc0d549 100644
--- a/libs/coding/buffer_reader.hpp
+++ b/libs/coding/buffer_reader.hpp
@@ -35,10 +35,7 @@ public:
     memcpy(p, m_data.get() + static_cast<size_t>(pos) + m_offset, size);
   }
 
-  BufferReader SubReader(uint64_t pos, uint64_t size) const
-  {
-    return BufferReader(*this, pos, size);
-  }
+  BufferReader SubReader(uint64_t pos, uint64_t size) const { return BufferReader(*this, pos, size); }
 
   std::unique_ptr<Reader> CreateSubReader(uint64_t pos, uint64_t size) const
   {
@@ -47,8 +44,7 @@ public:
   }
 
 private:
-  BufferReader(BufferReader const & src, uint64_t pos, uint64_t size)
-    : m_data(src.m_data)
+  BufferReader(BufferReader const & src, uint64_t pos, uint64_t size) : m_data(src.m_data)
   {
     ASSERT_LESS_OR_EQUAL(pos + size, src.Size(), (pos, size));
 
@@ -67,7 +63,7 @@ private:
 
   struct Deleter
   {
-    void operator() (char * p) { delete [] p; }
+    void operator()(char * p) { delete[] p; }
   };
 
   std::shared_ptr<char> m_data;
diff --git a/libs/coding/buffered_file_writer.cpp b/libs/coding/buffered_file_writer.cpp
index fcc6d57c0..1ca8a9a85 100644
--- a/libs/coding/buffered_file_writer.cpp
+++ b/libs/coding/buffered_file_writer.cpp
@@ -4,8 +4,7 @@
 
 #include "base/assert.hpp"
 
-BufferedFileWriter::BufferedFileWriter(std::string const & fileName,
-                                       Op operation /* = OP_WRITE_TRUNCATE */,
+BufferedFileWriter::BufferedFileWriter(std::string const & fileName, Op operation /* = OP_WRITE_TRUNCATE */,
                                        size_t bufferSize /*  = 4096 */)
   : FileWriter(fileName, operation)
 {
diff --git a/libs/coding/buffered_file_writer.hpp b/libs/coding/buffered_file_writer.hpp
index 35a0f7ec1..94b254acc 100644
--- a/libs/coding/buffered_file_writer.hpp
+++ b/libs/coding/buffered_file_writer.hpp
@@ -9,8 +9,7 @@
 class BufferedFileWriter : public FileWriter
 {
 public:
-  explicit BufferedFileWriter(std::string const & fileName, Op operation = OP_WRITE_TRUNCATE,
-                              size_t bufferSize = 4096);
+  explicit BufferedFileWriter(std::string const & fileName, Op operation = OP_WRITE_TRUNCATE, size_t bufferSize = 4096);
 
   ~BufferedFileWriter() noexcept(false) override;
 
diff --git a/libs/coding/byte_stream.hpp b/libs/coding/byte_stream.hpp
index 88b2bb276..f464701a4 100644
--- a/libs/coding/byte_stream.hpp
+++ b/libs/coding/byte_stream.hpp
@@ -9,7 +9,7 @@
 class ArrayByteSource
 {
 public:
-  explicit ArrayByteSource(const void * p) : m_p(static_cast<uint8_t const *>(p)) {}
+  explicit ArrayByteSource(void const * p) : m_p(static_cast<uint8_t const *>(p)) {}
 
   uint8_t ReadByte() { return *m_p++; }
 
@@ -22,22 +22,17 @@ public:
   void const * Ptr() const { return m_p; }
   uint8_t const * PtrUint8() const { return m_p; }
 
-  void Advance(size_t size)
-  {
-    m_p += size;
-  }
+  void Advance(size_t size) { m_p += size; }
 
 private:
   uint8_t const * m_p;
 };
 
-template <class StorageT> class PushBackByteSink
+template <class StorageT>
+class PushBackByteSink
 {
 public:
-  explicit PushBackByteSink(StorageT & storage)
-    : m_Storage(storage)
-  {
-  }
+  explicit PushBackByteSink(StorageT & storage) : m_Storage(storage) {}
 
   void Write(void const * p, size_t size)
   {
@@ -46,10 +41,8 @@ public:
     m_Storage.insert(m_Storage.end(), pp, pp + size);
   }
 
-  size_t Pos() const
-  {
-    return m_Storage.size();
-  }
+  size_t Pos() const { return m_Storage.size(); }
+
 private:
   StorageT & m_Storage;
 };
@@ -60,6 +53,7 @@ public:
   CountingSink() : m_Count(0) {}
   inline void Write(void const *, size_t size) { m_Count += size; }
   inline size_t GetCount() const { return m_Count; }
+
 private:
   size_t m_Count;
 };
diff --git a/libs/coding/coding_tests/base64_test.cpp b/libs/coding/coding_tests/base64_test.cpp
index 04da71677..d44bf51bd 100644
--- a/libs/coding/coding_tests/base64_test.cpp
+++ b/libs/coding/coding_tests/base64_test.cpp
@@ -2,14 +2,13 @@
 
 #include "coding/base64.hpp"
 
-
 using namespace base64;
 
 UNIT_TEST(Base64_Smoke)
 {
   char const * bytes[] = {"H", "He", "Hel", "Hell", "Hello", "Hello,", "Hello, ", "Hello, World!"};
-  char const * encoded[] = {"SA==", "SGU=", "SGVs", "SGVsbA==", "SGVsbG8=", "SGVsbG8s",
-                           "SGVsbG8sIA==", "SGVsbG8sIFdvcmxkIQ=="};
+  char const * encoded[] = {
+      "SA==", "SGU=", "SGVs", "SGVsbA==", "SGVsbG8=", "SGVsbG8s", "SGVsbG8sIA==", "SGVsbG8sIFdvcmxkIQ=="};
 
   TEST_EQUAL(ARRAY_SIZE(bytes), ARRAY_SIZE(encoded), ());
 
@@ -22,7 +21,8 @@ UNIT_TEST(Base64_Smoke)
   }
 
   char const * str = "MapsWithMe is the offline maps application for any device in the world.";
-  char const * encStr = "TWFwc1dpdGhNZSBpcyB0aGUgb2ZmbGluZSBtYXBzIGFwcGxpY2F0aW9uIGZvciBhbnkgZGV2aWNlIGluIHRoZSB3b3JsZC4=";
+  char const * encStr =
+      "TWFwc1dpdGhNZSBpcyB0aGUgb2ZmbGluZSBtYXBzIGFwcGxpY2F0aW9uIGZvciBhbnkgZGV2aWNlIGluIHRoZSB3b3JsZC4=";
   TEST_EQUAL(Encode(str), encStr, ());
   TEST_EQUAL(Decode(encStr), str, ());
 }
diff --git a/libs/coding/coding_tests/bit_streams_test.cpp b/libs/coding/coding_tests/bit_streams_test.cpp
index 1a4add97d..4dca4c88c 100644
--- a/libs/coding/coding_tests/bit_streams_test.cpp
+++ b/libs/coding/coding_tests/bit_streams_test.cpp
@@ -84,12 +84,10 @@ UNIT_TEST(BitStreams_Large)
     BitWriter<TWriter> bits(w);
 
     for (int i = 0; i <= 64; ++i)
-    {
       if (i <= 32)
         bits.WriteAtMost32Bits(static_cast<uint32_t>(kMask), i);
       else
         bits.WriteAtMost64Bits(kMask, i);
-    }
   }
 
   {
diff --git a/libs/coding/coding_tests/compressed_bit_vector_test.cpp b/libs/coding/coding_tests/compressed_bit_vector_test.cpp
index 0b92970da..961c69e63 100644
--- a/libs/coding/coding_tests/compressed_bit_vector_test.cpp
+++ b/libs/coding/coding_tests/compressed_bit_vector_test.cpp
@@ -18,24 +18,21 @@ void Intersect(vector<uint64_t> & setBits1, vector<uint64_t> & setBits2, vector<
 {
   sort(setBits1.begin(), setBits1.end());
   sort(setBits2.begin(), setBits2.end());
-  set_intersection(setBits1.begin(), setBits1.end(), setBits2.begin(), setBits2.end(),
-                   back_inserter(result));
+  set_intersection(setBits1.begin(), setBits1.end(), setBits2.begin(), setBits2.end(), back_inserter(result));
 }
 
 void Subtract(vector<uint64_t> & setBits1, vector<uint64_t> & setBits2, vector<uint64_t> & result)
 {
   sort(setBits1.begin(), setBits1.end());
   sort(setBits2.begin(), setBits2.end());
-  set_difference(setBits1.begin(), setBits1.end(), setBits2.begin(), setBits2.end(),
-                 back_inserter(result));
+  set_difference(setBits1.begin(), setBits1.end(), setBits2.begin(), setBits2.end(), back_inserter(result));
 }
 
 void Union(vector<uint64_t> & setBits1, vector<uint64_t> & setBits2, vector<uint64_t> & result)
 {
   sort(setBits1.begin(), setBits1.end());
   sort(setBits2.begin(), setBits2.end());
-  set_union(setBits1.begin(), setBits1.end(), setBits2.begin(), setBits2.end(),
-            back_inserter(result));
+  set_union(setBits1.begin(), setBits1.end(), setBits2.begin(), setBits2.end(), back_inserter(result));
 }
 
 template <typename TBinaryOp>
@@ -56,14 +53,12 @@ void CheckIntersection(vector<uint64_t> & setBits1, vector<uint64_t> & setBits2,
   CheckBinaryOp(&Intersect, setBits1, setBits2, cbv);
 }
 
-void CheckSubtraction(vector<uint64_t> & setBits1, vector<uint64_t> & setBits2,
-                      coding::CompressedBitVector const & cbv)
+void CheckSubtraction(vector<uint64_t> & setBits1, vector<uint64_t> & setBits2, coding::CompressedBitVector const & cbv)
 {
   CheckBinaryOp(&Subtract, setBits1, setBits2, cbv);
 }
 
-void CheckUnion(vector<uint64_t> & setBits1, vector<uint64_t> & setBits2,
-                coding::CompressedBitVector const & cbv)
+void CheckUnion(vector<uint64_t> & setBits1, vector<uint64_t> & setBits2, coding::CompressedBitVector const & cbv)
 {
   CheckBinaryOp(&Union, setBits1, setBits2, cbv);
 }
@@ -249,8 +244,8 @@ UNIT_TEST(CompressedBitVector_Union_Smoke)
   vector<uint64_t> setBits1 = {};
   vector<uint64_t> setBits2 = {};
 
-  CheckUnion(setBits1, coding::CompressedBitVector::StorageStrategy::Sparse /* strategy1 */,
-             setBits2, coding::CompressedBitVector::StorageStrategy::Sparse /* strategy2 */,
+  CheckUnion(setBits1, coding::CompressedBitVector::StorageStrategy::Sparse /* strategy1 */, setBits2,
+             coding::CompressedBitVector::StorageStrategy::Sparse /* strategy2 */,
              coding::CompressedBitVector::StorageStrategy::Sparse /* resultStrategy */);
 }
 
@@ -259,8 +254,8 @@ UNIT_TEST(CompressedBitVector_Union1)
   vector<uint64_t> setBits1 = {};
   vector<uint64_t> setBits2 = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
 
-  CheckUnion(setBits1, coding::CompressedBitVector::StorageStrategy::Sparse /* strategy1 */,
-             setBits2, coding::CompressedBitVector::StorageStrategy::Dense /* strategy2 */,
+  CheckUnion(setBits1, coding::CompressedBitVector::StorageStrategy::Sparse /* strategy1 */, setBits2,
+             coding::CompressedBitVector::StorageStrategy::Dense /* strategy2 */,
              coding::CompressedBitVector::StorageStrategy::Dense /* resultStrategy */);
 }
 
@@ -269,8 +264,8 @@ UNIT_TEST(CompressedBitVector_Union2)
   vector<uint64_t> setBits1 = {256, 1024};
   vector<uint64_t> setBits2 = {0, 32, 64};
 
-  CheckUnion(setBits1, coding::CompressedBitVector::StorageStrategy::Sparse /* strategy1 */,
-             setBits2, coding::CompressedBitVector::StorageStrategy::Sparse /* strategy2 */,
+  CheckUnion(setBits1, coding::CompressedBitVector::StorageStrategy::Sparse /* strategy1 */, setBits2,
+             coding::CompressedBitVector::StorageStrategy::Sparse /* strategy2 */,
              coding::CompressedBitVector::StorageStrategy::Sparse /* resultStrategy */);
 }
 
@@ -282,8 +277,8 @@ UNIT_TEST(CompressedBitVector_Union3)
   for (int i = 0; i < 256; ++i)
     setBits2.push_back(i);
 
-  CheckUnion(setBits1, coding::CompressedBitVector::StorageStrategy::Dense /* strategy1 */,
-             setBits2, coding::CompressedBitVector::StorageStrategy::Dense /* strategy2 */,
+  CheckUnion(setBits1, coding::CompressedBitVector::StorageStrategy::Dense /* strategy1 */, setBits2,
+             coding::CompressedBitVector::StorageStrategy::Dense /* strategy2 */,
              coding::CompressedBitVector::StorageStrategy::Dense /* resultStrategy */);
 }
 
@@ -295,8 +290,8 @@ UNIT_TEST(CompressedBitVector_Union4)
 
   vector<uint64_t> setBits2 = {1000000000};
 
-  CheckUnion(setBits1, coding::CompressedBitVector::StorageStrategy::Dense /* strategy1 */,
-             setBits2, coding::CompressedBitVector::StorageStrategy::Sparse /* strategy2 */,
+  CheckUnion(setBits1, coding::CompressedBitVector::StorageStrategy::Dense /* strategy1 */, setBits2,
+             coding::CompressedBitVector::StorageStrategy::Sparse /* strategy2 */,
              coding::CompressedBitVector::StorageStrategy::Sparse /* resultStrategy */);
 }
 
@@ -328,10 +323,8 @@ UNIT_TEST(CompressedBitVector_SerializationSparse)
   int const kNumBits = 100;
   vector<uint64_t> setBits;
   for (size_t i = 0; i < kNumBits; ++i)
-  {
     if (i % 10 == 0)
       setBits.push_back(i);
-  }
   vector<uint8_t> buf;
   {
     MemWriter<vector<uint8_t>> writer(buf);
@@ -361,25 +354,20 @@ UNIT_TEST(CompressedBitVector_ForEach)
   }
   auto denseCBV = coding::CompressedBitVectorBuilder::FromBitPositions(denseBits);
   auto sparseCBV = coding::CompressedBitVectorBuilder::FromBitPositions(sparseBits);
-  TEST_EQUAL(coding::CompressedBitVector::StorageStrategy::Dense, denseCBV->GetStorageStrategy(),
-             ());
-  TEST_EQUAL(coding::CompressedBitVector::StorageStrategy::Sparse, sparseCBV->GetStorageStrategy(),
-             ());
+  TEST_EQUAL(coding::CompressedBitVector::StorageStrategy::Dense, denseCBV->GetStorageStrategy(), ());
+  TEST_EQUAL(coding::CompressedBitVector::StorageStrategy::Sparse, sparseCBV->GetStorageStrategy(), ());
 
   set<uint64_t> denseSet;
   uint64_t maxPos = 0;
   coding::CompressedBitVectorEnumerator::ForEach(*denseCBV, [&](uint64_t pos)
-                                                 {
-                                                   denseSet.insert(pos);
-                                                   maxPos = max(maxPos, pos);
-                                                 });
+  {
+    denseSet.insert(pos);
+    maxPos = max(maxPos, pos);
+  });
   TEST_EQUAL(denseSet.size(), kNumBits, ());
   TEST_EQUAL(maxPos, kNumBits - 1, ());
 
-  coding::CompressedBitVectorEnumerator::ForEach(*sparseCBV, [](uint64_t pos)
-                                                 {
-                                                   TEST_EQUAL(pos % 15, 0, ());
-                                                 });
+  coding::CompressedBitVectorEnumerator::ForEach(*sparseCBV, [](uint64_t pos) { TEST_EQUAL(pos % 15, 0, ()); });
 }
 
 UNIT_TEST(CompressedBitVector_DenseOneBit)
@@ -387,10 +375,7 @@ UNIT_TEST(CompressedBitVector_DenseOneBit)
   vector<uint64_t> setBits = {0};
   unique_ptr<coding::DenseCBV> cbv(new coding::DenseCBV(setBits));
   TEST_EQUAL(cbv->PopCount(), 1, ());
-  coding::CompressedBitVectorEnumerator::ForEach(*cbv, [&](uint64_t pos)
-                                                 {
-                                                   TEST_EQUAL(pos, 0, ());
-                                                 });
+  coding::CompressedBitVectorEnumerator::ForEach(*cbv, [&](uint64_t pos) { TEST_EQUAL(pos, 0, ()); });
 }
 
 UNIT_TEST(CompressedBitVector_LeaveFirstNBitsSmoke)
@@ -450,22 +435,18 @@ UNIT_TEST(CompressedBitVector_SparseLeaveFirstNBits)
   cbv = cbv->LeaveFirstSetNBits(100);
   TEST_EQUAL(cbv->PopCount(), 10, ());
   for (uint64_t bit = 0; bit < (1 << 10); ++bit)
-  {
     if (bit != 0 && (bit & (bit - 1)) == 0)
       TEST(cbv->GetBit(bit), (bit));
     else
       TEST(!cbv->GetBit(bit), (bit));
-  }
 
   cbv = cbv->LeaveFirstSetNBits(8);
   TEST_EQUAL(cbv->PopCount(), 8, ());
   for (uint64_t bit = 0; bit < (1 << 10); ++bit)
-  {
     if (bit != 0 && (bit & (bit - 1)) == 0 && bit < (1 << 8))
       TEST(cbv->GetBit(bit), (bit));
     else
       TEST(!cbv->GetBit(bit), (bit));
-  }
 
   cbv = cbv->LeaveFirstSetNBits(0);
   TEST_EQUAL(cbv->PopCount(), 0, ());
diff --git a/libs/coding/coding_tests/csv_reader_test.cpp b/libs/coding/coding_tests/csv_reader_test.cpp
index dd2ad6b8b..152f24820 100644
--- a/libs/coding/coding_tests/csv_reader_test.cpp
+++ b/libs/coding/coding_tests/csv_reader_test.cpp
@@ -144,7 +144,8 @@ UNIT_TEST(CSVReaderForEachRow)
   FileReader fileReader(sf.GetFullPath());
   auto reader = coding::CSVReader(fileReader);
   size_t index = 0;
-  reader.ForEachRow([&](auto const & row) {
+  reader.ForEachRow([&](auto const & row)
+  {
     TEST_EQUAL(row, answer[index], ());
     ++index;
   });
@@ -202,10 +203,12 @@ UNIT_TEST(CSVReaderEmptyColumns)
 
 UNIT_TEST(CSVReaderQuotes)
 {
-  auto const kContentWithQuotes = R"(noquotes, "" , "with space","with, comma","""double"" quotes","""double,"", commas", """""",)";
+  auto const kContentWithQuotes =
+      R"(noquotes, "" , "with space","with, comma","""double"" quotes","""double,"", commas", """""",)";
   auto const fileName = "test.csv";
   ScopedFile sf(fileName, kContentWithQuotes);
-  Rows const answer = {{"noquotes", "", "with space", "with, comma", "\"double\" quotes", "\"double,\", commas","\"\"", ""}};
+  Rows const answer = {
+      {"noquotes", "", "with space", "with, comma", "\"double\" quotes", "\"double,\", commas", "\"\"", ""}};
   coding::CSVReader reader(sf.GetFullPath());
   size_t index = 0;
   while (auto const optionalRow = reader.ReadRow())
diff --git a/libs/coding/coding_tests/diff_test.cpp b/libs/coding/coding_tests/diff_test.cpp
index 5e86ff3f0..ed3878b28 100644
--- a/libs/coding/coding_tests/diff_test.cpp
+++ b/libs/coding/coding_tests/diff_test.cpp
@@ -18,10 +18,10 @@ using namespace std;
 UNIT_TEST(MyersSimpleDiff)
 {
   vector<char> tmp;
-  PushBackByteSink<vector<char> > sink(tmp);
+  PushBackByteSink<vector<char>> sink(tmp);
   TEST_EQUAL(4, diff::DiffMyersSimple(string("axxxb"), string("cxxxd"), 5, sink), ());
-  TEST_EQUAL(5,  diff::DiffMyersSimple(string("abcabba"), string("cbabac"), 10, sink), ());
-  TEST_EQUAL(5,  diff::DiffMyersSimple(string("abcabba"), string("cbabac"), 5, sink), ());
+  TEST_EQUAL(5, diff::DiffMyersSimple(string("abcabba"), string("cbabac"), 10, sink), ());
+  TEST_EQUAL(5, diff::DiffMyersSimple(string("abcabba"), string("cbabac"), 5, sink), ());
   TEST_EQUAL(-1, diff::DiffMyersSimple(string("abcabba"), string("cbabac"), 4, sink), ());
   TEST_EQUAL(-1, diff::DiffMyersSimple(string("abcabba"), string("cbabac"), 2, sink), ());
   TEST_EQUAL(-1, diff::DiffMyersSimple(string("abcabba"), string("cbabac"), 1, sink), ());
@@ -30,21 +30,16 @@ UNIT_TEST(MyersSimpleDiff)
 class TestPatchWriter
 {
 public:
-  template <typename IterT> void WriteData(IterT it, uint64_t n)
+  template <typename IterT>
+  void WriteData(IterT it, uint64_t n)
   {
     for (uint64_t i = 0; i < n; ++i, ++it)
       m_Stream << *it;
   }
 
-  void WriteOperation(uint64_t op)
-  {
-    m_Stream << op << ".";
-  }
+  void WriteOperation(uint64_t op) { m_Stream << op << "."; }
 
-  string Str()
-  {
-    return m_Stream.str();
-  }
+  string Str() { return m_Stream.str(); }
 
 private:
   ostringstream m_Stream;
@@ -113,7 +108,8 @@ public:
       m_Stream << "-" << n << ".";
   }
 
-  template <typename IterT> void Insert(IterT it, size_t n)
+  template <typename IterT>
+  void Insert(IterT it, size_t n)
   {
     if (n == 0)
       return;
@@ -124,6 +120,7 @@ public:
   }
   void Finalize() {}
   string Str() { return m_Stream.str(); }
+
 private:
   ostringstream m_Stream;
 };
@@ -134,8 +131,8 @@ UNIT_TEST(DiffSimpleReplace)
   char const dst[] = "abcyydef";
   MemReader srcReader(src, ARRAY_SIZE(src) - 1);
   MemReader dstReader(dst, ARRAY_SIZE(dst) - 1);
-  DDVector<char, MemReader> srcV(srcReader); // since sizeof(char) == 1
-  DDVector<char, MemReader> dstV(dstReader); // since sizeof(char) == 1
+  DDVector<char, MemReader> srcV(srcReader);  // since sizeof(char) == 1
+  DDVector<char, MemReader> dstV(dstReader);  // since sizeof(char) == 1
 
   diff::SimpleReplaceDiffer differ;
 
@@ -156,8 +153,8 @@ UNIT_TEST(DiffSimpleReplaceEmptyBegin)
   char const dst[] = "yydef";
   MemReader srcReader(src, ARRAY_SIZE(src) - 1);
   MemReader dstReader(dst, ARRAY_SIZE(dst) - 1);
-  DDVector<char, MemReader> srcV(srcReader); // since sizeof(char) == 1
-  DDVector<char, MemReader> dstV(dstReader); // since sizeof(char) == 1
+  DDVector<char, MemReader> srcV(srcReader);  // since sizeof(char) == 1
+  DDVector<char, MemReader> dstV(dstReader);  // since sizeof(char) == 1
 
   diff::SimpleReplaceDiffer differ;
 
@@ -178,8 +175,8 @@ UNIT_TEST(DiffSimpleReplaceEmptyEnd)
   char const dst[] = "abcyy";
   MemReader srcReader(src, ARRAY_SIZE(src) - 1);
   MemReader dstReader(dst, ARRAY_SIZE(dst) - 1);
-  DDVector<char, MemReader> srcV(srcReader); // since sizeof(char) == 1
-  DDVector<char, MemReader> dstV(dstReader); // since sizeof(char) == 1
+  DDVector<char, MemReader> srcV(srcReader);  // since sizeof(char) == 1
+  DDVector<char, MemReader> dstV(dstReader);  // since sizeof(char) == 1
 
   diff::SimpleReplaceDiffer differ;
 
@@ -200,8 +197,8 @@ UNIT_TEST(DiffSimpleReplaceAllEqual)
   char const dst[] = "abcdef";
   MemReader srcReader(src, ARRAY_SIZE(src) - 1);
   MemReader dstReader(dst, ARRAY_SIZE(dst) - 1);
-  DDVector<char, MemReader> srcV(srcReader); // since sizeof(char) == 1
-  DDVector<char, MemReader> dstV(dstReader); // since sizeof(char) == 1
+  DDVector<char, MemReader> srcV(srcReader);  // since sizeof(char) == 1
+  DDVector<char, MemReader> dstV(dstReader);  // since sizeof(char) == 1
 
   diff::SimpleReplaceDiffer differ;
 
@@ -222,8 +219,8 @@ UNIT_TEST(DiffWithRollingHashEqualStrings)
   char const dst[] = "abcdefklmno";
   MemReader srcReader(src, ARRAY_SIZE(src) - 1);
   MemReader dstReader(dst, ARRAY_SIZE(dst) - 1);
-  DDVector<char, MemReader> srcV(srcReader); // since sizeof(char) == 1
-  DDVector<char, MemReader> dstV(dstReader); // since sizeof(char) == 1
+  DDVector<char, MemReader> srcV(srcReader);  // since sizeof(char) == 1
+  DDVector<char, MemReader> dstV(dstReader);  // since sizeof(char) == 1
 
   diff::RollingHashDiffer<diff::SimpleReplaceDiffer, RollingHasher64> differ(3);
 
@@ -238,8 +235,8 @@ UNIT_TEST(DiffWithRollingHashCompletelyDifferentStrings)
   char const dst[] = "abcdefgh";
   MemReader srcReader(src, ARRAY_SIZE(src) - 1);
   MemReader dstReader(dst, ARRAY_SIZE(dst) - 1);
-  DDVector<char, MemReader> srcV(srcReader); // since sizeof(char) == 1
-  DDVector<char, MemReader> dstV(dstReader); // since sizeof(char) == 1
+  DDVector<char, MemReader> srcV(srcReader);  // since sizeof(char) == 1
+  DDVector<char, MemReader> dstV(dstReader);  // since sizeof(char) == 1
 
   diff::RollingHashDiffer<diff::SimpleReplaceDiffer, RollingHasher64> differ(3);
 
@@ -254,8 +251,8 @@ UNIT_TEST(DiffWithRollingHash1)
   char const dst[] = "abcdfeghikkklmnop";
   MemReader srcReader(src, ARRAY_SIZE(src) - 1);
   MemReader dstReader(dst, ARRAY_SIZE(dst) - 1);
-  DDVector<char, MemReader> srcV(srcReader); // since sizeof(char) == 1
-  DDVector<char, MemReader> dstV(dstReader); // since sizeof(char) == 1
+  DDVector<char, MemReader> srcV(srcReader);  // since sizeof(char) == 1
+  DDVector<char, MemReader> dstV(dstReader);  // since sizeof(char) == 1
 
   diff::RollingHashDiffer<diff::SimpleReplaceDiffer, RollingHasher64> differ(3);
 
@@ -270,8 +267,8 @@ UNIT_TEST(DiffWithRollingHash2)
   char const dst[] = "abxdeflmnop";
   MemReader srcReader(src, ARRAY_SIZE(src) - 1);
   MemReader dstReader(dst, ARRAY_SIZE(dst) - 1);
-  DDVector<char, MemReader> srcV(srcReader); // since sizeof(char) == 1
-  DDVector<char, MemReader> dstV(dstReader); // since sizeof(char) == 1
+  DDVector<char, MemReader> srcV(srcReader);  // since sizeof(char) == 1
+  DDVector<char, MemReader> dstV(dstReader);  // since sizeof(char) == 1
 
   diff::RollingHashDiffer<diff::SimpleReplaceDiffer, RollingHasher64> differ(3);
 
diff --git a/libs/coding/coding_tests/elias_coder_test.cpp b/libs/coding/coding_tests/elias_coder_test.cpp
index d60570db4..485f0fe05 100644
--- a/libs/coding/coding_tests/elias_coder_test.cpp
+++ b/libs/coding/coding_tests/elias_coder_test.cpp
@@ -51,6 +51,12 @@ void TestCoder(std::string const & name)
   }
 }
 
-UNIT_TEST(EliasCoder_Gamma) { TestCoder<coding::GammaCoder>("Gamma"); }
-UNIT_TEST(EliasCoder_Delta) { TestCoder<coding::DeltaCoder>("Delta"); }
+UNIT_TEST(EliasCoder_Gamma)
+{
+  TestCoder<coding::GammaCoder>("Gamma");
+}
+UNIT_TEST(EliasCoder_Delta)
+{
+  TestCoder<coding::DeltaCoder>("Delta");
+}
 }  // namespace
diff --git a/libs/coding/coding_tests/endianness_test.cpp b/libs/coding/coding_tests/endianness_test.cpp
index dc529e621..cafe58b66 100644
--- a/libs/coding/coding_tests/endianness_test.cpp
+++ b/libs/coding/coding_tests/endianness_test.cpp
@@ -2,40 +2,39 @@
 
 #include "coding/endianness.hpp"
 
-
 UNIT_TEST(Endianness1Byte)
 {
-  TEST_EQUAL(uint8_t(0),   ReverseByteOrder<uint8_t>(0), ());
-  TEST_EQUAL(uint8_t(17),  ReverseByteOrder<uint8_t>(17), ());
+  TEST_EQUAL(uint8_t(0), ReverseByteOrder<uint8_t>(0), ());
+  TEST_EQUAL(uint8_t(17), ReverseByteOrder<uint8_t>(17), ());
   TEST_EQUAL(uint8_t(255), ReverseByteOrder<uint8_t>(255), ());
 
-  TEST_EQUAL(uint8_t(0),   ReverseByteOrder<uint8_t>(0), ());
-  TEST_EQUAL(uint8_t(17),  ReverseByteOrder<uint8_t>(17), ());
+  TEST_EQUAL(uint8_t(0), ReverseByteOrder<uint8_t>(0), ());
+  TEST_EQUAL(uint8_t(17), ReverseByteOrder<uint8_t>(17), ());
   TEST_EQUAL(uint8_t(255), ReverseByteOrder<uint8_t>(255), ());
 }
 
 UNIT_TEST(Endianness12Bytes)
 {
-  TEST_EQUAL(uint16_t(0),      ReverseByteOrder<uint16_t>(0), ());
-  TEST_EQUAL(uint16_t(256),    ReverseByteOrder<uint16_t>(1), ());
+  TEST_EQUAL(uint16_t(0), ReverseByteOrder<uint16_t>(0), ());
+  TEST_EQUAL(uint16_t(256), ReverseByteOrder<uint16_t>(1), ());
   TEST_EQUAL(uint16_t(0xE8FD), ReverseByteOrder<uint16_t>(0xFDE8), ());
   TEST_EQUAL(uint16_t(0xFFFF), ReverseByteOrder<uint16_t>(0xFFFF), ());
 
-  TEST_EQUAL(uint16_t(0),      ReverseByteOrder<uint16_t>(0), ());
-  TEST_EQUAL(uint16_t(256),    ReverseByteOrder<uint16_t>(1), ());
+  TEST_EQUAL(uint16_t(0), ReverseByteOrder<uint16_t>(0), ());
+  TEST_EQUAL(uint16_t(256), ReverseByteOrder<uint16_t>(1), ());
   TEST_EQUAL(uint16_t(0xE8FD), ReverseByteOrder<uint16_t>(0xFDE8), ());
   TEST_EQUAL(uint16_t(0xFFFF), ReverseByteOrder<uint16_t>(0xFFFF), ());
 }
 
 UNIT_TEST(Endianness18Bytes)
 {
-  TEST_EQUAL(0ULL,                   ReverseByteOrder(0ULL), ());
-  TEST_EQUAL(1ULL,                   ReverseByteOrder(1ULL << 56), ());
-  TEST_EQUAL(0xE2E4D7D5B1C3B8C6ULL,  ReverseByteOrder(0xC6B8C3B1D5D7E4E2ULL), ());
-  TEST_EQUAL(0xFFFFFFFFFFFFFFFFULL,  ReverseByteOrder(0xFFFFFFFFFFFFFFFFULL), ());
+  TEST_EQUAL(0ULL, ReverseByteOrder(0ULL), ());
+  TEST_EQUAL(1ULL, ReverseByteOrder(1ULL << 56), ());
+  TEST_EQUAL(0xE2E4D7D5B1C3B8C6ULL, ReverseByteOrder(0xC6B8C3B1D5D7E4E2ULL), ());
+  TEST_EQUAL(0xFFFFFFFFFFFFFFFFULL, ReverseByteOrder(0xFFFFFFFFFFFFFFFFULL), ());
 
-  TEST_EQUAL(0ULL,                   ReverseByteOrder(0ULL), ());
-  TEST_EQUAL(1ULL,                   ReverseByteOrder(1ULL << 56), ());
-  TEST_EQUAL(0xE2E4D7D5B1C3B8C6ULL,  ReverseByteOrder(0xC6B8C3B1D5D7E4E2ULL), ());
-  TEST_EQUAL(0xFFFFFFFFFFFFFFFFULL,  ReverseByteOrder(0xFFFFFFFFFFFFFFFFULL), ());
+  TEST_EQUAL(0ULL, ReverseByteOrder(0ULL), ());
+  TEST_EQUAL(1ULL, ReverseByteOrder(1ULL << 56), ());
+  TEST_EQUAL(0xE2E4D7D5B1C3B8C6ULL, ReverseByteOrder(0xC6B8C3B1D5D7E4E2ULL), ());
+  TEST_EQUAL(0xFFFFFFFFFFFFFFFFULL, ReverseByteOrder(0xFFFFFFFFFFFFFFFFULL), ());
 }
diff --git a/libs/coding/coding_tests/file_data_test.cpp b/libs/coding/coding_tests/file_data_test.cpp
index 88df521a2..896f6a11f 100644
--- a/libs/coding/coding_tests/file_data_test.cpp
+++ b/libs/coding/coding_tests/file_data_test.cpp
@@ -6,36 +6,35 @@
 #include <fstream>
 #include <string>
 
-
 namespace file_data_test
 {
-  std::string const name1 = "test1.file";
-  std::string const name2 = "test2.file";
+std::string const name1 = "test1.file";
+std::string const name2 = "test2.file";
 
-  void MakeFile(std::string const & name)
-  {
-    base::FileData f(name, base::FileData::Op::WRITE_TRUNCATE);
-    f.Write(name.c_str(), name.size());
-  }
+void MakeFile(std::string const & name)
+{
+  base::FileData f(name, base::FileData::Op::WRITE_TRUNCATE);
+  f.Write(name.c_str(), name.size());
+}
 
-  void MakeFile(std::string const & name, size_t const size, const char c)
-  {
-    base::FileData f(name, base::FileData::Op::WRITE_TRUNCATE);
-    f.Write(std::string(size, c).c_str(), size);
-  }
+void MakeFile(std::string const & name, size_t const size, char const c)
+{
+  base::FileData f(name, base::FileData::Op::WRITE_TRUNCATE);
+  f.Write(std::string(size, c).c_str(), size);
+}
 
 #ifdef OMIM_OS_WINDOWS
-  void CheckFileOK(std::string const & name)
-  {
-    base::FileData f(name, base::FileData::Op::READ);
+void CheckFileOK(std::string const & name)
+{
+  base::FileData f(name, base::FileData::Op::READ);
 
-    uint64_t const size = f.Size();
-    TEST_EQUAL ( size, name.size(), () );
+  uint64_t const size = f.Size();
+  TEST_EQUAL(size, name.size(), ());
 
-    std::vector<char> buffer(size);
-    f.Read(0, &buffer[0], size);
-    TEST ( equal(name.begin(), name.end(), buffer.begin()), () );
-  }
+  std::vector<char> buffer(size);
+  f.Read(0, &buffer[0], size);
+  TEST(equal(name.begin(), name.end(), buffer.begin()), ());
+}
 #endif
 
 UNIT_TEST(FileData_ApiSmoke)
@@ -202,7 +201,7 @@ UNIT_TEST(EmptyFile)
 
   // Do copy.
   TEST(CopyFileX(name, copy), ());
-  //TEST(!RenameFileX(name, copy), ());
+  // TEST(!RenameFileX(name, copy), ());
 
   // Delete copy file and rename name -> copy.
   TEST(DeleteFileX(copy), ());
@@ -252,7 +251,7 @@ UNIT_TEST(File_StdGetLine)
 {
   std::string const fName = "test.txt";
 
-  for (char const * buffer : { "x\nxy\nxyz\nxyzk", "x\nxy\nxyz\nxyzk\n" })
+  for (char const * buffer : {"x\nxy\nxyz\nxyzk", "x\nxy\nxyz\nxyzk\n"})
   {
     {
       base::FileData f(fName, base::FileData::Op::WRITE_TRUNCATE);
@@ -276,4 +275,4 @@ UNIT_TEST(File_StdGetLine)
   }
 }
 
-} // namespace file_data_test
+}  // namespace file_data_test
diff --git a/libs/coding/coding_tests/file_sort_test.cpp b/libs/coding/coding_tests/file_sort_test.cpp
index b019accc8..ee2450635 100644
--- a/libs/coding/coding_tests/file_sort_test.cpp
+++ b/libs/coding/coding_tests/file_sort_test.cpp
@@ -1,8 +1,8 @@
 #include "testing/testing.hpp"
 
 #include "coding/file_sort.hpp"
-#include "coding/write_to_sink.hpp"
 #include "coding/reader.hpp"
+#include "coding/write_to_sink.hpp"
 
 #include <algorithm>
 #include <cstddef>
@@ -14,27 +14,27 @@ using namespace std;
 
 namespace
 {
-  void TestFileSorter(vector<uint32_t> & data, char const * tmpFileName, size_t bufferSize)
-  {
-    vector<char> serial;
-    typedef MemWriter<vector<char> > MemWriterType;
-    MemWriterType writer(serial);
-    typedef WriterFunctor<MemWriterType> OutT;
-    OutT out(writer);
-    FileSorter<uint32_t, OutT> sorter(bufferSize, tmpFileName, out);
-    for (size_t i = 0; i < data.size(); ++i)
-      sorter.Add(data[i]);
-    sorter.SortAndFinish();
+void TestFileSorter(vector<uint32_t> & data, char const * tmpFileName, size_t bufferSize)
+{
+  vector<char> serial;
+  typedef MemWriter<vector<char>> MemWriterType;
+  MemWriterType writer(serial);
+  typedef WriterFunctor<MemWriterType> OutT;
+  OutT out(writer);
+  FileSorter<uint32_t, OutT> sorter(bufferSize, tmpFileName, out);
+  for (size_t i = 0; i < data.size(); ++i)
+    sorter.Add(data[i]);
+  sorter.SortAndFinish();
 
-    TEST_EQUAL(serial.size(), data.size() * sizeof(data[0]), ());
-    sort(data.begin(), data.end());
-    MemReader reader(&serial[0], serial.size());
-    TEST_EQUAL(reader.Size(), data.size() * sizeof(data[0]), ());
-    vector<uint32_t> result(data.size());
-    reader.Read(0, &result[0], reader.Size());
-    TEST_EQUAL(result, data, ());
-  }
+  TEST_EQUAL(serial.size(), data.size() * sizeof(data[0]), ());
+  sort(data.begin(), data.end());
+  MemReader reader(&serial[0], serial.size());
+  TEST_EQUAL(reader.Size(), data.size() * sizeof(data[0]), ());
+  vector<uint32_t> result(data.size());
+  reader.Read(0, &result[0], reader.Size());
+  TEST_EQUAL(result, data, ());
 }
+}  // namespace
 
 UNIT_TEST(FileSorter_Smoke)
 {
diff --git a/libs/coding/coding_tests/files_container_tests.cpp b/libs/coding/coding_tests/files_container_tests.cpp
index 3d694605c..8d81c28cd 100644
--- a/libs/coding/coding_tests/files_container_tests.cpp
+++ b/libs/coding/coding_tests/files_container_tests.cpp
@@ -4,8 +4,8 @@
 #include "coding/varint.hpp"
 
 #include "base/logging.hpp"
-#include "base/string_utils.hpp"
 #include "base/scope_guard.hpp"
+#include "base/string_utils.hpp"
 
 #include "std/target_os.hpp"
 
@@ -56,7 +56,7 @@ UNIT_TEST(FilesContainer_Smoke)
   }
 
   // append to container
-  uint32_t const arrAppend[] = { 888, 777, 666 };
+  uint32_t const arrAppend[] = {888, 777, 666};
   for (size_t i = 0; i < ARRAY_SIZE(arrAppend); ++i)
   {
     {
@@ -82,12 +82,12 @@ UNIT_TEST(FilesContainer_Smoke)
 
 namespace
 {
-  void CheckInvariant(FilesContainerR & reader, string const & tag, int64_t test)
-  {
-    FilesContainerR::TReader r = reader.GetReader(tag);
-    TEST_EQUAL(test, ReadPrimitiveFromPos<int64_t>(r, 0), ());
-  }
+void CheckInvariant(FilesContainerR & reader, string const & tag, int64_t test)
+{
+  FilesContainerR::TReader r = reader.GetReader(tag);
+  TEST_EQUAL(test, ReadPrimitiveFromPos<int64_t>(r, 0), ());
 }
+}  // namespace
 
 UNIT_TEST(FilesContainer_Shared)
 {
@@ -147,43 +147,41 @@ UNIT_TEST(FilesContainer_Shared)
 
 namespace
 {
-  void ReplaceInContainer(string const & fName,
-                          char const * key, char const * value)
+void ReplaceInContainer(string const & fName, char const * key, char const * value)
+{
+  FilesContainerW writer(fName, FileWriter::OP_WRITE_EXISTING);
+  auto w = writer.GetWriter(key);
+  w->Write(value, strlen(value));
+}
+
+void CheckContainer(string const & fName, char const * key[], char const * value[], size_t count)
+{
+  FilesContainerR reader(fName);
+  LOG(LINFO, ("Size=", reader.GetFileSize()));
+
+  for (size_t i = 0; i < count; ++i)
   {
-    FilesContainerW writer(fName, FileWriter::OP_WRITE_EXISTING);
-    auto w = writer.GetWriter(key);
-    w->Write(value, strlen(value));
-  }
+    FilesContainerR::TReader r = reader.GetReader(key[i]);
 
-  void CheckContainer(string const & fName,
-                      char const * key[], char const * value[], size_t count)
-  {
-    FilesContainerR reader(fName);
-    LOG(LINFO, ("Size=", reader.GetFileSize()));
+    size_t const szBuffer = 100;
+    size_t const szS = strlen(value[i]);
 
-    for (size_t i = 0; i < count; ++i)
-    {
-      FilesContainerR::TReader r = reader.GetReader(key[i]);
+    char s[szBuffer] = {0};
+    ASSERT_LESS(szS, szBuffer, ());
+    r.Read(0, s, szS);
 
-      size_t const szBuffer = 100;
-      size_t const szS = strlen(value[i]);
-
-      char s[szBuffer] = { 0 };
-      ASSERT_LESS ( szS, szBuffer, () );
-      r.Read(0, s, szS);
-
-      TEST(strcmp(value[i], s) == 0, (s));
-    }
+    TEST(strcmp(value[i], s) == 0, (s));
   }
 }
+}  // namespace
 
 UNIT_TEST(FilesContainer_RewriteExisting)
 {
   string const fName = "files_container.tmp";
   FileWriter::DeleteFileX(fName);
 
-  char const * key[] = { "3", "2", "1" };
-  char const * value[] = { "prolog", "data", "epilog" };
+  char const * key[] = {"3", "2", "1"};
+  char const * value[] = {"prolog", "data", "epilog"};
 
   // fill container
   {
@@ -199,19 +197,19 @@ UNIT_TEST(FilesContainer_RewriteExisting)
   // re-write middle file in container
   char const * buffer1 = "xxxxxxx";
   ReplaceInContainer(fName, key[1], buffer1);
-  char const * value1[] = { value[0], buffer1, value[2] };
+  char const * value1[] = {value[0], buffer1, value[2]};
   CheckContainer(fName, key, value1, 3);
 
   // re-write end file in container
   char const * buffer2 = "yyyyyyyyyyyyyy";
   ReplaceInContainer(fName, key[2], buffer2);
-  char const * value2[] = { value[0], buffer1, buffer2 };
+  char const * value2[] = {value[0], buffer1, buffer2};
   CheckContainer(fName, key, value2, 3);
 
   // re-write end file in container once again
   char const * buffer3 = "zzz";
   ReplaceInContainer(fName, key[2], buffer3);
-  char const * value3[] = { value[0], buffer1, buffer3 };
+  char const * value3[] = {value[0], buffer1, buffer3};
   CheckContainer(fName, key, value3, 3);
 
   FileWriter::DeleteFileX(fName);
@@ -334,7 +332,7 @@ UNIT_TEST(FilesMappingContainer_MoveHandle)
 UNIT_TEST(FilesMappingContainer_Smoke)
 {
   string const fName = "files_container.tmp";
-  char const * key[] = { "3", "2", "1" };
+  char const * key[] = {"3", "2", "1"};
   uint32_t const count = 1000000;
 
   // fill container
@@ -385,9 +383,9 @@ UNIT_TEST(FilesMappingContainer_PageSize)
 #endif
   LOG(LINFO, ("Page size:", pageSize));
 
-  char const * key[] = { "3", "2", "1" };
-  char const byte[] = { 'a', 'b', 'c', 'd', 'e', 'f', 'g' };
-  size_t count[] = { pageSize-1, pageSize, pageSize+1 };
+  char const * key[] = {"3", "2", "1"};
+  char const byte[] = {'a', 'b', 'c', 'd', 'e', 'f', 'g'};
+  size_t count[] = {pageSize - 1, pageSize, pageSize + 1};
   size_t const sz = ARRAY_SIZE(key);
 
   {
diff --git a/libs/coding/coding_tests/fixed_bits_ddvector_test.cpp b/libs/coding/coding_tests/fixed_bits_ddvector_test.cpp
index 0f464a944..72c7b1c96 100644
--- a/libs/coding/coding_tests/fixed_bits_ddvector_test.cpp
+++ b/libs/coding/coding_tests/fixed_bits_ddvector_test.cpp
@@ -12,7 +12,8 @@ using namespace std;
 
 namespace
 {
-template <size_t Bits> void TestWithData(vector<uint32_t> const & lst)
+template <size_t Bits>
+void TestWithData(vector<uint32_t> const & lst)
 {
   using TVector = FixedBitsDDVector<Bits, MemReader>;
   using TBuffer = vector<uint8_t>;
@@ -50,7 +51,7 @@ template <size_t Bits> void TestWithData(vector<uint32_t> const & lst)
     ++i;
   }
 }
-} // namespace
+}  // namespace
 
 UNIT_TEST(FixedBitsDDVector_Smoke)
 {
diff --git a/libs/coding/coding_tests/geometry_coding_test.cpp b/libs/coding/coding_tests/geometry_coding_test.cpp
index 15968b0a0..a238f7e0a 100644
--- a/libs/coding/coding_tests/geometry_coding_test.cpp
+++ b/libs/coding/coding_tests/geometry_coding_test.cpp
@@ -26,12 +26,17 @@ using PD = m2::PointD;
 
 namespace
 {
-m2::PointU D2U(m2::PointD const & p) { return PointDToPointU(p, kPointCoordBits); }
+m2::PointU D2U(m2::PointD const & p)
+{
+  return PointDToPointU(p, kPointCoordBits);
+}
 
-m2::PointU GetMaxPoint() { return D2U(m2::PointD(mercator::Bounds::kMaxX, mercator::Bounds::kMaxY)); }
+m2::PointU GetMaxPoint()
+{
+  return D2U(m2::PointD(mercator::Bounds::kMaxX, mercator::Bounds::kMaxY));
+}
 
-void TestPolylineEncode(string testName, vector<m2::PointU> const & points,
-                        m2::PointU const & maxPoint,
+void TestPolylineEncode(string testName, vector<m2::PointU> const & points, m2::PointU const & maxPoint,
                         void (*fnEncode)(InPointsT const & points, m2::PointU const & basePoint,
                                          m2::PointU const & maxPoint, OutDeltasT & deltas),
                         void (*fnDecode)(InDeltasT const & deltas, m2::PointU const & basePoint,
@@ -161,9 +166,8 @@ UNIT_TEST(EncodePolyline)
     vector<m2::PointU> points;
     points.reserve(polygonSize);
     for (size_t i = 0; i < polygonSize; ++i)
-      points.push_back(
-          m2::PointU(static_cast<uint32_t>(LargePolygon::kLargePolygon[i].x * 10000),
-                     static_cast<uint32_t>((LargePolygon::kLargePolygon[i].y + 200) * 10000)));
+      points.push_back(m2::PointU(static_cast<uint32_t>(LargePolygon::kLargePolygon[i].x * 10000),
+                                  static_cast<uint32_t>((LargePolygon::kLargePolygon[i].y + 200) * 10000)));
 
     TestEncodePolyline("Unsimp", maxPoint, points);
     TestEncodePolyline("1simp", maxPoint, SimplifyPoints(points, 1));
diff --git a/libs/coding/coding_tests/geometry_serialization_test.cpp b/libs/coding/coding_tests/geometry_serialization_test.cpp
index 2fb98529a..9f3bb3f5d 100644
--- a/libs/coding/coding_tests/geometry_serialization_test.cpp
+++ b/libs/coding/coding_tests/geometry_serialization_test.cpp
@@ -29,8 +29,8 @@ bool IsEqual(m2::PointD const & p1, m2::PointD const & p2)
 
 bool IsEqual(m2::RectD const & r1, m2::RectD const & r2)
 {
-  return (IsEqual(r1.minX(), r2.minX()) && IsEqual(r1.minY(), r2.minY()) &&
-          IsEqual(r1.maxX(), r2.maxX()) && IsEqual(r1.maxY(), r2.maxY()));
+  return (IsEqual(r1.minX(), r2.minX()) && IsEqual(r1.minY(), r2.minY()) && IsEqual(r1.maxX(), r2.maxX()) &&
+          IsEqual(r1.maxY(), r2.maxY()));
 }
 }  // namespace
 
diff --git a/libs/coding/coding_tests/hex_test.cpp b/libs/coding/coding_tests/hex_test.cpp
index 7e5182995..0d52fad35 100644
--- a/libs/coding/coding_tests/hex_test.cpp
+++ b/libs/coding/coding_tests/hex_test.cpp
@@ -32,8 +32,7 @@ UNIT_TEST(RandomRecode)
 
 UNIT_TEST(EncodeNumber)
 {
-  TEST_EQUAL(NumToHex(uint64_t(0x0123456789ABCDEFULL)),
-                                "0123456789ABCDEF", ());
+  TEST_EQUAL(NumToHex(uint64_t(0x0123456789ABCDEFULL)), "0123456789ABCDEF", ());
 }
 
 UNIT_TEST(DecodeLowerCaseHex)
diff --git a/libs/coding/coding_tests/huffman_test.cpp b/libs/coding/coding_tests/huffman_test.cpp
index 4c5d957bb..ba8e1b904 100644
--- a/libs/coding/coding_tests/huffman_test.cpp
+++ b/libs/coding/coding_tests/huffman_test.cpp
@@ -85,8 +85,7 @@ UNIT_TEST(Huffman_Init)
 UNIT_TEST(Huffman_Serialization_Encoding)
 {
   HuffmanCoder hW;
-  hW.Init(MakeUniStringVector(
-      vector<string>{"aaaaaaaaaa", "bbbbbbbbbb", "ccccc", "ddddd"}));  // 10, 10, 5, 5
+  hW.Init(MakeUniStringVector(vector<string>{"aaaaaaaaaa", "bbbbbbbbbb", "ccccc", "ddddd"}));  // 10, 10, 5, 5
   vector<uint8_t> buf;
   MemWriter<vector<uint8_t>> writer(buf);
   hW.WriteEncoding(writer);
@@ -112,8 +111,7 @@ UNIT_TEST(Huffman_Serialization_Encoding)
 UNIT_TEST(Huffman_Serialization_Data)
 {
   HuffmanCoder hW;
-  hW.Init(MakeUniStringVector(
-      vector<string>{"aaaaaaaaaa", "bbbbbbbbbb", "ccccc", "ddddd"}));  // 10, 10, 5, 5
+  hW.Init(MakeUniStringVector(vector<string>{"aaaaaaaaaa", "bbbbbbbbbb", "ccccc", "ddddd"}));  // 10, 10, 5, 5
   vector<uint8_t> buf;
 
   string const data = "abacabaddddaaabbcabacabadbabd";
diff --git a/libs/coding/coding_tests/map_uint32_to_val_tests.cpp b/libs/coding/coding_tests/map_uint32_to_val_tests.cpp
index e4bff15a3..f44008b56 100644
--- a/libs/coding/coding_tests/map_uint32_to_val_tests.cpp
+++ b/libs/coding/coding_tests/map_uint32_to_val_tests.cpp
@@ -86,8 +86,8 @@ UNIT_TEST(MapUint32Val_Smoke)
 
   {
     MemReader reader(buffer.data(), buffer.size());
-    auto table = MapUint32ToValue<uint32_t>::Load(reader, [](NonOwningReaderSource & source, uint32_t blockSize,
-                                                             ValuesT & values)
+    auto table = MapUint32ToValue<uint32_t>::Load(
+        reader, [](NonOwningReaderSource & source, uint32_t blockSize, ValuesT & values)
     {
       values.reserve(blockSize);
       while (source.Size() > 0)
@@ -105,4 +105,4 @@ UNIT_TEST(MapUint32Val_Smoke)
     }
   }
 }
-} // namespace map_uint32_tests
+}  // namespace map_uint32_tests
diff --git a/libs/coding/coding_tests/mem_file_reader_test.cpp b/libs/coding/coding_tests/mem_file_reader_test.cpp
index bef292c1c..96a4271e5 100644
--- a/libs/coding/coding_tests/mem_file_reader_test.cpp
+++ b/libs/coding/coding_tests/mem_file_reader_test.cpp
@@ -1,7 +1,7 @@
 #include "testing/testing.hpp"
 
-#include "coding/reader.hpp"
 #include "base/macros.hpp"
+#include "coding/reader.hpp"
 
 UNIT_TEST(MemReaderSimple)
 {
diff --git a/libs/coding/coding_tests/mem_file_writer_test.cpp b/libs/coding/coding_tests/mem_file_writer_test.cpp
index a233a7098..bf95a86a1 100644
--- a/libs/coding/coding_tests/mem_file_writer_test.cpp
+++ b/libs/coding/coding_tests/mem_file_writer_test.cpp
@@ -1,7 +1,7 @@
 #include "testing/testing.hpp"
 
-#include "coding/writer.hpp"
 #include "coding/file_writer.hpp"
+#include "coding/writer.hpp"
 
 #include "base/macros.hpp"
 
@@ -25,6 +25,6 @@ UNIT_TEST(MemWriterSimple)
   writer.Write("world!", 6);
 
   char const expected[] = "Hello,world!";
-  TEST_EQUAL(data.size(), ARRAY_SIZE(expected)-1, ());
+  TEST_EQUAL(data.size(), ARRAY_SIZE(expected) - 1, ());
   TEST(equal(data.begin(), data.end(), &expected[0]), (data));
 }
diff --git a/libs/coding/coding_tests/png_decoder_test.cpp b/libs/coding/coding_tests/png_decoder_test.cpp
index f01448032..382300ce3 100644
--- a/libs/coding/coding_tests/png_decoder_test.cpp
+++ b/libs/coding/coding_tests/png_decoder_test.cpp
@@ -6,7 +6,8 @@
 
 using namespace std;
 
-void loadFile(vector<unsigned char> & buffer, string const & filename) //designed for loading files from hard disk in an std::vector
+void loadFile(vector<unsigned char> & buffer,
+              string const & filename)  // designed for loading files from hard disk in an std::vector
 {
   ifstream file(filename.c_str(), ios::in | ios::binary | ios::ate);
 
@@ -21,7 +22,7 @@ void loadFile(vector<unsigned char> & buffer, string const & filename) //designe
   if (size > 0)
   {
     buffer.resize((size_t)size);
-    file.read((char*)(&buffer[0]), size);
+    file.read((char *)(&buffer[0]), size);
   }
   else
     buffer.clear();
@@ -29,16 +30,16 @@ void loadFile(vector<unsigned char> & buffer, string const & filename) //designe
 
 UNIT_TEST(PngDecode)
 {
-//  // load and decode
-//  vector<unsigned char> buffer, image;
-//  loadFile(buffer, "../../data/font_0.png");
-//  unsigned long w, h;
-//  int error = DecodePNG(image, w, h, buffer.empty() ? 0 : &buffer[0], (unsigned long)buffer.size());
-//
-//  // if there's an error, display it
-//  TEST_EQUAL(error, 0, ());
-//  // the pixels are now in the vector "image", use it as texture, draw it, ...
-//  TEST_GREATER(image.size(), 4, ("Image is empty???"));
-//  TEST_EQUAL(w, 1024, ());
-//  TEST_EQUAL(h, 1024, ());
+  //  // load and decode
+  //  vector<unsigned char> buffer, image;
+  //  loadFile(buffer, "../../data/font_0.png");
+  //  unsigned long w, h;
+  //  int error = DecodePNG(image, w, h, buffer.empty() ? 0 : &buffer[0], (unsigned long)buffer.size());
+  //
+  //  // if there's an error, display it
+  //  TEST_EQUAL(error, 0, ());
+  //  // the pixels are now in the vector "image", use it as texture, draw it, ...
+  //  TEST_GREATER(image.size(), 4, ("Image is empty???"));
+  //  TEST_EQUAL(w, 1024, ());
+  //  TEST_EQUAL(h, 1024, ());
 }
diff --git a/libs/coding/coding_tests/point_coding_tests.cpp b/libs/coding/coding_tests/point_coding_tests.cpp
index a061367c2..92c15dfd3 100644
--- a/libs/coding/coding_tests/point_coding_tests.cpp
+++ b/libs/coding/coding_tests/point_coding_tests.cpp
@@ -51,9 +51,7 @@ UNIT_TEST(PointDToPointU_Epsilons)
     for (; i < count; ++i)
     {
       m2::PointU p0 = PointDToPointU(arrPt[i].x, arrPt[i].y, kCoordBits);
-      m2::PointU p1 = PointDToPointU(arrPt[i].x + arrD[i].x * eps,
-                                     arrPt[i].y + arrD[i].y * eps,
-                                     kCoordBits);
+      m2::PointU p1 = PointDToPointU(arrPt[i].x + arrD[i].x * eps, arrPt[i].y + arrD[i].y * eps, kCoordBits);
 
       if (p0 != p1)
         break;
@@ -114,8 +112,7 @@ UNIT_TEST(PointToInt64Obsolete_Smoke)
   m2::PointD const arr[] = {{1.25, 1.3}, {180, 90}, {-180, -90}, {0, 0}};
 
   for (size_t i = 0; i < ARRAY_SIZE(arr); ++i)
-    CheckEqualPoints(arr[i],
-                     Int64ToPointObsolete(PointToInt64Obsolete(arr[i], kCoordBits), kCoordBits));
+    CheckEqualPoints(arr[i], Int64ToPointObsolete(PointToInt64Obsolete(arr[i], kCoordBits), kCoordBits));
 }
 
 UNIT_TEST(PointToInt64Obsolete_Grid)
@@ -151,11 +148,9 @@ UNIT_TEST(PointToInt64Obsolete_Bounds)
       for (size_t iY = 0; iY < ARRAY_SIZE(arrEps); ++iY)
       {
         m2::PointD const pt(arrPt[iP].x + arrEps[iX], arrPt[iP].y + arrEps[iY]);
-        m2::PointD const pt1 =
-            Int64ToPointObsolete(PointToInt64Obsolete(pt, kCoordBits), kCoordBits);
+        m2::PointD const pt1 = Int64ToPointObsolete(PointToInt64Obsolete(pt, kCoordBits), kCoordBits);
 
-        TEST(fabs(pt.x - pt1.x) <= (fabs(arrEps[iX]) + kEps) &&
-                 fabs(pt.y - pt1.y) <= (fabs(arrEps[iY]) + kEps),
+        TEST(fabs(pt.x - pt1.x) <= (fabs(arrEps[iX]) + kEps) && fabs(pt.y - pt1.y) <= (fabs(arrEps[iY]) + kEps),
              (pt, pt1));
       }
     }
diff --git a/libs/coding/coding_tests/reader_cache_test.cpp b/libs/coding/coding_tests/reader_cache_test.cpp
index 3c17b890e..e0d445322 100644
--- a/libs/coding/coding_tests/reader_cache_test.cpp
+++ b/libs/coding/coding_tests/reader_cache_test.cpp
@@ -1,7 +1,7 @@
 #include "testing/testing.hpp"
 
-#include "coding/reader_cache.hpp"
 #include "coding/reader.hpp"
+#include "coding/reader_cache.hpp"
 
 #include <algorithm>
 #include <random>
@@ -12,21 +12,22 @@ using namespace std;
 
 namespace
 {
-  template <class ReaderT> class CacheReader
-  {
-  public:
-    CacheReader(ReaderT const & reader, uint32_t logPageSize, uint32_t logPageCount)
-      : m_Reader(reader), m_Cache(logPageSize, logPageCount) {}
+template <class ReaderT>
+class CacheReader
+{
+public:
+  CacheReader(ReaderT const & reader, uint32_t logPageSize, uint32_t logPageCount)
+    : m_Reader(reader)
+    , m_Cache(logPageSize, logPageCount)
+  {}
 
-    void Read(uint64_t pos, void * p, size_t size) const
-    {
-      m_Cache.Read(m_Reader, pos, p, size);
-    }
-  private:
-    ReaderT m_Reader;
-    ReaderCache<ReaderT const> mutable m_Cache;
-  };
-}
+  void Read(uint64_t pos, void * p, size_t size) const { m_Cache.Read(m_Reader, pos, p, size); }
+
+private:
+  ReaderT m_Reader;
+  ReaderCache<ReaderT const> mutable m_Cache;
+};
+}  // namespace
 
 UNIT_TEST(CacheReaderRandomTest)
 {
diff --git a/libs/coding/coding_tests/reader_test.cpp b/libs/coding/coding_tests/reader_test.cpp
index 22a94374b..58e0263be 100644
--- a/libs/coding/coding_tests/reader_test.cpp
+++ b/libs/coding/coding_tests/reader_test.cpp
@@ -2,9 +2,9 @@
 
 #include "coding/coding_tests/reader_test.hpp"
 
+#include "coding/buffer_reader.hpp"
 #include "coding/file_reader.hpp"
 #include "coding/file_writer.hpp"
-#include "coding/buffer_reader.hpp"
 #include "coding/reader_streambuf.hpp"
 
 #include <cstring>
@@ -16,7 +16,7 @@ using namespace std;
 
 namespace
 {
-  string const kData("Quick brown fox jumps over a lazy dog...");
+string const kData("Quick brown fox jumps over a lazy dog...");
 }
 
 UNIT_TEST(MemReaderSmokeTest)
@@ -70,8 +70,7 @@ UNIT_TEST(FileReaderNonExistentFileTest)
     TEST(false, ("Exception should be thrown!"));
   }
   catch (FileReader::OpenException &)
-  {
-  }
+  {}
 }
 
 UNIT_TEST(FileReaderReadAsText)
diff --git a/libs/coding/coding_tests/reader_test.hpp b/libs/coding/coding_tests/reader_test.hpp
index 714996c2e..e471e1eb3 100644
--- a/libs/coding/coding_tests/reader_test.hpp
+++ b/libs/coding/coding_tests/reader_test.hpp
@@ -8,21 +8,21 @@
 
 namespace
 {
-  template <class ReaderT>
-  void ReadToStringFromPos(ReaderT const & reader, std::string & str, uint64_t pos, size_t size)
-  {
-    str.resize(size);
-    reader.Read(pos, &str[0], str.size());
-  }
-
-  template <class SourceT>
-  void ReadToStringFromSource(SourceT & source, std::string & str, size_t size)
-  {
-    str.resize(size);
-    source.Read(&str[0], str.size());
-  }
+template <class ReaderT>
+void ReadToStringFromPos(ReaderT const & reader, std::string & str, uint64_t pos, size_t size)
+{
+  str.resize(size);
+  reader.Read(pos, &str[0], str.size());
 }
 
+template <class SourceT>
+void ReadToStringFromSource(SourceT & source, std::string & str, size_t size)
+{
+  str.resize(size);
+  source.Read(&str[0], str.size());
+}
+}  // namespace
+
 template <typename ReaderT>
 void TestReader(ReaderT const & reader)
 {
@@ -49,4 +49,3 @@ void TestReader(ReaderT const & reader)
   ReadToStringFromSource(subReaderSource, d1, 6);
   TEST_EQUAL(d1, "fox ju", ());
 }
-
diff --git a/libs/coding/coding_tests/reader_writer_ops_test.cpp b/libs/coding/coding_tests/reader_writer_ops_test.cpp
index fd5f06e91..32f99f0b6 100644
--- a/libs/coding/coding_tests/reader_writer_ops_test.cpp
+++ b/libs/coding/coding_tests/reader_writer_ops_test.cpp
@@ -1,10 +1,10 @@
 #include "testing/testing.hpp"
 
-#include "coding/reader_writer_ops.hpp"
+#include "coding/byte_stream.hpp"
 #include "coding/file_reader.hpp"
 #include "coding/file_writer.hpp"
 #include "coding/read_write_utils.hpp"
-#include "coding/byte_stream.hpp"
+#include "coding/reader_writer_ops.hpp"
 
 #include "base/random.hpp"
 
@@ -17,43 +17,43 @@ using namespace std;
 
 namespace
 {
-  void GetReverseForReaderAndTmpFile(Reader const & src, vector<char> & buffer)
+void GetReverseForReaderAndTmpFile(Reader const & src, vector<char> & buffer)
+{
+  char const * tmpFile = "reversed_file.tmp";
+
   {
-    char const * tmpFile = "reversed_file.tmp";
-
-    {
-      FileWriter writer(tmpFile);
-      rw_ops::Reverse(src, writer);
-    }
-
-    {
-      FileReader reader(tmpFile);
-      buffer.clear();
-      MemWriter<vector<char> > writer(buffer);
-      rw_ops::Reverse(reader, writer);
-    }
-
-    FileWriter::DeleteFileX(tmpFile);
+    FileWriter writer(tmpFile);
+    rw_ops::Reverse(src, writer);
   }
 
-  void FillRandFile(string const & fName, size_t count)
   {
-    FileWriter writer(fName);
+    FileReader reader(tmpFile);
+    buffer.clear();
+    MemWriter<vector<char>> writer(buffer);
+    rw_ops::Reverse(reader, writer);
+  }
 
-    base::UniformRandom<int8_t> rand;
+  FileWriter::DeleteFileX(tmpFile);
+}
 
-    while (count-- > 0)
-    {
-      int8_t const c = rand();
-      writer.Write(&c, 1);
-    }
+void FillRandFile(string const & fName, size_t count)
+{
+  FileWriter writer(fName);
+
+  base::UniformRandom<int8_t> rand;
+
+  while (count-- > 0)
+  {
+    int8_t const c = rand();
+    writer.Write(&c, 1);
   }
 }
+}  // namespace
 
 UNIT_TEST(Reverse_Smoke)
 {
   {
-    char arr[] = { 0xA, 0xB, 0xC, 0xD, 0xF };
+    char arr[] = {0xA, 0xB, 0xC, 0xD, 0xF};
     size_t const sz = ARRAY_SIZE(arr);
 
     MemReader reader(&arr[0], sz);
@@ -86,17 +86,17 @@ UNIT_TEST(Reverse_Smoke)
 
 namespace
 {
-  struct ThePOD
-  {
-    uint32_t m_i;
-    double m_d;
-  };
+struct ThePOD
+{
+  uint32_t m_i;
+  double m_d;
+};
 
-  bool operator==(ThePOD const & r1, ThePOD const & r2)
-  {
-    return (r1.m_i == r2.m_i && r1.m_d == r2.m_d);
-  }
+bool operator==(ThePOD const & r1, ThePOD const & r2)
+{
+  return (r1.m_i == r2.m_i && r1.m_d == r2.m_d);
 }
+}  // namespace
 
 UNIT_TEST(ReadWrite_POD)
 {
@@ -111,7 +111,7 @@ UNIT_TEST(ReadWrite_POD)
   }
 
   vector<char> buffer;
-  PushBackByteSink<vector<char> > sink(buffer);
+  PushBackByteSink<vector<char>> sink(buffer);
   rw::WriteVectorOfPOD(sink, src);
 
   buffer_vector<ThePOD, 128> dest;
@@ -123,12 +123,11 @@ UNIT_TEST(ReadWrite_POD)
 
 namespace
 {
-template <class T> void TestIntegral()
+template <class T>
+void TestIntegral()
 {
-  std::vector<T> ethalon{ static_cast<T>(-1), 0, 1,
-                          static_cast<T>(-2), 2,
-                          std::numeric_limits<T>::min(), std::numeric_limits<T>::max()
-  };
+  std::vector<T> ethalon{static_cast<T>(-1),           0, 1, static_cast<T>(-2), 2, std::numeric_limits<T>::min(),
+                         std::numeric_limits<T>::max()};
 
   std::string buffer;
   MemWriter writer(buffer);
@@ -141,7 +140,7 @@ template <class T> void TestIntegral()
 
   TEST_EQUAL(ethalon, expected, ());
 }
-}
+}  // namespace
 
 UNIT_TEST(ReadWrite_Integral)
 {
@@ -151,4 +150,4 @@ UNIT_TEST(ReadWrite_Integral)
   TestIntegral<int64_t>();
 }
 
-} // namespace rw_ops_tests
+}  // namespace rw_ops_tests
diff --git a/libs/coding/coding_tests/serdes_json_test.cpp b/libs/coding/coding_tests/serdes_json_test.cpp
index 1979531ba..9aacf7000 100644
--- a/libs/coding/coding_tests/serdes_json_test.cpp
+++ b/libs/coding/coding_tests/serdes_json_test.cpp
@@ -44,8 +44,7 @@ bool TestSerDes(T const & value)
   }
   catch (base::Json::Exception const & exception)
   {
-    LOG(LWARNING, ("Exception while parsing json string, reason:", exception.what(),
-      "json:", jsonStr));
+    LOG(LWARNING, ("Exception while parsing json string, reason:", exception.what(), "json:", jsonStr));
     return false;
   }
   return deserializedValue == value;
@@ -61,16 +60,11 @@ enum class TestEnum
 
 struct ValueTypes
 {
-  DECLARE_VISITOR(visitor(m_boolValue, "boolValue"),
-                  visitor(m_uint8Value, "uint8Value"),
-                  visitor(m_uint32Value, "uint32Value"),
-                  visitor(m_uint64Value, "uint64Value"),
-                  visitor(m_int8Value, "int8Value"),
-                  visitor(m_int32Value, "int32Value"),
-                  visitor(m_int64Value, "int64Value"),
-                  visitor(m_doubleValue, "doubleValue"),
-                  visitor(m_stringValue, "stringValue"),
-                  visitor(m_enumValue, "enumValue"),
+  DECLARE_VISITOR(visitor(m_boolValue, "boolValue"), visitor(m_uint8Value, "uint8Value"),
+                  visitor(m_uint32Value, "uint32Value"), visitor(m_uint64Value, "uint64Value"),
+                  visitor(m_int8Value, "int8Value"), visitor(m_int32Value, "int32Value"),
+                  visitor(m_int64Value, "int64Value"), visitor(m_doubleValue, "doubleValue"),
+                  visitor(m_stringValue, "stringValue"), visitor(m_enumValue, "enumValue"),
                   visitor(m_timePointValue, "timePointValue"))
 
   ValueTypes() = default;
@@ -90,12 +84,11 @@ struct ValueTypes
 
   bool operator==(ValueTypes const & rhs) const
   {
-    return m_boolValue == rhs.m_boolValue && m_uint8Value == rhs.m_uint8Value &&
-      m_uint32Value == rhs.m_uint32Value && m_uint64Value == rhs.m_uint64Value &&
-      m_int8Value == rhs.m_int8Value && m_int32Value == rhs.m_int32Value &&
-      m_int64Value == rhs.m_int64Value && m_doubleValue == rhs.m_doubleValue &&
-      m_stringValue == rhs.m_stringValue && m_enumValue == rhs.m_enumValue &&
-      m_timePointValue == rhs.m_timePointValue;
+    return m_boolValue == rhs.m_boolValue && m_uint8Value == rhs.m_uint8Value && m_uint32Value == rhs.m_uint32Value &&
+           m_uint64Value == rhs.m_uint64Value && m_int8Value == rhs.m_int8Value && m_int32Value == rhs.m_int32Value &&
+           m_int64Value == rhs.m_int64Value && m_doubleValue == rhs.m_doubleValue &&
+           m_stringValue == rhs.m_stringValue && m_enumValue == rhs.m_enumValue &&
+           m_timePointValue == rhs.m_timePointValue;
   }
 
   bool m_boolValue;
@@ -113,8 +106,7 @@ struct ValueTypes
 
 struct ObjectTypes
 {
-  DECLARE_VISITOR(visitor(m_pointValue, "pointValue"),
-                  visitor(m_latLonValue, "latLonValue"),
+  DECLARE_VISITOR(visitor(m_pointValue, "pointValue"), visitor(m_latLonValue, "latLonValue"),
                   visitor(m_pairValue, "pairValue"))
 
   ObjectTypes() = default;
@@ -126,8 +118,7 @@ struct ObjectTypes
 
   bool operator==(ObjectTypes const & rhs) const
   {
-    return m_pointValue == rhs.m_pointValue && m_latLonValue == rhs.m_latLonValue &&
-      m_pairValue == rhs.m_pairValue;
+    return m_pointValue == rhs.m_pointValue && m_latLonValue == rhs.m_latLonValue && m_pairValue == rhs.m_pairValue;
   }
 
   m2::PointD m_pointValue;
@@ -137,8 +128,7 @@ struct ObjectTypes
 
 struct PointerTypes
 {
-  DECLARE_VISITOR(visitor(m_uniquePtrValue, "uniquePtrValue"),
-                  visitor(m_sharedPtrValue, "sharedPtrValue"))
+  DECLARE_VISITOR(visitor(m_uniquePtrValue, "uniquePtrValue"), visitor(m_sharedPtrValue, "sharedPtrValue"))
 
   PointerTypes() = default;
   PointerTypes(uint32_t testCounter)
@@ -149,8 +139,7 @@ struct PointerTypes
 
   bool operator==(PointerTypes const & rhs) const
   {
-    return SamePtrValue(m_uniquePtrValue, rhs.m_uniquePtrValue) &&
-      SamePtrValue(m_sharedPtrValue, rhs.m_sharedPtrValue);
+    return SamePtrValue(m_uniquePtrValue, rhs.m_uniquePtrValue) && SamePtrValue(m_sharedPtrValue, rhs.m_sharedPtrValue);
   }
 
   unique_ptr<ValueTypes> m_uniquePtrValue;
@@ -159,10 +148,8 @@ struct PointerTypes
 
 struct ArrayTypes
 {
-  DECLARE_VISITOR(visitor(m_arrayValue, "arrayValue"),
-                  visitor(m_dequeValue, "dequeValue"),
-                  visitor(m_vectorValue, "vectorValue"),
-                  visitor(m_mapValue, "mapValue"),
+  DECLARE_VISITOR(visitor(m_arrayValue, "arrayValue"), visitor(m_dequeValue, "dequeValue"),
+                  visitor(m_vectorValue, "vectorValue"), visitor(m_mapValue, "mapValue"),
                   visitor(m_unorderedSetValue, "unorderedSetValue"))
 
   ArrayTypes() = default;
@@ -176,9 +163,8 @@ struct ArrayTypes
 
   bool operator==(ArrayTypes const & rhs) const
   {
-    return m_arrayValue == rhs.m_arrayValue && m_dequeValue == rhs.m_dequeValue &&
-      m_vectorValue == rhs.m_vectorValue && m_mapValue == rhs.m_mapValue &&
-      m_unorderedSetValue == rhs.m_unorderedSetValue;
+    return m_arrayValue == rhs.m_arrayValue && m_dequeValue == rhs.m_dequeValue && m_vectorValue == rhs.m_vectorValue &&
+           m_mapValue == rhs.m_mapValue && m_unorderedSetValue == rhs.m_unorderedSetValue;
   }
 
   array<uint32_t, 3> m_arrayValue;
@@ -233,16 +219,12 @@ UNIT_TEST(SerdesJsonTest)
   {
     struct Hasher
     {
-      size_t operator()(pair<string, string> const & item) const
-      {
-        return m_hasher(item.first + item.second);
-      }
+      size_t operator()(pair<string, string> const & item) const { return m_hasher(item.first + item.second); }
 
       hash<string> m_hasher;
     };
 
-    unordered_set<pair<string, string>, Hasher> testValue = {{"ab", "ab"}, {"ef", "ef"},
-                                                             {"cd", "cd"}};
+    unordered_set<pair<string, string>, Hasher> testValue = {{"ab", "ab"}, {"ef", "ef"}, {"cd", "cd"}};
     TEST(TestSerDes(testValue), ());
   }
 
diff --git a/libs/coding/coding_tests/sha1_test.cpp b/libs/coding/coding_tests/sha1_test.cpp
index edb1306f6..11364ff2d 100644
--- a/libs/coding/coding_tests/sha1_test.cpp
+++ b/libs/coding/coding_tests/sha1_test.cpp
@@ -2,37 +2,43 @@
 
 #include "coding/sha1.hpp"
 
-
 namespace sha1_test
 {
 using namespace coding;
 
 UNIT_TEST(SHA1_Smoke)
 {
-  char const * bytes[] =
-  {
-    "H",
-    "He",
-    "Hel",
-    "Hell",
-    "Hello",
-    "Hello,",
-    "Hello, ",
-    "Hello, World!",
-    "Organic Maps is the ultimate companion app for travellers, tourists, hikers, and cyclists!",
+  char const * bytes[] = {
+      "H",
+      "He",
+      "Hel",
+      "Hell",
+      "Hello",
+      "Hello,",
+      "Hello, ",
+      "Hello, World!",
+      "Organic Maps is the ultimate companion app for travellers, tourists, hikers, and cyclists!",
   };
 
-  SHA1::Hash encoded[] =
-  {
-    {0x7C, 0xF1, 0x84, 0xF4, 0xC6, 0x7A, 0xD5, 0x82, 0x83, 0xEC, 0xB1, 0x93, 0x49, 0x72, 0x0B, 0x0C, 0xAE, 0x75, 0x68, 0x29},
-    {0x53, 0xA4, 0x17, 0x79, 0x6C, 0x77, 0x78, 0x51, 0x00, 0x3B, 0x3F, 0x24, 0x31, 0xE8, 0xEE, 0xF5, 0x62, 0x5E, 0xC1, 0x5B},
-    {0xDB, 0xC2, 0xD1, 0xFE, 0xD0, 0xDC, 0x37, 0xA7, 0x0A, 0xEA, 0x0F, 0x37, 0x69, 0x58, 0xC8, 0x02, 0xED, 0xDC, 0x05, 0x59},
-    {0xED, 0x10, 0xFE, 0x11, 0x3D, 0xE1, 0xC0, 0xBD, 0xAA, 0xAA, 0xF0, 0x9B, 0x88, 0xCD, 0x34, 0x1E, 0xA0, 0xF4, 0x44, 0x28},
-    {0xF7, 0xFF, 0x9E, 0x8B, 0x7B, 0xB2, 0xE0, 0x9B, 0x70, 0x93, 0x5A, 0x5D, 0x78, 0x5E, 0x0C, 0xC5, 0xD9, 0xD0, 0xAB, 0xF0},
-    {0x65, 0x61, 0x1E, 0x95, 0x20, 0xE7, 0x68, 0x14, 0x5D, 0xAD, 0xAA, 0x1D, 0x10, 0x7F, 0xDD, 0x52, 0x07, 0xE6, 0x30, 0x57},
-    {0xF5, 0x2A, 0xB5, 0x7F, 0xA5, 0x1D, 0xFA, 0x71, 0x45, 0x05, 0x29, 0x44, 0x44, 0x46, 0x3A, 0xE5, 0xA0, 0x09, 0xAE, 0x34},
-    {0x0A, 0x0A, 0x9F, 0x2A, 0x67, 0x72, 0x94, 0x25, 0x57, 0xAB, 0x53, 0x55, 0xD7, 0x6A, 0xF4, 0x42, 0xF8, 0xF6, 0x5E, 0x01},
-    {0x48, 0xF5, 0x4D, 0x3D, 0x08, 0xD5, 0xC0, 0x57, 0x6B, 0x3A, 0xC5, 0x3E, 0xEF, 0x22, 0x4A, 0xB8, 0x46, 0x7B, 0xA2, 0xFC},
+  SHA1::Hash encoded[] = {
+      {0x7C, 0xF1, 0x84, 0xF4, 0xC6, 0x7A, 0xD5, 0x82, 0x83, 0xEC,
+       0xB1, 0x93, 0x49, 0x72, 0x0B, 0x0C, 0xAE, 0x75, 0x68, 0x29},
+      {0x53, 0xA4, 0x17, 0x79, 0x6C, 0x77, 0x78, 0x51, 0x00, 0x3B,
+       0x3F, 0x24, 0x31, 0xE8, 0xEE, 0xF5, 0x62, 0x5E, 0xC1, 0x5B},
+      {0xDB, 0xC2, 0xD1, 0xFE, 0xD0, 0xDC, 0x37, 0xA7, 0x0A, 0xEA,
+       0x0F, 0x37, 0x69, 0x58, 0xC8, 0x02, 0xED, 0xDC, 0x05, 0x59},
+      {0xED, 0x10, 0xFE, 0x11, 0x3D, 0xE1, 0xC0, 0xBD, 0xAA, 0xAA,
+       0xF0, 0x9B, 0x88, 0xCD, 0x34, 0x1E, 0xA0, 0xF4, 0x44, 0x28},
+      {0xF7, 0xFF, 0x9E, 0x8B, 0x7B, 0xB2, 0xE0, 0x9B, 0x70, 0x93,
+       0x5A, 0x5D, 0x78, 0x5E, 0x0C, 0xC5, 0xD9, 0xD0, 0xAB, 0xF0},
+      {0x65, 0x61, 0x1E, 0x95, 0x20, 0xE7, 0x68, 0x14, 0x5D, 0xAD,
+       0xAA, 0x1D, 0x10, 0x7F, 0xDD, 0x52, 0x07, 0xE6, 0x30, 0x57},
+      {0xF5, 0x2A, 0xB5, 0x7F, 0xA5, 0x1D, 0xFA, 0x71, 0x45, 0x05,
+       0x29, 0x44, 0x44, 0x46, 0x3A, 0xE5, 0xA0, 0x09, 0xAE, 0x34},
+      {0x0A, 0x0A, 0x9F, 0x2A, 0x67, 0x72, 0x94, 0x25, 0x57, 0xAB,
+       0x53, 0x55, 0xD7, 0x6A, 0xF4, 0x42, 0xF8, 0xF6, 0x5E, 0x01},
+      {0x48, 0xF5, 0x4D, 0x3D, 0x08, 0xD5, 0xC0, 0x57, 0x6B, 0x3A,
+       0xC5, 0x3E, 0xEF, 0x22, 0x4A, 0xB8, 0x46, 0x7B, 0xA2, 0xFC},
   };
 
   static_assert(std::size(bytes) == std::size(encoded));
@@ -40,4 +46,4 @@ UNIT_TEST(SHA1_Smoke)
   for (size_t i = 0; i < std::size(bytes); ++i)
     TEST_EQUAL(SHA1::CalculateForString(bytes[i]), encoded[i], ());
 }
-}
+}  // namespace sha1_test
diff --git a/libs/coding/coding_tests/simple_dense_coding_test.cpp b/libs/coding/coding_tests/simple_dense_coding_test.cpp
index 0bd1ddd07..a34985402 100644
--- a/libs/coding/coding_tests/simple_dense_coding_test.cpp
+++ b/libs/coding/coding_tests/simple_dense_coding_test.cpp
@@ -86,4 +86,4 @@ UNIT_TEST(SimpleDenseCoding_Ratio)
     TEST_GREATER(ratio, 1.8, ());
   }
 }
-} // namespace simple_dense_coding_test
+}  // namespace simple_dense_coding_test
diff --git a/libs/coding/coding_tests/sparse_vector_tests.cpp b/libs/coding/coding_tests/sparse_vector_tests.cpp
index d322647b2..448da0883 100644
--- a/libs/coding/coding_tests/sparse_vector_tests.cpp
+++ b/libs/coding/coding_tests/sparse_vector_tests.cpp
@@ -4,17 +4,15 @@
 
 UNIT_TEST(SparseVector_Smoke)
 {
-  uint32_t const arr[] = { 0, 0, 5, 0, 7, 1000, 0, 0, 1, 0 };
+  uint32_t const arr[] = {0, 0, 5, 0, 7, 1000, 0, 0, 1, 0};
   uint64_t const count = std::size(arr);
 
   coding::SparseVectorBuilder<uint32_t> builder(count);
   for (uint32_t v : arr)
-  {
     if (v == 0)
       builder.PushEmpty();
     else
       builder.PushValue(v);
-  }
 
   auto vec = builder.Build();
 
diff --git a/libs/coding/coding_tests/string_utf8_multilang_tests.cpp b/libs/coding/coding_tests/string_utf8_multilang_tests.cpp
index 12d1945a9..cb422360c 100644
--- a/libs/coding/coding_tests/string_utf8_multilang_tests.cpp
+++ b/libs/coding/coding_tests/string_utf8_multilang_tests.cpp
@@ -123,14 +123,12 @@ UNIT_TEST(MultilangString_Unique)
 UNIT_TEST(MultilangString_LangNames)
 {
   // It is important to compare the contents of the strings, and not just pointers
-  TEST_EQUAL(string("Беларуская"),
-             StringUtf8Multilang::GetLangNameByCode(StringUtf8Multilang::GetLangIndex("be")), ());
+  TEST_EQUAL(string("Беларуская"), StringUtf8Multilang::GetLangNameByCode(StringUtf8Multilang::GetLangIndex("be")), ());
 
   auto const & langs = StringUtf8Multilang::GetSupportedLanguages();
   // Using size_t workaround, because our logging/testing macroses do not support passing POD types
   // by value, only by reference. And our constant is a constexpr.
-  TEST_LESS_OR_EQUAL(langs.size(), static_cast<size_t>(StringUtf8Multilang::kMaxSupportedLanguages),
-                     ());
+  TEST_LESS_OR_EQUAL(langs.size(), static_cast<size_t>(StringUtf8Multilang::kMaxSupportedLanguages), ());
   auto const international = StringUtf8Multilang::GetLangIndex("int_name");
   TEST_EQUAL(langs[international].m_code, string("int_name"), ());
 }
@@ -201,8 +199,8 @@ UNIT_TEST(MultilangString_ForEachLanguage)
 
 UNIT_TEST(MultilangString_RemoveString)
 {
-  auto testRemove = [](vector<pair<uint8_t, string>> const & strings,
-                       set<uint8_t> const & codesToRemove) {
+  auto testRemove = [](vector<pair<uint8_t, string>> const & strings, set<uint8_t> const & codesToRemove)
+  {
     StringUtf8Multilang str;
     for (auto const & s : strings)
       str.AddString(s.first, s.second);
@@ -233,21 +231,15 @@ UNIT_TEST(MultilangString_RemoveString)
     }
 
     // No extra languages or other data damage.
-    str.ForEach([&](uint8_t lang, auto const &) {
-      TEST(base::FindIf(strings, [&lang](auto const & s) { return s.first == lang; }) !=
-               strings.end(),
-           ());
+    str.ForEach([&](uint8_t lang, auto const &)
+    {
+      TEST(base::FindIf(strings, [&lang](auto const & s) { return s.first == lang; }) != strings.end(), ());
       TEST(codesToRemove.find(lang) == codesToRemove.end(), ());
     });
   };
 
-  vector<pair<uint8_t, string>> strings = {{0, "aaa"},
-                                           {1, "bbb"},
-                                           {2, "ccc"},
-                                           {9, "ddd"},
-                                           {17, "eee"},
-                                           {27, "fff"},
-                                           {37, "ggg"}};
+  vector<pair<uint8_t, string>> strings = {{0, "aaa"},  {1, "bbb"},  {2, "ccc"}, {9, "ddd"},
+                                           {17, "eee"}, {27, "fff"}, {37, "ggg"}};
 
   testRemove(strings, {0});
   testRemove(strings, {1});
diff --git a/libs/coding/coding_tests/succinct_ef_test.cpp b/libs/coding/coding_tests/succinct_ef_test.cpp
index cde4833a6..bf945d1ed 100644
--- a/libs/coding/coding_tests/succinct_ef_test.cpp
+++ b/libs/coding/coding_tests/succinct_ef_test.cpp
@@ -12,7 +12,8 @@ namespace succinct_ef_test
 {
 using namespace std;
 
-template <class T> vector<T> GetUniformValues(size_t count)
+template <class T>
+vector<T> GetUniformValues(size_t count)
 {
   // Use max - 1 because succinct makes val + 1 encoding internals.
   uniform_int_distribution<T> randDist(0, numeric_limits<T>::max() - 1);
@@ -25,7 +26,8 @@ template <class T> vector<T> GetUniformValues(size_t count)
   return data;
 }
 
-template <class T> vector<T> GetNormalValues(size_t count, T mean)
+template <class T>
+vector<T> GetNormalValues(size_t count, T mean)
 {
   normal_distribution<> randDist(mean, 2);
   random_device randDevice;
@@ -46,7 +48,8 @@ template <class T> vector<T> GetNormalValues(size_t count, T mean)
   return data;
 }
 
-template <class T> double GetCompressionRatio(vector<T> const & data)
+template <class T>
+double GetCompressionRatio(vector<T> const & data)
 {
   succinct::elias_fano_compressed_list efList(data);
 
@@ -84,4 +87,4 @@ UNIT_TEST(SuccinctEFList_Ratio)
   }
 }
 
-} // namespace succinct_ef_test
+}  // namespace succinct_ef_test
diff --git a/libs/coding/coding_tests/test_polylines.cpp b/libs/coding/coding_tests/test_polylines.cpp
index fd15cd28e..19aebfdbf 100644
--- a/libs/coding/coding_tests/test_polylines.cpp
+++ b/libs/coding/coding_tests/test_polylines.cpp
@@ -2,380 +2,192 @@
 
 namespace geometry_coding_tests
 {
-P arr1[376] = {P(25.624035299999999182, 72.26346513007850092),
-               P(25.624273200000001083, 72.263461698303601111),
-               P(25.624488899999999347, 72.26341365347376211),
-               P(25.624979400000000851, 72.263304218156179104),
-               P(25.626030799999998777, 72.263025101705878228),
-               P(25.629390999999998257, 72.261676817778678128),
-               P(25.630162399999999678, 72.26138836631159279),
-               P(25.631299500000000791, 72.260963603282490908),
-               P(25.63236829999999955, 72.26051310574631259),
-               P(25.63325580000000059, 72.260190152533994024),
-               P(25.633720499999999021, 72.260019906865807116),
-               P(25.634314799999998513, 72.259865485075735592),
-               P(25.634578999999998672, 72.259830215951140531),
-               P(25.635424199999999217, 72.259772832171691448),
-               P(25.635776400000001018, 72.259834791404088605),
-               P(25.638406499999998545, 72.260604806439260983),
-               P(25.639231599999998679, 72.260931765228107793),
-               P(25.639867699999999928, 72.261237563690428942),
-               P(25.640699399999999031, 72.261850499331046649),
-               P(25.643624299999999039, 72.264447578158552687),
-               P(25.644772700000000754, 72.265904403664706024),
-               P(25.645413800000000037, 72.267106341816230497),
-               P(25.646751600000001758, 72.270404536824941033),
-               P(25.64890219999999843, 72.275985791150915816),
-               P(25.649064599999999103, 72.276404165523842948),
-               P(25.650549500000000336, 72.279974564589863917),
-               P(25.651433600000000723, 72.281545386607334081),
-               P(25.652029899999998719, 72.282193025251160634),
-               P(25.652814700000000414, 72.282915237415323872),
-               P(25.654197199999998702, 72.283799562153532747),
-               P(25.656540400000000801, 72.285055792411071707),
-               P(25.658162999999998277, 72.286263412818769325),
-               P(25.661959599999999426, 72.289916920742129491),
-               P(25.663380199999998865, 72.291039561736027963),
-               P(25.665810499999999195, 72.292780588759853799),
-               P(25.6700361000000008, 72.29585629709197292),
-               P(25.670962599999999298, 72.296655718166547899),
-               P(25.672222699999998952, 72.297961211704517837),
-               P(25.673103499999999855, 72.29896171301187735),
-               P(25.674837499999998869, 72.300952077677095531),
-               P(25.676358000000000459, 72.302732468128681376),
-               P(25.678018200000000348, 72.304444228347662715),
-               P(25.680309600000001069, 72.306619426588397914),
-               P(25.682252600000001763, 72.308208994982337003),
-               P(25.685880300000000886, 72.310749482551628375),
-               P(25.6871223999999998, 72.311619291531712861),
-               P(25.689502399999998516, 72.313337574126506979),
-               P(25.689994200000001001, 72.313685586072296019),
-               P(25.691337099999998372, 72.314639003020189989),
-               P(25.694014100000000411, 72.316465930359882464),
-               P(25.696650399999999337, 72.318133963117716689),
-               P(25.697924300000000386, 72.31863598381848135),
-               P(25.699229800000001234, 72.31891418618496914),
-               P(25.700213699999999051, 72.319045273707061483),
-               P(25.703616300000000194, 72.319271576784373678),
-               P(25.707311499999999427, 72.319273484907995453),
-               P(25.715181600000001083, 72.318046763400587906),
-               P(25.72608460000000008, 72.315978426880036523),
-               P(25.728649600000000675, 72.31539857900408208),
-               P(25.730824299999998317, 72.315156452495600092),
-               P(25.732753200000001215, 72.314945427265811873),
-               P(25.736661200000000349, 72.315042353781024076),
-               P(25.74480259999999987, 72.315568583243575063),
-               P(25.747831600000001373, 72.315649864883624787),
-               P(25.749809599999998966, 72.315866807206518274),
-               P(25.752535200000000515, 72.316023647210727177),
-               P(25.755610000000000781, 72.315910501039496694),
-               P(25.760463999999998919, 72.315272459413776573),
-               P(25.762314700000001011, 72.315021747344800929),
-               P(25.763456399999999036, 72.314812630534717641),
-               P(25.763716200000001066, 72.31478954377344337),
-               P(25.771413500000001306, 72.314102668549878672),
-               P(25.779617200000000565, 72.313375160856324442),
-               P(25.784148800000000534, 72.313357035273327256),
-               P(25.790238899999998523, 72.313577786126856495),
-               P(25.793676300000001334, 72.313716876708198811),
-               P(25.796280599999999339, 72.314048100429985766),
-               P(25.798680499999999682, 72.31463614103191162),
-               P(25.800190700000001698, 72.315239260045032665),
-               P(25.803071100000000371, 72.316310615756250968),
-               P(25.806439499999999754, 72.316835901112042961),
-               P(25.809219599999998707, 72.316657116642062419),
-               P(25.813906700000000427, 72.315918133153061831),
-               P(25.817769800000000657, 72.31543750249576874),
-               P(25.819804099999998925, 72.315482531661231747),
-               P(25.823219200000000484, 72.315995217547779816),
-               P(25.824360999999999677, 72.316092908788874638),
-               P(25.825752500000000111, 72.316000750836963107),
-               P(25.833053499999998337, 72.315183355397863352),
-               P(25.835087900000001326, 72.314863574077250519),
-               P(25.836477299999998536, 72.314986830897922232),
-               P(25.838510800000001666, 72.315843910886087542),
-               P(25.84021669999999915, 72.316586137240363996),
-               P(25.845591399999999993, 72.318366369042564656),
-               P(25.847287900000001315, 72.318912278071522337),
-               P(25.852937300000000675, 72.321233538069833457),
-               P(25.857534099999998745, 72.324114950429262194),
-               P(25.858493899999999144, 72.324638770105451613),
-               P(25.859516599999999187, 72.325101910243901671),
-               P(25.860960299999998568, 72.325309341574609334),
-               P(25.864481800000000078, 72.325170990340012622),
-               P(25.866295099999998541, 72.325066225249685203),
-               P(25.871619400000000155, 72.324758609934391984),
-               P(25.873917800000000966, 72.324524655307570242),
-               P(25.875719000000000136, 72.324229064532204347),
-               P(25.882352300000000866, 72.322516991669758113),
-               P(25.886094899999999797, 72.321551632301222412),
-               P(25.891463999999999146, 72.320154280548763381),
-               P(25.892594599999998906, 72.32000410941930113),
-               P(25.893775399999999109, 72.320041127430243932),
-               P(25.895055100000000436, 72.320205228136387632),
-               P(25.901716900000000265, 72.321479884460799781),
-               P(25.905201399999999268, 72.322148897878847151),
-               P(25.906758400000001075, 72.322300409542663147),
-               P(25.908453200000000294, 72.322276366107203671),
-               P(25.910453700000001476, 72.322039939449879853),
-               P(25.912611200000000622, 72.321379323121732341),
-               P(25.914446699999999169, 72.320507670602822259),
-               P(25.915890699999998503, 72.319578403757603269),
-               P(25.916971199999998987, 72.318721085380474278),
-               P(25.923277999999999821, 72.312682767056259081),
-               P(25.924315100000001166, 72.311643903530907096),
-               P(25.925479700000000349, 72.310661910829537646),
-               P(25.926380200000000542, 72.31012846985993292),
-               P(25.927288000000000778, 72.309673827336439444),
-               P(25.929170299999999116, 72.308742039167825055),
-               P(25.931695000000001272, 72.307558244187632113),
-               P(25.935542200000000435, 72.305689970006980616),
-               P(25.936291600000000557, 72.305420216334297834),
-               P(25.937011699999999337, 72.3052109385934898),
-               P(25.937444899999999137, 72.305171830245583919),
-               P(25.938065999999999178, 72.305126426436075349),
-               P(25.939194700000001603, 72.305346959512363014),
-               P(25.941637199999998842, 72.306187700803491225),
-               P(25.951531899999999098, 72.309363611414866568),
-               P(25.958591599999998323, 72.311600021678131611),
-               P(25.961859900000000323, 72.312588133461261464),
-               P(25.9623209000000017, 72.312845323461488078),
-               P(25.962808800000001241, 72.313126745396871797),
-               P(25.963783500000001681, 72.313929806056449934),
-               P(25.964454100000001091, 72.315054565005411291),
-               P(25.966293799999998981, 72.319575350745964215),
-               P(25.966609900000001687, 72.320173934482440359),
-               P(25.966938999999999993, 72.320628647970096381),
-               P(25.968776200000000642, 72.322731857094510133),
-               P(25.969766299999999859, 72.323772036806516894),
-               P(25.97039970000000153, 72.324406914991570261),
-               P(25.971057800000000526, 72.324904784282267656),
-               P(25.972805199999999815, 72.325716763759459127),
-               P(25.973508700000000005, 72.326106631888762877),
-               P(25.974174900000001287, 72.326699167072590058),
-               P(25.974623600000001034, 72.327462886785923502),
-               P(25.97499170000000035, 72.32822527930542833),
-               P(25.975826399999998984, 72.329784823533856297),
-               P(25.976481499999998448, 72.330935420885211329),
-               P(25.977230399999999833, 72.332212952428704966),
-               P(25.978115400000000079, 72.333512265445278899),
-               P(25.9789551000000003, 72.33474671239962106),
-               P(25.980276700000001, 72.336402410819303554),
-               P(25.98169719999999927, 72.337880836033434662),
-               P(25.983172299999999666, 72.33911288186702393),
-               P(25.984414600000000917, 72.340068567971513858),
-               P(25.985398499999998734, 72.340636603533639004),
-               P(25.986058100000001048, 72.340908025445514795),
-               P(25.987230000000000274, 72.341316496490946975),
-               P(25.988157300000001015, 72.341676869267246275),
-               P(25.991148400000000152, 72.342299318530393748),
-               P(25.997876999999999015, 72.343701138883602653),
-               P(25.999752600000000768, 72.344154484369809666),
-               P(26.001479700000000861, 72.344723890629211382),
-               P(26.003023999999999916, 72.345420432028205937),
-               P(26.005314899999998346, 72.346859159309715892),
-               P(26.007066099999999409, 72.348322733682408625),
-               P(26.008686999999998335, 72.35014618535842601),
-               P(26.012360000000001037, 72.354910262506038521),
-               P(26.013286199999999582, 72.355943685106993257),
-               P(26.013858500000001328, 72.35652369166834319),
-               P(26.014633599999999802, 72.357135968669368253),
-               P(26.015746700000001113, 72.357673410043958029),
-               P(26.017126499999999822, 72.358212001250265644),
-               P(26.020520199999999988, 72.359278695677289761),
-               P(26.021437599999998724, 72.359644892510004865),
-               P(26.022532699999999295, 72.360275718006846546),
-               P(26.028545999999998628, 72.365263533617877556),
-               P(26.029226600000001213, 72.365797602942478761),
-               P(26.030111600000001459, 72.366317546512846093),
-               P(26.032004199999999372, 72.367306080501194288),
-               P(26.033209299999999331, 72.367834246590078351),
-               P(26.034265699999998844, 72.368067397148493569),
-               P(26.035592099999998794, 72.368224167962054594),
-               P(26.03677019999999942, 72.368129074294643033),
-               P(26.043432299999999202, 72.366408627750374194),
-               P(26.045431499999999403, 72.365842856777021552),
-               P(26.048415399999999664, 72.36504242213915461),
-               P(26.052753299999999115, 72.363920454888528866),
-               P(26.05556269999999941, 72.363008918012667436),
-               P(26.060303699999998628, 72.360393712052541559),
-               P(26.065962500000001256, 72.35698705139280662),
-               P(26.067612400000001571, 72.356026924714299753),
-               P(26.069255399999999412, 72.355021374242639354),
-               P(26.070335599999999943, 72.354163985856629893),
-               P(26.071483900000000489, 72.353231772141796796),
-               P(26.073087300000000965, 72.351530224288538307),
-               P(26.07495580000000146, 72.349052146600300262),
-               P(26.077375199999998756, 72.345412414793742073),
-               P(26.079008800000000434, 72.34322240936705839),
-               P(26.080636800000000619, 72.341554327036718064),
-               P(26.081818800000000635, 72.340620379333103074),
-               P(26.083176200000000478, 72.339615440891947173),
-               P(26.085581000000001239, 72.338285853103528211),
-               P(26.092078799999999461, 72.335142167729841844),
-               P(26.099516500000000008, 72.332061609286498083),
-               P(26.102282500000001164, 72.330882175026999903),
-               P(26.105014700000001682, 72.329521843521945357),
-               P(26.108211900000000583, 72.327720133658942814),
-               P(26.116759299999998234, 72.322424061632020198),
-               P(26.118289900000000614, 72.321345929920937579),
-               P(26.124188000000000187, 72.316306990481081129),
-               P(26.126093300000000852, 72.314456217615472156),
-               P(26.13131840000000139, 72.308768748722727082),
-               P(26.133807300000000851, 72.305896196846916268),
-               P(26.135103199999999646, 72.304208818196542552),
-               P(26.13615610000000089, 72.3027141546473473),
-               P(26.136958199999998698, 72.301545345164157652),
-               P(26.137658200000000619, 72.300474224549915903),
-               P(26.140487000000000251, 72.29551524417688313),
-               P(26.146685800000000199, 72.285760107870132174),
-               P(26.151274499999999534, 72.277504651282583836),
-               P(26.151979099999998368, 72.276113553331668982),
-               P(26.152562700000000717, 72.274582520714972134),
-               P(26.152978600000000853, 72.272986691312326002),
-               P(26.154697899999998612, 72.264608683472175699),
-               P(26.155105599999998844, 72.263003939235275652),
-               P(26.155811400000001044, 72.261258344309723611),
-               P(26.156706599999999696, 72.259655777039213831),
-               P(26.158511799999999425, 72.257073180827120495),
-               P(26.163497199999998344, 72.251147710512896083),
-               P(26.164152500000000146, 72.250452144382251163),
-               P(26.165397099999999853, 72.249370018656591697),
-               P(26.171159400000000517, 72.245101348184562084),
-               P(26.171824600000000771, 72.244502288299599968),
-               P(26.172791700000001214, 72.243464858038208831),
-               P(26.173422299999998586, 72.24251111483852128),
-               P(26.174280599999999453, 72.240982180618559028),
-               P(26.174924399999998315, 72.239409446329290176),
-               P(26.175138900000000319, 72.238550480576279256),
-               P(26.177894599999998348, 72.222417606854094174),
-               P(26.178249600000000896, 72.220799387733251251),
-               P(26.178700899999999052, 72.219414415122045625),
-               P(26.179689899999999625, 72.217234222262234766),
-               P(26.182073200000001378, 72.213506738076645775),
-               P(26.18310470000000123, 72.211533626956168064),
-               P(26.183614800000000855, 72.210338776927230242),
-               P(26.18428000000000111, 72.208417574177602205),
-               P(26.185804499999999706, 72.203266316303412964),
-               P(26.186153000000000901, 72.202346286216979365),
-               P(26.186549599999999316, 72.201465316811109574),
-               P(26.187059699999998941, 72.200685882789031211),
-               P(26.187643699999998859, 72.200064170625580573),
-               P(26.188815999999999207, 72.199110470754774838),
-               P(26.189986799999999789, 72.198491439723213148),
-               P(26.190943999999998226, 72.198205925482497491),
-               P(26.192045499999998981, 72.198064597333782899),
-               P(26.201502200000000187, 72.19749033573828001),
-               P(26.204289599999999183, 72.197194731015855496),
-               P(26.212046699999998367, 72.196023752898682346),
-               P(26.217400099999998986, 72.195033541852339454),
-               P(26.220660899999998605, 72.194099530393685882),
-               P(26.223864100000000121, 72.193042117073559893),
-               P(26.227025699999998665, 72.192404096537160285),
-               P(26.229406099999998503, 72.192154413131575552),
-               P(26.23379059999999896, 72.191934250652863625),
-               P(26.241092200000000645, 72.191652763688111349),
-               P(26.247795599999999894, 72.191305763109099303),
-               P(26.259740499999999486, 72.190710990755292187),
-               P(26.262441899999998896, 72.190662426481935654),
-               P(26.26396259999999927, 72.190803739092231694),
-               P(26.265582200000000768, 72.19108065172507338),
-               P(26.271514700000000886, 72.192273445913514252),
-               P(26.275603900000000124, 72.192994312937273094),
-               P(26.278289999999998372, 72.193506828374651718),
-               P(26.280647800000000558, 72.193799369593079973),
-               P(26.284991699999999071, 72.194193426147350579),
-               P(26.295021899999998283, 72.194996021158502231),
-               P(26.296629599999999272, 72.195353135208762296),
-               P(26.298219400000000689, 72.195936520796209379),
-               P(26.299353599999999886, 72.196573622487093758),
-               P(26.300700500000001369, 72.19746290844136638),
-               P(26.301440499999998224, 72.198127833072547332),
-               P(26.302059899999999715, 72.198747051231549676),
-               P(26.302597999999999701, 72.199118470577644757),
-               P(26.30326700000000173, 72.200164931796578571),
-               P(26.304018299999999186, 72.201524555689601925),
-               P(26.305375600000001413, 72.20513574950004454),
-               P(26.306215500000000418, 72.206942181028665573),
-               P(26.307179600000001329, 72.208595118825385839),
-               P(26.307805599999998236, 72.209443034325843769),
-               P(26.308593200000000678, 72.210334966852684602),
-               P(26.309511400000001657, 72.211171854914510959),
-               P(26.310345000000001647, 72.211829485157878139),
-               P(26.313103999999999161, 72.213550746524816759),
-               P(26.313808999999999116, 72.214105903186023738),
-               P(26.315858999999999668, 72.21616368063173752),
-               P(26.316473599999998356, 72.216713905276705532),
-               P(26.317261800000000704, 72.217105619191144683),
-               P(26.318279199999999207, 72.217451609641841515),
-               P(26.31951039999999864, 72.217778930438797147),
-               P(26.319995200000001034, 72.217883719155963718),
-               P(26.322028199999998321, 72.21814340535271981),
-               P(26.323134799999998279, 72.218219615725388394),
-               P(26.324022500000001656, 72.218280774611798734),
-               P(26.32581220000000144, 72.218525220186265301),
-               P(26.327261700000001099, 72.218861882068196678),
-               P(26.330273800000000506, 72.219715642811124212),
-               P(26.337171999999998917, 72.221928497785057743),
-               P(26.339137900000000769, 72.222394361231621929),
-               P(26.341438799999998821, 72.222689314479467271),
-               P(26.343669200000000785, 72.222811640430336411),
-               P(26.346788899999999956, 72.222677310542948703),
-               P(26.356923500000000615, 72.222042438730937874),
-               P(26.359536099999999692, 72.2221015051835451),
-               P(26.36183730000000125, 72.222299854521224916),
-               P(26.366428899999998947, 72.222842507761527031),
-               P(26.374883000000000521, 72.223912965077033732),
-               P(26.380090800000001394, 72.224542709845593436),
-               P(26.39073850000000121, 72.225869670908153353),
-               P(26.393878699999998361, 72.226187124115313054),
-               P(26.400813700000000495, 72.226887965488728582),
-               P(26.405969100000000083, 72.227408932782296347),
-               P(26.434136200000001082, 72.23031015029567925),
-               P(26.437651200000001239, 72.230672215773722655),
-               P(26.439650799999999009, 72.230860300030158783),
-               P(26.442400500000001529, 72.230918230849241013),
-               P(26.444426599999999894, 72.230815518016711962),
-               P(26.454957100000001446, 72.229639190945519545),
-               P(26.455386699999998257, 72.229609273288744475),
-               P(26.470600499999999755, 72.227804710557407475),
-               P(26.485397899999998828, 72.226080035891357056),
-               P(26.487313600000000235, 72.226084418502168205),
-               P(26.488673999999999609, 72.226209799401686951),
-               P(26.489974300000000085, 72.226456941463752059),
-               P(26.493316499999998825, 72.227405883949458598),
-               P(26.497907399999999001, 72.228727947008763977),
-               P(26.507186099999998419, 72.231355762593423719),
-               P(26.521764000000001005, 72.235531322949142918),
-               P(26.522283200000000392, 72.235663963313356817),
-               P(26.52274799999999999, 72.235808991367022713),
-               P(26.523495799999999178, 72.236006428221017472),
-               P(26.537509100000001183, 72.239985971537208798),
-               P(26.540924100000001573, 72.240959309764491536),
-               P(26.544420699999999869, 72.241674408812258434),
-               P(26.546888100000000321, 72.242183101965366632),
-               P(26.5518616999999999, 72.242874580127462991),
-               P(26.562219100000000083, 72.244128903051048951),
-               P(26.564274399999998622, 72.244315309516480283),
-               P(26.576127799999998302, 72.245028538203385438),
-               P(26.58263820000000166, 72.244424904560787581),
-               P(26.591367999999999228, 72.243389190867901561),
-               P(26.598972199999998622, 72.242452221067154028),
-               P(26.600826200000000199, 72.242522931717928714),
-               P(26.603627199999998254, 72.242683603364909573),
-               P(26.606756300000000692, 72.243241096929352807),
-               P(26.612569100000001754, 72.244800578667096147),
-               P(26.615042299999998932, 72.246052459623328446),
-               P(26.621848599999999863, 72.249011664844303482),
-               P(26.627471299999999843, 72.250195383365820589),
-               P(26.641823800000000944, 72.252710806698729584),
-               P(26.648778100000001245, 72.254338371527666141),
-               P(26.655288500000001051, 72.25700169234383452),
-               P(26.660515000000000185, 72.259171735257126556),
-               P(26.662390800000000723, 72.25996099777080417),
-               P(26.670629300000001649, 72.263625851730935779),
-               P(26.671595899999999801, 72.264267979553508781),
-               P(26.676856199999999575, 72.267335711577246116),
-               P(26.677412499999999085, 72.267929636079472289),
-               P(26.676856199999999575, 72.267335711577246116)};
+P arr1[376] = {P(25.624035299999999182, 72.26346513007850092),  P(25.624273200000001083, 72.263461698303601111),
+               P(25.624488899999999347, 72.26341365347376211),  P(25.624979400000000851, 72.263304218156179104),
+               P(25.626030799999998777, 72.263025101705878228), P(25.629390999999998257, 72.261676817778678128),
+               P(25.630162399999999678, 72.26138836631159279),  P(25.631299500000000791, 72.260963603282490908),
+               P(25.63236829999999955, 72.26051310574631259),   P(25.63325580000000059, 72.260190152533994024),
+               P(25.633720499999999021, 72.260019906865807116), P(25.634314799999998513, 72.259865485075735592),
+               P(25.634578999999998672, 72.259830215951140531), P(25.635424199999999217, 72.259772832171691448),
+               P(25.635776400000001018, 72.259834791404088605), P(25.638406499999998545, 72.260604806439260983),
+               P(25.639231599999998679, 72.260931765228107793), P(25.639867699999999928, 72.261237563690428942),
+               P(25.640699399999999031, 72.261850499331046649), P(25.643624299999999039, 72.264447578158552687),
+               P(25.644772700000000754, 72.265904403664706024), P(25.645413800000000037, 72.267106341816230497),
+               P(25.646751600000001758, 72.270404536824941033), P(25.64890219999999843, 72.275985791150915816),
+               P(25.649064599999999103, 72.276404165523842948), P(25.650549500000000336, 72.279974564589863917),
+               P(25.651433600000000723, 72.281545386607334081), P(25.652029899999998719, 72.282193025251160634),
+               P(25.652814700000000414, 72.282915237415323872), P(25.654197199999998702, 72.283799562153532747),
+               P(25.656540400000000801, 72.285055792411071707), P(25.658162999999998277, 72.286263412818769325),
+               P(25.661959599999999426, 72.289916920742129491), P(25.663380199999998865, 72.291039561736027963),
+               P(25.665810499999999195, 72.292780588759853799), P(25.6700361000000008, 72.29585629709197292),
+               P(25.670962599999999298, 72.296655718166547899), P(25.672222699999998952, 72.297961211704517837),
+               P(25.673103499999999855, 72.29896171301187735),  P(25.674837499999998869, 72.300952077677095531),
+               P(25.676358000000000459, 72.302732468128681376), P(25.678018200000000348, 72.304444228347662715),
+               P(25.680309600000001069, 72.306619426588397914), P(25.682252600000001763, 72.308208994982337003),
+               P(25.685880300000000886, 72.310749482551628375), P(25.6871223999999998, 72.311619291531712861),
+               P(25.689502399999998516, 72.313337574126506979), P(25.689994200000001001, 72.313685586072296019),
+               P(25.691337099999998372, 72.314639003020189989), P(25.694014100000000411, 72.316465930359882464),
+               P(25.696650399999999337, 72.318133963117716689), P(25.697924300000000386, 72.31863598381848135),
+               P(25.699229800000001234, 72.31891418618496914),  P(25.700213699999999051, 72.319045273707061483),
+               P(25.703616300000000194, 72.319271576784373678), P(25.707311499999999427, 72.319273484907995453),
+               P(25.715181600000001083, 72.318046763400587906), P(25.72608460000000008, 72.315978426880036523),
+               P(25.728649600000000675, 72.31539857900408208),  P(25.730824299999998317, 72.315156452495600092),
+               P(25.732753200000001215, 72.314945427265811873), P(25.736661200000000349, 72.315042353781024076),
+               P(25.74480259999999987, 72.315568583243575063),  P(25.747831600000001373, 72.315649864883624787),
+               P(25.749809599999998966, 72.315866807206518274), P(25.752535200000000515, 72.316023647210727177),
+               P(25.755610000000000781, 72.315910501039496694), P(25.760463999999998919, 72.315272459413776573),
+               P(25.762314700000001011, 72.315021747344800929), P(25.763456399999999036, 72.314812630534717641),
+               P(25.763716200000001066, 72.31478954377344337),  P(25.771413500000001306, 72.314102668549878672),
+               P(25.779617200000000565, 72.313375160856324442), P(25.784148800000000534, 72.313357035273327256),
+               P(25.790238899999998523, 72.313577786126856495), P(25.793676300000001334, 72.313716876708198811),
+               P(25.796280599999999339, 72.314048100429985766), P(25.798680499999999682, 72.31463614103191162),
+               P(25.800190700000001698, 72.315239260045032665), P(25.803071100000000371, 72.316310615756250968),
+               P(25.806439499999999754, 72.316835901112042961), P(25.809219599999998707, 72.316657116642062419),
+               P(25.813906700000000427, 72.315918133153061831), P(25.817769800000000657, 72.31543750249576874),
+               P(25.819804099999998925, 72.315482531661231747), P(25.823219200000000484, 72.315995217547779816),
+               P(25.824360999999999677, 72.316092908788874638), P(25.825752500000000111, 72.316000750836963107),
+               P(25.833053499999998337, 72.315183355397863352), P(25.835087900000001326, 72.314863574077250519),
+               P(25.836477299999998536, 72.314986830897922232), P(25.838510800000001666, 72.315843910886087542),
+               P(25.84021669999999915, 72.316586137240363996),  P(25.845591399999999993, 72.318366369042564656),
+               P(25.847287900000001315, 72.318912278071522337), P(25.852937300000000675, 72.321233538069833457),
+               P(25.857534099999998745, 72.324114950429262194), P(25.858493899999999144, 72.324638770105451613),
+               P(25.859516599999999187, 72.325101910243901671), P(25.860960299999998568, 72.325309341574609334),
+               P(25.864481800000000078, 72.325170990340012622), P(25.866295099999998541, 72.325066225249685203),
+               P(25.871619400000000155, 72.324758609934391984), P(25.873917800000000966, 72.324524655307570242),
+               P(25.875719000000000136, 72.324229064532204347), P(25.882352300000000866, 72.322516991669758113),
+               P(25.886094899999999797, 72.321551632301222412), P(25.891463999999999146, 72.320154280548763381),
+               P(25.892594599999998906, 72.32000410941930113),  P(25.893775399999999109, 72.320041127430243932),
+               P(25.895055100000000436, 72.320205228136387632), P(25.901716900000000265, 72.321479884460799781),
+               P(25.905201399999999268, 72.322148897878847151), P(25.906758400000001075, 72.322300409542663147),
+               P(25.908453200000000294, 72.322276366107203671), P(25.910453700000001476, 72.322039939449879853),
+               P(25.912611200000000622, 72.321379323121732341), P(25.914446699999999169, 72.320507670602822259),
+               P(25.915890699999998503, 72.319578403757603269), P(25.916971199999998987, 72.318721085380474278),
+               P(25.923277999999999821, 72.312682767056259081), P(25.924315100000001166, 72.311643903530907096),
+               P(25.925479700000000349, 72.310661910829537646), P(25.926380200000000542, 72.31012846985993292),
+               P(25.927288000000000778, 72.309673827336439444), P(25.929170299999999116, 72.308742039167825055),
+               P(25.931695000000001272, 72.307558244187632113), P(25.935542200000000435, 72.305689970006980616),
+               P(25.936291600000000557, 72.305420216334297834), P(25.937011699999999337, 72.3052109385934898),
+               P(25.937444899999999137, 72.305171830245583919), P(25.938065999999999178, 72.305126426436075349),
+               P(25.939194700000001603, 72.305346959512363014), P(25.941637199999998842, 72.306187700803491225),
+               P(25.951531899999999098, 72.309363611414866568), P(25.958591599999998323, 72.311600021678131611),
+               P(25.961859900000000323, 72.312588133461261464), P(25.9623209000000017, 72.312845323461488078),
+               P(25.962808800000001241, 72.313126745396871797), P(25.963783500000001681, 72.313929806056449934),
+               P(25.964454100000001091, 72.315054565005411291), P(25.966293799999998981, 72.319575350745964215),
+               P(25.966609900000001687, 72.320173934482440359), P(25.966938999999999993, 72.320628647970096381),
+               P(25.968776200000000642, 72.322731857094510133), P(25.969766299999999859, 72.323772036806516894),
+               P(25.97039970000000153, 72.324406914991570261),  P(25.971057800000000526, 72.324904784282267656),
+               P(25.972805199999999815, 72.325716763759459127), P(25.973508700000000005, 72.326106631888762877),
+               P(25.974174900000001287, 72.326699167072590058), P(25.974623600000001034, 72.327462886785923502),
+               P(25.97499170000000035, 72.32822527930542833),   P(25.975826399999998984, 72.329784823533856297),
+               P(25.976481499999998448, 72.330935420885211329), P(25.977230399999999833, 72.332212952428704966),
+               P(25.978115400000000079, 72.333512265445278899), P(25.9789551000000003, 72.33474671239962106),
+               P(25.980276700000001, 72.336402410819303554),    P(25.98169719999999927, 72.337880836033434662),
+               P(25.983172299999999666, 72.33911288186702393),  P(25.984414600000000917, 72.340068567971513858),
+               P(25.985398499999998734, 72.340636603533639004), P(25.986058100000001048, 72.340908025445514795),
+               P(25.987230000000000274, 72.341316496490946975), P(25.988157300000001015, 72.341676869267246275),
+               P(25.991148400000000152, 72.342299318530393748), P(25.997876999999999015, 72.343701138883602653),
+               P(25.999752600000000768, 72.344154484369809666), P(26.001479700000000861, 72.344723890629211382),
+               P(26.003023999999999916, 72.345420432028205937), P(26.005314899999998346, 72.346859159309715892),
+               P(26.007066099999999409, 72.348322733682408625), P(26.008686999999998335, 72.35014618535842601),
+               P(26.012360000000001037, 72.354910262506038521), P(26.013286199999999582, 72.355943685106993257),
+               P(26.013858500000001328, 72.35652369166834319),  P(26.014633599999999802, 72.357135968669368253),
+               P(26.015746700000001113, 72.357673410043958029), P(26.017126499999999822, 72.358212001250265644),
+               P(26.020520199999999988, 72.359278695677289761), P(26.021437599999998724, 72.359644892510004865),
+               P(26.022532699999999295, 72.360275718006846546), P(26.028545999999998628, 72.365263533617877556),
+               P(26.029226600000001213, 72.365797602942478761), P(26.030111600000001459, 72.366317546512846093),
+               P(26.032004199999999372, 72.367306080501194288), P(26.033209299999999331, 72.367834246590078351),
+               P(26.034265699999998844, 72.368067397148493569), P(26.035592099999998794, 72.368224167962054594),
+               P(26.03677019999999942, 72.368129074294643033),  P(26.043432299999999202, 72.366408627750374194),
+               P(26.045431499999999403, 72.365842856777021552), P(26.048415399999999664, 72.36504242213915461),
+               P(26.052753299999999115, 72.363920454888528866), P(26.05556269999999941, 72.363008918012667436),
+               P(26.060303699999998628, 72.360393712052541559), P(26.065962500000001256, 72.35698705139280662),
+               P(26.067612400000001571, 72.356026924714299753), P(26.069255399999999412, 72.355021374242639354),
+               P(26.070335599999999943, 72.354163985856629893), P(26.071483900000000489, 72.353231772141796796),
+               P(26.073087300000000965, 72.351530224288538307), P(26.07495580000000146, 72.349052146600300262),
+               P(26.077375199999998756, 72.345412414793742073), P(26.079008800000000434, 72.34322240936705839),
+               P(26.080636800000000619, 72.341554327036718064), P(26.081818800000000635, 72.340620379333103074),
+               P(26.083176200000000478, 72.339615440891947173), P(26.085581000000001239, 72.338285853103528211),
+               P(26.092078799999999461, 72.335142167729841844), P(26.099516500000000008, 72.332061609286498083),
+               P(26.102282500000001164, 72.330882175026999903), P(26.105014700000001682, 72.329521843521945357),
+               P(26.108211900000000583, 72.327720133658942814), P(26.116759299999998234, 72.322424061632020198),
+               P(26.118289900000000614, 72.321345929920937579), P(26.124188000000000187, 72.316306990481081129),
+               P(26.126093300000000852, 72.314456217615472156), P(26.13131840000000139, 72.308768748722727082),
+               P(26.133807300000000851, 72.305896196846916268), P(26.135103199999999646, 72.304208818196542552),
+               P(26.13615610000000089, 72.3027141546473473),    P(26.136958199999998698, 72.301545345164157652),
+               P(26.137658200000000619, 72.300474224549915903), P(26.140487000000000251, 72.29551524417688313),
+               P(26.146685800000000199, 72.285760107870132174), P(26.151274499999999534, 72.277504651282583836),
+               P(26.151979099999998368, 72.276113553331668982), P(26.152562700000000717, 72.274582520714972134),
+               P(26.152978600000000853, 72.272986691312326002), P(26.154697899999998612, 72.264608683472175699),
+               P(26.155105599999998844, 72.263003939235275652), P(26.155811400000001044, 72.261258344309723611),
+               P(26.156706599999999696, 72.259655777039213831), P(26.158511799999999425, 72.257073180827120495),
+               P(26.163497199999998344, 72.251147710512896083), P(26.164152500000000146, 72.250452144382251163),
+               P(26.165397099999999853, 72.249370018656591697), P(26.171159400000000517, 72.245101348184562084),
+               P(26.171824600000000771, 72.244502288299599968), P(26.172791700000001214, 72.243464858038208831),
+               P(26.173422299999998586, 72.24251111483852128),  P(26.174280599999999453, 72.240982180618559028),
+               P(26.174924399999998315, 72.239409446329290176), P(26.175138900000000319, 72.238550480576279256),
+               P(26.177894599999998348, 72.222417606854094174), P(26.178249600000000896, 72.220799387733251251),
+               P(26.178700899999999052, 72.219414415122045625), P(26.179689899999999625, 72.217234222262234766),
+               P(26.182073200000001378, 72.213506738076645775), P(26.18310470000000123, 72.211533626956168064),
+               P(26.183614800000000855, 72.210338776927230242), P(26.18428000000000111, 72.208417574177602205),
+               P(26.185804499999999706, 72.203266316303412964), P(26.186153000000000901, 72.202346286216979365),
+               P(26.186549599999999316, 72.201465316811109574), P(26.187059699999998941, 72.200685882789031211),
+               P(26.187643699999998859, 72.200064170625580573), P(26.188815999999999207, 72.199110470754774838),
+               P(26.189986799999999789, 72.198491439723213148), P(26.190943999999998226, 72.198205925482497491),
+               P(26.192045499999998981, 72.198064597333782899), P(26.201502200000000187, 72.19749033573828001),
+               P(26.204289599999999183, 72.197194731015855496), P(26.212046699999998367, 72.196023752898682346),
+               P(26.217400099999998986, 72.195033541852339454), P(26.220660899999998605, 72.194099530393685882),
+               P(26.223864100000000121, 72.193042117073559893), P(26.227025699999998665, 72.192404096537160285),
+               P(26.229406099999998503, 72.192154413131575552), P(26.23379059999999896, 72.191934250652863625),
+               P(26.241092200000000645, 72.191652763688111349), P(26.247795599999999894, 72.191305763109099303),
+               P(26.259740499999999486, 72.190710990755292187), P(26.262441899999998896, 72.190662426481935654),
+               P(26.26396259999999927, 72.190803739092231694),  P(26.265582200000000768, 72.19108065172507338),
+               P(26.271514700000000886, 72.192273445913514252), P(26.275603900000000124, 72.192994312937273094),
+               P(26.278289999999998372, 72.193506828374651718), P(26.280647800000000558, 72.193799369593079973),
+               P(26.284991699999999071, 72.194193426147350579), P(26.295021899999998283, 72.194996021158502231),
+               P(26.296629599999999272, 72.195353135208762296), P(26.298219400000000689, 72.195936520796209379),
+               P(26.299353599999999886, 72.196573622487093758), P(26.300700500000001369, 72.19746290844136638),
+               P(26.301440499999998224, 72.198127833072547332), P(26.302059899999999715, 72.198747051231549676),
+               P(26.302597999999999701, 72.199118470577644757), P(26.30326700000000173, 72.200164931796578571),
+               P(26.304018299999999186, 72.201524555689601925), P(26.305375600000001413, 72.20513574950004454),
+               P(26.306215500000000418, 72.206942181028665573), P(26.307179600000001329, 72.208595118825385839),
+               P(26.307805599999998236, 72.209443034325843769), P(26.308593200000000678, 72.210334966852684602),
+               P(26.309511400000001657, 72.211171854914510959), P(26.310345000000001647, 72.211829485157878139),
+               P(26.313103999999999161, 72.213550746524816759), P(26.313808999999999116, 72.214105903186023738),
+               P(26.315858999999999668, 72.21616368063173752),  P(26.316473599999998356, 72.216713905276705532),
+               P(26.317261800000000704, 72.217105619191144683), P(26.318279199999999207, 72.217451609641841515),
+               P(26.31951039999999864, 72.217778930438797147),  P(26.319995200000001034, 72.217883719155963718),
+               P(26.322028199999998321, 72.21814340535271981),  P(26.323134799999998279, 72.218219615725388394),
+               P(26.324022500000001656, 72.218280774611798734), P(26.32581220000000144, 72.218525220186265301),
+               P(26.327261700000001099, 72.218861882068196678), P(26.330273800000000506, 72.219715642811124212),
+               P(26.337171999999998917, 72.221928497785057743), P(26.339137900000000769, 72.222394361231621929),
+               P(26.341438799999998821, 72.222689314479467271), P(26.343669200000000785, 72.222811640430336411),
+               P(26.346788899999999956, 72.222677310542948703), P(26.356923500000000615, 72.222042438730937874),
+               P(26.359536099999999692, 72.2221015051835451),   P(26.36183730000000125, 72.222299854521224916),
+               P(26.366428899999998947, 72.222842507761527031), P(26.374883000000000521, 72.223912965077033732),
+               P(26.380090800000001394, 72.224542709845593436), P(26.39073850000000121, 72.225869670908153353),
+               P(26.393878699999998361, 72.226187124115313054), P(26.400813700000000495, 72.226887965488728582),
+               P(26.405969100000000083, 72.227408932782296347), P(26.434136200000001082, 72.23031015029567925),
+               P(26.437651200000001239, 72.230672215773722655), P(26.439650799999999009, 72.230860300030158783),
+               P(26.442400500000001529, 72.230918230849241013), P(26.444426599999999894, 72.230815518016711962),
+               P(26.454957100000001446, 72.229639190945519545), P(26.455386699999998257, 72.229609273288744475),
+               P(26.470600499999999755, 72.227804710557407475), P(26.485397899999998828, 72.226080035891357056),
+               P(26.487313600000000235, 72.226084418502168205), P(26.488673999999999609, 72.226209799401686951),
+               P(26.489974300000000085, 72.226456941463752059), P(26.493316499999998825, 72.227405883949458598),
+               P(26.497907399999999001, 72.228727947008763977), P(26.507186099999998419, 72.231355762593423719),
+               P(26.521764000000001005, 72.235531322949142918), P(26.522283200000000392, 72.235663963313356817),
+               P(26.52274799999999999, 72.235808991367022713),  P(26.523495799999999178, 72.236006428221017472),
+               P(26.537509100000001183, 72.239985971537208798), P(26.540924100000001573, 72.240959309764491536),
+               P(26.544420699999999869, 72.241674408812258434), P(26.546888100000000321, 72.242183101965366632),
+               P(26.5518616999999999, 72.242874580127462991),   P(26.562219100000000083, 72.244128903051048951),
+               P(26.564274399999998622, 72.244315309516480283), P(26.576127799999998302, 72.245028538203385438),
+               P(26.58263820000000166, 72.244424904560787581),  P(26.591367999999999228, 72.243389190867901561),
+               P(26.598972199999998622, 72.242452221067154028), P(26.600826200000000199, 72.242522931717928714),
+               P(26.603627199999998254, 72.242683603364909573), P(26.606756300000000692, 72.243241096929352807),
+               P(26.612569100000001754, 72.244800578667096147), P(26.615042299999998932, 72.246052459623328446),
+               P(26.621848599999999863, 72.249011664844303482), P(26.627471299999999843, 72.250195383365820589),
+               P(26.641823800000000944, 72.252710806698729584), P(26.648778100000001245, 72.254338371527666141),
+               P(26.655288500000001051, 72.25700169234383452),  P(26.660515000000000185, 72.259171735257126556),
+               P(26.662390800000000723, 72.25996099777080417),  P(26.670629300000001649, 72.263625851730935779),
+               P(26.671595899999999801, 72.264267979553508781), P(26.676856199999999575, 72.267335711577246116),
+               P(26.677412499999999085, 72.267929636079472289), P(26.676856199999999575, 72.267335711577246116)};
 }  // namespace geometry_coding_tests
diff --git a/libs/coding/coding_tests/traffic_test.cpp b/libs/coding/coding_tests/traffic_test.cpp
index 8a9ac0032..92e64ce11 100644
--- a/libs/coding/coding_tests/traffic_test.cpp
+++ b/libs/coding/coding_tests/traffic_test.cpp
@@ -47,8 +47,7 @@ void Test(vector<TrafficGPSEncoder::DataPoint> & points)
     TEST_EQUAL(points.size(), result.size(), ());
     for (size_t i = 0; i < points.size(); ++i)
     {
-      TEST_EQUAL(points[i].m_timestamp, result[i].m_timestamp,
-                 (points[i].m_timestamp, result[i].m_timestamp));
+      TEST_EQUAL(points[i].m_timestamp, result[i].m_timestamp, (points[i].m_timestamp, result[i].m_timestamp));
       TEST(AlmostEqualAbsOrRel(points[i].m_latLon.m_lat, result[i].m_latLon.m_lat, kEps),
            (points[i].m_latLon.m_lat, result[i].m_latLon.m_lat));
       TEST(AlmostEqualAbsOrRel(points[i].m_latLon.m_lon, result[i].m_latLon.m_lon, kEps),
@@ -57,8 +56,8 @@ void Test(vector<TrafficGPSEncoder::DataPoint> & points)
 
     if (version == TrafficGPSEncoder::kLatestVersion)
     {
-      LOG(LINFO, ("path length =", CalculateLength(points), "num points =", points.size(),
-                  "compressed size =", buf.size()));
+      LOG(LINFO,
+          ("path length =", CalculateLength(points), "num points =", points.size(), "compressed size =", buf.size()));
     }
   }
 }
@@ -66,7 +65,8 @@ void Test(vector<TrafficGPSEncoder::DataPoint> & points)
 UNIT_TEST(Traffic_Serialization_Smoke)
 {
   vector<TrafficGPSEncoder::DataPoint> data = {
-      {0, ms::LatLon(0.0, 1.0), 1}, {0, ms::LatLon(0.0, 2.0), 2},
+      {0, ms::LatLon(0.0, 1.0), 1},
+      {0, ms::LatLon(0.0, 2.0), 2},
   };
   Test(data);
 }
@@ -80,7 +80,8 @@ UNIT_TEST(Traffic_Serialization_EmptyPath)
 UNIT_TEST(Traffic_Serialization_StraightLine100m)
 {
   vector<TrafficGPSEncoder::DataPoint> path = {
-      {0, ms::LatLon(0.0, 0.0), 1}, {0, ms::LatLon(0.0, 1e-3), 2},
+      {0, ms::LatLon(0.0, 0.0), 1},
+      {0, ms::LatLon(0.0, 1e-3), 2},
   };
   Test(path);
 }
@@ -88,7 +89,8 @@ UNIT_TEST(Traffic_Serialization_StraightLine100m)
 UNIT_TEST(Traffic_Serialization_StraightLine50Km)
 {
   vector<TrafficGPSEncoder::DataPoint> path = {
-      {0, ms::LatLon(0.0, 0.0), 1}, {0, ms::LatLon(0.0, 0.5), 2},
+      {0, ms::LatLon(0.0, 0.0), 1},
+      {0, ms::LatLon(0.0, 0.5), 2},
   };
   Test(path);
 }
@@ -147,7 +149,8 @@ UNIT_TEST(Traffic_Serialization_Circle20KmRadius)
 UNIT_TEST(Traffic_Serialization_ExtremeLatLon)
 {
   vector<TrafficGPSEncoder::DataPoint> path = {
-      {0, ms::LatLon(-90, -180), 0}, {0, ms::LatLon(90, 180), 0},
+      {0, ms::LatLon(-90, -180), 0},
+      {0, ms::LatLon(90, 180), 0},
   };
   Test(path);
 }
diff --git a/libs/coding/coding_tests/url_tests.cpp b/libs/coding/coding_tests/url_tests.cpp
index f92afab51..255074bcc 100644
--- a/libs/coding/coding_tests/url_tests.cpp
+++ b/libs/coding/coding_tests/url_tests.cpp
@@ -18,9 +18,21 @@ class TestUrl
 public:
   explicit TestUrl(string && url) : m_url(std::move(url)) {}
 
-  TestUrl & Scheme(string && scheme) { m_scheme = std::move(scheme); return *this; }
-  TestUrl & Host(string && host) { m_host = std::move(host); return *this; }
-  TestUrl & Path(string && path) { m_path = std::move(path); return *this; }
+  TestUrl & Scheme(string && scheme)
+  {
+    m_scheme = std::move(scheme);
+    return *this;
+  }
+  TestUrl & Host(string && host)
+  {
+    m_host = std::move(host);
+    return *this;
+  }
+  TestUrl & Path(string && path)
+  {
+    m_path = std::move(path);
+    return *this;
+  }
   TestUrl & KV(string && key, string && value)
   {
     m_keyValuePairs.emplace(std::move(key), std::move(value));
@@ -115,17 +127,9 @@ UNIT_TEST(Url_Valid)
       .KV("ll", "10.3,12.3223")
       .KV("n", "Hello World");
 
-  TestUrl("cm:M&M//path?q=q&w=w")
-      .Scheme("cm")
-      .Host("M&M")
-      .Path("path")
-      .KV("q", "q")
-      .KV("w", "w");
+  TestUrl("cm:M&M//path?q=q&w=w").Scheme("cm").Host("M&M").Path("path").KV("q", "q").KV("w", "w");
 
-  TestUrl("http://www.sandwichparlour.com.au/")
-      .Scheme("http")
-      .Host("www.sandwichparlour.com.au")
-      .Path("");
+  TestUrl("http://www.sandwichparlour.com.au/").Scheme("http").Host("www.sandwichparlour.com.au").Path("");
 
   TestUrl("cm:/&test").Scheme("cm").Host("&test").Path("");
 }
@@ -160,21 +164,40 @@ UNIT_TEST(UrlScheme_Comprehensive)
   TestUrl("http://host/path/to/something").Scheme("http").Host("host").Path("path/to/something");
   TestUrl("http://host?").Scheme("http").Host("host").Path("");
   TestUrl("maps://host?&&key=&").Scheme("maps").Host("host").KV("key", "");
-  TestUrl("mapswithme://map?ll=1.2,3.4&z=15").Scheme("mapswithme").Host("map").Path("")
-      .KV("ll", "1.2,3.4").KV("z", "15");
-  TestUrl("nopathnovalues://?key1&key2=val2").Scheme("nopathnovalues").Host("").Path("")
-      .KV("key1", "").KV("key2", "val2");
+  TestUrl("mapswithme://map?ll=1.2,3.4&z=15")
+      .Scheme("mapswithme")
+      .Host("map")
+      .Path("")
+      .KV("ll", "1.2,3.4")
+      .KV("z", "15");
+  TestUrl("nopathnovalues://?key1&key2=val2")
+      .Scheme("nopathnovalues")
+      .Host("")
+      .Path("")
+      .KV("key1", "")
+      .KV("key2", "val2");
   TestUrl("s://?key1&key2").Scheme("s").Host("").Path("").KV("key1", "").KV("key2", "");
   TestUrl("g://h/p?key1=val1&key2=").Scheme("g").Host("h").Path("p").KV("key1", "val1").KV("key2", "");
   TestUrl("g://h?=val1&key2=").Scheme("g").Host("h").Path("").KV("", "val1").KV("key2", "");
   TestUrl("g://?k&key2").Scheme("g").Host("").Path("").KV("k", "").KV("key2", "");
-  TestUrl("m:?%26Amp%26%3D%26Amp%26&name=%31%20%30").Scheme("m").Host("").Path("")
-      .KV("&Amp&=&Amp&", "").KV("name", "1 0");
+  TestUrl("m:?%26Amp%26%3D%26Amp%26&name=%31%20%30")
+      .Scheme("m")
+      .Host("")
+      .Path("")
+      .KV("&Amp&=&Amp&", "")
+      .KV("name", "1 0");
   TestUrl("s://?key1=value1&key1=value2&key1=value3&key2&key2&key3=value1&key3&key3=value2")
-      .Scheme("s").Host("").Path("")
-      .KV("key1", "value1").KV("key1", "value2").KV("key1", "value3")
-      .KV("key2", "").KV("key2", "")
-      .KV("key3", "value1").KV("key3", "").KV("key3", "value2");
+      .Scheme("s")
+      .Host("")
+      .Path("")
+      .KV("key1", "value1")
+      .KV("key1", "value2")
+      .KV("key1", "value3")
+      .KV("key2", "")
+      .KV("key2", "")
+      .KV("key3", "value1")
+      .KV("key3", "")
+      .KV("key3", "value2");
 }
 
 UNIT_TEST(UrlApi_Smoke)
diff --git a/libs/coding/coding_tests/value_opt_string_test.cpp b/libs/coding/coding_tests/value_opt_string_test.cpp
index b2797b426..af554b343 100644
--- a/libs/coding/coding_tests/value_opt_string_test.cpp
+++ b/libs/coding/coding_tests/value_opt_string_test.cpp
@@ -22,7 +22,7 @@ void TestStringCodingT(T const * arr, size_t count, size_t maxSize)
     s.Set(ethalon);
 
     std::vector<char> buffer;
-    MemWriter<std::vector<char> > w(buffer);
+    MemWriter<std::vector<char>> w(buffer);
 
     s.Write(w);
 
@@ -38,7 +38,7 @@ void TestStringCodingT(T const * arr, size_t count, size_t maxSize)
   }
 }
 
-} // namespace
+}  // namespace
 
 UNIT_TEST(StringNumericOptimal_Zero)
 {
@@ -51,19 +51,19 @@ UNIT_TEST(StringNumericOptimal_Zero)
 
 UNIT_TEST(StringNumericOptimal_IntCoding1)
 {
-  int arr[] = { 0, 1, 2, 666, 0x0FFFFFFF, 0x7FFFFFFF-1, 0x7FFFFFFF };
+  int arr[] = {0, 1, 2, 666, 0x0FFFFFFF, 0x7FFFFFFF - 1, 0x7FFFFFFF};
   TestStringCodingT(arr, ARRAY_SIZE(arr), 5);  // should be coded as VarUint
 }
 
 UNIT_TEST(StringNumericOptimal_IntCoding2)
 {
-  int arr[] = { -1, -2, -666666, static_cast<int>(0xFFFFFFFE), static_cast<int>(0xFFFFFFFF) };
+  int arr[] = {-1, -2, -666666, static_cast<int>(0xFFFFFFFE), static_cast<int>(0xFFFFFFFF)};
   TestStringCodingT(arr, ARRAY_SIZE(arr), 12);  // should be coded as String
 }
 
 UNIT_TEST(StringNumericOptimal_StringCoding)
 {
-  char const * arr[] = { "xxx", "yyy", "a", "0xFFFFFF", "123456UL" };
+  char const * arr[] = {"xxx", "yyy", "a", "0xFFFFFF", "123456UL"};
   TestStringCodingT(arr, ARRAY_SIZE(arr), 12);  // should be coded as String
 }
 
diff --git a/libs/coding/coding_tests/var_record_reader_test.cpp b/libs/coding/coding_tests/var_record_reader_test.cpp
index b32e7aa5e..63c37b464 100644
--- a/libs/coding/coding_tests/var_record_reader_test.cpp
+++ b/libs/coding/coding_tests/var_record_reader_test.cpp
@@ -17,36 +17,37 @@ using namespace std;
 
 namespace
 {
-  struct SaveForEachParams
+struct SaveForEachParams
+{
+  explicit SaveForEachParams(vector<pair<uint64_t, string>> & data) : m_data(data) {}
+
+  void operator()(uint64_t pos, vector<uint8_t> && data) const
   {
-    explicit SaveForEachParams(vector<pair<uint64_t, string>> & data) : m_data(data) {}
+    m_data.emplace_back(pos, string(data.begin(), data.end()));
+  }
 
-    void operator()(uint64_t pos, vector<uint8_t> && data) const
-    {
-      m_data.emplace_back(pos, string(data.begin(), data.end()));
-    }
+  vector<pair<uint64_t, string>> & m_data;
+};
 
-    vector<pair<uint64_t, string>> & m_data;
-  };
-
-}
+}  // namespace
 
 UNIT_TEST(VarRecordReader_Simple)
 {
   vector<uint8_t> data;
-  char const longString[] = "0123456789012345678901234567890123456789012345678901234567890123456789"
-                            "012345678901234567890123456789012345678901234567890123456789012345";
+  char const longString[] =
+      "0123456789012345678901234567890123456789012345678901234567890123456789"
+      "012345678901234567890123456789012345678901234567890123456789012345";
   size_t const longStringSize = sizeof(longString) - 1;
   TEST_GREATER(longStringSize, 128, ());
   {
     MemWriter<vector<uint8_t>> writer(data);
-    WriteVarUint(writer, 3U);                   //  0
-    writer.Write("abc", 3);                     //  1
-    WriteVarUint(writer, longStringSize);       //  4
-    writer.Write(longString, longStringSize);   //  6
-    WriteVarUint(writer, 4U);                   //  6 + longStringSize
-    writer.Write("defg", 4);                    //  7 + longStringSize
-                                                // 11 + longStringSize
+    WriteVarUint(writer, 3U);                  //  0
+    writer.Write("abc", 3);                    //  1
+    WriteVarUint(writer, longStringSize);      //  4
+    writer.Write(longString, longStringSize);  //  6
+    WriteVarUint(writer, 4U);                  //  6 + longStringSize
+    writer.Write("defg", 4);                   //  7 + longStringSize
+                                               // 11 + longStringSize
   }
 
   MemReader reader(&data[0], data.size());
@@ -63,8 +64,6 @@ UNIT_TEST(VarRecordReader_Simple)
 
   vector<pair<uint64_t, string>> forEachCalls;
   recordReader.ForEachRecord(SaveForEachParams(forEachCalls));
-  vector<pair<uint64_t, string>> expectedForEachCalls = {{0, "abc"},
-                                                         {4, longString},
-                                                         {6 + longStringSize, "defg"}};
+  vector<pair<uint64_t, string>> expectedForEachCalls = {{0, "abc"}, {4, longString}, {6 + longStringSize, "defg"}};
   TEST_EQUAL(forEachCalls, expectedForEachCalls, ());
 }
diff --git a/libs/coding/coding_tests/var_serial_vector_test.cpp b/libs/coding/coding_tests/var_serial_vector_test.cpp
index fa11c71c8..5ca94e83d 100644
--- a/libs/coding/coding_tests/var_serial_vector_test.cpp
+++ b/libs/coding/coding_tests/var_serial_vector_test.cpp
@@ -16,7 +16,12 @@
 
 using namespace std;
 
-char const kHexSerial[] = "03000000" "01000000" "04000000" "06000000" "616263646566";
+char const kHexSerial[] =
+    "03000000"
+    "01000000"
+    "04000000"
+    "06000000"
+    "616263646566";
 
 namespace
 {
@@ -45,7 +50,7 @@ void WriteVarSerialVector(ItT begin, ItT end, TDstStream & dst)
   }
 }
 
-}
+}  // namespace
 
 UNIT_TEST(WriteSerial)
 {
@@ -65,7 +70,7 @@ UNIT_TEST(WriteSerialWithWriter)
 {
   string output;
   MemWriter<string> writer(output);
-  VarSerialVectorWriter<MemWriter<string> > recordWriter(writer, 3);
+  VarSerialVectorWriter<MemWriter<string>> recordWriter(writer, 3);
   writer.Write("a", 1);
   recordWriter.FinishRecord();
   writer.Write("bcd", 3);
diff --git a/libs/coding/coding_tests/varint_test.cpp b/libs/coding/coding_tests/varint_test.cpp
index 3ceaa8a24..f18278347 100644
--- a/libs/coding/coding_tests/varint_test.cpp
+++ b/libs/coding/coding_tests/varint_test.cpp
@@ -12,33 +12,35 @@ using namespace std;
 
 namespace
 {
-  template <typename T> void TestVarUint(T const x)
-  {
-    vector<unsigned char> data;
-    PushBackByteSink<vector<uint8_t>> dst(data);
-    WriteVarUint(dst, x);
+template <typename T>
+void TestVarUint(T const x)
+{
+  vector<unsigned char> data;
+  PushBackByteSink<vector<uint8_t>> dst(data);
+  WriteVarUint(dst, x);
 
-    ArrayByteSource src(&data[0]);
-    TEST_EQUAL(ReadVarUint<T>(src), x, ());
+  ArrayByteSource src(&data[0]);
+  TEST_EQUAL(ReadVarUint<T>(src), x, ());
 
-    size_t const bytesRead = src.PtrUint8() - data.data();
-    TEST_EQUAL(bytesRead, data.size(), (x));
-  }
-
-  template <typename T> void TestVarInt(T const x)
-  {
-    vector<uint8_t> data;
-    PushBackByteSink<vector<uint8_t>> dst(data);
-    WriteVarInt(dst, x);
-
-    ArrayByteSource src(&data[0]);
-    TEST_EQUAL(ReadVarInt<T>(src), x, ());
-
-    size_t const bytesRead = src.PtrUint8() - data.data();
-    TEST_EQUAL(bytesRead, data.size(), (x));
-  }
+  size_t const bytesRead = src.PtrUint8() - data.data();
+  TEST_EQUAL(bytesRead, data.size(), (x));
 }
 
+template <typename T>
+void TestVarInt(T const x)
+{
+  vector<uint8_t> data;
+  PushBackByteSink<vector<uint8_t>> dst(data);
+  WriteVarInt(dst, x);
+
+  ArrayByteSource src(&data[0]);
+  TEST_EQUAL(ReadVarInt<T>(src), x, ());
+
+  size_t const bytesRead = src.PtrUint8() - data.data();
+  TEST_EQUAL(bytesRead, data.size(), (x));
+}
+}  // namespace
+
 UNIT_TEST(VarUint0)
 {
   // TestVarUint(static_cast<uint8_t>(0));
@@ -125,11 +127,16 @@ UNIT_TEST(ReadVarInt64Array)
 
   // Fill in values.
   {
-    int64_t const baseValues [] =
-    {
-      0, 127, 128, (2 << 28) - 1, (2 << 28), (2LL << 31), (2LL << 31) - 1,
-      0xFFFFFFFF - 1, 0xFFFFFFFF, 0xFFFFFFFFFFULL
-    };
+    int64_t const baseValues[] = {0,
+                                  127,
+                                  128,
+                                  (2 << 28) - 1,
+                                  (2 << 28),
+                                  (2LL << 31),
+                                  (2LL << 31) - 1,
+                                  0xFFFFFFFF - 1,
+                                  0xFFFFFFFF,
+                                  0xFFFFFFFFFFULL};
     for (size_t i = 0; i < ARRAY_SIZE(baseValues); ++i)
     {
       values.push_back(baseValues[i]);
@@ -164,20 +171,17 @@ UNIT_TEST(ReadVarInt64Array)
       void const * pDataEnd = &data[0] + data.size();
 
       vector<int64_t> result;
-      void const * pEnd = ReadVarInt64Array(pDataStart, pDataEnd,
-                                            base::MakeBackInsertFunctor(result));
+      void const * pEnd = ReadVarInt64Array(pDataStart, pDataEnd, base::MakeBackInsertFunctor(result));
 
       TEST_EQUAL(pEnd, pDataEnd, ("UntilBufferEnd", data.size()));
       TEST_EQUAL(result, testValues, ("UntilBufferEnd", data.size()));
     }
     {
       vector<int64_t> result;
-      void const * pEnd = ReadVarInt64Array(&data[0], testValues.size(),
-                                            base::MakeBackInsertFunctor(result));
+      void const * pEnd = ReadVarInt64Array(&data[0], testValues.size(), base::MakeBackInsertFunctor(result));
 
       TEST_EQUAL(pEnd, &data[0] + data.size(), ("GivenSize", data.size()));
       TEST_EQUAL(result, testValues, ("GivenSize", data.size()));
     }
   }
 }
-
diff --git a/libs/coding/coding_tests/writer_test.cpp b/libs/coding/coding_tests/writer_test.cpp
index 4151f2ee4..0f3912f3e 100644
--- a/libs/coding/coding_tests/writer_test.cpp
+++ b/libs/coding/coding_tests/writer_test.cpp
@@ -1,8 +1,8 @@
 #include "testing/testing.hpp"
 
 #include "coding/buffered_file_writer.hpp"
-#include "coding/file_writer.hpp"
 #include "coding/file_reader.hpp"
+#include "coding/file_writer.hpp"
 #include "coding/internal/file_data.hpp"
 
 #include <cstddef>
@@ -14,43 +14,43 @@ using namespace std;
 
 namespace
 {
-  static char const kTestWriteStr [] = "01234567";
+static char const kTestWriteStr[] = "01234567";
 
-  template <class WriterT>
-  void TestWrite(WriterT & writer)
-  {
-    writer.Write("01", 2);           // "01"
-    TEST_EQUAL(writer.Pos(), 2, ());
-    writer.Write("x", 1);            // "01x"
-    TEST_EQUAL(writer.Pos(), 3, ());
-    writer.Write("3", 1);            // "01x3"
-    TEST_EQUAL(writer.Pos(), 4, ());
-    writer.Seek(2);
-    TEST_EQUAL(writer.Pos(), 2, ());
-    writer.Write("2", 1);            // "0123"
-    TEST_EQUAL(writer.Pos(), 3, ());
-    writer.Seek(7);
-    TEST_EQUAL(writer.Pos(), 7, ());
-    writer.Write("7", 1);            // "0123???7"
-    TEST_EQUAL(writer.Pos(), 8, ());
-    writer.Seek(4);
-    TEST_EQUAL(writer.Pos(), 4, ());
-    writer.Write("45", 2);           // "012345?7"
-    writer.Write("6", 1);            // "01234567"
-  }
+template <class WriterT>
+void TestWrite(WriterT & writer)
+{
+  writer.Write("01", 2);  // "01"
+  TEST_EQUAL(writer.Pos(), 2, ());
+  writer.Write("x", 1);  // "01x"
+  TEST_EQUAL(writer.Pos(), 3, ());
+  writer.Write("3", 1);  // "01x3"
+  TEST_EQUAL(writer.Pos(), 4, ());
+  writer.Seek(2);
+  TEST_EQUAL(writer.Pos(), 2, ());
+  writer.Write("2", 1);  // "0123"
+  TEST_EQUAL(writer.Pos(), 3, ());
+  writer.Seek(7);
+  TEST_EQUAL(writer.Pos(), 7, ());
+  writer.Write("7", 1);  // "0123???7"
+  TEST_EQUAL(writer.Pos(), 8, ());
+  writer.Seek(4);
+  TEST_EQUAL(writer.Pos(), 4, ());
+  writer.Write("45", 2);  // "012345?7"
+  writer.Write("6", 1);   // "01234567"
 }
+}  // namespace
 
 UNIT_TEST(MemWriter_Smoke)
 {
   vector<char> s;
-  MemWriter<vector<char> > writer(s);
+  MemWriter<vector<char>> writer(s);
   TestWrite(writer);
   TEST_EQUAL(string(s.begin(), s.end()), kTestWriteStr, ());
 }
 
 UNIT_TEST(FileWriter_Smoke)
 {
-  char const fileName [] = "file_writer_smoke_test.tmp";
+  char const fileName[] = "file_writer_smoke_test.tmp";
   {
     FileWriter writer(fileName);
     TestWrite(writer);
@@ -68,10 +68,10 @@ UNIT_TEST(FileWriter_Smoke)
 UNIT_TEST(SubWriter_MemWriter_Smoke)
 {
   vector<char> s;
-  MemWriter<vector<char> > writer(s);
+  MemWriter<vector<char>> writer(s);
   writer.Write("aa", 2);
   {
-    SubWriter<MemWriter<vector<char> > > subWriter(writer);
+    SubWriter<MemWriter<vector<char>>> subWriter(writer);
     TestWrite(subWriter);
   }
   writer.Write("bb", 2);
@@ -80,7 +80,7 @@ UNIT_TEST(SubWriter_MemWriter_Smoke)
 
 UNIT_TEST(SubWriter_FileWriter_Smoke)
 {
-  char const fileName [] = "sub_file_writer_smoke_test.tmp";
+  char const fileName[] = "sub_file_writer_smoke_test.tmp";
   {
     FileWriter writer(fileName);
     writer.Write("aa", 2);
@@ -102,7 +102,7 @@ UNIT_TEST(SubWriter_FileWriter_Smoke)
 
 UNIT_TEST(FileWriter_DeleteFile)
 {
-  char const fileName [] = "delete_file_test";
+  char const fileName[] = "delete_file_test";
   {
     FileWriter writer(fileName);
     writer.Write("123", 3);
@@ -117,14 +117,13 @@ UNIT_TEST(FileWriter_DeleteFile)
     FileReader reader(fileName);
     TEST(false, ("Exception should be thrown!"));
   }
-  catch (FileReader::OpenException & )
-  {
-  }
+  catch (FileReader::OpenException &)
+  {}
 }
 
 UNIT_TEST(FileWriter_AppendAndOpenExisting)
 {
-  char const fileName [] = "append_openexisting_file_test";
+  char const fileName[] = "append_openexisting_file_test";
   {
     FileWriter writer(fileName);
   }
@@ -187,14 +186,14 @@ void WriteTestData1(Writer & w)
 void WriteTestData2(Writer & w)
 {
   char c[CHUNK_SIZE];
-  for (size_t i = 1; i < CHUNKS_COUNT; i +=2)
+  for (size_t i = 1; i < CHUNKS_COUNT; i += 2)
   {
     for (size_t j = 0; j < ARRAY_SIZE(c); ++j)
       c[j] = i;
     w.Seek(i * CHUNK_SIZE);
     w.Write(&c[0], ARRAY_SIZE(c));
   }
-  for (size_t i = 0; i < CHUNKS_COUNT; i +=2)
+  for (size_t i = 0; i < CHUNKS_COUNT; i += 2)
   {
     for (size_t j = 0; j < ARRAY_SIZE(c); ++j)
       c[j] = i;
diff --git a/libs/coding/coding_tests/xml_parser_tests.cpp b/libs/coding/coding_tests/xml_parser_tests.cpp
index 593a95247..8a5a0c7d8 100644
--- a/libs/coding/coding_tests/xml_parser_tests.cpp
+++ b/libs/coding/coding_tests/xml_parser_tests.cpp
@@ -55,10 +55,7 @@ public:
 
   void CharData(std::string const & ch) {}
 
-  void AddAttr(std::string key, std::string value)
-  {
-    m_addAttrs.emplace_back(std::move(key), std::move(value));
-  }
+  void AddAttr(std::string key, std::string value) { m_addAttrs.emplace_back(std::move(key), std::move(value)); }
 
   bool Push(std::string push)
   {
@@ -66,25 +63,13 @@ public:
     return true;
   }
 
-  void Pop(std::string pop)
-  {
-    m_pops.emplace_back(std::move(pop));
-  }
+  void Pop(std::string pop) { m_pops.emplace_back(std::move(pop)); }
 
-  void TestAddAttrs(PairsOfStrings const & addAttrs)
-  {
-    TestEquality(m_addAttrs, addAttrs);
-  }
+  void TestAddAttrs(PairsOfStrings const & addAttrs) { TestEquality(m_addAttrs, addAttrs); }
 
-  void TestPushes(Strings const & pushes)
-  {
-    TestEquality(m_pushes, pushes);
-  }
+  void TestPushes(Strings const & pushes) { TestEquality(m_pushes, pushes); }
 
-  void TestPops(Strings const & pops)
-  {
-    TestEquality(m_pops, pops);
-  }
+  void TestPops(Strings const & pops) { TestEquality(m_pops, pops); }
 
 private:
   template <typename F>
@@ -123,13 +108,12 @@ UNIT_TEST(XmlParser_LongTest)
 {
   Dispatcher d;
   TestXML(longXml, d);
-  d.TestAddAttrs({std::make_pair("vertical", "bottom"), std::make_pair("horizontal", "left"),
-                  std::make_pair("x", "10"), std::make_pair("vertical", "center"),
-                  std::make_pair("vertical", "top"), std::make_pair("vertical", "top"),
-                  std::make_pair("x", "34"), std::make_pair("y", "48")});
-  d.TestPushes({"root", "ruler", "portrait", "anchor", "offset", "compass", "portrait", "anchor",
-                "relative", "landscape", "relative", "offset"});
-  d.TestPops({"anchor", "offset", "portrait", "ruler", "anchor", "relative", "portrait", "relative",
-              "offset", "landscape", "compass", "root"});
+  d.TestAddAttrs({std::make_pair("vertical", "bottom"), std::make_pair("horizontal", "left"), std::make_pair("x", "10"),
+                  std::make_pair("vertical", "center"), std::make_pair("vertical", "top"),
+                  std::make_pair("vertical", "top"), std::make_pair("x", "34"), std::make_pair("y", "48")});
+  d.TestPushes({"root", "ruler", "portrait", "anchor", "offset", "compass", "portrait", "anchor", "relative",
+                "landscape", "relative", "offset"});
+  d.TestPops({"anchor", "offset", "portrait", "ruler", "anchor", "relative", "portrait", "relative", "offset",
+              "landscape", "compass", "root"});
 }
 }  // namespace
diff --git a/libs/coding/coding_tests/zip_creator_test.cpp b/libs/coding/coding_tests/zip_creator_test.cpp
index b60d3883b..4c992dda6 100644
--- a/libs/coding/coding_tests/zip_creator_test.cpp
+++ b/libs/coding/coding_tests/zip_creator_test.cpp
@@ -1,10 +1,10 @@
 #include "testing/testing.hpp"
 
+#include "coding/constants.hpp"
+#include "coding/file_writer.hpp"
+#include "coding/internal/file_data.hpp"
 #include "coding/zip_creator.hpp"
 #include "coding/zip_reader.hpp"
-#include "coding/internal/file_data.hpp"
-#include "coding/file_writer.hpp"
-#include "coding/constants.hpp"
 
 #include "base/scope_guard.hpp"
 
@@ -30,8 +30,7 @@ void CreateAndTestZip(std::string const & filePath, std::string const & zipPath)
   TEST(base::DeleteFileX(unzippedFile), ());
 }
 
-void CreateAndTestZip(std::vector<std::string> const & files, std::string const & zipPath,
-                      CompressionLevel compression)
+void CreateAndTestZip(std::vector<std::string> const & files, std::string const & zipPath, CompressionLevel compression)
 {
   TEST(CreateZipFromFiles(files, zipPath, compression), ());
 
@@ -50,8 +49,8 @@ void CreateAndTestZip(std::vector<std::string> const & files, std::string const
   TEST(base::DeleteFileX(zipPath), ());
 }
 
-void CreateAndTestZipWithFolder(std::vector<std::string> const & files, std::vector<std::string> const & filesInArchive, std::string const & zipPath,
-                      CompressionLevel compression)
+void CreateAndTestZipWithFolder(std::vector<std::string> const & files, std::vector<std::string> const & filesInArchive,
+                                std::string const & zipPath, CompressionLevel compression)
 {
   TEST(CreateZipFromFiles(files, filesInArchive, zipPath, compression), ());
 
@@ -72,10 +71,10 @@ void CreateAndTestZipWithFolder(std::vector<std::string> const & files, std::vec
 
 std::vector<CompressionLevel> GetCompressionLevels()
 {
-  return {CompressionLevel::DefaultCompression, CompressionLevel::BestCompression,
-          CompressionLevel::BestSpeed, CompressionLevel::NoCompression};
-}
+  return {CompressionLevel::DefaultCompression, CompressionLevel::BestCompression, CompressionLevel::BestSpeed,
+          CompressionLevel::NoCompression};
 }
+}  // namespace
 
 UNIT_TEST(CreateZip_BigFile)
 {
@@ -105,7 +104,8 @@ UNIT_TEST(CreateZip_Smoke)
 UNIT_TEST(CreateZip_MultipleFiles)
 {
   std::vector<std::string> const fileData{"testf1", "testfile2", "testfile3_longname.txt.xml.csv"};
-  SCOPE_GUARD(deleteFileGuard, [&fileData]() {
+  SCOPE_GUARD(deleteFileGuard, [&fileData]()
+  {
     for (auto const & file : fileData)
       TEST(base::DeleteFileX(file), ());
   });
@@ -150,7 +150,5 @@ UNIT_TEST(CreateZip_MultipleFilesSingleEmpty)
   }
 
   for (auto compression : GetCompressionLevels())
-  {
     CreateAndTestZip(fileData, "testzip.zip", compression);
-  }
 }
diff --git a/libs/coding/coding_tests/zip_reader_test.cpp b/libs/coding/coding_tests/zip_reader_test.cpp
index fc7b5e4d3..9ccad150e 100644
--- a/libs/coding/coding_tests/zip_reader_test.cpp
+++ b/libs/coding/coding_tests/zip_reader_test.cpp
@@ -1,7 +1,7 @@
 #include "testing/testing.hpp"
 
-#include "coding/zip_reader.hpp"
 #include "coding/file_writer.hpp"
+#include "coding/zip_reader.hpp"
 
 #include "base/logging.hpp"
 #include "base/macros.hpp"
@@ -11,17 +11,18 @@
 
 using namespace std;
 
-static char const zipBytes[] = "PK\003\004\n\0\0\0\0\0\222\226\342>\302\032"
-"x\372\005\0\0\0\005\0\0\0\b\0\034\0te"
-"st.txtUT\t\0\003\303>\017N\017"
-"?\017Nux\v\0\001\004\365\001\0\0\004P\0"
-"\0\0Test\nPK\001\002\036\003\n\0\0"
-"\0\0\0\222\226\342>\302\032x\372\005\0\0\0\005"
-"\0\0\0\b\0\030\0\0\0\0\0\0\0\0\0\244"
-"\201\0\0\0\0test.txtUT\005"
-"\0\003\303>\017Nux\v\0\001\004\365\001\0\0"
-"\004P\0\0\0PK\005\006\0\0\0\0\001\0\001"
-"\0N\0\0\0G\0\0\0\0\0";
+static char const zipBytes[] =
+    "PK\003\004\n\0\0\0\0\0\222\226\342>\302\032"
+    "x\372\005\0\0\0\005\0\0\0\b\0\034\0te"
+    "st.txtUT\t\0\003\303>\017N\017"
+    "?\017Nux\v\0\001\004\365\001\0\0\004P\0"
+    "\0\0Test\nPK\001\002\036\003\n\0\0"
+    "\0\0\0\222\226\342>\302\032x\372\005\0\0\0\005"
+    "\0\0\0\b\0\030\0\0\0\0\0\0\0\0\0\244"
+    "\201\0\0\0\0test.txtUT\005"
+    "\0\003\303>\017Nux\v\0\001\004\365\001\0\0"
+    "\004P\0\0\0PK\005\006\0\0\0\0\001\0\001"
+    "\0N\0\0\0G\0\0\0\0\0";
 
 UNIT_TEST(ZipReaderSmoke)
 {
@@ -74,21 +75,22 @@ UNIT_TEST(ZipReaderSmoke)
 }
 
 /// zip file with 3 files inside: 1.txt, 2.txt, 3.ttt
-static char const zipBytes2[] = "\x50\x4b\x3\x4\xa\x0\x0\x0\x0\x0\x92\x6b\xf6\x3e\x53\xfc\x51\x67\x2\x0\x0"
-"\x0\x2\x0\x0\x0\x5\x0\x1c\x0\x31\x2e\x74\x78\x74\x55\x54\x9\x0\x3\xd3\x50\x29\x4e\xd4\x50\x29\x4e\x75\x78"
-"\xb\x0\x1\x4\xf5\x1\x0\x0\x4\x14\x0\x0\x0\x31\xa\x50\x4b\x3\x4\xa\x0\x0\x0\x0\x0\x95\x6b\xf6\x3e\x90\xaf"
-"\x7c\x4c\x2\x0\x0\x0\x2\x0\x0\x0\x5\x0\x1c\x0\x32\x2e\x74\x78\x74\x55\x54\x9\x0\x3\xd9\x50\x29\x4e\xd9\x50"
-"\x29\x4e\x75\x78\xb\x0\x1\x4\xf5\x1\x0\x0\x4\x14\x0\x0\x0\x32\xa\x50\x4b\x3\x4\xa\x0\x0\x0\x0\x0\x9c\x6b"
-"\xf6\x3e\xd1\x9e\x67\x55\x2\x0\x0\x0\x2\x0\x0\x0\x5\x0\x1c\x0\x33\x2e\x74\x74\x74\x55\x54\x9\x0\x3\xe8\x50"
-"\x29\x4e\xe9\x50\x29\x4e\x75\x78\xb\x0\x1\x4\xf5\x1\x0\x0\x4\x14\x0\x0\x0\x33\xa\x50\x4b\x1\x2\x1e\x3\xa"
-"\x0\x0\x0\x0\x0\x92\x6b\xf6\x3e\x53\xfc\x51\x67\x2\x0\x0\x0\x2\x0\x0\x0\x5\x0\x18\x0\x0\x0\x0\x0\x1\x0\x0"
-"\x0\xa4\x81\x0\x0\x0\x0\x31\x2e\x74\x78\x74\x55\x54\x5\x0\x3\xd3\x50\x29\x4e\x75\x78\xb\x0\x1\x4\xf5\x1\x0"
-"\x0\x4\x14\x0\x0\x0\x50\x4b\x1\x2\x1e\x3\xa\x0\x0\x0\x0\x0\x95\x6b\xf6\x3e\x90\xaf\x7c\x4c\x2\x0\x0\x0\x2"
-"\x0\x0\x0\x5\x0\x18\x0\x0\x0\x0\x0\x1\x0\x0\x0\xa4\x81\x41\x0\x0\x0\x32\x2e\x74\x78\x74\x55\x54\x5\x0\x3"
-"\xd9\x50\x29\x4e\x75\x78\xb\x0\x1\x4\xf5\x1\x0\x0\x4\x14\x0\x0\x0\x50\x4b\x1\x2\x1e\x3\xa\x0\x0\x0\x0\x0"
-"\x9c\x6b\xf6\x3e\xd1\x9e\x67\x55\x2\x0\x0\x0\x2\x0\x0\x0\x5\x0\x18\x0\x0\x0\x0\x0\x1\x0\x0\x0\xa4\x81\x82"
-"\x0\x0\x0\x33\x2e\x74\x74\x74\x55\x54\x5\x0\x3\xe8\x50\x29\x4e\x75\x78\xb\x0\x1\x4\xf5\x1\x0\x0\x4\x14\x0"
-"\x0\x0\x50\x4b\x5\x6\x0\x0\x0\x0\x3\x0\x3\x0\xe1\x0\x0\x0\xc3\x0\x0\x0\x0\x0";
+static char const zipBytes2[] =
+    "\x50\x4b\x3\x4\xa\x0\x0\x0\x0\x0\x92\x6b\xf6\x3e\x53\xfc\x51\x67\x2\x0\x0"
+    "\x0\x2\x0\x0\x0\x5\x0\x1c\x0\x31\x2e\x74\x78\x74\x55\x54\x9\x0\x3\xd3\x50\x29\x4e\xd4\x50\x29\x4e\x75\x78"
+    "\xb\x0\x1\x4\xf5\x1\x0\x0\x4\x14\x0\x0\x0\x31\xa\x50\x4b\x3\x4\xa\x0\x0\x0\x0\x0\x95\x6b\xf6\x3e\x90\xaf"
+    "\x7c\x4c\x2\x0\x0\x0\x2\x0\x0\x0\x5\x0\x1c\x0\x32\x2e\x74\x78\x74\x55\x54\x9\x0\x3\xd9\x50\x29\x4e\xd9\x50"
+    "\x29\x4e\x75\x78\xb\x0\x1\x4\xf5\x1\x0\x0\x4\x14\x0\x0\x0\x32\xa\x50\x4b\x3\x4\xa\x0\x0\x0\x0\x0\x9c\x6b"
+    "\xf6\x3e\xd1\x9e\x67\x55\x2\x0\x0\x0\x2\x0\x0\x0\x5\x0\x1c\x0\x33\x2e\x74\x74\x74\x55\x54\x9\x0\x3\xe8\x50"
+    "\x29\x4e\xe9\x50\x29\x4e\x75\x78\xb\x0\x1\x4\xf5\x1\x0\x0\x4\x14\x0\x0\x0\x33\xa\x50\x4b\x1\x2\x1e\x3\xa"
+    "\x0\x0\x0\x0\x0\x92\x6b\xf6\x3e\x53\xfc\x51\x67\x2\x0\x0\x0\x2\x0\x0\x0\x5\x0\x18\x0\x0\x0\x0\x0\x1\x0\x0"
+    "\x0\xa4\x81\x0\x0\x0\x0\x31\x2e\x74\x78\x74\x55\x54\x5\x0\x3\xd3\x50\x29\x4e\x75\x78\xb\x0\x1\x4\xf5\x1\x0"
+    "\x0\x4\x14\x0\x0\x0\x50\x4b\x1\x2\x1e\x3\xa\x0\x0\x0\x0\x0\x95\x6b\xf6\x3e\x90\xaf\x7c\x4c\x2\x0\x0\x0\x2"
+    "\x0\x0\x0\x5\x0\x18\x0\x0\x0\x0\x0\x1\x0\x0\x0\xa4\x81\x41\x0\x0\x0\x32\x2e\x74\x78\x74\x55\x54\x5\x0\x3"
+    "\xd9\x50\x29\x4e\x75\x78\xb\x0\x1\x4\xf5\x1\x0\x0\x4\x14\x0\x0\x0\x50\x4b\x1\x2\x1e\x3\xa\x0\x0\x0\x0\x0"
+    "\x9c\x6b\xf6\x3e\xd1\x9e\x67\x55\x2\x0\x0\x0\x2\x0\x0\x0\x5\x0\x18\x0\x0\x0\x0\x0\x1\x0\x0\x0\xa4\x81\x82"
+    "\x0\x0\x0\x33\x2e\x74\x74\x74\x55\x54\x5\x0\x3\xe8\x50\x29\x4e\x75\x78\xb\x0\x1\x4\xf5\x1\x0\x0\x4\x14\x0"
+    "\x0\x0\x50\x4b\x5\x6\x0\x0\x0\x0\x3\x0\x3\x0\xe1\x0\x0\x0\xc3\x0\x0\x0\x0\x0";
 
 static char const invalidZip[] = "1234567890asdqwetwezxvcbdhg322353tgfsd";
 
@@ -132,8 +134,7 @@ UNIT_TEST(ZipFilesList)
     TEST(false, ("This test shouldn't be reached - exception should be thrown"));
   }
   catch (exception const &)
-  {
-  }
+  {}
 
   FileWriter::DeleteFileX(ZIPFILE_INVALID);
   FileWriter::DeleteFileX(ZIPFILE);
@@ -142,26 +143,26 @@ UNIT_TEST(ZipFilesList)
 /// Compressed zip file with 2 files in assets folder:
 /// assets/aaaaaaaaaa.txt (contains text "aaaaaaaaaa\x0A")
 /// assets/holalala.txt (contains text "Holalala\x0A")
-static char const zipBytes3[] = \
-	"\x50\x4B\x03\x04\x14\x00\x02\x00\x08\x00\xAF\x96\x56\x40\x42\xE5\x26\x8F\x06\x00" \
-	"\x00\x00\x0B\x00\x00\x00\x15\x00\x1C\x00\x61\x73\x73\x65\x74\x73\x2F\x61\x61\x61" \
-	"\x61\x61\x61\x61\x61\x61\x61\x2E\x74\x78\x74\x55\x54\x09\x00\x03\x7A\x0F\x45\x4F" \
-	"\xD8\x0F\x45\x4F\x75\x78\x0B\x00\x01\x04\xF5\x01\x00\x00\x04\x14\x00\x00\x00\x4B" \
-	"\x4C\x84\x01\x2E\x00\x50\x4B\x03\x04\x14\x00\x02\x00\x08\x00\xE6\x96\x56\x40\x5E" \
-	"\x76\x90\x07\x08\x00\x00\x00\x09\x00\x00\x00\x13\x00\x1C\x00\x61\x73\x73\x65\x74" \
-	"\x73\x2F\x68\x6F\x6C\x61\x6C\x61\x6C\x61\x2E\x74\x78\x74\x55\x54\x09\x00\x03\xDF" \
-	"\x0F\x45\x4F\xDC\x0F\x45\x4F\x75\x78\x0B\x00\x01\x04\xF5\x01\x00\x00\x04\x14\x00" \
-	"\x00\x00\xF3\xC8\xCF\x49\x04\x41\x2E\x00\x50\x4B\x01\x02\x1E\x03\x14\x00\x02\x00" \
-	"\x08\x00\xAF\x96\x56\x40\x42\xE5\x26\x8F\x06\x00\x00\x00\x0B\x00\x00\x00\x15\x00" \
-	"\x18\x00\x00\x00\x00\x00\x01\x00\x00\x00\xA4\x81\x00\x00\x00\x00\x61\x73\x73\x65" \
-	"\x74\x73\x2F\x61\x61\x61\x61\x61\x61\x61\x61\x61\x61\x2E\x74\x78\x74\x55\x54\x05" \
-	"\x00\x03\x7A\x0F\x45\x4F\x75\x78\x0B\x00\x01\x04\xF5\x01\x00\x00\x04\x14\x00\x00" \
-	"\x00\x50\x4B\x01\x02\x1E\x03\x14\x00\x02\x00\x08\x00\xE6\x96\x56\x40\x5E\x76\x90" \
-	"\x07\x08\x00\x00\x00\x09\x00\x00\x00\x13\x00\x18\x00\x00\x00\x00\x00\x01\x00\x00" \
-	"\x00\xA4\x81\x55\x00\x00\x00\x61\x73\x73\x65\x74\x73\x2F\x68\x6F\x6C\x61\x6C\x61" \
-	"\x6C\x61\x2E\x74\x78\x74\x55\x54\x05\x00\x03\xDF\x0F\x45\x4F\x75\x78\x0B\x00\x01" \
-	"\x04\xF5\x01\x00\x00\x04\x14\x00\x00\x00\x50\x4B\x05\x06\x00\x00\x00\x00\x02\x00" \
-	"\x02\x00\xB4\x00\x00\x00\xAA\x00\x00\x00\x00\x00";
+static char const zipBytes3[] =
+    "\x50\x4B\x03\x04\x14\x00\x02\x00\x08\x00\xAF\x96\x56\x40\x42\xE5\x26\x8F\x06\x00"
+    "\x00\x00\x0B\x00\x00\x00\x15\x00\x1C\x00\x61\x73\x73\x65\x74\x73\x2F\x61\x61\x61"
+    "\x61\x61\x61\x61\x61\x61\x61\x2E\x74\x78\x74\x55\x54\x09\x00\x03\x7A\x0F\x45\x4F"
+    "\xD8\x0F\x45\x4F\x75\x78\x0B\x00\x01\x04\xF5\x01\x00\x00\x04\x14\x00\x00\x00\x4B"
+    "\x4C\x84\x01\x2E\x00\x50\x4B\x03\x04\x14\x00\x02\x00\x08\x00\xE6\x96\x56\x40\x5E"
+    "\x76\x90\x07\x08\x00\x00\x00\x09\x00\x00\x00\x13\x00\x1C\x00\x61\x73\x73\x65\x74"
+    "\x73\x2F\x68\x6F\x6C\x61\x6C\x61\x6C\x61\x2E\x74\x78\x74\x55\x54\x09\x00\x03\xDF"
+    "\x0F\x45\x4F\xDC\x0F\x45\x4F\x75\x78\x0B\x00\x01\x04\xF5\x01\x00\x00\x04\x14\x00"
+    "\x00\x00\xF3\xC8\xCF\x49\x04\x41\x2E\x00\x50\x4B\x01\x02\x1E\x03\x14\x00\x02\x00"
+    "\x08\x00\xAF\x96\x56\x40\x42\xE5\x26\x8F\x06\x00\x00\x00\x0B\x00\x00\x00\x15\x00"
+    "\x18\x00\x00\x00\x00\x00\x01\x00\x00\x00\xA4\x81\x00\x00\x00\x00\x61\x73\x73\x65"
+    "\x74\x73\x2F\x61\x61\x61\x61\x61\x61\x61\x61\x61\x61\x2E\x74\x78\x74\x55\x54\x05"
+    "\x00\x03\x7A\x0F\x45\x4F\x75\x78\x0B\x00\x01\x04\xF5\x01\x00\x00\x04\x14\x00\x00"
+    "\x00\x50\x4B\x01\x02\x1E\x03\x14\x00\x02\x00\x08\x00\xE6\x96\x56\x40\x5E\x76\x90"
+    "\x07\x08\x00\x00\x00\x09\x00\x00\x00\x13\x00\x18\x00\x00\x00\x00\x00\x01\x00\x00"
+    "\x00\xA4\x81\x55\x00\x00\x00\x61\x73\x73\x65\x74\x73\x2F\x68\x6F\x6C\x61\x6C\x61"
+    "\x6C\x61\x2E\x74\x78\x74\x55\x54\x05\x00\x03\xDF\x0F\x45\x4F\x75\x78\x0B\x00\x01"
+    "\x04\xF5\x01\x00\x00\x04\x14\x00\x00\x00\x50\x4B\x05\x06\x00\x00\x00\x00\x02\x00"
+    "\x02\x00\xB4\x00\x00\x00\xAA\x00\x00\x00\x00\x00";
 
 UNIT_TEST(ZipExtract)
 {
diff --git a/libs/coding/coding_tests/zlib_test.cpp b/libs/coding/coding_tests/zlib_test.cpp
index 0234fbbd5..a8d3d453a 100644
--- a/libs/coding/coding_tests/zlib_test.cpp
+++ b/libs/coding/coding_tests/zlib_test.cpp
@@ -19,11 +19,10 @@ using namespace std;
 using Deflate = ZLib::Deflate;
 using Inflate = ZLib::Inflate;
 
-pair<Deflate::Format, Inflate::Format> const g_combinations[] = {
-    {Deflate::Format::ZLib, Inflate::Format::ZLib},
-    {Deflate::Format::ZLib, Inflate::Format::Both},
-    {Deflate::Format::GZip, Inflate::Format::GZip},
-    {Deflate::Format::GZip, Inflate::Format::Both}};
+pair<Deflate::Format, Inflate::Format> const g_combinations[] = {{Deflate::Format::ZLib, Inflate::Format::ZLib},
+                                                                 {Deflate::Format::ZLib, Inflate::Format::Both},
+                                                                 {Deflate::Format::GZip, Inflate::Format::GZip},
+                                                                 {Deflate::Format::GZip, Inflate::Format::Both}};
 
 namespace
 {
@@ -75,10 +74,9 @@ UNIT_TEST(GZip_ForeignData)
   // To get this array of bytes, type following:
   //
   // echo -n 'Hello World!' | gzip -c | od -t x1
-  uint8_t const data[] = {0x1f, 0x8b, 0x08, 0x08, 0x6d, 0x55, 0x08, 0x59, 0x00, 0x03, 0x73,
-                          0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x74, 0x78, 0x74, 0x00, 0xf3,
-                          0x48, 0xcd, 0xc9, 0xc9, 0xd7, 0x51, 0x08, 0xcf, 0x2f, 0xca, 0x49,
-                          0x51, 0x04, 0x00, 0xd0, 0xc3, 0x4a, 0xec, 0x0d, 0x00, 0x00, 0x00};
+  uint8_t const data[] = {0x1f, 0x8b, 0x08, 0x08, 0x6d, 0x55, 0x08, 0x59, 0x00, 0x03, 0x73, 0x61, 0x6d, 0x70, 0x6c,
+                          0x65, 0x2e, 0x74, 0x78, 0x74, 0x00, 0xf3, 0x48, 0xcd, 0xc9, 0xc9, 0xd7, 0x51, 0x08, 0xcf,
+                          0x2f, 0xca, 0x49, 0x51, 0x04, 0x00, 0xd0, 0xc3, 0x4a, 0xec, 0x0d, 0x00, 0x00, 0x00};
 
   string s;
 
@@ -90,11 +88,9 @@ UNIT_TEST(GZip_ForeignData)
 UNIT_TEST(GZip_ExtraDataInBuffer)
 {
   // Data from GZip_ForeignData + extra \n at the end of the buffer.
-  uint8_t const data[] = {0x1f, 0x8b, 0x08, 0x08, 0x6d, 0x55, 0x08, 0x59, 0x00, 0x03, 0x73,
-                          0x61, 0x6d, 0x70, 0x6c, 0x65, 0x2e, 0x74, 0x78, 0x74, 0x00, 0xf3,
-                          0x48, 0xcd, 0xc9, 0xc9, 0xd7, 0x51, 0x08, 0xcf, 0x2f, 0xca, 0x49,
-                          0x51, 0x04, 0x00, 0xd0, 0xc3, 0x4a, 0xec, 0x0d, 0x00, 0x00, 0x00,
-                          0x0a};
+  uint8_t const data[] = {0x1f, 0x8b, 0x08, 0x08, 0x6d, 0x55, 0x08, 0x59, 0x00, 0x03, 0x73, 0x61, 0x6d, 0x70, 0x6c,
+                          0x65, 0x2e, 0x74, 0x78, 0x74, 0x00, 0xf3, 0x48, 0xcd, 0xc9, 0xc9, 0xd7, 0x51, 0x08, 0xcf,
+                          0x2f, 0xca, 0x49, 0x51, 0x04, 0x00, 0xd0, 0xc3, 0x4a, 0xec, 0x0d, 0x00, 0x00, 0x00, 0x0a};
 
   string s;
 
diff --git a/libs/coding/compressed_bit_vector.cpp b/libs/coding/compressed_bit_vector.cpp
index 43aef358f..728ac397d 100644
--- a/libs/coding/compressed_bit_vector.cpp
+++ b/libs/coding/compressed_bit_vector.cpp
@@ -17,8 +17,7 @@ struct IntersectOp
 {
   IntersectOp() {}
 
-  unique_ptr<coding::CompressedBitVector> operator()(coding::DenseCBV const & a,
-                                                     coding::DenseCBV const & b) const
+  unique_ptr<coding::CompressedBitVector> operator()(coding::DenseCBV const & a, coding::DenseCBV const & b) const
   {
     size_t const sizeA = a.NumBitGroups();
     size_t const sizeB = b.NumBitGroups();
@@ -29,8 +28,7 @@ struct IntersectOp
   }
 
   // The intersection of dense and sparse is always sparse.
-  unique_ptr<coding::CompressedBitVector> operator()(coding::DenseCBV const & a,
-                                                     coding::SparseCBV const & b) const
+  unique_ptr<coding::CompressedBitVector> operator()(coding::DenseCBV const & a, coding::SparseCBV const & b) const
   {
     vector<uint64_t> resPos;
     for (size_t i = 0; i < b.PopCount(); ++i)
@@ -42,14 +40,12 @@ struct IntersectOp
     return make_unique<coding::SparseCBV>(std::move(resPos));
   }
 
-  unique_ptr<coding::CompressedBitVector> operator()(coding::SparseCBV const & a,
-                                                     coding::DenseCBV const & b) const
+  unique_ptr<coding::CompressedBitVector> operator()(coding::SparseCBV const & a, coding::DenseCBV const & b) const
   {
     return operator()(b, a);
   }
 
-  unique_ptr<coding::CompressedBitVector> operator()(coding::SparseCBV const & a,
-                                                     coding::SparseCBV const & b) const
+  unique_ptr<coding::CompressedBitVector> operator()(coding::SparseCBV const & a, coding::SparseCBV const & b) const
   {
     vector<uint64_t> resPos;
     set_intersection(a.Begin(), a.End(), b.Begin(), b.End(), back_inserter(resPos));
@@ -61,8 +57,7 @@ struct SubtractOp
 {
   SubtractOp() {}
 
-  unique_ptr<coding::CompressedBitVector> operator()(coding::DenseCBV const & a,
-                                                     coding::DenseCBV const & b) const
+  unique_ptr<coding::CompressedBitVector> operator()(coding::DenseCBV const & a, coding::DenseCBV const & b) const
   {
     size_t const sizeA = a.NumBitGroups();
     size_t const sizeB = b.NumBitGroups();
@@ -72,8 +67,7 @@ struct SubtractOp
     return CompressedBitVectorBuilder::FromBitGroups(std::move(resGroups));
   }
 
-  unique_ptr<coding::CompressedBitVector> operator()(coding::DenseCBV const & a,
-                                                     coding::SparseCBV const & b) const
+  unique_ptr<coding::CompressedBitVector> operator()(coding::DenseCBV const & a, coding::SparseCBV const & b) const
   {
     vector<uint64_t> resGroups(a.NumBitGroups());
 
@@ -100,19 +94,14 @@ struct SubtractOp
     return CompressedBitVectorBuilder::FromBitGroups(std::move(resGroups));
   }
 
-  unique_ptr<coding::CompressedBitVector> operator()(coding::SparseCBV const & a,
-                                                     coding::DenseCBV const & b) const
+  unique_ptr<coding::CompressedBitVector> operator()(coding::SparseCBV const & a, coding::DenseCBV const & b) const
   {
     vector<uint64_t> resPos;
-    copy_if(a.Begin(), a.End(), back_inserter(resPos), [&](uint64_t bit)
-            {
-              return !b.GetBit(bit);
-            });
+    copy_if(a.Begin(), a.End(), back_inserter(resPos), [&](uint64_t bit) { return !b.GetBit(bit); });
     return CompressedBitVectorBuilder::FromBitPositions(std::move(resPos));
   }
 
-  unique_ptr<coding::CompressedBitVector> operator()(coding::SparseCBV const & a,
-                                                     coding::SparseCBV const & b) const
+  unique_ptr<coding::CompressedBitVector> operator()(coding::SparseCBV const & a, coding::SparseCBV const & b) const
   {
     vector<uint64_t> resPos;
     set_difference(a.Begin(), a.End(), b.Begin(), b.End(), back_inserter(resPos));
@@ -124,8 +113,7 @@ struct UnionOp
 {
   UnionOp() {}
 
-  unique_ptr<coding::CompressedBitVector> operator()(coding::DenseCBV const & a,
-                                                     coding::DenseCBV const & b) const
+  unique_ptr<coding::CompressedBitVector> operator()(coding::DenseCBV const & a, coding::DenseCBV const & b) const
   {
     size_t const sizeA = a.NumBitGroups();
     size_t const sizeB = b.NumBitGroups();
@@ -136,27 +124,22 @@ struct UnionOp
     for (size_t i = 0; i < commonSize; ++i)
       resGroups[i] = a.GetBitGroup(i) | b.GetBitGroup(i);
     if (a.NumBitGroups() == resultSize)
-    {
       for (size_t i = commonSize; i < resultSize; ++i)
         resGroups[i] = a.GetBitGroup(i);
-    }
     else
-    {
       for (size_t i = commonSize; i < resultSize; ++i)
         resGroups[i] = b.GetBitGroup(i);
-    }
     return CompressedBitVectorBuilder::FromBitGroups(std::move(resGroups));
   }
 
-  unique_ptr<coding::CompressedBitVector> operator()(coding::DenseCBV const & a,
-                                                     coding::SparseCBV const & b) const
+  unique_ptr<coding::CompressedBitVector> operator()(coding::DenseCBV const & a, coding::SparseCBV const & b) const
   {
     size_t const sizeA = a.NumBitGroups();
     size_t const sizeB =
-        b.PopCount() == 0 ? 0
-                          : static_cast<size_t>((b.Select(static_cast<size_t>(b.PopCount() - 1)) +
-                                                 DenseCBV::kBlockSize - 1) /
-                                                DenseCBV::kBlockSize);
+        b.PopCount() == 0
+            ? 0
+            : static_cast<size_t>((b.Select(static_cast<size_t>(b.PopCount() - 1)) + DenseCBV::kBlockSize - 1) /
+                                  DenseCBV::kBlockSize);
     if (sizeB > sizeA)
     {
       vector<uint64_t> resPos;
@@ -198,14 +181,12 @@ struct UnionOp
     return CompressedBitVectorBuilder::FromBitGroups(std::move(resGroups));
   }
 
-  unique_ptr<coding::CompressedBitVector> operator()(coding::SparseCBV const & a,
-                                                     coding::DenseCBV const & b) const
+  unique_ptr<coding::CompressedBitVector> operator()(coding::SparseCBV const & a, coding::DenseCBV const & b) const
   {
     return operator()(b, a);
   }
 
-  unique_ptr<coding::CompressedBitVector> operator()(coding::SparseCBV const & a,
-                                                     coding::SparseCBV const & b) const
+  unique_ptr<coding::CompressedBitVector> operator()(coding::SparseCBV const & a, coding::SparseCBV const & b) const
   {
     vector<uint64_t> resPos;
     set_union(a.Begin(), a.End(), b.Begin(), b.End(), back_inserter(resPos));
@@ -279,18 +260,13 @@ uint64_t const DenseCBV::kBlockSize;
 DenseCBV::DenseCBV(vector<uint64_t> const & setBits)
 {
   if (setBits.empty())
-  {
     return;
-  }
   uint64_t const maxBit = *max_element(setBits.begin(), setBits.end());
   size_t const sz = 1 + static_cast<size_t>(maxBit / kBlockSize);
   m_bitGroups.resize(sz);
   m_popCount = static_cast<uint64_t>(setBits.size());
   for (uint64_t pos : setBits)
-  {
-    m_bitGroups[static_cast<size_t>(pos / kBlockSize)] |= static_cast<uint64_t>(1)
-                                                          << (pos % kBlockSize);
-  }
+    m_bitGroups[static_cast<size_t>(pos / kBlockSize)] |= static_cast<uint64_t>(1) << (pos % kBlockSize);
 }
 
 // static
@@ -309,7 +285,10 @@ uint64_t DenseCBV::GetBitGroup(size_t i) const
   return i < m_bitGroups.size() ? m_bitGroups[i] : 0;
 }
 
-uint64_t DenseCBV::PopCount() const { return m_popCount; }
+uint64_t DenseCBV::PopCount() const
+{
+  return m_popCount;
+}
 
 bool DenseCBV::GetBit(uint64_t pos) const
 {
@@ -383,7 +362,10 @@ uint64_t SparseCBV::Select(size_t i) const
   return m_positions[i];
 }
 
-uint64_t SparseCBV::PopCount() const { return m_positions.size(); }
+uint64_t SparseCBV::PopCount() const
+{
+  return m_positions.size();
+}
 
 bool SparseCBV::GetBit(uint64_t pos) const
 {
@@ -418,22 +400,19 @@ unique_ptr<CompressedBitVector> SparseCBV::Clone() const
 }
 
 // static
-unique_ptr<CompressedBitVector> CompressedBitVectorBuilder::FromBitPositions(
-    vector<uint64_t> const & setBits)
+unique_ptr<CompressedBitVector> CompressedBitVectorBuilder::FromBitPositions(vector<uint64_t> const & setBits)
 {
   return BuildFromBitPositions(setBits);
 }
 
 // static
-unique_ptr<CompressedBitVector> CompressedBitVectorBuilder::FromBitPositions(
-    vector<uint64_t> && setBits)
+unique_ptr<CompressedBitVector> CompressedBitVectorBuilder::FromBitPositions(vector<uint64_t> && setBits)
 {
   return BuildFromBitPositions(std::move(setBits));
 }
 
 // static
-unique_ptr<CompressedBitVector> CompressedBitVectorBuilder::FromBitGroups(
-    vector<uint64_t> && bitGroups)
+unique_ptr<CompressedBitVector> CompressedBitVectorBuilder::FromBitGroups(vector<uint64_t> && bitGroups)
 {
   static uint64_t const kBlockSize = DenseCBV::kBlockSize;
 
@@ -454,10 +433,8 @@ unique_ptr<CompressedBitVector> CompressedBitVectorBuilder::FromBitGroups(
   for (size_t i = 0; i < bitGroups.size(); ++i)
   {
     for (size_t j = 0; j < kBlockSize; ++j)
-    {
       if (((bitGroups[i] >> j) & 1) > 0)
         setBits.push_back(kBlockSize * i + j);
-    }
   }
   return make_unique<SparseCBV>(setBits);
 }
diff --git a/libs/coding/compressed_bit_vector.hpp b/libs/coding/compressed_bit_vector.hpp
index e260e2581..48f2d9477 100644
--- a/libs/coding/compressed_bit_vector.hpp
+++ b/libs/coding/compressed_bit_vector.hpp
@@ -48,8 +48,7 @@ public:
                                                        CompressedBitVector const & rhs);
 
   // Unites two bit vectors.
-  static std::unique_ptr<CompressedBitVector> Union(CompressedBitVector const & lhs,
-                                                    CompressedBitVector const & rhs);
+  static std::unique_ptr<CompressedBitVector> Union(CompressedBitVector const & lhs, CompressedBitVector const & rhs);
 
   static bool IsEmpty(std::unique_ptr<CompressedBitVector> const & cbv);
 
@@ -156,10 +155,8 @@ public:
   {
     base::ControlFlowWrapper<Fn> wrapper(std::forward<Fn>(f));
     for (auto const & position : m_positions)
-    {
       if (wrapper(position) == base::ControlFlow::Break)
         return;
-    }
   }
 
   // CompressedBitVector overrides:
@@ -183,8 +180,7 @@ class CompressedBitVectorBuilder
 public:
   // Chooses a strategy to store the bit vector with bits from setBits set to one
   // and returns a pointer to a class that fits best.
-  static std::unique_ptr<CompressedBitVector> FromBitPositions(
-      std::vector<uint64_t> const & setBits);
+  static std::unique_ptr<CompressedBitVector> FromBitPositions(std::vector<uint64_t> const & setBits);
   static std::unique_ptr<CompressedBitVector> FromBitPositions(std::vector<uint64_t> && setBits);
 
   // Chooses a strategy to store the bit vector with bits from a bitmap obtained
@@ -207,8 +203,7 @@ public:
   static std::unique_ptr<CompressedBitVector> DeserializeFromSource(TSource & src)
   {
     uint8_t header = ReadPrimitiveFromSource<uint8_t>(src);
-    CompressedBitVector::StorageStrategy strat =
-        static_cast<CompressedBitVector::StorageStrategy>(header);
+    CompressedBitVector::StorageStrategy strat = static_cast<CompressedBitVector::StorageStrategy>(header);
     switch (strat)
     {
     case CompressedBitVector::StorageStrategy::Dense:
@@ -263,10 +258,7 @@ public:
   {
     static constexpr uint64_t kBase = 127;
     uint64_t hash = 0;
-    CompressedBitVectorEnumerator::ForEach(cbv, [&hash](uint64_t i)
-                                           {
-                                             hash = hash * kBase + i + 1;
-                                           });
+    CompressedBitVectorEnumerator::ForEach(cbv, [&hash](uint64_t i) { hash = hash * kBase + i + 1; });
     return hash;
   }
 };
diff --git a/libs/coding/constants.hpp b/libs/coding/constants.hpp
index c37e681ec..ec9958263 100644
--- a/libs/coding/constants.hpp
+++ b/libs/coding/constants.hpp
@@ -1,4 +1,4 @@
 #pragma once
 
-static const size_t READ_FILE_BUFFER_SIZE = 512 * 1024;
-static const unsigned int ZIP_FILE_BUFFER_SIZE = 64 * 1024;
+static size_t const READ_FILE_BUFFER_SIZE = 512 * 1024;
+static unsigned int const ZIP_FILE_BUFFER_SIZE = 64 * 1024;
diff --git a/libs/coding/csv_reader.cpp b/libs/coding/csv_reader.cpp
index df33fab40..882091082 100644
--- a/libs/coding/csv_reader.cpp
+++ b/libs/coding/csv_reader.cpp
@@ -6,7 +6,9 @@
 namespace coding
 {
 CSVReader::CSVReader(std::unique_ptr<ReaderInterface> reader, bool hasHeader, char delimiter)
-  : m_reader(std::move(reader)), m_hasHeader(hasHeader), m_delimiter(delimiter)
+  : m_reader(std::move(reader))
+  , m_hasHeader(hasHeader)
+  , m_delimiter(delimiter)
 {
   if (!HasHeader())
     return;
@@ -18,31 +20,35 @@ CSVReader::CSVReader(std::unique_ptr<ReaderInterface> reader, bool hasHeader, ch
 
 CSVReader::CSVReader(std::string const & filename, bool hasHeader, char delimiter)
   : CSVReader(std::make_unique<DefaultReader>(filename), hasHeader, delimiter)
-{
-}
+{}
 
 CSVReader::CSVReader(std::istream & stream, bool hasHeader, char delimiter)
   : CSVReader(std::make_unique<IstreamWrapper>(stream), hasHeader, delimiter)
-{
-}
+{}
 
 CSVReader::CSVReader(Reader const & reader, bool hasHeader, char delimiter)
   : CSVReader(std::make_unique<ReaderWrapper>(reader), hasHeader, delimiter)
+{}
+
+bool CSVReader::HasHeader() const
 {
+  return m_hasHeader;
 }
 
-bool CSVReader::HasHeader() const { return m_hasHeader; }
+char CSVReader::GetDelimiter() const
+{
+  return m_delimiter;
+}
 
-char CSVReader::GetDelimiter() const { return m_delimiter; }
-
-CSVReader::Row const & CSVReader::GetHeader() const { return m_header; }
+CSVReader::Row const & CSVReader::GetHeader() const
+{
+  return m_header;
+}
 
 CSVReader::Rows CSVReader::ReadAll()
 {
   Rows file;
-  ForEachRow([&](auto const & row) {
-    file.emplace_back(row);
-  });
+  ForEachRow([&](auto const & row) { file.emplace_back(row); });
   return file;
 }
 
@@ -58,7 +64,10 @@ std::optional<CSVReader::Row> CSVReader::ReadRow()
   return row;
 }
 
-size_t CSVReader::GetCurrentLineNumber() const { return m_currentLine; }
+size_t CSVReader::GetCurrentLineNumber() const
+{
+  return m_currentLine;
+}
 
 CSVReader::IstreamWrapper::IstreamWrapper(std::istream & stream) : m_stream(stream) {}
 
@@ -91,8 +100,7 @@ std::optional<std::string> CSVReader::ReaderWrapper::ReadLine()
   return std::string(std::begin(line), end);
 }
 
-CSVReader::DefaultReader::DefaultReader(std::string const & filename)
-: m_stream(filename)
+CSVReader::DefaultReader::DefaultReader(std::string const & filename) : m_stream(filename)
 {
   if (!m_stream)
     LOG(LERROR, ("Can't open file ", filename));
@@ -111,10 +119,7 @@ CSVRunner::Iterator::Iterator(CSVReader & reader, bool isEnd) : m_reader(reader)
     m_current = m_reader.ReadRow();
 }
 
-CSVRunner::Iterator::Iterator(Iterator const & other)
-  : m_reader(other.m_reader), m_current(other.m_current)
-{
-}
+CSVRunner::Iterator::Iterator(Iterator const & other) : m_reader(other.m_reader), m_current(other.m_current) {}
 
 CSVRunner::Iterator & CSVRunner::Iterator::operator++()
 {
@@ -131,17 +136,28 @@ CSVRunner::Iterator CSVRunner::Iterator::operator++(int)
 
 bool CSVRunner::Iterator::operator==(Iterator const & other) const
 {
-  return &m_reader == &other.m_reader &&
-      static_cast<bool>(m_current) == static_cast<bool>(other.m_current);
+  return &m_reader == &other.m_reader && static_cast<bool>(m_current) == static_cast<bool>(other.m_current);
 }
 
-bool CSVRunner::Iterator::operator!=(Iterator const & other) const { return !(*this == other); }
+bool CSVRunner::Iterator::operator!=(Iterator const & other) const
+{
+  return !(*this == other);
+}
 
-CSVReader::Row & CSVRunner::Iterator::operator*() { return *m_current; }
+CSVReader::Row & CSVRunner::Iterator::operator*()
+{
+  return *m_current;
+}
 
 CSVRunner::CSVRunner(CSVReader && reader) : m_reader(std::move(reader)) {}
 
-CSVRunner::Iterator CSVRunner::begin() { return Iterator(m_reader); }
+CSVRunner::Iterator CSVRunner::begin()
+{
+  return Iterator(m_reader);
+}
 
-CSVRunner::Iterator CSVRunner::end() { return Iterator(m_reader, true /* isEnd */); }
+CSVRunner::Iterator CSVRunner::end()
+{
+  return Iterator(m_reader, true /* isEnd */);
+}
 }  // namespace coding
diff --git a/libs/coding/dd_vector.hpp b/libs/coding/dd_vector.hpp
index 2e83fc0bc..e3a5d3c62 100644
--- a/libs/coding/dd_vector.hpp
+++ b/libs/coding/dd_vector.hpp
@@ -23,10 +23,7 @@ public:
 
   DDVector() : m_Size(0) {}
 
-  explicit DDVector(TReader const & reader) : m_reader(reader)
-  {
-    InitSize();
-  }
+  explicit DDVector(TReader const & reader) : m_reader(reader) { InitSize(); }
 
   void Init(TReader const & reader)
   {
@@ -34,35 +31,29 @@ public:
     InitSize();
   }
 
-  size_type size() const
-  {
-    return m_Size;
-  }
+  size_type size() const { return m_Size; }
 
-  T const operator [] (size_type i) const
+  T const operator[](size_type i) const
   {
     return ReadPrimitiveFromPos<T>(m_reader, static_cast<uint64_t>(i) * sizeof(T));
   }
 
-  class const_iterator : public boost::iterator_facade<
-      const_iterator,
-      value_type const,
-      boost::random_access_traversal_tag,
-      value_type const &,
-      difference_type>
+  class const_iterator
+    : public boost::iterator_facade<const_iterator, value_type const, boost::random_access_traversal_tag,
+                                    value_type const &, difference_type>
   {
   public:
 #ifdef DEBUG
     const_iterator(ReaderType const * pReader, size_type i, size_type size)
-      : m_pReader(pReader), m_I(i), m_bValueRead(false), m_Size(size)
+      : m_pReader(pReader)
+      , m_I(i)
+      , m_bValueRead(false)
+      , m_Size(size)
     {
       ASSERT(static_cast<difference_type>(m_Size) >= 0, ());
     }
 #else
-    const_iterator(ReaderType const * pReader, size_type i)
-      : m_pReader(pReader), m_I(i), m_bValueRead(false)
-    {
-    }
+    const_iterator(ReaderType const * pReader, size_type i) : m_pReader(pReader), m_I(i), m_bValueRead(false) {}
 #endif
 
     T const & dereference() const
@@ -90,8 +81,7 @@ public:
       ASSERT_LESS_OR_EQUAL(it.m_I, it.m_Size, (it.m_bValueRead));
       ASSERT_EQUAL(m_Size, it.m_Size, (m_I, it.m_I, m_bValueRead, it.m_bValueRead));
       ASSERT(m_pReader == it.m_pReader, (m_I, m_Size, it.m_I, it.m_Size));
-      return (static_cast<difference_type>(it.m_I) -
-              static_cast<difference_type>(m_I));
+      return (static_cast<difference_type>(it.m_I) - static_cast<difference_type>(m_I));
     }
 
     void increment()
diff --git a/libs/coding/diff.hpp b/libs/coding/diff.hpp
index 15f386294..bfa8facc0 100644
--- a/libs/coding/diff.hpp
+++ b/libs/coding/diff.hpp
@@ -19,15 +19,17 @@ enum Operation
   OPERATION_INSERT = 2,
 };
 
-template <class PatchWriterT, typename SizeT = uint64_t> class PatchCoder
+template <class PatchWriterT, typename SizeT = uint64_t>
+class PatchCoder
 {
 public:
   typedef SizeT size_type;
 
   explicit PatchCoder(PatchWriterT & patchWriter)
-    : m_LastOperation(OPERATION_COPY), m_LastOpCode(0), m_PatchWriter(patchWriter)
-  {
-  }
+    : m_LastOperation(OPERATION_COPY)
+    , m_LastOpCode(0)
+    , m_PatchWriter(patchWriter)
+  {}
 
   void Delete(size_type n)
   {
@@ -41,7 +43,8 @@ public:
       Op(OPERATION_COPY, n);
   }
 
-  template <typename TIter> void Insert(TIter it, size_type n)
+  template <typename TIter>
+  void Insert(TIter it, size_type n)
   {
     if (n != 0)
     {
@@ -50,10 +53,7 @@ public:
     }
   }
 
-  void Finalize()
-  {
-    WriteLasOp();
-  }
+  void Finalize() { WriteLasOp(); }
 
 private:
   void Op(Operation op, size_type n)
@@ -85,15 +85,12 @@ private:
 // Returns the length of the minimal patch, or -1 if no such patch found.
 // Intermediate information is saved into tmpSink and can be used later to restore
 // the resulting patch.
-template <
-    typename TSignedWord, // Signed word, capable of storing position in text.
-    class TSrcVector,     // Source data (A).
-    class TDstVector,     // Destination data (B).
-    class TTmpFileSink    // Sink to store temporary information.
-    >
-TSignedWord DiffMyersSimple(TSrcVector const & A,
-                            TDstVector const & B,
-                            TSignedWord maxPatchSize,
+template <typename TSignedWord,  // Signed word, capable of storing position in text.
+          class TSrcVector,      // Source data (A).
+          class TDstVector,      // Destination data (B).
+          class TTmpFileSink     // Sink to store temporary information.
+          >
+TSignedWord DiffMyersSimple(TSrcVector const & A, TDstVector const & B, TSignedWord maxPatchSize,
                             TTmpFileSink & tmpSink)
 {
   ASSERT_GREATER(maxPatchSize, 0, ());
@@ -107,9 +104,7 @@ TSignedWord DiffMyersSimple(TSrcVector const & A,
         x = V[maxPatchSize + k + 1];
       else
         x = V[maxPatchSize + k - 1] + 1;
-      while (x < static_cast<TSignedWord>(A.size()) &&
-             x - k < static_cast<TSignedWord>(B.size()) &&
-             A[x] == B[x - k])
+      while (x < static_cast<TSignedWord>(A.size()) && x - k < static_cast<TSignedWord>(B.size()) && A[x] == B[x - k])
         ++x;
       V[maxPatchSize + k] = x;
       if (x == static_cast<TSignedWord>(A.size()) && x - k == static_cast<TSignedWord>(B.size()))
@@ -126,16 +121,14 @@ class SimpleReplaceDiffer
 {
 public:
   template <typename SrcIterT, typename DstIterT, class PatchCoderT>
-  void Diff(SrcIterT srcBeg, SrcIterT srcEnd,
-            DstIterT dstBeg, DstIterT dstEnd,
-            PatchCoderT & patchCoder)
+  void Diff(SrcIterT srcBeg, SrcIterT srcEnd, DstIterT dstBeg, DstIterT dstEnd, PatchCoderT & patchCoder)
   {
     typename PatchCoderT::size_type begCopy = 0;
     for (; srcBeg != srcEnd && dstBeg != dstEnd && *srcBeg == *dstBeg; ++srcBeg, ++dstBeg)
       ++begCopy;
     patchCoder.Copy(begCopy);
     typename PatchCoderT::size_type endCopy = 0;
-    for (; srcBeg != srcEnd && dstBeg != dstEnd && *(srcEnd-1) == *(dstEnd-1); --srcEnd, --dstEnd)
+    for (; srcBeg != srcEnd && dstBeg != dstEnd && *(srcEnd - 1) == *(dstEnd - 1); --srcEnd, --dstEnd)
       ++endCopy;
     patchCoder.Delete(srcEnd - srcBeg);
     patchCoder.Insert(dstBeg, dstEnd - dstBeg);
@@ -152,13 +145,13 @@ template <class FineGrainedDiffT, class HasherT,
 class RollingHashDiffer
 {
 public:
-  explicit RollingHashDiffer(size_t blockSize,
-                               FineGrainedDiffT const & fineGrainedDiff = FineGrainedDiffT())
-    : m_FineGrainedDiff(fineGrainedDiff), m_BlockSize(blockSize) {}
+  explicit RollingHashDiffer(size_t blockSize, FineGrainedDiffT const & fineGrainedDiff = FineGrainedDiffT())
+    : m_FineGrainedDiff(fineGrainedDiff)
+    , m_BlockSize(blockSize)
+  {}
 
   template <typename SrcIterT, typename DstIterT, class PatchCoderT>
-  void Diff(SrcIterT const srcBeg, SrcIterT const srcEnd,
-            DstIterT const dstBeg, DstIterT const dstEnd,
+  void Diff(SrcIterT const srcBeg, SrcIterT const srcEnd, DstIterT const dstBeg, DstIterT const dstEnd,
             PatchCoderT & patchCoder)
   {
     if (srcEnd - srcBeg < static_cast<decltype(srcEnd - srcBeg)>(m_BlockSize) ||
@@ -169,8 +162,7 @@ public:
     }
     HasherT hasher;
     HashPosMultiMapT srcHashes;
-    for (SrcIterT src = srcBeg; srcEnd - src >= static_cast<decltype(srcEnd - src)>(m_BlockSize);
-         src += m_BlockSize)
+    for (SrcIterT src = srcBeg; srcEnd - src >= static_cast<decltype(srcEnd - src)>(m_BlockSize); src += m_BlockSize)
       srcHashes.insert(HashPosMultiMapValue(hasher.Init(src, m_BlockSize), src - srcBeg));
     SrcIterT srcLastDiff = srcBeg;
     DstIterT dst = dstBeg, dstNext = dstBeg + m_BlockSize, dstLastDiff = dstBeg;
@@ -183,15 +175,12 @@ public:
         pos_type const srcLastDiffPos = srcLastDiff - srcBeg;
         HashPosMultiMapIterator it = srcHashes.end();
         for (HashPosMultiMapIterator i = iters.first; i != iters.second; ++i)
-          if (i->second >= srcLastDiffPos &&
-              (it == srcHashes.end() || i->second < it->second))
+          if (i->second >= srcLastDiffPos && (it == srcHashes.end() || i->second < it->second))
             it = i;
-        if (it != srcHashes.end() &&
-            std::equal(srcBeg + it->second, srcBeg + it->second + m_BlockSize, dst))
+        if (it != srcHashes.end() && std::equal(srcBeg + it->second, srcBeg + it->second + m_BlockSize, dst))
         {
           pos_type srcBlockEqualPos = it->second;
-          m_FineGrainedDiff.Diff(srcLastDiff, srcBeg + srcBlockEqualPos,
-                                 dstLastDiff, dst, patchCoder);
+          m_FineGrainedDiff.Diff(srcLastDiff, srcBeg + srcBlockEqualPos, dstLastDiff, dst, patchCoder);
           patchCoder.Copy(m_BlockSize);
           srcLastDiff = srcBeg + srcBlockEqualPos + m_BlockSize;
           dst = dstLastDiff = dstNext;
@@ -207,6 +196,7 @@ public:
     if (srcLastDiff != srcEnd || dstLastDiff != dstEnd)
       m_FineGrainedDiff.Diff(srcLastDiff, srcEnd, dstLastDiff, dstEnd, patchCoder);
   }
+
 private:
   typedef typename HasherT::hash_type hash_type;
   typedef typename HashPosMultiMapT::value_type::second_type pos_type;
diff --git a/libs/coding/file_reader.cpp b/libs/coding/file_reader.cpp
index 28d57c45c..0f2727d3d 100644
--- a/libs/coding/file_reader.cpp
+++ b/libs/coding/file_reader.cpp
@@ -1,28 +1,29 @@
 #include "coding/file_reader.hpp"
 
-#include "coding/reader_cache.hpp"
 #include "coding/internal/file_data.hpp"
+#include "coding/reader_cache.hpp"
 
 #include "base/logging.hpp"
 
 #ifndef LOG_FILE_READER_STATS
 #define LOG_FILE_READER_STATS 0
-#endif // LOG_FILE_READER_STATS
+#endif  // LOG_FILE_READER_STATS
 
 #if LOG_FILE_READER_STATS && !defined(LOG_FILE_READER_EVERY_N_READS_MASK)
 #define LOG_FILE_READER_EVERY_N_READS_MASK 0xFFFFFFFF
 #endif
 
 // static
-uint32_t const FileReader::kDefaultLogPageSize = 10; // page size is 2^10 = 1024 = 1kb
+uint32_t const FileReader::kDefaultLogPageSize = 10;  // page size is 2^10 = 1024 = 1kb
 // static
-uint32_t const FileReader::kDefaultLogPageCount = 4; // page count is 2^4 = 16, i.e. 16 pages are cached
+uint32_t const FileReader::kDefaultLogPageCount = 4;  // page count is 2^4 = 16, i.e. 16 pages are cached
 
 class FileReader::FileReaderData
 {
 public:
   FileReaderData(std::string const & fileName, uint32_t logPageSize, uint32_t logPageCount)
-    : m_fileData(fileName), m_readerCache(logPageSize, logPageCount)
+    : m_fileData(fileName)
+    , m_readerCache(logPageSize, logPageCount)
   {
 #if LOG_FILE_READER_STATS
     m_readCallCount = 0;
@@ -42,9 +43,7 @@ public:
   {
 #if LOG_FILE_READER_STATS
     if (((++m_readCallCount) & LOG_FILE_READER_EVERY_N_READS_MASK) == 0)
-    {
       LOG(LINFO, ("FileReader", m_fileData.GetName(), m_readerCache.GetStatsStr()));
-    }
 #endif
 
     return m_readerCache.Read(m_fileData, pos, p, size);
@@ -55,9 +54,9 @@ private:
   {
   public:
     explicit FileDataWithCachedSize(std::string const & fileName)
-      : base::FileData(fileName, Op::READ), m_Size(FileData::Size())
-    {
-    }
+      : base::FileData(fileName, Op::READ)
+      , m_Size(FileData::Size())
+    {}
 
     uint64_t Size() const { return m_Size; }
 
@@ -73,10 +72,8 @@ private:
 #endif
 };
 
-FileReader::FileReader(std::string const & fileName)
-  : FileReader(fileName, kDefaultLogPageSize, kDefaultLogPageCount)
-{
-}
+FileReader::FileReader(std::string const & fileName) : FileReader(fileName, kDefaultLogPageSize, kDefaultLogPageCount)
+{}
 
 FileReader::FileReader(std::string const & fileName, uint32_t logPageSize, uint32_t logPageCount)
   : ModelReader(fileName)
@@ -85,19 +82,17 @@ FileReader::FileReader(std::string const & fileName, uint32_t logPageSize, uint3
   , m_fileData(std::make_shared<FileReaderData>(fileName, logPageSize, logPageCount))
   , m_offset(0)
   , m_size(m_fileData->Size())
-{
-}
+{}
 
-FileReader::FileReader(FileReader const & reader, uint64_t offset, uint64_t size,
-                       uint32_t logPageSize, uint32_t logPageCount)
+FileReader::FileReader(FileReader const & reader, uint64_t offset, uint64_t size, uint32_t logPageSize,
+                       uint32_t logPageCount)
   : ModelReader(reader.GetName())
   , m_logPageSize(logPageSize)
   , m_logPageCount(logPageCount)
   , m_fileData(reader.m_fileData)
   , m_offset(offset)
   , m_size(size)
-{
-}
+{}
 
 void FileReader::Read(uint64_t pos, void * p, size_t size) const
 {
@@ -115,8 +110,7 @@ std::unique_ptr<Reader> FileReader::CreateSubReader(uint64_t pos, uint64_t size)
 {
   CheckPosAndSize(pos, size);
   // Can't use make_unique with private constructor.
-  return std::unique_ptr<Reader>(
-      new FileReader(*this, m_offset + pos, size, m_logPageSize, m_logPageCount));
+  return std::unique_ptr<Reader>(new FileReader(*this, m_offset + pos, size, m_logPageSize, m_logPageCount));
 }
 
 void FileReader::CheckPosAndSize(uint64_t pos, uint64_t size) const
diff --git a/libs/coding/file_reader.hpp b/libs/coding/file_reader.hpp
index db7f449a4..170eab536 100644
--- a/libs/coding/file_reader.hpp
+++ b/libs/coding/file_reader.hpp
@@ -36,8 +36,7 @@ protected:
 private:
   class FileReaderData;
 
-  FileReader(FileReader const & reader, uint64_t offset, uint64_t size, uint32_t logPageSize,
-             uint32_t logPageCount);
+  FileReader(FileReader const & reader, uint64_t offset, uint64_t size, uint32_t logPageSize, uint32_t logPageCount);
 
   // Throws an exception if a (pos, size) read would result in an out-of-bounds access.
   void CheckPosAndSize(uint64_t pos, uint64_t size) const;
diff --git a/libs/coding/file_sort.hpp b/libs/coding/file_sort.hpp
index ca8377a78..e037b41d4 100644
--- a/libs/coding/file_sort.hpp
+++ b/libs/coding/file_sort.hpp
@@ -4,8 +4,8 @@
 #include "coding/file_writer.hpp"
 
 #include "base/base.hpp"
-#include "base/logging.hpp"
 #include "base/exception.hpp"
+#include "base/logging.hpp"
 
 #include <algorithm>
 #include <cstdlib>
@@ -22,7 +22,8 @@ struct Sorter
 {
   LessT m_Less;
   Sorter(LessT lessF) : m_Less(lessF) {}
-  template <typename IterT> void operator() (IterT beg, IterT end) const
+  template <typename IterT>
+  void operator()(IterT beg, IterT end) const
   {
     std::sort(beg, end, m_Less);
   }
@@ -36,8 +37,7 @@ template <typename T,                                        // Item type.
 class FileSorter
 {
 public:
-  FileSorter(size_t bufferBytes, std::string const & tmpFileName, OutputSinkT & outputSink,
-             LessT fLess = LessT())
+  FileSorter(size_t bufferBytes, std::string const & tmpFileName, OutputSinkT & outputSink, LessT fLess = LessT())
     : m_TmpFileName(tmpFileName)
     , m_BufferCapacity(std::max(size_t(16), bufferBytes / sizeof(T)))
     , m_OutputSink(outputSink)
@@ -90,11 +90,11 @@ public:
       {
         SortAndFinish();
       }
-      catch(RootException const & e)
+      catch (RootException const & e)
       {
         LOG(LERROR, (e.Msg()));
       }
-      catch(std::exception const & e)
+      catch (std::exception const & e)
       {
         LOG(LERROR, (e.what()));
       }
@@ -113,8 +113,7 @@ private:
   };
 
   using PriorityQueue =
-      std::priority_queue<std::pair<T, uint32_t>, std::vector<std::pair<T, uint32_t>>,
-                          ItemIndexPairGreater>;
+      std::priority_queue<std::pair<T, uint32_t>, std::vector<std::pair<T, uint32_t>>, ItemIndexPairGreater>;
 
   void FlushToTmpFile()
   {
diff --git a/libs/coding/file_writer.cpp b/libs/coding/file_writer.cpp
index f32b22a9d..dbb8be50a 100644
--- a/libs/coding/file_writer.cpp
+++ b/libs/coding/file_writer.cpp
@@ -5,8 +5,7 @@
 
 FileWriter::FileWriter(std::string const & fileName, FileWriter::Op op)
   : m_pFileData(std::make_unique<base::FileData>(fileName, static_cast<base::FileData::Op>(op)))
-{
-}
+{}
 
 FileWriter::~FileWriter() noexcept(false)
 {
diff --git a/libs/coding/file_writer.hpp b/libs/coding/file_writer.hpp
index e6641b0a8..48a203f05 100644
--- a/libs/coding/file_writer.hpp
+++ b/libs/coding/file_writer.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "coding/writer.hpp"
 #include "coding/internal/file_data.hpp"
 #include "coding/write_to_sink.hpp"
+#include "coding/writer.hpp"
 
 #include "base/assert.hpp"
 #include "base/macros.hpp"
@@ -34,8 +34,7 @@ public:
     OP_APPEND = 3
   };
 
-  explicit FileWriter(std::string const & fileName,
-                      Op operation = OP_WRITE_TRUNCATE);
+  explicit FileWriter(std::string const & fileName, Op operation = OP_WRITE_TRUNCATE);
   FileWriter(FileWriter && rhs) = default;
 
   virtual ~FileWriter() noexcept(false);
@@ -59,10 +58,7 @@ protected:
 class FilesContainerWriter : public FileWriter
 {
 public:
-  FilesContainerWriter(std::string const & fileName, Op operation)
-    : FileWriter(fileName, operation)
-  {
-  }
+  FilesContainerWriter(std::string const & fileName, Op operation) : FileWriter(fileName, operation) {}
 
   void WritePaddingByEnd(size_t factor) { WritePadding(Size(), factor); }
   void WritePaddingByPos(size_t factor) { WritePadding(Pos(), factor); }
@@ -83,8 +79,7 @@ class TruncatingFileWriter : public FilesContainerWriter
 public:
   explicit TruncatingFileWriter(std::string const & fileName)
     : FilesContainerWriter(fileName, FileWriter::OP_WRITE_EXISTING)
-  {
-  }
+  {}
 
   TruncatingFileWriter(TruncatingFileWriter && rhs) = default;
 
diff --git a/libs/coding/files_container.cpp b/libs/coding/files_container.cpp
index c3e790f55..267e45133 100644
--- a/libs/coding/files_container.cpp
+++ b/libs/coding/files_container.cpp
@@ -9,17 +9,17 @@
 #include <sstream>
 
 #ifndef OMIM_OS_WINDOWS
-  #include <stdio.h>
-  #include <unistd.h>  // _SC_PAGESIZE
-  #include <sys/mman.h>
-  #include <sys/stat.h>
-  #ifdef OMIM_OS_ANDROID
-    #include <fcntl.h>
-  #else
-    #include <sys/fcntl.h>
-  #endif
+#include <stdio.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <unistd.h>  // _SC_PAGESIZE
+#ifdef OMIM_OS_ANDROID
+#include <fcntl.h>
 #else
-  #include <windows.h>
+#include <sys/fcntl.h>
+#endif
+#else
+#include <windows.h>
 #endif
 
 #include <errno.h>
@@ -68,16 +68,13 @@ void FilesContainerBase::ReadInfo(Reader & reader)
 // FilesContainerR
 /////////////////////////////////////////////////////////////////////////////
 
-FilesContainerR::FilesContainerR(std::string const & filePath,
-                                 uint32_t logPageSize,
-                                 uint32_t logPageCount)
+FilesContainerR::FilesContainerR(std::string const & filePath, uint32_t logPageSize, uint32_t logPageCount)
   : m_source(std::make_unique<FileReader>(filePath, logPageSize, logPageCount))
 {
   ReadInfo(m_source);
 }
 
-FilesContainerR::FilesContainerR(TReader const & file)
-  : m_source(file)
+FilesContainerR::FilesContainerR(TReader const & file) : m_source(file)
 {
   ReadInfo(m_source);
 }
@@ -120,7 +117,8 @@ void MappedFile::Open(std::string const & fName)
   Close();
 
 #ifdef OMIM_OS_WINDOWS
-  m_hFile = CreateFileA(fName.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED, NULL);
+  m_hFile = CreateFileA(fName.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING,
+                        FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED, NULL);
   if (m_hFile == INVALID_HANDLE_VALUE)
     MYTHROW(Reader::OpenException, ("Can't open file:", fName, "win last error:", GetLastError()));
   m_hMapping = CreateFileMappingA(m_hFile, NULL, PAGE_READONLY, 0, 0, NULL);
@@ -131,14 +129,9 @@ void MappedFile::Open(std::string const & fName)
   if (m_fd == -1)
   {
     if (errno == EMFILE || errno == ENFILE)
-    {
-      MYTHROW(Reader::TooManyFilesException,
-              ("Can't open file:", fName, ", reason:", strerror(errno)));
-    }
+      MYTHROW(Reader::TooManyFilesException, ("Can't open file:", fName, ", reason:", strerror(errno)));
     else
-    {
       MYTHROW(Reader::OpenException, ("Can't open file:", fName, ", reason:", strerror(errno)));
-    }
   }
 #endif
 }
@@ -182,14 +175,16 @@ MappedFile::Handle MappedFile::Map(uint64_t offset, uint64_t size, std::string c
   ASSERT_GREATER_OR_EQUAL(length, size, ());
 
 #ifdef OMIM_OS_WINDOWS
-  void * pMap = MapViewOfFile(m_hMapping, FILE_MAP_READ, alignedOffset >> (sizeof(DWORD) * 8), DWORD(alignedOffset), length);
+  void * pMap =
+      MapViewOfFile(m_hMapping, FILE_MAP_READ, alignedOffset >> (sizeof(DWORD) * 8), DWORD(alignedOffset), length);
   if (pMap == NULL)
-    MYTHROW(Reader::OpenException, ("Can't map section:", tag, "with [offset, size]:", offset, size, "win last error:", GetLastError()));
+    MYTHROW(Reader::OpenException,
+            ("Can't map section:", tag, "with [offset, size]:", offset, size, "win last error:", GetLastError()));
 #else
-  void * pMap = mmap(0, static_cast<size_t>(length), PROT_READ, MAP_SHARED, m_fd,
-                     static_cast<off_t>(alignedOffset));
+  void * pMap = mmap(0, static_cast<size_t>(length), PROT_READ, MAP_SHARED, m_fd, static_cast<off_t>(alignedOffset));
   if (pMap == MAP_FAILED)
-    MYTHROW(Reader::OpenException, ("Can't map section:", tag, "with [offset, size]:", offset, size, "errno:", strerror(errno)));
+    MYTHROW(Reader::OpenException,
+            ("Can't map section:", tag, "with [offset, size]:", offset, size, "errno:", strerror(errno)));
 #endif
 
   char const * data = reinterpret_cast<char const *>(pMap);
@@ -197,7 +192,7 @@ MappedFile::Handle MappedFile::Map(uint64_t offset, uint64_t size, std::string c
   return Handle(d, data, size, length);
 }
 
-} // namespace detail
+}  // namespace detail
 
 /////////////////////////////////////////////////////////////////////////////
 // FilesMappingContainer
@@ -275,11 +270,11 @@ void FilesMappingContainer::Handle::Unmap()
 {
   if (IsValid())
   {
-    #ifdef OMIM_OS_WINDOWS
-      VERIFY(UnmapViewOfFile(m_origBase), ());
-    #else
-      VERIFY(0 == munmap((void *)m_origBase, static_cast<size_t>(m_origSize)), ());
-    #endif
+#ifdef OMIM_OS_WINDOWS
+    VERIFY(UnmapViewOfFile(m_origBase), ());
+#else
+    VERIFY(0 == munmap((void *)m_origBase, static_cast<size_t>(m_origSize)), ());
+#endif
     Reset();
   }
 }
@@ -294,8 +289,7 @@ void FilesMappingContainer::Handle::Reset()
 // FilesContainerW
 /////////////////////////////////////////////////////////////////////////////
 
-FilesContainerW::FilesContainerW(std::string const & fName, FileWriter::Op op)
-  : m_name(fName), m_finished(false)
+FilesContainerW::FilesContainerW(std::string const & fName, FileWriter::Op op) : m_name(fName), m_finished(false)
 {
   Open(op);
 }
@@ -306,15 +300,14 @@ void FilesContainerW::Open(FileWriter::Op op)
 
   switch (op)
   {
-  case FileWriter::OP_WRITE_TRUNCATE:
-    break;
+  case FileWriter::OP_WRITE_TRUNCATE: break;
 
   case FileWriter::OP_WRITE_EXISTING:
-    {
-      // read an existing service info
-      FileReader reader(m_name);
-      ReadInfo(reader);
-    }
+  {
+    // read an existing service info
+    FileReader reader(m_name);
+    ReadInfo(reader);
+  }
 
     // Important: in append mode we should sort info-vector by offsets
     sort(m_info.begin(), m_info.end(), LessOffset());
@@ -322,15 +315,11 @@ void FilesContainerW::Open(FileWriter::Op op)
     // Check that all offsets are unique
 #ifdef DEBUG
     for (size_t i = 1; i < m_info.size(); ++i)
-      ASSERT(m_info[i-1].m_offset < m_info[i].m_offset ||
-             m_info[i-1].m_size == 0 ||
-             m_info[i].m_size == 0, ());
+      ASSERT(m_info[i - 1].m_offset < m_info[i].m_offset || m_info[i - 1].m_size == 0 || m_info[i].m_size == 0, ());
 #endif
     break;
 
-  default:
-    ASSERT ( false, ("Unsupported options") );
-    break;
+  default: ASSERT(false, ("Unsupported options")); break;
   }
 
   if (m_info.empty())
@@ -369,10 +358,8 @@ void FilesContainerW::DeleteSection(Tag const & tag)
     FilesContainerW contW(m_name + ".tmp");
 
     for (size_t i = 0; i < m_info.size(); ++i)
-    {
       if (m_info[i].m_tag != tag)
         contW.Write(contR.GetReader(m_info[i].m_tag), m_info[i].m_tag);
-    }
   }
 
   // swap files
@@ -390,7 +377,7 @@ std::unique_ptr<FilesContainerWriter> FilesContainerW::GetWriter(Tag const & tag
   InfoContainer::const_iterator it = find_if(m_info.begin(), m_info.end(), EqualTag(tag));
   if (it != m_info.end())
   {
-    if (it+1 == m_info.end())
+    if (it + 1 == m_info.end())
     {
       m_info.pop_back();
 
diff --git a/libs/coding/files_container.hpp b/libs/coding/files_container.hpp
index 8d18e8e69..04e604ef7 100644
--- a/libs/coding/files_container.hpp
+++ b/libs/coding/files_container.hpp
@@ -36,10 +36,7 @@ public:
   /// WARNING! Existing sections may not be properly aligned.
   static uint64_t const kSectionAlignment = 8;
 
-  bool IsExist(Tag const & tag) const
-  {
-    return GetInfo(tag) != 0;
-  }
+  bool IsExist(Tag const & tag) const { return GetInfo(tag) != 0; }
 
   template <typename ToDo>
   void ForEachTagInfo(ToDo && toDo) const
@@ -50,23 +47,14 @@ public:
 protected:
   struct LessInfo
   {
-    bool operator() (TagInfo const & t1, TagInfo const & t2) const
-    {
-      return (t1.m_tag < t2.m_tag);
-    }
-    bool operator() (TagInfo const & t1, Tag const & t2) const
-    {
-      return (t1.m_tag < t2);
-    }
-    bool operator() (Tag const & t1, TagInfo const & t2) const
-    {
-      return (t1 < t2.m_tag);
-    }
+    bool operator()(TagInfo const & t1, TagInfo const & t2) const { return (t1.m_tag < t2.m_tag); }
+    bool operator()(TagInfo const & t1, Tag const & t2) const { return (t1.m_tag < t2); }
+    bool operator()(Tag const & t1, TagInfo const & t2) const { return (t1 < t2.m_tag); }
   };
 
   struct LessOffset
   {
-    bool operator() (TagInfo const & t1, TagInfo const & t2) const
+    bool operator()(TagInfo const & t1, TagInfo const & t2) const
     {
       if (t1.m_offset == t2.m_offset)
       {
@@ -77,24 +65,15 @@ protected:
       else
         return (t1.m_offset < t2.m_offset);
     }
-    bool operator() (TagInfo const & t1, uint64_t const & t2) const
-    {
-      return (t1.m_offset < t2);
-    }
-    bool operator() (uint64_t const & t1, TagInfo const & t2) const
-    {
-      return (t1 < t2.m_offset);
-    }
+    bool operator()(TagInfo const & t1, uint64_t const & t2) const { return (t1.m_offset < t2); }
+    bool operator()(uint64_t const & t1, TagInfo const & t2) const { return (t1 < t2.m_offset); }
   };
 
   class EqualTag
   {
   public:
     EqualTag(Tag const & tag) : m_tag(tag) {}
-    bool operator() (TagInfo const & t) const
-    {
-      return (t.m_tag == m_tag);
-    }
+    bool operator()(TagInfo const & t) const { return (t.m_tag == m_tag); }
 
   private:
     Tag const & m_tag;
@@ -116,9 +95,7 @@ class FilesContainerR : public FilesContainerBase
 public:
   using TReader = ModelReaderPtr;
 
-  explicit FilesContainerR(std::string const & filePath,
-                           uint32_t logPageSize = 10,
-                           uint32_t logPageCount = 10);
+  explicit FilesContainerR(std::string const & filePath, uint32_t logPageSize = 10, uint32_t logPageCount = 10);
   explicit FilesContainerR(TReader const & file);
 
   TReader GetReader(Tag const & tag) const;
@@ -156,13 +133,19 @@ public:
     Handle() = default;
 
     Handle(char const * base, char const * alignBase, uint64_t size, uint64_t origSize)
-      : m_base(base), m_origBase(alignBase), m_size(size), m_origSize(origSize)
-    {
-    }
+      : m_base(base)
+      , m_origBase(alignBase)
+      , m_size(size)
+      , m_origSize(origSize)
+    {}
 
     Handle(Handle && h) { Assign(std::move(h)); }
 
-    Handle & operator=(Handle && h) { Assign(std::move(h)); return *this; }
+    Handle & operator=(Handle && h)
+    {
+      Assign(std::move(h));
+      return *this;
+    }
 
     ~Handle();
 
@@ -210,7 +193,7 @@ private:
 
   DISALLOW_COPY(MappedFile);
 };
-} // namespace detail
+}  // namespace detail
 
 class FilesMappingContainer : public FilesContainerBase
 {
@@ -239,8 +222,7 @@ private:
 class FilesContainerW : public FilesContainerBase
 {
 public:
-  FilesContainerW(std::string const & fName,
-                  FileWriter::Op op = FileWriter::OP_WRITE_TRUNCATE);
+  FilesContainerW(std::string const & fName, FileWriter::Op op = FileWriter::OP_WRITE_TRUNCATE);
   ~FilesContainerW();
 
   std::unique_ptr<FilesContainerWriter> GetWriter(Tag const & tag);
diff --git a/libs/coding/fixed_bits_ddvector.hpp b/libs/coding/fixed_bits_ddvector.hpp
index 45ea702e3..175b66fcf 100644
--- a/libs/coding/fixed_bits_ddvector.hpp
+++ b/libs/coding/fixed_bits_ddvector.hpp
@@ -23,13 +23,11 @@
 /// sorted by index parameter.
 /// Component is stored and used in host's endianness, without any conversions.
 
-template
-<
-  size_t Bits,                /// number of fixed bits
-  class TReader,              /// reader with random offset read functions
-  typename TSize = uint32_t,  /// vector index type (platform independent)
-  typename TValue = uint32_t  /// vector value type (platform independent)
->
+template <size_t Bits,                /// number of fixed bits
+          class TReader,              /// reader with random offset read functions
+          typename TSize = uint32_t,  /// vector index type (platform independent)
+          typename TValue = uint32_t  /// vector value type (platform independent)
+          >
 class FixedBitsDDVector
 {
   static_assert(std::is_unsigned<TSize>::value, "");
@@ -56,10 +54,7 @@ class FixedBitsDDVector
 
   using TBlock = uint32_t;
 
-  static uint64_t AlignBytesCount(uint64_t count)
-  {
-    return std::max(count, static_cast<uint64_t>(sizeof(TBlock)));
-  }
+  static uint64_t AlignBytesCount(uint64_t count) { return std::max(count, static_cast<uint64_t>(sizeof(TBlock))); }
 
   static TBlock constexpr kMask = (1 << Bits) - 1;
   static TBlock constexpr kLargeValue = kMask - 1;
@@ -75,11 +70,10 @@ class FixedBitsDDVector
   FixedBitsDDVector(TReader const & bitsReader, TReader const & vecReader, TSize size)
     : m_bits(bitsReader)
     , m_vector(vecReader)
-  #ifdef DEBUG
+#ifdef DEBUG
     , m_size(size)
-  #endif
-  {
-  }
+#endif
+  {}
 
 public:
   static std::unique_ptr<TSelf> Create(TReader const & reader)
@@ -90,8 +84,8 @@ public:
     uint64_t const off2 = AlignBytesCount((size * Bits + CHAR_BIT - 1) / CHAR_BIT) + off1;
 
     // We cannot use make_unique here because contsructor is private.
-    return std::unique_ptr<TSelf>(new TSelf(reader.SubReader(off1, off2 - off1),
-                                            reader.SubReader(off2, reader.Size() - off2), size));
+    return std::unique_ptr<TSelf>(
+        new TSelf(reader.SubReader(off1, off2 - off1), reader.SubReader(off2, reader.Size() - off2), size));
   }
 
   bool Get(TSize index, TValue & value) const
@@ -114,7 +108,8 @@ public:
     return true;
   }
 
-  template <class TWriter> class Builder
+  template <class TWriter>
+  class Builder
   {
     using TData = std::vector<uint8_t>;
     using TempWriter = PushBackByteSink<TData>;
@@ -133,10 +128,7 @@ public:
   public:
     using ValueType = TValue;
 
-    explicit Builder(TWriter & writer)
-      : m_writer(m_data), m_bits(new TBits(m_writer)), m_finalWriter(writer)
-    {
-    }
+    explicit Builder(TWriter & writer) : m_writer(m_data), m_bits(new TBits(m_writer)), m_finalWriter(writer) {}
 
     ~Builder()
     {
diff --git a/libs/coding/geometry_coding.cpp b/libs/coding/geometry_coding.cpp
index fd2d27edb..032dc540a 100644
--- a/libs/coding/geometry_coding.cpp
+++ b/libs/coding/geometry_coding.cpp
@@ -14,8 +14,8 @@ namespace
 inline m2::PointU ClampPoint(m2::PointD const & maxPoint, m2::PointD const & point)
 {
   using uvalue_t = m2::PointU::value_type;
-  return { static_cast<uvalue_t>(math::Clamp(point.x, 0.0, maxPoint.x)),
-           static_cast<uvalue_t>(math::Clamp(point.y, 0.0, maxPoint.y)) };
+  return {static_cast<uvalue_t>(math::Clamp(point.x, 0.0, maxPoint.x)),
+          static_cast<uvalue_t>(math::Clamp(point.y, 0.0, maxPoint.y))};
 }
 
 struct edge_less_p0
@@ -33,10 +33,10 @@ struct edge_less_p0
 
 namespace coding
 {
-bool TestDecoding(InPointsT const & points, m2::PointU const & basePoint,
-                  m2::PointU const & maxPoint, OutDeltasT const & deltas,
-                  void (*fnDecode)(InDeltasT const & deltas, m2::PointU const & basePoint,
-                                   m2::PointU const & maxPoint, OutPointsT & points))
+bool TestDecoding(InPointsT const & points, m2::PointU const & basePoint, m2::PointU const & maxPoint,
+                  OutDeltasT const & deltas,
+                  void (*fnDecode)(InDeltasT const & deltas, m2::PointU const & basePoint, m2::PointU const & maxPoint,
+                                   OutPointsT & points))
 {
   size_t const count = points.size();
 
@@ -51,17 +51,15 @@ bool TestDecoding(InPointsT const & points, m2::PointU const & basePoint,
   return true;
 }
 
-m2::PointU PredictPointInPolyline(m2::PointD const & maxPoint, m2::PointU const & p1,
-                                  m2::PointU const & p2)
+m2::PointU PredictPointInPolyline(m2::PointD const & maxPoint, m2::PointU const & p1, m2::PointU const & p2)
 {
   return ClampPoint(maxPoint, m2::PointD(p1) + (m2::PointD(p1) - m2::PointD(p2)) / 2.0);
 }
 
 uint64_t EncodePointDeltaAsUint(m2::PointU const & actual, m2::PointU const & prediction)
 {
-  return bits::BitwiseMerge(
-      bits::ZigZagEncode(static_cast<int32_t>(actual.x) - static_cast<int32_t>(prediction.x)),
-      bits::ZigZagEncode(static_cast<int32_t>(actual.y) - static_cast<int32_t>(prediction.y)));
+  return bits::BitwiseMerge(bits::ZigZagEncode(static_cast<int32_t>(actual.x) - static_cast<int32_t>(prediction.x)),
+                            bits::ZigZagEncode(static_cast<int32_t>(actual.y) - static_cast<int32_t>(prediction.y)));
 }
 
 m2::PointU DecodePointDeltaFromUint(uint64_t delta, m2::PointU const & prediction)
@@ -71,8 +69,8 @@ m2::PointU DecodePointDeltaFromUint(uint64_t delta, m2::PointU const & predictio
   return m2::PointU(prediction.x + bits::ZigZagDecode(x), prediction.y + bits::ZigZagDecode(y));
 }
 
-m2::PointU PredictPointInPolyline(m2::PointD const & maxPoint, m2::PointU const & p1,
-                                  m2::PointU const & p2, m2::PointU const & p3)
+m2::PointU PredictPointInPolyline(m2::PointD const & maxPoint, m2::PointU const & p1, m2::PointU const & p2,
+                                  m2::PointU const & p3)
 {
   CHECK_NOT_EQUAL(p2, p3, ());
 
@@ -93,18 +91,18 @@ m2::PointU PredictPointInPolyline(m2::PointD const & maxPoint, m2::PointU const
   complex<double> const c0 = (c01 + c02) * complex<double>(0.5, 0.0);
   */
 
-  return ClampPoint(maxPoint, { c0.real(), c0.imag() });
+  return ClampPoint(maxPoint, {c0.real(), c0.imag()});
 }
 
-m2::PointU PredictPointInTriangle(m2::PointD const & maxPoint, m2::PointU const & p1,
-                                  m2::PointU const & p2, m2::PointU const & p3)
+m2::PointU PredictPointInTriangle(m2::PointD const & maxPoint, m2::PointU const & p1, m2::PointU const & p2,
+                                  m2::PointU const & p3)
 {
   // parallelogram prediction
   return ClampPoint(maxPoint, m2::PointD(p1 + p2) - m2::PointD(p3));
 }
 
-void EncodePolylinePrev1(InPointsT const & points, m2::PointU const & basePoint,
-                         m2::PointU const & maxPoint, OutDeltasT & deltas)
+void EncodePolylinePrev1(InPointsT const & points, m2::PointU const & basePoint, m2::PointU const & maxPoint,
+                         OutDeltasT & deltas)
 {
   size_t const count = points.size();
   if (count > 0)
@@ -117,8 +115,8 @@ void EncodePolylinePrev1(InPointsT const & points, m2::PointU const & basePoint,
   ASSERT(TestDecoding(points, basePoint, maxPoint, deltas, &DecodePolylinePrev1), ());
 }
 
-void DecodePolylinePrev1(InDeltasT const & deltas, m2::PointU const & basePoint,
-                         m2::PointU const & /*maxPoint*/, OutPointsT & points)
+void DecodePolylinePrev1(InDeltasT const & deltas, m2::PointU const & basePoint, m2::PointU const & /*maxPoint*/,
+                         OutPointsT & points)
 {
   size_t const count = deltas.size();
   if (count > 0)
@@ -129,8 +127,8 @@ void DecodePolylinePrev1(InDeltasT const & deltas, m2::PointU const & basePoint,
   }
 }
 
-void EncodePolylinePrev2(InPointsT const & points, m2::PointU const & basePoint,
-                         m2::PointU const & maxPoint, OutDeltasT & deltas)
+void EncodePolylinePrev2(InPointsT const & points, m2::PointU const & basePoint, m2::PointU const & maxPoint,
+                         OutDeltasT & deltas)
 {
   size_t const count = points.size();
   if (count > 0)
@@ -141,16 +139,16 @@ void EncodePolylinePrev2(InPointsT const & points, m2::PointU const & basePoint,
       m2::PointD const maxPointD(maxPoint);
       deltas.push_back(EncodePointDeltaAsUint(points[1], points[0]));
       for (size_t i = 2; i < count; ++i)
-        deltas.push_back(EncodePointDeltaAsUint(
-            points[i], PredictPointInPolyline(maxPointD, points[i - 1], points[i - 2])));
+        deltas.push_back(
+            EncodePointDeltaAsUint(points[i], PredictPointInPolyline(maxPointD, points[i - 1], points[i - 2])));
     }
   }
 
   ASSERT(TestDecoding(points, basePoint, maxPoint, deltas, &DecodePolylinePrev2), ());
 }
 
-void DecodePolylinePrev2(InDeltasT const & deltas, m2::PointU const & basePoint,
-                         m2::PointU const & maxPoint, OutPointsT & points)
+void DecodePolylinePrev2(InDeltasT const & deltas, m2::PointU const & basePoint, m2::PointU const & maxPoint,
+                         OutPointsT & points)
 {
   size_t const count = deltas.size();
   if (count > 0)
@@ -163,15 +161,15 @@ void DecodePolylinePrev2(InDeltasT const & deltas, m2::PointU const & basePoint,
       for (size_t i = 2; i < count; ++i)
       {
         size_t const n = points.size();
-        points.push_back(DecodePointDeltaFromUint(
-            deltas[i], PredictPointInPolyline(maxPointD, points[n - 1], points[n - 2])));
+        points.push_back(
+            DecodePointDeltaFromUint(deltas[i], PredictPointInPolyline(maxPointD, points[n - 1], points[n - 2])));
       }
     }
   }
 }
 
-void EncodePolylinePrev3(InPointsT const & points, m2::PointU const & basePoint,
-                         m2::PointU const & maxPoint, OutDeltasT & deltas)
+void EncodePolylinePrev3(InPointsT const & points, m2::PointU const & basePoint, m2::PointU const & maxPoint,
+                         OutDeltasT & deltas)
 {
   ASSERT_LESS_OR_EQUAL(basePoint.x, maxPoint.x, (basePoint, maxPoint));
   ASSERT_LESS_OR_EQUAL(basePoint.y, maxPoint.y, (basePoint, maxPoint));
@@ -190,8 +188,7 @@ void EncodePolylinePrev3(InPointsT const & points, m2::PointU const & basePoint,
         deltas.push_back(EncodePointDeltaAsUint(points[2], prediction));
         for (size_t i = 3; i < count; ++i)
         {
-          m2::PointU const prediction = PredictPointInPolyline(
-                maxPointD, points[i - 1], points[i - 2], points[i - 3]);
+          m2::PointU const prediction = PredictPointInPolyline(maxPointD, points[i - 1], points[i - 2], points[i - 3]);
           deltas.push_back(EncodePointDeltaAsUint(points[i], prediction));
         }
       }
@@ -201,8 +198,8 @@ void EncodePolylinePrev3(InPointsT const & points, m2::PointU const & basePoint,
   ASSERT(TestDecoding(points, basePoint, maxPoint, deltas, &DecodePolylinePrev3), ());
 }
 
-void DecodePolylinePrev3(InDeltasT const & deltas, m2::PointU const & basePoint,
-                         m2::PointU const & maxPoint, OutPointsT & points)
+void DecodePolylinePrev3(InDeltasT const & deltas, m2::PointU const & basePoint, m2::PointU const & maxPoint,
+                         OutPointsT & points)
 {
   ASSERT_LESS_OR_EQUAL(basePoint.x, maxPoint.x, (basePoint, maxPoint));
   ASSERT_LESS_OR_EQUAL(basePoint.y, maxPoint.y, (basePoint, maxPoint));
@@ -218,13 +215,11 @@ void DecodePolylinePrev3(InDeltasT const & deltas, m2::PointU const & basePoint,
       if (count > 2)
       {
         m2::PointD const maxPointD(maxPoint);
-        points.push_back(DecodePointDeltaFromUint(
-            deltas[2], PredictPointInPolyline(maxPointD, points.back(), pt0)));
+        points.push_back(DecodePointDeltaFromUint(deltas[2], PredictPointInPolyline(maxPointD, points.back(), pt0)));
         for (size_t i = 3; i < count; ++i)
         {
           size_t const n = points.size();
-          m2::PointU const prediction = PredictPointInPolyline(
-                maxPointD, points[n - 1], points[n - 2], points[n - 3]);
+          m2::PointU const prediction = PredictPointInPolyline(maxPointD, points[n - 1], points[n - 2], points[n - 3]);
           points.push_back(DecodePointDeltaFromUint(deltas[i], prediction));
         }
       }
@@ -232,20 +227,20 @@ void DecodePolylinePrev3(InDeltasT const & deltas, m2::PointU const & basePoint,
   }
 }
 
-void EncodePolyline(InPointsT const & points, m2::PointU const & basePoint,
-                    m2::PointU const & maxPoint, OutDeltasT & deltas)
+void EncodePolyline(InPointsT const & points, m2::PointU const & basePoint, m2::PointU const & maxPoint,
+                    OutDeltasT & deltas)
 {
   EncodePolylinePrev2(points, basePoint, maxPoint, deltas);
 }
 
-void DecodePolyline(InDeltasT const & deltas, m2::PointU const & basePoint,
-                    m2::PointU const & maxPoint, OutPointsT & points)
+void DecodePolyline(InDeltasT const & deltas, m2::PointU const & basePoint, m2::PointU const & maxPoint,
+                    OutPointsT & points)
 {
   DecodePolylinePrev2(deltas, basePoint, maxPoint, points);
 }
 
-void EncodeTriangleStrip(InPointsT const & points, m2::PointU const & basePoint,
-                         m2::PointU const & maxPoint, OutDeltasT & deltas)
+void EncodeTriangleStrip(InPointsT const & points, m2::PointU const & basePoint, m2::PointU const & maxPoint,
+                         OutDeltasT & deltas)
 {
   size_t const count = points.size();
   if (count > 0)
@@ -259,15 +254,14 @@ void EncodeTriangleStrip(InPointsT const & points, m2::PointU const & basePoint,
     m2::PointD const maxPointD(maxPoint);
     for (size_t i = 3; i < count; ++i)
     {
-      m2::PointU const prediction = PredictPointInTriangle(
-            maxPointD, points[i - 1], points[i - 2], points[i - 3]);
+      m2::PointU const prediction = PredictPointInTriangle(maxPointD, points[i - 1], points[i - 2], points[i - 3]);
       deltas.push_back(EncodePointDeltaAsUint(points[i], prediction));
     }
   }
 }
 
-void DecodeTriangleStrip(InDeltasT const & deltas, m2::PointU const & basePoint,
-                         m2::PointU const & maxPoint, OutPointsT & points)
+void DecodeTriangleStrip(InDeltasT const & deltas, m2::PointU const & basePoint, m2::PointU const & maxPoint,
+                         OutPointsT & points)
 {
   size_t const count = deltas.size();
   if (count > 0)
@@ -282,8 +276,7 @@ void DecodeTriangleStrip(InDeltasT const & deltas, m2::PointU const & basePoint,
     for (size_t i = 3; i < count; ++i)
     {
       size_t const n = points.size();
-      m2::PointU const prediction = PredictPointInTriangle(
-            maxPointD, points[n - 1], points[n - 2], points[n - 3]);
+      m2::PointU const prediction = PredictPointInTriangle(maxPointD, points[n - 1], points[n - 2], points[n - 3]);
       points.push_back(DecodePointDeltaFromUint(deltas[i], prediction));
     }
   }
@@ -298,14 +291,14 @@ GeometryCodingParams::GeometryCodingParams() : m_BasePointUint64(0), m_CoordBits
   m_BasePoint = Uint64ToPointUObsolete(m_BasePointUint64);
 }
 
-GeometryCodingParams::GeometryCodingParams(uint8_t coordBits, m2::PointD const & pt)
-  : m_CoordBits(coordBits)
+GeometryCodingParams::GeometryCodingParams(uint8_t coordBits, m2::PointD const & pt) : m_CoordBits(coordBits)
 {
   SetBasePoint(pt);
 }
 
 GeometryCodingParams::GeometryCodingParams(uint8_t coordBits, uint64_t basePointUint64)
-  : m_BasePointUint64(basePointUint64), m_CoordBits(coordBits)
+  : m_BasePointUint64(basePointUint64)
+  , m_CoordBits(coordBits)
 {
   m_BasePoint = Uint64ToPointUObsolete(m_BasePointUint64);
 }
@@ -318,7 +311,10 @@ void GeometryCodingParams::SetBasePoint(m2::PointD const & pt)
 
 namespace pts
 {
-m2::PointU D2U(m2::PointD const & p, uint32_t coordBits) { return PointDToPointU(p, coordBits); }
+m2::PointU D2U(m2::PointD const & p, uint32_t coordBits)
+{
+  return PointDToPointU(p, coordBits);
+}
 
 m2::PointD U2D(m2::PointU const & p, uint32_t coordBits)
 {
@@ -333,7 +329,10 @@ m2::PointU GetMaxPoint(GeometryCodingParams const & params)
   return D2U(m2::PointD(mercator::Bounds::kMaxX, mercator::Bounds::kMaxY), params.GetCoordBits());
 }
 
-m2::PointU GetBasePoint(GeometryCodingParams const & params) { return params.GetBasePoint(); }
+m2::PointU GetBasePoint(GeometryCodingParams const & params)
+{
+  return params.GetBasePoint();
+}
 }  // namespace pts
 
 void Encode(EncodeFunT fn, std::vector<m2::PointD> const & points, GeometryCodingParams const & params,
@@ -354,8 +353,8 @@ void Encode(EncodeFunT fn, std::vector<m2::PointD> const & points, GeometryCodin
   (*fn)(make_read_adapter(upoints), pts::GetBasePoint(params), pts::GetMaxPoint(params), adapt);
 }
 
-void Decode(DecodeFunT fn, DeltasT const & deltas, GeometryCodingParams const & params,
-            OutPointsT & points, size_t reserveF)
+void Decode(DecodeFunT fn, DeltasT const & deltas, GeometryCodingParams const & params, OutPointsT & points,
+            size_t reserveF)
 {
   DecodeImpl(fn, deltas, params, points, reserveF);
 }
@@ -366,13 +365,12 @@ void Decode(DecodeFunT fn, DeltasT const & deltas, GeometryCodingParams const &
   DecodeImpl(fn, deltas, params, points, reserveF);
 }
 
-void const * LoadInner(DecodeFunT fn, void const * pBeg, size_t count,
-                       GeometryCodingParams const & params, OutPointsT & points)
+void const * LoadInner(DecodeFunT fn, void const * pBeg, size_t count, GeometryCodingParams const & params,
+                       OutPointsT & points)
 {
   DeltasT deltas;
   deltas.reserve(count);
-  void const * ret =
-      ReadVarUint64Array(static_cast<char const *>(pBeg), count, base::MakeBackInsertFunctor(deltas));
+  void const * ret = ReadVarUint64Array(static_cast<char const *>(pBeg), count, base::MakeBackInsertFunctor(deltas));
 
   Decode(fn, deltas, params, points);
   return ret;
@@ -450,8 +448,8 @@ void TrianglesChainSaver::operator()(TPoint arr[3], std::vector<TEdge> edges)
   }
 }
 
-void DecodeTriangles(coding::InDeltasT const & deltas, m2::PointU const & basePoint,
-                     m2::PointU const & maxPoint, coding::OutPointsT & points)
+void DecodeTriangles(coding::InDeltasT const & deltas, m2::PointU const & basePoint, m2::PointU const & maxPoint,
+                     coding::OutPointsT & points)
 {
   size_t const count = deltas.size();
   ASSERT_GREATER(count, 2, ());
@@ -504,8 +502,8 @@ void DecodeTriangles(coding::InDeltasT const & deltas, m2::PointU const & basePo
     // push points
     points.push_back(points[trg[0]]);
     points.push_back(points[trg[1]]);
-    points.push_back(coding::DecodePointDeltaFromUint(deltas[i] >> 2, coding::PredictPointInTriangle(
-            maxPointD, points[trg[0]], points[trg[1]], points[trg[2]])));
+    points.push_back(coding::DecodePointDeltaFromUint(
+        deltas[i] >> 2, coding::PredictPointInTriangle(maxPointD, points[trg[0]], points[trg[1]], points[trg[2]])));
 
     // next step
     treeBits = deltas[i] & 3;
diff --git a/libs/coding/geometry_coding.hpp b/libs/coding/geometry_coding.hpp
index 6023c961d..50cb24cc4 100644
--- a/libs/coding/geometry_coding.hpp
+++ b/libs/coding/geometry_coding.hpp
@@ -52,47 +52,46 @@ m2::PointU DecodePointDelta(Source & source, m2::PointU const & base)
 }
 
 /// Predict next point for polyline with given previous points (p1, p2).
-m2::PointU PredictPointInPolyline(m2::PointD const & maxPoint, m2::PointU const & p1,
-                                  m2::PointU const & p2);
+m2::PointU PredictPointInPolyline(m2::PointD const & maxPoint, m2::PointU const & p1, m2::PointU const & p2);
 
 /// Predict next point for polyline with given previous points (p1, p2, p3).
-m2::PointU PredictPointInPolyline(m2::PointD const & maxPoint, m2::PointU const & p1,
-                                  m2::PointU const & p2, m2::PointU const & p3);
+m2::PointU PredictPointInPolyline(m2::PointD const & maxPoint, m2::PointU const & p1, m2::PointU const & p2,
+                                  m2::PointU const & p3);
 
 /// Predict point for neighbour triangle with given
 /// previous triangle (p1, p2, p3) and common edge (p1, p2).
-m2::PointU PredictPointInTriangle(m2::PointD const & maxPoint, m2::PointU const & p1,
-                                  m2::PointU const & p2, m2::PointU const & p3);
+m2::PointU PredictPointInTriangle(m2::PointD const & maxPoint, m2::PointU const & p1, m2::PointU const & p2,
+                                  m2::PointU const & p3);
 
-void EncodePolylinePrev1(InPointsT const & points, m2::PointU const & basePoint,
-                         m2::PointU const & maxPoint, OutDeltasT & deltas);
+void EncodePolylinePrev1(InPointsT const & points, m2::PointU const & basePoint, m2::PointU const & maxPoint,
+                         OutDeltasT & deltas);
 
-void DecodePolylinePrev1(InDeltasT const & deltas, m2::PointU const & basePoint,
-                         m2::PointU const & maxPoint, OutPointsT & points);
+void DecodePolylinePrev1(InDeltasT const & deltas, m2::PointU const & basePoint, m2::PointU const & maxPoint,
+                         OutPointsT & points);
 
-void EncodePolylinePrev2(InPointsT const & points, m2::PointU const & basePoint,
-                         m2::PointU const & maxPoint, OutDeltasT & deltas);
+void EncodePolylinePrev2(InPointsT const & points, m2::PointU const & basePoint, m2::PointU const & maxPoint,
+                         OutDeltasT & deltas);
 
-void DecodePolylinePrev2(InDeltasT const & deltas, m2::PointU const & basePoint,
-                         m2::PointU const & maxPoint, OutPointsT & points);
+void DecodePolylinePrev2(InDeltasT const & deltas, m2::PointU const & basePoint, m2::PointU const & maxPoint,
+                         OutPointsT & points);
 
-void EncodePolylinePrev3(InPointsT const & points, m2::PointU const & basePoint,
-                         m2::PointU const & maxPoint, OutDeltasT & deltas);
+void EncodePolylinePrev3(InPointsT const & points, m2::PointU const & basePoint, m2::PointU const & maxPoint,
+                         OutDeltasT & deltas);
 
-void DecodePolylinePrev3(InDeltasT const & deltas, m2::PointU const & basePoint,
-                         m2::PointU const & maxPoint, OutPointsT & points);
+void DecodePolylinePrev3(InDeltasT const & deltas, m2::PointU const & basePoint, m2::PointU const & maxPoint,
+                         OutPointsT & points);
 
-void EncodePolyline(InPointsT const & points, m2::PointU const & basePoint,
-                    m2::PointU const & maxPoint, OutDeltasT & deltas);
+void EncodePolyline(InPointsT const & points, m2::PointU const & basePoint, m2::PointU const & maxPoint,
+                    OutDeltasT & deltas);
 
-void DecodePolyline(InDeltasT const & deltas, m2::PointU const & basePoint,
-                    m2::PointU const & maxPoint, OutPointsT & points);
+void DecodePolyline(InDeltasT const & deltas, m2::PointU const & basePoint, m2::PointU const & maxPoint,
+                    OutPointsT & points);
 
-void EncodeTriangleStrip(InPointsT const & points, m2::PointU const & basePoint,
-                         m2::PointU const & maxPoint, OutDeltasT & deltas);
+void EncodeTriangleStrip(InPointsT const & points, m2::PointU const & basePoint, m2::PointU const & maxPoint,
+                         OutDeltasT & deltas);
 
-void DecodeTriangleStrip(InDeltasT const & deltas, m2::PointU const & basePoint,
-                         m2::PointU const & maxPoint, OutPointsT & points);
+void DecodeTriangleStrip(InDeltasT const & deltas, m2::PointU const & basePoint, m2::PointU const & maxPoint,
+                         OutPointsT & points);
 }  // namespace coding
 
 namespace serial
@@ -147,26 +146,24 @@ m2::PointU GetBasePoint(GeometryCodingParams const & params);
 }  // namespace pts
 
 /// @name Encode and Decode function types.
-typedef void (*EncodeFunT)(coding::InPointsT const &, m2::PointU const &, m2::PointU const &,
-                           coding::OutDeltasT &);
-typedef void (*DecodeFunT)(coding::InDeltasT const &, m2::PointU const &, m2::PointU const &,
-                           coding::OutPointsT &);
+typedef void (*EncodeFunT)(coding::InPointsT const &, m2::PointU const &, m2::PointU const &, coding::OutDeltasT &);
+typedef void (*DecodeFunT)(coding::InDeltasT const &, m2::PointU const &, m2::PointU const &, coding::OutPointsT &);
 
 using DeltasT = buffer_vector<uint64_t, 32>;
 using OutPointsT = buffer_vector<m2::PointD, 32>;
 
-void Encode(EncodeFunT fn, std::vector<m2::PointD> const & points,
-            GeometryCodingParams const & params, DeltasT & deltas);
+void Encode(EncodeFunT fn, std::vector<m2::PointD> const & points, GeometryCodingParams const & params,
+            DeltasT & deltas);
 
 /// @name Overloads for different out container types.
-void Decode(DecodeFunT fn, DeltasT const & deltas, GeometryCodingParams const & params,
-            OutPointsT & points, size_t reserveF = 1);
+void Decode(DecodeFunT fn, DeltasT const & deltas, GeometryCodingParams const & params, OutPointsT & points,
+            size_t reserveF = 1);
 void Decode(DecodeFunT fn, DeltasT const & deltas, GeometryCodingParams const & params,
             std::vector<m2::PointD> & points, size_t reserveF = 1);
 
 template <class TDecodeFun, class TOutPoints>
-void DecodeImpl(TDecodeFun fn, DeltasT const & deltas, GeometryCodingParams const & params,
-                TOutPoints & points, size_t reserveF)
+void DecodeImpl(TDecodeFun fn, DeltasT const & deltas, GeometryCodingParams const & params, TOutPoints & points,
+                size_t reserveF)
 {
   size_t const count = deltas.size() * reserveF;
 
@@ -189,22 +186,19 @@ void DecodeImpl(TDecodeFun fn, DeltasT const & deltas, GeometryCodingParams cons
 template <class TSink>
 void SavePoint(TSink & sink, m2::PointD const & pt, GeometryCodingParams const & cp)
 {
-  WriteVarUint(sink, coding::EncodePointDeltaAsUint(PointDToPointU(pt, cp.GetCoordBits()),
-                                                    cp.GetBasePoint()));
+  WriteVarUint(sink, coding::EncodePointDeltaAsUint(PointDToPointU(pt, cp.GetCoordBits()), cp.GetBasePoint()));
 }
 
 template <class TSource>
 m2::PointD LoadPoint(TSource & src, GeometryCodingParams const & cp)
 {
-  m2::PointD const pt = PointUToPointD(
-      coding::DecodePointDeltaFromUint(ReadVarUint<uint64_t>(src), cp.GetBasePoint()),
-      cp.GetCoordBits());
+  m2::PointD const pt = PointUToPointD(coding::DecodePointDeltaFromUint(ReadVarUint<uint64_t>(src), cp.GetBasePoint()),
+                                       cp.GetCoordBits());
   return pt;
 }
 
 template <class TSink>
-void SaveInner(EncodeFunT fn, std::vector<m2::PointD> const & points,
-               GeometryCodingParams const & params, TSink & sink)
+void SaveInner(EncodeFunT fn, std::vector<m2::PointD> const & points, GeometryCodingParams const & params, TSink & sink)
 {
   DeltasT deltas;
   Encode(fn, points, params, deltas);
@@ -220,8 +214,7 @@ void WriteBufferToSink(std::vector<char> const & buffer, TSink & sink)
 }
 
 template <class TSink>
-void SaveOuter(EncodeFunT fn, std::vector<m2::PointD> const & points,
-               GeometryCodingParams const & params, TSink & sink)
+void SaveOuter(EncodeFunT fn, std::vector<m2::PointD> const & points, GeometryCodingParams const & params, TSink & sink)
 {
   DeltasT deltas;
   Encode(fn, points, params, deltas);
@@ -233,12 +226,11 @@ void SaveOuter(EncodeFunT fn, std::vector<m2::PointD> const & points,
   WriteBufferToSink(buffer, sink);
 }
 
-void const * LoadInner(DecodeFunT fn, void const * pBeg, size_t count,
-                       GeometryCodingParams const & params, OutPointsT & points);
+void const * LoadInner(DecodeFunT fn, void const * pBeg, size_t count, GeometryCodingParams const & params,
+                       OutPointsT & points);
 
 template <class TSource, class TPoints>
-void LoadOuter(DecodeFunT fn, TSource & src, GeometryCodingParams const & params, TPoints & points,
-               size_t reserveF = 1)
+void LoadOuter(DecodeFunT fn, TSource & src, GeometryCodingParams const & params, TPoints & points, size_t reserveF = 1)
 {
   uint32_t const count = ReadVarUint<uint32_t>(src);
   std::vector<char> buffer(count);
@@ -254,21 +246,19 @@ void LoadOuter(DecodeFunT fn, TSource & src, GeometryCodingParams const & params
 
 /// @name Paths.
 template <class TSink>
-void SaveInnerPath(std::vector<m2::PointD> const & points, GeometryCodingParams const & params,
-                   TSink & sink)
+void SaveInnerPath(std::vector<m2::PointD> const & points, GeometryCodingParams const & params, TSink & sink)
 {
   SaveInner(&coding::EncodePolyline, points, params, sink);
 }
 
 template <class TSink>
-void SaveOuterPath(std::vector<m2::PointD> const & points, GeometryCodingParams const & params,
-                   TSink & sink)
+void SaveOuterPath(std::vector<m2::PointD> const & points, GeometryCodingParams const & params, TSink & sink)
 {
   SaveOuter(&coding::EncodePolyline, points, params, sink);
 }
 
-inline void const * LoadInnerPath(void const * pBeg, size_t count,
-                                  GeometryCodingParams const & params, OutPointsT & points)
+inline void const * LoadInnerPath(void const * pBeg, size_t count, GeometryCodingParams const & params,
+                                  OutPointsT & points)
 {
   return LoadInner(&coding::DecodePolyline, pBeg, count, params, points);
 }
@@ -281,8 +271,7 @@ void LoadOuterPath(TSource & src, GeometryCodingParams const & params, TPoints &
 
 /// @name Triangles.
 template <class TSink>
-void SaveInnerTriangles(std::vector<m2::PointD> const & points, GeometryCodingParams const & params,
-                        TSink & sink)
+void SaveInnerTriangles(std::vector<m2::PointD> const & points, GeometryCodingParams const & params, TSink & sink)
 {
   SaveInner(&coding::EncodeTriangleStrip, points, params, sink);
 }
@@ -300,8 +289,8 @@ inline void StripToTriangles(size_t count, OutPointsT const & strip, OutPointsT
   }
 }
 
-inline void const * LoadInnerTriangles(void const * pBeg, size_t count,
-                                       GeometryCodingParams const & params, OutPointsT & triangles)
+inline void const * LoadInnerTriangles(void const * pBeg, size_t count, GeometryCodingParams const & params,
+                                       OutPointsT & triangles)
 {
   CHECK_GREATER_OR_EQUAL(count, 2, ());
   OutPointsT points;
@@ -311,8 +300,8 @@ inline void const * LoadInnerTriangles(void const * pBeg, size_t count,
   return res;
 }
 
-void DecodeTriangles(coding::InDeltasT const & deltas, m2::PointU const & basePoint,
-                     m2::PointU const & maxPoint, coding::OutPointsT & triangles);
+void DecodeTriangles(coding::InDeltasT const & deltas, m2::PointU const & basePoint, m2::PointU const & maxPoint,
+                     coding::OutPointsT & triangles);
 
 template <class TSource>
 void LoadOuterTriangles(TSource & src, GeometryCodingParams const & params, OutPointsT & triangles)
diff --git a/libs/coding/hex.cpp b/libs/coding/hex.cpp
index b82214d2f..fefd7b095 100644
--- a/libs/coding/hex.cpp
+++ b/libs/coding/hex.cpp
@@ -2,48 +2,47 @@
 
 #include "base/assert.hpp"
 
-
 namespace impl
 {
-  static const char kToHexTable[] = "0123456789ABCDEF";
+static char const kToHexTable[] = "0123456789ABCDEF";
 
-  void ToHexRaw(void const * src, size_t size, void * dst)
+void ToHexRaw(void const * src, size_t size, void * dst)
+{
+  uint8_t const * ptr = static_cast<uint8_t const *>(src);
+  uint8_t const * end = ptr + size;
+  uint8_t * out = static_cast<uint8_t *>(dst);
+
+  while (ptr != end)
   {
-    uint8_t const * ptr = static_cast<uint8_t const *>(src);
-    uint8_t const * end = ptr + size;
-    uint8_t * out = static_cast<uint8_t*>(dst);
-
-    while (ptr != end)
-    {
-      *out++ = kToHexTable[(*ptr) >> 4];
-      *out++ = kToHexTable[(*ptr) & 0xF];
-      ++ptr;
-    }
-  }
-
-  uint8_t HexDigitToRaw(uint8_t const digit)
-  {
-    if (digit >= '0' && digit <= '9')
-      return (digit - '0');
-    else if (digit >= 'A' && digit <= 'F')
-      return (digit - 'A' + 10);
-    else if (digit >= 'a' && digit <= 'f')
-      return (digit - 'a' + 10);
-    ASSERT(false, (digit));
-    return 0;
-  }
-
-  void FromHexRaw(void const * src, size_t size, void * dst)
-  {
-    uint8_t const * ptr = static_cast<uint8_t const *>(src);
-    uint8_t const * end = ptr + size;
-    uint8_t * out = static_cast<uint8_t*>(dst);
-
-    while (ptr < end)
-    {
-      *out = HexDigitToRaw(*ptr++) << 4;
-      *out |= HexDigitToRaw(*ptr++);
-      ++out;
-    }
+    *out++ = kToHexTable[(*ptr) >> 4];
+    *out++ = kToHexTable[(*ptr) & 0xF];
+    ++ptr;
   }
 }
+
+uint8_t HexDigitToRaw(uint8_t const digit)
+{
+  if (digit >= '0' && digit <= '9')
+    return (digit - '0');
+  else if (digit >= 'A' && digit <= 'F')
+    return (digit - 'A' + 10);
+  else if (digit >= 'a' && digit <= 'f')
+    return (digit - 'a' + 10);
+  ASSERT(false, (digit));
+  return 0;
+}
+
+void FromHexRaw(void const * src, size_t size, void * dst)
+{
+  uint8_t const * ptr = static_cast<uint8_t const *>(src);
+  uint8_t const * end = ptr + size;
+  uint8_t * out = static_cast<uint8_t *>(dst);
+
+  while (ptr < end)
+  {
+    *out = HexDigitToRaw(*ptr++) << 4;
+    *out |= HexDigitToRaw(*ptr++);
+    ++out;
+  }
+}
+}  // namespace impl
diff --git a/libs/coding/hex.hpp b/libs/coding/hex.hpp
index ba2b3a4bc..a31bb6848 100644
--- a/libs/coding/hex.hpp
+++ b/libs/coding/hex.hpp
@@ -9,14 +9,15 @@
 
 namespace impl
 {
-  void ToHexRaw(void const * src, size_t size, void * dst);
-  void FromHexRaw(void const * src, size_t size, void * dst);
-}
+void ToHexRaw(void const * src, size_t size, void * dst);
+void FromHexRaw(void const * src, size_t size, void * dst);
+}  // namespace impl
 
-inline std::string ToHex(const void * ptr, size_t size)
+inline std::string ToHex(void const * ptr, size_t size)
 {
   std::string result;
-  if (size == 0) return result;
+  if (size == 0)
+    return result;
 
   result.resize(size * 2);
   ::impl::ToHexRaw(ptr, size, &result[0]);
diff --git a/libs/coding/huffman.hpp b/libs/coding/huffman.hpp
index 10391fd34..ba89e3ac8 100644
--- a/libs/coding/huffman.hpp
+++ b/libs/coding/huffman.hpp
@@ -83,7 +83,7 @@ public:
     Code() : bits(0), len(0) {}
     Code(uint32_t bits, size_t len) : bits(bits), len(len) {}
 
-    bool operator<(const Code & o) const
+    bool operator<(Code const & o) const
     {
       if (bits != o.bits)
         return bits < o.bits;
@@ -224,9 +224,13 @@ private:
     bool isLeaf;
 
     Node(uint32_t symbol, uint32_t freq, bool isLeaf)
-        : l(nullptr), r(nullptr), symbol(symbol), freq(freq), depth(0), isLeaf(isLeaf)
-    {
-    }
+      : l(nullptr)
+      , r(nullptr)
+      , symbol(symbol)
+      , freq(freq)
+      , depth(0)
+      , isLeaf(isLeaf)
+    {}
   };
 
   struct NodeComparator
diff --git a/libs/coding/internal/file64_api.hpp b/libs/coding/internal/file64_api.hpp
index febb3da3c..8be3f8384 100644
--- a/libs/coding/internal/file64_api.hpp
+++ b/libs/coding/internal/file64_api.hpp
@@ -3,26 +3,26 @@
 #include "std/target_os.hpp"
 
 #if defined(OMIM_OS_WINDOWS_NATIVE)
-  #define fseek64 _fseeki64
-  #define ftell64 _ftelli64
+#define fseek64 _fseeki64
+#define ftell64 _ftelli64
 
 #elif defined(OMIM_OS_WINDOWS_MINGW)
-  #define fseek64 fseeko64
-  #define ftell64 ftello64
+#define fseek64 fseeko64
+#define ftell64 ftello64
 
 #else
-  // POSIX standart.
-  #include <sys/types.h>
+// POSIX standart.
+#include <sys/types.h>
 
-  // TODO: Always assert for 8 bytes after increasing min Android API to 24+.
-  // See more details here: https://android.googlesource.com/platform/bionic/+/master/docs/32-bit-abi.md
-  #if defined(OMIM_OS_ANDROID) && (defined(__arm__) || defined(__i386__))
-    static_assert(sizeof(off_t) == 4, "32-bit Android NDK < API 24 has only 32-bit file operations support");
-  #else
-    static_assert(sizeof(off_t) == 8, "FileReader and FileWriter require 64-bit file operations");
-  #endif
-  #define fseek64 fseeko
-  #define ftell64 ftello
+// TODO: Always assert for 8 bytes after increasing min Android API to 24+.
+// See more details here: https://android.googlesource.com/platform/bionic/+/master/docs/32-bit-abi.md
+#if defined(OMIM_OS_ANDROID) && (defined(__arm__) || defined(__i386__))
+static_assert(sizeof(off_t) == 4, "32-bit Android NDK < API 24 has only 32-bit file operations support");
+#else
+static_assert(sizeof(off_t) == 8, "FileReader and FileWriter require 64-bit file operations");
+#endif
+#define fseek64 fseeko
+#define ftell64 ftello
 
 #endif
 
diff --git a/libs/coding/internal/file_data.cpp b/libs/coding/internal/file_data.cpp
index 2d47ee1b5..28937340f 100644
--- a/libs/coding/internal/file_data.cpp
+++ b/libs/coding/internal/file_data.cpp
@@ -2,8 +2,8 @@
 
 #include "coding/constants.hpp"
 #include "coding/internal/file64_api.hpp"
-#include "coding/reader.hpp" // For Reader exceptions.
-#include "coding/writer.hpp" // For Writer exceptions.
+#include "coding/reader.hpp"  // For Reader exceptions.
+#include "coding/writer.hpp"  // For Writer exceptions.
 
 #include "base/exception.hpp"
 #include "base/logging.hpp"
@@ -40,10 +40,9 @@ std::ostream & operator<<(std::ostream & stream, FileData::Op op)
   return stream;
 }
 
-FileData::FileData(string const & fileName, Op op)
-  : m_FileName(fileName), m_Op(op)
+FileData::FileData(string const & fileName, Op op) : m_FileName(fileName), m_Op(op)
 {
-  char const * const modes [] = {"rb", "wb", "r+b", "ab"};
+  char const * const modes[] = {"rb", "wb", "r+b", "ab"};
 
   m_File = fopen(fileName.c_str(), modes[static_cast<int>(op)]);
   if (m_File)
@@ -190,9 +189,7 @@ bool CheckFileOperationResult(int res, string const & fName)
   // additional check if file really was removed correctly
   uint64_t dummy;
   if (GetFileSize(fName, dummy))
-  {
     LOG(LERROR, ("File exists but can't be deleted. Sharing violation?", fName));
-  }
 
   return false;
 }
@@ -226,18 +223,16 @@ bool MoveFileX(string const & fOld, string const & fNew)
   // Otherwise perform the full move.
   if (!CopyFileX(fOld, fNew))
   {
-    (void) DeleteFileX(fNew);
+    (void)DeleteFileX(fNew);
     return false;
   }
-  (void) DeleteFileX(fOld);
+  (void)DeleteFileX(fOld);
   return true;
 }
 
-bool WriteToTempAndRenameToFile(string const & dest, function<bool(string const &)> const & write,
-                                string const & tmp)
+bool WriteToTempAndRenameToFile(string const & dest, function<bool(string const &)> const & write, string const & tmp)
 {
-  string const tmpFileName =
-      tmp.empty() ? dest + ".tmp" + strings::to_string(this_thread::get_id()) : tmp;
+  string const tmpFileName = tmp.empty() ? dest + ".tmp" + strings::to_string(this_thread::get_id()) : tmp;
   if (!write(tmpFileName))
   {
     LOG(LERROR, ("Can't write to", tmpFileName));
@@ -298,7 +293,7 @@ bool CopyFileX(string const & fOld, string const & fNew)
   }
 
   // Don't care about possible error here ..
-  (void) DeleteFileX(fNew);
+  (void)DeleteFileX(fNew);
   return false;
 }
 
diff --git a/libs/coding/internal/file_data.hpp b/libs/coding/internal/file_data.hpp
index a2c04fbbc..beea6e760 100644
--- a/libs/coding/internal/file_data.hpp
+++ b/libs/coding/internal/file_data.hpp
@@ -13,7 +13,13 @@ class FileData
 {
 public:
   /// @note Do not change order (@see FileData::FileData).
-  enum class Op { READ = 0, WRITE_TRUNCATE, WRITE_EXISTING, APPEND };
+  enum class Op
+  {
+    READ = 0,
+    WRITE_TRUNCATE,
+    WRITE_EXISTING,
+    APPEND
+  };
 
   FileData(std::string const & fileName, Op op);
   ~FileData();
@@ -33,8 +39,8 @@ public:
 
 private:
   FILE * m_File;
-  const std::string m_FileName;
-  const Op m_Op;
+  std::string const m_FileName;
+  Op const m_Op;
 
   std::string GetErrorProlog() const;
 
@@ -47,8 +53,7 @@ bool RenameFileX(std::string const & fOld, std::string const & fNew);
 
 /// Write to temp file and rename it to dest. Delete temp on failure.
 /// @param write function that writes to file with a given name, returns true on success.
-bool WriteToTempAndRenameToFile(std::string const & dest,
-                                std::function<bool(std::string const &)> const & write,
+bool WriteToTempAndRenameToFile(std::string const & dest, std::function<bool(std::string const &)> const & write,
                                 std::string const & tmp = "");
 
 void AppendFileToFile(std::string const & fromFilename, std::string const & toFilename);
diff --git a/libs/coding/internal/xmlparser.hpp b/libs/coding/internal/xmlparser.hpp
index 0d8ca68b0..50d158104 100644
--- a/libs/coding/internal/xmlparser.hpp
+++ b/libs/coding/internal/xmlparser.hpp
@@ -36,15 +36,14 @@ public:
     , m_restrictDepth(static_cast<size_t>(-1))
     , m_dispatcher(dispatcher)
     , m_enableCharHandler(enableCharHandler)
-    , m_parser(std::unique_ptr<XML_ParserStruct, decltype(&XML_ParserFree)>(
-          XML_ParserCreate(nullptr /* encoding */), &XML_ParserFree))
+    , m_parser(std::unique_ptr<XML_ParserStruct, decltype(&XML_ParserFree)>(XML_ParserCreate(nullptr /* encoding */),
+                                                                            &XML_ParserFree))
   {
     CHECK(m_parser, ());
     OnPostCreate();
   }
 
-  static void StartElementHandler(void * userData, XML_Char const * name,
-                                  XML_Char const ** attrs)
+  static void StartElementHandler(void * userData, XML_Char const * name, XML_Char const ** attrs)
   {
     CHECK(userData, (name));
     auto * xmlParser = static_cast<XmlParser *>(userData);
@@ -138,8 +137,8 @@ public:
       return {};
 
     std::stringstream s;
-    s << "XML parse error at line " << XML_GetCurrentLineNumber(m_parser.get())
-      << " and byte " << XML_GetCurrentByteIndex(m_parser.get());
+    s << "XML parse error at line " << XML_GetCurrentLineNumber(m_parser.get()) << " and byte "
+      << XML_GetCurrentByteIndex(m_parser.get());
     return s.str();
   }
 
diff --git a/libs/coding/map_uint32_to_val.hpp b/libs/coding/map_uint32_to_val.hpp
index c6eea21ab..c94b6b08c 100644
--- a/libs/coding/map_uint32_to_val.hpp
+++ b/libs/coding/map_uint32_to_val.hpp
@@ -101,9 +101,9 @@ public:
   };
 
   MapUint32ToValue(Reader & reader, ReadBlockCallback const & readBlockCallback)
-    : m_reader(reader), m_readBlockCallback(readBlockCallback)
-  {
-  }
+    : m_reader(reader)
+    , m_readBlockCallback(readBlockCallback)
+  {}
 
   /// @name Tries to get |value| for key identified by |id|.
   /// @returns false if table does not have entry for this id.
@@ -284,8 +284,7 @@ public:
     }
 
     {
-      succinct::elias_fano::elias_fano_builder builder(offsets.empty() ? 0 : offsets.back() + 1,
-                                                       offsets.size());
+      succinct::elias_fano::elias_fano_builder builder(offsets.empty() ? 0 : offsets.back() + 1, offsets.size());
       for (auto const & offset : offsets)
         builder.push_back(offset);
 
diff --git a/libs/coding/memory_region.hpp b/libs/coding/memory_region.hpp
index 719782fef..fa243eb18 100644
--- a/libs/coding/memory_region.hpp
+++ b/libs/coding/memory_region.hpp
@@ -20,9 +20,7 @@ public:
 class MappedMemoryRegion : public MemoryRegion
 {
 public:
-  explicit MappedMemoryRegion(FilesMappingContainer::Handle && handle) : m_handle(std::move(handle))
-  {
-  }
+  explicit MappedMemoryRegion(FilesMappingContainer::Handle && handle) : m_handle(std::move(handle)) {}
 
   // MemoryRegion overrides:
   uint64_t Size() const override { return m_handle.GetSize(); }
diff --git a/libs/coding/mmap_reader.cpp b/libs/coding/mmap_reader.cpp
index 80504cdd6..97ef3bb01 100644
--- a/libs/coding/mmap_reader.cpp
+++ b/libs/coding/mmap_reader.cpp
@@ -7,16 +7,16 @@
 #include <cstring>
 
 #ifdef OMIM_OS_WINDOWS
-  #include <windows.h>
+#include <windows.h>
 #else
-  #include <unistd.h>
-  #include <sys/mman.h>
-  #include <sys/stat.h>
-  #ifdef OMIM_OS_ANDROID
-    #include <fcntl.h>
-  #else
-    #include <sys/fcntl.h>
-  #endif
+#include <sys/mman.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#ifdef OMIM_OS_ANDROID
+#include <fcntl.h>
+#else
+#include <sys/fcntl.h>
+#endif
 #endif
 
 class MmapReader::MmapData
@@ -33,7 +33,8 @@ public:
 
     m_hMapping = CreateFileMappingA(m_hFile, nullptr, PAGE_READONLY, 0, 0, nullptr);
     if (!m_hMapping)
-      MYTHROW(Reader::OpenException, ("Can't create file's Windows mapping:", fileName, "win last error:", GetLastError()));
+      MYTHROW(Reader::OpenException,
+              ("Can't create file's Windows mapping:", fileName, "win last error:", GetLastError()));
 
     SCOPE_GUARD(mappingGuard, [this] { CloseHandle(m_hMapping); });
 
@@ -44,7 +45,8 @@ public:
     m_size = fileSize.QuadPart;
     m_memory = static_cast<uint8_t *>(MapViewOfFile(m_hMapping, FILE_MAP_READ, 0, 0, 0));
     if (!m_memory)
-      MYTHROW(Reader::OpenException, ("Can't create file's Windows mapping:", fileName, "win last error:", GetLastError()));
+      MYTHROW(Reader::OpenException,
+              ("Can't create file's Windows mapping:", fileName, "win last error:", GetLastError()));
 
     mappingGuard.release();
     fileGuard.release();
@@ -58,8 +60,7 @@ public:
       MYTHROW(OpenException, ("fstat failed for file", fileName));
     m_size = s.st_size;
 
-    m_memory = static_cast<uint8_t *>(
-        mmap(0, static_cast<size_t>(m_size), PROT_READ, MAP_PRIVATE, m_fd, 0));
+    m_memory = static_cast<uint8_t *>(mmap(0, static_cast<size_t>(m_size), PROT_READ, MAP_PRIVATE, m_fd, 0));
     if (m_memory == MAP_FAILED)
     {
       close(m_fd);
@@ -109,14 +110,14 @@ MmapReader::MmapReader(std::string const & fileName, Advice advice)
   , m_data(std::make_shared<MmapData>(fileName, advice))
   , m_offset(0)
   , m_size(m_data->m_size)
-{
-}
+{}
 
 MmapReader::MmapReader(MmapReader const & reader, uint64_t offset, uint64_t size)
-  : base_type(reader.GetName()), m_data(reader.m_data),
-    m_offset(offset), m_size(size)
-{
-}
+  : base_type(reader.GetName())
+  , m_data(reader.m_data)
+  , m_offset(offset)
+  , m_size(size)
+{}
 
 uint64_t MmapReader::Size() const
 {
diff --git a/libs/coding/parse_xml.hpp b/libs/coding/parse_xml.hpp
index bb0b49c6d..d89e6d9f0 100644
--- a/libs/coding/parse_xml.hpp
+++ b/libs/coding/parse_xml.hpp
@@ -20,8 +20,7 @@ public:
     , m_numRead(0)
     , m_source(source)
     , m_parser(dispatcher, useCharData)
-  {
-  }
+  {}
 
   bool Read()
   {
@@ -65,7 +64,6 @@ private:
   Source & m_source;
 };
 
-
 template <typename XMLDispatcher, typename Source>
 bool ParseXML(Source & source, XMLDispatcher & dispatcher, bool useCharData = false)
 {
@@ -73,7 +71,8 @@ bool ParseXML(Source & source, XMLDispatcher & dispatcher, bool useCharData = fa
   XMLSequenceParser<decltype(adapter), XMLDispatcher> parser(adapter, dispatcher, useCharData);
   try
   {
-    while (parser.Read()) /* empty */;
+    while (parser.Read()) /* empty */
+      ;
   }
   catch (std::exception const & e)
   {
diff --git a/libs/coding/point_coding.cpp b/libs/coding/point_coding.cpp
index 49c83bc5d..0973ba34b 100644
--- a/libs/coding/point_coding.cpp
+++ b/libs/coding/point_coding.cpp
@@ -45,10 +45,10 @@ double Uint32ToDouble(uint32_t x, double min, double max, uint8_t coordBits)
 
   // It doesn't work now because of fancy serialization of m2::DiamondBox.
   /// @todo Check PathsThroughLayers search test. Refactor CitiesBoundariesSerDes.
-  //ASSERT_LESS_OR_EQUAL(x, coordSize, (d, min, max, coordBits));
+  // ASSERT_LESS_OR_EQUAL(x, coordSize, (d, min, max, coordBits));
 
   // It doesn't work because of possible floating errors.
-  //ASSERT(d >= min && d <= max, (d, x, min, max, coordBits));
+  // ASSERT(d >= min && d <= max, (d, x, min, max, coordBits));
 
   return math::Clamp(d, min, max);
 }
@@ -56,8 +56,8 @@ double Uint32ToDouble(uint32_t x, double min, double max, uint8_t coordBits)
 m2::PointU PointDToPointU(double x, double y, uint8_t coordBits)
 {
   using mercator::Bounds;
-  return { DoubleToUint32(x, Bounds::kMinX, Bounds::kMaxX, coordBits),
-           DoubleToUint32(y, Bounds::kMinY, Bounds::kMaxY, coordBits) };
+  return {DoubleToUint32(x, Bounds::kMinX, Bounds::kMaxX, coordBits),
+          DoubleToUint32(y, Bounds::kMinY, Bounds::kMaxY, coordBits)};
 }
 
 m2::PointU PointDToPointU(m2::PointD const & pt, uint8_t coordBits)
@@ -67,21 +67,21 @@ m2::PointU PointDToPointU(m2::PointD const & pt, uint8_t coordBits)
 
 m2::PointU PointDToPointU(m2::PointD const & pt, uint8_t coordBits, m2::RectD const & limitRect)
 {
-  return { DoubleToUint32(pt.x, limitRect.minX(), limitRect.maxX(), coordBits),
-           DoubleToUint32(pt.y, limitRect.minY(), limitRect.maxY(), coordBits) };
+  return {DoubleToUint32(pt.x, limitRect.minX(), limitRect.maxX(), coordBits),
+          DoubleToUint32(pt.y, limitRect.minY(), limitRect.maxY(), coordBits)};
 }
 
 m2::PointD PointUToPointD(m2::PointU const & pt, uint8_t coordBits)
 {
   using mercator::Bounds;
-  return { Uint32ToDouble(pt.x, Bounds::kMinX, Bounds::kMaxX, coordBits),
-           Uint32ToDouble(pt.y, Bounds::kMinY, Bounds::kMaxY, coordBits) };
+  return {Uint32ToDouble(pt.x, Bounds::kMinX, Bounds::kMaxX, coordBits),
+          Uint32ToDouble(pt.y, Bounds::kMinY, Bounds::kMaxY, coordBits)};
 }
 
 m2::PointD PointUToPointD(m2::PointU const & pt, uint8_t coordBits, m2::RectD const & limitRect)
 {
-  return { Uint32ToDouble(pt.x, limitRect.minX(), limitRect.maxX(), coordBits),
-           Uint32ToDouble(pt.y, limitRect.minY(), limitRect.maxY(), coordBits) };
+  return {Uint32ToDouble(pt.x, limitRect.minX(), limitRect.maxX(), coordBits),
+          Uint32ToDouble(pt.y, limitRect.minY(), limitRect.maxY(), coordBits)};
 }
 
 uint8_t GetCoordBits(m2::RectD const & limitRect, double accuracy)
@@ -89,10 +89,8 @@ uint8_t GetCoordBits(m2::RectD const & limitRect, double accuracy)
   auto const range = std::max(limitRect.SizeX(), limitRect.SizeY());
   auto const valuesNumber = 1.0 + range / accuracy;
   for (uint8_t coordBits = 1; coordBits <= 32; ++coordBits)
-  {
     if (CoordSize(coordBits) >= valuesNumber)
       return coordBits;
-  }
   return 0;
 }
 
diff --git a/libs/coding/read_write_utils.hpp b/libs/coding/read_write_utils.hpp
index 6a8805302..5c33084a8 100644
--- a/libs/coding/read_write_utils.hpp
+++ b/libs/coding/read_write_utils.hpp
@@ -11,156 +11,152 @@
 
 namespace rw
 {
-  template <class T, class TSink>
-  std::enable_if_t<std::is_integral_v<T> && std::is_unsigned_v<T>, void>
-  Write(TSink & sink, T i)
+template <class T, class TSink>
+std::enable_if_t<std::is_integral_v<T> && std::is_unsigned_v<T>, void> Write(TSink & sink, T i)
+{
+  WriteVarUint(sink, i);
+}
+
+template <class T, class TSource>
+std::enable_if_t<std::is_integral_v<T> && std::is_unsigned_v<T>, void> Read(TSource & src, T & i)
+{
+  i = ReadVarUint<T>(src);
+}
+
+template <class T, class TSink>
+std::enable_if_t<std::is_integral_v<T> && std::is_signed_v<T>, void> Write(TSink & sink, T i)
+{
+  WriteVarInt(sink, i);
+}
+
+template <class T, class TSource>
+std::enable_if_t<std::is_integral_v<T> && std::is_signed_v<T>, void> Read(TSource & src, T & i)
+{
+  i = ReadVarInt<T>(src);
+}
+
+template <class TSink>
+void Write(TSink & sink, std::string const & s)
+{
+  uint32_t const count = static_cast<uint32_t>(s.size());
+  WriteVarUint(sink, count);
+  if (!s.empty())
+    sink.Write(&s[0], count);
+}
+
+template <class TSource>
+void Read(TSource & src, std::string & s)
+{
+  uint32_t const count = ReadVarUint<uint32_t>(src);
+  s.resize(count);
+  if (count > 0)
+    src.Read(&s[0], count);
+}
+
+namespace impl
+{
+template <class TSink, class TCont>
+void WriteCont(TSink & sink, TCont const & v)
+{
+  uint32_t const count = static_cast<uint32_t>(v.size());
+  WriteVarUint(sink, count);
+  for (uint32_t i = 0; i < count; ++i)
+    Write(sink, v[i]);
+}
+
+template <class TSource, class TCont>
+void ReadCont(TSource & src, TCont & v)
+{
+  uint32_t const count = ReadVarUint<uint32_t>(src);
+  v.resize(count);
+  for (size_t i = 0; i < count; ++i)
+    Read(src, v[i]);
+}
+}  // namespace impl
+
+template <class TSink, class T>
+void Write(TSink & sink, std::vector<T> const & v)
+{
+  impl::WriteCont(sink, v);
+}
+
+template <class TSource, class T>
+void Read(TSource & src, std::vector<T> & v)
+{
+  impl::ReadCont(src, v);
+}
+
+template <class TSink, class T, size_t N>
+void Write(TSink & sink, buffer_vector<T, N> const & v)
+{
+  impl::WriteCont(sink, v);
+}
+
+template <class TSource, class T, size_t N>
+void Read(TSource & src, buffer_vector<T, N> & v)
+{
+  impl::ReadCont(src, v);
+}
+
+template <class Sink, class T>
+void WritePOD(Sink & sink, T const & value)
+{
+  static_assert(std::is_trivially_copyable<T>::value, "");
+  sink.Write(&value, sizeof(T));
+}
+
+template <class Sink, class T>
+void ReadPOD(Sink & src, T & value)
+{
+  static_assert(std::is_trivially_copyable<T>::value, "");
+  src.Read(&value, sizeof(T));
+}
+
+template <class TSource, class TCont>
+void ReadVectorOfPOD(TSource & src, TCont & v)
+{
+  typedef typename TCont::value_type ValueT;
+  /// This assert fails on std::pair<int, int> and OsmID class because std::pair is not trivially copyable:
+  /// std::pair has a non-trivial copy-assignment and move-assignment operator.
+  // static_assert(std::is_trivially_copyable_v<ValueT>);
+
+  uint32_t const count = ReadVarUint<uint32_t>(src);
+  if (count > 0)
   {
-    WriteVarUint(sink, i);
-  }
-
-  template <class T, class TSource>
-  std::enable_if_t<std::is_integral_v<T> && std::is_unsigned_v<T>, void>
-  Read(TSource & src, T & i)
-  {
-    i = ReadVarUint<T>(src);
-  }
-
-  template <class T, class TSink>
-  std::enable_if_t<std::is_integral_v<T> && std::is_signed_v<T>, void>
-  Write(TSink & sink, T i)
-  {
-    WriteVarInt(sink, i);
-  }
-
-  template <class T, class TSource>
-  std::enable_if_t<std::is_integral_v<T> && std::is_signed_v<T>, void>
-  Read(TSource & src, T & i)
-  {
-    i = ReadVarInt<T>(src);
-  }
-
-  template <class TSink>
-  void Write(TSink & sink, std::string const & s)
-  {
-    uint32_t const count = static_cast<uint32_t>(s.size());
-    WriteVarUint(sink, count);
-    if (!s.empty())
-      sink.Write(&s[0], count);
-  }
-
-  template <class TSource>
-  void Read(TSource & src, std::string & s)
-  {
-    uint32_t const count = ReadVarUint<uint32_t>(src);
-    s.resize(count);
-    if (count > 0)
-      src.Read(&s[0], count);
-  }
-
-  namespace impl
-  {
-    template <class TSink, class TCont>
-    void WriteCont(TSink & sink, TCont const & v)
-    {
-      uint32_t const count = static_cast<uint32_t>(v.size());
-      WriteVarUint(sink, count);
-      for (uint32_t i = 0; i < count; ++i)
-        Write(sink, v[i]);
-    }
-
-    template <class TSource, class TCont>
-    void ReadCont(TSource & src, TCont & v)
-    {
-      uint32_t const count = ReadVarUint<uint32_t>(src);
-      v.resize(count);
-      for (size_t i = 0; i < count; ++i)
-        Read(src, v[i]);
-    }
-  }
-
-  template <class TSink, class T>
-  void Write(TSink & sink, std::vector<T> const & v)
-  {
-    impl::WriteCont(sink, v);
-  }
-
-  template <class TSource, class T>
-  void Read(TSource & src, std::vector<T> & v)
-  {
-    impl::ReadCont(src, v);
-  }
-
-  template <class TSink, class T, size_t N>
-  void Write(TSink & sink, buffer_vector<T, N> const & v)
-  {
-    impl::WriteCont(sink, v);
-  }
-
-  template <class TSource, class T, size_t N>
-  void Read(TSource & src, buffer_vector<T, N> & v)
-  {
-    impl::ReadCont(src, v);
-  }
-
-  template <class Sink, class T>
-  void WritePOD(Sink & sink, T const & value)
-  {
-    static_assert(std::is_trivially_copyable<T>::value, "");
-    sink.Write(&value, sizeof(T));
-  }
-
-  template <class Sink, class T>
-  void ReadPOD(Sink & src, T & value)
-  {
-    static_assert(std::is_trivially_copyable<T>::value, "");
-    src.Read(&value, sizeof(T));
-  }
-
-  template <class TSource, class TCont>
-  void ReadVectorOfPOD(TSource & src, TCont & v)
-  {
-    typedef typename TCont::value_type ValueT;
-    /// This assert fails on std::pair<int, int> and OsmID class because std::pair is not trivially copyable:
-    /// std::pair has a non-trivial copy-assignment and move-assignment operator.
-    //static_assert(std::is_trivially_copyable_v<ValueT>);
-
-    uint32_t const count = ReadVarUint<uint32_t>(src);
-    if (count > 0)
-    {
-      v.resize(count);
-      src.Read(&v[0], count * sizeof(ValueT));
-    }
-  }
-
-  template <class TSink, class TCont>
-  void WriteVectorOfPOD(TSink & sink, TCont const & v)
-  {
-    typedef typename TCont::value_type ValueT;
-    /// This assert fails on std::pair<int, int> and OsmID class because std::pair is not trivially copyable:
-    /// std::pair has a non-trivial copy-assignment and move-assignment operator.
-    //static_assert(std::is_trivially_copyable_v<ValueT>);
-
-    uint32_t const count = static_cast<uint32_t>(v.size());
-    WriteVarUint(sink, count);
-
-    if (count > 0)
-      sink.Write(&v[0], count * sizeof(ValueT));
-  }
-
-  template <class ReaderT, class WriterT>
-  void ReadAndWrite(ReaderT & reader, WriterT & writer, size_t bufferSize = 4*1024)
-  {
-    uint64_t size = reader.Size();
-    std::vector<char> buffer(std::min(bufferSize, static_cast<size_t>(size)));
-
-    while (size > 0)
-    {
-      size_t const curr = std::min(bufferSize, static_cast<size_t>(size));
-
-      reader.Read(&buffer[0], curr);
-      writer.Write(&buffer[0], curr);
-
-      size -= curr;
-    }
+    v.resize(count);
+    src.Read(&v[0], count * sizeof(ValueT));
   }
 }
+
+template <class TSink, class TCont>
+void WriteVectorOfPOD(TSink & sink, TCont const & v)
+{
+  typedef typename TCont::value_type ValueT;
+  /// This assert fails on std::pair<int, int> and OsmID class because std::pair is not trivially copyable:
+  /// std::pair has a non-trivial copy-assignment and move-assignment operator.
+  // static_assert(std::is_trivially_copyable_v<ValueT>);
+
+  uint32_t const count = static_cast<uint32_t>(v.size());
+  WriteVarUint(sink, count);
+
+  if (count > 0)
+    sink.Write(&v[0], count * sizeof(ValueT));
+}
+
+template <class ReaderT, class WriterT>
+void ReadAndWrite(ReaderT & reader, WriterT & writer, size_t bufferSize = 4 * 1024)
+{
+  uint64_t size = reader.Size();
+  std::vector<char> buffer(std::min(bufferSize, static_cast<size_t>(size)));
+
+  while (size > 0)
+  {
+    size_t const curr = std::min(bufferSize, static_cast<size_t>(size));
+
+    reader.Read(&buffer[0], curr);
+    writer.Write(&buffer[0], curr);
+
+    size -= curr;
+  }
+}
+}  // namespace rw
diff --git a/libs/coding/reader.hpp b/libs/coding/reader.hpp
index da9b0c900..a0d41801a 100644
--- a/libs/coding/reader.hpp
+++ b/libs/coding/reader.hpp
@@ -37,15 +37,9 @@ class MemReaderTemplate : public Reader
 {
 public:
   // Construct from block of memory.
-  MemReaderTemplate(void const * pData, size_t size)
-    : m_pData(static_cast<char const *>(pData)), m_size(size)
-  {
-  }
+  MemReaderTemplate(void const * pData, size_t size) : m_pData(static_cast<char const *>(pData)), m_size(size) {}
 
-  explicit MemReaderTemplate(std::string_view data)
-    : m_pData{data.data()}, m_size{data.size()}
-  {
-  }
+  explicit MemReaderTemplate(std::string_view data) : m_pData{data.data()}, m_size{data.size()} {}
 
   uint64_t Size() const override { return m_size; }
 
@@ -106,25 +100,15 @@ protected:
 public:
   template <typename TReaderDerived>
   ReaderPtr(std::unique_ptr<TReaderDerived> p) : m_p(std::move(p))
-  {
-  }
+  {}
 
-  uint64_t Size() const
-  {
-    return m_p->Size();
-  }
+  uint64_t Size() const { return m_p->Size(); }
 
-  void Read(uint64_t pos, void * p, size_t size) const
-  {
-    m_p->Read(pos, p, size);
-  }
+  void Read(uint64_t pos, void * p, size_t size) const { m_p->Read(pos, p, size); }
 
   void ReadAsString(std::string & s) const { m_p->ReadAsString(s); }
 
-  ReaderPtr<Reader> SubReader(uint64_t pos, uint64_t size) const
-  {
-    return {m_p->CreateSubReader(pos, size)};
-  }
+  ReaderPtr<Reader> SubReader(uint64_t pos, uint64_t size) const { return {m_p->CreateSubReader(pos, size)}; }
 
   TReader * GetPtr() const { return m_p.get(); }
 };
@@ -148,13 +132,11 @@ class ModelReaderPtr : public ReaderPtr<ModelReader>
 public:
   template <typename TReaderDerived>
   ModelReaderPtr(std::unique_ptr<TReaderDerived> p) : TBase(std::move(p))
-  {
-  }
+  {}
 
   ModelReaderPtr SubReader(uint64_t pos, uint64_t size) const
   {
-    return std::unique_ptr<ModelReader>(
-        static_cast<ModelReader *>(m_p->CreateSubReader(pos, size).release()));
+    return std::unique_ptr<ModelReader>(static_cast<ModelReader *>(m_p->CreateSubReader(pos, size).release()));
   }
 
   std::string const & GetName() const { return m_p->GetName(); }
@@ -166,13 +148,9 @@ class NonOwningReaderSource
 {
 public:
   /// @note Reader shouldn't change it's size during the source's lifetime.
-  explicit NonOwningReaderSource(Reader const & reader)
-  : m_reader(reader), m_pos(0), m_end(reader.Size())
-  {}
+  explicit NonOwningReaderSource(Reader const & reader) : m_reader(reader), m_pos(0), m_end(reader.Size()) {}
 
-  NonOwningReaderSource(Reader const & reader, uint64_t pos, uint64_t end)
-  : m_reader(reader), m_pos(pos), m_end(end)
-  {}
+  NonOwningReaderSource(Reader const & reader, uint64_t pos, uint64_t end) : m_reader(reader), m_pos(pos), m_end(end) {}
 
   void Read(void * p, size_t size)
   {
@@ -202,10 +180,7 @@ public:
   }
 
 private:
-  void CheckPosition() const
-  {
-    ASSERT_LESS_OR_EQUAL(m_pos, m_end, ());
-  }
+  void CheckPosition() const { ASSERT_LESS_OR_EQUAL(m_pos, m_end, ()); }
 
   Reader const & m_reader;
   uint64_t m_pos, m_end;
@@ -229,17 +204,14 @@ public:
   void Skip(uint64_t size)
   {
     m_pos += size;
-    ASSERT ( AssertPosition(), () );
+    ASSERT(AssertPosition(), ());
   }
 
-  uint64_t Pos() const
-  {
-    return m_pos;
-  }
+  uint64_t Pos() const { return m_pos; }
 
   uint64_t Size() const
   {
-    ASSERT ( AssertPosition(), () );
+    ASSERT(AssertPosition(), ());
     return (m_reader.Size() - m_pos);
   }
 
@@ -270,7 +242,7 @@ private:
   bool AssertPosition() const
   {
     bool const ret = (m_pos <= m_reader.Size());
-    ASSERT ( ret, (m_pos, m_reader.Size()) );
+    ASSERT(ret, (m_pos, m_reader.Size()));
     return ret;
   }
 
diff --git a/libs/coding/reader_cache.hpp b/libs/coding/reader_cache.hpp
index 6f7112c9e..4b8a09f97 100644
--- a/libs/coding/reader_cache.hpp
+++ b/libs/coding/reader_cache.hpp
@@ -47,10 +47,7 @@ template <class ReaderT, bool bStats = false>
 class ReaderCache
 {
 public:
-  ReaderCache(uint32_t logPageSize, uint32_t logPageCount)
-    : m_Cache(logPageCount), m_LogPageSize(logPageSize)
-  {
-  }
+  ReaderCache(uint32_t logPageSize, uint32_t logPageCount) : m_Cache(logPageCount), m_LogPageSize(logPageSize) {}
 
   void Read(ReaderT & reader, uint64_t pos, void * p, size_t size)
   {
@@ -79,10 +76,7 @@ public:
     }
   }
 
-  std::string GetStatsStr() const
-  {
-    return m_Stats.GetStatsStr(m_LogPageSize, m_Cache.GetCacheSize());
-  }
+  std::string GetStatsStr() const { return m_Stats.GetStatsStr(m_LogPageSize, m_Cache.GetCacheSize()); }
 
 private:
   inline size_t PageSize() const { return 1 << m_LogPageSize; }
@@ -102,7 +96,7 @@ private:
     return &v[0];
   }
 
-  base::Cache<uint64_t, std::vector<char> > m_Cache;
+  base::Cache<uint64_t, std::vector<char>> m_Cache;
   uint32_t const m_LogPageSize;
   impl::ReaderCacheStats<bStats> m_Stats;
 };
diff --git a/libs/coding/reader_streambuf.cpp b/libs/coding/reader_streambuf.cpp
index fd49f2836..ab66354e1 100644
--- a/libs/coding/reader_streambuf.cpp
+++ b/libs/coding/reader_streambuf.cpp
@@ -1,13 +1,10 @@
 #include "coding/reader_streambuf.hpp"
-#include "coding/reader.hpp"
 #include "coding/file_writer.hpp"
+#include "coding/reader.hpp"
 
 #include <algorithm>
 
-ReaderStreamBuf::ReaderStreamBuf(std::unique_ptr<Reader> && p)
-  : m_p(std::move(p)), m_pos(0), m_size(m_p->Size())
-{
-}
+ReaderStreamBuf::ReaderStreamBuf(std::unique_ptr<Reader> && p) : m_p(std::move(p)), m_pos(0), m_size(m_p->Size()) {}
 
 // Define destructor in .cpp due to using unique_ptr with incomplete type.
 ReaderStreamBuf::~ReaderStreamBuf() = default;
@@ -37,7 +34,6 @@ ReaderStreamBuf::int_type ReaderStreamBuf::underflow()
   }
 }
 
-
 std::streamsize WriterStreamBuf::xsputn(char_type const * s, std::streamsize n)
 {
   m_writer.Write(s, n);
diff --git a/libs/coding/reader_streambuf.hpp b/libs/coding/reader_streambuf.hpp
index 14b1e2b58..084657151 100644
--- a/libs/coding/reader_streambuf.hpp
+++ b/libs/coding/reader_streambuf.hpp
@@ -7,7 +7,6 @@
 class Reader;
 class Writer;
 
-
 class BaseStreamBuf : public std::streambuf
 {
 public:
diff --git a/libs/coding/reader_wrapper.hpp b/libs/coding/reader_wrapper.hpp
index 28a078446..4108f6d06 100644
--- a/libs/coding/reader_wrapper.hpp
+++ b/libs/coding/reader_wrapper.hpp
@@ -2,19 +2,18 @@
 
 #include "coding/reader.hpp"
 
-
 /// Reader wrapper to avoid penalty on copy and polymorphic SubReader creation.
-template <class ReaderT> class SubReaderWrapper
+template <class ReaderT>
+class SubReaderWrapper
 {
   ReaderT * m_p;
   uint64_t m_pos;
   uint64_t m_size;
 
 protected:
-  SubReaderWrapper(ReaderT * p, uint64_t pos, uint64_t size)
-    : m_p(p), m_pos(pos), m_size(size)
+  SubReaderWrapper(ReaderT * p, uint64_t pos, uint64_t size) : m_p(p), m_pos(pos), m_size(size)
   {
-    ASSERT_LESS_OR_EQUAL ( pos + size, m_p->Size(), (pos, size) );
+    ASSERT_LESS_OR_EQUAL(pos + size, m_p->Size(), (pos, size));
   }
 
 public:
@@ -24,14 +23,11 @@ public:
 
   void Read(uint64_t pos, void * p, size_t size) const
   {
-    ASSERT_LESS_OR_EQUAL ( pos + size, m_size, (pos, size) );
+    ASSERT_LESS_OR_EQUAL(pos + size, m_size, (pos, size));
     m_p->Read(pos + m_pos, p, size);
   }
 
-  SubReaderWrapper SubReader(uint64_t pos, uint64_t size) const
-  {
-    return SubReaderWrapper(m_p, pos + m_pos, size);
-  }
+  SubReaderWrapper SubReader(uint64_t pos, uint64_t size) const { return SubReaderWrapper(m_p, pos + m_pos, size); }
 };
 
 /// Non template reader source for regular functions with incapsulated implementation.
diff --git a/libs/coding/reader_writer_ops.hpp b/libs/coding/reader_writer_ops.hpp
index cd508c01d..1beee5f64 100644
--- a/libs/coding/reader_writer_ops.hpp
+++ b/libs/coding/reader_writer_ops.hpp
@@ -5,7 +5,7 @@
 
 namespace rw_ops
 {
-  /// Do reverse bytes.
-  /// Note! src and dest should be for different entities.
-  void Reverse(Reader const & src, Writer & dest);
-}
+/// Do reverse bytes.
+/// Note! src and dest should be for different entities.
+void Reverse(Reader const & src, Writer & dest);
+}  // namespace rw_ops
diff --git a/libs/coding/serdes_binary_header.hpp b/libs/coding/serdes_binary_header.hpp
index 54a4d0a09..59f7a3e82 100644
--- a/libs/coding/serdes_binary_header.hpp
+++ b/libs/coding/serdes_binary_header.hpp
@@ -41,12 +41,9 @@ struct HeaderSerVisitor
 template <typename Source>
 struct HeaderDesVisitor
 {
-  HeaderDesVisitor(Source & source): m_source(source) {}
+  HeaderDesVisitor(Source & source) : m_source(source) {}
 
-  void operator()(uint64_t & v, char const * /* name */ = nullptr)
-  {
-    v = ReadPrimitiveFromSource<uint64_t>(m_source);
-  }
+  void operator()(uint64_t & v, char const * /* name */ = nullptr) { v = ReadPrimitiveFromSource<uint64_t>(m_source); }
 
   template <typename R>
   void operator()(R & r, char const * /* name */ = nullptr)
diff --git a/libs/coding/serdes_json.hpp b/libs/coding/serdes_json.hpp
index f46f4b8fe..d852ca80f 100644
--- a/libs/coding/serdes_json.hpp
+++ b/libs/coding/serdes_json.hpp
@@ -28,20 +28,16 @@ namespace traits
 namespace impl
 {
 template <typename T>
-auto is_iterable_checker(int) -> decltype(
-  std::begin(std::declval<T>()),
-  std::end(std::declval<T>()),
-  ++std::declval<decltype(std::begin(std::declval<T>())) &>(),
-  std::true_type {});
+auto is_iterable_checker(int)
+    -> decltype(std::begin(std::declval<T>()), std::end(std::declval<T>()),
+                ++std::declval<decltype(std::begin(std::declval<T>())) &>(), std::true_type{});
 
 template <typename T>
 std::false_type is_iterable_checker(...);
 
 template <typename T>
-auto is_dynamic_sequence_checker(int) -> decltype(
-  std::declval<T &>().resize(0),
-  std::declval<T &>()[0],
-  std::true_type {});
+auto is_dynamic_sequence_checker(int)
+    -> decltype(std::declval<T &>().resize(0), std::declval<T &>()[0], std::true_type{});
 
 template <typename T>
 std::false_type is_dynamic_sequence_checker(...);
@@ -67,13 +63,13 @@ template <typename T>
 using EnableIfNotEnum = std::enable_if_t<!std::is_enum<T>::value>;
 
 template <typename T>
-using EnableIfVectorOrDeque = std::enable_if_t<traits::is_dynamic_sequence<T>::value &&
-                                               !std::is_same<std::string, T>::value>;
+using EnableIfVectorOrDeque =
+    std::enable_if_t<traits::is_dynamic_sequence<T>::value && !std::is_same<std::string, T>::value>;
 
 template <typename T>
 using EnableIfNotVectorOrDeque = std::enable_if_t<!traits::is_dynamic_sequence<T>::value>;
 
-template<typename Sink>
+template <typename Sink>
 class SerializerJson
 {
 public:
@@ -122,7 +118,8 @@ public:
   template <typename T, EnableIfIterable<T> * = nullptr>
   void operator()(T const & src, char const * name = nullptr)
   {
-    NewScopeWith(base::NewJSONArray(), name, [this, &src] {
+    NewScopeWith(base::NewJSONArray(), name, [this, &src]
+    {
       for (auto const & v : src)
         (*this)(v);
     });
@@ -131,7 +128,8 @@ public:
   template <typename R>
   void operator()(std::unique_ptr<R> const & r, char const * name = nullptr)
   {
-    NewScopeWith(base::NewJSONObject(), name, [this, &r] {
+    NewScopeWith(base::NewJSONObject(), name, [this, &r]
+    {
       CHECK(r, ());
       r->Visit(*this);
     });
@@ -140,7 +138,8 @@ public:
   template <typename R>
   void operator()(std::shared_ptr<R> const & r, char const * name = nullptr)
   {
-    NewScopeWith(base::NewJSONObject(), name, [this, &r] {
+    NewScopeWith(base::NewJSONObject(), name, [this, &r]
+    {
       CHECK(r, ());
       r->Visit(*this);
     });
@@ -159,7 +158,8 @@ public:
 
   void operator()(m2::PointD const & p, char const * name = nullptr)
   {
-    NewScopeWith(base::NewJSONObject(), name, [this, &p] {
+    NewScopeWith(base::NewJSONObject(), name, [this, &p]
+    {
       (*this)(p.x, "x");
       (*this)(p.y, "y");
     });
@@ -167,7 +167,8 @@ public:
 
   void operator()(ms::LatLon const & ll, char const * name = nullptr)
   {
-    NewScopeWith(base::NewJSONObject(), name, [this, &ll] {
+    NewScopeWith(base::NewJSONObject(), name, [this, &ll]
+    {
       (*this)(ll.m_lat, "lat");
       (*this)(ll.m_lon, "lon");
     });
@@ -176,7 +177,8 @@ public:
   template <typename Key, typename Value>
   void operator()(std::pair<Key, Value> const & p, char const * name = nullptr)
   {
-    NewScopeWith(base::NewJSONObject(), name, [this, &p] {
+    NewScopeWith(base::NewJSONObject(), name, [this, &p]
+    {
       (*this)(p.first, "key");
       (*this)(p.second, "value");
     });
@@ -222,8 +224,7 @@ public:
   using Exception = base::Json::Exception;
 
   template <typename Source,
-            typename std::enable_if<!std::is_convertible<Source, std::string>::value,
-                                    Source>::type * = nullptr>
+            typename std::enable_if<!std::is_convertible<Source, std::string>::value, Source>::type * = nullptr>
   explicit DeserializerJson(Source & source)
   {
     auto const size = static_cast<size_t>(source.Size());
@@ -233,15 +234,9 @@ public:
     m_json = m_jsonObject.get();
   }
 
-  explicit DeserializerJson(std::string const & source)
-    : m_jsonObject(source), m_json(m_jsonObject.get())
-  {
-  }
+  explicit DeserializerJson(std::string const & source) : m_jsonObject(source), m_json(m_jsonObject.get()) {}
 
-  explicit DeserializerJson(char const * buffer)
-    : m_jsonObject(buffer), m_json(m_jsonObject.get())
-  {
-  }
+  explicit DeserializerJson(char const * buffer) : m_jsonObject(buffer), m_json(m_jsonObject.get()) {}
 
   explicit DeserializerJson(json_t * json) : m_json(json) {}
 
@@ -313,15 +308,12 @@ public:
     json_t * outerContext = SaveContext(name);
 
     if (!json_is_array(m_json))
-    {
-      MYTHROW(base::Json::Exception,
-              ("The field", name, "must contain a json array.", json_dumps(m_json, 0)));
-    }
+      MYTHROW(base::Json::Exception, ("The field", name, "must contain a json array.", json_dumps(m_json, 0)));
 
     if (N != json_array_size(m_json))
     {
-      MYTHROW(base::Json::Exception, ("The field", name, "must contain a json array of size", N,
-                                      "but size is", json_array_size(m_json)));
+      MYTHROW(base::Json::Exception,
+              ("The field", name, "must contain a json array of size", N, "but size is", json_array_size(m_json)));
     }
 
     for (size_t index = 0; index < N; ++index)
@@ -341,10 +333,7 @@ public:
     json_t * outerContext = SaveContext(name);
 
     if (!json_is_array(m_json))
-    {
-      MYTHROW(base::Json::Exception,
-              ("The field", name, "must contain a json array.", json_dumps(m_json, 0)));
-    }
+      MYTHROW(base::Json::Exception, ("The field", name, "must contain a json array.", json_dumps(m_json, 0)));
 
     size_t const size = json_array_size(m_json);
     for (size_t index = 0; index < size; ++index)
diff --git a/libs/coding/sha1.cpp b/libs/coding/sha1.cpp
index 906f0204d..5759a1a4e 100644
--- a/libs/coding/sha1.cpp
+++ b/libs/coding/sha1.cpp
@@ -29,7 +29,7 @@ SHA1::Hash ExtractHash(boost::uuids::detail::sha1 & sha1)
   std::copy_n(reinterpret_cast<uint8_t const *>(digest), sizeof(digest), std::begin(result));
   return result;
 }
-}
+}  // namespace
 
 // static
 SHA1::Hash SHA1::Calculate(std::string const & filePath)
@@ -74,4 +74,4 @@ SHA1::Hash SHA1::CalculateForString(std::string_view str)
   sha1.process_bytes(str.data(), str.size());
   return ExtractHash(sha1);
 }
-}  // coding
+}  // namespace coding
diff --git a/libs/coding/sha1.hpp b/libs/coding/sha1.hpp
index b5ecb24ef..e3a2f34b3 100644
--- a/libs/coding/sha1.hpp
+++ b/libs/coding/sha1.hpp
@@ -17,4 +17,4 @@ public:
 
   static Hash CalculateForString(std::string_view str);
 };
-}  // coding
+}  // namespace coding
diff --git a/libs/coding/simple_dense_coding.cpp b/libs/coding/simple_dense_coding.cpp
index 499966f29..4d1a384d4 100644
--- a/libs/coding/simple_dense_coding.cpp
+++ b/libs/coding/simple_dense_coding.cpp
@@ -23,7 +23,7 @@ SimpleDenseCoding::SimpleDenseCoding(std::vector<uint8_t> const & data)
 {
   size_t constexpr kAlphabetSize = size_t(std::numeric_limits<uint8_t>::max()) + 1;
 
-  uint64_t frequency[kAlphabetSize] = { 0 };  // Maps symbols to frequences.
+  uint64_t frequency[kAlphabetSize] = {0};  // Maps symbols to frequences.
   for (uint8_t symbol : data)
     ++frequency[symbol];
 
@@ -33,18 +33,12 @@ SimpleDenseCoding::SimpleDenseCoding(std::vector<uint8_t> const & data)
   for (size_t i = 0; i < kAlphabetSize; ++i)
     symbols[i] = i;
 
-  auto frequencyCmp = [&frequency](uint8_t lsym, uint8_t rsym)
-  {
-    return frequency[lsym] > frequency[rsym];
-  };
+  auto frequencyCmp = [&frequency](uint8_t lsym, uint8_t rsym) { return frequency[lsym] > frequency[rsym]; };
   std::sort(symbols, symbols + kAlphabetSize, frequencyCmp);
   for (size_t r = 0; r < kAlphabetSize; ++r)
     rank[symbols[r]] = r;
 
-  auto getRank = [&rank](uint8_t sym)
-  {
-    return rank[sym];
-  };
+  auto getRank = [&rank](uint8_t sym) { return rank[sym]; };
 
   using namespace boost::adaptors;
   succinct::elias_fano_compressed_list(data | transformed(getRank)).swap(m_ranks);
diff --git a/libs/coding/simple_dense_coding.hpp b/libs/coding/simple_dense_coding.hpp
index e23e633a8..48417e4d2 100644
--- a/libs/coding/simple_dense_coding.hpp
+++ b/libs/coding/simple_dense_coding.hpp
@@ -4,16 +4,15 @@
 #include <vector>
 
 #if defined(__clang__)
-  #pragma clang diagnostic push
-  #pragma clang diagnostic ignored "-Wunused-private-field"
-#endif
- 
-#include "3party/succinct/elias_fano_compressed_list.hpp"
- 
-#if defined(__clang__)
-  #pragma clang diagnostic pop
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-private-field"
 #endif
 
+#include "3party/succinct/elias_fano_compressed_list.hpp"
+
+#if defined(__clang__)
+#pragma clang diagnostic pop
+#endif
 
 namespace coding
 {
diff --git a/libs/coding/sparse_vector.hpp b/libs/coding/sparse_vector.hpp
index 15c1109cc..ab33fbfbb 100644
--- a/libs/coding/sparse_vector.hpp
+++ b/libs/coding/sparse_vector.hpp
@@ -6,7 +6,8 @@ namespace coding
 {
 
 /// Simple sparse vector for better memory usage.
-template <class Value> class SparseVector
+template <class Value>
+class SparseVector
 {
   succinct::rs_bit_vector m_bits;
   std::vector<Value> m_values;
@@ -19,30 +20,26 @@ public:
   bool Has(uint64_t i) const { return m_bits[i]; }
   Value const & Get(uint64_t i) const { return m_values[m_bits.rank(i)]; }
 
-  size_t GetMemorySize() const
-  {
-    return m_values.capacity() * sizeof(Value) + m_bits.size() / 8;
-  }
+  size_t GetMemorySize() const { return m_values.capacity() * sizeof(Value) + m_bits.size() / 8; }
 
 private:
   SparseVector(std::vector<Value> && values, succinct::bit_vector_builder & bitsBuilder)
-    : m_bits(&bitsBuilder), m_values(std::move(values))
-  {
-  }
+    : m_bits(&bitsBuilder)
+    , m_values(std::move(values))
+  {}
 
-  template <class T> friend class SparseVectorBuilder;
+  template <class T>
+  friend class SparseVectorBuilder;
 };
 
-template <class Value> class SparseVectorBuilder
+template <class Value>
+class SparseVectorBuilder
 {
   succinct::bit_vector_builder m_bitsBuilder;
   std::vector<Value> m_values;
 
 public:
-  explicit SparseVectorBuilder(size_t reserveSize = 0)
-  {
-    m_bitsBuilder.reserve(reserveSize);
-  }
+  explicit SparseVectorBuilder(size_t reserveSize = 0) { m_bitsBuilder.reserve(reserveSize); }
 
   void PushEmpty() { m_bitsBuilder.push_back(false); }
   void PushValue(Value v)
@@ -61,4 +58,4 @@ public:
   }
 };
 
-} // namespace coding
+}  // namespace coding
diff --git a/libs/coding/streams.hpp b/libs/coding/streams.hpp
index 2d7e6c8ad..59d423e22 100644
--- a/libs/coding/streams.hpp
+++ b/libs/coding/streams.hpp
@@ -3,56 +3,106 @@
 
 namespace stream
 {
-  template <class TReader> class ReaderStream
+template <class TReader>
+class ReaderStream
+{
+  TReader & m_reader;
+
+public:
+  ReaderStream(TReader & reader) : m_reader(reader) {}
+
+  ReaderStream & operator>>(char & t)
   {
-    TReader & m_reader;
-
-  public:
-    ReaderStream(TReader & reader) : m_reader(reader) {}
-
-    ReaderStream & operator >> (char & t) { m_reader.Read(&t, sizeof(t)); return (*this); }
-    ReaderStream & operator >> (uint32_t & t) { m_reader.Read(&t, sizeof(t)); return (*this); }
-    ReaderStream & operator >> (int32_t & t) { m_reader.Read(&t, sizeof(t)); return (*this); }
-    ReaderStream & operator >> (uint64_t & t) { m_reader.Read(&t, sizeof(t)); return (*this); }
-    ReaderStream & operator >> (int64_t & t) { m_reader.Read(&t, sizeof(t)); return (*this); }
-    ReaderStream & operator >> (double & t) { m_reader.Read(&t, sizeof(t)); return (*this); }
-
-    ReaderStream & operator >> (bool & t)
-    {
-      detail::ReadBool(*this, t);
-      return *this;
-    }
-
-    ReaderStream & operator >> (string & t)
-    {
-      detail::ReadString(*this, t);
-      return *this;
-    }
-  };
-
-  template <class TWriter> class WriterStream
+    m_reader.Read(&t, sizeof(t));
+    return (*this);
+  }
+  ReaderStream & operator>>(uint32_t & t)
   {
-    TWriter & m_writer;
+    m_reader.Read(&t, sizeof(t));
+    return (*this);
+  }
+  ReaderStream & operator>>(int32_t & t)
+  {
+    m_reader.Read(&t, sizeof(t));
+    return (*this);
+  }
+  ReaderStream & operator>>(uint64_t & t)
+  {
+    m_reader.Read(&t, sizeof(t));
+    return (*this);
+  }
+  ReaderStream & operator>>(int64_t & t)
+  {
+    m_reader.Read(&t, sizeof(t));
+    return (*this);
+  }
+  ReaderStream & operator>>(double & t)
+  {
+    m_reader.Read(&t, sizeof(t));
+    return (*this);
+  }
 
-  public:
-    WriterStream(TWriter & writer) : m_writer(writer) {}
+  ReaderStream & operator>>(bool & t)
+  {
+    detail::ReadBool(*this, t);
+    return *this;
+  }
 
-    WriterStream & operator << (char t) { m_writer.Write(&t, sizeof(t)); return (*this); }
-    WriterStream & operator << (uint64_t t) { m_writer.Write(&t, sizeof(t)); return (*this); }
-    WriterStream & operator << (uint32_t t) { m_writer.Write(&t, sizeof(t)); return (*this); }
-    WriterStream & operator << (int64_t t) { m_writer.Write(&t, sizeof(t)); return (*this); }
-    WriterStream & operator << (int32_t t) { m_writer.Write(&t, sizeof(t)); return (*this); }
-    WriterStream & operator << (double t) { m_writer.Write(&t, sizeof(t)); return (*this); }
-    WriterStream & operator << (bool t)
-    {
-      detail::WriteBool(*this, t);
-      return (*this);
-    }
+  ReaderStream & operator>>(string & t)
+  {
+    detail::ReadString(*this, t);
+    return *this;
+  }
+};
 
-    WriterStream & operator << (string const & t)
-    {
-      detail::WriteString(*this, m_writer, t);
-      return *this;
-    }
-  };
-}
+template <class TWriter>
+class WriterStream
+{
+  TWriter & m_writer;
+
+public:
+  WriterStream(TWriter & writer) : m_writer(writer) {}
+
+  WriterStream & operator<<(char t)
+  {
+    m_writer.Write(&t, sizeof(t));
+    return (*this);
+  }
+  WriterStream & operator<<(uint64_t t)
+  {
+    m_writer.Write(&t, sizeof(t));
+    return (*this);
+  }
+  WriterStream & operator<<(uint32_t t)
+  {
+    m_writer.Write(&t, sizeof(t));
+    return (*this);
+  }
+  WriterStream & operator<<(int64_t t)
+  {
+    m_writer.Write(&t, sizeof(t));
+    return (*this);
+  }
+  WriterStream & operator<<(int32_t t)
+  {
+    m_writer.Write(&t, sizeof(t));
+    return (*this);
+  }
+  WriterStream & operator<<(double t)
+  {
+    m_writer.Write(&t, sizeof(t));
+    return (*this);
+  }
+  WriterStream & operator<<(bool t)
+  {
+    detail::WriteBool(*this, t);
+    return (*this);
+  }
+
+  WriterStream & operator<<(string const & t)
+  {
+    detail::WriteString(*this, m_writer, t);
+    return *this;
+  }
+};
+}  // namespace stream
diff --git a/libs/coding/streams_common.hpp b/libs/coding/streams_common.hpp
index 86c1ec7ba..15fd9e735 100644
--- a/libs/coding/streams_common.hpp
+++ b/libs/coding/streams_common.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "base/base.hpp"
 #include "base/assert.hpp"
+#include "base/base.hpp"
 
 #include <cstdint>
 #include <string>
diff --git a/libs/coding/streams_sink.hpp b/libs/coding/streams_sink.hpp
index bf5c8699c..dfbf6759a 100644
--- a/libs/coding/streams_sink.hpp
+++ b/libs/coding/streams_sink.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "coding/streams_common.hpp"
 #include "coding/reader.hpp"
+#include "coding/streams_common.hpp"
 #include "coding/write_to_sink.hpp"
 
 #include <cstdint>
@@ -10,73 +10,75 @@
 
 namespace stream
 {
-  template <class TReader> class SinkReaderStream
+template <class TReader>
+class SinkReaderStream
+{
+  TReader & m_reader;
+
+public:
+  SinkReaderStream(TReader & reader) : m_reader(reader) {}
+
+  template <typename T>
+  std::enable_if_t<std::is_integral<T>::value, SinkReaderStream &> operator>>(T & t)
   {
-    TReader & m_reader;
+    t = ReadPrimitiveFromSource<T>(m_reader);
+    return (*this);
+  }
 
-  public:
-    SinkReaderStream(TReader & reader) : m_reader(reader) {}
-
-    template <typename T>
-    std::enable_if_t<std::is_integral<T>::value, SinkReaderStream &> operator>>(T & t)
-    {
-      t = ReadPrimitiveFromSource<T>(m_reader);
-      return (*this);
-    }
-
-    SinkReaderStream & operator >> (bool & t)
-    {
-      detail::ReadBool(*this, t);
-      return *this;
-    }
-
-    SinkReaderStream & operator >> (string & t)
-    {
-      detail::ReadString(*this, t);
-      return *this;
-    }
-
-    SinkReaderStream & operator >> (double & t)
-    {
-      static_assert(sizeof(double) == sizeof(int64_t), "");
-      int64_t * tInt = reinterpret_cast<int64_t *>(&t);
-      operator >> (*tInt);
-      return *this;
-    }
-  };
-
-  template <class TWriter> class SinkWriterStream
+  SinkReaderStream & operator>>(bool & t)
   {
-    TWriter & m_writer;
+    detail::ReadBool(*this, t);
+    return *this;
+  }
 
-  public:
-    SinkWriterStream(TWriter & writer) : m_writer(writer) {}
+  SinkReaderStream & operator>>(string & t)
+  {
+    detail::ReadString(*this, t);
+    return *this;
+  }
 
-    template <typename T>
-    std::enable_if_t<std::is_integral<T>::value, SinkWriterStream &> operator<<(T const & t)
-    {
-      WriteToSink(m_writer, t);
-      return (*this);
-    }
+  SinkReaderStream & operator>>(double & t)
+  {
+    static_assert(sizeof(double) == sizeof(int64_t), "");
+    int64_t * tInt = reinterpret_cast<int64_t *>(&t);
+    operator>>(*tInt);
+    return *this;
+  }
+};
 
-    SinkWriterStream & operator << (bool t)
-    {
-      detail::WriteBool(*this, t);
-      return (*this);
-    }
+template <class TWriter>
+class SinkWriterStream
+{
+  TWriter & m_writer;
 
-    SinkWriterStream & operator<<(std::string const & t)
-    {
-      detail::WriteString(*this, m_writer, t);
-      return *this;
-    }
+public:
+  SinkWriterStream(TWriter & writer) : m_writer(writer) {}
 
-    SinkWriterStream & operator << (double t)
-    {
-      static_assert(sizeof(double) == sizeof(int64_t), "");
-      int64_t const tInt = *reinterpret_cast<int64_t const *>(&t);
-      operator << (tInt);
-      return (*this);
-    }
-  };
-}
+  template <typename T>
+  std::enable_if_t<std::is_integral<T>::value, SinkWriterStream &> operator<<(T const & t)
+  {
+    WriteToSink(m_writer, t);
+    return (*this);
+  }
+
+  SinkWriterStream & operator<<(bool t)
+  {
+    detail::WriteBool(*this, t);
+    return (*this);
+  }
+
+  SinkWriterStream & operator<<(std::string const & t)
+  {
+    detail::WriteString(*this, m_writer, t);
+    return *this;
+  }
+
+  SinkWriterStream & operator<<(double t)
+  {
+    static_assert(sizeof(double) == sizeof(int64_t), "");
+    int64_t const tInt = *reinterpret_cast<int64_t const *>(&t);
+    operator<<(tInt);
+    return (*this);
+  }
+};
+}  // namespace stream
diff --git a/libs/coding/string_utf8_multilang.cpp b/libs/coding/string_utf8_multilang.cpp
index c472f779a..764c9724e 100644
--- a/libs/coding/string_utf8_multilang.cpp
+++ b/libs/coding/string_utf8_multilang.cpp
@@ -10,8 +10,8 @@ namespace
 // several data releases.
 // Note that it's not feasible to increase languages number here due to current encoding (6 bit to
 // store language code).
-std::array<StringUtf8Multilang::Lang, StringUtf8Multilang::kMaxSupportedLanguages> const kLanguages = {{
-     {"default", "Name in local language", {"Any-Latin"}},
+std::array<StringUtf8Multilang::Lang, StringUtf8Multilang::kMaxSupportedLanguages> const kLanguages = {
+    {{"default", "Name in local language", {"Any-Latin"}},
      {"en", "English", {}},
      {"ja", "日本語", {}},
      {"fr", "Français", {}},
@@ -74,13 +74,11 @@ std::array<StringUtf8Multilang::Lang, StringUtf8Multilang::kMaxSupportedLanguage
      {"mn", "Mongolian", {"Mongolian-Latin/BGN"}},
      {"mk", "Македонски", {"Macedonian-Latin/BGN"}},
      {"lv", "Latviešu", {}},
-     {"hi", "हिन्दी", {"Any-Latin"}}
-}};
+     {"hi", "हिन्दी", {"Any-Latin"}}}};
 
-static_assert(
-    kLanguages.size() == StringUtf8Multilang::kMaxSupportedLanguages,
-    "With current encoding we are limited to 64 languages max. And we need kLanguages.size()"
-    " to be exactly 64 for backward compatibility.");
+static_assert(kLanguages.size() == StringUtf8Multilang::kMaxSupportedLanguages,
+              "With current encoding we are limited to 64 languages max. And we need kLanguages.size()"
+              " to be exactly 64 for backward compatibility.");
 
 constexpr bool IsSupportedLangCode(int8_t langCode)
 {
@@ -91,21 +89,20 @@ constexpr bool IsSupportedLangCode(int8_t langCode)
 
 bool StringUtf8Multilang::IsServiceLang(std::string_view lang)
 {
-  return lang == kLanguages[kDefaultCode].m_code
-      || lang == kLanguages[kInternationalCode].m_code
-      || lang == kLanguages[kAltNameCode].m_code
-      || lang == kLanguages[kOldNameCode].m_code;
+  return lang == kLanguages[kDefaultCode].m_code || lang == kLanguages[kInternationalCode].m_code ||
+         lang == kLanguages[kAltNameCode].m_code || lang == kLanguages[kOldNameCode].m_code;
 }
 // static
-static const StringUtf8Multilang::Languages allLanguages = []()
+static StringUtf8Multilang::Languages const allLanguages = []()
 {
   StringUtf8Multilang::Languages langs;
   std::copy_if(kLanguages.cbegin(), kLanguages.cend(), std::back_inserter(langs),
-               [](StringUtf8Multilang::Lang const & lang) { return lang.m_code != StringUtf8Multilang::kReservedLang; });
+               [](StringUtf8Multilang::Lang const & lang)
+  { return lang.m_code != StringUtf8Multilang::kReservedLang; });
   return langs;
 }();
 
-static const StringUtf8Multilang::Languages languagesWithoutService = []()
+static StringUtf8Multilang::Languages const languagesWithoutService = []()
 {
   StringUtf8Multilang::Languages langs;
   std::copy_if(allLanguages.cbegin(), allLanguages.cend(), std::back_inserter(langs),
@@ -113,7 +110,6 @@ static const StringUtf8Multilang::Languages languagesWithoutService = []()
   return langs;
 }();
 
-
 StringUtf8Multilang::Languages const & StringUtf8Multilang::GetSupportedLanguages(bool includeServiceLangs)
 {
   // Asserts for generic class constants.
@@ -202,7 +198,6 @@ size_t StringUtf8Multilang::GetNextIndex(size_t i) const
   size_t const sz = m_s.size();
 
   while (i < sz && (m_s[i] & 0xC0) != 0x80)
-  {
     if ((m_s[i] & 0x80) == 0)
       i += 1;
     else if ((m_s[i] & 0xFE) == 0xFE)
@@ -217,7 +212,6 @@ size_t StringUtf8Multilang::GetNextIndex(size_t i) const
       i += 3;
     else if ((m_s[i] & 0xC0) == 0xC0)
       i += 2;
-  }
 
   return i;
 }
@@ -279,7 +273,7 @@ bool StringUtf8Multilang::GetString(int8_t lang, std::string_view & utf8s) const
     if ((m_s[i] & kLangCodeMask) == lang)
     {
       ++i;
-      utf8s = { m_s.c_str() + i, next - i };
+      utf8s = {m_s.c_str() + i, next - i};
       return true;
     }
 
@@ -295,10 +289,8 @@ bool StringUtf8Multilang::HasString(int8_t lang) const
     return false;
 
   for (size_t i = 0; i < m_s.size(); i = GetNextIndex(i))
-  {
     if ((m_s[i] & kLangCodeMask) == lang)
       return true;
-  }
 
   return false;
 }
diff --git a/libs/coding/string_utf8_multilang.hpp b/libs/coding/string_utf8_multilang.hpp
index 8b98deacc..f11eebec6 100644
--- a/libs/coding/string_utf8_multilang.hpp
+++ b/libs/coding/string_utf8_multilang.hpp
@@ -95,10 +95,7 @@ public:
   static bool IsServiceLang(std::string_view lang);
 
   // These names require separate search/street processing.
-  static bool IsAltOrOldName(int8_t langCode)
-  {
-    return langCode == kAltNameCode || langCode == kOldNameCode;
-  }
+  static bool IsAltOrOldName(int8_t langCode) { return langCode == kAltNameCode || langCode == kOldNameCode; }
 
   /// @returns kUnsupportedLanguageCode if language is not recognized.
   static int8_t GetLangIndex(std::string_view lang);
diff --git a/libs/coding/succinct_mapper.hpp b/libs/coding/succinct_mapper.hpp
index 38524e2a5..13260f02e 100644
--- a/libs/coding/succinct_mapper.hpp
+++ b/libs/coding/succinct_mapper.hpp
@@ -28,9 +28,15 @@ static T * Align8Ptr(T * ptr)
   return reinterpret_cast<T *>(value);
 }
 
-inline uint32_t ToAlign8(uint64_t written) { return (0x8 - (written & 0x7)) & 0x7; }
+inline uint32_t ToAlign8(uint64_t written)
+{
+  return (0x8 - (written & 0x7)) & 0x7;
+}
 
-inline bool IsAlign8(uint64_t offset) { return ToAlign8(offset) == 0; }
+inline bool IsAlign8(uint64_t offset)
+{
+  return ToAlign8(offset) == 0;
+}
 
 template <typename TWriter>
 void WritePadding(TWriter & writer, uint64_t & bytesWritten)
@@ -57,8 +63,7 @@ public:
   explicit MapVisitor(uint8_t const * base) : m_base(base), m_cur(m_base) {}
 
   template <typename T>
-  std::enable_if_t<!std::is_trivial_v<T>, MapVisitor &> operator()(T & val,
-                                                                   char const * /* name */)
+  std::enable_if_t<!std::is_trivial_v<T>, MapVisitor &> operator()(T & val, char const * /* name */)
   {
     val.map(*this);
     return *this;
@@ -79,7 +84,7 @@ public:
   {
     vec.clear();
     (*this)(vec.m_size, "size");
-    vec.m_data = reinterpret_cast<const T *>(m_cur);
+    vec.m_data = reinterpret_cast<T const *>(m_cur);
 
     m_cur = Align8Ptr(m_cur + vec.m_size * sizeof(T));
     return *this;
@@ -100,16 +105,14 @@ public:
   explicit ReverseMapVisitor(uint8_t * base) : m_base(base), m_cur(m_base) {}
 
   template <typename T>
-  std::enable_if_t<!std::is_trivial_v<T>, ReverseMapVisitor &> operator()(T & val,
-                                                                          char const * /* name */)
+  std::enable_if_t<!std::is_trivial_v<T>, ReverseMapVisitor &> operator()(T & val, char const * /* name */)
   {
     val.map(*this);
     return *this;
   }
 
   template <typename T>
-  std::enable_if_t<std::is_trivial_v<T>, ReverseMapVisitor &> operator()(T & val,
-                                                                         char const * /* name */)
+  std::enable_if_t<std::is_trivial_v<T>, ReverseMapVisitor &> operator()(T & val, char const * /* name */)
   {
     T * valPtr = reinterpret_cast<T *>(m_cur);
     *valPtr = ReverseByteOrder(*valPtr);
@@ -120,8 +123,7 @@ public:
   }
 
   template <typename T>
-  ReverseMapVisitor & operator()(succinct::mapper::mappable_vector<T> & vec,
-                                 char const * /* name */)
+  ReverseMapVisitor & operator()(succinct::mapper::mappable_vector<T> & vec, char const * /* name */)
   {
     vec.clear();
     (*this)(vec.m_size, "size");
@@ -151,8 +153,7 @@ public:
   explicit FreezeVisitor(TWriter & writer) : m_writer(writer), m_bytesWritten(0) {}
 
   template <typename T>
-  std::enable_if_t<!std::is_trivial_v<T>, FreezeVisitor &> operator()(T & val,
-                                                                      char const * /* name */)
+  std::enable_if_t<!std::is_trivial_v<T>, FreezeVisitor &> operator()(T & val, char const * /* name */)
   {
     ASSERT(IsAlign8(m_writer.Pos()), ());
     val.map(*this);
@@ -160,8 +161,7 @@ public:
   }
 
   template <typename T>
-  std::enable_if_t<std::is_trivial_v<T>, FreezeVisitor &> operator()(T & val,
-                                                                     char const * /* name */)
+  std::enable_if_t<std::is_trivial_v<T>, FreezeVisitor &> operator()(T & val, char const * /* name */)
   {
     ASSERT(IsAlign8(m_writer.Pos()), ());
     m_writer.Write(&val, sizeof(T));
@@ -199,8 +199,7 @@ public:
   explicit ReverseFreezeVisitor(TWriter & writer) : m_writer(writer), m_bytesWritten(0) {}
 
   template <typename T>
-  std::enable_if_t<!std::is_trivial_v<T>, ReverseFreezeVisitor &> operator()(
-      T & val, char const * /* name */)
+  std::enable_if_t<!std::is_trivial_v<T>, ReverseFreezeVisitor &> operator()(T & val, char const * /* name */)
   {
     ASSERT(IsAlign8(m_writer.Pos()), ());
     val.map(*this);
@@ -208,8 +207,7 @@ public:
   }
 
   template <typename T>
-  std::enable_if_t<std::is_trivial_v<T>, ReverseFreezeVisitor &> operator()(
-      T & val, char const * /* name */)
+  std::enable_if_t<std::is_trivial_v<T>, ReverseFreezeVisitor &> operator()(T & val, char const * /* name */)
   {
     ASSERT(IsAlign8(m_writer.Pos()), ());
     T const reversedVal = ReverseByteOrder(val);
@@ -220,8 +218,7 @@ public:
   }
 
   template <typename T>
-  ReverseFreezeVisitor & operator()(succinct::mapper::mappable_vector<T> & vec,
-                                    char const * /* name */)
+  ReverseFreezeVisitor & operator()(succinct::mapper::mappable_vector<T> & vec, char const * /* name */)
   {
     ASSERT(IsAlign8(m_writer.Pos()), ());
     (*this)(vec.m_size, "size");
diff --git a/libs/coding/text_storage.hpp b/libs/coding/text_storage.hpp
index 861b9cfa6..c7b860b22 100644
--- a/libs/coding/text_storage.hpp
+++ b/libs/coding/text_storage.hpp
@@ -37,7 +37,10 @@ class BlockedTextStorageWriter
 {
 public:
   BlockedTextStorageWriter(Writer & writer, uint64_t blockSize)
-    : m_writer(writer), m_blockSize(blockSize), m_startOffset(writer.Pos()), m_blocks(1)
+    : m_writer(writer)
+    , m_blockSize(blockSize)
+    , m_startOffset(writer.Pos())
+    , m_blocks(1)
   {
     CHECK(m_blockSize != 0, ());
     WriteToSink(m_writer, static_cast<uint64_t>(0));
@@ -110,8 +113,7 @@ private:
   {
     for (auto const & length : lengths)
       WriteVarUint(m_writer, length);
-    BWTCoder::EncodeAndWriteBlock(m_writer, pool.size(),
-                                  reinterpret_cast<uint8_t const *>(pool.c_str()));
+    BWTCoder::EncodeAndWriteBlock(m_writer, pool.size(), reinterpret_cast<uint8_t const *>(pool.c_str()));
   }
 
   Writer & m_writer;
@@ -121,7 +123,7 @@ private:
 
   std::vector<Block> m_blocks;
 
-  std::string m_pool;          // concatenated strings
+  std::string m_pool;               // concatenated strings
   std::vector<uint64_t> m_lengths;  // lengths of strings inside the |m_pool|
 };
 
@@ -142,10 +144,7 @@ public:
   };
 
   size_t GetNumBlockInfos() const { return m_blocks.size(); }
-  size_t GetNumStrings() const
-  {
-    return m_blocks.empty() ? 0 : static_cast<size_t>(m_blocks.back().To());
-  }
+  size_t GetNumStrings() const { return m_blocks.empty() ? 0 : static_cast<size_t>(m_blocks.back().To()); }
 
   BlockInfo const & GetBlockInfo(size_t blockIx) const
   {
@@ -282,7 +281,7 @@ private:
   struct StringInfo
   {
     StringInfo() = default;
-    StringInfo(uint64_t offset, uint64_t length): m_offset(offset), m_length(length) {}
+    StringInfo(uint64_t offset, uint64_t length) : m_offset(offset), m_length(length) {}
 
     uint64_t m_offset = 0;  // offset of the string inside the decompressed block
     uint64_t m_length = 0;  // length of the string
@@ -290,8 +289,8 @@ private:
 
   struct CacheEntry
   {
-    BWTCoder::BufferT m_value;        // concatenation of the strings
-    std::vector<StringInfo> m_subs;   // indices of individual strings
+    BWTCoder::BufferT m_value;       // concatenation of the strings
+    std::vector<StringInfo> m_subs;  // indices of individual strings
   };
 
   BlockedTextStorageIndex m_index;
@@ -303,10 +302,7 @@ template <typename Reader>
 class BlockedTextStorage
 {
 public:
-  explicit BlockedTextStorage(Reader & reader) : m_reader(reader)
-  {
-    m_storage.InitializeIfNeeded(m_reader);
-  }
+  explicit BlockedTextStorage(Reader & reader) : m_reader(reader) { m_storage.InitializeIfNeeded(m_reader); }
 
   size_t GetNumStrings() const { return m_storage.GetNumStrings(); }
   std::string ExtractString(size_t stringIx) { return m_storage.ExtractString(m_reader, stringIx); }
diff --git a/libs/coding/traffic.hpp b/libs/coding/traffic.hpp
index d3581c612..3b6ade184 100644
--- a/libs/coding/traffic.hpp
+++ b/libs/coding/traffic.hpp
@@ -30,9 +30,10 @@ public:
     DataPoint() = default;
 
     DataPoint(uint64_t timestamp, ms::LatLon latLon, uint8_t traffic)
-      : m_timestamp(timestamp), m_latLon(latLon), m_traffic(traffic)
-    {
-    }
+      : m_timestamp(timestamp)
+      , m_latLon(latLon)
+      , m_traffic(traffic)
+    {}
     // Uint64 should be enough for all our use cases.
     // It is expected that |m_timestamp| stores time since epoch in seconds.
     uint64_t m_timestamp = 0;
@@ -42,10 +43,7 @@ public:
     // This field was added in Version 1 (and was the only addition).
     uint8_t m_traffic = 0;
 
-    bool operator==(DataPoint const & p) const
-    {
-      return m_timestamp == p.m_timestamp && m_latLon == p.m_latLon;
-    }
+    bool operator==(DataPoint const & p) const { return m_timestamp == p.m_timestamp && m_latLon == p.m_latLon; }
   };
 
   // Serializes |points| to |writer| by storing delta-encoded points.
@@ -88,10 +86,10 @@ private:
     if (!points.empty())
     {
       uint64_t const firstTimestamp = points[0].m_timestamp;
-      uint32_t const firstLat = DoubleToUint32(points[0].m_latLon.m_lat, ms::LatLon::kMinLat,
-                                               ms::LatLon::kMaxLat, kCoordBits);
-      uint32_t const firstLon = DoubleToUint32(points[0].m_latLon.m_lon, ms::LatLon::kMinLon,
-                                               ms::LatLon::kMaxLon, kCoordBits);
+      uint32_t const firstLat =
+          DoubleToUint32(points[0].m_latLon.m_lat, ms::LatLon::kMinLat, ms::LatLon::kMaxLat, kCoordBits);
+      uint32_t const firstLon =
+          DoubleToUint32(points[0].m_latLon.m_lon, ms::LatLon::kMinLon, ms::LatLon::kMaxLon, kCoordBits);
       WriteVarUint(writer, firstTimestamp);
       WriteVarUint(writer, firstLat);
       WriteVarUint(writer, firstLon);
@@ -102,18 +100,17 @@ private:
       ASSERT_LESS_OR_EQUAL(points[i - 1].m_timestamp, points[i].m_timestamp, ());
 
       uint64_t const deltaTimestamp = points[i].m_timestamp - points[i - 1].m_timestamp;
-      uint32_t deltaLat = DoubleToUint32(points[i].m_latLon.m_lat - points[i - 1].m_latLon.m_lat,
-                                         kMinDeltaLat, kMaxDeltaLat, kCoordBits);
-      uint32_t deltaLon = DoubleToUint32(points[i].m_latLon.m_lon - points[i - 1].m_latLon.m_lon,
-                                         kMinDeltaLon, kMaxDeltaLon, kCoordBits);
+      uint32_t deltaLat = DoubleToUint32(points[i].m_latLon.m_lat - points[i - 1].m_latLon.m_lat, kMinDeltaLat,
+                                         kMaxDeltaLat, kCoordBits);
+      uint32_t deltaLon = DoubleToUint32(points[i].m_latLon.m_lon - points[i - 1].m_latLon.m_lon, kMinDeltaLon,
+                                         kMaxDeltaLon, kCoordBits);
 
       WriteVarUint(writer, deltaTimestamp);
       WriteVarUint(writer, deltaLat);
       WriteVarUint(writer, deltaLon);
     }
 
-    ASSERT_LESS_OR_EQUAL(writer.Pos() - startPos, std::numeric_limits<size_t>::max(),
-                         ("Too much data."));
+    ASSERT_LESS_OR_EQUAL(writer.Pos() - startPos, std::numeric_limits<size_t>::max(), ("Too much data."));
     return static_cast<size_t>(writer.Pos() - startPos);
   }
 
@@ -125,10 +122,10 @@ private:
     if (!points.empty())
     {
       uint64_t const firstTimestamp = points[0].m_timestamp;
-      uint32_t const firstLat = DoubleToUint32(points[0].m_latLon.m_lat, ms::LatLon::kMinLat,
-                                               ms::LatLon::kMaxLat, kCoordBits);
-      uint32_t const firstLon = DoubleToUint32(points[0].m_latLon.m_lon, ms::LatLon::kMinLon,
-                                               ms::LatLon::kMaxLon, kCoordBits);
+      uint32_t const firstLat =
+          DoubleToUint32(points[0].m_latLon.m_lat, ms::LatLon::kMinLat, ms::LatLon::kMaxLat, kCoordBits);
+      uint32_t const firstLon =
+          DoubleToUint32(points[0].m_latLon.m_lon, ms::LatLon::kMinLon, ms::LatLon::kMaxLon, kCoordBits);
       uint32_t const traffic = points[0].m_traffic;
       WriteVarUint(writer, firstTimestamp);
       WriteVarUint(writer, firstLat);
@@ -141,10 +138,10 @@ private:
       ASSERT_LESS_OR_EQUAL(points[i - 1].m_timestamp, points[i].m_timestamp, ());
 
       uint64_t const deltaTimestamp = points[i].m_timestamp - points[i - 1].m_timestamp;
-      uint32_t deltaLat = DoubleToUint32(points[i].m_latLon.m_lat - points[i - 1].m_latLon.m_lat,
-                                         kMinDeltaLat, kMaxDeltaLat, kCoordBits);
-      uint32_t deltaLon = DoubleToUint32(points[i].m_latLon.m_lon - points[i - 1].m_latLon.m_lon,
-                                         kMinDeltaLon, kMaxDeltaLon, kCoordBits);
+      uint32_t deltaLat = DoubleToUint32(points[i].m_latLon.m_lat - points[i - 1].m_latLon.m_lat, kMinDeltaLat,
+                                         kMaxDeltaLat, kCoordBits);
+      uint32_t deltaLon = DoubleToUint32(points[i].m_latLon.m_lon - points[i - 1].m_latLon.m_lon, kMinDeltaLon,
+                                         kMaxDeltaLon, kCoordBits);
 
       uint32_t const traffic = points[i - 1].m_traffic;
       WriteVarUint(writer, deltaTimestamp);
@@ -153,8 +150,7 @@ private:
       WriteVarUint(writer, traffic);
     }
 
-    ASSERT_LESS_OR_EQUAL(writer.Pos() - startPos, std::numeric_limits<size_t>::max(),
-                         ("Too much data."));
+    ASSERT_LESS_OR_EQUAL(writer.Pos() - startPos, std::numeric_limits<size_t>::max(), ("Too much data."));
     return static_cast<size_t>(writer.Pos() - startPos);
   }
 
@@ -172,20 +168,16 @@ private:
       if (first)
       {
         lastTimestamp = ReadVarUint<uint64_t>(src);
-        lastLat = Uint32ToDouble(ReadVarUint<uint32_t>(src), ms::LatLon::kMinLat,
-                                 ms::LatLon::kMaxLat, kCoordBits);
-        lastLon = Uint32ToDouble(ReadVarUint<uint32_t>(src), ms::LatLon::kMinLon,
-                                 ms::LatLon::kMaxLon, kCoordBits);
+        lastLat = Uint32ToDouble(ReadVarUint<uint32_t>(src), ms::LatLon::kMinLat, ms::LatLon::kMaxLat, kCoordBits);
+        lastLon = Uint32ToDouble(ReadVarUint<uint32_t>(src), ms::LatLon::kMinLon, ms::LatLon::kMaxLon, kCoordBits);
         result.emplace_back(lastTimestamp, ms::LatLon(lastLat, lastLon), traffic);
         first = false;
       }
       else
       {
         lastTimestamp += ReadVarUint<uint64_t>(src);
-        lastLat +=
-            Uint32ToDouble(ReadVarUint<uint32_t>(src), kMinDeltaLat, kMaxDeltaLat, kCoordBits);
-        lastLon +=
-            Uint32ToDouble(ReadVarUint<uint32_t>(src), kMinDeltaLon, kMaxDeltaLon, kCoordBits);
+        lastLat += Uint32ToDouble(ReadVarUint<uint32_t>(src), kMinDeltaLat, kMaxDeltaLat, kCoordBits);
+        lastLon += Uint32ToDouble(ReadVarUint<uint32_t>(src), kMinDeltaLon, kMaxDeltaLon, kCoordBits);
         result.emplace_back(lastTimestamp, ms::LatLon(lastLat, lastLon), traffic);
       }
     }
@@ -205,10 +197,8 @@ private:
       if (first)
       {
         lastTimestamp = ReadVarUint<uint64_t>(src);
-        lastLat = Uint32ToDouble(ReadVarUint<uint32_t>(src), ms::LatLon::kMinLat,
-                                 ms::LatLon::kMaxLat, kCoordBits);
-        lastLon = Uint32ToDouble(ReadVarUint<uint32_t>(src), ms::LatLon::kMinLon,
-                                 ms::LatLon::kMaxLon, kCoordBits);
+        lastLat = Uint32ToDouble(ReadVarUint<uint32_t>(src), ms::LatLon::kMinLat, ms::LatLon::kMaxLat, kCoordBits);
+        lastLon = Uint32ToDouble(ReadVarUint<uint32_t>(src), ms::LatLon::kMinLon, ms::LatLon::kMaxLon, kCoordBits);
         traffic = base::asserted_cast<uint8_t>(ReadVarUint<uint32_t>(src));
         result.emplace_back(lastTimestamp, ms::LatLon(lastLat, lastLon), traffic);
         first = false;
@@ -216,10 +206,8 @@ private:
       else
       {
         lastTimestamp += ReadVarUint<uint64_t>(src);
-        lastLat +=
-            Uint32ToDouble(ReadVarUint<uint32_t>(src), kMinDeltaLat, kMaxDeltaLat, kCoordBits);
-        lastLon +=
-            Uint32ToDouble(ReadVarUint<uint32_t>(src), kMinDeltaLon, kMaxDeltaLon, kCoordBits);
+        lastLat += Uint32ToDouble(ReadVarUint<uint32_t>(src), kMinDeltaLat, kMaxDeltaLat, kCoordBits);
+        lastLon += Uint32ToDouble(ReadVarUint<uint32_t>(src), kMinDeltaLon, kMaxDeltaLon, kCoordBits);
         traffic = base::asserted_cast<uint8_t>(ReadVarUint<uint32_t>(src));
         result.emplace_back(lastTimestamp, ms::LatLon(lastLat, lastLon), traffic);
       }
diff --git a/libs/coding/transliteration.cpp b/libs/coding/transliteration.cpp
index 35f9089b7..835331619 100644
--- a/libs/coding/transliteration.cpp
+++ b/libs/coding/transliteration.cpp
@@ -23,9 +23,7 @@ struct Transliteration::TransliteratorInfo
   std::unique_ptr<icu::Transliterator> m_transliterator;
 };
 
-Transliteration::Transliteration()
-  : m_inited(false), m_mode(Mode::Enabled)
-{}
+Transliteration::Transliteration() : m_inited(false), m_mode(Mode::Enabled) {}
 
 Transliteration::~Transliteration()
 {
@@ -64,10 +62,8 @@ void Transliteration::Init(std::string const & icuDataDir)
   for (auto const & lang : StringUtf8Multilang::GetSupportedLanguages())
   {
     for (auto const & t : lang.m_transliteratorsIds)
-    {
       if (m_transliterators.count(t) == 0)
         m_transliterators.emplace(t, std::make_unique<TransliteratorInfo>());
-    }
   }
 
   // We need "Hiragana-Katakana" for strings normalization, not for latin transliteration.
@@ -103,8 +99,7 @@ bool Transliteration::Transliterate(std::string_view transID, icu::UnicodeString
       auto const withDiacritic = std::string{transID}.append(";NFD;[\u02B9-\u02D3\u0301-\u0358\u00B7\u0027]Remove;NFC");
       icu::UnicodeString const uTransID(withDiacritic.c_str());
 
-      it->second->m_transliterator.reset(
-          icu::Transliterator::createInstance(uTransID, UTRANS_FORWARD, status));
+      it->second->m_transliterator.reset(icu::Transliterator::createInstance(uTransID, UTRANS_FORWARD, status));
 
       if (it->second->m_transliterator == nullptr)
         LOG(LWARNING, ("Cannot create transliterator:", transID, "ICU error =", status));
@@ -132,8 +127,7 @@ bool Transliteration::TransliterateForce(std::string const & str, std::string co
   return res;
 }
 
-bool Transliteration::Transliterate(std::string_view sv, int8_t langCode,
-                                    std::string & out) const
+bool Transliteration::Transliterate(std::string_view sv, int8_t langCode, std::string & out) const
 {
   CHECK(m_inited, ());
   if (m_mode != Mode::Enabled)
diff --git a/libs/coding/transliteration.hpp b/libs/coding/transliteration.hpp
index b825f8b6f..929db1669 100644
--- a/libs/coding/transliteration.hpp
+++ b/libs/coding/transliteration.hpp
@@ -35,8 +35,7 @@ public:
   bool Transliterate(std::string_view sv, int8_t langCode, std::string & out) const;
 
   // Transliterates |str| with |transliteratorId|, ignores mode.
-  bool TransliterateForce(std::string const & str, std::string const & transliteratorId,
-                          std::string & out) const;
+  bool TransliterateForce(std::string const & str, std::string const & transliteratorId, std::string & out) const;
 
 private:
   struct TransliteratorInfo;
diff --git a/libs/coding/url.cpp b/libs/coding/url.cpp
index 4613e2f03..5c5a0a2fe 100644
--- a/libs/coding/url.cpp
+++ b/libs/coding/url.cpp
@@ -4,7 +4,6 @@
 #include "base/assert.hpp"
 #include "base/string_utils.hpp"
 
-
 namespace url
 {
 using namespace std;
@@ -12,9 +11,7 @@ using namespace std;
 Url::Url(std::string const & url)
 {
   if (!Parse(url))
-  {
     ASSERT(m_scheme.empty() && m_host.empty() && m_path.empty() && !IsValid(), ());
-  }
 }
 
 Url Url::FromString(std::string const & url)
@@ -122,8 +119,8 @@ string UrlEncode(string const & rawUrl)
   for (size_t i = 0; i < count; ++i)
   {
     char const c = rawUrl[i];
-    if (c < '-' || c == '/' || (c > '9' && c < 'A') || (c > 'Z' && c < '_') ||
-        c == '`' || (c > 'z' && c < '~') || c > '~')
+    if (c < '-' || c == '/' || (c > '9' && c < 'A') || (c > 'Z' && c < '_') || c == '`' || (c > 'z' && c < '~') ||
+        c > '~')
     {
       result += '%';
       result += NumToHex(c);
diff --git a/libs/coding/url.hpp b/libs/coding/url.hpp
index 88294f86e..a514babf7 100644
--- a/libs/coding/url.hpp
+++ b/libs/coding/url.hpp
@@ -25,7 +25,8 @@ public:
   std::string const & GetPath() const { return m_path; }
   std::string GetHostAndPath() const { return m_host + '/' + m_path; }
 
-  template <class FnT> void ForEachParam(FnT && fn) const
+  template <class FnT>
+  void ForEachParam(FnT && fn) const
   {
     for (auto const & p : m_params)
       fn(p.first, p.second);
diff --git a/libs/coding/value_opt_string.hpp b/libs/coding/value_opt_string.hpp
index ce52b0750..40a200ab8 100644
--- a/libs/coding/value_opt_string.hpp
+++ b/libs/coding/value_opt_string.hpp
@@ -2,8 +2,8 @@
 
 #include "coding/varint.hpp"
 
-#include "base/string_utils.hpp"
 #include "base/assert.hpp"
+#include "base/string_utils.hpp"
 
 #include <limits>
 #include <string>
@@ -11,10 +11,7 @@
 class StringNumericOptimal
 {
 public:
-  bool operator==(StringNumericOptimal const & rhs) const
-  {
-    return m_s == rhs.m_s;
-  }
+  bool operator==(StringNumericOptimal const & rhs) const { return m_s == rhs.m_s; }
 
   void Set(std::string const & s)
   {
@@ -40,7 +37,7 @@ public:
       size_t const sz = m_s.size();
       ASSERT_GREATER(sz, 0, ());
 
-      WriteVarUint(sink, static_cast<uint32_t>((sz-1) << 1));
+      WriteVarUint(sink, static_cast<uint32_t>((sz - 1) << 1));
       sink.Write(m_s.c_str(), sz);
     }
   }
@@ -55,8 +52,7 @@ public:
     else
     {
       sz = (sz >> 1) + 1;
-      ASSERT_LESS_OR_EQUAL(sz, std::numeric_limits<size_t>::max(),
-                           ("sz is out of platform's range."));
+      ASSERT_LESS_OR_EQUAL(sz, std::numeric_limits<size_t>::max(), ("sz is out of platform's range."));
       m_s.resize(static_cast<size_t>(sz));
       src.Read(&m_s[0], static_cast<size_t>(sz));
     }
@@ -72,4 +68,7 @@ private:
   std::string m_s;
 };
 
-inline std::string DebugPrint(StringNumericOptimal const & s) { return s.Get(); }
+inline std::string DebugPrint(StringNumericOptimal const & s)
+{
+  return s.Get();
+}
diff --git a/libs/coding/var_record_reader.hpp b/libs/coding/var_record_reader.hpp
index c126d83e2..d1907e58d 100644
--- a/libs/coding/var_record_reader.hpp
+++ b/libs/coding/var_record_reader.hpp
@@ -24,7 +24,8 @@ public:
     return buffer;
   }
 
-  template <class FnT> void ForEachRecord(FnT && fn) const
+  template <class FnT>
+  void ForEachRecord(FnT && fn) const
   {
     ReaderSource source(m_reader);
     while (source.Size() > 0)
diff --git a/libs/coding/var_serial_vector.hpp b/libs/coding/var_serial_vector.hpp
index 170cfc7b2..d6fec1642 100644
--- a/libs/coding/var_serial_vector.hpp
+++ b/libs/coding/var_serial_vector.hpp
@@ -9,22 +9,19 @@
 #include <string>
 #include <utility>
 
-template <class WriterT> class VarSerialVectorWriter
+template <class WriterT>
+class VarSerialVectorWriter
 {
 public:
   // Actually, it is possible to refactor to accept maxPossibleSize (i.e. capacity) instead of size.
-  VarSerialVectorWriter(WriterT & writer, uint32_t size)
-    : m_writer(writer), m_size(size), m_recordNumber(0)
+  VarSerialVectorWriter(WriterT & writer, uint32_t size) : m_writer(writer), m_size(size), m_recordNumber(0)
   {
     WriteToSink(m_writer, size);
     m_sizesOffset = m_writer.Pos();
     m_writer.Seek(GetDataStartPos());
   }
 
-  ~VarSerialVectorWriter()
-  {
-    CHECK_EQUAL(m_recordNumber, m_size, ());
-  }
+  ~VarSerialVectorWriter() { CHECK_EQUAL(m_recordNumber, m_size, ()); }
 
   void FinishRecord()
   {
@@ -43,10 +40,7 @@ public:
   }
 
 private:
-  uint64_t GetDataStartPos() const
-  {
-    return m_sizesOffset + m_size * sizeof(uint32_t);
-  }
+  uint64_t GetDataStartPos() const { return m_sizesOffset + m_size * sizeof(uint32_t); }
 
 private:
   WriterT & m_writer;
@@ -60,17 +54,17 @@ class VarSerialVectorReader
 {
 public:
   template <typename SourceT>
-  explicit VarSerialVectorReader(SourceT & source) :
+  explicit VarSerialVectorReader(SourceT & source)
+    :
 
-  /// Reading this code can blow your mind :)
-  /// Initialization (and declaration below) order of m_offsetsReader and m_dataReader matters!!!
-  /// @see ReaderSource::SubReader - it's not constant.
-  /// @todo Do this stuff in a better way.
-  m_size(ReadPrimitiveFromSource<uint32_t>(source)),
-  m_offsetsReader(source.SubReader(m_size * sizeof(uint32_t))),
-  m_dataReader(source.SubReader())
-  {
-  }
+    /// Reading this code can blow your mind :)
+    /// Initialization (and declaration below) order of m_offsetsReader and m_dataReader matters!!!
+    /// @see ReaderSource::SubReader - it's not constant.
+    /// @todo Do this stuff in a better way.
+    m_size(ReadPrimitiveFromSource<uint32_t>(source))
+    , m_offsetsReader(source.SubReader(m_size * sizeof(uint32_t)))
+    , m_dataReader(source.SubReader())
+  {}
 
   /// Used for unit tests only. Dont't do COW in production code.
   std::string Read(uint32_t i) const
@@ -94,8 +88,7 @@ public:
 private:
   std::pair<uint32_t, uint32_t> GetPosAndSize(uint32_t i) const
   {
-    uint32_t const begin =
-            i == 0 ? 0 : ReadPrimitiveFromPos<uint32_t>(m_offsetsReader, (i - 1) * sizeof(uint32_t));
+    uint32_t const begin = i == 0 ? 0 : ReadPrimitiveFromPos<uint32_t>(m_offsetsReader, (i - 1) * sizeof(uint32_t));
     uint32_t const end = ReadPrimitiveFromPos<uint32_t>(m_offsetsReader, i * sizeof(uint32_t));
 
     ASSERT_LESS_OR_EQUAL(begin, end, ());
diff --git a/libs/coding/varint.hpp b/libs/coding/varint.hpp
index a1df7c9d3..b34430118 100644
--- a/libs/coding/varint.hpp
+++ b/libs/coding/varint.hpp
@@ -38,25 +38,29 @@ uint32_t ReadVarUint(TSource & src, uint32_t const *)
     uint8_t next0;
     src.Read(&next0, 1);
     res |= (static_cast<uint32_t>(next0) & 127);
-    if (!(next0 & 128)) return res;
+    if (!(next0 & 128))
+      return res;
   }
   {
     uint8_t next1;
     src.Read(&next1, 1);
     res |= (static_cast<uint32_t>(next1) & 127) << 7;
-    if (!(next1 & 128)) return res;
+    if (!(next1 & 128))
+      return res;
   }
   {
     uint8_t next2;
     src.Read(&next2, 1);
     res |= (static_cast<uint32_t>(next2) & 127) << 14;
-    if (!(next2 & 128)) return res;
+    if (!(next2 & 128))
+      return res;
   }
   {
     uint8_t next3;
     src.Read(&next3, 1);
     res |= (static_cast<uint32_t>(next3) & 127) << 21;
-    if (!(next3 & 128)) return res;
+    if (!(next3 & 128))
+      return res;
   }
   {
     uint8_t next4;
@@ -76,25 +80,29 @@ uint64_t ReadVarUint(TSource & src, uint64_t const *)
     uint8_t next0;
     src.Read(&next0, 1);
     res0 |= (static_cast<uint32_t>(next0) & 127);
-    if (!(next0 & 128)) return res0;
+    if (!(next0 & 128))
+      return res0;
   }
   {
     uint8_t next1;
     src.Read(&next1, 1);
     res0 |= (static_cast<uint32_t>(next1) & 127) << 7;
-    if (!(next1 & 128)) return res0;
+    if (!(next1 & 128))
+      return res0;
   }
   {
     uint8_t next2;
     src.Read(&next2, 1);
     res0 |= (static_cast<uint32_t>(next2) & 127) << 14;
-    if (!(next2 & 128)) return res0;
+    if (!(next2 & 128))
+      return res0;
   }
   {
     uint8_t next3;
     src.Read(&next3, 1);
     res0 |= (static_cast<uint32_t>(next3) & 127) << 21;
-    if (!(next3 & 128)) return res0;
+    if (!(next3 & 128))
+      return res0;
   }
 
   uint32_t res1 = 0;
@@ -102,25 +110,29 @@ uint64_t ReadVarUint(TSource & src, uint64_t const *)
     uint8_t next4;
     src.Read(&next4, 1);
     res1 |= (static_cast<uint32_t>(next4) & 127);
-    if (!(next4 & 128)) return (static_cast<uint64_t>(res1) << 28) + res0;
+    if (!(next4 & 128))
+      return (static_cast<uint64_t>(res1) << 28) + res0;
   }
   {
     uint8_t next5;
     src.Read(&next5, 1);
     res1 |= (static_cast<uint32_t>(next5) & 127) << 7;
-    if (!(next5 & 128)) return (static_cast<uint64_t>(res1) << 28) + res0;
+    if (!(next5 & 128))
+      return (static_cast<uint64_t>(res1) << 28) + res0;
   }
   {
     uint8_t next6;
     src.Read(&next6, 1);
     res1 |= (static_cast<uint32_t>(next6) & 127) << 14;
-    if (!(next6 & 128)) return (static_cast<uint64_t>(res1) << 28) + res0;
+    if (!(next6 & 128))
+      return (static_cast<uint64_t>(res1) << 28) + res0;
   }
   {
     uint8_t next7;
     src.Read(&next7, 1);
     res1 |= (static_cast<uint32_t>(next7) & 127) << 21;
-    if (!(next7 & 128)) return (static_cast<uint64_t>(res1) << 28) + res0;
+    if (!(next7 & 128))
+      return (static_cast<uint64_t>(res1) << 28) + res0;
   }
 
   uint32_t res2 = 0;
@@ -200,6 +212,7 @@ public:
     return p < m_pEnd;
   }
   void NextVarInt() {}
+
 private:
   void const * m_pEnd;
 };
@@ -210,13 +223,13 @@ public:
   explicit ReadVarInt64ArrayGivenSize(size_t const count) : m_Remaining(count) {}
   bool Continue(void const *) const { return m_Remaining > 0; }
   void NextVarInt() { --m_Remaining; }
+
 private:
   size_t m_Remaining;
 };
 
 template <typename ConverterT, typename F, class WhileConditionT>
-void const * ReadVarInt64Array(void const * pBeg, WhileConditionT whileCondition, F f,
-                               ConverterT converter)
+void const * ReadVarInt64Array(void const * pBeg, WhileConditionT whileCondition, F f, ConverterT converter)
 {
   uint8_t const * const pBegChar = static_cast<uint8_t const *>(pBeg);
   uint64_t res64 = 0;
@@ -252,13 +265,13 @@ void const * ReadVarInt64Array(void const * pBeg, WhileConditionT whileCondition
   return p;
 }
 
-}
+}  // namespace impl
 
 template <typename F>
 void const * ReadVarInt64Array(void const * pBeg, void const * pEnd, F f)
 {
-  return ::impl::ReadVarInt64Array<int64_t (*)(uint64_t)>(
-        pBeg, ::impl::ReadVarInt64ArrayUntilBufferEnd(pEnd), f, &bits::ZigZagDecode);
+  return ::impl::ReadVarInt64Array<int64_t (*)(uint64_t)>(pBeg, ::impl::ReadVarInt64ArrayUntilBufferEnd(pEnd), f,
+                                                          &bits::ZigZagDecode);
 }
 
 template <typename F>
@@ -270,8 +283,8 @@ void const * ReadVarUint64Array(void const * pBeg, void const * pEnd, F f)
 template <typename F>
 void const * ReadVarInt64Array(void const * pBeg, size_t count, F f)
 {
-  return ::impl::ReadVarInt64Array<int64_t (*)(uint64_t)>(
-        pBeg, ::impl::ReadVarInt64ArrayGivenSize(count), f, &bits::ZigZagDecode);
+  return ::impl::ReadVarInt64Array<int64_t (*)(uint64_t)>(pBeg, ::impl::ReadVarInt64ArrayGivenSize(count), f,
+                                                          &bits::ZigZagDecode);
 }
 
 template <typename F>
diff --git a/libs/coding/write_to_sink.hpp b/libs/coding/write_to_sink.hpp
index 85936039e..39face427 100644
--- a/libs/coding/write_to_sink.hpp
+++ b/libs/coding/write_to_sink.hpp
@@ -10,9 +10,7 @@ namespace traits
 namespace impl
 {
 template <typename T>
-auto has_arrow_operator_checker(int) -> decltype(
-  std::declval<T &>().operator->(),
-  std::true_type {});
+auto has_arrow_operator_checker(int) -> decltype(std::declval<T &>().operator->(), std::true_type{});
 
 template <typename T>
 std::false_type has_arrow_operator_checker(...);
@@ -23,8 +21,8 @@ using has_arrow_operator = decltype(impl::has_arrow_operator_checker<T>(0));
 }  // namespace traits
 
 template <class Sink, typename T>
-std::enable_if_t<!traits::has_arrow_operator<Sink>::value &&
-                 (std::is_integral<T>::value || std::is_enum<T>::value), void>
+std::enable_if_t<!traits::has_arrow_operator<Sink>::value && (std::is_integral<T>::value || std::is_enum<T>::value),
+                 void>
 WriteToSink(Sink & sink, T const & v)
 {
   T const t = SwapIfBigEndianMacroBased(v);
@@ -32,8 +30,8 @@ WriteToSink(Sink & sink, T const & v)
 }
 
 template <class Sink, typename T>
-std::enable_if_t<traits::has_arrow_operator<Sink>::value &&
-                 (std::is_integral<T>::value || std::is_enum<T>::value), void>
+std::enable_if_t<traits::has_arrow_operator<Sink>::value && (std::is_integral<T>::value || std::is_enum<T>::value),
+                 void>
 WriteToSink(Sink & sink, T const & v)
 {
   T const t = SwapIfBigEndianMacroBased(v);
@@ -43,7 +41,7 @@ WriteToSink(Sink & sink, T const & v)
 template <class Sink>
 void WriteZeroesToSink(Sink & sink, uint64_t size)
 {
-  uint8_t const zeroes[256] = { 0 };
+  uint8_t const zeroes[256] = {0};
   for (uint64_t i = 0; i < (size >> 8); ++i)
     sink.Write(zeroes, 256);
   sink.Write(zeroes, size & 255);
@@ -55,7 +53,8 @@ class WriterFunctor
 public:
   explicit WriterFunctor(Sink & sink) : m_sink(sink) {}
 
-  template <typename T> void operator() (T const & t) const
+  template <typename T>
+  void operator()(T const & t) const
   {
     m_sink.Write(&t, sizeof(T));
   }
diff --git a/libs/coding/writer.hpp b/libs/coding/writer.hpp
index 46f22829d..8e0854ce8 100644
--- a/libs/coding/writer.hpp
+++ b/libs/coding/writer.hpp
@@ -41,6 +41,7 @@ public:
   }
 
   // Disable deletion via this interface, because some dtors in derived classes are noexcept(false).
+
 protected:
   ~Writer() = default;
 };
@@ -50,7 +51,8 @@ protected:
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wnon-virtual-dtor"
 #endif  // __clang__
-template <typename ContainerT> class MemWriter : public Writer
+template <typename ContainerT>
+class MemWriter : public Writer
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif  // __clang__
@@ -104,8 +106,7 @@ public:
 #ifdef DEBUG
     , m_offset(GetOffset())
 #endif
-  {
-  }
+  {}
 
   ~SubWriter()
   {
@@ -152,26 +153,17 @@ private:
 #endif
 };
 
-template<typename WriterT>
+template <typename WriterT>
 class WriterPtr : public Writer
 {
 public:
   explicit WriterPtr(WriterT * p = 0) : m_p(p) {}
 
-  void Seek(uint64_t pos) override
-  {
-    m_p->Seek(pos);
-  }
+  void Seek(uint64_t pos) override { m_p->Seek(pos); }
 
-  uint64_t Pos() const override
-  {
-    return m_p->Pos();
-  }
+  uint64_t Pos() const override { return m_p->Pos(); }
 
-  void Write(void const * p, size_t size) override
-  {
-    m_p->Write(p, size);
-  }
+  void Write(void const * p, size_t size) override { m_p->Write(p, size); }
 
   WriterT * GetPtr() const { return m_p.get(); }
 
diff --git a/libs/coding/zip_creator.cpp b/libs/coding/zip_creator.cpp
index cee4ac5e6..1f32c342f 100644
--- a/libs/coding/zip_creator.cpp
+++ b/libs/coding/zip_creator.cpp
@@ -21,10 +21,7 @@ class ZipHandle
   zip::File m_zipFileHandle;
 
 public:
-  explicit ZipHandle(std::string const & filePath)
-  {
-    m_zipFileHandle = zip::Create(filePath);
-  }
+  explicit ZipHandle(std::string const & filePath) { m_zipFileHandle = zip::Create(filePath); }
 
   ~ZipHandle()
   {
@@ -62,8 +59,8 @@ void FillZipLocalDateTime(zip::DateTime & res)
   res.tm_year = local->tm_year;
 }
 
-bool CreateZipFromFiles(std::vector<std::string> const & files, std::vector<std::string> const & filesInArchive, std::string const & zipFilePath,
-                        CompressionLevel compression)
+bool CreateZipFromFiles(std::vector<std::string> const & files, std::vector<std::string> const & filesInArchive,
+                        std::string const & zipFilePath, CompressionLevel compression)
 {
   ASSERT_EQUAL(files.size(), filesInArchive.size(), ("List of file names in archive doesn't match list of files"));
   SCOPE_GUARD(outFileGuard, [&zipFilePath]() { base::DeleteFileX(zipFilePath); });
@@ -91,7 +88,8 @@ bool CreateZipFromFiles(std::vector<std::string> const & files, std::vector<std:
       }
       zip::FileInfo fileInfo = {};
       FillZipLocalDateTime(fileInfo.tmz_date);
-      if (zip::Code::Ok != zip::OpenNewFileInZip(zip.Handle(), fileInArchive, fileInfo, "", Z_DEFLATED, compressionLevel))
+      if (zip::Code::Ok !=
+          zip::OpenNewFileInZip(zip.Handle(), fileInArchive, fileInfo, "", Z_DEFLATED, compressionLevel))
         return false;
 
       base::FileData file(filePath, base::FileData::Op::READ);
diff --git a/libs/coding/zip_creator.hpp b/libs/coding/zip_creator.hpp
index 14bc2d7bc..201b1c0b1 100644
--- a/libs/coding/zip_creator.hpp
+++ b/libs/coding/zip_creator.hpp
@@ -15,7 +15,8 @@ enum class CompressionLevel
 
 void FillZipLocalDateTime(zip::DateTime & res);
 
-bool CreateZipFromFiles(std::vector<std::string> const & files, std::vector<std::string> const & filesInArchive, std::string const & zipFilePath,
+bool CreateZipFromFiles(std::vector<std::string> const & files, std::vector<std::string> const & filesInArchive,
+                        std::string const & zipFilePath,
                         CompressionLevel compression = CompressionLevel::DefaultCompression);
 
 bool CreateZipFromFiles(std::vector<std::string> const & files, std::string const & zipFilePath,
diff --git a/libs/coding/zip_reader.cpp b/libs/coding/zip_reader.cpp
index 2de9ac007..2b93aa991 100644
--- a/libs/coding/zip_reader.cpp
+++ b/libs/coding/zip_reader.cpp
@@ -15,9 +15,10 @@ class UnzipFileDelegate : public ZipFileReader::Delegate
 {
 public:
   explicit UnzipFileDelegate(std::string const & path)
-    : m_file(std::make_unique<FileWriter>(path)), m_path(path), m_completed(false)
-  {
-  }
+    : m_file(std::make_unique<FileWriter>(path))
+    , m_path(path)
+    , m_completed(false)
+  {}
 
   ~UnzipFileDelegate() override
   {
@@ -42,7 +43,8 @@ private:
 
 ZipFileReader::ZipFileReader(std::string const & container, std::string const & file, uint32_t logPageSize,
                              uint32_t logPageCount)
-  : FileReader(container, logPageSize, logPageCount), m_uncompressedFileSize(0)
+  : FileReader(container, logPageSize, logPageCount)
+  , m_uncompressedFileSize(0)
 {
   auto zip = unzip::Open(container.c_str());
   if (!zip)
@@ -88,8 +90,8 @@ void ZipFileReader::FilesList(std::string const & zipContainer, FileList & files
       MYTHROW(LocateZipException, ("Can't get file name inside zip", zipContainer));
 
     filesList.push_back(make_pair(fileInfo.m_filename, fileInfo.m_info.uncompressed_size));
-
-  } while (unzip::Code::Ok == unzip::GoToNextFile(zip));
+  }
+  while (unzip::Code::Ok == unzip::GoToNextFile(zip));
 }
 
 bool ZipFileReader::IsZip(std::string const & zipContainer)
@@ -102,8 +104,7 @@ bool ZipFileReader::IsZip(std::string const & zipContainer)
 }
 
 // static
-void ZipFileReader::UnzipFile(std::string const & zipContainer, std::string const & fileInZip,
-                              Delegate & delegate)
+void ZipFileReader::UnzipFile(std::string const & zipContainer, std::string const & fileInZip, Delegate & delegate)
 {
   auto zip = unzip::Open(zipContainer);
   if (!zip)
@@ -129,13 +130,11 @@ void ZipFileReader::UnzipFile(std::string const & zipContainer, std::string cons
   {
     readBytes = unzip::ReadCurrentFile(zip, buf);
     if (readBytes < 0)
-    {
-      MYTHROW(InvalidZipException,
-              ("Error", readBytes, "while unzipping", fileInZip, "from", zipContainer));
-    }
+      MYTHROW(InvalidZipException, ("Error", readBytes, "while unzipping", fileInZip, "from", zipContainer));
 
     delegate.OnBlockUnzipped(static_cast<size_t>(readBytes), buf.data());
-  } while (readBytes != 0);
+  }
+  while (readBytes != 0);
   delegate.OnCompleted();
 }
 
diff --git a/libs/coding/zip_reader.hpp b/libs/coding/zip_reader.hpp
index 162e68754..33b78a9ca 100644
--- a/libs/coding/zip_reader.hpp
+++ b/libs/coding/zip_reader.hpp
@@ -42,10 +42,8 @@ public:
   uint64_t UncompressedSize() const { return m_uncompressedFileSize; }
 
   /// @warning Can also throw Writer::OpenException and Writer::WriteException
-  static void UnzipFile(std::string const & zipContainer, std::string const & fileInZip,
-                        Delegate & delegate);
-  static void UnzipFile(std::string const & zipContainer, std::string const & fileInZip,
-                        std::string const & outPath);
+  static void UnzipFile(std::string const & zipContainer, std::string const & fileInZip, Delegate & delegate);
+  static void UnzipFile(std::string const & zipContainer, std::string const & fileInZip, std::string const & outPath);
 
   static void FilesList(std::string const & zipContainer, FileList & filesList);
 
diff --git a/libs/coding/zlib.cpp b/libs/coding/zlib.cpp
index 0184cb97d..13d92384a 100644
--- a/libs/coding/zlib.cpp
+++ b/libs/coding/zlib.cpp
@@ -55,8 +55,8 @@ bool ZLib::Processor::BufferIsFull() const
 }
 
 // ZLib::Deflate -----------------------------------------------------------------------------------
-ZLib::DeflateProcessor::DeflateProcessor(Deflate::Format format, Deflate::Level level,
-                                         void const * data, size_t size) noexcept
+ZLib::DeflateProcessor::DeflateProcessor(Deflate::Format format, Deflate::Level level, void const * data,
+                                         size_t size) noexcept
   : Processor(data, size)
 {
   auto bits = MAX_WBITS;
@@ -66,9 +66,8 @@ ZLib::DeflateProcessor::DeflateProcessor(Deflate::Format format, Deflate::Level
   case Deflate::Format::GZip: bits = bits | kGzipBits; break;
   }
 
-  int const ret =
-      deflateInit2(&m_stream, ToInt(level) /* level */, Z_DEFLATED /* method */,
-                   bits /* windowBits */, 8 /* memLevel */, Z_DEFAULT_STRATEGY /* strategy */);
+  int const ret = deflateInit2(&m_stream, ToInt(level) /* level */, Z_DEFLATED /* method */, bits /* windowBits */,
+                               8 /* memLevel */, Z_DEFAULT_STRATEGY /* strategy */);
   m_init = (ret == Z_OK);
 }
 
@@ -85,8 +84,7 @@ int ZLib::DeflateProcessor::Process(int flush)
 }
 
 // ZLib::Inflate -----------------------------------------------------------------------------------
-ZLib::InflateProcessor::InflateProcessor(Inflate::Format format, void const * data,
-                                         size_t size) noexcept
+ZLib::InflateProcessor::InflateProcessor(Inflate::Format format, void const * data, size_t size) noexcept
   : Processor(data, size)
 {
   auto bits = MAX_WBITS;
diff --git a/libs/coding/zlib.hpp b/libs/coding/zlib.hpp
index f32b6d760..fec1ed814 100644
--- a/libs/coding/zlib.hpp
+++ b/libs/coding/zlib.hpp
@@ -123,8 +123,7 @@ private:
   class DeflateProcessor final : public Processor
   {
   public:
-    DeflateProcessor(Deflate::Format format, Deflate::Level level, void const * data,
-                     size_t size) noexcept;
+    DeflateProcessor(Deflate::Format format, Deflate::Level level, void const * data, size_t size) noexcept;
     virtual ~DeflateProcessor() noexcept override;
 
     int Process(int flush);
diff --git a/libs/cppjansson/cppjansson.cpp b/libs/cppjansson/cppjansson.cpp
index bf61be32c..98fdfb588 100644
--- a/libs/cppjansson/cppjansson.cpp
+++ b/libs/cppjansson/cppjansson.cpp
@@ -61,7 +61,10 @@ json_t const * GetJSONOptionalField(json_t const * root, char const * field)
   return json_object_get(root, field);
 }
 
-bool JSONIsNull(json_t const * root) { return json_is_null(root); }
+bool JSONIsNull(json_t const * root)
+{
+  return json_is_null(root);
+}
 
 std::string DumpToString(JSONPtr const & json, size_t flags)
 {
@@ -138,5 +141,8 @@ void FromJSON(json_t const * root, UniString & result)
   result = MakeUniString(s);
 }
 
-base::JSONPtr ToJSON(UniString const & s) { return ToJSON(ToUtf8(s)); }
+base::JSONPtr ToJSON(UniString const & s)
+{
+  return ToJSON(ToUtf8(s));
+}
 }  // namespace strings
diff --git a/libs/cppjansson/cppjansson.hpp b/libs/cppjansson/cppjansson.hpp
index c5f286d19..0eb74410e 100644
--- a/libs/cppjansson/cppjansson.hpp
+++ b/libs/cppjansson/cppjansson.hpp
@@ -26,13 +26,34 @@ struct JSONDecRef
 
 using JSONPtr = std::unique_ptr<json_t, JSONDecRef>;
 
-inline JSONPtr NewJSONObject() { return JSONPtr(json_object()); }
-inline JSONPtr NewJSONArray() { return JSONPtr(json_array()); }
-inline JSONPtr NewJSONString(std::string const & s) { return JSONPtr(json_string(s.c_str())); }
-inline JSONPtr NewJSONInt(json_int_t value) { return JSONPtr(json_integer(value)); }
-inline JSONPtr NewJSONReal(double value) { return JSONPtr(json_real(value)); }
-inline JSONPtr NewJSONBool(bool value) { return JSONPtr(value ? json_true() : json_false()); }
-inline JSONPtr NewJSONNull() { return JSONPtr(json_null()); }
+inline JSONPtr NewJSONObject()
+{
+  return JSONPtr(json_object());
+}
+inline JSONPtr NewJSONArray()
+{
+  return JSONPtr(json_array());
+}
+inline JSONPtr NewJSONString(std::string const & s)
+{
+  return JSONPtr(json_string(s.c_str()));
+}
+inline JSONPtr NewJSONInt(json_int_t value)
+{
+  return JSONPtr(json_integer(value));
+}
+inline JSONPtr NewJSONReal(double value)
+{
+  return JSONPtr(json_real(value));
+}
+inline JSONPtr NewJSONBool(bool value)
+{
+  return JSONPtr(value ? json_true() : json_false());
+}
+inline JSONPtr NewJSONNull()
+{
+  return JSONPtr(json_null());
+}
 
 class Json
 {
@@ -85,8 +106,7 @@ inline json_t const * GetJSONObligatoryFieldByPath(json_t const * root, First &&
 }
 
 template <class First, class... Paths>
-inline json_t const * GetJSONObligatoryFieldByPath(json_t const * root, First && path,
-                                                   Paths &&... paths)
+inline json_t const * GetJSONObligatoryFieldByPath(json_t const * root, First && path, Paths &&... paths)
 {
   json_t const * newRoot = GetJSONObligatoryFieldByPath(root, std::forward<First>(path));
   return GetJSONObligatoryFieldByPath(newRoot, std::forward<Paths>(paths)...);
@@ -99,8 +119,7 @@ inline json_t * GetJSONObligatoryFieldByPath(json_t * root, First && path)
 }
 
 template <class First, class... Paths>
-inline json_t * GetJSONObligatoryFieldByPath(json_t * root, First && path,
-                                                   Paths &&... paths)
+inline json_t * GetJSONObligatoryFieldByPath(json_t * root, First && path, Paths &&... paths)
 {
   json_t * newRoot = GetJSONObligatoryFieldByPath(root, std::forward<First>(path));
   return GetJSONObligatoryFieldByPath(newRoot, std::forward<Paths>(paths)...);
@@ -117,8 +136,14 @@ T FromJSON(json_t const * root)
   return result;
 }
 
-inline void FromJSON(json_t * root, json_t *& value) { value = root; }
-inline void FromJSON(json_t const * root, json_t const *& value) { value = root; }
+inline void FromJSON(json_t * root, json_t *& value)
+{
+  value = root;
+}
+inline void FromJSON(json_t const * root, json_t const *& value)
+{
+  value = root;
+}
 
 void FromJSON(json_t const * root, double & result);
 void FromJSON(json_t const * root, bool & result);
@@ -190,9 +215,18 @@ inline base::JSONPtr ToJSON(T value)
 {
   return base::NewJSONInt(value);
 }
-inline base::JSONPtr ToJSON(double value) { return base::NewJSONReal(value); }
-inline base::JSONPtr ToJSON(bool value) { return base::NewJSONBool(value); }
-inline base::JSONPtr ToJSON(char const * s) { return base::NewJSONString(s); }
+inline base::JSONPtr ToJSON(double value)
+{
+  return base::NewJSONReal(value);
+}
+inline base::JSONPtr ToJSON(bool value)
+{
+  return base::NewJSONBool(value);
+}
+inline base::JSONPtr ToJSON(char const * s)
+{
+  return base::NewJSONString(s);
+}
 
 template <typename T>
 void ToJSONArray(json_t & root, T const & value)
@@ -205,7 +239,10 @@ inline void ToJSONArray(json_t & parent, base::JSONPtr & child)
   json_array_append_new(&parent, child.release());
 }
 
-inline void ToJSONArray(json_t & parent, json_t & child) { json_array_append_new(&parent, &child); }
+inline void ToJSONArray(json_t & parent, json_t & child)
+{
+  json_array_append_new(&parent, &child);
+}
 
 template <typename T>
 void ToJSONObject(json_t & root, char const * field, T const & value)
@@ -331,7 +368,10 @@ struct JSONFreeDeleter
 namespace std
 {
 void FromJSON(json_t const * root, std::string & result);
-inline base::JSONPtr ToJSON(std::string const & s) { return base::NewJSONString(s); }
+inline base::JSONPtr ToJSON(std::string const & s)
+{
+  return base::NewJSONString(s);
+}
 }  // namespace std
 
 namespace strings
diff --git a/libs/cppjansson/jansson_handle.hpp b/libs/cppjansson/jansson_handle.hpp
index 229a5b222..42a600aef 100644
--- a/libs/cppjansson/jansson_handle.hpp
+++ b/libs/cppjansson/jansson_handle.hpp
@@ -12,47 +12,26 @@ class JsonHandle
   void DecRef();
 
 public:
-  JsonHandle(json_t * pJson = 0) : m_pJson(pJson)
-  {
-    IncRef();
-  }
+  JsonHandle(json_t * pJson = 0) : m_pJson(pJson) { IncRef(); }
 
-  JsonHandle(JsonHandle const & json) : m_pJson(json.m_pJson)
-  {
-    IncRef();
-  }
+  JsonHandle(JsonHandle const & json) : m_pJson(json.m_pJson) { IncRef(); }
 
-  ~JsonHandle()
-  {
-    DecRef();
-  }
+  ~JsonHandle() { DecRef(); }
 
-  JsonHandle & operator = (JsonHandle const & json)
+  JsonHandle & operator=(JsonHandle const & json)
   {
     JsonHandle tmp(json);
     tmp.swap(*this);
     return *this;
   }
 
-  void swap(JsonHandle & json)
-  {
-    std::swap(m_pJson, json.m_pJson);
-  }
+  void swap(JsonHandle & json) { std::swap(m_pJson, json.m_pJson); }
 
-  json_t * get() const
-  {
-    return m_pJson;
-  }
+  json_t * get() const { return m_pJson; }
 
-  json_t * operator -> () const
-  {
-    return m_pJson;
-  }
+  json_t * operator->() const { return m_pJson; }
 
-  operator bool () const
-  {
-    return m_pJson != 0;
-  }
+  operator bool() const { return m_pJson != 0; }
 
   /// Attach newly created object without incrementing ref count (it's already == 1).
   void AttachNew(json_t * pJson)
diff --git a/libs/descriptions/descriptions_tests/descriptions_tests.cpp b/libs/descriptions/descriptions_tests/descriptions_tests.cpp
index e0fd4aa51..d13e18d31 100644
--- a/libs/descriptions/descriptions_tests/descriptions_tests.cpp
+++ b/libs/descriptions/descriptions_tests/descriptions_tests.cpp
@@ -44,13 +44,10 @@ DescriptionsCollection Convert(std::vector<RawDescription> const & rawDescriptio
 
 UNIT_TEST(Descriptions_SerDes)
 {
-  std::vector<RawDescription> const data =
-    { {100, {{10, "Description of feature 100, language 10."},
-             {11, "Описание фичи 100, язык 11."}}},
+  std::vector<RawDescription> const data = {
+      {100, {{10, "Description of feature 100, language 10."}, {11, "Описание фичи 100, язык 11."}}},
       {101, {{11, "Описание фичи 101, язык 11."}}},
-      {102, {{11, "Описание фичи 102, язык 11."},
-             {10, "Description of feature 102, language 10."}}}
-    };
+      {102, {{11, "Описание фичи 102, язык 11."}, {10, "Description of feature 102, language 10."}}}};
 
   auto testData = [](MemReader & reader)
   {
@@ -98,147 +95,192 @@ UNIT_TEST(Descriptions_SerDes)
 
 UNIT_TEST(Descriptions_Html)
 {
-  std::vector<RawDescription> const data =
-    { {100, {{1, "<div class=\"section\">\n"
-                 "<p lang=\"en\">Map data &copy; <a href=\"https://www.openstreetmap.org/\">"
-                 "OpenStreetMap</a> contributors, <a href=\"http://opendatacommons.org/licenses/odbl/\">ODbL</a>.</p>\n"
-                 "</div>"},
-             {2, "<div class=\"section\">\n"
-                 "<p lang=\"ru\">Картографические данные &copy; участники <a href=\"https://www.openstreetmap.org/\">"
-                 "OpenStreetMap</a>, <a href=\"http://opendatacommons.org/licenses/odbl/\">ODbL</a>.</p>\n"
-                 "</div>"},
-             {3, "<div class=\"section\">\n"
-                 "<p lang=\"vi\">Dữ liệu bản đồ &copy; Cộng tác viên của <a href=\"https://www.openstreetmap.org/\">"
-                 "OpenStreetMap</a>, ODbL.</p>\n"
-                 "</div>"},
-             {4, "<div class=\"section\">\n"
-                 "<p lang=\"tr\">Harita verileri &copy; <a href=\"https://www.openstreetmap.org/\">"
-                 "OpenStreetMap</a> katkıları, ODbL.</p>\n"
-                 "</div>"},
-             {5, "<div class=\"section\">\n"
-                 "<p lang=\"th\">ข้อมูลแผนที่ &copy; ผู้มีส่วนร่วม <a href=\"https://www.openstreetmap.org/\">"
-                 "OpenStreetMap</a> ODbL.</p>\n"
-                 "</div>"},
-             {6, "<div class=\"section\">\n"
-                 "<p lang=\"sv\">Map data &copy; <a href=\"https://www.openstreetmap.org/\">"
-                 "OpenStreetMap</a>-bidragsgivare, ODbL.</p>\n"
-                 "</div>"},
-             {7, "<div class=\"section\">\n"
-                 "<p lang=\"es\">Contribuidores de los datos de mapas &copy;"
-                 " <a href=\"https://www.openstreetmap.org/\">OpenStreetMap</a>, Licencia ODbL.</p>\n"
-                 "</div>"},
-             {8, "<div class=\"section\">\n"
-                 "<p lang=\"pt\">Dados de mapas de contribuintes do &copy;"
-                 " <a href=\"https://www.openstreetmap.org/\">OpenStreetMap</a>, ODbL.</p>\n"
-                 "</div>"},
-             {9, "<div class=\"section\">\n"
-                 "<p lang=\"pl\">Dane map &copy; Współautorzy"
-                 " <a href=\"https://www.openstreetmap.org/\">OpenStreetMap</a>, ODbL.</p>\n"
-                 "</div>"},
-             {10, "<div class=\"section\">\n"
-                  "<p lang=\"nb\">Kartdata &copy; <a href=\"https://www.openstreetmap.org/\">"
-                  "OpenStreetMap</a> bidragsytere, ODbL.</p>\n"
-                  "</div>"},
-             {11, "<div class=\"section\">\n"
-                  "<p lang=\"ko\">지도 데이터 &copy; <a href=\"https://www.openstreetmap.org/\">"
-                  "OpenStreetMap</a> contributors, ODbL.</p>\n"
-                  "</div>"},
-             {12, "<div class=\"section\">\n"
-                  "<p lang=\"ja\">地図データ &copy; <a href=\"https://www.openstreetmap.org/\">"
-                  "OpenStreetMap</a>貢献者、ODbL。</p>\n"
-                  "</div>"},
-             {13, "<div class=\"section\">\n"
-                  "<p lang=\"it\">Dati delle mappe &copy; Contenuti <a href=\"https://www.openstreetmap.org/\">"
-                  "OpenStreetMap</a>, ODbL.</p>\n"
-                  "</div>"},
-             {14, "<div class=\"section\">\n"
-                  "<p lang=\"id\">Data Peta &copy; Kontributor <a href=\"https://www.openstreetmap.org/\">"
-                  "OpenStreetMap</a>, ODbL.</p>\n"
-                  "</div>"},
-             {15, "<div class=\"section\">\n"
-                  "<p lang=\"hu\">Térképadat &copy; az <a href=\"https://www.openstreetmap.org/\">"
-                  "OpenStreetMap</a> közreműködői, ODbL.</p>\n"
-                  "</div>"},
-             {16, "<div class=\"section\">\n"
-                  "<p lang=\"de\">Kartendaten &copy; <a href=\"http://www.opentreetmap.org/\">"
-                  "OpenStreetMap</a>-Mitwirkende ODbL.</p>\n"
-                  "</div>"},
-             {17, "<div class=\"section\">\n"
-                  "<p lang=\"fr\">Données de la carte sous &copy; des contributeurs d'"
-                  "<a href=\"https://www.openstreetmap.org/\">OpenStreetMap</a>, licence ODbL.</p>\n"
-                  "</div>"},
-             {18, "<div class=\"section\">\n"
-                  "<p lang=\"fi\">Karttatiedot &copy; <a href=\"https://www.openstreetmap.org/\">"
-                  "OpenStreetMap</a>-avustajat, ODbL.</p>\n"
-                  "</div>"},
-             {19, "<div class=\"section\">\n"
-                  "<p lang=\"nl\">Kaartgegevens &copy; <a href=\"https://www.openstreetmap.org/\">"
-                  "OpenStreetMap</a> bjdragers, ODbL.</p>\n"
-                  "</div>"},
-             {20, "<div class=\"section\">\n"
-                  "<p lang=\"cs\">Mapová data &copy; <a href=\"https://www.openstreetmap.org/\">"
-                  "OpenStreetMap</a> přispěvatelé, ODbL.</p>\n"
-                  "</div>"},
-             {21, "<div class=\"section\">\n"
-                  "<p lang=\"zh-Hans\">地图数据 &copy; <a href=\"https://www.openstreetmap.org/\">"
-                  "OpenStreetMap</a> 贡献者, ODbL.</p>\n"
-                  "</div>"},
-             {22, "<div class=\"section\">\n"
-                  "<p lang=\"zh-Hant\">地圖數據 &copy; <a href=\"https://www.openstreetmap.org/\">"
-                  "OpenStreetMap</a> 貢獻者, ODbL.</p>\n"
-                  "</div>"},
-             {23, "<div class=\"section\">\n"
-                  "<p lang=\"ar\">المساهمون في بيانات خريطة &copy; <a href=\"https://www.openstreetmap.org/\">"
-                  "OpenStreetMap</a> و ODbL.</p>\n"
-                  "</div>"},
-             {24, "<div class=\"section\">\n"
-                  "<p lang=\"uk\">Картографічні дані &copy; учасники <a href=\"https://www.openstreetmap.org/\">"
-                  "OpenStreetMap</a>, ODbL.</p>"
-                  "</div>"}}},
-      {101, {{1, "<p lang=\"en\"><strong>omaps.app</strong> would not be possible without the generous contributions of "
-                 "the following projects:</p>\n"},
-             {2, "<p lang=\"ru\">Приложение <strong>omaps.app</strong> было бы невозможно без участия следующих"
-                 " проектов:</p>\n"},
-             {3, "<p lang=\"vi\"><strong>omaps.app</strong> sẽ không thành hiện thực nếu không có sự đóng góp hào phóng"
-                 " từ các dự án sau:</p>\n"},
-             {4, "<p lang=\"tr\"><strong>omaps.app</strong>, aşağıdaki projelerin cömert katkıları olmadan mümkün "
-                 "olmazdı:</p>\n"},
-             {5, "<p lang=\"th\"><strong>omaps.app</strong> จะสำเร็จลุล่วงไม่ได้เลยหากปราศจากความเอื้อเฟื้อเพื่อการร่วมมือของโป"
-                 "รเจกต์ดังต่อไปนี้:</p>\n"},
-             {6, "<p lang=\"sv\"><strong>omaps.app</strong> skulle inte vara möjlig utan följande projekts generösa"
-                 " bidrag:</p>\n"},
-             {7, "<p lang=\"es\"><strong>omaps.app</strong> no sería posible sin las generosas aportaciones de los"
-                 " siguientes proyectos:</p>\n"},
-             {8, "<p lang=\"pt\">O <strong>omaps.app</strong> não seria possível sem as contribuições generosas dos "
-                 "seguintes projetos:</p>\n"},
-             {9, "<p lang=\"pl\">Aplikacja <strong>omaps.app</strong> nie powstałaby bez znaczącego wkładu ze strony "
-                 "twórców poniższych projektów:</p>\n"},
-             {10, "<p lang=\"nb\"><strong>omaps.app</strong> ville ikke vært mulig uten de generøse bidragene fra "
-                  "følgende prosjekter:</p>\n"},
-             {11, "<p lang=\"ko\"><strong>omaps.app</strong>는 다음 프로젝트의 아낌없는 기부없이 가능하지 않습니다:</p>\n"},
-             {12, "<p lang=\"ja\"><strong>omaps.app</strong>は次のプロジェクトの手厚い貢献なしには不可能です：</p>\n"},
-             {13, "<p lang=\"it\"><strong>omaps.app</strong> non sarebbe realizzabile senza il generoso contributo "
-                  "dei seguenti progetti:</p>\n"},
-             {14, "<p lang=\"id\"><strong>omaps.app</strong> tidak mungkin tercipta tanpa kontribusi yang tulus dari "
-                  "proyek-proyek berikut ini:</p>\n"},
-             {15, "<p lang=\"hu\">A <strong>omaps.app</strong> nem jöhetett volna létre az alábbi projektek nagylelkű "
-                  "közreműködése nélkül:</p>\n"},
-             {16, "<p lang=\"de\"><strong>omaps.app</strong> wäre ohne die großzügigen Spenden der folgenden Projekte "
-                  "nicht möglich:</p>\n"},
-             {17, "<p lang=\"fr\">L'existence de <strong>omaps.app</strong> serait impossible sans les généreuses "
-                  "contributions des projets suivants :</p>\n"},
-             {18, "<p lang=\"fi\"><strong>omaps.app</strong> ei olisi mahdollinen ilman seuraavien projektien aulista "
-                  "tukea:</p>\n"},
-             {19, "<p lang=\"nl\"><strong>omaps.app</strong> zou niet mogelijk zijn zonder de genereuze bijdragen voor "
-                  "de volgende projecten:</p>\n"},
-             {20, "<p lang=\"cs\"><strong>omaps.app</strong> by nemohlo existovat bez štědrých přispění následujících "
-                  "projektů:</p>\n"},
-             {21, "<p lang=\"zh-Hans\">沒有下面項目的慷慨貢獻，<strong>omaps.app</strong> 不可能出現：</p>\n"},
-             {22, "<p lang=\"zh-Hant\">沒有下面項目的慷慨貢獻，<strong>omaps.app</strong> 不可能出現：</p>\n"},
-             {23, "<p lang=\"ar\">    ما كان لـ <strong>maps.me"
-                  "</strong> أن تأتي للوجود بدون المساهمات العظيمة للمشاريع التالية:</p>"},
-             {24, "<p lang=\"uk\"><strong>omaps.app</strong> був би неможливим без щедрої участі таких проектів:</p>"}}},
-    };
+  std::vector<RawDescription> const data = {
+      {100,
+       {{1,
+         "<div class=\"section\">\n"
+         "<p lang=\"en\">Map data &copy; <a href=\"https://www.openstreetmap.org/\">"
+         "OpenStreetMap</a> contributors, <a href=\"http://opendatacommons.org/licenses/odbl/\">ODbL</a>.</p>\n"
+         "</div>"},
+        {2,
+         "<div class=\"section\">\n"
+         "<p lang=\"ru\">Картографические данные &copy; участники <a href=\"https://www.openstreetmap.org/\">"
+         "OpenStreetMap</a>, <a href=\"http://opendatacommons.org/licenses/odbl/\">ODbL</a>.</p>\n"
+         "</div>"},
+        {3,
+         "<div class=\"section\">\n"
+         "<p lang=\"vi\">Dữ liệu bản đồ &copy; Cộng tác viên của <a href=\"https://www.openstreetmap.org/\">"
+         "OpenStreetMap</a>, ODbL.</p>\n"
+         "</div>"},
+        {4,
+         "<div class=\"section\">\n"
+         "<p lang=\"tr\">Harita verileri &copy; <a href=\"https://www.openstreetmap.org/\">"
+         "OpenStreetMap</a> katkıları, ODbL.</p>\n"
+         "</div>"},
+        {5,
+         "<div class=\"section\">\n"
+         "<p lang=\"th\">ข้อมูลแผนที่ &copy; ผู้มีส่วนร่วม <a href=\"https://www.openstreetmap.org/\">"
+         "OpenStreetMap</a> ODbL.</p>\n"
+         "</div>"},
+        {6,
+         "<div class=\"section\">\n"
+         "<p lang=\"sv\">Map data &copy; <a href=\"https://www.openstreetmap.org/\">"
+         "OpenStreetMap</a>-bidragsgivare, ODbL.</p>\n"
+         "</div>"},
+        {7,
+         "<div class=\"section\">\n"
+         "<p lang=\"es\">Contribuidores de los datos de mapas &copy;"
+         " <a href=\"https://www.openstreetmap.org/\">OpenStreetMap</a>, Licencia ODbL.</p>\n"
+         "</div>"},
+        {8,
+         "<div class=\"section\">\n"
+         "<p lang=\"pt\">Dados de mapas de contribuintes do &copy;"
+         " <a href=\"https://www.openstreetmap.org/\">OpenStreetMap</a>, ODbL.</p>\n"
+         "</div>"},
+        {9,
+         "<div class=\"section\">\n"
+         "<p lang=\"pl\">Dane map &copy; Współautorzy"
+         " <a href=\"https://www.openstreetmap.org/\">OpenStreetMap</a>, ODbL.</p>\n"
+         "</div>"},
+        {10,
+         "<div class=\"section\">\n"
+         "<p lang=\"nb\">Kartdata &copy; <a href=\"https://www.openstreetmap.org/\">"
+         "OpenStreetMap</a> bidragsytere, ODbL.</p>\n"
+         "</div>"},
+        {11,
+         "<div class=\"section\">\n"
+         "<p lang=\"ko\">지도 데이터 &copy; <a href=\"https://www.openstreetmap.org/\">"
+         "OpenStreetMap</a> contributors, ODbL.</p>\n"
+         "</div>"},
+        {12,
+         "<div class=\"section\">\n"
+         "<p lang=\"ja\">地図データ &copy; <a href=\"https://www.openstreetmap.org/\">"
+         "OpenStreetMap</a>貢献者、ODbL。</p>\n"
+         "</div>"},
+        {13,
+         "<div class=\"section\">\n"
+         "<p lang=\"it\">Dati delle mappe &copy; Contenuti <a href=\"https://www.openstreetmap.org/\">"
+         "OpenStreetMap</a>, ODbL.</p>\n"
+         "</div>"},
+        {14,
+         "<div class=\"section\">\n"
+         "<p lang=\"id\">Data Peta &copy; Kontributor <a href=\"https://www.openstreetmap.org/\">"
+         "OpenStreetMap</a>, ODbL.</p>\n"
+         "</div>"},
+        {15,
+         "<div class=\"section\">\n"
+         "<p lang=\"hu\">Térképadat &copy; az <a href=\"https://www.openstreetmap.org/\">"
+         "OpenStreetMap</a> közreműködői, ODbL.</p>\n"
+         "</div>"},
+        {16,
+         "<div class=\"section\">\n"
+         "<p lang=\"de\">Kartendaten &copy; <a href=\"http://www.opentreetmap.org/\">"
+         "OpenStreetMap</a>-Mitwirkende ODbL.</p>\n"
+         "</div>"},
+        {17,
+         "<div class=\"section\">\n"
+         "<p lang=\"fr\">Données de la carte sous &copy; des contributeurs d'"
+         "<a href=\"https://www.openstreetmap.org/\">OpenStreetMap</a>, licence ODbL.</p>\n"
+         "</div>"},
+        {18,
+         "<div class=\"section\">\n"
+         "<p lang=\"fi\">Karttatiedot &copy; <a href=\"https://www.openstreetmap.org/\">"
+         "OpenStreetMap</a>-avustajat, ODbL.</p>\n"
+         "</div>"},
+        {19,
+         "<div class=\"section\">\n"
+         "<p lang=\"nl\">Kaartgegevens &copy; <a href=\"https://www.openstreetmap.org/\">"
+         "OpenStreetMap</a> bjdragers, ODbL.</p>\n"
+         "</div>"},
+        {20,
+         "<div class=\"section\">\n"
+         "<p lang=\"cs\">Mapová data &copy; <a href=\"https://www.openstreetmap.org/\">"
+         "OpenStreetMap</a> přispěvatelé, ODbL.</p>\n"
+         "</div>"},
+        {21,
+         "<div class=\"section\">\n"
+         "<p lang=\"zh-Hans\">地图数据 &copy; <a href=\"https://www.openstreetmap.org/\">"
+         "OpenStreetMap</a> 贡献者, ODbL.</p>\n"
+         "</div>"},
+        {22,
+         "<div class=\"section\">\n"
+         "<p lang=\"zh-Hant\">地圖數據 &copy; <a href=\"https://www.openstreetmap.org/\">"
+         "OpenStreetMap</a> 貢獻者, ODbL.</p>\n"
+         "</div>"},
+        {23,
+         "<div class=\"section\">\n"
+         "<p lang=\"ar\">المساهمون في بيانات خريطة &copy; <a href=\"https://www.openstreetmap.org/\">"
+         "OpenStreetMap</a> و ODbL.</p>\n"
+         "</div>"},
+        {24,
+         "<div class=\"section\">\n"
+         "<p lang=\"uk\">Картографічні дані &copy; учасники <a href=\"https://www.openstreetmap.org/\">"
+         "OpenStreetMap</a>, ODbL.</p>"
+         "</div>"}}},
+      {101,
+       {{1,
+         "<p lang=\"en\"><strong>omaps.app</strong> would not be possible without the generous contributions of "
+         "the following projects:</p>\n"},
+        {2,
+         "<p lang=\"ru\">Приложение <strong>omaps.app</strong> было бы невозможно без участия следующих"
+         " проектов:</p>\n"},
+        {3,
+         "<p lang=\"vi\"><strong>omaps.app</strong> sẽ không thành hiện thực nếu không có sự đóng góp hào phóng"
+         " từ các dự án sau:</p>\n"},
+        {4,
+         "<p lang=\"tr\"><strong>omaps.app</strong>, aşağıdaki projelerin cömert katkıları olmadan mümkün "
+         "olmazdı:</p>\n"},
+        {5,
+         "<p lang=\"th\"><strong>omaps.app</strong> จะสำเร็จลุล่วงไม่ได้เลยหากปราศจากความเอื้อเฟื้อเพื่อการร่วมมือของโป"
+         "รเจกต์ดังต่อไปนี้:</p>\n"},
+        {6,
+         "<p lang=\"sv\"><strong>omaps.app</strong> skulle inte vara möjlig utan följande projekts generösa"
+         " bidrag:</p>\n"},
+        {7,
+         "<p lang=\"es\"><strong>omaps.app</strong> no sería posible sin las generosas aportaciones de los"
+         " siguientes proyectos:</p>\n"},
+        {8,
+         "<p lang=\"pt\">O <strong>omaps.app</strong> não seria possível sem as contribuições generosas dos "
+         "seguintes projetos:</p>\n"},
+        {9,
+         "<p lang=\"pl\">Aplikacja <strong>omaps.app</strong> nie powstałaby bez znaczącego wkładu ze strony "
+         "twórców poniższych projektów:</p>\n"},
+        {10,
+         "<p lang=\"nb\"><strong>omaps.app</strong> ville ikke vært mulig uten de generøse bidragene fra "
+         "følgende prosjekter:</p>\n"},
+        {11, "<p lang=\"ko\"><strong>omaps.app</strong>는 다음 프로젝트의 아낌없는 기부없이 가능하지 않습니다:</p>\n"},
+        {12, "<p lang=\"ja\"><strong>omaps.app</strong>は次のプロジェクトの手厚い貢献なしには不可能です：</p>\n"},
+        {13,
+         "<p lang=\"it\"><strong>omaps.app</strong> non sarebbe realizzabile senza il generoso contributo "
+         "dei seguenti progetti:</p>\n"},
+        {14,
+         "<p lang=\"id\"><strong>omaps.app</strong> tidak mungkin tercipta tanpa kontribusi yang tulus dari "
+         "proyek-proyek berikut ini:</p>\n"},
+        {15,
+         "<p lang=\"hu\">A <strong>omaps.app</strong> nem jöhetett volna létre az alábbi projektek nagylelkű "
+         "közreműködése nélkül:</p>\n"},
+        {16,
+         "<p lang=\"de\"><strong>omaps.app</strong> wäre ohne die großzügigen Spenden der folgenden Projekte "
+         "nicht möglich:</p>\n"},
+        {17,
+         "<p lang=\"fr\">L'existence de <strong>omaps.app</strong> serait impossible sans les généreuses "
+         "contributions des projets suivants :</p>\n"},
+        {18,
+         "<p lang=\"fi\"><strong>omaps.app</strong> ei olisi mahdollinen ilman seuraavien projektien aulista "
+         "tukea:</p>\n"},
+        {19,
+         "<p lang=\"nl\"><strong>omaps.app</strong> zou niet mogelijk zijn zonder de genereuze bijdragen voor "
+         "de volgende projecten:</p>\n"},
+        {20,
+         "<p lang=\"cs\"><strong>omaps.app</strong> by nemohlo existovat bez štědrých přispění následujících "
+         "projektů:</p>\n"},
+        {21, "<p lang=\"zh-Hans\">沒有下面項目的慷慨貢獻，<strong>omaps.app</strong> 不可能出現：</p>\n"},
+        {22, "<p lang=\"zh-Hant\">沒有下面項目的慷慨貢獻，<strong>omaps.app</strong> 不可能出現：</p>\n"},
+        {23,
+         "<p lang=\"ar\">    ما كان لـ <strong>maps.me"
+         "</strong> أن تأتي للوجود بدون المساهمات العظيمة للمشاريع التالية:</p>"},
+        {24, "<p lang=\"uk\"><strong>omaps.app</strong> був би неможливим без щедрої участі таких проектів:</p>"}}},
+  };
 
   {
     std::vector<uint8_t> buffer;
@@ -252,9 +294,7 @@ UNIT_TEST(Descriptions_Html)
     MemReader reader(buffer.data(), buffer.size());
 
     for (auto const & rawDesc : data)
-    {
       for (auto const & translation : rawDesc.m_strings)
         TEST_EQUAL(GetDescription(reader, rawDesc.m_idx, {translation.first}), translation.second, ());
-    }
   }
 }
diff --git a/libs/descriptions/serdes.hpp b/libs/descriptions/serdes.hpp
index baa34b884..665c7a863 100644
--- a/libs/descriptions/serdes.hpp
+++ b/libs/descriptions/serdes.hpp
@@ -13,8 +13,8 @@
 #include <map>
 #include <memory>
 #include <string>
-#include <vector>
 #include <utility>
+#include <vector>
 
 namespace descriptions
 {
@@ -59,10 +59,10 @@ class Serializer
 public:
   /// \param descriptions A non-empty unsorted collection of feature descriptions.
   ///                     FeatureDescription::m_description must contain non-empty translations.
-  explicit Serializer(DescriptionsCollection && descriptions)
-    : m_collection(std::move(descriptions))
+  explicit Serializer(DescriptionsCollection && descriptions) : m_collection(std::move(descriptions))
   {
-    std::sort(m_collection.m_features.begin(), m_collection.m_features.end(), base::LessBy(&FeatureDescription::m_ftIndex));
+    std::sort(m_collection.m_features.begin(), m_collection.m_features.end(),
+              base::LessBy(&FeatureDescription::m_ftIndex));
   }
 
   template <typename Sink>
@@ -197,10 +197,8 @@ public:
     for (LangCode const lang : langPriority)
     {
       for (auto const & meta : langMeta)
-      {
         if (lang == meta.first)
           return m_stringsReader.ExtractString(*stringsSubReader, meta.second);
-      }
     }
 
     return {};
diff --git a/libs/drape/attribute_buffer_mutator.hpp b/libs/drape/attribute_buffer_mutator.hpp
index e9b4c5c04..3ecae6b9e 100644
--- a/libs/drape/attribute_buffer_mutator.hpp
+++ b/libs/drape/attribute_buffer_mutator.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "drape/pointers.hpp"
 #include "drape/binding_info.hpp"
+#include "drape/pointers.hpp"
 
 #include "base/shared_buffer_manager.hpp"
 
@@ -17,8 +17,8 @@ struct MutateRegion
   MutateRegion() : m_offset(0), m_count(0) {}
   MutateRegion(uint32_t offset, uint32_t count) : m_offset(offset), m_count(count) {}
 
-  uint32_t m_offset; // Offset from buffer begin in "Elements" not in bytes.
-  uint32_t m_count;  // Count of "Elements".
+  uint32_t m_offset;  // Offset from buffer begin in "Elements" not in bytes.
+  uint32_t m_count;   // Count of "Elements".
 };
 
 struct MutateNode
diff --git a/libs/drape/attribute_provider.cpp b/libs/drape/attribute_provider.cpp
index 59dccaab1..5252c6c52 100644
--- a/libs/drape/attribute_provider.cpp
+++ b/libs/drape/attribute_provider.cpp
@@ -4,20 +4,19 @@
 #include "base/stl_helpers.hpp"
 
 #ifdef DEBUG
-  #define INIT_CHECK_INFO(x) m_checkInfo = std::vector<bool>((std::vector<bool>::size_type)(x), false);
-  #define CHECK_STREAMS CheckStreams()
-  #define INIT_STREAM(x) InitCheckStream((x))
+#define INIT_CHECK_INFO(x) m_checkInfo = std::vector<bool>((std::vector<bool>::size_type)(x), false);
+#define CHECK_STREAMS      CheckStreams()
+#define INIT_STREAM(x)     InitCheckStream((x))
 #else
-  #include "base/macros.hpp"
-  #define INIT_CHECK_INFO(x) UNUSED_VALUE((x))
-  #define CHECK_STREAMS
-  #define INIT_STREAM(x) UNUSED_VALUE((x))
+#include "base/macros.hpp"
+#define INIT_CHECK_INFO(x) UNUSED_VALUE((x))
+#define CHECK_STREAMS
+#define INIT_STREAM(x) UNUSED_VALUE((x))
 #endif
 
 namespace dp
 {
-AttributeProvider::AttributeProvider(uint8_t streamCount, uint32_t vertexCount)
-  : m_vertexCount(vertexCount)
+AttributeProvider::AttributeProvider(uint8_t streamCount, uint32_t vertexCount) : m_vertexCount(vertexCount)
 {
   m_streams.resize(streamCount);
   INIT_CHECK_INFO(streamCount);
@@ -72,9 +71,7 @@ void AttributeProvider::Advance(uint32_t vertexCount)
   m_vertexCount -= vertexCount;
 }
 
-void AttributeProvider::InitStream(uint8_t streamIndex,
-                                   BindingInfo const & bindingInfo,
-                                   ref_ptr<void> data)
+void AttributeProvider::InitStream(uint8_t streamIndex, BindingInfo const & bindingInfo, ref_ptr<void> data)
 {
   ASSERT_LESS(streamIndex, GetStreamCount(), ());
   AttributeStream s;
diff --git a/libs/drape/attribute_provider.hpp b/libs/drape/attribute_provider.hpp
index 8558458ba..4ee50969c 100644
--- a/libs/drape/attribute_provider.hpp
+++ b/libs/drape/attribute_provider.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "drape/pointers.hpp"
 #include "drape/binding_info.hpp"
+#include "drape/pointers.hpp"
 
 #include <vector>
 
@@ -21,9 +21,7 @@ public:
 
   void Advance(uint32_t vertexCount);
 
-  void InitStream(uint8_t streamIndex,
-                  BindingInfo const & bindingInfo,
-                  ref_ptr<void> data);
+  void InitStream(uint8_t streamIndex, BindingInfo const & bindingInfo, ref_ptr<void> data);
 
   void Reset(uint32_t vertexCount);
   void UpdateStream(uint8_t streamIndex, ref_ptr<void> data);
diff --git a/libs/drape/batcher.cpp b/libs/drape/batcher.cpp
index c34ce6548..d559ca126 100644
--- a/libs/drape/batcher.cpp
+++ b/libs/drape/batcher.cpp
@@ -14,8 +14,7 @@ namespace dp
 class Batcher::CallbacksWrapper : public BatchCallbacks
 {
 public:
-  CallbacksWrapper(RenderState const & state, ref_ptr<OverlayHandle> overlay,
-                   ref_ptr<Batcher> batcher)
+  CallbacksWrapper(RenderState const & state, ref_ptr<OverlayHandle> overlay, ref_ptr<Batcher> batcher)
     : m_state(state)
     , m_overlay(overlay)
     , m_batcher(batcher)
@@ -32,8 +31,7 @@ public:
     m_indicesRange.m_idxStart = m_buffer->GetIndexCount();
   }
 
-  void FlushData(ref_ptr<GraphicsContext> context, BindingInfo const & info,
-                 void const * data, uint32_t count) override
+  void FlushData(ref_ptr<GraphicsContext> context, BindingInfo const & info, void const * data, uint32_t count) override
   {
     if (m_overlay != nullptr && info.IsDynamic())
     {
@@ -63,25 +61,13 @@ public:
       m_buffer->UploadIndices(context, m_indexStorage.GetRawConst(), m_indexStorage.Size());
   }
 
-  uint32_t GetAvailableVertexCount() const override
-  {
-    return m_buffer->GetAvailableVertexCount();
-  }
+  uint32_t GetAvailableVertexCount() const override { return m_buffer->GetAvailableVertexCount(); }
 
-  uint32_t GetAvailableIndexCount() const override
-  {
-    return m_buffer->GetAvailableIndexCount();
-  }
+  uint32_t GetAvailableIndexCount() const override { return m_buffer->GetAvailableIndexCount(); }
 
-  void ChangeBuffer(ref_ptr<GraphicsContext> context) override
-  {
-    m_batcher->ChangeBuffer(context, make_ref(this));
-  }
+  void ChangeBuffer(ref_ptr<GraphicsContext> context) override { m_batcher->ChangeBuffer(context, make_ref(this)); }
 
-  RenderState const & GetState() const
-  {
-    return m_state;
-  }
+  RenderState const & GetState() const { return m_state; }
 
   IndicesRange const & Finish()
   {
@@ -119,13 +105,10 @@ void Batcher::InsertTriangleList(ref_ptr<GraphicsContext> context, RenderState c
   InsertTriangleList(context, state, params, nullptr);
 }
 
-IndicesRange Batcher::InsertTriangleList(ref_ptr<GraphicsContext> context,
-                                         RenderState const & state,
-                                         ref_ptr<AttributeProvider> params,
-                                         drape_ptr<OverlayHandle> && handle)
+IndicesRange Batcher::InsertTriangleList(ref_ptr<GraphicsContext> context, RenderState const & state,
+                                         ref_ptr<AttributeProvider> params, drape_ptr<OverlayHandle> && handle)
 {
-  return InsertPrimitives<TriangleListBatch>(context, state, params, std::move(handle),
-                                             0 /* vertexStride */);
+  return InsertPrimitives<TriangleListBatch>(context, state, params, std::move(handle), 0 /* vertexStride */);
 }
 
 void Batcher::InsertTriangleStrip(ref_ptr<GraphicsContext> context, RenderState const & state,
@@ -134,13 +117,10 @@ void Batcher::InsertTriangleStrip(ref_ptr<GraphicsContext> context, RenderState
   InsertTriangleStrip(context, state, params, nullptr);
 }
 
-IndicesRange Batcher::InsertTriangleStrip(ref_ptr<GraphicsContext> context,
-                                          RenderState const & state,
-                                          ref_ptr<AttributeProvider> params,
-                                          drape_ptr<OverlayHandle> && handle)
+IndicesRange Batcher::InsertTriangleStrip(ref_ptr<GraphicsContext> context, RenderState const & state,
+                                          ref_ptr<AttributeProvider> params, drape_ptr<OverlayHandle> && handle)
 {
-  return InsertPrimitives<TriangleStripBatch>(context, state, params, std::move(handle),
-                                              0 /* vertexStride */);
+  return InsertPrimitives<TriangleStripBatch>(context, state, params, std::move(handle), 0 /* vertexStride */);
 }
 
 void Batcher::InsertTriangleFan(ref_ptr<GraphicsContext> context, RenderState const & state,
@@ -150,11 +130,9 @@ void Batcher::InsertTriangleFan(ref_ptr<GraphicsContext> context, RenderState co
 }
 
 IndicesRange Batcher::InsertTriangleFan(ref_ptr<GraphicsContext> context, RenderState const & state,
-                                        ref_ptr<AttributeProvider> params,
-                                        drape_ptr<OverlayHandle> && handle)
+                                        ref_ptr<AttributeProvider> params, drape_ptr<OverlayHandle> && handle)
 {
-  return InsertPrimitives<TriangleFanBatch>(context, state, params, std::move(handle),
-                                            0 /* vertexStride */);
+  return InsertPrimitives<TriangleFanBatch>(context, state, params, std::move(handle), 0 /* vertexStride */);
 }
 
 void Batcher::InsertListOfStrip(ref_ptr<GraphicsContext> context, RenderState const & state,
@@ -164,11 +142,10 @@ void Batcher::InsertListOfStrip(ref_ptr<GraphicsContext> context, RenderState co
 }
 
 IndicesRange Batcher::InsertListOfStrip(ref_ptr<GraphicsContext> context, RenderState const & state,
-                                        ref_ptr<AttributeProvider> params,
-                                        drape_ptr<OverlayHandle> && handle, uint8_t vertexStride)
+                                        ref_ptr<AttributeProvider> params, drape_ptr<OverlayHandle> && handle,
+                                        uint8_t vertexStride)
 {
-  return InsertPrimitives<TriangleListOfStripBatch>(context, state, params, std::move(handle),
-                                                    vertexStride);
+  return InsertPrimitives<TriangleListOfStripBatch>(context, state, params, std::move(handle), vertexStride);
 }
 
 void Batcher::InsertLineStrip(ref_ptr<GraphicsContext> context, RenderState const & state,
@@ -178,11 +155,9 @@ void Batcher::InsertLineStrip(ref_ptr<GraphicsContext> context, RenderState cons
 }
 
 IndicesRange Batcher::InsertLineStrip(ref_ptr<GraphicsContext> context, RenderState const & state,
-                                      ref_ptr<AttributeProvider> params,
-                                      drape_ptr<OverlayHandle> && handle)
+                                      ref_ptr<AttributeProvider> params, drape_ptr<OverlayHandle> && handle)
 {
-  return InsertPrimitives<LineStripBatch>(context, state, params, std::move(handle),
-                                          0 /* vertexStride */);
+  return InsertPrimitives<LineStripBatch>(context, state, params, std::move(handle), 0 /* vertexStride */);
 }
 
 void Batcher::InsertLineRaw(ref_ptr<GraphicsContext> context, RenderState const & state,
@@ -195,8 +170,7 @@ IndicesRange Batcher::InsertLineRaw(ref_ptr<GraphicsContext> context, RenderStat
                                     ref_ptr<AttributeProvider> params, std::vector<int> const & indices,
                                     drape_ptr<OverlayHandle> && handle)
 {
-  return InsertPrimitives<LineRawBatch>(context, state, params, std::move(handle),
-                                        0 /* vertexStride */, indices);
+  return InsertPrimitives<LineRawBatch>(context, state, params, std::move(handle), 0 /* vertexStride */, indices);
 }
 
 void Batcher::StartSession(TFlushFn && flusher)
@@ -244,9 +218,8 @@ ref_ptr<RenderBucket> Batcher::GetBucket(RenderState const & state)
   auto res = m_buckets.insert({state, nullptr});
   if (res.second)
   {
-    drape_ptr<VertexArrayBuffer> vao = make_unique_dp<VertexArrayBuffer>(m_indexBufferSize,
-                                                                         m_vertexBufferSize,
-                                                                         m_batcherHash);
+    drape_ptr<VertexArrayBuffer> vao =
+        make_unique_dp<VertexArrayBuffer>(m_indexBufferSize, m_vertexBufferSize, m_batcherHash);
     drape_ptr<RenderBucket> buffer = make_unique_dp<RenderBucket>(std::move(vao));
     buffer->SetFeatureMinZoom(m_featureMinZoom);
     res.first->second = std::move(buffer);
@@ -281,8 +254,7 @@ void Batcher::Flush(ref_ptr<GraphicsContext> context)
 
 template <typename TBatcher, typename... TArgs>
 IndicesRange Batcher::InsertPrimitives(ref_ptr<GraphicsContext> context, RenderState const & state,
-                                       ref_ptr<AttributeProvider> params,
-                                       drape_ptr<OverlayHandle> && transferHandle,
+                                       ref_ptr<AttributeProvider> params, drape_ptr<OverlayHandle> && transferHandle,
                                        uint8_t vertexStride, TArgs... batcherArgs)
 {
   ref_ptr<VertexArrayBuffer> vao = GetBucket(state)->GetBuffer();
@@ -294,7 +266,7 @@ IndicesRange Batcher::InsertPrimitives(ref_ptr<GraphicsContext> context, RenderS
     Batcher::CallbacksWrapper wrapper(state, make_ref(handle), make_ref(this));
     wrapper.SetVAO(vao);
 
-    TBatcher batch(wrapper, batcherArgs ...);
+    TBatcher batch(wrapper, batcherArgs...);
     batch.SetCanDivideStreams(handle == nullptr);
     batch.SetVertexStride(vertexStride);
     batch.BatchData(context, params);
@@ -313,8 +285,7 @@ Batcher * BatcherFactory::GetNew() const
   return new Batcher(m_indexBufferSize, m_vertexBufferSize);
 }
 
-SessionGuard::SessionGuard(ref_ptr<GraphicsContext> context, Batcher & batcher,
-                           Batcher::TFlushFn && flusher)
+SessionGuard::SessionGuard(ref_ptr<GraphicsContext> context, Batcher & batcher, Batcher::TFlushFn && flusher)
   : m_context(context)
   , m_batcher(batcher)
 {
diff --git a/libs/drape/batcher.hpp b/libs/drape/batcher.hpp
index 7a0c3cc5e..2315ad257 100644
--- a/libs/drape/batcher.hpp
+++ b/libs/drape/batcher.hpp
@@ -33,40 +33,35 @@ public:
   void InsertTriangleList(ref_ptr<GraphicsContext> context, RenderState const & state,
                           ref_ptr<AttributeProvider> params);
   IndicesRange InsertTriangleList(ref_ptr<GraphicsContext> context, RenderState const & state,
-                                  ref_ptr<AttributeProvider> params,
-                                  drape_ptr<OverlayHandle> && handle);
+                                  ref_ptr<AttributeProvider> params, drape_ptr<OverlayHandle> && handle);
 
   void InsertTriangleStrip(ref_ptr<GraphicsContext> context, RenderState const & state,
                            ref_ptr<AttributeProvider> params);
   IndicesRange InsertTriangleStrip(ref_ptr<GraphicsContext> context, RenderState const & state,
-                                   ref_ptr<AttributeProvider> params,
-                                   drape_ptr<OverlayHandle> && handle);
+                                   ref_ptr<AttributeProvider> params, drape_ptr<OverlayHandle> && handle);
 
   void InsertTriangleFan(ref_ptr<GraphicsContext> context, RenderState const & state,
                          ref_ptr<AttributeProvider> params);
   IndicesRange InsertTriangleFan(ref_ptr<GraphicsContext> context, RenderState const & state,
-                                 ref_ptr<AttributeProvider> params,
-                                 drape_ptr<OverlayHandle> && handle);
+                                 ref_ptr<AttributeProvider> params, drape_ptr<OverlayHandle> && handle);
 
-  void InsertListOfStrip(ref_ptr<GraphicsContext> context, RenderState const & state,
-                         ref_ptr<AttributeProvider> params, uint8_t vertexStride);
+  void InsertListOfStrip(ref_ptr<GraphicsContext> context, RenderState const & state, ref_ptr<AttributeProvider> params,
+                         uint8_t vertexStride);
   IndicesRange InsertListOfStrip(ref_ptr<GraphicsContext> context, RenderState const & state,
-                                 ref_ptr<AttributeProvider> params,
-                                 drape_ptr<OverlayHandle> && handle, uint8_t vertexStride);
+                                 ref_ptr<AttributeProvider> params, drape_ptr<OverlayHandle> && handle,
+                                 uint8_t vertexStride);
 
-  void InsertLineStrip(ref_ptr<GraphicsContext> context, RenderState const & state,
-                       ref_ptr<AttributeProvider> params);
+  void InsertLineStrip(ref_ptr<GraphicsContext> context, RenderState const & state, ref_ptr<AttributeProvider> params);
   IndicesRange InsertLineStrip(ref_ptr<GraphicsContext> context, RenderState const & state,
-                               ref_ptr<AttributeProvider> params,
-                               drape_ptr<OverlayHandle> && handle);
+                               ref_ptr<AttributeProvider> params, drape_ptr<OverlayHandle> && handle);
 
-  void InsertLineRaw(ref_ptr<GraphicsContext> context, RenderState const & state,
-                     ref_ptr<AttributeProvider> params, std::vector<int> const & indices);
+  void InsertLineRaw(ref_ptr<GraphicsContext> context, RenderState const & state, ref_ptr<AttributeProvider> params,
+                     std::vector<int> const & indices);
   IndicesRange InsertLineRaw(ref_ptr<GraphicsContext> context, RenderState const & state,
                              ref_ptr<AttributeProvider> params, std::vector<int> const & indices,
                              drape_ptr<OverlayHandle> && handle);
 
-  using TFlushFn = std::function<void (RenderState const &, drape_ptr<RenderBucket> &&)>;
+  using TFlushFn = std::function<void(RenderState const &, drape_ptr<RenderBucket> &&)>;
   void StartSession(TFlushFn && flusher);
   void EndSession(ref_ptr<GraphicsContext> context);
   void ResetSession();
@@ -78,9 +73,8 @@ public:
 private:
   template <typename TBatcher, typename... TArgs>
   IndicesRange InsertPrimitives(ref_ptr<GraphicsContext> context, RenderState const & state,
-                                ref_ptr<AttributeProvider> params,
-                                drape_ptr<OverlayHandle> && transferHandle, uint8_t vertexStride,
-                                TArgs... batcherArgs);
+                                ref_ptr<AttributeProvider> params, drape_ptr<OverlayHandle> && transferHandle,
+                                uint8_t vertexStride, TArgs... batcherArgs);
 
   class CallbacksWrapper;
   void ChangeBuffer(ref_ptr<GraphicsContext> context, ref_ptr<CallbacksWrapper> wrapper);
@@ -120,8 +114,7 @@ private:
 class SessionGuard
 {
 public:
-  SessionGuard(ref_ptr<GraphicsContext> context, Batcher & batcher,
-               Batcher::TFlushFn && flusher);
+  SessionGuard(ref_ptr<GraphicsContext> context, Batcher & batcher, Batcher::TFlushFn && flusher);
   ~SessionGuard();
 
 private:
diff --git a/libs/drape/batcher_helpers.cpp b/libs/drape/batcher_helpers.cpp
index 50799dc26..e7ba18c76 100644
--- a/libs/drape/batcher_helpers.cpp
+++ b/libs/drape/batcher_helpers.cpp
@@ -27,13 +27,13 @@ bool IsEnoughMemory(uint32_t avVertex, uint32_t existVertex, uint32_t avIndex, u
   return avVertex >= existVertex && avIndex >= existIndex;
 }
 
-template<typename TGenerator>
+template <typename TGenerator>
 void GenerateIndices(void * indexStorage, uint32_t count, uint32_t startIndex)
 {
   GenerateIndices<TGenerator>(indexStorage, count, TGenerator(startIndex));
 }
 
-template<typename TGenerator>
+template <typename TGenerator>
 void GenerateIndices(void * indexStorage, uint32_t count, TGenerator const & generator)
 {
   if (dp::IndexStorage::IsSupported32bit())
@@ -51,10 +51,7 @@ void GenerateIndices(void * indexStorage, uint32_t count, TGenerator const & gen
 class IndexGenerator
 {
 public:
-  explicit IndexGenerator(uint32_t startIndex)
-    : m_startIndex(startIndex)
-    , m_counter(0)
-    , m_minStripCounter(0) {}
+  explicit IndexGenerator(uint32_t startIndex) : m_startIndex(startIndex), m_counter(0), m_minStripCounter(0) {}
 
 protected:
   uint32_t GetCounter() { return m_counter++; }
@@ -73,9 +70,9 @@ protected:
     m_minStripCounter = static_cast<uint8_t>(CyclicClamp(m_minStripCounter + 1, 0, 5));
     switch (tmp)
     {
-      case 4: return 1;
-      case 5: return -1;
-      default: return 0;
+    case 4: return 1;
+    case 5: return -1;
+    default: return 0;
     }
   }
 
@@ -87,18 +84,14 @@ private:
 class ListIndexGenerator : public IndexGenerator
 {
 public:
-  explicit ListIndexGenerator(uint32_t startIndex)
-    : IndexGenerator(startIndex)
-  {}
+  explicit ListIndexGenerator(uint32_t startIndex) : IndexGenerator(startIndex) {}
   uint32_t operator()() { return m_startIndex + GetCounter(); }
 };
 
 class StripIndexGenerator : public IndexGenerator
 {
 public:
-  explicit StripIndexGenerator(uint32_t startIndex)
-    : IndexGenerator(startIndex)
-  {}
+  explicit StripIndexGenerator(uint32_t startIndex) : IndexGenerator(startIndex) {}
 
   uint32_t operator()()
   {
@@ -110,9 +103,7 @@ public:
 class LineStripIndexGenerator : public IndexGenerator
 {
 public:
-  explicit LineStripIndexGenerator(uint32_t startIndex)
-    : IndexGenerator(startIndex)
-  {}
+  explicit LineStripIndexGenerator(uint32_t startIndex) : IndexGenerator(startIndex) {}
 
   uint32_t operator()()
   {
@@ -150,9 +141,7 @@ private:
 class FanIndexGenerator : public IndexGenerator
 {
 public:
-  explicit FanIndexGenerator(uint32_t startIndex)
-    : IndexGenerator(startIndex)
-  {}
+  explicit FanIndexGenerator(uint32_t startIndex) : IndexGenerator(startIndex) {}
 
   uint32_t operator()()
   {
@@ -193,8 +182,7 @@ private:
 };
 }  // namespace
 
-UniversalBatch::UniversalBatch(BatchCallbacks & callbacks, uint8_t minVerticesCount,
-                               uint8_t minIndicesCount)
+UniversalBatch::UniversalBatch(BatchCallbacks & callbacks, uint8_t minVerticesCount, uint8_t minIndicesCount)
   : m_callbacks(callbacks)
   , m_canDivideStreams(true)
   , m_minVerticesCount(minVerticesCount)
@@ -223,8 +211,8 @@ void UniversalBatch::FlushData(ref_ptr<GraphicsContext> context, ref_ptr<Attribu
     FlushData(context, streams->GetBindingInfo(i), streams->GetRawPointer(i), vertexCount);
 }
 
-void UniversalBatch::FlushData(ref_ptr<GraphicsContext> context, BindingInfo const & info,
-                               void const * data, uint32_t elementCount) const
+void UniversalBatch::FlushData(ref_ptr<GraphicsContext> context, BindingInfo const & info, void const * data,
+                               uint32_t elementCount) const
 {
   m_callbacks.FlushData(context, info, data, elementCount);
 }
@@ -259,20 +247,16 @@ uint8_t UniversalBatch::GetVertexStride() const
   return m_vertexStride;
 }
 
-bool UniversalBatch::IsBufferFilled(uint32_t availableVerticesCount,
-                                    uint32_t availableIndicesCount) const
+bool UniversalBatch::IsBufferFilled(uint32_t availableVerticesCount, uint32_t availableIndicesCount) const
 {
-  return availableVerticesCount < m_minVerticesCount ||
-         availableIndicesCount < m_minIndicesCount;
+  return availableVerticesCount < m_minVerticesCount || availableIndicesCount < m_minIndicesCount;
 }
 
-
 TriangleListBatch::TriangleListBatch(BatchCallbacks & callbacks)
   : TBase(callbacks, 3 /* minVerticesCount */, 3 /* minIndicesCount */)
 {}
 
-void TriangleListBatch::BatchData(ref_ptr<GraphicsContext> context,
-                                  ref_ptr<AttributeProvider> streams)
+void TriangleListBatch::BatchData(ref_ptr<GraphicsContext> context, ref_ptr<AttributeProvider> streams)
 {
   while (streams->IsDataExists())
   {
@@ -280,7 +264,7 @@ void TriangleListBatch::BatchData(ref_ptr<GraphicsContext> context,
       ChangeBuffer(context);
 
     uint32_t avVertex = GetAvailableVertexCount();
-    uint32_t avIndex  = GetAvailableIndexCount();
+    uint32_t avIndex = GetAvailableIndexCount();
     uint32_t vertexCount = streams->GetVertexCount();
 
     if (CanDivideStreams())
@@ -294,7 +278,7 @@ void TriangleListBatch::BatchData(ref_ptr<GraphicsContext> context,
     {
       ChangeBuffer(context);
       avVertex = GetAvailableVertexCount();
-      avIndex  = GetAvailableIndexCount();
+      avIndex = GetAvailableIndexCount();
       ASSERT(IsEnoughMemory(avVertex, vertexCount, avIndex, vertexCount), ());
       ASSERT(vertexCount % 3 == 0, ());
     }
@@ -313,8 +297,7 @@ LineStripBatch::LineStripBatch(BatchCallbacks & callbacks)
   : TBase(callbacks, 2 /* minVerticesCount */, 2 /* minIndicesCount */)
 {}
 
-void LineStripBatch::BatchData(ref_ptr<GraphicsContext> context,
-                               ref_ptr<AttributeProvider> streams)
+void LineStripBatch::BatchData(ref_ptr<GraphicsContext> context, ref_ptr<AttributeProvider> streams)
 {
   while (streams->IsDataExists())
   {
@@ -368,8 +351,7 @@ void LineRawBatch::BatchData(ref_ptr<GraphicsContext> context, ref_ptr<Attribute
       ChangeBuffer(context);
       avVertex = GetAvailableVertexCount();
       avIndex = GetAvailableIndexCount();
-      CHECK(IsEnoughMemory(avVertex, vertexCount, avIndex, indexCount),
-            (avVertex, vertexCount, avIndex, indexCount));
+      CHECK(IsEnoughMemory(avVertex, vertexCount, avIndex, indexCount), (avVertex, vertexCount, avIndex, indexCount));
     }
 
     uint32_t startIndex = 0;
@@ -391,7 +373,7 @@ FanStripHelper::FanStripHelper(BatchCallbacks & callbacks)
 uint32_t FanStripHelper::BatchIndexes(ref_ptr<GraphicsContext> context, uint32_t vertexCount)
 {
   uint32_t avVertex = GetAvailableVertexCount();
-  uint32_t avIndex  = GetAvailableIndexCount();
+  uint32_t avIndex = GetAvailableIndexCount();
 
   uint32_t batchVertexCount = 0;
   uint32_t batchIndexCount = 0;
@@ -401,7 +383,7 @@ uint32_t FanStripHelper::BatchIndexes(ref_ptr<GraphicsContext> context, uint32_t
   {
     ChangeBuffer(context);
     avVertex = GetAvailableVertexCount();
-    avIndex  = GetAvailableIndexCount();
+    avIndex = GetAvailableIndexCount();
     CalcBatchPortion(vertexCount, avVertex, avIndex, batchVertexCount, batchIndexCount);
     ASSERT(IsFullUploaded(), ());
   }
@@ -466,12 +448,9 @@ uint32_t FanStripHelper::AlignICount(uint32_t iCount) const
   return iCount - iCount % 3;
 }
 
-TriangleStripBatch::TriangleStripBatch(BatchCallbacks & callbacks)
- : TBase(callbacks)
-{}
+TriangleStripBatch::TriangleStripBatch(BatchCallbacks & callbacks) : TBase(callbacks) {}
 
-void TriangleStripBatch::BatchData(ref_ptr<GraphicsContext> context,
-                                   ref_ptr<AttributeProvider> streams)
+void TriangleStripBatch::BatchData(ref_ptr<GraphicsContext> context, ref_ptr<AttributeProvider> streams)
 {
   while (streams->IsDataExists())
   {
@@ -483,7 +462,6 @@ void TriangleStripBatch::BatchData(ref_ptr<GraphicsContext> context,
 
     uint32_t const advanceCount = IsFullUploaded() ? batchVertexCount : (batchVertexCount - 2);
     streams->Advance(advanceCount);
-
   }
 }
 
@@ -512,8 +490,7 @@ TriangleFanBatch::TriangleFanBatch(BatchCallbacks & callbacks) : TBase(callbacks
  * second part of data. But to avoid 2 separate call of glBufferSubData we at first do a copy of
  * data from params to cpuBuffer and than copy continuous block of memory from cpuBuffer
  */
-void TriangleFanBatch::BatchData(ref_ptr<GraphicsContext> context,
-                                 ref_ptr<AttributeProvider> streams)
+void TriangleFanBatch::BatchData(ref_ptr<GraphicsContext> context, ref_ptr<AttributeProvider> streams)
 {
   std::vector<CPUBuffer> cpuBuffers;
   while (streams->IsDataExists())
@@ -554,8 +531,7 @@ void TriangleFanBatch::BatchData(ref_ptr<GraphicsContext> context,
 
       streams->Advance(advanceCount);
     }
-    else // if m_cpuBuffer empty than it's first iteration
-    {
+    else  // if m_cpuBuffer empty than it's first iteration
       if (IsFullUploaded())
       {
         // We can upload all input data as one peace. For upload we need only one iteration
@@ -570,8 +546,8 @@ void TriangleFanBatch::BatchData(ref_ptr<GraphicsContext> context,
         cpuBuffers.reserve(streams->GetStreamCount());
         for (size_t i = 0; i < streams->GetStreamCount(); ++i)
         {
-          const BindingInfo & binding = streams->GetBindingInfo(i);
-          const void * rawDataPointer = streams->GetRawPointer(i);
+          BindingInfo const & binding = streams->GetBindingInfo(i);
+          void const * rawDataPointer = streams->GetRawPointer(i);
           FlushData(context, binding, rawDataPointer, batchVertexCount);
 
           // "(vertexCount + 1) - batchVertexCount" we allocate CPUBuffer on all remaining data
@@ -590,7 +566,6 @@ void TriangleFanBatch::BatchData(ref_ptr<GraphicsContext> context,
         // first vertex of data from CPUBuffers
         streams->Advance(batchVertexCount - 1);
       }
-    }
   }
 }
 
@@ -599,12 +574,9 @@ void TriangleFanBatch::GenerateIndexes(void * indexStorage, uint32_t count, uint
   GenerateIndices<FanIndexGenerator>(indexStorage, count, startIndex);
 }
 
-TriangleListOfStripBatch::TriangleListOfStripBatch(BatchCallbacks & callbacks)
- : TBase(callbacks)
-{}
+TriangleListOfStripBatch::TriangleListOfStripBatch(BatchCallbacks & callbacks) : TBase(callbacks) {}
 
-void TriangleListOfStripBatch::BatchData(ref_ptr<GraphicsContext> context,
-                                         ref_ptr<AttributeProvider> streams)
+void TriangleListOfStripBatch::BatchData(ref_ptr<GraphicsContext> context, ref_ptr<AttributeProvider> streams)
 {
   while (streams->IsDataExists())
   {
@@ -617,8 +589,7 @@ void TriangleListOfStripBatch::BatchData(ref_ptr<GraphicsContext> context,
   }
 }
 
-bool TriangleListOfStripBatch::IsBufferFilled(uint32_t availableVerticesCount,
-                                              uint32_t availableIndicesCount) const
+bool TriangleListOfStripBatch::IsBufferFilled(uint32_t availableVerticesCount, uint32_t availableIndicesCount) const
 {
   uint8_t const vertexStride = GetVertexStride();
   ASSERT_GREATER_OR_EQUAL(vertexStride, 4, ());
diff --git a/libs/drape/batcher_helpers.hpp b/libs/drape/batcher_helpers.hpp
index fe3349403..37a5beaf7 100644
--- a/libs/drape/batcher_helpers.hpp
+++ b/libs/drape/batcher_helpers.hpp
@@ -14,8 +14,8 @@ class BatchCallbacks
 {
 public:
   virtual ~BatchCallbacks() = default;
-  virtual void FlushData(ref_ptr<GraphicsContext> context, BindingInfo const & binding,
-                         void const * data, uint32_t count) = 0;
+  virtual void FlushData(ref_ptr<GraphicsContext> context, BindingInfo const & binding, void const * data,
+                         uint32_t count) = 0;
   virtual void * GetIndexStorage(uint32_t indexCount, uint32_t & startIndex) = 0;
   virtual void SubmitIndices(ref_ptr<GraphicsContext> context) = 0;
   virtual uint32_t GetAvailableVertexCount() const = 0;
@@ -35,10 +35,9 @@ public:
   void SetVertexStride(uint8_t vertexStride);
 
 protected:
-  void FlushData(ref_ptr<GraphicsContext> context, ref_ptr<AttributeProvider> streams,
-                 uint32_t vertexCount) const;
-  void FlushData(ref_ptr<GraphicsContext> context, BindingInfo const & info,
-                 void const * data, uint32_t elementCount) const;
+  void FlushData(ref_ptr<GraphicsContext> context, ref_ptr<AttributeProvider> streams, uint32_t vertexCount) const;
+  void FlushData(ref_ptr<GraphicsContext> context, BindingInfo const & info, void const * data,
+                 uint32_t elementCount) const;
   void * GetIndexStorage(uint32_t indexCount, uint32_t & startIndex);
   void SubmitIndices(ref_ptr<GraphicsContext> context);
   uint32_t GetAvailableVertexCount() const;
@@ -98,8 +97,8 @@ public:
 
 protected:
   uint32_t BatchIndexes(ref_ptr<GraphicsContext> context, uint32_t vertexCount);
-  void CalcBatchPortion(uint32_t vertexCount, uint32_t avVertex, uint32_t avIndex,
-                        uint32_t & batchVertexCount, uint32_t & batchIndexCount);
+  void CalcBatchPortion(uint32_t vertexCount, uint32_t avVertex, uint32_t avIndex, uint32_t & batchVertexCount,
+                        uint32_t & batchIndexCount);
   bool IsFullUploaded() const;
 
   virtual uint32_t VtoICount(uint32_t vCount) const;
@@ -120,6 +119,7 @@ public:
   explicit TriangleStripBatch(BatchCallbacks & callbacks);
 
   void BatchData(ref_ptr<GraphicsContext> context, ref_ptr<AttributeProvider> streams) override;
+
 protected:
   void GenerateIndexes(void * indexStorage, uint32_t count, uint32_t startIndex) const override;
 };
@@ -132,6 +132,7 @@ public:
   explicit TriangleFanBatch(BatchCallbacks & callbacks);
 
   void BatchData(ref_ptr<GraphicsContext> context, ref_ptr<AttributeProvider> streams) override;
+
 protected:
   void GenerateIndexes(void * indexStorage, uint32_t count, uint32_t startIndex) const override;
 };
diff --git a/libs/drape/binding_info.cpp b/libs/drape/binding_info.cpp
index fc0028879..c94231d7e 100644
--- a/libs/drape/binding_info.cpp
+++ b/libs/drape/binding_info.cpp
@@ -25,11 +25,8 @@ uint16_t SizeOfType(glConst type)
 
 bool BindingDecl::operator==(BindingDecl const & other) const
 {
-  return m_attributeName == other.m_attributeName &&
-         m_componentCount == other.m_componentCount &&
-         m_componentType == other.m_componentType &&
-         m_stride == other.m_stride &&
-         m_offset == other.m_offset;
+  return m_attributeName == other.m_attributeName && m_componentCount == other.m_componentCount &&
+         m_componentType == other.m_componentType && m_stride == other.m_stride && m_offset == other.m_offset;
 }
 
 bool BindingDecl::operator!=(BindingDecl const & other) const
@@ -50,12 +47,9 @@ bool BindingDecl::operator<(BindingDecl const & other) const
   return m_offset < other.m_offset;
 }
 
-BindingInfo::BindingInfo()
-  : m_info(0)
-{}
+BindingInfo::BindingInfo() : m_info(0) {}
 
-BindingInfo::BindingInfo(uint8_t count, uint8_t id)
-  : m_info((static_cast<uint16_t>(count) << 8) | id)
+BindingInfo::BindingInfo(uint8_t count, uint8_t id) : m_info((static_cast<uint16_t>(count) << 8) | id)
 {
   CHECK_LESS_OR_EQUAL(count, kMaxBindingDecl, ());
 }
diff --git a/libs/drape/buffer_base.cpp b/libs/drape/buffer_base.cpp
index 99170b9a8..be6d9bba0 100644
--- a/libs/drape/buffer_base.cpp
+++ b/libs/drape/buffer_base.cpp
@@ -8,8 +8,7 @@ BufferBase::BufferBase(uint8_t elementSize, uint32_t capacity)
   : m_elementSize(elementSize)
   , m_capacity(capacity)
   , m_size(0)
-{
-}
+{}
 
 uint32_t BufferBase::GetCapacity() const
 {
@@ -55,4 +54,4 @@ void BufferBase::SetDataSize(uint32_t elementCount)
   m_size = elementCount;
 }
 
-} // namespace dp
+}  // namespace dp
diff --git a/libs/drape/color.hpp b/libs/drape/color.hpp
index 45b9dcf66..719d65203 100644
--- a/libs/drape/color.hpp
+++ b/libs/drape/color.hpp
@@ -14,12 +14,10 @@ struct Color
   constexpr explicit Color(uint32_t rgba) : m_rgba(rgba) {}
   constexpr Color(uint8_t red, uint8_t green, uint8_t blue, uint8_t alpha)
     : Color(red << 24 | green << 16 | blue << 8 | alpha)
-  {
-  }
+  {}
   constexpr Color(uint32_t rgb, uint8_t alpha)
     : Color(ExtractByte(rgb, 2), ExtractByte(rgb, 1), ExtractByte(rgb, 0), alpha)
-  {
-  }
+  {}
 
   constexpr uint8_t GetRed() const { return ExtractByte(m_rgba, 3); }
   constexpr uint8_t GetGreen() const { return ExtractByte(m_rgba, 2); }
diff --git a/libs/drape/constants.hpp b/libs/drape/constants.hpp
index ecd0f3588..7284de0f6 100644
--- a/libs/drape/constants.hpp
+++ b/libs/drape/constants.hpp
@@ -9,5 +9,5 @@ namespace depth
 float constexpr kMyPositionMarkDepth = kMaxDepth - 1.0f;
 }  // namespace depth
 
-uint32_t constexpr kScreenPixelRectExtension = 75; // in pixels.
+uint32_t constexpr kScreenPixelRectExtension = 75;  // in pixels.
 }  // namespace dp
diff --git a/libs/drape/cpu_buffer.cpp b/libs/drape/cpu_buffer.cpp
index cab6dd30e..3156c7e7c 100644
--- a/libs/drape/cpu_buffer.cpp
+++ b/libs/drape/cpu_buffer.cpp
@@ -1,15 +1,14 @@
 #include "drape/cpu_buffer.hpp"
 
+#include "base/assert.hpp"
 #include "base/math.hpp"
 #include "base/shared_buffer_manager.hpp"
-#include "base/assert.hpp"
 
 #include <cstring>
 
 namespace dp
 {
-CPUBuffer::CPUBuffer(uint8_t elementSize, uint32_t capacity)
-  : TBase(elementSize, capacity)
+CPUBuffer::CPUBuffer(uint8_t elementSize, uint32_t capacity) : TBase(elementSize, capacity)
 {
   uint32_t memorySize = math::NextPowOf2(GetCapacity() * GetElementSize());
   m_memory = SharedBufferManager::instance().reserveSharedBuffer(memorySize);
diff --git a/libs/drape/cpu_buffer.hpp b/libs/drape/cpu_buffer.hpp
index 28a935b0f..f0dac123e 100644
--- a/libs/drape/cpu_buffer.hpp
+++ b/libs/drape/cpu_buffer.hpp
@@ -10,6 +10,7 @@ namespace dp
 class CPUBuffer : public BufferBase
 {
   using TBase = BufferBase;
+
 public:
   CPUBuffer(uint8_t elementSize, uint32_t capacity);
   ~CPUBuffer() override;
diff --git a/libs/drape/data_buffer.cpp b/libs/drape/data_buffer.cpp
index 878757782..e017a618b 100644
--- a/libs/drape/data_buffer.cpp
+++ b/libs/drape/data_buffer.cpp
@@ -14,8 +14,7 @@ ref_ptr<DataBufferBase> DataBuffer::GetBuffer() const
   return make_ref(m_impl);
 }
 
-void DataBuffer::MoveToGPU(ref_ptr<GraphicsContext> context, GPUBuffer::Target target,
-                           uint64_t batcherHash)
+void DataBuffer::MoveToGPU(ref_ptr<GraphicsContext> context, GPUBuffer::Target target, uint64_t batcherHash)
 {
   // If currentSize is 0 buffer hasn't been filled on preparation stage, let it be filled further.
   uint32_t const currentSize = m_impl->GetCurrentSize();
@@ -25,42 +24,30 @@ void DataBuffer::MoveToGPU(ref_ptr<GraphicsContext> context, GPUBuffer::Target t
   {
     if (currentSize != 0)
     {
-      m_impl = make_unique_dp<GpuBufferImpl>(target, m_impl->Data(), m_impl->GetElementSize(),
-                                             currentSize, batcherHash);
+      m_impl =
+          make_unique_dp<GpuBufferImpl>(target, m_impl->Data(), m_impl->GetElementSize(), currentSize, batcherHash);
     }
     else
     {
-      m_impl = make_unique_dp<GpuBufferImpl>(target, nullptr, m_impl->GetElementSize(),
-                                             m_impl->GetAvailableSize(), batcherHash);
+      m_impl = make_unique_dp<GpuBufferImpl>(target, nullptr, m_impl->GetElementSize(), m_impl->GetAvailableSize(),
+                                             batcherHash);
     }
   }
   else if (apiVersion == dp::ApiVersion::Metal)
   {
 #if defined(OMIM_METAL_AVAILABLE)
     if (currentSize != 0)
-    {
-      m_impl = CreateImplForMetal(context, m_impl->Data(), m_impl->GetElementSize(),
-                                  currentSize);
-    }
+      m_impl = CreateImplForMetal(context, m_impl->Data(), m_impl->GetElementSize(), currentSize);
     else
-    {
-      m_impl = CreateImplForMetal(context, nullptr, m_impl->GetElementSize(),
-                                  m_impl->GetAvailableSize());
-    }
+      m_impl = CreateImplForMetal(context, nullptr, m_impl->GetElementSize(), m_impl->GetAvailableSize());
 #endif
   }
   else if (apiVersion == dp::ApiVersion::Vulkan)
   {
     if (currentSize != 0)
-    {
-      m_impl = CreateImplForVulkan(context, m_impl->Data(), m_impl->GetElementSize(),
-                                   currentSize, batcherHash);
-    }
+      m_impl = CreateImplForVulkan(context, m_impl->Data(), m_impl->GetElementSize(), currentSize, batcherHash);
     else
-    {
-      m_impl = CreateImplForVulkan(context, nullptr, m_impl->GetElementSize(),
-                                   m_impl->GetAvailableSize(), batcherHash);
-    }
+      m_impl = CreateImplForVulkan(context, nullptr, m_impl->GetElementSize(), m_impl->GetAvailableSize(), batcherHash);
   }
   else
   {
@@ -68,8 +55,8 @@ void DataBuffer::MoveToGPU(ref_ptr<GraphicsContext> context, GPUBuffer::Target t
   }
 }
 
-DataBufferMapper::DataBufferMapper(ref_ptr<GraphicsContext> context, ref_ptr<DataBuffer> buffer,
-                                   uint32_t elementOffset, uint32_t elementCount)
+DataBufferMapper::DataBufferMapper(ref_ptr<GraphicsContext> context, ref_ptr<DataBuffer> buffer, uint32_t elementOffset,
+                                   uint32_t elementCount)
   : m_context(context)
   , m_buffer(buffer)
 {
@@ -77,7 +64,10 @@ DataBufferMapper::DataBufferMapper(ref_ptr<GraphicsContext> context, ref_ptr<Dat
   m_ptr = m_buffer->GetBuffer()->Map(m_context, elementOffset, elementCount);
 }
 
-DataBufferMapper::~DataBufferMapper() { m_buffer->GetBuffer()->Unmap(m_context); }
+DataBufferMapper::~DataBufferMapper()
+{
+  m_buffer->GetBuffer()->Unmap(m_context);
+}
 
 void DataBufferMapper::UpdateData(void const * data, uint32_t elementOffset, uint32_t elementCount)
 {
diff --git a/libs/drape/data_buffer.hpp b/libs/drape/data_buffer.hpp
index 9ac02a8b2..a05d83dee 100644
--- a/libs/drape/data_buffer.hpp
+++ b/libs/drape/data_buffer.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "drape/graphics_context.hpp"
 #include "drape/gpu_buffer.hpp"
+#include "drape/graphics_context.hpp"
 #include "drape/pointers.hpp"
 
 namespace dp
@@ -17,13 +17,10 @@ public:
   virtual void Seek(uint32_t elementNumber) = 0;
   virtual void const * Data() const = 0;
 
-  virtual void UploadData(ref_ptr<GraphicsContext> context,
-                          void const * data, uint32_t elementCount) = 0;
+  virtual void UploadData(ref_ptr<GraphicsContext> context, void const * data, uint32_t elementCount) = 0;
 
-  virtual void * Map(ref_ptr<GraphicsContext> context, uint32_t elementOffset,
-                     uint32_t elementCount) = 0;
-  virtual void UpdateData(void * destPtr, void const * srcPtr, uint32_t elementOffset,
-                          uint32_t elementCount) = 0;
+  virtual void * Map(ref_ptr<GraphicsContext> context, uint32_t elementOffset, uint32_t elementCount) = 0;
+  virtual void UpdateData(void * destPtr, void const * srcPtr, uint32_t elementOffset, uint32_t elementCount) = 0;
   virtual void Unmap(ref_ptr<GraphicsContext> context) = 0;
 
   virtual void Bind() = 0;
@@ -39,22 +36,21 @@ public:
 
 private:
   // Definition of this method is in a .mm-file.
-  drape_ptr<DataBufferBase> CreateImplForMetal(ref_ptr<GraphicsContext> context, void const * data,
-                                               uint8_t elementSize, uint32_t capacity);
+  drape_ptr<DataBufferBase> CreateImplForMetal(ref_ptr<GraphicsContext> context, void const * data, uint8_t elementSize,
+                                               uint32_t capacity);
 
   // Definition of this method is in a separate .cpp-file.
   drape_ptr<DataBufferBase> CreateImplForVulkan(ref_ptr<GraphicsContext> context, void const * data,
-                                                uint8_t elementSize, uint32_t capacity,
-                                                uint64_t batcherHash);
-  
+                                                uint8_t elementSize, uint32_t capacity, uint64_t batcherHash);
+
   drape_ptr<DataBufferBase> m_impl;
 };
 
 class DataBufferMapper
 {
 public:
-  DataBufferMapper(ref_ptr<GraphicsContext> context, ref_ptr<DataBuffer> buffer,
-                   uint32_t elementOffset, uint32_t elementCount);
+  DataBufferMapper(ref_ptr<GraphicsContext> context, ref_ptr<DataBuffer> buffer, uint32_t elementOffset,
+                   uint32_t elementCount);
   ~DataBufferMapper();
 
   void UpdateData(void const * data, uint32_t elementOffset, uint32_t elementCount);
diff --git a/libs/drape/data_buffer_impl.hpp b/libs/drape/data_buffer_impl.hpp
index 005a213c8..8d1e7895d 100644
--- a/libs/drape/data_buffer_impl.hpp
+++ b/libs/drape/data_buffer_impl.hpp
@@ -17,8 +17,7 @@ class DataBufferImpl : public DataBufferBase
 {
 public:
   template <typename... Args>
-  DataBufferImpl(Args &&... params)
-    : m_buffer(make_unique_dp<TBuffer>(std::forward<Args>(params)...))
+  DataBufferImpl(Args &&... params) : m_buffer(make_unique_dp<TBuffer>(std::forward<Args>(params)...))
   {}
 
   uint32_t GetCapacity() const override { return m_buffer->GetCapacity(); }
@@ -36,14 +35,12 @@ class CpuBufferImpl : public DataBufferImpl<CPUBuffer>
 {
 public:
   template <typename... Args>
-  CpuBufferImpl(Args &&... params)
-    : DataBufferImpl(std::forward<Args>(params)...)
+  CpuBufferImpl(Args &&... params) : DataBufferImpl(std::forward<Args>(params)...)
   {}
 
   void const * Data() const override { return m_buffer->Data(); }
 
-  void UploadData(ref_ptr<GraphicsContext> context, void const * data,
-                  uint32_t elementCount) override
+  void UploadData(ref_ptr<GraphicsContext> context, void const * data, uint32_t elementCount) override
   {
     UNUSED_VALUE(context);
     m_buffer->UploadData(data, elementCount);
@@ -51,8 +48,7 @@ public:
     m_buffer->Seek(newOffset);
   }
 
-  void * Map(ref_ptr<GraphicsContext> context, uint32_t elementOffset,
-             uint32_t elementCount) override
+  void * Map(ref_ptr<GraphicsContext> context, uint32_t elementOffset, uint32_t elementCount) override
   {
     UNUSED_VALUE(context);
     UNUSED_VALUE(elementOffset);
@@ -61,8 +57,7 @@ public:
     return nullptr;
   }
 
-  void UpdateData(void * destPtr, void const * srcPtr, uint32_t elementOffset,
-                  uint32_t elementCount) override
+  void UpdateData(void * destPtr, void const * srcPtr, uint32_t elementOffset, uint32_t elementCount) override
   {
     UNUSED_VALUE(destPtr);
     UNUSED_VALUE(srcPtr);
@@ -85,8 +80,7 @@ class GpuBufferImpl : public DataBufferImpl<GPUBuffer>
 {
 public:
   template <typename... Args>
-  GpuBufferImpl(Args &&... params)
-    : DataBufferImpl(std::forward<Args>(params)...)
+  GpuBufferImpl(Args &&... params) : DataBufferImpl(std::forward<Args>(params)...)
   {}
 
   void const * Data() const override
@@ -95,22 +89,19 @@ public:
     return nullptr;
   }
 
-  void UploadData(ref_ptr<GraphicsContext> context, void const * data,
-                  uint32_t elementCount) override
+  void UploadData(ref_ptr<GraphicsContext> context, void const * data, uint32_t elementCount) override
   {
     UNUSED_VALUE(context);
     m_buffer->UploadData(data, elementCount);
   }
 
-  void * Map(ref_ptr<GraphicsContext> context, uint32_t elementOffset,
-             uint32_t elementCount) override
+  void * Map(ref_ptr<GraphicsContext> context, uint32_t elementOffset, uint32_t elementCount) override
   {
     UNUSED_VALUE(context);
     return m_buffer->Map(elementOffset, elementCount);
   }
 
-  void UpdateData(void * destPtr, void const * srcPtr, uint32_t elementOffset,
-                  uint32_t elementCount) override
+  void UpdateData(void * destPtr, void const * srcPtr, uint32_t elementOffset, uint32_t elementCount) override
   {
     m_buffer->UpdateData(destPtr, srcPtr, elementOffset, elementCount);
   }
diff --git a/libs/drape/debug_renderer.hpp b/libs/drape/debug_renderer.hpp
index 48dffed93..b1d0ef58c 100644
--- a/libs/drape/debug_renderer.hpp
+++ b/libs/drape/debug_renderer.hpp
@@ -12,8 +12,8 @@ class DebugRenderer
 public:
   virtual ~DebugRenderer() = default;
   virtual bool IsEnabled() const = 0;
-  virtual void DrawRect(ref_ptr<GraphicsContext> context, ScreenBase const & screen,
-                        m2::RectF const & rect, Color const & color) = 0;
+  virtual void DrawRect(ref_ptr<GraphicsContext> context, ScreenBase const & screen, m2::RectF const & rect,
+                        Color const & color) = 0;
   virtual void DrawArrow(ref_ptr<GraphicsContext> context, ScreenBase const & screen,
                          OverlayTree::DisplacementData const & data) = 0;
 };
diff --git a/libs/drape/drape_diagnostics.hpp b/libs/drape/drape_diagnostics.hpp
index af10c1cc8..6585dccdd 100644
--- a/libs/drape/drape_diagnostics.hpp
+++ b/libs/drape/drape_diagnostics.hpp
@@ -1,31 +1,31 @@
 #pragma once
 
-//#define DRAW_TILE_NET
-//#define DEBUG_OVERLAYS_OUTPUT
+// #define DRAW_TILE_NET
+// #define DEBUG_OVERLAYS_OUTPUT
 
-//#define CHECK_VBO_BOUNDS
-//#define TRACK_POINTERS
-//#define DEBUG_ANIMATIONS
-//#define LINES_GENERATION_CALC_FILTERED_POINTS
-//#define GPS_TRACK_SHOW_RAW_POINTS
-//#define DEBUG_MESSAGE_QUEUE
-//#define RENDER_DEBUG_INFO_LABELS
+// #define CHECK_VBO_BOUNDS
+// #define TRACK_POINTERS
+// #define DEBUG_ANIMATIONS
+// #define LINES_GENERATION_CALC_FILTERED_POINTS
+// #define GPS_TRACK_SHOW_RAW_POINTS
+// #define DEBUG_MESSAGE_QUEUE
+// #define RENDER_DEBUG_INFO_LABELS
 
-//#define DRAPE_MEASURER_BENCHMARK
-//#define SCENARIO_ENABLE
-//#define SHOW_FRAMES_STATS
+// #define DRAPE_MEASURER_BENCHMARK
+// #define SCENARIO_ENABLE
+// #define SHOW_FRAMES_STATS
 
 #ifdef DRAPE_MEASURER_BENCHMARK
 
-//#define RENDER_STATISTIC
-//#define TILES_STATISTIC
-//#define GENERATING_STATISTIC
+// #define RENDER_STATISTIC
+// #define TILES_STATISTIC
+// #define GENERATING_STATISTIC
 
-//#define TRACK_GPU_MEM
-//#define TRACK_GLYPH_USAGE
+// #define TRACK_GPU_MEM
+// #define TRACK_GLYPH_USAGE
 
 #endif
 
-//#define ENABLE_VULKAN_DIAGNOSTICS
-//#define ENABLE_VULKAN_DEBUG_DIAGNOSTICS_MESSAGES
-//#define ENABLE_OPENGL_DIAGNOSTICS
+// #define ENABLE_VULKAN_DIAGNOSTICS
+// #define ENABLE_VULKAN_DEBUG_DIAGNOSTICS_MESSAGES
+// #define ENABLE_OPENGL_DIAGNOSTICS
diff --git a/libs/drape/drape_global.hpp b/libs/drape/drape_global.hpp
index 3939ad942..0c73615a8 100644
--- a/libs/drape/drape_global.hpp
+++ b/libs/drape/drape_global.hpp
@@ -66,7 +66,9 @@ struct FontDecl
 {
   FontDecl() = default;
   FontDecl(Color const & color, float size, Color const & outlineColor = Color::Transparent())
-    : m_color(color), m_outlineColor(outlineColor), m_size(size)
+    : m_color(color)
+    , m_outlineColor(outlineColor)
+    , m_size(size)
   {}
 
   Color m_color = Color::Transparent();
@@ -135,8 +137,6 @@ inline dp::ApiVersion ApiVersionFromString(std::string const & str)
 
 class GraphicsContext;
 class TextureManager;
-using RenderInjectionHandler = std::function<void(ref_ptr<dp::GraphicsContext>, 
-                                                  ref_ptr<TextureManager>, 
-                                                  ref_ptr<gpu::ProgramManager>,
-                                                  bool shutdown)>;
+using RenderInjectionHandler = std::function<void(ref_ptr<dp::GraphicsContext>, ref_ptr<TextureManager>,
+                                                  ref_ptr<gpu::ProgramManager>, bool shutdown)>;
 }  // namespace dp
diff --git a/libs/drape/drape_routine.hpp b/libs/drape/drape_routine.hpp
index c4a49d5d2..1a084747e 100644
--- a/libs/drape/drape_routine.hpp
+++ b/libs/drape/drape_routine.hpp
@@ -46,15 +46,9 @@ public:
 
   using ResultPtr = std::shared_ptr<Result>;
 
-  static void Init()
-  {
-    Instance(true /* reinitialize*/);
-  }
+  static void Init() { Instance(true /* reinitialize*/); }
 
-  static void Shutdown()
-  {
-    Instance().FinishAll();
-  }
+  static void Shutdown() { Instance().FinishAll(); }
 
   template <typename Task>
   static ResultPtr Run(Task && t)
@@ -76,7 +70,8 @@ public:
   static ResultPtr RunDelayed(base::DelayedThreadPool::Duration const & duration, Task && t)
   {
     ResultPtr result(new Result(Instance().GetNextId()));
-    auto const pushResult = Instance().m_workerThread.PushDelayed(duration, [result, t = std::forward<Task>(t)]() mutable
+    auto const pushResult =
+        Instance().m_workerThread.PushDelayed(duration, [result, t = std::forward<Task>(t)]() mutable
     {
       t();
       Instance().Notify(result->Finish());
@@ -109,7 +104,8 @@ private:
   static DrapeRoutine & Instance(bool reinitialize = false)
   {
     static std::unique_ptr<DrapeRoutine> instance;
-    if (!instance || reinitialize) {
+    if (!instance || reinitialize)
+    {
       if (instance)
         instance->FinishAll();
       instance = std::unique_ptr<DrapeRoutine>(new DrapeRoutine());
@@ -137,10 +133,7 @@ private:
     std::unique_lock<std::mutex> lock(m_mutex);
     if (m_finished)
       return;
-    m_condition.wait(lock, [this, id]()
-    {
-      return m_finished || m_finishedIds.find(id) != m_finishedIds.end();
-    });
+    m_condition.wait(lock, [this, id]() { return m_finished || m_finishedIds.find(id) != m_finishedIds.end(); });
     m_finishedIds.erase(id);
   }
 
@@ -175,15 +168,13 @@ class ActiveTasks
     DrapeRoutine::ResultPtr m_result;
 
     ActiveTask(std::shared_ptr<TaskType> && task, DrapeRoutine::ResultPtr && result)
-      : m_task(std::move(task)), m_result(std::move(result))
+      : m_task(std::move(task))
+      , m_result(std::move(result))
     {}
   };
 
 public:
-  ~ActiveTasks()
-  {
-    FinishAll();
-  }
+  ~ActiveTasks() { FinishAll(); }
 
   void Add(std::shared_ptr<TaskType> && task, DrapeRoutine::ResultPtr && result)
   {
@@ -196,9 +187,9 @@ public:
   void Remove(std::shared_ptr<TaskType> const & task)
   {
     std::lock_guard<std::mutex> lock(m_mutex);
-    m_tasks.erase(std::remove_if(m_tasks.begin(), m_tasks.end(),
-                  [task](ActiveTask const & t) { return t.m_task == task; }),
-                  m_tasks.end());
+    m_tasks.erase(
+        std::remove_if(m_tasks.begin(), m_tasks.end(), [task](ActiveTask const & t) { return t.m_task == task; }),
+        m_tasks.end());
   }
 
   void FinishAll()
diff --git a/libs/drape/drape_tests/attribute_provides_tests.cpp b/libs/drape/drape_tests/attribute_provides_tests.cpp
index 8b3b7ffb9..e3e684f6e 100644
--- a/libs/drape/drape_tests/attribute_provides_tests.cpp
+++ b/libs/drape/drape_tests/attribute_provides_tests.cpp
@@ -142,11 +142,11 @@ UNIT_TEST(MixedStreamsTest)
 
   for (int i = 0; i < VERTEX_COUNT; ++i)
   {
-    position[3 * i] = (float)i;       // x
-    position[(3 * i) + 1] = 0.0;      // y
-    position[(3 * i) + 2] = (float)i; // z
-    position[2 * i] = (float)i;       // Nx
-    position[(2 * i) + 1] = 0.0;      // Ny
+    position[3 * i] = (float)i;        // x
+    position[(3 * i) + 1] = 0.0;       // y
+    position[(3 * i) + 2] = (float)i;  // z
+    position[2 * i] = (float)i;        // Nx
+    position[(2 * i) + 1] = 0.0;       // Ny
   }
 
   {
diff --git a/libs/drape/drape_tests/batcher_tests.cpp b/libs/drape/drape_tests/batcher_tests.cpp
index 29f21e5b0..182b988b3 100644
--- a/libs/drape/drape_tests/batcher_tests.cpp
+++ b/libs/drape/drape_tests/batcher_tests.cpp
@@ -18,11 +18,11 @@
 #include <gmock/gmock.h>
 
 using testing::_;
-using testing::Return;
+using testing::AnyOf;
+using testing::IgnoreResult;
 using testing::InSequence;
 using testing::Invoke;
-using testing::IgnoreResult;
-using testing::AnyOf;
+using testing::Return;
 using namespace dp;
 using namespace std::placeholders;
 
@@ -48,14 +48,10 @@ public:
 class BatcherExpectations
 {
 public:
-  BatcherExpectations()
-    : m_indexBufferID(1)
-    , m_dataBufferID(2)
-  {}
+  BatcherExpectations() : m_indexBufferID(1), m_dataBufferID(2) {}
 
   template <typename TBatcherCall>
-  void RunTest(float * vertexes, void * indexes,
-               uint32_t vertexCount, uint8_t vertexComponentCount,
+  void RunTest(float * vertexes, void * indexes, uint32_t vertexCount, uint8_t vertexComponentCount,
                uint32_t indexCount, TBatcherCall const & fn)
   {
     uint32_t const vertexSize = vertexCount * vertexComponentCount;
@@ -91,23 +87,22 @@ public:
       vaoAcceptor.m_vao[i].reset();
   }
 
-  void ExpectBufferCreation(uint32_t vertexCount, uint32_t indexCount,
-                            MemoryComparer const & indexCmp, MemoryComparer const & vertexCmp)
+  void ExpectBufferCreation(uint32_t vertexCount, uint32_t indexCount, MemoryComparer const & indexCmp,
+                            MemoryComparer const & vertexCmp)
   {
     InSequence seq;
 
     // data buffer creation
     EXPECTGL(glGenBuffer()).WillOnce(Return(m_dataBufferID));
     EXPECTGL(glBindBuffer(m_dataBufferID, gl_const::GLArrayBuffer));
-    EXPECTGL(glBufferData(gl_const::GLArrayBuffer, vertexCount * sizeof(float), _,
-                          gl_const::GLDynamicDraw))
+    EXPECTGL(glBufferData(gl_const::GLArrayBuffer, vertexCount * sizeof(float), _, gl_const::GLDynamicDraw))
         .WillOnce(Invoke(&vertexCmp, &MemoryComparer::cmpSubBuffer));
 
     // Index buffer creation
     EXPECTGL(glGenBuffer()).WillOnce(Return(m_indexBufferID));
     EXPECTGL(glBindBuffer(m_indexBufferID, gl_const::GLElementArrayBuffer));
-    EXPECTGL(glBufferData(gl_const::GLElementArrayBuffer,
-                          indexCount * dp::IndexStorage::SizeOfIndex(), _, gl_const::GLDynamicDraw))
+    EXPECTGL(glBufferData(gl_const::GLElementArrayBuffer, indexCount * dp::IndexStorage::SizeOfIndex(), _,
+                          gl_const::GLDynamicDraw))
         .WillOnce(Invoke(&indexCmp, &MemoryComparer::cmpSubBuffer));
 
     EXPECTGL(glBindBuffer(0, gl_const::GLElementArrayBuffer));
@@ -128,13 +123,13 @@ private:
   uint32_t m_dataBufferID = 0;
 };
 
-} // namespace
+}  // namespace
 
 UNIT_TEST(BatchLists_Test)
 {
   TestingGraphicsContext context;
   uint32_t const kVerticesCount = 12;
-  uint32_t const kFloatsCount = 3 * 12; // 3 component on each vertex.
+  uint32_t const kFloatsCount = 3 * 12;  // 3 component on each vertex.
   float data[kFloatsCount];
   for (uint32_t i = 0; i < kFloatsCount; ++i)
     data[i] = static_cast<float>(i);
@@ -146,9 +141,7 @@ UNIT_TEST(BatchLists_Test)
 
   BatcherExpectations expectations;
   auto fn = [&context](Batcher * batcher, RenderState const & state, ref_ptr<AttributeProvider> p)
-  {
-    batcher->InsertTriangleList(make_ref(&context), state, p);
-  };
+  { batcher->InsertTriangleList(make_ref(&context), state, p); };
   expectations.RunTest(data, indexes.GetRaw(), kVerticesCount, 3, kVerticesCount, fn);
 }
 
@@ -167,9 +160,7 @@ UNIT_TEST(BatchListOfStript_4stride)
 
   BatcherExpectations expectations;
   auto fn = [&context](Batcher * batcher, RenderState const & state, ref_ptr<AttributeProvider> p)
-  {
-    batcher->InsertListOfStrip(make_ref(&context), state, p, dp::Batcher::VertexPerQuad);
-  };
+  { batcher->InsertListOfStrip(make_ref(&context), state, p, dp::Batcher::VertexPerQuad); };
 
   expectations.RunTest(data, indexes.GetRaw(), kVerticesCount, 3, kIndicesCount, fn);
 }
@@ -184,24 +175,13 @@ UNIT_TEST(BatchListOfStript_5stride)
   for (uint32_t i = 0; i < kVerticesCount * 3; ++i)
     data[i] = static_cast<float>(i);
 
-  std::vector<uint32_t> indexesRaw =
-  { 0, 1, 2,
-    1, 3, 2,
-    2, 3, 4,
-    5, 6, 7,
-    6, 8, 7,
-    7, 8, 9,
-    10, 11, 12,
-    11, 13, 12,
-    12, 13, 14
-  };
+  std::vector<uint32_t> indexesRaw = {0, 1, 2, 1, 3,  2,  2,  3,  4,  5,  6,  7,  6, 8,
+                                      7, 7, 8, 9, 10, 11, 12, 11, 13, 12, 12, 13, 14};
   dp::IndexStorage indexes(std::move(indexesRaw));
 
   BatcherExpectations expectations;
   auto fn = [&context](Batcher * batcher, RenderState const & state, ref_ptr<AttributeProvider> p)
-  {
-    batcher->InsertListOfStrip(make_ref(&context), state, p, 5);
-  };
+  { batcher->InsertListOfStrip(make_ref(&context), state, p, 5); };
   expectations.RunTest(data, indexes.GetRaw(), kVerticesCount, 3, kIndicesCount, fn);
 }
 
@@ -215,28 +195,13 @@ UNIT_TEST(BatchListOfStript_6stride)
   for (uint32_t i = 0; i < kVerticesCount * 3; ++i)
     data[i] = static_cast<float>(i);
 
-  std::vector<uint32_t> indexesRaw =
-  {
-    0, 1, 2,
-    1, 3, 2,
-    2, 3, 4,
-    3, 5, 4,
-    6, 7, 8,
-    7, 9, 8,
-    8, 9, 10,
-    9, 11, 10,
-    12, 13, 14,
-    13, 15, 14,
-    14, 15, 16,
-    15, 17, 16
-  };
+  std::vector<uint32_t> indexesRaw = {0, 1, 2,  1, 3,  2,  2,  3,  4,  3,  5,  4,  6,  7,  8,  7,  9,  8,
+                                      8, 9, 10, 9, 11, 10, 12, 13, 14, 13, 15, 14, 14, 15, 16, 15, 17, 16};
   dp::IndexStorage indexes(std::move(indexesRaw));
 
   BatcherExpectations expectations;
   auto fn = [&context](Batcher * batcher, RenderState const & state, ref_ptr<AttributeProvider> p)
-  {
-    batcher->InsertListOfStrip(make_ref(&context), state, p, 6);
-  };
+  { batcher->InsertListOfStrip(make_ref(&context), state, p, 6); };
   expectations.RunTest(data, indexes.GetRaw(), kVerticesCount, 3, kIndicesCount, fn);
 }
 
@@ -247,8 +212,7 @@ class PartialBatcherTest
 public:
   struct BufferNode
   {
-    BufferNode(uint32_t indexByteCount, uint32_t vertexByteCount,
-               void * indexData, void * vertexData)
+    BufferNode(uint32_t indexByteCount, uint32_t vertexByteCount, void * indexData, void * vertexData)
       : m_indexByteCount(indexByteCount)
       , m_vertexByteCount(vertexByteCount)
       , m_indexData(indexData)
@@ -267,10 +231,7 @@ public:
 
   PartialBatcherTest() = default;
 
-  ~PartialBatcherTest()
-  {
-    std::for_each(m_comparators.begin(), m_comparators.end(), base::DeleteFunctor());
-  }
+  ~PartialBatcherTest() { std::for_each(m_comparators.begin(), m_comparators.end(), base::DeleteFunctor()); }
 
   void AddBufferNode(BufferNode const & node)
   {
@@ -283,24 +244,20 @@ public:
     EXPECTGL(glGenBuffer()).WillOnce(Return(currentNode.m_vertexBufferID));
     EXPECTGL(glBindBuffer(currentNode.m_vertexBufferID, gl_const::GLArrayBuffer));
 
-    m_comparators.push_back(
-        new MemoryComparer(currentNode.m_vertexData, currentNode.m_vertexByteCount));
+    m_comparators.push_back(new MemoryComparer(currentNode.m_vertexData, currentNode.m_vertexByteCount));
     MemoryComparer * vertexComparer = m_comparators.back();
 
-    EXPECTGL(glBufferData(gl_const::GLArrayBuffer, currentNode.m_vertexByteCount, _,
-                          gl_const::GLDynamicDraw))
+    EXPECTGL(glBufferData(gl_const::GLArrayBuffer, currentNode.m_vertexByteCount, _, gl_const::GLDynamicDraw))
         .WillOnce(Invoke(vertexComparer, &MemoryComparer::cmpSubBuffer));
 
     // Index buffer creation
     EXPECTGL(glGenBuffer()).WillOnce(Return(currentNode.m_indexBufferID));
     EXPECTGL(glBindBuffer(currentNode.m_indexBufferID, gl_const::GLElementArrayBuffer));
 
-    m_comparators.push_back(
-        new MemoryComparer(currentNode.m_indexData, currentNode.m_indexByteCount));
+    m_comparators.push_back(new MemoryComparer(currentNode.m_indexData, currentNode.m_indexByteCount));
     MemoryComparer * indexComparer = m_comparators.back();
 
-    EXPECTGL(glBufferData(gl_const::GLElementArrayBuffer, currentNode.m_indexByteCount, _,
-                          gl_const::GLDynamicDraw))
+    EXPECTGL(glBufferData(gl_const::GLElementArrayBuffer, currentNode.m_indexByteCount, _, gl_const::GLDynamicDraw))
         .WillOnce(Invoke(indexComparer, &MemoryComparer::cmpSubBuffer));
 
     EXPECTGL(glBindBuffer(0, gl_const::GLElementArrayBuffer));
@@ -343,21 +300,14 @@ UNIT_TEST(BatchListOfStript_partial)
   for (uint32_t i = 0; i < VertexArraySize; ++i)
     vertexData[i] = static_cast<float>(i);
 
-  std::vector<uint32_t> indexDataRaw =
-  { 0, 1, 2,
-    1, 3, 2,
-    4, 5, 6,
-    5, 7, 6,
-    8, 9, 10,
-    9, 11, 10,
-    0, 1, 2, // start new buffer
-    1, 3, 2
-  };
+  std::vector<uint32_t> indexDataRaw = {0, 1, 2, 1,  3, 2,  4,  5, 6, 5, 7,
+                                        6, 8, 9, 10, 9, 11, 10, 0, 1, 2,  // start new buffer
+                                        1, 3, 2};
   dp::IndexStorage indexData(std::move(indexDataRaw));
 
   PartialBatcherTest::BufferNode node1(FirstBufferIndexPortion * dp::IndexStorage::SizeOfIndex(),
-                                       FirstBufferVertexPortion * ComponentCount * sizeof(float),
-                                       indexData.GetRaw(), vertexData);
+                                       FirstBufferVertexPortion * ComponentCount * sizeof(float), indexData.GetRaw(),
+                                       vertexData);
 
   PartialBatcherTest::BufferNode node2(SecondBufferIndexPortion * dp::IndexStorage::SizeOfIndex(),
                                        SecondBufferVertexPortion * ComponentCount * sizeof(float),
diff --git a/libs/drape/drape_tests/buffer_tests.cpp b/libs/drape/drape_tests/buffer_tests.cpp
index 41949a209..74f6285c6 100644
--- a/libs/drape/drape_tests/buffer_tests.cpp
+++ b/libs/drape/drape_tests/buffer_tests.cpp
@@ -26,8 +26,7 @@ UNIT_TEST(CreateDestroyDataBufferTest)
   InSequence s;
   EXPECTGL(glGenBuffer()).WillOnce(Return(1));
   EXPECTGL(glBindBuffer(1, gl_const::GLArrayBuffer));
-  EXPECTGL(glBufferData(gl_const::GLArrayBuffer,
-    3 * 100 * sizeof(float), nullptr, gl_const::GLDynamicDraw));
+  EXPECTGL(glBufferData(gl_const::GLArrayBuffer, 3 * 100 * sizeof(float), nullptr, gl_const::GLDynamicDraw));
   EXPECTGL(glBindBuffer(0, gl_const::GLArrayBuffer));
   EXPECTGL(glDeleteBuffer(1));
 
@@ -41,8 +40,8 @@ UNIT_TEST(CreateDestroyIndexBufferTest)
   InSequence s;
   EXPECTGL(glGenBuffer()).WillOnce(Return(1));
   EXPECTGL(glBindBuffer(1, gl_const::GLElementArrayBuffer));
-  EXPECTGL(glBufferData(gl_const::GLElementArrayBuffer,
-    100 * dp::IndexStorage::SizeOfIndex(), nullptr, gl_const::GLDynamicDraw));
+  EXPECTGL(glBufferData(gl_const::GLElementArrayBuffer, 100 * dp::IndexStorage::SizeOfIndex(), nullptr,
+                        gl_const::GLDynamicDraw));
   EXPECTGL(glBindBuffer(0, gl_const::GLElementArrayBuffer));
   EXPECTGL(glDeleteBuffer(1));
 
@@ -62,8 +61,8 @@ UNIT_TEST(UploadDataTest)
   InSequence s;
   EXPECTGL(glGenBuffer()).WillOnce(Return(1));
   EXPECTGL(glBindBuffer(1, gl_const::GLArrayBuffer));
-  EXPECTGL(glBufferData(gl_const::GLArrayBuffer, 3 * 100 * sizeof(float),
-    buffer->GetBuffer()->Data(), gl_const::GLDynamicDraw));
+  EXPECTGL(glBufferData(gl_const::GLArrayBuffer, 3 * 100 * sizeof(float), buffer->GetBuffer()->Data(),
+                        gl_const::GLDynamicDraw));
   EXPECTGL(glBindBuffer(0, gl_const::GLArrayBuffer));
   EXPECTGL(glDeleteBuffer(1));
 
@@ -89,8 +88,8 @@ UNIT_TEST(ParticalUploadDataTest)
   InSequence s;
   EXPECTGL(glGenBuffer()).WillOnce(Return(1));
   EXPECTGL(glBindBuffer(1, gl_const::GLArrayBuffer));
-  EXPECTGL(glBufferData(gl_const::GLArrayBuffer, 3 * 100 * sizeof(float),
-    buffer->GetBuffer()->Data(),gl_const::GLDynamicDraw));
+  EXPECTGL(glBufferData(gl_const::GLArrayBuffer, 3 * 100 * sizeof(float), buffer->GetBuffer()->Data(),
+                        gl_const::GLDynamicDraw));
   EXPECTGL(glBindBuffer(0, gl_const::GLArrayBuffer));
   EXPECTGL(glDeleteBuffer(1));
 
diff --git a/libs/drape/drape_tests/dummy_texture.hpp b/libs/drape/drape_tests/dummy_texture.hpp
index 4d2095bae..22391af01 100644
--- a/libs/drape/drape_tests/dummy_texture.hpp
+++ b/libs/drape/drape_tests/dummy_texture.hpp
@@ -12,8 +12,5 @@ public:
     return FindResource(key, dummy);
   }
 
-  virtual ref_ptr<ResourceInfo> FindResource(Key const & /*key*/, bool & /*newResource*/)
-  {
-    return nullptr;
-  }
+  virtual ref_ptr<ResourceInfo> FindResource(Key const & /*key*/, bool & /*newResource*/) { return nullptr; }
 };
diff --git a/libs/drape/drape_tests/font_texture_tests.cpp b/libs/drape/drape_tests/font_texture_tests.cpp
index 72e6f0ba8..245633eb8 100644
--- a/libs/drape/drape_tests/font_texture_tests.cpp
+++ b/libs/drape/drape_tests/font_texture_tests.cpp
@@ -134,4 +134,4 @@ UNIT_TEST(UploadingGlyphs)
   RunTestLoop("UploadingGlyphs", std::bind(&UploadedRender::Render, &r, _1));
   DrapeRoutine::Shutdown();
 }
-*/
\ No newline at end of file
+*/
diff --git a/libs/drape/drape_tests/gl_functions.cpp b/libs/drape/drape_tests/gl_functions.cpp
index 9ef2210fc..659b6f2f4 100644
--- a/libs/drape/drape_tests/gl_functions.cpp
+++ b/libs/drape/drape_tests/gl_functions.cpp
@@ -114,8 +114,7 @@ int8_t GLFunctions::glGetAttribLocation(uint32_t programID, std::string const &
   return MOCK_CALL(glGetAttribLocation(programID, name));
 }
 
-void GLFunctions::glBindAttribLocation(uint32_t programID, uint8_t index, std::string const & name)
-{}
+void GLFunctions::glBindAttribLocation(uint32_t programID, uint8_t index, std::string const & name) {}
 
 // Enable vertex attribute binding. To get attributeLocation need to call glGetAttributeLocation.
 void GLFunctions::glEnableVertexAttribute(int32_t attributeLocation)
@@ -123,12 +122,8 @@ void GLFunctions::glEnableVertexAttribute(int32_t attributeLocation)
   MOCK_CALL(glEnableVertexAttribute(attributeLocation));
 }
 
-void GLFunctions::glVertexAttributePointer(int32_t attrLocation,
-                                           uint32_t count,
-                                           glConst type,
-                                           bool needNormalize,
-                                           uint32_t stride,
-                                           uint32_t offset)
+void GLFunctions::glVertexAttributePointer(int32_t attrLocation, uint32_t count, glConst type, bool needNormalize,
+                                           uint32_t stride, uint32_t offset)
 {
   MOCK_CALL(glVertexAttributePointer(attrLocation, count, type, needNormalize, stride, offset));
 }
@@ -195,11 +190,11 @@ bool GLFunctions::glHasExtension(std::string const & extName)
 
 int32_t GLFunctions::glGetProgramiv(uint32_t program, glConst paramName)
 {
- return MOCK_CALL(glGetProgramiv(program, paramName));
+  return MOCK_CALL(glGetProgramiv(program, paramName));
 }
 
-void GLFunctions::glGetActiveUniform(uint32_t programID, uint32_t uniformIndex,
-                                     int32_t * uniformSize, glConst * type, std::string & name)
+void GLFunctions::glGetActiveUniform(uint32_t programID, uint32_t uniformIndex, int32_t * uniformSize, glConst * type,
+                                     std::string & name)
 {
   MOCK_CALL(glGetActiveUniform(programID, uniformIndex, uniformSize, type, name));
 }
@@ -230,7 +225,8 @@ void GLFunctions::glTexImage2D(int width, int height, glConst layout, glConst pi
   MOCK_CALL(glTexImage2D(width, height, layout, pixelType, data));
 }
 
-void GLFunctions::glTexSubImage2D(int x, int y, int width, int height, glConst layout, glConst pixelType, void const * data)
+void GLFunctions::glTexSubImage2D(int x, int y, int width, int height, glConst layout, glConst pixelType,
+                                  void const * data)
 {
   MOCK_CALL(glTexSubImage2D(x, y, width, height, layout, pixelType, data));
 }
@@ -303,12 +299,15 @@ void GLFunctions::glBlendEquation(glConst function) {}
 
 void GLFunctions::glBlendFunc(glConst srcFactor, glConst dstFactor) {}
 
-bool GLFunctions::CanEnableDebugMessages() { return false; }
+bool GLFunctions::CanEnableDebugMessages()
+{
+  return false;
+}
 
 void GLFunctions::glDebugMessageCallback(TglDebugProc messageCallback, void * userParam) {}
 
-void GLFunctions::glDebugMessageControl(glConst source, glConst type, glConst severity,
-                                        int32_t count, uint32_t const * ids, uint8_t enabled)
+void GLFunctions::glDebugMessageControl(glConst source, glConst type, glConst severity, int32_t count,
+                                        uint32_t const * ids, uint8_t enabled)
 {}
 
 void GLFunctions::glDisable(glConst mode) {}
@@ -317,14 +316,19 @@ void GLFunctions::glDepthFunc(glConst depthFunc) {}
 
 void GLFunctions::glUniformValueiv(int8_t location, int32_t * v, uint32_t size) {}
 
-void * GLFunctions::glMapBuffer(glConst, glConst) { return 0; }
+void * GLFunctions::glMapBuffer(glConst, glConst)
+{
+  return 0;
+}
 
-void * GLFunctions::glMapBufferRange(glConst, uint32_t, uint32_t, glConst) { return 0; }
+void * GLFunctions::glMapBufferRange(glConst, uint32_t, uint32_t, glConst)
+{
+  return 0;
+}
 
 void GLFunctions::glUnmapBuffer(glConst target) {}
 
-void GLFunctions::glDrawElements(glConst primitive, uint32_t sizeOfIndex,
-                                 uint32_t indexCount, uint32_t startIndex) {}
+void GLFunctions::glDrawElements(glConst primitive, uint32_t sizeOfIndex, uint32_t indexCount, uint32_t startIndex) {}
 
 void GLFunctions::glDrawArrays(glConst mode, int32_t first, uint32_t count) {}
 
diff --git a/libs/drape/drape_tests/gl_mock_functions.cpp b/libs/drape/drape_tests/gl_mock_functions.cpp
index 893a5065b..50c25ac42 100644
--- a/libs/drape/drape_tests/gl_mock_functions.cpp
+++ b/libs/drape/drape_tests/gl_mock_functions.cpp
@@ -2,7 +2,7 @@
 
 namespace emul
 {
-void GLMockFunctions::Init(int * argc, char **argv)
+void GLMockFunctions::Init(int * argc, char ** argv)
 {
   ::testing::InitGoogleMock(argc, argv);
   m_mock = new GLMockFunctions();
diff --git a/libs/drape/drape_tests/gl_mock_functions.hpp b/libs/drape/drape_tests/gl_mock_functions.hpp
index bfb4fd237..8a261eb68 100644
--- a/libs/drape/drape_tests/gl_mock_functions.hpp
+++ b/libs/drape/drape_tests/gl_mock_functions.hpp
@@ -58,20 +58,15 @@ public:
 
   MOCK_METHOD2(glGetAttribLocation, int32_t(uint32_t programID, std::string const & name));
   MOCK_METHOD1(glEnableVertexAttribute, void(int32_t attributeLocation));
-  MOCK_METHOD6(glVertexAttributePointer, void(int32_t attrLocation,
-                                             uint32_t count,
-                                             glConst type,
-                                             bool needNormalize,
-                                             uint32_t stride,
-                                             uint32_t offset));
+  MOCK_METHOD6(glVertexAttributePointer, void(int32_t attrLocation, uint32_t count, glConst type, bool needNormalize,
+                                              uint32_t stride, uint32_t offset));
 
   MOCK_METHOD1(glUseProgram, void(uint32_t programID));
   MOCK_METHOD1(glHasExtension, bool(std::string const & extName));
 
   MOCK_METHOD2(glGetProgramiv, int32_t(uint32_t, glConst));
 
-  MOCK_METHOD5(glGetActiveUniform, void(uint32_t, uint32_t, int32_t*, glConst *,
-                                        std::string &));
+  MOCK_METHOD5(glGetActiveUniform, void(uint32_t, uint32_t, int32_t *, glConst *, std::string &));
 
   // Texture functions
   MOCK_METHOD1(glActiveTexture, void(glConst));
diff --git a/libs/drape/drape_tests/glyph_mng_tests.cpp b/libs/drape/drape_tests/glyph_mng_tests.cpp
index da1a2b902..fa53a8117 100644
--- a/libs/drape/drape_tests/glyph_mng_tests.cpp
+++ b/libs/drape/drape_tests/glyph_mng_tests.cpp
@@ -32,7 +32,7 @@ class GlyphRenderer
   int m_fontPixelSize;
   char const * m_lang;
 
-  static constexpr FT_Int kSdfSpread {dp::kSdfBorder};
+  static constexpr FT_Int kSdfSpread{dp::kSdfBorder};
 
 public:
   GlyphRenderer()
@@ -51,10 +51,7 @@ public:
     m_mng = std::make_unique<dp::GlyphManager>(args);
   }
 
-  ~GlyphRenderer()
-  {
-    FT_Done_FreeType(m_freetypeLibrary);
-  }
+  ~GlyphRenderer() { FT_Done_FreeType(m_freetypeLibrary); }
 
   void SetString(std::string const & s, int fontPixelSize, char const * lang)
   {
@@ -71,7 +68,7 @@ public:
 
   static float PixelColorFromDistance(float distance)
   {
-    //float const normalizedDistance = (distance - 128.f) / 128.f;
+    // float const normalizedDistance = (distance - 128.f) / 128.f;
     float const normalizedDistance = distance / 255.f;
     static constexpr float kFontScale = 1.f;
     static constexpr float kSmoothing = 0.25f / (kSdfSpread * kFontScale);
@@ -131,7 +128,7 @@ public:
         currentPen.rx() += glyph.m_xOffset;
         currentPen.ry() -= glyph.m_yOffset + h;
         painter.drawImage(currentPen, CreateImage(w, h, img.m_data->data()),
-            QRect(dp::kSdfBorder, dp::kSdfBorder, w - 2 * dp::kSdfBorder, h - 2 * dp::kSdfBorder));
+                          QRect(dp::kSdfBorder, dp::kSdfBorder, w - 2 * dp::kSdfBorder, h - 2 * dp::kSdfBorder));
       }
       pen += QPoint(glyph.m_xAdvance, glyph.m_yAdvance /* 0 for horizontal texts */);
 
@@ -150,7 +147,8 @@ public:
       for (auto const & segment : runs.m_segments)
       {
         hb_buffer_t * buf = hb_buffer_create();
-        hb_buffer_add_utf16(buf, reinterpret_cast<const uint16_t *>(runs.m_text.data()), runs.m_text.size(), segment.m_start, segment.m_length);
+        hb_buffer_add_utf16(buf, reinterpret_cast<uint16_t const *>(runs.m_text.data()), runs.m_text.size(),
+                            segment.m_start, segment.m_length);
         hb_buffer_set_direction(buf, segment.m_direction);
         hb_buffer_set_script(buf, segment.m_script);
         hb_buffer_set_language(buf, hbLanguage);
@@ -164,12 +162,13 @@ public:
         auto reader = GetPlatform().GetReader("fonts/" + fontFileName);
         auto fontFile = reader->GetName();
         FT_Face face;
-        if (FT_New_Face(m_freetypeLibrary, fontFile.c_str(), 0, &face)) {
+        if (FT_New_Face(m_freetypeLibrary, fontFile.c_str(), 0, &face))
+        {
           std::cerr << "Can't load font " << fontFile << '\n';
           return;
         }
         // Set character size
-        FT_Set_Pixel_Sizes(face, 0 , m_fontPixelSize );
+        FT_Set_Pixel_Sizes(face, 0, m_fontPixelSize);
         // This also works.
         // if (FT_Set_Char_Size(face, 0, m_fontPixelSize << 6, 0, 0)) {
         //   std::cerr << "Can't set character size\n";
@@ -177,24 +176,24 @@ public:
         // }
 
         // Set no transform (identity)
-        //FT_Set_Transform(face, nullptr, nullptr);
+        // FT_Set_Transform(face, nullptr, nullptr);
 
         // Load font into HarfBuzz
-        hb_font_t *font = hb_ft_font_create(face, nullptr);
+        hb_font_t * font = hb_ft_font_create(face, nullptr);
 
         // Shape!
         hb_shape(font, buf, nullptr, 0);
 
         // Get the glyph and position information.
         unsigned int glyph_count;
-        hb_glyph_info_t *glyph_info    = hb_buffer_get_glyph_infos(buf, &glyph_count);
-        hb_glyph_position_t *glyph_pos = hb_buffer_get_glyph_positions(buf, &glyph_count);
+        hb_glyph_info_t * glyph_info = hb_buffer_get_glyph_infos(buf, &glyph_count);
+        hb_glyph_position_t * glyph_pos = hb_buffer_get_glyph_positions(buf, &glyph_count);
 
         for (unsigned int i = 0; i < glyph_count; i++)
         {
           hb_codepoint_t const glyphid = glyph_info[i].codepoint;
 
-          FT_Int32 const flags =  FT_LOAD_RENDER;
+          FT_Int32 const flags = FT_LOAD_RENDER;
           FT_Load_Glyph(face, glyphid, flags);
           FT_Render_Glyph(face->glyph, FT_RENDER_MODE_SDF);
 
@@ -217,12 +216,12 @@ public:
             }
           }
 
-          auto const bearing_x = slot->metrics.horiBearingX;//slot->bitmap_left;
-          auto const bearing_y = slot->metrics.horiBearingY;//slot->bitmap_top;
+          auto const bearing_x = slot->metrics.horiBearingX;  // slot->bitmap_left;
+          auto const bearing_y = slot->metrics.horiBearingY;  // slot->bitmap_top;
 
           auto const & glyphPos = glyph_pos[i];
-          hb_position_t const x_offset  = (glyphPos.x_offset + bearing_x) >> 6;
-          hb_position_t const y_offset  = (glyphPos.y_offset + bearing_y) >> 6;
+          hb_position_t const x_offset = (glyphPos.x_offset + bearing_x) >> 6;
+          hb_position_t const y_offset = (glyphPos.y_offset + bearing_y) >> 6;
           hb_position_t const x_advance = glyphPos.x_advance >> 6;
           hb_position_t const y_advance = glyphPos.y_advance >> 6;
 
@@ -232,7 +231,8 @@ public:
             QPoint currentPen = pen;
             currentPen.rx() += x_offset;
             currentPen.ry() -= y_offset;
-            painter.drawImage(currentPen, CreateImage(width, height, buffer), QRect(kSdfSpread, kSdfSpread, width - 2*kSdfSpread, height - 2*kSdfSpread));
+            painter.drawImage(currentPen, CreateImage(width, height, buffer),
+                              QRect(kSdfSpread, kSdfSpread, width - 2 * kSdfSpread, height - 2 * kSdfSpread));
           }
           pen += QPoint(x_advance, y_advance);
         }
@@ -250,14 +250,13 @@ public:
       pen.rx() = kLineStartX;
       pen.ry() += kLineMarginY;
 
-      //QFont font("Noto Naskh Arabic");
+      // QFont font("Noto Naskh Arabic");
       QFont font("Roboto");
       font.setPixelSize(m_fontPixelSize);
-      //font.setWeight(QFont::Weight::Normal);
+      // font.setWeight(QFont::Weight::Normal);
       painter.setFont(font);
       painter.drawText(pen, QString::fromUtf8(m_utf8.c_str(), m_utf8.size()));
     }
-
   }
 
 private:
@@ -286,16 +285,33 @@ UNIT_TEST(GlyphLoadingTest)
   renderer.SetString("𫝚 𫝛 𫝜", fontSize, "zh");
   RunTestLoop("CJK Surrogates", std::bind(&GlyphRenderer::RenderGlyphs, &renderer, _1));
 
-  renderer.SetString("الحلّة گلها"" كسول الزنجبيل القط""56""عين علي (الحربية)""123"" اَلْعَرَبِيَّةُ", fontSize, "ar");
+  renderer.SetString(
+      "الحلّة گلها"
+      " كسول الزنجبيل القط"
+      "56"
+      "عين علي (الحربية)"
+      "123"
+      " اَلْعَرَبِيَّةُ",
+      fontSize, "ar");
   RunTestLoop("Arabic1", std::bind(&GlyphRenderer::RenderGlyphs, &renderer, _1));
 
-  renderer.SetString("12345""گُلها""12345""گُلها""12345", fontSize, "ar");
+  renderer.SetString(
+      "12345"
+      "گُلها"
+      "12345"
+      "گُلها"
+      "12345",
+      fontSize, "ar");
   RunTestLoop("Arabic2", std::bind(&GlyphRenderer::RenderGlyphs, &renderer, _1));
 
   renderer.SetString("മനക്കലപ്പടി", fontSize, "ml");
   RunTestLoop("Malay", std::bind(&GlyphRenderer::RenderGlyphs, &renderer, _1));
 
-  renderer.SetString("Test 12 345 ""گُلها""678 9000 Test", fontSize, "ar");
+  renderer.SetString(
+      "Test 12 345 "
+      "گُلها"
+      "678 9000 Test",
+      fontSize, "ar");
   RunTestLoop("Arabic Mixed", std::bind(&GlyphRenderer::RenderGlyphs, &renderer, _1));
 
   renderer.SetString("NFKC Razdoĺny NFKD Razdoĺny", fontSize, "be");
diff --git a/libs/drape/drape_tests/glyph_packer_test.cpp b/libs/drape/drape_tests/glyph_packer_test.cpp
index 3004cd65f..aa7831281 100644
--- a/libs/drape/drape_tests/glyph_packer_test.cpp
+++ b/libs/drape/drape_tests/glyph_packer_test.cpp
@@ -1,5 +1,5 @@
-#include "testing/testing.hpp"
 #include "drape/font_texture.hpp"
+#include "testing/testing.hpp"
 
 UNIT_TEST(SimplePackTest)
 {
@@ -20,7 +20,7 @@ UNIT_TEST(SimplePackTest)
   TEST(!packer.IsFull(), ());
   TEST_EQUAL(r, m2::RectU(0, 15, 7, 25), ());
 
-  TEST(!packer.PackGlyph(12, 18, r),());
+  TEST(!packer.PackGlyph(12, 18, r), ());
   TEST(packer.IsFull(), ());
   TEST_EQUAL(r, m2::RectU(0, 15, 7, 25), ());
 }
diff --git a/libs/drape/drape_tests/harfbuzz_shaping_test.cpp b/libs/drape/drape_tests/harfbuzz_shaping_test.cpp
index fc8053efd..344cc144c 100644
--- a/libs/drape/drape_tests/harfbuzz_shaping_test.cpp
+++ b/libs/drape/drape_tests/harfbuzz_shaping_test.cpp
@@ -1,13 +1,13 @@
-#include "testing/testing.hpp"
 #include "drape/harfbuzz_shaping.hpp"
+#include "testing/testing.hpp"
 
 namespace harfbuzz_shaping
 {
 
 bool operator==(TextSegment const & s1, TextSegment const & s2)
 {
-  return s1.m_start == s2.m_start && s1.m_length == s2.m_length
-      && s1.m_script == s2.m_script && s1.m_direction == s2.m_direction;
+  return s1.m_start == s2.m_start && s1.m_length == s2.m_length && s1.m_script == s2.m_script &&
+         s1.m_direction == s2.m_direction;
 }
 
 UNIT_TEST(GetTextSegments)
@@ -15,14 +15,12 @@ UNIT_TEST(GetTextSegments)
   auto const [text, segments] = GetTextSegments("Map data © OpenStreetMap");
   TEST(text == u"Map data © OpenStreetMap", ());
 
-  std::vector<TextSegment> const expected {
-    {0, 3, HB_SCRIPT_LATIN, HB_DIRECTION_LTR},
-    {3, 1, HB_SCRIPT_COMMON, HB_DIRECTION_LTR},
-    {4, 4, HB_SCRIPT_LATIN, HB_DIRECTION_LTR},
-    {8, 3, HB_SCRIPT_COMMON, HB_DIRECTION_LTR},
-    {11, 13, HB_SCRIPT_LATIN, HB_DIRECTION_LTR},
+  std::vector<TextSegment> const expected{
+      {0, 3, HB_SCRIPT_LATIN, HB_DIRECTION_LTR},   {3, 1, HB_SCRIPT_COMMON, HB_DIRECTION_LTR},
+      {4, 4, HB_SCRIPT_LATIN, HB_DIRECTION_LTR},   {8, 3, HB_SCRIPT_COMMON, HB_DIRECTION_LTR},
+      {11, 13, HB_SCRIPT_LATIN, HB_DIRECTION_LTR},
   };
 
   TEST_EQUAL(segments, expected, ());
 }
-}  // namespace harfbuzz_shaping
\ No newline at end of file
+}  // namespace harfbuzz_shaping
diff --git a/libs/drape/drape_tests/img.hpp b/libs/drape/drape_tests/img.hpp
index 3efda8946..52ba3b2fa 100644
--- a/libs/drape/drape_tests/img.hpp
+++ b/libs/drape/drape_tests/img.hpp
@@ -2,4 +2,4 @@
 
 #include <QtGui/QImage>
 
-QImage CreateImage(uint32_t w, uint32_t h, const uint8_t * mem);
+QImage CreateImage(uint32_t w, uint32_t h, uint8_t const * mem);
diff --git a/libs/drape/drape_tests/memory_comparer.hpp b/libs/drape/drape_tests/memory_comparer.hpp
index a6c3feaaf..ef1e39f05 100644
--- a/libs/drape/drape_tests/memory_comparer.hpp
+++ b/libs/drape/drape_tests/memory_comparer.hpp
@@ -20,17 +20,16 @@ struct MemoryComparer
     TEST_EQUAL(memcmp(m_mem, data, size), 0, ());
   }
 
-  void cmpSubImage(uint32_t /*x*/, uint32_t /*y*/, uint32_t width, uint32_t height, glConst layout,
-                   glConst pixelFormat, void const * data) const
+  void cmpSubImage(uint32_t /*x*/, uint32_t /*y*/, uint32_t width, uint32_t height, glConst layout, glConst pixelFormat,
+                   void const * data) const
   {
     uint32_t channelCount = 0;
     if (layout == gl_const::GLRGBA || layout == gl_const::GLRGBA8 || layout == gl_const::GLRGBA4)
       channelCount = 4;
     else if (layout == gl_const::GLRGB)
       channelCount = 3;
-    else if (layout == gl_const::GLAlpha || layout == gl_const::GLAlpha8 ||
-             layout == gl_const::GLLuminance || layout == gl_const::GLLuminance8 ||
-             layout == gl_const::GLAlphaLuminance || layout == gl_const::GLRed)
+    else if (layout == gl_const::GLAlpha || layout == gl_const::GLAlpha8 || layout == gl_const::GLLuminance ||
+             layout == gl_const::GLLuminance8 || layout == gl_const::GLAlphaLuminance || layout == gl_const::GLRed)
     {
       channelCount = 1;
     }
diff --git a/libs/drape/drape_tests/pointers_tests.cpp b/libs/drape/drape_tests/pointers_tests.cpp
index 7909addc2..f7182455a 100644
--- a/libs/drape/drape_tests/pointers_tests.cpp
+++ b/libs/drape/drape_tests/pointers_tests.cpp
@@ -1,5 +1,5 @@
-#include "testing/testing.hpp"
 #include "drape/pointers.hpp"
+#include "testing/testing.hpp"
 
 #include "base/base.hpp"
 
@@ -23,7 +23,7 @@ bool OnAssertRaised(base::SrcPoint const & /* srcPoint */, std::string const & /
   return false;
 }
 #endif
-}
+}  // namespace
 
 UNIT_TEST(PointersTrackingTest)
 {
@@ -33,7 +33,7 @@ UNIT_TEST(PointersTrackingTest)
 
   drape_ptr<Tester> ptr = make_unique_dp<Tester>();
   void * ptrAddress = ptr.get();
-  std::string const ptrTypeName = typeid(Tester*).name();
+  std::string const ptrTypeName = typeid(Tester *).name();
 
   // no references
   TEST(alivePointers.find(ptrAddress) == alivePointers.end(), ());
diff --git a/libs/drape/drape_tests/static_texture_tests.cpp b/libs/drape/drape_tests/static_texture_tests.cpp
index 45daabf84..c3d2dce78 100644
--- a/libs/drape/drape_tests/static_texture_tests.cpp
+++ b/libs/drape/drape_tests/static_texture_tests.cpp
@@ -12,10 +12,8 @@
 UNIT_TEST(CheckTrafficArrowTextures)
 {
   static std::vector<std::string> skinPaths = {"6plus", "mdpi", "hdpi", "xhdpi", "xxhdpi", "xxxhdpi"};
-  static std::vector<MapStyle> styles = {MapStyle::MapStyleDefaultLight,
-                                         MapStyle::MapStyleDefaultDark,
-                                         MapStyle::MapStyleVehicleLight,
-                                         MapStyle::MapStyleVehicleDark};
+  static std::vector<MapStyle> styles = {MapStyle::MapStyleDefaultLight, MapStyle::MapStyleDefaultDark,
+                                         MapStyle::MapStyleVehicleLight, MapStyle::MapStyleVehicleDark};
 
   TestingGraphicsContext context;
   for (auto const & style : styles)
@@ -23,12 +21,10 @@ UNIT_TEST(CheckTrafficArrowTextures)
     GetStyleReader().SetCurrentStyle(style);
     for (auto const & skinPath : skinPaths)
     {
-      dp::StaticTexture texture(make_ref(&context), "traffic-arrow.png", skinPath,
-                                dp::TextureFormat::RGBA8, nullptr);
+      dp::StaticTexture texture(make_ref(&context), "traffic-arrow.png", skinPath, dp::TextureFormat::RGBA8, nullptr);
       TEST(texture.IsLoadingCorrect(), ());
 
-      dp::StaticTexture texture2(make_ref(&context), "area-hatching.png", skinPath,
-                                 dp::TextureFormat::RGBA8, nullptr);
+      dp::StaticTexture texture2(make_ref(&context), "area-hatching.png", skinPath, dp::TextureFormat::RGBA8, nullptr);
       TEST(texture2.IsLoadingCorrect(), ());
     }
   }
diff --git a/libs/drape/drape_tests/stipple_pen_tests.cpp b/libs/drape/drape_tests/stipple_pen_tests.cpp
index 0d1cce5c9..2c3d6a119 100644
--- a/libs/drape/drape_tests/stipple_pen_tests.cpp
+++ b/libs/drape/drape_tests/stipple_pen_tests.cpp
@@ -1,13 +1,12 @@
 #include "testing/testing.hpp"
 
-#include "drape/drape_tests/memory_comparer.hpp"
 #include "drape/drape_tests/dummy_texture.hpp"
+#include "drape/drape_tests/memory_comparer.hpp"
 
 #include "drape/stipple_pen_resource.hpp"
 #include "drape/texture.hpp"
 #include "drape/tm_read_resources.hpp"
 
-
 namespace stipple_pen_tests
 {
 using namespace dp;
@@ -16,15 +15,13 @@ namespace
 {
 void TestPacker(StipplePenPacker & packer, uint32_t width, m2::RectU const & expect)
 {
-  TEST_EQUAL(packer.PackResource({ width, 1 }), expect, ());
+  TEST_EQUAL(packer.PackResource({width, 1}), expect, ());
 }
 
 bool IsRectsEqual(m2::RectF const & r1, m2::RectF const & r2)
 {
-  return AlmostEqualULPs(r1.minX(), r2.minX()) &&
-         AlmostEqualULPs(r1.minY(), r2.minY()) &&
-         AlmostEqualULPs(r1.maxX(), r2.maxX()) &&
-         AlmostEqualULPs(r1.maxY(), r2.maxY());
+  return AlmostEqualULPs(r1.minX(), r2.minX()) && AlmostEqualULPs(r1.minY(), r2.minY()) &&
+         AlmostEqualULPs(r1.maxX(), r2.maxX()) && AlmostEqualULPs(r1.maxY(), r2.maxY());
 }
 }  // namespace
 
@@ -38,8 +35,7 @@ UNIT_TEST(StippleTest_Pack)
   TestPacker(packer, 249, m2::RectU(0, 4, 249, 5));
 
   m2::RectF mapped = packer.MapTextureCoords(m2::RectU(0, 0, 256, 1));
-  TEST(IsRectsEqual(mapped, m2::RectF(0.5f / 512.0f, 0.5f / 8.0f,
-                                      255.5f / 512.0f, 0.5f / 8.0f)), ());
+  TEST(IsRectsEqual(mapped, m2::RectF(0.5f / 512.0f, 0.5f / 8.0f, 255.5f / 512.0f, 0.5f / 8.0f)), ());
 }
 
 UNIT_TEST(StippleTest_EqualPatterns)
@@ -56,12 +52,10 @@ UNIT_TEST(StippleTest_EqualPatterns)
 
   auto const IsEqualPatterns = [](PatternT const & p1, PatternT const & p2)
   {
-    for (double scale : { 1, 2, 3 })
-    {
+    for (double scale : {1, 2, 3})
       if ((PatternFloat2Pixel(scale * p1[0]) != PatternFloat2Pixel(scale * p2[0])) ||
           (PatternFloat2Pixel(scale * p1[1]) != PatternFloat2Pixel(scale * p2[1])))
         return false;
-    }
     return true;
   };
   auto const IsAlmostEqualPatterns = [](PatternT const & p1, PatternT const & p2)
@@ -74,12 +68,10 @@ UNIT_TEST(StippleTest_EqualPatterns)
   for (size_t i = 0; i < count - 1; ++i)
   {
     for (size_t j = i + 1; j < count; ++j)
-    {
       if (IsEqualPatterns(patterns[i], patterns[j]))
         LOG(LINFO, ("Equal:", patterns[i], patterns[j]));
       else if (IsAlmostEqualPatterns(patterns[i], patterns[j]))
         LOG(LINFO, ("Almost equal:", patterns[i], patterns[j]));
-    }
   }
 }
-} // namespace stipple_pen_tests
+}  // namespace stipple_pen_tests
diff --git a/libs/drape/drape_tests/testing_graphics_context.hpp b/libs/drape/drape_tests/testing_graphics_context.hpp
index e7f3d1da7..daa23897c 100644
--- a/libs/drape/drape_tests/testing_graphics_context.hpp
+++ b/libs/drape/drape_tests/testing_graphics_context.hpp
@@ -32,8 +32,9 @@ public:
   void SetDepthTestFunction(dp::TestFunction depthFunction) override {}
   void SetStencilTestEnabled(bool enabled) override {}
   void SetStencilFunction(dp::StencilFace face, dp::TestFunction stencilFunction) override {}
-  void SetStencilActions(dp::StencilFace face, dp::StencilAction stencilFailAction,
-                         dp::StencilAction depthFailAction, dp::StencilAction passAction) override {}
+  void SetStencilActions(dp::StencilFace face, dp::StencilAction stencilFailAction, dp::StencilAction depthFailAction,
+                         dp::StencilAction passAction) override
+  {}
   void SetStencilReferenceValue(uint32_t stencilReferenceValue) override {}
   void SetCullingEnabled(bool enabled) override {}
 
diff --git a/libs/drape/drape_tests/texture_of_colors_tests.cpp b/libs/drape/drape_tests/texture_of_colors_tests.cpp
index 1e3974a97..b336be4de 100644
--- a/libs/drape/drape_tests/texture_of_colors_tests.cpp
+++ b/libs/drape/drape_tests/texture_of_colors_tests.cpp
@@ -5,19 +5,19 @@
 #include "drape/drape_tests/testing_graphics_context.hpp"
 
 #include "drape/gl_constants.hpp"
-#include "drape/texture_of_colors.hpp"
 #include "drape/texture.hpp"
+#include "drape/texture_of_colors.hpp"
 
 #include "drape/drape_tests/gl_mock_functions.hpp"
 
 #include <gmock/gmock.h>
 
 using testing::_;
-using testing::Return;
+using testing::AnyOf;
+using testing::IgnoreResult;
 using testing::InSequence;
 using testing::Invoke;
-using testing::IgnoreResult;
-using testing::AnyOf;
+using testing::Return;
 using namespace dp;
 
 namespace
@@ -48,11 +48,9 @@ void InitOpenGLTextures(int const w, int const h)
 class DummyColorPallete : public ColorPalette
 {
   typedef ColorPalette TBase;
+
 public:
-  explicit DummyColorPallete(m2::PointU const & size)
-    : TBase(size)
-  {
-  }
+  explicit DummyColorPallete(m2::PointU const & size) : TBase(size) {}
 
   ref_ptr<Texture::ResourceInfo> MapResource(ColorKey const & key)
   {
@@ -61,7 +59,7 @@ public:
   }
 };
 
-}
+}  // namespace
 
 UNIT_TEST(ColorPalleteMappingTests)
 {
@@ -74,18 +72,15 @@ UNIT_TEST(ColorPalleteMappingTests)
   TEST_NOT_EQUAL(info1, info2, ());
   TEST_EQUAL(info1, info3, ());
 
-  TestRects(info1->GetTexRect(), m2::RectF(1.0f / 32.0f, 1.0f / 16,
-                                           1.0f / 32.0f, 1.0f / 16));
-  TestRects(info2->GetTexRect(), m2::RectF(3.0f / 32.0f, 1.0f / 16,
-                                           3.0f / 32.0f, 1.0f / 16));
-  TestRects(info3->GetTexRect(), m2::RectF(1.0f / 32.0f, 1.0f / 16,
-                                           1.0f / 32.0f, 1.0f / 16));
+  TestRects(info1->GetTexRect(), m2::RectF(1.0f / 32.0f, 1.0f / 16, 1.0f / 32.0f, 1.0f / 16));
+  TestRects(info2->GetTexRect(), m2::RectF(3.0f / 32.0f, 1.0f / 16, 3.0f / 32.0f, 1.0f / 16));
+  TestRects(info3->GetTexRect(), m2::RectF(1.0f / 32.0f, 1.0f / 16, 1.0f / 32.0f, 1.0f / 16));
 
   for (int i = 2; i < 100; ++i)
     cp.MapResource(dp::ColorKey(dp::Color(i, i, i, i)));
 
   TestRects(cp.MapResource(dp::ColorKey(dp::Color(54, 54, 54, 54)))->GetTexRect(),
-                           m2::RectF(13.0f / 32.0f, 7.0f / 16.0f, 13.0f / 32.0f, 7.0f / 16.0f));
+            m2::RectF(13.0f / 32.0f, 7.0f / 16.0f, 13.0f / 32.0f, 7.0f / 16.0f));
 }
 
 UNIT_TEST(ColorPalleteUploadingSingleRow)
@@ -113,29 +108,28 @@ UNIT_TEST(ColorPalleteUploadingSingleRow)
     cp.MapResource(dp::ColorKey(dp::Color(0, 0, 0, 0xFF)));
     cp.MapResource(dp::ColorKey(dp::Color(0xAA, 0xBB, 0xCC, 0xDD)));
 
-    uint8_t memoryEtalon[] =
-    {
-      0xFF, 0x00, 0x00, 0x00, // 1 pixel (1st row)
-      0xFF, 0x00, 0x00, 0x00, // 1 pixel (1st row)
-      0x00, 0xFF, 0x00, 0x00, // 2 pixel (1st row)
-      0x00, 0xFF, 0x00, 0x00, // 2 pixel (1st row)
-      0x00, 0x00, 0xFF, 0x00, // 3 pixel (1st row)
-      0x00, 0x00, 0xFF, 0x00, // 3 pixel (1st row)
-      0x00, 0x00, 0x00, 0xFF, // 4 pixel (1st row)
-      0x00, 0x00, 0x00, 0xFF, // 4 pixel (1st row)
-      0xAA, 0xBB, 0xCC, 0xDD, // 5 pixel (1st row)
-      0xAA, 0xBB, 0xCC, 0xDD, // 5 pixel (1st row)
+    uint8_t memoryEtalon[] = {
+        0xFF, 0x00, 0x00, 0x00,  // 1 pixel (1st row)
+        0xFF, 0x00, 0x00, 0x00,  // 1 pixel (1st row)
+        0x00, 0xFF, 0x00, 0x00,  // 2 pixel (1st row)
+        0x00, 0xFF, 0x00, 0x00,  // 2 pixel (1st row)
+        0x00, 0x00, 0xFF, 0x00,  // 3 pixel (1st row)
+        0x00, 0x00, 0xFF, 0x00,  // 3 pixel (1st row)
+        0x00, 0x00, 0x00, 0xFF,  // 4 pixel (1st row)
+        0x00, 0x00, 0x00, 0xFF,  // 4 pixel (1st row)
+        0xAA, 0xBB, 0xCC, 0xDD,  // 5 pixel (1st row)
+        0xAA, 0xBB, 0xCC, 0xDD,  // 5 pixel (1st row)
 
-      0xFF, 0x00, 0x00, 0x00, // 1 pixel (2nd row)
-      0xFF, 0x00, 0x00, 0x00, // 1 pixel (2nd row)
-      0x00, 0xFF, 0x00, 0x00, // 2 pixel (2nd row)
-      0x00, 0xFF, 0x00, 0x00, // 2 pixel (2nd row)
-      0x00, 0x00, 0xFF, 0x00, // 3 pixel (2nd row)
-      0x00, 0x00, 0xFF, 0x00, // 3 pixel (2nd row)
-      0x00, 0x00, 0x00, 0xFF, // 4 pixel (2nd row)
-      0x00, 0x00, 0x00, 0xFF, // 4 pixel (2nd row)
-      0xAA, 0xBB, 0xCC, 0xDD, // 5 pixel (2nd row)
-      0xAA, 0xBB, 0xCC, 0xDD  // 5 pixel (2nd row)
+        0xFF, 0x00, 0x00, 0x00,  // 1 pixel (2nd row)
+        0xFF, 0x00, 0x00, 0x00,  // 1 pixel (2nd row)
+        0x00, 0xFF, 0x00, 0x00,  // 2 pixel (2nd row)
+        0x00, 0xFF, 0x00, 0x00,  // 2 pixel (2nd row)
+        0x00, 0x00, 0xFF, 0x00,  // 3 pixel (2nd row)
+        0x00, 0x00, 0xFF, 0x00,  // 3 pixel (2nd row)
+        0x00, 0x00, 0x00, 0xFF,  // 4 pixel (2nd row)
+        0x00, 0x00, 0x00, 0xFF,  // 4 pixel (2nd row)
+        0xAA, 0xBB, 0xCC, 0xDD,  // 5 pixel (2nd row)
+        0xAA, 0xBB, 0xCC, 0xDD   // 5 pixel (2nd row)
     };
 
     MemoryComparer cmp(memoryEtalon, ARRAY_SIZE(memoryEtalon));
@@ -152,29 +146,28 @@ UNIT_TEST(ColorPalleteUploadingSingleRow)
     cp.MapResource(dp::ColorKey(dp::Color(0xAA, 0, 0, 0xFF)));
     cp.MapResource(dp::ColorKey(dp::Color(0x00, 0xBB, 0xCC, 0xDD)));
 
-    uint8_t memoryEtalon[] =
-    {
-      0xFF, 0xAA, 0x00, 0x00, // 1 pixel (1st row)
-      0xFF, 0xAA, 0x00, 0x00, // 1 pixel (1st row)
-      0xAA, 0xFF, 0x00, 0x00, // 2 pixel (1st row)
-      0xAA, 0xFF, 0x00, 0x00, // 2 pixel (1st row)
-      0xAA, 0x00, 0xFF, 0x00, // 3 pixel (1st row)
-      0xAA, 0x00, 0xFF, 0x00, // 3 pixel (1st row)
-      0xAA, 0x00, 0x00, 0xFF, // 4 pixel (1st row)
-      0xAA, 0x00, 0x00, 0xFF, // 4 pixel (1st row)
-      0x00, 0xBB, 0xCC, 0xDD, // 5 pixel (1st row)
-      0x00, 0xBB, 0xCC, 0xDD, // 5 pixel (1st row)
+    uint8_t memoryEtalon[] = {
+        0xFF, 0xAA, 0x00, 0x00,  // 1 pixel (1st row)
+        0xFF, 0xAA, 0x00, 0x00,  // 1 pixel (1st row)
+        0xAA, 0xFF, 0x00, 0x00,  // 2 pixel (1st row)
+        0xAA, 0xFF, 0x00, 0x00,  // 2 pixel (1st row)
+        0xAA, 0x00, 0xFF, 0x00,  // 3 pixel (1st row)
+        0xAA, 0x00, 0xFF, 0x00,  // 3 pixel (1st row)
+        0xAA, 0x00, 0x00, 0xFF,  // 4 pixel (1st row)
+        0xAA, 0x00, 0x00, 0xFF,  // 4 pixel (1st row)
+        0x00, 0xBB, 0xCC, 0xDD,  // 5 pixel (1st row)
+        0x00, 0xBB, 0xCC, 0xDD,  // 5 pixel (1st row)
 
-      0xFF, 0xAA, 0x00, 0x00, // 1 pixel (2nd row)
-      0xFF, 0xAA, 0x00, 0x00, // 1 pixel (2nd row)
-      0xAA, 0xFF, 0x00, 0x00, // 2 pixel (2nd row)
-      0xAA, 0xFF, 0x00, 0x00, // 2 pixel (2nd row)
-      0xAA, 0x00, 0xFF, 0x00, // 3 pixel (2nd row)
-      0xAA, 0x00, 0xFF, 0x00, // 3 pixel (2nd row)
-      0xAA, 0x00, 0x00, 0xFF, // 4 pixel (2nd row)
-      0xAA, 0x00, 0x00, 0xFF, // 4 pixel (2nd row)
-      0x00, 0xBB, 0xCC, 0xDD, // 5 pixel (2nd row)
-      0x00, 0xBB, 0xCC, 0xDD  // 5 pixel (2nd row)
+        0xFF, 0xAA, 0x00, 0x00,  // 1 pixel (2nd row)
+        0xFF, 0xAA, 0x00, 0x00,  // 1 pixel (2nd row)
+        0xAA, 0xFF, 0x00, 0x00,  // 2 pixel (2nd row)
+        0xAA, 0xFF, 0x00, 0x00,  // 2 pixel (2nd row)
+        0xAA, 0x00, 0xFF, 0x00,  // 3 pixel (2nd row)
+        0xAA, 0x00, 0xFF, 0x00,  // 3 pixel (2nd row)
+        0xAA, 0x00, 0x00, 0xFF,  // 4 pixel (2nd row)
+        0xAA, 0x00, 0x00, 0xFF,  // 4 pixel (2nd row)
+        0x00, 0xBB, 0xCC, 0xDD,  // 5 pixel (2nd row)
+        0x00, 0xBB, 0xCC, 0xDD   // 5 pixel (2nd row)
     };
 
     MemoryComparer cmp(memoryEtalon, ARRAY_SIZE(memoryEtalon));
@@ -209,17 +202,16 @@ UNIT_TEST(ColorPalleteUploadingPartialyRow)
     cp.MapResource(dp::ColorKey(dp::Color(0xFF, 0, 0, 0)));
     cp.MapResource(dp::ColorKey(dp::Color(0xFF, 0xFF, 0, 0)));
 
-    uint8_t memoryEtalon[] =
-    {
-      0xFF, 0x00, 0x00, 0x00, // 1 pixel
-      0xFF, 0x00, 0x00, 0x00, // 1 pixel
-      0xFF, 0xFF, 0x00, 0x00, // 2 pixel
-      0xFF, 0xFF, 0x00, 0x00, // 2 pixel
+    uint8_t memoryEtalon[] = {
+        0xFF, 0x00, 0x00, 0x00,  // 1 pixel
+        0xFF, 0x00, 0x00, 0x00,  // 1 pixel
+        0xFF, 0xFF, 0x00, 0x00,  // 2 pixel
+        0xFF, 0xFF, 0x00, 0x00,  // 2 pixel
 
-      0xFF, 0x00, 0x00, 0x00, // 1 pixel
-      0xFF, 0x00, 0x00, 0x00, // 1 pixel
-      0xFF, 0xFF, 0x00, 0x00, // 2 pixel
-      0xFF, 0xFF, 0x00, 0x00  // 2 pixel
+        0xFF, 0x00, 0x00, 0x00,  // 1 pixel
+        0xFF, 0x00, 0x00, 0x00,  // 1 pixel
+        0xFF, 0xFF, 0x00, 0x00,  // 2 pixel
+        0xFF, 0xFF, 0x00, 0x00   // 2 pixel
     };
 
     MemoryComparer cmp(memoryEtalon, ARRAY_SIZE(memoryEtalon));
@@ -235,30 +227,28 @@ UNIT_TEST(ColorPalleteUploadingPartialyRow)
     cp.MapResource(dp::ColorKey(dp::Color(0xAA, 0xAA, 0xAA, 0)));
     cp.MapResource(dp::ColorKey(dp::Color(0xAA, 0xAA, 0xAA, 0xAA)));
 
-    uint8_t memoryEtalon1[] =
-    {
-      0xAA, 0x00, 0x00, 0x00, // 1 pixel
-      0xAA, 0x00, 0x00, 0x00, // 1 pixel
-      0xAA, 0xAA, 0x00, 0x00, // 2 pixel
-      0xAA, 0xAA, 0x00, 0x00, // 2 pixel
+    uint8_t memoryEtalon1[] = {
+        0xAA, 0x00, 0x00, 0x00,  // 1 pixel
+        0xAA, 0x00, 0x00, 0x00,  // 1 pixel
+        0xAA, 0xAA, 0x00, 0x00,  // 2 pixel
+        0xAA, 0xAA, 0x00, 0x00,  // 2 pixel
 
-      0xAA, 0x00, 0x00, 0x00, // 1 pixel
-      0xAA, 0x00, 0x00, 0x00, // 1 pixel
-      0xAA, 0xAA, 0x00, 0x00, // 2 pixel
-      0xAA, 0xAA, 0x00, 0x00  // 2 pixel
+        0xAA, 0x00, 0x00, 0x00,  // 1 pixel
+        0xAA, 0x00, 0x00, 0x00,  // 1 pixel
+        0xAA, 0xAA, 0x00, 0x00,  // 2 pixel
+        0xAA, 0xAA, 0x00, 0x00   // 2 pixel
     };
 
-    uint8_t memoryEtalon2[] =
-    {
-      0xAA, 0xAA, 0xAA, 0x00, // 1 pixel
-      0xAA, 0xAA, 0xAA, 0x00, // 1 pixel
-      0xAA, 0xAA, 0xAA, 0xAA, // 2 pixel
-      0xAA, 0xAA, 0xAA, 0xAA, // 2 pixel
+    uint8_t memoryEtalon2[] = {
+        0xAA, 0xAA, 0xAA, 0x00,  // 1 pixel
+        0xAA, 0xAA, 0xAA, 0x00,  // 1 pixel
+        0xAA, 0xAA, 0xAA, 0xAA,  // 2 pixel
+        0xAA, 0xAA, 0xAA, 0xAA,  // 2 pixel
 
-      0xAA, 0xAA, 0xAA, 0x00, // 1 pixel
-      0xAA, 0xAA, 0xAA, 0x00, // 1 pixel
-      0xAA, 0xAA, 0xAA, 0xAA, // 2 pixel
-      0xAA, 0xAA, 0xAA, 0xAA  // 2 pixel
+        0xAA, 0xAA, 0xAA, 0x00,  // 1 pixel
+        0xAA, 0xAA, 0xAA, 0x00,  // 1 pixel
+        0xAA, 0xAA, 0xAA, 0xAA,  // 2 pixel
+        0xAA, 0xAA, 0xAA, 0xAA   // 2 pixel
     };
 
     MemoryComparer cmp1(memoryEtalon1, ARRAY_SIZE(memoryEtalon1));
@@ -272,7 +262,6 @@ UNIT_TEST(ColorPalleteUploadingPartialyRow)
     cp.UploadResources(make_ref(&context), make_ref(&texture));
   }
 
-
   EXPECTGL(glDeleteTexture(1));
 }
 
@@ -299,17 +288,16 @@ UNIT_TEST(ColorPalleteUploadingMultiplyRow)
     cp.MapResource(dp::ColorKey(dp::Color(0xFF, 0, 0, 0)));
     cp.MapResource(dp::ColorKey(dp::Color(0xAA, 0, 0, 0)));
 
-    uint8_t memoryEtalon[] =
-    {
-      0xFF, 0x00, 0x00, 0x00, // 1 pixel
-      0xFF, 0x00, 0x00, 0x00, // 1 pixel
-      0xAA, 0x00, 0x00, 0x00, // 2 pixel
-      0xAA, 0x00, 0x00, 0x00, // 2 pixel
+    uint8_t memoryEtalon[] = {
+        0xFF, 0x00, 0x00, 0x00,  // 1 pixel
+        0xFF, 0x00, 0x00, 0x00,  // 1 pixel
+        0xAA, 0x00, 0x00, 0x00,  // 2 pixel
+        0xAA, 0x00, 0x00, 0x00,  // 2 pixel
 
-      0xFF, 0x00, 0x00, 0x00, // 1 pixel
-      0xFF, 0x00, 0x00, 0x00, // 1 pixel
-      0xAA, 0x00, 0x00, 0x00, // 2 pixel
-      0xAA, 0x00, 0x00, 0x00, // 2 pixel
+        0xFF, 0x00, 0x00, 0x00,  // 1 pixel
+        0xFF, 0x00, 0x00, 0x00,  // 1 pixel
+        0xAA, 0x00, 0x00, 0x00,  // 2 pixel
+        0xAA, 0x00, 0x00, 0x00,  // 2 pixel
     };
 
     MemoryComparer cmp(memoryEtalon, ARRAY_SIZE(memoryEtalon));
@@ -325,27 +313,26 @@ UNIT_TEST(ColorPalleteUploadingMultiplyRow)
     cp.MapResource(dp::ColorKey(dp::Color(0xFF, 0xFF, 0xFF, 0)));
     cp.MapResource(dp::ColorKey(dp::Color(0xFF, 0xFF, 0xFF, 0xFF)));
 
-    uint8_t memoryEtalon1[] =
-    {
-      0xCC, 0x00, 0x00, 0x00, // 1 pixel
-      0xCC, 0x00, 0x00, 0x00, // 1 pixel
-      0xFF, 0xFF, 0x00, 0x00, // 2 pixel
-      0xFF, 0xFF, 0x00, 0x00, // 2 pixel
+    uint8_t memoryEtalon1[] = {
+        0xCC, 0x00, 0x00, 0x00,  // 1 pixel
+        0xCC, 0x00, 0x00, 0x00,  // 1 pixel
+        0xFF, 0xFF, 0x00, 0x00,  // 2 pixel
+        0xFF, 0xFF, 0x00, 0x00,  // 2 pixel
 
-      0xCC, 0x00, 0x00, 0x00, // 1 pixel
-      0xCC, 0x00, 0x00, 0x00, // 1 pixel
-      0xFF, 0xFF, 0x00, 0x00, // 2 pixel
-      0xFF, 0xFF, 0x00, 0x00, // 2 pixel
+        0xCC, 0x00, 0x00, 0x00,  // 1 pixel
+        0xCC, 0x00, 0x00, 0x00,  // 1 pixel
+        0xFF, 0xFF, 0x00, 0x00,  // 2 pixel
+        0xFF, 0xFF, 0x00, 0x00,  // 2 pixel
 
-      0xFF, 0xFF, 0xFF, 0x00, // 1 pixel
-      0xFF, 0xFF, 0xFF, 0x00, // 1 pixel
-      0xFF, 0xFF, 0xFF, 0xFF, // 2 pixel
-      0xFF, 0xFF, 0xFF, 0xFF, // 2 pixel
+        0xFF, 0xFF, 0xFF, 0x00,  // 1 pixel
+        0xFF, 0xFF, 0xFF, 0x00,  // 1 pixel
+        0xFF, 0xFF, 0xFF, 0xFF,  // 2 pixel
+        0xFF, 0xFF, 0xFF, 0xFF,  // 2 pixel
 
-      0xFF, 0xFF, 0xFF, 0x00, // 1 pixel
-      0xFF, 0xFF, 0xFF, 0x00, // 1 pixel
-      0xFF, 0xFF, 0xFF, 0xFF, // 2 pixel
-      0xFF, 0xFF, 0xFF, 0xFF, // 2 pixel
+        0xFF, 0xFF, 0xFF, 0x00,  // 1 pixel
+        0xFF, 0xFF, 0xFF, 0x00,  // 1 pixel
+        0xFF, 0xFF, 0xFF, 0xFF,  // 2 pixel
+        0xFF, 0xFF, 0xFF, 0xFF,  // 2 pixel
     };
 
     MemoryComparer cmp1(memoryEtalon1, ARRAY_SIZE(memoryEtalon1));
@@ -357,4 +344,3 @@ UNIT_TEST(ColorPalleteUploadingMultiplyRow)
 
   EXPECTGL(glDeleteTexture(1));
 }
-
diff --git a/libs/drape/drape_tests/uniform_value_tests.cpp b/libs/drape/drape_tests/uniform_value_tests.cpp
index 55b5d1d9d..719074d0a 100644
--- a/libs/drape/drape_tests/uniform_value_tests.cpp
+++ b/libs/drape/drape_tests/uniform_value_tests.cpp
@@ -13,34 +13,24 @@
 #include <gmock/gmock.h>
 
 using ::testing::_;
-using ::testing::Return;
 using ::testing::AnyOf;
 using ::testing::IgnoreResult;
-using ::testing::Invoke;
 using ::testing::InSequence;
+using ::testing::Invoke;
+using ::testing::Return;
 using namespace dp;
 
 namespace uniform_value_tests
 {
-template<typename T>
+template <typename T>
 class MemoryComparer
 {
 public:
-  MemoryComparer(T const * memory, uint32_t size)
-    : m_result(false)
-    , m_memory(memory)
-    , m_size(size)
-  {}
+  MemoryComparer(T const * memory, uint32_t size) : m_result(false), m_memory(memory), m_size(size) {}
 
-  void Compare(int32_t id, T const * memory)
-  {
-    m_result = memcmp(m_memory, memory, m_size) == 0;
-  }
+  void Compare(int32_t id, T const * memory) { m_result = memcmp(m_memory, memory, m_size) == 0; }
 
-  bool GetResult() const
-  {
-    return m_result;
-  }
+  bool GetResult() const { return m_result; }
 
 private:
   bool m_result;
@@ -48,24 +38,17 @@ private:
   uint32_t m_size;
 };
 
-void mock_glGetActiveUniform(uint32_t programID, uint32_t index, int32_t * size,
-                             glConst * type, std::string & name)
+void mock_glGetActiveUniform(uint32_t programID, uint32_t index, int32_t * size, glConst * type, std::string & name)
 {
   *size = 1;
   if (index < 9)
   {
-    static std::pair<std::string, glConst> mockUniforms[9] =
-    {
-      {"position0", gl_const::GLIntType},
-      {"position1", gl_const::GLIntVec2},
-      {"position2", gl_const::GLIntVec3},
-      {"position3", gl_const::GLIntVec4},
-      {"position4", gl_const::GLFloatType},
-      {"position5", gl_const::GLFloatVec2},
-      {"position6", gl_const::GLFloatVec3},
-      {"position7", gl_const::GLFloatVec4},
-      {"viewModel", gl_const::GLFloatMat4}
-    };
+    static std::pair<std::string, glConst> mockUniforms[9] = {
+        {"position0", gl_const::GLIntType},   {"position1", gl_const::GLIntVec2},
+        {"position2", gl_const::GLIntVec3},   {"position3", gl_const::GLIntVec4},
+        {"position4", gl_const::GLFloatType}, {"position5", gl_const::GLFloatVec2},
+        {"position6", gl_const::GLFloatVec3}, {"position7", gl_const::GLFloatVec4},
+        {"viewModel", gl_const::GLFloatMat4}};
     name = mockUniforms[index].first;
     *type = mockUniforms[index].second;
   }
@@ -83,13 +66,7 @@ UNIT_TEST(UniformValueTest)
   int32_t constexpr positionLoc = 10;
   int32_t constexpr modelViewLoc = 11;
 
-  float matrix[16] =
-  {
-    1.0f, 0.0f, 0.0f, 0.0f,
-    0.0f, 1.0f, 0.0f, 0.0f,
-    0.0f, 0.0f, 1.0f, 0.0f,
-    0.0f, 0.0f, 0.0f, 1.0f
-  };
+  float matrix[16] = {1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f};
 
   MemoryComparer<float> comparer(matrix, 16 * sizeof(float));
 
@@ -136,19 +113,18 @@ UNIT_TEST(UniformValueTest)
 
     EXPECTGL(glUniformValuef(positionLoc, 1.0f, 2.0f, 3.0f, 4.0f));
 
-    EXPECTGL(glUniformMatrix4x4Value(modelViewLoc, _))
-        .WillOnce(Invoke(&comparer, &MemoryComparer<float>::Compare));
+    EXPECTGL(glUniformMatrix4x4Value(modelViewLoc, _)).WillOnce(Invoke(&comparer, &MemoryComparer<float>::Compare));
 
     EXPECTGL(glUseProgram(0));
     EXPECTGL(glDeleteProgram(ProgramID));
     EXPECTGL(glDeleteShader(AnyOf(VertexShaderID, FragmentShaderID))).Times(2);
   }
 
-  drape_ptr<Shader> vs = make_unique_dp<Shader>("", "void main() { gl_Position = vec4(0.0, 0.0, 0.0, 1.0); }",
-                                                "", Shader::Type::VertexShader);
+  drape_ptr<Shader> vs = make_unique_dp<Shader>("", "void main() { gl_Position = vec4(0.0, 0.0, 0.0, 1.0); }", "",
+                                                Shader::Type::VertexShader);
 
-  drape_ptr<Shader> fs = make_unique_dp<Shader>("", "void main() { gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0); }",
-                                                "", Shader::Type::FragmentShader);
+  drape_ptr<Shader> fs = make_unique_dp<Shader>("", "void main() { gl_FragColor = vec4(0.0, 0.0, 0.0, 1.0); }", "",
+                                                Shader::Type::FragmentShader);
 
   drape_ptr<GLGpuProgram> program = make_unique_dp<GLGpuProgram>("", make_ref(vs), make_ref(fs));
 
diff --git a/libs/drape/drape_tests/vertex_buffer_tests.cpp b/libs/drape/drape_tests/vertex_buffer_tests.cpp
index 090ef0d6d..9c06e7307 100644
--- a/libs/drape/drape_tests/vertex_buffer_tests.cpp
+++ b/libs/drape/drape_tests/vertex_buffer_tests.cpp
@@ -31,9 +31,9 @@ UNIT_TEST(VertexBuffer_Benchmark)
   using ValueT = gpu::TextOutlinedStaticVertex;
   // using ValueT = gpu::TextDynamicVertex
   ValueT objs[] = {
-    {{1, 1}, {2, 2}, {3, 3}},
-    {{4, 4}, {5, 5}, {6, 6}},
-    {{7, 7}, {8, 8}, {9, 9}},
+      {{1, 1}, {2, 2}, {3, 3}},
+      {{4, 4}, {5, 5}, {6, 6}},
+      {{7, 7}, {8, 8}, {9, 9}},
   };
 
   // Very comfortable for buffer_vector<ValueT, kUpperBound>.
@@ -86,12 +86,12 @@ UNIT_TEST(VertexBuffer_Benchmark)
     t4 = timer.ElapsedMilliseconds();
   }
 
-  LOG(LINFO, ("vector time:", t1, "buffer_vector time:", t2,
-              "boost::small_vector time:", t3, "reserved vector time:", t4));
+  LOG(LINFO,
+      ("vector time:", t1, "buffer_vector time:", t2, "boost::small_vector time:", t3, "reserved vector time:", t4));
   TEST_LESS(t2, t1, ());
   TEST_LESS(t3, t2, ());
   // TODO: Fix this condition
-  //TEST_LESS(t4, t3, ());
+  // TEST_LESS(t4, t3, ());
 }
 #endif
-} // namespace vertex_buffer_tests
+}  // namespace vertex_buffer_tests
diff --git a/libs/drape/dynamic_texture.hpp b/libs/drape/dynamic_texture.hpp
index fa05e2400..cd99326de 100644
--- a/libs/drape/dynamic_texture.hpp
+++ b/libs/drape/dynamic_texture.hpp
@@ -7,15 +7,13 @@
 
 namespace dp
 {
-template<typename TIndexer, typename TResourceKey, Texture::ResourceType TResourceType>
+template <typename TIndexer, typename TResourceKey, Texture::ResourceType TResourceType>
 class DynamicTexture : public Texture
 {
   using Base = Texture;
+
 public:
-  ~DynamicTexture() override
-  {
-    ASSERT(m_indexer == nullptr, ());
-  }
+  ~DynamicTexture() override { ASSERT(m_indexer == nullptr, ()); }
 
   ref_ptr<ResourceInfo> FindResource(Key const & key, bool & newResource) override
   {
@@ -53,35 +51,17 @@ public:
     m_indexer->UploadResources(context, make_ref(this));
   }
 
-  TextureFormat GetFormat() const override
-  {
-    return m_params.m_format;
-  }
+  TextureFormat GetFormat() const override { return m_params.m_format; }
 
-  uint32_t GetWidth() const override
-  {
-    return m_params.m_width;
-  }
+  uint32_t GetWidth() const override { return m_params.m_width; }
 
-  uint32_t GetHeight() const override
-  {
-    return m_params.m_height;
-  }
+  uint32_t GetHeight() const override { return m_params.m_height; }
 
-  float GetS(uint32_t x) const override
-  {
-    return static_cast<float>(x) / m_params.m_width;
-  }
+  float GetS(uint32_t x) const override { return static_cast<float>(x) / m_params.m_width; }
 
-  float GetT(uint32_t y) const override
-  {
-    return static_cast<float>(y) / m_params.m_height;
-  }
+  float GetT(uint32_t y) const override { return static_cast<float>(y) / m_params.m_height; }
 
-  uint32_t GetID() const override
-  {
-    return m_isInitialized ? Texture::GetID() : 0;
-  }
+  uint32_t GetID() const override { return m_isInitialized ? Texture::GetID() : 0; }
 
   void Bind(ref_ptr<dp::GraphicsContext> context) const override
   {
@@ -96,9 +76,7 @@ public:
   }
 
 protected:
-  DynamicTexture()
-    : m_isInitialized(false)
-  {}
+  DynamicTexture() : m_isInitialized(false) {}
 
   struct DynamicTextureParams
   {
@@ -108,8 +86,7 @@ protected:
     bool m_usePixelBuffer = false;
   };
 
-  void Init(ref_ptr<HWTextureAllocator> allocator, ref_ptr<TIndexer> indexer,
-            DynamicTextureParams const & params)
+  void Init(ref_ptr<HWTextureAllocator> allocator, ref_ptr<TIndexer> indexer, DynamicTextureParams const & params)
   {
     m_indexer = indexer;
     m_params.m_allocator = allocator;
@@ -121,10 +98,7 @@ protected:
     m_params.m_isMutable = true;
   }
 
-  void Reset()
-  {
-    m_indexer = nullptr;
-  }
+  void Reset() { m_indexer = nullptr; }
 
   ref_ptr<TIndexer> m_indexer;
   Texture::Params m_params;
diff --git a/libs/drape/font_texture.cpp b/libs/drape/font_texture.cpp
index 71159dc41..55407f3df 100644
--- a/libs/drape/font_texture.cpp
+++ b/libs/drape/font_texture.cpp
@@ -12,9 +12,7 @@
 
 namespace dp
 {
-GlyphPacker::GlyphPacker(const m2::PointU & size)
-  : m_size(size)
-{}
+GlyphPacker::GlyphPacker(m2::PointU const & size) : m_size(size) {}
 
 bool GlyphPacker::PackGlyph(uint32_t width, uint32_t height, m2::RectU & rect)
 {
@@ -34,8 +32,7 @@ bool GlyphPacker::PackGlyph(uint32_t width, uint32_t height, m2::RectU & rect)
     return false;
   }
 
-  rect = m2::RectU(m_cursor.x, m_cursor.y,
-                   m_cursor.x + width, m_cursor.y + height);
+  rect = m2::RectU(m_cursor.x, m_cursor.y, m_cursor.x + width, m_cursor.y + height);
 
   m_cursor.x += width;
   m_yStep = std::max(height, m_yStep);
@@ -64,7 +61,7 @@ bool GlyphPacker::CanBePacked(uint32_t glyphsCount, uint32_t width, uint32_t hei
   return true;
 }
 
-m2::RectF GlyphPacker::MapTextureCoords(const m2::RectU & pixelRect) const
+m2::RectF GlyphPacker::MapTextureCoords(m2::RectU const & pixelRect) const
 {
   auto const width = static_cast<float>(m_size.x);
   auto const height = static_cast<float>(m_size.y);
@@ -74,17 +71,16 @@ m2::RectF GlyphPacker::MapTextureCoords(const m2::RectU & pixelRect) const
   if (pixelRect.SizeX() != 0 && pixelRect.SizeY() != 0)
     offset = 0.5f;
 
-  return {(pixelRect.minX() + offset) / width,
-          (pixelRect.minY() + offset) / height,
-          (pixelRect.maxX() - offset) / width,
-          (pixelRect.maxY() - offset) / height};
+  return {(pixelRect.minX() + offset) / width, (pixelRect.minY() + offset) / height,
+          (pixelRect.maxX() - offset) / width, (pixelRect.maxY() - offset) / height};
 }
 
-bool GlyphPacker::IsFull() const { return m_isFull; }
+bool GlyphPacker::IsFull() const
+{
+  return m_isFull;
+}
 
-GlyphIndex::GlyphIndex(m2::PointU const & size, ref_ptr<GlyphManager> mng)
-  : m_packer(size)
-  , m_mng(mng)
+GlyphIndex::GlyphIndex(m2::PointU const & size, ref_ptr<GlyphManager> mng) : m_packer(size), m_mng(mng)
 {
   ASSERT(m_mng != nullptr, ());
 }
@@ -97,8 +93,7 @@ GlyphIndex::~GlyphIndex()
   m_pendingNodes.clear();
 }
 
-std::vector<ref_ptr<Texture::ResourceInfo>> GlyphIndex::MapResources(TGlyphs const & keys,
-                                                                     bool & hasNewResources)
+std::vector<ref_ptr<Texture::ResourceInfo>> GlyphIndex::MapResources(TGlyphs const & keys, bool & hasNewResources)
 {
   std::vector<ref_ptr<Texture::ResourceInfo>> info;
   info.reserve(keys.size());
@@ -130,9 +125,8 @@ ref_ptr<Texture::ResourceInfo> GlyphIndex::MapResource(GlyphFontAndId const & ke
   {
     glyphImage.Destroy();
 
-    LOG(LWARNING, ("Glyphs packer could not pack a glyph with fontIndex =", key.m_fontIndex,
-                   "glyphId =", key.m_glyphId, "w =", glyphImage.m_width, "h =", glyphImage.m_height,
-                   "packerSize =", m_packer.GetSize()));
+    LOG(LWARNING, ("Glyphs packer could not pack a glyph with fontIndex =", key.m_fontIndex, "glyphId =", key.m_glyphId,
+                   "w =", glyphImage.m_width, "h =", glyphImage.m_height, "packerSize =", m_packer.GetSize()));
 
     // TODO(AB): Is it a valid invalid glyph?
     GlyphFontAndId constexpr kInvalidGlyphKey{0, 0};
diff --git a/libs/drape/font_texture.hpp b/libs/drape/font_texture.hpp
index b658ba0dc..a27523fea 100644
--- a/libs/drape/font_texture.hpp
+++ b/libs/drape/font_texture.hpp
@@ -29,7 +29,9 @@ private:
   bool m_isFull = false;
 };
 
-class GlyphKey : public GlyphFontAndId, public Texture::Key
+class GlyphKey
+  : public GlyphFontAndId
+  , public Texture::Key
 {
 public:
   Texture::ResourceType GetType() const override { return Texture::ResourceType::Glyph; }
@@ -39,9 +41,7 @@ public:
 class GlyphInfo : public Texture::ResourceInfo
 {
 public:
-  explicit GlyphInfo(m2::RectF const & texRect)
-    : ResourceInfo(texRect)
-  {}
+  explicit GlyphInfo(m2::RectF const & texRect) : ResourceInfo(texRect) {}
 
   Texture::ResourceType GetType() const override { return Texture::ResourceType::Glyph; }
 };
@@ -93,10 +93,7 @@ public:
     return m_indexer->MapResource(key, hasNewResources);
   }
 
-  bool HasEnoughSpace(uint32_t newKeysCount) const override
-  {
-    return m_index.CanBeGlyphPacked(newKeysCount);
-  }
+  bool HasEnoughSpace(uint32_t newKeysCount) const override { return m_index.CanBeGlyphPacked(newKeysCount); }
 
 private:
   GlyphIndex m_index;
diff --git a/libs/drape/fonts_tool/fonts_tool.cpp b/libs/drape/fonts_tool/fonts_tool.cpp
index 5dff07a38..ab0bf7e7c 100644
--- a/libs/drape/fonts_tool/fonts_tool.cpp
+++ b/libs/drape/fonts_tool/fonts_tool.cpp
@@ -16,7 +16,7 @@ void ItemizeLine(std::string & str, dp::GlyphManager & glyphManager)
     return;
 
   auto const segments = harfbuzz_shaping::GetTextSegments(str);
-  for (const auto & run : segments.m_segments)
+  for (auto const & run : segments.m_segments)
   {
     std::u16string_view sv{segments.m_text.data() + run.m_start, static_cast<size_t>(run.m_length)};
     std::cout << DebugPrint(sv) << '|';
@@ -24,7 +24,7 @@ void ItemizeLine(std::string & str, dp::GlyphManager & glyphManager)
   std::cout << '\n';
 }
 
-int main(int argc, char** argv)
+int main(int argc, char ** argv)
 {
   if (argc < 2)
   {
diff --git a/libs/drape/framebuffer.cpp b/libs/drape/framebuffer.cpp
index c2b5f4f99..2a941456b 100644
--- a/libs/drape/framebuffer.cpp
+++ b/libs/drape/framebuffer.cpp
@@ -18,8 +18,7 @@ Framebuffer::DepthStencil::~DepthStencil()
   Destroy();
 }
 
-void Framebuffer::DepthStencil::SetSize(ref_ptr<dp::GraphicsContext> context,
-                                        uint32_t width, uint32_t height)
+void Framebuffer::DepthStencil::SetSize(ref_ptr<dp::GraphicsContext> context, uint32_t width, uint32_t height)
 {
   if (m_texture && m_texture->GetWidth() == width && m_texture->GetHeight() == height)
     return;
@@ -64,14 +63,12 @@ ref_ptr<FramebufferTexture> Framebuffer::DepthStencil::GetTexture() const
   return make_ref(m_texture);
 }
 
-Framebuffer::Framebuffer()
-  : m_colorFormat(TextureFormat::RGBA8)
+Framebuffer::Framebuffer() : m_colorFormat(TextureFormat::RGBA8)
 {
   ApplyOwnDepthStencil();
 }
 
-Framebuffer::Framebuffer(TextureFormat colorFormat)
-  : m_colorFormat(colorFormat)
+Framebuffer::Framebuffer(TextureFormat colorFormat) : m_colorFormat(colorFormat)
 {
   ApplyOwnDepthStencil();
 }
diff --git a/libs/drape/framebuffer.hpp b/libs/drape/framebuffer.hpp
index 05729641e..e00cba999 100644
--- a/libs/drape/framebuffer.hpp
+++ b/libs/drape/framebuffer.hpp
@@ -31,6 +31,7 @@ public:
     uint32_t GetDepthAttachmentId() const;
     uint32_t GetStencilAttachmentId() const;
     ref_ptr<FramebufferTexture> GetTexture() const;
+
   private:
     bool const m_depthEnabled = false;
     bool const m_stencilEnabled = false;
@@ -54,7 +55,7 @@ public:
   ref_ptr<DepthStencil> GetDepthStencilRef() const;
 
   bool IsSupported() const { return m_isSupported; }
-  
+
 private:
   void Destroy();
 
diff --git a/libs/drape/gl_constants.cpp b/libs/drape/gl_constants.cpp
index 8333b9c06..9dc9f00a0 100644
--- a/libs/drape/gl_constants.cpp
+++ b/libs/drape/gl_constants.cpp
@@ -2,313 +2,313 @@
 #include "drape/gl_includes.hpp"
 
 #if !defined(GL_RGBA8_OES)
-  #define GL_RGBA8_OES 0x8058
+#define GL_RGBA8_OES 0x8058
 #endif
 
 #if !defined(GL_RGBA4_OES)
-  #define GL_RGBA4_OES 0x8056
+#define GL_RGBA4_OES 0x8056
 #endif
 
 #if !defined(GL_ALPHA8_OES)
-  #define GL_ALPHA8_OES 0x803C
+#define GL_ALPHA8_OES 0x803C
 #endif
 
 #if !defined(GL_LUMINANCE8_OES)
-  #define GL_LUMINANCE8_OES 0x8040
+#define GL_LUMINANCE8_OES 0x8040
 #endif
 
 #if !defined(GL_LUMINANCE8_ALPHA8_OES)
-  #define GL_LUMINANCE8_ALPHA8_OES 0x8045
+#define GL_LUMINANCE8_ALPHA8_OES 0x8045
 #endif
 
 #if !defined(GL_LUMINANCE8_ALPHA4_OES)
-  #define GL_LUMINANCE8_ALPHA4_OES 0x8043
+#define GL_LUMINANCE8_ALPHA4_OES 0x8043
 #endif
 
 #if !defined(GL_LUMINANCE)
-  #define GL_LUMINANCE 0x1909
+#define GL_LUMINANCE 0x1909
 #endif
 
 #if !defined(GL_LUMINANCE_ALPHA)
-  #define GL_LUMINANCE_ALPHA 0x190A
+#define GL_LUMINANCE_ALPHA 0x190A
 #endif
 
 #if defined(GL_WRITE_ONLY)
-  #define WRITE_ONLY_DEF GL_WRITE_ONLY
+#define WRITE_ONLY_DEF GL_WRITE_ONLY
 #elif defined(GL_WRITE_ONLY_OES)
-  #define WRITE_ONLY_DEF GL_WRITE_ONLY_OES
+#define WRITE_ONLY_DEF GL_WRITE_ONLY_OES
 #else
-  #define WRITE_ONLY_DEF 0x88B9
+#define WRITE_ONLY_DEF 0x88B9
 #endif
 
 #if defined(GL_READ_ONLY)
-  #define READ_ONLY_DEF GL_READ_ONLY
+#define READ_ONLY_DEF GL_READ_ONLY
 #else
-  #define READ_ONLY_DEF 0x88B8
+#define READ_ONLY_DEF 0x88B8
 #endif
 
 #if defined(GL_MAP_READ_BIT_EXT)
-  #define READ_BIT_DEF GL_MAP_READ_BIT_EXT
+#define READ_BIT_DEF GL_MAP_READ_BIT_EXT
 #else
-  #define READ_BIT_DEF 0x0001
+#define READ_BIT_DEF 0x0001
 #endif
 
 #if defined(GL_MAP_WRITE_BIT_EXT)
-  #define WRITE_BIT_DEF GL_MAP_WRITE_BIT_EXT
+#define WRITE_BIT_DEF GL_MAP_WRITE_BIT_EXT
 #else
-  #define WRITE_BIT_DEF 0x0002
+#define WRITE_BIT_DEF 0x0002
 #endif
 
 #if defined(GL_MAP_INVALIDATE_RANGE_BIT_EXT)
-  #define INVALIDATE_RANGE_BIT_DEF GL_MAP_INVALIDATE_RANGE_BIT_EXT
+#define INVALIDATE_RANGE_BIT_DEF GL_MAP_INVALIDATE_RANGE_BIT_EXT
 #else
-  #define INVALIDATE_RANGE_BIT_DEF 0x0004
+#define INVALIDATE_RANGE_BIT_DEF 0x0004
 #endif
 
 #if defined(GL_MAP_INVALIDATE_BUFFER_BIT_EXT)
-  #define INVALIDATE_BUFFER_BIT_DEF GL_MAP_INVALIDATE_BUFFER_BIT_EXT
+#define INVALIDATE_BUFFER_BIT_DEF GL_MAP_INVALIDATE_BUFFER_BIT_EXT
 #else
-  #define INVALIDATE_BUFFER_BIT_DEF 0x0008
+#define INVALIDATE_BUFFER_BIT_DEF 0x0008
 #endif
 
 #if defined(GL_MAP_FLUSH_EXPLICIT_BIT_EXT)
-  #define FLUSH_EXPLICIT_BIT_DEF GL_MAP_FLUSH_EXPLICIT_BIT_EXT
+#define FLUSH_EXPLICIT_BIT_DEF GL_MAP_FLUSH_EXPLICIT_BIT_EXT
 #else
-  #define FLUSH_EXPLICIT_BIT_DEF 0x0010
+#define FLUSH_EXPLICIT_BIT_DEF 0x0010
 #endif
 
 #if defined(GL_MAP_UNSYNCHRONIZED_BIT_EXT)
-  #define UNSYNCHRONIZED_BIT_DEF GL_MAP_UNSYNCHRONIZED_BIT_EXT
+#define UNSYNCHRONIZED_BIT_DEF GL_MAP_UNSYNCHRONIZED_BIT_EXT
 #else
-  #define UNSYNCHRONIZED_BIT_DEF 0x0020
+#define UNSYNCHRONIZED_BIT_DEF 0x0020
 #endif
 
 #if !defined(GL_FUNC_ADD)
-  #define GL_FUNC_ADD 0x8006
+#define GL_FUNC_ADD 0x8006
 #endif
 
 #if !defined(GL_FUNC_SUBTRACT)
-  #define GL_FUNC_SUBTRACT 0x800A
+#define GL_FUNC_SUBTRACT 0x800A
 #endif
 
 #if !defined(GL_FUNC_REVERSE_SUBTRACT)
-  #define GL_FUNC_REVERSE_SUBTRACT 0x800B
+#define GL_FUNC_REVERSE_SUBTRACT 0x800B
 #endif
 
 namespace gl_const
 {
 
-constexpr glConst GLUnpackAlignment     = GL_UNPACK_ALIGNMENT;
+constexpr glConst GLUnpackAlignment = GL_UNPACK_ALIGNMENT;
 
-constexpr glConst GLRenderer            = GL_RENDERER;
-constexpr glConst GLVendor              = GL_VENDOR;
-constexpr glConst GLVersion             = GL_VERSION;
+constexpr glConst GLRenderer = GL_RENDERER;
+constexpr glConst GLVendor = GL_VENDOR;
+constexpr glConst GLVersion = GL_VERSION;
 
 #ifdef GL_VERSION_3_0
-constexpr glConst glContextFlags        = GL_CONTEXT_FLAGS;
+constexpr glConst glContextFlags = GL_CONTEXT_FLAGS;
 #else
-constexpr glConst glContextFlags        = 0;
+constexpr glConst glContextFlags = 0;
 #endif
 
-constexpr glConst GLColorBit            = GL_COLOR_BUFFER_BIT;
-constexpr glConst GLDepthBit            = GL_DEPTH_BUFFER_BIT;
-constexpr glConst GLStencilBit          = GL_STENCIL_BUFFER_BIT;
+constexpr glConst GLColorBit = GL_COLOR_BUFFER_BIT;
+constexpr glConst GLDepthBit = GL_DEPTH_BUFFER_BIT;
+constexpr glConst GLStencilBit = GL_STENCIL_BUFFER_BIT;
 
 constexpr glConst GLMaxFragmentTextures = GL_MAX_TEXTURE_IMAGE_UNITS;
-constexpr glConst GLMaxVertexTextures   = GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS;
-constexpr glConst GLMaxTextureSize      = GL_MAX_TEXTURE_SIZE;
+constexpr glConst GLMaxVertexTextures = GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS;
+constexpr glConst GLMaxTextureSize = GL_MAX_TEXTURE_SIZE;
 
-constexpr glConst GLArrayBuffer         = GL_ARRAY_BUFFER;
-constexpr glConst GLElementArrayBuffer  = GL_ELEMENT_ARRAY_BUFFER;
-constexpr glConst GLPixelBufferWrite    = GL_PIXEL_UNPACK_BUFFER;
+constexpr glConst GLArrayBuffer = GL_ARRAY_BUFFER;
+constexpr glConst GLElementArrayBuffer = GL_ELEMENT_ARRAY_BUFFER;
+constexpr glConst GLPixelBufferWrite = GL_PIXEL_UNPACK_BUFFER;
 
-constexpr glConst GLBufferSize          = GL_BUFFER_SIZE;
-constexpr glConst GLBufferUsage         = GL_BUFFER_USAGE;
+constexpr glConst GLBufferSize = GL_BUFFER_SIZE;
+constexpr glConst GLBufferUsage = GL_BUFFER_USAGE;
 
-constexpr glConst GLWriteOnly           = WRITE_ONLY_DEF;
-constexpr glConst GLReadOnly            = READ_ONLY_DEF;
+constexpr glConst GLWriteOnly = WRITE_ONLY_DEF;
+constexpr glConst GLReadOnly = READ_ONLY_DEF;
 
-constexpr glConst GLReadBufferBit       = READ_BIT_DEF;
-constexpr glConst GLWriteBufferBit      = WRITE_BIT_DEF;
-constexpr glConst GLInvalidateRange     = INVALIDATE_RANGE_BIT_DEF;
-constexpr glConst GLInvalidateBuffer    = INVALIDATE_BUFFER_BIT_DEF;
-constexpr glConst GLFlushExplicit       = FLUSH_EXPLICIT_BIT_DEF;
-constexpr glConst GLUnsynchronized      = UNSYNCHRONIZED_BIT_DEF;
+constexpr glConst GLReadBufferBit = READ_BIT_DEF;
+constexpr glConst GLWriteBufferBit = WRITE_BIT_DEF;
+constexpr glConst GLInvalidateRange = INVALIDATE_RANGE_BIT_DEF;
+constexpr glConst GLInvalidateBuffer = INVALIDATE_BUFFER_BIT_DEF;
+constexpr glConst GLFlushExplicit = FLUSH_EXPLICIT_BIT_DEF;
+constexpr glConst GLUnsynchronized = UNSYNCHRONIZED_BIT_DEF;
 
-constexpr glConst GLStaticDraw          = GL_STATIC_DRAW;
-constexpr glConst GLStreamDraw          = GL_STREAM_DRAW;
-constexpr glConst GLDynamicDraw         = GL_DYNAMIC_DRAW;
+constexpr glConst GLStaticDraw = GL_STATIC_DRAW;
+constexpr glConst GLStreamDraw = GL_STREAM_DRAW;
+constexpr glConst GLDynamicDraw = GL_DYNAMIC_DRAW;
 
-constexpr glConst GLVertexShader        = GL_VERTEX_SHADER;
-constexpr glConst GLFragmentShader      = GL_FRAGMENT_SHADER;
-constexpr glConst GLCurrentProgram      = GL_CURRENT_PROGRAM;
+constexpr glConst GLVertexShader = GL_VERTEX_SHADER;
+constexpr glConst GLFragmentShader = GL_FRAGMENT_SHADER;
+constexpr glConst GLCurrentProgram = GL_CURRENT_PROGRAM;
 
-constexpr glConst GLRGBA                = GL_RGBA;
-constexpr glConst GLRGB                 = GL_RGB;
-constexpr glConst GLAlpha               = GL_ALPHA;
-constexpr glConst GLLuminance           = GL_LUMINANCE;
-constexpr glConst GLAlphaLuminance      = GL_LUMINANCE_ALPHA;
-constexpr glConst GLDepthComponent      = GL_DEPTH_COMPONENT;
-constexpr glConst GLDepthStencil        = GL_DEPTH_STENCIL;
+constexpr glConst GLRGBA = GL_RGBA;
+constexpr glConst GLRGB = GL_RGB;
+constexpr glConst GLAlpha = GL_ALPHA;
+constexpr glConst GLLuminance = GL_LUMINANCE;
+constexpr glConst GLAlphaLuminance = GL_LUMINANCE_ALPHA;
+constexpr glConst GLDepthComponent = GL_DEPTH_COMPONENT;
+constexpr glConst GLDepthStencil = GL_DEPTH_STENCIL;
 
-constexpr glConst GLRGBA8               = GL_RGBA8_OES;
-constexpr glConst GLRGBA4               = GL_RGBA4_OES;
-constexpr glConst GLAlpha8              = GL_ALPHA8_OES;
-constexpr glConst GLLuminance8          = GL_LUMINANCE8_OES;
-constexpr glConst GLAlphaLuminance8     = GL_LUMINANCE8_ALPHA8_OES;
-constexpr glConst GLAlphaLuminance4     = GL_LUMINANCE8_ALPHA4_OES;
-constexpr glConst GLRed                 = GL_RED;
-constexpr glConst GLRedGreen            = GL_RG;
+constexpr glConst GLRGBA8 = GL_RGBA8_OES;
+constexpr glConst GLRGBA4 = GL_RGBA4_OES;
+constexpr glConst GLAlpha8 = GL_ALPHA8_OES;
+constexpr glConst GLLuminance8 = GL_LUMINANCE8_OES;
+constexpr glConst GLAlphaLuminance8 = GL_LUMINANCE8_ALPHA8_OES;
+constexpr glConst GLAlphaLuminance4 = GL_LUMINANCE8_ALPHA4_OES;
+constexpr glConst GLRed = GL_RED;
+constexpr glConst GLRedGreen = GL_RG;
 
-constexpr glConst GL8BitOnChannel       = GL_UNSIGNED_BYTE;
-constexpr glConst GL4BitOnChannel       = GL_UNSIGNED_SHORT_4_4_4_4;
+constexpr glConst GL8BitOnChannel = GL_UNSIGNED_BYTE;
+constexpr glConst GL4BitOnChannel = GL_UNSIGNED_SHORT_4_4_4_4;
 
-constexpr glConst GLTexture2D           = GL_TEXTURE_2D;
+constexpr glConst GLTexture2D = GL_TEXTURE_2D;
 
-constexpr glConst GLTexture0            = GL_TEXTURE0;
+constexpr glConst GLTexture0 = GL_TEXTURE0;
 
-constexpr glConst GLMinFilter           = GL_TEXTURE_MIN_FILTER;
-constexpr glConst GLMagFilter           = GL_TEXTURE_MAG_FILTER;
-constexpr glConst GLWrapS               = GL_TEXTURE_WRAP_S;
-constexpr glConst GLWrapT               = GL_TEXTURE_WRAP_T;
+constexpr glConst GLMinFilter = GL_TEXTURE_MIN_FILTER;
+constexpr glConst GLMagFilter = GL_TEXTURE_MAG_FILTER;
+constexpr glConst GLWrapS = GL_TEXTURE_WRAP_S;
+constexpr glConst GLWrapT = GL_TEXTURE_WRAP_T;
 
-constexpr glConst GLRepeat              = GL_REPEAT;
-constexpr glConst GLMirroredRepeat      = GL_MIRRORED_REPEAT;
-constexpr glConst GLClampToEdge         = GL_CLAMP_TO_EDGE;
+constexpr glConst GLRepeat = GL_REPEAT;
+constexpr glConst GLMirroredRepeat = GL_MIRRORED_REPEAT;
+constexpr glConst GLClampToEdge = GL_CLAMP_TO_EDGE;
 
-constexpr glConst GLLinear              = GL_LINEAR;
-constexpr glConst GLNearest             = GL_NEAREST;
+constexpr glConst GLLinear = GL_LINEAR;
+constexpr glConst GLNearest = GL_NEAREST;
 
-constexpr glConst GLByteType            = GL_BYTE;
-constexpr glConst GLUnsignedByteType    = GL_UNSIGNED_BYTE;
-constexpr glConst GLShortType           = GL_SHORT;
-constexpr glConst GLUnsignedShortType   = GL_UNSIGNED_SHORT;
-constexpr glConst GLIntType             = GL_INT;
-constexpr glConst GLUnsignedIntType     = GL_UNSIGNED_INT;
-constexpr glConst GLFloatType           = GL_FLOAT;
+constexpr glConst GLByteType = GL_BYTE;
+constexpr glConst GLUnsignedByteType = GL_UNSIGNED_BYTE;
+constexpr glConst GLShortType = GL_SHORT;
+constexpr glConst GLUnsignedShortType = GL_UNSIGNED_SHORT;
+constexpr glConst GLIntType = GL_INT;
+constexpr glConst GLUnsignedIntType = GL_UNSIGNED_INT;
+constexpr glConst GLFloatType = GL_FLOAT;
 constexpr glConst GLUnsignedInt24_8Type = GL_UNSIGNED_INT_24_8;
 
-constexpr glConst GLFloatVec2           = GL_FLOAT_VEC2;
-constexpr glConst GLFloatVec3           = GL_FLOAT_VEC3;
-constexpr glConst GLFloatVec4           = GL_FLOAT_VEC4;
+constexpr glConst GLFloatVec2 = GL_FLOAT_VEC2;
+constexpr glConst GLFloatVec3 = GL_FLOAT_VEC3;
+constexpr glConst GLFloatVec4 = GL_FLOAT_VEC4;
 
-constexpr glConst GLIntVec2             = GL_INT_VEC2;
-constexpr glConst GLIntVec3             = GL_INT_VEC3;
-constexpr glConst GLIntVec4             = GL_INT_VEC4;
+constexpr glConst GLIntVec2 = GL_INT_VEC2;
+constexpr glConst GLIntVec3 = GL_INT_VEC3;
+constexpr glConst GLIntVec4 = GL_INT_VEC4;
 
-constexpr glConst GLFloatMat4           = GL_FLOAT_MAT4;
+constexpr glConst GLFloatMat4 = GL_FLOAT_MAT4;
 
-constexpr glConst GLSampler2D           = GL_SAMPLER_2D;
+constexpr glConst GLSampler2D = GL_SAMPLER_2D;
 
-constexpr glConst GLAddBlend            = GL_FUNC_ADD;
-constexpr glConst GLSubstractBlend      = GL_FUNC_SUBTRACT;
-constexpr glConst GLReverseSubstrBlend  = GL_FUNC_REVERSE_SUBTRACT;
+constexpr glConst GLAddBlend = GL_FUNC_ADD;
+constexpr glConst GLSubstractBlend = GL_FUNC_SUBTRACT;
+constexpr glConst GLReverseSubstrBlend = GL_FUNC_REVERSE_SUBTRACT;
 
-constexpr glConst GLZero                = GL_ZERO;
-constexpr glConst GLOne                 = GL_ONE;
-constexpr glConst GLSrcColor            = GL_SRC_COLOR;
-constexpr glConst GLOneMinusSrcColor    = GL_ONE_MINUS_SRC_COLOR;
-constexpr glConst GLDstColor            = GL_DST_COLOR;
-constexpr glConst GLOneMinusDstColor    = GL_ONE_MINUS_DST_COLOR;
-constexpr glConst GLSrcAlpha            = GL_SRC_ALPHA;
-constexpr glConst GLOneMinusSrcAlpha    = GL_ONE_MINUS_SRC_ALPHA;
-constexpr glConst GLDstAlpha            = GL_DST_ALPHA;
-constexpr glConst GLOneMinusDstAlpha    = GL_ONE_MINUS_DST_ALPHA;
+constexpr glConst GLZero = GL_ZERO;
+constexpr glConst GLOne = GL_ONE;
+constexpr glConst GLSrcColor = GL_SRC_COLOR;
+constexpr glConst GLOneMinusSrcColor = GL_ONE_MINUS_SRC_COLOR;
+constexpr glConst GLDstColor = GL_DST_COLOR;
+constexpr glConst GLOneMinusDstColor = GL_ONE_MINUS_DST_COLOR;
+constexpr glConst GLSrcAlpha = GL_SRC_ALPHA;
+constexpr glConst GLOneMinusSrcAlpha = GL_ONE_MINUS_SRC_ALPHA;
+constexpr glConst GLDstAlpha = GL_DST_ALPHA;
+constexpr glConst GLOneMinusDstAlpha = GL_ONE_MINUS_DST_ALPHA;
 
-constexpr glConst GLDepthTest           = GL_DEPTH_TEST;
-constexpr glConst GLBlending            = GL_BLEND;
-constexpr glConst GLCullFace            = GL_CULL_FACE;
-constexpr glConst GLScissorTest         = GL_SCISSOR_TEST;
-constexpr glConst GLStencilTest         = GL_STENCIL_TEST;
+constexpr glConst GLDepthTest = GL_DEPTH_TEST;
+constexpr glConst GLBlending = GL_BLEND;
+constexpr glConst GLCullFace = GL_CULL_FACE;
+constexpr glConst GLScissorTest = GL_SCISSOR_TEST;
+constexpr glConst GLStencilTest = GL_STENCIL_TEST;
 
 constexpr glConst GLDontCare = GL_DONT_CARE;
-constexpr glConst GLTrue     = GL_TRUE;
-constexpr glConst GLFalse    = GL_FALSE;
+constexpr glConst GLTrue = GL_TRUE;
+constexpr glConst GLFalse = GL_FALSE;
 
 #ifdef GL_VERSION_4_3
-constexpr glConst GLDebugOutput            = GL_DEBUG_OUTPUT;
+constexpr glConst GLDebugOutput = GL_DEBUG_OUTPUT;
 constexpr glConst GLDebugOutputSynchronous = GL_DEBUG_OUTPUT_SYNCHRONOUS;
 
-constexpr glConst GLDebugSourceApi            = GL_DEBUG_SOURCE_API;
+constexpr glConst GLDebugSourceApi = GL_DEBUG_SOURCE_API;
 constexpr glConst GLDebugSourceShaderCompiler = GL_DEBUG_SOURCE_SHADER_COMPILER;
-constexpr glConst GLDebugSourceThirdParty     = GL_DEBUG_SOURCE_THIRD_PARTY;
-constexpr glConst GLDebugSourceApplication    = GL_DEBUG_SOURCE_APPLICATION;
-constexpr glConst GLDebugSourceOther          = GL_DEBUG_SOURCE_OTHER;
+constexpr glConst GLDebugSourceThirdParty = GL_DEBUG_SOURCE_THIRD_PARTY;
+constexpr glConst GLDebugSourceApplication = GL_DEBUG_SOURCE_APPLICATION;
+constexpr glConst GLDebugSourceOther = GL_DEBUG_SOURCE_OTHER;
 
-constexpr glConst GLDebugTypeError            = GL_DEBUG_TYPE_ERROR;
-constexpr glConst GLDebugDeprecatedBehavior   = GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR;
-constexpr glConst GLDebugUndefinedBehavior    = GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR;
-constexpr glConst GLDebugPortability          = GL_DEBUG_TYPE_PORTABILITY;
-constexpr glConst GLDebugPerformance          = GL_DEBUG_TYPE_PERFORMANCE;
-constexpr glConst GLDebugOther                = GL_DEBUG_TYPE_OTHER;
+constexpr glConst GLDebugTypeError = GL_DEBUG_TYPE_ERROR;
+constexpr glConst GLDebugDeprecatedBehavior = GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR;
+constexpr glConst GLDebugUndefinedBehavior = GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR;
+constexpr glConst GLDebugPortability = GL_DEBUG_TYPE_PORTABILITY;
+constexpr glConst GLDebugPerformance = GL_DEBUG_TYPE_PERFORMANCE;
+constexpr glConst GLDebugOther = GL_DEBUG_TYPE_OTHER;
 
-constexpr glConst GLDebugSeverityLow          = GL_DEBUG_SEVERITY_LOW;
-constexpr glConst GLDebugSeverityMedium       = GL_DEBUG_SEVERITY_MEDIUM;
-constexpr glConst GLDebugSeverityHigh         = GL_DEBUG_SEVERITY_HIGH;
+constexpr glConst GLDebugSeverityLow = GL_DEBUG_SEVERITY_LOW;
+constexpr glConst GLDebugSeverityMedium = GL_DEBUG_SEVERITY_MEDIUM;
+constexpr glConst GLDebugSeverityHigh = GL_DEBUG_SEVERITY_HIGH;
 constexpr glConst GLDebugSeverityNotification = GL_DEBUG_SEVERITY_NOTIFICATION;
 
-constexpr glConst glContextFlagDebugBit       = GL_CONTEXT_FLAG_DEBUG_BIT;
+constexpr glConst glContextFlagDebugBit = GL_CONTEXT_FLAG_DEBUG_BIT;
 #else
-constexpr glConst GLDebugOutput            = 0;
+constexpr glConst GLDebugOutput = 0;
 constexpr glConst GLDebugOutputSynchronous = 0;
 
-constexpr glConst GLDebugSourceApi            = 0;
+constexpr glConst GLDebugSourceApi = 0;
 constexpr glConst GLDebugSourceShaderCompiler = 0;
-constexpr glConst GLDebugSourceThirdParty     = 0;
-constexpr glConst GLDebugSourceApplication    = 0;
-constexpr glConst GLDebugSourceOther          = 0;
+constexpr glConst GLDebugSourceThirdParty = 0;
+constexpr glConst GLDebugSourceApplication = 0;
+constexpr glConst GLDebugSourceOther = 0;
 
-constexpr glConst GLDebugTypeError            = 0;
-constexpr glConst GLDebugDeprecatedBehavior   = 0;
-constexpr glConst GLDebugUndefinedBehavior    = 0;
-constexpr glConst GLDebugPortability          = 0;
-constexpr glConst GLDebugPerformance          = 0;
-constexpr glConst GLDebugOther                = 0;
+constexpr glConst GLDebugTypeError = 0;
+constexpr glConst GLDebugDeprecatedBehavior = 0;
+constexpr glConst GLDebugUndefinedBehavior = 0;
+constexpr glConst GLDebugPortability = 0;
+constexpr glConst GLDebugPerformance = 0;
+constexpr glConst GLDebugOther = 0;
 
-constexpr glConst GLDebugSeverityLow          = 0;
-constexpr glConst GLDebugSeverityMedium       = 0;
-constexpr glConst GLDebugSeverityHigh         = 0;
+constexpr glConst GLDebugSeverityLow = 0;
+constexpr glConst GLDebugSeverityMedium = 0;
+constexpr glConst GLDebugSeverityHigh = 0;
 constexpr glConst GLDebugSeverityNotification = 0;
 
-constexpr glConst glContextFlagDebugBit       = 0;
+constexpr glConst glContextFlagDebugBit = 0;
 #endif
 
-constexpr glConst GLClockwise           = GL_CW;
-constexpr glConst GLCounterClockwise    = GL_CCW;
+constexpr glConst GLClockwise = GL_CW;
+constexpr glConst GLCounterClockwise = GL_CCW;
 
-constexpr glConst GLFront               = GL_FRONT;
-constexpr glConst GLBack                = GL_BACK;
-constexpr glConst GLFrontAndBack        = GL_FRONT_AND_BACK;
+constexpr glConst GLFront = GL_FRONT;
+constexpr glConst GLBack = GL_BACK;
+constexpr glConst GLFrontAndBack = GL_FRONT_AND_BACK;
 
-constexpr glConst GLNever               = GL_NEVER;
-constexpr glConst GLLess                = GL_LESS;
-constexpr glConst GLEqual               = GL_EQUAL;
-constexpr glConst GLLessOrEqual         = GL_LEQUAL;
-constexpr glConst GLGreat               = GL_GREATER;
-constexpr glConst GLNotEqual            = GL_NOTEQUAL;
-constexpr glConst GLGreatOrEqual        = GL_GEQUAL;
-constexpr glConst GLAlways              = GL_ALWAYS;
+constexpr glConst GLNever = GL_NEVER;
+constexpr glConst GLLess = GL_LESS;
+constexpr glConst GLEqual = GL_EQUAL;
+constexpr glConst GLLessOrEqual = GL_LEQUAL;
+constexpr glConst GLGreat = GL_GREATER;
+constexpr glConst GLNotEqual = GL_NOTEQUAL;
+constexpr glConst GLGreatOrEqual = GL_GEQUAL;
+constexpr glConst GLAlways = GL_ALWAYS;
 
-constexpr glConst GLKeep                = GL_KEEP;
-constexpr glConst GLIncr                = GL_INCR;
-constexpr glConst GLDecr                = GL_DECR;
-constexpr glConst GLInvert              = GL_INVERT;
-constexpr glConst GLReplace             = GL_REPLACE;
-constexpr glConst GLIncrWrap            = GL_INCR_WRAP;
-constexpr glConst GLDecrWrap            = GL_DECR_WRAP;
+constexpr glConst GLKeep = GL_KEEP;
+constexpr glConst GLIncr = GL_INCR;
+constexpr glConst GLDecr = GL_DECR;
+constexpr glConst GLInvert = GL_INVERT;
+constexpr glConst GLReplace = GL_REPLACE;
+constexpr glConst GLIncrWrap = GL_INCR_WRAP;
+constexpr glConst GLDecrWrap = GL_DECR_WRAP;
 
-constexpr glConst GLActiveUniforms      = GL_ACTIVE_UNIFORMS;
+constexpr glConst GLActiveUniforms = GL_ACTIVE_UNIFORMS;
 
-constexpr glConst GLLines               = GL_LINES;
-constexpr glConst GLLineStrip           = GL_LINE_STRIP;
-constexpr glConst GLTriangles           = GL_TRIANGLES;
-constexpr glConst GLTriangleStrip       = GL_TRIANGLE_STRIP;
+constexpr glConst GLLines = GL_LINES;
+constexpr glConst GLLineStrip = GL_LINE_STRIP;
+constexpr glConst GLTriangles = GL_TRIANGLES;
+constexpr glConst GLTriangleStrip = GL_TRIANGLE_STRIP;
 
-constexpr glConst GLColorAttachment     = GL_COLOR_ATTACHMENT0;
-constexpr glConst GLDepthAttachment     = GL_DEPTH_ATTACHMENT;
-constexpr glConst GLStencilAttachment   = GL_STENCIL_ATTACHMENT;
+constexpr glConst GLColorAttachment = GL_COLOR_ATTACHMENT0;
+constexpr glConst GLDepthAttachment = GL_DEPTH_ATTACHMENT;
+constexpr glConst GLStencilAttachment = GL_STENCIL_ATTACHMENT;
 constexpr glConst GLDepthStencilAttachment = GL_DEPTH_STENCIL_ATTACHMENT;
 
 constexpr glConst GLFramebufferComplete = GL_FRAMEBUFFER_COMPLETE;
 
-} // namespace GLConst
+}  // namespace gl_const
diff --git a/libs/drape/gl_constants.hpp b/libs/drape/gl_constants.hpp
index e713e252d..394e856fb 100644
--- a/libs/drape/gl_constants.hpp
+++ b/libs/drape/gl_constants.hpp
@@ -6,217 +6,217 @@ using glConst = uint32_t;
 
 namespace gl_const
 {
-extern const glConst GLUnpackAlignment;
+extern glConst const GLUnpackAlignment;
 
-extern const glConst GLRenderer;
-extern const glConst GLVendor;
-extern const glConst GLVersion;
+extern glConst const GLRenderer;
+extern glConst const GLVendor;
+extern glConst const GLVersion;
 
-extern const glConst glContextFlags;
-extern const glConst glContextFlagDebugBit;
+extern glConst const glContextFlags;
+extern glConst const glContextFlagDebugBit;
 
 /// Clear bits
-extern const glConst GLColorBit;
-extern const glConst GLDepthBit;
-extern const glConst GLStencilBit;
+extern glConst const GLColorBit;
+extern glConst const GLDepthBit;
+extern glConst const GLStencilBit;
 
 /// Hardware specific params
-extern const glConst GLMaxFragmentTextures;
-extern const glConst GLMaxVertexTextures;
-extern const glConst GLMaxTextureSize;
+extern glConst const GLMaxFragmentTextures;
+extern glConst const GLMaxVertexTextures;
+extern glConst const GLMaxTextureSize;
 
 /// Buffer targets
-extern const glConst GLArrayBuffer;
-extern const glConst GLElementArrayBuffer;
-extern const glConst GLPixelBufferWrite;
+extern glConst const GLArrayBuffer;
+extern glConst const GLElementArrayBuffer;
+extern glConst const GLPixelBufferWrite;
 
 /// Buffer params
-extern const glConst GLBufferSize;
-extern const glConst GLBufferUsage;
+extern glConst const GLBufferSize;
+extern glConst const GLBufferUsage;
 
 /// VBO Access
-extern const glConst GLWriteOnly;
-extern const glConst GLReadOnly;
+extern glConst const GLWriteOnly;
+extern glConst const GLReadOnly;
 
 /// MapBufferRange
-extern const glConst GLWriteBufferBit;
-extern const glConst GLReadBufferBit;
-extern const glConst GLInvalidateRange;
-extern const glConst GLInvalidateBuffer;
-extern const glConst GLFlushExplicit;
-extern const glConst GLUnsynchronized;
+extern glConst const GLWriteBufferBit;
+extern glConst const GLReadBufferBit;
+extern glConst const GLInvalidateRange;
+extern glConst const GLInvalidateBuffer;
+extern glConst const GLFlushExplicit;
+extern glConst const GLUnsynchronized;
 
 /// BufferUsage
-extern const glConst GLStaticDraw;
-extern const glConst GLStreamDraw;
-extern const glConst GLDynamicDraw;
+extern glConst const GLStaticDraw;
+extern glConst const GLStreamDraw;
+extern glConst const GLDynamicDraw;
 
 /// ShaderType
-extern const glConst GLVertexShader;
-extern const glConst GLFragmentShader;
-extern const glConst GLCurrentProgram;
+extern glConst const GLVertexShader;
+extern glConst const GLFragmentShader;
+extern glConst const GLCurrentProgram;
 
 /// Texture layouts
-extern const glConst GLRGBA;
-extern const glConst GLRGB;
-extern const glConst GLAlpha;
-extern const glConst GLLuminance;
-extern const glConst GLAlphaLuminance;
-extern const glConst GLDepthComponent;
-extern const glConst GLDepthStencil;
+extern glConst const GLRGBA;
+extern glConst const GLRGB;
+extern glConst const GLAlpha;
+extern glConst const GLLuminance;
+extern glConst const GLAlphaLuminance;
+extern glConst const GLDepthComponent;
+extern glConst const GLDepthStencil;
 
 /// Texture layout size
-extern const glConst GLRGBA8;
-extern const glConst GLRGBA4;
-extern const glConst GLAlpha8;
-extern const glConst GLLuminance8;
-extern const glConst GLAlphaLuminance8;
-extern const glConst GLAlphaLuminance4;
-extern const glConst GLRed;
-extern const glConst GLRedGreen;
+extern glConst const GLRGBA8;
+extern glConst const GLRGBA4;
+extern glConst const GLAlpha8;
+extern glConst const GLLuminance8;
+extern glConst const GLAlphaLuminance8;
+extern glConst const GLAlphaLuminance4;
+extern glConst const GLRed;
+extern glConst const GLRedGreen;
 
 /// Pixel type for texture upload
-extern const glConst GL8BitOnChannel;
-extern const glConst GL4BitOnChannel;
+extern glConst const GL8BitOnChannel;
+extern glConst const GL4BitOnChannel;
 
 /// Texture targets
-extern const glConst GLTexture2D;
+extern glConst const GLTexture2D;
 
 /// Texture uniform blocks
-extern const glConst GLTexture0;
+extern glConst const GLTexture0;
 
 /// Texture param names
-extern const glConst GLMinFilter;
-extern const glConst GLMagFilter;
-extern const glConst GLWrapS;
-extern const glConst GLWrapT;
+extern glConst const GLMinFilter;
+extern glConst const GLMagFilter;
+extern glConst const GLWrapS;
+extern glConst const GLWrapT;
 
 /// Texture Wrap Modes
-extern const glConst GLRepeat;
-extern const glConst GLMirroredRepeat;
-extern const glConst GLClampToEdge;
+extern glConst const GLRepeat;
+extern glConst const GLMirroredRepeat;
+extern glConst const GLClampToEdge;
 
 /// Texture Filter Modes
-extern const glConst GLLinear;
-extern const glConst GLNearest;
+extern glConst const GLLinear;
+extern glConst const GLNearest;
 
 /// OpenGL types
-extern const glConst GLByteType;
-extern const glConst GLUnsignedByteType;
-extern const glConst GLShortType;
-extern const glConst GLUnsignedShortType;
-extern const glConst GLIntType;
-extern const glConst GLUnsignedIntType;
-extern const glConst GLFloatType;
-extern const glConst GLUnsignedInt24_8Type;
+extern glConst const GLByteType;
+extern glConst const GLUnsignedByteType;
+extern glConst const GLShortType;
+extern glConst const GLUnsignedShortType;
+extern glConst const GLIntType;
+extern glConst const GLUnsignedIntType;
+extern glConst const GLFloatType;
+extern glConst const GLUnsignedInt24_8Type;
 
-extern const glConst GLFloatVec2;
-extern const glConst GLFloatVec3;
-extern const glConst GLFloatVec4;
+extern glConst const GLFloatVec2;
+extern glConst const GLFloatVec3;
+extern glConst const GLFloatVec4;
 
-extern const glConst GLIntVec2;
-extern const glConst GLIntVec3;
-extern const glConst GLIntVec4;
+extern glConst const GLIntVec2;
+extern glConst const GLIntVec3;
+extern glConst const GLIntVec4;
 
-extern const glConst GLFloatMat4;
+extern glConst const GLFloatMat4;
 
-extern const glConst GLSampler2D;
+extern glConst const GLSampler2D;
 
 /// Blend Functions
-extern const glConst GLAddBlend;
-extern const glConst GLSubstractBlend;
-extern const glConst GLReverseSubstrBlend;
+extern glConst const GLAddBlend;
+extern glConst const GLSubstractBlend;
+extern glConst const GLReverseSubstrBlend;
 
 /// Blend Factors
-extern const glConst GLZero;
-extern const glConst GLOne;
-extern const glConst GLSrcColor;
-extern const glConst GLOneMinusSrcColor;
-extern const glConst GLDstColor;
-extern const glConst GLOneMinusDstColor;
-extern const glConst GLSrcAlpha;
-extern const glConst GLOneMinusSrcAlpha;
-extern const glConst GLDstAlpha;
-extern const glConst GLOneMinusDstAlpha;
+extern glConst const GLZero;
+extern glConst const GLOne;
+extern glConst const GLSrcColor;
+extern glConst const GLOneMinusSrcColor;
+extern glConst const GLDstColor;
+extern glConst const GLOneMinusDstColor;
+extern glConst const GLSrcAlpha;
+extern glConst const GLOneMinusSrcAlpha;
+extern glConst const GLDstAlpha;
+extern glConst const GLOneMinusDstAlpha;
 
 /// OpenGL states
-extern const glConst GLDepthTest;
-extern const glConst GLBlending;
-extern const glConst GLCullFace;
-extern const glConst GLScissorTest;
-extern const glConst GLStencilTest;
-extern const glConst GLDebugOutput;
-extern const glConst GLDebugOutputSynchronous;
+extern glConst const GLDepthTest;
+extern glConst const GLBlending;
+extern glConst const GLCullFace;
+extern glConst const GLScissorTest;
+extern glConst const GLStencilTest;
+extern glConst const GLDebugOutput;
+extern glConst const GLDebugOutputSynchronous;
 
-extern const glConst GLDontCare;
-extern const glConst GLDontCare;
-extern const glConst GLTrue;
-extern const glConst GLFalse;
+extern glConst const GLDontCare;
+extern glConst const GLDontCare;
+extern glConst const GLTrue;
+extern glConst const GLFalse;
 
 // OpenGL source type
-extern const glConst GLDebugSourceApi;
-extern const glConst GLDebugSourceShaderCompiler;
-extern const glConst GLDebugSourceThirdParty;
-extern const glConst GLDebugSourceApplication;
-extern const glConst GLDebugSourceOther;
+extern glConst const GLDebugSourceApi;
+extern glConst const GLDebugSourceShaderCompiler;
+extern glConst const GLDebugSourceThirdParty;
+extern glConst const GLDebugSourceApplication;
+extern glConst const GLDebugSourceOther;
 
 // OpenGL debug type
-extern const glConst GLDebugTypeError;
-extern const glConst GLDebugDeprecatedBehavior;
-extern const glConst GLDebugUndefinedBehavior;
-extern const glConst GLDebugPortability;
-extern const glConst GLDebugPerformance;
-extern const glConst GLDebugOther;
+extern glConst const GLDebugTypeError;
+extern glConst const GLDebugDeprecatedBehavior;
+extern glConst const GLDebugUndefinedBehavior;
+extern glConst const GLDebugPortability;
+extern glConst const GLDebugPerformance;
+extern glConst const GLDebugOther;
 
 // OpenGL debug severity
-extern const glConst GLDebugSeverityLow;
-extern const glConst GLDebugSeverityMedium;
-extern const glConst GLDebugSeverityHigh;
-extern const glConst GLDebugSeverityNotification;
+extern glConst const GLDebugSeverityLow;
+extern glConst const GLDebugSeverityMedium;
+extern glConst const GLDebugSeverityHigh;
+extern glConst const GLDebugSeverityNotification;
 
 /// Triangle faces order
-extern const glConst GLClockwise;
-extern const glConst GLCounterClockwise;
+extern glConst const GLClockwise;
+extern glConst const GLCounterClockwise;
 
 /// Triangle face
-extern const glConst GLFront;
-extern const glConst GLBack;
-extern const glConst GLFrontAndBack;
+extern glConst const GLFront;
+extern glConst const GLBack;
+extern glConst const GLFrontAndBack;
 
 /// OpenGL depth functions
-extern const glConst GLNever;
-extern const glConst GLLess;
-extern const glConst GLEqual;
-extern const glConst GLLessOrEqual;
-extern const glConst GLGreat;
-extern const glConst GLNotEqual;
-extern const glConst GLGreatOrEqual;
-extern const glConst GLAlways;
+extern glConst const GLNever;
+extern glConst const GLLess;
+extern glConst const GLEqual;
+extern glConst const GLLessOrEqual;
+extern glConst const GLGreat;
+extern glConst const GLNotEqual;
+extern glConst const GLGreatOrEqual;
+extern glConst const GLAlways;
 
 /// OpenGL stencil functions
-extern const glConst GLKeep;
-extern const glConst GLIncr;
-extern const glConst GLDecr;
-extern const glConst GLInvert;
-extern const glConst GLReplace;
-extern const glConst GLIncrWrap;
-extern const glConst GLDecrWrap;
+extern glConst const GLKeep;
+extern glConst const GLIncr;
+extern glConst const GLDecr;
+extern glConst const GLInvert;
+extern glConst const GLReplace;
+extern glConst const GLIncrWrap;
+extern glConst const GLDecrWrap;
 
 /// Program object parameter names
-extern const glConst GLActiveUniforms;
+extern glConst const GLActiveUniforms;
 
 /// Draw primitives
-extern const glConst GLLines;
-extern const glConst GLLineStrip;
-extern const glConst GLTriangles;
-extern const glConst GLTriangleStrip;
+extern glConst const GLLines;
+extern glConst const GLLineStrip;
+extern glConst const GLTriangles;
+extern glConst const GLTriangleStrip;
 
 /// Framebuffer attachment points
-extern const glConst GLColorAttachment;
-extern const glConst GLDepthAttachment;
-extern const glConst GLStencilAttachment;
-extern const glConst GLDepthStencilAttachment;
+extern glConst const GLColorAttachment;
+extern glConst const GLDepthAttachment;
+extern glConst const GLStencilAttachment;
+extern glConst const GLDepthStencilAttachment;
 
 /// Framebuffer status
-extern const glConst GLFramebufferComplete;
+extern glConst const GLFramebufferComplete;
 }  // namespace gl_const
diff --git a/libs/drape/gl_extensions_list.hpp b/libs/drape/gl_extensions_list.hpp
index c962c0714..ccd189102 100644
--- a/libs/drape/gl_extensions_list.hpp
+++ b/libs/drape/gl_extensions_list.hpp
@@ -22,7 +22,6 @@ public:
   bool IsSupported(ExtensionName extName) const;
 
 private:
-
   void CheckExtension(ExtensionName enumName, std::string const & extName);
   void SetExtension(ExtensionName enumName, bool isSupported);
 
diff --git a/libs/drape/gl_functions.cpp b/libs/drape/gl_functions.cpp
index e3e1f73ae..6e06b24f7 100644
--- a/libs/drape/gl_functions.cpp
+++ b/libs/drape/gl_functions.cpp
@@ -1,6 +1,6 @@
 #include "drape/gl_functions.hpp"
-#include "drape/gl_includes.hpp"
 #include "drape/gl_extensions_list.hpp"
+#include "drape/gl_includes.hpp"
 
 #include "base/assert.hpp"
 #include "base/logging.hpp"
@@ -10,7 +10,7 @@
 #include "std/target_os.hpp"
 
 #include <algorithm>
-#include <cstring>    // strlen
+#include <cstring>  // strlen
 #include <limits>
 #include <map>
 #include <mutex>
@@ -37,7 +37,10 @@ BoundMap g_boundBuffers;
 std::mutex g_boundBuffersMutex;
 #endif
 
-inline GLboolean convert(bool v) { return static_cast<GLboolean>(v ? GL_TRUE : GL_FALSE); }
+inline GLboolean convert(bool v)
+{
+  return static_cast<GLboolean>(v ? GL_TRUE : GL_FALSE);
+}
 
 typedef void(DP_APIENTRY * TglClearColorFn)(GLfloat r, GLfloat g, GLfloat b, GLfloat a);
 typedef void(DP_APIENTRY * TglClearFn)(GLbitfield mask);
@@ -51,14 +54,12 @@ typedef void(DP_APIENTRY * TglActiveTextureFn)(GLenum texture);
 typedef void(DP_APIENTRY * TglBlendEquationFn)(GLenum mode);
 
 #ifndef GL_VERSION_4_3
-using GLDEBUGPROC = void(DP_APIENTRY *)(GLenum source, GLenum type, GLuint id, GLenum severity,
-                                        GLsizei length, GLchar const * message,
-                                        void * const userParam);
+using GLDEBUGPROC = void(DP_APIENTRY *)(GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length,
+                                        GLchar const * message, void * const userParam);
 #endif
 typedef void(DP_APIENTRY * TglDebugMessageCallbackFn)(GLDEBUGPROC callback, void const * userParam);
-typedef void(DP_APIENTRY * TglDebugMessageControlFn)(GLenum source, GLenum type, GLenum severity,
-                                                     GLsizei count, GLuint const * ids,
-                                                     GLboolean enabled);
+typedef void(DP_APIENTRY * TglDebugMessageControlFn)(GLenum source, GLenum type, GLenum severity, GLsizei count,
+                                                     GLuint const * ids, GLboolean enabled);
 
 typedef void(DP_APIENTRY * TglGenVertexArraysFn)(GLsizei n, GLuint * ids);
 typedef void(DP_APIENTRY * TglBindVertexArrayFn)(GLuint id);
@@ -68,25 +69,21 @@ typedef void(DP_APIENTRY * TglGetBufferParameterFn)(GLenum target, GLenum value,
 typedef void(DP_APIENTRY * TglGenBuffersFn)(GLsizei n, GLuint * buffers);
 typedef void(DP_APIENTRY * TglBindBufferFn)(GLenum target, GLuint buffer);
 typedef void(DP_APIENTRY * TglDeleteBuffersFn)(GLsizei n, GLuint const * buffers);
-typedef void(DP_APIENTRY * TglBufferDataFn)(GLenum target, GLsizeiptr size, GLvoid const * data,
-                                            GLenum usage);
-typedef void(DP_APIENTRY * TglBufferSubDataFn)(GLenum target, GLintptr offset, GLsizeiptr size,
-                                               GLvoid const * data);
+typedef void(DP_APIENTRY * TglBufferDataFn)(GLenum target, GLsizeiptr size, GLvoid const * data, GLenum usage);
+typedef void(DP_APIENTRY * TglBufferSubDataFn)(GLenum target, GLintptr offset, GLsizeiptr size, GLvoid const * data);
 typedef void *(DP_APIENTRY * TglMapBufferFn)(GLenum target, GLenum access);
 typedef GLboolean(DP_APIENTRY * TglUnmapBufferFn)(GLenum target);
-typedef void *(DP_APIENTRY * TglMapBufferRangeFn)(GLenum target, GLintptr offset, GLsizeiptr length,
-                                                  GLbitfield access);
-typedef void(DP_APIENTRY * TglFlushMappedBufferRangeFn)(GLenum target, GLintptr offset,
-                                                        GLsizeiptr length);
+typedef void *(DP_APIENTRY * TglMapBufferRangeFn)(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access);
+typedef void(DP_APIENTRY * TglFlushMappedBufferRangeFn)(GLenum target, GLintptr offset, GLsizeiptr length);
 
 typedef GLuint(DP_APIENTRY * TglCreateShaderFn)(GLenum type);
-typedef void(DP_APIENTRY * TglShaderSourceFn)(GLuint shaderID, GLsizei count,
-                                              GLchar const * const * string, GLint const * length);
+typedef void(DP_APIENTRY * TglShaderSourceFn)(GLuint shaderID, GLsizei count, GLchar const * const * string,
+                                              GLint const * length);
 typedef void(DP_APIENTRY * TglCompileShaderFn)(GLuint shaderID);
 typedef void(DP_APIENTRY * TglDeleteShaderFn)(GLuint shaderID);
 typedef void(DP_APIENTRY * TglGetShaderivFn)(GLuint shaderID, GLenum name, GLint * p);
-typedef void(DP_APIENTRY * TglGetShaderInfoLogFn)(GLuint shaderID, GLsizei maxLength,
-                                                  GLsizei * length, GLchar * infoLog);
+typedef void(DP_APIENTRY * TglGetShaderInfoLogFn)(GLuint shaderID, GLsizei maxLength, GLsizei * length,
+                                                  GLchar * infoLog);
 
 typedef GLuint(DP_APIENTRY * TglCreateProgramFn)();
 typedef void(DP_APIENTRY * TglAttachShaderFn)(GLuint programID, GLuint shaderID);
@@ -94,22 +91,19 @@ typedef void(DP_APIENTRY * TglDetachShaderFn)(GLuint programID, GLuint shaderID)
 typedef void(DP_APIENTRY * TglLinkProgramFn)(GLuint programID);
 typedef void(DP_APIENTRY * TglDeleteProgramFn)(GLuint programID);
 typedef void(DP_APIENTRY * TglGetProgramivFn)(GLuint programID, GLenum name, GLint * p);
-typedef void(DP_APIENTRY * TglGetProgramInfoLogFn)(GLuint programID, GLsizei maxLength,
-                                                   GLsizei * length, GLchar * infoLog);
+typedef void(DP_APIENTRY * TglGetProgramInfoLogFn)(GLuint programID, GLsizei maxLength, GLsizei * length,
+                                                   GLchar * infoLog);
 
 typedef void(DP_APIENTRY * TglUseProgramFn)(GLuint programID);
 typedef GLint(DP_APIENTRY * TglGetAttribLocationFn)(GLuint program, GLchar const * name);
-typedef void(DP_APIENTRY * TglBindAttribLocationFn)(GLuint program, GLuint index,
-                                                    GLchar const * name);
+typedef void(DP_APIENTRY * TglBindAttribLocationFn)(GLuint program, GLuint index, GLchar const * name);
 
 typedef void(DP_APIENTRY * TglEnableVertexAttributeFn)(GLuint location);
-typedef void(DP_APIENTRY * TglVertexAttributePointerFn)(GLuint index, GLint count, GLenum type,
-                                                        GLboolean normalize, GLsizei stride,
-                                                        GLvoid const * p);
+typedef void(DP_APIENTRY * TglVertexAttributePointerFn)(GLuint index, GLint count, GLenum type, GLboolean normalize,
+                                                        GLsizei stride, GLvoid const * p);
 typedef GLint(DP_APIENTRY * TglGetUniformLocationFn)(GLuint programID, GLchar const * name);
-typedef void(DP_APIENTRY * TglGetActiveUniformFn)(GLuint programID, GLuint uniformIndex,
-                                                  GLsizei bufSize, GLsizei * length, GLint * size,
-                                                  GLenum * type, GLchar * name);
+typedef void(DP_APIENTRY * TglGetActiveUniformFn)(GLuint programID, GLuint uniformIndex, GLsizei bufSize,
+                                                  GLsizei * length, GLint * size, GLenum * type, GLchar * name);
 typedef void(DP_APIENTRY * TglUniform1iFn)(GLint location, GLint value);
 typedef void(DP_APIENTRY * TglUniform2iFn)(GLint location, GLint v1, GLint v2);
 typedef void(DP_APIENTRY * TglUniform3iFn)(GLint location, GLint v1, GLint v2, GLint v3);
@@ -118,21 +112,19 @@ typedef void(DP_APIENTRY * TglUniform1ivFn)(GLint location, GLsizei count, GLint
 typedef void(DP_APIENTRY * TglUniform1fFn)(GLint location, GLfloat value);
 typedef void(DP_APIENTRY * TglUniform2fFn)(GLint location, GLfloat v1, GLfloat v2);
 typedef void(DP_APIENTRY * TglUniform3fFn)(GLint location, GLfloat v1, GLfloat v2, GLfloat v3);
-typedef void(DP_APIENTRY * TglUniform4fFn)(GLint location, GLfloat v1, GLfloat v2, GLfloat v3,
-                                           GLfloat v4);
+typedef void(DP_APIENTRY * TglUniform4fFn)(GLint location, GLfloat v1, GLfloat v2, GLfloat v3, GLfloat v4);
 typedef void(DP_APIENTRY * TglUniform1fvFn)(GLint location, GLsizei count, GLfloat const * value);
-typedef void(DP_APIENTRY * TglUniformMatrix4fvFn)(GLint location, GLsizei count,
-                                                  GLboolean transpose, GLfloat const * value);
+typedef void(DP_APIENTRY * TglUniformMatrix4fvFn)(GLint location, GLsizei count, GLboolean transpose,
+                                                  GLfloat const * value);
 
 typedef void(DP_APIENTRY * TglGenFramebuffersFn)(GLsizei n, GLuint * framebuffers);
 typedef void(DP_APIENTRY * TglDeleteFramebuffersFn)(GLsizei n, GLuint const * framebuffers);
 typedef void(DP_APIENTRY * TglBindFramebufferFn)(GLenum target, GLuint id);
-typedef void(DP_APIENTRY * TglFramebufferTexture2DFn)(GLenum target, GLenum attachment,
-                                                      GLenum textarget, GLuint texture,
-                                                      GLint level);
+typedef void(DP_APIENTRY * TglFramebufferTexture2DFn)(GLenum target, GLenum attachment, GLenum textarget,
+                                                      GLuint texture, GLint level);
 typedef GLenum(DP_APIENTRY * TglCheckFramebufferStatusFn)(GLenum target);
 
-typedef GLubyte const * (DP_APIENTRY * TglGetStringiFn) (GLenum name, GLuint index);
+typedef GLubyte const *(DP_APIENTRY * TglGetStringiFn)(GLenum name, GLuint index);
 
 TglClearColorFn glClearColorFn = nullptr;
 TglClearFn glClearFn = nullptr;
@@ -212,7 +204,7 @@ TglCheckFramebufferStatusFn glCheckFramebufferStatusFn = nullptr;
 TglGetStringiFn glGetStringiFn = nullptr;
 
 #if !defined(GL_NUM_EXTENSIONS)
-  #define GL_NUM_EXTENSIONS 0x821D
+#define GL_NUM_EXTENSIONS 0x821D
 #endif
 
 std::mutex s_mutex;
@@ -352,8 +344,7 @@ bool GLFunctions::glHasExtension(std::string const & name)
   glGetIntegerv(GL_NUM_EXTENSIONS, &n);
   for (GLint i = 0; i < n; i++)
   {
-    std::string const extension =
-        std::string(reinterpret_cast<char const *>(glGetStringiFn(GL_EXTENSIONS, i)));
+    std::string const extension = std::string(reinterpret_cast<char const *>(glGetStringiFn(GL_EXTENSIONS, i)));
     if (extension == name)
       return true;
   }
@@ -533,8 +524,8 @@ void GLFunctions::glDebugMessageCallback(TglDebugProc messageCallback, void * us
   GLCHECK(glDebugMessageCallbackFn(reinterpret_cast<GLDEBUGPROC>(messageCallback), userParam));
 }
 
-void GLFunctions::glDebugMessageControl(glConst source, glConst type, glConst severity,
-                                        int32_t count, uint32_t const * ids, uint8_t enabled)
+void GLFunctions::glDebugMessageControl(glConst source, glConst type, glConst severity, int32_t count,
+                                        uint32_t const * ids, uint8_t enabled)
 {
   ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glDebugMessageControlFn != nullptr, ());
@@ -627,8 +618,7 @@ void GLFunctions::glUnmapBuffer(glConst target)
   GLCHECKCALL();
 }
 
-void * GLFunctions::glMapBufferRange(glConst target, uint32_t offset, uint32_t length,
-                                     glConst access)
+void * GLFunctions::glMapBufferRange(glConst target, uint32_t offset, uint32_t length, glConst access)
 {
   ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glMapBufferRangeFn != nullptr, ());
@@ -785,8 +775,8 @@ void GLFunctions::glEnableVertexAttribute(int attributeLocation)
   GLCHECK(glEnableVertexAttributeFn(attributeLocation));
 }
 
-void GLFunctions::glVertexAttributePointer(int attrLocation, uint32_t count, glConst type,
-                                           bool needNormalize, uint32_t stride, uint32_t offset)
+void GLFunctions::glVertexAttributePointer(int attrLocation, uint32_t count, glConst type, bool needNormalize,
+                                           uint32_t stride, uint32_t offset)
 {
   ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glVertexAttributePointerFn != nullptr, ());
@@ -794,14 +784,13 @@ void GLFunctions::glVertexAttributePointer(int attrLocation, uint32_t count, glC
                                      reinterpret_cast<void *>(offset)));
 }
 
-void GLFunctions::glGetActiveUniform(uint32_t programID, uint32_t uniformIndex,
-                                     int32_t * uniformSize, glConst * type, std::string & name)
+void GLFunctions::glGetActiveUniform(uint32_t programID, uint32_t uniformIndex, int32_t * uniformSize, glConst * type,
+                                     std::string & name)
 {
   ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   ASSERT(glGetActiveUniformFn != nullptr, ());
   GLchar buff[256];
-  GLCHECK(glGetActiveUniformFn(programID, uniformIndex, ARRAY_SIZE(buff), nullptr, uniformSize,
-                               type, buff));
+  GLCHECK(glGetActiveUniformFn(programID, uniformIndex, ARRAY_SIZE(buff), nullptr, uniformSize, type, buff));
   name = buff;
 }
 
@@ -948,8 +937,7 @@ void GLFunctions::glBindTexture(uint32_t textureID)
   GLCHECK(::glBindTexture(GL_TEXTURE_2D, textureID));
 }
 
-void GLFunctions::glTexImage2D(int width, int height, glConst layout, glConst pixelType,
-                               void const * data)
+void GLFunctions::glTexImage2D(int width, int height, glConst layout, glConst pixelType, void const * data)
 {
   ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   // In OpenGL ES3:
@@ -983,12 +971,11 @@ void GLFunctions::glTexImage2D(int width, int height, glConst layout, glConst pi
     }
   }
 
-  GLCHECK(::glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, width, height,
-                         0, layout, pixelType, data));
+  GLCHECK(::glTexImage2D(GL_TEXTURE_2D, 0, internalFormat, width, height, 0, layout, pixelType, data));
 }
 
-void GLFunctions::glTexSubImage2D(int x, int y, int width, int height, glConst layout,
-                                  glConst pixelType, void const * data)
+void GLFunctions::glTexSubImage2D(int x, int y, int width, int height, glConst layout, glConst pixelType,
+                                  void const * data)
 {
   ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
   GLCHECK(::glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, width, height, layout, pixelType, data));
@@ -1000,12 +987,10 @@ void GLFunctions::glTexParameter(glConst param, glConst value)
   GLCHECK(::glTexParameteri(GL_TEXTURE_2D, param, value));
 }
 
-void GLFunctions::glDrawElements(glConst primitive, uint32_t sizeOfIndex, uint32_t indexCount,
-                                 uint32_t startIndex)
+void GLFunctions::glDrawElements(glConst primitive, uint32_t sizeOfIndex, uint32_t indexCount, uint32_t startIndex)
 {
   ASSERT_EQUAL(CurrentApiVersion, dp::ApiVersion::OpenGLES3, ());
-  GLCHECK(::glDrawElements(primitive, indexCount,
-                           sizeOfIndex == sizeof(uint32_t) ? GL_UNSIGNED_INT : GL_UNSIGNED_SHORT,
+  GLCHECK(::glDrawElements(primitive, indexCount, sizeOfIndex == sizeof(uint32_t) ? GL_UNSIGNED_INT : GL_UNSIGNED_SHORT,
                            reinterpret_cast<GLvoid *>(startIndex * sizeOfIndex)));
 }
 
diff --git a/libs/drape/gl_functions.hpp b/libs/drape/gl_functions.hpp
index bd14dafc9..11007ef5b 100644
--- a/libs/drape/gl_functions.hpp
+++ b/libs/drape/gl_functions.hpp
@@ -30,7 +30,7 @@ public:
 
   static void glStencilOpSeparate(glConst face, glConst sfail, glConst dpfail, glConst dppass);
   static void glStencilFuncSeparate(glConst face, glConst func, int ref, uint32_t mask);
-  
+
   static void glPixelStore(glConst name, uint32_t value);
 
   static int32_t glGetInteger(glConst pname);
@@ -52,11 +52,11 @@ public:
 
   /// Debug Output
   static bool CanEnableDebugMessages();
-  using TglDebugProc = void (*)(glConst source, glConst type, uint32_t id, glConst severity,
-                                int32_t length, char const * message, void * userParam);
+  using TglDebugProc = void (*)(glConst source, glConst type, uint32_t id, glConst severity, int32_t length,
+                                char const * message, void * userParam);
   static void glDebugMessageCallback(TglDebugProc messageCallback, void * userParam);
-  static void glDebugMessageControl(glConst source, glConst type, glConst severity, int32_t count,
-                                    uint32_t const * ids, uint8_t enabled);
+  static void glDebugMessageControl(glConst source, glConst type, glConst severity, int32_t count, uint32_t const * ids,
+                                    uint8_t enabled);
 
   static void glLineWidth(uint32_t value);
 
@@ -82,8 +82,7 @@ public:
 
   /// Shaders support
   static uint32_t glCreateShader(glConst type);
-  static void glShaderSource(uint32_t shaderID, std::string const & src,
-                             std::string const & defines);
+  static void glShaderSource(uint32_t shaderID, std::string const & src, std::string const & defines);
   static bool glCompileShader(uint32_t shaderID, std::string & errorLog);
   static void glDeleteShader(uint32_t shaderID);
 
@@ -109,11 +108,11 @@ public:
   /// stride - how much bytes need to seek from current attribute value to get the second value
   /// offset - how much bytes need to seek from begin of currenct buffer to get first attribute
   /// value
-  static void glVertexAttributePointer(int32_t attrLocation, uint32_t count, glConst type,
-                                       bool needNormalize, uint32_t stride, uint32_t offset);
+  static void glVertexAttributePointer(int32_t attrLocation, uint32_t count, glConst type, bool needNormalize,
+                                       uint32_t stride, uint32_t offset);
 
-  static void glGetActiveUniform(uint32_t programID, uint32_t uniformIndex, int32_t * uniformSize,
-                                 glConst * type, std::string & name);
+  static void glGetActiveUniform(uint32_t programID, uint32_t uniformIndex, int32_t * uniformSize, glConst * type,
+                                 std::string & name);
 
   static int8_t glGetUniformLocation(uint32_t programID, std::string const & name);
   static void glUniformValuei(int8_t location, int32_t v);
@@ -139,15 +138,13 @@ public:
   static uint32_t glGenTexture();
   static void glDeleteTexture(uint32_t id);
   static void glBindTexture(uint32_t textureID);
-  static void glTexImage2D(int width, int height, glConst layout, glConst pixelType,
-                           void const * data);
-  static void glTexSubImage2D(int x, int y, int width, int height, glConst layout,
-                              glConst pixelType, void const * data);
+  static void glTexImage2D(int width, int height, glConst layout, glConst pixelType, void const * data);
+  static void glTexSubImage2D(int x, int y, int width, int height, glConst layout, glConst pixelType,
+                              void const * data);
   static void glTexParameter(glConst param, glConst value);
 
   // Draw support
-  static void glDrawElements(glConst primitive, uint32_t sizeOfIndex, uint32_t indexCount,
-                             uint32_t startIndex = 0);
+  static void glDrawElements(glConst primitive, uint32_t sizeOfIndex, uint32_t indexCount, uint32_t startIndex = 0);
   static void glDrawArrays(glConst mode, int32_t first, uint32_t count);
 
   // FBO support
@@ -161,8 +158,19 @@ public:
 void CheckGLError(base::SrcPoint const & src);
 
 #ifdef DEBUG
-#define GLCHECK(x) do { (x); CheckGLError(SRC()); } while (false)
-#define GLCHECKCALL() do { CheckGLError(SRC()); } while (false)
+#define GLCHECK(x)       \
+  do                     \
+  {                      \
+    (x);                 \
+    CheckGLError(SRC()); \
+  }                      \
+  while (false)
+#define GLCHECKCALL()    \
+  do                     \
+  {                      \
+    CheckGLError(SRC()); \
+  }                      \
+  while (false)
 #else
 #define GLCHECK(x) (x)
 #define GLCHECKCALL()
diff --git a/libs/drape/gl_gpu_program.cpp b/libs/drape/gl_gpu_program.cpp
index 2778a38ec..e3332a613 100644
--- a/libs/drape/gl_gpu_program.cpp
+++ b/libs/drape/gl_gpu_program.cpp
@@ -9,8 +9,8 @@
 
 namespace dp
 {
-GLGpuProgram::GLGpuProgram(std::string const & programName,
-                           ref_ptr<Shader> vertexShader, ref_ptr<Shader> fragmentShader)
+GLGpuProgram::GLGpuProgram(std::string const & programName, ref_ptr<Shader> vertexShader,
+                           ref_ptr<Shader> fragmentShader)
   : GpuProgram(programName)
   , m_vertexShader(vertexShader)
   , m_fragmentShader(fragmentShader)
@@ -82,10 +82,10 @@ GLGpuProgram::UniformsInfo const & GLGpuProgram::GetUniformsInfo() const
 
 void GLGpuProgram::LoadUniformLocations()
 {
-  static std::set<glConst> const kSupportedTypes = {
-      gl_const::GLFloatType, gl_const::GLFloatVec2, gl_const::GLFloatVec3, gl_const::GLFloatVec4,
-      gl_const::GLIntType,   gl_const::GLIntVec2,   gl_const::GLIntVec3,   gl_const::GLIntVec4,
-      gl_const::GLFloatMat4, gl_const::GLSampler2D};
+  static std::set<glConst> const kSupportedTypes = {gl_const::GLFloatType, gl_const::GLFloatVec2, gl_const::GLFloatVec3,
+                                                    gl_const::GLFloatVec4, gl_const::GLIntType,   gl_const::GLIntVec2,
+                                                    gl_const::GLIntVec3,   gl_const::GLIntVec4,   gl_const::GLFloatMat4,
+                                                    gl_const::GLSampler2D};
 
   auto const uniformsCount = GLFunctions::glGetProgramiv(m_programID, gl_const::GLActiveUniforms);
   for (int i = 0; i < uniformsCount; ++i)
@@ -108,10 +108,8 @@ uint32_t GLGpuProgram::CalculateNumericUniformsCount() const
 {
   uint32_t counter = 0;
   for (auto const & u : m_uniforms)
-  {
     if (u.second.m_type != gl_const::GLSampler2D)
       counter++;
-  }
   return counter;
 }
 }  // namespace dp
diff --git a/libs/drape/gl_gpu_program.hpp b/libs/drape/gl_gpu_program.hpp
index d446a3fb1..91ab30486 100644
--- a/libs/drape/gl_gpu_program.hpp
+++ b/libs/drape/gl_gpu_program.hpp
@@ -14,8 +14,7 @@ namespace dp
 class GLGpuProgram : public GpuProgram
 {
 public:
-  GLGpuProgram(std::string const & programName,
-               ref_ptr<Shader> vertexShader, ref_ptr<Shader> fragmentShader);
+  GLGpuProgram(std::string const & programName, ref_ptr<Shader> vertexShader, ref_ptr<Shader> fragmentShader);
   ~GLGpuProgram() override;
 
   void Bind() override;
diff --git a/libs/drape/gl_includes.hpp b/libs/drape/gl_includes.hpp
index 0e340e55f..57a68d126 100644
--- a/libs/drape/gl_includes.hpp
+++ b/libs/drape/gl_includes.hpp
@@ -3,31 +3,31 @@
 #include "std/target_os.hpp"
 
 #if defined(OMIM_OS_IPHONE)
-  #define GL_SILENCE_DEPRECATION
-  #include <OpenGLES/ES2/glext.h>
-  #include <OpenGLES/ES3/gl.h>
+#define GL_SILENCE_DEPRECATION
+#include <OpenGLES/ES2/glext.h>
+#include <OpenGLES/ES3/gl.h>
 #elif defined(OMIM_OS_MAC)
-  #define GL_SILENCE_DEPRECATION
-  #include <OpenGL/glext.h>
-  #include <OpenGL/gl3.h>
+#define GL_SILENCE_DEPRECATION
+#include <OpenGL/gl3.h>
+#include <OpenGL/glext.h>
 #elif defined(OMIM_OS_WINDOWS)
-  #include "std/windows.hpp"
-  #define GL_GLEXT_PROTOTYPES
-  #include <GL/gl.h>
-  #include "3party/GL/glext.h"
+#include "std/windows.hpp"
+#define GL_GLEXT_PROTOTYPES
+#include <GL/gl.h>
+#include "3party/GL/glext.h"
 #elif defined(OMIM_OS_ANDROID)
-  #define GL_GLEXT_PROTOTYPES
-  #include <GLES2/gl2.h>
-  #include <GLES2/gl2ext.h>
-  #include "android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/gl3stub.h"
-  #include <EGL/egl.h>
+#define GL_GLEXT_PROTOTYPES
+#include <EGL/egl.h>
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+#include "android/sdk/src/main/cpp/app/organicmaps/sdk/opengl/gl3stub.h"
 #elif defined(OMIM_OS_LINUX)
-  #define GL_GLEXT_PROTOTYPES
-  #include <dlfcn.h>
-  #include <GL/gl.h>
-  #include <GL/glext.h>
+#define GL_GLEXT_PROTOTYPES
+#include <GL/gl.h>
+#include <GL/glext.h>
+#include <dlfcn.h>
 #else
-  #define GL_GLEXT_PROTOTYPES
-  #include <GL/gl.h>
-  #include <GL/glext.h>
+#define GL_GLEXT_PROTOTYPES
+#include <GL/gl.h>
+#include <GL/glext.h>
 #endif
diff --git a/libs/drape/glsl_func.hpp b/libs/drape/glsl_func.hpp
index c0292b889..455ba7b86 100644
--- a/libs/drape/glsl_func.hpp
+++ b/libs/drape/glsl_func.hpp
@@ -7,14 +7,14 @@
 
 namespace glsl
 {
-using glm::dot;
 using glm::cross;
-using glm::normalize;
-using glm::length;
 using glm::distance;
+using glm::dot;
+using glm::length;
+using glm::normalize;
 
-using glm::translate;
 using glm::rotate;
 using glm::scale;
+using glm::translate;
 using glm::transpose;
 }  // namespace glsl
diff --git a/libs/drape/glsl_types.hpp b/libs/drape/glsl_types.hpp
index 2a8a58a86..7232cb191 100644
--- a/libs/drape/glsl_types.hpp
+++ b/libs/drape/glsl_types.hpp
@@ -72,17 +72,14 @@ inline m2::PointD FromVec2(glsl::vec2 const & pt)
 
 inline vec3 ToVec3(dp::Color const & color)
 {
-  return glsl::vec3(static_cast<float>(color.GetRed()) / 255,
-                    static_cast<float>(color.GetGreen()) / 255,
+  return glsl::vec3(static_cast<float>(color.GetRed()) / 255, static_cast<float>(color.GetGreen()) / 255,
                     static_cast<float>(color.GetBlue()) / 255);
 }
 
 inline vec4 ToVec4(dp::Color const & color)
 {
-  return glsl::vec4(static_cast<float>(color.GetRed()) / 255,
-                    static_cast<float>(color.GetGreen()) / 255,
-                    static_cast<float>(color.GetBlue()) / 255,
-                    static_cast<float>(color.GetAlpha()) / 255);
+  return glsl::vec4(static_cast<float>(color.GetRed()) / 255, static_cast<float>(color.GetGreen()) / 255,
+                    static_cast<float>(color.GetBlue()) / 255, static_cast<float>(color.GetAlpha()) / 255);
 }
 
 inline vec4 ToVec4(m2::PointD const & pt1, m2::PointD const & pt2)
@@ -90,8 +87,7 @@ inline vec4 ToVec4(m2::PointD const & pt1, m2::PointD const & pt2)
   return glsl::vec4(pt1.x, pt1.y, pt2.x, pt2.y);
 }
 
-template <typename T, typename = std::enable_if_t<std::is_integral<T>::value ||
-                                                  std::is_floating_point<T>::value>>
+template <typename T, typename = std::enable_if_t<std::is_integral<T>::value || std::is_floating_point<T>::value>>
 inline uint8_t GetArithmeticComponentCount()
 {
   return 1;
diff --git a/libs/drape/glyph.hpp b/libs/drape/glyph.hpp
index 39d9b858b..42fb2c6de 100644
--- a/libs/drape/glyph.hpp
+++ b/libs/drape/glyph.hpp
@@ -10,10 +10,7 @@ namespace dp
 {
 struct GlyphImage
 {
-  ~GlyphImage()
-  {
-    ASSERT_NOT_EQUAL(m_data.use_count(), 1, ("Probably you forgot to call Destroy()"));
-  }
+  ~GlyphImage() { ASSERT_NOT_EQUAL(m_data.use_count(), 1, ("Probably you forgot to call Destroy()")); }
 
   // TODO(AB): Get rid of manual call to Destroy.
   void Destroy()
@@ -48,22 +45,18 @@ struct GlyphFontAndId
 
   bool operator<(GlyphFontAndId const & other) const
   {
-    return std::tie(m_fontIndex, m_glyphId) < std::tie (other.m_fontIndex, other.m_glyphId);
+    return std::tie(m_fontIndex, m_glyphId) < std::tie(other.m_fontIndex, other.m_glyphId);
   }
 };
 
-
 // 50 glyphs should fit most of the strings based on tests in Switzerland and China.
 using TGlyphs = buffer_vector<GlyphFontAndId, 50>;
 
 struct Glyph
 {
-  Glyph(GlyphImage && image, GlyphFontAndId key)
-  : m_image(image), m_key(key)
-  {}
+  Glyph(GlyphImage && image, GlyphFontAndId key) : m_image(image), m_key(key) {}
 
   GlyphImage m_image;
   GlyphFontAndId m_key;
 };
 }  // namespace dp
-
diff --git a/libs/drape/glyph_manager.cpp b/libs/drape/glyph_manager.cpp
index 3715c5caa..864b728b6 100644
--- a/libs/drape/glyph_manager.cpp
+++ b/libs/drape/glyph_manager.cpp
@@ -18,10 +18,10 @@
 
 #include <ft2build.h>
 #include <hb-ft.h>
+#include <unicode/unistr.h>
 #include <limits>
 #include <sstream>
 #include <string>
-#include <unicode/unistr.h>
 #include <vector>
 
 #include FT_FREETYPE_H
@@ -33,7 +33,8 @@
 #undef __FTERRORS_H__
 #define FT_ERRORDEF(e, v, s) {e, s},
 #define FT_ERROR_START_LIST  {
-#define FT_ERROR_END_LIST    {0, 0}};
+#define FT_ERROR_END_LIST    {0, 0}} \
+  ;
 struct FreetypeError
 {
   int m_code;
@@ -44,647 +45,616 @@ FreetypeError constexpr g_FT_Errors[] =
 #include FT_ERRORS_H
 
 #ifdef DEBUG
-#define FREETYPE_CHECK(x) \
-    do \
-    { \
-      FT_Error const err = (x); \
-      if (err) \
-        LOG(LERROR, ("Freetype:", g_FT_Errors[err].m_code, g_FT_Errors[err].m_message)); \
-    } while (false)
+#define FREETYPE_CHECK(x)                                                              \
+  do                                                                                   \
+  {                                                                                    \
+    FT_Error const err = (x);                                                          \
+    if (err)                                                                           \
+      LOG(LERROR, ("Freetype:", g_FT_Errors[err].m_code, g_FT_Errors[err].m_message)); \
+  }                                                                                    \
+  while (false)
 #else
 #define FREETYPE_CHECK(x) x
 #endif
 
-namespace dp
+    namespace dp
 {
-int constexpr kInvalidFont = -1;
+  int constexpr kInvalidFont = -1;
 
-template <typename ToDo>
-void ParseUniBlocks(std::string const & uniBlocksFile, ToDo toDo)
-{
-  std::string uniBlocks;
-  try
+  template <typename ToDo>
+  void ParseUniBlocks(std::string const & uniBlocksFile, ToDo toDo)
   {
-    ReaderPtr<Reader>(GetPlatform().GetReader(uniBlocksFile)).ReadAsString(uniBlocks);
-  }
-  catch (RootException const & e)
-  {
-    LOG(LCRITICAL, ("Error reading uniblock description: ", e.what()));
-    return;
-  }
-
-  std::istringstream fin(uniBlocks);
-  while (true)
-  {
-    std::string name;
-    uint32_t start, end;
-    fin >> name >> std::hex >> start >> std::hex >> end;
-    if (!fin)
-      break;
-
-    toDo(name, start, end);
-  }
-}
-
-template <typename ToDo>
-void ParseFontList(std::string const & fontListFile, ToDo toDo)
-{
-  std::string fontList;
-  try
-  {
-    ReaderPtr<Reader>(GetPlatform().GetReader(fontListFile)).ReadAsString(fontList);
-  }
-  catch(RootException const & e)
-  {
-    LOG(LWARNING, ("Error reading font list ", fontListFile, " : ", e.what()));
-    return;
-  }
-
-  std::istringstream fin(fontList);
-  while (true)
-  {
-    std::string ubName;
-    std::string fontName;
-    fin >> ubName >> fontName;
-    if (!fin)
-      break;
-
-    toDo(ubName, fontName);
-  }
-}
-
-class Font
-{
-public:
-  DECLARE_EXCEPTION(InvalidFontException, RootException);
-  DISALLOW_COPY_AND_MOVE(Font);
-
-  Font(ReaderPtr<Reader> && fontReader, FT_Library lib)
-    : m_fontReader(std::move(fontReader))
-    , m_fontFace(nullptr)
-  {
-    std::memset(&m_stream, 0, sizeof(m_stream));
-    m_stream.size = static_cast<unsigned long>(m_fontReader.Size());
-    m_stream.descriptor.pointer = &m_fontReader;
-    m_stream.read = &Font::Read;
-    m_stream.close = &Font::Close;
-
-    FT_Open_Args args = {};
-    args.flags = FT_OPEN_STREAM;
-    args.stream = &m_stream;
-
-    FT_Error const err = FT_Open_Face(lib, &args, 0, &m_fontFace);
-    if (err || !IsValid())
-      MYTHROW(InvalidFontException, (g_FT_Errors[err].m_code, g_FT_Errors[err].m_message));
-
-    // The same font size is used to render all glyphs to textures and to shape them.
-    FT_Set_Pixel_Sizes(m_fontFace, kBaseFontSizePixels, kBaseFontSizePixels);
-    FT_Activate_Size(m_fontFace->size);
-  }
-
-  ~Font()
-  {
-    ASSERT(m_fontFace, ());
-    if (m_harfbuzzFont)
-      hb_font_destroy(m_harfbuzzFont);
-
-    FREETYPE_CHECK(FT_Done_Face(m_fontFace));
-  }
-
-  bool IsValid() const { return m_fontFace && m_fontFace->num_glyphs > 0; }
-
-  bool HasGlyph(strings::UniChar unicodePoint) const { return FT_Get_Char_Index(m_fontFace, unicodePoint) != 0; }
-
-  GlyphImage GetGlyphImage(uint16_t glyphId, int pixelHeight, bool sdf) const
-  {
-    FREETYPE_CHECK(FT_Set_Pixel_Sizes(m_fontFace, 0, pixelHeight));
-    // FT_LOAD_RENDER with FT_RENDER_MODE_SDF uses bsdf driver that is around 3x times faster
-    // than sdf driver, activated by FT_LOAD_DEFAULT + FT_RENDER_MODE_SDF
-    FREETYPE_CHECK(FT_Load_Glyph(m_fontFace, glyphId, FT_LOAD_RENDER));
-    if (sdf)
-      FREETYPE_CHECK(FT_Render_Glyph(m_fontFace->glyph, FT_RENDER_MODE_SDF));
-
-    FT_Bitmap const & bitmap = m_fontFace->glyph->bitmap;
-
-    SharedBufferManager::shared_buffer_ptr_t data;
-    if (bitmap.buffer != nullptr)
-    {
-      // Bitmap is stored without a padding.
-      data = SharedBufferManager::instance().reserveSharedBuffer(bitmap.width * bitmap.rows);
-      auto ptr = data->data();
-
-      for (unsigned int row = 0; row < bitmap.rows; ++row)
-      {
-        unsigned int const dstBaseIndex = row * bitmap.width;
-        int const srcBaseIndex = static_cast<int>(row) * bitmap.pitch;
-        for (unsigned int column = 0; column < bitmap.width; ++column)
-          ptr[dstBaseIndex + column] = bitmap.buffer[srcBaseIndex + column];
-      }
-    }
-    return {bitmap.width, bitmap.rows, data};
-  }
-
-  void GetCharcodes(std::vector<FT_ULong> & charcodes) const
-  {
-    FT_UInt gindex;
-    charcodes.push_back(FT_Get_First_Char(m_fontFace, &gindex));
-    while (gindex)
-      charcodes.push_back(FT_Get_Next_Char(m_fontFace, charcodes.back(), &gindex));
-
-    base::SortUnique(charcodes);
-  }
-
-  static unsigned long Read(FT_Stream stream, unsigned long offset, unsigned char * buffer, unsigned long count)
-  {
-    if (count != 0)
-    {
-      auto * reader = reinterpret_cast<ReaderPtr<Reader> *>(stream->descriptor.pointer);
-      reader->Read(offset, buffer, count);
-    }
-
-    return count;
-  }
-
-  static void Close(FT_Stream) {}
-
-  void MarkGlyphReady(uint16_t glyphId)
-  {
-    m_readyGlyphs.emplace(glyphId);
-  }
-
-  bool IsGlyphReady(uint16_t glyphId) const
-  {
-    return m_readyGlyphs.find(glyphId) != m_readyGlyphs.end();
-  }
-
-  std::string GetName() const { return std::string(m_fontFace->family_name) + ':' + m_fontFace->style_name; }
-
-  // This code is not thread safe.
-  void Shape(hb_buffer_t * hbBuffer, int fontPixelSize, int fontIndex, text::TextMetrics & outMetrics)
-  {
-    // TODO(AB): Do not set the same font size every time.
-    // TODO(AB): Use hb_font_set_scale to scale the same size font in HB instead of changing it in Freetype.
-    FREETYPE_CHECK(FT_Set_Pixel_Sizes(m_fontFace, 0 /* pixel_width */, fontPixelSize /* pixel_height */));
-    if (!m_harfbuzzFont)
-      m_harfbuzzFont = hb_ft_font_create(m_fontFace, nullptr);
-    //else
-    // Call on each font size change.
-    //  hb_ft_font_changed(m_harfbuzzFont);
-
-    // Shape!
-    hb_shape(m_harfbuzzFont, hbBuffer, nullptr, 0);
-
-    // Get the glyph and position information.
-    unsigned int glyphCount;
-    hb_glyph_info_t const * glyphInfo = hb_buffer_get_glyph_infos(hbBuffer, &glyphCount);
-    hb_glyph_position_t const * glyphPos = hb_buffer_get_glyph_positions(hbBuffer, &glyphCount);
-
-    for (unsigned int i = 0; i < glyphCount; ++i)
-    {
-      // TODO(AB): Check for missing glyph ID?
-      auto const glyphId = static_cast<uint16_t>(glyphInfo[i].codepoint);
-
-      FT_Int32 constexpr flags = FT_LOAD_DEFAULT;
-      FREETYPE_CHECK(FT_Load_Glyph(m_fontFace, glyphId, flags));
-
-      auto const & currPos = glyphPos[i];
-
-      auto const & metrics = m_fontFace->glyph->metrics;
-      auto const xOffset  = (currPos.x_offset + static_cast<int32_t>(metrics.horiBearingX)) >> 6;
-      // The original Drape code expects a bottom, not a top offset in its calculations.
-      auto const yOffset  = (currPos.y_offset + static_cast<int32_t>(metrics.horiBearingY) - metrics.height) >> 6;
-      int32_t const xAdvance = currPos.x_advance >> 6;
-      // yAdvance is always zero for horizontal text layouts.
-
-      outMetrics.AddGlyphMetrics(static_cast<int16_t>(fontIndex), glyphId, xOffset, yOffset, xAdvance, fontPixelSize);
-    }
-  }
-
-private:
-  ReaderPtr<Reader> m_fontReader;
-  FT_StreamRec_ m_stream;
-  FT_Face m_fontFace;
-
-  std::set<uint16_t> m_readyGlyphs;
-
-  hb_font_t * m_harfbuzzFont {nullptr};
-};
-
-// Information about single unicode block.
-struct UnicodeBlock
-{
-  std::string m_name;
-
-  strings::UniChar m_start;
-  strings::UniChar m_end;
-  std::vector<int> m_fontsWeight;
-
-  UnicodeBlock(std::string const & name, strings::UniChar start, strings::UniChar end)
-    : m_name(name)
-    , m_start(start)
-    , m_end(end)
-  {}
-
-  int GetFontOffset(int idx) const
-  {
-    if (m_fontsWeight.empty())
-      return kInvalidFont;
-
-    int maxWeight = 0;
-    int upperBoundWeight = std::numeric_limits<int>::max();
-    if (idx != kInvalidFont)
-      upperBoundWeight = m_fontsWeight[idx];
-
-    int index = kInvalidFont;
-    ASSERT_LESS(m_fontsWeight.size(), static_cast<size_t>(std::numeric_limits<int>::max()), ());
-    for (size_t i = 0; i < m_fontsWeight.size(); ++i)
-    {
-      int const w = m_fontsWeight[i];
-      if (w < upperBoundWeight && w > maxWeight)
-      {
-        maxWeight = w;
-        index = static_cast<int>(i);
-      }
-    }
-
-    return index;
-  }
-
-  bool HasSymbol(strings::UniChar sym) const
-  {
-    return (m_start <= sym) && (m_end >= sym);
-  }
-};
-
-using TUniBlocks = std::vector<UnicodeBlock>;
-using TUniBlockIter = TUniBlocks::const_iterator;
-
-struct GlyphManager::Impl
-{
-  DISALLOW_COPY_AND_MOVE(Impl);
-
-  Impl()
-  {
-    m_harfbuzzBuffer = hb_buffer_create();
-  }
-
-  ~Impl()
-  {
-    m_fonts.clear();
-    if (m_library)
-      FREETYPE_CHECK(FT_Done_FreeType(m_library));
-
-    hb_buffer_destroy(m_harfbuzzBuffer);
-  }
-
-  FT_Library m_library;
-  TUniBlocks m_blocks;
-  TUniBlockIter m_lastUsedBlock;
-  std::vector<std::unique_ptr<Font>> m_fonts;
-
-  // Required to use std::string_view as a search key for std::unordered_map::find().
-  struct StringHash : public std::hash<std::string_view> { using is_transparent = void; };
-
-  // TODO(AB): Compare performance with std::map.
-  std::unordered_map<std::string, text::TextMetrics, StringHash, std::equal_to<>> m_textMetricsCache;
-  hb_buffer_t * m_harfbuzzBuffer;
-};
-
-// Destructor is defined where pimpl's destructor is already known.
-GlyphManager::~GlyphManager() = default;
-
-GlyphManager::GlyphManager(Params const & params)
-  : m_impl(std::make_unique<Impl>())
-{
-  using TFontAndBlockName = std::pair<std::string, std::string>;
-  using TFontLst = buffer_vector<TFontAndBlockName, 64>;
-
-  TFontLst whitelst;
-  TFontLst blacklst;
-
-  m_impl->m_blocks.reserve(160);
-  ParseUniBlocks(params.m_uniBlocks, [this](std::string const & name,
-                                            strings::UniChar start, strings::UniChar end)
-  {
-    m_impl->m_blocks.emplace_back(name, start, end);
-  });
-
-  ParseFontList(params.m_whitelist, [&whitelst](std::string const & ubName, std::string const & fontName)
-  {
-    whitelst.emplace_back(fontName, ubName);
-  });
-
-  ParseFontList(params.m_blacklist, [&blacklst](std::string const & ubName, std::string const & fontName)
-  {
-    blacklst.emplace_back(fontName, ubName);
-  });
-
-  m_impl->m_fonts.reserve(params.m_fonts.size());
-
-  FREETYPE_CHECK(FT_Init_FreeType(&m_impl->m_library));
-
-  // Default Freetype spread/sdf border is 8.
-  static constexpr FT_Int kSdfBorder = dp::kSdfBorder;
-  for (auto const module : {"sdf", "bsdf"})
-    FREETYPE_CHECK(FT_Property_Set(m_impl->m_library, module, "spread", &kSdfBorder));
-
-  for (auto const & fontName : params.m_fonts)
-  {
-    bool ignoreFont = false;
-    std::for_each(blacklst.begin(), blacklst.end(), [&ignoreFont, &fontName](TFontAndBlockName const & p)
-    {
-      if (p.first == fontName && p.second == "*")
-        ignoreFont = true;
-    });
-
-    if (ignoreFont)
-      continue;
-
-    std::vector<FT_ULong> charCodes;
+    std::string uniBlocks;
     try
     {
-      m_impl->m_fonts.emplace_back(std::make_unique<Font>(GetPlatform().GetReader(fontName), m_impl->m_library));
-      m_impl->m_fonts.back()->GetCharcodes(charCodes);
+      ReaderPtr<Reader>(GetPlatform().GetReader(uniBlocksFile)).ReadAsString(uniBlocks);
     }
-    catch(RootException const & e)
+    catch (RootException const & e)
     {
-      LOG(LWARNING, ("Error reading font file =", fontName, "; Reason =", e.what()));
-      continue;
+      LOG(LCRITICAL, ("Error reading uniblock description: ", e.what()));
+      return;
     }
 
-    using BlockIndex = size_t;
-    using CharCounter = int;
-    using CoverNode = std::pair<BlockIndex, CharCounter>;
-    using CoverInfo = std::vector<CoverNode>;
-
-    size_t currentUniBlock = 0;
-    CoverInfo coverInfo;
-    for (auto const charCode : charCodes)
+    std::istringstream fin(uniBlocks);
+    while (true)
     {
-      size_t block = currentUniBlock;
-      while (block < m_impl->m_blocks.size())
-      {
-        if (m_impl->m_blocks[block].HasSymbol(static_cast<strings::UniChar>(charCode)))
-          break;
-        ++block;
-      }
+      std::string name;
+      uint32_t start, end;
+      fin >> name >> std::hex >> start >> std::hex >> end;
+      if (!fin)
+        break;
 
-      if (block < m_impl->m_blocks.size())
-      {
-        if (coverInfo.empty() || coverInfo.back().first != block)
-          coverInfo.emplace_back(block, 1);
-        else
-          ++coverInfo.back().second;
+      toDo(name, start, end);
+    }
+  }
 
-        currentUniBlock = block;
-      }
+  template <typename ToDo>
+  void ParseFontList(std::string const & fontListFile, ToDo toDo)
+  {
+    std::string fontList;
+    try
+    {
+      ReaderPtr<Reader>(GetPlatform().GetReader(fontListFile)).ReadAsString(fontList);
+    }
+    catch (RootException const & e)
+    {
+      LOG(LWARNING, ("Error reading font list ", fontListFile, " : ", e.what()));
+      return;
     }
 
-    using TUpdateCoverInfoFn = std::function<void(UnicodeBlock const & uniBlock, CoverNode & node)>;
-    auto const enumerateFn = [this, &coverInfo, &fontName] (TFontLst const & lst, TUpdateCoverInfoFn const & fn)
+    std::istringstream fin(fontList);
+    while (true)
     {
-      for (auto const & b : lst)
-      {
-        if (b.first != fontName)
-          continue;
+      std::string ubName;
+      std::string fontName;
+      fin >> ubName >> fontName;
+      if (!fin)
+        break;
 
-        for (CoverNode & node : coverInfo)
+      toDo(ubName, fontName);
+    }
+  }
+
+  class Font
+  {
+  public:
+    DECLARE_EXCEPTION(InvalidFontException, RootException);
+    DISALLOW_COPY_AND_MOVE(Font);
+
+    Font(ReaderPtr<Reader> && fontReader, FT_Library lib) : m_fontReader(std::move(fontReader)), m_fontFace(nullptr)
+    {
+      std::memset(&m_stream, 0, sizeof(m_stream));
+      m_stream.size = static_cast<unsigned long>(m_fontReader.Size());
+      m_stream.descriptor.pointer = &m_fontReader;
+      m_stream.read = &Font::Read;
+      m_stream.close = &Font::Close;
+
+      FT_Open_Args args = {};
+      args.flags = FT_OPEN_STREAM;
+      args.stream = &m_stream;
+
+      FT_Error const err = FT_Open_Face(lib, &args, 0, &m_fontFace);
+      if (err || !IsValid())
+        MYTHROW(InvalidFontException, (g_FT_Errors[err].m_code, g_FT_Errors[err].m_message));
+
+      // The same font size is used to render all glyphs to textures and to shape them.
+      FT_Set_Pixel_Sizes(m_fontFace, kBaseFontSizePixels, kBaseFontSizePixels);
+      FT_Activate_Size(m_fontFace->size);
+    }
+
+    ~Font()
+    {
+      ASSERT(m_fontFace, ());
+      if (m_harfbuzzFont)
+        hb_font_destroy(m_harfbuzzFont);
+
+      FREETYPE_CHECK(FT_Done_Face(m_fontFace));
+    }
+
+    bool IsValid() const { return m_fontFace && m_fontFace->num_glyphs > 0; }
+
+    bool HasGlyph(strings::UniChar unicodePoint) const { return FT_Get_Char_Index(m_fontFace, unicodePoint) != 0; }
+
+    GlyphImage GetGlyphImage(uint16_t glyphId, int pixelHeight, bool sdf) const
+    {
+      FREETYPE_CHECK(FT_Set_Pixel_Sizes(m_fontFace, 0, pixelHeight));
+      // FT_LOAD_RENDER with FT_RENDER_MODE_SDF uses bsdf driver that is around 3x times faster
+      // than sdf driver, activated by FT_LOAD_DEFAULT + FT_RENDER_MODE_SDF
+      FREETYPE_CHECK(FT_Load_Glyph(m_fontFace, glyphId, FT_LOAD_RENDER));
+      if (sdf)
+        FREETYPE_CHECK(FT_Render_Glyph(m_fontFace->glyph, FT_RENDER_MODE_SDF));
+
+      FT_Bitmap const & bitmap = m_fontFace->glyph->bitmap;
+
+      SharedBufferManager::shared_buffer_ptr_t data;
+      if (bitmap.buffer != nullptr)
+      {
+        // Bitmap is stored without a padding.
+        data = SharedBufferManager::instance().reserveSharedBuffer(bitmap.width * bitmap.rows);
+        auto ptr = data->data();
+
+        for (unsigned int row = 0; row < bitmap.rows; ++row)
         {
-          auto const & uniBlock = m_impl->m_blocks[node.first];
-          if (uniBlock.m_name == b.second)
-          {
-            fn(uniBlock, node);
-            break;
-          }
-          else if (b.second == "*")
-          {
-            fn(uniBlock, node);
-          }
+          unsigned int const dstBaseIndex = row * bitmap.width;
+          int const srcBaseIndex = static_cast<int>(row) * bitmap.pitch;
+          for (unsigned int column = 0; column < bitmap.width; ++column)
+            ptr[dstBaseIndex + column] = bitmap.buffer[srcBaseIndex + column];
         }
       }
+      return {bitmap.width, bitmap.rows, data};
+    }
+
+    void GetCharcodes(std::vector<FT_ULong> & charcodes) const
+    {
+      FT_UInt gindex;
+      charcodes.push_back(FT_Get_First_Char(m_fontFace, &gindex));
+      while (gindex)
+        charcodes.push_back(FT_Get_Next_Char(m_fontFace, charcodes.back(), &gindex));
+
+      base::SortUnique(charcodes);
+    }
+
+    static unsigned long Read(FT_Stream stream, unsigned long offset, unsigned char * buffer, unsigned long count)
+    {
+      if (count != 0)
+      {
+        auto * reader = reinterpret_cast<ReaderPtr<Reader> *>(stream->descriptor.pointer);
+        reader->Read(offset, buffer, count);
+      }
+
+      return count;
+    }
+
+    static void Close(FT_Stream) {}
+
+    void MarkGlyphReady(uint16_t glyphId) { m_readyGlyphs.emplace(glyphId); }
+
+    bool IsGlyphReady(uint16_t glyphId) const { return m_readyGlyphs.find(glyphId) != m_readyGlyphs.end(); }
+
+    std::string GetName() const { return std::string(m_fontFace->family_name) + ':' + m_fontFace->style_name; }
+
+    // This code is not thread safe.
+    void Shape(hb_buffer_t * hbBuffer, int fontPixelSize, int fontIndex, text::TextMetrics & outMetrics)
+    {
+      // TODO(AB): Do not set the same font size every time.
+      // TODO(AB): Use hb_font_set_scale to scale the same size font in HB instead of changing it in Freetype.
+      FREETYPE_CHECK(FT_Set_Pixel_Sizes(m_fontFace, 0 /* pixel_width */, fontPixelSize /* pixel_height */));
+      if (!m_harfbuzzFont)
+        m_harfbuzzFont = hb_ft_font_create(m_fontFace, nullptr);
+      // else
+      //  Call on each font size change.
+      //   hb_ft_font_changed(m_harfbuzzFont);
+
+      // Shape!
+      hb_shape(m_harfbuzzFont, hbBuffer, nullptr, 0);
+
+      // Get the glyph and position information.
+      unsigned int glyphCount;
+      hb_glyph_info_t const * glyphInfo = hb_buffer_get_glyph_infos(hbBuffer, &glyphCount);
+      hb_glyph_position_t const * glyphPos = hb_buffer_get_glyph_positions(hbBuffer, &glyphCount);
+
+      for (unsigned int i = 0; i < glyphCount; ++i)
+      {
+        // TODO(AB): Check for missing glyph ID?
+        auto const glyphId = static_cast<uint16_t>(glyphInfo[i].codepoint);
+
+        FT_Int32 constexpr flags = FT_LOAD_DEFAULT;
+        FREETYPE_CHECK(FT_Load_Glyph(m_fontFace, glyphId, flags));
+
+        auto const & currPos = glyphPos[i];
+
+        auto const & metrics = m_fontFace->glyph->metrics;
+        auto const xOffset = (currPos.x_offset + static_cast<int32_t>(metrics.horiBearingX)) >> 6;
+        // The original Drape code expects a bottom, not a top offset in its calculations.
+        auto const yOffset = (currPos.y_offset + static_cast<int32_t>(metrics.horiBearingY) - metrics.height) >> 6;
+        int32_t const xAdvance = currPos.x_advance >> 6;
+        // yAdvance is always zero for horizontal text layouts.
+
+        outMetrics.AddGlyphMetrics(static_cast<int16_t>(fontIndex), glyphId, xOffset, yOffset, xAdvance, fontPixelSize);
+      }
+    }
+
+  private:
+    ReaderPtr<Reader> m_fontReader;
+    FT_StreamRec_ m_stream;
+    FT_Face m_fontFace;
+
+    std::set<uint16_t> m_readyGlyphs;
+
+    hb_font_t * m_harfbuzzFont{nullptr};
+  };
+
+  // Information about single unicode block.
+  struct UnicodeBlock
+  {
+    std::string m_name;
+
+    strings::UniChar m_start;
+    strings::UniChar m_end;
+    std::vector<int> m_fontsWeight;
+
+    UnicodeBlock(std::string const & name, strings::UniChar start, strings::UniChar end)
+      : m_name(name)
+      , m_start(start)
+      , m_end(end)
+    {}
+
+    int GetFontOffset(int idx) const
+    {
+      if (m_fontsWeight.empty())
+        return kInvalidFont;
+
+      int maxWeight = 0;
+      int upperBoundWeight = std::numeric_limits<int>::max();
+      if (idx != kInvalidFont)
+        upperBoundWeight = m_fontsWeight[idx];
+
+      int index = kInvalidFont;
+      ASSERT_LESS(m_fontsWeight.size(), static_cast<size_t>(std::numeric_limits<int>::max()), ());
+      for (size_t i = 0; i < m_fontsWeight.size(); ++i)
+      {
+        int const w = m_fontsWeight[i];
+        if (w < upperBoundWeight && w > maxWeight)
+        {
+          maxWeight = w;
+          index = static_cast<int>(i);
+        }
+      }
+
+      return index;
+    }
+
+    bool HasSymbol(strings::UniChar sym) const { return (m_start <= sym) && (m_end >= sym); }
+  };
+
+  using TUniBlocks = std::vector<UnicodeBlock>;
+  using TUniBlockIter = TUniBlocks::const_iterator;
+
+  struct GlyphManager::Impl
+  {
+    DISALLOW_COPY_AND_MOVE(Impl);
+
+    Impl() { m_harfbuzzBuffer = hb_buffer_create(); }
+
+    ~Impl()
+    {
+      m_fonts.clear();
+      if (m_library)
+        FREETYPE_CHECK(FT_Done_FreeType(m_library));
+
+      hb_buffer_destroy(m_harfbuzzBuffer);
+    }
+
+    FT_Library m_library;
+    TUniBlocks m_blocks;
+    TUniBlockIter m_lastUsedBlock;
+    std::vector<std::unique_ptr<Font>> m_fonts;
+
+    // Required to use std::string_view as a search key for std::unordered_map::find().
+    struct StringHash : public std::hash<std::string_view>
+    {
+      using is_transparent = void;
     };
 
-    enumerateFn(blacklst, [](UnicodeBlock const &, CoverNode & node)
-    {
-      node.second = 0;
-    });
+    // TODO(AB): Compare performance with std::map.
+    std::unordered_map<std::string, text::TextMetrics, StringHash, std::equal_to<>> m_textMetricsCache;
+    hb_buffer_t * m_harfbuzzBuffer;
+  };
 
-    enumerateFn(whitelst, [this](UnicodeBlock const & uniBlock, CoverNode & node)
-    {
-      node.second = static_cast<int>(uniBlock.m_end + 1 - uniBlock.m_start + m_impl->m_fonts.size());
-    });
+  // Destructor is defined where pimpl's destructor is already known.
+  GlyphManager::~GlyphManager() = default;
 
-    for (CoverNode const & node : coverInfo)
-    {
-      UnicodeBlock & uniBlock = m_impl->m_blocks[node.first];
-      uniBlock.m_fontsWeight.resize(m_impl->m_fonts.size(), 0);
-      uniBlock.m_fontsWeight.back() = node.second;
-    }
-  }
-
-  m_impl->m_lastUsedBlock = m_impl->m_blocks.end();
-
-  LOG(LDEBUG, ("How unicode blocks are mapped on font files:"));
-
-  // We don't have black list for now.
-  ASSERT_EQUAL(m_impl->m_fonts.size(), params.m_fonts.size(), ());
-
-  for (auto const & b : m_impl->m_blocks)
+  GlyphManager::GlyphManager(Params const & params) : m_impl(std::make_unique<Impl>())
   {
-    auto const & weights = b.m_fontsWeight;
-    ASSERT_LESS_OR_EQUAL(weights.size(), m_impl->m_fonts.size(), ());
-    if (weights.empty())
-    {
-      LOG_SHORT(LDEBUG, (b.m_name, "is unsupported"));
-    }
-    else
-    {
-      size_t const ind = std::distance(weights.begin(), std::max_element(weights.begin(), weights.end()));
-      LOG_SHORT(LDEBUG, (b.m_name, "is in", params.m_fonts[ind]));
-    }
-  }
-}
+    using TFontAndBlockName = std::pair<std::string, std::string>;
+    using TFontLst = buffer_vector<TFontAndBlockName, 64>;
 
-int GlyphManager::GetFontIndex(strings::UniChar unicodePoint)
-{
-  auto iter = m_impl->m_blocks.cend();
-  if (m_impl->m_lastUsedBlock != m_impl->m_blocks.end() &&
-      m_impl->m_lastUsedBlock->HasSymbol(unicodePoint))
-  {
-    iter = m_impl->m_lastUsedBlock;
-  }
-  else
-  {
-    if (iter == m_impl->m_blocks.end() || !iter->HasSymbol(unicodePoint))
+    TFontLst whitelst;
+    TFontLst blacklst;
+
+    m_impl->m_blocks.reserve(160);
+    ParseUniBlocks(params.m_uniBlocks, [this](std::string const & name, strings::UniChar start, strings::UniChar end)
+    { m_impl->m_blocks.emplace_back(name, start, end); });
+
+    ParseFontList(params.m_whitelist, [&whitelst](std::string const & ubName, std::string const & fontName)
+    { whitelst.emplace_back(fontName, ubName); });
+
+    ParseFontList(params.m_blacklist, [&blacklst](std::string const & ubName, std::string const & fontName)
+    { blacklst.emplace_back(fontName, ubName); });
+
+    m_impl->m_fonts.reserve(params.m_fonts.size());
+
+    FREETYPE_CHECK(FT_Init_FreeType(&m_impl->m_library));
+
+    // Default Freetype spread/sdf border is 8.
+    static constexpr FT_Int kSdfBorder = dp::kSdfBorder;
+    for (auto const module : {"sdf", "bsdf"})
+      FREETYPE_CHECK(FT_Property_Set(m_impl->m_library, module, "spread", &kSdfBorder));
+
+    for (auto const & fontName : params.m_fonts)
     {
-      iter = std::lower_bound(m_impl->m_blocks.begin(), m_impl->m_blocks.end(), unicodePoint,
-                              [](UnicodeBlock const & block, strings::UniChar const & v)
+      bool ignoreFont = false;
+      std::for_each(blacklst.begin(), blacklst.end(), [&ignoreFont, &fontName](TFontAndBlockName const & p)
       {
-        return block.m_end < v;
+        if (p.first == fontName && p.second == "*")
+          ignoreFont = true;
       });
+
+      if (ignoreFont)
+        continue;
+
+      std::vector<FT_ULong> charCodes;
+      try
+      {
+        m_impl->m_fonts.emplace_back(std::make_unique<Font>(GetPlatform().GetReader(fontName), m_impl->m_library));
+        m_impl->m_fonts.back()->GetCharcodes(charCodes);
+      }
+      catch (RootException const & e)
+      {
+        LOG(LWARNING, ("Error reading font file =", fontName, "; Reason =", e.what()));
+        continue;
+      }
+
+      using BlockIndex = size_t;
+      using CharCounter = int;
+      using CoverNode = std::pair<BlockIndex, CharCounter>;
+      using CoverInfo = std::vector<CoverNode>;
+
+      size_t currentUniBlock = 0;
+      CoverInfo coverInfo;
+      for (auto const charCode : charCodes)
+      {
+        size_t block = currentUniBlock;
+        while (block < m_impl->m_blocks.size())
+        {
+          if (m_impl->m_blocks[block].HasSymbol(static_cast<strings::UniChar>(charCode)))
+            break;
+          ++block;
+        }
+
+        if (block < m_impl->m_blocks.size())
+        {
+          if (coverInfo.empty() || coverInfo.back().first != block)
+            coverInfo.emplace_back(block, 1);
+          else
+            ++coverInfo.back().second;
+
+          currentUniBlock = block;
+        }
+      }
+
+      using TUpdateCoverInfoFn = std::function<void(UnicodeBlock const & uniBlock, CoverNode & node)>;
+      auto const enumerateFn = [this, &coverInfo, &fontName](TFontLst const & lst, TUpdateCoverInfoFn const & fn)
+      {
+        for (auto const & b : lst)
+        {
+          if (b.first != fontName)
+            continue;
+
+          for (CoverNode & node : coverInfo)
+          {
+            auto const & uniBlock = m_impl->m_blocks[node.first];
+            if (uniBlock.m_name == b.second)
+            {
+              fn(uniBlock, node);
+              break;
+            }
+            else if (b.second == "*")
+            {
+              fn(uniBlock, node);
+            }
+          }
+        }
+      };
+
+      enumerateFn(blacklst, [](UnicodeBlock const &, CoverNode & node) { node.second = 0; });
+
+      enumerateFn(whitelst, [this](UnicodeBlock const & uniBlock, CoverNode & node)
+      { node.second = static_cast<int>(uniBlock.m_end + 1 - uniBlock.m_start + m_impl->m_fonts.size()); });
+
+      for (CoverNode const & node : coverInfo)
+      {
+        UnicodeBlock & uniBlock = m_impl->m_blocks[node.first];
+        uniBlock.m_fontsWeight.resize(m_impl->m_fonts.size(), 0);
+        uniBlock.m_fontsWeight.back() = node.second;
+      }
     }
-  }
 
-  if (iter == m_impl->m_blocks.end() || !iter->HasSymbol(unicodePoint))
-    return kInvalidFont;
+    m_impl->m_lastUsedBlock = m_impl->m_blocks.end();
 
-  m_impl->m_lastUsedBlock = iter;
+    LOG(LDEBUG, ("How unicode blocks are mapped on font files:"));
 
-  return FindFontIndexInBlock(*m_impl->m_lastUsedBlock, unicodePoint);
-}
+    // We don't have black list for now.
+    ASSERT_EQUAL(m_impl->m_fonts.size(), params.m_fonts.size(), ());
 
-int GlyphManager::GetFontIndex(std::u16string_view sv)
-{
-  // Only get font for the first character.
-  // TODO(AB): Make sure that text runs are split by fonts.
-  auto it = sv.begin();
-  return GetFontIndex(utf8::unchecked::next16(it));
-}
-
-int GlyphManager::GetFontIndexImmutable(strings::UniChar unicodePoint) const
-{
-  TUniBlockIter iter = std::lower_bound(m_impl->m_blocks.begin(), m_impl->m_blocks.end(), unicodePoint,
-                                        [](UnicodeBlock const & block, strings::UniChar const & v)
-  {
-    return block.m_end < v;
-  });
-
-  if (iter == m_impl->m_blocks.end() || !iter->HasSymbol(unicodePoint))
-    return kInvalidFont;
-
-  return FindFontIndexInBlock(*iter, unicodePoint);
-}
-
-int GlyphManager::FindFontIndexInBlock(UnicodeBlock const & block, strings::UniChar unicodePoint) const
-{
-  ASSERT(block.HasSymbol(unicodePoint), ());
-  for (int fontIndex = block.GetFontOffset(kInvalidFont); fontIndex != kInvalidFont;
-       fontIndex = block.GetFontOffset(fontIndex))
-  {
-    ASSERT_LESS(fontIndex, static_cast<int>(m_impl->m_fonts.size()), ());
-    auto const & f = m_impl->m_fonts[fontIndex];
-    if (f->HasGlyph(unicodePoint))
-      return fontIndex;
-  }
-
-  return kInvalidFont;
-}
-
-void GlyphManager::MarkGlyphReady(GlyphFontAndId key)
-{
-  ASSERT_GREATER_OR_EQUAL(key.m_fontIndex, 0, ());
-  ASSERT_LESS(key.m_fontIndex, static_cast<int>(m_impl->m_fonts.size()), ());
-  m_impl->m_fonts[key.m_fontIndex]->MarkGlyphReady(key.m_glyphId);
-}
-
-bool GlyphManager::AreGlyphsReady(TGlyphs const & glyphs) const
-{
-  for (auto [fontIndex, glyphId] : glyphs)
-  {
-    ASSERT_NOT_EQUAL(fontIndex, kInvalidFont, ());
-
-    if (!m_impl->m_fonts[fontIndex]->IsGlyphReady(glyphId))
-      return false;
-  }
-
-  return true;
-}
-
-// TODO(AB): Check and support invalid glyphs.
-GlyphImage GlyphManager::GetGlyphImage(GlyphFontAndId key, int pixelHeight, bool sdf) const
-{
-  return m_impl->m_fonts[key.m_fontIndex]->GetGlyphImage(key.m_glyphId, pixelHeight, sdf);
-}
-
-namespace
-{
-hb_language_t OrganicMapsLanguageToHarfbuzzLanguage(int8_t lang)
-{
-  // TODO(AB): can langs be converted faster?
-  auto const svLang = StringUtf8Multilang::GetLangByCode(lang);
-  auto const hbLanguage = hb_language_from_string(svLang.data(), static_cast<int>(svLang.size()));
-  if (hbLanguage == HB_LANGUAGE_INVALID)
-    return hb_language_get_default();
-  return hbLanguage;
-}
-}  // namespace
-
-// This method is NOT multithreading-safe.
-text::TextMetrics GlyphManager::ShapeText(std::string_view utf8, int fontPixelHeight, int8_t lang)
-{
-#ifdef DEBUG
-  static int const fontSize = fontPixelHeight;
-  ASSERT_EQUAL(fontSize, fontPixelHeight,
-      ("Cache relies on the same font height/metrics for each glyph", fontSize, fontPixelHeight));
-#endif
-
-  // A simple cache greatly speeds up text metrics calculation. It has 80+% hit ratio in most scenarios.
-  if (auto const found = m_impl->m_textMetricsCache.find(utf8); found != m_impl->m_textMetricsCache.end())
-    return found->second;
-
-  const auto [text, segments] = harfbuzz_shaping::GetTextSegments(utf8);
-
-  // TODO(AB): Optimize language conversion.
-  hb_language_t const hbLanguage = OrganicMapsLanguageToHarfbuzzLanguage(lang);
-
-  text::TextMetrics allGlyphs;
-  // For SplitText it's enough to know if the last visual (first logical) segment is RTL.
-  allGlyphs.m_isRTL = segments.back().m_direction == HB_DIRECTION_RTL;
-
-  // TODO(AB): Check if it's slower or faster.
-  allGlyphs.m_glyphs.reserve(icu::UnicodeString{false, text.data(), static_cast<int32_t>(text.size())}.countChar32());
-
-  for (auto const & substring : segments)
-  {
-    hb_buffer_clear_contents(m_impl->m_harfbuzzBuffer);
-
-    // TODO(AB): Some substrings use different fonts.
-    hb_buffer_add_utf16(m_impl->m_harfbuzzBuffer, reinterpret_cast<const uint16_t *>(text.data()),
-        static_cast<int>(text.size()), substring.m_start, substring.m_length);
-    hb_buffer_set_direction(m_impl->m_harfbuzzBuffer, substring.m_direction);
-    hb_buffer_set_script(m_impl->m_harfbuzzBuffer, substring.m_script);
-    hb_buffer_set_language(m_impl->m_harfbuzzBuffer, hbLanguage);
-
-    auto u32CharacterIter{text.begin() + substring.m_start};
-    auto const end{u32CharacterIter + substring.m_length};
-    do
+    for (auto const & b : m_impl->m_blocks)
     {
-      auto const u32Character = utf8::unchecked::next16(u32CharacterIter);
-      // TODO(AB): Mapping characters to fonts can be optimized.
-      int const fontIndex = GetFontIndex(u32Character);
-      if (fontIndex < 0)
-        LOG(LWARNING, ("No font was found for character", NumToHex(u32Character)));
+      auto const & weights = b.m_fontsWeight;
+      ASSERT_LESS_OR_EQUAL(weights.size(), m_impl->m_fonts.size(), ());
+      if (weights.empty())
+      {
+        LOG_SHORT(LDEBUG, (b.m_name, "is unsupported"));
+      }
       else
       {
-        // TODO(AB): Mapping font only by the first character in a string may fail in theory in some cases.
-        m_impl->m_fonts[fontIndex]->Shape(m_impl->m_harfbuzzBuffer, fontPixelHeight, fontIndex, allGlyphs);
-        break;
+        size_t const ind = std::distance(weights.begin(), std::max_element(weights.begin(), weights.end()));
+        LOG_SHORT(LDEBUG, (b.m_name, "is in", params.m_fonts[ind]));
       }
-    } while (u32CharacterIter != end);
+    }
   }
 
-  // Uncomment utf8 printing for debugging if necessary. It crashes JNI with non-modified UTF-8 strings on Android 5 and 6.
-  // See https://github.com/organicmaps/organicmaps/issues/10685
-  if (allGlyphs.m_glyphs.empty())
-    LOG(LWARNING, ("No glyphs were found in all fonts for string with characters in warnings above"/*, utf8*/));
-
-  // Empirically measured, may need more tuning.
-  size_t constexpr kMaxCacheSize = 50000;
-  if (m_impl->m_textMetricsCache.size() > kMaxCacheSize)
+  int GlyphManager::GetFontIndex(strings::UniChar unicodePoint)
   {
-    LOG(LINFO, ("Clearing text metrics cache"));
-    // TODO(AB): Is there a better way? E.g. clear a half of the cache?
-    m_impl->m_textMetricsCache.clear();
+    auto iter = m_impl->m_blocks.cend();
+    if (m_impl->m_lastUsedBlock != m_impl->m_blocks.end() && m_impl->m_lastUsedBlock->HasSymbol(unicodePoint))
+    {
+      iter = m_impl->m_lastUsedBlock;
+    }
+    else if (iter == m_impl->m_blocks.end() || !iter->HasSymbol(unicodePoint))
+    {
+      iter = std::lower_bound(m_impl->m_blocks.begin(), m_impl->m_blocks.end(), unicodePoint,
+                              [](UnicodeBlock const & block, strings::UniChar const & v) { return block.m_end < v; });
+    }
+
+    if (iter == m_impl->m_blocks.end() || !iter->HasSymbol(unicodePoint))
+      return kInvalidFont;
+
+    m_impl->m_lastUsedBlock = iter;
+
+    return FindFontIndexInBlock(*m_impl->m_lastUsedBlock, unicodePoint);
   }
 
-  m_impl->m_textMetricsCache.emplace(utf8, allGlyphs);
+  int GlyphManager::GetFontIndex(std::u16string_view sv)
+  {
+    // Only get font for the first character.
+    // TODO(AB): Make sure that text runs are split by fonts.
+    auto it = sv.begin();
+    return GetFontIndex(utf8::unchecked::next16(it));
+  }
 
-  return allGlyphs;
-}
+  int GlyphManager::GetFontIndexImmutable(strings::UniChar unicodePoint) const
+  {
+    TUniBlockIter iter =
+        std::lower_bound(m_impl->m_blocks.begin(), m_impl->m_blocks.end(), unicodePoint,
+                         [](UnicodeBlock const & block, strings::UniChar const & v) { return block.m_end < v; });
 
-text::TextMetrics GlyphManager::ShapeText(std::string_view utf8, int fontPixelHeight, char const * lang)
-{
-  return ShapeText(utf8, fontPixelHeight, StringUtf8Multilang::GetLangIndex(lang));
-}
+    if (iter == m_impl->m_blocks.end() || !iter->HasSymbol(unicodePoint))
+      return kInvalidFont;
+
+    return FindFontIndexInBlock(*iter, unicodePoint);
+  }
+
+  int GlyphManager::FindFontIndexInBlock(UnicodeBlock const & block, strings::UniChar unicodePoint) const
+  {
+    ASSERT(block.HasSymbol(unicodePoint), ());
+    for (int fontIndex = block.GetFontOffset(kInvalidFont); fontIndex != kInvalidFont;
+         fontIndex = block.GetFontOffset(fontIndex))
+    {
+      ASSERT_LESS(fontIndex, static_cast<int>(m_impl->m_fonts.size()), ());
+      auto const & f = m_impl->m_fonts[fontIndex];
+      if (f->HasGlyph(unicodePoint))
+        return fontIndex;
+    }
+
+    return kInvalidFont;
+  }
+
+  void GlyphManager::MarkGlyphReady(GlyphFontAndId key)
+  {
+    ASSERT_GREATER_OR_EQUAL(key.m_fontIndex, 0, ());
+    ASSERT_LESS(key.m_fontIndex, static_cast<int>(m_impl->m_fonts.size()), ());
+    m_impl->m_fonts[key.m_fontIndex]->MarkGlyphReady(key.m_glyphId);
+  }
+
+  bool GlyphManager::AreGlyphsReady(TGlyphs const & glyphs) const
+  {
+    for (auto [fontIndex, glyphId] : glyphs)
+    {
+      ASSERT_NOT_EQUAL(fontIndex, kInvalidFont, ());
+
+      if (!m_impl->m_fonts[fontIndex]->IsGlyphReady(glyphId))
+        return false;
+    }
+
+    return true;
+  }
+
+  // TODO(AB): Check and support invalid glyphs.
+  GlyphImage GlyphManager::GetGlyphImage(GlyphFontAndId key, int pixelHeight, bool sdf) const
+  {
+    return m_impl->m_fonts[key.m_fontIndex]->GetGlyphImage(key.m_glyphId, pixelHeight, sdf);
+  }
+
+  namespace
+  {
+  hb_language_t OrganicMapsLanguageToHarfbuzzLanguage(int8_t lang)
+  {
+    // TODO(AB): can langs be converted faster?
+    auto const svLang = StringUtf8Multilang::GetLangByCode(lang);
+    auto const hbLanguage = hb_language_from_string(svLang.data(), static_cast<int>(svLang.size()));
+    if (hbLanguage == HB_LANGUAGE_INVALID)
+      return hb_language_get_default();
+    return hbLanguage;
+  }
+  }  // namespace
+
+  // This method is NOT multithreading-safe.
+  text::TextMetrics GlyphManager::ShapeText(std::string_view utf8, int fontPixelHeight, int8_t lang)
+  {
+#ifdef DEBUG
+    static int const fontSize = fontPixelHeight;
+    ASSERT_EQUAL(fontSize, fontPixelHeight,
+                 ("Cache relies on the same font height/metrics for each glyph", fontSize, fontPixelHeight));
+#endif
+
+    // A simple cache greatly speeds up text metrics calculation. It has 80+% hit ratio in most scenarios.
+    if (auto const found = m_impl->m_textMetricsCache.find(utf8); found != m_impl->m_textMetricsCache.end())
+      return found->second;
+
+    auto const [text, segments] = harfbuzz_shaping::GetTextSegments(utf8);
+
+    // TODO(AB): Optimize language conversion.
+    hb_language_t const hbLanguage = OrganicMapsLanguageToHarfbuzzLanguage(lang);
+
+    text::TextMetrics allGlyphs;
+    // For SplitText it's enough to know if the last visual (first logical) segment is RTL.
+    allGlyphs.m_isRTL = segments.back().m_direction == HB_DIRECTION_RTL;
+
+    // TODO(AB): Check if it's slower or faster.
+    allGlyphs.m_glyphs.reserve(icu::UnicodeString{false, text.data(), static_cast<int32_t>(text.size())}.countChar32());
+
+    for (auto const & substring : segments)
+    {
+      hb_buffer_clear_contents(m_impl->m_harfbuzzBuffer);
+
+      // TODO(AB): Some substrings use different fonts.
+      hb_buffer_add_utf16(m_impl->m_harfbuzzBuffer, reinterpret_cast<uint16_t const *>(text.data()),
+                          static_cast<int>(text.size()), substring.m_start, substring.m_length);
+      hb_buffer_set_direction(m_impl->m_harfbuzzBuffer, substring.m_direction);
+      hb_buffer_set_script(m_impl->m_harfbuzzBuffer, substring.m_script);
+      hb_buffer_set_language(m_impl->m_harfbuzzBuffer, hbLanguage);
+
+      auto u32CharacterIter{text.begin() + substring.m_start};
+      auto const end{u32CharacterIter + substring.m_length};
+      do
+      {
+        auto const u32Character = utf8::unchecked::next16(u32CharacterIter);
+        // TODO(AB): Mapping characters to fonts can be optimized.
+        int const fontIndex = GetFontIndex(u32Character);
+        if (fontIndex < 0)
+          LOG(LWARNING, ("No font was found for character", NumToHex(u32Character)));
+        else
+        {
+          // TODO(AB): Mapping font only by the first character in a string may fail in theory in some cases.
+          m_impl->m_fonts[fontIndex]->Shape(m_impl->m_harfbuzzBuffer, fontPixelHeight, fontIndex, allGlyphs);
+          break;
+        }
+      }
+      while (u32CharacterIter != end);
+    }
+
+    // Uncomment utf8 printing for debugging if necessary. It crashes JNI with non-modified UTF-8 strings on Android 5
+    // and 6. See https://github.com/organicmaps/organicmaps/issues/10685
+    if (allGlyphs.m_glyphs.empty())
+      LOG(LWARNING, ("No glyphs were found in all fonts for string with characters in warnings above" /*, utf8*/));
+
+    // Empirically measured, may need more tuning.
+    size_t constexpr kMaxCacheSize = 50000;
+    if (m_impl->m_textMetricsCache.size() > kMaxCacheSize)
+    {
+      LOG(LINFO, ("Clearing text metrics cache"));
+      // TODO(AB): Is there a better way? E.g. clear a half of the cache?
+      m_impl->m_textMetricsCache.clear();
+    }
+
+    m_impl->m_textMetricsCache.emplace(utf8, allGlyphs);
+
+    return allGlyphs;
+  }
+
+  text::TextMetrics GlyphManager::ShapeText(std::string_view utf8, int fontPixelHeight, char const * lang)
+  {
+    return ShapeText(utf8, fontPixelHeight, StringUtf8Multilang::GetLangIndex(lang));
+  }
 
 }  // namespace dp
diff --git a/libs/drape/glyph_manager.hpp b/libs/drape/glyph_manager.hpp
index 15d7fb194..73fa2b08e 100644
--- a/libs/drape/glyph_manager.hpp
+++ b/libs/drape/glyph_manager.hpp
@@ -23,24 +23,22 @@ struct GlyphMetrics
   int32_t m_yOffset;
   int32_t m_xAdvance;
   // yAdvance is used only in vertical text layouts and is 0 for horizontal texts.
-  int32_t m_yAdvance {0};
+  int32_t m_yAdvance{0};
 
-  bool operator==(GlyphMetrics const & other) const
-  {
-    return m_key == other.m_key;
-  }
+  bool operator==(GlyphMetrics const & other) const { return m_key == other.m_key; }
 };
 
 // TODO(AB): Move to a separate file?
 struct TextMetrics
 {
-  int32_t m_lineWidthInPixels {0};
-  int32_t m_maxLineHeightInPixels {0};
+  int32_t m_lineWidthInPixels{0};
+  int32_t m_maxLineHeightInPixels{0};
   std::vector<GlyphMetrics> m_glyphs;
   // Used for SplitText.
-  bool m_isRTL {false};
+  bool m_isRTL{false};
 
-  void AddGlyphMetrics(int16_t font, uint16_t glyphId, int32_t xOffset, int32_t yOffset, int32_t xAdvance, int32_t height)
+  void AddGlyphMetrics(int16_t font, uint16_t glyphId, int32_t xOffset, int32_t yOffset, int32_t xAdvance,
+                       int32_t height)
   {
     m_glyphs.push_back({{font, glyphId}, xOffset, yOffset, xAdvance});
 
diff --git a/libs/drape/gpu_buffer.cpp b/libs/drape/gpu_buffer.cpp
index a280aeddd..6abdebf63 100644
--- a/libs/drape/gpu_buffer.cpp
+++ b/libs/drape/gpu_buffer.cpp
@@ -13,8 +13,7 @@ namespace
 {
 bool IsMapBufferSupported()
 {
-  static bool const isSupported =
-    GLFunctions::ExtensionsList.IsSupported(GLExtensionsList::MapBuffer);
+  static bool const isSupported = GLFunctions::ExtensionsList.IsSupported(GLExtensionsList::MapBuffer);
   return isSupported;
 }
 
@@ -27,8 +26,7 @@ glConst glTarget(GPUBuffer::Target t)
 }
 }  // namespace
 
-GPUBuffer::GPUBuffer(Target t, void const * data, uint8_t elementSize, uint32_t capacity,
-                     uint64_t batcherHash)
+GPUBuffer::GPUBuffer(Target t, void const * data, uint8_t elementSize, uint32_t capacity, uint64_t batcherHash)
   : TBase(elementSize, capacity)
   , m_t(t)
   , m_mappingOffset(0)
@@ -59,8 +57,7 @@ void GPUBuffer::UploadData(void const * data, uint32_t elementCount)
 
   uint32_t currentSize = GetCurrentSize();
   uint8_t elementSize = GetElementSize();
-  ASSERT(GetCapacity() >= elementCount + currentSize,
-         ("Not enough memory to upload ", elementCount, " elements"));
+  ASSERT(GetCapacity() >= elementCount + currentSize, ("Not enough memory to upload ", elementCount, " elements"));
   Bind();
 
 #if defined(CHECK_VBO_BOUNDS)
@@ -69,8 +66,7 @@ void GPUBuffer::UploadData(void const * data, uint32_t elementCount)
   ASSERT_LESS_OR_EQUAL((elementCount + currentSize) * elementSize, size, ());
 #endif
 
-  GLFunctions::glBufferSubData(glTarget(m_t), elementCount * elementSize, data,
-                               currentSize * elementSize);
+  GLFunctions::glBufferSubData(glTarget(m_t), elementCount * elementSize, data, currentSize * elementSize);
   TBase::UploadData(elementCount);
 
 #if defined(TRACK_GPU_MEM)
@@ -78,7 +74,10 @@ void GPUBuffer::UploadData(void const * data, uint32_t elementCount)
 #endif
 }
 
-void GPUBuffer::Bind() { GLFunctions::glBindBuffer(m_bufferID, glTarget(m_t)); }
+void GPUBuffer::Bind()
+{
+  GLFunctions::glBindBuffer(m_bufferID, glTarget(m_t));
+}
 
 void * GPUBuffer::Map(uint32_t elementOffset, uint32_t elementCount)
 {
@@ -96,12 +95,10 @@ void * GPUBuffer::Map(uint32_t elementOffset, uint32_t elementCount)
   uint32_t const elementSize = GetElementSize();
   uint32_t const byteOffset = elementOffset * elementSize;
   uint32_t const byteCount = elementCount * elementSize;
-  return GLFunctions::glMapBufferRange(glTarget(m_t), byteOffset, byteCount,
-                                        gl_const::GLWriteBufferBit);
+  return GLFunctions::glMapBufferRange(glTarget(m_t), byteOffset, byteCount, gl_const::GLWriteBufferBit);
 }
 
-void GPUBuffer::UpdateData(void * gpuPtr, void const * data, uint32_t elementOffset,
-                           uint32_t elementCount)
+void GPUBuffer::UpdateData(void * gpuPtr, void const * data, uint32_t elementOffset, uint32_t elementCount)
 {
   uint32_t const elementSize = GetElementSize();
   uint32_t const byteOffset = (elementOffset + m_mappingOffset) * elementSize;
@@ -146,8 +143,7 @@ void GPUBuffer::Resize(void const * data, uint32_t elementCount)
 {
   TBase::Resize(elementCount);
   Bind();
-  GLFunctions::glBufferData(glTarget(m_t), GetCapacity() * GetElementSize(), data,
-                            gl_const::GLDynamicDraw);
+  GLFunctions::glBufferData(glTarget(m_t), GetCapacity() * GetElementSize(), data, gl_const::GLDynamicDraw);
 
   // If we have set up data already (in glBufferData), we have to call SetDataSize.
   if (data != nullptr)
diff --git a/libs/drape/gpu_buffer.hpp b/libs/drape/gpu_buffer.hpp
index d835e8a2d..c8ad0a513 100644
--- a/libs/drape/gpu_buffer.hpp
+++ b/libs/drape/gpu_buffer.hpp
@@ -17,8 +17,7 @@ public:
     IndexBuffer
   };
 
-  GPUBuffer(Target t, void const * data, uint8_t elementSize, uint32_t capacity,
-            uint64_t batcherHash);
+  GPUBuffer(Target t, void const * data, uint8_t elementSize, uint32_t capacity, uint64_t batcherHash);
   ~GPUBuffer() override;
 
   void UploadData(void const * data, uint32_t elementCount);
diff --git a/libs/drape/gpu_program.hpp b/libs/drape/gpu_program.hpp
index 475957549..205e51d1b 100644
--- a/libs/drape/gpu_program.hpp
+++ b/libs/drape/gpu_program.hpp
@@ -7,9 +7,7 @@ namespace dp
 class GpuProgram
 {
 public:
-  explicit GpuProgram(std::string const & programName)
-    : m_programName(programName)
-  {}
+  explicit GpuProgram(std::string const & programName) : m_programName(programName) {}
 
   virtual ~GpuProgram() = default;
 
diff --git a/libs/drape/graphics_context.hpp b/libs/drape/graphics_context.hpp
index 0215a49cc..2165a3e57 100644
--- a/libs/drape/graphics_context.hpp
+++ b/libs/drape/graphics_context.hpp
@@ -13,7 +13,7 @@ enum ClearBits : uint32_t
   DepthBit = 1 << 1,
   StencilBit = 1 << 2
 };
-  
+
 uint32_t constexpr kClearBitsStoreAll = ClearBits::ColorBit | ClearBits::DepthBit | ClearBits::StencilBit;
 
 enum class TestFunction : uint8_t
@@ -86,8 +86,8 @@ public:
   virtual void SetDepthTestFunction(TestFunction depthFunction) = 0;
   virtual void SetStencilTestEnabled(bool enabled) = 0;
   virtual void SetStencilFunction(StencilFace face, TestFunction stencilFunction) = 0;
-  virtual void SetStencilActions(StencilFace face, StencilAction stencilFailAction,
-                                 StencilAction depthFailAction, StencilAction passAction) = 0;
+  virtual void SetStencilActions(StencilFace face, StencilAction stencilFailAction, StencilAction depthFailAction,
+                                 StencilAction passAction) = 0;
   virtual void SetStencilReferenceValue(uint32_t stencilReferenceValue) = 0;
   virtual void SetCullingEnabled(bool enabled) = 0;
 };
diff --git a/libs/drape/graphics_context_factory.cpp b/libs/drape/graphics_context_factory.cpp
index e1c5ec331..fc860fb76 100644
--- a/libs/drape/graphics_context_factory.cpp
+++ b/libs/drape/graphics_context_factory.cpp
@@ -14,18 +14,17 @@ ThreadSafeFactory::~ThreadSafeFactory()
 
 GraphicsContext * ThreadSafeFactory::GetDrawContext()
 {
-  return CreateContext([this](){ return m_factory->GetDrawContext(); },
-                       [this](){ return m_factory->IsUploadContextCreated(); });
+  return CreateContext([this]() { return m_factory->GetDrawContext(); },
+                       [this]() { return m_factory->IsUploadContextCreated(); });
 }
 
 GraphicsContext * ThreadSafeFactory::GetResourcesUploadContext()
 {
-  return CreateContext([this](){ return m_factory->GetResourcesUploadContext(); },
-                       [this](){ return m_factory->IsDrawContextCreated(); });
+  return CreateContext([this]() { return m_factory->GetResourcesUploadContext(); },
+                       [this]() { return m_factory->IsDrawContextCreated(); });
 }
 
-GraphicsContext * ThreadSafeFactory::CreateContext(TCreateCtxFn const & createFn,
-                                                   TIsSeparateCreatedFn const & checkFn)
+GraphicsContext * ThreadSafeFactory::CreateContext(TCreateCtxFn const & createFn, TIsSeparateCreatedFn const & checkFn)
 {
   std::unique_lock<std::mutex> lock(m_condLock);
   GraphicsContext * ctx = createFn();
diff --git a/libs/drape/graphics_context_factory.hpp b/libs/drape/graphics_context_factory.hpp
index b49d6fe27..918cedbac 100644
--- a/libs/drape/graphics_context_factory.hpp
+++ b/libs/drape/graphics_context_factory.hpp
@@ -30,7 +30,7 @@ public:
   GraphicsContext * GetDrawContext() override;
   GraphicsContext * GetResourcesUploadContext() override;
 
-  template<typename T>
+  template <typename T>
   T * CastFactory()
   {
     return dynamic_cast<T *>(m_factory);
@@ -40,10 +40,9 @@ public:
   void SetPresentAvailable(bool available) override;
 
 protected:
-  using TCreateCtxFn = std::function<GraphicsContext * ()>;
+  using TCreateCtxFn = std::function<GraphicsContext *()>;
   using TIsSeparateCreatedFn = std::function<bool()>;
-  GraphicsContext * CreateContext(TCreateCtxFn const & createFn,
-                                  TIsSeparateCreatedFn const & checkFn);
+  GraphicsContext * CreateContext(TCreateCtxFn const & createFn, TIsSeparateCreatedFn const & checkFn);
 
 private:
   GraphicsContextFactory * m_factory;
diff --git a/libs/drape/harfbuzz_shaping.cpp b/libs/drape/harfbuzz_shaping.cpp
index d79c7bceb..b03df65cf 100644
--- a/libs/drape/harfbuzz_shaping.cpp
+++ b/libs/drape/harfbuzz_shaping.cpp
@@ -25,8 +25,8 @@ size_t GetScriptExtensions(char32_t codepoint, TScriptsArray & scripts)
 {
   // Fill scripts with the script extensions.
   UErrorCode icu_error = U_ZERO_ERROR;
-  size_t const count = uscript_getScriptExtensions(static_cast<UChar32>(codepoint), scripts.data(),
-                                                   scripts.max_size(), &icu_error);
+  size_t const count =
+      uscript_getScriptExtensions(static_cast<UChar32>(codepoint), scripts.data(), scripts.max_size(), &icu_error);
   if (U_FAILURE(icu_error))
   {
     LOG(LWARNING, ("uscript_getScriptExtensions failed with error", icu_error));
@@ -132,7 +132,7 @@ hb_script_t ICUScriptToHarfbuzzScript(UScriptCode script)
 {
   if (script == USCRIPT_INVALID_CODE)
     return HB_SCRIPT_INVALID;
-  return hb_script_from_string(uscript_getShortName (script), -1);
+  return hb_script_from_string(uscript_getShortName(script), -1);
 }
 
 void GetSingleTextLineRuns(TextSegments & segments)
@@ -167,14 +167,15 @@ void GetSingleTextLineRuns(TextSegments & segments)
     {
       // Find the longest sequence of characters that have at least one common UScriptCode value.
       UScriptCode script = USCRIPT_INVALID_CODE;
-      size_t const scriptRunEnd = ScriptInterval(segments.m_text, scriptRunStart, bidiRunEnd - scriptRunStart, script) + scriptRunStart;
+      size_t const scriptRunEnd =
+          ScriptInterval(segments.m_text, scriptRunStart, bidiRunEnd - scriptRunStart, script) + scriptRunStart;
       ASSERT_LESS(scriptRunStart, base::asserted_cast<int32_t>(scriptRunEnd), ());
 
       // TODO(AB): May need to break on different unicode blocks, parentheses, and control chars (spaces).
 
       // TODO(AB): Support vertical layouts if necessary.
       segments.m_segments.emplace_back(scriptRunStart, scriptRunEnd - scriptRunStart, ICUScriptToHarfbuzzScript(script),
-                                   bidiLevel & 0x01 ? HB_DIRECTION_RTL : HB_DIRECTION_LTR);
+                                       bidiLevel & 0x01 ? HB_DIRECTION_RTL : HB_DIRECTION_LTR);
 
       // Move to the next script sequence.
       scriptRunStart = static_cast<int32_t>(scriptRunEnd);
@@ -215,7 +216,7 @@ TextSegments GetTextSegments(std::string_view utf8)
   ASSERT(std::string::npos == utf8.find_first_of("\r\n"), ("Shaping with line breaks is not supported", utf8));
 
   // TODO(AB): Can unnecessary conversion/allocation be avoided?
-  TextSegments segments {strings::ToUtf16(utf8), {}};
+  TextSegments segments{strings::ToUtf16(utf8), {}};
   // TODO(AB): Runs are not split by breaking chars and by different fonts.
   GetSingleTextLineRuns(segments);
   ReorderRTL(segments);
@@ -225,8 +226,8 @@ TextSegments GetTextSegments(std::string_view utf8)
 std::string DebugPrint(TextSegment const & segment)
 {
   std::stringstream ss;
-  ss << "TextSegment[start=" << segment.m_start << ", length=" << segment.m_length
-     << ", script=" << segment.m_script << ", direction=" << segment.m_direction << ']';
+  ss << "TextSegment[start=" << segment.m_start << ", length=" << segment.m_length << ", script=" << segment.m_script
+     << ", direction=" << segment.m_direction << ']';
   return ss.str();
 }
 
diff --git a/libs/drape/harfbuzz_shaping.hpp b/libs/drape/harfbuzz_shaping.hpp
index 6c2cc2c60..c8d8a4c34 100644
--- a/libs/drape/harfbuzz_shaping.hpp
+++ b/libs/drape/harfbuzz_shaping.hpp
@@ -16,7 +16,11 @@ struct TextSegment
   hb_direction_t m_direction;
 
   TextSegment(int32_t start, int32_t length, hb_script_t script, hb_direction_t direction)
-      : m_start(start), m_length(length), m_script(script), m_direction(direction) {}
+    : m_start(start)
+    , m_length(length)
+    , m_script(script)
+    , m_direction(direction)
+  {}
 };
 
 struct TextSegments
@@ -24,7 +28,7 @@ struct TextSegments
   std::u16string m_text;
   std::vector<TextSegment> m_segments;
   // TODO(AB): Reverse indexes to order segments instead of moving them.
-  //std::vector<size_t> m_segmentsOrder;
+  // std::vector<size_t> m_segmentsOrder;
 };
 
 // Finds segments with common properties suitable for harfbuzz in a single line of text without newlines.
diff --git a/libs/drape/hw_texture.cpp b/libs/drape/hw_texture.cpp
index 1d99e2028..a16c16fab 100644
--- a/libs/drape/hw_texture.cpp
+++ b/libs/drape/hw_texture.cpp
@@ -25,15 +25,12 @@ namespace dp
 std::string DebugPrint(HWTexture::Params const & p)
 {
   std::ostringstream ss;
-  ss << "Width = " << p.m_width
-     << "; Height = " << p.m_height
-     << "; Format = " << DebugPrint(p.m_format)
+  ss << "Width = " << p.m_width << "; Height = " << p.m_height << "; Format = " << DebugPrint(p.m_format)
      << "; IsRenderTarget = " << p.m_isRenderTarget;
   return ss.str();
 }
 
-void UnpackFormat(ref_ptr<dp::GraphicsContext> context, TextureFormat format,
-                  glConst & layout, glConst & pixelType)
+void UnpackFormat(ref_ptr<dp::GraphicsContext> context, TextureFormat format, glConst & layout, glConst & pixelType)
 {
   auto const apiVersion = context->GetApiVersion();
   CHECK(apiVersion == dp::ApiVersion::OpenGLES3, ());
@@ -65,9 +62,7 @@ void UnpackFormat(ref_ptr<dp::GraphicsContext> context, TextureFormat format,
     pixelType = gl_const::GLUnsignedIntType;
     return;
 
-  case TextureFormat::Unspecified:
-    CHECK(false, ());
-    return;
+  case TextureFormat::Unspecified: CHECK(false, ()); return;
   }
   UNREACHABLE();
 }
@@ -121,7 +116,10 @@ void HWTexture::Create(ref_ptr<dp::GraphicsContext>, Params const & params, ref_
 #endif
 }
 
-TextureFormat HWTexture::GetFormat() const { return m_params.m_format; }
+TextureFormat HWTexture::GetFormat() const
+{
+  return m_params.m_format;
+}
 
 uint32_t HWTexture::GetWidth() const
 {
@@ -147,7 +145,10 @@ float HWTexture::GetT(uint32_t y) const
   return y / static_cast<float>(m_params.m_height);
 }
 
-uint32_t HWTexture::GetID() const { return m_textureID; }
+uint32_t HWTexture::GetID() const
+{
+  return m_textureID;
+}
 
 OpenGLHWTexture::~OpenGLHWTexture()
 {
@@ -158,8 +159,7 @@ OpenGLHWTexture::~OpenGLHWTexture()
     GLFunctions::glDeleteBuffer(m_pixelBufferID);
 }
 
-void OpenGLHWTexture::Create(ref_ptr<dp::GraphicsContext> context, Params const & params,
-                             ref_ptr<void> data)
+void OpenGLHWTexture::Create(ref_ptr<dp::GraphicsContext> context, Params const & params, ref_ptr<void> data)
 {
   Base::Create(context, params, data);
 
@@ -182,8 +182,7 @@ void OpenGLHWTexture::Create(ref_ptr<dp::GraphicsContext> context, Params const
   UnpackFormat(context, m_params.m_format, m_unpackedLayout, m_unpackedPixelType);
 
   auto const f = DecodeTextureFilter(m_params.m_filter);
-  GLFunctions::glTexImage2D(m_params.m_width, m_params.m_height,
-                            m_unpackedLayout, m_unpackedPixelType, data.get());
+  GLFunctions::glTexImage2D(m_params.m_width, m_params.m_height, m_unpackedLayout, m_unpackedPixelType, data.get());
   GLFunctions::glTexParameter(gl_const::GLMinFilter, f);
   GLFunctions::glTexParameter(gl_const::GLMagFilter, f);
   GLFunctions::glTexParameter(gl_const::GLWrapS, DecodeTextureWrapping(m_params.m_wrapSMode));
@@ -193,8 +192,7 @@ void OpenGLHWTexture::Create(ref_ptr<dp::GraphicsContext> context, Params const
   {
     m_pixelBufferID = GLFunctions::glGenBuffer();
     GLFunctions::glBindBuffer(m_pixelBufferID, gl_const::GLPixelBufferWrite);
-    GLFunctions::glBufferData(gl_const::GLPixelBufferWrite, m_pixelBufferSize, nullptr,
-                              gl_const::GLDynamicDraw);
+    GLFunctions::glBufferData(gl_const::GLPixelBufferWrite, m_pixelBufferSize, nullptr, gl_const::GLDynamicDraw);
     GLFunctions::glBindBuffer(0, gl_const::GLPixelBufferWrite);
   }
 
@@ -202,8 +200,8 @@ void OpenGLHWTexture::Create(ref_ptr<dp::GraphicsContext> context, Params const
   GLFunctions::glFlush();
 }
 
-void OpenGLHWTexture::UploadData(ref_ptr<dp::GraphicsContext> context, uint32_t x, uint32_t y,
-                                 uint32_t width, uint32_t height, ref_ptr<void> data)
+void OpenGLHWTexture::UploadData(ref_ptr<dp::GraphicsContext> context, uint32_t x, uint32_t y, uint32_t width,
+                                 uint32_t height, ref_ptr<void> data)
 {
   ASSERT(Validate(), ());
   uint32_t const mappingSize = height * width * m_pixelBufferElementSize;
diff --git a/libs/drape/hw_texture.hpp b/libs/drape/hw_texture.hpp
index 92c3cc756..b44f41378 100644
--- a/libs/drape/hw_texture.hpp
+++ b/libs/drape/hw_texture.hpp
@@ -35,10 +35,9 @@ public:
 
   void Create(ref_ptr<dp::GraphicsContext> context, Params const & params);
 
-  virtual void Create(ref_ptr<dp::GraphicsContext> context, Params const & params,
-                      ref_ptr<void> data) = 0;
-  virtual void UploadData(ref_ptr<dp::GraphicsContext> context, uint32_t x, uint32_t y,
-                          uint32_t width, uint32_t height, ref_ptr<void> data) = 0;
+  virtual void Create(ref_ptr<dp::GraphicsContext> context, Params const & params, ref_ptr<void> data) = 0;
+  virtual void UploadData(ref_ptr<dp::GraphicsContext> context, uint32_t x, uint32_t y, uint32_t width, uint32_t height,
+                          ref_ptr<void> data) = 0;
 
   virtual void Bind(ref_ptr<dp::GraphicsContext> context) const = 0;
 
@@ -77,10 +76,9 @@ class OpenGLHWTexture : public HWTexture
 
 public:
   ~OpenGLHWTexture() override;
-  void Create(ref_ptr<dp::GraphicsContext> context, Params const & params,
-              ref_ptr<void> data) override;
-  void UploadData(ref_ptr<dp::GraphicsContext> context, uint32_t x, uint32_t y,
-                  uint32_t width, uint32_t height, ref_ptr<void> data) override;
+  void Create(ref_ptr<dp::GraphicsContext> context, Params const & params, ref_ptr<void> data) override;
+  void UploadData(ref_ptr<dp::GraphicsContext> context, uint32_t x, uint32_t y, uint32_t width, uint32_t height,
+                  ref_ptr<void> data) override;
   void Bind(ref_ptr<dp::GraphicsContext> context) const override;
   void SetFilter(TextureFilter filter) override;
   bool Validate() const override;
@@ -104,8 +102,7 @@ public:
 ref_ptr<HWTextureAllocator> GetDefaultAllocator(ref_ptr<dp::GraphicsContext> context);
 drape_ptr<HWTextureAllocator> CreateAllocator(ref_ptr<dp::GraphicsContext> context);
 
-void UnpackFormat(ref_ptr<dp::GraphicsContext> context, TextureFormat format,
-                  glConst & layout, glConst & pixelType);
+void UnpackFormat(ref_ptr<dp::GraphicsContext> context, TextureFormat format, glConst & layout, glConst & pixelType);
 glConst DecodeTextureFilter(TextureFilter filter);
 glConst DecodeTextureWrapping(TextureWrapping wrapping);
 }  // namespace dp
diff --git a/libs/drape/hw_texture_ios.hpp b/libs/drape/hw_texture_ios.hpp
index 8d76be252..75e97f6c2 100644
--- a/libs/drape/hw_texture_ios.hpp
+++ b/libs/drape/hw_texture_ios.hpp
@@ -6,12 +6,12 @@
 #include "std/target_os.hpp"
 
 #ifndef OMIM_OS_IPHONE
-  #error Only for iOS
+#error Only for iOS
 #endif
 
-#import <CoreVideo/CVPixelBuffer.h>
 #import <CoreVideo/CVOpenGLESTexture.h>
 #import <CoreVideo/CVOpenGLESTextureCache.h>
+#import <CoreVideo/CVPixelBuffer.h>
 
 namespace dp
 {
@@ -24,8 +24,8 @@ public:
   CVPixelBufferRef CVCreatePixelBuffer(uint32_t width, uint32_t height, dp::TextureFormat format);
   void CVDestroyPixelBuffer(CVPixelBufferRef buffer);
 
-  CVOpenGLESTextureRef CVCreateTexture(CVPixelBufferRef buffer, uint32_t width, uint32_t height,
-                                       glConst layout, glConst pixelType);
+  CVOpenGLESTextureRef CVCreateTexture(CVPixelBufferRef buffer, uint32_t width, uint32_t height, glConst layout,
+                                       glConst pixelType);
   void CVDestroyTexture(CVOpenGLESTextureRef texture);
 
   void RiseFlushFlag();
@@ -47,12 +47,12 @@ public:
   ~HWTextureApple();
 
   void Create(ref_ptr<dp::GraphicsContext> context, Params const & params, ref_ptr<void> data) override;
-  void UploadData(ref_ptr<dp::GraphicsContext> context, uint32_t x, uint32_t y,
-                  uint32_t width, uint32_t height, ref_ptr<void> data) override;
+  void UploadData(ref_ptr<dp::GraphicsContext> context, uint32_t x, uint32_t y, uint32_t width, uint32_t height,
+                  ref_ptr<void> data) override;
   void Bind(ref_ptr<dp::GraphicsContext> context) const override;
   void SetFilter(TextureFilter filter) override;
   bool Validate() const override;
-  
+
 private:
   void Lock();
   void Unlock();
diff --git a/libs/drape/index_buffer.cpp b/libs/drape/index_buffer.cpp
index 5e06bc2cc..1e1289568 100644
--- a/libs/drape/index_buffer.cpp
+++ b/libs/drape/index_buffer.cpp
@@ -5,9 +5,7 @@
 
 namespace dp
 {
-IndexBuffer::IndexBuffer(uint32_t capacity)
-  : DataBuffer((uint8_t)IndexStorage::SizeOfIndex(), capacity)
-{}
+IndexBuffer::IndexBuffer(uint32_t capacity) : DataBuffer((uint8_t)IndexStorage::SizeOfIndex(), capacity) {}
 
 void IndexBuffer::UploadData(ref_ptr<GraphicsContext> context, void const * data, uint32_t size)
 {
diff --git a/libs/drape/index_buffer_mutator.cpp b/libs/drape/index_buffer_mutator.cpp
index cc9e8e0cc..aec2e6d52 100644
--- a/libs/drape/index_buffer_mutator.cpp
+++ b/libs/drape/index_buffer_mutator.cpp
@@ -14,7 +14,7 @@ IndexBufferMutator::IndexBufferMutator(uint32_t baseSize)
 void IndexBufferMutator::AppendIndexes(void const * indexes, uint32_t count)
 {
   uint32_t dstActiveSize = m_activeSize + count;
-  if (dstActiveSize  > m_buffer.Size())
+  if (dstActiveSize > m_buffer.Size())
     m_buffer.Resize(std::max(m_buffer.Size() * 2, dstActiveSize));
 
   memcpy(m_buffer.GetRaw(m_activeSize), indexes, count * IndexStorage::SizeOfIndex());
diff --git a/libs/drape/index_storage.cpp b/libs/drape/index_storage.cpp
index 3432e8be9..6c8271043 100644
--- a/libs/drape/index_storage.cpp
+++ b/libs/drape/index_storage.cpp
@@ -5,9 +5,7 @@
 
 namespace dp
 {
-IndexStorage::IndexStorage()
-  : m_size(0)
-{}
+IndexStorage::IndexStorage() : m_size(0) {}
 
 IndexStorage::IndexStorage(std::vector<uint32_t> && initial)
 {
diff --git a/libs/drape/mesh_object.cpp b/libs/drape/mesh_object.cpp
index 4fbaa899e..9211a0d43 100644
--- a/libs/drape/mesh_object.cpp
+++ b/libs/drape/mesh_object.cpp
@@ -1,8 +1,8 @@
 #include "drape/mesh_object.hpp"
 
 #include "drape/gl_constants.hpp"
-#include "drape/gl_gpu_program.hpp"
 #include "drape/gl_functions.hpp"
+#include "drape/gl_gpu_program.hpp"
 #include "drape/glsl_func.hpp"
 #include "drape/glsl_types.hpp"
 #include "drape/texture_manager.hpp"
@@ -28,9 +28,7 @@ namespace dp
 class GLMeshObjectImpl : public MeshObjectImpl
 {
 public:
-  explicit GLMeshObjectImpl(ref_ptr<dp::MeshObject> mesh)
-    : m_mesh(mesh)
-  {}
+  explicit GLMeshObjectImpl(ref_ptr<dp::MeshObject> mesh) : m_mesh(mesh) {}
 
   void Build(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program) override
   {
@@ -46,16 +44,15 @@ public:
 
       if (buffer->GetSizeInBytes() != 0)
       {
-        GLFunctions::glBufferData(gl_const::GLArrayBuffer, buffer->GetSizeInBytes(),
-                                  buffer->GetData(), gl_const::GLStaticDraw);
+        GLFunctions::glBufferData(gl_const::GLArrayBuffer, buffer->GetSizeInBytes(), buffer->GetData(),
+                                  gl_const::GLStaticDraw);
       }
 
       if (!m_mesh->m_indices.empty())
       {
         m_indexBuffer = GLFunctions::glGenBuffer();
         GLFunctions::glBindBuffer(m_indexBuffer, gl_const::GLElementArrayBuffer);
-        GLFunctions::glBufferData(gl_const::GLElementArrayBuffer, 
-                                  m_mesh->m_indices.size() * sizeof(uint16_t),
+        GLFunctions::glBufferData(gl_const::GLElementArrayBuffer, m_mesh->m_indices.size() * sizeof(uint16_t),
                                   m_mesh->m_indices.data(), gl_const::GLStaticDraw);
       }
 
@@ -65,9 +62,8 @@ public:
         int8_t const attributePosition = p->GetAttributeLocation(attribute.m_attributeName);
         ASSERT_NOT_EQUAL(attributePosition, -1, ());
         GLFunctions::glEnableVertexAttribute(attributePosition);
-        GLFunctions::glVertexAttributePointer(attributePosition, attribute.m_componentsCount,
-                                              attribute.m_type, false, buffer->GetStrideInBytes(), 
-                                              attribute.m_offset);
+        GLFunctions::glVertexAttributePointer(attributePosition, attribute.m_componentsCount, attribute.m_type, false,
+                                              buffer->GetStrideInBytes(), attribute.m_offset);
       }
     }
 
@@ -106,8 +102,8 @@ public:
     UNUSED_VALUE(context);
     auto & buffer = m_mesh->m_buffers[bufferInd];
     GLFunctions::glBindBuffer(buffer->m_bufferId, gl_const::GLArrayBuffer);
-    GLFunctions::glBufferData(gl_const::GLArrayBuffer, buffer->GetSizeInBytes(),
-                              buffer->GetData(), gl_const::GLStaticDraw);
+    GLFunctions::glBufferData(gl_const::GLArrayBuffer, buffer->GetSizeInBytes(), buffer->GetData(),
+                              gl_const::GLStaticDraw);
     GLFunctions::glBindBuffer(0, gl_const::GLArrayBuffer);
   }
 
@@ -117,16 +113,12 @@ public:
     CHECK(!m_mesh->m_indices.empty(), ());
     CHECK(m_indexBuffer, ("Index buffer was not created"));
     GLFunctions::glBindBuffer(m_indexBuffer, gl_const::GLElementArrayBuffer);
-    GLFunctions::glBufferData(gl_const::GLElementArrayBuffer, 
-                              m_mesh->m_indices.size() * sizeof(uint16_t),
+    GLFunctions::glBufferData(gl_const::GLElementArrayBuffer, m_mesh->m_indices.size() * sizeof(uint16_t),
                               m_mesh->m_indices.data(), gl_const::GLStaticDraw);
     GLFunctions::glBindBuffer(0, gl_const::GLElementArrayBuffer);
   }
 
-  void Bind(ref_ptr<dp::GpuProgram> program) override
-  {
-    GLFunctions::glBindVertexArray(m_VAO);
-  }
+  void Bind(ref_ptr<dp::GpuProgram> program) override { GLFunctions::glBindVertexArray(m_VAO); }
 
   void Unbind() override
   {
@@ -136,22 +128,18 @@ public:
       GLFunctions::glBindBuffer(0, gl_const::GLElementArrayBuffer);
   }
 
-  void DrawPrimitives(ref_ptr<dp::GraphicsContext> context, uint32_t verticesCount, 
-                      uint32_t startVertex) override
+  void DrawPrimitives(ref_ptr<dp::GraphicsContext> context, uint32_t verticesCount, uint32_t startVertex) override
   {
     UNUSED_VALUE(context);
-    GLFunctions::glDrawArrays(GetGLDrawPrimitive(m_mesh->m_drawPrimitive), 
-                              static_cast<int32_t>(startVertex), 
+    GLFunctions::glDrawArrays(GetGLDrawPrimitive(m_mesh->m_drawPrimitive), static_cast<int32_t>(startVertex),
                               verticesCount);
   }
 
-  void DrawPrimitivesIndexed(ref_ptr<dp::GraphicsContext> context, uint32_t indexCount, 
-                             uint32_t startIndex) override
+  void DrawPrimitivesIndexed(ref_ptr<dp::GraphicsContext> context, uint32_t indexCount, uint32_t startIndex) override
   {
     UNUSED_VALUE(context);
     CHECK(m_indexBuffer != 0, ());
-    GLFunctions::glDrawElements(GetGLDrawPrimitive(m_mesh->m_drawPrimitive), sizeof(uint16_t), 
-                                indexCount, startIndex);
+    GLFunctions::glDrawElements(GetGLDrawPrimitive(m_mesh->m_drawPrimitive), sizeof(uint16_t), indexCount, startIndex);
   }
 
 private:
@@ -160,8 +148,7 @@ private:
   uint32_t m_indexBuffer = 0;
 };
 
-MeshObject::MeshObject(ref_ptr<dp::GraphicsContext> context, DrawPrimitive drawPrimitive,
-                       std::string const & debugName)
+MeshObject::MeshObject(ref_ptr<dp::GraphicsContext> context, DrawPrimitive drawPrimitive, std::string const & debugName)
   : m_drawPrimitive(drawPrimitive)
   , m_debugName(debugName)
 {
@@ -248,8 +235,7 @@ void MeshObject::UpdateIndexBuffer(ref_ptr<dp::GraphicsContext> context, std::ve
   m_impl->UpdateIndexBuffer(context);
 }
 
-void MeshObject::DrawPrimitivesSubset(ref_ptr<dp::GraphicsContext> context, uint32_t vertexCount,
-                                      uint32_t startVertex)
+void MeshObject::DrawPrimitivesSubset(ref_ptr<dp::GraphicsContext> context, uint32_t vertexCount, uint32_t startVertex)
 {
   CHECK(m_impl != nullptr, ());
   CHECK(!m_buffers.empty(), ());
@@ -261,7 +247,7 @@ void MeshObject::DrawPrimitivesSubset(ref_ptr<dp::GraphicsContext> context, uint
   m_impl->DrawPrimitives(context, vertexCount, startVertex);
 }
 
-void MeshObject::DrawPrimitivesSubsetIndexed(ref_ptr<dp::GraphicsContext> context, uint32_t indexCount, 
+void MeshObject::DrawPrimitivesSubsetIndexed(ref_ptr<dp::GraphicsContext> context, uint32_t indexCount,
                                              uint32_t startIndex)
 {
   CHECK(m_impl != nullptr, ());
@@ -282,11 +268,11 @@ void MeshObject::DrawPrimitives(ref_ptr<dp::GraphicsContext> context)
 #ifdef DEBUG
   for (size_t i = 1; i < m_buffers.size(); i++)
   {
-    ASSERT_EQUAL(m_buffers[i]->GetSizeInBytes() / m_buffers[i]->GetStrideInBytes(), vertexNum, 
+    ASSERT_EQUAL(m_buffers[i]->GetSizeInBytes() / m_buffers[i]->GetStrideInBytes(), vertexNum,
                  ("All buffers in a mesh must contain the same vertex number"));
   }
 #endif
-  
+
   CHECK(m_impl != nullptr, ());
   if (m_indices.empty())
     m_impl->DrawPrimitives(context, vertexNum, 0);
@@ -309,8 +295,7 @@ void MeshObject::UpdateImpl(ref_ptr<dp::GraphicsContext> context, uint32_t buffe
 }
 
 // static
-std::vector<float> MeshObject::GenerateNormalsForTriangles(std::vector<float> const & vertices,
-                                                           size_t componentsCount)
+std::vector<float> MeshObject::GenerateNormalsForTriangles(std::vector<float> const & vertices, size_t componentsCount)
 {
   auto const trianglesCount = vertices.size() / (3 * componentsCount);
   std::vector<float> normals;
@@ -338,4 +323,3 @@ std::vector<float> MeshObject::GenerateNormalsForTriangles(std::vector<float> co
   return normals;
 }
 }  // namespace dp
-
diff --git a/libs/drape/mesh_object.hpp b/libs/drape/mesh_object.hpp
index 7483a556c..32f8a895f 100644
--- a/libs/drape/mesh_object.hpp
+++ b/libs/drape/mesh_object.hpp
@@ -36,18 +36,17 @@ class MeshObject
   friend class vulkan::VulkanMeshObjectImpl;
 
 public:
-  enum class DrawPrimitive: uint8_t
+  enum class DrawPrimitive : uint8_t
   {
     Triangles,
     TriangleStrip,
     LineStrip
   };
 
-  MeshObject(ref_ptr<dp::GraphicsContext> context, DrawPrimitive drawPrimitive,
-             std::string const & debugName = "");
+  MeshObject(ref_ptr<dp::GraphicsContext> context, DrawPrimitive drawPrimitive, std::string const & debugName = "");
   virtual ~MeshObject();
 
-  template<typename T>
+  template <typename T>
   void SetBuffer(uint32_t bufferInd, std::vector<T> && vertices, uint32_t stride = 0)
   {
     CHECK_LESS_OR_EQUAL(bufferInd, GetNextBufferIndex(), ());
@@ -60,10 +59,10 @@ public:
     Reset();
   }
 
-  void SetAttribute(std::string const & attributeName, uint32_t bufferInd, uint32_t offset, 
-                    uint32_t componentsCount, glConst type = gl_const::GLFloatType);
+  void SetAttribute(std::string const & attributeName, uint32_t bufferInd, uint32_t offset, uint32_t componentsCount,
+                    glConst type = gl_const::GLFloatType);
 
-  template<typename T>
+  template <typename T>
   void UpdateBuffer(ref_ptr<dp::GraphicsContext> context, uint32_t bufferInd, std::vector<T> const & vertices)
   {
     CHECK(m_initialized, ());
@@ -81,9 +80,8 @@ public:
   void UpdateIndexBuffer(ref_ptr<dp::GraphicsContext> context, std::vector<uint16_t> const & indices);
 
   template <typename TParamsSetter, typename TParams>
-  void Render(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
-              dp::RenderState const & state, ref_ptr<TParamsSetter> paramsSetter,
-              TParams const & params)
+  void Render(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program, dp::RenderState const & state,
+              ref_ptr<TParamsSetter> paramsSetter, TParams const & params)
   {
     Bind(context, program);
 
@@ -96,9 +94,8 @@ public:
   }
 
   template <typename TParamsSetter, typename TParams>
-  void Render(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
-              dp::RenderState const & state, ref_ptr<TParamsSetter> paramsSetter,
-              TParams const & params, std::function<void()> && drawCallback)
+  void Render(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program, dp::RenderState const & state,
+              ref_ptr<TParamsSetter> paramsSetter, TParams const & params, std::function<void()> && drawCallback)
   {
     Bind(context, program);
 
@@ -110,7 +107,7 @@ public:
 
     Unbind(program);
   }
-  
+
   uint32_t GetNextBufferIndex() const { return static_cast<uint32_t>(m_buffers.size()); }
 
   bool IsInitialized() const { return m_initialized; }
@@ -118,10 +115,8 @@ public:
   void Reset();
 
   // Should be called inside draw callback in Render() method
-  void DrawPrimitivesSubset(ref_ptr<dp::GraphicsContext> context, uint32_t vertexCount,
-                             uint32_t startVertex);
-  void DrawPrimitivesSubsetIndexed(ref_ptr<dp::GraphicsContext> context, uint32_t indexCount, 
-                                   uint32_t startIndex);
+  void DrawPrimitivesSubset(ref_ptr<dp::GraphicsContext> context, uint32_t vertexCount, uint32_t startVertex);
+  void DrawPrimitivesSubsetIndexed(ref_ptr<dp::GraphicsContext> context, uint32_t indexCount, uint32_t startIndex);
 
   static std::vector<float> GenerateNormalsForTriangles(std::vector<float> const & vertices, size_t componentsCount);
 
@@ -130,7 +125,7 @@ private:
   {
     AttributeMapping() = default;
 
-    AttributeMapping(std::string const & attributeName, uint32_t offset, uint32_t componentsCount, 
+    AttributeMapping(std::string const & attributeName, uint32_t offset, uint32_t componentsCount,
                      glConst type = gl_const::GLFloatType)
       : m_attributeName(attributeName)
       , m_offset(offset)
@@ -144,7 +139,8 @@ private:
     glConst m_type = gl_const::GLFloatType;
   };
 
-  class VertexBufferBase {
+  class VertexBufferBase
+  {
   public:
     virtual ~VertexBufferBase() = default;
     virtual void * GetData() = 0;
@@ -155,7 +151,7 @@ private:
     std::vector<AttributeMapping> m_attributes;
   };
 
-  template<typename T>
+  template <typename T>
   class VertexBuffer : public VertexBufferBase
   {
   public:
@@ -171,8 +167,8 @@ private:
     void * GetData() override { return m_data.data(); }
     uint32_t GetSizeInBytes() const override { return static_cast<uint32_t>(m_data.size() * sizeof(T)); }
     uint32_t GetStrideInBytes() const override { return m_stride; }
-    
-  private:  
+
+  private:
     std::vector<T> m_data;
     uint32_t m_stride = 0;
   };
@@ -211,9 +207,8 @@ public:
   virtual void UpdateIndexBuffer(ref_ptr<dp::GraphicsContext> context) = 0;
   virtual void Bind(ref_ptr<dp::GpuProgram> program) = 0;
   virtual void Unbind() = 0;
-  virtual void DrawPrimitives(ref_ptr<dp::GraphicsContext> context, uint32_t verticesCount,
-                              uint32_t startVertex) = 0;
-  virtual void DrawPrimitivesIndexed(ref_ptr<dp::GraphicsContext> context, uint32_t indexCount, 
+  virtual void DrawPrimitives(ref_ptr<dp::GraphicsContext> context, uint32_t verticesCount, uint32_t startVertex) = 0;
+  virtual void DrawPrimitivesIndexed(ref_ptr<dp::GraphicsContext> context, uint32_t indexCount,
                                      uint32_t startIndex) = 0;
 };
 }  // namespace dp
diff --git a/libs/drape/metal/metal_base_context.hpp b/libs/drape/metal/metal_base_context.hpp
index fead43e83..3f023b3b0 100644
--- a/libs/drape/metal/metal_base_context.hpp
+++ b/libs/drape/metal/metal_base_context.hpp
@@ -1,8 +1,8 @@
 #pragma once
 #import <MetalKit/MetalKit.h>
 
-#include "drape/graphics_context.hpp"
 #include "drape/gpu_program.hpp"
+#include "drape/graphics_context.hpp"
 #include "drape/metal/metal_cleaner.hpp"
 #include "drape/metal/metal_states.hpp"
 #include "drape/metal/metal_texture.hpp"
@@ -22,10 +22,9 @@ class MetalBaseContext : public dp::GraphicsContext
 {
 public:
   using DrawableRequest = std::function<id<CAMetalDrawable>()>;
-  
-  MetalBaseContext(id<MTLDevice> device, m2::PointU const & screenSize,
-                   DrawableRequest && drawableRequest);
-  
+
+  MetalBaseContext(id<MTLDevice> device, m2::PointU const & screenSize, DrawableRequest && drawableRequest);
+
   bool BeginRendering() override;
   void EndRendering() override;
   void Present() override;
@@ -44,7 +43,7 @@ public:
   void DebugSynchronizeWithCPU() override;
   void PushDebugLabel(std::string const & label) override;
   void PopDebugLabel() override;
-  
+
   void SetClearColor(Color const & color) override;
   void Clear(uint32_t clearBits, uint32_t storeBits) override;
   void Flush() override {}
@@ -54,9 +53,12 @@ public:
   void SetDepthTestFunction(TestFunction depthFunction) override;
   void SetStencilTestEnabled(bool enabled) override;
   void SetStencilFunction(StencilFace face, TestFunction stencilFunction) override;
-  void SetStencilActions(StencilFace face, StencilAction stencilFailAction,
-                         StencilAction depthFailAction, StencilAction passAction) override;
-  void SetStencilReferenceValue(uint32_t stencilReferenceValue) override { m_stencilReferenceValue = stencilReferenceValue; }
+  void SetStencilActions(StencilFace face, StencilAction stencilFailAction, StencilAction depthFailAction,
+                         StencilAction passAction) override;
+  void SetStencilReferenceValue(uint32_t stencilReferenceValue) override
+  {
+    m_stencilReferenceValue = stencilReferenceValue;
+  }
   void SetCullingEnabled(bool enabled) override;
 
   id<MTLDevice> GetMetalDevice() const;
@@ -64,19 +66,17 @@ public:
   id<MTLRenderCommandEncoder> GetCommandEncoder() const;
   id<MTLDepthStencilState> GetDepthStencilState();
   id<MTLRenderPipelineState> GetPipelineState(ref_ptr<GpuProgram> program, bool blendingEnabled);
-  id<MTLSamplerState> GetSamplerState(TextureFilter filter, TextureWrapping wrapSMode,
-                                      TextureWrapping wrapTMode);
-  
-  void SetSystemPrograms(drape_ptr<GpuProgram> && programClearColor,
-                         drape_ptr<GpuProgram> && programClearDepth,
+  id<MTLSamplerState> GetSamplerState(TextureFilter filter, TextureWrapping wrapSMode, TextureWrapping wrapTMode);
+
+  void SetSystemPrograms(drape_ptr<GpuProgram> && programClearColor, drape_ptr<GpuProgram> && programClearDepth,
                          drape_ptr<GpuProgram> && programClearColorAndDepth);
-  
+
   void ApplyPipelineState(id<MTLRenderPipelineState> state);
   bool HasAppliedPipelineState() const;
   void ResetPipelineStatesCache();
 
   MTLRenderPassDescriptor * GetRenderPassDescriptor() const;
-  
+
 protected:
   void RecreateDepthTexture(m2::PointU const & screenSize);
   void RequestFrameDrawable();
@@ -91,15 +91,15 @@ protected:
   ref_ptr<dp::BaseFramebuffer> m_currentFramebuffer;
   MetalStates::DepthStencilKey m_currentDepthStencilKey;
   MetalStates m_metalStates;
-  
+
   // These objects are recreated each frame. They MUST NOT be stored anywhere.
   id<CAMetalDrawable> m_frameDrawable;
   id<MTLCommandBuffer> m_frameCommandBuffer;
   id<MTLRenderCommandEncoder> m_currentCommandEncoder;
   id<MTLRenderPipelineState> m_lastPipelineState;
-  
+
   MetalCleaner m_cleaner;
-  
+
   uint32_t m_stencilReferenceValue = 1;
 };
 }  // namespace metal
diff --git a/libs/drape/metal/metal_cleaner.hpp b/libs/drape/metal/metal_cleaner.hpp
index 81489b909..2564a67b4 100644
--- a/libs/drape/metal/metal_cleaner.hpp
+++ b/libs/drape/metal/metal_cleaner.hpp
@@ -18,28 +18,25 @@ class MetalCleaner
 {
 public:
   MetalCleaner() = default;
-  
-  void Init(ref_ptr<MetalBaseContext> context,
-            drape_ptr<GpuProgram> && programClearColor,
-            drape_ptr<GpuProgram> && programClearDepth,
-            drape_ptr<GpuProgram> && programClearColorAndDepth);
-  
+
+  void Init(ref_ptr<MetalBaseContext> context, drape_ptr<GpuProgram> && programClearColor,
+            drape_ptr<GpuProgram> && programClearDepth, drape_ptr<GpuProgram> && programClearColorAndDepth);
+
   void SetClearColor(Color const & color);
-  
+
   void ClearDepth(ref_ptr<MetalBaseContext> context, id<MTLRenderCommandEncoder> encoder);
   void ClearColor(ref_ptr<MetalBaseContext> context, id<MTLRenderCommandEncoder> encoder);
   void ClearColorAndDepth(ref_ptr<MetalBaseContext> context, id<MTLRenderCommandEncoder> encoder);
-  
+
 private:
   void ApplyColorParam(id<MTLRenderCommandEncoder> encoder, ref_ptr<GpuProgram> program);
-  void RenderQuad(ref_ptr<MetalBaseContext> context, id<MTLRenderCommandEncoder> encoder,
-                  ref_ptr<GpuProgram> program);
-  
+  void RenderQuad(ref_ptr<MetalBaseContext> context, id<MTLRenderCommandEncoder> encoder, ref_ptr<GpuProgram> program);
+
   id<MTLBuffer> m_buffer;
   id<MTLDepthStencilState> m_depthEnabledState;
   id<MTLDepthStencilState> m_depthDisabledState;
   glsl::vec4 m_clearColor;
-  
+
   drape_ptr<GpuProgram> m_programClearColor;
   drape_ptr<GpuProgram> m_programClearDepth;
   drape_ptr<GpuProgram> m_programClearColorAndDepth;
diff --git a/libs/drape/metal/metal_gpu_buffer_impl.hpp b/libs/drape/metal/metal_gpu_buffer_impl.hpp
index 6b961afc5..35b361579 100644
--- a/libs/drape/metal/metal_gpu_buffer_impl.hpp
+++ b/libs/drape/metal/metal_gpu_buffer_impl.hpp
@@ -18,60 +18,54 @@ namespace metal
 class MetalGPUBuffer : public BufferBase
 {
 public:
-  MetalGPUBuffer(ref_ptr<GraphicsContext> context, void const * data,
-                 uint8_t elementSize, uint32_t capacity);
-  
+  MetalGPUBuffer(ref_ptr<GraphicsContext> context, void const * data, uint8_t elementSize, uint32_t capacity);
+
   void UploadData(void const * data, uint32_t elementCount);
-  
+
   void * Map(uint32_t elementOffset, uint32_t elementCount);
-  
-  void UpdateData(void * gpuPtr, void const * data,
-                  uint32_t elementOffset, uint32_t elementCount);
-  
+
+  void UpdateData(void * gpuPtr, void const * data, uint32_t elementOffset, uint32_t elementCount);
+
   id<MTLBuffer> GetMetalBuffer() const { return m_metalBuffer; }
-  
+
 protected:
   void Resize(ref_ptr<MetalBaseContext> context, void const * data, uint32_t elementCount);
-  
+
   id<MTLBuffer> m_metalBuffer;
 };
-  
+
 class MetalGpuBufferImpl : public DataBufferImpl<MetalGPUBuffer>
 {
 public:
   template <typename... Args>
-  MetalGpuBufferImpl(Args &&... params)
-    : DataBufferImpl(std::forward<Args>(params)...)
+  MetalGpuBufferImpl(Args &&... params) : DataBufferImpl(std::forward<Args>(params)...)
   {}
-  
+
   void const * Data() const override
   {
     ASSERT(false, ("Retrieving of raw data is unavailable for GPU buffer"));
     return nullptr;
   }
-  
-  void UploadData(ref_ptr<GraphicsContext> context,
-                  void const * data, uint32_t elementCount) override
+
+  void UploadData(ref_ptr<GraphicsContext> context, void const * data, uint32_t elementCount) override
   {
     UNUSED_VALUE(context);
     m_buffer->UploadData(data, elementCount);
   }
-  
-  void UpdateData(void * destPtr, void const * srcPtr, uint32_t elementOffset,
-                  uint32_t elementCount) override
+
+  void UpdateData(void * destPtr, void const * srcPtr, uint32_t elementOffset, uint32_t elementCount) override
   {
     m_buffer->UpdateData(destPtr, srcPtr, elementOffset, elementCount);
   }
-  
-  void * Map(ref_ptr<GraphicsContext> context,
-             uint32_t elementOffset, uint32_t elementCount) override
+
+  void * Map(ref_ptr<GraphicsContext> context, uint32_t elementOffset, uint32_t elementCount) override
   {
     UNUSED_VALUE(context);
     return m_buffer->Map(elementOffset, elementCount);
   }
-  
+
   id<MTLBuffer> GetMetalBuffer() const { return m_buffer->GetMetalBuffer(); }
-  
+
   void Bind() override {}
   void Unmap(ref_ptr<GraphicsContext>) override {}
 };
diff --git a/libs/drape/metal/metal_gpu_program.hpp b/libs/drape/metal/metal_gpu_program.hpp
index f2f314b6c..7713beee9 100644
--- a/libs/drape/metal/metal_gpu_program.hpp
+++ b/libs/drape/metal/metal_gpu_program.hpp
@@ -22,12 +22,10 @@ public:
     int8_t m_samplerBindingIndex = kInvalidBindingIndex;
   };
   using TexturesBindingInfo = std::map<std::string, TextureBindingInfo>;
-  
-  MetalGpuProgram(std::string const & programName,
-                  id<MTLFunction> vertexShader, id<MTLFunction> fragmentShader,
+
+  MetalGpuProgram(std::string const & programName, id<MTLFunction> vertexShader, id<MTLFunction> fragmentShader,
                   int8_t vsUniformsBindingIndex, int8_t fsUniformsBindingIndex,
-                  TexturesBindingInfo && vertexTextureBindingInfo,
-                  TexturesBindingInfo && fragmentTextureBindingInfo,
+                  TexturesBindingInfo && vertexTextureBindingInfo, TexturesBindingInfo && fragmentTextureBindingInfo,
                   MTLVertexDescriptor * vertexDescriptor)
     : GpuProgram(programName)
     , m_vertexShader(vertexShader)
@@ -41,18 +39,18 @@ public:
 
   void Bind() override {}
   void Unbind() override {}
-  
+
   id<MTLFunction> GetVertexShader() const { return m_vertexShader; }
   id<MTLFunction> GetFragmentShader() const { return m_fragmentShader; }
-  
+
   int8_t GetVertexShaderUniformsBindingIndex() const { return m_vsUniformsBindingIndex; }
   int8_t GetFragmentShaderUniformsBindingIndex() const { return m_fsUniformsBindingIndex; }
-  
+
   TextureBindingInfo const & GetVertexTextureBindingInfo(std::string const & textureName) const
   {
     return GetTextureBindingInfo(m_vertexTextureBindingInfo, textureName);
   }
-  
+
   TextureBindingInfo const & GetFragmentTextureBindingInfo(std::string const & textureName) const
   {
     return GetTextureBindingInfo(m_fragmentTextureBindingInfo, textureName);
@@ -70,7 +68,7 @@ private:
       return kEmptyBinding;
     return it->second;
   }
-  
+
   id<MTLFunction> m_vertexShader;
   id<MTLFunction> m_fragmentShader;
   int8_t const m_vsUniformsBindingIndex;
diff --git a/libs/drape/metal/metal_states.hpp b/libs/drape/metal/metal_states.hpp
index 057e50845..c10eb2d8a 100644
--- a/libs/drape/metal/metal_states.hpp
+++ b/libs/drape/metal/metal_states.hpp
@@ -22,32 +22,32 @@ public:
     void SetDepthTestFunction(TestFunction depthFunction);
     void SetStencilTestEnabled(bool enabled);
     void SetStencilFunction(StencilFace face, TestFunction stencilFunction);
-    void SetStencilActions(StencilFace face, StencilAction stencilFailAction,
-                           StencilAction depthFailAction, StencilAction passAction);
+    void SetStencilActions(StencilFace face, StencilAction stencilFailAction, StencilAction depthFailAction,
+                           StencilAction passAction);
     bool operator<(DepthStencilKey const & rhs) const;
     MTLDepthStencilDescriptor * BuildDescriptor() const;
-    
+
     bool m_depthEnabled = false;
     bool m_stencilEnabled = false;
     TestFunction m_depthFunction = TestFunction::Always;
     uint64_t m_stencil = 0;
   };
-  
+
   struct PipelineKey
   {
     PipelineKey() = default;
-    PipelineKey(ref_ptr<GpuProgram> program, MTLPixelFormat colorFormat,
-                MTLPixelFormat depthStencilFormat, bool blendingEnabled);
-    
+    PipelineKey(ref_ptr<GpuProgram> program, MTLPixelFormat colorFormat, MTLPixelFormat depthStencilFormat,
+                bool blendingEnabled);
+
     bool operator<(PipelineKey const & rhs) const;
     MTLRenderPipelineDescriptor * BuildDescriptor() const;
-    
+
     ref_ptr<GpuProgram> m_program;
     MTLPixelFormat m_colorFormat = MTLPixelFormatInvalid;
     MTLPixelFormat m_depthStencilFormat = MTLPixelFormatInvalid;
     bool m_blendingEnabled = false;
   };
-  
+
   struct SamplerKey
   {
     SamplerKey() = default;
@@ -55,23 +55,23 @@ public:
     void Set(TextureFilter filter, TextureWrapping wrapSMode, TextureWrapping wrapTMode);
     bool operator<(SamplerKey const & rhs) const;
     MTLSamplerDescriptor * BuildDescriptor() const;
-    
+
     uint32_t m_sampler = 0;
   };
-  
+
   id<MTLDepthStencilState> GetDepthStencilState(id<MTLDevice> device, DepthStencilKey const & key);
   id<MTLRenderPipelineState> GetPipelineState(id<MTLDevice> device, PipelineKey const & key);
   id<MTLSamplerState> GetSamplerState(id<MTLDevice> device, SamplerKey const & key);
-  
+
   void ResetPipelineStatesCache();
-  
+
 private:
   using DepthStencilCache = std::map<DepthStencilKey, id<MTLDepthStencilState>>;
   DepthStencilCache m_depthStencilCache;
-  
+
   using PipelineCache = std::map<PipelineKey, id<MTLRenderPipelineState>>;
   PipelineCache m_pipelineCache;
-  
+
   using SamplerCache = std::map<SamplerKey, id<MTLSamplerState>>;
   SamplerCache m_samplerCache;
 };
diff --git a/libs/drape/metal/metal_texture.hpp b/libs/drape/metal/metal_texture.hpp
index 2fcdad2eb..7fc24d6e3 100644
--- a/libs/drape/metal/metal_texture.hpp
+++ b/libs/drape/metal/metal_texture.hpp
@@ -18,18 +18,19 @@ public:
 class MetalTexture : public HWTexture
 {
   using Base = HWTexture;
+
 public:
   explicit MetalTexture(ref_ptr<MetalTextureAllocator>) {}
 
   void Create(ref_ptr<dp::GraphicsContext> context, Params const & params, ref_ptr<void> data) override;
-  void UploadData(ref_ptr<dp::GraphicsContext> context, uint32_t x, uint32_t y,
-                  uint32_t width, uint32_t height, ref_ptr<void> data) override;
+  void UploadData(ref_ptr<dp::GraphicsContext> context, uint32_t x, uint32_t y, uint32_t width, uint32_t height,
+                  ref_ptr<void> data) override;
   void Bind(ref_ptr<dp::GraphicsContext> context) const override {}
   void SetFilter(TextureFilter filter) override;
   bool Validate() const override;
-  
+
   id<MTLTexture> GetTexture() const { return m_texture; }
-  
+
 private:
   id<MTLTexture> m_texture;
   bool m_isMutable = false;
diff --git a/libs/drape/object_pool.hpp b/libs/drape/object_pool.hpp
index 14b7e373f..90ffd5431 100644
--- a/libs/drape/object_pool.hpp
+++ b/libs/drape/object_pool.hpp
@@ -12,16 +12,15 @@
 
 namespace dp
 {
-template<typename T, typename Factory>
+template <typename T, typename Factory>
 class ObjectPool final
 {
 public:
-  ObjectPool(int count, Factory const & f)
-    : m_factory(f)
+  ObjectPool(int count, Factory const & f) : m_factory(f)
   {
     for (int i = 0; i < count; ++i)
     {
-      T *novice = m_factory.GetNew();
+      T * novice = m_factory.GetNew();
 #if defined(DEBUG) || defined(LOG_OBJECT_POOL)
       m_checkerSet.insert(novice);
 #endif
@@ -86,4 +85,3 @@ private:
   std::mutex m_lock;
 };
 }  // namespace dp
-
diff --git a/libs/drape/oglcontext.cpp b/libs/drape/oglcontext.cpp
index 91d3398c9..c9bcd67ae 100644
--- a/libs/drape/oglcontext.cpp
+++ b/libs/drape/oglcontext.cpp
@@ -52,8 +52,8 @@ glConst DecodeStencilAction(StencilAction stencilAction)
   UNREACHABLE();
 }
 
-void OpenGLMessageCallback(glConst source, glConst type, uint32_t id, glConst severity,
-                           int32_t length, char const * message, void * userData)
+void OpenGLMessageCallback(glConst source, glConst type, uint32_t id, glConst severity, int32_t length,
+                           char const * message, void * userData)
 {
   UNUSED_VALUE(userData);
 
@@ -94,8 +94,7 @@ void OpenGLMessageCallback(glConst source, glConst type, uint32_t id, glConst se
     debugSeverity = "DEBUG_SEVERITY_NOTIFICATION";
 
   LOG((type == gl_const::GLDebugTypeError) ? LERROR : LDEBUG,
-      (std::string(message, static_cast<size_t>(length)), id, debugSource, debugType,
-       debugSeverity));
+      (std::string(message, static_cast<size_t>(length)), id, debugSource, debugType, debugSeverity));
 }
 
 static_assert(std::is_same_v<GLFunctions::TglDebugProc, decltype(&OpenGLMessageCallback)>,
@@ -122,9 +121,8 @@ void OGLContext::Init(ApiVersion apiVersion)
     GLFunctions::glEnable(gl_const::GLDebugOutput);
     GLFunctions::glEnable(gl_const::GLDebugOutputSynchronous);
     GLFunctions::glDebugMessageCallback(&OpenGLMessageCallback, nullptr /* userData */);
-    GLFunctions::glDebugMessageControl(gl_const::GLDontCare /* source */,
-                                       gl_const::GLDebugTypeError, gl_const::GLDebugSeverityHigh,
-                                       0 /* count */, nullptr /* ids */,
+    GLFunctions::glDebugMessageControl(gl_const::GLDontCare /* source */, gl_const::GLDebugTypeError,
+                                       gl_const::GLDebugSeverityHigh, 0 /* count */, nullptr /* ids */,
                                        gl_const::GLTrue /* enable */);
   }
 }
@@ -157,7 +155,7 @@ void OGLContext::SetClearColor(dp::Color const & color)
 void OGLContext::Clear(uint32_t clearBits, uint32_t storeBits)
 {
   UNUSED_VALUE(storeBits);
-  
+
   glConst glBits = 0;
   if (clearBits & ClearBits::ColorBit)
     glBits |= gl_const::GLColorBit;
@@ -214,10 +212,8 @@ void OGLContext::SetStencilFunction(StencilFace face, TestFunction stencilFuncti
 void OGLContext::SetStencilActions(StencilFace face, StencilAction stencilFailAction, StencilAction depthFailAction,
                                    StencilAction passAction)
 {
-  GLFunctions::glStencilOpSeparate(DecodeStencilFace(face),
-                                   DecodeStencilAction(stencilFailAction),
-                                   DecodeStencilAction(depthFailAction),
-                                   DecodeStencilAction(passAction));
+  GLFunctions::glStencilOpSeparate(DecodeStencilFace(face), DecodeStencilAction(stencilFailAction),
+                                   DecodeStencilAction(depthFailAction), DecodeStencilAction(passAction));
 }
 
 void OGLContext::SetCullingEnabled(bool enabled)
diff --git a/libs/drape/oglcontext.hpp b/libs/drape/oglcontext.hpp
index 627168492..56f37e46d 100644
--- a/libs/drape/oglcontext.hpp
+++ b/libs/drape/oglcontext.hpp
@@ -29,7 +29,7 @@ public:
   void SetStencilFunction(StencilFace face, TestFunction stencilFunction) override;
   void SetStencilActions(StencilFace face, StencilAction stencilFailAction, StencilAction depthFailAction,
                          StencilAction passAction) override;
-  
+
   // Do not use custom stencil reference value in OpenGL rendering.
   void SetStencilReferenceValue(uint32_t stencilReferenceValue) override {}
 
diff --git a/libs/drape/overlay_handle.cpp b/libs/drape/overlay_handle.cpp
index e1e1c258e..bca6cd0e9 100644
--- a/libs/drape/overlay_handle.cpp
+++ b/libs/drape/overlay_handle.cpp
@@ -1,7 +1,7 @@
 #include "drape/overlay_handle.hpp"
 
-#include "base/macros.hpp"
 #include "base/internal/message.hpp"
+#include "base/macros.hpp"
 
 #include "indexer/drawing_rule_def.hpp"
 
@@ -15,17 +15,14 @@ struct OverlayHandle::OffsetNodeFinder
 public:
   explicit OffsetNodeFinder(uint8_t bufferID) : m_bufferID(bufferID) {}
 
-  bool operator()(OverlayHandle::TOffsetNode const & node) const
-  {
-    return node.first.GetID() == m_bufferID;
-  }
+  bool operator()(OverlayHandle::TOffsetNode const & node) const { return node.first.GetID() == m_bufferID; }
 
 private:
   uint8_t m_bufferID;
 };
 
-OverlayHandle::OverlayHandle(OverlayID const & id, dp::Anchor anchor,
-                             uint64_t priority, uint8_t minVisibleScale, bool isBillboard)
+OverlayHandle::OverlayHandle(OverlayID const & id, dp::Anchor anchor, uint64_t priority, uint8_t minVisibleScale,
+                             bool isBillboard)
   : m_id(id)
   , m_anchor(anchor)
   , m_priority(priority)
@@ -80,10 +77,8 @@ bool OverlayHandle::IsIntersect(ScreenBase const & screen, ref_ptr<OverlayHandle
   for (size_t i = 0; i < ar1.size(); ++i)
   {
     for (size_t j = 0; j < ar2.size(); ++j)
-    {
       if (ar1[i].IsIntersect(ar2[j]))
         return true;
-    }
   }
   return false;
 }
@@ -176,8 +171,8 @@ m2::RectD OverlayHandle::GetPixelRectPerspective(ScreenBase const & screen) cons
 }
 
 SquareHandle::SquareHandle(OverlayID const & id, dp::Anchor anchor, m2::PointD const & gbPivot,
-                           m2::PointD const & pxSize, m2::PointD const & pxOffset,
-                           uint64_t priority, bool isBound, int minVisibleScale, bool isBillboard)
+                           m2::PointD const & pxSize, m2::PointD const & pxOffset, uint64_t priority, bool isBound,
+                           int minVisibleScale, bool isBillboard)
   : TBase(id, anchor, priority, minVisibleScale, isBillboard)
   , m_pxHalfSize(pxSize.x / 2.0, pxSize.y / 2.0)
   , m_gbPivot(gbPivot)
@@ -213,14 +208,17 @@ void SquareHandle::GetPixelShape(ScreenBase const & screen, bool perspective, Re
   rects.emplace_back(GetPixelRect(screen, perspective));
 }
 
-bool SquareHandle::IsBound() const { return m_isBound; }
+bool SquareHandle::IsBound() const
+{
+  return m_isBound;
+}
 
 #ifdef DEBUG_OVERLAYS_OUTPUT
 std::string SquareHandle::GetOverlayDebugInfo()
 {
   std::ostringstream out;
-  out << "POI Priority(" << std::hex << std::setw(16) << std::setfill('0') << GetPriority()
-      << ") " << std::dec << DebugPrint(GetOverlayID());
+  out << "POI Priority(" << std::hex << std::setw(16) << std::setfill('0') << GetPriority() << ") " << std::dec
+      << DebugPrint(GetOverlayID());
   return out.str();
 }
 #endif
@@ -235,9 +233,7 @@ uint64_t CalculateOverlayPriority(uint8_t rank, float depth)
 
   // Pack into uint64_t priority value (bigger is better).
   // [1 byte - 0xFF][4 bytes - priority][1 byte - rank][2 bytes - 0xFFFF].
-  return (static_cast<uint64_t>(depth) << 24) |
-         (static_cast<uint64_t>(rank) << 16) |
-         dp::kPriorityMaskZoomLevel;
+  return (static_cast<uint64_t>(depth) << 24) | (static_cast<uint64_t>(rank) << 16) | dp::kPriorityMaskZoomLevel;
 }
 
 uint64_t CalculateSpecialModeUserMarkPriority(uint16_t specialPriority)
diff --git a/libs/drape/overlay_handle.hpp b/libs/drape/overlay_handle.hpp
index 5b7071cbc..873715128 100644
--- a/libs/drape/overlay_handle.hpp
+++ b/libs/drape/overlay_handle.hpp
@@ -19,9 +19,9 @@
 
 #include <set>
 #include <string>
+#include <tuple>
 #include <utility>
 #include <vector>
-#include <tuple>
 
 namespace dp
 {
@@ -46,9 +46,7 @@ struct OverlayID
 
   OverlayID() = default;
 
-  explicit OverlayID(FeatureID const & featureId)
-    : m_featureId(featureId)
-  {}
+  explicit OverlayID(FeatureID const & featureId) : m_featureId(featureId) {}
 
   OverlayID(FeatureID const & featureId, kml::MarkId markId, m2::PointI const & tileCoords, uint32_t index)
     : m_featureId(featureId)
@@ -57,45 +55,24 @@ struct OverlayID
     , m_index(index)
   {}
 
-  bool IsValid() const
-  {
-    return m_featureId.IsValid() || m_markId != kml::kInvalidMarkId;
-  }
+  bool IsValid() const { return m_featureId.IsValid() || m_markId != kml::kInvalidMarkId; }
 
-  static OverlayID GetLowerKey(FeatureID const & featureID)
-  {
-    return {featureID, 0, {-1, -1}, 0};
-  }
+  static OverlayID GetLowerKey(FeatureID const & featureID) { return {featureID, 0, {-1, -1}, 0}; }
 
-  auto AsTupleOfRefs() const
-  {
-    return std::tie(m_featureId, m_markId, m_tileCoords, m_index);
-  }
+  auto AsTupleOfRefs() const { return std::tie(m_featureId, m_markId, m_tileCoords, m_index); }
 
-  bool operator==(OverlayID const & overlayId) const
-  {
-    return AsTupleOfRefs() == overlayId.AsTupleOfRefs();
-  }
+  bool operator==(OverlayID const & overlayId) const { return AsTupleOfRefs() == overlayId.AsTupleOfRefs(); }
 
-  bool operator!=(OverlayID const & overlayId) const
-  {
-    return !operator ==(overlayId);
-  }
+  bool operator!=(OverlayID const & overlayId) const { return !operator==(overlayId); }
 
-  bool operator<(OverlayID const & overlayId) const
-  {
-    return AsTupleOfRefs() < overlayId.AsTupleOfRefs();
-  }
+  bool operator<(OverlayID const & overlayId) const { return AsTupleOfRefs() < overlayId.AsTupleOfRefs(); }
 
-  bool operator>(OverlayID const & overlayId) const
-  {
-    return overlayId < *this;
-  }
+  bool operator>(OverlayID const & overlayId) const { return overlayId < *this; }
 
   friend std::string DebugPrint(OverlayID const & overlayId)
   {
-    return strings::to_string(overlayId.m_featureId.m_index) + "-" +
-           strings::to_string(overlayId.m_markId) + "-" + strings::to_string(overlayId.m_index);
+    return strings::to_string(overlayId.m_featureId.m_index) + "-" + strings::to_string(overlayId.m_markId) + "-" +
+           strings::to_string(overlayId.m_index);
   }
 };
 
@@ -104,8 +81,7 @@ class OverlayHandle
 public:
   using Rects = std::vector<m2::RectF>;
 
-  OverlayHandle(OverlayID const & id, dp::Anchor anchor,
-                uint64_t priority, uint8_t minVisibleScale, bool isBillboard);
+  OverlayHandle(OverlayID const & id, dp::Anchor anchor, uint64_t priority, uint8_t minVisibleScale, bool isBillboard);
 
   virtual ~OverlayHandle() = default;
 
@@ -205,14 +181,8 @@ private:
     {
       return node1.first.GetID() < node2.first.GetID();
     }
-    bool operator()(uint8_t node1, TOffsetNode const & node2) const
-    {
-      return node1 < node2.first.GetID();
-    }
-    bool operator()(TOffsetNode const & node1, uint8_t node2) const
-    {
-      return node1.first.GetID() < node2;
-    }
+    bool operator()(uint8_t node1, TOffsetNode const & node2) const { return node1 < node2.first.GetID(); }
+    bool operator()(TOffsetNode const & node1, uint8_t node2) const { return node1.first.GetID() < node2; }
   };
 
   struct OffsetNodeFinder;
@@ -239,9 +209,8 @@ class SquareHandle : public OverlayHandle
   using TBase = OverlayHandle;
 
 public:
-  SquareHandle(OverlayID const & id, dp::Anchor anchor, m2::PointD const & gbPivot,
-               m2::PointD const & pxSize, m2::PointD const & pxOffset, uint64_t priority,
-               bool isBound, int minVisibleScale, bool isBillboard);
+  SquareHandle(OverlayID const & id, dp::Anchor anchor, m2::PointD const & gbPivot, m2::PointD const & pxSize,
+               m2::PointD const & pxOffset, uint64_t priority, bool isBound, int minVisibleScale, bool isBillboard);
 
   m2::RectD GetPixelRect(ScreenBase const & screen, bool perspective) const override;
   void GetPixelShape(ScreenBase const & screen, bool perspective, Rects & rects) const override;
diff --git a/libs/drape/overlay_tree.cpp b/libs/drape/overlay_tree.cpp
index 25df749be..5716cecc3 100644
--- a/libs/drape/overlay_tree.cpp
+++ b/libs/drape/overlay_tree.cpp
@@ -13,7 +13,7 @@ int const kMaxFrameUpdatePeriod = 15;
 uint32_t const kMinHandlesCount = 100;
 uint32_t const kMaxHandlesCount = 1000;
 
-size_t const kAverageHandlesCount[dp::OverlayRanksCount] = { 300, 200, 50 };
+size_t const kAverageHandlesCount[dp::OverlayRanksCount] = {300, 200, 50};
 int const kInvalidFrame = -1;
 
 namespace
@@ -21,14 +21,9 @@ namespace
 class HandleComparator
 {
 public:
-  explicit HandleComparator(bool enableMask)
-    : m_enableMask(enableMask)
-  {}
+  explicit HandleComparator(bool enableMask) : m_enableMask(enableMask) {}
 
-  bool operator()(ref_ptr<OverlayHandle> const & l, ref_ptr<OverlayHandle> const & r) const
-  {
-    return IsGreater(l, r);
-  }
+  bool operator()(ref_ptr<OverlayHandle> const & l, ref_ptr<OverlayHandle> const & r) const { return IsGreater(l, r); }
 
   bool IsGreater(ref_ptr<OverlayHandle> const & l, ref_ptr<OverlayHandle> const & r) const
   {
@@ -167,7 +162,7 @@ bool OverlayTree::Remove(ref_ptr<OverlayHandle> handle)
 void OverlayTree::Add(ref_ptr<OverlayHandle> handle)
 {
   /// @todo Fires when deleting downloaded country ?!
-  //ASSERT(handle->GetOverlayID().IsValid(), ());
+  // ASSERT(handle->GetOverlayID().IsValid(), ());
   ASSERT(IsNeedUpdate(), ());
 
   ScreenBase const & modelView = GetModelView();
@@ -199,8 +194,7 @@ void OverlayTree::Add(ref_ptr<OverlayHandle> handle)
   // last time. Also clip all handles in reverse projection.
   m2::RectD const pixelRect = handle->GetExtendedPixelRect(modelView);
   if (modelView.IsReverseProjection3d(pixelRect.Center()) ||
-      (m_displacers.find(handle) == m_displacers.end() &&
-       !m_traits.GetExtendedScreenRect().IsIntersect(pixelRect)))
+      (m_displacers.find(handle) == m_displacers.end() && !m_traits.GetExtendedScreenRect().IsIntersect(pixelRect)))
   {
     handle->SetIsVisible(false);
     return;
@@ -216,7 +210,7 @@ void OverlayTree::InsertHandle(ref_ptr<OverlayHandle> handle, int currentRank,
                                ref_ptr<OverlayHandle> const & parentOverlay)
 {
   /// @todo Fires when updating country (delete-add) ?!
-  //ASSERT(handle->GetOverlayID().IsValid(), ());
+  // ASSERT(handle->GetOverlayID().IsValid(), ());
   ASSERT(IsNeedUpdate(), ());
 
 #ifdef DEBUG_OVERLAYS_OUTPUT
@@ -242,11 +236,10 @@ void OverlayTree::InsertHandle(ref_ptr<OverlayHandle> handle, int currentRank,
 
   // Find elements that already on OverlayTree and it's pixel rect
   // intersect with handle pixel rect ("Intersected elements").
-  ForEachInRect(pixelRect, [&] (ref_ptr<OverlayHandle> const & h)
+  ForEachInRect(pixelRect, [&](ref_ptr<OverlayHandle> const & h)
   {
-    bool const isParent = (h == parentOverlay) ||
-                          (h->GetOverlayID() == handle->GetOverlayID() &&
-                           h->GetOverlayRank() < handle->GetOverlayRank());
+    bool const isParent = (h == parentOverlay) || (h->GetOverlayID() == handle->GetOverlayID() &&
+                                                   h->GetOverlayRank() < handle->GetOverlayRank());
     if (!isParent && handle->IsIntersect(modelView, h))
       rivals.push_back(h);
   });
@@ -257,8 +250,8 @@ void OverlayTree::InsertHandle(ref_ptr<OverlayHandle> handle, int currentRank,
   if (boundToParent)
     handleToCompare = parentOverlay;
 
-  bool const selected = m_selectedFeatureID.IsValid() &&
-                        handleToCompare->GetOverlayID().m_featureId == m_selectedFeatureID;
+  bool const selected =
+      m_selectedFeatureID.IsValid() && handleToCompare->GetOverlayID().m_featureId == m_selectedFeatureID;
 
   if (!selected)
   {
@@ -455,10 +448,8 @@ bool OverlayTree::GetSelectedFeatureRect(ScreenBase const & screen, m2::RectD &
        it != m_overlayIdCache.end() && it->first.m_featureId == m_selectedFeatureID; ++it)
   {
     for (auto const & handle : it->second)
-    {
       if (handle->IsVisible())
         resultRect.Add(handle->GetPixelRect(screen, screen.isPerspective()));
-    }
   }
 
   if (resultRect.IsValid())
@@ -482,10 +473,8 @@ void OverlayTree::Select(m2::PointD const & glbPoint, TOverlayContainer & result
   /// @todo Why we can't call Select(rect) here?
   /// Why we don't check handle->IsVisible(), like in Select(rect)?
   for (auto const & handle : m_handlesCache)
-  {
     if (!handle->HasLinearFeatureShape() && rect.IsPointInside(handle->GetPivot(screen, false)))
       result.push_back(handle);
-  }
 }
 
 void OverlayTree::Select(m2::RectD const & rect, TOverlayContainer & result) const
@@ -543,8 +532,8 @@ void OverlayTree::StoreDisplacementInfo(int caseIndex, ref_ptr<OverlayHandle> di
     m_displacers.insert(displacerHandle);
 
 #ifdef DEBUG_OVERLAYS_OUTPUT
-    LOG(LINFO, ("Displace (", caseIndex, "):", displacerHandle->GetOverlayDebugInfo(),
-                "->", displacedHandle->GetOverlayDebugInfo()));
+  LOG(LINFO, ("Displace (", caseIndex, "):", displacerHandle->GetOverlayDebugInfo(), "->",
+              displacedHandle->GetOverlayDebugInfo()));
 #else
   UNUSED_VALUE(caseIndex);
 #endif
diff --git a/libs/drape/overlay_tree.hpp b/libs/drape/overlay_tree.hpp
index 5ba842ade..e08805cdd 100644
--- a/libs/drape/overlay_tree.hpp
+++ b/libs/drape/overlay_tree.hpp
@@ -20,10 +20,7 @@ namespace detail
 class OverlayTraits
 {
 public:
-  m2::RectD const LimitRect(ref_ptr<OverlayHandle> const & handle)
-  {
-    return handle->GetExtendedPixelRect(m_modelView);
-  }
+  m2::RectD const LimitRect(ref_ptr<OverlayHandle> const & handle) { return handle->GetExtendedPixelRect(m_modelView); }
   ScreenBase const & GetModelView() const { return m_modelView; }
   m2::RectD const & GetExtendedScreenRect() const { return m_extendedScreenRect; }
   m2::RectD const & GetDisplacersFreeRect() const { return m_displacersFreeRect; }
@@ -42,10 +39,7 @@ struct OverlayHasher
 {
   std::hash<OverlayHandle *> m_hasher;
 
-  size_t operator()(ref_ptr<OverlayHandle> const & handle) const
-  {
-    return m_hasher(handle.get());
-  }
+  size_t operator()(ref_ptr<OverlayHandle> const & handle) const { return m_hasher(handle.get()); }
 };
 }  // namespace detail
 
@@ -90,9 +84,10 @@ public:
     m2::PointF m_arrowStart;
     m2::PointF m_arrowEnd;
     dp::Color m_arrowColor;
-    DisplacementData(m2::PointF const & arrowStart, m2::PointF const & arrowEnd,
-                     dp::Color const & arrowColor)
-      : m_arrowStart(arrowStart), m_arrowEnd(arrowEnd), m_arrowColor(arrowColor)
+    DisplacementData(m2::PointF const & arrowStart, m2::PointF const & arrowEnd, dp::Color const & arrowColor)
+      : m_arrowStart(arrowStart)
+      , m_arrowEnd(arrowEnd)
+      , m_arrowColor(arrowColor)
     {}
   };
   using TDisplacementInfo = std::vector<DisplacementData>;
@@ -102,10 +97,8 @@ public:
 
 private:
   ScreenBase const & GetModelView() const { return m_traits.GetModelView(); }
-  void InsertHandle(ref_ptr<OverlayHandle> handle, int currentRank,
-                    ref_ptr<OverlayHandle> const & parentOverlay);
-  bool CheckHandle(ref_ptr<OverlayHandle> handle, int currentRank,
-                   ref_ptr<OverlayHandle> & parentOverlay) const;
+  void InsertHandle(ref_ptr<OverlayHandle> handle, int currentRank, ref_ptr<OverlayHandle> const & parentOverlay);
+  bool CheckHandle(ref_ptr<OverlayHandle> handle, int currentRank, ref_ptr<OverlayHandle> & parentOverlay) const;
   bool DeleteHandleImpl(ref_ptr<OverlayHandle> handle);
   void DeleteHandle(ref_ptr<OverlayHandle> handle);
 
diff --git a/libs/drape/pointers.cpp b/libs/drape/pointers.cpp
index 10b9290e1..ba4f4bdde 100644
--- a/libs/drape/pointers.cpp
+++ b/libs/drape/pointers.cpp
@@ -36,8 +36,7 @@ void DpPointerTracker::DestroyPtr(void * p)
     if (it->second.first != 0)
     {
       LOG(LWARNING, ("Drape pointer [", it->second.second, p,
-                     "] was destroyed, but had references, ref count = ",
-                     it->second.first));
+                     "] was destroyed, but had references, ref count = ", it->second.first));
     }
     m_alivePointers.erase(it);
   }
diff --git a/libs/drape/pointers.hpp b/libs/drape/pointers.hpp
index 044179c28..4b4c50a67 100644
--- a/libs/drape/pointers.hpp
+++ b/libs/drape/pointers.hpp
@@ -25,7 +25,7 @@ public:
   template <typename T>
   void RefPtr(T * refPtr)
   {
-    RefPtrNamed(static_cast<void*>(refPtr), typeid(refPtr).name());
+    RefPtrNamed(static_cast<void *>(refPtr), typeid(refPtr).name());
   }
 
   void DerefPtr(void * p);
@@ -56,7 +56,8 @@ public:
   }
 };
 
-template<typename T> using drape_ptr = std::unique_ptr<T, DpPointerDeleter>;
+template <typename T>
+using drape_ptr = std::unique_ptr<T, DpPointerDeleter>;
 #else
 template <typename T>
 using drape_ptr = std::unique_ptr<T>;
@@ -68,12 +69,11 @@ drape_ptr<T> make_unique_dp(Args &&... args)
   return drape_ptr<T>(new T(std::forward<Args>(args)...));
 }
 
-template<typename T>
+template <typename T>
 class ref_ptr
 {
 public:
-  ref_ptr() noexcept
-    : m_ptr(nullptr)
+  ref_ptr() noexcept : m_ptr(nullptr)
   {
 #if defined(TRACK_POINTERS)
     m_isOwnerUnique = false;
@@ -94,8 +94,7 @@ public:
 #endif
   }
 
-  ref_ptr(ref_ptr const & rhs) noexcept
-    : m_ptr(rhs.m_ptr)
+  ref_ptr(ref_ptr const & rhs) noexcept : m_ptr(rhs.m_ptr)
   {
 #if defined(TRACK_POINTERS)
     m_isOwnerUnique = rhs.m_isOwnerUnique;
@@ -126,12 +125,12 @@ public:
 
   T * operator->() const { return m_ptr; }
 
-  template<typename TResult>
+  template <typename TResult>
   operator ref_ptr<TResult>() const
   {
     TResult * res;
 
-    if constexpr(std::is_base_of<TResult, T>::value || std::is_void<TResult>::value)
+    if constexpr (std::is_base_of<TResult, T>::value || std::is_void<TResult>::value)
       res = m_ptr;
     else
     {
@@ -211,7 +210,7 @@ public:
   T * get() const { return m_ptr; }
 
 private:
-  T* m_ptr;
+  T * m_ptr;
 #if defined(TRACK_POINTERS)
   bool m_isOwnerUnique;
 #endif
@@ -237,7 +236,7 @@ ref_ptr<T> make_ref(drape_ptr<T> const & drapePtr)
 }
 
 template <typename T>
-ref_ptr<T> make_ref(T* ptr)
+ref_ptr<T> make_ref(T * ptr)
 {
 #if defined(TRACK_POINTERS)
   return ref_ptr<T>(ptr, false /* isOwnerUnique */);
diff --git a/libs/drape/render_bucket.cpp b/libs/drape/render_bucket.cpp
index fb32c0d93..5353fdd14 100644
--- a/libs/drape/render_bucket.cpp
+++ b/libs/drape/render_bucket.cpp
@@ -10,9 +10,7 @@
 
 namespace dp
 {
-RenderBucket::RenderBucket(drape_ptr<VertexArrayBuffer> && buffer)
-  : m_buffer(std::move(buffer))
-{}
+RenderBucket::RenderBucket(drape_ptr<VertexArrayBuffer> && buffer) : m_buffer(std::move(buffer)) {}
 
 RenderBucket::~RenderBucket() {}
 
@@ -61,10 +59,8 @@ void RenderBucket::Update(ScreenBase const & modelView)
 {
   BeforeUpdate();
   for (auto & overlayHandle : m_overlay)
-  {
     if (overlayHandle->IsVisible())
       overlayHandle->Update(modelView);
-  }
 }
 
 void RenderBucket::CollectOverlayHandles(ref_ptr<OverlayTree> tree)
@@ -82,10 +78,8 @@ bool RenderBucket::HasOverlayHandles() const
 bool RenderBucket::RemoveOverlayHandles(ref_ptr<OverlayTree> tree)
 {
   for (auto const & overlayHandle : m_overlay)
-  {
     if (tree->Remove(make_ref(overlayHandle)))
       return true;
-  }
   return false;
 }
 
diff --git a/libs/drape/render_state.cpp b/libs/drape/render_state.cpp
index 59c89cc41..bac64a96b 100644
--- a/libs/drape/render_state.cpp
+++ b/libs/drape/render_state.cpp
@@ -37,30 +37,30 @@ void AlphaBlendingState::Apply(ref_ptr<GraphicsContext> context)
   }
 }
 
-Blending::Blending(bool isEnabled)
-  : m_isEnabled(isEnabled)
-{}
+Blending::Blending(bool isEnabled) : m_isEnabled(isEnabled) {}
 
 void Blending::Apply(ref_ptr<GraphicsContext> context, ref_ptr<GpuProgram> program) const
 {
   // For Metal Rendering these settings must be set in the pipeline state.
   auto const apiVersion = context->GetApiVersion();
   if (apiVersion == dp::ApiVersion::OpenGLES3)
-  {
     if (m_isEnabled)
       GLFunctions::glEnable(gl_const::GLBlending);
     else
       GLFunctions::glDisable(gl_const::GLBlending);
-  }
   else
-  {
     CHECK(false, ("Unsupported API version."));
-  }
 }
 
-bool Blending::operator<(Blending const & other) const { return m_isEnabled < other.m_isEnabled; }
+bool Blending::operator<(Blending const & other) const
+{
+  return m_isEnabled < other.m_isEnabled;
+}
 
-bool Blending::operator==(Blending const & other) const { return m_isEnabled == other.m_isEnabled; }
+bool Blending::operator==(Blending const & other) const
+{
+  return m_isEnabled == other.m_isEnabled;
+}
 
 void RenderState::SetColorTexture(ref_ptr<Texture> tex)
 {
@@ -192,15 +192,10 @@ bool RenderState::operator<(RenderState const & other) const
 
 bool RenderState::operator==(RenderState const & other) const
 {
-  return m_renderStateExtension->Equal(other.m_renderStateExtension) &&
-         m_gpuProgram == other.m_gpuProgram &&
-         m_gpuProgram3d == other.m_gpuProgram3d &&
-         m_blending == other.m_blending &&
-         m_textures == other.m_textures &&
-         m_textureFilter == other.m_textureFilter &&
-         m_depthFunction == other.m_depthFunction &&
-         m_drawAsLine == other.m_drawAsLine &&
-         m_lineWidth == other.m_lineWidth &&
+  return m_renderStateExtension->Equal(other.m_renderStateExtension) && m_gpuProgram == other.m_gpuProgram &&
+         m_gpuProgram3d == other.m_gpuProgram3d && m_blending == other.m_blending && m_textures == other.m_textures &&
+         m_textureFilter == other.m_textureFilter && m_depthFunction == other.m_depthFunction &&
+         m_drawAsLine == other.m_drawAsLine && m_lineWidth == other.m_lineWidth &&
          m_textureIndex == other.m_textureIndex;
 }
 
diff --git a/libs/drape/render_state.hpp b/libs/drape/render_state.hpp
index 0f3a314b5..764cb8404 100644
--- a/libs/drape/render_state.hpp
+++ b/libs/drape/render_state.hpp
@@ -41,7 +41,7 @@ public:
 class RenderState
 {
 public:
-  template<typename ProgramType>
+  template <typename ProgramType>
   RenderState(ProgramType gpuProgram, ref_ptr<BaseRenderStateExtension> renderStateExtension)
     : m_renderStateExtension(std::move(renderStateExtension))
     , m_gpuProgram(static_cast<size_t>(gpuProgram))
@@ -50,7 +50,7 @@ public:
     ASSERT(m_renderStateExtension != nullptr, ());
   }
 
-  template<typename RenderStateExtensionType>
+  template <typename RenderStateExtensionType>
   ref_ptr<RenderStateExtensionType> GetRenderStateExtension() const
   {
     ASSERT(dynamic_cast<RenderStateExtensionType *>(m_renderStateExtension.get()) != nullptr, ());
@@ -70,14 +70,23 @@ public:
   void SetBlending(Blending const & blending) { m_blending = blending; }
   Blending const & GetBlending() const { return m_blending; }
 
-  template<typename ProgramType>
-  ProgramType GetProgram() const { return static_cast<ProgramType>(m_gpuProgram); }
+  template <typename ProgramType>
+  ProgramType GetProgram() const
+  {
+    return static_cast<ProgramType>(m_gpuProgram);
+  }
 
-  template<typename ProgramType>
-  void SetProgram3d(ProgramType gpuProgram3d) { m_gpuProgram3d = static_cast<size_t>(gpuProgram3d); }
+  template <typename ProgramType>
+  void SetProgram3d(ProgramType gpuProgram3d)
+  {
+    m_gpuProgram3d = static_cast<size_t>(gpuProgram3d);
+  }
 
-  template<typename ProgramType>
-  ProgramType GetProgram3d() const { return static_cast<ProgramType>(m_gpuProgram3d); }
+  template <typename ProgramType>
+  ProgramType GetProgram3d() const
+  {
+    return static_cast<ProgramType>(m_gpuProgram3d);
+  }
 
   TestFunction GetDepthFunction() const;
   void SetDepthFunction(TestFunction depthFunction);
@@ -121,8 +130,7 @@ private:
 class TextureState
 {
 public:
-  static void ApplyTextures(ref_ptr<GraphicsContext> context, RenderState const & state,
-                            ref_ptr<GpuProgram> program);
+  static void ApplyTextures(ref_ptr<GraphicsContext> context, RenderState const & state, ref_ptr<GpuProgram> program);
   static uint8_t GetLastUsedSlots();
 
 private:
diff --git a/libs/drape/shader.cpp b/libs/drape/shader.cpp
index 259ccc278..3b6506bbe 100644
--- a/libs/drape/shader.cpp
+++ b/libs/drape/shader.cpp
@@ -16,8 +16,7 @@ glConst ConvertType(Shader::Type t)
 }
 }  // namespace
 
-Shader::Shader(std::string const & shaderName, std::string const & shaderSource,
-               std::string const & defines, Type type)
+Shader::Shader(std::string const & shaderName, std::string const & shaderSource, std::string const & defines, Type type)
   : m_shaderName(shaderName)
   , m_glID(0)
 {
diff --git a/libs/drape/shader.hpp b/libs/drape/shader.hpp
index ae4253bff..27a96cbf0 100644
--- a/libs/drape/shader.hpp
+++ b/libs/drape/shader.hpp
@@ -14,8 +14,7 @@ public:
     FragmentShader
   };
 
-  Shader(std::string const & shaderName, std::string const & shaderSource,
-         std::string const & defines, Type type);
+  Shader(std::string const & shaderName, std::string const & shaderSource, std::string const & defines, Type type);
   ~Shader();
 
   uint32_t GetID() const;
diff --git a/libs/drape/static_texture.cpp b/libs/drape/static_texture.cpp
index 6c21ec480..9018d279e 100644
--- a/libs/drape/static_texture.cpp
+++ b/libs/drape/static_texture.cpp
@@ -25,9 +25,8 @@ namespace
 using TLoadingCompletion = std::function<void(unsigned char *, uint32_t, uint32_t)>;
 using TLoadingFailure = std::function<void(std::string const &)>;
 
-bool LoadData(std::string const & textureName, std::string const & skinPathName,
-              uint8_t bytesPerPixel, TLoadingCompletion const & completionHandler,
-              TLoadingFailure const & failureHandler)
+bool LoadData(std::string const & textureName, std::string const & skinPathName, uint8_t bytesPerPixel,
+              TLoadingCompletion const & completionHandler, TLoadingFailure const & failureHandler)
 {
   ASSERT(completionHandler != nullptr, ());
   ASSERT(failureHandler != nullptr, ());
@@ -35,12 +34,10 @@ bool LoadData(std::string const & textureName, std::string const & skinPathName,
   std::vector<unsigned char> rawData;
   try
   {
-    ReaderPtr<Reader> reader =
-        !skinPathName.empty()
-            ? skinPathName == StaticTexture::kDefaultResource
-                ? GetStyleReader().GetDefaultResourceReader(textureName)
-                : GetStyleReader().GetResourceReader(textureName, skinPathName)
-            : GetPlatform().GetReader(textureName);
+    ReaderPtr<Reader> reader = !skinPathName.empty() ? skinPathName == StaticTexture::kDefaultResource
+                                                         ? GetStyleReader().GetDefaultResourceReader(textureName)
+                                                         : GetStyleReader().GetResourceReader(textureName, skinPathName)
+                                                     : GetPlatform().GetReader(textureName);
 
     CHECK_LESS(reader.Size(), static_cast<uint64_t>(std::numeric_limits<size_t>::max()), ());
     size_t const size = static_cast<size_t>(reader.Size());
@@ -63,8 +60,7 @@ bool LoadData(std::string const & textureName, std::string const & skinPathName,
   ASSERT(glm::isPowerOfTwo(w), (w));
   ASSERT(glm::isPowerOfTwo(h), (h));
 
-  unsigned char * data =
-      stbi_load_from_memory(&rawData[0], static_cast<int>(rawData.size()), &w, &h, &bpp, 0);
+  unsigned char * data = stbi_load_from_memory(&rawData[0], static_cast<int>(rawData.size()), &w, &h, &bpp, 0);
 
   if (bytesPerPixel != bpp)
   {
@@ -94,14 +90,12 @@ public:
 };
 }  // namespace
 
-StaticTexture::StaticTexture()
-  : m_info(make_unique_dp<StaticResourceInfo>()) {}
+StaticTexture::StaticTexture() : m_info(make_unique_dp<StaticResourceInfo>()) {}
 
-StaticTexture::StaticTexture(ref_ptr<dp::GraphicsContext> context,
-                             std::string const & textureName, std::string const & skinPathName,
-                             dp::TextureFormat format, ref_ptr<HWTextureAllocator> allocator,
-                             bool allowOptional /* = false */)
-: m_info(make_unique_dp<StaticResourceInfo>())
+StaticTexture::StaticTexture(ref_ptr<dp::GraphicsContext> context, std::string const & textureName,
+                             std::string const & skinPathName, dp::TextureFormat format,
+                             ref_ptr<HWTextureAllocator> allocator, bool allowOptional /* = false */)
+  : m_info(make_unique_dp<StaticResourceInfo>())
 {
   auto completionHandler = [&](unsigned char * data, uint32_t width, uint32_t height)
   {
@@ -129,8 +123,7 @@ StaticTexture::StaticTexture(ref_ptr<dp::GraphicsContext> context,
   m_isLoadingCorrect = LoadData(textureName, skinPathName, bytesPerPixel, completionHandler, failureHandler);
 }
 
-ref_ptr<Texture::ResourceInfo> StaticTexture::FindResource(Texture::Key const & key,
-                                                           bool & newResource)
+ref_ptr<Texture::ResourceInfo> StaticTexture::FindResource(Texture::Key const & key, bool & newResource)
 {
   newResource = false;
   if (key.GetType() != Texture::ResourceType::Static)
@@ -145,8 +138,7 @@ void StaticTexture::Create(ref_ptr<dp::GraphicsContext> context, Params const &
   Base::Create(context, params);
 }
 
-void StaticTexture::Create(ref_ptr<dp::GraphicsContext> context, Params const & params,
-                           ref_ptr<void> data)
+void StaticTexture::Create(ref_ptr<dp::GraphicsContext> context, Params const & params, ref_ptr<void> data)
 {
   ASSERT(Base::IsPowerOfTwo(params.m_width, params.m_height), (params.m_width, params.m_height));
 
diff --git a/libs/drape/static_texture.hpp b/libs/drape/static_texture.hpp
index fd5a806c4..0c5c04ac4 100644
--- a/libs/drape/static_texture.hpp
+++ b/libs/drape/static_texture.hpp
@@ -9,6 +9,7 @@ namespace dp
 class StaticTexture : public Texture
 {
   using Base = Texture;
+
 public:
   class StaticKey : public Key
   {
@@ -21,14 +22,12 @@ public:
   StaticTexture();
 
   /// @todo All xxxName can be std::string_view after Platform::GetReader (StyleReader) refactoring.
-  StaticTexture(ref_ptr<dp::GraphicsContext> context, std::string const & textureName,
-                std::string const & skinPathName, dp::TextureFormat format,
-                ref_ptr<HWTextureAllocator> allocator, bool allowOptional = false);
+  StaticTexture(ref_ptr<dp::GraphicsContext> context, std::string const & textureName, std::string const & skinPathName,
+                dp::TextureFormat format, ref_ptr<HWTextureAllocator> allocator, bool allowOptional = false);
 
   ref_ptr<ResourceInfo> FindResource(Key const & key, bool & newResource) override;
   void Create(ref_ptr<dp::GraphicsContext> context, Params const & params) override;
-  void Create(ref_ptr<dp::GraphicsContext> context, Params const & params,
-              ref_ptr<void> data) override;
+  void Create(ref_ptr<dp::GraphicsContext> context, Params const & params, ref_ptr<void> data) override;
 
   bool IsLoadingCorrect() const { return m_isLoadingCorrect; }
 
diff --git a/libs/drape/stipple_pen_resource.cpp b/libs/drape/stipple_pen_resource.cpp
index e5d4a9e74..4abf0642c 100644
--- a/libs/drape/stipple_pen_resource.cpp
+++ b/libs/drape/stipple_pen_resource.cpp
@@ -13,9 +13,7 @@
 
 namespace dp
 {
-StipplePenPacker::StipplePenPacker(m2::PointU const & canvasSize)
-  : m_canvasSize(canvasSize)
-  , m_currentRow(0)
+StipplePenPacker::StipplePenPacker(m2::PointU const & canvasSize) : m_canvasSize(canvasSize), m_currentRow(0)
 {
   ASSERT_GREATER_OR_EQUAL(canvasSize.x, kMaxStipplePenLength, ());
 }
@@ -31,14 +29,11 @@ m2::RectU StipplePenPacker::PackResource(m2::PointU const & size)
 
 m2::RectF StipplePenPacker::MapTextureCoords(m2::RectU const & pixelRect) const
 {
-  return { (pixelRect.minX() + 0.5f) / m_canvasSize.x,
-           (pixelRect.minY() + 0.5f) / m_canvasSize.y,
-           (pixelRect.maxX() - 0.5f) / m_canvasSize.x,
-           (pixelRect.maxY() - 0.5f) / m_canvasSize.y };
+  return {(pixelRect.minX() + 0.5f) / m_canvasSize.x, (pixelRect.minY() + 0.5f) / m_canvasSize.y,
+          (pixelRect.maxX() - 0.5f) / m_canvasSize.x, (pixelRect.maxY() - 0.5f) / m_canvasSize.y};
 }
 
-StipplePenRasterizator::StipplePenRasterizator(StipplePenKey const & key)
-  : m_key(key)
+StipplePenRasterizator::StipplePenRasterizator(StipplePenKey const & key) : m_key(key)
 {
   if (IsTrianglePattern(m_key.m_pattern))
   {
@@ -51,7 +46,7 @@ StipplePenRasterizator::StipplePenRasterizator(StipplePenKey const & key)
     m_height = 1;
   }
 
-  uint32_t const availableSize = kMaxStipplePenLength - 2; // the first and the last pixel reserved
+  uint32_t const availableSize = kMaxStipplePenLength - 2;  // the first and the last pixel reserved
   ASSERT(m_patternLength > 0 && m_patternLength < availableSize, (m_patternLength, availableSize));
   uint32_t const count = floor(availableSize / m_patternLength);
   m_pixelLength = count * m_patternLength;
@@ -155,8 +150,8 @@ ref_ptr<Texture::ResourceInfo> StipplePenIndex::ReserveResource(bool predefined,
     m_pendingNodes.emplace_back(pixelRect, resource);
   }
 
-  auto res = resourceMapping.emplace(key, StipplePenResourceInfo(m_packer.MapTextureCoords(pixelRect),
-                                                                 resource.GetSize()));
+  auto res =
+      resourceMapping.emplace(key, StipplePenResourceInfo(m_packer.MapTextureCoords(pixelRect), resource.GetSize()));
   ASSERT(res.second, ());
   return make_ref(&res.first->second);
 }
diff --git a/libs/drape/stipple_pen_resource.hpp b/libs/drape/stipple_pen_resource.hpp
index 03c6e1e26..43c672930 100644
--- a/libs/drape/stipple_pen_resource.hpp
+++ b/libs/drape/stipple_pen_resource.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
+#include "drape/dynamic_texture.hpp"
 #include "drape/pointers.hpp"
 #include "drape/texture.hpp"
-#include "drape/dynamic_texture.hpp"
 
 #include "base/buffer_vector.hpp"
 
@@ -13,7 +13,6 @@
 #include <map>
 #include <mutex>
 
-
 namespace dp
 {
 uint32_t constexpr kMaxStipplePenLength = 512;  /// @todo Should be equal with kStippleTextureWidth?
@@ -24,7 +23,7 @@ using PenPatternT = buffer_vector<uint16_t, 2>;
 inline uint16_t PatternFloat2Pixel(double d)
 {
   uint16_t const px = std::lround(d);
-  //ASSERT(px > 0, (d));
+  // ASSERT(px > 0, (d));
   return px > 0 ? px : 1;
 }
 
@@ -52,7 +51,7 @@ class StipplePenRasterizator
 public:
   explicit StipplePenRasterizator(StipplePenKey const & key);
 
-  m2::PointU GetSize() const { return { m_pixelLength, m_height }; }
+  m2::PointU GetSize() const { return {m_pixelLength, m_height}; }
 
   void Rasterize(uint8_t * buffer) const;
 
@@ -71,9 +70,9 @@ class StipplePenResourceInfo : public Texture::ResourceInfo
 {
 public:
   StipplePenResourceInfo(m2::RectF const & texRect, m2::PointU const & pixelSize)
-    : Texture::ResourceInfo(texRect), m_pixelSize(pixelSize)
-  {
-  }
+    : Texture::ResourceInfo(texRect)
+    , m_pixelSize(pixelSize)
+  {}
 
   virtual Texture::ResourceType GetType() const { return Texture::ResourceType::StipplePen; }
 
@@ -103,8 +102,7 @@ public:
   /// @param[out] newResource Needed for the generic DynamicTexture code.
   /// @{
   // Called from TextureManager::Init and fills m_predefinedResourceMapping, no need in m_mappingLock.
-  ref_ptr<Texture::ResourceInfo> ReserveResource(bool predefined, StipplePenKey const & key,
-                                                 bool & newResource);
+  ref_ptr<Texture::ResourceInfo> ReserveResource(bool predefined, StipplePenKey const & key, bool & newResource);
   // Checks m_predefinedResourceMapping, fills m_resourceMapping, locks m_mappingLock.
   ref_ptr<Texture::ResourceInfo> MapResource(StipplePenKey const & key, bool & newResource);
   /// @}
@@ -130,17 +128,14 @@ private:
   bool m_uploadCalled = false;
 };
 
-class StipplePenTexture : public DynamicTexture<StipplePenIndex, StipplePenKey,
-                                                Texture::ResourceType::StipplePen>
+class StipplePenTexture : public DynamicTexture<StipplePenIndex, StipplePenKey, Texture::ResourceType::StipplePen>
 {
   using TBase = DynamicTexture<StipplePenIndex, StipplePenKey, Texture::ResourceType::StipplePen>;
 
 public:
-  StipplePenTexture(m2::PointU const & size, ref_ptr<HWTextureAllocator> allocator)
-    : m_index(size)
+  StipplePenTexture(m2::PointU const & size, ref_ptr<HWTextureAllocator> allocator) : m_index(size)
   {
-    TBase::DynamicTextureParams params{size, TextureFormat::Red, TextureFilter::Nearest,
-                                       false /* m_usePixelBuffer */};
+    TBase::DynamicTextureParams params{size, TextureFormat::Red, TextureFilter::Nearest, false /* m_usePixelBuffer */};
     TBase::Init(allocator, make_ref(&m_index), params);
   }
 
diff --git a/libs/drape/support_manager.cpp b/libs/drape/support_manager.cpp
index b396899d5..097dbcb05 100644
--- a/libs/drape/support_manager.cpp
+++ b/libs/drape/support_manager.cpp
@@ -51,22 +51,22 @@ void SupportManager::Init(ref_ptr<GraphicsContext> context)
     m_maxLineWidth = std::max(props.limits.lineWidthRange[0], props.limits.lineWidthRange[1]);
     m_maxTextureSize = vulkanContext->GetGpuProperties().limits.maxImageDimension2D;
   }
-  LOG(LINFO, ("Max line width =", m_maxLineWidth,"| Max texture size =", m_maxTextureSize));
+  LOG(LINFO, ("Max line width =", m_maxLineWidth, "| Max texture size =", m_maxTextureSize));
 
   // Set up default antialiasing value.
   // Turn off AA for a while by energy-saving issues.
-//  bool val;
-//  if (!settings::Get(kSupportedAntialiasing, val))
-//  {
-//#ifdef OMIM_OS_ANDROID
-//    std::vector<std::string> const models = {"Mali-G71", "Mali-T880", "Adreno (TM) 540",
-//                                             "Adreno (TM) 530", "Adreno (TM) 430"};
-//    m_isAntialiasingEnabledByDefault = base::IsExist(models, m_rendererName);
-//#else
-//    m_isAntialiasingEnabledByDefault = true;
-//#endif
-//    settings::Set(kSupportedAntialiasing, m_isAntialiasingEnabledByDefault);
-//  }
+  //  bool val;
+  //  if (!settings::Get(kSupportedAntialiasing, val))
+  //  {
+  // #ifdef OMIM_OS_ANDROID
+  //    std::vector<std::string> const models = {"Mali-G71", "Mali-T880", "Adreno (TM) 540",
+  //                                             "Adreno (TM) 530", "Adreno (TM) 430"};
+  //    m_isAntialiasingEnabledByDefault = base::IsExist(models, m_rendererName);
+  // #else
+  //    m_isAntialiasingEnabledByDefault = true;
+  // #endif
+  //    settings::Set(kSupportedAntialiasing, m_isAntialiasingEnabledByDefault);
+  //  }
 
   m_isInitialized = true;
 }
@@ -84,8 +84,8 @@ bool SupportManager::IsVulkanForbidden()
   return forbidden;
 }
 
-bool SupportManager::IsVulkanForbidden(std::string const & deviceName, Version apiVersion,
-                                       Version driverVersion, bool isCustomROM, int sdkVersion)
+bool SupportManager::IsVulkanForbidden(std::string const & deviceName, Version apiVersion, Version driverVersion,
+                                       bool isCustomROM, int sdkVersion)
 {
   LOG(LINFO, ("Device =", deviceName, "API =", apiVersion, "Driver =", driverVersion, "SDK =", sdkVersion));
 
@@ -98,26 +98,26 @@ bool SupportManager::IsVulkanForbidden(std::string const & deviceName, Version a
   }
 
   static char const * kBannedDevices[] = {
-    /// @todo Should we ban all PowerVR Rogue devices?
-    // https://github.com/organicmaps/organicmaps/issues/1379
-    "PowerVR Rogue G6110", "PowerVR Rogue GE8100", "PowerVR Rogue GE8300",
-    // https://github.com/organicmaps/organicmaps/issues/5539
-    "Adreno (TM) 418",
+      /// @todo Should we ban all PowerVR Rogue devices?
+      // https://github.com/organicmaps/organicmaps/issues/1379
+      "PowerVR Rogue G6110",
+      "PowerVR Rogue GE8100",
+      "PowerVR Rogue GE8300",
+      // https://github.com/organicmaps/organicmaps/issues/5539
+      "Adreno (TM) 418",
   };
 
   for (auto const d : kBannedDevices)
-  {
     if (d == deviceName)
       return true;
-  }
 
   if (isCustomROM)
   {
     // Crash on LineageOS, stock Android works ok (with same api = 1.0.82; driver = 28.0.0).
     // https://github.com/organicmaps/organicmaps/issues/2739
     // https://github.com/organicmaps/organicmaps/issues/9255
-    // SM-G930F (S7, heroltexx, hero2ltexx). Crash on vkCreateSwapchainKHR and we don't even get to SupportManager::Init.
-    // SM-G920F (S6)
+    // SM-G930F (S7, heroltexx, hero2ltexx). Crash on vkCreateSwapchainKHR and we don't even get to
+    // SupportManager::Init. SM-G920F (S6)
     if (deviceName.starts_with("Mali-T"))
       return true;
   }
@@ -142,18 +142,14 @@ bool SupportManager::IsVulkanForbidden(std::string const & deviceName, Version a
   };
 
   for (auto const & c : kBannedConfigurations)
-  {
     if (c.m_deviceName == deviceName && c.m_apiVersion == apiVersion && c.m_driverVersion == driverVersion)
       return true;
-  }
   return false;
 }
 
 // Finally, the result of this function is used in GraphicsContext::HasPartialTextureUpdates.
-bool SupportManager::IsVulkanTexturePartialUpdateBuggy(int sdkVersion,
-                                                       std::string const & deviceName,
-                                                       Version apiVersion,
-                                                       Version driverVersion)
+bool SupportManager::IsVulkanTexturePartialUpdateBuggy(int sdkVersion, std::string const & deviceName,
+                                                       Version apiVersion, Version driverVersion)
 {
   /// @todo Assume that all Android 10+ (API 29) doesn't support Vulkan partial texture updates.
   /// Can't say for sure is it right or not ..
@@ -166,10 +162,8 @@ bool SupportManager::IsVulkanTexturePartialUpdateBuggy(int sdkVersion,
   };
 
   for (auto const & c : kBadConfigurations)
-  {
     if (c.m_deviceName == deviceName && c.m_apiVersion == apiVersion && c.m_driverVersion == driverVersion)
       return true;
-  }
   return false;
 }
 
diff --git a/libs/drape/support_manager.hpp b/libs/drape/support_manager.hpp
index d6f6f51a2..42c0e521b 100644
--- a/libs/drape/support_manager.hpp
+++ b/libs/drape/support_manager.hpp
@@ -38,8 +38,8 @@ public:
   static bool IsVulkanForbidden();
   static bool IsVulkanForbidden(std::string const & deviceName, Version apiVersion, Version driverVersion,
                                 bool isCustomROM, int sdkVersion);
-  static bool IsVulkanTexturePartialUpdateBuggy(int sdkVersion, std::string const & deviceName,
-                                                Version apiVersion, Version driverVersion);
+  static bool IsVulkanTexturePartialUpdateBuggy(int sdkVersion, std::string const & deviceName, Version apiVersion,
+                                                Version driverVersion);
 
 private:
   struct Configuration;
diff --git a/libs/drape/symbols_texture.cpp b/libs/drape/symbols_texture.cpp
index e78e48039..aa25912a1 100644
--- a/libs/drape/symbols_texture.cpp
+++ b/libs/drape/symbols_texture.cpp
@@ -4,8 +4,8 @@
 
 #include "platform/platform.hpp"
 
-#include "coding/reader.hpp"
 #include "coding/parse_xml.hpp"
+#include "coding/reader.hpp"
 
 #include "base/string_utils.hpp"
 
@@ -114,9 +114,8 @@ private:
   m2::RectF m_rect;
 };
 
-void LoadSymbols(std::string const & skinPathName, std::string const & textureName,
-                 bool convertToUV, TDefinitionInserter const & definitionInserter,
-                 TSymbolsLoadingCompletion const & completionHandler,
+void LoadSymbols(std::string const & skinPathName, std::string const & textureName, bool convertToUV,
+                 TDefinitionInserter const & definitionInserter, TSymbolsLoadingCompletion const & completionHandler,
                  TSymbolsLoadingFailure const & failureHandler)
 {
   ASSERT(definitionInserter != nullptr, ());
@@ -131,8 +130,7 @@ void LoadSymbols(std::string const & skinPathName, std::string const & textureNa
     DefinitionLoader loader(definitionInserter, convertToUV);
 
     {
-      ReaderPtr<Reader> reader =
-          GetStyleReader().GetResourceReader(textureName + ".sdf", skinPathName);
+      ReaderPtr<Reader> reader = GetStyleReader().GetResourceReader(textureName + ".sdf", skinPathName);
       ReaderSource<ReaderPtr<Reader>> source(reader);
       if (!ParseXML(source, loader))
       {
@@ -145,8 +143,7 @@ void LoadSymbols(std::string const & skinPathName, std::string const & textureNa
     }
 
     {
-      ReaderPtr<Reader> reader =
-          GetStyleReader().GetResourceReader(textureName + ".png", skinPathName);
+      ReaderPtr<Reader> reader = GetStyleReader().GetResourceReader(textureName + ".png", skinPathName);
       size_t const size = static_cast<size_t>(reader.Size());
       rawData.resize(size);
       reader.Read(0, &rawData[0], size);
@@ -159,28 +156,21 @@ void LoadSymbols(std::string const & skinPathName, std::string const & textureNa
   }
 
   int w, h, bpp;
-  unsigned char * data =
-      stbi_load_from_memory(&rawData[0], static_cast<int>(rawData.size()), &w, &h, &bpp, 0);
+  unsigned char * data = stbi_load_from_memory(&rawData[0], static_cast<int>(rawData.size()), &w, &h, &bpp, 0);
   ASSERT_EQUAL(bpp, 4, ("Incorrect symbols texture format"));
   ASSERT(glm::isPowerOfTwo(w), (w));
   ASSERT(glm::isPowerOfTwo(h), (h));
 
   if (width == static_cast<uint32_t>(w) && height == static_cast<uint32_t>(h))
-  {
     completionHandler(data, width, height);
-  }
   else
-  {
     failureHandler("Error symbols texture creation");
-  }
 
   stbi_image_free(data);
 }
 }  // namespace
 
-SymbolsTexture::SymbolKey::SymbolKey(std::string const & symbolName)
-  : m_symbolName(symbolName)
-{}
+SymbolsTexture::SymbolKey::SymbolKey(std::string const & symbolName) : m_symbolName(symbolName) {}
 
 Texture::ResourceType SymbolsTexture::SymbolKey::GetType() const
 {
@@ -192,9 +182,7 @@ std::string const & SymbolsTexture::SymbolKey::GetSymbolName() const
   return m_symbolName;
 }
 
-SymbolsTexture::SymbolInfo::SymbolInfo(const m2::RectF & texRect)
-  : ResourceInfo(texRect)
-{}
+SymbolsTexture::SymbolInfo::SymbolInfo(m2::RectF const & texRect) : ResourceInfo(texRect) {}
 
 Texture::ResourceType SymbolsTexture::SymbolInfo::GetType() const
 {
@@ -212,9 +200,7 @@ void SymbolsTexture::Load(ref_ptr<dp::GraphicsContext> context, std::string cons
                           ref_ptr<HWTextureAllocator> allocator)
 {
   auto definitionInserter = [this](std::string const & name, m2::RectF const & rect)
-  {
-    m_definition.insert(std::make_pair(name, SymbolsTexture::SymbolInfo(rect)));
-  };
+  { m_definition.insert(std::make_pair(name, SymbolsTexture::SymbolInfo(rect))); };
 
   auto completionHandler = [this, &allocator, context](unsigned char * data, uint32_t width, uint32_t height)
   {
@@ -233,8 +219,7 @@ void SymbolsTexture::Load(ref_ptr<dp::GraphicsContext> context, std::string cons
     Fail(context);
   };
 
-  LoadSymbols(skinPathName, m_name, true /* convertToUV */, definitionInserter,
-              completionHandler, failureHandler);
+  LoadSymbols(skinPathName, m_name, true /* convertToUV */, definitionInserter, completionHandler, failureHandler);
 }
 
 void SymbolsTexture::Invalidate(ref_ptr<dp::GraphicsContext> context, std::string const & skinPathName,
@@ -286,18 +271,15 @@ bool SymbolsTexture::IsSymbolContained(std::string const & symbolName) const
 }
 
 bool SymbolsTexture::DecodeToMemory(std::string const & skinPathName, std::string const & textureName,
-                                    std::vector<uint8_t> & symbolsSkin,
-                                    std::map<std::string, m2::RectU> & symbolsIndex,
+                                    std::vector<uint8_t> & symbolsSkin, std::map<std::string, m2::RectU> & symbolsIndex,
                                     uint32_t & skinWidth, uint32_t & skinHeight)
 {
   auto definitionInserter = [&symbolsIndex](std::string const & name, m2::RectF const & rect)
-  {
-    symbolsIndex.insert(make_pair(name, m2::RectU(rect)));
-  };
+  { symbolsIndex.insert(make_pair(name, m2::RectU(rect))); };
 
   bool result = true;
-  auto completionHandler = [&result, &symbolsSkin, &skinWidth, &skinHeight](unsigned char * data,
-      uint32_t width, uint32_t height)
+  auto completionHandler =
+      [&result, &symbolsSkin, &skinWidth, &skinHeight](unsigned char * data, uint32_t width, uint32_t height)
   {
     size_t size = 4 * width * height;
     symbolsSkin.resize(size);
@@ -313,8 +295,8 @@ bool SymbolsTexture::DecodeToMemory(std::string const & skinPathName, std::strin
     result = false;
   };
 
-  LoadSymbols(skinPathName, textureName, false /* convertToUV */,
-              definitionInserter, completionHandler, failureHandler);
+  LoadSymbols(skinPathName, textureName, false /* convertToUV */, definitionInserter, completionHandler,
+              failureHandler);
   return result;
 }
 }  // namespace dp
diff --git a/libs/drape/symbols_texture.hpp b/libs/drape/symbols_texture.hpp
index 3a23985e8..7bf9139d7 100644
--- a/libs/drape/symbols_texture.hpp
+++ b/libs/drape/symbols_texture.hpp
@@ -37,15 +37,14 @@ public:
   void Invalidate(ref_ptr<dp::GraphicsContext> context, std::string const & skinPathName,
                   ref_ptr<HWTextureAllocator> allocator);
   void Invalidate(ref_ptr<dp::GraphicsContext> context, std::string const & skinPathName,
-                  ref_ptr<HWTextureAllocator> allocator,
-                  std::vector<drape_ptr<HWTexture>> & internalTextures);
+                  ref_ptr<HWTextureAllocator> allocator, std::vector<drape_ptr<HWTexture>> & internalTextures);
 
   bool IsSymbolContained(std::string const & symbolName) const;
 
   static bool DecodeToMemory(std::string const & skinPathName, std::string const & textureName,
-                             std::vector<uint8_t> & symbolsSkin,
-                             std::map<std::string, m2::RectU> & symbolsIndex,
+                             std::vector<uint8_t> & symbolsSkin, std::map<std::string, m2::RectU> & symbolsIndex,
                              uint32_t & skinWidth, uint32_t & skinHeight);
+
 private:
   void Fail(ref_ptr<dp::GraphicsContext> context);
   void Load(ref_ptr<dp::GraphicsContext> context, std::string const & skinPathName,
diff --git a/libs/drape/texture.cpp b/libs/drape/texture.cpp
index c5e1618b6..49b1603ab 100644
--- a/libs/drape/texture.cpp
+++ b/libs/drape/texture.cpp
@@ -6,7 +6,10 @@ namespace dp
 {
 Texture::ResourceInfo::ResourceInfo(m2::RectF const & texRect) : m_texRect(texRect) {}
 
-m2::RectF const & Texture::ResourceInfo::GetTexRect() const { return m_texRect; }
+m2::RectF const & Texture::ResourceInfo::GetTexRect() const
+{
+  return m_texRect;
+}
 
 void Texture::Create(ref_ptr<dp::GraphicsContext> context, Params const & params)
 {
@@ -20,8 +23,8 @@ void Texture::Create(ref_ptr<dp::GraphicsContext> context, Params const & params
     m_hwTexture->Create(context, params, data);
 }
 
-void Texture::UploadData(ref_ptr<dp::GraphicsContext> context, uint32_t x, uint32_t y,
-                         uint32_t width, uint32_t height, ref_ptr<void> data)
+void Texture::UploadData(ref_ptr<dp::GraphicsContext> context, uint32_t x, uint32_t y, uint32_t width, uint32_t height,
+                         ref_ptr<void> data)
 {
   ASSERT(m_hwTexture != nullptr, ());
   m_hwTexture->UploadData(context, x, y, width, height, data);
@@ -81,10 +84,12 @@ bool Texture::IsPowerOfTwo(uint32_t width, uint32_t height)
   return glm::isPowerOfTwo(static_cast<int>(width)) && glm::isPowerOfTwo(static_cast<int>(height));
 }
 
-void Texture::Destroy() { m_hwTexture.reset(); }
+void Texture::Destroy()
+{
+  m_hwTexture.reset();
+}
 
-bool Texture::AllocateTexture(ref_ptr<dp::GraphicsContext> context,
-                              ref_ptr<HWTextureAllocator> allocator)
+bool Texture::AllocateTexture(ref_ptr<dp::GraphicsContext> context, ref_ptr<HWTextureAllocator> allocator)
 {
   if (allocator != nullptr)
   {
diff --git a/libs/drape/texture.hpp b/libs/drape/texture.hpp
index 094c3513a..8becf4850 100644
--- a/libs/drape/texture.hpp
+++ b/libs/drape/texture.hpp
@@ -65,10 +65,9 @@ public:
   virtual void SetFilter(TextureFilter filter);
 
   virtual void Create(ref_ptr<dp::GraphicsContext> context, Params const & params);
-  virtual void Create(ref_ptr<dp::GraphicsContext> context, Params const & params,
-                      ref_ptr<void> data);
-  void UploadData(ref_ptr<dp::GraphicsContext> context, uint32_t x, uint32_t y,
-                  uint32_t width, uint32_t height, ref_ptr<void> data);
+  virtual void Create(ref_ptr<dp::GraphicsContext> context, Params const & params, ref_ptr<void> data);
+  void UploadData(ref_ptr<dp::GraphicsContext> context, uint32_t x, uint32_t y, uint32_t width, uint32_t height,
+                  ref_ptr<void> data);
 
   ref_ptr<HWTexture> GetHardwareTexture() const;
 
@@ -76,8 +75,7 @@ public:
 
 protected:
   void Destroy();
-  bool AllocateTexture(ref_ptr<dp::GraphicsContext> context,
-                       ref_ptr<HWTextureAllocator> allocator);
+  bool AllocateTexture(ref_ptr<dp::GraphicsContext> context, ref_ptr<HWTextureAllocator> allocator);
 
   drape_ptr<HWTexture> m_hwTexture;
 
diff --git a/libs/drape/texture_manager.cpp b/libs/drape/texture_manager.cpp
index 03e472a29..9ceec7437 100644
--- a/libs/drape/texture_manager.cpp
+++ b/libs/drape/texture_manager.cpp
@@ -3,10 +3,10 @@
 #include "drape/font_constants.hpp"
 #include "drape/font_texture.hpp"
 #include "drape/gl_functions.hpp"
-#include "drape/symbols_texture.hpp"
 #include "drape/static_texture.hpp"
 #include "drape/stipple_pen_resource.hpp"
 #include "drape/support_manager.hpp"
+#include "drape/symbols_texture.hpp"
 #include "drape/texture_of_colors.hpp"
 #include "drape/tm_read_resources.hpp"
 
@@ -38,7 +38,7 @@ size_t constexpr kReservedColors = 384;
 float constexpr kGlyphAreaMultiplier = 1.2f;
 float constexpr kGlyphAreaCoverage = 0.9f;
 
-std::string const kSymbolTextures[] = { "symbols" };
+std::string const kSymbolTextures[] = {"symbols"};
 uint32_t constexpr kDefaultSymbolsIndex = 0;
 
 template <typename ToDo>
@@ -58,7 +58,7 @@ m2::PointU StipplePenTextureSize(size_t patternsCount, uint32_t maxTextureSize)
 {
   uint32_t const sz = math::NextPowOf2(static_cast<uint32_t>(patternsCount) + kReservedPatterns);
   // No problem if assert will fire here. Just pen texture will be 2x bigger :)
-  //ASSERT_LESS_OR_EQUAL(sz, kMinStippleTextureHeight, (patternsCount));
+  // ASSERT_LESS_OR_EQUAL(sz, kMinStippleTextureHeight, (patternsCount));
   uint32_t const stippleTextureHeight = std::min(maxTextureSize, std::max(sz, kMinStippleTextureHeight));
 
   return m2::PointU(kStippleTextureWidth, stippleTextureHeight);
@@ -78,34 +78,26 @@ m2::PointU ColorTextureSize(size_t colorsCount, uint32_t maxTextureSize)
 }
 
 drape_ptr<Texture> CreateArrowTexture(ref_ptr<dp::GraphicsContext> context,
-                                      ref_ptr<HWTextureAllocator> textureAllocator,
-                                      std::string const & texturePath,
+                                      ref_ptr<HWTextureAllocator> textureAllocator, std::string const & texturePath,
                                       bool useDefaultResourceFolder)
 {
   if (!texturePath.empty())
   {
-    return make_unique_dp<StaticTexture>(
-        context, texturePath,
-        useDefaultResourceFolder ? StaticTexture::kDefaultResource : std::string(),
-        dp::TextureFormat::RGBA8, textureAllocator, true /* allowOptional */);
+    return make_unique_dp<StaticTexture>(context, texturePath,
+                                         useDefaultResourceFolder ? StaticTexture::kDefaultResource : std::string(),
+                                         dp::TextureFormat::RGBA8, textureAllocator, true /* allowOptional */);
   }
-  return make_unique_dp<StaticTexture>(context, "arrow-texture.png",
-                                       StaticTexture::kDefaultResource, dp::TextureFormat::RGBA8,
-                                       textureAllocator, true /* allowOptional */);
+  return make_unique_dp<StaticTexture>(context, "arrow-texture.png", StaticTexture::kDefaultResource,
+                                       dp::TextureFormat::RGBA8, textureAllocator, true /* allowOptional */);
 }
 }  // namespace
 
-TextureManager::TextureManager()
-  : m_maxTextureSize(0)
-  , m_maxGlypsCount(0)
+TextureManager::TextureManager() : m_maxTextureSize(0), m_maxGlypsCount(0)
 {
   m_nothingToUpload.test_and_set();
 }
 
-TextureManager::BaseRegion::BaseRegion()
-  : m_info(nullptr)
-  , m_texture(nullptr)
-{}
+TextureManager::BaseRegion::BaseRegion() : m_info(nullptr), m_texture(nullptr) {}
 
 bool TextureManager::BaseRegion::IsValid() const
 {
@@ -128,8 +120,7 @@ m2::PointF TextureManager::BaseRegion::GetPixelSize() const
     return m2::PointF(0.0f, 0.0f);
 
   m2::RectF const & texRect = m_info->GetTexRect();
-  return m2::PointF(texRect.SizeX() * m_texture->GetWidth(),
-                    texRect.SizeY() * m_texture->GetHeight());
+  return m2::PointF(texRect.SizeX() * m_texture->GetWidth(), texRect.SizeY() * m_texture->GetHeight());
 }
 
 float TextureManager::BaseRegion::GetPixelHeight() const
@@ -242,15 +233,14 @@ void TextureManager::GetRegionBase(ref_ptr<Texture> tex, BaseRegion & region, Te
     m_nothingToUpload.clear();
 }
 
-uint32_t TextureManager::GetNumberOfGlyphsNotInGroup(std::vector<text::GlyphMetrics> const & glyphs, GlyphGroup const & group)
+uint32_t TextureManager::GetNumberOfGlyphsNotInGroup(std::vector<text::GlyphMetrics> const & glyphs,
+                                                     GlyphGroup const & group)
 {
   uint32_t count = 0;
   auto const end = group.m_glyphKeys.end();
   for (auto const & glyph : glyphs)
-  {
     if (group.m_glyphKeys.find(glyph.m_key) == end)
       ++count;
-  }
 
   return count;
 }
@@ -280,10 +270,8 @@ size_t TextureManager::FindHybridGlyphsGroup(std::vector<text::GlyphMetrics> con
 
   // Looking for a texture which can fit all glyphs.
   for (size_t i = 0; i < m_glyphGroups.size() - 1; i++)
-  {
     if (GetNumberOfGlyphsNotInGroup(glyphs, m_glyphGroups[i]) == 0)
       return i;
-  }
 
   // Check if we can fit all glyphs in the last hybrid texture.
   uint32_t const unfoundChars = GetNumberOfGlyphsNotInGroup(glyphs, group);
@@ -309,28 +297,23 @@ void TextureManager::Init(ref_ptr<dp::GraphicsContext> context, Params const & p
   // Initialize symbols.
   for (auto const & texName : kSymbolTextures)
   {
-    m_symbolTextures.push_back(make_unique_dp<SymbolsTexture>(context, m_resPostfix, texName,
-                                                              make_ref(m_textureAllocator)));
+    m_symbolTextures.push_back(
+        make_unique_dp<SymbolsTexture>(context, m_resPostfix, texName, make_ref(m_textureAllocator)));
   }
 
   // Initialize static textures.
-  m_trafficArrowTexture =
-      make_unique_dp<StaticTexture>(context, "traffic-arrow.png", m_resPostfix,
-                                    dp::TextureFormat::RGBA8, make_ref(m_textureAllocator));
-  m_hatchingTexture =
-      make_unique_dp<StaticTexture>(context, "area-hatching.png", m_resPostfix,
-                                    dp::TextureFormat::RGBA8, make_ref(m_textureAllocator));
-  m_arrowTexture =
-      CreateArrowTexture(context, make_ref(m_textureAllocator), params.m_arrowTexturePath,
-                         params.m_arrowTextureUseDefaultResourceFolder);
+  m_trafficArrowTexture = make_unique_dp<StaticTexture>(context, "traffic-arrow.png", m_resPostfix,
+                                                        dp::TextureFormat::RGBA8, make_ref(m_textureAllocator));
+  m_hatchingTexture = make_unique_dp<StaticTexture>(context, "area-hatching.png", m_resPostfix,
+                                                    dp::TextureFormat::RGBA8, make_ref(m_textureAllocator));
+  m_arrowTexture = CreateArrowTexture(context, make_ref(m_textureAllocator), params.m_arrowTexturePath,
+                                      params.m_arrowTextureUseDefaultResourceFolder);
 
   // SMAA.
-  m_smaaAreaTexture =
-      make_unique_dp<StaticTexture>(context, "smaa-area.png", StaticTexture::kDefaultResource,
-                                    dp::TextureFormat::RedGreen, make_ref(m_textureAllocator));
-  m_smaaSearchTexture =
-      make_unique_dp<StaticTexture>(context, "smaa-search.png", StaticTexture::kDefaultResource,
-                                    dp::TextureFormat::Red, make_ref(m_textureAllocator));
+  m_smaaAreaTexture = make_unique_dp<StaticTexture>(context, "smaa-area.png", StaticTexture::kDefaultResource,
+                                                    dp::TextureFormat::RedGreen, make_ref(m_textureAllocator));
+  m_smaaSearchTexture = make_unique_dp<StaticTexture>(context, "smaa-search.png", StaticTexture::kDefaultResource,
+                                                      dp::TextureFormat::Red, make_ref(m_textureAllocator));
 
   // Initialize patterns (reserved ./data/patterns.txt lines count).
   std::set<PenPatternT> patterns;
@@ -369,15 +352,13 @@ void TextureManager::Init(ref_ptr<dp::GraphicsContext> context, Params const & p
   // Initialize colors (reserved ./data/colors.txt lines count).
   std::vector<dp::Color> colors;
   colors.reserve(1024);
-  ParseColorsList(params.m_colors, [&colors](dp::Color const & color)
-  {
-    colors.push_back(color);
-  });
+  ParseColorsList(params.m_colors, [&colors](dp::Color const & color) { colors.push_back(color); });
 
-  m_colorTexture = make_unique_dp<ColorTexture>(ColorTextureSize(colors.size(), m_maxTextureSize),
-                                                make_ref(m_textureAllocator));
+  m_colorTexture =
+      make_unique_dp<ColorTexture>(ColorTextureSize(colors.size(), m_maxTextureSize), make_ref(m_textureAllocator));
 
-  LOG(LINFO, ("Colors count =", colors.size(), "texture size =", m_colorTexture->GetWidth(), m_colorTexture->GetHeight()));
+  LOG(LINFO,
+      ("Colors count =", colors.size(), "texture size =", m_colorTexture->GetWidth(), m_colorTexture->GetHeight()));
 
   ref_ptr<ColorTexture> colorTex = make_ref(m_colorTexture);
   for (auto const & c : colors)
@@ -406,7 +387,7 @@ void TextureManager::OnSwitchMapStyle(ref_ptr<dp::GraphicsContext> context)
   // Here we need invalidate only textures which can be changed in map style switch.
   // Now we update only symbol textures, if we need update other textures they must be added here.
   // For Vulkan we use m_texturesToCleanup to defer textures destroying.
-  for (const auto & m_symbolTexture : m_symbolTextures)
+  for (auto const & m_symbolTexture : m_symbolTextures)
   {
     ref_ptr<SymbolsTexture> symbolsTexture = make_ref(m_symbolTexture);
     ASSERT(symbolsTexture != nullptr, ());
@@ -418,14 +399,12 @@ void TextureManager::OnSwitchMapStyle(ref_ptr<dp::GraphicsContext> context)
   }
 }
 
-void TextureManager::InvalidateArrowTexture(
-    ref_ptr<dp::GraphicsContext> context,
-    std::string const & texturePath /* = {} */,
-    bool useDefaultResourceFolder /* = false */)
+void TextureManager::InvalidateArrowTexture(ref_ptr<dp::GraphicsContext> context,
+                                            std::string const & texturePath /* = {} */,
+                                            bool useDefaultResourceFolder /* = false */)
 {
   CHECK(m_isInitialized, ());
-  m_newArrowTexture = CreateArrowTexture(context, make_ref(m_textureAllocator), texturePath,
-                                         useDefaultResourceFolder);
+  m_newArrowTexture = CreateArrowTexture(context, make_ref(m_textureAllocator), texturePath, useDefaultResourceFolder);
 }
 
 void TextureManager::ApplyInvalidatedStaticTextures()
@@ -538,7 +517,8 @@ text::TextMetrics TextureManager::ShapeSingleTextLine(float fontPixelHeight, std
 }
 
 TextureManager::TShapedTextLines TextureManager::ShapeMultilineText(float fontPixelHeight, std::string_view utf8,
-    char const * delimiters, TMultilineGlyphsBuffer & multilineGlyphRegions)
+                                                                    char const * delimiters,
+                                                                    TMultilineGlyphsBuffer & multilineGlyphRegions)
 {
   TShapedTextLines textLines;
   strings::Tokenize(utf8, delimiters, [&](std::string_view line)
diff --git a/libs/drape/texture_manager.hpp b/libs/drape/texture_manager.hpp
index ff4e50758..db814abef 100644
--- a/libs/drape/texture_manager.hpp
+++ b/libs/drape/texture_manager.hpp
@@ -3,7 +3,7 @@
 #include "drape/color.hpp"
 #include "drape/glyph_manager.hpp"
 #include "drape/pointers.hpp"
-#include "drape/stipple_pen_resource.hpp"   // for PenPatternT
+#include "drape/stipple_pen_resource.hpp"  // for PenPatternT
 #include "drape/texture.hpp"
 
 #include "base/string_utils.hpp"
@@ -46,14 +46,14 @@ public:
   public:
     uint32_t GetTextureIndex() const { return m_textureIndex; }
     void SetTextureIndex(uint32_t index) { m_textureIndex = index; }
+
   private:
     uint32_t m_textureIndex = 0;
   };
 
   // TODO(AB): Remove?
   class GlyphRegion : public BaseRegion
-  {
-  };
+  {};
 
   class StippleRegion : public BaseRegion
   {
@@ -62,8 +62,7 @@ public:
   };
 
   class ColorRegion : public BaseRegion
-  {
-  };
+  {};
 
   struct Params
   {
@@ -72,7 +71,7 @@ public:
     std::string m_colors;
     std::string m_patterns;
     GlyphManager::Params m_glyphMngParams;
-    std::string m_arrowTexturePath; // maybe empty if no custom texture
+    std::string m_arrowTexturePath;  // maybe empty if no custom texture
     bool m_arrowTextureUseDefaultResourceFolder = false;
   };
 
@@ -117,8 +116,7 @@ public:
   ref_ptr<Texture> GetSMAAAreaTexture() const;
   ref_ptr<Texture> GetSMAASearchTexture() const;
 
-  void InvalidateArrowTexture(ref_ptr<dp::GraphicsContext> context,
-                              std::string const & texturePath = {},
+  void InvalidateArrowTexture(ref_ptr<dp::GraphicsContext> context, std::string const & texturePath = {},
                               bool useDefaultResourceFolder = false);
   // Apply must be called on FrontendRenderer.
   void ApplyInvalidatedStaticTextures();
@@ -129,7 +127,7 @@ private:
   struct GlyphGroup
   {
     std::set<GlyphFontAndId> m_glyphKeys;
-    ref_ptr<Texture> m_texture {nullptr};
+    ref_ptr<Texture> m_texture{nullptr};
   };
 
   uint32_t m_maxTextureSize;
@@ -142,7 +140,7 @@ private:
 
   static uint32_t GetNumberOfGlyphsNotInGroup(std::vector<text::GlyphMetrics> const & glyphs, GlyphGroup const & group);
 
-  template<typename TGlyphGroup>
+  template <typename TGlyphGroup>
   void FillResultBuffer(strings::UniString const & text, TGlyphGroup & group, TGlyphsBuffer & regions)
   {
     if (group.m_texture == nullptr)
@@ -151,25 +149,25 @@ private:
     GetGlyphsRegions(group.m_texture, text, regions);
   }
 
-  template<typename TGlyphGroup>
+  template <typename TGlyphGroup>
   void FillResults(strings::UniString const & text, TGlyphsBuffer & buffers, TGlyphGroup & group)
   {
     FillResultBuffer<TGlyphGroup>(text, group, buffers);
   }
 
-  template<typename TGlyphGroup>
+  template <typename TGlyphGroup>
   void FillResults(TMultilineText const & text, TMultilineGlyphsBuffer & buffers, TGlyphGroup & group)
   {
-     buffers.resize(text.size());
-     for (size_t i = 0; i < text.size(); ++i)
-     {
-       strings::UniString const & str = text[i];
-       TGlyphsBuffer & buffer = buffers[i];
-       FillResults<TGlyphGroup>(str, buffer, group);
-     }
+    buffers.resize(text.size());
+    for (size_t i = 0; i < text.size(); ++i)
+    {
+      strings::UniString const & str = text[i];
+      TGlyphsBuffer & buffer = buffers[i];
+      FillResults<TGlyphGroup>(str, buffer, group);
+    }
   }
 
-  template<typename TText, typename TBuffer>
+  template <typename TText, typename TBuffer>
   void CalcGlyphRegions(TText const & text, TBuffer & buffers)
   {
     CHECK(m_isInitialized, ());
@@ -208,7 +206,7 @@ private:
   std::vector<drape_ptr<HWTexture>> m_texturesToCleanup;
 
   base::Timer m_uploadTimer;
-  std::atomic_flag m_nothingToUpload {false};
+  std::atomic_flag m_nothingToUpload{false};
   std::mutex m_calcGlyphsMutex;
 
   // TODO(AB): Make a more robust use of BreakIterator to split strings and get rid of this space glyph.
diff --git a/libs/drape/texture_of_colors.cpp b/libs/drape/texture_of_colors.cpp
index 047ed1a5e..f1d75cb12 100644
--- a/libs/drape/texture_of_colors.cpp
+++ b/libs/drape/texture_of_colors.cpp
@@ -10,14 +10,11 @@ namespace dp
 
 namespace
 {
-  int const kResourceSize = 2;
-  int const kBytesPerPixel = 4;
-}
+int const kResourceSize = 2;
+int const kBytesPerPixel = 4;
+}  // namespace
 
-ColorPalette::ColorPalette(m2::PointU const & canvasSize)
-   : m_textureSize(canvasSize)
-   , m_cursor(m2::PointU::Zero())
-{}
+ColorPalette::ColorPalette(m2::PointU const & canvasSize) : m_textureSize(canvasSize), m_cursor(m2::PointU::Zero()) {}
 
 ref_ptr<Texture::ResourceInfo> ColorPalette::ReserveResource(bool predefined, ColorKey const & key, bool & newResource)
 {
@@ -28,8 +25,7 @@ ref_ptr<Texture::ResourceInfo> ColorPalette::ReserveResource(bool predefined, Co
   {
     PendingColor pendingColor;
     pendingColor.m_color = key.m_color;
-    pendingColor.m_rect = m2::RectU(m_cursor.x, m_cursor.y,
-                                    m_cursor.x + kResourceSize, m_cursor.y + kResourceSize);
+    pendingColor.m_rect = m2::RectU(m_cursor.x, m_cursor.y, m_cursor.x + kResourceSize, m_cursor.y + kResourceSize);
     {
       std::lock_guard<std::mutex> g(m_lock);
       m_pendingNodes.push_back(pendingColor);
@@ -131,8 +127,7 @@ void ColorPalette::UploadResources(ref_ptr<dp::GraphicsContext> context, ref_ptr
     m2::RectU const & endRect = pendingNodes[endRange - 1].m_rect;
 
     m2::RectU uploadRect;
-    if (startRect.minY() == endRect.minY() &&
-        startRect.maxY() == endRect.maxY())
+    if (startRect.minY() == endRect.minY() && startRect.maxY() == endRect.maxY())
     {
       uploadRect = m2::RectU(startRect.minX(), startRect.minY(), endRect.maxX(), endRect.maxY());
     }
@@ -184,8 +179,8 @@ void ColorPalette::UploadResources(ref_ptr<dp::GraphicsContext> context, ref_ptr
     }
 
     pointer = SharedBufferManager::GetRawPointer(buffer);
-    texture->UploadData(context, uploadRect.minX(), uploadRect.minY(),
-                        uploadRect.SizeX(), uploadRect.SizeY(), make_ref(pointer));
+    texture->UploadData(context, uploadRect.minX(), uploadRect.minY(), uploadRect.SizeX(), uploadRect.SizeY(),
+                        make_ref(pointer));
   }
 }
 
@@ -200,4 +195,4 @@ int ColorTexture::GetColorSizeInPixels()
   return kResourceSize;
 }
 
-} // namespace dp
+}  // namespace dp
diff --git a/libs/drape/texture_of_colors.hpp b/libs/drape/texture_of_colors.hpp
index fe13d4677..5af520242 100644
--- a/libs/drape/texture_of_colors.hpp
+++ b/libs/drape/texture_of_colors.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "drape/texture.hpp"
 #include "drape/color.hpp"
 #include "drape/dynamic_texture.hpp"
+#include "drape/texture.hpp"
 
 #include "base/buffer_vector.hpp"
 
@@ -23,7 +23,7 @@ public:
 class ColorResourceInfo : public Texture::ResourceInfo
 {
 public:
-  explicit ColorResourceInfo(m2::RectF const & texRect) : Texture::ResourceInfo(texRect) { }
+  explicit ColorResourceInfo(m2::RectF const & texRect) : Texture::ResourceInfo(texRect) {}
   virtual Texture::ResourceType GetType() const { return Texture::ResourceType::Color; }
 };
 
@@ -62,9 +62,9 @@ private:
 class ColorTexture : public DynamicTexture<ColorPalette, ColorKey, Texture::ResourceType::Color>
 {
   using TBase = DynamicTexture<ColorPalette, ColorKey, Texture::ResourceType::Color>;
+
 public:
-  ColorTexture(m2::PointU const & size, ref_ptr<HWTextureAllocator> allocator)
-    : m_palette(size)
+  ColorTexture(m2::PointU const & size, ref_ptr<HWTextureAllocator> allocator) : m_palette(size)
   {
     TBase::DynamicTextureParams params{size, TextureFormat::RGBA8, TextureFilter::Nearest,
                                        false /* m_usePixelBuffer */};
diff --git a/libs/drape/tm_read_resources.hpp b/libs/drape/tm_read_resources.hpp
index dac05b14f..1de991674 100644
--- a/libs/drape/tm_read_resources.hpp
+++ b/libs/drape/tm_read_resources.hpp
@@ -44,4 +44,4 @@ inline void ParsePatternsList(std::string const & patternsFile, ToDo && toDo)
   }
 }
 
-} // namespace dp::impl
+}  // namespace dp::impl
diff --git a/libs/drape/uniform_value.cpp b/libs/drape/uniform_value.cpp
index 5f35aeb0d..60ace1729 100644
--- a/libs/drape/uniform_value.cpp
+++ b/libs/drape/uniform_value.cpp
@@ -9,20 +9,11 @@ void ApplyInt(int8_t location, int32_t const * pointer, size_t componentCount)
 {
   switch (componentCount)
   {
-  case 1:
-    GLFunctions::glUniformValuei(location, pointer[0]);
-    break;
-  case 2:
-    GLFunctions::glUniformValuei(location, pointer[0], pointer[1]);
-    break;
-  case 3:
-    GLFunctions::glUniformValuei(location, pointer[0], pointer[1], pointer[2]);
-    break;
-  case 4:
-    GLFunctions::glUniformValuei(location, pointer[0], pointer[1], pointer[2], pointer[3]);
-    break;
-  default:
-    ASSERT(false, ());
+  case 1: GLFunctions::glUniformValuei(location, pointer[0]); break;
+  case 2: GLFunctions::glUniformValuei(location, pointer[0], pointer[1]); break;
+  case 3: GLFunctions::glUniformValuei(location, pointer[0], pointer[1], pointer[2]); break;
+  case 4: GLFunctions::glUniformValuei(location, pointer[0], pointer[1], pointer[2], pointer[3]); break;
+  default: ASSERT(false, ());
   }
 }
 
@@ -30,20 +21,11 @@ void ApplyFloat(int8_t location, float const * pointer, size_t componentCount)
 {
   switch (componentCount)
   {
-  case 1:
-    GLFunctions::glUniformValuef(location, pointer[0]);
-    break;
-  case 2:
-    GLFunctions::glUniformValuef(location, pointer[0], pointer[1]);
-    break;
-  case 3:
-    GLFunctions::glUniformValuef(location, pointer[0], pointer[1], pointer[2]);
-    break;
-  case 4:
-    GLFunctions::glUniformValuef(location, pointer[0], pointer[1], pointer[2], pointer[3]);
-    break;
-  default:
-    ASSERT(false, ());
+  case 1: GLFunctions::glUniformValuef(location, pointer[0]); break;
+  case 2: GLFunctions::glUniformValuef(location, pointer[0], pointer[1]); break;
+  case 3: GLFunctions::glUniformValuef(location, pointer[0], pointer[1], pointer[2]); break;
+  case 4: GLFunctions::glUniformValuef(location, pointer[0], pointer[1], pointer[2], pointer[3]); break;
+  default: ASSERT(false, ());
   }
 }
 
diff --git a/libs/drape/utils/glyph_usage_tracker.cpp b/libs/drape/utils/glyph_usage_tracker.cpp
index fd1bffbc7..752012d17 100644
--- a/libs/drape/utils/glyph_usage_tracker.cpp
+++ b/libs/drape/utils/glyph_usage_tracker.cpp
@@ -23,8 +23,8 @@ std::string GlyphUsageTracker::GlyphUsageStatistic::ToString() const
   ss << " Unexpected glyphs: {\n";
   for (auto const & it : m_unexpectedGlyphs)
   {
-    ss << "   glyph = " << std::hex << static_cast<uint32_t>(it.first) << std::dec << ", unique usages = " << it.second.m_counter
-       << ", group = " << it.second.m_group << ", expected groups = { ";
+    ss << "   glyph = " << std::hex << static_cast<uint32_t>(it.first) << std::dec
+       << ", unique usages = " << it.second.m_counter << ", group = " << it.second.m_group << ", expected groups = { ";
 
     for (auto const & gr : it.second.m_expectedGroups)
       ss << gr << " ";
diff --git a/libs/drape/utils/glyph_usage_tracker.hpp b/libs/drape/utils/glyph_usage_tracker.hpp
index a43f4c19e..bf7e25c5f 100644
--- a/libs/drape/utils/glyph_usage_tracker.hpp
+++ b/libs/drape/utils/glyph_usage_tracker.hpp
@@ -36,8 +36,8 @@ public:
   static GlyphUsageTracker & Instance();
 
   void AddInvalidGlyph(strings::UniString const & str, strings::UniChar const & c);
-  void AddUnexpectedGlyph(strings::UniString const & str, strings::UniChar const & c,
-                          size_t const group, size_t const expectedGroup);
+  void AddUnexpectedGlyph(strings::UniString const & str, strings::UniChar const & c, size_t const group,
+                          size_t const expectedGroup);
 
   GlyphUsageStatistic Report();
 
diff --git a/libs/drape/utils/profiler.hpp b/libs/drape/utils/profiler.hpp
index 57604ebe2..8bf7b6d48 100644
--- a/libs/drape/utils/profiler.hpp
+++ b/libs/drape/utils/profiler.hpp
@@ -6,9 +6,9 @@
 #include <array>
 #include <chrono>
 #include <cstdint>
+#include <map>
 #include <sstream>
 #include <string>
-#include <map>
 
 namespace dp
 {
@@ -66,11 +66,7 @@ protected:
 class ProfilerGuard
 {
 public:
-  ProfilerGuard(std::string const & name)
-    : m_name(name)
-  {
-    m_start = std::chrono::steady_clock::now();
-  }
+  ProfilerGuard(std::string const & name) : m_name(name) { m_start = std::chrono::steady_clock::now(); }
 
   ~ProfilerGuard()
   {
@@ -80,10 +76,7 @@ public:
       Profiler::Instance().Measure(m_name, ms);
   }
 
-  void Skip()
-  {
-    m_skipped = true;
-  }
+  void Skip() { m_skipped = true; }
 
 private:
   std::string m_name;
diff --git a/libs/drape/utils/projection.cpp b/libs/drape/utils/projection.cpp
index 497e61176..1899d7bc9 100644
--- a/libs/drape/utils/projection.cpp
+++ b/libs/drape/utils/projection.cpp
@@ -2,8 +2,7 @@
 
 namespace dp
 {
-std::array<float, 16> MakeProjection(dp::ApiVersion apiVersion, float left, float right,
-                                     float bottom, float top)
+std::array<float, 16> MakeProjection(dp::ApiVersion apiVersion, float left, float right, float bottom, float top)
 {
   std::array<float, 16> result = {};
 
diff --git a/libs/drape/utils/projection.hpp b/libs/drape/utils/projection.hpp
index ce6609b5c..061bd8c3b 100644
--- a/libs/drape/utils/projection.hpp
+++ b/libs/drape/utils/projection.hpp
@@ -15,6 +15,5 @@ float constexpr kMaxDepth = 25000.0f;
 static_assert(kMinDepth <= drule::kMinLayeredDepthBg && drule::kMaxLayeredDepthFg <= kMaxDepth);
 static_assert(kMinDepth <= -drule::kOverlaysMaxPriority && drule::kOverlaysMaxPriority <= kMaxDepth);
 
-std::array<float, 16> MakeProjection(dp::ApiVersion apiVersion, float left, float right,
-                                     float bottom, float top);
+std::array<float, 16> MakeProjection(dp::ApiVersion apiVersion, float left, float right, float bottom, float top);
 }  // namespace dp
diff --git a/libs/drape/utils/vertex_decl.cpp b/libs/drape/utils/vertex_decl.cpp
index e74f72b91..fcffbd083 100644
--- a/libs/drape/utils/vertex_decl.cpp
+++ b/libs/drape/utils/vertex_decl.cpp
@@ -32,8 +32,7 @@ typedef dp::BindingInfo (*TInitFunction)();
 
 dp::BindingInfo AreaBindingInit()
 {
-  static_assert(sizeof(AreaVertex) == (sizeof(AreaVertex::TPosition) +
-                                       sizeof(AreaVertex::TTexCoord)), "");
+  static_assert(sizeof(AreaVertex) == (sizeof(AreaVertex::TPosition) + sizeof(AreaVertex::TTexCoord)), "");
 
   dp::BindingFiller<AreaVertex> filler(2);
   filler.FillDecl<AreaVertex::TPosition>("a_position");
@@ -44,9 +43,9 @@ dp::BindingInfo AreaBindingInit()
 
 dp::BindingInfo Area3dBindingInit()
 {
-  static_assert(sizeof(Area3dVertex) == (sizeof(Area3dVertex::TPosition) +
-                                         sizeof(Area3dVertex::TNormal3d) +
-                                         sizeof(Area3dVertex::TTexCoord)), "");
+  static_assert(sizeof(Area3dVertex) == (sizeof(Area3dVertex::TPosition) + sizeof(Area3dVertex::TNormal3d) +
+                                         sizeof(Area3dVertex::TTexCoord)),
+                "");
 
   dp::BindingFiller<Area3dVertex> filler(3);
   filler.FillDecl<Area3dVertex::TPosition>("a_position");
@@ -58,9 +57,10 @@ dp::BindingInfo Area3dBindingInit()
 
 dp::BindingInfo HatchingAreaBindingInit()
 {
-  static_assert(sizeof(HatchingAreaVertex) == (sizeof(HatchingAreaVertex::TPosition) +
-                                               sizeof(HatchingAreaVertex::TTexCoord) +
-                                               sizeof(HatchingAreaVertex::TMaskTexCoord)), "");
+  static_assert(
+      sizeof(HatchingAreaVertex) == (sizeof(HatchingAreaVertex::TPosition) + sizeof(HatchingAreaVertex::TTexCoord) +
+                                     sizeof(HatchingAreaVertex::TMaskTexCoord)),
+      "");
 
   dp::BindingFiller<HatchingAreaVertex> filler(3);
   filler.FillDecl<HatchingAreaVertex::TPosition>("a_position");
@@ -71,9 +71,10 @@ dp::BindingInfo HatchingAreaBindingInit()
 
 dp::BindingInfo SolidTexturingBindingInit()
 {
-  static_assert(sizeof(SolidTexturingVertex) == (sizeof(SolidTexturingVertex::TPosition3d) +
-                                                 sizeof(SolidTexturingVertex::TNormal) +
-                                                 sizeof(SolidTexturingVertex::TTexCoord)), "");
+  static_assert(
+      sizeof(SolidTexturingVertex) == (sizeof(SolidTexturingVertex::TPosition3d) +
+                                       sizeof(SolidTexturingVertex::TNormal) + sizeof(SolidTexturingVertex::TTexCoord)),
+      "");
 
   dp::BindingFiller<SolidTexturingVertex> filler(3);
   filler.FillDecl<SolidTexturingVertex::TPosition3d>("a_position");
@@ -85,10 +86,10 @@ dp::BindingInfo SolidTexturingBindingInit()
 
 dp::BindingInfo MaskedTexturingBindingInit()
 {
-  static_assert(sizeof(MaskedTexturingVertex) == (sizeof(MaskedTexturingVertex::TPosition3d) +
-                                                  sizeof(MaskedTexturingVertex::TNormal) +
-                                                  sizeof(MaskedTexturingVertex::TTexCoord) +
-                                                  sizeof(MaskedTexturingVertex::TTexCoord)), "");
+  static_assert(sizeof(MaskedTexturingVertex) ==
+                    (sizeof(MaskedTexturingVertex::TPosition3d) + sizeof(MaskedTexturingVertex::TNormal) +
+                     sizeof(MaskedTexturingVertex::TTexCoord) + sizeof(MaskedTexturingVertex::TTexCoord)),
+                "");
 
   dp::BindingFiller<MaskedTexturingVertex> filler(4);
   filler.FillDecl<SolidTexturingVertex::TPosition3d>("a_position");
@@ -124,8 +125,8 @@ dp::BindingInfo TextOutlinedStaticBindingInit()
 
 dp::BindingInfo TextDynamicBindingInit()
 {
-  static_assert(sizeof(TextDynamicVertex) == (sizeof(TextStaticVertex::TPosition3d) +
-                                              sizeof(TextDynamicVertex::TNormal)), "");
+  static_assert(
+      sizeof(TextDynamicVertex) == (sizeof(TextStaticVertex::TPosition3d) + sizeof(TextDynamicVertex::TNormal)), "");
 
   dp::BindingFiller<TextDynamicVertex> filler(2, TextDynamicVertex::GetDynamicStreamID());
   filler.FillDecl<TextDynamicVertex::TPosition3d>("a_position");
@@ -136,9 +137,9 @@ dp::BindingInfo TextDynamicBindingInit()
 
 dp::BindingInfo LineBindingInit()
 {
-  static_assert(sizeof(LineVertex) == sizeof(LineVertex::TPosition) +
-                                      sizeof(LineVertex::TNormal) +
-                                      sizeof(LineVertex::TTexCoord), "");
+  static_assert(
+      sizeof(LineVertex) == sizeof(LineVertex::TPosition) + sizeof(LineVertex::TNormal) + sizeof(LineVertex::TTexCoord),
+      "");
   dp::BindingFiller<LineVertex> filler(3);
   filler.FillDecl<LineVertex::TPosition>("a_position");
   filler.FillDecl<LineVertex::TNormal>("a_normal");
@@ -149,10 +150,10 @@ dp::BindingInfo LineBindingInit()
 
 dp::BindingInfo DashedLineBindingInit()
 {
-  static_assert(sizeof(DashedLineVertex) == sizeof(DashedLineVertex::TPosition) +
-                                            sizeof(DashedLineVertex::TNormal) +
-                                            sizeof(DashedLineVertex::TTexCoord) +
-                                            sizeof(DashedLineVertex::TMaskTexCoord), "");
+  static_assert(sizeof(DashedLineVertex) == sizeof(DashedLineVertex::TPosition) + sizeof(DashedLineVertex::TNormal) +
+                                                sizeof(DashedLineVertex::TTexCoord) +
+                                                sizeof(DashedLineVertex::TMaskTexCoord),
+                "");
 
   dp::BindingFiller<DashedLineVertex> filler(4);
   filler.FillDecl<DashedLineVertex::TPosition>("a_position");
@@ -165,10 +166,9 @@ dp::BindingInfo DashedLineBindingInit()
 
 dp::BindingInfo RouteBindingInit()
 {
-  static_assert(sizeof(RouteVertex) == sizeof(RouteVertex::TPosition) +
-                                       sizeof(RouteVertex::TNormal) +
-                                       sizeof(RouteVertex::TLength) +
-                                       sizeof(RouteVertex::TColor), "");
+  static_assert(sizeof(RouteVertex) == sizeof(RouteVertex::TPosition) + sizeof(RouteVertex::TNormal) +
+                                           sizeof(RouteVertex::TLength) + sizeof(RouteVertex::TColor),
+                "");
 
   dp::BindingFiller<RouteVertex> filler(4);
   filler.FillDecl<RouteVertex::TPosition>("a_position");
@@ -181,9 +181,9 @@ dp::BindingInfo RouteBindingInit()
 
 dp::BindingInfo RouteMarkerBindingInit()
 {
-  static_assert(sizeof(RouteMarkerVertex) == sizeof(RouteMarkerVertex::TPosition) +
-                                             sizeof(RouteMarkerVertex::TNormal) +
-                                             sizeof(RouteMarkerVertex::TColor), "");
+  static_assert(sizeof(RouteMarkerVertex) == sizeof(RouteMarkerVertex::TPosition) + sizeof(RouteMarkerVertex::TNormal) +
+                                                 sizeof(RouteMarkerVertex::TColor),
+                "");
 
   dp::BindingFiller<RouteMarkerVertex> filler(3);
   filler.FillDecl<RouteMarkerVertex::TPosition>("a_position");
@@ -196,8 +196,9 @@ dp::BindingInfo RouteMarkerBindingInit()
 dp::BindingInfo ColoredSymbolBindingInit()
 {
   static_assert(sizeof(ColoredSymbolVertex) == sizeof(ColoredSymbolVertex::TPosition) +
-                                               sizeof(ColoredSymbolVertex::TNormal) +
-                                               sizeof(ColoredSymbolVertex::TTexCoord), "");
+                                                   sizeof(ColoredSymbolVertex::TNormal) +
+                                                   sizeof(ColoredSymbolVertex::TTexCoord),
+                "");
 
   dp::BindingFiller<ColoredSymbolVertex> filler(3);
   filler.FillDecl<ColoredSymbolVertex::TPosition>("a_position");
@@ -208,22 +209,19 @@ dp::BindingInfo ColoredSymbolBindingInit()
 }
 
 BindingNode g_bindingNodes[TypeCount];
-TInitFunction g_initFunctions[TypeCount] =
-{
-  &AreaBindingInit,
-  &Area3dBindingInit,
-  &HatchingAreaBindingInit,
-  &SolidTexturingBindingInit,
-  &MaskedTexturingBindingInit,
-  &TextStaticBindingInit,
-  &TextOutlinedStaticBindingInit,
-  &TextDynamicBindingInit,
-  &LineBindingInit,
-  &DashedLineBindingInit,
-  &RouteBindingInit,
-  &RouteMarkerBindingInit,
-  &ColoredSymbolBindingInit
-};
+TInitFunction g_initFunctions[TypeCount] = {&AreaBindingInit,
+                                            &Area3dBindingInit,
+                                            &HatchingAreaBindingInit,
+                                            &SolidTexturingBindingInit,
+                                            &MaskedTexturingBindingInit,
+                                            &TextStaticBindingInit,
+                                            &TextOutlinedStaticBindingInit,
+                                            &TextDynamicBindingInit,
+                                            &LineBindingInit,
+                                            &DashedLineBindingInit,
+                                            &RouteBindingInit,
+                                            &RouteMarkerBindingInit,
+                                            &ColoredSymbolBindingInit};
 
 dp::BindingInfo const & GetBinding(VertexType type)
 {
@@ -248,8 +246,7 @@ dp::BindingInfo const & AreaVertex::GetBindingInfo()
   return GetBinding(Area);
 }
 
-Area3dVertex::Area3dVertex(TPosition const & position, TPosition const & normal,
-                           TTexCoord const & colorTexCoord)
+Area3dVertex::Area3dVertex(TPosition const & position, TPosition const & normal, TTexCoord const & colorTexCoord)
   : m_position(position)
   , m_normal(normal)
   , m_colorTexCoord(colorTexCoord)
@@ -297,8 +294,7 @@ dp::BindingInfo const & MaskedTexturingVertex::GetBindingInfo()
   return GetBinding(MaskedTexturing);
 }
 
-TextOutlinedStaticVertex::TextOutlinedStaticVertex(TTexCoord const & colorTexCoord,
-                                                   TTexCoord const & outlineTexCoord,
+TextOutlinedStaticVertex::TextOutlinedStaticVertex(TTexCoord const & colorTexCoord, TTexCoord const & outlineTexCoord,
                                                    TTexCoord const & maskTexCoord)
   : m_colorTexCoord(colorTexCoord)
   , m_outlineTexCoord(outlineTexCoord)
@@ -310,9 +306,9 @@ dp::BindingInfo const & TextOutlinedStaticVertex::GetBindingInfo()
   return GetBinding(TextOutlinedStatic);
 }
 
-TextDynamicVertex::TextDynamicVertex(const TPosition3d & position, TNormal const & normal)
-  : m_position(position),
-    m_normal(normal)
+TextDynamicVertex::TextDynamicVertex(TPosition3d const & position, TNormal const & normal)
+  : m_position(position)
+  , m_normal(normal)
 {}
 
 dp::BindingInfo const & TextDynamicVertex::GetBindingInfo()
@@ -336,8 +332,8 @@ dp::BindingInfo const & LineVertex::GetBindingInfo()
   return GetBinding(Line);
 }
 
-DashedLineVertex::DashedLineVertex(TPosition const & position, TNormal const & normal,
-                                   TTexCoord const & color, TMaskTexCoord const & mask)
+DashedLineVertex::DashedLineVertex(TPosition const & position, TNormal const & normal, TTexCoord const & color,
+                                   TMaskTexCoord const & mask)
   : m_position(position)
   , m_normal(normal)
   , m_colorTexCoord(color)
@@ -349,8 +345,8 @@ dp::BindingInfo const & DashedLineVertex::GetBindingInfo()
   return GetBinding(DashedLine);
 }
 
-RouteVertex::RouteVertex(TPosition const & position, TNormal const & normal,
-                         TLength const & length, TColor const & color)
+RouteVertex::RouteVertex(TPosition const & position, TNormal const & normal, TLength const & length,
+                         TColor const & color)
   : m_position(position)
   , m_normal(normal)
   , m_length(length)
@@ -362,8 +358,7 @@ dp::BindingInfo const & RouteVertex::GetBindingInfo()
   return GetBinding(Route);
 }
 
-RouteMarkerVertex::RouteMarkerVertex(TPosition const & position, TNormal const & normal,
-                                     TColor const & color)
+RouteMarkerVertex::RouteMarkerVertex(TPosition const & position, TNormal const & normal, TColor const & color)
   : m_position(position)
   , m_normal(normal)
   , m_color(color)
@@ -396,4 +391,3 @@ dp::BindingInfo const & ColoredSymbolVertex::GetBindingInfo()
   return GetBinding(ColoredSymbol);
 }
 }  // namespace gpu
-
diff --git a/libs/drape/utils/vertex_decl.hpp b/libs/drape/utils/vertex_decl.hpp
index 1379757c2..afeada161 100644
--- a/libs/drape/utils/vertex_decl.hpp
+++ b/libs/drape/utils/vertex_decl.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "drape/glsl_types.hpp"
 #include "drape/binding_info.hpp"
+#include "drape/glsl_types.hpp"
 
 #include "base/buffer_vector.hpp"
 
@@ -17,8 +17,10 @@ struct BaseVertex
   using TTexCoord = glsl::vec2;
 };
 
-template <class T> using VBUnknownSizeT = buffer_vector<T, 128>;
-template <class T> using VBReservedSizeT = std::vector<T>;
+template <class T>
+using VBUnknownSizeT = buffer_vector<T, 128>;
+template <class T>
+using VBReservedSizeT = std::vector<T>;
 
 struct AreaVertex : BaseVertex
 {
@@ -34,7 +36,7 @@ struct AreaVertex : BaseVertex
 struct Area3dVertex : BaseVertex
 {
   Area3dVertex() = default;
-  Area3dVertex(TPosition const & position, const TPosition & normal, TTexCoord const & colorTexCoord);
+  Area3dVertex(TPosition const & position, TPosition const & normal, TTexCoord const & colorTexCoord);
 
   TPosition m_position;
   TNormal3d m_normal;
@@ -48,8 +50,7 @@ struct HatchingAreaVertex : BaseVertex
   using TMaskTexCoord = glsl::vec2;
 
   HatchingAreaVertex() = default;
-  HatchingAreaVertex(TPosition const & position, TTexCoord const & colorTexCoord,
-                     TMaskTexCoord const & maskTexCoord);
+  HatchingAreaVertex(TPosition const & position, TTexCoord const & colorTexCoord, TMaskTexCoord const & maskTexCoord);
 
   TPosition m_position;
   TTexCoord m_colorTexCoord;
@@ -73,8 +74,8 @@ struct SolidTexturingVertex : BaseVertex
 struct MaskedTexturingVertex : BaseVertex
 {
   MaskedTexturingVertex() = default;
-  MaskedTexturingVertex(TPosition3d const & position, TNormal const & normal,
-                        TTexCoord const & colorTexCoord, TTexCoord const & maskTexCoord);
+  MaskedTexturingVertex(TPosition3d const & position, TNormal const & normal, TTexCoord const & colorTexCoord,
+                        TTexCoord const & maskTexCoord);
   TPosition3d m_position;
   TNormal m_normal;
   TTexCoord m_colorTexCoord;
@@ -146,8 +147,8 @@ struct DashedLineVertex : BaseVertex
   using TMaskTexCoord = glsl::vec4;
 
   DashedLineVertex() = default;
-  DashedLineVertex(TPosition const & position, TNormal const & normal,
-                   TTexCoord const & color, TMaskTexCoord const & mask);
+  DashedLineVertex(TPosition const & position, TNormal const & normal, TTexCoord const & color,
+                   TMaskTexCoord const & mask);
 
   TPosition m_position;
   TNormal m_normal;
@@ -163,8 +164,7 @@ struct RouteVertex : BaseVertex
   using TColor = glsl::vec4;
 
   RouteVertex() = default;
-  RouteVertex(TPosition const & position, TNormal const & normal,
-              TLength const & length, TColor const & color);
+  RouteVertex(TPosition const & position, TNormal const & normal, TLength const & length, TColor const & color);
 
   TPosition m_position;
   TNormal m_normal;
@@ -181,8 +181,7 @@ struct RouteMarkerVertex : BaseVertex
   using TColor = glsl::vec4;
 
   RouteMarkerVertex() = default;
-  RouteMarkerVertex(TPosition const & position, TNormal const & normal,
-                    TColor const & color);
+  RouteMarkerVertex(TPosition const & position, TNormal const & normal, TColor const & color);
 
   TPosition m_position;
   TNormal m_normal;
@@ -197,8 +196,7 @@ struct ColoredSymbolVertex : BaseVertex
   using TTexCoord = glsl::vec4;
 
   ColoredSymbolVertex() = default;
-  ColoredSymbolVertex(TPosition const & position, TNormal const & normal,
-                      TTexCoord const & colorTexCoord);
+  ColoredSymbolVertex(TPosition const & position, TNormal const & normal, TTexCoord const & colorTexCoord);
 
   TPosition m_position;
   TNormal m_normal;
@@ -207,4 +205,4 @@ struct ColoredSymbolVertex : BaseVertex
   static dp::BindingInfo const & GetBindingInfo();
 };
 
-} // namespace gpu
+}  // namespace gpu
diff --git a/libs/drape/vertex_array_buffer.cpp b/libs/drape/vertex_array_buffer.cpp
index 8c417bfcd..913f0fba7 100644
--- a/libs/drape/vertex_array_buffer.cpp
+++ b/libs/drape/vertex_array_buffer.cpp
@@ -70,10 +70,7 @@ public:
     return true;
   }
 
-  void Unbind() override
-  {
-    GLFunctions::glBindVertexArray(0);
-  }
+  void Unbind() override { GLFunctions::glBindVertexArray(0); }
 
   void BindBuffers(BuffersMap const & buffers) const override
   {
@@ -89,21 +86,18 @@ public:
         int8_t attributeLocation = m_program->GetAttributeLocation(decl.m_attributeName);
         assert(attributeLocation != -1);
         GLFunctions::glEnableVertexAttribute(attributeLocation);
-        GLFunctions::glVertexAttributePointer(attributeLocation, decl.m_componentCount,
-                                              decl.m_componentType, false, decl.m_stride,
-                                              decl.m_offset);
+        GLFunctions::glVertexAttributePointer(attributeLocation, decl.m_componentCount, decl.m_componentType, false,
+                                              decl.m_stride, decl.m_offset);
       }
     }
   }
 
-  void RenderRange(ref_ptr<GraphicsContext> context, bool drawAsLine,
-                   IndicesRange const & range) override
+  void RenderRange(ref_ptr<GraphicsContext> context, bool drawAsLine, IndicesRange const & range) override
   {
     UNUSED_VALUE(context);
     ASSERT(m_program != nullptr, ("Build must be called before RenderRange"));
-    GLFunctions::glDrawElements(drawAsLine ? gl_const::GLLines : gl_const::GLTriangles,
-                                dp::IndexStorage::SizeOfIndex(), range.m_idxCount,
-                                range.m_idxStart);
+    GLFunctions::glDrawElements(drawAsLine ? gl_const::GLLines : gl_const::GLTriangles, dp::IndexStorage::SizeOfIndex(),
+                                range.m_idxCount, range.m_idxStart);
   }
 
 private:
@@ -112,8 +106,7 @@ private:
 };
 }  // namespace
 
-VertexArrayBuffer::VertexArrayBuffer(uint32_t indexBufferSize, uint32_t dataBufferSize,
-                                     uint64_t batcherHash)
+VertexArrayBuffer::VertexArrayBuffer(uint32_t indexBufferSize, uint32_t dataBufferSize, uint64_t batcherHash)
   : m_dataBufferSize(dataBufferSize)
   , m_batcherHash(batcherHash)
 {
@@ -164,8 +157,7 @@ void VertexArrayBuffer::Render(ref_ptr<GraphicsContext> context, bool drawAsLine
   RenderRange(context, drawAsLine, IndicesRange(0, GetIndexBuffer()->GetCurrentSize()));
 }
 
-void VertexArrayBuffer::RenderRange(ref_ptr<GraphicsContext> context,
-                                    bool drawAsLine, IndicesRange const & range)
+void VertexArrayBuffer::RenderRange(ref_ptr<GraphicsContext> context, bool drawAsLine, IndicesRange const & range)
 {
   if (HasBuffers() && GetIndexCount() > 0)
   {
@@ -225,8 +217,8 @@ void VertexArrayBuffer::Build(ref_ptr<GraphicsContext> context, ref_ptr<GpuProgr
   Unbind();
 }
 
-void VertexArrayBuffer::UploadData(ref_ptr<GraphicsContext> context, BindingInfo const & bindingInfo,
-                                   void const * data, uint32_t count)
+void VertexArrayBuffer::UploadData(ref_ptr<GraphicsContext> context, BindingInfo const & bindingInfo, void const * data,
+                                   uint32_t count)
 {
   ref_ptr<DataBuffer> buffer;
   if (!bindingInfo.IsDynamic())
@@ -258,8 +250,7 @@ ref_ptr<DataBuffer> VertexArrayBuffer::GetOrCreateStaticBuffer(BindingInfo const
   return GetOrCreateBuffer(bindingInfo, false);
 }
 
-ref_ptr<DataBuffer> VertexArrayBuffer::GetBuffer(BindingInfo const & bindingInfo,
-                                                 bool isDynamic) const
+ref_ptr<DataBuffer> VertexArrayBuffer::GetBuffer(BindingInfo const & bindingInfo, bool isDynamic) const
 {
   BuffersMap const * buffers = nullptr;
   if (isDynamic)
@@ -274,8 +265,7 @@ ref_ptr<DataBuffer> VertexArrayBuffer::GetBuffer(BindingInfo const & bindingInfo
   return make_ref(it->second);
 }
 
-ref_ptr<DataBuffer> VertexArrayBuffer::GetOrCreateBuffer(BindingInfo const & bindingInfo,
-                                                         bool isDynamic)
+ref_ptr<DataBuffer> VertexArrayBuffer::GetOrCreateBuffer(BindingInfo const & bindingInfo, bool isDynamic)
 {
   BuffersMap * buffers = nullptr;
   if (isDynamic)
@@ -286,8 +276,7 @@ ref_ptr<DataBuffer> VertexArrayBuffer::GetOrCreateBuffer(BindingInfo const & bin
   auto it = buffers->find(bindingInfo);
   if (it == buffers->end())
   {
-    drape_ptr<DataBuffer> dataBuffer =
-        make_unique_dp<DataBuffer>(bindingInfo.GetElementSize(), m_dataBufferSize);
+    drape_ptr<DataBuffer> dataBuffer = make_unique_dp<DataBuffer>(bindingInfo.GetElementSize(), m_dataBufferSize);
     ref_ptr<DataBuffer> result = make_ref(dataBuffer);
     (*buffers).insert(std::make_pair(bindingInfo, std::move(dataBuffer)));
     return result;
@@ -336,17 +325,18 @@ uint32_t VertexArrayBuffer::GetDynamicBufferOffset(BindingInfo const & bindingIn
   return GetOrCreateDynamicBuffer(bindingInfo)->GetBuffer()->GetCurrentSize();
 }
 
-uint32_t VertexArrayBuffer::GetIndexCount() const { return GetIndexBuffer()->GetCurrentSize(); }
+uint32_t VertexArrayBuffer::GetIndexCount() const
+{
+  return GetIndexBuffer()->GetCurrentSize();
+}
 
-void VertexArrayBuffer::UploadIndices(ref_ptr<GraphicsContext> context, void const * data,
-                                      uint32_t count)
+void VertexArrayBuffer::UploadIndices(ref_ptr<GraphicsContext> context, void const * data, uint32_t count)
 {
   CHECK_LESS_OR_EQUAL(count, GetIndexBuffer()->GetAvailableSize(), ());
   GetIndexBuffer()->UploadData(context, data, count);
 }
 
-void VertexArrayBuffer::ApplyMutation(ref_ptr<GraphicsContext> context,
-                                      ref_ptr<IndexBufferMutator> indexMutator,
+void VertexArrayBuffer::ApplyMutation(ref_ptr<GraphicsContext> context, ref_ptr<IndexBufferMutator> indexMutator,
                                       ref_ptr<AttributeBufferMutator> attrMutator)
 {
   // We need to bind current VAO before calling glBindBuffer if OES_vertex_array_object is
@@ -386,8 +376,7 @@ void VertexArrayBuffer::ApplyMutation(ref_ptr<GraphicsContext> context,
     {
       MutateNode const & node = nodes[i];
       ASSERT_GREATER(node.m_region.m_count, 0, ());
-      mapper.UpdateData(node.m_data.get(), node.m_region.m_offset - offsets.first,
-                        node.m_region.m_count);
+      mapper.UpdateData(node.m_data.get(), node.m_region.m_offset - offsets.first, node.m_region.m_count);
     }
   }
 
@@ -410,9 +399,15 @@ void VertexArrayBuffer::Unbind() const
   m_impl->Unbind();
 }
 
-void VertexArrayBuffer::BindStaticBuffers() const { BindBuffers(m_staticBuffers); }
+void VertexArrayBuffer::BindStaticBuffers() const
+{
+  BindBuffers(m_staticBuffers);
+}
 
-void VertexArrayBuffer::BindDynamicBuffers() const { BindBuffers(m_dynamicBuffers); }
+void VertexArrayBuffer::BindDynamicBuffers() const
+{
+  BindBuffers(m_dynamicBuffers);
+}
 
 void VertexArrayBuffer::BindBuffers(BuffersMap const & buffers) const
 {
@@ -440,9 +435,6 @@ void VertexArrayBuffer::CollectBindingInfo(dp::BindingInfo const & bindingInfo)
   CHECK_LESS(m_bindingInfoCount, kMaxBindingInfo, ());
   m_bindingInfo[m_bindingInfoCount++] = bindingInfo;
   std::sort(m_bindingInfo.begin(), m_bindingInfo.begin() + m_bindingInfoCount,
-            [](dp::BindingInfo const & info1, dp::BindingInfo const & info2)
-  {
-    return info1.GetID() < info2.GetID();
-  });
+            [](dp::BindingInfo const & info1, dp::BindingInfo const & info2) { return info1.GetID() < info2.GetID(); });
 }
 }  // namespace dp
diff --git a/libs/drape/vertex_array_buffer.hpp b/libs/drape/vertex_array_buffer.hpp
index bc4f69fcc..8af231493 100644
--- a/libs/drape/vertex_array_buffer.hpp
+++ b/libs/drape/vertex_array_buffer.hpp
@@ -34,8 +34,7 @@ public:
   virtual bool Bind() = 0;
   virtual void Unbind() = 0;
   virtual void BindBuffers(BuffersMap const & buffers) const = 0;
-  virtual void RenderRange(ref_ptr<GraphicsContext> context,
-                           bool drawAsLine, IndicesRange const & range) = 0;
+  virtual void RenderRange(ref_ptr<GraphicsContext> context, bool drawAsLine, IndicesRange const & range) = 0;
 
   virtual void AddBindingInfo(dp::BindingInfo const & bindingInfo) {}
 };
@@ -54,6 +53,7 @@ class VertexArrayBuffer
 {
   friend class metal::MetalVertexArrayBufferImpl;
   friend class vulkan::VulkanVertexArrayBufferImpl;
+
 public:
   VertexArrayBuffer(uint32_t indexBufferSize, uint32_t dataBufferSize, uint64_t batcherHash);
   ~VertexArrayBuffer();
@@ -74,12 +74,10 @@ public:
   uint32_t GetDynamicBufferOffset(BindingInfo const & bindingInfo);
   uint32_t GetIndexCount() const;
 
-  void UploadData(ref_ptr<GraphicsContext> context, BindingInfo const & bindingInfo,
-                  void const * data, uint32_t count);
+  void UploadData(ref_ptr<GraphicsContext> context, BindingInfo const & bindingInfo, void const * data, uint32_t count);
   void UploadIndices(ref_ptr<GraphicsContext> context, void const * data, uint32_t count);
 
-  void ApplyMutation(ref_ptr<GraphicsContext> context,
-                     ref_ptr<IndexBufferMutator> indexMutator,
+  void ApplyMutation(ref_ptr<GraphicsContext> context, ref_ptr<IndexBufferMutator> indexMutator,
                      ref_ptr<AttributeBufferMutator> attrMutator);
 
   void ResetChangingTracking() { m_isChanged = false; }
@@ -111,8 +109,7 @@ private:
   // Definition of this method is in a separate .cpp-file.
   drape_ptr<VertexArrayBufferImpl> CreateImplForVulkan(ref_ptr<GraphicsContext> context,
                                                        ref_ptr<VertexArrayBuffer> buffer,
-                                                       BindingInfoArray && bindingInfo,
-                                                       uint8_t bindingInfoCount);
+                                                       BindingInfoArray && bindingInfo, uint8_t bindingInfoCount);
 
   uint32_t const m_dataBufferSize;
   uint64_t const m_batcherHash;
diff --git a/libs/drape/viewport.cpp b/libs/drape/viewport.cpp
index 489fc5201..daa2a580a 100644
--- a/libs/drape/viewport.cpp
+++ b/libs/drape/viewport.cpp
@@ -3,10 +3,7 @@
 
 namespace dp
 {
-Viewport::Viewport(uint32_t x0, uint32_t y0, uint32_t w, uint32_t h)
-  : m_zero(x0, y0)
-  , m_size(w, h)
-{}
+Viewport::Viewport(uint32_t x0, uint32_t y0, uint32_t w, uint32_t h) : m_zero(x0, y0), m_size(w, h) {}
 
 void Viewport::SetViewport(uint32_t x0, uint32_t y0, uint32_t w, uint32_t h)
 {
@@ -14,13 +11,25 @@ void Viewport::SetViewport(uint32_t x0, uint32_t y0, uint32_t w, uint32_t h)
   m_size = m2::PointU(w, h);
 }
 
-uint32_t Viewport::GetX0() const { return m_zero.x; }
+uint32_t Viewport::GetX0() const
+{
+  return m_zero.x;
+}
 
-uint32_t Viewport::GetY0() const { return m_zero.y; }
+uint32_t Viewport::GetY0() const
+{
+  return m_zero.y;
+}
 
-uint32_t Viewport::GetWidth() const { return m_size.x; }
+uint32_t Viewport::GetWidth() const
+{
+  return m_size.x;
+}
 
-uint32_t Viewport::GetHeight() const { return m_size.y; }
+uint32_t Viewport::GetHeight() const
+{
+  return m_size.y;
+}
 
 void Viewport::Apply(ref_ptr<dp::GraphicsContext> context) const
 {
diff --git a/libs/drape/visual_scale.hpp b/libs/drape/visual_scale.hpp
index 1b559ff52..047c53a08 100644
--- a/libs/drape/visual_scale.hpp
+++ b/libs/drape/visual_scale.hpp
@@ -14,4 +14,4 @@ inline double VisualScale(double exactDensityDPI)
   // Returns one in that case to keep readable text on the map.
   return std::max(1.35, exactDensityDPI / 160.0);
 }
-} //  namespace dp
+}  //  namespace dp
diff --git a/libs/drape/vulkan/vulkan_base_context.cpp b/libs/drape/vulkan/vulkan_base_context.cpp
index 898a9a877..b40780b86 100644
--- a/libs/drape/vulkan/vulkan_base_context.cpp
+++ b/libs/drape/vulkan/vulkan_base_context.cpp
@@ -30,11 +30,9 @@ uint16_t PackAttachmentsOperations(VulkanBaseContext::AttachmentsOperations cons
 }  // namespace
 
 VulkanBaseContext::VulkanBaseContext(VkInstance vulkanInstance, VkPhysicalDevice gpu,
-                                     VkPhysicalDeviceProperties const & gpuProperties,
-                                     VkDevice device, uint32_t renderingQueueFamilyIndex,
-                                     ref_ptr<VulkanObjectManager> objectManager,
-                                     drape_ptr<VulkanPipeline> && pipeline,
-                                     bool hasPartialTextureUpdates)
+                                     VkPhysicalDeviceProperties const & gpuProperties, VkDevice device,
+                                     uint32_t renderingQueueFamilyIndex, ref_ptr<VulkanObjectManager> objectManager,
+                                     drape_ptr<VulkanPipeline> && pipeline, bool hasPartialTextureUpdates)
   : m_vulkanInstance(vulkanInstance)
   , m_gpu(gpu)
   , m_gpuProperties(gpuProperties)
@@ -74,16 +72,17 @@ std::string VulkanBaseContext::GetRendererName() const
 std::string VulkanBaseContext::GetRendererVersion() const
 {
   std::ostringstream ss;
-  ss << "API:" << VK_VERSION_MAJOR(m_gpuProperties.apiVersion) << "."
-     << VK_VERSION_MINOR(m_gpuProperties.apiVersion) << "."
-     << VK_VERSION_PATCH(m_gpuProperties.apiVersion)
+  ss << "API:" << VK_VERSION_MAJOR(m_gpuProperties.apiVersion) << "." << VK_VERSION_MINOR(m_gpuProperties.apiVersion)
+     << "." << VK_VERSION_PATCH(m_gpuProperties.apiVersion)
      << "/Driver:" << VK_VERSION_MAJOR(m_gpuProperties.driverVersion) << "."
-     << VK_VERSION_MINOR(m_gpuProperties.driverVersion) << "."
-     << VK_VERSION_PATCH(m_gpuProperties.driverVersion);
+     << VK_VERSION_MINOR(m_gpuProperties.driverVersion) << "." << VK_VERSION_PATCH(m_gpuProperties.driverVersion);
   return ss.str();
 }
 
-bool VulkanBaseContext::HasPartialTextureUpdates() const { return m_hasPartialTextureUpdates; }
+bool VulkanBaseContext::HasPartialTextureUpdates() const
+{
+  return m_hasPartialTextureUpdates;
+}
 
 void VulkanBaseContext::Init(ApiVersion apiVersion)
 {
@@ -145,8 +144,7 @@ void VulkanBaseContext::SetRenderingQueue(VkQueue queue)
 
 void VulkanBaseContext::Resize(int w, int h)
 {
-  if (m_swapchain != VK_NULL_HANDLE &&
-      m_surfaceCapabilities.currentExtent.width == static_cast<uint32_t>(w) &&
+  if (m_swapchain != VK_NULL_HANDLE && m_surfaceCapabilities.currentExtent.width == static_cast<uint32_t>(w) &&
       m_surfaceCapabilities.currentExtent.height == static_cast<uint32_t>(h))
   {
     return;
@@ -164,8 +162,7 @@ bool VulkanBaseContext::BeginRendering()
   // We wait for the fences no longer than kTimeoutNanoseconds. If timer is expired skip
   // the frame. It helps to prevent freeze on vkWaitForFences in the case of resetting surface.
   uint64_t constexpr kTimeoutNanoseconds = 2 * 1000 * 1000 * 1000;
-  auto res = vkWaitForFences(m_device, 1, &m_fences[m_inflightFrameIndex], VK_TRUE,
-                             kTimeoutNanoseconds);
+  auto res = vkWaitForFences(m_device, 1, &m_fences[m_inflightFrameIndex], VK_TRUE, kTimeoutNanoseconds);
   if (res == VK_TIMEOUT)
     return false;
 
@@ -195,8 +192,7 @@ bool VulkanBaseContext::BeginRendering()
   // "vkAcquireNextImageKHR: non-infinite timeouts not yet implemented"
   // https://android.googlesource.com/platform/frameworks/native/+/refs/heads/master/vulkan/libvulkan/swapchain.cpp
   res = vkAcquireNextImageKHR(m_device, m_swapchain, std::numeric_limits<uint64_t>::max() /* kTimeoutNanoseconds */,
-                              m_acquireSemaphores[m_inflightFrameIndex],
-                              VK_NULL_HANDLE, &m_imageIndex);
+                              m_acquireSemaphores[m_inflightFrameIndex], VK_NULL_HANDLE, &m_imageIndex);
   // VK_ERROR_SURFACE_LOST_KHR appears sometimes after getting foreground. We suppose rendering can be recovered
   // next frame.
   if (res == VK_TIMEOUT || res == VK_ERROR_SURFACE_LOST_KHR)
@@ -207,13 +203,13 @@ bool VulkanBaseContext::BeginRendering()
     return false;
   }
 
-  #if defined(OMIM_OS_MAC)
-    // MoltenVK returns VK_SUBOPTIMAL_KHR in our configuration, it means that window is not resized that's expected
-    // in the developer sandbox for macOS
-    // https://github.com/KhronosGroup/MoltenVK/issues/1753
-    if (res == VK_SUBOPTIMAL_KHR)
-      res = VK_SUCCESS;
-  #endif
+#if defined(OMIM_OS_MAC)
+  // MoltenVK returns VK_SUBOPTIMAL_KHR in our configuration, it means that window is not resized that's expected
+  // in the developer sandbox for macOS
+  // https://github.com/KhronosGroup/MoltenVK/issues/1753
+  if (res == VK_SUBOPTIMAL_KHR)
+    res = VK_SUCCESS;
+#endif
 
   if (res == VK_ERROR_OUT_OF_DATE_KHR || res == VK_SUBOPTIMAL_KHR)
   {
@@ -235,10 +231,8 @@ bool VulkanBaseContext::BeginRendering()
   commandBufferBeginInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
   commandBufferBeginInfo.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT;
 
-  CHECK_VK_CALL(vkBeginCommandBuffer(m_memoryCommandBuffers[m_inflightFrameIndex],
-                                     &commandBufferBeginInfo));
-  CHECK_VK_CALL(vkBeginCommandBuffer(m_renderingCommandBuffers[m_inflightFrameIndex],
-                                     &commandBufferBeginInfo));
+  CHECK_VK_CALL(vkBeginCommandBuffer(m_memoryCommandBuffers[m_inflightFrameIndex], &commandBufferBeginInfo));
+  CHECK_VK_CALL(vkBeginCommandBuffer(m_renderingCommandBuffers[m_inflightFrameIndex], &commandBufferBeginInfo));
 
   return true;
 }
@@ -297,10 +291,9 @@ void VulkanBaseContext::SetFramebuffer(ref_ptr<dp::BaseFramebuffer> framebuffer)
       ref_ptr<VulkanTexture> tex = fb->GetTexture()->GetHardwareTexture();
 
       // Allow to use framebuffer in the fragment shader in the next pass.
-      tex->MakeImageLayoutTransition(m_renderingCommandBuffers[m_inflightFrameIndex],
-                                     VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
-                                     VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
-                                     VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT);
+      tex->MakeImageLayoutTransition(
+          m_renderingCommandBuffers[m_inflightFrameIndex], VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
+          VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT);
     }
   }
 
@@ -353,11 +346,10 @@ void VulkanBaseContext::ApplyFramebuffer(std::string const & framebufferLabel)
       depthFormat = VulkanFormatUnpacker::Unpack(TextureFormat::Depth);
 
       fbData.m_packedAttachmentOperations = packedAttachmentOperations;
-      fbData.m_renderPass = CreateRenderPass(2 /* attachmentsCount */, attachmentsOp,
-                                             colorFormat, VK_IMAGE_LAYOUT_UNDEFINED,
-                                             VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,
-                                             depthFormat, VK_IMAGE_LAYOUT_UNDEFINED,
-                                             VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL);
+      fbData.m_renderPass =
+          CreateRenderPass(2 /* attachmentsCount */, attachmentsOp, colorFormat, VK_IMAGE_LAYOUT_UNDEFINED,
+                           VK_IMAGE_LAYOUT_PRESENT_SRC_KHR, depthFormat, VK_IMAGE_LAYOUT_UNDEFINED,
+                           VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL);
     }
     else
     {
@@ -375,14 +367,13 @@ void VulkanBaseContext::ApplyFramebuffer(std::string const & framebufferLabel)
       }
 
       fbData.m_packedAttachmentOperations = packedAttachmentOperations;
-      fbData.m_renderPass = CreateRenderPass(attachmentsCount, attachmentsOp, colorFormat, VK_IMAGE_LAYOUT_UNDEFINED,
-                                             VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,
-                                             depthFormat, initialDepthStencilLayout,
-                                             VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL);
+      fbData.m_renderPass =
+          CreateRenderPass(attachmentsCount, attachmentsOp, colorFormat, VK_IMAGE_LAYOUT_UNDEFINED,
+                           VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, depthFormat, initialDepthStencilLayout,
+                           VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL);
     }
 
-    SET_DEBUG_NAME_VK(VK_OBJECT_TYPE_RENDER_PASS, fbData.m_renderPass,
-                      ("RP: " + framebufferLabel).c_str());
+    SET_DEBUG_NAME_VK(VK_OBJECT_TYPE_RENDER_PASS, fbData.m_renderPass, ("RP: " + framebufferLabel).c_str());
   }
 
   // Initialize framebuffers.
@@ -410,17 +401,15 @@ void VulkanBaseContext::ApplyFramebuffer(std::string const & framebufferLabel)
       for (size_t i = 0; i < fbData.m_framebuffers.size(); ++i)
       {
         attachmentViews[0] = m_swapchainImageViews[i];
-        CHECK_VK_CALL(vkCreateFramebuffer(m_device, &frameBufferCreateInfo, nullptr,
-                                          &fbData.m_framebuffers[i]));
+        CHECK_VK_CALL(vkCreateFramebuffer(m_device, &frameBufferCreateInfo, nullptr, &fbData.m_framebuffers[i]));
         SET_DEBUG_NAME_VK(VK_OBJECT_TYPE_FRAMEBUFFER, fbData.m_framebuffers[i],
-                         ("FB: " + framebufferLabel + std::to_string(i)).c_str());
+                          ("FB: " + framebufferLabel + std::to_string(i)).c_str());
       }
     }
     else
     {
       ref_ptr<dp::Framebuffer> framebuffer = m_currentFramebuffer;
-      framebuffer->SetSize(this, m_surfaceCapabilities.currentExtent.width,
-                           m_surfaceCapabilities.currentExtent.height);
+      framebuffer->SetSize(this, m_surfaceCapabilities.currentExtent.width, m_surfaceCapabilities.currentExtent.height);
 
       auto const depthStencilRef = framebuffer->GetDepthStencilRef();
       auto const attachmentsCount = (depthStencilRef != nullptr) ? 2 : 1;
@@ -450,8 +439,7 @@ void VulkanBaseContext::ApplyFramebuffer(std::string const & framebufferLabel)
 
       fbData.m_framebuffers.resize(1);
       CHECK_VK_CALL(vkCreateFramebuffer(m_device, &frameBufferCreateInfo, nullptr, &fbData.m_framebuffers[0]));
-      SET_DEBUG_NAME_VK(VK_OBJECT_TYPE_FRAMEBUFFER, fbData.m_framebuffers[0],
-                        ("FB: " + framebufferLabel).c_str());
+      SET_DEBUG_NAME_VK(VK_OBJECT_TYPE_FRAMEBUFFER, fbData.m_framebuffers[0], ("FB: " + framebufferLabel).c_str());
     }
   }
 
@@ -460,17 +448,16 @@ void VulkanBaseContext::ApplyFramebuffer(std::string const & framebufferLabel)
   {
     ref_ptr<dp::Framebuffer> framebuffer = m_currentFramebuffer;
     ref_ptr<VulkanTexture> tex = framebuffer->GetTexture()->GetHardwareTexture();
-    tex->MakeImageLayoutTransition(m_renderingCommandBuffers[m_inflightFrameIndex],
-                                   VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,
-                                   VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
-                                   VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT);
+    tex->MakeImageLayoutTransition(
+        m_renderingCommandBuffers[m_inflightFrameIndex], VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,
+        VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT);
     if (auto ds = framebuffer->GetDepthStencilRef())
     {
       ref_ptr<VulkanTexture> dsTex = ds->GetTexture()->GetHardwareTexture();
-      dsTex->MakeImageLayoutTransition(m_renderingCommandBuffers[m_inflightFrameIndex],
-                                       VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL,
-                                       VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT,
-                                       VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT | VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT);
+      dsTex->MakeImageLayoutTransition(
+          m_renderingCommandBuffers[m_inflightFrameIndex], VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL,
+          VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT,
+          VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT | VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT);
     }
   }
   else
@@ -490,21 +477,20 @@ void VulkanBaseContext::ApplyFramebuffer(std::string const & framebufferLabel)
     imageMemoryBarrier.subresourceRange.levelCount = VK_REMAINING_MIP_LEVELS;
     imageMemoryBarrier.subresourceRange.baseArrayLayer = 0;
     imageMemoryBarrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS;
-    vkCmdPipelineBarrier(m_renderingCommandBuffers[m_inflightFrameIndex], 
-                         VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT, 0, 0,
-                         nullptr, 0, nullptr, 1, &imageMemoryBarrier);
+    vkCmdPipelineBarrier(m_renderingCommandBuffers[m_inflightFrameIndex], VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
+                         VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT, 0, 0, nullptr, 0, nullptr, 1, &imageMemoryBarrier);
 
-    m_depthTexture->MakeImageLayoutTransition(m_renderingCommandBuffers[m_inflightFrameIndex],
-                                              VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL,
-                                              VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT,
-                                              VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT | VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT);
+    m_depthTexture->MakeImageLayoutTransition(
+        m_renderingCommandBuffers[m_inflightFrameIndex], VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL,
+        VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT,
+        VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT | VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT);
   }
 
   m_pipelineKey.m_renderPass = fbData.m_renderPass;
 
   VkClearValue clearValues[2];
-  clearValues[0].color = {{m_clearColor.GetRedF(), m_clearColor.GetGreenF(), m_clearColor.GetBlueF(),
-                           m_clearColor.GetAlphaF()}};
+  clearValues[0].color = {
+      {m_clearColor.GetRedF(), m_clearColor.GetGreenF(), m_clearColor.GetBlueF(), m_clearColor.GetAlphaF()}};
   clearValues[1].depthStencil = {1.0f, 0};
 
   VkRenderPassBeginInfo renderPassBeginInfo = {};
@@ -536,11 +522,8 @@ void VulkanBaseContext::Present()
     presentInfo.waitSemaphoreCount = 1;
 
     auto const res = vkQueuePresentKHR(m_queue, &presentInfo);
-    if (res != VK_SUCCESS && res != VK_SUBOPTIMAL_KHR &&
-        res != VK_ERROR_OUT_OF_DATE_KHR && res != VK_ERROR_DEVICE_LOST)
-    {
+    if (res != VK_SUCCESS && res != VK_SUBOPTIMAL_KHR && res != VK_ERROR_OUT_OF_DATE_KHR && res != VK_ERROR_DEVICE_LOST)
       CHECK_RESULT_VK_CALL(vkQueuePresentKHR, res);
-    }
   }
 
   m_inflightFrameIndex = (m_inflightFrameIndex + 1) % kMaxInflightFrames;
@@ -570,10 +553,8 @@ void VulkanBaseContext::UnregisterHandler(uint32_t id)
   for (size_t i = 0; i < m_handlers.size(); ++i)
   {
     m_handlers[i].erase(std::remove_if(m_handlers[i].begin(), m_handlers[i].end(),
-                                       [id](std::pair<uint8_t, ContextHandler> const & p)
-    {
-      return p.first == id;
-    }), m_handlers[i].end());
+                                       [id](std::pair<uint8_t, ContextHandler> const & p) { return p.first == id; }),
+                        m_handlers[i].end());
   }
 }
 
@@ -609,8 +590,8 @@ void VulkanBaseContext::Clear(uint32_t clearBits, uint32_t storeBits)
         VkClearAttachment attachment = {};
         attachment.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
         attachment.colorAttachment = 0;
-        attachment.clearValue.color = {{m_clearColor.GetRedF(), m_clearColor.GetGreenF(),
-                                        m_clearColor.GetBlueF(), m_clearColor.GetAlphaF()}};
+        attachment.clearValue.color = {
+            {m_clearColor.GetRedF(), m_clearColor.GetGreenF(), m_clearColor.GetBlueF(), m_clearColor.GetAlphaF()}};
         CHECK_LESS(attachmentsCount, kMaxClearAttachment, ());
         attachments[attachmentsCount++] = std::move(attachment);
       }
@@ -627,8 +608,8 @@ void VulkanBaseContext::Clear(uint32_t clearBits, uint32_t storeBits)
       }
     }
 
-    vkCmdClearAttachments(m_renderingCommandBuffers[m_inflightFrameIndex], attachmentsCount,
-                          attachments.data(), 1 /* rectCount */, &clearRect);
+    vkCmdClearAttachments(m_renderingCommandBuffers[m_inflightFrameIndex], attachmentsCount, attachments.data(),
+                          1 /* rectCount */, &clearRect);
   }
   else
   {
@@ -646,20 +627,20 @@ VulkanBaseContext::AttachmentsOperations VulkanBaseContext::GetAttachmensOperati
   if (m_clearBits & ClearBits::ColorBit)
     operations.m_color.m_loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
   else
-    operations.m_color.m_loadOp = (m_storeBits & ClearBits::ColorBit) ? VK_ATTACHMENT_LOAD_OP_LOAD
-                                                                      : VK_ATTACHMENT_LOAD_OP_DONT_CARE;
+    operations.m_color.m_loadOp =
+        (m_storeBits & ClearBits::ColorBit) ? VK_ATTACHMENT_LOAD_OP_LOAD : VK_ATTACHMENT_LOAD_OP_DONT_CARE;
 
   if (m_clearBits & ClearBits::DepthBit)
     operations.m_depth.m_loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
   else
-    operations.m_depth.m_loadOp = (m_storeBits & ClearBits::DepthBit) ? VK_ATTACHMENT_LOAD_OP_LOAD
-                                                                      : VK_ATTACHMENT_LOAD_OP_DONT_CARE;
+    operations.m_depth.m_loadOp =
+        (m_storeBits & ClearBits::DepthBit) ? VK_ATTACHMENT_LOAD_OP_LOAD : VK_ATTACHMENT_LOAD_OP_DONT_CARE;
 
   if (m_clearBits & ClearBits::StencilBit)
     operations.m_stencil.m_loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR;
   else
-    operations.m_stencil.m_loadOp = (m_storeBits & ClearBits::StencilBit) ? VK_ATTACHMENT_LOAD_OP_LOAD
-                                                                          : VK_ATTACHMENT_LOAD_OP_DONT_CARE;
+    operations.m_stencil.m_loadOp =
+        (m_storeBits & ClearBits::StencilBit) ? VK_ATTACHMENT_LOAD_OP_LOAD : VK_ATTACHMENT_LOAD_OP_DONT_CARE;
 
   // Apply storing mode.
   if (m_storeBits & ClearBits::ColorBit)
@@ -749,8 +730,7 @@ void VulkanBaseContext::SetPrimitiveTopology(VkPrimitiveTopology topology)
 
 void VulkanBaseContext::SetBindingInfo(BindingInfoArray const & bindingInfo, uint8_t bindingInfoCount)
 {
-  std::copy(bindingInfo.begin(), bindingInfo.begin() + bindingInfoCount,
-            m_pipelineKey.m_bindingInfo.begin());
+  std::copy(bindingInfo.begin(), bindingInfo.begin() + bindingInfoCount, m_pipelineKey.m_bindingInfo.begin());
   m_pipelineKey.m_bindingInfoCount = bindingInfoCount;
 }
 
@@ -806,10 +786,8 @@ VkPipelineLayout VulkanBaseContext::GetCurrentPipelineLayout() const
 uint32_t VulkanBaseContext::GetCurrentDynamicBufferOffset() const
 {
   for (auto const & p : m_paramDescriptors)
-  {
     if (p.m_type == ParamDescriptor::Type::DynamicUniformBuffer)
       return p.m_bufferDynamicOffset;
-  }
   CHECK(false, ("Shaders parameters are not set."));
   return 0;
 }
@@ -833,7 +811,7 @@ ref_ptr<VulkanStagingBuffer> VulkanBaseContext::GetDefaultStagingBuffer() const
 {
   return make_ref(m_defaultStagingBuffers[m_inflightFrameIndex]);
 }
-  
+
 void VulkanBaseContext::RecreateSwapchain()
 {
   CHECK(m_surface.has_value(), ());
@@ -894,15 +872,14 @@ void VulkanBaseContext::RecreateSwapchain()
     swapchainImageViewCI.image = m_swapchainImages[i];
     swapchainImageViewCI.viewType = VK_IMAGE_VIEW_TYPE_2D;
     swapchainImageViewCI.format = m_surfaceFormat->format;
-    swapchainImageViewCI.components = {VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_G,
-                                       VK_COMPONENT_SWIZZLE_B, VK_COMPONENT_SWIZZLE_A};
+    swapchainImageViewCI.components = {VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_G, VK_COMPONENT_SWIZZLE_B,
+                                       VK_COMPONENT_SWIZZLE_A};
     swapchainImageViewCI.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
     swapchainImageViewCI.subresourceRange.baseMipLevel = 0;
     swapchainImageViewCI.subresourceRange.levelCount = 1;
     swapchainImageViewCI.subresourceRange.baseArrayLayer = 0;
     swapchainImageViewCI.subresourceRange.layerCount = 1;
-    CHECK_VK_CALL(vkCreateImageView(m_device, &swapchainImageViewCI, nullptr,
-                                    &m_swapchainImageViews[i]));
+    CHECK_VK_CALL(vkCreateImageView(m_device, &swapchainImageViewCI, nullptr, &m_swapchainImageViews[i]));
   }
 }
 
@@ -1136,8 +1113,7 @@ VkRenderPass VulkanBaseContext::CreateRenderPass(uint32_t attachmentsCount, Atta
   dependencies[2].dstSubpass = VK_SUBPASS_EXTERNAL;
   dependencies[2].srcStageMask = VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT;
   dependencies[2].dstStageMask = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
-  dependencies[2].srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | 
-                                  VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
+  dependencies[2].srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT;
   dependencies[2].dstAccessMask = VK_ACCESS_MEMORY_READ_BIT;
   dependencies[2].dependencyFlags = VK_DEPENDENCY_BY_REGION_BIT;
 
@@ -1145,8 +1121,7 @@ VkRenderPass VulkanBaseContext::CreateRenderPass(uint32_t attachmentsCount, Atta
   // Write-after-write happens because of layout transition to the final layout.
   dependencies[3].srcSubpass = 0;
   dependencies[3].dstSubpass = VK_SUBPASS_EXTERNAL;
-  dependencies[3].srcStageMask = VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | 
-                                 VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;
+  dependencies[3].srcStageMask = VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT | VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT;
   dependencies[3].dstStageMask = VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT;
   dependencies[3].srcAccessMask = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT;
   dependencies[3].dstAccessMask = 0;
diff --git a/libs/drape/vulkan/vulkan_base_context.hpp b/libs/drape/vulkan/vulkan_base_context.hpp
index c29fa5331..783037026 100644
--- a/libs/drape/vulkan/vulkan_base_context.hpp
+++ b/libs/drape/vulkan/vulkan_base_context.hpp
@@ -27,9 +27,8 @@ namespace vulkan
 class VulkanBaseContext : public dp::GraphicsContext
 {
 public:
-  VulkanBaseContext(VkInstance vulkanInstance, VkPhysicalDevice gpu,
-                    VkPhysicalDeviceProperties const & gpuProperties, VkDevice device,
-                    uint32_t renderingQueueFamilyIndex, ref_ptr<VulkanObjectManager> objectManager,
+  VulkanBaseContext(VkInstance vulkanInstance, VkPhysicalDevice gpu, VkPhysicalDeviceProperties const & gpuProperties,
+                    VkDevice device, uint32_t renderingQueueFamilyIndex, ref_ptr<VulkanObjectManager> objectManager,
                     drape_ptr<VulkanPipeline> && pipeline, bool hasPartialTextureUpdates);
   ~VulkanBaseContext() override;
 
@@ -65,8 +64,8 @@ public:
   void SetDepthTestFunction(TestFunction depthFunction) override;
   void SetStencilTestEnabled(bool enabled) override;
   void SetStencilFunction(StencilFace face, TestFunction stencilFunction) override;
-  void SetStencilActions(StencilFace face, StencilAction stencilFailAction,
-                         StencilAction depthFailAction, StencilAction passAction) override;
+  void SetStencilActions(StencilFace face, StencilAction stencilFailAction, StencilAction depthFailAction,
+                         StencilAction passAction) override;
   void SetStencilReferenceValue(uint32_t stencilReferenceValue) override;
   void SetCullingEnabled(bool enabled) override;
 
@@ -212,8 +211,7 @@ protected:
   };
   std::map<ref_ptr<BaseFramebuffer>, FramebufferData> m_framebuffersData;
 
-  std::array<std::vector<std::pair<uint32_t, ContextHandler>>,
-             static_cast<size_t>(HandlerType::Count)> m_handlers;
+  std::array<std::vector<std::pair<uint32_t, ContextHandler>>, static_cast<size_t>(HandlerType::Count)> m_handlers;
 
   VulkanPipeline::PipelineKey m_pipelineKey;
   std::vector<ParamDescriptor> m_paramDescriptors;
diff --git a/libs/drape/vulkan/vulkan_context_factory.cpp b/libs/drape/vulkan/vulkan_context_factory.cpp
index 9df359927..af55e1a13 100644
--- a/libs/drape/vulkan/vulkan_context_factory.cpp
+++ b/libs/drape/vulkan/vulkan_context_factory.cpp
@@ -19,15 +19,13 @@ namespace
 class DrawVulkanContext : public dp::vulkan::VulkanBaseContext
 {
 public:
-  DrawVulkanContext(VkInstance vulkanInstance, VkPhysicalDevice gpu,
-                    VkPhysicalDeviceProperties const & gpuProperties, VkDevice device,
-                    uint32_t renderingQueueFamilyIndex,
+  DrawVulkanContext(VkInstance vulkanInstance, VkPhysicalDevice gpu, VkPhysicalDeviceProperties const & gpuProperties,
+                    VkDevice device, uint32_t renderingQueueFamilyIndex,
                     ref_ptr<dp::vulkan::VulkanObjectManager> objectManager, uint32_t appVersionCode,
                     bool hasPartialTextureUpdates)
-    : dp::vulkan::VulkanBaseContext(
-          vulkanInstance, gpu, gpuProperties, device, renderingQueueFamilyIndex, objectManager,
-          make_unique_dp<dp::vulkan::VulkanPipeline>(device, appVersionCode),
-          hasPartialTextureUpdates)
+    : dp::vulkan::VulkanBaseContext(vulkanInstance, gpu, gpuProperties, device, renderingQueueFamilyIndex,
+                                    objectManager, make_unique_dp<dp::vulkan::VulkanPipeline>(device, appVersionCode),
+                                    hasPartialTextureUpdates)
   {
     VkQueue queue;
     vkGetDeviceQueue(device, renderingQueueFamilyIndex, 0, &queue);
@@ -35,38 +33,26 @@ public:
     CreateCommandPool();
   }
 
-  void MakeCurrent() override
-  {
-    m_objectManager->RegisterThread(dp::vulkan::VulkanObjectManager::Frontend);
-  }
+  void MakeCurrent() override { m_objectManager->RegisterThread(dp::vulkan::VulkanObjectManager::Frontend); }
 };
 
 class UploadVulkanContext : public dp::vulkan::VulkanBaseContext
 {
 public:
-  UploadVulkanContext(VkInstance vulkanInstance, VkPhysicalDevice gpu,
-                      VkPhysicalDeviceProperties const & gpuProperties, VkDevice device,
-                      uint32_t renderingQueueFamilyIndex,
-                      ref_ptr<dp::vulkan::VulkanObjectManager> objectManager,
-                      bool hasPartialTextureUpdates)
-    : dp::vulkan::VulkanBaseContext(vulkanInstance, gpu, gpuProperties, device,
-                                    renderingQueueFamilyIndex, objectManager,
-                                    nullptr /* pipeline */, hasPartialTextureUpdates)
+  UploadVulkanContext(VkInstance vulkanInstance, VkPhysicalDevice gpu, VkPhysicalDeviceProperties const & gpuProperties,
+                      VkDevice device, uint32_t renderingQueueFamilyIndex,
+                      ref_ptr<dp::vulkan::VulkanObjectManager> objectManager, bool hasPartialTextureUpdates)
+    : dp::vulkan::VulkanBaseContext(vulkanInstance, gpu, gpuProperties, device, renderingQueueFamilyIndex,
+                                    objectManager, nullptr /* pipeline */, hasPartialTextureUpdates)
   {}
 
-  void MakeCurrent() override
-  {
-    m_objectManager->RegisterThread(dp::vulkan::VulkanObjectManager::Backend);
-  }
+  void MakeCurrent() override { m_objectManager->RegisterThread(dp::vulkan::VulkanObjectManager::Backend); }
 
   void Present() override {}
 
   void Resize(int w, int h) override {}
   void SetFramebuffer(ref_ptr<dp::BaseFramebuffer> framebuffer) override {}
-  void Init(dp::ApiVersion apiVersion) override
-  {
-    CHECK_EQUAL(apiVersion, dp::ApiVersion::Vulkan, ());
-  }
+  void Init(dp::ApiVersion apiVersion) override { CHECK_EQUAL(apiVersion, dp::ApiVersion::Vulkan, ()); }
 
   void SetClearColor(dp::Color const & color) override {}
   void Clear(uint32_t clearBits, uint32_t storeBits) override {}
@@ -74,12 +60,10 @@ public:
   void SetDepthTestEnabled(bool enabled) override {}
   void SetDepthTestFunction(dp::TestFunction depthFunction) override {}
   void SetStencilTestEnabled(bool enabled) override {}
-  void SetStencilFunction(dp::StencilFace face,
-                          dp::TestFunction stencilFunction) override {}
-  void SetStencilActions(dp::StencilFace face,
-                         dp::StencilAction stencilFailAction,
-                         dp::StencilAction depthFailAction,
-                         dp::StencilAction passAction) override {}
+  void SetStencilFunction(dp::StencilFace face, dp::TestFunction stencilFunction) override {}
+  void SetStencilActions(dp::StencilFace face, dp::StencilAction stencilFailAction, dp::StencilAction depthFailAction,
+                         dp::StencilAction passAction) override
+  {}
 };
 }  // namespace
 
@@ -120,7 +104,7 @@ VulkanContextFactory::VulkanContextFactory(uint32_t appVersionCode, int sdkVersi
 
   // Enable extra validation features.
   VkValidationFeaturesEXT validationFeatures = {};
-  const VkValidationFeatureEnableEXT validationFeaturesEnabled[] = {
+  VkValidationFeatureEnableEXT const validationFeaturesEnabled[] = {
       VK_VALIDATION_FEATURE_ENABLE_SYNCHRONIZATION_VALIDATION_EXT};
   if (m_layers->IsValidationFeaturesEnabled())
   {
@@ -165,8 +149,8 @@ VulkanContextFactory::VulkanContextFactory(uint32_t appVersionCode, int sdkVersi
   dp::SupportManager::Version driverVersion{VK_VERSION_MAJOR(gpuProperties.driverVersion),
                                             VK_VERSION_MINOR(gpuProperties.driverVersion),
                                             VK_VERSION_PATCH(gpuProperties.driverVersion)};
-  if (dp::SupportManager::Instance().IsVulkanForbidden(gpuProperties.deviceName, apiVersion, driverVersion,
-                                                       isCustomROM, sdkVersion))
+  if (dp::SupportManager::Instance().IsVulkanForbidden(gpuProperties.deviceName, apiVersion, driverVersion, isCustomROM,
+                                                       sdkVersion))
   {
     LOG_ERROR_VK("GPU/Driver configuration is not supported.");
     return;
@@ -181,15 +165,12 @@ VulkanContextFactory::VulkanContextFactory(uint32_t appVersionCode, int sdkVersi
   }
 
   std::vector<VkQueueFamilyProperties> queueFamilyProperties(queueFamilyCount);
-  vkGetPhysicalDeviceQueueFamilyProperties(m_gpu, &queueFamilyCount,
-                                           queueFamilyProperties.data());
+  vkGetPhysicalDeviceQueueFamilyProperties(m_gpu, &queueFamilyCount, queueFamilyProperties.data());
 
   uint32_t renderingQueueFamilyIndex = 0;
   for (; renderingQueueFamilyIndex < queueFamilyCount; ++renderingQueueFamilyIndex)
-  {
     if (queueFamilyProperties[renderingQueueFamilyIndex].queueFlags & VK_QUEUE_GRAPHICS_BIT)
       break;
-  }
   if (renderingQueueFamilyIndex == queueFamilyCount)
   {
     LOG_ERROR_VK("Any queue family with VK_QUEUE_GRAPHICS_BIT wasn't found.");
@@ -246,20 +227,18 @@ VulkanContextFactory::VulkanContextFactory(uint32_t appVersionCode, int sdkVersi
 
   VkPhysicalDeviceMemoryProperties memoryProperties;
   vkGetPhysicalDeviceMemoryProperties(m_gpu, &memoryProperties);
-  m_objectManager = make_unique_dp<dp::vulkan::VulkanObjectManager>(m_device, gpuProperties.limits,
-                                                                    memoryProperties,
+  m_objectManager = make_unique_dp<dp::vulkan::VulkanObjectManager>(m_device, gpuProperties.limits, memoryProperties,
                                                                     renderingQueueFamilyIndex);
 
-  bool const hasPartialTextureUpdates =
-      !dp::SupportManager::Instance().IsVulkanTexturePartialUpdateBuggy(
-          sdkVersion, gpuProperties.deviceName, apiVersion, driverVersion);
+  bool const hasPartialTextureUpdates = !dp::SupportManager::Instance().IsVulkanTexturePartialUpdateBuggy(
+      sdkVersion, gpuProperties.deviceName, apiVersion, driverVersion);
 
-  m_drawContext = make_unique_dp<DrawVulkanContext>(
-      m_vulkanInstance, m_gpu, gpuProperties, m_device, renderingQueueFamilyIndex,
-      make_ref(m_objectManager), appVersionCode, hasPartialTextureUpdates);
-  m_uploadContext = make_unique_dp<UploadVulkanContext>(
-      m_vulkanInstance, m_gpu, gpuProperties, m_device, renderingQueueFamilyIndex,
-      make_ref(m_objectManager), hasPartialTextureUpdates);
+  m_drawContext =
+      make_unique_dp<DrawVulkanContext>(m_vulkanInstance, m_gpu, gpuProperties, m_device, renderingQueueFamilyIndex,
+                                        make_ref(m_objectManager), appVersionCode, hasPartialTextureUpdates);
+  m_uploadContext =
+      make_unique_dp<UploadVulkanContext>(m_vulkanInstance, m_gpu, gpuProperties, m_device, renderingQueueFamilyIndex,
+                                          make_ref(m_objectManager), hasPartialTextureUpdates);
 }
 
 VulkanContextFactory::~VulkanContextFactory()
@@ -314,8 +293,7 @@ void VulkanContextFactory::SetPresentAvailable(bool available)
 
 bool VulkanContextFactory::QuerySurfaceSize()
 {
-  auto statusCode = vkGetPhysicalDeviceSurfaceCapabilitiesKHR(m_gpu, m_surface,
-                                                              &m_surfaceCapabilities);
+  auto statusCode = vkGetPhysicalDeviceSurfaceCapabilitiesKHR(m_gpu, m_surface, &m_surfaceCapabilities);
   if (statusCode != VK_SUCCESS)
   {
     LOG_ERROR_VK_CALL(vkGetPhysicalDeviceSurfaceCapabilitiesKHR, statusCode);
diff --git a/libs/drape/vulkan/vulkan_context_factory.hpp b/libs/drape/vulkan/vulkan_context_factory.hpp
index e1582452e..65da7b7f3 100644
--- a/libs/drape/vulkan/vulkan_context_factory.hpp
+++ b/libs/drape/vulkan/vulkan_context_factory.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
 #include "drape/graphics_context_factory.hpp"
-#include "drape/vulkan/vulkan_base_context.hpp"
-#include "drape/vulkan/vulkan_object_manager.hpp"
-#include "drape/vulkan/vulkan_layers.hpp"
 #include "drape/pointers.hpp"
+#include "drape/vulkan/vulkan_base_context.hpp"
+#include "drape/vulkan/vulkan_layers.hpp"
+#include "drape/vulkan/vulkan_object_manager.hpp"
 
 #include <vulkan/vulkan_android.h>
 
diff --git a/libs/drape/vulkan/vulkan_gpu_buffer_impl.cpp b/libs/drape/vulkan/vulkan_gpu_buffer_impl.cpp
index cb61e36eb..f4b568354 100644
--- a/libs/drape/vulkan/vulkan_gpu_buffer_impl.cpp
+++ b/libs/drape/vulkan/vulkan_gpu_buffer_impl.cpp
@@ -11,8 +11,8 @@ namespace dp
 {
 namespace vulkan
 {
-VulkanGPUBuffer::VulkanGPUBuffer(ref_ptr<VulkanBaseContext> context, void const * data,
-                                 uint8_t elementSize, uint32_t capacity, uint64_t batcherHash)
+VulkanGPUBuffer::VulkanGPUBuffer(ref_ptr<VulkanBaseContext> context, void const * data, uint8_t elementSize,
+                                 uint32_t capacity, uint64_t batcherHash)
   : BufferBase(elementSize, capacity)
   , m_batcherHash(batcherHash)
 {
@@ -26,8 +26,7 @@ VulkanGPUBuffer::~VulkanGPUBuffer()
   m_objectManager->DestroyObject(m_geometryBuffer);
 }
 
-void * VulkanGPUBuffer::Map(ref_ptr<VulkanBaseContext> context, uint32_t elementOffset,
-                            uint32_t elementCount)
+void * VulkanGPUBuffer::Map(ref_ptr<VulkanBaseContext> context, uint32_t elementOffset, uint32_t elementCount)
 {
   CHECK(m_objectManager != nullptr, ());
 
@@ -54,8 +53,7 @@ void * VulkanGPUBuffer::Map(ref_ptr<VulkanBaseContext> context, uint32_t element
   return data.m_pointer;
 }
 
-void VulkanGPUBuffer::UpdateData(void * gpuPtr, void const * data,
-                                 uint32_t elementOffset, uint32_t elementCount)
+void VulkanGPUBuffer::UpdateData(void * gpuPtr, void const * data, uint32_t elementOffset, uint32_t elementCount)
 {
   CHECK(gpuPtr != nullptr, ());
   CHECK(m_stagingBufferRef != nullptr, ());
@@ -70,10 +68,9 @@ void VulkanGPUBuffer::UpdateData(void * gpuPtr, void const * data,
   copyRegion.srcOffset = baseSrcOffset + byteOffset;
   copyRegion.size = byteCount;
 
-  m_mappingByteOffsetMin = std::min(m_mappingByteOffsetMin,
-                                    static_cast<uint32_t>(copyRegion.dstOffset));
-  m_mappingByteOffsetMax = std::max(m_mappingByteOffsetMax,
-                                    static_cast<uint32_t>(copyRegion.dstOffset + copyRegion.size));
+  m_mappingByteOffsetMin = std::min(m_mappingByteOffsetMin, static_cast<uint32_t>(copyRegion.dstOffset));
+  m_mappingByteOffsetMax =
+      std::max(m_mappingByteOffsetMax, static_cast<uint32_t>(copyRegion.dstOffset + copyRegion.size));
 
   m_regionsToCopy.push_back(std::move(copyRegion));
 }
@@ -97,8 +94,7 @@ void VulkanGPUBuffer::Unmap(ref_ptr<VulkanBaseContext> context)
   VkBufferMemoryBarrier barrier = {};
   barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER;
   barrier.pNext = nullptr;
-  barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT | 
-                          VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT | VK_ACCESS_INDEX_READ_BIT;
+  barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT | VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT | VK_ACCESS_INDEX_READ_BIT;
   barrier.dstAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
   barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
   barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
@@ -106,9 +102,8 @@ void VulkanGPUBuffer::Unmap(ref_ptr<VulkanBaseContext> context)
   barrier.offset = m_mappingByteOffsetMin;
   barrier.size = m_mappingByteOffsetMax - m_mappingByteOffsetMin;
   vkCmdPipelineBarrier(commandBuffer, VK_PIPELINE_STAGE_VERTEX_INPUT_BIT | VK_PIPELINE_STAGE_TRANSFER_BIT,
-                        VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, nullptr,
-                        1, &barrier, 0, nullptr);
-                         
+                       VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, nullptr, 1, &barrier, 0, nullptr);
+
   // Schedule command to copy from the staging buffer to the geometry buffer.
   vkCmdCopyBuffer(commandBuffer, stagingBuffer, m_geometryBuffer.m_buffer,
                   static_cast<uint32_t>(m_regionsToCopy.size()), m_regionsToCopy.data());
@@ -116,24 +111,22 @@ void VulkanGPUBuffer::Unmap(ref_ptr<VulkanBaseContext> context)
   // Set up barriers to prevent data collisions (read-after-write).
   barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
   barrier.dstAccessMask = VK_ACCESS_INDEX_READ_BIT | VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT;
-  vkCmdPipelineBarrier(commandBuffer, VK_PIPELINE_STAGE_TRANSFER_BIT,
-                       VK_PIPELINE_STAGE_VERTEX_INPUT_BIT, 0, 0, nullptr,
+  vkCmdPipelineBarrier(commandBuffer, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_VERTEX_INPUT_BIT, 0, 0, nullptr,
                        1, &barrier, 0, nullptr);
 
   m_mappingByteOffset = 0;
   m_regionsToCopy.clear();
 }
 
-void VulkanGPUBuffer::Resize(ref_ptr<VulkanBaseContext> context, void const * data,
-                             uint32_t elementCount)
+void VulkanGPUBuffer::Resize(ref_ptr<VulkanBaseContext> context, void const * data, uint32_t elementCount)
 {
   BufferBase::Resize(elementCount);
 
   m_objectManager = context->GetObjectManager();
   uint32_t const sizeInBytes = GetCapacity() * GetElementSize();
 
-  m_geometryBuffer = m_objectManager->CreateBuffer(VulkanMemoryManager::ResourceType::Geometry,
-                                                   sizeInBytes, m_batcherHash);
+  m_geometryBuffer =
+      m_objectManager->CreateBuffer(VulkanMemoryManager::ResourceType::Geometry, sizeInBytes, m_batcherHash);
   m_objectManager->Fill(m_geometryBuffer, data, sizeInBytes);
 
   // If we have already set up data, we have to call SetDataSize.
@@ -141,10 +134,9 @@ void VulkanGPUBuffer::Resize(ref_ptr<VulkanBaseContext> context, void const * da
     SetDataSize(elementCount);
 }
 }  // namespace vulkan
-  
+
 drape_ptr<DataBufferBase> DataBuffer::CreateImplForVulkan(ref_ptr<GraphicsContext> context, void const * data,
-                                                          uint8_t elementSize, uint32_t capacity,
-                                                          uint64_t batcherHash)
+                                                          uint8_t elementSize, uint32_t capacity, uint64_t batcherHash)
 {
   return make_unique_dp<vulkan::VulkanGpuBufferImpl>(context, data, elementSize, capacity, batcherHash);
 }
diff --git a/libs/drape/vulkan/vulkan_gpu_buffer_impl.hpp b/libs/drape/vulkan/vulkan_gpu_buffer_impl.hpp
index e67e51fda..39cffb7a9 100644
--- a/libs/drape/vulkan/vulkan_gpu_buffer_impl.hpp
+++ b/libs/drape/vulkan/vulkan_gpu_buffer_impl.hpp
@@ -22,13 +22,12 @@ class VulkanStagingBuffer;
 class VulkanGPUBuffer : public BufferBase
 {
 public:
-  VulkanGPUBuffer(ref_ptr<VulkanBaseContext> context, void const * data,
-                  uint8_t elementSize, uint32_t capacity, uint64_t batcherHash);
+  VulkanGPUBuffer(ref_ptr<VulkanBaseContext> context, void const * data, uint8_t elementSize, uint32_t capacity,
+                  uint64_t batcherHash);
   ~VulkanGPUBuffer() override;
 
   void * Map(ref_ptr<VulkanBaseContext> context, uint32_t elementOffset, uint32_t elementCount);
-  void UpdateData(void * gpuPtr, void const * data,
-                  uint32_t elementOffset, uint32_t elementCount);
+  void UpdateData(void * gpuPtr, void const * data, uint32_t elementOffset, uint32_t elementCount);
   void Unmap(ref_ptr<VulkanBaseContext> context);
 
   void Advance(uint32_t elementCount) { BufferBase::UploadData(elementCount); }
@@ -50,23 +49,21 @@ protected:
   uint32_t m_mappingByteOffsetMax = std::numeric_limits<uint32_t>::min();
   std::vector<VkBufferCopy> m_regionsToCopy;
 };
-  
+
 class VulkanGpuBufferImpl : public DataBufferImpl<VulkanGPUBuffer>
 {
 public:
   template <typename... Args>
-  VulkanGpuBufferImpl(Args &&... params)
-    : DataBufferImpl(std::forward<Args>(params)...)
+  VulkanGpuBufferImpl(Args &&... params) : DataBufferImpl(std::forward<Args>(params)...)
   {}
-  
+
   void const * Data() const override
   {
     ASSERT(false, ("Retrieving of raw data is unavailable for GPU buffer"));
     return nullptr;
   }
-  
-  void UploadData(ref_ptr<GraphicsContext> context, void const * data,
-                  uint32_t elementCount) override
+
+  void UploadData(ref_ptr<GraphicsContext> context, void const * data, uint32_t elementCount) override
   {
     // In Vulkan we must call upload only from FR.
     ref_ptr<VulkanBaseContext> vulkanContext = context;
@@ -81,23 +78,18 @@ public:
     m_buffer->Unmap(context);
     m_buffer->Advance(elementCount);
   }
-  
-  void UpdateData(void * destPtr, void const * srcPtr, uint32_t elementOffset,
-                  uint32_t elementCount) override
+
+  void UpdateData(void * destPtr, void const * srcPtr, uint32_t elementOffset, uint32_t elementCount) override
   {
     m_buffer->UpdateData(destPtr, srcPtr, elementOffset, elementCount);
   }
-  
-  void * Map(ref_ptr<GraphicsContext> context, uint32_t elementOffset,
-             uint32_t elementCount) override
+
+  void * Map(ref_ptr<GraphicsContext> context, uint32_t elementOffset, uint32_t elementCount) override
   {
     return m_buffer->Map(context, elementOffset, elementCount);
   }
 
-  void Unmap(ref_ptr<GraphicsContext> context) override
-  {
-    m_buffer->Unmap(context);
-  }
+  void Unmap(ref_ptr<GraphicsContext> context) override { m_buffer->Unmap(context); }
 
   void Bind() override {}
 
diff --git a/libs/drape/vulkan/vulkan_gpu_program.hpp b/libs/drape/vulkan/vulkan_gpu_program.hpp
index 92870ca0c..1bcbdf776 100644
--- a/libs/drape/vulkan/vulkan_gpu_program.hpp
+++ b/libs/drape/vulkan/vulkan_gpu_program.hpp
@@ -18,12 +18,9 @@ class VulkanGpuProgram : public GpuProgram
 public:
   using TextureBindings = std::unordered_map<std::string, int8_t>;
 
-  VulkanGpuProgram(std::string const & programName,
-                   VkPipelineShaderStageCreateInfo const & vertexShader,
-                   VkPipelineShaderStageCreateInfo const & fragmentShader,
-                   VkDescriptorSetLayout descriptorSetLayout,
-                   VkPipelineLayout pipelineLayout,
-                   TextureBindings const & textureBindings)
+  VulkanGpuProgram(std::string const & programName, VkPipelineShaderStageCreateInfo const & vertexShader,
+                   VkPipelineShaderStageCreateInfo const & fragmentShader, VkDescriptorSetLayout descriptorSetLayout,
+                   VkPipelineLayout pipelineLayout, TextureBindings const & textureBindings)
     : GpuProgram(programName)
     , m_vertexShader(vertexShader)
     , m_fragmentShader(fragmentShader)
@@ -35,10 +32,7 @@ public:
   void Bind() override {}
   void Unbind() override {}
 
-  std::array<VkPipelineShaderStageCreateInfo, 2> GetShaders() const
-  {
-    return {{m_vertexShader, m_fragmentShader}};
-  }
+  std::array<VkPipelineShaderStageCreateInfo, 2> GetShaders() const { return {{m_vertexShader, m_fragmentShader}}; }
 
   VkDescriptorSetLayout GetDescriptorSetLayout() const { return m_descriptorSetLayout; }
 
diff --git a/libs/drape/vulkan/vulkan_layers.cpp b/libs/drape/vulkan/vulkan_layers.cpp
old mode 100755
new mode 100644
index a4126b0ef..79518a768
--- a/libs/drape/vulkan/vulkan_layers.cpp
+++ b/libs/drape/vulkan/vulkan_layers.cpp
@@ -17,34 +17,32 @@ char const * kDebugReportExtension = "VK_EXT_debug_report";
 char const * kValidationFeaturesExtension = "VK_EXT_validation_features";
 
 char const * const kInstanceExtensions[] = {
-  "VK_KHR_surface",
-  "VK_KHR_android_surface",
-  kDebugReportExtension,
-  kValidationFeaturesExtension,
+    "VK_KHR_surface",
+    "VK_KHR_android_surface",
+    kDebugReportExtension,
+    kValidationFeaturesExtension,
 #if defined(OMIM_OS_MAC) || defined(OMIM_OS_LINUX)
-  "VK_EXT_debug_utils",
+    "VK_EXT_debug_utils",
 #endif
 #if defined(OMIM_OS_MAC)
-  "VK_KHR_portability_enumeration",
-  "VK_MVK_macos_surface",
-  "VK_KHR_get_physical_device_properties2",
+    "VK_KHR_portability_enumeration",
+    "VK_MVK_macos_surface",
+    "VK_KHR_get_physical_device_properties2",
 #endif
 #if defined(OMIM_OS_LINUX)
-  "VK_KHR_xlib_surface",
+    "VK_KHR_xlib_surface",
 #endif
 };
 
-char const * const kDeviceExtensions[] =
-{
-  "VK_KHR_swapchain",
+char const * const kDeviceExtensions[] = {
+    "VK_KHR_swapchain",
 #if defined(OMIM_OS_MAC)
-  "VK_KHR_portability_subset",
+    "VK_KHR_portability_subset",
 #endif
 };
 
-char const * const kValidationLayers[] =
-{
-  "VK_LAYER_KHRONOS_validation",
+char const * const kValidationLayers[] = {
+    "VK_LAYER_KHRONOS_validation",
 };
 
 std::vector<char const *> CheckLayers(std::vector<VkLayerProperties> const & props)
@@ -53,20 +51,16 @@ std::vector<char const *> CheckLayers(std::vector<VkLayerProperties> const & pro
   result.reserve(props.size());
   for (uint32_t i = 0; i < ARRAY_SIZE(kValidationLayers); ++i)
   {
-    auto const it = std::find_if(props.begin(), props.end(),
-                                 [i](VkLayerProperties const & p)
-    {
-      return strcmp(kValidationLayers[i], p.layerName) == 0;
-    });
+    auto const it = std::find_if(props.begin(), props.end(), [i](VkLayerProperties const & p)
+    { return strcmp(kValidationLayers[i], p.layerName) == 0; });
     if (it != props.end())
       result.push_back(kValidationLayers[i]);
   }
   return result;
 }
 
-std::vector<char const *> CheckExtensions(std::vector<VkExtensionProperties> const & props,
-                                          bool enableDiagnostics, char const * const * extensions,
-                                          uint32_t extensionsCount)
+std::vector<char const *> CheckExtensions(std::vector<VkExtensionProperties> const & props, bool enableDiagnostics,
+                                          char const * const * extensions, uint32_t extensionsCount)
 {
   std::vector<char const *> result;
   result.reserve(props.size());
@@ -81,11 +75,8 @@ std::vector<char const *> CheckExtensions(std::vector<VkExtensionProperties> con
         continue;
     }
 
-    auto const it = std::find_if(props.begin(), props.end(),
-                                 [i, extensions](VkExtensionProperties const & p)
-    {
-      return strcmp(extensions[i], p.extensionName) == 0;
-    });
+    auto const it = std::find_if(props.begin(), props.end(), [i, extensions](VkExtensionProperties const & p)
+    { return strcmp(extensions[i], p.extensionName) == 0; });
     if (it != props.end())
       result.push_back(extensions[i]);
   }
@@ -124,16 +115,13 @@ std::string GetReportObjectTypeString(VkDebugReportObjectTypeEXT objectType)
   case VK_DEBUG_REPORT_OBJECT_TYPE_COMMAND_POOL_EXT: return "COMMAND_POOL";
   case VK_DEBUG_REPORT_OBJECT_TYPE_SURFACE_KHR_EXT: return "SURFACE_KHR";
   case VK_DEBUG_REPORT_OBJECT_TYPE_SWAPCHAIN_KHR_EXT: return "SWAPCHAIN_KHR";
-  case VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT_EXT:
-    return "DEBUG_REPORT_CALLBACK_EXT";
+  case VK_DEBUG_REPORT_OBJECT_TYPE_DEBUG_REPORT_CALLBACK_EXT_EXT: return "DEBUG_REPORT_CALLBACK_EXT";
   case VK_DEBUG_REPORT_OBJECT_TYPE_DISPLAY_KHR_EXT: return "DISPLAY_KHR";
   case VK_DEBUG_REPORT_OBJECT_TYPE_DISPLAY_MODE_KHR_EXT: return "DISPLAY_MODE_KHR";
   case VK_DEBUG_REPORT_OBJECT_TYPE_VALIDATION_CACHE_EXT_EXT: return "VALIDATION_CACHE_EXT";
   case VK_DEBUG_REPORT_OBJECT_TYPE_SAMPLER_YCBCR_CONVERSION_EXT: return "SAMPLER_YCBCR_CONVERSION";
-  case VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_EXT:
-    return "DESCRIPTOR_UPDATE_TEMPLATE";
-  case VK_DEBUG_REPORT_OBJECT_TYPE_ACCELERATION_STRUCTURE_NV_EXT:
-    return "ACCELERATION_STRUCTURE_NV";
+  case VK_DEBUG_REPORT_OBJECT_TYPE_DESCRIPTOR_UPDATE_TEMPLATE_EXT: return "DESCRIPTOR_UPDATE_TEMPLATE";
+  case VK_DEBUG_REPORT_OBJECT_TYPE_ACCELERATION_STRUCTURE_NV_EXT: return "ACCELERATION_STRUCTURE_NV";
   case VK_DEBUG_REPORT_OBJECT_TYPE_MAX_ENUM_EXT: return "MAX_ENUM";
   case VK_DEBUG_REPORT_OBJECT_TYPE_CU_MODULE_NVX_EXT: return "CU_MODULE_NVX";
   case VK_DEBUG_REPORT_OBJECT_TYPE_CU_FUNCTION_NVX_EXT: return "CU_FUNCTION_NVX";
@@ -148,41 +136,31 @@ std::string GetReportObjectTypeString(VkDebugReportObjectTypeEXT objectType)
 
 bool IsContained(char const * name, std::vector<char const *> const & collection)
 {
-  return collection.end() != std::find_if(collection.begin(), collection.end(),
-                                          [name](char const * v) { return strcmp(name, v) == 0; });
+  return collection.end() !=
+         std::find_if(collection.begin(), collection.end(), [name](char const * v) { return strcmp(name, v) == 0; });
 }
 }  // namespace
 
-static VkBool32 VKAPI_PTR DebugReportCallbackImpl(VkDebugReportFlagsEXT flags,
-                                           VkDebugReportObjectTypeEXT objectType, uint64_t object,
-                                           size_t location, int32_t /*messageCode*/,
-                                           const char * pLayerPrefix, const char * pMessage,
-                                           void * /*pUserData*/)
+static VkBool32 VKAPI_PTR DebugReportCallbackImpl(VkDebugReportFlagsEXT flags, VkDebugReportObjectTypeEXT objectType,
+                                                  uint64_t object, size_t location, int32_t /*messageCode*/,
+                                                  char const * pLayerPrefix, char const * pMessage,
+                                                  void * /*pUserData*/)
 {
   auto logLevel = base::LogLevel::LINFO;
-  if ((flags & VK_DEBUG_REPORT_WARNING_BIT_EXT) ||
-      (flags & VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT))
-  {
+  if ((flags & VK_DEBUG_REPORT_WARNING_BIT_EXT) || (flags & VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT))
     logLevel = base::LogLevel::LWARNING;
-  }
   else if (flags & VK_DEBUG_REPORT_ERROR_BIT_EXT)
-  {
     logLevel = base::LogLevel::LERROR;
-  }
 #ifdef ENABLE_VULKAN_DEBUG_DIAGNOSTICS_MESSAGES
   else if (flags & VK_DEBUG_REPORT_DEBUG_BIT_EXT)
-  {
     logLevel = base::LogLevel::LDEBUG;
-  }
 #else
   else
-  {
     return VK_FALSE;
-  }
 #endif
 
-  LOG(logLevel, ("Vulkan Diagnostics [", pLayerPrefix, "] [", GetReportObjectTypeString(objectType),
-                 "] [OBJ:", object, "LOC:", location, "]:", pMessage));
+  LOG(logLevel, ("Vulkan Diagnostics [", pLayerPrefix, "] [", GetReportObjectTypeString(objectType), "] [OBJ:", object,
+                 "LOC:", location, "]:", pMessage));
   return VK_FALSE;
 }
 
@@ -235,8 +213,7 @@ Layers::Layers(bool enableDiagnostics)
   if (instExtensionsCount != 0)
   {
     extensionsProperties.resize(instExtensionsCount);
-    statusCode = vkEnumerateInstanceExtensionProperties(nullptr, &instExtensionsCount,
-                                                        extensionsProperties.data());
+    statusCode = vkEnumerateInstanceExtensionProperties(nullptr, &instExtensionsCount, extensionsProperties.data());
     if (statusCode != VK_SUCCESS)
     {
       LOG_ERROR_VK_CALL(vkEnumerateInstanceExtensionProperties, statusCode);
@@ -267,8 +244,8 @@ Layers::Layers(bool enableDiagnostics)
     extensionsProperties.insert(extensionsProperties.end(), props.begin(), props.end());
   }
 
-  m_instanceExtensions = CheckExtensions(extensionsProperties, m_enableDiagnostics,
-                                         kInstanceExtensions, ARRAY_SIZE(kInstanceExtensions));
+  m_instanceExtensions =
+      CheckExtensions(extensionsProperties, m_enableDiagnostics, kInstanceExtensions, ARRAY_SIZE(kInstanceExtensions));
 
   for (auto ext : m_instanceExtensions)
   {
@@ -314,8 +291,7 @@ bool Layers::Initialize(VkInstance instance, VkPhysicalDevice physicalDevice)
   {
     // Get device layers count.
     uint32_t devLayerCount = 0;
-    auto statusCode = vkEnumerateDeviceLayerProperties(physicalDevice, &devLayerCount,
-                                                       nullptr);
+    auto statusCode = vkEnumerateDeviceLayerProperties(physicalDevice, &devLayerCount, nullptr);
     if (statusCode != VK_SUCCESS)
     {
       LOG_ERROR_VK_CALL(vkEnumerateDeviceLayerProperties, statusCode);
@@ -327,8 +303,7 @@ bool Layers::Initialize(VkInstance instance, VkPhysicalDevice physicalDevice)
     if (devLayerCount != 0)
     {
       layerProperties.resize(devLayerCount);
-      statusCode = vkEnumerateDeviceLayerProperties(physicalDevice, &devLayerCount,
-                                                    layerProperties.data());
+      statusCode = vkEnumerateDeviceLayerProperties(physicalDevice, &devLayerCount, layerProperties.data());
       if (statusCode != VK_SUCCESS)
       {
         LOG_ERROR_VK_CALL(vkEnumerateDeviceLayerProperties, statusCode);
@@ -343,8 +318,7 @@ bool Layers::Initialize(VkInstance instance, VkPhysicalDevice physicalDevice)
 
   // Get device extensions count.
   uint32_t devExtensionsCount = 0;
-  auto statusCode = vkEnumerateDeviceExtensionProperties(physicalDevice, nullptr,
-                                                         &devExtensionsCount, nullptr);
+  auto statusCode = vkEnumerateDeviceExtensionProperties(physicalDevice, nullptr, &devExtensionsCount, nullptr);
   if (statusCode != VK_SUCCESS)
   {
     LOG_ERROR_VK_CALL(vkEnumerateDeviceExtensionProperties, statusCode);
@@ -356,9 +330,8 @@ bool Layers::Initialize(VkInstance instance, VkPhysicalDevice physicalDevice)
   if (devExtensionsCount != 0)
   {
     extensionsProperties.resize(devExtensionsCount);
-    statusCode = vkEnumerateDeviceExtensionProperties(physicalDevice, nullptr,
-                                                      &devExtensionsCount,
-                                                      extensionsProperties.data());
+    statusCode =
+        vkEnumerateDeviceExtensionProperties(physicalDevice, nullptr, &devExtensionsCount, extensionsProperties.data());
     if (statusCode != VK_SUCCESS)
     {
       LOG_ERROR_VK_CALL(vkEnumerateDeviceExtensionProperties, statusCode);
@@ -370,8 +343,7 @@ bool Layers::Initialize(VkInstance instance, VkPhysicalDevice physicalDevice)
   for (auto layerName : m_deviceLayers)
   {
     uint32_t cnt = 0;
-    statusCode = vkEnumerateDeviceExtensionProperties(physicalDevice, layerName,
-                                                      &cnt, nullptr);
+    statusCode = vkEnumerateDeviceExtensionProperties(physicalDevice, layerName, &cnt, nullptr);
     if (statusCode != VK_SUCCESS)
     {
       LOG_ERROR_VK_CALL(vkEnumerateDeviceExtensionProperties, statusCode);
@@ -381,8 +353,7 @@ bool Layers::Initialize(VkInstance instance, VkPhysicalDevice physicalDevice)
       continue;
 
     std::vector<VkExtensionProperties> props(cnt);
-    statusCode = vkEnumerateDeviceExtensionProperties(physicalDevice, layerName,
-                                                      &cnt, props.data());
+    statusCode = vkEnumerateDeviceExtensionProperties(physicalDevice, layerName, &cnt, props.data());
     if (statusCode != VK_SUCCESS)
     {
       LOG_ERROR_VK_CALL(vkEnumerateDeviceExtensionProperties, statusCode);
@@ -391,8 +362,8 @@ bool Layers::Initialize(VkInstance instance, VkPhysicalDevice physicalDevice)
     extensionsProperties.insert(extensionsProperties.end(), props.begin(), props.end());
   }
 
-  m_deviceExtensions = CheckExtensions(extensionsProperties, m_enableDiagnostics,
-                                       kDeviceExtensions, ARRAY_SIZE(kDeviceExtensions));
+  m_deviceExtensions =
+      CheckExtensions(extensionsProperties, m_enableDiagnostics, kDeviceExtensions, ARRAY_SIZE(kDeviceExtensions));
   for (auto ext : m_deviceExtensions)
     LOG(LINFO, ("Vulkan device extension prepared", ext));
 
@@ -401,14 +372,11 @@ bool Layers::Initialize(VkInstance instance, VkPhysicalDevice physicalDevice)
     if (m_vkCreateDebugReportCallbackEXT == nullptr)
     {
       m_vkCreateDebugReportCallbackEXT =
-        (PFN_vkCreateDebugReportCallbackEXT)vkGetInstanceProcAddr(instance,
-        "vkCreateDebugReportCallbackEXT");
+          (PFN_vkCreateDebugReportCallbackEXT)vkGetInstanceProcAddr(instance, "vkCreateDebugReportCallbackEXT");
       m_vkDestroyDebugReportCallbackEXT =
-        (PFN_vkDestroyDebugReportCallbackEXT)vkGetInstanceProcAddr(instance,
-        "vkDestroyDebugReportCallbackEXT");
+          (PFN_vkDestroyDebugReportCallbackEXT)vkGetInstanceProcAddr(instance, "vkDestroyDebugReportCallbackEXT");
       m_vkDebugReportMessageEXT =
-        (PFN_vkDebugReportMessageEXT)vkGetInstanceProcAddr(instance,
-        "vkDebugReportMessageEXT");
+          (PFN_vkDebugReportMessageEXT)vkGetInstanceProcAddr(instance, "vkDebugReportMessageEXT");
     }
 
     if (m_vkCreateDebugReportCallbackEXT == nullptr)
@@ -420,10 +388,8 @@ bool Layers::Initialize(VkInstance instance, VkPhysicalDevice physicalDevice)
     VkDebugReportCallbackCreateInfoEXT dbgInfo = {};
     dbgInfo.sType = VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT;
     dbgInfo.pNext = nullptr;
-    dbgInfo.flags = VK_DEBUG_REPORT_INFORMATION_BIT_EXT |
-                    VK_DEBUG_REPORT_WARNING_BIT_EXT |
-                    VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT |
-                    VK_DEBUG_REPORT_ERROR_BIT_EXT |
+    dbgInfo.flags = VK_DEBUG_REPORT_INFORMATION_BIT_EXT | VK_DEBUG_REPORT_WARNING_BIT_EXT |
+                    VK_DEBUG_REPORT_PERFORMANCE_WARNING_BIT_EXT | VK_DEBUG_REPORT_ERROR_BIT_EXT |
                     VK_DEBUG_REPORT_DEBUG_BIT_EXT;
     dbgInfo.pfnCallback = DebugReportCallbackImpl;
     dbgInfo.pUserData = nullptr;
@@ -470,9 +436,9 @@ char const * const * Layers::GetDeviceExtensions() const
   return m_deviceExtensions.data();
 }
 
-bool Layers::IsValidationFeaturesEnabled() const 
+bool Layers::IsValidationFeaturesEnabled() const
 {
-  return m_validationFeaturesEnabled; 
+  return m_validationFeaturesEnabled;
 }
 }  // namespace vulkan
 }  // namespace dp
diff --git a/libs/drape/vulkan/vulkan_layers.hpp b/libs/drape/vulkan/vulkan_layers.hpp
old mode 100755
new mode 100644
index b845570cc..53c733c18
--- a/libs/drape/vulkan/vulkan_layers.hpp
+++ b/libs/drape/vulkan/vulkan_layers.hpp
@@ -40,7 +40,7 @@ private:
   std::vector<char const *> m_deviceLayers;
   std::vector<char const *> m_deviceExtensions;
 
-  VkDebugReportCallbackEXT m_reportCallback {0};
+  VkDebugReportCallbackEXT m_reportCallback{0};
 
   PFN_vkCreateDebugReportCallbackEXT m_vkCreateDebugReportCallbackEXT = nullptr;
   PFN_vkDestroyDebugReportCallbackEXT m_vkDestroyDebugReportCallbackEXT = nullptr;
diff --git a/libs/drape/vulkan/vulkan_memory_manager.cpp b/libs/drape/vulkan/vulkan_memory_manager.cpp
index 0ba78bcd9..fdeae1fc3 100644
--- a/libs/drape/vulkan/vulkan_memory_manager.cpp
+++ b/libs/drape/vulkan/vulkan_memory_manager.cpp
@@ -13,25 +13,22 @@ namespace vulkan
 {
 namespace
 {
-std::array<uint32_t, VulkanMemoryManager::kResourcesCount> const kMinBlockSizeInBytes =
-{{
-  1024 * 1024,  // Geometry
-  128 * 1024,   // Uniform
-  0,            // Staging (no minimal size)
-  0,            // Image (no minimal size)
+std::array<uint32_t, VulkanMemoryManager::kResourcesCount> const kMinBlockSizeInBytes = {{
+    1024 * 1024,  // Geometry
+    128 * 1024,   // Uniform
+    0,            // Staging (no minimal size)
+    0,            // Image (no minimal size)
 }};
 
-std::array<uint32_t, VulkanMemoryManager::kResourcesCount> const kDesiredSizeInBytes =
-{{
-  80 * 1024 * 1024,                      // Geometry
-  std::numeric_limits<uint32_t>::max(),  // Uniform (unlimited)
-  20 * 1024 * 1024,                      // Staging
-  100 * 1024 * 1024,                     // Image
+std::array<uint32_t, VulkanMemoryManager::kResourcesCount> const kDesiredSizeInBytes = {{
+    80 * 1024 * 1024,                      // Geometry
+    std::numeric_limits<uint32_t>::max(),  // Uniform (unlimited)
+    20 * 1024 * 1024,                      // Staging
+    100 * 1024 * 1024,                     // Image
 }};
 
-VkMemoryPropertyFlags GetMemoryPropertyFlags(
-    VulkanMemoryManager::ResourceType resourceType,
-    std::optional<VkMemoryPropertyFlags> & fallbackTypeBits)
+VkMemoryPropertyFlags GetMemoryPropertyFlags(VulkanMemoryManager::ResourceType resourceType,
+                                             std::optional<VkMemoryPropertyFlags> & fallbackTypeBits)
 {
   switch (resourceType)
   {
@@ -51,8 +48,7 @@ VkMemoryPropertyFlags GetMemoryPropertyFlags(
     // No fallback.
     return VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT;
 
-  case VulkanMemoryManager::ResourceType::Count:
-    CHECK(false, ());
+  case VulkanMemoryManager::ResourceType::Count: CHECK(false, ());
   }
   return 0;
 }
@@ -61,18 +57,9 @@ struct LessBlockSize
 {
   using BlockPtrT = drape_ptr<VulkanMemoryManager::MemoryBlock>;
 
-  bool operator()(BlockPtrT const & b1, BlockPtrT const & b2) const
-  {
-    return b1->m_blockSize < b2->m_blockSize;
-  }
-  bool operator()(BlockPtrT const & b1, uint32_t b2) const
-  {
-    return b1->m_blockSize < b2;
-  }
-  bool operator()(uint32_t b1, BlockPtrT const & b2) const
-  {
-    return b1 < b2->m_blockSize;
-  }
+  bool operator()(BlockPtrT const & b1, BlockPtrT const & b2) const { return b1->m_blockSize < b2->m_blockSize; }
+  bool operator()(BlockPtrT const & b1, uint32_t b2) const { return b1->m_blockSize < b2; }
+  bool operator()(uint32_t b1, BlockPtrT const & b2) const { return b1 < b2->m_blockSize; }
 };
 }  // namespace
 
@@ -105,8 +92,8 @@ VulkanMemoryManager::~VulkanMemoryManager()
   ASSERT_EQUAL(m_totalAllocationCounter, 0, ());
 }
 
-std::optional<uint32_t> VulkanMemoryManager::GetMemoryTypeIndex(
-    uint32_t typeBits, VkMemoryPropertyFlags properties) const
+std::optional<uint32_t> VulkanMemoryManager::GetMemoryTypeIndex(uint32_t typeBits,
+                                                                VkMemoryPropertyFlags properties) const
 {
   for (uint32_t i = 0; i < m_memoryProperties.memoryTypeCount; i++)
   {
@@ -130,16 +117,14 @@ uint32_t VulkanMemoryManager::GetOffsetAlignment(ResourceType resourceType) cons
     return kUniformAlignment;
   }
 
-  static uint32_t const kAlignment =
-      math::LCM(static_cast<uint32_t>(m_deviceLimits.minMemoryMapAlignment),
-                static_cast<uint32_t>(m_deviceLimits.nonCoherentAtomSize));
+  static uint32_t const kAlignment = math::LCM(static_cast<uint32_t>(m_deviceLimits.minMemoryMapAlignment),
+                                               static_cast<uint32_t>(m_deviceLimits.nonCoherentAtomSize));
   return kAlignment;
 }
 
 uint32_t VulkanMemoryManager::GetSizeAlignment(VkMemoryRequirements const & memReqs) const
 {
-  return math::LCM(static_cast<uint32_t>(memReqs.alignment),
-                   static_cast<uint32_t>(m_deviceLimits.nonCoherentAtomSize));
+  return math::LCM(static_cast<uint32_t>(memReqs.alignment), static_cast<uint32_t>(m_deviceLimits.nonCoherentAtomSize));
 }
 
 // static
@@ -151,8 +136,7 @@ uint32_t VulkanMemoryManager::GetAligned(uint32_t value, uint32_t alignment)
 }
 
 VulkanMemoryManager::AllocationPtr VulkanMemoryManager::Allocate(ResourceType resourceType,
-                                                                 VkMemoryRequirements memReqs,
-                                                                 uint64_t blockHash)
+                                                                 VkMemoryRequirements memReqs, uint64_t blockHash)
 {
   size_t const intResType = static_cast<size_t>(resourceType);
   auto const alignedSize = GetAligned(static_cast<uint32_t>(memReqs.size), GetSizeAlignment(memReqs));
@@ -171,8 +155,7 @@ VulkanMemoryManager::AllocationPtr VulkanMemoryManager::Allocate(ResourceType re
       {
         block->m_freeOffset = alignedOffset + alignedSize;
         block->m_allocationCounter++;
-        return std::make_shared<Allocation>(resourceType, blockHash, alignedOffset, alignedSize,
-                                            make_ref(block));
+        return std::make_shared<Allocation>(resourceType, blockHash, alignedOffset, alignedSize, make_ref(block));
       }
     }
 
@@ -191,8 +174,7 @@ VulkanMemoryManager::AllocationPtr VulkanMemoryManager::Allocate(ResourceType re
 
       freeBlock->m_freeOffset = alignedSize;
       freeBlock->m_allocationCounter++;
-      auto p = std::make_shared<Allocation>(resourceType, blockHash, 0, alignedSize,
-                                            make_ref(freeBlock));
+      auto p = std::make_shared<Allocation>(resourceType, blockHash, 0, alignedSize, make_ref(freeBlock));
 
       m[blockHash].push_back(std::move(freeBlock));
       return p;
@@ -222,8 +204,8 @@ VulkanMemoryManager::AllocationPtr VulkanMemoryManager::Allocate(ResourceType re
   IncrementTotalAllocationsCount();
 
   CHECK_VK_CALL_EX(vkAllocateMemory(m_device, &memAllocInfo, nullptr, &memory),
-                   ("Requested size =", blockSize, "Allocated sizes =", m_sizes, "Total allocs =", m_totalAllocationCounter,
-                    m_memory[intResType].size(), m_freeBlocks[intResType].size()));
+                   ("Requested size =", blockSize, "Allocated sizes =", m_sizes, "Total allocs =",
+                    m_totalAllocationCounter, m_memory[intResType].size(), m_freeBlocks[intResType].size()));
 
   m_sizes[intResType] += blockSize;
 
@@ -237,8 +219,7 @@ VulkanMemoryManager::AllocationPtr VulkanMemoryManager::Allocate(ResourceType re
   newBlock->m_allocationCounter++;
   newBlock->m_isCoherent = ((flags & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT) != 0);
 
-  auto p = std::make_shared<Allocation>(resourceType, blockHash, 0, alignedSize,
-                                        make_ref(newBlock));
+  auto p = std::make_shared<Allocation>(resourceType, blockHash, 0, alignedSize, make_ref(newBlock));
   m[blockHash].push_back(std::move(newBlock));
   return p;
 }
@@ -257,8 +238,7 @@ void VulkanMemoryManager::Deallocate(AllocationPtr ptr)
   auto & m = m_memory[resourceIndex];
   auto const it = m.find(ptr->m_blockHash);
   CHECK(it != m.end(), ());
-  auto blockIt = std::find_if(it->second.begin(), it->second.end(),
-                              [&ptr](drape_ptr<MemoryBlock> const & b)
+  auto blockIt = std::find_if(it->second.begin(), it->second.end(), [&ptr](drape_ptr<MemoryBlock> const & b)
   {
     ASSERT(ptr->m_memoryBlock != nullptr, ());
     return b->m_memory == ptr->m_memoryBlock->m_memory;
@@ -335,7 +315,8 @@ void VulkanMemoryManager::EndDeallocationSession()
           fm.push_back(std::move(block));
         }
         return true;
-      }), m.end());
+      }),
+              m.end());
 
       if (m.empty())
         hashesToDelete.push_back(p.first);
diff --git a/libs/drape/vulkan/vulkan_memory_manager.hpp b/libs/drape/vulkan/vulkan_memory_manager.hpp
index aae042f33..9ff81a128 100644
--- a/libs/drape/vulkan/vulkan_memory_manager.hpp
+++ b/libs/drape/vulkan/vulkan_memory_manager.hpp
@@ -33,8 +33,7 @@ public:
 
     Count
   };
-  static size_t constexpr kResourcesCount =
-      static_cast<uint32_t>(VulkanMemoryManager::ResourceType::Count);
+  static size_t constexpr kResourcesCount = static_cast<uint32_t>(VulkanMemoryManager::ResourceType::Count);
 
   struct MemoryBlock
   {
@@ -54,8 +53,8 @@ public:
     ResourceType const m_resourceType;
     ref_ptr<MemoryBlock> m_memoryBlock;
 
-    Allocation(ResourceType resourceType, uint64_t blockHash, uint32_t offset,
-               uint32_t size, ref_ptr<MemoryBlock> memoryBlock)
+    Allocation(ResourceType resourceType, uint64_t blockHash, uint32_t offset, uint32_t size,
+               ref_ptr<MemoryBlock> memoryBlock)
       : m_blockHash(blockHash)
       , m_alignedOffset(offset)
       , m_alignedSize(size)
@@ -66,8 +65,7 @@ public:
 
   using AllocationPtr = std::shared_ptr<Allocation>;
 
-  AllocationPtr Allocate(ResourceType resourceType, VkMemoryRequirements memReqs,
-                         uint64_t blockHash);
+  AllocationPtr Allocate(ResourceType resourceType, VkMemoryRequirements memReqs, uint64_t blockHash);
   void BeginDeallocationSession();
   void Deallocate(AllocationPtr ptr);
   void EndDeallocationSession();
@@ -79,8 +77,7 @@ public:
   VkPhysicalDeviceLimits const & GetDeviceLimits() const;
 
 private:
-  std::optional<uint32_t> GetMemoryTypeIndex(uint32_t typeBits,
-                                             VkMemoryPropertyFlags properties) const;
+  std::optional<uint32_t> GetMemoryTypeIndex(uint32_t typeBits, VkMemoryPropertyFlags properties) const;
   void IncrementTotalAllocationsCount();
   void DecrementTotalAllocationsCount();
 
diff --git a/libs/drape/vulkan/vulkan_mesh_object_impl.cpp b/libs/drape/vulkan/vulkan_mesh_object_impl.cpp
index e2f998c16..cd2955a88 100644
--- a/libs/drape/vulkan/vulkan_mesh_object_impl.cpp
+++ b/libs/drape/vulkan/vulkan_mesh_object_impl.cpp
@@ -1,8 +1,8 @@
 #include "drape/mesh_object.hpp"
 #include "drape/pointers.hpp"
 #include "drape/vulkan/vulkan_base_context.hpp"
-#include "drape/vulkan/vulkan_staging_buffer.hpp"
 #include "drape/vulkan/vulkan_param_descriptor.hpp"
+#include "drape/vulkan/vulkan_staging_buffer.hpp"
 #include "drape/vulkan/vulkan_utils.hpp"
 
 #include "base/assert.hpp"
@@ -22,9 +22,9 @@ VkPrimitiveTopology GetPrimitiveType(MeshObject::DrawPrimitive primitive)
 {
   switch (primitive)
   {
-    case MeshObject::DrawPrimitive::Triangles: return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
-    case MeshObject::DrawPrimitive::TriangleStrip: return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP;
-    case MeshObject::DrawPrimitive::LineStrip: return VK_PRIMITIVE_TOPOLOGY_LINE_STRIP;
+  case MeshObject::DrawPrimitive::Triangles: return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST;
+  case MeshObject::DrawPrimitive::TriangleStrip: return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP;
+  case MeshObject::DrawPrimitive::LineStrip: return VK_PRIMITIVE_TOPOLOGY_LINE_STRIP;
   }
   UNREACHABLE();
 }
@@ -50,15 +50,15 @@ public:
       if (sizeInBytes == 0)
         continue;
 
-      m_geometryBuffers[i] = m_objectManager->CreateBuffer(VulkanMemoryManager::ResourceType::Geometry,
-                                                           sizeInBytes, 0 /* batcherHash */);
-      SET_DEBUG_NAME_VK(VK_OBJECT_TYPE_BUFFER, m_geometryBuffers[i].m_buffer, 
+      m_geometryBuffers[i] =
+          m_objectManager->CreateBuffer(VulkanMemoryManager::ResourceType::Geometry, sizeInBytes, 0 /* batcherHash */);
+      SET_DEBUG_NAME_VK(VK_OBJECT_TYPE_BUFFER, m_geometryBuffers[i].m_buffer,
                         ("VB: Mesh (" + m_mesh->m_debugName + ") " + std::to_string(i)).c_str());
 
       m_objectManager->Fill(m_geometryBuffers[i], m_mesh->m_buffers[i]->GetData(), sizeInBytes);
 
-      m_bindingInfo[i] = dp::BindingInfo(static_cast<uint8_t>(m_mesh->m_buffers[i]->m_attributes.size()),
-                                         static_cast<uint8_t>(i));
+      m_bindingInfo[i] =
+          dp::BindingInfo(static_cast<uint8_t>(m_mesh->m_buffers[i]->m_attributes.size()), static_cast<uint8_t>(i));
       for (size_t j = 0; j < m_mesh->m_buffers[i]->m_attributes.size(); ++j)
       {
         auto const & attr = m_mesh->m_buffers[i]->m_attributes[j];
@@ -67,7 +67,7 @@ public:
         binding.m_componentCount = static_cast<uint8_t>(attr.m_componentsCount);
         binding.m_componentType = gl_const::GLFloatType;
         binding.m_offset = static_cast<uint8_t>(attr.m_offset);
-        CHECK_LESS_OR_EQUAL(m_mesh->m_buffers[i]->GetStrideInBytes(), 
+        CHECK_LESS_OR_EQUAL(m_mesh->m_buffers[i]->GetStrideInBytes(),
                             static_cast<uint32_t>(std::numeric_limits<uint8_t>::max()), ());
         binding.m_stride = static_cast<uint8_t>(m_mesh->m_buffers[i]->GetStrideInBytes());
       }
@@ -76,9 +76,9 @@ public:
     if (!m_mesh->m_indices.empty())
     {
       auto const sizeInBytes = static_cast<uint32_t>(m_mesh->m_indices.size() * sizeof(uint16_t));
-      m_indexBuffer = m_objectManager->CreateBuffer(VulkanMemoryManager::ResourceType::Geometry,
-                                                    sizeInBytes, 0 /* batcherHash */);
-      SET_DEBUG_NAME_VK(VK_OBJECT_TYPE_BUFFER, m_indexBuffer.m_buffer, 
+      m_indexBuffer =
+          m_objectManager->CreateBuffer(VulkanMemoryManager::ResourceType::Geometry, sizeInBytes, 0 /* batcherHash */);
+      SET_DEBUG_NAME_VK(VK_OBJECT_TYPE_BUFFER, m_indexBuffer.m_buffer,
                         ("IB: Mesh (" + m_mesh->m_debugName + ")").c_str());
 
       m_objectManager->Fill(m_indexBuffer, m_mesh->m_indices.data(), sizeInBytes);
@@ -103,8 +103,7 @@ public:
     auto const sizeInBytes = buffer->GetSizeInBytes();
     CHECK(sizeInBytes != 0, ());
 
-    UpdateBufferInternal(context, m_geometryBuffers[bufferInd].m_buffer, 
-                         VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT,
+    UpdateBufferInternal(context, m_geometryBuffers[bufferInd].m_buffer, VK_ACCESS_VERTEX_ATTRIBUTE_READ_BIT,
                          buffer->GetData(), sizeInBytes);
   }
 
@@ -113,14 +112,12 @@ public:
     CHECK(!m_mesh->m_indices.empty(), ());
     auto const sizeInBytes = m_mesh->m_indices.size() * sizeof(uint16_t);
     CHECK(m_indexBuffer.m_buffer != VK_NULL_HANDLE, ());
-    
-    UpdateBufferInternal(context, m_indexBuffer.m_buffer, 
-                         VK_ACCESS_INDEX_READ_BIT,
-                         m_mesh->m_indices.data(), sizeInBytes);
+
+    UpdateBufferInternal(context, m_indexBuffer.m_buffer, VK_ACCESS_INDEX_READ_BIT, m_mesh->m_indices.data(),
+                         sizeInBytes);
   }
 
-  void DrawPrimitives(ref_ptr<dp::GraphicsContext> context, uint32_t vertexCount,
-                      uint32_t startVertex) override
+  void DrawPrimitives(ref_ptr<dp::GraphicsContext> context, uint32_t vertexCount, uint32_t startVertex) override
   {
     ref_ptr<dp::vulkan::VulkanBaseContext> vulkanContext = context;
     VkCommandBuffer commandBuffer = vulkanContext->GetCurrentRenderingCommandBuffer();
@@ -131,8 +128,7 @@ public:
     vkCmdDraw(commandBuffer, vertexCount, 1, startVertex, 0);
   }
 
-  void DrawPrimitivesIndexed(ref_ptr<dp::GraphicsContext> context, uint32_t indexCount, 
-                             uint32_t startIndex) override
+  void DrawPrimitivesIndexed(ref_ptr<dp::GraphicsContext> context, uint32_t indexCount, uint32_t startIndex) override
   {
     ref_ptr<dp::vulkan::VulkanBaseContext> vulkanContext = context;
     VkCommandBuffer commandBuffer = vulkanContext->GetCurrentRenderingCommandBuffer();
@@ -161,12 +157,10 @@ private:
     auto descriptorSet = m_descriptorUpdater.GetDescriptorSet();
 
     uint32_t dynamicOffset = vulkanContext->GetCurrentDynamicBufferOffset();
-    vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS,
-                            vulkanContext->GetCurrentPipelineLayout(), 0, 1,
-                            &descriptorSet, 1, &dynamicOffset);
+    vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, vulkanContext->GetCurrentPipelineLayout(),
+                            0, 1, &descriptorSet, 1, &dynamicOffset);
 
-    vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS,
-                      vulkanContext->GetCurrentPipeline());
+    vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, vulkanContext->GetCurrentPipeline());
 
     buffer_vector<VkBuffer, 8> buffers;
     buffer_vector<VkDeviceSize, 8> offsets;
@@ -175,12 +169,10 @@ private:
       buffers.emplace_back(m_geometryBuffers[i].m_buffer);
       offsets.emplace_back(0);
     }
-    vkCmdBindVertexBuffers(commandBuffer, 0, m_geometryBuffers.size(), buffers.data(), 
-                           offsets.data());
+    vkCmdBindVertexBuffers(commandBuffer, 0, m_geometryBuffers.size(), buffers.data(), offsets.data());
   }
 
-  void UpdateBufferInternal(ref_ptr<dp::GraphicsContext> context, VkBuffer buffer, 
-                            VkAccessFlagBits bufferAccessMask,
+  void UpdateBufferInternal(ref_ptr<dp::GraphicsContext> context, VkBuffer buffer, VkAccessFlagBits bufferAccessMask,
                             void const * data, uint32_t sizeInBytes)
   {
     ref_ptr<dp::vulkan::VulkanBaseContext> vulkanContext = context;
@@ -199,8 +191,7 @@ private:
     barrier.offset = 0;
     barrier.size = sizeInBytes;
     vkCmdPipelineBarrier(commandBuffer, VK_PIPELINE_STAGE_VERTEX_INPUT_BIT | VK_PIPELINE_STAGE_TRANSFER_BIT,
-                         VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, nullptr,
-                         1, &barrier, 0, nullptr);
+                         VK_PIPELINE_STAGE_TRANSFER_BIT, 0, 0, nullptr, 1, &barrier, 0, nullptr);
 
     // Copy to default or temporary staging buffer.
     auto stagingBuffer = vulkanContext->GetDefaultStagingBuffer();
@@ -237,9 +228,8 @@ private:
     // Set up a barrier to prevent data collisions (read-after-write).
     barrier.srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT;
     barrier.dstAccessMask = bufferAccessMask;
-    vkCmdPipelineBarrier(commandBuffer, VK_PIPELINE_STAGE_TRANSFER_BIT,
-                         VK_PIPELINE_STAGE_VERTEX_INPUT_BIT, 0, 0, nullptr,
-                         1, &barrier, 0, nullptr);
+    vkCmdPipelineBarrier(commandBuffer, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_VERTEX_INPUT_BIT, 0, 0,
+                         nullptr, 1, &barrier, 0, nullptr);
   }
 
   ref_ptr<dp::MeshObject> m_mesh;
@@ -255,7 +245,6 @@ private:
 void MeshObject::InitForVulkan(ref_ptr<dp::GraphicsContext> context)
 {
   ref_ptr<dp::vulkan::VulkanBaseContext> vulkanContext = context;
-  m_impl = make_unique_dp<vulkan::VulkanMeshObjectImpl>(vulkanContext->GetObjectManager(),
-                                                        make_ref(this));
+  m_impl = make_unique_dp<vulkan::VulkanMeshObjectImpl>(vulkanContext->GetObjectManager(), make_ref(this));
 }
 }  // namespace dp
diff --git a/libs/drape/vulkan/vulkan_object_manager.cpp b/libs/drape/vulkan/vulkan_object_manager.cpp
index 8a711351e..a3251ca49 100644
--- a/libs/drape/vulkan/vulkan_object_manager.cpp
+++ b/libs/drape/vulkan/vulkan_object_manager.cpp
@@ -62,10 +62,8 @@ VulkanObjectManager::~VulkanObjectManager()
     CollectDescriptorSetGroupsUnsafe(descriptorsToDestroy);
 
   for (size_t i = 0; i < ThreadType::Count; ++i)
-  {
     for (auto & q : m_queuesToDestroy[i])
       CollectObjectsImpl(q);
-  }
 
   for (auto const & s : m_samplers)
     vkDestroySampler(m_device, s.second, nullptr);
@@ -86,8 +84,8 @@ void VulkanObjectManager::SetCurrentInflightFrameIndex(uint32_t index)
   m_currentInflightFrameIndex = index;
 }
 
-VulkanObject VulkanObjectManager::CreateBuffer(VulkanMemoryManager::ResourceType resourceType,
-                                               uint32_t sizeInBytes, uint64_t batcherHash)
+VulkanObject VulkanObjectManager::CreateBuffer(VulkanMemoryManager::ResourceType resourceType, uint32_t sizeInBytes,
+                                               uint64_t batcherHash)
 {
   VulkanObject result;
   VkBufferCreateInfo info = {};
@@ -97,8 +95,8 @@ VulkanObject VulkanObjectManager::CreateBuffer(VulkanMemoryManager::ResourceType
   info.size = sizeInBytes;
   if (resourceType == VulkanMemoryManager::ResourceType::Geometry)
   {
-    info.usage = VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_INDEX_BUFFER_BIT |
-                 VK_BUFFER_USAGE_TRANSFER_DST_BIT;
+    info.usage =
+        VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_INDEX_BUFFER_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT;
   }
   else if (resourceType == VulkanMemoryManager::ResourceType::Uniform)
   {
@@ -117,11 +115,14 @@ VulkanObject VulkanObjectManager::CreateBuffer(VulkanMemoryManager::ResourceType
   info.queueFamilyIndexCount = 1;
   info.pQueueFamilyIndices = &m_queueFamilyIndex;
   CHECK_VK_CALL(vkCreateBuffer(m_device, &info, nullptr, &result.m_buffer));
-  
-  SET_DEBUG_NAME_VK(VK_OBJECT_TYPE_BUFFER, result.m_buffer, 
-    ((resourceType == VulkanMemoryManager::ResourceType::Geometry ? "B: Geometry (" :
-    (resourceType == VulkanMemoryManager::ResourceType::Uniform ? "B: Uniform (" : 
-     "B: Staging (")) + std::to_string(sizeInBytes) + " bytes)").c_str());
+
+  SET_DEBUG_NAME_VK(
+      VK_OBJECT_TYPE_BUFFER, result.m_buffer,
+      ((resourceType == VulkanMemoryManager::ResourceType::Geometry
+            ? "B: Geometry ("
+            : (resourceType == VulkanMemoryManager::ResourceType::Uniform ? "B: Uniform (" : "B: Staging (")) +
+       std::to_string(sizeInBytes) + " bytes)")
+          .c_str());
 
   VkMemoryRequirements memReqs = {};
   vkGetBufferMemoryRequirements(m_device, result.m_buffer, &memReqs);
@@ -129,8 +130,7 @@ VulkanObject VulkanObjectManager::CreateBuffer(VulkanMemoryManager::ResourceType
   {
     std::lock_guard<std::mutex> lock(m_mutex);
     result.m_allocation = m_memoryManager.Allocate(resourceType, memReqs, batcherHash);
-    CHECK_VK_CALL(vkBindBufferMemory(m_device, result.m_buffer, result.GetMemory(),
-                                     result.GetAlignedOffset()));
+    CHECK_VK_CALL(vkBindBufferMemory(m_device, result.m_buffer, result.GetMemory(), result.GetAlignedOffset()));
   }
 
 #ifdef ENABLE_TRACE
@@ -156,7 +156,7 @@ VulkanObject VulkanObjectManager::CreateImage(VkImageUsageFlags usageFlags, VkFo
   imageCreateInfo.tiling = tiling;
   imageCreateInfo.sharingMode = VK_SHARING_MODE_EXCLUSIVE;
   imageCreateInfo.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
-  imageCreateInfo.extent = { width, height, 1 };
+  imageCreateInfo.extent = {width, height, 1};
   imageCreateInfo.usage = usageFlags | VK_IMAGE_USAGE_TRANSFER_DST_BIT;
   CHECK_VK_CALL(vkCreateImage(m_device, &imageCreateInfo, nullptr, &result.m_image));
 
@@ -165,10 +165,9 @@ VulkanObject VulkanObjectManager::CreateImage(VkImageUsageFlags usageFlags, VkFo
 
   {
     std::lock_guard<std::mutex> lock(m_mutex);
-    result.m_allocation = m_memoryManager.Allocate(VulkanMemoryManager::ResourceType::Image,
-                                                   memReqs, 0 /* blockHash */);
-    CHECK_VK_CALL(vkBindImageMemory(m_device, result.m_image,
-                                    result.GetMemory(), result.GetAlignedOffset()));
+    result.m_allocation =
+        m_memoryManager.Allocate(VulkanMemoryManager::ResourceType::Image, memReqs, 0 /* blockHash */);
+    CHECK_VK_CALL(vkBindImageMemory(m_device, result.m_image, result.GetMemory(), result.GetAlignedOffset()));
   }
 
   VkImageViewCreateInfo viewCreateInfo = {};
@@ -183,8 +182,8 @@ VulkanObject VulkanObjectManager::CreateImage(VkImageUsageFlags usageFlags, VkFo
   }
   else
   {
-    viewCreateInfo.components = {VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_G,
-                                 VK_COMPONENT_SWIZZLE_B, VK_COMPONENT_SWIZZLE_A};
+    viewCreateInfo.components = {VK_COMPONENT_SWIZZLE_R, VK_COMPONENT_SWIZZLE_G, VK_COMPONENT_SWIZZLE_B,
+                                 VK_COMPONENT_SWIZZLE_A};
   }
   viewCreateInfo.subresourceRange.aspectMask = aspectFlags;
   viewCreateInfo.subresourceRange.baseMipLevel = 0;
@@ -202,7 +201,8 @@ VulkanObject VulkanObjectManager::CreateImage(VkImageUsageFlags usageFlags, VkFo
   return result;
 }
 
-DescriptorSetGroup VulkanObjectManager::CreateDescriptorSetGroup(ref_ptr<VulkanGpuProgram> program) {
+DescriptorSetGroup VulkanObjectManager::CreateDescriptorSetGroup(ref_ptr<VulkanGpuProgram> program)
+{
   CHECK(std::this_thread::get_id() == m_renderers[ThreadType::Frontend], ());
 
   DescriptorSetGroup s;
@@ -296,8 +296,8 @@ void VulkanObjectManager::CollectDescriptorSetGroupsUnsafe(DescriptorSetGroupArr
   for (auto const & d : descriptors)
   {
     CHECK_LESS(d.m_descriptorPoolIndex, m_descriptorPools.size(), ());
-    CHECK_VK_CALL(vkFreeDescriptorSets(m_device, m_descriptorPools[d.m_descriptorPoolIndex].m_pool,
-                                       1 /* count */, &d.m_descriptorSet));
+    CHECK_VK_CALL(vkFreeDescriptorSets(m_device, m_descriptorPools[d.m_descriptorPoolIndex].m_pool, 1 /* count */,
+                                       &d.m_descriptorSet));
     m_descriptorPools[d.m_descriptorPoolIndex].m_availableSetsCount++;
   }
   descriptors.clear();
@@ -326,10 +326,7 @@ void VulkanObjectManager::CollectObjectsForThread(VulkanObjectArray & objects)
 
   std::vector<VulkanObject> queueToDestroy;
   std::swap(objects, queueToDestroy);
-  DrapeRoutine::Run([this, queueToDestroy = std::move(queueToDestroy)]()
-  {
-    CollectObjectsImpl(queueToDestroy);
-  });
+  DrapeRoutine::Run([this, queueToDestroy = std::move(queueToDestroy)]() { CollectObjectsImpl(queueToDestroy); });
 }
 
 void VulkanObjectManager::CollectObjectsImpl(VulkanObjectArray const & objects)
@@ -345,9 +342,7 @@ void VulkanObjectManager::CollectObjectsImpl(VulkanObjectArray const & objects)
 #endif
     }
     if (obj.m_imageView != VK_NULL_HANDLE)
-    {
       vkDestroyImageView(m_device, obj.m_imageView, nullptr);
-    }
     if (obj.m_image != VK_NULL_HANDLE)
     {
       vkDestroyImage(m_device, obj.m_image, nullptr);
@@ -361,10 +356,8 @@ void VulkanObjectManager::CollectObjectsImpl(VulkanObjectArray const & objects)
   std::lock_guard<std::mutex> lock(m_mutex);
   m_memoryManager.BeginDeallocationSession();
   for (auto const & obj : objects)
-  {
     if (obj.m_allocation)
       m_memoryManager.Deallocate(obj.m_allocation);
-  }
   m_memoryManager.EndDeallocationSession();
 }
 
@@ -389,8 +382,8 @@ uint8_t * VulkanObjectManager::MapUnsafe(VulkanObject object)
 
   CHECK(object.m_buffer != VK_NULL_HANDLE || object.m_image != VK_NULL_HANDLE, ());
   uint8_t * ptr = nullptr;
-  CHECK_VK_CALL(vkMapMemory(m_device, object.GetMemory(), object.GetAlignedOffset(),
-                            object.GetAlignedSize(), 0, reinterpret_cast<void **>(&ptr)));
+  CHECK_VK_CALL(vkMapMemory(m_device, object.GetMemory(), object.GetAlignedOffset(), object.GetAlignedSize(), 0,
+                            reinterpret_cast<void **>(&ptr)));
   object.m_allocation->m_memoryBlock->m_isBlocked = true;
   return ptr;
 }
@@ -436,10 +429,9 @@ void VulkanObjectManager::CreateDescriptorPool()
 {
   CHECK_GREATER(m_maxUniformBuffers, 0, ());
   CHECK_GREATER(m_maxImageSamplers, 0, ());
-  std::vector<VkDescriptorPoolSize> poolSizes =
-  {
-    {VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, m_maxUniformBuffers * kMaxDescriptorsSetCount},
-    {VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, m_maxImageSamplers * kMaxDescriptorsSetCount},
+  std::vector<VkDescriptorPoolSize> poolSizes = {
+      {VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC, m_maxUniformBuffers * kMaxDescriptorsSetCount},
+      {VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER, m_maxImageSamplers * kMaxDescriptorsSetCount},
   };
 
   VkDescriptorPoolCreateInfo descriptorPoolInfo = {};
diff --git a/libs/drape/vulkan/vulkan_object_manager.hpp b/libs/drape/vulkan/vulkan_object_manager.hpp
index bb9cdddc2..593eeb687 100644
--- a/libs/drape/vulkan/vulkan_object_manager.hpp
+++ b/libs/drape/vulkan/vulkan_object_manager.hpp
@@ -53,8 +53,7 @@ class VulkanObjectManager
 {
 public:
   VulkanObjectManager(VkDevice device, VkPhysicalDeviceLimits const & deviceLimits,
-                      VkPhysicalDeviceMemoryProperties const & memoryProperties,
-                      uint32_t queueFamilyIndex);
+                      VkPhysicalDeviceMemoryProperties const & memoryProperties, uint32_t queueFamilyIndex);
   ~VulkanObjectManager();
 
   enum ThreadType
@@ -68,8 +67,7 @@ public:
 
   void SetCurrentInflightFrameIndex(uint32_t index);
 
-  VulkanObject CreateBuffer(VulkanMemoryManager::ResourceType resourceType,
-                            uint32_t sizeInBytes, uint64_t batcherHash);
+  VulkanObject CreateBuffer(VulkanMemoryManager::ResourceType resourceType, uint32_t sizeInBytes, uint64_t batcherHash);
   VulkanObject CreateImage(VkImageUsageFlags usageFlags, VkFormat format, VkImageTiling tiling,
                            VkImageAspectFlags aspectFlags, uint32_t width, uint32_t height);
   DescriptorSetGroup CreateDescriptorSetGroup(ref_ptr<VulkanGpuProgram> program);
@@ -90,7 +88,7 @@ public:
   void DestroyObjectUnsafe(VulkanObject object);
 
   VkDevice GetDevice() const { return m_device; }
-  VulkanMemoryManager const & GetMemoryManager() const { return m_memoryManager; };
+  VulkanMemoryManager const & GetMemoryManager() const { return m_memoryManager; }
   VkSampler GetSampler(SamplerKey const & key);
 
   void SetMaxUniformBuffers(uint32_t maxUniformBuffers);
diff --git a/libs/drape/vulkan/vulkan_param_descriptor.cpp b/libs/drape/vulkan/vulkan_param_descriptor.cpp
index fb59924af..ea7332505 100644
--- a/libs/drape/vulkan/vulkan_param_descriptor.cpp
+++ b/libs/drape/vulkan/vulkan_param_descriptor.cpp
@@ -48,8 +48,7 @@ void DescriptorSetGroup::Update(VkDevice device, std::vector<ParamDescriptor> co
     }
   }
 
-  vkUpdateDescriptorSets(device, static_cast<uint32_t>(writeDescriptorsCount),
-                         writeDescriptorSets.data(), 0, nullptr);
+  vkUpdateDescriptorSets(device, static_cast<uint32_t>(writeDescriptorsCount), writeDescriptorSets.data(), 0, nullptr);
 }
 
 ParamDescriptorUpdater::ParamDescriptorUpdater(ref_ptr<VulkanObjectManager> objectManager)
diff --git a/libs/drape/vulkan/vulkan_param_descriptor.hpp b/libs/drape/vulkan/vulkan_param_descriptor.hpp
index e3599613e..04035d9d7 100644
--- a/libs/drape/vulkan/vulkan_param_descriptor.hpp
+++ b/libs/drape/vulkan/vulkan_param_descriptor.hpp
@@ -45,8 +45,7 @@ struct DescriptorSetGroup
 
   explicit operator bool()
   {
-    return m_descriptorSet != VK_NULL_HANDLE &&
-           m_descriptorPoolIndex != std::numeric_limits<uint32_t>::max();
+    return m_descriptorSet != VK_NULL_HANDLE && m_descriptorPoolIndex != std::numeric_limits<uint32_t>::max();
   }
 
   void Update(VkDevice device, std::vector<ParamDescriptor> const & descriptors);
diff --git a/libs/drape/vulkan/vulkan_pipeline.cpp b/libs/drape/vulkan/vulkan_pipeline.cpp
index f345ea929..d72b7843a 100644
--- a/libs/drape/vulkan/vulkan_pipeline.cpp
+++ b/libs/drape/vulkan/vulkan_pipeline.cpp
@@ -150,8 +150,7 @@ std::string GetDumpFilePath()
 }
 }  // namespace
 
-VulkanPipeline::VulkanPipeline(VkDevice device, uint32_t appVersionCode)
-  : m_appVersionCode(appVersionCode)
+VulkanPipeline::VulkanPipeline(VkDevice device, uint32_t appVersionCode) : m_appVersionCode(appVersionCode)
 {
   // Read dump.
   std::vector<uint8_t> dumpData;
@@ -177,8 +176,7 @@ VulkanPipeline::VulkanPipeline(VkDevice device, uint32_t appVersionCode)
     }
     catch (FileReader::Exception const & exception)
     {
-      LOG(LWARNING, ("Exception while reading file:", dumpFilePath,
-        "reason:", exception.what()));
+      LOG(LWARNING, ("Exception while reading file:", dumpFilePath, "reason:", exception.what()));
     }
   }
 
@@ -230,16 +228,14 @@ void VulkanPipeline::Dump(VkDevice device)
         }
         catch (FileWriter::Exception const & exception)
         {
-          LOG(LWARNING, ("Exception while writing file:", dumpFilePath,
-            "reason:", exception.what()));
+          LOG(LWARNING, ("Exception while writing file:", dumpFilePath, "reason:", exception.what()));
         }
         m_isChanged = false;
       }
     }
     else
     {
-      LOG(LWARNING, ("Maximum pipeline cache size exceeded (", cacheSize, "/", kMaxCacheSizeInBytes,
-                     "bytes)"));
+      LOG(LWARNING, ("Maximum pipeline cache size exceeded (", cacheSize, "/", kMaxCacheSizeInBytes, "bytes)"));
     }
   }
 }
@@ -299,8 +295,8 @@ VkPipeline VulkanPipeline::GetPipeline(VkDevice device, PipelineKey const & key)
 
   // Blending.
   VkPipelineColorBlendAttachmentState pipelineColorBlendAttachmentState = {};
-  pipelineColorBlendAttachmentState.colorWriteMask = VK_COLOR_COMPONENT_R_BIT | VK_COLOR_COMPONENT_G_BIT |
-    VK_COLOR_COMPONENT_B_BIT | VK_COLOR_COMPONENT_A_BIT;
+  pipelineColorBlendAttachmentState.colorWriteMask =
+      VK_COLOR_COMPONENT_R_BIT | VK_COLOR_COMPONENT_G_BIT | VK_COLOR_COMPONENT_B_BIT | VK_COLOR_COMPONENT_A_BIT;
   pipelineColorBlendAttachmentState.blendEnable = key.m_blendingEnabled ? VK_TRUE : VK_FALSE;
   if (key.m_blendingEnabled)
   {
@@ -328,9 +324,8 @@ VkPipeline VulkanPipeline::GetPipeline(VkDevice device, PipelineKey const & key)
   multisampleStateCreateInfo.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT;
 
   // Dynamic.
-  static std::array<VkDynamicState, 4> dynamicState = {
-    VK_DYNAMIC_STATE_VIEWPORT, VK_DYNAMIC_STATE_SCISSOR, VK_DYNAMIC_STATE_LINE_WIDTH,
-    VK_DYNAMIC_STATE_STENCIL_REFERENCE};
+  static std::array<VkDynamicState, 4> dynamicState = {VK_DYNAMIC_STATE_VIEWPORT, VK_DYNAMIC_STATE_SCISSOR,
+                                                       VK_DYNAMIC_STATE_LINE_WIDTH, VK_DYNAMIC_STATE_STENCIL_REFERENCE};
   VkPipelineDynamicStateCreateInfo dynamicStateCreateInfo = {};
   dynamicStateCreateInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO;
   dynamicStateCreateInfo.pDynamicStates = dynamicState.data();
@@ -356,8 +351,8 @@ VkPipeline VulkanPipeline::GetPipeline(VkDevice device, PipelineKey const & key)
       BindingDecl const & bindingDecl = key.m_bindingInfo[i].GetBindingDecl(j);
       attributeDescriptions[bindingCounter].location = bindingCounter;
       attributeDescriptions[bindingCounter].binding = static_cast<uint32_t>(i);
-      attributeDescriptions[bindingCounter].format = GetAttributeFormat(bindingDecl.m_componentCount,
-                                                                        bindingDecl.m_componentType);
+      attributeDescriptions[bindingCounter].format =
+          GetAttributeFormat(bindingDecl.m_componentCount, bindingDecl.m_componentType);
       attributeDescriptions[bindingCounter].offset = bindingDecl.m_offset;
 
       bindingCounter++;
@@ -378,8 +373,7 @@ VkPipeline VulkanPipeline::GetPipeline(VkDevice device, PipelineKey const & key)
   if (key.m_depthStencil.m_depthEnabled)
   {
     depthStencilState.depthWriteEnable = VK_TRUE;
-    depthStencilState.depthCompareOp =
-      DecodeTestFunction(static_cast<uint8_t>(key.m_depthStencil.m_depthFunction));
+    depthStencilState.depthCompareOp = DecodeTestFunction(static_cast<uint8_t>(key.m_depthStencil.m_depthFunction));
   }
   else
   {
@@ -391,25 +385,25 @@ VkPipeline VulkanPipeline::GetPipeline(VkDevice device, PipelineKey const & key)
   {
     depthStencilState.stencilTestEnable = VK_TRUE;
     depthStencilState.front.compareOp =
-      DecodeTestFunction(GetStateByte(key.m_depthStencil.m_stencil, kStencilFrontFunctionByte));
+        DecodeTestFunction(GetStateByte(key.m_depthStencil.m_stencil, kStencilFrontFunctionByte));
     depthStencilState.front.failOp =
-      DecodeStencilAction(GetStateByte(key.m_depthStencil.m_stencil, kStencilFrontFailActionByte));
-    depthStencilState.front.depthFailOp = DecodeStencilAction(
-      GetStateByte(key.m_depthStencil.m_stencil, kStencilFrontDepthFailActionByte));
+        DecodeStencilAction(GetStateByte(key.m_depthStencil.m_stencil, kStencilFrontFailActionByte));
+    depthStencilState.front.depthFailOp =
+        DecodeStencilAction(GetStateByte(key.m_depthStencil.m_stencil, kStencilFrontDepthFailActionByte));
     depthStencilState.front.passOp =
-      DecodeStencilAction(GetStateByte(key.m_depthStencil.m_stencil, kStencilFrontPassActionByte));
+        DecodeStencilAction(GetStateByte(key.m_depthStencil.m_stencil, kStencilFrontPassActionByte));
     depthStencilState.front.writeMask = 0xffffffff;
     depthStencilState.front.compareMask = 0xffffffff;
     depthStencilState.front.reference = 1;
 
     depthStencilState.back.compareOp =
-      DecodeTestFunction(GetStateByte(key.m_depthStencil.m_stencil, kStencilBackFunctionByte));
+        DecodeTestFunction(GetStateByte(key.m_depthStencil.m_stencil, kStencilBackFunctionByte));
     depthStencilState.back.failOp =
-      DecodeStencilAction(GetStateByte(key.m_depthStencil.m_stencil, kStencilBackFailActionByte));
-    depthStencilState.back.depthFailOp = DecodeStencilAction(
-      GetStateByte(key.m_depthStencil.m_stencil, kStencilBackDepthFailActionByte));
+        DecodeStencilAction(GetStateByte(key.m_depthStencil.m_stencil, kStencilBackFailActionByte));
+    depthStencilState.back.depthFailOp =
+        DecodeStencilAction(GetStateByte(key.m_depthStencil.m_stencil, kStencilBackDepthFailActionByte));
     depthStencilState.back.passOp =
-      DecodeStencilAction(GetStateByte(key.m_depthStencil.m_stencil, kStencilBackPassActionByte));
+        DecodeStencilAction(GetStateByte(key.m_depthStencil.m_stencil, kStencilBackPassActionByte));
     depthStencilState.back.writeMask = 0xffffffff;
     depthStencilState.back.compareMask = 0xffffffff;
     depthStencilState.back.reference = 1;
@@ -442,8 +436,8 @@ VkPipeline VulkanPipeline::GetPipeline(VkDevice device, PipelineKey const & key)
   pipelineCreateInfo.pStages = shaders.data();
 
   VkPipeline pipeline;
-  auto const result = vkCreateGraphicsPipelines(device, m_vulkanPipelineCache, 1,
-                                                &pipelineCreateInfo, nullptr, &pipeline);
+  auto const result =
+      vkCreateGraphicsPipelines(device, m_vulkanPipelineCache, 1, &pipelineCreateInfo, nullptr, &pipeline);
   if (result == VK_INCOMPLETE)
   {
     // Some Adreno GPUs return this not standard compliant code.
@@ -467,17 +461,17 @@ void VulkanPipeline::DepthStencilKey::SetDepthTestEnabled(bool enabled)
 {
   m_depthEnabled = enabled;
 }
-  
+
 void VulkanPipeline::DepthStencilKey::SetDepthTestFunction(TestFunction depthFunction)
 {
   m_depthFunction = depthFunction;
 }
-  
+
 void VulkanPipeline::DepthStencilKey::SetStencilTestEnabled(bool enabled)
 {
   m_stencilEnabled = enabled;
 }
-  
+
 void VulkanPipeline::DepthStencilKey::SetStencilFunction(StencilFace face, TestFunction stencilFunction)
 {
   switch (face)
@@ -494,7 +488,7 @@ void VulkanPipeline::DepthStencilKey::SetStencilFunction(StencilFace face, TestF
     break;
   }
 }
-  
+
 void VulkanPipeline::DepthStencilKey::SetStencilActions(StencilFace face, StencilAction stencilFailAction,
                                                         StencilAction depthFailAction, StencilAction passAction)
 {
@@ -525,13 +519,13 @@ bool VulkanPipeline::DepthStencilKey::operator<(DepthStencilKey const & rhs) con
 {
   if (m_depthEnabled != rhs.m_depthEnabled)
     return m_depthEnabled < rhs.m_depthEnabled;
-  
+
   if (m_stencilEnabled != rhs.m_stencilEnabled)
     return m_stencilEnabled < rhs.m_stencilEnabled;
-  
+
   if (m_depthFunction != rhs.m_depthFunction)
     return m_depthFunction < rhs.m_depthFunction;
-  
+
   return m_stencil < rhs.m_stencil;
 }
 
@@ -548,7 +542,7 @@ bool VulkanPipeline::PipelineKey::operator<(PipelineKey const & rhs) const
 
   if (m_program != rhs.m_program)
     return m_program < rhs.m_program;
-  
+
   if (m_depthStencil != rhs.m_depthStencil)
     return m_depthStencil < rhs.m_depthStencil;
 
@@ -556,10 +550,8 @@ bool VulkanPipeline::PipelineKey::operator<(PipelineKey const & rhs) const
     return m_bindingInfoCount < rhs.m_bindingInfoCount;
 
   for (uint8_t i = 0; i < m_bindingInfoCount; ++i)
-  {
     if (m_bindingInfo[i] != rhs.m_bindingInfo[i])
       return m_bindingInfo[i] < rhs.m_bindingInfo[i];
-  }
 
   if (m_primitiveTopology != rhs.m_primitiveTopology)
     return m_primitiveTopology < rhs.m_primitiveTopology;
diff --git a/libs/drape/vulkan/vulkan_pipeline.hpp b/libs/drape/vulkan/vulkan_pipeline.hpp
index 41687723c..743ac52cb 100644
--- a/libs/drape/vulkan/vulkan_pipeline.hpp
+++ b/libs/drape/vulkan/vulkan_pipeline.hpp
@@ -22,11 +22,11 @@ public:
     void SetDepthTestFunction(TestFunction depthFunction);
     void SetStencilTestEnabled(bool enabled);
     void SetStencilFunction(StencilFace face, TestFunction stencilFunction);
-    void SetStencilActions(StencilFace face, StencilAction stencilFailAction,
-                           StencilAction depthFailAction, StencilAction passAction);
+    void SetStencilActions(StencilFace face, StencilAction stencilFailAction, StencilAction depthFailAction,
+                           StencilAction passAction);
     bool operator<(DepthStencilKey const & rhs) const;
     bool operator!=(DepthStencilKey const & rhs) const;
-    
+
     bool m_depthEnabled = false;
     bool m_stencilEnabled = false;
     TestFunction m_depthFunction = TestFunction::Always;
diff --git a/libs/drape/vulkan/vulkan_staging_buffer.cpp b/libs/drape/vulkan/vulkan_staging_buffer.cpp
index ded71fceb..7b0ae1ec2 100644
--- a/libs/drape/vulkan/vulkan_staging_buffer.cpp
+++ b/libs/drape/vulkan/vulkan_staging_buffer.cpp
@@ -13,8 +13,7 @@ namespace vulkan
 // The most GPUs use this value, real one can be known only after buffer creation.
 uint32_t constexpr kDefaultAlignment = 64;
 
-VulkanStagingBuffer::VulkanStagingBuffer(ref_ptr<VulkanObjectManager> objectManager,
-                                         uint32_t sizeInBytes)
+VulkanStagingBuffer::VulkanStagingBuffer(ref_ptr<VulkanObjectManager> objectManager, uint32_t sizeInBytes)
   : m_objectManager(objectManager)
   , m_sizeInBytes(VulkanMemoryManager::GetAligned(sizeInBytes, kDefaultAlignment))
 {
@@ -38,10 +37,8 @@ VulkanStagingBuffer::VulkanStagingBuffer(ref_ptr<VulkanObjectManager> objectMana
     m_object = m_objectManager->CreateBuffer(kStagingBuffer, m_sizeInBytes, 0 /* batcherHash */);
     vkGetBufferMemoryRequirements(device, m_object.m_buffer, &memReqs);
     m_sizeAlignment = mm.GetSizeAlignment(memReqs);
-    CHECK(HasEnoughSpace(m_sizeInBytes), ("originalSize =", originalSize,
-        "originalAlignment =", originalAlignment,
-        "m_sizeInBytes =", m_sizeInBytes,
-        "m_sizeAlignment =", m_sizeAlignment));
+    CHECK(HasEnoughSpace(m_sizeInBytes), ("originalSize =", originalSize, "originalAlignment =", originalAlignment,
+                                          "m_sizeInBytes =", m_sizeInBytes, "m_sizeAlignment =", m_sizeAlignment));
   }
 
   m_offsetAlignment = mm.GetOffsetAlignment(kStagingBuffer);
diff --git a/libs/drape/vulkan/vulkan_staging_buffer.hpp b/libs/drape/vulkan/vulkan_staging_buffer.hpp
index 4777c487b..cae19b3a4 100644
--- a/libs/drape/vulkan/vulkan_staging_buffer.hpp
+++ b/libs/drape/vulkan/vulkan_staging_buffer.hpp
@@ -16,8 +16,7 @@ namespace vulkan
 class VulkanStagingBuffer
 {
 public:
-  VulkanStagingBuffer(ref_ptr<VulkanObjectManager> objectManager,
-                      uint32_t sizeInBytes);
+  VulkanStagingBuffer(ref_ptr<VulkanObjectManager> objectManager, uint32_t sizeInBytes);
   ~VulkanStagingBuffer();
 
   struct StagingData
diff --git a/libs/drape/vulkan/vulkan_texture.cpp b/libs/drape/vulkan/vulkan_texture.cpp
index 2d91949f5..35ad8eca1 100644
--- a/libs/drape/vulkan/vulkan_texture.cpp
+++ b/libs/drape/vulkan/vulkan_texture.cpp
@@ -2,7 +2,6 @@
 #include "drape/vulkan/vulkan_base_context.hpp"
 #include "drape/vulkan/vulkan_staging_buffer.hpp"
 
-
 drape_ptr<dp::HWTextureAllocator> CreateVulkanAllocator()
 {
   return make_unique_dp<dp::vulkan::VulkanTextureAllocator>();
@@ -20,8 +19,7 @@ namespace vulkan
 {
 namespace
 {
-VkBufferImageCopy BufferCopyRegion(uint32_t x, uint32_t y, uint32_t width, uint32_t height,
-                                   uint32_t stagingOffset)
+VkBufferImageCopy BufferCopyRegion(uint32_t x, uint32_t y, uint32_t width, uint32_t height, uint32_t stagingOffset)
 {
   VkBufferImageCopy bufferCopyRegion = {};
   bufferCopyRegion.imageSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
@@ -80,18 +78,17 @@ void VulkanTexture::Create(ref_ptr<dp::GraphicsContext> context, Params const &
     // Create image.
     if (params.m_format == TextureFormat::DepthStencil || params.m_format == TextureFormat::Depth)
     {
-      m_aspectFlags =
-          params.m_format == TextureFormat::DepthStencil ? (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)
-                                                         : VK_IMAGE_ASPECT_DEPTH_BIT;
-      m_textureObject = m_objectManager->CreateImage(VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT,
-                                                     format, tiling, m_aspectFlags, params.m_width, params.m_height);
+      m_aspectFlags = params.m_format == TextureFormat::DepthStencil
+                        ? (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)
+                        : VK_IMAGE_ASPECT_DEPTH_BIT;
+      m_textureObject = m_objectManager->CreateImage(VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT, format, tiling,
+                                                     m_aspectFlags, params.m_width, params.m_height);
     }
     else
     {
       m_aspectFlags = VK_IMAGE_ASPECT_COLOR_BIT;
       m_textureObject = m_objectManager->CreateImage(VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_SAMPLED_BIT,
-                                                     format, tiling, m_aspectFlags,
-                                                     params.m_width, params.m_height);
+                                                     format, tiling, m_aspectFlags, params.m_width, params.m_height);
     }
   }
   else
@@ -115,8 +112,8 @@ void VulkanTexture::Create(ref_ptr<dp::GraphicsContext> context, Params const &
   }
 }
 
-void VulkanTexture::UploadData(ref_ptr<dp::GraphicsContext> context, uint32_t x, uint32_t y,
-                               uint32_t width, uint32_t height, ref_ptr<void> data)
+void VulkanTexture::UploadData(ref_ptr<dp::GraphicsContext> context, uint32_t x, uint32_t y, uint32_t width,
+                               uint32_t height, ref_ptr<void> data)
 {
   CHECK(m_isMutable, ("Upload data is avaivable only for mutable textures."));
   CHECK(m_creationStagingBuffer == nullptr, ());
@@ -156,16 +153,16 @@ void VulkanTexture::UploadData(ref_ptr<dp::GraphicsContext> context, uint32_t x,
 
   // Here we use VK_PIPELINE_STAGE_VERTEX_SHADER_BIT, because we also read textures
   // in vertex shaders.
-  MakeImageLayoutTransition(commandBuffer, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
-                            VK_PIPELINE_STAGE_VERTEX_SHADER_BIT | VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT | VK_PIPELINE_STAGE_TRANSFER_BIT, 
-                            VK_PIPELINE_STAGE_TRANSFER_BIT);
+  MakeImageLayoutTransition(
+      commandBuffer, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+      VK_PIPELINE_STAGE_VERTEX_SHADER_BIT | VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT | VK_PIPELINE_STAGE_TRANSFER_BIT,
+      VK_PIPELINE_STAGE_TRANSFER_BIT);
 
   auto bufferCopyRegion = BufferCopyRegion(x, y, width, height, offset);
-  vkCmdCopyBufferToImage(commandBuffer, sb, m_textureObject.m_image,
-                         VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &bufferCopyRegion);
+  vkCmdCopyBufferToImage(commandBuffer, sb, m_textureObject.m_image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1,
+                         &bufferCopyRegion);
 
-  MakeImageLayoutTransition(commandBuffer, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
-                            VK_PIPELINE_STAGE_TRANSFER_BIT, 
+  MakeImageLayoutTransition(commandBuffer, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, VK_PIPELINE_STAGE_TRANSFER_BIT,
                             VK_PIPELINE_STAGE_VERTEX_SHADER_BIT | VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT);
 }
 
@@ -180,17 +177,17 @@ void VulkanTexture::Bind(ref_ptr<dp::GraphicsContext> context) const
   {
     // Here we use VK_PIPELINE_STAGE_VERTEX_SHADER_BIT, because we also read textures
     // in vertex shaders.
-    MakeImageLayoutTransition(commandBuffer, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
-                              VK_PIPELINE_STAGE_VERTEX_SHADER_BIT | VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT | VK_PIPELINE_STAGE_TRANSFER_BIT, 
-                              VK_PIPELINE_STAGE_TRANSFER_BIT);
+    MakeImageLayoutTransition(
+        commandBuffer, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+        VK_PIPELINE_STAGE_VERTEX_SHADER_BIT | VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT | VK_PIPELINE_STAGE_TRANSFER_BIT,
+        VK_PIPELINE_STAGE_TRANSFER_BIT);
 
     auto staging = m_creationStagingBuffer->GetReservationById(m_reservationId);
     auto bufferCopyRegion = BufferCopyRegion(0, 0, GetWidth(), GetHeight(), staging.m_offset);
     vkCmdCopyBufferToImage(commandBuffer, staging.m_stagingBuffer, m_textureObject.m_image,
                            VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &bufferCopyRegion);
 
-    MakeImageLayoutTransition(commandBuffer, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
-                              VK_PIPELINE_STAGE_TRANSFER_BIT, 
+    MakeImageLayoutTransition(commandBuffer, VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL, VK_PIPELINE_STAGE_TRANSFER_BIT,
                               VK_PIPELINE_STAGE_VERTEX_SHADER_BIT | VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT);
 
     m_creationStagingBuffer.reset();
@@ -204,8 +201,7 @@ void VulkanTexture::SetFilter(TextureFilter filter)
 
 bool VulkanTexture::Validate() const
 {
-  return m_textureObject.m_image != VK_NULL_HANDLE &&
-         m_textureObject.m_imageView != VK_NULL_HANDLE;
+  return m_textureObject.m_image != VK_NULL_HANDLE && m_textureObject.m_imageView != VK_NULL_HANDLE;
 }
 
 SamplerKey VulkanTexture::GetSamplerKey() const
@@ -213,75 +209,63 @@ SamplerKey VulkanTexture::GetSamplerKey() const
   return SamplerKey(m_params.m_filter, m_params.m_wrapSMode, m_params.m_wrapTMode);
 }
 
-void VulkanTexture::MakeImageLayoutTransition(VkCommandBuffer commandBuffer, 
-                                              VkImageLayout newLayout,
+void VulkanTexture::MakeImageLayoutTransition(VkCommandBuffer commandBuffer, VkImageLayout newLayout,
                                               VkPipelineStageFlags srcStageMask,
                                               VkPipelineStageFlags dstStageMask) const
 {
   VkAccessFlags srcAccessMask = 0;
   VkAccessFlags dstAccessMask = 0;
 
-  VkPipelineStageFlags const noAccessMask = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT | 
-                                            VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT |
-                                            VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT | 
-                                            VK_PIPELINE_STAGE_ALL_COMMANDS_BIT;
+  VkPipelineStageFlags const noAccessMask = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT | VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT |
+                                            VK_PIPELINE_STAGE_ALL_GRAPHICS_BIT | VK_PIPELINE_STAGE_ALL_COMMANDS_BIT;
   VkPipelineStageFlags srcRemainingMask = srcStageMask & ~noAccessMask;
   VkPipelineStageFlags dstRemainingMask = dstStageMask & ~noAccessMask;
 
-  auto const srcTestAndRemoveBit = [&](VkPipelineStageFlagBits stageBit, 
-                                       VkAccessFlags accessBits) {
-    if (srcStageMask & stageBit) 
+  auto const srcTestAndRemoveBit = [&](VkPipelineStageFlagBits stageBit, VkAccessFlags accessBits)
+  {
+    if (srcStageMask & stageBit)
     {
       srcAccessMask |= accessBits;
       srcRemainingMask &= ~stageBit;
-    }                                                
+    }
   };
 
-  srcTestAndRemoveBit(VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT, 
-                      VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT);
+  srcTestAndRemoveBit(VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT, VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT);
 
-  srcTestAndRemoveBit(VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, 
-                      VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT);
+  srcTestAndRemoveBit(VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT);
 
-  srcTestAndRemoveBit(VK_PIPELINE_STAGE_VERTEX_SHADER_BIT, 
-                      VK_ACCESS_SHADER_READ_BIT);
+  srcTestAndRemoveBit(VK_PIPELINE_STAGE_VERTEX_SHADER_BIT, VK_ACCESS_SHADER_READ_BIT);
 
-  srcTestAndRemoveBit(VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT, 
+  srcTestAndRemoveBit(VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
                       VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_INPUT_ATTACHMENT_READ_BIT);
 
-  srcTestAndRemoveBit(VK_PIPELINE_STAGE_TRANSFER_BIT, 
-                      VK_ACCESS_TRANSFER_WRITE_BIT);
+  srcTestAndRemoveBit(VK_PIPELINE_STAGE_TRANSFER_BIT, VK_ACCESS_TRANSFER_WRITE_BIT);
 
-  srcTestAndRemoveBit(VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT, 
-                      VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT | 
-                      VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT);
+  srcTestAndRemoveBit(VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT,
+                      VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT);
 
   CHECK(srcRemainingMask == 0, ("Not implemented transition for src pipeline stage"));
 
-  auto const dstTestAndRemoveBit = [&](VkPipelineStageFlagBits stageBit, 
-                                       VkAccessFlags accessBits) {
-    if (dstStageMask & stageBit) 
+  auto const dstTestAndRemoveBit = [&](VkPipelineStageFlagBits stageBit, VkAccessFlags accessBits)
+  {
+    if (dstStageMask & stageBit)
     {
       dstAccessMask |= accessBits;
       dstRemainingMask &= ~stageBit;
-    }                                               
+    }
   };
 
-  dstTestAndRemoveBit(VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT, 
-                      VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT);
+  dstTestAndRemoveBit(VK_PIPELINE_STAGE_LATE_FRAGMENT_TESTS_BIT, VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT);
 
   dstTestAndRemoveBit(VK_PIPELINE_STAGE_EARLY_FRAGMENT_TESTS_BIT,
-                      VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT | 
-                      VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT);
+                      VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT | VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT);
 
-  dstTestAndRemoveBit(VK_PIPELINE_STAGE_VERTEX_SHADER_BIT, 
-                      VK_ACCESS_SHADER_READ_BIT);
+  dstTestAndRemoveBit(VK_PIPELINE_STAGE_VERTEX_SHADER_BIT, VK_ACCESS_SHADER_READ_BIT);
 
-  dstTestAndRemoveBit(VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT, 
+  dstTestAndRemoveBit(VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
                       VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_INPUT_ATTACHMENT_READ_BIT);
 
-  dstTestAndRemoveBit(VK_PIPELINE_STAGE_TRANSFER_BIT, 
-                      VK_ACCESS_TRANSFER_WRITE_BIT);
+  dstTestAndRemoveBit(VK_PIPELINE_STAGE_TRANSFER_BIT, VK_ACCESS_TRANSFER_WRITE_BIT);
 
   CHECK(dstRemainingMask == 0, ("Not implemented transition for dest pipeline stage"));
 
@@ -301,8 +285,7 @@ void VulkanTexture::MakeImageLayoutTransition(VkCommandBuffer commandBuffer,
   imageMemoryBarrier.subresourceRange.baseArrayLayer = 0;
   imageMemoryBarrier.subresourceRange.layerCount = VK_REMAINING_ARRAY_LAYERS;
 
-  vkCmdPipelineBarrier(commandBuffer, srcStageMask, dstStageMask, 0, 0,
-                       nullptr, 0, nullptr, 1, &imageMemoryBarrier);
+  vkCmdPipelineBarrier(commandBuffer, srcStageMask, dstStageMask, 0, 0, nullptr, 0, nullptr, 1, &imageMemoryBarrier);
 
   m_currentLayout = newLayout;
 }
diff --git a/libs/drape/vulkan/vulkan_texture.hpp b/libs/drape/vulkan/vulkan_texture.hpp
index 674cd72c5..71f2dfbdd 100644
--- a/libs/drape/vulkan/vulkan_texture.hpp
+++ b/libs/drape/vulkan/vulkan_texture.hpp
@@ -23,14 +23,14 @@ public:
 class VulkanTexture : public HWTexture
 {
   using Base = HWTexture;
+
 public:
   explicit VulkanTexture(ref_ptr<VulkanTextureAllocator>) {}
   ~VulkanTexture() override;
 
-  void Create(ref_ptr<dp::GraphicsContext> context, Params const & params,
-              ref_ptr<void> data) override;
-  void UploadData(ref_ptr<dp::GraphicsContext> context, uint32_t x, uint32_t y, uint32_t width,
-                  uint32_t height, ref_ptr<void> data) override;
+  void Create(ref_ptr<dp::GraphicsContext> context, Params const & params, ref_ptr<void> data) override;
+  void UploadData(ref_ptr<dp::GraphicsContext> context, uint32_t x, uint32_t y, uint32_t width, uint32_t height,
+                  ref_ptr<void> data) override;
   void Bind(ref_ptr<dp::GraphicsContext> context) const override;
   void SetFilter(TextureFilter filter) override;
   bool Validate() const override;
@@ -40,10 +40,8 @@ public:
   SamplerKey GetSamplerKey() const;
   VkImageLayout GetCurrentLayout() const { return m_currentLayout; }
 
-  void MakeImageLayoutTransition(VkCommandBuffer commandBuffer,
-                                 VkImageLayout newLayout,
-                                 VkPipelineStageFlags srcStageMask,
-                                 VkPipelineStageFlags dstStageMask) const;
+  void MakeImageLayoutTransition(VkCommandBuffer commandBuffer, VkImageLayout newLayout,
+                                 VkPipelineStageFlags srcStageMask, VkPipelineStageFlags dstStageMask) const;
 
 private:
   ref_ptr<VulkanObjectManager> m_objectManager;
diff --git a/libs/drape/vulkan/vulkan_utils.cpp b/libs/drape/vulkan/vulkan_utils.cpp
index 096bb7a0c..e994137be 100644
--- a/libs/drape/vulkan/vulkan_utils.cpp
+++ b/libs/drape/vulkan/vulkan_utils.cpp
@@ -24,7 +24,7 @@ static bool gUse32bitDepth8bitStencil = false;
 void DebugName::Init(VkInstance instance, VkDevice device)
 {
   vkSetDebugUtilsObjectNameEXT =
-    (PFN_vkSetDebugUtilsObjectNameEXT)vkGetInstanceProcAddr(instance, "vkSetDebugUtilsObjectNameEXT");
+      (PFN_vkSetDebugUtilsObjectNameEXT)vkGetInstanceProcAddr(instance, "vkSetDebugUtilsObjectNameEXT");
   m_device = device;
 }
 
@@ -33,13 +33,11 @@ void DebugName::Set(VkObjectType type, uint64_t handle, char const * name)
   if (vkSetDebugUtilsObjectNameEXT == nullptr)
     return;
 
-  VkDebugUtilsObjectNameInfoEXT const info = {
-      .sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT,
-      .pNext = nullptr,
-      .objectType = type,
-      .objectHandle = handle,
-      .pObjectName = name
-  };
+  VkDebugUtilsObjectNameInfoEXT const info = {.sType = VK_STRUCTURE_TYPE_DEBUG_UTILS_OBJECT_NAME_INFO_EXT,
+                                              .pNext = nullptr,
+                                              .objectType = type,
+                                              .objectHandle = handle,
+                                              .pObjectName = name};
   CHECK_VK_CALL(vkSetDebugUtilsObjectNameEXT(m_device, &info));
 }
 
@@ -109,9 +107,7 @@ VkFormat VulkanFormatUnpacker::m_bestDepthFormat = VK_FORMAT_UNDEFINED;
 // static
 bool VulkanFormatUnpacker::Init(VkPhysicalDevice gpu)
 {
-  std::array<VkFormat, 3> depthFormats = {{VK_FORMAT_D32_SFLOAT,
-                                           VK_FORMAT_X8_D24_UNORM_PACK32,
-                                           VK_FORMAT_D16_UNORM}};
+  std::array<VkFormat, 3> depthFormats = {{VK_FORMAT_D32_SFLOAT, VK_FORMAT_X8_D24_UNORM_PACK32, VK_FORMAT_D16_UNORM}};
   VkFormatProperties formatProperties;
   for (auto depthFormat : depthFormats)
   {
@@ -141,8 +137,7 @@ bool VulkanFormatUnpacker::Init(VkPhysicalDevice gpu)
     }
   }
 
-  std::array<VkFormat, 2> framebufferColorFormats = {{Unpack(TextureFormat::RGBA8),
-                                                      Unpack(TextureFormat::RedGreen)}};
+  std::array<VkFormat, 2> framebufferColorFormats = {{Unpack(TextureFormat::RGBA8), Unpack(TextureFormat::RedGreen)}};
   for (auto colorFormat : framebufferColorFormats)
   {
     vkGetPhysicalDeviceFormatProperties(gpu, colorFormat, &formatProperties);
@@ -167,12 +162,11 @@ VkFormat VulkanFormatUnpacker::Unpack(TextureFormat format)
 #if defined(OMIM_OS_MAC)
   case TextureFormat::DepthStencil: return VK_FORMAT_D32_SFLOAT_S8_UINT;
 #else
-  case TextureFormat::DepthStencil: return gUse32bitDepth8bitStencil ? VK_FORMAT_D32_SFLOAT_S8_UINT : VK_FORMAT_D24_UNORM_S8_UINT;
+  case TextureFormat::DepthStencil:
+    return gUse32bitDepth8bitStencil ? VK_FORMAT_D32_SFLOAT_S8_UINT : VK_FORMAT_D24_UNORM_S8_UINT;
 #endif
   case TextureFormat::Depth: return m_bestDepthFormat;
-  case TextureFormat::Unspecified:
-    CHECK(false, ());
-    return VK_FORMAT_UNDEFINED;
+  case TextureFormat::Unspecified: CHECK(false, ()); return VK_FORMAT_UNDEFINED;
   }
   UNREACHABLE();
 }
diff --git a/libs/drape/vulkan/vulkan_utils.hpp b/libs/drape/vulkan/vulkan_utils.hpp
index 2d6ee6928..de6822b00 100644
--- a/libs/drape/vulkan/vulkan_utils.hpp
+++ b/libs/drape/vulkan/vulkan_utils.hpp
@@ -28,7 +28,7 @@ private:
   static VkFormat m_bestDepthFormat;
 };
 
-template<typename T>
+template <typename T>
 void SetStateByte(T & state, uint8_t value, uint8_t byteNumber)
 {
   auto const shift = byteNumber * 8;
@@ -36,7 +36,7 @@ void SetStateByte(T & state, uint8_t value, uint8_t byteNumber)
   state = (state & mask) | (static_cast<T>(value) << shift);
 }
 
-template<typename T>
+template <typename T>
 uint8_t GetStateByte(T & state, uint8_t byteNumber)
 {
   return static_cast<uint8_t>((state >> byteNumber * 8) & 0xFF);
@@ -69,41 +69,50 @@ private:
 }  // namespace vulkan
 }  // namespace dp
 
-#define LOG_ERROR_VK_CALL(method, statusCode) \
-  LOG(LDEBUG, ("Vulkan error:", #method, "finished with code", \
-               dp::vulkan::GetVulkanResultString(statusCode)))
+#define LOG_ERROR_VK_CALL(method, statusCode)                                                                  \
+  LOG(LDEBUG, ("Vulkan error:", #method, "finished with code", dp::vulkan::GetVulkanResultString(statusCode)))
 
 #define LOG_ERROR_VK(message) LOG(LDEBUG, ("Vulkan error:", message))
 
-#define CHECK_VK_CALL(method) \
-  do { \
-    VkResult const statusCode = method; \
-    CHECK(statusCode == VK_SUCCESS, ("Vulkan error:", #method, "finished with code", \
-                                     dp::vulkan::GetVulkanResultString(statusCode))); \
-  } while (false)
+#define CHECK_VK_CALL(method)                                                                               \
+  do                                                                                                        \
+  {                                                                                                         \
+    VkResult const statusCode = method;                                                                     \
+    CHECK(statusCode == VK_SUCCESS,                                                                         \
+          ("Vulkan error:", #method, "finished with code", dp::vulkan::GetVulkanResultString(statusCode))); \
+  }                                                                                                         \
+  while (false)
 
-#define CHECK_VK_CALL_EX(method, msg) \
-  do { \
-    VkResult const statusCode = method; \
+#define CHECK_VK_CALL_EX(method, msg)         \
+  do                                          \
+  {                                           \
+    VkResult const statusCode = method;       \
     CHECK_EQUAL(statusCode, VK_SUCCESS, msg); \
-  } while (false)
+  }                                           \
+  while (false)
 
-#define CHECK_RESULT_VK_CALL(method, statusCode) \
-  do { \
-    CHECK(statusCode == VK_SUCCESS, ("Vulkan error:", #method, "finished with code", \
-                                     dp::vulkan::GetVulkanResultString(statusCode))); \
-  } while (false)
+#define CHECK_RESULT_VK_CALL(method, statusCode)                                                            \
+  do                                                                                                        \
+  {                                                                                                         \
+    CHECK(statusCode == VK_SUCCESS,                                                                         \
+          ("Vulkan error:", #method, "finished with code", dp::vulkan::GetVulkanResultString(statusCode))); \
+  }                                                                                                         \
+  while (false)
 
 #if defined(OMIM_OS_MAC) || defined(OMIM_OS_LINUX)
 #define INIT_DEBUG_NAME_VK(instance, device) \
-  do { \
-    DebugName::Init(instance, device); \
-  } while (false)
+  do                                         \
+  {                                          \
+    DebugName::Init(instance, device);       \
+  }                                          \
+  while (false)
 
-#define SET_DEBUG_NAME_VK(type, handle, name) \
-  do { \
+#define SET_DEBUG_NAME_VK(type, handle, name)     \
+  do                                              \
+  {                                               \
     DebugName::Set(type, (uint64_t)handle, name); \
-  } while (false)
+  }                                               \
+  while (false)
 #else
 #define INIT_DEBUG_NAME_VK(instance, device)
 #define SET_DEBUG_NAME_VK(type, handle, name)
diff --git a/libs/drape/vulkan/vulkan_vertex_array_buffer_impl.cpp b/libs/drape/vulkan/vulkan_vertex_array_buffer_impl.cpp
index 93c0d3d3e..b83600b8e 100644
--- a/libs/drape/vulkan/vulkan_vertex_array_buffer_impl.cpp
+++ b/libs/drape/vulkan/vulkan_vertex_array_buffer_impl.cpp
@@ -21,10 +21,8 @@ namespace vulkan
 class VulkanVertexArrayBufferImpl : public VertexArrayBufferImpl
 {
 public:
-  VulkanVertexArrayBufferImpl(ref_ptr<VertexArrayBuffer> buffer,
-                              ref_ptr<VulkanObjectManager> objectManager,
-                              BindingInfoArray && bindingInfo,
-                              uint8_t bindingInfoCount)
+  VulkanVertexArrayBufferImpl(ref_ptr<VertexArrayBuffer> buffer, ref_ptr<VulkanObjectManager> objectManager,
+                              BindingInfoArray && bindingInfo, uint8_t bindingInfoCount)
     : m_vertexArrayBuffer(std::move(buffer))
     , m_objectManager(objectManager)
     , m_bindingInfo(std::move(bindingInfo))
@@ -32,23 +30,19 @@ public:
     , m_descriptorUpdater(objectManager)
   {}
 
-  ~VulkanVertexArrayBufferImpl() override
-  {
-    m_descriptorUpdater.Destroy();
-  }
+  ~VulkanVertexArrayBufferImpl() override { m_descriptorUpdater.Destroy(); }
 
   bool Build(ref_ptr<GpuProgram> program) override
   {
     UNUSED_VALUE(program);
     return true;
   }
-  
+
   bool Bind() override { return true; }
   void Unbind() override {}
   void BindBuffers(dp::BuffersMap const & buffers) const override {}
 
-  void RenderRange(ref_ptr<GraphicsContext> context, bool drawAsLine,
-                   IndicesRange const & range) override
+  void RenderRange(ref_ptr<GraphicsContext> context, bool drawAsLine, IndicesRange const & range) override
   {
     CHECK(m_vertexArrayBuffer->HasBuffers(), ());
 
@@ -56,20 +50,18 @@ public:
     VkCommandBuffer commandBuffer = vulkanContext->GetCurrentRenderingCommandBuffer();
     CHECK(commandBuffer != nullptr, ());
 
-    vulkanContext->SetPrimitiveTopology(drawAsLine ? VK_PRIMITIVE_TOPOLOGY_LINE_LIST :
-                                                     VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST);
+    vulkanContext->SetPrimitiveTopology(drawAsLine ? VK_PRIMITIVE_TOPOLOGY_LINE_LIST
+                                                   : VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST);
     vulkanContext->SetBindingInfo(m_bindingInfo, m_bindingInfoCount);
 
     m_descriptorUpdater.Update(context);
     auto descriptorSet = m_descriptorUpdater.GetDescriptorSet();
 
     uint32_t dynamicOffset = vulkanContext->GetCurrentDynamicBufferOffset();
-    vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS,
-                            vulkanContext->GetCurrentPipelineLayout(), 0, 1,
-                            &descriptorSet, 1, &dynamicOffset);
+    vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, vulkanContext->GetCurrentPipelineLayout(),
+                            0, 1, &descriptorSet, 1, &dynamicOffset);
 
-    vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS,
-                      vulkanContext->GetCurrentPipeline());
+    vkCmdBindPipeline(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, vulkanContext->GetCurrentPipeline());
 
     size_t constexpr kMaxBuffersCount = 4;
     std::array<VkBuffer, kMaxBuffersCount> buffers = {};
@@ -100,7 +92,7 @@ public:
 
     vkCmdDrawIndexed(commandBuffer, range.m_idxCount, 1, range.m_idxStart, 0, 0);
   }
-  
+
 private:
   ref_ptr<VertexArrayBuffer> m_vertexArrayBuffer;
   ref_ptr<VulkanObjectManager> m_objectManager;
@@ -109,7 +101,7 @@ private:
   ParamDescriptorUpdater m_descriptorUpdater;
 };
 }  // namespace vulkan
-  
+
 drape_ptr<VertexArrayBufferImpl> VertexArrayBuffer::CreateImplForVulkan(ref_ptr<GraphicsContext> context,
                                                                         ref_ptr<VertexArrayBuffer> buffer,
                                                                         BindingInfoArray && bindingInfo,
diff --git a/libs/drape_frontend/animation/animation.cpp b/libs/drape_frontend/animation/animation.cpp
index 9c514c57b..4341b3ca4 100644
--- a/libs/drape_frontend/animation/animation.cpp
+++ b/libs/drape_frontend/animation/animation.cpp
@@ -6,7 +6,8 @@ namespace df
 {
 
 // static
-bool Animation::GetCachedProperty(TPropertyCache const & properties, Object object, ObjectProperty property, PropertyValue & value)
+bool Animation::GetCachedProperty(TPropertyCache const & properties, Object object, ObjectProperty property,
+                                  PropertyValue & value)
 {
   auto const it = properties.find(std::make_pair(object, property));
   if (it != properties.end())
@@ -18,7 +19,8 @@ bool Animation::GetCachedProperty(TPropertyCache const & properties, Object obje
 }
 
 // static
-void Animation::GetCurrentScreen(TPropertyCache const & properties, ScreenBase const & screen, ScreenBase & currentScreen)
+void Animation::GetCurrentScreen(TPropertyCache const & properties, ScreenBase const & screen,
+                                 ScreenBase & currentScreen)
 {
   currentScreen = screen;
 
@@ -46,10 +48,8 @@ bool Animation::HasSameObjects(Animation const & animation) const
 {
   TAnimObjects const & objects = animation.GetObjects();
   for (auto const & object : objects)
-  {
     if (HasObject(object))
       return true;
-  }
   return false;
 }
 
@@ -129,4 +129,4 @@ std::string DebugPrint(Animation::ObjectProperty const & property)
   return "Unknown property";
 }
 
-} // namespace df
+}  // namespace df
diff --git a/libs/drape_frontend/animation/animation.hpp b/libs/drape_frontend/animation/animation.hpp
index 4aac4bcbd..ec5c1a740 100644
--- a/libs/drape_frontend/animation/animation.hpp
+++ b/libs/drape_frontend/animation/animation.hpp
@@ -52,18 +52,11 @@ public:
       ValuePointD
     };
 
-    PropertyValue()
-    {}
+    PropertyValue() {}
 
-    explicit PropertyValue(double value)
-      : m_type(Type::ValueD)
-      , m_valueD(value)
-    {}
+    explicit PropertyValue(double value) : m_type(Type::ValueD), m_valueD(value) {}
 
-    explicit PropertyValue(m2::PointD const & value)
-      : m_type(Type::ValuePointD)
-      , m_valuePointD(value)
-    {}
+    explicit PropertyValue(m2::PointD const & value) : m_type(Type::ValuePointD), m_valuePointD(value) {}
 
     Type m_type;
     union
@@ -88,9 +81,21 @@ public:
   virtual ~Animation() = default;
 
   virtual void Init(ScreenBase const & screen, TPropertyCache const & properties) {}
-  virtual void OnStart() { if (m_onStartAction != nullptr) m_onStartAction(this); }
-  virtual void OnFinish() { if (m_onFinishAction != nullptr) m_onFinishAction(this); }
-  virtual void Interrupt() { if (m_onInterruptAction != nullptr) m_onInterruptAction(this); }
+  virtual void OnStart()
+  {
+    if (m_onStartAction != nullptr)
+      m_onStartAction(this);
+  }
+  virtual void OnFinish()
+  {
+    if (m_onFinishAction != nullptr)
+      m_onFinishAction(this);
+  }
+  virtual void Interrupt()
+  {
+    if (m_onInterruptAction != nullptr)
+      m_onInterruptAction(this);
+  }
 
   virtual Type GetType() const = 0;
   virtual std::string GetCustomType() const { return std::string(); }
@@ -130,13 +135,15 @@ public:
 
   void SetCouldBeInterrupted(bool enable) { m_couldBeInterrupted = enable; }
   void SetCouldBeBlended(bool enable) { m_couldBeBlended = enable; }
-  
+
   void SetCouldBeRewinded(bool enable) { m_couldBeRewinded = enable; }
   bool CouldBeRewinded() const { return m_couldBeRewinded; }
 
 protected:
-  static void GetCurrentScreen(TPropertyCache const & properties, ScreenBase const & screen, ScreenBase & currentScreen);
-  static bool GetCachedProperty(TPropertyCache const & properties, Object object, ObjectProperty property, PropertyValue & value);
+  static void GetCurrentScreen(TPropertyCache const & properties, ScreenBase const & screen,
+                               ScreenBase & currentScreen);
+  static bool GetCachedProperty(TPropertyCache const & properties, Object object, ObjectProperty property,
+                                PropertyValue & value);
 
   static bool GetMinDuration(Interpolator const & interpolator, double & minDuration);
   static bool GetMaxDuration(Interpolator const & interpolator, double & maxDuration);
@@ -159,5 +166,4 @@ std::string DebugPrint(Animation::Type const & type);
 std::string DebugPrint(Animation::Object const & object);
 std::string DebugPrint(Animation::ObjectProperty const & property);
 
-} // namespace df
-
+}  // namespace df
diff --git a/libs/drape_frontend/animation/arrow_animation.cpp b/libs/drape_frontend/animation/arrow_animation.cpp
index b54d1cdb4..1af8df65d 100644
--- a/libs/drape_frontend/animation/arrow_animation.cpp
+++ b/libs/drape_frontend/animation/arrow_animation.cpp
@@ -2,11 +2,11 @@
 
 #include <algorithm>
 
-namespace  df
+namespace df
 {
 
 ArrowAnimation::ArrowAnimation(m2::PointD const & startPos, m2::PointD const & endPos, double moveDuration,
-               double startAngle, double endAngle)
+                               double startAngle, double endAngle)
   : Animation(true /* couldBeInterrupted */, true /* couldBeBlended */)
   , m_positionInterpolator(moveDuration, 0.0 /* delay */, startPos, endPos)
   , m_angleInterpolator(startAngle, endAngle)
@@ -28,10 +28,8 @@ void ArrowAnimation::Init(ScreenBase const & screen, TPropertyCache const & prop
     minDuration = m_positionInterpolator.GetMinDuration();
     maxDuration = m_positionInterpolator.GetMaxDuration();
 
-    m_positionInterpolator = PositionInterpolator(m_positionInterpolator.GetDuration(),
-                                                  0.0 /* delay */,
-                                                  value.m_valuePointD,
-                                                  m_positionInterpolator.GetTargetPosition());
+    m_positionInterpolator = PositionInterpolator(m_positionInterpolator.GetDuration(), 0.0 /* delay */,
+                                                  value.m_valuePointD, m_positionInterpolator.GetTargetPosition());
 
     m_positionInterpolator.SetMinDuration(minDuration);
     m_positionInterpolator.SetMaxDuration(maxDuration);
@@ -56,7 +54,7 @@ void ArrowAnimation::Init(ScreenBase const & screen, TPropertyCache const & prop
 
 Animation::TAnimObjects const & ArrowAnimation::GetObjects() const
 {
-   return m_objects;
+  return m_objects;
 }
 
 bool ArrowAnimation::HasObject(Object object) const
@@ -166,7 +164,8 @@ bool ArrowAnimation::GetProperty(Object object, ObjectProperty property, bool ta
   case Animation::ObjectProperty::Position:
     if (m_positionInterpolator.IsActive())
     {
-      value = PropertyValue(targetValue ? m_positionInterpolator.GetTargetPosition() : m_positionInterpolator.GetPosition());
+      value = PropertyValue(targetValue ? m_positionInterpolator.GetTargetPosition()
+                                        : m_positionInterpolator.GetPosition());
       return true;
     }
     return false;
@@ -177,12 +176,10 @@ bool ArrowAnimation::GetProperty(Object object, ObjectProperty property, bool ta
       return true;
     }
     return false;
-  default:
-    ASSERT(false, ("Wrong property:", static_cast<int>(property)));
+  default: ASSERT(false, ("Wrong property:", static_cast<int>(property)));
   }
 
   return false;
 }
 
-
-} // namespace df
+}  // namespace df
diff --git a/libs/drape_frontend/animation/arrow_animation.hpp b/libs/drape_frontend/animation/arrow_animation.hpp
index 123e15788..630e9943e 100644
--- a/libs/drape_frontend/animation/arrow_animation.hpp
+++ b/libs/drape_frontend/animation/arrow_animation.hpp
@@ -9,8 +9,8 @@ namespace df
 class ArrowAnimation : public Animation
 {
 public:
-  ArrowAnimation(m2::PointD const & startPos, m2::PointD const & endPos, double moveDuration,
-                 double startAngle, double endAngle);
+  ArrowAnimation(m2::PointD const & startPos, m2::PointD const & endPos, double moveDuration, double startAngle,
+                 double endAngle);
 
   void Init(ScreenBase const & screen, TPropertyCache const & properties) override;
 
@@ -43,4 +43,4 @@ private:
   AngleInterpolator m_angleInterpolator;
 };
 
-} // namespace df
+}  // namespace df
diff --git a/libs/drape_frontend/animation/follow_animation.cpp b/libs/drape_frontend/animation/follow_animation.cpp
index 13ee9b981..b80448d8b 100644
--- a/libs/drape_frontend/animation/follow_animation.cpp
+++ b/libs/drape_frontend/animation/follow_animation.cpp
@@ -11,10 +11,8 @@
 namespace df
 {
 
-MapFollowAnimation::MapFollowAnimation(ScreenBase const & screen,
-                                       m2::PointD const & globalUserPosition,
-                                       m2::PointD const & endPixelPosition,
-                                       double endScale, double endAngle,
+MapFollowAnimation::MapFollowAnimation(ScreenBase const & screen, m2::PointD const & globalUserPosition,
+                                       m2::PointD const & endPixelPosition, double endScale, double endAngle,
                                        bool isAutoZoom)
   : Animation(true /* couldBeInterrupted */, true /* couldBeBlended */)
   , m_isAutoZoom(isAutoZoom)
@@ -37,7 +35,8 @@ void MapFollowAnimation::Init(ScreenBase const & screen, TPropertyCache const &
 
   m_offset = currentScreen.PtoG(currentScreen.P3dtoP(m_endPixelPosition)) - m_globalPosition;
   double const averageScale = m_isAutoZoom ? currentScreen.GetScale() : (currentScreen.GetScale() + m_endScale) / 2.0;
-  double const moveDuration = PositionInterpolator::GetMoveDuration(m_offset.Length(), screen.PixelRectIn3d(), averageScale);
+  double const moveDuration =
+      PositionInterpolator::GetMoveDuration(m_offset.Length(), screen.PixelRectIn3d(), averageScale);
   m_offsetInterpolator = PositionInterpolator(moveDuration, 0.0, m_offset, m2::PointD(0.0, 0.0));
 
   m_offsetInterpolator.SetMinDuration(minDuration);
@@ -156,7 +155,6 @@ double MapFollowAnimation::GetMinDuration() const
   return minDuration;
 }
 
-
 double MapFollowAnimation::CalculateDuration() const
 {
   double duration = std::max(m_angleInterpolator.GetDuration(), m_offsetInterpolator.GetDuration());
@@ -180,15 +178,16 @@ bool MapFollowAnimation::GetTargetProperty(Object object, ObjectProperty propert
   return GetProperty(object, property, true /* targetValue */, value);
 }
 
-bool MapFollowAnimation::GetProperty(Object object, ObjectProperty property, bool targetValue, PropertyValue & value) const
+bool MapFollowAnimation::GetProperty(Object object, ObjectProperty property, bool targetValue,
+                                     PropertyValue & value) const
 {
   if (property == Animation::ObjectProperty::Position)
   {
     ScreenBase tmp = AnimationSystem::Instance().GetLastScreen();
     if (targetValue)
     {
-      tmp.SetFromParams(m_globalPosition, m_angleInterpolator.GetTargetAngle(), m_isAutoZoom ? m_scaleInterpolator.GetScale()
-                                                                                             : m_scaleInterpolator.GetTargetScale());
+      tmp.SetFromParams(m_globalPosition, m_angleInterpolator.GetTargetAngle(),
+                        m_isAutoZoom ? m_scaleInterpolator.GetScale() : m_scaleInterpolator.GetTargetScale());
       tmp.MatchGandP3d(m_globalPosition, m_endPixelPosition);
     }
     else
@@ -230,4 +229,4 @@ bool MapFollowAnimation::HasPixelOffset() const
   return m_offsetInterpolator.IsActive();
 }
 
-} // namespace df
+}  // namespace df
diff --git a/libs/drape_frontend/animation/follow_animation.hpp b/libs/drape_frontend/animation/follow_animation.hpp
index 0769fe059..a406d91c2 100644
--- a/libs/drape_frontend/animation/follow_animation.hpp
+++ b/libs/drape_frontend/animation/follow_animation.hpp
@@ -9,25 +9,16 @@ namespace df
 class MapFollowAnimation : public Animation
 {
 public:
-  MapFollowAnimation(ScreenBase const & screen,
-                     m2::PointD const & globalUserPosition,
-                     m2::PointD const & endPixelPosition,
-                     double endScale, double endAngle,
-                     bool isAutoZoom);
+  MapFollowAnimation(ScreenBase const & screen, m2::PointD const & globalUserPosition,
+                     m2::PointD const & endPixelPosition, double endScale, double endAngle, bool isAutoZoom);
 
   void Init(ScreenBase const & screen, TPropertyCache const & properties) override;
 
   Animation::Type GetType() const override { return Animation::Type::MapFollow; }
 
-  TAnimObjects const & GetObjects() const override
-  {
-    return m_objects;
-  }
+  TAnimObjects const & GetObjects() const override { return m_objects; }
 
-  bool HasObject(Object object) const override
-  {
-    return object == Animation::Object::MapPlane;
-  }
+  bool HasObject(Object object) const override { return object == Animation::Object::MapPlane; }
 
   TObjectProperties const & GetProperties(Object object) const override;
   bool HasProperty(Object object, ObjectProperty property) const override;
@@ -70,4 +61,4 @@ private:
   TAnimObjects m_objects;
 };
 
-} // namespace df
+}  // namespace df
diff --git a/libs/drape_frontend/animation/interpolation_holder.cpp b/libs/drape_frontend/animation/interpolation_holder.cpp
index f4c4dfae1..4819131f6 100644
--- a/libs/drape_frontend/animation/interpolation_holder.cpp
+++ b/libs/drape_frontend/animation/interpolation_holder.cpp
@@ -1,5 +1,5 @@
-#include "drape_frontend/animation/base_interpolator.hpp"
 #include "drape_frontend/animation/interpolation_holder.hpp"
+#include "drape_frontend/animation/base_interpolator.hpp"
 
 #include "base/assert.hpp"
 
diff --git a/libs/drape_frontend/animation/interpolations.cpp b/libs/drape_frontend/animation/interpolations.cpp
index b45cd4217..2bf5594c5 100644
--- a/libs/drape_frontend/animation/interpolations.cpp
+++ b/libs/drape_frontend/animation/interpolations.cpp
@@ -23,4 +23,4 @@ double InterpolateAngle(double startAngle, double endAngle, double t)
   return startAngle + ang::GetShortestDistance(startAngle, endAngle) * t;
 }
 
-} // namespace df
+}  // namespace df
diff --git a/libs/drape_frontend/animation/interpolations.hpp b/libs/drape_frontend/animation/interpolations.hpp
index 4ef59eaf1..e60d762e2 100644
--- a/libs/drape_frontend/animation/interpolations.hpp
+++ b/libs/drape_frontend/animation/interpolations.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
+#include "geometry/any_rect2d.hpp"
 #include "geometry/point2d.hpp"
 #include "geometry/rect2d.hpp"
-#include "geometry/any_rect2d.hpp"
 
 namespace df
 {
@@ -11,4 +11,4 @@ double InterpolateDouble(double startV, double endV, double t);
 m2::PointD InterpolatePoint(m2::PointD const & startPt, m2::PointD const & endPt, double t);
 double InterpolateAngle(double startAngle, double endAngle, double t);
 
-} // namespace df
+}  // namespace df
diff --git a/libs/drape_frontend/animation/interpolators.cpp b/libs/drape_frontend/animation/interpolators.cpp
index 948414707..91535ca0f 100644
--- a/libs/drape_frontend/animation/interpolators.cpp
+++ b/libs/drape_frontend/animation/interpolators.cpp
@@ -103,8 +103,8 @@ PositionInterpolator::PositionInterpolator()
   : PositionInterpolator(0.0 /* duration */, 0.0 /* delay */, m2::PointD(), m2::PointD())
 {}
 
-PositionInterpolator::PositionInterpolator(double duration, double delay,
-                                           m2::PointD const & startPosition, m2::PointD const & endPosition)
+PositionInterpolator::PositionInterpolator(double duration, double delay, m2::PointD const & startPosition,
+                                           m2::PointD const & endPosition)
   : Interpolator(duration, delay)
   , m_startPosition(startPosition)
   , m_endPosition(endPosition)
@@ -118,9 +118,8 @@ PositionInterpolator::PositionInterpolator(m2::PointD const & startPosition, m2:
   : PositionInterpolator(0.0 /* delay */, startPosition, endPosition, convertor)
 {}
 
-PositionInterpolator::PositionInterpolator(double delay,
-                                           m2::PointD const & startPosition, m2::PointD const & endPosition,
-                                           ScreenBase const & convertor)
+PositionInterpolator::PositionInterpolator(double delay, m2::PointD const & startPosition,
+                                           m2::PointD const & endPosition, ScreenBase const & convertor)
   : Interpolator(PositionInterpolator::GetMoveDuration(startPosition, endPosition, convertor), delay)
   , m_startPosition(startPosition)
   , m_endPosition(endPosition)
@@ -134,9 +133,8 @@ PositionInterpolator::PositionInterpolator(m2::PointD const & startPosition, m2:
   : PositionInterpolator(0.0 /* delay */, startPosition, endPosition, viewportRect, scale)
 {}
 
-PositionInterpolator::PositionInterpolator(double delay,
-                                           m2::PointD const & startPosition, m2::PointD const & endPosition,
-                                           m2::RectD const & viewportRect, double scale)
+PositionInterpolator::PositionInterpolator(double delay, m2::PointD const & startPosition,
+                                           m2::PointD const & endPosition, m2::RectD const & viewportRect, double scale)
   : Interpolator(PositionInterpolator::GetMoveDuration(startPosition, endPosition, viewportRect, scale), delay)
   , m_startPosition(startPosition)
   , m_endPosition(endPosition)
@@ -145,7 +143,7 @@ PositionInterpolator::PositionInterpolator(double delay,
   SetActive((GetDuration() > 0.0) && (m_startPosition != m_endPosition));
 }
 
-//static
+// static
 double PositionInterpolator::GetMoveDuration(double globalDistance, m2::RectD const & viewportRect, double scale)
 {
   double constexpr kMinMoveDuration = 0.2;
@@ -166,22 +164,20 @@ double PositionInterpolator::GetMoveDuration(double globalDistance, m2::RectD co
   return CalcAnimSpeedDuration(pixelLength, pixelSpeed);
 }
 
-//static
+// static
 double PositionInterpolator::GetMoveDuration(m2::PointD const & startPosition, m2::PointD const & endPosition,
-                              m2::RectD const & viewportRect, double scale)
+                                             m2::RectD const & viewportRect, double scale)
 {
   return GetMoveDuration(endPosition.Length(startPosition), viewportRect, scale);
 }
 
-//static
-double PositionInterpolator::GetMoveDuration(m2::PointD const & startPosition,
-                                             m2::PointD const & endPosition,
+// static
+double PositionInterpolator::GetMoveDuration(m2::PointD const & startPosition, m2::PointD const & endPosition,
                                              ScreenBase const & convertor)
 {
   return GetMoveDuration(startPosition, endPosition, convertor.PixelRectIn3d(), convertor.GetScale());
 }
 
-
 void PositionInterpolator::Advance(double elapsedSeconds)
 {
   TBase::Advance(elapsedSeconds);
@@ -235,9 +231,7 @@ void ScaleInterpolator::Finish()
   m_scale = m_endScale;
 }
 
-AngleInterpolator::AngleInterpolator()
-  : AngleInterpolator(0.0 /* startAngle */, 0.0 /* endAngle */)
-{}
+AngleInterpolator::AngleInterpolator() : AngleInterpolator(0.0 /* startAngle */, 0.0 /* endAngle */) {}
 
 AngleInterpolator::AngleInterpolator(double startAngle, double endAngle)
   : AngleInterpolator(0.0 /* delay */, startAngle, endAngle)
@@ -282,4 +276,4 @@ void AngleInterpolator::Finish()
   m_angle = m_endAngle;
 }
 
-} // namespace df
+}  // namespace df
diff --git a/libs/drape_frontend/animation/interpolators.hpp b/libs/drape_frontend/animation/interpolators.hpp
index 7041a4e9b..039875e12 100644
--- a/libs/drape_frontend/animation/interpolators.hpp
+++ b/libs/drape_frontend/animation/interpolators.hpp
@@ -21,7 +21,7 @@ public:
 
   static double constexpr kInvalidDuration = -1.0;
   void SetMaxDuration(double maxDuration);
-  void SetMinDuration(double minDuration); 
+  void SetMinDuration(double minDuration);
   double GetMaxDuration() const;
   double GetMinDuration() const;
 
@@ -41,27 +41,23 @@ private:
   bool m_isActive;
 };
 
-class PositionInterpolator: public Interpolator
+class PositionInterpolator : public Interpolator
 {
   using TBase = Interpolator;
 
 public:
   PositionInterpolator();
-  PositionInterpolator(double duration, double delay,
-                       m2::PointD const & startPosition, m2::PointD const & endPosition);
+  PositionInterpolator(double duration, double delay, m2::PointD const & startPosition, m2::PointD const & endPosition);
 
-  PositionInterpolator(m2::PointD const & startPosition, m2::PointD const & endPosition,
+  PositionInterpolator(m2::PointD const & startPosition, m2::PointD const & endPosition, ScreenBase const & convertor);
+
+  PositionInterpolator(double delay, m2::PointD const & startPosition, m2::PointD const & endPosition,
                        ScreenBase const & convertor);
 
-  PositionInterpolator(double delay,
-                       m2::PointD const & startPosition, m2::PointD const & endPosition,
-                       ScreenBase const & convertor);
+  PositionInterpolator(m2::PointD const & startPosition, m2::PointD const & endPosition, m2::RectD const & viewportRect,
+                       double scale);
 
-  PositionInterpolator(m2::PointD const & startPosition, m2::PointD const & endPosition,
-                       m2::RectD const & viewportRect, double scale);
-
-  PositionInterpolator(double delay,
-                       m2::PointD const & startPosition, m2::PointD const & endPosition,
+  PositionInterpolator(double delay, m2::PointD const & startPosition, m2::PointD const & endPosition,
                        m2::RectD const & viewportRect, double scale);
 
   static double GetMoveDuration(double globalDistance, m2::RectD const & viewportRect, double scale);
@@ -85,7 +81,7 @@ private:
   m2::PointD m_position;
 };
 
-class ScaleInterpolator: public Interpolator
+class ScaleInterpolator : public Interpolator
 {
   using TBase = Interpolator;
 
@@ -110,7 +106,7 @@ private:
   double m_scale;
 };
 
-class AngleInterpolator: public Interpolator
+class AngleInterpolator : public Interpolator
 {
   using TBase = Interpolator;
 
@@ -136,4 +132,4 @@ private:
   double m_angle;
 };
 
-} // namespace df
+}  // namespace df
diff --git a/libs/drape_frontend/animation/linear_animation.cpp b/libs/drape_frontend/animation/linear_animation.cpp
index f3120d446..e70e1c7e2 100644
--- a/libs/drape_frontend/animation/linear_animation.cpp
+++ b/libs/drape_frontend/animation/linear_animation.cpp
@@ -7,9 +7,9 @@
 namespace df
 {
 
-MapLinearAnimation::MapLinearAnimation(m2::PointD const & startPos, m2::PointD const & endPos,
-                                       double startAngle, double endAngle,
-                                       double startScale, double endScale, ScreenBase const & convertor)
+MapLinearAnimation::MapLinearAnimation(m2::PointD const & startPos, m2::PointD const & endPos, double startAngle,
+                                       double endAngle, double startScale, double endScale,
+                                       ScreenBase const & convertor)
   : Animation(true /* couldBeInterrupted */, false /* couldBeBlended */)
   , m_angleInterpolator(startAngle, endAngle)
   , m_positionInterpolator(startPos, endPos, convertor)
@@ -27,8 +27,7 @@ MapLinearAnimation::MapLinearAnimation(m2::PointD const & startPos, m2::PointD c
     m_properties.insert(Animation::ObjectProperty::Scale);
 }
 
-MapLinearAnimation::MapLinearAnimation()
-  : Animation(true /* couldBeInterrupted */, false /* couldBeBlended */)
+MapLinearAnimation::MapLinearAnimation() : Animation(true /* couldBeInterrupted */, false /* couldBeBlended */)
 {
   m_objects.insert(Animation::Object::MapPlane);
 }
@@ -60,16 +59,15 @@ void MapLinearAnimation::Init(ScreenBase const & screen, TPropertyCache const &
   m_angleInterpolator.SetMaxDuration(maxDuration);
 }
 
-void MapLinearAnimation::SetMove(m2::PointD const & startPos, m2::PointD const & endPos,
-                                 ScreenBase const & convertor)
+void MapLinearAnimation::SetMove(m2::PointD const & startPos, m2::PointD const & endPos, ScreenBase const & convertor)
 {
   m_positionInterpolator = PositionInterpolator(startPos, endPos, convertor);
   if (m_positionInterpolator.IsActive())
     m_properties.insert(Animation::ObjectProperty::Position);
 }
 
-void MapLinearAnimation::SetMove(m2::PointD const & startPos, m2::PointD const & endPos,
-                                 m2::RectD const & viewportRect, double scale)
+void MapLinearAnimation::SetMove(m2::PointD const & startPos, m2::PointD const & endPos, m2::RectD const & viewportRect,
+                                 double scale)
 {
   m_positionInterpolator = PositionInterpolator(startPos, endPos, viewportRect, scale);
   if (m_positionInterpolator.IsActive())
@@ -194,8 +192,7 @@ double MapLinearAnimation::GetMinDuration() const
 
 bool MapLinearAnimation::IsFinished() const
 {
-  return m_angleInterpolator.IsFinished() && m_scaleInterpolator.IsFinished() &&
-         m_positionInterpolator.IsFinished();
+  return m_angleInterpolator.IsFinished() && m_scaleInterpolator.IsFinished() && m_positionInterpolator.IsFinished();
 }
 
 bool MapLinearAnimation::GetProperty(Object object, ObjectProperty property, PropertyValue & value) const
@@ -208,7 +205,8 @@ bool MapLinearAnimation::GetTargetProperty(Object object, ObjectProperty propert
   return GetProperty(object, property, true /* targetValue */, value);
 }
 
-bool MapLinearAnimation::GetProperty(Object object, ObjectProperty property, bool targetValue, PropertyValue & value) const
+bool MapLinearAnimation::GetProperty(Object object, ObjectProperty property, bool targetValue,
+                                     PropertyValue & value) const
 {
   ASSERT_EQUAL(static_cast<int>(object), static_cast<int>(Animation::Object::MapPlane), ());
 
@@ -217,7 +215,8 @@ bool MapLinearAnimation::GetProperty(Object object, ObjectProperty property, boo
   case Animation::ObjectProperty::Position:
     if (m_positionInterpolator.IsActive())
     {
-      value = PropertyValue(targetValue ? m_positionInterpolator.GetTargetPosition() : m_positionInterpolator.GetPosition());
+      value = PropertyValue(targetValue ? m_positionInterpolator.GetTargetPosition()
+                                        : m_positionInterpolator.GetPosition());
       return true;
     }
     return false;
@@ -235,11 +234,10 @@ bool MapLinearAnimation::GetProperty(Object object, ObjectProperty property, boo
       return true;
     }
     return false;
-  default:
-    ASSERT(false, ("Wrong property:", static_cast<int>(property)));
+  default: ASSERT(false, ("Wrong property:", static_cast<int>(property)));
   }
 
   return false;
 }
 
-} // namespace df
+}  // namespace df
diff --git a/libs/drape_frontend/animation/linear_animation.hpp b/libs/drape_frontend/animation/linear_animation.hpp
index 2f65480a3..3a21e3adb 100644
--- a/libs/drape_frontend/animation/linear_animation.hpp
+++ b/libs/drape_frontend/animation/linear_animation.hpp
@@ -8,8 +8,7 @@ namespace df
 class MapLinearAnimation : public Animation
 {
 public:
-  MapLinearAnimation(m2::PointD const & startPos, m2::PointD const & endPos,
-                     double startAngle, double endAngle,
+  MapLinearAnimation(m2::PointD const & startPos, m2::PointD const & endPos, double startAngle, double endAngle,
                      double startScale, double endScale, ScreenBase const & convertor);
   MapLinearAnimation();
 
@@ -22,15 +21,9 @@ public:
 
   Animation::Type GetType() const override { return Animation::Type::MapLinear; }
 
-  TAnimObjects const & GetObjects() const override
-  {
-     return m_objects;
-  }
+  TAnimObjects const & GetObjects() const override { return m_objects; }
 
-  bool HasObject(Object object) const override
-  {
-    return object == Animation::Object::MapPlane;
-  }
+  bool HasObject(Object object) const override { return object == Animation::Object::MapPlane; }
 
   TObjectProperties const & GetProperties(Object object) const override;
   bool HasProperty(Object object, ObjectProperty property) const override;
diff --git a/libs/drape_frontend/animation/opacity_animation.cpp b/libs/drape_frontend/animation/opacity_animation.cpp
index aba039514..994bfd003 100644
--- a/libs/drape_frontend/animation/opacity_animation.cpp
+++ b/libs/drape_frontend/animation/opacity_animation.cpp
@@ -6,16 +6,14 @@ namespace df
 
 OpacityAnimation::OpacityAnimation(double duration, double startOpacity, double endOpacity)
   : OpacityAnimation(duration, 0.0, startOpacity, endOpacity)
-{
-}
+{}
 
 OpacityAnimation::OpacityAnimation(double duration, double delay, double startOpacity, double endOpacity)
   : BaseInterpolator(duration, delay)
   , m_startOpacity(startOpacity)
   , m_endOpacity(endOpacity)
   , m_opacity(startOpacity)
-{
-}
+{}
 
 void OpacityAnimation::Advance(double elapsedSeconds)
 {
@@ -23,4 +21,4 @@ void OpacityAnimation::Advance(double elapsedSeconds)
   m_opacity = InterpolateDouble(m_startOpacity, m_endOpacity, GetT());
 }
 
-}
+}  // namespace df
diff --git a/libs/drape_frontend/animation/parallel_animation.cpp b/libs/drape_frontend/animation/parallel_animation.cpp
index ead49f9fa..442cee9ef 100644
--- a/libs/drape_frontend/animation/parallel_animation.cpp
+++ b/libs/drape_frontend/animation/parallel_animation.cpp
@@ -7,9 +7,7 @@
 namespace df
 {
 
-ParallelAnimation::ParallelAnimation()
-  : Animation(true /* couldBeInterrupted */, true /* couldBeBlended */)
-{}
+ParallelAnimation::ParallelAnimation() : Animation(true /* couldBeInterrupted */, true /* couldBeBlended */) {}
 
 void ParallelAnimation::Init(ScreenBase const & screen, TPropertyCache const & properties)
 {
@@ -55,10 +53,8 @@ bool ParallelAnimation::HasTargetProperty(Object object, ObjectProperty property
 {
   ASSERT(!m_animations.empty(), ());
   for (auto const & anim : m_animations)
-  {
     if (anim->HasTargetProperty(object, property))
       return true;
-  }
   return false;
 }
 
@@ -119,10 +115,8 @@ bool ParallelAnimation::GetProperty(Object object, ObjectProperty property, Prop
 {
   ASSERT(!m_animations.empty(), ());
   for (auto const & anim : m_animations)
-  {
     if (anim->HasProperty(object, property))
       return anim->GetProperty(object, property, value);
-  }
   return false;
 }
 
@@ -130,10 +124,8 @@ bool ParallelAnimation::GetTargetProperty(Object object, ObjectProperty property
 {
   ASSERT(!m_animations.empty(), ());
   for (auto const & anim : m_animations)
-  {
     if (anim->HasProperty(object, property))
       return anim->GetTargetProperty(object, property, value);
-  }
   return false;
 }
 
@@ -211,4 +203,4 @@ void ParallelAnimation::ObtainObjectProperties()
   }
 }
 
-} // namespace df
+}  // namespace df
diff --git a/libs/drape_frontend/animation/parallel_animation.hpp b/libs/drape_frontend/animation/parallel_animation.hpp
index 804b73ee6..292e777ca 100644
--- a/libs/drape_frontend/animation/parallel_animation.hpp
+++ b/libs/drape_frontend/animation/parallel_animation.hpp
@@ -47,12 +47,12 @@ public:
   bool GetProperty(Object object, ObjectProperty property, PropertyValue & value) const override;
   bool GetTargetProperty(Object object, ObjectProperty property, PropertyValue & value) const override;
 
-  template<typename T> T const * FindAnimation(Animation::Type type, char const * customType = nullptr) const
+  template <typename T>
+  T const * FindAnimation(Animation::Type type, char const * customType = nullptr) const
   {
     for (auto const & anim : m_animations)
     {
-      if ((anim->GetType() == type) &&
-          (customType == nullptr || anim->GetCustomType() == customType))
+      if ((anim->GetType() == type) && (customType == nullptr || anim->GetCustomType() == customType))
       {
         ASSERT(dynamic_cast<T const *>(anim.get()) != nullptr, ());
         return static_cast<T const *>(anim.get());
@@ -71,4 +71,4 @@ private:
   std::string m_customType;
 };
 
-} // namespace df
+}  // namespace df
diff --git a/libs/drape_frontend/animation/scale_animation.cpp b/libs/drape_frontend/animation/scale_animation.cpp
index acb09f67c..75b16747d 100644
--- a/libs/drape_frontend/animation/scale_animation.cpp
+++ b/libs/drape_frontend/animation/scale_animation.cpp
@@ -27,7 +27,8 @@ void MapScaleAnimation::Init(ScreenBase const & screen, TPropertyCache const & p
   double const minDuration = m_scaleInterpolator.GetMinDuration();
   double const maxDuration = m_scaleInterpolator.GetMaxDuration();
 
-  m_scaleInterpolator = ScaleInterpolator(currentScreen.GetScale(), m_scaleInterpolator.GetTargetScale(), false /* isAutoZoom */);
+  m_scaleInterpolator =
+      ScaleInterpolator(currentScreen.GetScale(), m_scaleInterpolator.GetTargetScale(), false /* isAutoZoom */);
 
   m_scaleInterpolator.SetMinDuration(minDuration);
   m_scaleInterpolator.SetMaxDuration(maxDuration);
@@ -85,7 +86,8 @@ bool MapScaleAnimation::IsFinished() const
   return m_scaleInterpolator.IsFinished();
 }
 
-bool MapScaleAnimation::GetProperty(Object object, ObjectProperty property, bool targetValue, PropertyValue & value) const
+bool MapScaleAnimation::GetProperty(Object object, ObjectProperty property, bool targetValue,
+                                    PropertyValue & value) const
 {
   ASSERT_EQUAL(static_cast<int>(object), static_cast<int>(Animation::Object::MapPlane), ());
 
@@ -116,4 +118,4 @@ bool MapScaleAnimation::GetProperty(Object object, ObjectProperty property, Prop
   return GetProperty(object, property, false /* targetValue */, value);
 }
 
-} // namespace df
+}  // namespace df
diff --git a/libs/drape_frontend/animation/scale_animation.hpp b/libs/drape_frontend/animation/scale_animation.hpp
index 9fcaf265b..d6066988b 100644
--- a/libs/drape_frontend/animation/scale_animation.hpp
+++ b/libs/drape_frontend/animation/scale_animation.hpp
@@ -9,22 +9,16 @@ namespace df
 class MapScaleAnimation : public Animation
 {
 public:
-  MapScaleAnimation(double startScale, double endScale,
-                    m2::PointD const & globalScaleCenter, m2::PointD const & pxScaleCenter);
+  MapScaleAnimation(double startScale, double endScale, m2::PointD const & globalScaleCenter,
+                    m2::PointD const & pxScaleCenter);
 
   void Init(ScreenBase const & screen, TPropertyCache const & properties) override;
 
   Animation::Type GetType() const override { return Animation::Type::MapScale; }
 
-  TAnimObjects const & GetObjects() const override
-  {
-    return m_objects;
-  }
+  TAnimObjects const & GetObjects() const override { return m_objects; }
 
-  bool HasObject(Object object) const override
-  {
-    return object == Animation::Object::MapPlane;
-  }
+  bool HasObject(Object object) const override { return object == Animation::Object::MapPlane; }
 
   TObjectProperties const & GetProperties(Object object) const override;
   bool HasProperty(Object object, ObjectProperty property) const override;
@@ -52,5 +46,4 @@ private:
   TAnimObjects m_objects;
 };
 
-} // namespace df
-
+}  // namespace df
diff --git a/libs/drape_frontend/animation/sequence_animation.cpp b/libs/drape_frontend/animation/sequence_animation.cpp
index 6bdda2618..66a4a6fdf 100644
--- a/libs/drape_frontend/animation/sequence_animation.cpp
+++ b/libs/drape_frontend/animation/sequence_animation.cpp
@@ -7,10 +7,7 @@
 namespace df
 {
 
-SequenceAnimation::SequenceAnimation()
-  : Animation(true /* couldBeInterrupted */, true /* couldBeBlended */)
-{
-}
+SequenceAnimation::SequenceAnimation() : Animation(true /* couldBeInterrupted */, true /* couldBeBlended */) {}
 
 void SequenceAnimation::Init(ScreenBase const & screen, TPropertyCache const & properties)
 {
@@ -18,9 +15,15 @@ void SequenceAnimation::Init(ScreenBase const & screen, TPropertyCache const & p
     m_animations.front()->Init(screen, properties);
 }
 
-std::string SequenceAnimation::GetCustomType() const { return m_customType; }
+std::string SequenceAnimation::GetCustomType() const
+{
+  return m_customType;
+}
 
-void SequenceAnimation::SetCustomType(std::string const & type) { m_customType = type; }
+void SequenceAnimation::SetCustomType(std::string const & type)
+{
+  m_customType = type;
+}
 
 Animation::TAnimObjects const & SequenceAnimation::GetObjects() const
 {
@@ -51,10 +54,8 @@ bool SequenceAnimation::HasTargetProperty(Object object, ObjectProperty property
 {
   ASSERT(!m_animations.empty(), ());
   for (auto const & anim : m_animations)
-  {
     if (anim->HasTargetProperty(object, property))
       return true;
-  }
   return false;
 }
 
@@ -192,4 +193,4 @@ void SequenceAnimation::ObtainObjectProperties()
   }
 }
 
-} // namespace df
+}  // namespace df
diff --git a/libs/drape_frontend/animation/sequence_animation.hpp b/libs/drape_frontend/animation/sequence_animation.hpp
index c5116c4ba..9e7e76e41 100644
--- a/libs/drape_frontend/animation/sequence_animation.hpp
+++ b/libs/drape_frontend/animation/sequence_animation.hpp
@@ -35,8 +35,8 @@ public:
   double GetMinDuration() const override;
   bool IsFinished() const override;
 
-  bool GetProperty(Object object, ObjectProperty property, PropertyValue &value) const override;
-  bool GetTargetProperty(Object object, ObjectProperty property, PropertyValue &value) const override;
+  bool GetProperty(Object object, ObjectProperty property, PropertyValue & value) const override;
+  bool GetTargetProperty(Object object, ObjectProperty property, PropertyValue & value) const override;
 
   void AddAnimation(drape_ptr<Animation> && animation);
 
@@ -56,5 +56,4 @@ private:
   std::string m_customType;
 };
 
-} // namespace df
-
+}  // namespace df
diff --git a/libs/drape_frontend/animation/show_hide_animation.cpp b/libs/drape_frontend/animation/show_hide_animation.cpp
index 60903c08f..457058211 100644
--- a/libs/drape_frontend/animation/show_hide_animation.cpp
+++ b/libs/drape_frontend/animation/show_hide_animation.cpp
@@ -9,22 +9,20 @@ namespace df
 class ShowHideAnimation::ShowHideInterpolator : public BaseInterpolator
 {
 public:
-  ShowHideInterpolator(ShowHideAnimation::EState & state, double startT, double endT,
-                       double duration)
-    : BaseInterpolator(duration), m_state(state), m_startT(startT), m_endT(endT)
+  ShowHideInterpolator(ShowHideAnimation::EState & state, double startT, double endT, double duration)
+    : BaseInterpolator(duration)
+    , m_state(state)
+    , m_startT(startT)
+    , m_endT(endT)
   {
-    m_state = m_endT > m_startT ? ShowHideAnimation::STATE_SHOW_DIRECTION
-                                : ShowHideAnimation::STATE_HIDE_DIRECTION;
+    m_state = m_endT > m_startT ? ShowHideAnimation::STATE_SHOW_DIRECTION : ShowHideAnimation::STATE_HIDE_DIRECTION;
   }
 
   void Advance(double elapsedSeconds) override
   {
     BaseInterpolator::Advance(elapsedSeconds);
     if (IsFinished())
-    {
-      m_state = m_endT > m_startT ? ShowHideAnimation::STATE_VISIBLE
-                                  : ShowHideAnimation::STATE_INVISIBLE;
-    }
+      m_state = m_endT > m_startT ? ShowHideAnimation::STATE_VISIBLE : ShowHideAnimation::STATE_INVISIBLE;
   }
 
   double GetCurrentT() const { return m_startT + (m_endT - m_startT) * GetT(); }
@@ -57,7 +55,7 @@ void ShowHideAnimation::Show()
 
 void ShowHideAnimation::ShowAnimated()
 {
-  RefreshInterpolator({{ STATE_VISIBLE, STATE_SHOW_DIRECTION }}, 1.0);
+  RefreshInterpolator({{STATE_VISIBLE, STATE_SHOW_DIRECTION}}, 1.0);
 }
 
 void ShowHideAnimation::Hide()
@@ -72,7 +70,7 @@ void ShowHideAnimation::Hide()
 
 void ShowHideAnimation::HideAnimated()
 {
-  RefreshInterpolator({{ STATE_INVISIBLE, STATE_HIDE_DIRECTION }}, 0.0);
+  RefreshInterpolator({{STATE_INVISIBLE, STATE_HIDE_DIRECTION}}, 0.0);
 }
 
 ShowHideAnimation::EState ShowHideAnimation::GetState() const
diff --git a/libs/drape_frontend/animation/value_mapping.hpp b/libs/drape_frontend/animation/value_mapping.hpp
index 8dc6f2146..b5e83f41a 100644
--- a/libs/drape_frontend/animation/value_mapping.hpp
+++ b/libs/drape_frontend/animation/value_mapping.hpp
@@ -16,6 +16,7 @@ class ValueMapping
   using TRangePoint = std::pair<double, TValue>;
   using TRangeVector = buffer_vector<TRangePoint, 8>;
   using TRangeIter = typename TRangeVector::const_iterator;
+
 public:
   ValueMapping() = default;
 
@@ -71,4 +72,4 @@ private:
   TRangeVector m_ranges;
 };
 
-}
+}  // namespace df
diff --git a/libs/drape_frontend/animation_constants.hpp b/libs/drape_frontend/animation_constants.hpp
index 35cf0696a..ced06a4b0 100644
--- a/libs/drape_frontend/animation_constants.hpp
+++ b/libs/drape_frontend/animation_constants.hpp
@@ -2,6 +2,6 @@
 
 namespace df
 {
-double const kMaxAnimationTimeSec = 1.5; // in seconds
+double const kMaxAnimationTimeSec = 1.5;  // in seconds
 
-} // namespace df
+}  // namespace df
diff --git a/libs/drape_frontend/animation_system.cpp b/libs/drape_frontend/animation_system.cpp
index a1f835f64..8bda5cdcf 100644
--- a/libs/drape_frontend/animation_system.cpp
+++ b/libs/drape_frontend/animation_system.cpp
@@ -54,10 +54,7 @@ public:
     return m_value;
   }
 
-  bool IsEmpty() const
-  {
-    return m_counter == 0;
-  }
+  bool IsEmpty() const { return m_counter == 0; }
 
 private:
   Animation::PropertyValue m_value;
@@ -72,17 +69,16 @@ void AnimationSystem::UpdateLastScreen(ScreenBase const & currentScreen)
 
 bool AnimationSystem::GetScreen(ScreenBase const & currentScreen, ScreenBase & screen)
 {
-  return GetScreen(currentScreen, std::bind(&AnimationSystem::GetProperty, this, _1, _2, _3),
-                   screen);
+  return GetScreen(currentScreen, std::bind(&AnimationSystem::GetProperty, this, _1, _2, _3), screen);
 }
 
 void AnimationSystem::GetTargetScreen(ScreenBase const & currentScreen, ScreenBase & screen)
 {
-  GetScreen(currentScreen, std::bind(&AnimationSystem::GetTargetProperty, this, _1, _2, _3),
-            screen);
+  GetScreen(currentScreen, std::bind(&AnimationSystem::GetTargetProperty, this, _1, _2, _3), screen);
 }
 
-bool AnimationSystem::GetScreen(ScreenBase const & currentScreen, TGetPropertyFn const & getPropertyFn,  ScreenBase & screen)
+bool AnimationSystem::GetScreen(ScreenBase const & currentScreen, TGetPropertyFn const & getPropertyFn,
+                                ScreenBase & screen)
 {
   ASSERT(getPropertyFn != nullptr, ());
 
@@ -135,16 +131,12 @@ bool AnimationSystem::AnimationExists(Animation::Object object) const
   if (!m_animationChain.empty())
   {
     for (auto const & anim : *(m_animationChain.front()))
-    {
       if (anim->HasObject(object))
         return true;
-    }
   }
   for (auto const & prop : m_propertyCache)
-  {
     if (prop.first.first == object)
       return true;
-  }
   return false;
 }
 
@@ -240,7 +232,7 @@ void AnimationSystem::CombineAnimation(drape_ptr<Animation> && animation)
 
     startImmediately = false;
   }
-  
+
   PushAnimation(std::move(animation));
 }
 
@@ -281,8 +273,8 @@ void AnimationSystem::FinishAnimations(std::function<bool(std::shared_ptr<Animat
     if (predicate(anim))
     {
 #ifdef DEBUG_ANIMATIONS
-      LOG(LINFO, ("Finish animation", anim->GetType(), ", rewind:", rewind,
-                  ", couldBeRewinded:", anim->CouldBeRewinded()));
+      LOG(LINFO,
+          ("Finish animation", anim->GetType(), ", rewind:", rewind, ", couldBeRewinded:", anim->CouldBeRewinded()));
       changed = true;
 #endif
       finishAnimations.splice(finishAnimations.end(), frontList, it++);
@@ -335,23 +327,21 @@ void AnimationSystem::FinishAnimations(std::function<bool(std::shared_ptr<Animat
 
 void AnimationSystem::FinishAnimations(Animation::Type type, bool rewind, bool finishAll)
 {
-  FinishAnimations([&type](std::shared_ptr<Animation> const & anim) { return anim->GetType() == type; },
-                   rewind, finishAll);
+  FinishAnimations([&type](std::shared_ptr<Animation> const & anim) { return anim->GetType() == type; }, rewind,
+                   finishAll);
 }
 
-void AnimationSystem::FinishAnimations(Animation::Type type, std::string const & customType,
-                                       bool rewind, bool finishAll)
+void AnimationSystem::FinishAnimations(Animation::Type type, std::string const & customType, bool rewind,
+                                       bool finishAll)
 {
   FinishAnimations([&type, &customType](std::shared_ptr<Animation> const & anim)
-  {
-    return anim->GetType() == type && anim->GetCustomType() == customType;
-  }, rewind, finishAll);
+  { return anim->GetType() == type && anim->GetCustomType() == customType; }, rewind, finishAll);
 }
 
 void AnimationSystem::FinishObjectAnimations(Animation::Object object, bool rewind, bool finishAll)
 {
-  FinishAnimations([&object](std::shared_ptr<Animation> const & anim) { return anim->HasObject(object); },
-                   rewind, finishAll);
+  FinishAnimations([&object](std::shared_ptr<Animation> const & anim) { return anim->HasObject(object); }, rewind,
+                   finishAll);
 }
 
 void AnimationSystem::Advance(double elapsedSeconds)
@@ -366,13 +356,9 @@ void AnimationSystem::Advance(double elapsedSeconds)
     auto & anim = *it;
     anim->Advance(elapsedSeconds);
     if (anim->IsFinished())
-    {
       finishedAnimations.splice(finishedAnimations.end(), frontList, it++);
-    }
     else
-    {
       ++it;
-    }
   }
   for (auto & anim : finishedAnimations)
   {
@@ -397,7 +383,6 @@ void AnimationSystem::Print()
       auto & anim = *it;
       LOG(LINFO, ("Type:", anim->GetType()));
     }
-
   }
   LOG(LINFO, ("========================Animation chain end========================"));
 }
diff --git a/libs/drape_frontend/animation_system.hpp b/libs/drape_frontend/animation_system.hpp
index 05a997c66..d12317f41 100644
--- a/libs/drape_frontend/animation_system.hpp
+++ b/libs/drape_frontend/animation_system.hpp
@@ -38,11 +38,11 @@ public:
   void PushAnimation(drape_ptr<Animation> && animation);
 
   void FinishAnimations(Animation::Type type, bool rewind, bool finishAll);
-  void FinishAnimations(Animation::Type type, std::string const & customType, bool rewind,
-                        bool finishAll);
+  void FinishAnimations(Animation::Type type, std::string const & customType, bool rewind, bool finishAll);
   void FinishObjectAnimations(Animation::Object object, bool rewind, bool finishAll);
 
-  template<typename T> T const * FindAnimation(Animation::Type type, char const * customType = nullptr) const
+  template <typename T>
+  T const * FindAnimation(Animation::Type type, char const * customType = nullptr) const
   {
     for (auto & pList : m_animationChain)
     {
@@ -65,20 +65,20 @@ public:
   ScreenBase const & GetLastScreen() { return m_lastScreen; }
   void SaveAnimationResult(Animation const & animation);
 
-private:  
+private:
   AnimationSystem() = default;
 
   using TGetPropertyFn = std::function<bool(Animation::Object object, Animation::ObjectProperty property,
-                                                                      Animation::PropertyValue & value)>;
-  bool GetScreen(ScreenBase const & currentScreen, TGetPropertyFn const & getPropertyFn,  ScreenBase & screen);
+                                            Animation::PropertyValue & value)>;
+  bool GetScreen(ScreenBase const & currentScreen, TGetPropertyFn const & getPropertyFn, ScreenBase & screen);
 
   bool GetProperty(Animation::Object object, Animation::ObjectProperty property,
                    Animation::PropertyValue & value) const;
   bool GetTargetProperty(Animation::Object object, Animation::ObjectProperty property,
-                   Animation::PropertyValue & value) const;
+                         Animation::PropertyValue & value) const;
   void StartNextAnimations();
-  void FinishAnimations(std::function<bool(std::shared_ptr<Animation> const &)> const & predicate,
-                        bool rewind, bool finishAll);
+  void FinishAnimations(std::function<bool(std::shared_ptr<Animation> const &)> const & predicate, bool rewind,
+                        bool finishAll);
 
 #ifdef DEBUG_ANIMATIONS
   void Print();
@@ -86,8 +86,7 @@ private:
 
   using TAnimationList = std::list<std::shared_ptr<Animation>>;
   using TAnimationChain = std::deque<std::shared_ptr<TAnimationList>>;
-  using TPropertyCache = std::map<std::pair<Animation::Object, Animation::ObjectProperty>,
-                                  Animation::PropertyValue>;
+  using TPropertyCache = std::map<std::pair<Animation::Object, Animation::ObjectProperty>, Animation::PropertyValue>;
 
   TAnimationChain m_animationChain;
   mutable TPropertyCache m_propertyCache;
diff --git a/libs/drape_frontend/animation_utils.cpp b/libs/drape_frontend/animation_utils.cpp
index 09ad46850..2f8d4dc0f 100644
--- a/libs/drape_frontend/animation_utils.cpp
+++ b/libs/drape_frontend/animation_utils.cpp
@@ -12,4 +12,4 @@ bool IsAnimationAllowed(double duration, ScreenBase const & screen)
   return duration > 0.0 && duration <= kMaxAnimationTimeSec;
 }
 
-} // namespace df
+}  // namespace df
diff --git a/libs/drape_frontend/animation_utils.hpp b/libs/drape_frontend/animation_utils.hpp
index e85c4a60d..8f591725c 100644
--- a/libs/drape_frontend/animation_utils.hpp
+++ b/libs/drape_frontend/animation_utils.hpp
@@ -7,4 +7,4 @@ namespace df
 
 bool IsAnimationAllowed(double duration, ScreenBase const & screen);
 
-} // namespace df
+}  // namespace df
diff --git a/libs/drape_frontend/apply_feature_functors.cpp b/libs/drape_frontend/apply_feature_functors.cpp
index 04c88964f..f8e1654b2 100644
--- a/libs/drape_frontend/apply_feature_functors.cpp
+++ b/libs/drape_frontend/apply_feature_functors.cpp
@@ -78,8 +78,8 @@ public:
     for (std::pair<int, TValue> const & v : zoomValues)
     {
       int const filtered = v.second.m_readPoints - v.second.m_neededPoints;
-      LOG(LINFO, ("Zoom =", v.first, "Filtered", 100 * filtered / (double)v.second.m_readPoints, "% (",
-                  filtered, "out of", v.second.m_readPoints, "points)"));
+      LOG(LINFO, ("Zoom =", v.first, "Filtered", 100 * filtered / (double)v.second.m_readPoints, "% (", filtered,
+                  "out of", v.second.m_readPoints, "points)"));
     }
   }
 
@@ -134,26 +134,18 @@ void ExtractLineParams(LineRuleProto const & lineRule, LineViewParams & params)
 
   switch (lineRule.cap())
   {
-  case ::ROUNDCAP : params.m_cap = dp::RoundCap;
-    break;
-  case ::BUTTCAP  : params.m_cap = dp::ButtCap;
-    break;
-  case ::SQUARECAP: params.m_cap = dp::SquareCap;
-    break;
-  default:
-    CHECK(false, ());
+  case ::ROUNDCAP: params.m_cap = dp::RoundCap; break;
+  case ::BUTTCAP: params.m_cap = dp::ButtCap; break;
+  case ::SQUARECAP: params.m_cap = dp::SquareCap; break;
+  default: CHECK(false, ());
   }
 
   switch (lineRule.join())
   {
-  case ::NOJOIN    : params.m_join = dp::MiterJoin;
-    break;
-  case ::ROUNDJOIN : params.m_join = dp::RoundJoin;
-    break;
-  case ::BEVELJOIN : params.m_join = dp::BevelJoin;
-    break;
-  default:
-    CHECK(false, ());
+  case ::NOJOIN: params.m_join = dp::MiterJoin; break;
+  case ::ROUNDJOIN: params.m_join = dp::RoundJoin; break;
+  case ::BEVELJOIN: params.m_join = dp::BevelJoin; break;
+  default: CHECK(false, ());
   }
 }
 
@@ -198,13 +190,12 @@ dp::Anchor GetAnchor(int offsetX, int offsetY)
 m2::PointF GetOffset(int offsetX, int offsetY)
 {
   double const vs = VisualParams::Instance().GetVisualScale();
-  return { static_cast<float>(offsetX * vs), static_cast<float>(offsetY * vs) };
+  return {static_cast<float>(offsetX * vs), static_cast<float>(offsetY * vs)};
 }
 
 bool IsSymbolRoadShield(ftypes::RoadShield const & shield)
 {
-  return shield.m_type == ftypes::RoadShieldType::US_Interstate ||
-         shield.m_type == ftypes::RoadShieldType::US_Highway;
+  return shield.m_type == ftypes::RoadShieldType::US_Interstate || shield.m_type == ftypes::RoadShieldType::US_Highway;
 }
 
 std::string GetRoadShieldSymbolName(ftypes::RoadShield const & shield, double fontScale)
@@ -216,9 +207,7 @@ std::string GetRoadShieldSymbolName(ftypes::RoadShield const & shield, double fo
   else if (shield.m_type == ftypes::RoadShieldType::US_Highway)
     result = shield.m_name.size() <= 2 ? "shield-us-hw-thin" : "shield-us-hw-wide";
   else
-  {
     ASSERT(false, ("This shield type doesn't support symbols:", shield.m_type));
-  }
 
   if (fontScale > 1.0)
     result += "-scaled";
@@ -228,8 +217,7 @@ std::string GetRoadShieldSymbolName(ftypes::RoadShield const & shield, double fo
 
 bool IsColoredRoadShield(ftypes::RoadShield const & shield)
 {
-  return shield.m_type == ftypes::RoadShieldType::Default ||
-         shield.m_type == ftypes::RoadShieldType::UK_Highway ||
+  return shield.m_type == ftypes::RoadShieldType::Default || shield.m_type == ftypes::RoadShieldType::UK_Highway ||
          shield.m_type == ftypes::RoadShieldType::Generic_White ||
          shield.m_type == ftypes::RoadShieldType::Generic_Blue ||
          shield.m_type == ftypes::RoadShieldType::Generic_Green ||
@@ -250,8 +238,7 @@ void UpdateRoadShieldTextFont(dp::FontDecl & font, ftypes::RoadShield const & sh
       {RoadShieldType::US_Interstate, kRoadShieldWhiteTextColor},
       {RoadShieldType::US_Highway, kRoadShieldBlackTextColor},
       {RoadShieldType::Generic_Red, kRoadShieldWhiteTextColor},
-      {RoadShieldType::Generic_Orange, kRoadShieldBlackTextColor}
-  };
+      {RoadShieldType::Generic_Orange, kRoadShieldBlackTextColor}};
 
   if (auto const * cl = kColors.Find(shield.m_type); cl)
     font.m_color = df::GetColorConstant(*cl);
@@ -266,8 +253,7 @@ dp::Color GetRoadShieldColor(dp::Color const & baseColor, ftypes::RoadShield con
       {RoadShieldType::Generic_Blue, kRoadShieldBlueBackgroundColor},
       {RoadShieldType::UK_Highway, kRoadShieldGreenBackgroundColor},
       {RoadShieldType::Generic_Red, kRoadShieldRedBackgroundColor},
-      {RoadShieldType::Generic_Orange, kRoadShieldOrangeBackgroundColor}
-  };
+      {RoadShieldType::Generic_Orange, kRoadShieldOrangeBackgroundColor}};
 
   if (auto const * cl = kColors.Find(shield.m_type); cl)
     return df::GetColorConstant(*cl);
@@ -277,10 +263,8 @@ dp::Color GetRoadShieldColor(dp::Color const & baseColor, ftypes::RoadShield con
 
 float GetRoadShieldOutlineWidth(float baseWidth, ftypes::RoadShield const & shield)
 {
-  if (shield.m_type == ftypes::RoadShieldType::UK_Highway ||
-      shield.m_type == ftypes::RoadShieldType::Generic_Blue ||
-      shield.m_type == ftypes::RoadShieldType::Generic_Green ||
-      shield.m_type == ftypes::RoadShieldType::Generic_Red)
+  if (shield.m_type == ftypes::RoadShieldType::UK_Highway || shield.m_type == ftypes::RoadShieldType::Generic_Blue ||
+      shield.m_type == ftypes::RoadShieldType::Generic_Green || shield.m_type == ftypes::RoadShieldType::Generic_Red)
     return 0.0f;
 
   return baseWidth;
@@ -290,18 +274,24 @@ dp::Anchor GetShieldAnchor(uint8_t shieldIndex, uint8_t shieldCount)
 {
   switch (shieldCount)
   {
-    case 2:
-      if (shieldIndex == 0) return dp::Bottom;
-      return dp::Top;
-    case 3:
-      if (shieldIndex == 0) return dp::RightBottom;
-      else if (shieldIndex == 1) return dp::LeftBottom;
-      return dp::Top;
-    case 4:
-      if (shieldIndex == 0) return dp::RightBottom;
-      else if (shieldIndex == 1) return dp::LeftBottom;
-      else if (shieldIndex == 2) return dp::RightTop;
-      return dp::LeftTop;
+  case 2:
+    if (shieldIndex == 0)
+      return dp::Bottom;
+    return dp::Top;
+  case 3:
+    if (shieldIndex == 0)
+      return dp::RightBottom;
+    else if (shieldIndex == 1)
+      return dp::LeftBottom;
+    return dp::Top;
+  case 4:
+    if (shieldIndex == 0)
+      return dp::RightBottom;
+    else if (shieldIndex == 1)
+      return dp::LeftBottom;
+    else if (shieldIndex == 2)
+      return dp::RightTop;
+    return dp::LeftTop;
   }
   // A single shield.
   return dp::Center;
@@ -322,8 +312,7 @@ m2::PointF GetShieldOffset(dp::Anchor anchor, double paddingWidth, double paddin
   return offset;
 }
 
-void CalculateRoadShieldPositions(std::vector<double> const & offsets,
-                                  m2::SharedSpline const & spline,
+void CalculateRoadShieldPositions(std::vector<double> const & offsets, m2::SharedSpline const & spline,
                                   std::vector<m2::PointD> & shieldPositions)
 {
   ASSERT(!offsets.empty(), ());
@@ -342,8 +331,8 @@ void CalculateRoadShieldPositions(std::vector<double> const & offsets,
 }
 }  // namespace
 
-BaseApplyFeature::BaseApplyFeature(TileKey const & tileKey, TInsertShapeFn const & insertShape,
-                                   FeatureType & f, CaptionDescription const & captions)
+BaseApplyFeature::BaseApplyFeature(TileKey const & tileKey, TInsertShapeFn const & insertShape, FeatureType & f,
+                                   CaptionDescription const & captions)
   : m_insertShape(insertShape)
   , m_f(f)
   , m_captions(captions)
@@ -361,8 +350,7 @@ void BaseApplyFeature::FillCommonParams(CommonOverlayViewParams & p) const
 }
 
 void ApplyPointFeature::ExtractCaptionParams(CaptionDefProto const * primaryProto,
-                                             CaptionDefProto const * secondaryProto,
-                                             TextViewParams & params) const
+                                             CaptionDefProto const * secondaryProto, TextViewParams & params) const
 {
   FillCommonParams(params);
   params.m_depthLayer = DepthLayer::OverlayLayer;
@@ -419,7 +407,8 @@ double BaseApplyFeature::PriorityToDepth(int priority, drule::TypeT ruleType, do
   {
     // Note we don't adjust priorities of "point-styles" according to layer=*,
     // because their priorities are used for displacement logic only.
-    /// @todo(pastk) we might want to hide e.g. a trash bin under man_made=bridge or a bench on underground railway station?
+    /// @todo(pastk) we might want to hide e.g. a trash bin under man_made=bridge or a bench on underground railway
+    /// station?
 
     // Check overlays priorities range.
     ASSERT(-drule::kOverlaysMaxPriority <= depth && depth < drule::kOverlaysMaxPriority, (depth, m_f.DebugString()));
@@ -457,8 +446,8 @@ void ApplyPointFeature::ProcessPointRules(SymbolRuleProto const * symbolRule, Ca
     params.m_symbolName = symbolRule->name();
     ASSERT_GREATER_OR_EQUAL(symbolRule->min_distance(), 0, ());
     auto const & vp = df::VisualParams::Instance();
-    params.m_extendingSize = static_cast<uint32_t>(vp.GetVisualScale() * symbolRule->min_distance() *
-                                                   vp.GetPoiExtendScale());
+    params.m_extendingSize =
+        static_cast<uint32_t>(vp.GetVisualScale() * symbolRule->min_distance() * vp.GetPoiExtendScale());
     params.m_posZ = m_posZ;
     params.m_hasArea = HasArea();
     params.m_prioritized = createdByEditor;
@@ -497,9 +486,9 @@ void ApplyPointFeature::ProcessPointRules(SymbolRuleProto const * symbolRule, Ca
       params.m_titleDecl.m_anchor = GetAnchor(0, 1);
 
     params.m_startOverlayRank = symbolRule ? dp::OverlayRank1 : dp::OverlayRank0;
-    auto shape = make_unique_dp<TextShape>(centerPoint, params, m_tileKey, symbolSize,
-                                           m2::PointF(0.0f, 0.0f) /* symbolOffset */,
-                                           dp::Center /* symbolAnchor */, 0 /* textIndex */);
+    auto shape =
+        make_unique_dp<TextShape>(centerPoint, params, m_tileKey, symbolSize, m2::PointF(0.0f, 0.0f) /* symbolOffset */,
+                                  dp::Center /* symbolAnchor */, 0 /* textIndex */);
     m_insertShape(std::move(shape));
   }
 
@@ -527,14 +516,13 @@ void ApplyPointFeature::ProcessPointRules(SymbolRuleProto const * symbolRule, Ca
       }
     }
     m_insertShape(make_unique_dp<TextShape>(centerPoint, params, m_tileKey, symbolSize,
-                                            m2::PointF(0.0f, 0.0f) /* symbolOffset */,
-                                            dp::Center /* symbolAnchor */, 0 /* textIndex */));
+                                            m2::PointF(0.0f, 0.0f) /* symbolOffset */, dp::Center /* symbolAnchor */,
+                                            0 /* textIndex */));
   }
 }
 
-ApplyAreaFeature::ApplyAreaFeature(TileKey const & tileKey, TInsertShapeFn const & insertShape,
-                                   FeatureType & f, double currentScaleGtoP, bool isBuilding,
-                                   float minPosZ, float posZ,
+ApplyAreaFeature::ApplyAreaFeature(TileKey const & tileKey, TInsertShapeFn const & insertShape, FeatureType & f,
+                                   double currentScaleGtoP, bool isBuilding, float minPosZ, float posZ,
                                    CaptionDescription const & captions)
   : TBase(tileKey, insertShape, f, captions)
   , m_minPosZ(minPosZ)
@@ -556,8 +544,8 @@ void ApplyAreaFeature::operator()(m2::PointD const & p1, m2::PointD const & p2,
 
   m2::PointD const v1 = p2 - p1;
   m2::PointD const v2 = p3 - p1;
-  //TODO(pastk) : degenerate triangles filtering should be done in the generator.
-  // ASSERT(!v1.IsAlmostZero() && !v2.IsAlmostZero(), ());
+  // TODO(pastk) : degenerate triangles filtering should be done in the generator.
+  //  ASSERT(!v1.IsAlmostZero() && !v2.IsAlmostZero(), ());
   if (v1.IsAlmostZero() || v2.IsAlmostZero())
     return;
 
@@ -584,8 +572,7 @@ void ApplyAreaFeature::operator()(m2::PointD const & p1, m2::PointD const & p2,
     m2::ClipTriangleByRect(m_tileRect, p1, p3, p2, clipFunctor);
 }
 
-void ApplyAreaFeature::ProcessBuildingPolygon(m2::PointD const & p1, m2::PointD const & p2,
-                                              m2::PointD const & p3)
+void ApplyAreaFeature::ProcessBuildingPolygon(m2::PointD const & p1, m2::PointD const & p2, m2::PointD const & p3)
 {
   // For building we must filter degenerate polygons because now we have to reconstruct
   // building outline by bunch of polygons.
@@ -649,8 +636,7 @@ bool ApplyAreaFeature::IsDuplicatedEdge(Edge const & edge)
   return false;
 }
 
-m2::PointD ApplyAreaFeature::CalculateNormal(m2::PointD const & p1, m2::PointD const & p2,
-                                             m2::PointD const & p3) const
+m2::PointD ApplyAreaFeature::CalculateNormal(m2::PointD const & p1, m2::PointD const & p2, m2::PointD const & p3) const
 {
   m2::PointD const tangent = (p2 - p1).Normalize();
   m2::PointD normal = m2::PointD(-tangent.y, tangent.x);
@@ -751,9 +737,8 @@ void ApplyAreaFeature::ProcessRule(AreaRuleProto const & areaRule, double areaDe
   if (m_isBuilding && !isHatching)
   {
     /// @todo Make borders work for non-building areas too.
-    outline.m_generateOutline = areaRule.has_border() &&
-                                areaRule.color() != areaRule.border().color() &&
-                                areaRule.border().width() > 0.0;
+    outline.m_generateOutline =
+        areaRule.has_border() && areaRule.color() != areaRule.border().color() && areaRule.border().width() > 0.0;
     if (outline.m_generateOutline)
       params.m_outlineColor = ToDrapeColor(areaRule.border().color());
 
@@ -765,8 +750,8 @@ void ApplyAreaFeature::ProcessRule(AreaRuleProto const & areaRule, double areaDe
   }
 
   // see ProcessAreaRules: isHatching first, - !isHatching last.
-  m_insertShape(make_unique_dp<AreaShape>(!isHatching ? std::move(m_triangles) : m_triangles,
-                                          std::move(outline), params));
+  m_insertShape(
+      make_unique_dp<AreaShape>(!isHatching ? std::move(m_triangles) : m_triangles, std::move(outline), params));
 }
 
 ApplyLineFeatureGeometry::ApplyLineFeatureGeometry(TileKey const & tileKey, TInsertShapeFn const & insertShape,
@@ -780,7 +765,7 @@ ApplyLineFeatureGeometry::ApplyLineFeatureGeometry(TileKey const & tileKey, TIns
   m_spline.Reset(new m2::Spline(f.GetPointsCount()));
 }
 
-void ApplyLineFeatureGeometry::operator() (m2::PointD const & point)
+void ApplyLineFeatureGeometry::operator()(m2::PointD const & point)
 {
 #ifdef LINES_GENERATION_CALC_FILTERED_POINTS
   ++m_readCount;
@@ -791,19 +776,15 @@ void ApplyLineFeatureGeometry::operator() (m2::PointD const & point)
     m_spline->AddPoint(point);
     m_lastAddedPoint = point;
   }
+  else if (m_simplify && ((m_spline->GetSize() > 1 && point.SquaredLength(m_lastAddedPoint) < m_minSegmentSqrLength) ||
+                          m_spline->IsProlonging(point)))
+  {
+    m_spline->ReplacePoint(point);
+  }
   else
   {
-    if (m_simplify &&
-        ((m_spline->GetSize() > 1 && point.SquaredLength(m_lastAddedPoint) < m_minSegmentSqrLength) ||
-          m_spline->IsProlonging(point)))
-    {
-      m_spline->ReplacePoint(point);
-    }
-    else
-    {
-      m_spline->AddPoint(point);
-      m_lastAddedPoint = point;
-    }
+    m_spline->AddPoint(point);
+    m_lastAddedPoint = point;
   }
 }
 
@@ -834,7 +815,7 @@ void ApplyLineFeatureGeometry::ProcessLineRules(Stylist::LineRulesT const & line
     m2::SmoothPaths(guidePointsForSmooth, 4 /* newPointsPerSegmentCount */, m2::kCentripetalAlpha, clippedPaths);
 
     ASSERT(m_clippedSplines.empty(), ());
-    std::function<void (m2::SharedSpline &&)> inserter = base::MakeBackInsertFunctor(m_clippedSplines);
+    std::function<void(m2::SharedSpline &&)> inserter = base::MakeBackInsertFunctor(m_clippedSplines);
     for (auto & path : clippedPaths)
       m2::ClipPathByRect(m_tileRect, std::move(path), inserter);
   }
@@ -897,12 +878,10 @@ ApplyLineFeatureAdditional::ApplyLineFeatureAdditional(TileKey const & tileKey,
 }
 
 void ApplyLineFeatureAdditional::GetRoadShieldsViewParams(ref_ptr<dp::TextureManager> texMng,
-                                                          ftypes::RoadShield const & shield,
-                                                          uint8_t shieldIndex, uint8_t shieldCount,
-                                                          TextViewParams & textParams,
+                                                          ftypes::RoadShield const & shield, uint8_t shieldIndex,
+                                                          uint8_t shieldCount, TextViewParams & textParams,
                                                           ColoredSymbolViewParams & symbolParams,
-                                                          PoiSymbolViewParams & poiParams,
-                                                          m2::PointD & shieldPixelSize)
+                                                          PoiSymbolViewParams & poiParams, m2::PointD & shieldPixelSize)
 {
   ASSERT(m_shieldRule, ());
 
@@ -979,7 +958,8 @@ void ApplyLineFeatureAdditional::GetRoadShieldsViewParams(ref_ptr<dp::TextureMan
     texMng->GetSymbolRegion(poiParams.m_symbolName, region);
     float const symBorderWidth = (region.GetPixelSize().x - textWidthInPixels) * 0.5f;
     float const symBorderHeight = (region.GetPixelSize().y - textHeightInPixels) * 0.5f;
-    textParams.m_titleDecl.m_primaryOffset = poiParams.m_offset + GetShieldOffset(anchor, symBorderWidth, symBorderHeight);
+    textParams.m_titleDecl.m_primaryOffset =
+        poiParams.m_offset + GetShieldOffset(anchor, symBorderWidth, symBorderHeight);
     shieldPixelSize = region.GetPixelSize();
   }
 
@@ -995,10 +975,8 @@ void ApplyLineFeatureAdditional::GetRoadShieldsViewParams(ref_ptr<dp::TextureMan
   }
 }
 
-bool ApplyLineFeatureAdditional::CheckShieldsNearby(m2::PointD const & shieldPos,
-                                                    m2::PointD const & shieldPixelSize,
-                                                    uint32_t minDistanceInPixels,
-                                                    std::vector<m2::RectD> & shields)
+bool ApplyLineFeatureAdditional::CheckShieldsNearby(m2::PointD const & shieldPos, m2::PointD const & shieldPixelSize,
+                                                    uint32_t minDistanceInPixels, std::vector<m2::RectD> & shields)
 {
   // Here we calculate extended rect to skip the same shields nearby.
   m2::PointD const skippingArea(2 * minDistanceInPixels, 2 * minDistanceInPixels);
@@ -1006,10 +984,8 @@ bool ApplyLineFeatureAdditional::CheckShieldsNearby(m2::PointD const & shieldPos
   m2::PointD const shieldMercatorHalfSize = extendedPixelSize / m_currentScaleGtoP * 0.5;
   m2::RectD shieldRect(shieldPos - shieldMercatorHalfSize, shieldPos + shieldMercatorHalfSize);
   for (auto const & r : shields)
-  {
     if (r.IsIntersect(shieldRect))
       return false;
-  }
   shields.push_back(shieldRect);
   return true;
 }
@@ -1078,8 +1054,7 @@ void ApplyLineFeatureAdditional::ProcessAdditionalLineRules(PathTextRuleProto co
     {
       double const pixelLength = 300.0 * vs;
       std::vector<double> offsets;
-      PathTextLayout::CalculatePositions(spline->GetLength(), m_currentScaleGtoP,
-                                         pixelLength, offsets);
+      PathTextLayout::CalculatePositions(spline->GetLength(), m_currentScaleGtoP, pixelLength, offsets);
       if (!offsets.empty())
         CalculateRoadShieldPositions(offsets, spline, shieldPositions);
     }
@@ -1104,8 +1079,8 @@ void ApplyLineFeatureAdditional::ProcessAdditionalLineRules(PathTextRuleProto co
     ColoredSymbolViewParams symbolParams;
     PoiSymbolViewParams poiParams;
     m2::PointD shieldPixelSize;
-    GetRoadShieldsViewParams(texMng, shield, shieldIndex, static_cast<uint8_t>(roadShields.size()),
-                             textParams, symbolParams, poiParams, shieldPixelSize);
+    GetRoadShieldsViewParams(texMng, shield, shieldIndex, static_cast<uint8_t>(roadShields.size()), textParams,
+                             symbolParams, poiParams, shieldPixelSize);
 
     auto & generatedShieldRects = generatedRoadShields[shield];
     generatedShieldRects.reserve(10);
@@ -1114,10 +1089,9 @@ void ApplyLineFeatureAdditional::ProcessAdditionalLineRules(PathTextRuleProto co
       if (!CheckShieldsNearby(shieldPos, shieldPixelSize, scaledMinDistance, generatedShieldRects))
         continue;
 
-      m_insertShape(make_unique_dp<TextShape>(shieldPos, textParams, m_tileKey,
-                                              m2::PointF(0.0f, 0.0f) /* symbolSize */,
-                                              m2::PointF(0.0f, 0.0f) /* symbolOffset */,
-                                              dp::Center /* symbolAnchor */, textIndex));
+      m_insertShape(make_unique_dp<TextShape>(shieldPos, textParams, m_tileKey, m2::PointF(0.0f, 0.0f) /* symbolSize */,
+                                              m2::PointF(0.0f, 0.0f) /* symbolOffset */, dp::Center /* symbolAnchor */,
+                                              textIndex));
       if (IsColoredRoadShield(shield))
         m_insertShape(make_unique_dp<ColoredSymbolShape>(shieldPos, symbolParams, m_tileKey, textIndex));
       else if (IsSymbolRoadShield(shield))
diff --git a/libs/drape_frontend/apply_feature_functors.hpp b/libs/drape_frontend/apply_feature_functors.hpp
index b094581b9..f7fa379da 100644
--- a/libs/drape_frontend/apply_feature_functors.hpp
+++ b/libs/drape_frontend/apply_feature_functors.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
+#include "drape_frontend/shape_view_params.hpp"
 #include "drape_frontend/stylist.hpp"
 #include "drape_frontend/tile_key.hpp"
-#include "drape_frontend/shape_view_params.hpp"
 
 #include "drape/drape_diagnostics.hpp"
 #include "drape/pointers.hpp"
@@ -22,7 +22,7 @@ class CaptionDefProto;
 namespace dp
 {
 class TextureManager;
-} // namespace dp
+}  // namespace dp
 
 namespace df
 {
@@ -36,8 +36,8 @@ using TInsertShapeFn = std::function<void(drape_ptr<MapShape> && shape)>;
 class BaseApplyFeature
 {
 public:
-  BaseApplyFeature(TileKey const & tileKey, TInsertShapeFn const & insertShape,
-                   FeatureType & f, CaptionDescription const & captions);
+  BaseApplyFeature(TileKey const & tileKey, TInsertShapeFn const & insertShape, FeatureType & f,
+                   CaptionDescription const & captions);
 
   virtual ~BaseApplyFeature() = default;
 
@@ -66,10 +66,10 @@ public:
                          ref_ptr<dp::TextureManager> texMng);
 
 protected:
-  void ExtractCaptionParams(CaptionDefProto const * primaryProto,
-                            CaptionDefProto const * secondaryProto,
+  void ExtractCaptionParams(CaptionDefProto const * primaryProto, CaptionDefProto const * secondaryProto,
                             TextViewParams & params) const;
   float m_posZ = 0.0f;
+
 private:
   virtual bool HasArea() const { return false; }
 };
@@ -79,9 +79,8 @@ class ApplyAreaFeature : public ApplyPointFeature
   using TBase = ApplyPointFeature;
 
 public:
-  ApplyAreaFeature(TileKey const & tileKey, TInsertShapeFn const & insertShape,
-                   FeatureType & f, double currentScaleGtoP, bool isBuilding,
-                   float minPosZ, float posZ,
+  ApplyAreaFeature(TileKey const & tileKey, TInsertShapeFn const & insertShape, FeatureType & f,
+                   double currentScaleGtoP, bool isBuilding, float minPosZ, float posZ,
                    CaptionDescription const & captions);
 
   void operator()(m2::PointD const & p1, m2::PointD const & p2, m2::PointD const & p3);
@@ -96,7 +95,7 @@ public:
     bool operator==(Edge const & edge) const
     {
       return (m_startIndex == edge.m_startIndex && m_endIndex == edge.m_endIndex) ||
-        (m_startIndex == edge.m_endIndex && m_endIndex == edge.m_startIndex);
+             (m_startIndex == edge.m_endIndex && m_endIndex == edge.m_startIndex);
     }
 
     int m_startIndex = -1;
@@ -142,10 +141,10 @@ class ApplyLineFeatureGeometry : public BaseApplyFeature
   using TBase = BaseApplyFeature;
 
 public:
-  ApplyLineFeatureGeometry(TileKey const & tileKey, TInsertShapeFn const & insertShape,
-                           FeatureType & f, double currentScaleGtoP);
+  ApplyLineFeatureGeometry(TileKey const & tileKey, TInsertShapeFn const & insertShape, FeatureType & f,
+                           double currentScaleGtoP);
 
-  void operator() (m2::PointD const & point);
+  void operator()(m2::PointD const & point);
   bool HasGeometry() const { return m_spline->IsValid(); }
   void ProcessLineRules(Stylist::LineRulesT const & lineRules);
 
@@ -172,8 +171,8 @@ class ApplyLineFeatureAdditional : public BaseApplyFeature
   using TBase = BaseApplyFeature;
 
 public:
-  ApplyLineFeatureAdditional(TileKey const & tileKey, TInsertShapeFn const & insertShape,
-                             FeatureType & f, double currentScaleGtoP, CaptionDescription const & captions,
+  ApplyLineFeatureAdditional(TileKey const & tileKey, TInsertShapeFn const & insertShape, FeatureType & f,
+                             double currentScaleGtoP, CaptionDescription const & captions,
                              std::vector<m2::SharedSpline> && clippedSplines);
 
   void ProcessAdditionalLineRules(PathTextRuleProto const * pathtextRule, ShieldRuleProto const * shieldRule,
@@ -181,17 +180,12 @@ public:
                                   GeneratedRoadShields & generatedRoadShields);
 
 private:
-  void GetRoadShieldsViewParams(ref_ptr<dp::TextureManager> texMng,
-                                ftypes::RoadShield const & shield,
-                                uint8_t shieldIndex, uint8_t shieldCount,
-                                TextViewParams & textParams,
-                                ColoredSymbolViewParams & symbolParams,
-                                PoiSymbolViewParams & poiParams,
+  void GetRoadShieldsViewParams(ref_ptr<dp::TextureManager> texMng, ftypes::RoadShield const & shield,
+                                uint8_t shieldIndex, uint8_t shieldCount, TextViewParams & textParams,
+                                ColoredSymbolViewParams & symbolParams, PoiSymbolViewParams & poiParams,
                                 m2::PointD & shieldPixelSize);
-  bool CheckShieldsNearby(m2::PointD const & shieldPos,
-                          m2::PointD const & shieldPixelSize,
-                          uint32_t minDistanceInPixels,
-                          std::vector<m2::RectD> & shields);
+  bool CheckShieldsNearby(m2::PointD const & shieldPos, m2::PointD const & shieldPixelSize,
+                          uint32_t minDistanceInPixels, std::vector<m2::RectD> & shields);
 
   std::vector<m2::SharedSpline> m_clippedSplines;
   double const m_currentScaleGtoP;
@@ -201,4 +195,4 @@ private:
 };
 
 extern dp::Color ToDrapeColor(uint32_t src);
-} // namespace df
+}  // namespace df
diff --git a/libs/drape_frontend/area_shape.cpp b/libs/drape_frontend/area_shape.cpp
index 9b104417d..34815077b 100644
--- a/libs/drape_frontend/area_shape.cpp
+++ b/libs/drape_frontend/area_shape.cpp
@@ -45,9 +45,8 @@ void AreaShape::Draw(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Batcher>
     DrawArea(context, batcher, colorUv, outlineUv, region.GetTexture());
 }
 
-void AreaShape::DrawArea(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Batcher> batcher,
-                         m2::PointD const & colorUv, m2::PointD const & outlineUv,
-                         ref_ptr<dp::Texture> texture) const
+void AreaShape::DrawArea(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Batcher> batcher, m2::PointD const & colorUv,
+                         m2::PointD const & outlineUv, ref_ptr<dp::Texture> texture) const
 {
   glsl::vec2 const uv = glsl::ToVec2(colorUv);
 
@@ -120,8 +119,7 @@ void AreaShape::DrawHatchingArea(ref_ptr<dp::GraphicsContext> context, ref_ptr<d
 }
 
 void AreaShape::DrawArea3D(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Batcher> batcher,
-                           m2::PointD const & colorUv, m2::PointD const & outlineUv,
-                           ref_ptr<dp::Texture> texture) const
+                           m2::PointD const & colorUv, m2::PointD const & outlineUv, ref_ptr<dp::Texture> texture) const
 {
   CHECK(!m_buildingOutline.m_indices.empty(), ());
   CHECK_EQUAL(m_buildingOutline.m_normals.size() * 2, m_buildingOutline.m_indices.size(), ());
diff --git a/libs/drape_frontend/area_shape.hpp b/libs/drape_frontend/area_shape.hpp
index 00b2c5f04..97190623e 100644
--- a/libs/drape_frontend/area_shape.hpp
+++ b/libs/drape_frontend/area_shape.hpp
@@ -24,8 +24,7 @@ struct BuildingOutline
 class AreaShape : public MapShape
 {
 public:
-  AreaShape(std::vector<m2::PointD> triangleList, BuildingOutline && buildingOutline,
-            AreaViewParams const & params);
+  AreaShape(std::vector<m2::PointD> triangleList, BuildingOutline && buildingOutline, AreaViewParams const & params);
 
   void Draw(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Batcher> batcher,
             ref_ptr<dp::TextureManager> textures) const override;
@@ -35,20 +34,14 @@ private:
   {
     return glsl::ToVec2(ConvertToLocal(vertex, m_params.m_tileCenter, kShapeCoordScalar));
   }
-  glsl::vec3 ToShapeVertex3(m2::PointD const & vertex) const
-  {
-    return { ToShapeVertex2(vertex), m_params.m_depth };
-  }
+  glsl::vec3 ToShapeVertex3(m2::PointD const & vertex) const { return {ToShapeVertex2(vertex), m_params.m_depth}; }
 
-  void DrawArea(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Batcher> batcher,
-                m2::PointD const & colorUv, m2::PointD const & outlineUv,
-                ref_ptr<dp::Texture> texture) const;
-  void DrawArea3D(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Batcher> batcher,
-                  m2::PointD const & colorUv, m2::PointD const & outlineUv,
-                  ref_ptr<dp::Texture> texture) const;
-  void DrawHatchingArea(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Batcher> batcher,
-                        m2::PointD const & colorUv, ref_ptr<dp::Texture> texture,
-                        ref_ptr<dp::Texture> hatchingTexture) const;
+  void DrawArea(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Batcher> batcher, m2::PointD const & colorUv,
+                m2::PointD const & outlineUv, ref_ptr<dp::Texture> texture) const;
+  void DrawArea3D(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Batcher> batcher, m2::PointD const & colorUv,
+                  m2::PointD const & outlineUv, ref_ptr<dp::Texture> texture) const;
+  void DrawHatchingArea(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Batcher> batcher, m2::PointD const & colorUv,
+                        ref_ptr<dp::Texture> texture, ref_ptr<dp::Texture> hatchingTexture) const;
 
   std::vector<m2::PointD> m_vertexes;
   BuildingOutline m_buildingOutline;
diff --git a/libs/drape_frontend/arrow3d.cpp b/libs/drape_frontend/arrow3d.cpp
index a758c3dea..3ef62775c 100644
--- a/libs/drape_frontend/arrow3d.cpp
+++ b/libs/drape_frontend/arrow3d.cpp
@@ -52,8 +52,8 @@ std::string const kDefaultArrowShadowMesh = "arrow_shadow.obj";
 
 std::string_view const kMainFileId = "main_obj_file_id";
 
-using TLoadingCompletion = std::function<void(
-    std::vector<float> positions, std::vector<float> normals, std::vector<float> texCoords)>;
+using TLoadingCompletion =
+    std::function<void(std::vector<float> positions, std::vector<float> normals, std::vector<float> texCoords)>;
 using TLoadingFailure = std::function<void(std::string const &)>;
 
 namespace fast_obj_adapter
@@ -102,10 +102,7 @@ unsigned long FileSize(void * file, void * userData)
 class FastObjMeshGuard
 {
 public:
-  explicit FastObjMeshGuard(fastObjMesh * mesh)
-    : m_mesh(mesh)
-  {
-  }
+  explicit FastObjMeshGuard(fastObjMesh * mesh) : m_mesh(mesh) {}
 
   ~FastObjMeshGuard()
   {
@@ -117,8 +114,8 @@ private:
   fastObjMesh * const m_mesh;
 };
 
-bool LoadMesh(std::string const & pathToMesh, bool isDefaultResource,
-              TLoadingCompletion const & completionHandler, TLoadingFailure const & failureHandler)
+bool LoadMesh(std::string const & pathToMesh, bool isDefaultResource, TLoadingCompletion const & completionHandler,
+              TLoadingFailure const & failureHandler)
 {
   CHECK(completionHandler != nullptr, ());
   CHECK(failureHandler != nullptr, ());
@@ -126,9 +123,8 @@ bool LoadMesh(std::string const & pathToMesh, bool isDefaultResource,
   fastObjMesh * meshData = nullptr;
   try
   {
-    ReaderPtr<Reader> reader = isDefaultResource
-                                 ? GetStyleReader().GetDefaultResourceReader(pathToMesh)
-                                 : GetPlatform().GetReader(pathToMesh);
+    ReaderPtr<Reader> reader =
+        isDefaultResource ? GetStyleReader().GetDefaultResourceReader(pathToMesh) : GetPlatform().GetReader(pathToMesh);
     ReaderSource source(reader);
 
     // Read OBJ file.
@@ -158,15 +154,13 @@ bool LoadMesh(std::string const & pathToMesh, bool isDefaultResource,
     {
       if (meshData->position_count > 1)
       {
-        memcpy(&positions[i * kComponentsInVertex],
-               &meshData->positions[meshData->indices[i].p * kComponentsInVertex],
+        memcpy(&positions[i * kComponentsInVertex], &meshData->positions[meshData->indices[i].p * kComponentsInVertex],
                sizeof(float) * kComponentsInVertex);
       }
 
       if (meshData->normal_count > 1)
       {
-        memcpy(&normals[i * kComponentsInNormal],
-               &meshData->normals[meshData->indices[i].n * kComponentsInNormal],
+        memcpy(&normals[i * kComponentsInNormal], &meshData->normals[meshData->indices[i].n * kComponentsInNormal],
                sizeof(float) * kComponentsInNormal);
       }
 
@@ -201,44 +195,40 @@ Arrow3d::PreloadedData Arrow3d::PreloadMesh(std::optional<Arrow3dCustomDecl> con
   // Load arrow mesh.
   auto const & meshPath = customDecl ? customDecl->m_arrowMeshPath : kDefaultArrowMesh;
   data.m_meshData = PreloadedMeshData{};
-  if (!LoadMesh(
-          meshPath, useDefaultResource,
-          [&](std::vector<float> positions, std::vector<float> normals,
-              std::vector<float> texCoords)
-          {
-            if (!positions.empty())
-            {
-              if (normals.empty())
-                normals =
-                    dp::MeshObject::GenerateNormalsForTriangles(positions, kComponentsInNormal);
+  if (!LoadMesh(meshPath, useDefaultResource,
+                [&](std::vector<float> positions, std::vector<float> normals, std::vector<float> texCoords)
+  {
+    if (!positions.empty())
+    {
+      if (normals.empty())
+        normals = dp::MeshObject::GenerateNormalsForTriangles(positions, kComponentsInNormal);
 
-              data.m_meshData->m_positions = std::move(positions);
-              data.m_meshData->m_normals = std::move(normals);
+      data.m_meshData->m_positions = std::move(positions);
+      data.m_meshData->m_normals = std::move(normals);
 
-              // Texture coordinates.
-              ref_ptr<dp::StaticTexture> arrowTexture = texMng->GetArrowTexture();
-              CHECK(arrowTexture != nullptr, ("Arrow texture must be initialized before the mesh"));
-              // NOTE: texture must be loaded before the mesh.
-              if (arrowTexture->IsLoadingCorrect() && !texCoords.empty())
-              {
-                data.m_arrowMeshTexturingEnabled = true;
-                data.m_meshData->m_texCoords = std::move(texCoords);
-              }
-              else
-              {
-                data.m_arrowMeshTexturingEnabled = false;
-              }
-            }
-            else
-            {
-              data.m_meshData.reset();
-            }
-          },
-          [&](std::string const & reason)
-          {
-            data.m_meshData.reset();
-            LOG(LERROR, ("Arrow3D mesh was not loaded:", reason));
-          }))
+      // Texture coordinates.
+      ref_ptr<dp::StaticTexture> arrowTexture = texMng->GetArrowTexture();
+      CHECK(arrowTexture != nullptr, ("Arrow texture must be initialized before the mesh"));
+      // NOTE: texture must be loaded before the mesh.
+      if (arrowTexture->IsLoadingCorrect() && !texCoords.empty())
+      {
+        data.m_arrowMeshTexturingEnabled = true;
+        data.m_meshData->m_texCoords = std::move(texCoords);
+      }
+      else
+      {
+        data.m_arrowMeshTexturingEnabled = false;
+      }
+    }
+    else
+    {
+      data.m_meshData.reset();
+    }
+  }, [&](std::string const & reason)
+  {
+    data.m_meshData.reset();
+    LOG(LERROR, ("Arrow3D mesh was not loaded:", reason));
+  }))
   {
     return {};
   }
@@ -248,39 +238,34 @@ Arrow3d::PreloadedData Arrow3d::PreloadMesh(std::optional<Arrow3dCustomDecl> con
   if (!shadowMeshPath.empty())
   {
     data.m_shadowMeshData = PreloadedMeshData{};
-    LoadMesh(
-        shadowMeshPath, useDefaultResource,
-        [&](std::vector<float> positions, std::vector<float> /* normals */,
-            std::vector<float> texCoords)
-        {
-          // NOTE: Shadow mesh must contain texture coordinates. They're used to create soft shadow.
-          if (!positions.empty() && !texCoords.empty())
-          {
-            data.m_shadowMeshData->m_positions = std::move(positions);
-            data.m_shadowMeshData->m_texCoords = std::move(texCoords);
-          }
-          else
-          {
-            data.m_shadowMeshData.reset();
-          }
-        },
-        [&](std::string const & reason)
-        {
-          data.m_shadowMeshData.reset();
-          LOG(LWARNING, ("Arrow3D shadow mesh was not loaded:", reason));
-        });
+    LoadMesh(shadowMeshPath, useDefaultResource,
+             [&](std::vector<float> positions, std::vector<float> /* normals */, std::vector<float> texCoords)
+    {
+      // NOTE: Shadow mesh must contain texture coordinates. They're used to create soft shadow.
+      if (!positions.empty() && !texCoords.empty())
+      {
+        data.m_shadowMeshData->m_positions = std::move(positions);
+        data.m_shadowMeshData->m_texCoords = std::move(texCoords);
+      }
+      else
+      {
+        data.m_shadowMeshData.reset();
+      }
+    }, [&](std::string const & reason)
+    {
+      data.m_shadowMeshData.reset();
+      LOG(LWARNING, ("Arrow3D shadow mesh was not loaded:", reason));
+    });
   }
 
   if (customDecl.has_value())
   {
-    data.m_texCoordFlipping = glsl::vec2{customDecl->m_flipTexCoordU ? 1.0f : 0.0f,
-                                         customDecl->m_flipTexCoordV ? 1.0f : 0.0f};
-    data.m_meshOffset =
-        glsl::vec3{customDecl->m_offset.x, customDecl->m_offset.y, customDecl->m_offset.z};
-    data.m_meshEulerAngles = glsl::vec3{customDecl->m_eulerAngles.x, customDecl->m_eulerAngles.y,
-                                        customDecl->m_eulerAngles.z};
-    data.m_meshScale =
-        glsl::vec3{customDecl->m_scale.x, customDecl->m_scale.y, customDecl->m_scale.z};
+    data.m_texCoordFlipping =
+        glsl::vec2{customDecl->m_flipTexCoordU ? 1.0f : 0.0f, customDecl->m_flipTexCoordV ? 1.0f : 0.0f};
+    data.m_meshOffset = glsl::vec3{customDecl->m_offset.x, customDecl->m_offset.y, customDecl->m_offset.z};
+    data.m_meshEulerAngles =
+        glsl::vec3{customDecl->m_eulerAngles.x, customDecl->m_eulerAngles.y, customDecl->m_eulerAngles.z};
+    data.m_meshScale = glsl::vec3{customDecl->m_scale.x, customDecl->m_scale.y, customDecl->m_scale.z};
     data.m_enableShadow = customDecl->m_enableShadow;
     data.m_enableOutline = customDecl->m_enableOutline;
   }
@@ -334,8 +319,7 @@ Arrow3d::Arrow3d(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::TextureManage
 
       m_arrowMesh.SetBuffer(kTexCoordBufferInd, std::move(preloadedData.m_meshData->m_texCoords),
                             sizeof(float) * kComponentsInTexCoord);
-      m_arrowMesh.SetAttribute("a_texCoords", kTexCoordBufferInd, 0 /* offset */,
-                               kComponentsInTexCoord);
+      m_arrowMesh.SetAttribute("a_texCoords", kTexCoordBufferInd, 0 /* offset */, kComponentsInTexCoord);
     }
   }
 
@@ -347,22 +331,22 @@ Arrow3d::Arrow3d(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::TextureManage
 
     // Positions.
     CHECK(!preloadedData.m_shadowMeshData->m_positions.empty(), ());
-    m_shadowMesh->SetBuffer(kVerticesBufferInd,
-                            std::move(preloadedData.m_shadowMeshData->m_positions),
+    m_shadowMesh->SetBuffer(kVerticesBufferInd, std::move(preloadedData.m_shadowMeshData->m_positions),
                             sizeof(float) * kComponentsInVertex);
     m_shadowMesh->SetAttribute("a_pos", kVerticesBufferInd, 0 /* offset */, kComponentsInVertex);
 
     // Texture coordinates.
     CHECK(!preloadedData.m_shadowMeshData->m_texCoords.empty(), ());
-    m_shadowMesh->SetBuffer(kTexCoordShadowBufferInd,
-                            std::move(preloadedData.m_shadowMeshData->m_texCoords),
+    m_shadowMesh->SetBuffer(kTexCoordShadowBufferInd, std::move(preloadedData.m_shadowMeshData->m_texCoords),
                             sizeof(float) * kComponentsInTexCoord);
-    m_shadowMesh->SetAttribute("a_texCoords", kTexCoordShadowBufferInd, 0 /* offset */,
-                               kComponentsInTexCoord);
+    m_shadowMesh->SetAttribute("a_texCoords", kTexCoordShadowBufferInd, 0 /* offset */, kComponentsInTexCoord);
   }
 }
 
-bool Arrow3d::IsValid() const { return m_isValid; }
+bool Arrow3d::IsValid() const
+{
+  return m_isValid;
+}
 
 // static
 double Arrow3d::GetMaxBottomSize()
@@ -371,27 +355,48 @@ double Arrow3d::GetMaxBottomSize()
   return kBottomSize * arrow3d::kArrowSize * arrow3d::kArrow3dScaleMax * kOutlineScale;
 }
 
-void Arrow3d::SetPosition(m2::PointD const & position) { m_position = position; }
+void Arrow3d::SetPosition(m2::PointD const & position)
+{
+  m_position = position;
+}
 
 void Arrow3d::SetAzimuth(double azimuth)
 {
   m_azimuth = azimuth;
 }
 
-void Arrow3d::SetPositionObsolete(bool obsolete) { m_obsoletePosition = obsolete; }
+void Arrow3d::SetPositionObsolete(bool obsolete)
+{
+  m_obsoletePosition = obsolete;
+}
 
-void Arrow3d::SetMeshOffset(glsl::vec3 const & offset) { m_meshOffset = offset; }
+void Arrow3d::SetMeshOffset(glsl::vec3 const & offset)
+{
+  m_meshOffset = offset;
+}
 
-void Arrow3d::SetMeshRotation(glsl::vec3 const & eulerAngles) { m_meshEulerAngles = eulerAngles; }
+void Arrow3d::SetMeshRotation(glsl::vec3 const & eulerAngles)
+{
+  m_meshEulerAngles = eulerAngles;
+}
 
-void Arrow3d::SetMeshScale(glsl::vec3 const & scale) { m_meshScale = scale; }
+void Arrow3d::SetMeshScale(glsl::vec3 const & scale)
+{
+  m_meshScale = scale;
+}
 
-void Arrow3d::SetShadowEnabled(bool enabled) { m_enableShadow = enabled; }
+void Arrow3d::SetShadowEnabled(bool enabled)
+{
+  m_enableShadow = enabled;
+}
 
-void Arrow3d::SetOutlineEnabled(bool enabled) { m_enableOutline = enabled; }
+void Arrow3d::SetOutlineEnabled(bool enabled)
+{
+  m_enableOutline = enabled;
+}
 
-void Arrow3d::Render(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
-                     ScreenBase const & screen, bool routingMode)
+void Arrow3d::Render(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng, ScreenBase const & screen,
+                     bool routingMode)
 {
   // Render shadow.
   if (m_shadowMesh && m_enableShadow && screen.isPerspective())
@@ -405,38 +410,34 @@ void Arrow3d::Render(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramM
   if (m_shadowMesh && m_enableOutline && routingMode)
   {
     dp::Color const outlineColor = df::GetColorConstant(df::kArrow3DOutlineColor);
-    RenderArrow(context, mng, *m_shadowMesh, screen, gpu::Program::Arrow3dOutline, outlineColor,
-                0.0f /* dz */, kOutlineScale /* scaleFactor */);
+    RenderArrow(context, mng, *m_shadowMesh, screen, gpu::Program::Arrow3dOutline, outlineColor, 0.0f /* dz */,
+                kOutlineScale /* scaleFactor */);
   }
 
   // Render arrow.
   if (m_arrowMeshTexturingEnabled)
   {
     // Use only alpha channel from arrow color for textured meshes.
-    auto const color =
-        dp::Color(255, 255, 255,
-                  m_obsoletePosition ? df::GetColorConstant(df::kArrow3DObsoleteColor).GetAlpha()
-                                     : df::GetColorConstant(df::kArrow3DColor).GetAlpha());
+    auto const color = dp::Color(255, 255, 255,
+                                 m_obsoletePosition ? df::GetColorConstant(df::kArrow3DObsoleteColor).GetAlpha()
+                                                    : df::GetColorConstant(df::kArrow3DColor).GetAlpha());
 
-    RenderArrow(context, mng, m_arrowMesh, screen, gpu::Program::Arrow3dTextured, color,
-                0.0f /* dz */, 1.0f /* scaleFactor */);
+    RenderArrow(context, mng, m_arrowMesh, screen, gpu::Program::Arrow3dTextured, color, 0.0f /* dz */,
+                1.0f /* scaleFactor */);
   }
   else
   {
-    dp::Color const color =
-        df::GetColorConstant(m_obsoletePosition ? df::kArrow3DObsoleteColor : df::kArrow3DColor);
-    RenderArrow(context, mng, m_arrowMesh, screen, gpu::Program::Arrow3d, color, 0.0f /* dz */,
-                1.0f /* scaleFactor */);
+    dp::Color const color = df::GetColorConstant(m_obsoletePosition ? df::kArrow3DObsoleteColor : df::kArrow3DColor);
+    RenderArrow(context, mng, m_arrowMesh, screen, gpu::Program::Arrow3d, color, 0.0f /* dz */, 1.0f /* scaleFactor */);
   }
 }
 
-void Arrow3d::RenderArrow(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
-                          dp::MeshObject & mesh, ScreenBase const & screen, gpu::Program program,
-                          dp::Color const & color, float dz, float scaleFactor)
+void Arrow3d::RenderArrow(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng, dp::MeshObject & mesh,
+                          ScreenBase const & screen, gpu::Program program, dp::Color const & color, float dz,
+                          float scaleFactor)
 {
   gpu::Arrow3dProgramParams params;
-  auto [transform, normalTransform] =
-      CalculateTransform(screen, dz, scaleFactor, context->GetApiVersion());
+  auto [transform, normalTransform] = CalculateTransform(screen, dz, scaleFactor, context->GetApiVersion());
   params.m_transform = std::move(transform);
   params.m_normalTransform = std::move(normalTransform);
   params.m_color = glsl::ToVec4(color);
@@ -446,8 +447,7 @@ void Arrow3d::RenderArrow(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::Pro
   mesh.Render(context, gpuProgram, m_state, mng->GetParamsSetter(), params);
 }
 
-std::pair<glsl::mat4, glsl::mat4> Arrow3d::CalculateTransform(ScreenBase const & screen, float dz,
-                                                              float scaleFactor,
+std::pair<glsl::mat4, glsl::mat4> Arrow3d::CalculateTransform(ScreenBase const & screen, float dz, float scaleFactor,
                                                               dp::ApiVersion apiVersion) const
 {
   double arrowScale = VisualParams::Instance().GetVisualScale() * arrow3d::kArrowSize * scaleFactor;
@@ -459,36 +459,30 @@ std::pair<glsl::mat4, glsl::mat4> Arrow3d::CalculateTransform(ScreenBase const &
 
   glm::quat const qx = glm::angleAxis(m_meshEulerAngles.x, glm::vec3{1.0f, 0.0f, 0.0f});
   glm::quat const qy = glm::angleAxis(m_meshEulerAngles.y, glm::vec3{0.0f, 1.0f, 0.0f});
-  glm::quat qz =
-      glm::angleAxis(static_cast<float>(m_azimuth + screen.GetAngle() + m_meshEulerAngles.z),
-                     glm::vec3{0.0f, 0.0f, -1.0f});
+  glm::quat qz = glm::angleAxis(static_cast<float>(m_azimuth + screen.GetAngle() + m_meshEulerAngles.z),
+                                glm::vec3{0.0f, 0.0f, -1.0f});
   auto const rotationMatrix = glm::mat4_cast(qz * qy * qx);
 
   qz = glm::angleAxis(static_cast<float>(m_meshEulerAngles.z), glm::vec3{0.0f, 0.0f, -1.0f});
   auto const normalMatrix = glm::mat4_cast(qz * qy * qx);
 
   auto const scaleMatrix = glm::scale(
-      glm::mat4(1.0f),
-      glm::vec3{arrowScale, arrowScale, screen.isPerspective() ? arrowScale : 1.0} * m_meshScale);
+      glm::mat4(1.0f), glm::vec3{arrowScale, arrowScale, screen.isPerspective() ? arrowScale : 1.0} * m_meshScale);
 
   auto const translationMatrix = glm::translate(glm::mat4(1.0f), m_meshOffset);
 
-  auto postProjectionScale =
-      glm::vec3{2.0f / screen.PixelRect().SizeX(), 2.0f / screen.PixelRect().SizeY(), 1.0f};
+  auto postProjectionScale = glm::vec3{2.0f / screen.PixelRect().SizeX(), 2.0f / screen.PixelRect().SizeY(), 1.0f};
   postProjectionScale.z =
-      screen.isPerspective()
-          ? std::min(postProjectionScale.x, postProjectionScale.y) * screen.GetScale3d()
-          : 0.1f;
+      screen.isPerspective() ? std::min(postProjectionScale.x, postProjectionScale.y) * screen.GetScale3d() : 0.1f;
   auto const postProjectionScaleMatrix = glm::scale(glm::mat4(1.0f), postProjectionScale);
 
   m2::PointD const pos = screen.GtoP(m_position);
   auto const dX = static_cast<float>(2.0 * pos.x / screen.PixelRect().SizeX() - 1.0);
   auto const dY = static_cast<float>(2.0 * pos.y / screen.PixelRect().SizeY() - 1.0);
-  auto const postProjectionTranslationMatrix =
-      glm::translate(glm::mat4(1.0f), glm::vec3{dX, -dY, dz});
+  auto const postProjectionTranslationMatrix = glm::translate(glm::mat4(1.0f), glm::vec3{dX, -dY, dz});
 
-  auto modelTransform = postProjectionTranslationMatrix * postProjectionScaleMatrix * scaleMatrix *
-                        translationMatrix * rotationMatrix;
+  auto modelTransform =
+      postProjectionTranslationMatrix * postProjectionScaleMatrix * scaleMatrix * translationMatrix * rotationMatrix;
 
   if (screen.isPerspective())
   {
diff --git a/libs/drape_frontend/arrow3d.hpp b/libs/drape_frontend/arrow3d.hpp
index e326ea0c2..4f9cf1176 100644
--- a/libs/drape_frontend/arrow3d.hpp
+++ b/libs/drape_frontend/arrow3d.hpp
@@ -31,6 +31,7 @@ namespace df
 class Arrow3d
 {
   using Base = dp::MeshObject;
+
 public:
   struct PreloadedMeshData
   {
@@ -57,8 +58,7 @@ public:
   static PreloadedData PreloadMesh(std::optional<Arrow3dCustomDecl> const & customDecl,
                                    ref_ptr<dp::TextureManager> texMng);
 
-  Arrow3d(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::TextureManager> texMng,
-          PreloadedData && preloadedData);
+  Arrow3d(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::TextureManager> texMng, PreloadedData && preloadedData);
 
   bool IsValid() const;
 
@@ -78,17 +78,16 @@ public:
   void SetShadowEnabled(bool enabled);
   void SetOutlineEnabled(bool enabled);
 
-  void Render(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
-              ScreenBase const & screen, bool routingMode);
+  void Render(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng, ScreenBase const & screen,
+              bool routingMode);
 
 private:
   // Returns transform matrix and normal transform matrix.
-  std::pair<glsl::mat4, glsl::mat4> CalculateTransform(ScreenBase const & screen, float dz,
-                                                       float scaleFactor,
+  std::pair<glsl::mat4, glsl::mat4> CalculateTransform(ScreenBase const & screen, float dz, float scaleFactor,
                                                        dp::ApiVersion apiVersion) const;
-  void RenderArrow(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
-                   dp::MeshObject & mesh, ScreenBase const & screen, gpu::Program program,
-                   dp::Color const & color, float dz, float scaleFactor);
+  void RenderArrow(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng, dp::MeshObject & mesh,
+                   ScreenBase const & screen, gpu::Program program, dp::Color const & color, float dz,
+                   float scaleFactor);
 
   dp::MeshObject m_arrowMesh;
   bool const m_arrowMeshTexturingEnabled;
diff --git a/libs/drape_frontend/backend_renderer.cpp b/libs/drape_frontend/backend_renderer.cpp
index 861b89749..c2654b804 100644
--- a/libs/drape_frontend/backend_renderer.cpp
+++ b/libs/drape_frontend/backend_renderer.cpp
@@ -21,8 +21,8 @@
 
 #include "platform/platform.hpp"
 
-#include "base/logging.hpp"
 #include "base/file_name_utils.hpp"
+#include "base/logging.hpp"
 
 #include <algorithm>
 #include <utility>
@@ -34,15 +34,13 @@ namespace df
 BackendRenderer::BackendRenderer(Params && params)
   : BaseRenderer(ThreadsCommutator::ResourceUploadThread, params)
   , m_model(params.m_model)
-  , m_readManager(make_unique_dp<ReadManager>(params.m_commutator, m_model,
-                                              params.m_allow3dBuildings, params.m_trafficEnabled,
-                                              params.m_isolinesEnabled))
-  , m_transitBuilder(make_unique_dp<TransitSchemeBuilder>(
-        std::bind(&BackendRenderer::FlushTransitRenderData, this, _1)))
-  , m_trafficGenerator(make_unique_dp<TrafficGenerator>(
-        std::bind(&BackendRenderer::FlushTrafficRenderData, this, _1)))
-  , m_userMarkGenerator(make_unique_dp<UserMarkGenerator>(
-        std::bind(&BackendRenderer::FlushUserMarksRenderData, this, _1)))
+  , m_readManager(make_unique_dp<ReadManager>(params.m_commutator, m_model, params.m_allow3dBuildings,
+                                              params.m_trafficEnabled, params.m_isolinesEnabled))
+  , m_transitBuilder(
+        make_unique_dp<TransitSchemeBuilder>(std::bind(&BackendRenderer::FlushTransitRenderData, this, _1)))
+  , m_trafficGenerator(make_unique_dp<TrafficGenerator>(std::bind(&BackendRenderer::FlushTrafficRenderData, this, _1)))
+  , m_userMarkGenerator(
+        make_unique_dp<UserMarkGenerator>(std::bind(&BackendRenderer::FlushUserMarksRenderData, this, _1)))
   , m_requestedTiles(params.m_requestedTiles)
   , m_updateCurrentCountryFn(params.m_updateCurrentCountryFn)
   , m_metalineManager(make_unique_dp<MetalineManager>(params.m_commutator, m_model))
@@ -56,12 +54,13 @@ BackendRenderer::BackendRenderer(Params && params)
 
   ASSERT(m_updateCurrentCountryFn != nullptr, ());
 
-  m_routeBuilder = make_unique_dp<RouteBuilder>([this](drape_ptr<SubrouteData> && subrouteData)
+  m_routeBuilder = make_unique_dp<RouteBuilder>(
+      [this](drape_ptr<SubrouteData> && subrouteData)
   {
     m_commutator->PostMessage(ThreadsCommutator::RenderThread,
-                              make_unique_dp<FlushSubrouteMessage>(std::move(subrouteData)),
-                              MessagePriority::Normal);
-  }, [this](drape_ptr<SubrouteArrowsData> && subrouteArrowsData)
+                              make_unique_dp<FlushSubrouteMessage>(std::move(subrouteData)), MessagePriority::Normal);
+  },
+      [this](drape_ptr<SubrouteArrowsData> && subrouteArrowsData)
   {
     m_commutator->PostMessage(ThreadsCommutator::RenderThread,
                               make_unique_dp<FlushSubrouteArrowsMessage>(std::move(subrouteArrowsData)),
@@ -125,550 +124,523 @@ void BackendRenderer::AcceptMessage(ref_ptr<Message> message)
   switch (message->GetType())
   {
   case Message::Type::UpdateReadManager:
+  {
+    TTilesCollection tiles = m_requestedTiles->GetTiles();
+    if (!tiles.empty())
     {
-      TTilesCollection tiles = m_requestedTiles->GetTiles();
-      if (!tiles.empty())
-      {
-        ScreenBase screen;
-        bool have3dBuildings;
-        bool forceRequest;
-        bool forceUserMarksRequest;
-        m_requestedTiles->GetParams(screen, have3dBuildings, forceRequest, forceUserMarksRequest);
-        m_readManager->UpdateCoverage(screen, have3dBuildings, forceRequest, forceUserMarksRequest,
-                                      tiles, m_texMng, make_ref(m_metalineManager));
-        m_updateCurrentCountryFn(screen.ClipRect().Center(), (*tiles.begin()).m_zoomLevel);
-      }
-      break;
+      ScreenBase screen;
+      bool have3dBuildings;
+      bool forceRequest;
+      bool forceUserMarksRequest;
+      m_requestedTiles->GetParams(screen, have3dBuildings, forceRequest, forceUserMarksRequest);
+      m_readManager->UpdateCoverage(screen, have3dBuildings, forceRequest, forceUserMarksRequest, tiles, m_texMng,
+                                    make_ref(m_metalineManager));
+      m_updateCurrentCountryFn(screen.ClipRect().Center(), (*tiles.begin()).m_zoomLevel);
     }
+    break;
+  }
 
   case Message::Type::InvalidateReadManagerRect:
-    {
-      ref_ptr<InvalidateReadManagerRectMessage> msg = message;
-      if (msg->NeedRestartReading())
-        m_readManager->Restart();
-      else
-        m_readManager->Invalidate(msg->GetTilesForInvalidate());
-      break;
-    }
+  {
+    ref_ptr<InvalidateReadManagerRectMessage> msg = message;
+    if (msg->NeedRestartReading())
+      m_readManager->Restart();
+    else
+      m_readManager->Invalidate(msg->GetTilesForInvalidate());
+    break;
+  }
 
   case Message::Type::ShowChoosePositionMark:
-    {
-      RecacheChoosePositionMark();
-      break;
-    }
+  {
+    RecacheChoosePositionMark();
+    break;
+  }
 
   case Message::Type::GuiRecache:
-    {
-      ref_ptr<GuiRecacheMessage> msg = message;
-      m_lastWidgetsInfo = msg->GetInitInfo();
-      RecacheGui(m_lastWidgetsInfo, msg->NeedResetOldGui());
+  {
+    ref_ptr<GuiRecacheMessage> msg = message;
+    m_lastWidgetsInfo = msg->GetInitInfo();
+    RecacheGui(m_lastWidgetsInfo, msg->NeedResetOldGui());
 #ifdef RENDER_DEBUG_INFO_LABELS
-      RecacheDebugLabels();
+    RecacheDebugLabels();
 #endif
-      break;
-    }
+    break;
+  }
 
   case Message::Type::GuiLayerLayout:
-    {
-      ref_ptr<GuiLayerLayoutMessage> msg = message;
-      m_commutator->PostMessage(ThreadsCommutator::RenderThread,
-                                make_unique_dp<GuiLayerLayoutMessage>(msg->AcceptLayoutInfo()),
-                                MessagePriority::Normal);
-      break;
-    }
+  {
+    ref_ptr<GuiLayerLayoutMessage> msg = message;
+    m_commutator->PostMessage(ThreadsCommutator::RenderThread,
+                              make_unique_dp<GuiLayerLayoutMessage>(msg->AcceptLayoutInfo()), MessagePriority::Normal);
+    break;
+  }
 
   case Message::Type::TileReadStarted:
-    {
-      ref_ptr<TileReadStartMessage> msg = message;
-      m_batchersPool->ReserveBatcher(msg->GetKey());
-      break;
-    }
+  {
+    ref_ptr<TileReadStartMessage> msg = message;
+    m_batchersPool->ReserveBatcher(msg->GetKey());
+    break;
+  }
 
   case Message::Type::TileReadEnded:
-    {
-      ref_ptr<TileReadEndMessage> msg = message;
-      CHECK(m_context != nullptr, ());
-      m_batchersPool->ReleaseBatcher(m_context, msg->GetKey());
-      break;
-    }
+  {
+    ref_ptr<TileReadEndMessage> msg = message;
+    CHECK(m_context != nullptr, ());
+    m_batchersPool->ReleaseBatcher(m_context, msg->GetKey());
+    break;
+  }
 
   case Message::Type::FinishTileRead:
-    {
-      ref_ptr<FinishTileReadMessage> msg = message;
-      CHECK(m_context != nullptr, ());
-      if (msg->NeedForceUpdateUserMarks())
-      {
-        for (auto const & tileKey : msg->GetTiles())
-          m_userMarkGenerator->GenerateUserMarksGeometry(m_context, tileKey, m_texMng);
-      }
-      m_commutator->PostMessage(ThreadsCommutator::RenderThread,
-                                make_unique_dp<FinishTileReadMessage>(msg->MoveTiles(),
-                                                                      msg->NeedForceUpdateUserMarks()),
-                                MessagePriority::Normal);
-      break;
-    }
+  {
+    ref_ptr<FinishTileReadMessage> msg = message;
+    CHECK(m_context != nullptr, ());
+    if (msg->NeedForceUpdateUserMarks())
+      for (auto const & tileKey : msg->GetTiles())
+        m_userMarkGenerator->GenerateUserMarksGeometry(m_context, tileKey, m_texMng);
+    m_commutator->PostMessage(ThreadsCommutator::RenderThread,
+                              make_unique_dp<FinishTileReadMessage>(msg->MoveTiles(), msg->NeedForceUpdateUserMarks()),
+                              MessagePriority::Normal);
+    break;
+  }
 
   case Message::Type::FinishReading:
-    {
-      TOverlaysRenderData overlays;
-      overlays.swap(m_overlays);
-      m_commutator->PostMessage(ThreadsCommutator::RenderThread,
-                                make_unique_dp<FlushOverlaysMessage>(std::move(overlays)),
-                                MessagePriority::Normal);
-      break;
-    }
+  {
+    TOverlaysRenderData overlays;
+    overlays.swap(m_overlays);
+    m_commutator->PostMessage(ThreadsCommutator::RenderThread,
+                              make_unique_dp<FlushOverlaysMessage>(std::move(overlays)), MessagePriority::Normal);
+    break;
+  }
 
   case Message::Type::MapShapesRecache:
-    {
-      RecacheMapShapes();
-      break;
-    }
+  {
+    RecacheMapShapes();
+    break;
+  }
 
   case Message::Type::MapShapeReaded:
+  {
+    ref_ptr<MapShapeReadedMessage> msg = message;
+    auto const & tileKey = msg->GetKey();
+    if (m_requestedTiles->CheckTileKey(tileKey) && m_readManager->CheckTileKey(tileKey))
     {
-      ref_ptr<MapShapeReadedMessage> msg = message;
-      auto const & tileKey = msg->GetKey();
-      if (m_requestedTiles->CheckTileKey(tileKey) && m_readManager->CheckTileKey(tileKey))
+      CHECK(m_context != nullptr, ());
+      ref_ptr<dp::Batcher> batcher = m_batchersPool->GetBatcher(tileKey);
+      batcher->SetBatcherHash(tileKey.GetHashValue(BatcherBucket::Default));
+#if defined(DRAPE_MEASURER_BENCHMARK) && defined(GENERATING_STATISTIC)
+      DrapeMeasurer::Instance().StartShapesGeneration();
+#endif
+      for (drape_ptr<MapShape> const & shape : msg->GetShapes())
       {
-        CHECK(m_context != nullptr, ());
-        ref_ptr<dp::Batcher> batcher = m_batchersPool->GetBatcher(tileKey);
-        batcher->SetBatcherHash(tileKey.GetHashValue(BatcherBucket::Default));
-#if defined(DRAPE_MEASURER_BENCHMARK) && defined(GENERATING_STATISTIC)
-        DrapeMeasurer::Instance().StartShapesGeneration();
-#endif
-        for (drape_ptr<MapShape> const & shape : msg->GetShapes())
-        {
-          batcher->SetFeatureMinZoom(shape->GetFeatureMinZoom());
-          shape->Draw(m_context, batcher, m_texMng);
-        }
-#if defined(DRAPE_MEASURER_BENCHMARK) && defined(GENERATING_STATISTIC)
-        DrapeMeasurer::Instance().EndShapesGeneration(static_cast<uint32_t>(msg->GetShapes().size()));
-#endif
+        batcher->SetFeatureMinZoom(shape->GetFeatureMinZoom());
+        shape->Draw(m_context, batcher, m_texMng);
       }
-      break;
+#if defined(DRAPE_MEASURER_BENCHMARK) && defined(GENERATING_STATISTIC)
+      DrapeMeasurer::Instance().EndShapesGeneration(static_cast<uint32_t>(msg->GetShapes().size()));
+#endif
     }
+    break;
+  }
 
   case Message::Type::OverlayMapShapeReaded:
+  {
+    ref_ptr<OverlayMapShapeReadedMessage> msg = message;
+    auto const & tileKey = msg->GetKey();
+    if (m_requestedTiles->CheckTileKey(tileKey) && m_readManager->CheckTileKey(tileKey))
     {
-      ref_ptr<OverlayMapShapeReadedMessage> msg = message;
-      auto const & tileKey = msg->GetKey();
-      if (m_requestedTiles->CheckTileKey(tileKey) && m_readManager->CheckTileKey(tileKey))
+      CHECK(m_context != nullptr, ());
+      CleanupOverlays(tileKey);
+
+#if defined(DRAPE_MEASURER_BENCHMARK) && defined(GENERATING_STATISTIC)
+      DrapeMeasurer::Instance().StartOverlayShapesGeneration();
+#endif
+      OverlayBatcher batcher(tileKey);
+      for (drape_ptr<MapShape> const & shape : msg->GetShapes())
+        batcher.Batch(m_context, shape, m_texMng);
+
+      TOverlaysRenderData renderData;
+      batcher.Finish(m_context, renderData);
+      if (!renderData.empty())
       {
-        CHECK(m_context != nullptr, ());
-        CleanupOverlays(tileKey);
-
-#if defined(DRAPE_MEASURER_BENCHMARK) && defined(GENERATING_STATISTIC)
-        DrapeMeasurer::Instance().StartOverlayShapesGeneration();
-#endif
-        OverlayBatcher batcher(tileKey);
-        for (drape_ptr<MapShape> const & shape : msg->GetShapes())
-          batcher.Batch(m_context, shape, m_texMng);
-
-        TOverlaysRenderData renderData;
-        batcher.Finish(m_context, renderData);
-        if (!renderData.empty())
-        {
-          m_overlays.reserve(m_overlays.size() + renderData.size());
-          std::move(renderData.begin(), renderData.end(), back_inserter(m_overlays));
-        }
-
-#if defined(DRAPE_MEASURER_BENCHMARK) && defined(GENERATING_STATISTIC)
-        DrapeMeasurer::Instance().EndOverlayShapesGeneration(
-              static_cast<uint32_t>(msg->GetShapes().size()));
-#endif
+        m_overlays.reserve(m_overlays.size() + renderData.size());
+        std::move(renderData.begin(), renderData.end(), back_inserter(m_overlays));
       }
-      break;
+
+#if defined(DRAPE_MEASURER_BENCHMARK) && defined(GENERATING_STATISTIC)
+      DrapeMeasurer::Instance().EndOverlayShapesGeneration(static_cast<uint32_t>(msg->GetShapes().size()));
+#endif
     }
+    break;
+  }
 
   case Message::Type::ChangeUserMarkGroupVisibility:
-    {
-      ref_ptr<ChangeUserMarkGroupVisibilityMessage> msg = message;
-      m_userMarkGenerator->SetGroupVisibility(msg->GetGroupId(), msg->IsVisible());
-      break;
-    }
+  {
+    ref_ptr<ChangeUserMarkGroupVisibilityMessage> msg = message;
+    m_userMarkGenerator->SetGroupVisibility(msg->GetGroupId(), msg->IsVisible());
+    break;
+  }
 
   case Message::Type::UpdateUserMarks:
-    {
-      ref_ptr<UpdateUserMarksMessage> msg = message;
-      m_userMarkGenerator->SetRemovedUserMarks(msg->AcceptRemovedIds());
-      m_userMarkGenerator->SetUserMarks(msg->AcceptMarkRenderParams());
-      m_userMarkGenerator->SetUserLines(msg->AcceptLineRenderParams());
-      m_userMarkGenerator->SetJustCreatedUserMarks(msg->AcceptJustCreatedIds());
-      break;
-    }
+  {
+    ref_ptr<UpdateUserMarksMessage> msg = message;
+    m_userMarkGenerator->SetRemovedUserMarks(msg->AcceptRemovedIds());
+    m_userMarkGenerator->SetUserMarks(msg->AcceptMarkRenderParams());
+    m_userMarkGenerator->SetUserLines(msg->AcceptLineRenderParams());
+    m_userMarkGenerator->SetJustCreatedUserMarks(msg->AcceptJustCreatedIds());
+    break;
+  }
 
   case Message::Type::UpdateUserMarkGroup:
-    {
-      ref_ptr<UpdateUserMarkGroupMessage> msg = message;
-      kml::MarkGroupId const groupId = msg->GetGroupId();
-      m_userMarkGenerator->SetGroup(groupId, msg->AcceptIds());
-      break;
-    }
+  {
+    ref_ptr<UpdateUserMarkGroupMessage> msg = message;
+    kml::MarkGroupId const groupId = msg->GetGroupId();
+    m_userMarkGenerator->SetGroup(groupId, msg->AcceptIds());
+    break;
+  }
 
   case Message::Type::ClearUserMarkGroup:
-    {
-      ref_ptr<ClearUserMarkGroupMessage> msg = message;
-      m_userMarkGenerator->RemoveGroup(msg->GetGroupId());
-      break;
-    }
+  {
+    ref_ptr<ClearUserMarkGroupMessage> msg = message;
+    m_userMarkGenerator->RemoveGroup(msg->GetGroupId());
+    break;
+  }
 
   case Message::Type::InvalidateUserMarks:
-    {
-      m_commutator->PostMessage(ThreadsCommutator::RenderThread,
-                                make_unique_dp<InvalidateUserMarksMessage>(),
-                                MessagePriority::Normal);
-      break;
-    }
+  {
+    m_commutator->PostMessage(ThreadsCommutator::RenderThread, make_unique_dp<InvalidateUserMarksMessage>(),
+                              MessagePriority::Normal);
+    break;
+  }
   case Message::Type::AddSubroute:
-    {
-      ref_ptr<AddSubrouteMessage> msg = message;
-      CHECK(m_context != nullptr, ());
-      m_routeBuilder->Build(m_context, msg->GetSubrouteId(), msg->GetSubroute(), m_texMng,
-                            msg->GetRecacheId());
-      break;
-    }
+  {
+    ref_ptr<AddSubrouteMessage> msg = message;
+    CHECK(m_context != nullptr, ());
+    m_routeBuilder->Build(m_context, msg->GetSubrouteId(), msg->GetSubroute(), m_texMng, msg->GetRecacheId());
+    break;
+  }
 
   case Message::Type::CacheSubrouteArrows:
-    {
-      ref_ptr<CacheSubrouteArrowsMessage> msg = message;
-      CHECK(m_context != nullptr, ());
-      m_routeBuilder->BuildArrows(m_context, msg->GetSubrouteId(), msg->GetBorders(), m_texMng,
-                                  msg->GetRecacheId());
-      break;
-    }
+  {
+    ref_ptr<CacheSubrouteArrowsMessage> msg = message;
+    CHECK(m_context != nullptr, ());
+    m_routeBuilder->BuildArrows(m_context, msg->GetSubrouteId(), msg->GetBorders(), m_texMng, msg->GetRecacheId());
+    break;
+  }
 
   case Message::Type::RemoveSubroute:
-    {
-      ref_ptr<RemoveSubrouteMessage> msg = message;
-      m_routeBuilder->ClearRouteCache();
-      // We have to resend the message to FR, because it guaranties that
-      // RemoveSubroute will be processed after FlushSubrouteMessage.
-      m_commutator->PostMessage(ThreadsCommutator::RenderThread,
-                                make_unique_dp<RemoveSubrouteMessage>(
-                                  msg->GetSegmentId(), msg->NeedDeactivateFollowing()),
-                                MessagePriority::Normal);
-      break;
-    }
+  {
+    ref_ptr<RemoveSubrouteMessage> msg = message;
+    m_routeBuilder->ClearRouteCache();
+    // We have to resend the message to FR, because it guaranties that
+    // RemoveSubroute will be processed after FlushSubrouteMessage.
+    m_commutator->PostMessage(
+        ThreadsCommutator::RenderThread,
+        make_unique_dp<RemoveSubrouteMessage>(msg->GetSegmentId(), msg->NeedDeactivateFollowing()),
+        MessagePriority::Normal);
+    break;
+  }
 
   case Message::Type::SwitchMapStyle:
-    {
-      ref_ptr<SwitchMapStyleMessage> msg = message;
-      msg->FilterDependentMessages();
+  {
+    ref_ptr<SwitchMapStyleMessage> msg = message;
+    msg->FilterDependentMessages();
 
-      CHECK(m_context != nullptr, ());
-      m_texMng->OnSwitchMapStyle(m_context);
-      RecacheMapShapes();
-      RecacheGui(m_lastWidgetsInfo, false /* needResetOldGui */);
+    CHECK(m_context != nullptr, ());
+    m_texMng->OnSwitchMapStyle(m_context);
+    RecacheMapShapes();
+    RecacheGui(m_lastWidgetsInfo, false /* needResetOldGui */);
 #ifdef RENDER_DEBUG_INFO_LABELS
-      RecacheDebugLabels();
+    RecacheDebugLabels();
 #endif
-      m_trafficGenerator->InvalidateTexturesCache();
-      m_transitBuilder->RebuildSchemes(m_context, m_texMng);
+    m_trafficGenerator->InvalidateTexturesCache();
+    m_transitBuilder->RebuildSchemes(m_context, m_texMng);
 
-      // For Vulkan we initialize deferred cleaning up.
-      if (m_context->GetApiVersion() == dp::ApiVersion::Vulkan)
+    // For Vulkan we initialize deferred cleaning up.
+    if (m_context->GetApiVersion() == dp::ApiVersion::Vulkan)
+    {
+      std::vector<drape_ptr<dp::HWTexture>> textures;
+      m_texMng->GetTexturesToCleanup(textures);
+      if (!textures.empty())
       {
-        std::vector<drape_ptr<dp::HWTexture>> textures;
-        m_texMng->GetTexturesToCleanup(textures);
-        if (!textures.empty())
-        {
-          m_commutator->PostMessage(ThreadsCommutator::RenderThread,
-                                    make_unique_dp<CleanupTexturesMessage>(std::move(textures)),
-                                    MessagePriority::Normal);
-        }
+        m_commutator->PostMessage(ThreadsCommutator::RenderThread,
+                                  make_unique_dp<CleanupTexturesMessage>(std::move(textures)), MessagePriority::Normal);
       }
-
-      break;
     }
 
+    break;
+  }
+
   case Message::Type::CacheCirclesPack:
-    {
-      ref_ptr<CacheCirclesPackMessage> msg = message;
-      drape_ptr<CirclesPackRenderData> data = make_unique_dp<CirclesPackRenderData>();
-      data->m_pointsCount = msg->GetPointsCount();
-      CHECK(m_context != nullptr, ());
-      CirclesPackShape::Draw(m_context, *data.get());
-      m_commutator->PostMessage(ThreadsCommutator::RenderThread,
-                                make_unique_dp<FlushCirclesPackMessage>(
-                                  std::move(data), msg->GetDestination()),
-                                MessagePriority::Normal);
-      break;
-    }
+  {
+    ref_ptr<CacheCirclesPackMessage> msg = message;
+    drape_ptr<CirclesPackRenderData> data = make_unique_dp<CirclesPackRenderData>();
+    data->m_pointsCount = msg->GetPointsCount();
+    CHECK(m_context != nullptr, ());
+    CirclesPackShape::Draw(m_context, *data.get());
+    m_commutator->PostMessage(ThreadsCommutator::RenderThread,
+                              make_unique_dp<FlushCirclesPackMessage>(std::move(data), msg->GetDestination()),
+                              MessagePriority::Normal);
+    break;
+  }
 
   case Message::Type::Allow3dBuildings:
-    {
-      ref_ptr<Allow3dBuildingsMessage> msg = message;
-      m_readManager->Allow3dBuildings(msg->Allow3dBuildings());
-      break;
-    }
+  {
+    ref_ptr<Allow3dBuildingsMessage> msg = message;
+    m_readManager->Allow3dBuildings(msg->Allow3dBuildings());
+    break;
+  }
   case Message::Type::SetMapLangIndex:
-    {
-      ref_ptr<SetMapLangIndexMessage> msg = message;
-      m_readManager->SetMapLangIndex(msg->MapLangIndex());
-      break;
-    }
+  {
+    ref_ptr<SetMapLangIndexMessage> msg = message;
+    m_readManager->SetMapLangIndex(msg->MapLangIndex());
+    break;
+  }
   case Message::Type::RequestSymbolsSize:
+  {
+    ref_ptr<RequestSymbolsSizeMessage> msg = message;
+    auto const & symbols = msg->GetSymbols();
+
+    RequestSymbolsSizeMessage::Sizes sizes;
+    for (auto const & s : symbols)
     {
-      ref_ptr<RequestSymbolsSizeMessage> msg = message;
-      auto const & symbols = msg->GetSymbols();
-
-      RequestSymbolsSizeMessage::Sizes sizes;
-      for (auto const & s : symbols)
-      {
-        dp::TextureManager::SymbolRegion region;
-        m_texMng->GetSymbolRegion(s, region);
-        sizes.insert(std::make_pair(s, region.GetPixelSize()));
-      }
-      msg->InvokeCallback(std::move(sizes));
-
-      break;
+      dp::TextureManager::SymbolRegion region;
+      m_texMng->GetSymbolRegion(s, region);
+      sizes.insert(std::make_pair(s, region.GetPixelSize()));
     }
+    msg->InvokeCallback(std::move(sizes));
+
+    break;
+  }
 
   case Message::Type::EnableTraffic:
-    {
-      ref_ptr<EnableTrafficMessage> msg = message;
-      if (!msg->IsTrafficEnabled())
-        m_trafficGenerator->ClearCache();
-      m_readManager->SetTrafficEnabled(msg->IsTrafficEnabled());
-      m_commutator->PostMessage(ThreadsCommutator::RenderThread,
-                                make_unique_dp<EnableTrafficMessage>(msg->IsTrafficEnabled()),
-                                MessagePriority::Normal);
-      break;
-    }
+  {
+    ref_ptr<EnableTrafficMessage> msg = message;
+    if (!msg->IsTrafficEnabled())
+      m_trafficGenerator->ClearCache();
+    m_readManager->SetTrafficEnabled(msg->IsTrafficEnabled());
+    m_commutator->PostMessage(ThreadsCommutator::RenderThread,
+                              make_unique_dp<EnableTrafficMessage>(msg->IsTrafficEnabled()), MessagePriority::Normal);
+    break;
+  }
 
   case Message::Type::FlushTrafficGeometry:
+  {
+    ref_ptr<FlushTrafficGeometryMessage> msg = message;
+    auto const & tileKey = msg->GetKey();
+    if (m_requestedTiles->CheckTileKey(tileKey) && m_readManager->CheckTileKey(tileKey))
     {
-      ref_ptr<FlushTrafficGeometryMessage> msg = message;
-      auto const & tileKey = msg->GetKey();
-      if (m_requestedTiles->CheckTileKey(tileKey) && m_readManager->CheckTileKey(tileKey))
-      {
-        CHECK(m_context != nullptr, ());
-        m_trafficGenerator->FlushSegmentsGeometry(m_context, tileKey, msg->GetSegments(), m_texMng);
-      }
-      break;
+      CHECK(m_context != nullptr, ());
+      m_trafficGenerator->FlushSegmentsGeometry(m_context, tileKey, msg->GetSegments(), m_texMng);
     }
+    break;
+  }
 
   case Message::Type::UpdateTraffic:
-    {
-      ref_ptr<UpdateTrafficMessage> msg = message;
-      m_trafficGenerator->UpdateColoring(msg->GetSegmentsColoring());
-      m_commutator->PostMessage(ThreadsCommutator::RenderThread,
-                                make_unique_dp<RegenerateTrafficMessage>(),
-                                MessagePriority::Normal);
-      break;
-    }
+  {
+    ref_ptr<UpdateTrafficMessage> msg = message;
+    m_trafficGenerator->UpdateColoring(msg->GetSegmentsColoring());
+    m_commutator->PostMessage(ThreadsCommutator::RenderThread, make_unique_dp<RegenerateTrafficMessage>(),
+                              MessagePriority::Normal);
+    break;
+  }
 
   case Message::Type::ClearTrafficData:
-    {
-      ref_ptr<ClearTrafficDataMessage> msg = message;
+  {
+    ref_ptr<ClearTrafficDataMessage> msg = message;
 
-      m_trafficGenerator->ClearCache(msg->GetMwmId());
+    m_trafficGenerator->ClearCache(msg->GetMwmId());
 
-      m_commutator->PostMessage(ThreadsCommutator::RenderThread,
-                                make_unique_dp<ClearTrafficDataMessage>(msg->GetMwmId()),
-                                MessagePriority::Normal);
-      break;
-    }
+    m_commutator->PostMessage(ThreadsCommutator::RenderThread, make_unique_dp<ClearTrafficDataMessage>(msg->GetMwmId()),
+                              MessagePriority::Normal);
+    break;
+  }
 
   case Message::Type::SetSimplifiedTrafficColors:
-    {
-      ref_ptr<SetSimplifiedTrafficColorsMessage> msg = message;
+  {
+    ref_ptr<SetSimplifiedTrafficColorsMessage> msg = message;
 
-      m_trafficGenerator->SetSimplifiedColorSchemeEnabled(msg->IsSimplified());
-      m_trafficGenerator->InvalidateTexturesCache();
+    m_trafficGenerator->SetSimplifiedColorSchemeEnabled(msg->IsSimplified());
+    m_trafficGenerator->InvalidateTexturesCache();
 
-      m_commutator->PostMessage(ThreadsCommutator::RenderThread,
-                                make_unique_dp<SetSimplifiedTrafficColorsMessage>(msg->IsSimplified()),
-                                MessagePriority::Normal);
-      break;
-    }
+    m_commutator->PostMessage(ThreadsCommutator::RenderThread,
+                              make_unique_dp<SetSimplifiedTrafficColorsMessage>(msg->IsSimplified()),
+                              MessagePriority::Normal);
+    break;
+  }
 
   case Message::Type::UpdateTransitScheme:
-    {
-      ref_ptr<UpdateTransitSchemeMessage> msg = message;
-      CHECK(m_context != nullptr, ());
-      m_transitBuilder->UpdateSchemes(m_context, msg->GetTransitDisplayInfos(), m_texMng);
-      break;
-    }
+  {
+    ref_ptr<UpdateTransitSchemeMessage> msg = message;
+    CHECK(m_context != nullptr, ());
+    m_transitBuilder->UpdateSchemes(m_context, msg->GetTransitDisplayInfos(), m_texMng);
+    break;
+  }
 
   case Message::Type::RegenerateTransitScheme:
-    {
-      CHECK(m_context != nullptr, ());
-      m_transitBuilder->RebuildSchemes(m_context, m_texMng);
-      break;
-    }
+  {
+    CHECK(m_context != nullptr, ());
+    m_transitBuilder->RebuildSchemes(m_context, m_texMng);
+    break;
+  }
 
   case Message::Type::ClearTransitSchemeData:
-    {
-      ref_ptr<ClearTransitSchemeDataMessage> msg = message;
-      m_transitBuilder->Clear(msg->GetMwmId());
-      m_commutator->PostMessage(ThreadsCommutator::RenderThread,
-                                make_unique_dp<ClearTransitSchemeDataMessage>(msg->GetMwmId()),
-                                MessagePriority::Normal);
-      break;
-    }
+  {
+    ref_ptr<ClearTransitSchemeDataMessage> msg = message;
+    m_transitBuilder->Clear(msg->GetMwmId());
+    m_commutator->PostMessage(ThreadsCommutator::RenderThread,
+                              make_unique_dp<ClearTransitSchemeDataMessage>(msg->GetMwmId()), MessagePriority::Normal);
+    break;
+  }
 
   case Message::Type::ClearAllTransitSchemeData:
-    {
-      m_transitBuilder->Clear();
-      m_commutator->PostMessage(ThreadsCommutator::RenderThread,
-                                make_unique_dp<ClearAllTransitSchemeDataMessage>(),
-                                MessagePriority::Normal);
-      break;
-    }
+  {
+    m_transitBuilder->Clear();
+    m_commutator->PostMessage(ThreadsCommutator::RenderThread, make_unique_dp<ClearAllTransitSchemeDataMessage>(),
+                              MessagePriority::Normal);
+    break;
+  }
 
   case Message::Type::EnableTransitScheme:
-    {
-      ref_ptr<EnableTransitSchemeMessage> msg = message;
-      if (!msg->IsEnabled())
-        m_transitBuilder->Clear();
-      m_commutator->PostMessage(ThreadsCommutator::RenderThread,
-                                make_unique_dp<EnableTransitSchemeMessage>(msg->IsEnabled()),
-                                MessagePriority::Normal);
-      break;
-    }
+  {
+    ref_ptr<EnableTransitSchemeMessage> msg = message;
+    if (!msg->IsEnabled())
+      m_transitBuilder->Clear();
+    m_commutator->PostMessage(ThreadsCommutator::RenderThread,
+                              make_unique_dp<EnableTransitSchemeMessage>(msg->IsEnabled()), MessagePriority::Normal);
+    break;
+  }
 
   case Message::Type::EnableIsolines:
-    {
-      ref_ptr<EnableIsolinesMessage> msg = message;
-      m_readManager->SetIsolinesEnabled(msg->IsEnabled());
-      m_commutator->PostMessage(ThreadsCommutator::RenderThread,
-                                make_unique_dp<EnableIsolinesMessage>(msg->IsEnabled()),
-                                MessagePriority::Normal);
-      break;
-    }
+  {
+    ref_ptr<EnableIsolinesMessage> msg = message;
+    m_readManager->SetIsolinesEnabled(msg->IsEnabled());
+    m_commutator->PostMessage(ThreadsCommutator::RenderThread, make_unique_dp<EnableIsolinesMessage>(msg->IsEnabled()),
+                              MessagePriority::Normal);
+    break;
+  }
 
   case Message::Type::DrapeApiAddLines:
-    {
-      ref_ptr<DrapeApiAddLinesMessage> msg = message;
-      CHECK(m_context != nullptr, ());
-      std::vector<drape_ptr<DrapeApiRenderProperty>> properties;
-      m_drapeApiBuilder->BuildLines(m_context, msg->GetLines(), m_texMng, properties);
-      m_commutator->PostMessage(ThreadsCommutator::RenderThread,
-                                make_unique_dp<DrapeApiFlushMessage>(std::move(properties)),
-                                MessagePriority::Normal);
-      break;
-    }
+  {
+    ref_ptr<DrapeApiAddLinesMessage> msg = message;
+    CHECK(m_context != nullptr, ());
+    std::vector<drape_ptr<DrapeApiRenderProperty>> properties;
+    m_drapeApiBuilder->BuildLines(m_context, msg->GetLines(), m_texMng, properties);
+    m_commutator->PostMessage(ThreadsCommutator::RenderThread,
+                              make_unique_dp<DrapeApiFlushMessage>(std::move(properties)), MessagePriority::Normal);
+    break;
+  }
 
   case Message::Type::DrapeApiRemove:
-    {
-      ref_ptr<DrapeApiRemoveMessage> msg = message;
-      m_commutator->PostMessage(ThreadsCommutator::RenderThread,
-                                make_unique_dp<DrapeApiRemoveMessage>(msg->GetId(), msg->NeedRemoveAll()),
-                                MessagePriority::Normal);
-      break;
-    }
+  {
+    ref_ptr<DrapeApiRemoveMessage> msg = message;
+    m_commutator->PostMessage(ThreadsCommutator::RenderThread,
+                              make_unique_dp<DrapeApiRemoveMessage>(msg->GetId(), msg->NeedRemoveAll()),
+                              MessagePriority::Normal);
+    break;
+  }
 
   case Message::Type::SetCustomFeatures:
-    {
-      ref_ptr<SetCustomFeaturesMessage> msg = message;
-      m_readManager->SetCustomFeatures(msg->AcceptFeatures());
-      m_commutator->PostMessage(ThreadsCommutator::RenderThread,
-                                make_unique_dp<SetTrackedFeaturesMessage>(
-                                  m_readManager->GetCustomFeaturesArray()),
-                                MessagePriority::Normal);
-      break;
-    }
+  {
+    ref_ptr<SetCustomFeaturesMessage> msg = message;
+    m_readManager->SetCustomFeatures(msg->AcceptFeatures());
+    m_commutator->PostMessage(ThreadsCommutator::RenderThread,
+                              make_unique_dp<SetTrackedFeaturesMessage>(m_readManager->GetCustomFeaturesArray()),
+                              MessagePriority::Normal);
+    break;
+  }
 
   case Message::Type::RemoveCustomFeatures:
-    {
-      ref_ptr<RemoveCustomFeaturesMessage> msg = message;
-      bool changed = false;
-      if (msg->NeedRemoveAll())
-        changed = m_readManager->RemoveAllCustomFeatures();
-      else
-        changed = m_readManager->RemoveCustomFeatures(msg->GetMwmId());
+  {
+    ref_ptr<RemoveCustomFeaturesMessage> msg = message;
+    bool changed = false;
+    if (msg->NeedRemoveAll())
+      changed = m_readManager->RemoveAllCustomFeatures();
+    else
+      changed = m_readManager->RemoveCustomFeatures(msg->GetMwmId());
 
-      if (changed)
-      {
-        m_commutator->PostMessage(ThreadsCommutator::RenderThread,
-                                  make_unique_dp<SetTrackedFeaturesMessage>(
-                                    m_readManager->GetCustomFeaturesArray()),
-                                  MessagePriority::Normal);
-      }
-      break;
+    if (changed)
+    {
+      m_commutator->PostMessage(ThreadsCommutator::RenderThread,
+                                make_unique_dp<SetTrackedFeaturesMessage>(m_readManager->GetCustomFeaturesArray()),
+                                MessagePriority::Normal);
     }
+    break;
+  }
 
   case Message::Type::NotifyRenderThread:
-    {
-      ref_ptr<NotifyRenderThreadMessage> msg = message;
-      msg->InvokeFunctor();
-      break;
-    }
+  {
+    ref_ptr<NotifyRenderThreadMessage> msg = message;
+    msg->InvokeFunctor();
+    break;
+  }
 
   case Message::Type::CheckSelectionGeometry:
+  {
+    ref_ptr<CheckSelectionGeometryMessage> msg = message;
+    auto renderNode = SelectionShapeGenerator::GenerateSelectionGeometry(
+        m_context, msg->GetFeature(), m_texMng, make_ref(m_metalineManager), m_readManager->GetMapDataProvider());
+    if (renderNode && renderNode->GetBoundingBox().IsValid())
     {
-      ref_ptr<CheckSelectionGeometryMessage> msg = message;
-      auto renderNode = SelectionShapeGenerator::GenerateSelectionGeometry(m_context, msg->GetFeature(), m_texMng,
-                                                                           make_ref(m_metalineManager),
-                                                                           m_readManager->GetMapDataProvider());
-      if (renderNode && renderNode->GetBoundingBox().IsValid())
-      {
-        m_commutator->PostMessage(ThreadsCommutator::RenderThread,
-                                  make_unique_dp<FlushSelectionGeometryMessage>(
-                                    std::move(renderNode), msg->GetRecacheId()),
-                                  MessagePriority::Normal);
-      }
-      break;
+      m_commutator->PostMessage(
+          ThreadsCommutator::RenderThread,
+          make_unique_dp<FlushSelectionGeometryMessage>(std::move(renderNode), msg->GetRecacheId()),
+          MessagePriority::Normal);
     }
+    break;
+  }
 
   case Message::Type::Arrow3dRecache:
+  {
+    ref_ptr<Arrow3dRecacheMessage> msg = message;
+
+    m_arrow3dCustomDecl = msg->GetArrow3dCustomDecl();
+
+    // Invalidate Arrow3d texture.
+    CHECK(m_context != nullptr, ());
+    m_texMng->InvalidateArrowTexture(
+        m_context, m_arrow3dCustomDecl ? m_arrow3dCustomDecl->m_arrowMeshTexturePath : std::string(),
+        m_arrow3dCustomDecl ? m_arrow3dCustomDecl->m_loadFromDefaultResourceFolder : false);
+
+    // Preload mesh data.
+    m_arrow3dPreloadedData = Arrow3d::PreloadMesh(m_arrow3dCustomDecl, m_texMng);
+    if (!m_arrow3dPreloadedData.m_meshData.has_value())
     {
-      ref_ptr<Arrow3dRecacheMessage> msg = message;
-
-      m_arrow3dCustomDecl = msg->GetArrow3dCustomDecl();
-
-      // Invalidate Arrow3d texture.
-      CHECK(m_context != nullptr, ());
-      m_texMng->InvalidateArrowTexture(
-          m_context,
-          m_arrow3dCustomDecl ? m_arrow3dCustomDecl->m_arrowMeshTexturePath : std::string(),
-          m_arrow3dCustomDecl ? m_arrow3dCustomDecl->m_loadFromDefaultResourceFolder : false);
-
-      // Preload mesh data.
+      // Fallback to default arrow mesh.
+      m_arrow3dCustomDecl.reset();
+      m_texMng->InvalidateArrowTexture(m_context);
       m_arrow3dPreloadedData = Arrow3d::PreloadMesh(m_arrow3dCustomDecl, m_texMng);
-      if (!m_arrow3dPreloadedData.m_meshData.has_value())
-      {
-        // Fallback to default arrow mesh.
-        m_arrow3dCustomDecl.reset();
-        m_texMng->InvalidateArrowTexture(m_context);
-        m_arrow3dPreloadedData = Arrow3d::PreloadMesh(m_arrow3dCustomDecl, m_texMng);
-      }
-
-      // Recache map shapes.
-      RecacheMapShapes();
-
-      // For Vulkan we initialize deferred cleaning up.
-      if (m_context->GetApiVersion() == dp::ApiVersion::Vulkan)
-      {
-        std::vector<drape_ptr<dp::HWTexture>> textures;
-        m_texMng->GetTexturesToCleanup(textures);
-        if (!textures.empty())
-        {
-          m_commutator->PostMessage(ThreadsCommutator::RenderThread,
-                                    make_unique_dp<CleanupTexturesMessage>(std::move(textures)),
-                                    MessagePriority::Normal);
-        }
-      }
-
-      break;
     }
 
+    // Recache map shapes.
+    RecacheMapShapes();
+
+    // For Vulkan we initialize deferred cleaning up.
+    if (m_context->GetApiVersion() == dp::ApiVersion::Vulkan)
+    {
+      std::vector<drape_ptr<dp::HWTexture>> textures;
+      m_texMng->GetTexturesToCleanup(textures);
+      if (!textures.empty())
+      {
+        m_commutator->PostMessage(ThreadsCommutator::RenderThread,
+                                  make_unique_dp<CleanupTexturesMessage>(std::move(textures)), MessagePriority::Normal);
+      }
+    }
+
+    break;
+  }
+
 #if defined(OMIM_OS_DESKTOP)
   case Message::Type::NotifyGraphicsReady:
-    {
-      ref_ptr<NotifyGraphicsReadyMessage> msg = message;
-      m_commutator->PostMessage(ThreadsCommutator::RenderThread,
-                                make_unique_dp<NotifyGraphicsReadyMessage>(msg->GetCallback(),
-                                                                           msg->NeedInvalidate()),
-                                MessagePriority::Normal);
-      break;
-    }
+  {
+    ref_ptr<NotifyGraphicsReadyMessage> msg = message;
+    m_commutator->PostMessage(ThreadsCommutator::RenderThread,
+                              make_unique_dp<NotifyGraphicsReadyMessage>(msg->GetCallback(), msg->NeedInvalidate()),
+                              MessagePriority::Normal);
+    break;
+  }
 #endif
 
-  default:
-    ASSERT(false, ());
-    break;
+  default: ASSERT(false, ()); break;
   }
 }
 
@@ -747,9 +719,8 @@ void BackendRenderer::InitContextDependentResources()
   // Increase this value for big features.
   uint32_t constexpr kBatchSize = 5000;
 
-  m_batchersPool = make_unique_dp<BatchersPool<TileKey, TileKeyStrictComparator>>(kReadingThreadsCount,
-                                               std::bind(&BackendRenderer::FlushGeometry, this, _1, _2, _3),
-                                               kBatchSize, kBatchSize);
+  m_batchersPool = make_unique_dp<BatchersPool<TileKey, TileKeyStrictComparator>>(
+      kReadingThreadsCount, std::bind(&BackendRenderer::FlushGeometry, this, _1, _2, _3), kBatchSize, kBatchSize);
   m_trafficGenerator->Init();
 
   dp::TextureManager::Params params;
@@ -761,7 +732,7 @@ void BackendRenderer::InitContextDependentResources()
 #else
   params.m_colors = "colors.txt";
   params.m_patterns = "patterns.txt";
-#endif // BUILD_DESIGNER
+#endif  // BUILD_DESIGNER
   params.m_glyphMngParams.m_uniBlocks = base::JoinPath("fonts", "unicode_blocks.txt");
   params.m_glyphMngParams.m_whitelist = base::JoinPath("fonts", "whitelist.txt");
   params.m_glyphMngParams.m_blacklist = base::JoinPath("fonts", "blacklist.txt");
@@ -784,8 +755,7 @@ void BackendRenderer::InitContextDependentResources()
                             make_unique_dp<SetPostprocessStaticTexturesMessage>(std::move(textures)),
                             MessagePriority::Normal);
 
-  m_commutator->PostMessage(ThreadsCommutator::RenderThread,
-                            make_unique_dp<FinishTexturesInitializationMessage>(),
+  m_commutator->PostMessage(ThreadsCommutator::RenderThread, make_unique_dp<FinishTexturesInitializationMessage>(),
                             MessagePriority::Normal);
 
   // Preload Arrow3D mesh.
@@ -795,9 +765,9 @@ void BackendRenderer::InitContextDependentResources()
 void BackendRenderer::RecacheMapShapes()
 {
   CHECK(m_context != nullptr, ());
-  auto msg = make_unique_dp<MapShapesMessage>(make_unique_dp<MyPosition>(m_context, m_texMng),
-                                              make_unique_dp<SelectionShape>(m_context, m_texMng),
-                                              m_arrow3dPreloadedData);
+  auto msg =
+      make_unique_dp<MapShapesMessage>(make_unique_dp<MyPosition>(m_context, m_texMng),
+                                       make_unique_dp<SelectionShape>(m_context, m_texMng), m_arrow3dPreloadedData);
   m_context->Flush();
   m_commutator->PostMessage(ThreadsCommutator::RenderThread, std::move(msg), MessagePriority::Normal);
 }
@@ -815,30 +785,25 @@ void BackendRenderer::FlushGeometry(TileKey const & key, dp::RenderState const &
 void BackendRenderer::FlushTransitRenderData(TransitRenderData && renderData)
 {
   m_commutator->PostMessage(ThreadsCommutator::RenderThread,
-                            make_unique_dp<FlushTransitSchemeMessage>(std::move(renderData)),
-                            MessagePriority::Normal);
+                            make_unique_dp<FlushTransitSchemeMessage>(std::move(renderData)), MessagePriority::Normal);
 }
 
 void BackendRenderer::FlushTrafficRenderData(TrafficRenderData && renderData)
 {
   m_commutator->PostMessage(ThreadsCommutator::RenderThread,
-                            make_unique_dp<FlushTrafficDataMessage>(std::move(renderData)),
-                            MessagePriority::Normal);
+                            make_unique_dp<FlushTrafficDataMessage>(std::move(renderData)), MessagePriority::Normal);
 }
 
 void BackendRenderer::FlushUserMarksRenderData(TUserMarksRenderData && renderData)
 {
   m_commutator->PostMessage(ThreadsCommutator::RenderThread,
-                            make_unique_dp<FlushUserMarksMessage>(std::move(renderData)),
-                            MessagePriority::Normal);
+                            make_unique_dp<FlushUserMarksMessage>(std::move(renderData)), MessagePriority::Normal);
 }
 
 void BackendRenderer::CleanupOverlays(TileKey const & tileKey)
 {
   auto const functor = [&tileKey](OverlayRenderData const & data)
-  {
-    return data.m_tileKey == tileKey && data.m_tileKey.m_generation < tileKey.m_generation;
-  };
+  { return data.m_tileKey == tileKey && data.m_tileKey.m_generation < tileKey.m_generation; };
   m_overlays.erase(std::remove_if(m_overlays.begin(), m_overlays.end(), functor), m_overlays.end());
 }
 }  // namespace df
diff --git a/libs/drape_frontend/backend_renderer.hpp b/libs/drape_frontend/backend_renderer.hpp
index 336bcf0be..a9ad6f78a 100644
--- a/libs/drape_frontend/backend_renderer.hpp
+++ b/libs/drape_frontend/backend_renderer.hpp
@@ -35,16 +35,15 @@ class MetalineManager;
 class BackendRenderer : public BaseRenderer
 {
 public:
-  using TUpdateCurrentCountryFn = std::function<void (m2::PointD const &, int)>;
+  using TUpdateCurrentCountryFn = std::function<void(m2::PointD const &, int)>;
 
   struct Params : BaseRenderer::Params
   {
     Params(dp::ApiVersion apiVersion, ref_ptr<ThreadsCommutator> commutator,
            ref_ptr<dp::GraphicsContextFactory> factory, ref_ptr<dp::TextureManager> texMng,
            MapDataProvider const & model, TUpdateCurrentCountryFn const & updateCurrentCountryFn,
-           ref_ptr<RequestedTiles> requestedTiles, bool allow3dBuildings, bool trafficEnabled,
-           bool isolinesEnabled, bool simplifiedTrafficColors,
-           std::optional<Arrow3dCustomDecl> arrow3dCustomDecl,
+           ref_ptr<RequestedTiles> requestedTiles, bool allow3dBuildings, bool trafficEnabled, bool isolinesEnabled,
+           bool simplifiedTrafficColors, std::optional<Arrow3dCustomDecl> arrow3dCustomDecl,
            OnGraphicsContextInitialized const & onGraphicsContextInitialized)
       : BaseRenderer::Params(apiVersion, commutator, factory, texMng, onGraphicsContextInitialized)
       , m_model(model)
@@ -74,7 +73,7 @@ public:
 
 protected:
   std::unique_ptr<threads::IRoutine> CreateRoutine() override;
-  
+
   void RenderFrame() override;
 
   void OnContextCreate() override;
diff --git a/libs/drape_frontend/base_renderer.cpp b/libs/drape_frontend/base_renderer.cpp
index feded7184..a039d0639 100644
--- a/libs/drape_frontend/base_renderer.cpp
+++ b/libs/drape_frontend/base_renderer.cpp
@@ -8,7 +8,7 @@ namespace dp
 {
 extern void RenderFrameMediator(std::function<void()> && renderFrameFunction);
 }  // namespace dp
-#define RENDER_FRAME_MEDIATOR(renderFunction) dp::RenderFrameMediator([this]{ renderFunction; })
+#define RENDER_FRAME_MEDIATOR(renderFunction) dp::RenderFrameMediator([this] { renderFunction; })
 #else
 #define RENDER_FRAME_MEDIATOR(renderFunction) renderFunction
 #endif
@@ -46,19 +46,17 @@ void BaseRenderer::StopThread()
 
   // wake up render thread if necessary
   if (!m_isEnabled)
-  {
     WakeUp();
-  }
 
   // wait for render thread completion
   m_selfThread.Join();
 }
-  
+
 void BaseRenderer::IterateRenderLoop()
 {
   RENDER_FRAME_MEDIATOR(IterateRenderLoopImpl());
 }
-  
+
 void BaseRenderer::IterateRenderLoopImpl()
 {
   RenderFrame();
@@ -155,8 +153,7 @@ void BaseRenderer::CheckRenderingEnabled()
     else
     {
       bool const isDrawContext = m_threadName == ThreadsCommutator::RenderThread;
-      context = isDrawContext ? m_contextFactory->GetDrawContext() :
-                                m_contextFactory->GetResourcesUploadContext();
+      context = isDrawContext ? m_contextFactory->GetDrawContext() : m_contextFactory->GetResourcesUploadContext();
       context->SetRenderingEnabled(false);
     }
 
diff --git a/libs/drape_frontend/base_renderer.hpp b/libs/drape_frontend/base_renderer.hpp
index 4bb80217e..4f45f8f28 100644
--- a/libs/drape_frontend/base_renderer.hpp
+++ b/libs/drape_frontend/base_renderer.hpp
@@ -44,7 +44,7 @@ public:
   BaseRenderer(ThreadsCommutator::ThreadName name, Params const & params);
 
   bool CanReceiveMessages();
-  
+
   void IterateRenderLoop();
 
   void SetRenderingEnabled(ref_ptr<dp::GraphicsContextFactory> contextFactory);
@@ -52,7 +52,7 @@ public:
 
   bool IsRenderingEnabled() const;
 
-  dp::ApiVersion GetApiVersion() const { return m_apiVersion; };
+  dp::ApiVersion GetApiVersion() const { return m_apiVersion; }
 
 protected:
   dp::ApiVersion m_apiVersion;
@@ -67,9 +67,9 @@ protected:
   void CreateContext();
 
   void CheckRenderingEnabled();
-  
+
   virtual std::unique_ptr<threads::IRoutine> CreateRoutine() = 0;
-  
+
   virtual void RenderFrame() = 0;
 
   virtual void OnContextCreate() = 0;
@@ -80,7 +80,7 @@ protected:
 
 private:
   using TCompletionHandler = std::function<void()>;
-  
+
   void IterateRenderLoopImpl();
 
   threads::Thread m_selfThread;
diff --git a/libs/drape_frontend/batchers_pool.hpp b/libs/drape_frontend/batchers_pool.hpp
index f7ea1416f..c53685520 100644
--- a/libs/drape_frontend/batchers_pool.hpp
+++ b/libs/drape_frontend/batchers_pool.hpp
@@ -16,11 +16,10 @@ template <typename TKey, typename TKeyComparator>
 class BatchersPool final
 {
 public:
-  using TFlushFn = std::function<void (TKey const & key, dp::RenderState const & state,
-                                       drape_ptr<dp::RenderBucket> && buffer)>;
+  using TFlushFn =
+      std::function<void(TKey const & key, dp::RenderState const & state, drape_ptr<dp::RenderBucket> && buffer)>;
 
-  BatchersPool(int initBatchersCount, TFlushFn const & flushFn,
-               uint32_t indexBufferSize, uint32_t vertexBufferSize)
+  BatchersPool(int initBatchersCount, TFlushFn const & flushFn, uint32_t indexBufferSize, uint32_t vertexBufferSize)
     : m_flushFn(flushFn)
     , m_pool(initBatchersCount, dp::BatcherFactory(indexBufferSize, vertexBufferSize))
   {}
@@ -63,7 +62,7 @@ public:
     auto it = m_batchers.find(key);
     ASSERT(it != m_batchers.end(), ());
     ASSERT_GREATER(it->second.second, 0, ());
-    if ((--it->second.second)== 0)
+    if ((--it->second.second) == 0)
     {
       dp::Batcher * batcher = it->second.first;
       batcher->EndSession(context);
diff --git a/libs/drape_frontend/circles_pack_shape.cpp b/libs/drape_frontend/circles_pack_shape.cpp
index d0f2b9999..eee3bd448 100644
--- a/libs/drape_frontend/circles_pack_shape.cpp
+++ b/libs/drape_frontend/circles_pack_shape.cpp
@@ -78,8 +78,7 @@ void CirclesPackHandle::GetAttributeMutation(ref_ptr<dp::AttributeBufferMutator>
   ASSERT_EQUAL(node.first.GetElementSize(), sizeof(CirclesPackDynamicVertex), ());
   ASSERT_EQUAL(node.second.m_count, m_buffer.size(), ());
 
-  uint32_t const bytesCount =
-      static_cast<uint32_t>(m_buffer.size()) * sizeof(CirclesPackDynamicVertex);
+  uint32_t const bytesCount = static_cast<uint32_t>(m_buffer.size()) * sizeof(CirclesPackDynamicVertex);
   void * buffer = mutator->AllocateMutationBuffer(bytesCount);
   memcpy(buffer, m_buffer.data(), bytesCount);
 
@@ -97,7 +96,10 @@ bool CirclesPackHandle::Update(ScreenBase const & screen)
   return true;
 }
 
-bool CirclesPackHandle::IndexesRequired() const { return false; }
+bool CirclesPackHandle::IndexesRequired() const
+{
+  return false;
+}
 
 m2::RectD CirclesPackHandle::GetPixelRect(ScreenBase const & screen, bool perspective) const
 {
@@ -106,15 +108,13 @@ m2::RectD CirclesPackHandle::GetPixelRect(ScreenBase const & screen, bool perspe
   return m2::RectD();
 }
 
-void CirclesPackHandle::GetPixelShape(ScreenBase const & screen, bool perspective,
-                                      Rects & rects) const
+void CirclesPackHandle::GetPixelShape(ScreenBase const & screen, bool perspective, Rects & rects) const
 {
   UNUSED_VALUE(screen);
   UNUSED_VALUE(perspective);
 }
 
-void CirclesPackHandle::SetPoint(size_t index, m2::PointD const & position, float radius,
-                                 dp::Color const & color)
+void CirclesPackHandle::SetPoint(size_t index, m2::PointD const & position, float radius, dp::Color const & color)
 {
   size_t const bufferIndex = index * dp::Batcher::VertexPerQuad;
   ASSERT_LESS_OR_EQUAL(bufferIndex + dp::Batcher::VertexPerQuad, m_buffer.size(), ());
@@ -161,8 +161,7 @@ void CirclesPackShape::Draw(ref_ptr<dp::GraphicsContext> context, CirclesPackRen
 
   dp::Batcher batcher(data.m_pointsCount * kIndicesInPoint, data.m_pointsCount * kVerticesInPoint);
   batcher.SetBatcherHash(static_cast<uint64_t>(BatcherBucket::Overlay));
-  dp::SessionGuard guard(context, batcher,
-                         [&data](dp::RenderState const & state, drape_ptr<dp::RenderBucket> && b)
+  dp::SessionGuard guard(context, batcher, [&data](dp::RenderState const & state, drape_ptr<dp::RenderBucket> && b)
   {
     data.m_bucket = std::move(b);
     data.m_state = state;
@@ -170,14 +169,10 @@ void CirclesPackShape::Draw(ref_ptr<dp::GraphicsContext> context, CirclesPackRen
 
   drape_ptr<dp::OverlayHandle> handle = make_unique_dp<CirclesPackHandle>(data.m_pointsCount);
 
-  dp::AttributeProvider provider(2 /* stream count */,
-                                 static_cast<uint32_t>(staticVertexData.size()));
-  provider.InitStream(0 /* stream index */, GetCirclesPackStaticBindingInfo(),
-                      make_ref(staticVertexData.data()));
-  provider.InitStream(1 /* stream index */, GetCirclesPackDynamicBindingInfo(),
-                      make_ref(dynamicVertexData.data()));
-  batcher.InsertListOfStrip(context, GetCirclesPackState(), make_ref(&provider),
-                            std::move(handle), kVerticesInPoint);
+  dp::AttributeProvider provider(2 /* stream count */, static_cast<uint32_t>(staticVertexData.size()));
+  provider.InitStream(0 /* stream index */, GetCirclesPackStaticBindingInfo(), make_ref(staticVertexData.data()));
+  provider.InitStream(1 /* stream index */, GetCirclesPackDynamicBindingInfo(), make_ref(dynamicVertexData.data()));
+  batcher.InsertListOfStrip(context, GetCirclesPackState(), make_ref(&provider), std::move(handle), kVerticesInPoint);
 
   context->Flush();
 }
diff --git a/libs/drape_frontend/circles_pack_shape.hpp b/libs/drape_frontend/circles_pack_shape.hpp
index fa92a8d01..5792f665c 100644
--- a/libs/drape_frontend/circles_pack_shape.hpp
+++ b/libs/drape_frontend/circles_pack_shape.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "drape_frontend/map_shape.hpp"
-#include "drape_frontend/shape_view_params.hpp"
 #include "drape_frontend/render_state_extension.hpp"
+#include "drape_frontend/shape_view_params.hpp"
 
 #include "drape/overlay_handle.hpp"
 #include "drape/pointers.hpp"
@@ -37,9 +37,7 @@ struct CirclesPackDynamicVertex
   using TColor = glsl::vec4;
 
   CirclesPackDynamicVertex() = default;
-  CirclesPackDynamicVertex(TPosition const & pos, TColor const & color)
-    : m_position(pos), m_color(color)
-  {}
+  CirclesPackDynamicVertex(TPosition const & pos, TColor const & color) : m_position(pos), m_color(color) {}
 
   TPosition m_position;
   TColor m_color;
diff --git a/libs/drape_frontend/color_constants.cpp b/libs/drape_frontend/color_constants.cpp
index 487b8f39b..bbfa34b77 100644
--- a/libs/drape_frontend/color_constants.cpp
+++ b/libs/drape_frontend/color_constants.cpp
@@ -57,7 +57,7 @@ public:
       if (colors == nullptr)
         return;
 
-      const char * name = nullptr;
+      char const * name = nullptr;
       json_t * colorInfo = nullptr;
       json_object_foreach(colors, name, colorInfo)
       {
@@ -128,7 +128,10 @@ dp::Color GetColorConstant(ColorConstant const & constant)
   return ToDrapeColor(color);
 }
 
-std::map<std::string, dp::Color> const & GetTransitClearColors() { return TransitColors().GetClearColors(); }
+std::map<std::string, dp::Color> const & GetTransitClearColors()
+{
+  return TransitColors().GetClearColors();
+}
 
 void LoadTransitColors()
 {
diff --git a/libs/drape_frontend/color_constants.hpp b/libs/drape_frontend/color_constants.hpp
index 6a3f2890c..d4e521bfb 100644
--- a/libs/drape_frontend/color_constants.hpp
+++ b/libs/drape_frontend/color_constants.hpp
@@ -19,4 +19,4 @@ void LoadTransitColors();
 
 ColorConstant GetTransitColorName(ColorConstant const & localName);
 ColorConstant GetTransitTextColorName(ColorConstant const & localName);
-} //  namespace df
+}  //  namespace df
diff --git a/libs/drape_frontend/colored_symbol_shape.cpp b/libs/drape_frontend/colored_symbol_shape.cpp
index ca9a11628..779c00275 100644
--- a/libs/drape_frontend/colored_symbol_shape.cpp
+++ b/libs/drape_frontend/colored_symbol_shape.cpp
@@ -46,10 +46,9 @@ class DynamicSquareHandle : public dp::SquareHandle
 
 public:
   DynamicSquareHandle(dp::OverlayID const & id, dp::Anchor anchor, m2::PointD const & gbPivot,
-                      std::vector<m2::PointF> const & pxSizes, m2::PointD const & pxOffset,
-                      uint64_t priority, bool isBound, int minVisibleScale, bool isBillboard)
-    : TBase(id, anchor, gbPivot, m2::PointD::Zero(), pxOffset, priority, isBound, minVisibleScale,
-            isBillboard)
+                      std::vector<m2::PointF> const & pxSizes, m2::PointD const & pxOffset, uint64_t priority,
+                      bool isBound, int minVisibleScale, bool isBillboard)
+    : TBase(id, anchor, gbPivot, m2::PointD::Zero(), pxOffset, priority, isBound, minVisibleScale, isBillboard)
     , m_pxSizes(pxSizes)
   {
     ASSERT_GREATER(pxSizes.size(), 0, ());
@@ -80,8 +79,7 @@ ColoredSymbolShape::ColoredSymbolShape(m2::PointD const & mercatorPt, ColoredSym
   , m_needOverlay(needOverlay)
 {}
 
-ColoredSymbolShape::ColoredSymbolShape(m2::PointD const & mercatorPt,
-                                       ColoredSymbolViewParams const & params,
+ColoredSymbolShape::ColoredSymbolShape(m2::PointD const & mercatorPt, ColoredSymbolViewParams const & params,
                                        TileKey const & tileKey, uint32_t textIndex,
                                        std::vector<m2::PointF> const & overlaySizes)
   : m_point(mercatorPt)
@@ -107,16 +105,12 @@ void ColoredSymbolShape::Draw(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::
   V::TTexCoord const uv(colorUv.x, colorUv.y, 0.0f, 0.0f);
   V::TTexCoord const uvOutline(outlineUv.x, outlineUv.y, 0.0f, 0.0f);
 
-  glsl::vec2 const pt = glsl::ToVec2(ConvertToLocal(m_point, m_params.m_tileCenter,
-                                                    kShapeCoordScalar));
+  glsl::vec2 const pt = glsl::ToVec2(ConvertToLocal(m_point, m_params.m_tileCenter, kShapeCoordScalar));
   glsl::vec3 const position = glsl::vec3(pt, m_params.m_depth);
 
   buffer_vector<V, 48> buffer;
 
-  auto norm = [this](float x, float y)
-  {
-    return ShiftNormal(glsl::vec2(x, y), m_params);
-  };
+  auto norm = [this](float x, float y) { return ShiftNormal(glsl::vec2(x, y), m_params); };
 
   m2::PointU pixelSize;
   if (m_params.m_shape == ColoredSymbolViewParams::Shape::Circle)
@@ -143,8 +137,8 @@ void ColoredSymbolShape::Draw(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::
   }
   else if (m_params.m_shape == ColoredSymbolViewParams::Shape::Rectangle)
   {
-    pixelSize = m2::PointU(static_cast<uint32_t>(m_params.m_sizeInPixels.x),
-                           static_cast<uint32_t>(m_params.m_sizeInPixels.y));
+    pixelSize =
+        m2::PointU(static_cast<uint32_t>(m_params.m_sizeInPixels.x), static_cast<uint32_t>(m_params.m_sizeInPixels.y));
     float const halfWidth = 0.5f * m_params.m_sizeInPixels.x;
     float const halfHeight = 0.5f * m_params.m_sizeInPixels.y;
     float const v = halfWidth * halfWidth + halfHeight * halfHeight;
@@ -170,8 +164,8 @@ void ColoredSymbolShape::Draw(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::
   }
   else if (m_params.m_shape == ColoredSymbolViewParams::Shape::RoundedRectangle)
   {
-    pixelSize = m2::PointU(static_cast<uint32_t>(m_params.m_sizeInPixels.x),
-                           static_cast<uint32_t>(m_params.m_sizeInPixels.y));
+    pixelSize =
+        m2::PointU(static_cast<uint32_t>(m_params.m_sizeInPixels.x), static_cast<uint32_t>(m_params.m_sizeInPixels.y));
     float const halfWidth = 0.5f * m_params.m_sizeInPixels.x;
     float const halfHeight = 0.5f * m_params.m_sizeInPixels.y;
     float const halfWidthBody = halfWidth - m_params.m_radiusInPixels;
@@ -279,16 +273,14 @@ void ColoredSymbolShape::Draw(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::
     if (!m_overlaySizes.empty())
     {
       handle = make_unique_dp<DynamicSquareHandle>(
-          overlayId, m_params.m_anchor, m_point, m_overlaySizes, m2::PointD(m_params.m_offset),
-          GetOverlayPriority(), true /* isBound */, m_params.m_minVisibleScale,
-          true /* isBillboard */);
+          overlayId, m_params.m_anchor, m_point, m_overlaySizes, m2::PointD(m_params.m_offset), GetOverlayPriority(),
+          true /* isBound */, m_params.m_minVisibleScale, true /* isBillboard */);
     }
     else
     {
-      handle = make_unique_dp<dp::SquareHandle>(
-          overlayId, m_params.m_anchor, m_point, m2::PointD(pixelSize),
-          m2::PointD(m_params.m_offset), GetOverlayPriority(), true /* isBound */,
-          m_params.m_minVisibleScale, true /* isBillboard */);
+      handle = make_unique_dp<dp::SquareHandle>(overlayId, m_params.m_anchor, m_point, m2::PointD(pixelSize),
+                                                m2::PointD(m_params.m_offset), GetOverlayPriority(), true /* isBound */,
+                                                m_params.m_minVisibleScale, true /* isBillboard */);
     }
 
     if (m_params.m_specialDisplacement == SpecialDisplacement::UserMark ||
diff --git a/libs/drape_frontend/colored_symbol_shape.hpp b/libs/drape_frontend/colored_symbol_shape.hpp
index e3415fe92..283fc6587 100644
--- a/libs/drape_frontend/colored_symbol_shape.hpp
+++ b/libs/drape_frontend/colored_symbol_shape.hpp
@@ -10,11 +10,11 @@ namespace df
 class ColoredSymbolShape : public MapShape
 {
 public:
-  ColoredSymbolShape(m2::PointD const & mercatorPt, ColoredSymbolViewParams const & params,
-                     TileKey const & tileKey, uint32_t textIndex, bool needOverlay = true);
+  ColoredSymbolShape(m2::PointD const & mercatorPt, ColoredSymbolViewParams const & params, TileKey const & tileKey,
+                     uint32_t textIndex, bool needOverlay = true);
 
-  ColoredSymbolShape(m2::PointD const & mercatorPt, ColoredSymbolViewParams const & params,
-                     TileKey const & tileKey, uint32_t textIndex, std::vector<m2::PointF> const & overlaySizes);
+  ColoredSymbolShape(m2::PointD const & mercatorPt, ColoredSymbolViewParams const & params, TileKey const & tileKey,
+                     uint32_t textIndex, std::vector<m2::PointF> const & overlaySizes);
 
   void Draw(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Batcher> batcher,
             ref_ptr<dp::TextureManager> textures) const override;
diff --git a/libs/drape_frontend/custom_features_context.hpp b/libs/drape_frontend/custom_features_context.hpp
index 5a338f0f6..3aa44d5ec 100644
--- a/libs/drape_frontend/custom_features_context.hpp
+++ b/libs/drape_frontend/custom_features_context.hpp
@@ -14,9 +14,7 @@ struct CustomFeaturesContext
 {
   CustomFeatures const m_features;
 
-  explicit CustomFeaturesContext(CustomFeatures && features)
-    : m_features(std::move(features))
-  {}
+  explicit CustomFeaturesContext(CustomFeatures && features) : m_features(std::move(features)) {}
 
   bool NeedDiscardGeometry(FeatureID const & id) const
   {
@@ -29,4 +27,4 @@ struct CustomFeaturesContext
 
 using CustomFeaturesContextPtr = std::shared_ptr<CustomFeaturesContext>;
 using CustomFeaturesContextWeakPtr = std::weak_ptr<CustomFeaturesContext>;
-} //  namespace df
+}  //  namespace df
diff --git a/libs/drape_frontend/debug_rect_renderer.cpp b/libs/drape_frontend/debug_rect_renderer.cpp
index 151d5b816..6f3ad2eef 100644
--- a/libs/drape_frontend/debug_rect_renderer.cpp
+++ b/libs/drape_frontend/debug_rect_renderer.cpp
@@ -75,8 +75,7 @@ void DebugRectRenderer::SetArrow(ref_ptr<dp::GraphicsContext> context, m2::Point
     m_arrowMeshes[m_currentArrowMesh]->UpdateBuffer(context, 0 /* bufferInd */, vertices);
 }
 
-void DebugRectRenderer::SetRect(ref_ptr<dp::GraphicsContext> context, m2::RectF const & rect,
-                                ScreenBase const & screen)
+void DebugRectRenderer::SetRect(ref_ptr<dp::GraphicsContext> context, m2::RectF const & rect, ScreenBase const & screen)
 {
   std::vector<float> vertices;
   PixelPointToScreenSpace(screen, rect.LeftBottom(), vertices);
diff --git a/libs/drape_frontend/debug_rect_renderer.hpp b/libs/drape_frontend/debug_rect_renderer.hpp
index e86e15253..1977d9a44 100644
--- a/libs/drape_frontend/debug_rect_renderer.hpp
+++ b/libs/drape_frontend/debug_rect_renderer.hpp
@@ -17,6 +17,7 @@ namespace df
 class DebugRectRenderer : public dp::DebugRenderer
 {
   using Base = dp::MeshObject;
+
 public:
   DebugRectRenderer(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
                     ref_ptr<gpu::ProgramParamsSetter> paramsSetter);
@@ -24,18 +25,17 @@ public:
   void SetEnabled(bool enabled);
 
   bool IsEnabled() const override;
-  void DrawRect(ref_ptr<dp::GraphicsContext> context, ScreenBase const & screen,
-                m2::RectF const & rect, dp::Color const & color) override;
+  void DrawRect(ref_ptr<dp::GraphicsContext> context, ScreenBase const & screen, m2::RectF const & rect,
+                dp::Color const & color) override;
   void DrawArrow(ref_ptr<dp::GraphicsContext> context, ScreenBase const & screen,
                  dp::OverlayTree::DisplacementData const & data) override;
 
   void FinishRendering();
 
 private:
-  void SetArrow(ref_ptr<dp::GraphicsContext> context, m2::PointF const & arrowStart,
-                m2::PointF const & arrowEnd, ScreenBase const & screen);
-  void SetRect(ref_ptr<dp::GraphicsContext> context, m2::RectF const & rect,
-               ScreenBase const & screen);
+  void SetArrow(ref_ptr<dp::GraphicsContext> context, m2::PointF const & arrowStart, m2::PointF const & arrowEnd,
+                ScreenBase const & screen);
+  void SetRect(ref_ptr<dp::GraphicsContext> context, m2::RectF const & rect, ScreenBase const & screen);
 
   std::vector<drape_ptr<dp::MeshObject>> m_rectMeshes;
   std::vector<drape_ptr<dp::MeshObject>> m_arrowMeshes;
@@ -48,4 +48,3 @@ private:
   bool m_isEnabled = false;
 };
 }  // namespace df
-
diff --git a/libs/drape_frontend/drape_api.cpp b/libs/drape_frontend/drape_api.cpp
index f8bcad6f6..c0ea0135b 100644
--- a/libs/drape_frontend/drape_api.cpp
+++ b/libs/drape_frontend/drape_api.cpp
@@ -19,8 +19,7 @@ void DrapeApi::AddLine(std::string const & id, DrapeApiLineData const & data)
   auto const it = m_lines.find(id);
   if (it != m_lines.end())
   {
-    threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                                  make_unique_dp<DrapeApiRemoveMessage>(id),
+    threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread, make_unique_dp<DrapeApiRemoveMessage>(id),
                                   MessagePriority::Normal);
   }
 
@@ -28,8 +27,7 @@ void DrapeApi::AddLine(std::string const & id, DrapeApiLineData const & data)
 
   TLines lines;
   lines.insert(std::make_pair(id, data));
-  threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                                make_unique_dp<DrapeApiAddLinesMessage>(lines),
+  threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread, make_unique_dp<DrapeApiAddLinesMessage>(lines),
                                 MessagePriority::Normal);
 }
 
@@ -41,8 +39,7 @@ void DrapeApi::RemoveLine(std::string const & id)
 
   auto & threadCommutator = lock.Get()->m_threadCommutator;
   m_lines.erase(id);
-  threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                                make_unique_dp<DrapeApiRemoveMessage>(id),
+  threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread, make_unique_dp<DrapeApiRemoveMessage>(id),
                                 MessagePriority::Normal);
 }
 
@@ -71,7 +68,6 @@ void DrapeApi::Invalidate()
                                 MessagePriority::Normal);
 
   threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                                make_unique_dp<DrapeApiAddLinesMessage>(m_lines),
-                                MessagePriority::Normal);
+                                make_unique_dp<DrapeApiAddLinesMessage>(m_lines), MessagePriority::Normal);
 }
 }  // namespace df
diff --git a/libs/drape_frontend/drape_api.hpp b/libs/drape_frontend/drape_api.hpp
index 769c7016e..47b2d6e7b 100644
--- a/libs/drape_frontend/drape_api.hpp
+++ b/libs/drape_frontend/drape_api.hpp
@@ -18,10 +18,7 @@ struct DrapeApiLineData
 {
   DrapeApiLineData() = default;
 
-  DrapeApiLineData(std::vector<m2::PointD> const & points,
-                   dp::Color const & color)
-    : m_points(points)
-    , m_color(color)
+  DrapeApiLineData(std::vector<m2::PointD> const & points, dp::Color const & color) : m_points(points), m_color(color)
   {}
 
   DrapeApiLineData & ShowPoints(bool markPoints)
diff --git a/libs/drape_frontend/drape_api_builder.cpp b/libs/drape_frontend/drape_api_builder.cpp
index cfde72f58..73e509f4d 100644
--- a/libs/drape_frontend/drape_api_builder.cpp
+++ b/libs/drape_frontend/drape_api_builder.cpp
@@ -13,9 +13,9 @@
 
 namespace
 {
-void BuildText(ref_ptr<dp::GraphicsContext> context, std::string const & str,
-               dp::FontDecl const & font, m2::PointD const & position, m2::PointD const & center,
-               ref_ptr<dp::TextureManager> textures, dp::Batcher & batcher)
+void BuildText(ref_ptr<dp::GraphicsContext> context, std::string const & str, dp::FontDecl const & font,
+               m2::PointD const & position, m2::PointD const & center, ref_ptr<dp::TextureManager> textures,
+               dp::Batcher & batcher)
 {
   gui::StaticLabel::LabelResult result;
   gui::StaticLabel::CacheStaticText(str, "\n", dp::LeftTop, font, textures, result);
@@ -33,8 +33,8 @@ void BuildText(ref_ptr<dp::GraphicsContext> context, std::string const & str,
 
 namespace df
 {
-void DrapeApiBuilder::BuildLines(ref_ptr<dp::GraphicsContext> context,
-                                 DrapeApi::TLines & lines, ref_ptr<dp::TextureManager> textures,
+void DrapeApiBuilder::BuildLines(ref_ptr<dp::GraphicsContext> context, DrapeApi::TLines & lines,
+                                 ref_ptr<dp::TextureManager> textures,
                                  std::vector<drape_ptr<DrapeApiRenderProperty>> & properties)
 {
   properties.reserve(lines.size());
@@ -48,10 +48,8 @@ void DrapeApiBuilder::BuildLines(ref_ptr<dp::GraphicsContext> context,
     std::string const & id = line.first;
 
     DrapeApiLineData & data = line.second;
-    base::Unique(data.m_points, [](m2::PointD const & p1, m2::PointD const & p2)
-    {
-      return p1.EqualDxDy(p2, kMwmPointAccuracy);
-    });
+    base::Unique(data.m_points,
+                 [](m2::PointD const & p1, m2::PointD const & p2) { return p1.EqualDxDy(p2, kMwmPointAccuracy); });
 
     m2::RectD rect;
     for (auto const & p : data.m_points)
@@ -62,8 +60,8 @@ void DrapeApiBuilder::BuildLines(ref_ptr<dp::GraphicsContext> context,
     auto property = make_unique_dp<DrapeApiRenderProperty>();
     property->m_center = rect.Center();
     {
-      dp::SessionGuard guard(context, batcher, [&property, &id](dp::RenderState const & state,
-                                                                drape_ptr<dp::RenderBucket> && b)
+      dp::SessionGuard guard(context, batcher,
+                             [&property, &id](dp::RenderState const & state, drape_ptr<dp::RenderBucket> && b)
       {
         property->m_id = id;
         property->m_buckets.emplace_back(state, std::move(b));
@@ -94,8 +92,8 @@ void DrapeApiBuilder::BuildLines(ref_ptr<dp::GraphicsContext> context,
         cvp.m_radiusInPixels = data.m_width * 2.0f;
         for (m2::PointD const & pt : data.m_points)
         {
-          ColoredSymbolShape(m2::PointD(pt), cvp, TileKey(), 0 /* textIndex */,
-                             false /* need overlay */).Draw(context, make_ref(&batcher), textures);
+          ColoredSymbolShape(m2::PointD(pt), cvp, TileKey(), 0 /* textIndex */, false /* need overlay */)
+              .Draw(context, make_ref(&batcher), textures);
         }
       }
 
@@ -105,7 +103,8 @@ void DrapeApiBuilder::BuildLines(ref_ptr<dp::GraphicsContext> context,
         size_t index = 0;
         for (m2::PointD const & pt : data.m_points)
         {
-          if (index > 0 && !data.m_markPoints) break;
+          if (index > 0 && !data.m_markPoints)
+            break;
 
           std::string s;
           if (data.m_markPoints)
diff --git a/libs/drape_frontend/drape_api_builder.hpp b/libs/drape_frontend/drape_api_builder.hpp
index eac3d477c..d093446b7 100644
--- a/libs/drape_frontend/drape_api_builder.hpp
+++ b/libs/drape_frontend/drape_api_builder.hpp
@@ -22,8 +22,7 @@ struct DrapeApiRenderProperty
 class DrapeApiBuilder
 {
 public:
-  void BuildLines(ref_ptr<dp::GraphicsContext> context, DrapeApi::TLines & lines,
-                  ref_ptr<dp::TextureManager> textures,
+  void BuildLines(ref_ptr<dp::GraphicsContext> context, DrapeApi::TLines & lines, ref_ptr<dp::TextureManager> textures,
                   std::vector<drape_ptr<DrapeApiRenderProperty>> & properties);
 };
 }  // namespace df
diff --git a/libs/drape_frontend/drape_api_renderer.cpp b/libs/drape_frontend/drape_api_renderer.cpp
index 309d8c2f5..569ff952e 100644
--- a/libs/drape_frontend/drape_api_renderer.cpp
+++ b/libs/drape_frontend/drape_api_renderer.cpp
@@ -9,9 +9,8 @@
 
 namespace df
 {
-void DrapeApiRenderer::AddRenderProperties(
-    ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
-    std::vector<drape_ptr<DrapeApiRenderProperty>> && properties)
+void DrapeApiRenderer::AddRenderProperties(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
+                                           std::vector<drape_ptr<DrapeApiRenderProperty>> && properties)
 {
   if (properties.empty())
     return;
@@ -32,9 +31,9 @@ void DrapeApiRenderer::AddRenderProperties(
 
 void DrapeApiRenderer::RemoveRenderProperty(std::string const & id)
 {
-  m_properties.erase(std::remove_if(m_properties.begin(), m_properties.end(),
-                                    [&id](auto const & p) { return p->m_id == id; }),
-                                    m_properties.end());
+  m_properties.erase(
+      std::remove_if(m_properties.begin(), m_properties.end(), [&id](auto const & p) { return p->m_id == id; }),
+      m_properties.end());
 }
 
 void DrapeApiRenderer::Clear()
diff --git a/libs/drape_frontend/drape_engine.cpp b/libs/drape_frontend/drape_engine.cpp
index ba73ec1b8..05d0b4389 100644
--- a/libs/drape_frontend/drape_engine.cpp
+++ b/libs/drape_frontend/drape_engine.cpp
@@ -20,7 +20,7 @@ namespace
 {
 std::string_view constexpr kLocationStateMode = "LastLocationStateMode";
 std::string_view constexpr kLastEnterBackground = "LastEnterBackground";
-}
+}  // namespace
 
 DrapeEngine::DrapeEngine(Params && params)
   : m_myPositionModeChanged(std::move(params.m_myPositionModeChanged))
@@ -54,48 +54,34 @@ DrapeEngine::DrapeEngine(Params && params)
 
   std::vector<PostprocessRenderer::Effect> effects;
 
-//  bool enabledAntialiasing;
-//  if (!settings::Get(dp::kSupportedAntialiasing, enabledAntialiasing))
-//    enabledAntialiasing = false;
+  //  bool enabledAntialiasing;
+  //  if (!settings::Get(dp::kSupportedAntialiasing, enabledAntialiasing))
+  //    enabledAntialiasing = false;
 
   // Turn off AA for a while by energy-saving issues.
-  //if (enabledAntialiasing)
+  // if (enabledAntialiasing)
   //{
   //  LOG(LINFO, ("Antialiasing is enabled"));
   //  effects.push_back(PostprocessRenderer::Antialiasing);
   //}
 
-  MyPositionController::Params mpParams(mode,
-                                        base::Timer::LocalTime() - m_startBackgroundTime,
-                                        params.m_hints,
-                                        params.m_isRoutingActive,
-                                        params.m_isAutozoomEnabled,
+  MyPositionController::Params mpParams(mode, base::Timer::LocalTime() - m_startBackgroundTime, params.m_hints,
+                                        params.m_isRoutingActive, params.m_isAutozoomEnabled,
                                         std::bind(&DrapeEngine::MyPositionModeChanged, this, _1, _2));
 
-  FrontendRenderer::Params frParams(params.m_apiVersion,
-                                    make_ref(m_threadCommutator),
-                                    params.m_factory,
-                                    make_ref(m_textureManager),
-                                    std::move(mpParams),
-                                    m_viewport,
-                                    std::bind(&DrapeEngine::ModelViewChanged, this, _1),
-                                    std::bind(&DrapeEngine::TapEvent, this, _1),
-                                    std::bind(&DrapeEngine::UserPositionChanged, this, _1, _2),
-                                    make_ref(m_requestedTiles),
-                                    std::move(params.m_overlaysShowStatsCallback),
-                                    params.m_allow3dBuildings,
-                                    params.m_trafficEnabled,
-                                    params.m_blockTapEvents,
-                                    std::move(effects),
-                                    params.m_onGraphicsContextInitialized,
-                                    std::move(params.m_renderInjectionHandler));
+  FrontendRenderer::Params frParams(
+      params.m_apiVersion, make_ref(m_threadCommutator), params.m_factory, make_ref(m_textureManager),
+      std::move(mpParams), m_viewport, std::bind(&DrapeEngine::ModelViewChanged, this, _1),
+      std::bind(&DrapeEngine::TapEvent, this, _1), std::bind(&DrapeEngine::UserPositionChanged, this, _1, _2),
+      make_ref(m_requestedTiles), std::move(params.m_overlaysShowStatsCallback), params.m_allow3dBuildings,
+      params.m_trafficEnabled, params.m_blockTapEvents, std::move(effects), params.m_onGraphicsContextInitialized,
+      std::move(params.m_renderInjectionHandler));
 
-  BackendRenderer::Params brParams(
-      params.m_apiVersion, frParams.m_commutator, frParams.m_oglContextFactory, frParams.m_texMng,
-      params.m_model, params.m_model.UpdateCurrentCountryFn(), make_ref(m_requestedTiles),
-      params.m_allow3dBuildings, params.m_trafficEnabled, params.m_isolinesEnabled,
-      params.m_simplifiedTrafficColors, std::move(params.m_arrow3dCustomDecl),
-      params.m_onGraphicsContextInitialized);
+  BackendRenderer::Params brParams(params.m_apiVersion, frParams.m_commutator, frParams.m_oglContextFactory,
+                                   frParams.m_texMng, params.m_model, params.m_model.UpdateCurrentCountryFn(),
+                                   make_ref(m_requestedTiles), params.m_allow3dBuildings, params.m_trafficEnabled,
+                                   params.m_isolinesEnabled, params.m_simplifiedTrafficColors,
+                                   std::move(params.m_arrow3dCustomDecl), params.m_onGraphicsContextInitialized);
 
   m_backend = make_unique_dp<BackendRenderer>(std::move(brParams));
   m_frontend = make_unique_dp<FrontendRenderer>(std::move(frParams));
@@ -135,8 +121,7 @@ void DrapeEngine::RecoverSurface(int w, int h, bool recreateContextDependentReso
   if (m_choosePositionMode)
   {
     m_threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                                    make_unique_dp<ShowChoosePositionMarkMessage>(),
-                                    MessagePriority::Normal);
+                                    make_unique_dp<ShowChoosePositionMarkMessage>(), MessagePriority::Normal);
   }
 
   if (recreateContextDependentResources)
@@ -144,8 +129,7 @@ void DrapeEngine::RecoverSurface(int w, int h, bool recreateContextDependentReso
     RecacheGui(false);
     RecacheMapShapes();
     m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
-                                    make_unique_dp<RecoverContextDependentResourcesMessage>(),
-                                    MessagePriority::Normal);
+                                    make_unique_dp<RecoverContextDependentResourcesMessage>(), MessagePriority::Normal);
   }
 
   ResizeImpl(w, h);
@@ -155,22 +139,19 @@ void DrapeEngine::Resize(int w, int h)
 {
   ASSERT_GREATER(w, 0, ());
   ASSERT_GREATER(h, 0, ());
-  if (m_viewport.GetHeight() != static_cast<uint32_t>(h) ||
-      m_viewport.GetWidth() != static_cast<uint32_t>(w))
+  if (m_viewport.GetHeight() != static_cast<uint32_t>(h) || m_viewport.GetWidth() != static_cast<uint32_t>(w))
     ResizeImpl(w, h);
 }
 
 void DrapeEngine::SetVisibleViewport(m2::RectD const & rect) const
 {
-  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
-                                  make_unique_dp<SetVisibleViewportMessage>(rect),
+  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread, make_unique_dp<SetVisibleViewportMessage>(rect),
                                   MessagePriority::Normal);
 }
 
 void DrapeEngine::Invalidate()
 {
-  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
-                                  make_unique_dp<InvalidateMessage>(),
+  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread, make_unique_dp<InvalidateMessage>(),
                                   MessagePriority::High);
 }
 
@@ -207,23 +188,21 @@ void DrapeEngine::MakeFrameActive()
 void DrapeEngine::ScaleAndSetCenter(m2::PointD const & centerPt, double scaleFactor, bool isAnim,
                                     bool trackVisibleViewport)
 {
-  PostUserEvent(make_unique_dp<SetCenterEvent>(scaleFactor, centerPt, isAnim,
-                                               trackVisibleViewport,
+  PostUserEvent(make_unique_dp<SetCenterEvent>(scaleFactor, centerPt, isAnim, trackVisibleViewport,
                                                nullptr /* parallelAnimCreator */));
 }
 
-void DrapeEngine::SetModelViewCenter(m2::PointD const & centerPt, int zoom, bool isAnim,
-                                     bool trackVisibleViewport)
+void DrapeEngine::SetModelViewCenter(m2::PointD const & centerPt, int zoom, bool isAnim, bool trackVisibleViewport)
 {
-  PostUserEvent(make_unique_dp<SetCenterEvent>(centerPt, zoom, isAnim, trackVisibleViewport,
-                                               nullptr /* parallelAnimCreator */));
+  PostUserEvent(
+      make_unique_dp<SetCenterEvent>(centerPt, zoom, isAnim, trackVisibleViewport, nullptr /* parallelAnimCreator */));
 }
 
 void DrapeEngine::SetModelViewRect(m2::RectD const & rect, bool applyRotation, int zoom, bool isAnim,
                                    bool useVisibleViewport)
 {
   PostUserEvent(make_unique_dp<SetRectEvent>(rect, applyRotation, zoom, isAnim, useVisibleViewport,
-                                             nullptr /* parallelAnimCreator */ ));
+                                             nullptr /* parallelAnimCreator */));
 }
 
 void DrapeEngine::SetModelViewAnyRect(m2::AnyRectD const & rect, bool isAnim, bool useVisibleViewport)
@@ -234,8 +213,7 @@ void DrapeEngine::SetModelViewAnyRect(m2::AnyRectD const & rect, bool isAnim, bo
 void DrapeEngine::ClearUserMarksGroup(kml::MarkGroupId groupId)
 {
   m_threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                                  make_unique_dp<ClearUserMarkGroupMessage>(groupId),
-                                  MessagePriority::Normal);
+                                  make_unique_dp<ClearUserMarkGroupMessage>(groupId), MessagePriority::Normal);
 }
 
 void DrapeEngine::ChangeVisibilityUserMarksGroup(kml::MarkGroupId groupId, bool isVisible)
@@ -247,15 +225,13 @@ void DrapeEngine::ChangeVisibilityUserMarksGroup(kml::MarkGroupId groupId, bool
 
 void DrapeEngine::InvalidateUserMarks()
 {
-  m_threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                                  make_unique_dp<InvalidateUserMarksMessage>(),
+  m_threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread, make_unique_dp<InvalidateUserMarksMessage>(),
                                   MessagePriority::Normal);
 }
 
 void DrapeEngine::UpdateUserMarks(UserMarksProvider * provider, bool firstTime)
 {
-  auto const updatedGroupIds = firstTime ? provider->GetAllGroupIds()
-                                         : provider->GetUpdatedGroupIds();
+  auto const updatedGroupIds = firstTime ? provider->GetAllGroupIds() : provider->GetUpdatedGroupIds();
   if (updatedGroupIds.empty())
     return;
 
@@ -267,10 +243,7 @@ void DrapeEngine::UpdateUserMarks(UserMarksProvider * provider, bool firstTime)
   std::unordered_map<kml::MarkGroupId, drape_ptr<IDCollections>> groupsVisibleIds;
 
   auto const groupFilter = [&](kml::MarkGroupId groupId)
-  {
-    return provider->IsGroupVisible(groupId) &&
-      (provider->GetBecameVisibleGroupIds().count(groupId) == 0);
-  };
+  { return provider->IsGroupVisible(groupId) && (provider->GetBecameVisibleGroupIds().count(groupId) == 0); };
 
   using GroupFilter = std::function<bool(kml::MarkGroupId groupId)>;
 
@@ -278,20 +251,16 @@ void DrapeEngine::UpdateUserMarks(UserMarksProvider * provider, bool firstTime)
                               GroupFilter const & filter, IDCollections & collection)
   {
     for (auto const markId : markIds)
-    {
       if (filter == nullptr || filter(provider->GetUserPointMark(markId)->GetGroupId()))
         collection.m_markIds.push_back(markId);
-    }
 
     for (auto const lineId : lineIds)
-    {
       if (filter == nullptr || filter(provider->GetUserLineMark(lineId)->GetGroupId()))
         collection.m_lineIds.push_back(lineId);
-    }
   };
 
-  auto const collectRenderData = [&](kml::MarkIdSet const & markIds, kml::TrackIdSet const & lineIds,
-                                     GroupFilter const & filter)
+  auto const collectRenderData =
+      [&](kml::MarkIdSet const & markIds, kml::TrackIdSet const & lineIds, GroupFilter const & filter)
   {
     for (auto const markId : markIds)
     {
@@ -316,8 +285,8 @@ void DrapeEngine::UpdateUserMarks(UserMarksProvider * provider, bool firstTime)
 
       if (provider->IsGroupVisible(groupId))
       {
-        collectIds(provider->GetGroupPointIds(groupId), provider->GetGroupLineIds(groupId),
-                   nullptr /* filter */, *visibleIdCollection);
+        collectIds(provider->GetGroupPointIds(groupId), provider->GetGroupLineIds(groupId), nullptr /* filter */,
+                   *visibleIdCollection);
         collectRenderData(provider->GetGroupPointIds(groupId), provider->GetGroupLineIds(groupId),
                           nullptr /* filter */);
       }
@@ -331,51 +300,43 @@ void DrapeEngine::UpdateUserMarks(UserMarksProvider * provider, bool firstTime)
       auto visibleIdCollection = make_unique_dp<IDCollections>();
       if (provider->IsGroupVisible(groupId))
       {
-        collectIds(provider->GetGroupPointIds(groupId), provider->GetGroupLineIds(groupId),
-                   nullptr /* filter */, *visibleIdCollection);
+        collectIds(provider->GetGroupPointIds(groupId), provider->GetGroupLineIds(groupId), nullptr /* filter */,
+                   *visibleIdCollection);
       }
       groupsVisibleIds.emplace(groupId, std::move(visibleIdCollection));
     }
 
-    collectIds(provider->GetCreatedMarkIds(), provider->GetCreatedLineIds(),
-               groupFilter, *justCreatedIdCollection);
-    collectIds(provider->GetRemovedMarkIds(), provider->GetRemovedLineIds(),
-               nullptr /* filter */, *removedIdCollection);
+    collectIds(provider->GetCreatedMarkIds(), provider->GetCreatedLineIds(), groupFilter, *justCreatedIdCollection);
+    collectIds(provider->GetRemovedMarkIds(), provider->GetRemovedLineIds(), nullptr /* filter */,
+               *removedIdCollection);
 
     collectRenderData(provider->GetCreatedMarkIds(), provider->GetCreatedLineIds(), groupFilter);
     collectRenderData(provider->GetUpdatedMarkIds(), provider->GetUpdatedLineIds(), groupFilter);
 
     for (auto const groupId : provider->GetBecameVisibleGroupIds())
-    {
-      collectRenderData(provider->GetGroupPointIds(groupId), provider->GetGroupLineIds(groupId),
-                        nullptr /* filter */);
-    }
+      collectRenderData(provider->GetGroupPointIds(groupId), provider->GetGroupLineIds(groupId), nullptr /* filter */);
 
     for (auto const groupId : provider->GetBecameInvisibleGroupIds())
     {
-      collectIds(provider->GetGroupPointIds(groupId), provider->GetGroupLineIds(groupId),
-                 nullptr /* filter */, *removedIdCollection);
+      collectIds(provider->GetGroupPointIds(groupId), provider->GetGroupLineIds(groupId), nullptr /* filter */,
+                 *removedIdCollection);
     }
   }
 
-  if (!marksRenderCollection->empty() || !linesRenderCollection->empty() ||
-      !removedIdCollection->IsEmpty() || !justCreatedIdCollection->IsEmpty())
+  if (!marksRenderCollection->empty() || !linesRenderCollection->empty() || !removedIdCollection->IsEmpty() ||
+      !justCreatedIdCollection->IsEmpty())
   {
-    m_threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                                    make_unique_dp<UpdateUserMarksMessage>(
-                                      std::move(justCreatedIdCollection),
-                                      std::move(removedIdCollection),
-                                      std::move(marksRenderCollection),
-                                      std::move(linesRenderCollection)),
-                                    MessagePriority::Normal);
+    m_threadCommutator->PostMessage(
+        ThreadsCommutator::ResourceUploadThread,
+        make_unique_dp<UpdateUserMarksMessage>(std::move(justCreatedIdCollection), std::move(removedIdCollection),
+                                               std::move(marksRenderCollection), std::move(linesRenderCollection)),
+        MessagePriority::Normal);
   }
 
   for (auto & v : groupsVisibleIds)
   {
     m_threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                                    make_unique_dp<UpdateUserMarkGroupMessage>(
-                                      v.first,
-                                      std::move(v.second)),
+                                    make_unique_dp<UpdateUserMarkGroupMessage>(v.first, std::move(v.second)),
                                     MessagePriority::Normal);
   }
 }
@@ -398,22 +359,19 @@ void DrapeEngine::SetRenderingDisabled(bool const destroySurface)
 
 void DrapeEngine::InvalidateRect(m2::RectD const & rect)
 {
-  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
-                                  make_unique_dp<InvalidateRectMessage>(rect),
+  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread, make_unique_dp<InvalidateRectMessage>(rect),
                                   MessagePriority::High);
 }
 
 void DrapeEngine::UpdateMapStyle()
 {
-  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
-                                  make_unique_dp<UpdateMapStyleMessage>(),
+  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread, make_unique_dp<UpdateMapStyleMessage>(),
                                   MessagePriority::High);
 }
 
 void DrapeEngine::RecacheMapShapes()
 {
-  m_threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                                  make_unique_dp<MapShapesRecacheMessage>(),
+  m_threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread, make_unique_dp<MapShapesRecacheMessage>(),
                                   MessagePriority::Normal);
 }
 
@@ -431,8 +389,7 @@ void DrapeEngine::RecacheGui(bool needResetOldGui)
 
 void DrapeEngine::PostUserEvent(drape_ptr<UserEvent> && e)
 {
-  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
-                                  make_unique_dp<PostUserEventMessage>(std::move(e)),
+  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread, make_unique_dp<PostUserEventMessage>(std::move(e)),
                                   MessagePriority::Normal);
 }
 
@@ -480,8 +437,7 @@ void DrapeEngine::ResizeImpl(int w, int h)
 
 void DrapeEngine::SetCompassInfo(location::CompassInfo const & info)
 {
-  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
-                                  make_unique_dp<CompassInfoMessage>(info),
+  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread, make_unique_dp<CompassInfoMessage>(info),
                                   MessagePriority::Normal);
 }
 
@@ -517,13 +473,11 @@ void DrapeEngine::StopLocationFollow()
                                   MessagePriority::Normal);
 }
 
-void DrapeEngine::FollowRoute(int preferredZoomLevel, int preferredZoomLevel3d, bool enableAutoZoom,
-                              bool isArrowGlued)
+void DrapeEngine::FollowRoute(int preferredZoomLevel, int preferredZoomLevel3d, bool enableAutoZoom, bool isArrowGlued)
 {
   m_threadCommutator->PostMessage(
       ThreadsCommutator::RenderThread,
-      make_unique_dp<FollowRouteMessage>(preferredZoomLevel, preferredZoomLevel3d, enableAutoZoom,
-                                         isArrowGlued),
+      make_unique_dp<FollowRouteMessage>(preferredZoomLevel, preferredZoomLevel3d, enableAutoZoom, isArrowGlued),
       MessagePriority::Normal);
 }
 
@@ -551,30 +505,27 @@ void DrapeEngine::SetUserPositionListener(UserPositionChangedHandler && fn)
   m_userPositionChangedHandler = std::move(fn);
 }
 
-void DrapeEngine::SelectObject(SelectionShape::ESelectedObject obj, m2::PointD const & pt,
-                               FeatureID const & featureId, bool isAnim,
-                               bool isGeometrySelectionAllowed, bool isSelectionShapeVisible)
+void DrapeEngine::SelectObject(SelectionShape::ESelectedObject obj, m2::PointD const & pt, FeatureID const & featureId,
+                               bool isAnim, bool isGeometrySelectionAllowed, bool isSelectionShapeVisible)
 {
-  m_threadCommutator->PostMessage(
-      ThreadsCommutator::RenderThread,
-      make_unique_dp<SelectObjectMessage>(obj, pt, featureId, isAnim, isGeometrySelectionAllowed,
-                                          isSelectionShapeVisible),
-      MessagePriority::Normal);
+  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
+                                  make_unique_dp<SelectObjectMessage>(
+                                      obj, pt, featureId, isAnim, isGeometrySelectionAllowed, isSelectionShapeVisible),
+                                  MessagePriority::Normal);
 }
 
 void DrapeEngine::DeselectObject(bool restoreViewport)
 {
-  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
-                                  make_unique_dp<SelectObjectMessage>(SelectObjectMessage::DismissTag(), restoreViewport),
-                                  MessagePriority::Normal);
+  m_threadCommutator->PostMessage(
+      ThreadsCommutator::RenderThread,
+      make_unique_dp<SelectObjectMessage>(SelectObjectMessage::DismissTag(), restoreViewport), MessagePriority::Normal);
 }
 
 dp::DrapeID DrapeEngine::AddSubroute(SubrouteConstPtr subroute)
 {
   dp::DrapeID const id = GenerateDrapeID();
   m_threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                                  make_unique_dp<AddSubrouteMessage>(id, subroute),
-                                  MessagePriority::Normal);
+                                  make_unique_dp<AddSubrouteMessage>(id, subroute), MessagePriority::Normal);
   return id;
 }
 
@@ -587,8 +538,7 @@ void DrapeEngine::RemoveSubroute(dp::DrapeID subrouteId, bool deactivateFollowin
 
 void DrapeEngine::DeactivateRouteFollowing()
 {
-  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
-                                  make_unique_dp<DeactivateRouteFollowingMessage>(),
+  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread, make_unique_dp<DeactivateRouteFollowingMessage>(),
                                   MessagePriority::Normal);
 }
 
@@ -611,14 +561,12 @@ dp::DrapeID DrapeEngine::AddRoutePreviewSegment(m2::PointD const & startPt, m2::
 void DrapeEngine::RemoveRoutePreviewSegment(dp::DrapeID segmentId)
 {
   m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
-                                  make_unique_dp<RemoveRoutePreviewSegmentMessage>(segmentId),
-                                  MessagePriority::Normal);
+                                  make_unique_dp<RemoveRoutePreviewSegmentMessage>(segmentId), MessagePriority::Normal);
 }
 
 void DrapeEngine::RemoveAllRoutePreviewSegments()
 {
-  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
-                                  make_unique_dp<RemoveRoutePreviewSegmentMessage>(),
+  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread, make_unique_dp<RemoveRoutePreviewSegmentMessage>(),
                                   MessagePriority::Normal);
 }
 
@@ -632,60 +580,50 @@ void DrapeEngine::SetWidgetLayout(gui::TWidgetsLayoutInfo && info)
       itInfo->second.m_pixelPivot = layout.second;
   }
   m_threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                                  make_unique_dp<GuiLayerLayoutMessage>(m_widgetsLayout),
-                                  MessagePriority::Normal);
+                                  make_unique_dp<GuiLayerLayoutMessage>(m_widgetsLayout), MessagePriority::Normal);
 }
 
 void DrapeEngine::AllowAutoZoom(bool allowAutoZoom)
 {
-  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
-                                  make_unique_dp<AllowAutoZoomMessage>(allowAutoZoom),
+  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread, make_unique_dp<AllowAutoZoomMessage>(allowAutoZoom),
                                   MessagePriority::Normal);
 }
 
 void DrapeEngine::Allow3dMode(bool allowPerspectiveInNavigation, bool allow3dBuildings)
 {
   m_threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                                  make_unique_dp<Allow3dBuildingsMessage>(allow3dBuildings),
-                                  MessagePriority::Normal);
+                                  make_unique_dp<Allow3dBuildingsMessage>(allow3dBuildings), MessagePriority::Normal);
 
   m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
-                                  make_unique_dp<Allow3dModeMessage>(allowPerspectiveInNavigation,
-                                                                     allow3dBuildings),
+                                  make_unique_dp<Allow3dModeMessage>(allowPerspectiveInNavigation, allow3dBuildings),
                                   MessagePriority::Normal);
 }
 
 void DrapeEngine::SetMapLangIndex(int8_t mapLangIndex)
 {
   m_threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                                  make_unique_dp<SetMapLangIndexMessage>(mapLangIndex),
-                                  MessagePriority::Normal);
+                                  make_unique_dp<SetMapLangIndexMessage>(mapLangIndex), MessagePriority::Normal);
 
-  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
-                                  make_unique_dp<SetMapLangIndexMessage>(mapLangIndex),
+  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread, make_unique_dp<SetMapLangIndexMessage>(mapLangIndex),
                                   MessagePriority::Normal);
 }
 
 void DrapeEngine::EnablePerspective()
 {
-  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
-                                  make_unique_dp<EnablePerspectiveMessage>(),
+  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread, make_unique_dp<EnablePerspectiveMessage>(),
                                   MessagePriority::Normal);
 }
 
-void DrapeEngine::UpdateGpsTrackPoints(std::vector<df::GpsTrackPoint> && toAdd,
-                                       std::vector<uint32_t> && toRemove)
+void DrapeEngine::UpdateGpsTrackPoints(std::vector<df::GpsTrackPoint> && toAdd, std::vector<uint32_t> && toRemove)
 {
   m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
-                                  make_unique_dp<UpdateGpsTrackPointsMessage>(std::move(toAdd),
-                                                                              std::move(toRemove)),
+                                  make_unique_dp<UpdateGpsTrackPointsMessage>(std::move(toAdd), std::move(toRemove)),
                                   MessagePriority::Normal);
 }
 
 void DrapeEngine::ClearGpsTrackPoints()
 {
-  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
-                                  make_unique_dp<ClearGpsTrackPointsMessage>(),
+  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread, make_unique_dp<ClearGpsTrackPointsMessage>(),
                                   MessagePriority::Normal);
 }
 
@@ -698,24 +636,22 @@ void DrapeEngine::EnableChoosePositionMode(bool enable, std::vector<m2::Triangle
   {
     StopLocationFollow();
     m_threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                                    make_unique_dp<ShowChoosePositionMarkMessage>(),
-                                    MessagePriority::Normal);
+                                    make_unique_dp<ShowChoosePositionMarkMessage>(), MessagePriority::Normal);
     kineticScroll = false;
   }
   else
   {
     RecacheGui(true);
   }
-  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
-                                  make_unique_dp<SetAddNewPlaceModeMessage>(enable, std::move(boundAreaTriangles),
-                                                                            kineticScroll, optionalPosition),
-                                  MessagePriority::Normal);
+  m_threadCommutator->PostMessage(
+      ThreadsCommutator::RenderThread,
+      make_unique_dp<SetAddNewPlaceModeMessage>(enable, std::move(boundAreaTriangles), kineticScroll, optionalPosition),
+      MessagePriority::Normal);
 }
 
 void DrapeEngine::BlockTapEvents(bool block)
 {
-  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
-                                  make_unique_dp<BlockTapEventsMessage>(block),
+  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread, make_unique_dp<BlockTapEventsMessage>(block),
                                   MessagePriority::Normal);
 }
 
@@ -734,8 +670,7 @@ void DrapeEngine::OnEnterForeground()
 {
   double const backgroundTime = base::Timer::LocalTime() - m_startBackgroundTime;
   m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
-                                  make_unique_dp<OnEnterForegroundMessage>(backgroundTime),
-                                  MessagePriority::High);
+                                  make_unique_dp<OnEnterForegroundMessage>(backgroundTime), MessagePriority::High);
 }
 
 void DrapeEngine::OnEnterBackground()
@@ -752,9 +687,9 @@ void DrapeEngine::OnEnterBackground()
   /// especially Android with its AppBackgroundTracker.
   m_frontend->OnEnterBackground();
 
-//  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
-//                                  make_unique_dp<OnEnterBackgroundMessage>(),
-//                                  MessagePriority::High);
+  //  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
+  //                                  make_unique_dp<OnEnterBackgroundMessage>(),
+  //                                  MessagePriority::High);
 }
 
 void DrapeEngine::RequestSymbolsSize(std::vector<std::string> const & symbols,
@@ -768,8 +703,7 @@ void DrapeEngine::RequestSymbolsSize(std::vector<std::string> const & symbols,
 void DrapeEngine::EnableTraffic(bool trafficEnabled)
 {
   m_threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                                  make_unique_dp<EnableTrafficMessage>(trafficEnabled),
-                                  MessagePriority::Normal);
+                                  make_unique_dp<EnableTrafficMessage>(trafficEnabled), MessagePriority::Normal);
 }
 
 void DrapeEngine::UpdateTraffic(traffic::TrafficInfo const & info)
@@ -793,8 +727,7 @@ void DrapeEngine::UpdateTraffic(traffic::TrafficInfo const & info)
 void DrapeEngine::ClearTrafficCache(MwmSet::MwmId const & mwmId)
 {
   m_threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                                  make_unique_dp<ClearTrafficDataMessage>(mwmId),
-                                  MessagePriority::Normal);
+                                  make_unique_dp<ClearTrafficDataMessage>(mwmId), MessagePriority::Normal);
 }
 
 void DrapeEngine::SetSimplifiedTrafficColors(bool simplified)
@@ -807,22 +740,19 @@ void DrapeEngine::SetSimplifiedTrafficColors(bool simplified)
 void DrapeEngine::EnableTransitScheme(bool enable)
 {
   m_threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                                  make_unique_dp<EnableTransitSchemeMessage>(enable),
-                                  MessagePriority::Normal);
+                                  make_unique_dp<EnableTransitSchemeMessage>(enable), MessagePriority::Normal);
 }
 
 void DrapeEngine::ClearTransitSchemeCache(MwmSet::MwmId const & mwmId)
 {
   m_threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                                  make_unique_dp<ClearTransitSchemeDataMessage>(mwmId),
-                                  MessagePriority::Normal);
+                                  make_unique_dp<ClearTransitSchemeDataMessage>(mwmId), MessagePriority::Normal);
 }
 
 void DrapeEngine::ClearAllTransitSchemeCache()
 {
   m_threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                                  make_unique_dp<ClearAllTransitSchemeDataMessage>(),
-                                  MessagePriority::Normal);
+                                  make_unique_dp<ClearAllTransitSchemeDataMessage>(), MessagePriority::Normal);
 }
 
 void DrapeEngine::UpdateTransitScheme(TransitDisplayInfos && transitDisplayInfos)
@@ -835,8 +765,7 @@ void DrapeEngine::UpdateTransitScheme(TransitDisplayInfos && transitDisplayInfos
 void DrapeEngine::EnableIsolines(bool enable)
 {
   m_threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                                  make_unique_dp<EnableIsolinesMessage>(enable),
-                                  MessagePriority::Normal);
+                                  make_unique_dp<EnableIsolinesMessage>(enable), MessagePriority::Normal);
 }
 
 void DrapeEngine::SetFontScaleFactor(double scaleFactor)
@@ -856,22 +785,19 @@ void DrapeEngine::RunScenario(ScenarioManager::ScenarioData && scenarioData,
 void DrapeEngine::SetCustomFeatures(df::CustomFeatures && ids)
 {
   m_threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                                  make_unique_dp<SetCustomFeaturesMessage>(std::move(ids)),
-                                  MessagePriority::Normal);
+                                  make_unique_dp<SetCustomFeaturesMessage>(std::move(ids)), MessagePriority::Normal);
 }
 
 void DrapeEngine::RemoveCustomFeatures(MwmSet::MwmId const & mwmId)
 {
   m_threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                                  make_unique_dp<RemoveCustomFeaturesMessage>(mwmId),
-                                  MessagePriority::Normal);
+                                  make_unique_dp<RemoveCustomFeaturesMessage>(mwmId), MessagePriority::Normal);
 }
 
 void DrapeEngine::RemoveAllCustomFeatures()
 {
   m_threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                                  make_unique_dp<RemoveCustomFeaturesMessage>(),
-                                  MessagePriority::Normal);
+                                  make_unique_dp<RemoveCustomFeaturesMessage>(), MessagePriority::Normal);
 }
 
 void DrapeEngine::SetPosteffectEnabled(PostprocessRenderer::Effect effect, bool enabled)
@@ -889,23 +815,20 @@ void DrapeEngine::SetPosteffectEnabled(PostprocessRenderer::Effect effect, bool
 
 void DrapeEngine::RunFirstLaunchAnimation()
 {
-  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
-                                  make_unique_dp<RunFirstLaunchAnimationMessage>(),
+  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread, make_unique_dp<RunFirstLaunchAnimationMessage>(),
                                   MessagePriority::Normal);
 }
 
 void DrapeEngine::ShowDebugInfo(bool shown)
 {
-  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
-                                  make_unique_dp<ShowDebugInfoMessage>(shown),
+  m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread, make_unique_dp<ShowDebugInfoMessage>(shown),
                                   MessagePriority::Normal);
 }
 
 void DrapeEngine::EnableDebugRectRendering(bool enabled)
 {
   m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
-                                  make_unique_dp<EnableDebugRectRenderingMessage>(enabled),
-                                  MessagePriority::Normal);
+                                  make_unique_dp<EnableDebugRectRenderingMessage>(enabled), MessagePriority::Normal);
 }
 
 drape_ptr<UserMarkRenderParams> DrapeEngine::GenerateMarkRenderInfo(UserPointMark const * mark)
@@ -952,15 +875,12 @@ drape_ptr<UserLineRenderParams> DrapeEngine::GenerateLineRenderInfo(UserLineMark
   renderInfo->m_depthLayer = mark->GetDepthLayer();
 
   mark->ForEachGeometry([&renderInfo](std::vector<m2::PointD> && points)
-  {
-    renderInfo->m_splines.emplace_back(std::move(points));
-  });
+  { renderInfo->m_splines.emplace_back(std::move(points)); });
 
   renderInfo->m_layers.reserve(mark->GetLayerCount());
   for (size_t layerIndex = 0, layersCount = mark->GetLayerCount(); layerIndex < layersCount; ++layerIndex)
   {
-    renderInfo->m_layers.emplace_back(mark->GetColor(layerIndex),
-                                      mark->GetWidth(layerIndex),
+    renderInfo->m_layers.emplace_back(mark->GetColor(layerIndex), mark->GetWidth(layerIndex),
                                       mark->GetDepth(layerIndex));
   }
   return renderInfo;
@@ -979,8 +899,7 @@ void DrapeEngine::UpdateVisualScale(double vs, bool needStopRendering)
   RecacheGui(false);
   RecacheMapShapes();
   m_threadCommutator->PostMessage(ThreadsCommutator::RenderThread,
-                                  make_unique_dp<RecoverContextDependentResourcesMessage>(),
-                                  MessagePriority::Normal);
+                                  make_unique_dp<RecoverContextDependentResourcesMessage>(), MessagePriority::Normal);
 }
 
 void DrapeEngine::UpdateMyPositionRoutingOffset(bool useDefault, int offsetY)
@@ -992,8 +911,8 @@ void DrapeEngine::UpdateMyPositionRoutingOffset(bool useDefault, int offsetY)
 
 void DrapeEngine::SetCustomArrow3d(std::optional<Arrow3dCustomDecl> arrow3dCustomDecl)
 {
-  m_threadCommutator->PostMessage(
-      ThreadsCommutator::ResourceUploadThread,
-      make_unique_dp<Arrow3dRecacheMessage>(std::move(arrow3dCustomDecl)), MessagePriority::High);
+  m_threadCommutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
+                                  make_unique_dp<Arrow3dRecacheMessage>(std::move(arrow3dCustomDecl)),
+                                  MessagePriority::High);
 }
 }  // namespace df
diff --git a/libs/drape_frontend/drape_engine.hpp b/libs/drape_frontend/drape_engine.hpp
index 2990a0c46..39be90efa 100644
--- a/libs/drape_frontend/drape_engine.hpp
+++ b/libs/drape_frontend/drape_engine.hpp
@@ -52,14 +52,12 @@ class DrapeEngine
 public:
   struct Params
   {
-    Params(dp::ApiVersion apiVersion, ref_ptr<dp::GraphicsContextFactory> factory,
-           dp::Viewport const & viewport, MapDataProvider const & model, Hints const & hints,
-           double vs, double fontsScaleFactor, gui::TWidgetsInitInfo && info,
-           location::TMyPositionModeChanged && myPositionModeChanged, bool allow3dBuildings,
-           bool trafficEnabled, bool isolinesEnabled, bool blockTapEvents,
-           bool showChoosePositionMark, std::vector<m2::TriangleD> && boundAreaTriangles,
-           bool isRoutingActive, bool isAutozoomEnabled, bool simplifiedTrafficColors,
-           std::optional<Arrow3dCustomDecl> arrow3dCustomDecl,
+    Params(dp::ApiVersion apiVersion, ref_ptr<dp::GraphicsContextFactory> factory, dp::Viewport const & viewport,
+           MapDataProvider const & model, Hints const & hints, double vs, double fontsScaleFactor,
+           gui::TWidgetsInitInfo && info, location::TMyPositionModeChanged && myPositionModeChanged,
+           bool allow3dBuildings, bool trafficEnabled, bool isolinesEnabled, bool blockTapEvents,
+           bool showChoosePositionMark, std::vector<m2::TriangleD> && boundAreaTriangles, bool isRoutingActive,
+           bool isAutozoomEnabled, bool simplifiedTrafficColors, std::optional<Arrow3dCustomDecl> arrow3dCustomDecl,
            OverlaysShowStatsCallback && overlaysShowStatsCallback,
            OnGraphicsContextInitialized && onGraphicsContextInitialized,
            dp::RenderInjectionHandler && renderInjectionHandler)
@@ -130,14 +128,11 @@ public:
 
   void MakeFrameActive();
 
-  void ScaleAndSetCenter(m2::PointD const & centerPt, double scaleFactor, bool isAnim,
-                         bool trackVisibleViewport);
+  void ScaleAndSetCenter(m2::PointD const & centerPt, double scaleFactor, bool isAnim, bool trackVisibleViewport);
 
   // If zoom == -1 then current zoom will not be changed.
-  void SetModelViewCenter(m2::PointD const & centerPt, int zoom, bool isAnim,
-                          bool trackVisibleViewport);
-  void SetModelViewRect(m2::RectD const & rect, bool applyRotation, int zoom, bool isAnim,
-                        bool useVisibleViewport);
+  void SetModelViewCenter(m2::PointD const & centerPt, int zoom, bool isAnim, bool trackVisibleViewport);
+  void SetModelViewRect(m2::RectD const & rect, bool applyRotation, int zoom, bool isAnim, bool useVisibleViewport);
   void SetModelViewAnyRect(m2::AnyRectD const & rect, bool isAnim, bool useVisibleViewport);
 
   using ModelViewChangedHandler = FrontendRenderer::ModelViewChangedHandler;
@@ -159,8 +154,7 @@ public:
   void UpdateMapStyle();
 
   void SetCompassInfo(location::CompassInfo const & info);
-  void SetGpsInfo(location::GpsInfo const & info, bool isNavigable,
-                  location::RouteMatchingInfo const & routeInfo);
+  void SetGpsInfo(location::GpsInfo const & info, bool isNavigable, location::RouteMatchingInfo const & routeInfo);
   void SwitchMyPositionNextMode();
   void LoseLocation();
   void StopLocationFollow();
@@ -170,15 +164,13 @@ public:
   using UserPositionChangedHandler = FrontendRenderer::UserPositionChangedHandler;
   void SetUserPositionListener(UserPositionChangedHandler && fn);
 
-  void SelectObject(SelectionShape::ESelectedObject obj, m2::PointD const & pt,
-                    FeatureID const & featureID, bool isAnim, bool isGeometrySelectionAllowed,
-                    bool isSelectionShapeVisible);
+  void SelectObject(SelectionShape::ESelectedObject obj, m2::PointD const & pt, FeatureID const & featureID,
+                    bool isAnim, bool isGeometrySelectionAllowed, bool isSelectionShapeVisible);
   void DeselectObject(bool restoreViewport);
 
   dp::DrapeID AddSubroute(SubrouteConstPtr subroute);
   void RemoveSubroute(dp::DrapeID subrouteId, bool deactivateFollowing);
-  void FollowRoute(int preferredZoomLevel, int preferredZoomLevel3d, bool enableAutoZoom,
-                   bool isArrowGlued);
+  void FollowRoute(int preferredZoomLevel, int preferredZoomLevel3d, bool enableAutoZoom, bool isArrowGlued);
   void DeactivateRouteFollowing();
   void SetSubrouteVisibility(dp::DrapeID subrouteId, bool isVisible);
   dp::DrapeID AddRoutePreviewSegment(m2::PointD const & startPt, m2::PointD const & finishPt);
@@ -192,11 +184,11 @@ public:
   void Allow3dMode(bool allowPerspectiveInNavigation, bool allow3dBuildings);
   void EnablePerspective();
 
-  void UpdateGpsTrackPoints(std::vector<df::GpsTrackPoint> && toAdd,
-                            std::vector<uint32_t> && toRemove);
+  void UpdateGpsTrackPoints(std::vector<df::GpsTrackPoint> && toAdd, std::vector<uint32_t> && toRemove);
   void ClearGpsTrackPoints();
 
-  void EnableChoosePositionMode(bool enable, std::vector<m2::TriangleD> && boundAreaTriangles, m2::PointD const * optionalPosition);
+  void EnableChoosePositionMode(bool enable, std::vector<m2::TriangleD> && boundAreaTriangles,
+                                m2::PointD const * optionalPosition);
   void BlockTapEvents(bool block);
 
   void SetKineticScrollEnabled(bool enabled);
@@ -208,8 +200,7 @@ public:
 
   using TRequestSymbolsSizeCallback = std::function<void(std::map<std::string, m2::PointF> &&)>;
 
-  void RequestSymbolsSize(std::vector<std::string> const & symbols,
-                          TRequestSymbolsSizeCallback const & callback);
+  void RequestSymbolsSize(std::vector<std::string> const & symbols, TRequestSymbolsSizeCallback const & callback);
 
   void EnableTraffic(bool trafficEnabled);
   void UpdateTraffic(traffic::TrafficInfo const & info);
@@ -225,8 +216,7 @@ public:
 
   void SetFontScaleFactor(double scaleFactor);
 
-  void RunScenario(ScenarioManager::ScenarioData && scenarioData,
-                   ScenarioManager::ScenarioCallback const & onStartFn,
+  void RunScenario(ScenarioManager::ScenarioData && scenarioData, ScenarioManager::ScenarioCallback const & onStartFn,
                    ScenarioManager::ScenarioCallback const & onFinishFn);
 
   /// @name Custom features are features that we render in a different way.
@@ -253,7 +243,7 @@ public:
 
   void SetCustomArrow3d(std::optional<Arrow3dCustomDecl> arrow3dCustomDecl);
 
-  dp::ApiVersion GetApiVersion() const { return m_frontend->GetApiVersion(); };
+  dp::ApiVersion GetApiVersion() const { return m_frontend->GetApiVersion(); }
 
 private:
   void AddUserEvent(drape_ptr<UserEvent> && e);
diff --git a/libs/drape_frontend/drape_engine_safe_ptr.hpp b/libs/drape_frontend/drape_engine_safe_ptr.hpp
index a1a136639..f94a606d7 100644
--- a/libs/drape_frontend/drape_engine_safe_ptr.hpp
+++ b/libs/drape_frontend/drape_engine_safe_ptr.hpp
@@ -26,16 +26,16 @@ public:
     return m_engine != nullptr;
   }
 
-  template <typename Function, typename ... Args>
-  void SafeCall(Function && f, Args && ... functionArgs)
+  template <typename Function, typename... Args>
+  void SafeCall(Function && f, Args &&... functionArgs)
   {
     std::lock_guard<std::mutex> lock(m_mutex);
     if (m_engine != nullptr)
       (m_engine.get()->*f)(std::forward<Args>(functionArgs)...);
   }
 
-  template <typename Function, typename ... Args>
-  dp::DrapeID SafeCallWithResult(Function && f, Args && ... functionArgs)
+  template <typename Function, typename... Args>
+  dp::DrapeID SafeCallWithResult(Function && f, Args &&... functionArgs)
   {
     std::lock_guard<std::mutex> lock(m_mutex);
     if (m_engine != nullptr)
@@ -53,16 +53,9 @@ private:
 class DrapeEngineLockGuard
 {
 public:
-  explicit DrapeEngineLockGuard(DrapeEngineSafePtr & enginePtr)
-    : m_ptr(enginePtr)
-  {
-    m_ptr.m_mutex.lock();
-  }
+  explicit DrapeEngineLockGuard(DrapeEngineSafePtr & enginePtr) : m_ptr(enginePtr) { m_ptr.m_mutex.lock(); }
 
-  ~DrapeEngineLockGuard()
-  {
-    m_ptr.m_mutex.unlock();
-  }
+  ~DrapeEngineLockGuard() { m_ptr.m_mutex.unlock(); }
 
   explicit operator bool() { return m_ptr.m_engine != nullptr; }
 
diff --git a/libs/drape_frontend/drape_frontend_tests/frame_values_tests.cpp b/libs/drape_frontend/drape_frontend_tests/frame_values_tests.cpp
index ed4937088..930fcd230 100644
--- a/libs/drape_frontend/drape_frontend_tests/frame_values_tests.cpp
+++ b/libs/drape_frontend/drape_frontend_tests/frame_values_tests.cpp
@@ -8,14 +8,10 @@
 
 namespace
 {
-glsl::mat4 const kTestMatrix1 = glsl::mat4(1.0f, 2.0f, 3.0f, 4.0f,
-                                           1.0f, 2.0f, 3.0f, 4.0f,
-                                           1.0f, 2.0f, 3.0f, 4.0f,
-                                           1.0f, 2.0f, 3.0f, 4.0f);
-glsl::mat4 const kTestMatrix2 = glsl::mat4(4.0f, 3.0f, 2.0f, 1.0f,
-                                           4.0f, 3.0f, 2.0f, 1.0f,
-                                           4.0f, 3.0f, 2.0f, 1.0f,
-                                           4.0f, 3.0f, 2.0f, 1.0f);
+glsl::mat4 const kTestMatrix1 =
+    glsl::mat4(1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f, 1.0f, 2.0f, 3.0f, 4.0f);
+glsl::mat4 const kTestMatrix2 =
+    glsl::mat4(4.0f, 3.0f, 2.0f, 1.0f, 4.0f, 3.0f, 2.0f, 1.0f, 4.0f, 3.0f, 2.0f, 1.0f, 4.0f, 3.0f, 2.0f, 1.0f);
 }  // namespace
 
 UNIT_TEST(FrameValues_SetTo)
diff --git a/libs/drape_frontend/drape_frontend_tests/navigator_test.cpp b/libs/drape_frontend/drape_frontend_tests/navigator_test.cpp
index 440c89eef..26d5a394d 100644
--- a/libs/drape_frontend/drape_frontend_tests/navigator_test.cpp
+++ b/libs/drape_frontend/drape_frontend_tests/navigator_test.cpp
@@ -38,34 +38,30 @@ UNIT_TEST(Navigator_Scale2Points)
   ScreenBase const & screen = navigator.Screen();
   TEST_EQUAL(screen.ClipRect(), m2::RectD(0, 0, 8, 4), ());
 
-  navigator.StartScale(screen.GtoP(m2::PointD(1, 1)),
-                       screen.GtoP(m2::PointD(7, 1)));
-  navigator.StopScale(screen.GtoP(m2::PointD(1, 1)),
-                      screen.GtoP(m2::PointD(4, 1)));
+  navigator.StartScale(screen.GtoP(m2::PointD(1, 1)), screen.GtoP(m2::PointD(7, 1)));
+  navigator.StopScale(screen.GtoP(m2::PointD(1, 1)), screen.GtoP(m2::PointD(4, 1)));
   TEST_EQUAL(screen.ClipRect(), m2::RectD(-1, -1, 15, 7), ());
 }
 
 namespace
 {
-  void CheckNavigator(df::Navigator const & nav)
+void CheckNavigator(df::Navigator const & nav)
+{
+  typedef m2::PointD P;
+  m2::RectD clipR = nav.Screen().ClipRect();
+
+  P arr[] = {clipR.LeftTop(), clipR.RightTop(), clipR.RightBottom(), clipR.LeftBottom(), clipR.Center()};
+
+  for (size_t i = 0; i < ARRAY_SIZE(arr); ++i)
   {
-    typedef m2::PointD P;
-    m2::RectD clipR = nav.Screen().ClipRect();
-
-    P arr[] = { clipR.LeftTop(), clipR.RightTop(),
-                clipR.RightBottom(), clipR.LeftBottom(),
-                clipR.Center() };
-
-    for (size_t i = 0; i < ARRAY_SIZE(arr); ++i)
-    {
-      P const & pxP = arr[i];
-      P const gP = nav.PtoG(pxP);
-      P const pxP2 = nav.GtoP(gP);
-      TEST(AlmostEqualAbs(pxP.x, pxP2.x, 0.00001), (pxP.x, pxP2.x));
-      TEST(AlmostEqualAbs(pxP.y, pxP2.y, 0.00001), (pxP.y, pxP2.y));
-    }
+    P const & pxP = arr[i];
+    P const gP = nav.PtoG(pxP);
+    P const pxP2 = nav.GtoP(gP);
+    TEST(AlmostEqualAbs(pxP.x, pxP2.x, 0.00001), (pxP.x, pxP2.x));
+    TEST(AlmostEqualAbs(pxP.y, pxP2.y, 0.00001), (pxP.y, pxP2.y));
   }
 }
+}  // namespace
 
 UNIT_TEST(Navigator_G2P_P2G)
 {
@@ -83,6 +79,6 @@ UNIT_TEST(Navigator_G2P_P2G)
   navigator.Scale(center, 3.0);
   CheckNavigator(navigator);
 
-  navigator.Scale(center, 1/3.0);
+  navigator.Scale(center, 1 / 3.0);
   CheckNavigator(navigator);
 }
diff --git a/libs/drape_frontend/drape_frontend_tests/path_text_test.cpp b/libs/drape_frontend/drape_frontend_tests/path_text_test.cpp
index 66962ba8b..d1020232e 100644
--- a/libs/drape_frontend/drape_frontend_tests/path_text_test.cpp
+++ b/libs/drape_frontend/drape_frontend_tests/path_text_test.cpp
@@ -10,13 +10,11 @@ namespace
 bool IsSmooth(m2::SplineEx const & spline)
 {
   for (size_t i = 0, sz = spline.GetDirections().size(); i + 1 < sz; ++i)
-  {
     if (!df::IsValidSplineTurn(spline.GetDirections()[i], spline.GetDirections()[i + 1]))
       return false;
-  }
   return true;
 }
-} // namespace
+}  // namespace
 
 UNIT_TEST(Rounding_Spline)
 {
diff --git a/libs/drape_frontend/drape_frontend_tests/stylist_tests.cpp b/libs/drape_frontend/drape_frontend_tests/stylist_tests.cpp
index 1297896c6..4f8608c42 100644
--- a/libs/drape_frontend/drape_frontend_tests/stylist_tests.cpp
+++ b/libs/drape_frontend/drape_frontend_tests/stylist_tests.cpp
@@ -19,6 +19,6 @@ UNIT_TEST(Stylist_IsHatching)
   TEST(checker(cl.GetTypeByPath({"boundary", "national_park"})), ());
 
   TEST(checker(cl.GetTypeByPath({"landuse", "military", "danger_area"})), ());
-  
+
   TEST(checker(cl.GetTypeByPath({"amenity", "prison"})), ());
 }
diff --git a/libs/drape_frontend/drape_frontend_tests/user_event_stream_tests.cpp b/libs/drape_frontend/drape_frontend_tests/user_event_stream_tests.cpp
index 44acf3227..bd60ef8fc 100644
--- a/libs/drape_frontend/drape_frontend_tests/user_event_stream_tests.cpp
+++ b/libs/drape_frontend/drape_frontend_tests/user_event_stream_tests.cpp
@@ -17,8 +17,7 @@ namespace
 class UserEventStreamTest : df::UserEventStream::Listener
 {
 public:
-  explicit UserEventStreamTest(bool filtrateTouches)
-    : m_filtrate(filtrateTouches)
+  explicit UserEventStreamTest(bool filtrateTouches) : m_filtrate(filtrateTouches)
   {
     m_stream.SetTestBridge(std::bind(&UserEventStreamTest::TestBridge, this, _1));
   }
@@ -40,16 +39,13 @@ public:
   void OnScaleEnded() override {}
   void OnTouchMapAction(df::TouchEvent::ETouchType touchType, bool isMapTouch) override {}
   void OnAnimatedScaleEnded() override {}
-  bool OnNewVisibleViewport(m2::RectD const & oldViewport, m2::RectD const & newViewport,
-                            bool needOffset, m2::PointD & gOffset) override
+  bool OnNewVisibleViewport(m2::RectD const & oldViewport, m2::RectD const & newViewport, bool needOffset,
+                            m2::PointD & gOffset) override
   {
     return false;
   }
 
-  void AddUserEvent(df::TouchEvent const & event)
-  {
-    m_stream.AddEvent(make_unique_dp<df::TouchEvent>(event));
-  }
+  void AddUserEvent(df::TouchEvent const & event) { m_stream.AddEvent(make_unique_dp<df::TouchEvent>(event)); }
 
   void SetRect(m2::RectD const & r)
   {
@@ -58,10 +54,7 @@ public:
                                                        nullptr /* parallelAnimCreator */));
   }
 
-  void AddExpectation(char const * action)
-  {
-    m_expectation.push_back(action);
-  }
+  void AddExpectation(char const * action) { m_expectation.push_back(action); }
 
   void RunTest()
   {
diff --git a/libs/drape_frontend/drape_measurer.cpp b/libs/drape_frontend/drape_measurer.cpp
index afbe03ba3..4e60b4111 100644
--- a/libs/drape_frontend/drape_measurer.cpp
+++ b/libs/drape_frontend/drape_measurer.cpp
@@ -4,7 +4,6 @@
 
 #include "geometry/mercator.hpp"
 
-
 #include <iomanip>
 
 namespace df
@@ -81,7 +80,7 @@ void DrapeMeasurer::Start()
 #endif
 }
 
-void DrapeMeasurer::Stop(bool forceProcessRealtimeStats /* = false */ )
+void DrapeMeasurer::Stop(bool forceProcessRealtimeStats /* = false */)
 {
   using namespace std::chrono;
   if (!m_isEnabled)
@@ -90,11 +89,8 @@ void DrapeMeasurer::Stop(bool forceProcessRealtimeStats /* = false */ )
   m_isEnabled = false;
 
 #ifndef DRAPE_MEASURER_BENCHMARK
-  if ((forceProcessRealtimeStats && m_realtimeTotalFramesCount > 0) ||
-      m_realtimeTotalFramesCount >= 1000)
-  {
+  if ((forceProcessRealtimeStats && m_realtimeTotalFramesCount > 0) || m_realtimeTotalFramesCount >= 1000)
     m_realtimeTotalFramesCount = 0;
-  }
 #endif
 }
 
@@ -127,8 +123,7 @@ void DrapeMeasurer::EndScenePreparing()
   if (!m_isEnabled)
     return;
 
-  m_maxScenePreparingTime = max(m_maxScenePreparingTime,
-                                std::chrono::steady_clock::now() - m_startScenePreparingTime);
+  m_maxScenePreparingTime = max(m_maxScenePreparingTime, std::chrono::steady_clock::now() - m_startScenePreparingTime);
 }
 
 void DrapeMeasurer::StartShapesGeneration()
@@ -159,11 +154,11 @@ std::string DrapeMeasurer::GeneratingStatistic::ToString() const
   ss << " ----- Generation statistic report ----- \n";
   ss << " Max scene preparing time, ms = " << m_maxScenePreparingTimeInMs << "\n";
   ss << " Shapes total generation time, ms = " << m_shapeGenTimeInMs << "\n";
-  ss << " Shapes total count = " << m_shapesCount
-     << ", (" <<  static_cast<double>(m_shapeGenTimeInMs) / m_shapesCount << " ms per shape)\n";
+  ss << " Shapes total count = " << m_shapesCount << ", (" << static_cast<double>(m_shapeGenTimeInMs) / m_shapesCount
+     << " ms per shape)\n";
   ss << " Overlay shapes total generation time, ms = " << m_overlayShapeGenTimeInMs << "\n";
-  ss << " Overlay shapes total count = " << m_overlayShapesCount
-     << ", (" << static_cast<double>(m_overlayShapeGenTimeInMs) / m_overlayShapesCount << " ms per overlay)\n";
+  ss << " Overlay shapes total count = " << m_overlayShapesCount << ", ("
+     << static_cast<double>(m_overlayShapeGenTimeInMs) / m_overlayShapesCount << " ms per overlay)\n";
   ss << " ----- Generation statistic report ----- \n";
 
   return ss.str();
@@ -175,8 +170,7 @@ DrapeMeasurer::GeneratingStatistic DrapeMeasurer::GetGeneratingStatistic()
 
   GeneratingStatistic statistic;
   statistic.m_shapesCount = m_totalShapesCount;
-  statistic.m_shapeGenTimeInMs =
-      static_cast<uint32_t>(duration_cast<milliseconds>(m_totalShapesGenTime).count());
+  statistic.m_shapeGenTimeInMs = static_cast<uint32_t>(duration_cast<milliseconds>(m_totalShapesGenTime).count());
 
   statistic.m_overlayShapesCount = m_totalOverlayShapesCount;
   statistic.m_overlayShapeGenTimeInMs =
@@ -204,8 +198,8 @@ std::string DrapeMeasurer::RenderStatistic::ToString() const
     ss << " FPS Distribution:\n";
     for (auto const & fps : m_fpsDistribution)
     {
-      ss << "   " << fps.first << "-" << (fps.first + 10) << ": " << std::setprecision(4)
-         << fps.second * 100.0f << "%\n";
+      ss << "   " << fps.first << "-" << (fps.first + 10) << ": " << std::setprecision(4) << fps.second * 100.0f
+         << "%\n";
     }
   }
   ss << " ----- Render statistic report ----- \n";
@@ -228,10 +222,8 @@ DrapeMeasurer::RenderStatistic DrapeMeasurer::GetRenderStatistic()
     totalCount += fps.second;
 
   if (totalCount != 0)
-  {
     for (auto const & fps : m_fpsDistribution)
       statistic.m_fpsDistribution[fps.first] = static_cast<float>(fps.second) / totalCount;
-  }
 
   statistic.m_immediateRenderingMinFPS = m_immediateRenderingMinFps;
   if (m_immediateRenderingFramesCount > 0)
@@ -436,12 +428,9 @@ void DrapeMeasurer::TakeGPUMemorySnapshot()
     auto itMax = m_maxSnapshotValues.m_tagStats.find(tagPair.first);
     if (itMax != m_maxSnapshotValues.m_tagStats.end())
     {
-      itMax->second.m_objectsCount = std::max(itMax->second.m_objectsCount,
-                                              tagPair.second.m_objectsCount);
-      itMax->second.m_alocatedInMb = std::max(itMax->second.m_alocatedInMb,
-                                              tagPair.second.m_alocatedInMb);
-      itMax->second.m_usedInMb = std::max(itMax->second.m_alocatedInMb,
-                                          tagPair.second.m_usedInMb);
+      itMax->second.m_objectsCount = std::max(itMax->second.m_objectsCount, tagPair.second.m_objectsCount);
+      itMax->second.m_alocatedInMb = std::max(itMax->second.m_alocatedInMb, tagPair.second.m_alocatedInMb);
+      itMax->second.m_usedInMb = std::max(itMax->second.m_alocatedInMb, tagPair.second.m_usedInMb);
     }
     else
     {
@@ -461,10 +450,9 @@ void DrapeMeasurer::TakeGPUMemorySnapshot()
     }
   }
 
-  m_maxSnapshotValues.m_summaryAllocatedInMb = std::max(snap.m_summaryAllocatedInMb,
-                                                        m_maxSnapshotValues.m_summaryAllocatedInMb);
-  m_maxSnapshotValues.m_summaryUsedInMb = std::max(snap.m_summaryUsedInMb,
-                                                   m_maxSnapshotValues.m_summaryUsedInMb);
+  m_maxSnapshotValues.m_summaryAllocatedInMb =
+      std::max(snap.m_summaryAllocatedInMb, m_maxSnapshotValues.m_summaryAllocatedInMb);
+  m_maxSnapshotValues.m_summaryUsedInMb = std::max(snap.m_summaryUsedInMb, m_maxSnapshotValues.m_summaryUsedInMb);
 
   m_summarySnapshotValues.m_summaryAllocatedInMb += snap.m_summaryAllocatedInMb;
   m_summarySnapshotValues.m_summaryUsedInMb += snap.m_summaryUsedInMb;
diff --git a/libs/drape_frontend/drape_measurer.hpp b/libs/drape_frontend/drape_measurer.hpp
index 5e9758d2f..02b6a9db9 100644
--- a/libs/drape_frontend/drape_measurer.hpp
+++ b/libs/drape_frontend/drape_measurer.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "drape/drape_diagnostics.hpp"
-#include "drape/utils/gpu_mem_tracker.hpp"
 #include "drape/utils/glyph_usage_tracker.hpp"
+#include "drape/utils/gpu_mem_tracker.hpp"
 
 #include "geometry/rect2d.hpp"
 
@@ -10,13 +10,13 @@
 #include "base/timer.hpp"
 
 #include <chrono>
+#include <drape/drape_global.hpp>
 #include <map>
 #include <memory>
 #include <mutex>
 #include <numeric>
-#include <vector>
 #include <unordered_map>
-#include <drape/drape_global.hpp>
+#include <vector>
 
 namespace df
 {
diff --git a/libs/drape_frontend/drape_notifier.cpp b/libs/drape_frontend/drape_notifier.cpp
index a2957b396..27b4703e0 100644
--- a/libs/drape_frontend/drape_notifier.cpp
+++ b/libs/drape_frontend/drape_notifier.cpp
@@ -11,8 +11,7 @@ DrapeNotifier::DrapeNotifier(ref_ptr<ThreadsCommutator> commutator)
 {}
 
 uint64_t DrapeNotifier::Notify(ThreadsCommutator::ThreadName threadName,
-                               base::DelayedThreadPool::Duration const & duration, bool repeating,
-                               Functor && functor)
+                               base::DelayedThreadPool::Duration const & duration, bool repeating, Functor && functor)
 {
   uint64_t const notifyId = m_counter++;
   NotifyImpl(threadName, duration, repeating, notifyId, std::move(functor));
@@ -20,14 +19,13 @@ uint64_t DrapeNotifier::Notify(ThreadsCommutator::ThreadName threadName,
 }
 
 void DrapeNotifier::NotifyImpl(ThreadsCommutator::ThreadName threadName,
-                               base::DelayedThreadPool::Duration const & duration, bool repeating,
-                               uint64_t notifyId, Functor && functor)
+                               base::DelayedThreadPool::Duration const & duration, bool repeating, uint64_t notifyId,
+                               Functor && functor)
 {
   dp::DrapeRoutine::RunDelayed(duration,
-    [this, threadName, duration, repeating, notifyId, functor = std::move(functor)]() mutable
+                               [this, threadName, duration, repeating, notifyId, functor = std::move(functor)]() mutable
   {
-    m_commutator->PostMessage(threadName,
-                              make_unique_dp<NotifyRenderThreadMessage>(functor, notifyId),
+    m_commutator->PostMessage(threadName, make_unique_dp<NotifyRenderThreadMessage>(functor, notifyId),
                               MessagePriority::Normal);
     if (repeating)
       NotifyImpl(threadName, duration, repeating, notifyId, std::move(functor));
diff --git a/libs/drape_frontend/drape_notifier.hpp b/libs/drape_frontend/drape_notifier.hpp
index b5b277c93..dfde5f1f0 100644
--- a/libs/drape_frontend/drape_notifier.hpp
+++ b/libs/drape_frontend/drape_notifier.hpp
@@ -20,14 +20,12 @@ public:
 
   explicit DrapeNotifier(ref_ptr<ThreadsCommutator> commutator);
 
-  uint64_t Notify(ThreadsCommutator::ThreadName threadName,
-                  base::DelayedThreadPool::Duration const & duration,
+  uint64_t Notify(ThreadsCommutator::ThreadName threadName, base::DelayedThreadPool::Duration const & duration,
                   bool repeating, Functor && functor);
 
 private:
-  void NotifyImpl(ThreadsCommutator::ThreadName threadName,
-                  base::DelayedThreadPool::Duration const & duration, bool repeating,
-                  uint64_t notifyId, Functor && functor);
+  void NotifyImpl(ThreadsCommutator::ThreadName threadName, base::DelayedThreadPool::Duration const & duration,
+                  bool repeating, uint64_t notifyId, Functor && functor);
 
   ref_ptr<ThreadsCommutator> m_commutator;
   std::atomic<uint64_t> m_counter;
diff --git a/libs/drape_frontend/engine_context.cpp b/libs/drape_frontend/engine_context.cpp
index e917d5550..ff9dc6313 100644
--- a/libs/drape_frontend/engine_context.cpp
+++ b/libs/drape_frontend/engine_context.cpp
@@ -1,20 +1,15 @@
 #include "drape_frontend/engine_context.hpp"
 
-#include "drape_frontend/message_subclasses.hpp"
 #include "drape/texture_manager.hpp"
+#include "drape_frontend/message_subclasses.hpp"
 
 #include <utility>
 
 namespace df
 {
-EngineContext::EngineContext(TileKey tileKey,
-                             ref_ptr<ThreadsCommutator> commutator,
-                             ref_ptr<dp::TextureManager> texMng,
-                             ref_ptr<MetalineManager> metalineMng,
-                             CustomFeaturesContextWeakPtr customFeaturesContext,
-                             bool is3dBuildingsEnabled,
-                             bool isTrafficEnabled,
-                             bool isolinesEnabled,
+EngineContext::EngineContext(TileKey tileKey, ref_ptr<ThreadsCommutator> commutator, ref_ptr<dp::TextureManager> texMng,
+                             ref_ptr<MetalineManager> metalineMng, CustomFeaturesContextWeakPtr customFeaturesContext,
+                             bool is3dBuildingsEnabled, bool isTrafficEnabled, bool isolinesEnabled,
                              int8_t mapLangIndex)
   : m_tileKey(tileKey)
   , m_commutator(commutator)
@@ -66,7 +61,6 @@ void EngineContext::EndReadTile()
 
 void EngineContext::PostMessage(drape_ptr<Message> && message)
 {
-  m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread, std::move(message),
-                            MessagePriority::Normal);
+  m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread, std::move(message), MessagePriority::Normal);
 }
 }  // namespace df
diff --git a/libs/drape_frontend/engine_context.hpp b/libs/drape_frontend/engine_context.hpp
index bb10aed67..7a1a8db11 100644
--- a/libs/drape_frontend/engine_context.hpp
+++ b/libs/drape_frontend/engine_context.hpp
@@ -2,8 +2,8 @@
 
 #include "drape_frontend/custom_features_context.hpp"
 #include "drape_frontend/map_shape.hpp"
-#include "drape_frontend/tile_utils.hpp"
 #include "drape_frontend/threads_commutator.hpp"
+#include "drape_frontend/tile_utils.hpp"
 #include "drape_frontend/traffic_generator.hpp"
 
 #include "drape/constants.hpp"
@@ -24,15 +24,9 @@ class MetalineManager;
 class EngineContext
 {
 public:
-  EngineContext(TileKey tileKey,
-                ref_ptr<ThreadsCommutator> commutator,
-                ref_ptr<dp::TextureManager> texMng,
-                ref_ptr<MetalineManager> metalineMng,
-                CustomFeaturesContextWeakPtr customFeaturesContext,
-                bool is3dBuildingsEnabled,
-                bool isTrafficEnabled,
-                bool isolinesEnabled,
-                int8_t mapLangIndex);
+  EngineContext(TileKey tileKey, ref_ptr<ThreadsCommutator> commutator, ref_ptr<dp::TextureManager> texMng,
+                ref_ptr<MetalineManager> metalineMng, CustomFeaturesContextWeakPtr customFeaturesContext,
+                bool is3dBuildingsEnabled, bool isTrafficEnabled, bool isolinesEnabled, int8_t mapLangIndex);
 
   TileKey const & GetTileKey() const { return m_tileKey; }
   bool Is3dBuildingsEnabled() const { return m_3dBuildingsEnabled; }
diff --git a/libs/drape_frontend/frame_values.hpp b/libs/drape_frontend/frame_values.hpp
index e72ee243e..5d4199833 100644
--- a/libs/drape_frontend/frame_values.hpp
+++ b/libs/drape_frontend/frame_values.hpp
@@ -9,25 +9,26 @@
 
 namespace df
 {
-#define DECLARE_SETTER(name, field) \
-template<typename T> struct Check##name \
-{ \
-private: \
-  static void Detect(...); \
-  template<typename U> static decltype(std::declval<U>().field) Detect(U const &); \
-public: \
-  static constexpr bool Value = !std::is_same<void, decltype(Detect(std::declval<T>()))>::value; \
-}; \
-template <typename ParamsType> \
-std::enable_if_t<Check##name<ParamsType>::Value> \
-name(ParamsType & params) const \
-{ \
-  params.field = field; \
-} \
-template <typename ParamsType> \
-std::enable_if_t<!Check##name<ParamsType>::Value> \
-name(ParamsType & params) const {}
-
+#define DECLARE_SETTER(name, field)                                                                \
+  template <typename T>                                                                            \
+  struct Check##name                                                                               \
+  {                                                                                                \
+  private:                                                                                         \
+    static void Detect(...);                                                                       \
+    template <typename U>                                                                          \
+    static decltype(std::declval<U>().field) Detect(U const &);                                    \
+                                                                                                   \
+  public:                                                                                          \
+    static constexpr bool Value = !std::is_same<void, decltype(Detect(std::declval<T>()))>::value; \
+  };                                                                                               \
+  template <typename ParamsType>                                                                   \
+  std::enable_if_t<Check##name<ParamsType>::Value> name(ParamsType & params) const                 \
+  {                                                                                                \
+    params.field = field;                                                                          \
+  }                                                                                                \
+  template <typename ParamsType>                                                                   \
+  std::enable_if_t<!Check##name<ParamsType>::Value> name(ParamsType & params) const                \
+  {}
 
 struct FrameValues
 {
diff --git a/libs/drape_frontend/frontend_renderer.cpp b/libs/drape_frontend/frontend_renderer.cpp
old mode 100755
new mode 100644
index a34cc558d..2005e514c
--- a/libs/drape_frontend/frontend_renderer.cpp
+++ b/libs/drape_frontend/frontend_renderer.cpp
@@ -46,7 +46,6 @@
 #include <thread>
 #include <utility>
 
-
 namespace df
 {
 using namespace std::placeholders;
@@ -61,8 +60,7 @@ double constexpr kVSyncIntervalMetalVulkan = 0.03;
 std::string const kTransitBackgroundColor = "TransitBackground";
 
 template <typename ToDo>
-bool RemoveGroups(ToDo && filter, std::vector<drape_ptr<RenderGroup>> & groups,
-                  ref_ptr<dp::OverlayTree> tree)
+bool RemoveGroups(ToDo && filter, std::vector<drape_ptr<RenderGroup>> & groups, ref_ptr<dp::OverlayTree> tree)
 {
   auto const itEnd = groups.end();
   auto it = std::remove_if(groups.begin(), itEnd, [&filter, tree](drape_ptr<RenderGroup> & group)
@@ -86,16 +84,12 @@ bool RemoveGroups(ToDo && filter, std::vector<drape_ptr<RenderGroup>> & groups,
 class DebugLabelGuard
 {
 public:
-  DebugLabelGuard(ref_ptr<dp::GraphicsContext> context, std::string const & label)
-    : m_context(context)
+  DebugLabelGuard(ref_ptr<dp::GraphicsContext> context, std::string const & label) : m_context(context)
   {
     m_context->PushDebugLabel(label);
   }
 
-  ~DebugLabelGuard()
-  {
-    m_context->PopDebugLabel();
-  }
+  ~DebugLabelGuard() { m_context->PopDebugLabel(); }
 
 private:
   ref_ptr<dp::GraphicsContext> m_context;
@@ -110,15 +104,9 @@ private:
 class DrapeMeasurerGuard
 {
 public:
-  DrapeMeasurerGuard()
-  {
-    DrapeMeasurer::Instance().BeforeRenderFrame();
-  }
+  DrapeMeasurerGuard() { DrapeMeasurer::Instance().BeforeRenderFrame(); }
 
-  ~DrapeMeasurerGuard()
-  {
-    DrapeMeasurer::Instance().AfterRenderFrame(m_isActiveFrame, m_viewportCenter);
-  }
+  ~DrapeMeasurerGuard() { DrapeMeasurer::Instance().AfterRenderFrame(m_isActiveFrame, m_viewportCenter); }
 
   void SetProperties(bool isActiveFrame, m2::PointD const & viewportCenter)
   {
@@ -135,8 +123,7 @@ private:
 class DrapeImmediateRenderingMeasurerGuard
 {
 public:
-  DrapeImmediateRenderingMeasurerGuard(ref_ptr<dp::GraphicsContext> context)
-    : m_context(context)
+  DrapeImmediateRenderingMeasurerGuard(ref_ptr<dp::GraphicsContext> context) : m_context(context)
   {
     DrapeMeasurer::Instance().BeforeImmediateRendering();
   }
@@ -200,21 +187,20 @@ FrontendRenderer::FrontendRenderer(Params && params)
   m_gpsTrackRenderer = make_unique_dp<GpsTrackRenderer>([this](uint32_t pointsCount)
   {
     m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                              make_unique_dp<CacheCirclesPackMessage>(
-                                pointsCount, CacheCirclesPackMessage::GpsTrack),
+                              make_unique_dp<CacheCirclesPackMessage>(pointsCount, CacheCirclesPackMessage::GpsTrack),
                               MessagePriority::Normal);
   });
 
   m_routeRenderer = make_unique_dp<RouteRenderer>([this](uint32_t pointsCount)
   {
-    m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                              make_unique_dp<CacheCirclesPackMessage>(
-                                pointsCount, CacheCirclesPackMessage::RoutePreview),
-                              MessagePriority::Normal);
+    m_commutator->PostMessage(
+        ThreadsCommutator::ResourceUploadThread,
+        make_unique_dp<CacheCirclesPackMessage>(pointsCount, CacheCirclesPackMessage::RoutePreview),
+        MessagePriority::Normal);
   });
 
-  m_myPositionController = make_unique_dp<MyPositionController>(
-      std::move(params.m_myPositionParams), make_ref(m_notifier));
+  m_myPositionController =
+      make_unique_dp<MyPositionController>(std::move(params.m_myPositionParams), make_ref(m_notifier));
 
   StartThread();
 }
@@ -256,8 +242,7 @@ void FrontendRenderer::UpdateCanBeDeletedStatus()
         if (tileRect.IsIntersect(screenRect))
           canBeDeleted = !HasIntersection(tileRect, notFinishedTileRects);
       }
-      layer.m_isDirty |= group->UpdateCanBeDeletedStatus(canBeDeleted, GetCurrentZoom(),
-                                                         make_ref(m_overlayTree));
+      layer.m_isDirty |= group->UpdateCanBeDeletedStatus(canBeDeleted, GetCurrentZoom(), make_ref(m_overlayTree));
     }
   }
 }
@@ -267,799 +252,773 @@ void FrontendRenderer::AcceptMessage(ref_ptr<Message> message)
   switch (message->GetType())
   {
   case Message::Type::FlushTile:
+  {
+    ref_ptr<FlushRenderBucketMessage> msg = message;
+    dp::RenderState const & state = msg->GetState();
+    TileKey const & key = msg->GetKey();
+    drape_ptr<dp::RenderBucket> bucket = msg->AcceptBuffer();
+    if (key.m_zoomLevel == GetCurrentZoom() && CheckTileGenerations(key))
     {
-      ref_ptr<FlushRenderBucketMessage> msg = message;
-      dp::RenderState const & state = msg->GetState();
-      TileKey const & key = msg->GetKey();
-      drape_ptr<dp::RenderBucket> bucket = msg->AcceptBuffer();
-      if (key.m_zoomLevel == GetCurrentZoom() && CheckTileGenerations(key))
-      {
-        PrepareBucket(state, bucket);
-        AddToRenderGroup<RenderGroup>(state, std::move(bucket), key);
-      }
-      break;
+      PrepareBucket(state, bucket);
+      AddToRenderGroup<RenderGroup>(state, std::move(bucket), key);
     }
+    break;
+  }
 
   case Message::Type::FlushOverlays:
+  {
+    ref_ptr<FlushOverlaysMessage> msg = message;
+    TOverlaysRenderData renderData = msg->AcceptRenderData();
+    for (auto & overlayRenderData : renderData)
     {
-      ref_ptr<FlushOverlaysMessage> msg = message;
-      TOverlaysRenderData renderData = msg->AcceptRenderData();
-      for (auto & overlayRenderData : renderData)
+      if (overlayRenderData.m_tileKey.m_zoomLevel == GetCurrentZoom() &&
+          CheckTileGenerations(overlayRenderData.m_tileKey))
       {
-        if (overlayRenderData.m_tileKey.m_zoomLevel == GetCurrentZoom() &&
-            CheckTileGenerations(overlayRenderData.m_tileKey))
-        {
-          PrepareBucket(overlayRenderData.m_state, overlayRenderData.m_bucket);
-          AddToRenderGroup<RenderGroup>(overlayRenderData.m_state, std::move(overlayRenderData.m_bucket),
-                                        overlayRenderData.m_tileKey);
-        }
+        PrepareBucket(overlayRenderData.m_state, overlayRenderData.m_bucket);
+        AddToRenderGroup<RenderGroup>(overlayRenderData.m_state, std::move(overlayRenderData.m_bucket),
+                                      overlayRenderData.m_tileKey);
       }
-      UpdateCanBeDeletedStatus();
-
-      m_firstTilesReady = true;
-      if (m_firstLaunchAnimationTriggered)
-      {
-        CheckAndRunFirstLaunchAnimation();
-        m_firstLaunchAnimationTriggered = false;
-      }
-      break;
     }
+    UpdateCanBeDeletedStatus();
+
+    m_firstTilesReady = true;
+    if (m_firstLaunchAnimationTriggered)
+    {
+      CheckAndRunFirstLaunchAnimation();
+      m_firstLaunchAnimationTriggered = false;
+    }
+    break;
+  }
 
   case Message::Type::FinishTileRead:
+  {
+    ref_ptr<FinishTileReadMessage> msg = message;
+    bool changed = false;
+    for (auto const & tileKey : msg->GetTiles())
     {
-      ref_ptr<FinishTileReadMessage> msg = message;
-      bool changed = false;
-      for (auto const & tileKey : msg->GetTiles())
+      if (CheckTileGenerations(tileKey))
       {
-        if (CheckTileGenerations(tileKey))
+        auto it = m_notFinishedTiles.find(tileKey);
+        if (it != m_notFinishedTiles.end())
         {
-          auto it = m_notFinishedTiles.find(tileKey);
-          if (it != m_notFinishedTiles.end())
-          {
-            m_notFinishedTiles.erase(it);
-            changed = true;
-          }
+          m_notFinishedTiles.erase(it);
+          changed = true;
         }
       }
-      if (changed || m_notFinishedTiles.empty())
-        UpdateCanBeDeletedStatus();
+    }
+    if (changed || m_notFinishedTiles.empty())
+      UpdateCanBeDeletedStatus();
 
-      if (m_notFinishedTiles.empty())
-      {
+    if (m_notFinishedTiles.empty())
+    {
 #if defined(DRAPE_MEASURER_BENCHMARK) && defined(GENERATING_STATISTIC)
-        DrapeMeasurer::Instance().EndScenePreparing();
+      DrapeMeasurer::Instance().EndScenePreparing();
 #endif
-        m_trafficRenderer->OnGeometryReady(GetCurrentZoom());
+      m_trafficRenderer->OnGeometryReady(GetCurrentZoom());
 
 #if defined(OMIM_OS_DESKTOP)
-        if (m_graphicsStage == GraphicsStage::WaitReady)
-          m_graphicsStage = GraphicsStage::WaitRendering;
+      if (m_graphicsStage == GraphicsStage::WaitReady)
+        m_graphicsStage = GraphicsStage::WaitRendering;
 #endif
-      }
-      break;
     }
+    break;
+  }
 
   case Message::Type::InvalidateRect:
-    {
-      ref_ptr<InvalidateRectMessage> m = message;
-      InvalidateRect(m->GetRect());
-      break;
-    }
+  {
+    ref_ptr<InvalidateRectMessage> m = message;
+    InvalidateRect(m->GetRect());
+    break;
+  }
 
   case Message::Type::FlushUserMarks:
+  {
+    ref_ptr<FlushUserMarksMessage> msg = message;
+    TUserMarksRenderData marksRenderData = msg->AcceptRenderData();
+    for (auto & renderData : marksRenderData)
     {
-      ref_ptr<FlushUserMarksMessage> msg = message;
-      TUserMarksRenderData marksRenderData = msg->AcceptRenderData();
-      for (auto & renderData : marksRenderData)
+      if (renderData.m_tileKey.m_zoomLevel == GetCurrentZoom() && CheckTileGenerations(renderData.m_tileKey))
       {
-        if (renderData.m_tileKey.m_zoomLevel == GetCurrentZoom() &&
-            CheckTileGenerations(renderData.m_tileKey))
-        {
-          PrepareBucket(renderData.m_state, renderData.m_bucket);
-          AddToRenderGroup<UserMarkRenderGroup>(renderData.m_state, std::move(renderData.m_bucket),
-                                                renderData.m_tileKey);
-        }
+        PrepareBucket(renderData.m_state, renderData.m_bucket);
+        AddToRenderGroup<UserMarkRenderGroup>(renderData.m_state, std::move(renderData.m_bucket), renderData.m_tileKey);
       }
-      break;
     }
+    break;
+  }
 
   case Message::Type::GuiLayerRecached:
+  {
+    ref_ptr<GuiLayerRecachedMessage> msg = message;
+    CHECK(m_context != nullptr, ());
+    drape_ptr<gui::LayerRenderer> renderer = std::move(msg->AcceptRenderer());
+    renderer->Build(m_context, make_ref(m_gpuProgramManager));
+    if (msg->NeedResetOldGui())
+      m_guiRenderer.reset();
+    if (m_guiRenderer == nullptr)
+      m_guiRenderer = std::move(renderer);
+    else
+      m_guiRenderer->Merge(make_ref(renderer));
+
+    CHECK(m_guiRenderer != nullptr, ());
+    m_guiRenderer->SetLayout(m_lastWidgetsLayout);
+
+    bool oldMode = m_choosePositionMode;
+    m_choosePositionMode = m_guiRenderer->HasWidget(gui::WIDGET_CHOOSE_POSITION_MARK);
+    if (oldMode != m_choosePositionMode)
     {
-      ref_ptr<GuiLayerRecachedMessage> msg = message;
-      CHECK(m_context != nullptr, ());
-      drape_ptr<gui::LayerRenderer> renderer = std::move(msg->AcceptRenderer());
-      renderer->Build(m_context, make_ref(m_gpuProgramManager));
-      if (msg->NeedResetOldGui())
-        m_guiRenderer.reset();
-      if (m_guiRenderer == nullptr)
-        m_guiRenderer = std::move(renderer);
-      else
-        m_guiRenderer->Merge(make_ref(renderer));
-
-      CHECK(m_guiRenderer != nullptr, ());
-      m_guiRenderer->SetLayout(m_lastWidgetsLayout);
-
-      bool oldMode = m_choosePositionMode;
-      m_choosePositionMode = m_guiRenderer->HasWidget(gui::WIDGET_CHOOSE_POSITION_MARK);
-      if (oldMode != m_choosePositionMode)
-      {
-        ScreenBase const & screen = m_userEventStream.GetCurrentScreen();
-        CheckIsometryMinScale(screen);
-        UpdateDisplacementEnabled();
-        m_forceUpdateScene = true;
-      }
-
-      if (m_guiRenderer->HasWidget(gui::WIDGET_RULER))
-        gui::DrapeGui::GetRulerHelper().Invalidate();
-      break;
+      ScreenBase const & screen = m_userEventStream.GetCurrentScreen();
+      CheckIsometryMinScale(screen);
+      UpdateDisplacementEnabled();
+      m_forceUpdateScene = true;
     }
 
+    if (m_guiRenderer->HasWidget(gui::WIDGET_RULER))
+      gui::DrapeGui::GetRulerHelper().Invalidate();
+    break;
+  }
+
   case Message::Type::GuiLayerLayout:
-    {
-      m_lastWidgetsLayout = ref_ptr<GuiLayerLayoutMessage>(message)->GetLayoutInfo();
-      if (m_guiRenderer != nullptr)
-        m_guiRenderer->SetLayout(m_lastWidgetsLayout);
-      break;
-    }
+  {
+    m_lastWidgetsLayout = ref_ptr<GuiLayerLayoutMessage>(message)->GetLayoutInfo();
+    if (m_guiRenderer != nullptr)
+      m_guiRenderer->SetLayout(m_lastWidgetsLayout);
+    break;
+  }
 
   case Message::Type::UpdateMyPositionRoutingOffset:
-    {
-      ref_ptr<UpdateMyPositionRoutingOffsetMessage> msg = message;
-      m_myPositionController->UpdateRoutingOffsetY(msg->UseDefault(), msg->GetOffsetY());
-      m_myPositionController->UpdatePosition();
-      break;
-    }
+  {
+    ref_ptr<UpdateMyPositionRoutingOffsetMessage> msg = message;
+    m_myPositionController->UpdateRoutingOffsetY(msg->UseDefault(), msg->GetOffsetY());
+    m_myPositionController->UpdatePosition();
+    break;
+  }
 
   case Message::Type::MapShapes:
+  {
+    ref_ptr<MapShapesMessage> msg = message;
+    CHECK(m_context != nullptr, ());
+    m_texMng->ApplyInvalidatedStaticTextures();
+    m_myPositionController->SetRenderShape(m_context, m_texMng, msg->AcceptShape(), msg->AcceptPeloadedArrow3dData());
+    m_selectionShape = msg->AcceptSelection();
+    if (m_selectObjectMessage != nullptr)
     {
-      ref_ptr<MapShapesMessage> msg = message;
-      CHECK(m_context != nullptr, ());
-      m_texMng->ApplyInvalidatedStaticTextures();
-      m_myPositionController->SetRenderShape(m_context, m_texMng, msg->AcceptShape(),
-                                             msg->AcceptPeloadedArrow3dData());
-      m_selectionShape = msg->AcceptSelection();
-      if (m_selectObjectMessage != nullptr)
-      {
-        ProcessSelection(make_ref(m_selectObjectMessage));
-        m_selectObjectMessage.reset();
-        AddUserEvent(make_unique_dp<SetVisibleViewportEvent>(m_userEventStream.GetVisibleViewport()));
-      }
-      break;
+      ProcessSelection(make_ref(m_selectObjectMessage));
+      m_selectObjectMessage.reset();
+      AddUserEvent(make_unique_dp<SetVisibleViewportEvent>(m_userEventStream.GetVisibleViewport()));
     }
+    break;
+  }
 
   case Message::Type::ChangeMyPositionMode:
+  {
+    ref_ptr<ChangeMyPositionModeMessage> msg = message;
+    switch (msg->GetChangeType())
     {
-      ref_ptr<ChangeMyPositionModeMessage> msg = message;
-      switch (msg->GetChangeType())
-      {
-      case ChangeMyPositionModeMessage::SwitchNextMode:
-        m_myPositionController->NextMode(m_userEventStream.GetCurrentScreen());
-        break;
-      case ChangeMyPositionModeMessage::StopFollowing:
-        m_myPositionController->StopLocationFollow();
-        break;
-      case ChangeMyPositionModeMessage::LoseLocation:
-        m_myPositionController->LoseLocation();
-        break;
-      default:
-        ASSERT(false, ("Unknown change type:", static_cast<int>(msg->GetChangeType())));
-        break;
-      }
+    case ChangeMyPositionModeMessage::SwitchNextMode:
+      m_myPositionController->NextMode(m_userEventStream.GetCurrentScreen());
       break;
+    case ChangeMyPositionModeMessage::StopFollowing: m_myPositionController->StopLocationFollow(); break;
+    case ChangeMyPositionModeMessage::LoseLocation: m_myPositionController->LoseLocation(); break;
+    default: ASSERT(false, ("Unknown change type:", static_cast<int>(msg->GetChangeType()))); break;
     }
+    break;
+  }
 
   case Message::Type::CompassInfo:
-    {
-      ref_ptr<CompassInfoMessage> msg = message;
-      m_myPositionController->OnCompassUpdate(msg->GetInfo(), m_userEventStream.GetCurrentScreen());
-      break;
-    }
+  {
+    ref_ptr<CompassInfoMessage> msg = message;
+    m_myPositionController->OnCompassUpdate(msg->GetInfo(), m_userEventStream.GetCurrentScreen());
+    break;
+  }
 
   case Message::Type::GpsInfo:
-    {
+  {
 #ifdef SCENARIO_ENABLE
-      if (m_scenarioManager->IsRunning())
-        break;
+    if (m_scenarioManager->IsRunning())
+      break;
 #endif
-      ref_ptr<GpsInfoMessage> msg = message;
-      m_myPositionController->OnLocationUpdate(msg->GetInfo(), msg->IsNavigable(),
-                                               m_userEventStream.GetCurrentScreen());
+    ref_ptr<GpsInfoMessage> msg = message;
+    m_myPositionController->OnLocationUpdate(msg->GetInfo(), msg->IsNavigable(), m_userEventStream.GetCurrentScreen());
 
-      location::RouteMatchingInfo const & info = msg->GetRouteInfo();
-      if (info.HasDistanceFromBegin())
-      {
-        m_routeRenderer->UpdateDistanceFromBegin(info.GetDistanceFromBegin());
-        // Here we have to recache route arrows.
-        m_routeRenderer->PrepareRouteArrows(m_userEventStream.GetCurrentScreen(),
-                                            std::bind(&FrontendRenderer::OnPrepareRouteArrows, this, _1, _2));
-      }
-
-      break;
-    }
-
-  case Message::Type::SelectObject:
+    location::RouteMatchingInfo const & info = msg->GetRouteInfo();
+    if (info.HasDistanceFromBegin())
     {
-      ref_ptr<SelectObjectMessage> msg = message;
-      m_overlayTree->SetSelectedFeature(msg->IsDismiss() ? FeatureID() : msg->GetFeatureID());
-      if (m_selectionShape == nullptr)
-      {
-        m_selectObjectMessage = make_unique_dp<SelectObjectMessage>(
-            msg->GetSelectedObject(), msg->GetPosition(), msg->GetFeatureID(), msg->IsAnim(),
-            msg->IsGeometrySelectionAllowed(), true /* isSelectionShapeVisible */);
-      }
-      else
-      {
-        ProcessSelection(msg);
-        AddUserEvent(make_unique_dp<SetVisibleViewportEvent>(m_userEventStream.GetVisibleViewport()));
-      }
-      break;
-    }
-
-  case Message::Type::FlushSelectionGeometry:
-    {
-      ref_ptr<FlushSelectionGeometryMessage> msg = message;
-      if (m_selectionShape != nullptr)
-      {
-        m_selectionShape->AddSelectionGeometry(msg->AcceptRenderData(), msg->GetRecacheId());
-        if (m_selectionShape->HasSelectionGeometry())
-        {
-          auto bbox = m_selectionShape->GetSelectionGeometryBoundingBox();
-          CHECK(bbox.IsValid(), ());
-          bbox.Scale(kBoundingBoxScale);
-          AddUserEvent(make_unique_dp<SetRectEvent>(bbox, true /* rotate */, kDoNotChangeZoom,
-                                                    true /* isAnim */, true /* useVisibleViewport */,
-                                                    nullptr /* parallelAnimCreator */));
-        }
-      }
-      break;
-    }
-
-  case Message::Type::FlushSubroute:
-    {
-      ref_ptr<FlushSubrouteMessage> msg = message;
-      auto subrouteData = msg->AcceptRenderData();
-
-      if (subrouteData->m_recacheId < 0)
-        subrouteData->m_recacheId = m_lastRecacheRouteId;
-
-      if (!CheckRouteRecaching(make_ref(subrouteData)))
-        break;
-
-      m_routeRenderer->ClearObsoleteData(m_lastRecacheRouteId);
-
-      CHECK(m_context != nullptr, ());
-      m_routeRenderer->AddSubrouteData(m_context, std::move(subrouteData), make_ref(m_gpuProgramManager));
-
+      m_routeRenderer->UpdateDistanceFromBegin(info.GetDistanceFromBegin());
       // Here we have to recache route arrows.
       m_routeRenderer->PrepareRouteArrows(m_userEventStream.GetCurrentScreen(),
                                           std::bind(&FrontendRenderer::OnPrepareRouteArrows, this, _1, _2));
-
-      if (m_pendingFollowRoute != nullptr)
-      {
-        FollowRoute(m_pendingFollowRoute->m_preferredZoomLevel,
-                    m_pendingFollowRoute->m_preferredZoomLevelIn3d,
-                    m_pendingFollowRoute->m_enableAutoZoom, m_pendingFollowRoute->m_isArrowGlued);
-        m_pendingFollowRoute.reset();
-      }
-      break;
     }
 
+    break;
+  }
+
+  case Message::Type::SelectObject:
+  {
+    ref_ptr<SelectObjectMessage> msg = message;
+    m_overlayTree->SetSelectedFeature(msg->IsDismiss() ? FeatureID() : msg->GetFeatureID());
+    if (m_selectionShape == nullptr)
+    {
+      m_selectObjectMessage = make_unique_dp<SelectObjectMessage>(
+          msg->GetSelectedObject(), msg->GetPosition(), msg->GetFeatureID(), msg->IsAnim(),
+          msg->IsGeometrySelectionAllowed(), true /* isSelectionShapeVisible */);
+    }
+    else
+    {
+      ProcessSelection(msg);
+      AddUserEvent(make_unique_dp<SetVisibleViewportEvent>(m_userEventStream.GetVisibleViewport()));
+    }
+    break;
+  }
+
+  case Message::Type::FlushSelectionGeometry:
+  {
+    ref_ptr<FlushSelectionGeometryMessage> msg = message;
+    if (m_selectionShape != nullptr)
+    {
+      m_selectionShape->AddSelectionGeometry(msg->AcceptRenderData(), msg->GetRecacheId());
+      if (m_selectionShape->HasSelectionGeometry())
+      {
+        auto bbox = m_selectionShape->GetSelectionGeometryBoundingBox();
+        CHECK(bbox.IsValid(), ());
+        bbox.Scale(kBoundingBoxScale);
+        AddUserEvent(make_unique_dp<SetRectEvent>(bbox, true /* rotate */, kDoNotChangeZoom, true /* isAnim */,
+                                                  true /* useVisibleViewport */, nullptr /* parallelAnimCreator */));
+      }
+    }
+    break;
+  }
+
+  case Message::Type::FlushSubroute:
+  {
+    ref_ptr<FlushSubrouteMessage> msg = message;
+    auto subrouteData = msg->AcceptRenderData();
+
+    if (subrouteData->m_recacheId < 0)
+      subrouteData->m_recacheId = m_lastRecacheRouteId;
+
+    if (!CheckRouteRecaching(make_ref(subrouteData)))
+      break;
+
+    m_routeRenderer->ClearObsoleteData(m_lastRecacheRouteId);
+
+    CHECK(m_context != nullptr, ());
+    m_routeRenderer->AddSubrouteData(m_context, std::move(subrouteData), make_ref(m_gpuProgramManager));
+
+    // Here we have to recache route arrows.
+    m_routeRenderer->PrepareRouteArrows(m_userEventStream.GetCurrentScreen(),
+                                        std::bind(&FrontendRenderer::OnPrepareRouteArrows, this, _1, _2));
+
+    if (m_pendingFollowRoute != nullptr)
+    {
+      FollowRoute(m_pendingFollowRoute->m_preferredZoomLevel, m_pendingFollowRoute->m_preferredZoomLevelIn3d,
+                  m_pendingFollowRoute->m_enableAutoZoom, m_pendingFollowRoute->m_isArrowGlued);
+      m_pendingFollowRoute.reset();
+    }
+    break;
+  }
+
   case Message::Type::FlushTransitScheme:
-    {
-      ref_ptr<FlushTransitSchemeMessage > msg = message;
-      auto renderData = msg->AcceptRenderData();
-      CHECK(m_context != nullptr, ());
-      m_transitSchemeRenderer->AddRenderData(m_context, make_ref(m_gpuProgramManager),
-                                             make_ref(m_overlayTree), std::move(renderData));
-      break;
-    }
+  {
+    ref_ptr<FlushTransitSchemeMessage> msg = message;
+    auto renderData = msg->AcceptRenderData();
+    CHECK(m_context != nullptr, ());
+    m_transitSchemeRenderer->AddRenderData(m_context, make_ref(m_gpuProgramManager), make_ref(m_overlayTree),
+                                           std::move(renderData));
+    break;
+  }
 
   case Message::Type::FlushSubrouteArrows:
+  {
+    ref_ptr<FlushSubrouteArrowsMessage> msg = message;
+    drape_ptr<SubrouteArrowsData> routeArrowsData = msg->AcceptRenderData();
+    if (CheckRouteRecaching(make_ref(routeArrowsData)))
     {
-      ref_ptr<FlushSubrouteArrowsMessage> msg = message;
-      drape_ptr<SubrouteArrowsData> routeArrowsData = msg->AcceptRenderData();
-      if (CheckRouteRecaching(make_ref(routeArrowsData)))
-      {
-        CHECK(m_context != nullptr, ());
-        m_routeRenderer->AddSubrouteArrowsData(m_context, std::move(routeArrowsData),
-                                               make_ref(m_gpuProgramManager));
-      }
-      break;
+      CHECK(m_context != nullptr, ());
+      m_routeRenderer->AddSubrouteArrowsData(m_context, std::move(routeArrowsData), make_ref(m_gpuProgramManager));
     }
+    break;
+  }
 
   case Message::Type::FlushSubrouteMarkers:
-    {
-      ref_ptr<FlushSubrouteMarkersMessage> msg = message;
-      drape_ptr<SubrouteMarkersData> markersData = msg->AcceptRenderData();
-      if (markersData->m_recacheId < 0)
-        markersData->m_recacheId = m_lastRecacheRouteId;
+  {
+    ref_ptr<FlushSubrouteMarkersMessage> msg = message;
+    drape_ptr<SubrouteMarkersData> markersData = msg->AcceptRenderData();
+    if (markersData->m_recacheId < 0)
+      markersData->m_recacheId = m_lastRecacheRouteId;
 
-      if (CheckRouteRecaching(make_ref(markersData)))
-      {
-        CHECK(m_context != nullptr, ());
-        m_routeRenderer->AddSubrouteMarkersData(m_context, std::move(markersData),
-                                                make_ref(m_gpuProgramManager));
-      }
-      break;
+    if (CheckRouteRecaching(make_ref(markersData)))
+    {
+      CHECK(m_context != nullptr, ());
+      m_routeRenderer->AddSubrouteMarkersData(m_context, std::move(markersData), make_ref(m_gpuProgramManager));
     }
+    break;
+  }
 
   case Message::Type::RemoveSubroute:
+  {
+    ref_ptr<RemoveSubrouteMessage> msg = message;
+    if (msg->NeedDeactivateFollowing())
     {
-      ref_ptr<RemoveSubrouteMessage> msg = message;
-      if (msg->NeedDeactivateFollowing())
-      {
-        CHECK(m_context != nullptr, ());
-        m_routeRenderer->SetFollowingEnabled(false);
-        m_routeRenderer->Clear();
-        ++m_lastRecacheRouteId;
-        m_myPositionController->DeactivateRouting();
-        m_postprocessRenderer->OnChangedRouteFollowingMode(m_context, false /* active */);
-        if (m_enablePerspectiveInNavigation)
-          DisablePerspective();
-      }
-      else
-      {
-        m_routeRenderer->RemoveSubrouteData(msg->GetSegmentId());
-      }
-      break;
-    }
-
-  case Message::Type::FollowRoute:
-    {
-      ref_ptr<FollowRouteMessage> const msg = message;
-
-      // After night style switching or drape engine reinitialization FrontendRenderer can
-      // receive FollowRoute message before FlushSubroute message, so we need to postpone its processing.
-      if (m_routeRenderer->GetSubroutes().empty())
-      {
-        m_pendingFollowRoute = std::make_unique<FollowRouteData>(
-            msg->GetPreferredZoomLevel(), msg->GetPreferredZoomLevelIn3d(), msg->EnableAutoZoom(),
-            msg->IsArrowGlued());
-      }
-      else
-      {
-        FollowRoute(msg->GetPreferredZoomLevel(), msg->GetPreferredZoomLevelIn3d(),
-                    msg->EnableAutoZoom(), msg->IsArrowGlued());
-      }
-      break;
-    }
-
-  case Message::Type::DeactivateRouteFollowing:
-    {
-      m_myPositionController->DeactivateRouting();
       CHECK(m_context != nullptr, ());
+      m_routeRenderer->SetFollowingEnabled(false);
+      m_routeRenderer->Clear();
+      ++m_lastRecacheRouteId;
+      m_myPositionController->DeactivateRouting();
       m_postprocessRenderer->OnChangedRouteFollowingMode(m_context, false /* active */);
       if (m_enablePerspectiveInNavigation)
         DisablePerspective();
-      break;
     }
+    else
+    {
+      m_routeRenderer->RemoveSubrouteData(msg->GetSegmentId());
+    }
+    break;
+  }
+
+  case Message::Type::FollowRoute:
+  {
+    ref_ptr<FollowRouteMessage> const msg = message;
+
+    // After night style switching or drape engine reinitialization FrontendRenderer can
+    // receive FollowRoute message before FlushSubroute message, so we need to postpone its processing.
+    if (m_routeRenderer->GetSubroutes().empty())
+    {
+      m_pendingFollowRoute = std::make_unique<FollowRouteData>(
+          msg->GetPreferredZoomLevel(), msg->GetPreferredZoomLevelIn3d(), msg->EnableAutoZoom(), msg->IsArrowGlued());
+    }
+    else
+    {
+      FollowRoute(msg->GetPreferredZoomLevel(), msg->GetPreferredZoomLevelIn3d(), msg->EnableAutoZoom(),
+                  msg->IsArrowGlued());
+    }
+    break;
+  }
+
+  case Message::Type::DeactivateRouteFollowing:
+  {
+    m_myPositionController->DeactivateRouting();
+    CHECK(m_context != nullptr, ());
+    m_postprocessRenderer->OnChangedRouteFollowingMode(m_context, false /* active */);
+    if (m_enablePerspectiveInNavigation)
+      DisablePerspective();
+    break;
+  }
 
   case Message::Type::AddRoutePreviewSegment:
-    {
-      ref_ptr<AddRoutePreviewSegmentMessage> const msg = message;
-      RouteRenderer::PreviewInfo info;
-      info.m_startPoint = msg->GetStartPoint();
-      info.m_finishPoint = msg->GetFinishPoint();
-      m_routeRenderer->AddPreviewSegment(msg->GetSegmentId(), std::move(info));
-      break;
-    }
+  {
+    ref_ptr<AddRoutePreviewSegmentMessage> const msg = message;
+    RouteRenderer::PreviewInfo info;
+    info.m_startPoint = msg->GetStartPoint();
+    info.m_finishPoint = msg->GetFinishPoint();
+    m_routeRenderer->AddPreviewSegment(msg->GetSegmentId(), std::move(info));
+    break;
+  }
 
   case Message::Type::RemoveRoutePreviewSegment:
-    {
-      ref_ptr<RemoveRoutePreviewSegmentMessage> const msg = message;
-      if (msg->NeedRemoveAll())
-        m_routeRenderer->RemoveAllPreviewSegments();
-      else
-        m_routeRenderer->RemovePreviewSegment(msg->GetSegmentId());
-      break;
-    }
+  {
+    ref_ptr<RemoveRoutePreviewSegmentMessage> const msg = message;
+    if (msg->NeedRemoveAll())
+      m_routeRenderer->RemoveAllPreviewSegments();
+    else
+      m_routeRenderer->RemovePreviewSegment(msg->GetSegmentId());
+    break;
+  }
 
   case Message::Type::SetSubrouteVisibility:
-    {
-      ref_ptr<SetSubrouteVisibilityMessage> const msg = message;
-      m_routeRenderer->SetSubrouteVisibility(msg->GetSubrouteId(), msg->IsVisible());
-      break;
-    }
+  {
+    ref_ptr<SetSubrouteVisibilityMessage> const msg = message;
+    m_routeRenderer->SetSubrouteVisibility(msg->GetSubrouteId(), msg->IsVisible());
+    break;
+  }
 
   case Message::Type::PrepareSubrouteArrows:
-    {
-      ref_ptr<PrepareSubrouteArrowsMessage> msg = message;
-      m_routeRenderer->CacheRouteArrows(m_userEventStream.GetCurrentScreen(),
-                                        msg->GetSubrouteId(), msg->AcceptBorders(),
-                                        std::bind(&FrontendRenderer::OnCacheRouteArrows, this, _1, _2));
-      break;
-    }
+  {
+    ref_ptr<PrepareSubrouteArrowsMessage> msg = message;
+    m_routeRenderer->CacheRouteArrows(m_userEventStream.GetCurrentScreen(), msg->GetSubrouteId(), msg->AcceptBorders(),
+                                      std::bind(&FrontendRenderer::OnCacheRouteArrows, this, _1, _2));
+    break;
+  }
 
   case Message::Type::RecoverContextDependentResources:
-    {
-      UpdateContextDependentResources();
-      break;
-    }
+  {
+    UpdateContextDependentResources();
+    break;
+  }
 
   case Message::Type::UpdateMapStyle:
-    {
+  {
 #ifdef BUILD_DESIGNER
-      classificator::Load();
-#endif // BUILD_DESIGNER
+    classificator::Load();
+#endif  // BUILD_DESIGNER
 
-      // Clear all graphics.
-      for (RenderLayer & layer : m_layers)
-      {
-        layer.m_renderGroups.clear();
-        layer.m_isDirty = false;
-      }
-
-      // Must be recreated on map style changing.
-      CHECK(m_context != nullptr, ());
-      m_transitBackground = make_unique_dp<ScreenQuadRenderer>(m_context);
-
-      // Invalidate read manager.
-      {
-        BaseBlockingMessage::Blocker blocker;
-        m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                                  make_unique_dp<InvalidateReadManagerRectMessage>(blocker),
-                                  MessagePriority::Normal);
-        blocker.Wait();
-      }
-
-      // Delete all messages which can contain render states (and textures references inside).
-      auto f = [this]()
-      {
-        InstantMessageFilter([](ref_ptr<Message> msg) { return msg->ContainsRenderState(); });
-      };
-
-      // Notify backend renderer and wait for completion.
-      {
-        BaseBlockingMessage::Blocker blocker;
-        m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                                  make_unique_dp<SwitchMapStyleMessage>(blocker, std::move(f)),
-                                  MessagePriority::Normal);
-        blocker.Wait();
-      }
-
-      UpdateContextDependentResources();
-      break;
+    // Clear all graphics.
+    for (RenderLayer & layer : m_layers)
+    {
+      layer.m_renderGroups.clear();
+      layer.m_isDirty = false;
     }
 
+    // Must be recreated on map style changing.
+    CHECK(m_context != nullptr, ());
+    m_transitBackground = make_unique_dp<ScreenQuadRenderer>(m_context);
+
+    // Invalidate read manager.
+    {
+      BaseBlockingMessage::Blocker blocker;
+      m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
+                                make_unique_dp<InvalidateReadManagerRectMessage>(blocker), MessagePriority::Normal);
+      blocker.Wait();
+    }
+
+    // Delete all messages which can contain render states (and textures references inside).
+    auto f = [this]() { InstantMessageFilter([](ref_ptr<Message> msg) { return msg->ContainsRenderState(); }); };
+
+    // Notify backend renderer and wait for completion.
+    {
+      BaseBlockingMessage::Blocker blocker;
+      m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
+                                make_unique_dp<SwitchMapStyleMessage>(blocker, std::move(f)), MessagePriority::Normal);
+      blocker.Wait();
+    }
+
+    UpdateContextDependentResources();
+    break;
+  }
+
   case Message::Type::AllowAutoZoom:
-    {
-      ref_ptr<AllowAutoZoomMessage> const msg = message;
-      m_myPositionController->EnableAutoZoomInRouting(msg->AllowAutoZoom());
-      break;
-    }
+  {
+    ref_ptr<AllowAutoZoomMessage> const msg = message;
+    m_myPositionController->EnableAutoZoomInRouting(msg->AllowAutoZoom());
+    break;
+  }
 
   case Message::Type::EnablePerspective:
-    {
-      AddUserEvent(make_unique_dp<SetAutoPerspectiveEvent>(true /* isAutoPerspective */));
-      break;
-    }
+  {
+    AddUserEvent(make_unique_dp<SetAutoPerspectiveEvent>(true /* isAutoPerspective */));
+    break;
+  }
 
   case Message::Type::Allow3dMode:
-    {
-      ref_ptr<Allow3dModeMessage> const msg = message;
-      ScreenBase const & screen = m_userEventStream.GetCurrentScreen();
+  {
+    ref_ptr<Allow3dModeMessage> const msg = message;
+    ScreenBase const & screen = m_userEventStream.GetCurrentScreen();
 
 #ifdef OMIM_OS_DESKTOP
-      if (m_enablePerspectiveInNavigation == msg->AllowPerspective() &&
-          m_enablePerspectiveInNavigation != screen.isPerspective())
-      {
-        AddUserEvent(make_unique_dp<SetAutoPerspectiveEvent>(m_enablePerspectiveInNavigation));
-      }
+    if (m_enablePerspectiveInNavigation == msg->AllowPerspective() &&
+        m_enablePerspectiveInNavigation != screen.isPerspective())
+    {
+      AddUserEvent(make_unique_dp<SetAutoPerspectiveEvent>(m_enablePerspectiveInNavigation));
+    }
 #endif
 
-      if (m_enable3dBuildings != msg->Allow3dBuildings())
-      {
-        m_enable3dBuildings = msg->Allow3dBuildings();
-        CheckIsometryMinScale(screen);
-        m_forceUpdateScene = true;
-      }
-
-      if (m_enablePerspectiveInNavigation != msg->AllowPerspective())
-      {
-        m_enablePerspectiveInNavigation = msg->AllowPerspective();
-        m_myPositionController->EnablePerspectiveInRouting(m_enablePerspectiveInNavigation);
-        if (m_myPositionController->IsInRouting())
-        {
-          AddUserEvent(make_unique_dp<SetAutoPerspectiveEvent>(m_enablePerspectiveInNavigation));
-        }
-      }
-      break;
-    }
-    case Message::Type::SetMapLangIndex:
+    if (m_enable3dBuildings != msg->Allow3dBuildings())
     {
-      ref_ptr<SetMapLangIndexMessage> const msg = message;
-
-      if (m_mapLangIndex != msg->MapLangIndex())
-      {
-        m_mapLangIndex = msg->MapLangIndex();
-        m_forceUpdateScene = true;
-      }
-      break;
+      m_enable3dBuildings = msg->Allow3dBuildings();
+      CheckIsometryMinScale(screen);
+      m_forceUpdateScene = true;
     }
+
+    if (m_enablePerspectiveInNavigation != msg->AllowPerspective())
+    {
+      m_enablePerspectiveInNavigation = msg->AllowPerspective();
+      m_myPositionController->EnablePerspectiveInRouting(m_enablePerspectiveInNavigation);
+      if (m_myPositionController->IsInRouting())
+        AddUserEvent(make_unique_dp<SetAutoPerspectiveEvent>(m_enablePerspectiveInNavigation));
+    }
+    break;
+  }
+  case Message::Type::SetMapLangIndex:
+  {
+    ref_ptr<SetMapLangIndexMessage> const msg = message;
+
+    if (m_mapLangIndex != msg->MapLangIndex())
+    {
+      m_mapLangIndex = msg->MapLangIndex();
+      m_forceUpdateScene = true;
+    }
+    break;
+  }
   case Message::Type::FlushCirclesPack:
+  {
+    ref_ptr<FlushCirclesPackMessage> msg = message;
+    CHECK(m_context != nullptr, ());
+    switch (msg->GetDestination())
     {
-      ref_ptr<FlushCirclesPackMessage> msg = message;
-      CHECK(m_context != nullptr, ());
-      switch (msg->GetDestination())
-      {
-      case CacheCirclesPackMessage::GpsTrack:
-        m_gpsTrackRenderer->AddRenderData(m_context, make_ref(m_gpuProgramManager), msg->AcceptRenderData());
-        break;
-      case CacheCirclesPackMessage::RoutePreview:
-        m_routeRenderer->AddPreviewRenderData(m_context, msg->AcceptRenderData(), make_ref(m_gpuProgramManager));
-        break;
-      }
+    case CacheCirclesPackMessage::GpsTrack:
+      m_gpsTrackRenderer->AddRenderData(m_context, make_ref(m_gpuProgramManager), msg->AcceptRenderData());
+      break;
+    case CacheCirclesPackMessage::RoutePreview:
+      m_routeRenderer->AddPreviewRenderData(m_context, msg->AcceptRenderData(), make_ref(m_gpuProgramManager));
       break;
     }
+    break;
+  }
 
   case Message::Type::UpdateGpsTrackPoints:
-    {
-      ref_ptr<UpdateGpsTrackPointsMessage> msg = message;
-      m_gpsTrackRenderer->UpdatePoints(msg->GetPointsToAdd(), msg->GetPointsToRemove());
-      break;
-    }
+  {
+    ref_ptr<UpdateGpsTrackPointsMessage> msg = message;
+    m_gpsTrackRenderer->UpdatePoints(msg->GetPointsToAdd(), msg->GetPointsToRemove());
+    break;
+  }
 
   case Message::Type::ClearGpsTrackPoints:
-    {
-      m_gpsTrackRenderer->Clear();
-      break;
-    }
+  {
+    m_gpsTrackRenderer->Clear();
+    break;
+  }
 
   case Message::Type::BlockTapEvents:
-    {
-      ref_ptr<BlockTapEventsMessage> msg = message;
-      m_blockTapEvents = msg->NeedBlock();
-      break;
-    }
+  {
+    ref_ptr<BlockTapEventsMessage> msg = message;
+    m_blockTapEvents = msg->NeedBlock();
+    break;
+  }
 
   case Message::Type::SetKineticScrollEnabled:
-    {
-      ref_ptr<SetKineticScrollEnabledMessage> msg = message;
-      m_userEventStream.SetKineticScrollEnabled(msg->IsEnabled());
-      break;
-    }
+  {
+    ref_ptr<SetKineticScrollEnabledMessage> msg = message;
+    m_userEventStream.SetKineticScrollEnabled(msg->IsEnabled());
+    break;
+  }
 
   case Message::Type::OnEnterForeground:
-    {
-      ref_ptr<OnEnterForegroundMessage> msg = message;
-      m_myPositionController->OnEnterForeground(msg->GetTime());
-      break;
-    }
+  {
+    ref_ptr<OnEnterForegroundMessage> msg = message;
+    m_myPositionController->OnEnterForeground(msg->GetTime());
+    break;
+  }
 
-//  case Message::Type::OnEnterBackground:
-//    {
-//      m_myPositionController->OnEnterBackground();
-//      break;
-//    }
+    //  case Message::Type::OnEnterBackground:
+    //    {
+    //      m_myPositionController->OnEnterBackground();
+    //      break;
+    //    }
 
   case Message::Type::SetAddNewPlaceMode:
+  {
+    ref_ptr<SetAddNewPlaceModeMessage> msg = message;
+    m_userEventStream.SetKineticScrollEnabled(msg->IsKineticScrollEnabled());
+    m_dragBoundArea = msg->AcceptBoundArea();
+    if (msg->IsEnabled())
     {
-      ref_ptr<SetAddNewPlaceModeMessage> msg = message;
-      m_userEventStream.SetKineticScrollEnabled(msg->IsKineticScrollEnabled());
-      m_dragBoundArea = msg->AcceptBoundArea();
-      if (msg->IsEnabled())
+      auto const pt = msg->GetOptionalPosition();
+      if (pt || m_dragBoundArea.empty())
       {
-        auto const pt = msg->GetOptionalPosition();
-        if (pt || m_dragBoundArea.empty())
-        {
-            int zoom = kDoNotChangeZoom;
-            if (GetCurrentZoom() < scales::GetAddNewPlaceScale())
-              zoom = scales::GetAddNewPlaceScale();
-            AddUserEvent(make_unique_dp<SetCenterEvent>(pt ? *pt : m_userEventStream.GetCurrentScreen().GlobalRect().Center(),
-                                                      zoom, true /* isAnim */, false /* trackVisibleViewport */,
-                                                      nullptr /* parallelAnimCreator */));
-        }
-        else
-        {
-          PullToBoundArea(true /* randomPlace */, true /* applyZoom */);
-        }
+        int zoom = kDoNotChangeZoom;
+        if (GetCurrentZoom() < scales::GetAddNewPlaceScale())
+          zoom = scales::GetAddNewPlaceScale();
+        AddUserEvent(make_unique_dp<SetCenterEvent>(
+            pt ? *pt : m_userEventStream.GetCurrentScreen().GlobalRect().Center(), zoom, true /* isAnim */,
+            false /* trackVisibleViewport */, nullptr /* parallelAnimCreator */));
+      }
+      else
+      {
+        PullToBoundArea(true /* randomPlace */, true /* applyZoom */);
       }
-      break;
     }
+    break;
+  }
 
   case Message::Type::SetVisibleViewport:
-    {
-      ref_ptr<SetVisibleViewportMessage> msg = message;
-      AddUserEvent(make_unique_dp<SetVisibleViewportEvent>(msg->GetRect()));
-      m_myPositionController->SetVisibleViewport(msg->GetRect());
-      m_myPositionController->UpdatePosition();
-      PullToBoundArea(false /* randomPlace */, false /* applyZoom */);
-      break;
-    }
+  {
+    ref_ptr<SetVisibleViewportMessage> msg = message;
+    AddUserEvent(make_unique_dp<SetVisibleViewportEvent>(msg->GetRect()));
+    m_myPositionController->SetVisibleViewport(msg->GetRect());
+    m_myPositionController->UpdatePosition();
+    PullToBoundArea(false /* randomPlace */, false /* applyZoom */);
+    break;
+  }
 
   case Message::Type::Invalidate:
-    {
-      m_myPositionController->ResetRoutingNotFollowTimer();
-      m_myPositionController->ResetBlockAutoZoomTimer();
-      break;
-    }
+  {
+    m_myPositionController->ResetRoutingNotFollowTimer();
+    m_myPositionController->ResetBlockAutoZoomTimer();
+    break;
+  }
 
   case Message::Type::EnableTransitScheme:
-    {
-      ref_ptr<EnableTransitSchemeMessage > msg = message;
-      m_transitSchemeEnabled = msg->IsEnabled();
-      // Enabling anti aliasing destroys performance on some Android devices
-      // Jagged lines on subway lines are only visible on low density screens
-      // so we don't enable it here
-      if (!msg->IsEnabled())
-        m_transitSchemeRenderer->ClearContextDependentResources(make_ref(m_overlayTree));
-      break;
-    }
+  {
+    ref_ptr<EnableTransitSchemeMessage> msg = message;
+    m_transitSchemeEnabled = msg->IsEnabled();
+    // Enabling anti aliasing destroys performance on some Android devices
+    // Jagged lines on subway lines are only visible on low density screens
+    // so we don't enable it here
+    if (!msg->IsEnabled())
+      m_transitSchemeRenderer->ClearContextDependentResources(make_ref(m_overlayTree));
+    break;
+  }
 
   case Message::Type::ClearTransitSchemeData:
-    {
-      ref_ptr<ClearTransitSchemeDataMessage> msg = message;
-      m_transitSchemeRenderer->Clear(msg->GetMwmId(), make_ref(m_overlayTree));
-      break;
-    }
+  {
+    ref_ptr<ClearTransitSchemeDataMessage> msg = message;
+    m_transitSchemeRenderer->Clear(msg->GetMwmId(), make_ref(m_overlayTree));
+    break;
+  }
 
   case Message::Type::ClearAllTransitSchemeData:
-    {
-      m_transitSchemeRenderer->ClearContextDependentResources(make_ref(m_overlayTree));
-      break;
-    }
+  {
+    m_transitSchemeRenderer->ClearContextDependentResources(make_ref(m_overlayTree));
+    break;
+  }
 
   case Message::Type::EnableTraffic:
-    {
-      ref_ptr<EnableTrafficMessage> msg = message;
-      m_trafficEnabled = msg->IsTrafficEnabled();
-      if (msg->IsTrafficEnabled())
-        m_forceUpdateScene = true;
-      else
-        m_trafficRenderer->ClearContextDependentResources();
-      break;
-    }
+  {
+    ref_ptr<EnableTrafficMessage> msg = message;
+    m_trafficEnabled = msg->IsTrafficEnabled();
+    if (msg->IsTrafficEnabled())
+      m_forceUpdateScene = true;
+    else
+      m_trafficRenderer->ClearContextDependentResources();
+    break;
+  }
 
   case Message::Type::RegenerateTraffic:
   case Message::Type::SetSimplifiedTrafficColors:
   case Message::Type::UpdateMetalines:
   case Message::Type::EnableIsolines:
-    {
-      m_forceUpdateScene = true;
-      break;
-    }
+  {
+    m_forceUpdateScene = true;
+    break;
+  }
 
   case Message::Type::EnableDebugRectRendering:
-    {
-      ref_ptr<EnableDebugRectRenderingMessage> msg = message;
-      m_isDebugRectRenderingEnabled = msg->IsEnabled();
-      m_debugRectRenderer->SetEnabled(msg->IsEnabled());
-    }
-    break;
+  {
+    ref_ptr<EnableDebugRectRenderingMessage> msg = message;
+    m_isDebugRectRenderingEnabled = msg->IsEnabled();
+    m_debugRectRenderer->SetEnabled(msg->IsEnabled());
+  }
+  break;
 
   case Message::Type::InvalidateUserMarks:
-    {
-      m_forceUpdateUserMarks = true;
-      break;
-    }
+  {
+    m_forceUpdateUserMarks = true;
+    break;
+  }
 
   case Message::Type::FlushTrafficData:
-    {
-      if (!m_trafficEnabled)
-        break;
-      ref_ptr<FlushTrafficDataMessage> msg = message;
-      CHECK(m_context != nullptr, ());
-      m_trafficRenderer->AddRenderData(m_context, make_ref(m_gpuProgramManager),
-                                       msg->AcceptRenderData());
+  {
+    if (!m_trafficEnabled)
       break;
-    }
+    ref_ptr<FlushTrafficDataMessage> msg = message;
+    CHECK(m_context != nullptr, ());
+    m_trafficRenderer->AddRenderData(m_context, make_ref(m_gpuProgramManager), msg->AcceptRenderData());
+    break;
+  }
 
   case Message::Type::ClearTrafficData:
-    {
-      ref_ptr<ClearTrafficDataMessage> msg = message;
-      m_trafficRenderer->Clear(msg->GetMwmId());
-      break;
-    }
+  {
+    ref_ptr<ClearTrafficDataMessage> msg = message;
+    m_trafficRenderer->Clear(msg->GetMwmId());
+    break;
+  }
 
   case Message::Type::DrapeApiFlush:
-    {
-      ref_ptr<DrapeApiFlushMessage> msg = message;
-      CHECK(m_context != nullptr, ());
-      m_drapeApiRenderer->AddRenderProperties(m_context, make_ref(m_gpuProgramManager),
-                                              msg->AcceptProperties());
-      break;
-    }
+  {
+    ref_ptr<DrapeApiFlushMessage> msg = message;
+    CHECK(m_context != nullptr, ());
+    m_drapeApiRenderer->AddRenderProperties(m_context, make_ref(m_gpuProgramManager), msg->AcceptProperties());
+    break;
+  }
 
   case Message::Type::DrapeApiRemove:
-    {
-      ref_ptr<DrapeApiRemoveMessage> msg = message;
-      if (msg->NeedRemoveAll())
-        m_drapeApiRenderer->Clear();
-      else
-        m_drapeApiRenderer->RemoveRenderProperty(msg->GetId());
-      break;
-    }
+  {
+    ref_ptr<DrapeApiRemoveMessage> msg = message;
+    if (msg->NeedRemoveAll())
+      m_drapeApiRenderer->Clear();
+    else
+      m_drapeApiRenderer->RemoveRenderProperty(msg->GetId());
+    break;
+  }
 
   case Message::Type::SetTrackedFeatures:
-    {
-      ref_ptr<SetTrackedFeaturesMessage> msg = message;
-      m_overlaysTracker->SetTrackedOverlaysFeatures(msg->AcceptFeatures());
-      m_forceUpdateScene = true;
-      break;
-    }
+  {
+    ref_ptr<SetTrackedFeaturesMessage> msg = message;
+    m_overlaysTracker->SetTrackedOverlaysFeatures(msg->AcceptFeatures());
+    m_forceUpdateScene = true;
+    break;
+  }
 
   case Message::Type::SetPostprocessStaticTextures:
-    {
-      ref_ptr<SetPostprocessStaticTexturesMessage> msg = message;
-      m_postprocessRenderer->SetStaticTextures(msg->AcceptTextures());
-      break;
-    }
+  {
+    ref_ptr<SetPostprocessStaticTexturesMessage> msg = message;
+    m_postprocessRenderer->SetStaticTextures(msg->AcceptTextures());
+    break;
+  }
 
   case Message::Type::SetPosteffectEnabled:
-    {
-      ref_ptr<SetPosteffectEnabledMessage> msg = message;
-      // Enabling anti aliasing destroys performance on some Android devices
+  {
+    ref_ptr<SetPosteffectEnabledMessage> msg = message;
+    // Enabling anti aliasing destroys performance on some Android devices
 #ifndef OMIM_OS_IPHONE_SIMULATOR
-      CHECK(m_context != nullptr, ());
-      m_postprocessRenderer->SetEffectEnabled(m_context, msg->GetEffect(), msg->IsEnabled());
+    CHECK(m_context != nullptr, ());
+    m_postprocessRenderer->SetEffectEnabled(m_context, msg->GetEffect(), msg->IsEnabled());
 #endif
-      break;
-    }
+    break;
+  }
 
   case Message::Type::RunFirstLaunchAnimation:
-    {
-      ref_ptr<RunFirstLaunchAnimationMessage> msg = message;
-      m_firstLaunchAnimationTriggered = true;
-      CheckAndRunFirstLaunchAnimation();
-      break;
-    }
+  {
+    ref_ptr<RunFirstLaunchAnimationMessage> msg = message;
+    m_firstLaunchAnimationTriggered = true;
+    CheckAndRunFirstLaunchAnimation();
+    break;
+  }
 
   case Message::Type::PostUserEvent:
-    {
-      ref_ptr<PostUserEventMessage> msg = message;
-      AddUserEvent(msg->AcceptEvent());
-      break;
-    }
+  {
+    ref_ptr<PostUserEventMessage> msg = message;
+    AddUserEvent(msg->AcceptEvent());
+    break;
+  }
 
   case Message::Type::FinishTexturesInitialization:
-    {
-      ref_ptr<FinishTexturesInitializationMessage> msg = message;
-      m_finishTexturesInitialization = true;
-      break;
-    }
+  {
+    ref_ptr<FinishTexturesInitializationMessage> msg = message;
+    m_finishTexturesInitialization = true;
+    break;
+  }
 
   case Message::Type::CleanupTextures:
-    {
-      // Do nothing, just destroy message with textures.
-      break;
-    }
+  {
+    // Do nothing, just destroy message with textures.
+    break;
+  }
 
   case Message::Type::ShowDebugInfo:
-    {
-      ref_ptr<ShowDebugInfoMessage> msg = message;
-      gui::DrapeGui::Instance().GetScaleFpsHelper().SetVisible(msg->IsShown());
-      break;
-    }
+  {
+    ref_ptr<ShowDebugInfoMessage> msg = message;
+    gui::DrapeGui::Instance().GetScaleFpsHelper().SetVisible(msg->IsShown());
+    break;
+  }
 
   case Message::Type::NotifyRenderThread:
-    {
-      ref_ptr<NotifyRenderThreadMessage> msg = message;
-      msg->InvokeFunctor();
-      break;
-    }
+  {
+    ref_ptr<NotifyRenderThreadMessage> msg = message;
+    msg->InvokeFunctor();
+    break;
+  }
 
 #if defined(OMIM_OS_DESKTOP)
   case Message::Type::NotifyGraphicsReady:
+  {
+    ref_ptr<NotifyGraphicsReadyMessage> msg = message;
+    m_graphicsReadyFn = msg->GetCallback();
+    if (m_graphicsReadyFn)
     {
-      ref_ptr<NotifyGraphicsReadyMessage> msg = message;
-      m_graphicsReadyFn = msg->GetCallback();
-      if (m_graphicsReadyFn)
+      m_graphicsStage = GraphicsStage::WaitReady;
+      if (m_notFinishedTiles.empty())
       {
-        m_graphicsStage = GraphicsStage::WaitReady;
-        if (m_notFinishedTiles.empty())
-        {
-          if (msg->NeedInvalidate())
-            InvalidateRect(m_userEventStream.GetCurrentScreen().ClipRect());
-          else
-            m_graphicsStage = GraphicsStage::WaitRendering;
-        }
+        if (msg->NeedInvalidate())
+          InvalidateRect(m_userEventStream.GetCurrentScreen().ClipRect());
+        else
+          m_graphicsStage = GraphicsStage::WaitRendering;
       }
-      break;
     }
+    break;
+  }
 #endif
 
-  default:
-    ASSERT(false, ());
+  default: ASSERT(false, ());
   }
 }
 
@@ -1074,11 +1033,8 @@ void FrontendRenderer::UpdateContextDependentResources()
 
   for (auto const & subroute : m_routeRenderer->GetSubroutes())
   {
-    auto msg = make_unique_dp<AddSubrouteMessage>(subroute.m_subrouteId,
-                                                  subroute.m_subroute,
-                                                  m_lastRecacheRouteId);
-    m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread, std::move(msg),
-                              MessagePriority::Normal);
+    auto msg = make_unique_dp<AddSubrouteMessage>(subroute.m_subrouteId, subroute.m_subroute, m_lastRecacheRouteId);
+    m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread, std::move(msg), MessagePriority::Normal);
   }
 
   m_trafficRenderer->ClearContextDependentResources();
@@ -1088,26 +1044,22 @@ void FrontendRenderer::UpdateContextDependentResources()
     // Request new tiles.
     ScreenBase const & screen = m_userEventStream.GetCurrentScreen();
     m_lastReadedModelView = screen;
-    m_requestedTiles->Set(screen, m_isIsometry || screen.isPerspective(),
-                          m_forceUpdateScene, m_forceUpdateUserMarks,
+    m_requestedTiles->Set(screen, m_isIsometry || screen.isPerspective(), m_forceUpdateScene, m_forceUpdateUserMarks,
                           ResolveTileKeys(screen));
-    m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                              make_unique_dp<UpdateReadManagerMessage>(),
+    m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread, make_unique_dp<UpdateReadManagerMessage>(),
                               MessagePriority::UberHighSingleton);
-    m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                              make_unique_dp<RegenerateTransitMessage>(),
+    m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread, make_unique_dp<RegenerateTransitMessage>(),
                               MessagePriority::Normal);
   }
 
   m_gpsTrackRenderer->Update();
 }
 
-void FrontendRenderer::FollowRoute(int preferredZoomLevel, int preferredZoomLevelIn3d,
-                                   bool enableAutoZoom, bool isArrowGlued)
+void FrontendRenderer::FollowRoute(int preferredZoomLevel, int preferredZoomLevelIn3d, bool enableAutoZoom,
+                                   bool isArrowGlued)
 {
   m_myPositionController->ActivateRouting(
-      !m_enablePerspectiveInNavigation ? preferredZoomLevel : preferredZoomLevelIn3d,
-      enableAutoZoom, isArrowGlued);
+      !m_enablePerspectiveInNavigation ? preferredZoomLevel : preferredZoomLevelIn3d, enableAutoZoom, isArrowGlued);
 
   if (m_enablePerspectiveInNavigation)
     AddUserEvent(make_unique_dp<SetAutoPerspectiveEvent>(true /* isAutoPerspective */));
@@ -1140,9 +1092,7 @@ void FrontendRenderer::InvalidateRect(m2::RectD const & gRect)
 
     // Remove tiles to invalidate from screen.
     auto eraseFunction = [&tiles](drape_ptr<RenderGroup> const & group)
-    {
-      return tiles.find(group->GetTileKey()) != tiles.end();
-    };
+    { return tiles.find(group->GetTileKey()) != tiles.end(); };
     for (RenderLayer & layer : m_layers)
     {
       RemoveGroups(eraseFunction, layer.m_renderGroups, make_ref(m_overlayTree));
@@ -1152,17 +1102,14 @@ void FrontendRenderer::InvalidateRect(m2::RectD const & gRect)
     // Remove tiles to invalidate from backend renderer.
     BaseBlockingMessage::Blocker blocker;
     m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                              make_unique_dp<InvalidateReadManagerRectMessage>(blocker, tiles),
-                              MessagePriority::High);
+                              make_unique_dp<InvalidateReadManagerRectMessage>(blocker, tiles), MessagePriority::High);
     blocker.Wait();
 
     // Request new tiles.
     m_lastReadedModelView = screen;
-    m_requestedTiles->Set(screen, m_isIsometry || screen.isPerspective(),
-                          m_forceUpdateScene, m_forceUpdateUserMarks,
+    m_requestedTiles->Set(screen, m_isIsometry || screen.isPerspective(), m_forceUpdateScene, m_forceUpdateUserMarks,
                           ResolveTileKeys(screen));
-    m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                              make_unique_dp<UpdateReadManagerMessage>(),
+    m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread, make_unique_dp<UpdateReadManagerMessage>(),
                               MessagePriority::UberHighSingleton);
   }
 }
@@ -1193,9 +1140,8 @@ void FrontendRenderer::OnResize(ScreenBase const & screen)
   RefreshPivotTransform(screen);
 }
 
-template<typename TRenderGroup>
-void FrontendRenderer::AddToRenderGroup(dp::RenderState const & state,
-                                        drape_ptr<dp::RenderBucket> && renderBucket,
+template <typename TRenderGroup>
+void FrontendRenderer::AddToRenderGroup(dp::RenderState const & state, drape_ptr<dp::RenderBucket> && renderBucket,
                                         TileKey const & newTile)
 {
   RenderLayer & layer = m_layers[static_cast<size_t>(GetDepthLayer(state))];
@@ -1247,8 +1193,8 @@ bool FrontendRenderer::CheckTileGenerations(TileKey const & tileKey)
   {
     auto const & groupKey = group->GetTileKey();
     return groupKey == tileKey &&
-          (groupKey.m_generation < tileKey.m_generation ||
-          (group->IsUserMark() && groupKey.m_userMarksGeneration < tileKey.m_userMarksGeneration));
+           (groupKey.m_generation < tileKey.m_generation ||
+            (group->IsUserMark() && groupKey.m_userMarksGeneration < tileKey.m_userMarksGeneration));
   });
 
   return result;
@@ -1280,8 +1226,7 @@ std::pair<FeatureID, kml::MarkId> FrontendRenderer::GetVisiblePOI(m2::RectD cons
   auto selectionRect = pixelRect;
   constexpr double kTapRectFactor = 0.25;  // make tap rect size smaller for extended objects
   selectionRect.Scale(kTapRectFactor);
-  SearchInNonDisplaceableUserMarksLayer(screen, DepthLayer::SearchMarkLayer, selectionRect,
-                                        selectResult);
+  SearchInNonDisplaceableUserMarksLayer(screen, DepthLayer::SearchMarkLayer, selectionRect, selectResult);
 
   if (selectResult.empty())
     m_overlayTree->Select(pixelRect, selectResult);
@@ -1315,8 +1260,8 @@ void FrontendRenderer::PullToBoundArea(bool randomPlace, bool applyZoom)
   m2::PointD const center = screen.GlobalRect().Center();
   if (!m2::IsPointInsideTriangles(center, m_dragBoundArea))
   {
-    m2::PointD const dest = randomPlace ? m2::GetRandomPointInsideTriangles(m_dragBoundArea) :
-                                          m2::ProjectPointToTriangles(center, m_dragBoundArea);
+    m2::PointD const dest = randomPlace ? m2::GetRandomPointInsideTriangles(m_dragBoundArea)
+                                        : m2::ProjectPointToTriangles(center, m_dragBoundArea);
     int zoom = kDoNotChangeZoom;
     if (applyZoom && GetCurrentZoom() < scales::GetAddNewPlaceScale())
       zoom = scales::GetAddNewPlaceScale();
@@ -1332,9 +1277,8 @@ void FrontendRenderer::ProcessSelection(ref_ptr<SelectObjectMessage> msg)
     m_selectionShape->Hide();
     if (msg->ShouldRestoreViewport() && !m_myPositionController->IsModeChangeViewport() && m_selectionTrackInfo)
     {
-      AddUserEvent(make_unique_dp<SetAnyRectEvent>(m_selectionTrackInfo->m_startRect,
-                                                   true /* isAnim */, false /* fitInViewport */,
-                                                   false /* useVisibleViewport */));
+      AddUserEvent(make_unique_dp<SetAnyRectEvent>(m_selectionTrackInfo->m_startRect, true /* isAnim */,
+                                                   false /* fitInViewport */, false /* useVisibleViewport */));
     }
     m_selectionTrackInfo.reset();
   }
@@ -1367,10 +1311,10 @@ void FrontendRenderer::ProcessSelection(ref_ptr<SelectObjectMessage> msg)
 
     if (msg->IsGeometrySelectionAllowed())
     {
-      m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                                make_unique_dp<CheckSelectionGeometryMessage>(
-                                  msg->GetFeatureID(), m_selectionShape->GetRecacheId()),
-                                MessagePriority::Normal);
+      m_commutator->PostMessage(
+          ThreadsCommutator::ResourceUploadThread,
+          make_unique_dp<CheckSelectionGeometryMessage>(msg->GetFeatureID(), m_selectionShape->GetRecacheId()),
+          MessagePriority::Normal);
     }
   }
 }
@@ -1396,16 +1340,13 @@ void FrontendRenderer::EndUpdateOverlayTree()
     m_overlayTree->EndOverlayPlacing();
 
     // Track overlays.
-    if (m_overlaysTracker->StartTracking(GetCurrentZoom(),
-                                         m_myPositionController->IsModeHasPosition(),
+    if (m_overlaysTracker->StartTracking(GetCurrentZoom(), m_myPositionController->IsModeHasPosition(),
                                          m_myPositionController->GetDrawablePosition(),
                                          m_myPositionController->GetHorizontalAccuracy()))
     {
       for (auto const & handle : m_overlayTree->GetHandlesCache())
-      {
         if (handle->IsVisible())
           m_overlaysTracker->Track(handle->GetOverlayID().m_featureId);
-      }
       m_overlaysTracker->FinishTracking();
     }
   }
@@ -1467,13 +1408,11 @@ void FrontendRenderer::RenderScene(ScreenBase const & modelView, bool activeFram
       {
         ASSERT(m_myPositionController->IsModeHasPosition(), ());
         m_selectionShape->SetPosition(m_myPositionController->Position());
-        m_selectionShape->Render(m_context, make_ref(m_gpuProgramManager), modelView,
-                                 GetCurrentZoom(), m_frameValues);
+        m_selectionShape->Render(m_context, make_ref(m_gpuProgramManager), modelView, GetCurrentZoom(), m_frameValues);
       }
       else if (selectedObject == SelectionShape::OBJECT_POI)
       {
-        m_selectionShape->Render(m_context, make_ref(m_gpuProgramManager), modelView,
-                                 GetCurrentZoom(), m_frameValues);
+        m_selectionShape->Render(m_context, make_ref(m_gpuProgramManager), modelView, GetCurrentZoom(), m_frameValues);
       }
     }
 
@@ -1487,12 +1426,10 @@ void FrontendRenderer::RenderScene(ScreenBase const & modelView, bool activeFram
       m_gpsTrackRenderer->RenderTrack(m_context, make_ref(m_gpuProgramManager), modelView, GetCurrentZoom(),
                                       m_frameValues);
 
-      if (m_selectionShape &&
-          (m_selectionShape->GetSelectedObject() == SelectionShape::OBJECT_USER_MARK ||
-           m_selectionShape->GetSelectedObject() == SelectionShape::OBJECT_TRACK))
+      if (m_selectionShape && (m_selectionShape->GetSelectedObject() == SelectionShape::OBJECT_USER_MARK ||
+                               m_selectionShape->GetSelectedObject() == SelectionShape::OBJECT_TRACK))
       {
-        m_selectionShape->Render(m_context, make_ref(m_gpuProgramManager), modelView, GetCurrentZoom(),
-                                 m_frameValues);
+        m_selectionShape->Render(m_context, make_ref(m_gpuProgramManager), modelView, GetCurrentZoom(), m_frameValues);
       }
     }
 
@@ -1526,15 +1463,12 @@ void FrontendRenderer::RenderScene(ScreenBase const & modelView, bool activeFram
       clearBits |= dp::ClearBits::StencilBit;
     m_context->Clear(clearBits, dp::kClearBitsStoreAll);
 
-    m_myPositionController->Render(m_context, make_ref(m_gpuProgramManager), modelView,
-                                   GetCurrentZoom(), m_frameValues);
+    m_myPositionController->Render(m_context, make_ref(m_gpuProgramManager), modelView, GetCurrentZoom(),
+                                   m_frameValues);
   }
 
   if (m_guiRenderer && !m_screenshotMode)
-  {
-    m_guiRenderer->Render(m_context, make_ref(m_gpuProgramManager), m_myPositionController->IsInRouting(),
-                          modelView);
-  }
+    m_guiRenderer->Render(m_context, make_ref(m_gpuProgramManager), m_myPositionController->IsInRouting(), modelView);
 
 #if defined(OMIM_OS_DESKTOP)
   if (m_graphicsStage == GraphicsStage::WaitRendering)
@@ -1586,8 +1520,7 @@ void FrontendRenderer::Render3dLayer(ScreenBase const & modelView)
   if (m_buildingsFramebuffer->IsSupported())
   {
     float const kOpacity = 0.7f;
-    m_screenQuadRenderer->RenderTexture(m_context, make_ref(m_gpuProgramManager),
-                                        m_buildingsFramebuffer->GetTexture(),
+    m_screenQuadRenderer->RenderTexture(m_context, make_ref(m_gpuProgramManager), m_buildingsFramebuffer->GetTexture(),
                                         kOpacity);
   }
   else
@@ -1645,8 +1578,8 @@ void FrontendRenderer::RenderTrafficLayer(ScreenBase const & modelView)
   {
     DEBUG_LABEL(m_context, "Traffic Layer");
     m_context->Clear(dp::ClearBits::DepthBit, dp::kClearBitsStoreAll);
-    m_trafficRenderer->RenderTraffic(m_context, make_ref(m_gpuProgramManager), modelView,
-                                     GetCurrentZoom(), 1.0f /* opacity */, m_frameValues);
+    m_trafficRenderer->RenderTraffic(m_context, make_ref(m_gpuProgramManager), modelView, GetCurrentZoom(),
+                                     1.0f /* opacity */, m_frameValues);
   }
 }
 
@@ -1665,8 +1598,8 @@ void FrontendRenderer::RenderTransitBackground()
   if (!m_transitBackground->IsInitialized())
     m_transitBackground->SetTextureRect(m_context, region.GetTexRect());
 
-  m_transitBackground->RenderTexture(m_context, make_ref(m_gpuProgramManager),
-                                     region.GetTexture(), 1.0f /* opacity */, false /* invertV */);
+  m_transitBackground->RenderTexture(m_context, make_ref(m_gpuProgramManager), region.GetTexture(), 1.0f /* opacity */,
+                                     false /* invertV */);
 }
 
 void FrontendRenderer::RenderRouteLayer(ScreenBase const & modelView)
@@ -1702,8 +1635,7 @@ void FrontendRenderer::RenderUserMarksLayer(ScreenBase const & modelView, DepthL
     RenderSingleGroup(m_context, modelView, make_ref(group));
 }
 
-void FrontendRenderer::RenderNonDisplaceableUserMarksLayer(ScreenBase const & modelView,
-                                                           DepthLayer layerId)
+void FrontendRenderer::RenderNonDisplaceableUserMarksLayer(ScreenBase const & modelView, DepthLayer layerId)
 {
   TRACE_SECTION("[drape] RenderNonDisplaceableUserMarksLayer");
   auto & layer = m_layers[static_cast<size_t>(layerId)];
@@ -1834,10 +1766,9 @@ void FrontendRenderer::RenderFrame()
   }
   else
   {
-    auto const syncInverval = (m_apiVersion == dp::ApiVersion::Metal ||
-                               m_apiVersion == dp::ApiVersion::Vulkan)
-                              ? kVSyncIntervalMetalVulkan
-                              : kVSyncInterval;
+    auto const syncInverval = (m_apiVersion == dp::ApiVersion::Metal || m_apiVersion == dp::ApiVersion::Vulkan)
+                                ? kVSyncIntervalMetalVulkan
+                                : kVSyncInterval;
 
     double availableTime;
     do
@@ -1866,7 +1797,7 @@ void FrontendRenderer::RenderFrame()
 
   m_frameData.m_frameTime = m_frameData.m_timer.ElapsedSeconds();
   scaleFpsHelper.SetFrameTime(m_frameData.m_frameTime,
-    m_frameData.m_inactiveFramesCounter + 1 < FrameData::kMaxInactiveFrames);
+                              m_frameData.m_inactiveFramesCounter + 1 < FrameData::kMaxInactiveFrames);
 
   m_debugRectRenderer->FinishRendering();
 
@@ -1882,9 +1813,8 @@ void FrontendRenderer::BuildOverlayTree(ScreenBase const & modelView)
     return;
 
   BeginUpdateOverlayTree(modelView);
-  for (auto const layerId : {DepthLayer::OverlayLayer,
-                             DepthLayer::RoutingBottomMarkLayer,
-                             DepthLayer::RoutingMarkLayer})
+  for (auto const layerId :
+       {DepthLayer::OverlayLayer, DepthLayer::RoutingBottomMarkLayer, DepthLayer::RoutingMarkLayer})
   {
     RenderLayer & overlay = m_layers[static_cast<size_t>(layerId)];
     overlay.Sort(make_ref(m_overlayTree));
@@ -1900,20 +1830,19 @@ void FrontendRenderer::PrepareBucket(dp::RenderState const & state, drape_ptr<dp
 {
   CHECK(m_context != nullptr, ());
 
-  auto program = m_gpuProgramManager->GetProgram(m_userEventStream.GetCurrentScreen().isPerspective() ?
-          state.GetProgram3d<gpu::Program>() : state.GetProgram<gpu::Program>());
+  auto program = m_gpuProgramManager->GetProgram(m_userEventStream.GetCurrentScreen().isPerspective()
+                                                     ? state.GetProgram3d<gpu::Program>()
+                                                     : state.GetProgram<gpu::Program>());
 
   program->Bind();
   bucket->GetBuffer()->Build(m_context, program);
 }
 
-void FrontendRenderer::RenderSingleGroup(ref_ptr<dp::GraphicsContext> context,
-                                         ScreenBase const & modelView,
+void FrontendRenderer::RenderSingleGroup(ref_ptr<dp::GraphicsContext> context, ScreenBase const & modelView,
                                          ref_ptr<BaseRenderGroup> group)
 {
   group->UpdateAnimation();
-  group->Render(context, make_ref(m_gpuProgramManager), modelView, m_frameValues,
-                make_ref(m_debugRectRenderer));
+  group->Render(context, make_ref(m_gpuProgramManager), modelView, m_frameValues, make_ref(m_debugRectRenderer));
 }
 
 void FrontendRenderer::RefreshProjection(ScreenBase const & screen)
@@ -1955,8 +1884,7 @@ void FrontendRenderer::RefreshPivotTransform(ScreenBase const & screen)
 
 void FrontendRenderer::RefreshBgColor()
 {
-  auto const scale = std::min(df::GetDrawTileScale(m_userEventStream.GetCurrentScreen()),
-                              scales::GetUpperStyleScale());
+  auto const scale = std::min(df::GetDrawTileScale(m_userEventStream.GetCurrentScreen()), scales::GetUpperStyleScale());
   auto const c = dp::Color(drule::rules().GetBgColor(scale), 255);
 
   CHECK(m_context != nullptr, ());
@@ -2049,8 +1977,8 @@ void FrontendRenderer::OnDoubleTap(m2::PointD const & pt)
 void FrontendRenderer::OnTwoFingersTap()
 {
   ScreenBase const & screen = m_userEventStream.GetCurrentScreen();
-  m_userEventStream.AddEvent(make_unique_dp<ScaleEvent>(0.5 /* scale factor */, screen.PixelRect().Center(),
-                                                        true /* animated */));
+  m_userEventStream.AddEvent(
+      make_unique_dp<ScaleEvent>(0.5 /* scale factor */, screen.PixelRect().Center(), true /* animated */));
 }
 
 bool FrontendRenderer::OnSingleTouchFiltrate(m2::PointD const & pt, TouchEvent::ETouchType type)
@@ -2063,20 +1991,13 @@ bool FrontendRenderer::OnSingleTouchFiltrate(m2::PointD const & pt, TouchEvent::
   m2::RectD r(-rectHalfSize, -rectHalfSize, rectHalfSize, rectHalfSize);
   r.SetCenter(pt);
 
-  switch(type)
+  switch (type)
   {
-  case TouchEvent::ETouchType::TOUCH_DOWN:
-    return m_guiRenderer->OnTouchDown(r);
-  case TouchEvent::ETouchType::TOUCH_UP:
-    m_guiRenderer->OnTouchUp(r);
-    return false;
-  case TouchEvent::ETouchType::TOUCH_CANCEL:
-    m_guiRenderer->OnTouchCancel(r);
-    return false;
-  case TouchEvent::ETouchType::TOUCH_MOVE:
-    return false;
-  case TouchEvent::ETouchType::TOUCH_NONE:
-    UNREACHABLE();
+  case TouchEvent::ETouchType::TOUCH_DOWN: return m_guiRenderer->OnTouchDown(r);
+  case TouchEvent::ETouchType::TOUCH_UP: m_guiRenderer->OnTouchUp(r); return false;
+  case TouchEvent::ETouchType::TOUCH_CANCEL: m_guiRenderer->OnTouchCancel(r); return false;
+  case TouchEvent::ETouchType::TOUCH_MOVE: return false;
+  case TouchEvent::ETouchType::TOUCH_NONE: UNREACHABLE();
   }
 
   return false;
@@ -2160,8 +2081,8 @@ bool FrontendRenderer::OnNewVisibleViewport(m2::RectD const & oldViewport, m2::R
   }
 
   gOffset = m2::PointD(0, 0);
-  if (m_myPositionController->IsModeChangeViewport() || m_selectionShape == nullptr ||
-      oldViewport == newViewport || !m_selectionTrackInfo.has_value())
+  if (m_myPositionController->IsModeChangeViewport() || m_selectionShape == nullptr || oldViewport == newViewport ||
+      !m_selectionTrackInfo.has_value())
   {
     return false;
   }
@@ -2261,8 +2182,7 @@ TTilesCollection FrontendRenderer::ResolveTileKeys(ScreenBase const & screen)
   TTilesCollection tiles;
   /// @todo Introduce small_set class based on buffer_vector.
   buffer_vector<TileKey, 8> tilesToDelete;
-  auto const result = CalcTilesCoverage(rect, dataZoomLevel,
-                                  [this, &rect, &tiles, &tilesToDelete](int tileX, int tileY)
+  auto const result = CalcTilesCoverage(rect, dataZoomLevel, [this, &rect, &tiles, &tilesToDelete](int tileX, int tileY)
   {
     TileKey const key(tileX, tileY, GetCurrentZoom());
     if (rect.IsIntersect(key.GetGlobalRect()))
@@ -2281,17 +2201,14 @@ TTilesCollection FrontendRenderer::ResolveTileKeys(ScreenBase const & screen)
   {
     TileKey const & key = group->GetTileKey();
     return key.m_zoomLevel == GetCurrentZoom() &&
-           (key.m_x < result.m_minTileX || key.m_x >= result.m_maxTileX ||
-           key.m_y < result.m_minTileY || key.m_y >= result.m_maxTileY ||
-           base::IsExist(tilesToDelete, key));
+           (key.m_x < result.m_minTileX || key.m_x >= result.m_maxTileX || key.m_y < result.m_minTileY ||
+            key.m_y >= result.m_maxTileY || base::IsExist(tilesToDelete, key));
   };
   for (RenderLayer & layer : m_layers)
     layer.m_isDirty |= RemoveGroups(removePredicate, layer.m_renderGroups, make_ref(m_overlayTree));
 
   RemoveRenderGroupsLater([this](drape_ptr<RenderGroup> const & group)
-  {
-    return group->GetTileKey().m_zoomLevel != GetCurrentZoom();
-  });
+  { return group->GetTileKey().m_zoomLevel != GetCurrentZoom(); });
 
   m_trafficRenderer->OnUpdateViewport(result, GetCurrentZoom(), tilesToDelete);
 
@@ -2376,8 +2293,7 @@ void FrontendRenderer::OnContextCreate()
   dp::AlphaBlendingState::Apply(m_context);
 
   m_debugRectRenderer = make_unique_dp<DebugRectRenderer>(
-    m_context, m_gpuProgramManager->GetProgram(gpu::Program::DebugRect),
-    m_gpuProgramManager->GetParamsSetter());
+      m_context, m_gpuProgramManager->GetProgram(gpu::Program::DebugRect), m_gpuProgramManager->GetParamsSetter());
   m_debugRectRenderer->SetEnabled(m_isDebugRectRenderingEnabled);
 
   m_overlayTree->SetDebugRectRenderer(make_ref(m_debugRectRenderer));
@@ -2393,11 +2309,7 @@ void FrontendRenderer::OnContextCreate()
       return false;
     m_context->SetFramebuffer(nullptr /* default */);
     return true;
-  },
-  [this](ScreenBase const & modelView)
-  {
-    PreRender3dLayer(modelView);
-  });
+  }, [this](ScreenBase const & modelView) { PreRender3dLayer(modelView); });
 
 #ifndef OMIM_OS_IPHONE_SIMULATOR
   for (auto const & effect : m_enabledOnStartEffects)
@@ -2408,13 +2320,10 @@ void FrontendRenderer::OnContextCreate()
     m_postprocessRenderer->SetEffectEnabled(m_context, PostprocessRenderer::Antialiasing, true);
 #endif
 
-  m_buildingsFramebuffer = make_unique_dp<dp::Framebuffer>(dp::TextureFormat::RGBA8,
-                                                           true /* depthEnabled */,
-                                                           false /* stencilEnabled */);
+  m_buildingsFramebuffer =
+      make_unique_dp<dp::Framebuffer>(dp::TextureFormat::RGBA8, true /* depthEnabled */, false /* stencilEnabled */);
   m_buildingsFramebuffer->SetFramebufferFallback([this]()
-  {
-    return m_postprocessRenderer->OnFramebufferFallback(m_context);
-  });
+  { return m_postprocessRenderer->OnFramebufferFallback(m_context); });
 
   m_transitBackground = make_unique_dp<ScreenQuadRenderer>(m_context);
 }
@@ -2454,8 +2363,8 @@ void FrontendRenderer::Routine::Do()
   m_renderer.ScheduleOverlayCollecting();
 
 #ifdef SHOW_FRAMES_STATS
-  m_renderer.m_notifier->Notify(ThreadsCommutator::RenderThread, std::chrono::seconds(5),
-                                true /* repeating */, [this](uint64_t)
+  m_renderer.m_notifier->Notify(ThreadsCommutator::RenderThread, std::chrono::seconds(5), true /* repeating */,
+                                [this](uint64_t)
   {
     LOG(LINFO, ("framesOverall =", m_renderer.m_frameData.m_framesOverall,
                 "framesFast =", m_renderer.m_frameData.m_framesFast));
@@ -2467,8 +2376,8 @@ void FrontendRenderer::Routine::Do()
 
 #ifndef DRAPE_MEASURER_BENCHMARK
   DrapeMeasurer::Instance().SetApiVersion(m_renderer.m_apiVersion);
-  DrapeMeasurer::Instance().SetResolution(m2::PointU(m_renderer.m_viewport.GetWidth(),
-                                                     m_renderer.m_viewport.GetHeight()));
+  DrapeMeasurer::Instance().SetResolution(
+      m2::PointU(m_renderer.m_viewport.GetWidth(), m_renderer.m_viewport.GetHeight()));
   DrapeMeasurer::Instance().SetGpuName(m_renderer.m_context->GetRendererName());
   DrapeMeasurer::Instance().Start();
 #endif
@@ -2524,31 +2433,27 @@ void FrontendRenderer::PositionChanged(m2::PointD const & position, bool hasPosi
 void FrontendRenderer::ChangeModelView(m2::PointD const & center, int zoomLevel,
                                        TAnimationCreator const & parallelAnimCreator)
 {
-  AddUserEvent(make_unique_dp<SetCenterEvent>(center, zoomLevel, true /* isAnim */,
-                                              false /* trackVisibleViewport */,
+  AddUserEvent(make_unique_dp<SetCenterEvent>(center, zoomLevel, true /* isAnim */, false /* trackVisibleViewport */,
                                               parallelAnimCreator));
 }
 
-void FrontendRenderer::ChangeModelView(double azimuth,
-                                       TAnimationCreator const & parallelAnimCreator)
+void FrontendRenderer::ChangeModelView(double azimuth, TAnimationCreator const & parallelAnimCreator)
 {
   AddUserEvent(make_unique_dp<RotateEvent>(azimuth, true /* isAnim */, parallelAnimCreator));
 }
 
-void FrontendRenderer::ChangeModelView(m2::RectD const & rect,
-                                       TAnimationCreator const & parallelAnimCreator)
+void FrontendRenderer::ChangeModelView(m2::RectD const & rect, TAnimationCreator const & parallelAnimCreator)
 {
   AddUserEvent(make_unique_dp<SetRectEvent>(rect, true /* rotate */, kDoNotChangeZoom, true /* isAnim */,
                                             false /* useVisibleViewport */, parallelAnimCreator));
 }
 
-void FrontendRenderer::ChangeModelView(m2::PointD const & userPos, double azimuth,
-                                       m2::PointD const & pxZero, int preferredZoomLevel,
-                                       Animation::TAction const & onFinishAction,
+void FrontendRenderer::ChangeModelView(m2::PointD const & userPos, double azimuth, m2::PointD const & pxZero,
+                                       int preferredZoomLevel, Animation::TAction const & onFinishAction,
                                        TAnimationCreator const & parallelAnimCreator)
 {
-  AddUserEvent(make_unique_dp<FollowAndRotateEvent>(userPos, pxZero, azimuth, preferredZoomLevel,
-                                                    true, onFinishAction, parallelAnimCreator));
+  AddUserEvent(make_unique_dp<FollowAndRotateEvent>(userPos, pxZero, azimuth, preferredZoomLevel, true, onFinishAction,
+                                                    parallelAnimCreator));
 }
 
 void FrontendRenderer::ChangeModelView(double autoScale, m2::PointD const & userPos, double azimuth,
@@ -2562,12 +2467,11 @@ void FrontendRenderer::OnEnterBackground()
   m_myPositionController->OnEnterBackground();
 }
 
-ScreenBase const & FrontendRenderer::ProcessEvents(bool & modelViewChanged, bool & viewportChanged, 
+ScreenBase const & FrontendRenderer::ProcessEvents(bool & modelViewChanged, bool & viewportChanged,
                                                    bool & needActiveFrame)
 {
   TRACE_SECTION("[drape] ProcessEvents");
-  ScreenBase const & modelView = m_userEventStream.ProcessEvents(modelViewChanged, viewportChanged, 
-                                                                 needActiveFrame);
+  ScreenBase const & modelView = m_userEventStream.ProcessEvents(modelViewChanged, viewportChanged, needActiveFrame);
   gui::DrapeGui::Instance().SetInUserAction(m_userEventStream.IsInUserAction());
 
   // Location- or compass-update could have changed model view on the previous frame.
@@ -2602,8 +2506,7 @@ void FrontendRenderer::UpdateScene(ScreenBase const & modelView)
 
     return (GetDepthLayer(group->GetState()) == DepthLayer::OverlayLayer && key.m_zoomLevel > GetCurrentZoom()) ||
            (m_maxGeneration - key.m_generation > kMaxGenerationRange) ||
-           (group->IsUserMark() &&
-            (m_maxUserMarksGeneration - key.m_userMarksGeneration > kMaxGenerationRange));
+           (group->IsUserMark() && (m_maxUserMarksGeneration - key.m_userMarksGeneration > kMaxGenerationRange));
   };
   for (RenderLayer & layer : m_layers)
     layer.m_isDirty |= RemoveGroups(removePredicate, layer.m_renderGroups, make_ref(m_overlayTree));
@@ -2612,11 +2515,9 @@ void FrontendRenderer::UpdateScene(ScreenBase const & modelView)
   {
     EmitModelViewChanged(modelView);
     m_lastReadedModelView = modelView;
-    m_requestedTiles->Set(modelView, m_isIsometry || modelView.isPerspective(),
-                          m_forceUpdateScene, m_forceUpdateUserMarks,
-                          ResolveTileKeys(modelView));
-    m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                              make_unique_dp<UpdateReadManagerMessage>(),
+    m_requestedTiles->Set(modelView, m_isIsometry || modelView.isPerspective(), m_forceUpdateScene,
+                          m_forceUpdateUserMarks, ResolveTileKeys(modelView));
+    m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread, make_unique_dp<UpdateReadManagerMessage>(),
                               MessagePriority::UberHighSingleton);
     m_forceUpdateScene = false;
     m_forceUpdateUserMarks = false;
@@ -2663,11 +2564,8 @@ void FrontendRenderer::CollectShowOverlaysEvents()
 
 void FrontendRenderer::CheckAndRunFirstLaunchAnimation()
 {
-  if (!m_firstTilesReady || m_firstLaunchAnimationInterrupted ||
-      !m_myPositionController->IsModeHasPosition())
-  {
+  if (!m_firstTilesReady || m_firstLaunchAnimationInterrupted || !m_myPositionController->IsModeHasPosition())
     return;
-  }
 
   int constexpr kDesiredZoomLevel = 13;
   m2::PointD const pos = m_myPositionController->GetDrawablePosition();
@@ -2678,16 +2576,14 @@ void FrontendRenderer::CheckAndRunFirstLaunchAnimation()
 void FrontendRenderer::ScheduleOverlayCollecting()
 {
   auto const kCollectingEventsPeriod = std::chrono::seconds(10);
-  m_notifier->Notify(ThreadsCommutator::RenderThread, kCollectingEventsPeriod,
-                     true /* repeating */, [this](uint64_t)
+  m_notifier->Notify(ThreadsCommutator::RenderThread, kCollectingEventsPeriod, true /* repeating */, [this](uint64_t)
   {
     if (m_overlaysTracker->IsValid())
       CollectShowOverlaysEvents();
   });
 }
 
-void FrontendRenderer::SearchInNonDisplaceableUserMarksLayer(ScreenBase const & modelView,
-                                                             DepthLayer layerId,
+void FrontendRenderer::SearchInNonDisplaceableUserMarksLayer(ScreenBase const & modelView, DepthLayer layerId,
                                                              m2::RectD const & selectionRect,
                                                              dp::TOverlayContainer & result)
 {
@@ -2698,19 +2594,19 @@ void FrontendRenderer::SearchInNonDisplaceableUserMarksLayer(ScreenBase const &
     group->SetOverlayVisibility(true);
     group->Update(modelView);
     group->ForEachOverlay(
-      [&modelView, &result, selectionRect = m2::RectF(selectionRect)](ref_ptr<dp::OverlayHandle> const & h)
+        [&modelView, &result, selectionRect = m2::RectF(selectionRect)](ref_ptr<dp::OverlayHandle> const & h)
+    {
+      dp::OverlayHandle::Rects shapes;
+      h->GetPixelShape(modelView, modelView.isPerspective(), shapes);
+      for (m2::RectF const & shape : shapes)
       {
-        dp::OverlayHandle::Rects shapes;
-        h->GetPixelShape(modelView, modelView.isPerspective(), shapes);
-        for (m2::RectF const & shape : shapes)
+        if (selectionRect.IsIntersect(shape))
         {
-          if (selectionRect.IsIntersect(shape))
-          {
-            result.push_back(h);
-            break;
-          }
+          result.push_back(h);
+          break;
         }
-      });
+      }
+    });
   }
 }
 
@@ -2750,8 +2646,7 @@ m2::AnyRectD TapInfo::GetBookmarkTapRect(m2::PointD const & mercator, ScreenBase
   double const halfSize = VisualParams::Instance().GetTouchRectRadius();
   double const pxWidth = halfSize;
   double const pxHeight = halfSize + bmAddition;
-  screen.GetTouchRect(screen.GtoP(mercator) + m2::PointD(0, bmAddition),
-                      pxWidth, pxHeight, result);
+  screen.GetTouchRect(screen.GtoP(mercator) + m2::PointD(0, bmAddition), pxWidth, pxHeight, result);
   return result;
 }
 
diff --git a/libs/drape_frontend/frontend_renderer.hpp b/libs/drape_frontend/frontend_renderer.hpp
old mode 100755
new mode 100644
index 3108f89b0..b2070f155
--- a/libs/drape_frontend/frontend_renderer.hpp
+++ b/libs/drape_frontend/frontend_renderer.hpp
@@ -7,11 +7,11 @@
 #include "drape_frontend/gui/layer_render.hpp"
 #include "drape_frontend/my_position_controller.hpp"
 #include "drape_frontend/overlays_tracker.hpp"
+#include "drape_frontend/postprocess_renderer.hpp"
 #include "drape_frontend/render_group.hpp"
 #include "drape_frontend/render_state_extension.hpp"
 #include "drape_frontend/requested_tiles.hpp"
 #include "drape_frontend/route_renderer.hpp"
-#include "drape_frontend/postprocess_renderer.hpp"
 #include "drape_frontend/threads_commutator.hpp"
 #include "drape_frontend/traffic_renderer.hpp"
 #include "drape_frontend/transit_scheme_renderer.hpp"
@@ -74,9 +74,10 @@ struct TapInfo
  * Each RenderLayer contains several RenderGroups, one per each tile and RenderState.
  * Each RenderGroup contains several RenderBuckets holding VertexArrayBuffers and optional OverlayHandles.
  */
-class FrontendRenderer : public BaseRenderer,
-                         public MyPositionController::Listener,
-                         public UserEventStream::Listener
+class FrontendRenderer
+  : public BaseRenderer
+  , public MyPositionController::Listener
+  , public UserEventStream::Listener
 {
 public:
   using ModelViewChangedHandler = std::function<void(ScreenBase const & screen)>;
@@ -90,13 +91,11 @@ public:
            ref_ptr<dp::GraphicsContextFactory> factory, ref_ptr<dp::TextureManager> texMng,
            MyPositionController::Params && myPositionParams, dp::Viewport viewport,
            ModelViewChangedHandler && modelViewChangedHandler, TapEventInfoHandler && tapEventHandler,
-           UserPositionChangedHandler && positionChangedHandler,
-           ref_ptr<RequestedTiles> requestedTiles,
-           OverlaysShowStatsCallback && overlaysShowStatsCallback,
-           bool allow3dBuildings, bool trafficEnabled, bool blockTapEvents,
-           std::vector<PostprocessRenderer::Effect> && enabledEffects,
+           UserPositionChangedHandler && positionChangedHandler, ref_ptr<RequestedTiles> requestedTiles,
+           OverlaysShowStatsCallback && overlaysShowStatsCallback, bool allow3dBuildings, bool trafficEnabled,
+           bool blockTapEvents, std::vector<PostprocessRenderer::Effect> && enabledEffects,
            OnGraphicsContextInitialized const & onGraphicsContextInitialized,
-           dp::RenderInjectionHandler&& renderInjectionHandler)
+           dp::RenderInjectionHandler && renderInjectionHandler)
       : BaseRenderer::Params(apiVersion, commutator, factory, texMng, onGraphicsContextInitialized)
       , m_myPositionParams(std::move(myPositionParams))
       , m_viewport(viewport)
@@ -138,13 +137,12 @@ public:
   void ChangeModelView(m2::PointD const & center, int zoomLevel,
                        TAnimationCreator const & parallelAnimCreator) override;
   void ChangeModelView(double azimuth, TAnimationCreator const & parallelAnimCreator) override;
-  void ChangeModelView(m2::RectD const & rect,
+  void ChangeModelView(m2::RectD const & rect, TAnimationCreator const & parallelAnimCreator) override;
+  void ChangeModelView(m2::PointD const & userPos, double azimuth, m2::PointD const & pxZero, int preferredZoomLevel,
+                       Animation::TAction const & onFinishAction,
                        TAnimationCreator const & parallelAnimCreator) override;
-  void ChangeModelView(m2::PointD const & userPos, double azimuth, m2::PointD const & pxZero,
-                       int preferredZoomLevel, Animation::TAction const & onFinishAction,
+  void ChangeModelView(double autoScale, m2::PointD const & userPos, double azimuth, m2::PointD const & pxZero,
                        TAnimationCreator const & parallelAnimCreator) override;
-  void ChangeModelView(double autoScale, m2::PointD const & userPos, double azimuth,
-                       m2::PointD const & pxZero, TAnimationCreator const & parallelAnimCreator) override;
 
   drape_ptr<ScenarioManager> const & GetScenarioManager() const { return m_scenarioManager; }
   location::EMyPositionMode GetMyPositionMode() const { return m_myPositionController->GetCurrentMode(); }
@@ -197,8 +195,7 @@ private:
   bool HasTransitRouteData() const;
   bool HasRouteData() const;
 
-  ScreenBase const & ProcessEvents(bool & modelViewChanged, bool & viewportChanged, 
-                                   bool & needActiveFrame);
+  ScreenBase const & ProcessEvents(bool & modelViewChanged, bool & viewportChanged, bool & needActiveFrame);
   void PrepareScene(ScreenBase const & modelView);
   void UpdateScene(ScreenBase const & modelView);
   void BuildOverlayTree(ScreenBase const & modelView);
@@ -233,8 +230,8 @@ private:
   void OnScaleEnded() override;
   void OnAnimatedScaleEnded() override;
   void OnTouchMapAction(TouchEvent::ETouchType touchType, bool isMapTouch) override;
-  bool OnNewVisibleViewport(m2::RectD const & oldViewport, m2::RectD const & newViewport,
-                            bool needOffset, m2::PointD & gOffset) override;
+  bool OnNewVisibleViewport(m2::RectD const & oldViewport, m2::RectD const & newViewport, bool needOffset,
+                            m2::PointD & gOffset) override;
 
   class Routine : public threads::IRoutine
   {
@@ -253,15 +250,14 @@ private:
   void UpdateOverlayTree(ScreenBase const & modelView, drape_ptr<RenderGroup> & renderGroup);
   void EndUpdateOverlayTree();
 
-  template<typename TRenderGroup>
+  template <typename TRenderGroup>
   void AddToRenderGroup(dp::RenderState const & state, drape_ptr<dp::RenderBucket> && renderBucket,
                         TileKey const & newTile);
 
   using TRenderGroupRemovePredicate = std::function<bool(drape_ptr<RenderGroup> const &)>;
   void RemoveRenderGroupsLater(TRenderGroupRemovePredicate const & predicate);
 
-  void FollowRoute(int preferredZoomLevel, int preferredZoomLevelIn3d, bool enableAutoZoom,
-                   bool isArrowGlued);
+  void FollowRoute(int preferredZoomLevel, int preferredZoomLevelIn3d, bool enableAutoZoom, bool isArrowGlued);
 
   bool CheckRouteRecaching(ref_ptr<BaseSubrouteData> subrouteData);
 
@@ -288,8 +284,7 @@ private:
   void ScheduleOverlayCollecting();
 
   void SearchInNonDisplaceableUserMarksLayer(ScreenBase const & modelView, DepthLayer layerId,
-                                             m2::RectD const & selectionRect,
-                                             dp::TOverlayContainer & result);
+                                             m2::RectD const & selectionRect, dp::TOverlayContainer & result);
 
   drape_ptr<gpu::ProgramManager> m_gpuProgramManager;
 
@@ -373,8 +368,7 @@ private:
 
   struct FollowRouteData
   {
-    FollowRouteData(int preferredZoomLevel, int preferredZoomLevelIn3d, bool enableAutoZoom,
-                    bool isArrowGlued)
+    FollowRouteData(int preferredZoomLevel, int preferredZoomLevelIn3d, bool enableAutoZoom, bool isArrowGlued)
       : m_preferredZoomLevel(preferredZoomLevel)
       , m_preferredZoomLevelIn3d(preferredZoomLevelIn3d)
       , m_enableAutoZoom(enableAutoZoom)
diff --git a/libs/drape_frontend/gps_track_renderer.cpp b/libs/drape_frontend/gps_track_renderer.cpp
index 882886dfb..e51889d67 100644
--- a/libs/drape_frontend/gps_track_renderer.cpp
+++ b/libs/drape_frontend/gps_track_renderer.cpp
@@ -27,21 +27,19 @@ int const kMinVisibleZoomLevel = 5;
 uint32_t const kAveragePointsCount = 512;
 
 // Radius of circles depending on zoom levels.
-std::array<float, 20> const kRadiusInPixel =
-{
-  // 1   2     3     4     5     6     7     8     9     10
-  0.8f, 0.8f, 1.5f, 2.5f, 2.5f, 2.5f, 2.5f, 2.5f, 2.5f, 2.5f,
-  //11   12    13    14    15    16    17    18    19     20
-  2.5f, 2.5f, 2.5f, 2.5f, 3.0f, 4.0f, 4.5f, 4.5f, 5.0f, 5.5f
-};
+std::array<float, 20> const kRadiusInPixel = {
+    // 1   2     3     4     5     6     7     8     9     10
+    0.8f, 0.8f, 1.5f, 2.5f, 2.5f, 2.5f, 2.5f, 2.5f, 2.5f, 2.5f,
+    // 11   12    13    14    15    16    17    18    19     20
+    2.5f, 2.5f, 2.5f, 2.5f, 3.0f, 4.0f, 4.5f, 4.5f, 5.0f, 5.5f};
 
-double const kHumanSpeed = 2.6; // meters per second
-double const kCarSpeed = 6.2; // meters per second
+double const kHumanSpeed = 2.6;  // meters per second
+double const kCarSpeed = 6.2;    // meters per second
 uint8_t const kMinDayAlpha = 90;
 uint8_t const kMaxDayAlpha = 144;
 uint8_t const kMinNightAlpha = 50;
 uint8_t const kMaxNightAlpha = 102;
-double const kUnknownDistanceTime = 5 * 60; // seconds
+double const kUnknownDistanceTime = 5 * 60;  // seconds
 
 double const kDistanceScalar = 0.4;
 
@@ -51,7 +49,7 @@ bool GpsPointsSortPredicate(GpsTrackPoint const & pt1, GpsTrackPoint const & pt2
   return pt1.m_id < pt2.m_id;
 }
 #endif
-} // namespace
+}  // namespace
 
 GpsTrackRenderer::GpsTrackRenderer(TRenderDataRequestFn const & dataRequestFn)
   : m_dataRequestFn(dataRequestFn)
@@ -64,8 +62,7 @@ GpsTrackRenderer::GpsTrackRenderer(TRenderDataRequestFn const & dataRequestFn)
   m_handlesCache.reserve(8);
 }
 
-void GpsTrackRenderer::AddRenderData(ref_ptr<dp::GraphicsContext> context,
-                                     ref_ptr<gpu::ProgramManager> mng,
+void GpsTrackRenderer::AddRenderData(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
                                      drape_ptr<CirclesPackRenderData> && renderData)
 {
   drape_ptr<CirclesPackRenderData> data = std::move(renderData);
@@ -84,19 +81,15 @@ void GpsTrackRenderer::ClearRenderData()
   m_needUpdate = true;
 }
 
-void GpsTrackRenderer::UpdatePoints(std::vector<GpsTrackPoint> const & toAdd,
-                                    std::vector<uint32_t> const & toRemove)
+void GpsTrackRenderer::UpdatePoints(std::vector<GpsTrackPoint> const & toAdd, std::vector<uint32_t> const & toRemove)
 {
   bool recreateSpline = false;
   if (!toRemove.empty())
   {
     size_t const szBefore = m_points.size();
-    base::EraseIf(m_points, [&toRemove](GpsTrackPoint const & pt)
-    {
-      return base::IsExist(toRemove, pt.m_id);
-    });
+    base::EraseIf(m_points, [&toRemove](GpsTrackPoint const & pt) { return base::IsExist(toRemove, pt.m_id); });
 
-    if (szBefore > m_points.size())   // if removed any
+    if (szBefore > m_points.size())  // if removed any
     {
       recreateSpline = true;
       m_needUpdate = true;
@@ -111,13 +104,13 @@ void GpsTrackRenderer::UpdatePoints(std::vector<GpsTrackPoint> const & toAdd,
     m_needUpdate = true;
   }
 
-  if (recreateSpline)   // Recreate Spline only if Remove (Clear) was invoked.
+  if (recreateSpline)  // Recreate Spline only if Remove (Clear) was invoked.
   {
     m_pointsSpline = m2::Spline(m_points.size());
     for (auto const & p : m_points)
       m_pointsSpline.AddPoint(p.m_point);
   }
-  else                  // Simple append points otherwise.
+  else  // Simple append points otherwise.
   {
     for (auto const & p : toAdd)
       m_pointsSpline.AddPoint(p.m_point);
@@ -133,8 +126,8 @@ size_t GpsTrackRenderer::GetAvailablePointsCount() const
   return pointsCount;
 }
 
-dp::Color GpsTrackRenderer::CalculatePointColor(size_t pointIndex, m2::PointD const & curPoint,
-                                                double lengthFromStart, double fullLength) const
+dp::Color GpsTrackRenderer::CalculatePointColor(size_t pointIndex, m2::PointD const & curPoint, double lengthFromStart,
+                                                double fullLength) const
 {
   ASSERT_LESS(pointIndex, m_points.size(), ());
   if (pointIndex + 1 == m_points.size())
@@ -158,8 +151,7 @@ dp::Color GpsTrackRenderer::CalculatePointColor(size_t pointIndex, m2::PointD co
   if ((end.m_timestamp - start.m_timestamp) > kUnknownDistanceTime)
   {
     dp::Color const color = df::GetColorConstant(df::kTrackUnknownDistanceColor);
-    return dp::Color(color.GetRed(), color.GetGreen(), color.GetBlue(),
-                     static_cast<uint8_t>(alpha));
+    return dp::Color(color.GetRed(), color.GetGreen(), color.GetBlue(), static_cast<uint8_t>(alpha));
   }
 
   double const length = (end.m_point - start.m_point).Length();
@@ -168,8 +160,7 @@ dp::Color GpsTrackRenderer::CalculatePointColor(size_t pointIndex, m2::PointD co
 
   double const speed = std::max(start.m_speedMPS * (1.0 - td) + end.m_speedMPS * td, 0.0);
   dp::Color const color = GetColorBySpeed(speed);
-  return dp::Color(color.GetRed(), color.GetGreen(), color.GetBlue(),
-                   static_cast<uint8_t>(alpha));
+  return dp::Color(color.GetRed(), color.GetGreen(), color.GetBlue(), static_cast<uint8_t>(alpha));
 }
 
 dp::Color GpsTrackRenderer::GetColorBySpeed(double speed) const
@@ -244,14 +235,12 @@ void GpsTrackRenderer::RenderTrack(ref_ptr<dp::GraphicsContext> context, ref_ptr
       while (!it.BeginAgain())
       {
         m2::PointD const pt = it.m_pos;
-        m2::RectD pointRect(pt.x - radiusMercator, pt.y - radiusMercator,
-                            pt.x + radiusMercator, pt.y + radiusMercator);
+        m2::RectD pointRect(pt.x - radiusMercator, pt.y - radiusMercator, pt.x + radiusMercator, pt.y + radiusMercator);
         if (screen.ClipRect().IsIntersect(pointRect))
         {
           dp::Color const color = CalculatePointColor(it.GetIndex(), pt, lengthFromStart, fullLength);
           m2::PointD const convertedPt = MapShape::ConvertToLocal(pt, m_pivot, kShapeCoordScalar);
-          m_handlesCache[cacheIndex].first->SetPoint(m_handlesCache[cacheIndex].second,
-                                                     convertedPt, m_radius, color);
+          m_handlesCache[cacheIndex].first->SetPoint(m_handlesCache[cacheIndex].second, convertedPt, m_radius, color);
           m_handlesCache[cacheIndex].second++;
           if (m_handlesCache[cacheIndex].second >= m_handlesCache[cacheIndex].first->GetPointsCount())
             cacheIndex++;
@@ -271,8 +260,8 @@ void GpsTrackRenderer::RenderTrack(ref_ptr<dp::GraphicsContext> context, ref_ptr
       for (size_t i = 0; i < m_points.size(); i++)
       {
         m2::PointD const convertedPt = MapShape::ConvertToLocal(m_points[i].m_point, m_pivot, kShapeCoordScalar);
-        m_handlesCache[cacheIndex].first->SetPoint(m_handlesCache[cacheIndex].second, convertedPt,
-                                                   m_radius * 1.2, dp::Color(0, 0, 255, 255));
+        m_handlesCache[cacheIndex].first->SetPoint(m_handlesCache[cacheIndex].second, convertedPt, m_radius * 1.2,
+                                                   dp::Color(0, 0, 255, 255));
         m_handlesCache[cacheIndex].second++;
         if (m_handlesCache[cacheIndex].second >= m_handlesCache[cacheIndex].first->GetPointsCount())
           cacheIndex++;
@@ -308,10 +297,8 @@ void GpsTrackRenderer::RenderTrack(ref_ptr<dp::GraphicsContext> context, ref_ptr
   mng->GetParamsSetter()->Apply(context, program, params);
 
   for (size_t i = 0; i < m_renderData.size(); i++)
-  {
     if (m_handlesCache[i].second != 0)
       m_renderData[i]->m_bucket->Render(context, state.GetDrawAsLine());
-  }
 }
 
 void GpsTrackRenderer::Update()
diff --git a/libs/drape_frontend/gps_track_renderer.hpp b/libs/drape_frontend/gps_track_renderer.hpp
index 4b776c3a2..2eaa775a5 100644
--- a/libs/drape_frontend/gps_track_renderer.hpp
+++ b/libs/drape_frontend/gps_track_renderer.hpp
@@ -27,11 +27,10 @@ public:
   void AddRenderData(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
                      drape_ptr<CirclesPackRenderData> && renderData);
 
-  void UpdatePoints(std::vector<GpsTrackPoint> const & toAdd,
-                    std::vector<uint32_t> const & toRemove);
+  void UpdatePoints(std::vector<GpsTrackPoint> const & toAdd, std::vector<uint32_t> const & toRemove);
 
-  void RenderTrack(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
-                   ScreenBase const & screen, int zoomLevel, FrameValues const & frameValues);
+  void RenderTrack(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng, ScreenBase const & screen,
+                   int zoomLevel, FrameValues const & frameValues);
 
   void Update();
   void Clear();
@@ -39,8 +38,8 @@ public:
 
 private:
   size_t GetAvailablePointsCount() const;
-  dp::Color CalculatePointColor(size_t pointIndex, m2::PointD const & curPoint,
-                                double lengthFromStart, double fullLength) const;
+  dp::Color CalculatePointColor(size_t pointIndex, m2::PointD const & curPoint, double lengthFromStart,
+                                double fullLength) const;
   dp::Color GetColorBySpeed(double speed) const;
 
   TRenderDataRequestFn m_dataRequestFn;
diff --git a/libs/drape_frontend/gui/choose_position_mark.cpp b/libs/drape_frontend/gui/choose_position_mark.cpp
index 6047d880c..42db92b55 100644
--- a/libs/drape_frontend/gui/choose_position_mark.cpp
+++ b/libs/drape_frontend/gui/choose_position_mark.cpp
@@ -19,7 +19,8 @@ namespace
 struct ChoosePositionMarkVertex
 {
   ChoosePositionMarkVertex(glsl::vec2 const & position, glsl::vec2 const & texCoord)
-    : m_position(position), m_texCoord(texCoord)
+    : m_position(position)
+    , m_texCoord(texCoord)
   {}
 
   glsl::vec2 m_position;
@@ -31,8 +32,7 @@ class ChoosePositionMarkHandle : public Handle
   using TBase = Handle;
 
 public:
-  ChoosePositionMarkHandle(uint32_t id, m2::PointF const & pivot)
-    : Handle(id, dp::Center, pivot)
+  ChoosePositionMarkHandle(uint32_t id, m2::PointF const & pivot) : Handle(id, dp::Center, pivot)
   {
     SetIsVisible(true);
   }
@@ -54,13 +54,11 @@ drape_ptr<ShapeRenderer> ChoosePositionMark::Draw(ref_ptr<dp::GraphicsContext> c
   m2::RectF const texRect = region.GetTexRect();
 
   ASSERT_EQUAL(m_position.m_anchor, dp::Center, ());
-  ChoosePositionMarkVertex vertexes[] =
-  {
-    ChoosePositionMarkVertex(glsl::vec2(-halfSize.x, halfSize.y), glsl::ToVec2(texRect.LeftTop())),
-    ChoosePositionMarkVertex(glsl::vec2(-halfSize.x, -halfSize.y), glsl::ToVec2(texRect.LeftBottom())),
-    ChoosePositionMarkVertex(glsl::vec2(halfSize.x, halfSize.y), glsl::ToVec2(texRect.RightTop())),
-    ChoosePositionMarkVertex(glsl::vec2(halfSize.x, -halfSize.y), glsl::ToVec2(texRect.RightBottom()))
-  };
+  ChoosePositionMarkVertex vertexes[] = {
+      ChoosePositionMarkVertex(glsl::vec2(-halfSize.x, halfSize.y), glsl::ToVec2(texRect.LeftTop())),
+      ChoosePositionMarkVertex(glsl::vec2(-halfSize.x, -halfSize.y), glsl::ToVec2(texRect.LeftBottom())),
+      ChoosePositionMarkVertex(glsl::vec2(halfSize.x, halfSize.y), glsl::ToVec2(texRect.RightTop())),
+      ChoosePositionMarkVertex(glsl::vec2(halfSize.x, -halfSize.y), glsl::ToVec2(texRect.RightBottom()))};
 
   auto state = df::CreateRenderState(gpu::Program::TexturingGui, df::DepthLayer::GuiLayer);
   state.SetColorTexture(region.GetTexture());
@@ -86,8 +84,8 @@ drape_ptr<ShapeRenderer> ChoosePositionMark::Draw(ref_ptr<dp::GraphicsContext> c
 
   provider.InitStream(0, info, make_ref(&vertexes));
 
-  drape_ptr<dp::OverlayHandle> handle = make_unique_dp<ChoosePositionMarkHandle>(
-      GuiHandleChoosePositionMark, m_position.m_pixelPivot);
+  drape_ptr<dp::OverlayHandle> handle =
+      make_unique_dp<ChoosePositionMarkHandle>(GuiHandleChoosePositionMark, m_position.m_pixelPivot);
 
   drape_ptr<ShapeRenderer> renderer = make_unique_dp<ShapeRenderer>();
   dp::Batcher batcher(dp::Batcher::IndexPerQuad, dp::Batcher::VertexPerQuad);
diff --git a/libs/drape_frontend/gui/choose_position_mark.hpp b/libs/drape_frontend/gui/choose_position_mark.hpp
index c2253cb62..8ce59d08d 100644
--- a/libs/drape_frontend/gui/choose_position_mark.hpp
+++ b/libs/drape_frontend/gui/choose_position_mark.hpp
@@ -9,7 +9,6 @@ class ChoosePositionMark : public Shape
 public:
   explicit ChoosePositionMark(gui::Position const & position) : Shape(position) {}
 
-  drape_ptr<ShapeRenderer> Draw(ref_ptr<dp::GraphicsContext> context,
-                                ref_ptr<dp::TextureManager> tex) const;
+  drape_ptr<ShapeRenderer> Draw(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::TextureManager> tex) const;
 };
 }  // namespace gui
diff --git a/libs/drape_frontend/gui/compass.cpp b/libs/drape_frontend/gui/compass.cpp
index 34e3107df..f09ef9876 100644
--- a/libs/drape_frontend/gui/compass.cpp
+++ b/libs/drape_frontend/gui/compass.cpp
@@ -22,9 +22,7 @@ namespace
 {
 struct CompassVertex
 {
-  CompassVertex(glsl::vec2 const & position, glsl::vec2 const & texCoord)
-    : m_position(position)
-    , m_texCoord(texCoord)
+  CompassVertex(glsl::vec2 const & position, glsl::vec2 const & texCoord) : m_position(position), m_texCoord(texCoord)
   {}
 
   glsl::vec2 m_position;
@@ -36,8 +34,7 @@ class CompassHandle : public TappableHandle
   using TBase = TappableHandle;
 
 public:
-  CompassHandle(uint32_t id, m2::PointF const & pivot, m2::PointF const & size,
-                Shape::TTapHandler const & tapHandler)
+  CompassHandle(uint32_t id, m2::PointF const & pivot, m2::PointF const & size, Shape::TTapHandler const & tapHandler)
     : TappableHandle(id, dp::Center, pivot, size)
     , m_tapHandler(tapHandler)
     , m_animation(false, 0.25)
@@ -100,13 +97,10 @@ drape_ptr<ShapeRenderer> Compass::Draw(ref_ptr<dp::GraphicsContext> context, ref
   auto const texRect = region.GetTexRect();
 
   ASSERT_EQUAL(m_position.m_anchor, dp::Center, ());
-  CompassVertex vertexes[] =
-  {
-    CompassVertex(glsl::vec2(-halfSize.x, halfSize.y), glsl::ToVec2(texRect.LeftTop())),
-    CompassVertex(glsl::vec2(-halfSize.x, -halfSize.y), glsl::ToVec2(texRect.LeftBottom())),
-    CompassVertex(glsl::vec2(halfSize.x, halfSize.y), glsl::ToVec2(texRect.RightTop())),
-    CompassVertex(glsl::vec2(halfSize.x, -halfSize.y), glsl::ToVec2(texRect.RightBottom()))
-  };
+  CompassVertex vertexes[] = {CompassVertex(glsl::vec2(-halfSize.x, halfSize.y), glsl::ToVec2(texRect.LeftTop())),
+                              CompassVertex(glsl::vec2(-halfSize.x, -halfSize.y), glsl::ToVec2(texRect.LeftBottom())),
+                              CompassVertex(glsl::vec2(halfSize.x, halfSize.y), glsl::ToVec2(texRect.RightTop())),
+                              CompassVertex(glsl::vec2(halfSize.x, -halfSize.y), glsl::ToVec2(texRect.RightBottom()))};
 
   auto state = df::CreateRenderState(gpu::Program::TexturingGui, df::DepthLayer::GuiLayer);
   state.SetColorTexture(region.GetTexture());
@@ -132,9 +126,8 @@ drape_ptr<ShapeRenderer> Compass::Draw(ref_ptr<dp::GraphicsContext> context, ref
 
   provider.InitStream(0, info, make_ref(&vertexes));
 
-  drape_ptr<dp::OverlayHandle> handle = make_unique_dp<CompassHandle>(EGuiHandle::GuiHandleCompass,
-                                                                      m_position.m_pixelPivot,
-                                                                      region.GetPixelSize(), tapHandler);
+  drape_ptr<dp::OverlayHandle> handle = make_unique_dp<CompassHandle>(
+      EGuiHandle::GuiHandleCompass, m_position.m_pixelPivot, region.GetPixelSize(), tapHandler);
 
   drape_ptr<ShapeRenderer> renderer = make_unique_dp<ShapeRenderer>();
   dp::Batcher batcher(dp::Batcher::IndexPerQuad, dp::Batcher::VertexPerQuad);
diff --git a/libs/drape_frontend/gui/compass.hpp b/libs/drape_frontend/gui/compass.hpp
index b2c09e092..78d1ec353 100644
--- a/libs/drape_frontend/gui/compass.hpp
+++ b/libs/drape_frontend/gui/compass.hpp
@@ -9,8 +9,7 @@ class Compass : public Shape
 public:
   explicit Compass(gui::Position const & position) : Shape(position) {}
 
-  drape_ptr<ShapeRenderer> Draw(ref_ptr<dp::GraphicsContext> context,
-                                ref_ptr<dp::TextureManager> tex,
+  drape_ptr<ShapeRenderer> Draw(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::TextureManager> tex,
                                 TTapHandler const & tapHandler) const;
 };
 }  // namespace gui
diff --git a/libs/drape_frontend/gui/copyright_label.cpp b/libs/drape_frontend/gui/copyright_label.cpp
index b9abd9b1f..40a8cbd47 100644
--- a/libs/drape_frontend/gui/copyright_label.cpp
+++ b/libs/drape_frontend/gui/copyright_label.cpp
@@ -20,8 +20,8 @@ class CopyrightHandle : public StaticLabelHandle
   using TBase = StaticLabelHandle;
 
 public:
-  CopyrightHandle(uint32_t id, ref_ptr<dp::TextureManager> textureManager,
-                  dp::Anchor anchor, m2::PointF const & pivot, dp::TGlyphs && glyphs)
+  CopyrightHandle(uint32_t id, ref_ptr<dp::TextureManager> textureManager, dp::Anchor anchor, m2::PointF const & pivot,
+                  dp::TGlyphs && glyphs)
     : TBase(id, textureManager, anchor, pivot, std::move(glyphs))
   {
     SetIsVisible(true);
@@ -43,8 +43,7 @@ public:
 
     if (m_animation == nullptr)
     {
-      m_animation = make_unique_dp<df::OpacityAnimation>(kCopyrightHideTime,
-                                                         kCopyrightVisibleTime, 1.0f, 0.0f);
+      m_animation = make_unique_dp<df::OpacityAnimation>(kCopyrightHideTime, kCopyrightVisibleTime, 1.0f, 0.0f);
     }
     else if (m_animation->IsFinished())
     {
@@ -61,37 +60,32 @@ private:
 };
 }  // namespace
 
-CopyrightLabel::CopyrightLabel(Position const & position)
-  : TBase(position)
-{}
+CopyrightLabel::CopyrightLabel(Position const & position) : TBase(position) {}
 
 drape_ptr<ShapeRenderer> CopyrightLabel::Draw(ref_ptr<dp::GraphicsContext> context,
                                               ref_ptr<dp::TextureManager> tex) const
 {
   StaticLabel::LabelResult result;
   auto glyphs = StaticLabel::CacheStaticText("Map data © OpenStreetMap", "", m_position.m_anchor,
-      DrapeGui::GetGuiTextFont(), tex, result);
+                                             DrapeGui::GetGuiTextFont(), tex, result);
 
   dp::AttributeProvider provider(1 /*stream count*/, static_cast<uint32_t>(result.m_buffer.size()));
-  provider.InitStream(0 /*stream index*/, StaticLabel::Vertex::GetBindingInfo(),
-                      make_ref(result.m_buffer.data()));
+  provider.InitStream(0 /*stream index*/, StaticLabel::Vertex::GetBindingInfo(), make_ref(result.m_buffer.data()));
 
   auto const vertexCount = static_cast<uint32_t>(result.m_buffer.size());
   ASSERT(vertexCount % dp::Batcher::VertexPerQuad == 0, ());
   auto const indexCount = dp::Batcher::IndexPerQuad * vertexCount / dp::Batcher::VertexPerQuad;
 
-  drape_ptr<dp::OverlayHandle> handle = make_unique_dp<CopyrightHandle>(GuiHandleCopyright,
-                                                                        tex, m_position.m_anchor,
-                                                                        m_position.m_pixelPivot,
-                                                                        std::move(glyphs));
+  drape_ptr<dp::OverlayHandle> handle = make_unique_dp<CopyrightHandle>(GuiHandleCopyright, tex, m_position.m_anchor,
+                                                                        m_position.m_pixelPivot, std::move(glyphs));
 
   drape_ptr<ShapeRenderer> renderer = make_unique_dp<ShapeRenderer>();
   dp::Batcher batcher(indexCount, vertexCount);
   batcher.SetBatcherHash(static_cast<uint64_t>(df::BatcherBucket::Default));
   using namespace std::placeholders;
   dp::SessionGuard guard(context, batcher, std::bind(&ShapeRenderer::AddShape, renderer.get(), _1, _2));
-  batcher.InsertListOfStrip(context, result.m_state, make_ref(&provider),
-                            std::move(handle), dp::Batcher::VertexPerQuad);
+  batcher.InsertListOfStrip(context, result.m_state, make_ref(&provider), std::move(handle),
+                            dp::Batcher::VertexPerQuad);
 
   return renderer;
 }
diff --git a/libs/drape_frontend/gui/debug_label.cpp b/libs/drape_frontend/gui/debug_label.cpp
index 1101a1fb9..5a76aa53b 100644
--- a/libs/drape_frontend/gui/debug_label.cpp
+++ b/libs/drape_frontend/gui/debug_label.cpp
@@ -15,8 +15,8 @@ class DebugLabelHandle : public MutableLabelHandle
   using TBase = MutableLabelHandle;
 
 public:
-  DebugLabelHandle(uint32_t id, dp::Anchor anchor, m2::PointF const & pivot,
-                   ref_ptr<dp::TextureManager> tex, TUpdateDebugLabelFn const & onUpdateFn)
+  DebugLabelHandle(uint32_t id, dp::Anchor anchor, m2::PointF const & pivot, ref_ptr<dp::TextureManager> tex,
+                   TUpdateDebugLabelFn const & onUpdateFn)
     : MutableLabelHandle(id, anchor, pivot)
     , m_onUpdateFn(onUpdateFn)
   {
@@ -68,16 +68,14 @@ void DebugInfoLabels::AddLabel(ref_ptr<dp::TextureManager> tex, std::string cons
 #ifdef RENDER_DEBUG_INFO_LABELS
   uint32_t const id = GuiHandleDebugLabel + m_labelsCount;
 
-  params.m_handleCreator = [id, onUpdateFn, tex](dp::Anchor anchor, m2::PointF const & pivot) {
-    return make_unique_dp<DebugLabelHandle>(id, anchor, pivot, tex, onUpdateFn);
-  };
+  params.m_handleCreator = [id, onUpdateFn, tex](dp::Anchor anchor, m2::PointF const & pivot)
+  { return make_unique_dp<DebugLabelHandle>(id, anchor, pivot, tex, onUpdateFn); };
 #endif
   m_labelsParams.push_back(params);
   ++m_labelsCount;
 }
 
-drape_ptr<ShapeRenderer> DebugInfoLabels::Draw(ref_ptr<dp::GraphicsContext> context,
-                                               ref_ptr<dp::TextureManager> tex)
+drape_ptr<ShapeRenderer> DebugInfoLabels::Draw(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::TextureManager> tex)
 {
   drape_ptr<ShapeRenderer> renderer = make_unique_dp<ShapeRenderer>();
 
@@ -86,8 +84,8 @@ drape_ptr<ShapeRenderer> DebugInfoLabels::Draw(ref_ptr<dp::GraphicsContext> cont
   for (auto & params : m_labelsParams)
   {
     params.m_pivot.y = pos.y;
-    m2::PointF textSize = MutableLabelDrawer::Draw(context, params, tex,
-      std::bind(&ShapeRenderer::AddShape, renderer.get(), _1, _2));
+    m2::PointF textSize =
+        MutableLabelDrawer::Draw(context, params, tex, std::bind(&ShapeRenderer::AddShape, renderer.get(), _1, _2));
     pos.y += 2 * textSize.y;
   }
 
diff --git a/libs/drape_frontend/gui/debug_label.hpp b/libs/drape_frontend/gui/debug_label.hpp
index ccac4f524..ce334e5df 100644
--- a/libs/drape_frontend/gui/debug_label.hpp
+++ b/libs/drape_frontend/gui/debug_label.hpp
@@ -16,10 +16,8 @@ class DebugInfoLabels : public Shape
 public:
   explicit DebugInfoLabels(gui::Position const & position) : Shape(position) {}
 
-  void AddLabel(ref_ptr<dp::TextureManager> tex, std::string const & caption,
-                TUpdateDebugLabelFn const & onUpdateFn);
-  drape_ptr<ShapeRenderer> Draw(ref_ptr<dp::GraphicsContext> context,
-                                ref_ptr<dp::TextureManager> tex);
+  void AddLabel(ref_ptr<dp::TextureManager> tex, std::string const & caption, TUpdateDebugLabelFn const & onUpdateFn);
+  drape_ptr<ShapeRenderer> Draw(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::TextureManager> tex);
 
 private:
   std::vector<MutableLabelDrawer::Params> m_labelsParams;
diff --git a/libs/drape_frontend/gui/drape_gui.cpp b/libs/drape_frontend/gui/drape_gui.cpp
index f087eb29c..58cd326fa 100644
--- a/libs/drape_frontend/gui/drape_gui.cpp
+++ b/libs/drape_frontend/gui/drape_gui.cpp
@@ -15,9 +15,7 @@ struct DrapeGui::Impl
   RulerHelper m_rulerHelper;
 };
 
-DrapeGui::DrapeGui()
-  : m_impl(new Impl())
-{}
+DrapeGui::DrapeGui() : m_impl(new Impl()) {}
 
 DrapeGui & DrapeGui::Instance()
 {
@@ -69,7 +67,7 @@ void DrapeGui::ConnectOnCompassTappedHandler(Shape::TTapHandler const & handler)
 
 void DrapeGui::CallOnCompassTappedHandler()
 {
-  if(m_onCompassTappedHandler != nullptr)
+  if (m_onCompassTappedHandler != nullptr)
     m_onCompassTappedHandler();
 }
 }  // namespace gui
diff --git a/libs/drape_frontend/gui/gui_text.cpp b/libs/drape_frontend/gui/gui_text.cpp
index 14b15971a..a71c4e93a 100644
--- a/libs/drape_frontend/gui/gui_text.cpp
+++ b/libs/drape_frontend/gui/gui_text.cpp
@@ -13,13 +13,13 @@
 #include <array>
 #include <memory>
 
-
 namespace gui
 {
 namespace
 {
-glsl::vec2 GetNormalsAndMask(dp::TextureManager::GlyphRegion const & glyph, float xOffset, float yOffset, float textRatio,
-                             std::array<glsl::vec2, 4> & normals, std::array<glsl::vec2, 4> & maskTexCoord)
+glsl::vec2 GetNormalsAndMask(dp::TextureManager::GlyphRegion const & glyph, float xOffset, float yOffset,
+                             float textRatio, std::array<glsl::vec2, 4> & normals,
+                             std::array<glsl::vec2, 4> & maskTexCoord)
 {
   m2::PointF const pixelSize = glyph.GetPixelSize() * textRatio;
   m2::RectF const & r = glyph.GetTexRect();
@@ -109,14 +109,14 @@ StaticLabel::LabelResult::LabelResult()
   m_state.SetDepthTestEnabled(false);
 }
 
-dp::TGlyphs StaticLabel::CacheStaticText(std::string const & text, char const * delimiters,
-                                         dp::Anchor anchor, dp::FontDecl const & font,
-                                         ref_ptr<dp::TextureManager> mng, LabelResult & result)
+dp::TGlyphs StaticLabel::CacheStaticText(std::string const & text, char const * delimiters, dp::Anchor anchor,
+                                         dp::FontDecl const & font, ref_ptr<dp::TextureManager> mng,
+                                         LabelResult & result)
 {
   ASSERT(!text.empty(), ());
 
-  auto const textRatio = font.m_size *
-    static_cast<float>(df::VisualParams::Instance().GetVisualScale() / dp::kBaseFontSizePixels);
+  auto const textRatio =
+      font.m_size * static_cast<float>(df::VisualParams::Instance().GetVisualScale() / dp::kBaseFontSizePixels);
 
   dp::TextureManager::TMultilineGlyphsBuffer buffers;
   auto const shapedLines = mng->ShapeMultilineText(dp::kBaseFontSizePixels, text, delimiters, buffers);
@@ -132,10 +132,8 @@ dp::TGlyphs StaticLabel::CacheStaticText(std::string const & text, char const *
 
   ref_ptr<dp::Texture> texture = buffers[0][0].GetTexture();
   for (dp::TextureManager::TGlyphsBuffer const & b : buffers)
-  {
     for (dp::TextureManager::GlyphRegion const & reg : b)
       ASSERT(texture == reg.GetTexture(), ());
-  }
 #endif
 
   dp::TextureManager::ColorRegion color;
@@ -174,7 +172,8 @@ dp::TGlyphs StaticLabel::CacheStaticText(std::string const & text, char const *
       std::array<glsl::vec2, 4> normals, maskTex;
 
       dp::TextureManager::GlyphRegion const & glyph = regions[j];
-      glsl::vec2 offsets = GetNormalsAndMask(glyph, glyphMetrics.m_xOffset, glyphMetrics.m_yOffset, textRatio, normals, maskTex);
+      glsl::vec2 offsets =
+          GetNormalsAndMask(glyph, glyphMetrics.m_xOffset, glyphMetrics.m_yOffset, textRatio, normals, maskTex);
 
       glsl::vec3 position = glsl::vec3(0.0, 0.0, depth);
 
@@ -289,10 +288,7 @@ MutableLabel::PrecacheResult::PrecacheResult()
   m_state.SetDepthTestEnabled(false);
 }
 
-MutableLabel::MutableLabel(dp::Anchor anchor)
-  : m_anchor(anchor)
-{
-}
+MutableLabel::MutableLabel(dp::Anchor anchor) : m_anchor(anchor) {}
 
 void MutableLabel::SetMaxLength(uint16_t maxLength)
 {
@@ -313,7 +309,8 @@ void MutableLabel::Precache(PrecacheParams const & params, PrecacheResult & resu
 {
   SetMaxLength(static_cast<uint16_t>(params.m_maxLength));
 
-  m_textRatio = params.m_font.m_size * static_cast<float>(df::VisualParams::Instance().GetVisualScale()) / dp::kBaseFontSizePixels;
+  m_textRatio = params.m_font.m_size * static_cast<float>(df::VisualParams::Instance().GetVisualScale()) /
+                dp::kBaseFontSizePixels;
 
   // TODO(AB): Is this shaping/precaching really needed if the text changes every frame?
   m_shapedText = mng->ShapeSingleTextLine(dp::kBaseFontSizePixels, params.m_alphabet, &m_glyphRegions);
@@ -379,21 +376,22 @@ void MutableLabel::SetText(LabelResult & result, std::string text, ref_ptr<dp::T
   ASSERT_EQUAL(m_glyphRegions.size(), m_shapedText.m_glyphs.size(), ());
   for (size_t i = 0; i < m_glyphRegions.size(); ++i)
   {
-      std::array<glsl::vec2, 4> normals, maskTex;
-      dp::TextureManager::GlyphRegion const & glyph = m_glyphRegions[i];
-      auto const & metrics = m_shapedText.m_glyphs[i];
-      glsl::vec2 const offsets = GetNormalsAndMask(glyph, metrics.m_xOffset, metrics.m_yOffset, m_textRatio, normals, maskTex);
+    std::array<glsl::vec2, 4> normals, maskTex;
+    dp::TextureManager::GlyphRegion const & glyph = m_glyphRegions[i];
+    auto const & metrics = m_shapedText.m_glyphs[i];
+    glsl::vec2 const offsets =
+        GetNormalsAndMask(glyph, metrics.m_xOffset, metrics.m_yOffset, m_textRatio, normals, maskTex);
 
-      ASSERT_EQUAL(normals.size(), maskTex.size(), ());
+    ASSERT_EQUAL(normals.size(), maskTex.size(), ());
 
-      for (size_t i = 0; i < normals.size(); ++i)
-        result.m_buffer.emplace_back(pen + normals[i], maskTex[i]);
+    for (size_t i = 0; i < normals.size(); ++i)
+      result.m_buffer.emplace_back(pen + normals[i], maskTex[i]);
 
-      float const advance = metrics.m_xAdvance * m_textRatio;
-      length += advance + offsets.x;
-      // TODO(AB): yAdvance is always zero for horizontal layouts.
-      pen += glsl::vec2(advance, metrics.m_yAdvance * m_textRatio);
-      maxHeight = std::max(maxHeight, offsets.y + glyph.GetPixelHeight() * m_textRatio);
+    float const advance = metrics.m_xAdvance * m_textRatio;
+    length += advance + offsets.x;
+    // TODO(AB): yAdvance is always zero for horizontal layouts.
+    pen += glsl::vec2(advance, metrics.m_yAdvance * m_textRatio);
+    maxHeight = std::max(maxHeight, offsets.y + glyph.GetPixelHeight() * m_textRatio);
   }
 
   glsl::vec2 anchorModifier = glsl::vec2(-length / 2.0f, maxHeight / 2.0f);
@@ -494,8 +492,7 @@ void MutableLabelHandle::SetContent(std::string const & content)
 }
 
 m2::PointF MutableLabelDrawer::Draw(ref_ptr<dp::GraphicsContext> context, Params const & params,
-                                    ref_ptr<dp::TextureManager> mng,
-                                    dp::Batcher::TFlushFn && flushFn)
+                                    ref_ptr<dp::TextureManager> mng, dp::Batcher::TFlushFn && flushFn)
 {
   uint32_t const vertexCount = dp::Batcher::VertexPerQuad * params.m_maxLength;
   uint32_t const indexCount = dp::Batcher::IndexPerQuad * params.m_maxLength;
@@ -526,16 +523,15 @@ m2::PointF MutableLabelDrawer::Draw(ref_ptr<dp::GraphicsContext> context, Params
     dp::Batcher batcher(indexCount, vertexCount);
     batcher.SetBatcherHash(static_cast<uint64_t>(df::BatcherBucket::Default));
     dp::SessionGuard const guard(context, batcher, std::move(flushFn));
-    batcher.InsertListOfStrip(context, staticData.m_state, make_ref(&provider),
-                              std::move(handle), dp::Batcher::VertexPerQuad);
+    batcher.InsertListOfStrip(context, staticData.m_state, make_ref(&provider), std::move(handle),
+                              dp::Batcher::VertexPerQuad);
   }
 
   return staticData.m_maxPixelSize;
 }
 
-StaticLabelHandle::StaticLabelHandle(uint32_t id, ref_ptr<dp::TextureManager> textureManager,
-                                     dp::Anchor anchor, m2::PointF const & pivot,
-                                     dp::TGlyphs && glyphs)
+StaticLabelHandle::StaticLabelHandle(uint32_t id, ref_ptr<dp::TextureManager> textureManager, dp::Anchor anchor,
+                                     m2::PointF const & pivot, dp::TGlyphs && glyphs)
   : TBase(id, anchor, pivot)
   , m_glyphs(std::move(glyphs))
   , m_textureManager(std::move(textureManager))
diff --git a/libs/drape_frontend/gui/gui_text.hpp b/libs/drape_frontend/gui/gui_text.hpp
index b5693f3d6..d4778d006 100644
--- a/libs/drape_frontend/gui/gui_text.hpp
+++ b/libs/drape_frontend/gui/gui_text.hpp
@@ -23,8 +23,8 @@ public:
   struct Vertex
   {
     Vertex() = default;
-    Vertex(glsl::vec3 const & pos, glsl::vec2 const & color, glsl::vec2 const & outline,
-           glsl::vec2 const & normal, glsl::vec2 const & mask)
+    Vertex(glsl::vec3 const & pos, glsl::vec2 const & color, glsl::vec2 const & outline, glsl::vec2 const & normal,
+           glsl::vec2 const & mask)
       : m_position(pos)
       , m_colorTexCoord(color)
       , m_outlineColorTexCoord(outline)
@@ -52,8 +52,7 @@ public:
   };
 
   static dp::TGlyphs CacheStaticText(std::string const & text, char const * delim, dp::Anchor anchor,
-                              dp::FontDecl const & font, ref_ptr<dp::TextureManager> mng,
-                              LabelResult & result);
+                                     dp::FontDecl const & font, ref_ptr<dp::TextureManager> mng, LabelResult & result);
 };
 
 class MutableLabel
@@ -62,8 +61,7 @@ public:
   struct StaticVertex
   {
     StaticVertex() = default;
-    StaticVertex(glsl::vec3 const & position, glsl::vec2 const & color,
-                 glsl::vec2 const & outlineColor)
+    StaticVertex(glsl::vec3 const & position, glsl::vec2 const & color, glsl::vec2 const & outlineColor)
       : m_position(position)
       , m_color(color)
       , m_outline(outlineColor)
@@ -79,10 +77,7 @@ public:
   struct DynamicVertex
   {
     DynamicVertex() = default;
-    DynamicVertex(glsl::vec2 const & normal, glsl::vec2 const & mask)
-      : m_normal(normal)
-      , m_maskTexCoord(mask)
-    {}
+    DynamicVertex(glsl::vec2 const & normal, glsl::vec2 const & mask) : m_normal(normal), m_maskTexCoord(mask) {}
 
     static dp::BindingInfo const & GetBindingInfo();
 
@@ -114,8 +109,7 @@ public:
     m2::RectF m_boundRect;
   };
 
-  void Precache(PrecacheParams const & params, PrecacheResult & result,
-                ref_ptr<dp::TextureManager> mng);
+  void Precache(PrecacheParams const & params, PrecacheResult & result, ref_ptr<dp::TextureManager> mng);
 
   void SetText(LabelResult & result, std::string text, ref_ptr<dp::TextureManager> mng);
 
@@ -141,8 +135,7 @@ class MutableLabelHandle : public Handle
 public:
   MutableLabelHandle(uint32_t id, dp::Anchor anchor, m2::PointF const & pivot);
 
-  MutableLabelHandle(uint32_t id, dp::Anchor anchor, m2::PointF const & pivot,
-                     ref_ptr<dp::TextureManager> textures);
+  MutableLabelHandle(uint32_t id, dp::Anchor anchor, m2::PointF const & pivot, ref_ptr<dp::TextureManager> textures);
 
   void GetAttributeMutation(ref_ptr<dp::AttributeBufferMutator> mutator) const override;
 
@@ -180,8 +173,8 @@ public:
   };
 
   // Return maximum pixel size.
-  static m2::PointF Draw(ref_ptr<dp::GraphicsContext> context, Params const & params,
-                         ref_ptr<dp::TextureManager> mng, dp::Batcher::TFlushFn && flushFn);
+  static m2::PointF Draw(ref_ptr<dp::GraphicsContext> context, Params const & params, ref_ptr<dp::TextureManager> mng,
+                         dp::Batcher::TFlushFn && flushFn);
 };
 
 class StaticLabelHandle : public Handle
diff --git a/libs/drape_frontend/gui/layer_render.cpp b/libs/drape_frontend/gui/layer_render.cpp
index 5ab3239c9..598fa58f8 100644
--- a/libs/drape_frontend/gui/layer_render.cpp
+++ b/libs/drape_frontend/gui/layer_render.cpp
@@ -1,10 +1,10 @@
+#include "drape_frontend/gui/layer_render.hpp"
 #include "drape_frontend/gui/choose_position_mark.hpp"
 #include "drape_frontend/gui/compass.hpp"
 #include "drape_frontend/gui/copyright_label.hpp"
 #include "drape_frontend/gui/debug_label.hpp"
 #include "drape_frontend/gui/drape_gui.hpp"
 #include "drape_frontend/gui/gui_text.hpp"
-#include "drape_frontend/gui/layer_render.hpp"
 #include "drape_frontend/gui/ruler.hpp"
 #include "drape_frontend/gui/ruler_helper.hpp"
 
@@ -19,8 +19,8 @@
 
 #include "base/stl_helpers.hpp"
 
-#include <ios>
 #include <functional>
+#include <ios>
 #include <sstream>
 #include <utility>
 
@@ -39,8 +39,8 @@ void LayerRenderer::Build(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::Pro
     r.second->Build(context, mng);
 }
 
-void LayerRenderer::Render(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
-                           bool routingActive, ScreenBase const & screen)
+void LayerRenderer::Render(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng, bool routingActive,
+                           ScreenBase const & screen)
 {
   if (HasWidget(gui::WIDGET_RULER))
   {
@@ -157,8 +157,10 @@ namespace
 class ScaleFpsLabelHandle : public MutableLabelHandle
 {
   using TBase = MutableLabelHandle;
+
 public:
-  ScaleFpsLabelHandle(uint32_t id, ref_ptr<dp::TextureManager> textures, std::string const & apiLabel, Position const & position)
+  ScaleFpsLabelHandle(uint32_t id, ref_ptr<dp::TextureManager> textures, std::string const & apiLabel,
+                      Position const & position)
     : TBase(id, position.m_anchor, position.m_pixelPivot, textures)
     , m_apiLabel(apiLabel)
   {
@@ -198,9 +200,8 @@ drape_ptr<LayerRenderer> LayerCacher::RecacheWidgets(ref_ptr<dp::GraphicsContext
                                                      TWidgetsInitInfo const & initInfo,
                                                      ref_ptr<dp::TextureManager> textures)
 {
-  using TCacheShape = std::function<void(ref_ptr<dp::GraphicsContext>, Position anchor,
-                                               ref_ptr<LayerRenderer> renderer,
-                                               ref_ptr<dp::TextureManager> textures)>;
+  using TCacheShape = std::function<void(ref_ptr<dp::GraphicsContext>, Position anchor, ref_ptr<LayerRenderer> renderer,
+                                         ref_ptr<dp::TextureManager> textures)>;
   static std::map<EWidget, TCacheShape> cacheFunctions{
       {WIDGET_COMPASS, std::bind(&LayerCacher::CacheCompass, this, _1, _2, _3, _4)},
       {WIDGET_RULER, std::bind(&LayerCacher::CacheRuler, this, _1, _2, _3, _4)},
@@ -246,8 +247,8 @@ drape_ptr<LayerRenderer> LayerCacher::RecacheDebugLabels(ref_ptr<dp::GraphicsCon
   auto const vs = static_cast<float>(df::VisualParams::Instance().GetVisualScale());
   DebugInfoLabels debugLabels = DebugInfoLabels(Position(m2::PointF(10.0f * vs, 50.0f * vs), dp::Center));
 
-  debugLabels.AddLabel(textures, "visible: km2, readed: km2, ratio:",
-                       [](ScreenBase const & screen, string & content) -> bool
+  debugLabels.AddLabel(textures,
+                       "visible: km2, readed: km2, ratio:", [](ScreenBase const & screen, string & content) -> bool
   {
     double const sizeX = screen.PixelRectIn3d().SizeX();
     double const sizeY = screen.PixelRectIn3d().SizeY();
@@ -267,12 +268,10 @@ drape_ptr<LayerRenderer> LayerCacher::RecacheDebugLabels(ref_ptr<dp::GraphicsCon
     m2::PointD const p2_2d = screen.PtoG(m2::PointD(sizeX_2d, sizeY_2d));
     m2::PointD const p3_2d = screen.PtoG(m2::PointD(sizeX_2d, 0.0));
 
-    double const areaGTotal = mercator::AreaOnEarth(p0_2d, p1_2d, p2_2d) +
-        mercator::AreaOnEarth(p2_2d, p3_2d, p0_2d);
+    double const areaGTotal = mercator::AreaOnEarth(p0_2d, p1_2d, p2_2d) + mercator::AreaOnEarth(p2_2d, p3_2d, p0_2d);
 
     std::ostringstream out;
-    out << std::fixed << std::setprecision(2)
-        << "visible: " << areaG / 1000000.0 << " km2"
+    out << std::fixed << std::setprecision(2) << "visible: " << areaG / 1000000.0 << " km2"
         << ", readed: " << areaGTotal / 1000000.0 << " km2"
         << ", ratio: " << areaGTotal / areaG;
     content.assign(out.str());
@@ -289,36 +288,30 @@ drape_ptr<LayerRenderer> LayerCacher::RecacheDebugLabels(ref_ptr<dp::GraphicsCon
     double const scale = distanceG / screen.PixelRect().SizeX();
 
     std::ostringstream out;
-    out << std::fixed << std::setprecision(2)
-        << "scale2d: " << scale << " m/px"
+    out << std::fixed << std::setprecision(2) << "scale2d: " << scale << " m/px"
         << ", scale2d * vs: " << scale * vs << " m/px";
     content.assign(out.str());
     return true;
   });
 
-  debugLabels.AddLabel(textures, "distance: m",
-                       [](ScreenBase const & screen, string & content) -> bool
+  debugLabels.AddLabel(textures, "distance: m", [](ScreenBase const & screen, string & content) -> bool
   {
     double const sizeX = screen.PixelRectIn3d().SizeX();
     double const sizeY = screen.PixelRectIn3d().SizeY();
 
-    double const distance = mercator::DistanceOnEarth(
-      screen.PtoG(screen.P3dtoP(m2::PointD(sizeX / 2.0, 0.0))),
-      screen.PtoG(screen.P3dtoP(m2::PointD(sizeX / 2.0, sizeY))));
+    double const distance = mercator::DistanceOnEarth(screen.PtoG(screen.P3dtoP(m2::PointD(sizeX / 2.0, 0.0))),
+                                                      screen.PtoG(screen.P3dtoP(m2::PointD(sizeX / 2.0, sizeY))));
 
     std::ostringstream out;
-    out << std::fixed << std::setprecision(2)
-        << "distance: " << distance << " m";
+    out << std::fixed << std::setprecision(2) << "distance: " << distance << " m";
     content.assign(out.str());
     return true;
   });
 
-  debugLabels.AddLabel(textures, "angle: ",
-                       [](ScreenBase const & screen, string & content) -> bool
+  debugLabels.AddLabel(textures, "angle: ", [](ScreenBase const & screen, string & content) -> bool
   {
     std::ostringstream out;
-    out << std::fixed << std::setprecision(2)
-        << "angle: " << screen.GetRotationAngle() * 180.0 / math::pi;
+    out << std::fixed << std::setprecision(2) << "angle: " << screen.GetRotationAngle() * 180.0 / math::pi;
     content.assign(out.str());
     return true;
   });
@@ -336,8 +329,8 @@ void LayerCacher::CacheCompass(ref_ptr<dp::GraphicsContext> context, Position co
                                ref_ptr<LayerRenderer> renderer, ref_ptr<dp::TextureManager> textures)
 {
   Compass compass = Compass(position);
-  drape_ptr<ShapeRenderer> shape = compass.Draw(context, textures,
-      std::bind(&DrapeGui::CallOnCompassTappedHandler, &DrapeGui::Instance()));
+  drape_ptr<ShapeRenderer> shape =
+      compass.Draw(context, textures, std::bind(&DrapeGui::CallOnCompassTappedHandler, &DrapeGui::Instance()));
 
   renderer->AddShapeRenderer(WIDGET_COMPASS, std::move(shape));
 }
diff --git a/libs/drape_frontend/gui/layer_render.hpp b/libs/drape_frontend/gui/layer_render.hpp
index 0fa865899..d0f7e22f4 100644
--- a/libs/drape_frontend/gui/layer_render.hpp
+++ b/libs/drape_frontend/gui/layer_render.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "drape_frontend/gui/skin.hpp"
 #include "drape_frontend/gui/shape.hpp"
+#include "drape_frontend/gui/skin.hpp"
 
 #include "shaders/program_manager.hpp"
 
@@ -15,7 +15,7 @@
 
 namespace dp
 {
-  class GraphicsContext;
+class GraphicsContext;
 }  // namespace dp
 
 namespace gui
@@ -57,8 +57,7 @@ private:
 class LayerCacher
 {
 public:
-  drape_ptr<LayerRenderer> RecacheWidgets(ref_ptr<dp::GraphicsContext> context,
-                                          TWidgetsInitInfo const & initInfo,
+  drape_ptr<LayerRenderer> RecacheWidgets(ref_ptr<dp::GraphicsContext> context, TWidgetsInitInfo const & initInfo,
                                           ref_ptr<dp::TextureManager> textures);
   drape_ptr<LayerRenderer> RecacheChoosePositionMark(ref_ptr<dp::GraphicsContext> context,
                                                      ref_ptr<dp::TextureManager> textures);
@@ -69,15 +68,15 @@ public:
 #endif
 
 private:
-  void CacheCompass(ref_ptr<dp::GraphicsContext> context, Position const & position,
-                    ref_ptr<LayerRenderer> renderer, ref_ptr<dp::TextureManager> textures);
-  void CacheRuler(ref_ptr<dp::GraphicsContext> context, Position const & position,
-                  ref_ptr<LayerRenderer> renderer, ref_ptr<dp::TextureManager> textures);
-  void CacheCopyright(ref_ptr<dp::GraphicsContext> context, Position const & position,
-                      ref_ptr<LayerRenderer> renderer, ref_ptr<dp::TextureManager> textures);
+  void CacheCompass(ref_ptr<dp::GraphicsContext> context, Position const & position, ref_ptr<LayerRenderer> renderer,
+                    ref_ptr<dp::TextureManager> textures);
+  void CacheRuler(ref_ptr<dp::GraphicsContext> context, Position const & position, ref_ptr<LayerRenderer> renderer,
+                  ref_ptr<dp::TextureManager> textures);
+  void CacheCopyright(ref_ptr<dp::GraphicsContext> context, Position const & position, ref_ptr<LayerRenderer> renderer,
+                      ref_ptr<dp::TextureManager> textures);
   void CacheScaleFpsLabel(ref_ptr<dp::GraphicsContext> context, Position const & position,
                           ref_ptr<LayerRenderer> renderer, ref_ptr<dp::TextureManager> textures);
-  void CacheWatermark(ref_ptr<dp::GraphicsContext> context, Position const & position,
-                      ref_ptr<LayerRenderer> renderer, ref_ptr<dp::TextureManager> textures);
+  void CacheWatermark(ref_ptr<dp::GraphicsContext> context, Position const & position, ref_ptr<LayerRenderer> renderer,
+                      ref_ptr<dp::TextureManager> textures);
 };
 }  // namespace gui
diff --git a/libs/drape_frontend/gui/ruler.cpp b/libs/drape_frontend/gui/ruler.cpp
index c958b5a5a..a6553546e 100644
--- a/libs/drape_frontend/gui/ruler.cpp
+++ b/libs/drape_frontend/gui/ruler.cpp
@@ -38,12 +38,12 @@ dp::BindingInfo GetBindingInfo()
   uint8_t offset = 0;
   offset += dp::FillDecl<glsl::vec2, RulerVertex>(0, "a_position", info, offset);
   offset += dp::FillDecl<glsl::vec2, RulerVertex>(1, "a_normal", info, offset);
-  /*offset += */dp::FillDecl<glsl::vec2, RulerVertex>(2, "a_colorTexCoords", info, offset);
+  /*offset += */ dp::FillDecl<glsl::vec2, RulerVertex>(2, "a_colorTexCoords", info, offset);
 
   return info;
 }
 
-template<typename TBase>
+template <typename TBase>
 class BaseRulerHandle : public TBase
 {
 public:
@@ -65,21 +65,18 @@ public:
       m_animation.HideAnimated();
       m_isVisibleAtEnd = false;
     }
-    else
+    else if (helper.IsTextDirty())
     {
-      if (helper.IsTextDirty())
+      m_isAppearing = !m_isAppearing;
+      if (m_isAppearing)
       {
-        m_isAppearing = !m_isAppearing;
-        if (m_isAppearing)
-        {
-          m_animation.ShowAnimated();
-          m_isVisibleAtEnd = true;
-        }
-        else
-        {
-          m_animation.HideAnimated();
-          m_isVisibleAtEnd = false;
-        }
+        m_animation.ShowAnimated();
+        m_isVisibleAtEnd = true;
+      }
+      else
+      {
+        m_animation.HideAnimated();
+        m_isVisibleAtEnd = false;
       }
     }
 
@@ -131,8 +128,8 @@ class RulerTextHandle : public BaseRulerHandle<MutableLabelHandle>
   using TBase = BaseRulerHandle<MutableLabelHandle>;
 
 public:
-  RulerTextHandle(uint32_t id, dp::Anchor anchor, m2::PointF const & pivot,
-                  bool isAppearing, ref_ptr<dp::TextureManager> textures)
+  RulerTextHandle(uint32_t id, dp::Anchor anchor, m2::PointF const & pivot, bool isAppearing,
+                  ref_ptr<dp::TextureManager> textures)
     : TBase(id, anchor, pivot, isAppearing)
     , m_firstUpdate(true)
   {
@@ -192,10 +189,9 @@ void Ruler::DrawRuler(ref_ptr<dp::GraphicsContext> context, ShapeControl & contr
   glsl::vec2 texCoord = glsl::ToVec2(reg.GetTexRect().Center());
   float const h = RulerHelper::GetRulerHalfHeight();
 
-  glsl::vec2 normals[] =
-  {
-    glsl::vec2(-1.0, 0.0),
-    glsl::vec2(1.0, 0.0),
+  glsl::vec2 normals[] = {
+      glsl::vec2(-1.0, 0.0),
+      glsl::vec2(1.0, 0.0),
   };
 
   dp::Anchor anchor = m_position.m_anchor;
@@ -221,13 +217,12 @@ void Ruler::DrawRuler(ref_ptr<dp::GraphicsContext> context, ShapeControl & contr
     batcher.SetBatcherHash(static_cast<uint64_t>(df::BatcherBucket::Default));
     dp::SessionGuard guard(context, batcher, std::bind(&ShapeControl::AddShape, &control, _1, _2));
     batcher.InsertTriangleStrip(context, state, make_ref(&provider),
-                                make_unique_dp<RulerHandle>(EGuiHandle::GuiHandleRuler,
-                                  m_position.m_anchor, m_position.m_pixelPivot, isAppearing));
+                                make_unique_dp<RulerHandle>(EGuiHandle::GuiHandleRuler, m_position.m_anchor,
+                                                            m_position.m_pixelPivot, isAppearing));
   }
 }
 
-void Ruler::DrawText(ref_ptr<dp::GraphicsContext> context,
-                     ShapeControl & control, ref_ptr<dp::TextureManager> tex,
+void Ruler::DrawText(ref_ptr<dp::GraphicsContext> context, ShapeControl & control, ref_ptr<dp::TextureManager> tex,
                      bool isAppearing) const
 {
   std::string alphabet;
@@ -240,10 +235,8 @@ void Ruler::DrawText(ref_ptr<dp::GraphicsContext> context,
   params.m_maxLength = maxTextLength;
   params.m_font = DrapeGui::GetGuiTextFont();
   params.m_pivot = m_position.m_pixelPivot + m2::PointF(0.0f, RulerHelper::GetVerticalTextOffset());
-  params.m_handleCreator = [isAppearing, tex](dp::Anchor anchor, m2::PointF const & pivot) {
-    return make_unique_dp<RulerTextHandle>(EGuiHandle::GuiHandleRulerLabel, anchor, pivot,
-                                           isAppearing, tex);
-  };
+  params.m_handleCreator = [isAppearing, tex](dp::Anchor anchor, m2::PointF const & pivot)
+  { return make_unique_dp<RulerTextHandle>(EGuiHandle::GuiHandleRulerLabel, anchor, pivot, isAppearing, tex); };
 
   MutableLabelDrawer::Draw(context, params, tex, std::bind(&ShapeControl::AddShape, &control, _1, _2));
 }
diff --git a/libs/drape_frontend/gui/ruler.hpp b/libs/drape_frontend/gui/ruler.hpp
index 050739945..7991c9134 100644
--- a/libs/drape_frontend/gui/ruler.hpp
+++ b/libs/drape_frontend/gui/ruler.hpp
@@ -7,15 +7,13 @@ namespace gui
 class Ruler : public Shape
 {
 public:
-  explicit Ruler(Position const & position)
-    : Shape(position)
-  {}
+  explicit Ruler(Position const & position) : Shape(position) {}
   drape_ptr<ShapeRenderer> Draw(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::TextureManager> tex) const;
 
 private:
-  void DrawRuler(ref_ptr<dp::GraphicsContext> context, ShapeControl & control,
-                 ref_ptr<dp::TextureManager> tex, bool isAppearing) const;
-  void DrawText(ref_ptr<dp::GraphicsContext> context, ShapeControl & control,
-                ref_ptr<dp::TextureManager> tex, bool isAppearing) const;
+  void DrawRuler(ref_ptr<dp::GraphicsContext> context, ShapeControl & control, ref_ptr<dp::TextureManager> tex,
+                 bool isAppearing) const;
+  void DrawText(ref_ptr<dp::GraphicsContext> context, ShapeControl & control, ref_ptr<dp::TextureManager> tex,
+                bool isAppearing) const;
 };
 }  // namespace gui
diff --git a/libs/drape_frontend/gui/ruler_helper.cpp b/libs/drape_frontend/gui/ruler_helper.cpp
index a593fd5a2..a4235fb76 100644
--- a/libs/drape_frontend/gui/ruler_helper.cpp
+++ b/libs/drape_frontend/gui/ruler_helper.cpp
@@ -37,66 +37,24 @@ struct UnitValue
 
 // TODO: Localize these strings.
 UnitValue constexpr g_arrFeets[] = {
-  { "10 ft", 10 },
-  { "20 ft", 20 },
-  { "50 ft", 50 },
-  { "100 ft", 100 },
-  { "200 ft", 200 },
-  { "0.1 mi", 528 },
-  { "0.2 mi", 528 * 2 },
-  { "0.5 mi", 528 * 5 },
-  { "1 mi", 5280 },
-  { "2 mi", 2 * 5280 },
-  { "5 mi", 5 * 5280 },
-  { "10 mi", 10 * 5280 },
-  { "20 mi", 20 * 5280 },
-  { "50 mi", 50 * 5280 },
-  { "100 mi", 100 * 5280 },
-  { "200 mi", 200 * 5280 },
-  { "500 mi", 500 * 5280 }
-};
+    {"10 ft", 10},          {"20 ft", 20},         {"50 ft", 50},        {"100 ft", 100},      {"200 ft", 200},
+    {"0.1 mi", 528},        {"0.2 mi", 528 * 2},   {"0.5 mi", 528 * 5},  {"1 mi", 5280},       {"2 mi", 2 * 5280},
+    {"5 mi", 5 * 5280},     {"10 mi", 10 * 5280},  {"20 mi", 20 * 5280}, {"50 mi", 50 * 5280}, {"100 mi", 100 * 5280},
+    {"200 mi", 200 * 5280}, {"500 mi", 500 * 5280}};
 
 UnitValue constexpr g_arrYards[] = {
-  { "50 yd", 50 },
-  { "100 yd", 100 },
-  { "200 yd", 200 },
-  { "500 yd", 500 },
-  { "0.5 mi", 1760 / 2 },
-  { "1 mi", 1760 },
-  { "2 mi", 2 * 1760 },
-  { "5 mi", 5 * 1760 },
-  { "10 mi", 10 * 1760 },
-  { "20 mi", 20 * 1760 },
-  { "50 mi", 50 * 1760 },
-  { "100 mi", 100 * 1760 },
-  { "200 mi", 200 * 1760 },
-  { "500 mi", 500 * 1760 }
-};
+    {"50 yd", 50},        {"100 yd", 100},        {"200 yd", 200},        {"500 yd", 500},       {"0.5 mi", 1760 / 2},
+    {"1 mi", 1760},       {"2 mi", 2 * 1760},     {"5 mi", 5 * 1760},     {"10 mi", 10 * 1760},  {"20 mi", 20 * 1760},
+    {"50 mi", 50 * 1760}, {"100 mi", 100 * 1760}, {"200 mi", 200 * 1760}, {"500 mi", 500 * 1760}};
 
 // TODO: fix ruler text to the current zoom level, i.e. make it 100m for z16 always
 // (ruler length will vary still). It'll make debugging and user support easier as
 // we'll be able to tell zoom level of a screenshot by looking at the ruler.
-UnitValue constexpr g_arrMeters[] = {
-  { "1 m", 1 },
-  { "2 m", 2 },
-  { "5 m", 5 },
-  { "10 m", 10 },
-  { "20 m", 20 },
-  { "50 m", 50 },
-  { "100 m", 100 },
-  { "200 m", 200 },
-  { "500 m", 500 },
-  { "1 km", 1000 },
-  { "2 km", 2000 },
-  { "5 km", 5000 },
-  { "10 km", 10000 },
-  { "20 km", 20000 },
-  { "50 km", 50000 },
-  { "100 km", 100000 },
-  { "200 km", 200000 },
-  { "500 km", 500000 },
-  { "1000 km", 1000000 }
-};
+UnitValue constexpr g_arrMeters[] = {{"1 m", 1},         {"2 m", 2},         {"5 m", 5},          {"10 m", 10},
+                                     {"20 m", 20},       {"50 m", 50},       {"100 m", 100},      {"200 m", 200},
+                                     {"500 m", 500},     {"1 km", 1000},     {"2 km", 2000},      {"5 km", 5000},
+                                     {"10 km", 10000},   {"20 km", 20000},   {"50 km", 50000},    {"100 km", 100000},
+                                     {"200 km", 200000}, {"500 km", 500000}, {"1000 km", 1000000}};
 
 double Identity(double val)
 {
@@ -138,11 +96,8 @@ void RulerHelper::Update(ScreenBase const & screen)
   }
 
   int drawScale = df::GetDrawTileScale(screen);
-  if (m_currentDrawScale < kVisibleRulerBottomScale &&
-      drawScale >= kVisibleRulerBottomScale)
-  {
+  if (m_currentDrawScale < kVisibleRulerBottomScale && drawScale >= kVisibleRulerBottomScale)
     SetTextDirty();
-  }
 
   m_currentDrawScale = drawScale;
 }
@@ -217,13 +172,10 @@ void RulerHelper::GetTextInitInfo(std::string & alphabet, uint32_t & size)
   std::for_each(std::begin(g_arrMeters), std::end(g_arrMeters), functor);
   std::for_each(std::begin(g_arrYards), std::end(g_arrYards), functor);
 
-  std::for_each(begin(symbols), end(symbols), [&alphabet](char c)
-  {
-    alphabet.push_back(c);
-  });
+  std::for_each(begin(symbols), end(symbols), [&alphabet](char c) { alphabet.push_back(c); });
   alphabet.append("<>");
 
-  size = static_cast<uint32_t>(result) + 2; // add 2 char for symbols "< " and "> ".
+  size = static_cast<uint32_t>(result) + 2;  // add 2 char for symbols "< " and "> ".
 }
 
 double RulerHelper::CalcMetersDiff(double value)
@@ -251,10 +203,10 @@ double RulerHelper::CalcMetersDiff(double value)
     m_rulerText = std::string("< ") + arrU[0].m_s;
     result = kMinMetersWidth - 1.0;
   }
-  else if (arrU[count-1].m_i <= v)
+  else if (arrU[count - 1].m_i <= v)
   {
     m_rangeIndex = kMaxUnitValue;
-    m_rulerText = std::string("> ") + arrU[count-1].m_s;
+    m_rulerText = std::string("> ") + arrU[count - 1].m_s;
     result = kMaxMetersWidth + 1.0;
   }
   else
diff --git a/libs/drape_frontend/gui/scale_fps_helper.hpp b/libs/drape_frontend/gui/scale_fps_helper.hpp
index 55ce30d03..74f9575e2 100644
--- a/libs/drape_frontend/gui/scale_fps_helper.hpp
+++ b/libs/drape_frontend/gui/scale_fps_helper.hpp
@@ -16,10 +16,7 @@ public:
     return static_cast<uint32_t>(1.0 / m_frameTime);
   }
 
-  bool IsPaused() const
-  {
-    return m_isPaused;
-  }
+  bool IsPaused() const { return m_isPaused; }
 
   void SetFrameTime(double frameTime, bool isActiveFrame)
   {
diff --git a/libs/drape_frontend/gui/shape.cpp b/libs/drape_frontend/gui/shape.cpp
index e918ee2dd..bc659c265 100644
--- a/libs/drape_frontend/gui/shape.cpp
+++ b/libs/drape_frontend/gui/shape.cpp
@@ -13,8 +13,8 @@
 namespace gui
 {
 Handle::Handle(uint32_t id, dp::Anchor anchor, m2::PointF const & pivot)
-  : dp::OverlayHandle(dp::OverlayID(FeatureID(MwmSet::MwmId{}, id)), anchor, 0 /* priority */,
-                      1 /* minVisibleScale */, false /* isBillboard */)
+  : dp::OverlayHandle(dp::OverlayID(FeatureID(MwmSet::MwmId{}, id)), anchor, 0 /* priority */, 1 /* minVisibleScale */,
+                      false /* isBillboard */)
   , m_pivot(glsl::ToVec2(pivot))
 {}
 
@@ -46,8 +46,7 @@ m2::RectD Handle::GetPixelRect(ScreenBase const & screen, bool perspective) cons
   return {};
 }
 
-void Handle::GetPixelShape(ScreenBase const & screen, bool perspective,
-                           dp::OverlayHandle::Rects & rects) const
+void Handle::GetPixelShape(ScreenBase const & screen, bool perspective, dp::OverlayHandle::Rects & rects) const
 {
   // There is no need to check intersection of gui elements.
   UNUSED_VALUE(screen);
@@ -62,8 +61,8 @@ bool TappableHandle::IsTapped(m2::RectD const & touchArea) const
 
   if (m_anchor == dp::Anchor::Center)
   {
-    m2::RectD rect(m_pivot.x - m_size.x * 0.5, m_pivot.y - m_size.y * 0.5,
-                   m_pivot.x + m_size.x * 0.5, m_pivot.y + m_size.y * 0.5);
+    m2::RectD rect(m_pivot.x - m_size.x * 0.5, m_pivot.y - m_size.y * 0.5, m_pivot.x + m_size.x * 0.5,
+                   m_pivot.y + m_size.y * 0.5);
     return rect.Intersect(touchArea);
   }
   else
@@ -82,9 +81,7 @@ ShapeRenderer::~ShapeRenderer()
 void ShapeRenderer::Build(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng)
 {
   ForEachShapeInfo([context, mng](ShapeControl::ShapeInfo & info) mutable
-  {
-    info.m_buffer->Build(context, mng->GetProgram(info.m_state.GetProgram<gpu::Program>()));
-  });
+  { info.m_buffer->Build(context, mng->GetProgram(info.m_state.GetProgram<gpu::Program>())); });
 }
 
 void ShapeRenderer::Render(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
@@ -137,10 +134,8 @@ void ShapeRenderer::AddShapeControl(ShapeControl && control)
 void ShapeRenderer::SetPivot(m2::PointF const & pivot)
 {
   for (auto & control : m_shapes)
-  {
     for (auto & info : control.m_shapesInfo)
       info.m_handle->SetPivot(glsl::ToVec2(pivot));
-  }
 }
 
 void ShapeRenderer::ForEachShapeControl(TShapeControlEditFn const & fn)
@@ -151,9 +146,7 @@ void ShapeRenderer::ForEachShapeControl(TShapeControlEditFn const & fn)
 void ShapeRenderer::ForEachShapeInfo(ShapeRenderer::TShapeInfoEditFn const & fn)
 {
   ForEachShapeControl([&fn](ShapeControl & shape)
-  {
-    std::for_each(shape.m_shapesInfo.begin(), shape.m_shapesInfo.end(), fn);
-  });
+  { std::for_each(shape.m_shapesInfo.begin(), shape.m_shapesInfo.end(), fn); });
 }
 
 ref_ptr<Handle> ShapeRenderer::ProcessTapEvent(m2::RectD const & touchArea)
@@ -180,8 +173,7 @@ ref_ptr<Handle> ShapeRenderer::FindHandle(FeatureID const & id)
   return resultHandle;
 }
 
-ShapeControl::ShapeInfo::ShapeInfo(dp::RenderState const & state,
-                                   drape_ptr<dp::VertexArrayBuffer> && buffer,
+ShapeControl::ShapeInfo::ShapeInfo(dp::RenderState const & state, drape_ptr<dp::VertexArrayBuffer> && buffer,
                                    drape_ptr<Handle> && handle)
   : m_state(state)
   , m_buffer(std::move(buffer))
diff --git a/libs/drape_frontend/gui/shape.hpp b/libs/drape_frontend/gui/shape.hpp
index a6790e30c..4876caa28 100644
--- a/libs/drape_frontend/gui/shape.hpp
+++ b/libs/drape_frontend/gui/shape.hpp
@@ -48,7 +48,8 @@ class TappableHandle : public Handle
 
 public:
   TappableHandle(uint32_t id, dp::Anchor anchor, m2::PointF const & pivot, m2::PointF size)
-    : Handle(id, anchor, pivot), m_size(size)
+    : Handle(id, anchor, pivot)
+    , m_size(size)
   {}
 
   bool IsTapped(m2::RectD const & touchArea) const override;
@@ -66,8 +67,7 @@ struct ShapeControl
   struct ShapeInfo
   {
     ShapeInfo() : m_state(df::CreateRenderState(gpu::Program::TexturingGui, df::DepthLayer::GuiLayer)) {}
-    ShapeInfo(dp::RenderState const & state, drape_ptr<dp::VertexArrayBuffer> && buffer,
-              drape_ptr<Handle> && handle);
+    ShapeInfo(dp::RenderState const & state, drape_ptr<dp::VertexArrayBuffer> && buffer, drape_ptr<Handle> && handle);
 
     void Destroy();
 
@@ -111,9 +111,7 @@ private:
 class Shape
 {
 public:
-  explicit Shape(gui::Position const & position)
-    : m_position(position)
-  {}
+  explicit Shape(gui::Position const & position) : m_position(position) {}
 
   using TTapHandler = std::function<void()>;
 
diff --git a/libs/drape_frontend/gui/skin.cpp b/libs/drape_frontend/gui/skin.cpp
index c0f3f230f..33d9469e2 100644
--- a/libs/drape_frontend/gui/skin.cpp
+++ b/libs/drape_frontend/gui/skin.cpp
@@ -37,9 +37,7 @@ dp::Anchor ParseValueAnchor(std::string_view value)
   if (value == "bottom")
     return dp::Bottom;
   else
-  {
     ASSERT(false, ());
-  }
 
   return dp::Center;
 }
@@ -71,9 +69,7 @@ public:
     Offset
   };
 
-  ResolverParser()
-    : m_element(Element::Empty)
-  {}
+  ResolverParser() : m_element(Element::Empty) {}
 
   void Parse(std::string_view attr, char const * value)
   {
@@ -96,26 +92,15 @@ public:
       else if (m_element == Element::Relative)
         m_resolver.AddRelative(ParseValueAnchor(value));
       else
-      {
         ASSERT(false, ());
-      }
     }
   }
 
-  void Reset()
-  {
-    m_resolver = PositionResolver();
-  }
+  void Reset() { m_resolver = PositionResolver(); }
 
-  PositionResolver const & GetResolver() const
-  {
-    return m_resolver;
-  }
+  PositionResolver const & GetResolver() const { return m_resolver; }
 
-  void SetElement(Element e)
-  {
-    m_element = e;
-  }
+  void SetElement(Element e) { m_element = e; }
 
 private:
   Element m_element;
@@ -125,9 +110,7 @@ private:
 class SkinLoader
 {
 public:
-  explicit SkinLoader(std::map<EWidget, std::pair<PositionResolver, PositionResolver>> & skin)
-    : m_skin(skin)
-  {}
+  explicit SkinLoader(std::map<EWidget, std::pair<PositionResolver, PositionResolver>> & skin) : m_skin(skin) {}
 
   bool Push(std::string_view element)
   {
@@ -144,18 +127,14 @@ public:
       else if (element == "copyright")
         m_currentElement = WIDGET_COPYRIGHT;
       else
-      {
         ASSERT(false, ());
-      }
     }
     else if (!m_inConfiguration)
     {
       if (element == "portrait" || element == "landscape")
         m_inConfiguration = true;
       else
-      {
         ASSERT(false, ());
-      }
     }
     else
     {
@@ -166,9 +145,7 @@ public:
       else if (element == "offset")
         m_parser.SetElement(ResolverParser::Element::Offset);
       else
-      {
         ASSERT(false, ());
-      }
     }
 
     return true;
@@ -190,17 +167,13 @@ public:
       m_parser.Reset();
       m_inConfiguration = false;
     }
-    else if (element == "ruler" || element == "compass" || element == "copyright" ||
-             element == "country_status")
+    else if (element == "ruler" || element == "compass" || element == "copyright" || element == "country_status")
     {
       m_inElement = false;
     }
   }
 
-  void AddAttr(std::string_view attribute, char const * value)
-  {
-    m_parser.Parse(attribute, value);
-  }
+  void AddAttr(std::string_view attribute, char const * value) { m_parser.Parse(attribute, value); }
 
   void CharData(std::string const &) {}
 
@@ -213,7 +186,7 @@ private:
 
   std::map<EWidget, std::pair<PositionResolver, PositionResolver>> & m_skin;
 };
-}
+}  // namespace
 
 Position PositionResolver::Resolve(int w, int h, double vs) const
 {
@@ -222,18 +195,18 @@ Position PositionResolver::Resolve(int w, int h, double vs) const
   m2::PointF offset = m_offset * vs;
 
   if (m_resolveAnchor & dp::Left)
-   resultX = offset.x;
+    resultX = offset.x;
   else if (m_resolveAnchor & dp::Right)
-   resultX = w - offset.x;
+    resultX = w - offset.x;
   else
-   resultX += offset.x;
+    resultX += offset.x;
 
   if (m_resolveAnchor & dp::Top)
-   resultY = offset.y;
+    resultY = offset.y;
   else if (m_resolveAnchor & dp::Bottom)
-   resultY = h - offset.y;
+    resultY = h - offset.y;
   else
-   resultY += offset.y;
+    resultY += offset.y;
 
   return Position(m2::PointF(resultX, resultY), m_elementAnchor);
 }
@@ -258,11 +231,10 @@ void PositionResolver::SetOffsetY(float y)
   m_offset.y = y;
 }
 
-Skin::Skin(ReaderPtr<Reader> const & reader, float visualScale)
-  : m_visualScale(visualScale)
+Skin::Skin(ReaderPtr<Reader> const & reader, float visualScale) : m_visualScale(visualScale)
 {
   SkinLoader loader(m_resolvers);
-  ReaderSource<ReaderPtr<Reader> > source(reader);
+  ReaderSource<ReaderPtr<Reader>> source(reader);
   if (!ParseXML(source, loader))
     LOG(LERROR, ("Error parsing gui skin"));
 }
@@ -290,9 +262,9 @@ ReaderPtr<Reader> ResolveGuiSkinFile(std::string const & deviceType)
   {
     reader = pl.GetReader("symbols/default/" + deviceType + ".ui");
   }
-  catch(FileAbsentException & e)
+  catch (FileAbsentException & e)
   {
-    LOG(LINFO, ("Gui skin for : ", deviceType ,"not found"));
+    LOG(LINFO, ("Gui skin for : ", deviceType, "not found"));
   }
 
   if (!reader)
@@ -301,7 +273,7 @@ ReaderPtr<Reader> ResolveGuiSkinFile(std::string const & deviceType)
     {
       reader = pl.GetReader("symbols/default/default.ui");
     }
-    catch(FileAbsentException & e)
+    catch (FileAbsentException & e)
     {
       LOG(LINFO, ("Default gui skin not found"));
       throw e;
diff --git a/libs/drape_frontend/gui/skin.hpp b/libs/drape_frontend/gui/skin.hpp
index 400f25dad..365137d3b 100644
--- a/libs/drape_frontend/gui/skin.hpp
+++ b/libs/drape_frontend/gui/skin.hpp
@@ -42,20 +42,11 @@ enum EGuiHandle
 
 struct Position
 {
-  Position()
-    : m_pixelPivot(m2::PointF::Zero())
-    , m_anchor(dp::Center)
-  {}
+  Position() : m_pixelPivot(m2::PointF::Zero()), m_anchor(dp::Center) {}
 
-  explicit Position(dp::Anchor anchor)
-    : m_pixelPivot(m2::PointF::Zero())
-    , m_anchor(anchor)
-  {}
+  explicit Position(dp::Anchor anchor) : m_pixelPivot(m2::PointF::Zero()), m_anchor(anchor) {}
 
-  Position(m2::PointF const & pt, dp::Anchor anchor)
-    : m_pixelPivot(pt)
-    , m_anchor(anchor)
-  {}
+  Position(m2::PointF const & pt, dp::Anchor anchor) : m_pixelPivot(pt), m_anchor(anchor) {}
 
   m2::PointF m_pixelPivot;
   dp::Anchor m_anchor;
diff --git a/libs/drape_frontend/kinetic_scroller.cpp b/libs/drape_frontend/kinetic_scroller.cpp
index c3f1008db..907d15795 100644
--- a/libs/drape_frontend/kinetic_scroller.cpp
+++ b/libs/drape_frontend/kinetic_scroller.cpp
@@ -45,15 +45,9 @@ public:
 
   Animation::Type GetType() const override { return Animation::Type::KineticScroll; }
 
-  TAnimObjects const & GetObjects() const override
-  {
-    return m_objects;
-  }
+  TAnimObjects const & GetObjects() const override { return m_objects; }
 
-  bool HasObject(Object object) const override
-  {
-    return m_objects.find(object) != m_objects.end();
-  }
+  bool HasObject(Object object) const override { return m_objects.find(object) != m_objects.end(); }
 
   TObjectProperties const & GetProperties(Object object) const override
   {
@@ -79,10 +73,7 @@ public:
   double GetDuration() const override { return m_duration; }
   bool IsFinished() const override { return m_elapsedTime >= m_duration; }
 
-  void Advance(double elapsedSeconds) override
-  {
-    m_elapsedTime += elapsedSeconds;
-  }
+  void Advance(double elapsedSeconds) override { m_elapsedTime += elapsedSeconds; }
 
   void Finish() override
   {
@@ -107,10 +98,7 @@ public:
   }
 
 private:
-  double GetT() const
-  {
-    return IsFinished() ? 1.0 : m_elapsedTime / m_duration;
-  }
+  double GetT() const { return IsFinished() ? 1.0 : m_elapsedTime / m_duration; }
 
   m2::PointD m_endPos;
   m2::PointD m_direction;
@@ -137,9 +125,7 @@ void KineticScroller::Update(ScreenBase const & modelView)
   if (m_points.size() > 1)
   {
     auto it = std::find_if(m_points.begin(), m_points.end(), [&nowTime](auto const & e)
-    {
-      return GetDurationSeconds(nowTime, e.second) <= kTimeWindowSec;
-    });
+    { return GetDurationSeconds(nowTime, e.second) <= kTimeWindowSec; });
 
     // Keep last point always.
     if (it == m_points.end())
diff --git a/libs/drape_frontend/line_shape.cpp b/libs/drape_frontend/line_shape.cpp
index c76c23608..5f370109d 100644
--- a/libs/drape_frontend/line_shape.cpp
+++ b/libs/drape_frontend/line_shape.cpp
@@ -22,24 +22,19 @@ class TextureCoordGenerator
 {
 public:
   explicit TextureCoordGenerator(dp::TextureManager::StippleRegion const & region)
-    : m_region(region), m_maskSize(m_region.GetMaskPixelSize())
+    : m_region(region)
+    , m_maskSize(m_region.GetMaskPixelSize())
   {}
 
   glsl::vec4 GetTexCoordsByDistance(float distance, bool isLeft) const
   {
     m2::RectF const & texRect = m_region.GetTexRect();
-    return { distance / GetMaskLength(), texRect.minX(), texRect.SizeX(), isLeft ? texRect.minY() : texRect.maxY() };
+    return {distance / GetMaskLength(), texRect.minX(), texRect.SizeX(), isLeft ? texRect.minY() : texRect.maxY()};
   }
 
-  uint32_t GetMaskLength() const
-  {
-    return m_maskSize.x;
-  }
+  uint32_t GetMaskLength() const { return m_maskSize.x; }
 
-  dp::TextureManager::StippleRegion const & GetRegion() const
-  {
-    return m_region;
-  }
+  dp::TextureManager::StippleRegion const & GetRegion() const { return m_region; }
 
 private:
   dp::TextureManager::StippleRegion const m_region;
@@ -66,70 +61,43 @@ public:
     , m_colorCoord(glsl::ToVec2(params.m_color.GetTexRect().Center()))
   {
     m_geometry.reserve(geomsSize);
-    //m_joinGeom.reserve(joinsSize);
+    // m_joinGeom.reserve(joinsSize);
   }
 
-  dp::BindingInfo const & GetBindingInfo() override
-  {
-    return TVertex::GetBindingInfo();
-  }
+  dp::BindingInfo const & GetBindingInfo() override { return TVertex::GetBindingInfo(); }
 
-  ref_ptr<void> GetLineData() override
-  {
-    return make_ref(m_geometry.data());
-  }
+  ref_ptr<void> GetLineData() override { return make_ref(m_geometry.data()); }
 
-  uint32_t GetLineSize() override
-  {
-    return static_cast<uint32_t>(m_geometry.size());
-  }
+  uint32_t GetLineSize() override { return static_cast<uint32_t>(m_geometry.size()); }
 
-//  ref_ptr<void> GetJoinData() override
-//  {
-//    return make_ref(m_joinGeom.data());
-//  }
+  //  ref_ptr<void> GetJoinData() override
+  //  {
+  //    return make_ref(m_joinGeom.data());
+  //  }
 
-//  uint32_t GetJoinSize() override
-//  {
-//    return static_cast<uint32_t>(m_joinGeom.size());
-//  }
+  //  uint32_t GetJoinSize() override
+  //  {
+  //    return static_cast<uint32_t>(m_joinGeom.size());
+  //  }
 
-  float GetHalfWidth()
-  {
-    return m_params.m_pxHalfWidth;
-  }
+  float GetHalfWidth() { return m_params.m_pxHalfWidth; }
 
-  dp::BindingInfo const & GetCapBindingInfo() override
-  {
-    return GetBindingInfo();
-  }
+  dp::BindingInfo const & GetCapBindingInfo() override { return GetBindingInfo(); }
 
-  dp::RenderState GetCapState() override
-  {
-    return GetState();
-  }
+  dp::RenderState GetCapState() override { return GetState(); }
 
-  ref_ptr<void> GetCapData() override
-  {
-    return ref_ptr<void>();
-  }
+  ref_ptr<void> GetCapData() override { return ref_ptr<void>(); }
 
-  uint32_t GetCapSize() override
-  {
-    return 0;
-  }
+  uint32_t GetCapSize() override { return 0; }
 
-  float GetSide(bool isLeft) const
-  {
-    return isLeft ? 1.0f : -1.0f;
-  }
+  float GetSide(bool isLeft) const { return isLeft ? 1.0f : -1.0f; }
 
 protected:
   using V = TVertex;
   using TGeometryBuffer = gpu::VBReservedSizeT<V>;
 
   TGeometryBuffer m_geometry;
-  //TGeometryBuffer m_joinGeom;
+  // TGeometryBuffer m_joinGeom;
 
   BaseBuilderParams m_params;
   glsl::vec2 const m_colorCoord;
@@ -204,15 +172,9 @@ public:
     return state;
   }
 
-  ref_ptr<void> GetCapData() override
-  {
-    return make_ref<void>(m_capGeometry.data());
-  }
+  ref_ptr<void> GetCapData() override { return make_ref<void>(m_capGeometry.data()); }
 
-  uint32_t GetCapSize() override
-  {
-    return static_cast<uint32_t>(m_capGeometry.size());
-  }
+  uint32_t GetCapSize() override { return static_cast<uint32_t>(m_capGeometry.size()); }
 
   void SubmitVertex(glsl::vec3 const & pivot, glsl::vec2 const & normal, bool isLeft)
   {
@@ -246,8 +208,7 @@ private:
                                CapVertex::TNormal(radius * kSqrt3, -radius, radius),
                                CapVertex::TTexCoord(m_colorCoord));
     m_capGeometry.emplace_back(CapVertex::TPosition(pos, m_params.m_depth),
-                               CapVertex::TNormal(0, 2.0f * radius, radius),
-                               CapVertex::TTexCoord(m_colorCoord));
+                               CapVertex::TNormal(0, 2.0f * radius, radius), CapVertex::TTexCoord(m_colorCoord));
   }
 
 private:
@@ -276,10 +237,7 @@ public:
     return state;
   }
 
-  void SubmitVertex(glsl::vec3 const & pivot)
-  {
-    m_geometry.emplace_back(pivot, m_colorCoord);
-  }
+  void SubmitVertex(glsl::vec3 const & pivot) { m_geometry.emplace_back(pivot, m_colorCoord); }
 
 private:
   int m_lineWidth;
@@ -303,10 +261,7 @@ public:
     , m_baseGtoPScale(params.m_baseGtoP)
   {}
 
-  float GetMaskLengthG() const
-  {
-    return m_texCoordGen.GetMaskLength() / m_baseGtoPScale;
-  }
+  float GetMaskLengthG() const { return m_texCoordGen.GetMaskLength() / m_baseGtoPScale; }
 
   dp::RenderState GetState() override
   {
@@ -320,8 +275,8 @@ public:
   void SubmitVertex(glsl::vec3 const & pivot, glsl::vec2 const & normal, bool isLeft, float offsetFromStart)
   {
     float const halfWidth = GetHalfWidth();
-    m_geometry.emplace_back(pivot, TNormal(halfWidth * normal, halfWidth * GetSide(isLeft)),
-                            m_colorCoord, m_texCoordGen.GetTexCoordsByDistance(offsetFromStart, isLeft));
+    m_geometry.emplace_back(pivot, TNormal(halfWidth * normal, halfWidth * GetSide(isLeft)), m_colorCoord,
+                            m_texCoordGen.GetTexCoordsByDistance(offsetFromStart, isLeft));
   }
 
 private:
@@ -344,7 +299,8 @@ void LineShape::Construct(TBuilder & builder) const
   ASSERT(false, ("No implementation"));
 }
 
-template <class FnT> void LineShape::ForEachSplineSection(FnT && fn) const
+template <class FnT>
+void LineShape::ForEachSplineSection(FnT && fn) const
 {
   std::vector<m2::PointD> const & path = m_spline->GetPath();
   ASSERT(!path.empty(), ());
@@ -371,10 +327,8 @@ template <class FnT> void LineShape::ForEachSplineSection(FnT && fn) const
 
     glsl::vec2 const tangent = glsl::ToVec2(tanlen.first);
 
-    fn(ToShapeVertex2(path[i]), ToShapeVertex2(path[j]),
-       tangent, tanlen.second,
-       {-tangent.y, tangent.x}, {tangent.y, -tangent.x},
-       (i == 0 ? 0x1 : 0) + (j == sz ? 0x2 : 0));
+    fn(ToShapeVertex2(path[i]), ToShapeVertex2(path[j]), tangent, tanlen.second, {-tangent.y, tangent.x},
+       {tangent.y, -tangent.x}, (i == 0 ? 0x1 : 0) + (j == sz ? 0x2 : 0));
 
     i = j;
   }
@@ -388,14 +342,14 @@ void LineShape::Construct<DashedLineBuilder>(DashedLineBuilder & builder) const
 
   // Each segment should lie in pattern mask according to the "longest" possible pixel length in current tile.
   // Since, we calculate vertices once, usually for the "smallest" tile scale, need to apply divide factor here.
-  // In other words, if m_baseGtoPScale = Scale(tileLevel), we should use Scale(tileLevel + 1) to calculate 'maskLengthG'.
+  // In other words, if m_baseGtoPScale = Scale(tileLevel), we should use Scale(tileLevel + 1) to calculate
+  // 'maskLengthG'.
   /// @todo Logically, the factor should be 2, but drawing artifacts are still present at higher visual scales.
   /// Use 3 for the best quality, but need to review here, probably I missed something.
   float const maskLengthG = builder.GetMaskLengthG() / 3;
 
   float offset = 0;
-  ForEachSplineSection([&](glsl::vec2 const & p1, glsl::vec2 const & p2,
-                           glsl::vec2 const & tangent, float toDraw,
+  ForEachSplineSection([&](glsl::vec2 const & p1, glsl::vec2 const & p2, glsl::vec2 const & tangent, float toDraw,
                            glsl::vec2 const & leftNormal, glsl::vec2 const & rightNormal, int)
   {
     glsl::vec2 currPivot = p1;
@@ -429,8 +383,8 @@ void LineShape::Construct<DashedLineBuilder>(DashedLineBuilder & builder) const
       offset = nextOffset;
       if (offset >= maskLengthG)
         offset = 0;
-
-    } while (toDraw > 0);
+    }
+    while (toDraw > 0);
   });
 }
 
@@ -441,10 +395,8 @@ void LineShape::Construct<SolidLineBuilder>(SolidLineBuilder & builder) const
   // Skip joins generation for thin lines.
   bool const generateJoins = builder.GetHalfWidth() > 2.5f;
 
-  ForEachSplineSection([&](glsl::vec2 const & p1, glsl::vec2 const & p2,
-                           glsl::vec2 const & tangent, double,
-                           glsl::vec2 const & leftNormal, glsl::vec2 const & rightNormal,
-                           int flag)
+  ForEachSplineSection([&](glsl::vec2 const & p1, glsl::vec2 const & p2, glsl::vec2 const & tangent, double,
+                           glsl::vec2 const & leftNormal, glsl::vec2 const & rightNormal, int flag)
   {
     builder.SubmitVertex({p1, m_params.m_depth}, rightNormal, false /* isLeft */);
     builder.SubmitVertex({p1, m_params.m_depth}, leftNormal, true /* isLeft */);
@@ -452,11 +404,11 @@ void LineShape::Construct<SolidLineBuilder>(SolidLineBuilder & builder) const
     builder.SubmitVertex({p2, m_params.m_depth}, leftNormal, true /* isLeft */);
 
     // Generate joins.
-    if (flag & 0x1)   // p1 - first point
+    if (flag & 0x1)  // p1 - first point
       builder.SubmitCap(p1);
-    if (flag & 0x2)   // p2 - last point
+    if (flag & 0x2)  // p2 - last point
       builder.SubmitCap(p2);
-    else if (generateJoins)   // p2 - middle point
+    else if (generateJoins)  // p2 - middle point
       builder.SubmitJoin(p2);
   });
 }
@@ -560,13 +512,13 @@ void LineShape::Draw(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Batcher>
     batcher->InsertListOfStrip(context, state, make_ref(&provider), dp::Batcher::VertexPerQuad);
 
     // Not used, keep comment for possible usage. LineJoin::RoundJoin is processed as _Cap_.
-//    uint32_t const joinSize = m_lineShapeInfo->GetJoinSize();
-//    if (joinSize > 0)
-//    {
-//      dp::AttributeProvider joinsProvider(1, joinSize);
-//      joinsProvider.InitStream(0, m_lineShapeInfo->GetBindingInfo(), m_lineShapeInfo->GetJoinData());
-//      batcher->InsertTriangleList(context, state, make_ref(&joinsProvider));
-//    }
+    //    uint32_t const joinSize = m_lineShapeInfo->GetJoinSize();
+    //    if (joinSize > 0)
+    //    {
+    //      dp::AttributeProvider joinsProvider(1, joinSize);
+    //      joinsProvider.InitStream(0, m_lineShapeInfo->GetBindingInfo(), m_lineShapeInfo->GetJoinData());
+    //      batcher->InsertTriangleList(context, state, make_ref(&joinsProvider));
+    //    }
 
     uint32_t const capSize = m_lineShapeInfo->GetCapSize();
     if (capSize > 0)
@@ -582,4 +534,3 @@ void LineShape::Draw(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Batcher>
   }
 }
 }  // namespace df
-
diff --git a/libs/drape_frontend/line_shape.hpp b/libs/drape_frontend/line_shape.hpp
index 5330e371d..a0efc5d25 100644
--- a/libs/drape_frontend/line_shape.hpp
+++ b/libs/drape_frontend/line_shape.hpp
@@ -23,8 +23,8 @@ public:
   virtual ref_ptr<void> GetLineData() = 0;
   virtual uint32_t GetLineSize() = 0;
 
-//  virtual ref_ptr<void> GetJoinData() = 0;
-//  virtual uint32_t GetJoinSize() = 0;
+  //  virtual ref_ptr<void> GetJoinData() = 0;
+  //  virtual uint32_t GetJoinSize() = 0;
 
   virtual dp::BindingInfo const & GetCapBindingInfo() = 0;
   virtual dp::RenderState GetCapState() = 0;
@@ -47,7 +47,8 @@ private:
     return glsl::ToVec2(ConvertToLocal(vertex, m_params.m_tileCenter, kShapeCoordScalar));
   }
 
-  template <class FnT> void ForEachSplineSection(FnT && fn) const;
+  template <class FnT>
+  void ForEachSplineSection(FnT && fn) const;
 
   template <typename TBuilder>
   void Construct(TBuilder & builder) const;
@@ -60,4 +61,3 @@ private:
   mutable bool m_isSimple;
 };
 }  // namespace df
-
diff --git a/libs/drape_frontend/line_shape_helper.cpp b/libs/drape_frontend/line_shape_helper.cpp
index 41949b358..104228ac0 100644
--- a/libs/drape_frontend/line_shape_helper.cpp
+++ b/libs/drape_frontend/line_shape_helper.cpp
@@ -12,8 +12,7 @@ void UpdateNormalBetweenSegments(LineSegment * segment1, LineSegment * segment2)
 {
   ASSERT(segment1 != nullptr && segment2 != nullptr, ());
 
-  float const dotProduct = glsl::dot(segment1->m_leftNormals[EndPoint],
-                                     segment2->m_leftNormals[StartPoint]);
+  float const dotProduct = glsl::dot(segment1->m_leftNormals[EndPoint], segment2->m_leftNormals[StartPoint]);
   float const absDotProduct = fabs(dotProduct);
   float const kEps = 1e-5;
 
@@ -24,16 +23,15 @@ void UpdateNormalBetweenSegments(LineSegment * segment1, LineSegment * segment2)
   }
 
   float const kMaxScalar = 5;
-  float const crossProduct = glsl::cross(glsl::vec3(segment1->m_tangent, 0),
-                                         glsl::vec3(segment2->m_tangent, 0)).z;
+  float const crossProduct = glsl::cross(glsl::vec3(segment1->m_tangent, 0), glsl::vec3(segment2->m_tangent, 0)).z;
   if (crossProduct < 0)
   {
     segment1->m_hasLeftJoin[EndPoint] = true;
     segment2->m_hasLeftJoin[StartPoint] = true;
 
     // change right-side normals
-    glsl::vec2 averageNormal = glsl::normalize(segment1->m_rightNormals[EndPoint] +
-                                               segment2->m_rightNormals[StartPoint]);
+    glsl::vec2 averageNormal =
+        glsl::normalize(segment1->m_rightNormals[EndPoint] + segment2->m_rightNormals[StartPoint]);
     float const cosAngle = glsl::dot(segment1->m_tangent, averageNormal);
     float const widthScalar = 1.0f / sqrt(1.0f - cosAngle * cosAngle);
     if (widthScalar < kMaxScalar)
@@ -55,8 +53,7 @@ void UpdateNormalBetweenSegments(LineSegment * segment1, LineSegment * segment2)
     segment2->m_hasLeftJoin[StartPoint] = false;
 
     // change left-side normals
-    glsl::vec2 averageNormal = glsl::normalize(segment1->m_leftNormals[EndPoint] +
-                                               segment2->m_leftNormals[StartPoint]);
+    glsl::vec2 averageNormal = glsl::normalize(segment1->m_leftNormals[EndPoint] + segment2->m_leftNormals[StartPoint]);
     float const cosAngle = glsl::dot(segment1->m_tangent, averageNormal);
     float const widthScalar = 1.0f / sqrt(1.0f - cosAngle * cosAngle);
     if (widthScalar < kMaxScalar)
@@ -75,9 +72,8 @@ void UpdateNormalBetweenSegments(LineSegment * segment1, LineSegment * segment2)
 }
 }  // namespace
 
-void CalculateTangentAndNormals(glsl::vec2 const & pt0, glsl::vec2 const & pt1,
-                                glsl::vec2 & tangent, glsl::vec2 & leftNormal,
-                                glsl::vec2 & rightNormal)
+void CalculateTangentAndNormals(glsl::vec2 const & pt0, glsl::vec2 const & pt1, glsl::vec2 & tangent,
+                                glsl::vec2 & leftNormal, glsl::vec2 & rightNormal)
 {
   tangent = glsl::normalize(pt1 - pt0);
   leftNormal = glsl::vec2(-tangent.y, tangent.x);
@@ -90,9 +86,7 @@ void ConstructLineSegments(std::vector<m2::PointD> const & path, std::vector<gls
   ASSERT_LESS(1, path.size(), ());
 
   if (!segmentsColors.empty())
-  {
     ASSERT_EQUAL(segmentsColors.size() + 1, path.size(), ());
-  }
 
   m2::PointD prevPoint = path[0];
   for (size_t i = 1; i < path.size(); ++i)
@@ -107,8 +101,8 @@ void ConstructLineSegments(std::vector<m2::PointD> const & path, std::vector<gls
     segments.emplace_back(glsl::ToVec2(p1), glsl::ToVec2(p2));
     LineSegment & segment = segments.back();
 
-    CalculateTangentAndNormals(glsl::ToVec2(p1), glsl::ToVec2(p2), segment.m_tangent,
-                               segment.m_leftBaseNormal, segment.m_rightBaseNormal);
+    CalculateTangentAndNormals(glsl::ToVec2(p1), glsl::ToVec2(p2), segment.m_tangent, segment.m_leftBaseNormal,
+                               segment.m_rightBaseNormal);
 
     segment.m_leftNormals[StartPoint] = segment.m_leftNormals[EndPoint] = segment.m_leftBaseNormal;
     segment.m_rightNormals[StartPoint] = segment.m_rightNormals[EndPoint] = segment.m_rightBaseNormal;
@@ -130,9 +124,9 @@ void UpdateNormals(LineSegment * segment, LineSegment * prevSegment, LineSegment
     UpdateNormalBetweenSegments(segment, nextSegment);
 }
 
-std::vector<glsl::vec2> GenerateJoinNormals(
-    dp::LineJoin joinType, glsl::vec2 const & normal1, glsl::vec2 const & normal2,
-    float halfWidth, bool isLeft, float widthScalar, std::vector<glsl::vec2> * uv)
+std::vector<glsl::vec2> GenerateJoinNormals(dp::LineJoin joinType, glsl::vec2 const & normal1,
+                                            glsl::vec2 const & normal2, float halfWidth, bool isLeft, float widthScalar,
+                                            std::vector<glsl::vec2> * uv)
 {
   std::vector<glsl::vec2> normals;
   float const eps = 1e-5;
@@ -144,12 +138,12 @@ std::vector<glsl::vec2> GenerateJoinNormals(
     glsl::vec2 const n1 = halfWidth * normal1;
     glsl::vec2 const n2 = halfWidth * normal2;
 
-    normals = { glsl::vec2(0.0f, 0.0f), isLeft ? n1 : n2, isLeft ? n2 : n1 };
+    normals = {glsl::vec2(0.0f, 0.0f), isLeft ? n1 : n2, isLeft ? n2 : n1};
 
     if (uv)
     {
-      *uv = { glsl::vec2(0.5f, 0.5f), isLeft ? glsl::vec2(0.5f, 0.0f) : glsl::vec2(0.5f, 1.0f),
-                                      isLeft ? glsl::vec2(0.5f, 0.0f) : glsl::vec2(0.5f, 1.0f) };
+      *uv = {glsl::vec2(0.5f, 0.5f), isLeft ? glsl::vec2(0.5f, 0.0f) : glsl::vec2(0.5f, 1.0f),
+             isLeft ? glsl::vec2(0.5f, 0.0f) : glsl::vec2(0.5f, 1.0f)};
     }
   }
   else if (joinType == dp::LineJoin::MiterJoin)
@@ -159,16 +153,18 @@ std::vector<glsl::vec2> GenerateJoinNormals(
     glsl::vec2 const n1 = halfWidth * normal1;
     glsl::vec2 const n2 = halfWidth * normal2;
 
-    normals = { glsl::vec2(0.0f, 0.0f), isLeft ? n1 : averageNormal, isLeft ? averageNormal : n1,
-                glsl::vec2(0.0f, 0.0f), isLeft ? averageNormal : n2, isLeft ? n2 : averageNormal };
+    normals = {glsl::vec2(0.0f, 0.0f), isLeft ? n1 : averageNormal, isLeft ? averageNormal : n1,
+               glsl::vec2(0.0f, 0.0f), isLeft ? averageNormal : n2, isLeft ? n2 : averageNormal};
 
     if (uv)
     {
-      *uv = { glsl::vec2(0.5f, 0.5f), isLeft ? glsl::vec2(0.5f, 0.0f) : glsl::vec2(0.5f, 1.0f),
-                                      isLeft ? glsl::vec2(0.5f, 0.0f) : glsl::vec2(0.5f, 1.0f),
+      *uv = {glsl::vec2(0.5f, 0.5f),
+             isLeft ? glsl::vec2(0.5f, 0.0f) : glsl::vec2(0.5f, 1.0f),
+             isLeft ? glsl::vec2(0.5f, 0.0f) : glsl::vec2(0.5f, 1.0f),
 
-              glsl::vec2(0.5f, 0.5f), isLeft ? glsl::vec2(0.5f, 0.0f) : glsl::vec2(0.5f, 1.0f),
-                                      isLeft ? glsl::vec2(0.5f, 0.0f) : glsl::vec2(0.5f, 1.0f) };
+             glsl::vec2(0.5f, 0.5f),
+             isLeft ? glsl::vec2(0.5f, 0.0f) : glsl::vec2(0.5f, 1.0f),
+             isLeft ? glsl::vec2(0.5f, 0.0f) : glsl::vec2(0.5f, 1.0f)};
     }
   }
   else
@@ -208,9 +204,9 @@ std::vector<glsl::vec2> GenerateJoinNormals(
   return normals;
 }
 
-std::vector<glsl::vec2> GenerateCapNormals(
-    dp::LineCap capType, glsl::vec2 const & normal1, glsl::vec2 const & normal2,
-    glsl::vec2 const & direction, float halfWidth, bool isStart, int segmentsCount)
+std::vector<glsl::vec2> GenerateCapNormals(dp::LineCap capType, glsl::vec2 const & normal1, glsl::vec2 const & normal2,
+                                           glsl::vec2 const & direction, float halfWidth, bool isStart,
+                                           int segmentsCount)
 {
   std::vector<glsl::vec2> normals;
   if (capType == dp::ButtCap)
@@ -223,8 +219,7 @@ std::vector<glsl::vec2> GenerateCapNormals(
     glsl::vec2 const n3 = halfWidth * (normal1 + direction);
     glsl::vec2 const n4 = halfWidth * (normal2 + direction);
 
-    normals = { n2, isStart ? n4 : n1, isStart ? n1 : n4,
-                n1, isStart ? n4 : n3, isStart ? n3 : n4 };
+    normals = {n2, isStart ? n4 : n1, isStart ? n1 : n4, n1, isStart ? n4 : n3, isStart ? n3 : n4};
   }
   else
   {
@@ -253,12 +248,11 @@ glsl::vec2 GetNormal(LineSegment const & segment, bool isLeft, ENormalType norma
     return isLeft ? segment.m_leftBaseNormal : segment.m_rightBaseNormal;
 
   int const index = (normalType == StartNormal) ? StartPoint : EndPoint;
-  return isLeft ? segment.m_leftWidthScalar[index].x * segment.m_leftNormals[index]:
-                  segment.m_rightWidthScalar[index].x * segment.m_rightNormals[index];
+  return isLeft ? segment.m_leftWidthScalar[index].x * segment.m_leftNormals[index]
+                : segment.m_rightWidthScalar[index].x * segment.m_rightNormals[index];
 }
 
-float GetProjectionLength(glsl::vec2 const & newPoint, glsl::vec2 const & startPoint,
-                          glsl::vec2 const & endPoint)
+float GetProjectionLength(glsl::vec2 const & newPoint, glsl::vec2 const & startPoint, glsl::vec2 const & endPoint)
 {
   glsl::vec2 const v1 = endPoint - startPoint;
   glsl::vec2 const v2 = newPoint - startPoint;
@@ -267,4 +261,3 @@ float GetProjectionLength(glsl::vec2 const & newPoint, glsl::vec2 const & startP
   return sqrt(squareLen) * math::Clamp(proj, 0.0f, 1.0f);
 }
 }  // namespace df
-
diff --git a/libs/drape_frontend/line_shape_helper.hpp b/libs/drape_frontend/line_shape_helper.hpp
index b3ceca2e3..92750aef4 100644
--- a/libs/drape_frontend/line_shape_helper.hpp
+++ b/libs/drape_frontend/line_shape_helper.hpp
@@ -49,25 +49,23 @@ struct LineSegment
   }
 };
 
-void CalculateTangentAndNormals(glsl::vec2 const & pt0, glsl::vec2 const & pt1,
-                                glsl::vec2 & tangent, glsl::vec2 & leftNormal,
-                                glsl::vec2 & rightNormal);
+void CalculateTangentAndNormals(glsl::vec2 const & pt0, glsl::vec2 const & pt1, glsl::vec2 & tangent,
+                                glsl::vec2 & leftNormal, glsl::vec2 & rightNormal);
 
 void ConstructLineSegments(std::vector<m2::PointD> const & path, std::vector<glsl::vec4> const & segmentsColors,
                            std::vector<LineSegment> & segments);
 
 void UpdateNormals(LineSegment * segment, LineSegment * prevSegment, LineSegment * nextSegment);
 
-std::vector<glsl::vec2> GenerateJoinNormals(
-    dp::LineJoin joinType, glsl::vec2 const & normal1, glsl::vec2 const & normal2,
-    float halfWidth, bool isLeft, float widthScalar, std::vector<glsl::vec2> * uv = nullptr);
+std::vector<glsl::vec2> GenerateJoinNormals(dp::LineJoin joinType, glsl::vec2 const & normal1,
+                                            glsl::vec2 const & normal2, float halfWidth, bool isLeft, float widthScalar,
+                                            std::vector<glsl::vec2> * uv = nullptr);
 
-std::vector<glsl::vec2> GenerateCapNormals(
-    dp::LineCap capType, glsl::vec2 const & normal1, glsl::vec2 const & normal2,
-    glsl::vec2 const & direction, float halfWidth, bool isStart, int segmentsCount = 8);
+std::vector<glsl::vec2> GenerateCapNormals(dp::LineCap capType, glsl::vec2 const & normal1, glsl::vec2 const & normal2,
+                                           glsl::vec2 const & direction, float halfWidth, bool isStart,
+                                           int segmentsCount = 8);
 
 glsl::vec2 GetNormal(LineSegment const & segment, bool isLeft, ENormalType normalType);
 
 float GetProjectionLength(glsl::vec2 const & newPoint, glsl::vec2 const & startPoint, glsl::vec2 const & endPoint);
 }  // namespace df
-
diff --git a/libs/drape_frontend/map_data_provider.cpp b/libs/drape_frontend/map_data_provider.cpp
index 53c12773a..320151eae 100644
--- a/libs/drape_frontend/map_data_provider.cpp
+++ b/libs/drape_frontend/map_data_provider.cpp
@@ -6,8 +6,7 @@
 
 namespace df
 {
-MapDataProvider::MapDataProvider(TReadIDsFn && idsReader,
-                                 TReadFeaturesFn && featureReader,
+MapDataProvider::MapDataProvider(TReadIDsFn && idsReader, TReadFeaturesFn && featureReader,
                                  TIsCountryLoadedByNameFn && isCountryLoadedByNameFn,
                                  TUpdateCurrentCountryFn && updateCurrentCountryFn)
   : m_isCountryLoadedByName(std::move(isCountryLoadedByNameFn))
@@ -21,14 +20,12 @@ MapDataProvider::MapDataProvider(TReadIDsFn && idsReader,
   CHECK(m_updateCurrentCountry != nullptr, ());
 }
 
-void MapDataProvider::ReadFeaturesID(TReadCallback<FeatureID const> const & fn, m2::RectD const & r,
-                                     int scale) const
+void MapDataProvider::ReadFeaturesID(TReadCallback<FeatureID const> const & fn, m2::RectD const & r, int scale) const
 {
   m_idsReader(fn, r, scale);
 }
 
-void MapDataProvider::ReadFeatures(TReadCallback<FeatureType> const & fn,
-                                   std::vector<FeatureID> const & ids) const
+void MapDataProvider::ReadFeatures(TReadCallback<FeatureType> const & fn, std::vector<FeatureID> const & ids) const
 {
   m_featureReader(fn, ids);
 }
diff --git a/libs/drape_frontend/map_data_provider.hpp b/libs/drape_frontend/map_data_provider.hpp
index 338f8cb63..de9f76206 100644
--- a/libs/drape_frontend/map_data_provider.hpp
+++ b/libs/drape_frontend/map_data_provider.hpp
@@ -2,8 +2,8 @@
 
 #include "storage/storage_defines.hpp"
 
-#include "indexer/feature.hpp"
 #include "geometry/rect2d.hpp"
+#include "indexer/feature.hpp"
 
 #include <functional>
 #include <string>
@@ -14,22 +14,19 @@ namespace df
 class MapDataProvider
 {
 public:
-  template <typename T> using TReadCallback = std::function<void(T &)>;
-  using TReadFeaturesFn = std::function<void(TReadCallback<FeatureType> const &,
-                                             std::vector<FeatureID> const &)>;
-  using TReadIDsFn = std::function<void(TReadCallback<FeatureID const> const &,
-                                        m2::RectD const &, int)>;
+  template <typename T>
+  using TReadCallback = std::function<void(T &)>;
+  using TReadFeaturesFn = std::function<void(TReadCallback<FeatureType> const &, std::vector<FeatureID> const &)>;
+  using TReadIDsFn = std::function<void(TReadCallback<FeatureID const> const &, m2::RectD const &, int)>;
   using TIsCountryLoadedFn = std::function<bool(m2::PointD const &)>;
   using TIsCountryLoadedByNameFn = std::function<bool(std::string_view)>;
   using TUpdateCurrentCountryFn = std::function<void(m2::PointD const &, int)>;
 
-  MapDataProvider(TReadIDsFn && idsReader,
-                  TReadFeaturesFn && featureReader,
+  MapDataProvider(TReadIDsFn && idsReader, TReadFeaturesFn && featureReader,
                   TIsCountryLoadedByNameFn && isCountryLoadedByNameFn,
                   TUpdateCurrentCountryFn && updateCurrentCountryFn);
 
-  void ReadFeaturesID(TReadCallback<FeatureID const> const & fn, m2::RectD const & r,
-                      int scale) const;
+  void ReadFeaturesID(TReadCallback<FeatureID const> const & fn, m2::RectD const & r, int scale) const;
   void ReadFeatures(TReadCallback<FeatureType> const & fn, std::vector<FeatureID> const & ids) const;
 
   TUpdateCurrentCountryFn const & UpdateCurrentCountryFn() const;
diff --git a/libs/drape_frontend/map_shape.hpp b/libs/drape_frontend/map_shape.hpp
index af669c809..4ae57f322 100644
--- a/libs/drape_frontend/map_shape.hpp
+++ b/libs/drape_frontend/map_shape.hpp
@@ -52,9 +52,7 @@ using TMapShapes = std::vector<drape_ptr<MapShape>>;
 class MapShapeMessage : public Message
 {
 public:
-  explicit MapShapeMessage(TileKey const & key)
-    : m_tileKey(key)
-  {}
+  explicit MapShapeMessage(TileKey const & key) : m_tileKey(key) {}
 
   TileKey const & GetKey() const { return m_tileKey; }
 
@@ -81,8 +79,7 @@ public:
 class MapShapeReadedMessage : public MapShapeMessage
 {
 public:
-  MapShapeReadedMessage(TileKey const & key, TMapShapes && shapes)
-    : MapShapeMessage(key), m_shapes(std::move(shapes))
+  MapShapeReadedMessage(TileKey const & key, TMapShapes && shapes) : MapShapeMessage(key), m_shapes(std::move(shapes))
   {}
 
   Type GetType() const override { return Type::MapShapeReaded; }
diff --git a/libs/drape_frontend/message_acceptor.cpp b/libs/drape_frontend/message_acceptor.cpp
index 74532548b..7b3203a0d 100644
--- a/libs/drape_frontend/message_acceptor.cpp
+++ b/libs/drape_frontend/message_acceptor.cpp
@@ -4,9 +4,7 @@
 
 namespace df
 {
-MessageAcceptor::MessageAcceptor()
-  : m_infinityWaiting(false)
-{}
+MessageAcceptor::MessageAcceptor() : m_infinityWaiting(false) {}
 
 bool MessageAcceptor::ProcessSingleMessage(bool waitForMessage)
 {
diff --git a/libs/drape_frontend/message_acceptor.hpp b/libs/drape_frontend/message_acceptor.hpp
index 9f7b97446..e3db7f159 100644
--- a/libs/drape_frontend/message_acceptor.hpp
+++ b/libs/drape_frontend/message_acceptor.hpp
@@ -5,8 +5,8 @@
 #include "drape/pointers.hpp"
 
 #include <atomic>
-#include <mutex>
 #include <functional>
+#include <mutex>
 
 namespace df
 {
diff --git a/libs/drape_frontend/message_queue.cpp b/libs/drape_frontend/message_queue.cpp
index 9b4fa08b1..c09fcffe9 100644
--- a/libs/drape_frontend/message_queue.cpp
+++ b/libs/drape_frontend/message_queue.cpp
@@ -5,9 +5,7 @@
 
 namespace df
 {
-MessageQueue::MessageQueue()
-  : m_isWaiting(false)
-{}
+MessageQueue::MessageQueue() : m_isWaiting(false) {}
 
 MessageQueue::~MessageQueue()
 {
@@ -49,42 +47,42 @@ void MessageQueue::PushMessage(drape_ptr<Message> && message, MessagePriority pr
   switch (priority)
   {
   case MessagePriority::Normal:
-    {
-      m_messages.emplace_back(std::move(message), priority);
-      break;
-    }
+  {
+    m_messages.emplace_back(std::move(message), priority);
+    break;
+  }
   case MessagePriority::High:
-    {
-      auto iter = m_messages.begin();
-      while (iter != m_messages.end() && iter->second > MessagePriority::High) { iter++; }
-      m_messages.emplace(iter, std::move(message), priority);
-      break;
-    }
+  {
+    auto iter = m_messages.begin();
+    while (iter != m_messages.end() && iter->second > MessagePriority::High)
+      iter++;
+    m_messages.emplace(iter, std::move(message), priority);
+    break;
+  }
   case MessagePriority::UberHighSingleton:
+  {
+    bool found = false;
+    auto iter = m_messages.begin();
+    while (iter != m_messages.end() && iter->second == MessagePriority::UberHighSingleton)
     {
-      bool found = false;
-      auto iter = m_messages.begin();
-      while (iter != m_messages.end() && iter->second == MessagePriority::UberHighSingleton)
+      if (iter->first->GetType() == message->GetType())
       {
-        if (iter->first->GetType() == message->GetType())
-        {
-          found = true;
-          break;
-        }
-        iter++;
+        found = true;
+        break;
       }
+      iter++;
+    }
 
-      if (!found)
-        m_messages.emplace_front(std::move(message), priority);
-      break;
-    }
+    if (!found)
+      m_messages.emplace_front(std::move(message), priority);
+    break;
+  }
   case MessagePriority::Low:
-    {
-      m_lowPriorityMessages.emplace_back(std::move(message));
-      break;
-    }
-  default:
-    ASSERT(false, ("Unknown message priority type"));
+  {
+    m_lowPriorityMessages.emplace_back(std::move(message));
+    break;
+  }
+  default: ASSERT(false, ("Unknown message priority type"));
   }
 
   CancelWaitImpl();
@@ -94,21 +92,17 @@ void MessageQueue::FilterMessagesImpl()
 {
   CHECK(m_filter != nullptr, ());
 
-  for (auto it = m_messages.begin(); it != m_messages.end(); )
-  {
+  for (auto it = m_messages.begin(); it != m_messages.end();)
     if (m_filter(make_ref(it->first)))
       it = m_messages.erase(it);
     else
       ++it;
-  }
 
-  for (auto it = m_lowPriorityMessages.begin(); it != m_lowPriorityMessages.end(); )
-  {
+  for (auto it = m_lowPriorityMessages.begin(); it != m_lowPriorityMessages.end();)
     if (m_filter(make_ref(*it)))
       it = m_lowPriorityMessages.erase(it);
     else
       ++it;
-  }
 }
 
 void MessageQueue::EnableMessageFiltering(FilterMessageFn && filter)
diff --git a/libs/drape_frontend/message_subclasses.hpp b/libs/drape_frontend/message_subclasses.hpp
index 3beff5c95..00325e25c 100644
--- a/libs/drape_frontend/message_subclasses.hpp
+++ b/libs/drape_frontend/message_subclasses.hpp
@@ -53,7 +53,7 @@ public:
     void Wait()
     {
       std::unique_lock<std::mutex> lock(m_lock);
-      m_signal.wait(lock, [this]{return !m_blocked;} );
+      m_signal.wait(lock, [this] { return !m_blocked; });
     }
 
   private:
@@ -72,14 +72,9 @@ public:
     bool m_blocked = true;
   };
 
-  explicit BaseBlockingMessage(Blocker & blocker)
-    : m_blocker(blocker)
-  {}
+  explicit BaseBlockingMessage(Blocker & blocker) : m_blocker(blocker) {}
 
-  ~BaseBlockingMessage() override
-  {
-    m_blocker.Signal();
-  }
+  ~BaseBlockingMessage() override { m_blocker.Signal(); }
 
 private:
   Blocker & m_blocker;
@@ -88,9 +83,7 @@ private:
 class BaseTileMessage : public Message
 {
 public:
-  explicit BaseTileMessage(TileKey const & key)
-    : m_tileKey(key)
-  {}
+  explicit BaseTileMessage(TileKey const & key) : m_tileKey(key) {}
 
   TileKey const & GetKey() const { return m_tileKey; }
 
@@ -107,7 +100,8 @@ public:
 class FinishTileReadMessage : public Message
 {
 public:
-  template<typename T> FinishTileReadMessage(T && tiles, bool forceUpdateUserMarks)
+  template <typename T>
+  FinishTileReadMessage(T && tiles, bool forceUpdateUserMarks)
     : m_tiles(std::forward<T>(tiles))
     , m_forceUpdateUserMarks(forceUpdateUserMarks)
   {}
@@ -126,8 +120,7 @@ private:
 class FlushRenderBucketMessage : public BaseTileMessage
 {
 public:
-  FlushRenderBucketMessage(TileKey const & key, dp::RenderState const & state,
-                           drape_ptr<dp::RenderBucket> && buffer)
+  FlushRenderBucketMessage(TileKey const & key, dp::RenderState const & state, drape_ptr<dp::RenderBucket> && buffer)
     : BaseTileMessage(key)
     , m_state(state)
     , m_buffer(std::move(buffer))
@@ -161,14 +154,12 @@ private:
   RenderDataType m_data;
 };
 
-using FlushOverlaysMessage = FlushRenderDataMessage<TOverlaysRenderData,
-                                                    Message::Type::FlushOverlays>;
+using FlushOverlaysMessage = FlushRenderDataMessage<TOverlaysRenderData, Message::Type::FlushOverlays>;
 
 class InvalidateRectMessage : public Message
 {
 public:
-  explicit InvalidateRectMessage(m2::RectD const & rect)
-    : m_rect(rect) {}
+  explicit InvalidateRectMessage(m2::RectD const & rect) : m_rect(rect) {}
 
   Type GetType() const override { return Type::InvalidateRect; }
 
@@ -211,9 +202,7 @@ private:
 class ClearUserMarkGroupMessage : public Message
 {
 public:
-  explicit ClearUserMarkGroupMessage(kml::MarkGroupId groupId)
-    : m_groupId(groupId)
-  {}
+  explicit ClearUserMarkGroupMessage(kml::MarkGroupId groupId) : m_groupId(groupId) {}
 
   Type GetType() const override { return Type::ClearUserMarkGroup; }
 
@@ -228,7 +217,8 @@ class ChangeUserMarkGroupVisibilityMessage : public Message
 public:
   ChangeUserMarkGroupVisibilityMessage(kml::MarkGroupId groupId, bool isVisible)
     : m_groupId(groupId)
-    , m_isVisible(isVisible) {}
+    , m_isVisible(isVisible)
+  {}
 
   Type GetType() const override { return Type::ChangeUserMarkGroupVisibility; }
 
@@ -243,8 +233,7 @@ private:
 class UpdateUserMarksMessage : public Message
 {
 public:
-  UpdateUserMarksMessage(drape_ptr<IDCollections> && justCreatedIds,
-                         drape_ptr<IDCollections> && removedIds,
+  UpdateUserMarksMessage(drape_ptr<IDCollections> && justCreatedIds, drape_ptr<IDCollections> && removedIds,
                          drape_ptr<UserMarksRenderCollection> && marksRenderParams,
                          drape_ptr<UserLinesRenderCollection> && linesRenderParams)
     : m_justCreatedIds(std::move(justCreatedIds))
@@ -270,8 +259,7 @@ private:
 class UpdateUserMarkGroupMessage : public Message
 {
 public:
-  UpdateUserMarkGroupMessage(kml::MarkGroupId groupId,
-                             drape_ptr<IDCollections> && ids)
+  UpdateUserMarkGroupMessage(kml::MarkGroupId groupId, drape_ptr<IDCollections> && ids)
     : m_groupId(groupId)
     , m_ids(std::move(ids))
   {}
@@ -286,8 +274,7 @@ private:
   drape_ptr<IDCollections> m_ids;
 };
 
-using FlushUserMarksMessage = FlushRenderDataMessage<TUserMarksRenderData,
-                                                     Message::Type::FlushUserMarks>;
+using FlushUserMarksMessage = FlushRenderDataMessage<TUserMarksRenderData, Message::Type::FlushUserMarks>;
 
 class InvalidateUserMarksMessage : public Message
 {
@@ -325,7 +312,7 @@ public:
     , m_needResetOldGui(needResetOldGui)
   {}
 
-  Type GetType() const override { return Type::GuiRecache;}
+  Type GetType() const override { return Type::GuiRecache; }
   bool IsGraphicsContextDependent() const override { return true; }
 
   gui::TWidgetsInitInfo const & GetInitInfo() const { return m_initInfo; }
@@ -348,9 +335,7 @@ public:
 class GuiLayerLayoutMessage : public Message
 {
 public:
-  explicit GuiLayerLayoutMessage(gui::TWidgetsLayoutInfo const & info)
-    : m_layoutInfo(info)
-  {}
+  explicit GuiLayerLayoutMessage(gui::TWidgetsLayoutInfo const & info) : m_layoutInfo(info) {}
 
   Type GetType() const override { return Type::GuiLayerLayout; }
   bool IsGraphicsContextDependent() const override { return true; }
@@ -362,13 +347,10 @@ private:
   gui::TWidgetsLayoutInfo m_layoutInfo;
 };
 
-class UpdateMyPositionRoutingOffsetMessage: public Message
+class UpdateMyPositionRoutingOffsetMessage : public Message
 {
 public:
-  UpdateMyPositionRoutingOffsetMessage(bool useDefault, int offsetY)
-    : m_useDefault(useDefault)
-    , m_offsetY(offsetY)
-  {}
+  UpdateMyPositionRoutingOffsetMessage(bool useDefault, int offsetY) : m_useDefault(useDefault), m_offsetY(offsetY) {}
 
   Type GetType() const override { return Type::UpdateMyPositionRoutingOffset; }
 
@@ -390,9 +372,7 @@ public:
 class SetKineticScrollEnabledMessage : public Message
 {
 public:
-  explicit SetKineticScrollEnabledMessage(bool enabled)
-    : m_enabled(enabled)
-  {}
+  explicit SetKineticScrollEnabledMessage(bool enabled) : m_enabled(enabled) {}
 
   Type GetType() const override { return Type::SetKineticScrollEnabled; }
 
@@ -405,8 +385,8 @@ private:
 class SetAddNewPlaceModeMessage : public Message
 {
 public:
-  SetAddNewPlaceModeMessage(bool enable, std::vector<m2::TriangleD> && boundArea,
-                            bool enableKineticScroll, m2::PointD const * optionalPosition)
+  SetAddNewPlaceModeMessage(bool enable, std::vector<m2::TriangleD> && boundArea, bool enableKineticScroll,
+                            m2::PointD const * optionalPosition)
     : m_enable(enable)
     , m_boundArea(std::move(boundArea))
     , m_enableKineticScroll(enableKineticScroll)
@@ -432,9 +412,7 @@ private:
 class BlockTapEventsMessage : public Message
 {
 public:
-  explicit BlockTapEventsMessage(bool block)
-    : m_needBlock(block)
-  {}
+  explicit BlockTapEventsMessage(bool block) : m_needBlock(block) {}
 
   Type GetType() const override { return Type::BlockTapEvents; }
 
@@ -460,10 +438,7 @@ public:
 
   drape_ptr<MyPosition> && AcceptShape() { return std::move(m_shape); }
   drape_ptr<SelectionShape> AcceptSelection() { return std::move(m_selection); }
-  Arrow3d::PreloadedData && AcceptPeloadedArrow3dData()
-  {
-    return std::move(m_preloadedArrow3dData);
-  }
+  Arrow3d::PreloadedData && AcceptPeloadedArrow3dData() { return std::move(m_preloadedArrow3dData); }
 
 private:
   drape_ptr<MyPosition> m_shape;
@@ -481,9 +456,7 @@ public:
     StopFollowing
   };
 
-  explicit ChangeMyPositionModeMessage(EChangeType changeType)
-    : m_changeType(changeType)
-  {}
+  explicit ChangeMyPositionModeMessage(EChangeType changeType) : m_changeType(changeType) {}
 
   EChangeType GetChangeType() const { return m_changeType; }
   Type GetType() const override { return Type::ChangeMyPositionMode; }
@@ -495,9 +468,7 @@ private:
 class CompassInfoMessage : public Message
 {
 public:
-  explicit CompassInfoMessage(location::CompassInfo const & info)
-    : m_info(info)
-  {}
+  explicit CompassInfoMessage(location::CompassInfo const & info) : m_info(info) {}
 
   Type GetType() const override { return Type::CompassInfo; }
 
@@ -510,8 +481,7 @@ private:
 class GpsInfoMessage : public Message
 {
 public:
-  GpsInfoMessage(location::GpsInfo const & info, bool isNavigable,
-                 location::RouteMatchingInfo const & routeInfo)
+  GpsInfoMessage(location::GpsInfo const & info, bool isNavigable, location::RouteMatchingInfo const & routeInfo)
     : m_info(info)
     , m_isNavigable(isNavigable)
     , m_routeInfo(routeInfo)
@@ -532,7 +502,8 @@ private:
 class SelectObjectMessage : public Message
 {
 public:
-  struct DismissTag {};
+  struct DismissTag
+  {};
 
   explicit SelectObjectMessage(DismissTag, bool restoreViewport)
     : m_selected(SelectionShape::OBJECT_EMPTY)
@@ -582,14 +553,12 @@ private:
 class CheckSelectionGeometryMessage : public Message
 {
 public:
-  CheckSelectionGeometryMessage(FeatureID const & feature, int recacheId)
-    : m_feature(feature)
-    , m_recacheId(recacheId)
+  CheckSelectionGeometryMessage(FeatureID const & feature, int recacheId) : m_feature(feature), m_recacheId(recacheId)
   {}
 
   Type GetType() const override { return Type::CheckSelectionGeometry; }
 
-  FeatureID const & GetFeature() const { return m_feature; };
+  FeatureID const & GetFeature() const { return m_feature; }
   int GetRecacheId() const { return m_recacheId; }
 
 private:
@@ -597,8 +566,8 @@ private:
   int const m_recacheId;
 };
 
-using BaseFlushSelectionGeometryMessage = FlushRenderDataMessage<drape_ptr<RenderNode>,
-                                                                 Message::Type::FlushSelectionGeometry>;
+using BaseFlushSelectionGeometryMessage =
+    FlushRenderDataMessage<drape_ptr<RenderNode>, Message::Type::FlushSelectionGeometry>;
 class FlushSelectionGeometryMessage : public BaseFlushSelectionGeometryMessage
 {
 public:
@@ -628,7 +597,7 @@ public:
 
   Type GetType() const override { return Type::AddSubroute; }
 
-  dp::DrapeID GetSubrouteId() const { return m_subrouteId; };
+  dp::DrapeID GetSubrouteId() const { return m_subrouteId; }
   SubrouteConstPtr GetSubroute() const { return m_subroute; }
   int GetRecacheId() const { return m_recacheId; }
 
@@ -641,8 +610,7 @@ private:
 class PrepareSubrouteArrowsMessage : public Message
 {
 public:
-  PrepareSubrouteArrowsMessage(dp::DrapeID subrouteId,
-                               std::vector<ArrowBorders> && borders)
+  PrepareSubrouteArrowsMessage(dp::DrapeID subrouteId, std::vector<ArrowBorders> && borders)
     : m_subrouteId(subrouteId)
     , m_borders(std::move(borders))
   {}
@@ -659,9 +627,7 @@ private:
 class CacheSubrouteArrowsMessage : public Message
 {
 public:
-  CacheSubrouteArrowsMessage(dp::DrapeID subrouteId,
-                             std::vector<ArrowBorders> const & borders,
-                             int recacheId)
+  CacheSubrouteArrowsMessage(dp::DrapeID subrouteId, std::vector<ArrowBorders> const & borders, int recacheId)
     : m_subrouteId(subrouteId)
     , m_borders(borders)
     , m_recacheId(recacheId)
@@ -696,18 +662,16 @@ private:
   bool m_deactivateFollowing;
 };
 
-using FlushSubrouteMessage = FlushRenderDataMessage<drape_ptr<SubrouteData>,
-                                                    Message::Type::FlushSubroute>;
-using FlushSubrouteArrowsMessage = FlushRenderDataMessage<drape_ptr<SubrouteArrowsData>,
-                                                          Message::Type::FlushSubrouteArrows>;
-using FlushSubrouteMarkersMessage = FlushRenderDataMessage<drape_ptr<SubrouteMarkersData>,
-                                                           Message::Type::FlushSubrouteMarkers>;
+using FlushSubrouteMessage = FlushRenderDataMessage<drape_ptr<SubrouteData>, Message::Type::FlushSubroute>;
+using FlushSubrouteArrowsMessage =
+    FlushRenderDataMessage<drape_ptr<SubrouteArrowsData>, Message::Type::FlushSubrouteArrows>;
+using FlushSubrouteMarkersMessage =
+    FlushRenderDataMessage<drape_ptr<SubrouteMarkersData>, Message::Type::FlushSubrouteMarkers>;
 
 class AddRoutePreviewSegmentMessage : public Message
 {
 public:
-  AddRoutePreviewSegmentMessage(dp::DrapeID segmentId, m2::PointD const & startPt,
-                                m2::PointD const & finishPt)
+  AddRoutePreviewSegmentMessage(dp::DrapeID segmentId, m2::PointD const & startPt, m2::PointD const & finishPt)
     : m_segmentId(segmentId)
     , m_startPoint(startPt)
     , m_finishPoint(finishPt)
@@ -715,7 +679,7 @@ public:
 
   Type GetType() const override { return Type::AddRoutePreviewSegment; }
 
-  dp::DrapeID GetSegmentId() const { return m_segmentId; };
+  dp::DrapeID GetSegmentId() const { return m_segmentId; }
   m2::PointD const & GetStartPoint() const { return m_startPoint; }
   m2::PointD const & GetFinishPoint() const { return m_finishPoint; }
 
@@ -730,10 +694,7 @@ class RemoveRoutePreviewSegmentMessage : public Message
 public:
   RemoveRoutePreviewSegmentMessage() = default;
 
-  explicit RemoveRoutePreviewSegmentMessage(dp::DrapeID segmentId)
-    : m_segmentId(segmentId)
-    , m_needRemoveAll(false)
-  {}
+  explicit RemoveRoutePreviewSegmentMessage(dp::DrapeID segmentId) : m_segmentId(segmentId), m_needRemoveAll(false) {}
 
   Type GetType() const override { return Type::RemoveRoutePreviewSegment; }
 
@@ -772,8 +733,7 @@ public:
 class FollowRouteMessage : public Message
 {
 public:
-  FollowRouteMessage(int preferredZoomLevel, int preferredZoomLevelIn3d, bool enableAutoZoom,
-                     bool isArrowGlued)
+  FollowRouteMessage(int preferredZoomLevel, int preferredZoomLevelIn3d, bool enableAutoZoom, bool isArrowGlued)
     : m_preferredZoomLevel(preferredZoomLevel)
     , m_preferredZoomLevelIn3d(preferredZoomLevelIn3d)
     , m_enableAutoZoom(enableAutoZoom)
@@ -832,11 +792,9 @@ public:
 class SetVisibleViewportMessage : public Message
 {
 public:
-  explicit SetVisibleViewportMessage(m2::RectD const & rect)
-    : m_rect(rect)
-  {}
+  explicit SetVisibleViewportMessage(m2::RectD const & rect) : m_rect(rect) {}
 
-  Type GetType() const override { return Type::SetVisibleViewport;  }
+  Type GetType() const override { return Type::SetVisibleViewport; }
 
   m2::RectD const & GetRect() const { return m_rect; }
 
@@ -871,9 +829,7 @@ private:
 class AllowAutoZoomMessage : public Message
 {
 public:
-  explicit AllowAutoZoomMessage(bool allowAutoZoom)
-    : m_allowAutoZoom(allowAutoZoom)
-  {}
+  explicit AllowAutoZoomMessage(bool allowAutoZoom) : m_allowAutoZoom(allowAutoZoom) {}
 
   Type GetType() const override { return Type::AllowAutoZoom; }
 
@@ -886,9 +842,7 @@ private:
 class Allow3dBuildingsMessage : public Message
 {
 public:
-  explicit Allow3dBuildingsMessage(bool allow3dBuildings)
-    : m_allow3dBuildings(allow3dBuildings)
-  {}
+  explicit Allow3dBuildingsMessage(bool allow3dBuildings) : m_allow3dBuildings(allow3dBuildings) {}
 
   Type GetType() const override { return Type::Allow3dBuildings; }
 
@@ -901,9 +855,7 @@ private:
 class SetMapLangIndexMessage : public Message
 {
 public:
-  explicit SetMapLangIndexMessage(int8_t mapLangIndex)
-    : m_mapLangIndex(mapLangIndex)
-  {}
+  explicit SetMapLangIndexMessage(int8_t mapLangIndex) : m_mapLangIndex(mapLangIndex) {}
 
   Type GetType() const override { return Type::SetMapLangIndex; }
 
@@ -913,7 +865,6 @@ private:
   int8_t const m_mapLangIndex;
 };
 
-
 class EnablePerspectiveMessage : public Message
 {
 public:
@@ -931,10 +882,7 @@ public:
     RoutePreview
   };
 
-  CacheCirclesPackMessage(uint32_t pointsCount, Destination dest)
-    : m_pointsCount(pointsCount)
-    , m_destination(dest)
-  {}
+  CacheCirclesPackMessage(uint32_t pointsCount, Destination dest) : m_pointsCount(pointsCount), m_destination(dest) {}
 
   Type GetType() const override { return Type::CacheCirclesPack; }
 
@@ -946,13 +894,12 @@ private:
   Destination m_destination;
 };
 
-using BaseFlushCirclesPackMessage = FlushRenderDataMessage<drape_ptr<CirclesPackRenderData>,
-                                                           Message::Type::FlushCirclesPack>;
+using BaseFlushCirclesPackMessage =
+    FlushRenderDataMessage<drape_ptr<CirclesPackRenderData>, Message::Type::FlushCirclesPack>;
 class FlushCirclesPackMessage : public BaseFlushCirclesPackMessage
 {
 public:
-  FlushCirclesPackMessage(drape_ptr<CirclesPackRenderData> && renderData,
-                          CacheCirclesPackMessage::Destination dest)
+  FlushCirclesPackMessage(drape_ptr<CirclesPackRenderData> && renderData, CacheCirclesPackMessage::Destination dest)
     : BaseFlushCirclesPackMessage(std::move(renderData))
     , m_destination(dest)
   {}
@@ -966,8 +913,7 @@ private:
 class UpdateGpsTrackPointsMessage : public Message
 {
 public:
-  UpdateGpsTrackPointsMessage(std::vector<GpsTrackPoint> && toAdd,
-                              std::vector<uint32_t> && toRemove)
+  UpdateGpsTrackPointsMessage(std::vector<GpsTrackPoint> && toAdd, std::vector<uint32_t> && toRemove)
     : m_pointsToAdd(std::move(toAdd))
     , m_pointsToRemove(std::move(toRemove))
   {}
@@ -991,9 +937,7 @@ public:
 class OnEnterForegroundMessage : public Message
 {
 public:
-  explicit OnEnterForegroundMessage(double time)
-    : m_time(time)
-  {}
+  explicit OnEnterForegroundMessage(double time) : m_time(time) {}
 
   Type GetType() const override { return Type::OnEnterForeground; }
 
@@ -1015,8 +959,7 @@ public:
   using Sizes = std::map<std::string, m2::PointF>;
   using RequestSymbolsSizeCallback = std::function<void(Sizes &&)>;
 
-  RequestSymbolsSizeMessage(std::vector<std::string> const & symbols,
-                            RequestSymbolsSizeCallback const & callback)
+  RequestSymbolsSizeMessage(std::vector<std::string> const & symbols, RequestSymbolsSizeCallback const & callback)
     : m_symbols(symbols)
     , m_callback(callback)
   {}
@@ -1059,9 +1002,7 @@ private:
 class EnableTrafficMessage : public Message
 {
 public:
-  explicit EnableTrafficMessage(bool trafficEnabled)
-    : m_trafficEnabled(trafficEnabled)
-  {}
+  explicit EnableTrafficMessage(bool trafficEnabled) : m_trafficEnabled(trafficEnabled) {}
 
   Type GetType() const override { return Type::EnableTraffic; }
 
@@ -1108,15 +1049,12 @@ private:
   TrafficSegmentsColoring m_segmentsColoring;
 };
 
-using FlushTrafficDataMessage = FlushRenderDataMessage<TrafficRenderData,
-                                                       Message::Type::FlushTrafficData>;
+using FlushTrafficDataMessage = FlushRenderDataMessage<TrafficRenderData, Message::Type::FlushTrafficData>;
 
 class ClearTrafficDataMessage : public Message
 {
 public:
-  explicit ClearTrafficDataMessage(MwmSet::MwmId const & mwmId)
-    : m_mwmId(mwmId)
-  {}
+  explicit ClearTrafficDataMessage(MwmSet::MwmId const & mwmId) : m_mwmId(mwmId) {}
 
   Type GetType() const override { return Type::ClearTrafficData; }
 
@@ -1129,9 +1067,7 @@ private:
 class SetSimplifiedTrafficColorsMessage : public Message
 {
 public:
-  SetSimplifiedTrafficColorsMessage(bool isSimplified)
-    : m_isSimplified(isSimplified)
-  {}
+  SetSimplifiedTrafficColorsMessage(bool isSimplified) : m_isSimplified(isSimplified) {}
 
   Type GetType() const override { return Type::SetSimplifiedTrafficColors; }
 
@@ -1144,9 +1080,7 @@ private:
 class EnableIsolinesMessage : public Message
 {
 public:
-  explicit EnableIsolinesMessage(bool isEnabled)
-    : m_isEnabled(isEnabled)
-  {}
+  explicit EnableIsolinesMessage(bool isEnabled) : m_isEnabled(isEnabled) {}
 
   Type GetType() const override { return Type::EnableIsolines; }
 
@@ -1159,9 +1093,7 @@ private:
 class EnableTransitSchemeMessage : public Message
 {
 public:
-  explicit EnableTransitSchemeMessage(bool isEnabled)
-    : m_isEnabled(isEnabled)
-  {}
+  explicit EnableTransitSchemeMessage(bool isEnabled) : m_isEnabled(isEnabled) {}
 
   Type GetType() const override { return Type::EnableTransitScheme; }
 
@@ -1174,9 +1106,7 @@ private:
 class ClearTransitSchemeDataMessage : public Message
 {
 public:
-  explicit ClearTransitSchemeDataMessage(MwmSet::MwmId const & mwmId)
-    : m_mwmId(mwmId)
-  {}
+  explicit ClearTransitSchemeDataMessage(MwmSet::MwmId const & mwmId) : m_mwmId(mwmId) {}
 
   Type GetType() const override { return Type::ClearTransitSchemeData; }
 
@@ -1195,9 +1125,7 @@ public:
 class UpdateTransitSchemeMessage : public Message
 {
 public:
-  UpdateTransitSchemeMessage(TransitDisplayInfos && transitInfos)
-    : m_transitInfos(std::move(transitInfos))
-  {}
+  UpdateTransitSchemeMessage(TransitDisplayInfos && transitInfos) : m_transitInfos(std::move(transitInfos)) {}
 
   Type GetType() const override { return Type::UpdateTransitScheme; }
 
@@ -1213,15 +1141,12 @@ public:
   Type GetType() const override { return Type::RegenerateTransitScheme; }
 };
 
-using FlushTransitSchemeMessage = FlushRenderDataMessage<TransitRenderData,
-                                                         Message::Type::FlushTransitScheme>;
+using FlushTransitSchemeMessage = FlushRenderDataMessage<TransitRenderData, Message::Type::FlushTransitScheme>;
 
 class DrapeApiAddLinesMessage : public Message
 {
 public:
-  explicit DrapeApiAddLinesMessage(DrapeApi::TLines const & lines)
-    : m_lines(lines)
-  {}
+  explicit DrapeApiAddLinesMessage(DrapeApi::TLines const & lines) : m_lines(lines) {}
 
   Type GetType() const override { return Type::DrapeApiAddLines; }
 
@@ -1234,10 +1159,7 @@ private:
 class DrapeApiRemoveMessage : public Message
 {
 public:
-  explicit DrapeApiRemoveMessage(std::string const & id, bool removeAll = false)
-    : m_id(id)
-    , m_removeAll(removeAll)
-  {}
+  explicit DrapeApiRemoveMessage(std::string const & id, bool removeAll = false) : m_id(id), m_removeAll(removeAll) {}
 
   Type GetType() const override { return Type::DrapeApiRemove; }
 
@@ -1254,9 +1176,7 @@ class DrapeApiFlushMessage : public Message
 public:
   using TProperties = std::vector<drape_ptr<DrapeApiRenderProperty>>;
 
-  explicit DrapeApiFlushMessage(TProperties && properties)
-    : m_properties(std::move(properties))
-  {}
+  explicit DrapeApiFlushMessage(TProperties && properties) : m_properties(std::move(properties)) {}
 
   Type GetType() const override { return Type::DrapeApiFlush; }
 
@@ -1272,9 +1192,7 @@ private:
 class SetCustomFeaturesMessage : public Message
 {
 public:
-  explicit SetCustomFeaturesMessage(CustomFeatures && ids)
-    : m_features(std::move(ids))
-  {}
+  explicit SetCustomFeaturesMessage(CustomFeatures && ids) : m_features(std::move(ids)) {}
 
   Type GetType() const override { return Type::SetCustomFeatures; }
 
@@ -1288,9 +1206,7 @@ class RemoveCustomFeaturesMessage : public Message
 {
 public:
   RemoveCustomFeaturesMessage() = default;
-  explicit RemoveCustomFeaturesMessage(MwmSet::MwmId const & mwmId)
-    : m_mwmId(mwmId), m_removeAll(false)
-  {}
+  explicit RemoveCustomFeaturesMessage(MwmSet::MwmId const & mwmId) : m_mwmId(mwmId), m_removeAll(false) {}
 
   Type GetType() const override { return Type::RemoveCustomFeatures; }
   bool NeedRemoveAll() const { return m_removeAll; }
@@ -1304,9 +1220,7 @@ private:
 class SetTrackedFeaturesMessage : public Message
 {
 public:
-  explicit SetTrackedFeaturesMessage(std::vector<FeatureID> && features)
-    : m_features(std::move(features))
-  {}
+  explicit SetTrackedFeaturesMessage(std::vector<FeatureID> && features) : m_features(std::move(features)) {}
 
   Type GetType() const override { return Type::SetTrackedFeatures; }
 
@@ -1335,9 +1249,7 @@ private:
 class SetPosteffectEnabledMessage : public Message
 {
 public:
-  SetPosteffectEnabledMessage(PostprocessRenderer::Effect effect, bool enabled)
-    : m_effect(effect)
-    , m_enabled(enabled)
+  SetPosteffectEnabledMessage(PostprocessRenderer::Effect effect, bool enabled) : m_effect(effect), m_enabled(enabled)
   {}
 
   Type GetType() const override { return Type::SetPosteffectEnabled; }
@@ -1352,9 +1264,7 @@ private:
 class EnableDebugRectRenderingMessage : public Message
 {
 public:
-  explicit EnableDebugRectRenderingMessage(bool enabled)
-    : m_enabled(enabled)
-  {}
+  explicit EnableDebugRectRenderingMessage(bool enabled) : m_enabled(enabled) {}
 
   Type GetType() const override { return Type::EnableDebugRectRendering; }
   bool IsEnabled() const { return m_enabled; }
@@ -1378,9 +1288,7 @@ public:
 class PostUserEventMessage : public Message
 {
 public:
-  explicit PostUserEventMessage(drape_ptr<UserEvent> && event)
-    : m_event(std::move(event))
-  {}
+  explicit PostUserEventMessage(drape_ptr<UserEvent> && event) : m_event(std::move(event)) {}
 
   Type GetType() const override { return Type::PostUserEvent; }
 
@@ -1400,8 +1308,7 @@ public:
 class CleanupTexturesMessage : public Message
 {
 public:
-  explicit CleanupTexturesMessage(std::vector<drape_ptr<dp::HWTexture>> && textures)
-    : m_textures(std::move(textures))
+  explicit CleanupTexturesMessage(std::vector<drape_ptr<dp::HWTexture>> && textures) : m_textures(std::move(textures))
   {}
   Type GetType() const override { return Type::CleanupTextures; }
   bool IsGraphicsContextDependent() const override { return true; }
@@ -1413,9 +1320,7 @@ private:
 class ShowDebugInfoMessage : public Message
 {
 public:
-  explicit ShowDebugInfoMessage(bool shown)
-    : m_shown(shown)
-  {}
+  explicit ShowDebugInfoMessage(bool shown) : m_shown(shown) {}
 
   Type GetType() const override { return Type::ShowDebugInfo; }
   bool IsShown() const { return m_shown; }
@@ -1428,10 +1333,7 @@ class NotifyRenderThreadMessage : public Message
 {
 public:
   using Functor = std::function<void(uint64_t notifyId)>;
-  NotifyRenderThreadMessage(Functor const & functor, uint64_t notifyId)
-    : m_functor(functor)
-    , m_notifyId(notifyId)
-  {}
+  NotifyRenderThreadMessage(Functor const & functor, uint64_t notifyId) : m_functor(functor), m_notifyId(notifyId) {}
 
   // We can not notify render threads without active graphics context.
   bool IsGraphicsContextDependent() const override { return true; }
@@ -1458,10 +1360,7 @@ public:
 
   Type GetType() const override { return Type::Arrow3dRecache; }
 
-  std::optional<Arrow3dCustomDecl> const & GetArrow3dCustomDecl() const
-  {
-    return m_arrow3dCustomDecl;
-  }
+  std::optional<Arrow3dCustomDecl> const & GetArrow3dCustomDecl() const { return m_arrow3dCustomDecl; }
 
 private:
   std::optional<Arrow3dCustomDecl> m_arrow3dCustomDecl;
diff --git a/libs/drape_frontend/metaline_manager.cpp b/libs/drape_frontend/metaline_manager.cpp
index 0f2e3735d..91bfd7f72 100644
--- a/libs/drape_frontend/metaline_manager.cpp
+++ b/libs/drape_frontend/metaline_manager.cpp
@@ -10,8 +10,7 @@
 
 namespace df
 {
-MetalineManager::MetalineManager(ref_ptr<ThreadsCommutator> commutator,
-                                 MapDataProvider & model)
+MetalineManager::MetalineManager(ref_ptr<ThreadsCommutator> commutator, MapDataProvider & model)
   : m_model(model)
   , m_commutator(commutator)
 {}
@@ -67,8 +66,7 @@ void MetalineManager::OnTaskFinished(std::shared_ptr<ReadMetalineTask> const & t
   {
     // Notify frontend renderer.
     LOG(LDEBUG, ("Metalines prepared:", task->GetMwmId()));
-    m_commutator->PostMessage(ThreadsCommutator::RenderThread,
-                              make_unique_dp<UpdateMetalinesMessage>(),
+    m_commutator->PostMessage(ThreadsCommutator::RenderThread, make_unique_dp<UpdateMetalinesMessage>(),
                               MessagePriority::Normal);
   }
 
diff --git a/libs/drape_frontend/metaline_manager.hpp b/libs/drape_frontend/metaline_manager.hpp
index b9762505f..e12127d5c 100644
--- a/libs/drape_frontend/metaline_manager.hpp
+++ b/libs/drape_frontend/metaline_manager.hpp
@@ -18,8 +18,7 @@ class ThreadsCommutator;
 class MetalineManager
 {
 public:
-  MetalineManager(ref_ptr<ThreadsCommutator> commutator,
-                  MapDataProvider & model);
+  MetalineManager(ref_ptr<ThreadsCommutator> commutator, MapDataProvider & model);
   ~MetalineManager();
 
   void Stop();
diff --git a/libs/drape_frontend/my_position.cpp b/libs/drape_frontend/my_position.cpp
index 919e02a4e..b31a39eb3 100644
--- a/libs/drape_frontend/my_position.cpp
+++ b/libs/drape_frontend/my_position.cpp
@@ -13,7 +13,6 @@
 #include "drape/overlay_handle.hpp"
 #include "drape/render_bucket.hpp"
 
-
 namespace df
 {
 namespace mp
@@ -23,10 +22,7 @@ df::ColorConstant const kMyPositionAccuracyColor = "MyPositionAccuracy";
 struct MarkerVertex
 {
   MarkerVertex() = default;
-  MarkerVertex(glsl::vec2 const & normal, glsl::vec2 const & texCoord)
-    : m_normal(normal)
-    , m_texCoord(texCoord)
-  {}
+  MarkerVertex(glsl::vec2 const & normal, glsl::vec2 const & texCoord) : m_normal(normal), m_texCoord(texCoord) {}
 
   glsl::vec2 m_normal;
   glsl::vec2 m_texCoord;
@@ -108,7 +104,7 @@ void MyPosition::RenderAccuracy(ref_ptr<dp::GraphicsContext> context, ref_ptr<gp
 {
   m2::PointD accuracyPoint(m_position.x + m_accuracy, m_position.y);
   auto const pixelAccuracy =
-    static_cast<float>((screen.GtoP(accuracyPoint) - screen.GtoP(m2::PointD(m_position))).Length());
+      static_cast<float>((screen.GtoP(accuracyPoint) - screen.GtoP(m2::PointD(m_position))).Length());
 
   gpu::ShapesProgramParams params;
   frameValues.SetTo(params);
@@ -117,7 +113,7 @@ void MyPosition::RenderAccuracy(ref_ptr<dp::GraphicsContext> context, ref_ptr<gp
   params.m_modelView = glsl::make_mat4(mv.m_data);
 
   auto const pos = static_cast<m2::PointF>(
-    MapShape::ConvertToLocal(m2::PointD(m_position), key.GetGlobalRect().Center(), kShapeCoordScalar));
+      MapShape::ConvertToLocal(m2::PointD(m_position), key.GetGlobalRect().Center(), kShapeCoordScalar));
   params.m_position = glsl::vec3(pos.x, pos.y, 0.0f);
   params.m_accuracy = pixelAccuracy;
   RenderPart(context, mng, params, MyPositionAccuracy);
@@ -142,15 +138,14 @@ void MyPosition::RenderMyPosition(ref_ptr<dp::GraphicsContext> context, ref_ptr<
     params.m_modelView = glsl::make_mat4(mv.m_data);
 
     auto const pos = static_cast<m2::PointF>(
-      MapShape::ConvertToLocal(m2::PointD(m_position), key.GetGlobalRect().Center(), kShapeCoordScalar));
+        MapShape::ConvertToLocal(m2::PointD(m_position), key.GetGlobalRect().Center(), kShapeCoordScalar));
     params.m_position = glsl::vec3(pos.x, pos.y, dp::depth::kMyPositionMarkDepth);
     params.m_azimut = -(m_azimuth + static_cast<float>(screen.GetAngle()));
     RenderPart(context, mng, params, MyPositionPoint);
   }
 }
 
-void MyPosition::CacheAccuracySector(ref_ptr<dp::GraphicsContext> context,
-                                     ref_ptr<dp::TextureManager> mng)
+void MyPosition::CacheAccuracySector(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::TextureManager> mng)
 {
   size_t constexpr kTriangleCount = 40;
   size_t constexpr kVertexCount = 3 * kTriangleCount;
@@ -180,8 +175,7 @@ void MyPosition::CacheAccuracySector(ref_ptr<dp::GraphicsContext> context,
   {
     dp::Batcher batcher(kTriangleCount * dp::Batcher::IndexPerTriangle, kVertexCount);
     batcher.SetBatcherHash(static_cast<uint64_t>(BatcherBucket::Default));
-    dp::SessionGuard guard(context, batcher,
-      [this](dp::RenderState const & state, drape_ptr<dp::RenderBucket> && b)
+    dp::SessionGuard guard(context, batcher, [this](dp::RenderState const & state, drape_ptr<dp::RenderBucket> && b)
     {
       drape_ptr<dp::RenderBucket> bucket = std::move(b);
       ASSERT(bucket->GetOverlayHandlesCount() == 0, ());
@@ -193,27 +187,21 @@ void MyPosition::CacheAccuracySector(ref_ptr<dp::GraphicsContext> context,
     dp::AttributeProvider provider(1 /* stream count */, kVertexCount);
     provider.InitStream(0 /* stream index */, mp::GetMarkerBindingInfo(), make_ref(buffer.data()));
 
-    m_parts[MyPositionAccuracy].first = batcher.InsertTriangleList(context, state,
-                                                                   make_ref(&provider), nullptr);
+    m_parts[MyPositionAccuracy].first = batcher.InsertTriangleList(context, state, make_ref(&provider), nullptr);
     ASSERT(m_parts[MyPositionAccuracy].first.IsValid(), ());
   }
 }
 
-void MyPosition::CacheSymbol(ref_ptr<dp::GraphicsContext> context,
-                             dp::TextureManager::SymbolRegion const & symbol,
-                             dp::RenderState const & state, dp::Batcher & batcher,
-                             EMyPositionPart part)
+void MyPosition::CacheSymbol(ref_ptr<dp::GraphicsContext> context, dp::TextureManager::SymbolRegion const & symbol,
+                             dp::RenderState const & state, dp::Batcher & batcher, EMyPositionPart part)
 {
   m2::RectF const & texRect = symbol.GetTexRect();
   m2::PointF const halfSize = symbol.GetPixelSize() * 0.5f;
 
-  mp::MarkerVertex data[4] =
-  {
-    { glsl::vec2(-halfSize.x,  halfSize.y), glsl::ToVec2(texRect.LeftTop()) },
-    { glsl::vec2(-halfSize.x, -halfSize.y), glsl::ToVec2(texRect.LeftBottom()) },
-    { glsl::vec2( halfSize.x,  halfSize.y), glsl::ToVec2(texRect.RightTop()) },
-    { glsl::vec2( halfSize.x, -halfSize.y), glsl::ToVec2(texRect.RightBottom())}
-  };
+  mp::MarkerVertex data[4] = {{glsl::vec2(-halfSize.x, halfSize.y), glsl::ToVec2(texRect.LeftTop())},
+                              {glsl::vec2(-halfSize.x, -halfSize.y), glsl::ToVec2(texRect.LeftBottom())},
+                              {glsl::vec2(halfSize.x, halfSize.y), glsl::ToVec2(texRect.RightTop())},
+                              {glsl::vec2(halfSize.x, -halfSize.y), glsl::ToVec2(texRect.RightBottom())}};
 
   dp::AttributeProvider provider(1 /* streamCount */, dp::Batcher::VertexPerQuad);
   provider.InitStream(0 /* streamIndex */, mp::GetMarkerBindingInfo(), make_ref(data));
@@ -232,13 +220,12 @@ void MyPosition::CachePointPosition(ref_ptr<dp::GraphicsContext> context, ref_pt
   state.SetColorTexture(pointSymbol.GetTexture());
   state.SetTextureIndex(pointSymbol.GetTextureIndex());
 
-  dp::TextureManager::SymbolRegion * symbols[kSymbolsCount] = { &pointSymbol };
-  EMyPositionPart partIndices[kSymbolsCount] = { MyPositionPoint };
+  dp::TextureManager::SymbolRegion * symbols[kSymbolsCount] = {&pointSymbol};
+  EMyPositionPart partIndices[kSymbolsCount] = {MyPositionPoint};
   {
     dp::Batcher batcher(kSymbolsCount * dp::Batcher::IndexPerQuad, kSymbolsCount * dp::Batcher::VertexPerQuad);
     batcher.SetBatcherHash(static_cast<uint64_t>(BatcherBucket::Default));
-    dp::SessionGuard guard(context, batcher,
-      [this](dp::RenderState const & state, drape_ptr<dp::RenderBucket> && b)
+    dp::SessionGuard guard(context, batcher, [this](dp::RenderState const & state, drape_ptr<dp::RenderBucket> && b)
     {
       drape_ptr<dp::RenderBucket> bucket = std::move(b);
       ASSERT(bucket->GetOverlayHandlesCount() == 0, ());
diff --git a/libs/drape_frontend/my_position.hpp b/libs/drape_frontend/my_position.hpp
index 5fe3bb862..7a1158975 100644
--- a/libs/drape_frontend/my_position.hpp
+++ b/libs/drape_frontend/my_position.hpp
@@ -35,8 +35,8 @@ public:
   void SetRoutingMode(bool routingMode);
   void SetPositionObsolete(bool obsolete);
 
-  void RenderAccuracy(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
-                      ScreenBase const & screen, int zoomLevel, FrameValues const & frameValues);
+  void RenderAccuracy(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng, ScreenBase const & screen,
+                      int zoomLevel, FrameValues const & frameValues);
 
   void RenderMyPosition(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
                         ScreenBase const & screen, int zoomLevel, FrameValues const & frameValues);
@@ -53,12 +53,10 @@ private:
   };
 
   void RenderPart(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
-                  gpu::ShapesProgramParams const & params,
-                  EMyPositionPart part);
+                  gpu::ShapesProgramParams const & params, EMyPositionPart part);
 
-  void CacheSymbol(ref_ptr<dp::GraphicsContext> context,
-                   dp::TextureManager::SymbolRegion const & symbol, dp::RenderState const & state,
-                   dp::Batcher & batcher, EMyPositionPart part);
+  void CacheSymbol(ref_ptr<dp::GraphicsContext> context, dp::TextureManager::SymbolRegion const & symbol,
+                   dp::RenderState const & state, dp::Batcher & batcher, EMyPositionPart part);
 
   m2::PointF m_position;
   float m_azimuth;
diff --git a/libs/drape_frontend/my_position_controller.cpp b/libs/drape_frontend/my_position_controller.cpp
index 3a74c1ad8..10c8876eb 100644
--- a/libs/drape_frontend/my_position_controller.cpp
+++ b/libs/drape_frontend/my_position_controller.cpp
@@ -45,7 +45,8 @@ int GetZoomLevel(ScreenBase const & screen, m2::PointD const & position, double
 {
   ScreenBase s = screen;
   m2::PointD const size(errorRadius, errorRadius);
-  s.SetFromRect(m2::AnyRectD(position, ang::Angle<double>(screen.GetAngle()), m2::RectD(position - size, position + size)));
+  s.SetFromRect(
+      m2::AnyRectD(position, ang::Angle<double>(screen.GetAngle()), m2::RectD(position - size, position + size)));
   return GetZoomLevel(s);
 }
 
@@ -59,21 +60,21 @@ double CalculateZoomBySpeed(double speedMpS, bool isPerspectiveAllowed)
 {
   using TSpeedScale = std::pair<double, double>;
   static std::array<TSpeedScale, 6> const scales3d = {{
-    {20.0, 0.25},
-    {40.0, 0.75},
-    {60.0, 1.50},
-    {75.0, 2.50},
-    {85.0, 3.75},
-    {95.0, 6.00},
+      {20.0, 0.25},
+      {40.0, 0.75},
+      {60.0, 1.50},
+      {75.0, 2.50},
+      {85.0, 3.75},
+      {95.0, 6.00},
   }};
 
   static std::array<TSpeedScale, 6> const scales2d = {{
-    {20.0, 0.70},
-    {40.0, 1.25},
-    {60.0, 2.25},
-    {75.0, 3.00},
-    {85.0, 3.75},
-    {95.0, 6.00},
+      {20.0, 0.70},
+      {40.0, 1.25},
+      {60.0, 2.25},
+      {75.0, 3.00},
+      {85.0, 3.75},
+      {95.0, 6.00},
   }};
 
   std::array<TSpeedScale, 6> const & scales = isPerspectiveAllowed ? scales3d : scales2d;
@@ -315,10 +316,8 @@ void MyPositionController::CorrectGlobalScalePoint(m2::PointD & pt) const
     pt = m_position;
 }
 
-void MyPositionController::SetRenderShape(ref_ptr<dp::GraphicsContext> context,
-                                          ref_ptr<dp::TextureManager> texMng,
-                                          drape_ptr<MyPosition> && shape,
-                                          Arrow3d::PreloadedData && preloadedData)
+void MyPositionController::SetRenderShape(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::TextureManager> texMng,
+                                          drape_ptr<MyPosition> && shape, Arrow3d::PreloadedData && preloadedData)
 {
   m_shape = std::move(shape);
   if (!m_shape->InitArrow(context, texMng, std::move(preloadedData)))
@@ -335,7 +334,9 @@ void MyPositionController::ResetRenderShape()
 
 void MyPositionController::NextMode(ScreenBase const & screen)
 {
-  // When the app is awaiting location (indicator is active) and the user presses on the indicator, location updates will be stopped and goes into NotFollowNoPosition state. The next press on the indicator will start location updates again.
+  // When the app is awaiting location (indicator is active) and the user presses on the indicator, location updates
+  // will be stopped and goes into NotFollowNoPosition state. The next press on the indicator will start location
+  // updates again.
   if (IsWaitingForLocation())
   {
     m_desiredInitMode = location::Follow;
@@ -393,14 +394,12 @@ void MyPositionController::NextMode(ScreenBase const & screen)
   }
 }
 
-void MyPositionController::OnLocationUpdate(location::GpsInfo const & info, bool isNavigable,
-                                            ScreenBase const & screen)
+void MyPositionController::OnLocationUpdate(location::GpsInfo const & info, bool isNavigable, ScreenBase const & screen)
 {
   m2::PointD const oldPos = GetDrawablePosition();
   double const oldAzimut = GetDrawableAzimut();
 
-  m2::RectD const rect =
-      mercator::MetersToXY(info.m_longitude, info.m_latitude, info.m_horizontalAccuracy);
+  m2::RectD const rect = mercator::MetersToXY(info.m_longitude, info.m_latitude, info.m_horizontalAccuracy);
   // Use FromLatLon instead of rect.Center() since in case of large info.m_horizontalAccuracy
   // there is significant difference between the real location and the estimated one.
   m_position = mercator::FromLatLon(info.m_latitude, info.m_longitude);
@@ -477,17 +476,14 @@ void MyPositionController::OnLocationUpdate(location::GpsInfo const & info, bool
         if (!AnimationSystem::Instance().AnimationExists(Animation::Object::MapPlane))
           ChangeModelView(m_position, kDoNotChangeZoom);
       }
+      else if (GetZoomLevel(screen, m_position, m_errorRadius) <= kMaxScaleZoomLevel)
+      {
+        m2::PointD const size(m_errorRadius, m_errorRadius);
+        ChangeModelView(m2::RectD(m_position - size, m_position + size));
+      }
       else
       {
-        if (GetZoomLevel(screen, m_position, m_errorRadius) <= kMaxScaleZoomLevel)
-        {
-          m2::PointD const size(m_errorRadius, m_errorRadius);
-          ChangeModelView(m2::RectD(m_position - size, m_position + size));
-        }
-        else
-        {
-          ChangeModelView(m_position, kMaxScaleZoomLevel);
-        }
+        ChangeModelView(m_position, kMaxScaleZoomLevel);
       }
     }
   }
@@ -536,8 +532,7 @@ void MyPositionController::OnCompassUpdate(location::CompassInfo const & info, S
   double const oldAzimut = GetDrawableAzimut();
   m_isCompassAvailable = true;
 
-  bool const existsFreshGpsBearing =
-      m_lastGPSBearingTimer.ElapsedSeconds() < kGpsBearingLifetimeSec;
+  bool const existsFreshGpsBearing = m_lastGPSBearingTimer.ElapsedSeconds() < kGpsBearingLifetimeSec;
   if ((IsInRouting() && m_isArrowGluedInRouting) || existsFreshGpsBearing)
     return;
 
@@ -553,8 +548,8 @@ void MyPositionController::OnCompassUpdate(location::CompassInfo const & info, S
 bool MyPositionController::UpdateViewportWithAutoZoom()
 {
   double const autoScale = m_enablePerspectiveInRouting ? m_autoScale3d : m_autoScale2d;
-  if (autoScale > 0.0 && m_mode == location::FollowAndRotate &&
-      m_isInRouting && m_enableAutoZoomInRouting && !m_needBlockAutoZoom)
+  if (autoScale > 0.0 && m_mode == location::FollowAndRotate && m_isInRouting && m_enableAutoZoomInRouting &&
+      !m_needBlockAutoZoom)
   {
     ChangeModelView(autoScale, m_position, m_drawDirection, GetRoutingRotationPixelCenter());
     return true;
@@ -673,9 +668,7 @@ void MyPositionController::OnEnterForeground(double backgroundTime)
   }
 }
 
-void MyPositionController::OnEnterBackground()
-{
-}
+void MyPositionController::OnEnterBackground() {}
 
 void MyPositionController::OnCompassTapped()
 {
@@ -711,9 +704,8 @@ void MyPositionController::ChangeModelView(m2::RectD const & rect)
   m_animCreator = nullptr;
 }
 
-void MyPositionController::ChangeModelView(m2::PointD const & userPos, double azimuth,
-                                           m2::PointD const & pxZero, int zoomLevel,
-                                           Animation::TAction const & onFinishAction)
+void MyPositionController::ChangeModelView(m2::PointD const & userPos, double azimuth, m2::PointD const & pxZero,
+                                           int zoomLevel, Animation::TAction const & onFinishAction)
 {
   if (m_listener)
     m_listener->ChangeModelView(userPos, azimuth, pxZero, zoomLevel, onFinishAction, m_animCreator);
@@ -740,8 +732,7 @@ void MyPositionController::UpdateViewport(int zoomLevel)
   else if (m_mode == location::FollowAndRotate)
   {
     ChangeModelView(m_position, m_drawDirection,
-                    m_isInRouting ? GetRoutingRotationPixelCenter() : m_visiblePixelRect.Center(),
-                    zoomLevel);
+                    m_isInRouting ? GetRoutingRotationPixelCenter() : m_visiblePixelRect.Center(), zoomLevel);
   }
 }
 
@@ -758,7 +749,7 @@ m2::PointD MyPositionController::GetRotationPixelCenter() const
 
 m2::PointD MyPositionController::GetRoutingRotationPixelCenter() const
 {
-  return { m_visiblePixelRect.Center().x, m_visiblePixelRect.maxY() - m_positionRoutingOffsetY };
+  return {m_visiblePixelRect.Center().x, m_visiblePixelRect.maxY() - m_positionRoutingOffsetY};
 }
 
 void MyPositionController::UpdateRoutingOffsetY(bool useDefault, int offsetY)
@@ -807,9 +798,9 @@ void MyPositionController::CreateAnim(m2::PointD const & oldPos, double oldAzimu
     {
       m_animCreator = [this, moveDuration](ref_ptr<Animation> syncAnim) -> drape_ptr<Animation>
       {
-        drape_ptr<Animation> anim = make_unique_dp<ArrowAnimation>(GetDrawablePosition(), m_position,
-                                                   syncAnim == nullptr ? moveDuration : syncAnim->GetDuration(),
-                                                   GetDrawableAzimut(), m_drawDirection);
+        drape_ptr<Animation> anim = make_unique_dp<ArrowAnimation>(
+            GetDrawablePosition(), m_position, syncAnim == nullptr ? moveDuration : syncAnim->GetDuration(),
+            GetDrawableAzimut(), m_drawDirection);
         if (syncAnim != nullptr)
         {
           anim->SetMaxDuration(syncAnim->GetMaxDuration());
@@ -823,8 +814,8 @@ void MyPositionController::CreateAnim(m2::PointD const & oldPos, double oldAzimu
     }
     else
     {
-      AnimationSystem::Instance().CombineAnimation(make_unique_dp<ArrowAnimation>(
-          oldPos, m_position, moveDuration, oldAzimut, m_drawDirection));
+      AnimationSystem::Instance().CombineAnimation(
+          make_unique_dp<ArrowAnimation>(oldPos, m_position, moveDuration, oldAzimut, m_drawDirection));
     }
   }
 }
@@ -852,12 +843,8 @@ void MyPositionController::ActivateRouting(int zoomLevel, bool enableAutoZoom, b
     m_enableAutoZoomInRouting = enableAutoZoom;
 
     ChangeMode(location::FollowAndRotate);
-    ChangeModelView(m_position, m_isDirectionAssigned ? m_drawDirection : 0.0,
-                    GetRoutingRotationPixelCenter(), zoomLevel,
-                    [this](ref_ptr<Animation> anim)
-                    {
-                      UpdateViewport(kDoNotChangeZoom);
-                    });
+    ChangeModelView(m_position, m_isDirectionAssigned ? m_drawDirection : 0.0, GetRoutingRotationPixelCenter(),
+                    zoomLevel, [this](ref_ptr<Animation> anim) { UpdateViewport(kDoNotChangeZoom); });
     ResetRoutingNotFollowTimer();
   }
 }
@@ -878,18 +865,17 @@ void MyPositionController::DeactivateRouting()
 
 // This code schedules the execution of checkFunction on FR after timeout. Additionally
 // there is the protection from multiple scheduling.
-#define CHECK_ON_TIMEOUT(id, timeout, checkFunction) \
-  if (id == DrapeNotifier::kInvalidId) \
-  { \
-    id = m_notifier->Notify(ThreadsCommutator::RenderThread, \
-                            std::chrono::seconds(static_cast<uint32_t>(timeout)), false /* repeating */, \
-                            [this](uint64_t notifyId) \
-    { \
-      if (notifyId != id) \
-        return; \
-      checkFunction(); \
-      id = DrapeNotifier::kInvalidId; \
-    }); \
+#define CHECK_ON_TIMEOUT(id, timeout, checkFunction)                                                               \
+  if (id == DrapeNotifier::kInvalidId)                                                                             \
+  {                                                                                                                \
+    id = m_notifier->Notify(ThreadsCommutator::RenderThread, std::chrono::seconds(static_cast<uint32_t>(timeout)), \
+                            false /* repeating */, [this](uint64_t notifyId)                                       \
+    {                                                                                                              \
+      if (notifyId != id)                                                                                          \
+        return;                                                                                                    \
+      checkFunction();                                                                                             \
+      id = DrapeNotifier::kInvalidId;                                                                              \
+    });                                                                                                            \
   }
 
 void MyPositionController::CheckNotFollowRouting()
diff --git a/libs/drape_frontend/my_position_controller.hpp b/libs/drape_frontend/my_position_controller.hpp
index 585ff6d21..177016e7e 100644
--- a/libs/drape_frontend/my_position_controller.hpp
+++ b/libs/drape_frontend/my_position_controller.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "drape_frontend/animation/animation.hpp"
-#include "drape_frontend/frame_values.hpp"
 #include "drape_frontend/drape_hints.hpp"
+#include "drape_frontend/frame_values.hpp"
 #include "drape_frontend/my_position.hpp"
 
 #include "drape/pointers.hpp"
@@ -40,8 +40,8 @@ public:
     // Somehow show map that "rect" will see.
     virtual void ChangeModelView(m2::RectD const & rect, TAnimationCreator const & parallelAnimCreator) = 0;
     // Show map where "usePos" (mercator) placed in "pxZero" on screen and map rotated around "userPos".
-    virtual void ChangeModelView(m2::PointD const & userPos, double azimuth, m2::PointD const & pxZero,
-                                 int zoomLevel, Animation::TAction const & onFinishAction,
+    virtual void ChangeModelView(m2::PointD const & userPos, double azimuth, m2::PointD const & pxZero, int zoomLevel,
+                                 Animation::TAction const & onFinishAction,
                                  TAnimationCreator const & parallelAnimCreator) = 0;
     virtual void ChangeModelView(double autoScale, m2::PointD const & userPos, double azimuth,
                                  m2::PointD const & pxZero, TAnimationCreator const & parallelAnimCreator) = 0;
@@ -49,12 +49,8 @@ public:
 
   struct Params
   {
-    Params(location::EMyPositionMode initMode,
-           double timeInBackground,
-           Hints const & hints,
-           bool isRoutingActive,
-           bool isAutozoomEnabled,
-           location::TMyPositionModeChanged && fn)
+    Params(location::EMyPositionMode initMode, double timeInBackground, Hints const & hints, bool isRoutingActive,
+           bool isAutozoomEnabled, location::TMyPositionModeChanged && fn)
       : m_initMode(initMode)
       , m_timeInBackground(timeInBackground)
       , m_hints(hints)
@@ -124,8 +120,8 @@ public:
   void OnLocationUpdate(location::GpsInfo const & info, bool isNavigable, ScreenBase const & screen);
   void OnCompassUpdate(location::CompassInfo const & info, ScreenBase const & screen);
 
-  void Render(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
-              ScreenBase const & screen, int zoomLevel, FrameValues const & frameValues);
+  void Render(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng, ScreenBase const & screen,
+              int zoomLevel, FrameValues const & frameValues);
 
   bool IsRotationAvailable() const { return m_isDirectionAssigned; }
   bool IsInRouting() const { return m_isInRouting; }
@@ -180,9 +176,9 @@ private:
 
   double m_errorRadius;  // error radius in mercator.
   double m_horizontalAccuracy;
-  m2::PointD m_position; // position in mercator.
+  m2::PointD m_position;  // position in mercator.
   double m_drawDirection;
-  m2::PointD m_oldPosition; // position in mercator.
+  m2::PointD m_oldPosition;  // position in mercator.
   double m_oldDrawDirection;
 
   bool m_enablePerspectiveInRouting;
diff --git a/libs/drape_frontend/navigator.cpp b/libs/drape_frontend/navigator.cpp
index 07f48a838..87a0f327c 100644
--- a/libs/drape_frontend/navigator.cpp
+++ b/libs/drape_frontend/navigator.cpp
@@ -7,9 +7,9 @@
 #include "platform/settings.hpp"
 
 #include "geometry/angles.hpp"
-#include "geometry/transformations.hpp"
-#include "geometry/point2d.hpp"
 #include "geometry/distance_on_sphere.hpp"
+#include "geometry/point2d.hpp"
+#include "geometry/transformations.hpp"
 
 #include "base/logging.hpp"
 
@@ -164,20 +164,17 @@ void Navigator::Scale(m2::PointD const & pixelScaleCenter, double factor)
   ApplyScale(pixelScaleCenter, factor, m_Screen);
 }
 
-bool Navigator::ScaleImpl(m2::PointD const & newPt1, m2::PointD const & newPt2,
-                          m2::PointD const & oldPt1, m2::PointD const & oldPt2,
-                          bool skipMinScaleAndBordersCheck, bool doRotateScreen,
+bool Navigator::ScaleImpl(m2::PointD const & newPt1, m2::PointD const & newPt2, m2::PointD const & oldPt1,
+                          m2::PointD const & oldPt2, bool skipMinScaleAndBordersCheck, bool doRotateScreen,
                           ScreenBase & screen)
 {
   m2::PointD const center3d = oldPt1;
   m2::PointD const center2d = screen.P3dtoP(center3d);
   m2::PointD const centerG = screen.PtoG(center2d);
-  m2::PointD const offset =  center2d - center3d;
+  m2::PointD const offset = center2d - center3d;
   math::Matrix<double, 3, 3> const newM =
-      screen.GtoPMatrix() * ScreenBase::CalcTransform(oldPt1 + offset, oldPt2 + offset,
-                                                      newPt1 + offset, newPt2 + offset,
-                                                      doRotateScreen,
-                                                      true);
+      screen.GtoPMatrix() * ScreenBase::CalcTransform(oldPt1 + offset, oldPt2 + offset, newPt1 + offset,
+                                                      newPt2 + offset, doRotateScreen, true);
   ScreenBase tmp = screen;
   tmp.SetGtoPMatrix(newM);
 
@@ -186,10 +183,8 @@ bool Navigator::ScaleImpl(m2::PointD const & newPt1, m2::PointD const & newPt2,
     if (doRotateScreen)
     {
       math::Matrix<double, 3, 3> const tmpM =
-        screen.GtoPMatrix() * ScreenBase::CalcTransform(oldPt1 + offset, oldPt2 + offset,
-                                                        newPt1 + offset, newPt2 + offset,
-                                                        doRotateScreen,
-                                                        false);
+          screen.GtoPMatrix() * ScreenBase::CalcTransform(oldPt1 + offset, oldPt2 + offset, newPt1 + offset,
+                                                          newPt2 + offset, doRotateScreen, false);
       tmp.SetGtoPMatrix(tmpM);
     }
     else
@@ -265,9 +260,8 @@ void Navigator::DoScale(m2::PointD const & pt1, m2::PointD const & pt2)
 
   m_Screen = PrevScreen;
 
-  if (!ScaleImpl(pt1, pt2, m_LastPt1, m_LastPt2,
-                 pt1.Length(pt2) > m_LastPt1.Length(m_LastPt2),
-                 m_IsRotatingDuringScale, m_Screen))
+  if (!ScaleImpl(pt1, pt2, m_LastPt1, m_LastPt2, pt1.Length(pt2) > m_LastPt1.Length(m_LastPt2), m_IsRotatingDuringScale,
+                 m_Screen))
   {
     m_Screen = PrevScreen;
   }
@@ -317,9 +311,8 @@ m2::AnyRectD ToRotated(Navigator const & navigator, m2::RectD const & rect)
   double const dx = rect.SizeX();
   double const dy = rect.SizeY();
 
-  return m2::AnyRectD(rect.Center(),
-                      ang::Angle<double>(navigator.Screen().GetAngle()),
-                      m2::RectD(-dx/2, -dy/2, dx/2, dy/2));
+  return m2::AnyRectD(rect.Center(), ang::Angle<double>(navigator.Screen().GetAngle()),
+                      m2::RectD(-dx / 2, -dy / 2, dx / 2, dy / 2));
 }
 
 void CheckMinGlobalRect(m2::RectD & rect, uint32_t tileSize, double visualScale, double scale3d)
@@ -336,8 +329,7 @@ void CheckMinGlobalRect(m2::RectD & rect, double scale3d)
   CheckMinGlobalRect(rect, p.GetTileSize(), p.GetVisualScale(), scale3d);
 }
 
-void CheckMinMaxVisibleScale(m2::RectD & rect, int maxScale,
-                             uint32_t tileSize, double visualScale, double scale3d)
+void CheckMinMaxVisibleScale(m2::RectD & rect, int maxScale, uint32_t tileSize, double visualScale, double scale3d)
 {
   CheckMinGlobalRect(rect, tileSize, visualScale, scale3d);
   int scale = df::GetDrawTileScale(rect, tileSize, visualScale);
diff --git a/libs/drape_frontend/navigator.hpp b/libs/drape_frontend/navigator.hpp
index 0696adf2b..0255dd239 100644
--- a/libs/drape_frontend/navigator.hpp
+++ b/libs/drape_frontend/navigator.hpp
@@ -68,17 +68,15 @@ private:
   // Do screen rotates during the two fingers scaling.
   bool m_IsRotatingDuringScale = false;
   // Used in DoScale and ScaleByPoint
-  bool ScaleImpl(m2::PointD const & newPt1, m2::PointD const & newPt2,
-                 m2::PointD const & oldPt1, m2::PointD const & oldPt2,
-                 bool skipMinScaleAndBordersCheck, bool doRotateScreen,
-                 ScreenBase & screen);
+  bool ScaleImpl(m2::PointD const & newPt1, m2::PointD const & newPt2, m2::PointD const & oldPt1,
+                 m2::PointD const & oldPt2, bool skipMinScaleAndBordersCheck, bool doRotateScreen, ScreenBase & screen);
 };
 
 m2::AnyRectD ToRotated(Navigator const & navigator, m2::RectD const & rect);
 void CheckMinGlobalRect(m2::RectD & rect, uint32_t tileSize, double visualScale, double scale3d = kDefault3dScale);
 void CheckMinGlobalRect(m2::RectD & rect, double scale3d = kDefault3dScale);
 
-void CheckMinMaxVisibleScale(m2::RectD & rect, int maxScale/* = -1 */, uint32_t tileSize, double visualScale,
+void CheckMinMaxVisibleScale(m2::RectD & rect, int maxScale /* = -1 */, uint32_t tileSize, double visualScale,
                              double scale3d = kDefault3dScale);
-void CheckMinMaxVisibleScale(m2::RectD & rect, int maxScale/* = -1 */, double scale3d = kDefault3dScale);
+void CheckMinMaxVisibleScale(m2::RectD & rect, int maxScale /* = -1 */, double scale3d = kDefault3dScale);
 }  // namespace df
diff --git a/libs/drape_frontend/overlay_batcher.cpp b/libs/drape_frontend/overlay_batcher.cpp
index 31e3afa5d..eaf5a4791 100644
--- a/libs/drape_frontend/overlay_batcher.cpp
+++ b/libs/drape_frontend/overlay_batcher.cpp
@@ -11,17 +11,14 @@ namespace df
 uint32_t const kOverlayIndexBufferSize = 30000;
 uint32_t const kOverlayVertexBufferSize = 20000;
 
-OverlayBatcher::OverlayBatcher(TileKey const & key)
-  : m_batcher(kOverlayIndexBufferSize, kOverlayVertexBufferSize)
+OverlayBatcher::OverlayBatcher(TileKey const & key) : m_batcher(kOverlayIndexBufferSize, kOverlayVertexBufferSize)
 {
   int const kAverageRenderDataCount = 5;
   m_data.reserve(kAverageRenderDataCount);
 
   m_batcher.SetBatcherHash(key.GetHashValue(BatcherBucket::Overlay));
   m_batcher.StartSession([this, key](dp::RenderState const & state, drape_ptr<dp::RenderBucket> && bucket)
-  {
-    FlushGeometry(key, state, std::move(bucket));
-  });
+  { FlushGeometry(key, state, std::move(bucket)); });
 }
 
 void OverlayBatcher::Batch(ref_ptr<dp::GraphicsContext> context, drape_ptr<MapShape> const & shape,
diff --git a/libs/drape_frontend/overlay_batcher.hpp b/libs/drape_frontend/overlay_batcher.hpp
index b9f3901bb..23009aea2 100644
--- a/libs/drape_frontend/overlay_batcher.hpp
+++ b/libs/drape_frontend/overlay_batcher.hpp
@@ -6,8 +6,8 @@
 #include "drape/batcher.hpp"
 #include "drape/pointers.hpp"
 
-#include <vector>
 #include <utility>
+#include <vector>
 
 namespace dp
 {
@@ -25,9 +25,10 @@ struct OverlayRenderData
   dp::RenderState m_state;
   drape_ptr<dp::RenderBucket> m_bucket;
 
-  OverlayRenderData(TileKey const & key, dp::RenderState const & state,
-                    drape_ptr<dp::RenderBucket> && bucket)
-    : m_tileKey(key), m_state(state), m_bucket(std::move(bucket))
+  OverlayRenderData(TileKey const & key, dp::RenderState const & state, drape_ptr<dp::RenderBucket> && bucket)
+    : m_tileKey(key)
+    , m_state(state)
+    , m_bucket(std::move(bucket))
   {}
 };
 
@@ -42,8 +43,7 @@ public:
   void Finish(ref_ptr<dp::GraphicsContext> context, TOverlaysRenderData & data);
 
 private:
-  void FlushGeometry(TileKey const & key, dp::RenderState const & state,
-                     drape_ptr<dp::RenderBucket> && bucket);
+  void FlushGeometry(TileKey const & key, dp::RenderState const & state, drape_ptr<dp::RenderBucket> && bucket);
 
   dp::Batcher m_batcher;
   TOverlaysRenderData m_data;
diff --git a/libs/drape_frontend/overlays_tracker.cpp b/libs/drape_frontend/overlays_tracker.cpp
index 1b8d20e23..1268d54b9 100644
--- a/libs/drape_frontend/overlays_tracker.cpp
+++ b/libs/drape_frontend/overlays_tracker.cpp
@@ -9,8 +9,8 @@ void OverlaysTracker::SetTrackedOverlaysFeatures(std::vector<FeatureID> && ids)
     m_data.insert(std::make_pair(fid, OverlayInfo()));
 }
 
-bool OverlaysTracker::StartTracking(int zoomLevel, bool hasMyPosition,
-                                    m2::PointD const & myPosition, double gpsAccuracy)
+bool OverlaysTracker::StartTracking(int zoomLevel, bool hasMyPosition, m2::PointD const & myPosition,
+                                    double gpsAccuracy)
 {
   if (zoomLevel < kMinZoomLevel)
   {
@@ -41,15 +41,14 @@ void OverlaysTracker::Track(FeatureID const & fid)
   if (it->second.m_status == OverlayStatus::Invisible)
   {
     it->second.m_status = OverlayStatus::Visible;
-    m_events.emplace_back(it->first, static_cast<uint8_t>(m_zoomLevel),
-                          EventClock::now(), m_hasMyPosition,
+    m_events.emplace_back(it->first, static_cast<uint8_t>(m_zoomLevel), EventClock::now(), m_hasMyPosition,
                           m_myPosition, m_gpsAccuracy);
   }
 }
 
 void OverlaysTracker::FinishTracking()
 {
-   ASSERT_GREATER_OR_EQUAL(m_zoomLevel, kMinZoomLevel, ());
+  ASSERT_GREATER_OR_EQUAL(m_zoomLevel, kMinZoomLevel, ());
 
   for (auto & p : m_data)
   {
diff --git a/libs/drape_frontend/overlays_tracker.hpp b/libs/drape_frontend/overlays_tracker.hpp
index 9acaa0844..ce1786fd0 100644
--- a/libs/drape_frontend/overlays_tracker.hpp
+++ b/libs/drape_frontend/overlays_tracker.hpp
@@ -21,8 +21,7 @@ struct OverlayShowEvent
   bool m_hasMyPosition;
   m2::PointD m_myPosition;
   double m_gpsAccuracy;
-  OverlayShowEvent(FeatureID const & feature, uint8_t zoomLevel,
-                   EventTimestamp const & timestamp, bool hasMyPosition,
+  OverlayShowEvent(FeatureID const & feature, uint8_t zoomLevel, EventTimestamp const & timestamp, bool hasMyPosition,
                    m2::PointD const & myPosition, double gpsAccuracy)
     : m_feature(feature)
     , m_zoomLevel(zoomLevel)
@@ -44,8 +43,7 @@ public:
 
   void SetTrackedOverlaysFeatures(std::vector<FeatureID> && ids);
 
-  bool StartTracking(int zoomLevel, bool hasMyPosition,
-                     m2::PointD const & myPosition, double gpsAccuracy);
+  bool StartTracking(int zoomLevel, bool hasMyPosition, m2::PointD const & myPosition, double gpsAccuracy);
   void Track(FeatureID const & fid);
   void FinishTracking();
 
diff --git a/libs/drape_frontend/path_symbol_shape.cpp b/libs/drape_frontend/path_symbol_shape.cpp
index 19a13d71d..a2c015691 100644
--- a/libs/drape_frontend/path_symbol_shape.cpp
+++ b/libs/drape_frontend/path_symbol_shape.cpp
@@ -4,18 +4,17 @@
 
 #include "shaders/programs.hpp"
 
-#include "drape/utils/vertex_decl.hpp"
-#include "drape/glsl_types.hpp"
-#include "drape/glsl_func.hpp"
-#include "drape/overlay_handle.hpp"
 #include "drape/attribute_provider.hpp"
-#include "drape/texture_manager.hpp"
 #include "drape/batcher.hpp"
+#include "drape/glsl_func.hpp"
+#include "drape/glsl_types.hpp"
+#include "drape/overlay_handle.hpp"
+#include "drape/texture_manager.hpp"
+#include "drape/utils/vertex_decl.hpp"
 
 namespace df
 {
-PathSymbolShape::PathSymbolShape(m2::SharedSpline const & spline,
-                                 PathSymbolViewParams const & params)
+PathSymbolShape::PathSymbolShape(m2::SharedSpline const & spline, PathSymbolViewParams const & params)
   : m_params(params)
   , m_spline(spline)
 {}
diff --git a/libs/drape_frontend/path_text_handle.cpp b/libs/drape_frontend/path_text_handle.cpp
index 886b949a8..d8a7e5e2d 100644
--- a/libs/drape_frontend/path_text_handle.cpp
+++ b/libs/drape_frontend/path_text_handle.cpp
@@ -16,8 +16,8 @@ double const kSinTurn = sin(kValidPathSplineTurn);
 double const kRoundStep = 23;
 int const kMaxStepsCount = 7;
 
-bool RoundCorner(m2::PointD const & p1, m2::PointD const & p2, m2::PointD const & p3,
-                 int leftStepsCount, std::vector<m2::PointD> & roundedCorner)
+bool RoundCorner(m2::PointD const & p1, m2::PointD const & p2, m2::PointD const & p3, int leftStepsCount,
+                 std::vector<m2::PointD> & roundedCorner)
 {
   roundedCorner.clear();
 
@@ -37,8 +37,8 @@ bool RoundCorner(m2::PointD const & p1, m2::PointD const & p2, m2::PointD const
     roundedCorner.push_back(p1);
     return false;
   }
-  m2::PointD const np1 = p2 - dir1 * std::min(kRoundStep * vs,
-                                              p1p2Length - p1p2Length / std::max(leftStepsCount - 1, 2));
+  m2::PointD const np1 =
+      p2 - dir1 * std::min(kRoundStep * vs, p1p2Length - p1p2Length / std::max(leftStepsCount - 1, 2));
   p1p2Length = (p2 - np1).Length();
   double const cosCorner = m2::DotProduct(-dir1, dir2);
   double const sinCorner = fabs(m2::CrossProduct(-dir1, dir2));
@@ -69,8 +69,7 @@ void ReplaceLastCorner(std::vector<m2::PointD> const & roundedCorner, m2::Spline
 }
 }  // namespace
 
-bool IsValidSplineTurn(m2::PointD const & normalizedDir1,
-                       m2::PointD const & normalizedDir2)
+bool IsValidSplineTurn(m2::PointD const & normalizedDir1, m2::PointD const & normalizedDir2)
 {
   double const dotProduct = m2::DotProduct(normalizedDir1, normalizedDir2);
   double const kEps = 1e-5;
@@ -94,8 +93,8 @@ void AddPointAndRound(m2::SplineEx & spline, m2::PointD const & pt)
     int leftStepsCount = static_cast<int>(acos(dotProduct) / kValidPathSplineTurn);
     std::vector<m2::PointD> roundedCorner;
     while (leftStepsCount > 0 && leftStepsCount <= kMaxStepsCount &&
-           RoundCorner(spline.GetPath()[spline.GetSize() - 2],
-                       spline.GetPath().back(), pt, leftStepsCount--, roundedCorner))
+           RoundCorner(spline.GetPath()[spline.GetSize() - 2], spline.GetPath().back(), pt, leftStepsCount--,
+                       roundedCorner))
     {
       ReplaceLastCorner(roundedCorner, spline);
     }
@@ -104,17 +103,15 @@ void AddPointAndRound(m2::SplineEx & spline, m2::PointD const & pt)
   spline.AddPoint(pt);
 }
 
-PathTextContext::PathTextContext(m2::SharedSpline const & spline)
-  : m_globalSpline(spline)
-{}
+PathTextContext::PathTextContext(m2::SharedSpline const & spline) : m_globalSpline(spline) {}
 
 void PathTextContext::SetLayout(drape_ptr<PathTextLayout> && layout, double baseGtoPScale)
 {
   m_layout = std::move(layout);
   m_globalOffsets.clear();
   m_globalPivots.clear();
-  PathTextLayout::CalculatePositions(m_globalSpline->GetLength(), baseGtoPScale,
-                                     m_layout->GetPixelLength(), m_globalOffsets);
+  PathTextLayout::CalculatePositions(m_globalSpline->GetLength(), baseGtoPScale, m_layout->GetPixelLength(),
+                                     m_globalOffsets);
   m_globalPivots.reserve(m_globalOffsets.size());
   for (auto const offset : m_globalOffsets)
     m_globalPivots.push_back(m_globalSpline->GetPoint(offset).m_pos);
@@ -135,8 +132,7 @@ std::vector<double> const & PathTextContext::GetOffsets() const
   return m_globalOffsets;
 }
 
-bool PathTextContext::GetPivot(size_t textIndex, m2::PointD & pivot,
-                               m2::Spline::iterator & centerPointIter) const
+bool PathTextContext::GetPivot(size_t textIndex, m2::PointD & pivot, m2::Spline::iterator & centerPointIter) const
 {
   if (textIndex >= m_centerGlobalPivots.size())
     return false;
@@ -251,12 +247,11 @@ end:
   return resSpline ? resSpline->GetPoint(resStep) : m2::Spline::iterator();
 }
 
-
-PathTextHandle::PathTextHandle(dp::OverlayID const & id, std::shared_ptr<PathTextContext> const & context,
-                               float depth, uint32_t textIndex, uint64_t priority,
-                               ref_ptr<dp::TextureManager> textureManager, int minVisibleScale, bool isBillboard)
-  : TextHandle(id, context->GetLayout()->GetGlyphs(), dp::Center, priority,
-               textureManager, minVisibleScale, isBillboard)
+PathTextHandle::PathTextHandle(dp::OverlayID const & id, std::shared_ptr<PathTextContext> const & context, float depth,
+                               uint32_t textIndex, uint64_t priority, ref_ptr<dp::TextureManager> textureManager,
+                               int minVisibleScale, bool isBillboard)
+  : TextHandle(id, context->GetLayout()->GetGlyphs(), dp::Center, priority, textureManager, minVisibleScale,
+               isBillboard)
   , m_context(context)
   , m_textIndex(textIndex)
   , m_depth(depth)
diff --git a/libs/drape_frontend/path_text_handle.hpp b/libs/drape_frontend/path_text_handle.hpp
index 343deeae8..59f40ac68 100644
--- a/libs/drape_frontend/path_text_handle.hpp
+++ b/libs/drape_frontend/path_text_handle.hpp
@@ -19,8 +19,7 @@ public:
   void SetLayout(drape_ptr<PathTextLayout> && layout, double baseGtoPScale);
   ref_ptr<PathTextLayout> const GetLayout() const;
 
-  bool GetPivot(size_t textIndex, m2::PointD & pivot,
-                m2::Spline::iterator & centerPointIter) const;
+  bool GetPivot(size_t textIndex, m2::PointD & pivot, m2::Spline::iterator & centerPointIter) const;
 
   void BeforeUpdate();
   void Update(ScreenBase const & screen);
@@ -47,8 +46,8 @@ class PathTextHandle : public df::TextHandle
 {
 public:
   PathTextHandle(dp::OverlayID const & id, std::shared_ptr<PathTextContext> const & context, float depth,
-                 uint32_t textIndex, uint64_t priority, ref_ptr<dp::TextureManager> textureManager,
-                 int minVisibleScale, bool isBillboard);
+                 uint32_t textIndex, uint64_t priority, ref_ptr<dp::TextureManager> textureManager, int minVisibleScale,
+                 bool isBillboard);
 
   void BeforeUpdate() override;
   bool Update(ScreenBase const & screen) override;
diff --git a/libs/drape_frontend/path_text_shape.cpp b/libs/drape_frontend/path_text_shape.cpp
index 805fcf964..a61793d9e 100644
--- a/libs/drape_frontend/path_text_shape.cpp
+++ b/libs/drape_frontend/path_text_shape.cpp
@@ -23,8 +23,7 @@ using m2::Spline;
 
 namespace df
 {
-PathTextShape::PathTextShape(m2::SharedSpline const & spline,
-                             PathTextViewParams const & params,
+PathTextShape::PathTextShape(m2::SharedSpline const & spline, PathTextViewParams const & params,
                              TileKey const & tileKey, uint32_t baseTextIndex)
   : m_spline(spline)
   , m_params(params)
@@ -37,7 +36,8 @@ PathTextShape::PathTextShape(m2::SharedSpline const & spline,
 bool PathTextShape::CalculateLayout(ref_ptr<dp::TextureManager> textures)
 {
   char constexpr kSpaces[] = "   ";
-  auto layout = make_unique_dp<PathTextLayout>(m_params.m_tileCenter,
+  auto layout = make_unique_dp<PathTextLayout>(
+      m_params.m_tileCenter,
       m_params.m_auxText.empty() ? m_params.m_mainText : m_params.m_mainText + kSpaces + m_params.m_auxText,
       m_params.m_textFont.m_size, textures);
 
@@ -67,8 +67,7 @@ uint64_t PathTextShape::GetOverlayPriority(uint32_t textIndex, size_t textLength
   return priority;
 }
 
-void PathTextShape::DrawPathTextPlain(ref_ptr<dp::GraphicsContext> context,
-                                      ref_ptr<dp::TextureManager> textures,
+void PathTextShape::DrawPathTextPlain(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::TextureManager> textures,
                                       ref_ptr<dp::Batcher> batcher) const
 {
   auto const layout = m_context->GetLayout();
@@ -96,17 +95,13 @@ void PathTextShape::DrawPathTextPlain(ref_ptr<dp::GraphicsContext> context,
     dynBuffer.resize(staticBuffer.size());
 
     dp::AttributeProvider provider(2, static_cast<uint32_t>(staticBuffer.size()));
-    provider.InitStream(0, gpu::TextStaticVertex::GetBindingInfo(),
-                        make_ref(staticBuffer.data()));
-    provider.InitStream(1, gpu::TextDynamicVertex::GetBindingInfo(),
-                        make_ref(dynBuffer.data()));
-    batcher->InsertListOfStrip(context, state, make_ref(&provider),
-                               CreateOverlayHandle(textIndex, textures), 4);
+    provider.InitStream(0, gpu::TextStaticVertex::GetBindingInfo(), make_ref(staticBuffer.data()));
+    provider.InitStream(1, gpu::TextDynamicVertex::GetBindingInfo(), make_ref(dynBuffer.data()));
+    batcher->InsertListOfStrip(context, state, make_ref(&provider), CreateOverlayHandle(textIndex, textures), 4);
   }
 }
 
-void PathTextShape::DrawPathTextOutlined(ref_ptr<dp::GraphicsContext> context,
-                                         ref_ptr<dp::TextureManager> textures,
+void PathTextShape::DrawPathTextOutlined(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::TextureManager> textures,
                                          ref_ptr<dp::Batcher> batcher) const
 {
   auto const layout = m_context->GetLayout();
@@ -135,24 +130,20 @@ void PathTextShape::DrawPathTextOutlined(ref_ptr<dp::GraphicsContext> context,
     dynBuffer.resize(staticBuffer.size());
 
     dp::AttributeProvider provider(2, static_cast<uint32_t>(staticBuffer.size()));
-    provider.InitStream(0, gpu::TextOutlinedStaticVertex::GetBindingInfo(),
-                        make_ref(staticBuffer.data()));
-    provider.InitStream(1, gpu::TextDynamicVertex::GetBindingInfo(),
-                        make_ref(dynBuffer.data()));
-    batcher->InsertListOfStrip(context, state, make_ref(&provider),
-                               CreateOverlayHandle(textIndex, textures), 4);
+    provider.InitStream(0, gpu::TextOutlinedStaticVertex::GetBindingInfo(), make_ref(staticBuffer.data()));
+    provider.InitStream(1, gpu::TextDynamicVertex::GetBindingInfo(), make_ref(dynBuffer.data()));
+    batcher->InsertListOfStrip(context, state, make_ref(&provider), CreateOverlayHandle(textIndex, textures), 4);
   }
 }
 
 drape_ptr<dp::OverlayHandle> PathTextShape::CreateOverlayHandle(uint32_t textIndex,
                                                                 ref_ptr<dp::TextureManager> textures) const
 {
-  dp::OverlayID overlayId(m_params.m_featureId, m_params.m_markId,
-                          m_tileCoords, m_baseTextIndex + textIndex);
+  dp::OverlayID overlayId(m_params.m_featureId, m_params.m_markId, m_tileCoords, m_baseTextIndex + textIndex);
   auto const layout = m_context->GetLayout();
   auto const priority = GetOverlayPriority(textIndex, layout->GetGlyphCount());
-  return make_unique_dp<PathTextHandle>(overlayId, m_context, m_params.m_depth, textIndex, priority,
-                                          textures, m_params.m_minVisibleScale, true /* isBillboard */);
+  return make_unique_dp<PathTextHandle>(overlayId, m_context, m_params.m_depth, textIndex, priority, textures,
+                                        m_params.m_minVisibleScale, true /* isBillboard */);
 }
 
 void PathTextShape::Draw(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Batcher> batcher,
diff --git a/libs/drape_frontend/path_text_shape.hpp b/libs/drape_frontend/path_text_shape.hpp
index 65f6a6dcd..7ccf0ce08 100644
--- a/libs/drape_frontend/path_text_shape.hpp
+++ b/libs/drape_frontend/path_text_shape.hpp
@@ -20,8 +20,8 @@ namespace df
 class PathTextShape : public MapShape
 {
 public:
-  PathTextShape(m2::SharedSpline const & spline, PathTextViewParams const & params,
-                TileKey const & tileKey, uint32_t baseTextIndex);
+  PathTextShape(m2::SharedSpline const & spline, PathTextViewParams const & params, TileKey const & tileKey,
+                uint32_t baseTextIndex);
   bool CalculateLayout(ref_ptr<dp::TextureManager> textures);
 
   std::vector<double> GetOffsets() const { return m_context->GetOffsets(); }
@@ -33,14 +33,11 @@ public:
 private:
   uint64_t GetOverlayPriority(uint32_t textIndex, size_t textLength) const;
 
-  void DrawPathTextPlain(ref_ptr<dp::GraphicsContext> context,
-                         ref_ptr<dp::TextureManager> textures,
+  void DrawPathTextPlain(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::TextureManager> textures,
                          ref_ptr<dp::Batcher> batcher) const;
-  void DrawPathTextOutlined(ref_ptr<dp::GraphicsContext> context,
-                            ref_ptr<dp::TextureManager> textures,
+  void DrawPathTextOutlined(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::TextureManager> textures,
                             ref_ptr<dp::Batcher> batcher) const;
-  drape_ptr<dp::OverlayHandle> CreateOverlayHandle(uint32_t textIndex,
-                                                   ref_ptr<dp::TextureManager> textures) const;
+  drape_ptr<dp::OverlayHandle> CreateOverlayHandle(uint32_t textIndex, ref_ptr<dp::TextureManager> textures) const;
 
   m2::SharedSpline m_spline;
   PathTextViewParams m_params;
diff --git a/libs/drape_frontend/poi_symbol_shape.cpp b/libs/drape_frontend/poi_symbol_shape.cpp
index 225bfc651..3a3ff9ee8 100644
--- a/libs/drape_frontend/poi_symbol_shape.cpp
+++ b/libs/drape_frontend/poi_symbol_shape.cpp
@@ -18,8 +18,7 @@ namespace
 using SV = gpu::SolidTexturingVertex;
 using MV = gpu::MaskedTexturingVertex;
 
-glsl::vec2 ShiftNormal(glsl::vec2 const & n, df::PoiSymbolViewParams const & params,
-                       m2::PointF const & pixelSize)
+glsl::vec2 ShiftNormal(glsl::vec2 const & n, df::PoiSymbolViewParams const & params, m2::PointF const & pixelSize)
 {
   glsl::vec2 result = n + glsl::vec2(params.m_offset.x, params.m_offset.y);
   m2::PointF const halfPixelSize = pixelSize * 0.5f;
@@ -40,8 +39,7 @@ glsl::vec2 ShiftNormal(glsl::vec2 const & n, df::PoiSymbolViewParams const & par
 template <typename TCreateOverlayHandle>
 void SolidBatch(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Batcher> batcher,
                 TCreateOverlayHandle && createOverlayHandle, glsl::vec4 const & position,
-                df::PoiSymbolViewParams const & params,
-                dp::TextureManager::SymbolRegion const & symbolRegion,
+                df::PoiSymbolViewParams const & params, dp::TextureManager::SymbolRegion const & symbolRegion,
                 dp::TextureManager::ColorRegion const & colorRegion)
 {
   UNUSED_VALUE(colorRegion);
@@ -54,34 +52,26 @@ void SolidBatch(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Batcher> batch
   m2::RectF const & texRect = symbolRegion.GetTexRect();
 
   buffer_vector<SV, 8> vertexes;
-  vertexes.emplace_back(position,
-                        ShiftNormal(glsl::vec2(-halfSize.x, halfSize.y), params, pixelSize),
+  vertexes.emplace_back(position, ShiftNormal(glsl::vec2(-halfSize.x, halfSize.y), params, pixelSize),
                         glsl::vec2(texRect.minX(), texRect.maxY()));
-  vertexes.emplace_back(position,
-                        ShiftNormal(glsl::vec2(-halfSize.x, -halfSize.y), params, pixelSize),
+  vertexes.emplace_back(position, ShiftNormal(glsl::vec2(-halfSize.x, -halfSize.y), params, pixelSize),
                         glsl::vec2(texRect.minX(), texRect.minY()));
   if (symbolRegionSize.x < params.m_pixelWidth)
   {
     float const stretchHalfWidth = (params.m_pixelWidth - symbolRegionSize.x) * 0.5f;
     float const midTexU = (texRect.minX() + texRect.maxX()) * 0.5f;
-    vertexes.emplace_back(position,
-                          ShiftNormal(glsl::vec2(-stretchHalfWidth, halfSize.y), params, pixelSize),
+    vertexes.emplace_back(position, ShiftNormal(glsl::vec2(-stretchHalfWidth, halfSize.y), params, pixelSize),
                           glsl::vec2(midTexU, texRect.maxY()));
-    vertexes.emplace_back(position,
-                          ShiftNormal(glsl::vec2(-stretchHalfWidth, -halfSize.y), params, pixelSize),
+    vertexes.emplace_back(position, ShiftNormal(glsl::vec2(-stretchHalfWidth, -halfSize.y), params, pixelSize),
                           glsl::vec2(midTexU, texRect.minY()));
-    vertexes.emplace_back(position,
-                          ShiftNormal(glsl::vec2(stretchHalfWidth, halfSize.y), params, pixelSize),
+    vertexes.emplace_back(position, ShiftNormal(glsl::vec2(stretchHalfWidth, halfSize.y), params, pixelSize),
                           glsl::vec2(midTexU, texRect.maxY()));
-    vertexes.emplace_back(position,
-                          ShiftNormal(glsl::vec2(stretchHalfWidth, -halfSize.y), params, pixelSize),
+    vertexes.emplace_back(position, ShiftNormal(glsl::vec2(stretchHalfWidth, -halfSize.y), params, pixelSize),
                           glsl::vec2(midTexU, texRect.minY()));
   }
-  vertexes.emplace_back(position,
-                        ShiftNormal(glsl::vec2(halfSize.x, halfSize.y), params, pixelSize),
+  vertexes.emplace_back(position, ShiftNormal(glsl::vec2(halfSize.x, halfSize.y), params, pixelSize),
                         glsl::vec2(texRect.maxX(), texRect.maxY()));
-  vertexes.emplace_back(position,
-                        ShiftNormal(glsl::vec2(halfSize.x, -halfSize.y), params, pixelSize),
+  vertexes.emplace_back(position, ShiftNormal(glsl::vec2(halfSize.x, -halfSize.y), params, pixelSize),
                         glsl::vec2(texRect.maxX(), texRect.minY()));
 
   auto state = df::CreateRenderState(gpu::Program::Texturing, params.m_depthLayer);
@@ -99,8 +89,7 @@ void SolidBatch(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Batcher> batch
 template <typename TCreateOverlayHandle>
 void MaskedBatch(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Batcher> batcher,
                  TCreateOverlayHandle && createOverlayHandle, glsl::vec4 const & position,
-                 df::PoiSymbolViewParams const & params,
-                 dp::TextureManager::SymbolRegion const & symbolRegion,
+                 df::PoiSymbolViewParams const & params, dp::TextureManager::SymbolRegion const & symbolRegion,
                  dp::TextureManager::ColorRegion const & colorRegion)
 {
   m2::PointF const symbolRegionSize = symbolRegion.GetPixelSize();
@@ -112,41 +101,33 @@ void MaskedBatch(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Batcher> batc
   glsl::vec2 const maskColorCoords = glsl::ToVec2(colorRegion.GetTexRect().Center());
 
   buffer_vector<MV, 8> vertexes;
-  vertexes.emplace_back(position,
-                        ShiftNormal(glsl::vec2(-halfSize.x, halfSize.y), params, pixelSize),
+  vertexes.emplace_back(position, ShiftNormal(glsl::vec2(-halfSize.x, halfSize.y), params, pixelSize),
                         glsl::vec2(texRect.minX(), texRect.maxY()), maskColorCoords);
-  vertexes.emplace_back(position,
-                        ShiftNormal(glsl::vec2(-halfSize.x, -halfSize.y), params, pixelSize),
+  vertexes.emplace_back(position, ShiftNormal(glsl::vec2(-halfSize.x, -halfSize.y), params, pixelSize),
                         glsl::vec2(texRect.minX(), texRect.minY()), maskColorCoords);
   if (symbolRegionSize.x < params.m_pixelWidth)
   {
     float const stretchHalfWidth = (params.m_pixelWidth - symbolRegionSize.x) * 0.5f;
     float const midTexU = (texRect.minX() + texRect.maxX()) * 0.5f;
-    vertexes.emplace_back(position,
-                          ShiftNormal(glsl::vec2(-stretchHalfWidth, halfSize.y), params, pixelSize),
+    vertexes.emplace_back(position, ShiftNormal(glsl::vec2(-stretchHalfWidth, halfSize.y), params, pixelSize),
                           glsl::vec2(midTexU, texRect.maxY()), maskColorCoords);
-    vertexes.emplace_back(position,
-                          ShiftNormal(glsl::vec2(-stretchHalfWidth, -halfSize.y), params, pixelSize),
+    vertexes.emplace_back(position, ShiftNormal(glsl::vec2(-stretchHalfWidth, -halfSize.y), params, pixelSize),
                           glsl::vec2(midTexU, texRect.minY()), maskColorCoords);
-    vertexes.emplace_back(position,
-                          ShiftNormal(glsl::vec2(stretchHalfWidth, halfSize.y), params, pixelSize),
+    vertexes.emplace_back(position, ShiftNormal(glsl::vec2(stretchHalfWidth, halfSize.y), params, pixelSize),
                           glsl::vec2(midTexU, texRect.maxY()), maskColorCoords);
-    vertexes.emplace_back(position,
-                          ShiftNormal(glsl::vec2(stretchHalfWidth, -halfSize.y), params, pixelSize),
+    vertexes.emplace_back(position, ShiftNormal(glsl::vec2(stretchHalfWidth, -halfSize.y), params, pixelSize),
                           glsl::vec2(midTexU, texRect.minY()), maskColorCoords);
   }
-  vertexes.emplace_back(position,
-                        ShiftNormal(glsl::vec2(halfSize.x, halfSize.y), params, pixelSize),
+  vertexes.emplace_back(position, ShiftNormal(glsl::vec2(halfSize.x, halfSize.y), params, pixelSize),
                         glsl::vec2(texRect.maxX(), texRect.maxY()), maskColorCoords);
-  vertexes.emplace_back(position,
-                        ShiftNormal(glsl::vec2(halfSize.x, -halfSize.y), params, pixelSize),
+  vertexes.emplace_back(position, ShiftNormal(glsl::vec2(halfSize.x, -halfSize.y), params, pixelSize),
                         glsl::vec2(texRect.maxX(), texRect.minY()), maskColorCoords);
 
   auto state = df::CreateRenderState(gpu::Program::MaskedTexturing, params.m_depthLayer);
   state.SetProgram3d(gpu::Program::MaskedTexturingBillboard);
   state.SetDepthTestEnabled(params.m_depthTestEnabled);
   state.SetColorTexture(symbolRegion.GetTexture());
-  state.SetMaskTexture(colorRegion.GetTexture()); // Here mask is a color.
+  state.SetMaskTexture(colorRegion.GetTexture());  // Here mask is a color.
   state.SetTextureFilter(dp::TextureFilter::Nearest);
   state.SetTextureIndex(symbolRegion.GetTextureIndex());
 
@@ -205,9 +186,8 @@ drape_ptr<dp::OverlayHandle> PoiSymbolShape::CreateOverlayHandle(m2::RectD const
 {
   dp::OverlayID overlayId(m_params.m_featureId, m_params.m_markId, m_tileCoords, m_textIndex);
   drape_ptr<dp::OverlayHandle> handle = make_unique_dp<dp::SquareHandle>(
-      overlayId, m_params.m_anchor, m_pt, pixelRect.RightTop() - pixelRect.LeftBottom(),
-      m2::PointD(m_params.m_offset), GetOverlayPriority(), true /* isBound */,
-      m_params.m_minVisibleScale, true /* isBillboard */);
+      overlayId, m_params.m_anchor, m_pt, pixelRect.RightTop() - pixelRect.LeftBottom(), m2::PointD(m_params.m_offset),
+      GetOverlayPriority(), true /* isBound */, m_params.m_minVisibleScale, true /* isBillboard */);
   handle->SetPivotZ(m_params.m_posZ);
   handle->SetExtendingSize(m_params.m_extendingSize);
   if (m_params.m_specialDisplacement == SpecialDisplacement::UserMark ||
diff --git a/libs/drape_frontend/poi_symbol_shape.hpp b/libs/drape_frontend/poi_symbol_shape.hpp
index 33ecba409..deab1ed84 100644
--- a/libs/drape_frontend/poi_symbol_shape.hpp
+++ b/libs/drape_frontend/poi_symbol_shape.hpp
@@ -15,8 +15,8 @@ namespace df
 class PoiSymbolShape : public MapShape
 {
 public:
-  PoiSymbolShape(m2::PointD const & mercatorPt, PoiSymbolViewParams const & params,
-                 TileKey const & tileKey, uint32_t textIndex);
+  PoiSymbolShape(m2::PointD const & mercatorPt, PoiSymbolViewParams const & params, TileKey const & tileKey,
+                 uint32_t textIndex);
 
   void Draw(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Batcher> batcher,
             ref_ptr<dp::TextureManager> textures) const override;
@@ -32,4 +32,3 @@ private:
   uint32_t const m_textIndex;
 };
 }  // namespace df
-
diff --git a/libs/drape_frontend/postprocess_renderer.cpp b/libs/drape_frontend/postprocess_renderer.cpp
index 083eeabe2..ebcac1091 100644
--- a/libs/drape_frontend/postprocess_renderer.cpp
+++ b/libs/drape_frontend/postprocess_renderer.cpp
@@ -20,8 +20,7 @@ namespace
 class SMAABaseRenderParams
 {
 public:
-  explicit SMAABaseRenderParams(gpu::Program program)
-    : m_state(CreateRenderState(program, DepthLayer::GeometryLayer))
+  explicit SMAABaseRenderParams(gpu::Program program) : m_state(CreateRenderState(program, DepthLayer::GeometryLayer))
   {
     m_state.SetDepthTestEnabled(false);
     m_state.SetBlending(dp::Blending(false));
@@ -39,22 +38,23 @@ protected:
 class EdgesRenderParams : public SMAABaseRenderParams
 {
   using TBase = SMAABaseRenderParams;
+
 public:
-  EdgesRenderParams(): TBase(gpu::Program::SmaaEdges) {}
+  EdgesRenderParams() : TBase(gpu::Program::SmaaEdges) {}
 
   void SetParams(ref_ptr<dp::Texture> texture, uint32_t width, uint32_t height)
   {
     m_state.SetTexture("u_colorTex", texture);
 
-    m_params.m_framebufferMetrics = glsl::vec4(1.0f / width, 1.0f / height,
-                                               static_cast<float>(width),
-                                               static_cast<float>(height));
+    m_params.m_framebufferMetrics =
+        glsl::vec4(1.0f / width, 1.0f / height, static_cast<float>(width), static_cast<float>(height));
   }
 };
 
 class BlendingWeightRenderParams : public SMAABaseRenderParams
 {
   using TBase = SMAABaseRenderParams;
+
 public:
   BlendingWeightRenderParams() : TBase(gpu::Program::SmaaBlendingWeight) {}
 
@@ -65,44 +65,39 @@ public:
     m_state.SetTexture("u_smaaArea", areaTexture);
     m_state.SetTexture("u_smaaSearch", searchTexture);
 
-    m_params.m_framebufferMetrics = glsl::vec4(1.0f / width, 1.0f / height,
-                                               static_cast<float>(width),
-                                               static_cast<float>(height));
+    m_params.m_framebufferMetrics =
+        glsl::vec4(1.0f / width, 1.0f / height, static_cast<float>(width), static_cast<float>(height));
   }
 };
 
 class SMAAFinalRenderParams : public SMAABaseRenderParams
 {
   using TBase = SMAABaseRenderParams;
-public:
-  SMAAFinalRenderParams(): TBase(gpu::Program::SmaaFinal) {}
 
-  void SetParams(ref_ptr<dp::Texture> colorTexture, ref_ptr<dp::Texture> blendingWeightTexture,
-                 uint32_t width, uint32_t height)
+public:
+  SMAAFinalRenderParams() : TBase(gpu::Program::SmaaFinal) {}
+
+  void SetParams(ref_ptr<dp::Texture> colorTexture, ref_ptr<dp::Texture> blendingWeightTexture, uint32_t width,
+                 uint32_t height)
   {
     m_state.SetTexture("u_colorTex", colorTexture);
     m_state.SetTexture("u_blendingWeightTex", blendingWeightTexture);
 
-    m_params.m_framebufferMetrics = glsl::vec4(1.0f / width, 1.0f / height,
-                                               static_cast<float>(width),
-                                               static_cast<float>(height));
+    m_params.m_framebufferMetrics =
+        glsl::vec4(1.0f / width, 1.0f / height, static_cast<float>(width), static_cast<float>(height));
   }
 };
 
 class DefaultScreenQuadRenderParams
 {
 public:
-  DefaultScreenQuadRenderParams()
-    : m_state(CreateRenderState(gpu::Program::ScreenQuad, DepthLayer::GeometryLayer))
+  DefaultScreenQuadRenderParams() : m_state(CreateRenderState(gpu::Program::ScreenQuad, DepthLayer::GeometryLayer))
   {
     m_state.SetDepthTestEnabled(false);
     m_state.SetBlending(dp::Blending(false));
   }
 
-  void SetParams(ref_ptr<dp::Texture> texture)
-  {
-    m_state.SetTexture("u_colorTex", texture);
-  }
+  void SetParams(ref_ptr<dp::Texture> texture) { m_state.SetTexture("u_colorTex", texture); }
 
   dp::RenderState const & GetRenderState() const { return m_state; }
   gpu::ScreenQuadProgramParams const & GetProgramParams() const { return m_params; }
@@ -112,23 +107,16 @@ private:
   gpu::ScreenQuadProgramParams m_params;
 };
 
-void InitFramebuffer(ref_ptr<dp::GraphicsContext> context,
-                     drape_ptr<dp::Framebuffer> & framebuffer,
-                     uint32_t width, uint32_t height,
-                     bool depthEnabled, bool stencilEnabled)
+void InitFramebuffer(ref_ptr<dp::GraphicsContext> context, drape_ptr<dp::Framebuffer> & framebuffer, uint32_t width,
+                     uint32_t height, bool depthEnabled, bool stencilEnabled)
 {
   if (framebuffer == nullptr)
-  {
-    framebuffer = make_unique_dp<dp::Framebuffer>(dp::TextureFormat::RGBA8, depthEnabled,
-                                                  stencilEnabled);
-  }
+    framebuffer = make_unique_dp<dp::Framebuffer>(dp::TextureFormat::RGBA8, depthEnabled, stencilEnabled);
   framebuffer->SetSize(context, width, height);
 }
 
-void InitFramebuffer(ref_ptr<dp::GraphicsContext> context,
-                     drape_ptr<dp::Framebuffer> & framebuffer,
-                     dp::TextureFormat colorFormat,
-                     ref_ptr<dp::Framebuffer::DepthStencil> depthStencilRef,
+void InitFramebuffer(ref_ptr<dp::GraphicsContext> context, drape_ptr<dp::Framebuffer> & framebuffer,
+                     dp::TextureFormat colorFormat, ref_ptr<dp::Framebuffer::DepthStencil> depthStencilRef,
                      uint32_t width, uint32_t height)
 {
   if (framebuffer == nullptr)
@@ -200,8 +188,7 @@ bool PostprocessRenderer::IsEnabled() const
   return IsSupported(m_mainFramebuffer);
 }
 
-void PostprocessRenderer::SetEffectEnabled(ref_ptr<dp::GraphicsContext> context,
-                                           Effect effect, bool enabled)
+void PostprocessRenderer::SetEffectEnabled(ref_ptr<dp::GraphicsContext> context, Effect effect, bool enabled)
 {
   auto const oldValue = m_effects;
   auto const effectMask = static_cast<uint32_t>(effect);
@@ -221,24 +208,17 @@ bool PostprocessRenderer::CanRenderAntialiasing() const
   if (!IsEffectEnabled(Effect::Antialiasing))
     return false;
 
-  if (!IsSupported(m_edgesFramebuffer) || !IsSupported(m_blendingWeightFramebuffer) ||
-      !IsSupported(m_smaaFramebuffer))
-  {
+  if (!IsSupported(m_edgesFramebuffer) || !IsSupported(m_blendingWeightFramebuffer) || !IsSupported(m_smaaFramebuffer))
     return false;
-  }
 
-  if (m_staticTextures == nullptr ||
-      m_staticTextures->m_smaaSearchTexture == nullptr ||
+  if (m_staticTextures == nullptr || m_staticTextures->m_smaaSearchTexture == nullptr ||
       m_staticTextures->m_smaaAreaTexture == nullptr)
   {
     return false;
   }
 
   if (m_apiVersion == dp::ApiVersion::OpenGLES3)
-  {
-    return m_staticTextures->m_smaaAreaTexture->GetID() != 0 &&
-           m_staticTextures->m_smaaSearchTexture->GetID() != 0;
-  }
+    return m_staticTextures->m_smaaAreaTexture->GetID() != 0 && m_staticTextures->m_smaaSearchTexture->GetID() != 0;
   return true;
 }
 
@@ -271,8 +251,7 @@ bool PostprocessRenderer::BeginFrame(ref_ptr<dp::GraphicsContext> context, Scree
   return m_frameStarted;
 }
 
-bool PostprocessRenderer::EndFrame(ref_ptr<dp::GraphicsContext> context,
-                                   ref_ptr<gpu::ProgramManager> gpuProgramManager,
+bool PostprocessRenderer::EndFrame(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> gpuProgramManager,
                                    dp::Viewport const & viewport)
 {
   TRACE_SECTION("[drape] PostprocessRenderer::EndFrame");
@@ -303,8 +282,8 @@ bool PostprocessRenderer::EndFrame(ref_ptr<dp::GraphicsContext> context,
         context->SetStencilFunction(dp::StencilFace::FrontAndBack, dp::TestFunction::Greater);
       else
         context->SetStencilFunction(dp::StencilFace::FrontAndBack, dp::TestFunction::NotEqual);
-      context->SetStencilActions(dp::StencilFace::FrontAndBack, dp::StencilAction::Zero,
-                                 dp::StencilAction::Zero, dp::StencilAction::Replace);
+      context->SetStencilActions(dp::StencilFace::FrontAndBack, dp::StencilAction::Zero, dp::StencilAction::Zero,
+                                 dp::StencilAction::Replace);
       context->SetStencilReferenceValue(1);
       context->ApplyFramebuffer("SMAA edges");
       viewport.Apply(context);
@@ -323,16 +302,14 @@ bool PostprocessRenderer::EndFrame(ref_ptr<dp::GraphicsContext> context,
       context->SetFramebuffer(make_ref(m_blendingWeightFramebuffer));
       context->Clear(dp::ClearBits::ColorBit, dp::ClearBits::ColorBit | dp::ClearBits::StencilBit /* storeBits */);
       context->SetStencilFunction(dp::StencilFace::FrontAndBack, dp::TestFunction::Equal);
-      context->SetStencilActions(dp::StencilFace::FrontAndBack, dp::StencilAction::Keep,
-                                 dp::StencilAction::Keep, dp::StencilAction::Keep);
+      context->SetStencilActions(dp::StencilFace::FrontAndBack, dp::StencilAction::Keep, dp::StencilAction::Keep,
+                                 dp::StencilAction::Keep);
       context->ApplyFramebuffer("SMAA blending");
       viewport.Apply(context);
 
       BlendingWeightRenderParams params;
-      params.SetParams(m_edgesFramebuffer->GetTexture(),
-                       m_staticTextures->m_smaaAreaTexture,
-                       m_staticTextures->m_smaaSearchTexture,
-                       m_width, m_height);
+      params.SetParams(m_edgesFramebuffer->GetTexture(), m_staticTextures->m_smaaAreaTexture,
+                       m_staticTextures->m_smaaSearchTexture, m_width, m_height);
 
       auto program = gpuProgramManager->GetProgram(params.GetRenderState().GetProgram<gpu::Program>());
       m_screenQuadRenderer->Render(context, program, params.GetRenderState(), gpuProgramManager->GetParamsSetter(),
@@ -349,9 +326,7 @@ bool PostprocessRenderer::EndFrame(ref_ptr<dp::GraphicsContext> context,
       viewport.Apply(context);
 
       SMAAFinalRenderParams params;
-      params.SetParams(m_mainFramebuffer->GetTexture(),
-                       m_blendingWeightFramebuffer->GetTexture(),
-                       m_width, m_height);
+      params.SetParams(m_mainFramebuffer->GetTexture(), m_blendingWeightFramebuffer->GetTexture(), m_width, m_height);
 
       auto program = gpuProgramManager->GetProgram(params.GetRenderState().GetProgram<gpu::Program>());
       m_screenQuadRenderer->Render(context, program, params.GetRenderState(), gpuProgramManager->GetParamsSetter(),
@@ -395,8 +370,8 @@ void PostprocessRenderer::EnableWritingToStencil(ref_ptr<dp::GraphicsContext> co
     return;
   context->SetStencilTestEnabled(true);
   context->SetStencilFunction(dp::StencilFace::FrontAndBack, dp::TestFunction::Always);
-  context->SetStencilActions(dp::StencilFace::FrontAndBack, dp::StencilAction::Keep,
-                             dp::StencilAction::Keep, dp::StencilAction::Replace);
+  context->SetStencilActions(dp::StencilFace::FrontAndBack, dp::StencilAction::Keep, dp::StencilAction::Keep,
+                             dp::StencilAction::Replace);
 }
 
 void PostprocessRenderer::DisableWritingToStencil(ref_ptr<dp::GraphicsContext> context) const
@@ -406,8 +381,7 @@ void PostprocessRenderer::DisableWritingToStencil(ref_ptr<dp::GraphicsContext> c
   context->SetStencilTestEnabled(false);
 }
 
-void PostprocessRenderer::UpdateFramebuffers(ref_ptr<dp::GraphicsContext> context,
-                                             uint32_t width, uint32_t height)
+void PostprocessRenderer::UpdateFramebuffers(ref_ptr<dp::GraphicsContext> context, uint32_t width, uint32_t height)
 {
   TRACE_SECTION("[drape] PostprocessRenderer::UpdateFramebuffers");
   ASSERT_NOT_EQUAL(width, 0, ());
@@ -420,14 +394,11 @@ void PostprocessRenderer::UpdateFramebuffers(ref_ptr<dp::GraphicsContext> contex
   m_isSmaaFramebufferRendered = false;
   if (!m_isRouteFollowingActive && IsEffectEnabled(Effect::Antialiasing))
   {
-    InitFramebuffer(context, m_edgesFramebuffer, dp::TextureFormat::RedGreen,
-                    m_mainFramebuffer->GetDepthStencilRef(),
+    InitFramebuffer(context, m_edgesFramebuffer, dp::TextureFormat::RedGreen, m_mainFramebuffer->GetDepthStencilRef(),
                     width, height);
     InitFramebuffer(context, m_blendingWeightFramebuffer, dp::TextureFormat::RGBA8,
-                    m_mainFramebuffer->GetDepthStencilRef(),
-                    width, height);
-    InitFramebuffer(context, m_smaaFramebuffer, dp::TextureFormat::RGBA8,
-                    m_mainFramebuffer->GetDepthStencilRef(),
+                    m_mainFramebuffer->GetDepthStencilRef(), width, height);
+    InitFramebuffer(context, m_smaaFramebuffer, dp::TextureFormat::RGBA8, m_mainFramebuffer->GetDepthStencilRef(),
                     width, height);
   }
   else
@@ -453,8 +424,7 @@ bool PostprocessRenderer::OnFramebufferFallback(ref_ptr<dp::GraphicsContext> con
   return m_framebufferFallback();
 }
 
-void PostprocessRenderer::OnChangedRouteFollowingMode(ref_ptr<dp::GraphicsContext> context,
-                                                      bool isRouteFollowingActive)
+void PostprocessRenderer::OnChangedRouteFollowingMode(ref_ptr<dp::GraphicsContext> context, bool isRouteFollowingActive)
 {
   if (m_isRouteFollowingActive == isRouteFollowingActive)
     return;
@@ -464,8 +434,7 @@ void PostprocessRenderer::OnChangedRouteFollowingMode(ref_ptr<dp::GraphicsContex
     UpdateFramebuffers(context, m_width, m_height);
 }
 
-StencilWriterGuard::StencilWriterGuard(ref_ptr<PostprocessRenderer> renderer,
-                                       ref_ptr<dp::GraphicsContext> context)
+StencilWriterGuard::StencilWriterGuard(ref_ptr<PostprocessRenderer> renderer, ref_ptr<dp::GraphicsContext> context)
   : m_renderer(std::move(renderer))
   , m_context(std::move(context))
 {
diff --git a/libs/drape_frontend/postprocess_renderer.hpp b/libs/drape_frontend/postprocess_renderer.hpp
index 3e3bd91aa..3b3e0a93f 100644
--- a/libs/drape_frontend/postprocess_renderer.hpp
+++ b/libs/drape_frontend/postprocess_renderer.hpp
@@ -96,6 +96,7 @@ class StencilWriterGuard
 public:
   StencilWriterGuard(ref_ptr<PostprocessRenderer> renderer, ref_ptr<dp::GraphicsContext> context);
   ~StencilWriterGuard();
+
 private:
   ref_ptr<PostprocessRenderer> const m_renderer;
   ref_ptr<dp::GraphicsContext> const m_context;
diff --git a/libs/drape_frontend/read_manager.cpp b/libs/drape_frontend/read_manager.cpp
old mode 100755
new mode 100644
index 44b6fac7a..eefbdc798
--- a/libs/drape_frontend/read_manager.cpp
+++ b/libs/drape_frontend/read_manager.cpp
@@ -14,20 +14,11 @@ namespace
 {
 struct LessCoverageCell
 {
-  bool operator()(std::shared_ptr<TileInfo> const & l,
-                  TileKey const & r) const
-  {
-    return l->GetTileKey() < r;
-  }
+  bool operator()(std::shared_ptr<TileInfo> const & l, TileKey const & r) const { return l->GetTileKey() < r; }
 
-  bool operator()(TileKey const & l,
-                  std::shared_ptr<TileInfo> const & r) const
-  {
-    return l < r->GetTileKey();
-  }
+  bool operator()(TileKey const & l, std::shared_ptr<TileInfo> const & r) const { return l < r->GetTileKey(); }
 
-  bool operator()(std::shared_ptr<TileInfo> const & l,
-                  std::shared_ptr<TileInfo> const & r) const
+  bool operator()(std::shared_ptr<TileInfo> const & l, std::shared_ptr<TileInfo> const & r) const
   {
     return l->GetTileKey() < r->GetTileKey();
   }
@@ -40,8 +31,8 @@ bool ReadManager::LessByTileInfo::operator()(std::shared_ptr<TileInfo> const & l
   return *l < *r;
 }
 
-ReadManager::ReadManager(ref_ptr<ThreadsCommutator> commutator, MapDataProvider & model,
-                         bool allow3dBuildings, bool trafficEnabled, bool isolinesEnabled)
+ReadManager::ReadManager(ref_ptr<ThreadsCommutator> commutator, MapDataProvider & model, bool allow3dBuildings,
+                         bool trafficEnabled, bool isolinesEnabled)
   : m_commutator(commutator)
   , m_model(model)
   , m_have3dBuildings(false)
@@ -66,7 +57,7 @@ void ReadManager::Start()
   ASSERT_EQUAL(m_counter, 0, ());
 
   m_pool = make_unique_dp<base::ThreadPool>(kReadingThreadsCount,
-                              std::bind(&ReadManager::OnTaskFinished, this, std::placeholders::_1));
+                                            std::bind(&ReadManager::OnTaskFinished, this, std::placeholders::_1));
 }
 
 void ReadManager::Stop()
@@ -96,8 +87,7 @@ void ReadManager::OnTaskFinished(threads::IRoutine * task)
     ASSERT_GREATER(m_counter, 0, ());
     if (--m_counter == 0)
     {
-      m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                                make_unique_dp<FinishReadingMessage>(),
+      m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread, make_unique_dp<FinishReadingMessage>(),
                                 MessagePriority::Normal);
     }
 
@@ -113,10 +103,10 @@ void ReadManager::OnTaskFinished(threads::IRoutine * task)
 
       m_activeTiles.erase(it);
 
-      m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                                make_unique_dp<FinishTileReadMessage>(std::move(tiles),
-                                                                      true /* forceUpdateUserMarks */),
-                                MessagePriority::Normal);
+      m_commutator->PostMessage(
+          ThreadsCommutator::ResourceUploadThread,
+          make_unique_dp<FinishTileReadMessage>(std::move(tiles), true /* forceUpdateUserMarks */),
+          MessagePriority::Normal);
     }
   }
 
@@ -124,11 +114,9 @@ void ReadManager::OnTaskFinished(threads::IRoutine * task)
   m_tasksPool.Return(t);
 }
 
-void ReadManager::UpdateCoverage(ScreenBase const & screen, bool have3dBuildings,
-                                 bool forceUpdate, bool forceUpdateUserMarks,
-                                 TTilesCollection const & tiles,
-                                 ref_ptr<dp::TextureManager> texMng,
-                                 ref_ptr<MetalineManager> metalineMng)
+void ReadManager::UpdateCoverage(ScreenBase const & screen, bool have3dBuildings, bool forceUpdate,
+                                 bool forceUpdateUserMarks, TTilesCollection const & tiles,
+                                 ref_ptr<dp::TextureManager> texMng, ref_ptr<MetalineManager> metalineMng)
 {
   m_modeChanged |= (m_have3dBuildings != have3dBuildings);
   m_have3dBuildings = have3dBuildings;
@@ -152,8 +140,7 @@ void ReadManager::UpdateCoverage(ScreenBase const & screen, bool have3dBuildings
   {
     // Find rects that go out from viewport.
     TTileInfoCollection outdatedTiles;
-    std::set_difference(m_tileInfos.begin(), m_tileInfos.end(),
-                        tiles.begin(), tiles.end(),
+    std::set_difference(m_tileInfos.begin(), m_tileInfos.end(), tiles.begin(), tiles.end(),
                         std::back_inserter(outdatedTiles), LessCoverageCell());
 
     for (auto const & info : outdatedTiles)
@@ -161,14 +148,12 @@ void ReadManager::UpdateCoverage(ScreenBase const & screen, bool have3dBuildings
 
     // Find rects that go in into viewport.
     buffer_vector<TileKey, 8> newTiles;
-    std::set_difference(tiles.begin(), tiles.end(),
-                        m_tileInfos.begin(), m_tileInfos.end(),
+    std::set_difference(tiles.begin(), tiles.end(), m_tileInfos.begin(), m_tileInfos.end(),
                         std::back_inserter(newTiles), LessCoverageCell());
 
     // Find ready tiles.
     TTileInfoCollection readyTiles;
-    std::set_difference(m_tileInfos.begin(), m_tileInfos.end(),
-                        outdatedTiles.begin(), outdatedTiles.end(),
+    std::set_difference(m_tileInfos.begin(), m_tileInfos.end(), outdatedTiles.begin(), outdatedTiles.end(),
                         std::back_inserter(readyTiles), LessCoverageCell());
 
     IncreaseCounter(newTiles.size());
@@ -188,10 +173,8 @@ void ReadManager::Invalidate(TTilesCollection const & keyStorage)
 {
   TTileSet tilesToErase;
   for (auto const & info : m_tileInfos)
-  {
     if (keyStorage.find(info->GetTileKey()) != keyStorage.end())
       tilesToErase.insert(info);
-  }
 
   for (auto const & info : tilesToErase)
   {
@@ -212,10 +195,8 @@ void ReadManager::InvalidateAll()
 bool ReadManager::CheckTileKey(TileKey const & tileKey) const
 {
   for (auto const & tileInfo : m_tileInfos)
-  {
     if (tileInfo->GetTileKey() == tileKey)
       return !tileInfo->IsCancelled();
-  }
   return false;
 }
 
@@ -226,17 +207,14 @@ bool ReadManager::MustDropAllTiles(ScreenBase const & screen) const
   return (oldScale != newScale) || !m_currentViewport.GlobalRect().IsIntersect(screen.GlobalRect());
 }
 
-void ReadManager::PushTaskBackForTileKey(TileKey const & tileKey,
-                                         ref_ptr<dp::TextureManager> texMng,
+void ReadManager::PushTaskBackForTileKey(TileKey const & tileKey, ref_ptr<dp::TextureManager> texMng,
                                          ref_ptr<MetalineManager> metalineMng)
 {
   ASSERT(m_pool != nullptr, ());
-  auto context = make_unique_dp<EngineContext>(TileKey(tileKey, m_generationCounter,
-                                                       m_userMarksGenerationCounter),
-                                               m_commutator, texMng, metalineMng,
-                                               m_customFeaturesContext,
-                                               m_have3dBuildings && m_allow3dBuildings,
-                                               m_trafficEnabled, m_isolinesEnabled, m_mapLangIndex);
+  auto context = make_unique_dp<EngineContext>(TileKey(tileKey, m_generationCounter, m_userMarksGenerationCounter),
+                                               m_commutator, texMng, metalineMng, m_customFeaturesContext,
+                                               m_have3dBuildings && m_allow3dBuildings, m_trafficEnabled,
+                                               m_isolinesEnabled, m_mapLangIndex);
   std::shared_ptr<TileInfo> tileInfo = std::make_shared<TileInfo>(std::move(context));
   m_tileInfos.insert(tileInfo);
 
@@ -283,8 +261,7 @@ void ReadManager::CheckFinishedTiles(TTileInfoCollection const & requestedTiles,
   if (!finishedTiles.empty())
   {
     m_commutator->PostMessage(ThreadsCommutator::ResourceUploadThread,
-                              make_unique_dp<FinishTileReadMessage>(std::move(finishedTiles),
-                                                                    forceUpdateUserMarks),
+                              make_unique_dp<FinishTileReadMessage>(std::move(finishedTiles), forceUpdateUserMarks),
                               MessagePriority::Normal);
   }
 }
@@ -372,10 +349,8 @@ bool ReadManager::RemoveCustomFeatures(MwmSet::MwmId const & mwmId)
 
   CustomFeatures features;
   for (auto const & s : m_customFeaturesContext->m_features)
-  {
     if (s.first.m_mwmId != mwmId)
       features.insert(s);
-  }
   if (features.size() == m_customFeaturesContext->m_features.size())
     return false;
 
@@ -392,4 +367,4 @@ bool ReadManager::RemoveAllCustomFeatures()
   return true;
 }
 
-} // namespace df
+}  // namespace df
diff --git a/libs/drape_frontend/read_manager.hpp b/libs/drape_frontend/read_manager.hpp
old mode 100755
new mode 100644
index 813429b9c..1c534aa13
--- a/libs/drape_frontend/read_manager.hpp
+++ b/libs/drape_frontend/read_manager.hpp
@@ -32,15 +32,14 @@ uint8_t constexpr kReadingThreadsCount = 2;
 class ReadManager
 {
 public:
-  ReadManager(ref_ptr<ThreadsCommutator> commutator, MapDataProvider & model,
-              bool allow3dBuildings, bool trafficEnabled, bool isolinesEnabled);
+  ReadManager(ref_ptr<ThreadsCommutator> commutator, MapDataProvider & model, bool allow3dBuildings,
+              bool trafficEnabled, bool isolinesEnabled);
 
   void Start();
   void Stop();
   void Restart();
 
-  void UpdateCoverage(ScreenBase const & screen, bool have3dBuildings,
-                      bool forceUpdate, bool forceUpdateUserMarks,
+  void UpdateCoverage(ScreenBase const & screen, bool have3dBuildings, bool forceUpdate, bool forceUpdateUserMarks,
                       TTilesCollection const & tiles, ref_ptr<dp::TextureManager> texMng,
                       ref_ptr<MetalineManager> metalineMng);
   void Invalidate(TTilesCollection const & keyStorage);
@@ -88,8 +87,7 @@ private:
 
   struct LessByTileInfo
   {
-    bool operator ()(std::shared_ptr<TileInfo> const & l,
-                     std::shared_ptr<TileInfo> const & r) const;
+    bool operator()(std::shared_ptr<TileInfo> const & l, std::shared_ptr<TileInfo> const & r) const;
   };
 
   using TTileSet = std::set<std::shared_ptr<TileInfo>, LessByTileInfo>;
diff --git a/libs/drape_frontend/read_metaline_task.cpp b/libs/drape_frontend/read_metaline_task.cpp
index de9d60d70..be59fc8ae 100644
--- a/libs/drape_frontend/read_metaline_task.cpp
+++ b/libs/drape_frontend/read_metaline_task.cpp
@@ -29,15 +29,15 @@ std::vector<MetalineData> ReadMetalinesFromFile(MwmSet::MwmId const & mwmId)
   try
   {
     std::vector<MetalineData> model;
-    ModelReaderPtr reader = FilesContainerR(mwmId.GetInfo()->GetLocalFile().GetPath(MapFileType::Map))
-                                            .GetReader(METALINES_FILE_TAG);
+    ModelReaderPtr reader =
+        FilesContainerR(mwmId.GetInfo()->GetLocalFile().GetPath(MapFileType::Map)).GetReader(METALINES_FILE_TAG);
     ReaderSrc src(reader.GetPtr());
     auto const version = ReadPrimitiveFromSource<uint8_t>(src);
     if (version == 1)
     {
       for (auto metalineIndex = ReadVarUint<uint32_t>(src); metalineIndex > 0; --metalineIndex)
       {
-        MetalineData data {};
+        MetalineData data{};
         for (auto i = ReadVarUint<uint32_t>(src); i > 0; --i)
         {
           auto const fid = ReadVarInt<int32_t>(src);
@@ -58,8 +58,7 @@ std::vector<MetalineData> ReadMetalinesFromFile(MwmSet::MwmId const & mwmId)
   }
 }
 
-std::map<FeatureID, std::vector<m2::PointD>> ReadPoints(df::MapDataProvider & model,
-                                                        MetalineData const & metaline)
+std::map<FeatureID, std::vector<m2::PointD>> ReadPoints(df::MapDataProvider & model, MetalineData const & metaline)
 {
   auto features = metaline.m_features;
   std::sort(features.begin(), features.end());
diff --git a/libs/drape_frontend/read_mwm_task.cpp b/libs/drape_frontend/read_mwm_task.cpp
index 924d0c726..9b7c253fb 100644
--- a/libs/drape_frontend/read_mwm_task.cpp
+++ b/libs/drape_frontend/read_mwm_task.cpp
@@ -2,8 +2,7 @@
 
 namespace df
 {
-ReadMWMTask::ReadMWMTask(MapDataProvider & model)
-  : m_model(model)
+ReadMWMTask::ReadMWMTask(MapDataProvider & model) : m_model(model)
 {
 #ifdef DEBUG
   m_checker = false;
diff --git a/libs/drape_frontend/read_mwm_task.hpp b/libs/drape_frontend/read_mwm_task.hpp
index 258aaeff7..f12689af3 100644
--- a/libs/drape_frontend/read_mwm_task.hpp
+++ b/libs/drape_frontend/read_mwm_task.hpp
@@ -33,15 +33,10 @@ private:
 class ReadMWMTaskFactory
 {
 public:
-  explicit ReadMWMTaskFactory(MapDataProvider & model)
-    : m_model(model)
-  {}
+  explicit ReadMWMTaskFactory(MapDataProvider & model) : m_model(model) {}
 
   // Caller must handle object life cycle.
-  ReadMWMTask * GetNew() const
-  {
-    return new ReadMWMTask(m_model);
-  }
+  ReadMWMTask * GetNew() const { return new ReadMWMTask(m_model); }
 
 private:
   MapDataProvider & m_model;
diff --git a/libs/drape_frontend/render_group.cpp b/libs/drape_frontend/render_group.cpp
old mode 100755
new mode 100644
index 60957285a..07306ab3d
--- a/libs/drape_frontend/render_group.cpp
+++ b/libs/drape_frontend/render_group.cpp
@@ -3,8 +3,8 @@
 
 #include "shaders/program_manager.hpp"
 
-#include "drape_frontend/debug_rect_renderer.hpp"
 #include "drape/vertex_array_buffer.hpp"
+#include "drape_frontend/debug_rect_renderer.hpp"
 
 #include "geometry/screenbase.hpp"
 
@@ -50,10 +50,8 @@ void RenderGroup::CollectOverlay(ref_ptr<dp::OverlayTree> tree)
 bool RenderGroup::HasOverlayHandles() const
 {
   for (auto & renderBucket : m_renderBuckets)
-  {
     if (renderBucket->HasOverlayHandles())
       return true;
-  }
   return false;
 }
 
@@ -129,10 +127,8 @@ void RenderGroup::AddBucket(drape_ptr<dp::RenderBucket> && bucket)
 bool RenderGroup::IsUserMark() const
 {
   auto const depthLayer = GetDepthLayer(m_state);
-  return depthLayer == DepthLayer::UserLineLayer ||
-         depthLayer == DepthLayer::UserMarkLayer ||
-         depthLayer == DepthLayer::RoutingBottomMarkLayer ||
-         depthLayer == DepthLayer::RoutingMarkLayer ||
+  return depthLayer == DepthLayer::UserLineLayer || depthLayer == DepthLayer::UserMarkLayer ||
+         depthLayer == DepthLayer::RoutingBottomMarkLayer || depthLayer == DepthLayer::RoutingMarkLayer ||
          depthLayer == DepthLayer::SearchMarkLayer;
 }
 
@@ -141,7 +137,7 @@ bool RenderGroup::UpdateCanBeDeletedStatus(bool canBeDeleted, int currentZoom, r
   if (!IsPendingOnDelete())
     return false;
 
-  for (size_t i = 0; i < m_renderBuckets.size(); )
+  for (size_t i = 0; i < m_renderBuckets.size();)
   {
     bool const visibleBucket = !canBeDeleted && (m_renderBuckets[i]->GetMinZoom() <= currentZoom);
     if (!visibleBucket)
@@ -179,16 +175,14 @@ bool RenderGroupComparator::operator()(drape_ptr<RenderGroup> const & l, drape_p
   return rCanBeDeleted;
 }
 
-UserMarkRenderGroup::UserMarkRenderGroup(dp::RenderState const & state, TileKey const & tileKey)
-  : TBase(state, tileKey)
+UserMarkRenderGroup::UserMarkRenderGroup(dp::RenderState const & state, TileKey const & tileKey) : TBase(state, tileKey)
 {
   auto const program = state.GetProgram<gpu::Program>();
   auto const program3d = state.GetProgram3d<gpu::Program>();
 
   if (program == gpu::Program::BookmarkAnim || program3d == gpu::Program::BookmarkAnimBillboard)
   {
-    m_animation = std::make_unique<OpacityAnimation>(0.25 /* duration */, 0.0 /* minValue */,
-                                                     1.0 /* maxValue */);
+    m_animation = std::make_unique<OpacityAnimation>(0.25 /* duration */, 0.0 /* minValue */, 1.0 /* maxValue */);
     m_mapping.AddRangePoint(0.6f, 1.3f);
     m_mapping.AddRangePoint(0.85f, 0.8f);
     m_mapping.AddRangePoint(1.0f, 1.0f);
diff --git a/libs/drape_frontend/render_group.hpp b/libs/drape_frontend/render_group.hpp
old mode 100755
new mode 100644
index ddef84954..7fe22c585
--- a/libs/drape_frontend/render_group.hpp
+++ b/libs/drape_frontend/render_group.hpp
@@ -12,12 +12,18 @@
 #include "drape/render_bucket.hpp"
 
 #include <memory>
-#include <vector>
 #include <string>
+#include <vector>
 
 class ScreenBase;
-namespace dp { class OverlayTree; }
-namespace gpu { class ProgramManager; }
+namespace dp
+{
+class OverlayTree;
+}
+namespace gpu
+{
+class ProgramManager;
+}
 
 namespace df
 {
@@ -27,10 +33,7 @@ class DebugRectRenderer;
 class BaseRenderGroup
 {
 public:
-  BaseRenderGroup(dp::RenderState const & state, TileKey const & tileKey)
-    : m_state(state)
-    , m_tileKey(tileKey)
-  {}
+  BaseRenderGroup(dp::RenderState const & state, TileKey const & tileKey) : m_state(state), m_tileKey(tileKey) {}
 
   virtual ~BaseRenderGroup() = default;
 
@@ -52,6 +55,7 @@ private:
 class RenderGroup : public BaseRenderGroup
 {
   using TBase = BaseRenderGroup;
+
 public:
   RenderGroup(dp::RenderState const & state, TileKey const & tileKey);
   ~RenderGroup() override;
@@ -72,8 +76,7 @@ public:
   bool IsPendingOnDelete() const { return m_pendingOnDelete; }
   bool CanBeDeleted() const { return m_canBeDeleted; }
 
-  bool UpdateCanBeDeletedStatus(bool canBeDeleted, int currentZoom,
-                                ref_ptr<dp::OverlayTree> tree);
+  bool UpdateCanBeDeletedStatus(bool canBeDeleted, int currentZoom, ref_ptr<dp::OverlayTree> tree);
 
   bool IsUserMark() const;
 
@@ -107,6 +110,7 @@ public:
 class UserMarkRenderGroup : public RenderGroup
 {
   using TBase = RenderGroup;
+
 public:
   UserMarkRenderGroup(dp::RenderState const & state, TileKey const & tileKey);
 
diff --git a/libs/drape_frontend/render_node.hpp b/libs/drape_frontend/render_node.hpp
index 0953feff7..f99d60905 100644
--- a/libs/drape_frontend/render_node.hpp
+++ b/libs/drape_frontend/render_node.hpp
@@ -5,8 +5,8 @@
 #include "shaders/program_manager.hpp"
 
 #include "drape/graphics_context.hpp"
-#include "drape/vertex_array_buffer.hpp"
 #include "drape/pointers.hpp"
+#include "drape/vertex_array_buffer.hpp"
 
 #include "geometry/point2d.hpp"
 
@@ -21,16 +21,15 @@ public:
   {}
 
   template <typename ParamsType>
-  void Render(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
-              ParamsType const & params, dp::IndicesRange const & range)
+  void Render(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng, ParamsType const & params,
+              dp::IndicesRange const & range)
   {
     Apply(context, mng, params);
     m_buffer->RenderRange(context, m_state.GetDrawAsLine(), range);
   }
 
   template <typename ParamsType>
-  void Render(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
-              ParamsType const & params)
+  void Render(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng, ParamsType const & params)
   {
     Apply(context, mng, params);
     m_buffer->Render(context, m_state.GetDrawAsLine());
@@ -44,8 +43,7 @@ public:
 
 private:
   template <typename ParamsType>
-  void Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
-             ParamsType const & params)
+  void Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng, ParamsType const & params)
   {
     auto prg = mng->GetProgram(m_state.GetProgram<gpu::Program>());
     prg->Bind();
diff --git a/libs/drape_frontend/render_state_extension.cpp b/libs/drape_frontend/render_state_extension.cpp
index 380a701e5..53538a945 100644
--- a/libs/drape_frontend/render_state_extension.cpp
+++ b/libs/drape_frontend/render_state_extension.cpp
@@ -7,16 +7,11 @@ namespace
 using namespace df;
 
 std::array<RenderStateExtension, static_cast<size_t>(DepthLayer::LayersCount)> kStateExtensions = {
-    RenderStateExtension(DepthLayer::GeometryLayer),
-    RenderStateExtension(DepthLayer::Geometry3dLayer),
-    RenderStateExtension(DepthLayer::UserLineLayer),
-    RenderStateExtension(DepthLayer::OverlayLayer),
-    RenderStateExtension(DepthLayer::TransitSchemeLayer),
-    RenderStateExtension(DepthLayer::UserMarkLayer),
-    RenderStateExtension(DepthLayer::RoutingBottomMarkLayer),
-    RenderStateExtension(DepthLayer::RoutingMarkLayer),
-    RenderStateExtension(DepthLayer::SearchMarkLayer),
-    RenderStateExtension(DepthLayer::GuiLayer)};
+    RenderStateExtension(DepthLayer::GeometryLayer),          RenderStateExtension(DepthLayer::Geometry3dLayer),
+    RenderStateExtension(DepthLayer::UserLineLayer),          RenderStateExtension(DepthLayer::OverlayLayer),
+    RenderStateExtension(DepthLayer::TransitSchemeLayer),     RenderStateExtension(DepthLayer::UserMarkLayer),
+    RenderStateExtension(DepthLayer::RoutingBottomMarkLayer), RenderStateExtension(DepthLayer::RoutingMarkLayer),
+    RenderStateExtension(DepthLayer::SearchMarkLayer),        RenderStateExtension(DepthLayer::GuiLayer)};
 
 struct RenderStateExtensionFactory
 {
@@ -30,9 +25,7 @@ struct RenderStateExtensionFactory
 
 namespace df
 {
-RenderStateExtension::RenderStateExtension(DepthLayer depthLayer)
-  : m_depthLayer(depthLayer)
-{}
+RenderStateExtension::RenderStateExtension(DepthLayer depthLayer) : m_depthLayer(depthLayer) {}
 
 bool RenderStateExtension::Less(ref_ptr<dp::BaseRenderStateExtension> other) const
 {
diff --git a/libs/drape_frontend/requested_tiles.cpp b/libs/drape_frontend/requested_tiles.cpp
old mode 100755
new mode 100644
index 9341d2b96..39e9472d0
--- a/libs/drape_frontend/requested_tiles.cpp
+++ b/libs/drape_frontend/requested_tiles.cpp
@@ -2,8 +2,8 @@
 
 namespace df
 {
-void RequestedTiles::Set(ScreenBase const & screen, bool have3dBuildings, bool forceRequest,
-                         bool forceUserMarksRequest, TTilesCollection && tiles)
+void RequestedTiles::Set(ScreenBase const & screen, bool have3dBuildings, bool forceRequest, bool forceUserMarksRequest,
+                         TTilesCollection && tiles)
 {
   std::lock_guard<std::mutex> lock(m_mutex);
   m_tiles = std::move(tiles);
@@ -23,8 +23,8 @@ TTilesCollection RequestedTiles::GetTiles()
   return tiles;
 }
 
-void RequestedTiles::GetParams(ScreenBase & screen, bool & have3dBuildings,
-                               bool & forceRequest, bool & forceUserMarksRequest)
+void RequestedTiles::GetParams(ScreenBase & screen, bool & have3dBuildings, bool & forceRequest,
+                               bool & forceUserMarksRequest)
 {
   std::lock_guard<std::mutex> lock(m_mutex);
   screen = m_screen;
diff --git a/libs/drape_frontend/requested_tiles.hpp b/libs/drape_frontend/requested_tiles.hpp
old mode 100755
new mode 100644
index 7fc1ea845..0db7e6669
--- a/libs/drape_frontend/requested_tiles.hpp
+++ b/libs/drape_frontend/requested_tiles.hpp
@@ -12,11 +12,10 @@ class RequestedTiles
 {
 public:
   RequestedTiles() = default;
-  void Set(ScreenBase const & screen, bool have3dBuildings, bool forceRequest,
-           bool forceUserMarksRequest, TTilesCollection && tiles);
+  void Set(ScreenBase const & screen, bool have3dBuildings, bool forceRequest, bool forceUserMarksRequest,
+           TTilesCollection && tiles);
   TTilesCollection GetTiles();
-  void GetParams(ScreenBase & screen, bool & have3dBuildings,
-                 bool & forceRequest, bool & forceUserMarksRequest);
+  void GetParams(ScreenBase & screen, bool & have3dBuildings, bool & forceRequest, bool & forceUserMarksRequest);
   bool CheckTileKey(TileKey const & tileKey) const;
 
 private:
diff --git a/libs/drape_frontend/route_builder.cpp b/libs/drape_frontend/route_builder.cpp
index f8c0f0f2a..10addc7ec 100644
--- a/libs/drape_frontend/route_builder.cpp
+++ b/libs/drape_frontend/route_builder.cpp
@@ -7,16 +7,14 @@
 
 namespace df
 {
-RouteBuilder::RouteBuilder(FlushFn && flushFn, FlushArrowsFn && flushArrowsFn,
-                           FlushMarkersFn && flushMarkersFn)
+RouteBuilder::RouteBuilder(FlushFn && flushFn, FlushArrowsFn && flushArrowsFn, FlushMarkersFn && flushMarkersFn)
   : m_flushFn(std::move(flushFn))
   , m_flushArrowsFn(std::move(flushArrowsFn))
   , m_flushMarkersFn(std::move(flushMarkersFn))
 {}
 
-void RouteBuilder::Build(ref_ptr<dp::GraphicsContext> context, dp::DrapeID subrouteId,
-                         SubrouteConstPtr subroute, ref_ptr<dp::TextureManager> textures,
-                         int recacheId)
+void RouteBuilder::Build(ref_ptr<dp::GraphicsContext> context, dp::DrapeID subrouteId, SubrouteConstPtr subroute,
+                         ref_ptr<dp::TextureManager> textures, int recacheId)
 {
   RouteCacheData cacheData;
   cacheData.m_polyline = subroute->m_polyline;
@@ -28,9 +26,7 @@ void RouteBuilder::Build(ref_ptr<dp::GraphicsContext> context, dp::DrapeID subro
 
   ASSERT(!subroute->m_style.empty(), ());
   for (size_t styleIndex = 0; styleIndex < subroute->m_style.size(); ++styleIndex)
-  {
     subrouteData.push_back(RouteShape::CacheRoute(context, subrouteId, subroute, styleIndex, recacheId));
-  }
 
   auto markersData = RouteShape::CacheMarkers(context, subrouteId, subroute, recacheId, textures);
 
@@ -65,8 +61,8 @@ void RouteBuilder::BuildArrows(ref_ptr<dp::GraphicsContext> context, dp::DrapeID
   routeArrowsData->m_subrouteId = subrouteId;
   routeArrowsData->m_pivot = it->second.m_polyline.GetLimitRect().Center();
   routeArrowsData->m_recacheId = recacheId;
-  RouteShape::CacheRouteArrows(context, textures, it->second.m_polyline, borders,
-                               it->second.m_baseDepthIndex, *routeArrowsData.get());
+  RouteShape::CacheRouteArrows(context, textures, it->second.m_polyline, borders, it->second.m_baseDepthIndex,
+                               *routeArrowsData.get());
 
   // Flush route arrows geometry.
   context->Flush();
diff --git a/libs/drape_frontend/route_builder.hpp b/libs/drape_frontend/route_builder.hpp
index 8f230a6f0..85a50ba8a 100644
--- a/libs/drape_frontend/route_builder.hpp
+++ b/libs/drape_frontend/route_builder.hpp
@@ -15,8 +15,8 @@
 
 namespace dp
 {
-  class TextureManager;
-  class GraphicsContext;
+class TextureManager;
+class GraphicsContext;
 }  // namespace dp
 
 namespace df
@@ -28,8 +28,7 @@ public:
   using FlushArrowsFn = std::function<void(drape_ptr<SubrouteArrowsData> &&)>;
   using FlushMarkersFn = std::function<void(drape_ptr<SubrouteMarkersData> &&)>;
 
-  RouteBuilder(FlushFn && flushFn, FlushArrowsFn && flushArrowsFn,
-               FlushMarkersFn && flushMarkersFn);
+  RouteBuilder(FlushFn && flushFn, FlushArrowsFn && flushArrowsFn, FlushMarkersFn && flushMarkersFn);
 
   void Build(ref_ptr<dp::GraphicsContext> context, dp::DrapeID subrouteId, SubrouteConstPtr subroute,
              ref_ptr<dp::TextureManager> textures, int recacheId);
diff --git a/libs/drape_frontend/route_renderer.cpp b/libs/drape_frontend/route_renderer.cpp
index 8b7d1ad3a..978a8d4e4 100644
--- a/libs/drape_frontend/route_renderer.cpp
+++ b/libs/drape_frontend/route_renderer.cpp
@@ -32,13 +32,11 @@ std::string const kRouteFakeOutlineColor = "RouteFakeOutline";
 
 namespace
 {
-std::array<float, 20> const kPreviewPointRadiusInPixel =
-{
-  // 1   2     3     4     5     6     7     8     9     10
-  0.8f, 0.8f, 2.0f, 2.5f, 2.5f, 2.5f, 2.5f, 2.5f, 2.5f, 2.5f,
-  //11   12    13    14    15    16    17    18    19     20
-  2.5f, 2.5f, 2.5f, 2.5f, 3.0f, 4.0f, 4.5f, 4.5f, 5.0f, 5.5f
-};
+std::array<float, 20> const kPreviewPointRadiusInPixel = {
+    // 1   2     3     4     5     6     7     8     9     10
+    0.8f, 0.8f, 2.0f, 2.5f, 2.5f, 2.5f, 2.5f, 2.5f, 2.5f, 2.5f,
+    // 11   12    13    14    15    16    17    18    19     20
+    2.5f, 2.5f, 2.5f, 2.5f, 3.0f, 4.0f, 4.5f, 4.5f, 5.0f, 5.5f};
 
 int const kArrowAppearingZoomLevel = 14;
 int const kInvalidGroup = -1;
@@ -47,8 +45,7 @@ uint32_t const kPreviewPointsCount = 512;
 
 double const kInvalidDistance = -1.0;
 
-void InterpolateByZoom(SubrouteConstPtr const & subroute, ScreenBase const & screen,
-                       float & halfWidth, double & zoom)
+void InterpolateByZoom(SubrouteConstPtr const & subroute, ScreenBase const & screen, float & halfWidth, double & zoom)
 {
   int index = 0;
   float lerpCoef = 0.0f;
@@ -66,10 +63,7 @@ void InterpolateByZoom(SubrouteConstPtr const & subroute, ScreenBase const & scr
 
 void ClipBorders(std::vector<ArrowBorders> & borders)
 {
-  auto invalidBorders = [](ArrowBorders const & arrowBorders)
-  {
-    return arrowBorders.m_groupIndex == kInvalidGroup;
-  };
+  auto invalidBorders = [](ArrowBorders const & arrowBorders) { return arrowBorders.m_groupIndex == kInvalidGroup; };
   borders.erase(std::remove_if(borders.begin(), borders.end(), invalidBorders), borders.end());
 }
 
@@ -83,10 +77,8 @@ void MergeAndClipBorders(std::vector<ArrowBorders> & borders)
 
   // Mark groups.
   for (size_t i = 0; i + 1 < borders.size(); i++)
-  {
     if (borders[i].m_endDistance >= borders[i + 1].m_startDistance)
       borders[i + 1].m_groupIndex = borders[i].m_groupIndex;
-  }
 
   // Merge groups.
   int lastGroup = borders.front().m_groupIndex;
@@ -110,17 +102,14 @@ void MergeAndClipBorders(std::vector<ArrowBorders> & borders)
   ClipBorders(borders);
 }
 
-bool AreEqualArrowBorders(std::vector<ArrowBorders> const & borders1,
-                          std::vector<ArrowBorders> const & borders2)
+bool AreEqualArrowBorders(std::vector<ArrowBorders> const & borders1, std::vector<ArrowBorders> const & borders2)
 {
   if (borders1.size() != borders2.size())
     return false;
 
   for (size_t i = 0; i < borders1.size(); i++)
-  {
     if (borders1[i].m_groupIndex != borders2[i].m_groupIndex)
       return false;
-  }
 
   double const kDistanceEps = 1e-5;
   for (size_t i = 0; i < borders1.size(); i++)
@@ -135,9 +124,9 @@ bool AreEqualArrowBorders(std::vector<ArrowBorders> const & borders1,
   return true;
 }
 
-std::vector<ArrowBorders> CalculateArrowBorders(m2::RectD screenRect, double screenScale,
-                                                float currentHalfWidth, SubrouteConstPtr const & subroute,
-                                                double subrouteLength, double distanceFromBegin)
+std::vector<ArrowBorders> CalculateArrowBorders(m2::RectD screenRect, double screenScale, float currentHalfWidth,
+                                                SubrouteConstPtr const & subroute, double subrouteLength,
+                                                double distanceFromBegin)
 {
   auto const & turns = subroute->m_turns;
   if (turns.empty())
@@ -210,14 +199,10 @@ void BuildBuckets(ref_ptr<dp::GraphicsContext> context, RouteRenderProperty cons
     bucket->GetBuffer()->Build(context, mng->GetProgram(renderProperty.m_state.GetProgram<gpu::Program>()));
 }
 
-RouteRenderer::Subroutes::iterator FindSubroute(RouteRenderer::Subroutes & subroutes,
-                                                dp::DrapeID subrouteId)
+RouteRenderer::Subroutes::iterator FindSubroute(RouteRenderer::Subroutes & subroutes, dp::DrapeID subrouteId)
 {
-  return std::find_if(subroutes.begin(), subroutes.end(),
-                      [&subrouteId](RouteRenderer::SubrouteInfo const & info)
-  {
-    return info.m_subrouteId == subrouteId;
-  });
+  return std::find_if(subroutes.begin(), subroutes.end(), [&subrouteId](RouteRenderer::SubrouteInfo const & info)
+  { return info.m_subrouteId == subrouteId; });
 }
 
 float GetCurrentHalfWidth(df::RouteRenderer::SubrouteInfo const & subrouteInfo)
@@ -238,8 +223,7 @@ RouteRenderer::RouteRenderer(PreviewPointsRequestCallback && previewPointsReques
   ASSERT(m_previewPointsRequest != nullptr, ());
 }
 
-void RouteRenderer::PrepareRouteArrows(ScreenBase const & screen,
-                                       PrepareRouteArrowsCallback const & prepareCallback)
+void RouteRenderer::PrepareRouteArrows(ScreenBase const & screen, PrepareRouteArrowsCallback const & prepareCallback)
 {
   for (auto & subrouteInfo : m_subroutes)
   {
@@ -267,13 +251,12 @@ void RouteRenderer::PrepareRouteArrows(ScreenBase const & screen,
     auto const screenScale = screen.GetScale();
     auto const subrouteLength = subrouteInfo.m_length;
     auto subroute = subrouteInfo.m_subroute;
-    dp::DrapeRoutine::RunSequential([subrouteId, screenRect, screenScale, halfWidth,
-                                     subroute = std::move(subroute), subrouteLength,
-                                     dist, prepareCallback]()
+    dp::DrapeRoutine::RunSequential([subrouteId, screenRect, screenScale, halfWidth, subroute = std::move(subroute),
+                                     subrouteLength, dist, prepareCallback]()
     {
       ASSERT(prepareCallback != nullptr, ());
-      prepareCallback(subrouteId, CalculateArrowBorders(screenRect, screenScale, halfWidth,
-                                                        subroute, subrouteLength, dist));
+      prepareCallback(subrouteId,
+                      CalculateArrowBorders(screenRect, screenScale, halfWidth, subroute, subrouteLength, dist));
     });
   }
 }
@@ -342,8 +325,8 @@ void RouteRenderer::UpdatePreview(ScreenBase const & screen)
     for (double d = distDelta * 0.5; d < segmentLen; d += distDelta)
     {
       m2::PointD const pt = polyline.GetPointByDistance(d);
-      m2::RectD const circleRect(pt.x - radiusMercator, pt.y - radiusMercator,
-                                 pt.x + radiusMercator, pt.y + radiusMercator);
+      m2::RectD const circleRect(pt.x - radiusMercator, pt.y - radiusMercator, pt.x + radiusMercator,
+                                 pt.y + radiusMercator);
       if (!screen.ClipRect().IsIntersect(circleRect))
         continue;
 
@@ -463,8 +446,8 @@ void RouteRenderer::RenderSubroute(ref_ptr<dp::GraphicsContext> context, ref_ptr
 
   // Adjust line color depending on route type and subroute distance. After the first stop point
   // route color is adjusted according to RouteMaskCar, RouteMaskBicycle or RouteMaskPedestrian properties.
-  params.m_maskColor = glsl::ToVec4(GetRouteMaskColor(subrouteData->m_subroute->m_routeType,
-                                                      subrouteData->m_subroute->m_baseDistance));
+  params.m_maskColor =
+      glsl::ToVec4(GetRouteMaskColor(subrouteData->m_subroute->m_routeType, subrouteData->m_subroute->m_baseDistance));
   if (style.m_pattern.m_isDashed)
   {
     params.m_pattern = glsl::vec2(static_cast<float>(screenHalfWidth * style.m_pattern.m_dashLength),
@@ -474,34 +457,31 @@ void RouteRenderer::RenderSubroute(ref_ptr<dp::GraphicsContext> context, ref_ptr
   {
     params.m_outlineColor = glsl::ToVec4(df::GetColorConstant(style.m_outlineColor));
   }
-  params.m_fakeBorders = glsl::vec2(subrouteData->m_subroute->m_headFakeDistance,
-                                    subrouteData->m_subroute->m_tailFakeDistance);
+  params.m_fakeBorders =
+      glsl::vec2(subrouteData->m_subroute->m_headFakeDistance, subrouteData->m_subroute->m_tailFakeDistance);
   params.m_fakeColor = glsl::ToVec4(df::GetColorConstant(kRouteFakeColor));
   params.m_fakeOutlineColor = glsl::ToVec4(df::GetColorConstant(kRouteFakeOutlineColor));
 
-  ref_ptr<dp::GpuProgram> prg = mng->GetProgram(style.m_pattern.m_isDashed ?
-                                                gpu::Program::RouteDash : gpu::Program::Route);
+  ref_ptr<dp::GpuProgram> prg =
+      mng->GetProgram(style.m_pattern.m_isDashed ? gpu::Program::RouteDash : gpu::Program::Route);
   prg->Bind();
   dp::ApplyState(context, prg, state);
   mng->GetParamsSetter()->Apply(context, prg, params);
 
   // Render buckets.
   auto const & clipRect = screen.ClipRect();
-  CHECK_EQUAL(subrouteData->m_renderProperty.m_buckets.size(),
-              subrouteData->m_renderProperty.m_boundingBoxes.size(), ());
+  CHECK_EQUAL(subrouteData->m_renderProperty.m_buckets.size(), subrouteData->m_renderProperty.m_boundingBoxes.size(),
+              ());
   for (size_t i = 0; i < subrouteData->m_renderProperty.m_buckets.size(); ++i)
-  {
     if (subrouteData->m_renderProperty.m_boundingBoxes[i].IsIntersect(clipRect))
       subrouteData->m_renderProperty.m_buckets[i]->Render(context, state.GetDrawAsLine());
-  }
 }
 
 void RouteRenderer::RenderSubrouteArrows(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
                                          SubrouteInfo const & subrouteInfo, ScreenBase const & screen,
                                          FrameValues const & frameValues)
 {
-  if (subrouteInfo.m_arrowsData == nullptr ||
-      subrouteInfo.m_arrowsData->m_renderProperty.m_buckets.empty() ||
+  if (subrouteInfo.m_arrowsData == nullptr || subrouteInfo.m_arrowsData->m_renderProperty.m_buckets.empty() ||
       m_hiddenSubroutes.find(subrouteInfo.m_subrouteId) != m_hiddenSubroutes.end())
   {
     return;
@@ -513,15 +493,14 @@ void RouteRenderer::RenderSubrouteArrows(ref_ptr<dp::GraphicsContext> context, r
   // Set up parameters.
   gpu::RouteProgramParams params;
   frameValues.SetTo(params);
-  math::Matrix<float, 4, 4> mv = screen.GetModelView(subrouteInfo.m_arrowsData->m_pivot,
-                                                     kShapeCoordScalar);
+  math::Matrix<float, 4, 4> mv = screen.GetModelView(subrouteInfo.m_arrowsData->m_pivot, kShapeCoordScalar);
   params.m_modelView = glsl::make_mat4(mv.m_data);
   auto const arrowHalfWidth = static_cast<float>(currentHalfWidth * kArrowHeightFactor);
   params.m_arrowHalfWidth = arrowHalfWidth;
 
   // Adjust arrow color depending on route type and subroute distance
-  params.m_maskColor = glsl::ToVec4(GetArrowMaskColor(subrouteInfo.m_subroute->m_routeType,
-                                                      subrouteInfo.m_subroute->m_baseDistance));
+  params.m_maskColor =
+      glsl::ToVec4(GetArrowMaskColor(subrouteInfo.m_subroute->m_routeType, subrouteInfo.m_subroute->m_baseDistance));
 
   ref_ptr<dp::GpuProgram> prg = mng->GetProgram(gpu::Program::RouteArrow);
   prg->Bind();
@@ -532,18 +511,15 @@ void RouteRenderer::RenderSubrouteArrows(ref_ptr<dp::GraphicsContext> context, r
   CHECK_EQUAL(subrouteInfo.m_arrowsData->m_renderProperty.m_buckets.size(),
               subrouteInfo.m_arrowsData->m_renderProperty.m_boundingBoxes.size(), ());
   for (size_t i = 0; i < subrouteInfo.m_arrowsData->m_renderProperty.m_buckets.size(); ++i)
-  {
     if (subrouteInfo.m_arrowsData->m_renderProperty.m_boundingBoxes[i].IsIntersect(clipRect))
       subrouteInfo.m_arrowsData->m_renderProperty.m_buckets[i]->Render(context, state.GetDrawAsLine());
-  }
 }
 
 void RouteRenderer::RenderSubrouteMarkers(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
                                           SubrouteInfo const & subrouteInfo, ScreenBase const & screen,
                                           FrameValues const & frameValues)
 {
-  if (subrouteInfo.m_markersData == nullptr ||
-      subrouteInfo.m_markersData->m_renderProperty.m_buckets.empty() ||
+  if (subrouteInfo.m_markersData == nullptr || subrouteInfo.m_markersData->m_renderProperty.m_buckets.empty() ||
       m_hiddenSubroutes.find(subrouteInfo.m_subrouteId) != m_hiddenSubroutes.end())
   {
     return;
@@ -559,17 +535,16 @@ void RouteRenderer::RenderSubrouteMarkers(ref_ptr<dp::GraphicsContext> context,
   // Set up parameters.
   gpu::RouteProgramParams params;
   frameValues.SetTo(params);
-  math::Matrix<float, 4, 4> mv = screen.GetModelView(subrouteInfo.m_markersData->m_pivot,
-                                                     kShapeCoordScalar);
+  math::Matrix<float, 4, 4> mv = screen.GetModelView(subrouteInfo.m_markersData->m_pivot, kShapeCoordScalar);
   params.m_modelView = glsl::make_mat4(mv.m_data);
   params.m_routeParams = glsl::vec4(currentHalfWidth, dist, 0.0f, 0.0f);
-  params.m_angleCosSin = glsl::vec2(static_cast<float>(cos(screen.GetAngle())),
-                                    static_cast<float>(sin(screen.GetAngle())));
+  params.m_angleCosSin =
+      glsl::vec2(static_cast<float>(cos(screen.GetAngle())), static_cast<float>(sin(screen.GetAngle())));
 
   // Adjust color depending on route type and subroute distance. After the first stop point
   // marker color is adjusted according to RouteMaskCar, RouteMaskBicycle or RouteMaskPedestrian properties.
-  params.m_maskColor = glsl::ToVec4(GetRouteMaskColor(subrouteInfo.m_subroute->m_routeType,
-                                                      subrouteInfo.m_subroute->m_baseDistance));
+  params.m_maskColor =
+      glsl::ToVec4(GetRouteMaskColor(subrouteInfo.m_subroute->m_routeType, subrouteInfo.m_subroute->m_baseDistance));
 
   ref_ptr<dp::GpuProgram> prg = mng->GetProgram(gpu::Program::RouteMarker);
   prg->Bind();
@@ -598,10 +573,8 @@ void RouteRenderer::RenderPreviewData(ref_ptr<dp::GraphicsContext> context, ref_
 
   ASSERT_EQUAL(m_previewRenderData.size(), m_previewHandlesCache.size(), ());
   for (size_t i = 0; i < m_previewRenderData.size(); i++)
-  {
     if (m_previewHandlesCache[i].second != 0)
       m_previewRenderData[i]->m_bucket->Render(context, state.GetDrawAsLine());
-  }
 }
 
 void RouteRenderer::RenderRoute(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
@@ -624,8 +597,7 @@ void RouteRenderer::RenderRoute(ref_ptr<dp::GraphicsContext> context, ref_ptr<gp
   RenderPreviewData(context, mng, screen, frameValues);
 }
 
-void RouteRenderer::AddSubrouteData(ref_ptr<dp::GraphicsContext> context,
-                                    drape_ptr<SubrouteData> && subrouteData,
+void RouteRenderer::AddSubrouteData(ref_ptr<dp::GraphicsContext> context, drape_ptr<SubrouteData> && subrouteData,
                                     ref_ptr<gpu::ProgramManager> mng)
 {
   auto const it = FindSubroute(m_subroutes, subrouteData->m_subrouteId);
@@ -666,11 +638,8 @@ void RouteRenderer::AddSubrouteData(ref_ptr<dp::GraphicsContext> context,
     BuildBuckets(context, info.m_subrouteData.back()->m_renderProperty, mng);
     m_subroutes.push_back(std::move(info));
 
-    std::sort(m_subroutes.begin(), m_subroutes.end(),
-              [](SubrouteInfo const & info1, SubrouteInfo const & info2)
-    {
-      return info1.m_subroute->m_baseDistance > info2.m_subroute->m_baseDistance;
-    });
+    std::sort(m_subroutes.begin(), m_subroutes.end(), [](SubrouteInfo const & info1, SubrouteInfo const & info2)
+    { return info1.m_subroute->m_baseDistance > info2.m_subroute->m_baseDistance; });
   }
 }
 
@@ -733,11 +702,9 @@ void RouteRenderer::ClearObsoleteData(int currentRecacheId)
 {
   auto const functor = [&currentRecacheId](SubrouteInfo const & subrouteInfo)
   {
-    return !subrouteInfo.m_subrouteData.empty() &&
-           subrouteInfo.m_subrouteData.front()->m_recacheId < currentRecacheId;
+    return !subrouteInfo.m_subrouteData.empty() && subrouteInfo.m_subrouteData.front()->m_recacheId < currentRecacheId;
   };
-  m_subroutes.erase(std::remove_if(m_subroutes.begin(), m_subroutes.end(), functor),
-                    m_subroutes.end());
+  m_subroutes.erase(std::remove_if(m_subroutes.begin(), m_subroutes.end(), functor), m_subroutes.end());
 }
 
 void RouteRenderer::Clear()
diff --git a/libs/drape_frontend/route_renderer.hpp b/libs/drape_frontend/route_renderer.hpp
index 3bd4d0d66..a7a4fdbca 100644
--- a/libs/drape_frontend/route_renderer.hpp
+++ b/libs/drape_frontend/route_renderer.hpp
@@ -14,9 +14,9 @@
 #include <chrono>
 #include <functional>
 #include <string>
-#include <vector>
 #include <unordered_map>
 #include <unordered_set>
+#include <vector>
 
 namespace df
 {
@@ -58,29 +58,25 @@ public:
   explicit RouteRenderer(PreviewPointsRequestCallback && previewPointsRequest);
 
   void PrepareRouteArrows(ScreenBase const & screen, PrepareRouteArrowsCallback const & prepareCallback);
-  void CacheRouteArrows(ScreenBase const & screen, dp::DrapeID subrouteId,
-                        std::vector<ArrowBorders> && arrowBorders,
+  void CacheRouteArrows(ScreenBase const & screen, dp::DrapeID subrouteId, std::vector<ArrowBorders> && arrowBorders,
                         CacheRouteArrowsCallback const & cacheCallback);
 
-  void RenderRoute(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
-                   ScreenBase const & screen, bool trafficShown, FrameValues const & frameValues);
+  void RenderRoute(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng, ScreenBase const & screen,
+                   bool trafficShown, FrameValues const & frameValues);
 
-  void AddSubrouteData(ref_ptr<dp::GraphicsContext> context,
-                       drape_ptr<SubrouteData> && subrouteData, ref_ptr<gpu::ProgramManager> mng);
+  void AddSubrouteData(ref_ptr<dp::GraphicsContext> context, drape_ptr<SubrouteData> && subrouteData,
+                       ref_ptr<gpu::ProgramManager> mng);
   Subroutes const & GetSubroutes() const;
 
   void RemoveSubrouteData(dp::DrapeID subrouteId);
 
-  void AddSubrouteArrowsData(ref_ptr<dp::GraphicsContext> context,
-                             drape_ptr<SubrouteArrowsData> && subrouteArrowsData,
+  void AddSubrouteArrowsData(ref_ptr<dp::GraphicsContext> context, drape_ptr<SubrouteArrowsData> && subrouteArrowsData,
                              ref_ptr<gpu::ProgramManager> mng);
 
   void AddSubrouteMarkersData(ref_ptr<dp::GraphicsContext> context,
-                              drape_ptr<SubrouteMarkersData> && subrouteMarkersData,
-                              ref_ptr<gpu::ProgramManager> mng);
+                              drape_ptr<SubrouteMarkersData> && subrouteMarkersData, ref_ptr<gpu::ProgramManager> mng);
 
-  void AddPreviewRenderData(ref_ptr<dp::GraphicsContext> context,
-                            drape_ptr<CirclesPackRenderData> && renderData,
+  void AddPreviewRenderData(ref_ptr<dp::GraphicsContext> context, drape_ptr<CirclesPackRenderData> && renderData,
                             ref_ptr<gpu::ProgramManager> mng);
 
   void UpdatePreview(ScreenBase const & screen);
@@ -105,8 +101,8 @@ public:
 
 private:
   void RenderSubroute(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
-                      SubrouteInfo const & subrouteInfo, size_t subrouteDataIndex,
-                      ScreenBase const & screen, bool trafficShown, FrameValues const & frameValues);
+                      SubrouteInfo const & subrouteInfo, size_t subrouteDataIndex, ScreenBase const & screen,
+                      bool trafficShown, FrameValues const & frameValues);
   void RenderSubrouteArrows(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
                             SubrouteInfo const & subrouteInfo, ScreenBase const & screen,
                             FrameValues const & frameValues);
diff --git a/libs/drape_frontend/route_shape.cpp b/libs/drape_frontend/route_shape.cpp
index d213ef01c..92aeeca0d 100644
--- a/libs/drape_frontend/route_shape.cpp
+++ b/libs/drape_frontend/route_shape.cpp
@@ -21,29 +21,23 @@
 
 namespace df
 {
-std::array<float, 20> const kRouteHalfWidthInPixelCar =
-{
-  // 1   2     3     4     5     6     7     8     9     10
-  1.0f, 1.2f, 1.5f, 1.5f, 1.7f, 2.0f, 2.0f, 2.3f, 2.5f, 2.7f,
-  //11   12    13    14    15   16    17    18    19     20
-  3.0f, 3.5f, 4.5f, 5.5f, 7.0, 9.0f, 10.0f, 14.0f, 22.0f, 27.0f
-};
+std::array<float, 20> const kRouteHalfWidthInPixelCar = {
+    // 1   2     3     4     5     6     7     8     9     10
+    1.0f, 1.2f, 1.5f, 1.5f, 1.7f, 2.0f, 2.0f, 2.3f, 2.5f, 2.7f,
+    // 11   12    13    14    15   16    17    18    19     20
+    3.0f, 3.5f, 4.5f, 5.5f, 7.0, 9.0f, 10.0f, 14.0f, 22.0f, 27.0f};
 
-std::array<float, 20> const kRouteHalfWidthInPixelTransit =
-{
-  // 1   2     3     4     5     6     7     8     9     10
-  1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.1f, 1.2f, 1.3f, 1.4f, 1.7f,
-  //11   12    13    14    15   16    17    18    19     20
-  1.8f, 2.1f, 2.5f, 2.8f, 3.5, 4.5f, 5.0f, 7.0f, 11.0f, 13.0f
-};
+std::array<float, 20> const kRouteHalfWidthInPixelTransit = {
+    // 1   2     3     4     5     6     7     8     9     10
+    1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.1f, 1.2f, 1.3f, 1.4f, 1.7f,
+    // 11   12    13    14    15   16    17    18    19     20
+    1.8f, 2.1f, 2.5f, 2.8f, 3.5, 4.5f, 5.0f, 7.0f, 11.0f, 13.0f};
 
-std::array<float, 20> const kRouteHalfWidthInPixelOthers =
-{
-  // 1   2     3     4     5     6     7     8     9     10
-  1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.1f, 1.2f, 1.3f,
-  //11   12    13    14    15   16    17    18    19     20
-  1.5f, 1.7f, 2.3f, 2.7f, 3.5, 4.5f, 5.0f, 7.0f, 11.0f, 13.0f
-};
+std::array<float, 20> const kRouteHalfWidthInPixelOthers = {
+    // 1   2     3     4     5     6     7     8     9     10
+    1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.1f, 1.2f, 1.3f,
+    // 11   12    13    14    15   16    17    18    19     20
+    1.5f, 1.7f, 2.3f, 2.7f, 3.5, 4.5f, 5.0f, 7.0f, 11.0f, 13.0f};
 
 namespace rs
 {
@@ -56,14 +50,12 @@ float const kMarkersDepth = 100.0f;
 float const kArrowsDepth = 200.0f;
 float const kDepthPerSubroute = 200.0f;
 
-void GetArrowTextureRegion(ref_ptr<dp::TextureManager> textures,
-                           dp::TextureManager::SymbolRegion & region)
+void GetArrowTextureRegion(ref_ptr<dp::TextureManager> textures, dp::TextureManager::SymbolRegion & region)
 {
   textures->GetSymbolRegion("route-arrow", region);
 }
 
-void CalculatePoints(m2::PolylineD const & polyline, double start, double end,
-                     std::vector<m2::PointD> & result)
+void CalculatePoints(m2::PolylineD const & polyline, double start, double end, std::vector<m2::PointD> & result)
 {
   result.clear();
 
@@ -119,9 +111,8 @@ float SideByNormal(glsl::vec2 const & normal, bool isLeft)
   return glsl::length(normal) < kEps ? kCenter : side;
 }
 
-void GenerateJoinsTriangles(glsl::vec3 const & pivot, std::vector<glsl::vec2> const & normals,
-                            glsl::vec4 const & color, glsl::vec2 const & length, bool isLeft,
-                            RouteShape::GeometryBuffer & joinsGeometry)
+void GenerateJoinsTriangles(glsl::vec3 const & pivot, std::vector<glsl::vec2> const & normals, glsl::vec4 const & color,
+                            glsl::vec2 const & length, bool isLeft, RouteShape::GeometryBuffer & joinsGeometry)
 {
   size_t const trianglesCount = normals.size() / 3;
   for (size_t j = 0; j < trianglesCount; j++)
@@ -148,18 +139,15 @@ glsl::vec2 GetUV(m2::RectF const & texRect, glsl::vec2 const & uv)
 }
 
 void GenerateArrowsTriangles(glsl::vec4 const & pivot, std::vector<glsl::vec2> const & normals,
-                             m2::RectF const & texRect, std::vector<glsl::vec2> const & uv,
-                             bool normalizedUV, RouteShape::ArrowGeometryBuffer & joinsGeometry)
+                             m2::RectF const & texRect, std::vector<glsl::vec2> const & uv, bool normalizedUV,
+                             RouteShape::ArrowGeometryBuffer & joinsGeometry)
 {
   size_t const trianglesCount = normals.size() / 3;
   for (size_t j = 0; j < trianglesCount; j++)
   {
-    joinsGeometry.emplace_back(pivot, normals[3 * j],
-                               normalizedUV ? GetUV(texRect, uv[3 * j]) : uv[3 * j]);
-    joinsGeometry.emplace_back(pivot, normals[3 * j + 1],
-                               normalizedUV ? GetUV(texRect, uv[3 * j + 1]) : uv[3 * j + 1]);
-    joinsGeometry.emplace_back(pivot, normals[3 * j + 2],
-                               normalizedUV ? GetUV(texRect, uv[3 * j + 2]) : uv[3 * j + 2]);
+    joinsGeometry.emplace_back(pivot, normals[3 * j], normalizedUV ? GetUV(texRect, uv[3 * j]) : uv[3 * j]);
+    joinsGeometry.emplace_back(pivot, normals[3 * j + 1], normalizedUV ? GetUV(texRect, uv[3 * j + 1]) : uv[3 * j + 1]);
+    joinsGeometry.emplace_back(pivot, normals[3 * j + 2], normalizedUV ? GetUV(texRect, uv[3 * j + 2]) : uv[3 * j + 2]);
   }
 }
 
@@ -167,18 +155,14 @@ glsl::vec3 MarkerNormal(float x, float y, float z, float cosAngle, float sinAngl
 {
   return glsl::vec3(x * cosAngle - y * sinAngle, x * sinAngle + y * cosAngle, z);
 }
-} // namespace rs
+}  // namespace rs
 
 void Subroute::AddStyle(SubrouteStyle const & style)
 {
   if (!m_style.empty() && m_style.back() == style)
-  {
     m_style.back().m_endIndex = style.m_endIndex;
-  }
   else
-  {
     m_style.push_back(style);
-  }
 }
 
 void RouteShape::PrepareGeometry(std::vector<m2::PointD> const & path, m2::PointD const & pivot,
@@ -214,17 +198,16 @@ void RouteShape::PrepareGeometry(std::vector<m2::PointD> const & path, m2::Point
     auto & geometry = geomBufferData.m_geometry;
     auto & joinsGeometry = geomBufferData.m_joinsGeometry;
 
-    UpdateNormals(&segments[i], (i > 0) ? &segments[i - 1] : nullptr,
-                  i < lastIndex ? &segments[i + 1] : nullptr);
+    UpdateNormals(&segments[i], (i > 0) ? &segments[i - 1] : nullptr, i < lastIndex ? &segments[i + 1] : nullptr);
 
     geomBufferData.m_boundingBox.Add(glsl::FromVec2(segments[i].m_points[StartPoint]));
     geomBufferData.m_boundingBox.Add(glsl::FromVec2(segments[i].m_points[EndPoint]));
 
     // Generate main geometry.
-    m2::PointD const startPt = MapShape::ConvertToLocal(glsl::FromVec2(segments[i].m_points[StartPoint]),
-                                                        pivot, kShapeCoordScalar);
-    m2::PointD const endPt = MapShape::ConvertToLocal(glsl::FromVec2(segments[i].m_points[EndPoint]),
-                                                      pivot, kShapeCoordScalar);
+    m2::PointD const startPt =
+        MapShape::ConvertToLocal(glsl::FromVec2(segments[i].m_points[StartPoint]), pivot, kShapeCoordScalar);
+    m2::PointD const endPt =
+        MapShape::ConvertToLocal(glsl::FromVec2(segments[i].m_points[EndPoint]), pivot, kShapeCoordScalar);
 
     glsl::vec3 const startPivot = glsl::vec3(glsl::ToVec2(startPt), depth);
     glsl::vec3 const endPivot = glsl::vec3(glsl::ToVec2(endPt), depth);
@@ -242,37 +225,32 @@ void RouteShape::PrepareGeometry(std::vector<m2::PointD> const & path, m2::Point
     float const projRightStart = -segments[i].m_rightWidthScalar[StartPoint].y;
     float const projRightEnd = segments[i].m_rightWidthScalar[EndPoint].y;
 
-    geometry.emplace_back(startPivot, glsl::vec2(0, 0),
-                          glsl::vec3(startLength, 0, rs::kCenter), segments[i].m_color);
-    geometry.emplace_back(startPivot, leftNormalStart,
-                          glsl::vec3(startLength, projLeftStart, rs::kLeftSide), segments[i].m_color);
-    geometry.emplace_back(endPivot, glsl::vec2(0, 0),
-                          glsl::vec3(length, 0, rs::kCenter), segments[i].m_color);
-    geometry.emplace_back(endPivot, leftNormalEnd,
-                          glsl::vec3(length, projLeftEnd, rs::kLeftSide), segments[i].m_color);
+    geometry.emplace_back(startPivot, glsl::vec2(0, 0), glsl::vec3(startLength, 0, rs::kCenter), segments[i].m_color);
+    geometry.emplace_back(startPivot, leftNormalStart, glsl::vec3(startLength, projLeftStart, rs::kLeftSide),
+                          segments[i].m_color);
+    geometry.emplace_back(endPivot, glsl::vec2(0, 0), glsl::vec3(length, 0, rs::kCenter), segments[i].m_color);
+    geometry.emplace_back(endPivot, leftNormalEnd, glsl::vec3(length, projLeftEnd, rs::kLeftSide), segments[i].m_color);
 
-    geometry.emplace_back(startPivot, rightNormalStart,
-                          glsl::vec3(startLength, projRightStart, rs::kRightSide), segments[i].m_color);
-    geometry.emplace_back(startPivot, glsl::vec2(0, 0),
-                          glsl::vec3(startLength, 0, rs::kCenter), segments[i].m_color);
-    geometry.emplace_back(endPivot, rightNormalEnd,
-                          glsl::vec3(length, projRightEnd, rs::kRightSide), segments[i].m_color);
-    geometry.emplace_back(endPivot, glsl::vec2(0, 0),
-                          glsl::vec3(length, 0, rs::kCenter), segments[i].m_color);
+    geometry.emplace_back(startPivot, rightNormalStart, glsl::vec3(startLength, projRightStart, rs::kRightSide),
+                          segments[i].m_color);
+    geometry.emplace_back(startPivot, glsl::vec2(0, 0), glsl::vec3(startLength, 0, rs::kCenter), segments[i].m_color);
+    geometry.emplace_back(endPivot, rightNormalEnd, glsl::vec3(length, projRightEnd, rs::kRightSide),
+                          segments[i].m_color);
+    geometry.emplace_back(endPivot, glsl::vec2(0, 0), glsl::vec3(length, 0, rs::kCenter), segments[i].m_color);
 
     // Generate joins.
     if (segments[i].m_generateJoin && i < lastIndex)
     {
-      glsl::vec2 n1 = segments[i].m_hasLeftJoin[EndPoint] ? segments[i].m_leftNormals[EndPoint] :
-                                                            segments[i].m_rightNormals[EndPoint];
-      glsl::vec2 n2 = segments[i + 1].m_hasLeftJoin[StartPoint] ? segments[i + 1].m_leftNormals[StartPoint] :
-                                                                  segments[i + 1].m_rightNormals[StartPoint];
+      glsl::vec2 n1 = segments[i].m_hasLeftJoin[EndPoint] ? segments[i].m_leftNormals[EndPoint]
+                                                          : segments[i].m_rightNormals[EndPoint];
+      glsl::vec2 n2 = segments[i + 1].m_hasLeftJoin[StartPoint] ? segments[i + 1].m_leftNormals[StartPoint]
+                                                                : segments[i + 1].m_rightNormals[StartPoint];
 
-      float widthScalar = segments[i].m_hasLeftJoin[EndPoint] ? segments[i].m_rightWidthScalar[EndPoint].x :
-                                                                segments[i].m_leftWidthScalar[EndPoint].x;
+      float widthScalar = segments[i].m_hasLeftJoin[EndPoint] ? segments[i].m_rightWidthScalar[EndPoint].x
+                                                              : segments[i].m_leftWidthScalar[EndPoint].x;
 
-      std::vector<glsl::vec2> normals = GenerateJoinNormals(
-            dp::RoundJoin, n1, n2, 1.0f, segments[i].m_hasLeftJoin[EndPoint], widthScalar);
+      std::vector<glsl::vec2> normals =
+          GenerateJoinNormals(dp::RoundJoin, n1, n2, 1.0f, segments[i].m_hasLeftJoin[EndPoint], widthScalar);
 
       rs::GenerateJoinsTriangles(endPivot, normals, segments[i].m_color, glsl::vec2(length, 0),
                                  segments[i].m_hasLeftJoin[EndPoint], joinsGeometry);
@@ -281,22 +259,21 @@ void RouteShape::PrepareGeometry(std::vector<m2::PointD> const & path, m2::Point
     // Generate caps.
     if (i == 0)
     {
-      std::vector<glsl::vec2> normals = GenerateCapNormals(
-            dp::RoundCap, segments[i].m_leftNormals[StartPoint], segments[i].m_rightNormals[StartPoint],
-            -segments[i].m_tangent, 1.0f, true /* isStart */);
+      std::vector<glsl::vec2> normals =
+          GenerateCapNormals(dp::RoundCap, segments[i].m_leftNormals[StartPoint],
+                             segments[i].m_rightNormals[StartPoint], -segments[i].m_tangent, 1.0f, true /* isStart */);
 
-      rs::GenerateJoinsTriangles(startPivot, normals, segments[i].m_color, glsl::vec2(startLength, 0),
-                                 true, joinsGeometry);
+      rs::GenerateJoinsTriangles(startPivot, normals, segments[i].m_color, glsl::vec2(startLength, 0), true,
+                                 joinsGeometry);
     }
 
     if (i == lastIndex)
     {
-      std::vector<glsl::vec2> normals = GenerateCapNormals(
-            dp::RoundCap, segments[i].m_leftNormals[EndPoint], segments[i].m_rightNormals[EndPoint],
-            segments[i].m_tangent, 1.0f, false /* isStart */);
+      std::vector<glsl::vec2> normals =
+          GenerateCapNormals(dp::RoundCap, segments[i].m_leftNormals[EndPoint], segments[i].m_rightNormals[EndPoint],
+                             segments[i].m_tangent, 1.0f, false /* isStart */);
 
-      rs::GenerateJoinsTriangles(endPivot, normals, segments[i].m_color, glsl::vec2(length, 0),
-                                 true, joinsGeometry);
+      rs::GenerateJoinsTriangles(endPivot, normals, segments[i].m_color, glsl::vec2(length, 0), true, joinsGeometry);
     }
 
     auto const verticesCount = geomBufferData.m_geometry.size() + geomBufferData.m_joinsGeometry.size();
@@ -331,16 +308,16 @@ void RouteShape::PrepareArrowGeometry(std::vector<m2::PointD> const & path, m2::
   for (size_t i = 0; i < segments.size(); i++)
   {
     UpdateNormals(&segments[i], (i > 0) ? &segments[i - 1] : nullptr,
-                 (i < segments.size() - 1) ? &segments[i + 1] : nullptr);
+                  (i < segments.size() - 1) ? &segments[i + 1] : nullptr);
 
     geometryBufferData.m_boundingBox.Add(glsl::FromVec2(segments[i].m_points[StartPoint]));
     geometryBufferData.m_boundingBox.Add(glsl::FromVec2(segments[i].m_points[EndPoint]));
 
     // Generate main geometry.
-    m2::PointD const startPt = MapShape::ConvertToLocal(glsl::FromVec2(segments[i].m_points[StartPoint]),
-                                                        pivot, kShapeCoordScalar);
-    m2::PointD const endPt = MapShape::ConvertToLocal(glsl::FromVec2(segments[i].m_points[EndPoint]),
-                                                      pivot, kShapeCoordScalar);
+    m2::PointD const startPt =
+        MapShape::ConvertToLocal(glsl::FromVec2(segments[i].m_points[StartPoint]), pivot, kShapeCoordScalar);
+    m2::PointD const endPt =
+        MapShape::ConvertToLocal(glsl::FromVec2(segments[i].m_points[EndPoint]), pivot, kShapeCoordScalar);
 
     glsl::vec4 const startPivot = glsl::vec4(glsl::ToVec2(startPt), depth, 1.0);
     glsl::vec4 const endPivot = glsl::vec4(glsl::ToVec2(endPt), depth, 1.0);
@@ -368,18 +345,17 @@ void RouteShape::PrepareArrowGeometry(std::vector<m2::PointD> const & path, m2::
     // Generate joins.
     if (segments[i].m_generateJoin && i < segments.size() - 1)
     {
-      glsl::vec2 n1 = segments[i].m_hasLeftJoin[EndPoint] ? segments[i].m_leftNormals[EndPoint] :
-                                                            segments[i].m_rightNormals[EndPoint];
-      glsl::vec2 n2 = segments[i + 1].m_hasLeftJoin[StartPoint] ? segments[i + 1].m_leftNormals[StartPoint] :
-                                                                  segments[i + 1].m_rightNormals[StartPoint];
+      glsl::vec2 n1 = segments[i].m_hasLeftJoin[EndPoint] ? segments[i].m_leftNormals[EndPoint]
+                                                          : segments[i].m_rightNormals[EndPoint];
+      glsl::vec2 n2 = segments[i + 1].m_hasLeftJoin[StartPoint] ? segments[i + 1].m_leftNormals[StartPoint]
+                                                                : segments[i + 1].m_rightNormals[StartPoint];
 
-      float widthScalar = segments[i].m_hasLeftJoin[EndPoint] ? segments[i].m_rightWidthScalar[EndPoint].x :
-                                                                segments[i].m_leftWidthScalar[EndPoint].x;
+      float widthScalar = segments[i].m_hasLeftJoin[EndPoint] ? segments[i].m_rightWidthScalar[EndPoint].x
+                                                              : segments[i].m_leftWidthScalar[EndPoint].x;
 
       std::vector<glsl::vec2> uv;
-      std::vector<glsl::vec2> normals = GenerateJoinNormals(
-            dp::RoundJoin, n1, n2, 1.0f, segments[i].m_hasLeftJoin[EndPoint],
-            widthScalar, &uv);
+      std::vector<glsl::vec2> normals =
+          GenerateJoinNormals(dp::RoundJoin, n1, n2, 1.0f, segments[i].m_hasLeftJoin[EndPoint], widthScalar, &uv);
 
       ASSERT_EQUAL(normals.size(), uv.size(), ());
 
@@ -389,14 +365,10 @@ void RouteShape::PrepareArrowGeometry(std::vector<m2::PointD> const & path, m2::
     // Generate arrow head.
     if (i == segments.size() - 1)
     {
-      std::vector<glsl::vec2> normals =
-      {
-        segments[i].m_rightNormals[EndPoint],
-        segments[i].m_leftNormals[EndPoint],
-        kArrowHeadFactor * segments[i].m_tangent
-      };
+      std::vector<glsl::vec2> normals = {segments[i].m_rightNormals[EndPoint], segments[i].m_leftNormals[EndPoint],
+                                         kArrowHeadFactor * segments[i].m_tangent};
       float const u = 1.0f - static_cast<float>(kArrowHeadSize);
-      std::vector<glsl::vec2> uv = { glsl::vec2(u, 1.0f), glsl::vec2(u, 0.0f), glsl::vec2(1.0f, 0.5f) };
+      std::vector<glsl::vec2> uv = {glsl::vec2(u, 1.0f), glsl::vec2(u, 0.0f), glsl::vec2(1.0f, 0.5f)};
       glsl::vec4 const headPivot = glsl::vec4(glsl::ToVec2(endPt), depth, 1.0);
       depth += depthInc;
       rs::GenerateArrowsTriangles(headPivot, normals, texRect, uv, true /* normalizedUV */, joinsGeometry);
@@ -409,28 +381,21 @@ void RouteShape::PrepareArrowGeometry(std::vector<m2::PointD> const & path, m2::
       glsl::vec2 const n2 = segments[i].m_rightNormals[StartPoint];
       glsl::vec2 const n3 = (n1 - kArrowTailFactor * segments[i].m_tangent);
       glsl::vec2 const n4 = (n2 - kArrowTailFactor * segments[i].m_tangent);
-      std::vector<glsl::vec2> normals = { n2, n4, n1, n1, n4, n3 };
+      std::vector<glsl::vec2> normals = {n2, n4, n1, n1, n4, n3};
 
       m2::RectF t = texRect;
       t.setMaxX(tr.minX());
-      std::vector<glsl::vec2> uv =
-      {
-        glsl::ToVec2(t.RightBottom()),
-        glsl::ToVec2(t.LeftBottom()),
-        glsl::ToVec2(t.RightTop()),
-        glsl::ToVec2(t.RightTop()),
-        glsl::ToVec2(t.LeftBottom()),
-        glsl::ToVec2(t.LeftTop())
-      };
+      std::vector<glsl::vec2> uv = {glsl::ToVec2(t.RightBottom()), glsl::ToVec2(t.LeftBottom()),
+                                    glsl::ToVec2(t.RightTop()),    glsl::ToVec2(t.RightTop()),
+                                    glsl::ToVec2(t.LeftBottom()),  glsl::ToVec2(t.LeftTop())};
 
       rs::GenerateArrowsTriangles(startPivot, normals, texRect, uv, false /* normalizedUV */, joinsGeometry);
     }
   }
 }
 
-void RouteShape::PrepareMarkersGeometry(std::vector<SubrouteMarker> const & markers,
-                                        m2::PointD const & pivot, float baseDepth,
-                                        MarkersGeometryBuffer & geometry)
+void RouteShape::PrepareMarkersGeometry(std::vector<SubrouteMarker> const & markers, m2::PointD const & pivot,
+                                        float baseDepth, MarkersGeometryBuffer & geometry)
 {
   ASSERT(!markers.empty(), ());
 
@@ -473,8 +438,7 @@ void RouteShape::PrepareMarkersGeometry(std::vector<SubrouteMarker> const & mark
       dp::Color const innerColor = df::GetColorConstant(marker.m_innerColor);
       MV::TColor const c1(color1.GetRedF(), color1.GetGreenF(), color1.GetBlueF(), color1.GetAlphaF());
       MV::TColor const c2(color2.GetRedF(), color2.GetGreenF(), color2.GetBlueF(), color2.GetAlphaF());
-      MV::TColor const ic(innerColor.GetRedF(), innerColor.GetGreenF(),
-                          innerColor.GetBlueF(), innerColor.GetAlphaF());
+      MV::TColor const ic(innerColor.GetRedF(), innerColor.GetGreenF(), innerColor.GetBlueF(), innerColor.GetAlphaF());
 
       auto const cosAngle = static_cast<float>(m2::DotProduct(marker.m_up, m2::PointD(0.0, 1.0)));
       auto const sinAngle = static_cast<float>(m2::CrossProduct(marker.m_up, m2::PointD(0.0, 1.0)));
@@ -492,8 +456,7 @@ void RouteShape::PrepareMarkersGeometry(std::vector<SubrouteMarker> const & mark
     if (marker.m_colors.size() > 1 || marker.m_colors.front() != marker.m_innerColor)
     {
       dp::Color const innerColor = df::GetColorConstant(marker.m_innerColor);
-      MV::TColor const ic(innerColor.GetRedF(), innerColor.GetGreenF(),
-                          innerColor.GetBlueF(), innerColor.GetAlphaF());
+      MV::TColor const ic(innerColor.GetRedF(), innerColor.GetGreenF(), innerColor.GetBlueF(), innerColor.GetAlphaF());
 
       geometry.emplace_back(innerPos, MV::TNormal(-kSqrt3, -1.0f, innerRadius), ic);
       geometry.emplace_back(innerPos, MV::TNormal(kSqrt3, -1.0f, innerRadius), ic);
@@ -502,10 +465,9 @@ void RouteShape::PrepareMarkersGeometry(std::vector<SubrouteMarker> const & mark
   }
 }
 
-void RouteShape::CacheRouteArrows(ref_ptr<dp::GraphicsContext> context,
-                                  ref_ptr<dp::TextureManager> mng, m2::PolylineD const & polyline,
-                                  std::vector<ArrowBorders> const & borders, double baseDepthIndex,
-                                  SubrouteArrowsData & routeArrowsData)
+void RouteShape::CacheRouteArrows(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::TextureManager> mng,
+                                  m2::PolylineD const & polyline, std::vector<ArrowBorders> const & borders,
+                                  double baseDepthIndex, SubrouteArrowsData & routeArrowsData)
 {
   GeometryBufferData<ArrowGeometryBuffer> geometryData;
   dp::TextureManager::SymbolRegion region;
@@ -530,16 +492,13 @@ void RouteShape::CacheRouteArrows(ref_ptr<dp::GraphicsContext> context,
   geometryData.m_boundingBox.Scale(kBoundingBoxScale);
 
   BatchGeometry(context, state, make_ref(geometryData.m_geometry.data()),
-                static_cast<uint32_t>(geometryData.m_geometry.size()),
-                make_ref(geometryData.m_joinsGeometry.data()),
-                static_cast<uint32_t>(geometryData.m_joinsGeometry.size()),
-                geometryData.m_boundingBox, AV::GetBindingInfo(),
-                routeArrowsData.m_renderProperty);
+                static_cast<uint32_t>(geometryData.m_geometry.size()), make_ref(geometryData.m_joinsGeometry.data()),
+                static_cast<uint32_t>(geometryData.m_joinsGeometry.size()), geometryData.m_boundingBox,
+                AV::GetBindingInfo(), routeArrowsData.m_renderProperty);
 }
 
-drape_ptr<df::SubrouteData> RouteShape::CacheRoute(ref_ptr<dp::GraphicsContext> context,
-                                                   dp::DrapeID subrouteId, SubrouteConstPtr subroute,
-                                                   size_t styleIndex, int recacheId)
+drape_ptr<df::SubrouteData> RouteShape::CacheRoute(ref_ptr<dp::GraphicsContext> context, dp::DrapeID subrouteId,
+                                                   SubrouteConstPtr subroute, size_t styleIndex, int recacheId)
 {
   size_t startIndex;
   size_t endIndex;
@@ -571,9 +530,10 @@ drape_ptr<df::SubrouteData> RouteShape::CacheRoute(ref_ptr<dp::GraphicsContext>
       auto const speedGroup = TrafficGenerator::CheckColorsSimplification(subroute->m_traffic[i]);
       auto const colorConstant = TrafficGenerator::GetColorBySpeedGroup(speedGroup, true /* route */);
       dp::Color const color = df::GetColorConstant(colorConstant);
-      float const alpha = (speedGroup == traffic::SpeedGroup::G4 ||
-        speedGroup == traffic::SpeedGroup::G5 ||
-        speedGroup == traffic::SpeedGroup::Unknown) ? 0.0f : 1.0f;
+      float const alpha = (speedGroup == traffic::SpeedGroup::G4 || speedGroup == traffic::SpeedGroup::G5 ||
+                           speedGroup == traffic::SpeedGroup::Unknown)
+                            ? 0.0f
+                            : 1.0f;
       segmentsColors.emplace_back(color.GetRedF(), color.GetGreenF(), color.GetBlueF(), alpha);
     }
   }
@@ -590,24 +550,20 @@ drape_ptr<df::SubrouteData> RouteShape::CacheRoute(ref_ptr<dp::GraphicsContext>
 
   std::vector<GeometryBufferData<GeometryBuffer>> geometryBufferData;
   PrepareGeometry(points, subrouteData->m_pivot, segmentsColors,
-                  static_cast<float>(subroute->m_baseDepthIndex * rs::kDepthPerSubroute),
-                  geometryBufferData);
+                  static_cast<float>(subroute->m_baseDepthIndex * rs::kDepthPerSubroute), geometryBufferData);
 
-  auto state = CreateRenderState(subroute->m_style[styleIndex].m_pattern.m_isDashed ?
-                                 gpu::Program::RouteDash : gpu::Program::Route, DepthLayer::GeometryLayer);
+  auto state = CreateRenderState(
+      subroute->m_style[styleIndex].m_pattern.m_isDashed ? gpu::Program::RouteDash : gpu::Program::Route,
+      DepthLayer::GeometryLayer);
 
   for (auto & data : geometryBufferData)
   {
     data.m_boundingBox.Scale(kBoundingBoxScale);
-    BatchGeometry(context, state, make_ref(data.m_geometry.data()),
-                  static_cast<uint32_t>(data.m_geometry.size()),
-                  make_ref(data.m_joinsGeometry.data()),
-                  static_cast<uint32_t>(data.m_joinsGeometry.size()),
-                  data.m_boundingBox, RV::GetBindingInfo(),
-                  subrouteData->m_renderProperty);
+    BatchGeometry(context, state, make_ref(data.m_geometry.data()), static_cast<uint32_t>(data.m_geometry.size()),
+                  make_ref(data.m_joinsGeometry.data()), static_cast<uint32_t>(data.m_joinsGeometry.size()),
+                  data.m_boundingBox, RV::GetBindingInfo(), subrouteData->m_renderProperty);
   }
 
-
   return subrouteData;
 }
 
@@ -636,8 +592,8 @@ drape_ptr<df::SubrouteMarkersData> RouteShape::CacheMarkers(ref_ptr<dp::Graphics
     uint32_t const kBatchSize = 200;
     dp::Batcher batcher(kBatchSize, kBatchSize);
     batcher.SetBatcherHash(static_cast<uint64_t>(BatcherBucket::Routing));
-    dp::SessionGuard guard(context, batcher, [&markersData](dp::RenderState const & state,
-                                                            drape_ptr<dp::RenderBucket> &&b)
+    dp::SessionGuard guard(context, batcher,
+                           [&markersData](dp::RenderState const & state, drape_ptr<dp::RenderBucket> && b)
     {
       markersData->m_renderProperty.m_buckets.push_back(std::move(b));
       markersData->m_renderProperty.m_state = state;
@@ -652,10 +608,9 @@ drape_ptr<df::SubrouteMarkersData> RouteShape::CacheMarkers(ref_ptr<dp::Graphics
 }
 
 void RouteShape::BatchGeometry(ref_ptr<dp::GraphicsContext> context, dp::RenderState const & state,
-                               ref_ptr<void> geometry, uint32_t geomSize,
-                               ref_ptr<void> joinsGeometry, uint32_t joinsGeomSize,
-                               m2::RectD const & boundingBox, dp::BindingInfo const & bindingInfo,
-                               RouteRenderProperty & property)
+                               ref_ptr<void> geometry, uint32_t geomSize, ref_ptr<void> joinsGeometry,
+                               uint32_t joinsGeomSize, m2::RectD const & boundingBox,
+                               dp::BindingInfo const & bindingInfo, RouteRenderProperty & property)
 {
   auto verticesCount = geomSize + joinsGeomSize;
   if (verticesCount == 0)
@@ -670,8 +625,8 @@ void RouteShape::BatchGeometry(ref_ptr<dp::GraphicsContext> context, dp::RenderS
 
   dp::Batcher batcher(indicesCount, verticesCount);
   batcher.SetBatcherHash(static_cast<uint64_t>(BatcherBucket::Routing));
-  dp::SessionGuard guard(context, batcher, [&property, &boundingBox](dp::RenderState const & state,
-                                                                     drape_ptr<dp::RenderBucket> && b)
+  dp::SessionGuard guard(context, batcher,
+                         [&property, &boundingBox](dp::RenderState const & state, drape_ptr<dp::RenderBucket> && b)
   {
     property.m_buckets.push_back(std::move(b));
     property.m_boundingBoxes.push_back(boundingBox);
diff --git a/libs/drape_frontend/route_shape.hpp b/libs/drape_frontend/route_shape.hpp
index 74e3d5d6a..3db05fa3a 100644
--- a/libs/drape_frontend/route_shape.hpp
+++ b/libs/drape_frontend/route_shape.hpp
@@ -5,9 +5,9 @@
 #include "drape_frontend/render_state_extension.hpp"
 #include "drape_frontend/shape_view_params.hpp"
 
+#include "drape/pointers.hpp"
 #include "drape/render_bucket.hpp"
 #include "drape/utils/vertex_decl.hpp"
-#include "drape/pointers.hpp"
 
 #include "traffic/speed_groups.hpp"
 
@@ -54,17 +54,13 @@ struct RoutePattern
 {
   RoutePattern() = default;
 
-  RoutePattern(double dashLength, double gapLength)
-    : m_isDashed(true)
-    , m_dashLength(dashLength)
-    , m_gapLength(gapLength)
+  RoutePattern(double dashLength, double gapLength) : m_isDashed(true), m_dashLength(dashLength), m_gapLength(gapLength)
   {}
 
-  bool operator == (RoutePattern const & pattern) const
+  bool operator==(RoutePattern const & pattern) const
   {
     double const kEps = 1e-5;
-    return m_isDashed == pattern.m_isDashed &&
-           std::fabs(m_dashLength - pattern.m_dashLength) < kEps &&
+    return m_isDashed == pattern.m_isDashed && std::fabs(m_dashLength - pattern.m_dashLength) < kEps &&
            std::fabs(m_gapLength - pattern.m_gapLength) < kEps;
   }
 
@@ -82,10 +78,7 @@ enum class SubrouteStyleType
 struct SubrouteStyle
 {
   SubrouteStyle() = default;
-  explicit SubrouteStyle(df::ColorConstant const & color)
-    : m_color(color)
-    , m_outlineColor(color)
-  {}
+  explicit SubrouteStyle(df::ColorConstant const & color) : m_color(color), m_outlineColor(color) {}
   SubrouteStyle(df::ColorConstant const & color, df::ColorConstant const & outlineColor)
     : m_color(color)
     , m_outlineColor(outlineColor)
@@ -104,8 +97,7 @@ struct SubrouteStyle
 
   bool operator==(SubrouteStyle const & style) const
   {
-    return m_color == style.m_color && m_outlineColor == style.m_outlineColor &&
-           m_pattern == style.m_pattern;
+    return m_color == style.m_color && m_outlineColor == style.m_outlineColor && m_pattern == style.m_pattern;
   }
 
   bool operator!=(SubrouteStyle const & style) const { return !operator==(style); }
@@ -159,9 +151,7 @@ using SubrouteConstPtr = std::shared_ptr<Subroute const>;
 
 struct RouteRenderProperty
 {
-  RouteRenderProperty()
-    : m_state(CreateRenderState(gpu::Program::Route, DepthLayer::GeometryLayer))
-  {}
+  RouteRenderProperty() : m_state(CreateRenderState(gpu::Program::Route, DepthLayer::GeometryLayer)) {}
 
   dp::RenderState m_state;
   std::vector<drape_ptr<dp::RenderBucket>> m_buckets;
@@ -185,9 +175,11 @@ struct SubrouteData : public BaseSubrouteData
   double m_distanceOffset = 0.0;
 };
 
-struct SubrouteArrowsData : public BaseSubrouteData {};
+struct SubrouteArrowsData : public BaseSubrouteData
+{};
 
-struct SubrouteMarkersData : public BaseSubrouteData {};
+struct SubrouteMarkersData : public BaseSubrouteData
+{};
 
 struct ArrowBorders
 {
@@ -206,27 +198,22 @@ public:
   using MV = gpu::RouteMarkerVertex;
   using MarkersGeometryBuffer = gpu::VBUnknownSizeT<MV>;
 
-  static drape_ptr<df::SubrouteData> CacheRoute(ref_ptr<dp::GraphicsContext> context,
-                                                dp::DrapeID subrouteId, SubrouteConstPtr subroute,
-                                                size_t styleIndex, int recacheId);
+  static drape_ptr<df::SubrouteData> CacheRoute(ref_ptr<dp::GraphicsContext> context, dp::DrapeID subrouteId,
+                                                SubrouteConstPtr subroute, size_t styleIndex, int recacheId);
 
-  static drape_ptr<df::SubrouteMarkersData> CacheMarkers(ref_ptr<dp::GraphicsContext> context,
-                                                         dp::DrapeID subrouteId,
+  static drape_ptr<df::SubrouteMarkersData> CacheMarkers(ref_ptr<dp::GraphicsContext> context, dp::DrapeID subrouteId,
                                                          SubrouteConstPtr subroute, int recacheId,
                                                          ref_ptr<dp::TextureManager> textures);
 
-  static void CacheRouteArrows(ref_ptr<dp::GraphicsContext> context,
-                               ref_ptr<dp::TextureManager> mng, m2::PolylineD const & polyline,
-                               std::vector<ArrowBorders> const & borders, double baseDepthIndex,
-                               SubrouteArrowsData & routeArrowsData);
+  static void CacheRouteArrows(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::TextureManager> mng,
+                               m2::PolylineD const & polyline, std::vector<ArrowBorders> const & borders,
+                               double baseDepthIndex, SubrouteArrowsData & routeArrowsData);
 
 private:
-  template<typename GeometryBufferType>
+  template <typename GeometryBufferType>
   struct GeometryBufferData
   {
-    GeometryBufferData()
-      : m_boundingBox(m2::RectD::GetEmptyRect())
-    {}
+    GeometryBufferData() : m_boundingBox(m2::RectD::GetEmptyRect()) {}
 
     GeometryBufferType m_geometry;
     GeometryBufferType m_joinsGeometry;
@@ -238,13 +225,12 @@ private:
   static void PrepareArrowGeometry(std::vector<m2::PointD> const & path, m2::PointD const & pivot,
                                    m2::RectF const & texRect, float depthStep, float depth,
                                    GeometryBufferData<ArrowGeometryBuffer> & geometryBufferData);
-  static void PrepareMarkersGeometry(std::vector<SubrouteMarker> const & markers,
-                                     m2::PointD const & pivot, float baseDepth,
-                                     MarkersGeometryBuffer & geometry);
+  static void PrepareMarkersGeometry(std::vector<SubrouteMarker> const & markers, m2::PointD const & pivot,
+                                     float baseDepth, MarkersGeometryBuffer & geometry);
 
-  static void BatchGeometry(ref_ptr<dp::GraphicsContext> context, dp::RenderState const & state,
-                            ref_ptr<void> geometry, uint32_t geomSize, ref_ptr<void> joinsGeometry,
-                            uint32_t joinsGeomSize, m2::RectD const & boundingBox,
-                            dp::BindingInfo const & bindingInfo, RouteRenderProperty & property);
+  static void BatchGeometry(ref_ptr<dp::GraphicsContext> context, dp::RenderState const & state, ref_ptr<void> geometry,
+                            uint32_t geomSize, ref_ptr<void> joinsGeometry, uint32_t joinsGeomSize,
+                            m2::RectD const & boundingBox, dp::BindingInfo const & bindingInfo,
+                            RouteRenderProperty & property);
 };
 }  // namespace df
diff --git a/libs/drape_frontend/rule_drawer.cpp b/libs/drape_frontend/rule_drawer.cpp
index b0cca08c1..298053ffe 100644
--- a/libs/drape_frontend/rule_drawer.cpp
+++ b/libs/drape_frontend/rule_drawer.cpp
@@ -38,11 +38,9 @@ namespace
 {
 // The first zoom level in kAverageSegmentsCount.
 int constexpr kFirstZoomInAverageSegments = 10;
-std::array<size_t, 10> const kAverageSegmentsCount =
-{
-  // 10  11    12     13    14    15    16    17    18   19
-  10000, 5000, 10000, 5000, 2500, 5000, 2000, 1000, 500, 500
-};
+std::array<size_t, 10> const kAverageSegmentsCount = {
+    // 10  11    12     13    14    15    16    17    18   19
+    10000, 5000, 10000, 5000, 2500, 5000, 2000, 1000, 500, 500};
 
 double constexpr kMetersPerLevel = 3.0;
 
@@ -95,9 +93,9 @@ double GetBuildingMinHeightInMeters(FeatureType & f)
   return minHeightInMeters;
 }
 
-void ExtractTrafficGeometry(FeatureType const & f, df::RoadClass const & roadClass,
-                            m2::PolylineD const & polyline, bool oneWay, int zoomLevel,
-                            double pixelToGlobalScale, df::TrafficSegmentsGeometry & geometry)
+void ExtractTrafficGeometry(FeatureType const & f, df::RoadClass const & roadClass, m2::PolylineD const & polyline,
+                            bool oneWay, int zoomLevel, double pixelToGlobalScale,
+                            df::TrafficSegmentsGeometry & geometry)
 {
   if (polyline.GetSize() < 2)
     return;
@@ -140,10 +138,10 @@ void ExtractTrafficGeometry(FeatureType const & f, df::RoadClass const & roadCla
       if (!oneWay)
       {
         m2::PointD const tangent = (segment[1] - segment[0]).Normalize();
-        m2::PointD const normal = isLeftHandTraffic ? m2::PointD(-tangent.y, tangent.x) :
-                                                      m2::PointD(tangent.y, -tangent.x);
-        m2::PolylineD segmentPolyline(std::vector<m2::PointD>{segment[0] + normal * twoWayOffset,
-                                                              segment[1] + normal * twoWayOffset});
+        m2::PointD const normal =
+            isLeftHandTraffic ? m2::PointD(-tangent.y, tangent.x) : m2::PointD(tangent.y, -tangent.x);
+        m2::PolylineD segmentPolyline(
+            std::vector<m2::PointD>{segment[0] + normal * twoWayOffset, segment[1] + normal * twoWayOffset});
         segments.emplace_back(sid, df::TrafficSegmentGeometry(std::move(segmentPolyline), roadClass));
       }
       else
@@ -156,8 +154,7 @@ void ExtractTrafficGeometry(FeatureType const & f, df::RoadClass const & roadCla
 }
 }  // namespace
 
-RuleDrawer::RuleDrawer(TCheckCancelledCallback const & checkCancelled,
-                       TIsCountryLoadedByNameFn const & isLoadedFn,
+RuleDrawer::RuleDrawer(TCheckCancelledCallback const & checkCancelled, TIsCountryLoadedByNameFn const & isLoadedFn,
                        ref_ptr<EngineContext> engineContext, int8_t deviceLang)
   : m_checkCancelled(checkCancelled)
   , m_isLoadedFn(isLoadedFn)
@@ -221,8 +218,7 @@ bool RuleDrawer::IsDiscardCustomFeature(FeatureID const & id) const
 
 bool RuleDrawer::CheckCoastlines(FeatureType & f)
 {
-  if (m_zoomLevel > scales::GetUpperWorldScale() &&
-      f.GetID().m_mwmId.GetInfo()->GetType() == MwmInfo::COASTS)
+  if (m_zoomLevel > scales::GetUpperWorldScale() && f.GetID().m_mwmId.GetInfo()->GetType() == MwmInfo::COASTS)
   {
     std::string_view const name = f.GetName(StringUtf8Multilang::kDefaultCode);
     if (!name.empty())
@@ -249,13 +245,13 @@ void RuleDrawer::ProcessAreaAndPointStyle(FeatureType & f, Stylist const & s, TI
     feature::TypesHolder const types(f);
     using namespace ftypes;
 
-    bool const hasParts = IsBuildingHasPartsChecker::Instance()(types); // possible to do this checks beforehand in stylist?
+    bool const hasParts =
+        IsBuildingHasPartsChecker::Instance()(types);  // possible to do this checks beforehand in stylist?
     bool const isPart = IsBuildingPartChecker::Instance()(types);
 
     // Looks like nonsense, but there are some osm objects with types
     // highway-path-bridge and building (sic!) at the same time (pedestrian crossing).
-    isBuilding = (isPart || IsBuildingChecker::Instance()(types)) &&
-                  !IsBridgeOrTunnelChecker::Instance()(types);
+    isBuilding = (isPart || IsBuildingChecker::Instance()(types)) && !IsBridgeOrTunnelChecker::Instance()(types);
 
     isBuildingOutline = isBuilding && hasParts && !isPart;
     is3dBuilding = isBuilding && !isBuildingOutline && m_context->Is3dBuildingsEnabled();
@@ -296,10 +292,8 @@ void RuleDrawer::ProcessAreaAndPointStyle(FeatureType & f, Stylist const & s, TI
   if (!skipTriangles && isBuilding && f.GetTrgVerticesCount(m_zoomLevel) >= 10000)
     isBuilding = false;
 
-  ApplyAreaFeature apply(m_context->GetTileKey(), insertShape, f,
-                         m_currentScaleGtoP, isBuilding,
-                         areaMinHeight /* minPosZ */, areaHeight /* posZ */,
-                         s.GetCaptionDescription());
+  ApplyAreaFeature apply(m_context->GetTileKey(), insertShape, f, m_currentScaleGtoP, isBuilding,
+                         areaMinHeight /* minPosZ */, areaHeight /* posZ */, s.GetCaptionDescription());
 
   if (!skipTriangles && (s.m_areaRule || s.m_hatchingRule))
   {
@@ -311,8 +305,8 @@ void RuleDrawer::ProcessAreaAndPointStyle(FeatureType & f, Stylist const & s, TI
   /// @todo Can we put this check in the beginning of this function?
   if (applyPointStyle && !IsDiscardCustomFeature(f.GetID()))
   {
-    apply.ProcessPointRules(s.m_symbolRule, s.m_captionRule, s.m_houseNumberRule,
-                            featureCenter, m_context->GetTextureManager());
+    apply.ProcessPointRules(s.m_symbolRule, s.m_captionRule, s.m_houseNumberRule, featureCenter,
+                            m_context->GetTextureManager());
   }
 }
 
@@ -344,9 +338,8 @@ void RuleDrawer::ProcessLineStyle(FeatureType & f, Stylist const & s, TInsertSha
     {
       ApplyLineFeatureAdditional applyAdditional(m_context->GetTileKey(), insertShape, f, m_currentScaleGtoP,
                                                  s.GetCaptionDescription(), std::move(clippedSplines));
-      applyAdditional.ProcessAdditionalLineRules(s.m_pathtextRule, s.m_shieldRule,
-                                                 m_context->GetTextureManager(), s.m_roadShields,
-                                                 m_generatedRoadShields);
+      applyAdditional.ProcessAdditionalLineRules(s.m_pathtextRule, s.m_shieldRule, m_context->GetTextureManager(),
+                                                 s.m_roadShields, m_generatedRoadShields);
     }
   }
 
@@ -360,29 +353,26 @@ void RuleDrawer::ProcessLineStyle(FeatureType & f, Stylist const & s, TInsertSha
       df::RoadClass m_roadClass;
     };
     static Checker const checkers[] = {
-      {{HighwayClass::Trunk, HighwayClass::Primary},
-       kRoadClass0ZoomLevel, df::RoadClass::Class0},
-      {{HighwayClass::Secondary, HighwayClass::Tertiary},
-       kRoadClass1ZoomLevel, df::RoadClass::Class1},
-      {{HighwayClass::LivingStreet, HighwayClass::Service, HighwayClass::ServiceMinor},
-       kRoadClass2ZoomLevel, df::RoadClass::Class2}
-    };
+        {{HighwayClass::Trunk, HighwayClass::Primary}, kRoadClass0ZoomLevel, df::RoadClass::Class0},
+        {{HighwayClass::Secondary, HighwayClass::Tertiary}, kRoadClass1ZoomLevel, df::RoadClass::Class1},
+        {{HighwayClass::LivingStreet, HighwayClass::Service, HighwayClass::ServiceMinor},
+         kRoadClass2ZoomLevel,
+         df::RoadClass::Class2}};
 
     bool const oneWay = ftypes::IsOneWayChecker::Instance()(f);
     auto const highwayClass = ftypes::GetHighwayClass(feature::TypesHolder(f));
     for (size_t i = 0; i < ARRAY_SIZE(checkers); ++i)
     {
       auto const & classes = checkers[i].m_highwayClasses;
-      if (find(classes.begin(), classes.end(), highwayClass) != classes.end() &&
-          m_zoomLevel >= checkers[i].m_zoomLevel)
+      if (find(classes.begin(), classes.end(), highwayClass) != classes.end() && m_zoomLevel >= checkers[i].m_zoomLevel)
       {
         // Need reset, because (possible) simplified geometry was cached before.
         f.ResetGeometry();
         std::vector<m2::PointD> points;
         assign_range(points, f.GetPoints(FeatureType::BEST_GEOMETRY));
 
-        ExtractTrafficGeometry(f, checkers[i].m_roadClass, m2::PolylineD(std::move(points)), oneWay,
-                               m_zoomLevel, m_trafficScalePtoG, m_trafficGeometry);
+        ExtractTrafficGeometry(f, checkers[i].m_roadClass, m2::PolylineD(std::move(points)), oneWay, m_zoomLevel,
+                               m_trafficScalePtoG, m_trafficGeometry);
         break;
       }
     }
@@ -395,8 +385,8 @@ void RuleDrawer::ProcessPointStyle(FeatureType & f, Stylist const & s, TInsertSh
     return;
 
   ApplyPointFeature apply(m_context->GetTileKey(), insertShape, f, s.GetCaptionDescription());
-  apply.ProcessPointRules(s.m_symbolRule, s.m_captionRule, s.m_houseNumberRule,
-                          f.GetCenter(), m_context->GetTextureManager());
+  apply.ProcessPointRules(s.m_symbolRule, s.m_captionRule, s.m_houseNumberRule, f.GetCenter(),
+                          m_context->GetTextureManager());
 }
 
 void RuleDrawer::operator()(FeatureType & f)
@@ -416,8 +406,8 @@ void RuleDrawer::operator()(FeatureType & f)
   Stylist const s(f, m_zoomLevel, m_deviceLang);
 
   // No drawing rules.
-  if (!s.m_symbolRule && !s.m_captionRule && !s.m_houseNumberRule &&
-      s.m_lineRules.empty() && !s.m_areaRule && !s.m_hatchingRule)
+  if (!s.m_symbolRule && !s.m_captionRule && !s.m_houseNumberRule && s.m_lineRules.empty() && !s.m_areaRule &&
+      !s.m_hatchingRule)
     return;
 
 #ifdef DEBUG
@@ -443,8 +433,8 @@ void RuleDrawer::operator()(FeatureType & f)
     size_t const index = shape->GetType();
     ASSERT_LESS(index, m_mapShapes.size(), ());
 
-    // TODO(pastk) : MinZoom was used for optimization in RenderGroup::UpdateCanBeDeletedStatus(), but is long time broken.
-    // See https://github.com/organicmaps/organicmaps/pull/5903 for details.
+    // TODO(pastk) : MinZoom was used for optimization in RenderGroup::UpdateCanBeDeletedStatus(), but is long time
+    // broken. See https://github.com/organicmaps/organicmaps/pull/5903 for details.
     shape->SetFeatureMinZoom(0);
     m_mapShapes[index].push_back(std::move(shape));
   };
@@ -522,11 +512,9 @@ void RuleDrawer::DrawTileNet()
 
   tp.m_titleDecl.m_primaryTextFont = dp::FontDecl(dp::Color::Red(), 30);
   tp.m_titleDecl.m_primaryOffset = {0.0f, 0.0f};
-  auto textShape = make_unique_dp<TextShape>(m_globalRect.Center(), tp, key,
-                                             m2::PointF(0.0f, 0.0f) /* symbolSize */,
-                                             m2::PointF(0.0f, 0.0f) /* symbolOffset */,
-                                             dp::Anchor::Center,
-                                             0 /* textIndex */);
+  auto textShape =
+      make_unique_dp<TextShape>(m_globalRect.Center(), tp, key, m2::PointF(0.0f, 0.0f) /* symbolSize */,
+                                m2::PointF(0.0f, 0.0f) /* symbolOffset */, dp::Anchor::Center, 0 /* textIndex */);
   textShape->DisableDisplacing();
 
   textShape->Prepare(m_context->GetTextureManager());
diff --git a/libs/drape_frontend/rule_drawer.hpp b/libs/drape_frontend/rule_drawer.hpp
index 4abc34f14..2b8d6089a 100644
--- a/libs/drape_frontend/rule_drawer.hpp
+++ b/libs/drape_frontend/rule_drawer.hpp
@@ -41,8 +41,7 @@ public:
   using TIsCountryLoadedByNameFn = std::function<bool(std::string_view)>;
   using TInsertShapeFn = std::function<void(drape_ptr<MapShape> && shape)>;
 
-  RuleDrawer(TCheckCancelledCallback const & checkCancelled,
-             TIsCountryLoadedByNameFn const & isLoadedFn,
+  RuleDrawer(TCheckCancelledCallback const & checkCancelled, TIsCountryLoadedByNameFn const & isLoadedFn,
              ref_ptr<EngineContext> engineContext, int8_t deviceLang);
   ~RuleDrawer();
 
diff --git a/libs/drape_frontend/scenario_manager.cpp b/libs/drape_frontend/scenario_manager.cpp
index 6d21d8b08..c1ac0896c 100644
--- a/libs/drape_frontend/scenario_manager.cpp
+++ b/libs/drape_frontend/scenario_manager.cpp
@@ -31,7 +31,8 @@ void ScenarioManager::Interrupt()
   InterruptImpl();
 }
 
-bool ScenarioManager::RunScenario(ScenarioData && scenarioData, ScenarioCallback const & onStartFn, ScenarioCallback const & onFinishFn)
+bool ScenarioManager::RunScenario(ScenarioData && scenarioData, ScenarioCallback const & onStartFn,
+                                  ScenarioCallback const & onFinishFn)
 {
   std::lock_guard<std::mutex> lock(m_mutex);
   if (m_thread != nullptr)
@@ -39,7 +40,7 @@ bool ScenarioManager::RunScenario(ScenarioData && scenarioData, ScenarioCallback
     if (m_isFinished)
       InterruptImpl();
     else
-      return false; // The only scenario can be executed currently.
+      return false;  // The only scenario can be executed currently.
   }
 
   std::swap(m_scenarioData, scenarioData);
@@ -84,28 +85,25 @@ void ScenarioManager::ThreadRoutine()
       }
     }
 
-    switch(action->GetType())
+    switch (action->GetType())
     {
     case ActionType::CenterViewport:
-      {
-        CenterViewportAction * centerViewportAction = static_cast<CenterViewportAction *>(action.get());
-        m_frontendRenderer->AddUserEvent(make_unique_dp<SetCenterEvent>(centerViewportAction->GetCenter(),
-                                                                        centerViewportAction->GetZoomLevel(),
-                                                                        true /* isAnim */,
-                                                                        false /* trackVisibleViewport */,
-                                                                        nullptr /* parallelAnimCreator */));
-        break;
-      }
+    {
+      CenterViewportAction * centerViewportAction = static_cast<CenterViewportAction *>(action.get());
+      m_frontendRenderer->AddUserEvent(make_unique_dp<SetCenterEvent>(
+          centerViewportAction->GetCenter(), centerViewportAction->GetZoomLevel(), true /* isAnim */,
+          false /* trackVisibleViewport */, nullptr /* parallelAnimCreator */));
+      break;
+    }
 
     case ActionType::WaitForTime:
-      {
-        WaitForTimeAction * waitForTimeAction = static_cast<WaitForTimeAction *>(action.get());
-        std::this_thread::sleep_for(waitForTimeAction->GetDuration());
-        break;
-      }
+    {
+      WaitForTimeAction * waitForTimeAction = static_cast<WaitForTimeAction *>(action.get());
+      std::this_thread::sleep_for(waitForTimeAction->GetDuration());
+      break;
+    }
 
-    default:
-      LOG(LINFO, ("Unknown action in scenario"));
+    default: LOG(LINFO, ("Unknown action in scenario"));
     }
   }
 
@@ -145,4 +143,4 @@ void ScenarioManager::InterruptImpl()
   }
 }
 
-} //  namespace df
+}  //  namespace df
diff --git a/libs/drape_frontend/scenario_manager.hpp b/libs/drape_frontend/scenario_manager.hpp
index d158c1fdc..00b08926d 100644
--- a/libs/drape_frontend/scenario_manager.hpp
+++ b/libs/drape_frontend/scenario_manager.hpp
@@ -37,13 +37,13 @@ public:
   class CenterViewportAction : public Action
   {
   public:
-    CenterViewportAction(m2::PointD const & pt, int zoomLevel)
-      : m_center(pt), m_zoomLevel(zoomLevel) {}
+    CenterViewportAction(m2::PointD const & pt, int zoomLevel) : m_center(pt), m_zoomLevel(zoomLevel) {}
 
     ActionType GetType() override { return ActionType::CenterViewport; }
 
     m2::PointD const & GetCenter() const { return m_center; }
     int GetZoomLevel() const { return m_zoomLevel; }
+
   private:
     m2::PointD const m_center;
     int const m_zoomLevel;
@@ -54,12 +54,12 @@ public:
   public:
     using Duration = std::chrono::steady_clock::duration;
 
-    WaitForTimeAction(Duration const & duration)
-      : m_duration(duration) {}
+    WaitForTimeAction(Duration const & duration) : m_duration(duration) {}
 
     ActionType GetType() override { return ActionType::WaitForTime; }
 
     Duration const & GetDuration() const { return m_duration; }
+
   private:
     Duration m_duration;
   };
@@ -76,8 +76,8 @@ public:
   ScenarioManager(FrontendRenderer * frontendRenderer);
   ~ScenarioManager();
 
-  bool RunScenario(ScenarioData && scenarioData,
-                   ScenarioCallback const & startHandler, ScenarioCallback const & finishHandler);
+  bool RunScenario(ScenarioData && scenarioData, ScenarioCallback const & startHandler,
+                   ScenarioCallback const & finishHandler);
   void Interrupt();
   bool IsRunning();
 
@@ -99,4 +99,4 @@ private:
   std::unique_ptr<threads::SimpleThread> m_thread;
 };
 
-} //  namespace df
+}  //  namespace df
diff --git a/libs/drape_frontend/screen_animations.cpp b/libs/drape_frontend/screen_animations.cpp
index e2c15f74a..b79804370 100644
--- a/libs/drape_frontend/screen_animations.cpp
+++ b/libs/drape_frontend/screen_animations.cpp
@@ -17,12 +17,12 @@ std::string const kParallelLinearAnim = "ParallelLinear";
 
 drape_ptr<SequenceAnimation> GetPrettyMoveAnimation(ScreenBase const & startScreen, ScreenBase const & endScreen)
 {
-  return GetPrettyMoveAnimation(startScreen, startScreen.GetScale(), endScreen.GetScale(),
-                                startScreen.GetOrg(), endScreen.GetOrg());
+  return GetPrettyMoveAnimation(startScreen, startScreen.GetScale(), endScreen.GetScale(), startScreen.GetOrg(),
+                                endScreen.GetOrg());
 }
 
-drape_ptr<SequenceAnimation> GetPrettyMoveAnimation(ScreenBase const & screen,
-                                                    m2::AnyRectD const & startRect, m2::AnyRectD const & endRect)
+drape_ptr<SequenceAnimation> GetPrettyMoveAnimation(ScreenBase const & screen, m2::AnyRectD const & startRect,
+                                                    m2::AnyRectD const & endRect)
 {
   double const startScale = CalculateScale(screen.PixelRect(), startRect.GetLocalRect());
   double const endScale = CalculateScale(screen.PixelRect(), endRect.GetLocalRect());
@@ -45,7 +45,7 @@ drape_ptr<SequenceAnimation> GetPrettyMoveAnimation(ScreenBase const & screen, d
   zoomOutAnim->SetScale(startScale, startScale * scaleFactor);
   zoomOutAnim->SetMaxDuration(kMaxAnimationTimeSec * 0.5);
 
-  //TODO (in future): Pass fixed duration instead of screen.
+  // TODO (in future): Pass fixed duration instead of screen.
   auto moveAnim = make_unique_dp<MapLinearAnimation>();
   moveAnim->SetMove(startPt, endPt, screen);
   moveAnim->SetMaxDuration(kMaxAnimationTimeSec);
@@ -60,8 +60,9 @@ drape_ptr<SequenceAnimation> GetPrettyMoveAnimation(ScreenBase const & screen, d
   return sequenceAnim;
 }
 
-drape_ptr<SequenceAnimation> GetPrettyFollowAnimation(ScreenBase const & startScreen, m2::PointD const & userPos, double targetScale,
-                                                      double targetAngle, m2::PointD const & endPixelPos)
+drape_ptr<SequenceAnimation> GetPrettyFollowAnimation(ScreenBase const & startScreen, m2::PointD const & userPos,
+                                                      double targetScale, double targetAngle,
+                                                      m2::PointD const & endPixelPos)
 {
   auto sequenceAnim = make_unique_dp<SequenceAnimation>();
   sequenceAnim->SetCustomType(kPrettyFollowAnim);
@@ -96,9 +97,8 @@ drape_ptr<SequenceAnimation> GetPrettyFollowAnimation(ScreenBase const & startSc
     sequenceAnim->AddAnimation(std::move(moveAnim));
   }
 
-  auto followAnim = make_unique_dp<MapFollowAnimation>(tmp, userPos, endPixelPos,
-                                                       targetScale, targetAngle,
-                                                       false /* isAutoZoom */);
+  auto followAnim =
+      make_unique_dp<MapFollowAnimation>(tmp, userPos, endPixelPos, targetScale, targetAngle, false /* isAutoZoom */);
   followAnim->SetMaxDuration(kMaxAnimationTimeSec * 0.5);
   sequenceAnim->AddAnimation(std::move(followAnim));
   return sequenceAnim;
@@ -109,16 +109,16 @@ drape_ptr<MapLinearAnimation> GetRectAnimation(ScreenBase const & startScreen, S
   auto anim = make_unique_dp<MapLinearAnimation>();
 
   anim->SetRotate(startScreen.GetAngle(), endScreen.GetAngle());
-  anim->SetMove(startScreen.GetOrg(), endScreen.GetOrg(),
-                startScreen.PixelRectIn3d(), (startScreen.GetScale() + endScreen.GetScale()) / 2.0);
+  anim->SetMove(startScreen.GetOrg(), endScreen.GetOrg(), startScreen.PixelRectIn3d(),
+                (startScreen.GetScale() + endScreen.GetScale()) / 2.0);
   anim->SetScale(startScreen.GetScale(), endScreen.GetScale());
   anim->SetMaxScaleDuration(kMaxAnimationTimeSec);
 
   return anim;
 }
 
-drape_ptr<MapLinearAnimation> GetSetRectAnimation(ScreenBase const & screen,
-                                                  m2::AnyRectD const & startRect, m2::AnyRectD const & endRect)
+drape_ptr<MapLinearAnimation> GetSetRectAnimation(ScreenBase const & screen, m2::AnyRectD const & startRect,
+                                                  m2::AnyRectD const & endRect)
 {
   auto anim = make_unique_dp<MapLinearAnimation>();
 
@@ -137,7 +137,8 @@ drape_ptr<MapFollowAnimation> GetFollowAnimation(ScreenBase const & startScreen,
                                                  double targetScale, double targetAngle, m2::PointD const & endPixelPos,
                                                  bool isAutoZoom)
 {
-  auto anim = make_unique_dp<MapFollowAnimation>(startScreen, userPos, endPixelPos, targetScale, targetAngle, isAutoZoom);
+  auto anim =
+      make_unique_dp<MapFollowAnimation>(startScreen, userPos, endPixelPos, targetScale, targetAngle, isAutoZoom);
   anim->SetMaxDuration(kMaxAnimationTimeSec);
 
   return anim;
@@ -149,11 +150,11 @@ drape_ptr<MapScaleAnimation> GetScaleAnimation(ScreenBase const & startScreen, m
   ScreenBase endScreen = startScreen;
   ApplyScale(pxScaleCenter, factor, endScreen);
 
-  auto anim = make_unique_dp<MapScaleAnimation>(startScreen.GetScale(), endScreen.GetScale(),
-                                                glbScaleCenter, pxScaleCenter);
+  auto anim =
+      make_unique_dp<MapScaleAnimation>(startScreen.GetScale(), endScreen.GetScale(), glbScaleCenter, pxScaleCenter);
   anim->SetMaxDuration(kMaxAnimationTimeSec);
 
   return anim;
 }
 
-} // namespace df
+}  // namespace df
diff --git a/libs/drape_frontend/screen_animations.hpp b/libs/drape_frontend/screen_animations.hpp
index 102a9ce48..965024793 100644
--- a/libs/drape_frontend/screen_animations.hpp
+++ b/libs/drape_frontend/screen_animations.hpp
@@ -19,23 +19,24 @@ class MapFollowAnimation;
 class MapScaleAnimation;
 
 drape_ptr<SequenceAnimation> GetPrettyMoveAnimation(ScreenBase const & startScreen, ScreenBase const & endScreen);
-drape_ptr<SequenceAnimation> GetPrettyMoveAnimation(ScreenBase const & screen,
-                                                    m2::AnyRectD const & startRect, m2::AnyRectD const & endRect);
+drape_ptr<SequenceAnimation> GetPrettyMoveAnimation(ScreenBase const & screen, m2::AnyRectD const & startRect,
+                                                    m2::AnyRectD const & endRect);
 drape_ptr<SequenceAnimation> GetPrettyMoveAnimation(ScreenBase const & screen, double startScale, double endScale,
                                                     m2::PointD const & startPt, m2::PointD const & endPt);
 
 drape_ptr<SequenceAnimation> GetPrettyFollowAnimation(ScreenBase const & startScreen, m2::PointD const & userPos,
-                                                      double targetScale, double targetAngle, m2::PointD const & endPixelPos);
+                                                      double targetScale, double targetAngle,
+                                                      m2::PointD const & endPixelPos);
 
 drape_ptr<MapLinearAnimation> GetRectAnimation(ScreenBase const & startScreen, ScreenBase const & endScreen);
-drape_ptr<MapLinearAnimation> GetSetRectAnimation(ScreenBase const & screen,
-                                                  m2::AnyRectD const & startRect, m2::AnyRectD const & endRect);
+drape_ptr<MapLinearAnimation> GetSetRectAnimation(ScreenBase const & screen, m2::AnyRectD const & startRect,
+                                                  m2::AnyRectD const & endRect);
 
 drape_ptr<MapFollowAnimation> GetFollowAnimation(ScreenBase const & startScreen, m2::PointD const & userPos,
-                                                 double targetScale, double targetAngle, m2::PointD const & endPixelPos, bool isAutoZoom);
+                                                 double targetScale, double targetAngle, m2::PointD const & endPixelPos,
+                                                 bool isAutoZoom);
 
 drape_ptr<MapScaleAnimation> GetScaleAnimation(ScreenBase const & startScreen, m2::PointD pxScaleCenter,
                                                m2::PointD glbScaleCenter, double factor);
 
-} // namespace df
-
+}  // namespace df
diff --git a/libs/drape_frontend/screen_operations.cpp b/libs/drape_frontend/screen_operations.cpp
index ae3f0cb38..38bad8ec4 100644
--- a/libs/drape_frontend/screen_operations.cpp
+++ b/libs/drape_frontend/screen_operations.cpp
@@ -12,7 +12,6 @@
 
 #include <algorithm>
 
-
 namespace df
 {
 
@@ -31,9 +30,8 @@ double CalculateScale(m2::RectD const & pixelRect, m2::RectD const & localRect)
   return std::max(localRect.SizeX() / pixelRect.SizeX(), localRect.SizeY() / pixelRect.SizeY());
 }
 
-m2::PointD CalculateCenter(double scale, m2::RectD const & pixelRect,
-                           m2::PointD const & userPos, m2::PointD const & pixelPos,
-                           double azimuth)
+m2::PointD CalculateCenter(double scale, m2::RectD const & pixelRect, m2::PointD const & userPos,
+                           m2::PointD const & pixelPos, double azimuth)
 {
   m2::PointD formingVector = (pixelRect.Center() - pixelPos) * scale;
   formingVector.y = -formingVector.y;
@@ -41,8 +39,8 @@ m2::PointD CalculateCenter(double scale, m2::RectD const & pixelRect,
   return userPos + formingVector;
 }
 
-m2::PointD CalculateCenter(ScreenBase const & screen, m2::PointD const & userPos,
-                           m2::PointD const & pixelPos, double azimuth)
+m2::PointD CalculateCenter(ScreenBase const & screen, m2::PointD const & userPos, m2::PointD const & pixelPos,
+                           double azimuth)
 {
   double const scale = screen.GlobalRect().GetLocalRect().SizeX() / screen.PixelRect().SizeX();
   return CalculateCenter(scale, screen.PixelRect(), userPos, pixelPos, azimuth);
@@ -78,8 +76,7 @@ bool CheckBorders(ScreenBase const & screen)
 bool CanShrinkInto(ScreenBase const & screen, m2::RectD const & boundRect)
 {
   m2::RectD clipRect = screen.ClipRect();
-  return (boundRect.SizeX() >= clipRect.SizeX())
-      && (boundRect.SizeY() >= clipRect.SizeY());
+  return (boundRect.SizeX() >= clipRect.SizeX()) && (boundRect.SizeY() >= clipRect.SizeY());
 }
 
 ScreenBase const ShrinkInto(ScreenBase const & screen, m2::RectD const & boundRect)
@@ -99,7 +96,7 @@ ScreenBase const ShrinkInto(ScreenBase const & screen, m2::RectD const & boundRe
   res.SetOrg(clipRect.Center());
 
   // This assert fails near x = 180 (Philipines).
-  //ASSERT ( boundRect.IsRectInside(res.ClipRect()), (clipRect, res.ClipRect()) );
+  // ASSERT ( boundRect.IsRectInside(res.ClipRect()), (clipRect, res.ClipRect()) );
   return res;
 }
 
@@ -260,4 +257,4 @@ bool ApplyScale(m2::PointD const & pixelScaleCenter, double factor, ScreenBase &
   return true;
 }
 
-} // namespace df
+}  // namespace df
diff --git a/libs/drape_frontend/screen_operations.hpp b/libs/drape_frontend/screen_operations.hpp
index 5ef813518..c6e34c1ec 100644
--- a/libs/drape_frontend/screen_operations.hpp
+++ b/libs/drape_frontend/screen_operations.hpp
@@ -20,12 +20,11 @@ bool IsScaleAllowableIn3d(int scale);
 
 double CalculateScale(m2::RectD const & pixelRect, m2::RectD const & localRect);
 
-m2::PointD CalculateCenter(ScreenBase const & screen, m2::PointD const & userPos,
-                           m2::PointD const & pixelPos, double azimuth);
-m2::PointD CalculateCenter(double scale, m2::RectD const & pixelRect,
-                           m2::PointD const & userPos, m2::PointD const & pixelPos,
+m2::PointD CalculateCenter(ScreenBase const & screen, m2::PointD const & userPos, m2::PointD const & pixelPos,
                            double azimuth);
+m2::PointD CalculateCenter(double scale, m2::RectD const & pixelRect, m2::PointD const & userPos,
+                           m2::PointD const & pixelPos, double azimuth);
 
 bool ApplyScale(m2::PointD const & pixelScaleCenter, double factor, ScreenBase & screen);
 
-} // namespace df
+}  // namespace df
diff --git a/libs/drape_frontend/screen_quad_renderer.cpp b/libs/drape_frontend/screen_quad_renderer.cpp
index 595b1cabc..54b1395de 100644
--- a/libs/drape_frontend/screen_quad_renderer.cpp
+++ b/libs/drape_frontend/screen_quad_renderer.cpp
@@ -14,15 +14,14 @@ namespace
 class TextureRenderParams
 {
 public:
-  TextureRenderParams()
-    : m_state(CreateRenderState(gpu::Program::ScreenQuad, DepthLayer::GeometryLayer))
+  TextureRenderParams() : m_state(CreateRenderState(gpu::Program::ScreenQuad, DepthLayer::GeometryLayer))
   {
     m_state.SetDepthTestEnabled(false);
     m_state.SetBlending(dp::Blending(true));
   }
 
-  void SetParams(ref_ptr<gpu::ProgramManager> gpuProgramManager,
-                 ref_ptr<dp::Texture> texture, float opacity, bool invertV)
+  void SetParams(ref_ptr<gpu::ProgramManager> gpuProgramManager, ref_ptr<dp::Texture> texture, float opacity,
+                 bool invertV)
   {
     UNUSED_VALUE(gpuProgramManager);
     m_state.SetTexture("u_colorTex", std::move(texture));
@@ -51,10 +50,10 @@ void ScreenQuadRenderer::Rebuild(ref_ptr<dp::GraphicsContext> context)
   vertices.reserve(4);
   if (context->GetApiVersion() == dp::ApiVersion::Vulkan)
   {
-    vertices = {-1.0f, -1.0f,  m_textureRect.minX(), m_textureRect.minY(),
-                1.0f,  -1.0f,  m_textureRect.maxX(), m_textureRect.minY(),
-                -1.0f, 1.0f, m_textureRect.minX(), m_textureRect.maxY(),
-                1.0f,  1.0f, m_textureRect.maxX(), m_textureRect.maxY()};
+    vertices = {-1.0f, -1.0f, m_textureRect.minX(), m_textureRect.minY(),
+                1.0f,  -1.0f, m_textureRect.maxX(), m_textureRect.minY(),
+                -1.0f, 1.0f,  m_textureRect.minX(), m_textureRect.maxY(),
+                1.0f,  1.0f,  m_textureRect.maxX(), m_textureRect.maxY()};
   }
   else
   {
@@ -69,16 +68,14 @@ void ScreenQuadRenderer::Rebuild(ref_ptr<dp::GraphicsContext> context)
   SetAttribute("a_tcoord", bufferIndex, sizeof(float) * 2 /* offset */, 2 /* componentsCount */);
 }
 
-void ScreenQuadRenderer::RenderTexture(ref_ptr<dp::GraphicsContext> context,
-                                       ref_ptr<gpu::ProgramManager> mng,
+void ScreenQuadRenderer::RenderTexture(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
                                        ref_ptr<dp::Texture> texture, float opacity, bool invertV)
 {
   TextureRenderParams params;
   params.SetParams(mng, std::move(texture), opacity, invertV);
 
   auto program = mng->GetProgram(params.GetRenderState().GetProgram<gpu::Program>());
-  Base::Render(context, program, params.GetRenderState(), mng->GetParamsSetter(),
-               params.GetProgramParams());
+  Base::Render(context, program, params.GetRenderState(), mng->GetParamsSetter(), params.GetProgramParams());
 }
 
 void ScreenQuadRenderer::SetTextureRect(ref_ptr<dp::GraphicsContext> context, m2::RectF const & rect)
diff --git a/libs/drape_frontend/screen_quad_renderer.hpp b/libs/drape_frontend/screen_quad_renderer.hpp
index 5c37b6d97..fd380ffc0 100644
--- a/libs/drape_frontend/screen_quad_renderer.hpp
+++ b/libs/drape_frontend/screen_quad_renderer.hpp
@@ -14,6 +14,7 @@ namespace df
 class ScreenQuadRenderer : public dp::MeshObject
 {
   using Base = dp::MeshObject;
+
 public:
   explicit ScreenQuadRenderer(ref_ptr<dp::GraphicsContext> context);
 
diff --git a/libs/drape_frontend/selection_shape.cpp b/libs/drape_frontend/selection_shape.cpp
index 712a29a27..613e048f5 100644
--- a/libs/drape_frontend/selection_shape.cpp
+++ b/libs/drape_frontend/selection_shape.cpp
@@ -17,13 +17,11 @@ namespace df
 {
 namespace
 {
-std::array<float, 20> const kHalfLineWidthInPixel =
-{
-  // 1   2     3     4     5     6     7     8     9     10
-  1.0f, 1.2f, 1.5f, 1.5f, 1.7f, 2.0f, 2.0f, 2.3f, 2.5f, 2.7f,
-  //11   12    13    14    15   16    17    18    19     20
-  3.0f, 3.5f, 4.5f, 5.5f, 7.0, 9.0f, 10.0f, 14.0f, 22.0f, 27.0f
-};
+std::array<float, 20> const kHalfLineWidthInPixel = {
+    // 1   2     3     4     5     6     7     8     9     10
+    1.0f, 1.2f, 1.5f, 1.5f, 1.7f, 2.0f, 2.0f, 2.3f, 2.5f, 2.7f,
+    // 11   12    13    14    15   16    17    18    19     20
+    3.0f, 3.5f, 4.5f, 5.5f, 7.0, 9.0f, 10.0f, 14.0f, 22.0f, 27.0f};
 }  // namespace
 
 SelectionShape::SelectionShape(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::TextureManager> mng)
@@ -124,8 +122,8 @@ void SelectionShape::Render(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::P
     int index = 0;
     float lerpCoef = 0.0f;
     ExtractZoomFactors(screen, zoom, index, lerpCoef);
-    float const currentHalfWidth = InterpolateByZoomLevels(index, lerpCoef, kHalfLineWidthInPixel) *
-      VisualParams::Instance().GetVisualScale();
+    float const currentHalfWidth =
+        InterpolateByZoomLevels(index, lerpCoef, kHalfLineWidthInPixel) * VisualParams::Instance().GetVisualScale();
     auto const screenHalfWidth = static_cast<float>(currentHalfWidth * screen.GetScale());
 
     gpu::ShapesProgramParams geomParams;
diff --git a/libs/drape_frontend/selection_shape.hpp b/libs/drape_frontend/selection_shape.hpp
index d7e81570a..4672be15c 100644
--- a/libs/drape_frontend/selection_shape.hpp
+++ b/libs/drape_frontend/selection_shape.hpp
@@ -41,8 +41,8 @@ public:
   void SetPosition(m2::PointD const & position) { m_position = position; }
   void Show(ESelectedObject obj, m2::PointD const & position, double positionZ, bool isAnimate);
   void Hide();
-  void Render(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
-              ScreenBase const & screen, int zoomLevel, FrameValues const & frameValues);
+  void Render(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng, ScreenBase const & screen,
+              int zoomLevel, FrameValues const & frameValues);
 
   std::optional<m2::PointD> GetPixelPosition(ScreenBase const & screen, int zoomLevel) const;
   double GetRadius() const { return m_radius; }
diff --git a/libs/drape_frontend/selection_shape_generator.cpp b/libs/drape_frontend/selection_shape_generator.cpp
index a25efa6f0..5ce142367 100644
--- a/libs/drape_frontend/selection_shape_generator.cpp
+++ b/libs/drape_frontend/selection_shape_generator.cpp
@@ -33,10 +33,7 @@ float const kRightSide = -1.0f;
 struct MarkerVertex
 {
   MarkerVertex() = default;
-  MarkerVertex(glsl::vec2 const & normal, glsl::vec2 const & texCoord)
-    : m_normal(normal)
-    , m_texCoord(texCoord)
-  {}
+  MarkerVertex(glsl::vec2 const & normal, glsl::vec2 const & texCoord) : m_normal(normal), m_texCoord(texCoord) {}
 
   glsl::vec2 m_normal;
   glsl::vec2 m_texCoord;
@@ -67,8 +64,8 @@ struct SelectionLineVertex
   using TNormal = glsl::vec3;
 
   SelectionLineVertex() = default;
-  SelectionLineVertex(glsl::vec3 const & position, glsl::vec2 const & normal,
-                      glsl::vec2 const & colorTexCoords, glsl::vec3 const & length)
+  SelectionLineVertex(glsl::vec3 const & position, glsl::vec2 const & normal, glsl::vec2 const & colorTexCoords,
+                      glsl::vec3 const & length)
     : m_position(position)
     , m_normal(normal)
     , m_colorTexCoords(colorTexCoords)
@@ -151,8 +148,8 @@ drape_ptr<RenderNode> SelectionShapeGenerator::GenerateSelectionMarker(ref_ptr<d
   {
     dp::Batcher batcher(kTriangleCount * dp::Batcher::IndexPerTriangle, kVertexCount);
     batcher.SetBatcherHash(static_cast<uint64_t>(BatcherBucket::Default));
-    dp::SessionGuard guard(context, batcher, [&renderNode](dp::RenderState const & state,
-                                                           drape_ptr<dp::RenderBucket> && b)
+    dp::SessionGuard guard(context, batcher,
+                           [&renderNode](dp::RenderState const & state, drape_ptr<dp::RenderBucket> && b)
     {
       drape_ptr<dp::RenderBucket> bucket = std::move(b);
       ASSERT(bucket->GetOverlayHandlesCount() == 0, ());
@@ -168,8 +165,8 @@ drape_ptr<RenderNode> SelectionShapeGenerator::GenerateSelectionMarker(ref_ptr<d
 }
 
 // static
-drape_ptr<RenderNode> SelectionShapeGenerator::GenerateTrackSelectionMarker(
-    ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::TextureManager> mng)
+drape_ptr<RenderNode> SelectionShapeGenerator::GenerateTrackSelectionMarker(ref_ptr<dp::GraphicsContext> context,
+                                                                            ref_ptr<dp::TextureManager> mng)
 {
   dp::TextureManager::SymbolRegion region;
   mng->GetSymbolRegion(kTrackSelectedSymbolName, region);
@@ -195,8 +192,8 @@ drape_ptr<RenderNode> SelectionShapeGenerator::GenerateTrackSelectionMarker(
   {
     dp::Batcher batcher(dp::Batcher::IndexPerQuad, dp::Batcher::VertexPerQuad);
     batcher.SetBatcherHash(static_cast<uint64_t>(BatcherBucket::Default));
-    dp::SessionGuard guard(context, batcher, [&renderNode](dp::RenderState const & state,
-                                                           drape_ptr<dp::RenderBucket> && b)
+    dp::SessionGuard guard(context, batcher,
+                           [&renderNode](dp::RenderState const & state, drape_ptr<dp::RenderBucket> && b)
     {
       drape_ptr<dp::RenderBucket> bucket = std::move(b);
       ASSERT(bucket->GetOverlayHandlesCount() == 0, ());
@@ -262,14 +259,13 @@ drape_ptr<RenderNode> SelectionShapeGenerator::GenerateSelectionGeometry(ref_ptr
   float length = 0.0f;
   for (size_t i = 0; i < segsCount; ++i)
   {
-    UpdateNormals(&segments[i], (i > 0) ? &segments[i - 1] : nullptr,
-                  (i < segsCount - 1) ? &segments[i + 1] : nullptr);
+    UpdateNormals(&segments[i], (i > 0) ? &segments[i - 1] : nullptr, (i < segsCount - 1) ? &segments[i + 1] : nullptr);
 
     // Generate main geometry.
-    m2::PointD const startPt = MapShape::ConvertToLocal(glsl::FromVec2(segments[i].m_points[StartPoint]),
-                                                        pivot, kShapeCoordScalar);
-    m2::PointD const endPt = MapShape::ConvertToLocal(glsl::FromVec2(segments[i].m_points[EndPoint]),
-                                                      pivot, kShapeCoordScalar);
+    m2::PointD const startPt =
+        MapShape::ConvertToLocal(glsl::FromVec2(segments[i].m_points[StartPoint]), pivot, kShapeCoordScalar);
+    m2::PointD const endPt =
+        MapShape::ConvertToLocal(glsl::FromVec2(segments[i].m_points[EndPoint]), pivot, kShapeCoordScalar);
 
     glsl::vec3 const startPivot = glsl::vec3(glsl::ToVec2(startPt), 0.0f);
     glsl::vec3 const endPivot = glsl::vec3(glsl::ToVec2(endPt), 0.0f);
@@ -303,38 +299,37 @@ drape_ptr<RenderNode> SelectionShapeGenerator::GenerateSelectionGeometry(ref_ptr
     // Generate joins.
     if (segments[i].m_generateJoin && i < segsCount - 1)
     {
-      glsl::vec2 const n1 = segments[i].m_hasLeftJoin[EndPoint] ? segments[i].m_leftNormals[EndPoint] :
-                                                                  segments[i].m_rightNormals[EndPoint];
-      glsl::vec2 const n2 = segments[i + 1].m_hasLeftJoin[StartPoint] ? segments[i + 1].m_leftNormals[StartPoint] :
-                                                                        segments[i + 1].m_rightNormals[StartPoint];
+      glsl::vec2 const n1 = segments[i].m_hasLeftJoin[EndPoint] ? segments[i].m_leftNormals[EndPoint]
+                                                                : segments[i].m_rightNormals[EndPoint];
+      glsl::vec2 const n2 = segments[i + 1].m_hasLeftJoin[StartPoint] ? segments[i + 1].m_leftNormals[StartPoint]
+                                                                      : segments[i + 1].m_rightNormals[StartPoint];
 
-      float const widthScalar = segments[i].m_hasLeftJoin[EndPoint] ? segments[i].m_rightWidthScalar[EndPoint].x :
-                                                                      segments[i].m_leftWidthScalar[EndPoint].x;
+      float const widthScalar = segments[i].m_hasLeftJoin[EndPoint] ? segments[i].m_rightWidthScalar[EndPoint].x
+                                                                    : segments[i].m_leftWidthScalar[EndPoint].x;
 
-      std::vector<glsl::vec2> normals = GenerateJoinNormals(dp::RoundJoin, n1, n2, 1.0f,
-                                                            segments[i].m_hasLeftJoin[EndPoint], widthScalar);
-      GenerateJoinsTriangles(endPivot, normals, colorCoord, glsl::vec2(length, 0),
-                             segments[i].m_hasLeftJoin[EndPoint], geometry);
+      std::vector<glsl::vec2> normals =
+          GenerateJoinNormals(dp::RoundJoin, n1, n2, 1.0f, segments[i].m_hasLeftJoin[EndPoint], widthScalar);
+      GenerateJoinsTriangles(endPivot, normals, colorCoord, glsl::vec2(length, 0), segments[i].m_hasLeftJoin[EndPoint],
+                             geometry);
     }
 
     // Generate caps.
     if (i == 0)
     {
-      std::vector<glsl::vec2> normals = GenerateCapNormals(
-            dp::RoundCap, segments[i].m_leftNormals[StartPoint], segments[i].m_rightNormals[StartPoint],
-            -segments[i].m_tangent, 1.0f, true /* isStart */);
+      std::vector<glsl::vec2> normals =
+          GenerateCapNormals(dp::RoundCap, segments[i].m_leftNormals[StartPoint],
+                             segments[i].m_rightNormals[StartPoint], -segments[i].m_tangent, 1.0f, true /* isStart */);
 
       GenerateJoinsTriangles(startPivot, normals, colorCoord, glsl::vec2(length, 0), true, geometry);
     }
 
     if (i == segsCount - 1)
     {
-      std::vector<glsl::vec2> normals = GenerateCapNormals(
-            dp::RoundCap, segments[i].m_leftNormals[EndPoint], segments[i].m_rightNormals[EndPoint],
-            segments[i].m_tangent, 1.0f, false /* isStart */);
+      std::vector<glsl::vec2> normals =
+          GenerateCapNormals(dp::RoundCap, segments[i].m_leftNormals[EndPoint], segments[i].m_rightNormals[EndPoint],
+                             segments[i].m_tangent, 1.0f, false /* isStart */);
 
-      GenerateJoinsTriangles(endPivot, normals, colorCoord, glsl::vec2(length, 0),
-                             true, geometry);
+      GenerateJoinsTriangles(endPivot, normals, colorCoord, glsl::vec2(length, 0), true, geometry);
     }
 
     length += glsl::length(segments[i].m_points[EndPoint] - segments[i].m_points[StartPoint]);
@@ -348,8 +343,8 @@ drape_ptr<RenderNode> SelectionShapeGenerator::GenerateSelectionGeometry(ref_ptr
   {
     dp::Batcher batcher(static_cast<uint32_t>(geometry.size()), static_cast<uint32_t>(geometry.size()));
     batcher.SetBatcherHash(static_cast<uint64_t>(BatcherBucket::Default));
-    dp::SessionGuard guard(context, batcher, [&renderNode, &pivot, &rect](dp::RenderState const & state,
-                                                                          drape_ptr<dp::RenderBucket> && b)
+    dp::SessionGuard guard(context, batcher,
+                           [&renderNode, &pivot, &rect](dp::RenderState const & state, drape_ptr<dp::RenderBucket> && b)
     {
       drape_ptr<dp::RenderBucket> bucket = std::move(b);
       ASSERT(bucket->GetOverlayHandlesCount() == 0, ());
diff --git a/libs/drape_frontend/selection_shape_generator.hpp b/libs/drape_frontend/selection_shape_generator.hpp
index a76852bf9..e33a16ec9 100644
--- a/libs/drape_frontend/selection_shape_generator.hpp
+++ b/libs/drape_frontend/selection_shape_generator.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "drape_frontend/render_node.hpp"
 #include "drape_frontend/map_data_provider.hpp"
 #include "drape_frontend/metaline_manager.hpp"
+#include "drape_frontend/render_node.hpp"
 
 #include "drape/graphics_context.hpp"
 #include "drape/pointers.hpp"
@@ -26,8 +26,7 @@ public:
                                                             ref_ptr<dp::TextureManager> mng);
 
   static drape_ptr<RenderNode> GenerateSelectionGeometry(ref_ptr<dp::GraphicsContext> context,
-                                                         FeatureID const & feature,
-                                                         ref_ptr<dp::TextureManager> mng,
+                                                         FeatureID const & feature, ref_ptr<dp::TextureManager> mng,
                                                          ref_ptr<MetalineManager> metalineMng,
                                                          MapDataProvider & mapDataProvider);
 };
diff --git a/libs/drape_frontend/shape_view_params.hpp b/libs/drape_frontend/shape_view_params.hpp
index 12e8d545e..5f2b51dce 100644
--- a/libs/drape_frontend/shape_view_params.hpp
+++ b/libs/drape_frontend/shape_view_params.hpp
@@ -120,7 +120,9 @@ struct ColoredSymbolViewParams : CommonOverlayViewParams
 {
   enum class Shape
   {
-    Rectangle, Circle, RoundedRectangle
+    Rectangle,
+    Circle,
+    RoundedRectangle
   };
 
   Shape m_shape = Shape::Circle;
diff --git a/libs/drape_frontend/stylist.cpp b/libs/drape_frontend/stylist.cpp
index ea276f730..90f9aa671 100644
--- a/libs/drape_frontend/stylist.cpp
+++ b/libs/drape_frontend/stylist.cpp
@@ -18,18 +18,15 @@ IsHatchingTerritoryChecker::IsHatchingTerritoryChecker()
   Classificator const & c = classif();
 
   base::StringIL const arr3[] = {
-    {"boundary", "protected_area", "1"},
+      {"boundary", "protected_area", "1"},
   };
   for (auto const & sl : arr3)
     m_types.push_back(c.GetTypeByPath(sl));
   m_type3end = m_types.size();
 
   base::StringIL const arr2[] = {
-    {"boundary", "aboriginal_lands"},
-    {"leisure", "nature_reserve"},
-    {"boundary", "national_park"},
-    {"landuse", "military"},
-    {"amenity", "prison"},
+      {"boundary", "aboriginal_lands"}, {"leisure", "nature_reserve"}, {"boundary", "national_park"},
+      {"landuse", "military"},          {"amenity", "prison"},
   };
   for (auto const & sl : arr2)
     m_types.push_back(c.GetTypeByPath(sl));
@@ -45,8 +42,8 @@ bool IsHatchingTerritoryChecker::IsMatched(uint32_t type) const
   return std::find(iEnd3, m_types.end(), PrepareToMatch(type, 2)) != m_types.end();
 }
 
-void CaptionDescription::Init(FeatureType & f, int8_t deviceLang, int zoomLevel,
-                              feature::GeomType geomType, bool auxCaptionExists)
+void CaptionDescription::Init(FeatureType & f, int8_t deviceLang, int zoomLevel, feature::GeomType geomType,
+                              bool auxCaptionExists)
 {
   feature::NameParamsOut out;
   // TODO(pastk) : remove forced secondary text for all lines and set it via styles for major roads and rivers only.
@@ -75,7 +72,7 @@ void CaptionDescription::Init(FeatureType & f, int8_t deviceLang, int zoomLevel,
   }
 
   // Set max text length to avoid VB/IB overflow in rendering.
-  size_t constexpr kMaxTextLength = 65; 
+  size_t constexpr kMaxTextLength = 65;
   if (strings::Truncate(m_mainText, kMaxTextLength))
     m_mainText += "…";
 
@@ -85,7 +82,8 @@ void CaptionDescription::Init(FeatureType & f, int8_t deviceLang, int zoomLevel,
   if (geomType != feature::GeomType::Line && zoomLevel >= kHousenumbersMinZoom &&
       (auxCaptionExists || m_mainText.empty()))
   {
-    // TODO(pastk) : its not obvious that a housenumber display is dependent on a secondary caption drule existance in styles.
+    // TODO(pastk) : its not obvious that a housenumber display is dependent on a secondary caption drule existance in
+    // styles.
     m_houseNumberText = f.GetHouseNumber();
     if (!m_houseNumberText.empty() && !m_mainText.empty() && m_houseNumberText.find(m_mainText) != std::string::npos)
       m_mainText.clear();
@@ -102,20 +100,18 @@ void Stylist::ProcessKey(FeatureType & f, drule::Key const & key)
   switch (key.m_type)
   {
   case drule::symbol:
-    ASSERT(dRule->GetSymbol() && !m_symbolRule &&
-           (geomType == GeomType::Point || geomType == GeomType::Area),
+    ASSERT(dRule->GetSymbol() && !m_symbolRule && (geomType == GeomType::Point || geomType == GeomType::Area),
            (m_symbolRule == nullptr, geomType, f.DebugString()));
     m_symbolRule = dRule->GetSymbol();
     break;
   case drule::caption:
     ASSERT(dRule->GetCaption() && dRule->GetCaption()->has_primary() && !m_captionRule &&
-           (geomType == GeomType::Point || geomType == GeomType::Area),
+               (geomType == GeomType::Point || geomType == GeomType::Area),
            (m_captionRule == nullptr, f.DebugString()));
     m_captionRule = dRule->GetCaption();
     break;
   case drule::pathtext:
-    ASSERT(dRule->GetPathtext() && dRule->GetPathtext()->has_primary() && !m_pathtextRule &&
-           geomType == GeomType::Line,
+    ASSERT(dRule->GetPathtext() && dRule->GetPathtext()->has_primary() && !m_pathtextRule && geomType == GeomType::Line,
            (m_pathtextRule == nullptr, geomType, f.DebugString()));
     m_pathtextRule = dRule->GetPathtext();
     break;
@@ -144,9 +140,7 @@ void Stylist::ProcessKey(FeatureType & f, drule::Key const & key)
   // TODO(pastk) : check if circle/waymarker support exists still (not used in styles ATM).
   case drule::circle:
   case drule::waymarker:
-  default:
-    ASSERT(false, (key.m_type, f.DebugString()));
-    return;
+  default: ASSERT(false, (key.m_type, f.DebugString())); return;
   }
 }
 
@@ -187,9 +181,8 @@ Stylist::Stylist(FeatureType & f, uint8_t zoomLevel, int8_t deviceLang)
     for (auto & k : typeKeys)
     {
       // Take overlay drules from the main type only.
-      if (t == mainOverlayType ||
-          (k.m_type != drule::caption && k.m_type != drule::symbol &&
-           k.m_type != drule::shield && k.m_type != drule::pathtext))
+      if (t == mainOverlayType || (k.m_type != drule::caption && k.m_type != drule::symbol &&
+                                   k.m_type != drule::shield && k.m_type != drule::pathtext))
       {
         if (hasHatching && k.m_type == drule::area)
           k.m_hatching = true;
@@ -211,8 +204,8 @@ Stylist::Stylist(FeatureType & f, uint8_t zoomLevel, int8_t deviceLang)
 
   if (m_captionRule || m_pathtextRule)
   {
-    bool const auxExists = (m_captionRule && m_captionRule->has_secondary()) ||
-                           (m_pathtextRule && m_pathtextRule->has_secondary());
+    bool const auxExists =
+        (m_captionRule && m_captionRule->has_secondary()) || (m_pathtextRule && m_pathtextRule->has_secondary());
     m_captionDescriptor.Init(f, deviceLang, zoomLevel, geomType, auxExists);
 
     if (m_captionDescriptor.IsHouseNumberExists())
diff --git a/libs/drape_frontend/stylist.hpp b/libs/drape_frontend/stylist.hpp
index 21a7e971a..95cc7da1a 100644
--- a/libs/drape_frontend/stylist.hpp
+++ b/libs/drape_frontend/stylist.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "indexer/ftypes_matcher.hpp"
 #include "indexer/drawing_rule_def.hpp"
 #include "indexer/drawing_rules.hpp"
+#include "indexer/ftypes_matcher.hpp"
 #include "indexer/road_shields_parser.hpp"
 
 #include "base/buffer_vector.hpp"
@@ -12,7 +12,10 @@
 
 class FeatureType;
 
-namespace drule { class BaseRule; }
+namespace drule
+{
+class BaseRule;
+}
 
 namespace df
 {
@@ -20,10 +23,13 @@ namespace df
 class IsHatchingTerritoryChecker : public ftypes::BaseChecker
 {
   IsHatchingTerritoryChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(IsHatchingTerritoryChecker);
+
 protected:
   bool IsMatched(uint32_t type) const override;
+
 private:
   size_t m_type3end;
 };
diff --git a/libs/drape_frontend/text_handle.cpp b/libs/drape_frontend/text_handle.cpp
index f538552a3..a1d422435 100644
--- a/libs/drape_frontend/text_handle.cpp
+++ b/libs/drape_frontend/text_handle.cpp
@@ -14,9 +14,9 @@ TextHandle::TextHandle(dp::OverlayID const & id, dp::TGlyphs && glyphs, dp::Anch
   , m_glyphsReady(false)
 {}
 
-TextHandle::TextHandle(dp::OverlayID const & id, dp::TGlyphs && glyphs, dp::Anchor anchor,
-                       uint64_t priority, ref_ptr<dp::TextureManager> textureManager,
-                       gpu::TTextDynamicVertexBuffer && normals, int minVisibleScale, bool isBillboard)
+TextHandle::TextHandle(dp::OverlayID const & id, dp::TGlyphs && glyphs, dp::Anchor anchor, uint64_t priority,
+                       ref_ptr<dp::TextureManager> textureManager, gpu::TTextDynamicVertexBuffer && normals,
+                       int minVisibleScale, bool isBillboard)
   : OverlayHandle(id, anchor, priority, minVisibleScale, isBillboard)
   , m_buffer(std::move(normals))
   , m_forceUpdateNormals(false)
@@ -74,8 +74,8 @@ void TextHandle::SetForceUpdateNormals(bool forceUpdate) const
 std::string TextHandle::GetOverlayDebugInfo()
 {
   std::ostringstream out;
-  out << "Text Priority(" << std::hex << std::setw(16) << std::setfill('0') << GetPriority()
-      << ") " << std::dec << DebugPrint(GetOverlayID());
+  out << "Text Priority(" << std::hex << std::setw(16) << std::setfill('0') << GetPriority() << ") " << std::dec
+      << DebugPrint(GetOverlayID());
   return out.str();
 }
 #endif
diff --git a/libs/drape_frontend/text_handle.hpp b/libs/drape_frontend/text_handle.hpp
index c7e568091..604b61197 100644
--- a/libs/drape_frontend/text_handle.hpp
+++ b/libs/drape_frontend/text_handle.hpp
@@ -17,16 +17,12 @@ namespace df
 class TextHandle : public dp::OverlayHandle
 {
 public:
-  TextHandle(dp::OverlayID const & id, dp::TGlyphs && glyphs,
-             dp::Anchor anchor, uint64_t priority,
-             ref_ptr<dp::TextureManager> textureManager,
-             int minVisibleScale, bool isBillboard);
+  TextHandle(dp::OverlayID const & id, dp::TGlyphs && glyphs, dp::Anchor anchor, uint64_t priority,
+             ref_ptr<dp::TextureManager> textureManager, int minVisibleScale, bool isBillboard);
 
-  TextHandle(dp::OverlayID const & id, dp::TGlyphs && glyphs,
-             dp::Anchor anchor, uint64_t priority,
-             ref_ptr<dp::TextureManager> textureManager,
-             gpu::TTextDynamicVertexBuffer && normals,
-             int minVisibleScale, bool IsBillboard);
+  TextHandle(dp::OverlayID const & id, dp::TGlyphs && glyphs, dp::Anchor anchor, uint64_t priority,
+             ref_ptr<dp::TextureManager> textureManager, gpu::TTextDynamicVertexBuffer && normals, int minVisibleScale,
+             bool IsBillboard);
 
   bool Update(ScreenBase const & screen) override;
 
diff --git a/libs/drape_frontend/text_layout.cpp b/libs/drape_frontend/text_layout.cpp
index 19583a193..9b50080eb 100644
--- a/libs/drape_frontend/text_layout.cpp
+++ b/libs/drape_frontend/text_layout.cpp
@@ -17,15 +17,14 @@ float constexpr kValidSplineTurn = 0.96f;
 class TextGeometryGenerator
 {
 public:
-  TextGeometryGenerator(dp::TextureManager::ColorRegion const & color,
-                        gpu::TTextStaticVertexBuffer & buffer)
+  TextGeometryGenerator(dp::TextureManager::ColorRegion const & color, gpu::TTextStaticVertexBuffer & buffer)
     : m_colorCoord(glsl::ToVec2(color.GetTexRect().Center()))
     , m_buffer(buffer)
   {}
 
   void SetPenPosition(glsl::vec2 const & penOffset) {}
 
-  void operator() (dp::TextureManager::GlyphRegion const & glyph, dp::text::GlyphMetrics const &)
+  void operator()(dp::TextureManager::GlyphRegion const & glyph, dp::text::GlyphMetrics const &)
   {
     m2::RectF const & mask = glyph.GetTexRect();
 
@@ -43,8 +42,7 @@ protected:
 class StraightTextGeometryGenerator
 {
 public:
-  StraightTextGeometryGenerator(glsl::vec4 const & pivot,
-                                glsl::vec2 const & pixelOffset, float textRatio,
+  StraightTextGeometryGenerator(glsl::vec4 const & pivot, glsl::vec2 const & pixelOffset, float textRatio,
                                 gpu::TTextDynamicVertexBuffer & dynBuffer)
     : m_pivot(pivot)
     , m_pixelOffset(pixelOffset)
@@ -107,7 +105,7 @@ public:
 
   void SetPenPosition(glsl::vec2 const & penOffset) {}
 
-  void operator() (dp::TextureManager::GlyphRegion const & glyph, dp::text::GlyphMetrics const &)
+  void operator()(dp::TextureManager::GlyphRegion const & glyph, dp::text::GlyphMetrics const &)
   {
     m2::RectF const & mask = glyph.GetTexRect();
     m_buffer.emplace_back(m_colorCoord, m_outlineCoord, glsl::ToVec2(mask.LeftTop()));
@@ -131,11 +129,12 @@ struct LineMetrics
 
 // Scan longer shaped glyphs, and try to split them into two strings if a space glyph is present.
 // NOTE: Works only for LTR texts. Implementation should be mirrored for RTL.
-buffer_vector<LineMetrics, 2> SplitText(bool forceNoWrap, float textScale, dp::GlyphFontAndId space, dp::text::TextMetrics const & str)
+buffer_vector<LineMetrics, 2> SplitText(bool forceNoWrap, float textScale, dp::GlyphFontAndId space,
+                                        dp::text::TextMetrics const & str)
 {
   // Add the whole line by default.
-  buffer_vector<LineMetrics, 2> lines{{str.m_glyphs.size(),
-      textScale * str.m_lineWidthInPixels, textScale * str.m_maxLineHeightInPixels}};
+  buffer_vector<LineMetrics, 2> lines{
+      {str.m_glyphs.size(), textScale * str.m_lineWidthInPixels, textScale * str.m_maxLineHeightInPixels}};
 
   size_t const count = str.m_glyphs.size();
   if (forceNoWrap || count <= 15)
@@ -148,7 +147,7 @@ buffer_vector<LineMetrics, 2> SplitText(bool forceNoWrap, float textScale, dp::G
   // Doesn't take into an account the width of glyphs/string.
   auto const iMiddle = begin + count / 2;
 
-  auto const isSpaceGlyph = [space](auto const & metrics){ return metrics.m_key == space; };
+  auto const isSpaceGlyph = [space](auto const & metrics) { return metrics.m_key == space; };
   // Find next delimiter after middle [m, e)
   auto iNext = std::find_if(iMiddle, end, isSpaceGlyph);
 
@@ -179,7 +178,7 @@ buffer_vector<LineMetrics, 2> SplitText(bool forceNoWrap, float textScale, dp::G
 
   lines.push_back(LineMetrics{
       count,
-      textScale * std::accumulate(afterSpace, end, 0, [](auto acc, auto const & m){ return m.m_xAdvance + acc; }),
+      textScale * std::accumulate(afterSpace, end, 0, [](auto acc, auto const & m) { return m.m_xAdvance + acc; }),
       textScale * str.m_maxLineHeightInPixels});
 
   // Update the first line too.
@@ -192,9 +191,7 @@ buffer_vector<LineMetrics, 2> SplitText(bool forceNoWrap, float textScale, dp::G
 class XLayouter
 {
 public:
-  explicit XLayouter(dp::Anchor anchor)
-    : m_anchor(anchor)
-  {}
+  explicit XLayouter(dp::Anchor anchor) : m_anchor(anchor) {}
 
   float operator()(float currentLength, float maxLength) const
   {
@@ -232,7 +229,7 @@ public:
   }
 
 private:
-    float m_penOffset;
+  float m_penOffset;
 };
 
 double GetTextMinPeriod(double pixelTextLength)
@@ -291,7 +288,8 @@ StraightTextLayout::StraightTextLayout(std::string const & text, float fontSize,
 
   // TODO(AB): Use ICU's BreakIterator to split text properly in different languages without spaces.
   // TODO(AB): Implement SplitText for RTL languages.
-  auto const lines = SplitText(forceNoWrap || m_shapedGlyphs.m_isRTL, m_textSizeRatio, textures->GetSpaceGlyph(), m_shapedGlyphs);
+  auto const lines =
+      SplitText(forceNoWrap || m_shapedGlyphs.m_isRTL, m_textSizeRatio, textures->GetSpaceGlyph(), m_shapedGlyphs);
   m_rowsCount = lines.size();
 
   float summaryHeight = 0.;
@@ -376,8 +374,8 @@ void StraightTextLayout::CacheDynamicGeometry(glsl::vec2 const & pixelOffset,
   Cache(generator);
 }
 
-PathTextLayout::PathTextLayout(m2::PointD const & tileCenter, std::string const & text,
-                               float fontSize, ref_ptr<dp::TextureManager> textureManager)
+PathTextLayout::PathTextLayout(m2::PointD const & tileCenter, std::string const & text, float fontSize,
+                               ref_ptr<dp::TextureManager> textureManager)
   : m_tileCenter(tileCenter)
 {
   ASSERT_EQUAL(std::string::npos, text.find('\n'), ("Multiline text is not expected", text));
@@ -409,8 +407,7 @@ void PathTextLayout::CacheStaticGeometry(dp::TextureManager::ColorRegion const &
 }
 
 bool PathTextLayout::CacheDynamicGeometry(m2::Spline::iterator const & iter, float depth,
-                                          m2::PointD const & globalPivot,
-                                          gpu::TTextDynamicVertexBuffer & buffer) const
+                                          m2::PointD const & globalPivot, gpu::TTextDynamicVertexBuffer & buffer) const
 {
   float const halfLength = 0.5f * GetPixelLength();
 
@@ -433,8 +430,8 @@ bool PathTextLayout::CacheDynamicGeometry(m2::Spline::iterator const & iter, flo
   m2::PointD const pxPivot = iter.m_pos;
   buffer.resize(4 * m_glyphRegions.size());
 
-  glsl::vec4 const pivot(glsl::ToVec2(MapShape::ConvertToLocal(globalPivot, m_tileCenter,
-                                                               kShapeCoordScalar)), depth, 0.0f);
+  glsl::vec4 const pivot(glsl::ToVec2(MapShape::ConvertToLocal(globalPivot, m_tileCenter, kShapeCoordScalar)), depth,
+                         0.0f);
 
   ASSERT_EQUAL(m_glyphRegions.size(), m_shapedGlyphs.m_glyphs.size(), ());
   for (size_t i = 0; i < m_glyphRegions.size(); ++i)
@@ -458,8 +455,8 @@ bool PathTextLayout::CacheDynamicGeometry(m2::Spline::iterator const & iter, flo
     float const xOffset = glyph.m_xOffset * m_textSizeRatio;
     float const yOffset = glyph.m_yOffset * m_textSizeRatio;
 
-    float const upVector = - (pxSize.y + yOffset);
-    float const bottomVector = - yOffset;
+    float const upVector = -(pxSize.y + yOffset);
+    float const bottomVector = -yOffset;
 
     size_t const baseIndex = 4 * i;
 
@@ -485,8 +482,8 @@ double PathTextLayout::CalculateTextLength(double textPixelLength)
   return kTextBorder + textPixelLength;
 }
 
-void PathTextLayout::CalculatePositions(double splineLength, double splineScaleToPixel,
-                                        double textPixelLength, std::vector<double> & offsets)
+void PathTextLayout::CalculatePositions(double splineLength, double splineScaleToPixel, double textPixelLength,
+                                        std::vector<double> & offsets)
 {
   double const textLength = CalculateTextLength(textPixelLength);
 
diff --git a/libs/drape_frontend/text_layout.hpp b/libs/drape_frontend/text_layout.hpp
index b5f5be227..c51b6597f 100644
--- a/libs/drape_frontend/text_layout.hpp
+++ b/libs/drape_frontend/text_layout.hpp
@@ -8,11 +8,11 @@
 #include "drape/texture_manager.hpp"
 #include "drape/utils/vertex_decl.hpp"
 
-#include "geometry/spline.hpp"
 #include "geometry/screenbase.hpp"
+#include "geometry/spline.hpp"
 
-#include "base/string_utils.hpp"
 #include "base/buffer_vector.hpp"
+#include "base/string_utils.hpp"
 
 #include <string>
 #include <vector>
@@ -46,9 +46,10 @@ protected:
 class StraightTextLayout : public TextLayout
 {
   using TBase = TextLayout;
+
 public:
-  StraightTextLayout(std::string const & text, float fontSize,
-                     ref_ptr<dp::TextureManager> textures, dp::Anchor anchor, bool forceNoWrap);
+  StraightTextLayout(std::string const & text, float fontSize, ref_ptr<dp::TextureManager> textures, dp::Anchor anchor,
+                     bool forceNoWrap);
 
   void CacheStaticGeometry(dp::TextureManager::ColorRegion const & colorRegion,
                            gpu::TTextStaticVertexBuffer & staticBuffer) const;
@@ -63,8 +64,7 @@ public:
   m2::PointF const & GetPixelSize() const { return m_pixelSize; }
   size_t GetRowsCount() const { return m_rowsCount; }
 
-  static m2::PointF GetSymbolBasedTextOffset(m2::PointF const & symbolSize,
-                                             dp::Anchor textAnchor,
+  static m2::PointF GetSymbolBasedTextOffset(m2::PointF const & symbolSize, dp::Anchor textAnchor,
                                              dp::Anchor symbolAnchor);
 
   glsl::vec2 GetTextOffset(m2::PointF const & symbolSize, dp::Anchor textAnchor, dp::Anchor symbolAnchor) const;
@@ -93,9 +93,10 @@ private:
 class PathTextLayout : public TextLayout
 {
   using TBase = TextLayout;
+
 public:
-  PathTextLayout(m2::PointD const & tileCenter, std::string const & text,
-                 float fontSize, ref_ptr<dp::TextureManager> textures);
+  PathTextLayout(m2::PointD const & tileCenter, std::string const & text, float fontSize,
+                 ref_ptr<dp::TextureManager> textures);
 
   void CacheStaticGeometry(dp::TextureManager::ColorRegion const & colorRegion,
                            dp::TextureManager::ColorRegion const & outlineRegion,
@@ -104,13 +105,12 @@ public:
   void CacheStaticGeometry(dp::TextureManager::ColorRegion const & colorRegion,
                            gpu::TTextStaticVertexBuffer & staticBuffer) const;
 
-  bool CacheDynamicGeometry(m2::Spline::iterator const & iter,
-                            float depth,
-                            m2::PointD const & globalPivot,
+  bool CacheDynamicGeometry(m2::Spline::iterator const & iter, float depth, m2::PointD const & globalPivot,
                             gpu::TTextDynamicVertexBuffer & buffer) const;
 
-  static void CalculatePositions(double splineLength, double splineScaleToPixel,
-                                 double textPixelLength, std::vector<double> & offsets);
+  static void CalculatePositions(double splineLength, double splineScaleToPixel, double textPixelLength,
+                                 std::vector<double> & offsets);
+
 private:
   static double CalculateTextLength(double textPixelLength);
 
diff --git a/libs/drape_frontend/text_shape.cpp b/libs/drape_frontend/text_shape.cpp
index c5fc60a26..9952dada8 100644
--- a/libs/drape_frontend/text_shape.cpp
+++ b/libs/drape_frontend/text_shape.cpp
@@ -6,11 +6,11 @@
 
 #include "shaders/programs.hpp"
 
-#include "drape/utils/vertex_decl.hpp"
 #include "drape/attribute_provider.hpp"
 #include "drape/batcher.hpp"
 #include "drape/overlay_handle.hpp"
 #include "drape/texture_manager.hpp"
+#include "drape/utils/vertex_decl.hpp"
 
 #include <algorithm>
 #include <utility>
@@ -24,10 +24,9 @@ class StraightTextHandle : public TextHandle
   using TBase = TextHandle;
 
 public:
-  StraightTextHandle(dp::OverlayID const & id, dp::TGlyphs && glyphMetrics,
-                     dp::Anchor anchor, glsl::vec2 const & pivot,
-                     glsl::vec2 const & pxSize, glsl::vec2 const & offset,
-                     uint64_t priority, ref_ptr<dp::TextureManager> textureManager, bool isOptional,
+  StraightTextHandle(dp::OverlayID const & id, dp::TGlyphs && glyphMetrics, dp::Anchor anchor, glsl::vec2 const & pivot,
+                     glsl::vec2 const & pxSize, glsl::vec2 const & offset, uint64_t priority,
+                     ref_ptr<dp::TextureManager> textureManager, bool isOptional,
                      gpu::TTextDynamicVertexBuffer && normals, int minVisibleScale, bool isBillboard)
     : TextHandle(id, std::move(glyphMetrics), anchor, priority, textureManager, std::move(normals), minVisibleScale,
                  isBillboard)
@@ -122,8 +121,7 @@ public:
       pivot.y -= halfHeight;
     }
 
-    return m2::RectD(std::min(x, pivot.x), std::min(y, pivot.y),
-                     std::max(x, pivot.x), std::max(y, pivot.y));
+    return m2::RectD(std::min(x, pivot.x), std::min(y, pivot.y), std::max(x, pivot.x), std::max(y, pivot.y));
   }
 
   void GetPixelShape(ScreenBase const & screen, bool perspective, Rects & rects) const override
@@ -131,10 +129,7 @@ public:
     rects.emplace_back(GetPixelRect(screen, perspective));
   }
 
-  bool IsBound() const override
-  {
-    return !m_isOptional;
-  }
+  bool IsBound() const override { return !m_isOptional; }
 
 private:
   m2::PointF m_pivot;
@@ -147,8 +142,7 @@ private:
 };
 }  // namespace
 
-TextShape::TextShape(m2::PointD const & basePoint, TextViewParams const & params,
-                     TileKey const & tileKey,
+TextShape::TextShape(m2::PointD const & basePoint, TextViewParams const & params, TileKey const & tileKey,
                      m2::PointF const & symbolSize, m2::PointF const & symbolOffset, dp::Anchor symbolAnchor,
                      uint32_t textIndex)
   : m_basePoint(basePoint)
@@ -161,9 +155,9 @@ TextShape::TextShape(m2::PointD const & basePoint, TextViewParams const & params
   m_symbolSizes.push_back(symbolSize);
 }
 
-TextShape::TextShape(m2::PointD const & basePoint, TextViewParams const & params,
-                     TileKey const & tileKey, std::vector<m2::PointF> const & symbolSizes,
-                     m2::PointF const & symbolOffset, dp::Anchor symbolAnchor, uint32_t textIndex)
+TextShape::TextShape(m2::PointD const & basePoint, TextViewParams const & params, TileKey const & tileKey,
+                     std::vector<m2::PointF> const & symbolSizes, m2::PointF const & symbolOffset,
+                     dp::Anchor symbolAnchor, uint32_t textIndex)
   : m_basePoint(basePoint)
   , m_params(params)
   , m_tileCoords(tileKey.GetTileCoords())
@@ -234,17 +228,16 @@ void TextShape::Draw(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Batcher>
   auto const & titleDecl = m_params.m_titleDecl;
 
   ASSERT(!titleDecl.m_primaryText.empty(), ());
-  StraightTextLayout primaryLayout(titleDecl.m_primaryText, titleDecl.m_primaryTextFont.m_size,
-      textures, titleDecl.m_anchor, titleDecl.m_forceNoWrap);
-
+  StraightTextLayout primaryLayout(titleDecl.m_primaryText, titleDecl.m_primaryTextFont.m_size, textures,
+                                   titleDecl.m_anchor, titleDecl.m_forceNoWrap);
 
   if (m_params.m_limitedText)
   {
     if (auto const y = primaryLayout.GetPixelSize().y; y >= m_params.m_limits.y)
     {
       float const newFontSize = titleDecl.m_primaryTextFont.m_size * m_params.m_limits.y / y;
-      primaryLayout = StraightTextLayout(titleDecl.m_primaryText, newFontSize,
-                                         textures, titleDecl.m_anchor, titleDecl.m_forceNoWrap);
+      primaryLayout = StraightTextLayout(titleDecl.m_primaryText, newFontSize, textures, titleDecl.m_anchor,
+                                         titleDecl.m_forceNoWrap);
     }
   }
 
@@ -257,29 +250,29 @@ void TextShape::Draw(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Batcher>
   }
   else
   {
-    StraightTextLayout secondaryLayout{titleDecl.m_secondaryText,
-        titleDecl.m_secondaryTextFont.m_size, textures, titleDecl.m_anchor, titleDecl.m_forceNoWrap};
+    StraightTextLayout secondaryLayout{titleDecl.m_secondaryText, titleDecl.m_secondaryTextFont.m_size, textures,
+                                       titleDecl.m_anchor, titleDecl.m_forceNoWrap};
 
     if (secondaryLayout.GetGlyphCount() > 0)
     {
-      CalculateTextOffsets(titleDecl, primaryLayout.GetPixelSize(), secondaryLayout.GetPixelSize(), primaryOffset, secondaryOffset);
+      CalculateTextOffsets(titleDecl, primaryLayout.GetPixelSize(), secondaryLayout.GetPixelSize(), primaryOffset,
+                           secondaryOffset);
       secondaryOffset += glsl::vec2(m_symbolOffset.x, m_symbolOffset.y);
-      DrawSubString(context, secondaryLayout, titleDecl.m_secondaryTextFont, secondaryOffset, batcher,
-                    textures, false /* isPrimary */, titleDecl.m_secondaryOptional);
+      DrawSubString(context, secondaryLayout, titleDecl.m_secondaryTextFont, secondaryOffset, batcher, textures,
+                    false /* isPrimary */, titleDecl.m_secondaryOptional);
     }
   }
 
   // The order of drawing secondary and primary texts has been changed after a minor refactoring for better performance.
   // If there are any issues caused by a swapped order, it should be changed back.
   if (primaryLayout.GetGlyphCount() > 0)
-    DrawSubString(context, primaryLayout, titleDecl.m_primaryTextFont, primaryOffset, batcher,
-                  textures, true /* isPrimary */, titleDecl.m_primaryOptional);
+    DrawSubString(context, primaryLayout, titleDecl.m_primaryTextFont, primaryOffset, batcher, textures,
+                  true /* isPrimary */, titleDecl.m_primaryOptional);
 }
 
 void TextShape::DrawSubString(ref_ptr<dp::GraphicsContext> context, StraightTextLayout & layout,
-                              dp::FontDecl const & font, glm::vec2 const & baseOffset,
-                              ref_ptr<dp::Batcher> batcher, ref_ptr<dp::TextureManager> textures,
-                              bool isPrimary, bool isOptional) const
+                              dp::FontDecl const & font, glm::vec2 const & baseOffset, ref_ptr<dp::Batcher> batcher,
+                              ref_ptr<dp::TextureManager> textures, bool isPrimary, bool isOptional) const
 {
   glsl::vec2 const pt = glsl::ToVec2(ConvertToLocal(m_basePoint, m_params.m_tileCenter, kShapeCoordScalar));
   layout.SetBasePosition(glsl::vec4(pt, m_params.m_depth, -m_params.m_posZ), baseOffset);
@@ -293,11 +286,9 @@ void TextShape::DrawSubString(ref_ptr<dp::GraphicsContext> context, StraightText
     DrawSubStringOutlined(context, layout, font, batcher, textures, isPrimary, isOptional);
 }
 
-void TextShape::DrawSubStringPlain(ref_ptr<dp::GraphicsContext> context,
-                                   StraightTextLayout const & layout, dp::FontDecl const & font,
-                                   ref_ptr<dp::Batcher> batcher,
-                                   ref_ptr<dp::TextureManager> textures, bool isPrimary,
-                                   bool isOptional) const
+void TextShape::DrawSubStringPlain(ref_ptr<dp::GraphicsContext> context, StraightTextLayout const & layout,
+                                   dp::FontDecl const & font, ref_ptr<dp::Batcher> batcher,
+                                   ref_ptr<dp::TextureManager> textures, bool isPrimary, bool isOptional) const
 {
   gpu::TTextStaticVertexBuffer staticBuffer;
   gpu::TTextDynamicVertexBuffer dynamicBuffer;
@@ -324,18 +315,10 @@ void TextShape::DrawSubStringPlain(ref_ptr<dp::GraphicsContext> context,
   m2::PointF const & pixelSize = layout.GetPixelSize();
 
   dp::OverlayID overlayId(m_params.m_featureId, m_params.m_markId, m_tileCoords, m_textIndex);
-  drape_ptr<StraightTextHandle> handle = make_unique_dp<StraightTextHandle>(overlayId,
-                                                                            layout.GetGlyphs(),
-                                                                            m_params.m_titleDecl.m_anchor,
-                                                                            glsl::ToVec2(m_basePoint),
-                                                                            glsl::vec2(pixelSize.x, pixelSize.y),
-                                                                            finalOffset,
-                                                                            GetOverlayPriority(),
-                                                                            textures,
-                                                                            isOptional,
-                                                                            std::move(dynamicBuffer),
-                                                                            m_params.m_minVisibleScale,
-                                                                            true);
+  drape_ptr<StraightTextHandle> handle = make_unique_dp<StraightTextHandle>(
+      overlayId, layout.GetGlyphs(), m_params.m_titleDecl.m_anchor, glsl::ToVec2(m_basePoint),
+      glsl::vec2(pixelSize.x, pixelSize.y), finalOffset, GetOverlayPriority(), textures, isOptional,
+      std::move(dynamicBuffer), m_params.m_minVisibleScale, true);
   if (m_symbolSizes.size() > 1)
     handle->SetDynamicSymbolSizes(layout, m_symbolSizes, m_symbolAnchor);
   handle->SetPivotZ(m_params.m_posZ);
@@ -356,11 +339,9 @@ void TextShape::DrawSubStringPlain(ref_ptr<dp::GraphicsContext> context,
   batcher->InsertListOfStrip(context, state, make_ref(&provider), std::move(handle), 4);
 }
 
-void TextShape::DrawSubStringOutlined(ref_ptr<dp::GraphicsContext> context,
-                                      StraightTextLayout const & layout, dp::FontDecl const & font,
-                                      ref_ptr<dp::Batcher> batcher,
-                                      ref_ptr<dp::TextureManager> textures, bool isPrimary,
-                                      bool isOptional) const
+void TextShape::DrawSubStringOutlined(ref_ptr<dp::GraphicsContext> context, StraightTextLayout const & layout,
+                                      dp::FontDecl const & font, ref_ptr<dp::Batcher> batcher,
+                                      ref_ptr<dp::TextureManager> textures, bool isPrimary, bool isOptional) const
 {
   gpu::TTextOutlinedStaticVertexBuffer staticBuffer;
   gpu::TTextDynamicVertexBuffer dynamicBuffer;
@@ -386,18 +367,10 @@ void TextShape::DrawSubStringOutlined(ref_ptr<dp::GraphicsContext> context,
   m2::PointF const & pixelSize = layout.GetPixelSize();
 
   dp::OverlayID overlayId(m_params.m_featureId, m_params.m_markId, m_tileCoords, m_textIndex);
-  drape_ptr<StraightTextHandle> handle = make_unique_dp<StraightTextHandle>(overlayId,
-                                                                            layout.GetGlyphs(),
-                                                                            m_params.m_titleDecl.m_anchor,
-                                                                            glsl::ToVec2(m_basePoint),
-                                                                            glsl::vec2(pixelSize.x, pixelSize.y),
-                                                                            finalOffset,
-                                                                            GetOverlayPriority(),
-                                                                            textures,
-                                                                            isOptional,
-                                                                            std::move(dynamicBuffer),
-                                                                            m_params.m_minVisibleScale,
-                                                                            true);
+  drape_ptr<StraightTextHandle> handle = make_unique_dp<StraightTextHandle>(
+      overlayId, layout.GetGlyphs(), m_params.m_titleDecl.m_anchor, glsl::ToVec2(m_basePoint),
+      glsl::vec2(pixelSize.x, pixelSize.y), finalOffset, GetOverlayPriority(), textures, isOptional,
+      std::move(dynamicBuffer), m_params.m_minVisibleScale, true);
   if (m_symbolSizes.size() > 1)
     handle->SetDynamicSymbolSizes(layout, m_symbolSizes, m_symbolAnchor);
   handle->SetPivotZ(m_params.m_posZ);
@@ -419,8 +392,8 @@ void TextShape::DrawSubStringOutlined(ref_ptr<dp::GraphicsContext> context,
 }
 
 // TODO: *Shape classes are concerned with drawing themselves. Its strange they decide/manipulate overlays' priorities
-// in the scene. It seems more logical to set priorities beforehand in the creators of *Shapes and pass on final values only.
-// Check if such a refactoring makes sense.
+// in the scene. It seems more logical to set priorities beforehand in the creators of *Shapes and pass on final values
+// only. Check if such a refactoring makes sense.
 uint64_t TextShape::GetOverlayPriority() const
 {
   // Set up maximum priority for shapes which created by user in the editor and in case of disabling
diff --git a/libs/drape_frontend/text_shape.hpp b/libs/drape_frontend/text_shape.hpp
index b4cbbb068..6090ede76 100644
--- a/libs/drape_frontend/text_shape.hpp
+++ b/libs/drape_frontend/text_shape.hpp
@@ -17,13 +17,13 @@ class StraightTextLayout;
 class TextShape : public MapShape
 {
 public:
-  TextShape(m2::PointD const & basePoint, TextViewParams const & params,
-            TileKey const & tileKey, m2::PointF const & symbolSize, m2::PointF const & symbolOffset,
-            dp::Anchor symbolAnchor, uint32_t textIndex);
+  TextShape(m2::PointD const & basePoint, TextViewParams const & params, TileKey const & tileKey,
+            m2::PointF const & symbolSize, m2::PointF const & symbolOffset, dp::Anchor symbolAnchor,
+            uint32_t textIndex);
 
-  TextShape(m2::PointD const & basePoint, TextViewParams const & params,
-            TileKey const & tileKey, std::vector<m2::PointF> const & symbolSizes,
-            m2::PointF const & symbolOffset, dp::Anchor symbolAnchor, uint32_t textIndex);
+  TextShape(m2::PointD const & basePoint, TextViewParams const & params, TileKey const & tileKey,
+            std::vector<m2::PointF> const & symbolSizes, m2::PointF const & symbolOffset, dp::Anchor symbolAnchor,
+            uint32_t textIndex);
 
   void Draw(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Batcher> batcher,
             ref_ptr<dp::TextureManager> textures) const override;
@@ -33,21 +33,17 @@ public:
   void DisableDisplacing() { m_disableDisplacing = true; }
 
 private:
-  void DrawSubString(ref_ptr<dp::GraphicsContext> context, StraightTextLayout & layout,
-                     dp::FontDecl const & font, glsl::vec2 const & baseOffset,
-                     ref_ptr<dp::Batcher> batcher, ref_ptr<dp::TextureManager> textures,
+  void DrawSubString(ref_ptr<dp::GraphicsContext> context, StraightTextLayout & layout, dp::FontDecl const & font,
+                     glsl::vec2 const & baseOffset, ref_ptr<dp::Batcher> batcher, ref_ptr<dp::TextureManager> textures,
                      bool isPrimary, bool isOptional) const;
 
   void DrawSubStringPlain(ref_ptr<dp::GraphicsContext> context, StraightTextLayout const & layout,
-                          dp::FontDecl const & font,
-                          ref_ptr<dp::Batcher> batcher, ref_ptr<dp::TextureManager> textures,
+                          dp::FontDecl const & font, ref_ptr<dp::Batcher> batcher, ref_ptr<dp::TextureManager> textures,
                           bool isPrimary, bool isOptional) const;
 
-  void DrawSubStringOutlined(ref_ptr<dp::GraphicsContext> context,
-                             StraightTextLayout const & layout, dp::FontDecl const & font,
-                             ref_ptr<dp::Batcher> batcher,
-                             ref_ptr<dp::TextureManager> textures, bool isPrimary,
-                             bool isOptional) const;
+  void DrawSubStringOutlined(ref_ptr<dp::GraphicsContext> context, StraightTextLayout const & layout,
+                             dp::FontDecl const & font, ref_ptr<dp::Batcher> batcher,
+                             ref_ptr<dp::TextureManager> textures, bool isPrimary, bool isOptional) const;
 
   uint64_t GetOverlayPriority() const;
 
diff --git a/libs/drape_frontend/threads_commutator.cpp b/libs/drape_frontend/threads_commutator.cpp
index 81068da2f..8005aa71c 100644
--- a/libs/drape_frontend/threads_commutator.cpp
+++ b/libs/drape_frontend/threads_commutator.cpp
@@ -22,5 +22,4 @@ void ThreadsCommutator::PostMessage(ThreadName name, drape_ptr<Message> && messa
     it->second->PostMessage(std::move(message), priority);
 }
 
-} // namespace df
-
+}  // namespace df
diff --git a/libs/drape_frontend/threads_commutator.hpp b/libs/drape_frontend/threads_commutator.hpp
index 27bbbcb1c..f90d9e2f2 100644
--- a/libs/drape_frontend/threads_commutator.hpp
+++ b/libs/drape_frontend/threads_commutator.hpp
@@ -28,4 +28,4 @@ private:
   TAcceptorsMap m_acceptors;
 };
 
-} // namespace df
+}  // namespace df
diff --git a/libs/drape_frontend/tile_info.cpp b/libs/drape_frontend/tile_info.cpp
index 30fa5bbbd..3f20241e3 100644
--- a/libs/drape_frontend/tile_info.cpp
+++ b/libs/drape_frontend/tile_info.cpp
@@ -11,8 +11,8 @@
 #include "platform/preferred_languages.hpp"
 #include "platform/settings.hpp"
 
-#include "base/scope_guard.hpp"
 #include "base/logging.hpp"
+#include "base/scope_guard.hpp"
 
 #include <algorithm>
 #include <functional>
@@ -21,9 +21,7 @@ using namespace std::placeholders;
 
 namespace df
 {
-TileInfo::TileInfo(drape_ptr<EngineContext> && engineContext)
-  : m_context(std::move(engineContext))
-  , m_isCanceled(false)
+TileInfo::TileInfo(drape_ptr<EngineContext> && engineContext) : m_context(std::move(engineContext)), m_isCanceled(false)
 {}
 
 m2::RectD TileInfo::GetGlobalRect() const
@@ -73,8 +71,8 @@ void TileInfo::ReadFeatures(MapDataProvider const & model)
   {
     std::sort(m_featureInfo.begin(), m_featureInfo.end());
 
-    RuleDrawer drawer(std::bind(&TileInfo::IsCancelled, this), model.m_isCountryLoadedByName,
-                      make_ref(m_context), m_context->GetMapLangIndex());
+    RuleDrawer drawer(std::bind(&TileInfo::IsCancelled, this), model.m_isCountryLoadedByName, make_ref(m_context),
+                      m_context->GetMapLangIndex());
     model.ReadFeatures(std::bind<void>(std::ref(drawer), _1), m_featureInfo);
 #ifdef DRAW_TILE_NET
     drawer.DrawTileNet();
diff --git a/libs/drape_frontend/tile_info.hpp b/libs/drape_frontend/tile_info.hpp
index 3d2c61189..e95368b4b 100644
--- a/libs/drape_frontend/tile_info.hpp
+++ b/libs/drape_frontend/tile_info.hpp
@@ -33,7 +33,7 @@ public:
 
   m2::RectD GetGlobalRect() const;
   TileKey const & GetTileKey() const { return m_context->GetTileKey(); }
-  bool operator <(TileInfo const & other) const { return GetTileKey() < other.GetTileKey(); }
+  bool operator<(TileInfo const & other) const { return GetTileKey() < other.GetTileKey(); }
 
 private:
   void ReadFeatureIndex(MapDataProvider const & model);
diff --git a/libs/drape_frontend/tile_key.cpp b/libs/drape_frontend/tile_key.cpp
old mode 100755
new mode 100644
index 0f1a83586..5b97b7739
--- a/libs/drape_frontend/tile_key.cpp
+++ b/libs/drape_frontend/tile_key.cpp
@@ -18,18 +18,14 @@ uint32_t constexpr GetMask(uint8_t bitsCount)
 }
 }  // namespace
 
-TileKey::TileKey()
-  : m_x(-1), m_y(-1),
-    m_zoomLevel(0),
-    m_generation(0),
-    m_userMarksGeneration(0)
-{}
+TileKey::TileKey() : m_x(-1), m_y(-1), m_zoomLevel(0), m_generation(0), m_userMarksGeneration(0) {}
 
 TileKey::TileKey(int x, int y, uint8_t zoomLevel)
-  : m_x(x), m_y(y),
-    m_zoomLevel(zoomLevel),
-    m_generation(0),
-    m_userMarksGeneration(0)
+  : m_x(x)
+  , m_y(y)
+  , m_zoomLevel(zoomLevel)
+  , m_generation(0)
+  , m_userMarksGeneration(0)
 {}
 
 TileKey::TileKey(TileKey const & key, uint64_t generation, uint64_t userMarksGeneration)
@@ -40,7 +36,7 @@ TileKey::TileKey(TileKey const & key, uint64_t generation, uint64_t userMarksGen
   , m_userMarksGeneration(userMarksGeneration)
 {}
 
-bool TileKey::operator <(TileKey const & other) const
+bool TileKey::operator<(TileKey const & other) const
 {
   if (m_zoomLevel != other.m_zoomLevel)
     return m_zoomLevel < other.m_zoomLevel;
@@ -51,11 +47,9 @@ bool TileKey::operator <(TileKey const & other) const
   return m_x < other.m_x;
 }
 
-bool TileKey::operator ==(TileKey const & other) const
+bool TileKey::operator==(TileKey const & other) const
 {
-  return m_x == other.m_x &&
-         m_y == other.m_y &&
-         m_zoomLevel == other.m_zoomLevel;
+  return m_x == other.m_x && m_y == other.m_y && m_zoomLevel == other.m_zoomLevel;
 }
 
 bool TileKey::LessStrict(TileKey const & other) const
@@ -77,11 +71,8 @@ bool TileKey::LessStrict(TileKey const & other) const
 
 bool TileKey::EqualStrict(TileKey const & other) const
 {
-  return m_x == other.m_x &&
-         m_y == other.m_y &&
-         m_zoomLevel == other.m_zoomLevel &&
-         m_generation == other.m_generation &&
-         m_userMarksGeneration == other.m_userMarksGeneration;
+  return m_x == other.m_x && m_y == other.m_y && m_zoomLevel == other.m_zoomLevel &&
+         m_generation == other.m_generation && m_userMarksGeneration == other.m_userMarksGeneration;
 }
 
 m2::RectD TileKey::GetGlobalRect(bool clipByDataMaxZoom) const
@@ -135,8 +126,7 @@ uint64_t TileKey::GetHashValue(BatcherBucket bucket) const
   auto const umg = static_cast<uint64_t>(m_userMarksGeneration % kGenerationMod);
   auto const g = static_cast<uint64_t>(m_generation % kGenerationMod);
 
-  auto const hash = x | (y << kCoordsBits) | (zoom << (2 * kCoordsBits)) |
-                    (umg << (2 * kCoordsBits + kZoomBits)) |
+  auto const hash = x | (y << kCoordsBits) | (zoom << (2 * kCoordsBits)) | (umg << (2 * kCoordsBits + kZoomBits)) |
                     (g << (2 * kCoordsBits + kZoomBits + kGenerationBits));
 
   return (hash << kBucketBits) | (static_cast<uint64_t>(bucket) & kBucketMask);
@@ -155,9 +145,8 @@ std::string TileKey::Coord2String() const
 std::string DebugPrint(TileKey const & key)
 {
   std::ostringstream out;
-  out << "{ x = " << key.m_x << ", y = " << key.m_y << ", zoomLevel = "
-      << (int)key.m_zoomLevel << ", gen = " << key.m_generation
-      << ", user marks gen = " << key.m_userMarksGeneration << " }";
+  out << "{ x = " << key.m_x << ", y = " << key.m_y << ", zoomLevel = " << (int)key.m_zoomLevel
+      << ", gen = " << key.m_generation << ", user marks gen = " << key.m_userMarksGeneration << " }";
   return out.str();
 }
 }  // namespace df
diff --git a/libs/drape_frontend/tile_key.hpp b/libs/drape_frontend/tile_key.hpp
old mode 100755
new mode 100644
index 79ec89e7c..18eee8540
--- a/libs/drape_frontend/tile_key.hpp
+++ b/libs/drape_frontend/tile_key.hpp
@@ -20,8 +20,8 @@ struct TileKey
   // Operators < and == do not consider parameter m_generation.
   // m_generation is used to determine a generation of geometry for this tile key.
   // Geometry with different generations must be able to group by (x, y, zoomlevel).
-  bool operator < (TileKey const & other) const;
-  bool operator == (TileKey const & other) const;
+  bool operator<(TileKey const & other) const;
+  bool operator==(TileKey const & other) const;
 
   // These methods implement strict comparison of tile keys. It's necessary to merger of
   // batches which must not merge batches with different m_generation.
@@ -48,10 +48,7 @@ struct TileKey
 
 struct TileKeyStrictComparator
 {
-  bool operator() (TileKey const & lhs, TileKey const & rhs) const
-  {
-    return lhs.LessStrict(rhs);
-  }
+  bool operator()(TileKey const & lhs, TileKey const & rhs) const { return lhs.LessStrict(rhs); }
 };
 
 std::string DebugPrint(TileKey const & key);
diff --git a/libs/drape_frontend/tile_utils.cpp b/libs/drape_frontend/tile_utils.cpp
old mode 100755
new mode 100644
index 6e33ddc50..da5676f06
--- a/libs/drape_frontend/tile_utils.cpp
+++ b/libs/drape_frontend/tile_utils.cpp
@@ -34,8 +34,7 @@ CoverageResult CalcTilesCoverage(m2::RectD const & rect, int targetZoom,
 bool IsNeighbours(TileKey const & tileKey1, TileKey const & tileKey2)
 {
   return !((tileKey1.m_x == tileKey2.m_x) && (tileKey1.m_y == tileKey2.m_y)) &&
-         (abs(tileKey1.m_x - tileKey2.m_x) < 2) &&
-         (abs(tileKey1.m_y - tileKey2.m_y) < 2);
+         (abs(tileKey1.m_x - tileKey2.m_x) < 2) && (abs(tileKey1.m_y - tileKey2.m_y) < 2);
 }
 
 int ClipTileZoomByMaxDataZoom(int zoom)
@@ -47,7 +46,6 @@ TileKey GetTileKeyByPoint(m2::PointD const & pt, int zoom)
 {
   ASSERT_GREATER(zoom, 0, ());
   double const rectSize = mercator::Bounds::kRangeX / (1 << (zoom - 1));
-  return TileKey(static_cast<int>(floor(pt.x / rectSize)),
-                 static_cast<int>(floor(pt.y / rectSize)), zoom);
+  return TileKey(static_cast<int>(floor(pt.x / rectSize)), static_cast<int>(floor(pt.y / rectSize)), zoom);
 }
 }  // namespace df
diff --git a/libs/drape_frontend/traffic_generator.cpp b/libs/drape_frontend/traffic_generator.cpp
index d68cb35ee..bed4d4393 100644
--- a/libs/drape_frontend/traffic_generator.cpp
+++ b/libs/drape_frontend/traffic_generator.cpp
@@ -28,28 +28,26 @@ namespace df
 namespace
 {
 // Values of the following arrays are based on traffic-arrow texture.
-static std::array<float, static_cast<size_t>(traffic::SpeedGroup::Count)> kCoordVOffsets =
-{{
-  0.75f,  // G0
-  0.75f,  // G1
-  0.75f,  // G2
-  0.5f,   // G3
-  0.25f,  // G4
-  0.25f,  // G5
-  0.75f,  // TempBlock
-  0.0f,   // Unknown
+static std::array<float, static_cast<size_t>(traffic::SpeedGroup::Count)> kCoordVOffsets = {{
+    0.75f,  // G0
+    0.75f,  // G1
+    0.75f,  // G2
+    0.5f,   // G3
+    0.25f,  // G4
+    0.25f,  // G5
+    0.75f,  // TempBlock
+    0.0f,   // Unknown
 }};
 
-static std::array<float, static_cast<size_t>(traffic::SpeedGroup::Count)> kMinCoordU =
-{{
-  0.15f,  // G0
-  0.15f,  // G1
-  0.15f,  // G2
-  0.33f,  // G3
-  0.5f,   // G4
-  0.0f,   // G5
-  0.15f,  // TempBlock
-  0.0f,   // Unknown
+static std::array<float, static_cast<size_t>(traffic::SpeedGroup::Count)> kMinCoordU = {{
+    0.15f,  // G0
+    0.15f,  // G1
+    0.15f,  // G2
+    0.33f,  // G3
+    0.5f,   // G4
+    0.0f,   // G5
+    0.15f,  // TempBlock
+    0.0f,   // Unknown
 }};
 
 dp::BindingInfo const & GetTrafficStaticBindingInfo()
@@ -93,16 +91,14 @@ dp::BindingInfo const & GetTrafficCircleStaticBindingInfo()
   return *s_info;
 }
 
-void SubmitStaticVertex(glsl::vec3 const & pivot, glsl::vec2 const & normal, float side,
-                        float offsetFromStart, glsl::vec4 const & texCoord,
-                        std::vector<TrafficStaticVertex> & staticGeom)
+void SubmitStaticVertex(glsl::vec3 const & pivot, glsl::vec2 const & normal, float side, float offsetFromStart,
+                        glsl::vec4 const & texCoord, std::vector<TrafficStaticVertex> & staticGeom)
 {
   staticGeom.emplace_back(pivot, TrafficStaticVertex::TNormal(normal, side, offsetFromStart), texCoord);
 }
 
-void SubmitCircleStaticVertices(RoadClass roadClass, glsl::vec3 const & pivot,
-                                glsl::vec2 const & rightNormal, glsl::vec2 const & uv,
-                                std::vector<TrafficCircleStaticVertex> & circlesGeometry)
+void SubmitCircleStaticVertices(RoadClass roadClass, glsl::vec3 const & pivot, glsl::vec2 const & rightNormal,
+                                glsl::vec2 const & uv, std::vector<TrafficCircleStaticVertex> & circlesGeometry)
 {
   // Here we use an equilateral triangle to render circle (incircle of a triangle).
   static float const kSqrt3 = sqrt(3.0f);
@@ -120,8 +116,7 @@ void TrafficGenerator::Init()
   uint32_t constexpr kBatchersCount = 3;
   uint32_t constexpr kBatchSize = 5000;
   m_batchersPool = make_unique_dp<BatchersPool<TrafficBatcherKey, TrafficBatcherKeyComparator>>(
-                                  kBatchersCount, std::bind(&TrafficGenerator::FlushGeometry, this, _1, _2, _3),
-                                  kBatchSize, kBatchSize);
+      kBatchersCount, std::bind(&TrafficGenerator::FlushGeometry, this, _1, _2, _3), kBatchSize, kBatchSize);
 
   uint32_t constexpr kCirclesBatchSize = 1000;
   m_circlesBatcher = make_unique_dp<dp::Batcher>(kCirclesBatchSize, kCirclesBatchSize);
@@ -138,10 +133,8 @@ void TrafficGenerator::ClearContextDependentResources()
   m_circlesBatcher.reset();
 }
 
-void TrafficGenerator::GenerateSegmentsGeometry(ref_ptr<dp::GraphicsContext> context,
-                                                MwmSet::MwmId const & mwmId,
-                                                TileKey const & tileKey,
-                                                TrafficSegmentsGeometryValue const & geometry,
+void TrafficGenerator::GenerateSegmentsGeometry(ref_ptr<dp::GraphicsContext> context, MwmSet::MwmId const & mwmId,
+                                                TileKey const & tileKey, TrafficSegmentsGeometryValue const & geometry,
                                                 traffic::TrafficInfo::Coloring const & coloring,
                                                 ref_ptr<dp::TextureManager> texturesMgr)
 {
@@ -181,19 +174,17 @@ void TrafficGenerator::GenerateSegmentsGeometry(ref_ptr<dp::GraphicsContext> con
     auto const minU = kMinCoordU[static_cast<size_t>(coloringIt->second)];
 
     TrafficSegmentGeometry const & g = geomPair.second;
-    ref_ptr<dp::Batcher> batcher =
-      m_batchersPool->GetBatcher(TrafficBatcherKey(mwmId, tileKey, g.m_roadClass));
+    ref_ptr<dp::Batcher> batcher = m_batchersPool->GetBatcher(TrafficBatcherKey(mwmId, tileKey, g.m_roadClass));
     batcher->SetBatcherHash(tileKey.GetHashValue(BatcherBucket::Traffic));
 
-    auto const finalDepth = kRoadClassDepths[static_cast<size_t>(g.m_roadClass)] +
-                            static_cast<float>(coloringIt->second);
+    auto const finalDepth =
+        kRoadClassDepths[static_cast<size_t>(g.m_roadClass)] + static_cast<float>(coloringIt->second);
 
     int width = 0;
     if (TrafficRenderer::CanBeRenderedAsLine(g.m_roadClass, tileKey.m_zoomLevel, width))
     {
       std::vector<TrafficLineStaticVertex> staticGeometry;
-      GenerateLineSegment(colorRegion, g.m_polyline, tileKey.GetGlobalRect().Center(), finalDepth,
-                          staticGeometry);
+      GenerateLineSegment(colorRegion, g.m_polyline, tileKey.GetGlobalRect().Center(), finalDepth, staticGeometry);
       if (staticGeometry.empty())
         continue;
 
@@ -208,12 +199,11 @@ void TrafficGenerator::GenerateSegmentsGeometry(ref_ptr<dp::GraphicsContext> con
     {
       std::vector<TrafficStaticVertex> staticGeometry;
       bool const generateCircles =
-        (tileKey.m_zoomLevel > kGenerateCirclesZoomLevel[static_cast<uint32_t>(g.m_roadClass)]);
+          (tileKey.m_zoomLevel > kGenerateCirclesZoomLevel[static_cast<uint32_t>(g.m_roadClass)]);
 
       std::vector<TrafficCircleStaticVertex> circlesGeometry;
-      GenerateSegment(g.m_roadClass, colorRegion, g.m_polyline, tileKey.GetGlobalRect().Center(),
-                      generateCircles, finalDepth, vOffset, minU, isLeftHand, staticGeometry,
-                      circlesGeometry);
+      GenerateSegment(g.m_roadClass, colorRegion, g.m_polyline, tileKey.GetGlobalRect().Center(), generateCircles,
+                      finalDepth, vOffset, minU, isLeftHand, staticGeometry, circlesGeometry);
       if (staticGeometry.empty())
         continue;
 
@@ -231,15 +221,12 @@ void TrafficGenerator::GenerateSegmentsGeometry(ref_ptr<dp::GraphicsContext> con
   }
 }
 
-void TrafficGenerator::FlushSegmentsGeometry(ref_ptr<dp::GraphicsContext> context,
-                                             TileKey const & tileKey,
-                                             TrafficSegmentsGeometry const & geom,
-                                             ref_ptr<dp::TextureManager> textures)
+void TrafficGenerator::FlushSegmentsGeometry(ref_ptr<dp::GraphicsContext> context, TileKey const & tileKey,
+                                             TrafficSegmentsGeometry const & geom, ref_ptr<dp::TextureManager> textures)
 {
   FillColorsCache(textures);
 
-  static std::array<RoadClass, 3> const kRoadClasses = {RoadClass::Class0, RoadClass::Class1,
-                                                      RoadClass::Class2};
+  static std::array<RoadClass, 3> const kRoadClasses = {RoadClass::Class0, RoadClass::Class1, RoadClass::Class2};
   for (auto const & g : geom)
   {
     auto const & mwmId = g.first;
@@ -250,12 +237,9 @@ void TrafficGenerator::FlushSegmentsGeometry(ref_ptr<dp::GraphicsContext> contex
     for (auto const & roadClass : kRoadClasses)
       m_batchersPool->ReserveBatcher(TrafficBatcherKey(mwmId, tileKey, roadClass));
 
-    m_circlesBatcher->StartSession([this, mwmId, tileKey](dp::RenderState const & state,
-                                                          drape_ptr<dp::RenderBucket> && renderBucket)
-    {
-      FlushGeometry(TrafficBatcherKey(mwmId, tileKey, RoadClass::Class0), state,
-                    std::move(renderBucket));
-    });
+    m_circlesBatcher->StartSession(
+        [this, mwmId, tileKey](dp::RenderState const & state, drape_ptr<dp::RenderBucket> && renderBucket)
+    { FlushGeometry(TrafficBatcherKey(mwmId, tileKey, RoadClass::Class0), state, std::move(renderBucket)); });
 
     GenerateSegmentsGeometry(context, mwmId, tileKey, g.second, coloringIt->second, textures);
 
@@ -301,11 +285,9 @@ void TrafficGenerator::FlushGeometry(TrafficBatcherKey const & key, dp::RenderSt
   m_flushRenderDataFn(std::move(renderData));
 }
 
-void TrafficGenerator::GenerateSegment(RoadClass roadClass,
-                                       dp::TextureManager::ColorRegion const & colorRegion,
-                                       m2::PolylineD const & polyline,
-                                       m2::PointD const & tileCenter, bool generateCircles,
-                                       float depth, float vOffset, float minU, bool isLeftHand,
+void TrafficGenerator::GenerateSegment(RoadClass roadClass, dp::TextureManager::ColorRegion const & colorRegion,
+                                       m2::PolylineD const & polyline, m2::PointD const & tileCenter,
+                                       bool generateCircles, float depth, float vOffset, float minU, bool isLeftHand,
                                        std::vector<TrafficStaticVertex> & staticGeometry,
                                        std::vector<TrafficCircleStaticVertex> & circlesGeometry)
 {
@@ -361,8 +343,8 @@ void TrafficGenerator::GenerateSegment(RoadClass roadClass,
 
     if (generateCircles && !firstFilled)
     {
-      SubmitCircleStaticVertices(roadClass, glsl::vec3(p1, circleDepth), rightNormal,
-                                 glsl::vec2(uvStart), circlesGeometry);
+      SubmitCircleStaticVertices(roadClass, glsl::vec3(p1, circleDepth), rightNormal, glsl::vec2(uvStart),
+                                 circlesGeometry);
     }
 
     firstFilled = true;
@@ -372,14 +354,14 @@ void TrafficGenerator::GenerateSegment(RoadClass roadClass,
 
   if (generateCircles && firstFilled)
   {
-    SubmitCircleStaticVertices(roadClass, glsl::vec3(lastPoint, circleDepth), lastRightNormal,
-                               glsl::vec2(uvStart), circlesGeometry);
+    SubmitCircleStaticVertices(roadClass, glsl::vec3(lastPoint, circleDepth), lastRightNormal, glsl::vec2(uvStart),
+                               circlesGeometry);
   }
 }
 
 void TrafficGenerator::GenerateLineSegment(dp::TextureManager::ColorRegion const & colorRegion,
-                                           m2::PolylineD const & polyline, m2::PointD const & tileCenter,
-                                           float depth, std::vector<TrafficLineStaticVertex> & staticGeometry)
+                                           m2::PolylineD const & polyline, m2::PointD const & tileCenter, float depth,
+                                           std::vector<TrafficLineStaticVertex> & staticGeometry)
 {
   auto const & path = polyline.GetPoints();
   ASSERT_GREATER(path.size(), 1, ());
@@ -415,28 +397,26 @@ traffic::SpeedGroup TrafficGenerator::CheckColorsSimplification(traffic::SpeedGr
 df::ColorConstant TrafficGenerator::GetColorBySpeedGroup(traffic::SpeedGroup speedGroup, bool route)
 {
   auto constexpr kSpeedGroupsCount = static_cast<size_t>(traffic::SpeedGroup::Count);
-  static std::array<df::ColorConstant, kSpeedGroupsCount> const kColorMap
-  {{
-    "TrafficG0",
-    "TrafficG1",
-    "TrafficG2",
-    "TrafficG3",
-    "TrafficG4",
-    "TrafficG5",
-    "TrafficTempBlock",
-    "TrafficUnknown",
+  static std::array<df::ColorConstant, kSpeedGroupsCount> const kColorMap{{
+      "TrafficG0",
+      "TrafficG1",
+      "TrafficG2",
+      "TrafficG3",
+      "TrafficG4",
+      "TrafficG5",
+      "TrafficTempBlock",
+      "TrafficUnknown",
   }};
 
-  static std::array<df::ColorConstant, kSpeedGroupsCount> const kColorMapRoute
-  {{
-    "RouteTrafficG0",
-    "RouteTrafficG1",
-    "RouteTrafficG2",
-    "RouteTrafficG3",
-    "TrafficG4",
-    "TrafficG5",
-    "TrafficTempBlock",
-    "TrafficUnknown",
+  static std::array<df::ColorConstant, kSpeedGroupsCount> const kColorMapRoute{{
+      "RouteTrafficG0",
+      "RouteTrafficG1",
+      "RouteTrafficG2",
+      "RouteTrafficG3",
+      "TrafficG4",
+      "TrafficG5",
+      "TrafficTempBlock",
+      "TrafficUnknown",
   }};
 
   auto const index = static_cast<size_t>(CheckColorsSimplification(speedGroup));
diff --git a/libs/drape_frontend/traffic_generator.hpp b/libs/drape_frontend/traffic_generator.hpp
index 0ccaf9c91..5c9076d30 100644
--- a/libs/drape_frontend/traffic_generator.hpp
+++ b/libs/drape_frontend/traffic_generator.hpp
@@ -24,7 +24,7 @@
 
 namespace dp
 {
-  class GraphicsContext;
+class GraphicsContext;
 }  // namespace dp
 
 namespace df
@@ -45,8 +45,7 @@ struct TrafficSegmentID
   MwmSet::MwmId m_mwmId;
   traffic::TrafficInfo::RoadSegmentId m_segmentId;
 
-  TrafficSegmentID(MwmSet::MwmId const & mwmId,
-                   traffic::TrafficInfo::RoadSegmentId const & segmentId)
+  TrafficSegmentID(MwmSet::MwmId const & mwmId, traffic::TrafficInfo::RoadSegmentId const & segmentId)
     : m_mwmId(mwmId)
     , m_segmentId(segmentId)
   {}
@@ -77,8 +76,8 @@ struct TrafficSegmentGeometry
   {}
 };
 
-using TrafficSegmentsGeometryValue = std::vector<std::pair<traffic::TrafficInfo::RoadSegmentId,
-                                                           TrafficSegmentGeometry>>;
+using TrafficSegmentsGeometryValue =
+    std::vector<std::pair<traffic::TrafficInfo::RoadSegmentId, TrafficSegmentGeometry>>;
 using TrafficSegmentsGeometry = std::map<MwmSet::MwmId, TrafficSegmentsGeometryValue>;
 using TrafficSegmentsColoring = std::map<MwmSet::MwmId, traffic::TrafficInfo::Coloring>;
 
@@ -107,8 +106,7 @@ struct TrafficStaticVertex
   using TTexCoord = glsl::vec4;
 
   TrafficStaticVertex() = default;
-  TrafficStaticVertex(TPosition const & position, TNormal const & normal,
-                      TTexCoord const & colorTexCoord)
+  TrafficStaticVertex(TPosition const & position, TNormal const & normal, TTexCoord const & colorTexCoord)
     : m_position(position)
     , m_normal(normal)
     , m_colorTexCoord(colorTexCoord)
@@ -141,8 +139,7 @@ struct TrafficCircleStaticVertex
   using TTexCoord = glsl::vec2;
 
   TrafficCircleStaticVertex() = default;
-  TrafficCircleStaticVertex(TPosition const & position, TNormal const & normal,
-                            TTexCoord const & colorTexCoord)
+  TrafficCircleStaticVertex(TPosition const & position, TNormal const & normal, TTexCoord const & colorTexCoord)
     : m_position(position)
     , m_normal(normal)
     , m_colorTexCoord(colorTexCoord)
@@ -212,20 +209,18 @@ private:
   };
 
   void GenerateSegment(RoadClass roadClass, dp::TextureManager::ColorRegion const & colorRegion,
-                       m2::PolylineD const & polyline, m2::PointD const & tileCenter,
-                       bool generateCircles, float depth, float vOffset, float minU,
-                       bool isLeftHand, std::vector<TrafficStaticVertex> & staticGeometry,
+                       m2::PolylineD const & polyline, m2::PointD const & tileCenter, bool generateCircles, float depth,
+                       float vOffset, float minU, bool isLeftHand, std::vector<TrafficStaticVertex> & staticGeometry,
                        std::vector<TrafficCircleStaticVertex> & circlesGeometry);
-  void GenerateLineSegment(dp::TextureManager::ColorRegion const & colorRegion,
-                           m2::PolylineD const & polyline, m2::PointD const & tileCenter, float depth,
+  void GenerateLineSegment(dp::TextureManager::ColorRegion const & colorRegion, m2::PolylineD const & polyline,
+                           m2::PointD const & tileCenter, float depth,
                            std::vector<TrafficLineStaticVertex> & staticGeometry);
   void FillColorsCache(ref_ptr<dp::TextureManager> textures);
 
   void FlushGeometry(TrafficBatcherKey const & key, dp::RenderState const & state,
                      drape_ptr<dp::RenderBucket> && buffer);
   void GenerateSegmentsGeometry(ref_ptr<dp::GraphicsContext> context, MwmSet::MwmId const & mwmId,
-                                TileKey const & tileKey,
-                                TrafficSegmentsGeometryValue const & geometry,
+                                TileKey const & tileKey, TrafficSegmentsGeometryValue const & geometry,
                                 traffic::TrafficInfo::Coloring const & coloring,
                                 ref_ptr<dp::TextureManager> texturesMgr);
 
diff --git a/libs/drape_frontend/traffic_renderer.cpp b/libs/drape_frontend/traffic_renderer.cpp
index 8401f8b8d..4fb566921 100644
--- a/libs/drape_frontend/traffic_renderer.cpp
+++ b/libs/drape_frontend/traffic_renderer.cpp
@@ -13,8 +13,8 @@
 
 #include "base/logging.hpp"
 
-#include <array>
 #include <algorithm>
+#include <array>
 #include <cmath>
 #include <utility>
 
@@ -32,45 +32,35 @@ int constexpr kOutlineMinZoomLevel = 14;
 
 float const kTrafficArrowAspect = 128.0f / 8.0f;
 
-std::array<float, 20> const kLeftWidthInPixel =
-{
-  // 1   2     3     4     5     6     7     8     9    10
-  0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f,
-  //11   12    13   14    15    16    17   18     19    20
-  0.5f, 0.5f, 0.5f, 0.6f, 1.6f, 2.7f, 3.5f, 4.0f, 4.0f, 4.0f
-};
+std::array<float, 20> const kLeftWidthInPixel = {
+    // 1   2     3     4     5     6     7     8     9    10
+    0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f, 0.5f,
+    // 11   12    13   14    15    16    17   18     19    20
+    0.5f, 0.5f, 0.5f, 0.6f, 1.6f, 2.7f, 3.5f, 4.0f, 4.0f, 4.0f};
 
-std::array<float, 20> const kRightWidthInPixel =
-{
-  // 1   2     3     4     5     6     7     8     9    10
-  2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.5f, 3.0f, 3.0f,
-  //11  12    13    14    15    16    17    18    19     20
-  3.0f, 3.5f, 4.0f, 3.9f, 3.2f, 2.7f, 3.5f, 4.0f, 4.0f, 4.0f
-};
+std::array<float, 20> const kRightWidthInPixel = {
+    // 1   2     3     4     5     6     7     8     9    10
+    2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.5f, 3.0f, 3.0f,
+    // 11  12    13    14    15    16    17    18    19     20
+    3.0f, 3.5f, 4.0f, 3.9f, 3.2f, 2.7f, 3.5f, 4.0f, 4.0f, 4.0f};
 
-std::array<float, 20> const kRoadClass1WidthScalar =
-{
-  // 1   2     3     4     5     6     7     8     9    10
-  0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.3,
-  //11  12    13    14    15    16    17    18    19     20
-  0.3, 0.35f, 0.45f, 0.55f, 0.6f, 0.8f, 1.0f, 1.0f, 1.0f, 1.0f
-};
+std::array<float, 20> const kRoadClass1WidthScalar = {
+    // 1   2     3     4     5     6     7     8     9    10
+    0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.3,
+    // 11  12    13    14    15    16    17    18    19     20
+    0.3, 0.35f, 0.45f, 0.55f, 0.6f, 0.8f, 1.0f, 1.0f, 1.0f, 1.0f};
 
-std::array<float, 20> const kRoadClass2WidthScalar =
-{
-  // 1   2     3     4     5     6     7     8     9     10
-  0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.3f,
-  //11  12    13    14    15     16   17    18    19    20
-  0.3f, 0.3f, 0.3f, 0.4f, 0.5f, 0.5f, 0.65f, 0.85f, 0.95f, 1.0f
-};
+std::array<float, 20> const kRoadClass2WidthScalar = {
+    // 1   2     3     4     5     6     7     8     9     10
+    0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.3f,
+    // 11  12    13    14    15     16   17    18    19    20
+    0.3f, 0.3f, 0.3f, 0.4f, 0.5f, 0.5f, 0.65f, 0.85f, 0.95f, 1.0f};
 
-std::array<float, 20> const kTwoWayOffsetInPixel =
-{
-  // 1   2     3     4     5     6     7     8     9     10
-  0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
-  //11  12    13    14    15     16   17    18    19    20
-  0.0f, 0.5f, 0.5f, 0.75f, 1.7f, 2.5f, 2.5f, 2.5f, 2.5f, 2.5f
-};
+std::array<float, 20> const kTwoWayOffsetInPixel = {
+    // 1   2     3     4     5     6     7     8     9     10
+    0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f,
+    // 11  12    13    14    15     16   17    18    19    20
+    0.0f, 0.5f, 0.5f, 0.75f, 1.7f, 2.5f, 2.5f, 2.5f, 2.5f, 2.5f};
 
 std::array<int, 3> const kLineDrawerRoadClass1 = {12, 13, 14};
 
@@ -94,17 +84,14 @@ float CalculateHalfWidth(ScreenBase const & screen, RoadClass const & roadClass,
 }
 }  // namespace
 
-void TrafficRenderer::AddRenderData(ref_ptr<dp::GraphicsContext> context,
-                                    ref_ptr<gpu::ProgramManager> mng,
+void TrafficRenderer::AddRenderData(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
                                     TrafficRenderData && renderData)
 {
   // Remove obsolete render data.
   TileKey const tileKey(renderData.m_tileKey);
-  m_renderData.erase(std::remove_if(m_renderData.begin(), m_renderData.end(),
-                                    [&tileKey](TrafficRenderData const & rd)
-  {
-    return tileKey == rd.m_tileKey && rd.m_tileKey.m_generation < tileKey.m_generation;
-  }), m_renderData.end());
+  m_renderData.erase(std::remove_if(m_renderData.begin(), m_renderData.end(), [&tileKey](TrafficRenderData const & rd)
+  { return tileKey == rd.m_tileKey && rd.m_tileKey.m_generation < tileKey.m_generation; }),
+                     m_renderData.end());
 
   // Add new render data.
   m_renderData.emplace_back(std::move(renderData));
@@ -125,23 +112,23 @@ void TrafficRenderer::OnUpdateViewport(CoverageResult const & coverage, int curr
   {
     return rd.m_tileKey.m_zoomLevel == currentZoomLevel &&
            (rd.m_tileKey.m_x < coverage.m_minTileX || rd.m_tileKey.m_x >= coverage.m_maxTileX ||
-           rd.m_tileKey.m_y < coverage.m_minTileY || rd.m_tileKey.m_y >= coverage.m_maxTileY ||
-           base::IsExist(tilesToDelete, rd.m_tileKey));
-  }), m_renderData.end());
+            rd.m_tileKey.m_y < coverage.m_minTileY || rd.m_tileKey.m_y >= coverage.m_maxTileY ||
+            base::IsExist(tilesToDelete, rd.m_tileKey));
+  }),
+                     m_renderData.end());
 }
 
 void TrafficRenderer::OnGeometryReady(int currentZoomLevel)
 {
-  m_renderData.erase(std::remove_if(m_renderData.begin(), m_renderData.end(),
-                                    [&currentZoomLevel](TrafficRenderData const & rd)
-  {
-    return rd.m_tileKey.m_zoomLevel != currentZoomLevel;
-  }), m_renderData.end());
+  m_renderData.erase(
+      std::remove_if(m_renderData.begin(), m_renderData.end(), [&currentZoomLevel](TrafficRenderData const & rd)
+  { return rd.m_tileKey.m_zoomLevel != currentZoomLevel; }),
+      m_renderData.end());
 }
 
-void TrafficRenderer::RenderTraffic(ref_ptr<dp::GraphicsContext> context,
-                                    ref_ptr<gpu::ProgramManager> mng, ScreenBase const & screen,
-                                    int zoomLevel, float opacity, FrameValues const & frameValues)
+void TrafficRenderer::RenderTraffic(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
+                                    ScreenBase const & screen, int zoomLevel, float opacity,
+                                    FrameValues const & frameValues)
 {
   if (m_renderData.empty() || zoomLevel < kRoadClass0ZoomLevel)
     return;
@@ -215,11 +202,9 @@ void TrafficRenderer::RenderTraffic(ref_ptr<dp::GraphicsContext> context,
       if (zoomLevel < visibleZoomLevel)
         continue;
 
-      float const leftPixelHalfWidth =
-          CalculateHalfWidth(screen, renderData.m_roadClass, true /* left */);
+      float const leftPixelHalfWidth = CalculateHalfWidth(screen, renderData.m_roadClass, true /* left */);
       float const invLeftPixelLength = 1.0f / (2.0f * leftPixelHalfWidth * kTrafficArrowAspect);
-      float const rightPixelHalfWidth =
-          CalculateHalfWidth(screen, renderData.m_roadClass, false /* left */);
+      float const rightPixelHalfWidth = CalculateHalfWidth(screen, renderData.m_roadClass, false /* left */);
       float const kEps = 1e-5;
       if (fabs(leftPixelHalfWidth) < kEps && fabs(rightPixelHalfWidth) < kEps)
         continue;
@@ -255,8 +240,7 @@ void TrafficRenderer::Clear(MwmSet::MwmId const & mwmId)
 {
   auto removePredicate = [&mwmId](TrafficRenderData const & data) { return data.m_mwmId == mwmId; };
 
-  m_renderData.erase(std::remove_if(m_renderData.begin(), m_renderData.end(), removePredicate),
-                                    m_renderData.end());
+  m_renderData.erase(std::remove_if(m_renderData.begin(), m_renderData.end(), removePredicate), m_renderData.end());
 }
 
 // static
@@ -272,9 +256,7 @@ float TrafficRenderer::GetTwoWayOffset(RoadClass const & roadClass, int zoomLeve
   ASSERT_LESS_OR_EQUAL(zoomLevel, scales::GetUpperStyleScale(), ());
   int const index = zoomLevel - 1;
   float const halfWidth = 0.5f * df::TrafficRenderer::GetPixelWidth(roadClass, zoomLevel);
-  return kTwoWayOffsetInPixel[index] *
-             static_cast<float>(VisualParams::Instance().GetVisualScale()) +
-         halfWidth;
+  return kTwoWayOffsetInPixel[index] * static_cast<float>(VisualParams::Instance().GetVisualScale()) + halfWidth;
 }
 
 // static
@@ -310,14 +292,14 @@ bool TrafficRenderer::CanBeRenderedAsLine(RoadClass const & roadClass, int zoomL
   if (roadClass == RoadClass::Class0)
     return false;
 
-  int const *lineDrawer = nullptr;
-  int const *lineDrawerEnd = nullptr;
+  int const * lineDrawer = nullptr;
+  int const * lineDrawerEnd = nullptr;
   if (roadClass == RoadClass::Class1)
-    std::tie(lineDrawer, lineDrawerEnd) = std::make_pair(
-        kLineDrawerRoadClass1.data(), kLineDrawerRoadClass1.data() + kLineDrawerRoadClass1.size());
+    std::tie(lineDrawer, lineDrawerEnd) =
+        std::make_pair(kLineDrawerRoadClass1.data(), kLineDrawerRoadClass1.data() + kLineDrawerRoadClass1.size());
   else if (roadClass == RoadClass::Class2)
-    std::tie(lineDrawer, lineDrawerEnd) = std::make_pair(
-        kLineDrawerRoadClass2.data(), kLineDrawerRoadClass2.data() + kLineDrawerRoadClass2.size());
+    std::tie(lineDrawer, lineDrawerEnd) =
+        std::make_pair(kLineDrawerRoadClass2.data(), kLineDrawerRoadClass2.data() + kLineDrawerRoadClass2.size());
 
   ASSERT(lineDrawer != nullptr, ());
   auto it = std::find(lineDrawer, lineDrawerEnd, zoomLevel);
diff --git a/libs/drape_frontend/traffic_renderer.hpp b/libs/drape_frontend/traffic_renderer.hpp
index e3fbc0c85..796e7ce4e 100644
--- a/libs/drape_frontend/traffic_renderer.hpp
+++ b/libs/drape_frontend/traffic_renderer.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "drape_frontend/frame_values.hpp"
-#include "drape_frontend/traffic_generator.hpp"
 #include "drape_frontend/tile_utils.hpp"
+#include "drape_frontend/traffic_generator.hpp"
 
 #include "shaders/program_manager.hpp"
 
@@ -23,9 +23,8 @@ public:
   void AddRenderData(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
                      TrafficRenderData && renderData);
 
-  void RenderTraffic(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
-                     ScreenBase const & screen, int zoomLevel, float opacity,
-                     FrameValues const & frameValues);
+  void RenderTraffic(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng, ScreenBase const & screen,
+                     int zoomLevel, float opacity, FrameValues const & frameValues);
 
   bool HasRenderData() const { return !m_renderData.empty(); }
 
diff --git a/libs/drape_frontend/transit_scheme_builder.cpp b/libs/drape_frontend/transit_scheme_builder.cpp
index ecd6beb1f..74813b473 100644
--- a/libs/drape_frontend/transit_scheme_builder.cpp
+++ b/libs/drape_frontend/transit_scheme_builder.cpp
@@ -29,13 +29,11 @@ namespace df
 int constexpr kTransitSchemeMinZoomLevel = 10;
 float constexpr kTransitLineHalfWidth = 0.8f;
 float constexpr kTransitLineCasingHalfWidth = 0.5f;
-std::array<float, 20> constexpr kTransitLinesWidthInPixel =
-{
-  // 1   2     3     4     5     6     7     8     9    10
-  1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.25f,
-  //11  12    13    14    15    16    17    18    19     20
-  1.65f, 2.0f, 2.5f, 3.0f, 3.5f, 4.3f, 5.0f, 5.5f, 5.8f, 5.8f
-};
+std::array<float, 20> constexpr kTransitLinesWidthInPixel = {
+    // 1   2     3     4     5     6     7     8     9    10
+    1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.25f,
+    // 11  12    13    14    15    16    17    18    19     20
+    1.65f, 2.0f, 2.5f, 3.0f, 3.5f, 4.3f, 5.0f, 5.5f, 5.8f, 5.8f};
 
 namespace
 {
@@ -73,9 +71,11 @@ struct TransitStaticVertex
   using TColor = glsl::vec4;
 
   TransitStaticVertex() = default;
-  TransitStaticVertex(TPosition const & position, TNormal const & normal,
-                          TColor const & color)
-    : m_position(position), m_normal(normal), m_color(color) {}
+  TransitStaticVertex(TPosition const & position, TNormal const & normal, TColor const & color)
+    : m_position(position)
+    , m_normal(normal)
+    , m_color(color)
+  {}
 
   TPosition m_position;
   TNormal m_normal;
@@ -107,9 +107,8 @@ dp::BindingInfo const & GetTransitStaticBindingInfo()
   return *s_info;
 }
 
-void GenerateLineCaps(ref_ptr<dp::GraphicsContext> context,
-                      std::vector<SchemeSegment> const & segments, glsl::vec4 const & color,
-                      float lineOffset, float halfWidth, float depth, dp::Batcher & batcher)
+void GenerateLineCaps(ref_ptr<dp::GraphicsContext> context, std::vector<SchemeSegment> const & segments,
+                      glsl::vec4 const & color, float lineOffset, float halfWidth, float depth, dp::Batcher & batcher)
 {
   using TV = TransitStaticVertex;
 
@@ -133,8 +132,7 @@ void GenerateLineCaps(ref_ptr<dp::GraphicsContext> context,
   }
 
   dp::AttributeProvider provider(1 /* stream count */, static_cast<uint32_t>(geometry.size()));
-  provider.InitStream(0 /* stream index */, GetTransitStaticBindingInfo(),
-                      make_ref(geometry.data()));
+  provider.InitStream(0 /* stream index */, GetTransitStaticBindingInfo(), make_ref(geometry.data()));
   auto state = CreateRenderState(gpu::Program::TransitCircle, DepthLayer::TransitSchemeLayer);
   batcher.InsertTriangleList(context, state, make_ref(&provider));
 }
@@ -203,8 +201,7 @@ std::vector<TitleInfo> GetTitles(StopNodeParamsPT const & stopParams)
   return titles;
 }
 
-void PlaceTitles(std::vector<TitleInfo> & titles, float textSize,
-                 ref_ptr<dp::TextureManager> textures)
+void PlaceTitles(std::vector<TitleInfo> & titles, float textSize, ref_ptr<dp::TextureManager> textures)
 {
   if (titles.size() < 2)
     return;
@@ -271,11 +268,13 @@ std::vector<m2::PointF> GetTransitMarkerSizes(float markerScale, float maxRouteW
   return markerSizes;
 }
 
-uint32_t GetRouteId(routing::transit::LineId lineId) { return static_cast<uint32_t>(lineId >> 4); }
+uint32_t GetRouteId(routing::transit::LineId lineId)
+{
+  return static_cast<uint32_t>(lineId >> 4);
+}
 
-void FillStopParamsSubway(TransitDisplayInfo const & transitDisplayInfo,
-                          MwmSet::MwmId const & mwmId, routing::transit::Stop const & stop,
-                          StopNodeParamsSubway & stopParams)
+void FillStopParamsSubway(TransitDisplayInfo const & transitDisplayInfo, MwmSet::MwmId const & mwmId,
+                          routing::transit::Stop const & stop, StopNodeParamsSubway & stopParams)
 {
   FeatureID featureId;
   std::string title;
@@ -328,19 +327,16 @@ void FillStopParamsPT(TransitDisplayInfo const & transitDisplayInfo, MwmSet::Mwm
 }
 
 bool FindLongerPath(routing::transit::StopId stop1Id, routing::transit::StopId stop2Id,
-                    std::vector<routing::transit::StopId> const & sameStops, size_t & stop1Ind,
-                    size_t & stop2Ind)
+                    std::vector<routing::transit::StopId> const & sameStops, size_t & stop1Ind, size_t & stop2Ind)
 {
   stop1Ind = std::numeric_limits<size_t>::max();
   stop2Ind = std::numeric_limits<size_t>::max();
 
   for (size_t stopInd = 0; stopInd < sameStops.size(); ++stopInd)
-  {
     if (sameStops[stopInd] == stop1Id)
       stop1Ind = stopInd;
     else if (sameStops[stopInd] == stop2Id)
       stop2Ind = stopInd;
-  }
 
   if (stop1Ind < sameStops.size() || stop2Ind < sameStops.size())
   {
@@ -405,15 +401,13 @@ void TransitSchemeBuilder::Clear(MwmSet::MwmId const & mwmId)
   m_schemes.erase(mwmId);
 }
 
-void TransitSchemeBuilder::RebuildSchemes(ref_ptr<dp::GraphicsContext> context,
-                                          ref_ptr<dp::TextureManager> textures)
+void TransitSchemeBuilder::RebuildSchemes(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::TextureManager> textures)
 {
   for (auto const & mwmScheme : m_schemes)
     BuildScheme(context, mwmScheme.first, textures);
 }
 
-void TransitSchemeBuilder::BuildScheme(ref_ptr<dp::GraphicsContext> context,
-                                       MwmSet::MwmId const & mwmId,
+void TransitSchemeBuilder::BuildScheme(ref_ptr<dp::GraphicsContext> context, MwmSet::MwmId const & mwmId,
                                        ref_ptr<dp::TextureManager> textures)
 {
   if (m_schemes.find(mwmId) == m_schemes.end())
@@ -429,10 +423,8 @@ void TransitSchemeBuilder::GenerateLinesSubway(MwmSchemeData const & scheme, dp:
 {
   for (auto const & shape : scheme.m_shapesSubway)
   {
-    size_t const linesCount =
-        shape.second.m_forwardLines.size() + shape.second.m_backwardLines.size();
-    float shapeOffset =
-        -static_cast<float>(linesCount / 2) * 2.0f - static_cast<float>(linesCount % 2) + 1.0f;
+    size_t const linesCount = shape.second.m_forwardLines.size() + shape.second.m_backwardLines.size();
+    float shapeOffset = -static_cast<float>(linesCount / 2) * 2.0f - static_cast<float>(linesCount % 2) + 1.0f;
     float constexpr shapeOffsetIncrement = 2.0f;
 
     std::vector<std::pair<dp::Color, routing::transit::LineId>> coloredLines;
@@ -445,8 +437,7 @@ void TransitSchemeBuilder::GenerateLinesSubway(MwmSchemeData const & scheme, dp:
       coloredLines.emplace_back(color, lineId);
     }
 
-    for (auto it = shape.second.m_backwardLines.rbegin(); it != shape.second.m_backwardLines.rend();
-         ++it)
+    for (auto it = shape.second.m_backwardLines.rbegin(); it != shape.second.m_backwardLines.rend(); ++it)
     {
       auto const & lineColor = scheme.m_linesSubway.at(*it).m_color;
       auto const colorName = df::GetTransitColorName(lineColor);
@@ -460,8 +451,8 @@ void TransitSchemeBuilder::GenerateLinesSubway(MwmSchemeData const & scheme, dp:
       auto const & lineId = coloredLine.second;
       auto const depth = scheme.m_linesSubway.at(lineId).m_depth;
 
-      GenerateLine(context, shape.second.m_polyline, scheme.m_pivot, colorConst, shapeOffset,
-                   kTransitLineHalfWidth, depth, batcher);
+      GenerateLine(context, shape.second.m_polyline, scheme.m_pivot, colorConst, shapeOffset, kTransitLineHalfWidth,
+                   depth, batcher);
       GenerateLine(context, shape.second.m_polyline, scheme.m_pivot, kCasingColor, shapeOffset,
                    kTransitLineHalfWidth + kTransitLineCasingHalfWidth, kCasingLineDepth, batcher);
 
@@ -480,8 +471,8 @@ void TransitSchemeBuilder::GenerateLinesPT(MwmSchemeData const & scheme, dp::Bat
     for (auto const & routeData : data.m_routeShapes)
     {
       float const offset = static_cast<float>(routeData.m_order);
-      GenerateLine(context, routeData.m_polyline, scheme.m_pivot, color, offset,
-                   kTransitLineHalfWidth, data.m_depth, batcher);
+      GenerateLine(context, routeData.m_polyline, scheme.m_pivot, color, offset, kTransitLineHalfWidth, data.m_depth,
+                   batcher);
     }
   }
 }
@@ -520,12 +511,10 @@ void TransitSchemeBuilder::CollectStopsSubway(TransitDisplayInfo const & transit
   }
 }
 
-void TransitSchemeBuilder::CollectStopsPT(TransitDisplayInfo const & transitDisplayInfo,
-                                          LinesDataPT const & linesData,
+void TransitSchemeBuilder::CollectStopsPT(TransitDisplayInfo const & transitDisplayInfo, LinesDataPT const & linesData,
                                           MwmSet::MwmId const & mwmId, MwmSchemeData & scheme)
 {
-  CHECK_EQUAL(transitDisplayInfo.m_transitVersion, ::transit::TransitVersion::AllPublicTransport,
-              ());
+  CHECK_EQUAL(transitDisplayInfo.m_transitVersion, ::transit::TransitVersion::AllPublicTransport, ());
 
   for (auto const & [stopId, lineIds] : linesData.m_stopToLineIds)
   {
@@ -568,8 +557,7 @@ void TransitSchemeBuilder::CollectStopsPT(TransitDisplayInfo const & transitDisp
   }
 }
 
-void TransitSchemeBuilder::CollectLinesSubway(TransitDisplayInfo const & transitDisplayInfo,
-                                              MwmSchemeData & scheme)
+void TransitSchemeBuilder::CollectLinesSubway(TransitDisplayInfo const & transitDisplayInfo, MwmSchemeData & scheme)
 {
   CHECK_EQUAL(transitDisplayInfo.m_transitVersion, ::transit::TransitVersion::OnlySubway, ());
 
@@ -588,18 +576,15 @@ void TransitSchemeBuilder::CollectLinesSubway(TransitDisplayInfo const & transit
   {
     auto const lineId = pair.second;
 
-    scheme.m_linesSubway[lineId] =
-        LineParams(transitDisplayInfo.m_linesSubway.at(lineId).GetColor(), depth);
+    scheme.m_linesSubway[lineId] = LineParams(transitDisplayInfo.m_linesSubway.at(lineId).GetColor(), depth);
 
     depth += kDepthPerLine;
   }
 }
 
-LinesDataPT TransitSchemeBuilder::CollectLinesPT(TransitDisplayInfo const & transitDisplayInfo,
-                                                 MwmSchemeData & scheme)
+LinesDataPT TransitSchemeBuilder::CollectLinesPT(TransitDisplayInfo const & transitDisplayInfo, MwmSchemeData & scheme)
 {
-  CHECK_EQUAL(transitDisplayInfo.m_transitVersion, ::transit::TransitVersion::AllPublicTransport,
-              ());
+  CHECK_EQUAL(transitDisplayInfo.m_transitVersion, ::transit::TransitVersion::AllPublicTransport, ());
 
   LinesDataPT linesData;
 
@@ -639,8 +624,7 @@ LinesDataPT TransitSchemeBuilder::CollectLinesPT(TransitDisplayInfo const & tran
   return linesData;
 }
 
-void TransitSchemeBuilder::CollectShapesSubway(TransitDisplayInfo const & transitDisplayInfo,
-                                               MwmSchemeData & scheme)
+void TransitSchemeBuilder::CollectShapesSubway(TransitDisplayInfo const & transitDisplayInfo, MwmSchemeData & scheme)
 {
   CHECK_EQUAL(transitDisplayInfo.m_transitVersion, ::transit::TransitVersion::OnlySubway, ());
 
@@ -660,18 +644,14 @@ void TransitSchemeBuilder::CollectShapesSubway(TransitDisplayInfo const & transi
 
     auto const & stopsRanges = line.second.GetStopIds();
     for (auto const & stops : stopsRanges)
-    {
       for (size_t i = 1; i < stops.size(); ++i)
         FindShapes(stops[i - 1], stops[i], lineId, roads[roadId], transitDisplayInfo, scheme);
-    }
   }
 }
 
-void TransitSchemeBuilder::CollectShapesPT(TransitDisplayInfo const & transitDisplayInfo,
-                                           MwmSchemeData & scheme)
+void TransitSchemeBuilder::CollectShapesPT(TransitDisplayInfo const & transitDisplayInfo, MwmSchemeData & scheme)
 {
-  CHECK_EQUAL(transitDisplayInfo.m_transitVersion, ::transit::TransitVersion::AllPublicTransport,
-              ());
+  CHECK_EQUAL(transitDisplayInfo.m_transitVersion, ::transit::TransitVersion::AllPublicTransport, ());
 
   float curDepth = kBaseLineDepth;
   std::unordered_map<std::string, float> routeColorToDepth;
@@ -704,8 +684,7 @@ void TransitSchemeBuilder::CollectShapesPT(TransitDisplayInfo const & transitDis
     for (auto const & part : metaData.GetLineSegmentsOrder())
     {
       RouteSegment rs;
-      rs.m_polyline =
-          ::transit::GetPolylinePart(shape, part.m_segment.m_startIdx, part.m_segment.m_endIdx);
+      rs.m_polyline = ::transit::GetPolylinePart(shape, part.m_segment.m_startIdx, part.m_segment.m_endIdx);
       rs.m_order = part.m_order;
       routeData.m_routeShapes.push_back(rs);
     }
@@ -714,12 +693,10 @@ void TransitSchemeBuilder::CollectShapesPT(TransitDisplayInfo const & transitDis
   }
 }
 
-void TransitSchemeBuilder::FindShapes(routing::transit::StopId stop1Id,
-                                      routing::transit::StopId stop2Id,
+void TransitSchemeBuilder::FindShapes(routing::transit::StopId stop1Id, routing::transit::StopId stop2Id,
                                       routing::transit::LineId lineId,
                                       std::vector<routing::transit::LineId> const & sameLines,
-                                      TransitDisplayInfo const & transitDisplayInfo,
-                                      MwmSchemeData & scheme)
+                                      TransitDisplayInfo const & transitDisplayInfo, MwmSchemeData & scheme)
 {
   bool shapeAdded = false;
 
@@ -752,10 +729,8 @@ void TransitSchemeBuilder::FindShapes(routing::transit::StopId stop1Id,
     AddShape(transitDisplayInfo, stop1Id, stop2Id, lineId, scheme);
 }
 
-void TransitSchemeBuilder::AddShape(TransitDisplayInfo const & transitDisplayInfo,
-                                    routing::transit::StopId stop1Id,
-                                    routing::transit::StopId stop2Id,
-                                    routing::transit::LineId lineId,
+void TransitSchemeBuilder::AddShape(TransitDisplayInfo const & transitDisplayInfo, routing::transit::StopId stop1Id,
+                                    routing::transit::StopId stop2Id, routing::transit::LineId lineId,
                                     MwmSchemeData & scheme)
 {
   auto const stop1It = transitDisplayInfo.m_stopsSubway.find(stop1Id);
@@ -767,10 +742,8 @@ void TransitSchemeBuilder::AddShape(TransitDisplayInfo const & transitDisplayInf
   auto const transfer1Id = stop1It->second.GetTransferId();
   auto const transfer2Id = stop2It->second.GetTransferId();
 
-  auto shapeId = routing::transit::ShapeId(transfer1Id != routing::transit::kInvalidTransferId ? transfer1Id
-                                                                                               : stop1Id,
-                                           transfer2Id != routing::transit::kInvalidTransferId ? transfer2Id
-                                                                                               : stop2Id);
+  auto shapeId = routing::transit::ShapeId(transfer1Id != routing::transit::kInvalidTransferId ? transfer1Id : stop1Id,
+                                           transfer2Id != routing::transit::kInvalidTransferId ? transfer2Id : stop2Id);
   auto it = transitDisplayInfo.m_shapesSubway.find(shapeId);
   bool isForward = true;
   if (it == transitDisplayInfo.m_shapesSubway.end())
@@ -796,15 +769,11 @@ void TransitSchemeBuilder::AddShape(TransitDisplayInfo const & transitDisplayInf
   else
   {
     for (auto id : itScheme->second.m_forwardLines)
-    {
       if (GetRouteId(id) == GetRouteId(lineId))
         return;
-    }
     for (auto id : itScheme->second.m_backwardLines)
-    {
       if (GetRouteId(id) == GetRouteId(lineId))
         return;
-    }
 
     if (isForward)
       itScheme->second.m_forwardLines.push_back(lineId);
@@ -821,14 +790,12 @@ void TransitSchemeBuilder::PrepareSchemeSubway(MwmSchemeData & scheme)
   {
     auto const stop1 = shape.first.GetStop1Id();
     auto const stop2 = shape.first.GetStop2Id();
-    StopNodeParamsSubway & params1 =
-        (scheme.m_stopsSubway.find(stop1) == scheme.m_stopsSubway.end())
-            ? scheme.m_transfersSubway[stop1]
-            : scheme.m_stopsSubway[stop1];
-    StopNodeParamsSubway & params2 =
-        (scheme.m_stopsSubway.find(stop2) == scheme.m_stopsSubway.end())
-            ? scheme.m_transfersSubway[stop2]
-            : scheme.m_stopsSubway[stop2];
+    StopNodeParamsSubway & params1 = (scheme.m_stopsSubway.find(stop1) == scheme.m_stopsSubway.end())
+                                       ? scheme.m_transfersSubway[stop1]
+                                       : scheme.m_stopsSubway[stop1];
+    StopNodeParamsSubway & params2 = (scheme.m_stopsSubway.find(stop2) == scheme.m_stopsSubway.end())
+                                       ? scheme.m_transfersSubway[stop2]
+                                       : scheme.m_stopsSubway[stop2];
 
     auto const linesCount = shape.second.m_forwardLines.size() + shape.second.m_backwardLines.size();
 
@@ -857,8 +824,7 @@ void UpdateShapeInfos(std::vector<ShapeInfoPT> & shapeInfos, m2::PointD const &
 
   for (ShapeInfoPT & info : shapeInfos)
   {
-    if (AlmostEqualAbs(info.m_direction, newDir, kEps) ||
-        AlmostEqualAbs(info.m_direction, newDirReverse, kEps))
+    if (AlmostEqualAbs(info.m_direction, newDir, kEps) || AlmostEqualAbs(info.m_direction, newDirReverse, kEps))
     {
       for (auto const & color : colors)
         info.m_colors.insert(color);
@@ -869,14 +835,12 @@ void UpdateShapeInfos(std::vector<ShapeInfoPT> & shapeInfos, m2::PointD const &
   shapeInfos.push_back(ShapeInfoPT(newDir, colors));
 }
 
-void UpdateShapeInfos(std::vector<ShapeInfoPT> & shapeInfos, m2::PointD const & newDir,
-                      std::string const & color)
+void UpdateShapeInfos(std::vector<ShapeInfoPT> & shapeInfos, m2::PointD const & newDir, std::string const & color)
 {
   UpdateShapeInfos(shapeInfos, newDir, std::set<std::string>{color});
 }
 
-StopNodeParamsPT & TransitSchemeBuilder::GetStopOrTransfer(MwmSchemeData & scheme,
-                                                           ::transit::TransitId id)
+StopNodeParamsPT & TransitSchemeBuilder::GetStopOrTransfer(MwmSchemeData & scheme, ::transit::TransitId id)
 {
   auto itStop = scheme.m_stopsPT.find(id);
   if (itStop != scheme.m_stopsPT.end())
@@ -885,15 +849,14 @@ StopNodeParamsPT & TransitSchemeBuilder::GetStopOrTransfer(MwmSchemeData & schem
   return scheme.m_transfersPT[id];
 }
 
-void TransitSchemeBuilder::PrepareSchemePT(TransitDisplayInfo const & transitDisplayInfo,
-                                           LinesDataPT const & lineData, MwmSchemeData & scheme)
+void TransitSchemeBuilder::PrepareSchemePT(TransitDisplayInfo const & transitDisplayInfo, LinesDataPT const & lineData,
+                                           MwmSchemeData & scheme)
 {
   m2::RectD boundingRect;
 
   for (auto const & [lineId, lineData] : scheme.m_linesPT)
   {
-    if (transitDisplayInfo.m_linesMetadataPT.find(lineId) ==
-        transitDisplayInfo.m_linesMetadataPT.end())
+    if (transitDisplayInfo.m_linesMetadataPT.find(lineId) == transitDisplayInfo.m_linesMetadataPT.end())
       continue;
 
     auto const & color = lineData.m_color;
@@ -929,8 +892,7 @@ void TransitSchemeBuilder::PrepareSchemePT(TransitDisplayInfo const & transitDis
 
         auto const & polyline = itShape->second.GetPolyline();
 
-        auto const [startIndex, endIndex] =
-            std::minmax(shapeLink.m_startIndex, shapeLink.m_endIndex);
+        auto const [startIndex, endIndex] = std::minmax(shapeLink.m_startIndex, shapeLink.m_endIndex);
 
         dir1 = (polyline[startIndex + 1] - polyline[startIndex]).Normalize();
         dir2 = (polyline[endIndex] - polyline[endIndex - 1]).Normalize();
@@ -978,8 +940,7 @@ void TransitSchemeBuilder::PrepareSchemePT(TransitDisplayInfo const & transitDis
   scheme.m_pivot = boundingRect.Center();
 }
 
-void TransitSchemeBuilder::GenerateShapes(ref_ptr<dp::GraphicsContext> context,
-                                          MwmSet::MwmId const & mwmId)
+void TransitSchemeBuilder::GenerateShapes(ref_ptr<dp::GraphicsContext> context, MwmSet::MwmId const & mwmId)
 {
   MwmSchemeData const & scheme = m_schemes[mwmId];
 
@@ -987,16 +948,15 @@ void TransitSchemeBuilder::GenerateShapes(ref_ptr<dp::GraphicsContext> context,
   dp::Batcher batcher(kBatchSize, kBatchSize);
   batcher.SetBatcherHash(static_cast<uint64_t>(BatcherBucket::Transit));
   {
-    dp::SessionGuard guard(
-        context, batcher,
-        [this, &mwmId, &scheme](dp::RenderState const & state, drape_ptr<dp::RenderBucket> && b) {
-          TransitRenderData::Type type = TransitRenderData::Type::Lines;
-          if (state.GetProgram<gpu::Program>() == gpu::Program::TransitCircle)
-            type = TransitRenderData::Type::LinesCaps;
-          TransitRenderData renderData(type, state, m_recacheId, mwmId, scheme.m_pivot,
-                                       std::move(b));
-          m_flushRenderDataFn(std::move(renderData));
-        });
+    dp::SessionGuard guard(context, batcher,
+                           [this, &mwmId, &scheme](dp::RenderState const & state, drape_ptr<dp::RenderBucket> && b)
+    {
+      TransitRenderData::Type type = TransitRenderData::Type::Lines;
+      if (state.GetProgram<gpu::Program>() == gpu::Program::TransitCircle)
+        type = TransitRenderData::Type::LinesCaps;
+      TransitRenderData renderData(type, state, m_recacheId, mwmId, scheme.m_pivot, std::move(b));
+      m_flushRenderDataFn(std::move(renderData));
+    });
 
     if (scheme.m_transitVersion == ::transit::TransitVersion::OnlySubway)
       GenerateLinesSubway(scheme, batcher, context);
@@ -1012,11 +972,9 @@ void TransitSchemeBuilder::GenerateShapes(ref_ptr<dp::GraphicsContext> context,
 
 template <class F, class S, class T, class L>
 void TransitSchemeBuilder::GenerateLocationsWithTitles(ref_ptr<dp::GraphicsContext> context,
-                                                       ref_ptr<dp::TextureManager> textures,
-                                                       dp::Batcher & batcher, F && flusher,
-                                                       MwmSchemeData const & scheme,
-                                                       S const & stops, T const & transfers,
-                                                       L const & lines)
+                                                       ref_ptr<dp::TextureManager> textures, dp::Batcher & batcher,
+                                                       F && flusher, MwmSchemeData const & scheme, S const & stops,
+                                                       T const & transfers, L const & lines)
 {
   dp::SessionGuard guard(context, batcher, flusher);
 
@@ -1035,19 +993,17 @@ void TransitSchemeBuilder::GenerateLocationsWithTitles(ref_ptr<dp::GraphicsConte
   for (auto const & transfer : transfers)
   {
     GenerateTransfer(context, transfer.second, scheme.m_pivot, batcher);
-    GenerateTitles(context, transfer.second, scheme.m_pivot, transferMarkerSizes, textures,
-                   batcher);
+    GenerateTitles(context, transfer.second, scheme.m_pivot, transferMarkerSizes, textures, batcher);
   }
 }
 
-void TransitSchemeBuilder::GenerateStops(ref_ptr<dp::GraphicsContext> context,
-                                         MwmSet::MwmId const & mwmId,
+void TransitSchemeBuilder::GenerateStops(ref_ptr<dp::GraphicsContext> context, MwmSet::MwmId const & mwmId,
                                          ref_ptr<dp::TextureManager> textures)
 {
   MwmSchemeData const & scheme = m_schemes[mwmId];
 
-  auto const flusher = [this, &mwmId, &scheme](dp::RenderState const & state,
-                                               drape_ptr<dp::RenderBucket> && b) {
+  auto const flusher = [this, &mwmId, &scheme](dp::RenderState const & state, drape_ptr<dp::RenderBucket> && b)
+  {
     TransitRenderData::Type type = TransitRenderData::Type::Stubs;
     if (state.GetProgram<gpu::Program>() == gpu::Program::TransitMarker)
       type = TransitRenderData::Type::Markers;
@@ -1069,8 +1025,8 @@ void TransitSchemeBuilder::GenerateStops(ref_ptr<dp::GraphicsContext> context,
   }
   else if (scheme.m_transitVersion == ::transit::TransitVersion::AllPublicTransport)
   {
-    GenerateLocationsWithTitles(context, textures, batcher, flusher, scheme, scheme.m_stopsPT,
-                                scheme.m_transfersPT, scheme.m_linesPT);
+    GenerateLocationsWithTitles(context, textures, batcher, flusher, scheme, scheme.m_stopsPT, scheme.m_transfersPT,
+                                scheme.m_linesPT);
   }
   else
   {
@@ -1079,11 +1035,10 @@ void TransitSchemeBuilder::GenerateStops(ref_ptr<dp::GraphicsContext> context,
   }
 }
 
-void TransitSchemeBuilder::GenerateMarker(ref_ptr<dp::GraphicsContext> context,
-                                          m2::PointD const & pt, m2::PointD widthDir,
-                                          float linesCountWidth, float linesCountHeight,
-                                          float scaleWidth, float scaleHeight, float depth,
-                                          dp::Color const & color, dp::Batcher & batcher)
+void TransitSchemeBuilder::GenerateMarker(ref_ptr<dp::GraphicsContext> context, m2::PointD const & pt,
+                                          m2::PointD widthDir, float linesCountWidth, float linesCountHeight,
+                                          float scaleWidth, float scaleHeight, float depth, dp::Color const & color,
+                                          dp::Batcher & batcher)
 {
   using TV = TransitStaticVertex;
 
@@ -1093,47 +1048,38 @@ void TransitSchemeBuilder::GenerateMarker(ref_ptr<dp::GraphicsContext> context,
   widthDir.y = -widthDir.y;
   m2::PointD heightDir = widthDir.Ort();
 
-  auto const v1 =
-      -widthDir * scaleWidth * linesCountWidth - heightDir * scaleHeight * linesCountHeight;
-  auto const v2 =
-      widthDir * scaleWidth * linesCountWidth - heightDir * scaleHeight * linesCountHeight;
-  auto const v3 =
-      widthDir * scaleWidth * linesCountWidth + heightDir * scaleHeight * linesCountHeight;
-  auto const v4 =
-      -widthDir * scaleWidth * linesCountWidth + heightDir * scaleHeight * linesCountHeight;
+  auto const v1 = -widthDir * scaleWidth * linesCountWidth - heightDir * scaleHeight * linesCountHeight;
+  auto const v2 = widthDir * scaleWidth * linesCountWidth - heightDir * scaleHeight * linesCountHeight;
+  auto const v3 = widthDir * scaleWidth * linesCountWidth + heightDir * scaleHeight * linesCountHeight;
+  auto const v4 = -widthDir * scaleWidth * linesCountWidth + heightDir * scaleHeight * linesCountHeight;
 
   glsl::vec3 const pos(pt.x, pt.y, depth);
-  auto const colorVal =
-      glsl::vec4(color.GetRedF(), color.GetGreenF(), color.GetBlueF(), 1.0f /* alpha */);
+  auto const colorVal = glsl::vec4(color.GetRedF(), color.GetGreenF(), color.GetBlueF(), 1.0f /* alpha */);
 
   TGeometryBuffer geometry;
   geometry.reserve(6);
-  geometry.emplace_back(pos, TV::TNormal(v1.x, v1.y, -linesCountWidth, -linesCountHeight),
-                        colorVal);
+  geometry.emplace_back(pos, TV::TNormal(v1.x, v1.y, -linesCountWidth, -linesCountHeight), colorVal);
   geometry.emplace_back(pos, TV::TNormal(v2.x, v2.y, linesCountWidth, -linesCountHeight), colorVal);
   geometry.emplace_back(pos, TV::TNormal(v3.x, v3.y, linesCountWidth, linesCountHeight), colorVal);
-  geometry.emplace_back(pos, TV::TNormal(v1.x, v1.y, -linesCountWidth, -linesCountHeight),
-                        colorVal);
+  geometry.emplace_back(pos, TV::TNormal(v1.x, v1.y, -linesCountWidth, -linesCountHeight), colorVal);
   geometry.emplace_back(pos, TV::TNormal(v3.x, v3.y, linesCountWidth, linesCountHeight), colorVal);
   geometry.emplace_back(pos, TV::TNormal(v4.x, v4.y, -linesCountWidth, linesCountHeight), colorVal);
 
   dp::AttributeProvider provider(1 /* stream count */, static_cast<uint32_t>(geometry.size()));
-  provider.InitStream(0 /* stream index */, GetTransitStaticBindingInfo(),
-                      make_ref(geometry.data()));
+  provider.InitStream(0 /* stream index */, GetTransitStaticBindingInfo(), make_ref(geometry.data()));
   auto state = CreateRenderState(gpu::Program::TransitMarker, DepthLayer::TransitSchemeLayer);
   batcher.InsertTriangleList(context, state, make_ref(&provider));
 }
 
-void TransitSchemeBuilder::GenerateLine(ref_ptr<dp::GraphicsContext> context,
-                                        std::vector<m2::PointD> const & path,
-                                        m2::PointD const & pivot, dp::Color const & colorConst,
-                                        float lineOffset, float halfWidth, float depth,
-                                        dp::Batcher & batcher)
+void TransitSchemeBuilder::GenerateLine(ref_ptr<dp::GraphicsContext> context, std::vector<m2::PointD> const & path,
+                                        m2::PointD const & pivot, dp::Color const & colorConst, float lineOffset,
+                                        float halfWidth, float depth, dp::Batcher & batcher)
 {
   using TV = TransitStaticVertex;
 
   TGeometryBuffer geometry;
-  auto const color = glsl::vec4(colorConst.GetRedF(), colorConst.GetGreenF(), colorConst.GetBlueF(), colorConst.GetAlphaF());
+  auto const color =
+      glsl::vec4(colorConst.GetRedF(), colorConst.GetGreenF(), colorConst.GetBlueF(), colorConst.GetAlphaF());
   size_t const kAverageSize = path.size() * 6;
   size_t const kAverageCapSize = 12;
   geometry.reserve(kAverageSize + kAverageCapSize * 2);
@@ -1156,36 +1102,28 @@ void TransitSchemeBuilder::GenerateLine(ref_ptr<dp::GraphicsContext> context,
     auto const endPivot = glsl::vec3(segment.m_p2, depth);
     auto const offset = lineOffset * segment.m_rightNormal;
 
-    geometry.emplace_back(startPivot,
-                          TV::TNormal(segment.m_rightNormal * halfWidth - offset, -halfWidth, 0.0),
-                          color);
-    geometry.emplace_back(
-        startPivot, TV::TNormal(segment.m_leftNormal * halfWidth - offset, halfWidth, 0.0), color);
-    geometry.emplace_back(
-        endPivot, TV::TNormal(segment.m_rightNormal * halfWidth - offset, -halfWidth, 0.0), color);
-    geometry.emplace_back(
-        endPivot, TV::TNormal(segment.m_rightNormal * halfWidth - offset, -halfWidth, 0.0), color);
-    geometry.emplace_back(
-        startPivot, TV::TNormal(segment.m_leftNormal * halfWidth - offset, halfWidth, 0.0), color);
-    geometry.emplace_back(
-        endPivot, TV::TNormal(segment.m_leftNormal * halfWidth - offset, halfWidth, 0.0), color);
+    geometry.emplace_back(startPivot, TV::TNormal(segment.m_rightNormal * halfWidth - offset, -halfWidth, 0.0), color);
+    geometry.emplace_back(startPivot, TV::TNormal(segment.m_leftNormal * halfWidth - offset, halfWidth, 0.0), color);
+    geometry.emplace_back(endPivot, TV::TNormal(segment.m_rightNormal * halfWidth - offset, -halfWidth, 0.0), color);
+    geometry.emplace_back(endPivot, TV::TNormal(segment.m_rightNormal * halfWidth - offset, -halfWidth, 0.0), color);
+    geometry.emplace_back(startPivot, TV::TNormal(segment.m_leftNormal * halfWidth - offset, halfWidth, 0.0), color);
+    geometry.emplace_back(endPivot, TV::TNormal(segment.m_leftNormal * halfWidth - offset, halfWidth, 0.0), color);
 
     segments.emplace_back(std::move(segment));
   }
 
   dp::AttributeProvider provider(1 /* stream count */, static_cast<uint32_t>(geometry.size()));
-  provider.InitStream(0 /* stream index */, GetTransitStaticBindingInfo(),
-                      make_ref(geometry.data()));
+  provider.InitStream(0 /* stream index */, GetTransitStaticBindingInfo(), make_ref(geometry.data()));
   auto state = CreateRenderState(gpu::Program::Transit, DepthLayer::TransitSchemeLayer);
   batcher.InsertTriangleList(context, state, make_ref(&provider));
 
   GenerateLineCaps(context, segments, color, lineOffset, halfWidth, depth, batcher);
 }
 
-void TransitSchemeBuilder::GenerateStop(
-    ref_ptr<dp::GraphicsContext> context, StopNodeParamsSubway const & stopParams,
-    m2::PointD const & pivot, std::map<routing::transit::LineId, LineParams> const & lines,
-    dp::Batcher & batcher)
+void TransitSchemeBuilder::GenerateStop(ref_ptr<dp::GraphicsContext> context, StopNodeParamsSubway const & stopParams,
+                                        m2::PointD const & pivot,
+                                        std::map<routing::transit::LineId, LineParams> const & lines,
+                                        dp::Batcher & batcher)
 {
   bool const severalRoads = stopParams.m_stopsInfo.size() > 1;
 
@@ -1208,15 +1146,12 @@ void TransitSchemeBuilder::GenerateStop(
 
   m2::PointD dir = stopParams.m_shapesInfo.begin()->second.m_direction;
 
-  GenerateMarker(context, pt, dir, 1.0f, 1.0f, kOuterScale, kOuterScale, kOuterMarkerDepth,
-                 outerColor, batcher);
+  GenerateMarker(context, pt, dir, 1.0f, 1.0f, kOuterScale, kOuterScale, kOuterMarkerDepth, outerColor, batcher);
 
-  GenerateMarker(context, pt, dir, 1.0f, 1.0f, kInnerScale, kInnerScale, kInnerMarkerDepth,
-                 innerColor, batcher);
+  GenerateMarker(context, pt, dir, 1.0f, 1.0f, kInnerScale, kInnerScale, kInnerMarkerDepth, innerColor, batcher);
 }
 
-std::pair<m2::PointD, size_t> GetFittingDirectionAndSize(
-    std::vector<ShapeInfoPT> const & shapeInfos)
+std::pair<m2::PointD, size_t> GetFittingDirectionAndSize(std::vector<ShapeInfoPT> const & shapeInfos)
 {
   if (shapeInfos.empty())
     return {m2::PointD::Zero(), 0};
@@ -1236,8 +1171,8 @@ std::pair<m2::PointD, size_t> GetFittingDirectionAndSize(
   return {shapeInfos[idxMax].m_direction, max};
 }
 
-std::pair<m2::PointD, size_t> GetFittingDirectionAndSize(
-    std::vector<ShapeInfoPT> const & shapeInfosIn, std::vector<ShapeInfoPT> const & shapeInfosOut)
+std::pair<m2::PointD, size_t> GetFittingDirectionAndSize(std::vector<ShapeInfoPT> const & shapeInfosIn,
+                                                         std::vector<ShapeInfoPT> const & shapeInfosOut)
 {
   auto const dirSizeIn = GetFittingDirectionAndSize(shapeInfosIn);
   auto const dirSizeOut = GetFittingDirectionAndSize(shapeInfosOut);
@@ -1252,10 +1187,8 @@ bool StopHasMultipleShapes(std::vector<ShapeInfoPT> const & shapeInfosIn,
 
   for (auto const & si : shapeInfosIn)
   {
-    auto const it =
-        std::find_if(shapeInfosOut.begin(), shapeInfosOut.end(), [&si](ShapeInfoPT const & so) {
-          return AlmostEqualAbs(si.m_direction, so.m_direction, kEps);
-        });
+    auto const it = std::find_if(shapeInfosOut.begin(), shapeInfosOut.end(), [&si](ShapeInfoPT const & so)
+    { return AlmostEqualAbs(si.m_direction, so.m_direction, kEps); });
     if (it != shapeInfosOut.end())
       ++count;
   }
@@ -1263,15 +1196,13 @@ bool StopHasMultipleShapes(std::vector<ShapeInfoPT> const & shapeInfosIn,
   return std::max(shapeInfosIn.size(), shapeInfosOut.size()) - count > 1;
 }
 
-void TransitSchemeBuilder::GenerateStop(
-    ref_ptr<dp::GraphicsContext> context, StopNodeParamsPT const & stopParams,
-    m2::PointD const & pivot, std::map<routing::transit::LineId, LineParams> const & lines,
-    dp::Batcher & batcher)
+void TransitSchemeBuilder::GenerateStop(ref_ptr<dp::GraphicsContext> context, StopNodeParamsPT const & stopParams,
+                                        m2::PointD const & pivot,
+                                        std::map<routing::transit::LineId, LineParams> const & lines,
+                                        dp::Batcher & batcher)
 {
-  auto const & [dir, linesCount] =
-      GetFittingDirectionAndSize(stopParams.m_shapeInfoIn, stopParams.m_shapeInfoOut);
-  bool const severalRoads =
-      StopHasMultipleShapes(stopParams.m_shapeInfoIn, stopParams.m_shapeInfoOut);
+  auto const & [dir, linesCount] = GetFittingDirectionAndSize(stopParams.m_shapeInfoIn, stopParams.m_shapeInfoOut);
+  bool const severalRoads = StopHasMultipleShapes(stopParams.m_shapeInfoIn, stopParams.m_shapeInfoOut);
 
   if (linesCount > 1 || severalRoads)
   {
@@ -1294,19 +1225,14 @@ void TransitSchemeBuilder::GenerateStop(
 
   m2::PointD const pt = MapShape::ConvertToLocal(stopParams.m_pivot, pivot, kShapeCoordScalar);
 
-  GenerateMarker(context, pt, dir, 1.0f, 1.0f, kOuterScale, kOuterScale, kOuterMarkerDepth,
-                 outerColor, batcher);
+  GenerateMarker(context, pt, dir, 1.0f, 1.0f, kOuterScale, kOuterScale, kOuterMarkerDepth, outerColor, batcher);
 
-  GenerateMarker(context, pt, dir, 1.0f, 1.0f, kInnerScale, kInnerScale, kInnerMarkerDepth,
-                 innerColor, batcher);
+  GenerateMarker(context, pt, dir, 1.0f, 1.0f, kInnerScale, kInnerScale, kInnerMarkerDepth, innerColor, batcher);
 }
 
-void TransitSchemeBuilder::GenerateTitles(ref_ptr<dp::GraphicsContext> context,
-                                          StopNodeParamsSubway const & stopParams,
-                                          m2::PointD const & pivot,
-                                          std::vector<m2::PointF> const & markerSizes,
-                                          ref_ptr<dp::TextureManager> textures,
-                                          dp::Batcher & batcher)
+void TransitSchemeBuilder::GenerateTitles(ref_ptr<dp::GraphicsContext> context, StopNodeParamsSubway const & stopParams,
+                                          m2::PointD const & pivot, std::vector<m2::PointF> const & markerSizes,
+                                          ref_ptr<dp::TextureManager> textures, dp::Batcher & batcher)
 {
   auto const vs = static_cast<float>(df::VisualParams::Instance().GetVisualScale());
 
@@ -1318,8 +1244,7 @@ void TransitSchemeBuilder::GenerateTitles(ref_ptr<dp::GraphicsContext> context,
 
   auto const featureId = stopParams.m_stopsInfo.begin()->second.m_featureId;
 
-  auto priority =
-      static_cast<uint16_t>(stopParams.m_isTransfer ? Priority::TransferMin : Priority::StopMin);
+  auto priority = static_cast<uint16_t>(stopParams.m_isTransfer ? Priority::TransferMin : Priority::StopMin);
   priority += static_cast<uint16_t>(stopParams.m_stopsInfo.size());
 
   auto minVisibleScale = stopParams.m_isTransfer ? kTransferMinZoomLevel : kStopMinZoomLevel;
@@ -1331,10 +1256,8 @@ void TransitSchemeBuilder::GenerateTitles(ref_ptr<dp::GraphicsContext> context,
     priority += kFinalStationPriorityInc;
   }
 
-  ASSERT_LESS_OR_EQUAL(
-      priority,
-      static_cast<uint16_t>(stopParams.m_isTransfer ? Priority::TransferMax : Priority::StopMax),
-      ());
+  ASSERT_LESS_OR_EQUAL(priority,
+                       static_cast<uint16_t>(stopParams.m_isTransfer ? Priority::TransferMax : Priority::StopMax), ());
 
   std::vector<m2::PointF> symbolSizes;
   symbolSizes.reserve(markerSizes.size());
@@ -1363,8 +1286,7 @@ void TransitSchemeBuilder::GenerateTitles(ref_ptr<dp::GraphicsContext> context,
     textParams.m_startOverlayRank = dp::OverlayRank0;
     textParams.m_minVisibleScale = minVisibleScale;
 
-    TextShape(stopParams.m_pivot, textParams, TileKey(), symbolSizes, title.m_offset, dp::Center,
-              kTransitOverlayIndex)
+    TextShape(stopParams.m_pivot, textParams, TileKey(), symbolSizes, title.m_offset, dp::Center, kTransitOverlayIndex)
         .Draw(context, &batcher, textures);
   }
 
@@ -1379,17 +1301,13 @@ void TransitSchemeBuilder::GenerateTitles(ref_ptr<dp::GraphicsContext> context,
   colorParams.m_specialPriority = static_cast<uint16_t>(Priority::Stub);
   colorParams.m_startOverlayRank = dp::OverlayRank0;
 
-  ColoredSymbolShape(stopParams.m_pivot, colorParams, TileKey(), kTransitStubOverlayIndex,
-                     markerSizes)
+  ColoredSymbolShape(stopParams.m_pivot, colorParams, TileKey(), kTransitStubOverlayIndex, markerSizes)
       .Draw(context, &batcher, textures);
 }
 
-void TransitSchemeBuilder::GenerateTitles(ref_ptr<dp::GraphicsContext> context,
-                                          StopNodeParamsPT const & stopParams,
-                                          m2::PointD const & pivot,
-                                          std::vector<m2::PointF> const & markerSizes,
-                                          ref_ptr<dp::TextureManager> textures,
-                                          dp::Batcher & batcher)
+void TransitSchemeBuilder::GenerateTitles(ref_ptr<dp::GraphicsContext> context, StopNodeParamsPT const & stopParams,
+                                          m2::PointD const & pivot, std::vector<m2::PointF> const & markerSizes,
+                                          ref_ptr<dp::TextureManager> textures, dp::Batcher & batcher)
 {
   auto const vs = static_cast<float>(df::VisualParams::Instance().GetVisualScale());
 
@@ -1401,8 +1319,7 @@ void TransitSchemeBuilder::GenerateTitles(ref_ptr<dp::GraphicsContext> context,
 
   auto const featureId = stopParams.m_stopsInfo.begin()->second.m_featureId;
 
-  auto priority =
-      static_cast<uint16_t>(stopParams.m_isTransfer ? Priority::TransferMin : Priority::StopMin);
+  auto priority = static_cast<uint16_t>(stopParams.m_isTransfer ? Priority::TransferMin : Priority::StopMin);
   priority += static_cast<uint16_t>(stopParams.m_stopsInfo.size());
 
   auto minVisibleScale = stopParams.m_isTransfer ? kTransferMinZoomLevel : kStopMinZoomLevel;
@@ -1413,10 +1330,8 @@ void TransitSchemeBuilder::GenerateTitles(ref_ptr<dp::GraphicsContext> context,
     priority += kFinalStationPriorityInc;
   }
 
-  ASSERT_LESS_OR_EQUAL(
-      priority,
-      static_cast<uint16_t>(stopParams.m_isTransfer ? Priority::TransferMax : Priority::StopMax),
-      ());
+  ASSERT_LESS_OR_EQUAL(priority,
+                       static_cast<uint16_t>(stopParams.m_isTransfer ? Priority::TransferMax : Priority::StopMax), ());
 
   std::vector<m2::PointF> symbolSizes;
   symbolSizes.reserve(markerSizes.size());
@@ -1445,8 +1360,7 @@ void TransitSchemeBuilder::GenerateTitles(ref_ptr<dp::GraphicsContext> context,
     textParams.m_startOverlayRank = dp::OverlayRank0;
     textParams.m_minVisibleScale = minVisibleScale;
 
-    TextShape(stopParams.m_pivot, textParams, TileKey(), symbolSizes, title.m_offset, dp::Center,
-              kTransitOverlayIndex)
+    TextShape(stopParams.m_pivot, textParams, TileKey(), symbolSizes, title.m_offset, dp::Center, kTransitOverlayIndex)
         .Draw(context, &batcher, textures);
   }
 
@@ -1461,14 +1375,13 @@ void TransitSchemeBuilder::GenerateTitles(ref_ptr<dp::GraphicsContext> context,
   colorParams.m_specialPriority = static_cast<uint16_t>(Priority::Stub);
   colorParams.m_startOverlayRank = dp::OverlayRank0;
 
-  ColoredSymbolShape(stopParams.m_pivot, colorParams, TileKey(), kTransitStubOverlayIndex,
-                     markerSizes)
+  ColoredSymbolShape(stopParams.m_pivot, colorParams, TileKey(), kTransitStubOverlayIndex, markerSizes)
       .Draw(context, &batcher, textures);
 }
 
 void TransitSchemeBuilder::GenerateTransfer(ref_ptr<dp::GraphicsContext> context,
-                                            StopNodeParamsSubway const & stopParams,
-                                            m2::PointD const & pivot, dp::Batcher & batcher)
+                                            StopNodeParamsSubway const & stopParams, m2::PointD const & pivot,
+                                            dp::Batcher & batcher)
 {
   m2::PointD const pt = MapShape::ConvertToLocal(stopParams.m_pivot, pivot, kShapeCoordScalar);
 
@@ -1494,21 +1407,19 @@ void TransitSchemeBuilder::GenerateTransfer(ref_ptr<dp::GraphicsContext> context
   float const innerScale = maxLinesCount == 1 ? 1.4f : kInnerScale;
   float const outerScale = maxLinesCount == 1 ? 1.9f : kOuterScale;
 
-  GenerateMarker(context, pt, dir, widthLinesCount, maxLinesCount, outerScale, outerScale,
-                 kOuterMarkerDepth, outerColor, batcher);
+  GenerateMarker(context, pt, dir, widthLinesCount, maxLinesCount, outerScale, outerScale, kOuterMarkerDepth,
+                 outerColor, batcher);
 
-  GenerateMarker(context, pt, dir, widthLinesCount, maxLinesCount, innerScale, innerScale,
-                 kInnerMarkerDepth, innerColor, batcher);
+  GenerateMarker(context, pt, dir, widthLinesCount, maxLinesCount, innerScale, innerScale, kInnerMarkerDepth,
+                 innerColor, batcher);
 }
 
-void TransitSchemeBuilder::GenerateTransfer(ref_ptr<dp::GraphicsContext> context,
-                                            StopNodeParamsPT const & stopParams,
+void TransitSchemeBuilder::GenerateTransfer(ref_ptr<dp::GraphicsContext> context, StopNodeParamsPT const & stopParams,
                                             m2::PointD const & pivot, dp::Batcher & batcher)
 {
   m2::PointD const pt = MapShape::ConvertToLocal(stopParams.m_pivot, pivot, kShapeCoordScalar);
 
-  auto [dir, maxLinesCount] =
-      GetFittingDirectionAndSize(stopParams.m_shapeInfoIn, stopParams.m_shapeInfoOut);
+  auto [dir, maxLinesCount] = GetFittingDirectionAndSize(stopParams.m_shapeInfoIn, stopParams.m_shapeInfoOut);
 
   CHECK_GREATER(maxLinesCount, 0, ());
 
@@ -1522,10 +1433,10 @@ void TransitSchemeBuilder::GenerateTransfer(ref_ptr<dp::GraphicsContext> context
   float const innerScale = maxLinesCount == 1 ? 1.4f : kInnerScale;
   float const outerScale = maxLinesCount == 1 ? 1.9f : kOuterScale;
 
-  GenerateMarker(context, pt, dir, widthLinesCount, maxLinesCount, outerScale, outerScale,
-                 kOuterMarkerDepth, outerColor, batcher);
+  GenerateMarker(context, pt, dir, widthLinesCount, maxLinesCount, outerScale, outerScale, kOuterMarkerDepth,
+                 outerColor, batcher);
 
-  GenerateMarker(context, pt, dir, widthLinesCount, maxLinesCount, innerScale, innerScale,
-                 kInnerMarkerDepth, innerColor, batcher);
+  GenerateMarker(context, pt, dir, widthLinesCount, maxLinesCount, innerScale, innerScale, kInnerMarkerDepth,
+                 innerColor, batcher);
 }
 }  // namespace df
diff --git a/libs/drape_frontend/transit_scheme_builder.hpp b/libs/drape_frontend/transit_scheme_builder.hpp
index c0366b1e5..7cd6ef300 100644
--- a/libs/drape_frontend/transit_scheme_builder.hpp
+++ b/libs/drape_frontend/transit_scheme_builder.hpp
@@ -39,9 +39,8 @@ struct TransitRenderData
   m2::PointD m_pivot;
   drape_ptr<dp::RenderBucket> m_bucket;
 
-  TransitRenderData(Type type, dp::RenderState const & state, uint32_t recacheId,
-                    MwmSet::MwmId const & mwmId, m2::PointD const pivot,
-                    drape_ptr<dp::RenderBucket> && bucket)
+  TransitRenderData(Type type, dp::RenderState const & state, uint32_t recacheId, MwmSet::MwmId const & mwmId,
+                    m2::PointD const pivot, drape_ptr<dp::RenderBucket> && bucket)
     : m_type(type)
     , m_state(state)
     , m_recacheId(recacheId)
@@ -54,9 +53,7 @@ struct TransitRenderData
 struct LineParams
 {
   LineParams() = default;
-  LineParams(std::string const & color, float depth)
-    : m_color(color), m_depth(depth)
-  {}
+  LineParams(std::string const & color, float depth) : m_color(color), m_depth(depth) {}
   std::string m_color;
   float m_depth = 0.0;
   std::vector<::transit::TransitId> m_stopIds;
@@ -79,10 +76,7 @@ struct ShapeInfoPT
 {
   ShapeInfoPT() = default;
 
-  ShapeInfoPT(m2::PointD const & dir, std::set<std::string> const & colors)
-    : m_direction(dir), m_colors(colors)
-  {
-  }
+  ShapeInfoPT(m2::PointD const & dir, std::set<std::string> const & colors) : m_direction(dir), m_colors(colors) {}
 
   m2::PointD m_direction;
   std::set<std::string> m_colors;
@@ -91,10 +85,7 @@ struct ShapeInfoPT
 struct StopInfo
 {
   StopInfo() = default;
-  StopInfo(std::string const & name, FeatureID const & featureId)
-    : m_name(name)
-    , m_featureId(featureId)
-  {}
+  StopInfo(std::string const & name, FeatureID const & featureId) : m_name(name), m_featureId(featureId) {}
 
   std::string m_name;
   FeatureID m_featureId;
@@ -157,16 +148,12 @@ public:
 
   using TFlushRenderDataFn = std::function<void(TransitRenderData && renderData)>;
 
-  explicit TransitSchemeBuilder(TFlushRenderDataFn const & flushFn)
-    : m_flushRenderDataFn(flushFn)
-  {}
+  explicit TransitSchemeBuilder(TFlushRenderDataFn const & flushFn) : m_flushRenderDataFn(flushFn) {}
 
-  void UpdateSchemes(ref_ptr<dp::GraphicsContext> context,
-                     TransitDisplayInfos const & transitDisplayInfos,
+  void UpdateSchemes(ref_ptr<dp::GraphicsContext> context, TransitDisplayInfos const & transitDisplayInfos,
                      ref_ptr<dp::TextureManager> textures);
 
-  void RebuildSchemes(ref_ptr<dp::GraphicsContext> context,
-                      ref_ptr<dp::TextureManager> textures);
+  void RebuildSchemes(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::TextureManager> textures);
 
   void Clear();
   void Clear(MwmSet::MwmId const & mwmId);
@@ -192,20 +179,17 @@ private:
   void BuildScheme(ref_ptr<dp::GraphicsContext> context, MwmSet::MwmId const & mwmId,
                    ref_ptr<dp::TextureManager> textures);
 
-  void GenerateLinesSubway(MwmSchemeData const & scheme, dp::Batcher & batcher,
-                           ref_ptr<dp::GraphicsContext> context);
+  void GenerateLinesSubway(MwmSchemeData const & scheme, dp::Batcher & batcher, ref_ptr<dp::GraphicsContext> context);
 
-  void GenerateLinesPT(MwmSchemeData const & scheme, dp::Batcher & batcher,
-                       ref_ptr<dp::GraphicsContext> context);
+  void GenerateLinesPT(MwmSchemeData const & scheme, dp::Batcher & batcher, ref_ptr<dp::GraphicsContext> context);
 
   template <class F, class S, class T, class L>
-  void GenerateLocationsWithTitles(ref_ptr<dp::GraphicsContext> context,
-                                   ref_ptr<dp::TextureManager> textures, dp::Batcher & batcher,
-                                   F && flusher, MwmSchemeData const & scheme, S const & stops,
+  void GenerateLocationsWithTitles(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::TextureManager> textures,
+                                   dp::Batcher & batcher, F && flusher, MwmSchemeData const & scheme, S const & stops,
                                    T const & transfers, L const & lines);
 
-  void CollectStopsSubway(TransitDisplayInfo const & transitDisplayInfo,
-                          MwmSet::MwmId const & mwmId, MwmSchemeData & scheme);
+  void CollectStopsSubway(TransitDisplayInfo const & transitDisplayInfo, MwmSet::MwmId const & mwmId,
+                          MwmSchemeData & scheme);
   void CollectStopsPT(TransitDisplayInfo const & transitDisplayInfo, LinesDataPT const & linesData,
                       MwmSet::MwmId const & mwmId, MwmSchemeData & scheme);
 
@@ -215,8 +199,7 @@ private:
   void CollectShapesSubway(TransitDisplayInfo const & transitDisplayInfo, MwmSchemeData & scheme);
   void CollectShapesPT(TransitDisplayInfo const & transitDisplayInfo, MwmSchemeData & scheme);
 
-  void FindShapes(routing::transit::StopId stop1Id, routing::transit::StopId stop2Id,
-                  routing::transit::LineId lineId,
+  void FindShapes(routing::transit::StopId stop1Id, routing::transit::StopId stop2Id, routing::transit::LineId lineId,
                   std::vector<routing::transit::LineId> const & sameLines,
                   TransitDisplayInfo const & transitDisplayInfo, MwmSchemeData & scheme);
   void AddShape(TransitDisplayInfo const & transitDisplayInfo, routing::transit::StopId stop1Id,
@@ -231,27 +214,22 @@ private:
   void GenerateStops(ref_ptr<dp::GraphicsContext> context, MwmSet::MwmId const & mwmId,
                      ref_ptr<dp::TextureManager> textures);
 
-  void GenerateMarker(ref_ptr<dp::GraphicsContext> context, m2::PointD const & pt,
-                      m2::PointD widthDir, float linesCountWidth, float linesCountHeight,
-                      float scaleWidth, float scaleHeight, float depth, dp::Color const & color,
-                      dp::Batcher & batcher);
+  void GenerateMarker(ref_ptr<dp::GraphicsContext> context, m2::PointD const & pt, m2::PointD widthDir,
+                      float linesCountWidth, float linesCountHeight, float scaleWidth, float scaleHeight, float depth,
+                      dp::Color const & color, dp::Batcher & batcher);
 
-  void GenerateTransfer(ref_ptr<dp::GraphicsContext> context,
-                        StopNodeParamsSubway const & stopParams, m2::PointD const & pivot,
-                        dp::Batcher & batcher);
+  void GenerateTransfer(ref_ptr<dp::GraphicsContext> context, StopNodeParamsSubway const & stopParams,
+                        m2::PointD const & pivot, dp::Batcher & batcher);
 
   void GenerateTransfer(ref_ptr<dp::GraphicsContext> context, StopNodeParamsPT const & stopParams,
                         m2::PointD const & pivot, dp::Batcher & batcher);
 
   void GenerateStop(ref_ptr<dp::GraphicsContext> context, StopNodeParamsSubway const & stopParams,
-                    m2::PointD const & pivot,
-                    std::map<routing::transit::LineId, LineParams> const & lines,
+                    m2::PointD const & pivot, std::map<routing::transit::LineId, LineParams> const & lines,
                     dp::Batcher & batcher);
 
-  void GenerateStop(ref_ptr<dp::GraphicsContext> context, StopNodeParamsPT const & stopParams,
-                    m2::PointD const & pivot,
-                    std::map<routing::transit::LineId, LineParams> const & lines,
-                    dp::Batcher & batcher);
+  void GenerateStop(ref_ptr<dp::GraphicsContext> context, StopNodeParamsPT const & stopParams, m2::PointD const & pivot,
+                    std::map<routing::transit::LineId, LineParams> const & lines, dp::Batcher & batcher);
 
   void GenerateTitles(ref_ptr<dp::GraphicsContext> context, StopNodeParamsSubway const & stopParams,
                       m2::PointD const & pivot, std::vector<m2::PointF> const & markerSizes,
@@ -262,8 +240,8 @@ private:
                       ref_ptr<dp::TextureManager> textures, dp::Batcher & batcher);
 
   void GenerateLine(ref_ptr<dp::GraphicsContext> context, std::vector<m2::PointD> const & path,
-                    m2::PointD const & pivot, dp::Color const & colorConst, float lineOffset,
-                    float halfWidth, float depth, dp::Batcher & batcher);
+                    m2::PointD const & pivot, dp::Color const & colorConst, float lineOffset, float halfWidth,
+                    float depth, dp::Batcher & batcher);
 
   StopNodeParamsPT & GetStopOrTransfer(MwmSchemeData & scheme, ::transit::TransitId id);
 
diff --git a/libs/drape_frontend/transit_scheme_renderer.cpp b/libs/drape_frontend/transit_scheme_renderer.cpp
index 63ee4572d..f74b11d3e 100644
--- a/libs/drape_frontend/transit_scheme_renderer.cpp
+++ b/libs/drape_frontend/transit_scheme_renderer.cpp
@@ -21,8 +21,8 @@ float CalculateHalfWidth(ScreenBase const & screen)
   float lerpCoef = 0.0f;
   ExtractZoomFactors(screen, zoom, index, lerpCoef);
 
-  return InterpolateByZoomLevels(index, lerpCoef, kTransitLinesWidthInPixel)
-    * static_cast<float>(VisualParams::Instance().GetVisualScale());
+  return InterpolateByZoomLevels(index, lerpCoef, kTransitLinesWidthInPixel) *
+         static_cast<float>(VisualParams::Instance().GetVisualScale());
 }
 }  // namespace
 
@@ -34,7 +34,7 @@ bool TransitSchemeRenderer::IsSchemeVisible(int zoomLevel) const
 bool TransitSchemeRenderer::HasRenderData() const
 {
   return !m_linesRenderData.empty() || !m_linesCapsRenderData.empty() || !m_markersRenderData.empty() ||
-    !m_textRenderData.empty() || !m_colorSymbolRenderData.empty();
+         !m_textRenderData.empty() || !m_colorSymbolRenderData.empty();
 }
 
 void TransitSchemeRenderer::ClearContextDependentResources(ref_ptr<dp::OverlayTree> tree)
@@ -74,52 +74,44 @@ void TransitSchemeRenderer::ClearRenderData(TRemovePredicate const & predicate,
   if (tree)
   {
     for (auto & data : renderData)
-    {
       if (predicate(data))
         data.m_bucket->RemoveOverlayHandles(tree);
-    }
   }
 
-  renderData.erase(std::remove_if(renderData.begin(), renderData.end(), predicate),
-                   renderData.end());
+  renderData.erase(std::remove_if(renderData.begin(), renderData.end(), predicate), renderData.end());
 }
 
-void TransitSchemeRenderer::AddRenderData(ref_ptr<dp::GraphicsContext> context,
-                                          ref_ptr<gpu::ProgramManager> mng,
-                                          ref_ptr<dp::OverlayTree> tree,
-                                          TransitRenderData && renderData)
+void TransitSchemeRenderer::AddRenderData(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
+                                          ref_ptr<dp::OverlayTree> tree, TransitRenderData && renderData)
 {
   switch (renderData.m_type)
   {
-    case TransitRenderData::Type::LinesCaps:
-      PrepareRenderData(context, mng, tree, m_linesCapsRenderData, std::move(renderData));
-      break;
-    case TransitRenderData::Type::Lines:
-      PrepareRenderData(context, mng, tree, m_linesRenderData, std::move(renderData));
-      break;
-    case TransitRenderData::Type::Markers:
-      PrepareRenderData(context, mng, tree, m_markersRenderData, std::move(renderData));
-      break;
-    case TransitRenderData::Type::Text:
-      PrepareRenderData(context, mng, tree, m_textRenderData, std::move(renderData));
-      break;
-    case TransitRenderData::Type::Stubs:
-      PrepareRenderData(context, mng, tree, m_colorSymbolRenderData, std::move(renderData));
-      break;
+  case TransitRenderData::Type::LinesCaps:
+    PrepareRenderData(context, mng, tree, m_linesCapsRenderData, std::move(renderData));
+    break;
+  case TransitRenderData::Type::Lines:
+    PrepareRenderData(context, mng, tree, m_linesRenderData, std::move(renderData));
+    break;
+  case TransitRenderData::Type::Markers:
+    PrepareRenderData(context, mng, tree, m_markersRenderData, std::move(renderData));
+    break;
+  case TransitRenderData::Type::Text:
+    PrepareRenderData(context, mng, tree, m_textRenderData, std::move(renderData));
+    break;
+  case TransitRenderData::Type::Stubs:
+    PrepareRenderData(context, mng, tree, m_colorSymbolRenderData, std::move(renderData));
+    break;
   }
 }
 
-void TransitSchemeRenderer::PrepareRenderData(ref_ptr<dp::GraphicsContext> context,
-                                              ref_ptr<gpu::ProgramManager> mng,
+void TransitSchemeRenderer::PrepareRenderData(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
                                               ref_ptr<dp::OverlayTree> tree,
                                               std::vector<TransitRenderData> & currentRenderData,
                                               TransitRenderData && newRenderData)
 {
   // Remove obsolete render data.
   auto const removePredicate = [this, &newRenderData](TransitRenderData const & rd)
-  {
-    return rd.m_mwmId == newRenderData.m_mwmId && rd.m_recacheId < m_lastRecacheId;
-  };
+  { return rd.m_mwmId == newRenderData.m_mwmId && rd.m_recacheId < m_lastRecacheId; };
   ClearRenderData(removePredicate, tree, currentRenderData);
 
   m_lastRecacheId = std::max(m_lastRecacheId, newRenderData.m_recacheId);
@@ -132,12 +124,9 @@ void TransitSchemeRenderer::PrepareRenderData(ref_ptr<dp::GraphicsContext> conte
   currentRenderData.emplace_back(std::move(newRenderData));
 }
 
-void TransitSchemeRenderer::RenderTransit(ref_ptr<dp::GraphicsContext> context,
-                                          ref_ptr<gpu::ProgramManager> mng,
-                                          ScreenBase const & screen,
-                                          ref_ptr<PostprocessRenderer> postprocessRenderer,
-                                          FrameValues const & frameValues,
-                                          ref_ptr<DebugRectRenderer> debugRectRenderer)
+void TransitSchemeRenderer::RenderTransit(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
+                                          ScreenBase const & screen, ref_ptr<PostprocessRenderer> postprocessRenderer,
+                                          FrameValues const & frameValues, ref_ptr<DebugRectRenderer> debugRectRenderer)
 {
   auto const zoomLevel = GetDrawTileScale(screen);
   if (!IsSchemeVisible(zoomLevel) || !HasRenderData())
@@ -153,7 +142,7 @@ void TransitSchemeRenderer::RenderTransit(ref_ptr<dp::GraphicsContext> context,
     RenderText(context, mng, screen, frameValues, debugRectRenderer);
   }
   // Render only for debug purpose.
-  //RenderStubs(context, mng, screen, frameValues, debugRectRenderer);
+  // RenderStubs(context, mng, screen, frameValues, debugRectRenderer);
 }
 
 void TransitSchemeRenderer::CollectOverlays(ref_ptr<dp::OverlayTree> tree, ScreenBase const & modelView)
@@ -166,25 +155,21 @@ void TransitSchemeRenderer::CollectOverlays(ref_ptr<dp::OverlayTree> tree, Scree
                                             std::vector<TransitRenderData> & renderData)
 {
   for (auto & data : renderData)
-  {
     if (tree->IsNeedUpdate())
       data.m_bucket->CollectOverlayHandles(tree);
     else
       data.m_bucket->Update(modelView);
-  }
 }
 
-void TransitSchemeRenderer::RemoveOverlays(ref_ptr<dp::OverlayTree> tree,
-                                           std::vector<TransitRenderData> & renderData)
+void TransitSchemeRenderer::RemoveOverlays(ref_ptr<dp::OverlayTree> tree, std::vector<TransitRenderData> & renderData)
 {
   for (auto & data : renderData)
     data.m_bucket->RemoveOverlayHandles(tree);
 }
 
-void TransitSchemeRenderer::RenderLinesCaps(ref_ptr<dp::GraphicsContext> context,
-                                            ref_ptr<gpu::ProgramManager> mng,
-                                            ScreenBase const & screen,
-                                            FrameValues const & frameValues, float pixelHalfWidth)
+void TransitSchemeRenderer::RenderLinesCaps(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
+                                            ScreenBase const & screen, FrameValues const & frameValues,
+                                            float pixelHalfWidth)
 {
   context->Clear(dp::ClearBits::DepthBit, dp::kClearBitsStoreAll);
   for (auto & renderData : m_linesCapsRenderData)
@@ -205,9 +190,9 @@ void TransitSchemeRenderer::RenderLinesCaps(ref_ptr<dp::GraphicsContext> context
   }
 }
 
-void TransitSchemeRenderer::RenderLines(ref_ptr<dp::GraphicsContext> context,
-                                        ref_ptr<gpu::ProgramManager> mng, ScreenBase const & screen,
-                                        FrameValues const & frameValues, float pixelHalfWidth)
+void TransitSchemeRenderer::RenderLines(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
+                                        ScreenBase const & screen, FrameValues const & frameValues,
+                                        float pixelHalfWidth)
 {
   for (auto & renderData : m_linesRenderData)
   {
@@ -226,10 +211,9 @@ void TransitSchemeRenderer::RenderLines(ref_ptr<dp::GraphicsContext> context,
   }
 }
 
-void TransitSchemeRenderer::RenderMarkers(ref_ptr<dp::GraphicsContext> context,
-                                          ref_ptr<gpu::ProgramManager> mng,
-                                          ScreenBase const & screen,
-                                          FrameValues const & frameValues, float pixelHalfWidth)
+void TransitSchemeRenderer::RenderMarkers(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
+                                          ScreenBase const & screen, FrameValues const & frameValues,
+                                          float pixelHalfWidth)
 {
   context->Clear(dp::ClearBits::DepthBit, dp::kClearBitsStoreAll);
   for (auto & renderData : m_markersRenderData)
@@ -242,8 +226,7 @@ void TransitSchemeRenderer::RenderMarkers(ref_ptr<dp::GraphicsContext> context,
     frameValues.SetTo(params);
     math::Matrix<float, 4, 4> mv = screen.GetModelView(renderData.m_pivot, kShapeCoordScalar);
     params.m_modelView = glsl::make_mat4(mv.m_data);
-    params.m_params = glsl::vec3(static_cast<float>(cos(screen.GetAngle())),
-                                 static_cast<float>(sin(screen.GetAngle())),
+    params.m_params = glsl::vec3(static_cast<float>(cos(screen.GetAngle())), static_cast<float>(sin(screen.GetAngle())),
                                  pixelHalfWidth);
     mng->GetParamsSetter()->Apply(context, program, params);
 
@@ -251,9 +234,8 @@ void TransitSchemeRenderer::RenderMarkers(ref_ptr<dp::GraphicsContext> context,
   }
 }
 
-void TransitSchemeRenderer::RenderText(ref_ptr<dp::GraphicsContext> context,
-                                       ref_ptr<gpu::ProgramManager> mng, ScreenBase const & screen,
-                                       FrameValues const & frameValues,
+void TransitSchemeRenderer::RenderText(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
+                                       ScreenBase const & screen, FrameValues const & frameValues,
                                        ref_ptr<DebugRectRenderer> debugRectRenderer)
 {
   auto const & glyphParams = df::VisualParams::Instance().GetGlyphVisualParams();
@@ -283,9 +265,8 @@ void TransitSchemeRenderer::RenderText(ref_ptr<dp::GraphicsContext> context,
   }
 }
 
-void TransitSchemeRenderer::RenderStubs(ref_ptr<dp::GraphicsContext> context,
-                                        ref_ptr<gpu::ProgramManager> mng, ScreenBase const & screen,
-                                        FrameValues const & frameValues,
+void TransitSchemeRenderer::RenderStubs(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
+                                        ScreenBase const & screen, FrameValues const & frameValues,
                                         ref_ptr<DebugRectRenderer> debugRectRenderer)
 {
   for (auto & renderData : m_colorSymbolRenderData)
diff --git a/libs/drape_frontend/transit_scheme_renderer.hpp b/libs/drape_frontend/transit_scheme_renderer.hpp
index 82bcc72ed..eabed6d40 100644
--- a/libs/drape_frontend/transit_scheme_renderer.hpp
+++ b/libs/drape_frontend/transit_scheme_renderer.hpp
@@ -30,21 +30,19 @@ public:
 
   bool IsSchemeVisible(int zoomLevel) const;
 
-  void RenderTransit(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
-                     ScreenBase const & screen, ref_ptr<PostprocessRenderer> postprocessRenderer,
-                     FrameValues const & frameValues, ref_ptr<DebugRectRenderer> debugRectRenderer);
+  void RenderTransit(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng, ScreenBase const & screen,
+                     ref_ptr<PostprocessRenderer> postprocessRenderer, FrameValues const & frameValues,
+                     ref_ptr<DebugRectRenderer> debugRectRenderer);
 
   void CollectOverlays(ref_ptr<dp::OverlayTree> tree, ScreenBase const & modelView);
 
-
   void ClearContextDependentResources(ref_ptr<dp::OverlayTree> tree);
 
   void Clear(MwmSet::MwmId const & mwmId, ref_ptr<dp::OverlayTree> tree);
 
 private:
   void PrepareRenderData(ref_ptr<dp::GraphicsContext> context, ref_ptr<gpu::ProgramManager> mng,
-                         ref_ptr<dp::OverlayTree> tree,
-                         std::vector<TransitRenderData> & currentRenderData,
+                         ref_ptr<dp::OverlayTree> tree, std::vector<TransitRenderData> & currentRenderData,
                          TransitRenderData && newRenderData);
   void ClearRenderData(MwmSet::MwmId const & mwmId, ref_ptr<dp::OverlayTree> tree,
                        std::vector<TransitRenderData> & renderData);
diff --git a/libs/drape_frontend/user_event_stream.cpp b/libs/drape_frontend/user_event_stream.cpp
index ca9f14fb8..0de671cb5 100644
--- a/libs/drape_frontend/user_event_stream.cpp
+++ b/libs/drape_frontend/user_event_stream.cpp
@@ -1,8 +1,8 @@
 #include "drape_frontend/user_event_stream.hpp"
 #include "drape_frontend/animation/follow_animation.hpp"
 #include "drape_frontend/animation/linear_animation.hpp"
-#include "drape_frontend/animation/scale_animation.hpp"
 #include "drape_frontend/animation/parallel_animation.hpp"
+#include "drape_frontend/animation/scale_animation.hpp"
 #include "drape_frontend/animation/sequence_animation.hpp"
 #include "drape_frontend/animation_constants.hpp"
 #include "drape_frontend/animation_system.hpp"
@@ -18,12 +18,13 @@
 #include <cmath>
 
 #ifdef DEBUG
-#define TEST_CALL(action) if (m_testFn) m_testFn(action)
+#define TEST_CALL(action) \
+  if (m_testFn)           \
+  m_testFn(action)
 #else
 #define TEST_CALL(action)
 #endif
 
-
 namespace df
 {
 namespace
@@ -66,13 +67,12 @@ char const * UserEventStream::DOUBLE_TAP_AND_HOLD = "DoubleTapAndHold";
 char const * UserEventStream::END_DOUBLE_TAP_AND_HOLD = "EndDoubleTapAndHold";
 #endif
 
-
 void TouchEvent::SetFirstTouch(const Touch & touch)
 {
   m_touches[0] = touch;
 }
 
-void TouchEvent::SetSecondTouch(const Touch & touch)
+void TouchEvent::SetSecondTouch(Touch const & touch)
 {
   m_touches[1] = touch;
 }
@@ -138,15 +138,13 @@ std::string DebugPrint(TouchEvent const & e)
   return std::to_string(e.m_type) + "; { " + DebugPrint(e.m_touches[0]) + " }";
 }
 
-
 UserEventStream::UserEventStream()
   : m_state(STATE_EMPTY)
   , m_animationSystem(AnimationSystem::Instance())
   , m_startDragOrg(m2::PointD::Zero())
   , m_startDoubleTapAndHold(m2::PointD::Zero())
   , m_dragThreshold(math::Pow2(VisualParams::Instance().GetDragThreshold()))
-{
-}
+{}
 
 void UserEventStream::AddEvent(drape_ptr<UserEvent> && event)
 {
@@ -154,8 +152,7 @@ void UserEventStream::AddEvent(drape_ptr<UserEvent> && event)
   m_events.emplace_back(std::move(event));
 }
 
-ScreenBase const & UserEventStream::ProcessEvents(bool & modelViewChanged, bool & viewportChanged, 
-                                                  bool & activeFrame)
+ScreenBase const & UserEventStream::ProcessEvents(bool & modelViewChanged, bool & viewportChanged, bool & activeFrame)
 {
   TEventsList events;
   {
@@ -176,108 +173,106 @@ ScreenBase const & UserEventStream::ProcessEvents(bool & modelViewChanged, bool
     switch (e->GetType())
     {
     case UserEvent::EventType::Scale:
-      {
-        ref_ptr<ScaleEvent> scaleEvent = make_ref(e);
-        breakAnim = OnSetScale(scaleEvent);
-        TouchCancel(m_touches);
-      }
-      break;
+    {
+      ref_ptr<ScaleEvent> scaleEvent = make_ref(e);
+      breakAnim = OnSetScale(scaleEvent);
+      TouchCancel(m_touches);
+    }
+    break;
     case UserEvent::EventType::Move:
-      {
-        ref_ptr<MoveEvent> moveEvent = make_ref(e);
-        breakAnim = OnMove(moveEvent);
-        TouchCancel(m_touches);
-      }
-      break;
+    {
+      ref_ptr<MoveEvent> moveEvent = make_ref(e);
+      breakAnim = OnMove(moveEvent);
+      TouchCancel(m_touches);
+    }
+    break;
     case UserEvent::EventType::Resize:
-      {
-        ref_ptr<ResizeEvent> resizeEvent = make_ref(e);
-        m_navigator.OnSize(resizeEvent->GetWidth(), resizeEvent->GetHeight());
-        if (!m_visibleViewport.IsValid())
-          m_visibleViewport = m2::RectD(0, 0, resizeEvent->GetWidth(), resizeEvent->GetHeight());
-        viewportChanged = true;
-        breakAnim = true;
-        TouchCancel(m_touches);
-        if (m_state == STATE_DOUBLE_TAP_HOLD)
-          EndDoubleTapAndHold(m_touches[0]);
-      }
-      break;
+    {
+      ref_ptr<ResizeEvent> resizeEvent = make_ref(e);
+      m_navigator.OnSize(resizeEvent->GetWidth(), resizeEvent->GetHeight());
+      if (!m_visibleViewport.IsValid())
+        m_visibleViewport = m2::RectD(0, 0, resizeEvent->GetWidth(), resizeEvent->GetHeight());
+      viewportChanged = true;
+      breakAnim = true;
+      TouchCancel(m_touches);
+      if (m_state == STATE_DOUBLE_TAP_HOLD)
+        EndDoubleTapAndHold(m_touches[0]);
+    }
+    break;
     case UserEvent::EventType::SetAnyRect:
-      {
-        m_needTrackCenter = false;
-        ref_ptr<SetAnyRectEvent> anyRectEvent = make_ref(e);
-        breakAnim = OnSetAnyRect(anyRectEvent);
-        TouchCancel(m_touches);
-      }
-      break;
+    {
+      m_needTrackCenter = false;
+      ref_ptr<SetAnyRectEvent> anyRectEvent = make_ref(e);
+      breakAnim = OnSetAnyRect(anyRectEvent);
+      TouchCancel(m_touches);
+    }
+    break;
     case UserEvent::EventType::SetRect:
-      {
-        m_needTrackCenter = false;
-        ref_ptr<SetRectEvent> rectEvent = make_ref(e);
-        breakAnim = OnSetRect(rectEvent);
-        TouchCancel(m_touches);
-      }
-      break;
+    {
+      m_needTrackCenter = false;
+      ref_ptr<SetRectEvent> rectEvent = make_ref(e);
+      breakAnim = OnSetRect(rectEvent);
+      TouchCancel(m_touches);
+    }
+    break;
     case UserEvent::EventType::SetCenter:
-      {
-        m_needTrackCenter = false;
-        ref_ptr<SetCenterEvent> centerEvent = make_ref(e);
-        breakAnim = OnSetCenter(centerEvent);
-        TouchCancel(m_touches);
-      }
-      break;
+    {
+      m_needTrackCenter = false;
+      ref_ptr<SetCenterEvent> centerEvent = make_ref(e);
+      breakAnim = OnSetCenter(centerEvent);
+      TouchCancel(m_touches);
+    }
+    break;
     case UserEvent::EventType::Touch:
-      {
-        m_needTrackCenter = false;
-        ref_ptr<TouchEvent> touchEvent = make_ref(e);
-        breakAnim = ProcessTouch(*touchEvent.get());
-      }
-      break;
+    {
+      m_needTrackCenter = false;
+      ref_ptr<TouchEvent> touchEvent = make_ref(e);
+      breakAnim = ProcessTouch(*touchEvent.get());
+    }
+    break;
     case UserEvent::EventType::Rotate:
-      {
-        m_needTrackCenter = false;
-        ref_ptr<RotateEvent> rotateEvent = make_ref(e);
-        breakAnim = OnRotate(rotateEvent);
-      }
-      break;
+    {
+      m_needTrackCenter = false;
+      ref_ptr<RotateEvent> rotateEvent = make_ref(e);
+      breakAnim = OnRotate(rotateEvent);
+    }
+    break;
     case UserEvent::EventType::FollowAndRotate:
-      {
-        m_needTrackCenter = false;
-        ref_ptr<FollowAndRotateEvent> followEvent = make_ref(e);
-        breakAnim = SetFollowAndRotate(followEvent->GetUserPos(), followEvent->GetPixelZero(),
-                                       followEvent->GetAzimuth(), followEvent->GetPreferredZoomLelel(),
-                                       followEvent->GetAutoScale(), followEvent->IsAnim(), followEvent->IsAutoScale(),
-                                       followEvent->GetOnFinishAction(), followEvent->GetParallelAnimCreator());
-      }
-      break;
+    {
+      m_needTrackCenter = false;
+      ref_ptr<FollowAndRotateEvent> followEvent = make_ref(e);
+      breakAnim = SetFollowAndRotate(followEvent->GetUserPos(), followEvent->GetPixelZero(), followEvent->GetAzimuth(),
+                                     followEvent->GetPreferredZoomLelel(), followEvent->GetAutoScale(),
+                                     followEvent->IsAnim(), followEvent->IsAutoScale(),
+                                     followEvent->GetOnFinishAction(), followEvent->GetParallelAnimCreator());
+    }
+    break;
     case UserEvent::EventType::AutoPerspective:
-      {
-        m_needTrackCenter = false;
-        ref_ptr<SetAutoPerspectiveEvent> perspectiveEvent = make_ref(e);
-        SetAutoPerspective(perspectiveEvent->IsAutoPerspective());
-      }
-      break;
+    {
+      m_needTrackCenter = false;
+      ref_ptr<SetAutoPerspectiveEvent> perspectiveEvent = make_ref(e);
+      SetAutoPerspective(perspectiveEvent->IsAutoPerspective());
+    }
+    break;
     case UserEvent::EventType::VisibleViewport:
-      {
-        ref_ptr<SetVisibleViewportEvent> viewportEvent = make_ref(e);
-        breakAnim = OnNewVisibleViewport(viewportEvent);
-      }
-      break;
+    {
+      ref_ptr<SetVisibleViewportEvent> viewportEvent = make_ref(e);
+      breakAnim = OnNewVisibleViewport(viewportEvent);
+    }
+    break;
     case UserEvent::EventType::Scroll:
-      {
-        ref_ptr<ScrollEvent> scrollEvent = make_ref(e);
-        breakAnim = OnScroll(scrollEvent);
-        TouchCancel(m_touches);
-      }
-      break;
+    {
+      ref_ptr<ScrollEvent> scrollEvent = make_ref(e);
+      breakAnim = OnScroll(scrollEvent);
+      TouchCancel(m_touches);
+    }
+    break;
     case UserEvent::EventType::ActiveFrame:
-      {
-        activeFrame = true;
-      }
-      break;
-    default:
-      ASSERT(false, ());
-      break;
+    {
+      activeFrame = true;
+    }
+    break;
+    default: ASSERT(false, ()); break;
     }
 
     if (breakAnim)
@@ -344,8 +339,8 @@ bool UserEventStream::OnSetScale(ref_ptr<ScaleEvent> scaleEvent)
     auto followAnim = m_animationSystem.FindAnimation<MapFollowAnimation>(Animation::Type::MapFollow);
     if (followAnim == nullptr)
     {
-      auto const parallelAnim = m_animationSystem.FindAnimation<ParallelAnimation>(
-          Animation::Type::Parallel, kParallelFollowAnim.c_str());
+      auto const parallelAnim =
+          m_animationSystem.FindAnimation<ParallelAnimation>(Animation::Type::Parallel, kParallelFollowAnim.c_str());
       if (parallelAnim != nullptr)
         followAnim = parallelAnim->FindAnimation<MapFollowAnimation>(Animation::Type::MapFollow);
     }
@@ -409,9 +404,8 @@ bool UserEventStream::OnSetAnyRect(ref_ptr<SetAnyRectEvent> anyRectEvent)
 
 bool UserEventStream::OnSetRect(ref_ptr<SetRectEvent> rectEvent)
 {
-  return SetRect(rectEvent->GetRect(), rectEvent->GetZoom(), rectEvent->GetApplyRotation(),
-                 rectEvent->IsAnim(), rectEvent->UseVisibleViewport(),
-                 rectEvent->GetParallelAnimCreator());
+  return SetRect(rectEvent->GetRect(), rectEvent->GetZoom(), rectEvent->GetApplyRotation(), rectEvent->IsAnim(),
+                 rectEvent->UseVisibleViewport(), rectEvent->GetParallelAnimCreator());
 }
 
 bool UserEventStream::OnSetCenter(ref_ptr<SetCenterEvent> centerEvent)
@@ -461,8 +455,8 @@ bool UserEventStream::OnNewVisibleViewport(ref_ptr<SetVisibleViewportEvent> view
   m2::PointD gOffset;
   ScreenBase screen;
 
-  auto const hasOffset = m_listener->OnNewVisibleViewport(prevVisibleViewport, m_visibleViewport,
-                                                          !m_needTrackCenter, gOffset);
+  auto const hasOffset =
+      m_listener->OnNewVisibleViewport(prevVisibleViewport, m_visibleViewport, !m_needTrackCenter, gOffset);
 
   if (m_needTrackCenter)
   {
@@ -506,11 +500,8 @@ bool UserEventStream::SetAngle(double azimuth, bool isAnim, TAnimationCreator co
 
   if (screen.isPerspective())
   {
-    return SetFollowAndRotate(gPt, pt,
-                              azimuth, kDoNotChangeZoom, kDoNotAutoZoom,
-                              isAnim, false /* isAutoScale */,
-                              nullptr /* onFinishAction */,
-                              parallelAnimCreator);
+    return SetFollowAndRotate(gPt, pt, azimuth, kDoNotChangeZoom, kDoNotAutoZoom, isAnim, false /* isAutoScale */,
+                              nullptr /* onFinishAction */, parallelAnimCreator);
   }
 
   screen.SetAngle(azimuth);
@@ -518,8 +509,8 @@ bool UserEventStream::SetAngle(double azimuth, bool isAnim, TAnimationCreator co
   return SetScreen(screen, isAnim, parallelAnimCreator);
 }
 
-bool UserEventStream::SetRect(m2::RectD rect, int zoom, bool applyRotation, bool isAnim,
-                              bool useVisibleViewport, TAnimationCreator const & parallelAnimCreator)
+bool UserEventStream::SetRect(m2::RectD rect, int zoom, bool applyRotation, bool isAnim, bool useVisibleViewport,
+                              TAnimationCreator const & parallelAnimCreator)
 {
   CheckMinGlobalRect(rect, kDefault3dScale);
   CheckMinMaxVisibleScale(rect, zoom, kDefault3dScale);
@@ -527,8 +518,8 @@ bool UserEventStream::SetRect(m2::RectD rect, int zoom, bool applyRotation, bool
   return SetRect(targetRect, isAnim, true /* fitInViewport */, useVisibleViewport, parallelAnimCreator);
 }
 
-bool UserEventStream::SetRect(m2::AnyRectD const & rect, bool isAnim, bool fitInViewport,
-                              bool useVisibleViewport, TAnimationCreator const & parallelAnimCreator)
+bool UserEventStream::SetRect(m2::AnyRectD const & rect, bool isAnim, bool fitInViewport, bool useVisibleViewport,
+                              TAnimationCreator const & parallelAnimCreator)
 {
   ScreenBase tmp = GetCurrentScreen();
   if (fitInViewport)
@@ -557,8 +548,7 @@ bool UserEventStream::SetScreen(ScreenBase const & endScreen, bool isAnim,
     if (!df::IsAnimationAllowed(anim->GetDuration(), screen))
     {
       anim.reset();
-      double const moveDuration = PositionInterpolator::GetMoveDuration(screen.GetOrg(),
-                                                                        endScreen.GetOrg(), screen);
+      double const moveDuration = PositionInterpolator::GetMoveDuration(screen.GetOrg(), endScreen.GetOrg(), screen);
       if (moveDuration > kMaxAnimationTimeSec)
         anim = GetPrettyMoveAnimation(screen, endScreen);
     }
@@ -595,13 +585,16 @@ bool UserEventStream::InterruptFollowAnimations(bool force)
   Animation const * followAnim = m_animationSystem.FindAnimation<MapFollowAnimation>(Animation::Type::MapFollow);
 
   if (followAnim == nullptr)
-    followAnim = m_animationSystem.FindAnimation<SequenceAnimation>(Animation::Type::Sequence, kPrettyFollowAnim.c_str());
+    followAnim =
+        m_animationSystem.FindAnimation<SequenceAnimation>(Animation::Type::Sequence, kPrettyFollowAnim.c_str());
 
   if (followAnim == nullptr)
-    followAnim = m_animationSystem.FindAnimation<ParallelAnimation>(Animation::Type::Parallel, kParallelFollowAnim.c_str());
+    followAnim =
+        m_animationSystem.FindAnimation<ParallelAnimation>(Animation::Type::Parallel, kParallelFollowAnim.c_str());
 
   if (followAnim == nullptr)
-    followAnim = m_animationSystem.FindAnimation<ParallelAnimation>(Animation::Type::Parallel, kParallelLinearAnim.c_str());
+    followAnim =
+        m_animationSystem.FindAnimation<ParallelAnimation>(Animation::Type::Parallel, kParallelLinearAnim.c_str());
 
   if (followAnim != nullptr)
   {
@@ -613,9 +606,9 @@ bool UserEventStream::InterruptFollowAnimations(bool force)
   return true;
 }
 
-bool UserEventStream::SetFollowAndRotate(m2::PointD const & userPos, m2::PointD const & pixelPos,
-                                         double azimuth, int preferredZoomLevel, double autoScale,
-                                         bool isAnim, bool isAutoScale, Animation::TAction const & onFinishAction,
+bool UserEventStream::SetFollowAndRotate(m2::PointD const & userPos, m2::PointD const & pixelPos, double azimuth,
+                                         int preferredZoomLevel, double autoScale, bool isAnim, bool isAutoScale,
+                                         Animation::TAction const & onFinishAction,
                                          TAnimationCreator const & parallelAnimCreator)
 {
   // Reset current follow-and-rotate animation if possible.
@@ -641,9 +634,9 @@ bool UserEventStream::SetFollowAndRotate(m2::PointD const & userPos, m2::PointD
   if (isAnim)
   {
     drape_ptr<Animation> anim;
-    double const moveDuration = PositionInterpolator::GetMoveDuration(currentScreen.GetOrg(), screen.GetOrg(),
-                                                                      currentScreen.PixelRectIn3d(),
-                                                                      (currentScreen.GetScale() + screen.GetScale()) / 2.0);
+    double const moveDuration =
+        PositionInterpolator::GetMoveDuration(currentScreen.GetOrg(), screen.GetOrg(), currentScreen.PixelRectIn3d(),
+                                              (currentScreen.GetScale() + screen.GetScale()) / 2.0);
     if (moveDuration > kMaxAnimationTimeSec)
     {
       // Run pretty move animation if we are far from userPos.
@@ -667,8 +660,8 @@ bool UserEventStream::SetFollowAndRotate(m2::PointD const & userPos, m2::PointD
     {
       drape_ptr<ParallelAnimation> parallelAnim = make_unique_dp<ParallelAnimation>();
       parallelAnim->SetCustomType(kParallelFollowAnim);
-      parallelAnim->AddAnimation(parallelAnimCreator(anim->GetType() == Animation::Type::MapFollow ? make_ref(anim)
-                                                                                                   : nullptr));
+      parallelAnim->AddAnimation(
+          parallelAnimCreator(anim->GetType() == Animation::Type::MapFollow ? make_ref(anim) : nullptr));
       parallelAnim->AddAnimation(std::move(anim));
       m_animationSystem.CombineAnimation(std::move(parallelAnim));
     }
@@ -701,7 +694,8 @@ void UserEventStream::ResetAnimations(Animation::Type animType, bool rewind, boo
     ApplyAnimations();
 }
 
-void UserEventStream::ResetAnimations(Animation::Type animType, std::string const & customType, bool rewind, bool finishAll)
+void UserEventStream::ResetAnimations(Animation::Type animType, std::string const & customType, bool rewind,
+                                      bool finishAll)
 {
   bool const hasAnimations = m_animationSystem.HasAnimations();
   m_animationSystem.FinishAnimations(animType, customType, rewind, finishAll);
@@ -747,21 +741,11 @@ bool UserEventStream::ProcessTouch(TouchEvent const & touch)
 
   switch (touchEvent.GetTouchType())
   {
-  case TouchEvent::TOUCH_DOWN:
-    isMapTouch = TouchDown(touchEvent.GetTouches());
-    break;
-  case TouchEvent::TOUCH_MOVE:
-    isMapTouch = TouchMove(touchEvent.GetTouches());
-    break;
-  case TouchEvent::TOUCH_CANCEL:
-    isMapTouch = TouchCancel(touchEvent.GetTouches());
-    break;
-  case TouchEvent::TOUCH_UP:
-    isMapTouch = TouchUp(touchEvent.GetTouches());
-    break;
-  default:
-    ASSERT(false, ());
-    break;
+  case TouchEvent::TOUCH_DOWN: isMapTouch = TouchDown(touchEvent.GetTouches()); break;
+  case TouchEvent::TOUCH_MOVE: isMapTouch = TouchMove(touchEvent.GetTouches()); break;
+  case TouchEvent::TOUCH_CANCEL: isMapTouch = TouchCancel(touchEvent.GetTouches()); break;
+  case TouchEvent::TOUCH_UP: isMapTouch = TouchUp(touchEvent.GetTouches()); break;
+  default: ASSERT(false, ()); break;
   }
 
   if (m_listener)
@@ -800,9 +784,7 @@ bool UserEventStream::TouchDown(std::array<Touch, 2> const & touches)
   {
     switch (m_state)
     {
-    case STATE_EMPTY:
-      BeginTwoFingersTap(touches[0], touches[1]);
-      break;
+    case STATE_EMPTY: BeginTwoFingersTap(touches[0], touches[1]); break;
     case STATE_FILTER:
       CancelFilter(touches[0]);
       BeginScale(touches[0], touches[1]);
@@ -821,8 +803,7 @@ bool UserEventStream::TouchDown(std::array<Touch, 2> const & touches)
       isMapTouch = EndDrag(touches[0], true /* cancelled */);
       BeginScale(touches[0], touches[1]);
       break;
-    default:
-      break;
+    default: break;
     }
   }
 
@@ -844,16 +825,12 @@ bool UserEventStream::TouchMove(std::array<Touch, 2> const & touches)
   {
   case STATE_EMPTY:
     if (touchCount == 1)
-    {
       if (CheckDrag(touches, m_dragThreshold))
         BeginDrag(touches[0]);
       else
         isMapTouch = false;
-    }
     else
-    {
       BeginScale(touches[0], touches[1]);
-    }
     break;
   case STATE_TAP_TWO_FINGERS:
     if (touchCount == 2)
@@ -883,9 +860,7 @@ bool UserEventStream::TouchMove(std::array<Touch, 2> const & touches)
     if (CheckDrag(touches, m_dragThreshold))
       StartDoubleTapAndHold(touches[0]);
     break;
-  case STATE_DOUBLE_TAP_HOLD:
-    UpdateDoubleTapAndHold(touches[0]);
-    break;
+  case STATE_DOUBLE_TAP_HOLD: UpdateDoubleTapAndHold(touches[0]); break;
   case STATE_DRAG:
     if (touchCount > 1)
     {
@@ -908,9 +883,7 @@ bool UserEventStream::TouchMove(std::array<Touch, 2> const & touches)
       Scale(touches[0], touches[1]);
     }
     break;
-  default:
-    ASSERT(false, ());
-    break;
+  default: ASSERT(false, ()); break;
   }
 
   UpdateTouches(touches);
@@ -926,9 +899,7 @@ bool UserEventStream::TouchCancel(std::array<Touch, 2> const & touches)
   {
   case STATE_EMPTY:
   case STATE_WAIT_DOUBLE_TAP:
-  case STATE_TAP_TWO_FINGERS:
-    isMapTouch = false;
-    break;
+  case STATE_TAP_TWO_FINGERS: isMapTouch = false; break;
   case STATE_WAIT_DOUBLE_TAP_HOLD:
   case STATE_DOUBLE_TAP_HOLD:
     // Do nothing here.
@@ -950,9 +921,7 @@ bool UserEventStream::TouchCancel(std::array<Touch, 2> const & touches)
     ASSERT_EQUAL(touchCount, 2, ());
     EndScale(touches[0], touches[1]);
     break;
-  default:
-    ASSERT(false, ());
-    break;
+  default: ASSERT(false, ()); break;
   }
   UpdateTouches(touches);
   return isMapTouch;
@@ -988,9 +957,7 @@ bool UserEventStream::TouchUp(std::array<Touch, 2> const & touches)
     ASSERT_EQUAL(touchCount, 1, ());
     PerformDoubleTap(touches[0]);
     break;
-  case STATE_DOUBLE_TAP_HOLD:
-    EndDoubleTapAndHold(touches[0]);
-    break;
+  case STATE_DOUBLE_TAP_HOLD: EndDoubleTapAndHold(touches[0]); break;
   case STATE_DRAG:
     ASSERT_EQUAL(touchCount, 1, ());
     isMapTouch = EndDrag(touches[0], false /* cancelled */);
@@ -1006,9 +973,7 @@ bool UserEventStream::TouchUp(std::array<Touch, 2> const & touches)
       EndScale(touches[0], touches[1]);
     }
     break;
-  default:
-    ASSERT(false, ());
-    break;
+  default: ASSERT(false, ()); break;
   }
 
   UpdateTouches(touches);
@@ -1132,7 +1097,7 @@ void UserEventStream::Scale(Touch const & t1, Touch const & t2)
   m_navigator.DoScale(touch1, touch2);
 }
 
-void UserEventStream::EndScale(const Touch & t1, const Touch & t2)
+void UserEventStream::EndScale(Touch const & t1, Touch const & t2)
 {
   TEST_CALL(END_SCALE);
   ASSERT_EQUAL(m_state, STATE_SCALE, ());
@@ -1229,8 +1194,8 @@ void UserEventStream::EndTapDetector(Touch const & touch)
 void UserEventStream::CancelTapDetector()
 {
   TEST_CALL(CANCEL_TAP_DETECTOR);
-  ASSERT(m_state == STATE_TAP_DETECTION || m_state == STATE_WAIT_DOUBLE_TAP ||
-    m_state == STATE_WAIT_DOUBLE_TAP_HOLD, ());
+  ASSERT(m_state == STATE_TAP_DETECTION || m_state == STATE_WAIT_DOUBLE_TAP || m_state == STATE_WAIT_DOUBLE_TAP_HOLD,
+         ());
   m_state = STATE_EMPTY;
 }
 
@@ -1247,7 +1212,7 @@ bool UserEventStream::TryBeginFilter(Touch const & t)
   return false;
 }
 
-void UserEventStream::EndFilter(const Touch & t)
+void UserEventStream::EndFilter(Touch const & t)
 {
   TEST_CALL(END_FILTER);
   ASSERT_EQUAL(m_state, STATE_FILTER, ());
diff --git a/libs/drape_frontend/user_event_stream.hpp b/libs/drape_frontend/user_event_stream.hpp
index 47f8ebdfd..3e27b69fb 100644
--- a/libs/drape_frontend/user_event_stream.hpp
+++ b/libs/drape_frontend/user_event_stream.hpp
@@ -5,9 +5,9 @@
 
 #include "drape/pointers.hpp"
 
+#include "geometry/any_rect2d.hpp"
 #include "geometry/point2d.hpp"
 #include "geometry/rect2d.hpp"
-#include "geometry/any_rect2d.hpp"
 
 #include "base/timer.hpp"
 
@@ -53,8 +53,8 @@ public:
 struct Touch
 {
   m2::PointF m_location = m2::PointF::Zero();
-  int64_t m_id = -1; // if id == -1 then touch is invalid
-  float m_force = 0.0; // relative force of touch [0.0 - 1.0]
+  int64_t m_id = -1;    // if id == -1 then touch is invalid
+  float m_force = 0.0;  // relative force of touch [0.0 - 1.0]
 
   friend std::string DebugPrint(Touch const & t);
 };
@@ -62,11 +62,7 @@ struct Touch
 class TouchEvent : public UserEvent
 {
 public:
-  TouchEvent()
-    : m_type(TOUCH_CANCEL)
-    , m_timeStamp(base::Timer::LocalTime())
-    , m_pointersMask(0xFFFF)
-  {}
+  TouchEvent() : m_type(TOUCH_CANCEL), m_timeStamp(base::Timer::LocalTime()), m_pointersMask(0xFFFF) {}
 
   enum ETouchType
   {
@@ -117,7 +113,7 @@ private:
 
   ETouchType m_type;
   std::array<Touch, 2> m_touches;  // array of all touches
-  double m_timeStamp; // seconds
+  double m_timeStamp;              // seconds
   uint16_t m_pointersMask;
 };
 
@@ -145,11 +141,7 @@ private:
 class MoveEvent : public UserEvent
 {
 public:
-  MoveEvent(double factorX, double factorY, bool isAnim)
-    : m_factorX(factorX)
-    , m_factorY(factorY)
-    , m_isAnim(isAnim)
-  {}
+  MoveEvent(double factorX, double factorY, bool isAnim) : m_factorX(factorX), m_factorY(factorY), m_isAnim(isAnim) {}
 
   EventType GetType() const override { return UserEvent::EventType::Move; }
 
@@ -166,8 +158,7 @@ private:
 class SetCenterEvent : public UserEvent
 {
 public:
-  SetCenterEvent(m2::PointD const & center, int zoom,
-                 bool isAnim, bool trackVisibleViewport,
+  SetCenterEvent(m2::PointD const & center, int zoom, bool isAnim, bool trackVisibleViewport,
                  TAnimationCreator const & parallelAnimCreator)
     : m_center(center)
     , m_zoom(zoom)
@@ -177,15 +168,14 @@ public:
     , m_parallelAnimCreator(parallelAnimCreator)
   {}
 
-  SetCenterEvent(double scaleFactor, m2::PointD const & center,
-                 bool isAnim, bool trackVisibleViewport,
+  SetCenterEvent(double scaleFactor, m2::PointD const & center, bool isAnim, bool trackVisibleViewport,
                  TAnimationCreator const & parallelAnimCreator)
-      : m_center(center)
-      , m_zoom(-1)
-      , m_scaleFactor(scaleFactor)
-      , m_isAnim(isAnim)
-      , m_trackVisibleViewport(trackVisibleViewport)
-      , m_parallelAnimCreator(parallelAnimCreator)
+    : m_center(center)
+    , m_zoom(-1)
+    , m_scaleFactor(scaleFactor)
+    , m_isAnim(isAnim)
+    , m_trackVisibleViewport(trackVisibleViewport)
+    , m_parallelAnimCreator(parallelAnimCreator)
   {}
 
   EventType GetType() const override { return UserEvent::EventType::SetCenter; }
@@ -198,10 +188,10 @@ public:
   TAnimationCreator const & GetParallelAnimCreator() const { return m_parallelAnimCreator; }
 
 private:
-  m2::PointD m_center; // center point in mercator
-  int m_zoom; // if zoom == -1, then zoom level will not change
-  double m_scaleFactor; // this parameter is used when zoom == -1,
-                        // if scaleFactor <= 0.0, then scale will not change
+  m2::PointD m_center;   // center point in mercator
+  int m_zoom;            // if zoom == -1, then zoom level will not change
+  double m_scaleFactor;  // this parameter is used when zoom == -1,
+                         // if scaleFactor <= 0.0, then scale will not change
   bool m_isAnim;
   bool m_trackVisibleViewport;
   TAnimationCreator m_parallelAnimCreator;
@@ -210,8 +200,8 @@ private:
 class SetRectEvent : public UserEvent
 {
 public:
-  SetRectEvent(m2::RectD const & rect, bool rotate, int zoom, bool isAnim,
-               bool useVisibleViewport, TAnimationCreator const & parallelAnimCreator)
+  SetRectEvent(m2::RectD const & rect, bool rotate, int zoom, bool isAnim, bool useVisibleViewport,
+               TAnimationCreator const & parallelAnimCreator)
     : m_rect(rect)
     , m_applyRotation(rotate)
     , m_zoom(zoom)
@@ -230,9 +220,9 @@ public:
   TAnimationCreator const & GetParallelAnimCreator() const { return m_parallelAnimCreator; }
 
 private:
-  m2::RectD m_rect; // destination mercator rect
-  bool m_applyRotation; // if true, current rotation will be apply to m_rect
-  int m_zoom; // if zoom == -1, then zoom level will'n change
+  m2::RectD m_rect;      // destination mercator rect
+  bool m_applyRotation;  // if true, current rotation will be apply to m_rect
+  int m_zoom;            // if zoom == -1, then zoom level will'n change
   bool m_isAnim;
   bool m_useVisibleViewport;
   TAnimationCreator m_parallelAnimCreator;
@@ -265,8 +255,7 @@ private:
 class FollowAndRotateEvent : public UserEvent
 {
 public:
-  FollowAndRotateEvent(m2::PointD const & userPos, m2::PointD const & pixelZero,
-                       double azimuth, double autoScale,
+  FollowAndRotateEvent(m2::PointD const & userPos, m2::PointD const & pixelZero, double azimuth, double autoScale,
                        TAnimationCreator const & parallelAnimCreator)
     : m_userPos(userPos)
     , m_pixelZero(pixelZero)
@@ -279,8 +268,7 @@ public:
     , m_parallelAnimCreator(parallelAnimCreator)
   {}
 
-  FollowAndRotateEvent(m2::PointD const & userPos, m2::PointD const & pixelZero,
-                       double azimuth, int preferredZoomLevel,
+  FollowAndRotateEvent(m2::PointD const & userPos, m2::PointD const & pixelZero, double azimuth, int preferredZoomLevel,
                        bool isAnim, Animation::TAction const & onFinishAction,
                        TAnimationCreator const & parallelAnimCreator)
     : m_userPos(userPos)
@@ -321,9 +309,7 @@ private:
 class SetAutoPerspectiveEvent : public UserEvent
 {
 public:
-  explicit SetAutoPerspectiveEvent(bool isAutoPerspective)
-    : m_isAutoPerspective(isAutoPerspective)
-  {}
+  explicit SetAutoPerspectiveEvent(bool isAutoPerspective) : m_isAutoPerspective(isAutoPerspective) {}
 
   EventType GetType() const override { return UserEvent::EventType::AutoPerspective; }
 
@@ -372,9 +358,7 @@ private:
 class SetVisibleViewportEvent : public UserEvent
 {
 public:
-  explicit SetVisibleViewportEvent(m2::RectD const & rect)
-    : m_rect(rect)
-  {}
+  explicit SetVisibleViewportEvent(m2::RectD const & rect) : m_rect(rect) {}
 
   EventType GetType() const override { return UserEvent::EventType::VisibleViewport; }
 
@@ -387,9 +371,7 @@ private:
 class ScrollEvent : public UserEvent
 {
 public:
-  ScrollEvent(double distanceX, double distanceY)
-    : m_distanceX(distanceX), m_distanceY(distanceY)
-  {}
+  ScrollEvent(double distanceX, double distanceY) : m_distanceX(distanceX), m_distanceY(distanceY) {}
 
   EventType GetType() const override { return UserEvent::EventType::Scroll; }
 
@@ -405,7 +387,7 @@ private:
 class ActiveFrameEvent : public UserEvent
 {
 public:
-  explicit ActiveFrameEvent(){}
+  explicit ActiveFrameEvent() {}
 
   EventType GetType() const override { return UserEvent::EventType::ActiveFrame; }
 };
@@ -437,8 +419,8 @@ public:
 
     virtual void OnTouchMapAction(TouchEvent::ETouchType touchType, bool isMapTouch) = 0;
 
-    virtual bool OnNewVisibleViewport(m2::RectD const & oldViewport, m2::RectD const & newViewport,
-                                      bool needOffset, m2::PointD & gOffset) = 0;
+    virtual bool OnNewVisibleViewport(m2::RectD const & oldViewport, m2::RectD const & newViewport, bool needOffset,
+                                      m2::PointD & gOffset) = 0;
   };
 
   UserEventStream();
@@ -477,7 +459,7 @@ public:
   static char const * DOUBLE_TAP_AND_HOLD;
   static char const * END_DOUBLE_TAP_AND_HOLD;
 
-  using TTestBridge = std::function<void (char const * action)>;
+  using TTestBridge = std::function<void(char const * action)>;
   void SetTestBridge(TTestBridge const & fn) { m_testFn = fn; }
 #endif
 
@@ -492,16 +474,15 @@ private:
   bool OnScroll(ref_ptr<ScrollEvent> scrollEvent);
 
   bool SetAngle(double azimuth, bool isAnim, TAnimationCreator const & parallelAnimCreator = nullptr);
-  bool SetRect(m2::RectD rect, int zoom, bool applyRotation, bool isAnim,
-               bool useVisibleViewport, TAnimationCreator const & parallelAnimCreator = nullptr);
-  bool SetRect(m2::AnyRectD const & rect, bool isAnim, bool fitInViewport,
-               bool useVisibleViewport, TAnimationCreator const & parallelAnimCreator = nullptr);
+  bool SetRect(m2::RectD rect, int zoom, bool applyRotation, bool isAnim, bool useVisibleViewport,
+               TAnimationCreator const & parallelAnimCreator = nullptr);
+  bool SetRect(m2::AnyRectD const & rect, bool isAnim, bool fitInViewport, bool useVisibleViewport,
+               TAnimationCreator const & parallelAnimCreator = nullptr);
 
-  bool SetScreen(ScreenBase const & screen, bool isAnim,
-                 TAnimationCreator const & parallelAnimCreator = nullptr);
-  bool SetFollowAndRotate(m2::PointD const & userPos, m2::PointD const & pixelPos,
-                          double azimuth, int preferredZoomLevel, double autoScale,
-                          bool isAnim, bool isAutoScale, Animation::TAction const & onFinishAction = nullptr,
+  bool SetScreen(ScreenBase const & screen, bool isAnim, TAnimationCreator const & parallelAnimCreator = nullptr);
+  bool SetFollowAndRotate(m2::PointD const & userPos, m2::PointD const & pixelPos, double azimuth,
+                          int preferredZoomLevel, double autoScale, bool isAnim, bool isAutoScale,
+                          Animation::TAction const & onFinishAction = nullptr,
                           TAnimationCreator const & parallelAnimCreator = nullptr);
   void SetAutoPerspective(bool isAutoPerspective);
 
@@ -546,8 +527,8 @@ private:
 
   void ApplyAnimations();
   void ResetAnimations(Animation::Type animType, bool rewind = true, bool finishAll = false);
-  void ResetAnimations(Animation::Type animType, std::string const & customType,
-                       bool rewind = true, bool finishAll = false);
+  void ResetAnimations(Animation::Type animType, std::string const & customType, bool rewind = true,
+                       bool finishAll = false);
   void ResetMapPlaneAnimations();
   bool InterruptFollowAnimations(bool force);
 
diff --git a/libs/drape_frontend/user_mark_generator.cpp b/libs/drape_frontend/user_mark_generator.cpp
index 966b2f3c8..dbe1ef195 100644
--- a/libs/drape_frontend/user_mark_generator.cpp
+++ b/libs/drape_frontend/user_mark_generator.cpp
@@ -14,8 +14,7 @@ namespace df
 {
 std::array<int, 3> const kLineIndexingLevels = {1, 7, 11};
 
-UserMarkGenerator::UserMarkGenerator(TFlushFn const & flushFn)
-  : m_flushFn(flushFn)
+UserMarkGenerator::UserMarkGenerator(TFlushFn const & flushFn) : m_flushFn(flushFn)
 {
   ASSERT(m_flushFn, ());
 }
@@ -124,10 +123,8 @@ void UserMarkGenerator::UpdateIndex(kml::MarkGroupId groupId)
       {
         df::ProcessSplineSegmentRects(spline, maxLength, [&](m2::RectD const & segmentRect)
         {
-          CalcTilesCoverage(segmentRect, zoomLevel, [&](int tileX, int tileY)
-          {
-            tiles.emplace(tileX, tileY, zoomLevel);
-          });
+          CalcTilesCoverage(segmentRect, zoomLevel,
+                            [&](int tileX, int tileY) { tiles.emplace(tileX, tileY, zoomLevel); });
           return true;
         });
       }
@@ -177,22 +174,18 @@ ref_ptr<IDCollections> UserMarkGenerator::GetIdCollection(TileKey const & tileKe
 void UserMarkGenerator::CleanIndex()
 {
   for (auto tileIt = m_index.begin(); tileIt != m_index.end();)
-  {
     if (tileIt->second->empty())
       tileIt = m_index.erase(tileIt);
     else
       ++tileIt;
-  }
 
   for (auto & tileGroups : m_index)
   {
     for (auto groupIt = tileGroups.second->begin(); groupIt != tileGroups.second->end();)
-    {
       if (groupIt->second->IsEmpty())
         groupIt = tileGroups.second->erase(groupIt);
       else
         ++groupIt;
-    }
   }
 }
 
@@ -216,22 +209,17 @@ ref_ptr<MarksIDGroups> UserMarkGenerator::GetUserLinesGroups(TileKey const & til
 {
   auto itTile = m_index.end();
   int const lineZoom = GetNearestLineIndexZoom(tileKey.m_zoomLevel);
-  CalcTilesCoverage(tileKey.GetGlobalRect(), lineZoom,
-                    [this, &itTile, lineZoom](int tileX, int tileY)
-  {
-    itTile = m_index.find(TileKey(tileX, tileY, lineZoom));
-  });
+  CalcTilesCoverage(tileKey.GetGlobalRect(), lineZoom, [this, &itTile, lineZoom](int tileX, int tileY)
+  { itTile = m_index.find(TileKey(tileX, tileY, lineZoom)); });
   if (itTile != m_index.end())
     return make_ref(itTile->second);
   return nullptr;
 }
 
-void UserMarkGenerator::GenerateUserMarksGeometry(ref_ptr<dp::GraphicsContext> context,
-                                                  TileKey const & tileKey,
+void UserMarkGenerator::GenerateUserMarksGeometry(ref_ptr<dp::GraphicsContext> context, TileKey const & tileKey,
                                                   ref_ptr<dp::TextureManager> textures)
 {
-  auto const clippedTileKey =
-      TileKey(tileKey.m_x, tileKey.m_y, ClipTileZoomByMaxDataZoom(tileKey.m_zoomLevel));
+  auto const clippedTileKey = TileKey(tileKey.m_x, tileKey.m_y, ClipTileZoomByMaxDataZoom(tileKey.m_zoomLevel));
   auto marksGroups = GetUserMarksGroups(clippedTileKey);
   auto linesGroups = GetUserLinesGroups(clippedTileKey);
 
@@ -243,11 +231,9 @@ void UserMarkGenerator::GenerateUserMarksGeometry(ref_ptr<dp::GraphicsContext> c
   batcher.SetBatcherHash(tileKey.GetHashValue(BatcherBucket::UserMark));
   TUserMarksRenderData renderData;
   {
-    dp::SessionGuard guard(context, batcher, [&tileKey, &renderData](dp::RenderState const & state,
-                                                                     drape_ptr<dp::RenderBucket> && b)
-    {
-      renderData.emplace_back(state, std::move(b), tileKey);
-    });
+    dp::SessionGuard guard(context, batcher,
+                           [&tileKey, &renderData](dp::RenderState const & state, drape_ptr<dp::RenderBucket> && b)
+    { renderData.emplace_back(state, std::move(b), tileKey); });
 
     if (marksGroups != nullptr)
       CacheUserMarks(context, tileKey, *marksGroups.get(), textures, batcher);
@@ -257,38 +243,32 @@ void UserMarkGenerator::GenerateUserMarksGeometry(ref_ptr<dp::GraphicsContext> c
   m_flushFn(std::move(renderData));
 }
 
-void UserMarkGenerator::CacheUserLines(ref_ptr<dp::GraphicsContext> context,
-                                       TileKey const & tileKey, MarksIDGroups const & indexesGroups,
-                                       ref_ptr<dp::TextureManager> textures, dp::Batcher & batcher) const
+void UserMarkGenerator::CacheUserLines(ref_ptr<dp::GraphicsContext> context, TileKey const & tileKey,
+                                       MarksIDGroups const & indexesGroups, ref_ptr<dp::TextureManager> textures,
+                                       dp::Batcher & batcher) const
 {
   for (auto const & gp : indexesGroups)
-  {
     if (m_groupsVisibility.find(gp.first) != m_groupsVisibility.end())
       df::CacheUserLines(context, tileKey, textures, gp.second->m_lineIds, m_lines, batcher);
-  }
 }
 
-void UserMarkGenerator::CacheUserMarks(ref_ptr<dp::GraphicsContext> context,
-                                       TileKey const & tileKey, MarksIDGroups const & indexesGroups,
-                                       ref_ptr<dp::TextureManager> textures, dp::Batcher & batcher) const
+void UserMarkGenerator::CacheUserMarks(ref_ptr<dp::GraphicsContext> context, TileKey const & tileKey,
+                                       MarksIDGroups const & indexesGroups, ref_ptr<dp::TextureManager> textures,
+                                       dp::Batcher & batcher) const
 {
   for (auto const & gp : indexesGroups)
-  {
     if (m_groupsVisibility.find(gp.first) != m_groupsVisibility.end())
       df::CacheUserMarks(context, tileKey, textures, gp.second->m_markIds, m_marks, batcher);
-  }
 }
 
 int UserMarkGenerator::GetNearestLineIndexZoom(int zoom) const
 {
   int nearestZoom = kLineIndexingLevels[0];
   for (size_t i = 1; i < kLineIndexingLevels.size(); ++i)
-  {
     if (kLineIndexingLevels[i] <= zoom)
       nearestZoom = kLineIndexingLevels[i];
     else
       break;
-  }
   return nearestZoom;
 }
 }  // namespace df
diff --git a/libs/drape_frontend/user_mark_shapes.cpp b/libs/drape_frontend/user_mark_shapes.cpp
index 4bb9e0f36..15ab19e5d 100644
--- a/libs/drape_frontend/user_mark_shapes.cpp
+++ b/libs/drape_frontend/user_mark_shapes.cpp
@@ -11,9 +11,9 @@
 
 #include "shaders/programs.hpp"
 
-#include "drape/utils/vertex_decl.hpp"
 #include "drape/attribute_provider.hpp"
 #include "drape/batcher.hpp"
+#include "drape/utils/vertex_decl.hpp"
 
 #include "indexer/feature_decl.hpp"
 #include "indexer/scales.hpp"
@@ -29,15 +29,13 @@ namespace df
 {
 namespace
 {
-std::array<double, 20> constexpr kLineWidthZoomFactor =
-{
-// 1   2    3    4    5    6    7    8    9    10   11   12   13   14   15   16   17   18   19   20
-  0.3, 0.3, 0.3, 0.4, 0.5, 0.6, 0.7, 0.7, 0.7, 0.7, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0
-};
+std::array<double, 20> constexpr kLineWidthZoomFactor = {
+    // 1   2    3    4    5    6    7    8    9    10   11   12   13   14   15   16   17   18   19   20
+    0.3, 0.3, 0.3, 0.4, 0.5, 0.6, 0.7, 0.7, 0.7, 0.7, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0};
 
 template <typename TCreateVector>
-void AlignFormingNormals(TCreateVector const & fn, dp::Anchor anchor, dp::Anchor first,
-                         dp::Anchor second, glsl::vec2 & firstNormal, glsl::vec2 & secondNormal)
+void AlignFormingNormals(TCreateVector const & fn, dp::Anchor anchor, dp::Anchor first, dp::Anchor second,
+                         glsl::vec2 & firstNormal, glsl::vec2 & secondNormal)
 {
   firstNormal = fn();
   secondNormal = -firstNormal;
@@ -55,14 +53,12 @@ void AlignFormingNormals(TCreateVector const & fn, dp::Anchor anchor, dp::Anchor
 
 void AlignHorizontal(float halfWidth, dp::Anchor anchor, glsl::vec2 & left, glsl::vec2 & right)
 {
-  AlignFormingNormals([&halfWidth] { return glsl::vec2(-halfWidth, 0.0f); }, anchor, dp::Left,
-                      dp::Right, left, right);
+  AlignFormingNormals([&halfWidth] { return glsl::vec2(-halfWidth, 0.0f); }, anchor, dp::Left, dp::Right, left, right);
 }
 
 void AlignVertical(float halfHeight, dp::Anchor anchor, glsl::vec2 & up, glsl::vec2 & down)
 {
-  AlignFormingNormals([&halfHeight] { return glsl::vec2(0.0f, -halfHeight); }, anchor, dp::Top,
-                      dp::Bottom, up, down);
+  AlignFormingNormals([&halfHeight] { return glsl::vec2(0.0f, -halfHeight); }, anchor, dp::Top, dp::Bottom, up, down);
 }
 
 struct UserPointVertex : public gpu::BaseVertex
@@ -73,8 +69,8 @@ struct UserPointVertex : public gpu::BaseVertex
   using TAnimateOrZ = float;
 
   UserPointVertex() = default;
-  UserPointVertex(TPosition const & pos, TNormalAndAnimateOrZ const & normalAndAnimateOrZ,
-                  TTexCoord const & texCoord, TColor const & color)
+  UserPointVertex(TPosition const & pos, TNormalAndAnimateOrZ const & normalAndAnimateOrZ, TTexCoord const & texCoord,
+                  TColor const & color)
     : m_position(pos)
     , m_normalAndAnimateOrZ(normalAndAnimateOrZ)
     , m_texCoord(texCoord)
@@ -86,10 +82,9 @@ struct UserPointVertex : public gpu::BaseVertex
     dp::BindingInfo info(4);
     uint8_t offset = 0;
     offset += dp::FillDecl<TPosition, UserPointVertex>(0, "a_position", info, offset);
-    offset += dp::FillDecl<TNormalAndAnimateOrZ, UserPointVertex>(1, "a_normalAndAnimateOrZ", info,
-                                                                  offset);
+    offset += dp::FillDecl<TNormalAndAnimateOrZ, UserPointVertex>(1, "a_normalAndAnimateOrZ", info, offset);
     offset += dp::FillDecl<TTexCoord, UserPointVertex>(2, "a_texCoords", info, offset);
-    /*offset += */dp::FillDecl<TColor, UserPointVertex>(3, "a_color", info, offset);
+    /*offset += */ dp::FillDecl<TColor, UserPointVertex>(3, "a_color", info, offset);
 
     return info;
   }
@@ -106,10 +101,8 @@ std::string GetSymbolNameForZoomLevel(ref_ptr<UserPointMark::SymbolNameZoomInfo>
     return {};
 
   for (auto itName = symbolNames->crbegin(); itName != symbolNames->crend(); ++itName)
-  {
     if (itName->first <= tileKey.m_zoomLevel)
       return itName->second;
-  }
   return {};
 }
 
@@ -206,15 +199,14 @@ void GenerateColoredSymbolShapes(ref_ptr<dp::GraphicsContext> context, ref_ptr<d
   params.m_offset += offset;
   if (renderInfo.m_symbolSizes != nullptr)
   {
-    ColoredSymbolShape(renderInfo.m_pivot, params, tileKey,
-                       kStartUserMarkOverlayIndex + renderInfo.m_index,
+    ColoredSymbolShape(renderInfo.m_pivot, params, tileKey, kStartUserMarkOverlayIndex + renderInfo.m_index,
                        isTextBg ? symbolSizesInc : *renderInfo.m_symbolSizes.get())
         .Draw(context, &batcher, textures);
   }
   else
   {
-    ColoredSymbolShape(renderInfo.m_pivot, params, tileKey,
-                       kStartUserMarkOverlayIndex + renderInfo.m_index, renderInfo.m_coloredSymbols->m_needOverlay)
+    ColoredSymbolShape(renderInfo.m_pivot, params, tileKey, kStartUserMarkOverlayIndex + renderInfo.m_index,
+                       renderInfo.m_coloredSymbols->m_needOverlay)
         .Draw(context, &batcher, textures);
   }
 }
@@ -241,15 +233,13 @@ void GeneratePoiSymbolShape(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Te
   bool const hasColoredOverlay = renderInfo.m_coloredSymbols != nullptr && renderInfo.m_coloredSymbols->m_needOverlay;
   params.m_startOverlayRank = hasColoredOverlay ? dp::OverlayRank1 : dp::OverlayRank0;
 
-  PoiSymbolShape(renderInfo.m_pivot, params, tileKey,
-                 kStartUserMarkOverlayIndex + renderInfo.m_index)
+  PoiSymbolShape(renderInfo.m_pivot, params, tileKey, kStartUserMarkOverlayIndex + renderInfo.m_index)
       .Draw(context, &batcher, textures);
 }
 
 void GenerateTextShapes(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::TextureManager> textures,
-                        UserMarkRenderParams const & renderInfo, TileKey const & tileKey,
-                        m2::PointD const & tileCenter, m2::PointF const & symbolOffset,
-                        m2::PointF const & symbolSize, dp::Batcher & batcher)
+                        UserMarkRenderParams const & renderInfo, TileKey const & tileKey, m2::PointD const & tileCenter,
+                        m2::PointF const & symbolOffset, m2::PointF const & symbolSize, dp::Batcher & batcher)
 {
   if (renderInfo.m_minTitleZoom > tileKey.m_zoomLevel)
     return;
@@ -303,8 +293,7 @@ void GenerateTextShapes(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::Textur
     }
     else
     {
-      TextShape(renderInfo.m_pivot, params, tileKey, symbolSize, symbolOffset, renderInfo.m_anchor,
-                overlayIndex)
+      TextShape(renderInfo.m_pivot, params, tileKey, symbolSize, symbolOffset, renderInfo.m_anchor, overlayIndex)
           .Draw(context, &batcher, textures);
     }
   }
@@ -345,10 +334,8 @@ std::string GetBackgroundSymbolName(std::string const & symbolName)
   return res;
 }
 
-drape_ptr<dp::OverlayHandle> CreateSymbolOverlayHandle(UserMarkRenderParams const & renderInfo,
-                                                       TileKey const & tileKey,
-                                                       m2::PointF const & symbolOffset,
-                                                       m2::RectD const & pixelRect)
+drape_ptr<dp::OverlayHandle> CreateSymbolOverlayHandle(UserMarkRenderParams const & renderInfo, TileKey const & tileKey,
+                                                       m2::PointF const & symbolOffset, m2::RectD const & pixelRect)
 {
   if (!renderInfo.m_isSymbolSelectable || !renderInfo.m_isNonDisplaceable)
     return nullptr;
@@ -356,16 +343,15 @@ drape_ptr<dp::OverlayHandle> CreateSymbolOverlayHandle(UserMarkRenderParams cons
   dp::OverlayID overlayId(renderInfo.m_featureId, renderInfo.m_markId, tileKey.GetTileCoords(),
                           kStartUserMarkOverlayIndex + renderInfo.m_index);
   drape_ptr<dp::OverlayHandle> handle = make_unique_dp<dp::SquareHandle>(
-      overlayId, renderInfo.m_anchor, renderInfo.m_pivot,
-      pixelRect.RightTop() - pixelRect.LeftBottom(), m2::PointD(symbolOffset), 0 /*priority*/,
-      true /* isBound */, renderInfo.m_minZoom, true /* isBillboard */);
+      overlayId, renderInfo.m_anchor, renderInfo.m_pivot, pixelRect.RightTop() - pixelRect.LeftBottom(),
+      m2::PointD(symbolOffset), 0 /*priority*/, true /* isBound */, renderInfo.m_minZoom, true /* isBillboard */);
   return handle;
 }
 }  // namespace
 
-void CacheUserMarks(ref_ptr<dp::GraphicsContext> context, TileKey const & tileKey,
-                    ref_ptr<dp::TextureManager> textures, kml::MarkIdCollection const & marksId,
-                    UserMarksRenderCollection const & renderParams, dp::Batcher & batcher)
+void CacheUserMarks(ref_ptr<dp::GraphicsContext> context, TileKey const & tileKey, ref_ptr<dp::TextureManager> textures,
+                    kml::MarkIdCollection const & marksId, UserMarksRenderCollection const & renderParams,
+                    dp::Batcher & batcher)
 {
   using UPV = UserPointVertex;
   buffer_vector<UPV, dp::Batcher::VertexPerQuad> buffer;
@@ -422,8 +408,7 @@ void CacheUserMarks(ref_ptr<dp::GraphicsContext> context, TileKey const & tileKe
         m2::RectF const & bgTexRect = backgroundRegion.GetTexRect();
         m2::PointF const pxSize = symbolRegion.GetPixelSize();
         dp::Anchor const anchor = renderInfo.m_anchor;
-        m2::PointD const pt = MapShape::ConvertToLocal(renderInfo.m_pivot, tileCenter,
-                                                       kShapeCoordScalar);
+        m2::PointD const pt = MapShape::ConvertToLocal(renderInfo.m_pivot, tileCenter, kShapeCoordScalar);
         glsl::vec3 const pos = glsl::vec3(glsl::ToVec2(pt), renderInfo.m_depth);
         bool const runAnim = renderInfo.m_hasCreationAnimation && renderInfo.m_justCreated;
 
@@ -438,51 +423,39 @@ void CacheUserMarks(ref_ptr<dp::GraphicsContext> context, TileKey const & tileKe
         if (!renderInfo.m_color.empty())
           color = df::GetColorConstant(renderInfo.m_color);
 
-        glsl::vec4 maskColor(color.GetRedF(), color.GetGreenF(), color.GetBlueF(),
-                             renderInfo.m_symbolOpacity);
+        glsl::vec4 maskColor(color.GetRedF(), color.GetGreenF(), color.GetBlueF(), renderInfo.m_symbolOpacity);
         float animateOrZ = 0.0f;
         if (!renderInfo.m_customDepth)
           animateOrZ = runAnim ? 1.0f : -1.0f;
 
-        buffer.emplace_back(
-            pos, glsl::vec3(left + down + offset, animateOrZ),
-            glsl::ToVec4(m2::PointD(texRect.LeftTop()), m2::PointD(bgTexRect.LeftTop())),
-            maskColor);
-        buffer.emplace_back(
-            pos, glsl::vec3(left + up + offset, animateOrZ),
-            glsl::ToVec4(m2::PointD(texRect.LeftBottom()), m2::PointD(bgTexRect.LeftBottom())),
-            maskColor);
-        buffer.emplace_back(
-            pos, glsl::vec3(right + down + offset, animateOrZ),
-            glsl::ToVec4(m2::PointD(texRect.RightTop()), m2::PointD(bgTexRect.RightTop())),
-            maskColor);
-        buffer.emplace_back(
-            pos, glsl::vec3(right + up + offset, animateOrZ),
-            glsl::ToVec4(m2::PointD(texRect.RightBottom()), m2::PointD(bgTexRect.RightBottom())),
-            maskColor);
+        buffer.emplace_back(pos, glsl::vec3(left + down + offset, animateOrZ),
+                            glsl::ToVec4(m2::PointD(texRect.LeftTop()), m2::PointD(bgTexRect.LeftTop())), maskColor);
+        buffer.emplace_back(pos, glsl::vec3(left + up + offset, animateOrZ),
+                            glsl::ToVec4(m2::PointD(texRect.LeftBottom()), m2::PointD(bgTexRect.LeftBottom())),
+                            maskColor);
+        buffer.emplace_back(pos, glsl::vec3(right + down + offset, animateOrZ),
+                            glsl::ToVec4(m2::PointD(texRect.RightTop()), m2::PointD(bgTexRect.RightTop())), maskColor);
+        buffer.emplace_back(pos, glsl::vec3(right + up + offset, animateOrZ),
+                            glsl::ToVec4(m2::PointD(texRect.RightBottom()), m2::PointD(bgTexRect.RightBottom())),
+                            maskColor);
 
         m2::RectD rect;
         for (auto const & vertex : buffer)
           rect.Add(glsl::FromVec2(glsl::vec2(vertex.m_normalAndAnimateOrZ)));
 
-        drape_ptr<dp::OverlayHandle> overlayHandle =
-            CreateSymbolOverlayHandle(renderInfo, tileKey, symbolOffset, rect);
+        drape_ptr<dp::OverlayHandle> overlayHandle = CreateSymbolOverlayHandle(renderInfo, tileKey, symbolOffset, rect);
 
         gpu::Program program;
         gpu::Program program3d;
         if (renderInfo.m_isMarkAboveText)
         {
-          program = runAnim ? gpu::Program::BookmarkAnimAboveText
-                            : gpu::Program::BookmarkAboveText;
-          program3d = runAnim ? gpu::Program::BookmarkAnimAboveTextBillboard
-                              : gpu::Program::BookmarkAboveTextBillboard;
+          program = runAnim ? gpu::Program::BookmarkAnimAboveText : gpu::Program::BookmarkAboveText;
+          program3d = runAnim ? gpu::Program::BookmarkAnimAboveTextBillboard : gpu::Program::BookmarkAboveTextBillboard;
         }
         else
         {
-          program = runAnim ? gpu::Program::BookmarkAnim
-                            : gpu::Program::Bookmark;
-          program3d = runAnim ? gpu::Program::BookmarkAnimBillboard
-                              : gpu::Program::BookmarkBillboard;
+          program = runAnim ? gpu::Program::BookmarkAnim : gpu::Program::Bookmark;
+          program3d = runAnim ? gpu::Program::BookmarkAnimBillboard : gpu::Program::BookmarkBillboard;
         }
         auto state = CreateRenderState(program, renderInfo.m_depthLayer);
         state.SetProgram3d(program3d);
@@ -494,8 +467,8 @@ void CacheUserMarks(ref_ptr<dp::GraphicsContext> context, TileKey const & tileKe
         dp::AttributeProvider attribProvider(1, static_cast<uint32_t>(buffer.size()));
         attribProvider.InitStream(0, UPV::GetBinding(), make_ref(buffer.data()));
 
-        batcher.InsertListOfStrip(context, state, make_ref(&attribProvider),
-                                  std::move(overlayHandle), dp::Batcher::VertexPerQuad);
+        batcher.InsertListOfStrip(context, state, make_ref(&attribProvider), std::move(overlayHandle),
+                                  dp::Batcher::VertexPerQuad);
       }
     }
 
@@ -507,7 +480,7 @@ void CacheUserMarks(ref_ptr<dp::GraphicsContext> context, TileKey const & tileKe
 }
 
 void ProcessSplineSegmentRects(m2::SharedSpline const & spline, double maxSegmentLength,
-                               const std::function<bool(const m2::RectD & segmentRect)> & func)
+                               std::function<bool(m2::RectD const & segmentRect)> const & func)
 {
   double const splineFullLength = spline->GetLength();
   double length = 0;
@@ -524,10 +497,7 @@ void ProcessSplineSegmentRects(m2::SharedSpline const & spline, double maxSegmen
       splineRect.Add(spline->GetPath().back());
     }
 
-    spline->ForEachNode(itBegin, itEnd, [&splineRect](m2::PointD const & pt)
-    {
-      splineRect.Add(pt);
-    });
+    spline->ForEachNode(itBegin, itEnd, [&splineRect](m2::PointD const & pt) { splineRect.Add(pt); });
 
     length += maxSegmentLength;
 
@@ -536,9 +506,9 @@ void ProcessSplineSegmentRects(m2::SharedSpline const & spline, double maxSegmen
   }
 }
 
-void CacheUserLines(ref_ptr<dp::GraphicsContext> context, TileKey const & tileKey,
-                    ref_ptr<dp::TextureManager> textures, kml::TrackIdCollection const & linesId,
-                    UserLinesRenderCollection const & renderParams, dp::Batcher & batcher)
+void CacheUserLines(ref_ptr<dp::GraphicsContext> context, TileKey const & tileKey, ref_ptr<dp::TextureManager> textures,
+                    kml::TrackIdCollection const & linesId, UserLinesRenderCollection const & renderParams,
+                    dp::Batcher & batcher)
 {
   CHECK_GREATER(tileKey.m_zoomLevel, 0, ());
   CHECK_LESS(tileKey.m_zoomLevel - 1, static_cast<int>(kLineWidthZoomFactor.size()), ());
@@ -554,7 +524,7 @@ void CacheUserLines(ref_ptr<dp::GraphicsContext> context, TileKey const & tileKe
   m2::RectD const tileRect = tileKey.GetGlobalRect();
 
   // Process spline by segments that are no longer than tile size.
-  //double const maxLength = mercator::Bounds::kRangeX / (1 << (tileKey.m_zoomLevel - 1));
+  // double const maxLength = mercator::Bounds::kRangeX / (1 << (tileKey.m_zoomLevel - 1));
 
   for (auto const & id : linesId)
   {
@@ -613,4 +583,4 @@ void CacheUserLines(ref_ptr<dp::GraphicsContext> context, TileKey const & tileKe
     }
   }
 }
-} // namespace df
+}  // namespace df
diff --git a/libs/drape_frontend/user_mark_shapes.hpp b/libs/drape_frontend/user_mark_shapes.hpp
index 043234d29..2bc0f58c0 100644
--- a/libs/drape_frontend/user_mark_shapes.hpp
+++ b/libs/drape_frontend/user_mark_shapes.hpp
@@ -38,7 +38,7 @@ struct UserMarkRenderParams
   bool m_customDepth = false;
   DepthLayer m_depthLayer = DepthLayer::UserMarkLayer;
   bool m_hasCreationAnimation = false;
-  mutable bool m_justCreated = false;   ///< will be reset after first caching
+  mutable bool m_justCreated = false;  ///< will be reset after first caching
   bool m_isVisible = true;
   FeatureID m_featureId;
   bool m_isMarkAboveText = false;
@@ -50,11 +50,7 @@ struct UserMarkRenderParams
 struct LineLayer
 {
   LineLayer() = default;
-  LineLayer(dp::Color color, float width, float depth)
-    : m_color(color)
-    , m_width(width)
-    , m_depth(depth)
-  {}
+  LineLayer(dp::Color color, float width, float depth) : m_color(color), m_width(width), m_depth(depth) {}
 
   dp::Color m_color;
   float m_width = 0.0;
@@ -74,10 +70,10 @@ using UserLinesRenderCollection = std::unordered_map<kml::MarkId, drape_ptr<User
 
 struct UserMarkRenderData
 {
-  UserMarkRenderData(dp::RenderState const & state,
-                     drape_ptr<dp::RenderBucket> && bucket,
-                     TileKey const & tileKey)
-    : m_state(state), m_bucket(std::move(bucket)), m_tileKey(tileKey)
+  UserMarkRenderData(dp::RenderState const & state, drape_ptr<dp::RenderBucket> && bucket, TileKey const & tileKey)
+    : m_state(state)
+    , m_bucket(std::move(bucket))
+    , m_tileKey(tileKey)
   {}
 
   dp::RenderState m_state;
@@ -90,11 +86,11 @@ using TUserMarksRenderData = std::vector<UserMarkRenderData>;
 void ProcessSplineSegmentRects(m2::SharedSpline const & spline, double maxSegmentLength,
                                std::function<bool(m2::RectD const & segmentRect)> const & func);
 
-void CacheUserMarks(ref_ptr<dp::GraphicsContext> context, TileKey const & tileKey,
-                    ref_ptr<dp::TextureManager> textures, kml::MarkIdCollection const & marksId,
-                    UserMarksRenderCollection const & renderParams, dp::Batcher & batcher);
+void CacheUserMarks(ref_ptr<dp::GraphicsContext> context, TileKey const & tileKey, ref_ptr<dp::TextureManager> textures,
+                    kml::MarkIdCollection const & marksId, UserMarksRenderCollection const & renderParams,
+                    dp::Batcher & batcher);
 
-void CacheUserLines(ref_ptr<dp::GraphicsContext> context, TileKey const & tileKey,
-                    ref_ptr<dp::TextureManager> textures, kml::TrackIdCollection const & linesId,
-                    UserLinesRenderCollection const & renderParams, dp::Batcher & batcher);
+void CacheUserLines(ref_ptr<dp::GraphicsContext> context, TileKey const & tileKey, ref_ptr<dp::TextureManager> textures,
+                    kml::TrackIdCollection const & linesId, UserLinesRenderCollection const & renderParams,
+                    dp::Batcher & batcher);
 }  // namespace df
diff --git a/libs/drape_frontend/user_marks_provider.cpp b/libs/drape_frontend/user_marks_provider.cpp
index eb8383587..91ac8153f 100644
--- a/libs/drape_frontend/user_marks_provider.cpp
+++ b/libs/drape_frontend/user_marks_provider.cpp
@@ -2,15 +2,8 @@
 
 namespace df
 {
-UserPointMark::UserPointMark(kml::MarkId id)
-  : m_id(id)
-{
-}
+UserPointMark::UserPointMark(kml::MarkId id) : m_id(id) {}
 
-
-UserLineMark::UserLineMark(kml::TrackId id)
-  : m_id(id)
-{
-}
+UserLineMark::UserLineMark(kml::TrackId id) : m_id(id) {}
 
 }  // namespace df
diff --git a/libs/drape_frontend/user_marks_provider.hpp b/libs/drape_frontend/user_marks_provider.hpp
index d410eaeb1..d5f522325 100644
--- a/libs/drape_frontend/user_marks_provider.hpp
+++ b/libs/drape_frontend/user_marks_provider.hpp
@@ -23,10 +23,7 @@ struct IDCollections
   kml::MarkIdCollection m_markIds;
   kml::TrackIdCollection m_lineIds;
 
-  bool IsEmpty()
-  {
-    return m_markIds.empty() && m_lineIds.empty();
-  }
+  bool IsEmpty() { return m_markIds.empty() && m_lineIds.empty(); }
 
   void Clear()
   {
@@ -111,7 +108,7 @@ public:
   virtual float GetWidth(size_t layerIndex) const = 0;
   virtual float GetDepth(size_t layerIndex) const = 0;
 
-  using GeometryFnT = std::function<void (std::vector<m2::PointD> &&)>;
+  using GeometryFnT = std::function<void(std::vector<m2::PointD> &&)>;
   virtual void ForEachGeometry(GeometryFnT && fn) const = 0;
 
 private:
diff --git a/libs/drape_frontend/visual_params.cpp b/libs/drape_frontend/visual_params.cpp
index 420cb55ad..2c00cb2bc 100644
--- a/libs/drape_frontend/visual_params.cpp
+++ b/libs/drape_frontend/visual_params.cpp
@@ -20,7 +20,7 @@ using VisualScale = std::pair<std::string, double>;
 
 #ifdef DEBUG
 static bool g_isInited = false;
-#define RISE_INITED g_isInited = true
+#define RISE_INITED   g_isInited = true
 #define ASSERT_INITED ASSERT(g_isInited, ())
 #else
 #define RISE_INITED
@@ -43,9 +43,9 @@ void VisualParams::Init(double vs, uint32_t tileSize)
 
   // Here we set up glyphs rendering parameters separately for high-res and low-res screens.
   if (vs <= 1.0)
-    vizParams.m_glyphVisualParams = { 0.48f, 0.08f, 0.2f, 0.01f, 0.49f, 0.04f };
+    vizParams.m_glyphVisualParams = {0.48f, 0.08f, 0.2f, 0.01f, 0.49f, 0.04f};
   else
-    vizParams.m_glyphVisualParams = { 0.5f, 0.06f, 0.2f, 0.01f, 0.49f, 0.04f };
+    vizParams.m_glyphVisualParams = {0.5f, 0.06f, 0.2f, 0.01f, 0.49f, 0.04f};
 
   RISE_INITED;
 
@@ -76,16 +76,12 @@ void VisualParams::SetVisualScale(double visualScale)
 std::string const & VisualParams::GetResourcePostfix(double visualScale)
 {
   ASSERT_INITED;
-  static VisualScale postfixes[] =
-  {
-    /// @todo Not used in mobile because of minimal visual scale (@see visual_scale.hpp)
-    {"mdpi", kMdpiScale},
+  static VisualScale postfixes[] = {
+      /// @todo Not used in mobile because of minimal visual scale (@see visual_scale.hpp)
+      {"mdpi", kMdpiScale},
 
-    {"hdpi", kHdpiScale},
-    {"xhdpi", kXhdpiScale},
-    {"6plus", k6plusScale},
-    {"xxhdpi", kXxhdpiScale},
-    {"xxxhdpi", kXxxhdpiScale},
+      {"hdpi", kHdpiScale},     {"xhdpi", kXhdpiScale},     {"6plus", k6plusScale},
+      {"xxhdpi", kXxhdpiScale}, {"xxxhdpi", kXxxhdpiScale},
   };
 
   // Looking for the nearest available scale.
@@ -170,9 +166,7 @@ int GetTileScaleBase(ScreenBase const & s, uint32_t tileSize)
 
   m2::RectD glbRect;
   m2::PointD const pxCenter = tmpS.PixelRect().Center();
-  tmpS.PtoG(m2::RectD(pxCenter - m2::PointD(halfSize, halfSize),
-                      pxCenter + m2::PointD(halfSize, halfSize)),
-            glbRect);
+  tmpS.PtoG(m2::RectD(pxCenter - m2::PointD(halfSize, halfSize), pxCenter + m2::PointD(halfSize, halfSize)), glbRect);
 
   return GetTileScaleBase(glbRect);
 }
@@ -212,8 +206,8 @@ m2::RectD GetRectForDrawScale(int drawScale, m2::PointD const & center, uint32_t
 
   double const len = mercator::Bounds::kRangeX / factor;
 
-  return m2::RectD(mercator::ClampX(center.x - len), mercator::ClampY(center.y - len),
-                   mercator::ClampX(center.x + len), mercator::ClampY(center.y + len));
+  return m2::RectD(mercator::ClampX(center.x - len), mercator::ClampY(center.y - len), mercator::ClampX(center.x + len),
+                   mercator::ClampY(center.y + len));
 }
 
 m2::RectD GetRectForDrawScale(int drawScale, m2::PointD const & center)
diff --git a/libs/drape_frontend/visual_params.hpp b/libs/drape_frontend/visual_params.hpp
index 6eb980a89..082a9de58 100644
--- a/libs/drape_frontend/visual_params.hpp
+++ b/libs/drape_frontend/visual_params.hpp
@@ -26,9 +26,8 @@ public:
   static double constexpr kXxhdpiScale = 3.0;
   static double constexpr kXxxhdpiScale = 3.5;
 
-  static_assert(kMdpiScale < kHdpiScale && kHdpiScale < kXhdpiScale &&
-                kXhdpiScale < k6plusScale && k6plusScale < kXxhdpiScale &&
-                kXxhdpiScale < kXxxhdpiScale && kXxxhdpiScale <= kMaxVisualScale);
+  static_assert(kMdpiScale < kHdpiScale && kHdpiScale < kXhdpiScale && kXhdpiScale < k6plusScale &&
+                k6plusScale < kXxhdpiScale && kXxhdpiScale < kXxxhdpiScale && kXxxhdpiScale <= kMaxVisualScale);
 
   static void Init(double vs, uint32_t tileSize);
   static VisualParams & Instance();
@@ -72,7 +71,7 @@ private:
 
   uint32_t m_tileSize = 0;
   double m_visualScale = 0.0;
-  double m_poiExtendScale = 0.1; // Found empirically.
+  double m_poiExtendScale = 0.1;  // Found empirically.
   std::atomic<double> m_fontScale = 1.0;
 
   DISALLOW_COPY_AND_MOVE(VisualParams);
@@ -107,7 +106,8 @@ uint32_t CalculateTileSize(uint32_t screenWidth, uint32_t screenHeight);
 
 void ExtractZoomFactors(ScreenBase const & s, double & zoom, int & index, float & lerpCoef);
 
-template <class T> class ArrayView
+template <class T>
+class ArrayView
 {
   T const * m_arr;
   size_t m_size;
@@ -115,7 +115,10 @@ template <class T> class ArrayView
 public:
   using value_type = T;
 
-  template <class ArrayT> ArrayView(ArrayT const & arr) : m_arr(arr.data()), m_size(arr.size()) {}
+  template <class ArrayT>
+  ArrayView(ArrayT const & arr) : m_arr(arr.data())
+                                , m_size(arr.size())
+  {}
 
   ArrayView(ArrayView const &) = default;
   ArrayView(ArrayView &&) = default;
@@ -133,8 +136,8 @@ public:
   }
 };
 
-template <class ArrayT> typename ArrayT::value_type
-InterpolateByZoomLevels(int index, float lerpCoef, ArrayT const & values)
+template <class ArrayT>
+typename ArrayT::value_type InterpolateByZoomLevels(int index, float lerpCoef, ArrayT const & values)
 {
   ASSERT_GREATER_OR_EQUAL(index, 0, ());
   if (index + 1 < static_cast<int>(values.size()))
diff --git a/libs/editor/changeset_wrapper.cpp b/libs/editor/changeset_wrapper.cpp
index 15336e9c6..fe6b2e280 100644
--- a/libs/editor/changeset_wrapper.cpp
+++ b/libs/editor/changeset_wrapper.cpp
@@ -32,10 +32,9 @@ bool OsmFeatureHasTags(pugi::xml_node const & osmFt)
 
 std::string_view constexpr kVowels = "aeiouy";
 
-std::string_view constexpr kMainTags[] = {
-    "amenity", "shop", "tourism", "historic", "craft", "emergency", "barrier", "highway", "office",
-    "leisure", "waterway",  "natural", "place",  "entrance", "building", "man_made", "healthcare",
-    "attraction"};
+std::string_view constexpr kMainTags[] = {"amenity", "shop",     "tourism",  "historic", "craft",      "emergency",
+                                          "barrier", "highway",  "office",   "leisure",  "waterway",   "natural",
+                                          "place",   "entrance", "building", "man_made", "healthcare", "attraction"};
 
 std::string GetTypeForFeature(editor::XMLFeature const & node)
 {
@@ -83,7 +82,8 @@ std::vector<m2::PointD> NaiveSample(std::vector<m2::PointD> const & source, size
     do
     {
       index = distrib(engine);
-    } while (find(begin(indexes), end(indexes), index) != end(indexes));
+    }
+    while (find(begin(indexes), end(indexes), index) != end(indexes));
     result.push_back(source[index]);
     indexes.push_back(index);
   }
@@ -104,11 +104,10 @@ std::string DebugPrint(xml_document const & doc)
 
 namespace osm
 {
-ChangesetWrapper::ChangesetWrapper(std::string const & keySecret,
-                                   ServerApi06::KeyValueTags comments) noexcept
-  : m_changesetComments(std::move(comments)), m_api(OsmOAuth::ServerAuth(keySecret))
-{
-}
+ChangesetWrapper::ChangesetWrapper(std::string const & keySecret, ServerApi06::KeyValueTags comments) noexcept
+  : m_changesetComments(std::move(comments))
+  , m_api(OsmOAuth::ServerAuth(keySecret))
+{}
 
 ChangesetWrapper::~ChangesetWrapper()
 {
@@ -127,21 +126,18 @@ ChangesetWrapper::~ChangesetWrapper()
   }
 }
 
-void ChangesetWrapper::LoadXmlFromOSM(ms::LatLon const & ll, pugi::xml_document & doc,
-                                      double radiusInMeters)
+void ChangesetWrapper::LoadXmlFromOSM(ms::LatLon const & ll, pugi::xml_document & doc, double radiusInMeters)
 {
   auto const response = m_api.GetXmlFeaturesAtLatLon(ll.m_lat, ll.m_lon, radiusInMeters);
   if (response.first != OsmOAuth::HTTP::OK)
     MYTHROW(HttpErrorException, ("HTTP error", response, "with GetXmlFeaturesAtLatLon", ll));
 
   if (pugi::status_ok != doc.load_string(response.second.c_str()).status)
-    MYTHROW(
-        OsmXmlParseException,
-        ("Can't parse OSM server response for GetXmlFeaturesAtLatLon request", response.second));
+    MYTHROW(OsmXmlParseException,
+            ("Can't parse OSM server response for GetXmlFeaturesAtLatLon request", response.second));
 }
 
-void ChangesetWrapper::LoadXmlFromOSM(ms::LatLon const & min, ms::LatLon const & max,
-                                      pugi::xml_document & doc)
+void ChangesetWrapper::LoadXmlFromOSM(ms::LatLon const & min, ms::LatLon const & max, pugi::xml_document & doc)
 {
   auto const response = m_api.GetXmlFeaturesInRect(min.m_lat, min.m_lon, max.m_lat, max.m_lon);
   if (response.first != OsmOAuth::HTTP::OK)
@@ -266,11 +262,7 @@ std::string ChangesetWrapper::TypeCountToString(TypeCount const & typeCount)
   // Convert map to vector and sort pairs by count, descending.
   std::vector<std::pair<std::string, size_t>> items{typeCount.begin(), typeCount.end()};
 
-  sort(items.begin(), items.end(),
-       [](auto const & a, auto const & b)
-       {
-         return a.second > b.second;
-       });
+  sort(items.begin(), items.end(), [](auto const & a, auto const & b) { return a.second > b.second; });
 
   std::ostringstream ss;
   size_t const limit = std::min(size_t(3), items.size());
@@ -299,16 +291,12 @@ std::string ChangesetWrapper::TypeCountToString(TypeCount const & typeCount)
 
     // Format a count: "a shop" for single shop, "4 shops" for multiple.
     if (currentPair.second == 1)
-    {
       if (kVowels.find(currentPair.first.front()) != std::string::npos)
         ss << "an";
       else
         ss << "a";
-    }
     else
-    {
       ss << currentPair.second;
-    }
     ss << ' ' << currentPair.first;
     if (currentPair.second > 1)
     {
diff --git a/libs/editor/editor_config.cpp b/libs/editor/editor_config.cpp
index bf2b59e02..e5ad6a2e0 100644
--- a/libs/editor/editor_config.cpp
+++ b/libs/editor/editor_config.cpp
@@ -57,15 +57,15 @@ bool TypeDescriptionFromXml(pugi::xml_node const & root, pugi::xml_node const &
   if (!node || strcmp(node.attribute("editable").value(), "no") == 0)
     return false;
 
-  auto const handleField = [&outDesc](std::string const & fieldName) {
+  auto const handleField = [&outDesc](std::string const & fieldName)
+  {
     if (fieldName == "name")
     {
       outDesc.m_name = true;
       return;
     }
 
-    if (fieldName == "street" || fieldName == "housenumber" || fieldName == "housename" ||
-        fieldName == "postcode")
+    if (fieldName == "street" || fieldName == "housenumber" || fieldName == "housename" || fieldName == "postcode")
     {
       outDesc.m_address = true;
       return;
@@ -118,16 +118,16 @@ std::vector<pugi::xml_node> GetPrioritizedTypes(pugi::xml_node const & node)
   std::vector<pugi::xml_node> result;
   for (auto const & xNode : node.select_nodes("/comaps/editor/types/type[@id]"))
     result.push_back(xNode.node());
-  stable_sort(begin(result), end(result),
-              [](pugi::xml_node const & lhs, pugi::xml_node const & rhs) {
-                auto const lhsWeight = kPriorityWeights.find(lhs.attribute("priority").value());
-                auto const rhsWeight = kPriorityWeights.find(rhs.attribute("priority").value());
+  stable_sort(begin(result), end(result), [](pugi::xml_node const & lhs, pugi::xml_node const & rhs)
+  {
+    auto const lhsWeight = kPriorityWeights.find(lhs.attribute("priority").value());
+    auto const rhsWeight = kPriorityWeights.find(rhs.attribute("priority").value());
 
-                CHECK(lhsWeight != kPriorityWeights.end(), (""));
-                CHECK(rhsWeight != kPriorityWeights.end(), (""));
+    CHECK(lhsWeight != kPriorityWeights.end(), (""));
+    CHECK(rhsWeight != kPriorityWeights.end(), (""));
 
-                return lhsWeight->second < rhsWeight->second;
-              });
+    return lhsWeight->second < rhsWeight->second;
+  });
   return result;
 }
 }  // namespace
@@ -158,9 +158,7 @@ bool EditorConfig::GetTypeDescription(std::vector<std::string> classificatorType
 
   auto const typeNodes = GetPrioritizedTypes(m_document);
   auto const it = base::FindIf(typeNodes, [&classificatorTypes](pugi::xml_node const & node)
-  {
-    return base::IsExist(classificatorTypes, node.attribute("id").value());
-  });
+  { return base::IsExist(classificatorTypes, node.attribute("id").value()); });
   if (it == end(typeNodes))
     return isBuilding;
 
@@ -169,8 +167,7 @@ bool EditorConfig::GetTypeDescription(std::vector<std::string> classificatorType
 
 std::vector<std::string> EditorConfig::GetTypesThatCanBeAdded() const
 {
-  auto const xpathResult =
-      m_document.select_nodes("/comaps/editor/types/type[not(@can_add='no' or @editable='no')]");
+  auto const xpathResult = m_document.select_nodes("/comaps/editor/types/type[not(@can_add='no' or @editable='no')]");
 
   std::vector<std::string> result;
   for (auto const & xNode : xpathResult)
@@ -178,5 +175,8 @@ std::vector<std::string> EditorConfig::GetTypesThatCanBeAdded() const
   return result;
 }
 
-void EditorConfig::SetConfig(pugi::xml_document const & doc) { m_document.reset(doc); }
+void EditorConfig::SetConfig(pugi::xml_document const & doc)
+{
+  m_document.reset(doc);
+}
 }  // namespace editor
diff --git a/libs/editor/editor_config.hpp b/libs/editor/editor_config.hpp
index a1be7c2eb..21e7e2c56 100644
--- a/libs/editor/editor_config.hpp
+++ b/libs/editor/editor_config.hpp
@@ -18,8 +18,7 @@ struct TypeAggregatedDescription
 
   bool IsEmpty() const
   {
-    return IsNameEditable() || IsAddressEditable() || IsCuisineEditable() ||
-           !m_editableFields.empty();
+    return IsNameEditable() || IsAddressEditable() || IsCuisineEditable() || !m_editableFields.empty();
   }
 
   FeatureFields const & GetEditableFields() const { return m_editableFields; }
@@ -41,15 +40,14 @@ public:
   EditorConfig() = default;
 
   // TODO(mgsergio): Reduce overhead by matching uint32_t types instead of strings.
-  bool GetTypeDescription(std::vector<std::string> classificatorTypes,
-                          TypeAggregatedDescription & outDesc) const;
+  bool GetTypeDescription(std::vector<std::string> classificatorTypes, TypeAggregatedDescription & outDesc) const;
   std::vector<std::string> GetTypesThatCanBeAdded() const;
 
   void SetConfig(pugi::xml_document const & doc);
 
   // TODO(mgsergio): Implement this getter to avoid hard-code in XMLFeature::ApplyPatch.
   // It should return [[phone, contact:phone, contact:mobile], [website, contact:website, url], ...].
-  //vector<vector<string>> GetAlternativeFields() const;
+  // vector<vector<string>> GetAlternativeFields() const;
 
 private:
   pugi::xml_document m_document;
diff --git a/libs/editor/editor_notes.cpp b/libs/editor/editor_notes.cpp
index 4018b0714..3bc1f4a21 100644
--- a/libs/editor/editor_notes.cpp
+++ b/libs/editor/editor_notes.cpp
@@ -18,8 +18,7 @@
 
 namespace
 {
-bool LoadFromXml(pugi::xml_document const & xml, std::list<editor::Note> & notes,
-                 uint32_t & uploadedNotesCount)
+bool LoadFromXml(pugi::xml_document const & xml, std::list<editor::Note> & notes, uint32_t & uploadedNotesCount)
 {
   uint64_t notesCount;
   auto const root = xml.child("notes");
@@ -55,8 +54,7 @@ bool LoadFromXml(pugi::xml_document const & xml, std::list<editor::Note> & notes
   return true;
 }
 
-void SaveToXml(std::list<editor::Note> const & notes, pugi::xml_document & xml,
-               uint32_t const uploadedNotesCount)
+void SaveToXml(std::list<editor::Note> const & notes, pugi::xml_document & xml, uint32_t const uploadedNotesCount)
 {
   auto constexpr kDigitsAfterComma = 7;
   auto root = xml.append_child("notes");
@@ -65,17 +63,14 @@ void SaveToXml(std::list<editor::Note> const & notes, pugi::xml_document & xml,
   {
     auto node = root.append_child("note");
 
-    node.append_attribute("lat") =
-        strings::to_string_dac(note.m_point.m_lat, kDigitsAfterComma).data();
-    node.append_attribute("lon") =
-        strings::to_string_dac(note.m_point.m_lon, kDigitsAfterComma).data();
+    node.append_attribute("lat") = strings::to_string_dac(note.m_point.m_lat, kDigitsAfterComma).data();
+    node.append_attribute("lon") = strings::to_string_dac(note.m_point.m_lon, kDigitsAfterComma).data();
     node.append_attribute("text") = note.m_note.data();
   }
 }
 
 /// Not thread-safe, use only for initialization.
-bool Load(std::string const & fileName, std::list<editor::Note> & notes,
-          uint32_t & uploadedNotesCount)
+bool Load(std::string const & fileName, std::list<editor::Note> & notes, uint32_t & uploadedNotesCount)
 {
   std::string content;
   try
@@ -112,14 +107,12 @@ bool Load(std::string const & fileName, std::list<editor::Note> & notes,
 }
 
 /// Not thread-safe, use synchronization.
-bool Save(std::string const & fileName, std::list<editor::Note> const & notes,
-          uint32_t const uploadedNotesCount)
+bool Save(std::string const & fileName, std::list<editor::Note> const & notes, uint32_t const uploadedNotesCount)
 {
   pugi::xml_document xml;
   SaveToXml(notes, xml, uploadedNotesCount);
-  return base::WriteToTempAndRenameToFile(fileName, [&xml](std::string const & fileName) {
-    return xml.save_file(fileName.data(), "  ");
-  });
+  return base::WriteToTempAndRenameToFile(
+      fileName, [&xml](std::string const & fileName) { return xml.save_file(fileName.data(), "  "); });
 }
 }  // namespace
 
@@ -127,8 +120,7 @@ namespace editor
 {
 std::shared_ptr<Notes> Notes::MakeNotes(std::string const & fileName, bool const fullPath)
 {
-  return std::shared_ptr<Notes>(
-      new Notes(fullPath ? fileName : GetPlatform().WritablePathForFile(fileName)));
+  return std::shared_ptr<Notes>(new Notes(fullPath ? fileName : GetPlatform().WritablePathForFile(fileName)));
 }
 
 Notes::Notes(std::string const & fileName) : m_fileName(fileName)
@@ -151,9 +143,8 @@ void Notes::CreateNote(ms::LatLon const & latLon, std::string const & text)
   }
 
   std::lock_guard<std::mutex> g(m_mu);
-  auto const it = std::find_if(m_notes.begin(), m_notes.end(), [&latLon, &text](Note const & note) {
-    return latLon.EqualDxDy(note.m_point, kTolerance) && text == note.m_note;
-  });
+  auto const it = std::find_if(m_notes.begin(), m_notes.end(), [&latLon, &text](Note const & note)
+  { return latLon.EqualDxDy(note.m_point, kTolerance) && text == note.m_note; });
   // No need to add the same note. It works in case when saved note are not uploaded yet.
   if (it != m_notes.end())
     return;
@@ -167,7 +158,8 @@ void Notes::Upload(osm::OsmOAuth const & auth)
   // Capture self to keep it from destruction until this thread is done.
   auto const self = shared_from_this();
 
-  auto const doUpload = [self, auth]() {
+  auto const doUpload = [self, auth]()
+  {
     std::unique_lock<std::mutex> ulock(self->m_mu);
     // Size of m_notes is decreased only in this method.
     auto & notes = self->m_notes;
diff --git a/libs/editor/editor_notes.hpp b/libs/editor/editor_notes.hpp
index 8e0a0c989..a59477efd 100644
--- a/libs/editor/editor_notes.hpp
+++ b/libs/editor/editor_notes.hpp
@@ -29,8 +29,7 @@ class Notes : public std::enable_shared_from_this<Notes>
 {
 public:
   static float constexpr kTolerance = 1e-7;
-  static std::shared_ptr<Notes> MakeNotes(std::string const & fileName = "notes.xml",
-                                          bool const fullPath = false);
+  static std::shared_ptr<Notes> MakeNotes(std::string const & fileName = "notes.xml", bool const fullPath = false);
 
   void CreateNote(ms::LatLon const & latLon, std::string const & text);
 
@@ -57,4 +56,4 @@ private:
 
   DISALLOW_COPY_AND_MOVE(Notes);
 };
-}  // namespace
+}  // namespace editor
diff --git a/libs/editor/editor_storage.cpp b/libs/editor/editor_storage.cpp
index 8a6344996..690a23056 100644
--- a/libs/editor/editor_storage.cpp
+++ b/libs/editor/editor_storage.cpp
@@ -14,7 +14,10 @@ namespace
 {
 char const * kEditorXMLFileName = "edits.xml";
 
-std::string GetEditorFilePath() { return GetPlatform().WritablePathForFile(kEditorXMLFileName); }
+std::string GetEditorFilePath()
+{
+  return GetPlatform().WritablePathForFile(kEditorXMLFileName);
+}
 }  // namespace
 
 namespace editor
@@ -26,9 +29,8 @@ bool LocalStorage::Save(xml_document const & doc)
 
   std::lock_guard<std::mutex> guard(m_mutex);
 
-  return base::WriteToTempAndRenameToFile(editorFilePath, [&doc](std::string const & fileName) {
-    return doc.save_file(fileName.data(), "  " /* indent */);
-  });
+  return base::WriteToTempAndRenameToFile(editorFilePath, [&doc](std::string const & fileName)
+  { return doc.save_file(fileName.data(), "  " /* indent */); });
 }
 
 bool LocalStorage::Load(xml_document & doc)
diff --git a/libs/editor/editor_tests/config_loader_test.cpp b/libs/editor/editor_tests/config_loader_test.cpp
index 62c81b39c..5c603e091 100644
--- a/libs/editor/editor_tests/config_loader_test.cpp
+++ b/libs/editor/editor_tests/config_loader_test.cpp
@@ -32,14 +32,14 @@ UNIT_TEST(ConfigLoader_Base)
 
 // This functionality is not used and corresponding server is not working.
 // Uncomment it when server will be up.
-//UNIT_TEST(ConfigLoader_GetRemoteHash)
+// UNIT_TEST(ConfigLoader_GetRemoteHash)
 //{
 //  auto const hashStr = ConfigLoader::GetRemoteHash();
 //  TEST_NOT_EQUAL(hashStr, "", ());
 //  TEST_EQUAL(hashStr, ConfigLoader::GetRemoteHash(), ());
 //}
 //
-//UNIT_TEST(ConfigLoader_GetRemoteConfig)
+// UNIT_TEST(ConfigLoader_GetRemoteConfig)
 //{
 //  pugi::xml_document doc;
 //  ConfigLoader::GetRemoteConfig(doc);
diff --git a/libs/editor/editor_tests/editor_config_test.cpp b/libs/editor/editor_tests/editor_config_test.cpp
index 15e041369..901a1d6d7 100644
--- a/libs/editor/editor_tests/editor_config_test.cpp
+++ b/libs/editor/editor_tests/editor_config_test.cpp
@@ -11,19 +11,10 @@ UNIT_TEST(EditorConfig_TypeDescription)
   using Fields = editor::TypeAggregatedDescription::FeatureFields;
 
   Fields const poiInternet = {
-    EType::FMD_OPEN_HOURS,
-    EType::FMD_PHONE_NUMBER,
-    EType::FMD_WEBSITE,
-    EType::FMD_INTERNET,
-    EType::FMD_EMAIL,
-    EType::FMD_LEVEL,
-    EType::FMD_CONTACT_FACEBOOK,
-    EType::FMD_CONTACT_INSTAGRAM,
-    EType::FMD_CONTACT_TWITTER,
-    EType::FMD_CONTACT_VK,
-    EType::FMD_CONTACT_LINE,
-    EType::FMD_CONTACT_FEDIVERSE,
-    EType::FMD_CONTACT_BLUESKY,
+      EType::FMD_OPEN_HOURS,      EType::FMD_PHONE_NUMBER, EType::FMD_WEBSITE,          EType::FMD_INTERNET,
+      EType::FMD_EMAIL,           EType::FMD_LEVEL,        EType::FMD_CONTACT_FACEBOOK, EType::FMD_CONTACT_INSTAGRAM,
+      EType::FMD_CONTACT_TWITTER, EType::FMD_CONTACT_VK,   EType::FMD_CONTACT_LINE,     EType::FMD_CONTACT_FEDIVERSE,
+      EType::FMD_CONTACT_BLUESKY,
   };
 
   pugi::xml_document doc;
diff --git a/libs/editor/editor_tests/editor_notes_test.cpp b/libs/editor/editor_tests/editor_notes_test.cpp
index c1d51f4d9..f43fba0cf 100644
--- a/libs/editor/editor_tests/editor_notes_test.cpp
+++ b/libs/editor/editor_tests/editor_notes_test.cpp
@@ -31,10 +31,9 @@ UNIT_TEST(Notes_Smoke)
                                      {mercator::ToLatLon({2, 2}), "Some note2"},
                                      {mercator::ToLatLon({1, 1}), "Some note3"}};
 
-    auto const isEqual = std::equal(
-        result.begin(), result.end(), expected.begin(), [](Note const & lhs, Note const & rhs) {
-          return lhs.m_point.EqualDxDy(rhs.m_point, Notes::kTolerance);
-        });
+    auto const isEqual =
+        std::equal(result.begin(), result.end(), expected.begin(), [](Note const & lhs, Note const & rhs)
+    { return lhs.m_point.EqualDxDy(rhs.m_point, Notes::kTolerance); });
     TEST(isEqual, ());
   }
 }
diff --git a/libs/editor/editor_tests/feature_matcher_test.cpp b/libs/editor/editor_tests/feature_matcher_test.cpp
index 0b8d945c2..b3fd1d422 100644
--- a/libs/editor/editor_tests/feature_matcher_test.cpp
+++ b/libs/editor/editor_tests/feature_matcher_test.cpp
@@ -274,8 +274,7 @@ UNIT_TEST(GetBestOsmNode_Test)
     TEST(osmResponse.load_buffer(osmRawResponseNode, ::strlen(osmRawResponseNode)), ());
 
     auto const bestNode = matcher::GetBestOsmNode(osmResponse, ms::LatLon(53.8977398, 27.5579251));
-    TEST_EQUAL(editor::XMLFeature(bestNode).GetName(),
-               "Главное управление капитального строительства", ());
+    TEST_EQUAL(editor::XMLFeature(bestNode).GetName(), "Главное управление капитального строительства", ());
   }
   {
     pugi::xml_document osmResponse;
@@ -292,16 +291,11 @@ UNIT_TEST(GetBestOsmWay_Test)
     pugi::xml_document osmResponse;
     TEST(osmResponse.load_buffer(osmRawResponseWay, ::strlen(osmRawResponseWay)), ());
     std::vector<m2::PointD> const geometry = {
-      {27.557515856307106, 64.236609073256034},
-      {27.55784576801841,  64.236820967769773},
-      {27.557352241556003, 64.236863883114324},
-      {27.55784576801841,  64.236820967769773},
-      {27.557352241556003, 64.236863883114324},
-      {27.557765301747366, 64.236963124848614},
-      {27.557352241556003, 64.236863883114324},
-      {27.557765301747366, 64.236963124848614},
-      {27.55768215326728,  64.237078459837136}
-    };
+        {27.557515856307106, 64.236609073256034}, {27.55784576801841, 64.236820967769773},
+        {27.557352241556003, 64.236863883114324}, {27.55784576801841, 64.236820967769773},
+        {27.557352241556003, 64.236863883114324}, {27.557765301747366, 64.236963124848614},
+        {27.557352241556003, 64.236863883114324}, {27.557765301747366, 64.236963124848614},
+        {27.55768215326728, 64.237078459837136}};
 
     auto const bestWay = matcher::GetBestOsmWayOrRelation(osmResponse, geometry);
     TEST(bestWay, ());
@@ -312,16 +306,11 @@ UNIT_TEST(GetBestOsmWay_Test)
     TEST(osmResponse.load_buffer(osmRawResponseWay, ::strlen(osmRawResponseWay)), ());
     // Each point is moved for 0.0001 on x and y. It is aboout a half of side length.
     std::vector<m2::PointD> const geometry = {
-      {27.557615856307106, 64.236709073256034},
-      {27.55794576801841,  64.236920967769773},
-      {27.557452241556003, 64.236963883114324},
-      {27.55794576801841,  64.236920967769773},
-      {27.557452241556003, 64.236963883114324},
-      {27.557865301747366, 64.237063124848614},
-      {27.557452241556003, 64.236963883114324},
-      {27.557865301747366, 64.237063124848614},
-      {27.55778215326728,  64.237178459837136}
-    };
+        {27.557615856307106, 64.236709073256034}, {27.55794576801841, 64.236920967769773},
+        {27.557452241556003, 64.236963883114324}, {27.55794576801841, 64.236920967769773},
+        {27.557452241556003, 64.236963883114324}, {27.557865301747366, 64.237063124848614},
+        {27.557452241556003, 64.236963883114324}, {27.557865301747366, 64.237063124848614},
+        {27.55778215326728, 64.237178459837136}};
 
     auto const bestWay = matcher::GetBestOsmWayOrRelation(osmResponse, geometry);
     TEST(!bestWay, ());
@@ -333,76 +322,41 @@ UNIT_TEST(GetBestOsmRealtion_Test)
   pugi::xml_document osmResponse;
   TEST(osmResponse.load_buffer(osmRawResponseRelation, ::strlen(osmRawResponseRelation)), ());
   std::vector<m2::PointD> const geometry = {
-    {37.640253436865322, 67.455316241497655},
-    {37.64019442826654, 67.455394025559684},
-    {37.640749645536772, 67.455726619480004},
-    {37.640253436865322, 67.455316241497655},
-    {37.640749645536772, 67.455726619480004},
-    {37.64069063693799, 67.455281372780206},
-    {37.640253436865322, 67.455316241497655},
-    {37.64069063693799, 67.455281372780206},
-    {37.640505564514598, 67.455174084418815},
-    {37.640253436865322, 67.455316241497655},
-    {37.640505564514598, 67.455174084418815},
-    {37.640376818480917, 67.455053385012263},
-    {37.640253436865322, 67.455316241497655},
-    {37.640376818480917, 67.455053385012263},
-    {37.640320492091178, 67.454932685605684},
-    {37.640253436865322, 67.455316241497655},
-    {37.640320492091178, 67.454932685605684},
-    {37.640111279786453, 67.455147262328467},
-    {37.640111279786453, 67.455147262328467},
-    {37.640320492091178, 67.454932685605684},
-    {37.640046906769612, 67.454938050023742},
-    {37.640046906769612, 67.454938050023742},
-    {37.640320492091178, 67.454932685605684},
-    {37.640320492091178, 67.454811986199104},
-    {37.640046906769612, 67.454938050023742},
-    {37.640320492091178, 67.454811986199104},
-    {37.640105915368395, 67.454677875747365},
-    {37.640105915368395, 67.454677875747365},
-    {37.640320492091178, 67.454811986199104},
-    {37.64035804301767, 67.454704697837713},
-    {37.640105915368395, 67.454677875747365},
-    {37.64035804301767, 67.454704697837713},
-    {37.64018101722138, 67.454508896578176},
-    {37.64018101722138, 67.454508896578176},
-    {37.64035804301767, 67.454704697837713},
-    {37.640663814847642, 67.454390879380639},
-    {37.64018101722138, 67.454508896578176},
-    {37.640663814847642, 67.454390879380639},
-    {37.640489471260366, 67.454173620448813},
-    {37.640489471260366, 67.454173620448813},
-    {37.640663814847642, 67.454390879380639},
-    {37.640634310548251, 67.454090471968726},
-    {37.640634310548251, 67.454090471968726},
-    {37.640663814847642, 67.454390879380639},
-    {37.640827429598772, 67.454321141945741},
-    {37.640634310548251, 67.454090471968726},
-    {37.640827429598772, 67.454321141945741},
-    {37.640787196463265, 67.454063649878378},
-    {37.640787196463265, 67.454063649878378},
-    {37.640827429598772, 67.454321141945741},
-    {37.64095349342341, 67.454079743132581},
-    {37.64095349342341, 67.454079743132581},
-    {37.640827429598772, 67.454321141945741},
-    {37.641001773186048, 67.454350646245103},
-    {37.64095349342341, 67.454079743132581},
-    {37.641001773186048, 67.454350646245103},
-    {37.641098332711294, 67.454152162776523},
-    {37.641098332711294, 67.454152162776523},
-    {37.641001773186048, 67.454350646245103},
-    {37.641243171999179, 67.45453303645948},
-    {37.641098332711294, 67.454152162776523},
-    {37.641243171999179, 67.45453303645948},
-    {37.641618681264049, 67.454541083086582},
-    {37.641618681264049, 67.454541083086582},
-    {37.641243171999179, 67.45453303645948},
-    {37.64069063693799, 67.455281372780206},
-    {37.641618681264049, 67.454541083086582},
-    {37.64069063693799, 67.455281372780206},
-    {37.640749645536772, 67.455726619480004}
-  };
+      {37.640253436865322, 67.455316241497655}, {37.64019442826654, 67.455394025559684},
+      {37.640749645536772, 67.455726619480004}, {37.640253436865322, 67.455316241497655},
+      {37.640749645536772, 67.455726619480004}, {37.64069063693799, 67.455281372780206},
+      {37.640253436865322, 67.455316241497655}, {37.64069063693799, 67.455281372780206},
+      {37.640505564514598, 67.455174084418815}, {37.640253436865322, 67.455316241497655},
+      {37.640505564514598, 67.455174084418815}, {37.640376818480917, 67.455053385012263},
+      {37.640253436865322, 67.455316241497655}, {37.640376818480917, 67.455053385012263},
+      {37.640320492091178, 67.454932685605684}, {37.640253436865322, 67.455316241497655},
+      {37.640320492091178, 67.454932685605684}, {37.640111279786453, 67.455147262328467},
+      {37.640111279786453, 67.455147262328467}, {37.640320492091178, 67.454932685605684},
+      {37.640046906769612, 67.454938050023742}, {37.640046906769612, 67.454938050023742},
+      {37.640320492091178, 67.454932685605684}, {37.640320492091178, 67.454811986199104},
+      {37.640046906769612, 67.454938050023742}, {37.640320492091178, 67.454811986199104},
+      {37.640105915368395, 67.454677875747365}, {37.640105915368395, 67.454677875747365},
+      {37.640320492091178, 67.454811986199104}, {37.64035804301767, 67.454704697837713},
+      {37.640105915368395, 67.454677875747365}, {37.64035804301767, 67.454704697837713},
+      {37.64018101722138, 67.454508896578176},  {37.64018101722138, 67.454508896578176},
+      {37.64035804301767, 67.454704697837713},  {37.640663814847642, 67.454390879380639},
+      {37.64018101722138, 67.454508896578176},  {37.640663814847642, 67.454390879380639},
+      {37.640489471260366, 67.454173620448813}, {37.640489471260366, 67.454173620448813},
+      {37.640663814847642, 67.454390879380639}, {37.640634310548251, 67.454090471968726},
+      {37.640634310548251, 67.454090471968726}, {37.640663814847642, 67.454390879380639},
+      {37.640827429598772, 67.454321141945741}, {37.640634310548251, 67.454090471968726},
+      {37.640827429598772, 67.454321141945741}, {37.640787196463265, 67.454063649878378},
+      {37.640787196463265, 67.454063649878378}, {37.640827429598772, 67.454321141945741},
+      {37.64095349342341, 67.454079743132581},  {37.64095349342341, 67.454079743132581},
+      {37.640827429598772, 67.454321141945741}, {37.641001773186048, 67.454350646245103},
+      {37.64095349342341, 67.454079743132581},  {37.641001773186048, 67.454350646245103},
+      {37.641098332711294, 67.454152162776523}, {37.641098332711294, 67.454152162776523},
+      {37.641001773186048, 67.454350646245103}, {37.641243171999179, 67.45453303645948},
+      {37.641098332711294, 67.454152162776523}, {37.641243171999179, 67.45453303645948},
+      {37.641618681264049, 67.454541083086582}, {37.641618681264049, 67.454541083086582},
+      {37.641243171999179, 67.45453303645948},  {37.64069063693799, 67.455281372780206},
+      {37.641618681264049, 67.454541083086582}, {37.64069063693799, 67.455281372780206},
+      {37.640749645536772, 67.455726619480004}};
 
   auto const bestWay = matcher::GetBestOsmWayOrRelation(osmResponse, geometry);
   TEST_EQUAL(bestWay.attribute("id").value(), std::string("365808"), ());
@@ -456,13 +410,9 @@ UNIT_TEST(HouseBuildingMiss_test)
   pugi::xml_document osmResponse;
   TEST(osmResponse.load_buffer(osmResponseBuildingMiss, ::strlen(osmResponseBuildingMiss)), ());
   std::vector<m2::PointD> const geometry = {
-    {-0.2048121407986514, 60.333984198674443},
-    {-0.20478800091734684,  60.333909096821458},
-    {-0.20465925488366565,  60.334029796228037},
-    {-0.2048121407986514, 60.333984198674443},
-    {-0.20478800091734684,  60.333909096821458},
-    {-0.20463511500236109,  60.333954694375052}
-  };
+      {-0.2048121407986514, 60.333984198674443},  {-0.20478800091734684, 60.333909096821458},
+      {-0.20465925488366565, 60.334029796228037}, {-0.2048121407986514, 60.333984198674443},
+      {-0.20478800091734684, 60.333909096821458}, {-0.20463511500236109, 60.333954694375052}};
 
   auto const bestWay = matcher::GetBestOsmWayOrRelation(osmResponse, geometry);
   TEST_EQUAL(bestWay.attribute("id").value(), std::string("345630019"), ());
@@ -512,17 +462,12 @@ std::string const kHouseWithSeveralEntrances = R"xxx("
 UNIT_TEST(HouseWithSeveralEntrances)
 {
   pugi::xml_document osmResponse;
-  TEST(osmResponse.load_buffer(kHouseWithSeveralEntrances.c_str(),
-                               kHouseWithSeveralEntrances.size()), ());
+  TEST(osmResponse.load_buffer(kHouseWithSeveralEntrances.c_str(), kHouseWithSeveralEntrances.size()), ());
 
   std::vector<m2::PointD> geometry = {
-    {37.570076119676798, 67.574481424499169},
-    {37.570258509891175, 67.574527022052763},
-    {37.569802534355233, 67.575570401367315},
-    {37.570258509891175, 67.574527022052763},
-    {37.569802534355233, 67.575570401367315},
-    {37.56998492456961, 67.57561599892091}
-  };
+      {37.570076119676798, 67.574481424499169}, {37.570258509891175, 67.574527022052763},
+      {37.569802534355233, 67.575570401367315}, {37.570258509891175, 67.574527022052763},
+      {37.569802534355233, 67.575570401367315}, {37.56998492456961, 67.57561599892091}};
 
   auto const bestWay = matcher::GetBestOsmWayOrRelation(osmResponse, geometry);
   TEST_EQUAL(bestWay.attribute("id").value(), std::string("30680719"), ());
@@ -565,13 +510,9 @@ UNIT_TEST(RelationWithSingleWay)
   TEST(osmResponse.load_buffer(kRelationWithSingleWay.c_str(), kRelationWithSingleWay.size()), ());
 
   std::vector<m2::PointD> geometry = {
-    {37.539920043497688, 67.533792313440074},
-    {37.539477479006933, 67.533234413960827},
-    {37.541207503834414, 67.532770391797811},
-    {37.539477479006933, 67.533234413960827},
-    {37.541207503834414, 67.532770391797811},
-    {37.54076493934366, 67.532212492318536}
-  };
+      {37.539920043497688, 67.533792313440074}, {37.539477479006933, 67.533234413960827},
+      {37.541207503834414, 67.532770391797811}, {37.539477479006933, 67.533234413960827},
+      {37.541207503834414, 67.532770391797811}, {37.54076493934366, 67.532212492318536}};
 
   auto const bestWay = matcher::GetBestOsmWayOrRelation(osmResponse, geometry);
   TEST_EQUAL(bestWay.attribute("id").value(), std::string("26232961"), ());
@@ -579,23 +520,9 @@ UNIT_TEST(RelationWithSingleWay)
 
 UNIT_TEST(ScoreTriangulatedGeometries)
 {
-  std::vector<m2::PointD> lhs = {
-    {0, 0},
-    {10, 10},
-    {10, 0},
-    {0, 0},
-    {10, 10},
-    {0, 10}
-  };
+  std::vector<m2::PointD> lhs = {{0, 0}, {10, 10}, {10, 0}, {0, 0}, {10, 10}, {0, 10}};
 
-  std::vector<m2::PointD> rhs = {
-    {-1, -1},
-    {9, 9},
-    {9, -1},
-    {-1, -1},
-    {9, 9},
-    {-1, 9}
-  };
+  std::vector<m2::PointD> rhs = {{-1, -1}, {9, 9}, {9, -1}, {-1, -1}, {9, 9}, {-1, 9}};
 
   auto const score = matcher::ScoreTriangulatedGeometries(lhs, rhs);
   TEST_GREATER(score, 0.6, ());
diff --git a/libs/editor/editor_tests/match_by_geometry_test.cpp b/libs/editor/editor_tests/match_by_geometry_test.cpp
index 3ac072fd3..27a65ca32 100644
--- a/libs/editor/editor_tests/match_by_geometry_test.cpp
+++ b/libs/editor/editor_tests/match_by_geometry_test.cpp
@@ -145,112 +145,59 @@ UNIT_TEST(MatchByGeometry)
   // For simplification, you can visualize it as a single sequence of points
   // by using, for ex. Gnuplot.
   std::vector<m2::PointD> geometry = {
-    {37.621818614168603, 67.468231078000599},
-    {37.621858847304139, 67.468292768808396},
-    {37.621783745451154, 67.468236442418657},
-    {37.621783745451154, 67.468236442418657},
-    {37.621858847304139, 67.468292768808396},
-    {37.621840071840893, 67.468327637525846},
-    {37.621783745451154, 67.468236442418657},
-    {37.621840071840893, 67.468327637525846},
-    {37.620694768582979, 67.46837323507944},
-    {37.621783745451154, 67.468236442418657},
-    {37.620694768582979, 67.46837323507944},
-    {37.620887887633501, 67.46797626814228},
-    {37.620887887633501, 67.46797626814228},
-    {37.620694768582979, 67.46837323507944},
-    {37.620826196825703, 67.467957492679034},
-    {37.621783745451154, 67.468236442418657},
-    {37.620887887633501, 67.46797626814228},
-    {37.621625495118082, 67.467576618996077},
-    {37.621625495118082, 67.467576618996077},
-    {37.620887887633501, 67.46797626814228},
-    {37.621373367468806, 67.467496152725033},
-    {37.621373367468806, 67.467496152725033},
-    {37.620887887633501, 67.46797626814228},
-    {37.621365320841704, 67.467439826335323},
-    {37.621373367468806, 67.467496152725033},
-    {37.621365320841704, 67.467439826335323},
-    {37.621386778513994, 67.467447872962424},
-    {37.621783745451154, 67.468236442418657},
-    {37.621625495118082, 67.467576618996077},
-    {37.621869576140256, 67.467936035006772},
-    {37.621869576140256, 67.467936035006772},
-    {37.621625495118082, 67.467576618996077},
-    {37.621856165095096, 67.467691953984598},
-    {37.621856165095096, 67.467691953984598},
-    {37.621625495118082, 67.467576618996077},
-    {37.621966135665531, 67.467348631228134},
-    {37.621966135665531, 67.467348631228134},
-    {37.621625495118082, 67.467576618996077},
-    {37.621722054643357, 67.467270847166105},
-    {37.621966135665531, 67.467348631228134},
-    {37.621722054643357, 67.467270847166105},
-    {37.621880304976401, 67.46708309253367},
-    {37.621880304976401, 67.46708309253367},
-    {37.621722054643357, 67.467270847166105},
-    {37.621445787112748, 67.467185016477004},
-    {37.621880304976401, 67.46708309253367},
-    {37.621445787112748, 67.467185016477004},
-    {37.621236574808023, 67.466879244647032},
-    {37.621236574808023, 67.466879244647032},
-    {37.621445787112748, 67.467185016477004},
-    {37.621365320841704, 67.467439826335323},
-    {37.621236574808023, 67.466879244647032},
-    {37.621365320841704, 67.467439826335323},
-    {37.620887887633501, 67.46797626814228},
-    {37.621966135665531, 67.467348631228134},
-    {37.621880304976401, 67.46708309253367},
-    {37.622068059608836, 67.46738081773654},
-    {37.622068059608836, 67.46738081773654},
-    {37.621880304976401, 67.46708309253367},
-    {37.622121703789531, 67.466683443387467},
-    {37.622121703789531, 67.466683443387467},
-    {37.621880304976401, 67.46708309253367},
-    {37.622019779846227, 67.466648574670018},
-    {37.622068059608836, 67.46738081773654},
-    {37.622121703789531, 67.466683443387467},
-    {37.622078788444981, 67.467426415290134},
-    {37.621869576140256, 67.467936035006772},
-    {37.621856165095096, 67.467691953984598},
-    {37.622033190891386, 67.467748280374309},
-    {37.621869576140256, 67.467936035006772},
-    {37.622033190891386, 67.467748280374309},
-    {37.622041237518488, 67.467981632560367},
-    {37.622041237518488, 67.467981632560367},
-    {37.622033190891386, 67.467748280374309},
-    {37.62210024611727, 67.467734869329149},
-    {37.622041237518488, 67.467981632560367},
-    {37.62210024611727, 67.467734869329149},
-    {37.622344327139444, 67.468314226480686},
-    {37.622344327139444, 67.468314226480686},
-    {37.62210024611727, 67.467734869329149},
-    {37.622078788444981, 67.467426415290134},
-    {37.622078788444981, 67.467426415290134},
-    {37.62210024611727, 67.467734869329149},
-    {37.622060012981734, 67.46746664842567},
-    {37.622344327139444, 67.468314226480686},
-    {37.622078788444981, 67.467426415290134},
-    {37.622121703789531, 67.466683443387467},
-    {37.622041237518488, 67.467981632560367},
-    {37.622344327139444, 67.468314226480686},
-    {37.622092199490169, 67.468252535672889},
-    {37.622092199490169, 67.468252535672889},
-    {37.622344327139444, 67.468314226480686},
-    {37.622049284145589, 67.468392010542686},
-    {37.622049284145589, 67.468392010542686},
-    {37.622344327139444, 67.468314226480686},
-    {37.622188759015415, 67.468845303869585},
-    {37.622049284145589, 67.468392010542686},
-    {37.622188759015415, 67.468845303869585},
-    {37.621840071840893, 67.468327637525846},
-    {37.621840071840893, 67.468327637525846},
-    {37.622188759015415, 67.468845303869585},
-    {37.620694768582979, 67.46837323507944},
-    {37.622041237518488, 67.467981632560367},
-    {37.622092199490169, 67.468252535672889},
-    {37.622065377399821, 67.468244489045759}
-  };
+      {37.621818614168603, 67.468231078000599}, {37.621858847304139, 67.468292768808396},
+      {37.621783745451154, 67.468236442418657}, {37.621783745451154, 67.468236442418657},
+      {37.621858847304139, 67.468292768808396}, {37.621840071840893, 67.468327637525846},
+      {37.621783745451154, 67.468236442418657}, {37.621840071840893, 67.468327637525846},
+      {37.620694768582979, 67.46837323507944},  {37.621783745451154, 67.468236442418657},
+      {37.620694768582979, 67.46837323507944},  {37.620887887633501, 67.46797626814228},
+      {37.620887887633501, 67.46797626814228},  {37.620694768582979, 67.46837323507944},
+      {37.620826196825703, 67.467957492679034}, {37.621783745451154, 67.468236442418657},
+      {37.620887887633501, 67.46797626814228},  {37.621625495118082, 67.467576618996077},
+      {37.621625495118082, 67.467576618996077}, {37.620887887633501, 67.46797626814228},
+      {37.621373367468806, 67.467496152725033}, {37.621373367468806, 67.467496152725033},
+      {37.620887887633501, 67.46797626814228},  {37.621365320841704, 67.467439826335323},
+      {37.621373367468806, 67.467496152725033}, {37.621365320841704, 67.467439826335323},
+      {37.621386778513994, 67.467447872962424}, {37.621783745451154, 67.468236442418657},
+      {37.621625495118082, 67.467576618996077}, {37.621869576140256, 67.467936035006772},
+      {37.621869576140256, 67.467936035006772}, {37.621625495118082, 67.467576618996077},
+      {37.621856165095096, 67.467691953984598}, {37.621856165095096, 67.467691953984598},
+      {37.621625495118082, 67.467576618996077}, {37.621966135665531, 67.467348631228134},
+      {37.621966135665531, 67.467348631228134}, {37.621625495118082, 67.467576618996077},
+      {37.621722054643357, 67.467270847166105}, {37.621966135665531, 67.467348631228134},
+      {37.621722054643357, 67.467270847166105}, {37.621880304976401, 67.46708309253367},
+      {37.621880304976401, 67.46708309253367},  {37.621722054643357, 67.467270847166105},
+      {37.621445787112748, 67.467185016477004}, {37.621880304976401, 67.46708309253367},
+      {37.621445787112748, 67.467185016477004}, {37.621236574808023, 67.466879244647032},
+      {37.621236574808023, 67.466879244647032}, {37.621445787112748, 67.467185016477004},
+      {37.621365320841704, 67.467439826335323}, {37.621236574808023, 67.466879244647032},
+      {37.621365320841704, 67.467439826335323}, {37.620887887633501, 67.46797626814228},
+      {37.621966135665531, 67.467348631228134}, {37.621880304976401, 67.46708309253367},
+      {37.622068059608836, 67.46738081773654},  {37.622068059608836, 67.46738081773654},
+      {37.621880304976401, 67.46708309253367},  {37.622121703789531, 67.466683443387467},
+      {37.622121703789531, 67.466683443387467}, {37.621880304976401, 67.46708309253367},
+      {37.622019779846227, 67.466648574670018}, {37.622068059608836, 67.46738081773654},
+      {37.622121703789531, 67.466683443387467}, {37.622078788444981, 67.467426415290134},
+      {37.621869576140256, 67.467936035006772}, {37.621856165095096, 67.467691953984598},
+      {37.622033190891386, 67.467748280374309}, {37.621869576140256, 67.467936035006772},
+      {37.622033190891386, 67.467748280374309}, {37.622041237518488, 67.467981632560367},
+      {37.622041237518488, 67.467981632560367}, {37.622033190891386, 67.467748280374309},
+      {37.62210024611727, 67.467734869329149},  {37.622041237518488, 67.467981632560367},
+      {37.62210024611727, 67.467734869329149},  {37.622344327139444, 67.468314226480686},
+      {37.622344327139444, 67.468314226480686}, {37.62210024611727, 67.467734869329149},
+      {37.622078788444981, 67.467426415290134}, {37.622078788444981, 67.467426415290134},
+      {37.62210024611727, 67.467734869329149},  {37.622060012981734, 67.46746664842567},
+      {37.622344327139444, 67.468314226480686}, {37.622078788444981, 67.467426415290134},
+      {37.622121703789531, 67.466683443387467}, {37.622041237518488, 67.467981632560367},
+      {37.622344327139444, 67.468314226480686}, {37.622092199490169, 67.468252535672889},
+      {37.622092199490169, 67.468252535672889}, {37.622344327139444, 67.468314226480686},
+      {37.622049284145589, 67.468392010542686}, {37.622049284145589, 67.468392010542686},
+      {37.622344327139444, 67.468314226480686}, {37.622188759015415, 67.468845303869585},
+      {37.622049284145589, 67.468392010542686}, {37.622188759015415, 67.468845303869585},
+      {37.621840071840893, 67.468327637525846}, {37.621840071840893, 67.468327637525846},
+      {37.622188759015415, 67.468845303869585}, {37.620694768582979, 67.46837323507944},
+      {37.622041237518488, 67.467981632560367}, {37.622092199490169, 67.468252535672889},
+      {37.622065377399821, 67.468244489045759}};
 
   auto const matched = matcher::GetBestOsmWayOrRelation(osmResponse, geometry);
   TEST_EQUAL(matched.attribute("id").value(), std::string("85761"), ());
diff --git a/libs/editor/editor_tests/new_feature_categories_test.cpp b/libs/editor/editor_tests/new_feature_categories_test.cpp
index 4b37f2d26..54f2453c3 100644
--- a/libs/editor/editor_tests/new_feature_categories_test.cpp
+++ b/libs/editor/editor_tests/new_feature_categories_test.cpp
@@ -29,7 +29,8 @@ UNIT_TEST(NewFeatureCategories_UniqueNames)
       do
       {
         LOG(LWARNING, (*result));
-      } while (++result != names.end());
+      }
+      while (++result != names.end());
 
       TEST(false, ("Please look at output above"));
     }
diff --git a/libs/editor/editor_tests/opening_hours_ui_test.cpp b/libs/editor/editor_tests/opening_hours_ui_test.cpp
index 176daf31a..e806b09f3 100644
--- a/libs/editor/editor_tests/opening_hours_ui_test.cpp
+++ b/libs/editor/editor_tests/opening_hours_ui_test.cpp
@@ -186,8 +186,8 @@ UNIT_TEST(TestAppendTimeTable)
       TEST(tt.Commit(), ());
 
       TEST(tts.Append(tts.GetComplementTimeTable()), ());
-      TEST_EQUAL(tts.Back().GetOpeningDays(), (std::set<osmoh::Weekday>{osmoh::Weekday::Sunday,
-                osmoh::Weekday::Saturday}), ());
+      TEST_EQUAL(tts.Back().GetOpeningDays(),
+                 (std::set<osmoh::Weekday>{osmoh::Weekday::Sunday, osmoh::Weekday::Saturday}), ());
     }
 
     {
@@ -198,8 +198,8 @@ UNIT_TEST(TestAppendTimeTable)
     }
 
     TEST(tts.Append(tts.GetComplementTimeTable()), ());
-    TEST_EQUAL(tts.Back().GetOpeningDays(), (std::set<osmoh::Weekday>{osmoh::Weekday::Monday,
-              osmoh::Weekday::Tuesday}), ());
+    TEST_EQUAL(tts.Back().GetOpeningDays(), (std::set<osmoh::Weekday>{osmoh::Weekday::Monday, osmoh::Weekday::Tuesday}),
+               ());
 
     TEST(!tts.GetComplementTimeTable().IsValid(), ());
     TEST(!tts.Append(tts.GetComplementTimeTable()), ());
@@ -208,11 +208,10 @@ UNIT_TEST(TestAppendTimeTable)
     TEST(tts.Remove(0), ());
     TEST(tts.Remove(1), ());
     TEST_EQUAL(tts.Size(), 1, ());
-    TEST_EQUAL(tts.GetUnhandledDays(), (std::set<osmoh::Weekday>{osmoh::Weekday::Monday,
-              osmoh::Weekday::Tuesday,
-              osmoh::Weekday::Wednesday,
-              osmoh::Weekday::Thursday,
-              osmoh::Weekday::Friday}), ());
+    TEST_EQUAL(tts.GetUnhandledDays(),
+               (std::set<osmoh::Weekday>{osmoh::Weekday::Monday, osmoh::Weekday::Tuesday, osmoh::Weekday::Wednesday,
+                                         osmoh::Weekday::Thursday, osmoh::Weekday::Friday}),
+               ());
   }
   {
     TimeTableSet tts;
diff --git a/libs/editor/editor_tests/osm_editor_test.cpp b/libs/editor/editor_tests/osm_editor_test.cpp
index a20df020b..2952fb75d 100644
--- a/libs/editor/editor_tests/osm_editor_test.cpp
+++ b/libs/editor/editor_tests/osm_editor_test.cpp
@@ -38,7 +38,7 @@ class IsCafeChecker : public ftypes::BaseChecker
 public:
   static IsCafeChecker const & Instance()
   {
-    static const IsCafeChecker instance;
+    static IsCafeChecker const instance;
     return instance;
   }
 
@@ -53,8 +53,7 @@ private:
 class TestCafe : public TestPOI
 {
 public:
-  TestCafe(m2::PointD const & center, std::string const & name, std::string const & lang)
-    : TestPOI(center, name, lang)
+  TestCafe(m2::PointD const & center, std::string const & name, std::string const & lang) : TestPOI(center, name, lang)
   {
     SetTypes({{"amenity", "cafe"}});
   }
@@ -63,10 +62,7 @@ public:
 class OptionalSaveStorage : public editor::InMemoryStorage
 {
 public:
-  void AllowSave(bool allow)
-  {
-    m_allowSave = allow;
-  }
+  void AllowSave(bool allow) { m_allowSave = allow; }
 
   // StorageBase overrides:
   bool Save(pugi::xml_document const & doc) override
@@ -104,10 +100,7 @@ public:
     editor.SetStorageForTesting(std::make_unique<editor::InMemoryStorage>());
   }
 
-  void AllowSave(bool allow)
-  {
-    m_storage->AllowSave(allow);
-  }
+  void AllowSave(bool allow) { m_storage->AllowSave(allow); }
 
 private:
   OptionalSaveStorage * m_storage = new OptionalSaveStorage;
@@ -121,9 +114,7 @@ void ForEachCafeAtPoint(DataSource & dataSource, m2::PointD const & mercator, Fn
   auto const f = [&fn](FeatureType & ft)
   {
     if (IsCafeChecker::Instance()(ft))
-    {
       fn(ft);
-    }
   };
 
   dataSource.ForEachInRect(f, rect, scales::GetUpperScale());
@@ -143,13 +134,10 @@ void SetBuildingLevels(osm::EditableMapObject & emo, std::string s)
 
 void SetBuildingLevelsToOne(FeatureType & ft)
 {
-  EditFeature(ft, [](osm::EditableMapObject & emo)
-  {
-    SetBuildingLevels(emo, "1");
-  });
+  EditFeature(ft, [](osm::EditableMapObject & emo) { SetBuildingLevels(emo, "1"); });
 }
 
-void CreateCafeAtPoint(m2::PointD const & point, MwmSet::MwmId const & mwmId, osm::EditableMapObject &emo)
+void CreateCafeAtPoint(m2::PointD const & point, MwmSet::MwmId const & mwmId, osm::EditableMapObject & emo)
 {
   auto & editor = osm::Editor::Instance();
 
@@ -158,9 +146,7 @@ void CreateCafeAtPoint(m2::PointD const & point, MwmSet::MwmId const & mwmId, os
   TEST_EQUAL(editor.SaveEditedFeature(emo), osm::Editor::SaveResult::SavedSuccessfully, ());
 }
 
-void GenerateUploadedFeature(MwmSet::MwmId const & mwmId,
-                             osm::EditableMapObject const & emo,
-                             pugi::xml_document & out)
+void GenerateUploadedFeature(MwmSet::MwmId const & mwmId, osm::EditableMapObject const & emo, pugi::xml_document & out)
 {
   pugi::xml_node root = out.append_child("comaps");
   root.append_attribute("format_version") = 1;
@@ -266,7 +252,8 @@ void EditorTest::GetEditedFeatureTest()
     builder.Add(cafe);
   });
 
-  ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0), [&editor](FeatureType & ft) {
+  ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0), [&editor](FeatureType & ft)
+  {
     TEST(!editor.GetEditedFeature(ft.GetID()), ());
 
     SetBuildingLevelsToOne(ft);
@@ -305,7 +292,8 @@ void EditorTest::SetIndexTest()
   osm::EditableMapObject emo;
   CreateCafeAtPoint({2.0, 2.0}, gbMwmId, emo);
 
-  ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0), [&editor](FeatureType & ft) {
+  ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0), [&editor](FeatureType & ft)
+  {
     auto const firstPtr = editor.GetOriginalMapObject(ft.GetID());
     TEST(firstPtr, ());
     SetBuildingLevelsToOne(ft);
@@ -314,7 +302,8 @@ void EditorTest::SetIndexTest()
     TEST_EQUAL(firstPtr->GetID(), secondPtr->GetID(), ());
   });
 
-  ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0), [&editor](FeatureType & ft) {
+  ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0), [&editor](FeatureType & ft)
+  {
     TEST_EQUAL(editor.GetOriginalFeatureStreet(ft.GetID()), "Test street", ());
 
     EditFeature(ft, [](osm::EditableMapObject & emo)
@@ -326,34 +315,22 @@ void EditorTest::SetIndexTest()
   });
 
   uint32_t counter = 0;
-  editor.ForEachFeatureAtPoint([&counter](FeatureType & ft)
-  {
-    ++counter;
-  }, {100.0, 100.0});
+  editor.ForEachFeatureAtPoint([&counter](FeatureType & ft) { ++counter; }, {100.0, 100.0});
 
   TEST_EQUAL(counter, 0, ());
 
   counter = 0;
-  editor.ForEachFeatureAtPoint([&counter](FeatureType & ft)
-  {
-    ++counter;
-  }, {3.0, 3.0});
+  editor.ForEachFeatureAtPoint([&counter](FeatureType & ft) { ++counter; }, {3.0, 3.0});
 
   TEST_EQUAL(counter, 1, ());
 
   counter = 0;
-  editor.ForEachFeatureAtPoint([&counter](FeatureType & ft)
-  {
-    ++counter;
-  }, {1.0, 1.0});
+  editor.ForEachFeatureAtPoint([&counter](FeatureType & ft) { ++counter; }, {1.0, 1.0});
 
   TEST_EQUAL(counter, 2, ());
 
   counter = 0;
-  editor.ForEachFeatureAtPoint([&counter](FeatureType & ft)
-  {
-    ++counter;
-  }, {4.0, 4.0});
+  editor.ForEachFeatureAtPoint([&counter](FeatureType & ft) { ++counter; }, {4.0, 4.0});
 
   TEST_EQUAL(counter, 3, ());
 }
@@ -380,10 +357,7 @@ void EditorTest::GetEditedFeatureStreetTest()
     TEST(!editor.GetEditedFeatureStreet(ft.GetID(), street), ());
 
     osm::LocalizedStreet ls{"some street", ""};
-    EditFeature(ft, [&ls](osm::EditableMapObject & emo)
-    {
-      emo.SetStreet(ls);
-    });
+    EditFeature(ft, [&ls](osm::EditableMapObject & emo) { emo.SetStreet(ls); });
 
     TEST(editor.GetEditedFeatureStreet(ft.GetID(), street), ());
     TEST_EQUAL(street, ls.m_defaultName, ());
@@ -443,9 +417,7 @@ void EditorTest::IsFeatureUploadedTest()
   });
 
   ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0), [&editor](FeatureType & ft)
-  {
-    TEST(!editor.IsFeatureUploaded(ft.GetID().m_mwmId, ft.GetID().m_index), ());
-  });
+  { TEST(!editor.IsFeatureUploaded(ft.GetID().m_mwmId, ft.GetID().m_index), ()); });
 
   osm::EditableMapObject emo;
   CreateCafeAtPoint({3.0, 3.0}, mwmId, emo);
@@ -592,20 +564,12 @@ void EditorTest::OnMapDeregisteredTest()
     builder.Add(cafeMoscow);
   });
 
-  auto nzMwmId = BuildMwm("NZ", [](TestMwmBuilder & builder)
-  {
-  });
+  auto nzMwmId = BuildMwm("NZ", [](TestMwmBuilder & builder) {});
   m_dataSource.DeregisterMap(nzMwmId.GetInfo()->GetLocalFile().GetCountryFile());
 
-  ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0), [](FeatureType & ft)
-  {
-    SetBuildingLevelsToOne(ft);
-  });
+  ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0), [](FeatureType & ft) { SetBuildingLevelsToOne(ft); });
 
-  ForEachCafeAtPoint(m_dataSource, m2::PointD(2.0, 2.0), [](FeatureType & ft)
-  {
-    SetBuildingLevelsToOne(ft);
-  });
+  ForEachCafeAtPoint(m_dataSource, m2::PointD(2.0, 2.0), [](FeatureType & ft) { SetBuildingLevelsToOne(ft); });
 
   TEST_EQUAL(editor.m_features.Get()->size(), 2, (editor.m_features.Get()->size()));
 
@@ -669,20 +633,14 @@ void EditorTest::RollBackChangesTest()
     TEST_EQUAL(editor.SaveEditedFeature(emo), osm::Editor::SaveResult::SavedSuccessfully, ());
   });
 
-  ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0), [&houseNumber](FeatureType & ft)
-  {
-    TEST_EQUAL(ft.GetHouseNumber(), houseNumber, ());
-  });
+  ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0),
+                     [&houseNumber](FeatureType & ft) { TEST_EQUAL(ft.GetHouseNumber(), houseNumber, ()); });
 
-  ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0), [&editor](FeatureType & ft)
-  {
-    editor.RollBackChanges(ft.GetID());
-  });
+  ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0),
+                     [&editor](FeatureType & ft) { editor.RollBackChanges(ft.GetID()); });
 
-  ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0), [](FeatureType & ft)
-  {
-    TEST_EQUAL(ft.GetHouseNumber(), "", ());
-  });
+  ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0),
+                     [](FeatureType & ft) { TEST_EQUAL(ft.GetHouseNumber(), "", ()); });
 }
 
 void EditorTest::HaveMapEditsOrNotesToUploadTest()
@@ -697,10 +655,7 @@ void EditorTest::HaveMapEditsOrNotesToUploadTest()
 
   TEST(!editor.HaveMapEditsOrNotesToUpload(), ());
 
-  ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0), [](FeatureType & ft)
-  {
-    SetBuildingLevelsToOne(ft);
-  });
+  ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0), [](FeatureType & ft) { SetBuildingLevelsToOne(ft); });
 
   TEST(editor.HaveMapEditsOrNotesToUpload(), ());
   editor.ClearAllLocalEdits();
@@ -715,8 +670,7 @@ void EditorTest::HaveMapEditsOrNotesToUploadTest()
     using NoteType = osm::Editor::NoteProblemType;
     feature::TypesHolder typesHolder;
     std::string defaultName;
-    editor.CreateNote({1.0, 1.0}, ft.GetID(), typesHolder, defaultName, NoteType::PlaceDoesNotExist,
-                      "exploded");
+    editor.CreateNote({1.0, 1.0}, ft.GetID(), typesHolder, defaultName, NoteType::PlaceDoesNotExist, "exploded");
   });
 
   TEST(editor.HaveMapEditsOrNotesToUpload(), ());
@@ -741,18 +695,12 @@ void EditorTest::HaveMapEditsToUploadTest()
   TEST(!editor.HaveMapEditsToUpload(gbMwmId), ());
   TEST(!editor.HaveMapEditsToUpload(rfMwmId), ());
 
-  ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0), [](FeatureType & ft)
-  {
-    SetBuildingLevelsToOne(ft);
-  });
+  ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0), [](FeatureType & ft) { SetBuildingLevelsToOne(ft); });
 
   TEST(editor.HaveMapEditsToUpload(gbMwmId), ());
   TEST(!editor.HaveMapEditsToUpload(rfMwmId), ());
 
-  ForEachCafeAtPoint(m_dataSource, m2::PointD(2.0, 2.0), [](FeatureType & ft)
-  {
-    SetBuildingLevelsToOne(ft);
-  });
+  ForEachCafeAtPoint(m_dataSource, m2::PointD(2.0, 2.0), [](FeatureType & ft) { SetBuildingLevelsToOne(ft); });
 
   TEST(editor.HaveMapEditsToUpload(gbMwmId), ());
   TEST(editor.HaveMapEditsToUpload(rfMwmId), ());
@@ -779,26 +727,17 @@ void EditorTest::GetStatsTest()
   TEST_EQUAL(stats.m_uploadedCount, 0, ());
   TEST_EQUAL(stats.m_lastUploadTimestamp, base::INVALID_TIME_STAMP, ());
 
-  ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0), [](FeatureType & ft)
-  {
-    SetBuildingLevelsToOne(ft);
-  });
+  ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0), [](FeatureType & ft) { SetBuildingLevelsToOne(ft); });
 
   stats = editor.GetStats();
   TEST_EQUAL(stats.m_edits.size(), 1, ());
 
-  ForEachCafeAtPoint(m_dataSource, m2::PointD(4.0, 4.0), [](FeatureType & ft)
-  {
-    SetBuildingLevelsToOne(ft);
-  });
+  ForEachCafeAtPoint(m_dataSource, m2::PointD(4.0, 4.0), [](FeatureType & ft) { SetBuildingLevelsToOne(ft); });
 
   stats = editor.GetStats();
   TEST_EQUAL(stats.m_edits.size(), 2, ());
 
-  ForEachCafeAtPoint(m_dataSource, m2::PointD(5.0, 5.0), [](FeatureType & ft)
-  {
-    SetBuildingLevelsToOne(ft);
-  });
+  ForEachCafeAtPoint(m_dataSource, m2::PointD(5.0, 5.0), [](FeatureType & ft) { SetBuildingLevelsToOne(ft); });
 
   stats = editor.GetStats();
   TEST_EQUAL(stats.m_edits.size(), 3, ());
@@ -910,8 +849,9 @@ void EditorTest::CreateNoteTest()
     builder.Add(TestCafe(m2::PointD(2.0, 2.0), "Cafe", "en"));
   });
 
-  auto const createAndCheckNote = [&editor](FeatureID const & fId, ms::LatLon const & pos,
-                                            osm::Editor::NoteProblemType const noteType) {
+  auto const createAndCheckNote =
+      [&editor](FeatureID const & fId, ms::LatLon const & pos, osm::Editor::NoteProblemType const noteType)
+  {
     ScopedFile sf("test_notes.xml", ScopedFile::Mode::DoNotCreate);
     editor.m_notes = Notes::MakeNotes(sf.GetFullPath(), true);
     feature::TypesHolder holder;
@@ -1022,12 +962,8 @@ void EditorTest::LoadMapEditsTest()
   {
     loadedFeatures.clear();
     for (auto const & mwm : *(editor.m_features.Get()))
-    {
       for (auto const & index : mwm.second)
-      {
         loadedFeatures.emplace_back(index.second.m_object.GetID());
-      }
-    }
   };
 
   std::vector<FeatureID> loadedFeatures;
@@ -1142,20 +1078,12 @@ void EditorTest::SaveTransactionTest()
     builder.Add(TestPOI(m2::PointD(6.0, 6.0), "Corner Post", "default"));
   });
 
-  auto const rfMwmId = BuildMwm("RF", [](TestMwmBuilder & builder)
-  {
-    builder.Add(TestCafe(m2::PointD(10.0, 10.0), "Moscow Cafe1", "en"));
-  });
+  auto const rfMwmId = BuildMwm(
+      "RF", [](TestMwmBuilder & builder) { builder.Add(TestCafe(m2::PointD(10.0, 10.0), "Moscow Cafe1", "en")); });
 
-  ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0), [](FeatureType & ft)
-  {
-    SetBuildingLevelsToOne(ft);
-  });
+  ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0), [](FeatureType & ft) { SetBuildingLevelsToOne(ft); });
 
-  ForEachCafeAtPoint(m_dataSource, m2::PointD(10.0, 10.0), [](FeatureType & ft)
-  {
-    SetBuildingLevelsToOne(ft);
-  });
+  ForEachCafeAtPoint(m_dataSource, m2::PointD(10.0, 10.0), [](FeatureType & ft) { SetBuildingLevelsToOne(ft); });
 
   auto const features = editor.m_features.Get();
 
@@ -1215,10 +1143,8 @@ void EditorTest::SaveTransactionTest()
   }
 
   {
-    ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0), [&editor](FeatureType & ft)
-    {
-      editor.DeleteFeature(ft.GetID());
-    });
+    ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0),
+                       [&editor](FeatureType & ft) { editor.DeleteFeature(ft.GetID()); });
 
     auto const features = editor.m_features.Get();
     auto const mwmIt = features->find(mwmId);
@@ -1231,10 +1157,8 @@ void EditorTest::SaveTransactionTest()
   }
 
   {
-    ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0), [&editor](FeatureType & ft)
-    {
-      editor.MarkFeatureAsObsolete(ft.GetID());
-    });
+    ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0),
+                       [&editor](FeatureType & ft) { editor.MarkFeatureAsObsolete(ft.GetID()); });
 
     auto const features = editor.m_features.Get();
     auto const mwmIt = features->find(mwmId);
@@ -1252,8 +1176,7 @@ void EditorTest::SaveTransactionTest()
       using NoteType = osm::Editor::NoteProblemType;
       feature::TypesHolder typesHolder;
       std::string defaultName;
-      editor.CreateNote({1.0, 1.0}, ft.GetID(), typesHolder, defaultName, NoteType::PlaceDoesNotExist,
-                        "exploded");
+      editor.CreateNote({1.0, 1.0}, ft.GetID(), typesHolder, defaultName, NoteType::PlaceDoesNotExist, "exploded");
     });
 
     TEST_EQUAL(editor.m_notes->NotUploadedNotesCount(), 0, ());
@@ -1269,10 +1192,8 @@ void EditorTest::SaveTransactionTest()
   }
 
   {
-    ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0), [&editor](FeatureType & ft)
-    {
-      editor.RollBackChanges(ft.GetID());
-    });
+    ForEachCafeAtPoint(m_dataSource, m2::PointD(1.0, 1.0),
+                       [&editor](FeatureType & ft) { editor.RollBackChanges(ft.GetID()); });
 
     auto const features = editor.m_features.Get();
     auto const mwmIt = features->find(mwmId);
@@ -1349,9 +1270,7 @@ void EditorTest::LoadExistingEditsXml()
     </mapsme>
   )";
 
-  ConstructTestMwm([](editor::testing::TestMwmBuilder &)
-  {
-  });
+  ConstructTestMwm([](editor::testing::TestMwmBuilder &) {});
 
   pugi::xml_document doc;
   TEST(doc.load_string(data), ());
@@ -1458,14 +1377,23 @@ UNIT_CLASS_TEST(EditorTest, CreateNoteTest)
   EditorTest::CreateNoteTest();
 }
 
-UNIT_CLASS_TEST(EditorTest, LoadMapEditsTest) { EditorTest::LoadMapEditsTest(); }
+UNIT_CLASS_TEST(EditorTest, LoadMapEditsTest)
+{
+  EditorTest::LoadMapEditsTest();
+}
 
 UNIT_CLASS_TEST(EditorTest, SaveEditedFeatureTest)
 {
   EditorTest::SaveEditedFeatureTest();
 }
 
-UNIT_CLASS_TEST(EditorTest, SaveTransactionTest) { EditorTest::SaveTransactionTest(); }
+UNIT_CLASS_TEST(EditorTest, SaveTransactionTest)
+{
+  EditorTest::SaveTransactionTest();
+}
 
-UNIT_CLASS_TEST(EditorTest, LoadEditsXml) { LoadExistingEditsXml(); }
+UNIT_CLASS_TEST(EditorTest, LoadEditsXml)
+{
+  LoadExistingEditsXml();
+}
 }  // namespace
diff --git a/libs/editor/editor_tests/ui2oh_test.cpp b/libs/editor/editor_tests/ui2oh_test.cpp
index 795d12b58..f12155b0c 100644
--- a/libs/editor/editor_tests/ui2oh_test.cpp
+++ b/libs/editor/editor_tests/ui2oh_test.cpp
@@ -42,8 +42,9 @@ UNIT_TEST(OpeningHours2TimeTableSet)
     TEST_EQUAL(tt.GetOpeningTime().GetEnd().GetHourMinutes().GetHoursCount(), 23, ());
   }
   {
-    OpeningHours oh("Mo-Su 12:00-15:30, 19:30-23:00;"
-                    "Fr-Sa 12:00-15:30, 19:30-23:30;");
+    OpeningHours oh(
+        "Mo-Su 12:00-15:30, 19:30-23:00;"
+        "Fr-Sa 12:00-15:30, 19:30-23:30;");
     TEST(oh.IsValid(), ());
 
     TimeTableSet tts;
@@ -266,12 +267,9 @@ UNIT_TEST(OpeningHours2TimeTableSet_off)
 
     TEST(MakeTimeTableSet(oh, tts), ());
     TEST_EQUAL(tts.GetUnhandledDays(),
-               OpeningDays({osmoh::Weekday::Monday,
-                            osmoh::Weekday::Tuesday,
-                            osmoh::Weekday::Wednesday,
-                            osmoh::Weekday::Thursday,
-                            osmoh::Weekday::Friday,
-                            osmoh::Weekday::Saturday}), ());
+               OpeningDays({osmoh::Weekday::Monday, osmoh::Weekday::Tuesday, osmoh::Weekday::Wednesday,
+                            osmoh::Weekday::Thursday, osmoh::Weekday::Friday, osmoh::Weekday::Saturday}),
+               ());
   }
   {
     OpeningHours oh("Mo-Su 08:00-13:00,14:00-20:00; Sa 10:00-11:00 off");
@@ -329,11 +327,9 @@ UNIT_TEST(OpeningHours2TimeTableSet_off)
     TEST_EQUAL(tts.Size(), 1, ());
 
     TEST_EQUAL(tts.GetUnhandledDays(),
-               OpeningDays({osmoh::Weekday::Monday,
-                            osmoh::Weekday::Tuesday,
-                            osmoh::Weekday::Wednesday,
-                            osmoh::Weekday::Thursday,
-                            osmoh::Weekday::Friday}), ());
+               OpeningDays({osmoh::Weekday::Monday, osmoh::Weekday::Tuesday, osmoh::Weekday::Wednesday,
+                            osmoh::Weekday::Thursday, osmoh::Weekday::Friday}),
+               ());
   }
   {
     OpeningHours oh("Mo-Fr 11:00-17:00; Sa-Su 12:00-16:00; Mo-Fr 11:00-13:00 off");
@@ -396,14 +392,10 @@ UNIT_TEST(TimeTableSt2OpeningHours)
   {
     TimeTableSet tts;
     auto tt = tts.Front();
-    TEST(tt.SetOpeningDays({
-          osmoh::Weekday::Monday,
-          osmoh::Weekday::Tuesday,
-          osmoh::Weekday::Wednesday,
-          osmoh::Weekday::Thursday,
-          osmoh::Weekday::Friday,
-          osmoh::Weekday::Saturday,
-          osmoh::Weekday::Sunday}), ());
+    TEST(tt.SetOpeningDays({osmoh::Weekday::Monday, osmoh::Weekday::Tuesday, osmoh::Weekday::Wednesday,
+                            osmoh::Weekday::Thursday, osmoh::Weekday::Friday, osmoh::Weekday::Saturday,
+                            osmoh::Weekday::Sunday}),
+         ());
 
     tt.SetTwentyFourHours(false);
     TEST(tt.SetOpeningTime({8_h, 22_h}), ());
@@ -414,12 +406,9 @@ UNIT_TEST(TimeTableSt2OpeningHours)
   {
     TimeTableSet tts;
     auto tt = tts.Front();
-    TEST(tt.SetOpeningDays({
-          osmoh::Weekday::Monday,
-          osmoh::Weekday::Tuesday,
-          osmoh::Weekday::Wednesday,
-          osmoh::Weekday::Thursday,
-          osmoh::Weekday::Friday}), ());
+    TEST(tt.SetOpeningDays({osmoh::Weekday::Monday, osmoh::Weekday::Tuesday, osmoh::Weekday::Wednesday,
+                            osmoh::Weekday::Thursday, osmoh::Weekday::Friday}),
+         ());
 
     tt.SetTwentyFourHours(false);
     TEST(tt.SetOpeningTime({8_h, 22_h}), ());
@@ -431,12 +420,9 @@ UNIT_TEST(TimeTableSt2OpeningHours)
     TimeTableSet tts;
 
     auto tt = tts.Front();
-    TEST(tt.SetOpeningDays({
-          osmoh::Weekday::Monday,
-          osmoh::Weekday::Tuesday,
-          osmoh::Weekday::Wednesday,
-          osmoh::Weekday::Thursday,
-          osmoh::Weekday::Friday}), ());
+    TEST(tt.SetOpeningDays({osmoh::Weekday::Monday, osmoh::Weekday::Tuesday, osmoh::Weekday::Wednesday,
+                            osmoh::Weekday::Thursday, osmoh::Weekday::Friday}),
+         ());
 
     tt.SetTwentyFourHours(false);
     TEST(tt.SetOpeningTime({8_h, 22_h}), ());
@@ -449,12 +435,9 @@ UNIT_TEST(TimeTableSt2OpeningHours)
     TimeTableSet tts;
 
     auto tt = tts.Front();
-    TEST(tt.SetOpeningDays({
-          osmoh::Weekday::Monday,
-          osmoh::Weekday::Tuesday,
-          osmoh::Weekday::Wednesday,
-          osmoh::Weekday::Thursday,
-          osmoh::Weekday::Friday}), ());
+    TEST(tt.SetOpeningDays({osmoh::Weekday::Monday, osmoh::Weekday::Tuesday, osmoh::Weekday::Wednesday,
+                            osmoh::Weekday::Thursday, osmoh::Weekday::Friday}),
+         ());
 
     tt.SetTwentyFourHours(false);
     TEST(tt.SetOpeningTime({8_h, 22_h}), ());
@@ -469,10 +452,7 @@ UNIT_TEST(TimeTableSt2OpeningHours)
 
     {
       auto tt = tts.Front();
-      TEST(tt.SetOpeningDays({
-            osmoh::Weekday::Tuesday,
-            osmoh::Weekday::Wednesday,
-            osmoh::Weekday::Thursday}), ());
+      TEST(tt.SetOpeningDays({osmoh::Weekday::Tuesday, osmoh::Weekday::Wednesday, osmoh::Weekday::Thursday}), ());
 
       tt.SetTwentyFourHours(false);
       TEST(tt.SetOpeningTime({8_h, 10_h}), ());
@@ -480,11 +460,9 @@ UNIT_TEST(TimeTableSt2OpeningHours)
     }
     {
       TimeTable tt = TimeTable::GetUninitializedTimeTable();
-      TEST(tt.SetOpeningDays({
-            osmoh::Weekday::Monday,
-            osmoh::Weekday::Friday,
-            osmoh::Weekday::Saturday,
-            osmoh::Weekday::Sunday}), ());
+      TEST(tt.SetOpeningDays(
+               {osmoh::Weekday::Monday, osmoh::Weekday::Friday, osmoh::Weekday::Saturday, osmoh::Weekday::Sunday}),
+           ());
 
       tt.SetTwentyFourHours(false);
       TEST(tt.SetOpeningTime({13_h, 22_h}), ());
@@ -498,10 +476,7 @@ UNIT_TEST(TimeTableSt2OpeningHours)
 
     {
       auto tt = tts.Front();
-      TEST(tt.SetOpeningDays({
-            osmoh::Weekday::Monday,
-            osmoh::Weekday::Wednesday,
-            osmoh::Weekday::Friday}), ());
+      TEST(tt.SetOpeningDays({osmoh::Weekday::Monday, osmoh::Weekday::Wednesday, osmoh::Weekday::Friday}), ());
 
       tt.SetTwentyFourHours(false);
       TEST(tt.SetOpeningTime({8_h, 10_h}), ());
@@ -509,9 +484,7 @@ UNIT_TEST(TimeTableSt2OpeningHours)
     }
     {
       TimeTable tt = TimeTable::GetUninitializedTimeTable();
-      TEST(tt.SetOpeningDays({
-            osmoh::Weekday::Saturday,
-            osmoh::Weekday::Sunday}), ());
+      TEST(tt.SetOpeningDays({osmoh::Weekday::Saturday, osmoh::Weekday::Sunday}), ());
 
       tt.SetTwentyFourHours(false);
       TEST(tt.SetOpeningTime({13_h, 22_h}), ());
@@ -524,14 +497,10 @@ UNIT_TEST(TimeTableSt2OpeningHours)
     TimeTableSet tts;
 
     auto tt = tts.Front();
-    TEST(tt.SetOpeningDays({
-          osmoh::Weekday::Sunday,
-          osmoh::Weekday::Monday,
-          osmoh::Weekday::Tuesday,
-          osmoh::Weekday::Wednesday,
-          osmoh::Weekday::Thursday,
-          osmoh::Weekday::Friday,
-          osmoh::Weekday::Saturday}), ());
+    TEST(tt.SetOpeningDays({osmoh::Weekday::Sunday, osmoh::Weekday::Monday, osmoh::Weekday::Tuesday,
+                            osmoh::Weekday::Wednesday, osmoh::Weekday::Thursday, osmoh::Weekday::Friday,
+                            osmoh::Weekday::Saturday}),
+         ());
 
     tt.SetTwentyFourHours(false);
     TEST(tt.SetOpeningTime({11_h, 24_h}), ());
@@ -544,11 +513,7 @@ UNIT_TEST(TimeTableSt2OpeningHours)
 
     {
       auto tt = tts.Front();
-      TEST(tt.SetOpeningDays({
-            osmoh::Weekday::Monday,
-            osmoh::Weekday::Wednesday,
-            osmoh::Weekday::Thursday}), ());
-
+      TEST(tt.SetOpeningDays({osmoh::Weekday::Monday, osmoh::Weekday::Wednesday, osmoh::Weekday::Thursday}), ());
 
       tt.SetTwentyFourHours(false);
       TEST(tt.SetOpeningTime({8_h, 20_h}), ());
@@ -567,6 +532,7 @@ UNIT_TEST(TimeTableSt2OpeningHours)
 
     TEST_EQUAL(ToString(MakeOpeningHours(tts)),
                "Mo, We-Th 08:00-13:00, 14:00-20:00; "
-               "Sa 09:00-13:00, 14:00-18:00", ());
+               "Sa 09:00-13:00, 14:00-18:00",
+               ());
   }
 }
diff --git a/libs/editor/editor_tests/xml_feature_test.cpp b/libs/editor/editor_tests/xml_feature_test.cpp
index 86056fc60..9d38ce258 100644
--- a/libs/editor/editor_tests/xml_feature_test.cpp
+++ b/libs/editor/editor_tests/xml_feature_test.cpp
@@ -47,7 +47,6 @@ UNIT_TEST(XMLFeature_RawGetSet)
   TEST_EQUAL(expected, sstr.str(), ());
 }
 
-
 UNIT_TEST(XMLFeature_Setters)
 {
   XMLFeature feature(XMLFeature::Type::Node);
@@ -163,7 +162,7 @@ UNIT_TEST(XMLFeature_HasTags)
 UNIT_TEST(XMLFeature_FromXml)
 {
   // Do not space-align this string literal constant. It will be compared below.
-auto const kTestNode = R"(<?xml version="1.0"?>
+  auto const kTestNode = R"(<?xml version="1.0"?>
 <node lat="55.7978998" lon="37.474528" timestamp="2015-11-27T21:13:32Z">
   <tag k="name" v="Gorki Park" />
   <tag k="name:en" v="Gorki Park" />
@@ -176,11 +175,7 @@ auto const kTestNode = R"(<?xml version="1.0"?>
 )";
 
   std::map<std::string_view, std::string_view> kTestNames{
-    {"default", "Gorki Park"},
-    {"en", "Gorki Park"},
-    {"ru", "Парк Горького"},
-    {"int_name", "Gorky Park"}
-  };
+      {"default", "Gorki Park"}, {"en", "Gorki Park"}, {"ru", "Парк Горького"}, {"int_name", "Gorky Park"}};
 
   XMLFeature feature(kTestNode);
 
@@ -207,10 +202,7 @@ auto const kTestNode = R"(<?xml version="1.0"?>
   TEST_EQUAL(base::TimestampToString(feature.GetModificationTime()), "2015-11-27T21:13:32Z", ());
 
   std::map<std::string_view, std::string_view> names;
-  feature.ForEachName([&names](std::string_view lang, std::string_view name)
-  {
-    names.emplace(lang, name);
-  });
+  feature.ForEachName([&names](std::string_view lang, std::string_view name) { names.emplace(lang, name); });
   TEST_EQUAL(names, kTestNames, ());
 }
 
@@ -266,16 +258,9 @@ UNIT_TEST(XMLFeature_FromXmlNode)
 
 UNIT_TEST(XMLFeature_Geometry)
 {
-  std::vector<m2::PointD> const geometry =
-  {
-    {28.7206411, 3.7182409},
-    {46.7569003, 47.0774689},
-    {22.5909217, 41.6994874},
-    {14.7537008, 17.7788229},
-    {55.1261701, 10.3199476},
-    {28.6519654, 50.0305930},
-    {28.7206411, 3.7182409}
-  };
+  std::vector<m2::PointD> const geometry = {
+      {28.7206411, 3.7182409},  {46.7569003, 47.0774689}, {22.5909217, 41.6994874}, {14.7537008, 17.7788229},
+      {55.1261701, 10.3199476}, {28.6519654, 50.0305930}, {28.7206411, 3.7182409}};
 
   XMLFeature feature(XMLFeature::Type::Way);
   feature.SetGeometry(geometry);
@@ -502,13 +487,15 @@ UNIT_TEST(XMLFeature_SocialContactsProcessing)
     auto convertedFt = editor::ToXML(emo, true);
 
     TEST(convertedFt.HasTag("contact:facebook"), ());
-    TEST_EQUAL(convertedFt.GetTagValue("contact:facebook"), "https://facebook.com/pages/Stereo-Plaza/118100041593935", ());
+    TEST_EQUAL(convertedFt.GetTagValue("contact:facebook"), "https://facebook.com/pages/Stereo-Plaza/118100041593935",
+               ());
 
     TEST(convertedFt.HasTag("contact:instagram"), ());
     TEST_EQUAL(convertedFt.GetTagValue("contact:instagram"), "https://instagram.com/p/CSy87IhMhfm", ());
 
     TEST(convertedFt.HasTag("contact:line"), ());
-    TEST_EQUAL(convertedFt.GetTagValue("contact:line"), "https://liff.line.me/1645278921-kWRPP32q/?accountId=673watcr", ());
+    TEST_EQUAL(convertedFt.GetTagValue("contact:line"), "https://liff.line.me/1645278921-kWRPP32q/?accountId=673watcr",
+               ());
   }
 }
 
diff --git a/libs/editor/edits_migration.cpp b/libs/editor/edits_migration.cpp
index 527944412..18705feef 100644
--- a/libs/editor/edits_migration.cpp
+++ b/libs/editor/edits_migration.cpp
@@ -14,34 +14,28 @@
 
 namespace editor
 {
-FeatureID MigrateNodeFeatureIndex(osm::Editor::ForEachFeaturesNearByFn & forEach,
-                                  XMLFeature const & xml,
-                                  FeatureStatus const featureStatus,
-                                  GenerateIDFn const & generateID)
+FeatureID MigrateNodeFeatureIndex(osm::Editor::ForEachFeaturesNearByFn & forEach, XMLFeature const & xml,
+                                  FeatureStatus const featureStatus, GenerateIDFn const & generateID)
 {
   if (featureStatus == FeatureStatus::Created)
     return generateID();
 
   FeatureID fid;
   auto count = 0;
-  forEach(
-      [&fid, &count](FeatureType const & ft) {
-        if (ft.GetGeomType() != feature::GeomType::Point)
-          return;
-        // TODO(mgsergio): Check that ft and xml correspond to the same feature.
-        fid = ft.GetID();
-        ++count;
-      },
-      mercator::FromLatLon(xml.GetCenter()));
+  forEach([&fid, &count](FeatureType const & ft)
+  {
+    if (ft.GetGeomType() != feature::GeomType::Point)
+      return;
+    // TODO(mgsergio): Check that ft and xml correspond to the same feature.
+    fid = ft.GetID();
+    ++count;
+  }, mercator::FromLatLon(xml.GetCenter()));
 
   if (count == 0)
     MYTHROW(MigrationError, ("No pointed features returned."));
 
   if (count > 1)
-  {
-    LOG(LWARNING,
-        (count, "features returned for point", mercator::FromLatLon(xml.GetCenter())));
-  }
+    LOG(LWARNING, (count, "features returned for point", mercator::FromLatLon(xml.GetCenter())));
 
   return fid;
 }
@@ -63,62 +57,53 @@ FeatureID MigrateWayOrRelatonFeatureIndex(
   auto const someFeaturePoint = geometry[0];
 
   forEach([&fid, &geometry, &count, &bestScore](FeatureType & ft)
-      {
-        if (ft.GetGeomType() != feature::GeomType::Area)
-          return;
-        ++count;
+  {
+    if (ft.GetGeomType() != feature::GeomType::Area)
+      return;
+    ++count;
 
-        std::vector<m2::PointD> ftGeometry;
-        assign_range(ftGeometry, ft.GetTrianglesAsPoints(FeatureType::BEST_GEOMETRY));
+    std::vector<m2::PointD> ftGeometry;
+    assign_range(ftGeometry, ft.GetTrianglesAsPoints(FeatureType::BEST_GEOMETRY));
 
-        double score = 0.0;
-        try
-        {
-          score = matcher::ScoreTriangulatedGeometries(geometry, ftGeometry);
-        }
-        catch (geometry::NotAPolygonException & ex)
-        {
-          LOG(LWARNING, (ex.Msg()));
-          // Support migration for old application versions.
-          // TODO(a): To remove it when version 8.0.x will no longer be supported.
-          base::SortUnique(geometry);
-          base::SortUnique(ftGeometry);
-          score = matcher::ScoreTriangulatedGeometriesByPoints(geometry, ftGeometry);
-        }
+    double score = 0.0;
+    try
+    {
+      score = matcher::ScoreTriangulatedGeometries(geometry, ftGeometry);
+    }
+    catch (geometry::NotAPolygonException & ex)
+    {
+      LOG(LWARNING, (ex.Msg()));
+      // Support migration for old application versions.
+      // TODO(a): To remove it when version 8.0.x will no longer be supported.
+      base::SortUnique(geometry);
+      base::SortUnique(ftGeometry);
+      score = matcher::ScoreTriangulatedGeometriesByPoints(geometry, ftGeometry);
+    }
 
-        if (score > bestScore)
-        {
-          bestScore = score;
-          fid = ft.GetID();
-        }
-      },
-      someFeaturePoint);
+    if (score > bestScore)
+    {
+      bestScore = score;
+      fid = ft.GetID();
+    }
+  }, someFeaturePoint);
 
   if (count == 0)
     MYTHROW(MigrationError, ("No ways returned for point", someFeaturePoint));
 
   if (!fid)
-  {
-    MYTHROW(MigrationError,
-            ("None of returned ways suffice. Possibly, the feature has been deleted."));
-  }
+    MYTHROW(MigrationError, ("None of returned ways suffice. Possibly, the feature has been deleted."));
   return *fid;
 }
 
-FeatureID MigrateFeatureIndex(osm::Editor::ForEachFeaturesNearByFn & forEach,
-                              XMLFeature const & xml,
-                              FeatureStatus const featureStatus,
-                              GenerateIDFn const & generateID)
+FeatureID MigrateFeatureIndex(osm::Editor::ForEachFeaturesNearByFn & forEach, XMLFeature const & xml,
+                              FeatureStatus const featureStatus, GenerateIDFn const & generateID)
 {
   switch (xml.GetType())
   {
-  case XMLFeature::Type::Unknown:
-    MYTHROW(MigrationError, ("Migration for XMLFeature::Type::Unknown is not possible"));
-  case XMLFeature::Type::Node:
-    return MigrateNodeFeatureIndex(forEach, xml, featureStatus, generateID);
+  case XMLFeature::Type::Unknown: MYTHROW(MigrationError, ("Migration for XMLFeature::Type::Unknown is not possible"));
+  case XMLFeature::Type::Node: return MigrateNodeFeatureIndex(forEach, xml, featureStatus, generateID);
   case XMLFeature::Type::Way:
-  case XMLFeature::Type::Relation:
-    return MigrateWayOrRelatonFeatureIndex(forEach, xml, featureStatus, generateID);
+  case XMLFeature::Type::Relation: return MigrateWayOrRelatonFeatureIndex(forEach, xml, featureStatus, generateID);
   }
   UNREACHABLE();
 }
diff --git a/libs/editor/edits_migration.hpp b/libs/editor/edits_migration.hpp
index 992803290..295280b6b 100644
--- a/libs/editor/edits_migration.hpp
+++ b/libs/editor/edits_migration.hpp
@@ -18,8 +18,6 @@ using GenerateIDFn = std::function<FeatureID()>;
 
 /// Tries to match xml feature with one on a new mwm and returns FeatureID
 /// of a found feature, throws MigrationError if migration fails.
-FeatureID MigrateFeatureIndex(osm::Editor::ForEachFeaturesNearByFn & forEach,
-                              XMLFeature const & xml,
-                              FeatureStatus const featureStatus,
-                              GenerateIDFn const & generateID);
+FeatureID MigrateFeatureIndex(osm::Editor::ForEachFeaturesNearByFn & forEach, XMLFeature const & xml,
+                              FeatureStatus const featureStatus, GenerateIDFn const & generateID);
 }  // namespace editor
diff --git a/libs/editor/feature_matcher.cpp b/libs/editor/feature_matcher.cpp
index 1f262681d..c3147d49c 100644
--- a/libs/editor/feature_matcher.cpp
+++ b/libs/editor/feature_matcher.cpp
@@ -31,8 +31,7 @@ using ForEachWayFn = std::function<void(pugi::xml_node const & way, std::string
 
 double const kPointDiffEps = 1e-5;
 
-void AddInnerIfNeeded(pugi::xml_document const & osmResponse, pugi::xml_node const & way,
-                      Polygon & dest)
+void AddInnerIfNeeded(pugi::xml_document const & osmResponse, pugi::xml_node const & way, Polygon & dest)
 {
   if (dest.inners().empty() || dest.inners().back().empty())
     return;
@@ -57,8 +56,7 @@ void AddInnerIfNeeded(pugi::xml_document const & osmResponse, pugi::xml_node con
 
 void MakeOuterRing(MultiLinestring & outerLines, Polygon & dest)
 {
-  bool const needReverse =
-      outerLines.size() > 1 && bg::equals(outerLines[0].front(), outerLines[1].back());
+  bool const needReverse = outerLines.size() > 1 && bg::equals(outerLines[0].front(), outerLines[1].back());
 
   for (size_t i = 0; i < outerLines.size(); ++i)
   {
@@ -77,8 +75,7 @@ double ScoreLatLon(XMLFeature const & xmlFt, ms::LatLon const & latLon)
   return 1.0 - (a.Length(b) / kPointDiffEps);
 }
 
-void ForEachRefInWay(pugi::xml_document const & osmResponse, pugi::xml_node const & way,
-                     ForEachRefFn const & fn)
+void ForEachRefInWay(pugi::xml_document const & osmResponse, pugi::xml_node const & way, ForEachRefFn const & fn)
 {
   for (auto const & xNodeRef : way.select_nodes("nd/@ref"))
   {
@@ -138,14 +135,12 @@ Polygon GetWaysGeometry(pugi::xml_document const & osmResponse, pugi::xml_node c
   return result;
 }
 
-Polygon GetRelationsGeometry(pugi::xml_document const & osmResponse,
-                             pugi::xml_node const & relation)
+Polygon GetRelationsGeometry(pugi::xml_document const & osmResponse, pugi::xml_node const & relation)
 {
   Polygon result;
   MultiLinestring outerLines;
 
-  auto const fn = [&osmResponse, &result, &outerLines](pugi::xml_node const & way,
-                                                       std::string const & role)
+  auto const fn = [&osmResponse, &result, &outerLines](pugi::xml_node const & way, std::string const & role)
   {
     if (role == "outer")
     {
@@ -171,8 +166,7 @@ Polygon GetRelationsGeometry(pugi::xml_document const & osmResponse,
   return result;
 }
 
-Polygon GetWaysOrRelationsGeometry(pugi::xml_document const & osmResponse,
-                                   pugi::xml_node const & wayOrRelation)
+Polygon GetWaysOrRelationsGeometry(pugi::xml_document const & osmResponse, pugi::xml_node const & wayOrRelation)
 {
   if (strcmp(wayOrRelation.name(), "way") == 0)
     return GetWaysGeometry(osmResponse, wayOrRelation);
@@ -245,8 +239,7 @@ pugi::xml_node GetBestOsmNode(pugi::xml_document const & osmResponse, ms::LatLon
   return bestMatchNode;
 }
 
-pugi::xml_node GetBestOsmWayOrRelation(pugi::xml_document const & osmResponse,
-                                       std::vector<m2::PointD> const & geometry)
+pugi::xml_node GetBestOsmWayOrRelation(pugi::xml_document const & osmResponse, std::vector<m2::PointD> const & geometry)
 {
   double bestScore = geometry::kPenaltyScore;
   pugi::xml_node bestMatchWay;
@@ -280,8 +273,7 @@ double ScoreTriangulatedGeometries(std::vector<m2::PointD> const & lhs, std::vec
   return score;
 }
 
-double ScoreTriangulatedGeometriesByPoints(std::vector<m2::PointD> const & lhs,
-                                           std::vector<m2::PointD> const & rhs)
+double ScoreTriangulatedGeometriesByPoints(std::vector<m2::PointD> const & lhs, std::vector<m2::PointD> const & rhs)
 {
   // The default comparison operator used in sort above (cmp1) and one that is
   // used in set_itersection (cmp2) are compatible in that sence that
@@ -293,13 +285,11 @@ double ScoreTriangulatedGeometriesByPoints(std::vector<m2::PointD> const & lhs,
   // |a, b| < eps, |b, c| < eps.
   // This could lead to unexpected results in set_itersection (with greedy implementation),
   // but we assume such situation is very unlikely.
-  auto const matched = set_intersection(begin(lhs), end(lhs),
-                                        begin(rhs), end(rhs),
-                                        CounterIterator(),
+  auto const matched = set_intersection(begin(lhs), end(lhs), begin(rhs), end(rhs), CounterIterator(),
                                         [](m2::PointD const & p1, m2::PointD const & p2)
-                                        {
-                                          return p1 < p2 && !p1.EqualDxDy(p2, mercator::kPointEqualityEps);
-                                        }).GetCount();
+  {
+    return p1 < p2 && !p1.EqualDxDy(p2, mercator::kPointEqualityEps);
+  }).GetCount();
 
   return static_cast<double>(matched) / static_cast<double>(lhs.size());
 }
diff --git a/libs/editor/feature_matcher.hpp b/libs/editor/feature_matcher.hpp
index ecd93e95d..bd1a2b84d 100644
--- a/libs/editor/feature_matcher.hpp
+++ b/libs/editor/feature_matcher.hpp
@@ -17,13 +17,11 @@ pugi::xml_node GetBestOsmWayOrRelation(pugi::xml_document const & osmResponse,
 /// Returns value form [-1, 1]. Negative values are used as penalty, positive as score.
 /// |lhs| and |rhs| - triangulated polygons.
 /// Throws NotAPolygon exception when either lhs or rhs is not convertible to a polygon.
-double ScoreTriangulatedGeometries(std::vector<m2::PointD> const & lhs,
-                                   std::vector<m2::PointD> const & rhs);
+double ScoreTriangulatedGeometries(std::vector<m2::PointD> const & lhs, std::vector<m2::PointD> const & rhs);
 /// Deprecated, use ScoreTriangulatedGeometries instead. In the older versions of the editor, the
 /// edits.xml file didn't contain the necessary geometry information, so we cannot restore the
 /// original geometry of a particular feature and thus can't use the new algo that is dependent on
 /// correct feature geometry to calculate scores.
 // TODO(a): To remove it when version 8.0.x is no longer supported.
-double ScoreTriangulatedGeometriesByPoints(std::vector<m2::PointD> const & lhs,
-                                           std::vector<m2::PointD> const & rhs);
-}  // namespace osm
+double ScoreTriangulatedGeometriesByPoints(std::vector<m2::PointD> const & lhs, std::vector<m2::PointD> const & rhs);
+}  // namespace matcher
diff --git a/libs/editor/new_feature_categories.cpp b/libs/editor/new_feature_categories.cpp
index 2bf4bdebe..ae220d8d0 100644
--- a/libs/editor/new_feature_categories.cpp
+++ b/libs/editor/new_feature_categories.cpp
@@ -23,7 +23,8 @@ NewFeatureCategories::NewFeatureCategories(editor::EditorConfig const & config)
 }
 
 NewFeatureCategories::NewFeatureCategories(NewFeatureCategories && other) noexcept
-  : m_index(std::move(other.m_index)), m_types(std::move(other.m_types))
+  : m_index(std::move(other.m_index))
+  , m_types(std::move(other.m_types))
 {
   // Do not move m_addedLangs, see Framework::GetEditorCategories() usage.
 }
diff --git a/libs/editor/opening_hours_ui.cpp b/libs/editor/opening_hours_ui.cpp
index 6a1952608..426010907 100644
--- a/libs/editor/opening_hours_ui.cpp
+++ b/libs/editor/opening_hours_ui.cpp
@@ -41,22 +41,20 @@ bool FixTimeSpans(osmoh::Timespan openingTime, osmoh::TTimespans & spans)
     return true;
 
   for (auto & span : spans)
-  {
     if (span.HasExtendedHours())
       span.GetEnd().GetHourMinutes().AddDuration(24_h);
-  }
 
-  std::sort(std::begin(spans), std::end(spans),
-            [](osmoh::Timespan const & s1, osmoh::Timespan const s2) {
-              auto const start1 = s1.GetStart().GetHourMinutes();
-              auto const start2 = s2.GetStart().GetHourMinutes();
+  std::sort(std::begin(spans), std::end(spans), [](osmoh::Timespan const & s1, osmoh::Timespan const s2)
+  {
+    auto const start1 = s1.GetStart().GetHourMinutes();
+    auto const start2 = s2.GetStart().GetHourMinutes();
 
-              // If two spans start at the same point the longest span should be leftmost.
-              if (start1 == start2)
-                return SpanLength(s1) > SpanLength(s2);
+    // If two spans start at the same point the longest span should be leftmost.
+    if (start1 == start2)
+      return SpanLength(s1) > SpanLength(s2);
 
-              return start1 < start2;
-            });
+    return start1 < start2;
+  });
 
   osmoh::TTimespans result{spans.front()};
   for (size_t i = 1, j = 0; i < spans.size(); ++i)
@@ -91,17 +89,14 @@ bool FixTimeSpans(osmoh::Timespan openingTime, osmoh::TTimespans & spans)
     return false;
 
   for (auto & span : result)
-  {
     if (span.HasExtendedHours())
       span.GetEnd().GetHourMinutes().AddDuration(-24_h);
-  }
 
   spans.swap(result);
   return true;
 }
 
-osmoh::Timespan GetLongetsOpenSpan(osmoh::Timespan const & openingTime,
-                                   osmoh::TTimespans const & excludeTime)
+osmoh::Timespan GetLongetsOpenSpan(osmoh::Timespan const & openingTime, osmoh::TTimespans const & excludeTime)
 {
   if (excludeTime.empty())
     return openingTime;
@@ -116,7 +111,7 @@ osmoh::Timespan GetLongetsOpenSpan(osmoh::Timespan const & openingTime,
   osmoh::Timespan lastSpan{excludeTime.back().GetEnd(), openingTime.GetEnd()};
   return SpanLength(longestSpan) > SpanLength(lastSpan) ? longestSpan : lastSpan;
 }
-} // namespace
+}  // namespace
 
 namespace editor
 {
@@ -129,15 +124,8 @@ TimeTable TimeTable::GetPredefinedTimeTable()
 {
   TimeTable tt;
   tt.m_isTwentyFourHours = true;
-  tt.m_weekdays = {
-    osmoh::Weekday::Sunday,
-    osmoh::Weekday::Monday,
-    osmoh::Weekday::Tuesday,
-    osmoh::Weekday::Wednesday,
-    osmoh::Weekday::Thursday,
-    osmoh::Weekday::Friday,
-    osmoh::Weekday::Saturday
-  };
+  tt.m_weekdays = {osmoh::Weekday::Sunday,   osmoh::Weekday::Monday, osmoh::Weekday::Tuesday, osmoh::Weekday::Wednesday,
+                   osmoh::Weekday::Thursday, osmoh::Weekday::Friday, osmoh::Weekday::Saturday};
 
   tt.m_openingTime = tt.GetPredefinedOpeningTime();
 
@@ -180,7 +168,8 @@ bool TimeTable::SetOpeningTime(osmoh::Timespan const & span)
     auto const excludeSpanStart = excludeSpan.GetStart().GetHourMinutes().GetDuration();
     auto const excludeSpanEnd = excludeSpan.GetEnd().GetHourMinutes().GetDuration();
 
-    if (!GetOpeningTime().HasExtendedHours() && (excludeSpanStart < openingTimeStart || openingTimeEnd < excludeSpanEnd))
+    if (!GetOpeningTime().HasExtendedHours() &&
+        (excludeSpanStart < openingTimeStart || openingTimeEnd < excludeSpanEnd))
       continue;
 
     excludeTime.push_back(excludeSpan);
@@ -193,8 +182,7 @@ bool TimeTable::SetOpeningTime(osmoh::Timespan const & span)
 bool TimeTable::CanAddExcludeTime() const
 {
   auto copy = *this;
-  return copy.AddExcludeTime(GetPredefinedExcludeTime()) &&
-         copy.GetExcludeTime().size() == GetExcludeTime().size() + 1;
+  return copy.AddExcludeTime(GetPredefinedExcludeTime()) && copy.GetExcludeTime().size() == GetExcludeTime().size() + 1;
 }
 
 bool TimeTable::AddExcludeTime(osmoh::Timespan const & span)
@@ -294,15 +282,9 @@ TimeTableSet::TimeTableSet()
 
 OpeningDays TimeTableSet::GetUnhandledDays() const
 {
-  OpeningDays days = {
-    osmoh::Weekday::Sunday,
-    osmoh::Weekday::Monday,
-    osmoh::Weekday::Tuesday,
-    osmoh::Weekday::Wednesday,
-    osmoh::Weekday::Thursday,
-    osmoh::Weekday::Friday,
-    osmoh::Weekday::Saturday
-  };
+  OpeningDays days = {osmoh::Weekday::Sunday,    osmoh::Weekday::Monday,   osmoh::Weekday::Tuesday,
+                      osmoh::Weekday::Wednesday, osmoh::Weekday::Thursday, osmoh::Weekday::Friday,
+                      osmoh::Weekday::Saturday};
 
   for (auto const & tt : *this)
     for (auto const day : tt.GetOpeningDays())
@@ -325,9 +307,8 @@ TimeTable TimeTableSet::GetComplementTimeTable() const
 
 bool TimeTableSet::IsTwentyFourPerSeven() const
 {
-  return GetUnhandledDays().empty() &&
-         std::all_of(std::begin(m_table), std::end(m_table),
-                     [](TimeTable const & tt) { return tt.IsTwentyFourHours(); });
+  return GetUnhandledDays().empty() && std::all_of(std::begin(m_table), std::end(m_table),
+                                                   [](TimeTable const & tt) { return tt.IsTwentyFourHours(); });
 }
 
 bool TimeTableSet::Append(TimeTable const & tt)
@@ -392,5 +373,5 @@ bool TimeTableSet::UpdateByIndex(TimeTableSet & ttSet, size_t const index)
 
   return true;
 }
-} // namspace ui
-} // namespace editor
+}  // namespace ui
+}  // namespace editor
diff --git a/libs/editor/opening_hours_ui.hpp b/libs/editor/opening_hours_ui.hpp
index 33d7c3fe9..1d1688191 100644
--- a/libs/editor/opening_hours_ui.hpp
+++ b/libs/editor/opening_hours_ui.hpp
@@ -57,10 +57,7 @@ public:
   class Proxy : public TimeTable
   {
   public:
-    Proxy(TimeTableSet & tts, size_t const index, TimeTable const & tt)
-      : TimeTable(tt), m_index(index), m_tts(tts)
-    {
-    }
+    Proxy(TimeTableSet & tts, size_t const index, TimeTable const & tt) : TimeTable(tt), m_index(index), m_tts(tts) {}
 
     bool Commit() { return m_tts.Replace(*this, m_index); }  // Slice base class on copy.
 
@@ -97,5 +94,5 @@ private:
 
   TimeTableSetImpl m_table;
 };
-} // namespace ui
-} // namespace editor
+}  // namespace ui
+}  // namespace editor
diff --git a/libs/editor/osm_auth.cpp b/libs/editor/osm_auth.cpp
index 73cf25d64..9953d143d 100644
--- a/libs/editor/osm_auth.cpp
+++ b/libs/editor/osm_auth.cpp
@@ -49,7 +49,7 @@ string FindOauthCode(string const & redirectUri)
 string FindAccessToken(string const & body)
 {
   // Extract access_token from JSON in format {"access_token":"...", "token_type":"Bearer", "scope":"read_prefs"}
-  const base::Json root(body.c_str());
+  base::Json const root(body.c_str());
 
   if (json_is_object(root.get()))
   {
@@ -80,12 +80,12 @@ bool OsmOAuth::IsValid(string const & ks)
   return !ks.empty();
 }
 
-OsmOAuth::OsmOAuth(string const & oauth2ClientId, string const & oauth2Scope,
-                   string const & oauth2RedirectUri, string baseUrl, string apiUrl)
-  : m_oauth2params{oauth2ClientId, oauth2Scope, oauth2RedirectUri},
-    m_baseUrl(std::move(baseUrl)), m_apiUrl(std::move(apiUrl))
-{
-}
+OsmOAuth::OsmOAuth(string const & oauth2ClientId, string const & oauth2Scope, string const & oauth2RedirectUri,
+                   string baseUrl, string apiUrl)
+  : m_oauth2params{oauth2ClientId, oauth2Scope, oauth2RedirectUri}
+  , m_baseUrl(std::move(baseUrl))
+  , m_apiUrl(std::move(apiUrl))
+{}
 // static
 OsmOAuth OsmOAuth::ServerAuth()
 {
@@ -121,11 +121,20 @@ OsmOAuth OsmOAuth::ProductionServerAuth()
   return {OSM_OAUTH2_CLIENT_ID, OSM_OAUTH2_SCOPE, OSM_OAUTH2_REDIRECT_URI, kOsmMainSiteURL, kOsmApiURL};
 }
 
-void OsmOAuth::SetAuthToken(string const & oauthToken) { m_oauth2token = oauthToken; }
+void OsmOAuth::SetAuthToken(string const & oauthToken)
+{
+  m_oauth2token = oauthToken;
+}
 
-string const & OsmOAuth::GetAuthToken() const { return m_oauth2token; }
+string const & OsmOAuth::GetAuthToken() const
+{
+  return m_oauth2token;
+}
 
-bool OsmOAuth::IsAuthorized() const{ return IsValid(m_oauth2token); }
+bool OsmOAuth::IsAuthorized() const
+{
+  return IsValid(m_oauth2token);
+}
 
 // Opens a login page and extract a cookie and a secret token.
 OsmOAuth::SessionID OsmOAuth::FetchSessionId(string const & subUrl, string const & cookies) const
@@ -140,7 +149,7 @@ OsmOAuth::SessionID OsmOAuth::FetchSessionId(string const & subUrl, string const
   if (request.ErrorCode() != HTTP::OK)
     MYTHROW(FetchSessionIdError, (DebugPrint(request)));
 
-  SessionID sid = { request.CombinedCookies(), FindAuthenticityToken(request.ServerResponse()) };
+  SessionID sid = {request.CombinedCookies(), FindAuthenticityToken(request.ServerResponse())};
   if (sid.m_cookies.empty() || sid.m_authenticityToken.empty())
     MYTHROW(FetchSessionIdError, ("Cookies and/or token are empty for request", DebugPrint(request)));
   return sid;
@@ -158,17 +167,15 @@ void OsmOAuth::LogoutUser(SessionID const & sid) const
 
 bool OsmOAuth::LoginUserPassword(string const & login, string const & password, SessionID const & sid) const
 {
-  auto params = BuildPostRequest({
-    {"username", login},
-    {"password", password},
-    {"referer", "/"},
-    {"commit", "Login"},
-    {"authenticity_token", sid.m_authenticityToken}
-  });
+  auto params = BuildPostRequest({{"username", login},
+                                  {"password", password},
+                                  {"referer", "/"},
+                                  {"commit", "Login"},
+                                  {"authenticity_token", sid.m_authenticityToken}});
   HttpClient request(m_baseUrl + "/login");
   request.SetBodyData(std::move(params), "application/x-www-form-urlencoded")
-         .SetCookies(sid.m_cookies)
-         .SetFollowRedirects(true);
+      .SetCookies(sid.m_cookies)
+      .SetFollowRedirects(true);
   if (!request.RunHttpRequest())
     MYTHROW(NetworkError, ("LoginUserPassword Network error while connecting to", request.UrlRequested()));
 
@@ -193,8 +200,7 @@ bool OsmOAuth::LoginSocial(string const & callbackPart, string const & socialTok
 {
   string const url = m_baseUrl + callbackPart + socialToken;
   HttpClient request(url);
-  request.SetCookies(sid.m_cookies)
-         .SetFollowRedirects(true);
+  request.SetCookies(sid.m_cookies).SetFollowRedirects(true);
   if (!request.RunHttpRequest())
     MYTHROW(NetworkError, ("LoginSocial Network error while connecting to", request.UrlRequested()));
   if (request.ErrorCode() != HTTP::OK && request.ErrorCode() != HTTP::Found)
@@ -215,18 +221,16 @@ bool OsmOAuth::LoginSocial(string const & callbackPart, string const & socialTok
 // Fakes a buttons press to automatically accept requested permissions.
 string OsmOAuth::SendAuthRequest(string const & requestTokenKey, SessionID const & lastSid) const
 {
-  auto params = BuildPostRequest({
-    {"authenticity_token", requestTokenKey},
-    {"client_id", m_oauth2params.m_clientId},
-    {"redirect_uri", m_oauth2params.m_redirectUri},
-    {"scope", m_oauth2params.m_scope},
-    {"response_type", "code"}
-  });
+  auto params = BuildPostRequest({{"authenticity_token", requestTokenKey},
+                                  {"client_id", m_oauth2params.m_clientId},
+                                  {"redirect_uri", m_oauth2params.m_redirectUri},
+                                  {"scope", m_oauth2params.m_scope},
+                                  {"response_type", "code"}});
   HttpClient request(m_baseUrl + "/oauth2/authorize");
   request.SetBodyData(std::move(params), "application/x-www-form-urlencoded")
-         .SetCookies(lastSid.m_cookies)
-         //.SetRawHeader("Origin", m_baseUrl)
-         .SetFollowRedirects(false);
+      .SetCookies(lastSid.m_cookies)
+      //.SetRawHeader("Origin", m_baseUrl)
+      .SetFollowRedirects(false);
   if (!request.RunHttpRequest())
     MYTHROW(NetworkError, ("SendAuthRequest Network error while connecting to", request.UrlRequested()));
   if (!request.WasRedirected())
@@ -242,8 +246,7 @@ string OsmOAuth::SendAuthRequest(string const & requestTokenKey, SessionID const
 string OsmOAuth::FetchRequestToken(SessionID const & sid) const
 {
   HttpClient request(BuildOAuth2Url());
-  request.SetCookies(sid.m_cookies)
-         .SetFollowRedirects(false);
+  request.SetCookies(sid.m_cookies).SetFollowRedirects(false);
 
   if (!request.RunHttpRequest())
     MYTHROW(NetworkError, ("FetchRequestToken Network error while connecting to", request.UrlRequested()));
@@ -257,7 +260,8 @@ string OsmOAuth::FetchRequestToken(SessionID const & sid) const
     // Recieved URL in format "{OSM_OAUTH2_REDIRECT_URI}?code=XXXX". Extract code value
     string const oauthCode = FindOauthCode(request.UrlReceived());
     if (oauthCode.empty())
-      MYTHROW(OsmOAuth::NetworkError, ("FetchRequestToken Redirect url has no 'code' parameter", request.UrlReceived()));
+      MYTHROW(OsmOAuth::NetworkError,
+              ("FetchRequestToken Redirect url has no 'code' parameter", request.UrlReceived()));
     return oauthCode;
   }
   else
@@ -275,15 +279,12 @@ string OsmOAuth::FetchRequestToken(SessionID const & sid) const
 
 string OsmOAuth::BuildOAuth2Url() const
 {
-   auto requestTokenUrl = m_baseUrl + "/oauth2/authorize";
-   auto const requestTokenQuery = BuildPostRequest(
-   {
-       {"client_id", m_oauth2params.m_clientId},
-       {"redirect_uri", m_oauth2params.m_redirectUri},
-       {"scope", m_oauth2params.m_scope},
-       {"response_type", "code"}
-   });
-   return requestTokenUrl.append("?").append(requestTokenQuery);
+  auto requestTokenUrl = m_baseUrl + "/oauth2/authorize";
+  auto const requestTokenQuery = BuildPostRequest({{"client_id", m_oauth2params.m_clientId},
+                                                   {"redirect_uri", m_oauth2params.m_redirectUri},
+                                                   {"scope", m_oauth2params.m_scope},
+                                                   {"response_type", "code"}});
+  return requestTokenUrl.append("?").append(requestTokenQuery);
 }
 
 string OsmOAuth::FinishAuthorization(string const & oauth2code) const
@@ -297,8 +298,7 @@ string OsmOAuth::FinishAuthorization(string const & oauth2code) const
   });
 
   HttpClient request(m_baseUrl + "/oauth2/token");
-  request.SetBodyData(std::move(params), "application/x-www-form-urlencoded")
-      .SetFollowRedirects(true);
+  request.SetBodyData(std::move(params), "application/x-www-form-urlencoded").SetFollowRedirects(true);
   if (!request.RunHttpRequest())
     MYTHROW(NetworkError, ("FinishAuthorization Network error while connecting to", request.UrlRequested()));
   if (request.ErrorCode() != HTTP::OK)
diff --git a/libs/editor/osm_auth.hpp b/libs/editor/osm_auth.hpp
index d97c4037f..4893b071b 100644
--- a/libs/editor/osm_auth.hpp
+++ b/libs/editor/osm_auth.hpp
@@ -14,7 +14,6 @@ struct Oauth2Params
   std::string m_redirectUri;
 };
 
-
 /// All methods that interact with the OSM server are blocking and not asynchronous.
 class OsmOAuth
 {
@@ -59,8 +58,8 @@ public:
   static bool IsValid(std::string const & ks);
 
   /// The constructor. Simply stores a lot of strings in fields.
-  OsmOAuth(std::string const & oauth2ClientId, std::string const & oauth2Scope,
-           std::string const & oauth2RedirectUri, std::string baseUrl, std::string apiUrl);
+  OsmOAuth(std::string const & oauth2ClientId, std::string const & oauth2Scope, std::string const & oauth2RedirectUri,
+           std::string baseUrl, std::string apiUrl);
 
   /// Should be used everywhere in production code instead of servers below.
   static OsmOAuth ServerAuth();
@@ -82,7 +81,7 @@ public:
   /// @returns false if Google credentials are invalid.
   bool AuthorizeGoogle(std::string const & googleToken);
   /// @returns false if email has not been registered on a server.
-  //bool ResetPassword(std::string const & email) const;
+  // bool ResetPassword(std::string const & email) const;
 
   /// Throws in case of network errors.
   /// @param[method] The API method, must start with a forward slash.
@@ -103,18 +102,9 @@ public:
   std::string FinishAuthorization(std::string const & oauth2code) const;
   std::string GetRegistrationURL() const { return m_baseUrl + "/user/new"; }
   std::string GetResetPasswordURL() const { return m_baseUrl + "/user/forgot-password"; }
-  std::string GetHistoryURL(std::string const & user) const
-  {
-    return m_baseUrl + "/user/" + user + "/history";
-  }
-  std::string GetNotesURL(std::string const & user) const
-  {
-    return m_baseUrl + "/user/" + user + "/notes";
-  }
-  std::string GetDeleteURL() const
-  {
-    return m_baseUrl + "/account/deletion";
-  }
+  std::string GetHistoryURL(std::string const & user) const { return m_baseUrl + "/user/" + user + "/history"; }
+  std::string GetNotesURL(std::string const & user) const { return m_baseUrl + "/user/" + user + "/notes"; }
+  std::string GetDeleteURL() const { return m_baseUrl + "/account/deletion"; }
   std::string BuildOAuth2Url() const;
   //@}
 
@@ -130,21 +120,18 @@ private:
   std::string const m_baseUrl;
   std::string const m_apiUrl;
   /// Token to authenticate every OAuth request.
-  //std::string const m_oauth2code;
+  // std::string const m_oauth2code;
   std::string m_oauth2token;
 
-  SessionID FetchSessionId(std::string const & subUrl = "/login",
-                           std::string const & cookies = "") const;
+  SessionID FetchSessionId(std::string const & subUrl = "/login", std::string const & cookies = "") const;
   /// Log a user out.
   void LogoutUser(SessionID const & sid) const;
   /// Signs a user id using login and password.
   /// @returns false if login or password are invalid.
-  bool LoginUserPassword(std::string const & login, std::string const & password,
-                         SessionID const & sid) const;
+  bool LoginUserPassword(std::string const & login, std::string const & password, SessionID const & sid) const;
   /// Signs a user in using Facebook token.
   /// @returns false if the social token is invalid.
-  bool LoginSocial(std::string const & callbackPart, std::string const & socialToken,
-                   SessionID const & sid) const;
+  bool LoginSocial(std::string const & callbackPart, std::string const & socialToken, SessionID const & sid) const;
   /// @returns non-empty string with oauth_verifier value.
   std::string SendAuthRequest(std::string const & requestTokenKey, SessionID const & lastSid) const;
   /// @returns valid key and secret or throws otherwise.
diff --git a/libs/editor/osm_auth_tests/osm_auth_tests.cpp b/libs/editor/osm_auth_tests/osm_auth_tests.cpp
index 7fcc2ac88..bfc01883b 100644
--- a/libs/editor/osm_auth_tests/osm_auth_tests.cpp
+++ b/libs/editor/osm_auth_tests/osm_auth_tests.cpp
@@ -1,7 +1,7 @@
 #include "testing/testing.hpp"
 
-#include "platform/platform.hpp"
 #include "editor/osm_auth.hpp"
+#include "platform/platform.hpp"
 
 #include <string>
 
diff --git a/libs/editor/osm_auth_tests/server_api_test.cpp b/libs/editor/osm_auth_tests/server_api_test.cpp
index 500a218cc..975d25938 100644
--- a/libs/editor/osm_auth_tests/server_api_test.cpp
+++ b/libs/editor/osm_auth_tests/server_api_test.cpp
@@ -8,15 +8,15 @@
 #include "base/string_utils.hpp"
 
 #include <cstdint>
-#include <string>
 #include <random>
+#include <string>
 
 #include <pugixml.hpp>
 
 namespace osm_auth
 {
-using osm::ServerApi06;
 using osm::OsmOAuth;
+using osm::ServerApi06;
 using namespace pugi;
 
 extern char const * kValidOsmUser;
@@ -53,11 +53,10 @@ ServerApi06 CreateAPI()
 ms::LatLon RandomCoordinate()
 {
   std::random_device rd;
-  return ms::LatLon(std::uniform_real_distribution<>{-89., 89.}(rd),
-                    std::uniform_real_distribution<>{-179., 179.}(rd));
+  return ms::LatLon(std::uniform_real_distribution<>{-89., 89.}(rd), std::uniform_real_distribution<>{-179., 179.}(rd));
 }
 
-} // namespace
+}  // namespace
 
 void DeleteOSMNodeIfExists(ServerApi06 const & api, uint64_t changeSetId, ms::LatLon const & ll)
 {
@@ -84,8 +83,8 @@ UNIT_TEST(OSM_ServerAPI_ChangesetAndNode)
   XMLFeature node(XMLFeature::Type::Node);
 
   ServerApi06 const api = CreateAPI();
-  uint64_t changeSetId = api.CreateChangeSet({{"created_by", "CoMaps Unit Test"},
-                                              {"comment", "For test purposes only."}});
+  uint64_t changeSetId =
+      api.CreateChangeSet({{"created_by", "CoMaps Unit Test"}, {"comment", "For test purposes only."}});
   auto const changesetCloser = [&]() { api.CloseChangeSet(changeSetId); };
 
   {
@@ -112,8 +111,8 @@ UNIT_TEST(OSM_ServerAPI_ChangesetAndNode)
     TEST_EQUAL(node.GetAttribute("version"), "2", ());
 
     // All tags must be specified, because there is no merging of old and new tags.
-    api.UpdateChangeSet(changeSetId, {{"created_by", "CoMaps Unit Test"},
-                                      {"comment", "For test purposes only (updated)."}});
+    api.UpdateChangeSet(changeSetId,
+                        {{"created_by", "CoMaps Unit Test"}, {"comment", "For test purposes only (updated)."}});
 
     // To retrieve created node, changeset should be closed first.
     // It is done here via Scope Guard.
@@ -126,8 +125,7 @@ UNIT_TEST(OSM_ServerAPI_ChangesetAndNode)
   TEST_EQUAL(node.GetAttribute("id"), features[0].GetAttribute("id"), ());
 
   // Cleanup - delete unit test node from the server.
-  changeSetId = api.CreateChangeSet({{"created_by", "CoMaps Unit Test"},
-                                    {"comment", "For test purposes only."}});
+  changeSetId = api.CreateChangeSet({{"created_by", "CoMaps Unit Test"}, {"comment", "For test purposes only."}});
   SCOPE_GUARD(guard, changesetCloser);
   // New changeset has new id.
   node.SetAttribute("changeset", strings::to_string(changeSetId));
diff --git a/libs/editor/osm_editor.cpp b/libs/editor/osm_editor.cpp
index 2ca7a0201..38d54e99b 100644
--- a/libs/editor/osm_editor.cpp
+++ b/libs/editor/osm_editor.cpp
@@ -24,9 +24,9 @@
 #include <array>
 #include <sstream>
 
-#include "3party/opening_hours/opening_hours.hpp"
 #include <pugixml.hpp>
 #include <utility>
+#include "3party/opening_hours/opening_hours.hpp"
 
 namespace osm
 {
@@ -54,21 +54,16 @@ constexpr char const * kMatchedFeatureIsEmpty = "Matched feature has no tags";
 
 struct XmlSection
 {
-  constexpr XmlSection(FeatureStatus status, char const * sectionName)
-    : m_status(status), m_sectionName(sectionName)
-  {
-  }
+  constexpr XmlSection(FeatureStatus status, char const * sectionName) : m_status(status), m_sectionName(sectionName) {}
 
   FeatureStatus m_status = FeatureStatus::Untouched;
   char const * m_sectionName;
 };
 
-std::array<XmlSection, 4> constexpr kXmlSections = {
-    {{FeatureStatus::Deleted, kDeleteSection},
-    {FeatureStatus::Modified, kModifySection},
-    {FeatureStatus::Obsolete, kObsoleteSection},
-    {FeatureStatus::Created, kCreateSection}}
-};
+std::array<XmlSection, 4> constexpr kXmlSections = {{{FeatureStatus::Deleted, kDeleteSection},
+                                                     {FeatureStatus::Modified, kModifySection},
+                                                     {FeatureStatus::Obsolete, kObsoleteSection},
+                                                     {FeatureStatus::Created, kCreateSection}}};
 
 struct LogHelper
 {
@@ -76,8 +71,8 @@ struct LogHelper
 
   ~LogHelper()
   {
-    LOG(LINFO, ("For", m_mwmId, ". Was loaded", m_modified, "modified,", m_created, "created,",
-                m_deleted, "deleted and", m_obsolete, "obsolete features."));
+    LOG(LINFO, ("For", m_mwmId, ". Was loaded", m_modified, "modified,", m_created, "created,", m_deleted,
+                "deleted and", m_obsolete, "obsolete features."));
   }
 
   void OnStatus(FeatureStatus status)
@@ -101,14 +96,12 @@ struct LogHelper
 
 bool NeedsUpload(string const & uploadStatus)
 {
-  return uploadStatus != kUploaded && uploadStatus != kDeletedFromOSMServer &&
-         uploadStatus != kMatchedFeatureIsEmpty;
+  return uploadStatus != kUploaded && uploadStatus != kDeletedFromOSMServer && uploadStatus != kMatchedFeatureIsEmpty;
 }
 
-XMLFeature GetMatchingFeatureFromOSM(osm::ChangesetWrapper & cw, const osm::EditableMapObject & o)
+XMLFeature GetMatchingFeatureFromOSM(osm::ChangesetWrapper & cw, osm::EditableMapObject const & o)
 {
-  ASSERT_NOT_EQUAL(o.GetGeomType(), feature::GeomType::Line,
-                   ("Line features are not supported yet."));
+  ASSERT_NOT_EQUAL(o.GetGeomType(), feature::GeomType::Line, ("Line features are not supported yet."));
   if (o.GetGeomType() == feature::GeomType::Point)
     return cw.GetMatchingNodeFeatureFromOSM(o.GetMercator());
 
@@ -133,10 +126,7 @@ bool IsObsolete(editor::XMLFeature const & xml, FeatureID const & fid)
 }
 }  // namespace
 
-Editor::Editor()
-  : m_configLoader(m_config)
-  , m_notes(editor::Notes::MakeNotes())
-  , m_isUploadingNow(false)
+Editor::Editor() : m_configLoader(m_config), m_notes(editor::Notes::MakeNotes()), m_isUploadingNow(false)
 {
   SetDefaultStorage();
 }
@@ -147,7 +137,10 @@ Editor & Editor::Instance()
   return instance;
 }
 
-void Editor::SetDefaultStorage() { m_storage = std::make_unique<editor::LocalStorage>(); }
+void Editor::SetDefaultStorage()
+{
+  m_storage = std::make_unique<editor::LocalStorage>();
+}
 
 void Editor::LoadEdits()
 {
@@ -222,8 +215,7 @@ bool Editor::Save(FeaturesContainer const & features) const
       FeatureTypeInfo const & fti = index.second;
       // TODO: Do we really need to serialize deleted features in full details? Looks like mwm ID
       // and meta fields are enough.
-      XMLFeature xf =
-          editor::ToXML(fti.m_object, true /* type serializing helps during migration */);
+      XMLFeature xf = editor::ToXML(fti.m_object, true /* type serializing helps during migration */);
       xf.SetEditJournal(fti.m_object.GetJournal());
       xf.SetMWMFeatureIndex(index.first);
       if (!fti.m_street.empty())
@@ -375,9 +367,8 @@ Editor::SaveResult Editor::SaveEditedFeature(EditableMapObject const & emo)
       return SaveResult::SavingError;
     }
     fti.m_object = emo;
-    bool const sameAsInMWM =
-        AreObjectsEqualIgnoringStreet(fti.m_object, *originalObjectPtr) &&
-        emo.GetStreet().m_defaultName == GetOriginalFeatureStreet(fti.m_object.GetID());
+    bool const sameAsInMWM = AreObjectsEqualIgnoringStreet(fti.m_object, *originalObjectPtr) &&
+                             emo.GetStreet().m_defaultName == GetOriginalFeatureStreet(fti.m_object.GetID());
 
     if (featureStatus != FeatureStatus::Untouched)
     {
@@ -440,8 +431,8 @@ bool Editor::RollBackChanges(FeatureID const & fid)
   return RemoveFeature(fid);
 }
 
-void Editor::ForEachCreatedFeature(MwmId const & id, FeatureIndexFunctor const & f,
-                                   m2::RectD const & rect, int /*scale*/) const
+void Editor::ForEachCreatedFeature(MwmId const & id, FeatureIndexFunctor const & f, m2::RectD const & rect,
+                                   int /*scale*/) const
 {
   auto const features = m_features.Get();
 
@@ -492,8 +483,7 @@ bool Editor::GetEditedFeatureStreet(FeatureID const & fid, string & outFeatureSt
   return true;
 }
 
-std::vector<uint32_t> Editor::GetFeaturesByStatus(MwmId const & mwmId,
-                                                  FeatureStatus status) const
+std::vector<uint32_t> Editor::GetFeaturesByStatus(MwmId const & mwmId, FeatureStatus status) const
 {
   auto const features = m_features.Get();
 
@@ -503,10 +493,8 @@ std::vector<uint32_t> Editor::GetFeaturesByStatus(MwmId const & mwmId,
     return result;
 
   for (auto const & index : matchedMwm->second)
-  {
     if (index.second.m_status == status)
       result.push_back(index.first);
-  }
   std::sort(result.begin(), result.end());
   return result;
 }
@@ -518,8 +506,7 @@ EditableProperties Editor::GetEditableProperties(FeatureType & feature) const
   auto const & fid = feature.GetID();
   auto const featureStatus = GetFeatureStatusImpl(*features, fid.m_mwmId, fid.m_index);
 
-  ASSERT(featureStatus != FeatureStatus::Obsolete,
-         ("Edit mode should not be available on obsolete features"));
+  ASSERT(featureStatus != FeatureStatus::Obsolete, ("Edit mode should not be available on obsolete features"));
 
   // TODO(mgsergio): Check if feature is in the area where editing is disabled in the config.
   auto editableProperties = GetEditablePropertiesForTypes(feature::TypesHolder(feature));
@@ -552,8 +539,8 @@ EditableProperties Editor::GetEditablePropertiesForTypes(feature::TypesHolder co
   editor::TypeAggregatedDescription desc;
   if (m_config.Get()->GetTypeDescription(types.ToObjectNames(), desc))
   {
-    return { std::move(desc.m_editableFields), desc.IsNameEditable(),
-             desc.IsAddressEditable(), desc.IsCuisineEditable() };
+    return {std::move(desc.m_editableFields), desc.IsNameEditable(), desc.IsAddressEditable(),
+            desc.IsCuisineEditable()};
   }
   return {};
 }
@@ -578,16 +565,13 @@ bool Editor::HaveMapEditsToUpload(MwmId const & mwmId) const
   if (found != features->cend())
   {
     for (auto const & index : found->second)
-    {
       if (NeedsUpload(index.second.m_uploadStatus))
         return true;
-    }
   }
   return false;
 }
 
-void Editor::UploadChanges(string const & oauthToken, ChangesetTags tags,
-                           FinishUploadCallback callback)
+void Editor::UploadChanges(string const & oauthToken, ChangesetTags tags, FinishUploadCallback callback)
 {
   if (m_notes->NotUploadedNotesCount())
     m_notes->Upload(OsmOAuth::ServerAuth(oauthToken));
@@ -625,7 +609,8 @@ void Editor::UploadChanges(string const & oauthToken, ChangesetTags tags,
 
         // Don't use new editor for Legacy Objects
         auto const & journalHistory = fti.m_object.GetJournal().GetJournalHistory();
-        bool useNewEditor = journalHistory.empty() || journalHistory.front().journalEntryType != JournalEntryType::LegacyObject;
+        bool useNewEditor =
+            journalHistory.empty() || journalHistory.front().journalEntryType != JournalEntryType::LegacyObject;
 
         try
         {
@@ -635,204 +620,203 @@ void Editor::UploadChanges(string const & oauthToken, ChangesetTags tags,
 
             switch (fti.m_status)
             {
-              case FeatureStatus::Untouched:
-                CHECK(false, ("It's impossible."));
-                continue;
-              case FeatureStatus::Obsolete:
-                continue;  // Obsolete features will be deleted by OSMers.
-              case FeatureStatus::Created: // fallthrough
-              case FeatureStatus::Modified:
+            case FeatureStatus::Untouched: CHECK(false, ("It's impossible.")); continue;
+            case FeatureStatus::Obsolete: continue;  // Obsolete features will be deleted by OSMers.
+            case FeatureStatus::Created:             // fallthrough
+            case FeatureStatus::Modified:
+            {
+              std::list<JournalEntry> const & journal = fti.m_object.GetJournal().GetJournal();
+
+              switch (fti.m_object.GetEditingLifecycle())
               {
-                std::list<JournalEntry> const & journal = fti.m_object.GetJournal().GetJournal();
+              case EditingLifecycle::CREATED:
+              {
+                // Generate XMLFeature for new object
+                JournalEntry const & createEntry = journal.front();
+                ASSERT(createEntry.journalEntryType == JournalEntryType::ObjectCreated,
+                       ("First item should have type ObjectCreated"));
+                ObjCreateData const & objCreateData = std::get<ObjCreateData>(createEntry.data);
+                XMLFeature feature =
+                    editor::TypeToXML(objCreateData.type, objCreateData.geomType, objCreateData.mercator);
 
-                switch (fti.m_object.GetEditingLifecycle())
+                // Check if place already exists
+                bool mergeSameLocation = false;
+                try
                 {
-                  case EditingLifecycle::CREATED:
+                  XMLFeature osmFeature = changeset.GetMatchingNodeFeatureFromOSM(objCreateData.mercator);
+                  if (objCreateData.mercator == osmFeature.GetMercatorCenter())
                   {
-                    // Generate XMLFeature for new object
-                    JournalEntry const & createEntry = journal.front();
-                    ASSERT(createEntry.journalEntryType == JournalEntryType::ObjectCreated,("First item should have type ObjectCreated"));
-                    ObjCreateData const & objCreateData = std::get<ObjCreateData>(createEntry.data);
-                    XMLFeature feature = editor::TypeToXML(objCreateData.type, objCreateData.geomType, objCreateData.mercator);
-
-                    // Check if place already exists
-                    bool mergeSameLocation = false;
-                    try
-                    {
-                      XMLFeature osmFeature = changeset.GetMatchingNodeFeatureFromOSM(objCreateData.mercator);
-                      if (objCreateData.mercator == osmFeature.GetMercatorCenter()) {
-                        changeset.AddChangesetTag("info:merged_same_location", "yes");
-                        feature = osmFeature;
-                        mergeSameLocation = true;
-                      }
-                      else
-                      {
-                        changeset.AddChangesetTag("info:feature_close_by", "yes");
-                      }
-                    }
-                    catch (ChangesetWrapper::OsmObjectWasDeletedException const &) {}
-                    catch (ChangesetWrapper::EmptyFeatureException const &) {}
-
-                    // Add tags to XMLFeature
-                    UpdateXMLFeatureTags(feature, journal);
-
-                    // Upload XMLFeature to OSM
-                    LOG(LDEBUG, ("CREATE Feature (newEditor)", feature));
-                    changeset.AddChangesetTag("info:new_editor", "yes");
-                    if (!mergeSameLocation)
-                      changeset.Create(feature);
-                    else
-                      changeset.Modify(feature);
-                    break;
+                    changeset.AddChangesetTag("info:merged_same_location", "yes");
+                    feature = osmFeature;
+                    mergeSameLocation = true;
                   }
-
-                  case EditingLifecycle::MODIFIED:
+                  else
                   {
-                    // Load existing OSM object (Throws, see catch below)
-                    XMLFeature feature = GetMatchingFeatureFromOSM(changeset, fti.m_object);
-
-                    // Update tags of XMLFeature
-                    UpdateXMLFeatureTags(feature, journal);
-
-                    // Upload XMLFeature to OSM
-                    LOG(LDEBUG, ("MODIFIED Feature (newEditor)", feature));
-                    changeset.AddChangesetTag("info:new_editor", "yes");
-                    changeset.Modify(feature);
-                    break;
-                  }
-
-                  case EditingLifecycle::IN_SYNC:
-                  {
-                    CHECK(false, ("Object already IN_SYNC should not be here"));
-                    continue;
+                    changeset.AddChangesetTag("info:feature_close_by", "yes");
                   }
                 }
+                catch (ChangesetWrapper::OsmObjectWasDeletedException const &)
+                {}
+                catch (ChangesetWrapper::EmptyFeatureException const &)
+                {}
+
+                // Add tags to XMLFeature
+                UpdateXMLFeatureTags(feature, journal);
+
+                // Upload XMLFeature to OSM
+                LOG(LDEBUG, ("CREATE Feature (newEditor)", feature));
+                changeset.AddChangesetTag("info:new_editor", "yes");
+                if (!mergeSameLocation)
+                  changeset.Create(feature);
+                else
+                  changeset.Modify(feature);
                 break;
               }
-              case FeatureStatus::Deleted:
-                auto const originalObjectPtr = GetOriginalMapObject(fti.m_object.GetID());
-                if (!originalObjectPtr)
-                {
-                  LOG(LERROR, ("A feature with id", fti.m_object.GetID(), "cannot be loaded."));
-                  GetPlatform().RunTask(Platform::Thread::Gui,[this, fid = fti.m_object.GetID()]() {
-                    RemoveFeatureIfExists(fid);
-                  });
-                  continue;
-                }
-                changeset.Delete(GetMatchingFeatureFromOSM(changeset, *originalObjectPtr));
+
+              case EditingLifecycle::MODIFIED:
+              {
+                // Load existing OSM object (Throws, see catch below)
+                XMLFeature feature = GetMatchingFeatureFromOSM(changeset, fti.m_object);
+
+                // Update tags of XMLFeature
+                UpdateXMLFeatureTags(feature, journal);
+
+                // Upload XMLFeature to OSM
+                LOG(LDEBUG, ("MODIFIED Feature (newEditor)", feature));
+                changeset.AddChangesetTag("info:new_editor", "yes");
+                changeset.Modify(feature);
                 break;
+              }
+
+              case EditingLifecycle::IN_SYNC:
+              {
+                CHECK(false, ("Object already IN_SYNC should not be here"));
+                continue;
+              }
+              }
+              break;
+            }
+            case FeatureStatus::Deleted:
+              auto const originalObjectPtr = GetOriginalMapObject(fti.m_object.GetID());
+              if (!originalObjectPtr)
+              {
+                LOG(LERROR, ("A feature with id", fti.m_object.GetID(), "cannot be loaded."));
+                GetPlatform().RunTask(Platform::Thread::Gui,
+                                      [this, fid = fti.m_object.GetID()]() { RemoveFeatureIfExists(fid); });
+                continue;
+              }
+              changeset.Delete(GetMatchingFeatureFromOSM(changeset, *originalObjectPtr));
+              break;
             }
           }
-          else // Use old editor
+          else  // Use old editor
           {
             // Todo: Remove old editor after transition period
             switch (fti.m_status)
             {
-              case FeatureStatus::Untouched: CHECK(false, ("It's impossible.")); continue;
-              case FeatureStatus::Obsolete: continue;  // Obsolete features will be deleted by OSMers.
-              case FeatureStatus::Created:
+            case FeatureStatus::Untouched: CHECK(false, ("It's impossible.")); continue;
+            case FeatureStatus::Obsolete: continue;  // Obsolete features will be deleted by OSMers.
+            case FeatureStatus::Created:
+            {
+              XMLFeature feature = editor::ToXML(fti.m_object, true);
+              if (!fti.m_street.empty())
+                feature.SetTagValue(kAddrStreetTag, fti.m_street);
+
+              ASSERT_EQUAL(feature.GetType(), XMLFeature::Type::Node,
+                           ("Linear and area features creation is not supported yet."));
+              try
               {
-                XMLFeature feature = editor::ToXML(fti.m_object, true);
-                if (!fti.m_street.empty())
-                  feature.SetTagValue(kAddrStreetTag, fti.m_street);
+                auto const center = fti.m_object.GetMercator();
+                // Throws, see catch below.
+                XMLFeature osmFeature = changeset.GetMatchingNodeFeatureFromOSM(center);
 
-                ASSERT_EQUAL(feature.GetType(), XMLFeature::Type::Node,
-                             ("Linear and area features creation is not supported yet."));
-                try
-                {
-                  auto const center = fti.m_object.GetMercator();
-                  // Throws, see catch below.
-                  XMLFeature osmFeature = changeset.GetMatchingNodeFeatureFromOSM(center);
-
-                  // If we are here, it means that object already exists at the given point.
-                  // To avoid nodes duplication, merge and apply changes to it instead of creating a new one.
-                  XMLFeature const osmFeatureCopy = osmFeature;
-                  osmFeature.ApplyPatch(feature);
-                  // Check to avoid uploading duplicates into OSM.
-                  if (osmFeature == osmFeatureCopy)
-                  {
-                    LOG(LWARNING,("Local changes are equal to OSM, feature has not been uploaded.", osmFeatureCopy));
-                    // Don't delete this local change right now for user to see it in profile.
-                    // It will be automatically deleted by migration code on the next maps update.
-                  }
-                  else
-                  {
-                    LOG(LDEBUG, ("Create case: uploading patched feature", osmFeature));
-                    changeset.AddChangesetTag("info:old_editor", "yes");
-                    changeset.AddChangesetTag("info:features_merged", "yes");
-                    changeset.Modify(osmFeature);
-                  }
-                }
-                catch (ChangesetWrapper::OsmObjectWasDeletedException const &)
-                {
-                  // Object was never created by anyone else - it's safe to create it.
-                  changeset.AddChangesetTag("info:old_editor", "yes");
-                  changeset.Create(feature);
-                }
-                catch (ChangesetWrapper::EmptyFeatureException const &)
-                {
-                  // There is another node nearby, but it should be safe to create a new one.
-                  changeset.AddChangesetTag("info:old_editor", "yes");
-                  changeset.Create(feature);
-                }
-                catch (...)
-                {
-                  // Pass network or other errors to outside exception handler.
-                  throw;
-                }
-              }
-                break;
-
-              case FeatureStatus::Modified:
-              {
-                // Do not serialize feature's type to avoid breaking OSM data.
-                // TODO: Implement correct types matching when we support modifying existing feature types.
-                XMLFeature feature = editor::ToXML(fti.m_object, false);
-                if (!fti.m_street.empty())
-                  feature.SetTagValue(kAddrStreetTag, fti.m_street);
-
-                auto const originalObjectPtr = GetOriginalMapObject(fti.m_object.GetID());
-                if (!originalObjectPtr)
-                {
-                  LOG(LERROR, ("A feature with id", fti.m_object.GetID(), "cannot be loaded."));
-                  GetPlatform().RunTask(Platform::Thread::Gui,[this, fid = fti.m_object.GetID()]() {
-                                          RemoveFeatureIfExists(fid);
-                                        });
-                  continue;
-                }
-
-                XMLFeature osmFeature = GetMatchingFeatureFromOSM(changeset, *originalObjectPtr);
+                // If we are here, it means that object already exists at the given point.
+                // To avoid nodes duplication, merge and apply changes to it instead of creating a new one.
                 XMLFeature const osmFeatureCopy = osmFeature;
                 osmFeature.ApplyPatch(feature);
                 // Check to avoid uploading duplicates into OSM.
                 if (osmFeature == osmFeatureCopy)
                 {
-                  LOG(LWARNING,("Local changes are equal to OSM, feature has not been uploaded.", osmFeatureCopy));
+                  LOG(LWARNING, ("Local changes are equal to OSM, feature has not been uploaded.", osmFeatureCopy));
                   // Don't delete this local change right now for user to see it in profile.
                   // It will be automatically deleted by migration code on the next maps update.
                 }
                 else
                 {
-                  LOG(LDEBUG, ("Uploading patched feature", osmFeature));
+                  LOG(LDEBUG, ("Create case: uploading patched feature", osmFeature));
                   changeset.AddChangesetTag("info:old_editor", "yes");
+                  changeset.AddChangesetTag("info:features_merged", "yes");
                   changeset.Modify(osmFeature);
                 }
               }
-                break;
-
-              case FeatureStatus::Deleted:
-                auto const originalObjectPtr = GetOriginalMapObject(fti.m_object.GetID());
-                if (!originalObjectPtr)
-                {
-                  LOG(LERROR, ("A feature with id", fti.m_object.GetID(), "cannot be loaded."));
-                  GetPlatform().RunTask(Platform::Thread::Gui,[this, fid = fti.m_object.GetID()]() {
-                                          RemoveFeatureIfExists(fid);
-                                        });
-                  continue;
-                }
+              catch (ChangesetWrapper::OsmObjectWasDeletedException const &)
+              {
+                // Object was never created by anyone else - it's safe to create it.
                 changeset.AddChangesetTag("info:old_editor", "yes");
-                changeset.Delete(GetMatchingFeatureFromOSM(changeset, *originalObjectPtr));
-                break;
+                changeset.Create(feature);
+              }
+              catch (ChangesetWrapper::EmptyFeatureException const &)
+              {
+                // There is another node nearby, but it should be safe to create a new one.
+                changeset.AddChangesetTag("info:old_editor", "yes");
+                changeset.Create(feature);
+              }
+              catch (...)
+              {
+                // Pass network or other errors to outside exception handler.
+                throw;
+              }
+            }
+            break;
+
+            case FeatureStatus::Modified:
+            {
+              // Do not serialize feature's type to avoid breaking OSM data.
+              // TODO: Implement correct types matching when we support modifying existing feature types.
+              XMLFeature feature = editor::ToXML(fti.m_object, false);
+              if (!fti.m_street.empty())
+                feature.SetTagValue(kAddrStreetTag, fti.m_street);
+
+              auto const originalObjectPtr = GetOriginalMapObject(fti.m_object.GetID());
+              if (!originalObjectPtr)
+              {
+                LOG(LERROR, ("A feature with id", fti.m_object.GetID(), "cannot be loaded."));
+                GetPlatform().RunTask(Platform::Thread::Gui,
+                                      [this, fid = fti.m_object.GetID()]() { RemoveFeatureIfExists(fid); });
+                continue;
+              }
+
+              XMLFeature osmFeature = GetMatchingFeatureFromOSM(changeset, *originalObjectPtr);
+              XMLFeature const osmFeatureCopy = osmFeature;
+              osmFeature.ApplyPatch(feature);
+              // Check to avoid uploading duplicates into OSM.
+              if (osmFeature == osmFeatureCopy)
+              {
+                LOG(LWARNING, ("Local changes are equal to OSM, feature has not been uploaded.", osmFeatureCopy));
+                // Don't delete this local change right now for user to see it in profile.
+                // It will be automatically deleted by migration code on the next maps update.
+              }
+              else
+              {
+                LOG(LDEBUG, ("Uploading patched feature", osmFeature));
+                changeset.AddChangesetTag("info:old_editor", "yes");
+                changeset.Modify(osmFeature);
+              }
+            }
+            break;
+
+            case FeatureStatus::Deleted:
+              auto const originalObjectPtr = GetOriginalMapObject(fti.m_object.GetID());
+              if (!originalObjectPtr)
+              {
+                LOG(LERROR, ("A feature with id", fti.m_object.GetID(), "cannot be loaded."));
+                GetPlatform().RunTask(Platform::Thread::Gui,
+                                      [this, fid = fti.m_object.GetID()]() { RemoveFeatureIfExists(fid); });
+                continue;
+              }
+              changeset.AddChangesetTag("info:old_editor", "yes");
+              changeset.Delete(GetMatchingFeatureFromOSM(changeset, *originalObjectPtr));
+              break;
             }
           }
           uploadInfo.m_uploadStatus = kUploaded;
@@ -866,11 +850,11 @@ void Editor::UploadChanges(string const & oauthToken, ChangesetTags tags,
         // TODO(AlexZ): Use timestamp from the server.
         uploadInfo.m_uploadAttemptTimestamp = time(nullptr);
 
-        GetPlatform().RunTask(Platform::Thread::Gui,
-                              [this, id = fti.m_object.GetID(), uploadInfo]() {
-                                // Call Save every time we modify each feature's information.
-                                SaveUploadedInformation(id, uploadInfo);
-                              });
+        GetPlatform().RunTask(Platform::Thread::Gui, [this, id = fti.m_object.GetID(), uploadInfo]()
+        {
+          // Call Save every time we modify each feature's information.
+          SaveUploadedInformation(id, uploadInfo);
+        });
       }
     }
 
@@ -891,11 +875,9 @@ void Editor::UploadChanges(string const & oauthToken, ChangesetTags tags,
   if (!m_isUploadingNow)
   {
     m_isUploadingNow = true;
-    GetPlatform().RunTask(Platform::Thread::Network, [upload = std::move(upload), oauthToken,
-                                                      tags = std::move(tags), callback = std::move(callback)]()
-    {
-      upload(std::move(oauthToken), std::move(tags), std::move(callback));
-    });
+    GetPlatform().RunTask(Platform::Thread::Network, [upload = std::move(upload), oauthToken, tags = std::move(tags),
+                                                      callback = std::move(callback)]()
+    { upload(std::move(oauthToken), std::move(tags), std::move(callback)); });
   }
 }
 
@@ -934,7 +916,8 @@ bool Editor::FillFeatureInfo(FeatureStatus status, XMLFeature const & xml, Featu
 
   // Do not load Legacy Objects form Journal
   auto const & journalHistory = journal.GetJournalHistory();
-  bool loadFromJournal = journalHistory.empty() || journalHistory.front().journalEntryType != JournalEntryType::LegacyObject;
+  bool loadFromJournal =
+      journalHistory.empty() || journalHistory.front().journalEntryType != JournalEntryType::LegacyObject;
 
   LOG(LDEBUG, ("loadFromJournal: ", loadFromJournal));
 
@@ -976,8 +959,7 @@ bool Editor::FillFeatureInfo(FeatureStatus status, XMLFeature const & xml, Featu
   return true;
 }
 
-Editor::FeatureTypeInfo const * Editor::GetFeatureTypeInfo(FeaturesContainer const & features,
-                                                           MwmId const & mwmId,
+Editor::FeatureTypeInfo const * Editor::GetFeatureTypeInfo(FeaturesContainer const & features, MwmId const & mwmId,
                                                            uint32_t index)
 {
   auto const matchedMwm = features.find(mwmId);
@@ -1063,13 +1045,11 @@ Editor::Stats Editor::GetStats() const
     for (auto & index : id.second)
     {
       auto const & fti = index.second;
-      stats.m_edits.emplace_back(FeatureID(id.first, index.first),
-                                 fti.m_uploadStatus + " " + fti.m_uploadError);
+      stats.m_edits.emplace_back(FeatureID(id.first, index.first), fti.m_uploadStatus + " " + fti.m_uploadError);
       LOG(LDEBUG, (fti.m_uploadAttemptTimestamp == base::INVALID_TIME_STAMP
                        ? "NOT_UPLOADED_YET"
                        : base::TimestampToString(fti.m_uploadAttemptTimestamp),
-                   fti.m_uploadStatus, fti.m_uploadError, fti.m_object.GetGeomType(),
-                   fti.m_object.GetMercator()));
+                   fti.m_uploadStatus, fti.m_uploadError, fti.m_object.GetGeomType(), fti.m_object.GetMercator()));
       if (fti.m_uploadStatus == kUploaded)
       {
         ++stats.m_uploadedCount;
@@ -1086,8 +1066,7 @@ NewFeatureCategories Editor::GetNewFeatureCategories() const
   return NewFeatureCategories(*(m_config.Get()));
 }
 
-FeatureID Editor::GenerateNewFeatureId(FeaturesContainer const & features,
-                                       MwmId const & id) const
+FeatureID Editor::GenerateNewFeatureId(FeaturesContainer const & features, MwmId const & id) const
 {
   CHECK_THREAD_CHECKER(MainThreadChecker, (""));
 
@@ -1098,10 +1077,8 @@ FeatureID Editor::GenerateNewFeatureId(FeaturesContainer const & features,
   {
     // Scan all already created features and choose next available ID.
     for (auto const & feature : found->second)
-    {
       if (feature.second.m_status == FeatureStatus::Created && featureIndex <= feature.first)
         featureIndex = feature.first + 1;
-    }
   }
   CHECK(feature::FakeFeatureIds::IsEditorCreatedFeature(featureIndex), ());
   return {id, featureIndex};
@@ -1110,8 +1087,7 @@ FeatureID Editor::GenerateNewFeatureId(FeaturesContainer const & features,
 bool Editor::CreatePoint(uint32_t type, m2::PointD const & mercator, MwmId const & id,
                          EditableMapObject & outFeature) const
 {
-  ASSERT(id.IsAlive(),
-         ("Please check that feature is created in valid MWM file before calling this method."));
+  ASSERT(id.IsAlive(), ("Please check that feature is created in valid MWM file before calling this method."));
   if (!id.GetInfo()->m_bordersRect.IsPointInside(mercator))
   {
     LOG(LERROR, ("Attempt to create a feature outside of the MWM's bounding box."));
@@ -1128,9 +1104,8 @@ bool Editor::CreatePoint(uint32_t type, m2::PointD const & mercator, MwmId const
   return true;
 }
 
-void Editor::CreateNote(ms::LatLon const & latLon, FeatureID const & fid,
-                        feature::TypesHolder const & holder, std::string_view defaultName,
-                        NoteProblemType type, std::string_view note)
+void Editor::CreateNote(ms::LatLon const & latLon, FeatureID const & fid, feature::TypesHolder const & holder,
+                        std::string_view defaultName, NoteProblemType type, std::string_view note)
 {
   CHECK_THREAD_CHECKER(MainThreadChecker, (""));
 
@@ -1148,10 +1123,8 @@ void Editor::CreateNote(ms::LatLon const & latLon, FeatureID const & fid,
             "that the POI was visible on the map (see snapshot date below), but was not found "
             "on the ground.\n";
     auto const features = m_features.Get();
-    auto const isCreated =
-        GetFeatureStatusImpl(*features, fid.m_mwmId, fid.m_index) == FeatureStatus::Created;
-    auto const createdAndUploaded =
-        (isCreated && IsFeatureUploadedImpl(*features, fid.m_mwmId, fid.m_index));
+    auto const isCreated = GetFeatureStatusImpl(*features, fid.m_mwmId, fid.m_index) == FeatureStatus::Created;
+    auto const createdAndUploaded = (isCreated && IsFeatureUploadedImpl(*features, fid.m_mwmId, fid.m_index));
     CHECK(!isCreated || createdAndUploaded, ());
 
     if (createdAndUploaded)
@@ -1190,8 +1163,7 @@ void Editor::CreateStandaloneNote(ms::LatLon const & latLon, std::string const &
   m_notes->CreateNote(latLon, noteText + "\n");
 }
 
-void Editor::MarkFeatureWithStatus(FeaturesContainer & editableFeatures, FeatureID const & fid,
-                                   FeatureStatus status)
+void Editor::MarkFeatureWithStatus(FeaturesContainer & editableFeatures, FeatureID const & fid, FeatureStatus status)
 {
   CHECK_THREAD_CHECKER(MainThreadChecker, (""));
 
@@ -1250,27 +1222,24 @@ void Editor::ForEachFeatureAtPoint(FeatureTypeFn && fn, m2::PointD const & point
   m_delegate->ForEachFeatureAtPoint(std::move(fn), point);
 }
 
-FeatureID Editor::GetFeatureIdByXmlFeature(FeaturesContainer const & features,
-                                           XMLFeature const & xml, MwmId const & mwmId,
-                                           FeatureStatus status, bool needMigrate) const
+FeatureID Editor::GetFeatureIdByXmlFeature(FeaturesContainer const & features, XMLFeature const & xml,
+                                           MwmId const & mwmId, FeatureStatus status, bool needMigrate) const
 {
-  ForEachFeaturesNearByFn forEach = [this](FeatureTypeFn && fn, m2::PointD const & point) {
-    return ForEachFeatureAtPoint(std::move(fn), point);
-  };
+  ForEachFeaturesNearByFn forEach = [this](FeatureTypeFn && fn, m2::PointD const & point)
+  { return ForEachFeatureAtPoint(std::move(fn), point); };
 
   // TODO(mgsergio): Deleted features are not properly handled yet.
   if (needMigrate)
   {
-    return editor::MigrateFeatureIndex(forEach, xml, status, [this, &mwmId, &features] {
-      return GenerateNewFeatureId(features, mwmId);
-    });
+    return editor::MigrateFeatureIndex(forEach, xml, status,
+                                       [this, &mwmId, &features] { return GenerateNewFeatureId(features, mwmId); });
   }
 
   return {mwmId, xml.GetMWMFeatureIndex()};
 }
 
-void Editor::LoadMwmEdits(FeaturesContainer & loadedFeatures, xml_node const & mwm,
-                          MwmId const & mwmId, bool needMigrate)
+void Editor::LoadMwmEdits(FeaturesContainer & loadedFeatures, xml_node const & mwm, MwmId const & mwmId,
+                          bool needMigrate)
 {
   LogHelper logHelper(mwmId);
 
@@ -1282,8 +1251,7 @@ void Editor::LoadMwmEdits(FeaturesContainer & loadedFeatures, xml_node const & m
       {
         XMLFeature const xml(nodeOrWay.node());
 
-        auto const fid =
-            GetFeatureIdByXmlFeature(loadedFeatures, xml, mwmId, section.m_status, needMigrate);
+        auto const fid = GetFeatureIdByXmlFeature(loadedFeatures, xml, mwmId, section.m_status, needMigrate);
 
         // Remove obsolete changes during migration.
         if (needMigrate && IsObsolete(xml, fid))
@@ -1327,16 +1295,13 @@ bool Editor::HaveMapEditsToUpload(FeaturesContainer const & features)
       continue;
 
     for (auto const & index : id.second)
-    {
       if (NeedsUpload(index.second.m_uploadStatus))
         return true;
-    }
   }
   return false;
 }
 
-FeatureStatus Editor::GetFeatureStatusImpl(FeaturesContainer const & features,
-                                           MwmId const & mwmId, uint32_t index)
+FeatureStatus Editor::GetFeatureStatusImpl(FeaturesContainer const & features, MwmId const & mwmId, uint32_t index)
 {
   // Most popular case optimization.
   if (features.empty())
@@ -1357,21 +1322,18 @@ bool Editor::IsFeatureUploadedImpl(FeaturesContainer const & features, MwmId con
 
 void Editor::UpdateXMLFeatureTags(editor::XMLFeature & feature, std::list<JournalEntry> const & journal)
 {
-  for (JournalEntry const & entry: journal)
+  for (JournalEntry const & entry : journal)
   {
     switch (entry.journalEntryType)
     {
-      case JournalEntryType::TagModification:
-      {
-        TagModData const & tagModData = std::get<TagModData>(entry.data);
-        feature.UpdateOSMTag(tagModData.key, tagModData.new_value);
-        break;
-      }
-      case JournalEntryType::ObjectCreated:
-        break;
-      case JournalEntryType::LegacyObject:
-        ASSERT_FAIL(("Legacy Objects can not be edited with the new editor"));
-        break;
+    case JournalEntryType::TagModification:
+    {
+      TagModData const & tagModData = std::get<TagModData>(entry.data);
+      feature.UpdateOSMTag(tagModData.key, tagModData.new_value);
+      break;
+    }
+    case JournalEntryType::ObjectCreated: break;
+    case JournalEntryType::LegacyObject: ASSERT_FAIL(("Legacy Objects can not be edited with the new editor")); break;
     }
   }
 }
@@ -1380,11 +1342,11 @@ string DebugPrint(Editor::SaveResult saveResult)
 {
   switch (saveResult)
   {
-    case Editor::SaveResult::NothingWasChanged: return "NothingWasChanged";
-    case Editor::SaveResult::SavedSuccessfully: return "SavedSuccessfully";
-    case Editor::SaveResult::NoFreeSpaceError: return "NoFreeSpaceError";
-    case Editor::SaveResult::NoUnderlyingMapError: return "NoUnderlyingMapError";
-    case Editor::SaveResult::SavingError: return "SavingError";
+  case Editor::SaveResult::NothingWasChanged: return "NothingWasChanged";
+  case Editor::SaveResult::SavedSuccessfully: return "SavedSuccessfully";
+  case Editor::SaveResult::NoFreeSpaceError: return "NoFreeSpaceError";
+  case Editor::SaveResult::NoUnderlyingMapError: return "NoUnderlyingMapError";
+  case Editor::SaveResult::SavingError: return "SavingError";
   }
   UNREACHABLE();
 }
diff --git a/libs/editor/osm_editor.hpp b/libs/editor/osm_editor.hpp
index a44511964..b0306d277 100644
--- a/libs/editor/osm_editor.hpp
+++ b/libs/editor/osm_editor.hpp
@@ -7,8 +7,8 @@
 #include "editor/new_feature_categories.hpp"
 #include "editor/xml_feature.hpp"
 
-#include "indexer/editable_map_object.hpp"
 #include "indexer/edit_journal.hpp"
+#include "indexer/editable_map_object.hpp"
 #include "indexer/feature.hpp"
 #include "indexer/feature_source.hpp"
 #include "indexer/mwm_set.hpp"
@@ -232,8 +232,8 @@ private:
   void ForEachFeatureAtPoint(FeatureTypeFn && fn, m2::PointD const & point) const;
   FeatureID GetFeatureIdByXmlFeature(FeaturesContainer const & features, editor::XMLFeature const & xml,
                                      MwmId const & mwmId, FeatureStatus status, bool needMigrate) const;
-  void LoadMwmEdits(FeaturesContainer & loadedFeatures, pugi::xml_node const & mwm,
-                    MwmId const & mwmId, bool needMigrate);
+  void LoadMwmEdits(FeaturesContainer & loadedFeatures, pugi::xml_node const & mwm, MwmId const & mwmId,
+                    bool needMigrate);
 
   static bool HaveMapEditsToUpload(FeaturesContainer const & features);
 
diff --git a/libs/editor/server_api.cpp b/libs/editor/server_api.cpp
index d34970a36..e2268e1b4 100644
--- a/libs/editor/server_api.cpp
+++ b/libs/editor/server_api.cpp
@@ -20,11 +20,11 @@ std::string KeyValueTagsToXML(osm::ServerApi06::KeyValueTags const & kvTags)
 {
   std::ostringstream stream;
   stream << "<osm>\n"
-  "<changeset>\n";
+            "<changeset>\n";
   for (auto const & tag : kvTags)
     stream << "  <tag k=\"" << tag.first << "\" v=\"" << tag.second << "\"/>\n";
   stream << "</changeset>\n"
-  "</osm>\n";
+            "</osm>\n";
   return stream.str();
 }
 }  // namespace
@@ -32,10 +32,7 @@ std::string KeyValueTagsToXML(osm::ServerApi06::KeyValueTags const & kvTags)
 namespace osm
 {
 
-ServerApi06::ServerApi06(OsmOAuth const & auth)
-  : m_auth(auth)
-{
-}
+ServerApi06::ServerApi06(OsmOAuth const & auth) : m_auth(auth) {}
 
 uint64_t ServerApi06::CreateChangeSet(KeyValueTags const & kvTags) const
 {
@@ -54,8 +51,8 @@ uint64_t ServerApi06::CreateChangeSet(KeyValueTags const & kvTags) const
 
 uint64_t ServerApi06::CreateElement(editor::XMLFeature const & element) const
 {
-  OsmOAuth::Response const response = m_auth.Request("/" + element.GetTypeString() + "/create",
-                                                     "PUT", element.ToOSMString());
+  OsmOAuth::Response const response =
+      m_auth.Request("/" + element.GetTypeString() + "/create", "PUT", element.ToOSMString());
   if (response.first != OsmOAuth::HTTP::OK)
     MYTHROW(CreateElementHasFailed, ("CreateElement request has failed:", response, "for", element));
   uint64_t id;
@@ -76,8 +73,8 @@ uint64_t ServerApi06::ModifyElement(editor::XMLFeature const & element) const
   std::string const id = element.GetAttribute("id");
   CHECK(!id.empty(), ("id attribute is missing for", element));
 
-  OsmOAuth::Response const response = m_auth.Request("/" + element.GetTypeString() + "/" + id,
-                                                     "PUT", element.ToOSMString());
+  OsmOAuth::Response const response =
+      m_auth.Request("/" + element.GetTypeString() + "/" + id, "PUT", element.ToOSMString());
   if (response.first != OsmOAuth::HTTP::OK)
     MYTHROW(ModifyElementHasFailed, ("ModifyElement request has failed:", response, "for", element));
   uint64_t version;
@@ -98,15 +95,16 @@ void ServerApi06::DeleteElement(editor::XMLFeature const & element) const
   if (id.empty())
     MYTHROW(DeletedElementHasNoIdAttribute, ("Please set id attribute for", element));
 
-  OsmOAuth::Response const response = m_auth.Request("/" + element.GetTypeString() + "/" + id,
-                                                     "DELETE", element.ToOSMString());
+  OsmOAuth::Response const response =
+      m_auth.Request("/" + element.GetTypeString() + "/" + id, "DELETE", element.ToOSMString());
   if (response.first != OsmOAuth::HTTP::OK && response.first != OsmOAuth::HTTP::Gone)
     MYTHROW(ErrorDeletingElement, ("Could not delete an element:", response));
 }
 
 void ServerApi06::UpdateChangeSet(uint64_t changesetId, KeyValueTags const & kvTags) const
 {
-  OsmOAuth::Response const response = m_auth.Request("/changeset/" + strings::to_string(changesetId), "PUT", KeyValueTagsToXML(kvTags));
+  OsmOAuth::Response const response =
+      m_auth.Request("/changeset/" + strings::to_string(changesetId), "PUT", KeyValueTagsToXML(kvTags));
   if (response.first != OsmOAuth::HTTP::OK)
     MYTHROW(UpdateChangeSetHasFailed, ("UpdateChangeSet request has failed:", response));
 }
@@ -151,7 +149,8 @@ bool ServerApi06::TestOSMUser(std::string const & userName)
 
 UserPreferences ServerApi06::GetUserPreferences() const
 {
-  try {
+  try
+  {
     OsmOAuth::Response const response = m_auth.Request("/user/details");
     if (response.first != OsmOAuth::HTTP::OK)
       MYTHROW(CantGetUserPreferences, (response));
@@ -186,9 +185,8 @@ OsmOAuth::Response ServerApi06::GetXmlFeaturesInRect(double minLat, double minLo
 
   // Digits After Comma.
   static constexpr double kDAC = 7;
-  std::string const url = "/map?bbox=" + to_string_dac(minLon, kDAC) + ',' +
-                          to_string_dac(minLat, kDAC) + ',' + to_string_dac(maxLon, kDAC) + ',' +
-                          to_string_dac(maxLat, kDAC);
+  std::string const url = "/map?bbox=" + to_string_dac(minLon, kDAC) + ',' + to_string_dac(minLat, kDAC) + ',' +
+                          to_string_dac(maxLon, kDAC) + ',' + to_string_dac(maxLat, kDAC);
 
   return m_auth.DirectRequest(url);
 }
@@ -197,11 +195,11 @@ OsmOAuth::Response ServerApi06::GetXmlFeaturesAtLatLon(double lat, double lon, d
 {
   double const latDegreeOffset = radiusInMeters * mercator::Bounds::kDegreesInMeter;
   double const minLat = std::max(-90.0, lat - latDegreeOffset);
-  double const maxLat = std::min( 90.0, lat + latDegreeOffset);
+  double const maxLat = std::min(90.0, lat + latDegreeOffset);
   double const cosL = std::max(cos(math::DegToRad(std::max(fabs(minLat), fabs(maxLat)))), 0.00001);
   double const lonDegreeOffset = radiusInMeters * mercator::Bounds::kDegreesInMeter / cosL;
   double const minLon = std::max(-180.0, lon - lonDegreeOffset);
-  double const maxLon = std::min( 180.0, lon + lonDegreeOffset);
+  double const maxLon = std::min(180.0, lon + lonDegreeOffset);
   return GetXmlFeaturesInRect(minLat, minLon, maxLat, maxLon);
 }
 
@@ -210,4 +208,4 @@ OsmOAuth::Response ServerApi06::GetXmlFeaturesAtLatLon(ms::LatLon const & ll, do
   return GetXmlFeaturesAtLatLon(ll.m_lat, ll.m_lon, radiusInMeters);
 }
 
-} // namespace osm
+}  // namespace osm
diff --git a/libs/editor/server_api.hpp b/libs/editor/server_api.hpp
index 485d32e88..a9ab95bd7 100644
--- a/libs/editor/server_api.hpp
+++ b/libs/editor/server_api.hpp
@@ -84,4 +84,4 @@ private:
   OsmOAuth m_auth;
 };
 
-} // namespace osm
+}  // namespace osm
diff --git a/libs/editor/ui2oh.cpp b/libs/editor/ui2oh.cpp
index a40a958c0..48d2caa07 100644
--- a/libs/editor/ui2oh.cpp
+++ b/libs/editor/ui2oh.cpp
@@ -10,7 +10,7 @@
 
 namespace
 {
-using osmoh::operator ""_h;
+using osmoh::operator""_h;
 
 osmoh::Timespan const kTwentyFourHours = {0_h, 24_h};
 
@@ -50,7 +50,8 @@ void SetUpTimeTable(osmoh::TTimespans spans, editor::ui::TimeTable & tt)
   for (auto & span : spans)
     span.ExpandPlus();
 
-  std::sort(std::begin(spans), std::end(spans), [](Timespan const & a, Timespan const & b) {
+  std::sort(std::begin(spans), std::end(spans), [](Timespan const & a, Timespan const & b)
+  {
     auto const start1 = a.GetStart().GetHourMinutes().GetDuration();
     auto const start2 = b.GetStart().GetHourMinutes().GetDuration();
 
@@ -66,7 +67,10 @@ void SetUpTimeTable(osmoh::TTimespans spans, editor::ui::TimeTable & tt)
     tt.AddExcludeTime({spans[i].GetEnd(), spans[i + 1].GetStart()});
 }
 
-int32_t WeekdayNumber(osmoh::Weekday const wd) { return static_cast<int32_t>(wd); }
+int32_t WeekdayNumber(osmoh::Weekday const wd)
+{
+  return static_cast<int32_t>(wd);
+}
 
 constexpr uint32_t kDaysInWeek = 7;
 
@@ -88,15 +92,12 @@ int32_t NextWeekdayNumber(osmoh::Weekday const wd)
 std::vector<osmoh::Weekday> RemoveInversion(editor::ui::OpeningDays const & days)
 {
   std::vector<osmoh::Weekday> result(begin(days), end(days));
-  if ((NextWeekdayNumber(result.back()) != WeekdayNumber(result.front()) &&
-       result.back() != osmoh::Weekday::Sunday) || result.size() < 2)
+  if ((NextWeekdayNumber(result.back()) != WeekdayNumber(result.front()) && result.back() != osmoh::Weekday::Sunday) ||
+      result.size() < 2)
     return result;
 
-  auto inversion = adjacent_find(begin(result), end(result),
-                [](osmoh::Weekday const a, osmoh::Weekday const b)
-                {
-                  return NextWeekdayNumber(a) != WeekdayNumber(b);
-                });
+  auto inversion = adjacent_find(begin(result), end(result), [](osmoh::Weekday const a, osmoh::Weekday const b)
+  { return NextWeekdayNumber(a) != WeekdayNumber(b); });
 
   if (inversion != end(result))
     rotate(begin(result), ++inversion, end(result));
@@ -167,17 +168,10 @@ osmoh::TTimespans MakeTimespans(editor::ui::TimeTable const & tt)
 }
 
 editor::ui::OpeningDays const kWholeWeek = {
-  osmoh::Weekday::Monday,
-  osmoh::Weekday::Tuesday,
-  osmoh::Weekday::Wednesday,
-  osmoh::Weekday::Thursday,
-  osmoh::Weekday::Friday,
-  osmoh::Weekday::Saturday,
-  osmoh::Weekday::Sunday
-};
+    osmoh::Weekday::Monday, osmoh::Weekday::Tuesday,  osmoh::Weekday::Wednesday, osmoh::Weekday::Thursday,
+    osmoh::Weekday::Friday, osmoh::Weekday::Saturday, osmoh::Weekday::Sunday};
 
-editor::ui::OpeningDays GetCommonDays(editor::ui::OpeningDays const & a,
-                                      editor::ui::OpeningDays const & b)
+editor::ui::OpeningDays GetCommonDays(editor::ui::OpeningDays const & a, editor::ui::OpeningDays const & b)
 {
   editor::ui::OpeningDays result;
   std::set_intersection(begin(a), end(a), begin(b), end(b), inserter(result, begin(result)));
@@ -191,8 +185,7 @@ osmoh::HourMinutes::TMinutes::rep GetDuration(osmoh::Time const & time)
 
 bool Includes(osmoh::Timespan const & a, osmoh::Timespan const & b)
 {
-  return GetDuration(a.GetStart()) <= GetDuration(b.GetStart()) &&
-         GetDuration(b.GetEnd()) <= GetDuration(a.GetEnd());
+  return GetDuration(a.GetStart()) <= GetDuration(b.GetStart()) && GetDuration(b.GetEnd()) <= GetDuration(a.GetEnd());
 }
 
 bool ExcludeRulePart(osmoh::RuleSequence const & rulePart, editor::ui::TimeTableSet & tts)
@@ -202,8 +195,7 @@ bool ExcludeRulePart(osmoh::RuleSequence const & rulePart, editor::ui::TimeTable
   {
     auto tt = tts.Get(i);
     auto const ttOpeningDays = tt.GetOpeningDays();
-    auto const commonDays = GetCommonDays(ttOpeningDays,
-                                          MakeOpeningDays(rulePart.GetWeekdays()));
+    auto const commonDays = GetCommonDays(ttOpeningDays, MakeOpeningDays(rulePart.GetWeekdays()));
 
     auto const removeCommonDays = [&commonDays](editor::ui::TimeTableSet::Proxy & tt)
     {
@@ -356,8 +348,7 @@ bool MakeTimeTableSet(osmoh::OpeningHours const & oh, ui::TimeTableSet & tts)
 
     auto const & times = rulePart.GetTimes();
 
-    bool isTwentyFourHours =
-        times.empty() || (times.size() == 1 && times.front() == kTwentyFourHours);
+    bool isTwentyFourHours = times.empty() || (times.size() == 1 && times.front() == kTwentyFourHours);
 
     if (isTwentyFourHours)
     {
@@ -386,4 +377,4 @@ bool MakeTimeTableSet(osmoh::OpeningHours const & oh, ui::TimeTableSet & tts)
 
   return true;
 }
-} // namespace editor
+}  // namespace editor
diff --git a/libs/editor/ui2oh.hpp b/libs/editor/ui2oh.hpp
index 65b774fd7..d2d0338f1 100644
--- a/libs/editor/ui2oh.hpp
+++ b/libs/editor/ui2oh.hpp
@@ -5,10 +5,10 @@
 namespace osmoh
 {
 class OpeningHours;
-} // namespace osmoh
+}  // namespace osmoh
 
 namespace editor
 {
 osmoh::OpeningHours MakeOpeningHours(ui::TimeTableSet const & tts);
 bool MakeTimeTableSet(osmoh::OpeningHours const & oh, ui::TimeTableSet & tts);
-} // namespace editor
+}  // namespace editor
diff --git a/libs/editor/xml_feature.cpp b/libs/editor/xml_feature.cpp
index c7ca2606d..9b3022516 100644
--- a/libs/editor/xml_feature.cpp
+++ b/libs/editor/xml_feature.cpp
@@ -56,15 +56,9 @@ ms::LatLon GetLatLonFromNode(pugi::xml_node const & node)
 {
   ms::LatLon ll;
   if (!strings::to_double(node.attribute("lat").value(), ll.m_lat))
-  {
-    MYTHROW(editor::NoLatLon,
-            ("Can't parse lat attribute:", string(node.attribute("lat").value())));
-  }
+    MYTHROW(editor::NoLatLon, ("Can't parse lat attribute:", string(node.attribute("lat").value())));
   if (!strings::to_double(node.attribute("lon").value(), ll.m_lon))
-  {
-    MYTHROW(editor::NoLatLon,
-            ("Can't parse lon attribute:", string(node.attribute("lon").value())));
-  }
+    MYTHROW(editor::NoLatLon, ("Can't parse lon attribute:", string(node.attribute("lon").value())));
   return ll;
 }
 
@@ -150,18 +144,25 @@ std::vector<XMLFeature> XMLFeature::FromOSM(string const & osmXml)
 
   std::vector<XMLFeature> features;
   for (auto const & n : doc.child("osm").children())
-  {
     if (StringToType(n.name()) != Type::Unknown)
       features.emplace_back(n);
-  }
   return features;
 }
 
-XMLFeature::Type XMLFeature::GetType() const { return StringToType(GetRootNode().name()); }
+XMLFeature::Type XMLFeature::GetType() const
+{
+  return StringToType(GetRootNode().name());
+}
 
-string XMLFeature::GetTypeString() const { return GetRootNode().name(); }
+string XMLFeature::GetTypeString() const
+{
+  return GetRootNode().name();
+}
 
-void XMLFeature::Save(std::ostream & ost) const { m_document.save(ost, "  "); }
+void XMLFeature::Save(std::ostream & ost) const
+{
+  m_document.save(ost, "  ");
+}
 
 string XMLFeature::ToOSMString() const
 {
@@ -178,12 +179,10 @@ string XMLFeature::ToOSMString() const
 void XMLFeature::ApplyPatch(XMLFeature const & featureWithChanges)
 {
   // TODO(mgsergio): Get these alt tags from the config.
-  base::StringIL const alternativeTags[] = {
-    {"phone", "contact:phone", "contact:mobile", "mobile"},
-    {"website", "contact:website", "url"},
-    {"fax", "contact:fax"},
-    {"email", "contact:email"}
-  };
+  base::StringIL const alternativeTags[] = {{"phone", "contact:phone", "contact:mobile", "mobile"},
+                                            {"website", "contact:website", "url"},
+                                            {"fax", "contact:fax"},
+                                            {"email", "contact:email"}};
 
   featureWithChanges.ForEachTag([&alternativeTags, this](string_view k, string_view v)
   {
@@ -260,7 +259,7 @@ string XMLFeature::GetName(std::string_view lang) const
   if (lang == kDefaultLang || lang.empty())
     return GetTagValue(kDefaultName);
   return GetTagValue(std::string{kDefaultName}.append(kColon).append(lang));
-  //return GetTagValue(suffix.insert(0, kDefaultName));
+  // return GetTagValue(suffix.insert(0, kDefaultName));
 }
 
 string XMLFeature::GetName(uint8_t const langCode) const
@@ -268,30 +267,23 @@ string XMLFeature::GetName(uint8_t const langCode) const
   return GetName(StringUtf8Multilang::GetLangByCode(langCode));
 }
 
-void XMLFeature::SetName(string_view name) { SetName(kDefaultLang, name); }
+void XMLFeature::SetName(string_view name)
+{
+  SetName(kDefaultLang, name);
+}
 
 void XMLFeature::SetName(string_view lang, string_view name)
 {
   if (lang == kIntlLang)
-  {
     SetTagValue(kIntlName, name);
-  }
   else if (lang == kAltLang)
-  {
     SetTagValue(kAltName, name);
-  }
   else if (lang == kOldLang)
-  {
     SetTagValue(kOldName, name);
-  }
   else if (lang == kDefaultLang || lang.empty())
-  {
     SetTagValue(kDefaultName, name);
-  }
   else
-  {
     SetTagValue(std::string{kDefaultName}.append(kColon).append(lang), name);
-  }
 }
 
 void XMLFeature::SetName(uint8_t const langCode, string_view name)
@@ -299,9 +291,15 @@ void XMLFeature::SetName(uint8_t const langCode, string_view name)
   SetName(StringUtf8Multilang::GetLangByCode(langCode), name);
 }
 
-string XMLFeature::GetHouse() const { return GetTagValue(kHouseNumber); }
+string XMLFeature::GetHouse() const
+{
+  return GetTagValue(kHouseNumber);
+}
 
-void XMLFeature::SetHouse(string const & house) { SetTagValue(kHouseNumber, house); }
+void XMLFeature::SetHouse(string const & house)
+{
+  SetTagValue(kHouseNumber, house);
+}
 
 /// https://github.com/organicmaps/organicmaps/issues/1118
 /// @todo Make full diet:xxx support.
@@ -403,11 +401,20 @@ string XMLFeature::GetUploadStatus() const
   return GetRootNode().attribute(kUploadStatus).value();
 }
 
-void XMLFeature::SetUploadStatus(string const & status) { SetAttribute(kUploadStatus, status); }
+void XMLFeature::SetUploadStatus(string const & status)
+{
+  SetAttribute(kUploadStatus, status);
+}
 
-string XMLFeature::GetUploadError() const { return GetRootNode().attribute(kUploadError).value(); }
+string XMLFeature::GetUploadError() const
+{
+  return GetRootNode().attribute(kUploadError).value();
+}
 
-void XMLFeature::SetUploadError(string const & error) { SetAttribute(kUploadError, error); }
+void XMLFeature::SetUploadError(string const & error)
+{
+  SetAttribute(kUploadError, error);
+}
 
 osm::EditJournal XMLFeature::GetEditJournal() const
 {
@@ -416,9 +423,9 @@ osm::EditJournal XMLFeature::GetEditJournal() const
   Save(ost);
   LOG(LDEBUG, ("Read in XMLFeature:\n", ost.str()));
 
-  auto readEditJournalList = [] (pugi::xml_node & xmlNode, osm::EditJournal & journal, bool isHistory)
+  auto readEditJournalList = [](pugi::xml_node & xmlNode, osm::EditJournal & journal, bool isHistory)
   {
-    auto getAttribute = [] (pugi::xml_node & xmlNode, std::string_view attribute)
+    auto getAttribute = [](pugi::xml_node & xmlNode, std::string_view attribute)
     {
       pugi::xml_attribute xmlValue = xmlNode.attribute(attribute.data());
       if (xmlValue.empty())
@@ -451,50 +458,50 @@ osm::EditJournal XMLFeature::GetEditJournal() const
 
       switch (entry.journalEntryType)
       {
-        case osm::JournalEntryType::TagModification:
-        {
-          osm::TagModData tagModData;
+      case osm::JournalEntryType::TagModification:
+      {
+        osm::TagModData tagModData;
 
-          tagModData.key = getAttribute(xmlData, "key");
-          if (tagModData.key.empty())
-            MYTHROW(editor::InvalidJournalEntry, ("Empty key in TagModData"));
-          tagModData.old_value = getAttribute(xmlData, "old_value");
-          tagModData.new_value = getAttribute(xmlData, "new_value");
+        tagModData.key = getAttribute(xmlData, "key");
+        if (tagModData.key.empty())
+          MYTHROW(editor::InvalidJournalEntry, ("Empty key in TagModData"));
+        tagModData.old_value = getAttribute(xmlData, "old_value");
+        tagModData.new_value = getAttribute(xmlData, "new_value");
 
-          entry.data = tagModData;
-          break;
-        }
-        case osm::JournalEntryType::ObjectCreated:
-        {
-          osm::ObjCreateData objCreateData;
+        entry.data = tagModData;
+        break;
+      }
+      case osm::JournalEntryType::ObjectCreated:
+      {
+        osm::ObjCreateData objCreateData;
 
-          // Feature Type
-          std::string strType = getAttribute(xmlData, "type");
-          if (strType.empty())
-            MYTHROW(editor::InvalidJournalEntry, ("Feature type is empty"));
-          objCreateData.type = classif().GetTypeByReadableObjectName(strType);
-          if (objCreateData.type == IndexAndTypeMapping::INVALID_TYPE)
-            MYTHROW(editor::InvalidJournalEntry, ("Invalid Feature Type:", strType));
+        // Feature Type
+        std::string strType = getAttribute(xmlData, "type");
+        if (strType.empty())
+          MYTHROW(editor::InvalidJournalEntry, ("Feature type is empty"));
+        objCreateData.type = classif().GetTypeByReadableObjectName(strType);
+        if (objCreateData.type == IndexAndTypeMapping::INVALID_TYPE)
+          MYTHROW(editor::InvalidJournalEntry, ("Invalid Feature Type:", strType));
 
-          // GeomType
-          std::string strGeomType = getAttribute(xmlData, "geomType");
-          objCreateData.geomType = feature::TypeFromString(strGeomType);
-          if (objCreateData.geomType != feature::GeomType::Point)
-            MYTHROW(editor::InvalidJournalEntry, ("Invalid geomType (only point features are supported):", strGeomType));
+        // GeomType
+        std::string strGeomType = getAttribute(xmlData, "geomType");
+        objCreateData.geomType = feature::TypeFromString(strGeomType);
+        if (objCreateData.geomType != feature::GeomType::Point)
+          MYTHROW(editor::InvalidJournalEntry, ("Invalid geomType (only point features are supported):", strGeomType));
 
-          // Mercator
-          objCreateData.mercator = mercator::FromLatLon(GetLatLonFromNode(xmlData));
+        // Mercator
+        objCreateData.mercator = mercator::FromLatLon(GetLatLonFromNode(xmlData));
 
-          entry.data = objCreateData;
-          break;
-        }
-        case osm::JournalEntryType::LegacyObject:
-        {
-          osm::LegacyObjData legacyObjData;
-          legacyObjData.version = getAttribute(xmlData, "version");
-          entry.data = legacyObjData;
-          break;
-        }
+        entry.data = objCreateData;
+        break;
+      }
+      case osm::JournalEntryType::LegacyObject:
+      {
+        osm::LegacyObjData legacyObjData;
+        legacyObjData.version = getAttribute(xmlData, "version");
+        entry.data = legacyObjData;
+        break;
+      }
       }
       if (isHistory)
         journal.AddJournalHistoryEntry(entry);
@@ -529,7 +536,7 @@ void XMLFeature::SetEditJournal(osm::EditJournal const & journal)
 {
   LOG(LDEBUG, ("Saving Journal:\n", journal.JournalToString()));
 
-  auto const insertEditJournalList = [] (pugi::xml_node & xmlNode, std::list<osm::JournalEntry> const & journalList)
+  auto const insertEditJournalList = [](pugi::xml_node & xmlNode, std::list<osm::JournalEntry> const & journalList)
   {
     xmlNode.append_attribute("version") = "1.0";
     for (osm::JournalEntry const & entry : journalList)
@@ -541,30 +548,30 @@ void XMLFeature::SetEditJournal(osm::EditJournal const & journal)
       auto xmlData = xmlEntry.append_child("data");
       switch (entry.journalEntryType)
       {
-        case osm::JournalEntryType::TagModification:
-        {
-          osm::TagModData const & tagModData = std::get<osm::TagModData>(entry.data);
-          xmlData.append_attribute("key") = tagModData.key.data();
-          xmlData.append_attribute("old_value") = tagModData.old_value.data();
-          xmlData.append_attribute("new_value") = tagModData.new_value.data();
-          break;
-        }
-        case osm::JournalEntryType::ObjectCreated:
-        {
-          osm::ObjCreateData const & objCreateData = std::get<osm::ObjCreateData>(entry.data);
-          xmlData.append_attribute("type") = classif().GetReadableObjectName(objCreateData.type).data();
-          xmlData.append_attribute("geomType") = ToString(objCreateData.geomType).data();
-          ms::LatLon ll = mercator::ToLatLon(objCreateData.mercator);
-          xmlData.append_attribute("lat") = strings::to_string_dac(ll.m_lat, kLatLonTolerance).data();
-          xmlData.append_attribute("lon") = strings::to_string_dac(ll.m_lon, kLatLonTolerance).data();
-          break;
-        }
-        case osm::JournalEntryType::LegacyObject:
-        {
-          osm::LegacyObjData const & legacyObjData = std::get<osm::LegacyObjData>(entry.data);
-          xmlData.append_attribute("version") = legacyObjData.version.data();
-          break;
-        }
+      case osm::JournalEntryType::TagModification:
+      {
+        osm::TagModData const & tagModData = std::get<osm::TagModData>(entry.data);
+        xmlData.append_attribute("key") = tagModData.key.data();
+        xmlData.append_attribute("old_value") = tagModData.old_value.data();
+        xmlData.append_attribute("new_value") = tagModData.new_value.data();
+        break;
+      }
+      case osm::JournalEntryType::ObjectCreated:
+      {
+        osm::ObjCreateData const & objCreateData = std::get<osm::ObjCreateData>(entry.data);
+        xmlData.append_attribute("type") = classif().GetReadableObjectName(objCreateData.type).data();
+        xmlData.append_attribute("geomType") = ToString(objCreateData.geomType).data();
+        ms::LatLon ll = mercator::ToLatLon(objCreateData.mercator);
+        xmlData.append_attribute("lat") = strings::to_string_dac(ll.m_lat, kLatLonTolerance).data();
+        xmlData.append_attribute("lon") = strings::to_string_dac(ll.m_lon, kLatLonTolerance).data();
+        break;
+      }
+      case osm::JournalEntryType::LegacyObject:
+      {
+        osm::LegacyObjData const & legacyObjData = std::get<osm::LegacyObjData>(entry.data);
+        xmlData.append_attribute("version") = legacyObjData.version.data();
+        break;
+      }
       }
     }
   };
@@ -581,16 +588,25 @@ void XMLFeature::SetEditJournal(osm::EditJournal const & journal)
   LOG(LDEBUG, ("Saving XMLFeature:\n", ost.str()));
 }
 
-bool XMLFeature::HasAnyTags() const { return GetRootNode().child("tag"); }
+bool XMLFeature::HasAnyTags() const
+{
+  return GetRootNode().child("tag");
+}
 
-bool XMLFeature::HasTag(string_view key) const { return FindTag(m_document, key); }
+bool XMLFeature::HasTag(string_view key) const
+{
+  return FindTag(m_document, key);
+}
 
 bool XMLFeature::HasAttribute(string_view key) const
 {
   return GetRootNode().attribute(key.data());
 }
 
-bool XMLFeature::HasKey(string_view key) const { return HasTag(key) || HasAttribute(key); }
+bool XMLFeature::HasKey(string_view key) const
+{
+  return HasTag(key) || HasAttribute(key);
+}
 
 string XMLFeature::GetTagValue(string_view key) const
 {
@@ -629,15 +645,13 @@ void XMLFeature::UpdateOSMTag(std::string_view key, std::string_view value)
   else
   {
     // TODO(mgsergio): Get these alt tags from the config.
-    base::StringIL const alternativeTags[] = {
-        {"phone", "contact:phone", "contact:mobile", "mobile"},
-        {"website", "contact:website", "url"},
-        {"fax", "contact:fax"},
-        {"email", "contact:email"},
-        {"addr:housenumber", "contact:housenumber"},
-        {"addr:street", "contact:street"},
-        {"addr:postcode", "contact:postcode"}
-    };
+    base::StringIL const alternativeTags[] = {{"phone", "contact:phone", "contact:mobile", "mobile"},
+                                              {"website", "contact:website", "url"},
+                                              {"fax", "contact:fax"},
+                                              {"email", "contact:email"},
+                                              {"addr:housenumber", "contact:housenumber"},
+                                              {"addr:street", "contact:street"},
+                                              {"addr:postcode", "contact:postcode"}};
 
     // Avoid duplication for similar alternative osm tags.
     for (auto const & alt : alternativeTags)
@@ -668,15 +682,20 @@ string XMLFeature::GetAttribute(string const & key) const
 
 void XMLFeature::SetAttribute(string const & key, string const & value)
 {
-  auto node = HasAttribute(key) ? GetRootNode().attribute(key.data())
-                                : GetRootNode().append_attribute(key.data());
+  auto node = HasAttribute(key) ? GetRootNode().attribute(key.data()) : GetRootNode().append_attribute(key.data());
 
   node.set_value(value.data());
 }
 
-pugi::xml_node const XMLFeature::GetRootNode() const { return m_document.first_child(); }
+pugi::xml_node const XMLFeature::GetRootNode() const
+{
+  return m_document.first_child();
+}
 
-pugi::xml_node XMLFeature::GetRootNode() { return m_document.first_child(); }
+pugi::xml_node XMLFeature::GetRootNode()
+{
+  return m_document.first_child();
+}
 
 bool XMLFeature::AttachToParentNode(pugi::xml_node parent) const
 {
@@ -712,9 +731,7 @@ XMLFeature::Type XMLFeature::StringToType(string const & type)
 void ApplyPatch(XMLFeature const & xml, osm::EditableMapObject & object)
 {
   xml.ForEachName([&object](string_view lang, string_view name)
-  {
-    object.SetName(name, StringUtf8Multilang::GetLangIndex(lang));
-  });
+  { object.SetName(name, StringUtf8Multilang::GetLangIndex(lang)); });
 
   string const house = xml.GetHouse();
   if (!house.empty())
@@ -747,9 +764,7 @@ XMLFeature ToXML(osm::EditableMapObject const & object, bool serializeType)
   }
 
   object.GetNameMultilang().ForEach([&toFeature](uint8_t const & lang, string_view name)
-  {
-    toFeature.SetName(lang, name);
-  });
+  { toFeature.SetName(lang, name); });
 
   string const & house = object.GetHouseNumber();
   if (!house.empty())
@@ -857,14 +872,11 @@ XMLFeature TypeToXML(uint32_t type, feature::GeomType geomType, m2::PointD merca
 
 bool FromXML(XMLFeature const & xml, osm::EditableMapObject & object)
 {
-  ASSERT_EQUAL(XMLFeature::Type::Node, xml.GetType(),
-               ("At the moment only new nodes (points) can be created."));
+  ASSERT_EQUAL(XMLFeature::Type::Node, xml.GetType(), ("At the moment only new nodes (points) can be created."));
   object.SetPointType();
   object.SetMercator(xml.GetMercatorCenter());
   xml.ForEachName([&object](string_view lang, string_view name)
-  {
-    object.SetName(name, StringUtf8Multilang::GetLangIndex(lang));
-  });
+  { object.SetName(name, StringUtf8Multilang::GetLangIndex(lang)); });
 
   string const house = xml.GetHouse();
   if (!house.empty())
@@ -917,7 +929,7 @@ bool FromXML(XMLFeature const & xml, osm::EditableMapObject & object)
       types.Add(type);
     else
     {
-      //LOG(LWARNING, ("Can't load/parse type:", k, v));
+      // LOG(LWARNING, ("Can't load/parse type:", k, v));
       /// @todo Refactor to make one ForEachTag loop. Now we have separate ForEachName,
       /// so we can't log any suspicious tag here ...
     }
@@ -934,5 +946,8 @@ string DebugPrint(XMLFeature const & feature)
   return ost.str();
 }
 
-string DebugPrint(XMLFeature::Type const type) { return XMLFeature::TypeToString(type); }
+string DebugPrint(XMLFeature::Type const type)
+{
+  return XMLFeature::TypeToString(type);
+}
 }  // namespace editor
diff --git a/libs/editor/xml_feature.hpp b/libs/editor/xml_feature.hpp
index 7f73cc269..8e2917cc2 100644
--- a/libs/editor/xml_feature.hpp
+++ b/libs/editor/xml_feature.hpp
@@ -2,8 +2,8 @@
 
 #include "geometry/mercator.hpp"
 #include "geometry/point2d.hpp"
-#include "indexer/feature_decl.hpp"
 #include "indexer/edit_journal.hpp"
+#include "indexer/feature_decl.hpp"
 
 #include "coding/string_utf8_multilang.hpp"
 
@@ -221,4 +221,4 @@ bool FromXML(XMLFeature const & xml, osm::EditableMapObject & object);
 
 std::string DebugPrint(XMLFeature const & feature);
 std::string DebugPrint(XMLFeature::Type const type);
-} // namespace editor
+}  // namespace editor
diff --git a/libs/ge0/ge0_tests/geo_url_tests.cpp b/libs/ge0/ge0_tests/geo_url_tests.cpp
index ebabe1554..4538291ba 100644
--- a/libs/ge0/ge0_tests/geo_url_tests.cpp
+++ b/libs/ge0/ge0_tests/geo_url_tests.cpp
@@ -2,7 +2,6 @@
 
 #include "ge0/geo_url_parser.hpp"
 
-
 namespace geo_url_tests
 {
 double const kEps = 1e-10;
@@ -124,7 +123,7 @@ UNIT_TEST(GeoUrl_Geo)
   TEST(info.IsLatLonValid(), ());
   TEST_ALMOST_EQUAL_ABS(info.m_lat, -32.899583, kEps, ());
   TEST_ALMOST_EQUAL_ABS(info.m_lon, 139.043969, kEps, ());
-  TEST_EQUAL(info.m_zoom, 12,());
+  TEST_EQUAL(info.m_zoom, 12, ());
 
   // Invalid coordinates.
   TEST(!parser.Parse("geo:0,0garbage", info), ());
@@ -195,7 +194,7 @@ UNIT_TEST(GeoURL_GoogleMaps)
   TEST_ALMOST_EQUAL_ABS(info.m_lat, 33.8904447, kEps, ());
   TEST_ALMOST_EQUAL_ABS(info.m_lon, 35.5044618, kEps, ());
   // Sic: zoom is not parsed
-  //TEST_ALMOST_EQUAL_ABS(info.m_zoom, 16.0, kEps, ());
+  // TEST_ALMOST_EQUAL_ABS(info.m_zoom, 16.0, kEps, ());
 
   TEST(parser.Parse("https://www.google.com/maps?q=55.751809,-37.6130029", info), ());
   TEST_ALMOST_EQUAL_ABS(info.m_lat, 55.751809, kEps, ());
@@ -302,4 +301,4 @@ UNIT_TEST(GeoURL_BadZoom)
   TEST_ALMOST_EQUAL_ABS(info.m_lon, 21.01547, kEps, ());
   TEST_GREATER_OR_EQUAL(info.m_zoom, 0.0, ());
 }
-} // namespace geo_url_tests
+}  // namespace geo_url_tests
diff --git a/libs/ge0/ge0_tests/parser_tests.cpp b/libs/ge0/ge0_tests/parser_tests.cpp
index 1685f3211..04590d857 100644
--- a/libs/ge0/ge0_tests/parser_tests.cpp
+++ b/libs/ge0/ge0_tests/parser_tests.cpp
@@ -21,8 +21,8 @@ class Ge0ParserForTest : public Ge0Parser
 {
 public:
   using Ge0Parser::DecodeBase64Char;
-  using Ge0Parser::DecodeZoom;
   using Ge0Parser::DecodeLatLon;
+  using Ge0Parser::DecodeZoom;
 };
 
 double GetLatEpsilon(size_t coordBytes)
@@ -189,8 +189,7 @@ UNIT_TEST(NameDecoding)
       "%d0%9c%d0%b8%d0%bd%d1%81%d0%ba_%d1%83%d0%bb._%d0%9b%d0%b5%d0%bd%d0%b8%d0%bd%d0%b0_9",
       0, 0, 4, "Минск ул. Ленина 9");
   TestSuccess("ge0://AwAAAAAAAA/z%c3%bcrich_bahnhofstrasse", 0, 0, 4, "zürich bahnhofstrasse");
-  TestSuccess("ge0://AwAAAAAAAA/%e5%8c%97%e4%ba%ac_or_B%c4%9bij%c4%abng%3F", 0, 0, 4,
-              "北京 or Běijīng?");
+  TestSuccess("ge0://AwAAAAAAAA/%e5%8c%97%e4%ba%ac_or_B%c4%9bij%c4%abng%3F", 0, 0, 4, "北京 or Běijīng?");
   TestSuccess(
       "ge0://AwAAAAAAAA/"
       "\xd1\x81\xd1\x82\xd1\x80\xd0\xbe\xd0\xba\xd0\xb0_\xd0\xb2_\xd1\x8e\xd1\x82\xd1\x84-8",
@@ -279,18 +278,18 @@ UNIT_TEST(LatLonFullAndClippedCoordinates)
 UNIT_TEST(ClippedName)
 {
   TestSuccess("ge0://AwAAAAAAAA/Super%5fPoi", 0, 0, 4, "Super Poi");
-  TestSuccess("ge0://AwAAAAAAAA/Super%5fPo" , 0, 0, 4, "Super Po");
-  TestSuccess("ge0://AwAAAAAAAA/Super%5fP"  , 0, 0, 4, "Super P");
-  TestSuccess("ge0://AwAAAAAAAA/Super%5f"   , 0, 0, 4, "Super ");
-  TestSuccess("ge0://AwAAAAAAAA/Super%5"    , 0, 0, 4, "Super");
-  TestSuccess("ge0://AwAAAAAAAA/Super%"     , 0, 0, 4, "Super");
-  TestSuccess("ge0://AwAAAAAAAA/Super"      , 0, 0, 4, "Super");
-  TestSuccess("ge0://AwAAAAAAAA/Supe"       , 0, 0, 4, "Supe");
-  TestSuccess("ge0://AwAAAAAAAA/Sup"        , 0, 0, 4, "Sup");
-  TestSuccess("ge0://AwAAAAAAAA/Su"         , 0, 0, 4, "Su");
-  TestSuccess("ge0://AwAAAAAAAA/S"          , 0, 0, 4, "S");
-  TestSuccess("ge0://AwAAAAAAAA/"           , 0, 0, 4, "");
-  TestSuccess("ge0://AwAAAAAAAA"            , 0, 0, 4, "");
+  TestSuccess("ge0://AwAAAAAAAA/Super%5fPo", 0, 0, 4, "Super Po");
+  TestSuccess("ge0://AwAAAAAAAA/Super%5fP", 0, 0, 4, "Super P");
+  TestSuccess("ge0://AwAAAAAAAA/Super%5f", 0, 0, 4, "Super ");
+  TestSuccess("ge0://AwAAAAAAAA/Super%5", 0, 0, 4, "Super");
+  TestSuccess("ge0://AwAAAAAAAA/Super%", 0, 0, 4, "Super");
+  TestSuccess("ge0://AwAAAAAAAA/Super", 0, 0, 4, "Super");
+  TestSuccess("ge0://AwAAAAAAAA/Supe", 0, 0, 4, "Supe");
+  TestSuccess("ge0://AwAAAAAAAA/Sup", 0, 0, 4, "Sup");
+  TestSuccess("ge0://AwAAAAAAAA/Su", 0, 0, 4, "Su");
+  TestSuccess("ge0://AwAAAAAAAA/S", 0, 0, 4, "S");
+  TestSuccess("ge0://AwAAAAAAAA/", 0, 0, 4, "");
+  TestSuccess("ge0://AwAAAAAAAA", 0, 0, 4, "");
 }
 
 UNIT_TEST(Bad_Base64)
diff --git a/libs/ge0/ge0_tests/url_generator_tests.cpp b/libs/ge0/ge0_tests/url_generator_tests.cpp
index a758ece15..514a070c4 100644
--- a/libs/ge0/ge0_tests/url_generator_tests.cpp
+++ b/libs/ge0/ge0_tests/url_generator_tests.cpp
@@ -1,7 +1,7 @@
 #include "testing/testing.hpp"
 
-#include "ge0/url_generator.hpp"
 #include "ge0/geo_url_parser.hpp"
+#include "ge0/url_generator.hpp"
 
 #include <string>
 
diff --git a/libs/ge0/geo_url_parser.cpp b/libs/ge0/geo_url_parser.cpp
index 431ed6609..eb73e32f2 100644
--- a/libs/ge0/geo_url_parser.cpp
+++ b/libs/ge0/geo_url_parser.cpp
@@ -21,9 +21,7 @@ double constexpr kEps = 1e-10;
 //    maximal zoom levels.
 double constexpr kMaxZoom = 20.0;
 
-bool MatchLatLonZoom(string const & s, regex const & re,
-                     size_t lati, size_t loni, size_t zoomi,
-                     GeoURLInfo & info)
+bool MatchLatLonZoom(string const & s, regex const & re, size_t lati, size_t loni, size_t zoomi, GeoURLInfo & info)
 {
   std::smatch m;
   if (!std::regex_search(s, m, re) || m.size() != 4)
@@ -55,13 +53,9 @@ std::string const kIntScale = R"((\d+))";
 // 2gis can accept float or int coordinates and scale.
 std::string const kFloatIntCoord = R"(([+-]?\d+\.?\d*))";
 std::string const kFloatIntScale = R"((\d+\.?\d*))";
-} // namespace
+}  // namespace
 
-LatLonParser::LatLonParser()
-: m_info(nullptr)
-, m_regexp(kFloatCoord + ", *" + kFloatCoord)
-{
-}
+LatLonParser::LatLonParser() : m_info(nullptr), m_regexp(kFloatCoord + ", *" + kFloatCoord) {}
 
 void LatLonParser::Reset(url::Url const & url, GeoURLInfo & info)
 {
@@ -154,10 +148,7 @@ int LatLonParser::GetCoordinatesPriority(string const & token)
 
 std::string const kLatLon = R"(([+-]?\d+(?:\.\d+)?), *([+-]?\d+(?:\.\d+)?)(:?, *([+-]?\d+(?:\.\d+)?))?)";
 
-GeoParser::GeoParser()
-  : m_latlonRe(kLatLon), m_zoomRe(kFloatIntScale)
-{
-}
+GeoParser::GeoParser() : m_latlonRe(kLatLon), m_zoomRe(kFloatIntScale) {}
 
 bool GeoParser::Parse(std::string const & raw, GeoURLInfo & info) const
 {
@@ -265,7 +256,7 @@ bool GeoParser::Parse(std::string const & raw, GeoURLInfo & info) const
     }
     // Ignore special 0,0 lat,lon if q= presents.
     if (!info.m_query.empty() && fabs(info.m_lat) < kEps && fabs(info.m_lon) < kEps)
-        info.m_lat = info.m_lon = ms::LatLon::kInvalid;
+      info.m_lat = info.m_lon = ms::LatLon::kInvalid;
   }
 
   if (!info.IsLatLonValid() && info.m_query.empty())
@@ -297,10 +288,9 @@ bool GeoParser::Parse(std::string const & raw, GeoURLInfo & info) const
 }
 
 DoubleGISParser::DoubleGISParser()
-: m_pathRe("/" + kFloatIntCoord + "," + kFloatIntCoord + "/zoom/" + kFloatIntScale)
-, m_paramRe(kFloatIntCoord + "," + kFloatIntCoord + "/" + kFloatIntScale)
-{
-}
+  : m_pathRe("/" + kFloatIntCoord + "," + kFloatIntCoord + "/zoom/" + kFloatIntScale)
+  , m_paramRe(kFloatIntCoord + "," + kFloatIntCoord + "/" + kFloatIntScale)
+{}
 
 bool DoubleGISParser::Parse(url::Url const & url, GeoURLInfo & info) const
 {
@@ -315,10 +305,7 @@ bool DoubleGISParser::Parse(url::Url const & url, GeoURLInfo & info) const
   return MatchLatLonZoom(url.GetHostAndPath(), m_pathRe, 2, 1, 3, info);
 }
 
-OpenStreetMapParser::OpenStreetMapParser()
-: m_regex(kIntScale + "/" + kFloatCoord + "/" + kFloatCoord)
-{
-}
+OpenStreetMapParser::OpenStreetMapParser() : m_regex(kIntScale + "/" + kFloatCoord + "/" + kFloatCoord) {}
 
 bool OpenStreetMapParser::Parse(url::Url const & url, GeoURLInfo & info) const
 {
@@ -401,4 +388,4 @@ bool UnifiedParser::Parse(std::string const & raw, GeoURLInfo & res)
   return m_llParser.IsValid();
 }
 
-} // namespace geo
+}  // namespace geo
diff --git a/libs/ge0/geo_url_parser.hpp b/libs/ge0/geo_url_parser.hpp
index 8538d3424..2d1afdc4f 100644
--- a/libs/ge0/geo_url_parser.hpp
+++ b/libs/ge0/geo_url_parser.hpp
@@ -83,6 +83,7 @@ class GeoParser
 public:
   GeoParser();
   bool Parse(std::string const & url, GeoURLInfo & info) const;
+
 private:
   std::regex m_latlonRe;
   std::regex m_zoomRe;
@@ -100,4 +101,4 @@ private:
   LatLonParser m_llParser;
 };
 
-} // namespace geo
+}  // namespace geo
diff --git a/libs/ge0/parser.cpp b/libs/ge0/parser.cpp
index ce60b5e1b..8cd997101 100644
--- a/libs/ge0/parser.cpp
+++ b/libs/ge0/parser.cpp
@@ -40,10 +40,8 @@ bool Ge0Parser::Parse(std::string const & url, Result & result)
   // http://comaps.app/ZCoordba64/Name
 
   for (auto prefix : kGe0Prefixes)
-  {
     if (url.starts_with(prefix))
       return ParseAfterPrefix(url, prefix.size(), result);
-  }
 
   return false;
 }
@@ -147,12 +145,10 @@ std::string Ge0Parser::DecodeName(std::string name)
 void Ge0Parser::SpacesToUnderscore(std::string & name)
 {
   for (size_t i = 0; i < name.size(); ++i)
-  {
     if (name[i] == ' ')
       name[i] = '_';
     else if (name[i] == '_')
       name[i] = ' ';
-  }
 }
 
 void Ge0Parser::ValidateName(std::string & name)
diff --git a/libs/ge0/parser.hpp b/libs/ge0/parser.hpp
index bd2c0ed70..f378ba6e0 100644
--- a/libs/ge0/parser.hpp
+++ b/libs/ge0/parser.hpp
@@ -11,10 +11,8 @@ class Ge0Parser
 {
 public:
   // Used by map/mwm_url.cpp.
-  static constexpr std::array<std::string_view, 6> kGe0Prefixes = {{
-      "https://comaps.at/", "cm://", "http://comaps.at/",
-      "ge0://", "http://ge0.me/", "https://ge0.me/"
-  }};
+  static constexpr std::array<std::string_view, 6> kGe0Prefixes = {
+      {"https://comaps.at/", "cm://", "http://comaps.at/", "ge0://", "http://ge0.me/", "https://ge0.me/"}};
 
   struct Result
   {
diff --git a/libs/ge0/url_generator.cpp b/libs/ge0/url_generator.cpp
index dedcee162..c2e1d31f9 100644
--- a/libs/ge0/url_generator.cpp
+++ b/libs/ge0/url_generator.cpp
@@ -1,7 +1,7 @@
 #include "ge0/url_generator.hpp"
 
-#include "coding/url.hpp"
 #include "base/assert.hpp"
+#include "coding/url.hpp"
 
 #include <cmath>
 #include <iomanip>
@@ -14,12 +14,10 @@ std::string TransformName(std::string const & s)
 {
   std::string result = s;
   for (auto & c : result)
-  {
     if (c == ' ')
       c = '_';
     else if (c == '_')
       c = ' ';
-  }
   return result;
 }
 
@@ -37,10 +35,38 @@ std::string UrlEncodeString(std::string const & s)
     auto const c = static_cast<unsigned char>(s[i]);
     switch (c)
     {
-    case 0x00: case 0x01: case 0x02: case 0x03: case 0x04: case 0x05: case 0x06: case 0x07:
-    case 0x08: case 0x09: case 0x0A: case 0x0B: case 0x0C: case 0x0D: case 0x0E: case 0x0F:
-    case 0x10: case 0x11: case 0x12: case 0x13: case 0x14: case 0x15: case 0x16: case 0x17:
-    case 0x18: case 0x19: case 0x1A: case 0x1B: case 0x1C: case 0x1D: case 0x1E: case 0x1F:
+    case 0x00:
+    case 0x01:
+    case 0x02:
+    case 0x03:
+    case 0x04:
+    case 0x05:
+    case 0x06:
+    case 0x07:
+    case 0x08:
+    case 0x09:
+    case 0x0A:
+    case 0x0B:
+    case 0x0C:
+    case 0x0D:
+    case 0x0E:
+    case 0x0F:
+    case 0x10:
+    case 0x11:
+    case 0x12:
+    case 0x13:
+    case 0x14:
+    case 0x15:
+    case 0x16:
+    case 0x17:
+    case 0x18:
+    case 0x19:
+    case 0x1A:
+    case 0x1B:
+    case 0x1C:
+    case 0x1D:
+    case 0x1E:
+    case 0x1F:
     case 0x7F:
     case ' ':
     case '<':
@@ -74,8 +100,7 @@ std::string UrlEncodeString(std::string const & s)
       result += "0123456789ABCDEF"[c >> 4];
       result += "0123456789ABCDEF"[c & 15];
       break;
-    default:
-      result += s[i];
+    default: result += s[i];
     }
   }
   return result;
@@ -169,13 +194,8 @@ void LatLonToString(double lat, double lon, char * s, size_t nBytes)
     int const latBits = latI >> shift & 7;
     int const lonBits = lonI >> shift & 7;
 
-    int const nextByte =
-      (latBits >> 2 & 1) << 5 |
-      (lonBits >> 2 & 1) << 4 |
-      (latBits >> 1 & 1) << 3 |
-      (lonBits >> 1 & 1) << 2 |
-      (latBits      & 1) << 1 |
-      (lonBits      & 1);
+    int const nextByte = (latBits >> 2 & 1) << 5 | (lonBits >> 2 & 1) << 4 | (latBits >> 1 & 1) << 3 |
+                         (lonBits >> 1 & 1) << 2 | (latBits & 1) << 1 | (lonBits & 1);
 
     s[i] = Base64Char(nextByte);
   }
diff --git a/libs/geometry/algorithm.cpp b/libs/geometry/algorithm.cpp
index 723bcedb1..c55e93bcd 100644
--- a/libs/geometry/algorithm.cpp
+++ b/libs/geometry/algorithm.cpp
@@ -42,8 +42,7 @@ CalculatePointOnSurface::CalculatePointOnSurface(m2::RectD const & rect)
   : m_rectCenter(rect.Center())
   , m_center(m_rectCenter)
   , m_squareDistanceToApproximate(std::numeric_limits<double>::max())
-{
-}
+{}
 
 void CalculatePointOnSurface::operator()(PointD const & p1, PointD const & p2, PointD const & p3)
 {
diff --git a/libs/geometry/algorithm.hpp b/libs/geometry/algorithm.hpp
index bdfd7d964..5fd727ccb 100644
--- a/libs/geometry/algorithm.hpp
+++ b/libs/geometry/algorithm.hpp
@@ -44,6 +44,7 @@ public:
 
   void operator()(PointD const & p1, PointD const & p2, PointD const & p3);
   PointD GetResult() const { return m_center; }
+
 private:
   PointD m_rectCenter;
   PointD m_center;
@@ -56,6 +57,7 @@ class CalculateBoundingBox
 public:
   void operator()(PointD const & p);
   RectD GetResult() const { return m_boundingBox; }
+
 private:
   RectD m_boundingBox;
 };
@@ -80,8 +82,7 @@ m2::PointD ApplyPointOnSurfaceCalculator(TIterator begin, TIterator end, TCalcul
 }
 
 template <typename TCalculator, typename TIterator>
-auto ApplyCalculator(TIterator begin, TIterator end, TCalculator && calc)
-    -> decltype(calc.GetResult())
+auto ApplyCalculator(TIterator begin, TIterator end, TCalculator && calc) -> decltype(calc.GetResult())
 {
   for (; begin != end; ++begin)
     calc(*begin);
@@ -89,34 +90,30 @@ auto ApplyCalculator(TIterator begin, TIterator end, TCalculator && calc)
 }
 
 template <typename TCalculator, typename TIterator>
-auto SelectImplementation(TIterator begin, TIterator end, TCalculator && calc,
-                          std::true_type const &) -> decltype(calc.GetResult())
+auto SelectImplementation(TIterator begin, TIterator end, TCalculator && calc, std::true_type const &)
+    -> decltype(calc.GetResult())
 {
   return impl::ApplyPointOnSurfaceCalculator(begin, end, std::forward<TCalculator>(calc));
 }
 
 template <typename TCalculator, typename TIterator>
-auto SelectImplementation(TIterator begin, TIterator end, TCalculator && calc,
-                          std::false_type const &) -> decltype(calc.GetResult())
+auto SelectImplementation(TIterator begin, TIterator end, TCalculator && calc, std::false_type const &)
+    -> decltype(calc.GetResult())
 {
   return impl::ApplyCalculator(begin, end, std::forward<TCalculator>(calc));
 }
 }  // namespace impl
 
 template <typename TCalculator, typename TIterator>
-auto ApplyCalculator(TIterator begin, TIterator end, TCalculator && calc)
-    -> decltype(calc.GetResult())
+auto ApplyCalculator(TIterator begin, TIterator end, TCalculator && calc) -> decltype(calc.GetResult())
 {
-  return impl::SelectImplementation(
-      begin, end, std::forward<TCalculator>(calc),
-      std::is_same<CalculatePointOnSurface, std::remove_reference_t<TCalculator>>());
+  return impl::SelectImplementation(begin, end, std::forward<TCalculator>(calc),
+                                    std::is_same<CalculatePointOnSurface, std::remove_reference_t<TCalculator>>());
 }
 
 template <typename TCalculator, typename TCollection>
-auto ApplyCalculator(TCollection && collection, TCalculator && calc)
-    -> decltype(calc.GetResult())
+auto ApplyCalculator(TCollection && collection, TCalculator && calc) -> decltype(calc.GetResult())
 {
-  return ApplyCalculator(std::begin(collection), std::end(collection),
-                         std::forward<TCalculator>(calc));
+  return ApplyCalculator(std::begin(collection), std::end(collection), std::forward<TCalculator>(calc));
 }
 }  // namespace m2
diff --git a/libs/geometry/any_rect2d.hpp b/libs/geometry/any_rect2d.hpp
index e66eed6f1..dcf99f34a 100644
--- a/libs/geometry/any_rect2d.hpp
+++ b/libs/geometry/any_rect2d.hpp
@@ -37,18 +37,14 @@ public:
     }
   }
 
-  AnyRect(Point<T> const & zero, ang::Angle<T> const & angle, Rect<T> const & r)
-    : m_angle(angle), m_rect(r)
+  AnyRect(Point<T> const & zero, ang::Angle<T> const & angle, Rect<T> const & r) : m_angle(angle), m_rect(r)
   {
     m_zero = Convert(zero, Point<T>(1, 0), Point<T>(0, 1), i(), j());
   }
 
   Point<T> const & LocalZero() const { return m_zero; }
 
-  Point<T> GlobalZero() const
-  {
-    return Convert(m_zero, i(), j(), Point<T>(1, 0), Point<T>(0, 1));
-  }
+  Point<T> GlobalZero() const { return Convert(m_zero, i(), j(), Point<T>(1, 0), Point<T>(0, 1)); }
 
   Point<T> i() const { return Point<T>(m_angle.cos(), m_angle.sin()); }
 
@@ -81,10 +77,8 @@ public:
     std::sort(arr2.begin(), arr2.end());
 
     for (size_t i = 0; i < arr1.size(); ++i)
-    {
       if (!arr1[i].EqualDxDy(arr2[i], eps))
         return false;
-    }
 
     return true;
   }
@@ -96,8 +90,8 @@ public:
     Corners pts;
     r.GetGlobalPoints(pts);
     ConvertTo(pts);
-    return m_rect.IsPointInside(pts[0]) && m_rect.IsPointInside(pts[1]) &&
-           m_rect.IsPointInside(pts[2]) && m_rect.IsPointInside(pts[3]);
+    return m_rect.IsPointInside(pts[0]) && m_rect.IsPointInside(pts[1]) && m_rect.IsPointInside(pts[2]) &&
+           m_rect.IsPointInside(pts[3]);
   }
 
   bool IsIntersect(AnyRect<T> const & r) const
@@ -196,8 +190,8 @@ public:
   }
 
 private:
-  static Point<T> Convert(Point<T> const & p, Point<T> const & fromI, Point<T> const & fromJ,
-                          Point<T> const & toI, Point<T> const & toJ)
+  static Point<T> Convert(Point<T> const & p, Point<T> const & fromI, Point<T> const & fromJ, Point<T> const & toI,
+                          Point<T> const & toJ)
   {
     Point<T> res;
 
diff --git a/libs/geometry/area_on_earth.cpp b/libs/geometry/area_on_earth.cpp
index ca15b3bdc..7c3863e73 100644
--- a/libs/geometry/area_on_earth.cpp
+++ b/libs/geometry/area_on_earth.cpp
@@ -50,9 +50,9 @@ double AreaOnEarth(LatLon const & ll1, LatLon const & ll2, LatLon const & ll3)
   ASSERT(::AlmostEqualAbs(c.Length(), 1.0, 1e-5), ());
 
   double constexpr lengthMultiplication = 1.0;  // a.Length() * b.Length() * c.Length()
-  double const abc = m3::DotProduct(a, b);  // * c.Length() == 1
-  double const acb = m3::DotProduct(a, c);  // * b.Length() == 1
-  double const bca = m3::DotProduct(b, c);  // * a.Length() == 1
+  double const abc = m3::DotProduct(a, b);      // * c.Length() == 1
+  double const acb = m3::DotProduct(a, c);      // * b.Length() == 1
+  double const bca = m3::DotProduct(b, c);      // * a.Length() == 1
 
   double const tanFromHalfSolidAngle = triple / (lengthMultiplication + abc + acb + bca);
   double const halfSolidAngle = atan(tanFromHalfSolidAngle);
diff --git a/libs/geometry/avg_vector.hpp b/libs/geometry/avg_vector.hpp
index a1688e5df..673286d6a 100644
--- a/libs/geometry/avg_vector.hpp
+++ b/libs/geometry/avg_vector.hpp
@@ -17,10 +17,7 @@ template <class T, size_t Dim>
 class AvgVector
 {
 public:
-  explicit AvgVector(size_t count = 1) : m_count(count)
-  {
-    static_assert(std::is_floating_point<T>::value, "");
-  }
+  explicit AvgVector(size_t count = 1) : m_count(count) { static_assert(std::is_floating_point<T>::value, ""); }
 
   void SetCount(size_t count) { m_count = count; }
 
diff --git a/libs/geometry/bounding_box.hpp b/libs/geometry/bounding_box.hpp
index 502e08fc7..b5dc39d85 100644
--- a/libs/geometry/bounding_box.hpp
+++ b/libs/geometry/bounding_box.hpp
@@ -40,10 +40,7 @@ public:
     return points;
   }
 
-  bool operator==(BoundingBox const & rhs) const
-  {
-    return m_min == rhs.m_min && m_max == rhs.m_max;
-  }
+  bool operator==(BoundingBox const & rhs) const { return m_min == rhs.m_min && m_max == rhs.m_max; }
 
   DECLARE_VISITOR(visitor(m_min, "min"), visitor(m_max, "max"))
   DECLARE_DEBUG_PRINT(BoundingBox)
diff --git a/libs/geometry/calipers_box.cpp b/libs/geometry/calipers_box.cpp
index fc5e8ce3c..ca17bb63e 100644
--- a/libs/geometry/calipers_box.cpp
+++ b/libs/geometry/calipers_box.cpp
@@ -23,7 +23,10 @@ bool IsCCWNeg(PointD const & p1, PointD const & p2, PointD const & p, double eps
   return robust::OrientedS(p1, p2, p) > -eps;
 }
 
-PointD Ort(PointD const & p) { return PointD(-p.y, p.x); }
+PointD Ort(PointD const & p)
+{
+  return PointD(-p.y, p.x);
+}
 
 // For each facet of the |hull| calls |fn| with the smallest rectangle
 // containing the hull and with one side collinear to the facet.
@@ -113,11 +116,11 @@ void CalipersBox::Deserialize(std::vector<PointD> && points)
   ASSERT(TestValid(), ());
 
   // 2. Stable with input.
-//#ifdef DEBUG
-//  CalipersBox test(m_points);
-//  ASSERT(test.TestValid(), ());
-//  *this = std::move(test);
-//#endif
+  // #ifdef DEBUG
+  //   CalipersBox test(m_points);
+  //   ASSERT(test.TestValid(), ());
+  //   *this = std::move(test);
+  // #endif
 }
 
 void CalipersBox::Normalize()
@@ -136,10 +139,8 @@ bool CalipersBox::TestValid() const
 {
   size_t const n = m_points.size();
   for (size_t i = 0; i < n; ++i)
-  {
     if (!IsCCWNeg(m_points[i], m_points[(i + 1) % n], m_points[(i + 2) % n], kEps))
       return false;
-  }
   return n > 0;
 }
 
@@ -148,12 +149,9 @@ bool CalipersBox::HasPoint(PointD const & p, double eps) const
   auto const n = m_points.size();
   switch (n)
   {
-  case 0:
-    return false;
-  case 1:
-    return AlmostEqualAbs(m_points[0], p, eps);
-  case 2:
-    return IsPointOnSegmentEps(p, m_points[0], m_points[1], eps);
+  case 0: return false;
+  case 1: return AlmostEqualAbs(m_points[0], p, eps);
+  case 2: return IsPointOnSegmentEps(p, m_points[0], m_points[1], eps);
   }
 
   for (size_t i = 0; i < n; ++i)
diff --git a/libs/geometry/cellid.hpp b/libs/geometry/cellid.hpp
index d648a7356..432ac4369 100644
--- a/libs/geometry/cellid.hpp
+++ b/libs/geometry/cellid.hpp
@@ -108,10 +108,8 @@ public:
     if (length >= DEPTH_LEVELS)
       return false;
     for (size_t i = 0; i < length; ++i)
-    {
       if (s[i] < '0' || s[i] > '3')
         return false;
-    }
     return true;
   }
 
diff --git a/libs/geometry/circle_on_earth.cpp b/libs/geometry/circle_on_earth.cpp
index 3d734d567..b80cad270 100644
--- a/libs/geometry/circle_on_earth.cpp
+++ b/libs/geometry/circle_on_earth.cpp
@@ -18,18 +18,13 @@ std::vector<m3::PointD> CreateCircleOnNorth(double radiusMeters, double angleSte
   std::vector<m3::PointD> result;
   double const stepRad = math::DegToRad(angleStepDegree);
   for (double angleRad = 0; angleRad < 2 * math::pi; angleRad += stepRad)
-  {
-    result.emplace_back(circleRadiusMeters * cos(angleRad),
-                        circleRadiusMeters * sin(angleRad),
-                        z);
-  }
+    result.emplace_back(circleRadiusMeters * cos(angleRad), circleRadiusMeters * sin(angleRad), z);
   return result;
 }
 
 ms::LatLon FromEarth3dToSpherical(m3::PointD const & vec)
 {
-  ASSERT(AlmostEqualAbs(vec.Length(), ms::kEarthRadiusMeters, 1e-5),
-         (vec.Length(), ms::kEarthRadiusMeters));
+  ASSERT(AlmostEqualAbs(vec.Length(), ms::kEarthRadiusMeters, 1e-5), (vec.Length(), ms::kEarthRadiusMeters));
 
   double sinLatRad = vec.z / ms::kEarthRadiusMeters;
   sinLatRad = math::Clamp(sinLatRad, -1.0, 1.0);
diff --git a/libs/geometry/clipping.cpp b/libs/geometry/clipping.cpp
index 4d6510144..ec77747a9 100644
--- a/libs/geometry/clipping.cpp
+++ b/libs/geometry/clipping.cpp
@@ -25,9 +25,8 @@ int GetRectSideIndex(int code)
 using CornersT = std::array<m2::PointD, 4>;
 
 template <class AddPointFnT>
-void InsertCorners(CornersT const & corners, m2::PointD const & p1, m2::PointD const & p2,
-                   m2::PointD const & p3, AddPointFnT const & addPolygonPoint, int code1,
-                   int code2)
+void InsertCorners(CornersT const & corners, m2::PointD const & p1, m2::PointD const & p2, m2::PointD const & p3,
+                   AddPointFnT const & addPolygonPoint, int code1, int code2)
 {
   int cornerInd = GetRectSideIndex(code1);
   int endCornerInd = GetRectSideIndex(code2);
@@ -47,9 +46,8 @@ void InsertCorners(CornersT const & corners, m2::PointD const & p1, m2::PointD c
 }
 
 template <class AddPointFnT>
-bool IntersectEdge(m2::RectD const & rect, CornersT const & corners,
-                   m2::PointD const & pp1, m2::PointD const & pp2, m2::PointD const & pp3,
-                   AddPointFnT const & addPolygonPoint, int prevClipCode, int nextClipCode,
+bool IntersectEdge(m2::RectD const & rect, CornersT const & corners, m2::PointD const & pp1, m2::PointD const & pp2,
+                   m2::PointD const & pp3, AddPointFnT const & addPolygonPoint, int prevClipCode, int nextClipCode,
                    int & firstClipCode, int & lastClipCode)
 {
   m2::PointD p1 = pp1;
@@ -75,10 +73,10 @@ bool IntersectEdge(m2::RectD const & rect, CornersT const & corners,
   }
   return false;
 }
-} // namespace
+}  // namespace
 
-void ClipTriangleByRect(m2::RectD const & rect, m2::PointD const & p1, m2::PointD const & p2,
-                        m2::PointD const & p3, ClipTriangleByRectResultIt const & resultIterator)
+void ClipTriangleByRect(m2::RectD const & rect, m2::PointD const & p1, m2::PointD const & p2, m2::PointD const & p3,
+                        ClipTriangleByRectResultIt const & resultIterator)
 {
   if (rect.IsPointInside(p1) && rect.IsPointInside(p2) && rect.IsPointInside(p3))
   {
@@ -94,22 +92,20 @@ void ClipTriangleByRect(m2::RectD const & rect, m2::PointD const & p1, m2::Point
       polygon.push_back(pt);
   };
 
-  CornersT const corners = { rect.LeftTop(), rect.RightTop(), rect.RightBottom(), rect.LeftBottom() };
+  CornersT const corners = {rect.LeftTop(), rect.RightTop(), rect.RightBottom(), rect.LeftBottom()};
 
   int firstClipCode[3];
   int lastClipCode[3];
   bool intersected[3];
 
-  intersected[0] = IntersectEdge(rect, corners, p1, p2, p3, addPolygonPoint, 0, 0, firstClipCode[0],
-                                 lastClipCode[0]);
+  intersected[0] = IntersectEdge(rect, corners, p1, p2, p3, addPolygonPoint, 0, 0, firstClipCode[0], lastClipCode[0]);
 
-  intersected[1] = IntersectEdge(rect, corners, p2, p3, p1, addPolygonPoint, lastClipCode[0], 0,
-                                 firstClipCode[1], lastClipCode[1]);
+  intersected[1] =
+      IntersectEdge(rect, corners, p2, p3, p1, addPolygonPoint, lastClipCode[0], 0, firstClipCode[1], lastClipCode[1]);
 
-  intersected[2] = IntersectEdge(rect, corners, p3, p1, p2, addPolygonPoint,
-                                 lastClipCode[1] != 0 ? lastClipCode[1] : lastClipCode[0],
-                                 firstClipCode[0] != 0 ? firstClipCode[0] : firstClipCode[1],
-                                 firstClipCode[2], lastClipCode[2]);
+  intersected[2] = IntersectEdge(
+      rect, corners, p3, p1, p2, addPolygonPoint, lastClipCode[1] != 0 ? lastClipCode[1] : lastClipCode[0],
+      firstClipCode[0] != 0 ? firstClipCode[0] : firstClipCode[1], firstClipCode[2], lastClipCode[2]);
 
   int const intersectCount = intersected[0] + intersected[1] + intersected[2];
   if (intersectCount == 0)
@@ -207,7 +203,7 @@ std::vector<m2::SharedSpline> ClipSplineByRect(m2::RectD const & rect, m2::Share
   case RectCase::Intersect:
   {
     std::vector<m2::SharedSpline> res;
-    res.reserve(2); // keep previous behavior, but not sure that its actually needed
+    res.reserve(2);  // keep previous behavior, but not sure that its actually needed
     ClipPathByRectImpl(rect, spline->GetPath(), base::MakeBackInsertFunctor(res));
     return res;
   }
@@ -217,7 +213,7 @@ std::vector<m2::SharedSpline> ClipSplineByRect(m2::RectD const & rect, m2::Share
 }
 
 void ClipPathByRect(m2::RectD const & rect, std::vector<m2::PointD> && path,
-                    std::function<void (m2::SharedSpline &&)> const & fn)
+                    std::function<void(m2::SharedSpline &&)> const & fn)
 {
   switch (GetRectCase(rect, path))
   {
@@ -228,8 +224,7 @@ void ClipPathByRect(m2::RectD const & rect, std::vector<m2::PointD> && path,
 }
 
 void ClipPathByRectBeforeSmooth(m2::RectD const & rect, std::vector<m2::PointD> const & path,
-                                GuidePointsForSmooth & guidePoints,
-                                std::vector<std::vector<m2::PointD>> & clippedPaths)
+                                GuidePointsForSmooth & guidePoints, std::vector<std::vector<m2::PointD>> & clippedPaths)
 {
   if (path.size() < 2)
     return;
@@ -313,4 +308,4 @@ void ClipPathByRectBeforeSmooth(m2::RectD const & rect, std::vector<m2::PointD>
     guidePoints.push_back({currentGuideFront, guideBack});
   }
 }
-}  // namespace m2;
+}  // namespace m2
diff --git a/libs/geometry/clipping.hpp b/libs/geometry/clipping.hpp
index 4ba906351..4948ddd87 100644
--- a/libs/geometry/clipping.hpp
+++ b/libs/geometry/clipping.hpp
@@ -9,16 +9,14 @@
 
 namespace m2
 {
-using ClipTriangleByRectResultIt =
-    std::function<void(m2::PointD const &, m2::PointD const &, m2::PointD const &)>;
+using ClipTriangleByRectResultIt = std::function<void(m2::PointD const &, m2::PointD const &, m2::PointD const &)>;
 
-void ClipTriangleByRect(m2::RectD const & rect, m2::PointD const & p1, m2::PointD const & p2,
-                        m2::PointD const & p3, ClipTriangleByRectResultIt const & resultIterator);
+void ClipTriangleByRect(m2::RectD const & rect, m2::PointD const & p1, m2::PointD const & p2, m2::PointD const & p3,
+                        ClipTriangleByRectResultIt const & resultIterator);
 
 void ClipPathByRect(m2::RectD const & rect, std::vector<m2::PointD> && path,
-                    std::function<void (m2::SharedSpline &&)> const & fn);
-std::vector<m2::SharedSpline> ClipSplineByRect(m2::RectD const & rect,
-                                               m2::SharedSpline const & spline);
+                    std::function<void(m2::SharedSpline &&)> const & fn);
+std::vector<m2::SharedSpline> ClipSplineByRect(m2::RectD const & rect, m2::SharedSpline const & spline);
 
 using GuidePointsForSmooth = std::vector<std::pair<m2::PointD, m2::PointD>>;
 void ClipPathByRectBeforeSmooth(m2::RectD const & rect, std::vector<m2::PointD> const & path,
diff --git a/libs/geometry/convex_hull.cpp b/libs/geometry/convex_hull.cpp
index 84eca849f..f2774f07f 100644
--- a/libs/geometry/convex_hull.cpp
+++ b/libs/geometry/convex_hull.cpp
@@ -62,8 +62,5 @@ std::vector<PointD> BuildConvexHull(std::vector<PointD> points, double eps)
 }
 }  // namespace
 
-ConvexHull::ConvexHull(std::vector<PointD> const & points, double eps)
-  : m_hull(BuildConvexHull(points, eps))
-{
-}
+ConvexHull::ConvexHull(std::vector<PointD> const & points, double eps) : m_hull(BuildConvexHull(points, eps)) {}
 }  // namespace m2
diff --git a/libs/geometry/covering.hpp b/libs/geometry/covering.hpp
index 8e08d6642..6689d896e 100644
--- a/libs/geometry/covering.hpp
+++ b/libs/geometry/covering.hpp
@@ -41,8 +41,7 @@ public:
   }
 
   // Cover triangle.
-  Covering(m2::PointD const & a, m2::PointD const & b, m2::PointD const & c,
-           int level = CellId::DEPTH_LEVELS - 1)
+  Covering(m2::PointD const & a, m2::PointD const & b, m2::PointD const & c, int level = CellId::DEPTH_LEVELS - 1)
   {
     // TODO: ASSERT(a != b), ASSERT(b != c), ASSERT(a != c) ?
     ASSERT(0 <= level && level <= CellId::DEPTH_LEVELS, (level, CellId::Root()));
@@ -117,12 +116,10 @@ private:
     std::vector<CellId> parentCells;
     std::vector<CellId> childCells;
     for (ConstIterator it = m_Covering[level].begin(); it != m_Covering[level].end(); ++it)
-    {
       if (parentCellCounts[it->Parent()] > 1)
         parentCells.push_back(it->Parent());
       else
         childCells.push_back(*it);
-    }
     ASSERT(std::is_sorted(parentCells.begin(), parentCells.end(), LessLevelOrder()), (parentCells));
     ASSERT(std::is_sorted(childCells.begin(), childCells.end(), LessLevelOrder()), (childCells));
     m_Covering[level].swap(childCells);
@@ -135,8 +132,7 @@ private:
     ASSERT(base::IsSortedAndUnique(a.begin(), a.end(), LessLevelOrder()), (a));
     ASSERT(base::IsSortedAndUnique(b.begin(), b.end(), LessLevelOrder()), (b));
     std::vector<CellId> merged;
-    std::set_union(a.begin(), a.end(), b.begin(), b.end(), std::back_inserter(merged),
-                   LessLevelOrder());
+    std::set_union(a.begin(), a.end(), b.begin(), b.end(), std::back_inserter(merged), LessLevelOrder());
     a.swap(merged);
   }
 
@@ -195,16 +191,13 @@ private:
     {
       if (m_Covering[parentLevel].empty())
         continue;
-      for (int childLevel = parentLevel + 1; childLevel < static_cast<int>(m_Covering.size());
-           ++childLevel)
+      for (int childLevel = parentLevel + 1; childLevel < static_cast<int>(m_Covering.size()); ++childLevel)
       {
         std::vector<CellId> subtracted;
         CompareCellsAtLevel<LessLevelOrder> comparator(parentLevel);
-        ASSERT(std::is_sorted(m_Covering[childLevel].begin(), m_Covering[childLevel].end(),
-                              comparator),
+        ASSERT(std::is_sorted(m_Covering[childLevel].begin(), m_Covering[childLevel].end(), comparator),
                (m_Covering[childLevel]));
-        ASSERT(std::is_sorted(m_Covering[parentLevel].begin(), m_Covering[parentLevel].end(),
-                              comparator),
+        ASSERT(std::is_sorted(m_Covering[parentLevel].begin(), m_Covering[parentLevel].end(), comparator),
                (m_Covering[parentLevel]));
         SetDifferenceUnlimited(m_Covering[childLevel].begin(), m_Covering[childLevel].end(),
                                m_Covering[parentLevel].begin(), m_Covering[parentLevel].end(),
@@ -229,8 +222,7 @@ private:
         if (i + 3 < a.size())
         {
           CellId const parent = a[i].Parent();
-          if (parent == a[i + 1].Parent() && parent == a[i + 2].Parent() &&
-              parent == a[i + 3].Parent())
+          if (parent == a[i + 1].Parent() && parent == a[i + 2].Parent() && parent == a[i + 3].Parent())
           {
             parents.push_back(parent);
             i += 3;
@@ -263,8 +255,7 @@ private:
   static void CoverTriangleImpl(CoverTriangleInfo const & info, CellId const cell)
   {
     ASSERT_LESS_OR_EQUAL(cell.Level(), info.m_Level, (info.m_A, info.m_B, info.m_C));
-    CellObjectIntersection intersection =
-        IntersectCellWithTriangle(cell, info.m_A, info.m_B, info.m_C);
+    CellObjectIntersection intersection = IntersectCellWithTriangle(cell, info.m_A, info.m_B, info.m_C);
 
     if (intersection == CELL_OBJECT_NO_INTERSECTION)
       return;
diff --git a/libs/geometry/covering_utils.hpp b/libs/geometry/covering_utils.hpp
index 2dc57662b..db3f0151b 100644
--- a/libs/geometry/covering_utils.hpp
+++ b/libs/geometry/covering_utils.hpp
@@ -28,27 +28,23 @@ enum CellObjectIntersection
 };
 
 template <class CellId>
-CellObjectIntersection IntersectCellWithLine(CellId const cell, m2::PointD const & a,
-                                             m2::PointD const & b)
+CellObjectIntersection IntersectCellWithLine(CellId const cell, m2::PointD const & a, m2::PointD const & b)
 {
   std::pair<uint32_t, uint32_t> const xy = cell.XY();
   uint32_t const r = cell.Radius();
-  m2::PointD const cellCorners[4] = {
-      m2::PointD(xy.first - r, xy.second - r), m2::PointD(xy.first - r, xy.second + r),
-      m2::PointD(xy.first + r, xy.second + r), m2::PointD(xy.first + r, xy.second - r)};
+  m2::PointD const cellCorners[4] = {m2::PointD(xy.first - r, xy.second - r), m2::PointD(xy.first - r, xy.second + r),
+                                     m2::PointD(xy.first + r, xy.second + r), m2::PointD(xy.first + r, xy.second - r)};
   for (int i = 0; i < 4; ++i)
-  {
     if (m2::SegmentsIntersect(a, b, cellCorners[i], cellCorners[i == 0 ? 3 : i - 1]))
       return CELL_OBJECT_INTERSECT;
-  }
   if (xy.first - r <= a.x && a.x <= xy.first + r && xy.second - r <= a.y && a.y <= xy.second + r)
     return OBJECT_INSIDE_CELL;
   return CELL_OBJECT_NO_INTERSECTION;
 }
 
 template <class CellId>
-CellObjectIntersection IntersectCellWithTriangle(CellId const cell, m2::PointD const & a,
-                                                 m2::PointD const & b, m2::PointD const & c)
+CellObjectIntersection IntersectCellWithTriangle(CellId const cell, m2::PointD const & a, m2::PointD const & b,
+                                                 m2::PointD const & c)
 {
   CellObjectIntersection const i1 = IntersectCellWithLine(cell, a, b);
   if (i1 == CELL_OBJECT_INTERSECT)
@@ -75,8 +71,8 @@ CellObjectIntersection IntersectCellWithTriangle(CellId const cell, m2::PointD c
 }
 
 template <class CellId, class CellIdContainerT, typename IntersectF>
-void CoverObject(IntersectF const & intersect, uint64_t cellPenaltyArea, CellIdContainerT & out,
-                 int cellDepth, CellId cell)
+void CoverObject(IntersectF const & intersect, uint64_t cellPenaltyArea, CellIdContainerT & out, int cellDepth,
+                 CellId cell)
 {
   if (cell.Level() == cellDepth - 1)
   {
@@ -107,13 +103,9 @@ void CoverObject(IntersectF const & intersect, uint64_t cellPenaltyArea, CellIdC
 
   // This criteria is more clear for me. Let's divide if we can save more than cellPenaltyArea.
   if (subdiv.size() > 1 && cellPenaltyArea >= cellArea - subdivArea)
-  {
     out.push_back(cell);
-  }
   else
-  {
     for (size_t i = 0; i < subdiv.size(); ++i)
       out.push_back(subdiv[i]);
-  }
 }
 }  // namespace covering
diff --git a/libs/geometry/diamond_box.hpp b/libs/geometry/diamond_box.hpp
index 544353208..940e7b1ad 100644
--- a/libs/geometry/diamond_box.hpp
+++ b/libs/geometry/diamond_box.hpp
@@ -25,10 +25,7 @@ public:
 
   bool HasPoint(PointD const & p, double eps) const { return HasPoint(p.x, p.y, eps); }
 
-  bool HasPoint(double x, double y, double eps) const
-  {
-    return m_box.HasPoint(x + y, x - y, 2 * eps);
-  }
+  bool HasPoint(double x, double y, double eps) const { return m_box.HasPoint(x + y, x - y, 2 * eps); }
 
   std::vector<m2::PointD> Points() const
   {
@@ -44,10 +41,7 @@ public:
   DECLARE_DEBUG_PRINT(DiamondBox)
 
 private:
-  static m2::PointD ToOrig(m2::PointD const & p)
-  {
-    return m2::PointD(0.5 * (p.x + p.y), 0.5 * (p.x - p.y));
-  }
+  static m2::PointD ToOrig(m2::PointD const & p) { return m2::PointD(0.5 * (p.x + p.y), 0.5 * (p.x - p.y)); }
 
   BoundingBox m_box;
 };
diff --git a/libs/geometry/geometry_tests/algorithm_test.cpp b/libs/geometry/geometry_tests/algorithm_test.cpp
index 30f9f6d77..9a1793a83 100644
--- a/libs/geometry/geometry_tests/algorithm_test.cpp
+++ b/libs/geometry/geometry_tests/algorithm_test.cpp
@@ -11,11 +11,11 @@ namespace algorithm_test
 {
 using namespace std;
 
+using m2::CalculateBoundingBox;
+using m2::CalculatePointOnSurface;
+using m2::CalculatePolyLineCenter;
 using m2::PointD;
 using m2::RectD;
-using m2::CalculatePolyLineCenter;
-using m2::CalculatePointOnSurface;
-using m2::CalculateBoundingBox;
 
 PointD GetPolyLineCenter(vector<PointD> const & points)
 {
@@ -42,52 +42,28 @@ bool PointsAlmostEqual(PointD const & p1, PointD const & p2)
 UNIT_TEST(CalculatePolyLineCenter)
 {
   {
-    vector<PointD> const points {
-      {0, 0},
-      {1, 1},
-      {2, 2}
-    };
+    vector<PointD> const points{{0, 0}, {1, 1}, {2, 2}};
     TEST_EQUAL(GetPolyLineCenter(points), PointD(1, 1), ());
   }
   {
-    vector<PointD> const points {
-      {0, 2},
-      {1, 1},
-      {2, 2}
-    };
+    vector<PointD> const points{{0, 2}, {1, 1}, {2, 2}};
     TEST_EQUAL(GetPolyLineCenter(points), PointD(1, 1), ());
   }
   {
-    vector<PointD> const points {
-      {1, 1},
-      {2, 2},
-      {4, 4},
+    vector<PointD> const points{
+        {1, 1},
+        {2, 2},
+        {4, 4},
     };
     TEST_EQUAL(GetPolyLineCenter(points), PointD(2.5, 2.5), ());
   }
   {
-    vector<PointD> const points {
-      {0, 0},
-      {0, 0},
-      {0, 0},
-      {0, 0},
-      {0, 0},
-      {0, 0},
-      {0, 0}
-    };
+    vector<PointD> const points{{0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}, {0, 0}};
     // Also logs a warning message.
     TEST_EQUAL(GetPolyLineCenter(points), PointD(0, 0), ());
   }
   {
-    vector<PointD> const points {
-      {0, 0},
-      {0, 0},
-      {0, 0},
-      {0, 0.000001},
-      {0, 0.000001},
-      {0, 0.000001},
-      {0, 0.000001}
-    };
+    vector<PointD> const points{{0, 0}, {0, 0}, {0, 0}, {0, 0.000001}, {0, 0.000001}, {0, 0.000001}, {0, 0.000001}};
     // Also logs a warning message.
     TEST(GetPolyLineCenter(points).EqualDxDy(PointD(0, .0000005), 1e-7), ());
   }
@@ -96,28 +72,15 @@ UNIT_TEST(CalculatePolyLineCenter)
 UNIT_TEST(CalculateCenter)
 {
   {
-    vector<PointD> const points {
-      {2, 2}
-    };
-    TEST_EQUAL(GetBoundingBox(points), RectD({2, 2},  {2, 2}), ());
+    vector<PointD> const points{{2, 2}};
+    TEST_EQUAL(GetBoundingBox(points), RectD({2, 2}, {2, 2}), ());
   }
   {
-    vector<PointD> const points {
-      {0, 0},
-      {1, 1},
-      {2, 2}
-    };
+    vector<PointD> const points{{0, 0}, {1, 1}, {2, 2}};
     TEST_EQUAL(GetBoundingBox(points), RectD({0, 0}, {2, 2}), ());
   }
   {
-    vector<PointD> const points {
-      {0, 2},
-      {1, 1},
-      {2, 2},
-      {1, 2},
-      {2, 2},
-      {2, 0}
-    };
+    vector<PointD> const points{{0, 2}, {1, 1}, {2, 2}, {1, 2}, {2, 2}, {2, 0}};
     TEST_EQUAL(GetBoundingBox(points), RectD({0, 0}, {2, 2}), ());
   }
 }
@@ -125,45 +88,30 @@ UNIT_TEST(CalculateCenter)
 UNIT_TEST(CalculatePointOnSurface)
 {
   {
-    vector<PointD> const points {
-      {0, 0},
-      {1, 1},
-      {2, 2}
-    };
+    vector<PointD> const points{{0, 0}, {1, 1}, {2, 2}};
     TEST_EQUAL(GetPointOnSurface(points), PointD(1, 1), ());
   }
   {
-    vector<PointD> const points {
-      {0, 2},
-      {1, 1},
-      {2, 2},
-      {1, 2},
-      {2, 2},
-      {2, 0}
-    };
+    vector<PointD> const points{{0, 2}, {1, 1}, {2, 2}, {1, 2}, {2, 2}, {2, 0}};
     TEST_EQUAL(GetPointOnSurface(points), PointD(1, 1), ());
   }
   {
-    vector<PointD> const points {
-      {0, 0}, {1, 1}, {2, 0},
-      {1, 1}, {2, 0}, {3, 1},  // Center of this triangle is used as a result.
-      {2, 0}, {3, 1}, {4, 0},
+    vector<PointD> const points{
+        {0, 0}, {1, 1}, {2, 0}, {1, 1}, {2, 0}, {3, 1},  // Center of this triangle is used as a result.
+        {2, 0}, {3, 1}, {4, 0},
 
-      {4, 0}, {3, 1}, {4, 2},
-      {3, 1}, {4, 2}, {3, 3},  // Or this.
-      {4, 2}, {3, 3}, {4, 4},
+        {4, 0}, {3, 1}, {4, 2}, {3, 1}, {4, 2}, {3, 3},  // Or this.
+        {4, 2}, {3, 3}, {4, 4},
 
-      {3, 3}, {4, 4}, {2, 4},
-      {3, 3}, {2, 4}, {1, 3},  // Or this.
-      {1, 3}, {2, 4}, {0, 4},
+        {3, 3}, {4, 4}, {2, 4}, {3, 3}, {2, 4}, {1, 3},  // Or this.
+        {1, 3}, {2, 4}, {0, 4},
 
-      {0, 4}, {1, 3}, {0, 2},
-      {1, 3}, {0, 2}, {1, 1},  // Or this
-      {0, 2}, {1, 1}, {0, 0},
+        {0, 4}, {1, 3}, {0, 2}, {1, 3}, {0, 2}, {1, 1},  // Or this
+        {0, 2}, {1, 1}, {0, 0},
     };
     auto const result = GetPointOnSurface(points);
     TEST(PointsAlmostEqual(result, {10.0 / 3.0, 2}) || PointsAlmostEqual(result, {2, 2.0 / 3.0}) ||
-         PointsAlmostEqual(result, {2, 10.0 / 3.0}) || PointsAlmostEqual(result, {2.0 / 3.0, 2}),
+             PointsAlmostEqual(result, {2, 10.0 / 3.0}) || PointsAlmostEqual(result, {2.0 / 3.0, 2}),
          ("result = ", result));
   }
 }
diff --git a/libs/geometry/geometry_tests/angle_test.cpp b/libs/geometry/geometry_tests/angle_test.cpp
index d5f6e47e3..0211e78e6 100644
--- a/libs/geometry/geometry_tests/angle_test.cpp
+++ b/libs/geometry/geometry_tests/angle_test.cpp
@@ -6,20 +6,19 @@
 
 #include "geometry/angles.hpp"
 
-
 using namespace test;
 using math::pi;
 
 UNIT_TEST(Atan)
 {
-  double const h4 = math::pi/4.0;
+  double const h4 = math::pi / 4.0;
 
   TEST(is_equal_atan(1, 1, h4), ());
   TEST(is_equal_atan(-1, 1, math::pi - h4), ());
   TEST(is_equal_atan(-1, -1, h4 - math::pi), ());
   TEST(is_equal_atan(1, -1, -h4), ());
 
-  double const hh = atan(1.0/2.0);
+  double const hh = atan(1.0 / 2.0);
 
   TEST(is_equal_atan(2, 1, hh), ());
   TEST(is_equal_atan(-2, 1, math::pi - hh), ());
@@ -29,36 +28,36 @@ UNIT_TEST(Atan)
 
 UNIT_TEST(Atan2)
 {
-  TEST_ALMOST_EQUAL_ULPS(atan2(1, 0), pi/2.0, ());
-  TEST_ALMOST_EQUAL_ULPS(atan2(-1, 0), -pi/2.0, ());
+  TEST_ALMOST_EQUAL_ULPS(atan2(1, 0), pi / 2.0, ());
+  TEST_ALMOST_EQUAL_ULPS(atan2(-1, 0), -pi / 2.0, ());
   TEST_ALMOST_EQUAL_ULPS(atan2(0, 1), 0.0, ());
   TEST_ALMOST_EQUAL_ULPS(atan2(0, -1), pi, ());
 
-  TEST_ALMOST_EQUAL_ULPS(atan2(1, 1), pi/4.0, ());
+  TEST_ALMOST_EQUAL_ULPS(atan2(1, 1), pi / 4.0, ());
 }
 
 namespace
 {
-  void check_avg(double arr[], size_t n, double v)
-  {
-    ang::AverageCalc calc;
-    for (size_t i = 0; i < n; ++i)
-      calc.Add(arr[i]);
+void check_avg(double arr[], size_t n, double v)
+{
+  ang::AverageCalc calc;
+  for (size_t i = 0; i < n; ++i)
+    calc.Add(arr[i]);
 
-    double const avg = calc.GetAverage();
-    TEST(is_equal_angle(avg, v), (avg, v));
-  }
+  double const avg = calc.GetAverage();
+  TEST(is_equal_angle(avg, v), (avg, v));
 }
+}  // namespace
 
 UNIT_TEST(Average)
 {
   double constexpr eps = 1.0E-3;
 
-  double arr1[] = { math::pi-eps, -math::pi+eps };
+  double arr1[] = {math::pi - eps, -math::pi + eps};
   TEST(is_equal_angle(ang::GetMiddleAngle(arr1[0], arr1[1]), math::pi), ());
   check_avg(arr1, ARRAY_SIZE(arr1), math::pi);
 
-  double arr2[] = { eps, -eps };
+  double arr2[] = {eps, -eps};
   TEST(is_equal_angle(ang::GetMiddleAngle(arr2[0], arr2[1]), 0.0), ());
   check_avg(arr2, ARRAY_SIZE(arr2), 0.0);
 }
@@ -75,47 +74,36 @@ UNIT_TEST(ShortestDistance)
 UNIT_TEST(TwoVectorsAngle)
 {
   double constexpr eps = 1e-10;
-  TEST(AlmostEqualAbs(ang::TwoVectorsAngle(m2::Point<double>(0, 0)  /* p */,
-                                                 m2::Point<double>(0, 1)  /* p1 */,
-                                                 m2::Point<double>(1, 0)) /* p2 */, 3 * math::pi2, eps), ());
-  TEST(AlmostEqualAbs(ang::TwoVectorsAngle(m2::Point<double>(1, 1)  /* p */,
-                                                 m2::Point<double>(2, 2)  /* p1 */,
-                                                 m2::Point<double>(1, 2)) /* p2 */, math::pi4, eps), ());
-  TEST(AlmostEqualAbs(ang::TwoVectorsAngle(m2::Point<double>(0, 0)  /* p */,
-                                                 m2::Point<double>(1, 0)  /* p1 */,
-                                                 m2::Point<double>(0, -1)) /* p2 */, 3 * math::pi2, eps), ());
-  TEST(AlmostEqualAbs(ang::TwoVectorsAngle(m2::Point<double>(0, 0)  /* p */,
-                                                 m2::Point<double>(1, 0)  /* p1 */,
-                                                 m2::Point<double>(-1, 0)) /* p2 */, math::pi, eps), ());
+  TEST(AlmostEqualAbs(ang::TwoVectorsAngle(m2::Point<double>(0, 0) /* p */, m2::Point<double>(0, 1) /* p1 */,
+                                           m2::Point<double>(1, 0)) /* p2 */,
+                      3 * math::pi2, eps),
+       ());
+  TEST(AlmostEqualAbs(ang::TwoVectorsAngle(m2::Point<double>(1, 1) /* p */, m2::Point<double>(2, 2) /* p1 */,
+                                           m2::Point<double>(1, 2)) /* p2 */,
+                      math::pi4, eps),
+       ());
+  TEST(AlmostEqualAbs(ang::TwoVectorsAngle(m2::Point<double>(0, 0) /* p */, m2::Point<double>(1, 0) /* p1 */,
+                                           m2::Point<double>(0, -1)) /* p2 */,
+                      3 * math::pi2, eps),
+       ());
+  TEST(AlmostEqualAbs(ang::TwoVectorsAngle(m2::Point<double>(0, 0) /* p */, m2::Point<double>(1, 0) /* p1 */,
+                                           m2::Point<double>(-1, 0)) /* p2 */,
+                      math::pi, eps),
+       ());
 }
 
 UNIT_TEST(Azimuth)
 {
-  TEST(is_equal_angle(ang::Azimuth(m2::Point<double>(-1, 0),
-                                   m2::Point<double>(0, 1),
-                                   math::pi2), -math::pi4), ());
-  TEST(is_equal_angle(ang::Azimuth(m2::Point<double>(-1, 0),
-                                   m2::Point<double>(0, 1),
-                                   0.0), math::pi4), ());
-  TEST(is_equal_angle(ang::Azimuth(m2::Point<double>(-1, 1),
-                                   m2::Point<double>(1, -1),
-                                   0.0), 3 * math::pi4), ());
-  TEST(is_equal_angle(ang::Azimuth(m2::Point<double>(1, 1),
-                                   m2::Point<double>(0, 1),
-                                   -math::pi2), 0.0), ());
-  TEST(is_equal_angle(ang::Azimuth(m2::Point<double>(1, -1),
-                                   m2::Point<double>(-1, -1),
-                                   math::pi), math::pi2), ());
-  TEST(is_equal_angle(ang::Azimuth(m2::Point<double>(0, 0),
-                                   m2::Point<double>(-1, -1),
-                                   math::pi4), math::pi), ());
-  TEST(is_equal_angle(ang::Azimuth(m2::Point<double>(0.5, -0.5),
-                                   m2::Point<double>(-0.5, 0.5),
-                                   math::pi4), -math::pi2), ());
-  TEST(is_equal_angle(ang::Azimuth(m2::Point<double>(0.1, 0.1),
-                                   m2::Point<double>(0.2, 0.2),
-                                   math::pi4), 0.0), ());
-  TEST(is_equal_angle(ang::Azimuth(m2::Point<double>(0.7, 0.7),
-                                   m2::Point<double>(-0.2, -0.2),
-                                   math::pi2), 3 * math::pi4), ());
+  TEST(is_equal_angle(ang::Azimuth(m2::Point<double>(-1, 0), m2::Point<double>(0, 1), math::pi2), -math::pi4), ());
+  TEST(is_equal_angle(ang::Azimuth(m2::Point<double>(-1, 0), m2::Point<double>(0, 1), 0.0), math::pi4), ());
+  TEST(is_equal_angle(ang::Azimuth(m2::Point<double>(-1, 1), m2::Point<double>(1, -1), 0.0), 3 * math::pi4), ());
+  TEST(is_equal_angle(ang::Azimuth(m2::Point<double>(1, 1), m2::Point<double>(0, 1), -math::pi2), 0.0), ());
+  TEST(is_equal_angle(ang::Azimuth(m2::Point<double>(1, -1), m2::Point<double>(-1, -1), math::pi), math::pi2), ());
+  TEST(is_equal_angle(ang::Azimuth(m2::Point<double>(0, 0), m2::Point<double>(-1, -1), math::pi4), math::pi), ());
+  TEST(is_equal_angle(ang::Azimuth(m2::Point<double>(0.5, -0.5), m2::Point<double>(-0.5, 0.5), math::pi4), -math::pi2),
+       ());
+  TEST(is_equal_angle(ang::Azimuth(m2::Point<double>(0.1, 0.1), m2::Point<double>(0.2, 0.2), math::pi4), 0.0), ());
+  TEST(is_equal_angle(ang::Azimuth(m2::Point<double>(0.7, 0.7), m2::Point<double>(-0.2, -0.2), math::pi2),
+                      3 * math::pi4),
+       ());
 }
diff --git a/libs/geometry/geometry_tests/anyrect_test.cpp b/libs/geometry/geometry_tests/anyrect_test.cpp
index 8146702e6..84e579e43 100644
--- a/libs/geometry/geometry_tests/anyrect_test.cpp
+++ b/libs/geometry/geometry_tests/anyrect_test.cpp
@@ -29,7 +29,7 @@ UNIT_TEST(AnyRect_TestConvertFrom)
   AnyRectD const r(PointD(100, 100), ang::Angle<double>(math::pi / 6), RectD(0, 0, 10, 10));
 
   double const sqrt3 = sqrt(3.0);
-  TEST(r.ConvertFrom(PointD(50, 0)).EqualDxDy(PointD(100 + 50 * sqrt3 / 2 , 100 + 50 * 1 / 2.0), 10e-5), ());
+  TEST(r.ConvertFrom(PointD(50, 0)).EqualDxDy(PointD(100 + 50 * sqrt3 / 2, 100 + 50 * 1 / 2.0), 10e-5), ());
   TEST(r.ConvertTo(PointD(100 + 50 * sqrt3 / 2, 100 + 50 * 1.0 / 2)).EqualDxDy(PointD(50, 0), 10e-5), ());
 }
 
diff --git a/libs/geometry/geometry_tests/area_on_earth_tests.cpp b/libs/geometry/geometry_tests/area_on_earth_tests.cpp
index cd5378ead..489c3c289 100644
--- a/libs/geometry/geometry_tests/area_on_earth_tests.cpp
+++ b/libs/geometry/geometry_tests/area_on_earth_tests.cpp
@@ -11,28 +11,18 @@
 UNIT_TEST(AreaOnEarth_Circle)
 {
   double const kEarthSurfaceArea = 4.0 * math::pi * ms::kEarthRadiusMeters * ms::kEarthRadiusMeters;
-  TEST_ALMOST_EQUAL_ABS(ms::CircleAreaOnEarth(math::pi * ms::kEarthRadiusMeters),
-                        kEarthSurfaceArea,
-                        1e-1, ());
+  TEST_ALMOST_EQUAL_ABS(ms::CircleAreaOnEarth(math::pi * ms::kEarthRadiusMeters), kEarthSurfaceArea, 1e-1, ());
 
-  TEST_ALMOST_EQUAL_ABS(ms::CircleAreaOnEarth(2.0 /* radiusMeters */),
-                        math::pi * 2.0 * 2.0,
-                        1e-2, ());
+  TEST_ALMOST_EQUAL_ABS(ms::CircleAreaOnEarth(2.0 /* radiusMeters */), math::pi * 2.0 * 2.0, 1e-2, ());
 
-  TEST_ALMOST_EQUAL_ABS(ms::CircleAreaOnEarth(2000.0 /* radiusMeters */),
-                        math::pi * 2000.0 * 2000.0,
-                        1.0, ());
+  TEST_ALMOST_EQUAL_ABS(ms::CircleAreaOnEarth(2000.0 /* radiusMeters */), math::pi * 2000.0 * 2000.0, 1.0, ());
 }
 
 UNIT_TEST(AreaOnEarth_ThreePoints)
 {
   double const kEarthSurfaceArea = 4.0 * math::pi * ms::kEarthRadiusMeters * ms::kEarthRadiusMeters;
 
-  TEST_ALMOST_EQUAL_ABS(ms::AreaOnEarth({90.0, 0.0}, {0.0, 0.0}, {0.0, 90.0}),
-                        kEarthSurfaceArea / 8.0,
-                        1e-1, ());
+  TEST_ALMOST_EQUAL_ABS(ms::AreaOnEarth({90.0, 0.0}, {0.0, 0.0}, {0.0, 90.0}), kEarthSurfaceArea / 8.0, 1e-1, ());
 
-  TEST_ALMOST_EQUAL_ABS(ms::AreaOnEarth({90.0, 0.0}, {0.0, 90.0}, {0.0, -90.0}),
-                        kEarthSurfaceArea / 4.0,
-                        1e-1, ());
+  TEST_ALMOST_EQUAL_ABS(ms::AreaOnEarth({90.0, 0.0}, {0.0, 90.0}, {0.0, -90.0}), kEarthSurfaceArea / 4.0, 1e-1, ());
 }
diff --git a/libs/geometry/geometry_tests/bounding_box_tests.cpp b/libs/geometry/geometry_tests/bounding_box_tests.cpp
index 994068fef..b45ba76d9 100644
--- a/libs/geometry/geometry_tests/bounding_box_tests.cpp
+++ b/libs/geometry/geometry_tests/bounding_box_tests.cpp
@@ -30,4 +30,4 @@ UNIT_TEST(BoundingBox_Smoke)
     TEST(bbox.HasPoint(0.5, 0.5), ());
   }
 }
-}  // namespace bounding_box_tests
\ No newline at end of file
+}  // namespace bounding_box_tests
diff --git a/libs/geometry/geometry_tests/calipers_box_tests.cpp b/libs/geometry/geometry_tests/calipers_box_tests.cpp
index b821dccaf..c4fcd90b0 100644
--- a/libs/geometry/geometry_tests/calipers_box_tests.cpp
+++ b/libs/geometry/geometry_tests/calipers_box_tests.cpp
@@ -48,18 +48,16 @@ UNIT_TEST(CalipersBox_Smoke)
     vector<PointD> const points = {
         {PointD(0, 0), PointD(-2, 3), PointD(1, 5), PointD(3, 2), PointD(1, 2), PointD(0, 3)}};
     CalipersBox const cbox(points);
-    TEST_EQUAL(cbox.Points(),
-               (vector<PointD>{{PointD(-2, 3), PointD(0, 0), PointD(3, 2), PointD(1, 5)}}), ());
+    TEST_EQUAL(cbox.Points(), (vector<PointD>{{PointD(-2, 3), PointD(0, 0), PointD(3, 2), PointD(1, 5)}}), ());
     for (auto const & p : points)
       TEST(cbox.HasPoint(p), (p));
     TEST(!cbox.HasPoint(1, 0), ());
   }
 
   {
-    vector<PointD> const points = {{PointD(0, 0), PointD(1, 0), PointD(0, 5), PointD(1, 5),
-                                    PointD(-2, 2), PointD(-2, 3), PointD(3, 2), PointD(3, 3)}};
-    vector<PointD> const expected = {
-      {PointD(-2.5, 2.5), PointD(0.5, -0.5), PointD(3.5, 2.5), PointD(0.5, 5.5)}};
+    vector<PointD> const points = {{PointD(0, 0), PointD(1, 0), PointD(0, 5), PointD(1, 5), PointD(-2, 2),
+                                    PointD(-2, 3), PointD(3, 2), PointD(3, 3)}};
+    vector<PointD> const expected = {{PointD(-2.5, 2.5), PointD(0.5, -0.5), PointD(3.5, 2.5), PointD(0.5, 5.5)}};
     CalipersBox const cbox(points);
     TEST_EQUAL(cbox.Points(), expected, ());
 
diff --git a/libs/geometry/geometry_tests/cellid_test.cpp b/libs/geometry/geometry_tests/cellid_test.cpp
index e9705dcad..30322eb71 100644
--- a/libs/geometry/geometry_tests/cellid_test.cpp
+++ b/libs/geometry/geometry_tests/cellid_test.cpp
@@ -175,7 +175,8 @@ UNIT_TEST(CellId_LessQueueOrder)
     }
     sort(tst.begin(), tst.end(), m2::CellId<4>::LessLevelOrder());
     TEST_EQUAL(tst, exp, ());
-  } while (next_permutation(e.begin(), e.end()));
+  }
+  while (next_permutation(e.begin(), e.end()));
 }
 
 UNIT_TEST(CellId_LessStackOrder)
@@ -199,7 +200,8 @@ UNIT_TEST(CellId_LessStackOrder)
     }
     sort(tst.begin(), tst.end(), m2::CellId<4>::LessPreOrder());
     TEST_EQUAL(tst, exp, ());
-  } while (next_permutation(e.begin(), e.end()));
+  }
+  while (next_permutation(e.begin(), e.end()));
 }
 
 UNIT_TEST(CellId_IsStringValid)
@@ -228,27 +230,8 @@ UNIT_TEST(CellId_ToAndFromInt64ZOrder)
   }
 
   vector<string> const atDepth3 = {
-    "",
-    "0",
-    "00",
-    "01",
-    "02",
-    "03",
-    "1",
-    "10",
-    "11",
-    "12",
-    "13",
-    "2",
-    "20",
-    "21",
-    "22",
-    "23",
-    "3",
-    "30",
-    "31",
-    "32",
-    "33",
+      "",  "0",  "00", "01", "02", "03", "1",  "10", "11", "12", "13",
+      "2", "20", "21", "22", "23", "3",  "30", "31", "32", "33",
   };
 
   for (uint64_t id = 1; id <= atDepth3.size(); ++id)
diff --git a/libs/geometry/geometry_tests/circle_on_earth_tests.cpp b/libs/geometry/geometry_tests/circle_on_earth_tests.cpp
index 7ad906047..3027a95db 100644
--- a/libs/geometry/geometry_tests/circle_on_earth_tests.cpp
+++ b/libs/geometry/geometry_tests/circle_on_earth_tests.cpp
@@ -1,9 +1,9 @@
 #include "testing/testing.hpp"
 
-#include "geometry/distance_on_sphere.hpp"
-#include "geometry/point2d.hpp"
-#include "geometry/mercator.hpp"
 #include "geometry/circle_on_earth.hpp"
+#include "geometry/distance_on_sphere.hpp"
+#include "geometry/mercator.hpp"
+#include "geometry/point2d.hpp"
 
 #include "base/math.hpp"
 
@@ -12,8 +12,7 @@
 
 namespace
 {
-void TestGeometryAlmostEqualAbs(std::vector<m2::PointD> const & geometry,
-                                std::vector<m2::PointD> const & answer,
+void TestGeometryAlmostEqualAbs(std::vector<m2::PointD> const & geometry, std::vector<m2::PointD> const & answer,
                                 double eps)
 {
   TEST_EQUAL(geometry.size(), answer.size(), ());
@@ -22,9 +21,8 @@ void TestGeometryAlmostEqualAbs(std::vector<m2::PointD> const & geometry,
     TEST_ALMOST_EQUAL_ABS(geometry[i], answer[i], eps, ());
 }
 
-void TestGeometryAlmostEqualMeters(std::vector<m2::PointD> const & geometry,
-                                      std::vector<m2::PointD> const & answer,
-                                      double epsMeters)
+void TestGeometryAlmostEqualMeters(std::vector<m2::PointD> const & geometry, std::vector<m2::PointD> const & answer,
+                                   double epsMeters)
 {
   TEST_EQUAL(geometry.size(), answer.size(), ());
 
@@ -37,15 +35,10 @@ UNIT_TEST(CircleOnEarth)
 {
   ms::LatLon const center(90.0 /* lat */, 0.0 /* lon */);
   double const radiusMeters = 2.0 * math::pi * ms::kEarthRadiusMeters / 4.0;
-  auto const geometry =
-      ms::CreateCircleGeometryOnEarth(center, radiusMeters, 90.0 /* angleStepDegree */);
+  auto const geometry = ms::CreateCircleGeometryOnEarth(center, radiusMeters, 90.0 /* angleStepDegree */);
 
-  std::vector<m2::PointD> const result = {
-      mercator::FromLatLon(0.0, 0.0),
-      mercator::FromLatLon(0.0, 90.0),
-      mercator::FromLatLon(0.0, 180.0),
-      mercator::FromLatLon(0.0, -90.0)
-  };
+  std::vector<m2::PointD> const result = {mercator::FromLatLon(0.0, 0.0), mercator::FromLatLon(0.0, 90.0),
+                                          mercator::FromLatLon(0.0, 180.0), mercator::FromLatLon(0.0, -90.0)};
 
   TestGeometryAlmostEqualAbs(geometry, result, 1e-9 /* eps */);
 }
@@ -68,15 +61,13 @@ UNIT_TEST(CircleOnEarthEquator)
   while (angleSumRad < 2 * math::pi)
   {
     angleSumRad += kStepRad;
-    result.emplace_back(point.x + kRadiusMercator * cos(angleRad),
-                        point.y + kRadiusMercator * sin(angleRad));
+    result.emplace_back(point.x + kRadiusMercator * cos(angleRad), point.y + kRadiusMercator * sin(angleRad));
     angleRad += kStepRad;
     if (angleRad > 2 * math::pi)
       angleRad -= 2 * math::pi;
   }
 
-  auto const geometry =
-      ms::CreateCircleGeometryOnEarth(center, kRadiusMeters, kAngleStepDegree);
+  auto const geometry = ms::CreateCircleGeometryOnEarth(center, kRadiusMeters, kAngleStepDegree);
 
   TestGeometryAlmostEqualMeters(geometry, result, 20.0 /* epsMeters */);
 }
diff --git a/libs/geometry/geometry_tests/clipping_test.cpp b/libs/geometry/geometry_tests/clipping_test.cpp
index 182fcc545..64aded060 100644
--- a/libs/geometry/geometry_tests/clipping_test.cpp
+++ b/libs/geometry/geometry_tests/clipping_test.cpp
@@ -72,7 +72,7 @@ UNIT_TEST(Clipping_ClipTriangleByRect)
     result1.push_back(p2);
     result1.push_back(p3);
   });
-  vector<m2::PointD> expectedResult1 = { m2::PointD(0.5, 0.5), m2::PointD(0.5, -0.5), m2::PointD(0.0, 0.0) };
+  vector<m2::PointD> expectedResult1 = {m2::PointD(0.5, 0.5), m2::PointD(0.5, -0.5), m2::PointD(0.0, 0.0)};
   TEST(CompareTriangleLists(result1, expectedResult1), (result1, expectedResult1));
 
   // 1 point inside.
@@ -84,7 +84,7 @@ UNIT_TEST(Clipping_ClipTriangleByRect)
     result2.push_back(p2);
     result2.push_back(p3);
   });
-  vector<m2::PointD> expectedResult2 = { m2::PointD(0.0, 0.0), m2::PointD(1.0, 1.0), m2::PointD(1.0, -1.0) };
+  vector<m2::PointD> expectedResult2 = {m2::PointD(0.0, 0.0), m2::PointD(1.0, 1.0), m2::PointD(1.0, -1.0)};
   TEST(CompareTriangleLists(result2, expectedResult2), (result2, expectedResult2));
 
   // 2 points inside.
@@ -96,8 +96,8 @@ UNIT_TEST(Clipping_ClipTriangleByRect)
     result3.push_back(p2);
     result3.push_back(p3);
   });
-  vector<m2::PointD> expectedResult3 = { m2::PointD(0.0, 0.5), m2::PointD(1.0, 0.25), m2::PointD(1.0, -0.25),
-                                         m2::PointD(0.0, 0.5), m2::PointD(1.0, -0.25), m2::PointD(0.0, -0.5) };
+  vector<m2::PointD> expectedResult3 = {m2::PointD(0.0, 0.5), m2::PointD(1.0, 0.25),  m2::PointD(1.0, -0.25),
+                                        m2::PointD(0.0, 0.5), m2::PointD(1.0, -0.25), m2::PointD(0.0, -0.5)};
   TEST(CompareTriangleLists(result3, expectedResult3), (result3, expectedResult3));
 
   // 2 edges clipping.
@@ -109,9 +109,9 @@ UNIT_TEST(Clipping_ClipTriangleByRect)
     result4.push_back(p2);
     result4.push_back(p3);
   });
-  vector<m2::PointD> expectedResult4 = { m2::PointD(0.0, 0.0), m2::PointD(0.0, 1.0), m2::PointD(0.5, 1.0),
-                                         m2::PointD(0.0, 0.0), m2::PointD(0.5, 1.0), m2::PointD(1.0, 0.5),
-                                         m2::PointD(0.0, 0.0), m2::PointD(1.0, 0.5), m2::PointD(1.0, 0.0) };
+  vector<m2::PointD> expectedResult4 = {m2::PointD(0.0, 0.0), m2::PointD(0.0, 1.0), m2::PointD(0.5, 1.0),
+                                        m2::PointD(0.0, 0.0), m2::PointD(0.5, 1.0), m2::PointD(1.0, 0.5),
+                                        m2::PointD(0.0, 0.0), m2::PointD(1.0, 0.5), m2::PointD(1.0, 0.0)};
   TEST(CompareTriangleLists(result4, expectedResult4), (result4, expectedResult4));
 
   // 3 edges clipping.
@@ -123,10 +123,10 @@ UNIT_TEST(Clipping_ClipTriangleByRect)
     result5.push_back(p2);
     result5.push_back(p3);
   });
-  vector<m2::PointD> expectedResult5 = { m2::PointD(-1.0, 0.5), m2::PointD(-0.5, 1.0), m2::PointD(0.5, 1.0),
-                                         m2::PointD(-1.0, 0.5), m2::PointD(0.5, 1.0), m2::PointD(1.0, 0.5),
-                                         m2::PointD(-1.0, 0.5), m2::PointD(1.0, 0.5), m2::PointD(1.0, 0.0),
-                                         m2::PointD(-1.0, 0.5), m2::PointD(1.0, 0.0), m2::PointD(-1.0, 0.0) };
+  vector<m2::PointD> expectedResult5 = {m2::PointD(-1.0, 0.5), m2::PointD(-0.5, 1.0), m2::PointD(0.5, 1.0),
+                                        m2::PointD(-1.0, 0.5), m2::PointD(0.5, 1.0),  m2::PointD(1.0, 0.5),
+                                        m2::PointD(-1.0, 0.5), m2::PointD(1.0, 0.5),  m2::PointD(1.0, 0.0),
+                                        m2::PointD(-1.0, 0.5), m2::PointD(1.0, 0.0),  m2::PointD(-1.0, 0.0)};
   TEST(CompareTriangleLists(result5, expectedResult5), (result5, expectedResult5));
 
   // Completely outside.
@@ -150,8 +150,8 @@ UNIT_TEST(Clipping_ClipTriangleByRect)
     result7.push_back(p2);
     result7.push_back(p3);
   });
-  vector<m2::PointD> expectedResult7 = { m2::PointD(0.5, 0.5), m2::PointD(0.5, 1.0), m2::PointD(1.0, 1.0),
-                                         m2::PointD(0.5, 0.5), m2::PointD(1.0, 1.0), m2::PointD(1.0, 0.5) };
+  vector<m2::PointD> expectedResult7 = {m2::PointD(0.5, 0.5), m2::PointD(0.5, 1.0), m2::PointD(1.0, 1.0),
+                                        m2::PointD(0.5, 0.5), m2::PointD(1.0, 1.0), m2::PointD(1.0, 0.5)};
   TEST(CompareTriangleLists(result7, expectedResult7), (result7, expectedResult7));
 
   // Triangle covers rect.
@@ -163,8 +163,8 @@ UNIT_TEST(Clipping_ClipTriangleByRect)
     result8.push_back(p2);
     result8.push_back(p3);
   });
-  vector<m2::PointD> expectedResult8 = { m2::PointD(-1.0, 1.0), m2::PointD(1.0, 1.0), m2::PointD(1.0, -1.0),
-                                         m2::PointD(1.0, -1.0), m2::PointD(-1.0, -1.0), m2::PointD(-1.0, 1.0) };
+  vector<m2::PointD> expectedResult8 = {m2::PointD(-1.0, 1.0), m2::PointD(1.0, 1.0),   m2::PointD(1.0, -1.0),
+                                        m2::PointD(1.0, -1.0), m2::PointD(-1.0, -1.0), m2::PointD(-1.0, 1.0)};
   TEST(CompareTriangleLists(result8, expectedResult8), (result8, expectedResult8));
 
   // Clip with an angle of rect.
@@ -176,7 +176,7 @@ UNIT_TEST(Clipping_ClipTriangleByRect)
     result9.push_back(p2);
     result9.push_back(p3);
   });
-  vector<m2::PointD> expectedResult9 = { m2::PointD(0.5, -1.0), m2::PointD(1.0, -0.5), m2::PointD(1.0, -1.0) };
+  vector<m2::PointD> expectedResult9 = {m2::PointD(0.5, -1.0), m2::PointD(1.0, -0.5), m2::PointD(1.0, -1.0)};
   TEST(CompareTriangleLists(result9, expectedResult9), (result9, expectedResult9));
 
   // Clip with an angle of rect.
@@ -188,8 +188,8 @@ UNIT_TEST(Clipping_ClipTriangleByRect)
     result10.push_back(p2);
     result10.push_back(p3);
   });
-  vector<m2::PointD> expectedResult10 = { m2::PointD(-1.0, -0.5), m2::PointD(-0.5, -0.5), m2::PointD(-0.5, -1.0),
-                                          m2::PointD(-1.0, -0.5), m2::PointD(-0.5, -1.0), m2::PointD(-1.0, -1.0) };
+  vector<m2::PointD> expectedResult10 = {m2::PointD(-1.0, -0.5), m2::PointD(-0.5, -0.5), m2::PointD(-0.5, -1.0),
+                                         m2::PointD(-1.0, -0.5), m2::PointD(-0.5, -1.0), m2::PointD(-1.0, -1.0)};
   TEST(CompareTriangleLists(result10, expectedResult10), (result10, expectedResult10));
 
   // Clip with 3 angles of rect.
@@ -201,9 +201,9 @@ UNIT_TEST(Clipping_ClipTriangleByRect)
     result11.push_back(p2);
     result11.push_back(p3);
   });
-  vector<m2::PointD> expectedResult11 = { m2::PointD(0.0, -1.0), m2::PointD(-1.0, 0.0), m2::PointD(-1.0, 1.0),
-                                          m2::PointD(0.0, -1.0), m2::PointD(-1.0, 1.0), m2::PointD(1.0, 1.0),
-                                          m2::PointD(0.0, -1.0), m2::PointD(1.0, 1.0), m2::PointD(1.0, -1.0) };
+  vector<m2::PointD> expectedResult11 = {m2::PointD(0.0, -1.0), m2::PointD(-1.0, 0.0), m2::PointD(-1.0, 1.0),
+                                         m2::PointD(0.0, -1.0), m2::PointD(-1.0, 1.0), m2::PointD(1.0, 1.0),
+                                         m2::PointD(0.0, -1.0), m2::PointD(1.0, 1.0),  m2::PointD(1.0, -1.0)};
   TEST(CompareTriangleLists(result11, expectedResult11), (result11, expectedResult11));
 }
 
@@ -217,7 +217,7 @@ UNIT_TEST(Clipping_ClipSplineByRect)
   spline1->AddPoint(m2::PointD(-2.0, 0.0));
   spline1->AddPoint(m2::PointD(2.0, 1.0));
   vector<m2::SharedSpline> result1 = m2::ClipSplineByRect(r, spline1);
-  vector<m2::SharedSpline> expectedResult1 = ConstructSplineList({ { m2::PointD(-1.0, 0.25), m2::PointD(1.0, 0.75) } });
+  vector<m2::SharedSpline> expectedResult1 = ConstructSplineList({{m2::PointD(-1.0, 0.25), m2::PointD(1.0, 0.75)}});
   TEST(CompareSplineLists(result1, expectedResult1), ());
 
   // Intersection. Several segments.
@@ -228,8 +228,8 @@ UNIT_TEST(Clipping_ClipSplineByRect)
   spline2->AddPoint(m2::PointD(0.5, -2.0));
   spline2->AddPoint(m2::PointD(-0.5, -0.5));
   vector<m2::SharedSpline> result2 = m2::ClipSplineByRect(r, spline2);
-  vector<m2::SharedSpline> expectedResult2 = ConstructSplineList({ { m2::PointD(-1.0, 0.25), m2::PointD(1.0, 0.75) },
-                                                                   { m2::PointD(-0.166666666, -1.0), m2::PointD(-0.5, -0.5) } });
+  vector<m2::SharedSpline> expectedResult2 = ConstructSplineList(
+      {{m2::PointD(-1.0, 0.25), m2::PointD(1.0, 0.75)}, {m2::PointD(-0.166666666, -1.0), m2::PointD(-0.5, -0.5)}});
   TEST(CompareSplineLists(result2, expectedResult2), ());
 
   // Completely outside.
@@ -247,7 +247,7 @@ UNIT_TEST(Clipping_ClipSplineByRect)
   spline4->AddPoint(m2::PointD(-0.5, 0.0));
   spline4->AddPoint(m2::PointD(0.5, 0.5));
   vector<m2::SharedSpline> result4 = m2::ClipSplineByRect(r, spline4);
-  vector<m2::SharedSpline> expectedResult4 = ConstructSplineList({ { m2::PointD(-0.5, 0.0), m2::PointD(0.5, 0.5) } });
+  vector<m2::SharedSpline> expectedResult4 = ConstructSplineList({{m2::PointD(-0.5, 0.0), m2::PointD(0.5, 0.5)}});
   TEST(CompareSplineLists(result4, expectedResult4), ());
 
   // Intersection. Long spline.
@@ -258,8 +258,8 @@ UNIT_TEST(Clipping_ClipSplineByRect)
   spline5->AddPoint(m2::PointD(0.5, 0.5));
   spline5->AddPoint(m2::PointD(2.0, 1.0));
   vector<m2::SharedSpline> result5 = m2::ClipSplineByRect(r, spline5);
-  vector<m2::SharedSpline> expectedResult5 = ConstructSplineList({ { m2::PointD(-1.0, 0.0), m2::PointD(0.0, 0.0),
-                                                                     m2::PointD(0.5, 0.5), m2::PointD(1.0, 0.66666666) } });
+  vector<m2::SharedSpline> expectedResult5 = ConstructSplineList(
+      {{m2::PointD(-1.0, 0.0), m2::PointD(0.0, 0.0), m2::PointD(0.5, 0.5), m2::PointD(1.0, 0.66666666)}});
   TEST(CompareSplineLists(result5, expectedResult5), ());
 
   // Intersection. Several segments.
@@ -271,8 +271,8 @@ UNIT_TEST(Clipping_ClipSplineByRect)
   spline6->AddPoint(m2::PointD(0.0, 1.5));
   spline6->AddPoint(m2::PointD(0.0, 0.0));
   vector<m2::SharedSpline> result6 = m2::ClipSplineByRect(r, spline6);
-  vector<m2::SharedSpline> expectedResult6 = ConstructSplineList({ { m2::PointD(-1.0, 0.0), m2::PointD(-0.5, 1.0) },
-                                                                   { m2::PointD(0.0, 1.0), m2::PointD(0.0, 0.0) } });
+  vector<m2::SharedSpline> expectedResult6 = ConstructSplineList(
+      {{m2::PointD(-1.0, 0.0), m2::PointD(-0.5, 1.0)}, {m2::PointD(0.0, 1.0), m2::PointD(0.0, 0.0)}});
   TEST(CompareSplineLists(result6, expectedResult6), ());
 }
-} // namespace clipping_test
+}  // namespace clipping_test
diff --git a/libs/geometry/geometry_tests/common_test.cpp b/libs/geometry/geometry_tests/common_test.cpp
index 795bff436..ee3bd86ed 100644
--- a/libs/geometry/geometry_tests/common_test.cpp
+++ b/libs/geometry/geometry_tests/common_test.cpp
@@ -12,7 +12,7 @@ UNIT_TEST(Rect)
 {
   m2::RectD rect(0, 0, 500, 300);
 
-  double factor[] = { 0.2, 0.3, 0.5, 0.7, 1.0, 1.3, 1.5, 2.0 };
+  double factor[] = {0.2, 0.3, 0.5, 0.7, 1.0, 1.3, 1.5, 2.0};
   for (size_t i = 0; i < ARRAY_SIZE(factor); ++i)
   {
     m2::RectD r(rect);
@@ -35,5 +35,5 @@ UNIT_TEST(Point)
   TEST(is_equal(start.Move(l, a), m2::PointD(1, 1)), ());
   TEST(is_equal(start.Move(l, math::pi - a), m2::PointD(-1, 1)), ());
   TEST(is_equal(start.Move(l, -math::pi + a), m2::PointD(-1, -1)), ());
-  TEST(is_equal(start.Move(l, - a), m2::PointD(1, -1)), ());
+  TEST(is_equal(start.Move(l, -a), m2::PointD(1, -1)), ());
 }
diff --git a/libs/geometry/geometry_tests/convex_hull_tests.cpp b/libs/geometry/geometry_tests/convex_hull_tests.cpp
index 885807903..a7f34d208 100644
--- a/libs/geometry/geometry_tests/convex_hull_tests.cpp
+++ b/libs/geometry/geometry_tests/convex_hull_tests.cpp
@@ -23,28 +23,24 @@ UNIT_TEST(ConvexHull_Smoke)
   TEST_EQUAL(BuildConvexHull({PointD(0, 0)}), vector<PointD>{PointD(0, 0)}, ());
   TEST_EQUAL(BuildConvexHull({PointD(0, 0), PointD(0, 0)}), vector<PointD>{PointD(0, 0)}, ());
 
-  TEST_EQUAL(BuildConvexHull({PointD(0, 0), PointD(1, 1), PointD(0, 0)}),
-             vector<PointD>({PointD(0, 0), PointD(1, 1)}), ());
+  TEST_EQUAL(BuildConvexHull({PointD(0, 0), PointD(1, 1), PointD(0, 0)}), vector<PointD>({PointD(0, 0), PointD(1, 1)}),
+             ());
 
-  TEST_EQUAL(BuildConvexHull({PointD(0, 0), PointD(1, 1), PointD(2, 2)}),
-             vector<PointD>({PointD(0, 0), PointD(2, 2)}), ());
+  TEST_EQUAL(BuildConvexHull({PointD(0, 0), PointD(1, 1), PointD(2, 2)}), vector<PointD>({PointD(0, 0), PointD(2, 2)}),
+             ());
 
   {
     int const kXMax = 100;
     int const kYMax = 200;
     vector<PointD> points;
     for (int x = 0; x <= kXMax; ++x)
-    {
       for (int y = 0; y <= kYMax; ++y)
         points.emplace_back(x, y);
-    }
-    TEST_EQUAL(BuildConvexHull(points), vector<PointD>({PointD(0, 0), PointD(kXMax, 0),
-                                                        PointD(kXMax, kYMax), PointD(0, kYMax)}),
-               ());
+    TEST_EQUAL(BuildConvexHull(points),
+               vector<PointD>({PointD(0, 0), PointD(kXMax, 0), PointD(kXMax, kYMax), PointD(0, kYMax)}), ());
   }
 
-  TEST_EQUAL(
-      BuildConvexHull({PointD(0, 0), PointD(0, 5), PointD(10, 5), PointD(3, 3), PointD(10, 0)}),
-      vector<PointD>({PointD(0, 0), PointD(10, 0), PointD(10, 5), PointD(0, 5)}), ());
+  TEST_EQUAL(BuildConvexHull({PointD(0, 0), PointD(0, 5), PointD(10, 5), PointD(3, 3), PointD(10, 0)}),
+             vector<PointD>({PointD(0, 0), PointD(10, 0), PointD(10, 5), PointD(0, 5)}), ());
 }
 }  // namespace convex_hull_tests
diff --git a/libs/geometry/geometry_tests/covering_test.cpp b/libs/geometry/geometry_tests/covering_test.cpp
index 9ad59b016..11b8a3d1a 100644
--- a/libs/geometry/geometry_tests/covering_test.cpp
+++ b/libs/geometry/geometry_tests/covering_test.cpp
@@ -20,7 +20,7 @@ using CellId = m2::CellId<5>;
 UNIT_TEST(CoverTriangle_Simple)
 {
   vector<CellId> v;
-  covering::Covering<CellId> c(m2::PointD(3*2, 3*2), m2::PointD(4*2, 12*2), m2::PointD(14*2, 3*2));
+  covering::Covering<CellId> c(m2::PointD(3 * 2, 3 * 2), m2::PointD(4 * 2, 12 * 2), m2::PointD(14 * 2, 3 * 2));
   c.OutputToVector(v);
   vector<CellId> e;
   e.push_back(CellId("03"));
@@ -97,14 +97,10 @@ UNIT_TEST(Covering_Append_Simple)
 UNIT_TEST(IntersectCellWithTriangle_EmptyTriangle)
 {
   m2::PointD pt(27.0, 31.0);
-  TEST_EQUAL(covering::CELL_OBJECT_NO_INTERSECTION,
-             covering::IntersectCellWithTriangle(CellId("0"), pt, pt, pt), ());
-  TEST_EQUAL(covering::CELL_OBJECT_NO_INTERSECTION,
-             covering::IntersectCellWithTriangle(CellId("1"), pt, pt, pt), ());
-  TEST_EQUAL(covering::CELL_OBJECT_NO_INTERSECTION,
-             covering::IntersectCellWithTriangle(CellId("2"), pt, pt, pt), ());
-  TEST_EQUAL(covering::OBJECT_INSIDE_CELL,
-             covering::IntersectCellWithTriangle(CellId("3"), pt, pt, pt), ());
+  TEST_EQUAL(covering::CELL_OBJECT_NO_INTERSECTION, covering::IntersectCellWithTriangle(CellId("0"), pt, pt, pt), ());
+  TEST_EQUAL(covering::CELL_OBJECT_NO_INTERSECTION, covering::IntersectCellWithTriangle(CellId("1"), pt, pt, pt), ());
+  TEST_EQUAL(covering::CELL_OBJECT_NO_INTERSECTION, covering::IntersectCellWithTriangle(CellId("2"), pt, pt, pt), ());
+  TEST_EQUAL(covering::OBJECT_INSIDE_CELL, covering::IntersectCellWithTriangle(CellId("3"), pt, pt, pt), ());
 }
 
 UNIT_TEST(Covering_EmptyTriangle)
diff --git a/libs/geometry/geometry_tests/equality.hpp b/libs/geometry/geometry_tests/equality.hpp
index 02fee741e..e7cb9f58f 100644
--- a/libs/geometry/geometry_tests/equality.hpp
+++ b/libs/geometry/geometry_tests/equality.hpp
@@ -6,48 +6,44 @@
 
 namespace test
 {
-  inline bool is_equal(double a1, double a2)
-  {
-    return (fabs(a1 - a2) < 1.0E-10);
-  }
-
-  inline bool is_equal_atan(double x, double y, double v)
-  {
-    return is_equal(ang::AngleTo(m2::PointD(0, 0), m2::PointD(x, y)), v);
-  }
-
-  inline bool is_equal_angle(double a1, double a2)
-  {
-    double const two_pi = 2.0*math::pi;
-    if (a1 < 0.0) a1 += two_pi;
-    if (a2 < 0.0) a2 += two_pi;
-
-    return is_equal(a1, a2);
-  }
-
-  inline bool is_equal(m2::PointD const & p1, m2::PointD const & p2)
-  {
-    return p1.EqualDxDy(p2, 1.0E-8);
-  }
-
-  inline bool is_equal_center(m2::RectD const & r1, m2::RectD const & r2)
-  {
-    return is_equal(r1.Center(), r2.Center());
-  }
-
-  struct strict_equal
-  {
-    bool operator() (m2::PointD const & p1, m2::PointD const & p2) const
-    {
-      return p1 == p2;
-    }
-  };
-
-  struct epsilon_equal
-  {
-    bool operator() (m2::PointD const & p1, m2::PointD const & p2) const
-    {
-      return is_equal(p1, p2);
-    }
-  };
+inline bool is_equal(double a1, double a2)
+{
+  return (fabs(a1 - a2) < 1.0E-10);
 }
+
+inline bool is_equal_atan(double x, double y, double v)
+{
+  return is_equal(ang::AngleTo(m2::PointD(0, 0), m2::PointD(x, y)), v);
+}
+
+inline bool is_equal_angle(double a1, double a2)
+{
+  double const two_pi = 2.0 * math::pi;
+  if (a1 < 0.0)
+    a1 += two_pi;
+  if (a2 < 0.0)
+    a2 += two_pi;
+
+  return is_equal(a1, a2);
+}
+
+inline bool is_equal(m2::PointD const & p1, m2::PointD const & p2)
+{
+  return p1.EqualDxDy(p2, 1.0E-8);
+}
+
+inline bool is_equal_center(m2::RectD const & r1, m2::RectD const & r2)
+{
+  return is_equal(r1.Center(), r2.Center());
+}
+
+struct strict_equal
+{
+  bool operator()(m2::PointD const & p1, m2::PointD const & p2) const { return p1 == p2; }
+};
+
+struct epsilon_equal
+{
+  bool operator()(m2::PointD const & p1, m2::PointD const & p2) const { return is_equal(p1, p2); }
+};
+}  // namespace test
diff --git a/libs/geometry/geometry_tests/intersect_test.cpp b/libs/geometry/geometry_tests/intersect_test.cpp
index eb1eb8d88..7bc4b6f6c 100644
--- a/libs/geometry/geometry_tests/intersect_test.cpp
+++ b/libs/geometry/geometry_tests/intersect_test.cpp
@@ -2,15 +2,14 @@
 
 #include "testing/testing.hpp"
 
-#include "geometry/rect_intersect.hpp"
 #include "geometry/angles.hpp"
-
+#include "geometry/rect_intersect.hpp"
 
 using namespace test;
 
 namespace
 {
-  typedef m2::PointD P;
+typedef m2::PointD P;
 }
 
 m2::PointD get_point(m2::RectD const & r, int ind)
@@ -21,9 +20,7 @@ m2::PointD get_point(m2::RectD const & r, int ind)
   case 1: return r.LeftTop();
   case 2: return r.RightTop();
   case 3: return r.RightBottom();
-  default:
-    ASSERT ( false, () );
-    return m2::PointD();
+  default: ASSERT(false, ()); return m2::PointD();
   }
 }
 
@@ -31,14 +28,16 @@ void make_section_longer(m2::PointD & p1, m2::PointD & p2, double sm)
 {
   if (p1.x == p2.x)
   {
-    if (p1.y > p2.y) sm = -sm;
+    if (p1.y > p2.y)
+      sm = -sm;
 
     p1.y -= sm;
     p2.y += sm;
   }
   else if (p1.y == p2.y)
   {
-    if (p1.x > p2.x) sm = -sm;
+    if (p1.x > p2.x)
+      sm = -sm;
 
     p1.x -= sm;
     p2.x += sm;
@@ -74,8 +73,8 @@ void check_intersect_boundaries(m2::RectD const & r)
 {
   for (int i = 0; i < 4; ++i)
   {
-    check_full_equal(r, get_point(r, i), get_point(r, i+1), strict_equal());
-    check_inside(r, get_point(r, i), get_point(r, i+1));
+    check_full_equal(r, get_point(r, i), get_point(r, i + 1), strict_equal());
+    check_inside(r, get_point(r, i), get_point(r, i + 1));
   }
 }
 
@@ -83,8 +82,8 @@ void check_intersect_diagonal(m2::RectD const & r)
 {
   for (int i = 0; i < 4; ++i)
   {
-    check_full_equal(r, get_point(r, i), get_point(r, i+2), epsilon_equal());
-    check_inside(r, get_point(r, i), get_point(r, i+2));
+    check_full_equal(r, get_point(r, i), get_point(r, i + 2), epsilon_equal());
+    check_inside(r, get_point(r, i), get_point(r, i + 2));
   }
 }
 
@@ -92,8 +91,8 @@ void check_sides(m2::RectD const & r)
 {
   for (int i = 0; i < 4; ++i)
   {
-    m2::PointD p1 = (get_point(r, i) + get_point(r, i+1)) / 2.0;
-    m2::PointD p2 = (get_point(r, i + 2) + get_point(r, i+3)) / 2.0;
+    m2::PointD p1 = (get_point(r, i) + get_point(r, i + 1)) / 2.0;
+    m2::PointD p2 = (get_point(r, i + 2) + get_point(r, i + 3)) / 2.0;
     check_full_equal(r, p1, p2, strict_equal());
     check_inside(r, p1, p2);
   }
@@ -107,7 +106,7 @@ void check_eps_boundaries(m2::RectD const & r, double eps = 1.0E-6)
   for (int i = 0; i < 4; ++i)
   {
     m2::PointD p1 = get_point(rr, i);
-    m2::PointD p2 = get_point(rr, i+1);
+    m2::PointD p2 = get_point(rr, i + 1);
 
     TEST(!m2::Intersect(r, p1, p2), ());
   }
@@ -116,7 +115,7 @@ void check_eps_boundaries(m2::RectD const & r, double eps = 1.0E-6)
   rr.Inflate(-eps, -eps);
 
   for (int i = 0; i < 4; ++i)
-    check_inside(r, get_point(rr, i), get_point(rr, i+1));
+    check_inside(r, get_point(rr, i), get_point(rr, i + 1));
 }
 
 UNIT_TEST(IntersectRect_Section)
@@ -130,15 +129,15 @@ UNIT_TEST(IntersectRect_Section)
 
 namespace
 {
-  void check_point_in_rect(m2::RectD const & r, m2::PointD const & p)
-  {
-    m2::PointD p1 = p;
-    m2::PointD p2 = p;
+void check_point_in_rect(m2::RectD const & r, m2::PointD const & p)
+{
+  m2::PointD p1 = p;
+  m2::PointD p2 = p;
 
-    TEST(m2::Intersect(r, p1, p2), ());
-    TEST(p == p1 && p == p2, ());
-  }
+  TEST(m2::Intersect(r, p1, p2), ());
+  TEST(p == p1 && p == p2, ());
 }
+}  // namespace
 
 UNIT_TEST(IntersectRect_Point)
 {
@@ -147,14 +146,14 @@ UNIT_TEST(IntersectRect_Point)
     for (int i = 0; i < 4; ++i)
     {
       check_point_in_rect(r, get_point(r, i));
-      check_point_in_rect(r, (get_point(r, i) + get_point(r, i+1)) / 2.0);
+      check_point_in_rect(r, (get_point(r, i) + get_point(r, i + 1)) / 2.0);
     }
   }
 
   {
     m2::RectD r(-1000, -1000, 1000, 1000);
     double const eps = 1.0E-6;
-    P sm[] = { P(-eps, -eps), P(-eps, eps), P(eps, eps), P(eps, -eps) };
+    P sm[] = {P(-eps, -eps), P(-eps, eps), P(eps, eps), P(eps, -eps)};
     for (int i = 0; i < 4; ++i)
     {
       P p1 = get_point(r, i);
diff --git a/libs/geometry/geometry_tests/intersection_score_tests.cpp b/libs/geometry/geometry_tests/intersection_score_tests.cpp
index a518ac7c9..385b8d8fa 100644
--- a/libs/geometry/geometry_tests/intersection_score_tests.cpp
+++ b/libs/geometry/geometry_tests/intersection_score_tests.cpp
@@ -65,8 +65,7 @@ UNIT_TEST(IntersectionScore_TrianglesToPolygon)
     std::vector<m2::PointD> triangiulated2 = {{0.0, 0.0},  {0.0, 9.0}, {10.0, 0.0},
                                               {10.0, 0.0}, {0.0, 9.0}, {10.0, 9.0}};
 
-    auto const score =
-        geometry::GetIntersectionScoreForTriangulated(triangiulated1, triangiulated2);
+    auto const score = geometry::GetIntersectionScoreForTriangulated(triangiulated1, triangiulated2);
 
     TEST(AlmostEqualAbs(score, 0.9, 1e-10), ());
   }
@@ -87,8 +86,7 @@ UNIT_TEST(IntersectionScore_TrianglesToPolygon)
     std::vector<m2::PointD> triangiulated2 = {{10.0, 10.0}, {10.0, 20.0}, {20.0, 10.0},
                                               {20.0, 10.0}, {10.0, 20.0}, {20.0, 20.0}};
 
-    auto const score =
-        geometry::GetIntersectionScoreForTriangulated(triangiulated1, triangiulated2);
+    auto const score = geometry::GetIntersectionScoreForTriangulated(triangiulated1, triangiulated2);
 
     TEST(AlmostEqualAbs(score, 0.0, 1e-10), ());
   }
diff --git a/libs/geometry/geometry_tests/large_polygon.hpp b/libs/geometry/geometry_tests/large_polygon.hpp
index 223914af1..40e5ccbdc 100644
--- a/libs/geometry/geometry_tests/large_polygon.hpp
+++ b/libs/geometry/geometry_tests/large_polygon.hpp
@@ -6,5547 +6,5544 @@ namespace LargePolygon
 typedef m2::PointD P;
 
 // This is actually part of coastline of Australia.
-m2::PointD const kLargePolygon[] =
-{
-  P(136.0397033691406,-12.47166633605957),
-  P(136.0491333007813,-12.45999908447266),
-  P(136.0810852050781,-12.44555473327637),
-  P(136.1497192382813,-12.43555641174316),
-  P(136.1552429199219,-12.43527793884277),
-  P(136.1599731445313,-12.43777847290039),
-  P(136.1624755859375,-12.44194412231446),
-  P(136.1644287109375,-12.45249938964844),
-  P(136.1685791015625,-12.46166610717774),
-  P(136.1724853515625,-12.4647216796875),
-  P(136.1785888671875,-12.46583366394043),
-  P(136.2299499511719,-12.46055603027344),
-  P(136.2352294921875,-12.45888900756836),
-  P(136.2477416992188,-12.45027732849121),
-  P(136.2902526855469,-12.41805553436279),
-  P(136.2972106933594,-12.41055679321289),
-  P(136.34912109375,-12.29111099243164),
-  P(136.365234375,-12.25027847290039),
-  P(136.3663635253906,-12.24416542053223),
-  P(136.365234375,-12.23861122131348),
-  P(136.3588562011719,-12.22583198547363),
-  P(136.3421936035156,-12.2080545425415),
-  P(136.3327331542969,-12.20333290100098),
-  P(136.3194274902344,-12.20277786254883),
-  P(136.3058166503906,-12.20999908447266),
-  P(136.2958068847656,-12.21249961853028),
-  P(136.2849731445313,-12.21444511413574),
-  P(136.2555541992188,-12.21749877929688),
-  P(136.2430114746094,-12.21777725219727),
-  P(136.2366333007813,-12.21666526794434),
-  P(136.1846923828125,-12.19555473327637),
-  P(136.1791381835938,-12.1875),
-  P(136.1771850585938,-12.17027854919434),
-  P(136.1783142089844,-12.16361236572266),
-  P(136.2816467285157,-12.06555557250977),
-  P(136.4510803222656,-11.95416641235352),
-  P(136.5621948242188,-11.93444442749023),
-  P(136.5391540527344,-12.00972366333008),
-  P(136.5985717773438,-12.17666625976563),
-  P(136.605224609375,-12.18944358825684),
-  P(136.6157836914063,-12.20666694641114),
-  P(136.66552734375,-12.27861213684082),
-  P(136.6683044433594,-12.28222274780273),
-  P(136.6769104003906,-12.28777885437012),
-  P(136.6821899414063,-12.28944396972656),
-  P(136.7096862792969,-12.28611183166504),
-  P(136.7152404785156,-12.2852783203125),
-  P(136.7246704101563,-12.28111267089844),
-  P(136.7505493164063,-12.26472282409668),
-  P(136.7574768066406,-12.25861167907715),
-  P(136.7597045898438,-12.25388908386231),
-  P(136.7611083984375,-12.24777793884277),
-  P(136.7599792480469,-12.24222183227539),
-  P(136.7577514648438,-12.2380542755127),
-  P(136.7544250488281,-12.23361015319824),
-  P(136.7441101074219,-12.22333335876465),
-  P(136.7369079589844,-12.21749877929688),
-  P(136.7268981933594,-12.21305465698242),
-  P(136.7210693359375,-12.21416664123535),
-  P(136.7060852050781,-12.21916580200195),
-  P(136.6935729980469,-12.2188892364502),
-  P(136.6888732910156,-12.21638870239258),
-  P(136.6846923828125,-12.20722198486328),
-  P(136.6860961914063,-12.20111083984375),
-  P(136.6921997070313,-12.19277763366699),
-  P(136.69580078125,-12.19027709960938),
-  P(136.7638854980469,-12.17111206054688),
-  P(136.7699890136719,-12.17083358764648),
-  P(136.7838745117188,-12.17250061035156),
-  P(136.871337890625,-12.2188892364502),
-  P(136.8755187988281,-12.22194480895996),
-  P(136.87939453125,-12.22500038146973),
-  P(136.9310913085938,-12.28361129760742),
-  P(136.9802551269531,-12.34166717529297),
-  P(136.9835815429688,-12.34611129760742),
-  P(136.9835815429688,-12.35166454315186),
-  P(136.9819030761719,-12.35694313049316),
-  P(136.9794006347656,-12.36138916015625),
-  P(136.9694213867188,-12.37305545806885),
-  P(136.9574584960938,-12.38166618347168),
-  P(136.8038635253906,-12.47749900817871),
-  P(136.7452392578125,-12.54416656494141),
-  P(136.6435852050781,-12.70416641235352),
-  P(136.6207885742188,-12.82527732849121),
-  P(136.4944152832031,-12.77916717529297),
-  P(136.4843444824219,-12.84594345092773),
-  P(136.5460815429688,-12.9580545425415),
-  P(136.5452575683594,-13.05500030517578),
-  P(136.5283203125,-13.14999961853027),
-  P(136.4766235351563,-13.21222114562988),
-  P(136.4580078125,-13.25250053405762),
-  P(136.4524536132813,-13.22527694702148),
-  P(136.4508056640625,-13.22055435180664),
-  P(136.4460754394531,-13.21805572509766),
-  P(136.4099731445313,-13.23777770996094),
-  P(136.4069213867188,-13.24083328247071),
-  P(136.3677368164063,-13.24722099304199),
-  P(136.3710632324219,-13.1744441986084),
-  P(136.3738403320313,-13.0830545425415),
-  P(136.3741149902344,-13.07027816772461),
-  P(136.3724670410156,-13.06527709960938),
-  P(136.3669128417969,-13.05805587768555),
-  P(136.3627319335938,-13.05500030517578),
-  P(136.3505249023438,-13.05249977111816),
-  P(136.3382873535156,-13.05361175537109),
-  P(136.3283081054688,-13.05694389343262),
-  P(136.32080078125,-13.06305503845215),
-  P(136.3144226074219,-13.0716667175293),
-  P(136.3094177246094,-13.0808334350586),
-  P(136.3063659667969,-13.09138870239258),
-  P(136.3058166503906,-13.09805488586426),
-  P(136.3074645996094,-13.10305404663086),
-  P(136.310791015625,-13.10750007629395),
-  P(136.2861022949219,-13.16638946533203),
-  P(136.2435607910156,-13.20527839660645),
-  P(136.2044067382813,-13.23638725280762),
-  P(136.1960754394531,-13.241943359375),
-  P(136.1624755859375,-13.24333190917969),
-  P(136.1569213867188,-13.24083328247071),
-  P(136.1466369628906,-13.21194458007813),
-  P(136.145263671875,-13.20638847351074),
-  P(136.1449890136719,-13.20083236694336),
-  P(136.1455383300781,-13.19472312927246),
-  P(136.0971984863281,-13.18472290039063),
-  P(135.9955139160156,-13.22360992431641),
-  P(135.9910583496094,-13.22583198547364),
-  P(135.9344177246094,-13.2711124420166),
-  P(135.9269104003906,-13.27750015258789),
-  P(135.9238586425781,-13.2813892364502),
-  P(135.8924865722656,-13.33611106872559),
-  P(135.8905334472656,-13.34083366394043),
-  P(135.8885803222656,-13.35361099243164),
-  P(135.8944396972656,-13.36777687072754),
-  P(135.8977661132813,-13.37138652801514),
-  P(135.9349670410156,-13.39694595336914),
-  P(135.9085998535156,-13.45583343505859),
-  P(135.8641357421875,-13.49166679382324),
-  P(135.8455200195313,-13.57500076293945),
-  P(135.843017578125,-13.58722114562988),
-  P(135.8457946777344,-13.6038875579834),
-  P(135.8821716308594,-13.7197208404541),
-  P(135.8847045898438,-13.72472190856934),
-  P(135.8902587890625,-13.73194313049316),
-  P(135.8988647460938,-13.73833274841309),
-  P(135.9124755859375,-13.74555397033691),
-  P(135.9233093261719,-13.74916553497315),
-  P(135.9302673339844,-13.75027847290039),
-  P(135.9435729980469,-13.75083446502686),
-  P(135.9602355957031,-13.74666595458984),
-  P(135.9785766601563,-13.73861122131348),
-  P(135.9866333007813,-13.73305511474609),
-  P(136.0063781738281,-13.71749877929688),
-  P(136.0097045898438,-13.71361160278321),
-  P(136.0258178710938,-13.68777847290039),
-  P(136.020263671875,-13.76250076293946),
-  P(135.9885559082031,-13.86666488647461),
-  P(135.9246826171875,-13.96194458007813),
-  P(135.9083251953125,-14.0674991607666),
-  P(135.8969421386719,-14.14277839660645),
-  P(135.8735656738281,-14.19222259521484),
-  P(135.8646850585938,-14.19694519042969),
-  P(135.8038635253906,-14.23083305358887),
-  P(135.7813720703125,-14.24361038208008),
-  P(135.7660827636719,-14.25583457946777),
-  P(135.7527770996094,-14.2711124420166),
-  P(135.6230163574219,-14.43527793884277),
-  P(135.6196899414063,-14.43972206115723),
-  P(135.5613708496094,-14.53083419799805),
-  P(135.5513610839844,-14.54916763305664),
-  P(135.54052734375,-14.57361030578613),
-  P(135.5316467285156,-14.60166454315186),
-  P(135.5305480957031,-14.62138652801514),
-  P(135.5316467285156,-14.62694358825684),
-  P(135.5382995605469,-14.64666652679443),
-  P(135.5058288574219,-14.6694450378418),
-  P(135.4132995605469,-14.7294454574585),
-  P(135.3727416992188,-14.7288875579834),
-  P(135.4055480957031,-14.83027839660645),
-  P(135.4122009277344,-14.85083198547363),
-  P(135.4319152832031,-14.89777946472168),
-  P(135.4360961914063,-14.90694427490234),
-  P(135.4460754394531,-14.9244441986084),
-  P(135.4566345214844,-14.94111061096191),
-  P(135.466064453125,-14.95333290100098),
-  P(135.4752502441406,-14.96388816833496),
-  P(135.482177734375,-14.97055435180664),
-  P(135.54052734375,-15.01805686950684),
-  P(135.5452575683594,-15.0205545425415),
-  P(135.5799560546875,-15.0363883972168),
-  P(135.5966186523438,-15.0419454574585),
-  P(135.6085815429688,-15.04500007629395),
-  P(135.6705322265625,-15.06444454193115),
-  P(135.8518981933594,-15.17749977111816),
-  P(135.8821716308594,-15.19694519042969),
-  P(135.9085998535156,-15.2197208404541),
-  P(135.9222106933594,-15.23388862609864),
-  P(135.9369201660157,-15.25361347198487),
-  P(135.9402465820313,-15.25666809082031),
-  P(135.9488525390625,-15.26222229003906),
-  P(136.056640625,-15.31555557250977),
-  P(136.2121887207031,-15.39444541931152),
-  P(136.240234375,-15.41611099243164),
-  P(136.2419128417969,-15.42083358764648),
-  P(136.2527770996094,-15.47527694702148),
-  P(136.26416015625,-15.53444480895996),
-  P(136.2660827636719,-15.54638862609863),
-  P(136.2733154296875,-15.55999946594238),
-  P(136.2791442871094,-15.56722259521484),
-  P(136.2830505371094,-15.57111167907715),
-  P(136.3155212402344,-15.60027694702148),
-  P(136.3244018554688,-15.60583305358887),
-  P(136.341064453125,-15.6119441986084),
-  P(136.4574584960938,-15.65805625915528),
-  P(136.5685729980469,-15.71833229064942),
-  P(136.5982971191406,-15.73916625976563),
-  P(136.6710815429688,-15.80027770996094),
-  P(136.7152404785156,-15.85861015319824),
-  P(136.7196960449219,-15.86777687072754),
-  P(136.7658081054688,-15.90444564819336),
-  P(136.8607788085938,-15.91222190856934),
-  P(136.9205322265625,-15.9063892364502),
-  P(137.0305480957031,-15.91472244262695),
-  P(137.1366577148438,-15.96861076354981),
-  P(137.2760925292969,-16.05638885498047),
-  P(137.2866516113281,-16.06750106811523),
-  P(137.2980346679688,-16.07722473144531),
-  P(137.3060913085938,-16.08333206176758),
-  P(137.3391418457031,-16.10750198364258),
-  P(137.3644104003906,-16.12527847290039),
-  P(137.3738403320313,-16.13000106811523),
-  P(137.4341430664063,-16.15638732910156),
-  P(137.4791259765625,-16.17472076416016),
-  P(137.4974670410156,-16.17805480957031),
-  P(137.5046997070313,-16.17777633666992),
-  P(137.5205383300781,-16.17361068725586),
-  P(137.54052734375,-16.17416763305664),
-  P(137.5469360351563,-16.17555618286133),
-  P(137.5852355957031,-16.18777847290039),
-  P(137.6466369628906,-16.20805358886719),
-  P(137.7308044433594,-16.24610900878906),
-  P(137.7355041503906,-16.24916458129883),
-  P(137.7421875,-16.25583648681641),
-  P(137.7738647460938,-16.30055618286133),
-  P(137.7880249023438,-16.3216667175293),
-  P(137.7949829101563,-16.33361053466797),
-  P(137.8135986328125,-16.36999893188477),
-  P(137.81884765625,-16.37805557250977),
-  P(137.857177734375,-16.43611145019531),
-  P(137.8605041503906,-16.43999862670898),
-  P(137.8866577148438,-16.4566650390625),
-  P(137.9338684082031,-16.49361038208008),
-  P(137.9713439941406,-16.52722549438477),
-  P(138.0002746582031,-16.55472183227539),
-  P(138.066650390625,-16.61472320556641),
-  P(138.1188354492188,-16.65472030639648),
-  P(138.1474914550781,-16.67583084106445),
-  P(138.1902465820313,-16.70499801635742),
-  P(138.1994018554688,-16.70972061157227),
-  P(138.2908020019531,-16.74249649047852),
-  P(138.4352416992188,-16.77888870239258),
-  P(138.4669189453125,-16.7852783203125),
-  P(138.4869079589844,-16.78778076171875),
-  P(138.51416015625,-16.78833389282227),
-  P(138.5896911621094,-16.78361129760742),
-  P(138.6324462890625,-16.77888870239258),
-  P(138.6466369628906,-16.77972412109375),
-  P(138.6549682617188,-16.78499984741211),
-  P(138.6630249023438,-16.79111099243164),
-  P(138.6810913085938,-16.80805587768555),
-  P(138.6935729980469,-16.81722259521484),
-  P(138.8380126953125,-16.8738899230957),
-  P(138.8485717773438,-16.87777709960938),
-  P(138.8677368164063,-16.88055419921875),
-  P(138.9069213867188,-16.88499832153321),
-  P(138.9341430664063,-16.88527679443359),
-  P(138.9810791015625,-16.88916778564453),
-  P(138.9938354492188,-16.89138793945313),
-  P(139.0036010742188,-16.89527893066406),
-  P(139.0174865722656,-16.90305328369141),
-  P(139.0263671875,-16.90916442871094),
-  P(139.0357971191406,-16.92055511474609),
-  P(139.141357421875,-17.07416915893555),
-  P(139.1427612304688,-17.11750030517578),
-  P(139.143310546875,-17.13000106811523),
-  P(139.1447143554688,-17.14166641235352),
-  P(139.1469421386719,-17.15277862548828),
-  P(139.1508178710938,-17.16888809204102),
-  P(139.1627502441406,-17.20305252075195),
-  P(139.2013549804688,-17.28111267089844),
-  P(139.2124633789063,-17.29750061035157),
-  P(139.2191162109375,-17.30500030517578),
-  P(139.2441101074219,-17.32916641235352),
-  P(139.2605285644531,-17.34249877929688),
-  P(139.2835998535156,-17.35416793823242),
-  P(139.3302612304688,-17.36666488647461),
-  P(139.343017578125,-17.36888885498047),
-  P(139.3702392578125,-17.37166595458984),
-  P(139.37744140625,-17.37166595458984),
-  P(139.3955383300781,-17.36972045898438),
-  P(139.4091491699219,-17.36999893188477),
-  P(139.4163818359375,-17.37111282348633),
-  P(139.4274597167969,-17.37444305419922),
-  P(139.4371948242188,-17.37916564941406),
-  P(139.5285949707031,-17.43611145019531),
-  P(139.5327453613281,-17.43916702270508),
-  P(139.5402526855469,-17.44583129882813),
-  P(139.5849609375,-17.48555374145508),
-  P(139.5924682617188,-17.49277496337891),
-  P(139.611083984375,-17.51611328125),
-  P(139.6218872070313,-17.52555847167969),
-  P(139.6361083984375,-17.53250122070313),
-  P(139.647216796875,-17.53666687011719),
-  P(139.6649780273438,-17.54194641113282),
-  P(139.6924743652344,-17.54972457885742),
-  P(139.746337890625,-17.56388854980469),
-  P(139.7802734375,-17.57087707519531),
-  P(139.8141479492188,-17.57527923583984),
-  P(139.8827209472656,-17.61416625976563),
-  P(139.9463500976563,-17.65777587890625),
-  P(139.9574584960938,-17.67416763305664),
-  P(139.9702453613281,-17.68999862670898),
-  P(139.9735717773438,-17.69361114501953),
-  P(139.9819030761719,-17.70027542114258),
-  P(139.9916381835938,-17.70499801635742),
-  P(140.0185852050781,-17.71277618408203),
-  P(140.0513610839844,-17.71805572509766),
-  P(140.0657958984375,-17.71888732910156),
-  P(140.1321716308594,-17.71916580200195),
-  P(140.3743896484375,-17.67972183227539),
-  P(140.3966369628906,-17.67333221435547),
-  P(140.4949645996094,-17.64083480834961),
-  P(140.5341491699219,-17.62444305419922),
-  P(140.6135864257813,-17.58416748046875),
-  P(140.6263427734375,-17.57583236694336),
-  P(140.6377563476563,-17.56694412231445),
-  P(140.6611022949219,-17.54833602905273),
-  P(140.7580261230469,-17.47777557373047),
-  P(140.7810974121094,-17.46527481079102),
-  P(140.79052734375,-17.46166610717773),
-  P(140.8016357421875,-17.45888900756836),
-  P(140.8202514648438,-17.4577751159668),
-  P(140.8313598632813,-17.45360946655273),
-  P(140.8352355957031,-17.45027542114258),
-  P(140.8596801757813,-17.41110992431641),
-  P(140.87744140625,-17.37833404541016),
-  P(140.8858032226563,-17.35972213745117),
-  P(140.9421997070313,-17.1511116027832),
-  P(140.9524536132813,-17.09694671630859),
-  P(140.955810546875,-17.0716667175293),
-  P(140.9552307128906,-17.05916595458984),
-  P(140.9541320800781,-17.05361175537109),
-  P(140.9474792480469,-17.03277969360352),
-  P(140.9469299316406,-17.02666854858398),
-  P(140.9474792480469,-17.01972198486328),
-  P(140.9491271972656,-17.01361465454102),
-  P(140.9569091796875,-17.00111389160156),
-  P(140.9724731445313,-16.98138809204102),
-  P(141.0510864257813,-16.88388824462891),
-  P(141.1758117675781,-16.72888565063477),
-  P(141.1819152832031,-16.72111129760742),
-  P(141.1944274902344,-16.70388793945313),
-  P(141.2119140625,-16.67250061035156),
-  P(141.2166442871094,-16.66305541992188),
-  P(141.2688598632813,-16.54305648803711),
-  P(141.2861022949219,-16.50333404541016),
-  P(141.2955322265625,-16.47638702392578),
-  P(141.2994079589844,-16.45888900756836),
-  P(141.3002624511719,-16.45277786254883),
-  P(141.2999877929688,-16.44638824462891),
-  P(141.2988586425781,-16.44083404541016),
-  P(141.2963562011719,-16.43666458129883),
-  P(141.3155212402344,-16.35750198364258),
-  P(141.326904296875,-16.33194351196289),
-  P(141.3502502441406,-16.25638961791992),
-  P(141.4132995605469,-16.10722351074219),
-  P(141.4252624511719,-16.08388900756836),
-  P(141.4269104003906,-16.07916641235352),
-  P(141.4277648925781,-16.07305526733398),
-  P(141.4263610839844,-16.0613899230957),
-  P(141.4005432128906,-15.90583419799805),
-  P(141.4227600097656,-15.741943359375),
-  P(141.431640625,-15.67916679382324),
-  P(141.435791015625,-15.65500068664551),
-  P(141.4605102539063,-15.53611183166504),
-  P(141.4716186523438,-15.50444602966309),
-  P(141.5716247558594,-15.27861213684082),
-  P(141.6333312988282,-15.15166664123535),
-  P(141.6358032226563,-15.14694595336914),
-  P(141.6658020019531,-15.03611183166504),
-  P(141.6652526855469,-15.01694488525391),
-  P(141.6611022949219,-15.00111198425293),
-  P(141.6563720703125,-14.98583221435547),
-  P(141.6324462890625,-14.93805503845215),
-  P(141.621337890625,-14.91777801513672),
-  P(141.6146850585938,-14.91055679321289),
-  P(141.6096801757813,-14.90139007568359),
-  P(141.6038513183594,-14.88750076293945),
-  P(141.5952453613281,-14.86166572570801),
-  P(141.5677490234375,-14.76889038085938),
-  P(141.5652465820313,-14.75833511352539),
-  P(141.5216369628906,-14.48749923706055),
-  P(141.520263671875,-14.47500038146973),
-  P(141.5210876464844,-14.45527839660645),
-  P(141.5230407714844,-14.44305610656739),
-  P(141.5361022949219,-14.39861106872559),
-  P(141.5452575683594,-14.37360954284668),
-  P(141.5660705566407,-14.32333374023438),
-  P(141.5844116210938,-14.28416633605957),
-  P(141.5882873535156,-14.27527809143066),
-  P(141.5916442871094,-14.26472282409668),
-  P(141.5946960449219,-14.24638652801514),
-  P(141.59912109375,-14.1924991607666),
-  P(141.6002502441406,-14.15305519104004),
-  P(141.5999755859375,-14.13444519042969),
-  P(141.5955200195313,-14.11249923706055),
-  P(141.5905151367188,-14.09638786315918),
-  P(141.5813598632813,-14.07194519042969),
-  P(141.5749816894531,-14.05888938903809),
-  P(141.5516357421875,-14.03222274780274),
-  P(141.5280456542969,-14.01472282409668),
-  P(141.5172119140625,-14.0041675567627),
-  P(141.5019226074219,-13.98555564880371),
-  P(141.4796752929688,-13.95305442810059),
-  P(141.4752502441406,-13.94388961791992),
-  P(141.4716186523438,-13.93416595458985),
-  P(141.4674682617188,-13.91749954223633),
-  P(141.466064453125,-13.90666770935059),
-  P(141.4655151367188,-13.88750076293946),
-  P(141.4657897949219,-13.86833190917969),
-  P(141.4688415527344,-13.82805633544922),
-  P(141.4738464355469,-13.79694557189942),
-  P(141.4796752929688,-13.7672233581543),
-  P(141.4974670410156,-13.68000030517578),
-  P(141.5046997070313,-13.65027809143066),
-  P(141.5152587890625,-13.61277770996094),
-  P(141.520263671875,-13.59583282470703),
-  P(141.5419311523438,-13.53277778625488),
-  P(141.5544128417969,-13.50333404541016),
-  P(141.5591430664063,-13.49388885498047),
-  P(141.5652465820313,-13.4859676361084),
-  P(141.6124572753906,-13.41472244262696),
-  P(141.6805419921875,-13.28916740417481),
-  P(141.685791015625,-13.27277755737305),
-  P(141.6882934570313,-13.26083374023438),
-  P(141.6891479492188,-13.24722099304199),
-  P(141.6885681152344,-13.24083328247071),
-  P(141.6846923828125,-13.22500038146973),
-  P(141.6808166503906,-13.21527671813965),
-  P(141.6783142089844,-13.21111106872559),
-  P(141.6749877929688,-13.20694446563721),
-  P(141.6524658203125,-13.19499969482422),
-  P(141.6491394042969,-13.19138908386231),
-  P(141.6318969726563,-13.16194534301758),
-  P(141.6299438476563,-13.15694427490234),
-  P(141.5855102539063,-13.00139045715332),
-  P(141.5838623046875,-12.98916625976563),
-  P(141.5866394042969,-12.97749900817871),
-  P(141.5938415527344,-12.95750045776367),
-  P(141.6041259765625,-12.93888854980469),
-  P(141.6094055175781,-12.93027877807617),
-  P(141.6288452148438,-12.90805625915528),
-  P(141.6330261230469,-12.90555572509766),
-  P(141.6363830566406,-12.90972328186035),
-  P(141.6410827636719,-12.91277885437012),
-  P(141.6466369628906,-12.91361236572266),
-  P(141.6521911621094,-12.91250038146973),
-  P(141.7030334472656,-12.8761100769043),
-  P(141.7141418457031,-12.8658332824707),
-  P(141.7230224609375,-12.85527801513672),
-  P(141.7477416992188,-12.82444381713867),
-  P(141.7597045898438,-12.80805587768555),
-  P(141.7666625976563,-12.79472446441651),
-  P(141.7705383300781,-12.78472328186035),
-  P(141.7891540527344,-12.72500038146973),
-  P(141.7922058105469,-12.71416664123535),
-  P(141.7952575683594,-12.6966667175293),
-  P(141.798583984375,-12.68583297729492),
-  P(141.8184661865234,-12.69333362579346),
-  P(141.8206481933594,-12.69133377075196),
-  P(141.8241424560547,-12.69099998474121),
-  P(141.8283081054688,-12.69133377075196),
-  P(141.8471374511719,-12.6986665725708),
-  P(141.8499603271484,-12.69999980926514),
-  P(141.8524780273438,-12.70183277130127),
-  P(141.8567962646484,-12.70616722106934),
-  P(141.8584594726563,-12.70866584777832),
-  P(141.865478515625,-12.72533321380615),
-  P(141.8880310058594,-12.75500106811523),
-  P(141.8908081054688,-12.77194595336914),
-  P(141.8927612304688,-12.78972244262696),
-  P(141.8927612304688,-12.8033332824707),
-  P(141.8922119140625,-12.81500053405762),
-  P(141.8899841308594,-12.82777786254883),
-  P(141.8894348144531,-12.84083366394043),
-  P(141.8905334472656,-12.84638786315918),
-  P(141.9288635253906,-12.90333366394043),
-  P(141.9349670410156,-12.91111183166504),
-  P(141.9407958984375,-12.87583160400391),
-  P(141.9410705566406,-12.86916542053223),
-  P(141.939697265625,-12.85750007629395),
-  P(141.8838653564453,-12.70416736602783),
-  P(141.83935546875,-12.67250061035156),
-  P(141.7688598632813,-12.56999969482422),
-  P(141.7277526855469,-12.51277923583984),
-  P(141.7177429199219,-12.49333190917969),
-  P(141.7427368164063,-12.47805595397949),
-  P(141.7508239746094,-12.47249984741211),
-  P(141.7524719238281,-12.46722221374512),
-  P(141.7444152832031,-12.46111106872559),
-  P(141.72802734375,-12.4555549621582),
-  P(141.6669311523438,-12.44722175598145),
-  P(141.661376953125,-12.44833374023438),
-  P(141.6602478027344,-12.45444488525391),
-  P(141.6544189453125,-12.50333404541016),
-  P(141.6530456542969,-12.51611137390137),
-  P(141.6544189453125,-12.52833366394043),
-  P(141.6569213867188,-12.53250122070313),
-  P(141.6619262695313,-12.53499984741211),
-  P(141.6724853515625,-12.53194427490234),
-  P(141.6852416992188,-12.55166625976563),
-  P(141.6321716308594,-12.56805610656738),
-  P(141.6216125488281,-12.57111167907715),
-  P(141.596923828125,-12.56027793884278),
-  P(141.593017578125,-12.5575008392334),
-  P(141.5902404785156,-12.55333328247071),
-  P(141.5894165039063,-12.54694557189941),
-  P(141.5941162109375,-12.53166770935059),
-  P(141.606689453125,-12.50929546356201),
-  P(141.6218872070313,-12.48250007629395),
-  P(141.6602478027344,-12.4013900756836),
-  P(141.6688537597656,-12.38194274902344),
-  P(141.6882934570313,-12.33194446563721),
-  P(141.7530517578125,-12.24666595458984),
-  P(141.7758178710938,-12.21361160278321),
-  P(141.7599792480469,-12.17888832092285),
-  P(141.8016357421875,-12.05888938903809),
-  P(141.8091430664063,-12.0444450378418),
-  P(141.8144226074219,-12.0363883972168),
-  P(141.8258056640625,-12.02000045776367),
-  P(141.8457946777344,-11.99249839782715),
-  P(141.8524475097656,-11.98444366455078),
-  P(141.8707885742188,-11.96833229064941),
-  P(141.8880310058594,-11.95833396911621),
-  P(141.8952026367188,-11.96299934387207),
-  P(141.8993682861328,-11.96316623687744),
-  P(141.9017028808594,-11.96500015258789),
-  P(141.9011993408203,-11.96866607666016),
-  P(141.8928680419922,-11.97716617584229),
-  P(141.8905334472656,-11.98833274841309),
-  P(141.8910827636719,-11.99444389343262),
-  P(141.9169311523438,-12.08888816833496),
-  P(142.0172119140625,-12.07194519042969),
-  P(142.0227661132813,-12.06999969482422),
-  P(142.0258178710938,-12.06694412231445),
-  P(142.0288696289063,-12.06222152709961),
-  P(142.0305480957031,-12.05694389343262),
-  P(142.032470703125,-12.04472446441651),
-  P(142.0327453613281,-12.03861236572266),
-  P(142.0308227539063,-12.03388977050781),
-  P(141.984130859375,-11.98250007629395),
-  P(141.9730224609375,-11.97999954223633),
-  P(141.9610900878906,-11.98222160339356),
-  P(141.9540252685547,-11.97049903869629),
-  P(141.9511871337891,-11.9694995880127),
-  P(141.9491882324219,-11.96733188629151),
-  P(141.9480133056641,-11.96450042724609),
-  P(141.947021484375,-11.96083354949951),
-  P(141.9468688964844,-11.95416641235352),
-  P(141.9466247558594,-11.9244441986084),
-  P(141.9577331542969,-11.85083198547364),
-  P(141.968017578125,-11.81111145019531),
-  P(141.9696960449219,-11.80583381652832),
-  P(142.0558166503906,-11.55027770996094),
-  P(142.0819091796875,-11.48555564880371),
-  P(142.1002502441407,-11.44694519042969),
-  P(142.1216125488281,-11.37805557250977),
-  P(142.1241149902344,-11.36722183227539),
-  P(142.1291198730469,-11.33694458007813),
-  P(142.1588745117188,-11.14944458007813),
-  P(142.1588745117188,-11.12388801574707),
-  P(142.1569213867188,-11.09249877929688),
-  P(142.1535949707031,-11.05694389343262),
-  P(142.1521911621094,-11.04555511474609),
-  P(142.1499938964844,-11.03444480895996),
-  P(142.1480407714844,-11.02833366394043),
-  P(142.1458129882813,-11.01805686950684),
-  P(142.1385803222656,-10.97972106933594),
-  P(142.1377563476563,-10.96749877929688),
-  P(142.1419372558594,-10.95666694641113),
-  P(142.147216796875,-10.94888877868652),
-  P(142.1508178710938,-10.94555473327637),
-  P(142.1741333007813,-10.9283332824707),
-  P(142.1827392578125,-10.92277717590332),
-  P(142.187744140625,-10.92083358764648),
-  P(142.1941223144531,-10.91972160339356),
-  P(142.2002563476563,-10.92000007629395),
-  P(142.2063598632813,-10.92111206054688),
-  P(142.2166442871094,-10.92555618286133),
-  P(142.2227478027344,-10.92666625976563),
-  P(142.3044128417969,-10.90777778625488),
-  P(142.3394165039063,-10.89861106872559),
-  P(142.3466186523438,-10.8922233581543),
-  P(142.3966369628906,-10.82583236694336),
-  P(142.4024658203125,-10.81805610656738),
-  P(142.4111022949219,-10.79861068725586),
-  P(142.4127502441406,-10.79333305358887),
-  P(142.4163818359375,-10.77527809143066),
-  P(142.41748046875,-10.76250076293946),
-  P(142.421630859375,-10.74555397033691),
-  P(142.4263610839844,-10.73638725280762),
-  P(142.4419250488281,-10.71055603027344),
-  P(142.4469299316406,-10.70888900756836),
-  P(142.5188598632813,-10.70666694641113),
-  P(142.556640625,-10.72166633605957),
-  P(142.6088562011719,-10.74444389343262),
-  P(142.6127319335938,-10.74805545806885),
-  P(142.615234375,-10.75222396850586),
-  P(142.6157836914063,-10.75833511352539),
-  P(142.5955200195313,-10.79249954223633),
-  P(142.5861206054688,-10.79756546020508),
-  P(142.5758056640625,-10.80055618286133),
-  P(142.5716247558594,-10.80305480957031),
-  P(142.5224914550781,-10.84916687011719),
-  P(142.5160827636719,-10.85610961914063),
-  P(142.5138854980469,-10.86083221435547),
-  P(142.5127563476563,-10.866943359375),
-  P(142.5027770996094,-10.94861030578613),
-  P(142.506103515625,-10.95222282409668),
-  P(142.5116577148438,-10.95111083984375),
-  P(142.5166625976563,-10.94916725158691),
-  P(142.5216369628906,-10.94611167907715),
-  P(142.5280456542969,-10.94027709960938),
-  P(142.536376953125,-10.92777824401856),
-  P(142.5521850585938,-10.89527893066406),
-  P(142.5560913085938,-10.88527870178223),
-  P(142.5613708496094,-10.87638854980469),
-  P(142.5699768066406,-10.86999893188477),
-  P(142.5741271972656,-10.86833190917969),
-  P(142.5852355957031,-10.86610984802246),
-  P(142.5982971191406,-10.86722183227539),
-  P(142.6038513183594,-10.86888885498047),
-  P(142.61328125,-10.87416553497315),
-  P(142.6205139160156,-10.87972068786621),
-  P(142.7227478027344,-10.96138954162598),
-  P(142.72607421875,-10.96444511413574),
-  P(142.7419128417969,-10.9827766418457),
-  P(142.7477416992188,-10.99027633666992),
-  P(142.7855224609375,-11.07333374023438),
-  P(142.7910766601563,-11.08777809143066),
-  P(142.8041381835938,-11.16722297668457),
-  P(142.8607788085938,-11.36166572570801),
-  P(142.8674621582031,-11.38166618347168),
-  P(142.8680114746094,-11.38777923583985),
-  P(142.8641357421875,-11.39777946472168),
-  P(142.8391418457031,-11.50889015197754),
-  P(142.841064453125,-11.51361274719238),
-  P(142.8563537597656,-11.62305545806885),
-  P(142.8674621582031,-11.71583366394043),
-  P(142.8663635253906,-11.74222183227539),
-  P(142.8605041503906,-11.77805709838867),
-  P(142.8555297851563,-11.81583404541016),
-  P(142.8583068847657,-11.8330545425415),
-  P(142.8602294921875,-11.83777809143067),
-  P(142.865234375,-11.84611129760742),
-  P(142.8718872070313,-11.8538875579834),
-  P(142.8841552734375,-11.86333274841309),
-  P(142.9646911621094,-11.9244441986084),
-  P(142.9727478027344,-11.93027877807617),
-  P(142.9824523925781,-11.93472290039063),
-  P(142.9941101074219,-11.93638801574707),
-  P(143.0080261230469,-11.93694496154785),
-  P(143.0205383300781,-11.93611145019531),
-  P(143.0374755859375,-11.93277740478516),
-  P(143.0588684082031,-11.92000007629395),
-  P(143.0624694824219,-11.9169454574585),
-  P(143.0752563476563,-11.90916633605957),
-  P(143.0899658203125,-11.90361213684082),
-  P(143.1033020019531,-11.90361213684082),
-  P(143.1291198730469,-11.91333389282227),
-  P(143.1338806152344,-11.91638946533203),
-  P(143.1991271972656,-11.98749923706055),
-  P(143.1611022949219,-12.04583358764648),
-  P(143.147216796875,-12.06722259521484),
-  P(143.1021728515625,-12.14027786254883),
-  P(143.0819091796875,-12.22500038146973),
-  P(143.0749816894531,-12.29222297668457),
-  P(143.0730285644531,-12.31861114501953),
-  P(143.0758056640625,-12.3358325958252),
-  P(143.0785827636719,-12.34000015258789),
-  P(143.0824584960938,-12.34277725219727),
-  P(143.1255187988281,-12.34916687011719),
-  P(143.1324462890625,-12.3488883972168),
-  P(143.1460876464844,-12.34249877929688),
-  P(143.1566467285156,-12.3397216796875),
-  P(143.1627502441406,-12.33916664123535),
-  P(143.1752624511719,-12.34166717529297),
-  P(143.19775390625,-12.35416603088379),
-  P(143.2105102539063,-12.36222076416016),
-  P(143.218017578125,-12.36805534362793),
-  P(143.2207946777344,-12.37222099304199),
-  P(143.2224731445313,-12.37694358825684),
-  P(143.2419128417969,-12.38055419921875),
-  P(143.2480163574219,-12.38194274902344),
-  P(143.252197265625,-12.38500022888184),
-  P(143.2749938964844,-12.4102783203125),
-  P(143.2766418457031,-12.41583442687988),
-  P(143.2802734375,-12.4466667175293),
-  P(143.2799682617188,-12.45333290100098),
-  P(143.2755432128906,-12.46277809143067),
-  P(143.272216796875,-12.47360992431641),
-  P(143.2716369628906,-12.48638725280762),
-  P(143.272216796875,-12.49333190917969),
-  P(143.2755432128906,-12.50972366333008),
-  P(143.2774658203125,-12.51472282409668),
-  P(143.2821960449219,-12.52305603027344),
-  P(143.3121948242188,-12.55555534362793),
-  P(143.3197021484375,-12.56194496154785),
-  P(143.3283081054688,-12.56694412231445),
-  P(143.3352355957031,-12.56722259521485),
-  P(143.3535766601563,-12.56527709960938),
-  P(143.3605041503906,-12.56555557250977),
-  P(143.3660583496094,-12.56694412231445),
-  P(143.4111022949219,-12.59194374084473),
-  P(143.4152526855469,-12.59472274780274),
-  P(143.4291381835938,-12.61444473266602),
-  P(143.4308166503906,-12.61916542053223),
-  P(143.4111022949219,-12.67777824401856),
-  P(143.3944396972656,-12.70972347259522),
-  P(143.3885803222656,-12.71777725219727),
-  P(143.3802490234375,-12.73027801513672),
-  P(143.375244140625,-12.73972129821777),
-  P(143.3724670410156,-12.75055694580078),
-  P(143.3674621582031,-12.77416801452637),
-  P(143.3655090332031,-12.7863883972168),
-  P(143.3605041503906,-12.8216667175293),
-  P(143.3599548339844,-12.83444404602051),
-  P(143.3605041503906,-12.84055519104004),
-  P(143.3641357421875,-12.85722160339356),
-  P(143.4027709960938,-12.87027740478516),
-  P(143.4088745117188,-12.87055397033691),
-  P(143.4755249023438,-12.86277770996094),
-  P(143.5044250488281,-12.85916519165039),
-  P(143.51416015625,-12.87916564941406),
-  P(143.5099792480469,-13.00166702270508),
-  P(143.5055541992188,-13.0444450378418),
-  P(143.5030517578125,-13.06833267211914),
-  P(143.5024719238281,-13.07027816772461),
-  P(143.4993896484375,-13.07416725158691),
-  P(143.4977416992188,-13.07972145080567),
-  P(143.498291015625,-13.09860992431641),
-  P(143.5169372558594,-13.26916694641113),
-  P(143.5216369628907,-13.30416679382324),
-  P(143.5260925292969,-13.33305454254151),
-  P(143.5310974121094,-13.34805488586426),
-  P(143.536376953125,-13.35722160339356),
-  P(143.5397033691406,-13.36083221435547),
-  P(143.5472106933594,-13.36777687072754),
-  P(143.5560913085938,-13.37222099304199),
-  P(143.566650390625,-13.3761100769043),
-  P(143.5705261230469,-13.37888717651367),
-  P(143.5913391113281,-13.41861152648926),
-  P(143.5952453613281,-13.4283332824707),
-  P(143.5960693359375,-13.44055557250977),
-  P(143.5866394042969,-13.52611160278321),
-  P(143.5780334472656,-13.5613899230957),
-  P(143.5533142089844,-13.64166831970215),
-  P(143.5299682617188,-13.75055694580078),
-  P(143.5316467285156,-13.76222229003906),
-  P(143.5455322265625,-13.80222320556641),
-  P(143.6013488769531,-13.93611145019531),
-  P(143.6160583496094,-13.9558334350586),
-  P(143.6327209472656,-13.97360992431641),
-  P(143.647216796875,-13.9869441986084),
-  P(143.6627502441406,-13.99860954284668),
-  P(143.6758117675781,-14.00722312927246),
-  P(143.6827392578125,-14.01500129699707),
-  P(143.6846923828125,-14.01916694641113),
-  P(143.6866455078125,-14.02388954162598),
-  P(143.6888732910156,-14.03499984741211),
-  P(143.69384765625,-14.06999969482422),
-  P(143.7030334472656,-14.13944435119629),
-  P(143.7035827636719,-14.14555454254151),
-  P(143.7021789550781,-14.1644458770752),
-  P(143.6983032226563,-14.17527770996094),
-  P(143.6972045898438,-14.18083381652832),
-  P(143.6972045898438,-14.18694496154785),
-  P(143.6983032226563,-14.19388961791992),
-  P(143.7119140625,-14.23944282531738),
-  P(143.7338562011719,-14.31194496154785),
-  P(143.740234375,-14.32638931274414),
-  P(143.7730407714844,-14.39527893066406),
-  P(143.7821960449219,-14.41333389282227),
-  P(143.7977600097656,-14.4325008392334),
-  P(143.8160705566406,-14.44944381713867),
-  P(143.8538513183594,-14.47472190856934),
-  P(143.8669128417969,-14.48194313049316),
-  P(143.8780212402344,-14.48583221435547),
-  P(143.897216796875,-14.48861122131348),
-  P(143.9344177246094,-14.491943359375),
-  P(143.9632873535156,-14.49361038208008),
-  P(144.0008239746094,-14.4908332824707),
-  P(144.01220703125,-14.48833274841309),
-  P(144.0172119140625,-14.48583221435547),
-  P(144.0849609375,-14.44388961791992),
-  P(144.0997009277344,-14.43055534362793),
-  P(144.1535949707031,-14.3799991607666),
-  P(144.3419189453125,-14.30138969421387),
-  P(144.38916015625,-14.28055572509766),
-  P(144.4294128417969,-14.25861167907715),
-  P(144.4407958984375,-14.24944305419922),
-  P(144.4491271972656,-14.23666572570801),
-  P(144.4588623046875,-14.21861076354981),
-  P(144.4657897949219,-14.20444488525391),
-  P(144.4710693359375,-14.18888854980469),
-  P(144.4746704101563,-14.16500091552734),
-  P(144.4777526855469,-14.16111183166504),
-  P(144.5105285644531,-14.16833305358887),
-  P(144.5155334472656,-14.1705551147461),
-  P(144.5188598632813,-14.17388916015625),
-  P(144.5591430664063,-14.22999954223633),
-  P(144.5760803222656,-14.2541675567627),
-  P(144.5794067382813,-14.2591667175293),
-  P(144.5805358886719,-14.26388931274414),
-  P(144.5783081054688,-14.27555656433106),
-  P(144.5680236816406,-14.30111122131348),
-  P(144.5671997070313,-14.30666732788086),
-  P(144.5669250488281,-14.35499954223633),
-  P(144.5669250488281,-14.3619441986084),
-  P(144.6121826171875,-14.48027801513672),
-  P(144.6169128417969,-14.48916625976563),
-  P(144.6746826171875,-14.55583381652832),
-  P(144.6788635253906,-14.55888938903809),
-  P(144.7835998535156,-14.59805488586426),
-  P(144.8252563476563,-14.6130542755127),
-  P(144.8310852050781,-14.61472129821778),
-  P(144.8427429199219,-14.61638832092285),
-  P(144.8569030761719,-14.61666488647461),
-  P(144.8796691894531,-14.6119441986084),
-  P(144.8869323730469,-14.61222076416016),
-  P(144.8924865722656,-14.61361122131348),
-  P(144.897216796875,-14.61583328247071),
-  P(144.9013671875,-14.61888885498047),
-  P(144.9069213867188,-14.62722206115723),
-  P(144.9324645996094,-14.68666553497315),
-  P(144.9321899414063,-14.69277763366699),
-  P(144.9382934570313,-14.72861099243164),
-  P(144.9421997070313,-14.73833274841309),
-  P(144.9516296386719,-14.74944305419922),
-  P(144.955810546875,-14.75222396850586),
-  P(144.9649658203125,-14.75666809082031),
-  P(144.9955139160156,-14.76861190795899),
-  P(145.0758666992188,-14.80317497253418),
-  P(145.2063598632813,-14.86249923706055),
-  P(145.3157958984375,-14.94555473327637),
-  P(145.3163757324219,-14.99749946594238),
-  P(145.3030395507813,-15.01139068603516),
-  P(145.2846984863281,-15.03499984741211),
-  P(145.2713623046875,-15.05638885498047),
-  P(145.2549743652344,-15.08277702331543),
-  P(145.2430114746094,-15.10499954223633),
-  P(145.2352294921875,-15.12527656555176),
-  P(145.2333068847656,-15.14361190795898),
-  P(145.2333068847656,-15.15055656433106),
-  P(145.2346801757813,-15.16888999938965),
-  P(145.2377319335938,-15.19305610656739),
-  P(145.2769165039063,-15.25694465637207),
-  P(145.2855224609375,-15.30444526672364),
-  P(145.2894287109375,-15.33111190795898),
-  P(145.2485656738281,-15.44638824462891),
-  P(145.2777709960938,-15.48944282531738),
-  P(145.3049621582031,-15.55472183227539),
-  P(145.3577270507813,-15.72638893127442),
-  P(145.3613586425781,-15.74222183227539),
-  P(145.3616333007813,-15.76222229003906),
-  P(145.357177734375,-15.81888961791992),
-  P(145.35302734375,-15.88249969482422),
-  P(145.35302734375,-15.88916778564453),
-  P(145.3541259765625,-15.90166664123535),
-  P(145.3566284179688,-15.91333389282227),
-  P(145.3613586425781,-15.92166709899902),
-  P(145.3646850585938,-15.92500114440918),
-  P(145.3738403320313,-15.93027877807617),
-  P(145.3788452148438,-15.93222236633301),
-  P(145.391357421875,-15.94083404541016),
-  P(145.3988647460938,-15.94805526733398),
-  P(145.4099731445313,-15.9647216796875),
-  P(145.4463500976563,-16.03139114379883),
-  P(145.4533081054688,-16.0444450378418),
-  P(145.4621887207031,-16.07694625854492),
-  P(145.4624633789063,-16.08916854858398),
-  P(145.4513549804688,-16.28222274780273),
-  P(145.4410705566406,-16.29277801513672),
-  P(145.4219055175781,-16.31639099121095),
-  P(145.4160766601563,-16.32416915893555),
-  P(145.4107971191406,-16.33305740356445),
-  P(145.4069213867188,-16.34333419799805),
-  P(145.4021911621094,-16.4375),
-  P(145.4019165039063,-16.44444274902344),
-  P(145.4035949707031,-16.46221923828125),
-  P(145.4055480957031,-16.46722030639648),
-  P(145.4130249023438,-16.47416687011719),
-  P(145.4238586425781,-16.47722244262695),
-  P(145.4644165039063,-16.50222396850586),
-  P(145.5094299316406,-16.56111145019531),
-  P(145.6163635253906,-16.6986083984375),
-  P(145.6683044433594,-16.73694229125977),
-  P(145.7283020019531,-16.81639099121094),
-  P(145.7724914550781,-16.88277816772461),
-  P(145.7744140625,-16.88750076293945),
-  P(145.8060913085938,-16.91305541992188),
-  P(145.8366394042969,-16.88750076293945),
-  P(145.841064453125,-16.88499832153321),
-  P(145.9224853515625,-16.86916732788086),
-  P(145.9294128417969,-16.86999893188477),
-  P(145.9352416992188,-16.87138748168945),
-  P(145.9402465820313,-16.87361145019531),
-  P(145.9521789550781,-16.88277816772461),
-  P(145.9583129882813,-16.89055633544922),
-  P(145.9605102539063,-16.89527893066406),
-  P(145.9594116210938,-16.90139007568359),
-  P(145.955810546875,-16.90472030639648),
-  P(145.9508056640625,-16.90666580200195),
-  P(145.9111022949219,-16.97166442871094),
-  P(145.8960876464844,-16.99805450439453),
-  P(145.8785705566406,-17.03805541992188),
-  P(145.8777465820313,-17.04277801513672),
-  P(145.8780212402344,-17.06277847290039),
-  P(145.8821716308594,-17.07250213623047),
-  P(145.8855285644531,-17.07583236694336),
-  P(145.953857421875,-17.1886100769043),
-  P(146.0319213867188,-17.36444473266602),
-  P(146.0855102539063,-17.55278015136719),
-  P(146.1066284179688,-17.68360900878906),
-  P(146.1018981933594,-17.69972229003906),
-  P(146.0860900878906,-17.78722381591797),
-  P(146.1007995605469,-17.88972091674805),
-  P(146.0944213867188,-17.95277786254883),
-  P(146.0935668945313,-17.95888900756836),
-  P(146.0849609375,-17.97861099243164),
-  P(146.0827331542969,-17.98332977294922),
-  P(146.0760803222656,-17.99138641357422),
-  P(146.0724792480469,-17.99388885498047),
-  P(146.0657958984375,-18.00139236450195),
-  P(146.0605163574219,-18.00944519042969),
-  P(146.0372009277344,-18.05083465576172),
-  P(146.0033264160156,-18.13166809082031),
-  P(146.0016479492188,-18.13722229003906),
-  P(146.0008239746094,-18.14999771118164),
-  P(146.0013732910156,-18.17610931396484),
-  P(146.0094299316406,-18.23805236816406),
-  P(146.0216369628906,-18.26639175415039),
-  P(146.0249938964844,-18.27138900756836),
-  P(146.2119140625,-18.49166488647461),
-  P(146.2283020019531,-18.50500106811523),
-  P(146.2572021484375,-18.51111221313477),
-  P(146.2933044433594,-18.51444625854492),
-  P(146.3246765136719,-18.5261116027832),
-  P(146.3333129882813,-18.53194427490234),
-  P(146.3369140625,-18.53666687011719),
-  P(146.3394165039063,-18.54777908325195),
-  P(146.3374633789063,-18.56694412231445),
-  P(146.3321838378906,-18.61750030517578),
-  P(146.3277587890625,-18.6422233581543),
-  P(146.3246765136719,-18.65250015258789),
-  P(146.306640625,-18.67666625976563),
-  P(146.3021850585938,-18.68611145019531),
-  P(146.2908020019531,-18.71055603027344),
-  P(146.2827453613281,-18.73805236816406),
-  P(146.2794189453125,-18.75638961791992),
-  P(146.2680358886719,-18.84389114379883),
-  P(146.268310546875,-18.86333465576172),
-  P(146.2724914550781,-18.87972259521484),
-  P(146.2752685546875,-18.88388824462891),
-  P(146.2813720703125,-18.8922233581543),
-  P(146.3335876464844,-18.95861053466797),
-  P(146.3377380371094,-18.96221923828125),
-  P(146.3796691894531,-18.99805450439453),
-  P(146.423583984375,-19.02555847167969),
-  P(146.4421997070313,-19.06361389160156),
-  P(146.4472045898438,-19.07138824462891),
-  P(146.4513549804688,-19.07472229003906),
-  P(146.5652465820313,-19.14361190795898),
-  P(146.6344299316406,-19.17527770996094),
-  P(146.6544189453125,-19.18388748168946),
-  P(146.6819152832031,-19.19305419921875),
-  P(146.7013549804688,-19.19499969482422),
-  P(146.7066345214844,-19.19305419921875),
-  P(146.7257995605469,-19.18305587768555),
-  P(146.7308044433594,-19.18166732788086),
-  P(146.7438354492188,-19.18000030517578),
-  P(146.7505493164063,-19.18000030517578),
-  P(146.7563781738281,-19.18166732788086),
-  P(146.7613830566406,-19.18444442749023),
-  P(146.768310546875,-19.19055557250977),
-  P(146.814697265625,-19.2430534362793),
-  P(146.8730163574219,-19.29833602905273),
-  P(146.8824462890625,-19.3025016784668),
-  P(146.8938598632813,-19.30555725097656),
-  P(146.9535827636719,-19.30583572387695),
-  P(147.0722045898438,-19.34277725219727),
-  P(147.1177368164063,-19.39027786254883),
-  P(147.1394348144531,-19.40277862548828),
-  P(147.2533264160156,-19.42583084106445),
-  P(147.4213562011719,-19.41611099243164),
-  P(147.4324645996094,-19.41277694702148),
-  P(147.4369201660156,-19.4102783203125),
-  P(147.4472045898438,-19.39249801635742),
-  P(147.4474792480469,-19.38555526733398),
-  P(147.4466247558594,-19.37944412231445),
-  P(147.4447021484375,-19.37333297729492),
-  P(147.4424743652344,-19.36972045898438),
-  P(147.4341430664063,-19.35722351074219),
-  P(147.4219055175781,-19.34194564819336),
-  P(147.395263671875,-19.31833267211914),
-  P(147.393310546875,-19.31361389160156),
-  P(147.3941345214844,-19.30722427368164),
-  P(147.3977661132813,-19.30389022827148),
-  P(147.4049682617188,-19.30416870117188),
-  P(147.4107971191407,-19.30611038208008),
-  P(147.4271850585938,-19.32500076293945),
-  P(147.4563598632813,-19.3658332824707),
-  P(147.4613647460938,-19.37416839599609),
-  P(147.5541381835938,-19.53333282470703),
-  P(147.5563659667969,-19.53750228881836),
-  P(147.5657958984375,-19.57583236694336),
-  P(147.5760803222656,-19.62138748168945),
-  P(147.5877380371094,-19.67638778686524),
-  P(147.594970703125,-19.72722244262695),
-  P(147.6160583496094,-19.76861190795898),
-  P(147.6210632324219,-19.77777862548828),
-  P(147.6677551269531,-19.82305526733398),
-  P(147.6713562011719,-19.82638931274414),
-  P(147.718017578125,-19.83583450317383),
-  P(147.7302551269531,-19.83805465698242),
-  P(147.7710876464844,-19.83527755737305),
-  P(147.7691345214844,-19.81722259521484),
-  P(147.7636108398438,-19.80916595458984),
-  P(147.7608032226563,-19.79805755615234),
-  P(147.754150390625,-19.74499893188477),
-  P(147.7546997070313,-19.71638870239258),
-  P(147.7680358886719,-19.70360946655273),
-  P(147.8152465820313,-19.70805358886719),
-  P(147.8210754394531,-19.70972061157227),
-  P(147.8255310058594,-19.71249771118164),
-  P(147.8485717773438,-19.73249816894531),
-  P(147.8513488769531,-19.73666381835938),
-  P(147.8527526855469,-19.74222183227539),
-  P(147.8518981933594,-19.74916458129883),
-  P(147.85107421875,-19.80666732788086),
-  P(147.8516235351563,-19.82583236694336),
-  P(147.8549499511719,-19.83638763427734),
-  P(147.8621826171875,-19.85083389282227),
-  P(147.8649597167969,-19.85499954223633),
-  P(147.8721923828125,-19.86111068725586),
-  P(147.9119262695313,-19.89389038085938),
-  P(147.9371948242188,-19.90999984741211),
-  P(147.9480285644531,-19.91361236572266),
-  P(147.9655151367188,-19.91777801513672),
-  P(147.97802734375,-19.9194450378418),
-  P(148,-19.9202766418457),
-  P(148.0058288574219,-19.91888809204102),
-  P(148.096923828125,-19.91305541992188),
-  P(148.219970703125,-19.94721984863281),
-  P(148.2697143554688,-19.99110794067383),
-  P(148.3058166503906,-20.03250122070313),
-  P(148.3049621582031,-20.03861236572266),
-  P(148.2991333007813,-20.04000091552734),
-  P(148.2852478027344,-20.04055786132813),
-  P(148.2727661132813,-20.04305648803711),
-  P(148.26416015625,-20.04777908325195),
-  P(148.2647094726563,-20.05416870117188),
-  P(148.2746887207031,-20.07666778564453),
-  P(148.3338623046875,-20.14527893066406),
-  P(148.4019165039063,-20.20138931274414),
-  P(148.411376953125,-20.20694351196289),
-  P(148.4166564941406,-20.20861053466797),
-  P(148.4238586425781,-20.20861053466797),
-  P(148.4619140625,-20.1888885498047),
-  P(148.4663696289063,-20.18638610839844),
-  P(148.4685668945313,-20.18138885498047),
-  P(148.47412109375,-20.1341667175293),
-  P(148.4727478027344,-20.12805557250977),
-  P(148.4707946777344,-20.1238899230957),
-  P(148.4641418457031,-20.11639022827148),
-  P(148.44970703125,-20.10916519165039),
-  P(148.4374694824219,-20.10027694702148),
-  P(148.4352416992188,-20.09555435180664),
-  P(148.4346923828125,-20.08916854858398),
-  P(148.4352416992188,-20.07611083984375),
-  P(148.4405212402344,-20.06666564941406),
-  P(148.4485778808594,-20.0605583190918),
-  P(148.4552307128906,-20.06000137329102),
-  P(148.4610900878906,-20.0613899230957),
-  P(148.522216796875,-20.08805465698242),
-  P(148.5641479492188,-20.12111282348633),
-  P(148.6374816894531,-20.18277740478516),
-  P(148.6730346679688,-20.21611022949219),
-  P(148.7533264160156,-20.23583221435547),
-  P(148.7563781738281,-20.23110961914063),
-  P(148.7608032226563,-20.22888565063477),
-  P(148.7680358886719,-20.22833251953125),
-  P(148.7730407714844,-20.22972106933594),
-  P(148.7774658203125,-20.23249816894531),
-  P(148.7810974121094,-20.23666381835938),
-  P(148.8033142089844,-20.27666854858398),
-  P(148.8355102539063,-20.37777709960938),
-  P(148.8333129882813,-20.383056640625),
-  P(148.8346862792969,-20.38861083984375),
-  P(148.8405151367188,-20.40388870239258),
-  P(148.8577270507813,-20.43611145019531),
-  P(148.8607788085938,-20.44027709960938),
-  P(148.8716125488281,-20.45055389404297),
-  P(148.8765563964844,-20.45236587524414),
-  P(148.8908081054688,-20.45360946655273),
-  P(148.897216796875,-20.45277786254883),
-  P(148.9038696289063,-20.45360946655273),
-  P(148.907470703125,-20.45638656616211),
-  P(148.9355163574219,-20.53277969360352),
-  P(148.9333190917969,-20.53666687011719),
-  P(148.9091491699219,-20.53444671630859),
-  P(148.8785705566406,-20.52138900756836),
-  P(148.8558044433594,-20.508056640625),
-  P(148.8305358886719,-20.47499847412109),
-  P(148.7902526855469,-20.45694351196289),
-  P(148.7410583496094,-20.475830078125),
-  P(148.6672058105469,-20.56166839599609),
-  P(148.691650390625,-20.62444305419922),
-  P(148.72607421875,-20.71166610717774),
-  P(148.7283020019531,-20.71722030639648),
-  P(148.7310791015625,-20.72055435180664),
-  P(148.8497009277344,-20.83611297607422),
-  P(148.9213562011719,-20.883056640625),
-  P(149.0283203125,-20.91860961914063),
-  P(149.1605224609375,-21.01527786254884),
-  P(149.2146911621094,-21.08000183105469),
-  P(149.2049560546875,-21.15444564819336),
-  P(149.2399597167969,-21.27861404418945),
-  P(149.2894287109375,-21.31861114501953),
-  P(149.29443359375,-21.3397216796875),
-  P(149.3285827636719,-21.43777847290039),
-  P(149.3855285644532,-21.53139114379883),
-  P(149.4430236816406,-21.58250045776368),
-  P(149.441650390625,-21.62944412231445),
-  P(149.4305419921875,-21.76555633544922),
-  P(149.4294128417969,-21.77166748046875),
-  P(149.4299621582031,-21.77777862548828),
-  P(149.469970703125,-21.9122200012207),
-  P(149.5208129882813,-22.07722473144531),
-  P(149.5899658203125,-22.23332977294922),
-  P(149.6533203125,-22.31805801391602),
-  P(149.6955261230469,-22.34805679321289),
-  P(149.69775390625,-22.35305404663086),
-  P(149.7027587890625,-22.37416839599609),
-  P(149.7035827636719,-22.38666534423828),
-  P(149.7033081054688,-22.4386100769043),
-  P(149.7013549804688,-22.45083236694336),
-  P(149.6966247558594,-22.46027755737305),
-  P(149.6683044433594,-22.48249816894531),
-  P(149.6622009277344,-22.49055480957031),
-  P(149.6611022949219,-22.49666595458984),
-  P(149.66552734375,-22.49944305419922),
-  P(149.6722106933594,-22.49888610839844),
-  P(149.6771850585938,-22.49721908569336),
-  P(149.7105102539063,-22.47972106933595),
-  P(149.7149658203125,-22.47722244262695),
-  P(149.7363586425781,-22.46333312988281),
-  P(149.7849731445313,-22.42694473266602),
-  P(149.7888793945313,-22.42361068725586),
-  P(149.7919311523438,-22.4194450378418),
-  P(149.7997131347656,-22.3849983215332),
-  P(149.8035888671875,-22.38166809082031),
-  P(149.8083190917969,-22.37916564941406),
-  P(149.814697265625,-22.38000106811523),
-  P(149.8191223144531,-22.38277816772461),
-  P(149.8263549804688,-22.38999938964844),
-  P(149.9621887207031,-22.53694534301758),
-  P(149.9649658203125,-22.54166793823242),
-  P(149.9718933105469,-22.55500030517578),
-  P(149.9771728515625,-22.57083511352539),
-  P(149.9766235351563,-22.58305740356446),
-  P(149.9771728515625,-22.58916854858398),
-  P(150.0274658203125,-22.63805389404297),
-  P(150.0433044433594,-22.65083312988282),
-  P(150.0427551269531,-22.64444351196289),
-  P(150.0413513183594,-22.63916778564454),
-  P(150.01220703125,-22.54583358764648),
-  P(149.9863586425781,-22.47555541992188),
-  P(149.9533081054688,-22.41083145141602),
-  P(149.9213562011719,-22.35333251953125),
-  P(149.9202575683594,-22.3477783203125),
-  P(149.9199829101563,-22.30889129638672),
-  P(149.9227600097656,-22.29777908325195),
-  P(149.9599609375,-22.20833206176758),
-  P(149.9694213867188,-22.1894416809082),
-  P(149.9816284179688,-22.17416763305664),
-  P(149.9969177246094,-22.16166687011719),
-  P(150.002197265625,-22.15888977050781),
-  P(150.0341491699219,-22.14972305297852),
-  P(150.0533142089844,-22.14833450317383),
-  P(150.0771789550781,-22.1613883972168),
-  P(150.080810546875,-22.16416549682617),
-  P(150.1552429199219,-22.27222442626953),
-  P(150.1902465820313,-22.33250045776368),
-  P(150.1907958984375,-22.3386116027832),
-  P(150.1891479492188,-22.34416580200196),
-  P(150.1783142089844,-22.35472106933594),
-  P(150.1830444335938,-22.37055587768555),
-  P(150.1885681152344,-22.37888717651367),
-  P(150.1985778808594,-22.39027786254884),
-  P(150.2021789550781,-22.3930549621582),
-  P(150.2268981933594,-22.40527725219727),
-  P(150.2371826171875,-22.40972137451172),
-  P(150.2430114746094,-22.41110992431641),
-  P(150.3218994140625,-22.4375),
-  P(150.3897094726563,-22.47138595581055),
-  P(150.3991394042969,-22.47638702392578),
-  P(150.4119262695313,-22.49166488647461),
-  P(150.4147033691406,-22.49610900878906),
-  P(150.4246826171875,-22.50722503662109),
-  P(150.4799499511719,-22.53861236572266),
-  P(150.5577392578125,-22.57694625854493),
-  P(150.593017578125,-22.58611297607422),
-  P(150.5374755859375,-22.46500015258789),
-  P(150.5355224609375,-22.46027755737305),
-  P(150.5341491699219,-22.45471954345704),
-  P(150.5308227539063,-22.39583206176758),
-  P(150.5319213867188,-22.38972091674805),
-  P(150.5374755859375,-22.37416839599609),
-  P(150.5527648925781,-22.33638763427734),
-  P(150.5610961914063,-22.3297233581543),
-  P(150.5669250488281,-22.32916641235352),
-  P(150.6271667480469,-22.3397216796875),
-  P(150.6330261230469,-22.34111022949219),
-  P(150.63720703125,-22.34389114379883),
-  P(150.6408081054688,-22.34749984741211),
-  P(150.7055358886719,-22.44138717651367),
-  P(150.689697265625,-22.50111389160156),
-  P(150.6841430664063,-22.5),
-  P(150.6771850585938,-22.49860763549805),
-  P(150.6748352050781,-22.5),
-  P(150.6724853515625,-22.50139236450196),
-  P(150.66943359375,-22.50527954101563),
-  P(150.6677551269531,-22.51083374023438),
-  P(150.6710815429688,-22.52194595336914),
-  P(150.68359375,-22.55361175537109),
-  P(150.7421875,-22.62888717651367),
-  P(150.8191223144531,-22.73194122314454),
-  P(150.8044128417969,-22.78139114379883),
-  P(150.7910766601563,-22.8569450378418),
-  P(150.7713623046875,-22.97610855102539),
-  P(150.7546997070313,-23.11444473266602),
-  P(150.7536010742188,-23.12666702270509),
-  P(150.7563781738281,-23.13777923583984),
-  P(150.7583312988281,-23.14249801635742),
-  P(150.8121948242188,-23.23805236816406),
-  P(150.8049621582031,-23.30777740478516),
-  P(150.7974853515625,-23.33555603027346),
-  P(150.7972106933594,-23.36861038208008),
-  P(150.7977600097656,-23.37472152709961),
-  P(150.8033142089844,-23.38972091674805),
-  P(150.8671875,-23.50500106811523),
-  P(150.9338684082031,-23.55083465576172),
-  P(150.9483032226563,-23.5444450378418),
-  P(150.955810546875,-23.54472351074219),
-  P(151.0130310058594,-23.55194473266602),
-  P(151.0241394042969,-23.55583572387695),
-  P(151.0277709960938,-23.55916595458984),
-  P(151.0414428710938,-23.5826358795166),
-  P(151.0521392822266,-23.61722373962403),
-  P(151.1155090332031,-23.65888977050782),
-  P(151.1249694824219,-23.67138671875),
-  P(151.13916015625,-23.69916534423828),
-  P(151.1455383300781,-23.71361160278321),
-  P(151.1533203125,-23.75278091430664),
-  P(151.1535949707031,-23.77138900756836),
-  P(151.1549682617188,-23.77694702148438),
-  P(151.1599731445313,-23.78583526611328),
-  P(151.1636047363281,-23.78944396972656),
-  P(151.1724853515625,-23.7955551147461),
-  P(151.2294006347656,-23.82638931274414),
-  P(151.2485656738281,-23.82944488525391),
-  P(151.268310546875,-23.82722473144531),
-  P(151.2749938964844,-23.82805633544922),
-  P(151.3182983398438,-23.85833358764648),
-  P(151.3969421386719,-23.94888687133789),
-  P(151.4241333007813,-23.97861099243164),
-  P(151.4549560546875,-23.99860763549805),
-  P(151.4596862792969,-23.99583053588868),
-  P(151.4649658203125,-23.99388885498047),
-  P(151.4716186523438,-23.99333190917971),
-  P(151.4791259765625,-23.99361038208008),
-  P(151.4919128417969,-23.99583053588868),
-  P(151.5000305175781,-24),
-  P(151.5458068847656,-24.02888870239259),
-  P(151.548583984375,-24.03305816650391),
-  P(151.5472106933594,-24.03861236572266),
-  P(151.5447082519531,-24.0433349609375),
-  P(151.5402526855469,-24.04583358764648),
-  P(151.5333251953125,-24.0533332824707),
-  P(151.5294189453125,-24.06361389160157),
-  P(151.5305480957031,-24.07583236694336),
-  P(151.5346984863281,-24.08555603027344),
-  P(151.53857421875,-24.08916854858398),
-  P(151.5480346679688,-24.09472274780274),
-  P(151.55859375,-24.0988883972168),
-  P(151.5652465820313,-24.09833526611329),
-  P(151.5691223144532,-24.09500122070313),
-  P(151.6141357421875,-24.0527801513672),
-  P(151.6144104003907,-24.01028060913086),
-  P(151.6138610839844,-24.00416946411134),
-  P(151.6144104003907,-24),
-  P(151.6146850585938,-23.99805450439454),
-  P(151.6177368164063,-23.99388885498047),
-  P(151.6369323730469,-23.97666549682618),
-  P(151.6427612304688,-23.97805404663086),
-  P(151.6838684082031,-23.98888778686523),
-  P(151.7880249023438,-24.0988883972168),
-  P(151.8807983398438,-24.18111038208008),
-  P(151.9060974121094,-24.19444274902344),
-  P(151.9296875,-24.21416473388672),
-  P(151.9371948242188,-24.22166442871096),
-  P(151.9444274902344,-24.23555374145509),
-  P(151.9802551269531,-24.33139038085938),
-  P(151.982177734375,-24.34305572509766),
-  P(151.9877319335938,-24.3650016784668),
-  P(151.9991149902344,-24.4022216796875),
-  P(152.0036010742188,-24.4124984741211),
-  P(152.0099792480469,-24.42638778686524),
-  P(152.0246887207031,-24.45388793945313),
-  P(152.0524597167969,-24.50361251831055),
-  P(152.1280212402344,-24.60472106933594),
-  P(152.1355285644531,-24.61166763305664),
-  P(152.1994018554688,-24.66444396972657),
-  P(152.2077331542969,-24.66999816894532),
-  P(152.2771911621094,-24.70999908447266),
-  P(152.3116455078125,-24.72694396972657),
-  P(152.3394165039063,-24.73611068725586),
-  P(152.3513488769531,-24.73916625976563),
-  P(152.3844299316406,-24.74277496337891),
-  P(152.3958129882813,-24.74638748168946),
-  P(152.4183044433594,-24.76028060913086),
-  P(152.4421997070313,-24.78111267089844),
-  P(152.4488525390625,-24.78805541992188),
-  P(152.468017578125,-24.81222152709961),
-  P(152.4849548339844,-24.83722305297852),
-  P(152.490234375,-24.84694671630859),
-  P(152.4966125488281,-24.86805725097657),
-  P(152.4988403320313,-24.88666534423828),
-  P(152.4977416992188,-24.90583419799805),
-  P(152.4960632324219,-24.91749954223633),
-  P(152.4935607910156,-24.93583297729493),
-  P(152.4960632324219,-24.96749877929688),
-  P(152.4991149902344,-24.97777557373047),
-  P(152.5077514648438,-24.99777603149414),
-  P(152.5260925292969,-25.03555679321289),
-  P(152.5610961914063,-25.08750152587891),
-  P(152.6658020019531,-25.24277496337891),
-  P(152.6771850585938,-25.24749755859375),
-  P(152.7224731445313,-25.26111221313477),
-  P(152.8055419921875,-25.28222274780274),
-  P(152.8124694824219,-25.28305816650391),
-  P(152.8541259765625,-25.28222274780274),
-  P(152.9002685546875,-25.2852783203125),
-  P(152.9063720703125,-25.28666687011721),
-  P(152.9107971191407,-25.28944396972656),
-  P(152.9138793945313,-25.29416656494141),
-  P(152.9466247558594,-25.43638610839845),
-  P(152.9366455078125,-25.52333450317384),
-  P(152.9319152832031,-25.5261116027832),
-  P(152.8944396972656,-25.5605583190918),
-  P(152.8922119140625,-25.56416702270508),
-  P(152.8985900878906,-25.67916488647461),
-  P(152.9172058105469,-25.73166656494141),
-  P(152.9238586425781,-25.73916625976563),
-  P(152.9449768066406,-25.76194763183594),
-  P(152.9494018554688,-25.76472473144531),
-  P(152.9563598632813,-25.76527786254883),
-  P(152.9632873535156,-25.76472473144531),
-  P(152.969970703125,-25.76555633544922),
-  P(152.97607421875,-25.76694488525391),
-  P(152.9813537597656,-25.76916885375977),
-  P(152.986083984375,-25.77166748046875),
-  P(152.9896850585938,-25.7752799987793),
-  P(153.0219116210938,-25.83444595336914),
-  P(153.0241394042969,-25.83916854858399),
-  P(153.0374755859375,-25.88750076293946),
-  P(153.0382995605469,-25.89361190795898),
-  P(153.064697265625,-25.90055465698243),
-  P(153.0997009277344,-25.90972137451172),
-  P(153.1819152832031,-25.94944381713867),
-  P(153.1855163574219,-25.97333145141602),
-  P(153.1374816894531,-26.06777954101563),
-  P(153.1005249023438,-26.17916488647461),
-  P(153.0905151367188,-26.21833038330079),
-  P(153.0730285644531,-26.29888916015625),
-  P(153.0710754394531,-26.31805801391602),
-  P(153.0746765136719,-26.34222412109375),
-  P(153.0777587890625,-26.35305404663086),
-  P(153.0816345214844,-26.36361312866211),
-  P(153.0874633789063,-26.37250137329102),
-  P(153.0960693359375,-26.37861251831055),
-  P(153.1041259765625,-26.50638961791992),
-  P(153.1105041503906,-26.65583419799805),
-  P(153.1119079589844,-26.66694259643555),
-  P(153.1171875,-26.67583084106446),
-  P(153.1210632324219,-26.67916488647461),
-  P(153.1310729980469,-26.68416595458984),
-  P(153.1430358886719,-26.72999954223633),
-  P(153.1558227539063,-26.95527648925781),
-  P(153.1571960449219,-27.08277893066407),
-  P(153.10302734375,-27.0966682434082),
-  P(153.0882873535156,-27.10416793823242),
-  P(153.0760803222656,-27.11444473266602),
-  P(153.0649719238281,-27.12527847290039),
-  P(153.0558166503906,-27.13777923583985),
-  P(153.0399780273438,-27.16500091552734),
-  P(153.0352478027344,-27.17388916015625),
-  P(153.0338745117188,-27.179443359375),
-  P(153.0574645996094,-27.30083465576172),
-  P(153.0619201660156,-27.3113899230957),
-  P(153.0641479492188,-27.31527709960938),
-  P(153.0758056640625,-27.32583236694336),
-  P(153.0902404785156,-27.33333206176759),
-  P(153.1746826171875,-27.38888931274414),
-  P(153.256103515625,-27.47972106933594),
-  P(153.2660827636719,-27.49777603149414),
-  P(153.2705383300781,-27.5072250366211),
-  P(153.3046875,-27.60499954223634),
-  P(153.3121948242188,-27.64611053466797),
-  P(153.3174743652344,-27.66888809204102),
-  P(153.3199768066406,-27.67361068725586),
-  P(153.37744140625,-27.75278091430664),
-  P(153.4005432128906,-27.77277755737305),
-  P(153.4060974121094,-27.78166961669922),
-  P(153.4327392578125,-27.84833526611328),
-  P(153.4308166503906,-27.9113883972168),
-  P(153.4169311523438,-27.91611099243164),
-  P(153.4102478027344,-27.98194122314454),
-  P(153.4480285644531,-28.06999969482422),
-  P(153.4524536132813,-28.0797233581543),
-  P(153.4602355957031,-28.09277725219727),
-  P(153.4871826171875,-28.13750076293945),
-  P(153.4910583496094,-28.14083480834961),
-  P(153.5059509277344,-28.15011215209961),
-  P(153.5197143554688,-28.17055511474609),
-  P(153.5227661132813,-28.17444229125977),
-  P(153.5266418457031,-28.17805480957032),
-  P(153.5361022949219,-28.18360900878906),
-  P(153.5430297851563,-28.18416595458985),
-  P(153.5508117675781,-28.18360900878906),
-  P(153.5619201660156,-28.18083190917971),
-  P(153.5671997070313,-28.18360900878906),
-  P(153.5763549804688,-28.20277786254883),
-  P(153.578857421875,-28.21305465698242),
-  P(153.591064453125,-28.27083587646484),
-  P(153.5919189453125,-28.27694702148438),
-  P(153.5852355957031,-28.3558349609375),
-  P(153.5835876464844,-28.36833190917971),
-  P(153.578857421875,-28.39833450317384),
-  P(153.5749816894531,-28.41555404663086),
-  P(153.5694274902344,-28.4375),
-  P(153.5621948242188,-28.45944213867188),
-  P(153.5596923828125,-28.48472213745117),
-  P(153.5596923828125,-28.49860763549805),
-  P(153.562744140625,-28.53000259399414),
-  P(153.5694274902344,-28.57805633544922),
-  P(153.5718994140625,-28.5897216796875),
-  P(153.5758056640625,-28.60083389282227),
-  P(153.5810852050781,-28.61027908325195),
-  P(153.5874633789063,-28.61805725097656),
-  P(153.5952453613281,-28.62555694580078),
-  P(153.6069030761719,-28.6349983215332),
-  P(153.6202392578125,-28.65083312988282),
-  P(153.6255187988281,-28.65999984741211),
-  P(153.6255187988281,-28.66666412353516),
-  P(153.609130859375,-28.85111236572266),
-  P(153.6083068847656,-28.85722351074221),
-  P(153.6046752929688,-28.86777877807617),
-  P(153.6018981933594,-28.87250137329102),
-  P(153.5846862792969,-28.8922233581543),
-  P(153.5735778808594,-28.90250015258789),
-  P(153.5619201660156,-28.91277694702148),
-  P(153.5327453613281,-28.93527603149414),
-  P(153.5185852050781,-28.95027542114258),
-  P(153.4919128417969,-28.98249816894531),
-  P(153.4791259765625,-28.99833297729492),
-  P(153.4727478027344,-29.00638961791992),
-  P(153.4516296386719,-29.03666687011719),
-  P(153.4444274902344,-29.05083465576172),
-  P(153.4341430664063,-29.07555770874023),
-  P(153.3560791015625,-29.27194595336914),
-  P(153.3480224609375,-29.29249954223633),
-  P(153.3424682617188,-29.30833435058596),
-  P(153.3391418457031,-29.31944656372071),
-  P(153.3360900878906,-29.33722305297852),
-  P(153.3366394042969,-29.34333419799805),
-  P(153.3396911621094,-29.35499954223633),
-  P(153.3413391113281,-29.35972213745117),
-  P(153.3474731445313,-29.36805725097656),
-  P(153.3513488769531,-29.37166595458984),
-  P(153.3560791015625,-29.3741683959961),
-  P(153.3638610839844,-29.38111114501953),
-  P(153.3671875,-29.38527679443359),
-  P(153.3655090332031,-29.39833450317383),
-  P(153.3466186523438,-29.52916717529297),
-  P(153.2922058105469,-29.78139114379883),
-  P(153.2538757324219,-29.95249938964844),
-  P(153.2049560546875,-30.11472320556641),
-  P(153.1702575683594,-30.20499801635742),
-  P(153.1380310058594,-30.25889205932617),
-  P(153.0341491699219,-30.50861358642578),
-  P(153.0310974121094,-30.51944732666016),
-  P(153.0185852050781,-30.56861114501954),
-  P(153.0133056640625,-30.60916519165039),
-  P(153.0052490234375,-30.72083282470703),
-  P(153.0038757324219,-30.77750015258789),
-  P(153.0036010742188,-30.79138946533204),
-  P(153.0036010742188,-30.80444717407227),
-  P(153.004150390625,-30.82277679443359),
-  P(153.0055541992188,-30.83527755737305),
-  P(153.0180358886719,-30.87833404541016),
-  P(153.0197143554688,-30.88388824462891),
-  P(153.0244140625,-30.88666534423828),
-  P(153.0474853515625,-30.88888931274414),
-  P(153.066650390625,-30.88638687133789),
-  P(153.0749816894531,-30.9486083984375),
-  P(153.0524597167969,-31.03499984741211),
-  P(152.9730224609375,-31.2433319091797),
-  P(152.9541320800781,-31.35944366455078),
-  P(152.8863830566406,-31.53916931152344),
-  P(152.8616333007813,-31.60666656494141),
-  P(152.8488464355469,-31.65666580200195),
-  P(152.8283081054688,-31.70444488525391),
-  P(152.76025390625,-31.8105583190918),
-  P(152.6844177246094,-31.88999938964844),
-  P(152.6647033691406,-31.90750122070313),
-  P(152.6499938964844,-31.92250061035156),
-  P(152.6246643066406,-31.94888687133789),
-  P(152.5935668945313,-31.98416519165039),
-  P(152.5574645996094,-32.02916717529297),
-  P(152.5158081054688,-32.11888885498047),
-  P(152.5116577148438,-32.12916564941406),
-  P(152.5099792480469,-32.13472747802734),
-  P(152.5099792480469,-32.14138793945313),
-  P(152.5413513183594,-32.26361846923828),
-  P(152.5296936035156,-32.40361022949219),
-  P(152.3969421386719,-32.50083923339844),
-  P(152.3771667480469,-32.51139068603516),
-  P(152.3558044433594,-32.52833557128906),
-  P(152.3277587890625,-32.55278015136719),
-  P(152.2808227539063,-32.60139465332031),
-  P(152.2274475097656,-32.63138580322266),
-  P(152.12744140625,-32.68222045898439),
-  P(152.1194152832031,-32.72527313232423),
-  P(152.1447143554688,-32.77055358886719),
-  P(151.9966125488281,-32.81305694580078),
-  P(151.9555358886719,-32.82611083984375),
-  P(151.9499816894531,-32.82805633544922),
-  P(151.8457946777344,-32.86888885498047),
-  P(151.8294067382813,-32.87555694580078),
-  P(151.8194274902344,-32.88166809082031),
-  P(151.8119201660156,-32.88833618164063),
-  P(151.80859375,-32.89250183105469),
-  P(151.6719055175781,-33.06583404541016),
-  P(151.6660766601563,-33.07417297363281),
-  P(151.6305236816406,-33.16444396972656),
-  P(151.5938415527344,-33.23472595214844),
-  P(151.5741271972656,-33.26721954345703),
-  P(151.5533142089844,-33.29306030273438),
-  P(151.5558166503906,-33.28277587890625),
-  P(151.5527648925781,-33.27777862548828),
-  P(151.5477600097656,-33.27583312988281),
-  P(151.532470703125,-33.27610778808594),
-  P(151.5249938964844,-33.27749633789063),
-  P(151.5019226074219,-33.2852783203125),
-  P(151.4563598632813,-33.31444549560547),
-  P(151.4527587890625,-33.31916809082031),
-  P(151.4405212402344,-33.35111236572266),
-  P(151.4435729980469,-33.36138916015625),
-  P(151.44580078125,-33.36611175537109),
-  P(151.4491271972656,-33.37027740478516),
-  P(151.453857421875,-33.37332916259767),
-  P(151.4669189453125,-33.37610626220703),
-  P(151.4743957519531,-33.37555694580078),
-  P(151.4771270751953,-33.39744567871094),
-  P(151.4812927246094,-33.39294815063477),
-  P(151.4842987060547,-33.39094924926758),
-  P(151.4886474609375,-33.3906135559082),
-  P(151.4911499023438,-33.39228057861328),
-  P(151.490478515625,-33.39594268798828),
-  P(151.4563598632813,-33.49833679199219),
-  P(151.4530334472656,-33.50305938720703),
-  P(151.3402404785156,-33.62860870361328),
-  P(151.2969360351563,-33.89749908447266),
-  P(151.2727661132813,-33.96944427490234),
-  P(151.2455444335938,-33.99089050292969),
-  P(151.2433624267578,-33.99322509765625),
-  P(151.2408752441407,-33.99489212036133),
-  P(151.2368621826172,-33.99572372436523),
-  P(151.2335357666016,-33.99389266967773),
-  P(151.2296905517578,-33.98938751220704),
-  P(151.1783142089844,-33.98750305175781),
-  P(151.1046752929688,-34.00222778320313),
-  P(151.0997009277344,-34.00556182861328),
-  P(151.0963439941406,-34.00889587402344),
-  P(151.0960693359375,-34.01583862304688),
-  P(151.1002502441406,-34.01944732666017),
-  P(151.13916015625,-34.03500366210938),
-  P(151.1458129882813,-34.03666687011719),
-  P(151.1499938964844,-34.03333282470704),
-  P(151.1544189453125,-34.02305603027344),
-  P(151.159423828125,-34.01972198486328),
-  P(151.1660766601563,-34.0191650390625),
-  P(151.1865081787109,-34.04861068725587),
-  P(151.1910095214844,-34.04911041259766),
-  P(151.1968536376953,-34.05244445800781),
-  P(151.1986846923828,-34.05527496337891),
-  P(151.1991882324219,-34.05861282348633),
-  P(151.1980133056641,-34.06194686889648),
-  P(151.1960144042969,-34.06428146362305),
-  P(151.1182861328125,-34.16305541992188),
-  P(151.1099548339844,-34.16972351074219),
-  P(151.093017578125,-34.17610931396484),
-  P(151.0771789550781,-34.18388366699219),
-  P(151.0638732910156,-34.19249725341797),
-  P(151.0377502441406,-34.21111297607422),
-  P(151.0241394042969,-34.22110748291016),
-  P(151.0166625976563,-34.22777557373047),
-  P(150.9763488769531,-34.27749633789063),
-  P(150.9599609375,-34.29833984375),
-  P(150.9341430664063,-34.33167266845704),
-  P(150.8405151367188,-34.55833435058594),
-  P(150.875244140625,-34.58416748046875),
-  P(150.88134765625,-34.59916687011719),
-  P(150.8735656738281,-34.66110992431641),
-  P(150.8377380371094,-34.77555847167969),
-  P(150.8341369628906,-34.78639221191406),
-  P(150.8296813964844,-34.78972625732422),
-  P(150.8238525390625,-34.79222869873047),
-  P(150.8038635253906,-34.79528045654297),
-  P(150.7980346679688,-34.79722595214845),
-  P(150.7872009277344,-34.80166625976563),
-  P(150.7777709960938,-34.80777740478516),
-  P(150.7699890136719,-34.8155517578125),
-  P(150.7638854980469,-34.82361602783203),
-  P(150.756103515625,-34.83777618408203),
-  P(150.7441101074219,-34.86972045898438),
-  P(150.7496948242188,-34.88527679443359),
-  P(150.7819213867188,-34.96166992187501),
-  P(150.841064453125,-35.01194763183594),
-  P(150.8477478027344,-35.01361846923828),
-  P(150.8524475097656,-35.01694488525391),
-  P(150.8558044433594,-35.02111053466797),
-  P(150.8546752929688,-35.0272216796875),
-  P(150.8405151367188,-35.08277893066406),
-  P(150.8377380371094,-35.08750152587891),
-  P(150.8344116210938,-35.09166717529297),
-  P(150.8163757324219,-35.10417175292969),
-  P(150.8113708496094,-35.10750579833984),
-  P(150.8055419921875,-35.10944366455078),
-  P(150.7763671875,-35.08611297607422),
-  P(150.7746887207031,-35.08083343505859),
-  P(150.7766418457031,-35.07527923583984),
-  P(150.7799682617188,-35.07138824462892),
-  P(150.784423828125,-35.06806182861328),
-  P(150.7897033691406,-35.05860900878906),
-  P(150.7916564941406,-35.05332946777344),
-  P(150.7819213867188,-35.01694488525391),
-  P(150.7785949707031,-35.01277923583984),
-  P(150.7738647460938,-35.01000213623047),
-  P(150.7672119140625,-35.00833892822266),
-  P(150.7597045898438,-35.00750732421875),
-  P(150.752197265625,-35.008056640625),
-  P(150.7413330078125,-35.01194763183594),
-  P(150.6966247558594,-35.02944183349609),
-  P(150.691650390625,-35.03194427490234),
-  P(150.6871948242188,-35.0352783203125),
-  P(150.6838684082031,-35.03916931152344),
-  P(150.6819152832032,-35.04472351074219),
-  P(150.6791381835938,-35.05610656738281),
-  P(150.6774597167969,-35.07583618164063),
-  P(150.7033081054688,-35.12694549560547),
-  P(150.6474914550781,-35.17861175537109),
-  P(150.6171875,-35.18833160400391),
-  P(150.5716247558594,-35.20417022705078),
-  P(150.5563659667969,-35.21194458007813),
-  P(150.5513610839844,-35.21527862548828),
-  P(150.5469360351563,-35.21860504150391),
-  P(150.5402526855469,-35.22666168212891),
-  P(150.4863586425781,-35.30777740478516),
-  P(150.4852294921875,-35.31388854980469),
-  P(150.4799499511719,-35.35055541992188),
-  P(150.4805297851563,-35.3558349609375),
-  P(150.4066467285156,-35.52777862548828),
-  P(150.3558044433594,-35.59500122070313),
-  P(150.2752685546875,-35.73583221435547),
-  P(150.1624755859375,-35.9405517578125),
-  P(150.1374816894531,-36.11167144775392),
-  P(150.141357421875,-36.24361419677734),
-  P(150.1444396972656,-36.25527954101563),
-  P(150.1455383300781,-36.26666259765625),
-  P(150.1410827636719,-36.3175048828125),
-  P(150.1399841308594,-36.32361602783203),
-  P(150.1347045898438,-36.33167266845703),
-  P(150.1266174316406,-36.3397216796875),
-  P(150.1041259765625,-36.35527801513672),
-  P(150.0927429199219,-36.36583709716797),
-  P(150.0794067382813,-36.38388824462891),
-  P(150.0749816894532,-36.39389038085938),
-  P(150.0657958984375,-36.42778015136719),
-  P(150.0513610839844,-36.49861145019531),
-  P(150.0519104003906,-36.50472259521484),
-  P(150.0233154296875,-36.6280517578125),
-  P(149.9824523925781,-36.75333404541017),
-  P(149.9768981933594,-36.76860809326172),
-  P(149.9663696289063,-36.79472351074219),
-  P(149.9385681152344,-36.85722351074219),
-  P(149.9024658203125,-36.92333221435547),
-  P(149.9066467285156,-37.06916809082031),
-  P(149.9385681152344,-37.11611175537109),
-  P(149.9455261230469,-37.11472320556641),
-  P(149.9513549804688,-37.11777496337891),
-  P(150.004150390625,-37.15694427490234),
-  P(150.0088806152344,-37.16666412353516),
-  P(150.0197143554688,-37.23138427734376),
-  P(150.0191345214844,-37.26445007324219),
-  P(149.9941101074219,-37.25695037841797),
-  P(149.9855041503906,-37.25666809082031),
-  P(149.9566345214844,-37.27361297607423),
-  P(149.9480285644531,-37.28028106689453),
-  P(149.9444274902344,-37.28417205810547),
-  P(149.9424743652344,-37.28944396972656),
-  P(149.9485778808594,-37.38916778564453),
-  P(149.9502563476563,-37.40750122070313),
-  P(149.953857421875,-37.42444610595703),
-  P(149.9585876464844,-37.43416595458984),
-  P(149.9749755859375,-37.46833038330078),
-  P(149.97802734375,-37.47916412353516),
-  P(149.9796752929688,-37.49777984619141),
-  P(149.9794006347656,-37.50444793701172),
-  P(149.9777526855469,-37.51267242431641),
-  P(149.9738464355469,-37.52055358886719),
-  P(149.9694213867188,-37.52388763427735),
-  P(149.9024658203125,-37.55110931396484),
-  P(149.8963623046875,-37.55305480957031),
-  P(149.8235778808594,-37.55833435058594),
-  P(149.7935791015625,-37.56027984619141),
-  P(149.7774658203125,-37.56055450439453),
-  P(149.7466125488281,-37.59888458251953),
-  P(149.6802673339844,-37.6905517578125),
-  P(149.6766357421875,-37.69444274902344),
-  P(149.6672058105469,-37.70027923583984),
-  P(149.5786437988281,-37.73557662963867),
-  P(149.5697021484375,-37.73611450195313),
-  P(149.5558166503907,-37.73833465576172),
-  P(149.5052490234375,-37.75861358642578),
-  P(149.4571838378906,-37.78333282470703),
-  P(149.3094177246094,-37.79528045654297),
-  P(149.2546997070313,-37.79361724853516),
-  P(149.0802612304688,-37.79277801513672),
-  P(148.8335876464844,-37.79695129394531),
-  P(148.81884765625,-37.79861450195313),
-  P(148.784423828125,-37.80332946777344),
-  P(148.7652587890625,-37.80805206298828),
-  P(148.7530517578125,-37.81194305419923),
-  P(148.6585998535156,-37.81666564941406),
-  P(148.4938354492188,-37.81166839599609),
-  P(148.3091430664063,-37.82167053222656),
-  P(148.2813720703125,-37.82611083984375),
-  P(148.2069091796875,-37.8397216796875),
-  P(147.9735717773438,-37.89972686767578),
-  P(147.9544067382813,-37.90499877929688),
-  P(147.9369201660156,-37.91110992431641),
-  P(147.8463439941406,-37.94527435302734),
-  P(147.7644348144531,-37.97999572753906),
-  P(147.7538757324219,-37.98500061035156),
-  P(147.734130859375,-37.99639129638672),
-  P(147.6546936035156,-38.04250335693359),
-  P(147.5877380371094,-38.08306121826172),
-  P(147.5410766601563,-38.11333465576172),
-  P(147.4296875,-38.19471740722656),
-  P(147.3724670410156,-38.23805236816406),
-  P(147.2130126953125,-38.36305999755859),
-  P(147.1930236816406,-38.38111114501953),
-  P(147.1855163574219,-38.38805389404297),
-  P(147.1819152832031,-38.39194488525391),
-  P(147.1144104003906,-38.45471954345703),
-  P(146.9941101074219,-38.56416320800782),
-  P(146.982177734375,-38.57500457763672),
-  P(146.9694213867188,-38.58527374267578),
-  P(146.8735656738281,-38.65166473388672),
-  P(146.8424682617188,-38.66444396972656),
-  P(146.8402404785156,-38.65972137451172),
-  P(146.8344116210938,-38.65805053710938),
-  P(146.8258056640625,-38.65833282470703),
-  P(146.6569213867188,-38.67277526855469),
-  P(146.6427612304688,-38.67472076416016),
-  P(146.5016479492188,-38.70055389404297),
-  P(146.4310913085938,-38.71721649169922),
-  P(146.3638610839844,-38.70444488525392),
-  P(146.3558044433594,-38.69721984863281),
-  P(146.3499755859375,-38.69499969482422),
-  P(146.3413391113281,-38.69471740722656),
-  P(146.2611083984375,-38.70222473144531),
-  P(146.2399597167969,-38.70527648925781),
-  P(146.2338562011719,-38.70694732666016),
-  P(146.2230224609375,-38.71250152587891),
-  P(146.2155151367188,-38.71944427490234),
-  P(146.1852416992188,-38.75111389160156),
-  P(146.1830444335938,-38.75639343261719),
-  P(146.1852416992188,-38.76111602783203),
-  P(146.2794189453125,-38.91305541992188),
-  P(146.282470703125,-38.91638946533203),
-  P(146.28857421875,-38.91889190673828),
-  P(146.2972106933594,-38.91916656494141),
-  P(146.3033142089844,-38.91750335693359),
-  P(146.3088684082031,-38.91500091552734),
-  P(146.4077453613281,-38.85778045654297),
-  P(146.4116516113281,-38.85472106933594),
-  P(146.4144287109375,-38.84999847412109),
-  P(146.4191284179688,-38.82527923583984),
-  P(146.4266357421875,-38.79611206054689),
-  P(146.4302673339844,-38.79222869873047),
-  P(146.4374694824219,-38.79111480712891),
-  P(146.4605102539063,-38.79416656494141),
-  P(146.4655151367188,-38.79666900634766),
-  P(146.4685668945313,-38.80139160156251),
-  P(146.4707946777344,-38.80610656738281),
-  P(146.4721984863281,-38.81166839599609),
-  P(146.4844055175781,-39.07333374023438),
-  P(146.4830322265625,-39.07917022705078),
-  P(146.4274597167969,-39.133056640625),
-  P(146.4227600097656,-39.13639068603516),
-  P(146.407470703125,-39.14444732666016),
-  P(146.3941345214844,-39.14722442626953),
-  P(146.3855285644531,-39.14666748046875),
-  P(146.3493957519531,-39.13138580322266),
-  P(146.3444213867188,-39.12860870361328),
-  P(146.3258056640625,-39.11000061035156),
-  P(146.3197021484375,-39.10166931152344),
-  P(146.3152465820313,-39.09194183349609),
-  P(146.3174743652344,-39.08666229248047),
-  P(146.2685852050781,-38.98194122314453),
-  P(146.2516479492188,-38.95555877685547),
-  P(146.2424621582031,-38.94222259521484),
-  P(146.2266235351563,-38.92166900634766),
-  P(146.2091369628907,-38.90193939208984),
-  P(146.1930236816406,-38.88694763183594),
-  P(146.1658020019531,-38.86277770996094),
-  P(146.1469421386719,-38.84888458251953),
-  P(146.1377563476563,-38.84305572509766),
-  P(146.1268920898438,-38.83777618408204),
-  P(146.1144104003907,-38.83332824707032),
-  P(146.0891418457031,-38.82527923583984),
-  P(146.0697021484375,-38.82028198242188),
-  P(146.060791015625,-38.81972503662109),
-  P(146.0452575683594,-38.82028198242188),
-  P(146.0313720703125,-38.82222747802734),
-  P(146.0205383300781,-38.82695007324219),
-  P(146.0166625976563,-38.83083343505859),
-  P(146.0136108398438,-38.83555603027344),
-  P(146.0049743652344,-38.85610961914063),
-  P(146.0030517578125,-38.86138916015625),
-  P(146.0013732910156,-38.86805725097656),
-  P(145.9044189453125,-38.85694885253906),
-  P(145.8235778808594,-38.72860717773438),
-  P(145.8344116210938,-38.70471954345703),
-  P(145.843017578125,-38.70527648925781),
-  P(145.8477478027344,-38.70194244384766),
-  P(145.8471984863281,-38.69527435302734),
-  P(145.8222045898438,-38.65610504150391),
-  P(145.8180236816406,-38.65249633789063),
-  P(145.8121948242188,-38.65027618408203),
-  P(145.7919311523438,-38.64500427246094),
-  P(145.7774658203125,-38.64222717285156),
-  P(145.7536010742188,-38.63972473144531),
-  P(145.7310791015625,-38.64055633544922),
-  P(145.7246704101563,-38.64222717285156),
-  P(145.6869201660156,-38.65916442871094),
-  P(145.6769104003906,-38.66471862792969),
-  P(145.6685791015625,-38.67166900634766),
-  P(145.659423828125,-38.67778015136719),
-  P(145.6530456542969,-38.67972564697267),
-  P(145.6113586425781,-38.68416595458984),
-  P(145.6035766601563,-38.68305969238281),
-  P(145.5744018554688,-38.67055511474609),
-  P(145.5694274902344,-38.66777801513672),
-  P(145.5605163574219,-38.66110992431641),
-  P(145.4160766601563,-38.54583740234375),
-  P(145.4163818359375,-38.52361297607422),
-  P(145.4321899414063,-38.45222473144532),
-  P(145.4877319335938,-38.43028259277344),
-  P(145.5033264160156,-38.42972564697266),
-  P(145.51025390625,-38.42861175537109),
-  P(145.5210876464844,-38.42388916015625),
-  P(145.5249938964844,-38.41999816894531),
-  P(145.5513610839844,-38.38555908203125),
-  P(145.5571899414063,-38.37638854980469),
-  P(145.5569152832031,-38.37027740478516),
-  P(145.5555419921875,-38.36500549316406),
-  P(145.4874572753906,-38.25028228759766),
-  P(145.4835815429688,-38.24610900878906),
-  P(145.4472045898438,-38.22777557373047),
-  P(145.4413452148438,-38.22610473632813),
-  P(145.2630310058594,-38.23500061035156),
-  P(145.256103515625,-38.23611450195313),
-  P(145.2513732910156,-38.23972320556641),
-  P(145.2130126953125,-38.34916687011719),
-  P(145.036376953125,-38.49527740478516),
-  P(145.0244140625,-38.49949645996094),
-  P(144.941650390625,-38.51083374023438),
-  P(144.9038696289063,-38.50722503662109),
-  P(144.8988647460938,-38.50444793701172),
-  P(144.7611083984375,-38.37777709960938),
-  P(144.7821960449219,-38.37305450439453),
-  P(144.798583984375,-38.38082885742188),
-  P(144.8138732910157,-38.383056640625),
-  P(144.8388671875,-38.38388824462891),
-  P(144.8738403320313,-38.37916564941406),
-  P(144.8869323730469,-38.37638854980469),
-  P(144.9107971191406,-38.36972045898438),
-  P(144.9410705566406,-38.36083221435547),
-  P(144.9796752929688,-38.34471893310547),
-  P(144.9844055175781,-38.34166717529297),
-  P(144.9880065917969,-38.33777618408203),
-  P(145.1146850585938,-38.17444610595703),
-  P(145.1235656738281,-38.16082763671875),
-  P(145.1288452148438,-38.15166473388672),
-  P(145.1324462890625,-38.14028167724609),
-  P(145.1318969726563,-38.1280517578125),
-  P(145.1146850585938,-38.07028198242188),
-  P(145.1021728515625,-38.04722595214844),
-  P(145.0963439941406,-38.03889465332031),
-  P(144.9774475097656,-37.89389038085938),
-  P(144.9735717773438,-37.88999938964844),
-  P(144.9541320800781,-37.8780517578125),
-  P(144.9424743652344,-37.87332916259766),
-  P(144.9291381835938,-37.86916351318359),
-  P(144.921630859375,-37.86805725097656),
-  P(144.9130249023438,-37.86750030517578),
-  P(144.9069213867188,-37.86944580078125),
-  P(144.8338623046875,-37.89611053466797),
-  P(144.8285827636719,-37.89861297607422),
-  P(144.8238525390625,-37.90222167968751),
-  P(144.8124694824219,-37.91305541992188),
-  P(144.7469177246094,-37.96277618408203),
-  P(144.69775390625,-37.99916839599609),
-  P(144.6846923828125,-38.00861358642578),
-  P(144.6611022949219,-38.02333068847656),
-  P(144.5269165039063,-38.10111236572266),
-  P(144.397216796875,-38.10861206054688),
-  P(144.3908081054688,-38.11028289794923),
-  P(144.3802490234375,-38.11500549316406),
-  P(144.3755187988281,-38.11833190917969),
-  P(144.3716125488281,-38.12194061279297),
-  P(144.3655090332031,-38.13111114501953),
-  P(144.3627319335938,-38.14305877685547),
-  P(144.3630065917969,-38.14861297607422),
-  P(144.3671875,-38.15833282470703),
-  P(144.3818969726563,-38.16722106933594),
-  P(144.3885803222656,-38.16916656494141),
-  P(144.4038696289063,-38.17138671875001),
-  P(144.5052490234375,-38.18167114257813),
-  P(144.5208129882813,-38.18138885498047),
-  P(144.5408020019531,-38.17778015136719),
-  P(144.5533142089844,-38.17444610595703),
-  P(144.5827331542969,-38.16416168212891),
-  P(144.5988464355469,-38.15694427490234),
-  P(144.6080017089844,-38.15139007568359),
-  P(144.6119079589844,-38.14749908447266),
-  P(144.6249694824219,-38.13750457763672),
-  P(144.6302490234375,-38.13527679443359),
-  P(144.6427612304688,-38.13194274902344),
-  P(144.6505432128906,-38.13111114501953),
-  P(144.6724853515625,-38.13444519042969),
-  P(144.6860961914063,-38.13777923583984),
-  P(144.7024536132813,-38.14555358886719),
-  P(144.7102355957031,-38.15277862548828),
-  P(144.7163696289063,-38.16138458251953),
-  P(144.7218933105469,-38.17583465576172),
-  P(144.7232971191406,-38.1875),
-  P(144.7105102539063,-38.22249603271484),
-  P(144.6588745117188,-38.28500366210938),
-  P(144.6338806152344,-38.29972839355469),
-  P(144.6121826171875,-38.30194091796875),
-  P(144.6046752929688,-38.30083465576173),
-  P(144.593017578125,-38.29611206054688),
-  P(144.5882873535156,-38.29222869873047),
-  P(144.5766296386719,-38.28694915771484),
-  P(144.5641479492188,-38.28333282470703),
-  P(144.5555419921875,-38.28277587890625),
-  P(144.5416564941406,-38.28472900390625),
-  P(144.4005432128907,-38.30722045898439),
-  P(144.3897094726563,-38.31194305419922),
-  P(144.36328125,-38.32444763183594),
-  P(144.0638732910156,-38.48305511474609),
-  P(144.0594177246094,-38.48611450195313),
-  P(144.0036010742188,-38.53055572509766),
-  P(143.9996948242188,-38.53444671630859),
-  P(143.9966125488281,-38.53889465332031),
-  P(143.9952392578125,-38.54472351074219),
-  P(143.9147033691406,-38.63444519042969),
-  P(143.9111022949219,-38.63805389404297),
-  P(143.8985900878906,-38.64888763427734),
-  P(143.844970703125,-38.69527435302734),
-  P(143.8396911621094,-38.69777679443359),
-  P(143.7694396972656,-38.71416473388672),
-  P(143.7413330078125,-38.71749877929688),
-  P(143.7224731445313,-38.72305297851563),
-  P(143.7069091796875,-38.73082733154297),
-  P(143.69384765625,-38.74083709716797),
-  P(143.6899719238281,-38.74472045898438),
-  P(143.6838684082031,-38.75389099121094),
-  P(143.6769104003906,-38.77639007568359),
-  P(143.6746826171875,-38.78221893310547),
-  P(143.6724853515625,-38.78666687011719),
-  P(143.6685791015625,-38.79055786132813),
-  P(143.5546875,-38.85527801513672),
-  P(143.5438537597656,-38.86000061035156),
-  P(143.5366516113281,-38.86083221435547),
-  P(143.51220703125,-38.85444641113281),
-  P(143.5063781738281,-38.85222625732422),
-  P(143.5016479492188,-38.84916687011719),
-  P(143.484130859375,-38.83499908447266),
-  P(143.4535827636719,-38.80527496337891),
-  P(143.4474792480469,-38.79666900634766),
-  P(143.439697265625,-38.78944396972656),
-  P(143.4346923828125,-38.78639221191406),
-  P(143.3874816894531,-38.76833343505859),
-  P(143.3485717773438,-38.75889587402344),
-  P(143.3407897949219,-38.75778198242188),
-  P(143.3330383300781,-38.75722503662109),
-  P(143.1799621582031,-38.71611022949219),
-  P(143.1380310058594,-38.68138885498047),
-  P(143.1282958984375,-38.67555999755859),
-  P(143.0963439941406,-38.65888977050781),
-  P(143.0510864257813,-38.63833618164063),
-  P(143.0452575683594,-38.63583374023438),
-  P(143.0252685546875,-38.63027954101564),
-  P(143.0099792480469,-38.62777709960938),
-  P(142.9863586425781,-38.62833404541016),
-  P(142.9724731445313,-38.62999725341797),
-  P(142.9638671875,-38.62944030761719),
-  P(142.8599548339844,-38.59833526611328),
-  P(142.8060913085938,-38.57749938964844),
-  P(142.800537109375,-38.57444763183595),
-  P(142.7588806152344,-38.54555511474609),
-  P(142.7416381835938,-38.53166961669922),
-  P(142.6121826171875,-38.45527648925781),
-  P(142.5352478027344,-38.41277313232422),
-  P(142.3888854980469,-38.36472320556641),
-  P(142.38134765625,-38.36361694335938),
-  P(142.3735656738282,-38.36361694335938),
-  P(142.282470703125,-38.37361145019532),
-  P(142.2760925292969,-38.37527465820313),
-  P(142.2705383300782,-38.37749481201172),
-  P(142.2660827636719,-38.38055419921875),
-  P(142.2627563476563,-38.38500213623047),
-  P(142.2630310058594,-38.39111328125001),
-  P(142.2669372558594,-38.39472198486328),
-  P(142.2636108398438,-38.39944458007813),
-  P(142.2574768066406,-38.40083312988281),
-  P(142.2432861328125,-38.40249633789063),
-  P(142.2277526855469,-38.40277862548828),
-  P(142.171630859375,-38.40193939208984),
-  P(142.1630249023438,-38.40110778808594),
-  P(142.1563720703125,-38.39999389648438),
-  P(142.1505432128906,-38.39749908447267),
-  P(142.0882873535156,-38.36972045898438),
-  P(142.0624694824219,-38.35556030273438),
-  P(141.9924621582031,-38.31361389160156),
-  P(141.9830322265625,-38.30750274658203),
-  P(141.9674682617188,-38.2933349609375),
-  P(141.9619140625,-38.29084014892578),
-  P(141.8213500976563,-38.26750183105469),
-  P(141.7583312988282,-38.26666259765625),
-  P(141.7435607910156,-38.26750183105469),
-  P(141.7216186523438,-38.27055358886719),
-  P(141.6849670410156,-38.28055572509766),
-  P(141.6738586425781,-38.2852783203125),
-  P(141.6307983398438,-38.31166839599609),
-  P(141.621337890625,-38.3175048828125),
-  P(141.6149597167969,-38.32639312744141),
-  P(141.6135864257813,-38.33194732666016),
-  P(141.6144104003906,-38.34416198730469),
-  P(141.6163635253906,-38.34888458251954),
-  P(141.6221923828125,-38.35750579833984),
-  P(141.6260681152344,-38.36138916015625),
-  P(141.6358032226563,-38.36750030517578),
-  P(141.6510925292969,-38.38221740722656),
-  P(141.6560974121094,-38.39083862304688),
-  P(141.6560974121094,-38.39694976806641),
-  P(141.6535949707031,-38.4022216796875),
-  P(141.6497192382813,-38.40583038330078),
-  P(141.6427612304688,-38.40750122070313),
-  P(141.5713500976563,-38.41722106933595),
-  P(141.4541320800781,-38.37249755859375),
-  P(141.4021911621094,-38.32888793945313),
-  P(141.3944396972656,-38.3155517578125),
-  P(141.3869323730469,-38.30750274658203),
-  P(141.3674621582031,-38.28944396972656),
-  P(141.2894287109375,-38.22833251953125),
-  P(141.2396850585938,-38.19305419921875),
-  P(141.1930236816406,-38.16055297851563),
-  P(141.1463623046875,-38.13500213623048),
-  P(141.1255187988281,-38.12388610839844),
-  P(141.1035766601563,-38.1138916015625),
-  P(141.0258178710938,-38.08277893066406),
-  P(141.0019226074219,-38.07417297363281),
-  P(140.9680480957031,-38.06421661376953),
-  P(140.94775390625,-38.05999755859375),
-  P(140.9308166503906,-38.05860900878906),
-  P(140.8580017089844,-38.05500030517579),
-  P(140.8432922363281,-38.054443359375),
-  P(140.8285827636719,-38.05583190917969),
-  P(140.8160705566406,-38.05889129638672),
-  P(140.7752685546875,-38.07389068603516),
-  P(140.768310546875,-38.07389068603516),
-  P(140.6985778808594,-38.07194519042969),
-  P(140.6749877929688,-38.06861114501953),
-  P(140.6683044433594,-38.06666564941406),
-  P(140.5860900878906,-38.03221893310547),
-  P(140.5299682617188,-38.00028228759767),
-  P(140.3577270507813,-37.866943359375),
-  P(140.3541259765625,-37.85639190673828),
-  P(140.3380126953125,-37.82361602783204),
-  P(140.3324584960938,-37.81500244140625),
-  P(140.23828125,-37.67194366455078),
-  P(140.1282958984375,-37.53611755371094),
-  P(140.1144104003906,-37.52527618408203),
-  P(140.0805358886719,-37.50444793701172),
-  P(140.0588684082031,-37.49361419677734),
-  P(140.0408020019531,-37.48722076416016),
-  P(140.0333251953125,-37.48583221435547),
-  P(140.0263671875,-37.48666381835939),
-  P(140.0224914550782,-37.49055480957031),
-  P(140.0197143554688,-37.49639129638672),
-  P(139.9938354492188,-37.49250030517578),
-  P(139.8413391113281,-37.33139038085938),
-  P(139.8144226074219,-37.29972839355469),
-  P(139.7977600097656,-37.27361297607423),
-  P(139.7513732910156,-37.19972229003906),
-  P(139.7530517578125,-37.16916656494141),
-  P(139.7616577148438,-37.16944885253906),
-  P(139.7680358886719,-37.16777801513672),
-  P(139.7724914550781,-37.16555023193359),
-  P(139.7766418457032,-37.16194152832031),
-  P(139.7805480957031,-37.15805053710938),
-  P(139.7835998535156,-37.15361022949219),
-  P(139.7846984863281,-37.14694976806641),
-  P(139.7846984863281,-37.14083862304688),
-  P(139.7802734375,-37.10778045654298),
-  P(139.736083984375,-37.01889038085938),
-  P(139.7313537597657,-37.00972747802734),
-  P(139.7519226074219,-36.92166900634766),
-  P(139.7861022949219,-36.90361022949219),
-  P(139.8002624511719,-36.89472198486328),
-  P(139.8169250488281,-36.88055419921875),
-  P(139.828857421875,-36.86860656738281),
-  P(139.8416442871094,-36.85139465332031),
-  P(139.8497009277344,-36.83666229248047),
-  P(139.8546752929688,-36.82611083984375),
-  P(139.8607788085938,-36.8013916015625),
-  P(139.8627319335938,-36.78805541992188),
-  P(139.8646850585938,-36.76833343505859),
-  P(139.8655090332031,-36.75611114501953),
-  P(139.8649597167969,-36.73221588134766),
-  P(139.8616333007813,-36.66638946533203),
-  P(139.8599548339844,-36.65527343750001),
-  P(139.8544006347656,-36.63500213623047),
-  P(139.826904296875,-36.57778167724609),
-  P(139.826904296875,-36.56610870361328),
-  P(139.8260803222657,-36.56055450439453),
-  P(139.8205261230469,-36.54583740234375),
-  P(139.673583984375,-36.25472259521484),
-  P(139.6480407714844,-36.20972442626953),
-  P(139.5086975097656,-36.05611038208008),
-  P(139.4943542480469,-36.0357780456543),
-  P(139.4295196533203,-35.9659423828125),
-  P(139.4163513183594,-35.95244598388672),
-  P(139.4070129394531,-35.94361114501953),
-  P(139.3718414306641,-35.91061019897461),
-  P(139.3245239257813,-35.86777877807617),
-  P(139.2893524169922,-35.83844757080078),
-  P(139.1893310546875,-35.7506332397461),
-  P(139.0773468017578,-35.68263626098633),
-  P(139.078857421875,-35.67947006225586),
-  P(139.08251953125,-35.67863464355469),
-  P(139.0916900634766,-35.67830276489258),
-  P(139.1006774902344,-35.67880249023438),
-  P(139.1056823730469,-35.67929840087891),
-  P(139.1094970703125,-35.68046569824219),
-  P(139.1226654052734,-35.68679809570313),
-  P(139.1286926269531,-35.69063568115234),
-  P(139.1341857910156,-35.69446563720703),
-  P(139.3432922363281,-35.8397216796875),
-  P(139.4038696289063,-35.88722229003906),
-  P(139.4743957519531,-35.95777893066406),
-  P(139.47802734375,-35.961669921875),
-  P(139.580810546875,-36.08444213867188),
-  P(139.5871887207031,-36.09249877929688),
-  P(139.6121826171875,-36.12583160400391),
-  P(139.6430358886719,-36.18527221679688),
-  P(139.6533203125,-36.20944213867188),
-  P(139.6641540527344,-36.22694396972656),
-  P(139.6677551269531,-36.23082733154297),
-  P(139.6702575683594,-36.22555541992188),
-  P(139.6677551269531,-36.20889282226563),
-  P(139.6632995605469,-36.18721771240234),
-  P(139.6497192382813,-36.14694976806641),
-  P(139.6041259765625,-36.04138946533203),
-  P(139.5885620117188,-36.02083587646484),
-  P(139.5718994140625,-36.00139617919922),
-  P(139.5610961914063,-35.98944091796875),
-  P(139.5388793945313,-35.96749877929688),
-  P(139.4885559082031,-35.91944885253906),
-  P(139.4480285644531,-35.88417053222656),
-  P(139.2958068847656,-35.77277374267578),
-  P(139.1862487792969,-35.67655563354492),
-  P(139.1542358398438,-35.65705490112305),
-  P(139.1274108886719,-35.64038848876953),
-  P(139.1190795898438,-35.63505554199219),
-  P(139.1025848388672,-35.62355422973633),
-  P(139.0999145507813,-35.62155532836914),
-  P(139.0967407226563,-35.61588668823242),
-  P(139.0967407226563,-35.61255645751953),
-  P(139.0977478027344,-35.60905838012695),
-  P(139.1025848388672,-35.60422515869142),
-  P(139.0913391113281,-35.52916717529297),
-  P(139.1038513183594,-35.51889038085938),
-  P(139.123291015625,-35.50778198242188),
-  P(139.1285705566406,-35.50556182861328),
-  P(139.1347045898438,-35.50417327880859),
-  P(139.1483154296875,-35.50278472900391),
-  P(139.1560974121094,-35.50278472900391),
-  P(139.1632995605469,-35.5050048828125),
-  P(139.2246704101563,-35.54389190673828),
-  P(139.2294006347656,-35.54722595214844),
-  P(139.2338562011719,-35.55110931396484),
-  P(139.2366333007813,-35.55471801757813),
-  P(139.2391357421875,-35.56527709960938),
-  P(139.2399597167969,-35.58916473388672),
-  P(139.2388610839844,-35.59610748291016),
-  P(139.2363586425781,-35.60139465332031),
-  P(139.2249755859375,-35.67277526855469),
-  P(139.2246704101563,-35.67888641357422),
-  P(139.2255249023438,-35.68444061279297),
-  P(139.2291259765625,-35.69444274902344),
-  P(139.2327270507813,-35.69805145263672),
-  P(139.2391357421875,-35.69999694824219),
-  P(139.2474670410156,-35.70083618164063),
-  P(139.3216247558594,-35.70194244384766),
-  P(139.3277587890625,-35.70055389404297),
-  P(139.3324584960938,-35.69777679443359),
-  P(139.3371887207032,-35.69416046142578),
-  P(139.3419189453125,-35.68416595458984),
-  P(139.3613586425781,-35.60388946533203),
-  P(139.373291015625,-35.47777557373047),
-  P(139.3735656738281,-35.47166442871094),
-  P(139.3727416992188,-35.46611022949219),
-  P(139.3580017089844,-35.37638854980469),
-  P(139.355224609375,-35.37249755859375),
-  P(139.246337890625,-35.3255615234375),
-  P(139.22802734375,-35.31889343261719),
-  P(139.2124633789063,-35.31666564941407),
-  P(139.1844177246094,-35.31806182861328),
-  P(139.1791381835938,-35.31999969482422),
-  P(139.1774597167969,-35.32611083984375),
-  P(139.19384765625,-35.33472442626953),
-  P(139.1947021484375,-35.34027862548828),
-  P(139.1397094726563,-35.37638854980469),
-  P(139.1296691894531,-35.38166809082031),
-  P(139.0860900878906,-35.39167022705078),
-  P(139.0730285644531,-35.39389038085938),
-  P(139.0663757324219,-35.39389038085938),
-  P(139.0508117675781,-35.39167022705078),
-  P(139.0274658203125,-35.38999938964844),
-  P(139.0138854980469,-35.39138793945313),
-  P(138.9955139160156,-35.39555358886719),
-  P(138.984130859375,-35.39944458007813),
-  P(138.9738464355469,-35.40499877929688),
-  P(138.966064453125,-35.41194152832031),
-  P(138.9566345214844,-35.42527770996094),
-  P(138.9541320800781,-35.43055725097656),
-  P(138.9505310058594,-35.44249725341797),
-  P(138.9485778808594,-35.45527648925781),
-  P(138.9502563476563,-35.46639251708984),
-  P(138.955810546875,-35.47527313232422),
-  P(138.9602355957031,-35.47833251953125),
-  P(138.9716186523438,-35.48237609863281),
-  P(138.9794006347656,-35.48444366455078),
-  P(138.9952392578125,-35.48555755615234),
-  P(139.0099792480469,-35.48833465576173),
-  P(139.0238647460938,-35.49222564697266),
-  P(139.0335998535156,-35.49888610839844),
-  P(139.0382995605469,-35.50750732421875),
-  P(139.0372009277344,-35.51416778564453),
-  P(139.0341491699219,-35.51889038085938),
-  P(138.9966125488282,-35.55416870117188),
-  P(138.9930114746094,-35.55722045898438),
-  P(138.9874572753906,-35.55916595458984),
-  P(138.9655151367188,-35.56055450439453),
-  P(138.9005432128906,-35.55471801757813),
-  P(138.8355102539063,-35.54528045654297),
-  P(138.8152465820313,-35.53972625732422),
-  P(138.800537109375,-35.53694915771484),
-  P(138.7771911621094,-35.53583526611328),
-  P(138.7308044433594,-35.53583526611328),
-  P(138.7121887207031,-35.54167175292969),
-  P(138.6555480957031,-35.56055450439453),
-  P(138.6455383300781,-35.5655517578125),
-  P(138.6327209472657,-35.57583618164063),
-  P(138.6210632324219,-35.58694458007813),
-  P(138.615234375,-35.59666442871094),
-  P(138.6055297851563,-35.61028289794922),
-  P(138.5977478027344,-35.61833190917969),
-  P(138.5844116210938,-35.62722015380859),
-  P(138.5508117675781,-35.64778137207031),
-  P(138.5355224609375,-35.65444183349609),
-  P(138.5294189453125,-35.65583038330078),
-  P(138.2021789550781,-35.67138671875),
-  P(138.1785888671875,-35.67028045654297),
-  P(138.1713562011719,-35.66889190673828),
-  P(138.1583251953125,-35.66471862792969),
-  P(138.1419372558594,-35.65694427490234),
-  P(138.1374816894531,-35.65305328369141),
-  P(138.0974731445313,-35.62416839599609),
-  P(138.093017578125,-35.62083435058594),
-  P(138.091064453125,-35.61583709716797),
-  P(138.1249694824219,-35.55777740478516),
-  P(138.1321716308594,-35.54944610595704),
-  P(138.1480407714844,-35.53556060791017),
-  P(138.1580200195313,-35.53028106689453),
-  P(138.1941223144531,-35.52111053466797),
-  P(138.2163696289063,-35.51333618164063),
-  P(138.2583312988281,-35.49444580078125),
-  P(138.2785949707031,-35.48332977294922),
-  P(138.29248046875,-35.47471618652344),
-  P(138.4271850585938,-35.35722351074219),
-  P(138.4391479492188,-35.34610748291016),
-  P(138.4421997070313,-35.34166717529297),
-  P(138.4466247558594,-35.33028411865234),
-  P(138.4707946777344,-35.22943878173828),
-  P(138.4694213867188,-35.21194458007813),
-  P(138.4674682617188,-35.20694732666016),
-  P(138.4621887207031,-35.19833374023438),
-  P(138.4577331542969,-35.18888854980469),
-  P(138.4544067382813,-35.17888641357422),
-  P(138.4535827636719,-35.17333221435547),
-  P(138.4546813964844,-35.16666412353516),
-  P(138.4641418457031,-35.11611175537109),
-  P(138.4657897949219,-35.11000061035156),
-  P(138.4757995605469,-35.08916473388672),
-  P(138.4894104003906,-35.07222747802735),
-  P(138.4935607910156,-35.06833648681641),
-  P(138.5069274902344,-35.0513916015625),
-  P(138.5113830566406,-35.04000091552734),
-  P(138.51416015625,-35.02805328369141),
-  P(138.51416015625,-35.02194213867188),
-  P(138.5116577148438,-35.0050048828125),
-  P(138.498291015625,-34.93444061279297),
-  P(138.4863586425781,-34.89389038085939),
-  P(138.4813537597656,-34.86611175537109),
-  P(138.4808044433594,-34.85972595214844),
-  P(138.4899597167969,-34.7852783203125),
-  P(138.4916381835938,-34.77916717529297),
-  P(138.5002746582031,-34.77249908447266),
-  P(138.5055541992188,-34.77027893066406),
-  P(138.51220703125,-34.76972198486328),
-  P(138.4960632324219,-34.7288818359375),
-  P(138.4352416992188,-34.64222717285156),
-  P(138.4199829101563,-34.62749481201172),
-  P(138.4030456542969,-34.61389160156251),
-  P(138.2955322265625,-34.50639343261719),
-  P(138.2846984863281,-34.49500274658203),
-  P(138.2785949707031,-34.48666381835938),
-  P(138.2713623046875,-34.47360992431641),
-  P(138.2655334472656,-34.45861053466797),
-  P(138.2424621582031,-34.383056640625),
-  P(138.2355041503906,-34.35694885253906),
-  P(138.2255249023438,-34.32695007324219),
-  P(138.2210693359375,-34.3175048828125),
-  P(138.216064453125,-34.30750274658203),
-  P(138.1519165039063,-34.20694732666016),
-  P(138.1016235351563,-34.14111328125),
-  P(138.0980224609375,-34.13722229003906),
-  P(138.0882873535156,-34.13138580322267),
-  P(138.0810852050781,-34.12999725341797),
-  P(138.0749816894531,-34.13138580322267),
-  P(138.0677490234375,-34.13944244384766),
-  P(138.064697265625,-34.14389038085938),
-  P(138.0069274902344,-34.24083709716797),
-  P(138.0046997070313,-34.25361633300781),
-  P(138.0055541992188,-34.25917053222656),
-  P(138.0105285644531,-34.27500152587891),
-  P(138.0130310058594,-34.27999877929688),
-  P(138.0158081054688,-34.28388977050781),
-  P(138.0210876464844,-34.28639221191406),
-  P(138.0285949707031,-34.28778076171875),
-  P(138.0338745117188,-34.29000091552734),
-  P(138.0357971191406,-34.29472351074219),
-  P(138.0335998535156,-34.30833435058595),
-  P(138.0316467285156,-34.31444549560547),
-  P(138.0205383300781,-34.34194183349609),
-  P(138.0174865722657,-34.34638977050781),
-  P(137.9899597167969,-34.37305450439453),
-  P(137.9727478027344,-34.38639068603516),
-  P(137.9449768066406,-34.40388488769531),
-  P(137.9363708496094,-34.41055297851563),
-  P(137.9285888671875,-34.41806030273439),
-  P(137.9202575683594,-34.43277740478516),
-  P(137.8905334472656,-34.51889038085938),
-  P(137.8877563476563,-34.53166961669922),
-  P(137.8841552734375,-34.59471893310547),
-  P(137.8861083984375,-34.59944152832031),
-  P(137.8894348144531,-34.60333251953125),
-  P(137.8866577148438,-34.65750122070313),
-  P(137.8755187988281,-34.71111297607422),
-  P(137.8369140625,-34.82444763183594),
-  P(137.8274536132813,-34.83721923828125),
-  P(137.8216247558594,-34.84749603271484),
-  P(137.8096923828125,-34.87361145019531),
-  P(137.7491149902344,-35.04972839355469),
-  P(137.7533264160156,-35.09138488769531),
-  P(137.754150390625,-35.0969467163086),
-  P(137.752197265625,-35.12361145019531),
-  P(137.7510986328125,-35.13027954101563),
-  P(137.7446899414063,-35.13861083984375),
-  P(137.6849670410156,-35.179443359375),
-  P(137.6805419921875,-35.18167114257813),
-  P(137.6744079589844,-35.18305969238281),
-  P(137.6577453613281,-35.18250274658203),
-  P(137.6438598632813,-35.17972564697266),
-  P(137.6327209472656,-35.17500305175781),
-  P(137.6238403320313,-35.16777801513672),
-  P(137.5957946777344,-35.14972686767578),
-  P(137.5733032226563,-35.13972473144531),
-  P(137.5605163574219,-35.13527679443359),
-  P(137.5321960449219,-35.12888336181641),
-  P(137.468017578125,-35.11472320556641),
-  P(137.4516296386719,-35.11305999755859),
-  P(137.4210815429688,-35.1199951171875),
-  P(137.2385559082031,-35.1755599975586),
-  P(137.2285766601563,-35.18083190917969),
-  P(137.219970703125,-35.18666076660156),
-  P(137.2132873535156,-35.19554901123047),
-  P(137.2091369628906,-35.2066650390625),
-  P(137.2013549804688,-35.22222137451172),
-  P(137.1947021484375,-35.23110961914063),
-  P(137.1874694824219,-35.23916625976563),
-  P(137.1788635253906,-35.24583435058594),
-  P(137.16748046875,-35.24861145019531),
-  P(137.1605224609375,-35.24916839599609),
-  P(137.13720703125,-35.24861145019531),
-  P(137.1141357421875,-35.24472045898438),
-  P(137.0841369628906,-35.23361206054688),
-  P(137.0694274902344,-35.23055267333984),
-  P(137.0538635253906,-35.22805023193359),
-  P(137.0330505371094,-35.22860717773438),
-  P(137.022216796875,-35.23277282714844),
-  P(137.0072021484375,-35.24055480957031),
-  P(136.9707946777344,-35.26611328125),
-  P(136.9630126953125,-35.27277374267578),
-  P(136.955810546875,-35.28138732910156),
-  P(136.94384765625,-35.29194641113282),
-  P(136.8960876464844,-35.30416870117189),
-  P(136.8885803222656,-35.30388641357422),
-  P(136.8596801757813,-35.29111480712892),
-  P(136.8305358886719,-35.25472259521484),
-  P(136.8324584960938,-35.24888610839844),
-  P(136.8518981933594,-35.20555877685547),
-  P(136.8657836914063,-35.20305633544922),
-  P(136.8724670410156,-35.20249938964844),
-  P(136.8833312988281,-35.19833374023438),
-  P(136.8922119140625,-35.19166564941406),
-  P(136.8960876464844,-35.18804931640625),
-  P(136.9366455078125,-35.14722442626953),
-  P(136.9577331542969,-35.10722351074219),
-  P(136.9605102539063,-35.10139465332031),
-  P(136.9616394042969,-35.09527587890625),
-  P(136.9613647460938,-35.07194519042969),
-  P(136.9591369628906,-35.06138610839844),
-  P(136.9566345214844,-35.05610656738281),
-  P(136.9494018554688,-35.04917144775391),
-  P(136.97412109375,-34.96333312988281),
-  P(136.9799499511719,-34.95444488525391),
-  P(137.0152587890625,-34.90416717529297),
-  P(137.0199890136719,-34.90110778808594),
-  P(137.0269165039063,-34.90055084228516),
-  P(137.0341491699219,-34.9022216796875),
-  P(137.0521850585938,-34.90916442871094),
-  P(137.0794067382813,-34.92250061035156),
-  P(137.0999755859375,-34.92833709716797),
-  P(137.1155090332031,-34.93083190917969),
-  P(137.1291198730469,-34.929443359375),
-  P(137.141357421875,-34.92694854736328),
-  P(137.1869201660156,-34.91138458251953),
-  P(137.19970703125,-34.90999603271484),
-  P(137.2719116210938,-34.90388488769531),
-  P(137.2794189453125,-34.90471649169922),
-  P(137.2855224609375,-34.90666198730469),
-  P(137.2891540527344,-34.91055297851563),
-  P(137.29248046875,-34.92055511474609),
-  P(137.2977600097656,-34.929443359375),
-  P(137.3021850585938,-34.93277740478516),
-  P(137.38134765625,-34.96083068847656),
-  P(137.3880310058594,-34.96083068847656),
-  P(137.4063720703125,-34.9566650390625),
-  P(137.4305419921875,-34.94305419921875),
-  P(137.437744140625,-34.93472290039063),
-  P(137.4435729980469,-34.92527770996095),
-  P(137.4505310058594,-34.90888977050781),
-  P(137.4541320800781,-34.89694976806641),
-  P(137.4985656738281,-34.65860748291016),
-  P(137.4810791015625,-34.47166442871094),
-  P(137.4932861328125,-34.28639221191406),
-  P(137.4871826171875,-34.24250030517578),
-  P(137.4721984863281,-34.19721984863281),
-  P(137.4671936035156,-34.18777465820313),
-  P(137.455810546875,-34.17083740234375),
-  P(137.4513549804688,-34.16194152832031),
-  P(137.44970703125,-34.15750122070313),
-  P(137.4499816894531,-34.15139007568359),
-  P(137.4524536132813,-34.14639282226563),
-  P(137.4638671875,-34.14194488525391),
-  P(137.4705200195313,-34.14222717285156),
-  P(137.4777526855469,-34.14361572265625),
-  P(137.5033264160156,-34.15055084228516),
-  P(137.5133056640625,-34.14555358886719),
-  P(137.5163879394531,-34.14111328125),
-  P(137.5427551269531,-34.0977783203125),
-  P(137.5449829101563,-34.09333038330078),
-  P(137.5555419921875,-34.06500244140625),
-  P(137.594970703125,-33.95583343505859),
-  P(137.6027526855469,-33.88722229003906),
-  P(137.60302734375,-33.88082885742188),
-  P(137.6321716308594,-33.84916687011719),
-  P(137.7738647460938,-33.70111083984375),
-  P(137.7816467285156,-33.69361114501953),
-  P(137.8836059570313,-33.61000061035156),
-  P(137.8966369628907,-33.60028076171875),
-  P(137.9080200195313,-33.59666442871094),
-  P(137.9132995605469,-33.59944152832031),
-  P(137.9321899414063,-33.59527587890625),
-  P(137.9452514648438,-33.56999969482422),
-  P(137.9502563476563,-33.55944061279297),
-  P(137.9494018554688,-33.55388641357422),
-  P(137.941650390625,-33.51028442382813),
-  P(137.9160766601563,-33.44138336181641),
-  P(137.8474731445313,-33.32277679443359),
-  P(137.8169250488281,-33.28694915771485),
-  P(137.8144226074219,-33.28250122070313),
-  P(137.8130187988281,-33.27138519287109),
-  P(137.8252563476563,-33.22943878173828),
-  P(137.8313598632813,-33.21694183349609),
-  P(137.8377380371094,-33.20805358886719),
-  P(137.8416442871094,-33.20417022705078),
-  P(137.8502502441406,-33.19777679443359),
-  P(137.9019165039063,-33.16750335693359),
-  P(137.9549560546875,-33.14944458007813),
-  P(138.0069274902344,-33.14888763427734),
-  P(138.0138854980469,-33.15110778808594),
-  P(138.0208129882813,-33.14972686767578),
-  P(138.0366516113281,-33.14250183105469),
-  P(138.04443359375,-33.13583374023438),
-  P(138.0474853515625,-33.13138580322266),
-  P(138.0477600097656,-33.12527465820313),
-  P(138.0394287109375,-33.07805633544922),
-  P(138.0188598632813,-33.03583526611328),
-  P(138.0163879394531,-33.03138732910156),
-  P(138.0074768066406,-33.02555847167969),
-  P(137.9930114746094,-33.02249908447266),
-  P(137.9857788085938,-33.02249908447266),
-  P(137.9696960449219,-33.02083587646484),
-  P(137.9624633789063,-33.0191650390625),
-  P(137.9535827636719,-33.01194763183595),
-  P(137.9502563476563,-33.00278472900391),
-  P(137.8963623046875,-32.78722381591797),
-  P(137.8438415527344,-32.68804931640625),
-  P(137.8299560546875,-32.63138580322266),
-  P(137.8160705566406,-32.57389068603516),
-  P(137.8180236816406,-32.56806182861328),
-  P(137.8155212402344,-32.56277465820313),
-  P(137.7733154296875,-32.52361297607422),
-  P(137.7627563476563,-32.52861022949219),
-  P(137.7597045898438,-32.53250122070313),
-  P(137.756103515625,-32.54528045654297),
-  P(137.7552490234375,-32.55110931396484),
-  P(137.7544250488281,-32.57611083984375),
-  P(137.7519226074219,-32.68416595458984),
-  P(137.7527770996094,-32.69583129882813),
-  P(137.7552490234375,-32.70027923583984),
-  P(137.7605285644531,-32.70278167724609),
-  P(137.7758178710938,-32.70527648925781),
-  P(137.7810974121094,-32.70805358886719),
-  P(137.7880249023438,-32.71583557128906),
-  P(137.7958068847656,-32.7288818359375),
-  P(137.7983093261719,-32.73332977294922),
-  P(137.8041381835938,-32.74861145019531),
-  P(137.8083190917969,-32.84138488769531),
-  P(137.8069152832031,-32.85444641113281),
-  P(137.7808227539063,-32.98722076416016),
-  P(137.7783203125,-32.99250030517578),
-  P(137.7738647460938,-32.99555206298828),
-  P(137.7663879394531,-32.99583435058594),
-  P(137.7227478027344,-32.99527740478516),
-  P(137.5955200195313,-33.02972412109375),
-  P(137.48828125,-33.12777709960938),
-  P(137.4430236816406,-33.19444274902344),
-  P(137.3888854980469,-33.29250335693359),
-  P(137.3816223144532,-33.30805206298828),
-  P(137.3785705566406,-33.32083892822266),
-  P(137.375244140625,-33.34111022949219),
-  P(137.3749694824219,-33.34722137451172),
-  P(137.3749694824219,-33.35361480712891),
-  P(137.3763427734375,-33.36472320556641),
-  P(137.3802490234375,-33.38027954101563),
-  P(137.3785705566406,-33.38639068603516),
-  P(137.3655090332031,-33.41999816894531),
-  P(137.3630065917969,-33.42583465576172),
-  P(137.3580017089844,-33.43582916259766),
-  P(137.2838745117188,-33.55471801757813),
-  P(137.2749938964844,-33.56889343261719),
-  P(137.2268981933594,-33.64333343505859),
-  P(137.2099609375,-33.66610717773438),
-  P(137.16943359375,-33.69999694824219),
-  P(137.1611022949219,-33.7066650390625),
-  P(137.1510925292969,-33.711669921875),
-  P(137.1330261230469,-33.71583557128906),
-  P(137.0349273681641,-33.72399902343751),
-  P(137.0309143066406,-33.72399902343751),
-  P(137.0272521972656,-33.72266387939453),
-  P(137.017578125,-33.71783065795898),
-  P(137.0149230957031,-33.71582794189453),
-  P(137.0129089355469,-33.7135009765625),
-  P(137.0119171142578,-33.71016693115234),
-  P(136.9833068847656,-33.69916534423828),
-  P(136.9799499511719,-33.68888854980469),
-  P(136.9774475097656,-33.68472290039064),
-  P(136.9730224609375,-33.68138885498047),
-  P(136.9669189453125,-33.67861175537109),
-  P(136.9596862792969,-33.67778015136719),
-  P(136.9527587890625,-33.67833709716798),
-  P(136.9474792480469,-33.68028259277344),
-  P(136.9427490234375,-33.68332672119141),
-  P(136.8833312988281,-33.74583435058594),
-  P(136.8802490234375,-33.75028228759767),
-  P(136.8782958984375,-33.75639343261719),
-  P(136.8796691894531,-33.76222229003906),
-  P(136.8816223144531,-33.76639556884766),
-  P(136.8849792480469,-33.77083587646484),
-  P(136.8894348144531,-33.77361297607422),
-  P(136.8966369628906,-33.77444458007813),
-  P(136.9027709960938,-33.77305603027344),
-  P(136.8638610839844,-33.80694580078125),
-  P(136.6611022949219,-33.89055633544922),
-  P(136.5799560546875,-33.93194580078125),
-  P(136.4197082519531,-34.03611755371094),
-  P(136.4071960449219,-34.04583740234375),
-  P(136.3646850585938,-34.07917022705078),
-  P(136.3569030761719,-34.08638763427734),
-  P(136.3535766601563,-34.09083557128906),
-  P(136.35107421875,-34.10444641113281),
-  P(136.3527526855469,-34.11028289794922),
-  P(136.3521728515625,-34.12166595458984),
-  P(136.3502502441406,-34.12833404541016),
-  P(136.3199768066406,-34.18694305419922),
-  P(136.3163757324219,-34.19332885742188),
-  P(136.3060913085938,-34.19888305664063),
-  P(136.2619323730469,-34.27083587646484),
-  P(136.2519226074219,-34.28388977050781),
-  P(136.2413330078125,-34.29722595214844),
-  P(136.2163696289063,-34.32527923583984),
-  P(136.2083129882813,-34.33250427246094),
-  P(136.203857421875,-34.33472442626953),
-  P(136.19775390625,-34.33611297607422),
-  P(136.1849670410156,-34.33777618408203),
-  P(136.1544189453125,-34.34444427490234),
-  P(136.1430358886719,-34.34860992431641),
-  P(136.1336059570313,-34.35444641113281),
-  P(136.1255187988281,-34.36167144775391),
-  P(136.1221923828125,-34.36611175537109),
-  P(136.0430297851563,-34.48249816894531),
-  P(136.0374755859375,-34.48472595214844),
-  P(135.9721984863281,-34.5130615234375),
-  P(135.9621887207031,-34.51805877685547),
-  P(135.9430236816406,-34.53028106689453),
-  P(135.9391479492188,-34.53333282470703),
-  P(135.9327392578125,-34.54194641113281),
-  P(135.8749694824219,-34.63833618164063),
-  P(135.800537109375,-34.80750274658203),
-  P(135.798583984375,-34.81361389160156),
-  P(135.8021850585938,-34.8175048828125),
-  P(135.8138732910156,-34.82222747802734),
-  P(135.8291320800781,-34.82472229003906),
-  P(135.8641357421875,-34.82222747802734),
-  P(135.8816223144531,-34.8175048828125),
-  P(135.8974914550781,-34.80972290039063),
-  P(135.9069213867188,-34.80416870117188),
-  P(135.953857421875,-34.76721954345703),
-  P(135.990234375,-34.73722076416016),
-  P(135.996337890625,-34.73527526855469),
-  P(136.0030517578125,-34.73666381835939),
-  P(136.0083312988282,-34.73944091796875),
-  P(136.0119323730469,-34.74333190917969),
-  P(136.0158081054688,-34.75278472900392),
-  P(136.0199890136719,-34.78611755371094),
-  P(136.0199890136719,-34.80416870117188),
-  P(136.0088806152344,-34.98583221435547),
-  P(136.0069274902344,-34.991943359375),
-  P(136.0013732910156,-34.99472045898438),
-  P(135.9644165039063,-35.00944519042969),
-  P(135.9610290527344,-35.01015472412109),
-  P(135.9541320800781,-35.01028442382814),
-  P(135.9460754394531,-35.00305938720703),
-  P(135.9341430664063,-34.98638916015626),
-  P(135.9310913085938,-34.975830078125),
-  P(135.9321899414063,-34.96971893310547),
-  P(135.9313659667969,-34.96416473388672),
-  P(135.9280395507813,-34.95944213867188),
-  P(135.8466186523438,-34.89028167724609),
-  P(135.8235778808594,-34.87444305419922),
-  P(135.806640625,-34.86611175537109),
-  P(135.7866516113281,-34.86028289794922),
-  P(135.7619323730469,-34.85778045654297),
-  P(135.748291015625,-34.85833740234376),
-  P(135.736083984375,-34.86083221435547),
-  P(135.7252502441406,-34.86583709716797),
-  P(135.7213439941407,-34.86860656738281),
-  P(135.7132873535156,-34.87583160400391),
-  P(135.7066345214844,-34.88555908203125),
-  P(135.7046813964844,-34.89083862304688),
-  P(135.7010803222656,-34.9102783203125),
-  P(135.6863708496094,-34.94916534423828),
-  P(135.6824645996094,-34.95278167724609),
-  P(135.6777648925781,-34.95555877685547),
-  P(135.6722106933594,-34.95777893066406),
-  P(135.6652526855469,-34.95805358886719),
-  P(135.6435852050781,-34.95278167724609),
-  P(135.6194152832031,-34.92083740234375),
-  P(135.6060791015625,-34.89305877685547),
-  P(135.5824584960938,-34.86583709716797),
-  P(135.4746704101563,-34.75111389160156),
-  P(135.330810546875,-34.6280517578125),
-  P(135.3218994140625,-34.62166595458984),
-  P(135.2510986328125,-34.57472229003906),
-  P(135.2449645996094,-34.57167053222656),
-  P(135.2268981933594,-34.56527709960938),
-  P(135.2188415527344,-34.56416320800781),
-  P(135.2119140625,-34.56472015380859),
-  P(135.205810546875,-34.56610870361328),
-  P(135.1535949707031,-34.58139038085938),
-  P(135.1488647460938,-34.58416748046875),
-  P(135.1463623046875,-34.58943939208984),
-  P(135.1397094726563,-34.59749603271484),
-  P(135.1307983398438,-34.60417175292969),
-  P(135.1171875,-34.60500335693359),
-  P(135.1099548339844,-34.60333251953125),
-  P(135.1058044433594,-34.59999847412109),
-  P(135.1049499511719,-34.59444427490234),
-  P(135.1124572753906,-34.57833862304688),
-  P(135.1516418457031,-34.50389099121094),
-  P(135.2008056640625,-34.43777465820313),
-  P(135.2055358886719,-34.43499755859375),
-  P(135.2116394042969,-34.43360900878906),
-  P(135.216064453125,-34.43694305419922),
-  P(135.2141418457031,-34.45610809326172),
-  P(135.2099609375,-34.46860504150391),
-  P(135.2088623046875,-34.47527313232422),
-  P(135.2088623046875,-34.48777770996094),
-  P(135.2096862792969,-34.49277496337891),
-  P(135.2121887207031,-34.49722290039063),
-  P(135.2155151367188,-34.50111389160156),
-  P(135.3444213867188,-34.61416625976563),
-  P(135.3861083984375,-34.64194488525391),
-  P(135.3922119140625,-34.6441650390625),
-  P(135.4005432128906,-34.64527893066406),
-  P(135.4071960449219,-34.64472198486328),
-  P(135.4932861328125,-34.6280517578125),
-  P(135.4993896484375,-34.62666320800781),
-  P(135.5049743652344,-34.62388610839844),
-  P(135.5069274902344,-34.61805725097656),
-  P(135.5044250488281,-34.61361694335938),
-  P(135.4907836914063,-34.60972595214844),
-  P(135.4835815429688,-34.60833740234375),
-  P(135.4447021484375,-34.60527801513672),
-  P(135.4374694824219,-34.60388946533203),
-  P(135.3977661132813,-34.58777618408203),
-  P(135.3919372558594,-34.57944488525391),
-  P(135.3830261230469,-34.55471801757813),
-  P(135.38134765625,-34.54972839355469),
-  P(135.3766174316407,-34.53472900390625),
-  P(135.3760681152344,-34.52916717529297),
-  P(135.3763427734375,-34.52305603027344),
-  P(135.3782958984375,-34.51694488525391),
-  P(135.3897094726563,-34.50527954101563),
-  P(135.3924865722656,-34.5),
-  P(135.3944396972656,-34.49416351318359),
-  P(135.3958129882813,-34.48194122314453),
-  P(135.34912109375,-34.28916931152344),
-  P(135.3099670410156,-34.19388580322266),
-  P(135.2724914550781,-34.12332916259766),
-  P(135.2727661132813,-34.11721801757813),
-  P(135.2652587890625,-34.01889038085938),
-  P(135.2630310058594,-34.00833892822266),
-  P(135.2580261230469,-33.99944305419922),
-  P(135.19384765625,-33.91944885253906),
-  P(135.0574645996094,-33.79055786132813),
-  P(135.0335998535156,-33.76860809326172),
-  P(134.9816284179688,-33.73444366455078),
-  P(134.937744140625,-33.70722198486328),
-  P(134.9238586425781,-33.69777679443359),
-  P(134.8419189453125,-33.63999938964844),
-  P(134.8394165039063,-33.63555908203125),
-  P(134.8457946777344,-33.60166931152344),
-  P(134.8505249023438,-33.58999633789063),
-  P(134.8607788085938,-33.570556640625),
-  P(134.8644104003907,-33.5655517578125),
-  P(134.8682861328125,-33.55361175537109),
-  P(134.8688354492188,-33.54111480712891),
-  P(134.8682861328125,-33.53556060791016),
-  P(134.86328125,-33.49610900878906),
-  P(134.8580017089844,-33.47193908691406),
-  P(134.8280334472656,-33.39472198486328),
-  P(134.80859375,-33.352783203125),
-  P(134.7091369628906,-33.17916870117188),
-  P(134.705810546875,-33.17527770996094),
-  P(134.6955261230469,-33.16889190673828),
-  P(134.6830444335938,-33.16527557373047),
-  P(134.5935668945313,-33.13999938964844),
-  P(134.41748046875,-33.15777587890625),
-  P(134.4119262695313,-33.15999603271484),
-  P(134.4085998535156,-33.16444396972656),
-  P(134.3966369628906,-33.17583465576172),
-  P(134.3877563476563,-33.18222045898438),
-  P(134.3382873535156,-33.20388793945313),
-  P(134.3321838378906,-33.20500183105469),
-  P(134.3260803222657,-33.20278167724609),
-  P(134.3216247558594,-33.19944000244141),
-  P(134.2691345214844,-33.15972137451172),
-  P(134.2669372558594,-33.149169921875),
-  P(134.2674865722656,-33.14222717285156),
-  P(134.2713623046875,-33.13111114501953),
-  P(134.2708129882813,-33.12471771240234),
-  P(134.2677612304688,-33.11528015136719),
-  P(134.2030334472656,-32.96444702148438),
-  P(134.1980285644531,-32.95610809326172),
-  P(134.1947021484375,-32.95222473144531),
-  P(134.1869201660156,-32.94499969482423),
-  P(134.12939453125,-32.8427734375),
-  P(134.0697021484375,-32.73638916015625),
-  P(134.0671997070313,-32.73110961914063),
-  P(134.0649719238281,-32.72110748291016),
-  P(134.0682983398438,-32.71665954589844),
-  P(134.0738525390625,-32.7147216796875),
-  P(134.0891418457031,-32.71611022949219),
-  P(134.1546936035156,-32.725830078125),
-  P(134.1983032226563,-32.74361419677734),
-  P(134.1935729980469,-32.75472259521484),
-  P(134.1921997070313,-32.76139068603516),
-  P(134.1919250488281,-32.76777648925781),
-  P(134.1941223144531,-32.790283203125),
-  P(134.1994018554688,-32.80471801757813),
-  P(134.201904296875,-32.80916595458984),
-  P(134.2063598632813,-32.8125),
-  P(134.2144165039063,-32.81305694580078),
-  P(134.2174682617188,-32.80916595458984),
-  P(134.22412109375,-32.78388977050781),
-  P(134.2727661132813,-32.73305511474609),
-  P(134.2802734375,-32.72444152832031),
-  P(134.2969360351563,-32.68028259277344),
-  P(134.2972106933594,-32.67472076416016),
-  P(134.2821960449219,-32.59999847412109),
-  P(134.2783203125,-32.59027862548828),
-  P(134.2724914550782,-32.58194732666016),
-  P(134.2230224609375,-32.52249908447266),
-  P(134.2055358886719,-32.50361633300781),
-  P(134.1841430664063,-32.48666381835938),
-  P(134.1430358886719,-32.45750427246094),
-  P(134.1207885742188,-32.45305633544922),
-  P(134.1074523925781,-32.45388793945313),
-  P(133.9555358886719,-32.49583435058594),
-  P(133.909423828125,-32.54138946533203),
-  P(133.9055480957031,-32.54500579833984),
-  P(133.8949890136719,-32.54888916015625),
-  P(133.8888854980469,-32.55027770996094),
-  P(133.8816223144531,-32.54999542236328),
-  P(133.8583068847656,-32.54722595214844),
-  P(133.8518981933594,-32.54500579833984),
-  P(133.8505249023438,-32.54055786132813),
-  P(133.8507995605469,-32.53444671630859),
-  P(133.8541259765625,-32.46361541748047),
-  P(133.8546752929688,-32.45722198486328),
-  P(133.8777465820313,-32.41055297851563),
-  P(133.8805236816406,-32.40555572509766),
-  P(133.8844299316406,-32.40193939208984),
-  P(133.8905334472656,-32.40083312988282),
-  P(133.8955383300781,-32.40361022949219),
-  P(133.9021911621094,-32.41138458251953),
-  P(133.9041442871094,-32.42194366455078),
-  P(133.909423828125,-32.42555999755859),
-  P(133.9233093261719,-32.42555999755859),
-  P(133.9294128417969,-32.42417144775391),
-  P(133.9399719238281,-32.42028045654297),
-  P(133.94384765625,-32.41666412353516),
-  P(133.9499816894531,-32.40694427490234),
-  P(133.951904296875,-32.40110778808594),
-  P(133.9521789550781,-32.39472198486328),
-  P(133.9491271972656,-32.39028167724609),
-  P(133.9019165039063,-32.32944488525391),
-  P(133.8735656738281,-32.29917144775391),
-  P(133.8263549804688,-32.25083923339844),
-  P(133.7566528320313,-32.21389007568359),
-  P(133.7255249023438,-32.20055389404297),
-  P(133.6949768066406,-32.18111419677734),
-  P(133.6658020019531,-32.15888977050781),
-  P(133.6616516113281,-32.1552734375),
-  P(133.6602478027344,-32.15027618408203),
-  P(133.6636047363281,-32.14527893066406),
-  P(133.6777648925781,-32.12860870361328),
-  P(133.6796875,-32.12249755859375),
-  P(133.6783142089844,-32.11750030517578),
-  P(133.6749877929688,-32.11361694335938),
-  P(133.6697082519531,-32.11083221435547),
-  P(133.6221923828125,-32.09833526611328),
-  P(133.6060791015625,-32.09694671630859),
-  P(133.6002502441406,-32.09749603271484),
-  P(133.594970703125,-32.09944152832031),
-  P(133.5902404785156,-32.10222625732422),
-  P(133.5802612304688,-32.11528015136719),
-  P(133.5774536132813,-32.12110900878906),
-  P(133.5766296386719,-32.15027618408203),
-  P(133.5744018554688,-32.15694427490234),
-  P(133.5718994140625,-32.16138458251953),
-  P(133.5685729980469,-32.16583251953125),
-  P(133.5605163574219,-32.17277526855469),
-  P(133.4921875,-32.20750427246094),
-  P(133.4866333007813,-32.21028137207031),
-  P(133.4808044433594,-32.21083068847656),
-  P(133.4172058105469,-32.21333312988281),
-  P(133.22607421875,-32.19749450683594),
-  P(133.1666564941406,-32.19083404541016),
-  P(133.1380310058594,-32.18611145019531),
-  P(133.1338806152344,-32.18277740478516),
-  P(133.0902404785156,-32.14361572265625),
-  P(133.0794067382813,-32.13221740722656),
-  P(133.0718994140625,-32.125),
-  P(133.0591430664063,-32.11472320556641),
-  P(133.0435791015625,-32.10610961914063),
-  P(133.0252685546875,-32.09999847412109),
-  P(133.0180358886719,-32.09972381591797),
-  P(132.9735717773438,-32.09166717529297),
-  P(132.8594055175782,-32.00611114501953),
-  P(132.8355102539063,-31.97972106933596),
-  P(132.8302612304688,-31.97610855102539),
-  P(132.7913513183594,-31.95861053466797),
-  P(132.7791442871094,-31.95388793945313),
-  P(132.7644348144531,-31.95083236694336),
-  P(132.5880126953125,-31.93583297729493),
-  P(132.580810546875,-31.93583297729493),
-  P(132.5491333007813,-31.93888854980471),
-  P(132.518310546875,-31.94472122192383),
-  P(132.4888610839844,-31.95249938964844),
-  P(132.4682922363281,-31.96055603027345),
-  P(132.4541320800781,-31.96888732910156),
-  P(132.4508056640625,-31.97277450561523),
-  P(132.4483032226563,-31.97777557373047),
-  P(132.4141540527344,-32.01167297363281),
-  P(132.330810546875,-32.03722381591797),
-  P(132.3246765136719,-32.03833770751953),
-  P(132.2649841308594,-32.04167175292969),
-  P(132.203857421875,-32.03166961669922),
-  P(132.1880187988281,-32.02222442626953),
-  P(132.1760864257813,-32.01222229003906),
-  P(132.16943359375,-32.00556182861328),
-  P(132.1546936035156,-31.98999786376954),
-  P(132.1374816894531,-31.97083282470703),
-  P(132.0269165039063,-31.88194274902345),
-  P(131.8157958984375,-31.74777603149414),
-  P(131.7691345214844,-31.72222137451172),
-  P(131.6666564941406,-31.67055511474609),
-  P(131.4924621582031,-31.59555435180664),
-  P(131.4691162109375,-31.58583450317384),
-  P(131.3649597167969,-31.5433349609375),
-  P(131.2769165039063,-31.51166915893555),
-  P(131.1810913085938,-31.48027801513672),
-  P(131.1672058105469,-31.47666549682617),
-  P(131.1521911621094,-31.47416687011719),
-  P(131.1449890136719,-31.4738883972168),
-  P(131.1249694824219,-31.47472000122071),
-  P(131.1191101074219,-31.475830078125),
-  P(131.1083068847656,-31.47972106933594),
-  P(131.0902404785156,-31.49138641357422),
-  P(131.0694274902344,-31.50833511352539),
-  P(131.0455322265625,-31.53028106689454),
-  P(131.0369262695313,-31.5363883972168),
-  P(131.0174865722656,-31.54666900634766),
-  P(131.0074768066406,-31.55111312866211),
-  P(130.8499755859375,-31.60361099243164),
-  P(130.8380126953125,-31.6058349609375),
-  P(130.7935791015625,-31.61027908325195),
-  P(130.7735900878906,-31.61194610595704),
-  P(130.7538757324219,-31.61222076416016),
-  P(130.732177734375,-31.61083221435547),
-  P(130.7030334472656,-31.60889053344727),
-  P(130.6444396972656,-31.60388946533203),
-  P(130.2633056640625,-31.57611083984375),
-  P(130.2363586425781,-31.57638931274414),
-  P(130.1488647460938,-31.57916641235352),
-  P(129.935791015625,-31.59333419799805),
-  P(129.9038696289063,-31.59694671630859),
-  P(129.8924865722656,-31.59916687011719),
-  P(129.88720703125,-31.60111236572266),
-  P(129.8849792480469,-31.60361099243164),
-  P(129.8780212402344,-31.6058349609375),
-  P(129.8382873535156,-31.61444473266602),
-  P(129.7010803222656,-31.62166595458984),
-  P(129.4755249023438,-31.63861083984375),
-  P(129.2319030761719,-31.65833282470704),
-  P(129.0602416992188,-31.68249893188477),
-  P(129.0294189453125,-31.6875),
-  P(129.0002746582031,-31.69261169433594),
-  P(128.9874572753906,-31.69416427612305),
-  P(128.969970703125,-31.69805526733398),
-  P(128.9524536132813,-31.70333099365234),
-  P(128.7930297851563,-31.76944732666016),
-  P(128.7733154296875,-31.77916717529297),
-  P(128.7041320800781,-31.81639099121094),
-  P(128.5544128417969,-31.88833236694336),
-  P(128.1827392578125,-32.03166961669922),
-  P(128.0208129882813,-32.08694458007813),
-  P(128.0038757324219,-32.09222412109375),
-  P(127.9494171142578,-32.10111236572266),
-  P(127.8283233642578,-32.11944580078125),
-  P(127.7374877929688,-32.13472747802734),
-  P(127.6288604736328,-32.17083740234375),
-  P(127.5385894775391,-32.20278167724609),
-  P(127.334716796875,-32.26694488525391),
-  P(127.2677612304688,-32.27833557128906),
-  P(127.1649932861328,-32.29389190673828),
-  P(127.1249694824219,-32.29849243164063),
-  P(127.0230407714844,-32.30361175537109),
-  P(126.9905395507813,-32.30500030517578),
-  P(126.6871871948242,-32.31583404541016),
-  P(126.6386032104492,-32.31416320800781),
-  P(126.5736083984375,-32.30916595458985),
-  P(126.4588775634766,-32.29972839355469),
-  P(126.3994293212891,-32.29222869873047),
-  P(126.3285980224609,-32.27222442626953),
-  P(126.3030395507813,-32.26222229003906),
-  P(126.2830505371094,-32.25639343261719),
-  P(126.2613830566406,-32.25139617919922),
-  P(126.2391510009766,-32.2469482421875),
-  P(126.2086029052734,-32.24083709716797),
-  P(126.1860961914063,-32.23805236816406),
-  P(126.1733093261719,-32.2388916015625),
-  P(126.1611022949219,-32.24083709716797),
-  P(126.1447067260742,-32.24610900878906),
-  P(126.1349868774414,-32.25111389160156),
-  P(126.1266479492188,-32.258056640625),
-  P(126.0994262695313,-32.27500152587891),
-  P(126.0841522216797,-32.28194427490234),
-  P(126.0780487060547,-32.28361511230469),
-  P(126.0605316162109,-32.28639221191406),
-  P(126.0452575683594,-32.28472900390625),
-  P(126.0124969482422,-32.274169921875),
-  P(125.9847106933594,-32.26639556884766),
-  P(125.9766464233398,-32.26555633544922),
-  P(125.9683227539063,-32.26611328125),
-  P(125.9594268798828,-32.26889038085938),
-  P(125.8088684082031,-32.34222412109375),
-  P(125.8041534423828,-32.34500122070313),
-  P(125.6177520751953,-32.4677734375),
-  P(125.5908203125,-32.48611450195313),
-  P(125.5824890136719,-32.49333190917969),
-  P(125.5794372558594,-32.4969482421875),
-  P(125.5785980224609,-32.50167083740234),
-  P(125.5660934448242,-32.51167297363281),
-  P(125.5538635253906,-32.52111053466797),
-  P(125.5408172607422,-32.53055572509766),
-  P(125.5227737426758,-32.54277801513672),
-  P(125.5072174072266,-32.55083465576172),
-  P(125.4499969482422,-32.57138824462891),
-  P(125.4385833740234,-32.57527923583984),
-  P(125.3988800048828,-32.58250427246094),
-  P(125.3777618408203,-32.58416748046876),
-  P(125.3369293212891,-32.59055328369142),
-  P(125.3052520751953,-32.5977783203125),
-  P(125.2994232177734,-32.59972381591797),
-  P(125.2463684082031,-32.62444305419922),
-  P(124.998031616211,-32.74083709716797),
-  P(124.9930419921875,-32.74361419677734),
-  P(124.9371871948242,-32.77833557128906),
-  P(124.9322128295898,-32.78166961669922),
-  P(124.9238662719727,-32.78778076171875),
-  P(124.9155426025391,-32.79444885253906),
-  P(124.8999862670898,-32.80916595458984),
-  P(124.8933334350586,-32.8175048828125),
-  P(124.8858184814453,-32.82472229003906),
-  P(124.8733062744141,-32.83499908447267),
-  P(124.7524871826172,-32.89583587646484),
-  P(124.7408065795898,-32.89972686767578),
-  P(124.7049865722656,-32.9102783203125),
-  P(124.6647033691406,-32.91638946533203),
-  P(124.580551147461,-32.92805480957031),
-  P(124.4974822998047,-32.93694305419922),
-  P(124.4533233642578,-32.94083404541016),
-  P(124.4027709960938,-32.94554901123047),
-  P(124.352767944336,-32.95750427246094),
-  P(124.3288726806641,-32.9647216796875),
-  P(124.3016510009766,-32.97499847412109),
-  P(124.2819366455078,-32.98555755615234),
-  P(124.1963729858399,-33.04416656494141),
-  P(124.1838684082031,-33.05416870117188),
-  P(124.1577606201172,-33.07972717285156),
-  P(124.1427612304688,-33.09444427490234),
-  P(124.1394271850586,-33.09833526611328),
-  P(124.1063690185547,-33.13944244384766),
-  P(124.0935974121094,-33.15694427490234),
-  P(124.0883178710938,-33.16722106933594),
-  P(124.0024871826172,-33.39361572265625),
-  P(123.9658203125,-33.53277587890625),
-  P(123.9636077880859,-33.54500579833984),
-  P(123.9594268798828,-33.55527496337892),
-  P(123.9524765014648,-33.56388854980469),
-  P(123.9391479492188,-33.57333374023438),
-  P(123.9183197021484,-33.58306121826172),
-  P(123.859992980957,-33.61583709716797),
-  P(123.7899780273438,-33.67722320556641),
-  P(123.7697067260742,-33.69527435302734),
-  P(123.7524871826172,-33.71416473388672),
-  P(123.7389221191406,-33.73740386962891),
-  P(123.7360610961914,-33.75),
-  P(123.734992980957,-33.75472259521484),
-  P(123.7335968017578,-33.76750183105469),
-  P(123.734992980957,-33.77972412109375),
-  P(123.6908111572266,-33.820556640625),
-  P(123.6488800048828,-33.84694671630859),
-  P(123.5408172607422,-33.90583038330078),
-  P(123.4724884033203,-33.9102783203125),
-  P(123.4677581787109,-33.90666198730469),
-  P(123.4580383300781,-33.90193939208984),
-  P(123.4449768066406,-33.89861297607422),
-  P(123.4294281005859,-33.89694976806641),
-  P(123.4055480957031,-33.89583587646484),
-  P(123.3727569580078,-33.89500427246094),
-  P(123.3652572631836,-33.89527893066406),
-  P(123.3519287109375,-33.89778137207031),
-  P(123.3419265747071,-33.90361022949219),
-  P(123.3385925292969,-33.90694427490234),
-  P(123.3052520751953,-33.94166564941407),
-  P(123.2902679443359,-33.96389007568359),
-  P(123.2869262695313,-33.9677734375),
-  P(123.2827606201172,-33.97193908691406),
-  P(123.2708282470703,-33.98110961914063),
-  P(123.2363662719727,-34),
-  P(123.1680526733399,-34.01860809326172),
-  P(123.1394271850586,-33.94916534423828),
-  P(123.1047134399414,-33.88999938964844),
-  P(123.0966491699219,-33.88388824462891),
-  P(123.0863800048828,-33.8780517578125),
-  P(123.0741577148438,-33.87361145019531),
-  P(123.0272064208984,-33.85805511474609),
-  P(123.0197067260742,-33.85722351074219),
-  P(123.01220703125,-33.85750579833984),
-  P(122.9149932861328,-33.88555908203125),
-  P(122.8516464233398,-33.90583038330078),
-  P(122.8383178710938,-33.90805053710938),
-  P(122.8227691650391,-33.90888977050781),
-  P(122.8121871948242,-33.90471649169922),
-  P(122.7302703857422,-33.89333343505859),
-  P(122.606086730957,-33.89444732666016),
-  P(122.5977630615235,-33.89555358886719),
-  P(122.5877685546875,-33.89944458007813),
-  P(122.5836029052734,-33.90277862548828),
-  P(122.57666015625,-33.91055297851563),
-  P(122.57470703125,-33.91610717773439),
-  P(122.4394226074219,-33.92778015136719),
-  P(122.4272003173828,-33.92388916015625),
-  P(122.3808135986328,-33.91277313232422),
-  P(122.3733062744141,-33.91194152832031),
-  P(122.3577575683594,-33.91194152832031),
-  P(122.3510894775391,-33.91388702392578),
-  P(122.3052520751953,-33.92888641357422),
-  P(122.2994232177734,-33.93083190917969),
-  P(122.2941436767578,-33.93332672119141),
-  P(122.2677612304688,-33.95361328125),
-  P(122.2624969482422,-33.96221923828125),
-  P(122.2594299316406,-33.97388458251953),
-  P(122.2630462646484,-34.00389099121094),
-  P(122.2611083984375,-34.00944519042969),
-  P(122.2583312988281,-34.01416778564453),
-  P(122.2541732788086,-34.01750183105469),
-  P(122.249153137207,-34.01999664306641),
-  P(122.238037109375,-34.02444458007813),
-  P(122.1183166503906,-34.02861022949219),
-  P(122.0916595458984,-34.02305603027344),
-  P(122.077766418457,-34.01972198486328),
-  P(122.0738830566406,-34.01694488525391),
-  P(122.0755462646484,-34.01139068603516),
-  P(122.0863800048828,-33.99277496337891),
-  P(122.0908203125,-33.98944091796875),
-  P(122.1038665771484,-33.98722076416016),
-  P(122.1074829101563,-33.98332977294922),
-  P(122.1047134399414,-33.97222137451173),
-  P(122.0863800048828,-33.92722320556641),
-  P(122.0738830566406,-33.89805603027345),
-  P(122.0691528320313,-33.88833618164063),
-  P(122.0522003173828,-33.86860656738281),
-  P(122.0372009277344,-33.85305786132813),
-  P(122.0177612304688,-33.83472442626953),
-  P(122.0097198486328,-33.82749938964844),
-  P(121.9974822998047,-33.82444763183594),
-  P(121.9902572631836,-33.82500457763672),
-  P(121.925537109375,-33.83361053466797),
-  P(121.9080429077148,-33.83916473388672),
-  P(121.8927612304688,-33.84749603271484),
-  P(121.8858184814453,-33.85472106933594),
-  P(121.8827514648438,-33.86639404296875),
-  P(121.8616485595703,-33.88055419921876),
-  P(121.8405532836914,-33.88999938964844),
-  P(121.8288726806641,-33.89389038085938),
-  P(121.7897033691406,-33.90193939208984),
-  P(121.7824935913086,-33.90110778808594),
-  P(121.7758178710938,-33.89749908447266),
-  P(121.672492980957,-33.86028289794922),
-  P(121.5299835205078,-33.82222747802734),
-  P(121.5152664184571,-33.82083892822266),
-  P(121.4611129760742,-33.8175048828125),
-  P(121.3708190917969,-33.81527709960938),
-  P(121.3394317626953,-33.81500244140625),
-  P(121.332763671875,-33.81610870361328),
-  P(121.2197113037109,-33.83889007568359),
-  P(121.0516510009766,-33.85694885253906),
-  P(120.9297027587891,-33.86277770996094),
-  P(120.8922119140625,-33.85778045654297),
-  P(120.8774719238281,-33.85583496093751),
-  P(120.869140625,-33.85556030273438),
-  P(120.8558197021484,-33.85778045654297),
-  P(120.834716796875,-33.866943359375),
-  P(120.8144226074219,-33.87638854980469),
-  P(120.8049774169922,-33.88277435302734),
-  P(120.7947082519531,-33.88722229003906),
-  P(120.7880401611328,-33.88889312744141),
-  P(120.7227630615234,-33.89444732666016),
-  P(120.6938629150391,-33.89583587646484),
-  P(120.5402679443359,-33.91722106933594),
-  P(120.4855270385742,-33.94888305664063),
-  P(120.4447021484375,-33.96888732910156),
-  P(120.4277572631836,-33.97444152832031),
-  P(120.4210968017578,-33.97555541992188),
-  P(120.4135971069336,-33.975830078125),
-  P(120.407211303711,-33.97416687011719),
-  P(120.369140625,-33.96361541748047),
-  P(120.2880401611328,-33.94554901123047),
-  P(120.2530517578125,-33.93972015380859),
-  P(120.22998046875,-33.9375),
-  P(120.0324935913086,-33.92527770996094),
-  P(120.0241470336914,-33.92583465576172),
-  P(120.0049896240235,-33.92888641357422),
-  P(119.97998046875,-33.93444061279297),
-  P(119.8188781738281,-33.975830078125),
-  P(119.8069305419922,-33.98027801513672),
-  P(119.7933197021485,-33.98833465576172),
-  P(119.7844161987305,-33.99472045898438),
-  P(119.770263671875,-34.01055908203125),
-  P(119.7580413818359,-34.02833557128906),
-  P(119.7510986328125,-34.03611755371094),
-  P(119.7388763427734,-34.04583740234375),
-  P(119.7155532836914,-34.06027984619141),
-  P(119.6999969482422,-34.06777954101563),
-  P(119.6727600097656,-34.07888793945313),
-  P(119.6441497802734,-34.0897216796875),
-  P(119.6160888671875,-34.09999847412109),
-  P(119.5672073364258,-34.14583587646484),
-  P(119.5599822998047,-34.15361022949219),
-  P(119.4863662719727,-34.25722503662109),
-  P(119.4813690185547,-34.26721954345703),
-  P(119.4780426025391,-34.27861022949219),
-  P(119.4680480957031,-34.32527923583984),
-  P(119.466926574707,-34.33833312988281),
-  P(119.3255462646484,-34.44694519042969),
-  P(119.2086029052735,-34.50444793701172),
-  P(119.1852569580078,-34.49500274658203),
-  P(119.1113662719727,-34.47471618652344),
-  P(119.0788726806641,-34.46611022949219),
-  P(118.9394226074219,-34.44972229003906),
-  P(118.9310913085938,-34.44916534423828),
-  P(118.9116516113281,-34.45305633544922),
-  P(118.890266418457,-34.46221923828125),
-  P(118.772216796875,-34.52861022949219),
-  P(118.7574920654297,-34.53750610351563),
-  P(118.7397003173828,-34.54999542236328),
-  P(118.7216491699219,-34.56945037841797),
-  P(118.7194366455078,-34.57500457763672),
-  P(118.7541732788086,-34.60694885253906),
-  P(118.7397003173828,-34.62249755859375),
-  P(118.7316589355469,-34.62944030761719),
-  P(118.7191467285156,-34.63972473144531),
-  P(118.6991424560547,-34.65027618408204),
-  P(118.6480407714844,-34.67610931396484),
-  P(118.6386032104492,-34.6808319091797),
-  P(118.6324768066406,-34.68250274658203),
-  P(118.6121978759766,-34.68555450439453),
-  P(118.5913696289063,-34.68860626220703),
-  P(118.5727691650391,-34.69277191162109),
-  P(118.5183334350586,-34.70750427246094),
-  P(118.4797134399414,-34.72249603271484),
-  P(118.4744262695313,-34.72499847412109),
-  P(118.4552612304688,-34.73527526855469),
-  P(118.4463729858398,-34.74166870117188),
-  P(118.4383087158203,-34.74861145019531),
-  P(118.4180526733398,-34.774169921875),
-  P(118.3997192382813,-34.80110931396484),
-  P(118.3899765014648,-34.8277816772461),
-  P(118.38720703125,-34.83999633789064),
-  P(118.3866577148438,-34.84666442871095),
-  P(118.2816619873047,-34.90555572509766),
-  P(118.081672668457,-34.99388885498047),
-  P(117.8460998535156,-35.02666473388672),
-  P(117.8399810791016,-35.02833557128906),
-  P(117.834716796875,-35.03083038330078),
-  P(117.8311004638672,-35.03472900390625),
-  P(117.8297119140625,-35.04084014892578),
-  P(117.8299865722656,-35.04695129394531),
-  P(117.8319396972656,-35.05194091796875),
-  P(117.8435974121094,-35.06277465820313),
-  P(117.8577575683594,-35.07194519042969),
-  P(117.8794326782227,-35.08194732666016),
-  P(117.8866577148438,-35.08332824707031),
-  P(117.9402618408203,-35.09194183349609),
-  P(117.9474792480469,-35.09305572509766),
-  P(117.9544372558594,-35.09222412109375),
-  P(117.9827575683594,-35.08222198486328),
-  P(117.9949798583984,-35.08638763427734),
-  P(118.0008163452148,-35.09500122070313),
-  P(118.0019378662109,-35.10055541992188),
-  P(117.9966430664063,-35.10278320312501),
-  P(117.9466400146485,-35.12222290039063),
-  P(117.9344177246094,-35.12583160400391),
-  P(117.9277572631836,-35.12666320800781),
-  P(117.869140625,-35.11888885498047),
-  P(117.8627624511719,-35.11721801757813),
-  P(117.8572082519531,-35.11472320556641),
-  P(117.8446731567383,-35.10543823242188),
-  P(117.8094177246094,-35.07917022705078),
-  P(117.7841491699219,-35.06527709960938),
-  P(117.7552566528321,-35.05332946777344),
-  P(117.7422027587891,-35.05027770996094),
-  P(117.7266464233398,-35.04805755615234),
-  P(117.6797027587891,-35.04778289794922),
-  P(117.6663818359375,-35.04972839355469),
-  P(117.6602630615234,-35.0513916015625),
-  P(117.6499862670899,-35.05610656738281),
-  P(117.6363830566406,-35.0655517578125),
-  P(117.629150390625,-35.07333374023438),
-  P(117.6224822998047,-35.08250427246094),
-  P(117.6166534423828,-35.09916687011719),
-  P(117.6097106933594,-35.13833618164064),
-  P(117.5541534423828,-35.09860992431641),
-  P(117.533332824707,-35.08833312988281),
-  P(117.3641510009766,-35.02777862548828),
-  P(117.3460998535156,-35.02166748046875),
-  P(117.3324890136719,-35.01889038085938),
-  P(117.1838684082031,-35.01194763183594),
-  P(116.9599914550781,-35.01389312744141),
-  P(116.9524765014649,-35.01416778564453),
-  P(116.9405364990234,-35.01750183105469),
-  P(116.922492980957,-35.03055572509766),
-  P(116.9166564941406,-35.03916931152344),
-  P(116.9144287109375,-35.04444885253906),
-  P(116.9077606201172,-35.05278015136719),
-  P(116.9024810791016,-35.05527496337891),
-  P(116.8888931274414,-35.05694580078125),
-  P(116.8730316162109,-35.05666351318359),
-  P(116.8444366455078,-35.05110931396484),
-  P(116.831672668457,-35.04695129394531),
-  P(116.814697265625,-35.03972625732422),
-  P(116.7244262695313,-35.01694488525391),
-  P(116.6580429077148,-35.03221893310547),
-  P(116.6019287109375,-35.03305816650391),
-  P(116.4633178710938,-35.00083923339844),
-  P(116.457763671875,-34.99833679199219),
-  P(116.3755264282227,-34.94805145263672),
-  P(116.32470703125,-34.9183349609375),
-  P(116.2686004638672,-34.88777923583984),
-  P(116.2463684082031,-34.87777709960938),
-  P(116.2169265747071,-34.86611175537109),
-  P(116.1788635253906,-34.85444641113281),
-  P(116.0924835205078,-34.83805084228516),
-  P(115.9736022949219,-34.81945037841797),
-  P(115.9524765014648,-34.76944732666016),
-  P(115.9438629150391,-34.75111389160156),
-  P(115.9160919189453,-34.70722198486328),
-  P(115.9105377197266,-34.69916534423828),
-  P(115.8141479492188,-34.60778045654297),
-  P(115.79443359375,-34.58999633789063),
-  P(115.7824935913086,-34.57944488525391),
-  P(115.6480407714844,-34.4677734375),
-  P(115.5010986328125,-34.38611602783203),
-  P(115.4902572631836,-34.38111114501954),
-  P(115.3916625976563,-34.33638763427734),
-  P(115.3805389404297,-34.33139038085938),
-  P(115.3172073364258,-34.30583190917969),
-  P(115.3108062744141,-34.30388641357422),
-  P(115.2508163452149,-34.29833984375),
-  P(115.2427520751953,-34.29778289794922),
-  P(115.2352600097656,-34.29778289794922),
-  P(115.2141571044922,-34.29972839355469),
-  P(115.1947021484375,-34.30278015136719),
-  P(115.1819305419922,-34.30583190917969),
-  P(115.1716537475586,-34.30999755859375),
-  P(115.1616516113281,-34.31610870361328),
-  P(115.1580429077148,-34.31916809082031),
-  P(115.1519317626953,-34.32888793945313),
-  P(115.1474914550781,-34.34638977050781),
-  P(115.1436004638672,-34.35028076171875),
-  P(115.1263732910156,-34.36305999755859),
-  P(115.1180419921875,-34.36250305175781),
-  P(115.0738830566406,-34.32389068603516),
-  P(115.0155487060547,-34.27055358886719),
-  P(115.0080413818359,-34.2630615234375),
-  P(115.006103515625,-34.258056640625),
-  P(115.0047073364258,-34.23416900634766),
-  P(115.0044403076172,-34.21555328369141),
-  P(115.005256652832,-34.20889282226563),
-  P(115.009162902832,-34.19749450683594),
-  P(115.0108184814453,-34.18388366699219),
-  P(115.0108184814453,-34.17694854736328),
-  P(115.0097198486328,-34.17138671875),
-  P(114.9766464233398,-34.01860809326172),
-  P(114.957763671875,-33.86611175537109),
-  P(114.9533233642578,-33.69583129882813),
-  P(114.9541625976563,-33.68888854980469),
-  P(114.9869232177735,-33.52972412109375),
-  P(114.9887237548828,-33.52253723144531),
-  P(115.0027770996094,-33.52138519287109),
-  P(115.0099868774414,-33.52277374267578),
-  P(115.0347137451172,-33.53083038330078),
-  P(115.0447082519531,-33.53666687011719),
-  P(115.0713806152344,-33.56221771240234),
-  P(115.0822067260742,-33.57389068603516),
-  P(115.0849914550781,-33.57833862304688),
-  P(115.0888824462891,-33.58833312988281),
-  P(115.0897064208984,-33.59388732910156),
-  P(115.092758178711,-33.60361480712891),
-  P(115.0955429077148,-33.60805511474609),
-  P(115.0991516113281,-33.61167144775391),
-  P(115.1083221435547,-33.61805725097656),
-  P(115.1558227539063,-33.63555908203125),
-  P(115.2113800048828,-33.6522216796875),
-  P(115.2185974121094,-33.6536102294922),
-  P(115.2260894775391,-33.6536102294922),
-  P(115.2616577148438,-33.6522216796875),
-  P(115.2824935913086,-33.65055084228516),
-  P(115.3091430664063,-33.64722442626953),
-  P(115.3219299316406,-33.64472198486328),
-  P(115.3636016845703,-33.633056640625),
-  P(115.3969421386719,-33.62138366699219),
-  P(115.4274673461914,-33.60666656494141),
-  P(115.4319305419922,-33.60361480712891),
-  P(115.6608123779297,-33.31082916259766),
-  P(115.6746978759766,-33.30972290039063),
-  P(115.6858062744141,-33.3058319091797),
-  P(115.6947021484375,-33.29972839355469),
-  P(115.7022094726563,-33.29138946533203),
-  P(115.7066497802735,-33.28138732910156),
-  P(115.7111129760742,-33.26999664306641),
-  P(115.7141571044922,-33.258056640625),
-  P(115.7147064208985,-33.24500274658203),
-  P(115.7138824462891,-33.23944091796875),
-  P(115.66943359375,-32.98194122314453),
-  P(115.6530532836914,-32.92444610595703),
-  P(115.6355361938477,-32.86750030517578),
-  P(115.6199798583985,-32.80944061279297),
-  P(115.6188735961914,-32.80388641357422),
-  P(115.5949935913086,-32.68250274658203),
-  P(115.5935974121094,-32.67138671875),
-  P(115.5944366455078,-32.66444396972656),
-  P(115.6144332885742,-32.60916900634766),
-  P(115.6166534423828,-32.60388946533203),
-  P(115.6197128295898,-32.59916687011719),
-  P(115.6785888671875,-32.52972412109375),
-  P(115.6824798583984,-32.52583312988281),
-  P(115.6910934448242,-32.51972198486328),
-  P(115.6971969604492,-32.51805877685547),
-  P(115.70166015625,-32.52111053466797),
-  P(115.7022094726563,-32.54444885253906),
-  P(115.7008209228516,-32.55055236816406),
-  P(115.6955337524414,-32.55305480957031),
-  P(115.689697265625,-32.554443359375),
-  P(115.6852569580078,-32.55750274658203),
-  P(115.6527709960938,-32.58611297607422),
-  P(115.6374969482422,-32.60055541992188),
-  P(115.6299667358399,-32.61500549316406),
-  P(115.6296997070313,-32.64055633544922),
-  P(115.6344299316406,-32.65666198730469),
-  P(115.6718673706055,-32.74428176879883),
-  P(115.6735458374023,-32.74728012084961),
-  P(115.6883087158203,-32.77555847167969),
-  P(115.6971969604492,-32.78250122070313),
-  P(115.7044372558594,-32.78361511230469),
-  P(115.7111129760742,-32.78277587890625),
-  P(115.7155532836914,-32.77972412109375),
-  P(115.7185974121094,-32.77527618408203),
-  P(115.7199935913086,-32.7691650390625),
-  P(115.7188720703125,-32.75722503662109),
-  P(115.7159881591797,-32.71566772460938),
-  P(115.7335968017578,-32.64444732666017),
-  P(115.7619323730469,-32.57250213623047),
-  P(115.7438735961914,-32.44888305664063),
-  P(115.7324829101563,-32.32083892822266),
-  P(115.7316589355469,-32.26944732666016),
-  P(115.7383117675781,-32.26028442382813),
-  P(115.755256652832,-32.19499969482422),
-  P(115.755256652832,-32.18860626220703),
-  P(115.7377624511719,-32.09527587890626),
-  P(115.7438735961914,-31.94388961791992),
-  P(115.744140625,-31.92472076416016),
-  P(115.7438735961914,-31.89916610717774),
-  P(115.7427520751953,-31.88750076293946),
-  P(115.7405395507813,-31.87083435058594),
-  P(115.7394332885742,-31.86527633666992),
-  P(115.707763671875,-31.72444152832031),
-  P(115.7038726806641,-31.70833206176759),
-  P(115.6935882568359,-31.68360900878906),
-  P(115.6816635131836,-31.66055679321289),
-  P(115.6394271850586,-31.59527969360352),
-  P(115.5672073364258,-31.48360824584961),
-  P(115.4511032104492,-31.30166625976563),
-  P(115.4399719238281,-31.2841682434082),
-  P(115.4355316162109,-31.27500152587891),
-  P(115.3949890136719,-31.18416595458985),
-  P(115.3752593994141,-31.12222290039063),
-  P(115.3685913085938,-31.10222244262696),
-  P(115.3130264282227,-30.99110794067384),
-  P(115.3074798583984,-30.98221969604492),
-  P(115.2469329833984,-30.89194488525391),
-  P(115.2183227539063,-30.85527801513672),
-  P(115.2147064208985,-30.85139083862305),
-  P(115.2022094726563,-30.84138870239259),
-  P(115.16748046875,-30.77194595336914),
-  P(115.0811004638672,-30.5888900756836),
-  P(115.0494232177734,-30.51611328125),
-  P(115.0455322265625,-30.50694656372071),
-  P(115.0455322265625,-30.50055694580079),
-  P(115.0485992431641,-30.49527740478516),
-  P(115.0530395507813,-30.48472213745117),
-  P(115.054428100586,-30.47916412353516),
-  P(115.0552520751953,-30.47249984741211),
-  P(115.0236129760742,-30.274169921875),
-  P(114.9860992431641,-30.14833450317384),
-  P(114.9844207763672,-30.14277648925781),
-  P(114.966926574707,-30.08611297607422),
-  P(114.9621963500977,-30.07666778564453),
-  P(114.957763671875,-30.07361221313477),
-  P(114.9419326782227,-30.06611251831055),
-  P(114.9385833740234,-30.0625),
-  P(114.9358062744141,-30.05805587768555),
-  P(114.9388732910156,-29.74610900878906),
-  P(114.9394226074219,-29.72749710083008),
-  P(114.9419326782227,-29.67055511474609),
-  P(114.9458236694336,-29.63638687133789),
-  P(114.9483184814453,-29.62222290039063),
-  P(114.9594268798828,-29.57277679443359),
-  P(114.9630432128906,-29.56138992309571),
-  P(114.9719161987305,-29.54027938842773),
-  P(114.9749908447266,-29.53499984741211),
-  P(114.9791564941406,-29.51750183105469),
-  P(114.9797134399414,-29.49888610839846),
-  P(114.9780426025391,-29.48777770996094),
-  P(114.93359375,-29.34749984741211),
-  P(114.9299774169922,-29.33750152587891),
-  P(114.9246978759766,-29.32861328125),
-  P(114.9027709960938,-29.29916763305664),
-  P(114.9047088623047,-29.26833343505859),
-  P(114.9038696289063,-29.26277923583984),
-  P(114.9019317626953,-29.25166702270508),
-  P(114.88916015625,-29.21055603027345),
-  P(114.8855361938477,-29.20111083984375),
-  P(114.8391571044922,-29.10277938842774),
-  P(114.830551147461,-29.09027862548829),
-  P(114.7199935913086,-28.96805572509766),
-  P(114.6910934448242,-28.94416427612305),
-  P(114.6655426025391,-28.92610931396485),
-  P(114.6605377197266,-28.92361068725586),
-  P(114.6524810791016,-28.91666412353516),
-  P(114.6455383300781,-28.90916442871094),
-  P(114.6246871948242,-28.87916564941406),
-  P(114.6138763427734,-28.86305618286133),
-  P(114.5980377197266,-28.83666610717774),
-  P(114.5952606201172,-28.81999969482422),
-  P(114.5916595458985,-28.79750061035156),
-  P(114.5885925292969,-28.77722549438477),
-  P(114.5913696289063,-28.77277755737305),
-  P(114.5944366455078,-28.76055908203125),
-  P(114.5966491699219,-28.72833251953125),
-  P(114.5963668823242,-28.72222137451172),
-  P(114.591926574707,-28.68111038208008),
-  P(114.5871963500977,-28.64055633544922),
-  P(114.5811004638672,-28.62555694580078),
-  P(114.5299835205078,-28.53194427490235),
-  P(114.51416015625,-28.50583648681641),
-  P(114.5027770996094,-28.48805236816407),
-  P(114.3697128295898,-28.32083511352539),
-  P(114.3138732910156,-28.23583221435547),
-  P(114.3110961914063,-28.23221969604492),
-  P(114.307746887207,-28.22833251953125),
-  P(114.2972106933594,-28.22333145141602),
-  P(114.2741470336914,-28.21500015258789),
-  P(114.2636108398438,-28.20972061157227),
-  P(114.2541732788086,-28.20416641235352),
-  P(114.2316589355469,-28.18888854980469),
-  P(114.213607788086,-28.16999816894531),
-  P(114.2066497802734,-28.16249847412109),
-  P(114.1971969604492,-28.15055465698242),
-  P(114.1574935913086,-28.0977783203125),
-  P(114.1510925292969,-28.08416748046875),
-  P(114.1458282470703,-28.06916809082032),
-  P(114.1166534423828,-27.94777679443359),
-  P(114.0955429077148,-27.85750198364258),
-  P(114.0938720703125,-27.84555435180664),
-  P(114.0952606201172,-27.82638931274414),
-  P(114.0977630615234,-27.81361389160156),
-  P(114.1074829101563,-27.77722549438477),
-  P(114.1227569580078,-27.74055480957031),
-  P(114.1277618408203,-27.73083114624024),
-  P(114.13720703125,-27.71860885620117),
-  P(114.1416625976563,-27.70805358886719),
-  P(114.1424865722656,-27.70111083984375),
-  P(114.1352691650391,-27.66249847412109),
-  P(114.1213684082031,-27.60333251953125),
-  P(114.0933227539063,-27.50555801391602),
-  P(114.0727691650391,-27.45111083984375),
-  P(114.0272064208985,-27.36388778686524),
-  P(113.9369201660156,-27.19888687133789),
-  P(113.7991485595703,-26.96749877929688),
-  P(113.7872009277344,-26.95055389404297),
-  P(113.6877593994141,-26.81583404541016),
-  P(113.5858230590821,-26.69083404541016),
-  P(113.5355377197266,-26.63333129882813),
-  P(113.5119323730469,-26.6069450378418),
-  P(113.5,-26.5966682434082),
-  P(113.4908065795898,-26.59083557128907),
-  P(113.4466400146484,-26.55555725097656),
-  P(113.2835998535156,-26.40388870239258),
-  P(113.2785873413086,-26.39500045776368),
-  P(113.2244262695313,-26.23916625976563),
-  P(113.2536010742188,-26.19583129882813),
-  P(113.266098022461,-26.17083358764649),
-  P(113.270263671875,-26.1602783203125),
-  P(113.2719268798828,-26.15416717529297),
-  P(113.2736129760742,-26.14055633544922),
-  P(113.2736129760742,-26.12833404541016),
-  P(113.270263671875,-26.10027694702148),
-  P(113.2644271850586,-26.07333374023438),
-  P(113.2638931274414,-26.05472183227539),
-  P(113.265266418457,-26.04805755615235),
-  P(113.2705383300781,-26.03194427490235),
-  P(113.2755432128906,-26.02138900756836),
-  P(113.2791595458984,-26.01833343505859),
-  P(113.2849884033203,-26.02027893066407),
-  P(113.2916564941406,-26.02777862548829),
-  P(113.29248046875,-26.03361129760742),
-  P(113.3016510009766,-26.1261100769043),
-  P(113.3033065795898,-26.16722106933594),
-  P(113.3041534423828,-26.22249984741211),
-  P(113.3341522216797,-26.27861404418946),
-  P(113.3577575683594,-26.18638610839844),
-  P(113.3655395507813,-26.11888885498047),
-  P(113.5130462646484,-26.28194427490234),
-  P(113.5155487060547,-26.2863883972168),
-  P(113.5341491699219,-26.33499908447266),
-  P(113.5349884033203,-26.34083557128906),
-  P(113.5397033691406,-26.40055465698242),
-  P(113.546371459961,-26.508056640625),
-  P(113.5697174072266,-26.56972122192383),
-  P(113.6413726806641,-26.65277862548828),
-  P(113.6455383300781,-26.65583419799805),
-  P(113.6666564941406,-26.65944290161134),
-  P(113.6744232177734,-26.65999984741211),
-  P(113.6774673461914,-26.6341667175293),
-  P(113.7419281005859,-26.59416580200196),
-  P(113.7697067260742,-26.59916687011721),
-  P(113.7741470336914,-26.60222244262695),
-  P(113.7791595458984,-26.60472106933595),
-  P(113.7858123779297,-26.60610961914063),
-  P(113.7908172607422,-26.60388946533204),
-  P(113.8152618408203,-26.57389068603516),
-  P(113.8558197021484,-26.50750350952148),
-  P(113.8638763427734,-26.48472213745117),
-  P(113.8647003173828,-26.45916366577149),
-  P(113.8636016845703,-26.34111022949219),
-  P(113.8591537475586,-26.33194351196289),
-  P(113.8383178710938,-26.29611206054688),
-  P(113.8330535888672,-26.28778076171875),
-  P(113.8219299316406,-26.27777862548829),
-  P(113.7891464233398,-26.25055694580078),
-  P(113.7435913085938,-26.22666549682617),
-  P(113.6522064208985,-26.1694450378418),
-  P(113.5524673461914,-26.08028030395509),
-  P(113.5499877929688,-26.06972122192383),
-  P(113.5322113037109,-25.98944091796875),
-  P(113.49609375,-25.86555480957031),
-  P(113.4894332885742,-25.85194396972656),
-  P(113.4466400146484,-25.79389190673828),
-  P(113.4085998535156,-25.7430534362793),
-  P(113.3986129760742,-25.73166656494141),
-  P(113.3916625976563,-25.71805572509766),
-  P(113.3905487060547,-25.70277786254883),
-  P(113.3913726806641,-25.68472290039063),
-  P(113.3936004638672,-25.67194366455078),
-  P(113.3980407714844,-25.65499877929688),
-  P(113.4060974121094,-25.633056640625),
-  P(113.4111022949219,-25.62333297729492),
-  P(113.4197082519531,-25.60972213745117),
-  P(113.4694366455078,-25.54083633422852),
-  P(113.4977569580078,-25.56027984619141),
-  P(113.5297088623047,-25.62361145019531),
-  P(113.582763671875,-25.70249938964844),
-  P(113.5894317626953,-25.71083068847656),
-  P(113.5960998535156,-25.71777725219727),
-  P(113.6516571044922,-25.76388931274414),
-  P(113.6871871948242,-25.78805541992188),
-  P(113.6971969604492,-25.7933349609375),
-  P(113.7013931274414,-25.79722213745118),
-  P(113.7038726806641,-25.80222320556641),
-  P(113.7322082519531,-25.87805557250977),
-  P(113.7347106933594,-25.88861083984375),
-  P(113.7347106933594,-25.89472198486328),
-  P(113.7133178710938,-26.00166702270509),
-  P(113.7111129760742,-26.0069465637207),
-  P(113.7074890136719,-26.01083374023438),
-  P(113.6871871948242,-26.02666854858398),
-  P(113.6766510009766,-26.04305648803711),
-  P(113.6830368041992,-26.11111068725586),
-  P(113.6855316162109,-26.12805557250977),
-  P(113.7119293212891,-26.19527816772461),
-  P(113.7160873413086,-26.1986083984375),
-  P(113.7522125244141,-26.20638656616211),
-  P(113.7638931274414,-26.20388793945313),
-  P(113.7716522216797,-26.19721984863281),
-  P(113.7899780273438,-26.17833328247071),
-  P(113.7972106933594,-26.17055511474609),
-  P(113.8035888671875,-26.16222000122071),
-  P(113.8208312988281,-26.1341667175293),
-  P(113.8621978759766,-26.05833435058594),
-  P(113.8644332885742,-26.05305480957031),
-  P(113.8788604736328,-26.02888870239258),
-  P(113.9052581787109,-26.12194442749023),
-  P(113.9269332885742,-26.20944213867188),
-  P(113.9308166503906,-26.26083374023438),
-  P(113.9316635131836,-26.26639175415039),
-  P(113.9588775634766,-26.32777786254884),
-  P(114.0660934448242,-26.46194458007813),
-  P(114.0724868774414,-26.46138763427735),
-  P(114.1908111572266,-26.37805557250977),
-  P(114.1944274902344,-26.3741683959961),
-  P(114.1971969604492,-26.36972045898438),
-  P(114.220832824707,-26.30638885498047),
-  P(114.2227630615234,-26.2955551147461),
-  P(114.2227630615234,-26.28944396972657),
-  P(114.2194366455078,-26.27861404418946),
-  P(114.213607788086,-26.27055740356445),
-  P(114.2066497802734,-26.26361465454102),
-  P(114.1930389404297,-26.25555801391602),
-  P(114.1894226074219,-26.25166702270508),
-  P(114.182746887207,-26.23027801513672),
-  P(114.1733093261719,-26.19361114501954),
-  P(114.171371459961,-26.18305587768555),
-  P(114.171371459961,-26.17694473266602),
-  P(114.1955337524414,-26.03111267089844),
-  P(114.2063827514648,-25.98916625976563),
-  P(114.2397003173828,-26.00139236450195),
-  P(114.2569427490234,-25.97055435180664),
-  P(114.2599868774414,-25.85861206054688),
-  P(114.259162902832,-25.84666824340821),
-  P(114.2566528320313,-25.84305572509766),
-  P(114.1394271850586,-25.73194122314453),
-  P(114.0530395507813,-25.6522216796875),
-  P(114.0372009277344,-25.63750076293945),
-  P(114.0313720703125,-25.63000106811523),
-  P(113.95166015625,-25.49555206298828),
-  P(113.9188690185547,-25.4386100769043),
-  P(113.911376953125,-25.42472076416016),
-  P(113.8688735961914,-25.32555770874024),
-  P(113.8369293212891,-25.24860763549805),
-  P(113.811653137207,-25.18694305419922),
-  P(113.8016510009766,-25.17555618286134),
-  P(113.7974929809571,-25.17222213745117),
-  P(113.7841491699219,-25.16277694702149),
-  P(113.7455291748047,-25.14110946655273),
-  P(113.7119293212891,-25.13000106811523),
-  P(113.7019271850586,-25.125),
-  P(113.6977462768555,-25.12166595458984),
-  P(113.6927490234375,-25.11305618286133),
-  P(113.6541595458984,-25.02250289916992),
-  P(113.6491470336914,-25.008056640625),
-  P(113.6110992431641,-24.88916778564453),
-  P(113.6002731323242,-24.85305404663086),
-  P(113.6052627563477,-24.83611297607422),
-  P(113.6124877929688,-24.82194519042969),
-  P(113.6174774169922,-24.80444717407227),
-  P(113.6158065795898,-24.76139068603516),
-  P(113.6124877929688,-24.74610900878906),
-  P(113.6041564941406,-24.73332977294922),
-  P(113.5749969482422,-24.69194412231445),
-  P(113.5516510009766,-24.65999984741211),
-  P(113.5044403076172,-24.60638809204102),
-  P(113.4844207763672,-24.58416748046875),
-  P(113.4644317626953,-24.56722259521484),
-  P(113.4544372558594,-24.55722427368164),
-  P(113.4269332885742,-24.52750015258789),
-  P(113.4244232177734,-24.52305603027344),
-  P(113.4002685546875,-24.47249984741211),
-  P(113.3944396972656,-24.45194244384766),
-  P(113.3897094726563,-24.429443359375),
-  P(113.3822021484375,-24.24388885498047),
-  P(113.3824768066406,-24.23138809204102),
-  P(113.3844299316406,-24.22610855102539),
-  P(113.38720703125,-24.22166442871096),
-  P(113.4244232177734,-24.13444519042971),
-  P(113.4463729858399,-24.01139068603516),
-  P(113.488037109375,-23.87805557250977),
-  P(113.5322113037109,-23.75722503662109),
-  P(113.5997161865235,-23.63249969482422),
-  P(113.602767944336,-23.62805557250977),
-  P(113.633041381836,-23.60027694702148),
-  P(113.6377716064453,-23.5977783203125),
-  P(113.6594161987305,-23.59194564819336),
-  P(113.6691436767578,-23.58805465698242),
-  P(113.6738662719727,-23.58583450317383),
-  P(113.682746887207,-23.5797233581543),
-  P(113.7377624511719,-23.53499984741211),
-  P(113.7410888671875,-23.53111267089844),
-  P(113.7466430664063,-23.52138900756836),
-  P(113.7630462646484,-23.47277450561523),
-  P(113.7683334350586,-23.44166564941406),
-  P(113.7813720703125,-23.34333419799805),
-  P(113.7827606201172,-23.32500076293946),
-  P(113.7819366455078,-23.31916809082031),
-  P(113.7602691650391,-23.19388961791993),
-  P(113.7824935913086,-23.10555648803711),
-  P(113.7991485595703,-23.08499908447266),
-  P(113.8110961914063,-23.06083297729492),
-  P(113.8152618408203,-23.05027770996095),
-  P(113.8183288574219,-23.03055572509766),
-  P(113.8074798583985,-22.93333053588867),
-  P(113.8008117675781,-22.91333389282227),
-  P(113.7694396972656,-22.82500076293945),
-  P(113.7627716064453,-22.81138992309571),
-  P(113.7555465698242,-22.79833602905274),
-  P(113.7505493164063,-22.78944396972656),
-  P(113.7455291748047,-22.78083419799805),
-  P(113.7374877929688,-22.7683334350586),
-  P(113.7316589355469,-22.76000213623047),
-  P(113.7144317626953,-22.74110794067384),
-  P(113.7063827514648,-22.73555374145508),
-  P(113.6710968017578,-22.68611145019531),
-  P(113.6563720703125,-22.60472106933594),
-  P(113.6833190917969,-22.54639053344727),
-  P(113.6912078857422,-22.54100036621094),
-  P(113.6977462768555,-22.53194427490234),
-  P(113.7333221435547,-22.47527694702148),
-  P(113.7997131347656,-22.33416748046875),
-  P(113.8202667236328,-22.28055572509766),
-  P(113.8377685546875,-22.23166656494141),
-  P(113.863037109375,-22.15388870239259),
-  P(113.8924865722656,-22.0605583190918),
-  P(113.8974914550781,-22.04999923706055),
-  P(113.9333190917969,-21.97610855102539),
-  P(113.9963684082031,-21.88027954101563),
-  P(114.008041381836,-21.86277770996094),
-  P(114.0180511474609,-21.85083389282227),
-  P(114.0302734375,-21.84166717529297),
-  P(114.084716796875,-21.81277847290039),
-  P(114.0938720703125,-21.80889129638672),
-  P(114.1505432128906,-21.79111099243164),
-  P(114.1611022949219,-21.79555511474609),
-  P(114.168586730957,-21.8025016784668),
-  P(114.1716537475586,-21.80611038208009),
-  P(114.1766510009766,-21.81555557250977),
-  P(114.1766510009766,-21.82111358642579),
-  P(114.1752624511719,-21.82722473144531),
-  P(114.1605377197266,-21.84083557128906),
-  P(114.1502685546875,-21.85222244262695),
-  P(114.1394271850586,-21.87111282348633),
-  P(114.1324768066406,-21.88611221313477),
-  P(114.1266479492188,-21.9102783203125),
-  P(114.0761032104492,-22.15833282470703),
-  P(114.0761032104492,-22.17083358764648),
-  P(114.0769271850586,-22.17638778686523),
-  P(114.0819396972656,-22.19138717651368),
-  P(114.0861129760742,-22.20055389404297),
-  P(114.1213684082031,-22.27333450317383),
-  P(114.1419372558594,-22.3013916015625),
-  P(114.1227569580078,-22.39083480834961),
-  P(114.1188735961914,-22.39389038085938),
-  P(114.1160888671875,-22.39860916137695),
-  P(114.1147003173828,-22.40444564819336),
-  P(114.1085968017578,-22.48166656494141),
-  P(114.1119232177734,-22.49138641357422),
-  P(114.1266479492188,-22.51222229003907),
-  P(114.1333312988281,-22.51972198486329),
-  P(114.1416625976563,-22.52611160278321),
-  P(114.147216796875,-22.52777862548828),
-  P(114.1538696289063,-22.52777862548828),
-  P(114.1977462768555,-22.50889205932618),
-  P(114.3724822998047,-22.44249725341797),
-  P(114.3861083984375,-22.38138961791992),
-  P(114.390266418457,-22.36333465576172),
-  P(114.3924865722656,-22.35666656494141),
-  P(114.3999862670898,-22.33555603027344),
-  P(114.4083328247071,-22.31416702270508),
-  P(114.4608230590821,-22.19027709960938),
-  P(114.5180511474609,-22.08722305297852),
-  P(114.6241531372071,-21.92527770996094),
-  P(114.6266479492188,-21.92055511474609),
-  P(114.630256652832,-21.90944290161134),
-  P(114.6299667358398,-21.89083480834961),
-  P(114.6313629150391,-21.87111282348633),
-  P(114.6327514648438,-21.8650016784668),
-  P(114.6369323730469,-21.85444641113281),
-  P(114.6438827514649,-21.84611129760742),
-  P(114.6510925292969,-21.84000015258789),
-  P(114.6960906982422,-21.81333541870117),
-  P(114.7388763427734,-21.80083465576172),
-  P(114.8397064208984,-21.74805450439453),
-  P(114.9319305419922,-21.69222259521484),
-  P(114.9374771118164,-21.68999862670898),
-  P(114.9474792480469,-21.68666458129883),
-  P(114.9541625976563,-21.68583297729492),
-  P(114.9810867309571,-21.68777847290039),
-  P(115.0086135864258,-21.69222259521484),
-  P(115.0213775634766,-21.69138717651367),
-  P(115.0327606201172,-21.68888854980469),
-  P(115.0527572631836,-21.68111038208008),
-  P(115.1597137451172,-21.63055419921875),
-  P(115.2455291748047,-21.59194564819336),
-  P(115.3366470336914,-21.56639099121094),
-  P(115.4455337524414,-21.52194595336914),
-  P(115.4583282470703,-21.51361465454102),
-  P(115.4697113037109,-21.50361251831055),
-  P(115.4963684082031,-21.47249984741211),
-  P(115.5211029052735,-21.44027709960938),
-  P(115.5494232177734,-21.40444564819336),
-  P(115.6194305419922,-21.33194351196289),
-  P(115.6352691650391,-21.3194465637207),
-  P(115.6749877929688,-21.28944396972656),
-  P(115.6849822998047,-21.28555679321289),
-  P(115.7366485595703,-21.26750183105469),
-  P(115.7816619873047,-21.25),
-  P(115.7910919189453,-21.24555206298828),
-  P(115.8002624511719,-21.2408332824707),
-  P(115.8127593994141,-21.23221969604492),
-  P(115.8222198486328,-21.21999740600586),
-  P(115.8369293212891,-21.19055557250977),
-  P(115.8624877929688,-21.1455535888672),
-  P(115.8777618408203,-21.125),
-  P(115.9055480957031,-21.08833312988281),
-  P(115.9155426025391,-21.07694625854492),
-  P(115.9233093261719,-21.070556640625),
-  P(115.9272003173828,-21.06750106811523),
-  P(115.9544372558594,-21.05222320556641),
-  P(115.9874877929688,-21.0363883972168),
-  P(116.0086135864258,-21.03000259399414),
-  P(116.1219177246094,-20.98749923706055),
-  P(116.1363830566406,-20.98138809204102),
-  P(116.1541595458985,-20.97111129760742),
-  P(116.1655426025391,-20.96055603027344),
-  P(116.1719207763672,-20.94527816772461),
-  P(116.1855316162109,-20.90194320678711),
-  P(116.2488708496094,-20.86888885498047),
-  P(116.3094177246094,-20.86166763305664),
-  P(116.4755401611328,-20.80611038208008),
-  P(116.5897064208985,-20.7408332824707),
-  P(116.6066436767578,-20.73055267333985),
-  P(116.6144332885742,-20.72444152832031),
-  P(116.7074890136719,-20.64916610717773),
-  P(116.7855377197266,-20.64833450317383),
-  P(116.7844161987305,-20.65444564819336),
-  P(116.7844161987305,-20.66055679321289),
-  P(116.7855377197266,-20.66611099243164),
-  P(116.7885894775391,-20.67055511474609),
-  P(116.7955322265625,-20.67722320556641),
-  P(116.8274765014649,-20.70360946655274),
-  P(116.8363800048828,-20.70833206176759),
-  P(116.8647003173828,-20.71749877929688),
-  P(116.8713684082031,-20.71860885620117),
-  P(116.8777618408203,-20.71860885620117),
-  P(116.88916015625,-20.71527481079102),
-  P(116.8983306884766,-20.71110916137695),
-  P(116.9210968017578,-20.69944381713867),
-  P(116.9305419921875,-20.69444274902345),
-  P(116.9383087158203,-20.68833160400391),
-  P(116.9488677978516,-20.67694473266602),
-  P(116.9566497802734,-20.67138671875),
-  P(116.9933166503906,-20.6522216796875),
-  P(117.0405426025391,-20.63000106811523),
-  P(117.0502624511719,-20.62583160400391),
-  P(117.0666732788086,-20.62166595458984),
-  P(117.1569366455078,-20.64166641235352),
-  P(117.1619262695313,-20.65027618408203),
-  P(117.1710968017578,-20.66166687011719),
-  P(117.1869201660156,-20.68083190917969),
-  P(117.1944274902344,-20.6875),
-  P(117.2044372558594,-20.69222259521484),
-  P(117.26220703125,-20.7158317565918),
-  P(117.2736129760742,-20.71944427490234),
-  P(117.2858123779297,-20.72222137451172),
-  P(117.3049774169922,-20.725830078125),
-  P(117.3172073364258,-20.72805404663086),
-  P(117.3383178710938,-20.73027801513672),
-  P(117.3463668823242,-20.73083114624023),
-  P(117.3805389404297,-20.73138809204102),
-  P(117.4002685546875,-20.73083114624023),
-  P(117.4122009277344,-20.72888565063477),
-  P(117.48193359375,-20.71638870239258),
-  P(117.682746887207,-20.67694473266602),
-  P(117.6880264282227,-20.67583084106445),
-  P(117.7377624511719,-20.65638732910156),
-  P(117.82666015625,-20.62027740478516),
-  P(117.8363800048828,-20.61611175537109),
-  P(117.8502731323242,-20.60833358764649),
-  P(117.9191436767578,-20.55861282348633),
-  P(117.9246978759766,-20.55055618286133),
-  P(117.9324798583985,-20.53555679321289),
-  P(117.9349822998047,-20.524169921875),
-  P(118.0005493164063,-20.46805572509766),
-  P(118.0691528320313,-20.40999984741211),
-  P(118.1319274902344,-20.36861038208008),
-  P(118.1449890136719,-20.36055755615234),
-  P(118.1683197021484,-20.34916687011719),
-  P(118.1783065795898,-20.34500122070313),
-  P(118.1824798583985,-20.34805679321289),
-  P(118.1849822998047,-20.35250091552734),
-  P(118.1888732910156,-20.36833190917969),
-  P(118.1888732910156,-20.37444305419922),
-  P(118.1955337524414,-20.37555694580079),
-  P(118.234992980957,-20.37416839599609),
-  P(118.3974914550781,-20.34972381591797),
-  P(118.5452575683594,-20.32527923583984),
-  P(118.6483306884766,-20.3297233581543),
-  P(118.6538696289063,-20.33166885375977),
-  P(118.6611022949219,-20.33194351196289),
-  P(118.6677627563477,-20.33111190795898),
-  P(118.8010864257813,-20.28583526611328),
-  P(118.818603515625,-20.2752799987793),
-  P(118.8224868774414,-20.27138900756836),
-  P(118.9471969604492,-20.12111282348633),
-  P(118.9527664184571,-20.11277770996094),
-  P(118.9621963500977,-20.09361267089845),
-  P(118.9736022949219,-20.05472183227539),
-  P(118.9747009277344,-20.04861068725586),
-  P(118.9766464233399,-20.0433349609375),
-  P(118.9797134399414,-20.03944396972657),
-  P(118.9835968017578,-20.03611373901367),
-  P(119.0780487060547,-19.96999740600586),
-  P(119.0824890136719,-19.96749877929688),
-  P(119.1688690185547,-19.95694351196289),
-  P(119.1888732910156,-19.95944213867188),
-  P(119.3658065795898,-19.99944305419922),
-  P(119.4341430664063,-20.01694488525391),
-  P(119.5469436645508,-20.06500244140625),
-  P(119.5583190917969,-20.06833267211914),
-  P(119.5785980224609,-20.07111358642578),
-  P(119.5849914550781,-20.070556640625),
-  P(119.6013793945313,-20.06611251831055),
-  P(119.6927490234375,-20.0183334350586),
-  P(119.720832824707,-19.99805450439453),
-  P(119.7855377197266,-19.97166442871094),
-  P(120.0224914550781,-19.93305587768555),
-  P(120.1574935913086,-19.91694259643555),
-  P(120.1705322265625,-19.91638946533203),
-  P(120.2038726806641,-19.91472244262695),
-  P(120.2344207763672,-19.9102783203125),
-  P(120.2447128295898,-19.90722274780273),
-  P(120.3294372558594,-19.88111114501953),
-  P(120.3449935913086,-19.87583160400391),
-  P(120.5594177246094,-19.79194641113281),
-  P(120.8785934448242,-19.66527557373047),
-  P(120.9111022949219,-19.65055465698242),
-  P(120.9866485595703,-19.61472320556641),
-  P(121.0005493164063,-19.6077766418457),
-  P(121.0274810791016,-19.59222412109375),
-  P(121.0761032104492,-19.55777740478516),
-  P(121.1246871948242,-19.52250289916992),
-  P(121.1366577148438,-19.51361465454102),
-  P(121.2080383300781,-19.45916366577148),
-  P(121.2283172607422,-19.44305419921875),
-  P(121.2388763427734,-19.43388748168945),
-  P(121.2766571044922,-19.39500045776367),
-  P(121.3202667236328,-19.34722137451172),
-  P(121.3338775634766,-19.33222198486328),
-  P(121.4885864257813,-19.12305450439453),
-  P(121.5036010742188,-19.09583282470703),
-  P(121.5572128295899,-18.99361038208009),
-  P(121.6394271850586,-18.8138885498047),
-  P(121.7719268798828,-18.65722274780273),
-  P(121.7766571044922,-18.64749908447266),
-  P(121.7783203125,-18.64277648925781),
-  P(121.7791595458985,-18.63583374023438),
-  P(121.7788696289063,-18.63055419921875),
-  P(121.7774810791016,-18.625),
-  P(121.7711029052735,-18.61111068725586),
-  P(121.7658233642578,-18.60277938842773),
-  P(121.76220703125,-18.59944534301758),
-  P(121.7574920654297,-18.59638977050781),
-  P(121.7649993896484,-18.55611038208008),
-  P(121.800537109375,-18.48027801513672),
-  P(121.8099822998047,-18.46166610717773),
-  P(121.8135986328125,-18.45833206176758),
-  P(121.8180465698242,-18.45583343505859),
-  P(121.8244323730469,-18.4555549621582),
-  P(121.8299865722656,-18.45722198486328),
-  P(121.8336029052734,-18.46055603027344),
-  P(121.8460998535156,-18.46916580200195),
-  P(121.8516464233398,-18.47138595581055),
-  P(121.8844299316406,-18.47499847412109),
-  P(121.895263671875,-18.47249984741211),
-  P(121.939697265625,-18.44805526733398),
-  P(121.9927520751953,-18.40999984741211),
-  P(122.0083312988281,-18.39722061157227),
-  P(122.0188827514648,-18.38722229003906),
-  P(122.0285873413086,-18.3761100769043),
-  P(122.0430526733399,-18.35499954223633),
-  P(122.0666732788086,-18.31750106811523),
-  P(122.084716796875,-18.31416702270508),
-  P(122.0991516113281,-18.30722427368164),
-  P(122.1116485595703,-18.29944610595703),
-  P(122.1285934448242,-18.28861236572266),
-  P(122.310531616211,-18.15944290161133),
-  P(122.3180465698242,-18.15361022949219),
-  P(122.3374862670898,-18.13138961791992),
-  P(122.3533172607422,-18.10555648803711),
-  P(122.3572082519531,-18.09555435180664),
-  P(122.3660888671875,-18.06999969482422),
-  P(122.369140625,-18.05111312866211),
-  P(122.3697128295898,-18.03833389282227),
-  P(122.3636016845703,-18.01028060913086),
-  P(122.3597106933594,-18.00083541870117),
-  P(122.3544311523438,-17.99249649047852),
-  P(122.3474884033203,-17.98472213745117),
-  P(122.3322067260742,-17.97944259643555),
-  P(122.2527770996094,-17.95833206176759),
-  P(122.210823059082,-17.90083312988281),
-  P(122.2113800048828,-17.88638687133789),
-  P(122.2005462646484,-17.7077751159668),
-  P(122.1991424560547,-17.70138931274414),
-  P(122.1952514648438,-17.69249725341797),
-  P(122.1874771118164,-17.679443359375),
-  P(122.1785888671875,-17.66749954223633),
-  P(122.1741485595703,-17.65861129760742),
-  P(122.1494293212891,-17.59027862548828),
-  P(122.1441497802734,-17.57500076293945),
-  P(122.1408233642578,-17.55805587768555),
-  P(122.1386032104492,-17.52833557128906),
-  P(122.1386032104492,-17.50861358642578),
-  P(122.1438827514648,-17.36305618286133),
-  P(122.1749877929688,-17.24333190917969),
-  P(122.2533264160156,-17.11138916015625),
-  P(122.2599868774414,-17.10416793823242),
-  P(122.2810974121094,-17.08416748046875),
-  P(122.2883071899414,-17.07749938964844),
-  P(122.3624877929688,-17.01083374023438),
-  P(122.379150390625,-16.99610900878906),
-  P(122.3994293212891,-16.98194122314453),
-  P(122.4383087158203,-16.95888900756836),
-  P(122.4469299316406,-16.95388793945313),
-  P(122.4522094726563,-16.95194244384766),
-  P(122.5244293212891,-16.9566650390625),
-  P(122.578598022461,-16.95916366577148),
-  P(122.5699920654297,-16.9474983215332),
-  P(122.5299835205078,-16.87194442749023),
-  P(122.5241470336914,-16.85750198364258),
-  P(122.5224914550781,-16.8466682434082),
-  P(122.5252685546875,-16.84277725219727),
-  P(122.5610961914063,-16.79472351074219),
-  P(122.5719299316406,-16.78499984741211),
-  P(122.5855407714844,-16.77888870239258),
-  P(122.5919265747071,-16.77777862548828),
-  P(122.5974884033203,-16.77861404418945),
-  P(122.6008071899414,-16.78194427490234),
-  P(122.6080322265625,-16.79583358764648),
-  P(122.6113662719727,-16.79916763305664),
-  P(122.6163787841797,-16.8013916015625),
-  P(122.6288604736328,-16.8025016784668),
-  P(122.6397094726563,-16.79972457885742),
-  P(122.6766510009766,-16.78805541992188),
-  P(122.7522125244141,-16.76222229003906),
-  P(122.76220703125,-16.73360824584961),
-  P(122.738037109375,-16.70388793945313),
-  P(122.7355270385742,-16.69972229003906),
-  P(122.7363662719727,-16.69305419921875),
-  P(122.7586135864258,-16.60555648803711),
-  P(122.7624969482422,-16.59555435180664),
-  P(122.7736129760742,-16.5797233581543),
-  P(122.7880401611328,-16.56694412231445),
-  P(122.7930526733399,-16.56500244140625),
-  P(122.7999877929688,-16.56527709960938),
-  P(122.810531616211,-16.56888961791992),
-  P(122.8238830566406,-16.56861114501953),
-  P(122.8374862670898,-16.56166839599609),
-  P(122.8452606201172,-16.55583572387695),
-  P(122.8927612304688,-16.50777816772461),
-  P(122.8958282470703,-16.49694442749023),
-  P(122.8955383300781,-16.4849967956543),
-  P(122.8933334350586,-16.46722030639648),
-  P(122.8936004638672,-16.46055603027344),
-  P(122.8997192382813,-16.44583129882813),
-  P(122.9022064208984,-16.44138717651367),
-  P(122.9177627563477,-16.41555404663086),
-  P(122.9227600097656,-16.41361236572266),
-  P(122.9916534423828,-16.38972091674805),
-  P(123.0610961914063,-16.44638824462891),
-  P(123.0621871948242,-16.45166397094727),
-  P(123.0613708496094,-16.4577751159668),
-  P(123.0563735961914,-16.46638870239258),
-  P(123.047492980957,-16.47833251953125),
-  P(123.0438690185547,-16.48138809204102),
-  P(123.0388793945313,-16.48332977294922),
-  P(123.0260925292969,-16.48221969604492),
-  P(123.0208282470703,-16.47999954223633),
-  P(123.0172119140625,-16.47722244262695),
-  P(123.0077667236328,-16.47305297851563),
-  P(123.0019378662109,-16.47138595581055),
-  P(122.9958190917969,-16.47194290161133),
-  P(122.9908065795899,-16.4738883972168),
-  P(122.9871978759766,-16.47694396972656),
-  P(122.9841537475586,-16.48110961914063),
-  P(122.9552612304688,-16.58444595336914),
-  P(122.9572067260742,-16.58916854858398),
-  P(122.973876953125,-16.62444305419922),
-  P(122.9805526733398,-16.63166809082031),
-  P(123.0197067260742,-16.6702766418457),
-  P(123.0594177246094,-16.69166564941406),
-  P(123.0772094726563,-16.69944381713867),
-  P(123.0960998535156,-16.71611022949219),
-  P(123.1163787841797,-16.79277801513672),
-  P(123.2047119140625,-16.95222091674805),
-  P(123.307746887207,-17.13750076293945),
-  P(123.3744201660156,-17.24694442749023),
-  P(123.4347076416016,-17.34277725219727),
-  P(123.4780426025391,-17.40916442871094),
-  P(123.5358123779297,-17.49416351318359),
-  P(123.5524673461914,-17.51277923583984),
-  P(123.5544281005859,-17.5172233581543),
-  P(123.5752716064453,-17.59749984741211),
-  P(123.5794372558594,-17.59527969360352),
-  P(123.582763671875,-17.59166717529297),
-  P(123.5863800048828,-17.5797233581543),
-  P(123.594711303711,-17.51222229003906),
-  P(123.5933227539063,-17.50722503662109),
-  P(123.5724868774414,-17.47888565063477),
-  P(123.5638732910156,-17.46110916137695),
-  P(123.5599822998047,-17.44583129882813),
-  P(123.5635986328125,-17.36722183227539),
-  P(123.6163787841797,-17.21083068847656),
-  P(123.6216430664063,-17.20138931274414),
-  P(123.5755462646485,-17.08111190795898),
-  P(123.5724868774414,-17.06472396850586),
-  P(123.5736083984375,-17.04083633422852),
-  P(123.57470703125,-17.03388977050781),
-  P(123.5788726806641,-17.02277755737305),
-  P(123.5885925292969,-17.00333404541016),
-  P(123.5966491699219,-16.98999786376953),
-  P(123.6483306884766,-16.99249649047852),
-  P(123.6547088623047,-16.99388885498047),
-  P(123.6599884033203,-16.99638748168945),
-  P(123.7274780273438,-17.06666564941406),
-  P(123.7602691650391,-17.11000061035156),
-  P(123.7697067260742,-17.12722396850586),
-  P(123.7824935913086,-17.14249801635742),
-  P(123.8497161865234,-17.20166397094727),
-  P(123.8619232177734,-17.21110916137695),
-  P(123.8763732910156,-17.21971893310547),
-  P(123.8888931274414,-17.22277450561523),
-  P(123.8949890136719,-17.22249984741211),
-  P(123.9055480957031,-17.21999740600586),
-  P(123.9144287109375,-17.21500015258789),
-  P(123.9177627563477,-17.21138763427734),
-  P(123.9183197021484,-17.20444488525391),
-  P(123.9135971069336,-17.20222091674805),
-  P(123.8878326416016,-17.19525146484375),
-  P(123.8769226074219,-17.19138717651367),
-  P(123.8727569580078,-17.1886100769043),
-  P(123.8383178710938,-17.14666748046875),
-  P(123.8324890136719,-17.13888931274414),
-  P(123.8302764892578,-17.13444519042969),
-  P(123.82666015625,-17.12472152709961),
-  P(123.8030395507813,-17.03944396972656),
-  P(123.7949829101563,-17.0091667175293),
-  P(123.7949829101563,-16.99721908569336),
-  P(123.7977600097656,-16.99277496337891),
-  P(123.8369293212891,-16.94388961791992),
-  P(123.8916625976563,-16.89333343505859),
-  P(123.8583221435547,-16.87638854980469),
-  P(123.7822113037109,-16.89888763427734),
-  P(123.7719268798828,-16.89389038085938),
-  P(123.7608184814453,-16.88249969482422),
-  P(123.7541732788086,-16.86972045898438),
-  P(123.7177581787109,-16.78805541992188),
-  P(123.6077575683594,-16.67333221435547),
-  P(123.6136016845703,-16.56416702270508),
-  P(123.5466537475586,-16.56694412231445),
-  P(123.54248046875,-16.56972122192383),
-  P(123.5102691650391,-16.56833267211914),
-  P(123.5024871826172,-16.56722259521484),
-  P(123.4963684082031,-16.56416702270508),
-  P(123.4588775634766,-16.53778076171875),
-  P(123.4272003173828,-16.50638961791992),
-  P(123.4244232177735,-16.50250244140625),
-  P(123.4230270385742,-16.49666595458984),
-  P(123.4260864257813,-16.49249649047852),
-  P(123.4933166503906,-16.49721908569336),
-  P(123.5630264282227,-16.51555633544922),
-  P(123.6105270385742,-16.53028106689453),
-  P(123.624153137207,-16.53250122070313),
-  P(123.6410980224609,-16.52944564819336),
-  P(123.7088775634766,-16.43027877807617),
-  P(123.7174835205078,-16.37888717651367),
-  P(123.7163772583008,-16.34611129760742),
-  P(123.7133178710938,-16.34222412109375),
-  P(123.7086029052735,-16.33944320678711),
-  P(123.691650390625,-16.33277893066406),
-  P(123.6852569580078,-16.33222198486328),
-  P(123.6735992431641,-16.33333206176758),
-  P(123.6044311523438,-16.32333374023438),
-  P(123.5991516113281,-16.32138824462891),
-  P(123.5897064208984,-16.31583404541016),
-  P(123.5602569580078,-16.28833389282227),
-  P(123.5552520751953,-16.20999908447266),
-  P(123.5591430664063,-16.19110870361328),
-  P(123.5666732788086,-16.17638778686523),
-  P(123.5697174072266,-16.17194366455078),
-  P(123.5736083984375,-16.16916656494141),
-  P(123.6008071899414,-16.15722274780273),
-  P(123.6055526733398,-16.15527725219727),
-  P(123.7230377197266,-16.13833236694336),
-  P(123.7294311523438,-16.13888931274414),
-  P(123.7994232177735,-16.18694305419922),
-  P(123.8038635253906,-16.19027709960938),
-  P(123.8069305419922,-16.19416427612305),
-  P(123.8088684082031,-16.19944381713867),
-  P(123.8080291748047,-16.20527648925781),
-  P(123.7838668823242,-16.24610900878906),
-  P(123.7347106933594,-16.25611114501953),
-  P(123.72998046875,-16.258056640625),
-  P(123.7330474853516,-16.26194763183594),
-  P(123.8391571044922,-16.36805725097656),
-  P(123.8913726806641,-16.37888717651367),
-  P(123.8916625976563,-16.34277725219727),
-  P(123.8938827514648,-16.33694458007813),
-  P(123.9644317626953,-16.24555206298828),
-  P(124.0802764892578,-16.26083374023438),
-  P(124.0922088623047,-16.26416778564453),
-  P(124.113037109375,-16.27333450317383),
-  P(124.1399765014648,-16.2852783203125),
-  P(124.1599884033203,-16.29500198364258),
-  P(124.1727600097656,-16.31000137329102),
-  P(124.1824798583985,-16.3386116027832),
-  P(124.1958236694336,-16.37166595458984),
-  P(124.2022094726563,-16.38583374023438),
-  P(124.2047119140625,-16.38972091674805),
-  P(124.2074890136719,-16.39361190795898),
-  P(124.2158203125,-16.40027618408203),
-  P(124.2263793945313,-16.4033317565918),
-  P(124.2385864257813,-16.40666580200195),
-  P(124.3274765014648,-16.41083145141602),
-  P(124.3385925292969,-16.40888977050781),
-  P(124.3413696289063,-16.39694595336914),
-  P(124.3463668823242,-16.38722229003906),
-  P(124.3735961914063,-16.35722351074219),
-  P(124.3827514648438,-16.35111236572266),
-  P(124.3877716064453,-16.35027694702149),
-  P(124.3933334350586,-16.35250091552734),
-  P(124.4149932861328,-16.36611175537109),
-  P(124.4758071899414,-16.39583206176758),
-  P(124.5724868774414,-16.40527725219727),
-  P(124.584716796875,-16.40583419799805),
-  P(124.6647033691406,-16.39389038085938),
-  P(124.7199935913086,-16.38527679443359),
-  P(124.7383117675781,-16.38444519042969),
-  P(124.7455291748047,-16.3849983215332),
-  P(124.76416015625,-16.38972091674805),
-  P(124.7697067260742,-16.39194488525391),
-  P(124.8358230590821,-16.43000030517578),
-  P(124.8474884033203,-16.42888641357422),
-  P(124.890266418457,-16.41916656494141),
-  P(124.8994293212891,-16.41500091552734),
-  P(124.9016571044922,-16.40972137451172),
-  P(124.8997192382813,-16.40527725219727),
-  P(124.8949890136719,-16.40250015258789),
-  P(124.8816528320313,-16.39972305297852),
-  P(124.8524780273438,-16.40250015258789),
-  P(124.8472137451172,-16.40388870239258),
-  P(124.8352737426758,-16.40499877929688),
-  P(124.8283233642578,-16.40388870239258),
-  P(124.8152618408203,-16.39999771118164),
-  P(124.7491531372071,-16.37583160400391),
-  P(124.7091522216797,-16.35472106933594),
-  P(124.7013931274414,-16.34860992431641),
-  P(124.6921997070313,-16.34305572509766),
-  P(124.686653137207,-16.3411102294922),
-  P(124.6188735961914,-16.32833480834961),
-  P(124.6116485595703,-16.32722473144531),
-  P(124.5688781738281,-16.32444381713867),
-  P(124.5558166503906,-16.32389068603516),
-  P(124.5074920654297,-16.33416748046875),
-  P(124.4974822998047,-16.33666610717773),
-  P(124.47998046875,-16.34749984741211),
-  P(124.4297027587891,-16.34972381591797),
-  P(124.4169311523438,-16.34860992431641),
-  P(124.4124908447266,-16.34583282470703),
-  P(124.4005432128906,-16.32944488525391),
-  P(124.3822021484375,-16.28250122070313),
-  P(124.3760833740235,-16.22194290161133),
-  P(124.3908233642578,-16.17499923706055),
-  P(124.3930511474609,-16.16971969604492),
-  P(124.4305419921875,-16.10250091552734),
-  P(124.470832824707,-16.09333419799805),
-  P(124.4997100830078,-16.14389038085938),
-  P(124.5130462646484,-16.16388702392578),
-  P(124.5244293212891,-16.16333389282227),
-  P(124.5930480957031,-16.11416625976563),
-  P(124.5852737426758,-16.02277755737305),
-  P(124.6016464233399,-15.95611000061035),
-  P(124.6147003173828,-15.91861152648926),
-  P(124.6652679443359,-15.8630542755127),
-  P(124.7247009277344,-15.81416702270508),
-  P(124.7283172607422,-15.81055641174316),
-  P(124.7269287109375,-15.80555534362793),
-  P(124.6977462768555,-15.79361152648926),
-  P(124.6730270385742,-15.78666687011719),
-  P(124.6672134399414,-15.78722190856934),
-  P(124.6255264282227,-15.7947244644165),
-  P(124.6177520751953,-15.79999923706055),
-  P(124.6108093261719,-15.80722236633301),
-  P(124.5772094726563,-15.85472106933594),
-  P(124.5608062744141,-15.88083267211914),
-  P(124.5508117675781,-15.89944458007813),
-  P(124.5347137451172,-15.93638801574707),
-  P(124.4877624511719,-15.93722152709961),
-  P(124.4049835205078,-15.87444305419922),
-  P(124.4013824462891,-15.8711109161377),
-  P(124.397216796875,-15.85583305358887),
-  P(124.3774719238281,-15.73194313049316),
-  P(124.3713684082031,-15.67138862609863),
-  P(124.3724822998047,-15.66527652740479),
-  P(124.4477462768555,-15.48638725280762),
-  P(124.4547119140625,-15.4788875579834),
-  P(124.4633178710938,-15.4738883972168),
-  P(124.48193359375,-15.46583366394043),
-  P(124.4871978759766,-15.46444511413574),
-  P(124.4933166503906,-15.46527671813965),
-  P(124.5297088623047,-15.48027801513672),
-  P(124.5388793945313,-15.48666572570801),
-  P(124.5408172607422,-15.49638652801514),
-  P(124.5452575683594,-15.5),
-  P(124.5791625976563,-15.51749992370606),
-  P(124.5844268798828,-15.51611137390137),
-  P(124.6066436767578,-15.50750160217285),
-  P(124.6563720703125,-15.47972106933594),
-  P(124.6772003173828,-15.45583343505859),
-  P(124.6710968017578,-15.45416641235352),
-  P(124.6608123779297,-15.34277725219727),
-  P(124.6577606201172,-15.27916717529297),
-  P(124.6619262695313,-15.26111221313477),
-  P(124.6641464233398,-15.25666809082031),
-  P(124.66943359375,-15.25527954101563),
-  P(124.7022094726563,-15.25250053405762),
-  P(124.7083282470703,-15.2541675567627),
-  P(124.9124908447266,-15.35610961914063),
-  P(124.9399719238281,-15.37805557250977),
-  P(124.9435882568359,-15.38111114501953),
-  P(124.9844207763672,-15.41833305358887),
-  P(124.9949798583984,-15.42944526672364),
-  P(124.9977569580078,-15.43972206115723),
-  P(125.1818084716797,-15.52068519592285),
-  P(125.18359375,-15.51277923583985),
-  P(125.1799774169922,-15.50944519042969),
-  P(125.1722106933594,-15.50277900695801),
-  P(125.1197128295898,-15.46277809143066),
-  P(125.1013793945313,-15.4505558013916),
-  P(125.0844268798828,-15.43972206115723),
-  P(125.0769271850586,-15.43305587768555),
-  P(125.0738830566406,-15.42916679382324),
-  P(125.0702667236328,-15.41972160339356),
-  P(125.0697174072266,-15.41416740417481),
-  P(125.0724868774414,-15.4013900756836),
-  P(125.0866470336914,-15.35694313049316),
-  P(125.0922088623047,-15.34749984741211),
-  P(125.0991516113281,-15.34083366394043),
-  P(125.1072082519531,-15.33499908447266),
-  P(125.1163787841797,-15.3308334350586),
-  P(125.1208190917969,-15.31555557250977),
-  P(125.1033172607422,-15.30472183227539),
-  P(125.0913696289063,-15.29888916015625),
-  P(125.0113830566406,-15.30055618286133),
-  P(124.9863662719727,-15.30944442749023),
-  P(124.9633178710938,-15.31972122192383),
-  P(124.9591522216797,-15.32277679443359),
-  P(124.9280395507813,-15.33888816833496),
-  P(124.9227600097656,-15.34083366394043),
-  P(124.9177627563477,-15.34138870239258),
-  P(124.9116516113281,-15.33916664123535),
-  P(124.9041595458984,-15.33194446563721),
-  P(124.8956451416016,-15.28988838195801),
-  P(124.8958206176758,-15.28622150421143),
-  P(124.8971481323242,-15.28272247314453),
-  P(124.8988265991211,-15.28005599975586),
-  P(124.904655456543,-15.27305603027344),
-  P(124.9374771118164,-15.22833347320557),
-  P(124.966926574707,-15.20888900756836),
-  P(124.9722137451172,-15.20777702331543),
-  P(124.9791564941406,-15.20861053466797),
-  P(124.984992980957,-15.21722221374512),
-  P(124.988037109375,-15.22027778625488),
-  P(124.9958190917969,-15.22694396972656),
-  P(125.0002670288086,-15.22972106933594),
-  P(125.0063781738281,-15.23138809204102),
-  P(125.0111083984375,-15.22916603088379),
-  P(125.0477600097656,-15.17305564880371),
-  P(125.0499877929688,-15.16777801513672),
-  P(125.0494232177734,-15.16277885437012),
-  P(125.0458221435547,-15.15888977050781),
-  P(125.0402679443359,-15.15750122070313),
-  P(125.0127716064453,-15.15361213684082),
-  P(124.9324798583985,-15.19999885559082),
-  P(124.9277572631836,-15.20388793945313),
-  P(124.8922729492188,-15.22766590118408),
-  P(124.890266418457,-15.22983169555664),
-  P(124.8830947875977,-15.23999977111816),
-  P(124.880256652832,-15.2413330078125),
-  P(124.8770904541016,-15.23999977111816),
-  P(124.8544311523438,-15.23611068725586),
-  P(124.8244323730469,-15.16749954223633),
-  P(124.8238830566406,-15.16194534301758),
-  P(124.8255462646484,-15.15583419799805),
-  P(124.85693359375,-15.12027740478516),
-  P(124.8974914550781,-15.09999847412109),
-  P(124.9035873413086,-15.10083198547363),
-  P(124.9591522216797,-15.11722183227539),
-  P(124.9802703857422,-15.11083221435547),
-  P(125.0252685546875,-15.08805465698242),
-  P(125.0358123779297,-15.07583236694336),
-  P(125.0361022949219,-15.06972122192383),
-  P(125.0344161987305,-15.06527709960938),
-  P(125.0183334350586,-15.04083442687988),
-  P(125.0783233642578,-14.99972152709961),
-  P(125.147216796875,-15.15139007568359),
-  P(125.1630401611328,-15.16416740417481),
-  P(125.1663818359375,-15.16055679321289),
-  P(125.1744232177734,-15.12222099304199),
-  P(125.1746978759766,-15.11666488647461),
-  P(125.1619262695313,-15.07972145080566),
-  P(125.1616516113281,-15.03388977050781),
-  P(125.2210998535156,-15.0625),
-  P(125.2491531372071,-15.07972145080566),
-  P(125.2752685546875,-15.09583282470703),
-  P(125.2797088623047,-15.09999847412109),
-  P(125.2810974121094,-15.1044454574585),
-  P(125.2758178710938,-15.12916564941406),
-  P(125.2763824462891,-15.13472366333008),
-  P(125.2802734375,-15.1380558013916),
-  P(125.2947082519531,-15.14638900756836),
-  P(125.3094177246094,-15.15277862548828),
-  P(125.3211135864258,-15.1563892364502),
-  P(125.3280487060547,-15.15750122070313),
-  P(125.4077606201172,-15.15500068664551),
-  P(125.4219207763672,-15.14805603027344),
-  P(125.4299774169922,-15.1422233581543),
-  P(125.4333190917969,-15.13861274719239),
-  P(125.4377593994141,-15.12888717651367),
-  P(125.4380264282227,-15.12277603149414),
-  P(125.4333190917969,-15.11916542053223),
-  P(125.4202575683594,-15.11666488647461),
-  P(125.4097137451172,-15.11944389343262),
-  P(125.4052581787109,-15.12138652801514),
-  P(125.3941497802734,-15.12333297729492),
-  P(125.3877716064453,-15.12305545806885),
-  P(125.3830413818359,-15.12055397033691),
-  P(125.3619232177735,-15.10555458068848),
-  P(125.3588714599609,-15.10111045837402),
-  P(125.359992980957,-15.09416580200195),
-  P(125.3899765014649,-15.07083320617676),
-  P(125.364990234375,-15.05277824401856),
-  P(125.2869262695313,-14.99749946594238),
-  P(125.2752685546875,-14.99361038208008),
-  P(125.1819305419922,-14.95472145080566),
-  P(125.1813735961914,-14.94916725158691),
-  P(125.1841430664063,-14.94472312927246),
-  P(125.2141571044922,-14.91166687011719),
-  P(125.2180480957031,-14.90944480895996),
-  P(125.2430419921875,-14.90194511413574),
-  P(125.2041625976563,-14.85694313049317),
-  P(125.1980285644531,-14.8499984741211),
-  P(125.1363830566406,-14.75889015197754),
-  P(125.1349868774414,-14.75388908386231),
-  P(125.1355361938477,-14.74138832092285),
-  P(125.13720703125,-14.73555564880371),
-  P(125.2433166503906,-14.59805488586426),
-  P(125.2649993896484,-14.57722282409668),
-  P(125.3361129760742,-14.52305603027344),
-  P(125.3883209228516,-14.54500007629395),
-  P(125.5372009277344,-14.55611038208008),
-  P(125.550537109375,-14.55666732788086),
-  P(125.5621871948242,-14.55555534362793),
-  P(125.5888824462891,-14.5494441986084),
-  P(125.5947113037109,-14.49249839782715),
-  P(125.5994262695313,-14.42694473266602),
-  P(125.5802764892578,-14.31444454193115),
-  P(125.5797119140625,-14.3033332824707),
-  P(125.584716796875,-14.26111221313477),
-  P(125.592758178711,-14.24166679382324),
-  P(125.60693359375,-14.22305488586426),
-  P(125.6180419921875,-14.22111129760742),
-  P(125.6241531372071,-14.22277641296387),
-  P(125.7260894775391,-14.26749992370606),
-  P(125.7291564941406,-14.27138900756836),
-  P(125.7297134399414,-14.27694511413574),
-  P(125.7155532836914,-14.32888793945313),
-  P(125.7138824462891,-14.33472347259522),
-  P(125.7105407714844,-14.33833312988281),
-  P(125.7066497802735,-14.34138870239258),
-  P(125.7019271850586,-14.34333229064942),
-  P(125.6369323730469,-14.6130542755127),
-  P(125.6344299316406,-14.625),
-  P(125.6349868774414,-14.63055419921875),
-  P(125.63720703125,-14.63500022888184),
-  P(125.6416625976563,-14.63777923583984),
-  P(125.6477737426758,-14.63666725158691),
-  P(125.6510925292969,-14.63361167907715),
-  P(125.6538696289063,-14.62916564941406),
-  P(125.6608123779297,-14.61166572570801),
-  P(125.7035980224609,-14.48916625976563),
-  P(125.7066497802735,-14.47722244262695),
-  P(125.7124862670899,-14.44416618347168),
-  P(125.713607788086,-14.43194389343262),
-  P(125.7116470336914,-14.42138862609863),
-  P(125.7127685546875,-14.40833473205566),
-  P(125.7158203125,-14.40333366394043),
-  P(125.7188720703125,-14.40027809143066),
-  P(125.7241516113281,-14.39888954162598),
-  P(125.7374877929688,-14.40166664123535),
-  P(125.8402709960938,-14.45111083984375),
-  P(125.8477630615234,-14.46333312988281),
-  P(125.8460998535156,-14.46999931335449),
-  P(125.8380432128906,-14.47500038146973),
-  P(125.82470703125,-14.56972122192383),
-  P(125.8252716064453,-14.57527732849121),
-  P(125.841926574707,-14.60610961914063),
-  P(125.845832824707,-14.60861015319824),
-  P(125.9027709960938,-14.64361190795898),
-  P(125.9088668823242,-14.64527893066406),
-  P(125.9238662719727,-14.61749839782715),
-  P(125.9877624511719,-14.54722213745117),
-  P(125.994140625,-14.54722213745117),
-  P(126.0333328247071,-14.51972198486328),
-  P(126.0372009277344,-14.51666641235352),
-  P(126.0399780273438,-14.51222229003906),
-  P(126.0663833618164,-14.34416580200195),
-  P(126.1424865722656,-14.19555473327637),
-  P(126.1441497802734,-14.18944358825684),
-  P(126.1466522216797,-14.1299991607666),
-  P(126.0888824462891,-13.97305488586426),
-  P(126.085823059082,-13.96833229064941),
-  P(126.0822067260742,-13.96500015258789),
-  P(126.0691528320313,-13.95722198486328),
-  P(126.0535888671875,-13.9516658782959),
-  P(126.0274810791016,-13.93972206115723),
-  P(126.0177612304688,-13.93416595458985),
-  P(126.0147094726563,-13.93083381652832),
-  P(126.0124969482422,-13.92638969421387),
-  P(126.0147094726563,-13.92138862609864),
-  P(126.0194396972656,-13.91916656494141),
-  P(126.0674896240234,-13.91555595397949),
-  P(126.1480407714844,-13.92749977111816),
-  P(126.2174835205078,-13.96194458007813),
-  P(126.2160873413086,-14.02861213684082),
-  P(126.2147064208984,-14.03472328186035),
-  P(126.2072067260742,-14.04111099243164),
-  P(126.1974792480469,-14.0447244644165),
-  P(126.1869201660156,-14.04805564880371),
-  P(126.1819305419922,-14.04861068725586),
-  P(126.161376953125,-14.05416679382324),
-  P(126.1577606201172,-14.05777740478516),
-  P(126.1549835205078,-14.06222152709961),
-  P(126.1852569580078,-14.16139030456543),
-  P(126.186653137207,-14.16583442687989),
-  P(126.189697265625,-14.16972160339356),
-  P(126.2049865722656,-14.17666625976563),
-  P(126.2310867309571,-14.17888832092285),
-  P(126.2371978759766,-14.18055534362793),
-  P(126.2736129760742,-14.20750045776367),
-  P(126.2805480957031,-14.2147216796875),
-  P(126.2833328247071,-14.21916580200195),
-  P(126.2877731323242,-14.2330551147461),
-  P(126.3133087158203,-14.19361114501953),
-  P(126.29443359375,-14.14361190795899),
-  P(126.2947082519531,-14.13750076293945),
-  P(126.307746887207,-14.09166717529297),
-  P(126.3105316162109,-14.08722114562989),
-  P(126.332763671875,-14.05222320556641),
-  P(126.3355407714844,-14.04861068725586),
-  P(126.4313735961914,-13.97500038146973),
-  P(126.5024871826172,-13.9647216796875),
-  P(126.4910888671875,-14.0091667175293),
-  P(126.4569396972656,-14.06333446502686),
-  P(126.4549865722656,-14.06777763366699),
-  P(126.4533233642578,-14.07361030578613),
-  P(126.4530487060547,-14.07999992370606),
-  P(126.4561004638672,-14.08388900756836),
-  P(126.5683288574219,-14.22055435180664),
-  P(126.6005401611328,-14.22972106933594),
-  P(126.7022094726563,-14.12555503845215),
-  P(126.7055511474609,-14.12194442749024),
-  P(126.7891464233399,-13.97138786315918),
-  P(126.7619323730469,-13.83944320678711),
-  P(126.7444305419922,-13.79805564880371),
-  P(126.7474822998047,-13.79277801513672),
-  P(126.8530426025391,-13.75277900695801),
-  P(126.8627624511719,-13.74916553497315),
-  P(126.9533386230469,-13.72669219970703),
-  P(126.9583282470703,-13.72972106933594),
-  P(127.0177612304688,-13.77639007568359),
-  P(127.0744323730469,-13.83222198486328),
-  P(127.0772094726563,-13.8358325958252),
-  P(127.0780487060547,-13.84083366394043),
-  P(127.0772094726563,-13.84749984741211),
-  P(127.0727691650391,-13.85805511474609),
-  P(127.0583190917969,-13.87944412231446),
-  P(127.0569305419922,-13.88472366333008),
-  P(127.0574798583984,-13.89055633544922),
-  P(127.1091537475586,-13.96138954162598),
-  P(127.1158065795898,-13.96916580200196),
-  P(127.1197128295898,-13.97166633605957),
-  P(127.1305389404297,-13.97583198547364),
-  P(127.1363830566406,-13.97527694702148),
-  P(127.1397094726563,-13.97166633605957),
-  P(127.1535873413086,-13.93277740478516),
-  P(127.1541595458985,-13.89999961853027),
-  P(127.2419281005859,-13.89638900756836),
-  P(127.3555526733398,-13.92944526672364),
-  P(127.4208221435547,-13.94972229003906),
-  P(127.4246978759766,-13.95305442810059),
-  P(127.4277572631836,-13.95666694641113),
-  P(127.4471969604492,-13.98416519165039),
-  P(127.45166015625,-13.99305534362793),
-  P(127.4530487060547,-13.99805545806885),
-  P(127.5211029052735,-14.08611106872559),
-  P(127.6538696289063,-14.17305564880371),
-  P(127.6622009277344,-14.17888832092285),
-  P(127.7316589355469,-14.26777839660645),
-  P(127.7605361938477,-14.30055618286133),
-  P(127.7791595458985,-14.33527755737305),
-  P(127.8733062744141,-14.47333335876465),
-  P(127.9452514648438,-14.57638931274414),
-  P(127.9538726806641,-14.58222198486328),
-  P(127.9591522216797,-14.58444404602051),
-  P(127.9705429077149,-14.58361053466797),
-  P(127.9760894775391,-14.5808334350586),
-  P(127.9794311523438,-14.57805633544922),
-  P(127.9860992431641,-14.57055473327637),
-  P(127.9888763427734,-14.56611061096191),
-  P(127.9966430664063,-14.56027793884277),
-  P(128.0036010742188,-14.56111145019531),
-  P(128.0313720703125,-14.5830545425415),
-  P(128.1174621582031,-14.6513900756836),
-  P(128.12939453125,-14.66111183166504),
-  P(128.16943359375,-14.70277786254883),
-  P(128.1827392578125,-14.74166679382324),
-  P(128.1882934570313,-14.80027770996094),
-  P(128.1399841308594,-14.86777687072754),
-  P(128.0877380371094,-15.02527809143066),
-  P(128.0705261230469,-15.09472274780273),
-  P(128.0682983398438,-15.10694313049316),
-  P(128.0677490234375,-15.1261100769043),
-  P(128.0691223144531,-15.13666725158691),
-  P(128.0713500976563,-15.14111137390137),
-  P(128.0773620605469,-15.19766712188721),
-  P(128.0800170898438,-15.20300102233887),
-  P(128.0808563232422,-15.20650100708008),
-  P(128.0806884765625,-15.21716690063477),
-  P(128.0738525390625,-15.38972282409668),
-  P(128.0722045898438,-15.40333366394043),
-  P(128.0652465820313,-15.42638969421387),
-  P(128.0610961914063,-15.43694496154785),
-  P(128.0533142089844,-15.45194435119629),
-  P(128.0357971191406,-15.4697208404541),
-  P(128.0277709960938,-15.47555541992188),
-  P(128.0177612304688,-15.48611068725586),
-  P(128.01220703125,-15.49499893188477),
-  P(128.0136108398438,-15.5),
-  P(128.0199890136719,-15.50139045715332),
-  P(128.0258178710938,-15.50083446502686),
-  P(128.0435791015625,-15.49138832092285),
-  P(128.0632934570313,-15.47666454315186),
-  P(128.0746765136719,-15.46694374084473),
-  P(128.0816345214844,-15.45944404602051),
-  P(128.0905151367188,-15.44694519042969),
-  P(128.0938415527344,-15.44194412231445),
-  P(128.1002502441406,-15.42666625976563),
-  P(128.1058044433594,-15.40277862548828),
-  P(128.1138610839844,-15.34305572509766),
-  P(128.1188354492188,-15.29055595397949),
-  P(128.12841796875,-15.26572227478027),
-  P(128.1239013671875,-15.25822257995606),
-  P(128.1165771484375,-15.24888801574707),
-  P(128.1152496337891,-15.2462215423584),
-  P(128.1152496337891,-15.24255466461182),
-  P(128.1250762939453,-15.21738910675049),
-  P(128.1267395019531,-15.21472263336182),
-  P(128.1292419433594,-15.21288967132568),
-  P(128.132568359375,-15.21255493164063),
-  P(128.1358947753906,-15.21372222900391),
-  P(128.1817169189453,-15.23341083526611),
-  P(128.2176971435547,-15.26857757568359),
-  P(128.2263793945313,-15.27724361419678),
-  P(128.2552490234375,-15.30166625976563),
-  P(128.2599792480469,-15.31027793884278),
-  P(128.2611083984375,-15.33388900756836),
-  P(128.2638854980469,-15.35027694702148),
-  P(128.2666625976563,-15.36027717590332),
-  P(128.282470703125,-15.40361213684082),
-  P(128.2852478027344,-15.40722274780274),
-  P(128.2899780273438,-15.4052791595459),
-  P(128.2910766601563,-15.38666725158692),
-  P(128.2927551269531,-15.34222221374512),
-  P(128.2933044433594,-15.31194496154785),
-  P(128.29052734375,-15.29555511474609),
-  P(128.2874755859375,-15.28555679321289),
-  P(128.282470703125,-15.27666664123535),
-  P(128.2545928955078,-15.22939014434815),
-  P(128.2494354248047,-15.22588920593262),
-  P(128.2449340820313,-15.22205638885498),
-  P(128.236572265625,-15.21305465698242),
-  P(128.2287445068359,-15.20138835906982),
-  P(128.2247467041016,-15.19305515289307),
-  P(128.2220764160156,-15.18388938903809),
-  P(128.189697265625,-15.07944488525391),
-  P(128.1905212402344,-15.06805610656739),
-  P(128.1941223144531,-15.05666732788086),
-  P(128.2046813964844,-15.03805541992188),
-  P(128.216064453125,-15.02083396911621),
-  P(128.2255249023438,-15.00889015197754),
-  P(128.298583984375,-14.91888999938965),
-  P(128.3019104003906,-14.91527652740479),
-  P(128.3096923828125,-14.90916633605957),
-  P(128.3149719238281,-14.90777778625489),
-  P(128.3213500976563,-14.90805625915527),
-  P(128.3252563476563,-14.91111183166504),
-  P(128.328857421875,-14.9205551147461),
-  P(128.3296813964844,-14.92611122131348),
-  P(128.3285827636719,-14.93861198425293),
-  P(128.3283081054688,-14.95777702331543),
-  P(128.3396911621094,-15.01638984680176),
-  P(128.341064453125,-15.02194595336914),
-  P(128.3455200195313,-15.0363883972168),
-  P(128.3507995605469,-15.04472446441651),
-  P(128.3546752929688,-15.04777908325195),
-  P(128.361083984375,-15.04805564880371),
-  P(128.4369201660156,-15.05055618286133),
-  P(128.4485778808594,-15.0494441986084),
-  P(128.4524536132813,-15.04638862609863),
-  P(128.4552307128906,-15.0419454574585),
-  P(128.4610900878906,-15.01027870178223),
-  P(128.4602355957031,-15.00472259521484),
-  P(128.455810546875,-14.99583244323731),
-  P(128.4374694824219,-14.97222137451172),
-  P(128.4299621582031,-14.95944404602051),
-  P(128.4260864257813,-14.95083236694336),
-  P(128.4185791015625,-14.93194389343262),
-  P(128.4119262695313,-14.91250038146973),
-  P(128.4069213867188,-14.89666652679444),
-  P(128.3802490234375,-14.8086109161377),
-  P(128.3818969726563,-14.80249977111817),
-  P(128.38916015625,-14.79583358764648),
-  P(128.3994140625,-14.79305553436279),
-  P(128.51025390625,-14.76416778564453),
-  P(128.5302734375,-14.7591667175293),
-  P(128.5416564941406,-14.75777816772461),
-  P(128.6580200195313,-14.78250122070313),
-  P(128.9027709960938,-14.84027671813965),
-  P(128.9999694824219,-14.87107753753662),
-  P(129.0638732910156,-14.88750076293945),
-  P(129.0894165039063,-14.89944458007813),
-  P(129.1810913085938,-14.9738883972168),
-  P(129.1849670410156,-14.97777652740479),
-  P(129.1871948242188,-14.98166656494141),
-  P(129.1888732910156,-14.98666572570801),
-  P(129.1744079589844,-15.16250038146973),
-  P(129.1910705566406,-15.1825008392334),
-  P(129.2563781738281,-15.10416603088379),
-  P(129.2388610839844,-15.00638961791992),
-  P(129.2366333007813,-14.99666595458984),
-  P(129.2191162109375,-14.866943359375),
-  P(129.2177429199219,-14.85583305358887),
-  P(129.219970703125,-14.84305572509766),
-  P(129.2285766601563,-14.83777809143066),
-  P(129.2349548339844,-14.83805465698242),
-  P(129.3277587890625,-14.86499977111817),
-  P(129.3377380371094,-14.86944389343262),
-  P(129.4549560546875,-14.92694473266602),
-  P(129.4691162109375,-14.93416595458984),
-  P(129.4813537597656,-14.94388961791992),
-  P(129.4921875,-14.95416641235352),
-  P(129.6313018798828,-15.10750102996826),
-  P(129.6677551269531,-15.14916801452637),
-  P(129.66943359375,-15.1602783203125),
-  P(129.66748046875,-15.1924991607666),
-  P(129.6683044433594,-15.19722175598145),
-  P(129.6705322265625,-15.2016658782959),
-  P(129.6744079589844,-15.20499992370606),
-  P(129.6799621582031,-15.20694446563721),
-  P(129.6860961914063,-15.20777702331543),
-  P(129.7324523925781,-15.19722175598145),
-  P(129.7363586425781,-15.19361114501953),
-  P(129.7366333007813,-15.1875),
-  P(129.7349548339844,-15.1825008392334),
-  P(129.7288513183594,-15.17416763305664),
-  P(129.6988525390625,-15.13472366333008),
-  P(129.6927490234375,-15.12722206115723),
-  P(129.6725769042969,-15.10134696960449),
-  P(129.6664733886719,-15.09850025177002),
-  P(129.6589813232422,-15.0935001373291),
-  P(129.6558074951172,-15.08866596221924),
-  P(129.6271667480469,-15.02444458007813),
-  P(129.6257934570313,-15.01889038085938),
-  P(129.6141357421875,-14.95416641235352),
-  P(129.61328125,-14.94861030578614),
-  P(129.6141357421875,-14.9424991607666),
-  P(129.6364440917969,-14.90501499176025),
-  P(129.6438140869141,-14.87274837493897),
-  P(129.6419372558594,-14.84249877929688),
-  P(129.6438598632813,-14.83722114562989),
-  P(129.6483154296875,-14.83499908447266),
-  P(129.6552429199219,-14.83638763427734),
-  P(129.6972045898438,-14.8538875579834),
-  P(129.786376953125,-14.86499977111817),
-  P(129.7999877929688,-14.86527633666992),
-  P(129.8099670410156,-14.86277770996094),
-  P(129.8646850585938,-14.84305572509766),
-  P(129.9288635253906,-14.79000091552734),
-  P(129.9444274902344,-14.76777839660645),
-  P(129.8055419921875,-14.81500053405762),
-  P(129.7738647460938,-14.82361030578614),
-  P(129.7672119140625,-14.82333374023438),
-  P(129.7611083984375,-14.82194519042969),
-  P(129.7207946777344,-14.79805564880371),
-  P(129.7169189453125,-14.7955551147461),
-  P(129.6827392578125,-14.77222347259522),
-  P(129.6749877929688,-14.76638984680176),
-  P(129.6719055175781,-14.76277923583985),
-  P(129.6063537597656,-14.67861175537109),
-  P(129.6007995605469,-14.67027854919434),
-  P(129.5880126953125,-14.64277839660645),
-  P(129.5849609375,-14.62722206115723),
-  P(129.5866394042969,-14.6211109161377),
-  P(129.6125793457031,-14.61272239685059),
-  P(129.618408203125,-14.61105442047119),
-  P(129.6284027099609,-14.60922145843506),
-  P(129.6357421875,-14.60855484008789),
-  P(129.6475830078125,-14.609055519104),
-  P(129.6702423095703,-14.60922145843506),
-  P(129.6988525390625,-14.60416603088379),
-  P(129.7080078125,-14.59972190856934),
-  P(129.7647094726563,-14.56027793884277),
-  P(129.7727661132813,-14.55444526672364),
-  P(129.7833251953125,-14.54388999938965),
-  P(129.78857421875,-14.53499984741211),
-  P(129.7846984863281,-14.53166770935059),
-  P(129.7733154296875,-14.53305625915527),
-  P(129.7630310058594,-14.5352783203125),
-  P(129.7124633789063,-14.55888938903809),
-  P(129.6717376708984,-14.56872177124023),
-  P(129.6595764160156,-14.5730562210083),
-  P(129.6560821533203,-14.5735559463501),
-  P(129.6522521972656,-14.57338905334473),
-  P(129.5905151367188,-14.56805610656739),
-  P(129.5427551269531,-14.55138969421387),
-  P(129.5374755859375,-14.54916763305664),
-  P(129.4549560546875,-14.50305557250977),
-  P(129.359130859375,-14.42555618286133),
-  P(129.3577270507813,-14.41416740417481),
-  P(129.3585815429688,-14.40750122070313),
-  P(129.3702392578125,-14.33333206176758),
-  P(129.4305419921875,-14.22222137451172),
-  P(129.4924621582031,-14.1422233581543),
-  P(129.5810852050781,-14.08611106872559),
-  P(129.6891479492188,-14.0261116027832),
-  P(129.7035827636719,-14.02027893066406),
-  P(129.7080078125,-14.01777839660645),
-  P(129.7196960449219,-14.00889015197754),
-  P(129.7327270507813,-13.99472236633301),
-  P(129.7466125488281,-13.96416664123535),
-  P(129.7874755859375,-13.74416542053223),
-  P(129.7819213867188,-13.71055603027344),
-  P(129.7819213867188,-13.69888877868653),
-  P(129.7827453613281,-13.69222259521484),
-  P(129.78857421875,-13.6680555343628),
-  P(129.8274536132813,-13.51944541931152),
-  P(129.8302612304688,-13.51444625854492),
-  P(129.8861083984375,-13.44527816772461),
-  P(129.8941345214844,-13.43944358825684),
-  P(129.8997192382813,-13.43888854980469),
-  P(129.9027709960938,-13.44333267211914),
-  P(129.9041442871094,-13.44833374023438),
-  P(129.9038696289063,-13.49694442749024),
-  P(129.9069213867188,-13.50694465637207),
-  P(129.9136047363281,-13.51388931274414),
-  P(129.9382934570313,-13.52555656433106),
-  P(129.9499816894531,-13.52916717529297),
-  P(129.9638671875,-13.53083419799805),
-  P(129.986083984375,-13.52777862548828),
-  P(130,-13.52474784851074),
-  P(130.0277709960938,-13.51694488525391),
-  P(130.0374755859375,-13.51250076293945),
-  P(130.0497131347656,-13.50500106811524),
-  P(130.1149597167969,-13.46249961853027),
-  P(130.1641540527344,-13.42916679382324),
-  P(130.2644348144531,-13.32527732849121),
-  P(130.2546997070313,-13.28805541992188),
-  P(130.1966247558594,-13.20972347259522),
-  P(130.1874694824219,-13.19833374023438),
-  P(130.1730346679688,-13.18444442749023),
-  P(130.1605224609375,-13.17611122131348),
-  P(130.1552429199219,-13.17361068725586),
-  P(130.1427612304688,-13.17138862609864),
-  P(130.13134765625,-13.17277717590332),
-  P(130.1243896484375,-13.17194557189941),
-  P(130.121337890625,-13.16833305358887),
-  P(130.1191101074219,-13.16388893127441),
-  P(130.1160583496094,-13.15388870239258),
-  P(130.1155090332031,-13.14138984680176),
-  P(130.1155090332031,-13.06666564941406),
-  P(130.1241149902344,-12.97360992431641),
-  P(130.1249694824219,-12.96694374084473),
-  P(130.1358032226563,-12.93388938903809),
-  P(130.1408081054688,-12.92416763305664),
-  P(130.1430969238281,-12.92282104492188),
-  P(130.1744079589844,-12.90750122070313),
-  P(130.1794128417969,-12.90611076354981),
-  P(130.1855163574219,-12.90750122070313),
-  P(130.1894226074219,-12.91055679321289),
-  P(130.1902465820313,-12.92250061035156),
-  P(130.1930236816406,-12.93222236633301),
-  P(130.1960754394531,-12.93611145019531),
-  P(130.2046813964844,-12.9424991607666),
-  P(130.2099609375,-12.94444465637207),
-  P(130.2230224609375,-12.94750022888184),
-  P(130.2349548339844,-12.94750022888184),
-  P(130.256103515625,-12.9416675567627),
-  P(130.270263671875,-12.93583297729492),
-  P(130.2869262695313,-12.92527770996094),
-  P(130.3030395507813,-12.91500091552735),
-  P(130.3224792480469,-12.89916801452637),
-  P(130.3327331542969,-12.88888931274414),
-  P(130.3407897949219,-12.8761100769043),
-  P(130.3488464355469,-12.85499954223633),
-  P(130.3538513183594,-12.83777809143066),
-  P(130.3546752929688,-12.83111190795898),
-  P(130.3560791015625,-12.75444602966309),
-  P(130.3560791015625,-12.74277687072754),
-  P(130.3546752929688,-12.73777770996094),
-  P(130.3485717773438,-12.72416687011719),
-  P(130.3438415527344,-12.70916557312012),
-  P(130.3441162109375,-12.70305442810059),
-  P(130.35302734375,-12.67527770996094),
-  P(130.3558044433594,-12.67000007629395),
-  P(130.4993896484375,-12.60305404663086),
-  P(130.5049743652344,-12.60222244262695),
-  P(130.5119323730469,-12.60305404663086),
-  P(130.5197143554688,-12.60944366455078),
-  P(130.5518188476563,-12.65622234344482),
-  P(130.5544738769531,-12.66138935089111),
-  P(130.5563049316406,-12.66788864135742),
-  P(130.5977478027344,-12.70666694641113),
-  P(130.6038513183594,-12.70805454254151),
-  P(130.62744140625,-12.7108325958252),
-  P(130.6691284179688,-12.70999908447266),
-  P(130.6860961914063,-12.70777702331543),
-  P(130.6913452148438,-12.7055549621582),
-  P(130.6952514648438,-12.70249938964844),
-  P(130.6944274902344,-12.69694519042969),
-  P(130.6899719238281,-12.69444465637207),
-  P(130.6444396972656,-12.68111228942871),
-  P(130.6041259765625,-12.67666625976563),
-  P(130.5869598388672,-12.62983322143555),
-  P(130.5733032226563,-12.58250045776367),
-  P(130.5733032226563,-12.57583236694336),
-  P(130.5746765136719,-12.57055473327637),
-  P(130.580810546875,-12.55472183227539),
-  P(130.591064453125,-12.53472328186035),
-  P(130.5997009277344,-12.51500129699707),
-  P(130.6049499511719,-12.49860954284668),
-  P(130.6177368164063,-12.43277740478516),
-  P(130.6146850585938,-12.42916679382324),
-  P(130.6102294921875,-12.42666625976563),
-  P(130.5946960449219,-12.42000007629395),
-  P(130.5802612304688,-12.41222190856934),
-  P(130.5771789550781,-12.40833473205566),
-  P(130.5766296386719,-12.40277862548828),
-  P(130.5830383300781,-12.39527893066406),
-  P(130.5869140625,-12.39249992370606),
-  P(130.6016235351563,-12.38722229003906),
-  P(130.6194152832031,-12.38500022888184),
-  P(130.6374816894531,-12.38527870178223),
-  P(130.6560974121094,-12.38916778564453),
-  P(130.7649841308594,-12.42749977111816),
-  P(130.7758178710938,-12.43166732788086),
-  P(130.8963623046875,-12.64027786254883),
-  P(130.8966369628906,-12.60750007629395),
-  P(130.9541320800781,-12.5363883972168),
-  P(130.8566284179688,-12.45972347259522),
-  P(130.8533020019531,-12.4636116027832),
-  P(130.8488464355469,-12.46583366394043),
-  P(130.8319091796875,-12.46055603027344),
-  P(130.8157958984375,-12.44777870178223),
-  P(130.8157958984375,-12.4416675567627),
-  P(130.8258056640625,-12.4063892364502),
-  P(130.844970703125,-12.37416553497315),
-  P(130.8493957519531,-12.37194442749023),
-  P(130.8858032226563,-12.35416603088379),
-  P(130.9230346679688,-12.34749984741211),
-  P(130.9291381835938,-12.3488883972168),
-  P(130.9794006347656,-12.35527801513672),
-  P(131.0269165039063,-12.35833358764649),
-  P(131.0361022949219,-12.3266658782959),
-  P(131.0299682617188,-12.25333404541016),
-  P(131.0277709960938,-12.24222183227539),
-  P(131.0238647460938,-12.23361015319824),
-  P(131.0111083984375,-12.21777725219727),
-  P(131.0038757324219,-12.21138954162598),
-  P(130.9993896484375,-12.20333290100098),
-  P(130.9977416992188,-12.19833374023438),
-  P(130.9969177246094,-12.19277763366699),
-  P(131,-12.18083381652832),
-  P(131.0058288574219,-12.16500091552734),
-  P(131.0105285644531,-12.1552791595459),
-  P(131.0177612304688,-12.14861106872559),
-  P(131.0271911621094,-12.1455545425415),
-  P(131.0333251953125,-12.1455545425415),
-  P(131.1055297851563,-12.14944458007813),
-  P(131.1119079589844,-12.15083312988281),
-  P(131.1194152832031,-12.15722274780273),
-  P(131.1727600097656,-12.19333267211914),
-  P(131.2132873535156,-12.21749877929688),
-  P(131.3441162109375,-12.22360992431641),
-  P(131.3707885742188,-12.24777793884277),
-  P(131.4077453613281,-12.27444458007813),
-  P(131.4213562011719,-12.28194427490235),
-  P(131.4313659667969,-12.28722190856934),
-  P(131.4413452148438,-12.29111099243164),
-  P(131.4530334472656,-12.2944450378418),
-  P(131.4669189453125,-12.29583358764649),
-  P(131.4863586425781,-12.29722213745117),
-  P(131.4988403320313,-12.29722213745117),
-  P(131.675537109375,-12.28833389282227),
-  P(131.72802734375,-12.28361129760742),
-  P(131.7449645996094,-12.2813892364502),
-  P(131.7663879394531,-12.27694511413574),
-  P(131.782470703125,-12.27250099182129),
-  P(131.9291381835938,-12.26666641235352),
-  P(131.9338684082031,-12.26944541931152),
-  P(131.9752502441406,-12.28666687011719),
-  P(132.0491333007813,-12.30888938903809),
-  P(132.0621948242188,-12.31083297729492),
-  P(132.0674743652344,-12.30944442749023),
-  P(132.0718994140625,-12.30722236633301),
-  P(132.2235717773438,-12.19999885559082),
-  P(132.3535766601563,-12.2005558013916),
-  P(132.3602294921875,-12.2016658782959),
-  P(132.3649597167969,-12.20361137390137),
-  P(132.3787231445313,-12.22488975524902),
-  P(132.3895874023438,-12.23788833618164),
-  P(132.4130249023438,-12.28916740417481),
-  P(132.4202575683594,-12.30777740478516),
-  P(132.4197082519531,-12.31388854980469),
-  P(132.4163818359375,-12.31777763366699),
-  P(132.4035949707031,-12.32527732849121),
-  P(132.3997192382813,-12.32888793945313),
-  P(132.393310546875,-12.33638763427734),
-  P(132.3883056640625,-12.34472274780273),
-  P(132.3844299316406,-12.35527801513672),
-  P(132.3836059570313,-12.36222076416016),
-  P(132.3836059570313,-12.3799991607666),
-  P(132.3991394042969,-12.36638832092285),
-  P(132.4132995605469,-12.35361099243164),
-  P(132.4363708496094,-12.32777786254883),
-  P(132.4388732910156,-12.32333374023438),
-  P(132.4447021484375,-12.30833435058594),
-  P(132.4447021484375,-12.29583358764649),
-  P(132.4366912841797,-12.25888919830322),
-  P(132.4320373535156,-12.24772357940674),
-  P(132.42919921875,-12.23888874053955),
-  P(132.4268493652344,-12.2295560836792),
-  P(132.4266967773438,-12.22255516052246),
-  P(132.4238586425781,-12.18861198425293),
-  P(132.4252624511719,-12.1825008392334),
-  P(132.4330444335938,-12.16222190856934),
-  P(132.4421997070313,-12.14999961853028),
-  P(132.4466247558594,-12.14638900756836),
-  P(132.4555358886719,-12.14249992370606),
-  P(132.5766296386719,-12.10111045837403),
-  P(132.5796813964844,-12.10472106933594),
-  P(132.5882873535156,-12.11111068725586),
-  P(132.6021728515625,-12.11805534362793),
-  P(132.6074523925781,-12.11999893188477),
-  P(132.6827392578125,-12.14055633544922),
-  P(132.7083129882813,-12.14583396911621),
-  P(132.7152404785156,-12.14638900756836),
-  P(132.7207946777344,-12.14583396911621),
-  P(132.7421875,-12.14111137390137),
-  P(132.7510986328125,-12.13638877868652),
-  P(132.7544250488281,-12.13277626037598),
-  P(132.748291015625,-12.13138771057129),
-  P(132.7171936035156,-12.13249969482422),
-  P(132.7105102539063,-12.13166618347168),
-  P(132.705810546875,-12.12916564941406),
-  P(132.647216796875,-12.08916664123535),
-  P(132.6394348144531,-12.08277702331543),
-  P(132.6363830566406,-12.07833290100098),
-  P(132.6307983398438,-12.06416702270508),
-  P(132.6277465820313,-12.0419454574585),
-  P(132.62744140625,-12.02361106872559),
-  P(132.6246643066406,-11.80888938903809),
-  P(132.6349792480469,-11.74499893188477),
-  P(132.6463623046875,-11.72833347320557),
-  P(132.6919250488281,-11.66139030456543),
-  P(132.6910705566406,-11.65500068664551),
-  P(132.6602478027344,-11.63694572448731),
-  P(132.6558227539063,-11.63444519042969),
-  P(132.5402526855469,-11.54750061035156),
-  P(132.4899597167969,-11.47694396972656),
-  P(132.4616394042969,-11.45638847351074),
-  P(132.4516296386719,-11.45194435119629),
-  P(132.4402465820313,-11.44861030578614),
-  P(132.3963623046875,-11.44083404541016),
-  P(132.3757934570313,-11.43777847290039),
-  P(132.3696899414063,-11.43777847290039),
-  P(132.2371826171875,-11.45888900756836),
-  P(132.2218933105469,-11.46361160278321),
-  P(132.1647033691406,-11.4908332824707),
-  P(132.1602478027344,-11.49333190917969),
-  P(132.1058044433594,-11.52639007568359),
-  P(132.0924682617188,-11.52639007568359),
-  P(132.0810852050781,-11.52305603027344),
-  P(132.0718994140625,-11.51861190795898),
-  P(132.0641479492188,-11.51250076293945),
-  P(132.0571899414063,-11.50555610656738),
-  P(131.990234375,-11.42972183227539),
-  P(131.9652404785156,-11.37916564941406),
-  P(131.9696960449219,-11.37694358825684),
-  P(131.9730224609375,-11.37305545806885),
-  P(131.9743957519531,-11.36722183227539),
-  P(131.97412109375,-11.36111068725586),
-  P(131.9727478027344,-11.35610961914063),
-  P(131.9696960449219,-11.35222244262696),
-  P(131.9657897949219,-11.34916687011719),
-  P(131.9027709960938,-11.32277679443359),
-  P(131.8721923828125,-11.30999946594238),
-  P(131.8583068847656,-11.30833435058594),
-  P(131.8303833007813,-11.31320762634277),
-  P(131.8055419921875,-11.32055473327637),
-  P(131.78857421875,-11.32277679443359),
-  P(131.7821960449219,-11.32277679443359),
-  P(131.7708129882813,-11.31944465637207),
-  P(131.7669372558594,-11.31638908386231),
-  P(131.7638854980469,-11.31194496154785),
-  P(131.7642669677734,-11.3066873550415),
-  P(131.7727661132813,-11.29527854919434),
-  P(131.8741149902344,-11.17722320556641),
-  P(131.9743957519531,-11.12694358825684),
-  P(131.9799499511719,-11.12555503845215),
-  P(131.986083984375,-11.12638854980469),
-  P(131.9969177246094,-11.13083267211914),
-  P(132.0052490234375,-11.13583374023438),
-  P(132.0902404785156,-11.22999954223633),
-  P(132.1549682617188,-11.39638900756836),
-  P(132.1647033691406,-11.40777778625489),
-  P(132.16943359375,-11.4102783203125),
-  P(132.1746826171875,-11.41139030456543),
-  P(132.19970703125,-11.41277885437012),
-  P(132.2046813964844,-11.41111183166504),
-  P(132.2077331542969,-11.40750122070313),
-  P(132.2355041503906,-11.35833358764648),
-  P(132.2355041503906,-11.35222244262696),
-  P(132.1924743652344,-11.22222137451172),
-  P(132.1702575683594,-11.19138908386231),
-  P(132.1480407714844,-11.15888977050781),
-  P(132.1458129882813,-11.15472221374512),
-  P(132.1419372558594,-11.14472389221191),
-  P(132.1419372558594,-11.13916778564453),
-  P(132.143310546875,-11.13333320617676),
-  P(132.1469421386719,-11.13027763366699),
-  P(132.1527709960938,-11.12944412231445),
-  P(132.1783142089844,-11.13083267211914),
-  P(132.1841430664063,-11.13277626037598),
-  P(132.2699890136719,-11.16777801513672),
-  P(132.2821960449219,-11.15944480895996),
-  P(132.3374633789063,-11.12916564941406),
-  P(132.3435668945313,-11.13111114501953),
-  P(132.4585876464844,-11.21805572509766),
-  P(132.5019226074219,-11.26250076293945),
-  P(132.5049743652344,-11.26638984680176),
-  P(132.5133056640625,-11.30527877807617),
-  P(132.5138854980469,-11.31166553497315),
-  P(132.6449890136719,-11.48472213745117),
-  P(132.6544189453125,-11.49583244323731),
-  P(132.6658020019531,-11.50527954101563),
-  P(132.6705322265625,-11.50777816772461),
-  P(132.6758117675781,-11.50972366333008),
-  P(132.7163696289063,-11.52250099182129),
-  P(132.7224731445313,-11.52250099182129),
-  P(132.7313537597656,-11.51805686950684),
-  P(132.7352294921875,-11.51500129699707),
-  P(132.7724914550781,-11.48388862609863),
-  P(132.8341369628906,-11.40027809143066),
-  P(132.8721923828125,-11.34860992431641),
-  P(132.8682861328125,-11.33944320678711),
-  P(132.8696899414063,-11.33361053466797),
-  P(132.8730163574219,-11.32972145080566),
-  P(132.8785705566406,-11.32888793945313),
-  P(132.9180297851563,-11.33694458007813),
-  P(132.9424743652344,-11.3619441986084),
-  P(132.9921875,-11.41388893127441),
-  P(133.0008239746094,-11.42555618286133),
-  P(133.0519104003906,-11.50250053405762),
-  P(133.0710754394531,-11.54583358764649),
-  P(133.0718994140625,-11.5575008392334),
-  P(133.0749816894531,-11.56805610656738),
-  P(133.09912109375,-11.61083221435547),
-  P(133.1419372558594,-11.68194389343262),
-  P(133.1505432128907,-11.69361114501953),
-  P(133.1580200195313,-11.7005558013916),
-  P(133.1658020019531,-11.70666694641113),
-  P(133.1830444335938,-11.71666526794434),
-  P(133.2044067382813,-11.72500038146973),
-  P(133.23828125,-11.73499870300293),
-  P(133.2513732910156,-11.7369441986084),
-  P(133.3074645996094,-11.69944381713867),
-  P(133.3374633789063,-11.69027709960938),
-  P(133.3482971191407,-11.68777847290039),
-  P(133.3574523925781,-11.69361114501953),
-  P(133.3621826171875,-11.70138931274414),
-  P(133.3630065917969,-11.70694446563721),
-  P(133.361083984375,-11.71222114562988),
-  P(133.4071960449219,-11.77416801452637),
-  P(133.5488586425781,-11.83277702331543),
-  P(133.6135864257813,-11.83499908447266),
-  P(133.6199645996094,-11.83416557312012),
-  P(133.6652526855469,-11.81944465637207),
-  P(133.7580261230469,-11.77027893066406),
-  P(133.7663879394531,-11.76500129699707),
-  P(133.7808227539063,-11.75277900695801),
-  P(133.786376953125,-11.74444389343262),
-  P(133.7972106933594,-11.71944427490234),
-  P(133.8016357421875,-11.71722221374512),
-  P(133.8321838378906,-11.71749877929688),
-  P(133.9083251953125,-11.73611068725586),
-  P(133.91943359375,-11.7672233581543),
-  P(133.8538513183594,-11.80333328247071),
-  P(133.8463439941406,-11.80888938903809),
-  P(133.8380126953125,-11.8216667175293),
-  P(133.8352355957031,-11.82694435119629),
-  P(133.8335876464844,-11.83222198486328),
-  P(133.8327331542969,-11.83833312988281),
-  P(133.8330383300782,-11.84361076354981),
-  P(133.8369140625,-11.85361099243164),
-  P(133.8438415527344,-11.85972213745117),
-  P(133.8710632324219,-11.88277626037598),
-  P(133.9288635253906,-11.91083335876465),
-  P(133.939697265625,-11.91388893127441),
-  P(133.9510803222656,-11.91222190856934),
-  P(133.9877319335938,-11.89444541931152),
-  P(133.9957885742188,-11.88916778564453),
-  P(133.9996948242188,-11.88611221313477),
-  P(134.0091552734375,-11.8761100769043),
-  P(134.01416015625,-11.866943359375),
-  P(134.0160827636719,-11.86166572570801),
-  P(134.0216369628906,-11.85249900817871),
-  P(134.0330505371094,-11.84333229064941),
-  P(134.0449829101563,-11.84249877929688),
-  P(134.0558166503906,-11.84638786315918),
-  P(134.1855163574219,-11.94638824462891),
-  P(134.1738586425781,-11.96583366394043),
-  P(134.187744140625,-12.04611206054688),
-  P(134.2066345214844,-12.06166553497315),
-  P(134.3699645996094,-12.03777885437012),
-  P(134.3947143554688,-12.05027770996094),
-  P(134.4149780273438,-12.0575008392334),
-  P(134.4271850585938,-12.05999946594238),
-  P(134.4852294921875,-12.06722259521484),
-  P(134.5038757324219,-12.06777763366699),
-  P(134.5160827636719,-12.06666564941406),
-  P(134.5985717773438,-12.05638885498047),
-  P(134.6658020019531,-12.00861167907715),
-  P(134.6727600097656,-12.00166702270508),
-  P(134.6760864257813,-11.99722099304199),
-  P(134.7705383300781,-11.99333190917969),
-  P(134.772216796875,-11.99833297729492),
-  P(134.8013610839844,-12.04333305358887),
-  P(134.8588562011719,-12.12416553497315),
-  P(134.8657836914063,-12.13083267211914),
-  P(134.8705139160156,-12.13333320617676),
-  P(134.8874816894531,-12.13833427429199),
-  P(134.9069213867188,-12.14138984680176),
-  P(134.9971923828125,-12.19638824462891),
-  P(135.0838623046875,-12.26666641235352),
-  P(135.1924743652344,-12.27694511413574),
-  P(135.2313537597656,-12.2944450378418),
-  P(135.22607421875,-12.27555656433106),
-  P(135.2419128417969,-12.2238883972168),
-  P(135.2669372558594,-12.17194557189941),
-  P(135.3283081054688,-12.11166572570801),
-  P(135.3796691894531,-12.09027671813965),
-  P(135.4088745117188,-12.09277725219727),
-  P(135.4241333007813,-12.09944343566895),
-  P(135.4224853515625,-12.10472106933594),
-  P(135.4224853515625,-12.11111068725586),
-  P(135.4271850585938,-12.11416625976563),
-  P(135.4324645996094,-12.1158332824707),
-  P(135.44580078125,-12.11555480957031),
-  P(135.5860900878906,-12.09833335876465),
-  P(135.6563720703125,-12.05222320556641),
-  P(135.6602478027344,-12.04916763305664),
-  P(135.6632995605469,-12.04527854919434),
-  P(135.6658020019531,-12.04083442687989),
-  P(135.6672058105469,-12.03472328186035),
-  P(135.6660766601563,-12.02861213684082),
-  P(135.6638793945313,-12.02500152587891),
-  P(135.6591491699219,-12.02194595336914),
-  P(135.6535949707031,-12.02083396911621),
-  P(135.6422119140625,-12.02250099182129),
-  P(135.63720703125,-12.02416801452637),
-  P(135.6241149902344,-12.03111267089844),
-  P(135.6121826171875,-12.03972244262696),
-  P(135.5902404785156,-12.05916595458984),
-  P(135.5860900878906,-12.06083297729492),
-  P(135.5796813964844,-12.05944442749024),
-  P(135.5741271972656,-12.05166625976563),
-  P(135.5724792480469,-12.04666709899903),
-  P(135.5716247558594,-12.03499984741211),
-  P(135.5722045898438,-12.02833366394043),
-  P(135.5733032226563,-12.02222347259522),
-  P(135.5902404785156,-11.9636116027832),
-  P(135.5921936035156,-11.95833396911621),
-  P(135.5952453613281,-11.95444488525391),
-  P(135.685791015625,-11.93333244323731),
-  P(135.705810546875,-11.93499946594238),
-  P(135.7110900878906,-11.93694496154785),
-  P(135.7296752929688,-11.94055557250977),
-  P(135.7366333007813,-11.94111061096192),
-  P(135.7471923828125,-11.93861198425293),
-  P(135.7598876953125,-11.93149852752686),
-  P(135.8380126953125,-11.87249946594238),
-  P(135.8724670410156,-11.84611129760742),
-  P(135.8791198730469,-11.83916664123535),
-  P(135.8841552734375,-11.82999992370606),
-  P(135.8861083984375,-11.82472229003906),
-  P(135.8905334472656,-11.80666732788086),
-  P(135.8863830566406,-11.79750061035156),
-  P(135.8791198730469,-11.79083442687988),
-  P(135.8730163574219,-11.78333282470703),
-  P(135.8705139160156,-11.77916717529297),
-  P(135.8688354492188,-11.77416801452637),
-  P(135.8685607910156,-11.76805686950684),
-  P(135.8710632324219,-11.76361274719239),
-  P(135.8749694824219,-11.76027870178223),
-  P(135.8799438476563,-11.758056640625),
-  P(135.8849792480469,-11.75722312927246),
-  P(135.8919372558594,-11.75777816772461),
-  P(135.9080200195313,-11.7630558013916),
-  P(135.91748046875,-11.76805686950684),
-  P(135.9291381835938,-11.77722358703613),
-  P(135.941650390625,-11.79249954223633),
-  P(135.9466247558594,-11.80111122131348),
-  P(135.9466247558594,-11.80722236633301),
-  P(135.9163818359375,-11.85249900817871),
-  P(135.8555297851563,-11.89444541931152),
-  P(135.7449645996094,-11.98138809204102),
-  P(135.7419128417969,-11.98527717590332),
-  P(135.7399597167969,-11.99055480957031),
-  P(135.740234375,-11.99666595458984),
-  P(135.7441101074219,-11.99972152709961),
-  P(135.7563781738281,-12.00139045715332),
-  P(135.7882995605469,-12.04361152648926),
-  P(135.6802673339844,-12.14833545684815),
-  P(135.6738586425781,-12.15611076354981),
-  P(135.6713562011719,-12.16083335876465),
-  P(135.6683044433594,-12.17277717590332),
-  P(135.6685791015625,-12.18499946594238),
-  P(135.6697082519531,-12.1966667175293),
-  P(135.6722106933594,-12.20722198486328),
-  P(135.6771850585938,-12.22194480895996),
-  P(135.6852416992188,-12.23416519165039),
-  P(135.6921997070313,-12.2408332824707),
-  P(135.7355041503906,-12.28083419799805),
-  P(135.784423828125,-12.26444625854492),
-  P(135.7882995605469,-12.25305557250977),
-  P(135.7949829101563,-12.23111152648926),
-  P(135.8010864257813,-12.21666526794434),
-  P(135.8044128417969,-12.21277809143066),
-  P(135.88134765625,-12.15305519104004),
-  P(135.8858032226563,-12.15055656433106),
-  P(136.0230407714844,-12.1119441986084),
-  P(135.9419250488281,-12.1966667175293),
-  P(135.9360961914063,-12.20583343505859),
-  P(135.9349670410156,-12.21138954162598),
-  P(135.9352416992188,-12.21749877929688),
-  P(135.9391479492188,-12.22666454315186),
-  P(135.9632873535156,-12.26416778564453),
-  P(135.9671936035156,-12.2672233581543),
-  P(135.9718933105469,-12.26944541931152),
-  P(135.9849548339844,-12.27000045776367),
-  P(135.9907836914063,-12.26889038085938),
-  P(135.9966125488281,-12.26666641235352),
-  P(136.0002746582031,-12.26444625854492),
-  P(136.0072021484375,-12.25666809082031),
-  P(136.0119323730469,-12.24888801574707),
-  P(136.0194396972656,-12.24277687072754),
-  P(136.0327453613281,-12.23499870300293),
-  P(136.0427551269531,-12.23166656494141),
-  P(136.0491333007813,-12.23222160339356),
-  P(136.0591430664063,-12.23722076416016),
-  P(136.0655212402344,-12.24444389343262),
-  P(136.0671997070313,-12.25611114501953),
-  P(136.066650390625,-12.26222229003906),
-  P(136.0641479492188,-12.26694488525391),
-  P(136.0610961914063,-12.27083396911621),
-  P(135.9921875,-12.3577766418457),
-  P(135.9827270507813,-12.36861038208008),
-  P(135.9810791015625,-12.37388801574707),
-  P(135.9805297851563,-12.38083267211914),
-  P(135.982177734375,-12.38555717468262),
-  P(136.0105285644531,-12.44472312927246),
-  P(136.0341491699219,-12.4697208404541),
-  P(136.0397033691406,-12.47166633605957)
-};
+m2::PointD const kLargePolygon[] = {P(136.0397033691406, -12.47166633605957),
+                                    P(136.0491333007813, -12.45999908447266),
+                                    P(136.0810852050781, -12.44555473327637),
+                                    P(136.1497192382813, -12.43555641174316),
+                                    P(136.1552429199219, -12.43527793884277),
+                                    P(136.1599731445313, -12.43777847290039),
+                                    P(136.1624755859375, -12.44194412231446),
+                                    P(136.1644287109375, -12.45249938964844),
+                                    P(136.1685791015625, -12.46166610717774),
+                                    P(136.1724853515625, -12.4647216796875),
+                                    P(136.1785888671875, -12.46583366394043),
+                                    P(136.2299499511719, -12.46055603027344),
+                                    P(136.2352294921875, -12.45888900756836),
+                                    P(136.2477416992188, -12.45027732849121),
+                                    P(136.2902526855469, -12.41805553436279),
+                                    P(136.2972106933594, -12.41055679321289),
+                                    P(136.34912109375, -12.29111099243164),
+                                    P(136.365234375, -12.25027847290039),
+                                    P(136.3663635253906, -12.24416542053223),
+                                    P(136.365234375, -12.23861122131348),
+                                    P(136.3588562011719, -12.22583198547363),
+                                    P(136.3421936035156, -12.2080545425415),
+                                    P(136.3327331542969, -12.20333290100098),
+                                    P(136.3194274902344, -12.20277786254883),
+                                    P(136.3058166503906, -12.20999908447266),
+                                    P(136.2958068847656, -12.21249961853028),
+                                    P(136.2849731445313, -12.21444511413574),
+                                    P(136.2555541992188, -12.21749877929688),
+                                    P(136.2430114746094, -12.21777725219727),
+                                    P(136.2366333007813, -12.21666526794434),
+                                    P(136.1846923828125, -12.19555473327637),
+                                    P(136.1791381835938, -12.1875),
+                                    P(136.1771850585938, -12.17027854919434),
+                                    P(136.1783142089844, -12.16361236572266),
+                                    P(136.2816467285157, -12.06555557250977),
+                                    P(136.4510803222656, -11.95416641235352),
+                                    P(136.5621948242188, -11.93444442749023),
+                                    P(136.5391540527344, -12.00972366333008),
+                                    P(136.5985717773438, -12.17666625976563),
+                                    P(136.605224609375, -12.18944358825684),
+                                    P(136.6157836914063, -12.20666694641114),
+                                    P(136.66552734375, -12.27861213684082),
+                                    P(136.6683044433594, -12.28222274780273),
+                                    P(136.6769104003906, -12.28777885437012),
+                                    P(136.6821899414063, -12.28944396972656),
+                                    P(136.7096862792969, -12.28611183166504),
+                                    P(136.7152404785156, -12.2852783203125),
+                                    P(136.7246704101563, -12.28111267089844),
+                                    P(136.7505493164063, -12.26472282409668),
+                                    P(136.7574768066406, -12.25861167907715),
+                                    P(136.7597045898438, -12.25388908386231),
+                                    P(136.7611083984375, -12.24777793884277),
+                                    P(136.7599792480469, -12.24222183227539),
+                                    P(136.7577514648438, -12.2380542755127),
+                                    P(136.7544250488281, -12.23361015319824),
+                                    P(136.7441101074219, -12.22333335876465),
+                                    P(136.7369079589844, -12.21749877929688),
+                                    P(136.7268981933594, -12.21305465698242),
+                                    P(136.7210693359375, -12.21416664123535),
+                                    P(136.7060852050781, -12.21916580200195),
+                                    P(136.6935729980469, -12.2188892364502),
+                                    P(136.6888732910156, -12.21638870239258),
+                                    P(136.6846923828125, -12.20722198486328),
+                                    P(136.6860961914063, -12.20111083984375),
+                                    P(136.6921997070313, -12.19277763366699),
+                                    P(136.69580078125, -12.19027709960938),
+                                    P(136.7638854980469, -12.17111206054688),
+                                    P(136.7699890136719, -12.17083358764648),
+                                    P(136.7838745117188, -12.17250061035156),
+                                    P(136.871337890625, -12.2188892364502),
+                                    P(136.8755187988281, -12.22194480895996),
+                                    P(136.87939453125, -12.22500038146973),
+                                    P(136.9310913085938, -12.28361129760742),
+                                    P(136.9802551269531, -12.34166717529297),
+                                    P(136.9835815429688, -12.34611129760742),
+                                    P(136.9835815429688, -12.35166454315186),
+                                    P(136.9819030761719, -12.35694313049316),
+                                    P(136.9794006347656, -12.36138916015625),
+                                    P(136.9694213867188, -12.37305545806885),
+                                    P(136.9574584960938, -12.38166618347168),
+                                    P(136.8038635253906, -12.47749900817871),
+                                    P(136.7452392578125, -12.54416656494141),
+                                    P(136.6435852050781, -12.70416641235352),
+                                    P(136.6207885742188, -12.82527732849121),
+                                    P(136.4944152832031, -12.77916717529297),
+                                    P(136.4843444824219, -12.84594345092773),
+                                    P(136.5460815429688, -12.9580545425415),
+                                    P(136.5452575683594, -13.05500030517578),
+                                    P(136.5283203125, -13.14999961853027),
+                                    P(136.4766235351563, -13.21222114562988),
+                                    P(136.4580078125, -13.25250053405762),
+                                    P(136.4524536132813, -13.22527694702148),
+                                    P(136.4508056640625, -13.22055435180664),
+                                    P(136.4460754394531, -13.21805572509766),
+                                    P(136.4099731445313, -13.23777770996094),
+                                    P(136.4069213867188, -13.24083328247071),
+                                    P(136.3677368164063, -13.24722099304199),
+                                    P(136.3710632324219, -13.1744441986084),
+                                    P(136.3738403320313, -13.0830545425415),
+                                    P(136.3741149902344, -13.07027816772461),
+                                    P(136.3724670410156, -13.06527709960938),
+                                    P(136.3669128417969, -13.05805587768555),
+                                    P(136.3627319335938, -13.05500030517578),
+                                    P(136.3505249023438, -13.05249977111816),
+                                    P(136.3382873535156, -13.05361175537109),
+                                    P(136.3283081054688, -13.05694389343262),
+                                    P(136.32080078125, -13.06305503845215),
+                                    P(136.3144226074219, -13.0716667175293),
+                                    P(136.3094177246094, -13.0808334350586),
+                                    P(136.3063659667969, -13.09138870239258),
+                                    P(136.3058166503906, -13.09805488586426),
+                                    P(136.3074645996094, -13.10305404663086),
+                                    P(136.310791015625, -13.10750007629395),
+                                    P(136.2861022949219, -13.16638946533203),
+                                    P(136.2435607910156, -13.20527839660645),
+                                    P(136.2044067382813, -13.23638725280762),
+                                    P(136.1960754394531, -13.241943359375),
+                                    P(136.1624755859375, -13.24333190917969),
+                                    P(136.1569213867188, -13.24083328247071),
+                                    P(136.1466369628906, -13.21194458007813),
+                                    P(136.145263671875, -13.20638847351074),
+                                    P(136.1449890136719, -13.20083236694336),
+                                    P(136.1455383300781, -13.19472312927246),
+                                    P(136.0971984863281, -13.18472290039063),
+                                    P(135.9955139160156, -13.22360992431641),
+                                    P(135.9910583496094, -13.22583198547364),
+                                    P(135.9344177246094, -13.2711124420166),
+                                    P(135.9269104003906, -13.27750015258789),
+                                    P(135.9238586425781, -13.2813892364502),
+                                    P(135.8924865722656, -13.33611106872559),
+                                    P(135.8905334472656, -13.34083366394043),
+                                    P(135.8885803222656, -13.35361099243164),
+                                    P(135.8944396972656, -13.36777687072754),
+                                    P(135.8977661132813, -13.37138652801514),
+                                    P(135.9349670410156, -13.39694595336914),
+                                    P(135.9085998535156, -13.45583343505859),
+                                    P(135.8641357421875, -13.49166679382324),
+                                    P(135.8455200195313, -13.57500076293945),
+                                    P(135.843017578125, -13.58722114562988),
+                                    P(135.8457946777344, -13.6038875579834),
+                                    P(135.8821716308594, -13.7197208404541),
+                                    P(135.8847045898438, -13.72472190856934),
+                                    P(135.8902587890625, -13.73194313049316),
+                                    P(135.8988647460938, -13.73833274841309),
+                                    P(135.9124755859375, -13.74555397033691),
+                                    P(135.9233093261719, -13.74916553497315),
+                                    P(135.9302673339844, -13.75027847290039),
+                                    P(135.9435729980469, -13.75083446502686),
+                                    P(135.9602355957031, -13.74666595458984),
+                                    P(135.9785766601563, -13.73861122131348),
+                                    P(135.9866333007813, -13.73305511474609),
+                                    P(136.0063781738281, -13.71749877929688),
+                                    P(136.0097045898438, -13.71361160278321),
+                                    P(136.0258178710938, -13.68777847290039),
+                                    P(136.020263671875, -13.76250076293946),
+                                    P(135.9885559082031, -13.86666488647461),
+                                    P(135.9246826171875, -13.96194458007813),
+                                    P(135.9083251953125, -14.0674991607666),
+                                    P(135.8969421386719, -14.14277839660645),
+                                    P(135.8735656738281, -14.19222259521484),
+                                    P(135.8646850585938, -14.19694519042969),
+                                    P(135.8038635253906, -14.23083305358887),
+                                    P(135.7813720703125, -14.24361038208008),
+                                    P(135.7660827636719, -14.25583457946777),
+                                    P(135.7527770996094, -14.2711124420166),
+                                    P(135.6230163574219, -14.43527793884277),
+                                    P(135.6196899414063, -14.43972206115723),
+                                    P(135.5613708496094, -14.53083419799805),
+                                    P(135.5513610839844, -14.54916763305664),
+                                    P(135.54052734375, -14.57361030578613),
+                                    P(135.5316467285156, -14.60166454315186),
+                                    P(135.5305480957031, -14.62138652801514),
+                                    P(135.5316467285156, -14.62694358825684),
+                                    P(135.5382995605469, -14.64666652679443),
+                                    P(135.5058288574219, -14.6694450378418),
+                                    P(135.4132995605469, -14.7294454574585),
+                                    P(135.3727416992188, -14.7288875579834),
+                                    P(135.4055480957031, -14.83027839660645),
+                                    P(135.4122009277344, -14.85083198547363),
+                                    P(135.4319152832031, -14.89777946472168),
+                                    P(135.4360961914063, -14.90694427490234),
+                                    P(135.4460754394531, -14.9244441986084),
+                                    P(135.4566345214844, -14.94111061096191),
+                                    P(135.466064453125, -14.95333290100098),
+                                    P(135.4752502441406, -14.96388816833496),
+                                    P(135.482177734375, -14.97055435180664),
+                                    P(135.54052734375, -15.01805686950684),
+                                    P(135.5452575683594, -15.0205545425415),
+                                    P(135.5799560546875, -15.0363883972168),
+                                    P(135.5966186523438, -15.0419454574585),
+                                    P(135.6085815429688, -15.04500007629395),
+                                    P(135.6705322265625, -15.06444454193115),
+                                    P(135.8518981933594, -15.17749977111816),
+                                    P(135.8821716308594, -15.19694519042969),
+                                    P(135.9085998535156, -15.2197208404541),
+                                    P(135.9222106933594, -15.23388862609864),
+                                    P(135.9369201660157, -15.25361347198487),
+                                    P(135.9402465820313, -15.25666809082031),
+                                    P(135.9488525390625, -15.26222229003906),
+                                    P(136.056640625, -15.31555557250977),
+                                    P(136.2121887207031, -15.39444541931152),
+                                    P(136.240234375, -15.41611099243164),
+                                    P(136.2419128417969, -15.42083358764648),
+                                    P(136.2527770996094, -15.47527694702148),
+                                    P(136.26416015625, -15.53444480895996),
+                                    P(136.2660827636719, -15.54638862609863),
+                                    P(136.2733154296875, -15.55999946594238),
+                                    P(136.2791442871094, -15.56722259521484),
+                                    P(136.2830505371094, -15.57111167907715),
+                                    P(136.3155212402344, -15.60027694702148),
+                                    P(136.3244018554688, -15.60583305358887),
+                                    P(136.341064453125, -15.6119441986084),
+                                    P(136.4574584960938, -15.65805625915528),
+                                    P(136.5685729980469, -15.71833229064942),
+                                    P(136.5982971191406, -15.73916625976563),
+                                    P(136.6710815429688, -15.80027770996094),
+                                    P(136.7152404785156, -15.85861015319824),
+                                    P(136.7196960449219, -15.86777687072754),
+                                    P(136.7658081054688, -15.90444564819336),
+                                    P(136.8607788085938, -15.91222190856934),
+                                    P(136.9205322265625, -15.9063892364502),
+                                    P(137.0305480957031, -15.91472244262695),
+                                    P(137.1366577148438, -15.96861076354981),
+                                    P(137.2760925292969, -16.05638885498047),
+                                    P(137.2866516113281, -16.06750106811523),
+                                    P(137.2980346679688, -16.07722473144531),
+                                    P(137.3060913085938, -16.08333206176758),
+                                    P(137.3391418457031, -16.10750198364258),
+                                    P(137.3644104003906, -16.12527847290039),
+                                    P(137.3738403320313, -16.13000106811523),
+                                    P(137.4341430664063, -16.15638732910156),
+                                    P(137.4791259765625, -16.17472076416016),
+                                    P(137.4974670410156, -16.17805480957031),
+                                    P(137.5046997070313, -16.17777633666992),
+                                    P(137.5205383300781, -16.17361068725586),
+                                    P(137.54052734375, -16.17416763305664),
+                                    P(137.5469360351563, -16.17555618286133),
+                                    P(137.5852355957031, -16.18777847290039),
+                                    P(137.6466369628906, -16.20805358886719),
+                                    P(137.7308044433594, -16.24610900878906),
+                                    P(137.7355041503906, -16.24916458129883),
+                                    P(137.7421875, -16.25583648681641),
+                                    P(137.7738647460938, -16.30055618286133),
+                                    P(137.7880249023438, -16.3216667175293),
+                                    P(137.7949829101563, -16.33361053466797),
+                                    P(137.8135986328125, -16.36999893188477),
+                                    P(137.81884765625, -16.37805557250977),
+                                    P(137.857177734375, -16.43611145019531),
+                                    P(137.8605041503906, -16.43999862670898),
+                                    P(137.8866577148438, -16.4566650390625),
+                                    P(137.9338684082031, -16.49361038208008),
+                                    P(137.9713439941406, -16.52722549438477),
+                                    P(138.0002746582031, -16.55472183227539),
+                                    P(138.066650390625, -16.61472320556641),
+                                    P(138.1188354492188, -16.65472030639648),
+                                    P(138.1474914550781, -16.67583084106445),
+                                    P(138.1902465820313, -16.70499801635742),
+                                    P(138.1994018554688, -16.70972061157227),
+                                    P(138.2908020019531, -16.74249649047852),
+                                    P(138.4352416992188, -16.77888870239258),
+                                    P(138.4669189453125, -16.7852783203125),
+                                    P(138.4869079589844, -16.78778076171875),
+                                    P(138.51416015625, -16.78833389282227),
+                                    P(138.5896911621094, -16.78361129760742),
+                                    P(138.6324462890625, -16.77888870239258),
+                                    P(138.6466369628906, -16.77972412109375),
+                                    P(138.6549682617188, -16.78499984741211),
+                                    P(138.6630249023438, -16.79111099243164),
+                                    P(138.6810913085938, -16.80805587768555),
+                                    P(138.6935729980469, -16.81722259521484),
+                                    P(138.8380126953125, -16.8738899230957),
+                                    P(138.8485717773438, -16.87777709960938),
+                                    P(138.8677368164063, -16.88055419921875),
+                                    P(138.9069213867188, -16.88499832153321),
+                                    P(138.9341430664063, -16.88527679443359),
+                                    P(138.9810791015625, -16.88916778564453),
+                                    P(138.9938354492188, -16.89138793945313),
+                                    P(139.0036010742188, -16.89527893066406),
+                                    P(139.0174865722656, -16.90305328369141),
+                                    P(139.0263671875, -16.90916442871094),
+                                    P(139.0357971191406, -16.92055511474609),
+                                    P(139.141357421875, -17.07416915893555),
+                                    P(139.1427612304688, -17.11750030517578),
+                                    P(139.143310546875, -17.13000106811523),
+                                    P(139.1447143554688, -17.14166641235352),
+                                    P(139.1469421386719, -17.15277862548828),
+                                    P(139.1508178710938, -17.16888809204102),
+                                    P(139.1627502441406, -17.20305252075195),
+                                    P(139.2013549804688, -17.28111267089844),
+                                    P(139.2124633789063, -17.29750061035157),
+                                    P(139.2191162109375, -17.30500030517578),
+                                    P(139.2441101074219, -17.32916641235352),
+                                    P(139.2605285644531, -17.34249877929688),
+                                    P(139.2835998535156, -17.35416793823242),
+                                    P(139.3302612304688, -17.36666488647461),
+                                    P(139.343017578125, -17.36888885498047),
+                                    P(139.3702392578125, -17.37166595458984),
+                                    P(139.37744140625, -17.37166595458984),
+                                    P(139.3955383300781, -17.36972045898438),
+                                    P(139.4091491699219, -17.36999893188477),
+                                    P(139.4163818359375, -17.37111282348633),
+                                    P(139.4274597167969, -17.37444305419922),
+                                    P(139.4371948242188, -17.37916564941406),
+                                    P(139.5285949707031, -17.43611145019531),
+                                    P(139.5327453613281, -17.43916702270508),
+                                    P(139.5402526855469, -17.44583129882813),
+                                    P(139.5849609375, -17.48555374145508),
+                                    P(139.5924682617188, -17.49277496337891),
+                                    P(139.611083984375, -17.51611328125),
+                                    P(139.6218872070313, -17.52555847167969),
+                                    P(139.6361083984375, -17.53250122070313),
+                                    P(139.647216796875, -17.53666687011719),
+                                    P(139.6649780273438, -17.54194641113282),
+                                    P(139.6924743652344, -17.54972457885742),
+                                    P(139.746337890625, -17.56388854980469),
+                                    P(139.7802734375, -17.57087707519531),
+                                    P(139.8141479492188, -17.57527923583984),
+                                    P(139.8827209472656, -17.61416625976563),
+                                    P(139.9463500976563, -17.65777587890625),
+                                    P(139.9574584960938, -17.67416763305664),
+                                    P(139.9702453613281, -17.68999862670898),
+                                    P(139.9735717773438, -17.69361114501953),
+                                    P(139.9819030761719, -17.70027542114258),
+                                    P(139.9916381835938, -17.70499801635742),
+                                    P(140.0185852050781, -17.71277618408203),
+                                    P(140.0513610839844, -17.71805572509766),
+                                    P(140.0657958984375, -17.71888732910156),
+                                    P(140.1321716308594, -17.71916580200195),
+                                    P(140.3743896484375, -17.67972183227539),
+                                    P(140.3966369628906, -17.67333221435547),
+                                    P(140.4949645996094, -17.64083480834961),
+                                    P(140.5341491699219, -17.62444305419922),
+                                    P(140.6135864257813, -17.58416748046875),
+                                    P(140.6263427734375, -17.57583236694336),
+                                    P(140.6377563476563, -17.56694412231445),
+                                    P(140.6611022949219, -17.54833602905273),
+                                    P(140.7580261230469, -17.47777557373047),
+                                    P(140.7810974121094, -17.46527481079102),
+                                    P(140.79052734375, -17.46166610717773),
+                                    P(140.8016357421875, -17.45888900756836),
+                                    P(140.8202514648438, -17.4577751159668),
+                                    P(140.8313598632813, -17.45360946655273),
+                                    P(140.8352355957031, -17.45027542114258),
+                                    P(140.8596801757813, -17.41110992431641),
+                                    P(140.87744140625, -17.37833404541016),
+                                    P(140.8858032226563, -17.35972213745117),
+                                    P(140.9421997070313, -17.1511116027832),
+                                    P(140.9524536132813, -17.09694671630859),
+                                    P(140.955810546875, -17.0716667175293),
+                                    P(140.9552307128906, -17.05916595458984),
+                                    P(140.9541320800781, -17.05361175537109),
+                                    P(140.9474792480469, -17.03277969360352),
+                                    P(140.9469299316406, -17.02666854858398),
+                                    P(140.9474792480469, -17.01972198486328),
+                                    P(140.9491271972656, -17.01361465454102),
+                                    P(140.9569091796875, -17.00111389160156),
+                                    P(140.9724731445313, -16.98138809204102),
+                                    P(141.0510864257813, -16.88388824462891),
+                                    P(141.1758117675781, -16.72888565063477),
+                                    P(141.1819152832031, -16.72111129760742),
+                                    P(141.1944274902344, -16.70388793945313),
+                                    P(141.2119140625, -16.67250061035156),
+                                    P(141.2166442871094, -16.66305541992188),
+                                    P(141.2688598632813, -16.54305648803711),
+                                    P(141.2861022949219, -16.50333404541016),
+                                    P(141.2955322265625, -16.47638702392578),
+                                    P(141.2994079589844, -16.45888900756836),
+                                    P(141.3002624511719, -16.45277786254883),
+                                    P(141.2999877929688, -16.44638824462891),
+                                    P(141.2988586425781, -16.44083404541016),
+                                    P(141.2963562011719, -16.43666458129883),
+                                    P(141.3155212402344, -16.35750198364258),
+                                    P(141.326904296875, -16.33194351196289),
+                                    P(141.3502502441406, -16.25638961791992),
+                                    P(141.4132995605469, -16.10722351074219),
+                                    P(141.4252624511719, -16.08388900756836),
+                                    P(141.4269104003906, -16.07916641235352),
+                                    P(141.4277648925781, -16.07305526733398),
+                                    P(141.4263610839844, -16.0613899230957),
+                                    P(141.4005432128906, -15.90583419799805),
+                                    P(141.4227600097656, -15.741943359375),
+                                    P(141.431640625, -15.67916679382324),
+                                    P(141.435791015625, -15.65500068664551),
+                                    P(141.4605102539063, -15.53611183166504),
+                                    P(141.4716186523438, -15.50444602966309),
+                                    P(141.5716247558594, -15.27861213684082),
+                                    P(141.6333312988282, -15.15166664123535),
+                                    P(141.6358032226563, -15.14694595336914),
+                                    P(141.6658020019531, -15.03611183166504),
+                                    P(141.6652526855469, -15.01694488525391),
+                                    P(141.6611022949219, -15.00111198425293),
+                                    P(141.6563720703125, -14.98583221435547),
+                                    P(141.6324462890625, -14.93805503845215),
+                                    P(141.621337890625, -14.91777801513672),
+                                    P(141.6146850585938, -14.91055679321289),
+                                    P(141.6096801757813, -14.90139007568359),
+                                    P(141.6038513183594, -14.88750076293945),
+                                    P(141.5952453613281, -14.86166572570801),
+                                    P(141.5677490234375, -14.76889038085938),
+                                    P(141.5652465820313, -14.75833511352539),
+                                    P(141.5216369628906, -14.48749923706055),
+                                    P(141.520263671875, -14.47500038146973),
+                                    P(141.5210876464844, -14.45527839660645),
+                                    P(141.5230407714844, -14.44305610656739),
+                                    P(141.5361022949219, -14.39861106872559),
+                                    P(141.5452575683594, -14.37360954284668),
+                                    P(141.5660705566407, -14.32333374023438),
+                                    P(141.5844116210938, -14.28416633605957),
+                                    P(141.5882873535156, -14.27527809143066),
+                                    P(141.5916442871094, -14.26472282409668),
+                                    P(141.5946960449219, -14.24638652801514),
+                                    P(141.59912109375, -14.1924991607666),
+                                    P(141.6002502441406, -14.15305519104004),
+                                    P(141.5999755859375, -14.13444519042969),
+                                    P(141.5955200195313, -14.11249923706055),
+                                    P(141.5905151367188, -14.09638786315918),
+                                    P(141.5813598632813, -14.07194519042969),
+                                    P(141.5749816894531, -14.05888938903809),
+                                    P(141.5516357421875, -14.03222274780274),
+                                    P(141.5280456542969, -14.01472282409668),
+                                    P(141.5172119140625, -14.0041675567627),
+                                    P(141.5019226074219, -13.98555564880371),
+                                    P(141.4796752929688, -13.95305442810059),
+                                    P(141.4752502441406, -13.94388961791992),
+                                    P(141.4716186523438, -13.93416595458985),
+                                    P(141.4674682617188, -13.91749954223633),
+                                    P(141.466064453125, -13.90666770935059),
+                                    P(141.4655151367188, -13.88750076293946),
+                                    P(141.4657897949219, -13.86833190917969),
+                                    P(141.4688415527344, -13.82805633544922),
+                                    P(141.4738464355469, -13.79694557189942),
+                                    P(141.4796752929688, -13.7672233581543),
+                                    P(141.4974670410156, -13.68000030517578),
+                                    P(141.5046997070313, -13.65027809143066),
+                                    P(141.5152587890625, -13.61277770996094),
+                                    P(141.520263671875, -13.59583282470703),
+                                    P(141.5419311523438, -13.53277778625488),
+                                    P(141.5544128417969, -13.50333404541016),
+                                    P(141.5591430664063, -13.49388885498047),
+                                    P(141.5652465820313, -13.4859676361084),
+                                    P(141.6124572753906, -13.41472244262696),
+                                    P(141.6805419921875, -13.28916740417481),
+                                    P(141.685791015625, -13.27277755737305),
+                                    P(141.6882934570313, -13.26083374023438),
+                                    P(141.6891479492188, -13.24722099304199),
+                                    P(141.6885681152344, -13.24083328247071),
+                                    P(141.6846923828125, -13.22500038146973),
+                                    P(141.6808166503906, -13.21527671813965),
+                                    P(141.6783142089844, -13.21111106872559),
+                                    P(141.6749877929688, -13.20694446563721),
+                                    P(141.6524658203125, -13.19499969482422),
+                                    P(141.6491394042969, -13.19138908386231),
+                                    P(141.6318969726563, -13.16194534301758),
+                                    P(141.6299438476563, -13.15694427490234),
+                                    P(141.5855102539063, -13.00139045715332),
+                                    P(141.5838623046875, -12.98916625976563),
+                                    P(141.5866394042969, -12.97749900817871),
+                                    P(141.5938415527344, -12.95750045776367),
+                                    P(141.6041259765625, -12.93888854980469),
+                                    P(141.6094055175781, -12.93027877807617),
+                                    P(141.6288452148438, -12.90805625915528),
+                                    P(141.6330261230469, -12.90555572509766),
+                                    P(141.6363830566406, -12.90972328186035),
+                                    P(141.6410827636719, -12.91277885437012),
+                                    P(141.6466369628906, -12.91361236572266),
+                                    P(141.6521911621094, -12.91250038146973),
+                                    P(141.7030334472656, -12.8761100769043),
+                                    P(141.7141418457031, -12.8658332824707),
+                                    P(141.7230224609375, -12.85527801513672),
+                                    P(141.7477416992188, -12.82444381713867),
+                                    P(141.7597045898438, -12.80805587768555),
+                                    P(141.7666625976563, -12.79472446441651),
+                                    P(141.7705383300781, -12.78472328186035),
+                                    P(141.7891540527344, -12.72500038146973),
+                                    P(141.7922058105469, -12.71416664123535),
+                                    P(141.7952575683594, -12.6966667175293),
+                                    P(141.798583984375, -12.68583297729492),
+                                    P(141.8184661865234, -12.69333362579346),
+                                    P(141.8206481933594, -12.69133377075196),
+                                    P(141.8241424560547, -12.69099998474121),
+                                    P(141.8283081054688, -12.69133377075196),
+                                    P(141.8471374511719, -12.6986665725708),
+                                    P(141.8499603271484, -12.69999980926514),
+                                    P(141.8524780273438, -12.70183277130127),
+                                    P(141.8567962646484, -12.70616722106934),
+                                    P(141.8584594726563, -12.70866584777832),
+                                    P(141.865478515625, -12.72533321380615),
+                                    P(141.8880310058594, -12.75500106811523),
+                                    P(141.8908081054688, -12.77194595336914),
+                                    P(141.8927612304688, -12.78972244262696),
+                                    P(141.8927612304688, -12.8033332824707),
+                                    P(141.8922119140625, -12.81500053405762),
+                                    P(141.8899841308594, -12.82777786254883),
+                                    P(141.8894348144531, -12.84083366394043),
+                                    P(141.8905334472656, -12.84638786315918),
+                                    P(141.9288635253906, -12.90333366394043),
+                                    P(141.9349670410156, -12.91111183166504),
+                                    P(141.9407958984375, -12.87583160400391),
+                                    P(141.9410705566406, -12.86916542053223),
+                                    P(141.939697265625, -12.85750007629395),
+                                    P(141.8838653564453, -12.70416736602783),
+                                    P(141.83935546875, -12.67250061035156),
+                                    P(141.7688598632813, -12.56999969482422),
+                                    P(141.7277526855469, -12.51277923583984),
+                                    P(141.7177429199219, -12.49333190917969),
+                                    P(141.7427368164063, -12.47805595397949),
+                                    P(141.7508239746094, -12.47249984741211),
+                                    P(141.7524719238281, -12.46722221374512),
+                                    P(141.7444152832031, -12.46111106872559),
+                                    P(141.72802734375, -12.4555549621582),
+                                    P(141.6669311523438, -12.44722175598145),
+                                    P(141.661376953125, -12.44833374023438),
+                                    P(141.6602478027344, -12.45444488525391),
+                                    P(141.6544189453125, -12.50333404541016),
+                                    P(141.6530456542969, -12.51611137390137),
+                                    P(141.6544189453125, -12.52833366394043),
+                                    P(141.6569213867188, -12.53250122070313),
+                                    P(141.6619262695313, -12.53499984741211),
+                                    P(141.6724853515625, -12.53194427490234),
+                                    P(141.6852416992188, -12.55166625976563),
+                                    P(141.6321716308594, -12.56805610656738),
+                                    P(141.6216125488281, -12.57111167907715),
+                                    P(141.596923828125, -12.56027793884278),
+                                    P(141.593017578125, -12.5575008392334),
+                                    P(141.5902404785156, -12.55333328247071),
+                                    P(141.5894165039063, -12.54694557189941),
+                                    P(141.5941162109375, -12.53166770935059),
+                                    P(141.606689453125, -12.50929546356201),
+                                    P(141.6218872070313, -12.48250007629395),
+                                    P(141.6602478027344, -12.4013900756836),
+                                    P(141.6688537597656, -12.38194274902344),
+                                    P(141.6882934570313, -12.33194446563721),
+                                    P(141.7530517578125, -12.24666595458984),
+                                    P(141.7758178710938, -12.21361160278321),
+                                    P(141.7599792480469, -12.17888832092285),
+                                    P(141.8016357421875, -12.05888938903809),
+                                    P(141.8091430664063, -12.0444450378418),
+                                    P(141.8144226074219, -12.0363883972168),
+                                    P(141.8258056640625, -12.02000045776367),
+                                    P(141.8457946777344, -11.99249839782715),
+                                    P(141.8524475097656, -11.98444366455078),
+                                    P(141.8707885742188, -11.96833229064941),
+                                    P(141.8880310058594, -11.95833396911621),
+                                    P(141.8952026367188, -11.96299934387207),
+                                    P(141.8993682861328, -11.96316623687744),
+                                    P(141.9017028808594, -11.96500015258789),
+                                    P(141.9011993408203, -11.96866607666016),
+                                    P(141.8928680419922, -11.97716617584229),
+                                    P(141.8905334472656, -11.98833274841309),
+                                    P(141.8910827636719, -11.99444389343262),
+                                    P(141.9169311523438, -12.08888816833496),
+                                    P(142.0172119140625, -12.07194519042969),
+                                    P(142.0227661132813, -12.06999969482422),
+                                    P(142.0258178710938, -12.06694412231445),
+                                    P(142.0288696289063, -12.06222152709961),
+                                    P(142.0305480957031, -12.05694389343262),
+                                    P(142.032470703125, -12.04472446441651),
+                                    P(142.0327453613281, -12.03861236572266),
+                                    P(142.0308227539063, -12.03388977050781),
+                                    P(141.984130859375, -11.98250007629395),
+                                    P(141.9730224609375, -11.97999954223633),
+                                    P(141.9610900878906, -11.98222160339356),
+                                    P(141.9540252685547, -11.97049903869629),
+                                    P(141.9511871337891, -11.9694995880127),
+                                    P(141.9491882324219, -11.96733188629151),
+                                    P(141.9480133056641, -11.96450042724609),
+                                    P(141.947021484375, -11.96083354949951),
+                                    P(141.9468688964844, -11.95416641235352),
+                                    P(141.9466247558594, -11.9244441986084),
+                                    P(141.9577331542969, -11.85083198547364),
+                                    P(141.968017578125, -11.81111145019531),
+                                    P(141.9696960449219, -11.80583381652832),
+                                    P(142.0558166503906, -11.55027770996094),
+                                    P(142.0819091796875, -11.48555564880371),
+                                    P(142.1002502441407, -11.44694519042969),
+                                    P(142.1216125488281, -11.37805557250977),
+                                    P(142.1241149902344, -11.36722183227539),
+                                    P(142.1291198730469, -11.33694458007813),
+                                    P(142.1588745117188, -11.14944458007813),
+                                    P(142.1588745117188, -11.12388801574707),
+                                    P(142.1569213867188, -11.09249877929688),
+                                    P(142.1535949707031, -11.05694389343262),
+                                    P(142.1521911621094, -11.04555511474609),
+                                    P(142.1499938964844, -11.03444480895996),
+                                    P(142.1480407714844, -11.02833366394043),
+                                    P(142.1458129882813, -11.01805686950684),
+                                    P(142.1385803222656, -10.97972106933594),
+                                    P(142.1377563476563, -10.96749877929688),
+                                    P(142.1419372558594, -10.95666694641113),
+                                    P(142.147216796875, -10.94888877868652),
+                                    P(142.1508178710938, -10.94555473327637),
+                                    P(142.1741333007813, -10.9283332824707),
+                                    P(142.1827392578125, -10.92277717590332),
+                                    P(142.187744140625, -10.92083358764648),
+                                    P(142.1941223144531, -10.91972160339356),
+                                    P(142.2002563476563, -10.92000007629395),
+                                    P(142.2063598632813, -10.92111206054688),
+                                    P(142.2166442871094, -10.92555618286133),
+                                    P(142.2227478027344, -10.92666625976563),
+                                    P(142.3044128417969, -10.90777778625488),
+                                    P(142.3394165039063, -10.89861106872559),
+                                    P(142.3466186523438, -10.8922233581543),
+                                    P(142.3966369628906, -10.82583236694336),
+                                    P(142.4024658203125, -10.81805610656738),
+                                    P(142.4111022949219, -10.79861068725586),
+                                    P(142.4127502441406, -10.79333305358887),
+                                    P(142.4163818359375, -10.77527809143066),
+                                    P(142.41748046875, -10.76250076293946),
+                                    P(142.421630859375, -10.74555397033691),
+                                    P(142.4263610839844, -10.73638725280762),
+                                    P(142.4419250488281, -10.71055603027344),
+                                    P(142.4469299316406, -10.70888900756836),
+                                    P(142.5188598632813, -10.70666694641113),
+                                    P(142.556640625, -10.72166633605957),
+                                    P(142.6088562011719, -10.74444389343262),
+                                    P(142.6127319335938, -10.74805545806885),
+                                    P(142.615234375, -10.75222396850586),
+                                    P(142.6157836914063, -10.75833511352539),
+                                    P(142.5955200195313, -10.79249954223633),
+                                    P(142.5861206054688, -10.79756546020508),
+                                    P(142.5758056640625, -10.80055618286133),
+                                    P(142.5716247558594, -10.80305480957031),
+                                    P(142.5224914550781, -10.84916687011719),
+                                    P(142.5160827636719, -10.85610961914063),
+                                    P(142.5138854980469, -10.86083221435547),
+                                    P(142.5127563476563, -10.866943359375),
+                                    P(142.5027770996094, -10.94861030578613),
+                                    P(142.506103515625, -10.95222282409668),
+                                    P(142.5116577148438, -10.95111083984375),
+                                    P(142.5166625976563, -10.94916725158691),
+                                    P(142.5216369628906, -10.94611167907715),
+                                    P(142.5280456542969, -10.94027709960938),
+                                    P(142.536376953125, -10.92777824401856),
+                                    P(142.5521850585938, -10.89527893066406),
+                                    P(142.5560913085938, -10.88527870178223),
+                                    P(142.5613708496094, -10.87638854980469),
+                                    P(142.5699768066406, -10.86999893188477),
+                                    P(142.5741271972656, -10.86833190917969),
+                                    P(142.5852355957031, -10.86610984802246),
+                                    P(142.5982971191406, -10.86722183227539),
+                                    P(142.6038513183594, -10.86888885498047),
+                                    P(142.61328125, -10.87416553497315),
+                                    P(142.6205139160156, -10.87972068786621),
+                                    P(142.7227478027344, -10.96138954162598),
+                                    P(142.72607421875, -10.96444511413574),
+                                    P(142.7419128417969, -10.9827766418457),
+                                    P(142.7477416992188, -10.99027633666992),
+                                    P(142.7855224609375, -11.07333374023438),
+                                    P(142.7910766601563, -11.08777809143066),
+                                    P(142.8041381835938, -11.16722297668457),
+                                    P(142.8607788085938, -11.36166572570801),
+                                    P(142.8674621582031, -11.38166618347168),
+                                    P(142.8680114746094, -11.38777923583985),
+                                    P(142.8641357421875, -11.39777946472168),
+                                    P(142.8391418457031, -11.50889015197754),
+                                    P(142.841064453125, -11.51361274719238),
+                                    P(142.8563537597656, -11.62305545806885),
+                                    P(142.8674621582031, -11.71583366394043),
+                                    P(142.8663635253906, -11.74222183227539),
+                                    P(142.8605041503906, -11.77805709838867),
+                                    P(142.8555297851563, -11.81583404541016),
+                                    P(142.8583068847657, -11.8330545425415),
+                                    P(142.8602294921875, -11.83777809143067),
+                                    P(142.865234375, -11.84611129760742),
+                                    P(142.8718872070313, -11.8538875579834),
+                                    P(142.8841552734375, -11.86333274841309),
+                                    P(142.9646911621094, -11.9244441986084),
+                                    P(142.9727478027344, -11.93027877807617),
+                                    P(142.9824523925781, -11.93472290039063),
+                                    P(142.9941101074219, -11.93638801574707),
+                                    P(143.0080261230469, -11.93694496154785),
+                                    P(143.0205383300781, -11.93611145019531),
+                                    P(143.0374755859375, -11.93277740478516),
+                                    P(143.0588684082031, -11.92000007629395),
+                                    P(143.0624694824219, -11.9169454574585),
+                                    P(143.0752563476563, -11.90916633605957),
+                                    P(143.0899658203125, -11.90361213684082),
+                                    P(143.1033020019531, -11.90361213684082),
+                                    P(143.1291198730469, -11.91333389282227),
+                                    P(143.1338806152344, -11.91638946533203),
+                                    P(143.1991271972656, -11.98749923706055),
+                                    P(143.1611022949219, -12.04583358764648),
+                                    P(143.147216796875, -12.06722259521484),
+                                    P(143.1021728515625, -12.14027786254883),
+                                    P(143.0819091796875, -12.22500038146973),
+                                    P(143.0749816894531, -12.29222297668457),
+                                    P(143.0730285644531, -12.31861114501953),
+                                    P(143.0758056640625, -12.3358325958252),
+                                    P(143.0785827636719, -12.34000015258789),
+                                    P(143.0824584960938, -12.34277725219727),
+                                    P(143.1255187988281, -12.34916687011719),
+                                    P(143.1324462890625, -12.3488883972168),
+                                    P(143.1460876464844, -12.34249877929688),
+                                    P(143.1566467285156, -12.3397216796875),
+                                    P(143.1627502441406, -12.33916664123535),
+                                    P(143.1752624511719, -12.34166717529297),
+                                    P(143.19775390625, -12.35416603088379),
+                                    P(143.2105102539063, -12.36222076416016),
+                                    P(143.218017578125, -12.36805534362793),
+                                    P(143.2207946777344, -12.37222099304199),
+                                    P(143.2224731445313, -12.37694358825684),
+                                    P(143.2419128417969, -12.38055419921875),
+                                    P(143.2480163574219, -12.38194274902344),
+                                    P(143.252197265625, -12.38500022888184),
+                                    P(143.2749938964844, -12.4102783203125),
+                                    P(143.2766418457031, -12.41583442687988),
+                                    P(143.2802734375, -12.4466667175293),
+                                    P(143.2799682617188, -12.45333290100098),
+                                    P(143.2755432128906, -12.46277809143067),
+                                    P(143.272216796875, -12.47360992431641),
+                                    P(143.2716369628906, -12.48638725280762),
+                                    P(143.272216796875, -12.49333190917969),
+                                    P(143.2755432128906, -12.50972366333008),
+                                    P(143.2774658203125, -12.51472282409668),
+                                    P(143.2821960449219, -12.52305603027344),
+                                    P(143.3121948242188, -12.55555534362793),
+                                    P(143.3197021484375, -12.56194496154785),
+                                    P(143.3283081054688, -12.56694412231445),
+                                    P(143.3352355957031, -12.56722259521485),
+                                    P(143.3535766601563, -12.56527709960938),
+                                    P(143.3605041503906, -12.56555557250977),
+                                    P(143.3660583496094, -12.56694412231445),
+                                    P(143.4111022949219, -12.59194374084473),
+                                    P(143.4152526855469, -12.59472274780274),
+                                    P(143.4291381835938, -12.61444473266602),
+                                    P(143.4308166503906, -12.61916542053223),
+                                    P(143.4111022949219, -12.67777824401856),
+                                    P(143.3944396972656, -12.70972347259522),
+                                    P(143.3885803222656, -12.71777725219727),
+                                    P(143.3802490234375, -12.73027801513672),
+                                    P(143.375244140625, -12.73972129821777),
+                                    P(143.3724670410156, -12.75055694580078),
+                                    P(143.3674621582031, -12.77416801452637),
+                                    P(143.3655090332031, -12.7863883972168),
+                                    P(143.3605041503906, -12.8216667175293),
+                                    P(143.3599548339844, -12.83444404602051),
+                                    P(143.3605041503906, -12.84055519104004),
+                                    P(143.3641357421875, -12.85722160339356),
+                                    P(143.4027709960938, -12.87027740478516),
+                                    P(143.4088745117188, -12.87055397033691),
+                                    P(143.4755249023438, -12.86277770996094),
+                                    P(143.5044250488281, -12.85916519165039),
+                                    P(143.51416015625, -12.87916564941406),
+                                    P(143.5099792480469, -13.00166702270508),
+                                    P(143.5055541992188, -13.0444450378418),
+                                    P(143.5030517578125, -13.06833267211914),
+                                    P(143.5024719238281, -13.07027816772461),
+                                    P(143.4993896484375, -13.07416725158691),
+                                    P(143.4977416992188, -13.07972145080567),
+                                    P(143.498291015625, -13.09860992431641),
+                                    P(143.5169372558594, -13.26916694641113),
+                                    P(143.5216369628907, -13.30416679382324),
+                                    P(143.5260925292969, -13.33305454254151),
+                                    P(143.5310974121094, -13.34805488586426),
+                                    P(143.536376953125, -13.35722160339356),
+                                    P(143.5397033691406, -13.36083221435547),
+                                    P(143.5472106933594, -13.36777687072754),
+                                    P(143.5560913085938, -13.37222099304199),
+                                    P(143.566650390625, -13.3761100769043),
+                                    P(143.5705261230469, -13.37888717651367),
+                                    P(143.5913391113281, -13.41861152648926),
+                                    P(143.5952453613281, -13.4283332824707),
+                                    P(143.5960693359375, -13.44055557250977),
+                                    P(143.5866394042969, -13.52611160278321),
+                                    P(143.5780334472656, -13.5613899230957),
+                                    P(143.5533142089844, -13.64166831970215),
+                                    P(143.5299682617188, -13.75055694580078),
+                                    P(143.5316467285156, -13.76222229003906),
+                                    P(143.5455322265625, -13.80222320556641),
+                                    P(143.6013488769531, -13.93611145019531),
+                                    P(143.6160583496094, -13.9558334350586),
+                                    P(143.6327209472656, -13.97360992431641),
+                                    P(143.647216796875, -13.9869441986084),
+                                    P(143.6627502441406, -13.99860954284668),
+                                    P(143.6758117675781, -14.00722312927246),
+                                    P(143.6827392578125, -14.01500129699707),
+                                    P(143.6846923828125, -14.01916694641113),
+                                    P(143.6866455078125, -14.02388954162598),
+                                    P(143.6888732910156, -14.03499984741211),
+                                    P(143.69384765625, -14.06999969482422),
+                                    P(143.7030334472656, -14.13944435119629),
+                                    P(143.7035827636719, -14.14555454254151),
+                                    P(143.7021789550781, -14.1644458770752),
+                                    P(143.6983032226563, -14.17527770996094),
+                                    P(143.6972045898438, -14.18083381652832),
+                                    P(143.6972045898438, -14.18694496154785),
+                                    P(143.6983032226563, -14.19388961791992),
+                                    P(143.7119140625, -14.23944282531738),
+                                    P(143.7338562011719, -14.31194496154785),
+                                    P(143.740234375, -14.32638931274414),
+                                    P(143.7730407714844, -14.39527893066406),
+                                    P(143.7821960449219, -14.41333389282227),
+                                    P(143.7977600097656, -14.4325008392334),
+                                    P(143.8160705566406, -14.44944381713867),
+                                    P(143.8538513183594, -14.47472190856934),
+                                    P(143.8669128417969, -14.48194313049316),
+                                    P(143.8780212402344, -14.48583221435547),
+                                    P(143.897216796875, -14.48861122131348),
+                                    P(143.9344177246094, -14.491943359375),
+                                    P(143.9632873535156, -14.49361038208008),
+                                    P(144.0008239746094, -14.4908332824707),
+                                    P(144.01220703125, -14.48833274841309),
+                                    P(144.0172119140625, -14.48583221435547),
+                                    P(144.0849609375, -14.44388961791992),
+                                    P(144.0997009277344, -14.43055534362793),
+                                    P(144.1535949707031, -14.3799991607666),
+                                    P(144.3419189453125, -14.30138969421387),
+                                    P(144.38916015625, -14.28055572509766),
+                                    P(144.4294128417969, -14.25861167907715),
+                                    P(144.4407958984375, -14.24944305419922),
+                                    P(144.4491271972656, -14.23666572570801),
+                                    P(144.4588623046875, -14.21861076354981),
+                                    P(144.4657897949219, -14.20444488525391),
+                                    P(144.4710693359375, -14.18888854980469),
+                                    P(144.4746704101563, -14.16500091552734),
+                                    P(144.4777526855469, -14.16111183166504),
+                                    P(144.5105285644531, -14.16833305358887),
+                                    P(144.5155334472656, -14.1705551147461),
+                                    P(144.5188598632813, -14.17388916015625),
+                                    P(144.5591430664063, -14.22999954223633),
+                                    P(144.5760803222656, -14.2541675567627),
+                                    P(144.5794067382813, -14.2591667175293),
+                                    P(144.5805358886719, -14.26388931274414),
+                                    P(144.5783081054688, -14.27555656433106),
+                                    P(144.5680236816406, -14.30111122131348),
+                                    P(144.5671997070313, -14.30666732788086),
+                                    P(144.5669250488281, -14.35499954223633),
+                                    P(144.5669250488281, -14.3619441986084),
+                                    P(144.6121826171875, -14.48027801513672),
+                                    P(144.6169128417969, -14.48916625976563),
+                                    P(144.6746826171875, -14.55583381652832),
+                                    P(144.6788635253906, -14.55888938903809),
+                                    P(144.7835998535156, -14.59805488586426),
+                                    P(144.8252563476563, -14.6130542755127),
+                                    P(144.8310852050781, -14.61472129821778),
+                                    P(144.8427429199219, -14.61638832092285),
+                                    P(144.8569030761719, -14.61666488647461),
+                                    P(144.8796691894531, -14.6119441986084),
+                                    P(144.8869323730469, -14.61222076416016),
+                                    P(144.8924865722656, -14.61361122131348),
+                                    P(144.897216796875, -14.61583328247071),
+                                    P(144.9013671875, -14.61888885498047),
+                                    P(144.9069213867188, -14.62722206115723),
+                                    P(144.9324645996094, -14.68666553497315),
+                                    P(144.9321899414063, -14.69277763366699),
+                                    P(144.9382934570313, -14.72861099243164),
+                                    P(144.9421997070313, -14.73833274841309),
+                                    P(144.9516296386719, -14.74944305419922),
+                                    P(144.955810546875, -14.75222396850586),
+                                    P(144.9649658203125, -14.75666809082031),
+                                    P(144.9955139160156, -14.76861190795899),
+                                    P(145.0758666992188, -14.80317497253418),
+                                    P(145.2063598632813, -14.86249923706055),
+                                    P(145.3157958984375, -14.94555473327637),
+                                    P(145.3163757324219, -14.99749946594238),
+                                    P(145.3030395507813, -15.01139068603516),
+                                    P(145.2846984863281, -15.03499984741211),
+                                    P(145.2713623046875, -15.05638885498047),
+                                    P(145.2549743652344, -15.08277702331543),
+                                    P(145.2430114746094, -15.10499954223633),
+                                    P(145.2352294921875, -15.12527656555176),
+                                    P(145.2333068847656, -15.14361190795898),
+                                    P(145.2333068847656, -15.15055656433106),
+                                    P(145.2346801757813, -15.16888999938965),
+                                    P(145.2377319335938, -15.19305610656739),
+                                    P(145.2769165039063, -15.25694465637207),
+                                    P(145.2855224609375, -15.30444526672364),
+                                    P(145.2894287109375, -15.33111190795898),
+                                    P(145.2485656738281, -15.44638824462891),
+                                    P(145.2777709960938, -15.48944282531738),
+                                    P(145.3049621582031, -15.55472183227539),
+                                    P(145.3577270507813, -15.72638893127442),
+                                    P(145.3613586425781, -15.74222183227539),
+                                    P(145.3616333007813, -15.76222229003906),
+                                    P(145.357177734375, -15.81888961791992),
+                                    P(145.35302734375, -15.88249969482422),
+                                    P(145.35302734375, -15.88916778564453),
+                                    P(145.3541259765625, -15.90166664123535),
+                                    P(145.3566284179688, -15.91333389282227),
+                                    P(145.3613586425781, -15.92166709899902),
+                                    P(145.3646850585938, -15.92500114440918),
+                                    P(145.3738403320313, -15.93027877807617),
+                                    P(145.3788452148438, -15.93222236633301),
+                                    P(145.391357421875, -15.94083404541016),
+                                    P(145.3988647460938, -15.94805526733398),
+                                    P(145.4099731445313, -15.9647216796875),
+                                    P(145.4463500976563, -16.03139114379883),
+                                    P(145.4533081054688, -16.0444450378418),
+                                    P(145.4621887207031, -16.07694625854492),
+                                    P(145.4624633789063, -16.08916854858398),
+                                    P(145.4513549804688, -16.28222274780273),
+                                    P(145.4410705566406, -16.29277801513672),
+                                    P(145.4219055175781, -16.31639099121095),
+                                    P(145.4160766601563, -16.32416915893555),
+                                    P(145.4107971191406, -16.33305740356445),
+                                    P(145.4069213867188, -16.34333419799805),
+                                    P(145.4021911621094, -16.4375),
+                                    P(145.4019165039063, -16.44444274902344),
+                                    P(145.4035949707031, -16.46221923828125),
+                                    P(145.4055480957031, -16.46722030639648),
+                                    P(145.4130249023438, -16.47416687011719),
+                                    P(145.4238586425781, -16.47722244262695),
+                                    P(145.4644165039063, -16.50222396850586),
+                                    P(145.5094299316406, -16.56111145019531),
+                                    P(145.6163635253906, -16.6986083984375),
+                                    P(145.6683044433594, -16.73694229125977),
+                                    P(145.7283020019531, -16.81639099121094),
+                                    P(145.7724914550781, -16.88277816772461),
+                                    P(145.7744140625, -16.88750076293945),
+                                    P(145.8060913085938, -16.91305541992188),
+                                    P(145.8366394042969, -16.88750076293945),
+                                    P(145.841064453125, -16.88499832153321),
+                                    P(145.9224853515625, -16.86916732788086),
+                                    P(145.9294128417969, -16.86999893188477),
+                                    P(145.9352416992188, -16.87138748168945),
+                                    P(145.9402465820313, -16.87361145019531),
+                                    P(145.9521789550781, -16.88277816772461),
+                                    P(145.9583129882813, -16.89055633544922),
+                                    P(145.9605102539063, -16.89527893066406),
+                                    P(145.9594116210938, -16.90139007568359),
+                                    P(145.955810546875, -16.90472030639648),
+                                    P(145.9508056640625, -16.90666580200195),
+                                    P(145.9111022949219, -16.97166442871094),
+                                    P(145.8960876464844, -16.99805450439453),
+                                    P(145.8785705566406, -17.03805541992188),
+                                    P(145.8777465820313, -17.04277801513672),
+                                    P(145.8780212402344, -17.06277847290039),
+                                    P(145.8821716308594, -17.07250213623047),
+                                    P(145.8855285644531, -17.07583236694336),
+                                    P(145.953857421875, -17.1886100769043),
+                                    P(146.0319213867188, -17.36444473266602),
+                                    P(146.0855102539063, -17.55278015136719),
+                                    P(146.1066284179688, -17.68360900878906),
+                                    P(146.1018981933594, -17.69972229003906),
+                                    P(146.0860900878906, -17.78722381591797),
+                                    P(146.1007995605469, -17.88972091674805),
+                                    P(146.0944213867188, -17.95277786254883),
+                                    P(146.0935668945313, -17.95888900756836),
+                                    P(146.0849609375, -17.97861099243164),
+                                    P(146.0827331542969, -17.98332977294922),
+                                    P(146.0760803222656, -17.99138641357422),
+                                    P(146.0724792480469, -17.99388885498047),
+                                    P(146.0657958984375, -18.00139236450195),
+                                    P(146.0605163574219, -18.00944519042969),
+                                    P(146.0372009277344, -18.05083465576172),
+                                    P(146.0033264160156, -18.13166809082031),
+                                    P(146.0016479492188, -18.13722229003906),
+                                    P(146.0008239746094, -18.14999771118164),
+                                    P(146.0013732910156, -18.17610931396484),
+                                    P(146.0094299316406, -18.23805236816406),
+                                    P(146.0216369628906, -18.26639175415039),
+                                    P(146.0249938964844, -18.27138900756836),
+                                    P(146.2119140625, -18.49166488647461),
+                                    P(146.2283020019531, -18.50500106811523),
+                                    P(146.2572021484375, -18.51111221313477),
+                                    P(146.2933044433594, -18.51444625854492),
+                                    P(146.3246765136719, -18.5261116027832),
+                                    P(146.3333129882813, -18.53194427490234),
+                                    P(146.3369140625, -18.53666687011719),
+                                    P(146.3394165039063, -18.54777908325195),
+                                    P(146.3374633789063, -18.56694412231445),
+                                    P(146.3321838378906, -18.61750030517578),
+                                    P(146.3277587890625, -18.6422233581543),
+                                    P(146.3246765136719, -18.65250015258789),
+                                    P(146.306640625, -18.67666625976563),
+                                    P(146.3021850585938, -18.68611145019531),
+                                    P(146.2908020019531, -18.71055603027344),
+                                    P(146.2827453613281, -18.73805236816406),
+                                    P(146.2794189453125, -18.75638961791992),
+                                    P(146.2680358886719, -18.84389114379883),
+                                    P(146.268310546875, -18.86333465576172),
+                                    P(146.2724914550781, -18.87972259521484),
+                                    P(146.2752685546875, -18.88388824462891),
+                                    P(146.2813720703125, -18.8922233581543),
+                                    P(146.3335876464844, -18.95861053466797),
+                                    P(146.3377380371094, -18.96221923828125),
+                                    P(146.3796691894531, -18.99805450439453),
+                                    P(146.423583984375, -19.02555847167969),
+                                    P(146.4421997070313, -19.06361389160156),
+                                    P(146.4472045898438, -19.07138824462891),
+                                    P(146.4513549804688, -19.07472229003906),
+                                    P(146.5652465820313, -19.14361190795898),
+                                    P(146.6344299316406, -19.17527770996094),
+                                    P(146.6544189453125, -19.18388748168946),
+                                    P(146.6819152832031, -19.19305419921875),
+                                    P(146.7013549804688, -19.19499969482422),
+                                    P(146.7066345214844, -19.19305419921875),
+                                    P(146.7257995605469, -19.18305587768555),
+                                    P(146.7308044433594, -19.18166732788086),
+                                    P(146.7438354492188, -19.18000030517578),
+                                    P(146.7505493164063, -19.18000030517578),
+                                    P(146.7563781738281, -19.18166732788086),
+                                    P(146.7613830566406, -19.18444442749023),
+                                    P(146.768310546875, -19.19055557250977),
+                                    P(146.814697265625, -19.2430534362793),
+                                    P(146.8730163574219, -19.29833602905273),
+                                    P(146.8824462890625, -19.3025016784668),
+                                    P(146.8938598632813, -19.30555725097656),
+                                    P(146.9535827636719, -19.30583572387695),
+                                    P(147.0722045898438, -19.34277725219727),
+                                    P(147.1177368164063, -19.39027786254883),
+                                    P(147.1394348144531, -19.40277862548828),
+                                    P(147.2533264160156, -19.42583084106445),
+                                    P(147.4213562011719, -19.41611099243164),
+                                    P(147.4324645996094, -19.41277694702148),
+                                    P(147.4369201660156, -19.4102783203125),
+                                    P(147.4472045898438, -19.39249801635742),
+                                    P(147.4474792480469, -19.38555526733398),
+                                    P(147.4466247558594, -19.37944412231445),
+                                    P(147.4447021484375, -19.37333297729492),
+                                    P(147.4424743652344, -19.36972045898438),
+                                    P(147.4341430664063, -19.35722351074219),
+                                    P(147.4219055175781, -19.34194564819336),
+                                    P(147.395263671875, -19.31833267211914),
+                                    P(147.393310546875, -19.31361389160156),
+                                    P(147.3941345214844, -19.30722427368164),
+                                    P(147.3977661132813, -19.30389022827148),
+                                    P(147.4049682617188, -19.30416870117188),
+                                    P(147.4107971191407, -19.30611038208008),
+                                    P(147.4271850585938, -19.32500076293945),
+                                    P(147.4563598632813, -19.3658332824707),
+                                    P(147.4613647460938, -19.37416839599609),
+                                    P(147.5541381835938, -19.53333282470703),
+                                    P(147.5563659667969, -19.53750228881836),
+                                    P(147.5657958984375, -19.57583236694336),
+                                    P(147.5760803222656, -19.62138748168945),
+                                    P(147.5877380371094, -19.67638778686524),
+                                    P(147.594970703125, -19.72722244262695),
+                                    P(147.6160583496094, -19.76861190795898),
+                                    P(147.6210632324219, -19.77777862548828),
+                                    P(147.6677551269531, -19.82305526733398),
+                                    P(147.6713562011719, -19.82638931274414),
+                                    P(147.718017578125, -19.83583450317383),
+                                    P(147.7302551269531, -19.83805465698242),
+                                    P(147.7710876464844, -19.83527755737305),
+                                    P(147.7691345214844, -19.81722259521484),
+                                    P(147.7636108398438, -19.80916595458984),
+                                    P(147.7608032226563, -19.79805755615234),
+                                    P(147.754150390625, -19.74499893188477),
+                                    P(147.7546997070313, -19.71638870239258),
+                                    P(147.7680358886719, -19.70360946655273),
+                                    P(147.8152465820313, -19.70805358886719),
+                                    P(147.8210754394531, -19.70972061157227),
+                                    P(147.8255310058594, -19.71249771118164),
+                                    P(147.8485717773438, -19.73249816894531),
+                                    P(147.8513488769531, -19.73666381835938),
+                                    P(147.8527526855469, -19.74222183227539),
+                                    P(147.8518981933594, -19.74916458129883),
+                                    P(147.85107421875, -19.80666732788086),
+                                    P(147.8516235351563, -19.82583236694336),
+                                    P(147.8549499511719, -19.83638763427734),
+                                    P(147.8621826171875, -19.85083389282227),
+                                    P(147.8649597167969, -19.85499954223633),
+                                    P(147.8721923828125, -19.86111068725586),
+                                    P(147.9119262695313, -19.89389038085938),
+                                    P(147.9371948242188, -19.90999984741211),
+                                    P(147.9480285644531, -19.91361236572266),
+                                    P(147.9655151367188, -19.91777801513672),
+                                    P(147.97802734375, -19.9194450378418),
+                                    P(148, -19.9202766418457),
+                                    P(148.0058288574219, -19.91888809204102),
+                                    P(148.096923828125, -19.91305541992188),
+                                    P(148.219970703125, -19.94721984863281),
+                                    P(148.2697143554688, -19.99110794067383),
+                                    P(148.3058166503906, -20.03250122070313),
+                                    P(148.3049621582031, -20.03861236572266),
+                                    P(148.2991333007813, -20.04000091552734),
+                                    P(148.2852478027344, -20.04055786132813),
+                                    P(148.2727661132813, -20.04305648803711),
+                                    P(148.26416015625, -20.04777908325195),
+                                    P(148.2647094726563, -20.05416870117188),
+                                    P(148.2746887207031, -20.07666778564453),
+                                    P(148.3338623046875, -20.14527893066406),
+                                    P(148.4019165039063, -20.20138931274414),
+                                    P(148.411376953125, -20.20694351196289),
+                                    P(148.4166564941406, -20.20861053466797),
+                                    P(148.4238586425781, -20.20861053466797),
+                                    P(148.4619140625, -20.1888885498047),
+                                    P(148.4663696289063, -20.18638610839844),
+                                    P(148.4685668945313, -20.18138885498047),
+                                    P(148.47412109375, -20.1341667175293),
+                                    P(148.4727478027344, -20.12805557250977),
+                                    P(148.4707946777344, -20.1238899230957),
+                                    P(148.4641418457031, -20.11639022827148),
+                                    P(148.44970703125, -20.10916519165039),
+                                    P(148.4374694824219, -20.10027694702148),
+                                    P(148.4352416992188, -20.09555435180664),
+                                    P(148.4346923828125, -20.08916854858398),
+                                    P(148.4352416992188, -20.07611083984375),
+                                    P(148.4405212402344, -20.06666564941406),
+                                    P(148.4485778808594, -20.0605583190918),
+                                    P(148.4552307128906, -20.06000137329102),
+                                    P(148.4610900878906, -20.0613899230957),
+                                    P(148.522216796875, -20.08805465698242),
+                                    P(148.5641479492188, -20.12111282348633),
+                                    P(148.6374816894531, -20.18277740478516),
+                                    P(148.6730346679688, -20.21611022949219),
+                                    P(148.7533264160156, -20.23583221435547),
+                                    P(148.7563781738281, -20.23110961914063),
+                                    P(148.7608032226563, -20.22888565063477),
+                                    P(148.7680358886719, -20.22833251953125),
+                                    P(148.7730407714844, -20.22972106933594),
+                                    P(148.7774658203125, -20.23249816894531),
+                                    P(148.7810974121094, -20.23666381835938),
+                                    P(148.8033142089844, -20.27666854858398),
+                                    P(148.8355102539063, -20.37777709960938),
+                                    P(148.8333129882813, -20.383056640625),
+                                    P(148.8346862792969, -20.38861083984375),
+                                    P(148.8405151367188, -20.40388870239258),
+                                    P(148.8577270507813, -20.43611145019531),
+                                    P(148.8607788085938, -20.44027709960938),
+                                    P(148.8716125488281, -20.45055389404297),
+                                    P(148.8765563964844, -20.45236587524414),
+                                    P(148.8908081054688, -20.45360946655273),
+                                    P(148.897216796875, -20.45277786254883),
+                                    P(148.9038696289063, -20.45360946655273),
+                                    P(148.907470703125, -20.45638656616211),
+                                    P(148.9355163574219, -20.53277969360352),
+                                    P(148.9333190917969, -20.53666687011719),
+                                    P(148.9091491699219, -20.53444671630859),
+                                    P(148.8785705566406, -20.52138900756836),
+                                    P(148.8558044433594, -20.508056640625),
+                                    P(148.8305358886719, -20.47499847412109),
+                                    P(148.7902526855469, -20.45694351196289),
+                                    P(148.7410583496094, -20.475830078125),
+                                    P(148.6672058105469, -20.56166839599609),
+                                    P(148.691650390625, -20.62444305419922),
+                                    P(148.72607421875, -20.71166610717774),
+                                    P(148.7283020019531, -20.71722030639648),
+                                    P(148.7310791015625, -20.72055435180664),
+                                    P(148.8497009277344, -20.83611297607422),
+                                    P(148.9213562011719, -20.883056640625),
+                                    P(149.0283203125, -20.91860961914063),
+                                    P(149.1605224609375, -21.01527786254884),
+                                    P(149.2146911621094, -21.08000183105469),
+                                    P(149.2049560546875, -21.15444564819336),
+                                    P(149.2399597167969, -21.27861404418945),
+                                    P(149.2894287109375, -21.31861114501953),
+                                    P(149.29443359375, -21.3397216796875),
+                                    P(149.3285827636719, -21.43777847290039),
+                                    P(149.3855285644532, -21.53139114379883),
+                                    P(149.4430236816406, -21.58250045776368),
+                                    P(149.441650390625, -21.62944412231445),
+                                    P(149.4305419921875, -21.76555633544922),
+                                    P(149.4294128417969, -21.77166748046875),
+                                    P(149.4299621582031, -21.77777862548828),
+                                    P(149.469970703125, -21.9122200012207),
+                                    P(149.5208129882813, -22.07722473144531),
+                                    P(149.5899658203125, -22.23332977294922),
+                                    P(149.6533203125, -22.31805801391602),
+                                    P(149.6955261230469, -22.34805679321289),
+                                    P(149.69775390625, -22.35305404663086),
+                                    P(149.7027587890625, -22.37416839599609),
+                                    P(149.7035827636719, -22.38666534423828),
+                                    P(149.7033081054688, -22.4386100769043),
+                                    P(149.7013549804688, -22.45083236694336),
+                                    P(149.6966247558594, -22.46027755737305),
+                                    P(149.6683044433594, -22.48249816894531),
+                                    P(149.6622009277344, -22.49055480957031),
+                                    P(149.6611022949219, -22.49666595458984),
+                                    P(149.66552734375, -22.49944305419922),
+                                    P(149.6722106933594, -22.49888610839844),
+                                    P(149.6771850585938, -22.49721908569336),
+                                    P(149.7105102539063, -22.47972106933595),
+                                    P(149.7149658203125, -22.47722244262695),
+                                    P(149.7363586425781, -22.46333312988281),
+                                    P(149.7849731445313, -22.42694473266602),
+                                    P(149.7888793945313, -22.42361068725586),
+                                    P(149.7919311523438, -22.4194450378418),
+                                    P(149.7997131347656, -22.3849983215332),
+                                    P(149.8035888671875, -22.38166809082031),
+                                    P(149.8083190917969, -22.37916564941406),
+                                    P(149.814697265625, -22.38000106811523),
+                                    P(149.8191223144531, -22.38277816772461),
+                                    P(149.8263549804688, -22.38999938964844),
+                                    P(149.9621887207031, -22.53694534301758),
+                                    P(149.9649658203125, -22.54166793823242),
+                                    P(149.9718933105469, -22.55500030517578),
+                                    P(149.9771728515625, -22.57083511352539),
+                                    P(149.9766235351563, -22.58305740356446),
+                                    P(149.9771728515625, -22.58916854858398),
+                                    P(150.0274658203125, -22.63805389404297),
+                                    P(150.0433044433594, -22.65083312988282),
+                                    P(150.0427551269531, -22.64444351196289),
+                                    P(150.0413513183594, -22.63916778564454),
+                                    P(150.01220703125, -22.54583358764648),
+                                    P(149.9863586425781, -22.47555541992188),
+                                    P(149.9533081054688, -22.41083145141602),
+                                    P(149.9213562011719, -22.35333251953125),
+                                    P(149.9202575683594, -22.3477783203125),
+                                    P(149.9199829101563, -22.30889129638672),
+                                    P(149.9227600097656, -22.29777908325195),
+                                    P(149.9599609375, -22.20833206176758),
+                                    P(149.9694213867188, -22.1894416809082),
+                                    P(149.9816284179688, -22.17416763305664),
+                                    P(149.9969177246094, -22.16166687011719),
+                                    P(150.002197265625, -22.15888977050781),
+                                    P(150.0341491699219, -22.14972305297852),
+                                    P(150.0533142089844, -22.14833450317383),
+                                    P(150.0771789550781, -22.1613883972168),
+                                    P(150.080810546875, -22.16416549682617),
+                                    P(150.1552429199219, -22.27222442626953),
+                                    P(150.1902465820313, -22.33250045776368),
+                                    P(150.1907958984375, -22.3386116027832),
+                                    P(150.1891479492188, -22.34416580200196),
+                                    P(150.1783142089844, -22.35472106933594),
+                                    P(150.1830444335938, -22.37055587768555),
+                                    P(150.1885681152344, -22.37888717651367),
+                                    P(150.1985778808594, -22.39027786254884),
+                                    P(150.2021789550781, -22.3930549621582),
+                                    P(150.2268981933594, -22.40527725219727),
+                                    P(150.2371826171875, -22.40972137451172),
+                                    P(150.2430114746094, -22.41110992431641),
+                                    P(150.3218994140625, -22.4375),
+                                    P(150.3897094726563, -22.47138595581055),
+                                    P(150.3991394042969, -22.47638702392578),
+                                    P(150.4119262695313, -22.49166488647461),
+                                    P(150.4147033691406, -22.49610900878906),
+                                    P(150.4246826171875, -22.50722503662109),
+                                    P(150.4799499511719, -22.53861236572266),
+                                    P(150.5577392578125, -22.57694625854493),
+                                    P(150.593017578125, -22.58611297607422),
+                                    P(150.5374755859375, -22.46500015258789),
+                                    P(150.5355224609375, -22.46027755737305),
+                                    P(150.5341491699219, -22.45471954345704),
+                                    P(150.5308227539063, -22.39583206176758),
+                                    P(150.5319213867188, -22.38972091674805),
+                                    P(150.5374755859375, -22.37416839599609),
+                                    P(150.5527648925781, -22.33638763427734),
+                                    P(150.5610961914063, -22.3297233581543),
+                                    P(150.5669250488281, -22.32916641235352),
+                                    P(150.6271667480469, -22.3397216796875),
+                                    P(150.6330261230469, -22.34111022949219),
+                                    P(150.63720703125, -22.34389114379883),
+                                    P(150.6408081054688, -22.34749984741211),
+                                    P(150.7055358886719, -22.44138717651367),
+                                    P(150.689697265625, -22.50111389160156),
+                                    P(150.6841430664063, -22.5),
+                                    P(150.6771850585938, -22.49860763549805),
+                                    P(150.6748352050781, -22.5),
+                                    P(150.6724853515625, -22.50139236450196),
+                                    P(150.66943359375, -22.50527954101563),
+                                    P(150.6677551269531, -22.51083374023438),
+                                    P(150.6710815429688, -22.52194595336914),
+                                    P(150.68359375, -22.55361175537109),
+                                    P(150.7421875, -22.62888717651367),
+                                    P(150.8191223144531, -22.73194122314454),
+                                    P(150.8044128417969, -22.78139114379883),
+                                    P(150.7910766601563, -22.8569450378418),
+                                    P(150.7713623046875, -22.97610855102539),
+                                    P(150.7546997070313, -23.11444473266602),
+                                    P(150.7536010742188, -23.12666702270509),
+                                    P(150.7563781738281, -23.13777923583984),
+                                    P(150.7583312988281, -23.14249801635742),
+                                    P(150.8121948242188, -23.23805236816406),
+                                    P(150.8049621582031, -23.30777740478516),
+                                    P(150.7974853515625, -23.33555603027346),
+                                    P(150.7972106933594, -23.36861038208008),
+                                    P(150.7977600097656, -23.37472152709961),
+                                    P(150.8033142089844, -23.38972091674805),
+                                    P(150.8671875, -23.50500106811523),
+                                    P(150.9338684082031, -23.55083465576172),
+                                    P(150.9483032226563, -23.5444450378418),
+                                    P(150.955810546875, -23.54472351074219),
+                                    P(151.0130310058594, -23.55194473266602),
+                                    P(151.0241394042969, -23.55583572387695),
+                                    P(151.0277709960938, -23.55916595458984),
+                                    P(151.0414428710938, -23.5826358795166),
+                                    P(151.0521392822266, -23.61722373962403),
+                                    P(151.1155090332031, -23.65888977050782),
+                                    P(151.1249694824219, -23.67138671875),
+                                    P(151.13916015625, -23.69916534423828),
+                                    P(151.1455383300781, -23.71361160278321),
+                                    P(151.1533203125, -23.75278091430664),
+                                    P(151.1535949707031, -23.77138900756836),
+                                    P(151.1549682617188, -23.77694702148438),
+                                    P(151.1599731445313, -23.78583526611328),
+                                    P(151.1636047363281, -23.78944396972656),
+                                    P(151.1724853515625, -23.7955551147461),
+                                    P(151.2294006347656, -23.82638931274414),
+                                    P(151.2485656738281, -23.82944488525391),
+                                    P(151.268310546875, -23.82722473144531),
+                                    P(151.2749938964844, -23.82805633544922),
+                                    P(151.3182983398438, -23.85833358764648),
+                                    P(151.3969421386719, -23.94888687133789),
+                                    P(151.4241333007813, -23.97861099243164),
+                                    P(151.4549560546875, -23.99860763549805),
+                                    P(151.4596862792969, -23.99583053588868),
+                                    P(151.4649658203125, -23.99388885498047),
+                                    P(151.4716186523438, -23.99333190917971),
+                                    P(151.4791259765625, -23.99361038208008),
+                                    P(151.4919128417969, -23.99583053588868),
+                                    P(151.5000305175781, -24),
+                                    P(151.5458068847656, -24.02888870239259),
+                                    P(151.548583984375, -24.03305816650391),
+                                    P(151.5472106933594, -24.03861236572266),
+                                    P(151.5447082519531, -24.0433349609375),
+                                    P(151.5402526855469, -24.04583358764648),
+                                    P(151.5333251953125, -24.0533332824707),
+                                    P(151.5294189453125, -24.06361389160157),
+                                    P(151.5305480957031, -24.07583236694336),
+                                    P(151.5346984863281, -24.08555603027344),
+                                    P(151.53857421875, -24.08916854858398),
+                                    P(151.5480346679688, -24.09472274780274),
+                                    P(151.55859375, -24.0988883972168),
+                                    P(151.5652465820313, -24.09833526611329),
+                                    P(151.5691223144532, -24.09500122070313),
+                                    P(151.6141357421875, -24.0527801513672),
+                                    P(151.6144104003907, -24.01028060913086),
+                                    P(151.6138610839844, -24.00416946411134),
+                                    P(151.6144104003907, -24),
+                                    P(151.6146850585938, -23.99805450439454),
+                                    P(151.6177368164063, -23.99388885498047),
+                                    P(151.6369323730469, -23.97666549682618),
+                                    P(151.6427612304688, -23.97805404663086),
+                                    P(151.6838684082031, -23.98888778686523),
+                                    P(151.7880249023438, -24.0988883972168),
+                                    P(151.8807983398438, -24.18111038208008),
+                                    P(151.9060974121094, -24.19444274902344),
+                                    P(151.9296875, -24.21416473388672),
+                                    P(151.9371948242188, -24.22166442871096),
+                                    P(151.9444274902344, -24.23555374145509),
+                                    P(151.9802551269531, -24.33139038085938),
+                                    P(151.982177734375, -24.34305572509766),
+                                    P(151.9877319335938, -24.3650016784668),
+                                    P(151.9991149902344, -24.4022216796875),
+                                    P(152.0036010742188, -24.4124984741211),
+                                    P(152.0099792480469, -24.42638778686524),
+                                    P(152.0246887207031, -24.45388793945313),
+                                    P(152.0524597167969, -24.50361251831055),
+                                    P(152.1280212402344, -24.60472106933594),
+                                    P(152.1355285644531, -24.61166763305664),
+                                    P(152.1994018554688, -24.66444396972657),
+                                    P(152.2077331542969, -24.66999816894532),
+                                    P(152.2771911621094, -24.70999908447266),
+                                    P(152.3116455078125, -24.72694396972657),
+                                    P(152.3394165039063, -24.73611068725586),
+                                    P(152.3513488769531, -24.73916625976563),
+                                    P(152.3844299316406, -24.74277496337891),
+                                    P(152.3958129882813, -24.74638748168946),
+                                    P(152.4183044433594, -24.76028060913086),
+                                    P(152.4421997070313, -24.78111267089844),
+                                    P(152.4488525390625, -24.78805541992188),
+                                    P(152.468017578125, -24.81222152709961),
+                                    P(152.4849548339844, -24.83722305297852),
+                                    P(152.490234375, -24.84694671630859),
+                                    P(152.4966125488281, -24.86805725097657),
+                                    P(152.4988403320313, -24.88666534423828),
+                                    P(152.4977416992188, -24.90583419799805),
+                                    P(152.4960632324219, -24.91749954223633),
+                                    P(152.4935607910156, -24.93583297729493),
+                                    P(152.4960632324219, -24.96749877929688),
+                                    P(152.4991149902344, -24.97777557373047),
+                                    P(152.5077514648438, -24.99777603149414),
+                                    P(152.5260925292969, -25.03555679321289),
+                                    P(152.5610961914063, -25.08750152587891),
+                                    P(152.6658020019531, -25.24277496337891),
+                                    P(152.6771850585938, -25.24749755859375),
+                                    P(152.7224731445313, -25.26111221313477),
+                                    P(152.8055419921875, -25.28222274780274),
+                                    P(152.8124694824219, -25.28305816650391),
+                                    P(152.8541259765625, -25.28222274780274),
+                                    P(152.9002685546875, -25.2852783203125),
+                                    P(152.9063720703125, -25.28666687011721),
+                                    P(152.9107971191407, -25.28944396972656),
+                                    P(152.9138793945313, -25.29416656494141),
+                                    P(152.9466247558594, -25.43638610839845),
+                                    P(152.9366455078125, -25.52333450317384),
+                                    P(152.9319152832031, -25.5261116027832),
+                                    P(152.8944396972656, -25.5605583190918),
+                                    P(152.8922119140625, -25.56416702270508),
+                                    P(152.8985900878906, -25.67916488647461),
+                                    P(152.9172058105469, -25.73166656494141),
+                                    P(152.9238586425781, -25.73916625976563),
+                                    P(152.9449768066406, -25.76194763183594),
+                                    P(152.9494018554688, -25.76472473144531),
+                                    P(152.9563598632813, -25.76527786254883),
+                                    P(152.9632873535156, -25.76472473144531),
+                                    P(152.969970703125, -25.76555633544922),
+                                    P(152.97607421875, -25.76694488525391),
+                                    P(152.9813537597656, -25.76916885375977),
+                                    P(152.986083984375, -25.77166748046875),
+                                    P(152.9896850585938, -25.7752799987793),
+                                    P(153.0219116210938, -25.83444595336914),
+                                    P(153.0241394042969, -25.83916854858399),
+                                    P(153.0374755859375, -25.88750076293946),
+                                    P(153.0382995605469, -25.89361190795898),
+                                    P(153.064697265625, -25.90055465698243),
+                                    P(153.0997009277344, -25.90972137451172),
+                                    P(153.1819152832031, -25.94944381713867),
+                                    P(153.1855163574219, -25.97333145141602),
+                                    P(153.1374816894531, -26.06777954101563),
+                                    P(153.1005249023438, -26.17916488647461),
+                                    P(153.0905151367188, -26.21833038330079),
+                                    P(153.0730285644531, -26.29888916015625),
+                                    P(153.0710754394531, -26.31805801391602),
+                                    P(153.0746765136719, -26.34222412109375),
+                                    P(153.0777587890625, -26.35305404663086),
+                                    P(153.0816345214844, -26.36361312866211),
+                                    P(153.0874633789063, -26.37250137329102),
+                                    P(153.0960693359375, -26.37861251831055),
+                                    P(153.1041259765625, -26.50638961791992),
+                                    P(153.1105041503906, -26.65583419799805),
+                                    P(153.1119079589844, -26.66694259643555),
+                                    P(153.1171875, -26.67583084106446),
+                                    P(153.1210632324219, -26.67916488647461),
+                                    P(153.1310729980469, -26.68416595458984),
+                                    P(153.1430358886719, -26.72999954223633),
+                                    P(153.1558227539063, -26.95527648925781),
+                                    P(153.1571960449219, -27.08277893066407),
+                                    P(153.10302734375, -27.0966682434082),
+                                    P(153.0882873535156, -27.10416793823242),
+                                    P(153.0760803222656, -27.11444473266602),
+                                    P(153.0649719238281, -27.12527847290039),
+                                    P(153.0558166503906, -27.13777923583985),
+                                    P(153.0399780273438, -27.16500091552734),
+                                    P(153.0352478027344, -27.17388916015625),
+                                    P(153.0338745117188, -27.179443359375),
+                                    P(153.0574645996094, -27.30083465576172),
+                                    P(153.0619201660156, -27.3113899230957),
+                                    P(153.0641479492188, -27.31527709960938),
+                                    P(153.0758056640625, -27.32583236694336),
+                                    P(153.0902404785156, -27.33333206176759),
+                                    P(153.1746826171875, -27.38888931274414),
+                                    P(153.256103515625, -27.47972106933594),
+                                    P(153.2660827636719, -27.49777603149414),
+                                    P(153.2705383300781, -27.5072250366211),
+                                    P(153.3046875, -27.60499954223634),
+                                    P(153.3121948242188, -27.64611053466797),
+                                    P(153.3174743652344, -27.66888809204102),
+                                    P(153.3199768066406, -27.67361068725586),
+                                    P(153.37744140625, -27.75278091430664),
+                                    P(153.4005432128906, -27.77277755737305),
+                                    P(153.4060974121094, -27.78166961669922),
+                                    P(153.4327392578125, -27.84833526611328),
+                                    P(153.4308166503906, -27.9113883972168),
+                                    P(153.4169311523438, -27.91611099243164),
+                                    P(153.4102478027344, -27.98194122314454),
+                                    P(153.4480285644531, -28.06999969482422),
+                                    P(153.4524536132813, -28.0797233581543),
+                                    P(153.4602355957031, -28.09277725219727),
+                                    P(153.4871826171875, -28.13750076293945),
+                                    P(153.4910583496094, -28.14083480834961),
+                                    P(153.5059509277344, -28.15011215209961),
+                                    P(153.5197143554688, -28.17055511474609),
+                                    P(153.5227661132813, -28.17444229125977),
+                                    P(153.5266418457031, -28.17805480957032),
+                                    P(153.5361022949219, -28.18360900878906),
+                                    P(153.5430297851563, -28.18416595458985),
+                                    P(153.5508117675781, -28.18360900878906),
+                                    P(153.5619201660156, -28.18083190917971),
+                                    P(153.5671997070313, -28.18360900878906),
+                                    P(153.5763549804688, -28.20277786254883),
+                                    P(153.578857421875, -28.21305465698242),
+                                    P(153.591064453125, -28.27083587646484),
+                                    P(153.5919189453125, -28.27694702148438),
+                                    P(153.5852355957031, -28.3558349609375),
+                                    P(153.5835876464844, -28.36833190917971),
+                                    P(153.578857421875, -28.39833450317384),
+                                    P(153.5749816894531, -28.41555404663086),
+                                    P(153.5694274902344, -28.4375),
+                                    P(153.5621948242188, -28.45944213867188),
+                                    P(153.5596923828125, -28.48472213745117),
+                                    P(153.5596923828125, -28.49860763549805),
+                                    P(153.562744140625, -28.53000259399414),
+                                    P(153.5694274902344, -28.57805633544922),
+                                    P(153.5718994140625, -28.5897216796875),
+                                    P(153.5758056640625, -28.60083389282227),
+                                    P(153.5810852050781, -28.61027908325195),
+                                    P(153.5874633789063, -28.61805725097656),
+                                    P(153.5952453613281, -28.62555694580078),
+                                    P(153.6069030761719, -28.6349983215332),
+                                    P(153.6202392578125, -28.65083312988282),
+                                    P(153.6255187988281, -28.65999984741211),
+                                    P(153.6255187988281, -28.66666412353516),
+                                    P(153.609130859375, -28.85111236572266),
+                                    P(153.6083068847656, -28.85722351074221),
+                                    P(153.6046752929688, -28.86777877807617),
+                                    P(153.6018981933594, -28.87250137329102),
+                                    P(153.5846862792969, -28.8922233581543),
+                                    P(153.5735778808594, -28.90250015258789),
+                                    P(153.5619201660156, -28.91277694702148),
+                                    P(153.5327453613281, -28.93527603149414),
+                                    P(153.5185852050781, -28.95027542114258),
+                                    P(153.4919128417969, -28.98249816894531),
+                                    P(153.4791259765625, -28.99833297729492),
+                                    P(153.4727478027344, -29.00638961791992),
+                                    P(153.4516296386719, -29.03666687011719),
+                                    P(153.4444274902344, -29.05083465576172),
+                                    P(153.4341430664063, -29.07555770874023),
+                                    P(153.3560791015625, -29.27194595336914),
+                                    P(153.3480224609375, -29.29249954223633),
+                                    P(153.3424682617188, -29.30833435058596),
+                                    P(153.3391418457031, -29.31944656372071),
+                                    P(153.3360900878906, -29.33722305297852),
+                                    P(153.3366394042969, -29.34333419799805),
+                                    P(153.3396911621094, -29.35499954223633),
+                                    P(153.3413391113281, -29.35972213745117),
+                                    P(153.3474731445313, -29.36805725097656),
+                                    P(153.3513488769531, -29.37166595458984),
+                                    P(153.3560791015625, -29.3741683959961),
+                                    P(153.3638610839844, -29.38111114501953),
+                                    P(153.3671875, -29.38527679443359),
+                                    P(153.3655090332031, -29.39833450317383),
+                                    P(153.3466186523438, -29.52916717529297),
+                                    P(153.2922058105469, -29.78139114379883),
+                                    P(153.2538757324219, -29.95249938964844),
+                                    P(153.2049560546875, -30.11472320556641),
+                                    P(153.1702575683594, -30.20499801635742),
+                                    P(153.1380310058594, -30.25889205932617),
+                                    P(153.0341491699219, -30.50861358642578),
+                                    P(153.0310974121094, -30.51944732666016),
+                                    P(153.0185852050781, -30.56861114501954),
+                                    P(153.0133056640625, -30.60916519165039),
+                                    P(153.0052490234375, -30.72083282470703),
+                                    P(153.0038757324219, -30.77750015258789),
+                                    P(153.0036010742188, -30.79138946533204),
+                                    P(153.0036010742188, -30.80444717407227),
+                                    P(153.004150390625, -30.82277679443359),
+                                    P(153.0055541992188, -30.83527755737305),
+                                    P(153.0180358886719, -30.87833404541016),
+                                    P(153.0197143554688, -30.88388824462891),
+                                    P(153.0244140625, -30.88666534423828),
+                                    P(153.0474853515625, -30.88888931274414),
+                                    P(153.066650390625, -30.88638687133789),
+                                    P(153.0749816894531, -30.9486083984375),
+                                    P(153.0524597167969, -31.03499984741211),
+                                    P(152.9730224609375, -31.2433319091797),
+                                    P(152.9541320800781, -31.35944366455078),
+                                    P(152.8863830566406, -31.53916931152344),
+                                    P(152.8616333007813, -31.60666656494141),
+                                    P(152.8488464355469, -31.65666580200195),
+                                    P(152.8283081054688, -31.70444488525391),
+                                    P(152.76025390625, -31.8105583190918),
+                                    P(152.6844177246094, -31.88999938964844),
+                                    P(152.6647033691406, -31.90750122070313),
+                                    P(152.6499938964844, -31.92250061035156),
+                                    P(152.6246643066406, -31.94888687133789),
+                                    P(152.5935668945313, -31.98416519165039),
+                                    P(152.5574645996094, -32.02916717529297),
+                                    P(152.5158081054688, -32.11888885498047),
+                                    P(152.5116577148438, -32.12916564941406),
+                                    P(152.5099792480469, -32.13472747802734),
+                                    P(152.5099792480469, -32.14138793945313),
+                                    P(152.5413513183594, -32.26361846923828),
+                                    P(152.5296936035156, -32.40361022949219),
+                                    P(152.3969421386719, -32.50083923339844),
+                                    P(152.3771667480469, -32.51139068603516),
+                                    P(152.3558044433594, -32.52833557128906),
+                                    P(152.3277587890625, -32.55278015136719),
+                                    P(152.2808227539063, -32.60139465332031),
+                                    P(152.2274475097656, -32.63138580322266),
+                                    P(152.12744140625, -32.68222045898439),
+                                    P(152.1194152832031, -32.72527313232423),
+                                    P(152.1447143554688, -32.77055358886719),
+                                    P(151.9966125488281, -32.81305694580078),
+                                    P(151.9555358886719, -32.82611083984375),
+                                    P(151.9499816894531, -32.82805633544922),
+                                    P(151.8457946777344, -32.86888885498047),
+                                    P(151.8294067382813, -32.87555694580078),
+                                    P(151.8194274902344, -32.88166809082031),
+                                    P(151.8119201660156, -32.88833618164063),
+                                    P(151.80859375, -32.89250183105469),
+                                    P(151.6719055175781, -33.06583404541016),
+                                    P(151.6660766601563, -33.07417297363281),
+                                    P(151.6305236816406, -33.16444396972656),
+                                    P(151.5938415527344, -33.23472595214844),
+                                    P(151.5741271972656, -33.26721954345703),
+                                    P(151.5533142089844, -33.29306030273438),
+                                    P(151.5558166503906, -33.28277587890625),
+                                    P(151.5527648925781, -33.27777862548828),
+                                    P(151.5477600097656, -33.27583312988281),
+                                    P(151.532470703125, -33.27610778808594),
+                                    P(151.5249938964844, -33.27749633789063),
+                                    P(151.5019226074219, -33.2852783203125),
+                                    P(151.4563598632813, -33.31444549560547),
+                                    P(151.4527587890625, -33.31916809082031),
+                                    P(151.4405212402344, -33.35111236572266),
+                                    P(151.4435729980469, -33.36138916015625),
+                                    P(151.44580078125, -33.36611175537109),
+                                    P(151.4491271972656, -33.37027740478516),
+                                    P(151.453857421875, -33.37332916259767),
+                                    P(151.4669189453125, -33.37610626220703),
+                                    P(151.4743957519531, -33.37555694580078),
+                                    P(151.4771270751953, -33.39744567871094),
+                                    P(151.4812927246094, -33.39294815063477),
+                                    P(151.4842987060547, -33.39094924926758),
+                                    P(151.4886474609375, -33.3906135559082),
+                                    P(151.4911499023438, -33.39228057861328),
+                                    P(151.490478515625, -33.39594268798828),
+                                    P(151.4563598632813, -33.49833679199219),
+                                    P(151.4530334472656, -33.50305938720703),
+                                    P(151.3402404785156, -33.62860870361328),
+                                    P(151.2969360351563, -33.89749908447266),
+                                    P(151.2727661132813, -33.96944427490234),
+                                    P(151.2455444335938, -33.99089050292969),
+                                    P(151.2433624267578, -33.99322509765625),
+                                    P(151.2408752441407, -33.99489212036133),
+                                    P(151.2368621826172, -33.99572372436523),
+                                    P(151.2335357666016, -33.99389266967773),
+                                    P(151.2296905517578, -33.98938751220704),
+                                    P(151.1783142089844, -33.98750305175781),
+                                    P(151.1046752929688, -34.00222778320313),
+                                    P(151.0997009277344, -34.00556182861328),
+                                    P(151.0963439941406, -34.00889587402344),
+                                    P(151.0960693359375, -34.01583862304688),
+                                    P(151.1002502441406, -34.01944732666017),
+                                    P(151.13916015625, -34.03500366210938),
+                                    P(151.1458129882813, -34.03666687011719),
+                                    P(151.1499938964844, -34.03333282470704),
+                                    P(151.1544189453125, -34.02305603027344),
+                                    P(151.159423828125, -34.01972198486328),
+                                    P(151.1660766601563, -34.0191650390625),
+                                    P(151.1865081787109, -34.04861068725587),
+                                    P(151.1910095214844, -34.04911041259766),
+                                    P(151.1968536376953, -34.05244445800781),
+                                    P(151.1986846923828, -34.05527496337891),
+                                    P(151.1991882324219, -34.05861282348633),
+                                    P(151.1980133056641, -34.06194686889648),
+                                    P(151.1960144042969, -34.06428146362305),
+                                    P(151.1182861328125, -34.16305541992188),
+                                    P(151.1099548339844, -34.16972351074219),
+                                    P(151.093017578125, -34.17610931396484),
+                                    P(151.0771789550781, -34.18388366699219),
+                                    P(151.0638732910156, -34.19249725341797),
+                                    P(151.0377502441406, -34.21111297607422),
+                                    P(151.0241394042969, -34.22110748291016),
+                                    P(151.0166625976563, -34.22777557373047),
+                                    P(150.9763488769531, -34.27749633789063),
+                                    P(150.9599609375, -34.29833984375),
+                                    P(150.9341430664063, -34.33167266845704),
+                                    P(150.8405151367188, -34.55833435058594),
+                                    P(150.875244140625, -34.58416748046875),
+                                    P(150.88134765625, -34.59916687011719),
+                                    P(150.8735656738281, -34.66110992431641),
+                                    P(150.8377380371094, -34.77555847167969),
+                                    P(150.8341369628906, -34.78639221191406),
+                                    P(150.8296813964844, -34.78972625732422),
+                                    P(150.8238525390625, -34.79222869873047),
+                                    P(150.8038635253906, -34.79528045654297),
+                                    P(150.7980346679688, -34.79722595214845),
+                                    P(150.7872009277344, -34.80166625976563),
+                                    P(150.7777709960938, -34.80777740478516),
+                                    P(150.7699890136719, -34.8155517578125),
+                                    P(150.7638854980469, -34.82361602783203),
+                                    P(150.756103515625, -34.83777618408203),
+                                    P(150.7441101074219, -34.86972045898438),
+                                    P(150.7496948242188, -34.88527679443359),
+                                    P(150.7819213867188, -34.96166992187501),
+                                    P(150.841064453125, -35.01194763183594),
+                                    P(150.8477478027344, -35.01361846923828),
+                                    P(150.8524475097656, -35.01694488525391),
+                                    P(150.8558044433594, -35.02111053466797),
+                                    P(150.8546752929688, -35.0272216796875),
+                                    P(150.8405151367188, -35.08277893066406),
+                                    P(150.8377380371094, -35.08750152587891),
+                                    P(150.8344116210938, -35.09166717529297),
+                                    P(150.8163757324219, -35.10417175292969),
+                                    P(150.8113708496094, -35.10750579833984),
+                                    P(150.8055419921875, -35.10944366455078),
+                                    P(150.7763671875, -35.08611297607422),
+                                    P(150.7746887207031, -35.08083343505859),
+                                    P(150.7766418457031, -35.07527923583984),
+                                    P(150.7799682617188, -35.07138824462892),
+                                    P(150.784423828125, -35.06806182861328),
+                                    P(150.7897033691406, -35.05860900878906),
+                                    P(150.7916564941406, -35.05332946777344),
+                                    P(150.7819213867188, -35.01694488525391),
+                                    P(150.7785949707031, -35.01277923583984),
+                                    P(150.7738647460938, -35.01000213623047),
+                                    P(150.7672119140625, -35.00833892822266),
+                                    P(150.7597045898438, -35.00750732421875),
+                                    P(150.752197265625, -35.008056640625),
+                                    P(150.7413330078125, -35.01194763183594),
+                                    P(150.6966247558594, -35.02944183349609),
+                                    P(150.691650390625, -35.03194427490234),
+                                    P(150.6871948242188, -35.0352783203125),
+                                    P(150.6838684082031, -35.03916931152344),
+                                    P(150.6819152832032, -35.04472351074219),
+                                    P(150.6791381835938, -35.05610656738281),
+                                    P(150.6774597167969, -35.07583618164063),
+                                    P(150.7033081054688, -35.12694549560547),
+                                    P(150.6474914550781, -35.17861175537109),
+                                    P(150.6171875, -35.18833160400391),
+                                    P(150.5716247558594, -35.20417022705078),
+                                    P(150.5563659667969, -35.21194458007813),
+                                    P(150.5513610839844, -35.21527862548828),
+                                    P(150.5469360351563, -35.21860504150391),
+                                    P(150.5402526855469, -35.22666168212891),
+                                    P(150.4863586425781, -35.30777740478516),
+                                    P(150.4852294921875, -35.31388854980469),
+                                    P(150.4799499511719, -35.35055541992188),
+                                    P(150.4805297851563, -35.3558349609375),
+                                    P(150.4066467285156, -35.52777862548828),
+                                    P(150.3558044433594, -35.59500122070313),
+                                    P(150.2752685546875, -35.73583221435547),
+                                    P(150.1624755859375, -35.9405517578125),
+                                    P(150.1374816894531, -36.11167144775392),
+                                    P(150.141357421875, -36.24361419677734),
+                                    P(150.1444396972656, -36.25527954101563),
+                                    P(150.1455383300781, -36.26666259765625),
+                                    P(150.1410827636719, -36.3175048828125),
+                                    P(150.1399841308594, -36.32361602783203),
+                                    P(150.1347045898438, -36.33167266845703),
+                                    P(150.1266174316406, -36.3397216796875),
+                                    P(150.1041259765625, -36.35527801513672),
+                                    P(150.0927429199219, -36.36583709716797),
+                                    P(150.0794067382813, -36.38388824462891),
+                                    P(150.0749816894532, -36.39389038085938),
+                                    P(150.0657958984375, -36.42778015136719),
+                                    P(150.0513610839844, -36.49861145019531),
+                                    P(150.0519104003906, -36.50472259521484),
+                                    P(150.0233154296875, -36.6280517578125),
+                                    P(149.9824523925781, -36.75333404541017),
+                                    P(149.9768981933594, -36.76860809326172),
+                                    P(149.9663696289063, -36.79472351074219),
+                                    P(149.9385681152344, -36.85722351074219),
+                                    P(149.9024658203125, -36.92333221435547),
+                                    P(149.9066467285156, -37.06916809082031),
+                                    P(149.9385681152344, -37.11611175537109),
+                                    P(149.9455261230469, -37.11472320556641),
+                                    P(149.9513549804688, -37.11777496337891),
+                                    P(150.004150390625, -37.15694427490234),
+                                    P(150.0088806152344, -37.16666412353516),
+                                    P(150.0197143554688, -37.23138427734376),
+                                    P(150.0191345214844, -37.26445007324219),
+                                    P(149.9941101074219, -37.25695037841797),
+                                    P(149.9855041503906, -37.25666809082031),
+                                    P(149.9566345214844, -37.27361297607423),
+                                    P(149.9480285644531, -37.28028106689453),
+                                    P(149.9444274902344, -37.28417205810547),
+                                    P(149.9424743652344, -37.28944396972656),
+                                    P(149.9485778808594, -37.38916778564453),
+                                    P(149.9502563476563, -37.40750122070313),
+                                    P(149.953857421875, -37.42444610595703),
+                                    P(149.9585876464844, -37.43416595458984),
+                                    P(149.9749755859375, -37.46833038330078),
+                                    P(149.97802734375, -37.47916412353516),
+                                    P(149.9796752929688, -37.49777984619141),
+                                    P(149.9794006347656, -37.50444793701172),
+                                    P(149.9777526855469, -37.51267242431641),
+                                    P(149.9738464355469, -37.52055358886719),
+                                    P(149.9694213867188, -37.52388763427735),
+                                    P(149.9024658203125, -37.55110931396484),
+                                    P(149.8963623046875, -37.55305480957031),
+                                    P(149.8235778808594, -37.55833435058594),
+                                    P(149.7935791015625, -37.56027984619141),
+                                    P(149.7774658203125, -37.56055450439453),
+                                    P(149.7466125488281, -37.59888458251953),
+                                    P(149.6802673339844, -37.6905517578125),
+                                    P(149.6766357421875, -37.69444274902344),
+                                    P(149.6672058105469, -37.70027923583984),
+                                    P(149.5786437988281, -37.73557662963867),
+                                    P(149.5697021484375, -37.73611450195313),
+                                    P(149.5558166503907, -37.73833465576172),
+                                    P(149.5052490234375, -37.75861358642578),
+                                    P(149.4571838378906, -37.78333282470703),
+                                    P(149.3094177246094, -37.79528045654297),
+                                    P(149.2546997070313, -37.79361724853516),
+                                    P(149.0802612304688, -37.79277801513672),
+                                    P(148.8335876464844, -37.79695129394531),
+                                    P(148.81884765625, -37.79861450195313),
+                                    P(148.784423828125, -37.80332946777344),
+                                    P(148.7652587890625, -37.80805206298828),
+                                    P(148.7530517578125, -37.81194305419923),
+                                    P(148.6585998535156, -37.81666564941406),
+                                    P(148.4938354492188, -37.81166839599609),
+                                    P(148.3091430664063, -37.82167053222656),
+                                    P(148.2813720703125, -37.82611083984375),
+                                    P(148.2069091796875, -37.8397216796875),
+                                    P(147.9735717773438, -37.89972686767578),
+                                    P(147.9544067382813, -37.90499877929688),
+                                    P(147.9369201660156, -37.91110992431641),
+                                    P(147.8463439941406, -37.94527435302734),
+                                    P(147.7644348144531, -37.97999572753906),
+                                    P(147.7538757324219, -37.98500061035156),
+                                    P(147.734130859375, -37.99639129638672),
+                                    P(147.6546936035156, -38.04250335693359),
+                                    P(147.5877380371094, -38.08306121826172),
+                                    P(147.5410766601563, -38.11333465576172),
+                                    P(147.4296875, -38.19471740722656),
+                                    P(147.3724670410156, -38.23805236816406),
+                                    P(147.2130126953125, -38.36305999755859),
+                                    P(147.1930236816406, -38.38111114501953),
+                                    P(147.1855163574219, -38.38805389404297),
+                                    P(147.1819152832031, -38.39194488525391),
+                                    P(147.1144104003906, -38.45471954345703),
+                                    P(146.9941101074219, -38.56416320800782),
+                                    P(146.982177734375, -38.57500457763672),
+                                    P(146.9694213867188, -38.58527374267578),
+                                    P(146.8735656738281, -38.65166473388672),
+                                    P(146.8424682617188, -38.66444396972656),
+                                    P(146.8402404785156, -38.65972137451172),
+                                    P(146.8344116210938, -38.65805053710938),
+                                    P(146.8258056640625, -38.65833282470703),
+                                    P(146.6569213867188, -38.67277526855469),
+                                    P(146.6427612304688, -38.67472076416016),
+                                    P(146.5016479492188, -38.70055389404297),
+                                    P(146.4310913085938, -38.71721649169922),
+                                    P(146.3638610839844, -38.70444488525392),
+                                    P(146.3558044433594, -38.69721984863281),
+                                    P(146.3499755859375, -38.69499969482422),
+                                    P(146.3413391113281, -38.69471740722656),
+                                    P(146.2611083984375, -38.70222473144531),
+                                    P(146.2399597167969, -38.70527648925781),
+                                    P(146.2338562011719, -38.70694732666016),
+                                    P(146.2230224609375, -38.71250152587891),
+                                    P(146.2155151367188, -38.71944427490234),
+                                    P(146.1852416992188, -38.75111389160156),
+                                    P(146.1830444335938, -38.75639343261719),
+                                    P(146.1852416992188, -38.76111602783203),
+                                    P(146.2794189453125, -38.91305541992188),
+                                    P(146.282470703125, -38.91638946533203),
+                                    P(146.28857421875, -38.91889190673828),
+                                    P(146.2972106933594, -38.91916656494141),
+                                    P(146.3033142089844, -38.91750335693359),
+                                    P(146.3088684082031, -38.91500091552734),
+                                    P(146.4077453613281, -38.85778045654297),
+                                    P(146.4116516113281, -38.85472106933594),
+                                    P(146.4144287109375, -38.84999847412109),
+                                    P(146.4191284179688, -38.82527923583984),
+                                    P(146.4266357421875, -38.79611206054689),
+                                    P(146.4302673339844, -38.79222869873047),
+                                    P(146.4374694824219, -38.79111480712891),
+                                    P(146.4605102539063, -38.79416656494141),
+                                    P(146.4655151367188, -38.79666900634766),
+                                    P(146.4685668945313, -38.80139160156251),
+                                    P(146.4707946777344, -38.80610656738281),
+                                    P(146.4721984863281, -38.81166839599609),
+                                    P(146.4844055175781, -39.07333374023438),
+                                    P(146.4830322265625, -39.07917022705078),
+                                    P(146.4274597167969, -39.133056640625),
+                                    P(146.4227600097656, -39.13639068603516),
+                                    P(146.407470703125, -39.14444732666016),
+                                    P(146.3941345214844, -39.14722442626953),
+                                    P(146.3855285644531, -39.14666748046875),
+                                    P(146.3493957519531, -39.13138580322266),
+                                    P(146.3444213867188, -39.12860870361328),
+                                    P(146.3258056640625, -39.11000061035156),
+                                    P(146.3197021484375, -39.10166931152344),
+                                    P(146.3152465820313, -39.09194183349609),
+                                    P(146.3174743652344, -39.08666229248047),
+                                    P(146.2685852050781, -38.98194122314453),
+                                    P(146.2516479492188, -38.95555877685547),
+                                    P(146.2424621582031, -38.94222259521484),
+                                    P(146.2266235351563, -38.92166900634766),
+                                    P(146.2091369628907, -38.90193939208984),
+                                    P(146.1930236816406, -38.88694763183594),
+                                    P(146.1658020019531, -38.86277770996094),
+                                    P(146.1469421386719, -38.84888458251953),
+                                    P(146.1377563476563, -38.84305572509766),
+                                    P(146.1268920898438, -38.83777618408204),
+                                    P(146.1144104003907, -38.83332824707032),
+                                    P(146.0891418457031, -38.82527923583984),
+                                    P(146.0697021484375, -38.82028198242188),
+                                    P(146.060791015625, -38.81972503662109),
+                                    P(146.0452575683594, -38.82028198242188),
+                                    P(146.0313720703125, -38.82222747802734),
+                                    P(146.0205383300781, -38.82695007324219),
+                                    P(146.0166625976563, -38.83083343505859),
+                                    P(146.0136108398438, -38.83555603027344),
+                                    P(146.0049743652344, -38.85610961914063),
+                                    P(146.0030517578125, -38.86138916015625),
+                                    P(146.0013732910156, -38.86805725097656),
+                                    P(145.9044189453125, -38.85694885253906),
+                                    P(145.8235778808594, -38.72860717773438),
+                                    P(145.8344116210938, -38.70471954345703),
+                                    P(145.843017578125, -38.70527648925781),
+                                    P(145.8477478027344, -38.70194244384766),
+                                    P(145.8471984863281, -38.69527435302734),
+                                    P(145.8222045898438, -38.65610504150391),
+                                    P(145.8180236816406, -38.65249633789063),
+                                    P(145.8121948242188, -38.65027618408203),
+                                    P(145.7919311523438, -38.64500427246094),
+                                    P(145.7774658203125, -38.64222717285156),
+                                    P(145.7536010742188, -38.63972473144531),
+                                    P(145.7310791015625, -38.64055633544922),
+                                    P(145.7246704101563, -38.64222717285156),
+                                    P(145.6869201660156, -38.65916442871094),
+                                    P(145.6769104003906, -38.66471862792969),
+                                    P(145.6685791015625, -38.67166900634766),
+                                    P(145.659423828125, -38.67778015136719),
+                                    P(145.6530456542969, -38.67972564697267),
+                                    P(145.6113586425781, -38.68416595458984),
+                                    P(145.6035766601563, -38.68305969238281),
+                                    P(145.5744018554688, -38.67055511474609),
+                                    P(145.5694274902344, -38.66777801513672),
+                                    P(145.5605163574219, -38.66110992431641),
+                                    P(145.4160766601563, -38.54583740234375),
+                                    P(145.4163818359375, -38.52361297607422),
+                                    P(145.4321899414063, -38.45222473144532),
+                                    P(145.4877319335938, -38.43028259277344),
+                                    P(145.5033264160156, -38.42972564697266),
+                                    P(145.51025390625, -38.42861175537109),
+                                    P(145.5210876464844, -38.42388916015625),
+                                    P(145.5249938964844, -38.41999816894531),
+                                    P(145.5513610839844, -38.38555908203125),
+                                    P(145.5571899414063, -38.37638854980469),
+                                    P(145.5569152832031, -38.37027740478516),
+                                    P(145.5555419921875, -38.36500549316406),
+                                    P(145.4874572753906, -38.25028228759766),
+                                    P(145.4835815429688, -38.24610900878906),
+                                    P(145.4472045898438, -38.22777557373047),
+                                    P(145.4413452148438, -38.22610473632813),
+                                    P(145.2630310058594, -38.23500061035156),
+                                    P(145.256103515625, -38.23611450195313),
+                                    P(145.2513732910156, -38.23972320556641),
+                                    P(145.2130126953125, -38.34916687011719),
+                                    P(145.036376953125, -38.49527740478516),
+                                    P(145.0244140625, -38.49949645996094),
+                                    P(144.941650390625, -38.51083374023438),
+                                    P(144.9038696289063, -38.50722503662109),
+                                    P(144.8988647460938, -38.50444793701172),
+                                    P(144.7611083984375, -38.37777709960938),
+                                    P(144.7821960449219, -38.37305450439453),
+                                    P(144.798583984375, -38.38082885742188),
+                                    P(144.8138732910157, -38.383056640625),
+                                    P(144.8388671875, -38.38388824462891),
+                                    P(144.8738403320313, -38.37916564941406),
+                                    P(144.8869323730469, -38.37638854980469),
+                                    P(144.9107971191406, -38.36972045898438),
+                                    P(144.9410705566406, -38.36083221435547),
+                                    P(144.9796752929688, -38.34471893310547),
+                                    P(144.9844055175781, -38.34166717529297),
+                                    P(144.9880065917969, -38.33777618408203),
+                                    P(145.1146850585938, -38.17444610595703),
+                                    P(145.1235656738281, -38.16082763671875),
+                                    P(145.1288452148438, -38.15166473388672),
+                                    P(145.1324462890625, -38.14028167724609),
+                                    P(145.1318969726563, -38.1280517578125),
+                                    P(145.1146850585938, -38.07028198242188),
+                                    P(145.1021728515625, -38.04722595214844),
+                                    P(145.0963439941406, -38.03889465332031),
+                                    P(144.9774475097656, -37.89389038085938),
+                                    P(144.9735717773438, -37.88999938964844),
+                                    P(144.9541320800781, -37.8780517578125),
+                                    P(144.9424743652344, -37.87332916259766),
+                                    P(144.9291381835938, -37.86916351318359),
+                                    P(144.921630859375, -37.86805725097656),
+                                    P(144.9130249023438, -37.86750030517578),
+                                    P(144.9069213867188, -37.86944580078125),
+                                    P(144.8338623046875, -37.89611053466797),
+                                    P(144.8285827636719, -37.89861297607422),
+                                    P(144.8238525390625, -37.90222167968751),
+                                    P(144.8124694824219, -37.91305541992188),
+                                    P(144.7469177246094, -37.96277618408203),
+                                    P(144.69775390625, -37.99916839599609),
+                                    P(144.6846923828125, -38.00861358642578),
+                                    P(144.6611022949219, -38.02333068847656),
+                                    P(144.5269165039063, -38.10111236572266),
+                                    P(144.397216796875, -38.10861206054688),
+                                    P(144.3908081054688, -38.11028289794923),
+                                    P(144.3802490234375, -38.11500549316406),
+                                    P(144.3755187988281, -38.11833190917969),
+                                    P(144.3716125488281, -38.12194061279297),
+                                    P(144.3655090332031, -38.13111114501953),
+                                    P(144.3627319335938, -38.14305877685547),
+                                    P(144.3630065917969, -38.14861297607422),
+                                    P(144.3671875, -38.15833282470703),
+                                    P(144.3818969726563, -38.16722106933594),
+                                    P(144.3885803222656, -38.16916656494141),
+                                    P(144.4038696289063, -38.17138671875001),
+                                    P(144.5052490234375, -38.18167114257813),
+                                    P(144.5208129882813, -38.18138885498047),
+                                    P(144.5408020019531, -38.17778015136719),
+                                    P(144.5533142089844, -38.17444610595703),
+                                    P(144.5827331542969, -38.16416168212891),
+                                    P(144.5988464355469, -38.15694427490234),
+                                    P(144.6080017089844, -38.15139007568359),
+                                    P(144.6119079589844, -38.14749908447266),
+                                    P(144.6249694824219, -38.13750457763672),
+                                    P(144.6302490234375, -38.13527679443359),
+                                    P(144.6427612304688, -38.13194274902344),
+                                    P(144.6505432128906, -38.13111114501953),
+                                    P(144.6724853515625, -38.13444519042969),
+                                    P(144.6860961914063, -38.13777923583984),
+                                    P(144.7024536132813, -38.14555358886719),
+                                    P(144.7102355957031, -38.15277862548828),
+                                    P(144.7163696289063, -38.16138458251953),
+                                    P(144.7218933105469, -38.17583465576172),
+                                    P(144.7232971191406, -38.1875),
+                                    P(144.7105102539063, -38.22249603271484),
+                                    P(144.6588745117188, -38.28500366210938),
+                                    P(144.6338806152344, -38.29972839355469),
+                                    P(144.6121826171875, -38.30194091796875),
+                                    P(144.6046752929688, -38.30083465576173),
+                                    P(144.593017578125, -38.29611206054688),
+                                    P(144.5882873535156, -38.29222869873047),
+                                    P(144.5766296386719, -38.28694915771484),
+                                    P(144.5641479492188, -38.28333282470703),
+                                    P(144.5555419921875, -38.28277587890625),
+                                    P(144.5416564941406, -38.28472900390625),
+                                    P(144.4005432128907, -38.30722045898439),
+                                    P(144.3897094726563, -38.31194305419922),
+                                    P(144.36328125, -38.32444763183594),
+                                    P(144.0638732910156, -38.48305511474609),
+                                    P(144.0594177246094, -38.48611450195313),
+                                    P(144.0036010742188, -38.53055572509766),
+                                    P(143.9996948242188, -38.53444671630859),
+                                    P(143.9966125488281, -38.53889465332031),
+                                    P(143.9952392578125, -38.54472351074219),
+                                    P(143.9147033691406, -38.63444519042969),
+                                    P(143.9111022949219, -38.63805389404297),
+                                    P(143.8985900878906, -38.64888763427734),
+                                    P(143.844970703125, -38.69527435302734),
+                                    P(143.8396911621094, -38.69777679443359),
+                                    P(143.7694396972656, -38.71416473388672),
+                                    P(143.7413330078125, -38.71749877929688),
+                                    P(143.7224731445313, -38.72305297851563),
+                                    P(143.7069091796875, -38.73082733154297),
+                                    P(143.69384765625, -38.74083709716797),
+                                    P(143.6899719238281, -38.74472045898438),
+                                    P(143.6838684082031, -38.75389099121094),
+                                    P(143.6769104003906, -38.77639007568359),
+                                    P(143.6746826171875, -38.78221893310547),
+                                    P(143.6724853515625, -38.78666687011719),
+                                    P(143.6685791015625, -38.79055786132813),
+                                    P(143.5546875, -38.85527801513672),
+                                    P(143.5438537597656, -38.86000061035156),
+                                    P(143.5366516113281, -38.86083221435547),
+                                    P(143.51220703125, -38.85444641113281),
+                                    P(143.5063781738281, -38.85222625732422),
+                                    P(143.5016479492188, -38.84916687011719),
+                                    P(143.484130859375, -38.83499908447266),
+                                    P(143.4535827636719, -38.80527496337891),
+                                    P(143.4474792480469, -38.79666900634766),
+                                    P(143.439697265625, -38.78944396972656),
+                                    P(143.4346923828125, -38.78639221191406),
+                                    P(143.3874816894531, -38.76833343505859),
+                                    P(143.3485717773438, -38.75889587402344),
+                                    P(143.3407897949219, -38.75778198242188),
+                                    P(143.3330383300781, -38.75722503662109),
+                                    P(143.1799621582031, -38.71611022949219),
+                                    P(143.1380310058594, -38.68138885498047),
+                                    P(143.1282958984375, -38.67555999755859),
+                                    P(143.0963439941406, -38.65888977050781),
+                                    P(143.0510864257813, -38.63833618164063),
+                                    P(143.0452575683594, -38.63583374023438),
+                                    P(143.0252685546875, -38.63027954101564),
+                                    P(143.0099792480469, -38.62777709960938),
+                                    P(142.9863586425781, -38.62833404541016),
+                                    P(142.9724731445313, -38.62999725341797),
+                                    P(142.9638671875, -38.62944030761719),
+                                    P(142.8599548339844, -38.59833526611328),
+                                    P(142.8060913085938, -38.57749938964844),
+                                    P(142.800537109375, -38.57444763183595),
+                                    P(142.7588806152344, -38.54555511474609),
+                                    P(142.7416381835938, -38.53166961669922),
+                                    P(142.6121826171875, -38.45527648925781),
+                                    P(142.5352478027344, -38.41277313232422),
+                                    P(142.3888854980469, -38.36472320556641),
+                                    P(142.38134765625, -38.36361694335938),
+                                    P(142.3735656738282, -38.36361694335938),
+                                    P(142.282470703125, -38.37361145019532),
+                                    P(142.2760925292969, -38.37527465820313),
+                                    P(142.2705383300782, -38.37749481201172),
+                                    P(142.2660827636719, -38.38055419921875),
+                                    P(142.2627563476563, -38.38500213623047),
+                                    P(142.2630310058594, -38.39111328125001),
+                                    P(142.2669372558594, -38.39472198486328),
+                                    P(142.2636108398438, -38.39944458007813),
+                                    P(142.2574768066406, -38.40083312988281),
+                                    P(142.2432861328125, -38.40249633789063),
+                                    P(142.2277526855469, -38.40277862548828),
+                                    P(142.171630859375, -38.40193939208984),
+                                    P(142.1630249023438, -38.40110778808594),
+                                    P(142.1563720703125, -38.39999389648438),
+                                    P(142.1505432128906, -38.39749908447267),
+                                    P(142.0882873535156, -38.36972045898438),
+                                    P(142.0624694824219, -38.35556030273438),
+                                    P(141.9924621582031, -38.31361389160156),
+                                    P(141.9830322265625, -38.30750274658203),
+                                    P(141.9674682617188, -38.2933349609375),
+                                    P(141.9619140625, -38.29084014892578),
+                                    P(141.8213500976563, -38.26750183105469),
+                                    P(141.7583312988282, -38.26666259765625),
+                                    P(141.7435607910156, -38.26750183105469),
+                                    P(141.7216186523438, -38.27055358886719),
+                                    P(141.6849670410156, -38.28055572509766),
+                                    P(141.6738586425781, -38.2852783203125),
+                                    P(141.6307983398438, -38.31166839599609),
+                                    P(141.621337890625, -38.3175048828125),
+                                    P(141.6149597167969, -38.32639312744141),
+                                    P(141.6135864257813, -38.33194732666016),
+                                    P(141.6144104003906, -38.34416198730469),
+                                    P(141.6163635253906, -38.34888458251954),
+                                    P(141.6221923828125, -38.35750579833984),
+                                    P(141.6260681152344, -38.36138916015625),
+                                    P(141.6358032226563, -38.36750030517578),
+                                    P(141.6510925292969, -38.38221740722656),
+                                    P(141.6560974121094, -38.39083862304688),
+                                    P(141.6560974121094, -38.39694976806641),
+                                    P(141.6535949707031, -38.4022216796875),
+                                    P(141.6497192382813, -38.40583038330078),
+                                    P(141.6427612304688, -38.40750122070313),
+                                    P(141.5713500976563, -38.41722106933595),
+                                    P(141.4541320800781, -38.37249755859375),
+                                    P(141.4021911621094, -38.32888793945313),
+                                    P(141.3944396972656, -38.3155517578125),
+                                    P(141.3869323730469, -38.30750274658203),
+                                    P(141.3674621582031, -38.28944396972656),
+                                    P(141.2894287109375, -38.22833251953125),
+                                    P(141.2396850585938, -38.19305419921875),
+                                    P(141.1930236816406, -38.16055297851563),
+                                    P(141.1463623046875, -38.13500213623048),
+                                    P(141.1255187988281, -38.12388610839844),
+                                    P(141.1035766601563, -38.1138916015625),
+                                    P(141.0258178710938, -38.08277893066406),
+                                    P(141.0019226074219, -38.07417297363281),
+                                    P(140.9680480957031, -38.06421661376953),
+                                    P(140.94775390625, -38.05999755859375),
+                                    P(140.9308166503906, -38.05860900878906),
+                                    P(140.8580017089844, -38.05500030517579),
+                                    P(140.8432922363281, -38.054443359375),
+                                    P(140.8285827636719, -38.05583190917969),
+                                    P(140.8160705566406, -38.05889129638672),
+                                    P(140.7752685546875, -38.07389068603516),
+                                    P(140.768310546875, -38.07389068603516),
+                                    P(140.6985778808594, -38.07194519042969),
+                                    P(140.6749877929688, -38.06861114501953),
+                                    P(140.6683044433594, -38.06666564941406),
+                                    P(140.5860900878906, -38.03221893310547),
+                                    P(140.5299682617188, -38.00028228759767),
+                                    P(140.3577270507813, -37.866943359375),
+                                    P(140.3541259765625, -37.85639190673828),
+                                    P(140.3380126953125, -37.82361602783204),
+                                    P(140.3324584960938, -37.81500244140625),
+                                    P(140.23828125, -37.67194366455078),
+                                    P(140.1282958984375, -37.53611755371094),
+                                    P(140.1144104003906, -37.52527618408203),
+                                    P(140.0805358886719, -37.50444793701172),
+                                    P(140.0588684082031, -37.49361419677734),
+                                    P(140.0408020019531, -37.48722076416016),
+                                    P(140.0333251953125, -37.48583221435547),
+                                    P(140.0263671875, -37.48666381835939),
+                                    P(140.0224914550782, -37.49055480957031),
+                                    P(140.0197143554688, -37.49639129638672),
+                                    P(139.9938354492188, -37.49250030517578),
+                                    P(139.8413391113281, -37.33139038085938),
+                                    P(139.8144226074219, -37.29972839355469),
+                                    P(139.7977600097656, -37.27361297607423),
+                                    P(139.7513732910156, -37.19972229003906),
+                                    P(139.7530517578125, -37.16916656494141),
+                                    P(139.7616577148438, -37.16944885253906),
+                                    P(139.7680358886719, -37.16777801513672),
+                                    P(139.7724914550781, -37.16555023193359),
+                                    P(139.7766418457032, -37.16194152832031),
+                                    P(139.7805480957031, -37.15805053710938),
+                                    P(139.7835998535156, -37.15361022949219),
+                                    P(139.7846984863281, -37.14694976806641),
+                                    P(139.7846984863281, -37.14083862304688),
+                                    P(139.7802734375, -37.10778045654298),
+                                    P(139.736083984375, -37.01889038085938),
+                                    P(139.7313537597657, -37.00972747802734),
+                                    P(139.7519226074219, -36.92166900634766),
+                                    P(139.7861022949219, -36.90361022949219),
+                                    P(139.8002624511719, -36.89472198486328),
+                                    P(139.8169250488281, -36.88055419921875),
+                                    P(139.828857421875, -36.86860656738281),
+                                    P(139.8416442871094, -36.85139465332031),
+                                    P(139.8497009277344, -36.83666229248047),
+                                    P(139.8546752929688, -36.82611083984375),
+                                    P(139.8607788085938, -36.8013916015625),
+                                    P(139.8627319335938, -36.78805541992188),
+                                    P(139.8646850585938, -36.76833343505859),
+                                    P(139.8655090332031, -36.75611114501953),
+                                    P(139.8649597167969, -36.73221588134766),
+                                    P(139.8616333007813, -36.66638946533203),
+                                    P(139.8599548339844, -36.65527343750001),
+                                    P(139.8544006347656, -36.63500213623047),
+                                    P(139.826904296875, -36.57778167724609),
+                                    P(139.826904296875, -36.56610870361328),
+                                    P(139.8260803222657, -36.56055450439453),
+                                    P(139.8205261230469, -36.54583740234375),
+                                    P(139.673583984375, -36.25472259521484),
+                                    P(139.6480407714844, -36.20972442626953),
+                                    P(139.5086975097656, -36.05611038208008),
+                                    P(139.4943542480469, -36.0357780456543),
+                                    P(139.4295196533203, -35.9659423828125),
+                                    P(139.4163513183594, -35.95244598388672),
+                                    P(139.4070129394531, -35.94361114501953),
+                                    P(139.3718414306641, -35.91061019897461),
+                                    P(139.3245239257813, -35.86777877807617),
+                                    P(139.2893524169922, -35.83844757080078),
+                                    P(139.1893310546875, -35.7506332397461),
+                                    P(139.0773468017578, -35.68263626098633),
+                                    P(139.078857421875, -35.67947006225586),
+                                    P(139.08251953125, -35.67863464355469),
+                                    P(139.0916900634766, -35.67830276489258),
+                                    P(139.1006774902344, -35.67880249023438),
+                                    P(139.1056823730469, -35.67929840087891),
+                                    P(139.1094970703125, -35.68046569824219),
+                                    P(139.1226654052734, -35.68679809570313),
+                                    P(139.1286926269531, -35.69063568115234),
+                                    P(139.1341857910156, -35.69446563720703),
+                                    P(139.3432922363281, -35.8397216796875),
+                                    P(139.4038696289063, -35.88722229003906),
+                                    P(139.4743957519531, -35.95777893066406),
+                                    P(139.47802734375, -35.961669921875),
+                                    P(139.580810546875, -36.08444213867188),
+                                    P(139.5871887207031, -36.09249877929688),
+                                    P(139.6121826171875, -36.12583160400391),
+                                    P(139.6430358886719, -36.18527221679688),
+                                    P(139.6533203125, -36.20944213867188),
+                                    P(139.6641540527344, -36.22694396972656),
+                                    P(139.6677551269531, -36.23082733154297),
+                                    P(139.6702575683594, -36.22555541992188),
+                                    P(139.6677551269531, -36.20889282226563),
+                                    P(139.6632995605469, -36.18721771240234),
+                                    P(139.6497192382813, -36.14694976806641),
+                                    P(139.6041259765625, -36.04138946533203),
+                                    P(139.5885620117188, -36.02083587646484),
+                                    P(139.5718994140625, -36.00139617919922),
+                                    P(139.5610961914063, -35.98944091796875),
+                                    P(139.5388793945313, -35.96749877929688),
+                                    P(139.4885559082031, -35.91944885253906),
+                                    P(139.4480285644531, -35.88417053222656),
+                                    P(139.2958068847656, -35.77277374267578),
+                                    P(139.1862487792969, -35.67655563354492),
+                                    P(139.1542358398438, -35.65705490112305),
+                                    P(139.1274108886719, -35.64038848876953),
+                                    P(139.1190795898438, -35.63505554199219),
+                                    P(139.1025848388672, -35.62355422973633),
+                                    P(139.0999145507813, -35.62155532836914),
+                                    P(139.0967407226563, -35.61588668823242),
+                                    P(139.0967407226563, -35.61255645751953),
+                                    P(139.0977478027344, -35.60905838012695),
+                                    P(139.1025848388672, -35.60422515869142),
+                                    P(139.0913391113281, -35.52916717529297),
+                                    P(139.1038513183594, -35.51889038085938),
+                                    P(139.123291015625, -35.50778198242188),
+                                    P(139.1285705566406, -35.50556182861328),
+                                    P(139.1347045898438, -35.50417327880859),
+                                    P(139.1483154296875, -35.50278472900391),
+                                    P(139.1560974121094, -35.50278472900391),
+                                    P(139.1632995605469, -35.5050048828125),
+                                    P(139.2246704101563, -35.54389190673828),
+                                    P(139.2294006347656, -35.54722595214844),
+                                    P(139.2338562011719, -35.55110931396484),
+                                    P(139.2366333007813, -35.55471801757813),
+                                    P(139.2391357421875, -35.56527709960938),
+                                    P(139.2399597167969, -35.58916473388672),
+                                    P(139.2388610839844, -35.59610748291016),
+                                    P(139.2363586425781, -35.60139465332031),
+                                    P(139.2249755859375, -35.67277526855469),
+                                    P(139.2246704101563, -35.67888641357422),
+                                    P(139.2255249023438, -35.68444061279297),
+                                    P(139.2291259765625, -35.69444274902344),
+                                    P(139.2327270507813, -35.69805145263672),
+                                    P(139.2391357421875, -35.69999694824219),
+                                    P(139.2474670410156, -35.70083618164063),
+                                    P(139.3216247558594, -35.70194244384766),
+                                    P(139.3277587890625, -35.70055389404297),
+                                    P(139.3324584960938, -35.69777679443359),
+                                    P(139.3371887207032, -35.69416046142578),
+                                    P(139.3419189453125, -35.68416595458984),
+                                    P(139.3613586425781, -35.60388946533203),
+                                    P(139.373291015625, -35.47777557373047),
+                                    P(139.3735656738281, -35.47166442871094),
+                                    P(139.3727416992188, -35.46611022949219),
+                                    P(139.3580017089844, -35.37638854980469),
+                                    P(139.355224609375, -35.37249755859375),
+                                    P(139.246337890625, -35.3255615234375),
+                                    P(139.22802734375, -35.31889343261719),
+                                    P(139.2124633789063, -35.31666564941407),
+                                    P(139.1844177246094, -35.31806182861328),
+                                    P(139.1791381835938, -35.31999969482422),
+                                    P(139.1774597167969, -35.32611083984375),
+                                    P(139.19384765625, -35.33472442626953),
+                                    P(139.1947021484375, -35.34027862548828),
+                                    P(139.1397094726563, -35.37638854980469),
+                                    P(139.1296691894531, -35.38166809082031),
+                                    P(139.0860900878906, -35.39167022705078),
+                                    P(139.0730285644531, -35.39389038085938),
+                                    P(139.0663757324219, -35.39389038085938),
+                                    P(139.0508117675781, -35.39167022705078),
+                                    P(139.0274658203125, -35.38999938964844),
+                                    P(139.0138854980469, -35.39138793945313),
+                                    P(138.9955139160156, -35.39555358886719),
+                                    P(138.984130859375, -35.39944458007813),
+                                    P(138.9738464355469, -35.40499877929688),
+                                    P(138.966064453125, -35.41194152832031),
+                                    P(138.9566345214844, -35.42527770996094),
+                                    P(138.9541320800781, -35.43055725097656),
+                                    P(138.9505310058594, -35.44249725341797),
+                                    P(138.9485778808594, -35.45527648925781),
+                                    P(138.9502563476563, -35.46639251708984),
+                                    P(138.955810546875, -35.47527313232422),
+                                    P(138.9602355957031, -35.47833251953125),
+                                    P(138.9716186523438, -35.48237609863281),
+                                    P(138.9794006347656, -35.48444366455078),
+                                    P(138.9952392578125, -35.48555755615234),
+                                    P(139.0099792480469, -35.48833465576173),
+                                    P(139.0238647460938, -35.49222564697266),
+                                    P(139.0335998535156, -35.49888610839844),
+                                    P(139.0382995605469, -35.50750732421875),
+                                    P(139.0372009277344, -35.51416778564453),
+                                    P(139.0341491699219, -35.51889038085938),
+                                    P(138.9966125488282, -35.55416870117188),
+                                    P(138.9930114746094, -35.55722045898438),
+                                    P(138.9874572753906, -35.55916595458984),
+                                    P(138.9655151367188, -35.56055450439453),
+                                    P(138.9005432128906, -35.55471801757813),
+                                    P(138.8355102539063, -35.54528045654297),
+                                    P(138.8152465820313, -35.53972625732422),
+                                    P(138.800537109375, -35.53694915771484),
+                                    P(138.7771911621094, -35.53583526611328),
+                                    P(138.7308044433594, -35.53583526611328),
+                                    P(138.7121887207031, -35.54167175292969),
+                                    P(138.6555480957031, -35.56055450439453),
+                                    P(138.6455383300781, -35.5655517578125),
+                                    P(138.6327209472657, -35.57583618164063),
+                                    P(138.6210632324219, -35.58694458007813),
+                                    P(138.615234375, -35.59666442871094),
+                                    P(138.6055297851563, -35.61028289794922),
+                                    P(138.5977478027344, -35.61833190917969),
+                                    P(138.5844116210938, -35.62722015380859),
+                                    P(138.5508117675781, -35.64778137207031),
+                                    P(138.5355224609375, -35.65444183349609),
+                                    P(138.5294189453125, -35.65583038330078),
+                                    P(138.2021789550781, -35.67138671875),
+                                    P(138.1785888671875, -35.67028045654297),
+                                    P(138.1713562011719, -35.66889190673828),
+                                    P(138.1583251953125, -35.66471862792969),
+                                    P(138.1419372558594, -35.65694427490234),
+                                    P(138.1374816894531, -35.65305328369141),
+                                    P(138.0974731445313, -35.62416839599609),
+                                    P(138.093017578125, -35.62083435058594),
+                                    P(138.091064453125, -35.61583709716797),
+                                    P(138.1249694824219, -35.55777740478516),
+                                    P(138.1321716308594, -35.54944610595704),
+                                    P(138.1480407714844, -35.53556060791017),
+                                    P(138.1580200195313, -35.53028106689453),
+                                    P(138.1941223144531, -35.52111053466797),
+                                    P(138.2163696289063, -35.51333618164063),
+                                    P(138.2583312988281, -35.49444580078125),
+                                    P(138.2785949707031, -35.48332977294922),
+                                    P(138.29248046875, -35.47471618652344),
+                                    P(138.4271850585938, -35.35722351074219),
+                                    P(138.4391479492188, -35.34610748291016),
+                                    P(138.4421997070313, -35.34166717529297),
+                                    P(138.4466247558594, -35.33028411865234),
+                                    P(138.4707946777344, -35.22943878173828),
+                                    P(138.4694213867188, -35.21194458007813),
+                                    P(138.4674682617188, -35.20694732666016),
+                                    P(138.4621887207031, -35.19833374023438),
+                                    P(138.4577331542969, -35.18888854980469),
+                                    P(138.4544067382813, -35.17888641357422),
+                                    P(138.4535827636719, -35.17333221435547),
+                                    P(138.4546813964844, -35.16666412353516),
+                                    P(138.4641418457031, -35.11611175537109),
+                                    P(138.4657897949219, -35.11000061035156),
+                                    P(138.4757995605469, -35.08916473388672),
+                                    P(138.4894104003906, -35.07222747802735),
+                                    P(138.4935607910156, -35.06833648681641),
+                                    P(138.5069274902344, -35.0513916015625),
+                                    P(138.5113830566406, -35.04000091552734),
+                                    P(138.51416015625, -35.02805328369141),
+                                    P(138.51416015625, -35.02194213867188),
+                                    P(138.5116577148438, -35.0050048828125),
+                                    P(138.498291015625, -34.93444061279297),
+                                    P(138.4863586425781, -34.89389038085939),
+                                    P(138.4813537597656, -34.86611175537109),
+                                    P(138.4808044433594, -34.85972595214844),
+                                    P(138.4899597167969, -34.7852783203125),
+                                    P(138.4916381835938, -34.77916717529297),
+                                    P(138.5002746582031, -34.77249908447266),
+                                    P(138.5055541992188, -34.77027893066406),
+                                    P(138.51220703125, -34.76972198486328),
+                                    P(138.4960632324219, -34.7288818359375),
+                                    P(138.4352416992188, -34.64222717285156),
+                                    P(138.4199829101563, -34.62749481201172),
+                                    P(138.4030456542969, -34.61389160156251),
+                                    P(138.2955322265625, -34.50639343261719),
+                                    P(138.2846984863281, -34.49500274658203),
+                                    P(138.2785949707031, -34.48666381835938),
+                                    P(138.2713623046875, -34.47360992431641),
+                                    P(138.2655334472656, -34.45861053466797),
+                                    P(138.2424621582031, -34.383056640625),
+                                    P(138.2355041503906, -34.35694885253906),
+                                    P(138.2255249023438, -34.32695007324219),
+                                    P(138.2210693359375, -34.3175048828125),
+                                    P(138.216064453125, -34.30750274658203),
+                                    P(138.1519165039063, -34.20694732666016),
+                                    P(138.1016235351563, -34.14111328125),
+                                    P(138.0980224609375, -34.13722229003906),
+                                    P(138.0882873535156, -34.13138580322267),
+                                    P(138.0810852050781, -34.12999725341797),
+                                    P(138.0749816894531, -34.13138580322267),
+                                    P(138.0677490234375, -34.13944244384766),
+                                    P(138.064697265625, -34.14389038085938),
+                                    P(138.0069274902344, -34.24083709716797),
+                                    P(138.0046997070313, -34.25361633300781),
+                                    P(138.0055541992188, -34.25917053222656),
+                                    P(138.0105285644531, -34.27500152587891),
+                                    P(138.0130310058594, -34.27999877929688),
+                                    P(138.0158081054688, -34.28388977050781),
+                                    P(138.0210876464844, -34.28639221191406),
+                                    P(138.0285949707031, -34.28778076171875),
+                                    P(138.0338745117188, -34.29000091552734),
+                                    P(138.0357971191406, -34.29472351074219),
+                                    P(138.0335998535156, -34.30833435058595),
+                                    P(138.0316467285156, -34.31444549560547),
+                                    P(138.0205383300781, -34.34194183349609),
+                                    P(138.0174865722657, -34.34638977050781),
+                                    P(137.9899597167969, -34.37305450439453),
+                                    P(137.9727478027344, -34.38639068603516),
+                                    P(137.9449768066406, -34.40388488769531),
+                                    P(137.9363708496094, -34.41055297851563),
+                                    P(137.9285888671875, -34.41806030273439),
+                                    P(137.9202575683594, -34.43277740478516),
+                                    P(137.8905334472656, -34.51889038085938),
+                                    P(137.8877563476563, -34.53166961669922),
+                                    P(137.8841552734375, -34.59471893310547),
+                                    P(137.8861083984375, -34.59944152832031),
+                                    P(137.8894348144531, -34.60333251953125),
+                                    P(137.8866577148438, -34.65750122070313),
+                                    P(137.8755187988281, -34.71111297607422),
+                                    P(137.8369140625, -34.82444763183594),
+                                    P(137.8274536132813, -34.83721923828125),
+                                    P(137.8216247558594, -34.84749603271484),
+                                    P(137.8096923828125, -34.87361145019531),
+                                    P(137.7491149902344, -35.04972839355469),
+                                    P(137.7533264160156, -35.09138488769531),
+                                    P(137.754150390625, -35.0969467163086),
+                                    P(137.752197265625, -35.12361145019531),
+                                    P(137.7510986328125, -35.13027954101563),
+                                    P(137.7446899414063, -35.13861083984375),
+                                    P(137.6849670410156, -35.179443359375),
+                                    P(137.6805419921875, -35.18167114257813),
+                                    P(137.6744079589844, -35.18305969238281),
+                                    P(137.6577453613281, -35.18250274658203),
+                                    P(137.6438598632813, -35.17972564697266),
+                                    P(137.6327209472656, -35.17500305175781),
+                                    P(137.6238403320313, -35.16777801513672),
+                                    P(137.5957946777344, -35.14972686767578),
+                                    P(137.5733032226563, -35.13972473144531),
+                                    P(137.5605163574219, -35.13527679443359),
+                                    P(137.5321960449219, -35.12888336181641),
+                                    P(137.468017578125, -35.11472320556641),
+                                    P(137.4516296386719, -35.11305999755859),
+                                    P(137.4210815429688, -35.1199951171875),
+                                    P(137.2385559082031, -35.1755599975586),
+                                    P(137.2285766601563, -35.18083190917969),
+                                    P(137.219970703125, -35.18666076660156),
+                                    P(137.2132873535156, -35.19554901123047),
+                                    P(137.2091369628906, -35.2066650390625),
+                                    P(137.2013549804688, -35.22222137451172),
+                                    P(137.1947021484375, -35.23110961914063),
+                                    P(137.1874694824219, -35.23916625976563),
+                                    P(137.1788635253906, -35.24583435058594),
+                                    P(137.16748046875, -35.24861145019531),
+                                    P(137.1605224609375, -35.24916839599609),
+                                    P(137.13720703125, -35.24861145019531),
+                                    P(137.1141357421875, -35.24472045898438),
+                                    P(137.0841369628906, -35.23361206054688),
+                                    P(137.0694274902344, -35.23055267333984),
+                                    P(137.0538635253906, -35.22805023193359),
+                                    P(137.0330505371094, -35.22860717773438),
+                                    P(137.022216796875, -35.23277282714844),
+                                    P(137.0072021484375, -35.24055480957031),
+                                    P(136.9707946777344, -35.26611328125),
+                                    P(136.9630126953125, -35.27277374267578),
+                                    P(136.955810546875, -35.28138732910156),
+                                    P(136.94384765625, -35.29194641113282),
+                                    P(136.8960876464844, -35.30416870117189),
+                                    P(136.8885803222656, -35.30388641357422),
+                                    P(136.8596801757813, -35.29111480712892),
+                                    P(136.8305358886719, -35.25472259521484),
+                                    P(136.8324584960938, -35.24888610839844),
+                                    P(136.8518981933594, -35.20555877685547),
+                                    P(136.8657836914063, -35.20305633544922),
+                                    P(136.8724670410156, -35.20249938964844),
+                                    P(136.8833312988281, -35.19833374023438),
+                                    P(136.8922119140625, -35.19166564941406),
+                                    P(136.8960876464844, -35.18804931640625),
+                                    P(136.9366455078125, -35.14722442626953),
+                                    P(136.9577331542969, -35.10722351074219),
+                                    P(136.9605102539063, -35.10139465332031),
+                                    P(136.9616394042969, -35.09527587890625),
+                                    P(136.9613647460938, -35.07194519042969),
+                                    P(136.9591369628906, -35.06138610839844),
+                                    P(136.9566345214844, -35.05610656738281),
+                                    P(136.9494018554688, -35.04917144775391),
+                                    P(136.97412109375, -34.96333312988281),
+                                    P(136.9799499511719, -34.95444488525391),
+                                    P(137.0152587890625, -34.90416717529297),
+                                    P(137.0199890136719, -34.90110778808594),
+                                    P(137.0269165039063, -34.90055084228516),
+                                    P(137.0341491699219, -34.9022216796875),
+                                    P(137.0521850585938, -34.90916442871094),
+                                    P(137.0794067382813, -34.92250061035156),
+                                    P(137.0999755859375, -34.92833709716797),
+                                    P(137.1155090332031, -34.93083190917969),
+                                    P(137.1291198730469, -34.929443359375),
+                                    P(137.141357421875, -34.92694854736328),
+                                    P(137.1869201660156, -34.91138458251953),
+                                    P(137.19970703125, -34.90999603271484),
+                                    P(137.2719116210938, -34.90388488769531),
+                                    P(137.2794189453125, -34.90471649169922),
+                                    P(137.2855224609375, -34.90666198730469),
+                                    P(137.2891540527344, -34.91055297851563),
+                                    P(137.29248046875, -34.92055511474609),
+                                    P(137.2977600097656, -34.929443359375),
+                                    P(137.3021850585938, -34.93277740478516),
+                                    P(137.38134765625, -34.96083068847656),
+                                    P(137.3880310058594, -34.96083068847656),
+                                    P(137.4063720703125, -34.9566650390625),
+                                    P(137.4305419921875, -34.94305419921875),
+                                    P(137.437744140625, -34.93472290039063),
+                                    P(137.4435729980469, -34.92527770996095),
+                                    P(137.4505310058594, -34.90888977050781),
+                                    P(137.4541320800781, -34.89694976806641),
+                                    P(137.4985656738281, -34.65860748291016),
+                                    P(137.4810791015625, -34.47166442871094),
+                                    P(137.4932861328125, -34.28639221191406),
+                                    P(137.4871826171875, -34.24250030517578),
+                                    P(137.4721984863281, -34.19721984863281),
+                                    P(137.4671936035156, -34.18777465820313),
+                                    P(137.455810546875, -34.17083740234375),
+                                    P(137.4513549804688, -34.16194152832031),
+                                    P(137.44970703125, -34.15750122070313),
+                                    P(137.4499816894531, -34.15139007568359),
+                                    P(137.4524536132813, -34.14639282226563),
+                                    P(137.4638671875, -34.14194488525391),
+                                    P(137.4705200195313, -34.14222717285156),
+                                    P(137.4777526855469, -34.14361572265625),
+                                    P(137.5033264160156, -34.15055084228516),
+                                    P(137.5133056640625, -34.14555358886719),
+                                    P(137.5163879394531, -34.14111328125),
+                                    P(137.5427551269531, -34.0977783203125),
+                                    P(137.5449829101563, -34.09333038330078),
+                                    P(137.5555419921875, -34.06500244140625),
+                                    P(137.594970703125, -33.95583343505859),
+                                    P(137.6027526855469, -33.88722229003906),
+                                    P(137.60302734375, -33.88082885742188),
+                                    P(137.6321716308594, -33.84916687011719),
+                                    P(137.7738647460938, -33.70111083984375),
+                                    P(137.7816467285156, -33.69361114501953),
+                                    P(137.8836059570313, -33.61000061035156),
+                                    P(137.8966369628907, -33.60028076171875),
+                                    P(137.9080200195313, -33.59666442871094),
+                                    P(137.9132995605469, -33.59944152832031),
+                                    P(137.9321899414063, -33.59527587890625),
+                                    P(137.9452514648438, -33.56999969482422),
+                                    P(137.9502563476563, -33.55944061279297),
+                                    P(137.9494018554688, -33.55388641357422),
+                                    P(137.941650390625, -33.51028442382813),
+                                    P(137.9160766601563, -33.44138336181641),
+                                    P(137.8474731445313, -33.32277679443359),
+                                    P(137.8169250488281, -33.28694915771485),
+                                    P(137.8144226074219, -33.28250122070313),
+                                    P(137.8130187988281, -33.27138519287109),
+                                    P(137.8252563476563, -33.22943878173828),
+                                    P(137.8313598632813, -33.21694183349609),
+                                    P(137.8377380371094, -33.20805358886719),
+                                    P(137.8416442871094, -33.20417022705078),
+                                    P(137.8502502441406, -33.19777679443359),
+                                    P(137.9019165039063, -33.16750335693359),
+                                    P(137.9549560546875, -33.14944458007813),
+                                    P(138.0069274902344, -33.14888763427734),
+                                    P(138.0138854980469, -33.15110778808594),
+                                    P(138.0208129882813, -33.14972686767578),
+                                    P(138.0366516113281, -33.14250183105469),
+                                    P(138.04443359375, -33.13583374023438),
+                                    P(138.0474853515625, -33.13138580322266),
+                                    P(138.0477600097656, -33.12527465820313),
+                                    P(138.0394287109375, -33.07805633544922),
+                                    P(138.0188598632813, -33.03583526611328),
+                                    P(138.0163879394531, -33.03138732910156),
+                                    P(138.0074768066406, -33.02555847167969),
+                                    P(137.9930114746094, -33.02249908447266),
+                                    P(137.9857788085938, -33.02249908447266),
+                                    P(137.9696960449219, -33.02083587646484),
+                                    P(137.9624633789063, -33.0191650390625),
+                                    P(137.9535827636719, -33.01194763183595),
+                                    P(137.9502563476563, -33.00278472900391),
+                                    P(137.8963623046875, -32.78722381591797),
+                                    P(137.8438415527344, -32.68804931640625),
+                                    P(137.8299560546875, -32.63138580322266),
+                                    P(137.8160705566406, -32.57389068603516),
+                                    P(137.8180236816406, -32.56806182861328),
+                                    P(137.8155212402344, -32.56277465820313),
+                                    P(137.7733154296875, -32.52361297607422),
+                                    P(137.7627563476563, -32.52861022949219),
+                                    P(137.7597045898438, -32.53250122070313),
+                                    P(137.756103515625, -32.54528045654297),
+                                    P(137.7552490234375, -32.55110931396484),
+                                    P(137.7544250488281, -32.57611083984375),
+                                    P(137.7519226074219, -32.68416595458984),
+                                    P(137.7527770996094, -32.69583129882813),
+                                    P(137.7552490234375, -32.70027923583984),
+                                    P(137.7605285644531, -32.70278167724609),
+                                    P(137.7758178710938, -32.70527648925781),
+                                    P(137.7810974121094, -32.70805358886719),
+                                    P(137.7880249023438, -32.71583557128906),
+                                    P(137.7958068847656, -32.7288818359375),
+                                    P(137.7983093261719, -32.73332977294922),
+                                    P(137.8041381835938, -32.74861145019531),
+                                    P(137.8083190917969, -32.84138488769531),
+                                    P(137.8069152832031, -32.85444641113281),
+                                    P(137.7808227539063, -32.98722076416016),
+                                    P(137.7783203125, -32.99250030517578),
+                                    P(137.7738647460938, -32.99555206298828),
+                                    P(137.7663879394531, -32.99583435058594),
+                                    P(137.7227478027344, -32.99527740478516),
+                                    P(137.5955200195313, -33.02972412109375),
+                                    P(137.48828125, -33.12777709960938),
+                                    P(137.4430236816406, -33.19444274902344),
+                                    P(137.3888854980469, -33.29250335693359),
+                                    P(137.3816223144532, -33.30805206298828),
+                                    P(137.3785705566406, -33.32083892822266),
+                                    P(137.375244140625, -33.34111022949219),
+                                    P(137.3749694824219, -33.34722137451172),
+                                    P(137.3749694824219, -33.35361480712891),
+                                    P(137.3763427734375, -33.36472320556641),
+                                    P(137.3802490234375, -33.38027954101563),
+                                    P(137.3785705566406, -33.38639068603516),
+                                    P(137.3655090332031, -33.41999816894531),
+                                    P(137.3630065917969, -33.42583465576172),
+                                    P(137.3580017089844, -33.43582916259766),
+                                    P(137.2838745117188, -33.55471801757813),
+                                    P(137.2749938964844, -33.56889343261719),
+                                    P(137.2268981933594, -33.64333343505859),
+                                    P(137.2099609375, -33.66610717773438),
+                                    P(137.16943359375, -33.69999694824219),
+                                    P(137.1611022949219, -33.7066650390625),
+                                    P(137.1510925292969, -33.711669921875),
+                                    P(137.1330261230469, -33.71583557128906),
+                                    P(137.0349273681641, -33.72399902343751),
+                                    P(137.0309143066406, -33.72399902343751),
+                                    P(137.0272521972656, -33.72266387939453),
+                                    P(137.017578125, -33.71783065795898),
+                                    P(137.0149230957031, -33.71582794189453),
+                                    P(137.0129089355469, -33.7135009765625),
+                                    P(137.0119171142578, -33.71016693115234),
+                                    P(136.9833068847656, -33.69916534423828),
+                                    P(136.9799499511719, -33.68888854980469),
+                                    P(136.9774475097656, -33.68472290039064),
+                                    P(136.9730224609375, -33.68138885498047),
+                                    P(136.9669189453125, -33.67861175537109),
+                                    P(136.9596862792969, -33.67778015136719),
+                                    P(136.9527587890625, -33.67833709716798),
+                                    P(136.9474792480469, -33.68028259277344),
+                                    P(136.9427490234375, -33.68332672119141),
+                                    P(136.8833312988281, -33.74583435058594),
+                                    P(136.8802490234375, -33.75028228759767),
+                                    P(136.8782958984375, -33.75639343261719),
+                                    P(136.8796691894531, -33.76222229003906),
+                                    P(136.8816223144531, -33.76639556884766),
+                                    P(136.8849792480469, -33.77083587646484),
+                                    P(136.8894348144531, -33.77361297607422),
+                                    P(136.8966369628906, -33.77444458007813),
+                                    P(136.9027709960938, -33.77305603027344),
+                                    P(136.8638610839844, -33.80694580078125),
+                                    P(136.6611022949219, -33.89055633544922),
+                                    P(136.5799560546875, -33.93194580078125),
+                                    P(136.4197082519531, -34.03611755371094),
+                                    P(136.4071960449219, -34.04583740234375),
+                                    P(136.3646850585938, -34.07917022705078),
+                                    P(136.3569030761719, -34.08638763427734),
+                                    P(136.3535766601563, -34.09083557128906),
+                                    P(136.35107421875, -34.10444641113281),
+                                    P(136.3527526855469, -34.11028289794922),
+                                    P(136.3521728515625, -34.12166595458984),
+                                    P(136.3502502441406, -34.12833404541016),
+                                    P(136.3199768066406, -34.18694305419922),
+                                    P(136.3163757324219, -34.19332885742188),
+                                    P(136.3060913085938, -34.19888305664063),
+                                    P(136.2619323730469, -34.27083587646484),
+                                    P(136.2519226074219, -34.28388977050781),
+                                    P(136.2413330078125, -34.29722595214844),
+                                    P(136.2163696289063, -34.32527923583984),
+                                    P(136.2083129882813, -34.33250427246094),
+                                    P(136.203857421875, -34.33472442626953),
+                                    P(136.19775390625, -34.33611297607422),
+                                    P(136.1849670410156, -34.33777618408203),
+                                    P(136.1544189453125, -34.34444427490234),
+                                    P(136.1430358886719, -34.34860992431641),
+                                    P(136.1336059570313, -34.35444641113281),
+                                    P(136.1255187988281, -34.36167144775391),
+                                    P(136.1221923828125, -34.36611175537109),
+                                    P(136.0430297851563, -34.48249816894531),
+                                    P(136.0374755859375, -34.48472595214844),
+                                    P(135.9721984863281, -34.5130615234375),
+                                    P(135.9621887207031, -34.51805877685547),
+                                    P(135.9430236816406, -34.53028106689453),
+                                    P(135.9391479492188, -34.53333282470703),
+                                    P(135.9327392578125, -34.54194641113281),
+                                    P(135.8749694824219, -34.63833618164063),
+                                    P(135.800537109375, -34.80750274658203),
+                                    P(135.798583984375, -34.81361389160156),
+                                    P(135.8021850585938, -34.8175048828125),
+                                    P(135.8138732910156, -34.82222747802734),
+                                    P(135.8291320800781, -34.82472229003906),
+                                    P(135.8641357421875, -34.82222747802734),
+                                    P(135.8816223144531, -34.8175048828125),
+                                    P(135.8974914550781, -34.80972290039063),
+                                    P(135.9069213867188, -34.80416870117188),
+                                    P(135.953857421875, -34.76721954345703),
+                                    P(135.990234375, -34.73722076416016),
+                                    P(135.996337890625, -34.73527526855469),
+                                    P(136.0030517578125, -34.73666381835939),
+                                    P(136.0083312988282, -34.73944091796875),
+                                    P(136.0119323730469, -34.74333190917969),
+                                    P(136.0158081054688, -34.75278472900392),
+                                    P(136.0199890136719, -34.78611755371094),
+                                    P(136.0199890136719, -34.80416870117188),
+                                    P(136.0088806152344, -34.98583221435547),
+                                    P(136.0069274902344, -34.991943359375),
+                                    P(136.0013732910156, -34.99472045898438),
+                                    P(135.9644165039063, -35.00944519042969),
+                                    P(135.9610290527344, -35.01015472412109),
+                                    P(135.9541320800781, -35.01028442382814),
+                                    P(135.9460754394531, -35.00305938720703),
+                                    P(135.9341430664063, -34.98638916015626),
+                                    P(135.9310913085938, -34.975830078125),
+                                    P(135.9321899414063, -34.96971893310547),
+                                    P(135.9313659667969, -34.96416473388672),
+                                    P(135.9280395507813, -34.95944213867188),
+                                    P(135.8466186523438, -34.89028167724609),
+                                    P(135.8235778808594, -34.87444305419922),
+                                    P(135.806640625, -34.86611175537109),
+                                    P(135.7866516113281, -34.86028289794922),
+                                    P(135.7619323730469, -34.85778045654297),
+                                    P(135.748291015625, -34.85833740234376),
+                                    P(135.736083984375, -34.86083221435547),
+                                    P(135.7252502441406, -34.86583709716797),
+                                    P(135.7213439941407, -34.86860656738281),
+                                    P(135.7132873535156, -34.87583160400391),
+                                    P(135.7066345214844, -34.88555908203125),
+                                    P(135.7046813964844, -34.89083862304688),
+                                    P(135.7010803222656, -34.9102783203125),
+                                    P(135.6863708496094, -34.94916534423828),
+                                    P(135.6824645996094, -34.95278167724609),
+                                    P(135.6777648925781, -34.95555877685547),
+                                    P(135.6722106933594, -34.95777893066406),
+                                    P(135.6652526855469, -34.95805358886719),
+                                    P(135.6435852050781, -34.95278167724609),
+                                    P(135.6194152832031, -34.92083740234375),
+                                    P(135.6060791015625, -34.89305877685547),
+                                    P(135.5824584960938, -34.86583709716797),
+                                    P(135.4746704101563, -34.75111389160156),
+                                    P(135.330810546875, -34.6280517578125),
+                                    P(135.3218994140625, -34.62166595458984),
+                                    P(135.2510986328125, -34.57472229003906),
+                                    P(135.2449645996094, -34.57167053222656),
+                                    P(135.2268981933594, -34.56527709960938),
+                                    P(135.2188415527344, -34.56416320800781),
+                                    P(135.2119140625, -34.56472015380859),
+                                    P(135.205810546875, -34.56610870361328),
+                                    P(135.1535949707031, -34.58139038085938),
+                                    P(135.1488647460938, -34.58416748046875),
+                                    P(135.1463623046875, -34.58943939208984),
+                                    P(135.1397094726563, -34.59749603271484),
+                                    P(135.1307983398438, -34.60417175292969),
+                                    P(135.1171875, -34.60500335693359),
+                                    P(135.1099548339844, -34.60333251953125),
+                                    P(135.1058044433594, -34.59999847412109),
+                                    P(135.1049499511719, -34.59444427490234),
+                                    P(135.1124572753906, -34.57833862304688),
+                                    P(135.1516418457031, -34.50389099121094),
+                                    P(135.2008056640625, -34.43777465820313),
+                                    P(135.2055358886719, -34.43499755859375),
+                                    P(135.2116394042969, -34.43360900878906),
+                                    P(135.216064453125, -34.43694305419922),
+                                    P(135.2141418457031, -34.45610809326172),
+                                    P(135.2099609375, -34.46860504150391),
+                                    P(135.2088623046875, -34.47527313232422),
+                                    P(135.2088623046875, -34.48777770996094),
+                                    P(135.2096862792969, -34.49277496337891),
+                                    P(135.2121887207031, -34.49722290039063),
+                                    P(135.2155151367188, -34.50111389160156),
+                                    P(135.3444213867188, -34.61416625976563),
+                                    P(135.3861083984375, -34.64194488525391),
+                                    P(135.3922119140625, -34.6441650390625),
+                                    P(135.4005432128906, -34.64527893066406),
+                                    P(135.4071960449219, -34.64472198486328),
+                                    P(135.4932861328125, -34.6280517578125),
+                                    P(135.4993896484375, -34.62666320800781),
+                                    P(135.5049743652344, -34.62388610839844),
+                                    P(135.5069274902344, -34.61805725097656),
+                                    P(135.5044250488281, -34.61361694335938),
+                                    P(135.4907836914063, -34.60972595214844),
+                                    P(135.4835815429688, -34.60833740234375),
+                                    P(135.4447021484375, -34.60527801513672),
+                                    P(135.4374694824219, -34.60388946533203),
+                                    P(135.3977661132813, -34.58777618408203),
+                                    P(135.3919372558594, -34.57944488525391),
+                                    P(135.3830261230469, -34.55471801757813),
+                                    P(135.38134765625, -34.54972839355469),
+                                    P(135.3766174316407, -34.53472900390625),
+                                    P(135.3760681152344, -34.52916717529297),
+                                    P(135.3763427734375, -34.52305603027344),
+                                    P(135.3782958984375, -34.51694488525391),
+                                    P(135.3897094726563, -34.50527954101563),
+                                    P(135.3924865722656, -34.5),
+                                    P(135.3944396972656, -34.49416351318359),
+                                    P(135.3958129882813, -34.48194122314453),
+                                    P(135.34912109375, -34.28916931152344),
+                                    P(135.3099670410156, -34.19388580322266),
+                                    P(135.2724914550781, -34.12332916259766),
+                                    P(135.2727661132813, -34.11721801757813),
+                                    P(135.2652587890625, -34.01889038085938),
+                                    P(135.2630310058594, -34.00833892822266),
+                                    P(135.2580261230469, -33.99944305419922),
+                                    P(135.19384765625, -33.91944885253906),
+                                    P(135.0574645996094, -33.79055786132813),
+                                    P(135.0335998535156, -33.76860809326172),
+                                    P(134.9816284179688, -33.73444366455078),
+                                    P(134.937744140625, -33.70722198486328),
+                                    P(134.9238586425781, -33.69777679443359),
+                                    P(134.8419189453125, -33.63999938964844),
+                                    P(134.8394165039063, -33.63555908203125),
+                                    P(134.8457946777344, -33.60166931152344),
+                                    P(134.8505249023438, -33.58999633789063),
+                                    P(134.8607788085938, -33.570556640625),
+                                    P(134.8644104003907, -33.5655517578125),
+                                    P(134.8682861328125, -33.55361175537109),
+                                    P(134.8688354492188, -33.54111480712891),
+                                    P(134.8682861328125, -33.53556060791016),
+                                    P(134.86328125, -33.49610900878906),
+                                    P(134.8580017089844, -33.47193908691406),
+                                    P(134.8280334472656, -33.39472198486328),
+                                    P(134.80859375, -33.352783203125),
+                                    P(134.7091369628906, -33.17916870117188),
+                                    P(134.705810546875, -33.17527770996094),
+                                    P(134.6955261230469, -33.16889190673828),
+                                    P(134.6830444335938, -33.16527557373047),
+                                    P(134.5935668945313, -33.13999938964844),
+                                    P(134.41748046875, -33.15777587890625),
+                                    P(134.4119262695313, -33.15999603271484),
+                                    P(134.4085998535156, -33.16444396972656),
+                                    P(134.3966369628906, -33.17583465576172),
+                                    P(134.3877563476563, -33.18222045898438),
+                                    P(134.3382873535156, -33.20388793945313),
+                                    P(134.3321838378906, -33.20500183105469),
+                                    P(134.3260803222657, -33.20278167724609),
+                                    P(134.3216247558594, -33.19944000244141),
+                                    P(134.2691345214844, -33.15972137451172),
+                                    P(134.2669372558594, -33.149169921875),
+                                    P(134.2674865722656, -33.14222717285156),
+                                    P(134.2713623046875, -33.13111114501953),
+                                    P(134.2708129882813, -33.12471771240234),
+                                    P(134.2677612304688, -33.11528015136719),
+                                    P(134.2030334472656, -32.96444702148438),
+                                    P(134.1980285644531, -32.95610809326172),
+                                    P(134.1947021484375, -32.95222473144531),
+                                    P(134.1869201660156, -32.94499969482423),
+                                    P(134.12939453125, -32.8427734375),
+                                    P(134.0697021484375, -32.73638916015625),
+                                    P(134.0671997070313, -32.73110961914063),
+                                    P(134.0649719238281, -32.72110748291016),
+                                    P(134.0682983398438, -32.71665954589844),
+                                    P(134.0738525390625, -32.7147216796875),
+                                    P(134.0891418457031, -32.71611022949219),
+                                    P(134.1546936035156, -32.725830078125),
+                                    P(134.1983032226563, -32.74361419677734),
+                                    P(134.1935729980469, -32.75472259521484),
+                                    P(134.1921997070313, -32.76139068603516),
+                                    P(134.1919250488281, -32.76777648925781),
+                                    P(134.1941223144531, -32.790283203125),
+                                    P(134.1994018554688, -32.80471801757813),
+                                    P(134.201904296875, -32.80916595458984),
+                                    P(134.2063598632813, -32.8125),
+                                    P(134.2144165039063, -32.81305694580078),
+                                    P(134.2174682617188, -32.80916595458984),
+                                    P(134.22412109375, -32.78388977050781),
+                                    P(134.2727661132813, -32.73305511474609),
+                                    P(134.2802734375, -32.72444152832031),
+                                    P(134.2969360351563, -32.68028259277344),
+                                    P(134.2972106933594, -32.67472076416016),
+                                    P(134.2821960449219, -32.59999847412109),
+                                    P(134.2783203125, -32.59027862548828),
+                                    P(134.2724914550782, -32.58194732666016),
+                                    P(134.2230224609375, -32.52249908447266),
+                                    P(134.2055358886719, -32.50361633300781),
+                                    P(134.1841430664063, -32.48666381835938),
+                                    P(134.1430358886719, -32.45750427246094),
+                                    P(134.1207885742188, -32.45305633544922),
+                                    P(134.1074523925781, -32.45388793945313),
+                                    P(133.9555358886719, -32.49583435058594),
+                                    P(133.909423828125, -32.54138946533203),
+                                    P(133.9055480957031, -32.54500579833984),
+                                    P(133.8949890136719, -32.54888916015625),
+                                    P(133.8888854980469, -32.55027770996094),
+                                    P(133.8816223144531, -32.54999542236328),
+                                    P(133.8583068847656, -32.54722595214844),
+                                    P(133.8518981933594, -32.54500579833984),
+                                    P(133.8505249023438, -32.54055786132813),
+                                    P(133.8507995605469, -32.53444671630859),
+                                    P(133.8541259765625, -32.46361541748047),
+                                    P(133.8546752929688, -32.45722198486328),
+                                    P(133.8777465820313, -32.41055297851563),
+                                    P(133.8805236816406, -32.40555572509766),
+                                    P(133.8844299316406, -32.40193939208984),
+                                    P(133.8905334472656, -32.40083312988282),
+                                    P(133.8955383300781, -32.40361022949219),
+                                    P(133.9021911621094, -32.41138458251953),
+                                    P(133.9041442871094, -32.42194366455078),
+                                    P(133.909423828125, -32.42555999755859),
+                                    P(133.9233093261719, -32.42555999755859),
+                                    P(133.9294128417969, -32.42417144775391),
+                                    P(133.9399719238281, -32.42028045654297),
+                                    P(133.94384765625, -32.41666412353516),
+                                    P(133.9499816894531, -32.40694427490234),
+                                    P(133.951904296875, -32.40110778808594),
+                                    P(133.9521789550781, -32.39472198486328),
+                                    P(133.9491271972656, -32.39028167724609),
+                                    P(133.9019165039063, -32.32944488525391),
+                                    P(133.8735656738281, -32.29917144775391),
+                                    P(133.8263549804688, -32.25083923339844),
+                                    P(133.7566528320313, -32.21389007568359),
+                                    P(133.7255249023438, -32.20055389404297),
+                                    P(133.6949768066406, -32.18111419677734),
+                                    P(133.6658020019531, -32.15888977050781),
+                                    P(133.6616516113281, -32.1552734375),
+                                    P(133.6602478027344, -32.15027618408203),
+                                    P(133.6636047363281, -32.14527893066406),
+                                    P(133.6777648925781, -32.12860870361328),
+                                    P(133.6796875, -32.12249755859375),
+                                    P(133.6783142089844, -32.11750030517578),
+                                    P(133.6749877929688, -32.11361694335938),
+                                    P(133.6697082519531, -32.11083221435547),
+                                    P(133.6221923828125, -32.09833526611328),
+                                    P(133.6060791015625, -32.09694671630859),
+                                    P(133.6002502441406, -32.09749603271484),
+                                    P(133.594970703125, -32.09944152832031),
+                                    P(133.5902404785156, -32.10222625732422),
+                                    P(133.5802612304688, -32.11528015136719),
+                                    P(133.5774536132813, -32.12110900878906),
+                                    P(133.5766296386719, -32.15027618408203),
+                                    P(133.5744018554688, -32.15694427490234),
+                                    P(133.5718994140625, -32.16138458251953),
+                                    P(133.5685729980469, -32.16583251953125),
+                                    P(133.5605163574219, -32.17277526855469),
+                                    P(133.4921875, -32.20750427246094),
+                                    P(133.4866333007813, -32.21028137207031),
+                                    P(133.4808044433594, -32.21083068847656),
+                                    P(133.4172058105469, -32.21333312988281),
+                                    P(133.22607421875, -32.19749450683594),
+                                    P(133.1666564941406, -32.19083404541016),
+                                    P(133.1380310058594, -32.18611145019531),
+                                    P(133.1338806152344, -32.18277740478516),
+                                    P(133.0902404785156, -32.14361572265625),
+                                    P(133.0794067382813, -32.13221740722656),
+                                    P(133.0718994140625, -32.125),
+                                    P(133.0591430664063, -32.11472320556641),
+                                    P(133.0435791015625, -32.10610961914063),
+                                    P(133.0252685546875, -32.09999847412109),
+                                    P(133.0180358886719, -32.09972381591797),
+                                    P(132.9735717773438, -32.09166717529297),
+                                    P(132.8594055175782, -32.00611114501953),
+                                    P(132.8355102539063, -31.97972106933596),
+                                    P(132.8302612304688, -31.97610855102539),
+                                    P(132.7913513183594, -31.95861053466797),
+                                    P(132.7791442871094, -31.95388793945313),
+                                    P(132.7644348144531, -31.95083236694336),
+                                    P(132.5880126953125, -31.93583297729493),
+                                    P(132.580810546875, -31.93583297729493),
+                                    P(132.5491333007813, -31.93888854980471),
+                                    P(132.518310546875, -31.94472122192383),
+                                    P(132.4888610839844, -31.95249938964844),
+                                    P(132.4682922363281, -31.96055603027345),
+                                    P(132.4541320800781, -31.96888732910156),
+                                    P(132.4508056640625, -31.97277450561523),
+                                    P(132.4483032226563, -31.97777557373047),
+                                    P(132.4141540527344, -32.01167297363281),
+                                    P(132.330810546875, -32.03722381591797),
+                                    P(132.3246765136719, -32.03833770751953),
+                                    P(132.2649841308594, -32.04167175292969),
+                                    P(132.203857421875, -32.03166961669922),
+                                    P(132.1880187988281, -32.02222442626953),
+                                    P(132.1760864257813, -32.01222229003906),
+                                    P(132.16943359375, -32.00556182861328),
+                                    P(132.1546936035156, -31.98999786376954),
+                                    P(132.1374816894531, -31.97083282470703),
+                                    P(132.0269165039063, -31.88194274902345),
+                                    P(131.8157958984375, -31.74777603149414),
+                                    P(131.7691345214844, -31.72222137451172),
+                                    P(131.6666564941406, -31.67055511474609),
+                                    P(131.4924621582031, -31.59555435180664),
+                                    P(131.4691162109375, -31.58583450317384),
+                                    P(131.3649597167969, -31.5433349609375),
+                                    P(131.2769165039063, -31.51166915893555),
+                                    P(131.1810913085938, -31.48027801513672),
+                                    P(131.1672058105469, -31.47666549682617),
+                                    P(131.1521911621094, -31.47416687011719),
+                                    P(131.1449890136719, -31.4738883972168),
+                                    P(131.1249694824219, -31.47472000122071),
+                                    P(131.1191101074219, -31.475830078125),
+                                    P(131.1083068847656, -31.47972106933594),
+                                    P(131.0902404785156, -31.49138641357422),
+                                    P(131.0694274902344, -31.50833511352539),
+                                    P(131.0455322265625, -31.53028106689454),
+                                    P(131.0369262695313, -31.5363883972168),
+                                    P(131.0174865722656, -31.54666900634766),
+                                    P(131.0074768066406, -31.55111312866211),
+                                    P(130.8499755859375, -31.60361099243164),
+                                    P(130.8380126953125, -31.6058349609375),
+                                    P(130.7935791015625, -31.61027908325195),
+                                    P(130.7735900878906, -31.61194610595704),
+                                    P(130.7538757324219, -31.61222076416016),
+                                    P(130.732177734375, -31.61083221435547),
+                                    P(130.7030334472656, -31.60889053344727),
+                                    P(130.6444396972656, -31.60388946533203),
+                                    P(130.2633056640625, -31.57611083984375),
+                                    P(130.2363586425781, -31.57638931274414),
+                                    P(130.1488647460938, -31.57916641235352),
+                                    P(129.935791015625, -31.59333419799805),
+                                    P(129.9038696289063, -31.59694671630859),
+                                    P(129.8924865722656, -31.59916687011719),
+                                    P(129.88720703125, -31.60111236572266),
+                                    P(129.8849792480469, -31.60361099243164),
+                                    P(129.8780212402344, -31.6058349609375),
+                                    P(129.8382873535156, -31.61444473266602),
+                                    P(129.7010803222656, -31.62166595458984),
+                                    P(129.4755249023438, -31.63861083984375),
+                                    P(129.2319030761719, -31.65833282470704),
+                                    P(129.0602416992188, -31.68249893188477),
+                                    P(129.0294189453125, -31.6875),
+                                    P(129.0002746582031, -31.69261169433594),
+                                    P(128.9874572753906, -31.69416427612305),
+                                    P(128.969970703125, -31.69805526733398),
+                                    P(128.9524536132813, -31.70333099365234),
+                                    P(128.7930297851563, -31.76944732666016),
+                                    P(128.7733154296875, -31.77916717529297),
+                                    P(128.7041320800781, -31.81639099121094),
+                                    P(128.5544128417969, -31.88833236694336),
+                                    P(128.1827392578125, -32.03166961669922),
+                                    P(128.0208129882813, -32.08694458007813),
+                                    P(128.0038757324219, -32.09222412109375),
+                                    P(127.9494171142578, -32.10111236572266),
+                                    P(127.8283233642578, -32.11944580078125),
+                                    P(127.7374877929688, -32.13472747802734),
+                                    P(127.6288604736328, -32.17083740234375),
+                                    P(127.5385894775391, -32.20278167724609),
+                                    P(127.334716796875, -32.26694488525391),
+                                    P(127.2677612304688, -32.27833557128906),
+                                    P(127.1649932861328, -32.29389190673828),
+                                    P(127.1249694824219, -32.29849243164063),
+                                    P(127.0230407714844, -32.30361175537109),
+                                    P(126.9905395507813, -32.30500030517578),
+                                    P(126.6871871948242, -32.31583404541016),
+                                    P(126.6386032104492, -32.31416320800781),
+                                    P(126.5736083984375, -32.30916595458985),
+                                    P(126.4588775634766, -32.29972839355469),
+                                    P(126.3994293212891, -32.29222869873047),
+                                    P(126.3285980224609, -32.27222442626953),
+                                    P(126.3030395507813, -32.26222229003906),
+                                    P(126.2830505371094, -32.25639343261719),
+                                    P(126.2613830566406, -32.25139617919922),
+                                    P(126.2391510009766, -32.2469482421875),
+                                    P(126.2086029052734, -32.24083709716797),
+                                    P(126.1860961914063, -32.23805236816406),
+                                    P(126.1733093261719, -32.2388916015625),
+                                    P(126.1611022949219, -32.24083709716797),
+                                    P(126.1447067260742, -32.24610900878906),
+                                    P(126.1349868774414, -32.25111389160156),
+                                    P(126.1266479492188, -32.258056640625),
+                                    P(126.0994262695313, -32.27500152587891),
+                                    P(126.0841522216797, -32.28194427490234),
+                                    P(126.0780487060547, -32.28361511230469),
+                                    P(126.0605316162109, -32.28639221191406),
+                                    P(126.0452575683594, -32.28472900390625),
+                                    P(126.0124969482422, -32.274169921875),
+                                    P(125.9847106933594, -32.26639556884766),
+                                    P(125.9766464233398, -32.26555633544922),
+                                    P(125.9683227539063, -32.26611328125),
+                                    P(125.9594268798828, -32.26889038085938),
+                                    P(125.8088684082031, -32.34222412109375),
+                                    P(125.8041534423828, -32.34500122070313),
+                                    P(125.6177520751953, -32.4677734375),
+                                    P(125.5908203125, -32.48611450195313),
+                                    P(125.5824890136719, -32.49333190917969),
+                                    P(125.5794372558594, -32.4969482421875),
+                                    P(125.5785980224609, -32.50167083740234),
+                                    P(125.5660934448242, -32.51167297363281),
+                                    P(125.5538635253906, -32.52111053466797),
+                                    P(125.5408172607422, -32.53055572509766),
+                                    P(125.5227737426758, -32.54277801513672),
+                                    P(125.5072174072266, -32.55083465576172),
+                                    P(125.4499969482422, -32.57138824462891),
+                                    P(125.4385833740234, -32.57527923583984),
+                                    P(125.3988800048828, -32.58250427246094),
+                                    P(125.3777618408203, -32.58416748046876),
+                                    P(125.3369293212891, -32.59055328369142),
+                                    P(125.3052520751953, -32.5977783203125),
+                                    P(125.2994232177734, -32.59972381591797),
+                                    P(125.2463684082031, -32.62444305419922),
+                                    P(124.998031616211, -32.74083709716797),
+                                    P(124.9930419921875, -32.74361419677734),
+                                    P(124.9371871948242, -32.77833557128906),
+                                    P(124.9322128295898, -32.78166961669922),
+                                    P(124.9238662719727, -32.78778076171875),
+                                    P(124.9155426025391, -32.79444885253906),
+                                    P(124.8999862670898, -32.80916595458984),
+                                    P(124.8933334350586, -32.8175048828125),
+                                    P(124.8858184814453, -32.82472229003906),
+                                    P(124.8733062744141, -32.83499908447267),
+                                    P(124.7524871826172, -32.89583587646484),
+                                    P(124.7408065795898, -32.89972686767578),
+                                    P(124.7049865722656, -32.9102783203125),
+                                    P(124.6647033691406, -32.91638946533203),
+                                    P(124.580551147461, -32.92805480957031),
+                                    P(124.4974822998047, -32.93694305419922),
+                                    P(124.4533233642578, -32.94083404541016),
+                                    P(124.4027709960938, -32.94554901123047),
+                                    P(124.352767944336, -32.95750427246094),
+                                    P(124.3288726806641, -32.9647216796875),
+                                    P(124.3016510009766, -32.97499847412109),
+                                    P(124.2819366455078, -32.98555755615234),
+                                    P(124.1963729858399, -33.04416656494141),
+                                    P(124.1838684082031, -33.05416870117188),
+                                    P(124.1577606201172, -33.07972717285156),
+                                    P(124.1427612304688, -33.09444427490234),
+                                    P(124.1394271850586, -33.09833526611328),
+                                    P(124.1063690185547, -33.13944244384766),
+                                    P(124.0935974121094, -33.15694427490234),
+                                    P(124.0883178710938, -33.16722106933594),
+                                    P(124.0024871826172, -33.39361572265625),
+                                    P(123.9658203125, -33.53277587890625),
+                                    P(123.9636077880859, -33.54500579833984),
+                                    P(123.9594268798828, -33.55527496337892),
+                                    P(123.9524765014648, -33.56388854980469),
+                                    P(123.9391479492188, -33.57333374023438),
+                                    P(123.9183197021484, -33.58306121826172),
+                                    P(123.859992980957, -33.61583709716797),
+                                    P(123.7899780273438, -33.67722320556641),
+                                    P(123.7697067260742, -33.69527435302734),
+                                    P(123.7524871826172, -33.71416473388672),
+                                    P(123.7389221191406, -33.73740386962891),
+                                    P(123.7360610961914, -33.75),
+                                    P(123.734992980957, -33.75472259521484),
+                                    P(123.7335968017578, -33.76750183105469),
+                                    P(123.734992980957, -33.77972412109375),
+                                    P(123.6908111572266, -33.820556640625),
+                                    P(123.6488800048828, -33.84694671630859),
+                                    P(123.5408172607422, -33.90583038330078),
+                                    P(123.4724884033203, -33.9102783203125),
+                                    P(123.4677581787109, -33.90666198730469),
+                                    P(123.4580383300781, -33.90193939208984),
+                                    P(123.4449768066406, -33.89861297607422),
+                                    P(123.4294281005859, -33.89694976806641),
+                                    P(123.4055480957031, -33.89583587646484),
+                                    P(123.3727569580078, -33.89500427246094),
+                                    P(123.3652572631836, -33.89527893066406),
+                                    P(123.3519287109375, -33.89778137207031),
+                                    P(123.3419265747071, -33.90361022949219),
+                                    P(123.3385925292969, -33.90694427490234),
+                                    P(123.3052520751953, -33.94166564941407),
+                                    P(123.2902679443359, -33.96389007568359),
+                                    P(123.2869262695313, -33.9677734375),
+                                    P(123.2827606201172, -33.97193908691406),
+                                    P(123.2708282470703, -33.98110961914063),
+                                    P(123.2363662719727, -34),
+                                    P(123.1680526733399, -34.01860809326172),
+                                    P(123.1394271850586, -33.94916534423828),
+                                    P(123.1047134399414, -33.88999938964844),
+                                    P(123.0966491699219, -33.88388824462891),
+                                    P(123.0863800048828, -33.8780517578125),
+                                    P(123.0741577148438, -33.87361145019531),
+                                    P(123.0272064208984, -33.85805511474609),
+                                    P(123.0197067260742, -33.85722351074219),
+                                    P(123.01220703125, -33.85750579833984),
+                                    P(122.9149932861328, -33.88555908203125),
+                                    P(122.8516464233398, -33.90583038330078),
+                                    P(122.8383178710938, -33.90805053710938),
+                                    P(122.8227691650391, -33.90888977050781),
+                                    P(122.8121871948242, -33.90471649169922),
+                                    P(122.7302703857422, -33.89333343505859),
+                                    P(122.606086730957, -33.89444732666016),
+                                    P(122.5977630615235, -33.89555358886719),
+                                    P(122.5877685546875, -33.89944458007813),
+                                    P(122.5836029052734, -33.90277862548828),
+                                    P(122.57666015625, -33.91055297851563),
+                                    P(122.57470703125, -33.91610717773439),
+                                    P(122.4394226074219, -33.92778015136719),
+                                    P(122.4272003173828, -33.92388916015625),
+                                    P(122.3808135986328, -33.91277313232422),
+                                    P(122.3733062744141, -33.91194152832031),
+                                    P(122.3577575683594, -33.91194152832031),
+                                    P(122.3510894775391, -33.91388702392578),
+                                    P(122.3052520751953, -33.92888641357422),
+                                    P(122.2994232177734, -33.93083190917969),
+                                    P(122.2941436767578, -33.93332672119141),
+                                    P(122.2677612304688, -33.95361328125),
+                                    P(122.2624969482422, -33.96221923828125),
+                                    P(122.2594299316406, -33.97388458251953),
+                                    P(122.2630462646484, -34.00389099121094),
+                                    P(122.2611083984375, -34.00944519042969),
+                                    P(122.2583312988281, -34.01416778564453),
+                                    P(122.2541732788086, -34.01750183105469),
+                                    P(122.249153137207, -34.01999664306641),
+                                    P(122.238037109375, -34.02444458007813),
+                                    P(122.1183166503906, -34.02861022949219),
+                                    P(122.0916595458984, -34.02305603027344),
+                                    P(122.077766418457, -34.01972198486328),
+                                    P(122.0738830566406, -34.01694488525391),
+                                    P(122.0755462646484, -34.01139068603516),
+                                    P(122.0863800048828, -33.99277496337891),
+                                    P(122.0908203125, -33.98944091796875),
+                                    P(122.1038665771484, -33.98722076416016),
+                                    P(122.1074829101563, -33.98332977294922),
+                                    P(122.1047134399414, -33.97222137451173),
+                                    P(122.0863800048828, -33.92722320556641),
+                                    P(122.0738830566406, -33.89805603027345),
+                                    P(122.0691528320313, -33.88833618164063),
+                                    P(122.0522003173828, -33.86860656738281),
+                                    P(122.0372009277344, -33.85305786132813),
+                                    P(122.0177612304688, -33.83472442626953),
+                                    P(122.0097198486328, -33.82749938964844),
+                                    P(121.9974822998047, -33.82444763183594),
+                                    P(121.9902572631836, -33.82500457763672),
+                                    P(121.925537109375, -33.83361053466797),
+                                    P(121.9080429077148, -33.83916473388672),
+                                    P(121.8927612304688, -33.84749603271484),
+                                    P(121.8858184814453, -33.85472106933594),
+                                    P(121.8827514648438, -33.86639404296875),
+                                    P(121.8616485595703, -33.88055419921876),
+                                    P(121.8405532836914, -33.88999938964844),
+                                    P(121.8288726806641, -33.89389038085938),
+                                    P(121.7897033691406, -33.90193939208984),
+                                    P(121.7824935913086, -33.90110778808594),
+                                    P(121.7758178710938, -33.89749908447266),
+                                    P(121.672492980957, -33.86028289794922),
+                                    P(121.5299835205078, -33.82222747802734),
+                                    P(121.5152664184571, -33.82083892822266),
+                                    P(121.4611129760742, -33.8175048828125),
+                                    P(121.3708190917969, -33.81527709960938),
+                                    P(121.3394317626953, -33.81500244140625),
+                                    P(121.332763671875, -33.81610870361328),
+                                    P(121.2197113037109, -33.83889007568359),
+                                    P(121.0516510009766, -33.85694885253906),
+                                    P(120.9297027587891, -33.86277770996094),
+                                    P(120.8922119140625, -33.85778045654297),
+                                    P(120.8774719238281, -33.85583496093751),
+                                    P(120.869140625, -33.85556030273438),
+                                    P(120.8558197021484, -33.85778045654297),
+                                    P(120.834716796875, -33.866943359375),
+                                    P(120.8144226074219, -33.87638854980469),
+                                    P(120.8049774169922, -33.88277435302734),
+                                    P(120.7947082519531, -33.88722229003906),
+                                    P(120.7880401611328, -33.88889312744141),
+                                    P(120.7227630615234, -33.89444732666016),
+                                    P(120.6938629150391, -33.89583587646484),
+                                    P(120.5402679443359, -33.91722106933594),
+                                    P(120.4855270385742, -33.94888305664063),
+                                    P(120.4447021484375, -33.96888732910156),
+                                    P(120.4277572631836, -33.97444152832031),
+                                    P(120.4210968017578, -33.97555541992188),
+                                    P(120.4135971069336, -33.975830078125),
+                                    P(120.407211303711, -33.97416687011719),
+                                    P(120.369140625, -33.96361541748047),
+                                    P(120.2880401611328, -33.94554901123047),
+                                    P(120.2530517578125, -33.93972015380859),
+                                    P(120.22998046875, -33.9375),
+                                    P(120.0324935913086, -33.92527770996094),
+                                    P(120.0241470336914, -33.92583465576172),
+                                    P(120.0049896240235, -33.92888641357422),
+                                    P(119.97998046875, -33.93444061279297),
+                                    P(119.8188781738281, -33.975830078125),
+                                    P(119.8069305419922, -33.98027801513672),
+                                    P(119.7933197021485, -33.98833465576172),
+                                    P(119.7844161987305, -33.99472045898438),
+                                    P(119.770263671875, -34.01055908203125),
+                                    P(119.7580413818359, -34.02833557128906),
+                                    P(119.7510986328125, -34.03611755371094),
+                                    P(119.7388763427734, -34.04583740234375),
+                                    P(119.7155532836914, -34.06027984619141),
+                                    P(119.6999969482422, -34.06777954101563),
+                                    P(119.6727600097656, -34.07888793945313),
+                                    P(119.6441497802734, -34.0897216796875),
+                                    P(119.6160888671875, -34.09999847412109),
+                                    P(119.5672073364258, -34.14583587646484),
+                                    P(119.5599822998047, -34.15361022949219),
+                                    P(119.4863662719727, -34.25722503662109),
+                                    P(119.4813690185547, -34.26721954345703),
+                                    P(119.4780426025391, -34.27861022949219),
+                                    P(119.4680480957031, -34.32527923583984),
+                                    P(119.466926574707, -34.33833312988281),
+                                    P(119.3255462646484, -34.44694519042969),
+                                    P(119.2086029052735, -34.50444793701172),
+                                    P(119.1852569580078, -34.49500274658203),
+                                    P(119.1113662719727, -34.47471618652344),
+                                    P(119.0788726806641, -34.46611022949219),
+                                    P(118.9394226074219, -34.44972229003906),
+                                    P(118.9310913085938, -34.44916534423828),
+                                    P(118.9116516113281, -34.45305633544922),
+                                    P(118.890266418457, -34.46221923828125),
+                                    P(118.772216796875, -34.52861022949219),
+                                    P(118.7574920654297, -34.53750610351563),
+                                    P(118.7397003173828, -34.54999542236328),
+                                    P(118.7216491699219, -34.56945037841797),
+                                    P(118.7194366455078, -34.57500457763672),
+                                    P(118.7541732788086, -34.60694885253906),
+                                    P(118.7397003173828, -34.62249755859375),
+                                    P(118.7316589355469, -34.62944030761719),
+                                    P(118.7191467285156, -34.63972473144531),
+                                    P(118.6991424560547, -34.65027618408204),
+                                    P(118.6480407714844, -34.67610931396484),
+                                    P(118.6386032104492, -34.6808319091797),
+                                    P(118.6324768066406, -34.68250274658203),
+                                    P(118.6121978759766, -34.68555450439453),
+                                    P(118.5913696289063, -34.68860626220703),
+                                    P(118.5727691650391, -34.69277191162109),
+                                    P(118.5183334350586, -34.70750427246094),
+                                    P(118.4797134399414, -34.72249603271484),
+                                    P(118.4744262695313, -34.72499847412109),
+                                    P(118.4552612304688, -34.73527526855469),
+                                    P(118.4463729858398, -34.74166870117188),
+                                    P(118.4383087158203, -34.74861145019531),
+                                    P(118.4180526733398, -34.774169921875),
+                                    P(118.3997192382813, -34.80110931396484),
+                                    P(118.3899765014648, -34.8277816772461),
+                                    P(118.38720703125, -34.83999633789064),
+                                    P(118.3866577148438, -34.84666442871095),
+                                    P(118.2816619873047, -34.90555572509766),
+                                    P(118.081672668457, -34.99388885498047),
+                                    P(117.8460998535156, -35.02666473388672),
+                                    P(117.8399810791016, -35.02833557128906),
+                                    P(117.834716796875, -35.03083038330078),
+                                    P(117.8311004638672, -35.03472900390625),
+                                    P(117.8297119140625, -35.04084014892578),
+                                    P(117.8299865722656, -35.04695129394531),
+                                    P(117.8319396972656, -35.05194091796875),
+                                    P(117.8435974121094, -35.06277465820313),
+                                    P(117.8577575683594, -35.07194519042969),
+                                    P(117.8794326782227, -35.08194732666016),
+                                    P(117.8866577148438, -35.08332824707031),
+                                    P(117.9402618408203, -35.09194183349609),
+                                    P(117.9474792480469, -35.09305572509766),
+                                    P(117.9544372558594, -35.09222412109375),
+                                    P(117.9827575683594, -35.08222198486328),
+                                    P(117.9949798583984, -35.08638763427734),
+                                    P(118.0008163452148, -35.09500122070313),
+                                    P(118.0019378662109, -35.10055541992188),
+                                    P(117.9966430664063, -35.10278320312501),
+                                    P(117.9466400146485, -35.12222290039063),
+                                    P(117.9344177246094, -35.12583160400391),
+                                    P(117.9277572631836, -35.12666320800781),
+                                    P(117.869140625, -35.11888885498047),
+                                    P(117.8627624511719, -35.11721801757813),
+                                    P(117.8572082519531, -35.11472320556641),
+                                    P(117.8446731567383, -35.10543823242188),
+                                    P(117.8094177246094, -35.07917022705078),
+                                    P(117.7841491699219, -35.06527709960938),
+                                    P(117.7552566528321, -35.05332946777344),
+                                    P(117.7422027587891, -35.05027770996094),
+                                    P(117.7266464233398, -35.04805755615234),
+                                    P(117.6797027587891, -35.04778289794922),
+                                    P(117.6663818359375, -35.04972839355469),
+                                    P(117.6602630615234, -35.0513916015625),
+                                    P(117.6499862670899, -35.05610656738281),
+                                    P(117.6363830566406, -35.0655517578125),
+                                    P(117.629150390625, -35.07333374023438),
+                                    P(117.6224822998047, -35.08250427246094),
+                                    P(117.6166534423828, -35.09916687011719),
+                                    P(117.6097106933594, -35.13833618164064),
+                                    P(117.5541534423828, -35.09860992431641),
+                                    P(117.533332824707, -35.08833312988281),
+                                    P(117.3641510009766, -35.02777862548828),
+                                    P(117.3460998535156, -35.02166748046875),
+                                    P(117.3324890136719, -35.01889038085938),
+                                    P(117.1838684082031, -35.01194763183594),
+                                    P(116.9599914550781, -35.01389312744141),
+                                    P(116.9524765014649, -35.01416778564453),
+                                    P(116.9405364990234, -35.01750183105469),
+                                    P(116.922492980957, -35.03055572509766),
+                                    P(116.9166564941406, -35.03916931152344),
+                                    P(116.9144287109375, -35.04444885253906),
+                                    P(116.9077606201172, -35.05278015136719),
+                                    P(116.9024810791016, -35.05527496337891),
+                                    P(116.8888931274414, -35.05694580078125),
+                                    P(116.8730316162109, -35.05666351318359),
+                                    P(116.8444366455078, -35.05110931396484),
+                                    P(116.831672668457, -35.04695129394531),
+                                    P(116.814697265625, -35.03972625732422),
+                                    P(116.7244262695313, -35.01694488525391),
+                                    P(116.6580429077148, -35.03221893310547),
+                                    P(116.6019287109375, -35.03305816650391),
+                                    P(116.4633178710938, -35.00083923339844),
+                                    P(116.457763671875, -34.99833679199219),
+                                    P(116.3755264282227, -34.94805145263672),
+                                    P(116.32470703125, -34.9183349609375),
+                                    P(116.2686004638672, -34.88777923583984),
+                                    P(116.2463684082031, -34.87777709960938),
+                                    P(116.2169265747071, -34.86611175537109),
+                                    P(116.1788635253906, -34.85444641113281),
+                                    P(116.0924835205078, -34.83805084228516),
+                                    P(115.9736022949219, -34.81945037841797),
+                                    P(115.9524765014648, -34.76944732666016),
+                                    P(115.9438629150391, -34.75111389160156),
+                                    P(115.9160919189453, -34.70722198486328),
+                                    P(115.9105377197266, -34.69916534423828),
+                                    P(115.8141479492188, -34.60778045654297),
+                                    P(115.79443359375, -34.58999633789063),
+                                    P(115.7824935913086, -34.57944488525391),
+                                    P(115.6480407714844, -34.4677734375),
+                                    P(115.5010986328125, -34.38611602783203),
+                                    P(115.4902572631836, -34.38111114501954),
+                                    P(115.3916625976563, -34.33638763427734),
+                                    P(115.3805389404297, -34.33139038085938),
+                                    P(115.3172073364258, -34.30583190917969),
+                                    P(115.3108062744141, -34.30388641357422),
+                                    P(115.2508163452149, -34.29833984375),
+                                    P(115.2427520751953, -34.29778289794922),
+                                    P(115.2352600097656, -34.29778289794922),
+                                    P(115.2141571044922, -34.29972839355469),
+                                    P(115.1947021484375, -34.30278015136719),
+                                    P(115.1819305419922, -34.30583190917969),
+                                    P(115.1716537475586, -34.30999755859375),
+                                    P(115.1616516113281, -34.31610870361328),
+                                    P(115.1580429077148, -34.31916809082031),
+                                    P(115.1519317626953, -34.32888793945313),
+                                    P(115.1474914550781, -34.34638977050781),
+                                    P(115.1436004638672, -34.35028076171875),
+                                    P(115.1263732910156, -34.36305999755859),
+                                    P(115.1180419921875, -34.36250305175781),
+                                    P(115.0738830566406, -34.32389068603516),
+                                    P(115.0155487060547, -34.27055358886719),
+                                    P(115.0080413818359, -34.2630615234375),
+                                    P(115.006103515625, -34.258056640625),
+                                    P(115.0047073364258, -34.23416900634766),
+                                    P(115.0044403076172, -34.21555328369141),
+                                    P(115.005256652832, -34.20889282226563),
+                                    P(115.009162902832, -34.19749450683594),
+                                    P(115.0108184814453, -34.18388366699219),
+                                    P(115.0108184814453, -34.17694854736328),
+                                    P(115.0097198486328, -34.17138671875),
+                                    P(114.9766464233398, -34.01860809326172),
+                                    P(114.957763671875, -33.86611175537109),
+                                    P(114.9533233642578, -33.69583129882813),
+                                    P(114.9541625976563, -33.68888854980469),
+                                    P(114.9869232177735, -33.52972412109375),
+                                    P(114.9887237548828, -33.52253723144531),
+                                    P(115.0027770996094, -33.52138519287109),
+                                    P(115.0099868774414, -33.52277374267578),
+                                    P(115.0347137451172, -33.53083038330078),
+                                    P(115.0447082519531, -33.53666687011719),
+                                    P(115.0713806152344, -33.56221771240234),
+                                    P(115.0822067260742, -33.57389068603516),
+                                    P(115.0849914550781, -33.57833862304688),
+                                    P(115.0888824462891, -33.58833312988281),
+                                    P(115.0897064208984, -33.59388732910156),
+                                    P(115.092758178711, -33.60361480712891),
+                                    P(115.0955429077148, -33.60805511474609),
+                                    P(115.0991516113281, -33.61167144775391),
+                                    P(115.1083221435547, -33.61805725097656),
+                                    P(115.1558227539063, -33.63555908203125),
+                                    P(115.2113800048828, -33.6522216796875),
+                                    P(115.2185974121094, -33.6536102294922),
+                                    P(115.2260894775391, -33.6536102294922),
+                                    P(115.2616577148438, -33.6522216796875),
+                                    P(115.2824935913086, -33.65055084228516),
+                                    P(115.3091430664063, -33.64722442626953),
+                                    P(115.3219299316406, -33.64472198486328),
+                                    P(115.3636016845703, -33.633056640625),
+                                    P(115.3969421386719, -33.62138366699219),
+                                    P(115.4274673461914, -33.60666656494141),
+                                    P(115.4319305419922, -33.60361480712891),
+                                    P(115.6608123779297, -33.31082916259766),
+                                    P(115.6746978759766, -33.30972290039063),
+                                    P(115.6858062744141, -33.3058319091797),
+                                    P(115.6947021484375, -33.29972839355469),
+                                    P(115.7022094726563, -33.29138946533203),
+                                    P(115.7066497802735, -33.28138732910156),
+                                    P(115.7111129760742, -33.26999664306641),
+                                    P(115.7141571044922, -33.258056640625),
+                                    P(115.7147064208985, -33.24500274658203),
+                                    P(115.7138824462891, -33.23944091796875),
+                                    P(115.66943359375, -32.98194122314453),
+                                    P(115.6530532836914, -32.92444610595703),
+                                    P(115.6355361938477, -32.86750030517578),
+                                    P(115.6199798583985, -32.80944061279297),
+                                    P(115.6188735961914, -32.80388641357422),
+                                    P(115.5949935913086, -32.68250274658203),
+                                    P(115.5935974121094, -32.67138671875),
+                                    P(115.5944366455078, -32.66444396972656),
+                                    P(115.6144332885742, -32.60916900634766),
+                                    P(115.6166534423828, -32.60388946533203),
+                                    P(115.6197128295898, -32.59916687011719),
+                                    P(115.6785888671875, -32.52972412109375),
+                                    P(115.6824798583984, -32.52583312988281),
+                                    P(115.6910934448242, -32.51972198486328),
+                                    P(115.6971969604492, -32.51805877685547),
+                                    P(115.70166015625, -32.52111053466797),
+                                    P(115.7022094726563, -32.54444885253906),
+                                    P(115.7008209228516, -32.55055236816406),
+                                    P(115.6955337524414, -32.55305480957031),
+                                    P(115.689697265625, -32.554443359375),
+                                    P(115.6852569580078, -32.55750274658203),
+                                    P(115.6527709960938, -32.58611297607422),
+                                    P(115.6374969482422, -32.60055541992188),
+                                    P(115.6299667358399, -32.61500549316406),
+                                    P(115.6296997070313, -32.64055633544922),
+                                    P(115.6344299316406, -32.65666198730469),
+                                    P(115.6718673706055, -32.74428176879883),
+                                    P(115.6735458374023, -32.74728012084961),
+                                    P(115.6883087158203, -32.77555847167969),
+                                    P(115.6971969604492, -32.78250122070313),
+                                    P(115.7044372558594, -32.78361511230469),
+                                    P(115.7111129760742, -32.78277587890625),
+                                    P(115.7155532836914, -32.77972412109375),
+                                    P(115.7185974121094, -32.77527618408203),
+                                    P(115.7199935913086, -32.7691650390625),
+                                    P(115.7188720703125, -32.75722503662109),
+                                    P(115.7159881591797, -32.71566772460938),
+                                    P(115.7335968017578, -32.64444732666017),
+                                    P(115.7619323730469, -32.57250213623047),
+                                    P(115.7438735961914, -32.44888305664063),
+                                    P(115.7324829101563, -32.32083892822266),
+                                    P(115.7316589355469, -32.26944732666016),
+                                    P(115.7383117675781, -32.26028442382813),
+                                    P(115.755256652832, -32.19499969482422),
+                                    P(115.755256652832, -32.18860626220703),
+                                    P(115.7377624511719, -32.09527587890626),
+                                    P(115.7438735961914, -31.94388961791992),
+                                    P(115.744140625, -31.92472076416016),
+                                    P(115.7438735961914, -31.89916610717774),
+                                    P(115.7427520751953, -31.88750076293946),
+                                    P(115.7405395507813, -31.87083435058594),
+                                    P(115.7394332885742, -31.86527633666992),
+                                    P(115.707763671875, -31.72444152832031),
+                                    P(115.7038726806641, -31.70833206176759),
+                                    P(115.6935882568359, -31.68360900878906),
+                                    P(115.6816635131836, -31.66055679321289),
+                                    P(115.6394271850586, -31.59527969360352),
+                                    P(115.5672073364258, -31.48360824584961),
+                                    P(115.4511032104492, -31.30166625976563),
+                                    P(115.4399719238281, -31.2841682434082),
+                                    P(115.4355316162109, -31.27500152587891),
+                                    P(115.3949890136719, -31.18416595458985),
+                                    P(115.3752593994141, -31.12222290039063),
+                                    P(115.3685913085938, -31.10222244262696),
+                                    P(115.3130264282227, -30.99110794067384),
+                                    P(115.3074798583984, -30.98221969604492),
+                                    P(115.2469329833984, -30.89194488525391),
+                                    P(115.2183227539063, -30.85527801513672),
+                                    P(115.2147064208985, -30.85139083862305),
+                                    P(115.2022094726563, -30.84138870239259),
+                                    P(115.16748046875, -30.77194595336914),
+                                    P(115.0811004638672, -30.5888900756836),
+                                    P(115.0494232177734, -30.51611328125),
+                                    P(115.0455322265625, -30.50694656372071),
+                                    P(115.0455322265625, -30.50055694580079),
+                                    P(115.0485992431641, -30.49527740478516),
+                                    P(115.0530395507813, -30.48472213745117),
+                                    P(115.054428100586, -30.47916412353516),
+                                    P(115.0552520751953, -30.47249984741211),
+                                    P(115.0236129760742, -30.274169921875),
+                                    P(114.9860992431641, -30.14833450317384),
+                                    P(114.9844207763672, -30.14277648925781),
+                                    P(114.966926574707, -30.08611297607422),
+                                    P(114.9621963500977, -30.07666778564453),
+                                    P(114.957763671875, -30.07361221313477),
+                                    P(114.9419326782227, -30.06611251831055),
+                                    P(114.9385833740234, -30.0625),
+                                    P(114.9358062744141, -30.05805587768555),
+                                    P(114.9388732910156, -29.74610900878906),
+                                    P(114.9394226074219, -29.72749710083008),
+                                    P(114.9419326782227, -29.67055511474609),
+                                    P(114.9458236694336, -29.63638687133789),
+                                    P(114.9483184814453, -29.62222290039063),
+                                    P(114.9594268798828, -29.57277679443359),
+                                    P(114.9630432128906, -29.56138992309571),
+                                    P(114.9719161987305, -29.54027938842773),
+                                    P(114.9749908447266, -29.53499984741211),
+                                    P(114.9791564941406, -29.51750183105469),
+                                    P(114.9797134399414, -29.49888610839846),
+                                    P(114.9780426025391, -29.48777770996094),
+                                    P(114.93359375, -29.34749984741211),
+                                    P(114.9299774169922, -29.33750152587891),
+                                    P(114.9246978759766, -29.32861328125),
+                                    P(114.9027709960938, -29.29916763305664),
+                                    P(114.9047088623047, -29.26833343505859),
+                                    P(114.9038696289063, -29.26277923583984),
+                                    P(114.9019317626953, -29.25166702270508),
+                                    P(114.88916015625, -29.21055603027345),
+                                    P(114.8855361938477, -29.20111083984375),
+                                    P(114.8391571044922, -29.10277938842774),
+                                    P(114.830551147461, -29.09027862548829),
+                                    P(114.7199935913086, -28.96805572509766),
+                                    P(114.6910934448242, -28.94416427612305),
+                                    P(114.6655426025391, -28.92610931396485),
+                                    P(114.6605377197266, -28.92361068725586),
+                                    P(114.6524810791016, -28.91666412353516),
+                                    P(114.6455383300781, -28.90916442871094),
+                                    P(114.6246871948242, -28.87916564941406),
+                                    P(114.6138763427734, -28.86305618286133),
+                                    P(114.5980377197266, -28.83666610717774),
+                                    P(114.5952606201172, -28.81999969482422),
+                                    P(114.5916595458985, -28.79750061035156),
+                                    P(114.5885925292969, -28.77722549438477),
+                                    P(114.5913696289063, -28.77277755737305),
+                                    P(114.5944366455078, -28.76055908203125),
+                                    P(114.5966491699219, -28.72833251953125),
+                                    P(114.5963668823242, -28.72222137451172),
+                                    P(114.591926574707, -28.68111038208008),
+                                    P(114.5871963500977, -28.64055633544922),
+                                    P(114.5811004638672, -28.62555694580078),
+                                    P(114.5299835205078, -28.53194427490235),
+                                    P(114.51416015625, -28.50583648681641),
+                                    P(114.5027770996094, -28.48805236816407),
+                                    P(114.3697128295898, -28.32083511352539),
+                                    P(114.3138732910156, -28.23583221435547),
+                                    P(114.3110961914063, -28.23221969604492),
+                                    P(114.307746887207, -28.22833251953125),
+                                    P(114.2972106933594, -28.22333145141602),
+                                    P(114.2741470336914, -28.21500015258789),
+                                    P(114.2636108398438, -28.20972061157227),
+                                    P(114.2541732788086, -28.20416641235352),
+                                    P(114.2316589355469, -28.18888854980469),
+                                    P(114.213607788086, -28.16999816894531),
+                                    P(114.2066497802734, -28.16249847412109),
+                                    P(114.1971969604492, -28.15055465698242),
+                                    P(114.1574935913086, -28.0977783203125),
+                                    P(114.1510925292969, -28.08416748046875),
+                                    P(114.1458282470703, -28.06916809082032),
+                                    P(114.1166534423828, -27.94777679443359),
+                                    P(114.0955429077148, -27.85750198364258),
+                                    P(114.0938720703125, -27.84555435180664),
+                                    P(114.0952606201172, -27.82638931274414),
+                                    P(114.0977630615234, -27.81361389160156),
+                                    P(114.1074829101563, -27.77722549438477),
+                                    P(114.1227569580078, -27.74055480957031),
+                                    P(114.1277618408203, -27.73083114624024),
+                                    P(114.13720703125, -27.71860885620117),
+                                    P(114.1416625976563, -27.70805358886719),
+                                    P(114.1424865722656, -27.70111083984375),
+                                    P(114.1352691650391, -27.66249847412109),
+                                    P(114.1213684082031, -27.60333251953125),
+                                    P(114.0933227539063, -27.50555801391602),
+                                    P(114.0727691650391, -27.45111083984375),
+                                    P(114.0272064208985, -27.36388778686524),
+                                    P(113.9369201660156, -27.19888687133789),
+                                    P(113.7991485595703, -26.96749877929688),
+                                    P(113.7872009277344, -26.95055389404297),
+                                    P(113.6877593994141, -26.81583404541016),
+                                    P(113.5858230590821, -26.69083404541016),
+                                    P(113.5355377197266, -26.63333129882813),
+                                    P(113.5119323730469, -26.6069450378418),
+                                    P(113.5, -26.5966682434082),
+                                    P(113.4908065795898, -26.59083557128907),
+                                    P(113.4466400146484, -26.55555725097656),
+                                    P(113.2835998535156, -26.40388870239258),
+                                    P(113.2785873413086, -26.39500045776368),
+                                    P(113.2244262695313, -26.23916625976563),
+                                    P(113.2536010742188, -26.19583129882813),
+                                    P(113.266098022461, -26.17083358764649),
+                                    P(113.270263671875, -26.1602783203125),
+                                    P(113.2719268798828, -26.15416717529297),
+                                    P(113.2736129760742, -26.14055633544922),
+                                    P(113.2736129760742, -26.12833404541016),
+                                    P(113.270263671875, -26.10027694702148),
+                                    P(113.2644271850586, -26.07333374023438),
+                                    P(113.2638931274414, -26.05472183227539),
+                                    P(113.265266418457, -26.04805755615235),
+                                    P(113.2705383300781, -26.03194427490235),
+                                    P(113.2755432128906, -26.02138900756836),
+                                    P(113.2791595458984, -26.01833343505859),
+                                    P(113.2849884033203, -26.02027893066407),
+                                    P(113.2916564941406, -26.02777862548829),
+                                    P(113.29248046875, -26.03361129760742),
+                                    P(113.3016510009766, -26.1261100769043),
+                                    P(113.3033065795898, -26.16722106933594),
+                                    P(113.3041534423828, -26.22249984741211),
+                                    P(113.3341522216797, -26.27861404418946),
+                                    P(113.3577575683594, -26.18638610839844),
+                                    P(113.3655395507813, -26.11888885498047),
+                                    P(113.5130462646484, -26.28194427490234),
+                                    P(113.5155487060547, -26.2863883972168),
+                                    P(113.5341491699219, -26.33499908447266),
+                                    P(113.5349884033203, -26.34083557128906),
+                                    P(113.5397033691406, -26.40055465698242),
+                                    P(113.546371459961, -26.508056640625),
+                                    P(113.5697174072266, -26.56972122192383),
+                                    P(113.6413726806641, -26.65277862548828),
+                                    P(113.6455383300781, -26.65583419799805),
+                                    P(113.6666564941406, -26.65944290161134),
+                                    P(113.6744232177734, -26.65999984741211),
+                                    P(113.6774673461914, -26.6341667175293),
+                                    P(113.7419281005859, -26.59416580200196),
+                                    P(113.7697067260742, -26.59916687011721),
+                                    P(113.7741470336914, -26.60222244262695),
+                                    P(113.7791595458984, -26.60472106933595),
+                                    P(113.7858123779297, -26.60610961914063),
+                                    P(113.7908172607422, -26.60388946533204),
+                                    P(113.8152618408203, -26.57389068603516),
+                                    P(113.8558197021484, -26.50750350952148),
+                                    P(113.8638763427734, -26.48472213745117),
+                                    P(113.8647003173828, -26.45916366577149),
+                                    P(113.8636016845703, -26.34111022949219),
+                                    P(113.8591537475586, -26.33194351196289),
+                                    P(113.8383178710938, -26.29611206054688),
+                                    P(113.8330535888672, -26.28778076171875),
+                                    P(113.8219299316406, -26.27777862548829),
+                                    P(113.7891464233398, -26.25055694580078),
+                                    P(113.7435913085938, -26.22666549682617),
+                                    P(113.6522064208985, -26.1694450378418),
+                                    P(113.5524673461914, -26.08028030395509),
+                                    P(113.5499877929688, -26.06972122192383),
+                                    P(113.5322113037109, -25.98944091796875),
+                                    P(113.49609375, -25.86555480957031),
+                                    P(113.4894332885742, -25.85194396972656),
+                                    P(113.4466400146484, -25.79389190673828),
+                                    P(113.4085998535156, -25.7430534362793),
+                                    P(113.3986129760742, -25.73166656494141),
+                                    P(113.3916625976563, -25.71805572509766),
+                                    P(113.3905487060547, -25.70277786254883),
+                                    P(113.3913726806641, -25.68472290039063),
+                                    P(113.3936004638672, -25.67194366455078),
+                                    P(113.3980407714844, -25.65499877929688),
+                                    P(113.4060974121094, -25.633056640625),
+                                    P(113.4111022949219, -25.62333297729492),
+                                    P(113.4197082519531, -25.60972213745117),
+                                    P(113.4694366455078, -25.54083633422852),
+                                    P(113.4977569580078, -25.56027984619141),
+                                    P(113.5297088623047, -25.62361145019531),
+                                    P(113.582763671875, -25.70249938964844),
+                                    P(113.5894317626953, -25.71083068847656),
+                                    P(113.5960998535156, -25.71777725219727),
+                                    P(113.6516571044922, -25.76388931274414),
+                                    P(113.6871871948242, -25.78805541992188),
+                                    P(113.6971969604492, -25.7933349609375),
+                                    P(113.7013931274414, -25.79722213745118),
+                                    P(113.7038726806641, -25.80222320556641),
+                                    P(113.7322082519531, -25.87805557250977),
+                                    P(113.7347106933594, -25.88861083984375),
+                                    P(113.7347106933594, -25.89472198486328),
+                                    P(113.7133178710938, -26.00166702270509),
+                                    P(113.7111129760742, -26.0069465637207),
+                                    P(113.7074890136719, -26.01083374023438),
+                                    P(113.6871871948242, -26.02666854858398),
+                                    P(113.6766510009766, -26.04305648803711),
+                                    P(113.6830368041992, -26.11111068725586),
+                                    P(113.6855316162109, -26.12805557250977),
+                                    P(113.7119293212891, -26.19527816772461),
+                                    P(113.7160873413086, -26.1986083984375),
+                                    P(113.7522125244141, -26.20638656616211),
+                                    P(113.7638931274414, -26.20388793945313),
+                                    P(113.7716522216797, -26.19721984863281),
+                                    P(113.7899780273438, -26.17833328247071),
+                                    P(113.7972106933594, -26.17055511474609),
+                                    P(113.8035888671875, -26.16222000122071),
+                                    P(113.8208312988281, -26.1341667175293),
+                                    P(113.8621978759766, -26.05833435058594),
+                                    P(113.8644332885742, -26.05305480957031),
+                                    P(113.8788604736328, -26.02888870239258),
+                                    P(113.9052581787109, -26.12194442749023),
+                                    P(113.9269332885742, -26.20944213867188),
+                                    P(113.9308166503906, -26.26083374023438),
+                                    P(113.9316635131836, -26.26639175415039),
+                                    P(113.9588775634766, -26.32777786254884),
+                                    P(114.0660934448242, -26.46194458007813),
+                                    P(114.0724868774414, -26.46138763427735),
+                                    P(114.1908111572266, -26.37805557250977),
+                                    P(114.1944274902344, -26.3741683959961),
+                                    P(114.1971969604492, -26.36972045898438),
+                                    P(114.220832824707, -26.30638885498047),
+                                    P(114.2227630615234, -26.2955551147461),
+                                    P(114.2227630615234, -26.28944396972657),
+                                    P(114.2194366455078, -26.27861404418946),
+                                    P(114.213607788086, -26.27055740356445),
+                                    P(114.2066497802734, -26.26361465454102),
+                                    P(114.1930389404297, -26.25555801391602),
+                                    P(114.1894226074219, -26.25166702270508),
+                                    P(114.182746887207, -26.23027801513672),
+                                    P(114.1733093261719, -26.19361114501954),
+                                    P(114.171371459961, -26.18305587768555),
+                                    P(114.171371459961, -26.17694473266602),
+                                    P(114.1955337524414, -26.03111267089844),
+                                    P(114.2063827514648, -25.98916625976563),
+                                    P(114.2397003173828, -26.00139236450195),
+                                    P(114.2569427490234, -25.97055435180664),
+                                    P(114.2599868774414, -25.85861206054688),
+                                    P(114.259162902832, -25.84666824340821),
+                                    P(114.2566528320313, -25.84305572509766),
+                                    P(114.1394271850586, -25.73194122314453),
+                                    P(114.0530395507813, -25.6522216796875),
+                                    P(114.0372009277344, -25.63750076293945),
+                                    P(114.0313720703125, -25.63000106811523),
+                                    P(113.95166015625, -25.49555206298828),
+                                    P(113.9188690185547, -25.4386100769043),
+                                    P(113.911376953125, -25.42472076416016),
+                                    P(113.8688735961914, -25.32555770874024),
+                                    P(113.8369293212891, -25.24860763549805),
+                                    P(113.811653137207, -25.18694305419922),
+                                    P(113.8016510009766, -25.17555618286134),
+                                    P(113.7974929809571, -25.17222213745117),
+                                    P(113.7841491699219, -25.16277694702149),
+                                    P(113.7455291748047, -25.14110946655273),
+                                    P(113.7119293212891, -25.13000106811523),
+                                    P(113.7019271850586, -25.125),
+                                    P(113.6977462768555, -25.12166595458984),
+                                    P(113.6927490234375, -25.11305618286133),
+                                    P(113.6541595458984, -25.02250289916992),
+                                    P(113.6491470336914, -25.008056640625),
+                                    P(113.6110992431641, -24.88916778564453),
+                                    P(113.6002731323242, -24.85305404663086),
+                                    P(113.6052627563477, -24.83611297607422),
+                                    P(113.6124877929688, -24.82194519042969),
+                                    P(113.6174774169922, -24.80444717407227),
+                                    P(113.6158065795898, -24.76139068603516),
+                                    P(113.6124877929688, -24.74610900878906),
+                                    P(113.6041564941406, -24.73332977294922),
+                                    P(113.5749969482422, -24.69194412231445),
+                                    P(113.5516510009766, -24.65999984741211),
+                                    P(113.5044403076172, -24.60638809204102),
+                                    P(113.4844207763672, -24.58416748046875),
+                                    P(113.4644317626953, -24.56722259521484),
+                                    P(113.4544372558594, -24.55722427368164),
+                                    P(113.4269332885742, -24.52750015258789),
+                                    P(113.4244232177734, -24.52305603027344),
+                                    P(113.4002685546875, -24.47249984741211),
+                                    P(113.3944396972656, -24.45194244384766),
+                                    P(113.3897094726563, -24.429443359375),
+                                    P(113.3822021484375, -24.24388885498047),
+                                    P(113.3824768066406, -24.23138809204102),
+                                    P(113.3844299316406, -24.22610855102539),
+                                    P(113.38720703125, -24.22166442871096),
+                                    P(113.4244232177734, -24.13444519042971),
+                                    P(113.4463729858399, -24.01139068603516),
+                                    P(113.488037109375, -23.87805557250977),
+                                    P(113.5322113037109, -23.75722503662109),
+                                    P(113.5997161865235, -23.63249969482422),
+                                    P(113.602767944336, -23.62805557250977),
+                                    P(113.633041381836, -23.60027694702148),
+                                    P(113.6377716064453, -23.5977783203125),
+                                    P(113.6594161987305, -23.59194564819336),
+                                    P(113.6691436767578, -23.58805465698242),
+                                    P(113.6738662719727, -23.58583450317383),
+                                    P(113.682746887207, -23.5797233581543),
+                                    P(113.7377624511719, -23.53499984741211),
+                                    P(113.7410888671875, -23.53111267089844),
+                                    P(113.7466430664063, -23.52138900756836),
+                                    P(113.7630462646484, -23.47277450561523),
+                                    P(113.7683334350586, -23.44166564941406),
+                                    P(113.7813720703125, -23.34333419799805),
+                                    P(113.7827606201172, -23.32500076293946),
+                                    P(113.7819366455078, -23.31916809082031),
+                                    P(113.7602691650391, -23.19388961791993),
+                                    P(113.7824935913086, -23.10555648803711),
+                                    P(113.7991485595703, -23.08499908447266),
+                                    P(113.8110961914063, -23.06083297729492),
+                                    P(113.8152618408203, -23.05027770996095),
+                                    P(113.8183288574219, -23.03055572509766),
+                                    P(113.8074798583985, -22.93333053588867),
+                                    P(113.8008117675781, -22.91333389282227),
+                                    P(113.7694396972656, -22.82500076293945),
+                                    P(113.7627716064453, -22.81138992309571),
+                                    P(113.7555465698242, -22.79833602905274),
+                                    P(113.7505493164063, -22.78944396972656),
+                                    P(113.7455291748047, -22.78083419799805),
+                                    P(113.7374877929688, -22.7683334350586),
+                                    P(113.7316589355469, -22.76000213623047),
+                                    P(113.7144317626953, -22.74110794067384),
+                                    P(113.7063827514648, -22.73555374145508),
+                                    P(113.6710968017578, -22.68611145019531),
+                                    P(113.6563720703125, -22.60472106933594),
+                                    P(113.6833190917969, -22.54639053344727),
+                                    P(113.6912078857422, -22.54100036621094),
+                                    P(113.6977462768555, -22.53194427490234),
+                                    P(113.7333221435547, -22.47527694702148),
+                                    P(113.7997131347656, -22.33416748046875),
+                                    P(113.8202667236328, -22.28055572509766),
+                                    P(113.8377685546875, -22.23166656494141),
+                                    P(113.863037109375, -22.15388870239259),
+                                    P(113.8924865722656, -22.0605583190918),
+                                    P(113.8974914550781, -22.04999923706055),
+                                    P(113.9333190917969, -21.97610855102539),
+                                    P(113.9963684082031, -21.88027954101563),
+                                    P(114.008041381836, -21.86277770996094),
+                                    P(114.0180511474609, -21.85083389282227),
+                                    P(114.0302734375, -21.84166717529297),
+                                    P(114.084716796875, -21.81277847290039),
+                                    P(114.0938720703125, -21.80889129638672),
+                                    P(114.1505432128906, -21.79111099243164),
+                                    P(114.1611022949219, -21.79555511474609),
+                                    P(114.168586730957, -21.8025016784668),
+                                    P(114.1716537475586, -21.80611038208009),
+                                    P(114.1766510009766, -21.81555557250977),
+                                    P(114.1766510009766, -21.82111358642579),
+                                    P(114.1752624511719, -21.82722473144531),
+                                    P(114.1605377197266, -21.84083557128906),
+                                    P(114.1502685546875, -21.85222244262695),
+                                    P(114.1394271850586, -21.87111282348633),
+                                    P(114.1324768066406, -21.88611221313477),
+                                    P(114.1266479492188, -21.9102783203125),
+                                    P(114.0761032104492, -22.15833282470703),
+                                    P(114.0761032104492, -22.17083358764648),
+                                    P(114.0769271850586, -22.17638778686523),
+                                    P(114.0819396972656, -22.19138717651368),
+                                    P(114.0861129760742, -22.20055389404297),
+                                    P(114.1213684082031, -22.27333450317383),
+                                    P(114.1419372558594, -22.3013916015625),
+                                    P(114.1227569580078, -22.39083480834961),
+                                    P(114.1188735961914, -22.39389038085938),
+                                    P(114.1160888671875, -22.39860916137695),
+                                    P(114.1147003173828, -22.40444564819336),
+                                    P(114.1085968017578, -22.48166656494141),
+                                    P(114.1119232177734, -22.49138641357422),
+                                    P(114.1266479492188, -22.51222229003907),
+                                    P(114.1333312988281, -22.51972198486329),
+                                    P(114.1416625976563, -22.52611160278321),
+                                    P(114.147216796875, -22.52777862548828),
+                                    P(114.1538696289063, -22.52777862548828),
+                                    P(114.1977462768555, -22.50889205932618),
+                                    P(114.3724822998047, -22.44249725341797),
+                                    P(114.3861083984375, -22.38138961791992),
+                                    P(114.390266418457, -22.36333465576172),
+                                    P(114.3924865722656, -22.35666656494141),
+                                    P(114.3999862670898, -22.33555603027344),
+                                    P(114.4083328247071, -22.31416702270508),
+                                    P(114.4608230590821, -22.19027709960938),
+                                    P(114.5180511474609, -22.08722305297852),
+                                    P(114.6241531372071, -21.92527770996094),
+                                    P(114.6266479492188, -21.92055511474609),
+                                    P(114.630256652832, -21.90944290161134),
+                                    P(114.6299667358398, -21.89083480834961),
+                                    P(114.6313629150391, -21.87111282348633),
+                                    P(114.6327514648438, -21.8650016784668),
+                                    P(114.6369323730469, -21.85444641113281),
+                                    P(114.6438827514649, -21.84611129760742),
+                                    P(114.6510925292969, -21.84000015258789),
+                                    P(114.6960906982422, -21.81333541870117),
+                                    P(114.7388763427734, -21.80083465576172),
+                                    P(114.8397064208984, -21.74805450439453),
+                                    P(114.9319305419922, -21.69222259521484),
+                                    P(114.9374771118164, -21.68999862670898),
+                                    P(114.9474792480469, -21.68666458129883),
+                                    P(114.9541625976563, -21.68583297729492),
+                                    P(114.9810867309571, -21.68777847290039),
+                                    P(115.0086135864258, -21.69222259521484),
+                                    P(115.0213775634766, -21.69138717651367),
+                                    P(115.0327606201172, -21.68888854980469),
+                                    P(115.0527572631836, -21.68111038208008),
+                                    P(115.1597137451172, -21.63055419921875),
+                                    P(115.2455291748047, -21.59194564819336),
+                                    P(115.3366470336914, -21.56639099121094),
+                                    P(115.4455337524414, -21.52194595336914),
+                                    P(115.4583282470703, -21.51361465454102),
+                                    P(115.4697113037109, -21.50361251831055),
+                                    P(115.4963684082031, -21.47249984741211),
+                                    P(115.5211029052735, -21.44027709960938),
+                                    P(115.5494232177734, -21.40444564819336),
+                                    P(115.6194305419922, -21.33194351196289),
+                                    P(115.6352691650391, -21.3194465637207),
+                                    P(115.6749877929688, -21.28944396972656),
+                                    P(115.6849822998047, -21.28555679321289),
+                                    P(115.7366485595703, -21.26750183105469),
+                                    P(115.7816619873047, -21.25),
+                                    P(115.7910919189453, -21.24555206298828),
+                                    P(115.8002624511719, -21.2408332824707),
+                                    P(115.8127593994141, -21.23221969604492),
+                                    P(115.8222198486328, -21.21999740600586),
+                                    P(115.8369293212891, -21.19055557250977),
+                                    P(115.8624877929688, -21.1455535888672),
+                                    P(115.8777618408203, -21.125),
+                                    P(115.9055480957031, -21.08833312988281),
+                                    P(115.9155426025391, -21.07694625854492),
+                                    P(115.9233093261719, -21.070556640625),
+                                    P(115.9272003173828, -21.06750106811523),
+                                    P(115.9544372558594, -21.05222320556641),
+                                    P(115.9874877929688, -21.0363883972168),
+                                    P(116.0086135864258, -21.03000259399414),
+                                    P(116.1219177246094, -20.98749923706055),
+                                    P(116.1363830566406, -20.98138809204102),
+                                    P(116.1541595458985, -20.97111129760742),
+                                    P(116.1655426025391, -20.96055603027344),
+                                    P(116.1719207763672, -20.94527816772461),
+                                    P(116.1855316162109, -20.90194320678711),
+                                    P(116.2488708496094, -20.86888885498047),
+                                    P(116.3094177246094, -20.86166763305664),
+                                    P(116.4755401611328, -20.80611038208008),
+                                    P(116.5897064208985, -20.7408332824707),
+                                    P(116.6066436767578, -20.73055267333985),
+                                    P(116.6144332885742, -20.72444152832031),
+                                    P(116.7074890136719, -20.64916610717773),
+                                    P(116.7855377197266, -20.64833450317383),
+                                    P(116.7844161987305, -20.65444564819336),
+                                    P(116.7844161987305, -20.66055679321289),
+                                    P(116.7855377197266, -20.66611099243164),
+                                    P(116.7885894775391, -20.67055511474609),
+                                    P(116.7955322265625, -20.67722320556641),
+                                    P(116.8274765014649, -20.70360946655274),
+                                    P(116.8363800048828, -20.70833206176759),
+                                    P(116.8647003173828, -20.71749877929688),
+                                    P(116.8713684082031, -20.71860885620117),
+                                    P(116.8777618408203, -20.71860885620117),
+                                    P(116.88916015625, -20.71527481079102),
+                                    P(116.8983306884766, -20.71110916137695),
+                                    P(116.9210968017578, -20.69944381713867),
+                                    P(116.9305419921875, -20.69444274902345),
+                                    P(116.9383087158203, -20.68833160400391),
+                                    P(116.9488677978516, -20.67694473266602),
+                                    P(116.9566497802734, -20.67138671875),
+                                    P(116.9933166503906, -20.6522216796875),
+                                    P(117.0405426025391, -20.63000106811523),
+                                    P(117.0502624511719, -20.62583160400391),
+                                    P(117.0666732788086, -20.62166595458984),
+                                    P(117.1569366455078, -20.64166641235352),
+                                    P(117.1619262695313, -20.65027618408203),
+                                    P(117.1710968017578, -20.66166687011719),
+                                    P(117.1869201660156, -20.68083190917969),
+                                    P(117.1944274902344, -20.6875),
+                                    P(117.2044372558594, -20.69222259521484),
+                                    P(117.26220703125, -20.7158317565918),
+                                    P(117.2736129760742, -20.71944427490234),
+                                    P(117.2858123779297, -20.72222137451172),
+                                    P(117.3049774169922, -20.725830078125),
+                                    P(117.3172073364258, -20.72805404663086),
+                                    P(117.3383178710938, -20.73027801513672),
+                                    P(117.3463668823242, -20.73083114624023),
+                                    P(117.3805389404297, -20.73138809204102),
+                                    P(117.4002685546875, -20.73083114624023),
+                                    P(117.4122009277344, -20.72888565063477),
+                                    P(117.48193359375, -20.71638870239258),
+                                    P(117.682746887207, -20.67694473266602),
+                                    P(117.6880264282227, -20.67583084106445),
+                                    P(117.7377624511719, -20.65638732910156),
+                                    P(117.82666015625, -20.62027740478516),
+                                    P(117.8363800048828, -20.61611175537109),
+                                    P(117.8502731323242, -20.60833358764649),
+                                    P(117.9191436767578, -20.55861282348633),
+                                    P(117.9246978759766, -20.55055618286133),
+                                    P(117.9324798583985, -20.53555679321289),
+                                    P(117.9349822998047, -20.524169921875),
+                                    P(118.0005493164063, -20.46805572509766),
+                                    P(118.0691528320313, -20.40999984741211),
+                                    P(118.1319274902344, -20.36861038208008),
+                                    P(118.1449890136719, -20.36055755615234),
+                                    P(118.1683197021484, -20.34916687011719),
+                                    P(118.1783065795898, -20.34500122070313),
+                                    P(118.1824798583985, -20.34805679321289),
+                                    P(118.1849822998047, -20.35250091552734),
+                                    P(118.1888732910156, -20.36833190917969),
+                                    P(118.1888732910156, -20.37444305419922),
+                                    P(118.1955337524414, -20.37555694580079),
+                                    P(118.234992980957, -20.37416839599609),
+                                    P(118.3974914550781, -20.34972381591797),
+                                    P(118.5452575683594, -20.32527923583984),
+                                    P(118.6483306884766, -20.3297233581543),
+                                    P(118.6538696289063, -20.33166885375977),
+                                    P(118.6611022949219, -20.33194351196289),
+                                    P(118.6677627563477, -20.33111190795898),
+                                    P(118.8010864257813, -20.28583526611328),
+                                    P(118.818603515625, -20.2752799987793),
+                                    P(118.8224868774414, -20.27138900756836),
+                                    P(118.9471969604492, -20.12111282348633),
+                                    P(118.9527664184571, -20.11277770996094),
+                                    P(118.9621963500977, -20.09361267089845),
+                                    P(118.9736022949219, -20.05472183227539),
+                                    P(118.9747009277344, -20.04861068725586),
+                                    P(118.9766464233399, -20.0433349609375),
+                                    P(118.9797134399414, -20.03944396972657),
+                                    P(118.9835968017578, -20.03611373901367),
+                                    P(119.0780487060547, -19.96999740600586),
+                                    P(119.0824890136719, -19.96749877929688),
+                                    P(119.1688690185547, -19.95694351196289),
+                                    P(119.1888732910156, -19.95944213867188),
+                                    P(119.3658065795898, -19.99944305419922),
+                                    P(119.4341430664063, -20.01694488525391),
+                                    P(119.5469436645508, -20.06500244140625),
+                                    P(119.5583190917969, -20.06833267211914),
+                                    P(119.5785980224609, -20.07111358642578),
+                                    P(119.5849914550781, -20.070556640625),
+                                    P(119.6013793945313, -20.06611251831055),
+                                    P(119.6927490234375, -20.0183334350586),
+                                    P(119.720832824707, -19.99805450439453),
+                                    P(119.7855377197266, -19.97166442871094),
+                                    P(120.0224914550781, -19.93305587768555),
+                                    P(120.1574935913086, -19.91694259643555),
+                                    P(120.1705322265625, -19.91638946533203),
+                                    P(120.2038726806641, -19.91472244262695),
+                                    P(120.2344207763672, -19.9102783203125),
+                                    P(120.2447128295898, -19.90722274780273),
+                                    P(120.3294372558594, -19.88111114501953),
+                                    P(120.3449935913086, -19.87583160400391),
+                                    P(120.5594177246094, -19.79194641113281),
+                                    P(120.8785934448242, -19.66527557373047),
+                                    P(120.9111022949219, -19.65055465698242),
+                                    P(120.9866485595703, -19.61472320556641),
+                                    P(121.0005493164063, -19.6077766418457),
+                                    P(121.0274810791016, -19.59222412109375),
+                                    P(121.0761032104492, -19.55777740478516),
+                                    P(121.1246871948242, -19.52250289916992),
+                                    P(121.1366577148438, -19.51361465454102),
+                                    P(121.2080383300781, -19.45916366577148),
+                                    P(121.2283172607422, -19.44305419921875),
+                                    P(121.2388763427734, -19.43388748168945),
+                                    P(121.2766571044922, -19.39500045776367),
+                                    P(121.3202667236328, -19.34722137451172),
+                                    P(121.3338775634766, -19.33222198486328),
+                                    P(121.4885864257813, -19.12305450439453),
+                                    P(121.5036010742188, -19.09583282470703),
+                                    P(121.5572128295899, -18.99361038208009),
+                                    P(121.6394271850586, -18.8138885498047),
+                                    P(121.7719268798828, -18.65722274780273),
+                                    P(121.7766571044922, -18.64749908447266),
+                                    P(121.7783203125, -18.64277648925781),
+                                    P(121.7791595458985, -18.63583374023438),
+                                    P(121.7788696289063, -18.63055419921875),
+                                    P(121.7774810791016, -18.625),
+                                    P(121.7711029052735, -18.61111068725586),
+                                    P(121.7658233642578, -18.60277938842773),
+                                    P(121.76220703125, -18.59944534301758),
+                                    P(121.7574920654297, -18.59638977050781),
+                                    P(121.7649993896484, -18.55611038208008),
+                                    P(121.800537109375, -18.48027801513672),
+                                    P(121.8099822998047, -18.46166610717773),
+                                    P(121.8135986328125, -18.45833206176758),
+                                    P(121.8180465698242, -18.45583343505859),
+                                    P(121.8244323730469, -18.4555549621582),
+                                    P(121.8299865722656, -18.45722198486328),
+                                    P(121.8336029052734, -18.46055603027344),
+                                    P(121.8460998535156, -18.46916580200195),
+                                    P(121.8516464233398, -18.47138595581055),
+                                    P(121.8844299316406, -18.47499847412109),
+                                    P(121.895263671875, -18.47249984741211),
+                                    P(121.939697265625, -18.44805526733398),
+                                    P(121.9927520751953, -18.40999984741211),
+                                    P(122.0083312988281, -18.39722061157227),
+                                    P(122.0188827514648, -18.38722229003906),
+                                    P(122.0285873413086, -18.3761100769043),
+                                    P(122.0430526733399, -18.35499954223633),
+                                    P(122.0666732788086, -18.31750106811523),
+                                    P(122.084716796875, -18.31416702270508),
+                                    P(122.0991516113281, -18.30722427368164),
+                                    P(122.1116485595703, -18.29944610595703),
+                                    P(122.1285934448242, -18.28861236572266),
+                                    P(122.310531616211, -18.15944290161133),
+                                    P(122.3180465698242, -18.15361022949219),
+                                    P(122.3374862670898, -18.13138961791992),
+                                    P(122.3533172607422, -18.10555648803711),
+                                    P(122.3572082519531, -18.09555435180664),
+                                    P(122.3660888671875, -18.06999969482422),
+                                    P(122.369140625, -18.05111312866211),
+                                    P(122.3697128295898, -18.03833389282227),
+                                    P(122.3636016845703, -18.01028060913086),
+                                    P(122.3597106933594, -18.00083541870117),
+                                    P(122.3544311523438, -17.99249649047852),
+                                    P(122.3474884033203, -17.98472213745117),
+                                    P(122.3322067260742, -17.97944259643555),
+                                    P(122.2527770996094, -17.95833206176759),
+                                    P(122.210823059082, -17.90083312988281),
+                                    P(122.2113800048828, -17.88638687133789),
+                                    P(122.2005462646484, -17.7077751159668),
+                                    P(122.1991424560547, -17.70138931274414),
+                                    P(122.1952514648438, -17.69249725341797),
+                                    P(122.1874771118164, -17.679443359375),
+                                    P(122.1785888671875, -17.66749954223633),
+                                    P(122.1741485595703, -17.65861129760742),
+                                    P(122.1494293212891, -17.59027862548828),
+                                    P(122.1441497802734, -17.57500076293945),
+                                    P(122.1408233642578, -17.55805587768555),
+                                    P(122.1386032104492, -17.52833557128906),
+                                    P(122.1386032104492, -17.50861358642578),
+                                    P(122.1438827514648, -17.36305618286133),
+                                    P(122.1749877929688, -17.24333190917969),
+                                    P(122.2533264160156, -17.11138916015625),
+                                    P(122.2599868774414, -17.10416793823242),
+                                    P(122.2810974121094, -17.08416748046875),
+                                    P(122.2883071899414, -17.07749938964844),
+                                    P(122.3624877929688, -17.01083374023438),
+                                    P(122.379150390625, -16.99610900878906),
+                                    P(122.3994293212891, -16.98194122314453),
+                                    P(122.4383087158203, -16.95888900756836),
+                                    P(122.4469299316406, -16.95388793945313),
+                                    P(122.4522094726563, -16.95194244384766),
+                                    P(122.5244293212891, -16.9566650390625),
+                                    P(122.578598022461, -16.95916366577148),
+                                    P(122.5699920654297, -16.9474983215332),
+                                    P(122.5299835205078, -16.87194442749023),
+                                    P(122.5241470336914, -16.85750198364258),
+                                    P(122.5224914550781, -16.8466682434082),
+                                    P(122.5252685546875, -16.84277725219727),
+                                    P(122.5610961914063, -16.79472351074219),
+                                    P(122.5719299316406, -16.78499984741211),
+                                    P(122.5855407714844, -16.77888870239258),
+                                    P(122.5919265747071, -16.77777862548828),
+                                    P(122.5974884033203, -16.77861404418945),
+                                    P(122.6008071899414, -16.78194427490234),
+                                    P(122.6080322265625, -16.79583358764648),
+                                    P(122.6113662719727, -16.79916763305664),
+                                    P(122.6163787841797, -16.8013916015625),
+                                    P(122.6288604736328, -16.8025016784668),
+                                    P(122.6397094726563, -16.79972457885742),
+                                    P(122.6766510009766, -16.78805541992188),
+                                    P(122.7522125244141, -16.76222229003906),
+                                    P(122.76220703125, -16.73360824584961),
+                                    P(122.738037109375, -16.70388793945313),
+                                    P(122.7355270385742, -16.69972229003906),
+                                    P(122.7363662719727, -16.69305419921875),
+                                    P(122.7586135864258, -16.60555648803711),
+                                    P(122.7624969482422, -16.59555435180664),
+                                    P(122.7736129760742, -16.5797233581543),
+                                    P(122.7880401611328, -16.56694412231445),
+                                    P(122.7930526733399, -16.56500244140625),
+                                    P(122.7999877929688, -16.56527709960938),
+                                    P(122.810531616211, -16.56888961791992),
+                                    P(122.8238830566406, -16.56861114501953),
+                                    P(122.8374862670898, -16.56166839599609),
+                                    P(122.8452606201172, -16.55583572387695),
+                                    P(122.8927612304688, -16.50777816772461),
+                                    P(122.8958282470703, -16.49694442749023),
+                                    P(122.8955383300781, -16.4849967956543),
+                                    P(122.8933334350586, -16.46722030639648),
+                                    P(122.8936004638672, -16.46055603027344),
+                                    P(122.8997192382813, -16.44583129882813),
+                                    P(122.9022064208984, -16.44138717651367),
+                                    P(122.9177627563477, -16.41555404663086),
+                                    P(122.9227600097656, -16.41361236572266),
+                                    P(122.9916534423828, -16.38972091674805),
+                                    P(123.0610961914063, -16.44638824462891),
+                                    P(123.0621871948242, -16.45166397094727),
+                                    P(123.0613708496094, -16.4577751159668),
+                                    P(123.0563735961914, -16.46638870239258),
+                                    P(123.047492980957, -16.47833251953125),
+                                    P(123.0438690185547, -16.48138809204102),
+                                    P(123.0388793945313, -16.48332977294922),
+                                    P(123.0260925292969, -16.48221969604492),
+                                    P(123.0208282470703, -16.47999954223633),
+                                    P(123.0172119140625, -16.47722244262695),
+                                    P(123.0077667236328, -16.47305297851563),
+                                    P(123.0019378662109, -16.47138595581055),
+                                    P(122.9958190917969, -16.47194290161133),
+                                    P(122.9908065795899, -16.4738883972168),
+                                    P(122.9871978759766, -16.47694396972656),
+                                    P(122.9841537475586, -16.48110961914063),
+                                    P(122.9552612304688, -16.58444595336914),
+                                    P(122.9572067260742, -16.58916854858398),
+                                    P(122.973876953125, -16.62444305419922),
+                                    P(122.9805526733398, -16.63166809082031),
+                                    P(123.0197067260742, -16.6702766418457),
+                                    P(123.0594177246094, -16.69166564941406),
+                                    P(123.0772094726563, -16.69944381713867),
+                                    P(123.0960998535156, -16.71611022949219),
+                                    P(123.1163787841797, -16.79277801513672),
+                                    P(123.2047119140625, -16.95222091674805),
+                                    P(123.307746887207, -17.13750076293945),
+                                    P(123.3744201660156, -17.24694442749023),
+                                    P(123.4347076416016, -17.34277725219727),
+                                    P(123.4780426025391, -17.40916442871094),
+                                    P(123.5358123779297, -17.49416351318359),
+                                    P(123.5524673461914, -17.51277923583984),
+                                    P(123.5544281005859, -17.5172233581543),
+                                    P(123.5752716064453, -17.59749984741211),
+                                    P(123.5794372558594, -17.59527969360352),
+                                    P(123.582763671875, -17.59166717529297),
+                                    P(123.5863800048828, -17.5797233581543),
+                                    P(123.594711303711, -17.51222229003906),
+                                    P(123.5933227539063, -17.50722503662109),
+                                    P(123.5724868774414, -17.47888565063477),
+                                    P(123.5638732910156, -17.46110916137695),
+                                    P(123.5599822998047, -17.44583129882813),
+                                    P(123.5635986328125, -17.36722183227539),
+                                    P(123.6163787841797, -17.21083068847656),
+                                    P(123.6216430664063, -17.20138931274414),
+                                    P(123.5755462646485, -17.08111190795898),
+                                    P(123.5724868774414, -17.06472396850586),
+                                    P(123.5736083984375, -17.04083633422852),
+                                    P(123.57470703125, -17.03388977050781),
+                                    P(123.5788726806641, -17.02277755737305),
+                                    P(123.5885925292969, -17.00333404541016),
+                                    P(123.5966491699219, -16.98999786376953),
+                                    P(123.6483306884766, -16.99249649047852),
+                                    P(123.6547088623047, -16.99388885498047),
+                                    P(123.6599884033203, -16.99638748168945),
+                                    P(123.7274780273438, -17.06666564941406),
+                                    P(123.7602691650391, -17.11000061035156),
+                                    P(123.7697067260742, -17.12722396850586),
+                                    P(123.7824935913086, -17.14249801635742),
+                                    P(123.8497161865234, -17.20166397094727),
+                                    P(123.8619232177734, -17.21110916137695),
+                                    P(123.8763732910156, -17.21971893310547),
+                                    P(123.8888931274414, -17.22277450561523),
+                                    P(123.8949890136719, -17.22249984741211),
+                                    P(123.9055480957031, -17.21999740600586),
+                                    P(123.9144287109375, -17.21500015258789),
+                                    P(123.9177627563477, -17.21138763427734),
+                                    P(123.9183197021484, -17.20444488525391),
+                                    P(123.9135971069336, -17.20222091674805),
+                                    P(123.8878326416016, -17.19525146484375),
+                                    P(123.8769226074219, -17.19138717651367),
+                                    P(123.8727569580078, -17.1886100769043),
+                                    P(123.8383178710938, -17.14666748046875),
+                                    P(123.8324890136719, -17.13888931274414),
+                                    P(123.8302764892578, -17.13444519042969),
+                                    P(123.82666015625, -17.12472152709961),
+                                    P(123.8030395507813, -17.03944396972656),
+                                    P(123.7949829101563, -17.0091667175293),
+                                    P(123.7949829101563, -16.99721908569336),
+                                    P(123.7977600097656, -16.99277496337891),
+                                    P(123.8369293212891, -16.94388961791992),
+                                    P(123.8916625976563, -16.89333343505859),
+                                    P(123.8583221435547, -16.87638854980469),
+                                    P(123.7822113037109, -16.89888763427734),
+                                    P(123.7719268798828, -16.89389038085938),
+                                    P(123.7608184814453, -16.88249969482422),
+                                    P(123.7541732788086, -16.86972045898438),
+                                    P(123.7177581787109, -16.78805541992188),
+                                    P(123.6077575683594, -16.67333221435547),
+                                    P(123.6136016845703, -16.56416702270508),
+                                    P(123.5466537475586, -16.56694412231445),
+                                    P(123.54248046875, -16.56972122192383),
+                                    P(123.5102691650391, -16.56833267211914),
+                                    P(123.5024871826172, -16.56722259521484),
+                                    P(123.4963684082031, -16.56416702270508),
+                                    P(123.4588775634766, -16.53778076171875),
+                                    P(123.4272003173828, -16.50638961791992),
+                                    P(123.4244232177735, -16.50250244140625),
+                                    P(123.4230270385742, -16.49666595458984),
+                                    P(123.4260864257813, -16.49249649047852),
+                                    P(123.4933166503906, -16.49721908569336),
+                                    P(123.5630264282227, -16.51555633544922),
+                                    P(123.6105270385742, -16.53028106689453),
+                                    P(123.624153137207, -16.53250122070313),
+                                    P(123.6410980224609, -16.52944564819336),
+                                    P(123.7088775634766, -16.43027877807617),
+                                    P(123.7174835205078, -16.37888717651367),
+                                    P(123.7163772583008, -16.34611129760742),
+                                    P(123.7133178710938, -16.34222412109375),
+                                    P(123.7086029052735, -16.33944320678711),
+                                    P(123.691650390625, -16.33277893066406),
+                                    P(123.6852569580078, -16.33222198486328),
+                                    P(123.6735992431641, -16.33333206176758),
+                                    P(123.6044311523438, -16.32333374023438),
+                                    P(123.5991516113281, -16.32138824462891),
+                                    P(123.5897064208984, -16.31583404541016),
+                                    P(123.5602569580078, -16.28833389282227),
+                                    P(123.5552520751953, -16.20999908447266),
+                                    P(123.5591430664063, -16.19110870361328),
+                                    P(123.5666732788086, -16.17638778686523),
+                                    P(123.5697174072266, -16.17194366455078),
+                                    P(123.5736083984375, -16.16916656494141),
+                                    P(123.6008071899414, -16.15722274780273),
+                                    P(123.6055526733398, -16.15527725219727),
+                                    P(123.7230377197266, -16.13833236694336),
+                                    P(123.7294311523438, -16.13888931274414),
+                                    P(123.7994232177735, -16.18694305419922),
+                                    P(123.8038635253906, -16.19027709960938),
+                                    P(123.8069305419922, -16.19416427612305),
+                                    P(123.8088684082031, -16.19944381713867),
+                                    P(123.8080291748047, -16.20527648925781),
+                                    P(123.7838668823242, -16.24610900878906),
+                                    P(123.7347106933594, -16.25611114501953),
+                                    P(123.72998046875, -16.258056640625),
+                                    P(123.7330474853516, -16.26194763183594),
+                                    P(123.8391571044922, -16.36805725097656),
+                                    P(123.8913726806641, -16.37888717651367),
+                                    P(123.8916625976563, -16.34277725219727),
+                                    P(123.8938827514648, -16.33694458007813),
+                                    P(123.9644317626953, -16.24555206298828),
+                                    P(124.0802764892578, -16.26083374023438),
+                                    P(124.0922088623047, -16.26416778564453),
+                                    P(124.113037109375, -16.27333450317383),
+                                    P(124.1399765014648, -16.2852783203125),
+                                    P(124.1599884033203, -16.29500198364258),
+                                    P(124.1727600097656, -16.31000137329102),
+                                    P(124.1824798583985, -16.3386116027832),
+                                    P(124.1958236694336, -16.37166595458984),
+                                    P(124.2022094726563, -16.38583374023438),
+                                    P(124.2047119140625, -16.38972091674805),
+                                    P(124.2074890136719, -16.39361190795898),
+                                    P(124.2158203125, -16.40027618408203),
+                                    P(124.2263793945313, -16.4033317565918),
+                                    P(124.2385864257813, -16.40666580200195),
+                                    P(124.3274765014648, -16.41083145141602),
+                                    P(124.3385925292969, -16.40888977050781),
+                                    P(124.3413696289063, -16.39694595336914),
+                                    P(124.3463668823242, -16.38722229003906),
+                                    P(124.3735961914063, -16.35722351074219),
+                                    P(124.3827514648438, -16.35111236572266),
+                                    P(124.3877716064453, -16.35027694702149),
+                                    P(124.3933334350586, -16.35250091552734),
+                                    P(124.4149932861328, -16.36611175537109),
+                                    P(124.4758071899414, -16.39583206176758),
+                                    P(124.5724868774414, -16.40527725219727),
+                                    P(124.584716796875, -16.40583419799805),
+                                    P(124.6647033691406, -16.39389038085938),
+                                    P(124.7199935913086, -16.38527679443359),
+                                    P(124.7383117675781, -16.38444519042969),
+                                    P(124.7455291748047, -16.3849983215332),
+                                    P(124.76416015625, -16.38972091674805),
+                                    P(124.7697067260742, -16.39194488525391),
+                                    P(124.8358230590821, -16.43000030517578),
+                                    P(124.8474884033203, -16.42888641357422),
+                                    P(124.890266418457, -16.41916656494141),
+                                    P(124.8994293212891, -16.41500091552734),
+                                    P(124.9016571044922, -16.40972137451172),
+                                    P(124.8997192382813, -16.40527725219727),
+                                    P(124.8949890136719, -16.40250015258789),
+                                    P(124.8816528320313, -16.39972305297852),
+                                    P(124.8524780273438, -16.40250015258789),
+                                    P(124.8472137451172, -16.40388870239258),
+                                    P(124.8352737426758, -16.40499877929688),
+                                    P(124.8283233642578, -16.40388870239258),
+                                    P(124.8152618408203, -16.39999771118164),
+                                    P(124.7491531372071, -16.37583160400391),
+                                    P(124.7091522216797, -16.35472106933594),
+                                    P(124.7013931274414, -16.34860992431641),
+                                    P(124.6921997070313, -16.34305572509766),
+                                    P(124.686653137207, -16.3411102294922),
+                                    P(124.6188735961914, -16.32833480834961),
+                                    P(124.6116485595703, -16.32722473144531),
+                                    P(124.5688781738281, -16.32444381713867),
+                                    P(124.5558166503906, -16.32389068603516),
+                                    P(124.5074920654297, -16.33416748046875),
+                                    P(124.4974822998047, -16.33666610717773),
+                                    P(124.47998046875, -16.34749984741211),
+                                    P(124.4297027587891, -16.34972381591797),
+                                    P(124.4169311523438, -16.34860992431641),
+                                    P(124.4124908447266, -16.34583282470703),
+                                    P(124.4005432128906, -16.32944488525391),
+                                    P(124.3822021484375, -16.28250122070313),
+                                    P(124.3760833740235, -16.22194290161133),
+                                    P(124.3908233642578, -16.17499923706055),
+                                    P(124.3930511474609, -16.16971969604492),
+                                    P(124.4305419921875, -16.10250091552734),
+                                    P(124.470832824707, -16.09333419799805),
+                                    P(124.4997100830078, -16.14389038085938),
+                                    P(124.5130462646484, -16.16388702392578),
+                                    P(124.5244293212891, -16.16333389282227),
+                                    P(124.5930480957031, -16.11416625976563),
+                                    P(124.5852737426758, -16.02277755737305),
+                                    P(124.6016464233399, -15.95611000061035),
+                                    P(124.6147003173828, -15.91861152648926),
+                                    P(124.6652679443359, -15.8630542755127),
+                                    P(124.7247009277344, -15.81416702270508),
+                                    P(124.7283172607422, -15.81055641174316),
+                                    P(124.7269287109375, -15.80555534362793),
+                                    P(124.6977462768555, -15.79361152648926),
+                                    P(124.6730270385742, -15.78666687011719),
+                                    P(124.6672134399414, -15.78722190856934),
+                                    P(124.6255264282227, -15.7947244644165),
+                                    P(124.6177520751953, -15.79999923706055),
+                                    P(124.6108093261719, -15.80722236633301),
+                                    P(124.5772094726563, -15.85472106933594),
+                                    P(124.5608062744141, -15.88083267211914),
+                                    P(124.5508117675781, -15.89944458007813),
+                                    P(124.5347137451172, -15.93638801574707),
+                                    P(124.4877624511719, -15.93722152709961),
+                                    P(124.4049835205078, -15.87444305419922),
+                                    P(124.4013824462891, -15.8711109161377),
+                                    P(124.397216796875, -15.85583305358887),
+                                    P(124.3774719238281, -15.73194313049316),
+                                    P(124.3713684082031, -15.67138862609863),
+                                    P(124.3724822998047, -15.66527652740479),
+                                    P(124.4477462768555, -15.48638725280762),
+                                    P(124.4547119140625, -15.4788875579834),
+                                    P(124.4633178710938, -15.4738883972168),
+                                    P(124.48193359375, -15.46583366394043),
+                                    P(124.4871978759766, -15.46444511413574),
+                                    P(124.4933166503906, -15.46527671813965),
+                                    P(124.5297088623047, -15.48027801513672),
+                                    P(124.5388793945313, -15.48666572570801),
+                                    P(124.5408172607422, -15.49638652801514),
+                                    P(124.5452575683594, -15.5),
+                                    P(124.5791625976563, -15.51749992370606),
+                                    P(124.5844268798828, -15.51611137390137),
+                                    P(124.6066436767578, -15.50750160217285),
+                                    P(124.6563720703125, -15.47972106933594),
+                                    P(124.6772003173828, -15.45583343505859),
+                                    P(124.6710968017578, -15.45416641235352),
+                                    P(124.6608123779297, -15.34277725219727),
+                                    P(124.6577606201172, -15.27916717529297),
+                                    P(124.6619262695313, -15.26111221313477),
+                                    P(124.6641464233398, -15.25666809082031),
+                                    P(124.66943359375, -15.25527954101563),
+                                    P(124.7022094726563, -15.25250053405762),
+                                    P(124.7083282470703, -15.2541675567627),
+                                    P(124.9124908447266, -15.35610961914063),
+                                    P(124.9399719238281, -15.37805557250977),
+                                    P(124.9435882568359, -15.38111114501953),
+                                    P(124.9844207763672, -15.41833305358887),
+                                    P(124.9949798583984, -15.42944526672364),
+                                    P(124.9977569580078, -15.43972206115723),
+                                    P(125.1818084716797, -15.52068519592285),
+                                    P(125.18359375, -15.51277923583985),
+                                    P(125.1799774169922, -15.50944519042969),
+                                    P(125.1722106933594, -15.50277900695801),
+                                    P(125.1197128295898, -15.46277809143066),
+                                    P(125.1013793945313, -15.4505558013916),
+                                    P(125.0844268798828, -15.43972206115723),
+                                    P(125.0769271850586, -15.43305587768555),
+                                    P(125.0738830566406, -15.42916679382324),
+                                    P(125.0702667236328, -15.41972160339356),
+                                    P(125.0697174072266, -15.41416740417481),
+                                    P(125.0724868774414, -15.4013900756836),
+                                    P(125.0866470336914, -15.35694313049316),
+                                    P(125.0922088623047, -15.34749984741211),
+                                    P(125.0991516113281, -15.34083366394043),
+                                    P(125.1072082519531, -15.33499908447266),
+                                    P(125.1163787841797, -15.3308334350586),
+                                    P(125.1208190917969, -15.31555557250977),
+                                    P(125.1033172607422, -15.30472183227539),
+                                    P(125.0913696289063, -15.29888916015625),
+                                    P(125.0113830566406, -15.30055618286133),
+                                    P(124.9863662719727, -15.30944442749023),
+                                    P(124.9633178710938, -15.31972122192383),
+                                    P(124.9591522216797, -15.32277679443359),
+                                    P(124.9280395507813, -15.33888816833496),
+                                    P(124.9227600097656, -15.34083366394043),
+                                    P(124.9177627563477, -15.34138870239258),
+                                    P(124.9116516113281, -15.33916664123535),
+                                    P(124.9041595458984, -15.33194446563721),
+                                    P(124.8956451416016, -15.28988838195801),
+                                    P(124.8958206176758, -15.28622150421143),
+                                    P(124.8971481323242, -15.28272247314453),
+                                    P(124.8988265991211, -15.28005599975586),
+                                    P(124.904655456543, -15.27305603027344),
+                                    P(124.9374771118164, -15.22833347320557),
+                                    P(124.966926574707, -15.20888900756836),
+                                    P(124.9722137451172, -15.20777702331543),
+                                    P(124.9791564941406, -15.20861053466797),
+                                    P(124.984992980957, -15.21722221374512),
+                                    P(124.988037109375, -15.22027778625488),
+                                    P(124.9958190917969, -15.22694396972656),
+                                    P(125.0002670288086, -15.22972106933594),
+                                    P(125.0063781738281, -15.23138809204102),
+                                    P(125.0111083984375, -15.22916603088379),
+                                    P(125.0477600097656, -15.17305564880371),
+                                    P(125.0499877929688, -15.16777801513672),
+                                    P(125.0494232177734, -15.16277885437012),
+                                    P(125.0458221435547, -15.15888977050781),
+                                    P(125.0402679443359, -15.15750122070313),
+                                    P(125.0127716064453, -15.15361213684082),
+                                    P(124.9324798583985, -15.19999885559082),
+                                    P(124.9277572631836, -15.20388793945313),
+                                    P(124.8922729492188, -15.22766590118408),
+                                    P(124.890266418457, -15.22983169555664),
+                                    P(124.8830947875977, -15.23999977111816),
+                                    P(124.880256652832, -15.2413330078125),
+                                    P(124.8770904541016, -15.23999977111816),
+                                    P(124.8544311523438, -15.23611068725586),
+                                    P(124.8244323730469, -15.16749954223633),
+                                    P(124.8238830566406, -15.16194534301758),
+                                    P(124.8255462646484, -15.15583419799805),
+                                    P(124.85693359375, -15.12027740478516),
+                                    P(124.8974914550781, -15.09999847412109),
+                                    P(124.9035873413086, -15.10083198547363),
+                                    P(124.9591522216797, -15.11722183227539),
+                                    P(124.9802703857422, -15.11083221435547),
+                                    P(125.0252685546875, -15.08805465698242),
+                                    P(125.0358123779297, -15.07583236694336),
+                                    P(125.0361022949219, -15.06972122192383),
+                                    P(125.0344161987305, -15.06527709960938),
+                                    P(125.0183334350586, -15.04083442687988),
+                                    P(125.0783233642578, -14.99972152709961),
+                                    P(125.147216796875, -15.15139007568359),
+                                    P(125.1630401611328, -15.16416740417481),
+                                    P(125.1663818359375, -15.16055679321289),
+                                    P(125.1744232177734, -15.12222099304199),
+                                    P(125.1746978759766, -15.11666488647461),
+                                    P(125.1619262695313, -15.07972145080566),
+                                    P(125.1616516113281, -15.03388977050781),
+                                    P(125.2210998535156, -15.0625),
+                                    P(125.2491531372071, -15.07972145080566),
+                                    P(125.2752685546875, -15.09583282470703),
+                                    P(125.2797088623047, -15.09999847412109),
+                                    P(125.2810974121094, -15.1044454574585),
+                                    P(125.2758178710938, -15.12916564941406),
+                                    P(125.2763824462891, -15.13472366333008),
+                                    P(125.2802734375, -15.1380558013916),
+                                    P(125.2947082519531, -15.14638900756836),
+                                    P(125.3094177246094, -15.15277862548828),
+                                    P(125.3211135864258, -15.1563892364502),
+                                    P(125.3280487060547, -15.15750122070313),
+                                    P(125.4077606201172, -15.15500068664551),
+                                    P(125.4219207763672, -15.14805603027344),
+                                    P(125.4299774169922, -15.1422233581543),
+                                    P(125.4333190917969, -15.13861274719239),
+                                    P(125.4377593994141, -15.12888717651367),
+                                    P(125.4380264282227, -15.12277603149414),
+                                    P(125.4333190917969, -15.11916542053223),
+                                    P(125.4202575683594, -15.11666488647461),
+                                    P(125.4097137451172, -15.11944389343262),
+                                    P(125.4052581787109, -15.12138652801514),
+                                    P(125.3941497802734, -15.12333297729492),
+                                    P(125.3877716064453, -15.12305545806885),
+                                    P(125.3830413818359, -15.12055397033691),
+                                    P(125.3619232177735, -15.10555458068848),
+                                    P(125.3588714599609, -15.10111045837402),
+                                    P(125.359992980957, -15.09416580200195),
+                                    P(125.3899765014649, -15.07083320617676),
+                                    P(125.364990234375, -15.05277824401856),
+                                    P(125.2869262695313, -14.99749946594238),
+                                    P(125.2752685546875, -14.99361038208008),
+                                    P(125.1819305419922, -14.95472145080566),
+                                    P(125.1813735961914, -14.94916725158691),
+                                    P(125.1841430664063, -14.94472312927246),
+                                    P(125.2141571044922, -14.91166687011719),
+                                    P(125.2180480957031, -14.90944480895996),
+                                    P(125.2430419921875, -14.90194511413574),
+                                    P(125.2041625976563, -14.85694313049317),
+                                    P(125.1980285644531, -14.8499984741211),
+                                    P(125.1363830566406, -14.75889015197754),
+                                    P(125.1349868774414, -14.75388908386231),
+                                    P(125.1355361938477, -14.74138832092285),
+                                    P(125.13720703125, -14.73555564880371),
+                                    P(125.2433166503906, -14.59805488586426),
+                                    P(125.2649993896484, -14.57722282409668),
+                                    P(125.3361129760742, -14.52305603027344),
+                                    P(125.3883209228516, -14.54500007629395),
+                                    P(125.5372009277344, -14.55611038208008),
+                                    P(125.550537109375, -14.55666732788086),
+                                    P(125.5621871948242, -14.55555534362793),
+                                    P(125.5888824462891, -14.5494441986084),
+                                    P(125.5947113037109, -14.49249839782715),
+                                    P(125.5994262695313, -14.42694473266602),
+                                    P(125.5802764892578, -14.31444454193115),
+                                    P(125.5797119140625, -14.3033332824707),
+                                    P(125.584716796875, -14.26111221313477),
+                                    P(125.592758178711, -14.24166679382324),
+                                    P(125.60693359375, -14.22305488586426),
+                                    P(125.6180419921875, -14.22111129760742),
+                                    P(125.6241531372071, -14.22277641296387),
+                                    P(125.7260894775391, -14.26749992370606),
+                                    P(125.7291564941406, -14.27138900756836),
+                                    P(125.7297134399414, -14.27694511413574),
+                                    P(125.7155532836914, -14.32888793945313),
+                                    P(125.7138824462891, -14.33472347259522),
+                                    P(125.7105407714844, -14.33833312988281),
+                                    P(125.7066497802735, -14.34138870239258),
+                                    P(125.7019271850586, -14.34333229064942),
+                                    P(125.6369323730469, -14.6130542755127),
+                                    P(125.6344299316406, -14.625),
+                                    P(125.6349868774414, -14.63055419921875),
+                                    P(125.63720703125, -14.63500022888184),
+                                    P(125.6416625976563, -14.63777923583984),
+                                    P(125.6477737426758, -14.63666725158691),
+                                    P(125.6510925292969, -14.63361167907715),
+                                    P(125.6538696289063, -14.62916564941406),
+                                    P(125.6608123779297, -14.61166572570801),
+                                    P(125.7035980224609, -14.48916625976563),
+                                    P(125.7066497802735, -14.47722244262695),
+                                    P(125.7124862670899, -14.44416618347168),
+                                    P(125.713607788086, -14.43194389343262),
+                                    P(125.7116470336914, -14.42138862609863),
+                                    P(125.7127685546875, -14.40833473205566),
+                                    P(125.7158203125, -14.40333366394043),
+                                    P(125.7188720703125, -14.40027809143066),
+                                    P(125.7241516113281, -14.39888954162598),
+                                    P(125.7374877929688, -14.40166664123535),
+                                    P(125.8402709960938, -14.45111083984375),
+                                    P(125.8477630615234, -14.46333312988281),
+                                    P(125.8460998535156, -14.46999931335449),
+                                    P(125.8380432128906, -14.47500038146973),
+                                    P(125.82470703125, -14.56972122192383),
+                                    P(125.8252716064453, -14.57527732849121),
+                                    P(125.841926574707, -14.60610961914063),
+                                    P(125.845832824707, -14.60861015319824),
+                                    P(125.9027709960938, -14.64361190795898),
+                                    P(125.9088668823242, -14.64527893066406),
+                                    P(125.9238662719727, -14.61749839782715),
+                                    P(125.9877624511719, -14.54722213745117),
+                                    P(125.994140625, -14.54722213745117),
+                                    P(126.0333328247071, -14.51972198486328),
+                                    P(126.0372009277344, -14.51666641235352),
+                                    P(126.0399780273438, -14.51222229003906),
+                                    P(126.0663833618164, -14.34416580200195),
+                                    P(126.1424865722656, -14.19555473327637),
+                                    P(126.1441497802734, -14.18944358825684),
+                                    P(126.1466522216797, -14.1299991607666),
+                                    P(126.0888824462891, -13.97305488586426),
+                                    P(126.085823059082, -13.96833229064941),
+                                    P(126.0822067260742, -13.96500015258789),
+                                    P(126.0691528320313, -13.95722198486328),
+                                    P(126.0535888671875, -13.9516658782959),
+                                    P(126.0274810791016, -13.93972206115723),
+                                    P(126.0177612304688, -13.93416595458985),
+                                    P(126.0147094726563, -13.93083381652832),
+                                    P(126.0124969482422, -13.92638969421387),
+                                    P(126.0147094726563, -13.92138862609864),
+                                    P(126.0194396972656, -13.91916656494141),
+                                    P(126.0674896240234, -13.91555595397949),
+                                    P(126.1480407714844, -13.92749977111816),
+                                    P(126.2174835205078, -13.96194458007813),
+                                    P(126.2160873413086, -14.02861213684082),
+                                    P(126.2147064208984, -14.03472328186035),
+                                    P(126.2072067260742, -14.04111099243164),
+                                    P(126.1974792480469, -14.0447244644165),
+                                    P(126.1869201660156, -14.04805564880371),
+                                    P(126.1819305419922, -14.04861068725586),
+                                    P(126.161376953125, -14.05416679382324),
+                                    P(126.1577606201172, -14.05777740478516),
+                                    P(126.1549835205078, -14.06222152709961),
+                                    P(126.1852569580078, -14.16139030456543),
+                                    P(126.186653137207, -14.16583442687989),
+                                    P(126.189697265625, -14.16972160339356),
+                                    P(126.2049865722656, -14.17666625976563),
+                                    P(126.2310867309571, -14.17888832092285),
+                                    P(126.2371978759766, -14.18055534362793),
+                                    P(126.2736129760742, -14.20750045776367),
+                                    P(126.2805480957031, -14.2147216796875),
+                                    P(126.2833328247071, -14.21916580200195),
+                                    P(126.2877731323242, -14.2330551147461),
+                                    P(126.3133087158203, -14.19361114501953),
+                                    P(126.29443359375, -14.14361190795899),
+                                    P(126.2947082519531, -14.13750076293945),
+                                    P(126.307746887207, -14.09166717529297),
+                                    P(126.3105316162109, -14.08722114562989),
+                                    P(126.332763671875, -14.05222320556641),
+                                    P(126.3355407714844, -14.04861068725586),
+                                    P(126.4313735961914, -13.97500038146973),
+                                    P(126.5024871826172, -13.9647216796875),
+                                    P(126.4910888671875, -14.0091667175293),
+                                    P(126.4569396972656, -14.06333446502686),
+                                    P(126.4549865722656, -14.06777763366699),
+                                    P(126.4533233642578, -14.07361030578613),
+                                    P(126.4530487060547, -14.07999992370606),
+                                    P(126.4561004638672, -14.08388900756836),
+                                    P(126.5683288574219, -14.22055435180664),
+                                    P(126.6005401611328, -14.22972106933594),
+                                    P(126.7022094726563, -14.12555503845215),
+                                    P(126.7055511474609, -14.12194442749024),
+                                    P(126.7891464233399, -13.97138786315918),
+                                    P(126.7619323730469, -13.83944320678711),
+                                    P(126.7444305419922, -13.79805564880371),
+                                    P(126.7474822998047, -13.79277801513672),
+                                    P(126.8530426025391, -13.75277900695801),
+                                    P(126.8627624511719, -13.74916553497315),
+                                    P(126.9533386230469, -13.72669219970703),
+                                    P(126.9583282470703, -13.72972106933594),
+                                    P(127.0177612304688, -13.77639007568359),
+                                    P(127.0744323730469, -13.83222198486328),
+                                    P(127.0772094726563, -13.8358325958252),
+                                    P(127.0780487060547, -13.84083366394043),
+                                    P(127.0772094726563, -13.84749984741211),
+                                    P(127.0727691650391, -13.85805511474609),
+                                    P(127.0583190917969, -13.87944412231446),
+                                    P(127.0569305419922, -13.88472366333008),
+                                    P(127.0574798583984, -13.89055633544922),
+                                    P(127.1091537475586, -13.96138954162598),
+                                    P(127.1158065795898, -13.96916580200196),
+                                    P(127.1197128295898, -13.97166633605957),
+                                    P(127.1305389404297, -13.97583198547364),
+                                    P(127.1363830566406, -13.97527694702148),
+                                    P(127.1397094726563, -13.97166633605957),
+                                    P(127.1535873413086, -13.93277740478516),
+                                    P(127.1541595458985, -13.89999961853027),
+                                    P(127.2419281005859, -13.89638900756836),
+                                    P(127.3555526733398, -13.92944526672364),
+                                    P(127.4208221435547, -13.94972229003906),
+                                    P(127.4246978759766, -13.95305442810059),
+                                    P(127.4277572631836, -13.95666694641113),
+                                    P(127.4471969604492, -13.98416519165039),
+                                    P(127.45166015625, -13.99305534362793),
+                                    P(127.4530487060547, -13.99805545806885),
+                                    P(127.5211029052735, -14.08611106872559),
+                                    P(127.6538696289063, -14.17305564880371),
+                                    P(127.6622009277344, -14.17888832092285),
+                                    P(127.7316589355469, -14.26777839660645),
+                                    P(127.7605361938477, -14.30055618286133),
+                                    P(127.7791595458985, -14.33527755737305),
+                                    P(127.8733062744141, -14.47333335876465),
+                                    P(127.9452514648438, -14.57638931274414),
+                                    P(127.9538726806641, -14.58222198486328),
+                                    P(127.9591522216797, -14.58444404602051),
+                                    P(127.9705429077149, -14.58361053466797),
+                                    P(127.9760894775391, -14.5808334350586),
+                                    P(127.9794311523438, -14.57805633544922),
+                                    P(127.9860992431641, -14.57055473327637),
+                                    P(127.9888763427734, -14.56611061096191),
+                                    P(127.9966430664063, -14.56027793884277),
+                                    P(128.0036010742188, -14.56111145019531),
+                                    P(128.0313720703125, -14.5830545425415),
+                                    P(128.1174621582031, -14.6513900756836),
+                                    P(128.12939453125, -14.66111183166504),
+                                    P(128.16943359375, -14.70277786254883),
+                                    P(128.1827392578125, -14.74166679382324),
+                                    P(128.1882934570313, -14.80027770996094),
+                                    P(128.1399841308594, -14.86777687072754),
+                                    P(128.0877380371094, -15.02527809143066),
+                                    P(128.0705261230469, -15.09472274780273),
+                                    P(128.0682983398438, -15.10694313049316),
+                                    P(128.0677490234375, -15.1261100769043),
+                                    P(128.0691223144531, -15.13666725158691),
+                                    P(128.0713500976563, -15.14111137390137),
+                                    P(128.0773620605469, -15.19766712188721),
+                                    P(128.0800170898438, -15.20300102233887),
+                                    P(128.0808563232422, -15.20650100708008),
+                                    P(128.0806884765625, -15.21716690063477),
+                                    P(128.0738525390625, -15.38972282409668),
+                                    P(128.0722045898438, -15.40333366394043),
+                                    P(128.0652465820313, -15.42638969421387),
+                                    P(128.0610961914063, -15.43694496154785),
+                                    P(128.0533142089844, -15.45194435119629),
+                                    P(128.0357971191406, -15.4697208404541),
+                                    P(128.0277709960938, -15.47555541992188),
+                                    P(128.0177612304688, -15.48611068725586),
+                                    P(128.01220703125, -15.49499893188477),
+                                    P(128.0136108398438, -15.5),
+                                    P(128.0199890136719, -15.50139045715332),
+                                    P(128.0258178710938, -15.50083446502686),
+                                    P(128.0435791015625, -15.49138832092285),
+                                    P(128.0632934570313, -15.47666454315186),
+                                    P(128.0746765136719, -15.46694374084473),
+                                    P(128.0816345214844, -15.45944404602051),
+                                    P(128.0905151367188, -15.44694519042969),
+                                    P(128.0938415527344, -15.44194412231445),
+                                    P(128.1002502441406, -15.42666625976563),
+                                    P(128.1058044433594, -15.40277862548828),
+                                    P(128.1138610839844, -15.34305572509766),
+                                    P(128.1188354492188, -15.29055595397949),
+                                    P(128.12841796875, -15.26572227478027),
+                                    P(128.1239013671875, -15.25822257995606),
+                                    P(128.1165771484375, -15.24888801574707),
+                                    P(128.1152496337891, -15.2462215423584),
+                                    P(128.1152496337891, -15.24255466461182),
+                                    P(128.1250762939453, -15.21738910675049),
+                                    P(128.1267395019531, -15.21472263336182),
+                                    P(128.1292419433594, -15.21288967132568),
+                                    P(128.132568359375, -15.21255493164063),
+                                    P(128.1358947753906, -15.21372222900391),
+                                    P(128.1817169189453, -15.23341083526611),
+                                    P(128.2176971435547, -15.26857757568359),
+                                    P(128.2263793945313, -15.27724361419678),
+                                    P(128.2552490234375, -15.30166625976563),
+                                    P(128.2599792480469, -15.31027793884278),
+                                    P(128.2611083984375, -15.33388900756836),
+                                    P(128.2638854980469, -15.35027694702148),
+                                    P(128.2666625976563, -15.36027717590332),
+                                    P(128.282470703125, -15.40361213684082),
+                                    P(128.2852478027344, -15.40722274780274),
+                                    P(128.2899780273438, -15.4052791595459),
+                                    P(128.2910766601563, -15.38666725158692),
+                                    P(128.2927551269531, -15.34222221374512),
+                                    P(128.2933044433594, -15.31194496154785),
+                                    P(128.29052734375, -15.29555511474609),
+                                    P(128.2874755859375, -15.28555679321289),
+                                    P(128.282470703125, -15.27666664123535),
+                                    P(128.2545928955078, -15.22939014434815),
+                                    P(128.2494354248047, -15.22588920593262),
+                                    P(128.2449340820313, -15.22205638885498),
+                                    P(128.236572265625, -15.21305465698242),
+                                    P(128.2287445068359, -15.20138835906982),
+                                    P(128.2247467041016, -15.19305515289307),
+                                    P(128.2220764160156, -15.18388938903809),
+                                    P(128.189697265625, -15.07944488525391),
+                                    P(128.1905212402344, -15.06805610656739),
+                                    P(128.1941223144531, -15.05666732788086),
+                                    P(128.2046813964844, -15.03805541992188),
+                                    P(128.216064453125, -15.02083396911621),
+                                    P(128.2255249023438, -15.00889015197754),
+                                    P(128.298583984375, -14.91888999938965),
+                                    P(128.3019104003906, -14.91527652740479),
+                                    P(128.3096923828125, -14.90916633605957),
+                                    P(128.3149719238281, -14.90777778625489),
+                                    P(128.3213500976563, -14.90805625915527),
+                                    P(128.3252563476563, -14.91111183166504),
+                                    P(128.328857421875, -14.9205551147461),
+                                    P(128.3296813964844, -14.92611122131348),
+                                    P(128.3285827636719, -14.93861198425293),
+                                    P(128.3283081054688, -14.95777702331543),
+                                    P(128.3396911621094, -15.01638984680176),
+                                    P(128.341064453125, -15.02194595336914),
+                                    P(128.3455200195313, -15.0363883972168),
+                                    P(128.3507995605469, -15.04472446441651),
+                                    P(128.3546752929688, -15.04777908325195),
+                                    P(128.361083984375, -15.04805564880371),
+                                    P(128.4369201660156, -15.05055618286133),
+                                    P(128.4485778808594, -15.0494441986084),
+                                    P(128.4524536132813, -15.04638862609863),
+                                    P(128.4552307128906, -15.0419454574585),
+                                    P(128.4610900878906, -15.01027870178223),
+                                    P(128.4602355957031, -15.00472259521484),
+                                    P(128.455810546875, -14.99583244323731),
+                                    P(128.4374694824219, -14.97222137451172),
+                                    P(128.4299621582031, -14.95944404602051),
+                                    P(128.4260864257813, -14.95083236694336),
+                                    P(128.4185791015625, -14.93194389343262),
+                                    P(128.4119262695313, -14.91250038146973),
+                                    P(128.4069213867188, -14.89666652679444),
+                                    P(128.3802490234375, -14.8086109161377),
+                                    P(128.3818969726563, -14.80249977111817),
+                                    P(128.38916015625, -14.79583358764648),
+                                    P(128.3994140625, -14.79305553436279),
+                                    P(128.51025390625, -14.76416778564453),
+                                    P(128.5302734375, -14.7591667175293),
+                                    P(128.5416564941406, -14.75777816772461),
+                                    P(128.6580200195313, -14.78250122070313),
+                                    P(128.9027709960938, -14.84027671813965),
+                                    P(128.9999694824219, -14.87107753753662),
+                                    P(129.0638732910156, -14.88750076293945),
+                                    P(129.0894165039063, -14.89944458007813),
+                                    P(129.1810913085938, -14.9738883972168),
+                                    P(129.1849670410156, -14.97777652740479),
+                                    P(129.1871948242188, -14.98166656494141),
+                                    P(129.1888732910156, -14.98666572570801),
+                                    P(129.1744079589844, -15.16250038146973),
+                                    P(129.1910705566406, -15.1825008392334),
+                                    P(129.2563781738281, -15.10416603088379),
+                                    P(129.2388610839844, -15.00638961791992),
+                                    P(129.2366333007813, -14.99666595458984),
+                                    P(129.2191162109375, -14.866943359375),
+                                    P(129.2177429199219, -14.85583305358887),
+                                    P(129.219970703125, -14.84305572509766),
+                                    P(129.2285766601563, -14.83777809143066),
+                                    P(129.2349548339844, -14.83805465698242),
+                                    P(129.3277587890625, -14.86499977111817),
+                                    P(129.3377380371094, -14.86944389343262),
+                                    P(129.4549560546875, -14.92694473266602),
+                                    P(129.4691162109375, -14.93416595458984),
+                                    P(129.4813537597656, -14.94388961791992),
+                                    P(129.4921875, -14.95416641235352),
+                                    P(129.6313018798828, -15.10750102996826),
+                                    P(129.6677551269531, -15.14916801452637),
+                                    P(129.66943359375, -15.1602783203125),
+                                    P(129.66748046875, -15.1924991607666),
+                                    P(129.6683044433594, -15.19722175598145),
+                                    P(129.6705322265625, -15.2016658782959),
+                                    P(129.6744079589844, -15.20499992370606),
+                                    P(129.6799621582031, -15.20694446563721),
+                                    P(129.6860961914063, -15.20777702331543),
+                                    P(129.7324523925781, -15.19722175598145),
+                                    P(129.7363586425781, -15.19361114501953),
+                                    P(129.7366333007813, -15.1875),
+                                    P(129.7349548339844, -15.1825008392334),
+                                    P(129.7288513183594, -15.17416763305664),
+                                    P(129.6988525390625, -15.13472366333008),
+                                    P(129.6927490234375, -15.12722206115723),
+                                    P(129.6725769042969, -15.10134696960449),
+                                    P(129.6664733886719, -15.09850025177002),
+                                    P(129.6589813232422, -15.0935001373291),
+                                    P(129.6558074951172, -15.08866596221924),
+                                    P(129.6271667480469, -15.02444458007813),
+                                    P(129.6257934570313, -15.01889038085938),
+                                    P(129.6141357421875, -14.95416641235352),
+                                    P(129.61328125, -14.94861030578614),
+                                    P(129.6141357421875, -14.9424991607666),
+                                    P(129.6364440917969, -14.90501499176025),
+                                    P(129.6438140869141, -14.87274837493897),
+                                    P(129.6419372558594, -14.84249877929688),
+                                    P(129.6438598632813, -14.83722114562989),
+                                    P(129.6483154296875, -14.83499908447266),
+                                    P(129.6552429199219, -14.83638763427734),
+                                    P(129.6972045898438, -14.8538875579834),
+                                    P(129.786376953125, -14.86499977111817),
+                                    P(129.7999877929688, -14.86527633666992),
+                                    P(129.8099670410156, -14.86277770996094),
+                                    P(129.8646850585938, -14.84305572509766),
+                                    P(129.9288635253906, -14.79000091552734),
+                                    P(129.9444274902344, -14.76777839660645),
+                                    P(129.8055419921875, -14.81500053405762),
+                                    P(129.7738647460938, -14.82361030578614),
+                                    P(129.7672119140625, -14.82333374023438),
+                                    P(129.7611083984375, -14.82194519042969),
+                                    P(129.7207946777344, -14.79805564880371),
+                                    P(129.7169189453125, -14.7955551147461),
+                                    P(129.6827392578125, -14.77222347259522),
+                                    P(129.6749877929688, -14.76638984680176),
+                                    P(129.6719055175781, -14.76277923583985),
+                                    P(129.6063537597656, -14.67861175537109),
+                                    P(129.6007995605469, -14.67027854919434),
+                                    P(129.5880126953125, -14.64277839660645),
+                                    P(129.5849609375, -14.62722206115723),
+                                    P(129.5866394042969, -14.6211109161377),
+                                    P(129.6125793457031, -14.61272239685059),
+                                    P(129.618408203125, -14.61105442047119),
+                                    P(129.6284027099609, -14.60922145843506),
+                                    P(129.6357421875, -14.60855484008789),
+                                    P(129.6475830078125, -14.609055519104),
+                                    P(129.6702423095703, -14.60922145843506),
+                                    P(129.6988525390625, -14.60416603088379),
+                                    P(129.7080078125, -14.59972190856934),
+                                    P(129.7647094726563, -14.56027793884277),
+                                    P(129.7727661132813, -14.55444526672364),
+                                    P(129.7833251953125, -14.54388999938965),
+                                    P(129.78857421875, -14.53499984741211),
+                                    P(129.7846984863281, -14.53166770935059),
+                                    P(129.7733154296875, -14.53305625915527),
+                                    P(129.7630310058594, -14.5352783203125),
+                                    P(129.7124633789063, -14.55888938903809),
+                                    P(129.6717376708984, -14.56872177124023),
+                                    P(129.6595764160156, -14.5730562210083),
+                                    P(129.6560821533203, -14.5735559463501),
+                                    P(129.6522521972656, -14.57338905334473),
+                                    P(129.5905151367188, -14.56805610656739),
+                                    P(129.5427551269531, -14.55138969421387),
+                                    P(129.5374755859375, -14.54916763305664),
+                                    P(129.4549560546875, -14.50305557250977),
+                                    P(129.359130859375, -14.42555618286133),
+                                    P(129.3577270507813, -14.41416740417481),
+                                    P(129.3585815429688, -14.40750122070313),
+                                    P(129.3702392578125, -14.33333206176758),
+                                    P(129.4305419921875, -14.22222137451172),
+                                    P(129.4924621582031, -14.1422233581543),
+                                    P(129.5810852050781, -14.08611106872559),
+                                    P(129.6891479492188, -14.0261116027832),
+                                    P(129.7035827636719, -14.02027893066406),
+                                    P(129.7080078125, -14.01777839660645),
+                                    P(129.7196960449219, -14.00889015197754),
+                                    P(129.7327270507813, -13.99472236633301),
+                                    P(129.7466125488281, -13.96416664123535),
+                                    P(129.7874755859375, -13.74416542053223),
+                                    P(129.7819213867188, -13.71055603027344),
+                                    P(129.7819213867188, -13.69888877868653),
+                                    P(129.7827453613281, -13.69222259521484),
+                                    P(129.78857421875, -13.6680555343628),
+                                    P(129.8274536132813, -13.51944541931152),
+                                    P(129.8302612304688, -13.51444625854492),
+                                    P(129.8861083984375, -13.44527816772461),
+                                    P(129.8941345214844, -13.43944358825684),
+                                    P(129.8997192382813, -13.43888854980469),
+                                    P(129.9027709960938, -13.44333267211914),
+                                    P(129.9041442871094, -13.44833374023438),
+                                    P(129.9038696289063, -13.49694442749024),
+                                    P(129.9069213867188, -13.50694465637207),
+                                    P(129.9136047363281, -13.51388931274414),
+                                    P(129.9382934570313, -13.52555656433106),
+                                    P(129.9499816894531, -13.52916717529297),
+                                    P(129.9638671875, -13.53083419799805),
+                                    P(129.986083984375, -13.52777862548828),
+                                    P(130, -13.52474784851074),
+                                    P(130.0277709960938, -13.51694488525391),
+                                    P(130.0374755859375, -13.51250076293945),
+                                    P(130.0497131347656, -13.50500106811524),
+                                    P(130.1149597167969, -13.46249961853027),
+                                    P(130.1641540527344, -13.42916679382324),
+                                    P(130.2644348144531, -13.32527732849121),
+                                    P(130.2546997070313, -13.28805541992188),
+                                    P(130.1966247558594, -13.20972347259522),
+                                    P(130.1874694824219, -13.19833374023438),
+                                    P(130.1730346679688, -13.18444442749023),
+                                    P(130.1605224609375, -13.17611122131348),
+                                    P(130.1552429199219, -13.17361068725586),
+                                    P(130.1427612304688, -13.17138862609864),
+                                    P(130.13134765625, -13.17277717590332),
+                                    P(130.1243896484375, -13.17194557189941),
+                                    P(130.121337890625, -13.16833305358887),
+                                    P(130.1191101074219, -13.16388893127441),
+                                    P(130.1160583496094, -13.15388870239258),
+                                    P(130.1155090332031, -13.14138984680176),
+                                    P(130.1155090332031, -13.06666564941406),
+                                    P(130.1241149902344, -12.97360992431641),
+                                    P(130.1249694824219, -12.96694374084473),
+                                    P(130.1358032226563, -12.93388938903809),
+                                    P(130.1408081054688, -12.92416763305664),
+                                    P(130.1430969238281, -12.92282104492188),
+                                    P(130.1744079589844, -12.90750122070313),
+                                    P(130.1794128417969, -12.90611076354981),
+                                    P(130.1855163574219, -12.90750122070313),
+                                    P(130.1894226074219, -12.91055679321289),
+                                    P(130.1902465820313, -12.92250061035156),
+                                    P(130.1930236816406, -12.93222236633301),
+                                    P(130.1960754394531, -12.93611145019531),
+                                    P(130.2046813964844, -12.9424991607666),
+                                    P(130.2099609375, -12.94444465637207),
+                                    P(130.2230224609375, -12.94750022888184),
+                                    P(130.2349548339844, -12.94750022888184),
+                                    P(130.256103515625, -12.9416675567627),
+                                    P(130.270263671875, -12.93583297729492),
+                                    P(130.2869262695313, -12.92527770996094),
+                                    P(130.3030395507813, -12.91500091552735),
+                                    P(130.3224792480469, -12.89916801452637),
+                                    P(130.3327331542969, -12.88888931274414),
+                                    P(130.3407897949219, -12.8761100769043),
+                                    P(130.3488464355469, -12.85499954223633),
+                                    P(130.3538513183594, -12.83777809143066),
+                                    P(130.3546752929688, -12.83111190795898),
+                                    P(130.3560791015625, -12.75444602966309),
+                                    P(130.3560791015625, -12.74277687072754),
+                                    P(130.3546752929688, -12.73777770996094),
+                                    P(130.3485717773438, -12.72416687011719),
+                                    P(130.3438415527344, -12.70916557312012),
+                                    P(130.3441162109375, -12.70305442810059),
+                                    P(130.35302734375, -12.67527770996094),
+                                    P(130.3558044433594, -12.67000007629395),
+                                    P(130.4993896484375, -12.60305404663086),
+                                    P(130.5049743652344, -12.60222244262695),
+                                    P(130.5119323730469, -12.60305404663086),
+                                    P(130.5197143554688, -12.60944366455078),
+                                    P(130.5518188476563, -12.65622234344482),
+                                    P(130.5544738769531, -12.66138935089111),
+                                    P(130.5563049316406, -12.66788864135742),
+                                    P(130.5977478027344, -12.70666694641113),
+                                    P(130.6038513183594, -12.70805454254151),
+                                    P(130.62744140625, -12.7108325958252),
+                                    P(130.6691284179688, -12.70999908447266),
+                                    P(130.6860961914063, -12.70777702331543),
+                                    P(130.6913452148438, -12.7055549621582),
+                                    P(130.6952514648438, -12.70249938964844),
+                                    P(130.6944274902344, -12.69694519042969),
+                                    P(130.6899719238281, -12.69444465637207),
+                                    P(130.6444396972656, -12.68111228942871),
+                                    P(130.6041259765625, -12.67666625976563),
+                                    P(130.5869598388672, -12.62983322143555),
+                                    P(130.5733032226563, -12.58250045776367),
+                                    P(130.5733032226563, -12.57583236694336),
+                                    P(130.5746765136719, -12.57055473327637),
+                                    P(130.580810546875, -12.55472183227539),
+                                    P(130.591064453125, -12.53472328186035),
+                                    P(130.5997009277344, -12.51500129699707),
+                                    P(130.6049499511719, -12.49860954284668),
+                                    P(130.6177368164063, -12.43277740478516),
+                                    P(130.6146850585938, -12.42916679382324),
+                                    P(130.6102294921875, -12.42666625976563),
+                                    P(130.5946960449219, -12.42000007629395),
+                                    P(130.5802612304688, -12.41222190856934),
+                                    P(130.5771789550781, -12.40833473205566),
+                                    P(130.5766296386719, -12.40277862548828),
+                                    P(130.5830383300781, -12.39527893066406),
+                                    P(130.5869140625, -12.39249992370606),
+                                    P(130.6016235351563, -12.38722229003906),
+                                    P(130.6194152832031, -12.38500022888184),
+                                    P(130.6374816894531, -12.38527870178223),
+                                    P(130.6560974121094, -12.38916778564453),
+                                    P(130.7649841308594, -12.42749977111816),
+                                    P(130.7758178710938, -12.43166732788086),
+                                    P(130.8963623046875, -12.64027786254883),
+                                    P(130.8966369628906, -12.60750007629395),
+                                    P(130.9541320800781, -12.5363883972168),
+                                    P(130.8566284179688, -12.45972347259522),
+                                    P(130.8533020019531, -12.4636116027832),
+                                    P(130.8488464355469, -12.46583366394043),
+                                    P(130.8319091796875, -12.46055603027344),
+                                    P(130.8157958984375, -12.44777870178223),
+                                    P(130.8157958984375, -12.4416675567627),
+                                    P(130.8258056640625, -12.4063892364502),
+                                    P(130.844970703125, -12.37416553497315),
+                                    P(130.8493957519531, -12.37194442749023),
+                                    P(130.8858032226563, -12.35416603088379),
+                                    P(130.9230346679688, -12.34749984741211),
+                                    P(130.9291381835938, -12.3488883972168),
+                                    P(130.9794006347656, -12.35527801513672),
+                                    P(131.0269165039063, -12.35833358764649),
+                                    P(131.0361022949219, -12.3266658782959),
+                                    P(131.0299682617188, -12.25333404541016),
+                                    P(131.0277709960938, -12.24222183227539),
+                                    P(131.0238647460938, -12.23361015319824),
+                                    P(131.0111083984375, -12.21777725219727),
+                                    P(131.0038757324219, -12.21138954162598),
+                                    P(130.9993896484375, -12.20333290100098),
+                                    P(130.9977416992188, -12.19833374023438),
+                                    P(130.9969177246094, -12.19277763366699),
+                                    P(131, -12.18083381652832),
+                                    P(131.0058288574219, -12.16500091552734),
+                                    P(131.0105285644531, -12.1552791595459),
+                                    P(131.0177612304688, -12.14861106872559),
+                                    P(131.0271911621094, -12.1455545425415),
+                                    P(131.0333251953125, -12.1455545425415),
+                                    P(131.1055297851563, -12.14944458007813),
+                                    P(131.1119079589844, -12.15083312988281),
+                                    P(131.1194152832031, -12.15722274780273),
+                                    P(131.1727600097656, -12.19333267211914),
+                                    P(131.2132873535156, -12.21749877929688),
+                                    P(131.3441162109375, -12.22360992431641),
+                                    P(131.3707885742188, -12.24777793884277),
+                                    P(131.4077453613281, -12.27444458007813),
+                                    P(131.4213562011719, -12.28194427490235),
+                                    P(131.4313659667969, -12.28722190856934),
+                                    P(131.4413452148438, -12.29111099243164),
+                                    P(131.4530334472656, -12.2944450378418),
+                                    P(131.4669189453125, -12.29583358764649),
+                                    P(131.4863586425781, -12.29722213745117),
+                                    P(131.4988403320313, -12.29722213745117),
+                                    P(131.675537109375, -12.28833389282227),
+                                    P(131.72802734375, -12.28361129760742),
+                                    P(131.7449645996094, -12.2813892364502),
+                                    P(131.7663879394531, -12.27694511413574),
+                                    P(131.782470703125, -12.27250099182129),
+                                    P(131.9291381835938, -12.26666641235352),
+                                    P(131.9338684082031, -12.26944541931152),
+                                    P(131.9752502441406, -12.28666687011719),
+                                    P(132.0491333007813, -12.30888938903809),
+                                    P(132.0621948242188, -12.31083297729492),
+                                    P(132.0674743652344, -12.30944442749023),
+                                    P(132.0718994140625, -12.30722236633301),
+                                    P(132.2235717773438, -12.19999885559082),
+                                    P(132.3535766601563, -12.2005558013916),
+                                    P(132.3602294921875, -12.2016658782959),
+                                    P(132.3649597167969, -12.20361137390137),
+                                    P(132.3787231445313, -12.22488975524902),
+                                    P(132.3895874023438, -12.23788833618164),
+                                    P(132.4130249023438, -12.28916740417481),
+                                    P(132.4202575683594, -12.30777740478516),
+                                    P(132.4197082519531, -12.31388854980469),
+                                    P(132.4163818359375, -12.31777763366699),
+                                    P(132.4035949707031, -12.32527732849121),
+                                    P(132.3997192382813, -12.32888793945313),
+                                    P(132.393310546875, -12.33638763427734),
+                                    P(132.3883056640625, -12.34472274780273),
+                                    P(132.3844299316406, -12.35527801513672),
+                                    P(132.3836059570313, -12.36222076416016),
+                                    P(132.3836059570313, -12.3799991607666),
+                                    P(132.3991394042969, -12.36638832092285),
+                                    P(132.4132995605469, -12.35361099243164),
+                                    P(132.4363708496094, -12.32777786254883),
+                                    P(132.4388732910156, -12.32333374023438),
+                                    P(132.4447021484375, -12.30833435058594),
+                                    P(132.4447021484375, -12.29583358764649),
+                                    P(132.4366912841797, -12.25888919830322),
+                                    P(132.4320373535156, -12.24772357940674),
+                                    P(132.42919921875, -12.23888874053955),
+                                    P(132.4268493652344, -12.2295560836792),
+                                    P(132.4266967773438, -12.22255516052246),
+                                    P(132.4238586425781, -12.18861198425293),
+                                    P(132.4252624511719, -12.1825008392334),
+                                    P(132.4330444335938, -12.16222190856934),
+                                    P(132.4421997070313, -12.14999961853028),
+                                    P(132.4466247558594, -12.14638900756836),
+                                    P(132.4555358886719, -12.14249992370606),
+                                    P(132.5766296386719, -12.10111045837403),
+                                    P(132.5796813964844, -12.10472106933594),
+                                    P(132.5882873535156, -12.11111068725586),
+                                    P(132.6021728515625, -12.11805534362793),
+                                    P(132.6074523925781, -12.11999893188477),
+                                    P(132.6827392578125, -12.14055633544922),
+                                    P(132.7083129882813, -12.14583396911621),
+                                    P(132.7152404785156, -12.14638900756836),
+                                    P(132.7207946777344, -12.14583396911621),
+                                    P(132.7421875, -12.14111137390137),
+                                    P(132.7510986328125, -12.13638877868652),
+                                    P(132.7544250488281, -12.13277626037598),
+                                    P(132.748291015625, -12.13138771057129),
+                                    P(132.7171936035156, -12.13249969482422),
+                                    P(132.7105102539063, -12.13166618347168),
+                                    P(132.705810546875, -12.12916564941406),
+                                    P(132.647216796875, -12.08916664123535),
+                                    P(132.6394348144531, -12.08277702331543),
+                                    P(132.6363830566406, -12.07833290100098),
+                                    P(132.6307983398438, -12.06416702270508),
+                                    P(132.6277465820313, -12.0419454574585),
+                                    P(132.62744140625, -12.02361106872559),
+                                    P(132.6246643066406, -11.80888938903809),
+                                    P(132.6349792480469, -11.74499893188477),
+                                    P(132.6463623046875, -11.72833347320557),
+                                    P(132.6919250488281, -11.66139030456543),
+                                    P(132.6910705566406, -11.65500068664551),
+                                    P(132.6602478027344, -11.63694572448731),
+                                    P(132.6558227539063, -11.63444519042969),
+                                    P(132.5402526855469, -11.54750061035156),
+                                    P(132.4899597167969, -11.47694396972656),
+                                    P(132.4616394042969, -11.45638847351074),
+                                    P(132.4516296386719, -11.45194435119629),
+                                    P(132.4402465820313, -11.44861030578614),
+                                    P(132.3963623046875, -11.44083404541016),
+                                    P(132.3757934570313, -11.43777847290039),
+                                    P(132.3696899414063, -11.43777847290039),
+                                    P(132.2371826171875, -11.45888900756836),
+                                    P(132.2218933105469, -11.46361160278321),
+                                    P(132.1647033691406, -11.4908332824707),
+                                    P(132.1602478027344, -11.49333190917969),
+                                    P(132.1058044433594, -11.52639007568359),
+                                    P(132.0924682617188, -11.52639007568359),
+                                    P(132.0810852050781, -11.52305603027344),
+                                    P(132.0718994140625, -11.51861190795898),
+                                    P(132.0641479492188, -11.51250076293945),
+                                    P(132.0571899414063, -11.50555610656738),
+                                    P(131.990234375, -11.42972183227539),
+                                    P(131.9652404785156, -11.37916564941406),
+                                    P(131.9696960449219, -11.37694358825684),
+                                    P(131.9730224609375, -11.37305545806885),
+                                    P(131.9743957519531, -11.36722183227539),
+                                    P(131.97412109375, -11.36111068725586),
+                                    P(131.9727478027344, -11.35610961914063),
+                                    P(131.9696960449219, -11.35222244262696),
+                                    P(131.9657897949219, -11.34916687011719),
+                                    P(131.9027709960938, -11.32277679443359),
+                                    P(131.8721923828125, -11.30999946594238),
+                                    P(131.8583068847656, -11.30833435058594),
+                                    P(131.8303833007813, -11.31320762634277),
+                                    P(131.8055419921875, -11.32055473327637),
+                                    P(131.78857421875, -11.32277679443359),
+                                    P(131.7821960449219, -11.32277679443359),
+                                    P(131.7708129882813, -11.31944465637207),
+                                    P(131.7669372558594, -11.31638908386231),
+                                    P(131.7638854980469, -11.31194496154785),
+                                    P(131.7642669677734, -11.3066873550415),
+                                    P(131.7727661132813, -11.29527854919434),
+                                    P(131.8741149902344, -11.17722320556641),
+                                    P(131.9743957519531, -11.12694358825684),
+                                    P(131.9799499511719, -11.12555503845215),
+                                    P(131.986083984375, -11.12638854980469),
+                                    P(131.9969177246094, -11.13083267211914),
+                                    P(132.0052490234375, -11.13583374023438),
+                                    P(132.0902404785156, -11.22999954223633),
+                                    P(132.1549682617188, -11.39638900756836),
+                                    P(132.1647033691406, -11.40777778625489),
+                                    P(132.16943359375, -11.4102783203125),
+                                    P(132.1746826171875, -11.41139030456543),
+                                    P(132.19970703125, -11.41277885437012),
+                                    P(132.2046813964844, -11.41111183166504),
+                                    P(132.2077331542969, -11.40750122070313),
+                                    P(132.2355041503906, -11.35833358764648),
+                                    P(132.2355041503906, -11.35222244262696),
+                                    P(132.1924743652344, -11.22222137451172),
+                                    P(132.1702575683594, -11.19138908386231),
+                                    P(132.1480407714844, -11.15888977050781),
+                                    P(132.1458129882813, -11.15472221374512),
+                                    P(132.1419372558594, -11.14472389221191),
+                                    P(132.1419372558594, -11.13916778564453),
+                                    P(132.143310546875, -11.13333320617676),
+                                    P(132.1469421386719, -11.13027763366699),
+                                    P(132.1527709960938, -11.12944412231445),
+                                    P(132.1783142089844, -11.13083267211914),
+                                    P(132.1841430664063, -11.13277626037598),
+                                    P(132.2699890136719, -11.16777801513672),
+                                    P(132.2821960449219, -11.15944480895996),
+                                    P(132.3374633789063, -11.12916564941406),
+                                    P(132.3435668945313, -11.13111114501953),
+                                    P(132.4585876464844, -11.21805572509766),
+                                    P(132.5019226074219, -11.26250076293945),
+                                    P(132.5049743652344, -11.26638984680176),
+                                    P(132.5133056640625, -11.30527877807617),
+                                    P(132.5138854980469, -11.31166553497315),
+                                    P(132.6449890136719, -11.48472213745117),
+                                    P(132.6544189453125, -11.49583244323731),
+                                    P(132.6658020019531, -11.50527954101563),
+                                    P(132.6705322265625, -11.50777816772461),
+                                    P(132.6758117675781, -11.50972366333008),
+                                    P(132.7163696289063, -11.52250099182129),
+                                    P(132.7224731445313, -11.52250099182129),
+                                    P(132.7313537597656, -11.51805686950684),
+                                    P(132.7352294921875, -11.51500129699707),
+                                    P(132.7724914550781, -11.48388862609863),
+                                    P(132.8341369628906, -11.40027809143066),
+                                    P(132.8721923828125, -11.34860992431641),
+                                    P(132.8682861328125, -11.33944320678711),
+                                    P(132.8696899414063, -11.33361053466797),
+                                    P(132.8730163574219, -11.32972145080566),
+                                    P(132.8785705566406, -11.32888793945313),
+                                    P(132.9180297851563, -11.33694458007813),
+                                    P(132.9424743652344, -11.3619441986084),
+                                    P(132.9921875, -11.41388893127441),
+                                    P(133.0008239746094, -11.42555618286133),
+                                    P(133.0519104003906, -11.50250053405762),
+                                    P(133.0710754394531, -11.54583358764649),
+                                    P(133.0718994140625, -11.5575008392334),
+                                    P(133.0749816894531, -11.56805610656738),
+                                    P(133.09912109375, -11.61083221435547),
+                                    P(133.1419372558594, -11.68194389343262),
+                                    P(133.1505432128907, -11.69361114501953),
+                                    P(133.1580200195313, -11.7005558013916),
+                                    P(133.1658020019531, -11.70666694641113),
+                                    P(133.1830444335938, -11.71666526794434),
+                                    P(133.2044067382813, -11.72500038146973),
+                                    P(133.23828125, -11.73499870300293),
+                                    P(133.2513732910156, -11.7369441986084),
+                                    P(133.3074645996094, -11.69944381713867),
+                                    P(133.3374633789063, -11.69027709960938),
+                                    P(133.3482971191407, -11.68777847290039),
+                                    P(133.3574523925781, -11.69361114501953),
+                                    P(133.3621826171875, -11.70138931274414),
+                                    P(133.3630065917969, -11.70694446563721),
+                                    P(133.361083984375, -11.71222114562988),
+                                    P(133.4071960449219, -11.77416801452637),
+                                    P(133.5488586425781, -11.83277702331543),
+                                    P(133.6135864257813, -11.83499908447266),
+                                    P(133.6199645996094, -11.83416557312012),
+                                    P(133.6652526855469, -11.81944465637207),
+                                    P(133.7580261230469, -11.77027893066406),
+                                    P(133.7663879394531, -11.76500129699707),
+                                    P(133.7808227539063, -11.75277900695801),
+                                    P(133.786376953125, -11.74444389343262),
+                                    P(133.7972106933594, -11.71944427490234),
+                                    P(133.8016357421875, -11.71722221374512),
+                                    P(133.8321838378906, -11.71749877929688),
+                                    P(133.9083251953125, -11.73611068725586),
+                                    P(133.91943359375, -11.7672233581543),
+                                    P(133.8538513183594, -11.80333328247071),
+                                    P(133.8463439941406, -11.80888938903809),
+                                    P(133.8380126953125, -11.8216667175293),
+                                    P(133.8352355957031, -11.82694435119629),
+                                    P(133.8335876464844, -11.83222198486328),
+                                    P(133.8327331542969, -11.83833312988281),
+                                    P(133.8330383300782, -11.84361076354981),
+                                    P(133.8369140625, -11.85361099243164),
+                                    P(133.8438415527344, -11.85972213745117),
+                                    P(133.8710632324219, -11.88277626037598),
+                                    P(133.9288635253906, -11.91083335876465),
+                                    P(133.939697265625, -11.91388893127441),
+                                    P(133.9510803222656, -11.91222190856934),
+                                    P(133.9877319335938, -11.89444541931152),
+                                    P(133.9957885742188, -11.88916778564453),
+                                    P(133.9996948242188, -11.88611221313477),
+                                    P(134.0091552734375, -11.8761100769043),
+                                    P(134.01416015625, -11.866943359375),
+                                    P(134.0160827636719, -11.86166572570801),
+                                    P(134.0216369628906, -11.85249900817871),
+                                    P(134.0330505371094, -11.84333229064941),
+                                    P(134.0449829101563, -11.84249877929688),
+                                    P(134.0558166503906, -11.84638786315918),
+                                    P(134.1855163574219, -11.94638824462891),
+                                    P(134.1738586425781, -11.96583366394043),
+                                    P(134.187744140625, -12.04611206054688),
+                                    P(134.2066345214844, -12.06166553497315),
+                                    P(134.3699645996094, -12.03777885437012),
+                                    P(134.3947143554688, -12.05027770996094),
+                                    P(134.4149780273438, -12.0575008392334),
+                                    P(134.4271850585938, -12.05999946594238),
+                                    P(134.4852294921875, -12.06722259521484),
+                                    P(134.5038757324219, -12.06777763366699),
+                                    P(134.5160827636719, -12.06666564941406),
+                                    P(134.5985717773438, -12.05638885498047),
+                                    P(134.6658020019531, -12.00861167907715),
+                                    P(134.6727600097656, -12.00166702270508),
+                                    P(134.6760864257813, -11.99722099304199),
+                                    P(134.7705383300781, -11.99333190917969),
+                                    P(134.772216796875, -11.99833297729492),
+                                    P(134.8013610839844, -12.04333305358887),
+                                    P(134.8588562011719, -12.12416553497315),
+                                    P(134.8657836914063, -12.13083267211914),
+                                    P(134.8705139160156, -12.13333320617676),
+                                    P(134.8874816894531, -12.13833427429199),
+                                    P(134.9069213867188, -12.14138984680176),
+                                    P(134.9971923828125, -12.19638824462891),
+                                    P(135.0838623046875, -12.26666641235352),
+                                    P(135.1924743652344, -12.27694511413574),
+                                    P(135.2313537597656, -12.2944450378418),
+                                    P(135.22607421875, -12.27555656433106),
+                                    P(135.2419128417969, -12.2238883972168),
+                                    P(135.2669372558594, -12.17194557189941),
+                                    P(135.3283081054688, -12.11166572570801),
+                                    P(135.3796691894531, -12.09027671813965),
+                                    P(135.4088745117188, -12.09277725219727),
+                                    P(135.4241333007813, -12.09944343566895),
+                                    P(135.4224853515625, -12.10472106933594),
+                                    P(135.4224853515625, -12.11111068725586),
+                                    P(135.4271850585938, -12.11416625976563),
+                                    P(135.4324645996094, -12.1158332824707),
+                                    P(135.44580078125, -12.11555480957031),
+                                    P(135.5860900878906, -12.09833335876465),
+                                    P(135.6563720703125, -12.05222320556641),
+                                    P(135.6602478027344, -12.04916763305664),
+                                    P(135.6632995605469, -12.04527854919434),
+                                    P(135.6658020019531, -12.04083442687989),
+                                    P(135.6672058105469, -12.03472328186035),
+                                    P(135.6660766601563, -12.02861213684082),
+                                    P(135.6638793945313, -12.02500152587891),
+                                    P(135.6591491699219, -12.02194595336914),
+                                    P(135.6535949707031, -12.02083396911621),
+                                    P(135.6422119140625, -12.02250099182129),
+                                    P(135.63720703125, -12.02416801452637),
+                                    P(135.6241149902344, -12.03111267089844),
+                                    P(135.6121826171875, -12.03972244262696),
+                                    P(135.5902404785156, -12.05916595458984),
+                                    P(135.5860900878906, -12.06083297729492),
+                                    P(135.5796813964844, -12.05944442749024),
+                                    P(135.5741271972656, -12.05166625976563),
+                                    P(135.5724792480469, -12.04666709899903),
+                                    P(135.5716247558594, -12.03499984741211),
+                                    P(135.5722045898438, -12.02833366394043),
+                                    P(135.5733032226563, -12.02222347259522),
+                                    P(135.5902404785156, -11.9636116027832),
+                                    P(135.5921936035156, -11.95833396911621),
+                                    P(135.5952453613281, -11.95444488525391),
+                                    P(135.685791015625, -11.93333244323731),
+                                    P(135.705810546875, -11.93499946594238),
+                                    P(135.7110900878906, -11.93694496154785),
+                                    P(135.7296752929688, -11.94055557250977),
+                                    P(135.7366333007813, -11.94111061096192),
+                                    P(135.7471923828125, -11.93861198425293),
+                                    P(135.7598876953125, -11.93149852752686),
+                                    P(135.8380126953125, -11.87249946594238),
+                                    P(135.8724670410156, -11.84611129760742),
+                                    P(135.8791198730469, -11.83916664123535),
+                                    P(135.8841552734375, -11.82999992370606),
+                                    P(135.8861083984375, -11.82472229003906),
+                                    P(135.8905334472656, -11.80666732788086),
+                                    P(135.8863830566406, -11.79750061035156),
+                                    P(135.8791198730469, -11.79083442687988),
+                                    P(135.8730163574219, -11.78333282470703),
+                                    P(135.8705139160156, -11.77916717529297),
+                                    P(135.8688354492188, -11.77416801452637),
+                                    P(135.8685607910156, -11.76805686950684),
+                                    P(135.8710632324219, -11.76361274719239),
+                                    P(135.8749694824219, -11.76027870178223),
+                                    P(135.8799438476563, -11.758056640625),
+                                    P(135.8849792480469, -11.75722312927246),
+                                    P(135.8919372558594, -11.75777816772461),
+                                    P(135.9080200195313, -11.7630558013916),
+                                    P(135.91748046875, -11.76805686950684),
+                                    P(135.9291381835938, -11.77722358703613),
+                                    P(135.941650390625, -11.79249954223633),
+                                    P(135.9466247558594, -11.80111122131348),
+                                    P(135.9466247558594, -11.80722236633301),
+                                    P(135.9163818359375, -11.85249900817871),
+                                    P(135.8555297851563, -11.89444541931152),
+                                    P(135.7449645996094, -11.98138809204102),
+                                    P(135.7419128417969, -11.98527717590332),
+                                    P(135.7399597167969, -11.99055480957031),
+                                    P(135.740234375, -11.99666595458984),
+                                    P(135.7441101074219, -11.99972152709961),
+                                    P(135.7563781738281, -12.00139045715332),
+                                    P(135.7882995605469, -12.04361152648926),
+                                    P(135.6802673339844, -12.14833545684815),
+                                    P(135.6738586425781, -12.15611076354981),
+                                    P(135.6713562011719, -12.16083335876465),
+                                    P(135.6683044433594, -12.17277717590332),
+                                    P(135.6685791015625, -12.18499946594238),
+                                    P(135.6697082519531, -12.1966667175293),
+                                    P(135.6722106933594, -12.20722198486328),
+                                    P(135.6771850585938, -12.22194480895996),
+                                    P(135.6852416992188, -12.23416519165039),
+                                    P(135.6921997070313, -12.2408332824707),
+                                    P(135.7355041503906, -12.28083419799805),
+                                    P(135.784423828125, -12.26444625854492),
+                                    P(135.7882995605469, -12.25305557250977),
+                                    P(135.7949829101563, -12.23111152648926),
+                                    P(135.8010864257813, -12.21666526794434),
+                                    P(135.8044128417969, -12.21277809143066),
+                                    P(135.88134765625, -12.15305519104004),
+                                    P(135.8858032226563, -12.15055656433106),
+                                    P(136.0230407714844, -12.1119441986084),
+                                    P(135.9419250488281, -12.1966667175293),
+                                    P(135.9360961914063, -12.20583343505859),
+                                    P(135.9349670410156, -12.21138954162598),
+                                    P(135.9352416992188, -12.21749877929688),
+                                    P(135.9391479492188, -12.22666454315186),
+                                    P(135.9632873535156, -12.26416778564453),
+                                    P(135.9671936035156, -12.2672233581543),
+                                    P(135.9718933105469, -12.26944541931152),
+                                    P(135.9849548339844, -12.27000045776367),
+                                    P(135.9907836914063, -12.26889038085938),
+                                    P(135.9966125488281, -12.26666641235352),
+                                    P(136.0002746582031, -12.26444625854492),
+                                    P(136.0072021484375, -12.25666809082031),
+                                    P(136.0119323730469, -12.24888801574707),
+                                    P(136.0194396972656, -12.24277687072754),
+                                    P(136.0327453613281, -12.23499870300293),
+                                    P(136.0427551269531, -12.23166656494141),
+                                    P(136.0491333007813, -12.23222160339356),
+                                    P(136.0591430664063, -12.23722076416016),
+                                    P(136.0655212402344, -12.24444389343262),
+                                    P(136.0671997070313, -12.25611114501953),
+                                    P(136.066650390625, -12.26222229003906),
+                                    P(136.0641479492188, -12.26694488525391),
+                                    P(136.0610961914063, -12.27083396911621),
+                                    P(135.9921875, -12.3577766418457),
+                                    P(135.9827270507813, -12.36861038208008),
+                                    P(135.9810791015625, -12.37388801574707),
+                                    P(135.9805297851563, -12.38083267211914),
+                                    P(135.982177734375, -12.38555717468262),
+                                    P(136.0105285644531, -12.44472312927246),
+                                    P(136.0341491699219, -12.4697208404541),
+                                    P(136.0397033691406, -12.47166633605957)};
 
-} // namespace LargePolygon
+}  // namespace LargePolygon
diff --git a/libs/geometry/geometry_tests/latlon_test.cpp b/libs/geometry/geometry_tests/latlon_test.cpp
index 8d9cc69c4..a85146817 100644
--- a/libs/geometry/geometry_tests/latlon_test.cpp
+++ b/libs/geometry/geometry_tests/latlon_test.cpp
@@ -1,7 +1,7 @@
-#include "testing/testing.hpp"
 #include "geometry/latlon.hpp"
-#include "geometry/point2d.hpp"
 #include "geometry/mercator.hpp"
+#include "geometry/point2d.hpp"
+#include "testing/testing.hpp"
 
 UNIT_TEST(LatLonPointConstructorTest)
 {
diff --git a/libs/geometry/geometry_tests/mercator_test.cpp b/libs/geometry/geometry_tests/mercator_test.cpp
index 6da4c5aee..99ada5c68 100644
--- a/libs/geometry/geometry_tests/mercator_test.cpp
+++ b/libs/geometry/geometry_tests/mercator_test.cpp
@@ -2,10 +2,9 @@
 
 #include "geometry/mercator.hpp"
 
-#include "base/math.hpp"
-#include "base/macros.hpp"
 #include "base/logging.hpp"
-
+#include "base/macros.hpp"
+#include "base/math.hpp"
 
 UNIT_TEST(Mercator_Grid)
 {
@@ -45,7 +44,7 @@ UNIT_TEST(Mercator_DirectInferseF)
 
 UNIT_TEST(Mercator_ErrorToRadius)
 {
-  double const points[] = { -85.0, -45.0, -10.0, -1.0, -0.003, 0.0, 0.003, 1.0, 10.0, 45.0, 85.0 };
+  double const points[] = {-85.0, -45.0, -10.0, -1.0, -0.003, 0.0, 0.003, 1.0, 10.0, 45.0, 85.0};
 
   double const error1 = 1.0;    // 1 metre
   double const error10 = 10.0;  // 10 metres
@@ -78,6 +77,5 @@ UNIT_TEST(Mercator_ErrorToRadius)
 
 UNIT_TEST(Mercator_Sample1)
 {
-  LOG(LINFO, (mercator::XToLon(27.531491200000001385),
-              mercator::YToLat(64.392864299248202542)));
+  LOG(LINFO, (mercator::XToLon(27.531491200000001385), mercator::YToLat(64.392864299248202542)));
 }
diff --git a/libs/geometry/geometry_tests/nearby_points_sweeper_test.cpp b/libs/geometry/geometry_tests/nearby_points_sweeper_test.cpp
index 33a023141..d23624004 100644
--- a/libs/geometry/geometry_tests/nearby_points_sweeper_test.cpp
+++ b/libs/geometry/geometry_tests/nearby_points_sweeper_test.cpp
@@ -68,8 +68,7 @@ UNIT_TEST(NearbyPointsSweeper_Smoke)
 
   {
     uint8_t const priority = 0;
-    vector<PointD> const points = {PointD(0.0, 0.0), PointD(1.0, 1.0),
-                                   PointD(1.5, 0.0), PointD(1.5 + 1.01, 1.5 + 1.0)};
+    vector<PointD> const points = {PointD(0.0, 0.0), PointD(1.0, 1.0), PointD(1.5, 0.0), PointD(1.5 + 1.01, 1.5 + 1.0)};
     NearbyPointsSweeper sweeper(1.0);
 
     for (size_t i = 0; i < points.size(); ++i)
@@ -85,9 +84,8 @@ UNIT_TEST(NearbyPointsSweeper_Smoke)
 
   {
     uint8_t const priority = 0;
-    vector<PointD> const points = {PointD(0, 0),     PointD(0, 0), PointD(1, 0),
-                                   PointD(0, 1),     PointD(1, 1), PointD(1, 0),
-                                   PointD(0.5, 0.5), PointD(0, 1)};
+    vector<PointD> const points = {PointD(0, 0), PointD(0, 0), PointD(1, 0),     PointD(0, 1),
+                                   PointD(1, 1), PointD(1, 0), PointD(0.5, 0.5), PointD(0, 1)};
 
     NearbyPointsSweeper sweeper(10.0);
     for (size_t i = 0; i < points.size(); ++i)
@@ -130,8 +128,8 @@ UNIT_TEST(NearbyPointsSweeper_Priority)
     TEST_EQUAL(expected, actual, ());
   }
   {
-    vector<pair<PointD, uint8_t>> const objects = {{PointD(0.0, 0.0), 0}, {PointD(1.0, 1.0), 1},
-                                                   {PointD(1.5, 0.0), 0}, {PointD(1.5 + 1.01, 1.5 + 1.0), 0}};
+    vector<pair<PointD, uint8_t>> const objects = {
+        {PointD(0.0, 0.0), 0}, {PointD(1.0, 1.0), 1}, {PointD(1.5, 0.0), 0}, {PointD(1.5 + 1.01, 1.5 + 1.0), 0}};
     NearbyPointsSweeper sweeper(1.0);
 
     for (size_t i = 0; i < objects.size(); ++i)
diff --git a/libs/geometry/geometry_tests/oblate_spheroid_tests.cpp b/libs/geometry/geometry_tests/oblate_spheroid_tests.cpp
index 4ef905ee3..37b7dcd61 100644
--- a/libs/geometry/geometry_tests/oblate_spheroid_tests.cpp
+++ b/libs/geometry/geometry_tests/oblate_spheroid_tests.cpp
@@ -12,7 +12,7 @@ void testDistance(ms::LatLon const & a, ms::LatLon const & b, double planDistanc
   double const factDistance = oblate_spheroid::GetDistance(a, b);
   TEST_ALMOST_EQUAL_ABS(factDistance, planDistance, kAccuracyEps, ());
 }
-}
+}  // namespace
 
 UNIT_TEST(Distance_EdgeCaseEquatorialLine)
 {
diff --git a/libs/geometry/geometry_tests/packer_test.cpp b/libs/geometry/geometry_tests/packer_test.cpp
index 804d694e6..51a593985 100644
--- a/libs/geometry/geometry_tests/packer_test.cpp
+++ b/libs/geometry/geometry_tests/packer_test.cpp
@@ -36,15 +36,15 @@ UNIT_TEST(PackerTest_SimplePack)
 
   m2::Packer::handle_t h2 = p.pack(5, 5);
 
-// Possibly we should restore this checks
+  // Possibly we should restore this checks
 
-//  TEST_EQUAL(p.isPacked(h0), false, ());
-//  TEST_EQUAL(p.isPacked(h1), false, ());
+  //  TEST_EQUAL(p.isPacked(h0), false, ());
+  //  TEST_EQUAL(p.isPacked(h1), false, ());
 
   TEST_EQUAL(p.isPacked(h2), true, ());
 
   TEST_EQUAL(i, 7, ("Handlers priorities doesn't work"));
-  TEST_NOT_EQUAL( i, 12, ("Handlers priorities doesn't work"));
+  TEST_NOT_EQUAL(i, 12, ("Handlers priorities doesn't work"));
 
   m2::RectU r2 = p.find(h2).second;
 
@@ -55,53 +55,23 @@ UNIT_TEST(PackerTest_HasRoom_Sequence)
 {
   m2::Packer p(20, 20);
 
-  m2::PointU pts[] = {
-    m2::PointU(10, 10),
-    m2::PointU(11, 3),
-    m2::PointU(5, 5),
-    m2::PointU(5, 5)
-  };
+  m2::PointU pts[] = {m2::PointU(10, 10), m2::PointU(11, 3), m2::PointU(5, 5), m2::PointU(5, 5)};
 
   TEST(p.hasRoom(pts, sizeof(pts) / sizeof(m2::PointU)), ());
 
-  m2::PointU pts1[] = {
-    m2::PointU(10, 10),
-    m2::PointU(11, 3),
-    m2::PointU(5, 5),
-    m2::PointU(5, 5),
-    m2::PointU(16, 5)
-  };
+  m2::PointU pts1[] = {m2::PointU(10, 10), m2::PointU(11, 3), m2::PointU(5, 5), m2::PointU(5, 5), m2::PointU(16, 5)};
 
   TEST(!p.hasRoom(pts1, sizeof(pts1) / sizeof(m2::PointU)), ());
 
-  m2::PointU pts2[] = {
-    m2::PointU(10, 10),
-    m2::PointU(11, 3),
-    m2::PointU(5, 5),
-    m2::PointU(5, 5),
-    m2::PointU(10, 6)
-  };
+  m2::PointU pts2[] = {m2::PointU(10, 10), m2::PointU(11, 3), m2::PointU(5, 5), m2::PointU(5, 5), m2::PointU(10, 6)};
 
   TEST(!p.hasRoom(pts2, sizeof(pts2) / sizeof(m2::PointU)), ());
 
-  m2::PointU pts3[] = {
-    m2::PointU(10, 10),
-    m2::PointU(11, 3),
-    m2::PointU(5, 5),
-    m2::PointU(5, 5),
-    m2::PointU(15, 5)
-  };
+  m2::PointU pts3[] = {m2::PointU(10, 10), m2::PointU(11, 3), m2::PointU(5, 5), m2::PointU(5, 5), m2::PointU(15, 5)};
 
   TEST(p.hasRoom(pts3, sizeof(pts3) / sizeof(m2::PointU)), ());
 
-  m2::PointU pts4[] = {
-    m2::PointU(10, 10),
-    m2::PointU(11, 3),
-    m2::PointU(5, 5),
-    m2::PointU(5, 5),
-    m2::PointU(16, 5)
-  };
+  m2::PointU pts4[] = {m2::PointU(10, 10), m2::PointU(11, 3), m2::PointU(5, 5), m2::PointU(5, 5), m2::PointU(16, 5)};
 
   TEST(!p.hasRoom(pts4, sizeof(pts4) / sizeof(m2::PointU)), ());
-
 }
diff --git a/libs/geometry/geometry_tests/parametrized_segment_tests.cpp b/libs/geometry/geometry_tests/parametrized_segment_tests.cpp
index 347343ca2..31a2210a7 100644
--- a/libs/geometry/geometry_tests/parametrized_segment_tests.cpp
+++ b/libs/geometry/geometry_tests/parametrized_segment_tests.cpp
@@ -54,19 +54,12 @@ UNIT_TEST(ParametrizedSegment2D_ClosestPoint)
 {
   using P = m2::PointD;
 
-  P arr[][4] =
-  {
-    { P(3, 4), P(0, 0), P(10, 0), P(3, 0) },
-    { P(3, 4), P(0, 0), P(0, 10), P(0, 4) },
+  P arr[][4] = {{P(3, 4), P(0, 0), P(10, 0), P(3, 0)}, {P(3, 4), P(0, 0), P(0, 10), P(0, 4)},
 
-    { P(3, 5), P(2, 2), P(5, 5), P(4, 4) },
-    { P(5, 3), P(2, 2), P(5, 5), P(4, 4) },
-    { P(2, 4), P(2, 2), P(5, 5), P(3, 3) },
-    { P(4, 2), P(2, 2), P(5, 5), P(3, 3) },
+                {P(3, 5), P(2, 2), P(5, 5), P(4, 4)},  {P(5, 3), P(2, 2), P(5, 5), P(4, 4)},
+                {P(2, 4), P(2, 2), P(5, 5), P(3, 3)},  {P(4, 2), P(2, 2), P(5, 5), P(3, 3)},
 
-    { P(5, 6), P(2, 2), P(5, 5), P(5, 5) },
-    { P(1, 0), P(2, 2), P(5, 5), P(2, 2) }
-  };
+                {P(5, 6), P(2, 2), P(5, 5), P(5, 5)},  {P(1, 0), P(2, 2), P(5, 5), P(2, 2)}};
 
   for (size_t i = 0; i < ARRAY_SIZE(arr); ++i)
   {
diff --git a/libs/geometry/geometry_tests/point3d_tests.cpp b/libs/geometry/geometry_tests/point3d_tests.cpp
index cef69d5ef..177ff9e13 100644
--- a/libs/geometry/geometry_tests/point3d_tests.cpp
+++ b/libs/geometry/geometry_tests/point3d_tests.cpp
@@ -97,4 +97,4 @@ UNIT_TEST(Point3d_RotateXYZ)
   auto const north = rotatedFirst.RotateAroundY(-angleDegree);
   TEST_ALMOST_EQUAL_ABS(north, m3::PointD(0.0, 0.0, std::sqrt(3.0)), 1e-10, ());
 }
-}  // namespace point3d_tests
\ No newline at end of file
+}  // namespace point3d_tests
diff --git a/libs/geometry/geometry_tests/point_test.cpp b/libs/geometry/geometry_tests/point_test.cpp
index 4d8f88b94..8d15bb97f 100644
--- a/libs/geometry/geometry_tests/point_test.cpp
+++ b/libs/geometry/geometry_tests/point_test.cpp
@@ -79,19 +79,10 @@ UNIT_TEST(GetArrowPoints)
 
 UNIT_TEST(PointAtSegment)
 {
-  TEST(AlmostEqualULPs(m2::PointAtSegment(m2::PointF(0, 0), m2::PointF(1, 0), 0.5f),
-                           m2::PointF(0.5f, 0.f)),
-       ());
-  TEST(AlmostEqualULPs(m2::PointAtSegment(m2::PointF(0, 0), m2::PointF(0, 1), 0.3f),
-                           m2::PointF(0.f, 0.3f)),
-       ());
-  TEST(AlmostEqualULPs(m2::PointAtSegment(m2::PointD(0., 0.), m2::PointD(30., 40.), 5.),
-                           m2::PointD(3., 4.)),
-       ());
-  TEST(AlmostEqualULPs(m2::PointAtSegment(m2::PointF(-3, -4), m2::PointF(-30, -40), 5.f),
-                           m2::PointF(-6.f, -8.f)),
-       ());
-  TEST(AlmostEqualULPs(m2::PointAtSegment(m2::PointD(14., -48.), m2::PointD(70., -240.), 25.),
-                           m2::PointD(21., -72.)),
+  TEST(AlmostEqualULPs(m2::PointAtSegment(m2::PointF(0, 0), m2::PointF(1, 0), 0.5f), m2::PointF(0.5f, 0.f)), ());
+  TEST(AlmostEqualULPs(m2::PointAtSegment(m2::PointF(0, 0), m2::PointF(0, 1), 0.3f), m2::PointF(0.f, 0.3f)), ());
+  TEST(AlmostEqualULPs(m2::PointAtSegment(m2::PointD(0., 0.), m2::PointD(30., 40.), 5.), m2::PointD(3., 4.)), ());
+  TEST(AlmostEqualULPs(m2::PointAtSegment(m2::PointF(-3, -4), m2::PointF(-30, -40), 5.f), m2::PointF(-6.f, -8.f)), ());
+  TEST(AlmostEqualULPs(m2::PointAtSegment(m2::PointD(14., -48.), m2::PointD(70., -240.), 25.), m2::PointD(21., -72.)),
        ());
 }
diff --git a/libs/geometry/geometry_tests/polygon_test.cpp b/libs/geometry/geometry_tests/polygon_test.cpp
index 10f684063..4b553246b 100644
--- a/libs/geometry/geometry_tests/polygon_test.cpp
+++ b/libs/geometry/geometry_tests/polygon_test.cpp
@@ -116,8 +116,8 @@ UNIT_TEST(FindSingleStrip)
   {
     // Minsk, Bobryiskaya str., 7
     P const poly[] = {P(53.8926922, 27.5460021), P(53.8926539, 27.5461821), P(53.8926164, 27.5461591),
-                P(53.8925455, 27.5464921), P(53.8925817, 27.5465143), P(53.8925441, 27.5466909),
-                P(53.8923762, 27.5465881), P(53.8925229, 27.5458984)};
+                      P(53.8925455, 27.5464921), P(53.8925817, 27.5465143), P(53.8925441, 27.5466909),
+                      P(53.8923762, 27.5465881), P(53.8925229, 27.5458984)};
     TestFindStrip(poly, ARRAY_SIZE(poly));
   }
 }
@@ -150,15 +150,13 @@ UNIT_TEST(PolygonArea_Smoke)
 {
   {
     P arr[] = {P(-1, 0), P(0, 1), P(1, -1)};
-    TEST_ALMOST_EQUAL_ULPS(m2::GetTriangleArea(arr[0], arr[1], arr[2]),
-                           GetPolygonArea(arr, arr + ARRAY_SIZE(arr)), ());
+    TEST_ALMOST_EQUAL_ULPS(m2::GetTriangleArea(arr[0], arr[1], arr[2]), GetPolygonArea(arr, arr + ARRAY_SIZE(arr)), ());
   }
 
   {
     P arr[] = {P(-5, -7), P(-3.5, 10), P(7.2, 5), P(14, -6.4)};
-    TEST_ALMOST_EQUAL_ULPS(
-        m2::GetTriangleArea(arr[0], arr[1], arr[2]) + m2::GetTriangleArea(arr[2], arr[3], arr[0]),
-        GetPolygonArea(arr, arr + ARRAY_SIZE(arr)), ());
+    TEST_ALMOST_EQUAL_ULPS(m2::GetTriangleArea(arr[0], arr[1], arr[2]) + m2::GetTriangleArea(arr[2], arr[3], arr[0]),
+                           GetPolygonArea(arr, arr + ARRAY_SIZE(arr)), ());
   }
 }
 
diff --git a/libs/geometry/geometry_tests/polyline_tests.cpp b/libs/geometry/geometry_tests/polyline_tests.cpp
index e873b1c6f..48c8fbeeb 100644
--- a/libs/geometry/geometry_tests/polyline_tests.cpp
+++ b/libs/geometry/geometry_tests/polyline_tests.cpp
@@ -12,8 +12,8 @@ namespace polyline_tests
 {
 double constexpr kEps = 1e-5;
 
-void TestClosest(std::vector<m2::PointD> const & points, m2::PointD const & point,
-                 double expectedSquaredDist, uint32_t expectedIndex)
+void TestClosest(std::vector<m2::PointD> const & points, m2::PointD const & point, double expectedSquaredDist,
+                 uint32_t expectedIndex)
 {
   auto const closestByPoints = m2::CalcMinSquaredDistance(points.begin(), points.end(), point);
   TEST_ALMOST_EQUAL_ABS(closestByPoints.first, expectedSquaredDist, kEps, ());
@@ -44,8 +44,7 @@ UNIT_TEST(Rect_PolylineMinDistanceTest)
   // 1 |              |
   //   |              |
   //   0----1----2----3
-  std::vector<m2::PointD> const poly = {{0.0, 1.0}, {0.0, 0.0}, {1.0, 0.0},
-                                        {2.0, 0.0}, {3.0, 0.0}, {3.0, 1.0}};
+  std::vector<m2::PointD> const poly = {{0.0, 1.0}, {0.0, 0.0}, {1.0, 0.0}, {2.0, 0.0}, {3.0, 0.0}, {3.0, 1.0}};
 
   TestClosest(poly, m2::PointD(0.0, 1.0), 0.0 /* expectedSquaredDist */, 0 /* expectedIndex */);
   TestClosest(poly, m2::PointD(0.0, 0.0), 0.0 /* expectedSquaredDist */, 0 /* expectedIndex */);
diff --git a/libs/geometry/geometry_tests/rect_test.cpp b/libs/geometry/geometry_tests/rect_test.cpp
index bdac6b07c..5766e735e 100644
--- a/libs/geometry/geometry_tests/rect_test.cpp
+++ b/libs/geometry/geometry_tests/rect_test.cpp
@@ -1,5 +1,5 @@
-#include "testing/testing.hpp"
 #include "geometry/rect2d.hpp"
+#include "testing/testing.hpp"
 
 UNIT_TEST(Rect_Intersect)
 {
@@ -19,4 +19,3 @@ UNIT_TEST(Rect_Intersect)
   TEST(r3.IsIntersect(r), ());
   TEST(r.IsIntersect(r3), ());
 }
-
diff --git a/libs/geometry/geometry_tests/region2d_binary_op_test.cpp b/libs/geometry/geometry_tests/region2d_binary_op_test.cpp
index 3ab66b4a9..e4912bbe3 100644
--- a/libs/geometry/geometry_tests/region2d_binary_op_test.cpp
+++ b/libs/geometry/geometry_tests/region2d_binary_op_test.cpp
@@ -16,8 +16,8 @@ using R = m2::RegionI;
 UNIT_TEST(RegionIntersect_Smoke)
 {
   {
-    P arr1[] = { P(-2, 1), P(2, 1), P(2, -1), P(-2, -1) };
-    P arr2[] = { P(-1, 2), P(1, 2), P(1, -2), P(-1, -2) };
+    P arr1[] = {P(-2, 1), P(2, 1), P(2, -1), P(-2, -1)};
+    P arr2[] = {P(-1, 2), P(1, 2), P(1, -2), P(-1, -2)};
 
     R r1, r2;
     r1.Assign(arr1, arr1 + ARRAY_SIZE(arr1));
@@ -31,8 +31,8 @@ UNIT_TEST(RegionIntersect_Smoke)
   }
 
   {
-    P arr1[] = { P(0, 0), P(1, 1), P(2, 0) };
-    P arr2[] = { P(0, 0), P(1, -1), P(2, 0) };
+    P arr1[] = {P(0, 0), P(1, 1), P(2, 0)};
+    P arr2[] = {P(0, 0), P(1, -1), P(2, 0)};
 
     R r1, r2;
     r1.Assign(arr1, arr1 + ARRAY_SIZE(arr1));
@@ -45,8 +45,8 @@ UNIT_TEST(RegionIntersect_Smoke)
   }
 
   {
-    P arr1[] = { P(-10, -10), P(10, -10), P(10, 10), P(-10, 10) };
-    P arr2[] = { P(-5, -5), P(5, -5), P(5, 5), P(-5, 5) };
+    P arr1[] = {P(-10, -10), P(10, -10), P(10, 10), P(-10, 10)};
+    P arr2[] = {P(-5, -5), P(5, -5), P(5, 5), P(-5, 5)};
 
     R r1, r2;
     r1.Assign(arr1, arr1 + ARRAY_SIZE(arr1));
@@ -64,8 +64,8 @@ UNIT_TEST(RegionIntersect_Smoke)
 UNIT_TEST(RegionDifference_Smoke)
 {
   {
-    P arr1[] = { P(-1, 1), P(1, 1), P(1, -1), P(-1, -1) };
-    P arr2[] = { P(-2, 2), P(2, 2), P(2, -2), P(-2, -2) };
+    P arr1[] = {P(-1, 1), P(1, 1), P(1, -1), P(-1, -1)};
+    P arr2[] = {P(-2, 2), P(2, 2), P(2, -2), P(-2, -2)};
 
     R r1, r2;
     r1.Assign(arr1, arr1 + ARRAY_SIZE(arr1));
@@ -82,8 +82,8 @@ UNIT_TEST(RegionDifference_Smoke)
   }
 
   {
-    P arr1[] = { P(0, 1), P(2, 1), P(2, 0), P(0, 0) };
-    P arr2[] = { P(1, 2), P(2, 2), P(2, -1), P(1, -1) };
+    P arr1[] = {P(0, 1), P(2, 1), P(2, 0), P(0, 0)};
+    P arr2[] = {P(1, 2), P(2, 2), P(2, -1), P(1, -1)};
 
     R r1, r2;
     r1.Assign(arr1, arr1 + ARRAY_SIZE(arr1));
@@ -100,8 +100,8 @@ UNIT_TEST(RegionDifference_Smoke)
 UNIT_TEST(AddRegion_Smoke)
 {
   {
-    P arr1[] = { {0, 0}, {0, 1}, {1, 1}, {1, 0} };
-    P arr2[] = { {2, 2}, {2, 3}, {3, 3}, {3, 2} };
+    P arr1[] = {{0, 0}, {0, 1}, {1, 1}, {1, 0}};
+    P arr2[] = {{2, 2}, {2, 3}, {3, 3}, {3, 2}};
 
     R r1, r2;
     r1.Assign(arr1, arr1 + ARRAY_SIZE(arr1));
@@ -120,8 +120,8 @@ UNIT_TEST(AddRegion_Smoke)
   }
 
   {
-    P arr1[] = { {0, 0}, {0, 3}, {3, 3}, {3, 0} };
-    P arr2[] = { {1, 1}, {1, 2}, {2, 2}, {2, 1} };
+    P arr1[] = {{0, 0}, {0, 3}, {3, 3}, {3, 0}};
+    P arr2[] = {{1, 1}, {1, 2}, {2, 2}, {2, 1}};
 
     R r1, r2;
     r1.Assign(arr1, arr1 + ARRAY_SIZE(arr1));
@@ -142,8 +142,8 @@ UNIT_TEST(AddRegion_Smoke)
 
 UNIT_TEST(RegionIntersect_Floats)
 {
-  P arr1[] = { {0, 1}, {2, 3}, {3, 2}, {1, 0} };
-  P arr2[] = { {0, 2}, {1, 3}, {3, 1}, {2, 0} };
+  P arr1[] = {{0, 1}, {2, 3}, {3, 2}, {1, 0}};
+  P arr2[] = {{0, 2}, {1, 3}, {3, 1}, {2, 0}};
 
   R r1, r2;
   r1.Assign(arr1, arr1 + ARRAY_SIZE(arr1));
@@ -158,8 +158,9 @@ UNIT_TEST(RegionIntersect_Floats)
 
 UNIT_TEST(RegionArea_2Directions)
 {
-  P arr[] = { {1, 1}, {1, 0}, {2, 0}, {2, 1}, {1, 1}, // CCW direction
-              {1, 1}, {1, 0}, {0, 0}, {0, 1}, {1, 1}  // CW direction
+  P arr[] = {
+      {1, 1}, {1, 0}, {2, 0}, {2, 1}, {1, 1},  // CCW direction
+      {1, 1}, {1, 0}, {0, 0}, {0, 1}, {1, 1}   // CW direction
   };
 
   R r;
diff --git a/libs/geometry/geometry_tests/region_tests.cpp b/libs/geometry/geometry_tests/region_tests.cpp
index 523d85d99..e4f7485bd 100644
--- a/libs/geometry/geometry_tests/region_tests.cpp
+++ b/libs/geometry/geometry_tests/region_tests.cpp
@@ -8,8 +8,8 @@
 
 #include <iostream>
 #include <random>
-#include <vector>
 #include <type_traits>
+#include <vector>
 
 namespace region_tests
 {
@@ -88,13 +88,13 @@ void TestContains()
     TestContainsRectangular(data);
   }
   {
-    P const data[] = {P(-2000000000, -2000000000), P(-1000000000, -2000000000),
-                      P(-1000000000, -1000000000), P(-2000000000, -1000000000)};
+    P const data[] = {P(-2000000000, -2000000000), P(-1000000000, -2000000000), P(-1000000000, -1000000000),
+                      P(-2000000000, -1000000000)};
     TestContainsRectangular(data);
   }
   {
-    P const data[] = {P(1000000000, 1000000000), P(2000000000, 1000000000),
-                      P(2000000000, 2000000000), P(1000000000, 2000000000)};
+    P const data[] = {P(1000000000, 1000000000), P(2000000000, 1000000000), P(2000000000, 2000000000),
+                      P(1000000000, 2000000000)};
     TestContainsRectangular(data);
   }
 
@@ -111,10 +111,9 @@ void TestContains()
 
   // complex polygon
   {
-    P const data[] = {P(0, 0), P(2, 0), P(2, 2), P(3, 1), P(4, 2), P(5, 2), P(3, 3),
-                      P(3, 2), P(2, 4), P(6, 3), P(7, 4), P(7, 2), P(8, 5), P(8, 7),
-                      P(7, 7), P(8, 8), P(5, 9), P(6, 6), P(5, 7), P(4, 6), P(4, 8),
-                      P(3, 7), P(2, 7), P(3, 6), P(4, 4), P(0, 7), P(2, 3), P(0, 2)};
+    P const data[] = {P(0, 0), P(2, 0), P(2, 2), P(3, 1), P(4, 2), P(5, 2), P(3, 3), P(3, 2), P(2, 4), P(6, 3),
+                      P(7, 4), P(7, 2), P(8, 5), P(8, 7), P(7, 7), P(8, 8), P(5, 9), P(6, 6), P(5, 7), P(4, 6),
+                      P(4, 8), P(3, 7), P(2, 7), P(3, 6), P(4, 4), P(0, 7), P(2, 3), P(0, 2)};
     region.Assign(data, data + ARRAY_SIZE(data));
   }
   TEST_EQUAL(region.GetRect(), m2::Rect<typename P::value_type>(0, 0, 8, 9), ());
@@ -160,8 +159,7 @@ UNIT_TEST(Region)
   {
     // equality case
     {
-      P const data[] = {P(1, 1),    P(0, 4.995), P(1, 4.999996), P(1.000003, 5.000001),
-                        P(0.5, 10), P(10, 10),   P(10, 1)};
+      P const data[] = {P(1, 1), P(0, 4.995), P(1, 4.999996), P(1.000003, 5.000001), P(0.5, 10), P(10, 10), P(10, 1)};
       region.Assign(data, data + ARRAY_SIZE(data));
     }
     TEST(!region.Contains(P(0.9999987, 0.9999938)), ());
@@ -202,7 +200,10 @@ UNIT_TEST(Region_Contains_int32)
   }
 }
 
-UNIT_TEST(Region_Contains_uint32) { TestContains<m2::RegionU>(); }
+UNIT_TEST(Region_Contains_uint32)
+{
+  TestContains<m2::RegionU>();
+}
 
 UNIT_TEST(Region_Contains_double)
 {
@@ -279,8 +280,7 @@ UNIT_TEST(Region_border_intersecion_Test)
   TEST(region.FindIntersection(P(7.0, 7.0), P(7.0, 10.0), intersection), ());
   TEST(intersection == P(7.0, 10.0), ());
 
-  TEST(!region.FindIntersection(P(5.0, 5.0), P(2.0, 2.0), intersection),
-       ("This case has no intersection"));
+  TEST(!region.FindIntersection(P(5.0, 5.0), P(2.0, 2.0), intersection), ("This case has no intersection"));
 }
 
 UNIT_TEST(Region_Area)
@@ -319,7 +319,8 @@ UNIT_TEST(Region_GetRandomPoint)
   size_t const kNumIterations = 1000;
   bool const kNeedPlot = true;
 
-  auto testConvexRegion = [&](m2::Region<P> const & region) {
+  auto testConvexRegion = [&](m2::Region<P> const & region)
+  {
     minstd_rand rng(0);
     vector<P> points;
     points.reserve(kNumIterations);
@@ -363,4 +364,4 @@ UNIT_TEST(Region_GetRandomPoint)
     testConvexRegion(region);
   }
 }
-} // namespace region_tests
+}  // namespace region_tests
diff --git a/libs/geometry/geometry_tests/robust_test.cpp b/libs/geometry/geometry_tests/robust_test.cpp
index b876ba74a..5f2c2f86a 100644
--- a/libs/geometry/geometry_tests/robust_test.cpp
+++ b/libs/geometry/geometry_tests/robust_test.cpp
@@ -159,7 +159,7 @@ UNIT_TEST(Triangle_PointInsidePoint)
 UNIT_TEST(PolygonSelfIntersections_IntersectSmoke)
 {
   {
-    P arr[] = { P(0, 1), P(2, -1), P(2, 1), P(0, -1) };
+    P arr[] = {P(0, 1), P(2, -1), P(2, 1), P(0, -1)};
     CheckSelfIntersections(&arr[0], arr + ARRAY_SIZE(arr), true);
   }
 }
@@ -167,13 +167,13 @@ UNIT_TEST(PolygonSelfIntersections_IntersectSmoke)
 UNIT_TEST(PolygonSelfIntersections_TangentSmoke)
 {
   {
-    P arr[] = { P(0, 1), P(1, 0), P(2, 1), P(2, -1), P(1, 0), P(0, -1) };
+    P arr[] = {P(0, 1), P(1, 0), P(2, 1), P(2, -1), P(1, 0), P(0, -1)};
     CheckSelfIntersections(&arr[0], arr + ARRAY_SIZE(arr), false);
   }
 
   {
-    P arr[] = { P(0, 0), P(2, 0), P(2, 1), P(1, 0), P(0, 1) };
+    P arr[] = {P(0, 0), P(2, 0), P(2, 1), P(1, 0), P(0, 1)};
     CheckSelfIntersections(&arr[0], arr + ARRAY_SIZE(arr), false);
   }
 }
-}  // namespace robust_test
\ No newline at end of file
+}  // namespace robust_test
diff --git a/libs/geometry/geometry_tests/screen_test.cpp b/libs/geometry/geometry_tests/screen_test.cpp
index 2ece324d9..977c8f2a1 100644
--- a/libs/geometry/geometry_tests/screen_test.cpp
+++ b/libs/geometry/geometry_tests/screen_test.cpp
@@ -70,8 +70,11 @@ UNIT_TEST(ScreenBase_3dTransform)
 
   p3d = m2::PointD(screen.PixelRectIn3d().SizeX() / 2.0, screen.PixelRectIn3d().SizeY() / 2.0);
   pp = screen.P3dtoP(p3d);
-  TEST(pp.EqualDxDy(m2::PointD(screen.PixelRect().SizeX() / 2.0,
-                               screen.PixelRect().SizeY() - screen.PixelRectIn3d().SizeY() / (2.0 * cos(rotationAngle))), kEps), ());
+  TEST(
+      pp.EqualDxDy(m2::PointD(screen.PixelRect().SizeX() / 2.0,
+                              screen.PixelRect().SizeY() - screen.PixelRectIn3d().SizeY() / (2.0 * cos(rotationAngle))),
+                   kEps),
+      ());
 
   p3d = m2::PointD(0, 0);
   pp = screen.P3dtoP(p3d);
@@ -147,12 +150,10 @@ UNIT_TEST(ScreenBase_CalcTransform)
   double dx = 1;
   double dy = 2;
   double s1, a1, dx1, dy1;
-  math::Matrix<double, 3, 3> m = ScreenBase::CalcTransform(
-                                          m2::PointD(0, 1), m2::PointD(1, 1),
-                                          m2::PointD(             s * sin(a) + dx,               s * cos(a) + dy),
-                                          m2::PointD(s * cos(a) + s * sin(a) + dx, -s * sin(a) + s * cos(a) + dy),
-                                          true /* allow rotate */,
-                                          true /* allow scale*/);
+  math::Matrix<double, 3, 3> m =
+      ScreenBase::CalcTransform(m2::PointD(0, 1), m2::PointD(1, 1), m2::PointD(s * sin(a) + dx, s * cos(a) + dy),
+                                m2::PointD(s * cos(a) + s * sin(a) + dx, -s * sin(a) + s * cos(a) + dy),
+                                true /* allow rotate */, true /* allow scale*/);
 
   ScreenBase::ExtractGtoPParams(m, a1, s1, dx1, dy1);
 
@@ -194,26 +195,18 @@ UNIT_TEST(ScreenBase_CombineTransforms)
 
   {
     // GtoP matrix for scale only.
-    math::Matrix<double, 3, 3> m =
-        math::Shift(
-          math::Scale(math::Identity<double, 3>(),
-                      1.0 / fixedScale, -1.0 / fixedScale),
-          sCopy.PixelRect().Center());
+    math::Matrix<double, 3, 3> m = math::Shift(
+        math::Scale(math::Identity<double, 3>(), 1.0 / fixedScale, -1.0 / fixedScale), sCopy.PixelRect().Center());
 
     TEST(is_equal(sCopy.GtoP(g1), g1 * m), ());
     TEST(is_equal(sCopy.GtoP(g2), g2 * m), ());
   }
 
   // GtoP matrix to make full final transformation.
-  math::Matrix<double, 3, 3> m =
-      math::Shift(
-        math::Scale(
-          math::Rotate(
-            math::Shift(math::Identity<double, 3>(),
-                        -sCopy.PixelRect().Center()),
-            angle),
-          fixedScale / scale, fixedScale / scale),
-        org);
+  math::Matrix<double, 3, 3> m = math::Shift(
+      math::Scale(math::Rotate(math::Shift(math::Identity<double, 3>(), -sCopy.PixelRect().Center()), angle),
+                  fixedScale / scale, fixedScale / scale),
+      org);
 
   m2::PointD pp1 = sCopy.GtoP(g1) * m;
   m2::PointD pp2 = sCopy.GtoP(g2) * m;
@@ -221,4 +214,4 @@ UNIT_TEST(ScreenBase_CombineTransforms)
   TEST(is_equal(p1, pp1), (p1, pp1));
   TEST(is_equal(p2, pp2), (p2, pp2));
 }
-}  // namespace screen_test
\ No newline at end of file
+}  // namespace screen_test
diff --git a/libs/geometry/geometry_tests/segment2d_tests.cpp b/libs/geometry/geometry_tests/segment2d_tests.cpp
index 5dc6e6c8d..d5d88d33c 100644
--- a/libs/geometry/geometry_tests/segment2d_tests.cpp
+++ b/libs/geometry/geometry_tests/segment2d_tests.cpp
@@ -10,7 +10,7 @@ using namespace m2;
 double const kEps = 1e-10;
 
 void TestIntersectionResult(IntersectionResult const & result, IntersectionResult::Type expectedType,
-    PointD const & expectedPoint)
+                            PointD const & expectedPoint)
 {
   TEST_EQUAL(result.m_type, expectedType, ());
   TEST(AlmostEqualAbs(result.m_point, expectedPoint, kEps), (result.m_point, expectedPoint, kEps));
@@ -55,54 +55,45 @@ UNIT_TEST(SegmentIntersection_Intersect)
 
 UNIT_TEST(SegmentIntersection_NoIntersectionPoint)
 {
-  TEST_EQUAL(
-      Intersect(Segment2D({0.0, 0.0}, {1.0, 0.0}), Segment2D({2.0, 0.0}, {4.0, 0.0}), kEps).m_type,
-      IntersectionResult::Type::Zero, ());
+  TEST_EQUAL(Intersect(Segment2D({0.0, 0.0}, {1.0, 0.0}), Segment2D({2.0, 0.0}, {4.0, 0.0}), kEps).m_type,
+             IntersectionResult::Type::Zero, ());
 
-  TEST_EQUAL(
-      Intersect(Segment2D({0.0, 0.0}, {1.0, 1.0}), Segment2D({2.0, 0.0}, {4.0, 0.0}), kEps).m_type,
-      IntersectionResult::Type::Zero, ());
+  TEST_EQUAL(Intersect(Segment2D({0.0, 0.0}, {1.0, 1.0}), Segment2D({2.0, 0.0}, {4.0, 0.0}), kEps).m_type,
+             IntersectionResult::Type::Zero, ());
 
-  TEST_EQUAL(
-      Intersect(Segment2D({0.0, 0.0}, {1.0, 1.0}), Segment2D({4.0, 4.0}, {2.0, 2.0}), kEps).m_type,
-      IntersectionResult::Type::Zero, ());
+  TEST_EQUAL(Intersect(Segment2D({0.0, 0.0}, {1.0, 1.0}), Segment2D({4.0, 4.0}, {2.0, 2.0}), kEps).m_type,
+             IntersectionResult::Type::Zero, ());
 
-  TEST_EQUAL(
-      Intersect(Segment2D({0.0, 0.0}, {4.0, 4.0}), Segment2D({10.0, 0.0}, {6.0, 4.0}), kEps).m_type,
-      IntersectionResult::Type::Zero, ());
+  TEST_EQUAL(Intersect(Segment2D({0.0, 0.0}, {4.0, 4.0}), Segment2D({10.0, 0.0}, {6.0, 4.0}), kEps).m_type,
+             IntersectionResult::Type::Zero, ());
 }
 
 UNIT_TEST(SegmentIntersection_OneIntersectionPoint)
 {
   // Two intersected segments. The intersection point is in the middle of both of them.
   {
-    auto const result =
-        Intersect(Segment2D({-1.0, -1.0}, {1.0, 1.0}), Segment2D({-1.0, 0.0}, {1.0, 0.0}), kEps);
+    auto const result = Intersect(Segment2D({-1.0, -1.0}, {1.0, 1.0}), Segment2D({-1.0, 0.0}, {1.0, 0.0}), kEps);
     TestIntersectionResult(result, IntersectionResult::Type::One, {0.0, 0.0});
   }
 
   {
-    auto const result =
-        Intersect(Segment2D({0.0, 0.0}, {10.0, 10.0}), Segment2D({10.0, 0.0}, {0.0, 10.0}), kEps);
+    auto const result = Intersect(Segment2D({0.0, 0.0}, {10.0, 10.0}), Segment2D({10.0, 0.0}, {0.0, 10.0}), kEps);
     TestIntersectionResult(result, IntersectionResult::Type::One, {5.0, 5.0});
   }
 
   // Two intersected segments. The intersection point is in an end of both of them.
   {
-    auto const result =
-        Intersect(Segment2D({-1.0, -1.0}, {0.0, 0.0}), Segment2D({0.0, 0.0}, {11.0, 0.0}), kEps);
+    auto const result = Intersect(Segment2D({-1.0, -1.0}, {0.0, 0.0}), Segment2D({0.0, 0.0}, {11.0, 0.0}), kEps);
     TestIntersectionResult(result, IntersectionResult::Type::One, {0.0, 0.0});
   }
 }
 
 UNIT_TEST(SegmentIntersection_InfinityIntersectionPoints)
 {
-  TEST_EQUAL(
-      Intersect(Segment2D({0.0, 0.0}, {2.0, 0.0}), Segment2D({1.0, 0.0}, {4.0, 0.0}), kEps).m_type,
-      IntersectionResult::Type::Infinity, ());
+  TEST_EQUAL(Intersect(Segment2D({0.0, 0.0}, {2.0, 0.0}), Segment2D({1.0, 0.0}, {4.0, 0.0}), kEps).m_type,
+             IntersectionResult::Type::Infinity, ());
 
-  TEST_EQUAL(
-      Intersect(Segment2D({0.0, 0.0}, {2.0, 4.0}), Segment2D({1.0, 2.0}, {2.0, 4.0}), kEps).m_type,
-      IntersectionResult::Type::Infinity, ());
+  TEST_EQUAL(Intersect(Segment2D({0.0, 0.0}, {2.0, 4.0}), Segment2D({1.0, 2.0}, {2.0, 4.0}), kEps).m_type,
+             IntersectionResult::Type::Infinity, ());
 }
 }  // namespace segment2d_tests
diff --git a/libs/geometry/geometry_tests/simplification_test.cpp b/libs/geometry/geometry_tests/simplification_test.cpp
index 939e806bb..8b5ec4152 100644
--- a/libs/geometry/geometry_tests/simplification_test.cpp
+++ b/libs/geometry/geometry_tests/simplification_test.cpp
@@ -20,8 +20,7 @@ using namespace std;
 using P = m2::PointD;
 using DistanceFn = m2::SquaredDistanceFromSegmentToPoint;
 using PointOutput = base::BackInsertFunctor<vector<m2::PointD>>;
-using SimplifyFn = void (*)(m2::PointD const *, m2::PointD const *, double, DistanceFn,
-                            PointOutput);
+using SimplifyFn = void (*)(m2::PointD const *, m2::PointD const *, double, DistanceFn, PointOutput);
 
 struct LargePolylineTestData
 {
@@ -67,14 +66,12 @@ void TestSimplificationOfPoly(m2::PointD const * points, size_t count, SimplifyF
   }
 }
 
-void SimplifyNearOptimal10(m2::PointD const * f, m2::PointD const * l, double e, DistanceFn distFn,
-                           PointOutput out)
+void SimplifyNearOptimal10(m2::PointD const * f, m2::PointD const * l, double e, DistanceFn distFn, PointOutput out)
 {
   SimplifyNearOptimal(10, f, l, e, distFn, out);
 }
 
-void SimplifyNearOptimal20(m2::PointD const * f, m2::PointD const * l, double e, DistanceFn distFn,
-                           PointOutput out)
+void SimplifyNearOptimal20(m2::PointD const * f, m2::PointD const * l, double e, DistanceFn distFn, PointOutput out)
 {
   SimplifyNearOptimal(20, f, l, e, distFn, out);
 }
@@ -106,30 +103,39 @@ UNIT_TEST(Simplification_TestDataIsCorrect)
   TEST_EQUAL(LargePolylineTestData::m_Size, 5539, ());
 }
 
-UNIT_TEST(Simplification_DP_Smoke) { TestSimplificationSmoke(&SimplifyDP<DistanceFn>); }
+UNIT_TEST(Simplification_DP_Smoke)
+{
+  TestSimplificationSmoke(&SimplifyDP<DistanceFn>);
+}
 
-UNIT_TEST(Simplification_DP_Line) { TestSimplificationOfLine(&SimplifyDP<DistanceFn>); }
+UNIT_TEST(Simplification_DP_Line)
+{
+  TestSimplificationOfLine(&SimplifyDP<DistanceFn>);
+}
 
 UNIT_TEST(Simplification_DP_Polyline)
 {
-  TestSimplificationOfPoly(LargePolylineTestData::m_Data, LargePolylineTestData::m_Size,
-                           &SimplifyDP<DistanceFn>);
+  TestSimplificationOfPoly(LargePolylineTestData::m_Data, LargePolylineTestData::m_Size, &SimplifyDP<DistanceFn>);
 }
 
-UNIT_TEST(Simplification_Opt_Smoke) { TestSimplificationSmoke(&SimplifyNearOptimal10); }
+UNIT_TEST(Simplification_Opt_Smoke)
+{
+  TestSimplificationSmoke(&SimplifyNearOptimal10);
+}
 
-UNIT_TEST(Simplification_Opt_Line) { TestSimplificationOfLine(&SimplifyNearOptimal10); }
+UNIT_TEST(Simplification_Opt_Line)
+{
+  TestSimplificationOfLine(&SimplifyNearOptimal10);
+}
 
 UNIT_TEST(Simplification_Opt10_Polyline)
 {
-  TestSimplificationOfPoly(LargePolylineTestData::m_Data, LargePolylineTestData::m_Size,
-                           &SimplifyNearOptimal10);
+  TestSimplificationOfPoly(LargePolylineTestData::m_Data, LargePolylineTestData::m_Size, &SimplifyNearOptimal10);
 }
 
 UNIT_TEST(Simplification_Opt20_Polyline)
 {
-  TestSimplificationOfPoly(LargePolylineTestData::m_Data, LargePolylineTestData::m_Size,
-                           &SimplifyNearOptimal20);
+  TestSimplificationOfPoly(LargePolylineTestData::m_Data, LargePolylineTestData::m_Size, &SimplifyNearOptimal20);
 }
 
 UNIT_TEST(Simpfication_DP_DegenerateTrg)
@@ -137,9 +143,8 @@ UNIT_TEST(Simpfication_DP_DegenerateTrg)
   P arr1[] = {P(0, 0), P(100, 100), P(100, 500), P(0, 600)};
   CheckDPStrict(arr1, ARRAY_SIZE(arr1), 1.0, 4);
 
-  P arr2[] = {P(0, 0),       P(100, 100),   P(100.1, 150), P(100.2, 200),
-              P(100.3, 250), P(100.4, 300), P(100.3, 350), P(100.2, 400),
-              P(100.1, 450), P(100, 500),   P(0, 600)};
+  P arr2[] = {P(0, 0),       P(100, 100),   P(100.1, 150), P(100.2, 200), P(100.3, 250), P(100.4, 300),
+              P(100.3, 350), P(100.2, 400), P(100.1, 450), P(100, 500),   P(0, 600)};
   CheckDPStrict(arr2, ARRAY_SIZE(arr2), 1.0, 4);
 }
 }  // namespace simplification_test
diff --git a/libs/geometry/geometry_tests/spline_test.cpp b/libs/geometry/geometry_tests/spline_test.cpp
index 484bf9038..f8ce02269 100644
--- a/libs/geometry/geometry_tests/spline_test.cpp
+++ b/libs/geometry/geometry_tests/spline_test.cpp
@@ -9,8 +9,8 @@ namespace spline_test
 {
 using namespace std;
 
-using m2::Spline;
 using m2::PointD;
+using m2::Spline;
 
 namespace
 {
@@ -36,12 +36,12 @@ void TestPointDDir(PointD const & dst, PointD const & src)
   }
   else
   {
-    TestEqual(dst.x/len1, src.x/len2);
-    TestEqual(dst.y/len1, src.y/len2);
+    TestEqual(dst.x / len1, src.x / len2);
+    TestEqual(dst.y / len1, src.y / len2);
   }
 }
 
-} // namespace
+}  // namespace
 
 UNIT_TEST(Spline_SmoothedDirections)
 {
diff --git a/libs/geometry/geometry_tests/test_regions.hpp b/libs/geometry/geometry_tests/test_regions.hpp
index ffc3f42f7..9076130d4 100644
--- a/libs/geometry/geometry_tests/test_regions.hpp
+++ b/libs/geometry/geometry_tests/test_regions.hpp
@@ -3,38 +3,2058 @@
 
 namespace geom_test
 {
-  typedef m2::PointI P;
+typedef m2::PointI P;
 
-  P arrMain[] = { P(452984832, 654311423), P(452984832, 671088639), P(469762048, 671088639), P(469762048, 654311423) };
+P arrMain[] = {P(452984832, 654311423), P(452984832, 671088639), P(469762048, 671088639), P(469762048, 654311423)};
 
-  P arrB1[] = { P(453543869, 663407648), P(453541856, 663412556), P(453539892, 663412535), P(453539862, 663415492), P(453535925, 663416437), P(453535905, 663418409), P(453531978, 663418368), P(453531998, 663416396), P(453532980, 663416406), P(453533520, 663411484), P(453538931, 663410554), P(453538951, 663408583) };
+P arrB1[] = {P(453543869, 663407648), P(453541856, 663412556), P(453539892, 663412535), P(453539862, 663415492),
+             P(453535925, 663416437), P(453535905, 663418409), P(453531978, 663418368), P(453531998, 663416396),
+             P(453532980, 663416406), P(453533520, 663411484), P(453538931, 663410554), P(453538951, 663408583)};
 
-  P arrB2[] = { P(453497629, 663605369), P(453497618, 663606356), P(453498601, 663606366), P(453498591, 663607353), P(453494661, 663607312), P(453494682, 663605339) };
+P arrB2[] = {P(453497629, 663605369), P(453497618, 663606356), P(453498601, 663606366),
+             P(453498591, 663607353), P(453494661, 663607312), P(453494682, 663605339)};
 
-  P arrB3[] = { P(453492851, 663592496), P(453492810, 663596441), P(453493792, 663596451), P(453493751, 663600397), P(453495716, 663600418), P(453494712, 663602380), P(453486864, 663601311), P(453487385, 663598357), P(453490353, 663596416) };
+P arrB3[] = {P(453492851, 663592496), P(453492810, 663596441), P(453493792, 663596451),
+             P(453493751, 663600397), P(453495716, 663600418), P(453494712, 663602380),
+             P(453486864, 663601311), P(453487385, 663598357), P(453490353, 663596416)};
 
-  P arrB4[] = { P(452356784, 661602726), P(452353703, 661613453), P(452343909, 661616248), P(452343881, 661618206), P(452338044, 661617141), P(452338016, 661619100), P(452331162, 661620958), P(452331133, 661622916), P(452323275, 661626718), P(452322257, 661629642), P(452319317, 661630577), P(452318299, 661633500), P(452309458, 661637776), P(452284978, 661644269), P(452266282, 661655256), P(452265263, 661658179), P(452248612, 661662828), P(452248583, 661664786), P(452231974, 661666496), P(452231959, 661667475), P(452236821, 661668528), P(452236807, 661669507), P(452233895, 661668484), P(452233866, 661670443), P(452225081, 661670798), P(452224091, 661671763), P(452222148, 661671246), P(452222119, 661673204), P(452214257, 661677004), P(452214243, 661677983), P(452210313, 661679883), P(452209337, 661679868), P(452209293, 661682806), P(452206367, 661682761), P(452206323, 661685700), P(452189661, 661690833), P(452184829, 661687820), P(452148187, 661693368), P(452143731, 661696008), P(452130592, 661700788), P(452122615, 661700850), P(452115430, 661696551), P(452062913, 661685937), P(452059957, 661687850), P(452052154, 661687728), P(452042340, 661691492), P(452026228, 661684402), P(452020760, 661682756), P(452020081, 661677955), P(452006407, 661681128), P(452001469, 661684968), P(451969175, 661691310), P(451967193, 661693237), P(451934945, 661696637), P(451930131, 661692641), P(451887392, 661681172), P(451855099, 661666775), P(451846671, 661665812), P(451841898, 661659368), P(451825400, 661654198), P(451825433, 661652240), P(451822507, 661652192), P(451819678, 661646268), P(451815794, 661645225), P(451815826, 661643266), P(451811942, 661642223), P(451811974, 661640264), P(451808089, 661639221), P(451809097, 661637278), P(451805229, 661635255), P(451804965, 661621540), P(451794850, 661614025), P(451772514, 661608268), P(451771588, 661605315), P(451776463, 661605396), P(451776511, 661602459), P(451779971, 661599579), P(451778429, 661598204), P(451763934, 661596373), P(451764453, 661594424), P(451757889, 661578646), P(451755722, 661569788), P(451754058, 661566716), P(451750602, 661545596), P(451749346, 661540282), P(451742486, 661507590), P(451741974, 661498759), P(451744022, 661494279), P(451743407, 661486394), P(451744943, 661484090), P(451745890, 661482247), P(451746855, 661474598), P(451745114, 661468556), P(451746906, 661463436), P(451752666, 661451916), P(451747874, 661448278), P(451748442, 661443394), P(451747483, 661442398), P(451748555, 661436544), P(451747630, 661433593), P(451753251, 661418029), P(451751302, 661417996), P(451752342, 661414100), P(451754283, 661414620), P(451754792, 661413162), P(451753851, 661411189), P(451755832, 661409265), P(451755395, 661406322), P(451758318, 661406371), P(451758901, 661400509), P(451761873, 661397624), P(451763466, 661389822), P(451769894, 661384058), P(451773516, 661371399), P(451775464, 661371431), P(451783508, 661356398), P(451785448, 661356921), P(451785966, 661354973), P(451792347, 661352144), P(451792881, 661349218), P(451797298, 661347335), P(451796373, 661344384), P(451803223, 661342541), P(451803256, 661340585), P(451805204, 661340617), P(451804844, 661332785), P(451809970, 661317217), P(451811951, 661315293), P(451817678, 661292889), P(451819626, 661292921), P(451822715, 661282700), P(451825629, 661283239), P(451825661, 661281283), P(451829557, 661281347), P(451829588, 661279391), P(451834442, 661280450), P(451834975, 661277524), P(451845266, 661273781), P(451844324, 661271809), P(451847229, 661272834), P(451847261, 661270879), P(451849209, 661270911), P(451848266, 661268940), P(451849561, 661269603), P(451860517, 661264250), P(451861037, 661262302), P(451871804, 661259053), P(451874797, 661254703), P(451880647, 661254307), P(451881661, 661251880), P(451885540, 661252921), P(451886057, 661250974), P(451893488, 661243271), P(451905219, 661240527), P(451905251, 661238572), P(451909153, 661238144), P(451915097, 661231885), P(451918011, 661232420), P(451924881, 661229109), P(451924912, 661227154), P(451943521, 661220608), P(451943553, 661218653), P(451960151, 661215985), P(451961164, 661213554), P(451963095, 661214563), P(451973821, 661213757), P(451979290, 661206512), P(451981756, 661204595), P(451981710, 661207528), P(451990519, 661204734), P(451991554, 661200840), P(451997380, 661201910), P(451998931, 661196067), P(452002371, 661194166), P(452003383, 661191736), P(452007285, 661191310), P(452007346, 661187400), P(452009293, 661187431), P(452009324, 661185476), P(452011279, 661185016), P(452017250, 661176801), P(452021198, 661173439), P(452024126, 661172998), P(452024157, 661171043), P(452033960, 661166796), P(452090354, 661172079), P(452089836, 661174026), P(452093184, 661177990), P(452095601, 661179005), P(452096030, 661182922), P(452097977, 661182952), P(452098890, 661186878), P(452102266, 661188886), P(452103675, 661192328), P(452116287, 661195457), P(452139676, 661194352), P(452140190, 661192404), P(452151470, 661187197), P(452158403, 661187227), P(452158852, 661185302), P(452165201, 661181708), P(452166534, 661179723), P(452184851, 661169128), P(452232800, 661153230), P(452243602, 661147038), P(452243631, 661145083), P(452248513, 661144179), P(452248541, 661142223), P(452253423, 661141319), P(452253452, 661139364), P(452274918, 661136260), P(452294307, 661141927), P(452294278, 661143881), P(452297198, 661143924), P(452297156, 661146857), P(452309789, 661148508), P(452321506, 661146238), P(452321534, 661144282), P(452323481, 661144311), P(452323509, 661142356), P(452326423, 661142886), P(452331318, 661141003), P(452336178, 661141564), P(452336207, 661139609), P(452339113, 661140629), P(452339141, 661138675), P(452368316, 661141054), P(452368273, 661143987), P(452378022, 661143150), P(452378050, 661141195), P(452383897, 661140789), P(452384857, 661141781), P(452388161, 661140539), P(452393908, 661135947), P(452415172, 661132441), P(452433667, 661132705), P(452438555, 661131310), P(452438583, 661129355), P(452448309, 661129980), P(452451250, 661128558), P(452450249, 661130499), P(452469711, 661131261), P(452470670, 661132253), P(452511527, 661134782), P(452516360, 661137295), P(452516387, 661135341), P(452521234, 661136873), P(452522241, 661134445), P(452527101, 661135000), P(452528089, 661134036), P(452534896, 661134621), P(452534922, 661132666), P(452538783, 661135162), P(452549524, 661132869), P(452549484, 661135801), P(452551431, 661135828), P(452552438, 661133396), P(452563179, 661131102), P(452563691, 661129154), P(452567152, 661125291), P(452569244, 661123719), P(452573237, 661121670), P(452577927, 661120551), P(452580188, 661119431), P(452582833, 661117686), P(452583462, 661116160), P(452586793, 661112852), P(452591212, 661109980), P(452592733, 661105600), P(452594686, 661105140), P(452594224, 661103178), P(452596490, 661091265), P(452598766, 661088576), P(452600804, 661084696), P(452600876, 661083745), P(452602302, 661081783), P(452602277, 661080782), P(452600669, 661075187), P(452596083, 661073879), P(452598242, 661058270), P(452600188, 661058297), P(452601241, 661052447), P(452610052, 661054296), P(452610550, 661047687), P(452611156, 661038899), P(452616042, 661037498), P(452617048, 661035070), P(452630756, 661028902), P(452641493, 661026606), P(452642499, 661024174), P(452647358, 661024730), P(452647383, 661022776), P(452682271, 661033994), P(452682245, 661035948), P(452685171, 661035497), P(452699665, 661043508), P(452704492, 661046505), P(452709823, 661048043), P(452710286, 661050004), P(452712238, 661049539), P(452714159, 661051520), P(452718057, 661051084), P(452718980, 661055005), P(452722866, 661055544), P(452725728, 661059982), P(452734449, 661063028), P(452734423, 661064983), P(452742177, 661067527), P(452759708, 661066780), P(452772290, 661072321), P(452773200, 661077220), P(452776119, 661077258), P(452782744, 661092006), P(452784690, 661092031), P(452786574, 661096944), P(452789500, 661096491), P(452793847, 661098993), P(452794311, 661100954), P(452799165, 661101994), P(452800013, 661111780), P(452803900, 661112318), P(452804842, 661114776), P(452825178, 661123345), P(452832947, 661124913), P(452832971, 661122958), P(452837832, 661123508), P(452838818, 661122542), P(452841726, 661123557), P(452880706, 661120632), P(452880730, 661118678), P(452893421, 661115904), P(452893397, 661117860), P(452904062, 661121413), P(452928410, 661120740), P(452943065, 661116525), P(452943090, 661114570), P(452985961, 661111675), P(453009311, 661112938), P(453015169, 661111544), P(453015204, 661108612), P(453021080, 661105751), P(453021056, 661107705), P(453034702, 661106402), P(453035704, 661103972), P(453044499, 661101145), P(453044476, 661103100), P(453051330, 661099760), P(453054245, 661100285), P(453056232, 661096886), P(453062072, 661096956), P(453075763, 661091744), P(453075786, 661089790), P(453091342, 661091440), P(453092327, 661090473), P(453098161, 661091033), P(453098150, 661092010), P(453099123, 661092022), P(453101067, 661091304), P(453104154, 661092379), P(453105206, 661093453), P(453109697, 661093005), P(453110398, 661090051), P(453114328, 661090409), P(453118888, 661090140), P(453118958, 661093095), P(453119660, 661093453), P(453121274, 661094527), P(453121695, 661096766), P(453122747, 661097751), P(453124572, 661098467), P(453124361, 661100168), P(453125694, 661100168), P(453127659, 661101601), P(453128220, 661105361), P(453130044, 661105540), P(453132290, 661105092), P(453133272, 661104287), P(453136921, 661105361), P(453138815, 661104466), P(453142464, 661103481), P(453144569, 661102227), P(453146744, 661100795), P(453149340, 661100078), P(453158812, 661100795), P(453159514, 661097751), P(453161829, 661098914), P(453162321, 661101869), P(453163934, 661102854), P(453166951, 661104018), P(453168074, 661107241), P(453169898, 661108226), P(453172705, 661109032), P(453174529, 661110554), P(453186177, 661110644), P(453186878, 661109838), P(453188001, 661107779), P(453189475, 661108674), P(453189615, 661111987), P(453190527, 661112793), P(453196070, 661113420), P(453201543, 661114046), P(453202244, 661116285), P(453202244, 661118255), P(453204349, 661120762), P(453206524, 661119956), P(453209542, 661119419), P(453212729, 661117781), P(453222419, 661121803), P(453224728, 661121833), P(453239945, 661125773), P(453245816, 661125587), P(453248112, 661129064), P(453251571, 661130966), P(453256041, 661132041), P(453258475, 661130577), P(453259734, 661131275), P(453264963, 661132441), P(453268426, 661134581), P(453272059, 661136164), P(453273111, 661140910), P(453274725, 661145857), P(453272648, 661157566), P(453269739, 661156556), P(453269716, 661158511), P(453267989, 661159496), P(453270658, 661161455), P(453269163, 661164371), P(453269619, 661167310), P(453267672, 661167288), P(453265548, 661174009), P(453267433, 661180612), P(453263367, 661183151), P(453261027, 661187651), P(453259666, 661192864), P(453253680, 661199399), P(453248784, 661201787), P(453230245, 661205001), P(453230211, 661207935), P(453225321, 661209835), P(453221844, 661215663), P(453222311, 661217624), P(453220363, 661217602), P(453220341, 661219558), P(453205701, 661222324), P(453200743, 661230092), P(453190959, 661233891), P(453190404, 661239753), P(453191311, 661245632), P(453189818, 661248549), P(453186885, 661249493), P(453186863, 661251448), P(453172220, 661254213), P(453172198, 661256170), P(453161485, 661256045), P(453161462, 661258001), P(453151712, 661258866), P(453151689, 661260821), P(453141938, 661261686), P(453141916, 661263642), P(453139968, 661263619), P(453139991, 661261663), P(453130228, 661263506), P(453130251, 661261549), P(453102969, 661262206), P(453102029, 661259260), P(453082505, 661262941), P(453082493, 661263920), P(453080545, 661263896), P(453072684, 661269671), P(453059060, 661268530), P(453059999, 661271476), P(453055129, 661271417), P(453055106, 661273373), P(453053158, 661273350), P(453053181, 661271393), P(453020987, 661275405), P(453007376, 661273284), P(452999525, 661278078), P(452960553, 661278578), P(452954661, 661282418), P(452940027, 661284193), P(452936101, 661286592), P(452931086, 661298268), P(452905730, 661300394), P(452900823, 661303267), P(452875590, 661304251), P(452872569, 661303401), P(452850197, 661300670), P(452843335, 661304008), P(452842311, 661307907), P(452822717, 661316461), P(452818696, 661326192), P(452811865, 661327083), P(452811839, 661329039), P(452796297, 661325412), P(452785563, 661326742), P(452782501, 661337464), P(452780553, 661337438), P(452778517, 661344261), P(452772646, 661346141), P(452772634, 661347119), P(452774582, 661347145), P(452771495, 661359823), P(452765636, 661360726), P(452765611, 661362682), P(452762688, 661362644), P(452763085, 661369499), P(452760587, 661374358), P(452747858, 661379084), P(452747807, 661382997), P(452743896, 661383925), P(452743858, 661386859), P(452739942, 661388274), P(452738000, 661387761), P(452735987, 661392627), P(452723294, 661394417), P(452723269, 661396373), P(452718410, 661395331), P(452718384, 661397287), P(452702794, 661397081), P(452702769, 661399037), P(452700820, 661399011), P(452701768, 661400981), P(452696857, 661403851), P(452696805, 661407765), P(452689010, 661407662), P(452686997, 661412527), P(452665442, 661421046), P(452665429, 661422024), P(452664454, 661422012), P(452519219, 661493429), P(452498805, 661489227), P(452498832, 661487270), P(452482290, 661485079), P(452483238, 661487050), P(452481288, 661487022), P(452479284, 661490910), P(452474369, 661493777), P(452464402, 661509299), P(452457524, 661513117), P(452456856, 661525835), P(452446346, 661545266), P(452440455, 661548119), P(452439424, 661552021), P(452431563, 661556313), P(452429695, 661557950), P(452426184, 661556651), P(452423701, 661560608), P(452420790, 661559587), P(452420818, 661557629), P(452412016, 661559461), P(452406974, 661571138), P(452398390, 661575510), P(452399623, 661587782), P(452405710, 661584386), P(452406300, 661585550), P(452400264, 661588811), P(452394039, 661589065), P(452387137, 661594353), P(452377189, 661607919), P(452375253, 661606911), P(452375296, 661603974), P(452368492, 661602405), P(452365559, 661602853), P(452365588, 661600895), P(452363609, 661602825), P(452360684, 661602783), P(452361702, 661599860) };
+P arrB4[] = {P(452356784, 661602726), P(452353703, 661613453), P(452343909, 661616248), P(452343881, 661618206),
+             P(452338044, 661617141), P(452338016, 661619100), P(452331162, 661620958), P(452331133, 661622916),
+             P(452323275, 661626718), P(452322257, 661629642), P(452319317, 661630577), P(452318299, 661633500),
+             P(452309458, 661637776), P(452284978, 661644269), P(452266282, 661655256), P(452265263, 661658179),
+             P(452248612, 661662828), P(452248583, 661664786), P(452231974, 661666496), P(452231959, 661667475),
+             P(452236821, 661668528), P(452236807, 661669507), P(452233895, 661668484), P(452233866, 661670443),
+             P(452225081, 661670798), P(452224091, 661671763), P(452222148, 661671246), P(452222119, 661673204),
+             P(452214257, 661677004), P(452214243, 661677983), P(452210313, 661679883), P(452209337, 661679868),
+             P(452209293, 661682806), P(452206367, 661682761), P(452206323, 661685700), P(452189661, 661690833),
+             P(452184829, 661687820), P(452148187, 661693368), P(452143731, 661696008), P(452130592, 661700788),
+             P(452122615, 661700850), P(452115430, 661696551), P(452062913, 661685937), P(452059957, 661687850),
+             P(452052154, 661687728), P(452042340, 661691492), P(452026228, 661684402), P(452020760, 661682756),
+             P(452020081, 661677955), P(452006407, 661681128), P(452001469, 661684968), P(451969175, 661691310),
+             P(451967193, 661693237), P(451934945, 661696637), P(451930131, 661692641), P(451887392, 661681172),
+             P(451855099, 661666775), P(451846671, 661665812), P(451841898, 661659368), P(451825400, 661654198),
+             P(451825433, 661652240), P(451822507, 661652192), P(451819678, 661646268), P(451815794, 661645225),
+             P(451815826, 661643266), P(451811942, 661642223), P(451811974, 661640264), P(451808089, 661639221),
+             P(451809097, 661637278), P(451805229, 661635255), P(451804965, 661621540), P(451794850, 661614025),
+             P(451772514, 661608268), P(451771588, 661605315), P(451776463, 661605396), P(451776511, 661602459),
+             P(451779971, 661599579), P(451778429, 661598204), P(451763934, 661596373), P(451764453, 661594424),
+             P(451757889, 661578646), P(451755722, 661569788), P(451754058, 661566716), P(451750602, 661545596),
+             P(451749346, 661540282), P(451742486, 661507590), P(451741974, 661498759), P(451744022, 661494279),
+             P(451743407, 661486394), P(451744943, 661484090), P(451745890, 661482247), P(451746855, 661474598),
+             P(451745114, 661468556), P(451746906, 661463436), P(451752666, 661451916), P(451747874, 661448278),
+             P(451748442, 661443394), P(451747483, 661442398), P(451748555, 661436544), P(451747630, 661433593),
+             P(451753251, 661418029), P(451751302, 661417996), P(451752342, 661414100), P(451754283, 661414620),
+             P(451754792, 661413162), P(451753851, 661411189), P(451755832, 661409265), P(451755395, 661406322),
+             P(451758318, 661406371), P(451758901, 661400509), P(451761873, 661397624), P(451763466, 661389822),
+             P(451769894, 661384058), P(451773516, 661371399), P(451775464, 661371431), P(451783508, 661356398),
+             P(451785448, 661356921), P(451785966, 661354973), P(451792347, 661352144), P(451792881, 661349218),
+             P(451797298, 661347335), P(451796373, 661344384), P(451803223, 661342541), P(451803256, 661340585),
+             P(451805204, 661340617), P(451804844, 661332785), P(451809970, 661317217), P(451811951, 661315293),
+             P(451817678, 661292889), P(451819626, 661292921), P(451822715, 661282700), P(451825629, 661283239),
+             P(451825661, 661281283), P(451829557, 661281347), P(451829588, 661279391), P(451834442, 661280450),
+             P(451834975, 661277524), P(451845266, 661273781), P(451844324, 661271809), P(451847229, 661272834),
+             P(451847261, 661270879), P(451849209, 661270911), P(451848266, 661268940), P(451849561, 661269603),
+             P(451860517, 661264250), P(451861037, 661262302), P(451871804, 661259053), P(451874797, 661254703),
+             P(451880647, 661254307), P(451881661, 661251880), P(451885540, 661252921), P(451886057, 661250974),
+             P(451893488, 661243271), P(451905219, 661240527), P(451905251, 661238572), P(451909153, 661238144),
+             P(451915097, 661231885), P(451918011, 661232420), P(451924881, 661229109), P(451924912, 661227154),
+             P(451943521, 661220608), P(451943553, 661218653), P(451960151, 661215985), P(451961164, 661213554),
+             P(451963095, 661214563), P(451973821, 661213757), P(451979290, 661206512), P(451981756, 661204595),
+             P(451981710, 661207528), P(451990519, 661204734), P(451991554, 661200840), P(451997380, 661201910),
+             P(451998931, 661196067), P(452002371, 661194166), P(452003383, 661191736), P(452007285, 661191310),
+             P(452007346, 661187400), P(452009293, 661187431), P(452009324, 661185476), P(452011279, 661185016),
+             P(452017250, 661176801), P(452021198, 661173439), P(452024126, 661172998), P(452024157, 661171043),
+             P(452033960, 661166796), P(452090354, 661172079), P(452089836, 661174026), P(452093184, 661177990),
+             P(452095601, 661179005), P(452096030, 661182922), P(452097977, 661182952), P(452098890, 661186878),
+             P(452102266, 661188886), P(452103675, 661192328), P(452116287, 661195457), P(452139676, 661194352),
+             P(452140190, 661192404), P(452151470, 661187197), P(452158403, 661187227), P(452158852, 661185302),
+             P(452165201, 661181708), P(452166534, 661179723), P(452184851, 661169128), P(452232800, 661153230),
+             P(452243602, 661147038), P(452243631, 661145083), P(452248513, 661144179), P(452248541, 661142223),
+             P(452253423, 661141319), P(452253452, 661139364), P(452274918, 661136260), P(452294307, 661141927),
+             P(452294278, 661143881), P(452297198, 661143924), P(452297156, 661146857), P(452309789, 661148508),
+             P(452321506, 661146238), P(452321534, 661144282), P(452323481, 661144311), P(452323509, 661142356),
+             P(452326423, 661142886), P(452331318, 661141003), P(452336178, 661141564), P(452336207, 661139609),
+             P(452339113, 661140629), P(452339141, 661138675), P(452368316, 661141054), P(452368273, 661143987),
+             P(452378022, 661143150), P(452378050, 661141195), P(452383897, 661140789), P(452384857, 661141781),
+             P(452388161, 661140539), P(452393908, 661135947), P(452415172, 661132441), P(452433667, 661132705),
+             P(452438555, 661131310), P(452438583, 661129355), P(452448309, 661129980), P(452451250, 661128558),
+             P(452450249, 661130499), P(452469711, 661131261), P(452470670, 661132253), P(452511527, 661134782),
+             P(452516360, 661137295), P(452516387, 661135341), P(452521234, 661136873), P(452522241, 661134445),
+             P(452527101, 661135000), P(452528089, 661134036), P(452534896, 661134621), P(452534922, 661132666),
+             P(452538783, 661135162), P(452549524, 661132869), P(452549484, 661135801), P(452551431, 661135828),
+             P(452552438, 661133396), P(452563179, 661131102), P(452563691, 661129154), P(452567152, 661125291),
+             P(452569244, 661123719), P(452573237, 661121670), P(452577927, 661120551), P(452580188, 661119431),
+             P(452582833, 661117686), P(452583462, 661116160), P(452586793, 661112852), P(452591212, 661109980),
+             P(452592733, 661105600), P(452594686, 661105140), P(452594224, 661103178), P(452596490, 661091265),
+             P(452598766, 661088576), P(452600804, 661084696), P(452600876, 661083745), P(452602302, 661081783),
+             P(452602277, 661080782), P(452600669, 661075187), P(452596083, 661073879), P(452598242, 661058270),
+             P(452600188, 661058297), P(452601241, 661052447), P(452610052, 661054296), P(452610550, 661047687),
+             P(452611156, 661038899), P(452616042, 661037498), P(452617048, 661035070), P(452630756, 661028902),
+             P(452641493, 661026606), P(452642499, 661024174), P(452647358, 661024730), P(452647383, 661022776),
+             P(452682271, 661033994), P(452682245, 661035948), P(452685171, 661035497), P(452699665, 661043508),
+             P(452704492, 661046505), P(452709823, 661048043), P(452710286, 661050004), P(452712238, 661049539),
+             P(452714159, 661051520), P(452718057, 661051084), P(452718980, 661055005), P(452722866, 661055544),
+             P(452725728, 661059982), P(452734449, 661063028), P(452734423, 661064983), P(452742177, 661067527),
+             P(452759708, 661066780), P(452772290, 661072321), P(452773200, 661077220), P(452776119, 661077258),
+             P(452782744, 661092006), P(452784690, 661092031), P(452786574, 661096944), P(452789500, 661096491),
+             P(452793847, 661098993), P(452794311, 661100954), P(452799165, 661101994), P(452800013, 661111780),
+             P(452803900, 661112318), P(452804842, 661114776), P(452825178, 661123345), P(452832947, 661124913),
+             P(452832971, 661122958), P(452837832, 661123508), P(452838818, 661122542), P(452841726, 661123557),
+             P(452880706, 661120632), P(452880730, 661118678), P(452893421, 661115904), P(452893397, 661117860),
+             P(452904062, 661121413), P(452928410, 661120740), P(452943065, 661116525), P(452943090, 661114570),
+             P(452985961, 661111675), P(453009311, 661112938), P(453015169, 661111544), P(453015204, 661108612),
+             P(453021080, 661105751), P(453021056, 661107705), P(453034702, 661106402), P(453035704, 661103972),
+             P(453044499, 661101145), P(453044476, 661103100), P(453051330, 661099760), P(453054245, 661100285),
+             P(453056232, 661096886), P(453062072, 661096956), P(453075763, 661091744), P(453075786, 661089790),
+             P(453091342, 661091440), P(453092327, 661090473), P(453098161, 661091033), P(453098150, 661092010),
+             P(453099123, 661092022), P(453101067, 661091304), P(453104154, 661092379), P(453105206, 661093453),
+             P(453109697, 661093005), P(453110398, 661090051), P(453114328, 661090409), P(453118888, 661090140),
+             P(453118958, 661093095), P(453119660, 661093453), P(453121274, 661094527), P(453121695, 661096766),
+             P(453122747, 661097751), P(453124572, 661098467), P(453124361, 661100168), P(453125694, 661100168),
+             P(453127659, 661101601), P(453128220, 661105361), P(453130044, 661105540), P(453132290, 661105092),
+             P(453133272, 661104287), P(453136921, 661105361), P(453138815, 661104466), P(453142464, 661103481),
+             P(453144569, 661102227), P(453146744, 661100795), P(453149340, 661100078), P(453158812, 661100795),
+             P(453159514, 661097751), P(453161829, 661098914), P(453162321, 661101869), P(453163934, 661102854),
+             P(453166951, 661104018), P(453168074, 661107241), P(453169898, 661108226), P(453172705, 661109032),
+             P(453174529, 661110554), P(453186177, 661110644), P(453186878, 661109838), P(453188001, 661107779),
+             P(453189475, 661108674), P(453189615, 661111987), P(453190527, 661112793), P(453196070, 661113420),
+             P(453201543, 661114046), P(453202244, 661116285), P(453202244, 661118255), P(453204349, 661120762),
+             P(453206524, 661119956), P(453209542, 661119419), P(453212729, 661117781), P(453222419, 661121803),
+             P(453224728, 661121833), P(453239945, 661125773), P(453245816, 661125587), P(453248112, 661129064),
+             P(453251571, 661130966), P(453256041, 661132041), P(453258475, 661130577), P(453259734, 661131275),
+             P(453264963, 661132441), P(453268426, 661134581), P(453272059, 661136164), P(453273111, 661140910),
+             P(453274725, 661145857), P(453272648, 661157566), P(453269739, 661156556), P(453269716, 661158511),
+             P(453267989, 661159496), P(453270658, 661161455), P(453269163, 661164371), P(453269619, 661167310),
+             P(453267672, 661167288), P(453265548, 661174009), P(453267433, 661180612), P(453263367, 661183151),
+             P(453261027, 661187651), P(453259666, 661192864), P(453253680, 661199399), P(453248784, 661201787),
+             P(453230245, 661205001), P(453230211, 661207935), P(453225321, 661209835), P(453221844, 661215663),
+             P(453222311, 661217624), P(453220363, 661217602), P(453220341, 661219558), P(453205701, 661222324),
+             P(453200743, 661230092), P(453190959, 661233891), P(453190404, 661239753), P(453191311, 661245632),
+             P(453189818, 661248549), P(453186885, 661249493), P(453186863, 661251448), P(453172220, 661254213),
+             P(453172198, 661256170), P(453161485, 661256045), P(453161462, 661258001), P(453151712, 661258866),
+             P(453151689, 661260821), P(453141938, 661261686), P(453141916, 661263642), P(453139968, 661263619),
+             P(453139991, 661261663), P(453130228, 661263506), P(453130251, 661261549), P(453102969, 661262206),
+             P(453102029, 661259260), P(453082505, 661262941), P(453082493, 661263920), P(453080545, 661263896),
+             P(453072684, 661269671), P(453059060, 661268530), P(453059999, 661271476), P(453055129, 661271417),
+             P(453055106, 661273373), P(453053158, 661273350), P(453053181, 661271393), P(453020987, 661275405),
+             P(453007376, 661273284), P(452999525, 661278078), P(452960553, 661278578), P(452954661, 661282418),
+             P(452940027, 661284193), P(452936101, 661286592), P(452931086, 661298268), P(452905730, 661300394),
+             P(452900823, 661303267), P(452875590, 661304251), P(452872569, 661303401), P(452850197, 661300670),
+             P(452843335, 661304008), P(452842311, 661307907), P(452822717, 661316461), P(452818696, 661326192),
+             P(452811865, 661327083), P(452811839, 661329039), P(452796297, 661325412), P(452785563, 661326742),
+             P(452782501, 661337464), P(452780553, 661337438), P(452778517, 661344261), P(452772646, 661346141),
+             P(452772634, 661347119), P(452774582, 661347145), P(452771495, 661359823), P(452765636, 661360726),
+             P(452765611, 661362682), P(452762688, 661362644), P(452763085, 661369499), P(452760587, 661374358),
+             P(452747858, 661379084), P(452747807, 661382997), P(452743896, 661383925), P(452743858, 661386859),
+             P(452739942, 661388274), P(452738000, 661387761), P(452735987, 661392627), P(452723294, 661394417),
+             P(452723269, 661396373), P(452718410, 661395331), P(452718384, 661397287), P(452702794, 661397081),
+             P(452702769, 661399037), P(452700820, 661399011), P(452701768, 661400981), P(452696857, 661403851),
+             P(452696805, 661407765), P(452689010, 661407662), P(452686997, 661412527), P(452665442, 661421046),
+             P(452665429, 661422024), P(452664454, 661422012), P(452519219, 661493429), P(452498805, 661489227),
+             P(452498832, 661487270), P(452482290, 661485079), P(452483238, 661487050), P(452481288, 661487022),
+             P(452479284, 661490910), P(452474369, 661493777), P(452464402, 661509299), P(452457524, 661513117),
+             P(452456856, 661525835), P(452446346, 661545266), P(452440455, 661548119), P(452439424, 661552021),
+             P(452431563, 661556313), P(452429695, 661557950), P(452426184, 661556651), P(452423701, 661560608),
+             P(452420790, 661559587), P(452420818, 661557629), P(452412016, 661559461), P(452406974, 661571138),
+             P(452398390, 661575510), P(452399623, 661587782), P(452405710, 661584386), P(452406300, 661585550),
+             P(452400264, 661588811), P(452394039, 661589065), P(452387137, 661594353), P(452377189, 661607919),
+             P(452375253, 661606911), P(452375296, 661603974), P(452368492, 661602405), P(452365559, 661602853),
+             P(452365588, 661600895), P(452363609, 661602825), P(452360684, 661602783), P(452361702, 661599860)};
 
-  P arrB5[] = { P(453373290, 663707143), P(453373386, 663712231), P(453370442, 663713991), P(453369680, 663716470), P(453361829, 663715396), P(453361808, 663717370), P(453356883, 663718303), P(453356861, 663720276), P(453358827, 663720298), P(453358816, 663721284), P(453352920, 663721219), P(453347946, 663714950), P(453345194, 663713287), P(453338233, 663716122), P(453337226, 663717766), P(453335284, 663716089), P(453334538, 663717958), P(453332874, 663718470), P(453333066, 663722054), P(453328074, 663723014), P(453327335, 663723895), P(453322698, 663725063), P(453322389, 663726801), P(453315966, 663729690), P(453313522, 663728676), P(453313499, 663730649), P(453304622, 663733510), P(453301618, 663738410), P(453299652, 663738389), P(453299631, 663740362), P(453297670, 663739845), P(453294727, 663739320), P(453294705, 663741293), P(453273098, 663748103), P(453267978, 663751430), P(453251338, 663750919), P(453246497, 663745185), P(453225846, 663745934), P(453223898, 663744433), P(453222960, 663740475), P(453216047, 663743355), P(453216092, 663739408), P(453213144, 663739374), P(453213121, 663741348), P(453211634, 663740835), P(453210226, 663740259), P(453209212, 663739329), P(453209235, 663737354), P(453212195, 663736402), P(453207818, 663734534), P(453208330, 663731975), P(453207361, 663729438), P(453204746, 663728903), P(453202954, 663727366), P(453200650, 663725574), P(453198629, 663719468), P(453197322, 663712774), P(453201221, 663707656), P(453198602, 663701510), P(453194762, 663698439), P(453190922, 663696903), P(453189642, 663692807), P(453186570, 663688198), P(453175515, 663678739), P(453170751, 663665857), P(453161977, 663659834), P(453160070, 663654878), P(453157134, 663653857), P(453155215, 663649888), P(453149309, 663650805), P(453148488, 663636983), P(453145541, 663636948), P(453146558, 663634000), P(453153423, 663635069), P(453153400, 663637041), P(453156336, 663638063), P(453156359, 663636089), P(453159295, 663637111), P(453162858, 663626301), P(453160519, 663616408), P(453165454, 663614493), P(453165978, 663611540), P(453170423, 663609619), P(453171941, 663605691), P(453179856, 663600852), P(453180372, 663598885), P(453187294, 663595021), P(453194808, 663582285), P(453201899, 663563628), P(453207620, 663536079), P(453209585, 663536101), P(453211101, 663532175), P(453214563, 663530242), P(453218066, 663524366), P(453219665, 663513537), P(453222611, 663513570), P(453224642, 663507678), P(453229575, 663505763), P(453229597, 663503790), P(453231561, 663503813), P(453230625, 663499859), P(453233570, 663499892), P(453239047, 663493052), P(453243098, 663482253), P(453247060, 663479340), P(453251502, 663477419), P(453251525, 663475447), P(453257427, 663474529), P(453256957, 663472551), P(453262442, 663465218), P(453293799, 663470997), P(453293274, 663473949), P(453298671, 663474501), P(453299663, 663473527), P(453302603, 663474054), P(453302581, 663476026), P(453334999, 663474908), P(453337479, 663472472), P(453337131, 663459651), P(453339100, 663459178), P(453340109, 663456726), P(453345034, 663455300), P(453353870, 663455398), P(453362284, 663449084), P(453365337, 663439259), P(453371784, 663433415), P(453373796, 663428999), P(453379670, 663430544), P(453378667, 663432505), P(453383549, 663435021), P(453389455, 663433608), P(453389477, 663431637), P(453393414, 663430694), P(453394422, 663428239), P(453406229, 663425904), P(453406208, 663427875), P(453410119, 663429396), P(453415075, 663425015), P(453416083, 663422559), P(453427853, 663423672), P(453431818, 663421383), P(453436170, 663416327), P(453441802, 663414278), P(453450250, 663413766), P(453458442, 663414790), P(453463562, 663416839), P(453466506, 663420102), P(453470091, 663421661), P(453471538, 663423715), P(453476911, 663426662), P(453477893, 663426673), P(453478875, 663426683), P(453480626, 663428451), P(453491596, 663430761), P(453491617, 663428790), P(453494561, 663428820), P(453495502, 663432774), P(453498432, 663434281), P(453503356, 663432856), P(453503335, 663434827), P(453504337, 663432866), P(453506301, 663432888), P(453504307, 663435823), P(453502343, 663435803), P(453499326, 663442672), P(453502271, 663442703), P(453502241, 663445660), P(453500277, 663445640), P(453502205, 663449109), P(453512007, 663450693), P(453512455, 663454641), P(453510409, 663462506), P(453512815, 663467461), P(453510851, 663467441), P(453508836, 663472350), P(453499989, 663473243), P(453499969, 663475214), P(453498005, 663475194), P(453497440, 663482090), P(453497410, 663485048), P(453497871, 663488011), P(453499846, 663487045), P(453500283, 663491980), P(453497707, 663503786), P(453493769, 663504730), P(453493142, 663517543), P(453491577, 663526402), P(453489613, 663526381), P(453487577, 663533263), P(453482656, 663534197), P(453478635, 663543030), P(453462838, 663550753), P(453463789, 663553721), P(453459865, 663553185), P(453456893, 663555620), P(453456871, 663557593), P(453455794, 663557572), P(453455698, 663558564), P(453456861, 663558579), P(453456840, 663560551), P(453454876, 663560530), P(453455334, 663563494), P(453451825, 663570360), P(453446666, 663573511), P(453445898, 663580678), P(453447791, 663580180), P(453447242, 663583175), P(453448742, 663583150), P(453449682, 663587106), P(453459526, 663585238), P(453459547, 663583266), P(453461511, 663583287), P(453460498, 663586235), P(453458533, 663586213), P(453458512, 663588186), P(453448669, 663590054), P(453449137, 663592032), P(453445596, 663601858), P(453437770, 663605127), P(453434634, 663603911), P(453431754, 663603846), P(453430829, 663604659), P(453429194, 663604615), P(453428844, 663606610), P(453430808, 663606631), P(453426291, 663615461), P(453423689, 663629243), P(453418745, 663632150), P(453414624, 663649863), P(453412660, 663649842), P(453413589, 663654785), P(453411634, 663653778), P(453409616, 663658689), P(453407651, 663658667), P(453401628, 663670442), P(453396694, 663672361), P(453391306, 663687367), P(453385834, 663694310), P(453373642, 663695558), P(453373066, 663697062), P(453365834, 663702471), P(453368618, 663706054) };
+P arrB5[] = {P(453373290, 663707143), P(453373386, 663712231), P(453370442, 663713991), P(453369680, 663716470),
+             P(453361829, 663715396), P(453361808, 663717370), P(453356883, 663718303), P(453356861, 663720276),
+             P(453358827, 663720298), P(453358816, 663721284), P(453352920, 663721219), P(453347946, 663714950),
+             P(453345194, 663713287), P(453338233, 663716122), P(453337226, 663717766), P(453335284, 663716089),
+             P(453334538, 663717958), P(453332874, 663718470), P(453333066, 663722054), P(453328074, 663723014),
+             P(453327335, 663723895), P(453322698, 663725063), P(453322389, 663726801), P(453315966, 663729690),
+             P(453313522, 663728676), P(453313499, 663730649), P(453304622, 663733510), P(453301618, 663738410),
+             P(453299652, 663738389), P(453299631, 663740362), P(453297670, 663739845), P(453294727, 663739320),
+             P(453294705, 663741293), P(453273098, 663748103), P(453267978, 663751430), P(453251338, 663750919),
+             P(453246497, 663745185), P(453225846, 663745934), P(453223898, 663744433), P(453222960, 663740475),
+             P(453216047, 663743355), P(453216092, 663739408), P(453213144, 663739374), P(453213121, 663741348),
+             P(453211634, 663740835), P(453210226, 663740259), P(453209212, 663739329), P(453209235, 663737354),
+             P(453212195, 663736402), P(453207818, 663734534), P(453208330, 663731975), P(453207361, 663729438),
+             P(453204746, 663728903), P(453202954, 663727366), P(453200650, 663725574), P(453198629, 663719468),
+             P(453197322, 663712774), P(453201221, 663707656), P(453198602, 663701510), P(453194762, 663698439),
+             P(453190922, 663696903), P(453189642, 663692807), P(453186570, 663688198), P(453175515, 663678739),
+             P(453170751, 663665857), P(453161977, 663659834), P(453160070, 663654878), P(453157134, 663653857),
+             P(453155215, 663649888), P(453149309, 663650805), P(453148488, 663636983), P(453145541, 663636948),
+             P(453146558, 663634000), P(453153423, 663635069), P(453153400, 663637041), P(453156336, 663638063),
+             P(453156359, 663636089), P(453159295, 663637111), P(453162858, 663626301), P(453160519, 663616408),
+             P(453165454, 663614493), P(453165978, 663611540), P(453170423, 663609619), P(453171941, 663605691),
+             P(453179856, 663600852), P(453180372, 663598885), P(453187294, 663595021), P(453194808, 663582285),
+             P(453201899, 663563628), P(453207620, 663536079), P(453209585, 663536101), P(453211101, 663532175),
+             P(453214563, 663530242), P(453218066, 663524366), P(453219665, 663513537), P(453222611, 663513570),
+             P(453224642, 663507678), P(453229575, 663505763), P(453229597, 663503790), P(453231561, 663503813),
+             P(453230625, 663499859), P(453233570, 663499892), P(453239047, 663493052), P(453243098, 663482253),
+             P(453247060, 663479340), P(453251502, 663477419), P(453251525, 663475447), P(453257427, 663474529),
+             P(453256957, 663472551), P(453262442, 663465218), P(453293799, 663470997), P(453293274, 663473949),
+             P(453298671, 663474501), P(453299663, 663473527), P(453302603, 663474054), P(453302581, 663476026),
+             P(453334999, 663474908), P(453337479, 663472472), P(453337131, 663459651), P(453339100, 663459178),
+             P(453340109, 663456726), P(453345034, 663455300), P(453353870, 663455398), P(453362284, 663449084),
+             P(453365337, 663439259), P(453371784, 663433415), P(453373796, 663428999), P(453379670, 663430544),
+             P(453378667, 663432505), P(453383549, 663435021), P(453389455, 663433608), P(453389477, 663431637),
+             P(453393414, 663430694), P(453394422, 663428239), P(453406229, 663425904), P(453406208, 663427875),
+             P(453410119, 663429396), P(453415075, 663425015), P(453416083, 663422559), P(453427853, 663423672),
+             P(453431818, 663421383), P(453436170, 663416327), P(453441802, 663414278), P(453450250, 663413766),
+             P(453458442, 663414790), P(453463562, 663416839), P(453466506, 663420102), P(453470091, 663421661),
+             P(453471538, 663423715), P(453476911, 663426662), P(453477893, 663426673), P(453478875, 663426683),
+             P(453480626, 663428451), P(453491596, 663430761), P(453491617, 663428790), P(453494561, 663428820),
+             P(453495502, 663432774), P(453498432, 663434281), P(453503356, 663432856), P(453503335, 663434827),
+             P(453504337, 663432866), P(453506301, 663432888), P(453504307, 663435823), P(453502343, 663435803),
+             P(453499326, 663442672), P(453502271, 663442703), P(453502241, 663445660), P(453500277, 663445640),
+             P(453502205, 663449109), P(453512007, 663450693), P(453512455, 663454641), P(453510409, 663462506),
+             P(453512815, 663467461), P(453510851, 663467441), P(453508836, 663472350), P(453499989, 663473243),
+             P(453499969, 663475214), P(453498005, 663475194), P(453497440, 663482090), P(453497410, 663485048),
+             P(453497871, 663488011), P(453499846, 663487045), P(453500283, 663491980), P(453497707, 663503786),
+             P(453493769, 663504730), P(453493142, 663517543), P(453491577, 663526402), P(453489613, 663526381),
+             P(453487577, 663533263), P(453482656, 663534197), P(453478635, 663543030), P(453462838, 663550753),
+             P(453463789, 663553721), P(453459865, 663553185), P(453456893, 663555620), P(453456871, 663557593),
+             P(453455794, 663557572), P(453455698, 663558564), P(453456861, 663558579), P(453456840, 663560551),
+             P(453454876, 663560530), P(453455334, 663563494), P(453451825, 663570360), P(453446666, 663573511),
+             P(453445898, 663580678), P(453447791, 663580180), P(453447242, 663583175), P(453448742, 663583150),
+             P(453449682, 663587106), P(453459526, 663585238), P(453459547, 663583266), P(453461511, 663583287),
+             P(453460498, 663586235), P(453458533, 663586213), P(453458512, 663588186), P(453448669, 663590054),
+             P(453449137, 663592032), P(453445596, 663601858), P(453437770, 663605127), P(453434634, 663603911),
+             P(453431754, 663603846), P(453430829, 663604659), P(453429194, 663604615), P(453428844, 663606610),
+             P(453430808, 663606631), P(453426291, 663615461), P(453423689, 663629243), P(453418745, 663632150),
+             P(453414624, 663649863), P(453412660, 663649842), P(453413589, 663654785), P(453411634, 663653778),
+             P(453409616, 663658689), P(453407651, 663658667), P(453401628, 663670442), P(453396694, 663672361),
+             P(453391306, 663687367), P(453385834, 663694310), P(453373642, 663695558), P(453373066, 663697062),
+             P(453365834, 663702471), P(453368618, 663706054)};
 
-  P arrB6[] = { P(452404827, 662444214), P(452409435, 662433462), P(452421723, 662429366), P(452428891, 662425782), P(452446811, 662412470), P(452459099, 662396086), P(452469851, 662375094), P(452490843, 662354101), P(452513883, 662336694), P(452523611, 662325430), P(452527707, 662316726), P(452548187, 662304437), P(452555355, 662292662), P(452565083, 662290102), P(452581467, 662276278), P(452596827, 662268598), P(452611675, 662266550), P(452626011, 662262966), P(452633179, 662257334), P(452639323, 662251190), P(452659291, 662246582), P(452663898, 662238902), P(452673627, 662235318), P(452680283, 662227126), P(452687451, 662214838), P(452687451, 662206134), P(452677723, 662199477), P(452683867, 662193334), P(452690523, 662198454), P(452699739, 662198454), P(452705883, 662196406), P(452707419, 662191797), P(452703835, 662170294), P(452696155, 662169270), P(452697179, 662163638), P(452692059, 662163125), P(452693083, 662160053), P(452701275, 662155446), P(452710491, 662155958), P(452719707, 662156982), P(452727199, 662150103), P(452740229, 662146595), P(452745307, 662150326), P(452755035, 662146230), P(452750427, 662153397), P(452757083, 662155446), P(452765275, 662151862), P(452771419, 662144694), P(452776538, 662130357), P(452779611, 662114998), P(452788827, 662106806), P(452799579, 662100662), P(452809819, 662095030), P(452838491, 662088374), P(452855899, 662076086), P(452872283, 662064821), P(452902490, 662049973), P(452923483, 662034102), P(452938843, 662030517), P(452955739, 662019766), P(452979290, 662000310), P(453007451, 661990582), P(453055899, 661972889), P(453077658, 661969101), P(453119067, 661970102), P(453126747, 661963958), P(453144667, 661956277), P(453171803, 661946550), P(453179482, 661937334), P(453196891, 661931701), P(453203547, 661921461), P(453220443, 661911222), P(453228635, 661900982), P(453240923, 661898421), P(453248603, 661890230), P(453266011, 661870261), P(453287515, 661858486), P(453303899, 661855925), P(453314139, 661852854), P(453330011, 661851317), P(453329499, 661856949), P(453333083, 661855925), P(453342811, 661851317), P(453358683, 661848758), P(453365339, 661842102), P(453382234, 661836470), P(453397595, 661834422), P(453406299, 661828278), P(453428315, 661829302), P(453436507, 661835446), P(453443162, 661838518), P(453449818, 661838006), P(453457499, 661833397), P(453469786, 661829814), P(453475419, 661824694), P(453492314, 661814454), P(453498970, 661812406), P(453524571, 661813429), P(453533275, 661809333), P(453541979, 661801142), P(453549659, 661792950), P(453557338, 661789877), P(453560923, 661783734), P(453562094, 661783499), P(453562877, 661782035), P(453564392, 661781898), P(453565603, 661780029), P(453568191, 661779574), P(453569120, 661780105), P(453572187, 661775541), P(453577307, 661773494), P(453586522, 661770934), P(453592155, 661766326), P(453595738, 661755062), P(453600347, 661750966), P(453611099, 661746869), P(453616219, 661743286), P(453625947, 661733558), P(453633115, 661731510), P(453645403, 661725366), P(453653595, 661719222), P(453663835, 661715126), P(453687899, 661710518), P(453695066, 661705398), P(453717594, 661689013), P(453721432, 661684218), P(453725599, 661681402), P(453736557, 661679220), P(453742064, 661677029), P(453744862, 661676716), P(453747313, 661675518), P(453749460, 661675129), P(453750545, 661673542), P(453752775, 661671731), P(453754943, 661667704), P(453755737, 661663682), P(453758555, 661661366), P(453761856, 661659626), P(453763455, 661657235), P(453766187, 661656018), P(453770331, 661648566), P(453776987, 661644982), P(453793371, 661640886), P(453807707, 661629110), P(453828699, 661620917), P(453865563, 661599413), P(453886042, 661597878), P(453892698, 661600438), P(453967451, 661604534), P(453981787, 661607606), P(453987931, 661611702), P(454011994, 661612213), P(454026843, 661611190), P(454037082, 661609142), P(454040667, 661613749), P(454051419, 661617846), P(454058075, 661617333), P(454061147, 661622966), P(454069851, 661630133), P(454074459, 661631670), P(454081627, 661628086), P(454082651, 661640886), P(454084187, 661645493), P(454093403, 661650614), P(454099035, 661652662), P(454089307, 661670070), P(454081627, 661678774), P(454067291, 661682870), P(454063706, 661687477), P(454060635, 661685430), P(454050907, 661691062), P(454042203, 661698229), P(454030426, 661711542), P(454022747, 661717685), P(454009947, 661726902), P(453996635, 661727414), P(453978203, 661738166), P(453967451, 661744822), P(453962842, 661757109), P(453959771, 661756597), P(453958235, 661751990), P(453953626, 661749430), P(453937243, 661756086), P(453902939, 661763765), P(453887579, 661780662), P(453861467, 661792438), P(453844571, 661807798), P(453814875, 661821622), P(453803611, 661831350), P(453774427, 661843638), P(453750874, 661852342), P(453738587, 661862582), P(453718107, 661870261), P(453708378, 661878966), P(453700699, 661885110), P(453686363, 661887670), P(453670491, 661895862), P(453656155, 661896374), P(453642331, 661900982), P(453622363, 661900982), P(453607515, 661909174), P(453592155, 661924534), P(453587035, 661934262), P(453581403, 661947574), P(453574747, 661957813), P(453569627, 661961398), P(453559387, 661959350), P(453557616, 661955248), P(453552840, 661953921), P(453548635, 661956789), P(453536347, 661968566), P(453530203, 661973173), P(453522011, 661975734), P(453517402, 661980854), P(453508699, 661983414), P(453499483, 661989558), P(453483098, 661996726), P(453473371, 662004405), P(453470299, 662015158), P(453464667, 662018229), P(453455451, 662015670), P(453442139, 662019254), P(453431899, 662029494), P(453426267, 662046902), P(453413467, 662069430), P(453402202, 662075062), P(453394523, 662077621), P(453382234, 662075574), P(453370971, 662075574), P(453345371, 662085302), P(453337178, 662092469), P(453318235, 662100150), P(453308507, 662107318), P(453301851, 662116022), P(453291611, 662122166), P(453278299, 662126262), P(453260891, 662123702), P(453231194, 662125237), P(453214367, 662130618), P(453206042, 662146953), P(453207493, 662146599), P(453210183, 662150477), P(453206315, 662155170), P(453196952, 662150737), P(453183375, 662147295), P(453155784, 662134555), P(453149057, 662145097), P(453145949, 662150303), P(453144139, 662154765), P(453138982, 662156908), P(453132801, 662157083), P(453126532, 662158075), P(453119423, 662156788), P(453115654, 662155456), P(453107291, 662169270), P(453084251, 662181558), P(453067867, 662188726), P(453041243, 662195893), P(453007451, 662210742), P(452985435, 662217398), P(452964955, 662223030), P(452948059, 662234806), P(452930651, 662251701), P(452917851, 662253238), P(452907099, 662259893), P(452885082, 662263990), P(452861019, 662274230), P(452832859, 662283445), P(452823131, 662290102), P(452803675, 662301365), P(452795995, 662301365), P(452786779, 662304437), P(452771419, 662306486), P(452758107, 662315190), P(452732507, 662325430), P(452700251, 662338741), P(452668507, 662351542), P(452652123, 662360757), P(452637787, 662365366), P(452631643, 662370998), P(452617819, 662378166), P(452595803, 662385845), P(452579419, 662399670), P(452571739, 662404278), P(452556891, 662406838), P(452543066, 662411958), P(452525147, 662417590), P(452495450, 662431926), P(452478043, 662430901), P(452449883, 662436534), P(452443738, 662441142), P(452429403, 662442678), P(452418650, 662441142), P(452414043, 662444214), P(452410971, 662440630) };
+P arrB6[] = {P(452404827, 662444214), P(452409435, 662433462), P(452421723, 662429366), P(452428891, 662425782),
+             P(452446811, 662412470), P(452459099, 662396086), P(452469851, 662375094), P(452490843, 662354101),
+             P(452513883, 662336694), P(452523611, 662325430), P(452527707, 662316726), P(452548187, 662304437),
+             P(452555355, 662292662), P(452565083, 662290102), P(452581467, 662276278), P(452596827, 662268598),
+             P(452611675, 662266550), P(452626011, 662262966), P(452633179, 662257334), P(452639323, 662251190),
+             P(452659291, 662246582), P(452663898, 662238902), P(452673627, 662235318), P(452680283, 662227126),
+             P(452687451, 662214838), P(452687451, 662206134), P(452677723, 662199477), P(452683867, 662193334),
+             P(452690523, 662198454), P(452699739, 662198454), P(452705883, 662196406), P(452707419, 662191797),
+             P(452703835, 662170294), P(452696155, 662169270), P(452697179, 662163638), P(452692059, 662163125),
+             P(452693083, 662160053), P(452701275, 662155446), P(452710491, 662155958), P(452719707, 662156982),
+             P(452727199, 662150103), P(452740229, 662146595), P(452745307, 662150326), P(452755035, 662146230),
+             P(452750427, 662153397), P(452757083, 662155446), P(452765275, 662151862), P(452771419, 662144694),
+             P(452776538, 662130357), P(452779611, 662114998), P(452788827, 662106806), P(452799579, 662100662),
+             P(452809819, 662095030), P(452838491, 662088374), P(452855899, 662076086), P(452872283, 662064821),
+             P(452902490, 662049973), P(452923483, 662034102), P(452938843, 662030517), P(452955739, 662019766),
+             P(452979290, 662000310), P(453007451, 661990582), P(453055899, 661972889), P(453077658, 661969101),
+             P(453119067, 661970102), P(453126747, 661963958), P(453144667, 661956277), P(453171803, 661946550),
+             P(453179482, 661937334), P(453196891, 661931701), P(453203547, 661921461), P(453220443, 661911222),
+             P(453228635, 661900982), P(453240923, 661898421), P(453248603, 661890230), P(453266011, 661870261),
+             P(453287515, 661858486), P(453303899, 661855925), P(453314139, 661852854), P(453330011, 661851317),
+             P(453329499, 661856949), P(453333083, 661855925), P(453342811, 661851317), P(453358683, 661848758),
+             P(453365339, 661842102), P(453382234, 661836470), P(453397595, 661834422), P(453406299, 661828278),
+             P(453428315, 661829302), P(453436507, 661835446), P(453443162, 661838518), P(453449818, 661838006),
+             P(453457499, 661833397), P(453469786, 661829814), P(453475419, 661824694), P(453492314, 661814454),
+             P(453498970, 661812406), P(453524571, 661813429), P(453533275, 661809333), P(453541979, 661801142),
+             P(453549659, 661792950), P(453557338, 661789877), P(453560923, 661783734), P(453562094, 661783499),
+             P(453562877, 661782035), P(453564392, 661781898), P(453565603, 661780029), P(453568191, 661779574),
+             P(453569120, 661780105), P(453572187, 661775541), P(453577307, 661773494), P(453586522, 661770934),
+             P(453592155, 661766326), P(453595738, 661755062), P(453600347, 661750966), P(453611099, 661746869),
+             P(453616219, 661743286), P(453625947, 661733558), P(453633115, 661731510), P(453645403, 661725366),
+             P(453653595, 661719222), P(453663835, 661715126), P(453687899, 661710518), P(453695066, 661705398),
+             P(453717594, 661689013), P(453721432, 661684218), P(453725599, 661681402), P(453736557, 661679220),
+             P(453742064, 661677029), P(453744862, 661676716), P(453747313, 661675518), P(453749460, 661675129),
+             P(453750545, 661673542), P(453752775, 661671731), P(453754943, 661667704), P(453755737, 661663682),
+             P(453758555, 661661366), P(453761856, 661659626), P(453763455, 661657235), P(453766187, 661656018),
+             P(453770331, 661648566), P(453776987, 661644982), P(453793371, 661640886), P(453807707, 661629110),
+             P(453828699, 661620917), P(453865563, 661599413), P(453886042, 661597878), P(453892698, 661600438),
+             P(453967451, 661604534), P(453981787, 661607606), P(453987931, 661611702), P(454011994, 661612213),
+             P(454026843, 661611190), P(454037082, 661609142), P(454040667, 661613749), P(454051419, 661617846),
+             P(454058075, 661617333), P(454061147, 661622966), P(454069851, 661630133), P(454074459, 661631670),
+             P(454081627, 661628086), P(454082651, 661640886), P(454084187, 661645493), P(454093403, 661650614),
+             P(454099035, 661652662), P(454089307, 661670070), P(454081627, 661678774), P(454067291, 661682870),
+             P(454063706, 661687477), P(454060635, 661685430), P(454050907, 661691062), P(454042203, 661698229),
+             P(454030426, 661711542), P(454022747, 661717685), P(454009947, 661726902), P(453996635, 661727414),
+             P(453978203, 661738166), P(453967451, 661744822), P(453962842, 661757109), P(453959771, 661756597),
+             P(453958235, 661751990), P(453953626, 661749430), P(453937243, 661756086), P(453902939, 661763765),
+             P(453887579, 661780662), P(453861467, 661792438), P(453844571, 661807798), P(453814875, 661821622),
+             P(453803611, 661831350), P(453774427, 661843638), P(453750874, 661852342), P(453738587, 661862582),
+             P(453718107, 661870261), P(453708378, 661878966), P(453700699, 661885110), P(453686363, 661887670),
+             P(453670491, 661895862), P(453656155, 661896374), P(453642331, 661900982), P(453622363, 661900982),
+             P(453607515, 661909174), P(453592155, 661924534), P(453587035, 661934262), P(453581403, 661947574),
+             P(453574747, 661957813), P(453569627, 661961398), P(453559387, 661959350), P(453557616, 661955248),
+             P(453552840, 661953921), P(453548635, 661956789), P(453536347, 661968566), P(453530203, 661973173),
+             P(453522011, 661975734), P(453517402, 661980854), P(453508699, 661983414), P(453499483, 661989558),
+             P(453483098, 661996726), P(453473371, 662004405), P(453470299, 662015158), P(453464667, 662018229),
+             P(453455451, 662015670), P(453442139, 662019254), P(453431899, 662029494), P(453426267, 662046902),
+             P(453413467, 662069430), P(453402202, 662075062), P(453394523, 662077621), P(453382234, 662075574),
+             P(453370971, 662075574), P(453345371, 662085302), P(453337178, 662092469), P(453318235, 662100150),
+             P(453308507, 662107318), P(453301851, 662116022), P(453291611, 662122166), P(453278299, 662126262),
+             P(453260891, 662123702), P(453231194, 662125237), P(453214367, 662130618), P(453206042, 662146953),
+             P(453207493, 662146599), P(453210183, 662150477), P(453206315, 662155170), P(453196952, 662150737),
+             P(453183375, 662147295), P(453155784, 662134555), P(453149057, 662145097), P(453145949, 662150303),
+             P(453144139, 662154765), P(453138982, 662156908), P(453132801, 662157083), P(453126532, 662158075),
+             P(453119423, 662156788), P(453115654, 662155456), P(453107291, 662169270), P(453084251, 662181558),
+             P(453067867, 662188726), P(453041243, 662195893), P(453007451, 662210742), P(452985435, 662217398),
+             P(452964955, 662223030), P(452948059, 662234806), P(452930651, 662251701), P(452917851, 662253238),
+             P(452907099, 662259893), P(452885082, 662263990), P(452861019, 662274230), P(452832859, 662283445),
+             P(452823131, 662290102), P(452803675, 662301365), P(452795995, 662301365), P(452786779, 662304437),
+             P(452771419, 662306486), P(452758107, 662315190), P(452732507, 662325430), P(452700251, 662338741),
+             P(452668507, 662351542), P(452652123, 662360757), P(452637787, 662365366), P(452631643, 662370998),
+             P(452617819, 662378166), P(452595803, 662385845), P(452579419, 662399670), P(452571739, 662404278),
+             P(452556891, 662406838), P(452543066, 662411958), P(452525147, 662417590), P(452495450, 662431926),
+             P(452478043, 662430901), P(452449883, 662436534), P(452443738, 662441142), P(452429403, 662442678),
+             P(452418650, 662441142), P(452414043, 662444214), P(452410971, 662440630)};
 
-  P arrB7[] = { P(455901517, 661967465), P(455901030, 661968592), P(455900288, 661970025), P(455899904, 661972022), P(455900083, 661974454), P(455897625, 661973712), P(455895731, 661972560), P(455893836, 661970461), P(455892761, 661967645), P(455893171, 661963165), P(455893529, 661964496), P(455893927, 661965628), P(455897460, 661967139), P(455899764, 661967651) };
+P arrB7[] = {P(455901517, 661967465), P(455901030, 661968592), P(455900288, 661970025), P(455899904, 661972022),
+             P(455900083, 661974454), P(455897625, 661973712), P(455895731, 661972560), P(455893836, 661970461),
+             P(455892761, 661967645), P(455893171, 661963165), P(455893529, 661964496), P(455893927, 661965628),
+             P(455897460, 661967139), P(455899764, 661967651)};
 
-  P arrB8[] = { P(462224976, 655709334), P(462224231, 655708401), P(462220503, 655708401), P(462220503, 655706534), P(462219757, 655705601), P(462217520, 655705601), P(462216029, 655707467), P(462214537, 655708401), P(462213792, 655708401), P(462212300, 655707467), P(462210809, 655709334), P(462210063, 655709334), P(462209318, 655710267), P(462209318, 655711201), P(462208572, 655711201), P(462206335, 655714001), P(462206335, 655714934), P(462205589, 655715867), P(462205589, 655717734), P(462204098, 655717734), P(462203353, 655718667), P(462202607, 655718667), P(462195150, 655728001), P(462193659, 655728001), P(462192913, 655727068), P(462193659, 655726134), P(462193659, 655725201), P(462192913, 655724268), P(462192168, 655724268), P(462189185, 655720534), P(462187694, 655722401), P(462189185, 655724268), P(462189185, 655726134), P(462188439, 655726134), P(462186948, 655728001), P(462186202, 655728001), P(462185457, 655728935), P(462184711, 655730801), P(462185457, 655731735), P(462186202, 655731735), P(462186202, 655732668), P(462186948, 655733602), P(462186948, 655734535), P(462188439, 655736402), P(462189931, 655737335), P(462189931, 655740135), P(462189185, 655740135), P(462187694, 655738269), P(462186202, 655738269), P(462184711, 655736402), P(462183966, 655737335), P(462183966, 655740135), P(462183220, 655740135), P(462183220, 655739202), P(462181729, 655737335), P(462180983, 655738269), P(462179492, 655739202), P(462179492, 655740135), P(462180237, 655741069), P(462181729, 655741069), P(462181729, 655743869), P(462180983, 655743869), P(462180237, 655742936), P(462179492, 655742936), P(462178746, 655743869), P(462178000, 655742936), P(462175763, 655743869), P(462174272, 655741069), P(462172035, 655743869), P(462172781, 655744803), P(462173526, 655744803), P(462172781, 655745736), P(462172781, 655747603), P(462171289, 655747603), P(462170544, 655748536), P(462168307, 655750403), P(462169798, 655752270), P(462167561, 655756938), P(462167561, 655754137), P(462166815, 655753204), P(462165324, 655755071), P(462165324, 655756004), P(462163833, 655756004), P(462161596, 655757871), P(462161596, 655756938), P(462162342, 655756004), P(462162342, 655755071), P(462159359, 655751337), P(462154885, 655750403), P(462154885, 655751337), P(462155631, 655752270), P(462156376, 655752270), P(462157868, 655753204), P(462159359, 655755071), P(462159359, 655756004), P(462157868, 655756004), P(462157122, 655755071), P(462154885, 655755071), P(462154139, 655754137), P(462153394, 655754137), P(462151902, 655755071), P(462149665, 655757871), P(462149665, 655758805), P(462148920, 655759738), P(462148174, 655759738), P(462144446, 655764406), P(462144446, 655766273), P(462142955, 655768140), P(462142955, 655769073), P(462140718, 655771874), P(462141463, 655772808), P(462139972, 655776542), P(462139972, 655777475), P(462140718, 655778409), P(462141463, 655778409), P(462141463, 655779342), P(462140718, 655780276), P(462140718, 655784010), P(462141463, 655784944), P(462142209, 655784944), P(462142209, 655785877), P(462142955, 655786811), P(462142955, 655790545), P(462143700, 655791479), P(462145192, 655791479), P(462145192, 655792413), P(462146683, 655794280), P(462146683, 655795213), P(462147428, 655797081), P(462148174, 655797081), P(462148920, 655798014), P(462150411, 655798948), P(462151157, 655798948), P(462151902, 655799881), P(462154885, 655808284), P(462154885, 655809218), P(462152648, 655809218), P(462151157, 655808284), P(462149665, 655810152), P(462149665, 655811085), P(462151157, 655812953), P(462151902, 655814820), P(462152648, 655814820), P(462153394, 655815754), P(462154885, 655816687), P(462151902, 655816687), P(462151157, 655817621), P(462149665, 655817621), P(462147428, 655820422), P(462147428, 655821356), P(462148174, 655822289), P(462150411, 655822289), P(462151157, 655821356), P(462151157, 655823223), P(462150411, 655824157), P(462148920, 655824157), P(462145937, 655825091), P(462147428, 655826958), P(462148920, 655826958), P(462149665, 655827892), P(462150411, 655827892), P(462151157, 655826958), P(462152648, 655828825), P(462152648, 655830693), P(462151157, 655832560), P(462151157, 655833494), P(462150411, 655836295), P(462148920, 655836295), P(462148174, 655837229), P(462149665, 655839097), P(462150411, 655839097), P(462150411, 655840964), P(462149665, 655841898), P(462149665, 655843765), P(462150411, 655844699), P(462150411, 655850302), P(462149665, 655850302), P(462148920, 655849368), P(462148174, 655849368), P(462147428, 655848434), P(462145937, 655847501), P(462145192, 655848434), P(462145192, 655849368), P(462144446, 655850302), P(462144446, 655851236), P(462145192, 655852170), P(462145192, 655853103), P(462144446, 655854971), P(462143700, 655854971), P(462141463, 655857772), P(462140718, 655857772), P(462139972, 655856839), P(462138481, 655856839), P(462136244, 655855905), P(462134752, 655857772), P(462134752, 655858706), P(462135498, 655859640), P(462134752, 655859640), P(462134007, 655860574), P(462131770, 655865243), P(462130278, 655865243), P(462130278, 655863375), P(462129533, 655862442), P(462128041, 655862442), P(462125805, 655859640), P(462125059, 655860574), P(462123568, 655859640), P(462122822, 655860574), P(462121331, 655860574), P(462120585, 655861508), P(462119839, 655863375), P(462119839, 655864309), P(462122076, 655867111), P(462121331, 655867111), P(462120585, 655868045), P(462119839, 655868045), P(462119094, 655867111), P(462118348, 655867111), P(462116857, 655866177), P(462114620, 655868978), P(462112383, 655869912), P(462114620, 655867111), P(462114620, 655866177), P(462115365, 655866177), P(462116857, 655864309), P(462116857, 655863375), P(462116111, 655862442), P(462115365, 655862442), P(462114620, 655863375), P(462113128, 655861508), P(462115365, 655861508), P(462116111, 655860574), P(462116111, 655858706), P(462117602, 655855905), P(462117602, 655854971), P(462116857, 655854037), P(462116857, 655853103), P(462114620, 655850302), P(462112383, 655846567), P(462111637, 655847501), P(462111637, 655848434), P(462109400, 655848434), P(462107909, 655846567), P(462107163, 655847501), P(462107163, 655850302), P(462106417, 655850302), P(462105672, 655849368), P(462103435, 655849368), P(462103435, 655848434), P(462102689, 655847501), P(462099707, 655847501), P(462098961, 655848434), P(462098215, 655848434), P(462097470, 655849368), P(462098215, 655850302), P(462097470, 655852170), P(462097470, 655851236), P(462096724, 655850302), P(462096724, 655846567), P(462095978, 655845633), P(462093741, 655845633), P(462092996, 655846567), P(462092996, 655847501), P(462093741, 655848434), P(462093741, 655851236), P(462092250, 655851236), P(462092250, 655850302), P(462091504, 655849368), P(462091504, 655847501), P(462092250, 655846567), P(462091504, 655844699), P(462089267, 655844699), P(462088522, 655845633), P(462087030, 655845633), P(462085539, 655844699), P(462082557, 655848434), P(462081811, 655848434), P(462080320, 655844699), P(462079574, 655845633), P(462079574, 655848434), P(462078828, 655850302), P(462074354, 655850302), P(462072863, 655852170), P(462072863, 655849368), P(462071372, 655847501), P(462069880, 655849368), P(462069880, 655851236), P(462069135, 655851236), P(462068389, 655852170), P(462069135, 655853103), P(462068389, 655853103), P(462067643, 655855905), P(462066152, 655854037), P(462062424, 655855905), P(462061678, 655854971), P(462059441, 655854971), P(462059441, 655854037), P(462060933, 655854037), P(462061678, 655853103), P(462062424, 655854037), P(462065407, 655854037), P(462066898, 655852170), P(462066898, 655851236), P(462066152, 655850302), P(462066152, 655848434), P(462064661, 655846567), P(462061678, 655844699), P(462060187, 655846567), P(462060187, 655848434), P(462058696, 655850302), P(462057950, 655850302), P(462056459, 655852170), P(462055713, 655854037), P(462056459, 655854971), P(462056459, 655855905), P(462057204, 655856839), P(462057950, 655856839), P(462058696, 655858706), P(462059441, 655858706), P(462060933, 655859640), P(462060187, 655859640), P(462059441, 655860574), P(462058696, 655860574), P(462057950, 655861508), P(462057204, 655861508), P(462056459, 655862442), P(462056459, 655863375), P(462055713, 655863375), P(462054967, 655864309), P(462054967, 655865243), P(462054222, 655866177), P(462053476, 655866177), P(462051985, 655868045), P(462051239, 655868045), P(462047511, 655871780), P(462046765, 655871780), P(462046020, 655870846), P(462043783, 655870846), P(462042291, 655872714), P(462043783, 655874582), P(462043037, 655874582), P(462042291, 655873648), P(462040800, 655873648), P(462040054, 655874582), P(462040054, 655875516), P(462040800, 655876449), P(462043783, 655876449), P(462043783, 655878317), P(462041546, 655878317), P(462040800, 655877383), P(462040054, 655878317), P(462035580, 655879251), P(462034835, 655878317), P(462034835, 655877383), P(462032598, 655874582), P(462033343, 655873648), P(462033343, 655872714), P(462032598, 655870846), P(462031852, 655871780), P(462031106, 655871780), P(462030361, 655872714), P(462029615, 655871780), P(462028869, 655871780), P(462028124, 655872714), P(462028869, 655873648), P(462028869, 655874582), P(462027378, 655875516), P(462025141, 655875516), P(462023650, 655874582), P(462025141, 655872714), P(462025887, 655872714), P(462027378, 655870846), P(462026633, 655869912), P(462025887, 655869912), P(462025141, 655868978), P(462025141, 655868045), P(462024396, 655867111), P(462023650, 655865243), P(462024396, 655864309), P(462025141, 655864309), P(462025141, 655861508), P(462024396, 655860574), P(462021413, 655860574), P(462021413, 655858706), P(462019922, 655856839), P(462018430, 655858706), P(462018430, 655860574), P(462017685, 655860574), P(462016939, 655861508), P(462014702, 655862442), P(462014702, 655861508), P(462016193, 655859640), P(462016193, 655857772), P(462015448, 655855905), P(462014702, 655854971), P(462013956, 655854971), P(462013211, 655855905), P(462013211, 655858706), P(462010974, 655858706), P(462010974, 655856839), P(462011719, 655855905), P(462010974, 655854971), P(462008737, 655850302), P(462007246, 655852170), P(462007246, 655853103), P(462006500, 655854037), P(462005754, 655855905), P(462007246, 655857772), P(462007991, 655857772), P(462007991, 655858706), P(462007246, 655859640), P(462007246, 655862442), P(462005754, 655862442), P(462005754, 655861508), P(462006500, 655860574), P(462006500, 655857772), P(462006067, 655856854), P(462005009, 655856839), P(462005009, 655857772), P(462003517, 655859640), P(462002772, 655861508), P(462002026, 655861508), P(462000535, 655859640), P(461998298, 655862442), P(461997552, 655861508), P(461997552, 655860574), P(461996806, 655859640), P(461995315, 655858706), P(461994569, 655859640), P(461993824, 655859640), P(461993824, 655857772), P(461993078, 655856839), P(461990095, 655856839), P(461990095, 655855905), P(461989350, 655854971), P(461988604, 655854971), P(461984130, 655857772), P(461984130, 655856839), P(461983385, 655855905), P(461981893, 655854971), P(461982639, 655854037), P(461984130, 655855905), P(461984876, 655854971), P(461985622, 655853103), P(461984130, 655851236), P(461984130, 655850302), P(461983385, 655849368), P(461983385, 655847501), P(461982639, 655846567), P(461982639, 655844699), P(461983385, 655843765), P(461981148, 655840964), P(461981148, 655838163), P(461982639, 655838163), P(461984130, 655837229), P(461981893, 655834428), P(461979656, 655834428), P(461977419, 655831627), P(461975928, 655831627), P(461975182, 655830693), P(461975182, 655828825), P(461974437, 655827892), P(461973691, 655827892), P(461971454, 655825091), P(461970708, 655825091), P(461969963, 655824157), P(461968471, 655823223), P(461966980, 655823223), P(461966980, 655821356), P(461968614, 655822474), P(461969217, 655823223), P(461969963, 655823223), P(461970708, 655824157), P(461972200, 655825091), P(461972945, 655824157), P(461972945, 655823223), P(461973691, 655823223), P(461975928, 655821356), P(461974437, 655819488), P(461972945, 655821356), P(461972200, 655821356), P(461971454, 655820422), P(461970708, 655820422), P(461968471, 655819488), P(461968471, 655818555), P(461969217, 655817621), P(461968471, 655816687), P(461967726, 655816687), P(461967726, 655815754), P(461965489, 655812953), P(461966235, 655812019), P(461966235, 655810152), P(461965489, 655809218), P(461964743, 655809218), P(461963252, 655810152), P(461963252, 655805483), P(461961015, 655798014), P(461960269, 655798948), P(461960269, 655799881), P(461959524, 655800815), P(461960269, 655801749), P(461960269, 655803616), P(461959524, 655804550), P(461958778, 655807351), P(461957287, 655805483), P(461957287, 655804550), P(461956541, 655803616), P(461955795, 655803616), P(461953558, 655806417), P(461949084, 655806417), P(461948339, 655807351), P(461948339, 655809218), P(461947593, 655810152), P(461946848, 655812019), P(461946102, 655812019), P(461945356, 655811085), P(461944611, 655812019), P(461943865, 655812019), P(461943119, 655810152), P(461942374, 655811085), P(461942374, 655812019), P(461941628, 655812953), P(461941628, 655813886), P(461939391, 655816687), P(461937900, 655816687), P(461937154, 655815754), P(461935663, 655815754), P(461936408, 655814820), P(461936408, 655813886), P(461938645, 655813886), P(461940882, 655811085), P(461939391, 655809218), P(461939391, 655807351), P(461940137, 655805483), P(461939391, 655804550), P(461937154, 655804550), P(461937154, 655803616), P(461937900, 655802682), P(461935663, 655798948), P(461934171, 655798948), P(461933426, 655799881), P(461931934, 655800815), P(461931934, 655802682), P(461931189, 655803616), P(461931189, 655804550), P(461931934, 655806417), P(461931189, 655806417), P(461930443, 655807351), P(461929697, 655807351), P(461930443, 655806417), P(461926715, 655807351), P(461927461, 655808284), P(461925224, 655811085), P(461926715, 655812953), P(461925969, 655813886), P(461925969, 655815754), P(461927461, 655818555), P(461929697, 655818555), P(461930443, 655819488), P(461931189, 655818555), P(461931934, 655818555), P(461931934, 655821356), P(461932680, 655822289), P(461934171, 655822289), P(461936408, 655819488), P(461937154, 655819488), P(461937154, 655820422), P(461937900, 655821356), P(461939391, 655819488), P(461940137, 655819488), P(461940137, 655820422), P(461941628, 655822289), P(461942374, 655822289), P(461943865, 655823223), P(461948339, 655823223), P(461947593, 655824157), P(461946848, 655824157), P(461946102, 655825091), P(461946102, 655826024), P(461944611, 655826024), P(461943119, 655827892), P(461943119, 655828825), P(461941628, 655828825), P(461937154, 655834428), P(461937154, 655835362), P(461936408, 655835362), P(461934171, 655837229), P(461932680, 655837229), P(461931934, 655836295), P(461930443, 655836295), P(461929697, 655835362), P(461925969, 655835362), P(461924478, 655837229), P(461922241, 655837229), P(461921495, 655836295), P(461921495, 655831627), P(461919258, 655828825), P(461919258, 655826958), P(461916276, 655823223), P(461915530, 655821356), P(461912547, 655817621), P(461911802, 655817621), P(461911056, 655818555), P(461910310, 655817621), P(461908819, 655817621), P(461908074, 655816687), P(461908074, 655815754), P(461904345, 655812953), P(461903600, 655812953), P(461902854, 655813886), P(461901363, 655813886), P(461900617, 655814820), P(461901363, 655815754), P(461902854, 655815754), P(461903600, 655816687), P(461902854, 655817621), P(461902108, 655817621), P(461901363, 655818555), P(461900617, 655818555), P(461899871, 655819488), P(461899871, 655820422), P(461899126, 655821356), P(461899126, 655822289), P(461897634, 655826024), P(461895397, 655826024), P(461894652, 655825091), P(461893160, 655826958), P(461891669, 655825091), P(461892415, 655824157), P(461891669, 655823223), P(461886450, 655823223), P(461884958, 655825091), P(461884213, 655825091), P(461881976, 655827892), P(461882721, 655828825), P(461882721, 655829759), P(461881976, 655829759), P(461881230, 655830693), P(461880484, 655829759), P(461878993, 655829759), P(461878247, 655830693), P(461877502, 655830693), P(461876010, 655832560), P(461875265, 655832560), P(461874519, 655833494), P(461871536, 655834428), P(461872282, 655835362), P(461871536, 655836295), P(461871536, 655837229), P(461870791, 655838163), P(461870791, 655840964), P(461872282, 655842832), P(461872282, 655844699), P(461871536, 655844699), P(461870791, 655845633), P(461870045, 655847501), P(461869300, 655846567), P(461868554, 655846567), P(461867063, 655842832), P(461866317, 655842832), P(461865571, 655841898), P(461864826, 655842832), P(461864080, 655841898), P(461863334, 655841898), P(461862589, 655840964), P(461861097, 655840030), P(461857369, 655840030), P(461856623, 655839097), P(461855132, 655838163), P(461853641, 655838163), P(461852895, 655839097), P(461849913, 655839097), P(461849167, 655840030), P(461848421, 655839097), P(461845439, 655839097), P(461844693, 655838163), P(461844693, 655837229), P(461843947, 655836295), P(461843947, 655834428), P(461843202, 655832560), P(461842456, 655831627), P(461841710, 655831627), P(461839473, 655827892), P(461835745, 655827892), P(461834999, 655826958), P(461833508, 655826024), P(461832762, 655826958), P(461831271, 655826958), P(461830525, 655827892), P(461828289, 655827892), P(461827543, 655828825), P(461826797, 655828825), P(461825306, 655830693), P(461822323, 655830693), P(461821578, 655831627), P(461820086, 655832560), P(461819341, 655831627), P(461814867, 655831627), P(461814121, 655830693), P(461813375, 655830693), P(461812630, 655829759), P(461811884, 655829759), P(461811138, 655828825), P(461811138, 655827892), P(461811884, 655826958), P(461811884, 655826024), P(461811138, 655825091), P(461811138, 655824157), P(461808902, 655822289), P(461808156, 655823223), P(461805919, 655823223), P(461805173, 655824157), P(461798462, 655824157), P(461797717, 655823223), P(461797717, 655821356), P(461798462, 655821356), P(461799954, 655819488), P(461799954, 655818555), P(461799208, 655817621), P(461799954, 655816687), P(461799954, 655812953), P(461798462, 655811085), P(461797717, 655812019), P(461796971, 655811085), P(461793988, 655811085), P(461793988, 655810152), P(461793243, 655809218), P(461793243, 655807351), P(461789515, 655802682), P(461785041, 655802682), P(461784295, 655801749), P(461782804, 655801749), P(461782804, 655800815), P(461781312, 655798948), P(461780567, 655799881), P(461779821, 655801749), P(461776838, 655798014), P(461776093, 655798014), P(461775347, 655798948), P(461775347, 655799881), P(461767145, 655799881), P(461766399, 655798948), P(461766399, 655798014), P(461764908, 655796147), P(461766399, 655794280), P(461764908, 655792413), P(461762671, 655792413), P(461761925, 655790545), P(461761925, 655788678), P(461764162, 655785877), P(461764162, 655781209), P(461767145, 655781209), P(461764908, 655778409), P(461760434, 655778409), P(461760434, 655777475), P(461761180, 655776542), P(461761180, 655775608), P(461761925, 655775608), P(461762671, 655774675), P(461761180, 655772808), P(461758943, 655772808), P(461758943, 655770940), P(461760434, 655769073), P(461761180, 655767206), P(461760434, 655766273), P(461761180, 655764406), P(461760434, 655763472), P(461758943, 655763472), P(461758197, 655762539), P(461758197, 655761605), P(461757451, 655760672), P(461757451, 655759738), P(461756706, 655758805), P(461755214, 655754137), P(461755214, 655752270), P(461755960, 655751337), P(461755960, 655748536), P(461756706, 655747603), P(461756706, 655746670), P(461758943, 655743869), P(461758943, 655742936), P(461758197, 655740135), P(461758943, 655739202), P(461760434, 655739202), P(461762671, 655736402), P(461762671, 655735468), P(461763417, 655734535), P(461764162, 655734535), P(461765654, 655733602), P(461765654, 655732668), P(461764908, 655731735), P(461764162, 655731735), P(461764162, 655728935), P(461764908, 655728935), P(461766399, 655727068), P(461767891, 655727068), P(461768636, 655726134), P(461768636, 655725201), P(461769382, 655724268), P(461768636, 655723334), P(461768636, 655722401), P(461769382, 655722401), P(461770128, 655721467), P(461773110, 655718667), P(461773110, 655714934), P(461773856, 655714001), P(461774601, 655714001), P(461775347, 655713067), P(461773856, 655709334), P(461774601, 655708401), P(461778330, 655708401), P(461779075, 655707467), P(461779075, 655706534), P(461780567, 655704667), P(461779075, 655702801), P(461780567, 655700934), P(461781312, 655700934), P(461782058, 655700001), P(461783549, 655700001), P(461784295, 655699067), P(461784295, 655698134), P(461785041, 655697201), P(461783549, 655695334), P(461788023, 655692534), P(461788023, 655691601), P(461786532, 655689735), P(461786532, 655687868), P(461788769, 655685068), P(461788023, 655684135), P(461787278, 655684135), P(461787278, 655683202), P(461786532, 655682269), P(461785786, 655682269), P(461785041, 655681335), P(461783549, 655681335), P(461784295, 655680402), P(461782804, 655678536), P(461780567, 655678536), P(461779821, 655677602), P(461779821, 655676669), P(461779075, 655675736), P(461779075, 655674803), P(461778330, 655672003), P(461779075, 655672003), P(461779821, 655671070), P(461780567, 655671070), P(461782058, 655669203), P(461782804, 655669203), P(461784295, 655667337), P(461784295, 655666404), P(461783549, 655665471), P(461784295, 655664537), P(461783549, 655663604), P(461784295, 655659872), P(461785041, 655660805), P(461785786, 655660805), P(461788023, 655658005), P(461788769, 655658938), P(461791751, 655656139), P(461791751, 655650540), P(461792497, 655649607), P(461792497, 655648674), P(461791006, 655646808), P(461791006, 655645874), P(461791751, 655644941), P(461792497, 655644941), P(461793988, 655643075), P(461795480, 655643075), P(461796971, 655641209), P(461797717, 655638409), P(461796971, 655637476), P(461796971, 655636543), P(461797717, 655634677), P(461792497, 655628146), P(461793243, 655628146), P(461793988, 655629079), P(461794734, 655629079), P(461796225, 655627213), P(461796225, 655626279), P(461796971, 655626279), P(461797717, 655625346), P(461799954, 655624413), P(461801445, 655622547), P(461801445, 655620681), P(461802191, 655620681), P(461802936, 655619748), P(461804428, 655618815), P(461805173, 655617882), P(461805173, 655616949), P(461806665, 655615083), P(461806665, 655614150), P(461809647, 655611351), P(461809647, 655610418), P(461808902, 655609485), P(461808156, 655609485), P(461807410, 655608552), P(461807410, 655607619), P(461806665, 655606686), P(461805919, 655604820), P(461806665, 655602954), P(461809647, 655602954), P(461811138, 655601088), P(461811884, 655602021), P(461815612, 655602021), P(461817104, 655600155), P(461817104, 655599222), P(461817849, 655599222), P(461823069, 655592691), P(461824560, 655592691), P(461825306, 655591758), P(461827543, 655591758), P(461829034, 655589892), P(461829780, 655590825), P(461830525, 655589892), P(461832762, 655589892), P(461835745, 655586161), P(461837982, 655586161), P(461838728, 655587094), P(461841710, 655587094), P(461842456, 655588027), P(461843202, 655588027), P(461843947, 655588960), P(461844693, 655588960), P(461845439, 655589892), P(461846184, 655589892), P(461847676, 655590825), P(461849913, 655590825), P(461851404, 655591758), P(461852149, 655591758), P(461852895, 655590825), P(461858115, 655590825), P(461858860, 655589892), P(461864080, 655589892), P(461864080, 655590825), P(461864826, 655591758), P(461863334, 655591758), P(461862589, 655590825), P(461861843, 655590825), P(461861097, 655591758), P(461858115, 655591758), P(461857369, 655592691), P(461855132, 655591758), P(461853641, 655593624), P(461853641, 655595490), P(461854386, 655596423), P(461854386, 655597356), P(461856623, 655600155), P(461856623, 655602954), P(461857369, 655603887), P(461858115, 655603887), P(461859606, 655602021), P(461861097, 655601088), P(461861843, 655602021), P(461861843, 655602954), P(461862589, 655603887), P(461862589, 655605753), P(461866317, 655608552), P(461867063, 655607619), P(461867063, 655606686), P(461867808, 655605753), P(461869300, 655605753), P(461870045, 655606686), P(461871536, 655607619), P(461873028, 655605753), P(461873028, 655604820), P(461873773, 655603887), P(461875265, 655602954), P(461875265, 655601088), P(461876010, 655600155), P(461877502, 655599222), P(461877502, 655598289), P(461878247, 655597356), P(461878247, 655594557), P(461879739, 655594557), P(461881230, 655592691), P(461881230, 655590825), P(461881976, 655589892), P(461883467, 655587094), P(461885704, 655587094), P(461886450, 655586161), P(461887941, 655586161), P(461888687, 655585228), P(461891669, 655584295), P(461891669, 655586161), P(461893906, 655588960), P(461895397, 655588960), P(461896143, 655589892), P(461896143, 655590825), P(461897634, 655592691), P(461897634, 655593624), P(461898380, 655594557), P(461900617, 655596423), P(461902108, 655594557), P(461903600, 655594557), P(461904345, 655595490), P(461904345, 655596423), P(461905091, 655598289), P(461905837, 655599222), P(461907328, 655600155), P(461908074, 655600155), P(461908819, 655599222), P(461908819, 655598289), P(461909565, 655599222), P(461911056, 655599222), P(461911802, 655600155), P(461913293, 655600155), P(461914784, 655602021), P(461917767, 655602021), P(461922241, 655607619), P(461922987, 655607619), P(461923732, 655606686), P(461925969, 655606686), P(461925969, 655610418), P(461927461, 655610418), P(461928206, 655609485), P(461931934, 655609485), P(461933426, 655611351), P(461934171, 655610418), P(461934171, 655608552), P(461935663, 655608552), P(461936408, 655607619), P(461937900, 655607619), P(461940137, 655606686), P(461940882, 655606686), P(461941628, 655607619), P(461942374, 655607619), P(461943119, 655608552), P(461944611, 655608552), P(461947593, 655609485), P(461949084, 655611351), P(461949830, 655611351), P(461950576, 655612284), P(461951321, 655612284), P(461952813, 655613217), P(461952813, 655616016), P(461953558, 655616949), P(461956541, 655616949), P(461957287, 655617882), P(461958032, 655617882), P(461958778, 655618815), P(461959524, 655618815), P(461961761, 655619748), P(461961761, 655620681), P(461965489, 655625346), P(461965489, 655627213), P(461966235, 655628146), P(461967726, 655628146), P(461968471, 655627213), P(461969963, 655630945), P(461972200, 655630945), P(461972945, 655630012), P(461975928, 655630012), P(461978165, 655627213), P(461978911, 655625346), P(461979656, 655625346), P(461981148, 655627213), P(461985622, 655627213), P(461986367, 655628146), P(461989350, 655628146), P(461990095, 655629079), P(461992332, 655629079), P(461995315, 655630012), P(461996806, 655628146), P(461996806, 655627213), P(461996061, 655626279), P(461995315, 655626279), P(461995315, 655625346), P(461994569, 655624413), P(461995315, 655623480), P(461995315, 655621614), P(461993824, 655619748), P(461994569, 655619748), P(461995315, 655618815), P(461997552, 655618815), P(461998298, 655617882), P(461998298, 655616949), P(462000535, 655615083), P(462002772, 655615083), P(462003517, 655616016), P(462004263, 655616016), P(462005009, 655616949), P(462005754, 655616949), P(462007991, 655617882), P(462007991, 655618815), P(462008737, 655619748), P(462009482, 655619748), P(462010228, 655618815), P(462010228, 655616949), P(462011719, 655616949), P(462011719, 655619748), P(462012465, 655620681), P(462012465, 655621614), P(462010974, 655621614), P(462010228, 655622547), P(462010974, 655623480), P(462013956, 655628146), P(462014702, 655627213), P(462017685, 655627213), P(462018430, 655626279), P(462019922, 655626279), P(462020667, 655625346), P(462020667, 655624413), P(462022159, 655622547), P(462022904, 655622547), P(462023650, 655623480), P(462025887, 655623480), P(462026633, 655624413), P(462027378, 655623480), P(462027378, 655622547), P(462029615, 655622547), P(462030361, 655621614), P(462030361, 655620681), P(462029615, 655619748), P(462028869, 655619748), P(462028124, 655617882), P(462028124, 655613217), P(462028869, 655612284), P(462027378, 655610418), P(462028124, 655610418), P(462031852, 655605753), P(462034089, 655603887), P(462038563, 655603887), P(462039309, 655604820), P(462040054, 655604820), P(462041546, 655603887), P(462042291, 655604820), P(462041546, 655605753), P(462041546, 655606686), P(462042291, 655609485), P(462043783, 655607619), P(462045274, 655607619), P(462046020, 655608552), P(462049002, 655608552), P(462051239, 655605753), P(462052730, 655605753), P(462053476, 655604820), P(462054967, 655604820), P(462055713, 655603887), P(462059441, 655602954), P(462060187, 655602021), P(462058696, 655600155), P(462059441, 655599222), P(462060187, 655599222), P(462060933, 655598289), P(462060933, 655592691), P(462062424, 655592691), P(462063915, 655594557), P(462065407, 655592691), P(462065407, 655591758), P(462064661, 655590825), P(462064661, 655586161), P(462063915, 655585228), P(462063170, 655586161), P(462061678, 655587094), P(462061678, 655584295), P(462062424, 655582429), P(462063170, 655581496), P(462064661, 655581496), P(462065407, 655580563), P(462067643, 655580563), P(462068389, 655581496), P(462070626, 655581496), P(462071372, 655580563), P(462071372, 655579630), P(462072863, 655577765), P(462072863, 655572167), P(462073609, 655570301), P(462074354, 655569369), P(462075846, 655569369), P(462078083, 655566570), P(462078828, 655566570), P(462080320, 655564704), P(462079574, 655562839), P(462080320, 655562839), P(462081811, 655560973), P(462082557, 655560973), P(462083302, 655561906), P(462084794, 655561906), P(462085539, 655562839), P(462087776, 655562839), P(462089267, 655560973), P(462090013, 655560973), P(462090759, 655560040), P(462090759, 655559107), P(462090013, 655558174), P(462089267, 655556309), P(462091504, 655556309), P(462092250, 655555376), P(462092250, 655554443), P(462092996, 655552577), P(462093741, 655551645), P(462094487, 655551645), P(462098961, 655545115), P(462104181, 655545115), P(462104926, 655544182), P(462108654, 655544182), P(462110891, 655546981), P(462112383, 655547913), P(462113874, 655547913), P(462114620, 655546981), P(462116111, 655546981), P(462116857, 655546048), P(462118348, 655545115), P(462119094, 655546048), P(462119094, 655546981), P(462119839, 655547913), P(462120585, 655547913), P(462121331, 655548846), P(462122822, 655548846), P(462123568, 655547913), P(462125059, 655547913), P(462125805, 655548846), P(462126550, 655548846), P(462128787, 655551645), P(462131770, 655552577), P(462141463, 655552577), P(462142209, 655551645), P(462141463, 655550712), P(462141463, 655549779), P(462142209, 655549779), P(462143700, 655547913), P(462145937, 655547913), P(462146683, 655548846), P(462147428, 655548846), P(462148174, 655547913), P(462149665, 655547913), P(462150411, 655548846), P(462153394, 655548846), P(462154139, 655547913), P(462167561, 655547913), P(462168307, 655546981), P(462168307, 655546048), P(462169052, 655545115), P(462170544, 655546981), P(462171289, 655546981), P(462172035, 655546048), P(462172781, 655546048), P(462175018, 655548846), P(462175763, 655548846), P(462178000, 655549779), P(462180983, 655549779), P(462182474, 655547913), P(462185457, 655547913), P(462186202, 655548846), P(462186948, 655548846), P(462187694, 655549779), P(462189185, 655549779), P(462190676, 655551645), P(462192168, 655549779), P(462192913, 655549779), P(462194405, 655551645), P(462197387, 655551645), P(462198133, 655552577), P(462200370, 655552577), P(462206335, 655553510), P(462207081, 655552577), P(462207081, 655549779), P(462207826, 655549779), P(462208572, 655548846), P(462211555, 655547913), P(462211555, 655549779), P(462212300, 655550712), P(462212300, 655551645), P(462213046, 655553510), P(462213046, 655554443), P(462212300, 655555376), P(462213792, 655557241), P(462215283, 655557241), P(462216029, 655556309), P(462216774, 655557241), P(462216774, 655558174), P(462217520, 655559107), P(462219757, 655559107), P(462222740, 655560040), P(462223485, 655559107), P(462224231, 655559107), P(462224976, 655558174), P(462224976, 655557241), P(462229450, 655557241), P(462230196, 655558174), P(462231687, 655557241), P(462231687, 655556309), P(462230942, 655555376), P(462230196, 655555376), P(462229450, 655554443), P(462227959, 655554443), P(462228705, 655553510), P(462228705, 655547913), P(462232433, 655547913), P(462233179, 655548846), P(462234670, 655549779), P(462239144, 655549779), P(462239890, 655548846), P(462240635, 655548846), P(462242127, 655547913), P(462243618, 655547913), P(462244363, 655548846), P(462245855, 655546981), P(462248092, 655546981), P(462249583, 655547913), P(462251074, 655546048), P(462252566, 655546048), P(462253311, 655545115), P(462252566, 655544182), P(462256294, 655541384), P(462256294, 655542317), P(462257785, 655544182), P(462260768, 655544182), P(462263005, 655546981), P(462262259, 655547913), P(462260022, 655547913), P(462259277, 655548846), P(462260022, 655550712), P(462259277, 655550712), P(462257785, 655549779), P(462255548, 655552577), P(462254803, 655554443), P(462254803, 655556309), P(462254057, 655557241), P(462254803, 655558174), P(462254803, 655560973), P(462255548, 655561906), P(462255548, 655562839), P(462256294, 655563771), P(462258531, 655563771), P(462258531, 655564704), P(462257040, 655564704), P(462254803, 655569369), P(462255548, 655570301), P(462257040, 655570301), P(462258531, 655571234), P(462258531, 655572167), P(462257040, 655574033), P(462257785, 655574966), P(462257785, 655575899), P(462258531, 655576832), P(462260768, 655576832), P(462261514, 655577765), P(462263005, 655577765), P(462262259, 655578697), P(462262259, 655581496), P(462263005, 655582429), P(462264496, 655582429), P(462265242, 655583362), P(462265242, 655584295), P(462265987, 655585228), P(462268970, 655589892), P(462267479, 655589892), P(462266733, 655588960), P(462265242, 655588960), P(462264496, 655589892), P(462264496, 655591758), P(462263005, 655593624), P(462264496, 655595490), P(462263750, 655596423), P(462263750, 655597356), P(462264496, 655598289), P(462265242, 655598289), P(462266733, 655600155), P(462265987, 655600155), P(462265242, 655599222), P(462263750, 655601088), P(462263005, 655601088), P(462262259, 655600155), P(462260022, 655601088), P(462258531, 655602954), P(462258531, 655605753), P(462257785, 655606686), P(462257040, 655608552), P(462256294, 655608552), P(462254803, 655610418), P(462254803, 655611351), P(462253311, 655611351), P(462252566, 655612284), P(462252566, 655615083), P(462249583, 655616949), P(462249583, 655617882), P(462250329, 655618815), P(462249583, 655619748), P(462249583, 655620681), P(462248092, 655622547), P(462248092, 655624413), P(462248837, 655625346), P(462250329, 655625346), P(462250329, 655627213), P(462251074, 655628146), P(462251074, 655629079), P(462251820, 655630945), P(462254057, 655633744), P(462251074, 655637476), P(462250329, 655637476), P(462249583, 655638409), P(462249583, 655642142), P(462248092, 655645874), P(462248837, 655646808), P(462249583, 655645874), P(462251820, 655648674), P(462252566, 655647741), P(462252566, 655643075), P(462254803, 655640276), P(462256294, 655640276), P(462257040, 655639343), P(462257040, 655638409), P(462258531, 655638409), P(462260022, 655639343), P(462260768, 655638409), P(462260022, 655637476), P(462260022, 655636543), P(462260768, 655634677), P(462261514, 655633744), P(462262259, 655633744), P(462265242, 655631878), P(462265987, 655632811), P(462265242, 655633744), P(462265242, 655634677), P(462265987, 655635610), P(462266733, 655637476), P(462265987, 655638409), P(462265987, 655639343), P(462265242, 655640276), P(462265242, 655641209), P(462264496, 655642142), P(462264496, 655644008), P(462263005, 655645874), P(462262259, 655645874), P(462261514, 655646808), P(462257785, 655646808), P(462257040, 655647741), P(462254803, 655649607), P(462255548, 655650540), P(462257785, 655650540), P(462258531, 655651473), P(462257785, 655652406), P(462257040, 655652406), P(462256294, 655653339), P(462257040, 655654273), P(462257040, 655655206), P(462257785, 655656139), P(462261514, 655658938), P(462257040, 655658938), P(462256294, 655658005), P(462254803, 655658005), P(462253311, 655657072), P(462252566, 655658005), P(462254057, 655659872), P(462254057, 655663604), P(462252566, 655665471), P(462251074, 655665471), P(462250329, 655666404), P(462248837, 655666404), P(462248092, 655665471), P(462246600, 655666404), P(462246600, 655668270), P(462247346, 655669203), P(462248092, 655669203), P(462248092, 655670137), P(462246600, 655672003), P(462247346, 655672936), P(462247346, 655675736), P(462246600, 655676669), P(462246600, 655677602), P(462245855, 655678536), P(462245855, 655679469), P(462244363, 655681335), P(462239890, 655683202), P(462239144, 655682269), P(462237653, 655682269), P(462237653, 655680402), P(462238398, 655679469), P(462236161, 655676669), P(462235416, 655676669), P(462233924, 655675736), P(462234670, 655674803), P(462235416, 655674803), P(462236907, 655672936), P(462237653, 655671070), P(462236161, 655669203), P(462235416, 655669203), P(462233924, 655668270), P(462233924, 655666404), P(462233179, 655665471), P(462231687, 655664537), P(462232433, 655663604), P(462232433, 655660805), P(462230942, 655658938), P(462229450, 655658938), P(462226468, 655655206), P(462225722, 655656139), P(462225722, 655659872), P(462224976, 655661738), P(462222740, 655664537), P(462221994, 655664537), P(462220503, 655665471), P(462221248, 655666404), P(462221994, 655666404), P(462221994, 655667337), P(462222740, 655668270), P(462222740, 655669203), P(462221994, 655670137), P(462223485, 655672003), P(462224231, 655672003), P(462224231, 655672936), P(462223485, 655672936), P(462222740, 655673869), P(462221248, 655675736), P(462220503, 655677602), P(462221248, 655678536), P(462221994, 655678536), P(462222740, 655679469), P(462224976, 655679469), P(462225722, 655680402), P(462225722, 655681335), P(462224976, 655682269), P(462227213, 655685068), P(462226468, 655685068), P(462225722, 655686002), P(462224976, 655686002), P(462224231, 655686935), P(462222740, 655686935), P(462221994, 655687868), P(462221248, 655689735), P(462218266, 655686002), P(462217520, 655686002), P(462216774, 655686935), P(462216774, 655687868), P(462217520, 655688801), P(462217520, 655690668), P(462218266, 655692534), P(462217520, 655692534), P(462216774, 655693468), P(462216774, 655695334), P(462216029, 655695334), P(462212300, 655697201), P(462214537, 655700001), P(462216774, 655700001), P(462216774, 655701867), P(462217520, 655702801), P(462219757, 655702801), P(462221248, 655704667), P(462222740, 655704667), P(462223485, 655703734), P(462224976, 655702801), P(462224976, 655703734), P(462226468, 655705601), P(462227213, 655705601), P(462226468, 655706534), P(462227959, 655709334), P(462227213, 655708401), P(462226468, 655709334) };
+P arrB8[] = {P(462224976, 655709334), P(462224231, 655708401), P(462220503, 655708401), P(462220503, 655706534),
+             P(462219757, 655705601), P(462217520, 655705601), P(462216029, 655707467), P(462214537, 655708401),
+             P(462213792, 655708401), P(462212300, 655707467), P(462210809, 655709334), P(462210063, 655709334),
+             P(462209318, 655710267), P(462209318, 655711201), P(462208572, 655711201), P(462206335, 655714001),
+             P(462206335, 655714934), P(462205589, 655715867), P(462205589, 655717734), P(462204098, 655717734),
+             P(462203353, 655718667), P(462202607, 655718667), P(462195150, 655728001), P(462193659, 655728001),
+             P(462192913, 655727068), P(462193659, 655726134), P(462193659, 655725201), P(462192913, 655724268),
+             P(462192168, 655724268), P(462189185, 655720534), P(462187694, 655722401), P(462189185, 655724268),
+             P(462189185, 655726134), P(462188439, 655726134), P(462186948, 655728001), P(462186202, 655728001),
+             P(462185457, 655728935), P(462184711, 655730801), P(462185457, 655731735), P(462186202, 655731735),
+             P(462186202, 655732668), P(462186948, 655733602), P(462186948, 655734535), P(462188439, 655736402),
+             P(462189931, 655737335), P(462189931, 655740135), P(462189185, 655740135), P(462187694, 655738269),
+             P(462186202, 655738269), P(462184711, 655736402), P(462183966, 655737335), P(462183966, 655740135),
+             P(462183220, 655740135), P(462183220, 655739202), P(462181729, 655737335), P(462180983, 655738269),
+             P(462179492, 655739202), P(462179492, 655740135), P(462180237, 655741069), P(462181729, 655741069),
+             P(462181729, 655743869), P(462180983, 655743869), P(462180237, 655742936), P(462179492, 655742936),
+             P(462178746, 655743869), P(462178000, 655742936), P(462175763, 655743869), P(462174272, 655741069),
+             P(462172035, 655743869), P(462172781, 655744803), P(462173526, 655744803), P(462172781, 655745736),
+             P(462172781, 655747603), P(462171289, 655747603), P(462170544, 655748536), P(462168307, 655750403),
+             P(462169798, 655752270), P(462167561, 655756938), P(462167561, 655754137), P(462166815, 655753204),
+             P(462165324, 655755071), P(462165324, 655756004), P(462163833, 655756004), P(462161596, 655757871),
+             P(462161596, 655756938), P(462162342, 655756004), P(462162342, 655755071), P(462159359, 655751337),
+             P(462154885, 655750403), P(462154885, 655751337), P(462155631, 655752270), P(462156376, 655752270),
+             P(462157868, 655753204), P(462159359, 655755071), P(462159359, 655756004), P(462157868, 655756004),
+             P(462157122, 655755071), P(462154885, 655755071), P(462154139, 655754137), P(462153394, 655754137),
+             P(462151902, 655755071), P(462149665, 655757871), P(462149665, 655758805), P(462148920, 655759738),
+             P(462148174, 655759738), P(462144446, 655764406), P(462144446, 655766273), P(462142955, 655768140),
+             P(462142955, 655769073), P(462140718, 655771874), P(462141463, 655772808), P(462139972, 655776542),
+             P(462139972, 655777475), P(462140718, 655778409), P(462141463, 655778409), P(462141463, 655779342),
+             P(462140718, 655780276), P(462140718, 655784010), P(462141463, 655784944), P(462142209, 655784944),
+             P(462142209, 655785877), P(462142955, 655786811), P(462142955, 655790545), P(462143700, 655791479),
+             P(462145192, 655791479), P(462145192, 655792413), P(462146683, 655794280), P(462146683, 655795213),
+             P(462147428, 655797081), P(462148174, 655797081), P(462148920, 655798014), P(462150411, 655798948),
+             P(462151157, 655798948), P(462151902, 655799881), P(462154885, 655808284), P(462154885, 655809218),
+             P(462152648, 655809218), P(462151157, 655808284), P(462149665, 655810152), P(462149665, 655811085),
+             P(462151157, 655812953), P(462151902, 655814820), P(462152648, 655814820), P(462153394, 655815754),
+             P(462154885, 655816687), P(462151902, 655816687), P(462151157, 655817621), P(462149665, 655817621),
+             P(462147428, 655820422), P(462147428, 655821356), P(462148174, 655822289), P(462150411, 655822289),
+             P(462151157, 655821356), P(462151157, 655823223), P(462150411, 655824157), P(462148920, 655824157),
+             P(462145937, 655825091), P(462147428, 655826958), P(462148920, 655826958), P(462149665, 655827892),
+             P(462150411, 655827892), P(462151157, 655826958), P(462152648, 655828825), P(462152648, 655830693),
+             P(462151157, 655832560), P(462151157, 655833494), P(462150411, 655836295), P(462148920, 655836295),
+             P(462148174, 655837229), P(462149665, 655839097), P(462150411, 655839097), P(462150411, 655840964),
+             P(462149665, 655841898), P(462149665, 655843765), P(462150411, 655844699), P(462150411, 655850302),
+             P(462149665, 655850302), P(462148920, 655849368), P(462148174, 655849368), P(462147428, 655848434),
+             P(462145937, 655847501), P(462145192, 655848434), P(462145192, 655849368), P(462144446, 655850302),
+             P(462144446, 655851236), P(462145192, 655852170), P(462145192, 655853103), P(462144446, 655854971),
+             P(462143700, 655854971), P(462141463, 655857772), P(462140718, 655857772), P(462139972, 655856839),
+             P(462138481, 655856839), P(462136244, 655855905), P(462134752, 655857772), P(462134752, 655858706),
+             P(462135498, 655859640), P(462134752, 655859640), P(462134007, 655860574), P(462131770, 655865243),
+             P(462130278, 655865243), P(462130278, 655863375), P(462129533, 655862442), P(462128041, 655862442),
+             P(462125805, 655859640), P(462125059, 655860574), P(462123568, 655859640), P(462122822, 655860574),
+             P(462121331, 655860574), P(462120585, 655861508), P(462119839, 655863375), P(462119839, 655864309),
+             P(462122076, 655867111), P(462121331, 655867111), P(462120585, 655868045), P(462119839, 655868045),
+             P(462119094, 655867111), P(462118348, 655867111), P(462116857, 655866177), P(462114620, 655868978),
+             P(462112383, 655869912), P(462114620, 655867111), P(462114620, 655866177), P(462115365, 655866177),
+             P(462116857, 655864309), P(462116857, 655863375), P(462116111, 655862442), P(462115365, 655862442),
+             P(462114620, 655863375), P(462113128, 655861508), P(462115365, 655861508), P(462116111, 655860574),
+             P(462116111, 655858706), P(462117602, 655855905), P(462117602, 655854971), P(462116857, 655854037),
+             P(462116857, 655853103), P(462114620, 655850302), P(462112383, 655846567), P(462111637, 655847501),
+             P(462111637, 655848434), P(462109400, 655848434), P(462107909, 655846567), P(462107163, 655847501),
+             P(462107163, 655850302), P(462106417, 655850302), P(462105672, 655849368), P(462103435, 655849368),
+             P(462103435, 655848434), P(462102689, 655847501), P(462099707, 655847501), P(462098961, 655848434),
+             P(462098215, 655848434), P(462097470, 655849368), P(462098215, 655850302), P(462097470, 655852170),
+             P(462097470, 655851236), P(462096724, 655850302), P(462096724, 655846567), P(462095978, 655845633),
+             P(462093741, 655845633), P(462092996, 655846567), P(462092996, 655847501), P(462093741, 655848434),
+             P(462093741, 655851236), P(462092250, 655851236), P(462092250, 655850302), P(462091504, 655849368),
+             P(462091504, 655847501), P(462092250, 655846567), P(462091504, 655844699), P(462089267, 655844699),
+             P(462088522, 655845633), P(462087030, 655845633), P(462085539, 655844699), P(462082557, 655848434),
+             P(462081811, 655848434), P(462080320, 655844699), P(462079574, 655845633), P(462079574, 655848434),
+             P(462078828, 655850302), P(462074354, 655850302), P(462072863, 655852170), P(462072863, 655849368),
+             P(462071372, 655847501), P(462069880, 655849368), P(462069880, 655851236), P(462069135, 655851236),
+             P(462068389, 655852170), P(462069135, 655853103), P(462068389, 655853103), P(462067643, 655855905),
+             P(462066152, 655854037), P(462062424, 655855905), P(462061678, 655854971), P(462059441, 655854971),
+             P(462059441, 655854037), P(462060933, 655854037), P(462061678, 655853103), P(462062424, 655854037),
+             P(462065407, 655854037), P(462066898, 655852170), P(462066898, 655851236), P(462066152, 655850302),
+             P(462066152, 655848434), P(462064661, 655846567), P(462061678, 655844699), P(462060187, 655846567),
+             P(462060187, 655848434), P(462058696, 655850302), P(462057950, 655850302), P(462056459, 655852170),
+             P(462055713, 655854037), P(462056459, 655854971), P(462056459, 655855905), P(462057204, 655856839),
+             P(462057950, 655856839), P(462058696, 655858706), P(462059441, 655858706), P(462060933, 655859640),
+             P(462060187, 655859640), P(462059441, 655860574), P(462058696, 655860574), P(462057950, 655861508),
+             P(462057204, 655861508), P(462056459, 655862442), P(462056459, 655863375), P(462055713, 655863375),
+             P(462054967, 655864309), P(462054967, 655865243), P(462054222, 655866177), P(462053476, 655866177),
+             P(462051985, 655868045), P(462051239, 655868045), P(462047511, 655871780), P(462046765, 655871780),
+             P(462046020, 655870846), P(462043783, 655870846), P(462042291, 655872714), P(462043783, 655874582),
+             P(462043037, 655874582), P(462042291, 655873648), P(462040800, 655873648), P(462040054, 655874582),
+             P(462040054, 655875516), P(462040800, 655876449), P(462043783, 655876449), P(462043783, 655878317),
+             P(462041546, 655878317), P(462040800, 655877383), P(462040054, 655878317), P(462035580, 655879251),
+             P(462034835, 655878317), P(462034835, 655877383), P(462032598, 655874582), P(462033343, 655873648),
+             P(462033343, 655872714), P(462032598, 655870846), P(462031852, 655871780), P(462031106, 655871780),
+             P(462030361, 655872714), P(462029615, 655871780), P(462028869, 655871780), P(462028124, 655872714),
+             P(462028869, 655873648), P(462028869, 655874582), P(462027378, 655875516), P(462025141, 655875516),
+             P(462023650, 655874582), P(462025141, 655872714), P(462025887, 655872714), P(462027378, 655870846),
+             P(462026633, 655869912), P(462025887, 655869912), P(462025141, 655868978), P(462025141, 655868045),
+             P(462024396, 655867111), P(462023650, 655865243), P(462024396, 655864309), P(462025141, 655864309),
+             P(462025141, 655861508), P(462024396, 655860574), P(462021413, 655860574), P(462021413, 655858706),
+             P(462019922, 655856839), P(462018430, 655858706), P(462018430, 655860574), P(462017685, 655860574),
+             P(462016939, 655861508), P(462014702, 655862442), P(462014702, 655861508), P(462016193, 655859640),
+             P(462016193, 655857772), P(462015448, 655855905), P(462014702, 655854971), P(462013956, 655854971),
+             P(462013211, 655855905), P(462013211, 655858706), P(462010974, 655858706), P(462010974, 655856839),
+             P(462011719, 655855905), P(462010974, 655854971), P(462008737, 655850302), P(462007246, 655852170),
+             P(462007246, 655853103), P(462006500, 655854037), P(462005754, 655855905), P(462007246, 655857772),
+             P(462007991, 655857772), P(462007991, 655858706), P(462007246, 655859640), P(462007246, 655862442),
+             P(462005754, 655862442), P(462005754, 655861508), P(462006500, 655860574), P(462006500, 655857772),
+             P(462006067, 655856854), P(462005009, 655856839), P(462005009, 655857772), P(462003517, 655859640),
+             P(462002772, 655861508), P(462002026, 655861508), P(462000535, 655859640), P(461998298, 655862442),
+             P(461997552, 655861508), P(461997552, 655860574), P(461996806, 655859640), P(461995315, 655858706),
+             P(461994569, 655859640), P(461993824, 655859640), P(461993824, 655857772), P(461993078, 655856839),
+             P(461990095, 655856839), P(461990095, 655855905), P(461989350, 655854971), P(461988604, 655854971),
+             P(461984130, 655857772), P(461984130, 655856839), P(461983385, 655855905), P(461981893, 655854971),
+             P(461982639, 655854037), P(461984130, 655855905), P(461984876, 655854971), P(461985622, 655853103),
+             P(461984130, 655851236), P(461984130, 655850302), P(461983385, 655849368), P(461983385, 655847501),
+             P(461982639, 655846567), P(461982639, 655844699), P(461983385, 655843765), P(461981148, 655840964),
+             P(461981148, 655838163), P(461982639, 655838163), P(461984130, 655837229), P(461981893, 655834428),
+             P(461979656, 655834428), P(461977419, 655831627), P(461975928, 655831627), P(461975182, 655830693),
+             P(461975182, 655828825), P(461974437, 655827892), P(461973691, 655827892), P(461971454, 655825091),
+             P(461970708, 655825091), P(461969963, 655824157), P(461968471, 655823223), P(461966980, 655823223),
+             P(461966980, 655821356), P(461968614, 655822474), P(461969217, 655823223), P(461969963, 655823223),
+             P(461970708, 655824157), P(461972200, 655825091), P(461972945, 655824157), P(461972945, 655823223),
+             P(461973691, 655823223), P(461975928, 655821356), P(461974437, 655819488), P(461972945, 655821356),
+             P(461972200, 655821356), P(461971454, 655820422), P(461970708, 655820422), P(461968471, 655819488),
+             P(461968471, 655818555), P(461969217, 655817621), P(461968471, 655816687), P(461967726, 655816687),
+             P(461967726, 655815754), P(461965489, 655812953), P(461966235, 655812019), P(461966235, 655810152),
+             P(461965489, 655809218), P(461964743, 655809218), P(461963252, 655810152), P(461963252, 655805483),
+             P(461961015, 655798014), P(461960269, 655798948), P(461960269, 655799881), P(461959524, 655800815),
+             P(461960269, 655801749), P(461960269, 655803616), P(461959524, 655804550), P(461958778, 655807351),
+             P(461957287, 655805483), P(461957287, 655804550), P(461956541, 655803616), P(461955795, 655803616),
+             P(461953558, 655806417), P(461949084, 655806417), P(461948339, 655807351), P(461948339, 655809218),
+             P(461947593, 655810152), P(461946848, 655812019), P(461946102, 655812019), P(461945356, 655811085),
+             P(461944611, 655812019), P(461943865, 655812019), P(461943119, 655810152), P(461942374, 655811085),
+             P(461942374, 655812019), P(461941628, 655812953), P(461941628, 655813886), P(461939391, 655816687),
+             P(461937900, 655816687), P(461937154, 655815754), P(461935663, 655815754), P(461936408, 655814820),
+             P(461936408, 655813886), P(461938645, 655813886), P(461940882, 655811085), P(461939391, 655809218),
+             P(461939391, 655807351), P(461940137, 655805483), P(461939391, 655804550), P(461937154, 655804550),
+             P(461937154, 655803616), P(461937900, 655802682), P(461935663, 655798948), P(461934171, 655798948),
+             P(461933426, 655799881), P(461931934, 655800815), P(461931934, 655802682), P(461931189, 655803616),
+             P(461931189, 655804550), P(461931934, 655806417), P(461931189, 655806417), P(461930443, 655807351),
+             P(461929697, 655807351), P(461930443, 655806417), P(461926715, 655807351), P(461927461, 655808284),
+             P(461925224, 655811085), P(461926715, 655812953), P(461925969, 655813886), P(461925969, 655815754),
+             P(461927461, 655818555), P(461929697, 655818555), P(461930443, 655819488), P(461931189, 655818555),
+             P(461931934, 655818555), P(461931934, 655821356), P(461932680, 655822289), P(461934171, 655822289),
+             P(461936408, 655819488), P(461937154, 655819488), P(461937154, 655820422), P(461937900, 655821356),
+             P(461939391, 655819488), P(461940137, 655819488), P(461940137, 655820422), P(461941628, 655822289),
+             P(461942374, 655822289), P(461943865, 655823223), P(461948339, 655823223), P(461947593, 655824157),
+             P(461946848, 655824157), P(461946102, 655825091), P(461946102, 655826024), P(461944611, 655826024),
+             P(461943119, 655827892), P(461943119, 655828825), P(461941628, 655828825), P(461937154, 655834428),
+             P(461937154, 655835362), P(461936408, 655835362), P(461934171, 655837229), P(461932680, 655837229),
+             P(461931934, 655836295), P(461930443, 655836295), P(461929697, 655835362), P(461925969, 655835362),
+             P(461924478, 655837229), P(461922241, 655837229), P(461921495, 655836295), P(461921495, 655831627),
+             P(461919258, 655828825), P(461919258, 655826958), P(461916276, 655823223), P(461915530, 655821356),
+             P(461912547, 655817621), P(461911802, 655817621), P(461911056, 655818555), P(461910310, 655817621),
+             P(461908819, 655817621), P(461908074, 655816687), P(461908074, 655815754), P(461904345, 655812953),
+             P(461903600, 655812953), P(461902854, 655813886), P(461901363, 655813886), P(461900617, 655814820),
+             P(461901363, 655815754), P(461902854, 655815754), P(461903600, 655816687), P(461902854, 655817621),
+             P(461902108, 655817621), P(461901363, 655818555), P(461900617, 655818555), P(461899871, 655819488),
+             P(461899871, 655820422), P(461899126, 655821356), P(461899126, 655822289), P(461897634, 655826024),
+             P(461895397, 655826024), P(461894652, 655825091), P(461893160, 655826958), P(461891669, 655825091),
+             P(461892415, 655824157), P(461891669, 655823223), P(461886450, 655823223), P(461884958, 655825091),
+             P(461884213, 655825091), P(461881976, 655827892), P(461882721, 655828825), P(461882721, 655829759),
+             P(461881976, 655829759), P(461881230, 655830693), P(461880484, 655829759), P(461878993, 655829759),
+             P(461878247, 655830693), P(461877502, 655830693), P(461876010, 655832560), P(461875265, 655832560),
+             P(461874519, 655833494), P(461871536, 655834428), P(461872282, 655835362), P(461871536, 655836295),
+             P(461871536, 655837229), P(461870791, 655838163), P(461870791, 655840964), P(461872282, 655842832),
+             P(461872282, 655844699), P(461871536, 655844699), P(461870791, 655845633), P(461870045, 655847501),
+             P(461869300, 655846567), P(461868554, 655846567), P(461867063, 655842832), P(461866317, 655842832),
+             P(461865571, 655841898), P(461864826, 655842832), P(461864080, 655841898), P(461863334, 655841898),
+             P(461862589, 655840964), P(461861097, 655840030), P(461857369, 655840030), P(461856623, 655839097),
+             P(461855132, 655838163), P(461853641, 655838163), P(461852895, 655839097), P(461849913, 655839097),
+             P(461849167, 655840030), P(461848421, 655839097), P(461845439, 655839097), P(461844693, 655838163),
+             P(461844693, 655837229), P(461843947, 655836295), P(461843947, 655834428), P(461843202, 655832560),
+             P(461842456, 655831627), P(461841710, 655831627), P(461839473, 655827892), P(461835745, 655827892),
+             P(461834999, 655826958), P(461833508, 655826024), P(461832762, 655826958), P(461831271, 655826958),
+             P(461830525, 655827892), P(461828289, 655827892), P(461827543, 655828825), P(461826797, 655828825),
+             P(461825306, 655830693), P(461822323, 655830693), P(461821578, 655831627), P(461820086, 655832560),
+             P(461819341, 655831627), P(461814867, 655831627), P(461814121, 655830693), P(461813375, 655830693),
+             P(461812630, 655829759), P(461811884, 655829759), P(461811138, 655828825), P(461811138, 655827892),
+             P(461811884, 655826958), P(461811884, 655826024), P(461811138, 655825091), P(461811138, 655824157),
+             P(461808902, 655822289), P(461808156, 655823223), P(461805919, 655823223), P(461805173, 655824157),
+             P(461798462, 655824157), P(461797717, 655823223), P(461797717, 655821356), P(461798462, 655821356),
+             P(461799954, 655819488), P(461799954, 655818555), P(461799208, 655817621), P(461799954, 655816687),
+             P(461799954, 655812953), P(461798462, 655811085), P(461797717, 655812019), P(461796971, 655811085),
+             P(461793988, 655811085), P(461793988, 655810152), P(461793243, 655809218), P(461793243, 655807351),
+             P(461789515, 655802682), P(461785041, 655802682), P(461784295, 655801749), P(461782804, 655801749),
+             P(461782804, 655800815), P(461781312, 655798948), P(461780567, 655799881), P(461779821, 655801749),
+             P(461776838, 655798014), P(461776093, 655798014), P(461775347, 655798948), P(461775347, 655799881),
+             P(461767145, 655799881), P(461766399, 655798948), P(461766399, 655798014), P(461764908, 655796147),
+             P(461766399, 655794280), P(461764908, 655792413), P(461762671, 655792413), P(461761925, 655790545),
+             P(461761925, 655788678), P(461764162, 655785877), P(461764162, 655781209), P(461767145, 655781209),
+             P(461764908, 655778409), P(461760434, 655778409), P(461760434, 655777475), P(461761180, 655776542),
+             P(461761180, 655775608), P(461761925, 655775608), P(461762671, 655774675), P(461761180, 655772808),
+             P(461758943, 655772808), P(461758943, 655770940), P(461760434, 655769073), P(461761180, 655767206),
+             P(461760434, 655766273), P(461761180, 655764406), P(461760434, 655763472), P(461758943, 655763472),
+             P(461758197, 655762539), P(461758197, 655761605), P(461757451, 655760672), P(461757451, 655759738),
+             P(461756706, 655758805), P(461755214, 655754137), P(461755214, 655752270), P(461755960, 655751337),
+             P(461755960, 655748536), P(461756706, 655747603), P(461756706, 655746670), P(461758943, 655743869),
+             P(461758943, 655742936), P(461758197, 655740135), P(461758943, 655739202), P(461760434, 655739202),
+             P(461762671, 655736402), P(461762671, 655735468), P(461763417, 655734535), P(461764162, 655734535),
+             P(461765654, 655733602), P(461765654, 655732668), P(461764908, 655731735), P(461764162, 655731735),
+             P(461764162, 655728935), P(461764908, 655728935), P(461766399, 655727068), P(461767891, 655727068),
+             P(461768636, 655726134), P(461768636, 655725201), P(461769382, 655724268), P(461768636, 655723334),
+             P(461768636, 655722401), P(461769382, 655722401), P(461770128, 655721467), P(461773110, 655718667),
+             P(461773110, 655714934), P(461773856, 655714001), P(461774601, 655714001), P(461775347, 655713067),
+             P(461773856, 655709334), P(461774601, 655708401), P(461778330, 655708401), P(461779075, 655707467),
+             P(461779075, 655706534), P(461780567, 655704667), P(461779075, 655702801), P(461780567, 655700934),
+             P(461781312, 655700934), P(461782058, 655700001), P(461783549, 655700001), P(461784295, 655699067),
+             P(461784295, 655698134), P(461785041, 655697201), P(461783549, 655695334), P(461788023, 655692534),
+             P(461788023, 655691601), P(461786532, 655689735), P(461786532, 655687868), P(461788769, 655685068),
+             P(461788023, 655684135), P(461787278, 655684135), P(461787278, 655683202), P(461786532, 655682269),
+             P(461785786, 655682269), P(461785041, 655681335), P(461783549, 655681335), P(461784295, 655680402),
+             P(461782804, 655678536), P(461780567, 655678536), P(461779821, 655677602), P(461779821, 655676669),
+             P(461779075, 655675736), P(461779075, 655674803), P(461778330, 655672003), P(461779075, 655672003),
+             P(461779821, 655671070), P(461780567, 655671070), P(461782058, 655669203), P(461782804, 655669203),
+             P(461784295, 655667337), P(461784295, 655666404), P(461783549, 655665471), P(461784295, 655664537),
+             P(461783549, 655663604), P(461784295, 655659872), P(461785041, 655660805), P(461785786, 655660805),
+             P(461788023, 655658005), P(461788769, 655658938), P(461791751, 655656139), P(461791751, 655650540),
+             P(461792497, 655649607), P(461792497, 655648674), P(461791006, 655646808), P(461791006, 655645874),
+             P(461791751, 655644941), P(461792497, 655644941), P(461793988, 655643075), P(461795480, 655643075),
+             P(461796971, 655641209), P(461797717, 655638409), P(461796971, 655637476), P(461796971, 655636543),
+             P(461797717, 655634677), P(461792497, 655628146), P(461793243, 655628146), P(461793988, 655629079),
+             P(461794734, 655629079), P(461796225, 655627213), P(461796225, 655626279), P(461796971, 655626279),
+             P(461797717, 655625346), P(461799954, 655624413), P(461801445, 655622547), P(461801445, 655620681),
+             P(461802191, 655620681), P(461802936, 655619748), P(461804428, 655618815), P(461805173, 655617882),
+             P(461805173, 655616949), P(461806665, 655615083), P(461806665, 655614150), P(461809647, 655611351),
+             P(461809647, 655610418), P(461808902, 655609485), P(461808156, 655609485), P(461807410, 655608552),
+             P(461807410, 655607619), P(461806665, 655606686), P(461805919, 655604820), P(461806665, 655602954),
+             P(461809647, 655602954), P(461811138, 655601088), P(461811884, 655602021), P(461815612, 655602021),
+             P(461817104, 655600155), P(461817104, 655599222), P(461817849, 655599222), P(461823069, 655592691),
+             P(461824560, 655592691), P(461825306, 655591758), P(461827543, 655591758), P(461829034, 655589892),
+             P(461829780, 655590825), P(461830525, 655589892), P(461832762, 655589892), P(461835745, 655586161),
+             P(461837982, 655586161), P(461838728, 655587094), P(461841710, 655587094), P(461842456, 655588027),
+             P(461843202, 655588027), P(461843947, 655588960), P(461844693, 655588960), P(461845439, 655589892),
+             P(461846184, 655589892), P(461847676, 655590825), P(461849913, 655590825), P(461851404, 655591758),
+             P(461852149, 655591758), P(461852895, 655590825), P(461858115, 655590825), P(461858860, 655589892),
+             P(461864080, 655589892), P(461864080, 655590825), P(461864826, 655591758), P(461863334, 655591758),
+             P(461862589, 655590825), P(461861843, 655590825), P(461861097, 655591758), P(461858115, 655591758),
+             P(461857369, 655592691), P(461855132, 655591758), P(461853641, 655593624), P(461853641, 655595490),
+             P(461854386, 655596423), P(461854386, 655597356), P(461856623, 655600155), P(461856623, 655602954),
+             P(461857369, 655603887), P(461858115, 655603887), P(461859606, 655602021), P(461861097, 655601088),
+             P(461861843, 655602021), P(461861843, 655602954), P(461862589, 655603887), P(461862589, 655605753),
+             P(461866317, 655608552), P(461867063, 655607619), P(461867063, 655606686), P(461867808, 655605753),
+             P(461869300, 655605753), P(461870045, 655606686), P(461871536, 655607619), P(461873028, 655605753),
+             P(461873028, 655604820), P(461873773, 655603887), P(461875265, 655602954), P(461875265, 655601088),
+             P(461876010, 655600155), P(461877502, 655599222), P(461877502, 655598289), P(461878247, 655597356),
+             P(461878247, 655594557), P(461879739, 655594557), P(461881230, 655592691), P(461881230, 655590825),
+             P(461881976, 655589892), P(461883467, 655587094), P(461885704, 655587094), P(461886450, 655586161),
+             P(461887941, 655586161), P(461888687, 655585228), P(461891669, 655584295), P(461891669, 655586161),
+             P(461893906, 655588960), P(461895397, 655588960), P(461896143, 655589892), P(461896143, 655590825),
+             P(461897634, 655592691), P(461897634, 655593624), P(461898380, 655594557), P(461900617, 655596423),
+             P(461902108, 655594557), P(461903600, 655594557), P(461904345, 655595490), P(461904345, 655596423),
+             P(461905091, 655598289), P(461905837, 655599222), P(461907328, 655600155), P(461908074, 655600155),
+             P(461908819, 655599222), P(461908819, 655598289), P(461909565, 655599222), P(461911056, 655599222),
+             P(461911802, 655600155), P(461913293, 655600155), P(461914784, 655602021), P(461917767, 655602021),
+             P(461922241, 655607619), P(461922987, 655607619), P(461923732, 655606686), P(461925969, 655606686),
+             P(461925969, 655610418), P(461927461, 655610418), P(461928206, 655609485), P(461931934, 655609485),
+             P(461933426, 655611351), P(461934171, 655610418), P(461934171, 655608552), P(461935663, 655608552),
+             P(461936408, 655607619), P(461937900, 655607619), P(461940137, 655606686), P(461940882, 655606686),
+             P(461941628, 655607619), P(461942374, 655607619), P(461943119, 655608552), P(461944611, 655608552),
+             P(461947593, 655609485), P(461949084, 655611351), P(461949830, 655611351), P(461950576, 655612284),
+             P(461951321, 655612284), P(461952813, 655613217), P(461952813, 655616016), P(461953558, 655616949),
+             P(461956541, 655616949), P(461957287, 655617882), P(461958032, 655617882), P(461958778, 655618815),
+             P(461959524, 655618815), P(461961761, 655619748), P(461961761, 655620681), P(461965489, 655625346),
+             P(461965489, 655627213), P(461966235, 655628146), P(461967726, 655628146), P(461968471, 655627213),
+             P(461969963, 655630945), P(461972200, 655630945), P(461972945, 655630012), P(461975928, 655630012),
+             P(461978165, 655627213), P(461978911, 655625346), P(461979656, 655625346), P(461981148, 655627213),
+             P(461985622, 655627213), P(461986367, 655628146), P(461989350, 655628146), P(461990095, 655629079),
+             P(461992332, 655629079), P(461995315, 655630012), P(461996806, 655628146), P(461996806, 655627213),
+             P(461996061, 655626279), P(461995315, 655626279), P(461995315, 655625346), P(461994569, 655624413),
+             P(461995315, 655623480), P(461995315, 655621614), P(461993824, 655619748), P(461994569, 655619748),
+             P(461995315, 655618815), P(461997552, 655618815), P(461998298, 655617882), P(461998298, 655616949),
+             P(462000535, 655615083), P(462002772, 655615083), P(462003517, 655616016), P(462004263, 655616016),
+             P(462005009, 655616949), P(462005754, 655616949), P(462007991, 655617882), P(462007991, 655618815),
+             P(462008737, 655619748), P(462009482, 655619748), P(462010228, 655618815), P(462010228, 655616949),
+             P(462011719, 655616949), P(462011719, 655619748), P(462012465, 655620681), P(462012465, 655621614),
+             P(462010974, 655621614), P(462010228, 655622547), P(462010974, 655623480), P(462013956, 655628146),
+             P(462014702, 655627213), P(462017685, 655627213), P(462018430, 655626279), P(462019922, 655626279),
+             P(462020667, 655625346), P(462020667, 655624413), P(462022159, 655622547), P(462022904, 655622547),
+             P(462023650, 655623480), P(462025887, 655623480), P(462026633, 655624413), P(462027378, 655623480),
+             P(462027378, 655622547), P(462029615, 655622547), P(462030361, 655621614), P(462030361, 655620681),
+             P(462029615, 655619748), P(462028869, 655619748), P(462028124, 655617882), P(462028124, 655613217),
+             P(462028869, 655612284), P(462027378, 655610418), P(462028124, 655610418), P(462031852, 655605753),
+             P(462034089, 655603887), P(462038563, 655603887), P(462039309, 655604820), P(462040054, 655604820),
+             P(462041546, 655603887), P(462042291, 655604820), P(462041546, 655605753), P(462041546, 655606686),
+             P(462042291, 655609485), P(462043783, 655607619), P(462045274, 655607619), P(462046020, 655608552),
+             P(462049002, 655608552), P(462051239, 655605753), P(462052730, 655605753), P(462053476, 655604820),
+             P(462054967, 655604820), P(462055713, 655603887), P(462059441, 655602954), P(462060187, 655602021),
+             P(462058696, 655600155), P(462059441, 655599222), P(462060187, 655599222), P(462060933, 655598289),
+             P(462060933, 655592691), P(462062424, 655592691), P(462063915, 655594557), P(462065407, 655592691),
+             P(462065407, 655591758), P(462064661, 655590825), P(462064661, 655586161), P(462063915, 655585228),
+             P(462063170, 655586161), P(462061678, 655587094), P(462061678, 655584295), P(462062424, 655582429),
+             P(462063170, 655581496), P(462064661, 655581496), P(462065407, 655580563), P(462067643, 655580563),
+             P(462068389, 655581496), P(462070626, 655581496), P(462071372, 655580563), P(462071372, 655579630),
+             P(462072863, 655577765), P(462072863, 655572167), P(462073609, 655570301), P(462074354, 655569369),
+             P(462075846, 655569369), P(462078083, 655566570), P(462078828, 655566570), P(462080320, 655564704),
+             P(462079574, 655562839), P(462080320, 655562839), P(462081811, 655560973), P(462082557, 655560973),
+             P(462083302, 655561906), P(462084794, 655561906), P(462085539, 655562839), P(462087776, 655562839),
+             P(462089267, 655560973), P(462090013, 655560973), P(462090759, 655560040), P(462090759, 655559107),
+             P(462090013, 655558174), P(462089267, 655556309), P(462091504, 655556309), P(462092250, 655555376),
+             P(462092250, 655554443), P(462092996, 655552577), P(462093741, 655551645), P(462094487, 655551645),
+             P(462098961, 655545115), P(462104181, 655545115), P(462104926, 655544182), P(462108654, 655544182),
+             P(462110891, 655546981), P(462112383, 655547913), P(462113874, 655547913), P(462114620, 655546981),
+             P(462116111, 655546981), P(462116857, 655546048), P(462118348, 655545115), P(462119094, 655546048),
+             P(462119094, 655546981), P(462119839, 655547913), P(462120585, 655547913), P(462121331, 655548846),
+             P(462122822, 655548846), P(462123568, 655547913), P(462125059, 655547913), P(462125805, 655548846),
+             P(462126550, 655548846), P(462128787, 655551645), P(462131770, 655552577), P(462141463, 655552577),
+             P(462142209, 655551645), P(462141463, 655550712), P(462141463, 655549779), P(462142209, 655549779),
+             P(462143700, 655547913), P(462145937, 655547913), P(462146683, 655548846), P(462147428, 655548846),
+             P(462148174, 655547913), P(462149665, 655547913), P(462150411, 655548846), P(462153394, 655548846),
+             P(462154139, 655547913), P(462167561, 655547913), P(462168307, 655546981), P(462168307, 655546048),
+             P(462169052, 655545115), P(462170544, 655546981), P(462171289, 655546981), P(462172035, 655546048),
+             P(462172781, 655546048), P(462175018, 655548846), P(462175763, 655548846), P(462178000, 655549779),
+             P(462180983, 655549779), P(462182474, 655547913), P(462185457, 655547913), P(462186202, 655548846),
+             P(462186948, 655548846), P(462187694, 655549779), P(462189185, 655549779), P(462190676, 655551645),
+             P(462192168, 655549779), P(462192913, 655549779), P(462194405, 655551645), P(462197387, 655551645),
+             P(462198133, 655552577), P(462200370, 655552577), P(462206335, 655553510), P(462207081, 655552577),
+             P(462207081, 655549779), P(462207826, 655549779), P(462208572, 655548846), P(462211555, 655547913),
+             P(462211555, 655549779), P(462212300, 655550712), P(462212300, 655551645), P(462213046, 655553510),
+             P(462213046, 655554443), P(462212300, 655555376), P(462213792, 655557241), P(462215283, 655557241),
+             P(462216029, 655556309), P(462216774, 655557241), P(462216774, 655558174), P(462217520, 655559107),
+             P(462219757, 655559107), P(462222740, 655560040), P(462223485, 655559107), P(462224231, 655559107),
+             P(462224976, 655558174), P(462224976, 655557241), P(462229450, 655557241), P(462230196, 655558174),
+             P(462231687, 655557241), P(462231687, 655556309), P(462230942, 655555376), P(462230196, 655555376),
+             P(462229450, 655554443), P(462227959, 655554443), P(462228705, 655553510), P(462228705, 655547913),
+             P(462232433, 655547913), P(462233179, 655548846), P(462234670, 655549779), P(462239144, 655549779),
+             P(462239890, 655548846), P(462240635, 655548846), P(462242127, 655547913), P(462243618, 655547913),
+             P(462244363, 655548846), P(462245855, 655546981), P(462248092, 655546981), P(462249583, 655547913),
+             P(462251074, 655546048), P(462252566, 655546048), P(462253311, 655545115), P(462252566, 655544182),
+             P(462256294, 655541384), P(462256294, 655542317), P(462257785, 655544182), P(462260768, 655544182),
+             P(462263005, 655546981), P(462262259, 655547913), P(462260022, 655547913), P(462259277, 655548846),
+             P(462260022, 655550712), P(462259277, 655550712), P(462257785, 655549779), P(462255548, 655552577),
+             P(462254803, 655554443), P(462254803, 655556309), P(462254057, 655557241), P(462254803, 655558174),
+             P(462254803, 655560973), P(462255548, 655561906), P(462255548, 655562839), P(462256294, 655563771),
+             P(462258531, 655563771), P(462258531, 655564704), P(462257040, 655564704), P(462254803, 655569369),
+             P(462255548, 655570301), P(462257040, 655570301), P(462258531, 655571234), P(462258531, 655572167),
+             P(462257040, 655574033), P(462257785, 655574966), P(462257785, 655575899), P(462258531, 655576832),
+             P(462260768, 655576832), P(462261514, 655577765), P(462263005, 655577765), P(462262259, 655578697),
+             P(462262259, 655581496), P(462263005, 655582429), P(462264496, 655582429), P(462265242, 655583362),
+             P(462265242, 655584295), P(462265987, 655585228), P(462268970, 655589892), P(462267479, 655589892),
+             P(462266733, 655588960), P(462265242, 655588960), P(462264496, 655589892), P(462264496, 655591758),
+             P(462263005, 655593624), P(462264496, 655595490), P(462263750, 655596423), P(462263750, 655597356),
+             P(462264496, 655598289), P(462265242, 655598289), P(462266733, 655600155), P(462265987, 655600155),
+             P(462265242, 655599222), P(462263750, 655601088), P(462263005, 655601088), P(462262259, 655600155),
+             P(462260022, 655601088), P(462258531, 655602954), P(462258531, 655605753), P(462257785, 655606686),
+             P(462257040, 655608552), P(462256294, 655608552), P(462254803, 655610418), P(462254803, 655611351),
+             P(462253311, 655611351), P(462252566, 655612284), P(462252566, 655615083), P(462249583, 655616949),
+             P(462249583, 655617882), P(462250329, 655618815), P(462249583, 655619748), P(462249583, 655620681),
+             P(462248092, 655622547), P(462248092, 655624413), P(462248837, 655625346), P(462250329, 655625346),
+             P(462250329, 655627213), P(462251074, 655628146), P(462251074, 655629079), P(462251820, 655630945),
+             P(462254057, 655633744), P(462251074, 655637476), P(462250329, 655637476), P(462249583, 655638409),
+             P(462249583, 655642142), P(462248092, 655645874), P(462248837, 655646808), P(462249583, 655645874),
+             P(462251820, 655648674), P(462252566, 655647741), P(462252566, 655643075), P(462254803, 655640276),
+             P(462256294, 655640276), P(462257040, 655639343), P(462257040, 655638409), P(462258531, 655638409),
+             P(462260022, 655639343), P(462260768, 655638409), P(462260022, 655637476), P(462260022, 655636543),
+             P(462260768, 655634677), P(462261514, 655633744), P(462262259, 655633744), P(462265242, 655631878),
+             P(462265987, 655632811), P(462265242, 655633744), P(462265242, 655634677), P(462265987, 655635610),
+             P(462266733, 655637476), P(462265987, 655638409), P(462265987, 655639343), P(462265242, 655640276),
+             P(462265242, 655641209), P(462264496, 655642142), P(462264496, 655644008), P(462263005, 655645874),
+             P(462262259, 655645874), P(462261514, 655646808), P(462257785, 655646808), P(462257040, 655647741),
+             P(462254803, 655649607), P(462255548, 655650540), P(462257785, 655650540), P(462258531, 655651473),
+             P(462257785, 655652406), P(462257040, 655652406), P(462256294, 655653339), P(462257040, 655654273),
+             P(462257040, 655655206), P(462257785, 655656139), P(462261514, 655658938), P(462257040, 655658938),
+             P(462256294, 655658005), P(462254803, 655658005), P(462253311, 655657072), P(462252566, 655658005),
+             P(462254057, 655659872), P(462254057, 655663604), P(462252566, 655665471), P(462251074, 655665471),
+             P(462250329, 655666404), P(462248837, 655666404), P(462248092, 655665471), P(462246600, 655666404),
+             P(462246600, 655668270), P(462247346, 655669203), P(462248092, 655669203), P(462248092, 655670137),
+             P(462246600, 655672003), P(462247346, 655672936), P(462247346, 655675736), P(462246600, 655676669),
+             P(462246600, 655677602), P(462245855, 655678536), P(462245855, 655679469), P(462244363, 655681335),
+             P(462239890, 655683202), P(462239144, 655682269), P(462237653, 655682269), P(462237653, 655680402),
+             P(462238398, 655679469), P(462236161, 655676669), P(462235416, 655676669), P(462233924, 655675736),
+             P(462234670, 655674803), P(462235416, 655674803), P(462236907, 655672936), P(462237653, 655671070),
+             P(462236161, 655669203), P(462235416, 655669203), P(462233924, 655668270), P(462233924, 655666404),
+             P(462233179, 655665471), P(462231687, 655664537), P(462232433, 655663604), P(462232433, 655660805),
+             P(462230942, 655658938), P(462229450, 655658938), P(462226468, 655655206), P(462225722, 655656139),
+             P(462225722, 655659872), P(462224976, 655661738), P(462222740, 655664537), P(462221994, 655664537),
+             P(462220503, 655665471), P(462221248, 655666404), P(462221994, 655666404), P(462221994, 655667337),
+             P(462222740, 655668270), P(462222740, 655669203), P(462221994, 655670137), P(462223485, 655672003),
+             P(462224231, 655672003), P(462224231, 655672936), P(462223485, 655672936), P(462222740, 655673869),
+             P(462221248, 655675736), P(462220503, 655677602), P(462221248, 655678536), P(462221994, 655678536),
+             P(462222740, 655679469), P(462224976, 655679469), P(462225722, 655680402), P(462225722, 655681335),
+             P(462224976, 655682269), P(462227213, 655685068), P(462226468, 655685068), P(462225722, 655686002),
+             P(462224976, 655686002), P(462224231, 655686935), P(462222740, 655686935), P(462221994, 655687868),
+             P(462221248, 655689735), P(462218266, 655686002), P(462217520, 655686002), P(462216774, 655686935),
+             P(462216774, 655687868), P(462217520, 655688801), P(462217520, 655690668), P(462218266, 655692534),
+             P(462217520, 655692534), P(462216774, 655693468), P(462216774, 655695334), P(462216029, 655695334),
+             P(462212300, 655697201), P(462214537, 655700001), P(462216774, 655700001), P(462216774, 655701867),
+             P(462217520, 655702801), P(462219757, 655702801), P(462221248, 655704667), P(462222740, 655704667),
+             P(462223485, 655703734), P(462224976, 655702801), P(462224976, 655703734), P(462226468, 655705601),
+             P(462227213, 655705601), P(462226468, 655706534), P(462227959, 655709334), P(462227213, 655708401),
+             P(462226468, 655709334)};
 
-  P arrB9[] = { P(461870791, 655850302), P(461870791, 655849368), P(461871536, 655850302), P(461872282, 655852170), P(461873028, 655854971), P(461872282, 655854037), P(461870791, 655854037), P(461869300, 655853103), P(461869300, 655852170), P(461870045, 655851236) };
+P arrB9[] = {P(461870791, 655850302), P(461870791, 655849368), P(461871536, 655850302), P(461872282, 655852170),
+             P(461873028, 655854971), P(461872282, 655854037), P(461870791, 655854037), P(461869300, 655853103),
+             P(461869300, 655852170), P(461870045, 655851236)};
 
-  P arrB10[] = { P(459759099, 659037544), P(459758353, 659038488), P(459757607, 659037544), P(459757607, 659036599), P(459758353, 659037544) };
+P arrB10[] = {P(459759099, 659037544), P(459758353, 659038488), P(459757607, 659037544), P(459757607, 659036599),
+              P(459758353, 659037544)};
 
-  P arrB11[] = { P(461887195, 658819463), P(461888687, 658819463), P(461888687, 658820407), P(461890178, 658822294), P(461890178, 658823238), P(461891669, 658825125), P(461892415, 658825125), P(461893160, 658826069), P(461893160, 658827013), P(461893906, 658827957), P(461894652, 658827957), P(461894652, 658828900), P(461896143, 658830788), P(461899871, 658835506), P(461901363, 658835506), P(461902108, 658836450), P(461902854, 658836450), P(461903600, 658836450), P(461905091, 658838338), P(461905837, 658840225), P(461905837, 658841169), P(461904345, 658843057), P(461903600, 658844944), P(461903600, 658845888), P(461903600, 658846832), P(461902854, 658847776), P(461903600, 658848719), P(461903600, 658850607), P(461902854, 658851551), P(461902854, 658852495), P(461903600, 658856270), P(461902854, 658857214), P(461902854, 658858158), P(461902108, 658859101), P(461902108, 658860989), P(461902108, 658861933), P(461901363, 658861933), P(461900617, 658862877), P(461900617, 658863821), P(461898380, 658866652), P(461898380, 658867596), P(461899126, 658868540), P(461899126, 658869484), P(461898380, 658870428), P(461898380, 658872315), P(461897634, 658873259), P(461897634, 658876091), P(461897634, 658877035), P(461896143, 658878923), P(461895397, 658879867), P(461896143, 658880811), P(461894652, 658885530), P(461895417, 658891568), P(461895598, 658892269), P(461895608, 658892729), P(461895778, 658893077), P(461896052, 658893644), P(461896148, 658894156), P(461896163, 658895039), P(461896263, 658895870), P(461896508, 658896694), P(461896933, 658897419), P(461897294, 658897933), P(461897512, 658897955), P(461897712, 658898260), P(461898059, 658898523), P(461898449, 658897685), P(461898681, 658897783), P(461898561, 658898165), P(461898950, 658898693), P(461899573, 658898679), P(461899573, 658899149), P(461900035, 658899197), P(461900060, 658899536), P(461899955, 658899552), P(461900275, 658899940), P(461900557, 658900106), P(461900761, 658900086), P(461900773, 658900387), P(461900922, 658900399), P(461901038, 658900573), P(461901202, 658900444), P(461901440, 658900710), P(461901296, 658900878), P(461901460, 658901096), P(461901462, 658901523), P(461901812, 658901973), P(461902815, 658902734), P(461902841, 658903174), P(461902948, 658903594), P(461903241, 658903969), P(461903328, 658904312), P(461903147, 658904386), P(461903085, 658904683), P(461902608, 658904867), P(461902754, 658905262), P(461902336, 658905481), P(461902237, 658905820), P(461901802, 658905821), P(461901585, 658906008), P(461900406, 658906130), P(461900314, 658906289), P(461899928, 658906311), P(461899866, 658906210), P(461898720, 658906260), P(461898700, 658906729), P(461898391, 658906775), P(461898378, 658906599), P(461896739, 658906728), P(461896352, 658906477), P(461896015, 658906444), P(461895956, 658906609), P(461895634, 658906563), P(461895488, 658906400), P(461895124, 658906505), P(461894620, 658906732), P(461893957, 658907180), P(461893397, 658907639), P(461892690, 658908378), P(461892146, 658909144), P(461890923, 658911068), P(461890153, 658912451), P(461889244, 658914682), P(461888714, 658916737), P(461888394, 658918706), P(461888253, 658919329), P(461887904, 658919998), P(461887837, 658921357), P(461887776, 658921917), P(461887505, 658922487), P(461886849, 658923502), P(461886686, 658924126), P(461886478, 658924279), P(461886630, 658924819), P(461886547, 658925329), P(461885994, 658926536), P(461886297, 658926672), P(461885601, 658927899), P(461884938, 658929823), P(461884483, 658930588), P(461884408, 658931293), P(461884614, 658931474), P(461884633, 658931696), P(461884388, 658931959), P(461884080, 658933256), P(461883621, 658934502), P(461883660, 658935396), P(461883547, 658935637), P(461883294, 658935709), P(461883335, 658935951), P(461883107, 658936228), P(461882977, 658936571), P(461883064, 658937030), P(461882803, 658937196), P(461882184, 658938336), P(461882244, 658938545), P(461881818, 658939298), P(461881957, 658939447), P(461881872, 658939577), P(461881548, 658940939), P(461882115, 658941598), P(461881962, 658942028), P(461881663, 658942376), P(461881693, 658944318), P(461881580, 658944498), P(461881794, 658944540), P(461881798, 658945119), P(461881558, 658945579), P(461881590, 658946199), P(461881332, 658946919), P(461881324, 658948073), P(461881246, 658948089), P(461881242, 658948308), P(461881336, 658948416), P(461881072, 658948564), P(461881008, 658948941), P(461881155, 658949057), P(461881136, 658949147), P(461880869, 658949203), P(461880556, 658949930), P(461881004, 658950118), P(461880418, 658950140), P(461880380, 658950205), P(461880565, 658950599), P(461880324, 658950764), P(461879770, 658951818), P(461879590, 658952640), P(461879297, 658952906), P(461879289, 658953276), P(461878698, 658953663), P(461878162, 658953901), P(461877698, 658954186), P(461877179, 658954616), P(461876765, 658955103), P(461876669, 658955634), P(461876333, 658956387), P(461876098, 658957241), P(461875543, 658958242), P(461875470, 658959082), P(461875306, 658959192), P(461875179, 658959824), P(461875239, 658960197), P(461875449, 658960434), P(461875287, 658960649), P(461875026, 658960782), P(461875092, 658961166), P(461875003, 658961527), P(461874773, 658961729), P(461874716, 658962069), P(461874477, 658962796), P(461874394, 658963611), P(461874722, 658964766), P(461874836, 658965470), P(461874723, 658966275), P(461874201, 658967305), P(461873829, 658967805), P(461873617, 658967780), P(461873033, 658968330), P(461871801, 658970076), P(461872029, 658970265), P(461871972, 658970823), P(461871678, 658971602), P(461871482, 658971775), P(461871483, 658972499), P(461871738, 658972729), P(461871553, 658972918), P(461871436, 658973632), P(461871642, 658973819), P(461870358, 658976462), P(461870314, 658976742), P(461869765, 658977633), P(461869507, 658978225), P(461868771, 658979691), P(461868744, 658981034), P(461868522, 658982514), P(461867925, 658983822), P(461867726, 658984631), P(461867273, 658983964), P(461867380, 658985085), P(461867740, 658985424), P(461868220, 658985728), P(461868378, 658986048), P(461867743, 658986842), P(461867444, 658987496), P(461867484, 658988552), P(461867407, 658989739), P(461867105, 658990819), P(461866689, 658992072), P(461866317, 658993159), P(461865626, 658995584), P(461864220, 658997920), P(461861828, 659001546), P(461861681, 659002539), P(461860988, 659003364), P(461859626, 659003840), P(461857566, 659003744), P(461856815, 659003587), P(461855993, 659003447), P(461855001, 659003362), P(461854255, 659003362), P(461853298, 659003714), P(461852412, 659003998), P(461851076, 659004416), P(461850194, 659004278), P(461848372, 659004245), P(461846619, 659004771), P(461845732, 659005450), P(461844174, 659006253), P(461842914, 659006408), P(461841579, 659006195), P(461840474, 659006299), P(461839068, 659007104), P(461837028, 659007907), P(461835614, 659009028), P(461834772, 659010051), P(461834102, 659010691), P(461833593, 659011139), P(461833142, 659011538), P(461832632, 659011861), P(461830708, 659013262), P(461829385, 659013658), P(461828857, 659013248), P(461828290, 659013235), P(461827761, 659013418), P(461827316, 659013797), P(461826892, 659014323), P(461826410, 659014787), P(461825828, 659015530), P(461825175, 659016583), P(461824429, 659017528), P(461823095, 659018933), P(461820967, 659019691), P(461819369, 659020392), P(461818506, 659020902), P(461817782, 659021573), P(461817146, 659022136), P(461816383, 659022467), P(461815183, 659022831), P(461813990, 659023194), P(461813177, 659023538), P(461812111, 659023674), P(461811238, 659023600), P(461810292, 659023331), P(461807795, 659023220), P(461806391, 659023239), P(461804724, 659023240), P(461804059, 659023235), P(461803224, 659023365), P(461802240, 659023392), P(461801043, 659023498), P(461800630, 659023845), P(461799915, 659023965), P(461799060, 659024404), P(461798228, 659025448), P(461797507, 659025975), P(461796561, 659026602), P(461795761, 659027244), P(461794673, 659027655), P(461793881, 659028036), P(461792934, 659028629), P(461792020, 659029178), P(461790620, 659029986), P(461789996, 659030221), P(461789359, 659030458), P(461788574, 659031167), P(461788127, 659031922), P(461787267, 659032213), P(461786151, 659032380), P(461784473, 659032219), P(461783422, 659032420), P(461781979, 659032402), P(461780889, 659031736), P(461780087, 659031621), P(461778816, 659031954), P(461777587, 659031554), P(461775407, 659030348), P(461774471, 659029805), P(461773725, 659029805), P(461772963, 659029512), P(461772220, 659029445), P(461771135, 659029186), P(461770207, 659028850), P(461769171, 659028508), P(461767151, 659028300), P(461765555, 659028367), P(461764105, 659028578), P(461762275, 659029004), P(461760857, 659029199), P(461759557, 659029805), P(461758326, 659030722), P(461756942, 659031226), P(461754612, 659032539), P(461751700, 659033674), P(461750033, 659033461), P(461747705, 659033074), P(461744833, 659033224), P(461742190, 659033725), P(461740828, 659033987), P(461739873, 659034941), P(461738771, 659035752), P(461737567, 659035786), P(461735996, 659035560), P(461732996, 659035720), P(461727454, 659037748), P(461726686, 659037703), P(461725775, 659037392), P(461725068, 659037573), P(461724148, 659038034), P(461723382, 659038020), P(461722628, 659037695), P(461721118, 659037439), P(461719959, 659037562), P(461718546, 659037360), P(461717871, 659037362), P(461716247, 659037084), P(461716027, 659037503), P(461715532, 659037792), P(461714748, 659037903), P(461713983, 659037509), P(461713267, 659037047), P(461712371, 659036699), P(461711353, 659036317), P(461709894, 659036120), P(461708543, 659035754), P(461707247, 659035319), P(461706044, 659035106), P(461705324, 659035288), P(461704574, 659035338), P(461702888, 659034527), P(461701182, 659034124), P(461698548, 659034296), P(461697316, 659033850), P(461694536, 659033259), P(461693363, 659034295), P(461692059, 659035005), P(461690915, 659035112), P(461689497, 659034591), P(461688377, 659034233), P(461686886, 659034023), P(461685335, 659032987), P(461684004, 659032477), P(461682777, 659032021), P(461681219, 659031415), P(461679771, 659030720), P(461678927, 659030529), P(461678131, 659030199), P(461677225, 659029727), P(461676416, 659029408), P(461675451, 659029026), P(461674809, 659028730), P(461674198, 659028519), P(461673438, 659028290), P(461672684, 659028104), P(461671934, 659028047), P(461671150, 659027621), P(461670079, 659026972), P(461669180, 659026692), P(461668337, 659026476), P(461667465, 659025834), P(461666403, 659025412), P(461665404, 659025159), P(461663782, 659024911), P(461662900, 659024874), P(461662124, 659024959), P(461661313, 659025138), P(461660686, 659025264), P(461660075, 659024802), P(461658940, 659024977), P(461658041, 659025504), P(461656979, 659025434), P(461656217, 659024413), P(461655183, 659024035), P(461652435, 659023267), P(461651190, 659022947), P(461649667, 659023322), P(461648403, 659023667), P(461647456, 659023053), P(461646646, 659022720), P(461645647, 659022560), P(461644755, 659022234), P(461644144, 659022144), P(461643059, 659021830), P(461642057, 659021629), P(461641120, 659021693), P(461640294, 659021945), P(461639289, 659021667), P(461638438, 659021648), P(461637622, 659021699), P(461636838, 659021517), P(461635772, 659021216), P(461634604, 659020707), P(461633014, 659020230), P(461631817, 659019792), P(461630688, 659019385), P(461629193, 659018790), P(461628134, 659018103), P(461626921, 659017309), P(461625043, 659016403), P(461623667, 659016109), P(461622504, 659015534), P(461621470, 659015382), P(461620435, 659015099), P(461618635, 659015002), P(461617243, 659015122), P(461615841, 659015465), P(461614121, 659016465), P(461612281, 659016078), P(461610272, 659015651), P(461608680, 659015651), P(461608694, 659016118), P(461608251, 659015949), P(461607352, 659015863), P(461606854, 659016360), P(461605822, 659016392), P(461604665, 659017006), P(461603980, 659016712), P(461603582, 659016392), P(461602374, 659015989), P(461600984, 659015832), P(461599230, 659015762), P(461597435, 659015697), P(461594676, 659015842), P(461593736, 659015619), P(461592945, 659015778), P(461592627, 659016810), P(461592153, 659017186), P(461591769, 659017635), P(461591353, 659017537), P(461591868, 659016578), P(461592060, 659016114), P(461591366, 659015642), P(461590119, 659015561), P(461588275, 659015494), P(461587107, 659016074), P(461586179, 659016035), P(461585227, 659015986), P(461584241, 659016133), P(461583251, 659016067), P(461581883, 659016232), P(461580600, 659016583), P(461579961, 659017058), P(461579070, 659017216), P(461578300, 659017474), P(461577531, 659018035), P(461576718, 659018475), P(461575632, 659018979), P(461574300, 659019254), P(461572524, 659019926), P(461570876, 659019810), P(461569582, 659019688), P(461568857, 659019707), P(461567721, 659020011), P(461565800, 659021232), P(461564278, 659021568), P(461563299, 659021645), P(461562097, 659021965), P(461561100, 659022086), P(461560230, 659022229), P(461559609, 659022305), P(461558617, 659022275), P(461557260, 659022603), P(461556385, 659022838), P(461555248, 659023194), P(461553819, 659023968), P(461552192, 659024565), P(461551022, 659025258), P(461550438, 659025794), P(461549894, 659026376), P(461549160, 659026736), P(461548336, 659027254), P(461547792, 659027916), P(461545142, 659028342), P(461544766, 659028640), P(461544478, 659029285), P(461543836, 659029403), P(461542795, 659029077), P(461540483, 659029221), P(461538056, 659029576), P(461537000, 659029901), P(461535861, 659030749), P(461535628, 659031666), P(461534566, 659032966), P(461533536, 659034382), P(461532923, 659035030), P(461532588, 659035638), P(461531929, 659036480), P(461531312, 659036949), P(461530635, 659037579), P(461530116, 659038248), P(461529736, 659038701), P(461528913, 659039463), P(461528063, 659040392), P(461527659, 659041138), P(461524177, 659044498), P(461522955, 659044872), P(461521734, 659044872), P(461520948, 659044916), P(461520158, 659044669), P(461519561, 659044389), P(461518711, 659043971), P(461517220, 659043027), P(461515756, 659042541), P(461514963, 659042789), P(461513492, 659042082), P(461510958, 659040171), P(461509273, 659039344), P(461508131, 659038866), P(461506963, 659038406), P(461505948, 659037826), P(461504195, 659036789), P(461502780, 659036224), P(461501219, 659035927), P(461500345, 659036096), P(461499800, 659036861), P(461499075, 659037810), P(461498715, 659038339), P(461498408, 659039078), P(461498171, 659039010), P(461498076, 659038405), P(461498558, 659037696), P(461498491, 659037315), P(461498224, 659037288), P(461497723, 659037179), P(461497087, 659036416), P(461495596, 659036416), P(461493628, 659035400), P(461492796, 659035451), P(461491922, 659035441), P(461491225, 659035040), P(461488935, 659035029), P(461487429, 659035277), P(461486642, 659035496), P(461484207, 659037470), P(461484351, 659038014), P(461483889, 659038392), P(461483148, 659039025), P(461481669, 659039856), P(461479946, 659040017), P(461478780, 659040594), P(461478226, 659040854), P(461477764, 659041197), P(461477279, 659040965), P(461476448, 659040091), P(461475184, 659038904), P(461474068, 659038267), P(461473333, 659037622), P(461473127, 659036662), P(461472183, 659035958), P(461471405, 659034904), P(461470673, 659033833), P(461469732, 659033360), P(461469261, 659032680), P(461468697, 659032140), P(461467261, 659030749), P(461465560, 659030174), P(461463460, 659030157), P(461461743, 659030453), P(461460550, 659030749), P(461459805, 659030749), P(461458810, 659031008), P(461458424, 659031581), P(461457508, 659032061), P(461457623, 659032442), P(461458108, 659032318), P(461458551, 659032472), P(461457440, 659033510), P(461456415, 659033950), P(461455266, 659034122), P(461455034, 659033606), P(461455693, 659033118), P(461455713, 659032869), P(461455573, 659032749), P(461454471, 659032984), P(461453924, 659032986), P(461453094, 659031694), P(461452348, 659030749), P(461451516, 659030432), P(461451025, 659029720), P(461450199, 659029721), P(461449365, 659027916), P(461448648, 659027496), P(461447522, 659025992), P(461446778, 659025048), P(461446015, 659024616), P(461445199, 659023840), P(461444802, 659023388), P(461444477, 659022869), P(461443853, 659022059), P(461442727, 659021877), P(461442176, 659021553), P(461440778, 659021026), P(461439559, 659020565), P(461438450, 659020400), P(461437566, 659020544), P(461436508, 659021118), P(461434994, 659022323), P(461434450, 659023313), P(461433295, 659023819), P(461432399, 659024406), P(461430855, 659025266), P(461430109, 659025266), P(461429386, 659025377), P(461428586, 659025272), P(461427557, 659025232), P(461426114, 659025069), P(461424799, 659024266), P(461424066, 659022678), P(461423616, 659021614), P(461423152, 659020921), P(461420901, 659020433), P(461419060, 659020512), P(461418204, 659020765), P(461417325, 659021190), P(461416116, 659021925), P(461415196, 659022433), P(461414789, 659022950), P(461413705, 659023378), P(461411887, 659024731), P(461410476, 659025541), P(461410580, 659026802), P(461409423, 659027485), P(461407706, 659028221), P(461406340, 659028848), P(461404989, 659029256), P(461403325, 659029427), P(461402292, 659029392), P(461401423, 659029582), P(461400357, 659029625), P(461399165, 659029619), P(461397789, 659029249), P(461396887, 659028441), P(461396061, 659028211), P(461394991, 659028046), P(461394042, 659028014), P(461393597, 659028126), P(461391931, 659028862), P(461391090, 659029075), P(461389700, 659029318), P(461388268, 659029702), P(461386761, 659030334), P(461386378, 659031345), P(461385631, 659032089), P(461385498, 659032606), P(461385281, 659033250), P(461385154, 659033581), P(461384642, 659033488), P(461384388, 659033096), P(461383932, 659033051), P(461383548, 659033982), P(461383176, 659034328), P(461382951, 659033979), P(461382708, 659033918), P(461382229, 659034721), P(461379207, 659037181), P(461377876, 659038028), P(461376245, 659038582), P(461375690, 659038861), P(461375556, 659039198), P(461375525, 659039632), P(461374983, 659039971), P(461374596, 659039198), P(461374192, 659039554), P(461373388, 659039803), P(461372023, 659040985), P(461371629, 659041590), P(461371530, 659042179), P(461371650, 659042678), P(461371941, 659043149), P(461371698, 659043469), P(461371146, 659042966), P(461370863, 659042597), P(461370621, 659042819), P(461370773, 659043166), P(461370625, 659044043), P(461370157, 659043629), P(461369719, 659043741), P(461369503, 659044138), P(461369008, 659044488), P(461368735, 659044297), P(461367842, 659044498), P(461367260, 659044738), P(461366804, 659045050), P(461366615, 659045213), P(461366412, 659045249), P(461366433, 659045654), P(461366768, 659046077), P(461366751, 659046590), P(461366399, 659047081), P(461365792, 659047721), P(461365537, 659047806), P(461365380, 659048020), P(461365572, 659048253), P(461365857, 659048342), P(461365872, 659048637), P(461365460, 659048793), P(461365279, 659049278), P(461365311, 659049696), P(461365661, 659050177), P(461365511, 659050882), P(461365692, 659051681), P(461365608, 659052668), P(461365803, 659054085), P(461365623, 659054356), P(461365740, 659054825), P(461365285, 659055136), P(461364965, 659056579), P(461364532, 659056571), P(461364476, 659057118), P(461364479, 659057758), P(461364871, 659058301), P(461365172, 659059169), P(461365551, 659059379), P(461365906, 659059880), P(461365621, 659060157), P(461365111, 659060101), P(461364845, 659059928), P(461364269, 659059569), P(461363737, 659059326), P(461363423, 659058846), P(461363032, 659058836), P(461362962, 659059099), P(461363586, 659059430), P(461364100, 659060025), P(461364551, 659060374), P(461365159, 659061021), P(461365794, 659061686), P(461365722, 659062490), P(461365432, 659062765), P(461364853, 659062502), P(461364185, 659061593), P(461363997, 659061102), P(461363469, 659060817), P(461363167, 659060606), P(461362493, 659060705), P(461362194, 659060297), P(461361925, 659059977), P(461361423, 659059947), P(461361192, 659060616), P(461361240, 659061678), P(461360626, 659062174), P(461360635, 659062587), P(461360600, 659063187), P(461360373, 659063482), P(461360917, 659064475), P(461360890, 659065204), P(461360644, 659065322), P(461359461, 659064433), P(461359351, 659063776), P(461359253, 659063198), P(461358858, 659062400), P(461359045, 659060849), P(461358967, 659060190), P(461358567, 659059859), P(461357988, 659060456), P(461356884, 659060718), P(461356109, 659061134), P(461355737, 659061734), P(461355418, 659061628), P(461355498, 659060091), P(461354904, 659059448), P(461354298, 659058957), P(461354039, 659058722), P(461353506, 659058042), P(461352853, 659057222), P(461352245, 659055856), P(461350941, 659054699), P(461350092, 659054278), P(461349365, 659053931), P(461347730, 659053036), P(461346084, 659052387), P(461345053, 659051859), P(461344237, 659051182), P(461343836, 659051562), P(461343589, 659052190), P(461342394, 659050753), P(461341621, 659050283), P(461339663, 659049758), P(461338063, 659049429), P(461336992, 659047971), P(461337050, 659046874), P(461336551, 659046150), P(461337165, 659045366), P(461337437, 659044057), P(461338031, 659042368), P(461337461, 659040565), P(461336872, 659038270), P(461335962, 659036209), P(461335457, 659034492), P(461335711, 659033392), P(461334514, 659032140), P(461334143, 659031070), P(461333295, 659030294), P(461333671, 659029238), P(461333183, 659027571), P(461331469, 659025236), P(461330034, 659022260), P(461330546, 659021438), P(461330023, 659020686), P(461329257, 659019472), P(461328418, 659019102), P(461327471, 659019027), P(461326647, 659018390), P(461325799, 659017326), P(461325210, 659016851), P(461324991, 659016128), P(461324999, 659015086), P(461324489, 659014721), P(461323948, 659014373), P(461323101, 659014562), P(461322255, 659014257), P(461321700, 659013675), P(461321269, 659013398), P(461320791, 659013038), P(461320021, 659012979), P(461319313, 659012885), P(461317136, 659013288), P(461316309, 659013032), P(461315018, 659012336), P(461313509, 659011523), P(461311652, 659010670), P(461310652, 659010891), P(461308436, 659011085), P(461306741, 659010328), P(461306097, 659009934), P(461305586, 659009155), P(461305224, 659007574), P(461304741, 659005568), P(461304146, 659004360), P(461301783, 659001750), P(461300813, 659000136), P(461298834, 658998652), P(461297352, 658998333), P(461294749, 658999080), P(461292389, 658999702), P(461291800, 658998489), P(461291140, 658997781), P(461290450, 658997395), P(461289516, 658995939), P(461288786, 658994782), P(461287130, 658993800), P(461285549, 658992777), P(461283841, 658992149), P(461281730, 658990757), P(461280528, 658990134), P(461278863, 658989928), P(461277586, 658990400), P(461276975, 658990704), P(461275096, 658989275), P(461273228, 658988534), P(461272351, 658988413), P(461271868, 658988430), P(461271021, 658988909), P(461270274, 658988744), P(461269324, 658988181), P(461268352, 658987702), P(461267465, 658987350), P(461266056, 658986710), P(461264589, 658986070), P(461262572, 658985781), P(461262141, 658986058), P(461261151, 658985570), P(461259355, 658985604), P(461258775, 658986174), P(461258263, 658986106), P(461257980, 658986299), P(461257437, 658987233), P(461257010, 658988171), P(461255807, 658988574), P(461255097, 658988571), P(461254650, 658988241), P(461254944, 658987414), P(461255109, 658986272), P(461254783, 658986059), P(461253178, 658986774), P(461252410, 658986915), P(461251228, 658986331), P(461250426, 658985640), P(461249924, 658985090), P(461249330, 658985057), P(461248781, 658984310), P(461247962, 658983429), P(461247668, 658983166), P(461246074, 658984161), P(461245940, 658983649), P(461245813, 658982897), P(461245956, 658981480), P(461245144, 658980816), P(461244424, 658980185), P(461243906, 658979635), P(461243404, 658978528), P(461243010, 658977878), P(461242263, 658977517), P(461241618, 658977326), P(461240711, 658976718), P(461239618, 658976352), P(461238789, 658975717), P(461237879, 658975203), P(461236951, 658973405), P(461236151, 658972531), P(461235234, 658971166), P(461233628, 658969854), P(461231437, 658968104), P(461229741, 658966987), P(461228909, 658966600), P(461227752, 658966563), P(461226876, 658966501), P(461226338, 658966304), P(461226172, 658965691), P(461226023, 658965139), P(461225495, 658964795), P(461224876, 658964633), P(461224540, 658965329), P(461224244, 658965658), P(461223925, 658965704), P(461224228, 658964929), P(461224039, 658964629), P(461223455, 658964574), P(461223117, 658964763), P(461222186, 658964190), P(461221643, 658963891), P(461221495, 658963035), P(461220119, 658962933), P(461218888, 658962777), P(461217598, 658962943), P(461216793, 658962722), P(461216124, 658962441), P(461215240, 658961930), P(461214165, 658961286), P(461213271, 658960790), P(461210330, 658960126), P(461208380, 658959805), P(461205063, 658959744), P(461204113, 658960165), P(461203543, 658960826), P(461202911, 658962214), P(461200989, 658961627), P(461198872, 658959355), P(461197037, 658957766), P(461195538, 658956430), P(461194524, 658955573), P(461193968, 658954779), P(461192601, 658953861), P(461191209, 658953160), P(461190596, 658952712), P(461189897, 658952416), P(461189306, 658952475), P(461188850, 658952762), P(461186308, 658952483), P(461184991, 658952339), P(461183023, 658952129), P(461182231, 658952898), P(461181714, 658953302), P(461181285, 658953214), P(461181341, 658951770), P(461180423, 658950307), P(461179130, 658949400), P(461178943, 658948734), P(461178388, 658947974), P(461177692, 658947678), P(461176668, 658947360), P(461176064, 658947208), P(461175111, 658947088), P(461173999, 658946827), P(461172953, 658947034), P(461172599, 658946600), P(461171936, 658946325), P(461171127, 658945874), P(461170418, 658945346), P(461169441, 658944194), P(461168497, 658943510), P(461167796, 658942963), P(461166743, 658942235), P(461165935, 658941861), P(461164970, 658940989), P(461161167, 658939574), P(461159186, 658939338), P(461158266, 658938253), P(461157609, 658938099), P(461156386, 658938330), P(461155138, 658938520), P(461154221, 658938786), P(461153722, 658939097), P(461153092, 658939754), P(461152719, 658940301), P(461152700, 658940838), P(461153010, 658941306), P(461152456, 658942225), P(461152685, 658942573), P(461153061, 658942451), P(461153536, 658941999), P(461154032, 658941903), P(461154509, 658941938), P(461155164, 658942079), P(461156079, 658942733), P(461157128, 658946869), P(461156192, 658946434), P(461156269, 658948190), P(461156028, 658948763), P(461155336, 658949237), P(461155031, 658949579), P(461153871, 658947821), P(461154463, 658946470), P(461153629, 658946562), P(461152956, 658947656), P(461152981, 658948035), P(461152732, 658948437), P(461152447, 658947518), P(461152044, 658947171), P(461151296, 658946059), P(461150289, 658946443), P(461149092, 658947803), P(461148634, 658946619), P(461148202, 658946774), P(461147993, 658945810), P(461147469, 658945686), P(461147172, 658946115), P(461146394, 658946667), P(461146514, 658947288), P(461145066, 658948043), P(461143661, 658948341), P(461142946, 658947694), P(461142554, 658947171), P(461141957, 658947051), P(461140815, 658946386), P(461140415, 658945139), P(461139503, 658944952), P(461138791, 658945051), P(461138220, 658945349), P(461136927, 658945488), P(461137405, 658945731), P(461138109, 658945662), P(461138802, 658945402), P(461138725, 658945783), P(461137591, 658946373), P(461137324, 658947061), P(461136530, 658947317), P(461136652, 658947677), P(461135871, 658948394), P(461135295, 658948158), P(461135023, 658947709), P(461133205, 658948407), P(461132645, 658948709), P(461132743, 658949210), P(461133166, 658949769), P(461132682, 658950084), P(461132257, 658950362), P(461132004, 658950667), P(461131863, 658950362), P(461131441, 658950331), P(461131255, 658950621), P(461130719, 658950635), P(461130655, 658949790), P(461131141, 658948888), P(461131968, 658948301), P(461132516, 658948307), P(461132912, 658947734), P(461133772, 658947606), P(461134794, 658947163), P(461136306, 658946230), P(461136207, 658945779), P(461132916, 658946768), P(461132079, 658946083), P(461131271, 658945090), P(461130537, 658943445), P(461130362, 658943965), P(461129959, 658944017), P(461129370, 658943310), P(461129444, 658942534), P(461129290, 658942112), P(461128877, 658941653), P(461128786, 658941053), P(461127957, 658941921), P(461127732, 658942597), P(461127610, 658943894), P(461127469, 658944250), P(461127173, 658944597), P(461126857, 658944437), P(461126292, 658943054), P(461125895, 658942194), P(461125377, 658941408), P(461124525, 658940837), P(461124404, 658939773), P(461124343, 658938963), P(461122914, 658938208), P(461121970, 658937464), P(461121738, 658937920), P(461121493, 658938048), P(461120351, 658938079), P(461119728, 658938272), P(461119081, 658938005), P(461118569, 658937439), P(461118266, 658936763), P(461117783, 658936154), P(461117373, 658936318), P(461116734, 658936063), P(461116457, 658935217), P(461116600, 658934780), P(461116489, 658934391), P(461116563, 658933564), P(461116252, 658933246), P(461116187, 658932406), P(461116470, 658932239), P(461117196, 658933417), P(461117621, 658933375), P(461117230, 658932253), P(461117048, 658931622), P(461116561, 658931306), P(461115901, 658931127), P(461115181, 658930254), P(461114761, 658929015), P(461114470, 658927604), P(461113777, 658926239), P(461112963, 658925351), P(461111579, 658924228), P(461110969, 658923290), P(461109304, 658922178), P(461108603, 658921617), P(461107998, 658921105), P(461107121, 658920332), P(461106061, 658919338), P(461105194, 658918354), P(461103174, 658916382), P(461101619, 658915015), P(461100957, 658914754), P(461100241, 658914348), P(461099003, 658913969), P(461097005, 658913446), P(461095917, 658913564), P(461094973, 658913730), P(461093806, 658914055), P(461092288, 658914226), P(461091261, 658913937), P(461090264, 658913687), P(461088960, 658913534), P(461087808, 658913156), P(461087125, 658912996), P(461085976, 658912729), P(461084939, 658912598), P(461084126, 658912905), P(461082248, 658913588), P(461080981, 658914175), P(461079758, 658914940), P(461078395, 658915268), P(461076827, 658915276), P(461075608, 658915204), P(461074315, 658914668), P(461073273, 658914310), P(461071896, 658914343), P(461070718, 658914151), P(461069808, 658914218), P(461068726, 658914407), P(461066832, 658915145), P(461065723, 658914705), P(461064373, 658915719), P(461063928, 658915268), P(461063291, 658915108), P(461062902, 658915625), P(461062459, 658916388), P(461062291, 658916873), P(461061756, 658916681), P(461061556, 658917487), P(461060098, 658917085), P(461059762, 658917248), P(461059482, 658916866), P(461059497, 658916630), P(461059199, 658916350), P(461058677, 658916502), P(461057692, 658916866), P(461056284, 658917219), P(461055975, 658916279), P(461056365, 658915384), P(461057106, 658915405), P(461057300, 658915037), P(461056850, 658914782), P(461057113, 658911210), P(461056762, 658910067), P(461056298, 658909405), P(461055493, 658908703), P(461055108, 658908003), P(461054532, 658907517), P(461053964, 658907608), P(461053396, 658908227), P(461052978, 658908205), P(461052743, 658906765), P(461052232, 658906189), P(461051508, 658906349), P(461050589, 658906670), P(461049967, 658907347), P(461049080, 658907241), P(461048199, 658906357), P(461047916, 658906966), P(461047677, 658907056), P(461047593, 658907664), P(461047432, 658908485), P(461046964, 658908392), P(461045624, 658905675), P(461045450, 658906640), P(461044629, 658905678), P(461044292, 658905552), P(461043754, 658905990), P(461043115, 658906297), P(461041983, 658906624), P(461039263, 658906976), P(461037919, 658906720), P(461036415, 658905792), P(461035583, 658905120), P(461034781, 658904129), P(461034847, 658902656), P(461035039, 658901504), P(461034655, 658900640), P(461034107, 658900195), P(461033435, 658899971), P(461032767, 658899872), P(461032191, 658899968), P(461031930, 658900633), P(461032128, 658901382), P(461031665, 658901760), P(461031077, 658902038), P(461030388, 658902055), P(461029804, 658901802), P(461029476, 658902294), P(461029493, 658902746), P(461030439, 658903465), P(461030572, 658903978), P(461029882, 658904301), P(461029428, 658904194), P(461028954, 658904126), P(461028460, 658904579), P(461028447, 658905107), P(461027957, 658906118), P(461026710, 658907241), P(461026476, 658907706), P(461026497, 658908755), P(461026754, 658909237), P(461027324, 658909835), P(461027761, 658910265), P(461027764, 658911480), P(461027821, 658912838), P(461027889, 658914384), P(461027669, 658914456), P(461027210, 658911950), P(461026452, 658912478), P(461026018, 658912877), P(461026141, 658914605), P(461026410, 658915829), P(461026445, 658917047), P(461026199, 658917627), P(461026364, 658918259), P(461027061, 658918870), P(461027919, 658919498), P(461028416, 658920478), P(461027945, 658921717), P(461028029, 658922256), P(461028416, 658922613), P(461029624, 658922422), P(461029869, 658923991), P(461029344, 658924176), P(461029167, 658924462), P(461029596, 658924901), P(461029741, 658925397), P(461030076, 658925533), P(461030043, 658925846), P(461030277, 658926342), P(461030439, 658927066), P(461030789, 658928368), P(461030565, 658929419), P(461030016, 658929739), P(461029533, 658929882), P(461029113, 658929946), P(461028988, 658929562), P(461029465, 658929368), P(461029921, 658929015), P(461030394, 658928059), P(461030013, 658928275), P(461028541, 658928623), P(461028188, 658928237), P(461028469, 658927312), P(461027583, 658927531), P(461026599, 658927797), P(461024842, 658928520), P(461024733, 658928909), P(461025725, 658929234), P(461026684, 658929309), P(461027225, 658930088), P(461027376, 658931186), P(461027442, 658931605), P(461027327, 658931926), P(461027546, 658932276), P(461027703, 658933283), P(461025861, 658934226), P(461025137, 658934614), P(461024269, 658936355), P(461024121, 658935960), P(461024260, 658935000), P(461023658, 658934170), P(461023192, 658934534), P(461022765, 658934962), P(461022117, 658935456), P(461020908, 658935471), P(461019535, 658934872), P(461018436, 658934736), P(461017439, 658934622), P(461014780, 658935563), P(461014034, 658934619), P(461013289, 658934619), P(461012607, 658935102), P(461010309, 658933651), P(461009626, 658934555), P(461008285, 658933885), P(461007871, 658932958), P(461008061, 658931006), P(461007034, 658931098), P(461006237, 658928573), P(461006335, 658925950), P(461004667, 658924861), P(461008815, 658925178), P(461009279, 658924157), P(461009528, 658923190), P(461009023, 658922237), P(461008127, 658922590), P(461007328, 658922373), P(461006781, 658921757), P(461006879, 658920830), P(461007259, 658919837), P(461007967, 658919198), P(461008152, 658918750), P(461008219, 658918365), P(461007480, 658918008), P(461007359, 658917246), P(461006578, 658917625), P(461003165, 658918494), P(461000703, 658917726), P(460998879, 658915998), P(460998175, 658913598), P(460997597, 658913373), P(460997823, 658911838), P(460998590, 658912174), P(460998975, 658911710), P(460999359, 658912126), P(460999867, 658911961), P(460998975, 658910558), P(460998207, 658908222), P(460997277, 658909533), P(460996616, 658909718), P(460996991, 658908574), P(460996191, 658908990), P(460995752, 658909750), P(460995069, 658909150), P(460996127, 658907136), P(460997051, 658905923), P(460996125, 658905889), P(460995263, 658905664), P(460994655, 658904928), P(460994015, 658903776), P(460993759, 658902432), P(460993855, 658900832), P(460992698, 658900449), P(460991885, 658899695), P(460991387, 658899234), P(460991176, 658899702), P(460990783, 658899712), P(460990559, 658899232), P(460990303, 658899200), P(460990173, 658899689), P(460989599, 658900384), P(460989311, 658900992), P(460988607, 658902144), P(460987583, 658902368), P(460986495, 658902720), P(460984863, 658902688), P(460984296, 658902230), P(460983743, 658901760), P(460983133, 658901122), P(460981532, 658901312), P(460980061, 658901312), P(460978243, 658901577), P(460975423, 658902912), P(460971648, 658905568), P(460972095, 658906720), P(460972743, 658907288), P(460973407, 658907870), P(460974428, 658908768), P(460972837, 658908633), P(460973787, 658909981), P(460973432, 658911899), P(460973215, 658912382), P(460972861, 658912478), P(460972251, 658909949), P(460971616, 658909502), P(460971749, 658911542), P(460971202, 658912094), P(460970858, 658909814), P(460970560, 658909886), P(460970400, 658911134), P(460969952, 658911390), P(460969794, 658912318), P(460968607, 658911296), P(460967898, 658911298), P(460967349, 658910977), P(460967231, 658909952), P(460966453, 658909568), P(460966176, 658912978), P(460965887, 658914560), P(460965082, 658915938), P(460964671, 658914273), P(460964604, 658914946), P(460964188, 658915010), P(460963805, 658915394), P(460963847, 658917362), P(460963644, 658918466), P(460962679, 658919207), P(460961815, 658918458), P(460961791, 658917056), P(460962303, 658911296), P(460961833, 658912433), P(460961465, 658911685), P(460961116, 658911780), P(460961241, 658912517), P(460961079, 658913508), P(460960607, 658912704), P(460960119, 658912737), P(460959735, 658912968), P(460959602, 658914793), P(460958908, 658916290), P(460957948, 658915810), P(460957308, 658916132), P(460956671, 658916704), P(460956093, 658916768), P(460955391, 658917536), P(460953207, 658917730), P(460953404, 658916226), P(460953532, 658915233), P(460953466, 658914277), P(460953599, 658912897), P(460953695, 658910721), P(460953183, 658909056), P(460952447, 658908481), P(460951743, 658905888), P(460952602, 658905925), P(460951551, 658905184), P(460951743, 658904193), P(460952349, 658902784), P(460953146, 658901026), P(460951743, 658900289), P(460949791, 658900001), P(460949162, 658899689), P(460947999, 658899808), P(460946431, 658899649), P(460944088, 658899232), P(460943197, 658899689), P(460940581, 658901266), P(460939391, 658901888), P(460937978, 658902521), P(460936486, 658903465), P(460934995, 658904409), P(460934249, 658905353), P(460931267, 658908185), P(460930521, 658908185), P(460928415, 658909568), P(460926109, 658910369), P(460924223, 658911521), P(460922111, 658912544), P(460920607, 658913792), P(460919039, 658913889), P(460917631, 658914113), P(460917055, 658912032), P(460915932, 658910276), P(460914559, 658909633), P(460912991, 658909345), P(460911549, 658908770), P(460910335, 658908353), P(460909567, 658908001), P(460908639, 658907648), P(460907541, 658907653), P(460906847, 658907361), P(460906079, 658907200), P(460905436, 658907012), P(460904186, 658907076), P(460902932, 658907241), P(460902186, 658907241), P(460899615, 658908513), P(460897471, 658909857), P(460896831, 658911072), P(460896255, 658912129), P(460896127, 658912960), P(460895839, 658913696), P(460895423, 658916001), P(460895167, 658916609), P(460895039, 658917505), P(460893887, 658919617), P(460893238, 658921402), P(460892493, 658921402), P(460891747, 658922346), P(460891001, 658922346), P(460890256, 658923290), P(460889510, 658924234), P(460888764, 658924234), P(460888019, 658924234), P(460887273, 658925178), P(460887273, 658926122), P(460885782, 658928010), P(460884127, 658929473), P(460882303, 658930112), P(460882143, 658928097), P(460882495, 658926625), P(460881183, 658927776), P(460879775, 658927040), P(460878943, 658927648), P(460878463, 658928097), P(460878325, 658928954), P(460878584, 658930178), P(460879335, 658933746), P(460878973, 658936352), P(460878687, 658937505), P(460878079, 658938080), P(460877375, 658939040), P(460876956, 658939074), P(460876927, 658939681), P(460876543, 658940193), P(460875775, 658940032), P(460874943, 658940929), P(460874170, 658940866), P(460873851, 658941227), P(460873692, 658942004), P(460873215, 658942337), P(460872200, 658941744), P(460871679, 658942816), P(460870204, 658943296), P(460870207, 658941952), P(460870123, 658941227), P(460869377, 658941227), P(460868632, 658942171), P(460867140, 658943116), P(460864383, 658943872), P(460859932, 658945154), P(460859551, 658945985), P(460859512, 658946863), P(460859711, 658947488), P(460861087, 658947224), P(460861471, 658947873), P(460860895, 658948064), P(460861112, 658948967), P(460860922, 658949378), P(460861437, 658949984), P(460860860, 658950882), P(460861405, 658950944), P(460862343, 658952562), P(460861693, 658953026), P(460862303, 658954784), P(460864250, 658956069), P(460865632, 658956576), P(460864830, 658958015), P(460866401, 658956859), P(460866963, 658956917), P(460866262, 658958391), P(460866705, 658958676), P(460867886, 658958222), P(460867806, 658959743), P(460867037, 658961694), P(460866269, 658962174), P(460864158, 658966720), P(460863166, 658967711), P(460862590, 658966847), P(460862494, 658965983), P(460861981, 658965406), P(460861150, 658965791), P(460860126, 658966431), P(460859262, 658967039), P(460857822, 658968063), P(460857534, 658969119), P(460857118, 658971327), P(460856440, 658972764), P(460855870, 658973023), P(460855870, 658974111), P(460854910, 658975007), P(460855550, 658976383), P(460856958, 658977375), P(460857398, 658977979), P(460856541, 658979229), P(460856477, 658980959), P(460855994, 658981372), P(460855547, 658984413), P(460856325, 658986247), P(460855710, 658986719), P(460856306, 658987527), P(460856286, 658988831), P(460855454, 658989823), P(460854921, 658989518), P(460854334, 658990335), P(460853592, 658990186), P(460852414, 658991743), P(460851977, 658991506), P(460850878, 658991551), P(460850302, 658993439), P(460849181, 658993373), P(460849118, 658992671), P(460848667, 658991868), P(460847966, 658991327), P(460847038, 658992255), P(460845822, 658990463), P(460845022, 658990655), P(460844849, 658989911), P(460845517, 658989381), P(460844670, 658988639), P(460844157, 658988606), P(460843854, 658989233), P(460842558, 658990975), P(460842136, 658990556), P(460842270, 658989279), P(460842139, 658985404), P(460841470, 658984895), P(460841915, 658982078), P(460842558, 658980831), P(460842301, 658979679), P(460842072, 658979198), P(460840971, 658979465), P(460841541, 658977830), P(460842525, 658976415), P(460843211, 658975031), P(460843544, 658972537), P(460842971, 658972252), P(460841342, 658974207), P(460840665, 658973022), P(460840216, 658972894), P(460838870, 658974332), P(460838397, 658973086), P(460839992, 658970588), P(460839192, 658968860), P(460837982, 658970911), P(460837310, 658972319), P(460835454, 658974527), P(460834878, 658974783), P(460834398, 658973343), P(460834558, 658972959), P(460835038, 658971967), P(460835678, 658970783), P(460836286, 658970527), P(460836889, 658970110), P(460836094, 658970143), P(460834462, 658970911), P(460833246, 658972159), P(460832894, 658970593), P(460833598, 658968575), P(460834332, 658967664), P(460833586, 658967664), P(460832797, 658968222), P(460831774, 658968031), P(460831870, 658965919), P(460830840, 658964698), P(460829565, 658963711), P(460828422, 658963207), P(460825790, 658963583), P(460824414, 658963967), P(460821854, 658964799), P(460820958, 658965119), P(460820606, 658966367), P(460819774, 658967551), P(460818814, 658967295), P(460816830, 658968191), P(460816990, 658969151), P(460815771, 658969887), P(460814875, 658971132), P(460814875, 658971582), P(460815326, 658971775), P(460815706, 658972284), P(460816478, 658972095), P(460816958, 658973215), P(460816190, 658974175), P(460815998, 658976767), P(460815486, 658976991), P(460815351, 658977579), P(460815550, 658978655), P(460814846, 658979423), P(460814729, 658980337), P(460814496, 658980706), P(460814110, 658980063), P(460813977, 658979268), P(460814174, 658978367), P(460813012, 658979446), P(460812638, 658979487), P(460812382, 658980031), P(460811907, 658979591), P(460811774, 658978655), P(460812350, 658978047), P(460811742, 658977791), P(460809982, 658979935), P(460809022, 658980447), P(460807997, 658980159), P(460809630, 658976351), P(460810046, 658975135), P(460810942, 658972991), P(460812254, 658972223), P(460812062, 658971135), P(460811646, 658970015), P(460810782, 658968959), P(460809598, 658969567), P(460808926, 658969951), P(460808350, 658969279), P(460808683, 658967426), P(460807774, 658965951), P(460807646, 658965183), P(460807326, 658964735), P(460807518, 658963263), P(460808254, 658962367), P(460808701, 658961631), P(460808350, 658960383), P(460807966, 658959711), P(460807198, 658960158), P(460805918, 658961759), P(460805342, 658960319), P(460804734, 658959839), P(460803838, 658958943), P(460804486, 658958215), P(460805054, 658957567), P(460804670, 658956223), P(460804510, 658955263), P(460803710, 658954591), P(460803038, 658955039), P(460802558, 658954655), P(460802270, 658953567), P(460801470, 658952766), P(460800446, 658951870), P(460799294, 658951423), P(460798430, 658950750), P(460797790, 658950142), P(460797181, 658949276), P(460796350, 658949246), P(460795262, 658949694), P(460795006, 658948991), P(460795185, 658948105), P(460795353, 658946809), P(460794845, 658946492), P(460794365, 658947070), P(460793790, 658947262), P(460792537, 658946841), P(460793438, 658945470), P(460792446, 658944798), P(460791636, 658945788), P(460791134, 658945183), P(460791293, 658944094), P(460790749, 658942652), P(460789630, 658941726), P(460788219, 658940443), P(460785497, 658937886), P(460782974, 658936638), P(460781819, 658936732), P(460780892, 658936926), P(460779934, 658936894), P(460779294, 658936862), P(460777534, 658936798), P(460776253, 658936638), P(460775454, 658936478), P(460774590, 658936030), P(460773630, 658935678), P(460772766, 658935518), P(460771646, 658934942), P(460770840, 658934617), P(460770174, 658934302), P(460769598, 658933758), P(460768539, 658933147), P(460767166, 658932414), P(460765883, 658931291), P(460764766, 658930334), P(460763646, 658929854), P(460762654, 658929278), P(460761342, 658928062), P(460758621, 658926108), P(460756030, 658924638), P(460754693, 658923385), P(460753349, 658921913), P(460752733, 658920604), P(460751710, 658919422), P(460750878, 658919134), P(460748867, 658918713), P(460747230, 658917630), P(460744989, 658915480), P(460745045, 658914665), P(460745435, 658914427), P(460746297, 658915516), P(460747131, 658914715), P(460747421, 658915006), P(460747643, 658914843), P(460748029, 658914046), P(460748243, 658913963), P(460748212, 658913740), P(460747929, 658913748), P(460747413, 658913750), P(460747193, 658912185), P(460747534, 658911444), P(460743047, 658905563), P(460741484, 658903897), P(460739773, 658903138), P(460732318, 658899617), P(460730054, 658898887), P(460728926, 658898337), P(460727614, 658897825), P(460725598, 658897313), P(460724606, 658897153), P(460723230, 658897089), P(460721790, 658896897), P(460720368, 658896362), P(460719292, 658896190), P(460717536, 658896254), P(460716606, 658896124), P(460715742, 658895932), P(460714688, 658895646), P(460713568, 658895518), P(460711299, 658894970), P(460710112, 658894942), P(460709248, 658895134), P(460708480, 658895038), P(460707907, 658895035), P(460707296, 658894974), P(460706529, 658893980), P(460705697, 658893948), P(460704704, 658893982), P(460703008, 658893598), P(460700384, 658892062), P(460699040, 658891326), P(460698336, 658890910), P(460695808, 658889982), P(460695136, 658889694), P(460694656, 658889342), P(460693952, 658888958), P(460693313, 658888798), P(460692576, 658888382), P(460691648, 658887646), P(460690784, 658886942), P(460690176, 658886526), P(460689088, 658885566), P(460687264, 658884702), P(460685600, 658883390), P(460683814, 658882694), P(460683289, 658882178), P(460681257, 658881435), P(460680576, 658881409), P(460679232, 658880961), P(460677824, 658880641), P(460676864, 658880449), P(460675968, 658880129), P(460675008, 658879873), P(460673920, 658879425), P(460672640, 658879041), P(460671363, 658878532), P(460669440, 658877825), P(460667072, 658877057), P(460665408, 658876353), P(460664640, 658875649), P(460663299, 658874945), P(460661376, 658874113), P(460659520, 658873217), P(460656960, 658872129), P(460654629, 658871372), P(460653725, 658871201), P(460653138, 658873259), P(460652319, 658873313), P(460651770, 658873863), P(460651327, 658874176), P(460650901, 658874203), P(460650463, 658874016), P(460649279, 658875295), P(460648285, 658876127), P(460647743, 658876415), P(460643612, 658880165), P(460641879, 658880412), P(460641596, 658880125), P(460641500, 658879676), P(460641375, 658879071), P(460640669, 658878877), P(460639583, 658878911), P(460638651, 658877474), P(460636927, 658877375), P(460634271, 658874911), P(460633951, 658873441), P(460634173, 658871522), P(460634495, 658870240), P(460634975, 658869440), P(460634941, 658868928), P(460634303, 658868672), P(460633759, 658868384), P(460632893, 658868066), P(460632191, 658867968), P(460631263, 658867809), P(460630588, 658868036), P(460630022, 658868540), P(460627457, 658871680), P(460625549, 658873259), P(460624832, 658873825), P(460624320, 658875039), P(460622756, 658874879), P(460622566, 658876091), P(460621820, 658876091), P(460619583, 658877979), P(460615109, 658877979), P(460613618, 658878923), P(460613088, 658880479), P(460612096, 658882559), P(460611713, 658882399), P(460612544, 658880895), P(460612269, 658879821), P(460611713, 658880191), P(460611489, 658881727), P(460610538, 658881850), P(460611381, 658877979), P(460609890, 658877979), P(460609144, 658877979), P(460608161, 658878559), P(460607426, 658877600), P(460607904, 658876863), P(460607041, 658876287), P(460606817, 658875679), P(460606162, 658875147), P(460605914, 658875748), P(460605504, 658875967), P(460605559, 658876610), P(460604706, 658877853), P(460604768, 658876767), P(460604288, 658876223), P(460603648, 658876383), P(460603648, 658877215), P(460602722, 658878111), P(460603008, 658877055), P(460602052, 658877056), P(460600546, 658876928), P(460600196, 658875147), P(460599451, 658875147), P(460597959, 658875147), P(460597959, 658874203), P(460597214, 658873259), P(460596468, 658872315), P(460593485, 658872315), P(460591248, 658870428), P(460589757, 658870428), P(460585283, 658871372), P(460583046, 658874203), P(460582301, 658874203), P(460581555, 658875147), P(460580064, 658875147), P(460579318, 658875147), P(460577081, 658877979), P(460576335, 658877979), P(460573353, 658880811), P(460570370, 658879867), P(460559146, 658876840), P(460558890, 658876158), P(460559309, 658875425), P(460559824, 658875197), P(460565301, 658877001), P(460565656, 658875710), P(460564445, 658875342), P(460564578, 658875047), P(460565749, 658875510), P(460565951, 658874878), P(460565475, 658874326), P(460565544, 658873918), P(460565890, 658873648), P(460566288, 658873610), P(460567083, 658873714), P(460567177, 658872967), P(460568882, 658873337), P(460569163, 658872361), P(460568574, 658870596), P(460567091, 658868370), P(460565136, 658865119), P(460563939, 658864476), P(460563043, 658863983), P(460560184, 658864743), P(460556169, 658865098), P(460553866, 658866890), P(460549771, 658871411), P(460542303, 658874963), P(460538606, 658879878), P(460534998, 658881281), P(460533087, 658881754), P(460530621, 658882959), P(460527868, 658883642), P(460526451, 658884295), P(460524907, 658884748), P(460523790, 658884782), P(460522829, 658884527), P(460521903, 658884586), P(460521525, 658885284), P(460520718, 658885382), P(460519666, 658887418), P(460518920, 658888362), P(460518278, 658889265), P(460516492, 658890020), P(460514156, 658889068), P(460513382, 658888247), P(460512736, 658888257), P(460512190, 658888962), P(460511449, 658889318), P(460508481, 658890851), P(460507425, 658890690), P(460507749, 658891876), P(460506240, 658892801), P(460505062, 658892066), P(460504544, 658893185), P(460503682, 658893890), P(460502784, 658893313), P(460501632, 658895201), P(460501770, 658895914), P(460502048, 658896833), P(460502516, 658897801), P(460503200, 658898529), P(460503552, 658899809), P(460504192, 658900961), P(460504448, 658902593), P(460504321, 658904322), P(460502848, 658905409), P(460501984, 658906241), P(460501192, 658905673), P(460499360, 658906977), P(460497033, 658904740), P(460496448, 658903905), P(460493728, 658903937), P(460491040, 658903969), P(460489381, 658902789), P(460486944, 658902433), P(460480843, 658901447), P(460479400, 658901577), P(460477909, 658901577), P(460476418, 658902521), P(460473435, 658906297), P(460473435, 658907241), P(460472689, 658907241), P(460470453, 658910073), P(460469707, 658912905), P(460468961, 658912905), P(460468216, 658913849), P(460467470, 658913849), P(460466724, 658913849), P(460465979, 658914793), P(460463742, 658916681), P(460458522, 658916681), P(460457776, 658917625), P(460456285, 658917625), P(460454048, 658920458), P(460454048, 658921402), P(460453302, 658922346), P(460452557, 658922346), P(460451811, 658923290), P(460451066, 658923290), P(460448829, 658925178), P(460448083, 658925178), P(460447337, 658924234), P(460446592, 658924234), P(460445100, 658924234), P(460443609, 658926122), P(460442863, 658926122), P(460442118, 658927066), P(460442118, 658928954), P(460441372, 658929898), P(460439881, 658929898), P(460438389, 658931786), P(460437644, 658931786), P(460437644, 658929898), P(460435407, 658928010), P(460432424, 658931786), P(460432424, 658933675), P(460432424, 658936507), P(460431679, 658936507), P(460430933, 658935563), P(460430187, 658934619), P(460429442, 658934619), P(460428696, 658934619), P(460429442, 658933675), P(460429442, 658932730), P(460427950, 658930842), P(460427205, 658930842), P(460426459, 658931786), P(460425713, 658931786), P(460424968, 658930842), P(460424222, 658930842), P(460422731, 658928954), P(460421985, 658929898), P(460419748, 658929898), P(460419002, 658929898), P(460418257, 658930842), P(460416020, 658932730), P(460414528, 658930842), P(460412292, 658930842), P(460411546, 658929898), P(460410055, 658928954), P(460410055, 658928010), P(460409309, 658927066), P(460408563, 658925178), P(460407818, 658925178), P(460407072, 658924234), P(460404835, 658922346), P(460403344, 658922346), P(460401852, 658920458), P(460400361, 658919514), P(460397378, 658919514), P(460394396, 658919514), P(460392905, 658921402), P(460389922, 658921402), P(460389176, 658922346), P(460388431, 658922346), P(460386939, 658922346), P(460386194, 658923290), P(460385448, 658923290), P(460384702, 658924234), P(460381720, 658926122), P(460380228, 658926122), P(460379483, 658925178), P(460378737, 658926122), P(460377991, 658926122), P(460377246, 658926122), P(460376500, 658927066), P(460373517, 658928010), P(460372772, 658928954), P(460372772, 658929898), P(460372026, 658929898), P(460371281, 658930842), P(460370535, 658930842), P(460369789, 658930842), P(460369044, 658931786), P(460366061, 658934619), P(460364570, 658934619), P(460363824, 658933675), P(460363078, 658933675), P(460362333, 658932730), P(460360841, 658931786), P(460358604, 658931786), P(460357113, 658930842), P(460351894, 658930842), P(460351148, 658929898), P(460349657, 658929898), P(460347420, 658929898), P(460346674, 658930842), P(460345928, 658930842), P(460345183, 658930842), P(460343691, 658932730), P(460342946, 658932730), P(460341454, 658934619), P(460341454, 658935563), P(460339963, 658935563), P(460339217, 658936507), P(460337726, 658936507), P(460336235, 658937451), P(460335489, 658937451), P(460334743, 658936507), P(460330270, 658936507), P(460329524, 658936507), P(460327437, 658935759), P(460326613, 658935241), P(460325796, 658934619), P(460325050, 658935563), P(460324304, 658935563), P(460322813, 658937451), P(460321322, 658938395), P(460319830, 658938395), P(460316102, 658938395), P(460315235, 658939097), P(460314611, 658939339), P(460313111, 658940229), P(460311980, 658941473), P(460311632, 658943247), P(460310293, 658944138), P(460309049, 658944571), P(460307981, 658945716), P(460307550, 658945777), P(460307114, 658945397), P(460303885, 658946949), P(460303475, 658947717), P(460302083, 658947164), P(460301087, 658947276), P(460300003, 658948361), P(460299431, 658948556), P(460298196, 658946487), P(460295224, 658945004), P(460293733, 658946892), P(460291496, 658945004), P(460290750, 658945948), P(460290750, 658947836), P(460290750, 658948780), P(460288513, 658948780), P(460287767, 658949725), P(460287767, 658950669), P(460284785, 658950669), P(460283293, 658950669), P(460279565, 658955389), P(460279565, 658956334), P(460280311, 658957278), P(460277328, 658961054), P(460278074, 658962943), P(460276582, 658962943), P(460274346, 658965775), P(460274346, 658969552), P(460273600, 658970496), P(460274346, 658971441), P(460276582, 658971441), P(460277328, 658971441), P(460277328, 658973329), P(460278074, 658975218), P(460278074, 658976162), P(460277328, 658977106), P(460276582, 658977106), P(460275837, 658978050), P(460275837, 658979939), P(460274346, 658982772), P(460271811, 658983479), P(460270998, 658983409), P(460270201, 658980782), P(460270908, 658979316), P(460270976, 658976098), P(460270348, 658975845), P(460269872, 658978995), P(460269126, 658979654), P(460268257, 658981135), P(460267848, 658981689), P(460266980, 658982331), P(460265405, 658984842), P(460261163, 658986377), P(460257529, 658984946), P(460261243, 658981949), P(460256852, 658984270), P(460257189, 658980748), P(460256857, 658979956), P(460257968, 658976632), P(460258389, 658974963), P(460257973, 658974659), P(460258326, 658973765), P(460257918, 658972871), P(460257076, 658971742), P(460256061, 658971051), P(460254081, 658971034), P(460252520, 658970476), P(460251976, 658969552), P(460251230, 658969552), P(460249739, 658970496), P(460248993, 658971441), P(460248993, 658972385), P(460248993, 658973329), P(460246756, 658976162), P(460245265, 658976162), P(460244519, 658978995), P(460242282, 658978995), P(460240791, 658980883), P(460239300, 658982772), P(460240045, 658983716), P(460240045, 658984660), P(460238554, 658986549), P(460238554, 658987493), P(460237808, 658989381), P(460237808, 658990326), P(460238554, 658991270), P(460238554, 658993159), P(460237063, 658995047), P(460236317, 658995991), P(460236317, 659001657), P(460237808, 659003546), P(460238554, 659004490), P(460238554, 659005435), P(460237808, 659008268), P(460236317, 659010156), P(460235571, 659010156), P(460234080, 659012045), P(460233335, 659012989), P(460233335, 659013934), P(460232589, 659014878), P(460231843, 659016767), P(460230352, 659016767), P(460227369, 659020544), P(460225878, 659022433), P(460225878, 659023378), P(460225132, 659024322), P(460225132, 659029044), P(460225132, 659029988), P(460224387, 659029988), P(460223641, 659030933), P(460221404, 659034710), P(460221404, 659043210), P(460222150, 659044155), P(460222150, 659046988), P(460222895, 659048877), P(460222895, 659050766), P(460222895, 659054544), P(460222150, 659055489), P(460213948, 659055489), P(460213202, 659055489), P(460210965, 659058322), P(460210219, 659058322), P(460209474, 659057378), P(460208728, 659057378), P(460207982, 659058322), P(460205000, 659060211), P(460205000, 659061156), P(460205745, 659062100), P(460205745, 659063045), P(460204254, 659064934), P(460203508, 659064934), P(460202763, 659065878), P(460202017, 659065878), P(460200526, 659067768), P(460200526, 659068712), P(460199780, 659069657), P(460199780, 659070601), P(460199034, 659071546), P(460198289, 659072490), P(460198289, 659074379), P(460196797, 659077213), P(460196797, 659079102), P(460196052, 659080047), P(460196797, 659080992), P(460196797, 659081936), P(460196052, 659082881), P(460196052, 659084770), P(460195306, 659086659), P(460196052, 659087604), P(460196052, 659088548), P(460196052, 659090438), P(460195306, 659091382), P(460195306, 659094216), P(460195306, 659095161), P(460194561, 659096105), P(460193815, 659097050), P(460193815, 659101773), P(460193069, 659104607), P(460192324, 659105552), P(460191578, 659105552), P(460190832, 659106497), P(460190087, 659106497), P(460188595, 659108386), P(460187850, 659110275), P(460187104, 659109331), P(460186358, 659110275), P(460185613, 659110275), P(460184867, 659111220), P(460184121, 659111220), P(460183376, 659112165), P(460182630, 659112165), P(460180393, 659112165), P(460179647, 659113109), P(460179647, 659114054), P(460178902, 659114999), P(460178156, 659115944), P(460178156, 659116888), P(460177410, 659116888), P(460175919, 659118778), P(460174428, 659120667), P(460174428, 659121612), P(460174428, 659122557), P(460172937, 659124446), P(460171445, 659125391), P(460171445, 659126335), P(460171445, 659127280), P(460170700, 659127280), P(460168463, 659130114), P(460167717, 659130114), P(460166226, 659132004), P(460164734, 659132004), P(460163243, 659133894), P(460163243, 659134838), P(460162497, 659135783), P(460162497, 659136728), P(460161752, 659136728), P(460161006, 659137673), P(460161752, 659142397), P(460161006, 659142397), P(460160260, 659143341), P(460159515, 659142397), P(460159515, 659141452), P(460159515, 659140507), P(460158769, 659139562), P(460157278, 659139562), P(460156532, 659140507), P(460156532, 659141452), P(460155041, 659141452), P(460153550, 659140507), P(460152058, 659142397), P(460152058, 659143341), P(460150567, 659143341), P(460149821, 659142397), P(460148330, 659142397), P(460147584, 659143341), P(460146839, 659145231), P(460146093, 659145231), P(460145347, 659144286), P(460144602, 659144286), P(460143856, 659144286), P(460143110, 659143341), P(460142365, 659143341), P(460140128, 659144286), P(460138636, 659146176), P(460138636, 659147121), P(460137145, 659147121), P(460135654, 659149010), P(460133417, 659150900), P(460132671, 659150900), P(460131926, 659149955), P(460130434, 659149955), P(460128943, 659151845), P(460128943, 659152790), P(460128943, 659156569), P(460127452, 659156569), P(460127452, 659155624), P(460126706, 659154679), P(460126706, 659153734), P(460125215, 659151845), P(460123723, 659150900), P(460122978, 659150900), P(460122232, 659151845), P(460122232, 659152790), P(460120741, 659152790), P(460119995, 659151845), P(460119249, 659152790), P(460116267, 659152790), P(460115521, 659153734), P(460115521, 659154679), P(460114776, 659155624), P(460114776, 659156569), P(460113284, 659156569), P(460111793, 659158459), P(460110302, 659159403), P(460110302, 659160348), P(460109556, 659161293), P(460110302, 659163183), P(460109556, 659163183), P(460108065, 659165073), P(460107319, 659166018), P(460105082, 659166018), P(460104336, 659167907), P(460103591, 659167907), P(460102845, 659166962), P(460101354, 659166018), P(460099862, 659167907), P(460096134, 659167907), P(460094643, 659166962), P(460093897, 659167907), P(460093897, 659168852), P(460093897, 659169797), P(460093152, 659170742), P(460092406, 659170742), P(460091660, 659171687), P(460090915, 659172632), P(460090169, 659172632), P(460089423, 659172632), P(460087932, 659174522), P(460086441, 659174522), P(460085695, 659173577), P(460084949, 659172632), P(460084204, 659172632), P(460083458, 659173577), P(460082712, 659174092), P(460081887, 659173943), P(460077493, 659174522), P(460076002, 659176411), P(460076747, 659177356), P(460076002, 659178301), P(460074510, 659178301), P(460073765, 659178301), P(460072273, 659180191), P(460070782, 659183026), P(460070782, 659185861), P(460070036, 659186806), P(460071528, 659188696), P(460072273, 659188696), P(460071528, 659189640), P(460071528, 659190585), P(460070782, 659189640), P(460070036, 659189640), P(460070036, 659188696), P(460069291, 659187751), P(460068545, 659187751), P(460068545, 659185861), P(460067054, 659183971), P(460066308, 659184916), P(460065562, 659184916), P(460064817, 659185861), P(460065562, 659186806), P(460064817, 659186806), P(460063325, 659188696), P(460064071, 659189640), P(460063325, 659191530), P(460061834, 659191530), P(460062580, 659190585), P(460061834, 659188696), P(460060343, 659188696), P(460059597, 659187751), P(460058106, 659187751), P(460057360, 659188696), P(460058106, 659189640), P(460057360, 659189640), P(460055869, 659191530), P(460053632, 659191530), P(460052886, 659192475), P(460052141, 659192475), P(460050649, 659194365), P(460050649, 659195310), P(460049904, 659195310), P(460049158, 659196255), P(460048412, 659196255), P(460046921, 659197200), P(460046175, 659198145), P(460044684, 659200035), P(460042447, 659200035), P(460041701, 659200035), P(460040956, 659200980), P(460040956, 659201925), P(460040956, 659202870), P(460040210, 659202870), P(460039464, 659203815), P(460038719, 659203815), P(460037973, 659204760), P(460036482, 659204760), P(460035736, 659204760), P(460034991, 659205705), P(460035736, 659206650), P(460034245, 659206650), P(460029771, 659211375), P(460029025, 659210430), P(460027534, 659210430), P(460026788, 659210430), P(460026043, 659211375), P(460023806, 659211375), P(460023060, 659212320), P(460021569, 659212320), P(460020823, 659213265), P(460019332, 659214210), P(460018586, 659214210), P(460017841, 659213265), P(460017095, 659214210), P(460014858, 659214210), P(460014112, 659215156), P(460010384, 659215156), P(460008147, 659217991), P(460006656, 659217991), P(460005164, 659219881), P(460002927, 659221771), P(460002182, 659221771), P(460001436, 659222716), P(459999945, 659222716), P(459998454, 659224606), P(459996217, 659224606), P(459995471, 659223661), P(459993980, 659223661), P(459993234, 659223661), P(459992488, 659224606), P(459991743, 659224606), P(459990997, 659225551), P(459990251, 659225551), P(459989506, 659224606), P(459988014, 659224606), P(459989584, 659226837), P(459988801, 659228032), P(459988425, 659227050), P(459986826, 659227659), P(459982814, 659228559), P(459980515, 659229076), P(459976857, 659230084), P(459969207, 659229512), P(459968816, 659228975), P(459964212, 659228569), P(459960498, 659226963), P(459958254, 659225206), P(459956782, 659223162), P(459956096, 659220921), P(459955923, 659218678), P(459954847, 659215180), P(459957443, 659211375), P(459956697, 659210430), P(459955951, 659210430), P(459955951, 659209485), P(459955206, 659208540), P(459953714, 659205705), P(459952969, 659205705), P(459952223, 659204760), P(459949986, 659203815), P(459949986, 659201925), P(459949240, 659200035), P(459948495, 659200035), P(459947749, 659199090), P(459947003, 659199090), P(459945512, 659197200), P(459944021, 659196255), P(459941784, 659196255), P(459940292, 659195310), P(459938056, 659192475), P(459937310, 659192475), P(459936564, 659191530), P(459935073, 659190585), P(459934327, 659190585), P(459932090, 659188696), P(459931345, 659189640), P(459931345, 659188696), P(459930599, 659187751), P(459929108, 659185861), P(459928362, 659186806), P(459927616, 659186806), P(459926125, 659186806), P(459924634, 659184916), P(459924634, 659183971), P(459923888, 659183026), P(459923142, 659182081), P(459922397, 659182081), P(459920160, 659180191), P(459919414, 659181136), P(459919414, 659182081), P(459919414, 659183026), P(459917923, 659181136), P(459915686, 659181136), P(459915686, 659179246), P(459916432, 659179246), P(459917177, 659178301), P(459914940, 659175466), P(459912703, 659171687), P(459911212, 659173577), P(459911212, 659174522), P(459911212, 659175466), P(459910466, 659175466), P(459910466, 659174522), P(459909721, 659173577), P(459908975, 659174522), P(459908975, 659175466), P(459908229, 659176411), P(459905247, 659176411), P(459902264, 659179246), P(459897045, 659179246), P(459896299, 659178301), P(459895553, 659178301), P(459893316, 659177356), P(459892571, 659178301), P(459893316, 659179246), P(459893316, 659181136), P(459891825, 659181136), P(459891079, 659182081), P(459889588, 659182081), P(459888842, 659182081), P(459888097, 659183026), P(459886605, 659183026), P(459885549, 659183035), P(459883623, 659184916), P(459881551, 659188663), P(459881178, 659186462), P(459881053, 659185496), P(459881136, 659184240), P(459880309, 659183971), P(459879459, 659184187), P(459878029, 659184083), P(459877658, 659184916), P(459876912, 659184916), P(459875421, 659184916), P(459874239, 659184676), P(459872538, 659184866), P(459870587, 659184028), P(459869455, 659183026), P(459868710, 659183026), P(459867964, 659183971), P(459867964, 659186806), P(459866473, 659188696), P(459865727, 659190585), P(459864981, 659190585), P(459864128, 659190193), P(459863283, 659190270), P(459862387, 659190449), P(459861999, 659189640), P(459857525, 659187751), P(459855988, 659186328), P(459854835, 659186072), P(459854708, 659184203), P(459854195, 659183512), P(459853939, 659182667), P(459853051, 659182081), P(459851560, 659180191), P(459852506, 659177241), P(459853797, 659174522), P(459853597, 659173139), P(459853136, 659171940), P(459852275, 659171549), P(459852305, 659170742), P(459851905, 659169082), P(459853051, 659167907), P(459854197, 659167308), P(459855288, 659166962), P(459855465, 659166041), P(459855757, 659165050), P(459856034, 659164128), P(459856654, 659161898), P(459856469, 659159743), P(459856270, 659159227), P(459855561, 659158459), P(459854580, 659157661), P(459853007, 659157395), P(459850091, 659156686), P(459848998, 659157484), P(459847839, 659158783), P(459846871, 659159196), P(459844849, 659157514), P(459843831, 659156303), P(459844103, 659154679), P(459844103, 659153734), P(459844849, 659152790), P(459844842, 659151373), P(459844812, 659150074), P(459844849, 659149010), P(459845594, 659148065), P(459845824, 659147711), P(459846112, 659147327), P(459846931, 659146427), P(459847641, 659144523), P(459847774, 659143918), P(459847914, 659143327), P(459847847, 659142545), P(459847944, 659141954), P(459847737, 659140565), P(459846844, 659137717), P(459845959, 659135724), P(459845280, 659134573), P(459844320, 659133052), P(459843633, 659132093), P(459842415, 659130499), P(459841324, 659129510), P(459840150, 659128801), P(459839426, 659127900), P(459839100, 659127162), P(459839321, 659126055), P(459838694, 659124727), P(459837676, 659122705), P(459837071, 659121937), P(459836694, 659121332), P(459835837, 659119913), P(459834641, 659119307), P(459832582, 659118305), P(459832178, 659117734), P(459831005, 659116822), P(459830173, 659115389), P(459829532, 659112581), P(459829019, 659111686), P(459828622, 659111078), P(459828302, 659110555), P(459827918, 659110270), P(459827362, 659109441), P(459826617, 659108845), P(459824085, 659107371), P(459822479, 659106403), P(459820927, 659106010), P(459820259, 659106152), P(459819028, 659105861), P(459817654, 659106074), P(459814866, 659105969), P(459814751, 659106157), P(459813050, 659106157), P(459812570, 659106435), P(459812817, 659107072), P(459812653, 659107131), P(459812533, 659106888), P(459811588, 659106823), P(459810587, 659107399), P(459810139, 659107351), P(459810076, 659107826), P(459809732, 659107666), P(459809680, 659108016), P(459809476, 659107990), P(459809465, 659108343), P(459808600, 659108567), P(459807152, 659108330), P(459805901, 659108316), P(459805844, 659108647), P(459805441, 659108383), P(459805154, 659108689), P(459804850, 659108357), P(459804132, 659108912), P(459804074, 659108586), P(459803124, 659108358), P(459802037, 659107858), P(459801275, 659107215), P(459800390, 659106115), P(459800219, 659104999), P(459800343, 659103357), P(459800437, 659102134), P(459801058, 659100057), P(459802145, 659098879), P(459802627, 659098274), P(459803202, 659096336), P(459803776, 659094631), P(459804226, 659092895), P(459804224, 659091457), P(459803939, 659090340), P(459803493, 659089271), P(459803152, 659088371), P(459802685, 659087849), P(459802144, 659087510), P(459801456, 659087499), P(459801134, 659087877), P(459800521, 659087789), P(459800489, 659087554), P(459800636, 659087349), P(459800560, 659087106), P(459800365, 659086964), P(459799666, 659087039), P(459799097, 659087089), P(459798042, 659087993), P(459796717, 659088145), P(459796337, 659088566), P(459796071, 659088599), P(459795832, 659088478), P(459795727, 659088239), P(459795713, 659087141), P(459795363, 659086431), P(459794973, 659086045), P(459794834, 659086128), P(459794537, 659086097), P(459794393, 659085589), P(459793749, 659085394), P(459793330, 659085391), P(459792985, 659085866), P(459792876, 659086384), P(459793039, 659086585), P(459793057, 659086816), P(459792903, 659086964), P(459792468, 659087209), P(459791718, 659088468), P(459791062, 659089171), P(459790500, 659089665), P(459789867, 659089626), P(459789845, 659089910), P(459789313, 659089587), P(459789085, 659088602), P(459789890, 659087428), P(459789839, 659087050), P(459789501, 659086692), P(459789034, 659086701), P(459788042, 659087147), P(459779249, 659093973), P(459778937, 659093253), P(459778993, 659092599), P(459779262, 659092495), P(459779408, 659091576), P(459780412, 659091486), P(459780411, 659090511), P(459781000, 659090420), P(459781308, 659089691), P(459781028, 659089349), P(459781102, 659088016), P(459780681, 659086588), P(459780455, 659086393), P(459780443, 659085434), P(459780089, 659085086), P(459780101, 659084558), P(459779081, 659084261), P(459777967, 659083715), P(459776987, 659082974), P(459776592, 659082066), P(459775824, 659079020), P(459775580, 659078969), P(459775848, 659076350), P(459775303, 659075081), P(459774846, 659074964), P(459774623, 659074172), P(459773378, 659073654), P(459773394, 659072119), P(459771971, 659071672), P(459772071, 659071071), P(459772399, 659070994), P(459772717, 659070670), P(459772891, 659070286), P(459772678, 659070261), P(459772606, 659070022), P(459772752, 659069684), P(459770423, 659067542), P(459771169, 659066598), P(459771915, 659067542), P(459772219, 659066039), P(459773196, 659065767), P(459773196, 659063878), P(459772451, 659062934), P(459772451, 659061989), P(459771705, 659061045), P(459771705, 659060100), P(459771260, 659059257), P(459770789, 659057550), P(459770044, 659057550), P(459768774, 659056341), P(459767283, 659056341), P(459768356, 659054962), P(459766865, 659054017), P(459766119, 659054017), P(459765374, 659054962), P(459764628, 659055906), P(459762787, 659053824), P(459761295, 659053824), P(459762165, 659049053), P(459762165, 659046220), P(459761420, 659046220), P(459760674, 659047164), P(459760674, 659049053), P(459759928, 659049997), P(459759928, 659051886), P(459760674, 659053775), P(459757691, 659053775), P(459756946, 659052831), P(459750235, 659048109), P(459752472, 659045275), P(459752472, 659044331), P(459751726, 659043386), P(459753217, 659043386), P(459755454, 659040553), P(459756200, 659039608), P(459756946, 659039608), P(459757691, 659040553), P(459759928, 659039608), P(459759928, 659037719), P(459759183, 659036775), P(459758437, 659035831), P(459758437, 659034887), P(459759183, 659034887), P(459759928, 659034887), P(459760674, 659033942), P(459761420, 659032053), P(459761420, 659031109), P(459759928, 659029220), P(459758437, 659028276), P(459758437, 659024498), P(459757691, 659023554), P(459757691, 659022609), P(459756200, 659019776), P(459756200, 659016943), P(459756946, 659015999), P(459757691, 659011277), P(459758437, 659011277), P(459759183, 659010333), P(459759928, 659009388), P(459759928, 659008444), P(459760674, 659007500), P(459759928, 659006555), P(459760674, 659005611), P(459760674, 659004667), P(459761420, 659001834), P(459762165, 659000890), P(459762911, 659000890), P(459763657, 659000890), P(459765894, 658998057), P(459765894, 658997113), P(459767385, 658997113), P(459768876, 658996168), P(459767385, 658994280), P(459768876, 658992391), P(459768876, 658991447), P(459769622, 658991447), P(459770367, 658990502), P(459770367, 658987670), P(459771113, 658987670), P(459771859, 658986726), P(459771113, 658983893), P(459771859, 658982949), P(459773350, 658982949), P(459774096, 658982004), P(459774841, 658981060), P(459774841, 658980116), P(459777078, 658977283), P(459778570, 658974450), P(459778570, 658971618), P(459777824, 658970674), P(459778570, 658970674), P(459781552, 658966897), P(459782298, 658965953), P(459782298, 658964065), P(459783044, 658963120), P(459784535, 658957456), P(459785281, 658956511), P(459786772, 658956511), P(459789009, 658954623), P(459787518, 658952735), P(459787518, 658948958), P(459786772, 658948014), P(459786772, 658947070), P(459786026, 658946126), P(459786026, 658945182), P(459786026, 658942350), P(459786772, 658941406), P(459786772, 658940461), P(459787518, 658939517), P(459788263, 658938573), P(459788263, 658937629), P(459787518, 658935741), P(459788263, 658934797), P(459788263, 658933853), P(459789754, 658931965), P(459789009, 658931021), P(459788263, 658931021), P(459789754, 658929132), P(459792737, 658924412), P(459793483, 658923468), P(459795720, 658923468), P(459797211, 658922524), P(459797957, 658921580), P(459798702, 658920636), P(459800194, 658920636), P(459800939, 658919692), P(459802431, 658919692), P(459803176, 658918748), P(459803176, 658917804), P(459803922, 658916860), P(459804668, 658916860), P(459805413, 658915916), P(459806159, 658915916), P(459808396, 658914028), P(459810633, 658914028), P(459812124, 658913084), P(459813615, 658911196), P(459813615, 658910252), P(459814361, 658910252), P(459815852, 658908364), P(459817344, 658908364), P(459818835, 658906476), P(459818835, 658904588), P(459820326, 658902700), P(459822563, 658902700), P(459824055, 658900812), P(459824800, 658900812), P(459825546, 658899868), P(459826292, 658899868), P(459827783, 658898924), P(459829274, 658897036), P(459830020, 658896093), P(459833002, 658896093), P(459833748, 658895149), P(459833748, 658894205), P(459834494, 658893261), P(459835985, 658893261), P(459836731, 658892317), P(459837476, 658892317), P(459838222, 658892317), P(459840459, 658889485), P(459841205, 658889485), P(459841950, 658888541), P(459844933, 658885709), P(459846424, 658885709), P(459847170, 658884766), P(459847916, 658884766), P(459853135, 658881934), P(459854626, 658880046), P(459854626, 658879102), P(459856118, 658877215), P(459856863, 658876271), P(459856863, 658875327), P(459857609, 658874383), P(459857609, 658872495), P(459858355, 658872495), P(459859846, 658870607), P(459859846, 658869664), P(459859100, 658868720), P(459858355, 658867776), P(459859100, 658866832), P(459859100, 658865888), P(459860592, 658864001), P(459859846, 658863057), P(459859100, 658862113), P(459859846, 658862113), P(459860592, 658861169), P(459861337, 658861169), P(459862083, 658860225), P(459864320, 658857394), P(459866557, 658857394), P(459867303, 658856450), P(459868794, 658856450), P(459869539, 658855506), P(459871031, 658855506), P(459874013, 658854562), P(459875505, 658852675), P(459877742, 658852675), P(459879979, 658850787), P(459882961, 658850787), P(459883707, 658850787), P(459884453, 658849843), P(459885198, 658849843), P(459885944, 658848900), P(459885944, 658847956), P(459888181, 658847956), P(459889672, 658847012), P(459890418, 658846068), P(459890418, 658844181), P(459891163, 658843237), P(459891909, 658842293), P(459892655, 658842293), P(459894146, 658841350), P(459894892, 658840406), P(459896383, 658838518), P(459896383, 658837574), P(459896383, 658836631), P(459897129, 658836631), P(459897874, 658835687), P(459898620, 658835687), P(459899366, 658835687), P(459900111, 658834743), P(459900857, 658833800), P(459904585, 658833800), P(459905331, 658834743), P(459906822, 658832856), P(459907568, 658830969), P(459909805, 658830969), P(459910550, 658831912), P(459911296, 658830969), P(459912042, 658830969), P(459912787, 658830025), P(459913533, 658830025), P(459916516, 658829081), P(459917261, 658828137), P(459917261, 658827194), P(459916516, 658824362), P(459918007, 658824362), P(459918753, 658823419), P(459920244, 658823419), P(459920990, 658823419), P(459921735, 658822475), P(459922481, 658822475), P(459923972, 658821531), P(459925464, 658821531), P(459926209, 658822475), P(459927700, 658822475), P(459928446, 658822475), P(459929192, 658823419), P(459930683, 658823419), P(459932174, 658823419), P(459933666, 658821531), P(459937394, 658821531), P(459938885, 658819644), P(459941868, 658819644), P(459946342, 658817757), P(459948579, 658814926), P(459948579, 658813982), P(459950816, 658811151), P(459951561, 658810207), P(459951561, 658809264), P(459952307, 658808320), P(459953798, 658807376), P(459953798, 658806433), P(459954544, 658805489), P(459953053, 658803602), P(459953053, 658802658), P(459952307, 658801715), P(459953053, 658800771), P(459953798, 658799828), P(459953053, 658798884), P(459950816, 658797940), P(459951561, 658796997), P(459958272, 658796997), P(459959018, 658796053), P(459959764, 658796053), P(459962001, 658796053), P(459962746, 658795109), P(459963492, 658795109), P(459964238, 658794166), P(459964238, 658793222), P(459967220, 658793222), P(459968711, 658791335), P(459968711, 658790391), P(459971694, 658789448), P(459973185, 658787561), P(459972440, 658786617), P(459970948, 658785674), P(459971694, 658785674), P(459972440, 658784730), P(459973185, 658784730), P(459974677, 658782843), P(459974677, 658780956), P(459973931, 658780012), P(459972440, 658779069), P(459974677, 658776238), P(459975422, 658776238), P(459976168, 658775294), P(459976168, 658772464), P(459979151, 658768690), P(459978405, 658767747), P(459974677, 658767747), P(459973931, 658767747), P(459973931, 658766803), P(459973185, 658765859), P(459973931, 658764916), P(459974677, 658763972), P(459973185, 658762085), P(459972440, 658763029), P(459972440, 658763972), P(459970948, 658763972), P(459969457, 658762085), P(459967220, 658759255), P(459965729, 658761142), P(459966474, 658762085), P(459966474, 658763029), P(459967220, 658763972), P(459967966, 658765859), P(459966474, 658763972), P(459965729, 658763972), P(459964983, 658763029), P(459964238, 658763029), P(459962746, 658762085), P(459962746, 658758311), P(459960509, 658757368), P(459961255, 658757368), P(459962001, 658756425), P(459962746, 658757368), P(459964238, 658758311), P(459964983, 658757368), P(459964983, 658754538), P(459965729, 658753594), P(459965729, 658752651), P(459966474, 658749820), P(459968711, 658749820), P(459970203, 658747934), P(459970948, 658747934), P(459971694, 658748877), P(459975422, 658748877), P(459976914, 658747934), P(459977659, 658748877), P(459977659, 658749820), P(459978405, 658750764), P(459979896, 658750764), P(459980642, 658751707), P(459979896, 658752651), P(459980642, 658754538), P(459979896, 658754538), P(459978405, 658756425), P(459979896, 658758311), P(459982133, 658760198), P(459982879, 658759255), P(459982879, 658757368), P(459982879, 658756425), P(459984370, 658756425), P(459985116, 658754538), P(459985862, 658755481), P(459986607, 658755481), P(459987353, 658754538), P(459989590, 658754538), P(459990335, 658755481), P(459993318, 658755481), P(459994064, 658756425), P(459995555, 658757368), P(459997792, 658757368), P(459999283, 658755481), P(460000029, 658755481), P(460000775, 658754538), P(460001520, 658754538), P(460005994, 658753594), P(460006740, 658752651), P(460006740, 658748877), P(460015159, 658746665), P(460016993, 658743181), P(460018934, 658741224), P(460021004, 658737476), P(460021999, 658737183), P(460023384, 658735123), P(460023408, 658734211), P(460025089, 658733218), P(460025593, 658732682), P(460025750, 658731912), P(460027307, 658730502), P(460029394, 658729746), P(460031228, 658727335), P(460031347, 658725400), P(460033480, 658721843), P(460036162, 658720860), P(460038719, 658718780), P(460039705, 658716680), P(460041375, 658715922), P(460064834, 658706427), P(460068862, 658702772), P(460070622, 658699973), P(460072319, 658697777), P(460076125, 658696302), P(460079628, 658692900), P(460080865, 658690799), P(460088952, 658685780), P(460089317, 658684948), P(460093519, 658682117), P(460095517, 658680634), P(460096865, 658680768), P(460097753, 658679492), P(460100005, 658677676), P(460101673, 658677185), P(460101833, 658676590), P(460102610, 658675853), P(460103402, 658674584), P(460103608, 658675090), P(460103451, 658675519), P(460105147, 658674726), P(460106845, 658673284), P(460107622, 658671897), P(460108350, 658669567), P(460110033, 658666578), P(460111047, 658665682), P(460111699, 658665452), P(460113222, 658664739), P(460115953, 658662933), P(460116778, 658662046), P(460118301, 658661364), P(460119824, 658659541), P(460121299, 658657116), P(460122456, 658655095), P(460123820, 658654025), P(460124550, 658652868), P(460125344, 658649958), P(460126993, 658646153), P(460127025, 658644751), P(460129674, 658640265), P(460131542, 658639967), P(460134024, 658638456), P(460135838, 658637964), P(460137663, 658637864), P(460139143, 658637329), P(460140184, 658636261), P(460141831, 658635827), P(460145514, 658633699), P(460148240, 658632280), P(460150249, 658631417), P(460153419, 658630130), P(460155900, 658629958), P(460157504, 658629610), P(460161351, 658628457), P(460163431, 658626770), P(460165327, 658625092), P(460167407, 658623788), P(460169222, 658622654), P(460170530, 658621085), P(460171365, 658619256), P(460172666, 658617009), P(460174788, 658614645), P(460175648, 658612016), P(460177163, 658610409), P(460177844, 658608175), P(460177734, 658606510), P(460180169, 658601183), P(460182823, 658598828), P(460184195, 658598146), P(460186943, 658595938), P(460188460, 658594061), P(460191320, 658591397), P(460195103, 658589872), P(460197025, 658588682), P(460199415, 658586157), P(460200823, 658585740), P(460203292, 658583081), P(460206332, 658581282), P(460207247, 658581212), P(460209901, 658580496), P(460212853, 658580204), P(460214855, 658579514), P(460215772, 658578884), P(460215640, 658578476), P(460215751, 658578364), P(460215944, 658578825), P(460216967, 658578836), P(460218239, 658578195), P(460218220, 658577990), P(460218368, 658577766), P(460218613, 658577719), P(460218801, 658577912), P(460219475, 658577485), P(460219128, 658576507), P(460219513, 658576835), P(460220257, 658577014), P(460220346, 658576415), P(460221089, 658576846), P(460221738, 658576542), P(460221402, 658575518), P(460221800, 658575159), P(460222408, 658575837), P(460222892, 658575260), P(460223809, 658575510), P(460224697, 658574675), P(460224858, 658574233), P(460226216, 658573707), P(460228589, 658570821), P(460228805, 658569978), P(460230772, 658567478), P(460233591, 658566826), P(460235087, 658566812), P(460236391, 658566160), P(460238319, 658566698), P(460242316, 658566926), P(460245478, 658566138), P(460246745, 658565472), P(460250783, 658563155), P(460251752, 658562335), P(460252257, 658562744), P(460252520, 658562628), P(460252643, 658562087), P(460252343, 658561914), P(460252407, 658561527), P(460252541, 658561288), P(460252887, 658561462), P(460253090, 658561260), P(460253321, 658561458), P(460254128, 658561120), P(460254489, 658560530), P(460255079, 658559315), P(460256450, 658560065), P(460257153, 658559767), P(460259699, 658559423), P(460259644, 658558846), P(460259885, 658559086), P(460260207, 658559126), P(460260329, 658559479), P(460261659, 658559383), P(460263406, 658559671), P(460264523, 658559713), P(460265498, 658559504), P(460266113, 658559010), P(460265805, 658558651), P(460265957, 658558430), P(460267015, 658559251), P(460266813, 658559710), P(460267514, 658560180), P(460268186, 658561375), P(460269149, 658562088), P(460269505, 658562012), P(460269739, 658562389), P(460270104, 658562771), P(460270364, 658563043), P(460270631, 658563949), P(460271696, 658564918), P(460273081, 658565283), P(460275211, 658565150), P(460276516, 658564806), P(460277349, 658564102), P(460276769, 658563531), P(460277288, 658562662), P(460277849, 658562861), P(460278323, 658563611), P(460278740, 658563674), P(460278905, 658563130), P(460278309, 658562424), P(460279733, 658561925), P(460280537, 658562170), P(460280551, 658563038), P(460280937, 658563277), P(460281895, 658563001), P(460283094, 658563144), P(460284425, 658563477), P(460285330, 658563637), P(460287648, 658564806), P(460288953, 658565046), P(460289551, 658564497), P(460289658, 658564913), P(460290364, 658564593), P(460291203, 658564777), P(460291389, 658565842), P(460294665, 658566559), P(460295939, 658567139), P(460296475, 658567226), P(460301381, 658567301), P(460303732, 658567182), P(460306901, 658566638), P(460323788, 658563329), P(460325231, 658563451), P(460326644, 658564022), P(460328319, 658564849), P(460331015, 658565722), P(460336506, 658568055), P(460336633, 658567930), P(460336827, 658568014), P(460336892, 658568215), P(460337689, 658568609), P(460344118, 658571400), P(460345170, 658571585), P(460348556, 658571644), P(460348565, 658572946), P(460345184, 658572907), P(460344223, 658572712), P(460343238, 658572394), P(460342944, 658573107), P(460324908, 658565814), P(460324206, 658567509), P(460324124, 658567544), P(460301897, 658568859), P(460301907, 658569857), P(460303003, 658569840), P(460303008, 658570192), P(460306498, 658573310), P(460306652, 658573412), P(460306810, 658573493), P(460310913, 658575091), P(460310873, 658575181), P(460306545, 658573517), P(460306061, 658574672), P(460307369, 658575194), P(460307327, 658575292), P(460303470, 658573809), P(460303311, 658574186), P(460303971, 658574448), P(460303885, 658574642), P(460301806, 658573815), P(460302150, 658572956), P(460301963, 658572879), P(460300850, 658574639), P(460300857, 658574784), P(460300944, 658574922), P(460301735, 658575226), P(460301884, 658575319), P(460301966, 658575456), P(460301985, 658575599), P(460305423, 658576875), P(460305595, 658576436), P(460307671, 658576657), P(460308813, 658578279), P(460309471, 658578821), P(460310979, 658580383), P(460312717, 658582043), P(460313878, 658582946), P(460315048, 658583713), P(460316631, 658584475), P(460318369, 658584307), P(460321128, 658584419), P(460322546, 658579200), P(460325865, 658580066), P(460328624, 658582594), P(460327723, 658583688), P(460326546, 658585564), P(460328295, 658585544), P(460328769, 658579073), P(460336263, 658583732), P(460334228, 658583856), P(460332878, 658586477), P(460333814, 658585981), P(460334267, 658585859), P(460334701, 658585842), P(460335143, 658585903), P(460335607, 658586072), P(460337375, 658587363), P(460337643, 658587015), P(460338454, 658587623), P(460337251, 658589212), P(460337429, 658589467), P(460337447, 658589692), P(460337361, 658589941), P(460337582, 658590101), P(460338958, 658591099), P(460340555, 658591655), P(460341954, 658591741), P(460343200, 658591549), P(460343690, 658591338), P(460344084, 658591047), P(460344232, 658590761), P(460344218, 658590419), P(460344090, 658590127), P(460343894, 658589929), P(460343634, 658589794), P(460344389, 658588485), P(460341329, 658586678), P(460341490, 658586365), P(460339811, 658585523), P(460339405, 658585570), P(460339083, 658585392), P(460338842, 658584951), P(460338905, 658584504), P(460339509, 658584131), P(460351274, 658590726), P(460351938, 658590715), P(460352456, 658591219), P(460353234, 658590687), P(460356965, 658592720), P(460357046, 658593126), P(460357937, 658593363), P(460359041, 658593303), P(460359414, 658593138), P(460359968, 658593503), P(460361014, 658593741), P(460361181, 658593914), P(460361159, 658594469), P(460364028, 658594966), P(460364588, 658594811), P(460364620, 658593781), P(460365678, 658592842), P(460365712, 658592648), P(460365882, 658592657), P(460365970, 658593104), P(460366137, 658593181), P(460366303, 658593124), P(460366622, 658592636), P(460367193, 658592621), P(460367582, 658592126), P(460368051, 658592641), P(460368483, 658591948), P(460368663, 658591831), P(460368898, 658591866), P(460369073, 658591557), P(460369111, 658591601), P(460368883, 658592058), P(460368726, 658593094), P(460369647, 658593483), P(460370383, 658593294), P(460370064, 658595748), P(460371021, 658598014), P(460371311, 658600082), P(460372361, 658601489), P(460374030, 658601795), P(460377397, 658601311), P(460379733, 658601527), P(460381361, 658601302), P(460382677, 658603803), P(460387906, 658605165), P(460388800, 658605192), P(460390107, 658603926), P(460391340, 658599852), P(460393280, 658602026), P(460394425, 658602659), P(460394940, 658601646), P(460395796, 658603117), P(460395655, 658604055), P(460396364, 658604489), P(460397641, 658604223), P(460398333, 658602296), P(460398933, 658602240), P(460399723, 658602257), P(460400363, 658600662), P(460401296, 658601354), P(460400685, 658598604), P(460401591, 658597861), P(460403195, 658598382), P(460402726, 658599934), P(460402035, 658601405), P(460401852, 658602496), P(460402326, 658603848), P(460403042, 658604732), P(460403461, 658605611), P(460404756, 658605532), P(460406326, 658607211), P(460409309, 658610983), P(460410055, 658611570), P(460412203, 658612785), P(460414206, 658614546), P(460415274, 658614755), P(460416475, 658614939), P(460418143, 658615963), P(460418895, 658616982), P(460419748, 658617584), P(460421561, 658617118), P(460422054, 658619275), P(460421517, 658621299), P(460421232, 658622768), P(460421367, 658623687), P(460424197, 658624976), P(460429442, 658625128), P(460431775, 658626464), P(460433504, 658626627), P(460435902, 658626706), P(460439127, 658626612), P(460441855, 658626569), P(460444331, 658626474), P(460445474, 658626166), P(460446449, 658625881), P(460447171, 658625550), P(460448083, 658625128), P(460448829, 658624185), P(460448829, 658622299), P(460449574, 658621356), P(460451811, 658621356), P(460453302, 658620413), P(460455539, 658623242), P(460457031, 658623242), P(460457776, 658624185), P(460458658, 658624286), P(460459389, 658624374), P(460460469, 658624504), P(460461138, 658624402), P(460462188, 658624330), P(460463239, 658624039), P(460464115, 658623662), P(460464672, 658623271), P(460465113, 658622400), P(460465902, 658621225), P(460465176, 658620194), P(460465432, 658618860), P(460470453, 658619470), P(460471198, 658618527), P(460471198, 658617584), P(460471944, 658617584), P(460473435, 658615698), P(460474926, 658615698), P(460475672, 658614755), P(460476418, 658613812), P(460477163, 658614755), P(460479400, 658611926), P(460480146, 658611926), P(460483874, 658610040), P(460484620, 658609097), P(460484620, 658607211), P(460484620, 658605325), P(460485366, 658606268), P(460486111, 658606268), P(460486857, 658607211), P(460488348, 658607211), P(460489094, 658606268), P(460490585, 658605325), P(460491331, 658606268), P(460492076, 658607211), P(460494313, 658604382), P(460495059, 658601553), P(460495059, 658602496), P(460495805, 658603439), P(460498787, 658603439), P(460499533, 658604382), P(460501024, 658604382), P(460501770, 658605325), P(460503261, 658605325), P(460505498, 658606268), P(460506244, 658605325), P(460507735, 658605325), P(460508481, 658604382), P(460509972, 658603439), P(460510718, 658604382), P(460511463, 658604382), P(460512209, 658605325), P(460512955, 658605325), P(460514446, 658606268), P(460515192, 658605325), P(460515937, 658605325), P(460516683, 658605325), P(460517429, 658606268), P(460518174, 658606268), P(460518920, 658607211), P(460520411, 658607211), P(460521157, 658608154), P(460524140, 658608154), P(460527868, 658608154), P(460528614, 658607211), P(460529359, 658607211), P(460530105, 658606268), P(460530851, 658606268), P(460531596, 658605325), P(460532342, 658605325), P(460533833, 658603439), P(460534579, 658602496), P(460535324, 658603439), P(460536070, 658603439), P(460538307, 658602496), P(460539053, 658601553), P(460539053, 658600610), P(460539798, 658599667), P(460540544, 658599667), P(460542035, 658597781), P(460546509, 658597781), P(460547255, 658596838), P(460548746, 658596838), P(460550238, 658597781), P(460551729, 658595895), P(460553966, 658595895), P(460554711, 658594952), P(460556203, 658594952), P(460557694, 658594952), P(460559185, 658593066), P(460559931, 658593066), P(460560677, 658592123), P(460561422, 658591180), P(460562914, 658590237), P(460565151, 658590237), P(460565896, 658589295), P(460567388, 658589295), P(460568133, 658590237), P(460572607, 658587409), P(460573559, 658588756), P(460574607, 658588470), P(460574781, 658588779), P(460575225, 658588730), P(460574995, 658589470), P(460574748, 658589585), P(460575005, 658591162), P(460576299, 658592783), P(460577367, 658592906), P(460579138, 658592941), P(460582270, 658592735), P(460586200, 658592312), P(460588238, 658591390), P(460588496, 658591424), P(460588732, 658591567), P(460588797, 658591790), P(460588747, 658592066), P(460588650, 658592251), P(460588404, 658592363), P(460588011, 658592396), P(460587996, 658592898), P(460587165, 658592945), P(460587243, 658593815), P(460586952, 658594369), P(460587315, 658594850), P(460588535, 658595247), P(460589151, 658595269), P(460589668, 658595106), P(460589986, 658593499), P(460590642, 658593392), P(460590598, 658593124), P(460590279, 658592347), P(460590284, 658591813), P(460590619, 658591801), P(460592112, 658590314), P(460592972, 658590371), P(460593043, 658593066), P(460593232, 658593452), P(460593598, 658593781), P(460593510, 658591833), P(460594252, 658591836), P(460593911, 658593104), P(460594162, 658593081), P(460594570, 658592364), P(460595705, 658592335), P(460595678, 658592880), P(460596398, 658593053), P(460596393, 658593681), P(460596478, 658594161), P(460595999, 658594925), P(460596392, 658595254), P(460597398, 658595536), P(460598815, 658595766), P(460599092, 658595246), P(460599515, 658595260), P(460600426, 658595099), P(460607653, 658595895), P(460609144, 658595895), P(460610635, 658597781), P(460615855, 658600610), P(460616601, 658599667), P(460617346, 658599667), P(460618838, 658598724), P(460619583, 658597781), P(460620329, 658596838), P(460621075, 658596838), P(460622566, 658594952), P(460623312, 658594009), P(460622566, 658593066), P(460624803, 658590237), P(460624803, 658588352), P(460627040, 658585523), P(460627040, 658584580), P(460630022, 658578923), P(460630768, 658578923), P(460631514, 658577980), P(460632259, 658577037), P(460634496, 658577037), P(460635242, 658577037), P(460636733, 658575151), P(460637479, 658574208), P(460639716, 658574208), P(460641207, 658573265), P(460642699, 658571380), P(460642699, 658569494), P(460642699, 658568551), P(460644190, 658568551), P(460644936, 658567608), P(460647918, 658564780), P(460650901, 658564780), P(460651646, 658565722), P(460652392, 658565722), P(460653883, 658563837), P(460656866, 658563837), P(460659849, 658561951), P(460661340, 658560065), P(460661340, 658558180), P(460660594, 658557237), P(460662831, 658557237), P(460663577, 658556294), P(460663577, 658554408), P(460667305, 658554408), P(460668051, 658553466), P(460668796, 658553466), P(460669542, 658553466), P(460670288, 658552523), P(460671033, 658551580), P(460671779, 658551580), P(460673270, 658551580), P(460676253, 658547809), P(460676999, 658547809), P(460677744, 658546866), P(460678490, 658546866), P(460679981, 658544981), P(460680727, 658544981), P(460681473, 658544038), P(460681473, 658543095), P(460685201, 658538381), P(460686692, 658538381), P(460688184, 658540267), P(460688929, 658539324), P(460688929, 658538381), P(460688929, 658537438), P(460688184, 658536496), P(460686692, 658536496), P(460685947, 658535553), P(460686692, 658535553), P(460687438, 658534610), P(460688184, 658533667), P(460690420, 658533667), P(460691166, 658532725), P(460693403, 658532725), P(460694149, 658531782), P(460694894, 658529897), P(460698623, 658529897), P(460700114, 658528011), P(460700860, 658528011), P(460703097, 658527068), P(460705334, 658524240), P(460705334, 658523298), P(460706825, 658521412), P(460707571, 658521412), P(460708316, 658520469), P(460709807, 658518584), P(460709807, 658517641), P(460710553, 658516699), P(460712044, 658514813), P(460712790, 658514813), P(460713536, 658513871), P(460715027, 658513871), P(460715027, 658511043), P(460715027, 658509157), P(460715773, 658509157), P(460716518, 658508215), P(460717264, 658508215), P(460718755, 658506329), P(460719501, 658506329), P(460720992, 658504444), P(460720992, 658503502), P(460720247, 658502559), P(460720992, 658502559), P(460725466, 658497846), P(460726212, 658497846), P(460726958, 658496903), P(460728449, 658495961), P(460730686, 658495961), P(460731431, 658496903), P(460733668, 658496903), P(460734414, 658496903), P(460735160, 658497846), P(460736651, 658498788), P(460738142, 658498788), P(460738888, 658497846), P(460741125, 658497846), P(460743362, 658497846), P(460744108, 658498788), P(460747090, 658498788), P(460747836, 658498788), P(460748581, 658499731), P(460750073, 658500674), P(460753801, 658500674), P(460754547, 658501616), P(460756784, 658502559), P(460757529, 658502559), P(460759021, 658500674), P(460760512, 658499731), P(460761604, 658499452), P(460762031, 658498629), P(460764141, 658498090), P(460765946, 658497128), P(460765675, 658496145), P(460766513, 658494624), P(460765926, 658493183), P(460766924, 658493278), P(460767223, 658492190), P(460767968, 658492190), P(460768714, 658491248), P(460768714, 658489362), P(460767968, 658488420), P(460767223, 658488420), P(460767223, 658487477), P(460767968, 658485592), P(460770951, 658485592), P(460771697, 658484649), P(460771697, 658483707), P(460770951, 658482764), P(460771697, 658482764), P(460772442, 658481822), P(460772442, 658480879), P(460772442, 658479937), P(460773188, 658479937), P(460773934, 658478994), P(460775425, 658478052), P(460775425, 658477109), P(460775425, 658475224), P(460778408, 658475224), P(460779596, 658471937), P(460778907, 658468946), P(460779620, 658466299), P(460782136, 658465799), P(460783627, 658465799), P(460786405, 658463086), P(460790502, 658463643), P(460790338, 658465799), P(460791829, 658467684), P(460793321, 658467684), P(460794066, 658466741), P(460794812, 658466741), P(460795558, 658466741), P(460796066, 658467971), P(460797434, 658467348), P(460798442, 658466536), P(460799286, 658467684), P(460799638, 658468733), P(460800687, 658469052), P(460801998, 658467807), P(460802424, 658469077), P(460802514, 658469888), P(460803948, 658469692), P(460804235, 658468159), P(460804858, 658467741), P(460805931, 658468634), P(460807095, 658469339), P(460808553, 658468618), P(460811216, 658467684), P(460811962, 658468626), P(460812708, 658468626), P(460814945, 658471454), P(460816436, 658472396), P(460819419, 658472396), P(460820910, 658472396), P(460821656, 658473339), P(460822401, 658473339), P(460822401, 658474281), P(460824638, 658477109), P(460826130, 658479937), P(460826130, 658482764), P(460826875, 658483707), P(460826875, 658485592), P(460826875, 658486535), P(460827621, 658487477), P(460829112, 658489362), P(460830603, 658489362), P(460831349, 658488420), P(460831349, 658487477), P(460832095, 658486535), P(460832095, 658485592), P(460832840, 658484649), P(460833586, 658485592), P(460834332, 658485592), P(460835077, 658486535), P(460835823, 658486535), P(460837314, 658487477), P(460837314, 658488420), P(460838060, 658489362), P(460838806, 658489362), P(460839551, 658489362), P(460839551, 658492190), P(460840297, 658493133), P(460841043, 658492190), P(460845517, 658492190), P(460846262, 658492190), P(460847008, 658493133), P(460847753, 658493133), P(460848499, 658494075), P(460850736, 658494075), P(460851482, 658495018), P(460852973, 658495018), P(460855210, 658495018), P(460855210, 658496903), P(460855956, 658497846), P(460858938, 658497846), P(460861175, 658500674), P(460861921, 658500674), P(460867886, 658505387), P(460868632, 658505387), P(460870869, 658502559), P(460871614, 658501616), P(460873851, 658501616), P(460874597, 658500674), P(460876088, 658500674), P(460876834, 658499731), P(460880562, 658497846), P(460882054, 658497846), P(460884291, 658500674), P(460885782, 658501616), P(460888019, 658501616), P(460889510, 658501616), P(460890256, 658500674), P(460891001, 658500674), P(460891747, 658499731), P(460892493, 658499731), P(460893238, 658498788), P(460893984, 658497846), P(460896221, 658497846), P(460896967, 658496903), P(460898458, 658496903), P(460899204, 658495961), P(460900695, 658495018), P(460902932, 658492190), P(460902932, 658490305), P(460902932, 658489362), P(460903678, 658489362), P(460904423, 658488420), P(460907406, 658484649), P(460908897, 658484649), P(460909643, 658485592), P(460913371, 658485592), P(460914117, 658485592), P(460915608, 658483707), P(460917099, 658483707), P(460918591, 658485592), P(460918591, 658486535), P(460919336, 658487477), P(460920082, 658488420), P(460920082, 658489362), P(460921573, 658491248), P(460922319, 658491248), P(460923065, 658492190), P(460925301, 658495018), P(460927538, 658495018), P(460928284, 658494075), P(460929030, 658494075), P(460930521, 658492190), P(460931267, 658492190), P(460932012, 658491248), P(460933504, 658490305), P(460932758, 658489362), P(460932758, 658488420), P(460933504, 658488420), P(460935741, 658488420), P(460936486, 658489362), P(460936486, 658490305), P(460935741, 658491248), P(460936486, 658492190), P(460937232, 658492190), P(460938723, 658493133), P(460938723, 658495018), P(460940215, 658496903), P(460940960, 658496903), P(460941706, 658495961), P(460942452, 658495961), P(460943197, 658495961), P(460943197, 658496903), P(460943943, 658497846), P(460946925, 658498788), P(460947671, 658497846), P(460949908, 658497846), P(460950654, 658496903), P(460952145, 658496903), P(460953636, 658495018), P(460954382, 658495018), P(460955873, 658494075), P(460957365, 658492190), P(460958856, 658490305), P(460962584, 658490305), P(460963330, 658489362), P(460964076, 658489362), P(460964821, 658488420), P(460967804, 658488420), P(460968549, 658487477), P(460970786, 658487477), P(460972278, 658485592), P(460973023, 658484649), P(460975582, 658483888), P(460977373, 658483279), P(460979473, 658482394), P(460980660, 658481132), P(460980208, 658480081), P(460981405, 658478732), P(460982232, 658479711), P(460984171, 658479386), P(460985895, 658479045), P(460986314, 658480002), P(460987191, 658480879), P(460987740, 658481336), P(460988241, 658481996), P(460988682, 658482503), P(460989341, 658483112), P(460990173, 658483707), P(460990897, 658483990), P(460991425, 658484425), P(460992671, 658485433), P(460994800, 658485664), P(460996353, 658485760), P(460997875, 658486143), P(460999578, 658486585), P(461001119, 658487455), P(461002229, 658487820), P(461003611, 658487410), P(461005086, 658487477), P(461005889, 658488178), P(461007323, 658488420), P(461008808, 658489151), P(461012391, 658488920), P(461016232, 658488562), P(461017025, 658488511), P(461018664, 658488588), P(461019227, 658488127), P(461020404, 658489023), P(461020788, 658488229), P(461020576, 658486337), P(461024850, 658486190), P(461025294, 658486529), P(461028323, 658490139), P(461028482, 658490828), P(461028412, 658491387), P(461027853, 658493050), P(461027130, 658495355), P(461027339, 658496264), P(461028085, 658497660), P(461028528, 658498043), P(461031208, 658498089), P(461033351, 658498659), P(461035611, 658498962), P(461038431, 658498742), P(461039713, 658498312), P(461039899, 658496321), P(461039712, 658494656), P(461042765, 658493830), P(461043627, 658494622), P(461045352, 658494889), P(461046622, 658494625), P(461048423, 658493908), P(461048831, 658492716), P(461050506, 658492621), P(461051735, 658491355), P(461053721, 658490222), P(461055314, 658490866), P(461056727, 658491022), P(461058332, 658490426), P(461060265, 658488420), P(461061756, 658490305), P(461063993, 658490305), P(461064739, 658491248), P(461066230, 658490305), P(461066230, 658491248), P(461066976, 658492190), P(461068467, 658494075), P(461069213, 658493133), P(461069958, 658493133), P(461070704, 658493133), P(461071450, 658494075), P(461072195, 658494075), P(461072941, 658495018), P(461073687, 658495961), P(461078161, 658495961), P(461078906, 658495018), P(461080398, 658496903), P(461083380, 658497846), P(461084871, 658497846), P(461085617, 658496903), P(461087108, 658495961), P(461088600, 658495961), P(461089345, 658496903), P(461090837, 658496903), P(461091582, 658495961), P(461092328, 658495961), P(461093074, 658495018), P(461093819, 658494075), P(461095311, 658493133), P(461099039, 658493133), P(461099785, 658494075), P(461101276, 658495018), P(461102021, 658495018), P(461102767, 658494075), P(461104258, 658494075), P(461106495, 658495018), P(461107987, 658493133), P(461108732, 658492190), P(461109478, 658493133), P(461110224, 658493133), P(461110969, 658493133), P(461111715, 658494075), P(461113952, 658494075), P(461114698, 658494075), P(461115443, 658495018), P(461116189, 658495018), P(461116935, 658495961), P(461117680, 658495961), P(461119172, 658496903), P(461119917, 658495961), P(461120663, 658495961), P(461121409, 658496903), P(461122900, 658496903), P(461125137, 658497846), P(461131848, 658497846), P(461132593, 658498788), P(461140050, 658498788), P(461140796, 658497846), P(461141541, 658497846), P(461146015, 658498788), P(461146761, 658497846), P(461151235, 658497846), P(461151980, 658497846), P(461152726, 658496903), P(461154217, 658496903), P(461155709, 658495961), P(461157200, 658495961), P(461157946, 658496903), P(461158691, 658495961), P(461160183, 658495018), P(461160928, 658495961), P(461164656, 658495961), P(461165402, 658495018), P(461166148, 658495018), P(461169130, 658495018), P(461169876, 658494075), P(461171367, 658493133), P(461174350, 658493133), P(461175096, 658494075), P(461175841, 658494075), P(461176587, 658493133), P(461178824, 658493133), P(461181061, 658493133), P(461181806, 658492190), P(461182552, 658492190), P(461183298, 658491248), P(461186280, 658491248), P(461187026, 658490305), P(461191500, 658490305), P(461192246, 658489362), P(461195228, 658489362), P(461195974, 658488420), P(461196720, 658485592), P(461197465, 658486535), P(461198211, 658486535), P(461198957, 658487477), P(461201193, 658487477), P(461201939, 658486535), P(461208650, 658486535), P(461210141, 658488420), P(461211633, 658488420), P(461213124, 658490305), P(461213870, 658490305), P(461215361, 658492190), P(461218344, 658494075), P(461221326, 658497846), P(461221326, 658498788), P(461222072, 658499731), P(461222817, 658500674), P(461223563, 658500674), P(461225054, 658502559), P(461225800, 658503502), P(461226546, 658503502), P(461226546, 658504444), P(461227291, 658505387), P(461229528, 658508215), P(461230274, 658508215), P(461231020, 658509157), P(461231765, 658509157), P(461233257, 658511043), P(461234002, 658511043), P(461235494, 658511985), P(461236985, 658513871), P(461238246, 658516094), P(461239479, 658517024), P(461240411, 658517735), P(461241972, 658518607), P(461243182, 658518956), P(461244416, 658519015), P(461245724, 658519015), P(461246678, 658519852), P(461247589, 658520645), P(461248915, 658521412), P(461250407, 658522355), P(461251152, 658523298), P(461251728, 658524410), P(461252750, 658525025), P(461253389, 658525183), P(461253881, 658525565), P(461255559, 658526435), P(461256920, 658527059), P(461259818, 658528011), P(461262482, 658528732), P(461264607, 658529187), P(461265807, 658529460), P(461267737, 658529354), P(461269001, 658528869), P(461270849, 658528751), P(461272304, 658528357), P(461272849, 658527664), P(461273451, 658528315), P(461274005, 658529041), P(461274905, 658529521), P(461276063, 658529727), P(461277313, 658529813), P(461279068, 658529743), P(461280156, 658529701), P(461280943, 658529754), P(461282175, 658529700), P(461283200, 658529165), P(461284155, 658530385), P(461284536, 658531678), P(461285027, 658532440), P(461285951, 658533457), P(461286872, 658534377), P(461287831, 658534793), P(461288930, 658534773), P(461291064, 658533668), P(461291418, 658533667), P(461292173, 658533048), P(461292909, 658532725), P(461295146, 658530839), P(461298129, 658530839), P(461298874, 658529897), P(461299620, 658529897), P(461302602, 658528954), P(461303348, 658529897), P(461304094, 658529897), P(461304839, 658529897), P(461307076, 658532725), P(461307822, 658533667), P(461308568, 658533667), P(461309313, 658534610), P(461310805, 658534610), P(461312296, 658535553), P(461319007, 658535553), P(461319752, 658534610), P(461324226, 658534610), P(461325718, 658533667), P(461329446, 658533667), P(461332429, 658536496), P(461334666, 658536496), P(461336174, 658533105), P(461337181, 658531631), P(461338942, 658530506), P(461341376, 658531782), P(461343425, 658531616), P(461345121, 658530950), P(461347342, 658530839), P(461348770, 658530649), P(461349841, 658529695), P(461351459, 658528145), P(461355544, 658528011), P(461356290, 658528954), P(461356512, 658530286), P(461357035, 658531782), P(461357781, 658533667), P(461358385, 658536654), P(461359892, 658538143), P(461361565, 658539261), P(461363247, 658540600), P(461363921, 658541313), P(461365393, 658543713), P(461367054, 658544520), P(461367703, 658545588), P(461369220, 658547437), P(461370841, 658548151), P(461371720, 658548342), P(461374261, 658549580), P(461375638, 658549942), P(461377697, 658550142), P(461381188, 658550371), P(461383399, 658549961), P(461384583, 658549542), P(461385411, 658549180), P(461386579, 658547919), P(461385738, 658547331), P(461386219, 658546154), P(461385248, 658545644), P(461385452, 658545208), P(461386576, 658545713), P(461387359, 658544430), P(461387830, 658543651), P(461388022, 658543000), P(461388465, 658542781), P(461388761, 658542927), P(461389240, 658543565), P(461390450, 658545131), P(461391383, 658546422), P(461392401, 658547790), P(461393315, 658548989), P(461394064, 658550037), P(461394839, 658551341), P(461395683, 658552827), P(461396539, 658554227), P(461396942, 658555018), P(461397152, 658557151), P(461397590, 658558778), P(461398602, 658560055), P(461401029, 658561951), P(461403266, 658562894), P(461412959, 658562894), P(461413705, 658563837), P(461414451, 658563837), P(461415942, 658564780), P(461416688, 658563837), P(461416688, 658562894), P(461415196, 658561008), P(461413705, 658561008), P(461414451, 658559123), P(461415942, 658561008), P(461416688, 658561008), P(461418179, 658561951), P(461418924, 658562894), P(461418924, 658563837), P(461420416, 658565722), P(461429364, 658565722), P(461430109, 658566665), P(461430855, 658565722), P(461433092, 658568551), P(461433092, 658569494), P(461433838, 658570437), P(461434583, 658570437), P(461437566, 658572322), P(461438311, 658571380), P(461439057, 658572322), P(461439803, 658571380), P(461439803, 658570437), P(461440548, 658569494), P(461440548, 658568551), P(461440548, 658567608), P(461442040, 658565722), P(461443531, 658562894), P(461444277, 658563837), P(461444277, 658564780), P(461443531, 658565722), P(461443531, 658566665), P(461442785, 658567608), P(461442040, 658570437), P(461443531, 658572322), P(461443531, 658574208), P(461443531, 658575151), P(461445768, 658577980), P(461447259, 658578923), P(461447259, 658579865), P(461448005, 658581751), P(461448751, 658581751), P(461449496, 658582694), P(461452479, 658582694), P(461453225, 658581751), P(461453970, 658581751), P(461456207, 658581751), P(461456953, 658582694), P(461457698, 658582694), P(461457698, 658584580), P(461458444, 658585523), P(461459190, 658585523), P(461459935, 658586466), P(461460681, 658586466), P(461461427, 658587409), P(461462918, 658587409), P(461463664, 658588352), P(461463664, 658589295), P(461464409, 658591180), P(461465155, 658591180), P(461465901, 658592123), P(461466646, 658592123), P(461467392, 658592123), P(461468138, 658593066), P(461469629, 658594009), P(461470375, 658594009), P(461471120, 658594009), P(461471866, 658594952), P(461472612, 658594952), P(461473357, 658595895), P(461474849, 658596838), P(461476340, 658596838), P(461477085, 658596838), P(461477831, 658597781), P(461478577, 658597781), P(461479322, 658598724), P(461482305, 658601553), P(461483796, 658601553), P(461484542, 658602496), P(461486033, 658602496), P(461486779, 658602496), P(461487525, 658603439), P(461489762, 658603439), P(461490507, 658603439), P(461491253, 658604382), P(461492744, 658604382), P(461494236, 658605325), P(461498709, 658605325), P(461499455, 658605325), P(461500201, 658606268), P(461501692, 658606268), P(461507657, 658609097), P(461511751, 658608793), P(461514507, 658608419), P(461516636, 658608495), P(461518823, 658608661), P(461521066, 658608926), P(461522987, 658609097), P(461525060, 658609186), P(461526849, 658609186), P(461527973, 658609154), P(461530646, 658609097), P(461532434, 658609034), P(461533275, 658608850), P(461534501, 658609097), P(461536239, 658609229), P(461538217, 658609072), P(461540125, 658609704), P(461541957, 658610983), P(461543411, 658611533), P(461544934, 658611907), P(461547524, 658612305), P(461549692, 658612641), P(461552226, 658613172), P(461554539, 658613527), P(461556858, 658613243), P(461558362, 658612869), P(461561424, 658612655), P(461563189, 658611778), P(461562476, 658610864), P(461562525, 658610338), P(461568795, 658604963), P(461569325, 658604868), P(461569692, 658605461), P(461572422, 658604499), P(461572883, 658603883), P(461573685, 658603846), P(461574238, 658604326), P(461574412, 658605282), P(461575309, 658605163), P(461575259, 658604561), P(461575524, 658604301), P(461575793, 658604515), P(461575877, 658605352), P(461577672, 658607192), P(461579638, 658608338), P(461581457, 658608585), P(461583486, 658608490), P(461585635, 658607945), P(461587392, 658607414), P(461588896, 658606945), P(461590911, 658606338), P(461592586, 658605907), P(461593888, 658605566), P(461595089, 658605514), P(461596503, 658605249), P(461598633, 658604832), P(461600011, 658603875), P(461600933, 658602737), P(461601622, 658602079), P(461602943, 658602060), P(461604333, 658601623), P(461605610, 658601117), P(461606924, 658600586), P(461608914, 658599662), P(461609869, 658598851), P(461610615, 658598055), P(461611379, 658597662), P(461613483, 658596668), P(461615777, 658596838), P(461616523, 658595895), P(461617268, 658595895), P(461618014, 658595895), P(461618760, 658594952), P(461619505, 658594009), P(461621742, 658594009), P(461622488, 658593066), P(461623979, 658593066), P(461624725, 658592123), P(461630690, 658589295), P(461631436, 658590237), P(461632182, 658590237), P(461632927, 658590237), P(461633673, 658589295), P(461636655, 658589295), P(461637401, 658588352), P(461640384, 658588352), P(461641129, 658587409), P(461641875, 658587409), P(461642621, 658586466), P(461642621, 658585523), P(461643366, 658584580), P(461644858, 658582694), P(461647840, 658582694), P(461648586, 658581751), P(461649332, 658581751), P(461650077, 658580808), P(461650823, 658580808), P(461652314, 658580808), P(461653805, 658578923), P(461655297, 658578923), P(461656042, 658577980), P(461656788, 658577980), P(461657534, 658577037), P(461659771, 658575151), P(461663499, 658575151), P(461666482, 658572322), P(461667227, 658573265), P(461669464, 658573265), P(461670210, 658572322), P(461671701, 658571380), P(461673938, 658571380), P(461674684, 658572322), P(461676921, 658572322), P(461677666, 658571380), P(461679903, 658571380), P(461682886, 658572322), P(461683632, 658571380), P(461686614, 658571380), P(461687360, 658570437), P(461689597, 658570437), P(461692580, 658568551), P(461693325, 658568551), P(461694071, 658569494), P(461695562, 658569494), P(461697053, 658568551), P(461697799, 658569494), P(461698545, 658569494), P(461699290, 658570437), P(461700036, 658570437), P(461702273, 658572322), P(461703019, 658572322), P(461703764, 658571380), P(461704510, 658572322), P(461706747, 658573265), P(461708238, 658573265), P(461708984, 658572322), P(461709730, 658572322), P(461710818, 658572834), P(461713908, 658574810), P(461713754, 658575197), P(461715585, 658576916), P(461716254, 658576854), P(461716364, 658577471), P(461716224, 658578119), P(461717043, 658579923), P(461719644, 658584542), P(461721010, 658586692), P(461723105, 658588556), P(461724898, 658590294), P(461726024, 658591052), P(461726529, 658591228), P(461727319, 658591031), P(461727557, 658591265), P(461728240, 658591308), P(461728987, 658591301), P(461731639, 658592213), P(461734336, 658593066), P(461739393, 658594692), P(461744079, 658595601), P(461749187, 658596294), P(461751390, 658596528), P(461753057, 658596372), P(461754469, 658595895), P(461756804, 658594958), P(461760459, 658596134), P(461762057, 658596497), P(461764128, 658596497), P(461766160, 658596559), P(461772328, 658595878), P(461775449, 658595284), P(461778424, 658595020), P(461783667, 658594363), P(461786524, 658594116), P(461789926, 658593916), P(461791737, 658594338), P(461795387, 658595088), P(461796660, 658595501), P(461797717, 658595895), P(461798664, 658596352), P(461800159, 658596655), P(461801719, 658597525), P(461803682, 658597781), P(461804428, 658597781), P(461805919, 658599667), P(461806665, 658599667), P(461807410, 658600610), P(461808156, 658601553), P(461809647, 658601553), P(461810393, 658602496), P(461811138, 658602496), P(461812630, 658604382), P(461813375, 658604382), P(461814867, 658606268), P(461815612, 658606268), P(461816358, 658607211), P(461817104, 658608154), P(461817849, 658608154), P(461819341, 658609097), P(461820086, 658610040), P(461820832, 658610983), P(461824560, 658612869), P(461824560, 658613812), P(461825306, 658614755), P(461826052, 658614755), P(461827543, 658616641), P(461827543, 658619470), P(461828289, 658620413), P(461829034, 658622299), P(461831271, 658625128), P(461832017, 658625128), P(461836491, 658630786), P(461837236, 658631729), P(461837982, 658631729), P(461839473, 658632672), P(461839473, 658633615), P(461840219, 658634559), P(461840219, 658635502), P(461844693, 658641160), P(461845439, 658641160), P(461846930, 658643046), P(461848421, 658643990), P(461848421, 658644933), P(461851404, 658649648), P(461852895, 658649648), P(461853641, 658650591), P(461854386, 658650591), P(461856623, 658653421), P(461857369, 658654364), P(461860352, 658655307), P(461860352, 658658137), P(461862589, 658660966), P(461862589, 658661909), P(461863334, 658662852), P(461863334, 658663796), P(461865571, 658666625), P(461865571, 658670398), P(461865571, 658671341), P(461866317, 658672284), P(461867808, 658672284), P(461867808, 658676057), P(461867808, 658677000), P(461869300, 658678887), P(461870045, 658678887), P(461870045, 658680773), P(461873028, 658684546), P(461874519, 658685489), P(461874519, 658687376), P(461875265, 658688319), P(461875265, 658689262), P(461876010, 658690206), P(461876756, 658690206), P(461877502, 658691149), P(461878247, 658692092), P(461878247, 658693979), P(461880484, 658696809), P(461883467, 658701525), P(461883467, 658707185), P(461884213, 658708128), P(461884958, 658708128), P(461884958, 658713788), P(461886450, 658715675), P(461886450, 658716618), P(461885704, 658718505), P(461886450, 658719448), P(461886450, 658720392), P(461887195, 658722279), P(461887941, 658723222), P(461887195, 658724165), P(461887195, 658725109), P(461887941, 658726052), P(461888687, 658726052), P(461888687, 658731712), P(461890178, 658733599), P(461890178, 658736430), P(461891669, 658740203), P(461891669, 658742090), P(461890923, 658743034), P(461890923, 658743977), P(461891669, 658744920), P(461890923, 658745864), P(461890923, 658746807), P(461890178, 658747751), P(461890178, 658748694), P(461889432, 658748694), P(461888687, 658749638), P(461888687, 658750581), P(461888687, 658752468), P(461887941, 658752468), P(461887195, 658753412), P(461886450, 658754355), P(461886450, 658755299), P(461885704, 658756242), P(461884958, 658757186), P(461884958, 658758129), P(461884958, 658759073), P(461884213, 658760016), P(461881976, 658762847), P(461881976, 658772282), P(461881230, 658773225), P(461880484, 658775113), P(461880484, 658776056), P(461881230, 658777943), P(461879739, 658779830), P(461879739, 658780774), P(461878247, 658782661), P(461878993, 658783605), P(461877502, 658786435), P(461877502, 658788323), P(461878247, 658789266), P(461878247, 658793041), P(461878247, 658793984), P(461878993, 658794928), P(461879739, 658794928), P(461879739, 658800590), P(461881230, 658802477), P(461881230, 658803421), P(461881976, 658804364), P(461881976, 658806252) };
+P arrB11[] = {P(461887195, 658819463), P(461888687, 658819463), P(461888687, 658820407), P(461890178, 658822294),
+              P(461890178, 658823238), P(461891669, 658825125), P(461892415, 658825125), P(461893160, 658826069),
+              P(461893160, 658827013), P(461893906, 658827957), P(461894652, 658827957), P(461894652, 658828900),
+              P(461896143, 658830788), P(461899871, 658835506), P(461901363, 658835506), P(461902108, 658836450),
+              P(461902854, 658836450), P(461903600, 658836450), P(461905091, 658838338), P(461905837, 658840225),
+              P(461905837, 658841169), P(461904345, 658843057), P(461903600, 658844944), P(461903600, 658845888),
+              P(461903600, 658846832), P(461902854, 658847776), P(461903600, 658848719), P(461903600, 658850607),
+              P(461902854, 658851551), P(461902854, 658852495), P(461903600, 658856270), P(461902854, 658857214),
+              P(461902854, 658858158), P(461902108, 658859101), P(461902108, 658860989), P(461902108, 658861933),
+              P(461901363, 658861933), P(461900617, 658862877), P(461900617, 658863821), P(461898380, 658866652),
+              P(461898380, 658867596), P(461899126, 658868540), P(461899126, 658869484), P(461898380, 658870428),
+              P(461898380, 658872315), P(461897634, 658873259), P(461897634, 658876091), P(461897634, 658877035),
+              P(461896143, 658878923), P(461895397, 658879867), P(461896143, 658880811), P(461894652, 658885530),
+              P(461895417, 658891568), P(461895598, 658892269), P(461895608, 658892729), P(461895778, 658893077),
+              P(461896052, 658893644), P(461896148, 658894156), P(461896163, 658895039), P(461896263, 658895870),
+              P(461896508, 658896694), P(461896933, 658897419), P(461897294, 658897933), P(461897512, 658897955),
+              P(461897712, 658898260), P(461898059, 658898523), P(461898449, 658897685), P(461898681, 658897783),
+              P(461898561, 658898165), P(461898950, 658898693), P(461899573, 658898679), P(461899573, 658899149),
+              P(461900035, 658899197), P(461900060, 658899536), P(461899955, 658899552), P(461900275, 658899940),
+              P(461900557, 658900106), P(461900761, 658900086), P(461900773, 658900387), P(461900922, 658900399),
+              P(461901038, 658900573), P(461901202, 658900444), P(461901440, 658900710), P(461901296, 658900878),
+              P(461901460, 658901096), P(461901462, 658901523), P(461901812, 658901973), P(461902815, 658902734),
+              P(461902841, 658903174), P(461902948, 658903594), P(461903241, 658903969), P(461903328, 658904312),
+              P(461903147, 658904386), P(461903085, 658904683), P(461902608, 658904867), P(461902754, 658905262),
+              P(461902336, 658905481), P(461902237, 658905820), P(461901802, 658905821), P(461901585, 658906008),
+              P(461900406, 658906130), P(461900314, 658906289), P(461899928, 658906311), P(461899866, 658906210),
+              P(461898720, 658906260), P(461898700, 658906729), P(461898391, 658906775), P(461898378, 658906599),
+              P(461896739, 658906728), P(461896352, 658906477), P(461896015, 658906444), P(461895956, 658906609),
+              P(461895634, 658906563), P(461895488, 658906400), P(461895124, 658906505), P(461894620, 658906732),
+              P(461893957, 658907180), P(461893397, 658907639), P(461892690, 658908378), P(461892146, 658909144),
+              P(461890923, 658911068), P(461890153, 658912451), P(461889244, 658914682), P(461888714, 658916737),
+              P(461888394, 658918706), P(461888253, 658919329), P(461887904, 658919998), P(461887837, 658921357),
+              P(461887776, 658921917), P(461887505, 658922487), P(461886849, 658923502), P(461886686, 658924126),
+              P(461886478, 658924279), P(461886630, 658924819), P(461886547, 658925329), P(461885994, 658926536),
+              P(461886297, 658926672), P(461885601, 658927899), P(461884938, 658929823), P(461884483, 658930588),
+              P(461884408, 658931293), P(461884614, 658931474), P(461884633, 658931696), P(461884388, 658931959),
+              P(461884080, 658933256), P(461883621, 658934502), P(461883660, 658935396), P(461883547, 658935637),
+              P(461883294, 658935709), P(461883335, 658935951), P(461883107, 658936228), P(461882977, 658936571),
+              P(461883064, 658937030), P(461882803, 658937196), P(461882184, 658938336), P(461882244, 658938545),
+              P(461881818, 658939298), P(461881957, 658939447), P(461881872, 658939577), P(461881548, 658940939),
+              P(461882115, 658941598), P(461881962, 658942028), P(461881663, 658942376), P(461881693, 658944318),
+              P(461881580, 658944498), P(461881794, 658944540), P(461881798, 658945119), P(461881558, 658945579),
+              P(461881590, 658946199), P(461881332, 658946919), P(461881324, 658948073), P(461881246, 658948089),
+              P(461881242, 658948308), P(461881336, 658948416), P(461881072, 658948564), P(461881008, 658948941),
+              P(461881155, 658949057), P(461881136, 658949147), P(461880869, 658949203), P(461880556, 658949930),
+              P(461881004, 658950118), P(461880418, 658950140), P(461880380, 658950205), P(461880565, 658950599),
+              P(461880324, 658950764), P(461879770, 658951818), P(461879590, 658952640), P(461879297, 658952906),
+              P(461879289, 658953276), P(461878698, 658953663), P(461878162, 658953901), P(461877698, 658954186),
+              P(461877179, 658954616), P(461876765, 658955103), P(461876669, 658955634), P(461876333, 658956387),
+              P(461876098, 658957241), P(461875543, 658958242), P(461875470, 658959082), P(461875306, 658959192),
+              P(461875179, 658959824), P(461875239, 658960197), P(461875449, 658960434), P(461875287, 658960649),
+              P(461875026, 658960782), P(461875092, 658961166), P(461875003, 658961527), P(461874773, 658961729),
+              P(461874716, 658962069), P(461874477, 658962796), P(461874394, 658963611), P(461874722, 658964766),
+              P(461874836, 658965470), P(461874723, 658966275), P(461874201, 658967305), P(461873829, 658967805),
+              P(461873617, 658967780), P(461873033, 658968330), P(461871801, 658970076), P(461872029, 658970265),
+              P(461871972, 658970823), P(461871678, 658971602), P(461871482, 658971775), P(461871483, 658972499),
+              P(461871738, 658972729), P(461871553, 658972918), P(461871436, 658973632), P(461871642, 658973819),
+              P(461870358, 658976462), P(461870314, 658976742), P(461869765, 658977633), P(461869507, 658978225),
+              P(461868771, 658979691), P(461868744, 658981034), P(461868522, 658982514), P(461867925, 658983822),
+              P(461867726, 658984631), P(461867273, 658983964), P(461867380, 658985085), P(461867740, 658985424),
+              P(461868220, 658985728), P(461868378, 658986048), P(461867743, 658986842), P(461867444, 658987496),
+              P(461867484, 658988552), P(461867407, 658989739), P(461867105, 658990819), P(461866689, 658992072),
+              P(461866317, 658993159), P(461865626, 658995584), P(461864220, 658997920), P(461861828, 659001546),
+              P(461861681, 659002539), P(461860988, 659003364), P(461859626, 659003840), P(461857566, 659003744),
+              P(461856815, 659003587), P(461855993, 659003447), P(461855001, 659003362), P(461854255, 659003362),
+              P(461853298, 659003714), P(461852412, 659003998), P(461851076, 659004416), P(461850194, 659004278),
+              P(461848372, 659004245), P(461846619, 659004771), P(461845732, 659005450), P(461844174, 659006253),
+              P(461842914, 659006408), P(461841579, 659006195), P(461840474, 659006299), P(461839068, 659007104),
+              P(461837028, 659007907), P(461835614, 659009028), P(461834772, 659010051), P(461834102, 659010691),
+              P(461833593, 659011139), P(461833142, 659011538), P(461832632, 659011861), P(461830708, 659013262),
+              P(461829385, 659013658), P(461828857, 659013248), P(461828290, 659013235), P(461827761, 659013418),
+              P(461827316, 659013797), P(461826892, 659014323), P(461826410, 659014787), P(461825828, 659015530),
+              P(461825175, 659016583), P(461824429, 659017528), P(461823095, 659018933), P(461820967, 659019691),
+              P(461819369, 659020392), P(461818506, 659020902), P(461817782, 659021573), P(461817146, 659022136),
+              P(461816383, 659022467), P(461815183, 659022831), P(461813990, 659023194), P(461813177, 659023538),
+              P(461812111, 659023674), P(461811238, 659023600), P(461810292, 659023331), P(461807795, 659023220),
+              P(461806391, 659023239), P(461804724, 659023240), P(461804059, 659023235), P(461803224, 659023365),
+              P(461802240, 659023392), P(461801043, 659023498), P(461800630, 659023845), P(461799915, 659023965),
+              P(461799060, 659024404), P(461798228, 659025448), P(461797507, 659025975), P(461796561, 659026602),
+              P(461795761, 659027244), P(461794673, 659027655), P(461793881, 659028036), P(461792934, 659028629),
+              P(461792020, 659029178), P(461790620, 659029986), P(461789996, 659030221), P(461789359, 659030458),
+              P(461788574, 659031167), P(461788127, 659031922), P(461787267, 659032213), P(461786151, 659032380),
+              P(461784473, 659032219), P(461783422, 659032420), P(461781979, 659032402), P(461780889, 659031736),
+              P(461780087, 659031621), P(461778816, 659031954), P(461777587, 659031554), P(461775407, 659030348),
+              P(461774471, 659029805), P(461773725, 659029805), P(461772963, 659029512), P(461772220, 659029445),
+              P(461771135, 659029186), P(461770207, 659028850), P(461769171, 659028508), P(461767151, 659028300),
+              P(461765555, 659028367), P(461764105, 659028578), P(461762275, 659029004), P(461760857, 659029199),
+              P(461759557, 659029805), P(461758326, 659030722), P(461756942, 659031226), P(461754612, 659032539),
+              P(461751700, 659033674), P(461750033, 659033461), P(461747705, 659033074), P(461744833, 659033224),
+              P(461742190, 659033725), P(461740828, 659033987), P(461739873, 659034941), P(461738771, 659035752),
+              P(461737567, 659035786), P(461735996, 659035560), P(461732996, 659035720), P(461727454, 659037748),
+              P(461726686, 659037703), P(461725775, 659037392), P(461725068, 659037573), P(461724148, 659038034),
+              P(461723382, 659038020), P(461722628, 659037695), P(461721118, 659037439), P(461719959, 659037562),
+              P(461718546, 659037360), P(461717871, 659037362), P(461716247, 659037084), P(461716027, 659037503),
+              P(461715532, 659037792), P(461714748, 659037903), P(461713983, 659037509), P(461713267, 659037047),
+              P(461712371, 659036699), P(461711353, 659036317), P(461709894, 659036120), P(461708543, 659035754),
+              P(461707247, 659035319), P(461706044, 659035106), P(461705324, 659035288), P(461704574, 659035338),
+              P(461702888, 659034527), P(461701182, 659034124), P(461698548, 659034296), P(461697316, 659033850),
+              P(461694536, 659033259), P(461693363, 659034295), P(461692059, 659035005), P(461690915, 659035112),
+              P(461689497, 659034591), P(461688377, 659034233), P(461686886, 659034023), P(461685335, 659032987),
+              P(461684004, 659032477), P(461682777, 659032021), P(461681219, 659031415), P(461679771, 659030720),
+              P(461678927, 659030529), P(461678131, 659030199), P(461677225, 659029727), P(461676416, 659029408),
+              P(461675451, 659029026), P(461674809, 659028730), P(461674198, 659028519), P(461673438, 659028290),
+              P(461672684, 659028104), P(461671934, 659028047), P(461671150, 659027621), P(461670079, 659026972),
+              P(461669180, 659026692), P(461668337, 659026476), P(461667465, 659025834), P(461666403, 659025412),
+              P(461665404, 659025159), P(461663782, 659024911), P(461662900, 659024874), P(461662124, 659024959),
+              P(461661313, 659025138), P(461660686, 659025264), P(461660075, 659024802), P(461658940, 659024977),
+              P(461658041, 659025504), P(461656979, 659025434), P(461656217, 659024413), P(461655183, 659024035),
+              P(461652435, 659023267), P(461651190, 659022947), P(461649667, 659023322), P(461648403, 659023667),
+              P(461647456, 659023053), P(461646646, 659022720), P(461645647, 659022560), P(461644755, 659022234),
+              P(461644144, 659022144), P(461643059, 659021830), P(461642057, 659021629), P(461641120, 659021693),
+              P(461640294, 659021945), P(461639289, 659021667), P(461638438, 659021648), P(461637622, 659021699),
+              P(461636838, 659021517), P(461635772, 659021216), P(461634604, 659020707), P(461633014, 659020230),
+              P(461631817, 659019792), P(461630688, 659019385), P(461629193, 659018790), P(461628134, 659018103),
+              P(461626921, 659017309), P(461625043, 659016403), P(461623667, 659016109), P(461622504, 659015534),
+              P(461621470, 659015382), P(461620435, 659015099), P(461618635, 659015002), P(461617243, 659015122),
+              P(461615841, 659015465), P(461614121, 659016465), P(461612281, 659016078), P(461610272, 659015651),
+              P(461608680, 659015651), P(461608694, 659016118), P(461608251, 659015949), P(461607352, 659015863),
+              P(461606854, 659016360), P(461605822, 659016392), P(461604665, 659017006), P(461603980, 659016712),
+              P(461603582, 659016392), P(461602374, 659015989), P(461600984, 659015832), P(461599230, 659015762),
+              P(461597435, 659015697), P(461594676, 659015842), P(461593736, 659015619), P(461592945, 659015778),
+              P(461592627, 659016810), P(461592153, 659017186), P(461591769, 659017635), P(461591353, 659017537),
+              P(461591868, 659016578), P(461592060, 659016114), P(461591366, 659015642), P(461590119, 659015561),
+              P(461588275, 659015494), P(461587107, 659016074), P(461586179, 659016035), P(461585227, 659015986),
+              P(461584241, 659016133), P(461583251, 659016067), P(461581883, 659016232), P(461580600, 659016583),
+              P(461579961, 659017058), P(461579070, 659017216), P(461578300, 659017474), P(461577531, 659018035),
+              P(461576718, 659018475), P(461575632, 659018979), P(461574300, 659019254), P(461572524, 659019926),
+              P(461570876, 659019810), P(461569582, 659019688), P(461568857, 659019707), P(461567721, 659020011),
+              P(461565800, 659021232), P(461564278, 659021568), P(461563299, 659021645), P(461562097, 659021965),
+              P(461561100, 659022086), P(461560230, 659022229), P(461559609, 659022305), P(461558617, 659022275),
+              P(461557260, 659022603), P(461556385, 659022838), P(461555248, 659023194), P(461553819, 659023968),
+              P(461552192, 659024565), P(461551022, 659025258), P(461550438, 659025794), P(461549894, 659026376),
+              P(461549160, 659026736), P(461548336, 659027254), P(461547792, 659027916), P(461545142, 659028342),
+              P(461544766, 659028640), P(461544478, 659029285), P(461543836, 659029403), P(461542795, 659029077),
+              P(461540483, 659029221), P(461538056, 659029576), P(461537000, 659029901), P(461535861, 659030749),
+              P(461535628, 659031666), P(461534566, 659032966), P(461533536, 659034382), P(461532923, 659035030),
+              P(461532588, 659035638), P(461531929, 659036480), P(461531312, 659036949), P(461530635, 659037579),
+              P(461530116, 659038248), P(461529736, 659038701), P(461528913, 659039463), P(461528063, 659040392),
+              P(461527659, 659041138), P(461524177, 659044498), P(461522955, 659044872), P(461521734, 659044872),
+              P(461520948, 659044916), P(461520158, 659044669), P(461519561, 659044389), P(461518711, 659043971),
+              P(461517220, 659043027), P(461515756, 659042541), P(461514963, 659042789), P(461513492, 659042082),
+              P(461510958, 659040171), P(461509273, 659039344), P(461508131, 659038866), P(461506963, 659038406),
+              P(461505948, 659037826), P(461504195, 659036789), P(461502780, 659036224), P(461501219, 659035927),
+              P(461500345, 659036096), P(461499800, 659036861), P(461499075, 659037810), P(461498715, 659038339),
+              P(461498408, 659039078), P(461498171, 659039010), P(461498076, 659038405), P(461498558, 659037696),
+              P(461498491, 659037315), P(461498224, 659037288), P(461497723, 659037179), P(461497087, 659036416),
+              P(461495596, 659036416), P(461493628, 659035400), P(461492796, 659035451), P(461491922, 659035441),
+              P(461491225, 659035040), P(461488935, 659035029), P(461487429, 659035277), P(461486642, 659035496),
+              P(461484207, 659037470), P(461484351, 659038014), P(461483889, 659038392), P(461483148, 659039025),
+              P(461481669, 659039856), P(461479946, 659040017), P(461478780, 659040594), P(461478226, 659040854),
+              P(461477764, 659041197), P(461477279, 659040965), P(461476448, 659040091), P(461475184, 659038904),
+              P(461474068, 659038267), P(461473333, 659037622), P(461473127, 659036662), P(461472183, 659035958),
+              P(461471405, 659034904), P(461470673, 659033833), P(461469732, 659033360), P(461469261, 659032680),
+              P(461468697, 659032140), P(461467261, 659030749), P(461465560, 659030174), P(461463460, 659030157),
+              P(461461743, 659030453), P(461460550, 659030749), P(461459805, 659030749), P(461458810, 659031008),
+              P(461458424, 659031581), P(461457508, 659032061), P(461457623, 659032442), P(461458108, 659032318),
+              P(461458551, 659032472), P(461457440, 659033510), P(461456415, 659033950), P(461455266, 659034122),
+              P(461455034, 659033606), P(461455693, 659033118), P(461455713, 659032869), P(461455573, 659032749),
+              P(461454471, 659032984), P(461453924, 659032986), P(461453094, 659031694), P(461452348, 659030749),
+              P(461451516, 659030432), P(461451025, 659029720), P(461450199, 659029721), P(461449365, 659027916),
+              P(461448648, 659027496), P(461447522, 659025992), P(461446778, 659025048), P(461446015, 659024616),
+              P(461445199, 659023840), P(461444802, 659023388), P(461444477, 659022869), P(461443853, 659022059),
+              P(461442727, 659021877), P(461442176, 659021553), P(461440778, 659021026), P(461439559, 659020565),
+              P(461438450, 659020400), P(461437566, 659020544), P(461436508, 659021118), P(461434994, 659022323),
+              P(461434450, 659023313), P(461433295, 659023819), P(461432399, 659024406), P(461430855, 659025266),
+              P(461430109, 659025266), P(461429386, 659025377), P(461428586, 659025272), P(461427557, 659025232),
+              P(461426114, 659025069), P(461424799, 659024266), P(461424066, 659022678), P(461423616, 659021614),
+              P(461423152, 659020921), P(461420901, 659020433), P(461419060, 659020512), P(461418204, 659020765),
+              P(461417325, 659021190), P(461416116, 659021925), P(461415196, 659022433), P(461414789, 659022950),
+              P(461413705, 659023378), P(461411887, 659024731), P(461410476, 659025541), P(461410580, 659026802),
+              P(461409423, 659027485), P(461407706, 659028221), P(461406340, 659028848), P(461404989, 659029256),
+              P(461403325, 659029427), P(461402292, 659029392), P(461401423, 659029582), P(461400357, 659029625),
+              P(461399165, 659029619), P(461397789, 659029249), P(461396887, 659028441), P(461396061, 659028211),
+              P(461394991, 659028046), P(461394042, 659028014), P(461393597, 659028126), P(461391931, 659028862),
+              P(461391090, 659029075), P(461389700, 659029318), P(461388268, 659029702), P(461386761, 659030334),
+              P(461386378, 659031345), P(461385631, 659032089), P(461385498, 659032606), P(461385281, 659033250),
+              P(461385154, 659033581), P(461384642, 659033488), P(461384388, 659033096), P(461383932, 659033051),
+              P(461383548, 659033982), P(461383176, 659034328), P(461382951, 659033979), P(461382708, 659033918),
+              P(461382229, 659034721), P(461379207, 659037181), P(461377876, 659038028), P(461376245, 659038582),
+              P(461375690, 659038861), P(461375556, 659039198), P(461375525, 659039632), P(461374983, 659039971),
+              P(461374596, 659039198), P(461374192, 659039554), P(461373388, 659039803), P(461372023, 659040985),
+              P(461371629, 659041590), P(461371530, 659042179), P(461371650, 659042678), P(461371941, 659043149),
+              P(461371698, 659043469), P(461371146, 659042966), P(461370863, 659042597), P(461370621, 659042819),
+              P(461370773, 659043166), P(461370625, 659044043), P(461370157, 659043629), P(461369719, 659043741),
+              P(461369503, 659044138), P(461369008, 659044488), P(461368735, 659044297), P(461367842, 659044498),
+              P(461367260, 659044738), P(461366804, 659045050), P(461366615, 659045213), P(461366412, 659045249),
+              P(461366433, 659045654), P(461366768, 659046077), P(461366751, 659046590), P(461366399, 659047081),
+              P(461365792, 659047721), P(461365537, 659047806), P(461365380, 659048020), P(461365572, 659048253),
+              P(461365857, 659048342), P(461365872, 659048637), P(461365460, 659048793), P(461365279, 659049278),
+              P(461365311, 659049696), P(461365661, 659050177), P(461365511, 659050882), P(461365692, 659051681),
+              P(461365608, 659052668), P(461365803, 659054085), P(461365623, 659054356), P(461365740, 659054825),
+              P(461365285, 659055136), P(461364965, 659056579), P(461364532, 659056571), P(461364476, 659057118),
+              P(461364479, 659057758), P(461364871, 659058301), P(461365172, 659059169), P(461365551, 659059379),
+              P(461365906, 659059880), P(461365621, 659060157), P(461365111, 659060101), P(461364845, 659059928),
+              P(461364269, 659059569), P(461363737, 659059326), P(461363423, 659058846), P(461363032, 659058836),
+              P(461362962, 659059099), P(461363586, 659059430), P(461364100, 659060025), P(461364551, 659060374),
+              P(461365159, 659061021), P(461365794, 659061686), P(461365722, 659062490), P(461365432, 659062765),
+              P(461364853, 659062502), P(461364185, 659061593), P(461363997, 659061102), P(461363469, 659060817),
+              P(461363167, 659060606), P(461362493, 659060705), P(461362194, 659060297), P(461361925, 659059977),
+              P(461361423, 659059947), P(461361192, 659060616), P(461361240, 659061678), P(461360626, 659062174),
+              P(461360635, 659062587), P(461360600, 659063187), P(461360373, 659063482), P(461360917, 659064475),
+              P(461360890, 659065204), P(461360644, 659065322), P(461359461, 659064433), P(461359351, 659063776),
+              P(461359253, 659063198), P(461358858, 659062400), P(461359045, 659060849), P(461358967, 659060190),
+              P(461358567, 659059859), P(461357988, 659060456), P(461356884, 659060718), P(461356109, 659061134),
+              P(461355737, 659061734), P(461355418, 659061628), P(461355498, 659060091), P(461354904, 659059448),
+              P(461354298, 659058957), P(461354039, 659058722), P(461353506, 659058042), P(461352853, 659057222),
+              P(461352245, 659055856), P(461350941, 659054699), P(461350092, 659054278), P(461349365, 659053931),
+              P(461347730, 659053036), P(461346084, 659052387), P(461345053, 659051859), P(461344237, 659051182),
+              P(461343836, 659051562), P(461343589, 659052190), P(461342394, 659050753), P(461341621, 659050283),
+              P(461339663, 659049758), P(461338063, 659049429), P(461336992, 659047971), P(461337050, 659046874),
+              P(461336551, 659046150), P(461337165, 659045366), P(461337437, 659044057), P(461338031, 659042368),
+              P(461337461, 659040565), P(461336872, 659038270), P(461335962, 659036209), P(461335457, 659034492),
+              P(461335711, 659033392), P(461334514, 659032140), P(461334143, 659031070), P(461333295, 659030294),
+              P(461333671, 659029238), P(461333183, 659027571), P(461331469, 659025236), P(461330034, 659022260),
+              P(461330546, 659021438), P(461330023, 659020686), P(461329257, 659019472), P(461328418, 659019102),
+              P(461327471, 659019027), P(461326647, 659018390), P(461325799, 659017326), P(461325210, 659016851),
+              P(461324991, 659016128), P(461324999, 659015086), P(461324489, 659014721), P(461323948, 659014373),
+              P(461323101, 659014562), P(461322255, 659014257), P(461321700, 659013675), P(461321269, 659013398),
+              P(461320791, 659013038), P(461320021, 659012979), P(461319313, 659012885), P(461317136, 659013288),
+              P(461316309, 659013032), P(461315018, 659012336), P(461313509, 659011523), P(461311652, 659010670),
+              P(461310652, 659010891), P(461308436, 659011085), P(461306741, 659010328), P(461306097, 659009934),
+              P(461305586, 659009155), P(461305224, 659007574), P(461304741, 659005568), P(461304146, 659004360),
+              P(461301783, 659001750), P(461300813, 659000136), P(461298834, 658998652), P(461297352, 658998333),
+              P(461294749, 658999080), P(461292389, 658999702), P(461291800, 658998489), P(461291140, 658997781),
+              P(461290450, 658997395), P(461289516, 658995939), P(461288786, 658994782), P(461287130, 658993800),
+              P(461285549, 658992777), P(461283841, 658992149), P(461281730, 658990757), P(461280528, 658990134),
+              P(461278863, 658989928), P(461277586, 658990400), P(461276975, 658990704), P(461275096, 658989275),
+              P(461273228, 658988534), P(461272351, 658988413), P(461271868, 658988430), P(461271021, 658988909),
+              P(461270274, 658988744), P(461269324, 658988181), P(461268352, 658987702), P(461267465, 658987350),
+              P(461266056, 658986710), P(461264589, 658986070), P(461262572, 658985781), P(461262141, 658986058),
+              P(461261151, 658985570), P(461259355, 658985604), P(461258775, 658986174), P(461258263, 658986106),
+              P(461257980, 658986299), P(461257437, 658987233), P(461257010, 658988171), P(461255807, 658988574),
+              P(461255097, 658988571), P(461254650, 658988241), P(461254944, 658987414), P(461255109, 658986272),
+              P(461254783, 658986059), P(461253178, 658986774), P(461252410, 658986915), P(461251228, 658986331),
+              P(461250426, 658985640), P(461249924, 658985090), P(461249330, 658985057), P(461248781, 658984310),
+              P(461247962, 658983429), P(461247668, 658983166), P(461246074, 658984161), P(461245940, 658983649),
+              P(461245813, 658982897), P(461245956, 658981480), P(461245144, 658980816), P(461244424, 658980185),
+              P(461243906, 658979635), P(461243404, 658978528), P(461243010, 658977878), P(461242263, 658977517),
+              P(461241618, 658977326), P(461240711, 658976718), P(461239618, 658976352), P(461238789, 658975717),
+              P(461237879, 658975203), P(461236951, 658973405), P(461236151, 658972531), P(461235234, 658971166),
+              P(461233628, 658969854), P(461231437, 658968104), P(461229741, 658966987), P(461228909, 658966600),
+              P(461227752, 658966563), P(461226876, 658966501), P(461226338, 658966304), P(461226172, 658965691),
+              P(461226023, 658965139), P(461225495, 658964795), P(461224876, 658964633), P(461224540, 658965329),
+              P(461224244, 658965658), P(461223925, 658965704), P(461224228, 658964929), P(461224039, 658964629),
+              P(461223455, 658964574), P(461223117, 658964763), P(461222186, 658964190), P(461221643, 658963891),
+              P(461221495, 658963035), P(461220119, 658962933), P(461218888, 658962777), P(461217598, 658962943),
+              P(461216793, 658962722), P(461216124, 658962441), P(461215240, 658961930), P(461214165, 658961286),
+              P(461213271, 658960790), P(461210330, 658960126), P(461208380, 658959805), P(461205063, 658959744),
+              P(461204113, 658960165), P(461203543, 658960826), P(461202911, 658962214), P(461200989, 658961627),
+              P(461198872, 658959355), P(461197037, 658957766), P(461195538, 658956430), P(461194524, 658955573),
+              P(461193968, 658954779), P(461192601, 658953861), P(461191209, 658953160), P(461190596, 658952712),
+              P(461189897, 658952416), P(461189306, 658952475), P(461188850, 658952762), P(461186308, 658952483),
+              P(461184991, 658952339), P(461183023, 658952129), P(461182231, 658952898), P(461181714, 658953302),
+              P(461181285, 658953214), P(461181341, 658951770), P(461180423, 658950307), P(461179130, 658949400),
+              P(461178943, 658948734), P(461178388, 658947974), P(461177692, 658947678), P(461176668, 658947360),
+              P(461176064, 658947208), P(461175111, 658947088), P(461173999, 658946827), P(461172953, 658947034),
+              P(461172599, 658946600), P(461171936, 658946325), P(461171127, 658945874), P(461170418, 658945346),
+              P(461169441, 658944194), P(461168497, 658943510), P(461167796, 658942963), P(461166743, 658942235),
+              P(461165935, 658941861), P(461164970, 658940989), P(461161167, 658939574), P(461159186, 658939338),
+              P(461158266, 658938253), P(461157609, 658938099), P(461156386, 658938330), P(461155138, 658938520),
+              P(461154221, 658938786), P(461153722, 658939097), P(461153092, 658939754), P(461152719, 658940301),
+              P(461152700, 658940838), P(461153010, 658941306), P(461152456, 658942225), P(461152685, 658942573),
+              P(461153061, 658942451), P(461153536, 658941999), P(461154032, 658941903), P(461154509, 658941938),
+              P(461155164, 658942079), P(461156079, 658942733), P(461157128, 658946869), P(461156192, 658946434),
+              P(461156269, 658948190), P(461156028, 658948763), P(461155336, 658949237), P(461155031, 658949579),
+              P(461153871, 658947821), P(461154463, 658946470), P(461153629, 658946562), P(461152956, 658947656),
+              P(461152981, 658948035), P(461152732, 658948437), P(461152447, 658947518), P(461152044, 658947171),
+              P(461151296, 658946059), P(461150289, 658946443), P(461149092, 658947803), P(461148634, 658946619),
+              P(461148202, 658946774), P(461147993, 658945810), P(461147469, 658945686), P(461147172, 658946115),
+              P(461146394, 658946667), P(461146514, 658947288), P(461145066, 658948043), P(461143661, 658948341),
+              P(461142946, 658947694), P(461142554, 658947171), P(461141957, 658947051), P(461140815, 658946386),
+              P(461140415, 658945139), P(461139503, 658944952), P(461138791, 658945051), P(461138220, 658945349),
+              P(461136927, 658945488), P(461137405, 658945731), P(461138109, 658945662), P(461138802, 658945402),
+              P(461138725, 658945783), P(461137591, 658946373), P(461137324, 658947061), P(461136530, 658947317),
+              P(461136652, 658947677), P(461135871, 658948394), P(461135295, 658948158), P(461135023, 658947709),
+              P(461133205, 658948407), P(461132645, 658948709), P(461132743, 658949210), P(461133166, 658949769),
+              P(461132682, 658950084), P(461132257, 658950362), P(461132004, 658950667), P(461131863, 658950362),
+              P(461131441, 658950331), P(461131255, 658950621), P(461130719, 658950635), P(461130655, 658949790),
+              P(461131141, 658948888), P(461131968, 658948301), P(461132516, 658948307), P(461132912, 658947734),
+              P(461133772, 658947606), P(461134794, 658947163), P(461136306, 658946230), P(461136207, 658945779),
+              P(461132916, 658946768), P(461132079, 658946083), P(461131271, 658945090), P(461130537, 658943445),
+              P(461130362, 658943965), P(461129959, 658944017), P(461129370, 658943310), P(461129444, 658942534),
+              P(461129290, 658942112), P(461128877, 658941653), P(461128786, 658941053), P(461127957, 658941921),
+              P(461127732, 658942597), P(461127610, 658943894), P(461127469, 658944250), P(461127173, 658944597),
+              P(461126857, 658944437), P(461126292, 658943054), P(461125895, 658942194), P(461125377, 658941408),
+              P(461124525, 658940837), P(461124404, 658939773), P(461124343, 658938963), P(461122914, 658938208),
+              P(461121970, 658937464), P(461121738, 658937920), P(461121493, 658938048), P(461120351, 658938079),
+              P(461119728, 658938272), P(461119081, 658938005), P(461118569, 658937439), P(461118266, 658936763),
+              P(461117783, 658936154), P(461117373, 658936318), P(461116734, 658936063), P(461116457, 658935217),
+              P(461116600, 658934780), P(461116489, 658934391), P(461116563, 658933564), P(461116252, 658933246),
+              P(461116187, 658932406), P(461116470, 658932239), P(461117196, 658933417), P(461117621, 658933375),
+              P(461117230, 658932253), P(461117048, 658931622), P(461116561, 658931306), P(461115901, 658931127),
+              P(461115181, 658930254), P(461114761, 658929015), P(461114470, 658927604), P(461113777, 658926239),
+              P(461112963, 658925351), P(461111579, 658924228), P(461110969, 658923290), P(461109304, 658922178),
+              P(461108603, 658921617), P(461107998, 658921105), P(461107121, 658920332), P(461106061, 658919338),
+              P(461105194, 658918354), P(461103174, 658916382), P(461101619, 658915015), P(461100957, 658914754),
+              P(461100241, 658914348), P(461099003, 658913969), P(461097005, 658913446), P(461095917, 658913564),
+              P(461094973, 658913730), P(461093806, 658914055), P(461092288, 658914226), P(461091261, 658913937),
+              P(461090264, 658913687), P(461088960, 658913534), P(461087808, 658913156), P(461087125, 658912996),
+              P(461085976, 658912729), P(461084939, 658912598), P(461084126, 658912905), P(461082248, 658913588),
+              P(461080981, 658914175), P(461079758, 658914940), P(461078395, 658915268), P(461076827, 658915276),
+              P(461075608, 658915204), P(461074315, 658914668), P(461073273, 658914310), P(461071896, 658914343),
+              P(461070718, 658914151), P(461069808, 658914218), P(461068726, 658914407), P(461066832, 658915145),
+              P(461065723, 658914705), P(461064373, 658915719), P(461063928, 658915268), P(461063291, 658915108),
+              P(461062902, 658915625), P(461062459, 658916388), P(461062291, 658916873), P(461061756, 658916681),
+              P(461061556, 658917487), P(461060098, 658917085), P(461059762, 658917248), P(461059482, 658916866),
+              P(461059497, 658916630), P(461059199, 658916350), P(461058677, 658916502), P(461057692, 658916866),
+              P(461056284, 658917219), P(461055975, 658916279), P(461056365, 658915384), P(461057106, 658915405),
+              P(461057300, 658915037), P(461056850, 658914782), P(461057113, 658911210), P(461056762, 658910067),
+              P(461056298, 658909405), P(461055493, 658908703), P(461055108, 658908003), P(461054532, 658907517),
+              P(461053964, 658907608), P(461053396, 658908227), P(461052978, 658908205), P(461052743, 658906765),
+              P(461052232, 658906189), P(461051508, 658906349), P(461050589, 658906670), P(461049967, 658907347),
+              P(461049080, 658907241), P(461048199, 658906357), P(461047916, 658906966), P(461047677, 658907056),
+              P(461047593, 658907664), P(461047432, 658908485), P(461046964, 658908392), P(461045624, 658905675),
+              P(461045450, 658906640), P(461044629, 658905678), P(461044292, 658905552), P(461043754, 658905990),
+              P(461043115, 658906297), P(461041983, 658906624), P(461039263, 658906976), P(461037919, 658906720),
+              P(461036415, 658905792), P(461035583, 658905120), P(461034781, 658904129), P(461034847, 658902656),
+              P(461035039, 658901504), P(461034655, 658900640), P(461034107, 658900195), P(461033435, 658899971),
+              P(461032767, 658899872), P(461032191, 658899968), P(461031930, 658900633), P(461032128, 658901382),
+              P(461031665, 658901760), P(461031077, 658902038), P(461030388, 658902055), P(461029804, 658901802),
+              P(461029476, 658902294), P(461029493, 658902746), P(461030439, 658903465), P(461030572, 658903978),
+              P(461029882, 658904301), P(461029428, 658904194), P(461028954, 658904126), P(461028460, 658904579),
+              P(461028447, 658905107), P(461027957, 658906118), P(461026710, 658907241), P(461026476, 658907706),
+              P(461026497, 658908755), P(461026754, 658909237), P(461027324, 658909835), P(461027761, 658910265),
+              P(461027764, 658911480), P(461027821, 658912838), P(461027889, 658914384), P(461027669, 658914456),
+              P(461027210, 658911950), P(461026452, 658912478), P(461026018, 658912877), P(461026141, 658914605),
+              P(461026410, 658915829), P(461026445, 658917047), P(461026199, 658917627), P(461026364, 658918259),
+              P(461027061, 658918870), P(461027919, 658919498), P(461028416, 658920478), P(461027945, 658921717),
+              P(461028029, 658922256), P(461028416, 658922613), P(461029624, 658922422), P(461029869, 658923991),
+              P(461029344, 658924176), P(461029167, 658924462), P(461029596, 658924901), P(461029741, 658925397),
+              P(461030076, 658925533), P(461030043, 658925846), P(461030277, 658926342), P(461030439, 658927066),
+              P(461030789, 658928368), P(461030565, 658929419), P(461030016, 658929739), P(461029533, 658929882),
+              P(461029113, 658929946), P(461028988, 658929562), P(461029465, 658929368), P(461029921, 658929015),
+              P(461030394, 658928059), P(461030013, 658928275), P(461028541, 658928623), P(461028188, 658928237),
+              P(461028469, 658927312), P(461027583, 658927531), P(461026599, 658927797), P(461024842, 658928520),
+              P(461024733, 658928909), P(461025725, 658929234), P(461026684, 658929309), P(461027225, 658930088),
+              P(461027376, 658931186), P(461027442, 658931605), P(461027327, 658931926), P(461027546, 658932276),
+              P(461027703, 658933283), P(461025861, 658934226), P(461025137, 658934614), P(461024269, 658936355),
+              P(461024121, 658935960), P(461024260, 658935000), P(461023658, 658934170), P(461023192, 658934534),
+              P(461022765, 658934962), P(461022117, 658935456), P(461020908, 658935471), P(461019535, 658934872),
+              P(461018436, 658934736), P(461017439, 658934622), P(461014780, 658935563), P(461014034, 658934619),
+              P(461013289, 658934619), P(461012607, 658935102), P(461010309, 658933651), P(461009626, 658934555),
+              P(461008285, 658933885), P(461007871, 658932958), P(461008061, 658931006), P(461007034, 658931098),
+              P(461006237, 658928573), P(461006335, 658925950), P(461004667, 658924861), P(461008815, 658925178),
+              P(461009279, 658924157), P(461009528, 658923190), P(461009023, 658922237), P(461008127, 658922590),
+              P(461007328, 658922373), P(461006781, 658921757), P(461006879, 658920830), P(461007259, 658919837),
+              P(461007967, 658919198), P(461008152, 658918750), P(461008219, 658918365), P(461007480, 658918008),
+              P(461007359, 658917246), P(461006578, 658917625), P(461003165, 658918494), P(461000703, 658917726),
+              P(460998879, 658915998), P(460998175, 658913598), P(460997597, 658913373), P(460997823, 658911838),
+              P(460998590, 658912174), P(460998975, 658911710), P(460999359, 658912126), P(460999867, 658911961),
+              P(460998975, 658910558), P(460998207, 658908222), P(460997277, 658909533), P(460996616, 658909718),
+              P(460996991, 658908574), P(460996191, 658908990), P(460995752, 658909750), P(460995069, 658909150),
+              P(460996127, 658907136), P(460997051, 658905923), P(460996125, 658905889), P(460995263, 658905664),
+              P(460994655, 658904928), P(460994015, 658903776), P(460993759, 658902432), P(460993855, 658900832),
+              P(460992698, 658900449), P(460991885, 658899695), P(460991387, 658899234), P(460991176, 658899702),
+              P(460990783, 658899712), P(460990559, 658899232), P(460990303, 658899200), P(460990173, 658899689),
+              P(460989599, 658900384), P(460989311, 658900992), P(460988607, 658902144), P(460987583, 658902368),
+              P(460986495, 658902720), P(460984863, 658902688), P(460984296, 658902230), P(460983743, 658901760),
+              P(460983133, 658901122), P(460981532, 658901312), P(460980061, 658901312), P(460978243, 658901577),
+              P(460975423, 658902912), P(460971648, 658905568), P(460972095, 658906720), P(460972743, 658907288),
+              P(460973407, 658907870), P(460974428, 658908768), P(460972837, 658908633), P(460973787, 658909981),
+              P(460973432, 658911899), P(460973215, 658912382), P(460972861, 658912478), P(460972251, 658909949),
+              P(460971616, 658909502), P(460971749, 658911542), P(460971202, 658912094), P(460970858, 658909814),
+              P(460970560, 658909886), P(460970400, 658911134), P(460969952, 658911390), P(460969794, 658912318),
+              P(460968607, 658911296), P(460967898, 658911298), P(460967349, 658910977), P(460967231, 658909952),
+              P(460966453, 658909568), P(460966176, 658912978), P(460965887, 658914560), P(460965082, 658915938),
+              P(460964671, 658914273), P(460964604, 658914946), P(460964188, 658915010), P(460963805, 658915394),
+              P(460963847, 658917362), P(460963644, 658918466), P(460962679, 658919207), P(460961815, 658918458),
+              P(460961791, 658917056), P(460962303, 658911296), P(460961833, 658912433), P(460961465, 658911685),
+              P(460961116, 658911780), P(460961241, 658912517), P(460961079, 658913508), P(460960607, 658912704),
+              P(460960119, 658912737), P(460959735, 658912968), P(460959602, 658914793), P(460958908, 658916290),
+              P(460957948, 658915810), P(460957308, 658916132), P(460956671, 658916704), P(460956093, 658916768),
+              P(460955391, 658917536), P(460953207, 658917730), P(460953404, 658916226), P(460953532, 658915233),
+              P(460953466, 658914277), P(460953599, 658912897), P(460953695, 658910721), P(460953183, 658909056),
+              P(460952447, 658908481), P(460951743, 658905888), P(460952602, 658905925), P(460951551, 658905184),
+              P(460951743, 658904193), P(460952349, 658902784), P(460953146, 658901026), P(460951743, 658900289),
+              P(460949791, 658900001), P(460949162, 658899689), P(460947999, 658899808), P(460946431, 658899649),
+              P(460944088, 658899232), P(460943197, 658899689), P(460940581, 658901266), P(460939391, 658901888),
+              P(460937978, 658902521), P(460936486, 658903465), P(460934995, 658904409), P(460934249, 658905353),
+              P(460931267, 658908185), P(460930521, 658908185), P(460928415, 658909568), P(460926109, 658910369),
+              P(460924223, 658911521), P(460922111, 658912544), P(460920607, 658913792), P(460919039, 658913889),
+              P(460917631, 658914113), P(460917055, 658912032), P(460915932, 658910276), P(460914559, 658909633),
+              P(460912991, 658909345), P(460911549, 658908770), P(460910335, 658908353), P(460909567, 658908001),
+              P(460908639, 658907648), P(460907541, 658907653), P(460906847, 658907361), P(460906079, 658907200),
+              P(460905436, 658907012), P(460904186, 658907076), P(460902932, 658907241), P(460902186, 658907241),
+              P(460899615, 658908513), P(460897471, 658909857), P(460896831, 658911072), P(460896255, 658912129),
+              P(460896127, 658912960), P(460895839, 658913696), P(460895423, 658916001), P(460895167, 658916609),
+              P(460895039, 658917505), P(460893887, 658919617), P(460893238, 658921402), P(460892493, 658921402),
+              P(460891747, 658922346), P(460891001, 658922346), P(460890256, 658923290), P(460889510, 658924234),
+              P(460888764, 658924234), P(460888019, 658924234), P(460887273, 658925178), P(460887273, 658926122),
+              P(460885782, 658928010), P(460884127, 658929473), P(460882303, 658930112), P(460882143, 658928097),
+              P(460882495, 658926625), P(460881183, 658927776), P(460879775, 658927040), P(460878943, 658927648),
+              P(460878463, 658928097), P(460878325, 658928954), P(460878584, 658930178), P(460879335, 658933746),
+              P(460878973, 658936352), P(460878687, 658937505), P(460878079, 658938080), P(460877375, 658939040),
+              P(460876956, 658939074), P(460876927, 658939681), P(460876543, 658940193), P(460875775, 658940032),
+              P(460874943, 658940929), P(460874170, 658940866), P(460873851, 658941227), P(460873692, 658942004),
+              P(460873215, 658942337), P(460872200, 658941744), P(460871679, 658942816), P(460870204, 658943296),
+              P(460870207, 658941952), P(460870123, 658941227), P(460869377, 658941227), P(460868632, 658942171),
+              P(460867140, 658943116), P(460864383, 658943872), P(460859932, 658945154), P(460859551, 658945985),
+              P(460859512, 658946863), P(460859711, 658947488), P(460861087, 658947224), P(460861471, 658947873),
+              P(460860895, 658948064), P(460861112, 658948967), P(460860922, 658949378), P(460861437, 658949984),
+              P(460860860, 658950882), P(460861405, 658950944), P(460862343, 658952562), P(460861693, 658953026),
+              P(460862303, 658954784), P(460864250, 658956069), P(460865632, 658956576), P(460864830, 658958015),
+              P(460866401, 658956859), P(460866963, 658956917), P(460866262, 658958391), P(460866705, 658958676),
+              P(460867886, 658958222), P(460867806, 658959743), P(460867037, 658961694), P(460866269, 658962174),
+              P(460864158, 658966720), P(460863166, 658967711), P(460862590, 658966847), P(460862494, 658965983),
+              P(460861981, 658965406), P(460861150, 658965791), P(460860126, 658966431), P(460859262, 658967039),
+              P(460857822, 658968063), P(460857534, 658969119), P(460857118, 658971327), P(460856440, 658972764),
+              P(460855870, 658973023), P(460855870, 658974111), P(460854910, 658975007), P(460855550, 658976383),
+              P(460856958, 658977375), P(460857398, 658977979), P(460856541, 658979229), P(460856477, 658980959),
+              P(460855994, 658981372), P(460855547, 658984413), P(460856325, 658986247), P(460855710, 658986719),
+              P(460856306, 658987527), P(460856286, 658988831), P(460855454, 658989823), P(460854921, 658989518),
+              P(460854334, 658990335), P(460853592, 658990186), P(460852414, 658991743), P(460851977, 658991506),
+              P(460850878, 658991551), P(460850302, 658993439), P(460849181, 658993373), P(460849118, 658992671),
+              P(460848667, 658991868), P(460847966, 658991327), P(460847038, 658992255), P(460845822, 658990463),
+              P(460845022, 658990655), P(460844849, 658989911), P(460845517, 658989381), P(460844670, 658988639),
+              P(460844157, 658988606), P(460843854, 658989233), P(460842558, 658990975), P(460842136, 658990556),
+              P(460842270, 658989279), P(460842139, 658985404), P(460841470, 658984895), P(460841915, 658982078),
+              P(460842558, 658980831), P(460842301, 658979679), P(460842072, 658979198), P(460840971, 658979465),
+              P(460841541, 658977830), P(460842525, 658976415), P(460843211, 658975031), P(460843544, 658972537),
+              P(460842971, 658972252), P(460841342, 658974207), P(460840665, 658973022), P(460840216, 658972894),
+              P(460838870, 658974332), P(460838397, 658973086), P(460839992, 658970588), P(460839192, 658968860),
+              P(460837982, 658970911), P(460837310, 658972319), P(460835454, 658974527), P(460834878, 658974783),
+              P(460834398, 658973343), P(460834558, 658972959), P(460835038, 658971967), P(460835678, 658970783),
+              P(460836286, 658970527), P(460836889, 658970110), P(460836094, 658970143), P(460834462, 658970911),
+              P(460833246, 658972159), P(460832894, 658970593), P(460833598, 658968575), P(460834332, 658967664),
+              P(460833586, 658967664), P(460832797, 658968222), P(460831774, 658968031), P(460831870, 658965919),
+              P(460830840, 658964698), P(460829565, 658963711), P(460828422, 658963207), P(460825790, 658963583),
+              P(460824414, 658963967), P(460821854, 658964799), P(460820958, 658965119), P(460820606, 658966367),
+              P(460819774, 658967551), P(460818814, 658967295), P(460816830, 658968191), P(460816990, 658969151),
+              P(460815771, 658969887), P(460814875, 658971132), P(460814875, 658971582), P(460815326, 658971775),
+              P(460815706, 658972284), P(460816478, 658972095), P(460816958, 658973215), P(460816190, 658974175),
+              P(460815998, 658976767), P(460815486, 658976991), P(460815351, 658977579), P(460815550, 658978655),
+              P(460814846, 658979423), P(460814729, 658980337), P(460814496, 658980706), P(460814110, 658980063),
+              P(460813977, 658979268), P(460814174, 658978367), P(460813012, 658979446), P(460812638, 658979487),
+              P(460812382, 658980031), P(460811907, 658979591), P(460811774, 658978655), P(460812350, 658978047),
+              P(460811742, 658977791), P(460809982, 658979935), P(460809022, 658980447), P(460807997, 658980159),
+              P(460809630, 658976351), P(460810046, 658975135), P(460810942, 658972991), P(460812254, 658972223),
+              P(460812062, 658971135), P(460811646, 658970015), P(460810782, 658968959), P(460809598, 658969567),
+              P(460808926, 658969951), P(460808350, 658969279), P(460808683, 658967426), P(460807774, 658965951),
+              P(460807646, 658965183), P(460807326, 658964735), P(460807518, 658963263), P(460808254, 658962367),
+              P(460808701, 658961631), P(460808350, 658960383), P(460807966, 658959711), P(460807198, 658960158),
+              P(460805918, 658961759), P(460805342, 658960319), P(460804734, 658959839), P(460803838, 658958943),
+              P(460804486, 658958215), P(460805054, 658957567), P(460804670, 658956223), P(460804510, 658955263),
+              P(460803710, 658954591), P(460803038, 658955039), P(460802558, 658954655), P(460802270, 658953567),
+              P(460801470, 658952766), P(460800446, 658951870), P(460799294, 658951423), P(460798430, 658950750),
+              P(460797790, 658950142), P(460797181, 658949276), P(460796350, 658949246), P(460795262, 658949694),
+              P(460795006, 658948991), P(460795185, 658948105), P(460795353, 658946809), P(460794845, 658946492),
+              P(460794365, 658947070), P(460793790, 658947262), P(460792537, 658946841), P(460793438, 658945470),
+              P(460792446, 658944798), P(460791636, 658945788), P(460791134, 658945183), P(460791293, 658944094),
+              P(460790749, 658942652), P(460789630, 658941726), P(460788219, 658940443), P(460785497, 658937886),
+              P(460782974, 658936638), P(460781819, 658936732), P(460780892, 658936926), P(460779934, 658936894),
+              P(460779294, 658936862), P(460777534, 658936798), P(460776253, 658936638), P(460775454, 658936478),
+              P(460774590, 658936030), P(460773630, 658935678), P(460772766, 658935518), P(460771646, 658934942),
+              P(460770840, 658934617), P(460770174, 658934302), P(460769598, 658933758), P(460768539, 658933147),
+              P(460767166, 658932414), P(460765883, 658931291), P(460764766, 658930334), P(460763646, 658929854),
+              P(460762654, 658929278), P(460761342, 658928062), P(460758621, 658926108), P(460756030, 658924638),
+              P(460754693, 658923385), P(460753349, 658921913), P(460752733, 658920604), P(460751710, 658919422),
+              P(460750878, 658919134), P(460748867, 658918713), P(460747230, 658917630), P(460744989, 658915480),
+              P(460745045, 658914665), P(460745435, 658914427), P(460746297, 658915516), P(460747131, 658914715),
+              P(460747421, 658915006), P(460747643, 658914843), P(460748029, 658914046), P(460748243, 658913963),
+              P(460748212, 658913740), P(460747929, 658913748), P(460747413, 658913750), P(460747193, 658912185),
+              P(460747534, 658911444), P(460743047, 658905563), P(460741484, 658903897), P(460739773, 658903138),
+              P(460732318, 658899617), P(460730054, 658898887), P(460728926, 658898337), P(460727614, 658897825),
+              P(460725598, 658897313), P(460724606, 658897153), P(460723230, 658897089), P(460721790, 658896897),
+              P(460720368, 658896362), P(460719292, 658896190), P(460717536, 658896254), P(460716606, 658896124),
+              P(460715742, 658895932), P(460714688, 658895646), P(460713568, 658895518), P(460711299, 658894970),
+              P(460710112, 658894942), P(460709248, 658895134), P(460708480, 658895038), P(460707907, 658895035),
+              P(460707296, 658894974), P(460706529, 658893980), P(460705697, 658893948), P(460704704, 658893982),
+              P(460703008, 658893598), P(460700384, 658892062), P(460699040, 658891326), P(460698336, 658890910),
+              P(460695808, 658889982), P(460695136, 658889694), P(460694656, 658889342), P(460693952, 658888958),
+              P(460693313, 658888798), P(460692576, 658888382), P(460691648, 658887646), P(460690784, 658886942),
+              P(460690176, 658886526), P(460689088, 658885566), P(460687264, 658884702), P(460685600, 658883390),
+              P(460683814, 658882694), P(460683289, 658882178), P(460681257, 658881435), P(460680576, 658881409),
+              P(460679232, 658880961), P(460677824, 658880641), P(460676864, 658880449), P(460675968, 658880129),
+              P(460675008, 658879873), P(460673920, 658879425), P(460672640, 658879041), P(460671363, 658878532),
+              P(460669440, 658877825), P(460667072, 658877057), P(460665408, 658876353), P(460664640, 658875649),
+              P(460663299, 658874945), P(460661376, 658874113), P(460659520, 658873217), P(460656960, 658872129),
+              P(460654629, 658871372), P(460653725, 658871201), P(460653138, 658873259), P(460652319, 658873313),
+              P(460651770, 658873863), P(460651327, 658874176), P(460650901, 658874203), P(460650463, 658874016),
+              P(460649279, 658875295), P(460648285, 658876127), P(460647743, 658876415), P(460643612, 658880165),
+              P(460641879, 658880412), P(460641596, 658880125), P(460641500, 658879676), P(460641375, 658879071),
+              P(460640669, 658878877), P(460639583, 658878911), P(460638651, 658877474), P(460636927, 658877375),
+              P(460634271, 658874911), P(460633951, 658873441), P(460634173, 658871522), P(460634495, 658870240),
+              P(460634975, 658869440), P(460634941, 658868928), P(460634303, 658868672), P(460633759, 658868384),
+              P(460632893, 658868066), P(460632191, 658867968), P(460631263, 658867809), P(460630588, 658868036),
+              P(460630022, 658868540), P(460627457, 658871680), P(460625549, 658873259), P(460624832, 658873825),
+              P(460624320, 658875039), P(460622756, 658874879), P(460622566, 658876091), P(460621820, 658876091),
+              P(460619583, 658877979), P(460615109, 658877979), P(460613618, 658878923), P(460613088, 658880479),
+              P(460612096, 658882559), P(460611713, 658882399), P(460612544, 658880895), P(460612269, 658879821),
+              P(460611713, 658880191), P(460611489, 658881727), P(460610538, 658881850), P(460611381, 658877979),
+              P(460609890, 658877979), P(460609144, 658877979), P(460608161, 658878559), P(460607426, 658877600),
+              P(460607904, 658876863), P(460607041, 658876287), P(460606817, 658875679), P(460606162, 658875147),
+              P(460605914, 658875748), P(460605504, 658875967), P(460605559, 658876610), P(460604706, 658877853),
+              P(460604768, 658876767), P(460604288, 658876223), P(460603648, 658876383), P(460603648, 658877215),
+              P(460602722, 658878111), P(460603008, 658877055), P(460602052, 658877056), P(460600546, 658876928),
+              P(460600196, 658875147), P(460599451, 658875147), P(460597959, 658875147), P(460597959, 658874203),
+              P(460597214, 658873259), P(460596468, 658872315), P(460593485, 658872315), P(460591248, 658870428),
+              P(460589757, 658870428), P(460585283, 658871372), P(460583046, 658874203), P(460582301, 658874203),
+              P(460581555, 658875147), P(460580064, 658875147), P(460579318, 658875147), P(460577081, 658877979),
+              P(460576335, 658877979), P(460573353, 658880811), P(460570370, 658879867), P(460559146, 658876840),
+              P(460558890, 658876158), P(460559309, 658875425), P(460559824, 658875197), P(460565301, 658877001),
+              P(460565656, 658875710), P(460564445, 658875342), P(460564578, 658875047), P(460565749, 658875510),
+              P(460565951, 658874878), P(460565475, 658874326), P(460565544, 658873918), P(460565890, 658873648),
+              P(460566288, 658873610), P(460567083, 658873714), P(460567177, 658872967), P(460568882, 658873337),
+              P(460569163, 658872361), P(460568574, 658870596), P(460567091, 658868370), P(460565136, 658865119),
+              P(460563939, 658864476), P(460563043, 658863983), P(460560184, 658864743), P(460556169, 658865098),
+              P(460553866, 658866890), P(460549771, 658871411), P(460542303, 658874963), P(460538606, 658879878),
+              P(460534998, 658881281), P(460533087, 658881754), P(460530621, 658882959), P(460527868, 658883642),
+              P(460526451, 658884295), P(460524907, 658884748), P(460523790, 658884782), P(460522829, 658884527),
+              P(460521903, 658884586), P(460521525, 658885284), P(460520718, 658885382), P(460519666, 658887418),
+              P(460518920, 658888362), P(460518278, 658889265), P(460516492, 658890020), P(460514156, 658889068),
+              P(460513382, 658888247), P(460512736, 658888257), P(460512190, 658888962), P(460511449, 658889318),
+              P(460508481, 658890851), P(460507425, 658890690), P(460507749, 658891876), P(460506240, 658892801),
+              P(460505062, 658892066), P(460504544, 658893185), P(460503682, 658893890), P(460502784, 658893313),
+              P(460501632, 658895201), P(460501770, 658895914), P(460502048, 658896833), P(460502516, 658897801),
+              P(460503200, 658898529), P(460503552, 658899809), P(460504192, 658900961), P(460504448, 658902593),
+              P(460504321, 658904322), P(460502848, 658905409), P(460501984, 658906241), P(460501192, 658905673),
+              P(460499360, 658906977), P(460497033, 658904740), P(460496448, 658903905), P(460493728, 658903937),
+              P(460491040, 658903969), P(460489381, 658902789), P(460486944, 658902433), P(460480843, 658901447),
+              P(460479400, 658901577), P(460477909, 658901577), P(460476418, 658902521), P(460473435, 658906297),
+              P(460473435, 658907241), P(460472689, 658907241), P(460470453, 658910073), P(460469707, 658912905),
+              P(460468961, 658912905), P(460468216, 658913849), P(460467470, 658913849), P(460466724, 658913849),
+              P(460465979, 658914793), P(460463742, 658916681), P(460458522, 658916681), P(460457776, 658917625),
+              P(460456285, 658917625), P(460454048, 658920458), P(460454048, 658921402), P(460453302, 658922346),
+              P(460452557, 658922346), P(460451811, 658923290), P(460451066, 658923290), P(460448829, 658925178),
+              P(460448083, 658925178), P(460447337, 658924234), P(460446592, 658924234), P(460445100, 658924234),
+              P(460443609, 658926122), P(460442863, 658926122), P(460442118, 658927066), P(460442118, 658928954),
+              P(460441372, 658929898), P(460439881, 658929898), P(460438389, 658931786), P(460437644, 658931786),
+              P(460437644, 658929898), P(460435407, 658928010), P(460432424, 658931786), P(460432424, 658933675),
+              P(460432424, 658936507), P(460431679, 658936507), P(460430933, 658935563), P(460430187, 658934619),
+              P(460429442, 658934619), P(460428696, 658934619), P(460429442, 658933675), P(460429442, 658932730),
+              P(460427950, 658930842), P(460427205, 658930842), P(460426459, 658931786), P(460425713, 658931786),
+              P(460424968, 658930842), P(460424222, 658930842), P(460422731, 658928954), P(460421985, 658929898),
+              P(460419748, 658929898), P(460419002, 658929898), P(460418257, 658930842), P(460416020, 658932730),
+              P(460414528, 658930842), P(460412292, 658930842), P(460411546, 658929898), P(460410055, 658928954),
+              P(460410055, 658928010), P(460409309, 658927066), P(460408563, 658925178), P(460407818, 658925178),
+              P(460407072, 658924234), P(460404835, 658922346), P(460403344, 658922346), P(460401852, 658920458),
+              P(460400361, 658919514), P(460397378, 658919514), P(460394396, 658919514), P(460392905, 658921402),
+              P(460389922, 658921402), P(460389176, 658922346), P(460388431, 658922346), P(460386939, 658922346),
+              P(460386194, 658923290), P(460385448, 658923290), P(460384702, 658924234), P(460381720, 658926122),
+              P(460380228, 658926122), P(460379483, 658925178), P(460378737, 658926122), P(460377991, 658926122),
+              P(460377246, 658926122), P(460376500, 658927066), P(460373517, 658928010), P(460372772, 658928954),
+              P(460372772, 658929898), P(460372026, 658929898), P(460371281, 658930842), P(460370535, 658930842),
+              P(460369789, 658930842), P(460369044, 658931786), P(460366061, 658934619), P(460364570, 658934619),
+              P(460363824, 658933675), P(460363078, 658933675), P(460362333, 658932730), P(460360841, 658931786),
+              P(460358604, 658931786), P(460357113, 658930842), P(460351894, 658930842), P(460351148, 658929898),
+              P(460349657, 658929898), P(460347420, 658929898), P(460346674, 658930842), P(460345928, 658930842),
+              P(460345183, 658930842), P(460343691, 658932730), P(460342946, 658932730), P(460341454, 658934619),
+              P(460341454, 658935563), P(460339963, 658935563), P(460339217, 658936507), P(460337726, 658936507),
+              P(460336235, 658937451), P(460335489, 658937451), P(460334743, 658936507), P(460330270, 658936507),
+              P(460329524, 658936507), P(460327437, 658935759), P(460326613, 658935241), P(460325796, 658934619),
+              P(460325050, 658935563), P(460324304, 658935563), P(460322813, 658937451), P(460321322, 658938395),
+              P(460319830, 658938395), P(460316102, 658938395), P(460315235, 658939097), P(460314611, 658939339),
+              P(460313111, 658940229), P(460311980, 658941473), P(460311632, 658943247), P(460310293, 658944138),
+              P(460309049, 658944571), P(460307981, 658945716), P(460307550, 658945777), P(460307114, 658945397),
+              P(460303885, 658946949), P(460303475, 658947717), P(460302083, 658947164), P(460301087, 658947276),
+              P(460300003, 658948361), P(460299431, 658948556), P(460298196, 658946487), P(460295224, 658945004),
+              P(460293733, 658946892), P(460291496, 658945004), P(460290750, 658945948), P(460290750, 658947836),
+              P(460290750, 658948780), P(460288513, 658948780), P(460287767, 658949725), P(460287767, 658950669),
+              P(460284785, 658950669), P(460283293, 658950669), P(460279565, 658955389), P(460279565, 658956334),
+              P(460280311, 658957278), P(460277328, 658961054), P(460278074, 658962943), P(460276582, 658962943),
+              P(460274346, 658965775), P(460274346, 658969552), P(460273600, 658970496), P(460274346, 658971441),
+              P(460276582, 658971441), P(460277328, 658971441), P(460277328, 658973329), P(460278074, 658975218),
+              P(460278074, 658976162), P(460277328, 658977106), P(460276582, 658977106), P(460275837, 658978050),
+              P(460275837, 658979939), P(460274346, 658982772), P(460271811, 658983479), P(460270998, 658983409),
+              P(460270201, 658980782), P(460270908, 658979316), P(460270976, 658976098), P(460270348, 658975845),
+              P(460269872, 658978995), P(460269126, 658979654), P(460268257, 658981135), P(460267848, 658981689),
+              P(460266980, 658982331), P(460265405, 658984842), P(460261163, 658986377), P(460257529, 658984946),
+              P(460261243, 658981949), P(460256852, 658984270), P(460257189, 658980748), P(460256857, 658979956),
+              P(460257968, 658976632), P(460258389, 658974963), P(460257973, 658974659), P(460258326, 658973765),
+              P(460257918, 658972871), P(460257076, 658971742), P(460256061, 658971051), P(460254081, 658971034),
+              P(460252520, 658970476), P(460251976, 658969552), P(460251230, 658969552), P(460249739, 658970496),
+              P(460248993, 658971441), P(460248993, 658972385), P(460248993, 658973329), P(460246756, 658976162),
+              P(460245265, 658976162), P(460244519, 658978995), P(460242282, 658978995), P(460240791, 658980883),
+              P(460239300, 658982772), P(460240045, 658983716), P(460240045, 658984660), P(460238554, 658986549),
+              P(460238554, 658987493), P(460237808, 658989381), P(460237808, 658990326), P(460238554, 658991270),
+              P(460238554, 658993159), P(460237063, 658995047), P(460236317, 658995991), P(460236317, 659001657),
+              P(460237808, 659003546), P(460238554, 659004490), P(460238554, 659005435), P(460237808, 659008268),
+              P(460236317, 659010156), P(460235571, 659010156), P(460234080, 659012045), P(460233335, 659012989),
+              P(460233335, 659013934), P(460232589, 659014878), P(460231843, 659016767), P(460230352, 659016767),
+              P(460227369, 659020544), P(460225878, 659022433), P(460225878, 659023378), P(460225132, 659024322),
+              P(460225132, 659029044), P(460225132, 659029988), P(460224387, 659029988), P(460223641, 659030933),
+              P(460221404, 659034710), P(460221404, 659043210), P(460222150, 659044155), P(460222150, 659046988),
+              P(460222895, 659048877), P(460222895, 659050766), P(460222895, 659054544), P(460222150, 659055489),
+              P(460213948, 659055489), P(460213202, 659055489), P(460210965, 659058322), P(460210219, 659058322),
+              P(460209474, 659057378), P(460208728, 659057378), P(460207982, 659058322), P(460205000, 659060211),
+              P(460205000, 659061156), P(460205745, 659062100), P(460205745, 659063045), P(460204254, 659064934),
+              P(460203508, 659064934), P(460202763, 659065878), P(460202017, 659065878), P(460200526, 659067768),
+              P(460200526, 659068712), P(460199780, 659069657), P(460199780, 659070601), P(460199034, 659071546),
+              P(460198289, 659072490), P(460198289, 659074379), P(460196797, 659077213), P(460196797, 659079102),
+              P(460196052, 659080047), P(460196797, 659080992), P(460196797, 659081936), P(460196052, 659082881),
+              P(460196052, 659084770), P(460195306, 659086659), P(460196052, 659087604), P(460196052, 659088548),
+              P(460196052, 659090438), P(460195306, 659091382), P(460195306, 659094216), P(460195306, 659095161),
+              P(460194561, 659096105), P(460193815, 659097050), P(460193815, 659101773), P(460193069, 659104607),
+              P(460192324, 659105552), P(460191578, 659105552), P(460190832, 659106497), P(460190087, 659106497),
+              P(460188595, 659108386), P(460187850, 659110275), P(460187104, 659109331), P(460186358, 659110275),
+              P(460185613, 659110275), P(460184867, 659111220), P(460184121, 659111220), P(460183376, 659112165),
+              P(460182630, 659112165), P(460180393, 659112165), P(460179647, 659113109), P(460179647, 659114054),
+              P(460178902, 659114999), P(460178156, 659115944), P(460178156, 659116888), P(460177410, 659116888),
+              P(460175919, 659118778), P(460174428, 659120667), P(460174428, 659121612), P(460174428, 659122557),
+              P(460172937, 659124446), P(460171445, 659125391), P(460171445, 659126335), P(460171445, 659127280),
+              P(460170700, 659127280), P(460168463, 659130114), P(460167717, 659130114), P(460166226, 659132004),
+              P(460164734, 659132004), P(460163243, 659133894), P(460163243, 659134838), P(460162497, 659135783),
+              P(460162497, 659136728), P(460161752, 659136728), P(460161006, 659137673), P(460161752, 659142397),
+              P(460161006, 659142397), P(460160260, 659143341), P(460159515, 659142397), P(460159515, 659141452),
+              P(460159515, 659140507), P(460158769, 659139562), P(460157278, 659139562), P(460156532, 659140507),
+              P(460156532, 659141452), P(460155041, 659141452), P(460153550, 659140507), P(460152058, 659142397),
+              P(460152058, 659143341), P(460150567, 659143341), P(460149821, 659142397), P(460148330, 659142397),
+              P(460147584, 659143341), P(460146839, 659145231), P(460146093, 659145231), P(460145347, 659144286),
+              P(460144602, 659144286), P(460143856, 659144286), P(460143110, 659143341), P(460142365, 659143341),
+              P(460140128, 659144286), P(460138636, 659146176), P(460138636, 659147121), P(460137145, 659147121),
+              P(460135654, 659149010), P(460133417, 659150900), P(460132671, 659150900), P(460131926, 659149955),
+              P(460130434, 659149955), P(460128943, 659151845), P(460128943, 659152790), P(460128943, 659156569),
+              P(460127452, 659156569), P(460127452, 659155624), P(460126706, 659154679), P(460126706, 659153734),
+              P(460125215, 659151845), P(460123723, 659150900), P(460122978, 659150900), P(460122232, 659151845),
+              P(460122232, 659152790), P(460120741, 659152790), P(460119995, 659151845), P(460119249, 659152790),
+              P(460116267, 659152790), P(460115521, 659153734), P(460115521, 659154679), P(460114776, 659155624),
+              P(460114776, 659156569), P(460113284, 659156569), P(460111793, 659158459), P(460110302, 659159403),
+              P(460110302, 659160348), P(460109556, 659161293), P(460110302, 659163183), P(460109556, 659163183),
+              P(460108065, 659165073), P(460107319, 659166018), P(460105082, 659166018), P(460104336, 659167907),
+              P(460103591, 659167907), P(460102845, 659166962), P(460101354, 659166018), P(460099862, 659167907),
+              P(460096134, 659167907), P(460094643, 659166962), P(460093897, 659167907), P(460093897, 659168852),
+              P(460093897, 659169797), P(460093152, 659170742), P(460092406, 659170742), P(460091660, 659171687),
+              P(460090915, 659172632), P(460090169, 659172632), P(460089423, 659172632), P(460087932, 659174522),
+              P(460086441, 659174522), P(460085695, 659173577), P(460084949, 659172632), P(460084204, 659172632),
+              P(460083458, 659173577), P(460082712, 659174092), P(460081887, 659173943), P(460077493, 659174522),
+              P(460076002, 659176411), P(460076747, 659177356), P(460076002, 659178301), P(460074510, 659178301),
+              P(460073765, 659178301), P(460072273, 659180191), P(460070782, 659183026), P(460070782, 659185861),
+              P(460070036, 659186806), P(460071528, 659188696), P(460072273, 659188696), P(460071528, 659189640),
+              P(460071528, 659190585), P(460070782, 659189640), P(460070036, 659189640), P(460070036, 659188696),
+              P(460069291, 659187751), P(460068545, 659187751), P(460068545, 659185861), P(460067054, 659183971),
+              P(460066308, 659184916), P(460065562, 659184916), P(460064817, 659185861), P(460065562, 659186806),
+              P(460064817, 659186806), P(460063325, 659188696), P(460064071, 659189640), P(460063325, 659191530),
+              P(460061834, 659191530), P(460062580, 659190585), P(460061834, 659188696), P(460060343, 659188696),
+              P(460059597, 659187751), P(460058106, 659187751), P(460057360, 659188696), P(460058106, 659189640),
+              P(460057360, 659189640), P(460055869, 659191530), P(460053632, 659191530), P(460052886, 659192475),
+              P(460052141, 659192475), P(460050649, 659194365), P(460050649, 659195310), P(460049904, 659195310),
+              P(460049158, 659196255), P(460048412, 659196255), P(460046921, 659197200), P(460046175, 659198145),
+              P(460044684, 659200035), P(460042447, 659200035), P(460041701, 659200035), P(460040956, 659200980),
+              P(460040956, 659201925), P(460040956, 659202870), P(460040210, 659202870), P(460039464, 659203815),
+              P(460038719, 659203815), P(460037973, 659204760), P(460036482, 659204760), P(460035736, 659204760),
+              P(460034991, 659205705), P(460035736, 659206650), P(460034245, 659206650), P(460029771, 659211375),
+              P(460029025, 659210430), P(460027534, 659210430), P(460026788, 659210430), P(460026043, 659211375),
+              P(460023806, 659211375), P(460023060, 659212320), P(460021569, 659212320), P(460020823, 659213265),
+              P(460019332, 659214210), P(460018586, 659214210), P(460017841, 659213265), P(460017095, 659214210),
+              P(460014858, 659214210), P(460014112, 659215156), P(460010384, 659215156), P(460008147, 659217991),
+              P(460006656, 659217991), P(460005164, 659219881), P(460002927, 659221771), P(460002182, 659221771),
+              P(460001436, 659222716), P(459999945, 659222716), P(459998454, 659224606), P(459996217, 659224606),
+              P(459995471, 659223661), P(459993980, 659223661), P(459993234, 659223661), P(459992488, 659224606),
+              P(459991743, 659224606), P(459990997, 659225551), P(459990251, 659225551), P(459989506, 659224606),
+              P(459988014, 659224606), P(459989584, 659226837), P(459988801, 659228032), P(459988425, 659227050),
+              P(459986826, 659227659), P(459982814, 659228559), P(459980515, 659229076), P(459976857, 659230084),
+              P(459969207, 659229512), P(459968816, 659228975), P(459964212, 659228569), P(459960498, 659226963),
+              P(459958254, 659225206), P(459956782, 659223162), P(459956096, 659220921), P(459955923, 659218678),
+              P(459954847, 659215180), P(459957443, 659211375), P(459956697, 659210430), P(459955951, 659210430),
+              P(459955951, 659209485), P(459955206, 659208540), P(459953714, 659205705), P(459952969, 659205705),
+              P(459952223, 659204760), P(459949986, 659203815), P(459949986, 659201925), P(459949240, 659200035),
+              P(459948495, 659200035), P(459947749, 659199090), P(459947003, 659199090), P(459945512, 659197200),
+              P(459944021, 659196255), P(459941784, 659196255), P(459940292, 659195310), P(459938056, 659192475),
+              P(459937310, 659192475), P(459936564, 659191530), P(459935073, 659190585), P(459934327, 659190585),
+              P(459932090, 659188696), P(459931345, 659189640), P(459931345, 659188696), P(459930599, 659187751),
+              P(459929108, 659185861), P(459928362, 659186806), P(459927616, 659186806), P(459926125, 659186806),
+              P(459924634, 659184916), P(459924634, 659183971), P(459923888, 659183026), P(459923142, 659182081),
+              P(459922397, 659182081), P(459920160, 659180191), P(459919414, 659181136), P(459919414, 659182081),
+              P(459919414, 659183026), P(459917923, 659181136), P(459915686, 659181136), P(459915686, 659179246),
+              P(459916432, 659179246), P(459917177, 659178301), P(459914940, 659175466), P(459912703, 659171687),
+              P(459911212, 659173577), P(459911212, 659174522), P(459911212, 659175466), P(459910466, 659175466),
+              P(459910466, 659174522), P(459909721, 659173577), P(459908975, 659174522), P(459908975, 659175466),
+              P(459908229, 659176411), P(459905247, 659176411), P(459902264, 659179246), P(459897045, 659179246),
+              P(459896299, 659178301), P(459895553, 659178301), P(459893316, 659177356), P(459892571, 659178301),
+              P(459893316, 659179246), P(459893316, 659181136), P(459891825, 659181136), P(459891079, 659182081),
+              P(459889588, 659182081), P(459888842, 659182081), P(459888097, 659183026), P(459886605, 659183026),
+              P(459885549, 659183035), P(459883623, 659184916), P(459881551, 659188663), P(459881178, 659186462),
+              P(459881053, 659185496), P(459881136, 659184240), P(459880309, 659183971), P(459879459, 659184187),
+              P(459878029, 659184083), P(459877658, 659184916), P(459876912, 659184916), P(459875421, 659184916),
+              P(459874239, 659184676), P(459872538, 659184866), P(459870587, 659184028), P(459869455, 659183026),
+              P(459868710, 659183026), P(459867964, 659183971), P(459867964, 659186806), P(459866473, 659188696),
+              P(459865727, 659190585), P(459864981, 659190585), P(459864128, 659190193), P(459863283, 659190270),
+              P(459862387, 659190449), P(459861999, 659189640), P(459857525, 659187751), P(459855988, 659186328),
+              P(459854835, 659186072), P(459854708, 659184203), P(459854195, 659183512), P(459853939, 659182667),
+              P(459853051, 659182081), P(459851560, 659180191), P(459852506, 659177241), P(459853797, 659174522),
+              P(459853597, 659173139), P(459853136, 659171940), P(459852275, 659171549), P(459852305, 659170742),
+              P(459851905, 659169082), P(459853051, 659167907), P(459854197, 659167308), P(459855288, 659166962),
+              P(459855465, 659166041), P(459855757, 659165050), P(459856034, 659164128), P(459856654, 659161898),
+              P(459856469, 659159743), P(459856270, 659159227), P(459855561, 659158459), P(459854580, 659157661),
+              P(459853007, 659157395), P(459850091, 659156686), P(459848998, 659157484), P(459847839, 659158783),
+              P(459846871, 659159196), P(459844849, 659157514), P(459843831, 659156303), P(459844103, 659154679),
+              P(459844103, 659153734), P(459844849, 659152790), P(459844842, 659151373), P(459844812, 659150074),
+              P(459844849, 659149010), P(459845594, 659148065), P(459845824, 659147711), P(459846112, 659147327),
+              P(459846931, 659146427), P(459847641, 659144523), P(459847774, 659143918), P(459847914, 659143327),
+              P(459847847, 659142545), P(459847944, 659141954), P(459847737, 659140565), P(459846844, 659137717),
+              P(459845959, 659135724), P(459845280, 659134573), P(459844320, 659133052), P(459843633, 659132093),
+              P(459842415, 659130499), P(459841324, 659129510), P(459840150, 659128801), P(459839426, 659127900),
+              P(459839100, 659127162), P(459839321, 659126055), P(459838694, 659124727), P(459837676, 659122705),
+              P(459837071, 659121937), P(459836694, 659121332), P(459835837, 659119913), P(459834641, 659119307),
+              P(459832582, 659118305), P(459832178, 659117734), P(459831005, 659116822), P(459830173, 659115389),
+              P(459829532, 659112581), P(459829019, 659111686), P(459828622, 659111078), P(459828302, 659110555),
+              P(459827918, 659110270), P(459827362, 659109441), P(459826617, 659108845), P(459824085, 659107371),
+              P(459822479, 659106403), P(459820927, 659106010), P(459820259, 659106152), P(459819028, 659105861),
+              P(459817654, 659106074), P(459814866, 659105969), P(459814751, 659106157), P(459813050, 659106157),
+              P(459812570, 659106435), P(459812817, 659107072), P(459812653, 659107131), P(459812533, 659106888),
+              P(459811588, 659106823), P(459810587, 659107399), P(459810139, 659107351), P(459810076, 659107826),
+              P(459809732, 659107666), P(459809680, 659108016), P(459809476, 659107990), P(459809465, 659108343),
+              P(459808600, 659108567), P(459807152, 659108330), P(459805901, 659108316), P(459805844, 659108647),
+              P(459805441, 659108383), P(459805154, 659108689), P(459804850, 659108357), P(459804132, 659108912),
+              P(459804074, 659108586), P(459803124, 659108358), P(459802037, 659107858), P(459801275, 659107215),
+              P(459800390, 659106115), P(459800219, 659104999), P(459800343, 659103357), P(459800437, 659102134),
+              P(459801058, 659100057), P(459802145, 659098879), P(459802627, 659098274), P(459803202, 659096336),
+              P(459803776, 659094631), P(459804226, 659092895), P(459804224, 659091457), P(459803939, 659090340),
+              P(459803493, 659089271), P(459803152, 659088371), P(459802685, 659087849), P(459802144, 659087510),
+              P(459801456, 659087499), P(459801134, 659087877), P(459800521, 659087789), P(459800489, 659087554),
+              P(459800636, 659087349), P(459800560, 659087106), P(459800365, 659086964), P(459799666, 659087039),
+              P(459799097, 659087089), P(459798042, 659087993), P(459796717, 659088145), P(459796337, 659088566),
+              P(459796071, 659088599), P(459795832, 659088478), P(459795727, 659088239), P(459795713, 659087141),
+              P(459795363, 659086431), P(459794973, 659086045), P(459794834, 659086128), P(459794537, 659086097),
+              P(459794393, 659085589), P(459793749, 659085394), P(459793330, 659085391), P(459792985, 659085866),
+              P(459792876, 659086384), P(459793039, 659086585), P(459793057, 659086816), P(459792903, 659086964),
+              P(459792468, 659087209), P(459791718, 659088468), P(459791062, 659089171), P(459790500, 659089665),
+              P(459789867, 659089626), P(459789845, 659089910), P(459789313, 659089587), P(459789085, 659088602),
+              P(459789890, 659087428), P(459789839, 659087050), P(459789501, 659086692), P(459789034, 659086701),
+              P(459788042, 659087147), P(459779249, 659093973), P(459778937, 659093253), P(459778993, 659092599),
+              P(459779262, 659092495), P(459779408, 659091576), P(459780412, 659091486), P(459780411, 659090511),
+              P(459781000, 659090420), P(459781308, 659089691), P(459781028, 659089349), P(459781102, 659088016),
+              P(459780681, 659086588), P(459780455, 659086393), P(459780443, 659085434), P(459780089, 659085086),
+              P(459780101, 659084558), P(459779081, 659084261), P(459777967, 659083715), P(459776987, 659082974),
+              P(459776592, 659082066), P(459775824, 659079020), P(459775580, 659078969), P(459775848, 659076350),
+              P(459775303, 659075081), P(459774846, 659074964), P(459774623, 659074172), P(459773378, 659073654),
+              P(459773394, 659072119), P(459771971, 659071672), P(459772071, 659071071), P(459772399, 659070994),
+              P(459772717, 659070670), P(459772891, 659070286), P(459772678, 659070261), P(459772606, 659070022),
+              P(459772752, 659069684), P(459770423, 659067542), P(459771169, 659066598), P(459771915, 659067542),
+              P(459772219, 659066039), P(459773196, 659065767), P(459773196, 659063878), P(459772451, 659062934),
+              P(459772451, 659061989), P(459771705, 659061045), P(459771705, 659060100), P(459771260, 659059257),
+              P(459770789, 659057550), P(459770044, 659057550), P(459768774, 659056341), P(459767283, 659056341),
+              P(459768356, 659054962), P(459766865, 659054017), P(459766119, 659054017), P(459765374, 659054962),
+              P(459764628, 659055906), P(459762787, 659053824), P(459761295, 659053824), P(459762165, 659049053),
+              P(459762165, 659046220), P(459761420, 659046220), P(459760674, 659047164), P(459760674, 659049053),
+              P(459759928, 659049997), P(459759928, 659051886), P(459760674, 659053775), P(459757691, 659053775),
+              P(459756946, 659052831), P(459750235, 659048109), P(459752472, 659045275), P(459752472, 659044331),
+              P(459751726, 659043386), P(459753217, 659043386), P(459755454, 659040553), P(459756200, 659039608),
+              P(459756946, 659039608), P(459757691, 659040553), P(459759928, 659039608), P(459759928, 659037719),
+              P(459759183, 659036775), P(459758437, 659035831), P(459758437, 659034887), P(459759183, 659034887),
+              P(459759928, 659034887), P(459760674, 659033942), P(459761420, 659032053), P(459761420, 659031109),
+              P(459759928, 659029220), P(459758437, 659028276), P(459758437, 659024498), P(459757691, 659023554),
+              P(459757691, 659022609), P(459756200, 659019776), P(459756200, 659016943), P(459756946, 659015999),
+              P(459757691, 659011277), P(459758437, 659011277), P(459759183, 659010333), P(459759928, 659009388),
+              P(459759928, 659008444), P(459760674, 659007500), P(459759928, 659006555), P(459760674, 659005611),
+              P(459760674, 659004667), P(459761420, 659001834), P(459762165, 659000890), P(459762911, 659000890),
+              P(459763657, 659000890), P(459765894, 658998057), P(459765894, 658997113), P(459767385, 658997113),
+              P(459768876, 658996168), P(459767385, 658994280), P(459768876, 658992391), P(459768876, 658991447),
+              P(459769622, 658991447), P(459770367, 658990502), P(459770367, 658987670), P(459771113, 658987670),
+              P(459771859, 658986726), P(459771113, 658983893), P(459771859, 658982949), P(459773350, 658982949),
+              P(459774096, 658982004), P(459774841, 658981060), P(459774841, 658980116), P(459777078, 658977283),
+              P(459778570, 658974450), P(459778570, 658971618), P(459777824, 658970674), P(459778570, 658970674),
+              P(459781552, 658966897), P(459782298, 658965953), P(459782298, 658964065), P(459783044, 658963120),
+              P(459784535, 658957456), P(459785281, 658956511), P(459786772, 658956511), P(459789009, 658954623),
+              P(459787518, 658952735), P(459787518, 658948958), P(459786772, 658948014), P(459786772, 658947070),
+              P(459786026, 658946126), P(459786026, 658945182), P(459786026, 658942350), P(459786772, 658941406),
+              P(459786772, 658940461), P(459787518, 658939517), P(459788263, 658938573), P(459788263, 658937629),
+              P(459787518, 658935741), P(459788263, 658934797), P(459788263, 658933853), P(459789754, 658931965),
+              P(459789009, 658931021), P(459788263, 658931021), P(459789754, 658929132), P(459792737, 658924412),
+              P(459793483, 658923468), P(459795720, 658923468), P(459797211, 658922524), P(459797957, 658921580),
+              P(459798702, 658920636), P(459800194, 658920636), P(459800939, 658919692), P(459802431, 658919692),
+              P(459803176, 658918748), P(459803176, 658917804), P(459803922, 658916860), P(459804668, 658916860),
+              P(459805413, 658915916), P(459806159, 658915916), P(459808396, 658914028), P(459810633, 658914028),
+              P(459812124, 658913084), P(459813615, 658911196), P(459813615, 658910252), P(459814361, 658910252),
+              P(459815852, 658908364), P(459817344, 658908364), P(459818835, 658906476), P(459818835, 658904588),
+              P(459820326, 658902700), P(459822563, 658902700), P(459824055, 658900812), P(459824800, 658900812),
+              P(459825546, 658899868), P(459826292, 658899868), P(459827783, 658898924), P(459829274, 658897036),
+              P(459830020, 658896093), P(459833002, 658896093), P(459833748, 658895149), P(459833748, 658894205),
+              P(459834494, 658893261), P(459835985, 658893261), P(459836731, 658892317), P(459837476, 658892317),
+              P(459838222, 658892317), P(459840459, 658889485), P(459841205, 658889485), P(459841950, 658888541),
+              P(459844933, 658885709), P(459846424, 658885709), P(459847170, 658884766), P(459847916, 658884766),
+              P(459853135, 658881934), P(459854626, 658880046), P(459854626, 658879102), P(459856118, 658877215),
+              P(459856863, 658876271), P(459856863, 658875327), P(459857609, 658874383), P(459857609, 658872495),
+              P(459858355, 658872495), P(459859846, 658870607), P(459859846, 658869664), P(459859100, 658868720),
+              P(459858355, 658867776), P(459859100, 658866832), P(459859100, 658865888), P(459860592, 658864001),
+              P(459859846, 658863057), P(459859100, 658862113), P(459859846, 658862113), P(459860592, 658861169),
+              P(459861337, 658861169), P(459862083, 658860225), P(459864320, 658857394), P(459866557, 658857394),
+              P(459867303, 658856450), P(459868794, 658856450), P(459869539, 658855506), P(459871031, 658855506),
+              P(459874013, 658854562), P(459875505, 658852675), P(459877742, 658852675), P(459879979, 658850787),
+              P(459882961, 658850787), P(459883707, 658850787), P(459884453, 658849843), P(459885198, 658849843),
+              P(459885944, 658848900), P(459885944, 658847956), P(459888181, 658847956), P(459889672, 658847012),
+              P(459890418, 658846068), P(459890418, 658844181), P(459891163, 658843237), P(459891909, 658842293),
+              P(459892655, 658842293), P(459894146, 658841350), P(459894892, 658840406), P(459896383, 658838518),
+              P(459896383, 658837574), P(459896383, 658836631), P(459897129, 658836631), P(459897874, 658835687),
+              P(459898620, 658835687), P(459899366, 658835687), P(459900111, 658834743), P(459900857, 658833800),
+              P(459904585, 658833800), P(459905331, 658834743), P(459906822, 658832856), P(459907568, 658830969),
+              P(459909805, 658830969), P(459910550, 658831912), P(459911296, 658830969), P(459912042, 658830969),
+              P(459912787, 658830025), P(459913533, 658830025), P(459916516, 658829081), P(459917261, 658828137),
+              P(459917261, 658827194), P(459916516, 658824362), P(459918007, 658824362), P(459918753, 658823419),
+              P(459920244, 658823419), P(459920990, 658823419), P(459921735, 658822475), P(459922481, 658822475),
+              P(459923972, 658821531), P(459925464, 658821531), P(459926209, 658822475), P(459927700, 658822475),
+              P(459928446, 658822475), P(459929192, 658823419), P(459930683, 658823419), P(459932174, 658823419),
+              P(459933666, 658821531), P(459937394, 658821531), P(459938885, 658819644), P(459941868, 658819644),
+              P(459946342, 658817757), P(459948579, 658814926), P(459948579, 658813982), P(459950816, 658811151),
+              P(459951561, 658810207), P(459951561, 658809264), P(459952307, 658808320), P(459953798, 658807376),
+              P(459953798, 658806433), P(459954544, 658805489), P(459953053, 658803602), P(459953053, 658802658),
+              P(459952307, 658801715), P(459953053, 658800771), P(459953798, 658799828), P(459953053, 658798884),
+              P(459950816, 658797940), P(459951561, 658796997), P(459958272, 658796997), P(459959018, 658796053),
+              P(459959764, 658796053), P(459962001, 658796053), P(459962746, 658795109), P(459963492, 658795109),
+              P(459964238, 658794166), P(459964238, 658793222), P(459967220, 658793222), P(459968711, 658791335),
+              P(459968711, 658790391), P(459971694, 658789448), P(459973185, 658787561), P(459972440, 658786617),
+              P(459970948, 658785674), P(459971694, 658785674), P(459972440, 658784730), P(459973185, 658784730),
+              P(459974677, 658782843), P(459974677, 658780956), P(459973931, 658780012), P(459972440, 658779069),
+              P(459974677, 658776238), P(459975422, 658776238), P(459976168, 658775294), P(459976168, 658772464),
+              P(459979151, 658768690), P(459978405, 658767747), P(459974677, 658767747), P(459973931, 658767747),
+              P(459973931, 658766803), P(459973185, 658765859), P(459973931, 658764916), P(459974677, 658763972),
+              P(459973185, 658762085), P(459972440, 658763029), P(459972440, 658763972), P(459970948, 658763972),
+              P(459969457, 658762085), P(459967220, 658759255), P(459965729, 658761142), P(459966474, 658762085),
+              P(459966474, 658763029), P(459967220, 658763972), P(459967966, 658765859), P(459966474, 658763972),
+              P(459965729, 658763972), P(459964983, 658763029), P(459964238, 658763029), P(459962746, 658762085),
+              P(459962746, 658758311), P(459960509, 658757368), P(459961255, 658757368), P(459962001, 658756425),
+              P(459962746, 658757368), P(459964238, 658758311), P(459964983, 658757368), P(459964983, 658754538),
+              P(459965729, 658753594), P(459965729, 658752651), P(459966474, 658749820), P(459968711, 658749820),
+              P(459970203, 658747934), P(459970948, 658747934), P(459971694, 658748877), P(459975422, 658748877),
+              P(459976914, 658747934), P(459977659, 658748877), P(459977659, 658749820), P(459978405, 658750764),
+              P(459979896, 658750764), P(459980642, 658751707), P(459979896, 658752651), P(459980642, 658754538),
+              P(459979896, 658754538), P(459978405, 658756425), P(459979896, 658758311), P(459982133, 658760198),
+              P(459982879, 658759255), P(459982879, 658757368), P(459982879, 658756425), P(459984370, 658756425),
+              P(459985116, 658754538), P(459985862, 658755481), P(459986607, 658755481), P(459987353, 658754538),
+              P(459989590, 658754538), P(459990335, 658755481), P(459993318, 658755481), P(459994064, 658756425),
+              P(459995555, 658757368), P(459997792, 658757368), P(459999283, 658755481), P(460000029, 658755481),
+              P(460000775, 658754538), P(460001520, 658754538), P(460005994, 658753594), P(460006740, 658752651),
+              P(460006740, 658748877), P(460015159, 658746665), P(460016993, 658743181), P(460018934, 658741224),
+              P(460021004, 658737476), P(460021999, 658737183), P(460023384, 658735123), P(460023408, 658734211),
+              P(460025089, 658733218), P(460025593, 658732682), P(460025750, 658731912), P(460027307, 658730502),
+              P(460029394, 658729746), P(460031228, 658727335), P(460031347, 658725400), P(460033480, 658721843),
+              P(460036162, 658720860), P(460038719, 658718780), P(460039705, 658716680), P(460041375, 658715922),
+              P(460064834, 658706427), P(460068862, 658702772), P(460070622, 658699973), P(460072319, 658697777),
+              P(460076125, 658696302), P(460079628, 658692900), P(460080865, 658690799), P(460088952, 658685780),
+              P(460089317, 658684948), P(460093519, 658682117), P(460095517, 658680634), P(460096865, 658680768),
+              P(460097753, 658679492), P(460100005, 658677676), P(460101673, 658677185), P(460101833, 658676590),
+              P(460102610, 658675853), P(460103402, 658674584), P(460103608, 658675090), P(460103451, 658675519),
+              P(460105147, 658674726), P(460106845, 658673284), P(460107622, 658671897), P(460108350, 658669567),
+              P(460110033, 658666578), P(460111047, 658665682), P(460111699, 658665452), P(460113222, 658664739),
+              P(460115953, 658662933), P(460116778, 658662046), P(460118301, 658661364), P(460119824, 658659541),
+              P(460121299, 658657116), P(460122456, 658655095), P(460123820, 658654025), P(460124550, 658652868),
+              P(460125344, 658649958), P(460126993, 658646153), P(460127025, 658644751), P(460129674, 658640265),
+              P(460131542, 658639967), P(460134024, 658638456), P(460135838, 658637964), P(460137663, 658637864),
+              P(460139143, 658637329), P(460140184, 658636261), P(460141831, 658635827), P(460145514, 658633699),
+              P(460148240, 658632280), P(460150249, 658631417), P(460153419, 658630130), P(460155900, 658629958),
+              P(460157504, 658629610), P(460161351, 658628457), P(460163431, 658626770), P(460165327, 658625092),
+              P(460167407, 658623788), P(460169222, 658622654), P(460170530, 658621085), P(460171365, 658619256),
+              P(460172666, 658617009), P(460174788, 658614645), P(460175648, 658612016), P(460177163, 658610409),
+              P(460177844, 658608175), P(460177734, 658606510), P(460180169, 658601183), P(460182823, 658598828),
+              P(460184195, 658598146), P(460186943, 658595938), P(460188460, 658594061), P(460191320, 658591397),
+              P(460195103, 658589872), P(460197025, 658588682), P(460199415, 658586157), P(460200823, 658585740),
+              P(460203292, 658583081), P(460206332, 658581282), P(460207247, 658581212), P(460209901, 658580496),
+              P(460212853, 658580204), P(460214855, 658579514), P(460215772, 658578884), P(460215640, 658578476),
+              P(460215751, 658578364), P(460215944, 658578825), P(460216967, 658578836), P(460218239, 658578195),
+              P(460218220, 658577990), P(460218368, 658577766), P(460218613, 658577719), P(460218801, 658577912),
+              P(460219475, 658577485), P(460219128, 658576507), P(460219513, 658576835), P(460220257, 658577014),
+              P(460220346, 658576415), P(460221089, 658576846), P(460221738, 658576542), P(460221402, 658575518),
+              P(460221800, 658575159), P(460222408, 658575837), P(460222892, 658575260), P(460223809, 658575510),
+              P(460224697, 658574675), P(460224858, 658574233), P(460226216, 658573707), P(460228589, 658570821),
+              P(460228805, 658569978), P(460230772, 658567478), P(460233591, 658566826), P(460235087, 658566812),
+              P(460236391, 658566160), P(460238319, 658566698), P(460242316, 658566926), P(460245478, 658566138),
+              P(460246745, 658565472), P(460250783, 658563155), P(460251752, 658562335), P(460252257, 658562744),
+              P(460252520, 658562628), P(460252643, 658562087), P(460252343, 658561914), P(460252407, 658561527),
+              P(460252541, 658561288), P(460252887, 658561462), P(460253090, 658561260), P(460253321, 658561458),
+              P(460254128, 658561120), P(460254489, 658560530), P(460255079, 658559315), P(460256450, 658560065),
+              P(460257153, 658559767), P(460259699, 658559423), P(460259644, 658558846), P(460259885, 658559086),
+              P(460260207, 658559126), P(460260329, 658559479), P(460261659, 658559383), P(460263406, 658559671),
+              P(460264523, 658559713), P(460265498, 658559504), P(460266113, 658559010), P(460265805, 658558651),
+              P(460265957, 658558430), P(460267015, 658559251), P(460266813, 658559710), P(460267514, 658560180),
+              P(460268186, 658561375), P(460269149, 658562088), P(460269505, 658562012), P(460269739, 658562389),
+              P(460270104, 658562771), P(460270364, 658563043), P(460270631, 658563949), P(460271696, 658564918),
+              P(460273081, 658565283), P(460275211, 658565150), P(460276516, 658564806), P(460277349, 658564102),
+              P(460276769, 658563531), P(460277288, 658562662), P(460277849, 658562861), P(460278323, 658563611),
+              P(460278740, 658563674), P(460278905, 658563130), P(460278309, 658562424), P(460279733, 658561925),
+              P(460280537, 658562170), P(460280551, 658563038), P(460280937, 658563277), P(460281895, 658563001),
+              P(460283094, 658563144), P(460284425, 658563477), P(460285330, 658563637), P(460287648, 658564806),
+              P(460288953, 658565046), P(460289551, 658564497), P(460289658, 658564913), P(460290364, 658564593),
+              P(460291203, 658564777), P(460291389, 658565842), P(460294665, 658566559), P(460295939, 658567139),
+              P(460296475, 658567226), P(460301381, 658567301), P(460303732, 658567182), P(460306901, 658566638),
+              P(460323788, 658563329), P(460325231, 658563451), P(460326644, 658564022), P(460328319, 658564849),
+              P(460331015, 658565722), P(460336506, 658568055), P(460336633, 658567930), P(460336827, 658568014),
+              P(460336892, 658568215), P(460337689, 658568609), P(460344118, 658571400), P(460345170, 658571585),
+              P(460348556, 658571644), P(460348565, 658572946), P(460345184, 658572907), P(460344223, 658572712),
+              P(460343238, 658572394), P(460342944, 658573107), P(460324908, 658565814), P(460324206, 658567509),
+              P(460324124, 658567544), P(460301897, 658568859), P(460301907, 658569857), P(460303003, 658569840),
+              P(460303008, 658570192), P(460306498, 658573310), P(460306652, 658573412), P(460306810, 658573493),
+              P(460310913, 658575091), P(460310873, 658575181), P(460306545, 658573517), P(460306061, 658574672),
+              P(460307369, 658575194), P(460307327, 658575292), P(460303470, 658573809), P(460303311, 658574186),
+              P(460303971, 658574448), P(460303885, 658574642), P(460301806, 658573815), P(460302150, 658572956),
+              P(460301963, 658572879), P(460300850, 658574639), P(460300857, 658574784), P(460300944, 658574922),
+              P(460301735, 658575226), P(460301884, 658575319), P(460301966, 658575456), P(460301985, 658575599),
+              P(460305423, 658576875), P(460305595, 658576436), P(460307671, 658576657), P(460308813, 658578279),
+              P(460309471, 658578821), P(460310979, 658580383), P(460312717, 658582043), P(460313878, 658582946),
+              P(460315048, 658583713), P(460316631, 658584475), P(460318369, 658584307), P(460321128, 658584419),
+              P(460322546, 658579200), P(460325865, 658580066), P(460328624, 658582594), P(460327723, 658583688),
+              P(460326546, 658585564), P(460328295, 658585544), P(460328769, 658579073), P(460336263, 658583732),
+              P(460334228, 658583856), P(460332878, 658586477), P(460333814, 658585981), P(460334267, 658585859),
+              P(460334701, 658585842), P(460335143, 658585903), P(460335607, 658586072), P(460337375, 658587363),
+              P(460337643, 658587015), P(460338454, 658587623), P(460337251, 658589212), P(460337429, 658589467),
+              P(460337447, 658589692), P(460337361, 658589941), P(460337582, 658590101), P(460338958, 658591099),
+              P(460340555, 658591655), P(460341954, 658591741), P(460343200, 658591549), P(460343690, 658591338),
+              P(460344084, 658591047), P(460344232, 658590761), P(460344218, 658590419), P(460344090, 658590127),
+              P(460343894, 658589929), P(460343634, 658589794), P(460344389, 658588485), P(460341329, 658586678),
+              P(460341490, 658586365), P(460339811, 658585523), P(460339405, 658585570), P(460339083, 658585392),
+              P(460338842, 658584951), P(460338905, 658584504), P(460339509, 658584131), P(460351274, 658590726),
+              P(460351938, 658590715), P(460352456, 658591219), P(460353234, 658590687), P(460356965, 658592720),
+              P(460357046, 658593126), P(460357937, 658593363), P(460359041, 658593303), P(460359414, 658593138),
+              P(460359968, 658593503), P(460361014, 658593741), P(460361181, 658593914), P(460361159, 658594469),
+              P(460364028, 658594966), P(460364588, 658594811), P(460364620, 658593781), P(460365678, 658592842),
+              P(460365712, 658592648), P(460365882, 658592657), P(460365970, 658593104), P(460366137, 658593181),
+              P(460366303, 658593124), P(460366622, 658592636), P(460367193, 658592621), P(460367582, 658592126),
+              P(460368051, 658592641), P(460368483, 658591948), P(460368663, 658591831), P(460368898, 658591866),
+              P(460369073, 658591557), P(460369111, 658591601), P(460368883, 658592058), P(460368726, 658593094),
+              P(460369647, 658593483), P(460370383, 658593294), P(460370064, 658595748), P(460371021, 658598014),
+              P(460371311, 658600082), P(460372361, 658601489), P(460374030, 658601795), P(460377397, 658601311),
+              P(460379733, 658601527), P(460381361, 658601302), P(460382677, 658603803), P(460387906, 658605165),
+              P(460388800, 658605192), P(460390107, 658603926), P(460391340, 658599852), P(460393280, 658602026),
+              P(460394425, 658602659), P(460394940, 658601646), P(460395796, 658603117), P(460395655, 658604055),
+              P(460396364, 658604489), P(460397641, 658604223), P(460398333, 658602296), P(460398933, 658602240),
+              P(460399723, 658602257), P(460400363, 658600662), P(460401296, 658601354), P(460400685, 658598604),
+              P(460401591, 658597861), P(460403195, 658598382), P(460402726, 658599934), P(460402035, 658601405),
+              P(460401852, 658602496), P(460402326, 658603848), P(460403042, 658604732), P(460403461, 658605611),
+              P(460404756, 658605532), P(460406326, 658607211), P(460409309, 658610983), P(460410055, 658611570),
+              P(460412203, 658612785), P(460414206, 658614546), P(460415274, 658614755), P(460416475, 658614939),
+              P(460418143, 658615963), P(460418895, 658616982), P(460419748, 658617584), P(460421561, 658617118),
+              P(460422054, 658619275), P(460421517, 658621299), P(460421232, 658622768), P(460421367, 658623687),
+              P(460424197, 658624976), P(460429442, 658625128), P(460431775, 658626464), P(460433504, 658626627),
+              P(460435902, 658626706), P(460439127, 658626612), P(460441855, 658626569), P(460444331, 658626474),
+              P(460445474, 658626166), P(460446449, 658625881), P(460447171, 658625550), P(460448083, 658625128),
+              P(460448829, 658624185), P(460448829, 658622299), P(460449574, 658621356), P(460451811, 658621356),
+              P(460453302, 658620413), P(460455539, 658623242), P(460457031, 658623242), P(460457776, 658624185),
+              P(460458658, 658624286), P(460459389, 658624374), P(460460469, 658624504), P(460461138, 658624402),
+              P(460462188, 658624330), P(460463239, 658624039), P(460464115, 658623662), P(460464672, 658623271),
+              P(460465113, 658622400), P(460465902, 658621225), P(460465176, 658620194), P(460465432, 658618860),
+              P(460470453, 658619470), P(460471198, 658618527), P(460471198, 658617584), P(460471944, 658617584),
+              P(460473435, 658615698), P(460474926, 658615698), P(460475672, 658614755), P(460476418, 658613812),
+              P(460477163, 658614755), P(460479400, 658611926), P(460480146, 658611926), P(460483874, 658610040),
+              P(460484620, 658609097), P(460484620, 658607211), P(460484620, 658605325), P(460485366, 658606268),
+              P(460486111, 658606268), P(460486857, 658607211), P(460488348, 658607211), P(460489094, 658606268),
+              P(460490585, 658605325), P(460491331, 658606268), P(460492076, 658607211), P(460494313, 658604382),
+              P(460495059, 658601553), P(460495059, 658602496), P(460495805, 658603439), P(460498787, 658603439),
+              P(460499533, 658604382), P(460501024, 658604382), P(460501770, 658605325), P(460503261, 658605325),
+              P(460505498, 658606268), P(460506244, 658605325), P(460507735, 658605325), P(460508481, 658604382),
+              P(460509972, 658603439), P(460510718, 658604382), P(460511463, 658604382), P(460512209, 658605325),
+              P(460512955, 658605325), P(460514446, 658606268), P(460515192, 658605325), P(460515937, 658605325),
+              P(460516683, 658605325), P(460517429, 658606268), P(460518174, 658606268), P(460518920, 658607211),
+              P(460520411, 658607211), P(460521157, 658608154), P(460524140, 658608154), P(460527868, 658608154),
+              P(460528614, 658607211), P(460529359, 658607211), P(460530105, 658606268), P(460530851, 658606268),
+              P(460531596, 658605325), P(460532342, 658605325), P(460533833, 658603439), P(460534579, 658602496),
+              P(460535324, 658603439), P(460536070, 658603439), P(460538307, 658602496), P(460539053, 658601553),
+              P(460539053, 658600610), P(460539798, 658599667), P(460540544, 658599667), P(460542035, 658597781),
+              P(460546509, 658597781), P(460547255, 658596838), P(460548746, 658596838), P(460550238, 658597781),
+              P(460551729, 658595895), P(460553966, 658595895), P(460554711, 658594952), P(460556203, 658594952),
+              P(460557694, 658594952), P(460559185, 658593066), P(460559931, 658593066), P(460560677, 658592123),
+              P(460561422, 658591180), P(460562914, 658590237), P(460565151, 658590237), P(460565896, 658589295),
+              P(460567388, 658589295), P(460568133, 658590237), P(460572607, 658587409), P(460573559, 658588756),
+              P(460574607, 658588470), P(460574781, 658588779), P(460575225, 658588730), P(460574995, 658589470),
+              P(460574748, 658589585), P(460575005, 658591162), P(460576299, 658592783), P(460577367, 658592906),
+              P(460579138, 658592941), P(460582270, 658592735), P(460586200, 658592312), P(460588238, 658591390),
+              P(460588496, 658591424), P(460588732, 658591567), P(460588797, 658591790), P(460588747, 658592066),
+              P(460588650, 658592251), P(460588404, 658592363), P(460588011, 658592396), P(460587996, 658592898),
+              P(460587165, 658592945), P(460587243, 658593815), P(460586952, 658594369), P(460587315, 658594850),
+              P(460588535, 658595247), P(460589151, 658595269), P(460589668, 658595106), P(460589986, 658593499),
+              P(460590642, 658593392), P(460590598, 658593124), P(460590279, 658592347), P(460590284, 658591813),
+              P(460590619, 658591801), P(460592112, 658590314), P(460592972, 658590371), P(460593043, 658593066),
+              P(460593232, 658593452), P(460593598, 658593781), P(460593510, 658591833), P(460594252, 658591836),
+              P(460593911, 658593104), P(460594162, 658593081), P(460594570, 658592364), P(460595705, 658592335),
+              P(460595678, 658592880), P(460596398, 658593053), P(460596393, 658593681), P(460596478, 658594161),
+              P(460595999, 658594925), P(460596392, 658595254), P(460597398, 658595536), P(460598815, 658595766),
+              P(460599092, 658595246), P(460599515, 658595260), P(460600426, 658595099), P(460607653, 658595895),
+              P(460609144, 658595895), P(460610635, 658597781), P(460615855, 658600610), P(460616601, 658599667),
+              P(460617346, 658599667), P(460618838, 658598724), P(460619583, 658597781), P(460620329, 658596838),
+              P(460621075, 658596838), P(460622566, 658594952), P(460623312, 658594009), P(460622566, 658593066),
+              P(460624803, 658590237), P(460624803, 658588352), P(460627040, 658585523), P(460627040, 658584580),
+              P(460630022, 658578923), P(460630768, 658578923), P(460631514, 658577980), P(460632259, 658577037),
+              P(460634496, 658577037), P(460635242, 658577037), P(460636733, 658575151), P(460637479, 658574208),
+              P(460639716, 658574208), P(460641207, 658573265), P(460642699, 658571380), P(460642699, 658569494),
+              P(460642699, 658568551), P(460644190, 658568551), P(460644936, 658567608), P(460647918, 658564780),
+              P(460650901, 658564780), P(460651646, 658565722), P(460652392, 658565722), P(460653883, 658563837),
+              P(460656866, 658563837), P(460659849, 658561951), P(460661340, 658560065), P(460661340, 658558180),
+              P(460660594, 658557237), P(460662831, 658557237), P(460663577, 658556294), P(460663577, 658554408),
+              P(460667305, 658554408), P(460668051, 658553466), P(460668796, 658553466), P(460669542, 658553466),
+              P(460670288, 658552523), P(460671033, 658551580), P(460671779, 658551580), P(460673270, 658551580),
+              P(460676253, 658547809), P(460676999, 658547809), P(460677744, 658546866), P(460678490, 658546866),
+              P(460679981, 658544981), P(460680727, 658544981), P(460681473, 658544038), P(460681473, 658543095),
+              P(460685201, 658538381), P(460686692, 658538381), P(460688184, 658540267), P(460688929, 658539324),
+              P(460688929, 658538381), P(460688929, 658537438), P(460688184, 658536496), P(460686692, 658536496),
+              P(460685947, 658535553), P(460686692, 658535553), P(460687438, 658534610), P(460688184, 658533667),
+              P(460690420, 658533667), P(460691166, 658532725), P(460693403, 658532725), P(460694149, 658531782),
+              P(460694894, 658529897), P(460698623, 658529897), P(460700114, 658528011), P(460700860, 658528011),
+              P(460703097, 658527068), P(460705334, 658524240), P(460705334, 658523298), P(460706825, 658521412),
+              P(460707571, 658521412), P(460708316, 658520469), P(460709807, 658518584), P(460709807, 658517641),
+              P(460710553, 658516699), P(460712044, 658514813), P(460712790, 658514813), P(460713536, 658513871),
+              P(460715027, 658513871), P(460715027, 658511043), P(460715027, 658509157), P(460715773, 658509157),
+              P(460716518, 658508215), P(460717264, 658508215), P(460718755, 658506329), P(460719501, 658506329),
+              P(460720992, 658504444), P(460720992, 658503502), P(460720247, 658502559), P(460720992, 658502559),
+              P(460725466, 658497846), P(460726212, 658497846), P(460726958, 658496903), P(460728449, 658495961),
+              P(460730686, 658495961), P(460731431, 658496903), P(460733668, 658496903), P(460734414, 658496903),
+              P(460735160, 658497846), P(460736651, 658498788), P(460738142, 658498788), P(460738888, 658497846),
+              P(460741125, 658497846), P(460743362, 658497846), P(460744108, 658498788), P(460747090, 658498788),
+              P(460747836, 658498788), P(460748581, 658499731), P(460750073, 658500674), P(460753801, 658500674),
+              P(460754547, 658501616), P(460756784, 658502559), P(460757529, 658502559), P(460759021, 658500674),
+              P(460760512, 658499731), P(460761604, 658499452), P(460762031, 658498629), P(460764141, 658498090),
+              P(460765946, 658497128), P(460765675, 658496145), P(460766513, 658494624), P(460765926, 658493183),
+              P(460766924, 658493278), P(460767223, 658492190), P(460767968, 658492190), P(460768714, 658491248),
+              P(460768714, 658489362), P(460767968, 658488420), P(460767223, 658488420), P(460767223, 658487477),
+              P(460767968, 658485592), P(460770951, 658485592), P(460771697, 658484649), P(460771697, 658483707),
+              P(460770951, 658482764), P(460771697, 658482764), P(460772442, 658481822), P(460772442, 658480879),
+              P(460772442, 658479937), P(460773188, 658479937), P(460773934, 658478994), P(460775425, 658478052),
+              P(460775425, 658477109), P(460775425, 658475224), P(460778408, 658475224), P(460779596, 658471937),
+              P(460778907, 658468946), P(460779620, 658466299), P(460782136, 658465799), P(460783627, 658465799),
+              P(460786405, 658463086), P(460790502, 658463643), P(460790338, 658465799), P(460791829, 658467684),
+              P(460793321, 658467684), P(460794066, 658466741), P(460794812, 658466741), P(460795558, 658466741),
+              P(460796066, 658467971), P(460797434, 658467348), P(460798442, 658466536), P(460799286, 658467684),
+              P(460799638, 658468733), P(460800687, 658469052), P(460801998, 658467807), P(460802424, 658469077),
+              P(460802514, 658469888), P(460803948, 658469692), P(460804235, 658468159), P(460804858, 658467741),
+              P(460805931, 658468634), P(460807095, 658469339), P(460808553, 658468618), P(460811216, 658467684),
+              P(460811962, 658468626), P(460812708, 658468626), P(460814945, 658471454), P(460816436, 658472396),
+              P(460819419, 658472396), P(460820910, 658472396), P(460821656, 658473339), P(460822401, 658473339),
+              P(460822401, 658474281), P(460824638, 658477109), P(460826130, 658479937), P(460826130, 658482764),
+              P(460826875, 658483707), P(460826875, 658485592), P(460826875, 658486535), P(460827621, 658487477),
+              P(460829112, 658489362), P(460830603, 658489362), P(460831349, 658488420), P(460831349, 658487477),
+              P(460832095, 658486535), P(460832095, 658485592), P(460832840, 658484649), P(460833586, 658485592),
+              P(460834332, 658485592), P(460835077, 658486535), P(460835823, 658486535), P(460837314, 658487477),
+              P(460837314, 658488420), P(460838060, 658489362), P(460838806, 658489362), P(460839551, 658489362),
+              P(460839551, 658492190), P(460840297, 658493133), P(460841043, 658492190), P(460845517, 658492190),
+              P(460846262, 658492190), P(460847008, 658493133), P(460847753, 658493133), P(460848499, 658494075),
+              P(460850736, 658494075), P(460851482, 658495018), P(460852973, 658495018), P(460855210, 658495018),
+              P(460855210, 658496903), P(460855956, 658497846), P(460858938, 658497846), P(460861175, 658500674),
+              P(460861921, 658500674), P(460867886, 658505387), P(460868632, 658505387), P(460870869, 658502559),
+              P(460871614, 658501616), P(460873851, 658501616), P(460874597, 658500674), P(460876088, 658500674),
+              P(460876834, 658499731), P(460880562, 658497846), P(460882054, 658497846), P(460884291, 658500674),
+              P(460885782, 658501616), P(460888019, 658501616), P(460889510, 658501616), P(460890256, 658500674),
+              P(460891001, 658500674), P(460891747, 658499731), P(460892493, 658499731), P(460893238, 658498788),
+              P(460893984, 658497846), P(460896221, 658497846), P(460896967, 658496903), P(460898458, 658496903),
+              P(460899204, 658495961), P(460900695, 658495018), P(460902932, 658492190), P(460902932, 658490305),
+              P(460902932, 658489362), P(460903678, 658489362), P(460904423, 658488420), P(460907406, 658484649),
+              P(460908897, 658484649), P(460909643, 658485592), P(460913371, 658485592), P(460914117, 658485592),
+              P(460915608, 658483707), P(460917099, 658483707), P(460918591, 658485592), P(460918591, 658486535),
+              P(460919336, 658487477), P(460920082, 658488420), P(460920082, 658489362), P(460921573, 658491248),
+              P(460922319, 658491248), P(460923065, 658492190), P(460925301, 658495018), P(460927538, 658495018),
+              P(460928284, 658494075), P(460929030, 658494075), P(460930521, 658492190), P(460931267, 658492190),
+              P(460932012, 658491248), P(460933504, 658490305), P(460932758, 658489362), P(460932758, 658488420),
+              P(460933504, 658488420), P(460935741, 658488420), P(460936486, 658489362), P(460936486, 658490305),
+              P(460935741, 658491248), P(460936486, 658492190), P(460937232, 658492190), P(460938723, 658493133),
+              P(460938723, 658495018), P(460940215, 658496903), P(460940960, 658496903), P(460941706, 658495961),
+              P(460942452, 658495961), P(460943197, 658495961), P(460943197, 658496903), P(460943943, 658497846),
+              P(460946925, 658498788), P(460947671, 658497846), P(460949908, 658497846), P(460950654, 658496903),
+              P(460952145, 658496903), P(460953636, 658495018), P(460954382, 658495018), P(460955873, 658494075),
+              P(460957365, 658492190), P(460958856, 658490305), P(460962584, 658490305), P(460963330, 658489362),
+              P(460964076, 658489362), P(460964821, 658488420), P(460967804, 658488420), P(460968549, 658487477),
+              P(460970786, 658487477), P(460972278, 658485592), P(460973023, 658484649), P(460975582, 658483888),
+              P(460977373, 658483279), P(460979473, 658482394), P(460980660, 658481132), P(460980208, 658480081),
+              P(460981405, 658478732), P(460982232, 658479711), P(460984171, 658479386), P(460985895, 658479045),
+              P(460986314, 658480002), P(460987191, 658480879), P(460987740, 658481336), P(460988241, 658481996),
+              P(460988682, 658482503), P(460989341, 658483112), P(460990173, 658483707), P(460990897, 658483990),
+              P(460991425, 658484425), P(460992671, 658485433), P(460994800, 658485664), P(460996353, 658485760),
+              P(460997875, 658486143), P(460999578, 658486585), P(461001119, 658487455), P(461002229, 658487820),
+              P(461003611, 658487410), P(461005086, 658487477), P(461005889, 658488178), P(461007323, 658488420),
+              P(461008808, 658489151), P(461012391, 658488920), P(461016232, 658488562), P(461017025, 658488511),
+              P(461018664, 658488588), P(461019227, 658488127), P(461020404, 658489023), P(461020788, 658488229),
+              P(461020576, 658486337), P(461024850, 658486190), P(461025294, 658486529), P(461028323, 658490139),
+              P(461028482, 658490828), P(461028412, 658491387), P(461027853, 658493050), P(461027130, 658495355),
+              P(461027339, 658496264), P(461028085, 658497660), P(461028528, 658498043), P(461031208, 658498089),
+              P(461033351, 658498659), P(461035611, 658498962), P(461038431, 658498742), P(461039713, 658498312),
+              P(461039899, 658496321), P(461039712, 658494656), P(461042765, 658493830), P(461043627, 658494622),
+              P(461045352, 658494889), P(461046622, 658494625), P(461048423, 658493908), P(461048831, 658492716),
+              P(461050506, 658492621), P(461051735, 658491355), P(461053721, 658490222), P(461055314, 658490866),
+              P(461056727, 658491022), P(461058332, 658490426), P(461060265, 658488420), P(461061756, 658490305),
+              P(461063993, 658490305), P(461064739, 658491248), P(461066230, 658490305), P(461066230, 658491248),
+              P(461066976, 658492190), P(461068467, 658494075), P(461069213, 658493133), P(461069958, 658493133),
+              P(461070704, 658493133), P(461071450, 658494075), P(461072195, 658494075), P(461072941, 658495018),
+              P(461073687, 658495961), P(461078161, 658495961), P(461078906, 658495018), P(461080398, 658496903),
+              P(461083380, 658497846), P(461084871, 658497846), P(461085617, 658496903), P(461087108, 658495961),
+              P(461088600, 658495961), P(461089345, 658496903), P(461090837, 658496903), P(461091582, 658495961),
+              P(461092328, 658495961), P(461093074, 658495018), P(461093819, 658494075), P(461095311, 658493133),
+              P(461099039, 658493133), P(461099785, 658494075), P(461101276, 658495018), P(461102021, 658495018),
+              P(461102767, 658494075), P(461104258, 658494075), P(461106495, 658495018), P(461107987, 658493133),
+              P(461108732, 658492190), P(461109478, 658493133), P(461110224, 658493133), P(461110969, 658493133),
+              P(461111715, 658494075), P(461113952, 658494075), P(461114698, 658494075), P(461115443, 658495018),
+              P(461116189, 658495018), P(461116935, 658495961), P(461117680, 658495961), P(461119172, 658496903),
+              P(461119917, 658495961), P(461120663, 658495961), P(461121409, 658496903), P(461122900, 658496903),
+              P(461125137, 658497846), P(461131848, 658497846), P(461132593, 658498788), P(461140050, 658498788),
+              P(461140796, 658497846), P(461141541, 658497846), P(461146015, 658498788), P(461146761, 658497846),
+              P(461151235, 658497846), P(461151980, 658497846), P(461152726, 658496903), P(461154217, 658496903),
+              P(461155709, 658495961), P(461157200, 658495961), P(461157946, 658496903), P(461158691, 658495961),
+              P(461160183, 658495018), P(461160928, 658495961), P(461164656, 658495961), P(461165402, 658495018),
+              P(461166148, 658495018), P(461169130, 658495018), P(461169876, 658494075), P(461171367, 658493133),
+              P(461174350, 658493133), P(461175096, 658494075), P(461175841, 658494075), P(461176587, 658493133),
+              P(461178824, 658493133), P(461181061, 658493133), P(461181806, 658492190), P(461182552, 658492190),
+              P(461183298, 658491248), P(461186280, 658491248), P(461187026, 658490305), P(461191500, 658490305),
+              P(461192246, 658489362), P(461195228, 658489362), P(461195974, 658488420), P(461196720, 658485592),
+              P(461197465, 658486535), P(461198211, 658486535), P(461198957, 658487477), P(461201193, 658487477),
+              P(461201939, 658486535), P(461208650, 658486535), P(461210141, 658488420), P(461211633, 658488420),
+              P(461213124, 658490305), P(461213870, 658490305), P(461215361, 658492190), P(461218344, 658494075),
+              P(461221326, 658497846), P(461221326, 658498788), P(461222072, 658499731), P(461222817, 658500674),
+              P(461223563, 658500674), P(461225054, 658502559), P(461225800, 658503502), P(461226546, 658503502),
+              P(461226546, 658504444), P(461227291, 658505387), P(461229528, 658508215), P(461230274, 658508215),
+              P(461231020, 658509157), P(461231765, 658509157), P(461233257, 658511043), P(461234002, 658511043),
+              P(461235494, 658511985), P(461236985, 658513871), P(461238246, 658516094), P(461239479, 658517024),
+              P(461240411, 658517735), P(461241972, 658518607), P(461243182, 658518956), P(461244416, 658519015),
+              P(461245724, 658519015), P(461246678, 658519852), P(461247589, 658520645), P(461248915, 658521412),
+              P(461250407, 658522355), P(461251152, 658523298), P(461251728, 658524410), P(461252750, 658525025),
+              P(461253389, 658525183), P(461253881, 658525565), P(461255559, 658526435), P(461256920, 658527059),
+              P(461259818, 658528011), P(461262482, 658528732), P(461264607, 658529187), P(461265807, 658529460),
+              P(461267737, 658529354), P(461269001, 658528869), P(461270849, 658528751), P(461272304, 658528357),
+              P(461272849, 658527664), P(461273451, 658528315), P(461274005, 658529041), P(461274905, 658529521),
+              P(461276063, 658529727), P(461277313, 658529813), P(461279068, 658529743), P(461280156, 658529701),
+              P(461280943, 658529754), P(461282175, 658529700), P(461283200, 658529165), P(461284155, 658530385),
+              P(461284536, 658531678), P(461285027, 658532440), P(461285951, 658533457), P(461286872, 658534377),
+              P(461287831, 658534793), P(461288930, 658534773), P(461291064, 658533668), P(461291418, 658533667),
+              P(461292173, 658533048), P(461292909, 658532725), P(461295146, 658530839), P(461298129, 658530839),
+              P(461298874, 658529897), P(461299620, 658529897), P(461302602, 658528954), P(461303348, 658529897),
+              P(461304094, 658529897), P(461304839, 658529897), P(461307076, 658532725), P(461307822, 658533667),
+              P(461308568, 658533667), P(461309313, 658534610), P(461310805, 658534610), P(461312296, 658535553),
+              P(461319007, 658535553), P(461319752, 658534610), P(461324226, 658534610), P(461325718, 658533667),
+              P(461329446, 658533667), P(461332429, 658536496), P(461334666, 658536496), P(461336174, 658533105),
+              P(461337181, 658531631), P(461338942, 658530506), P(461341376, 658531782), P(461343425, 658531616),
+              P(461345121, 658530950), P(461347342, 658530839), P(461348770, 658530649), P(461349841, 658529695),
+              P(461351459, 658528145), P(461355544, 658528011), P(461356290, 658528954), P(461356512, 658530286),
+              P(461357035, 658531782), P(461357781, 658533667), P(461358385, 658536654), P(461359892, 658538143),
+              P(461361565, 658539261), P(461363247, 658540600), P(461363921, 658541313), P(461365393, 658543713),
+              P(461367054, 658544520), P(461367703, 658545588), P(461369220, 658547437), P(461370841, 658548151),
+              P(461371720, 658548342), P(461374261, 658549580), P(461375638, 658549942), P(461377697, 658550142),
+              P(461381188, 658550371), P(461383399, 658549961), P(461384583, 658549542), P(461385411, 658549180),
+              P(461386579, 658547919), P(461385738, 658547331), P(461386219, 658546154), P(461385248, 658545644),
+              P(461385452, 658545208), P(461386576, 658545713), P(461387359, 658544430), P(461387830, 658543651),
+              P(461388022, 658543000), P(461388465, 658542781), P(461388761, 658542927), P(461389240, 658543565),
+              P(461390450, 658545131), P(461391383, 658546422), P(461392401, 658547790), P(461393315, 658548989),
+              P(461394064, 658550037), P(461394839, 658551341), P(461395683, 658552827), P(461396539, 658554227),
+              P(461396942, 658555018), P(461397152, 658557151), P(461397590, 658558778), P(461398602, 658560055),
+              P(461401029, 658561951), P(461403266, 658562894), P(461412959, 658562894), P(461413705, 658563837),
+              P(461414451, 658563837), P(461415942, 658564780), P(461416688, 658563837), P(461416688, 658562894),
+              P(461415196, 658561008), P(461413705, 658561008), P(461414451, 658559123), P(461415942, 658561008),
+              P(461416688, 658561008), P(461418179, 658561951), P(461418924, 658562894), P(461418924, 658563837),
+              P(461420416, 658565722), P(461429364, 658565722), P(461430109, 658566665), P(461430855, 658565722),
+              P(461433092, 658568551), P(461433092, 658569494), P(461433838, 658570437), P(461434583, 658570437),
+              P(461437566, 658572322), P(461438311, 658571380), P(461439057, 658572322), P(461439803, 658571380),
+              P(461439803, 658570437), P(461440548, 658569494), P(461440548, 658568551), P(461440548, 658567608),
+              P(461442040, 658565722), P(461443531, 658562894), P(461444277, 658563837), P(461444277, 658564780),
+              P(461443531, 658565722), P(461443531, 658566665), P(461442785, 658567608), P(461442040, 658570437),
+              P(461443531, 658572322), P(461443531, 658574208), P(461443531, 658575151), P(461445768, 658577980),
+              P(461447259, 658578923), P(461447259, 658579865), P(461448005, 658581751), P(461448751, 658581751),
+              P(461449496, 658582694), P(461452479, 658582694), P(461453225, 658581751), P(461453970, 658581751),
+              P(461456207, 658581751), P(461456953, 658582694), P(461457698, 658582694), P(461457698, 658584580),
+              P(461458444, 658585523), P(461459190, 658585523), P(461459935, 658586466), P(461460681, 658586466),
+              P(461461427, 658587409), P(461462918, 658587409), P(461463664, 658588352), P(461463664, 658589295),
+              P(461464409, 658591180), P(461465155, 658591180), P(461465901, 658592123), P(461466646, 658592123),
+              P(461467392, 658592123), P(461468138, 658593066), P(461469629, 658594009), P(461470375, 658594009),
+              P(461471120, 658594009), P(461471866, 658594952), P(461472612, 658594952), P(461473357, 658595895),
+              P(461474849, 658596838), P(461476340, 658596838), P(461477085, 658596838), P(461477831, 658597781),
+              P(461478577, 658597781), P(461479322, 658598724), P(461482305, 658601553), P(461483796, 658601553),
+              P(461484542, 658602496), P(461486033, 658602496), P(461486779, 658602496), P(461487525, 658603439),
+              P(461489762, 658603439), P(461490507, 658603439), P(461491253, 658604382), P(461492744, 658604382),
+              P(461494236, 658605325), P(461498709, 658605325), P(461499455, 658605325), P(461500201, 658606268),
+              P(461501692, 658606268), P(461507657, 658609097), P(461511751, 658608793), P(461514507, 658608419),
+              P(461516636, 658608495), P(461518823, 658608661), P(461521066, 658608926), P(461522987, 658609097),
+              P(461525060, 658609186), P(461526849, 658609186), P(461527973, 658609154), P(461530646, 658609097),
+              P(461532434, 658609034), P(461533275, 658608850), P(461534501, 658609097), P(461536239, 658609229),
+              P(461538217, 658609072), P(461540125, 658609704), P(461541957, 658610983), P(461543411, 658611533),
+              P(461544934, 658611907), P(461547524, 658612305), P(461549692, 658612641), P(461552226, 658613172),
+              P(461554539, 658613527), P(461556858, 658613243), P(461558362, 658612869), P(461561424, 658612655),
+              P(461563189, 658611778), P(461562476, 658610864), P(461562525, 658610338), P(461568795, 658604963),
+              P(461569325, 658604868), P(461569692, 658605461), P(461572422, 658604499), P(461572883, 658603883),
+              P(461573685, 658603846), P(461574238, 658604326), P(461574412, 658605282), P(461575309, 658605163),
+              P(461575259, 658604561), P(461575524, 658604301), P(461575793, 658604515), P(461575877, 658605352),
+              P(461577672, 658607192), P(461579638, 658608338), P(461581457, 658608585), P(461583486, 658608490),
+              P(461585635, 658607945), P(461587392, 658607414), P(461588896, 658606945), P(461590911, 658606338),
+              P(461592586, 658605907), P(461593888, 658605566), P(461595089, 658605514), P(461596503, 658605249),
+              P(461598633, 658604832), P(461600011, 658603875), P(461600933, 658602737), P(461601622, 658602079),
+              P(461602943, 658602060), P(461604333, 658601623), P(461605610, 658601117), P(461606924, 658600586),
+              P(461608914, 658599662), P(461609869, 658598851), P(461610615, 658598055), P(461611379, 658597662),
+              P(461613483, 658596668), P(461615777, 658596838), P(461616523, 658595895), P(461617268, 658595895),
+              P(461618014, 658595895), P(461618760, 658594952), P(461619505, 658594009), P(461621742, 658594009),
+              P(461622488, 658593066), P(461623979, 658593066), P(461624725, 658592123), P(461630690, 658589295),
+              P(461631436, 658590237), P(461632182, 658590237), P(461632927, 658590237), P(461633673, 658589295),
+              P(461636655, 658589295), P(461637401, 658588352), P(461640384, 658588352), P(461641129, 658587409),
+              P(461641875, 658587409), P(461642621, 658586466), P(461642621, 658585523), P(461643366, 658584580),
+              P(461644858, 658582694), P(461647840, 658582694), P(461648586, 658581751), P(461649332, 658581751),
+              P(461650077, 658580808), P(461650823, 658580808), P(461652314, 658580808), P(461653805, 658578923),
+              P(461655297, 658578923), P(461656042, 658577980), P(461656788, 658577980), P(461657534, 658577037),
+              P(461659771, 658575151), P(461663499, 658575151), P(461666482, 658572322), P(461667227, 658573265),
+              P(461669464, 658573265), P(461670210, 658572322), P(461671701, 658571380), P(461673938, 658571380),
+              P(461674684, 658572322), P(461676921, 658572322), P(461677666, 658571380), P(461679903, 658571380),
+              P(461682886, 658572322), P(461683632, 658571380), P(461686614, 658571380), P(461687360, 658570437),
+              P(461689597, 658570437), P(461692580, 658568551), P(461693325, 658568551), P(461694071, 658569494),
+              P(461695562, 658569494), P(461697053, 658568551), P(461697799, 658569494), P(461698545, 658569494),
+              P(461699290, 658570437), P(461700036, 658570437), P(461702273, 658572322), P(461703019, 658572322),
+              P(461703764, 658571380), P(461704510, 658572322), P(461706747, 658573265), P(461708238, 658573265),
+              P(461708984, 658572322), P(461709730, 658572322), P(461710818, 658572834), P(461713908, 658574810),
+              P(461713754, 658575197), P(461715585, 658576916), P(461716254, 658576854), P(461716364, 658577471),
+              P(461716224, 658578119), P(461717043, 658579923), P(461719644, 658584542), P(461721010, 658586692),
+              P(461723105, 658588556), P(461724898, 658590294), P(461726024, 658591052), P(461726529, 658591228),
+              P(461727319, 658591031), P(461727557, 658591265), P(461728240, 658591308), P(461728987, 658591301),
+              P(461731639, 658592213), P(461734336, 658593066), P(461739393, 658594692), P(461744079, 658595601),
+              P(461749187, 658596294), P(461751390, 658596528), P(461753057, 658596372), P(461754469, 658595895),
+              P(461756804, 658594958), P(461760459, 658596134), P(461762057, 658596497), P(461764128, 658596497),
+              P(461766160, 658596559), P(461772328, 658595878), P(461775449, 658595284), P(461778424, 658595020),
+              P(461783667, 658594363), P(461786524, 658594116), P(461789926, 658593916), P(461791737, 658594338),
+              P(461795387, 658595088), P(461796660, 658595501), P(461797717, 658595895), P(461798664, 658596352),
+              P(461800159, 658596655), P(461801719, 658597525), P(461803682, 658597781), P(461804428, 658597781),
+              P(461805919, 658599667), P(461806665, 658599667), P(461807410, 658600610), P(461808156, 658601553),
+              P(461809647, 658601553), P(461810393, 658602496), P(461811138, 658602496), P(461812630, 658604382),
+              P(461813375, 658604382), P(461814867, 658606268), P(461815612, 658606268), P(461816358, 658607211),
+              P(461817104, 658608154), P(461817849, 658608154), P(461819341, 658609097), P(461820086, 658610040),
+              P(461820832, 658610983), P(461824560, 658612869), P(461824560, 658613812), P(461825306, 658614755),
+              P(461826052, 658614755), P(461827543, 658616641), P(461827543, 658619470), P(461828289, 658620413),
+              P(461829034, 658622299), P(461831271, 658625128), P(461832017, 658625128), P(461836491, 658630786),
+              P(461837236, 658631729), P(461837982, 658631729), P(461839473, 658632672), P(461839473, 658633615),
+              P(461840219, 658634559), P(461840219, 658635502), P(461844693, 658641160), P(461845439, 658641160),
+              P(461846930, 658643046), P(461848421, 658643990), P(461848421, 658644933), P(461851404, 658649648),
+              P(461852895, 658649648), P(461853641, 658650591), P(461854386, 658650591), P(461856623, 658653421),
+              P(461857369, 658654364), P(461860352, 658655307), P(461860352, 658658137), P(461862589, 658660966),
+              P(461862589, 658661909), P(461863334, 658662852), P(461863334, 658663796), P(461865571, 658666625),
+              P(461865571, 658670398), P(461865571, 658671341), P(461866317, 658672284), P(461867808, 658672284),
+              P(461867808, 658676057), P(461867808, 658677000), P(461869300, 658678887), P(461870045, 658678887),
+              P(461870045, 658680773), P(461873028, 658684546), P(461874519, 658685489), P(461874519, 658687376),
+              P(461875265, 658688319), P(461875265, 658689262), P(461876010, 658690206), P(461876756, 658690206),
+              P(461877502, 658691149), P(461878247, 658692092), P(461878247, 658693979), P(461880484, 658696809),
+              P(461883467, 658701525), P(461883467, 658707185), P(461884213, 658708128), P(461884958, 658708128),
+              P(461884958, 658713788), P(461886450, 658715675), P(461886450, 658716618), P(461885704, 658718505),
+              P(461886450, 658719448), P(461886450, 658720392), P(461887195, 658722279), P(461887941, 658723222),
+              P(461887195, 658724165), P(461887195, 658725109), P(461887941, 658726052), P(461888687, 658726052),
+              P(461888687, 658731712), P(461890178, 658733599), P(461890178, 658736430), P(461891669, 658740203),
+              P(461891669, 658742090), P(461890923, 658743034), P(461890923, 658743977), P(461891669, 658744920),
+              P(461890923, 658745864), P(461890923, 658746807), P(461890178, 658747751), P(461890178, 658748694),
+              P(461889432, 658748694), P(461888687, 658749638), P(461888687, 658750581), P(461888687, 658752468),
+              P(461887941, 658752468), P(461887195, 658753412), P(461886450, 658754355), P(461886450, 658755299),
+              P(461885704, 658756242), P(461884958, 658757186), P(461884958, 658758129), P(461884958, 658759073),
+              P(461884213, 658760016), P(461881976, 658762847), P(461881976, 658772282), P(461881230, 658773225),
+              P(461880484, 658775113), P(461880484, 658776056), P(461881230, 658777943), P(461879739, 658779830),
+              P(461879739, 658780774), P(461878247, 658782661), P(461878993, 658783605), P(461877502, 658786435),
+              P(461877502, 658788323), P(461878247, 658789266), P(461878247, 658793041), P(461878247, 658793984),
+              P(461878993, 658794928), P(461879739, 658794928), P(461879739, 658800590), P(461881230, 658802477),
+              P(461881230, 658803421), P(461881976, 658804364), P(461881976, 658806252)};
 
-  P arrB12[] = { P(460986784, 658459776), P(460986675, 658459120), P(460986911, 658458209), P(460986865, 658456699), P(460986496, 658455767), P(460985720, 658455182), P(460984758, 658454922), P(460983868, 658454994), P(460983176, 658455313), P(460982578, 658455918), P(460982196, 658456621), P(460982791, 658456864), P(460983017, 658457388), P(460983090, 658457898), P(460983015, 658458501), P(460982684, 658458929), P(460983022, 658459341), P(460983545, 658459650), P(460984420, 658459870), P(460985415, 658459817), P(460986086, 658459523), P(460986169, 658459873), P(460984610, 658460861), P(460984881, 658461398), P(460984024, 658461925), P(460981370, 658462644), P(460980169, 658462674), P(460979105, 658462345), P(460977673, 658461169), P(460976946, 658460135), P(460976612, 658459084), P(460977140, 658456574), P(460977610, 658455908), P(460978137, 658455628), P(460978622, 658454600), P(460979642, 658453610), P(460980599, 658451968), P(460981467, 658450813), P(460982683, 658451476), P(460983145, 658451820), P(460983526, 658452079), P(460984186, 658451938), P(460984436, 658452359), P(460984747, 658452842), P(460985231, 658452585), P(460985611, 658453076), P(460986266, 658453607), P(460986582, 658454102), P(460986388, 658454517), P(460987607, 658455824), P(460987499, 658455965), P(460987738, 658456317), P(460988016, 658456213), P(460989034, 658457433), P(460989226, 658458420), P(460989753, 658457582), P(460990273, 658459236), P(460990231, 658459809), P(460989818, 658460006), P(460989019, 658460196), P(460988166, 658460356), P(460987511, 658460305) };
+P arrB12[] = {P(460986784, 658459776), P(460986675, 658459120), P(460986911, 658458209), P(460986865, 658456699),
+              P(460986496, 658455767), P(460985720, 658455182), P(460984758, 658454922), P(460983868, 658454994),
+              P(460983176, 658455313), P(460982578, 658455918), P(460982196, 658456621), P(460982791, 658456864),
+              P(460983017, 658457388), P(460983090, 658457898), P(460983015, 658458501), P(460982684, 658458929),
+              P(460983022, 658459341), P(460983545, 658459650), P(460984420, 658459870), P(460985415, 658459817),
+              P(460986086, 658459523), P(460986169, 658459873), P(460984610, 658460861), P(460984881, 658461398),
+              P(460984024, 658461925), P(460981370, 658462644), P(460980169, 658462674), P(460979105, 658462345),
+              P(460977673, 658461169), P(460976946, 658460135), P(460976612, 658459084), P(460977140, 658456574),
+              P(460977610, 658455908), P(460978137, 658455628), P(460978622, 658454600), P(460979642, 658453610),
+              P(460980599, 658451968), P(460981467, 658450813), P(460982683, 658451476), P(460983145, 658451820),
+              P(460983526, 658452079), P(460984186, 658451938), P(460984436, 658452359), P(460984747, 658452842),
+              P(460985231, 658452585), P(460985611, 658453076), P(460986266, 658453607), P(460986582, 658454102),
+              P(460986388, 658454517), P(460987607, 658455824), P(460987499, 658455965), P(460987738, 658456317),
+              P(460988016, 658456213), P(460989034, 658457433), P(460989226, 658458420), P(460989753, 658457582),
+              P(460990273, 658459236), P(460990231, 658459809), P(460989818, 658460006), P(460989019, 658460196),
+              P(460988166, 658460356), P(460987511, 658460305)};
 
-  P arrB13[] = { P(461372255, 659042686), P(461372543, 659042686), P(461372671, 659042814), P(461372703, 659043134), P(461372479, 659043198), P(461372191, 659043198), P(461372095, 659042942), P(461372158, 659042781) };
+P arrB13[] = {P(461372255, 659042686), P(461372543, 659042686), P(461372671, 659042814), P(461372703, 659043134),
+              P(461372479, 659043198), P(461372191, 659043198), P(461372095, 659042942), P(461372158, 659042781)};
 
-  P arrB14[] = { P(455913148, 661963263), P(455914403, 661963571), P(455918217, 661963878), P(455919087, 661965055), P(455920828, 661965823), P(455922620, 661965567), P(455922825, 661968972), P(455922159, 661971506), P(455920987, 661974197), P(455919804, 661975987), P(455917065, 661977599), P(455912943, 661978828), P(455909078, 661978521), P(455906851, 661977651), P(455908233, 661973734), P(455909411, 661972658), P(455910747, 661971637), P(455912282, 661969846), P(455913563, 661966262), P(455913307, 661964470) };
+P arrB14[] = {P(455913148, 661963263), P(455914403, 661963571), P(455918217, 661963878), P(455919087, 661965055),
+              P(455920828, 661965823), P(455922620, 661965567), P(455922825, 661968972), P(455922159, 661971506),
+              P(455920987, 661974197), P(455919804, 661975987), P(455917065, 661977599), P(455912943, 661978828),
+              P(455909078, 661978521), P(455906851, 661977651), P(455908233, 661973734), P(455909411, 661972658),
+              P(455910747, 661971637), P(455912282, 661969846), P(455913563, 661966262), P(455913307, 661964470)};
 
-  P arrB15[] = { P(455317437, 662167343), P(455332101, 662159278), P(455346724, 662154106), P(455350628, 662151103), P(455359788, 662139691), P(455364293, 662139841), P(455373453, 662137288), P(455378859, 662132633), P(455380661, 662127528), P(455394776, 662125275), P(455399130, 662121822), P(455404987, 662118518), P(455412194, 662116416), P(455424207, 662108908), P(455433667, 662103502), P(455446431, 662093141), P(455450936, 662091489), P(455455441, 662089537), P(455457543, 662082630), P(455466703, 662079176), P(455475262, 662073620), P(455480667, 662070317), P(455486974, 662065812), P(455489527, 662062508), P(455493581, 662064461), P(455500038, 662062358), P(455501990, 662065812), P(455504693, 662065662), P(455506495, 662063560), P(455509798, 662058604), P(455513252, 662057103), P(455515805, 662052898), P(455521661, 662054550), P(455526466, 662060106), P(455529319, 662063409), P(455531872, 662063109), P(455535176, 662059956), P(455542834, 662060406), P(455541933, 662066263), P(455542083, 662069566), P(455544035, 662069416), P(455548540, 662067163), P(455551543, 662067914), P(455556198, 662065362), P(455561904, 662064611), P(455565808, 662062208), P(455568962, 662063560), P(455572716, 662063860), P(455576169, 662061457), P(455582326, 662061758), P(455586831, 662067013), P(455589684, 662067464), P(455591336, 662065812), P(455593288, 662067464), P(455595090, 662068965), P(455599294, 662068365), P(455601096, 662064761), P(455603799, 662063860), P(455606502, 662065211), P(455611457, 662063560), P(455617163, 662062508), P(455619115, 662066112), P(455623620, 662066563), P(455628275, 662064611), P(455631428, 662065061), P(455633981, 662063109), P(455637435, 662065362), P(455638186, 662068064), P(455640288, 662068214), P(455642234, 662065622), P(455643905, 662065564), P(455646333, 662066011), P(455649336, 662063903), P(455653872, 662063775), P(455654804, 662063501), P(455655817, 662063208), P(455657763, 662062031), P(455660067, 662060802), P(455658664, 662059494), P(455658728, 662053488), P(455659431, 662048185), P(455662498, 662045246), P(455665117, 662044160), P(455660964, 662041668), P(455658153, 662039943), P(455657322, 662036238), P(455655661, 662032979), P(455657259, 662028698), P(455651061, 662025120), P(455645566, 662021798), P(455645183, 662016878), P(455650678, 662012023), P(455659367, 662005314), P(455666076, 662001800), P(455671123, 662001736), P(455679493, 662006975), P(455682240, 662006847), P(455686649, 662010233), P(455691313, 662012533), P(455693996, 662014898), P(455692695, 662019811), P(455691076, 662025316), P(455687837, 662029958), P(455684491, 662034816), P(455680928, 662040213), P(455677366, 662041401), P(455677150, 662048094), P(455679633, 662048849), P(455682332, 662053599), P(455683346, 662055431), P(455686622, 662055226), P(455687082, 662053059), P(455690632, 662048799), P(455697839, 662048493), P(455697839, 662049673), P(455691156, 662050066), P(455688273, 662053211), P(455689365, 662055046), P(455693296, 662054696), P(455695655, 662052163), P(455699019, 662051988), P(455699936, 662051245), P(455700460, 662051333), P(455701189, 662051259), P(455702187, 662051259), P(455702801, 662050619), P(455703237, 662049953), P(455705003, 662049159), P(455704952, 662048366), P(455704133, 662047854), P(455702238, 662047470), P(455700446, 662047316), P(455699371, 662046983), P(455698415, 662046144), P(455698014, 662044999), P(455702644, 662044868), P(455708192, 662044824), P(455711468, 662048755), P(455714962, 662053255), P(455718488, 662057144), P(455721884, 662057748), P(455723168, 662060163), P(455727244, 662060012), P(455727093, 662058201), P(455731471, 662057899), P(455734641, 662058352), P(455738641, 662056842), P(455742113, 662054729), P(455746265, 662054729), P(455750492, 662052766), P(455755624, 662049370), P(455761738, 662046652), P(455766569, 662049068), P(455770645, 662051861), P(455776080, 662055634), P(455782194, 662058880), P(455788987, 662059333), P(455796007, 662058956), P(455801592, 662055710), P(455803253, 662050351), P(455809216, 662054578), P(455817066, 662059786), P(455825104, 662060239), P(455833181, 662058956), P(455840427, 662058427), P(455845786, 662055786), P(455849862, 662056087), P(455857863, 662052011), P(455857712, 662049068), P(455866921, 662046501), P(455872808, 662041897), P(455878092, 662036462), P(455884961, 662032084), P(455891528, 662032084), P(455899680, 662031858), P(455908813, 662026876), P(455918550, 662021064), P(455927306, 662021291), P(455939458, 662021215), P(455948667, 662019102), P(455958253, 662023933), P(455969801, 662024536), P(455977953, 662028914), P(455989200, 662029442), P(455991917, 662034802), P(455995314, 662031254), P(456003839, 662028085), P(456014104, 662022500), P(456023468, 662018800), P(456031394, 662019177), P(456036979, 662025744), P(456045395, 662028235), P(456048264, 662035255), P(456052415, 662036010), P(456062228, 662024159), P(456066756, 662020234), P(456071059, 662021140), P(456078834, 662013742), P(456085966, 662014497), P(456094420, 662013969), P(456101138, 662018724), P(456104912, 662018951), P(456105221, 662018324), P(456106497, 662015856), P(456112309, 662016384), P(456109139, 662021291), P(456104686, 662024008), P(456106195, 662030047), P(456104912, 662032613), P(456106044, 662038500), P(456111177, 662042652), P(456117366, 662042199), P(456124009, 662034500), P(456126500, 662035707), P(456118348, 662044388), P(456112762, 662046275), P(456112347, 662052276), P(456110233, 662055672), P(456112800, 662059371), P(456117102, 662059748), P(456117857, 662062617), P(456113781, 662064352), P(456111743, 662070014), P(456113630, 662071297), P(456115895, 662070165), P(456117781, 662072127), P(456116951, 662073184), P(456112875, 662073184), P(456112724, 662074467), P(456114536, 662076845), P(456113479, 662080467), P(456115291, 662082128), P(456117253, 662082128), P(456119442, 662084543), P(456117102, 662088091), P(456119593, 662090884), P(456118008, 662093903), P(456115743, 662099640), P(456118612, 662106282), P(456118989, 662112396), P(456116196, 662120548), P(456118346, 662124343), P(456118385, 662124397), P(456123971, 662123567), P(456127594, 662124926), P(456128047, 662128322), P(456130764, 662131040), P(456133633, 662131191), P(456136576, 662135116), P(456136954, 662138135), P(456140652, 662139569), P(456141935, 662141003), P(456144804, 662140701), P(456146313, 662139418), P(456149786, 662140098), P(456150276, 662143230), P(456155862, 662145947), P(456162655, 662148287), P(456168165, 662147608), P(456173600, 662144362), P(456175336, 662149872), P(456176996, 662156892), P(456170580, 662162553), P(456169674, 662171800), P(456175411, 662179498), P(456181676, 662177234), P(456187337, 662182367), P(456194357, 662182895), P(456197311, 662192960), P(456205575, 662201975), P(456214027, 662214184), P(456210271, 662225829), P(456213464, 662241230), P(456206139, 662252311), P(456193555, 662261702), P(456199377, 662290157), P(456195057, 662292035), P(456188671, 662277949), P(456181722, 662274944), P(456177402, 662281893), P(456174209, 662276634), P(456163316, 662278137), P(456166133, 662282832), P(456171580, 662282832), P(456169702, 662289782), P(456162940, 662289218), P(456163503, 662308188), P(456157493, 662327909), P(456164067, 662344719), P(456173646, 662356364), P(456190362, 662347912), P(456198814, 662361247), P(456208205, 662366318), P(456207454, 662371765), P(456187545, 662379278), P(456168199, 662397309), P(456160874, 662416842), P(456154335, 662436711), P(456157607, 662459144), P(456143119, 662470828), P(456135174, 662484381), P(456121620, 662486718), P(456108534, 662500739), P(456082362, 662516629), P(456065537, 662539062), P(456052919, 662539062), P(456042169, 662545605), P(456031888, 662560561), P(456010389, 662557289), P(455985152, 662550746), P(455969963, 662544904), P(455962952, 662547241), P(455952203, 662542567), P(455948464, 662553317), P(455944726, 662562196), P(455933976, 662562664), P(455919021, 662545839), P(455910141, 662567804), P(455904533, 662559392), P(455888175, 662558925), P(455876491, 662567804), P(455860601, 662574815), P(455839570, 662580423), P(455811996, 662585097), P(455799377, 662599585), P(455782085, 662592107), P(455768064, 662592341), P(455752642, 662601221), P(455741892, 662615709), P(455741892, 662597482), P(455731143, 662601221), P(455724133, 662610100), P(455700298, 662609633), P(455693755, 662601688), P(455695624, 662589069), P(455677864, 662586265), P(455656833, 662584396), P(455641878, 662608698), P(455640821, 662584888), P(455632143, 662589624), P(455627996, 662591570), P(455631129, 662599818), P(455609163, 662603090), P(455604489, 662618980), P(455584813, 662619365), P(455572525, 662625509), P(455560090, 662616643), P(455540781, 662622437), P(455527375, 662620382), P(455508013, 662618341), P(455487533, 662618341), P(455469101, 662614245), P(455456813, 662609125), P(455445821, 662606595), P(455423856, 662606128), P(455401890, 662603791), P(455390206, 662607063), P(455384130, 662606595), P(455384130, 662599117), P(455370577, 662597248), P(455370577, 662590705), P(455376652, 662590705), P(455381504, 662581843), P(455384130, 662577152), P(455372914, 662565468), P(455366701, 662576869), P(455361069, 662590693), P(455333188, 662581825), P(455321037, 662572011), P(455298604, 662555653), P(455273366, 662529949), P(455241586, 662500037), P(455231122, 662486778), P(455223430, 662491628), P(455217839, 662488479), P(455218556, 662482262), P(455225089, 662475438), P(455219620, 662467323), P(455227565, 662441151), P(455210740, 662412174), P(455213077, 662382731), P(455214479, 662346277), P(455224877, 662328037), P(455224877, 662301925), P(455232005, 662280613), P(455247428, 662252572), P(455263318, 662228270), P(455280676, 662196256), P(455301642, 662182001) };
+P arrB15[] = {P(455317437, 662167343), P(455332101, 662159278), P(455346724, 662154106), P(455350628, 662151103),
+              P(455359788, 662139691), P(455364293, 662139841), P(455373453, 662137288), P(455378859, 662132633),
+              P(455380661, 662127528), P(455394776, 662125275), P(455399130, 662121822), P(455404987, 662118518),
+              P(455412194, 662116416), P(455424207, 662108908), P(455433667, 662103502), P(455446431, 662093141),
+              P(455450936, 662091489), P(455455441, 662089537), P(455457543, 662082630), P(455466703, 662079176),
+              P(455475262, 662073620), P(455480667, 662070317), P(455486974, 662065812), P(455489527, 662062508),
+              P(455493581, 662064461), P(455500038, 662062358), P(455501990, 662065812), P(455504693, 662065662),
+              P(455506495, 662063560), P(455509798, 662058604), P(455513252, 662057103), P(455515805, 662052898),
+              P(455521661, 662054550), P(455526466, 662060106), P(455529319, 662063409), P(455531872, 662063109),
+              P(455535176, 662059956), P(455542834, 662060406), P(455541933, 662066263), P(455542083, 662069566),
+              P(455544035, 662069416), P(455548540, 662067163), P(455551543, 662067914), P(455556198, 662065362),
+              P(455561904, 662064611), P(455565808, 662062208), P(455568962, 662063560), P(455572716, 662063860),
+              P(455576169, 662061457), P(455582326, 662061758), P(455586831, 662067013), P(455589684, 662067464),
+              P(455591336, 662065812), P(455593288, 662067464), P(455595090, 662068965), P(455599294, 662068365),
+              P(455601096, 662064761), P(455603799, 662063860), P(455606502, 662065211), P(455611457, 662063560),
+              P(455617163, 662062508), P(455619115, 662066112), P(455623620, 662066563), P(455628275, 662064611),
+              P(455631428, 662065061), P(455633981, 662063109), P(455637435, 662065362), P(455638186, 662068064),
+              P(455640288, 662068214), P(455642234, 662065622), P(455643905, 662065564), P(455646333, 662066011),
+              P(455649336, 662063903), P(455653872, 662063775), P(455654804, 662063501), P(455655817, 662063208),
+              P(455657763, 662062031), P(455660067, 662060802), P(455658664, 662059494), P(455658728, 662053488),
+              P(455659431, 662048185), P(455662498, 662045246), P(455665117, 662044160), P(455660964, 662041668),
+              P(455658153, 662039943), P(455657322, 662036238), P(455655661, 662032979), P(455657259, 662028698),
+              P(455651061, 662025120), P(455645566, 662021798), P(455645183, 662016878), P(455650678, 662012023),
+              P(455659367, 662005314), P(455666076, 662001800), P(455671123, 662001736), P(455679493, 662006975),
+              P(455682240, 662006847), P(455686649, 662010233), P(455691313, 662012533), P(455693996, 662014898),
+              P(455692695, 662019811), P(455691076, 662025316), P(455687837, 662029958), P(455684491, 662034816),
+              P(455680928, 662040213), P(455677366, 662041401), P(455677150, 662048094), P(455679633, 662048849),
+              P(455682332, 662053599), P(455683346, 662055431), P(455686622, 662055226), P(455687082, 662053059),
+              P(455690632, 662048799), P(455697839, 662048493), P(455697839, 662049673), P(455691156, 662050066),
+              P(455688273, 662053211), P(455689365, 662055046), P(455693296, 662054696), P(455695655, 662052163),
+              P(455699019, 662051988), P(455699936, 662051245), P(455700460, 662051333), P(455701189, 662051259),
+              P(455702187, 662051259), P(455702801, 662050619), P(455703237, 662049953), P(455705003, 662049159),
+              P(455704952, 662048366), P(455704133, 662047854), P(455702238, 662047470), P(455700446, 662047316),
+              P(455699371, 662046983), P(455698415, 662046144), P(455698014, 662044999), P(455702644, 662044868),
+              P(455708192, 662044824), P(455711468, 662048755), P(455714962, 662053255), P(455718488, 662057144),
+              P(455721884, 662057748), P(455723168, 662060163), P(455727244, 662060012), P(455727093, 662058201),
+              P(455731471, 662057899), P(455734641, 662058352), P(455738641, 662056842), P(455742113, 662054729),
+              P(455746265, 662054729), P(455750492, 662052766), P(455755624, 662049370), P(455761738, 662046652),
+              P(455766569, 662049068), P(455770645, 662051861), P(455776080, 662055634), P(455782194, 662058880),
+              P(455788987, 662059333), P(455796007, 662058956), P(455801592, 662055710), P(455803253, 662050351),
+              P(455809216, 662054578), P(455817066, 662059786), P(455825104, 662060239), P(455833181, 662058956),
+              P(455840427, 662058427), P(455845786, 662055786), P(455849862, 662056087), P(455857863, 662052011),
+              P(455857712, 662049068), P(455866921, 662046501), P(455872808, 662041897), P(455878092, 662036462),
+              P(455884961, 662032084), P(455891528, 662032084), P(455899680, 662031858), P(455908813, 662026876),
+              P(455918550, 662021064), P(455927306, 662021291), P(455939458, 662021215), P(455948667, 662019102),
+              P(455958253, 662023933), P(455969801, 662024536), P(455977953, 662028914), P(455989200, 662029442),
+              P(455991917, 662034802), P(455995314, 662031254), P(456003839, 662028085), P(456014104, 662022500),
+              P(456023468, 662018800), P(456031394, 662019177), P(456036979, 662025744), P(456045395, 662028235),
+              P(456048264, 662035255), P(456052415, 662036010), P(456062228, 662024159), P(456066756, 662020234),
+              P(456071059, 662021140), P(456078834, 662013742), P(456085966, 662014497), P(456094420, 662013969),
+              P(456101138, 662018724), P(456104912, 662018951), P(456105221, 662018324), P(456106497, 662015856),
+              P(456112309, 662016384), P(456109139, 662021291), P(456104686, 662024008), P(456106195, 662030047),
+              P(456104912, 662032613), P(456106044, 662038500), P(456111177, 662042652), P(456117366, 662042199),
+              P(456124009, 662034500), P(456126500, 662035707), P(456118348, 662044388), P(456112762, 662046275),
+              P(456112347, 662052276), P(456110233, 662055672), P(456112800, 662059371), P(456117102, 662059748),
+              P(456117857, 662062617), P(456113781, 662064352), P(456111743, 662070014), P(456113630, 662071297),
+              P(456115895, 662070165), P(456117781, 662072127), P(456116951, 662073184), P(456112875, 662073184),
+              P(456112724, 662074467), P(456114536, 662076845), P(456113479, 662080467), P(456115291, 662082128),
+              P(456117253, 662082128), P(456119442, 662084543), P(456117102, 662088091), P(456119593, 662090884),
+              P(456118008, 662093903), P(456115743, 662099640), P(456118612, 662106282), P(456118989, 662112396),
+              P(456116196, 662120548), P(456118346, 662124343), P(456118385, 662124397), P(456123971, 662123567),
+              P(456127594, 662124926), P(456128047, 662128322), P(456130764, 662131040), P(456133633, 662131191),
+              P(456136576, 662135116), P(456136954, 662138135), P(456140652, 662139569), P(456141935, 662141003),
+              P(456144804, 662140701), P(456146313, 662139418), P(456149786, 662140098), P(456150276, 662143230),
+              P(456155862, 662145947), P(456162655, 662148287), P(456168165, 662147608), P(456173600, 662144362),
+              P(456175336, 662149872), P(456176996, 662156892), P(456170580, 662162553), P(456169674, 662171800),
+              P(456175411, 662179498), P(456181676, 662177234), P(456187337, 662182367), P(456194357, 662182895),
+              P(456197311, 662192960), P(456205575, 662201975), P(456214027, 662214184), P(456210271, 662225829),
+              P(456213464, 662241230), P(456206139, 662252311), P(456193555, 662261702), P(456199377, 662290157),
+              P(456195057, 662292035), P(456188671, 662277949), P(456181722, 662274944), P(456177402, 662281893),
+              P(456174209, 662276634), P(456163316, 662278137), P(456166133, 662282832), P(456171580, 662282832),
+              P(456169702, 662289782), P(456162940, 662289218), P(456163503, 662308188), P(456157493, 662327909),
+              P(456164067, 662344719), P(456173646, 662356364), P(456190362, 662347912), P(456198814, 662361247),
+              P(456208205, 662366318), P(456207454, 662371765), P(456187545, 662379278), P(456168199, 662397309),
+              P(456160874, 662416842), P(456154335, 662436711), P(456157607, 662459144), P(456143119, 662470828),
+              P(456135174, 662484381), P(456121620, 662486718), P(456108534, 662500739), P(456082362, 662516629),
+              P(456065537, 662539062), P(456052919, 662539062), P(456042169, 662545605), P(456031888, 662560561),
+              P(456010389, 662557289), P(455985152, 662550746), P(455969963, 662544904), P(455962952, 662547241),
+              P(455952203, 662542567), P(455948464, 662553317), P(455944726, 662562196), P(455933976, 662562664),
+              P(455919021, 662545839), P(455910141, 662567804), P(455904533, 662559392), P(455888175, 662558925),
+              P(455876491, 662567804), P(455860601, 662574815), P(455839570, 662580423), P(455811996, 662585097),
+              P(455799377, 662599585), P(455782085, 662592107), P(455768064, 662592341), P(455752642, 662601221),
+              P(455741892, 662615709), P(455741892, 662597482), P(455731143, 662601221), P(455724133, 662610100),
+              P(455700298, 662609633), P(455693755, 662601688), P(455695624, 662589069), P(455677864, 662586265),
+              P(455656833, 662584396), P(455641878, 662608698), P(455640821, 662584888), P(455632143, 662589624),
+              P(455627996, 662591570), P(455631129, 662599818), P(455609163, 662603090), P(455604489, 662618980),
+              P(455584813, 662619365), P(455572525, 662625509), P(455560090, 662616643), P(455540781, 662622437),
+              P(455527375, 662620382), P(455508013, 662618341), P(455487533, 662618341), P(455469101, 662614245),
+              P(455456813, 662609125), P(455445821, 662606595), P(455423856, 662606128), P(455401890, 662603791),
+              P(455390206, 662607063), P(455384130, 662606595), P(455384130, 662599117), P(455370577, 662597248),
+              P(455370577, 662590705), P(455376652, 662590705), P(455381504, 662581843), P(455384130, 662577152),
+              P(455372914, 662565468), P(455366701, 662576869), P(455361069, 662590693), P(455333188, 662581825),
+              P(455321037, 662572011), P(455298604, 662555653), P(455273366, 662529949), P(455241586, 662500037),
+              P(455231122, 662486778), P(455223430, 662491628), P(455217839, 662488479), P(455218556, 662482262),
+              P(455225089, 662475438), P(455219620, 662467323), P(455227565, 662441151), P(455210740, 662412174),
+              P(455213077, 662382731), P(455214479, 662346277), P(455224877, 662328037), P(455224877, 662301925),
+              P(455232005, 662280613), P(455247428, 662252572), P(455263318, 662228270), P(455280676, 662196256),
+              P(455301642, 662182001)};
 
-}
+}  // namespace geom_test
diff --git a/libs/geometry/geometry_tests/transformations_test.cpp b/libs/geometry/geometry_tests/transformations_test.cpp
index b6484a234..df295990a 100644
--- a/libs/geometry/geometry_tests/transformations_test.cpp
+++ b/libs/geometry/geometry_tests/transformations_test.cpp
@@ -1,7 +1,7 @@
-#include "testing/testing.hpp"
+#include "geometry/transformations.hpp"
 #include "base/matrix.hpp"
 #include "geometry/point2d.hpp"
-#include "geometry/transformations.hpp"
+#include "testing/testing.hpp"
 
 UNIT_TEST(Transformations_Shift)
 {
@@ -28,7 +28,8 @@ UNIT_TEST(Transformations_Rotate)
 
 UNIT_TEST(Transformations_ShiftScaleRotate)
 {
-  math::Matrix<double, 3, 3> m = math::Rotate(math::Scale(math::Shift(math::Identity<double, 3>(), 100, 100), 2, 3), -math::pi / 2);
+  math::Matrix<double, 3, 3> m =
+      math::Rotate(math::Scale(math::Shift(math::Identity<double, 3>(), 100, 100), 2, 3), -math::pi / 2);
   m2::PointD pt = m2::PointD(20, 10) * m;
 
   TEST(pt.EqualDxDy(m2::PointD(330, -240), 1.0E-10), ());
diff --git a/libs/geometry/geometry_tests/tree_test.cpp b/libs/geometry/geometry_tests/tree_test.cpp
index b2bb2920c..2856bf1b3 100644
--- a/libs/geometry/geometry_tests/tree_test.cpp
+++ b/libs/geometry/geometry_tests/tree_test.cpp
@@ -64,8 +64,7 @@ UNIT_TEST(Tree4D_ForAnyInRect)
 {
   Tree theTree;
 
-  R arr[] = {R(0, 0, 1, 1), R(0, 0, 5, 5), R(1, 1, 2, 2),
-             R(1, 1, 6.5, 6.5), R(2, 2, 3, 3), R(2, 2, 7, 7)};
+  R arr[] = {R(0, 0, 1, 1), R(0, 0, 5, 5), R(1, 1, 2, 2), R(1, 1, 6.5, 6.5), R(2, 2, 3, 3), R(2, 2, 7, 7)};
   for (auto const & r : arr)
     theTree.Add(r);
 
@@ -118,7 +117,7 @@ void CheckInRect(R const * arr, size_t count, R const & searchR, size_t expected
 
   TEST_EQUAL(test.size(), expected, ());
 }
-}
+}  // namespace
 
 UNIT_TEST(Tree4D_ForEachInRect)
 {
@@ -141,10 +140,7 @@ struct TestObj : public m2::RectD
 {
   int m_id;
 
-  TestObj(double minX, double minY, double maxX, double maxY, int id)
-    : m2::RectD(minX, minY, maxX, maxY), m_id(id)
-  {
-  }
+  TestObj(double minX, double minY, double maxX, double maxY, int id) : m2::RectD(minX, minY, maxX, maxY), m_id(id) {}
 
   bool operator==(TestObj const & r) const { return m_id == r.m_id; }
 };
diff --git a/libs/geometry/geometry_tests/vector_test.cpp b/libs/geometry/geometry_tests/vector_test.cpp
index bf58ff998..babc0156c 100644
--- a/libs/geometry/geometry_tests/vector_test.cpp
+++ b/libs/geometry/geometry_tests/vector_test.cpp
@@ -8,10 +8,8 @@ template <class T, size_t N>
 bool EqualArrays(T (&a1)[N], T (&a2)[N])
 {
   for (size_t i = 0; i < N; ++i)
-  {
     if (!AlmostEqualULPs(a1[i], a2[i]))
       return false;
-  }
   return true;
 }
 }  // namespace
@@ -20,14 +18,14 @@ UNIT_TEST(AvgVector_Smoke)
 {
   math::AvgVector<double, 3> holder(3);
 
-  double ethalon1[] = { 5, 5, 5 };
-  double ethalon2[] = { 5.5, 5.5, 5.5 };
-  double ethalon3[] = { 6, 6, 6 };
+  double ethalon1[] = {5, 5, 5};
+  double ethalon2[] = {5.5, 5.5, 5.5};
+  double ethalon3[] = {6, 6, 6};
 
-  double arr1[] = { 5, 5, 5 };
-  double arr2[] = { 6, 6, 6 };
-  double arr3[] = { 5, 5, 5 };
-  double arr4[] = { 6, 6, 6 };
+  double arr1[] = {5, 5, 5};
+  double arr2[] = {6, 6, 6};
+  double arr3[] = {5, 5, 5};
+  double arr4[] = {6, 6, 6};
 
   holder.Next(arr1);
   TEST(EqualArrays(arr1, ethalon1), ());
diff --git a/libs/geometry/intersection_score.hpp b/libs/geometry/intersection_score.hpp
index b5afa5018..0159fa82d 100644
--- a/libs/geometry/intersection_score.hpp
+++ b/libs/geometry/intersection_score.hpp
@@ -8,10 +8,10 @@
 
 #include <vector>
 
-#include "std/boost_geometry.hpp"
 #include <boost/geometry/geometries/adapted/boost_tuple.hpp>
 #include <boost/geometry/geometries/point_xy.hpp>
 #include <boost/geometry/geometries/polygon.hpp>
+#include "std/boost_geometry.hpp"
 
 namespace geometry
 {
@@ -39,8 +39,8 @@ impl::MultiPolygon TrianglesToPolygon(Container const & points);
 template <typename LGeometry, typename RGeometry>
 double GetIntersectionScore(LGeometry const & lhs, RGeometry const & rhs)
 {
-  if (!boost::geometry::is_valid(lhs) || !boost::geometry::is_valid(rhs) ||
-      boost::geometry::is_empty(lhs) || boost::geometry::is_empty(rhs))
+  if (!boost::geometry::is_valid(lhs) || !boost::geometry::is_valid(rhs) || boost::geometry::is_empty(lhs) ||
+      boost::geometry::is_empty(rhs))
   {
     return kPenaltyScore;
   }
@@ -63,8 +63,7 @@ double GetIntersectionScore(LGeometry const & lhs, RGeometry const & rhs)
 /// |lhs| and |rhs| are any standard container of m2::Point with random access iterator.
 /// |toPolygonConverter| is a method which converts |lhs| and |rhs| to boost::geometry areal type.
 template <typename Container, typename Converter>
-double GetIntersectionScore(Container const & lhs, Container const & rhs,
-                            Converter const & toPolygonConverter)
+double GetIntersectionScore(Container const & lhs, Container const & rhs, Converter const & toPolygonConverter)
 {
   auto const lhsPolygon = toPolygonConverter(lhs);
   if (boost::geometry::is_empty(lhsPolygon))
diff --git a/libs/geometry/latlon.cpp b/libs/geometry/latlon.cpp
index 01b45d7cf..95867f0e2 100644
--- a/libs/geometry/latlon.cpp
+++ b/libs/geometry/latlon.cpp
@@ -7,7 +7,10 @@
 
 namespace ms
 {
-bool LatLon::operator==(ms::LatLon const & rhs) const { return m_lat == rhs.m_lat && m_lon == rhs.m_lon; }
+bool LatLon::operator==(ms::LatLon const & rhs) const
+{
+  return m_lat == rhs.m_lat && m_lon == rhs.m_lon;
+}
 
 bool LatLon::operator<(ms::LatLon const & rhs) const
 {
@@ -22,14 +25,13 @@ bool LatLon::EqualDxDy(LatLon const & p, double eps) const
 std::string DebugPrint(LatLon const & t)
 {
   std::ostringstream out;
-  out.precision(9); // <3>.<6> digits is enough here
+  out.precision(9);  // <3>.<6> digits is enough here
   out << "ms::LatLon(" << t.m_lat << ", " << t.m_lon << ")";
   return out.str();
 }
 
 bool AlmostEqualAbs(LatLon const & ll1, LatLon const & ll2, double eps)
 {
-  return ::AlmostEqualAbs(ll1.m_lat, ll2.m_lat, eps) &&
-         ::AlmostEqualAbs(ll1.m_lon, ll2.m_lon, eps);
+  return ::AlmostEqualAbs(ll1.m_lat, ll2.m_lat, eps) && ::AlmostEqualAbs(ll1.m_lon, ll2.m_lon, eps);
 }
 }  // namespace ms
diff --git a/libs/geometry/mercator.cpp b/libs/geometry/mercator.cpp
index 9f2003ede..e20358eb0 100644
--- a/libs/geometry/mercator.cpp
+++ b/libs/geometry/mercator.cpp
@@ -101,8 +101,7 @@ m2::RectD RectByCenterXYAndSizeInMeters(m2::PointD const & center, double size)
 
 m2::RectD RectByCenterXYAndOffset(m2::PointD const & center, double offset)
 {
-  return {ClampX(center.x - offset), ClampY(center.y - offset),
-          ClampX(center.x + offset), ClampY(center.y + offset)};
+  return {ClampX(center.x - offset), ClampY(center.y - offset), ClampX(center.x + offset), ClampY(center.y + offset)};
 }
 
 m2::RectD RectByCenterLatLonAndSizeInMeters(double lat, double lon, double size)
@@ -112,11 +111,11 @@ m2::RectD RectByCenterLatLonAndSizeInMeters(double lat, double lon, double size)
 
 m2::RectD FromLatLon(m2::RectD const & rect)
 {
-  return { FromLatLon(rect.minY(), rect.minX()), FromLatLon(rect.maxY(), rect.maxX()) };
+  return {FromLatLon(rect.minY(), rect.minX()), FromLatLon(rect.maxY(), rect.maxX())};
 }
 
 m2::RectD ToLatLon(m2::RectD const & rect)
 {
-  return { YToLat(rect.minY()), XToLon(rect.minX()), YToLat(rect.maxY()), XToLon(rect.maxX()) };
+  return {YToLat(rect.minY()), XToLon(rect.minX()), YToLat(rect.maxY()), XToLon(rect.maxX())};
 }
 }  // namespace mercator
diff --git a/libs/geometry/mercator.hpp b/libs/geometry/mercator.hpp
index d65f459f2..4f454c9ed 100644
--- a/libs/geometry/mercator.hpp
+++ b/libs/geometry/mercator.hpp
@@ -24,31 +24,58 @@ struct Bounds
   static double constexpr kDegreesInMeter = 360.0 / 40008245.0;
   static double constexpr kMetersInDegree = 40008245.0 / 360.0;
 
-  static m2::RectD FullRect()
-  {
-    return m2::RectD(kMinX, kMinY, kMaxX, kMaxY);
-  }
+  static m2::RectD FullRect() { return m2::RectD(kMinX, kMinY, kMaxX, kMaxY); }
 };
 
-inline bool ValidLon(double d) { return math::Between(-180.0, 180.0, d); }
-inline bool ValidLat(double d) { return math::Between(-90.0, 90.0, d); }
+inline bool ValidLon(double d)
+{
+  return math::Between(-180.0, 180.0, d);
+}
+inline bool ValidLat(double d)
+{
+  return math::Between(-90.0, 90.0, d);
+}
 
-inline bool ValidX(double d) { return math::Between(Bounds::kMinX, Bounds::kMaxX, d); }
-inline bool ValidY(double d) { return math::Between(Bounds::kMinY, Bounds::kMaxY, d); }
+inline bool ValidX(double d)
+{
+  return math::Between(Bounds::kMinX, Bounds::kMaxX, d);
+}
+inline bool ValidY(double d)
+{
+  return math::Between(Bounds::kMinY, Bounds::kMaxY, d);
+}
 
-inline double ClampX(double d) { return math::Clamp(d, Bounds::kMinX, Bounds::kMaxX); }
-inline double ClampY(double d) { return math::Clamp(d, Bounds::kMinY, Bounds::kMaxY); }
+inline double ClampX(double d)
+{
+  return math::Clamp(d, Bounds::kMinX, Bounds::kMaxX);
+}
+inline double ClampY(double d)
+{
+  return math::Clamp(d, Bounds::kMinY, Bounds::kMaxY);
+}
 
 void ClampPoint(m2::PointD & pt);
 
 double YToLat(double y);
 double LatToY(double lat);
 
-inline double XToLon(double x) { return x; }
-inline double LonToX(double lon) { return lon; }
+inline double XToLon(double x)
+{
+  return x;
+}
+inline double LonToX(double lon)
+{
+  return lon;
+}
 
-inline double MetersToMercator(double meters) { return meters * Bounds::kDegreesInMeter; }
-inline double MercatorToMeters(double mercator) { return mercator * Bounds::kMetersInDegree; }
+inline double MetersToMercator(double meters)
+{
+  return meters * Bounds::kDegreesInMeter;
+}
+inline double MercatorToMeters(double mercator)
+{
+  return mercator * Bounds::kMetersInDegree;
+}
 
 /// @name Get rect for center point (lon, lat) and dimensions in meters.
 /// @return mercator rect.
@@ -63,12 +90,21 @@ m2::RectD RectByCenterXYAndOffset(m2::PointD const & center, double offset);
 
 m2::PointD GetSmPoint(m2::PointD const & pt, double lonMetersR, double latMetersR);
 
-inline m2::PointD FromLatLon(double lat, double lon) { return m2::PointD(LonToX(lon), LatToY(lat)); }
-inline m2::PointD FromLatLon(ms::LatLon const & point) { return FromLatLon(point.m_lat, point.m_lon); }
+inline m2::PointD FromLatLon(double lat, double lon)
+{
+  return m2::PointD(LonToX(lon), LatToY(lat));
+}
+inline m2::PointD FromLatLon(ms::LatLon const & point)
+{
+  return FromLatLon(point.m_lat, point.m_lon);
+}
 
 m2::RectD RectByCenterLatLonAndSizeInMeters(double lat, double lon, double size);
 
-inline ms::LatLon ToLatLon(m2::PointD const & point) { return {YToLat(point.y), XToLon(point.x)}; }
+inline ms::LatLon ToLatLon(m2::PointD const & point)
+{
+  return {YToLat(point.y), XToLon(point.x)};
+}
 
 m2::RectD FromLatLon(m2::RectD const & rect);
 m2::RectD ToLatLon(m2::RectD const & rect);
diff --git a/libs/geometry/nearby_points_sweeper.cpp b/libs/geometry/nearby_points_sweeper.cpp
index 2011d160d..e51714d17 100644
--- a/libs/geometry/nearby_points_sweeper.cpp
+++ b/libs/geometry/nearby_points_sweeper.cpp
@@ -4,9 +4,12 @@ namespace m2
 {
 // NearbyPointsSweeper::Event ----------------------------------------------------------------------
 NearbyPointsSweeper::Event::Event(Type type, double y, double x, size_t index, uint8_t priority)
-  : m_type(type), m_y(y), m_x(x), m_index(index), m_priority(priority)
-{
-}
+  : m_type(type)
+  , m_y(y)
+  , m_x(x)
+  , m_index(index)
+  , m_priority(priority)
+{}
 
 bool NearbyPointsSweeper::Event::operator<(Event const & rhs) const
 {
diff --git a/libs/geometry/nearby_points_sweeper.hpp b/libs/geometry/nearby_points_sweeper.hpp
index 7ba112ad5..9e380aa8c 100644
--- a/libs/geometry/nearby_points_sweeper.hpp
+++ b/libs/geometry/nearby_points_sweeper.hpp
@@ -55,8 +55,8 @@ public:
           break;
         }
 
-        auto it = line.upper_bound(
-            {event.m_x, std::numeric_limits<size_t>::max(), std::numeric_limits<uint8_t>::max()});
+        auto it =
+            line.upper_bound({event.m_x, std::numeric_limits<size_t>::max(), std::numeric_limits<uint8_t>::max()});
 
         bool add = true;
         while (true)
diff --git a/libs/geometry/oblate_spheroid.cpp b/libs/geometry/oblate_spheroid.cpp
index 1bed930bc..47c032a3c 100644
--- a/libs/geometry/oblate_spheroid.cpp
+++ b/libs/geometry/oblate_spheroid.cpp
@@ -26,7 +26,10 @@ static double constexpr kEps = 1e-10;
 static int constexpr kIterations = 10;
 
 /// \brief Calculates latitude on the auxiliary sphere for |angleRad| latitude on a spheroid.
-static double ReducedLatitude(double angleRad) { return std::atan((1.0 - kF) * std::tan(angleRad)); }
+static double ReducedLatitude(double angleRad)
+{
+  return std::atan((1.0 - kF) * std::tan(angleRad));
+}
 
 double GetDistance(ms::LatLon const & point1, ms::LatLon const & point2)
 {
@@ -75,9 +78,7 @@ double GetDistance(ms::LatLon const & point1, ms::LatLon const & point2)
 
     lambdaPrev = lambda;
     lambda = L + (1 - C) * kF * sinAlpha *
-                     (sigma +
-                      C * sinSigma *
-                          (cosDoubleSigmaMid + C * cosSigma * (-1 + 2 * cosDoubleSigmaMidSquare)));
+                     (sigma + C * sinSigma * (cosDoubleSigmaMid + C * cosSigma * (-1 + 2 * cosDoubleSigmaMidSquare)));
   }
 
   // Fallback solution.
@@ -89,18 +90,16 @@ double GetDistance(ms::LatLon const & point1, ms::LatLon const & point2)
 
   double const uSquare = cosAlphaSquare * (aSquare - bSquare) / bSquare;
 
-  double const A = 1.0 + (uSquare / 16384.0) *
-                       (4096.0 + uSquare * (-768.0 + uSquare * (320.0 - 175.0 * uSquare)));
+  double const A = 1.0 + (uSquare / 16384.0) * (4096.0 + uSquare * (-768.0 + uSquare * (320.0 - 175.0 * uSquare)));
 
   double const B = (uSquare / 1024.0) * (256.0 + uSquare * (-128.0 + uSquare * (74.0 - 47 * uSquare)));
 
-  double const deltaSigma =
-      B * sinSigma *
-      (cosDoubleSigmaMid + 0.25 * B *
-                               (cosSigma * (-1.0 + 2.0 * cosDoubleSigmaMidSquare) -
-                                (B / 6.0) * cosDoubleSigmaMid * (-3.0 + 4.0 * Pow2(sinSigma)) *
-                                    (-3.0 + 4 * cosDoubleSigmaMidSquare)));
+  double const deltaSigma = B * sinSigma *
+                            (cosDoubleSigmaMid + 0.25 * B *
+                                                     (cosSigma * (-1.0 + 2.0 * cosDoubleSigmaMidSquare) -
+                                                      (B / 6.0) * cosDoubleSigmaMid * (-3.0 + 4.0 * Pow2(sinSigma)) *
+                                                          (-3.0 + 4 * cosDoubleSigmaMidSquare)));
 
   return kB * A * (sigma - deltaSigma);
 }
-} // namespace oblate_spheroid
+}  // namespace oblate_spheroid
diff --git a/libs/geometry/oblate_spheroid.hpp b/libs/geometry/oblate_spheroid.hpp
index a55f1c33b..7e9c8bf22 100644
--- a/libs/geometry/oblate_spheroid.hpp
+++ b/libs/geometry/oblate_spheroid.hpp
@@ -9,4 +9,4 @@ namespace oblate_spheroid
 /// Vincenty's solution is much slower but more accurate than ms::DistanceOnEarth from [geometry].
 /// https://en.wikipedia.org/wiki/Vincenty%27s_formulae
 double GetDistance(ms::LatLon const & point1, ms::LatLon const & point2);
-} // namespace
+}  // namespace oblate_spheroid
diff --git a/libs/geometry/packer.cpp b/libs/geometry/packer.cpp
index 01c11c875..b463f0ff7 100644
--- a/libs/geometry/packer.cpp
+++ b/libs/geometry/packer.cpp
@@ -14,8 +14,7 @@ Packer::Packer()
   , m_currentHandle(0)
   , m_maxHandle(0)
   , m_invalidHandle(0x00FFFFFF)
-{
-}
+{}
 
 Packer::Packer(unsigned width, unsigned height, uint32_t maxHandle)
   : m_currentX(0)
@@ -26,10 +25,12 @@ Packer::Packer(unsigned width, unsigned height, uint32_t maxHandle)
   , m_currentHandle(0)
   , m_maxHandle(maxHandle)
   , m_invalidHandle(0x00FFFFFF)
-{
-}
+{}
 
-uint32_t Packer::invalidHandle() const { return m_invalidHandle; }
+uint32_t Packer::invalidHandle() const
+{
+  return m_invalidHandle;
+}
 
 Packer::handle_t Packer::pack(unsigned width, unsigned height)
 {
@@ -134,7 +135,10 @@ bool Packer::hasRoom(m2::PointU const * sizes, size_t cnt) const
   return true;
 }
 
-bool Packer::isPacked(handle_t handle) { return m_rects.find(handle) != m_rects.end(); }
+bool Packer::isPacked(handle_t handle)
+{
+  return m_rects.find(handle) != m_rects.end();
+}
 
 Packer::find_result_t Packer::find(handle_t handle) const
 {
@@ -146,7 +150,10 @@ Packer::find_result_t Packer::find(handle_t handle) const
   return res;
 }
 
-void Packer::remove(handle_t handle) { m_rects.erase(handle); }
+void Packer::remove(handle_t handle)
+{
+  m_rects.erase(handle);
+}
 
 void Packer::reset()
 {
diff --git a/libs/geometry/packer.hpp b/libs/geometry/packer.hpp
index 4944fdd3c..db930074a 100644
--- a/libs/geometry/packer.hpp
+++ b/libs/geometry/packer.hpp
@@ -15,10 +15,7 @@ namespace m2
 template <typename pair_t>
 struct first_less
 {
-  bool operator()(pair_t const & first, pair_t const & second)
-  {
-    return first.first < second.first;
-  }
+  bool operator()(pair_t const & first, pair_t const & second) { return first.first < second.first; }
 };
 
 /// The simplest row-by-row packer.
@@ -29,9 +26,8 @@ class Packer
 public:
   using overflowFn = std::function<void()>;
 
-  using overflowFns =
-      std::priority_queue<std::pair<size_t, overflowFn>, std::vector<std::pair<size_t, overflowFn>>,
-                          first_less<std::pair<size_t, overflowFn>>>;
+  using overflowFns = std::priority_queue<std::pair<size_t, overflowFn>, std::vector<std::pair<size_t, overflowFn>>,
+                                          first_less<std::pair<size_t, overflowFn>>>;
 
   using handle_t = uint32_t;
   using find_result_t = std::pair<bool, m2::RectU>;
diff --git a/libs/geometry/parametrized_segment.hpp b/libs/geometry/parametrized_segment.hpp
index 35d858f3e..e71af2e28 100644
--- a/libs/geometry/parametrized_segment.hpp
+++ b/libs/geometry/parametrized_segment.hpp
@@ -24,8 +24,7 @@ template <typename Point>
 class ParametrizedSegment
 {
 public:
-  static_assert(std::numeric_limits<typename Point::value_type>::is_signed,
-                "Unsigned points are not supported");
+  static_assert(std::numeric_limits<typename Point::value_type>::is_signed, "Unsigned points are not supported");
 
   ParametrizedSegment(Point const & p0, Point const & p1) : m_p0(p0), m_p1(p1)
   {
diff --git a/libs/geometry/point2d.hpp b/libs/geometry/point2d.hpp
index 9e84970bd..7363a92f1 100644
--- a/libs/geometry/point2d.hpp
+++ b/libs/geometry/point2d.hpp
@@ -24,17 +24,14 @@ public:
   constexpr Point(T x_, T y_) : x(x_), y(y_) {}
 
   template <typename U>
-  explicit constexpr Point(Point<U> const & u) : x(u.x), y(u.y)
-  {
-  }
+  explicit constexpr Point(Point<U> const & u) : x(u.x)
+                                               , y(u.y)
+  {}
 
   static Point<T> Zero() { return Point<T>(0, 0); }
-  static Point<T> Max() { return Point<T>(std::numeric_limits<T>::max(), std::numeric_limits<T>::max());}
+  static Point<T> Max() { return Point<T>(std::numeric_limits<T>::max(), std::numeric_limits<T>::max()); }
 
-  bool EqualDxDy(Point<T> const & p, T eps) const
-  {
-    return ((fabs(x - p.x) < eps) && (fabs(y - p.y) < eps));
-  }
+  bool EqualDxDy(Point<T> const & p, T eps) const { return ((fabs(x - p.x) < eps) && (fabs(y - p.y) < eps)); }
 
   T SquaredLength(Point<T> const & p) const { return math::Pow2(x - p.x) + math::Pow2(y - p.y); }
   double Length(Point<T> const & p) const { return std::sqrt(SquaredLength(p)); }
@@ -43,10 +40,7 @@ public:
 
   Point<T> Move(T len, T ang) const { return Point<T>(x + len * cos(ang), y + len * sin(ang)); }
 
-  Point<T> Move(T len, T angSin, T angCos) const
-  {
-    return m2::Point<T>(x + len * angCos, y + len * angSin);
-  }
+  Point<T> Move(T len, T angSin, T angCos) const { return m2::Point<T>(x + len * angCos, y + len * angSin); }
 
   Point<T> const & operator-=(Point<T> const & a)
   {
@@ -100,10 +94,7 @@ public:
 
   m2::Point<T> operator/(T scale) const { return m2::Point<T>(x / scale, y / scale); }
 
-  m2::Point<T> Mid(m2::Point<T> const & p) const
-  {
-    return m2::Point<T>((x + p.x) * 0.5, (y + p.y) * 0.5);
-  }
+  m2::Point<T> Mid(m2::Point<T> const & p) const { return m2::Point<T>((x + p.x) * 0.5, (y + p.y) * 0.5); }
 
   /// @name VectorOperationsOnPoint
   /// @{
@@ -123,9 +114,8 @@ public:
   {
     T const prolongatedX = prolongationFactor * x;
     T const prolongatedY = prolongationFactor * y;
-    return std::pair<Point<T>, Point<T>>(
-        Point<T>(static_cast<T>(-prolongatedY), static_cast<T>(prolongatedX)),
-        Point<T>(static_cast<T>(prolongatedY), static_cast<T>(-prolongatedX)));
+    return std::pair<Point<T>, Point<T>>(Point<T>(static_cast<T>(-prolongatedY), static_cast<T>(prolongatedX)),
+                                         Point<T>(static_cast<T>(prolongatedY), static_cast<T>(-prolongatedX)));
   }
 
   m2::Point<T> const & operator*=(math::Matrix<T, 3, 3> const & m)
diff --git a/libs/geometry/point3d.hpp b/libs/geometry/point3d.hpp
index f8fc286a6..1ffc95848 100644
--- a/libs/geometry/point3d.hpp
+++ b/libs/geometry/point3d.hpp
@@ -97,7 +97,6 @@ std::string DebugPrint(Point<T> const & p)
 template <typename T>
 bool AlmostEqualAbs(Point<T> const & p1, Point<T> const & p2, double const & eps)
 {
-  return ::AlmostEqualAbs(p1.x, p2.x, eps) && ::AlmostEqualAbs(p1.y, p2.y, eps) &&
-         ::AlmostEqualAbs(p1.z, p2.z, eps);
+  return ::AlmostEqualAbs(p1.x, p2.x, eps) && ::AlmostEqualAbs(p1.y, p2.y, eps) && ::AlmostEqualAbs(p1.z, p2.z, eps);
 }
 }  // namespace m3
diff --git a/libs/geometry/point_with_altitude.cpp b/libs/geometry/point_with_altitude.cpp
index 4ace90c56..d76210c5f 100644
--- a/libs/geometry/point_with_altitude.cpp
+++ b/libs/geometry/point_with_altitude.cpp
@@ -6,15 +6,12 @@
 
 namespace geometry
 {
-PointWithAltitude::PointWithAltitude()
-  : m_point(m2::PointD::Zero()), m_altitude(kDefaultAltitudeMeters)
-{
-}
+PointWithAltitude::PointWithAltitude() : m_point(m2::PointD::Zero()), m_altitude(kDefaultAltitudeMeters) {}
 
-PointWithAltitude::PointWithAltitude(m2::PointD const & point, Altitude altitude/* = kDefaultAltitudeMeters */)
-  : m_point(point), m_altitude(altitude)
-{
-}
+PointWithAltitude::PointWithAltitude(m2::PointD const & point, Altitude altitude /* = kDefaultAltitudeMeters */)
+  : m_point(point)
+  , m_altitude(altitude)
+{}
 
 bool PointWithAltitude::operator==(PointWithAltitude const & r) const
 {
@@ -32,8 +29,7 @@ bool PointWithAltitude::operator<(PointWithAltitude const & r) const
 std::string DebugPrint(PointWithAltitude const & r)
 {
   std::ostringstream ss;
-  ss << "PointWithAltitude{point:" << DebugPrint(r.m_point) << ", altitude:" << r.GetAltitude()
-     << "}";
+  ss << "PointWithAltitude{point:" << DebugPrint(r.m_point) << ", altitude:" << r.GetAltitude() << "}";
   return ss.str();
 }
 
diff --git a/libs/geometry/point_with_altitude.hpp b/libs/geometry/point_with_altitude.hpp
index 4fa50e81c..91892eab6 100644
--- a/libs/geometry/point_with_altitude.hpp
+++ b/libs/geometry/point_with_altitude.hpp
@@ -41,8 +41,14 @@ private:
 std::string DebugPrint(PointWithAltitude const & r);
 
 template <typename T>
-m2::Point<T> GetPoint(m2::Point<T> const & point) { return point; }
-inline m2::PointD GetPoint(PointWithAltitude const & pwa) { return pwa.GetPoint(); }
+m2::Point<T> GetPoint(m2::Point<T> const & point)
+{
+  return point;
+}
+inline m2::PointD GetPoint(PointWithAltitude const & pwa)
+{
+  return pwa.GetPoint();
+}
 
 PointWithAltitude MakePointWithAltitudeForTesting(m2::PointD const & point);
 
diff --git a/libs/geometry/polygon.hpp b/libs/geometry/polygon.hpp
index 6228fa115..a3ead8b98 100644
--- a/libs/geometry/polygon.hpp
+++ b/libs/geometry/polygon.hpp
@@ -38,16 +38,15 @@ template <typename IsVisibleF>
 size_t FindSingleStrip(size_t n, IsVisibleF isVisible)
 {
   for (size_t i = 0; i < n; ++i)
-  {
     if (FindSingleStripForIndex(i, n, isVisible))
       return i;
-  }
 
   return n;
 }
 
 #ifdef DEBUG
-template <typename IterT> bool TestPolygonPreconditions(IterT beg, IterT end)
+template <typename IterT>
+bool TestPolygonPreconditions(IterT beg, IterT end)
 {
   ASSERT_GREATER(std::distance(beg, end), 2, ());
   ASSERT(!AlmostEqualULPs(*beg, *(--end)), ());
@@ -56,7 +55,8 @@ template <typename IterT> bool TestPolygonPreconditions(IterT beg, IterT end)
 #endif
 
 /// Is polygon [beg, end) has CCW orientation.
-template <typename IterT> bool IsPolygonCCW(IterT beg, IterT end)
+template <typename IterT>
+bool IsPolygonCCW(IterT beg, IterT end)
 {
   ASSERT(TestPolygonPreconditions(beg, end), ());
 
@@ -72,8 +72,8 @@ template <typename IterT> bool IsPolygonCCW(IterT beg, IterT end)
     }
   }
 
-  double cp = m2::robust::OrientedS(*base::PrevIterInCycle(iRes, beg, end), *iRes,
-                                    *base::NextIterInCycle(iRes, beg, end));
+  double cp =
+      m2::robust::OrientedS(*base::PrevIterInCycle(iRes, beg, end), *iRes, *base::NextIterInCycle(iRes, beg, end));
   if (cp != 0.0)
     return (cp > 0.0);
 
@@ -90,7 +90,7 @@ template <typename IterT> bool IsPolygonCCW(IterT beg, IterT end)
 
   IterT iPrev = base::PrevIterInCycle(iRes, beg, end);
   IterT iNext = base::NextIterInCycle(iRes, beg, end);
-  cp =  m2::robust::OrientedS(*iPrev, *iRes, *iNext);
+  cp = m2::robust::OrientedS(*iPrev, *iRes, *iNext);
 
   // Feel free to comment this assert when debugging generator tool.
   // It fires on degenerated polygons which a lot in OSM.
@@ -122,45 +122,45 @@ bool IsDiagonalVisible(IterT beg, IterT end, IterT i0, IterT i1)
   return true;
 }
 
-template <typename IterT> class IsDiagonalVisibleFunctor
+template <typename IterT>
+class IsDiagonalVisibleFunctor
 {
   IterT m_Beg, m_End;
+
 public:
   IsDiagonalVisibleFunctor(IterT beg, IterT end) : m_Beg(beg), m_End(end) {}
 
-  bool operator () (size_t a, size_t b) const
-  {
-    return IsDiagonalVisible(m_Beg, m_End, m_Beg + a, m_Beg + b);
-  }
+  bool operator()(size_t a, size_t b) const { return IsDiagonalVisible(m_Beg, m_End, m_Beg + a, m_Beg + b); }
 };
 
 namespace polygon_detail
 {
-  template <typename F> class StripEmitter
+template <typename F>
+class StripEmitter
+{
+  F & m_f;
+  int m_order;
+
+public:
+  StripEmitter(F & f) : m_f(f), m_order(0) {}
+
+  bool operator()(size_t a, size_t b)
   {
-    F & m_f;
-    int m_order;
-
-  public:
-    StripEmitter(F & f) : m_f(f), m_order(0) {}
-
-    bool operator () (size_t a, size_t b)
+    if (m_order == 0)
     {
-      if (m_order == 0)
-      {
-        m_f(b);
-        m_f(a);
-        m_order = 1;
-      }
-      else
-      {
-        m_f(m_order == 1 ? b : a);
-        m_order = -m_order;
-      }
-      return true;
+      m_f(b);
+      m_f(a);
+      m_order = 1;
     }
-  };
-}
+    else
+    {
+      m_f(m_order == 1 ? b : a);
+      m_order = -m_order;
+    }
+    return true;
+  }
+};
+}  // namespace polygon_detail
 
 /// Make single strip for the range of points [beg, end), started with index = i.
 template <typename F>
@@ -171,7 +171,8 @@ void MakeSingleStripFromIndex(size_t i, size_t n, F && f)
   FindSingleStripForIndex(i, n, polygon_detail::StripEmitter<F>(f));
 }
 
-template <class TIter> double GetPolygonArea(TIter beg, TIter end)
+template <class TIter>
+double GetPolygonArea(TIter beg, TIter end)
 {
   double area = 0.0;
 
diff --git a/libs/geometry/polyline2d.hpp b/libs/geometry/polyline2d.hpp
index 506570d5f..5ef60f592 100644
--- a/libs/geometry/polyline2d.hpp
+++ b/libs/geometry/polyline2d.hpp
@@ -21,8 +21,7 @@ namespace m2
 /// \returns a pair of minimum squared distance from |point| to the closest segment and
 /// a zero-based closest segment index in points in range [|beginIt|, |endIt|).
 template <typename It, typename T>
-std::pair<double, uint32_t> CalcMinSquaredDistance(It beginIt, It endIt,
-                                                   m2::Point<T> const & point)
+std::pair<double, uint32_t> CalcMinSquaredDistance(It beginIt, It endIt, m2::Point<T> const & point)
 {
   CHECK_GREATER(std::distance(beginIt, endIt), 1, ());
   auto squaredClosestSegDist = std::numeric_limits<double>::max();
@@ -40,8 +39,7 @@ std::pair<double, uint32_t> CalcMinSquaredDistance(It beginIt, It endIt,
     }
   }
 
-  return std::make_pair(squaredClosestSegDist,
-                        static_cast<uint32_t>(std::distance(beginIt, closestSeg)));
+  return std::make_pair(squaredClosestSegDist, static_cast<uint32_t>(std::distance(beginIt, closestSeg)));
 }
 
 template <typename T>
@@ -59,10 +57,7 @@ public:
     ASSERT_GREATER(m_points.size(), 1, ());
   }
 
-  explicit Polyline(std::vector<Point<T>> const & points) : m_points(points)
-  {
-    ASSERT_GREATER(m_points.size(), 1, ());
-  }
+  explicit Polyline(std::vector<Point<T>> const & points) : m_points(points) { ASSERT_GREATER(m_points.size(), 1, ()); }
 
   explicit Polyline(std::vector<Point<T>> && points) : m_points(std::move(points))
   {
@@ -108,10 +103,7 @@ public:
 
   void Clear() { m_points.clear(); }
   void Add(Point<T> const & pt) { m_points.push_back(pt); }
-  void Append(Polyline const & poly)
-  {
-    m_points.insert(m_points.end(), poly.m_points.cbegin(), poly.m_points.cend());
-  }
+  void Append(Polyline const & poly) { m_points.insert(m_points.end(), poly.m_points.cbegin(), poly.m_points.cend()); }
 
   template <class Iter>
   void Append(Iter beg, Iter end)
@@ -170,11 +162,8 @@ public:
 
   std::vector<Point<T>> ExtractSegment(size_t startPointIndex, size_t endPointIndex) const
   {
-    if (startPointIndex > endPointIndex || startPointIndex >= m_points.size() ||
-        endPointIndex >= m_points.size())
-    {
+    if (startPointIndex > endPointIndex || startPointIndex >= m_points.size() || endPointIndex >= m_points.size())
       return std::vector<Point<T>>();
-    }
 
     std::vector<Point<T>> result(endPointIndex - startPointIndex + 1);
     for (size_t i = startPointIndex, j = 0; i <= endPointIndex; ++i, ++j)
diff --git a/libs/geometry/rect2d.hpp b/libs/geometry/rect2d.hpp
index 049109024..041c47fac 100644
--- a/libs/geometry/rect2d.hpp
+++ b/libs/geometry/rect2d.hpp
@@ -50,14 +50,14 @@ public:
     , m_minY(std::min(p1.y, p2.y))
     , m_maxX(std::max(p1.x, p2.x))
     , m_maxY(std::max(p1.y, p2.y))
-  {
-  }
+  {}
 
   template <typename U>
-  explicit Rect(Rect<U> const & src)
-    : m_minX(src.minX()), m_minY(src.minY()), m_maxX(src.maxX()), m_maxY(src.maxY())
-  {
-  }
+  explicit Rect(Rect<U> const & src) : m_minX(src.minX())
+                                     , m_minY(src.minY())
+                                     , m_maxX(src.maxX())
+                                     , m_maxY(src.maxY())
+  {}
 
   static Rect GetEmptyRect() { return Rect(); }
 
@@ -141,8 +141,7 @@ public:
 
   bool IsIntersect(Rect const & r) const
   {
-    return !((m_maxX < r.m_minX) || (m_minX > r.m_maxX) || (m_maxY < r.m_minY) ||
-             (m_minY > r.m_maxY));
+    return !((m_maxX < r.m_minX) || (m_minX > r.m_maxX) || (m_maxY < r.m_minY) || (m_minY > r.m_maxY));
   }
 
   bool IsPointInside(Point<T> const & pt) const
@@ -152,8 +151,7 @@ public:
 
   bool IsRectInside(Rect<T> const & rect) const
   {
-    return (IsPointInside(Point<T>(rect.minX(), rect.minY())) &&
-            IsPointInside(Point<T>(rect.maxX(), rect.maxY())));
+    return (IsPointInside(Point<T>(rect.minX(), rect.minY())) && IsPointInside(Point<T>(rect.maxX(), rect.maxY())));
   }
 
   Point<T> Center() const { return Point<T>((m_minX + m_maxX) / 2.0, (m_minY + m_maxY) / 2.0); }
@@ -326,8 +324,8 @@ m2::Rect<T> const Add(m2::Rect<T> const & r, m2::Point<T> const & p)
 template <typename T>
 m2::Rect<T> const Add(m2::Rect<T> const & r1, m2::Rect<T> const & r2)
 {
-  return m2::Rect<T>(std::min(r2.minX(), r1.minX()), std::min(r2.minY(), r1.minY()),
-                     std::max(r2.maxX(), r1.maxX()), std::max(r2.maxY(), r1.maxY()));
+  return m2::Rect<T>(std::min(r2.minX(), r1.minX()), std::min(r2.minY(), r1.minY()), std::max(r2.maxX(), r1.maxX()),
+                     std::max(r2.maxY(), r1.maxY()));
 }
 
 template <typename T>
@@ -358,10 +356,8 @@ template <typename T, typename TCollection>
 bool HasIntersection(m2::Rect<T> const & rect, TCollection const & geometry)
 {
   for (auto const & g : geometry)
-  {
     if (rect.IsIntersect(g))
       return true;
-  }
   return false;
 }
 
diff --git a/libs/geometry/rect_intersect.hpp b/libs/geometry/rect_intersect.hpp
index 445e2381e..1bab4343f 100644
--- a/libs/geometry/rect_intersect.hpp
+++ b/libs/geometry/rect_intersect.hpp
@@ -1,104 +1,106 @@
 #pragma once
 
-#include "geometry/rect2d.hpp"
 #include "geometry/point2d.hpp"
+#include "geometry/rect2d.hpp"
 
 namespace m2
 {
-  namespace detail
-  {
-    // bit masks for code kinds
-    static const int LEFT = 1;
-    static const int RIGHT = 2;
-    static const int BOT = 4;
-    static const int TOP = 8;
+namespace detail
+{
+// bit masks for code kinds
+static int const LEFT = 1;
+static int const RIGHT = 2;
+static int const BOT = 4;
+static int const TOP = 8;
 
-    // return accumulated bit mask for point-rect interaction
-    template <class T>
-    int vcode(m2::Rect<T> const & r, m2::Point<T> const & p)
-    {
-      return ((p.x < r.minX() ? LEFT : 0)  +
-              (p.x > r.maxX() ? RIGHT : 0) +
-              (p.y < r.minY() ? BOT : 0)   +
-              (p.y > r.maxY() ? TOP : 0));
-    }
-  }
-
-  template <class T>
-  bool Intersect(m2::Rect<T> const & r, m2::Point<T> & p1, m2::Point<T> & p2, int & code1, int & code2)
-  {
-    code1 = code2 = 0;
-    int codeClip[2] = { 0, 0 };
-    int code[2] = { detail::vcode(r, p1), detail::vcode(r, p2) };
-
-    // do while one of the point is out of rect
-    while (code[0] || code[1])
-    {
-      if (code[0] & code[1])
-      {
-        // both point area on the one side of rect
-        return false;
-      }
-
-      // choose point with non-zero code
-      m2::Point<T> * pp;
-      int i;
-      if (code[0])
-      {
-        i = 0;
-        pp = &p1;
-      }
-      else
-      {
-        i = 1;
-        pp = &p2;
-      }
-
-      // added points compare to avoid NAN numbers
-      if (code[i] & detail::LEFT)
-      {
-        if (p1 == p2) return false;
-        pp->y += (p1.y - p2.y) * (r.minX() - pp->x) / (p1.x - p2.x);
-        pp->x = r.minX();
-        codeClip[i] = detail::LEFT;
-      }
-      else if (code[i] & detail::RIGHT)
-      {
-        if (p1 == p2) return false;
-        pp->y += (p1.y - p2.y) * (r.maxX() - pp->x) / (p1.x - p2.x);
-        pp->x = r.maxX();
-        codeClip[i] = detail::RIGHT;
-      }
-
-      if (code[i] & detail::BOT)
-      {
-        if (p1 == p2) return false;
-        pp->x += (p1.x - p2.x) * (r.minY() - pp->y) / (p1.y - p2.y);
-        pp->y = r.minY();
-        codeClip[i] = detail::BOT;
-      }
-      else if (code[i] & detail::TOP)
-      {
-        if (p1 == p2) return false;
-        pp->x += (p1.x - p2.x) * (r.maxY() - pp->y) / (p1.y - p2.y);
-        pp->y = r.maxY();
-        codeClip[i] = detail::TOP;
-      }
-
-      // update code with new point
-      code[i] = detail::vcode(r, *pp);
-    }
-
-    code1 = codeClip[0];
-    code2 = codeClip[1];
-    // both codes are equal to zero => points area inside rect
-    return true;
-  }
-
-  template <class T>
-  bool Intersect(m2::Rect<T> const & r, m2::Point<T> & p1, m2::Point<T> & p2)
-  {
-    int code1, code2;
-    return Intersect(r, p1, p2, code1, code2);
-  }
+// return accumulated bit mask for point-rect interaction
+template <class T>
+int vcode(m2::Rect<T> const & r, m2::Point<T> const & p)
+{
+  return ((p.x < r.minX() ? LEFT : 0) + (p.x > r.maxX() ? RIGHT : 0) + (p.y < r.minY() ? BOT : 0) +
+          (p.y > r.maxY() ? TOP : 0));
 }
+}  // namespace detail
+
+template <class T>
+bool Intersect(m2::Rect<T> const & r, m2::Point<T> & p1, m2::Point<T> & p2, int & code1, int & code2)
+{
+  code1 = code2 = 0;
+  int codeClip[2] = {0, 0};
+  int code[2] = {detail::vcode(r, p1), detail::vcode(r, p2)};
+
+  // do while one of the point is out of rect
+  while (code[0] || code[1])
+  {
+    if (code[0] & code[1])
+    {
+      // both point area on the one side of rect
+      return false;
+    }
+
+    // choose point with non-zero code
+    m2::Point<T> * pp;
+    int i;
+    if (code[0])
+    {
+      i = 0;
+      pp = &p1;
+    }
+    else
+    {
+      i = 1;
+      pp = &p2;
+    }
+
+    // added points compare to avoid NAN numbers
+    if (code[i] & detail::LEFT)
+    {
+      if (p1 == p2)
+        return false;
+      pp->y += (p1.y - p2.y) * (r.minX() - pp->x) / (p1.x - p2.x);
+      pp->x = r.minX();
+      codeClip[i] = detail::LEFT;
+    }
+    else if (code[i] & detail::RIGHT)
+    {
+      if (p1 == p2)
+        return false;
+      pp->y += (p1.y - p2.y) * (r.maxX() - pp->x) / (p1.x - p2.x);
+      pp->x = r.maxX();
+      codeClip[i] = detail::RIGHT;
+    }
+
+    if (code[i] & detail::BOT)
+    {
+      if (p1 == p2)
+        return false;
+      pp->x += (p1.x - p2.x) * (r.minY() - pp->y) / (p1.y - p2.y);
+      pp->y = r.minY();
+      codeClip[i] = detail::BOT;
+    }
+    else if (code[i] & detail::TOP)
+    {
+      if (p1 == p2)
+        return false;
+      pp->x += (p1.x - p2.x) * (r.maxY() - pp->y) / (p1.y - p2.y);
+      pp->y = r.maxY();
+      codeClip[i] = detail::TOP;
+    }
+
+    // update code with new point
+    code[i] = detail::vcode(r, *pp);
+  }
+
+  code1 = codeClip[0];
+  code2 = codeClip[1];
+  // both codes are equal to zero => points area inside rect
+  return true;
+}
+
+template <class T>
+bool Intersect(m2::Rect<T> const & r, m2::Point<T> & p1, m2::Point<T> & p2)
+{
+  int code1, code2;
+  return Intersect(r, p1, p2, code1, code2);
+}
+}  // namespace m2
diff --git a/libs/geometry/region2d.hpp b/libs/geometry/region2d.hpp
index 37ad8e7ef..0f8f39c3c 100644
--- a/libs/geometry/region2d.hpp
+++ b/libs/geometry/region2d.hpp
@@ -39,8 +39,7 @@ struct DefEqualFloat
   // Determines if value of a val lays between a p1 and a p2 values with some precision.
   bool IsAlmostBetween(double val, double p1, double p2) const
   {
-    return (val >= p1 - kPrecision && val <= p2 + kPrecision) ||
-           (val <= p1 + kPrecision && val >= p2 - kPrecision);
+    return (val >= p1 - kPrecision && val <= p2 + kPrecision) || (val <= p1 + kPrecision && val >= p2 - kPrecision);
   }
 };
 
@@ -101,8 +100,7 @@ public:
 
   Region() = default;
 
-  template <typename Points,
-            typename = std::enable_if_t<std::is_constructible<Container, Points>::value>>
+  template <typename Points, typename = std::enable_if_t<std::is_constructible<Container, Points>::value>>
   explicit Region(Points && points) : m_points(std::forward<Points>(points))
   {
     CalcLimitRect();
@@ -158,9 +156,8 @@ public:
   Container & MutableData() { return m_points; }
 
   template <typename EqualFn>
-  static bool IsIntersect(Coord const & x11, Coord const & y11, Coord const & x12,
-                          Coord const & y12, Coord const & x21, Coord const & y21,
-                          Coord const & x22, Coord const & y22, EqualFn && equalF, Point & pt)
+  static bool IsIntersect(Coord const & x11, Coord const & y11, Coord const & x12, Coord const & y12, Coord const & x21,
+                          Coord const & y21, Coord const & x22, Coord const & y22, EqualFn && equalF, Point & pt)
   {
     double const divider = ((y12 - y11) * (x22 - x21) - (x12 - x11) * (y22 - y21));
     if (equalF.EqualZeroSquarePrecision(divider))
@@ -181,11 +178,9 @@ public:
     return true;
   }
 
-  static bool IsIntersect(Point const & p1, Point const & p2, Point const & p3, Point const & p4,
-                          Point & pt)
+  static bool IsIntersect(Point const & p1, Point const & p2, Point const & p3, Point const & p4, Point & pt)
   {
-    return IsIntersect(p1.x, p1.y, p2.x, p2.y, p3.x, p3.y, p4.x, p4.y, typename Traits::EqualType(),
-                       pt);
+    return IsIntersect(p1.x, p1.y, p2.x, p2.y, p3.x, p3.y, p4.x, p4.y, typename Traits::EqualType(), pt);
   }
 
   /// Taken from Computational Geometry in C and modified
@@ -275,7 +270,7 @@ public:
     if (!Inflate(m_rect, rectDelta, rectDelta).IsPointInside(pt))
       return false;
 
-    const double squaredDelta = delta * delta;
+    double const squaredDelta = delta * delta;
     size_t const numPoints = m_points.size();
 
     Point prev = m_points[numPoints - 1];
@@ -402,10 +397,8 @@ template <typename Point>
 bool RegionsContain(std::vector<Region<Point>> const & regions, Point const & point)
 {
   for (auto const & region : regions)
-  {
     if (region.Contains(point))
       return true;
-  }
 
   return false;
 }
diff --git a/libs/geometry/region2d/boost_concept.hpp b/libs/geometry/region2d/boost_concept.hpp
index f7beb98bb..2880b9f3b 100644
--- a/libs/geometry/region2d/boost_concept.hpp
+++ b/libs/geometry/region2d/boost_concept.hpp
@@ -20,163 +20,136 @@ namespace boost
 {
 namespace polygon
 {
-  typedef int32_t my_coord_t;
+typedef int32_t my_coord_t;
 
-  ////////////////////////////////////////////////////////////////////////////////
-  // Point concept.
-  ////////////////////////////////////////////////////////////////////////////////
-  typedef m2::PointI my_point_t;
+////////////////////////////////////////////////////////////////////////////////
+// Point concept.
+////////////////////////////////////////////////////////////////////////////////
+typedef m2::PointI my_point_t;
 
-  template <>
-  struct geometry_concept<my_point_t>
+template <>
+struct geometry_concept<my_point_t>
+{
+  typedef point_concept type;
+};
+
+template <>
+struct point_traits<my_point_t>
+{
+  typedef my_point_t::value_type coordinate_type;
+
+  static inline coordinate_type get(my_point_t const & p, orientation_2d o) { return ((o == HORIZONTAL) ? p.x : p.y); }
+};
+
+template <>
+struct point_mutable_traits<my_point_t>
+{
+  typedef my_point_t::value_type Coord;
+
+  static inline void set(my_point_t & p, orientation_2d o, Coord v)
   {
-    typedef point_concept type;
-  };
+    if (o == HORIZONTAL)
+      p.x = v;
+    else
+      p.y = v;
+  }
 
-  template <>
-  struct point_traits<my_point_t>
+  static inline my_point_t construct(Coord x, Coord y) { return my_point_t(x, y); }
+};
+
+////////////////////////////////////////////////////////////////////////////////
+// Polygon concept.
+////////////////////////////////////////////////////////////////////////////////
+typedef m2::RegionI my_region_t;
+
+template <>
+struct geometry_concept<my_region_t>
+{
+  typedef polygon_concept type;
+};
+
+template <>
+struct polygon_traits<my_region_t>
+{
+  typedef my_region_t::Coord coordinate_type;
+  typedef my_region_t::IteratorT iterator_type;
+  typedef my_region_t::Value point_type;
+
+  // Get the begin iterator
+  static inline iterator_type begin_points(my_region_t const & t) { return t.Begin(); }
+
+  // Get the end iterator
+  static inline iterator_type end_points(my_region_t const & t) { return t.End(); }
+
+  // Get the number of sides of the polygon
+  static inline size_t size(my_region_t const & t) { return t.Size(); }
+
+  // Get the winding direction of the polygon
+  static inline winding_direction winding(my_region_t const & /*t*/) { return unknown_winding; }
+};
+
+struct my_point_getter
+{
+  my_point_t operator()(point_data<my_coord_t> const & t) { return my_point_t(t.x(), t.y()); }
+};
+
+template <>
+struct polygon_mutable_traits<my_region_t>
+{
+  // expects stl style iterators
+  template <typename IterT>
+  static inline my_region_t & set_points(my_region_t & t, IterT b, IterT e)
   {
-    typedef my_point_t::value_type coordinate_type;
+    t.AssignEx(b, e, my_point_getter());
+    return t;
+  }
+};
 
-    static inline coordinate_type get(my_point_t const & p, orientation_2d o)
-    {
-      return ((o == HORIZONTAL) ? p.x : p.y);
-    }
-  };
+////////////////////////////////////////////////////////////////////////////////
+// Polygon set concept.
+////////////////////////////////////////////////////////////////////////////////
+typedef std::vector<my_region_t> my_region_set_t;
 
-  template <>
-  struct point_mutable_traits<my_point_t>
+template <>
+struct geometry_concept<my_region_set_t>
+{
+  typedef polygon_set_concept type;
+};
+
+// next we map to the concept through traits
+template <>
+struct polygon_set_traits<my_region_set_t>
+{
+  typedef my_coord_t coordinate_type;
+  typedef my_region_set_t::const_iterator iterator_type;
+  typedef my_region_set_t operator_arg_type;
+
+  static inline iterator_type begin(my_region_set_t const & t) { return t.begin(); }
+
+  static inline iterator_type end(my_region_set_t const & t) { return t.end(); }
+
+  // don't worry about these, just return false from them
+  static inline bool clean(my_region_set_t const & /*t*/) { return false; }
+  static inline bool sorted(my_region_set_t const & /*t*/) { return false; }
+};
+
+template <>
+struct polygon_set_mutable_traits<my_region_set_t>
+{
+  template <typename IterT>
+  static inline void set(my_region_set_t & poly_set, IterT b, IterT e)
   {
-    typedef my_point_t::value_type Coord;
+    poly_set.clear();
 
-    static inline void set(my_point_t & p, orientation_2d o, Coord v)
-    {
-      if (o == HORIZONTAL)
-        p.x = v;
-      else
-        p.y = v;
-    }
+    // this is kind of cheesy. I am copying the unknown input geometry
+    // into my own polygon set and then calling get to populate the std::vector
+    polygon_set_data<my_coord_t> ps;
+    ps.insert(b, e);
+    ps.get(poly_set);
 
-    static inline my_point_t construct(Coord x, Coord y)
-    {
-      return my_point_t(x, y);
-    }
-  };
-
-  ////////////////////////////////////////////////////////////////////////////////
-  // Polygon concept.
-  ////////////////////////////////////////////////////////////////////////////////
-  typedef m2::RegionI my_region_t;
-
-  template <>
-  struct geometry_concept<my_region_t>
-  {
-    typedef polygon_concept type;
-  };
-
-  template <>
-  struct polygon_traits<my_region_t>
-  {
-    typedef my_region_t::Coord coordinate_type;
-    typedef my_region_t::IteratorT iterator_type;
-    typedef my_region_t::Value point_type;
-
-    // Get the begin iterator
-    static inline iterator_type begin_points(my_region_t const & t)
-    {
-      return t.Begin();
-    }
-
-    // Get the end iterator
-    static inline iterator_type end_points(my_region_t const & t)
-    {
-      return t.End();
-    }
-
-    // Get the number of sides of the polygon
-    static inline size_t size(my_region_t const & t)
-    {
-      return t.Size();
-    }
-
-    // Get the winding direction of the polygon
-    static inline winding_direction winding(my_region_t const & /*t*/)
-    {
-      return unknown_winding;
-    }
-  };
-
-  struct my_point_getter
-  {
-    my_point_t operator() (point_data<my_coord_t> const & t)
-    {
-      return my_point_t(t.x(), t.y());
-    }
-  };
-
-  template <>
-  struct polygon_mutable_traits<my_region_t>
-  {
-    // expects stl style iterators
-    template <typename IterT>
-    static inline my_region_t & set_points(my_region_t & t, IterT b, IterT e)
-    {
-      t.AssignEx(b, e, my_point_getter());
-      return t;
-    }
-  };
-
-  ////////////////////////////////////////////////////////////////////////////////
-  // Polygon set concept.
-  ////////////////////////////////////////////////////////////////////////////////
-  typedef std::vector<my_region_t> my_region_set_t;
-
-  template <>
-  struct geometry_concept<my_region_set_t>
-  {
-    typedef polygon_set_concept type;
-  };
-
-  // next we map to the concept through traits
-  template <>
-  struct polygon_set_traits<my_region_set_t>
-  {
-    typedef my_coord_t coordinate_type;
-    typedef my_region_set_t::const_iterator iterator_type;
-    typedef my_region_set_t operator_arg_type;
-
-    static inline iterator_type begin(my_region_set_t const & t)
-    {
-      return t.begin();
-    }
-
-    static inline iterator_type end(my_region_set_t const & t)
-    {
-      return t.end();
-    }
-
-    // don't worry about these, just return false from them
-    static inline bool clean(my_region_set_t const & /*t*/) { return false; }
-    static inline bool sorted(my_region_set_t const & /*t*/) { return false; }
-  };
-
-  template <>
-  struct polygon_set_mutable_traits<my_region_set_t>
-  {
-    template <typename IterT>
-    static inline void set(my_region_set_t & poly_set, IterT b, IterT e)
-    {
-      poly_set.clear();
-
-      // this is kind of cheesy. I am copying the unknown input geometry
-      // into my own polygon set and then calling get to populate the std::vector
-      polygon_set_data<my_coord_t> ps;
-      ps.insert(b, e);
-      ps.get(poly_set);
-
-      // if you had your own odd-ball polygon set you would probably have
-      // to iterate through each polygon at this point and do something extra
-    }
-  };
+    // if you had your own odd-ball polygon set you would probably have
+    // to iterate through each polygon at this point and do something extra
+  }
+};
 }  // namespace polygon
 }  // namespace boost
diff --git a/libs/geometry/robust_orientation.cpp b/libs/geometry/robust_orientation.cpp
index cc5fd8e45..32b554d63 100644
--- a/libs/geometry/robust_orientation.cpp
+++ b/libs/geometry/robust_orientation.cpp
@@ -4,7 +4,8 @@
 
 #include <algorithm>
 
-extern "C" {
+extern "C"
+{
 #if defined(__clang__)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wconditional-uninitialized"
@@ -36,8 +37,7 @@ double OrientedS(PointD const & p1, PointD const & p2, PointD const & p)
   return orient2d(a, b, c);
 }
 
-bool IsSegmentInCone(PointD const & v, PointD const & v1, PointD const & vPrev,
-                     PointD const & vNext)
+bool IsSegmentInCone(PointD const & v, PointD const & v1, PointD const & vPrev, PointD const & vNext)
 {
   double const cpLR = OrientedS(vPrev, vNext, v);
 
diff --git a/libs/geometry/robust_orientation.hpp b/libs/geometry/robust_orientation.hpp
index e0111ed54..85e18ca48 100644
--- a/libs/geometry/robust_orientation.hpp
+++ b/libs/geometry/robust_orientation.hpp
@@ -20,8 +20,7 @@ double OrientedS(PointD const & p1, PointD const & p2, PointD const & p);
 
 /// Is segment (v, v1) in cone (vPrev, v, vNext)?
 /// @precondition (vPrev, v, vNext) is CCW.
-bool IsSegmentInCone(PointD const & v, PointD const & v1, PointD const & vPrev,
-                     PointD const & vNext);
+bool IsSegmentInCone(PointD const & v, PointD const & v1, PointD const & vPrev, PointD const & vNext);
 
 template <typename T>
 bool Between(T a, T b, T c)
diff --git a/libs/geometry/screenbase.cpp b/libs/geometry/screenbase.cpp
index 68ed13852..a9db15944 100644
--- a/libs/geometry/screenbase.cpp
+++ b/libs/geometry/screenbase.cpp
@@ -42,7 +42,10 @@ ScreenBase::ScreenBase(m2::RectI const & pxRect, m2::AnyRectD const & glbRect)
 }
 
 ScreenBase::ScreenBase(ScreenBase const & s, m2::PointD const & org, double scale, double angle)
-  : m_Org(org), m_ViewportRect(s.m_ViewportRect), m_Scale(scale), m_Angle(angle)
+  : m_Org(org)
+  , m_ViewportRect(s.m_ViewportRect)
+  , m_Scale(scale)
+  , m_Angle(angle)
 {
   ASSERT_GREATER(m_Scale, 0.0, ());
   UpdateDependentParameters();
@@ -52,11 +55,11 @@ void ScreenBase::UpdateDependentParameters()
 {
   m_PixelRect = CalculatePixelRect(m_Scale);
 
-  m_PtoG = math::Shift(     /// 5. shifting on (E0, N0)
-      math::Rotate(         /// 4. rotating on the screen angle
-          math::Scale(      /// 3. scaling to translate pixel sizes to global
-              math::Scale(  /// 2. swapping the Y axis??? why??? supposed to be a rotation on -pi /
-                            /// 2 here.
+  m_PtoG = math::Shift(         /// 5. shifting on (E0, N0)
+      math::Rotate(             /// 4. rotating on the screen angle
+          math::Scale(          /// 3. scaling to translate pixel sizes to global
+              math::Scale(      /// 2. swapping the Y axis??? why??? supposed to be a rotation on -pi /
+                                /// 2 here.
                   math::Shift(  /// 1. shifting for the pixel center to become (0, 0)
                       math::Identity<double, 3>(), -m_PixelRect.Center()),
                   1, -1),
@@ -93,15 +96,13 @@ double ScreenBase::CalculateAutoPerspectiveAngle(double scale)
 
   if (scale > kEndPerspectiveScale1)
   {
-    double const k =
-        (kStartPerspectiveScale1 - scale) / (kStartPerspectiveScale1 - kEndPerspectiveScale1);
+    double const k = (kStartPerspectiveScale1 - scale) / (kStartPerspectiveScale1 - kEndPerspectiveScale1);
     return kMaxPerspectiveAngle1 * k;
   }
 
   if (scale > kEndPerspectiveScale2)
   {
-    double const k =
-        (kEndPerspectiveScale1 - scale) / (kEndPerspectiveScale1 - kEndPerspectiveScale2);
+    double const k = (kEndPerspectiveScale1 - scale) / (kEndPerspectiveScale1 - kEndPerspectiveScale2);
     return kMaxPerspectiveAngle1 + (kMaxPerspectiveAngle2 - kMaxPerspectiveAngle1) * k;
   }
 
@@ -109,7 +110,10 @@ double ScreenBase::CalculateAutoPerspectiveAngle(double scale)
 }
 
 // static
-double ScreenBase::GetStartPerspectiveScale() { return kStartPerspectiveScale1; }
+double ScreenBase::GetStartPerspectiveScale()
+{
+  return kStartPerspectiveScale1;
+}
 
 double ScreenBase::CalculatePerspectiveAngle(double scale) const
 {
@@ -142,7 +146,10 @@ void ScreenBase::SetFromRects(m2::AnyRectD const & glbRect, m2::RectD const & px
   UpdateDependentParameters();
 }
 
-void ScreenBase::SetFromRect(m2::AnyRectD const & glbRect) { SetFromRects(glbRect, m_PixelRect); }
+void ScreenBase::SetFromRect(m2::AnyRectD const & glbRect)
+{
+  SetFromRects(glbRect, m_PixelRect);
+}
 
 void ScreenBase::SetFromParams(m2::PointD const & org, double angle, double scale)
 {
@@ -203,7 +210,10 @@ void ScreenBase::OnSize(m2::RectI const & r)
   UpdateDependentParameters();
 }
 
-void ScreenBase::OnSize(int x0, int y0, int w, int h) { OnSize(m2::RectI(x0, y0, x0 + w, y0 + h)); }
+void ScreenBase::OnSize(int x0, int y0, int w, int h)
+{
+  OnSize(m2::RectI(x0, y0, x0 + w, y0 + h));
+}
 
 void ScreenBase::SetScale(double scale)
 {
@@ -218,25 +228,26 @@ void ScreenBase::SetAngle(double angle)
   UpdateDependentParameters();
 }
 
-int ScreenBase::GetWidth() const { return std::lround(m_PixelRect.SizeX()); }
-
-int ScreenBase::GetHeight() const { return std::lround(m_PixelRect.SizeY()); }
-
-ScreenBase::MatrixT ScreenBase::CalcTransform(m2::PointD const & oldPt1,
-                                                    m2::PointD const & oldPt2,
-                                                    m2::PointD const & newPt1,
-                                                    m2::PointD const & newPt2,
-                                                    bool allowRotate,
-                                                    bool allowScale)
+int ScreenBase::GetWidth() const
 {
+  return std::lround(m_PixelRect.SizeX());
+}
 
+int ScreenBase::GetHeight() const
+{
+  return std::lround(m_PixelRect.SizeY());
+}
+
+ScreenBase::MatrixT ScreenBase::CalcTransform(m2::PointD const & oldPt1, m2::PointD const & oldPt2,
+                                              m2::PointD const & newPt1, m2::PointD const & newPt2, bool allowRotate,
+                                              bool allowScale)
+{
   double const s = allowScale ? newPt1.Length(newPt2) / oldPt1.Length(oldPt2) : 1.0;
   double const a = allowRotate ? ang::AngleTo(newPt1, newPt2) - ang::AngleTo(oldPt1, oldPt2) : 0.0;
 
-  MatrixT m = math::Shift(
-      math::Scale(math::Rotate(math::Shift(math::Identity<double, 3>(), -oldPt1.x, -oldPt1.y), a),
-                  s, s),
-      newPt1.x, newPt1.y);
+  MatrixT m =
+      math::Shift(math::Scale(math::Rotate(math::Shift(math::Identity<double, 3>(), -oldPt1.x, -oldPt1.y), a), s, s),
+                  newPt1.x, newPt1.y);
   return m;
 }
 
@@ -268,15 +279,14 @@ void ScreenBase::PtoG(m2::RectD const & pxRect, m2::RectD & glbRect) const
   glbRect = m2::RectD(PtoG(pxRect.LeftTop()), PtoG(pxRect.RightBottom()));
 }
 
-void ScreenBase::GetTouchRect(m2::PointD const & pixPoint, double pixRadius,
-                              m2::AnyRectD & glbRect) const
+void ScreenBase::GetTouchRect(m2::PointD const & pixPoint, double pixRadius, m2::AnyRectD & glbRect) const
 {
   double const r = pixRadius * m_Scale;
   glbRect = m2::AnyRectD(PtoG(pixPoint), m_Angle, m2::RectD(-r, -r, r, r));
 }
 
-void ScreenBase::GetTouchRect(m2::PointD const & pixPoint, double const pxWidth,
-                              double const pxHeight, m2::AnyRectD & glbRect) const
+void ScreenBase::GetTouchRect(m2::PointD const & pixPoint, double const pxWidth, double const pxHeight,
+                              m2::AnyRectD & glbRect) const
 {
   double const width = pxWidth * m_Scale;
   double const height = pxHeight * m_Scale;
@@ -293,16 +303,13 @@ bool IsPanningAndRotate(ScreenBase const & s1, ScreenBase const & s2)
 
   m2::PointD globPt(c1.x - r1.minX(), c1.y - r1.minY());
 
-  m2::PointD p1 =
-      s1.GtoP(s1.GlobalRect().ConvertFrom(c1)) - s1.GtoP(s1.GlobalRect().ConvertFrom(c1 + globPt));
-  m2::PointD p2 =
-      s2.GtoP(s2.GlobalRect().ConvertFrom(c2)) - s2.GtoP(s2.GlobalRect().ConvertFrom(c2 + globPt));
+  m2::PointD p1 = s1.GtoP(s1.GlobalRect().ConvertFrom(c1)) - s1.GtoP(s1.GlobalRect().ConvertFrom(c1 + globPt));
+  m2::PointD p2 = s2.GtoP(s2.GlobalRect().ConvertFrom(c2)) - s2.GtoP(s2.GlobalRect().ConvertFrom(c2 + globPt));
 
   return p1.EqualDxDy(p2, 0.00001);
 }
 
-void ScreenBase::ExtractGtoPParams(MatrixT const & m, double & a, double & s, double & dx,
-                                   double & dy)
+void ScreenBase::ExtractGtoPParams(MatrixT const & m, double & a, double & s, double & dx, double & dy)
 {
   s = sqrt(m(0, 0) * m(0, 0) + m(0, 1) * m(0, 1));
 
@@ -319,8 +326,7 @@ double ScreenBase::CalculateScale3d(double rotationAngle) const
 
   // Ratio of the expanded plane's size to the original size.
   double const y3dScale = cos(rotationAngle) + sin(rotationAngle) * tan(halfFOV + rotationAngle);
-  double const x3dScale =
-      1.0 + 2 * sin(rotationAngle) * cos(halfFOV) / (cameraZ * cos(halfFOV + rotationAngle));
+  double const x3dScale = 1.0 + 2 * sin(rotationAngle) * cos(halfFOV) / (cameraZ * cos(halfFOV + rotationAngle));
 
   return std::max(x3dScale, y3dScale);
 }
@@ -332,8 +338,7 @@ m2::RectD ScreenBase::CalculatePixelRect(double scale) const
   {
     double const scale3d = CalculateScale3d(angle);
 
-    return m2::RectD(m2::PointD(0.0, 0.0),
-                     m2::PointD(m_ViewportRect.maxX(), m_ViewportRect.maxY()) * scale3d);
+    return m2::RectD(m2::PointD(0.0, 0.0), m2::PointD(m_ViewportRect.maxX(), m_ViewportRect.maxY()) * scale3d);
   }
 
   return m_ViewportRect;
@@ -342,8 +347,7 @@ m2::RectD ScreenBase::CalculatePixelRect(double scale) const
 // Place the camera at the distance, where it gives the same view of plane as the
 // orthogonal projection does. Calculate what part of the map would be visible,
 // when it is rotated through maxRotationAngle around its near horizontal side.
-void ScreenBase::ApplyPerspective(double currentRotationAngle, double maxRotationAngle,
-                                  double angleFOV)
+void ScreenBase::ApplyPerspective(double currentRotationAngle, double maxRotationAngle, double angleFOV)
 {
   ASSERT_GREATER(angleFOV, 0.0, ());
   ASSERT_LESS(angleFOV, math::pi2, ());
@@ -405,8 +409,7 @@ void ScreenBase::SetRotationAngle(double rotationAngle)
   projectionM(0, 0) = projectionM(1, 1) = cameraZ;
   projectionM(2, 2) = m_3dAngleX != 0.0 ? (m_3dFarZ + m_3dNearZ) / (m_3dFarZ - m_3dNearZ) : 0.0;
   projectionM(2, 3) = 1.0;
-  projectionM(3, 2) =
-      m_3dAngleX != 0.0 ? -2.0 * m_3dFarZ * m_3dNearZ / (m_3dFarZ - m_3dNearZ) : 0.0;
+  projectionM(3, 2) = m_3dAngleX != 0.0 ? -2.0 * m_3dFarZ * m_3dNearZ / (m_3dFarZ - m_3dNearZ) : 0.0;
 
   m_Pto3d = scaleM * rotateM * translateM * projectionM;
   m_3dtoP = math::Inverse(m_Pto3d);
@@ -426,7 +429,10 @@ void ScreenBase::ResetPerspective()
   Move(0.0, -old_dy / 2.0);
 }
 
-m2::PointD ScreenBase::PtoP3d(m2::PointD const & pt) const { return PtoP3d(pt, 0.0); }
+m2::PointD ScreenBase::PtoP3d(m2::PointD const & pt) const
+{
+  return PtoP3d(pt, 0.0);
+}
 
 double ScreenBase::GetZScale() const
 {
@@ -439,8 +445,7 @@ m2::PointD ScreenBase::PtoP3d(m2::PointD const & pt, double ptZ) const
   if (!m_isPerspective)
     return pt;
   Vector3dT const normalizedPoint{float(2.0 * pt.x / m_PixelRect.SizeX() - 1.0),
-                                  -float(2.0 * pt.y / m_PixelRect.SizeY() - 1.0),
-                                  float(ptZ * GetZScale()), 1.0};
+                                  -float(2.0 * pt.y / m_PixelRect.SizeY() - 1.0), float(ptZ * GetZScale()), 1.0};
 
   Vector3dT const perspectivePoint = normalizedPoint * m_Pto3d;
 
@@ -515,24 +520,16 @@ bool ScreenBase::IsReverseProjection3d(m2::PointD const & pt) const
 
 ScreenBase::Matrix3dT ScreenBase::GetModelView() const
 {
-  return ScreenBase::Matrix3dT
-  {
-    m_GtoP(0, 0), m_GtoP(1, 0), 0, m_GtoP(2, 0),
-    m_GtoP(0, 1), m_GtoP(1, 1), 0, m_GtoP(2, 1),
-    0, 0, 1, 0,
-    0, 0, 0, 1
-  };
+  return ScreenBase::Matrix3dT{
+      m_GtoP(0, 0), m_GtoP(1, 0), 0, m_GtoP(2, 0), m_GtoP(0, 1), m_GtoP(1, 1), 0, m_GtoP(2, 1), 0, 0, 1, 0, 0, 0, 0, 1};
 }
 
 ScreenBase::Matrix3dT ScreenBase::GetModelView(m2::PointD const & pivot, double scalar) const
 {
   MatrixT const & m = m_GtoP;
   double const s = 1.0 / scalar;
-  return ScreenBase::Matrix3dT
-  {
-    s * m(0, 0), s * m(1, 0), 0, m(2, 0) + pivot.x * m(0, 0) + pivot.y * m(1, 0),
-    s * m(0, 1), s * m(1, 1), 0, m(2, 1) + pivot.x * m(0, 1) + pivot.y * m(1, 1),
-    0, 0, 1, 0,
-    0, 0, 0, 1
-  };
+  return ScreenBase::Matrix3dT{s * m(0, 0), s * m(1, 0), 0, m(2, 0) + pivot.x * m(0, 0) + pivot.y * m(1, 0),
+                               s * m(0, 1), s * m(1, 1), 0, m(2, 1) + pivot.x * m(0, 1) + pivot.y * m(1, 1),
+                               0,           0,           1, 0,
+                               0,           0,           0, 1};
 }
diff --git a/libs/geometry/screenbase.hpp b/libs/geometry/screenbase.hpp
index da92b35fd..a36b23bdc 100644
--- a/libs/geometry/screenbase.hpp
+++ b/libs/geometry/screenbase.hpp
@@ -122,23 +122,18 @@ public:
 
   /// Compute arbitrary pixel transformation, that translates the (oldPt1, oldPt2) -> (newPt1,
   /// newPt2)
-  static MatrixT CalcTransform(m2::PointD const & oldPt1, m2::PointD const & oldPt2,
-                                     m2::PointD const & newPt1, m2::PointD const & newPt2,
-                                     bool allowRotate, bool allowScale);
+  static MatrixT CalcTransform(m2::PointD const & oldPt1, m2::PointD const & oldPt2, m2::PointD const & newPt1,
+                               m2::PointD const & newPt2, bool allowRotate, bool allowScale);
 
   /// Setting GtoP matrix extracts the Angle and m_Org parameters, leaving PixelRect intact
   void SetGtoPMatrix(MatrixT const & m);
 
   /// Extracting parameters from matrix, that is supposed to represent GtoP transformation
-  static void ExtractGtoPParams(MatrixT const & m, double & a, double & s, double & dx,
-                                double & dy);
+  static void ExtractGtoPParams(MatrixT const & m, double & a, double & s, double & dx, double & dy);
 
   bool operator!=(ScreenBase const & src) const { return !(*this == src); }
 
-  bool operator==(ScreenBase const & src) const
-  {
-    return (m_GtoP == src.m_GtoP) && (m_PtoG == src.m_PtoG);
-  }
+  bool operator==(ScreenBase const & src) const { return (m_GtoP == src.m_GtoP) && (m_PtoG == src.m_PtoG); }
 
 private:
   // Used when initializing m_GlobalRect.
diff --git a/libs/geometry/segment2d.cpp b/libs/geometry/segment2d.cpp
index 6a2f640d0..5e0cd32be 100644
--- a/libs/geometry/segment2d.cpp
+++ b/libs/geometry/segment2d.cpp
@@ -43,10 +43,9 @@ bool IsPointOnSegment(PointD const & pt, PointD const & p1, PointD const & p2)
 bool SegmentsIntersect(PointD const & a, PointD const & b, PointD const & c, PointD const & d)
 {
   using std::max, std::min;
-  return max(a.x, b.x) >= min(c.x, d.x) && min(a.x, b.x) <= max(c.x, d.x) &&
-      max(a.y, b.y) >= min(c.y, d.y) && min(a.y, b.y) <= max(c.y, d.y) &&
-      robust::OrientedS(a, b, c) * robust::OrientedS(a, b, d) <= 0.0 &&
-      robust::OrientedS(c, d, a) * robust::OrientedS(c, d, b) <= 0.0;
+  return max(a.x, b.x) >= min(c.x, d.x) && min(a.x, b.x) <= max(c.x, d.x) && max(a.y, b.y) >= min(c.y, d.y) &&
+         min(a.y, b.y) <= max(c.y, d.y) && robust::OrientedS(a, b, c) * robust::OrientedS(a, b, d) <= 0.0 &&
+         robust::OrientedS(c, d, a) * robust::OrientedS(c, d, b) <= 0.0;
 }
 
 IntersectionResult Intersect(Segment2D const & seg1, Segment2D const & seg2, double eps)
diff --git a/libs/geometry/segment2d.hpp b/libs/geometry/segment2d.hpp
index de0f6f1a6..d41a527d9 100644
--- a/libs/geometry/segment2d.hpp
+++ b/libs/geometry/segment2d.hpp
@@ -37,8 +37,7 @@ bool IsPointOnSegmentEps(PointD const & pt, PointD const & p1, PointD const & p2
 bool IsPointOnSegment(PointD const & pt, PointD const & p1, PointD const & p2);
 
 /// \returns true if segments (p1, p2) and (p3, p4) are intersected and false otherwise.
-bool SegmentsIntersect(PointD const & p1, PointD const & p2, PointD const & p3,
-                       PointD const & p4);
+bool SegmentsIntersect(PointD const & p1, PointD const & p2, PointD const & p3, PointD const & p4);
 
 /// \breif Intersects two segments and finds an intersection point if any.
 /// \note |eps| applies for collinearity and for PointD errors.
diff --git a/libs/geometry/simplification.hpp b/libs/geometry/simplification.hpp
index 47c883566..7714cf668 100644
--- a/libs/geometry/simplification.hpp
+++ b/libs/geometry/simplification.hpp
@@ -52,8 +52,7 @@ void SimplifyDP(Iter first, Iter last, double epsilon, DistanceFn & distFn, Out
 struct SimplifyOptimalRes
 {
   SimplifyOptimalRes() = default;
-  SimplifyOptimalRes(int32_t nextPoint, uint32_t pointCount)
-    : m_NextPoint(nextPoint), m_PointCount(pointCount) {}
+  SimplifyOptimalRes(int32_t nextPoint, uint32_t pointCount) : m_NextPoint(nextPoint), m_PointCount(pointCount) {}
 
   int32_t m_NextPoint = -1;
   uint32_t m_PointCount = -1U;
@@ -80,8 +79,7 @@ void SimplifyDP(Iter beg, Iter end, double epsilon, DistanceFn distFn, Out out)
 // Essentially, it's a trade-off between optimality and performance.
 // Values around 20 - 200 are reasonable.
 template <typename DistanceFn, typename Iter, typename Out>
-void SimplifyNearOptimal(int maxFalseLookAhead, Iter beg, Iter end, double epsilon,
-                         DistanceFn distFn, Out out)
+void SimplifyNearOptimal(int maxFalseLookAhead, Iter beg, Iter end, double epsilon, DistanceFn distFn, Out out)
 {
   int32_t const n = static_cast<int32_t>(end - beg);
   if (n <= 2)
@@ -124,21 +122,20 @@ class AccumulateSkipSmallTrg
 {
 public:
   AccumulateSkipSmallTrg(DistanceFn & distFn, std::vector<Point> & vec, double eps)
-    : m_distFn(distFn), m_vec(vec), m_eps(eps)
-  {
-  }
+    : m_distFn(distFn)
+    , m_vec(vec)
+    , m_eps(eps)
+  {}
 
   void operator()(Point const & p) const
   {
     // remove points while they make linear triangle with p
     size_t count;
     while ((count = m_vec.size()) >= 2)
-    {
       if (m_distFn(m_vec[count - 2], p, m_vec[count - 1]) < m_eps)
         m_vec.pop_back();
       else
         break;
-    }
 
     m_vec.push_back(p);
   }
diff --git a/libs/geometry/smoothing.cpp b/libs/geometry/smoothing.cpp
index 71920bb10..116a79a77 100644
--- a/libs/geometry/smoothing.cpp
+++ b/libs/geometry/smoothing.cpp
@@ -8,8 +8,7 @@ namespace
 {
 double constexpr kEps = 1e-5;
 
-void SmoothGeneric(m2::PointD const & pt0, m2::PointD const & pt1,
-                   m2::PointD const & pt2, m2::PointD const & pt3,
+void SmoothGeneric(m2::PointD const & pt0, m2::PointD const & pt1, m2::PointD const & pt2, m2::PointD const & pt3,
                    double alpha, size_t pointsCount, std::vector<m2::PointD> & path)
 {
   if (pt0.EqualDxDy(pt1, kEps) || pt1.EqualDxDy(pt2, kEps) || pt2.EqualDxDy(pt3, kEps))
@@ -46,8 +45,7 @@ void SmoothGeneric(m2::PointD const & pt0, m2::PointD const & pt1,
 }
 
 // The same as SmoothGeneric but optimized for alpha == 0.0.
-void SmoothUniform(m2::PointD const & pt0, m2::PointD const & pt1,
-                   m2::PointD const & pt2, m2::PointD const & pt3,
+void SmoothUniform(m2::PointD const & pt0, m2::PointD const & pt1, m2::PointD const & pt2, m2::PointD const & pt3,
                    size_t pointsCount, std::vector<m2::PointD> & path)
 {
   if (pt0.EqualDxDy(pt1, kEps) || pt1.EqualDxDy(pt2, kEps) || pt2.EqualDxDy(pt3, kEps))
@@ -71,8 +69,7 @@ void SmoothUniform(m2::PointD const & pt0, m2::PointD const & pt1,
 }
 }  // namespace
 
-void SmoothPaths(GuidePointsForSmooth const & guidePoints,
-                 size_t newPointsPerSegmentCount, double smoothAlpha,
+void SmoothPaths(GuidePointsForSmooth const & guidePoints, size_t newPointsPerSegmentCount, double smoothAlpha,
                  std::vector<std::vector<m2::PointD>> & paths)
 {
   ASSERT_EQUAL(guidePoints.size(), paths.size(), ());
diff --git a/libs/geometry/smoothing.hpp b/libs/geometry/smoothing.hpp
index 884d1d2e6..0ab6d3932 100644
--- a/libs/geometry/smoothing.hpp
+++ b/libs/geometry/smoothing.hpp
@@ -13,8 +13,6 @@ double constexpr kUniformAplha = 0.0;
 double constexpr kCentripetalAlpha = 0.5;
 double constexpr kChordalAlpha = 1.0;
 
-void SmoothPaths(GuidePointsForSmooth const & guidePoints,
-                 size_t newPointsPerSegmentCount, double smoothAlpha,
+void SmoothPaths(GuidePointsForSmooth const & guidePoints, size_t newPointsPerSegmentCount, double smoothAlpha,
                  std::vector<std::vector<m2::PointD>> & paths);
 }  // namespace m2
-
diff --git a/libs/geometry/spline.cpp b/libs/geometry/spline.cpp
index 8f4c2b4fa..3db329db5 100644
--- a/libs/geometry/spline.cpp
+++ b/libs/geometry/spline.cpp
@@ -4,14 +4,12 @@
 
 namespace m2
 {
-Spline::Spline(std::vector<PointD> const & path)
-  : m_position(path)
+Spline::Spline(std::vector<PointD> const & path) : m_position(path)
 {
   InitDirections();
 }
 
-Spline::Spline(std::vector<PointD> && path)
-  : m_position(std::move(path))
+Spline::Spline(std::vector<PointD> && path) : m_position(std::move(path))
 {
   InitDirections();
 }
@@ -24,10 +22,7 @@ Spline::Spline(size_t reservedSize)
   m_length.reserve(reservedSize - 1);
 }
 
-SplineEx::SplineEx(size_t reservedSize)
-  : Spline(reservedSize)
-{
-}
+SplineEx::SplineEx(size_t reservedSize) : Spline(reservedSize) {}
 
 void Spline::AddPoint(PointD const & pt)
 {
@@ -120,7 +115,7 @@ double Spline::GetLastLength() const
 std::pair<PointD, double> Spline::GetTangentAndLength(size_t i) const
 {
   ASSERT_LESS(i, m_length.size(), ());
-  return { m_direction[i], m_length[i] };
+  return {m_direction[i], m_length[i]};
 }
 
 void Spline::InitDirections()
@@ -142,13 +137,7 @@ void Spline::InitDirections()
   }
 }
 
-Spline::iterator::iterator()
-  : m_checker(false)
-  , m_spl(NULL)
-  , m_index(0)
-  , m_dist(0)
-{
-}
+Spline::iterator::iterator() : m_checker(false), m_spl(NULL), m_index(0), m_dist(0) {}
 
 void Spline::iterator::Attach(Spline const & spl)
 {
@@ -247,15 +236,9 @@ void Spline::iterator::AdvanceForward(double step)
   m_avrDir += m_pos;
 }
 
-SharedSpline::SharedSpline(std::vector<PointD> const & path)
-  : m_spline(std::make_shared<Spline>(path))
-{
-}
+SharedSpline::SharedSpline(std::vector<PointD> const & path) : m_spline(std::make_shared<Spline>(path)) {}
 
-SharedSpline::SharedSpline(std::vector<PointD> && path)
-  : m_spline(std::make_shared<Spline>(std::move(path)))
-{
-}
+SharedSpline::SharedSpline(std::vector<PointD> && path) : m_spline(std::make_shared<Spline>(std::move(path))) {}
 
 bool SharedSpline::IsNull() const
 {
@@ -267,10 +250,10 @@ void SharedSpline::Reset(Spline * spline)
   m_spline.reset(spline);
 }
 
-//void SharedSpline::Reset(std::vector<PointD> const & path)
+// void SharedSpline::Reset(std::vector<PointD> const & path)
 //{
-//  m_spline.reset(new Spline(path));
-//}
+//   m_spline.reset(new Spline(path));
+// }
 
 Spline::iterator SharedSpline::CreateIterator() const
 {
@@ -295,4 +278,4 @@ Spline const * SharedSpline::Get() const
   ASSERT(!IsNull(), ());
   return m_spline.get();
 }
-} // namespace m2
+}  // namespace m2
diff --git a/libs/geometry/spline.hpp b/libs/geometry/spline.hpp
index 241c48d39..81c895aad 100644
--- a/libs/geometry/spline.hpp
+++ b/libs/geometry/spline.hpp
@@ -105,7 +105,7 @@ public:
 
   bool IsNull() const;
   void Reset(Spline * spline);
-  //void Reset(std::vector<PointD> const & path);
+  // void Reset(std::vector<PointD> const & path);
 
   Spline::iterator CreateIterator() const;
 
diff --git a/libs/geometry/transformations.hpp b/libs/geometry/transformations.hpp
index 9fb6dbaf0..412e9ef2e 100644
--- a/libs/geometry/transformations.hpp
+++ b/libs/geometry/transformations.hpp
@@ -4,53 +4,54 @@
 
 #include "base/matrix.hpp"
 
-
 /// v` = v * M, v = [x, y, 1]
 
 namespace math
 {
-  template <typename T, typename U>
-  Matrix<T, 3, 3> const Rotate(Matrix<T, 3, 3> const & m, U const & cos, U const & sin)
-  {
-    Matrix<T, 3, 3> m1 = Identity<T, 3>();
-    m1(0, 0) = cos; m1(0, 1) = sin;
-    m1(1, 0) = -sin; m1(1, 1) = cos;
-    return m * m1;
-  }
-
-  template <typename T, typename U>
-  Matrix<T, 3, 3> const Rotate(Matrix<T, 3, 3> const & m, U const & angle)
-  {
-    return Rotate(m, cos(angle), sin(angle));
-  }
-
-  template <typename T, typename U>
-  Matrix<T, 3, 3> const Shift(Matrix<T, 3, 3> const & m, U const & dx, U const & dy)
-  {
-    Matrix<T, 3, 3> m1 = Identity<T, 3>();
-    m1(2, 0) = dx;
-    m1(2, 1) = dy;
-    return m * m1;
-  }
-
-  template <typename T, typename U>
-  Matrix<T, 3, 3> const Shift(Matrix<T, 3, 3> const & m, m2::Point<U> const & pt)
-  {
-    return Shift(m, pt.x, pt.y);
-  }
-
-  template <typename T, typename U>
-  Matrix<T, 3, 3> const Scale(Matrix<T, 3, 3> const & m, U const & kx, U const & ky)
-  {
-    Matrix<T, 3, 3> m1 = Identity<T, 3>();
-    m1(0, 0) = kx;
-    m1(1, 1) = ky;
-    return m * m1;
-  }
-
-  template <typename T, typename U>
-  Matrix<T, 3, 3> const Scale(Matrix<T, 3, 3> const & m, m2::Point<U> const & pt)
-  {
-    return Scale(m, pt.x, pt.y);
-  }
+template <typename T, typename U>
+Matrix<T, 3, 3> const Rotate(Matrix<T, 3, 3> const & m, U const & cos, U const & sin)
+{
+  Matrix<T, 3, 3> m1 = Identity<T, 3>();
+  m1(0, 0) = cos;
+  m1(0, 1) = sin;
+  m1(1, 0) = -sin;
+  m1(1, 1) = cos;
+  return m * m1;
 }
+
+template <typename T, typename U>
+Matrix<T, 3, 3> const Rotate(Matrix<T, 3, 3> const & m, U const & angle)
+{
+  return Rotate(m, cos(angle), sin(angle));
+}
+
+template <typename T, typename U>
+Matrix<T, 3, 3> const Shift(Matrix<T, 3, 3> const & m, U const & dx, U const & dy)
+{
+  Matrix<T, 3, 3> m1 = Identity<T, 3>();
+  m1(2, 0) = dx;
+  m1(2, 1) = dy;
+  return m * m1;
+}
+
+template <typename T, typename U>
+Matrix<T, 3, 3> const Shift(Matrix<T, 3, 3> const & m, m2::Point<U> const & pt)
+{
+  return Shift(m, pt.x, pt.y);
+}
+
+template <typename T, typename U>
+Matrix<T, 3, 3> const Scale(Matrix<T, 3, 3> const & m, U const & kx, U const & ky)
+{
+  Matrix<T, 3, 3> m1 = Identity<T, 3>();
+  m1(0, 0) = kx;
+  m1(1, 1) = ky;
+  return m * m1;
+}
+
+template <typename T, typename U>
+Matrix<T, 3, 3> const Scale(Matrix<T, 3, 3> const & m, m2::Point<U> const & pt)
+{
+  return Scale(m, pt.x, pt.y);
+}
+}  // namespace math
diff --git a/libs/geometry/tree4d.hpp b/libs/geometry/tree4d.hpp
index bf6f7a88d..3ac1d1255 100644
--- a/libs/geometry/tree4d.hpp
+++ b/libs/geometry/tree4d.hpp
@@ -37,8 +37,7 @@ class Tree
 
     bool IsIntersect(m2::RectD const & r) const
     {
-      return !((m_pts[2] <= r.minX()) || (m_pts[0] >= r.maxX()) || (m_pts[3] <= r.minY()) ||
-               (m_pts[1] >= r.maxY()));
+      return !((m_pts[2] <= r.minX()) || (m_pts[0] >= r.maxX()) || (m_pts[3] <= r.minY()) || (m_pts[1] >= r.maxY()));
     }
 
     bool operator==(Value const & r) const { return (m_val == r.m_val); }
@@ -47,8 +46,7 @@ class Tree
     {
       std::ostringstream out;
 
-      out << DebugPrint(m_val) << ", (" << m_pts[0] << ", " << m_pts[1] << ", " << m_pts[2] << ", "
-          << m_pts[3] << ")";
+      out << DebugPrint(m_val) << ", (" << m_pts[0] << ", " << m_pts[1] << ", " << m_pts[2] << ", " << m_pts[3] << ")";
 
       return out.str();
     }
@@ -77,9 +75,7 @@ class Tree
   class for_each_helper
   {
   public:
-    for_each_helper(m2::RectD const & r, ToDo && toDo) : m_rect(r), m_toDo(std::forward<ToDo>(toDo))
-    {
-    }
+    for_each_helper(m2::RectD const & r, ToDo && toDo) : m_rect(r), m_toDo(std::forward<ToDo>(toDo)) {}
 
     bool ScanLeft(size_t plane, Value const & v) const
     {
@@ -153,7 +149,8 @@ private:
     bool skip = false;
     std::vector<Value const *> isect;
 
-    m_tree.for_each(GetFunctor(rect, [&](Value const & v) {
+    m_tree.for_each(GetFunctor(rect, [&](Value const & v)
+    {
       if (skip)
         return;
 
@@ -177,14 +174,14 @@ public:
   template <typename Compare>
   void ReplaceAllInRect(T const & obj, Compare comp)
   {
-    ReplaceImpl(obj, GetLimitRect(obj),
-                [&comp](T const & t1, T const & t2) { return comp(t1, t2) ? 1 : -1; });
+    ReplaceImpl(obj, GetLimitRect(obj), [&comp](T const & t1, T const & t2) { return comp(t1, t2) ? 1 : -1; });
   }
 
   template <typename Equal, typename Compare>
   void ReplaceEqualInRect(T const & obj, Equal eq, Compare comp)
   {
-    ReplaceImpl(obj, GetLimitRect(obj), [&](T const & t1, T const & t2) {
+    ReplaceImpl(obj, GetLimitRect(obj), [&](T const & t1, T const & t2)
+    {
       if (eq(t1, t2))
         return comp(t1, t2) ? 1 : -1;
       else
@@ -215,10 +212,8 @@ public:
   bool ForAny(ToDo && toDo) const
   {
     for (Value const & v : m_tree)
-    {
       if (toDo(v.m_val))
         return true;
-    }
 
     return false;
   }
@@ -234,10 +229,8 @@ public:
   bool FindNode(ToDo && toDo) const
   {
     for (Value const & v : m_tree)
-    {
       if (toDo(v.m_val))
         return true;
-    }
 
     return false;
   }
diff --git a/libs/geometry/triangle2d.cpp b/libs/geometry/triangle2d.cpp
index 54974a35c..a4a42c5b2 100644
--- a/libs/geometry/triangle2d.cpp
+++ b/libs/geometry/triangle2d.cpp
@@ -11,8 +11,7 @@
 
 namespace m2
 {
-bool IsPointInsideTriangle(PointD const & pt, PointD const & p1,
-                           PointD const & p2, PointD const & p3)
+bool IsPointInsideTriangle(PointD const & pt, PointD const & p1, PointD const & p2, PointD const & p3)
 {
   double const s1 = robust::OrientedS(p1, p2, pt);
   double const s2 = robust::OrientedS(p2, p3, pt);
@@ -21,32 +20,24 @@ bool IsPointInsideTriangle(PointD const & pt, PointD const & p1,
   // In the case of degenerate triangles we need to check that pt lies
   // on (p1, p2), (p2, p3) or (p3, p1).
   if (s1 == 0.0 && s2 == 0.0 && s3 == 0.0)
-  {
-    return IsPointOnSegment(pt, p1, p2) || IsPointOnSegment(pt, p2, p3) ||
-           IsPointOnSegment(pt, p3, p1);
-  }
+    return IsPointOnSegment(pt, p1, p2) || IsPointOnSegment(pt, p2, p3) || IsPointOnSegment(pt, p3, p1);
 
-  return ((s1 >= 0.0 && s2 >= 0.0 && s3 >= 0.0) ||
-          (s1 <= 0.0 && s2 <= 0.0 && s3 <= 0.0));
+  return ((s1 >= 0.0 && s2 >= 0.0 && s3 >= 0.0) || (s1 <= 0.0 && s2 <= 0.0 && s3 <= 0.0));
 }
 
-bool IsPointStrictlyInsideTriangle(PointD const & pt, PointD const & p1,
-                                   PointD const & p2, PointD const & p3)
+bool IsPointStrictlyInsideTriangle(PointD const & pt, PointD const & p1, PointD const & p2, PointD const & p3)
 {
   double const s1 = robust::OrientedS(p1, p2, pt);
   double const s2 = robust::OrientedS(p2, p3, pt);
   double const s3 = robust::OrientedS(p3, p1, pt);
 
-  return ((s1 > 0.0 && s2 > 0.0 && s3 > 0.0) ||
-          (s1 < 0.0 && s2 < 0.0 && s3 < 0.0));
+  return ((s1 > 0.0 && s2 > 0.0 && s3 > 0.0) || (s1 < 0.0 && s2 < 0.0 && s3 < 0.0));
 }
 
 bool IsPointInsideTriangles(PointD const & pt, std::vector<TriangleD> const & v)
 {
-  return std::any_of(v.begin(), v.end(), [&pt](TriangleD const & t)
-      {
-         return IsPointInsideTriangle(pt, t.p1(), t.p2(), t.p3());
-      });
+  return std::any_of(v.begin(), v.end(),
+                     [&pt](TriangleD const & t) { return IsPointInsideTriangle(pt, t.p1(), t.p2(), t.p3()); });
 }
 
 PointD GetRandomPointInsideTriangle(TriangleD const & t)
diff --git a/libs/geometry/triangle2d.hpp b/libs/geometry/triangle2d.hpp
index 76adb6551..ee0de6e87 100644
--- a/libs/geometry/triangle2d.hpp
+++ b/libs/geometry/triangle2d.hpp
@@ -8,7 +8,8 @@
 namespace m2
 {
 
-template <typename T> struct Triangle
+template <typename T>
+struct Triangle
 {
   Point<T> m_points[3];
 
@@ -31,17 +32,14 @@ template <typename T>
 std::string DebugPrint(m2::Triangle<T> const & trg)
 {
   std::stringstream s;
-  s << "Triangle ["
-    << DebugPrint(trg.p1()) << ", "
-    << DebugPrint(trg.p2()) << ", "
-    << DebugPrint(trg.p3()) << "]";
+  s << "Triangle [" << DebugPrint(trg.p1()) << ", " << DebugPrint(trg.p2()) << ", " << DebugPrint(trg.p3()) << "]";
   return s.str();
 }
 
 template <class T>
 double GetTriangleArea(Point<T> const & p1, Point<T> const & p2, Point<T> const & p3)
 {
-  return 0.5 * fabs((p2.x - p1.x)*(p3.y - p1.y) - (p3.x - p1.x)*(p2.y - p1.y));
+  return 0.5 * fabs((p2.x - p1.x) * (p3.y - p1.y) - (p3.x - p1.x) * (p2.y - p1.y));
 }
 
 m2::PointD GetRandomPointInsideTriangle(m2::TriangleD const & t);
@@ -54,13 +52,12 @@ m2::PointD ProjectPointToTriangles(m2::PointD const & pt, std::vector<m2::Triang
 /// @param[in] pt - Point to check
 /// @param[in] p1, p2, p3 - Triangle
 //@{
-bool IsPointInsideTriangle(m2::PointD const & pt, m2::PointD const & p1,
-                           m2::PointD const & p2, m2::PointD const & p3);
+bool IsPointInsideTriangle(m2::PointD const & pt, m2::PointD const & p1, m2::PointD const & p2, m2::PointD const & p3);
 
-bool IsPointStrictlyInsideTriangle(m2::PointD const & pt, m2::PointD const & p1,
-                                   m2::PointD const & p2, m2::PointD const & p3);
+bool IsPointStrictlyInsideTriangle(m2::PointD const & pt, m2::PointD const & p1, m2::PointD const & p2,
+                                   m2::PointD const & p3);
 
 bool IsPointInsideTriangles(m2::PointD const & pt, std::vector<m2::TriangleD> const & v);
 //@}
 
-} // namespace m2
+}  // namespace m2
diff --git a/libs/indexer/altitude_loader.cpp b/libs/indexer/altitude_loader.cpp
index f63b5b951..991c7563b 100644
--- a/libs/indexer/altitude_loader.cpp
+++ b/libs/indexer/altitude_loader.cpp
@@ -45,8 +45,7 @@ AltitudeLoaderBase::AltitudeLoaderBase(MwmValue const & mwmValue)
     ReaderSource<FilesContainerR::TReader> src(*m_reader);
     m_header.Deserialize(src);
 
-    LoadAndMap(m_header.GetAltitudeAvailabilitySize(), src, m_altitudeAvailability,
-               m_altitudeAvailabilityRegion);
+    LoadAndMap(m_header.GetAltitudeAvailabilitySize(), src, m_altitudeAvailability, m_altitudeAvailabilityRegion);
     LoadAndMap(m_header.GetFeatureTableSize(), src, m_featureTable, m_featureTableRegion);
   }
   catch (Reader::OpenException const & e)
@@ -85,11 +84,12 @@ geometry::Altitudes AltitudeLoaderBase::GetAltitudes(uint32_t featureId, size_t
     Altitudes altitudes;
     ReaderSource<FilesContainerR::TReader> src(*m_reader);
     src.Skip(altitudeInfoOffsetInSection);
-    altitudes.Deserialize(m_header.m_minAltitude, pointCount, m_countryFileName, featureId,  src);
+    altitudes.Deserialize(m_header.m_minAltitude, pointCount, m_countryFileName, featureId, src);
 
     // It's filtered on generator stage.
     ASSERT(none_of(altitudes.m_altitudes.begin(), altitudes.m_altitudes.end(),
-           [](geometry::Altitude a) { return a == geometry::kInvalidAltitude; }), (featureId, m_countryFileName));
+                   [](geometry::Altitude a) { return a == geometry::kInvalidAltitude; }),
+           (featureId, m_countryFileName));
 
     return std::move(altitudes.m_altitudes);
   }
diff --git a/libs/indexer/altitude_loader.hpp b/libs/indexer/altitude_loader.hpp
index 0e77e50b4..82d8c8e39 100644
--- a/libs/indexer/altitude_loader.hpp
+++ b/libs/indexer/altitude_loader.hpp
@@ -42,10 +42,7 @@ private:
 class AltitudeLoaderCached : public AltitudeLoaderBase
 {
 public:
-  explicit AltitudeLoaderCached(MwmValue const & mwmValue)
-    : AltitudeLoaderBase(mwmValue)
-  {
-  }
+  explicit AltitudeLoaderCached(MwmValue const & mwmValue) : AltitudeLoaderBase(mwmValue) {}
 
   /// \returns altitude of feature with |featureId|. All items of the returned vector are valid
   /// or the returned vector is empty.
diff --git a/libs/indexer/brands_holder.cpp b/libs/indexer/brands_holder.cpp
index 647e28c1f..cc00cc034 100644
--- a/libs/indexer/brands_holder.cpp
+++ b/libs/indexer/brands_holder.cpp
@@ -45,7 +45,8 @@ void BrandsHolder::ForEachNameByKeyAndLang(std::string const & key, std::string
                                            std::function<void(std::string const &)> const & toDo) const
 {
   int8_t const locale = StringUtf8Multilang::GetLangIndex(lang);
-  ForEachNameByKey(key, [&](Brand::Name const & name) {
+  ForEachNameByKey(key, [&](Brand::Name const & name)
+  {
     if (name.m_locale == locale)
       toDo(name.m_name);
   });
@@ -126,8 +127,7 @@ void BrandsHolder::AddBrand(Brand & brand, std::string const & key)
 std::string DebugPrint(BrandsHolder::Brand::Name const & name)
 {
   std::ostringstream out;
-  out << "BrandName[" << StringUtf8Multilang::GetLangByCode(name.m_locale) << ", " << name.m_name
-      << "]";
+  out << "BrandName[" << StringUtf8Multilang::GetLangByCode(name.m_locale) << ", " << name.m_name << "]";
   return out.str();
 }
 
diff --git a/libs/indexer/brands_holder.hpp b/libs/indexer/brands_holder.hpp
index 8969dca5a..471a4e6dc 100644
--- a/libs/indexer/brands_holder.hpp
+++ b/libs/indexer/brands_holder.hpp
@@ -40,7 +40,8 @@ public:
 
   std::set<std::string> const & GetKeys() const { return m_keys; }
 
-  template <class FnT> void ForEachNameByKey(std::string_view key, FnT && fn) const
+  template <class FnT>
+  void ForEachNameByKey(std::string_view key, FnT && fn) const
   {
     auto const it = m_keyToName.find(key);
     if (it == m_keyToName.end())
@@ -63,7 +64,7 @@ private:
     using is_transparent = void;
 
     // std::size_t operator()(const char* str) const        { return hash_type{}(str); }
-    size_t operator()(std::string_view str) const   { return hash_type{}(str); }
+    size_t operator()(std::string_view str) const { return hash_type{}(str); }
     size_t operator()(std::string const & str) const { return hash_type{}(str); }
   };
 
@@ -74,7 +75,8 @@ private:
 std::string DebugPrint(BrandsHolder::Brand::Name const & name);
 BrandsHolder const & GetDefaultBrands();
 
-template <class FnT> void ForEachLocalizedBrands(std::string_view brand, FnT && fn)
+template <class FnT>
+void ForEachLocalizedBrands(std::string_view brand, FnT && fn)
 {
   bool processed = false;
   /// Localized brands are not working as expected now because we store raw names from OSM, not brand IDs.
diff --git a/libs/indexer/caching_rank_table_loader.cpp b/libs/indexer/caching_rank_table_loader.cpp
index e540c7a79..b03fab31b 100644
--- a/libs/indexer/caching_rank_table_loader.cpp
+++ b/libs/indexer/caching_rank_table_loader.cpp
@@ -4,12 +4,10 @@
 
 #include "indexer/data_source.hpp"
 
-
-CachingRankTableLoader::CachingRankTableLoader(DataSource const & dataSource,
-                                               std::string const & sectionName)
-  : m_dataSource(dataSource), m_sectionName(sectionName)
-{
-}
+CachingRankTableLoader::CachingRankTableLoader(DataSource const & dataSource, std::string const & sectionName)
+  : m_dataSource(dataSource)
+  , m_sectionName(sectionName)
+{}
 
 uint8_t CachingRankTableLoader::Get(FeatureID const & featureId) const
 {
diff --git a/libs/indexer/categories_holder.cpp b/libs/indexer/categories_holder.cpp
index eaa5f276d..e7c670f51 100644
--- a/libs/indexer/categories_holder.cpp
+++ b/libs/indexer/categories_holder.cpp
@@ -7,7 +7,6 @@
 
 #include "base/logging.hpp"
 
-
 namespace
 {
 enum ParseState
@@ -150,10 +149,8 @@ void CategoriesHolder::AddCategory(Category & cat, std::vector<uint32_t> & types
       search::ForEachNormalizedToken(synonym.m_name, [&](strings::UniString const & token)
       {
         if (ValidKeyToken(token))
-        {
           for (uint32_t const t : types)
             m_name2type.Add(localePrefix + token, t);
-        }
       });
     }
   }
@@ -169,10 +166,8 @@ bool CategoriesHolder::ValidKeyToken(strings::UniString const & s)
 
   /// @todo We need to have global stop words array for the most used languages.
   for (char const * token : {"a", "z", "s", "d", "di", "de", "le", "ra", "ao"})
-  {
     if (s.IsEqualAscii(token))
       return false;
-  }
 
   return true;
 }
@@ -227,8 +222,7 @@ void CategoriesHolder::LoadFromStream(std::istream & s)
       }
 
       int8_t const langCode = MapLocaleToInteger(*iter);
-      CHECK(langCode != kUnsupportedLocaleCode,
-            ("Invalid language code:", *iter, "at line:", lineNumber));
+      CHECK(langCode != kUnsupportedLocaleCode, ("Invalid language code:", *iter, "at line:", lineNumber));
 
       while (++iter)
       {
@@ -311,10 +305,8 @@ int8_t CategoriesHolder::MapLocaleToInteger(std::string_view const locale)
   ASSERT_EQUAL(kLocaleMapping[0].m_code, kEnglishCode, ());
 
   for (auto it = kLocaleMapping.crbegin(); it != kLocaleMapping.crend(); ++it)
-  {
     if (locale.find(it->m_name) == 0)
       return it->m_code;
-  }
 
   // Special cases for different Chinese variations
   if (locale.find("zh") == 0)
@@ -323,10 +315,8 @@ int8_t CategoriesHolder::MapLocaleToInteger(std::string_view const locale)
     strings::AsciiToLower(lower);
 
     for (char const * s : {"hant", "tw", "hk", "mo"})
-    {
       if (lower.find(s) != std::string::npos)
         return kTraditionalChineseCode;
-    }
     // Simplified Chinese by default for all other cases.
     return kSimplifiedChineseCode;
   }
diff --git a/libs/indexer/categories_holder.hpp b/libs/indexer/categories_holder.hpp
index fd237a160..1d86b49eb 100644
--- a/libs/indexer/categories_holder.hpp
+++ b/libs/indexer/categories_holder.hpp
@@ -31,10 +31,7 @@ public:
 
     std::vector<Name> m_synonyms;
 
-    void Swap(Category & r)
-    {
-      m_synonyms.swap(r.m_synonyms);
-    }
+    void Swap(Category & r) { m_synonyms.swap(r.m_synonyms); }
   };
 
   struct Mapping
@@ -137,20 +134,16 @@ public:
   void ForEachName(ToDo && toDo) const
   {
     for (auto const & p : m_type2cat)
-    {
       for (auto const & synonym : p.second->m_synonyms)
         toDo(synonym);
-    }
   }
 
   template <class ToDo>
   void ForEachNameAndType(ToDo && toDo) const
   {
     for (auto const & p : m_type2cat)
-    {
       for (auto const & synonym : p.second->m_synonyms)
         toDo(synonym, p.first);
-    }
   }
 
   template <class ToDo>
diff --git a/libs/indexer/categories_index.cpp b/libs/indexer/categories_index.cpp
index fe484e1f6..25b6839ca 100644
--- a/libs/indexer/categories_index.cpp
+++ b/libs/indexer/categories_index.cpp
@@ -14,8 +14,8 @@ using namespace std;
 
 namespace
 {
-void AddAllNonemptySubstrings(base::MemTrie<std::string, base::VectorValues<uint32_t>> & trie,
-                              std::string const & s, uint32_t value)
+void AddAllNonemptySubstrings(base::MemTrie<std::string, base::VectorValues<uint32_t>> & trie, std::string const & s,
+                              uint32_t value)
 {
   ASSERT(!s.empty(), ());
   for (size_t i = 0; i < s.length(); ++i)
@@ -32,19 +32,13 @@ void AddAllNonemptySubstrings(base::MemTrie<std::string, base::VectorValues<uint
 template <typename TF>
 void ForEachToken(std::string const & s, TF && fn)
 {
-  search::ForEachNormalizedToken(s, [&fn](strings::UniString const & token)
-  {
-    fn(strings::ToUtf8(token));
-  });
+  search::ForEachNormalizedToken(s, [&fn](strings::UniString const & token) { fn(strings::ToUtf8(token)); });
 }
 
-void TokenizeAndAddAllSubstrings(base::MemTrie<std::string, base::VectorValues<uint32_t>> & trie,
-                                 std::string const & s, uint32_t value)
+void TokenizeAndAddAllSubstrings(base::MemTrie<std::string, base::VectorValues<uint32_t>> & trie, std::string const & s,
+                                 uint32_t value)
 {
-  auto fn = [&](std::string const & token)
-  {
-    AddAllNonemptySubstrings(trie, token, value);
-  };
+  auto fn = [&](std::string const & token) { AddAllNonemptySubstrings(trie, token, value); };
   ForEachToken(s, fn);
 }
 }  // namespace
@@ -54,10 +48,10 @@ void CategoriesIndex::AddCategoryByTypeAndLang(uint32_t type, int8_t lang)
   ASSERT(lang >= 1 && static_cast<size_t>(lang) <= CategoriesHolder::kLocaleMapping.size(),
          ("Invalid lang code:", lang));
   m_catHolder->ForEachNameByType(type, [&](Category::Name const & name)
-                                 {
-                                   if (name.m_locale == lang)
-                                     TokenizeAndAddAllSubstrings(m_trie, name.m_name, type);
-                                 });
+  {
+    if (name.m_locale == lang)
+      TokenizeAndAddAllSubstrings(m_trie, name.m_name, type);
+  });
 }
 
 void CategoriesIndex::AddCategoryByTypeAllLangs(uint32_t type)
@@ -71,22 +65,20 @@ void CategoriesIndex::AddAllCategoriesInLang(int8_t lang)
   ASSERT(lang >= 1 && static_cast<size_t>(lang) <= CategoriesHolder::kLocaleMapping.size(),
          ("Invalid lang code:", lang));
   m_catHolder->ForEachTypeAndCategory([&](uint32_t type, Category const & cat)
-                                      {
-                                        for (auto const & name : cat.m_synonyms)
-                                        {
-                                          if (name.m_locale == lang)
-                                            TokenizeAndAddAllSubstrings(m_trie, name.m_name, type);
-                                        }
-                                      });
+  {
+    for (auto const & name : cat.m_synonyms)
+      if (name.m_locale == lang)
+        TokenizeAndAddAllSubstrings(m_trie, name.m_name, type);
+  });
 }
 
 void CategoriesIndex::AddAllCategoriesInAllLangs()
 {
   m_catHolder->ForEachTypeAndCategory([this](uint32_t type, Category const & cat)
-                                      {
-                                        for (auto const & name : cat.m_synonyms)
-                                          TokenizeAndAddAllSubstrings(m_trie, name.m_name, type);
-                                      });
+  {
+    for (auto const & name : cat.m_synonyms)
+      TokenizeAndAddAllSubstrings(m_trie, name.m_name, type);
+  });
 }
 
 void CategoriesIndex::GetCategories(std::string const & query, std::vector<Category> & result) const
@@ -95,10 +87,10 @@ void CategoriesIndex::GetCategories(std::string const & query, std::vector<Categ
   GetAssociatedTypes(query, types);
   base::SortUnique(types);
   m_catHolder->ForEachTypeAndCategory([&](uint32_t type, Category const & cat)
-                                      {
-                                        if (binary_search(types.begin(), types.end(), type))
-                                          result.push_back(cat);
-                                      });
+  {
+    if (binary_search(types.begin(), types.end(), type))
+      result.push_back(cat);
+  });
 }
 
 void CategoriesIndex::GetAssociatedTypes(std::string const & query, std::vector<uint32_t> & result) const
@@ -108,10 +100,7 @@ void CategoriesIndex::GetAssociatedTypes(std::string const & query, std::vector<
   auto processToken = [&](std::string const & token)
   {
     std::set<uint32_t> types;
-    auto fn = [&](std::string const &, uint32_t type)
-    {
-      types.insert(type);
-    };
+    auto fn = [&](std::string const &, uint32_t type) { types.insert(type); };
     m_trie.ForEachInSubtree(token, fn);
 
     if (first)
diff --git a/libs/indexer/cell_coverer.hpp b/libs/indexer/cell_coverer.hpp
index 167a3a8cc..2e4bf6237 100644
--- a/libs/indexer/cell_coverer.hpp
+++ b/libs/indexer/cell_coverer.hpp
@@ -46,11 +46,10 @@ inline void CoverRect(m2::RectD rect, size_t cellsCount, int maxLevel, std::vect
     ASSERT(rect.IsValid(), ());
   }
 
-  auto const commonCell = CellIdConverter<Bounds, CellId>::Cover2PointsWithCell(
-      rect.minX(), rect.minY(), rect.maxX(), rect.maxY());
+  auto const commonCell =
+      CellIdConverter<Bounds, CellId>::Cover2PointsWithCell(rect.minX(), rect.minY(), rect.maxX(), rect.maxY());
 
-  std::priority_queue<CellId, buffer_vector<CellId, SPLIT_RECT_CELLS_COUNT>,
-                      typename CellId::GreaterLevelOrder>
+  std::priority_queue<CellId, buffer_vector<CellId, SPLIT_RECT_CELLS_COUNT>, typename CellId::GreaterLevelOrder>
       cellQueue;
   cellQueue.push(commonCell);
 
@@ -75,12 +74,10 @@ inline void CoverRect(m2::RectD rect, size_t cellsCount, int maxLevel, std::vect
     if (cellQueue.size() + result.size() + count <= cellsCount)
     {
       for (size_t i = 0; i < count; ++i)
-      {
         if (rect.IsRectInside(arr[i].second))
           result.push_back(arr[i].first);
         else
           cellQueue.push(arr[i].first);
-      }
     }
     else
     {
@@ -150,11 +147,11 @@ void CoverSpiral(m2::RectD rect, int maxLevel, std::vector<CellId> & result)
   // |maxCount| may be adjusted after testing to ensure better quality-performance tradeoff.
   uint32_t constexpr maxCount = 64;
 
-  auto const nextDirection = [](Direction direction) {
-    return static_cast<Direction>((static_cast<uint8_t>(direction) + 1) % 4);
-  };
+  auto const nextDirection = [](Direction direction)
+  { return static_cast<Direction>((static_cast<uint8_t>(direction) + 1) % 4); };
 
-  auto const nextCoords = [](std::pair<int32_t, int32_t> const & xy, Direction direction, uint32_t step) {
+  auto const nextCoords = [](std::pair<int32_t, int32_t> const & xy, Direction direction, uint32_t step)
+  {
     auto res = xy;
     switch (direction)
     {
@@ -166,9 +163,9 @@ void CoverSpiral(m2::RectD rect, int maxLevel, std::vector<CellId> & result)
     return res;
   };
 
-  auto const coordsAreValid = [](std::pair<int32_t, int32_t> const & xy) {
-    return xy.first >= 0 && xy.second >= 0 &&
-           static_cast<decltype(CellId::MAX_COORD)>(xy.first) <= CellId::MAX_COORD &&
+  auto const coordsAreValid = [](std::pair<int32_t, int32_t> const & xy)
+  {
+    return xy.first >= 0 && xy.second >= 0 && static_cast<decltype(CellId::MAX_COORD)>(xy.first) <= CellId::MAX_COORD &&
            static_cast<decltype(CellId::MAX_COORD)>(xy.second) <= CellId::MAX_COORD;
   };
 
diff --git a/libs/indexer/cell_id.hpp b/libs/indexer/cell_id.hpp
index a3f519a11..e176f0ed8 100644
--- a/libs/indexer/cell_id.hpp
+++ b/libs/indexer/cell_id.hpp
@@ -21,30 +21,18 @@ template <typename Bounds, typename CellId>
 class CellIdConverter
 {
 public:
-  static double XToCellIdX(double x)
-  {
-    return (x - Bounds::kMinX) / StepX();
-  }
-  static double YToCellIdY(double y)
-  {
-    return (y - Bounds::kMinY) / StepY();
-  }
+  static double XToCellIdX(double x) { return (x - Bounds::kMinX) / StepX(); }
+  static double YToCellIdY(double y) { return (y - Bounds::kMinY) / StepY(); }
 
-  static double CellIdXToX(double  x)
-  {
-    return (x*StepX() + Bounds::kMinX);
-  }
-  static double CellIdYToY(double y)
-  {
-    return (y*StepY() + Bounds::kMinY);
-  }
+  static double CellIdXToX(double x) { return (x * StepX() + Bounds::kMinX); }
+  static double CellIdYToY(double y) { return (y * StepY() + Bounds::kMinY); }
 
   static CellId ToCellId(double x, double y)
   {
     uint32_t const ix = static_cast<uint32_t>(XToCellIdX(x));
     uint32_t const iy = static_cast<uint32_t>(YToCellIdY(y));
     CellId id = CellId::FromXY(ix, iy, CellId::DEPTH_LEVELS - 1);
-#if 0 // DEBUG
+#if 0  // DEBUG
     std::pair<uint32_t, uint32_t> ixy = id.XY();
     ASSERT(Abs(ixy.first  - ix) <= 1, (x, y, id, ixy));
     ASSERT(Abs(ixy.second - iy) <= 1, (x, y, id, ixy));
@@ -65,7 +53,7 @@ public:
       id1 = id1.Parent();
       id2 = id2.Parent();
     }
-#if 0 // DEBUG
+#if 0  // DEBUG
     double minX, minY, maxX, maxY;
     GetCellBounds(id1, minX, minY, maxX, maxY);
     ASSERT(math::Between(minX, maxX, x1), (x1, minX, maxX));
@@ -82,8 +70,7 @@ public:
     return m2::PointD(CellIdXToX(xy.first), CellIdYToY(xy.second));
   }
 
-  static void GetCellBounds(CellId id,
-                            double & minX, double & minY, double & maxX, double & maxY)
+  static void GetCellBounds(CellId id, double & minX, double & minY, double & maxX, double & maxY)
   {
     std::pair<uint32_t, uint32_t> const xy = id.XY();
     uint32_t const r = id.Radius();
@@ -94,13 +81,7 @@ public:
   }
 
 private:
-  inline static double StepX()
-  {
-    return static_cast<double>(Bounds::kRangeX) / CellId::MAX_COORD;
-  }
+  inline static double StepX() { return static_cast<double>(Bounds::kRangeX) / CellId::MAX_COORD; }
 
-  inline static double StepY()
-  {
-    return static_cast<double>(Bounds::kRangeY) / CellId::MAX_COORD;
-  }
+  inline static double StepY() { return static_cast<double>(Bounds::kRangeY) / CellId::MAX_COORD; }
 };
diff --git a/libs/indexer/cell_value_pair.hpp b/libs/indexer/cell_value_pair.hpp
index c9bf5bd30..99c15218e 100644
--- a/libs/indexer/cell_value_pair.hpp
+++ b/libs/indexer/cell_value_pair.hpp
@@ -14,10 +14,7 @@ public:
 
   CellValuePair() = default;
 
-  CellValuePair(uint64_t cell, Value value)
-    : m_cellLo(UINT64_LO(cell)), m_cellHi(UINT64_HI(cell)), m_value(value)
-  {
-  }
+  CellValuePair(uint64_t cell, Value value) : m_cellLo(UINT64_LO(cell)), m_cellHi(UINT64_HI(cell)), m_value(value) {}
 
   bool operator<(CellValuePair const & rhs) const
   {
diff --git a/libs/indexer/centers_table.cpp b/libs/indexer/centers_table.cpp
index 37a88ddd7..ba369eee0 100644
--- a/libs/indexer/centers_table.cpp
+++ b/libs/indexer/centers_table.cpp
@@ -13,7 +13,6 @@
 #include "base/assert.hpp"
 #include "base/checked_cast.hpp"
 
-
 namespace search
 {
 
@@ -46,8 +45,7 @@ bool CentersTable::Get(uint32_t id, m2::PointD & center)
 
 // CentersTable ------------------------------------------------------------------------------------
 // static
-std::unique_ptr<CentersTable> CentersTable::LoadV0(
-    Reader & reader, serial::GeometryCodingParams const & codingParams)
+std::unique_ptr<CentersTable> CentersTable::LoadV0(Reader & reader, serial::GeometryCodingParams const & codingParams)
 {
   auto table = std::make_unique<CentersTable>();
   table->m_version = Version::V0;
@@ -73,8 +71,7 @@ std::unique_ptr<CentersTable> CentersTable::LoadV1(Reader & reader)
   auto minY = ReadPrimitiveFromSource<uint32_t>(src);
   auto maxX = ReadPrimitiveFromSource<uint32_t>(src);
   auto maxY = ReadPrimitiveFromSource<uint32_t>(src);
-  m2::RectD limitRect(PointUToPointD({minX, minY}, kPointCoordBits),
-                      PointUToPointD({maxX, maxY}, kPointCoordBits));
+  m2::RectD limitRect(PointUToPointD({minX, minY}, kPointCoordBits), PointUToPointD({maxX, maxY}, kPointCoordBits));
 
   table->m_centersSubreader = reader.CreateSubReader(header.m_centersOffset, header.m_centersSize);
   if (!table->m_centersSubreader)
@@ -84,14 +81,13 @@ std::unique_ptr<CentersTable> CentersTable::LoadV1(Reader & reader)
   return table;
 }
 
-bool CentersTable::Init(Reader & reader, serial::GeometryCodingParams const & codingParams,
-                        m2::RectD const & limitRect)
+bool CentersTable::Init(Reader & reader, serial::GeometryCodingParams const & codingParams, m2::RectD const & limitRect)
 {
   m_codingParams = codingParams;
   m_limitRect = limitRect;
   // Decodes block encoded by writeBlockCallback from CentersTableBuilder::Freeze.
-  auto const readBlockCallback = [&](NonOwningReaderSource & source, uint32_t blockSize,
-                                     std::vector<m2::PointU> & values)
+  auto const readBlockCallback =
+      [&](NonOwningReaderSource & source, uint32_t blockSize, std::vector<m2::PointU> & values)
   {
     values.reserve(blockSize);
 
@@ -166,8 +162,7 @@ void CentersTableBuilder::Freeze(Writer & writer) const
 
   header.m_centersOffset = base::asserted_cast<uint32_t>(writer.Pos() - startOffset);
   m_builder.Freeze(writer, [&](auto & w, auto begin, auto end) { WriteBlock(w, begin, end); });
-  header.m_centersSize =
-      base::asserted_cast<uint32_t>(writer.Pos() - header.m_centersOffset - startOffset);
+  header.m_centersSize = base::asserted_cast<uint32_t>(writer.Pos() - header.m_centersOffset - startOffset);
 
   auto const endOffset = writer.Pos();
   writer.Seek(startOffset);
@@ -175,8 +170,7 @@ void CentersTableBuilder::Freeze(Writer & writer) const
   writer.Seek(endOffset);
 }
 
-void CentersTableBuilder::SetGeometryCodingParamsV0ForTests(
-    serial::GeometryCodingParams const & codingParams)
+void CentersTableBuilder::SetGeometryCodingParamsV0ForTests(serial::GeometryCodingParams const & codingParams)
 {
   m_codingParams = codingParams;
 }
diff --git a/libs/indexer/centers_table.hpp b/libs/indexer/centers_table.hpp
index 841d99ff6..c70bbfe3e 100644
--- a/libs/indexer/centers_table.hpp
+++ b/libs/indexer/centers_table.hpp
@@ -54,21 +54,19 @@ public:
   // false if table does not have entry for the feature.
   [[nodiscard]] bool Get(uint32_t id, m2::PointD & center);
 
-  uint64_t Count() const { return m_map->Count(); };
+  uint64_t Count() const { return m_map->Count(); }
 
   // Loads CentersTable instance. Note that |reader| must be alive
   // until the destruction of loaded table. Returns nullptr if
   // CentersTable can't be loaded.
-  static std::unique_ptr<CentersTable> LoadV0(Reader & reader,
-                                              serial::GeometryCodingParams const & codingParams);
+  static std::unique_ptr<CentersTable> LoadV0(Reader & reader, serial::GeometryCodingParams const & codingParams);
 
   static std::unique_ptr<CentersTable> LoadV1(Reader & reader);
 
 private:
   using Map = MapUint32ToValue<m2::PointU>;
 
-  bool Init(Reader & reader, serial::GeometryCodingParams const & codingParams,
-            m2::RectD const & limitRect);
+  bool Init(Reader & reader, serial::GeometryCodingParams const & codingParams, m2::RectD const & limitRect);
 
   serial::GeometryCodingParams m_codingParams;
   std::unique_ptr<Map> m_map;
diff --git a/libs/indexer/cities_boundaries_serdes.hpp b/libs/indexer/cities_boundaries_serdes.hpp
index 410fb2998..18daab253 100644
--- a/libs/indexer/cities_boundaries_serdes.hpp
+++ b/libs/indexer/cities_boundaries_serdes.hpp
@@ -35,14 +35,12 @@ public:
   {
   public:
     Visitor(Sink & sink, serial::GeometryCodingParams const & params)
-      : m_sink(sink), m_params(params), m_last(params.GetBasePoint())
-    {
-    }
+      : m_sink(sink)
+      , m_params(params)
+      , m_last(params.GetBasePoint())
+    {}
 
-    void Save(m2::PointU const & p)
-    {
-      WriteVarUint(m_sink, coding::EncodePointDeltaAsUint(p, m_last));
-    }
+    void Save(m2::PointU const & p) { WriteVarUint(m_sink, coding::EncodePointDeltaAsUint(p, m_last)); }
     void SaveWithLast(m2::PointU const & p)
     {
       Save(p);
@@ -117,10 +115,7 @@ public:
     }
 
   private:
-    m2::PointU ToU(m2::PointD const & p) const
-    {
-      return PointDToPointU(p, m_params.GetCoordBits());
-    }
+    m2::PointU ToU(m2::PointD const & p) const { return PointDToPointU(p, m_params.GetCoordBits()); }
 
     std::vector<m2::PointU> ToU(std::vector<m2::PointD> const & ps) const
     {
@@ -153,9 +148,9 @@ public:
   };
 
   CitiesBoundariesEncoder(Sink & sink, serial::GeometryCodingParams const & params)
-    : m_sink(sink), m_visitor(sink, params)
-  {
-  }
+    : m_sink(sink)
+    , m_visitor(sink, params)
+  {}
 
   void operator()(std::vector<std::vector<CityBoundary>> const & boundaries)
   {
@@ -166,18 +161,15 @@ public:
       for (auto const & bs : boundaries)
       {
         CHECK_LESS(bs.size(), std::numeric_limits<uint64_t>::max(), ());
-        auto const success =
-            coding::GammaCoder::Encode(writer, static_cast<uint64_t>(bs.size()) + 1);
+        auto const success = coding::GammaCoder::Encode(writer, static_cast<uint64_t>(bs.size()) + 1);
         ASSERT(success, ());
         UNUSED_VALUE(success);
       }
     }
 
     for (auto const & bs : boundaries)
-    {
       for (auto const & b : bs)
         m_visitor(b);
-    }
   }
 
 private:
@@ -198,10 +190,7 @@ public:
       return {dx, dy};
     }
 
-    static m2::PointU DecodePoint(Source & src, m2::PointU const & base)
-    {
-      return coding::DecodePointDelta(src, base);
-    }
+    static m2::PointU DecodePoint(Source & src, m2::PointU const & base) { return coding::DecodePointDelta(src, base); }
   };
 
   struct DecoderV1
@@ -219,18 +208,17 @@ public:
     }
   };
 
-  template <class TDecoder> struct Visitor
+  template <class TDecoder>
+  struct Visitor
   {
   public:
     Visitor(Source & source, serial::GeometryCodingParams const & params)
-      : m_source(source), m_params(params), m_last(params.GetBasePoint())
-    {
-    }
+      : m_source(source)
+      , m_params(params)
+      , m_last(params.GetBasePoint())
+    {}
 
-    m2::PointU LoadPoint()
-    {
-      return coding::DecodePointDeltaFromUint(ReadVarUint<uint64_t>(m_source), m_last);
-    }
+    m2::PointU LoadPoint() { return coding::DecodePointDeltaFromUint(ReadVarUint<uint64_t>(m_source), m_last); }
 
     m2::PointU LoadPointWithLast()
     {
@@ -283,10 +271,7 @@ public:
     }
 
   private:
-    m2::PointD FromU(m2::PointU const & u) const
-    {
-      return PointUToPointD(u, m_params.GetCoordBits());
-    }
+    m2::PointD FromU(m2::PointU const & u) const { return PointUToPointD(u, m_params.GetCoordBits()); }
 
     std::vector<m2::PointD> FromU(std::vector<m2::PointU> const & us) const
     {
@@ -304,9 +289,10 @@ public:
   using BoundariesT = std::vector<std::vector<CityBoundary>>;
 
   CitiesBoundariesDecoder(Source & source, serial::GeometryCodingParams const & params, BoundariesT & res)
-    : m_source(source), m_params(params), m_boundaries(res)
-  {
-  }
+    : m_source(source)
+    , m_params(params)
+    , m_boundaries(res)
+  {}
 
   void LoadSizes()
   {
@@ -324,14 +310,13 @@ public:
     }
   }
 
-  template <class TDecoder> void LoadBoundaries()
+  template <class TDecoder>
+  void LoadBoundaries()
   {
     Visitor<TDecoder> visitor(m_source, m_params);
     for (auto & bs : m_boundaries)
-    {
       for (auto & b : bs)
         visitor(b);
-    }
   }
 
 private:
@@ -352,13 +337,15 @@ struct CitiesBoundariesSerDes
     uint8_t m_coordBits = kDefaultCoordBits;
     uint8_t m_version = kLatestVersion;
 
-    template <class Sink> void Serialize(Sink & sink) const
+    template <class Sink>
+    void Serialize(Sink & sink) const
     {
       WriteToSink(sink, m_version);
       WriteToSink(sink, m_coordBits);
     }
 
-    template <class Source> void Deserialize(Source & src)
+    template <class Source>
+    void Deserialize(Source & src)
     {
       m_version = ReadPrimitiveFromSource<uint8_t>(src);
       m_coordBits = ReadPrimitiveFromSource<uint8_t>(src);
@@ -400,4 +387,4 @@ struct CitiesBoundariesSerDes
   }
 };
 
-} // namespace indexer
+}  // namespace indexer
diff --git a/libs/indexer/city_boundary.hpp b/libs/indexer/city_boundary.hpp
index 1e34c8a1c..206420c41 100644
--- a/libs/indexer/city_boundary.hpp
+++ b/libs/indexer/city_boundary.hpp
@@ -19,10 +19,7 @@ struct CityBoundary
 
   explicit CityBoundary(std::vector<m2::PointD> const & ps) : m_bbox(ps), m_cbox(ps), m_dbox(ps) {}
 
-  bool HasPoint(m2::PointD const & p) const
-  {
-    return m_bbox.HasPoint(p) && m_dbox.HasPoint(p) && m_cbox.HasPoint(p);
-  }
+  bool HasPoint(m2::PointD const & p) const { return m_bbox.HasPoint(p) && m_dbox.HasPoint(p) && m_cbox.HasPoint(p); }
 
   bool HasPoint(double x, double y) const { return HasPoint(m2::PointD(x, y)); }
 
diff --git a/libs/indexer/classificator.cpp b/libs/indexer/classificator.cpp
index 035571db1..87c2a9688 100644
--- a/libs/indexer/classificator.cpp
+++ b/libs/indexer/classificator.cpp
@@ -7,17 +7,16 @@
 
 #include <algorithm>
 
-
 using std::string;
 
 namespace
 {
-  struct less_scales
-  {
-    bool operator() (drule::Key const & l, int r) const { return l.m_scale < r; }
-    bool operator() (int l, drule::Key const & r) const { return l < r.m_scale; }
-    bool operator() (drule::Key const & l, drule::Key const & r) const { return l.m_scale < r.m_scale; }
-  };
+struct less_scales
+{
+  bool operator()(drule::Key const & l, int r) const { return l.m_scale < r; }
+  bool operator()(int l, drule::Key const & r) const { return l < r.m_scale; }
+  bool operator()(drule::Key const & l, drule::Key const & r) const { return l.m_scale < r.m_scale; }
+};
 }  // namespace
 
 /////////////////////////////////////////////////////////////////////////////////////////
@@ -26,7 +25,8 @@ namespace
 
 ClassifObject * ClassifObject::AddImpl(string const & s)
 {
-  if (m_objs.empty()) m_objs.reserve(30);
+  if (m_objs.empty())
+    m_objs.reserve(30);
 
   m_objs.emplace_back(s);
   return &(m_objs.back());
@@ -52,12 +52,11 @@ void ClassifObject::AddDrawRule(drule::Key const & k)
   auto i = std::lower_bound(m_drawRules.begin(), m_drawRules.end(), k.m_scale, less_scales());
   for (; i != m_drawRules.end() && i->m_scale == k.m_scale; ++i)
     if (k == *i)
-      return; // already exists
+      return;  // already exists
   m_drawRules.insert(i, k);
 
-  if (k.m_priority > m_maxOverlaysPriority &&
-      (k.m_type == drule::symbol || k.m_type == drule::caption ||
-       k.m_type == drule::shield || k.m_type == drule::pathtext))
+  if (k.m_priority > m_maxOverlaysPriority && (k.m_type == drule::symbol || k.m_type == drule::caption ||
+                                               k.m_type == drule::shield || k.m_type == drule::pathtext))
     m_maxOverlaysPriority = k.m_priority;
 }
 
@@ -81,7 +80,7 @@ void ClassifObject::LoadPolicy::Start(size_t i)
 void ClassifObject::LoadPolicy::EndChilds()
 {
   ClassifObject * p = Current();
-  ASSERT ( p->m_objs.back().m_name.empty(), () );
+  ASSERT(p->m_objs.back().m_name.empty(), ());
   p->m_objs.pop_back();
 }
 
@@ -125,141 +124,138 @@ Classificator & classif()
 
 namespace ftype
 {
-  uint8_t const bits_count = 7;
-  uint8_t const levels_count = 4;
-  uint8_t const max_value = (1 << bits_count) - 1;
+uint8_t const bits_count = 7;
+uint8_t const levels_count = 4;
+uint8_t const max_value = (1 << bits_count) - 1;
 
-  void set_value(uint32_t & type, uint8_t level, uint8_t value)
+void set_value(uint32_t & type, uint8_t level, uint8_t value)
+{
+  level *= bits_count;  // level to bits
+
+  uint32_t const m1 = uint32_t(max_value) << level;
+  type &= (~m1);  // zero bits
+
+  uint32_t const m2 = uint32_t(value) << level;
+  type |= m2;  // set bits
+}
+
+uint8_t get_value(uint32_t type, uint8_t level)
+{
+  level *= bits_count;  // level to bits;
+
+  uint32_t const m = uint32_t(max_value) << level;
+  type &= m;  // leave only our bits
+
+  type = type >> level;  // move to start
+  ASSERT(type <= max_value, ("invalid output value", type));
+
+  return uint8_t(type);  // conversion
+}
+
+uint8_t get_control_level(uint32_t type)
+{
+  uint8_t count = 0;
+  while (type > 1)
   {
-    level *= bits_count;  // level to bits
-
-    uint32_t const m1 = uint32_t(max_value) << level;
-    type &= (~m1);        // zero bits
-
-    uint32_t const m2 = uint32_t(value) << level;
-    type |= m2;           // set bits
+    type = type >> bits_count;
+    ++count;
   }
 
-  uint8_t get_value(uint32_t type, uint8_t level)
-  {
-    level *= bits_count;     // level to bits;
+  return count;
+}
 
-    uint32_t const m = uint32_t(max_value) << level;
-    type &= m;              // leave only our bits
+void PushValue(uint32_t & type, uint8_t value)
+{
+  ASSERT(value <= max_value, ("invalid input value", value));
 
-    type = type >> level;   // move to start
-    ASSERT ( type <= max_value, ("invalid output value", type) );
-
-    return uint8_t(type);   // conversion
-  }
-
-  uint8_t get_control_level(uint32_t type)
-  {
-    uint8_t count = 0;
-    while (type > 1)
-    {
-      type = type >> bits_count;
-      ++count;
-    }
-
-    return count;
-  }
-
-  void PushValue(uint32_t & type, uint8_t value)
-  {
-    ASSERT ( value <= max_value, ("invalid input value", value) );
-
-    uint8_t const cl = get_control_level(type);
-    // to avoid warning in release
+  uint8_t const cl = get_control_level(type);
+  // to avoid warning in release
 #ifdef RELEASE
-    UNUSED_VALUE(levels_count);
+  UNUSED_VALUE(levels_count);
 #endif
-    ASSERT ( cl < levels_count, (cl) );
+  ASSERT(cl < levels_count, (cl));
 
-    set_value(type, cl, value);
+  set_value(type, cl, value);
 
-    // set control level
-    set_value(type, cl+1, 1);
-  }
+  // set control level
+  set_value(type, cl + 1, 1);
+}
 
-  uint8_t GetValue(uint32_t type, uint8_t level)
+uint8_t GetValue(uint32_t type, uint8_t level)
+{
+  return get_value(type, level);
+}
+
+void PopValue(uint32_t & type)
+{
+  uint8_t const cl = get_control_level(type);
+  ASSERT_GREATER(cl, 0, ());
+
+  // remove control level
+  set_value(type, cl, 0);
+
+  // set control level
+  set_value(type, cl - 1, 1);
+}
+
+void TruncValue(uint32_t & type, uint8_t level)
+{
+  ASSERT_GREATER(level, 0, ());
+  uint8_t cl = get_control_level(type);
+
+  while (cl > level)
   {
-    return get_value(type, level);
-  }
-
-  void PopValue(uint32_t & type)
-  {
-    uint8_t const cl = get_control_level(type);
-    ASSERT_GREATER ( cl, 0, () );
-
     // remove control level
     set_value(type, cl, 0);
 
+    --cl;
+
     // set control level
-    set_value(type, cl-1, 1);
+    set_value(type, cl, 1);
   }
+}
 
-  void TruncValue(uint32_t & type, uint8_t level)
-  {
-    ASSERT_GREATER ( level, 0, () );
-    uint8_t cl = get_control_level(type);
-
-    while (cl > level)
-    {
-      // remove control level
-      set_value(type, cl, 0);
-
-      --cl;
-
-      // set control level
-      set_value(type, cl, 1);
-    }
-  }
-
-  uint8_t GetLevel(uint32_t type)
-  {
-    return get_control_level(type);
-  }
-} // namespace ftype
+uint8_t GetLevel(uint32_t type)
+{
+  return get_control_level(type);
+}
+}  // namespace ftype
 
 namespace
 {
-  class suitable_getter
+class suitable_getter
+{
+  typedef std::vector<drule::Key> vec_t;
+  typedef vec_t::const_iterator iter_t;
+
+  vec_t const & m_rules;
+  drule::KeysT & m_keys;
+
+  void add_rule(int ft, iter_t i)
   {
-    typedef std::vector<drule::Key> vec_t;
-    typedef vec_t::const_iterator iter_t;
-
-    vec_t const & m_rules;
-    drule::KeysT & m_keys;
-
-    void add_rule(int ft, iter_t i)
-    {
-      // Define which drule types are applicable to which feature geom types.
-      static const int visible[3][drule::count_of_rules] = {
+    // Define which drule types are applicable to which feature geom types.
+    static int const visible[3][drule::count_of_rules] = {
         //{ line, area, symbol, caption, circle, pathtext, waymarker, shield }, see drule::Key::rule_type_t
-        { 0, 0, 1, 1, 1, 0, 0, 0 },   // fpoint
-        { 1, 0, 0, 0, 0, 1, 0, 1 },   // fline
-        { 0, 1, 1, 1, 1, 0, 0, 0 }    // farea (!!! different from IsDrawableLike(): here area feature can use point styles)
-      };
+        {0, 0, 1, 1, 1, 0, 0, 0},  // fpoint
+        {1, 0, 0, 0, 0, 1, 0, 1},  // fline
+        {0, 1, 1, 1, 1, 0, 0, 0}  // farea (!!! different from IsDrawableLike(): here area feature can use point styles)
+    };
 
-      if (visible[ft][i->m_type] == 1)
-        m_keys.push_back(*i);
-    }
+    if (visible[ft][i->m_type] == 1)
+      m_keys.push_back(*i);
+  }
 
-  public:
-    suitable_getter(vec_t const & rules, drule::KeysT & keys)
-      : m_rules(rules), m_keys(keys)
-    {
-    }
+public:
+  suitable_getter(vec_t const & rules, drule::KeysT & keys) : m_rules(rules), m_keys(keys) {}
 
-    void find(int ft, int scale)
-    {
-      auto i = std::lower_bound(m_rules.begin(), m_rules.end(), scale, less_scales());
-      while (i != m_rules.end() && i->m_scale == scale)
-        add_rule(ft, i++);
-    }
-  };
-} // namespace
+  void find(int ft, int scale)
+  {
+    auto i = std::lower_bound(m_rules.begin(), m_rules.end(), scale, less_scales());
+    while (i != m_rules.end() && i->m_scale == scale)
+      add_rule(ft, i++);
+  }
+};
+}  // namespace
 
 void ClassifObject::GetSuitable(int scale, feature::GeomType gt, drule::KeysT & keys) const
 {
@@ -293,11 +289,11 @@ bool ClassifObject::IsDrawableLike(feature::GeomType gt, bool emptyName) const
     return false;
 
   // Define which feature geom types can use which drule types for rendering.
-  static const int visible[3][drule::count_of_rules] = {
-    //{ line, area, symbol, caption, circle, pathtext, waymarker, shield }, see drule::Key::rule_type_t
-    {0, 0, 1, 1, 1, 0, 0, 0},   // fpoint
-    {1, 0, 0, 0, 0, 1, 0, 1},   // fline
-    {0, 1, 0, 0, 0, 0, 0, 0}    // farea (!!! key difference with GetSuitable, see suitable_getter::add_rule())
+  static int const visible[3][drule::count_of_rules] = {
+      //{ line, area, symbol, caption, circle, pathtext, waymarker, shield }, see drule::Key::rule_type_t
+      {0, 0, 1, 1, 1, 0, 0, 0},  // fpoint
+      {1, 0, 0, 0, 0, 1, 0, 1},  // fline
+      {0, 1, 0, 0, 0, 0, 0, 0}   // farea (!!! key difference with GetSuitable, see suitable_getter::add_rule())
   };
 
   for (auto const & k : m_drawRules)
@@ -330,10 +326,10 @@ std::pair<int, int> ClassifObject::GetDrawScaleRange() const
       break;
     }
 
-  ASSERT_NOT_EQUAL ( left, -1, () );
+  ASSERT_NOT_EQUAL(left, -1, ());
 
   int right = left;
-  for (int i = count-1; i > left; --i)
+  for (int i = count - 1; i > left; --i)
     if (m_visibility[i])
     {
       right = i;
@@ -350,8 +346,8 @@ void Classificator::ReadClassificator(std::istream & s)
 
   m_root.Sort();
 
-  m_coastType = GetTypeByPath({ "natural", "coastline" });
-  m_stubType = GetTypeByPath({ "mapswithme" });
+  m_coastType = GetTypeByPath({"natural", "coastline"});
+  m_stubType = GetTypeByPath({"mapswithme"});
 }
 
 template <typename Iter>
@@ -417,7 +413,8 @@ void Classificator::Clear()
   m_mapping.Clear();
 }
 
-template <class ToDo> void Classificator::ForEachPathObject(uint32_t type, ToDo && toDo) const
+template <class ToDo>
+void Classificator::ForEachPathObject(uint32_t type, ToDo && toDo) const
 {
   ClassifObject const * p = &m_root;
   uint8_t const level = ftype::GetLevel(type);
@@ -431,30 +428,21 @@ template <class ToDo> void Classificator::ForEachPathObject(uint32_t type, ToDo
 ClassifObject const * Classificator::GetObject(uint32_t type) const
 {
   ClassifObject const * res = nullptr;
-  ForEachPathObject(type, [&res](ClassifObject const * p)
-  {
-    res = p;
-  });
+  ForEachPathObject(type, [&res](ClassifObject const * p) { res = p; });
   return res;
 }
 
 std::string Classificator::GetFullObjectName(uint32_t type) const
 {
   std::string res;
-  ForEachPathObject(type, [&res](ClassifObject const * p)
-  {
-    res = res + p->GetName() + '|';
-  });
+  ForEachPathObject(type, [&res](ClassifObject const * p) { res = res + p->GetName() + '|'; });
   return res;
 }
 
 std::vector<std::string> Classificator::GetFullObjectNamePath(uint32_t type) const
 {
   std::vector<std::string> res;
-  ForEachPathObject(type, [&res](ClassifObject const * p)
-  {
-    res.push_back(p->GetName());
-  });
+  ForEachPathObject(type, [&res](ClassifObject const * p) { res.push_back(p->GetName()); });
   return res;
 }
 
@@ -462,7 +450,7 @@ string Classificator::GetReadableObjectName(uint32_t type) const
 {
   string s = GetFullObjectName(type);
   // Remove ending dummy symbol.
-  ASSERT ( !s.empty(), () );
+  ASSERT(!s.empty(), ());
   s.pop_back();
   // Replace separator.
   replace(s.begin(), s.end(), '|', '-');
diff --git a/libs/indexer/classificator.hpp b/libs/indexer/classificator.hpp
index c86f182e1..152b87e2d 100644
--- a/libs/indexer/classificator.hpp
+++ b/libs/indexer/classificator.hpp
@@ -17,21 +17,24 @@ class ClassifObject;
 
 namespace ftype
 {
-  inline uint32_t GetEmptyValue() { return 1; }
-
-  void PushValue(uint32_t & type, uint8_t value);
-  /// @pre level < GetLevel(type).
-  uint8_t GetValue(uint32_t type, uint8_t level);
-  void PopValue(uint32_t & type);
-  void TruncValue(uint32_t & type, uint8_t level);
-  inline uint32_t Trunc(uint32_t type, uint8_t level)
-  {
-    TruncValue(type, level);
-    return type;
-  }
-  uint8_t GetLevel(uint32_t type);
+inline uint32_t GetEmptyValue()
+{
+  return 1;
 }
 
+void PushValue(uint32_t & type, uint8_t value);
+/// @pre level < GetLevel(type).
+uint8_t GetValue(uint32_t type, uint8_t level);
+void PopValue(uint32_t & type);
+void TruncValue(uint32_t & type, uint8_t level);
+inline uint32_t Trunc(uint32_t type, uint8_t level)
+{
+  TruncValue(type, level);
+  return type;
+}
+uint8_t GetLevel(uint32_t type);
+}  // namespace ftype
+
 class ClassifObjectPtr
 {
   ClassifObject const * m_p;
@@ -39,7 +42,7 @@ class ClassifObjectPtr
 
 public:
   ClassifObjectPtr() : m_p(nullptr), m_ind(0) {}
-  ClassifObjectPtr(ClassifObject const * p, size_t i): m_p(p), m_ind(i) {}
+  ClassifObjectPtr(ClassifObject const * p, size_t i) : m_p(p), m_ind(i) {}
 
   ClassifObject const * get() const { return m_p; }
   ClassifObject const * operator->() const { return m_p; }
@@ -52,18 +55,9 @@ class ClassifObject
 {
   struct LessName
   {
-    bool operator() (ClassifObject const & r1, ClassifObject const & r2) const
-    {
-      return (r1.m_name < r2.m_name);
-    }
-    bool operator() (ClassifObject const & r1, std::string_view r2) const
-    {
-      return (r1.m_name < r2);
-    }
-    bool operator() (std::string_view r1, ClassifObject const & r2) const
-    {
-      return (r1 < r2.m_name);
-    }
+    bool operator()(ClassifObject const & r1, ClassifObject const & r2) const { return (r1.m_name < r2.m_name); }
+    bool operator()(ClassifObject const & r1, std::string_view r2) const { return (r1.m_name < r2); }
+    bool operator()(std::string_view r1, ClassifObject const & r2) const { return (r1 < r2.m_name); }
   };
 
 public:
@@ -72,8 +66,10 @@ public:
 
   /// @name Fill from osm draw rule files.
   //@{
+
 private:
   ClassifObject * AddImpl(std::string const & s);
+
 public:
   ClassifObject * Add(std::string const & s);
   ClassifObject * Find(std::string const & s);
@@ -106,14 +102,16 @@ public:
 
   /// @name Iterate first level children only.
   /// @{
-  template <class ToDo> void ForEachObject(ToDo && toDo)
+  template <class ToDo>
+  void ForEachObject(ToDo && toDo)
   {
-    for (auto & e: m_objs)
+    for (auto & e : m_objs)
       toDo(&e);
   }
-  template <class ToDo> void ForEachObject(ToDo && toDo) const
+  template <class ToDo>
+  void ForEachObject(ToDo && toDo) const
   {
-    for (auto const & e: m_objs)
+    for (auto const & e : m_objs)
       toDo(e);
   }
   /// @}
@@ -134,7 +132,7 @@ public:
     }
   }
 
-  using VisibleMask = std::bitset<scales::UPPER_STYLE_SCALE+1>;
+  using VisibleMask = std::bitset<scales::UPPER_STYLE_SCALE + 1>;
   void SetVisibilityOnScale(bool isVisible, int scale) { m_visibility.set(scale, isVisible); }
 
   /// @name Policies for classificator tree serialization.
@@ -155,6 +153,7 @@ public:
   class LoadPolicy : public BasePolicy
   {
     typedef BasePolicy base_type;
+
   public:
     explicit LoadPolicy(ClassifObject * pRoot) : base_type(pRoot) {}
 
@@ -236,8 +235,7 @@ public:
   void ForEachInSubtree(ToDo && toDo, uint32_t root) const
   {
     toDo(root);
-    GetObject(root)->ForEachObjectInTree([&toDo](ClassifObject const *, uint32_t c) { toDo(c); },
-                                         root);
+    GetObject(root)->ForEachObjectInTree([&toDo](ClassifObject const *, uint32_t c) { toDo(c); }, root);
   }
 
   ClassifObject const * GetObject(uint32_t type) const;
@@ -248,7 +246,8 @@ public:
   std::string GetReadableObjectName(uint32_t type) const;
 
 private:
-  template <class ToDo> void ForEachPathObject(uint32_t type, ToDo && toDo) const;
+  template <class ToDo>
+  void ForEachPathObject(uint32_t type, ToDo && toDo) const;
 
   template <typename Iter>
   uint32_t GetTypeByPathImpl(Iter beg, Iter end) const;
diff --git a/libs/indexer/classificator_loader.cpp b/libs/indexer/classificator_loader.cpp
index 8addfbdca..1087a4029 100644
--- a/libs/indexer/classificator_loader.cpp
+++ b/libs/indexer/classificator_loader.cpp
@@ -16,14 +16,13 @@
 
 namespace
 {
-void ReadCommon(std::unique_ptr<Reader> classificator,
-                std::unique_ptr<Reader> types)
+void ReadCommon(std::unique_ptr<Reader> classificator, std::unique_ptr<Reader> types)
 {
   Classificator & c = classif();
   c.Clear();
 
   {
-    //LOG(LINFO, ("Reading classificator"));
+    // LOG(LINFO, ("Reading classificator"));
     ReaderStreamBuf buffer(std::move(classificator));
 
     std::istream s(&buffer);
@@ -31,7 +30,7 @@ void ReadCommon(std::unique_ptr<Reader> classificator,
   }
 
   {
-    //LOG(LINFO, ("Reading types mapping"));
+    // LOG(LINFO, ("Reading types mapping"));
     ReaderStreamBuf buffer(std::move(types));
 
     std::istream s(&buffer);
@@ -57,8 +56,7 @@ void Load()
     if (mapStyle != MapStyleMerged || originMapStyle == MapStyleMerged)
     {
       GetStyleReader().SetCurrentStyle(mapStyle);
-      ReadCommon(p.GetReader("classificator.txt"),
-                 p.GetReader("types.txt"));
+      ReadCommon(p.GetReader("classificator.txt"), p.GetReader("types.txt"));
 
       drule::LoadRules();
     }
@@ -69,12 +67,9 @@ void Load()
   LOG(LDEBUG, ("Reading of classificator finished"));
 }
 
-void LoadTypes(std::string const & classificatorFileStr,
-               std::string const & typesFileStr)
+void LoadTypes(std::string const & classificatorFileStr, std::string const & typesFileStr)
 {
-  ReadCommon(std::make_unique<MemReaderWithExceptions>(classificatorFileStr.data(),
-                                                       classificatorFileStr.size()),
-             std::make_unique<MemReaderWithExceptions>(typesFileStr.data(),
-                                                       typesFileStr.size()));
+  ReadCommon(std::make_unique<MemReaderWithExceptions>(classificatorFileStr.data(), classificatorFileStr.size()),
+             std::make_unique<MemReaderWithExceptions>(typesFileStr.data(), typesFileStr.size()));
 }
 }  // namespace classificator
diff --git a/libs/indexer/classificator_loader.hpp b/libs/indexer/classificator_loader.hpp
index 9bc89522a..85bb19592 100644
--- a/libs/indexer/classificator_loader.hpp
+++ b/libs/indexer/classificator_loader.hpp
@@ -9,6 +9,5 @@ void Load();
 // This method loads only classificator and types. It does not load and apply
 // style rules. It can be used only in separate modules (like pybindings) to
 // operate with number-string representations of types.
-void LoadTypes(std::string const & classificatorFileStr,
-               std::string const & typesFileStr);
+void LoadTypes(std::string const & classificatorFileStr, std::string const & typesFileStr);
 }  // namespace classificator
diff --git a/libs/indexer/complex/serdes.hpp b/libs/indexer/complex/serdes.hpp
index b34d7065b..402a76c11 100644
--- a/libs/indexer/complex/serdes.hpp
+++ b/libs/indexer/complex/serdes.hpp
@@ -89,7 +89,8 @@ private:
     template <typename Sink>
     static void Serialize(Sink & sink, tree_node::types::Ptr<Ids> const & tree)
     {
-      tree_node::PreOrderVisit(tree, [&](auto const & node) {
+      tree_node::PreOrderVisit(tree, [&](auto const & node)
+      {
         coding_utils::WriteCollectionPrimitive(sink, node->GetData());
         auto const size = base::checked_cast<coding_utils::CollectionSizeType>(node->GetChildren().size());
         WriteVarUint(sink, size);
@@ -100,7 +101,8 @@ private:
     static void Deserialize(Src & src, tree_node::types::Ptr<Ids> & tree)
     {
       std::function<void(tree_node::types::Ptr<Ids> &)> deserializeTree;
-      deserializeTree = [&](auto & tree) {
+      deserializeTree = [&](auto & tree)
+      {
         Ids ids;
         coding_utils::ReadCollectionPrimitive(src, std::back_inserter(ids));
         tree = tree_node::MakeTreeNode(std::move(ids));
diff --git a/libs/indexer/complex/tree_node.hpp b/libs/indexer/complex/tree_node.hpp
index b7c7cf56f..894dff05b 100644
--- a/libs/indexer/complex/tree_node.hpp
+++ b/libs/indexer/complex/tree_node.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <algorithm>
-#include <memory>
 #include <limits>
+#include <memory>
 #include <sstream>
 #include <type_traits>
 #include <utility>
@@ -41,16 +41,16 @@ public:
   bool HasChildren() const { return !m_children.empty(); }
   Ptrs const & GetChildren() const { return m_children; }
   void AddChild(Ptr const & child) { m_children.push_back(child); }
-  void AddChildren(Ptrs && children)
-  {
-    std::move(std::begin(children), std::end(children), std::end(m_children));
-  }
+  void AddChildren(Ptrs && children) { std::move(std::begin(children), std::end(children), std::end(m_children)); }
 
   void SetChildren(Ptrs && children) { m_children = std::move(children); }
   void RemoveChildren() { m_children.clear(); }
 
   template <typename Fn>
-  void RemoveChildrenIf(Fn && fn) { base::EraseIf(m_children, std::forward<Fn>(fn)); }
+  void RemoveChildrenIf(Fn && fn)
+  {
+    base::EraseIf(m_children, std::forward<Fn>(fn));
+  }
 
   bool HasParent() const { return m_parent.lock() != nullptr; }
   Ptr GetParent() const { return m_parent.lock(); }
@@ -102,15 +102,14 @@ void PreOrderVisit(types::Ptr<Data> const & node, Fn && fn)
 {
   base::ControlFlowWrapper<Fn> wrapper(std::forward<Fn>(fn));
   std::function<base::ControlFlow(types::Ptr<Data> const &)> preOrderVisitDetail;
-  preOrderVisitDetail = [&](auto const & node) {
+  preOrderVisitDetail = [&](auto const & node)
+  {
     if (wrapper(node) == base::ControlFlow::Break)
       return base::ControlFlow::Break;
 
     for (auto const & ch : node->GetChildren())
-    {
       if (preOrderVisitDetail(ch) == base::ControlFlow::Break)
         return base::ControlFlow::Break;
-    }
 
     return base::ControlFlow::Continue;
   };
@@ -122,12 +121,11 @@ void PostOrderVisit(types::Ptr<Data> const & node, Fn && fn)
 {
   base::ControlFlowWrapper<Fn> wrapper(std::forward<Fn>(fn));
   std::function<base::ControlFlow(types::Ptr<Data> const &)> postOrderVisitDetail;
-  postOrderVisitDetail = [&](auto const & node) {
+  postOrderVisitDetail = [&](auto const & node)
+  {
     for (auto const & ch : node->GetChildren())
-    {
       if (postOrderVisitDetail(ch) == base::ControlFlow::Break)
         return base::ControlFlow::Break;
-    }
 
     return wrapper(node);
   };
@@ -137,16 +135,15 @@ void PostOrderVisit(types::Ptr<Data> const & node, Fn && fn)
 template <typename Data, typename Fn>
 void ForEach(types::Ptr<Data> const & node, Fn && fn)
 {
-  PreOrderVisit(node, [&](auto const & node) {
-    fn(node->GetData());
-  });
+  PreOrderVisit(node, [&](auto const & node) { fn(node->GetData()); });
 }
 
 template <typename Data, typename Fn>
 decltype(auto) FindIf(types::Ptr<Data> const & node, Fn && fn)
 {
   types::Ptr<Data> res = nullptr;
-  PreOrderVisit(node, [&](auto const & node) {
+  PreOrderVisit(node, [&](auto const & node)
+  {
     if (fn(node->GetData()))
     {
       res = node;
@@ -186,8 +183,7 @@ decltype(auto) GetPathToRoot(types::Ptr<Data> node)
 }
 
 template <typename Data, typename Fn>
-types::Ptr<typename std::invoke_result<Fn, Data const &>::type> TransformToTree(
-    types::Ptr<Data> const & node, Fn && fn)
+types::Ptr<typename std::invoke_result<Fn, Data const &>::type> TransformToTree(types::Ptr<Data> const & node, Fn && fn)
 {
   auto n = MakeTreeNode(fn(node->GetData()));
   for (auto const & ch : node->GetChildren())
@@ -207,10 +203,8 @@ bool IsEqual(types::Ptr<Data> const & lhs, types::Ptr<Data> const & rhs)
     return false;
 
   for (size_t i = 0; i < lhsCh.size(); ++i)
-  {
     if (!IsEqual(lhsCh[i], rhsCh[i]))
       return false;
-  }
   return true;
 }
 
@@ -218,7 +212,8 @@ template <typename Data, typename Fn>
 size_t CountIf(types::Ptr<Data> const & node, Fn && fn)
 {
   size_t count = 0;
-  PreOrderVisit(node, [&](auto const & node) {
+  PreOrderVisit(node, [&](auto const & node)
+  {
     if (fn(node->GetData()))
       ++count;
   });
@@ -226,8 +221,7 @@ size_t CountIf(types::Ptr<Data> const & node, Fn && fn)
 }
 
 template <typename Data>
-void Print(types::Ptr<Data> const & node, std::ostream & stream,
-           std::string prefix = "", bool isTail = true)
+void Print(types::Ptr<Data> const & node, std::ostream & stream, std::string prefix = "", bool isTail = true)
 {
   stream << prefix;
   if (isTail)
@@ -268,10 +262,8 @@ public:
       return false;
 
     for (size_t i = 0; i < size; ++i)
-    {
       if (!IsEqual(m_trees[i], other.m_trees[i]))
         return false;
-    }
     return true;
   }
 
@@ -286,10 +278,8 @@ public:
   {
     base::ControlFlowWrapper<Fn> wrapper(std::forward<Fn>(fn));
     for (auto const & tree : m_trees)
-    {
       if (wrapper(tree) == base::ControlFlow::Break)
         return;
-    }
   }
 
 private:
@@ -300,7 +290,8 @@ template <typename Data, typename Fn>
 decltype(auto) FindIf(Forest<Data> const & forest, Fn && fn)
 {
   types::Ptr<Data> res = nullptr;
-  forest.ForEachTree([&](auto const & tree) {
+  forest.ForEachTree([&](auto const & tree)
+  {
     res = FindIf(tree, fn);
     return res ? base::ControlFlow::Break : base::ControlFlow::Continue;
   });
@@ -311,9 +302,7 @@ template <typename Data>
 std::string DebugPrint(Forest<Data> const & forest)
 {
   std::stringstream stream;
-  forest.ForEachTree([&](auto const & tree) {
-    stream << DebugPrint(tree) << '\n';
-  });
+  forest.ForEachTree([&](auto const & tree) { stream << DebugPrint(tree) << '\n'; });
   return stream.str();
 }
 }  // namespace tree_node
diff --git a/libs/indexer/cuisines.cpp b/libs/indexer/cuisines.cpp
index 639009059..28c007a5a 100644
--- a/libs/indexer/cuisines.cpp
+++ b/libs/indexer/cuisines.cpp
@@ -20,16 +20,15 @@ Cuisines::Cuisines()
   /// @todo Better to have GetObjectByPath().
   // Assume that "cuisine" hierarchy is one-level.
   uint32_t const cuisineType = c.GetTypeByPath({"cuisine"});
-  c.GetObject(cuisineType)->ForEachObject([this](ClassifObject const & o)
+  c.GetObject(cuisineType)
+      ->ForEachObject([this](ClassifObject const & o)
   {
     auto const & name = o.GetName();
     m_allCuisines.emplace_back(name, platform::GetLocalizedTypeName("cuisine-" + name));
   });
 
-  sort(m_allCuisines.begin(), m_allCuisines.end(), [](auto const & lhs, auto const & rhs)
-  {
-    return lhs.second < rhs.second;
-  });
+  sort(m_allCuisines.begin(), m_allCuisines.end(),
+       [](auto const & lhs, auto const & rhs) { return lhs.second < rhs.second; });
 }
 
 // static
@@ -41,7 +40,7 @@ Cuisines const & Cuisines::Instance()
 
 string const & Cuisines::Translate(string const & singleCuisine) const
 {
-  static const string kEmptyString;
+  static string const kEmptyString;
   auto const it = find_if(m_allCuisines.begin(), m_allCuisines.end(),
                           [&](auto const & cuisine) { return cuisine.first == singleCuisine; });
   if (it != m_allCuisines.end())
@@ -49,5 +48,8 @@ string const & Cuisines::Translate(string const & singleCuisine) const
   return kEmptyString;
 }
 
-AllCuisines const & Cuisines::AllSupportedCuisines() const { return m_allCuisines; }
+AllCuisines const & Cuisines::AllSupportedCuisines() const
+{
+  return m_allCuisines;
+}
 }  // namespace osm
diff --git a/libs/indexer/custom_keyvalue.cpp b/libs/indexer/custom_keyvalue.cpp
index 566df81e0..9d2a345c2 100644
--- a/libs/indexer/custom_keyvalue.cpp
+++ b/libs/indexer/custom_keyvalue.cpp
@@ -43,4 +43,4 @@ std::string DebugPrint(CustomKeyValue const & kv)
   return ss.str();
 }
 
-} // namespace indexer
+}  // namespace indexer
diff --git a/libs/indexer/custom_keyvalue.hpp b/libs/indexer/custom_keyvalue.hpp
index ec403f6a0..80cd17efa 100644
--- a/libs/indexer/custom_keyvalue.hpp
+++ b/libs/indexer/custom_keyvalue.hpp
@@ -22,10 +22,8 @@ public:
   std::optional<uint64_t> Get(uint8_t k) const
   {
     for (auto const & v : m_vals)
-    {
       if (v.first == k)
         return v.second;
-    }
     return {};
   }
 
@@ -41,4 +39,4 @@ public:
   friend std::string DebugPrint(CustomKeyValue const & kv);
 };
 
-} // namespace indexer
+}  // namespace indexer
diff --git a/libs/indexer/data_header.cpp b/libs/indexer/data_header.cpp
index 06c5eb84d..c23c0f148 100644
--- a/libs/indexer/data_header.cpp
+++ b/libs/indexer/data_header.cpp
@@ -4,8 +4,8 @@
 #include "platform/mwm_version.hpp"
 #include "platform/platform.hpp"
 
-#include "coding/files_container.hpp"
 #include "coding/file_writer.hpp"
+#include "coding/files_container.hpp"
 #include "coding/point_coding.hpp"
 #include "coding/varint.hpp"
 
@@ -41,98 +41,96 @@ void LoadBytes(Source & src, Cont & cont)
 }
 }  // namespace
 
-  DataHeader::DataHeader(std::string const & fileName)
-    : DataHeader((FilesContainerR(GetPlatform().GetReader(fileName))))
+DataHeader::DataHeader(std::string const & fileName) : DataHeader((FilesContainerR(GetPlatform().GetReader(fileName))))
+{}
+
+DataHeader::DataHeader(FilesContainerR const & cont)
+{
+  Load(cont);
+}
+
+serial::GeometryCodingParams DataHeader::GetGeometryCodingParams(int scaleIndex) const
+{
+  return {static_cast<uint8_t>(m_codingParams.GetCoordBits() - (m_scales.back() - m_scales[scaleIndex]) / 2),
+          m_codingParams.GetBasePointUint64()};
+}
+
+m2::RectD DataHeader::GetBounds() const
+{
+  return Int64ToRectObsolete(m_bounds, m_codingParams.GetCoordBits());
+}
+
+void DataHeader::SetBounds(m2::RectD const & r)
+{
+  m_bounds = RectToInt64Obsolete(r, m_codingParams.GetCoordBits());
+}
+
+std::pair<int, int> DataHeader::GetScaleRange() const
+{
+  using namespace scales;
+
+  int const low = 0;
+  int const high = GetUpperScale();
+  int const worldH = GetUpperWorldScale();
+  MapType const type = GetType();
+
+  switch (type)
   {
+  case MapType::World: return {low, worldH};
+  case MapType::WorldCoasts: return {low, high};
+  default:
+    ASSERT_EQUAL(type, MapType::Country, ());
+    return {worldH + 1, high};
+
+    // Uncomment this to test countries drawing in all scales.
+    // return {1, high};
+  }
+}
+
+void DataHeader::Save(FileWriter & w) const
+{
+  m_codingParams.Save(w);
+
+  WriteVarInt(w, m_bounds.first);
+  WriteVarInt(w, m_bounds.second);
+
+  SaveBytes(w, m_scales);
+  SaveBytes(w, m_langs);
+
+  WriteVarInt(w, static_cast<int32_t>(m_type));
+}
+
+void DataHeader::Load(FilesContainerR const & cont)
+{
+  Load(cont.GetReader(HEADER_FILE_TAG));
+}
+
+void DataHeader::Load(ModelReaderPtr const & r)
+{
+  ReaderSource<ModelReaderPtr> src(r);
+  m_codingParams.Load(src);
+
+  m_bounds.first = ReadVarInt<int64_t>(src);
+  m_bounds.second = ReadVarInt<int64_t>(src);
+
+  LoadBytes(src, m_scales);
+  LoadBytes(src, m_langs);
+
+  m_type = static_cast<MapType>(ReadVarInt<int32_t>(src));
+
+  if (m_type < MapType::World || m_type > MapType::Country || m_scales.size() != kMaxScalesCount)
+    MYTHROW(CorruptedMwmFile, (r.GetName()));
+}
+
+std::string DebugPrint(DataHeader::MapType type)
+{
+  switch (type)
+  {
+  case DataHeader::MapType::World: return "World";
+  case DataHeader::MapType::WorldCoasts: return "WorldCoasts";
+  case DataHeader::MapType::Country: return "Country";
   }
 
-  DataHeader::DataHeader(FilesContainerR const & cont)
-  {
-    Load(cont);
-  }
-
-  serial::GeometryCodingParams DataHeader::GetGeometryCodingParams(int scaleIndex) const
-  {
-    return { static_cast<uint8_t>(m_codingParams.GetCoordBits() - (m_scales.back() - m_scales[scaleIndex]) / 2),
-             m_codingParams.GetBasePointUint64()};
-  }
-
-  m2::RectD DataHeader::GetBounds() const
-  {
-    return Int64ToRectObsolete(m_bounds, m_codingParams.GetCoordBits());
-  }
-
-  void DataHeader::SetBounds(m2::RectD const & r)
-  {
-    m_bounds = RectToInt64Obsolete(r, m_codingParams.GetCoordBits());
-  }
-
-  std::pair<int, int> DataHeader::GetScaleRange() const
-  {
-    using namespace scales;
-
-    int const low = 0;
-    int const high = GetUpperScale();
-    int const worldH = GetUpperWorldScale();
-    MapType const type = GetType();
-
-    switch (type)
-    {
-    case MapType::World: return {low, worldH};
-    case MapType::WorldCoasts: return {low, high};
-    default:
-      ASSERT_EQUAL(type, MapType::Country, ());
-      return {worldH + 1, high};
-
-      // Uncomment this to test countries drawing in all scales.
-      //return {1, high};
-    }
-  }
-
-  void DataHeader::Save(FileWriter & w) const
-  {
-    m_codingParams.Save(w);
-
-    WriteVarInt(w, m_bounds.first);
-    WriteVarInt(w, m_bounds.second);
-
-    SaveBytes(w, m_scales);
-    SaveBytes(w, m_langs);
-
-    WriteVarInt(w, static_cast<int32_t>(m_type));
-  }
-
-  void DataHeader::Load(FilesContainerR const & cont)
-  {
-    Load(cont.GetReader(HEADER_FILE_TAG));
-  }
-
-  void DataHeader::Load(ModelReaderPtr const & r)
-  {
-    ReaderSource<ModelReaderPtr> src(r);
-    m_codingParams.Load(src);
-
-    m_bounds.first = ReadVarInt<int64_t>(src);
-    m_bounds.second = ReadVarInt<int64_t>(src);
-
-    LoadBytes(src, m_scales);
-    LoadBytes(src, m_langs);
-
-    m_type = static_cast<MapType>(ReadVarInt<int32_t>(src));
-
-    if (m_type < MapType::World || m_type > MapType::Country || m_scales.size() != kMaxScalesCount)
-      MYTHROW(CorruptedMwmFile, (r.GetName()));
-  }
-
-  std::string DebugPrint(DataHeader::MapType type)
-  {
-    switch (type)
-    {
-    case DataHeader::MapType::World: return "World";
-    case DataHeader::MapType::WorldCoasts: return "WorldCoasts";
-    case DataHeader::MapType::Country: return "Country";
-    }
-
-    UNREACHABLE();
-  }
+  UNREACHABLE();
+}
 }  // namespace feature
diff --git a/libs/indexer/data_header.hpp b/libs/indexer/data_header.hpp
index 422c5b77c..961b51be7 100644
--- a/libs/indexer/data_header.hpp
+++ b/libs/indexer/data_header.hpp
@@ -16,71 +16,65 @@ class ModelReaderPtr;
 
 namespace feature
 {
-  class DataHeader
+class DataHeader
+{
+public:
+  /// @note An order is important here, @see Load function.
+  enum class MapType : uint8_t
   {
-  public:
-    /// @note An order is important here, @see Load function.
-    enum class MapType : uint8_t
-    {
-      World,
-      WorldCoasts,
-      Country
-    };
-
-    /// Max possible geometry scales. @see arrays in feature_impl.hpp
-    static constexpr size_t kMaxScalesCount = 4;
-
-    DataHeader() = default;
-    explicit DataHeader(std::string const & fileName);
-    explicit DataHeader(FilesContainerR const & cont);
-
-    inline void SetGeometryCodingParams(serial::GeometryCodingParams const & cp)
-    {
-      m_codingParams = cp;
-    }
-
-    inline serial::GeometryCodingParams const & GetDefGeometryCodingParams() const
-    {
-      return m_codingParams;
-    }
-
-    serial::GeometryCodingParams GetGeometryCodingParams(int scaleIndex) const;
-
-    m2::RectD GetBounds() const;
-    void SetBounds(m2::RectD const & r);
-
-    template <size_t N>
-    void SetScales(int const (&arr)[N])
-    {
-      m_scales.assign(arr, arr + N);
-    }
-
-    size_t GetScalesCount() const { return m_scales.size(); }
-    int GetScale(size_t i) const { return static_cast<int>(m_scales[i]); }
-    int GetLastScale() const { return m_scales.back(); }
-
-    std::pair<int, int> GetScaleRange() const;
-
-    void Save(FileWriter & w) const;
-    void Load(FilesContainerR const & cont);
-
-    void SetType(MapType t) { m_type = t; }
-    MapType GetType() const { return m_type; }
-
-  private:
-    void Load(ModelReaderPtr const & r);
-
-    MapType m_type = MapType::World;
-
-    serial::GeometryCodingParams m_codingParams;
-
-    // Rect around region border. Features which cross region border may cross this rect.
-    std::pair<int64_t, int64_t> m_bounds;
-
-    buffer_vector<uint8_t, kMaxScalesCount> m_scales;
-    // Is not used now (see data/countries_meta.txt). Can be reused for something else.
-    buffer_vector<uint8_t, 2> m_langs;
+    World,
+    WorldCoasts,
+    Country
   };
 
-  std::string DebugPrint(DataHeader::MapType type);
+  /// Max possible geometry scales. @see arrays in feature_impl.hpp
+  static constexpr size_t kMaxScalesCount = 4;
+
+  DataHeader() = default;
+  explicit DataHeader(std::string const & fileName);
+  explicit DataHeader(FilesContainerR const & cont);
+
+  inline void SetGeometryCodingParams(serial::GeometryCodingParams const & cp) { m_codingParams = cp; }
+
+  inline serial::GeometryCodingParams const & GetDefGeometryCodingParams() const { return m_codingParams; }
+
+  serial::GeometryCodingParams GetGeometryCodingParams(int scaleIndex) const;
+
+  m2::RectD GetBounds() const;
+  void SetBounds(m2::RectD const & r);
+
+  template <size_t N>
+  void SetScales(int const (&arr)[N])
+  {
+    m_scales.assign(arr, arr + N);
+  }
+
+  size_t GetScalesCount() const { return m_scales.size(); }
+  int GetScale(size_t i) const { return static_cast<int>(m_scales[i]); }
+  int GetLastScale() const { return m_scales.back(); }
+
+  std::pair<int, int> GetScaleRange() const;
+
+  void Save(FileWriter & w) const;
+  void Load(FilesContainerR const & cont);
+
+  void SetType(MapType t) { m_type = t; }
+  MapType GetType() const { return m_type; }
+
+private:
+  void Load(ModelReaderPtr const & r);
+
+  MapType m_type = MapType::World;
+
+  serial::GeometryCodingParams m_codingParams;
+
+  // Rect around region border. Features which cross region border may cross this rect.
+  std::pair<int64_t, int64_t> m_bounds;
+
+  buffer_vector<uint8_t, kMaxScalesCount> m_scales;
+  // Is not used now (see data/countries_meta.txt). Can be reused for something else.
+  buffer_vector<uint8_t, 2> m_langs;
+};
+
+std::string DebugPrint(DataHeader::MapType type);
 }  // namespace feature
diff --git a/libs/indexer/data_source.cpp b/libs/indexer/data_source.cpp
index 4ebb7a3f6..a6205afe7 100644
--- a/libs/indexer/data_source.cpp
+++ b/libs/indexer/data_source.cpp
@@ -22,11 +22,11 @@ public:
     m_stop = []() { return false; };
   }
 
-  ReadMWMFunctor(FeatureSourceFactory const & factory, Fn const & fn,
-                 DataSource::StopSearchCallback const & stop)
-    : m_factory(factory), m_fn(fn), m_stop(stop)
-  {
-  }
+  ReadMWMFunctor(FeatureSourceFactory const & factory, Fn const & fn, DataSource::StopSearchCallback const & stop)
+    : m_factory(factory)
+    , m_fn(fn)
+    , m_stop(stop)
+  {}
 
   // Reads features visible at |scale| covered by |cov| from mwm and applies |m_fn| to them.
   // Feature reading process consists of two steps: untouched (original) features reading and
@@ -183,10 +183,13 @@ std::pair<MwmSet::MwmId, MwmSet::RegResult> DataSource::RegisterMap(LocalCountry
   return Register(localFile);
 }
 
-bool DataSource::DeregisterMap(CountryFile const & countryFile) { return Deregister(countryFile); }
+bool DataSource::DeregisterMap(CountryFile const & countryFile)
+{
+  return Deregister(countryFile);
+}
 
-void DataSource::ForEachInIntervals(ReaderCallback const & fn, covering::CoveringMode mode,
-                                    m2::RectD const & rect, int scale) const
+void DataSource::ForEachInIntervals(ReaderCallback const & fn, covering::CoveringMode mode, m2::RectD const & rect,
+                                    int scale) const
 {
   std::vector<std::shared_ptr<MwmInfo>> mwms;
   GetMwmsInfo(mwms);
@@ -197,8 +200,7 @@ void DataSource::ForEachInIntervals(ReaderCallback const & fn, covering::Coverin
 
   for (auto const & info : mwms)
   {
-    if (info->m_minScale <= scale && scale <= info->m_maxScale &&
-        rect.IsIntersect(info->m_bordersRect))
+    if (info->m_minScale <= scale && scale <= info->m_maxScale && rect.IsIntersect(info->m_bordersRect))
     {
       MwmId const mwmId(info);
       switch (info->GetType())
@@ -223,7 +225,7 @@ void DataSource::ForEachFeatureIDInRect(FeatureIdCallback const & f, m2::RectD c
   auto readFeatureId = [&f](uint32_t index, FeatureSource & src)
   {
     if (src.GetFeatureStatus(index) != FeatureStatus::Deleted)
-      f({ src.GetMwmId(), index });
+      f({src.GetMwmId(), index});
   };
 
   ReadMWMFunctor readFunctor(*m_factory, readFeatureId);
@@ -232,9 +234,7 @@ void DataSource::ForEachFeatureIDInRect(FeatureIdCallback const & f, m2::RectD c
 
 void DataSource::ForEachInRect(FeatureCallback const & f, m2::RectD const & rect, int scale) const
 {
-  auto readFeatureType = [&f](uint32_t index, FeatureSource & src) {
-    ReadFeatureType(f, src, index);
-  };
+  auto readFeatureType = [&f](uint32_t index, FeatureSource & src) { ReadFeatureType(f, src, index); };
 
   ReadMWMFunctor readFunctor(*m_factory, readFeatureType);
   ForEachInIntervals(readFunctor, covering::ViewportWithLowLevels, rect, scale);
@@ -245,18 +245,14 @@ void DataSource::ForClosestToPoint(FeatureCallback const & f, StopSearchCallback
 {
   auto const rect = mercator::RectByCenterXYAndSizeInMeters(center, sizeM);
 
-  auto readFeatureType = [&f](uint32_t index, FeatureSource & src) {
-    ReadFeatureType(f, src, index);
-  };
+  auto readFeatureType = [&f](uint32_t index, FeatureSource & src) { ReadFeatureType(f, src, index); };
   ReadMWMFunctor readFunctor(*m_factory, readFeatureType, stop);
   ForEachInIntervals(readFunctor, covering::CoveringMode::Spiral, rect, scale);
 }
 
 void DataSource::ForEachInScale(FeatureCallback const & f, int scale) const
 {
-  auto readFeatureType = [&f](uint32_t index, FeatureSource & src) {
-    ReadFeatureType(f, src, index);
-  };
+  auto readFeatureType = [&f](uint32_t index, FeatureSource & src) { ReadFeatureType(f, src, index); };
 
   ReadMWMFunctor readFunctor(*m_factory, readFeatureType);
   ForEachInIntervals(readFunctor, covering::FullCover, m2::RectD::GetInfiniteRect(), scale);
@@ -269,9 +265,7 @@ void DataSource::ForEachInRectForMWM(FeatureCallback const & f, m2::RectD const
   if (handle.IsAlive())
   {
     covering::CoveringGetter cov(rect, covering::ViewportWithLowLevels);
-    auto readFeatureType = [&f](uint32_t index, FeatureSource & src) {
-      ReadFeatureType(f, src, index);
-    };
+    auto readFeatureType = [&f](uint32_t index, FeatureSource & src) { ReadFeatureType(f, src, index); };
 
     ReadMWMFunctor readFunctor(*m_factory, readFeatureType);
     readFunctor(handle, cov, scale);
@@ -295,9 +289,8 @@ void DataSource::ReadFeatures(FeatureCallback const & fn, std::vector<FeatureID>
       do
       {
         auto const fts = src->GetFeatureStatus(fidIter->m_index);
-        ASSERT_NOT_EQUAL(
-            FeatureStatus::Deleted, fts,
-            ("Deleted feature was cached. It should not be here. Please review your code."));
+        ASSERT_NOT_EQUAL(FeatureStatus::Deleted, fts,
+                         ("Deleted feature was cached. It should not be here. Please review your code."));
         std::unique_ptr<FeatureType> ft;
         if (fts == FeatureStatus::Modified || fts == FeatureStatus::Created)
           ft = src->GetModifiedFeature(fidIter->m_index);
@@ -306,7 +299,8 @@ void DataSource::ReadFeatures(FeatureCallback const & fn, std::vector<FeatureID>
 
         CHECK(ft, ());
         fn(*ft);
-      } while (++fidIter != endIter && id == fidIter->m_mwmId);
+      }
+      while (++fidIter != endIter && id == fidIter->m_mwmId);
     }
     else
     {
diff --git a/libs/indexer/data_source.hpp b/libs/indexer/data_source.hpp
index 7e429f282..fb9f4e680 100644
--- a/libs/indexer/data_source.hpp
+++ b/libs/indexer/data_source.hpp
@@ -33,18 +33,14 @@ public:
   // |sizeM| from has been reached. Then for EditableDataSource calls |f| for each edited feature
   // inside square with center |center| and side |2 * sizeM|. Edited features are not in the same
   // hierarchy and there is no fast way to merge frozen and edited features.
-  void ForClosestToPoint(FeatureCallback const & f, StopSearchCallback const & stopCallback,
-                         m2::PointD const & center, double sizeM, int scale) const;
+  void ForClosestToPoint(FeatureCallback const & f, StopSearchCallback const & stopCallback, m2::PointD const & center,
+                         double sizeM, int scale) const;
   void ForEachInScale(FeatureCallback const & f, int scale) const;
-  void ForEachInRectForMWM(FeatureCallback const & f, m2::RectD const & rect, int scale,
-                           MwmId const & id) const;
+  void ForEachInRectForMWM(FeatureCallback const & f, m2::RectD const & rect, int scale, MwmId const & id) const;
   // "features" must be sorted using FeatureID::operator< as predicate.
   void ReadFeatures(FeatureCallback const & fn, std::vector<FeatureID> const & features) const;
 
-  void ReadFeature(FeatureCallback const & fn, FeatureID const & feature) const
-  {
-    return ReadFeatures(fn, {feature});
-  }
+  void ReadFeature(FeatureCallback const & fn, FeatureID const & feature) const { return ReadFeatures(fn, {feature}); }
 
   std::unique_ptr<FeatureSource> CreateFeatureSource(DataSource::MwmHandle const & handle) const
   {
@@ -52,13 +48,13 @@ public:
   }
 
 protected:
-  using ReaderCallback = std::function<void(MwmSet::MwmHandle const & handle,
-                                            covering::CoveringGetter & cov, int scale)>;
+  using ReaderCallback =
+      std::function<void(MwmSet::MwmHandle const & handle, covering::CoveringGetter & cov, int scale)>;
 
   explicit DataSource(std::unique_ptr<FeatureSourceFactory> factory) : m_factory(std::move(factory)) {}
 
-  void ForEachInIntervals(ReaderCallback const & fn, covering::CoveringMode mode,
-                          m2::RectD const & rect, int scale) const;
+  void ForEachInIntervals(ReaderCallback const & fn, covering::CoveringMode mode, m2::RectD const & rect,
+                          int scale) const;
 
   /// @name MwmSet overrides
   /// @{
@@ -86,7 +82,8 @@ class FeaturesLoaderGuard
 {
 public:
   FeaturesLoaderGuard(DataSource const & dataSource, DataSource::MwmId const & id)
-    : m_handle(dataSource.GetMwmHandleById(id)), m_source(dataSource.CreateFeatureSource(m_handle))
+    : m_handle(dataSource.GetMwmHandleById(id))
+    , m_source(dataSource.CreateFeatureSource(m_handle))
   {
     // FeaturesLoaderGuard is always created in-place, so MWM should always be alive.
     ASSERT(id.IsAlive(), ());
diff --git a/libs/indexer/data_source_helpers.cpp b/libs/indexer/data_source_helpers.cpp
index fcc8ba23c..93c5a077f 100644
--- a/libs/indexer/data_source_helpers.cpp
+++ b/libs/indexer/data_source_helpers.cpp
@@ -14,10 +14,10 @@ void ForEachFeatureAtPoint(DataSource const & dataSource, function<void(FeatureT
   double constexpr kSelectRectWidthInMeters = 1.1;
   double constexpr kMetersToLinearFeature = 3;
   int constexpr kScale = scales::GetUpperScale();
-  m2::RectD const rect =
-      mercator::RectByCenterXYAndSizeInMeters(mercator, kSelectRectWidthInMeters);
+  m2::RectD const rect = mercator::RectByCenterXYAndSizeInMeters(mercator, kSelectRectWidthInMeters);
 
-  auto const emitter = [&fn, &rect, &mercator, toleranceInMeters](FeatureType & ft) {
+  auto const emitter = [&fn, &rect, &mercator, toleranceInMeters](FeatureType & ft)
+  {
     switch (ft.GetGeomType())
     {
     case feature::GeomType::Point:
@@ -34,11 +34,8 @@ void ForEachFeatureAtPoint(DataSource const & dataSource, function<void(FeatureT
       // Be a little more tolerant. When used by editor mercator is given
       // with some error, so we must extend limit rect a bit.
       limitRect.Inflate(kMwmPointAccuracy, kMwmPointAccuracy);
-      if (limitRect.IsPointInside(mercator) &&
-          feature::GetMinDistanceMeters(ft, mercator) <= toleranceInMeters)
-      {
+      if (limitRect.IsPointInside(mercator) && feature::GetMinDistanceMeters(ft, mercator) <= toleranceInMeters)
         fn(ft);
-      }
     }
     break;
     case feature::GeomType::Undefined: ASSERT(false, ("case feature::GeomType::Undefined")); break;
diff --git a/libs/indexer/displacement_manager.hpp b/libs/indexer/displacement_manager.hpp
index e382e24fe..346007af6 100644
--- a/libs/indexer/displacement_manager.hpp
+++ b/libs/indexer/displacement_manager.hpp
@@ -33,9 +33,7 @@ public:
   using CellFeaturePair = CellValuePair<uint32_t>;
 
   CellFeatureBucketTuple() : m_bucket(0) {}
-  CellFeatureBucketTuple(CellFeaturePair const & p, uint32_t bucket) : m_pair(p), m_bucket(bucket)
-  {
-  }
+  CellFeatureBucketTuple(CellFeaturePair const & p, uint32_t bucket) : m_pair(p), m_bucket(bucket) {}
 
   bool operator<(CellFeatureBucketTuple const & rhs) const
   {
@@ -97,8 +95,7 @@ public:
       auto scale = node.m_minScale;
       // Do not filter high level objects. Including metro and country names.
       static auto const maximumIgnoredZoom =
-          feature::GetDrawableScaleRange(classif().GetTypeByPath({"railway", "station", "subway"}))
-              .first;
+          feature::GetDrawableScaleRange(classif().GetTypeByPath({"railway", "station", "subway"})).first;
 
       if (maximumIgnoredZoom < 0 || scale <= maximumIgnoredZoom)
       {
@@ -115,11 +112,11 @@ public:
         m2::RectD const displacementRect(node.m_center, node.m_center);
         bool isDisplaced = false;
         acceptedNodes.ForEachInRect(m2::Inflate(displacementRect, {delta, delta}),
-            [&isDisplaced, &node, &squaredDelta, &scale](DisplaceableNode const & rhs)
-            {
-              if (node.m_center.SquaredLength(rhs.m_center) < squaredDelta && rhs.m_maxScale > scale)
-                isDisplaced = true;
-            });
+                                    [&isDisplaced, &node, &squaredDelta, &scale](DisplaceableNode const & rhs)
+        {
+          if (node.m_center.SquaredLength(rhs.m_center) < squaredDelta && rhs.m_maxScale > scale)
+            isDisplaced = true;
+        });
         if (isDisplaced)
           continue;
 
@@ -169,10 +166,8 @@ private:
 
       float depth = 0;
       for (auto const & k : keys)
-      {
         if (depth < k.m_priority)
           depth = k.m_priority;
-      }
 
       // @todo: make sure features are prioritised the same way as in the run-time displacer,
       // see overlay_handle.cpp::CalculateOverlayPriority()
@@ -214,4 +209,4 @@ private:
   Sorter & m_sorter;
   std::vector<DisplaceableNode> m_storage;
 };
-} // namespace covering
+}  // namespace covering
diff --git a/libs/indexer/drawing_rule_def.cpp b/libs/indexer/drawing_rule_def.cpp
index 8b1aa6744..bb63afe42 100644
--- a/libs/indexer/drawing_rule_def.cpp
+++ b/libs/indexer/drawing_rule_def.cpp
@@ -11,7 +11,7 @@ namespace
 {
 struct less_key
 {
-  bool operator() (drule::Key const & r1, drule::Key const & r2) const
+  bool operator()(drule::Key const & r1, drule::Key const & r2) const
   {
     // assume that unique algo leaves the first element (with max priority), others - go away
     if (r1.m_type == r2.m_type)
@@ -22,12 +22,12 @@ struct less_key
     }
     else
       return (r1.m_type < r2.m_type);
-   }
+  }
 };
 
 struct equal_key
 {
-  bool operator() (drule::Key const & r1, drule::Key const & r2) const
+  bool operator()(drule::Key const & r1, drule::Key const & r2) const
   {
     // many line rules - is ok, other rules - one is enough
     if (r1.m_type == drule::line)
@@ -61,9 +61,7 @@ double CalcAreaBySizeDepth(FeatureType & f)
   // Raw areas' size range is about (1e-11, 3000).
   double const areaSize = r.SizeX() * r.SizeY();
   // Compacted range is approx (-37;13).
-  double constexpr kMinSize = -37,
-                   kMaxSize = 13,
-                   kStretchFactor = kDepthRangeBgBySize / (kMaxSize - kMinSize);
+  double constexpr kMinSize = -37, kMaxSize = 13, kStretchFactor = kDepthRangeBgBySize / (kMaxSize - kMinSize);
 
   // Use log2() to have more precision distinguishing smaller areas.
   /// @todo We still can get here with areaSize == 0.
@@ -77,4 +75,4 @@ double CalcAreaBySizeDepth(FeatureType & f)
   return areaDepth;
 }
 
-}
+}  // namespace drule
diff --git a/libs/indexer/drawing_rule_def.hpp b/libs/indexer/drawing_rule_def.hpp
index 53966bb89..26d20e6c3 100644
--- a/libs/indexer/drawing_rule_def.hpp
+++ b/libs/indexer/drawing_rule_def.hpp
@@ -18,69 +18,74 @@ double constexpr kLayerPriorityRange = 1000;
 int32_t constexpr kOverlaysMaxPriority = 10000;
 
 /*
-* Besides overlays, the overall rendering depth range [dp::kMinDepth;dp::kMaxDepth] is divided
-* into following specific depth ranges:
-* FG - foreground lines and areas (buildings..), rendered on top of other geometry always,
-*      even if a fg feature is layer=-10 (e.g. tunnels should be visibile over landcover and water).
-* BG-top - rendered just on top of BG-by-size range, because ordering by size
-*      doesn't always work with e.g. water mapped over a forest,
-*      so water should be on top of other landcover always,
-*      but linear waterways should be hidden beneath it.
-* BG-by-size - landcover areas rendered in bbox size order, smaller areas are above larger ones.
-* Still, a BG-top water area with layer=-1 should go below other landcover,
-* and a layer=1 landcover area should be displayed above water,
-* so BG-top and BG-by-size should share the same "layer" space.
-*/
+ * Besides overlays, the overall rendering depth range [dp::kMinDepth;dp::kMaxDepth] is divided
+ * into following specific depth ranges:
+ * FG - foreground lines and areas (buildings..), rendered on top of other geometry always,
+ *      even if a fg feature is layer=-10 (e.g. tunnels should be visibile over landcover and water).
+ * BG-top - rendered just on top of BG-by-size range, because ordering by size
+ *      doesn't always work with e.g. water mapped over a forest,
+ *      so water should be on top of other landcover always,
+ *      but linear waterways should be hidden beneath it.
+ * BG-by-size - landcover areas rendered in bbox size order, smaller areas are above larger ones.
+ * Still, a BG-top water area with layer=-1 should go below other landcover,
+ * and a layer=1 landcover area should be displayed above water,
+ * so BG-top and BG-by-size should share the same "layer" space.
+ */
 
 // Priority values coming from style files are expected to be separated into following ranges.
-static double constexpr kBasePriorityFg = 0,
-                        kBasePriorityBgTop = -1000,
-                        kBasePriorityBgBySize = -2000;
+static double constexpr kBasePriorityFg = 0, kBasePriorityBgTop = -1000, kBasePriorityBgBySize = -2000;
 
 // Define depth ranges boundaries to accomodate for all possible layer=* values.
 // One layer space is drule::kLayerPriorityRange (1000). So each +1/-1 layer value shifts
 // depth of the drule by -1000/+1000.
 
-                        // FG depth range: [0;1000).
+// FG depth range: [0;1000).
 static double constexpr kBaseDepthFg = 0,
                         // layer=-10/10 gives an overall FG range of [-10000;11000).
-                        kMaxLayeredDepthFg = kBaseDepthFg + (1 + feature::LAYER_HIGH) * kLayerPriorityRange,
+    kMaxLayeredDepthFg = kBaseDepthFg + (1 + feature::LAYER_HIGH) * kLayerPriorityRange,
                         kMinLayeredDepthFg = kBaseDepthFg + int8_t{feature::LAYER_LOW} * kLayerPriorityRange,
                         // Split the background layer space as 100 for BG-top and 900 for BG-by-size.
-                        kBgTopRangeFraction = 0.1,
-                        kDepthRangeBgTop = kBgTopRangeFraction * kLayerPriorityRange,
+    kBgTopRangeFraction = 0.1, kDepthRangeBgTop = kBgTopRangeFraction * kLayerPriorityRange,
                         kDepthRangeBgBySize = kLayerPriorityRange - kDepthRangeBgTop,
                         // So the BG-top range is [-10100,-10000).
-                        kBaseDepthBgTop = kMinLayeredDepthFg - kDepthRangeBgTop,
+    kBaseDepthBgTop = kMinLayeredDepthFg - kDepthRangeBgTop,
                         // And BG-by-size range is [-11000,-10100).
-                        kBaseDepthBgBySize = kBaseDepthBgTop - kDepthRangeBgBySize,
+    kBaseDepthBgBySize = kBaseDepthBgTop - kDepthRangeBgBySize,
                         // Minimum BG depth for layer=-10 is -21000.
-                        kMinLayeredDepthBg = kBaseDepthBgBySize + int8_t{feature::LAYER_LOW} * kLayerPriorityRange;
+    kMinLayeredDepthBg = kBaseDepthBgBySize + int8_t{feature::LAYER_LOW} * kLayerPriorityRange;
 
-  class Key
-  {
-  public:
-    uint8_t m_scale = -1;
-    int m_type = -1;
-    size_t m_index = std::numeric_limits<size_t>::max(); // an index to RulesHolder.m_dRules[]
-    int m_priority = -1;
-    bool m_hatching = false;
+class Key
+{
+public:
+  uint8_t m_scale = -1;
+  int m_type = -1;
+  size_t m_index = std::numeric_limits<size_t>::max();  // an index to RulesHolder.m_dRules[]
+  int m_priority = -1;
+  bool m_hatching = false;
 
-    Key() = default;
-    Key(uint8_t s, int t, size_t i) : m_scale(s), m_type(t), m_index(i), m_priority(-1) {}
+  Key() = default;
+  Key(uint8_t s, int t, size_t i) : m_scale(s), m_type(t), m_index(i), m_priority(-1) {}
 
-    bool operator==(Key const & r) const
-    {
-      return (m_index == r.m_index);
-    }
+  bool operator==(Key const & r) const { return (m_index == r.m_index); }
 
-    void SetPriority(int pr) { m_priority = pr; }
-  };
+  void SetPriority(int pr) { m_priority = pr; }
+};
 
-  /// drawing type of rule - can be one of ...
-  enum TypeT { line, area, symbol, caption, circle, pathtext, waymarker, shield, count_of_rules };
+/// drawing type of rule - can be one of ...
+enum TypeT
+{
+  line,
+  area,
+  symbol,
+  caption,
+  circle,
+  pathtext,
+  waymarker,
+  shield,
+  count_of_rules
+};
 
-  typedef buffer_vector<Key, 16> KeysT;
-  void MakeUnique(KeysT & keys);
-  double CalcAreaBySizeDepth(FeatureType & f);
-}
+typedef buffer_vector<Key, 16> KeysT;
+void MakeUnique(KeysT & keys);
+double CalcAreaBySizeDepth(FeatureType & f);
+}  // namespace drule
diff --git a/libs/indexer/drawing_rules.cpp b/libs/indexer/drawing_rules.cpp
index 22168b87a..fadbdf31b 100644
--- a/libs/indexer/drawing_rules.cpp
+++ b/libs/indexer/drawing_rules.cpp
@@ -22,8 +22,8 @@ using namespace std;
 
 namespace
 {
-  uint32_t const DEFAULT_BG_COLOR = 0xEEEEDD;
-} // namespace
+uint32_t const DEFAULT_BG_COLOR = 0xEEEEDD;
+}  // namespace
 
 LineRuleProto const * BaseRule::GetLine() const
 {
@@ -67,9 +67,7 @@ void BaseRule::SetSelector(unique_ptr<ISelector> && selector)
   m_selector = std::move(selector);
 }
 
-RulesHolder::RulesHolder()
-  : m_bgColors(scales::UPPER_STYLE_SCALE+1, DEFAULT_BG_COLOR)
-{}
+RulesHolder::RulesHolder() : m_bgColors(scales::UPPER_STYLE_SCALE + 1, DEFAULT_BG_COLOR) {}
 
 RulesHolder::~RulesHolder()
 {
@@ -87,8 +85,8 @@ void RulesHolder::Clean()
 
 Key RulesHolder::AddRule(int scale, TypeT type, BaseRule * p)
 {
-  ASSERT ( 0 <= scale && scale <= scales::GetUpperStyleScale(), (scale) );
-  ASSERT ( 0 <= type && type < count_of_rules, () );
+  ASSERT(0 <= scale && scale <= scales::GetUpperStyleScale(), (scale));
+  ASSERT(0 <= type && type < count_of_rules, ());
 
   m_dRules.push_back(p);
   auto const index = m_dRules.size() - 1;
@@ -129,7 +127,7 @@ RulesHolder & rules(MapStyle mapStyle)
   static RulesHolder h[MapStyleCount];
   return h[mapStyle];
 }
-} // namespace
+}  // namespace
 
 RulesHolder & rules()
 {
@@ -138,215 +136,203 @@ RulesHolder & rules()
 
 namespace
 {
-  namespace proto_rules
+namespace proto_rules
+{
+class Line : public BaseRule
+{
+  LineRuleProto m_line;
+
+public:
+  explicit Line(LineRuleProto const & r) : m_line(r)
   {
-    class Line : public BaseRule
-    {
-      LineRuleProto m_line;
-    public:
-      explicit Line(LineRuleProto const & r)
-        : m_line(r)
-      {
-        ASSERT(r.has_pathsym() || r.width() > 0, ("Zero width line w/o path symbol)"));
-      }
-
-      virtual LineRuleProto const * GetLine() const { return &m_line; }
-    };
-
-    class Area : public BaseRule
-    {
-      AreaRuleProto m_area;
-    public:
-      explicit Area(AreaRuleProto const & r) : m_area(r) {}
-
-      virtual AreaRuleProto const * GetArea() const { return &m_area; }
-    };
-
-    class Symbol : public BaseRule
-    {
-      SymbolRuleProto m_symbol;
-    public:
-      explicit Symbol(SymbolRuleProto const & r) : m_symbol(r) {}
-
-      virtual SymbolRuleProto const * GetSymbol() const { return &m_symbol; }
-    };
-
-    class Caption : public BaseRule
-    {
-      CaptionRuleProto m_caption;
-    public:
-      explicit Caption(CaptionRuleProto const & r)
-        : m_caption(r)
-      {
-        ASSERT(r.has_primary(),());
-      }
-
-      virtual CaptionRuleProto const * GetCaption() const { return &m_caption; }
-    };
-
-    class PathText : public BaseRule
-    {
-      PathTextRuleProto m_pathtext;
-    public:
-      explicit PathText(PathTextRuleProto const & r) : m_pathtext(r) {}
-
-      virtual PathTextRuleProto const * GetPathtext() const { return &m_pathtext; }
-    };
-
-    class Shield : public BaseRule
-    {
-      ShieldRuleProto m_shield;
-    public:
-      explicit Shield(ShieldRuleProto const & r) : m_shield(r) {}
-
-      virtual ShieldRuleProto const * GetShield() const { return &m_shield; }
-    };
+    ASSERT(r.has_pathsym() || r.width() > 0, ("Zero width line w/o path symbol)"));
   }
 
-  class DoSetIndex
+  virtual LineRuleProto const * GetLine() const { return &m_line; }
+};
+
+class Area : public BaseRule
+{
+  AreaRuleProto m_area;
+
+public:
+  explicit Area(AreaRuleProto const & r) : m_area(r) {}
+
+  virtual AreaRuleProto const * GetArea() const { return &m_area; }
+};
+
+class Symbol : public BaseRule
+{
+  SymbolRuleProto m_symbol;
+
+public:
+  explicit Symbol(SymbolRuleProto const & r) : m_symbol(r) {}
+
+  virtual SymbolRuleProto const * GetSymbol() const { return &m_symbol; }
+};
+
+class Caption : public BaseRule
+{
+  CaptionRuleProto m_caption;
+
+public:
+  explicit Caption(CaptionRuleProto const & r) : m_caption(r) { ASSERT(r.has_primary(), ()); }
+
+  virtual CaptionRuleProto const * GetCaption() const { return &m_caption; }
+};
+
+class PathText : public BaseRule
+{
+  PathTextRuleProto m_pathtext;
+
+public:
+  explicit PathText(PathTextRuleProto const & r) : m_pathtext(r) {}
+
+  virtual PathTextRuleProto const * GetPathtext() const { return &m_pathtext; }
+};
+
+class Shield : public BaseRule
+{
+  ShieldRuleProto m_shield;
+
+public:
+  explicit Shield(ShieldRuleProto const & r) : m_shield(r) {}
+
+  virtual ShieldRuleProto const * GetShield() const { return &m_shield; }
+};
+}  // namespace proto_rules
+
+class DoSetIndex
+{
+public:
+  ContainerProto m_cont;
+
+private:
+  vector<string> m_names;
+
+  typedef ClassifElementProto ElementT;
+
+  class RandI : public boost::iterator_facade<RandI, ElementT const, boost::random_access_traversal_tag>
   {
-  public:
-    ContainerProto m_cont;
-
-  private:
-    vector<string> m_names;
-
-    typedef ClassifElementProto ElementT;
-
-    class RandI : public boost::iterator_facade<
-        RandI,
-        ElementT const,
-        boost::random_access_traversal_tag>
-    {
-      ContainerProto const * m_cont;
-    public:
-      int m_index;
-
-      RandI() : m_cont(0), m_index(-1) {}
-      RandI(ContainerProto const & cont, int ind) : m_cont(&cont), m_index(ind) {}
-
-      ElementT const & dereference() const { return m_cont->cont(m_index); }
-      bool equal(RandI const & r) const { return m_index == r.m_index; }
-      void increment() { ++m_index; }
-      void decrement() { --m_index; }
-      void advance(size_t n) { m_index += n; }
-      difference_type distance_to(RandI const & r) const { return (r.m_index - m_index); }
-    };
-
-    struct less_name
-    {
-      bool operator() (ElementT const & e1, ElementT const & e2) const
-      {
-        return (e1.name() < e2.name());
-      }
-      bool operator() (string const & e1, ElementT const & e2) const
-      {
-        return (e1 < e2.name());
-      }
-      bool operator() (ElementT const & e1, string const & e2) const
-      {
-        return (e1.name() < e2);
-      }
-    };
-
-    int FindIndex() const
-    {
-      string name = m_names[0];
-      for (size_t i = 1; i < m_names.size(); ++i)
-        name = name + "-" + m_names[i];
-
-      int const count = m_cont.cont_size();
-      int const i = lower_bound(RandI(m_cont, 0), RandI(m_cont, count), name, less_name()).m_index;
-      ASSERT_GREATER_OR_EQUAL(i, 0, ());
-      ASSERT_LESS_OR_EQUAL(i, count, ());
-
-      if (i < count && m_cont.cont(i).name() == name)
-        return i;
-      else
-        return -1;
-    }
-
-    RulesHolder & m_holder;
-
-    template <class TRule, class TProtoRule>
-    void AddRule(ClassifObject * p, int scale, TypeT type, TProtoRule const & rule,
-                 vector<string> const & apply_if)
-    {
-      unique_ptr<ISelector> selector;
-      if (!apply_if.empty())
-      {
-        selector = ParseSelector(apply_if);
-        if (selector == nullptr)
-        {
-          LOG(LERROR, ("Runtime selector has not been created:", apply_if));
-          return;
-        }
-      }
-
-      BaseRule * obj = new TRule(rule);
-      obj->SetSelector(std::move(selector));
-      Key k = m_holder.AddRule(scale, type, obj);
-      p->SetVisibilityOnScale(true, scale);
-      k.SetPriority(rule.priority());
-      p->AddDrawRule(k);
-    }
-
-    static void DrawElementGetApplyIf(DrawElementProto const & de, vector<string> & apply_if)
-    {
-      apply_if.clear();
-      apply_if.reserve(de.apply_if_size());
-      for (int i = 0; i < de.apply_if_size(); ++i)
-        apply_if.emplace_back(de.apply_if(i));
-    }
+    ContainerProto const * m_cont;
 
   public:
-    explicit DoSetIndex(RulesHolder & holder)
-      : m_holder(holder) {}
+    int m_index;
 
-    void operator() (ClassifObject * p)
-    {
-      m_names.push_back(p->GetName());
+    RandI() : m_cont(0), m_index(-1) {}
+    RandI(ContainerProto const & cont, int ind) : m_cont(&cont), m_index(ind) {}
 
-      int const i = FindIndex();
-      if (i != -1)
-      {
-        vector<string> apply_if;
-
-        ClassifElementProto const & ce = m_cont.cont(i);
-        for (int j = 0; j < ce.element_size(); ++j)
-        {
-          DrawElementProto const & de = ce.element(j);
-
-          using namespace proto_rules;
-
-          DrawElementGetApplyIf(de, apply_if);
-
-          for (int k = 0; k < de.lines_size(); ++k)
-            AddRule<Line>(p, de.scale(), line, de.lines(k), apply_if);
-
-          if (de.has_area())
-            AddRule<Area>(p, de.scale(), area, de.area(), apply_if);
-
-          if (de.has_symbol())
-            AddRule<Symbol>(p, de.scale(), symbol, de.symbol(), apply_if);
-
-          if (de.has_caption())
-            AddRule<Caption>(p, de.scale(), caption, de.caption(), apply_if);
-
-          if (de.has_path_text())
-            AddRule<PathText>(p, de.scale(), pathtext, de.path_text(), apply_if);
-
-          if (de.has_shield())
-            AddRule<Shield>(p, de.scale(), shield, de.shield(), apply_if);
-        }
-      }
-
-      p->ForEachObject(ref(*this));
-
-      m_names.pop_back();
-    }
+    ElementT const & dereference() const { return m_cont->cont(m_index); }
+    bool equal(RandI const & r) const { return m_index == r.m_index; }
+    void increment() { ++m_index; }
+    void decrement() { --m_index; }
+    void advance(size_t n) { m_index += n; }
+    difference_type distance_to(RandI const & r) const { return (r.m_index - m_index); }
   };
-} // namespace
+
+  struct less_name
+  {
+    bool operator()(ElementT const & e1, ElementT const & e2) const { return (e1.name() < e2.name()); }
+    bool operator()(string const & e1, ElementT const & e2) const { return (e1 < e2.name()); }
+    bool operator()(ElementT const & e1, string const & e2) const { return (e1.name() < e2); }
+  };
+
+  int FindIndex() const
+  {
+    string name = m_names[0];
+    for (size_t i = 1; i < m_names.size(); ++i)
+      name = name + "-" + m_names[i];
+
+    int const count = m_cont.cont_size();
+    int const i = lower_bound(RandI(m_cont, 0), RandI(m_cont, count), name, less_name()).m_index;
+    ASSERT_GREATER_OR_EQUAL(i, 0, ());
+    ASSERT_LESS_OR_EQUAL(i, count, ());
+
+    if (i < count && m_cont.cont(i).name() == name)
+      return i;
+    else
+      return -1;
+  }
+
+  RulesHolder & m_holder;
+
+  template <class TRule, class TProtoRule>
+  void AddRule(ClassifObject * p, int scale, TypeT type, TProtoRule const & rule, vector<string> const & apply_if)
+  {
+    unique_ptr<ISelector> selector;
+    if (!apply_if.empty())
+    {
+      selector = ParseSelector(apply_if);
+      if (selector == nullptr)
+      {
+        LOG(LERROR, ("Runtime selector has not been created:", apply_if));
+        return;
+      }
+    }
+
+    BaseRule * obj = new TRule(rule);
+    obj->SetSelector(std::move(selector));
+    Key k = m_holder.AddRule(scale, type, obj);
+    p->SetVisibilityOnScale(true, scale);
+    k.SetPriority(rule.priority());
+    p->AddDrawRule(k);
+  }
+
+  static void DrawElementGetApplyIf(DrawElementProto const & de, vector<string> & apply_if)
+  {
+    apply_if.clear();
+    apply_if.reserve(de.apply_if_size());
+    for (int i = 0; i < de.apply_if_size(); ++i)
+      apply_if.emplace_back(de.apply_if(i));
+  }
+
+public:
+  explicit DoSetIndex(RulesHolder & holder) : m_holder(holder) {}
+
+  void operator()(ClassifObject * p)
+  {
+    m_names.push_back(p->GetName());
+
+    int const i = FindIndex();
+    if (i != -1)
+    {
+      vector<string> apply_if;
+
+      ClassifElementProto const & ce = m_cont.cont(i);
+      for (int j = 0; j < ce.element_size(); ++j)
+      {
+        DrawElementProto const & de = ce.element(j);
+
+        using namespace proto_rules;
+
+        DrawElementGetApplyIf(de, apply_if);
+
+        for (int k = 0; k < de.lines_size(); ++k)
+          AddRule<Line>(p, de.scale(), line, de.lines(k), apply_if);
+
+        if (de.has_area())
+          AddRule<Area>(p, de.scale(), area, de.area(), apply_if);
+
+        if (de.has_symbol())
+          AddRule<Symbol>(p, de.scale(), symbol, de.symbol(), apply_if);
+
+        if (de.has_caption())
+          AddRule<Caption>(p, de.scale(), caption, de.caption(), apply_if);
+
+        if (de.has_path_text())
+          AddRule<PathText>(p, de.scale(), pathtext, de.path_text(), apply_if);
+
+        if (de.has_shield())
+          AddRule<Shield>(p, de.scale(), shield, de.shield(), apply_if);
+      }
+    }
+
+    p->ForEachObject(ref(*this));
+
+    m_names.pop_back();
+  }
+};
+}  // namespace
 
 void RulesHolder::InitBackgroundColors(ContainerProto const & cont)
 {
@@ -385,7 +371,7 @@ void RulesHolder::InitBackgroundColors(ContainerProto const & cont)
     }
   }
 
-  ASSERT_EQUAL(m_bgColors.size(), scales::UPPER_STYLE_SCALE+1, ());
+  ASSERT_EQUAL(m_bgColors.size(), scales::UPPER_STYLE_SCALE + 1, ());
   for (int scale = 0; scale <= scales::UPPER_STYLE_SCALE; ++scale)
   {
     auto const i = bgColorForScale.find(scale);
@@ -415,7 +401,7 @@ void RulesHolder::LoadFromBinaryProto(string const & s)
 
   DoSetIndex doSet(*this);
 
-  CHECK ( doSet.m_cont.ParseFromString(s), ("Error in proto loading!") );
+  CHECK(doSet.m_cont.ParseFromString(s), ("Error in proto loading!"));
 
   classif().GetMutableRoot()->ForEachObject(ref(doSet));
 
@@ -430,4 +416,4 @@ void LoadRules()
   rules().LoadFromBinaryProto(buffer);
 }
 
-} // namespace drule
+}  // namespace drule
diff --git a/libs/indexer/drawing_rules.hpp b/libs/indexer/drawing_rules.hpp
index 658a8768a..e08dfcb30 100644
--- a/libs/indexer/drawing_rules.hpp
+++ b/libs/indexer/drawing_rules.hpp
@@ -25,71 +25,71 @@ class ShieldRuleProto;
 class ContainerProto;
 class FeatureType;
 
-
 namespace drule
 {
-  class BaseRule
-  {
-  public:
-    BaseRule() = default;
-    virtual ~BaseRule() = default;
+class BaseRule
+{
+public:
+  BaseRule() = default;
+  virtual ~BaseRule() = default;
 
-    virtual LineRuleProto const * GetLine() const;
-    virtual AreaRuleProto const * GetArea() const;
-    virtual SymbolRuleProto const * GetSymbol() const;
-    virtual CaptionRuleProto const * GetCaption() const;
-    virtual PathTextRuleProto const * GetPathtext() const;
-    virtual ShieldRuleProto const * GetShield() const;
+  virtual LineRuleProto const * GetLine() const;
+  virtual AreaRuleProto const * GetArea() const;
+  virtual SymbolRuleProto const * GetSymbol() const;
+  virtual CaptionRuleProto const * GetCaption() const;
+  virtual PathTextRuleProto const * GetPathtext() const;
+  virtual ShieldRuleProto const * GetShield() const;
 
-    // Test feature by runtime feature style selector
-    // Returns true if rule is applicable for feature, otherwise it returns false
-    bool TestFeature(FeatureType & ft, int zoom) const;
+  // Test feature by runtime feature style selector
+  // Returns true if rule is applicable for feature, otherwise it returns false
+  bool TestFeature(FeatureType & ft, int zoom) const;
 
-    // Set runtime feature style selector
-    void SetSelector(std::unique_ptr<ISelector> && selector);
+  // Set runtime feature style selector
+  void SetSelector(std::unique_ptr<ISelector> && selector);
 
-  private:
-    std::unique_ptr<ISelector> m_selector;
-  };
+private:
+  std::unique_ptr<ISelector> m_selector;
+};
 
-  class RulesHolder
-  {
-  public:
-    RulesHolder();
-    ~RulesHolder();
+class RulesHolder
+{
+public:
+  RulesHolder();
+  ~RulesHolder();
 
-    Key AddRule(int scale, TypeT type, BaseRule * p);
+  Key AddRule(int scale, TypeT type, BaseRule * p);
 
-    BaseRule const * Find(Key const & k) const;
+  BaseRule const * Find(Key const & k) const;
 
-    uint32_t GetBgColor(int scale) const;
-    uint32_t GetColor(std::string const & name) const;
+  uint32_t GetBgColor(int scale) const;
+  uint32_t GetColor(std::string const & name) const;
 
 #ifdef OMIM_OS_DESKTOP
-    void LoadFromTextProto(std::string const & buffer);
-    static void SaveToBinaryProto(std::string const & buffer, std::ostream & s);
+  void LoadFromTextProto(std::string const & buffer);
+  static void SaveToBinaryProto(std::string const & buffer, std::ostream & s);
 #endif
 
-    void LoadFromBinaryProto(std::string const & s);
+  void LoadFromBinaryProto(std::string const & s);
 
-    template <class ToDo> void ForEachRule(ToDo && toDo)
-    {
-      for (auto const dRule : m_dRules)
-        toDo(dRule);
-    }
+  template <class ToDo>
+  void ForEachRule(ToDo && toDo)
+  {
+    for (auto const dRule : m_dRules)
+      toDo(dRule);
+  }
 
-  private:
-    void InitBackgroundColors(ContainerProto const & cp);
-    void InitColors(ContainerProto const & cp);
-    void Clean();
+private:
+  void InitBackgroundColors(ContainerProto const & cp);
+  void InitColors(ContainerProto const & cp);
+  void Clean();
 
-    /// background color for scales in range [0...scales::UPPER_STYLE_SCALE]
-    std::vector<uint32_t> m_bgColors;
-    std::unordered_map<std::string, uint32_t> m_colors;
-    std::vector<BaseRule *> m_dRules;
-  };
+  /// background color for scales in range [0...scales::UPPER_STYLE_SCALE]
+  std::vector<uint32_t> m_bgColors;
+  std::unordered_map<std::string, uint32_t> m_colors;
+  std::vector<BaseRule *> m_dRules;
+};
 
-  RulesHolder & rules();
+RulesHolder & rules();
 
-  void LoadRules();
-}
+void LoadRules();
+}  // namespace drule
diff --git a/libs/indexer/drules_selector.cpp b/libs/indexer/drules_selector.cpp
index 6ca52d4a1..543f2aa21 100644
--- a/libs/indexer/drules_selector.cpp
+++ b/libs/indexer/drules_selector.cpp
@@ -17,15 +17,9 @@ namespace
 class CompositeSelector : public ISelector
 {
 public:
-  explicit CompositeSelector(size_t capacity)
-  {
-    m_selectors.reserve(capacity);
-  }
+  explicit CompositeSelector(size_t capacity) { m_selectors.reserve(capacity); }
 
-  void Add(unique_ptr<ISelector> && selector)
-  {
-    m_selectors.emplace_back(std::move(selector));
-  }
+  void Add(unique_ptr<ISelector> && selector) { m_selectors.emplace_back(std::move(selector)); }
 
   // ISelector overrides:
   bool Test(FeatureType & ft, int zoom) const override
@@ -49,7 +43,9 @@ public:
   typedef bool (*TGetFeatureTagValueFn)(FeatureType &, int, TType & value);
 
   Selector(TGetFeatureTagValueFn fn, SelectorOperatorType op, TType const & value)
-    : m_getFeatureValueFn(fn), m_evalFn(nullptr), m_value(value)
+    : m_getFeatureValueFn(fn)
+    , m_evalFn(nullptr)
+    , m_value(value)
   {
     ASSERT(fn != nullptr, ());
 
@@ -104,17 +100,15 @@ public:
   typedef bool (*THasFeatureTagValueFn)(FeatureType &, int);
 
   HasSelector(THasFeatureTagValueFn fn, SelectorOperatorType op)
-  : m_hasFeatureValueFn(fn), m_testHas(op == SelectorOperatorIsSet)
+    : m_hasFeatureValueFn(fn)
+    , m_testHas(op == SelectorOperatorIsSet)
   {
     ASSERT(op == SelectorOperatorIsSet || op == SelectorOperatorIsNotSet, ());
     ASSERT(fn != nullptr, ());
   }
 
   // ISelector overrides:
-  bool Test(FeatureType & ft, int zoom) const override
-  {
-    return m_hasFeatureValueFn(ft, zoom) == m_testHas;
-  }
+  bool Test(FeatureType & ft, int zoom) const override { return m_hasFeatureValueFn(ft, zoom) == m_testHas; }
 
 private:
   THasFeatureTagValueFn m_hasFeatureValueFn;
@@ -215,18 +209,18 @@ unique_ptr<ISelector> ParseSelector(string const & str)
     }
     return make_unique<Selector<double>>(&GetBoundingBoxArea, e.m_operator, value);
   }
-//  else if (e.m_tag == "extra_tag")
-//  {
-//    ASSERT(false, ());
-//    uint32_t const type = TagSelectorToType(e.m_value);
-//    if (type == Classificator::INVALID_TYPE)
-//    {
-//      // Type was not found.
-//      LOG(LDEBUG, ("Invalid selector:", str));
-//      return unique_ptr<ISelector>();
-//    }
-//    return make_unique<TypeSelector>(type, e.m_operator);
-//  }
+  //  else if (e.m_tag == "extra_tag")
+  //  {
+  //    ASSERT(false, ());
+  //    uint32_t const type = TagSelectorToType(e.m_value);
+  //    if (type == Classificator::INVALID_TYPE)
+  //    {
+  //      // Type was not found.
+  //      LOG(LDEBUG, ("Invalid selector:", str));
+  //      return unique_ptr<ISelector>();
+  //    }
+  //    return make_unique<TypeSelector>(type, e.m_operator);
+  //  }
 
   LOG(LERROR, ("Unrecognized selector:", str));
   return {};
diff --git a/libs/indexer/drules_selector_parser.cpp b/libs/indexer/drules_selector_parser.cpp
index 6e7633ca7..7e976754a 100644
--- a/libs/indexer/drules_selector_parser.cpp
+++ b/libs/indexer/drules_selector_parser.cpp
@@ -15,10 +15,8 @@ bool IsTag(string const & str)
 {
   // tag consists of a-z or A-Z letters or _ and not empty
   for (auto const c : str)
-  {
     if (!(c >= 'a' && c <= 'z') && !(c >= 'A' && c <= 'Z') && c != '_')
       return false;
-  }
   return !str.empty();
 }
 
@@ -38,14 +36,14 @@ bool ParseSelector(string const & str, SelectorExpression & e)
   // [tag]
 
   if (str.empty())
-    return false; // invalid format
+    return false;  // invalid format
 
   // [!tag]
   if (str[0] == '!')
   {
     string tag(str.begin() + 1, str.end());
     if (!IsTag(tag))
-      return false; // invalid format
+      return false;  // invalid format
 
     e.m_operator = SelectorOperatorIsNotSet;
     e.m_tag = std::move(tag);
@@ -65,7 +63,7 @@ bool ParseSelector(string const & str, SelectorExpression & e)
   // Find first entrance of >, < or =
   size_t pos = string::npos;
   size_t len = 0;
-  char const c[] = { '>', '<', '=', 0 };
+  char const c[] = {'>', '<', '=', 0};
   for (size_t i = 0; c[i] != 0; ++i)
   {
     size_t p = str.find(c[i]);
@@ -77,15 +75,15 @@ bool ParseSelector(string const & str, SelectorExpression & e)
   }
 
   // If there is no entrance or no space for tag or value then it is invalid format
-  if (pos == 0 || len == 0 || pos == str.size()-1)
-    return false; // invalid format
+  if (pos == 0 || len == 0 || pos == str.size() - 1)
+    return false;  // invalid format
 
   // Dedicate the operator type, real operator position and length
   SelectorOperatorType op = SelectorOperatorUnknown;
   if (str[pos] == '>')
   {
     op = SelectorOperatorGreater;
-    if (str[pos+1] == '=')
+    if (str[pos + 1] == '=')
     {
       ++len;
       op = SelectorOperatorGreaterOrEqual;
@@ -94,7 +92,7 @@ bool ParseSelector(string const & str, SelectorExpression & e)
   else if (str[pos] == '<')
   {
     op = SelectorOperatorLess;
-    if (str[pos+1] == '=')
+    if (str[pos + 1] == '=')
     {
       ++len;
       op = SelectorOperatorLessOrEqual;
@@ -104,7 +102,7 @@ bool ParseSelector(string const & str, SelectorExpression & e)
   {
     ASSERT(str[pos] == '=', ());
     op = SelectorOperatorEqual;
-    if (str[pos-1] == '!')
+    if (str[pos - 1] == '!')
     {
       --pos;
       ++len;
@@ -114,7 +112,7 @@ bool ParseSelector(string const & str, SelectorExpression & e)
 
   string tag(str.begin(), str.begin() + pos);
   if (!IsTag(tag))
-    return false; // invalid format
+    return false;  // invalid format
 
   e.m_operator = op;
   e.m_tag = std::move(tag);
diff --git a/libs/indexer/edit_journal.cpp b/libs/indexer/edit_journal.cpp
index 96ffc5c53..0156f0ec2 100644
--- a/libs/indexer/edit_journal.cpp
+++ b/libs/indexer/edit_journal.cpp
@@ -10,116 +10,120 @@
 
 namespace osm
 {
-  std::list<JournalEntry> const & EditJournal::GetJournal() const
-  {
-    return m_journal;
-  }
+std::list<JournalEntry> const & EditJournal::GetJournal() const
+{
+  return m_journal;
+}
 
-  osm::EditingLifecycle EditJournal::GetEditingLifecycle() const
-  {
-    if (m_journal.empty())
-      return EditingLifecycle::IN_SYNC;
+osm::EditingLifecycle EditJournal::GetEditingLifecycle() const
+{
+  if (m_journal.empty())
+    return EditingLifecycle::IN_SYNC;
 
-    else if (m_journal.front().journalEntryType == JournalEntryType::ObjectCreated)
-      return EditingLifecycle::CREATED;
+  else if (m_journal.front().journalEntryType == JournalEntryType::ObjectCreated)
+    return EditingLifecycle::CREATED;
 
-    return EditingLifecycle::MODIFIED;
-  }
+  return EditingLifecycle::MODIFIED;
+}
 
-  void EditJournal::AddTagChange(std::string key, std::string old_value, std::string new_value)
-  {
-    LOG(LDEBUG, ("Key ", key, "changed from \"", old_value, "\" to \"", new_value, "\""));
-    AddJournalEntry({JournalEntryType::TagModification, time(nullptr), TagModData{std::move(key), std::move(old_value), std::move(new_value)}});
-  }
+void EditJournal::AddTagChange(std::string key, std::string old_value, std::string new_value)
+{
+  LOG(LDEBUG, ("Key ", key, "changed from \"", old_value, "\" to \"", new_value, "\""));
+  AddJournalEntry({JournalEntryType::TagModification, time(nullptr),
+                   TagModData{std::move(key), std::move(old_value), std::move(new_value)}});
+}
 
-  void EditJournal::MarkAsCreated(uint32_t type, feature::GeomType geomType, m2::PointD mercator)
-  {
-    ASSERT(m_journal.empty(), ("Only empty journals can be marked as created"));
-    LOG(LDEBUG, ("Object of type ", classif().GetReadableObjectName(type), " created"));
-    AddJournalEntry({JournalEntryType::ObjectCreated, time(nullptr), osm::ObjCreateData{type, geomType, mercator}});
-  }
+void EditJournal::MarkAsCreated(uint32_t type, feature::GeomType geomType, m2::PointD mercator)
+{
+  ASSERT(m_journal.empty(), ("Only empty journals can be marked as created"));
+  LOG(LDEBUG, ("Object of type ", classif().GetReadableObjectName(type), " created"));
+  AddJournalEntry({JournalEntryType::ObjectCreated, time(nullptr), osm::ObjCreateData{type, geomType, mercator}});
+}
 
-  void EditJournal::AddJournalEntry(JournalEntry entry)
-  {
-    m_journal.push_back(std::move(entry));
-  }
+void EditJournal::AddJournalEntry(JournalEntry entry)
+{
+  m_journal.push_back(std::move(entry));
+}
 
-  void EditJournal::Clear()
-  {
-    for (JournalEntry & entry : m_journal)
-      m_journalHistory.push_back(std::move(entry));
-
-    m_journal = {};
-  }
-
-  std::list<JournalEntry> const & EditJournal::GetJournalHistory() const
-  {
-    return m_journalHistory;
-  }
-
-  void EditJournal::AddJournalHistoryEntry(JournalEntry entry)
-  {
+void EditJournal::Clear()
+{
+  for (JournalEntry & entry : m_journal)
     m_journalHistory.push_back(std::move(entry));
-  }
 
-  std::string EditJournal::JournalToString() const
+  m_journal = {};
+}
+
+std::list<JournalEntry> const & EditJournal::GetJournalHistory() const
+{
+  return m_journalHistory;
+}
+
+void EditJournal::AddJournalHistoryEntry(JournalEntry entry)
+{
+  m_journalHistory.push_back(std::move(entry));
+}
+
+std::string EditJournal::JournalToString() const
+{
+  std::string string;
+  std::for_each(m_journal.begin(), m_journal.end(),
+                [&](auto const & journalEntry) { string += ToString(journalEntry) + "\n"; });
+  return string;
+}
+
+std::string EditJournal::ToString(osm::JournalEntry const & journalEntry)
+{
+  switch (journalEntry.journalEntryType)
   {
-    std::string string;
-    std::for_each(m_journal.begin(), m_journal.end(), [&](auto const & journalEntry) {
-      string += ToString(journalEntry) + "\n";
-    });
-    return string;
-  }
-
-  std::string EditJournal::ToString(osm::JournalEntry const & journalEntry)
+  case osm::JournalEntryType::TagModification:
   {
-    switch (journalEntry.journalEntryType)
-    {
-      case osm::JournalEntryType::TagModification:
-      {
-        TagModData const & tagModData = std::get<TagModData>(journalEntry.data);
-        return ToString(journalEntry.journalEntryType)
-            .append(": Key ").append(tagModData.key)
-            .append(" changed from \"").append(tagModData.old_value)
-            .append("\" to \"").append(tagModData.new_value).append("\"");
-      }
-      case osm::JournalEntryType::ObjectCreated:
-      {
-        ObjCreateData const & objCreatedData = std::get<ObjCreateData>(journalEntry.data);
-        return ToString(journalEntry.journalEntryType)
-            .append(": ").append(classif().GetReadableObjectName(objCreatedData.type))
-            .append(" (").append(std::to_string(objCreatedData.type)).append(")");
-      }
-      case osm::JournalEntryType::LegacyObject:
-      {
-        LegacyObjData const & legacyObjData = std::get<LegacyObjData>(journalEntry.data);
-        return ToString(journalEntry.journalEntryType)
-            .append(": version=\"").append(legacyObjData.version).append("\"");
-      }
-    }
+    TagModData const & tagModData = std::get<TagModData>(journalEntry.data);
+    return ToString(journalEntry.journalEntryType)
+        .append(": Key ")
+        .append(tagModData.key)
+        .append(" changed from \"")
+        .append(tagModData.old_value)
+        .append("\" to \"")
+        .append(tagModData.new_value)
+        .append("\"");
   }
-
-  std::string EditJournal::ToString(osm::JournalEntryType journalEntryType)
+  case osm::JournalEntryType::ObjectCreated:
   {
-    switch (journalEntryType)
-    {
-      case osm::JournalEntryType::TagModification:
-        return "TagModification";
-      case osm::JournalEntryType::ObjectCreated:
-        return "ObjectCreated";
-      case osm::JournalEntryType::LegacyObject:
-        return "LegacyObject";
-    }
+    ObjCreateData const & objCreatedData = std::get<ObjCreateData>(journalEntry.data);
+    return ToString(journalEntry.journalEntryType)
+        .append(": ")
+        .append(classif().GetReadableObjectName(objCreatedData.type))
+        .append(" (")
+        .append(std::to_string(objCreatedData.type))
+        .append(")");
+  }
+  case osm::JournalEntryType::LegacyObject:
+  {
+    LegacyObjData const & legacyObjData = std::get<LegacyObjData>(journalEntry.data);
+    return ToString(journalEntry.journalEntryType).append(": version=\"").append(legacyObjData.version).append("\"");
   }
-
-  std::optional<JournalEntryType> EditJournal::TypeFromString(std::string const & entryType) {
-    if (entryType == "TagModification")
-      return JournalEntryType::TagModification;
-    else if (entryType == "ObjectCreated")
-      return JournalEntryType::ObjectCreated;
-    else if (entryType == "LegacyObject")
-      return JournalEntryType::LegacyObject;
-    else
-      return {};
   }
 }
+
+std::string EditJournal::ToString(osm::JournalEntryType journalEntryType)
+{
+  switch (journalEntryType)
+  {
+  case osm::JournalEntryType::TagModification: return "TagModification";
+  case osm::JournalEntryType::ObjectCreated: return "ObjectCreated";
+  case osm::JournalEntryType::LegacyObject: return "LegacyObject";
+  }
+}
+
+std::optional<JournalEntryType> EditJournal::TypeFromString(std::string const & entryType)
+{
+  if (entryType == "TagModification")
+    return JournalEntryType::TagModification;
+  else if (entryType == "ObjectCreated")
+    return JournalEntryType::ObjectCreated;
+  else if (entryType == "LegacyObject")
+    return JournalEntryType::LegacyObject;
+  else
+    return {};
+}
+}  // namespace osm
diff --git a/libs/indexer/edit_journal.hpp b/libs/indexer/edit_journal.hpp
index 44d0e25fd..2e1cf5b24 100644
--- a/libs/indexer/edit_journal.hpp
+++ b/libs/indexer/edit_journal.hpp
@@ -11,79 +11,79 @@
 
 namespace osm
 {
-  enum class JournalEntryType
-  {
-    TagModification,
-    ObjectCreated,
-    LegacyObject,   //object without full journal history, used for transition to new editor
-    //Possible future values: ObjectDeleted, ObjectDisused, ObjectNotDisused, LocationChanged, FeatureTypeChanged
-  };
+enum class JournalEntryType
+{
+  TagModification,
+  ObjectCreated,
+  LegacyObject,  // object without full journal history, used for transition to new editor
+  // Possible future values: ObjectDeleted, ObjectDisused, ObjectNotDisused, LocationChanged, FeatureTypeChanged
+};
 
-  struct TagModData
-  {
-    std::string key;
-    std::string old_value;
-    std::string new_value;
-  };
+struct TagModData
+{
+  std::string key;
+  std::string old_value;
+  std::string new_value;
+};
 
-  struct ObjCreateData
-  {
-    uint32_t type;
-    feature::GeomType geomType;
-    m2::PointD mercator;
-  };
+struct ObjCreateData
+{
+  uint32_t type;
+  feature::GeomType geomType;
+  m2::PointD mercator;
+};
 
-  struct LegacyObjData
-  {
-    std::string version;
-  };
+struct LegacyObjData
+{
+  std::string version;
+};
 
-  struct JournalEntry
-  {
-    JournalEntryType journalEntryType = JournalEntryType::TagModification;
-    time_t timestamp;
-    std::variant<TagModData, ObjCreateData, LegacyObjData> data;
-  };
+struct JournalEntry
+{
+  JournalEntryType journalEntryType = JournalEntryType::TagModification;
+  time_t timestamp;
+  std::variant<TagModData, ObjCreateData, LegacyObjData> data;
+};
 
-  /// Used to determine whether existing OSM object should be updated or new one created
-  enum class EditingLifecycle
-  {
-    CREATED,      //newly created and not synced with OSM
-    MODIFIED,     //modified and not synced with OSM
-    IN_SYNC       //synced with OSM (including never edited)
-  };
+/// Used to determine whether existing OSM object should be updated or new one created
+enum class EditingLifecycle
+{
+  CREATED,   // newly created and not synced with OSM
+  MODIFIED,  // modified and not synced with OSM
+  IN_SYNC    // synced with OSM (including never edited)
+};
 
-  class EditJournal
-  {
-    std::list<JournalEntry> m_journal{};
-    std::list<JournalEntry> m_journalHistory{};
+class EditJournal
+{
+  std::list<JournalEntry> m_journal{};
+  std::list<JournalEntry> m_journalHistory{};
 
-  public:
-    std::list<JournalEntry> const & GetJournal() const;
+public:
+  std::list<JournalEntry> const & GetJournal() const;
 
-    osm::EditingLifecycle GetEditingLifecycle() const;
+  osm::EditingLifecycle GetEditingLifecycle() const;
 
-    /// Log object edits in the journal
-    void AddTagChange(std::string key, std::string old_value, std::string new_value);
+  /// Log object edits in the journal
+  void AddTagChange(std::string key, std::string old_value, std::string new_value);
 
-    /// Log object creation in the journal
-    void MarkAsCreated(uint32_t type, feature::GeomType geomType, m2::PointD mercator);
+  /// Log object creation in the journal
+  void MarkAsCreated(uint32_t type, feature::GeomType geomType, m2::PointD mercator);
 
-    void AddJournalEntry(JournalEntry entry);
+  void AddJournalEntry(JournalEntry entry);
 
-    /// Clear Journal and move content to journalHistory, used after upload to OSM
-    void Clear();
+  /// Clear Journal and move content to journalHistory, used after upload to OSM
+  void Clear();
 
-    std::list<JournalEntry> const & GetJournalHistory() const;
+  std::list<JournalEntry> const & GetJournalHistory() const;
 
-    void AddJournalHistoryEntry(JournalEntry entry);
+  void AddJournalHistoryEntry(JournalEntry entry);
 
-    std::string JournalToString() const;
+  std::string JournalToString() const;
 
-    static std::string ToString(osm::JournalEntry const & journalEntry);
+  static std::string ToString(osm::JournalEntry const & journalEntry);
 
-    static std::string ToString(osm::JournalEntryType journalEntryType);
+  static std::string ToString(osm::JournalEntryType journalEntryType);
 
-    static std::optional<JournalEntryType> TypeFromString(std::string const & entryType);
-  };
-}
+  static std::optional<JournalEntryType> TypeFromString(std::string const & entryType);
+};
+}  // namespace osm
diff --git a/libs/indexer/editable_map_object.cpp b/libs/indexer/editable_map_object.cpp
index aca814913..b5c2538ad 100644
--- a/libs/indexer/editable_map_object.cpp
+++ b/libs/indexer/editable_map_object.cpp
@@ -1,10 +1,10 @@
 #include "indexer/editable_map_object.hpp"
 
 #include "indexer/classificator.hpp"
+#include "indexer/edit_journal.hpp"
 #include "indexer/ftypes_matcher.hpp"
 #include "indexer/postcodes_matcher.hpp"
 #include "indexer/validate_and_format_contacts.hpp"
-#include "indexer/edit_journal.hpp"
 
 #include "platform/preferred_languages.hpp"
 
@@ -22,19 +22,14 @@ using namespace std;
 
 namespace
 {
-bool ExtractName(StringUtf8Multilang const & names, int8_t const langCode,
-                 vector<osm::LocalizedName> & result)
+bool ExtractName(StringUtf8Multilang const & names, int8_t const langCode, vector<osm::LocalizedName> & result)
 {
   if (StringUtf8Multilang::kUnsupportedLanguageCode == langCode)
-  {
     return false;
-  }
 
   // Exclude languages that are already present.
-  auto const it = base::FindIf(result, [langCode](osm::LocalizedName const & localizedName)
-  {
-    return localizedName.m_code == langCode;
-  });
+  auto const it = base::FindIf(
+      result, [langCode](osm::LocalizedName const & localizedName) { return localizedName.m_code == langCode; });
 
   if (result.end() != it)
     return false;
@@ -54,21 +49,25 @@ LocalizedName::LocalizedName(int8_t const code, string_view name)
   , m_lang(StringUtf8Multilang::GetLangByCode(code))
   , m_langName(StringUtf8Multilang::GetLangNameByCode(code))
   , m_name(name)
-{
-}
+{}
 
 LocalizedName::LocalizedName(string const & langCode, string const & name)
   : m_code(StringUtf8Multilang::GetLangIndex(langCode))
   , m_lang(StringUtf8Multilang::GetLangByCode(m_code))
   , m_langName(StringUtf8Multilang::GetLangNameByCode(m_code))
   , m_name(name)
-{
-}
+{}
 
 // EditableMapObject -------------------------------------------------------------------------------
 
-bool EditableMapObject::IsNameEditable() const { return m_editableProperties.m_name; }
-bool EditableMapObject::IsAddressEditable() const { return m_editableProperties.m_address; }
+bool EditableMapObject::IsNameEditable() const
+{
+  return m_editableProperties.m_name;
+}
+bool EditableMapObject::IsAddressEditable() const
+{
+  return m_editableProperties.m_address;
+}
 
 vector<MapObject::MetadataID> EditableMapObject::GetEditableProperties() const
 {
@@ -103,8 +102,7 @@ NamesDataSource EditableMapObject::GetNamesDataSource()
 
 // static
 NamesDataSource EditableMapObject::GetNamesDataSource(StringUtf8Multilang const & source,
-                                                      vector<int8_t> const & mwmLanguages,
-                                                      int8_t const userLangCode)
+                                                      vector<int8_t> const & mwmLanguages, int8_t const userLangCode)
 {
   NamesDataSource result;
   auto & names = result.names;
@@ -119,9 +117,8 @@ NamesDataSource EditableMapObject::GetNamesDataSource(StringUtf8Multilang const
   {
     auto const mandatoryNamesEnd = names.begin() + mandatoryCount;
     // Exclude languages which are already in container (languages with top priority).
-    auto const it = find_if(
-        names.begin(), mandatoryNamesEnd,
-        [code](LocalizedName const & localizedName) { return localizedName.m_code == code; });
+    auto const it = find_if(names.begin(), mandatoryNamesEnd,
+                            [code](LocalizedName const & localizedName) { return localizedName.m_code == code; });
 
     if (mandatoryNamesEnd == it)
       names.emplace_back(code, name);
@@ -130,7 +127,10 @@ NamesDataSource EditableMapObject::GetNamesDataSource(StringUtf8Multilang const
   return result;
 }
 
-vector<LocalizedStreet> const & EditableMapObject::GetNearbyStreets() const { return m_nearbyStreets; }
+vector<LocalizedStreet> const & EditableMapObject::GetNearbyStreets() const
+{
+  return m_nearbyStreets;
+}
 
 void EditableMapObject::ForEachMetadataItem(function<void(string_view tag, string_view value)> const & fn) const
 {
@@ -156,7 +156,8 @@ void EditableMapObject::ForEachMetadataItem(function<void(string_view tag, strin
     case MetadataID::FMD_PRICE_RATES:
     case MetadataID::FMD_RATINGS:
     case MetadataID::FMD_EXTERNAL_URI:
-    case MetadataID::FMD_WHEELCHAIR:    // Value is runtime only, data is taken from the classificator types, should not be used to update the OSM database
+    case MetadataID::FMD_WHEELCHAIR:  // Value is runtime only, data is taken from the classificator types, should not
+                                      // be used to update the OSM database
       break;
     default: fn(ToString(type), value); break;
     }
@@ -173,7 +174,10 @@ void EditableMapObject::SetEditableProperties(osm::EditableProperties const & pr
   m_editableProperties = props;
 }
 
-void EditableMapObject::SetName(StringUtf8Multilang const & name) { m_name = name; }
+void EditableMapObject::SetName(StringUtf8Multilang const & name)
+{
+  m_name = name;
+}
 
 void EditableMapObject::SetName(string_view name, int8_t langCode)
 {
@@ -196,7 +200,10 @@ bool EditableMapObject::CanUseAsDefaultName(int8_t const lang, vector<int8_t> co
   return false;
 }
 
-void EditableMapObject::SetMercator(m2::PointD const & center) { m_mercator = center; }
+void EditableMapObject::SetMercator(m2::PointD const & center)
+{
+  m_mercator = center;
+}
 
 void EditableMapObject::SetType(uint32_t featureType)
 {
@@ -218,10 +225,19 @@ void EditableMapObject::SetType(uint32_t featureType)
   }
 }
 
-void EditableMapObject::SetTypes(feature::TypesHolder const & types) { m_types = types; }
+void EditableMapObject::SetTypes(feature::TypesHolder const & types)
+{
+  m_types = types;
+}
 
-void EditableMapObject::SetID(FeatureID const & fid) { m_featureID = fid; }
-void EditableMapObject::SetStreet(LocalizedStreet const & st) { m_street = st; }
+void EditableMapObject::SetID(FeatureID const & fid)
+{
+  m_featureID = fid;
+}
+void EditableMapObject::SetStreet(LocalizedStreet const & st)
+{
+  m_street = st;
+}
 
 void EditableMapObject::SetNearbyStreets(vector<LocalizedStreet> && streets)
 {
@@ -322,7 +338,10 @@ void EditableMapObject::SetInternet(feature::Internet internet)
     m_types.SafeAdd(wifiType);
 }
 
-LocalizedStreet const & EditableMapObject::GetStreet() const { return m_street; }
+LocalizedStreet const & EditableMapObject::GetStreet() const
+{
+  return m_street;
+}
 
 template <class T>
 void EditableMapObject::SetCuisinesImpl(vector<T> const & cuisines)
@@ -332,10 +351,8 @@ void EditableMapObject::SetCuisinesImpl(vector<T> const & cuisines)
   // Ignore cuisine types as these will be set from the cuisines param
   auto const & isCuisine = ftypes::IsCuisineChecker::Instance();
   for (uint32_t const type : m_types)
-  {
     if (!isCuisine(type))
       params.m_types.push_back(type);
-  }
 
   Classificator const & cl = classif();
   for (auto const & cuisine : cuisines)
@@ -357,7 +374,10 @@ void EditableMapObject::SetCuisines(std::vector<std::string> const & cuisines)
   SetCuisinesImpl(cuisines);
 }
 
-void EditableMapObject::SetPointType() { m_geomType = feature::GeomType::Point; }
+void EditableMapObject::SetPointType()
+{
+  m_geomType = feature::GeomType::Point;
+}
 
 void EditableMapObject::RemoveBlankNames()
 {
@@ -426,10 +446,8 @@ bool EditableMapObject::ValidateFlats(string const & flats)
       return false;
 
     for (auto const & rangeBorder : range)
-    {
       if (!all_of(begin(rangeBorder), end(rangeBorder), ::isalnum))
         return false;
-    }
   }
   return true;
 }
@@ -466,10 +484,7 @@ bool EditableMapObject::ValidatePhoneList(string const & phone)
 
   do
   {
-    last = find_if(curr, phone.end(), [](string::value_type const & ch)
-    {
-      return ch == ',' || ch == ';';
-    });
+    last = find_if(curr, phone.end(), [](string::value_type const & ch) { return ch == ',' || ch == ';'; });
 
     auto digitsCount = 0;
     string const symbols = "+-() ";
@@ -544,8 +559,7 @@ bool EditableMapObject::ValidateLevel(string const & level)
 
   auto constexpr kMinBuildingLevel = -9;
   double result;
-  return strings::to_double(level, result) && result > kMinBuildingLevel &&
-         result <= kMaximumLevelsEditableByUsers;
+  return strings::to_double(level, result) && result > kMinBuildingLevel && result <= kMaximumLevelsEditableByUsers;
 }
 
 // static
@@ -620,92 +634,93 @@ void EditableMapObject::ApplyEditsFromJournal(EditJournal const & editJournal)
 void EditableMapObject::ApplyJournalEntry(JournalEntry const & entry)
 {
   LOG(LDEBUG, ("Applying Journal Entry: ", osm::EditJournal::ToString(entry)));
-  //Todo
+  // Todo
   switch (entry.journalEntryType)
   {
-    case JournalEntryType::TagModification:
+  case JournalEntryType::TagModification:
+  {
+    TagModData const & tagModData = std::get<TagModData>(entry.data);
+
+    // Metadata
+    MetadataID type;
+    if (feature::Metadata::TypeFromString(tagModData.key, type))
     {
-      TagModData const & tagModData = std::get<TagModData>(entry.data);
-
-      //Metadata
-      MetadataID type;
-      if (feature::Metadata::TypeFromString(tagModData.key, type))
+      m_metadata.Set(type, tagModData.new_value);
+      if (type == MetadataID::FMD_INTERNET)
       {
-        m_metadata.Set(type, tagModData.new_value);
-        if (type == MetadataID::FMD_INTERNET)
-        {
-          uint32_t const wifiType = ftypes::IsWifiChecker::Instance().GetType();
-          if (tagModData.new_value == "wifi")
-            m_types.SafeAdd(wifiType);
-          else
-            m_types.Remove(wifiType);
-        }
-        break;
-      }
-
-      //Names
-      int8_t langCode = StringUtf8Multilang::GetCodeByOSMTag(tagModData.key);
-      if (langCode != StringUtf8Multilang::kUnsupportedLanguageCode)
-      {
-        m_name.AddString(langCode, tagModData.new_value);
-        break;
-      }
-
-      if (tagModData.key == "addr:street")
-        m_street.m_defaultName = tagModData.new_value;
-
-      else if (tagModData.key == "addr:housenumber")
-        m_houseNumber = tagModData.new_value;
-
-      else if (tagModData.key == "cuisine")
-      {
-        Classificator const & cl = classif();
-        // Remove old cuisine values
-        vector<std::string_view> oldCuisines = strings::Tokenize(tagModData.old_value, ";");
-        for (std::string_view const & cuisine : oldCuisines)
-          m_types.Remove(cl.GetTypeByPath({string_view("cuisine"), cuisine}));
-        // Add new cuisine values
-        vector<std::string_view> newCuisines = strings::Tokenize(tagModData.new_value, ";");
-        for (std::string_view const & cuisine : newCuisines)
-          m_types.SafeAdd(cl.GetTypeByPath({string_view("cuisine"), cuisine}));
-      }
-      else if (tagModData.key == "diet:vegetarian")
-      {
-        Classificator const & cl = classif();
-        uint32_t const vegetarianType = cl.GetTypeByPath({string_view("cuisine"), "vegetarian"});
-        if (tagModData.new_value == "yes")
-          m_types.SafeAdd(vegetarianType);
+        uint32_t const wifiType = ftypes::IsWifiChecker::Instance().GetType();
+        if (tagModData.new_value == "wifi")
+          m_types.SafeAdd(wifiType);
         else
-          m_types.Remove(vegetarianType);
-      }
-      else if (tagModData.key == "diet:vegan")
-      {
-        Classificator const & cl = classif();
-        uint32_t const veganType = cl.GetTypeByPath({string_view("cuisine"), "vegan"});
-        if (tagModData.new_value == "yes")
-          m_types.SafeAdd(veganType);
-        else
-          m_types.Remove(veganType);
+          m_types.Remove(wifiType);
       }
+      break;
+    }
+
+    // Names
+    int8_t langCode = StringUtf8Multilang::GetCodeByOSMTag(tagModData.key);
+    if (langCode != StringUtf8Multilang::kUnsupportedLanguageCode)
+    {
+      m_name.AddString(langCode, tagModData.new_value);
+      break;
+    }
+
+    if (tagModData.key == "addr:street")
+      m_street.m_defaultName = tagModData.new_value;
+
+    else if (tagModData.key == "addr:housenumber")
+      m_houseNumber = tagModData.new_value;
+
+    else if (tagModData.key == "cuisine")
+    {
+      Classificator const & cl = classif();
+      // Remove old cuisine values
+      vector<std::string_view> oldCuisines = strings::Tokenize(tagModData.old_value, ";");
+      for (std::string_view const & cuisine : oldCuisines)
+        m_types.Remove(cl.GetTypeByPath({string_view("cuisine"), cuisine}));
+      // Add new cuisine values
+      vector<std::string_view> newCuisines = strings::Tokenize(tagModData.new_value, ";");
+      for (std::string_view const & cuisine : newCuisines)
+        m_types.SafeAdd(cl.GetTypeByPath({string_view("cuisine"), cuisine}));
+    }
+    else if (tagModData.key == "diet:vegetarian")
+    {
+      Classificator const & cl = classif();
+      uint32_t const vegetarianType = cl.GetTypeByPath({string_view("cuisine"), "vegetarian"});
+      if (tagModData.new_value == "yes")
+        m_types.SafeAdd(vegetarianType);
       else
-        LOG(LWARNING, ("OSM key \"" , tagModData.key, "\" is unknown, skipped"));
+        m_types.Remove(vegetarianType);
+    }
+    else if (tagModData.key == "diet:vegan")
+    {
+      Classificator const & cl = classif();
+      uint32_t const veganType = cl.GetTypeByPath({string_view("cuisine"), "vegan"});
+      if (tagModData.new_value == "yes")
+        m_types.SafeAdd(veganType);
+      else
+        m_types.Remove(veganType);
+    }
+    else
+      LOG(LWARNING, ("OSM key \"", tagModData.key, "\" is unknown, skipped"));
 
-      break;
-    }
-    case JournalEntryType::ObjectCreated:
-    {
-      ObjCreateData const & objCreatedData = std::get<ObjCreateData>(entry.data);
-      ASSERT_EQUAL(feature::GeomType::Point, objCreatedData.geomType, ("At the moment only new nodes (points) can be created."));
-      SetPointType();
-      SetMercator(objCreatedData.mercator);
-      m_types.Add(objCreatedData.type);
-      break;
-    }
-    case JournalEntryType::LegacyObject:
-    {
-      ASSERT_FAIL(("Legacy Objects can not be loaded from Journal"));
-      break;
-    }
+    break;
+  }
+  case JournalEntryType::ObjectCreated:
+  {
+    ObjCreateData const & objCreatedData = std::get<ObjCreateData>(entry.data);
+    ASSERT_EQUAL(feature::GeomType::Point, objCreatedData.geomType,
+                 ("At the moment only new nodes (points) can be created."));
+    SetPointType();
+    SetMercator(objCreatedData.mercator);
+    m_types.Add(objCreatedData.type);
+    break;
+  }
+  case JournalEntryType::LegacyObject:
+  {
+    ASSERT_FAIL(("Legacy Objects can not be loaded from Journal"));
+    break;
+  }
   }
 }
 
@@ -751,7 +766,7 @@ void EditableMapObject::LogDiffInJournal(EditableMapObject const & unedited_emo)
   std::vector<std::string> new_cuisines = GetCuisines();
   std::vector<std::string> old_cuisines = unedited_emo.GetCuisines();
 
-  auto const findAndErase = [] (std::vector<std::string> & cuisinesPtr, std::string_view s)
+  auto const findAndErase = [](std::vector<std::string> & cuisinesPtr, std::string_view s)
   {
     auto it = std::find(cuisinesPtr.begin(), cuisinesPtr.end(), s);
     if (it != cuisinesPtr.end())
diff --git a/libs/indexer/editable_map_object.hpp b/libs/indexer/editable_map_object.hpp
index 846871163..c123f0ca3 100644
--- a/libs/indexer/editable_map_object.hpp
+++ b/libs/indexer/editable_map_object.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
+#include "indexer/edit_journal.hpp"
 #include "indexer/feature_data.hpp"
 #include "indexer/feature_decl.hpp"
 #include "indexer/feature_meta.hpp"
 #include "indexer/feature_utils.hpp"
 #include "indexer/map_object.hpp"
-#include "indexer/edit_journal.hpp"
 
 #include "coding/string_utf8_multilang.hpp"
 
@@ -19,11 +19,12 @@ namespace osm
 struct EditableProperties
 {
   EditableProperties() = default;
-  EditableProperties(std::vector<feature::Metadata::EType> metadata, bool name,
-                     bool address, bool cuisine)
-    : m_metadata(std::move(metadata)), m_name(name), m_address(address), m_cuisine(cuisine)
-  {
-  }
+  EditableProperties(std::vector<feature::Metadata::EType> metadata, bool name, bool address, bool cuisine)
+    : m_metadata(std::move(metadata))
+    , m_name(name)
+    , m_address(address)
+    , m_cuisine(cuisine)
+  {}
 
   bool IsEditable() const { return m_name || m_address || m_cuisine || !m_metadata.empty(); }
 
@@ -110,8 +111,11 @@ public:
   void SetInternet(feature::Internet internet);
 
   /// @param[in] cuisine is a vector of osm cuisine ids.
+
 private:
-  template <class T> void SetCuisinesImpl(std::vector<T> const & cuisines);
+  template <class T>
+  void SetCuisinesImpl(std::vector<T> const & cuisines);
+
 public:
   void SetCuisines(std::vector<std::string_view> const & cuisines);
   void SetCuisines(std::vector<std::string> const & cuisines);
@@ -145,8 +149,7 @@ public:
 
   /// See comment for NamesDataSource class.
   static NamesDataSource GetNamesDataSource(StringUtf8Multilang const & source,
-                                            std::vector<int8_t> const & nativeMwmLanguages,
-                                            int8_t const userLanguage);
+                                            std::vector<int8_t> const & nativeMwmLanguages, int8_t const userLanguage);
 
   /// Compares editable fields connected with feature ignoring street.
   friend bool AreObjectsEqualIgnoringStreet(EditableMapObject const & lhs, EditableMapObject const & rhs);
diff --git a/libs/indexer/fake_feature_ids.hpp b/libs/indexer/fake_feature_ids.hpp
index 20e65ea6f..d4c4e66e9 100644
--- a/libs/indexer/fake_feature_ids.hpp
+++ b/libs/indexer/fake_feature_ids.hpp
@@ -3,20 +3,16 @@
 #include <cstdint>
 #include <limits>
 
-// Before creating new fake feature interval note that routing has 
+// Before creating new fake feature interval note that routing has
 // it's own fake features in routing/fake_feature_ids.hpp
 
 namespace feature
 {
 struct FakeFeatureIds
 {
-  static bool IsEditorCreatedFeature(uint32_t id)
-  {
-    return id >= kEditorCreatedFeaturesStart;
-  }
+  static bool IsEditorCreatedFeature(uint32_t id) { return id >= kEditorCreatedFeaturesStart; }
 
   static uint32_t constexpr k20BitsOffset = 0xfffff;
-  static uint32_t constexpr kEditorCreatedFeaturesStart =
-      std::numeric_limits<uint32_t>::max() - k20BitsOffset;
+  static uint32_t constexpr kEditorCreatedFeaturesStart = std::numeric_limits<uint32_t>::max() - k20BitsOffset;
 };
 }  // namespace feature
diff --git a/libs/indexer/feature.cpp b/libs/indexer/feature.cpp
index 004da30a7..06e24f3bd 100644
--- a/libs/indexer/feature.cpp
+++ b/libs/indexer/feature.cpp
@@ -52,18 +52,15 @@ int GetScaleIndex(SharedLoadInfo const & loadInfo, int scale)
       scale = lastScale;
 
     for (int i = 0; i < count; ++i)
-    {
       if (scale <= loadInfo.GetScale(i))
         return i;
-    }
     ASSERT(false, ("No suitable geometry scale range in the map file."));
     return -1;
   }
 }
 
 // Get an index of outer geometry scale range.
-int GetScaleIndex(SharedLoadInfo const & loadInfo, int scale,
-                  FeatureType::GeometryOffsets const & offsets)
+int GetScaleIndex(SharedLoadInfo const & loadInfo, int scale, FeatureType::GeometryOffsets const & offsets)
 {
   int const count = loadInfo.GetScalesCount();
   ASSERT_EQUAL(count, static_cast<int>(offsets.size()), ());
@@ -119,8 +116,8 @@ uint32_t CalcOffset(ArrayByteSource const & source, uint8_t const * start)
 
 uint8_t Header(vector<uint8_t> const & data)
 {
- CHECK(!data.empty(), ());
- return data[0];
+  CHECK(!data.empty(), ());
+  return data[0];
 }
 
 void ReadOffsets(SharedLoadInfo const & loadInfo, ArrayByteSource & src, uint8_t mask,
@@ -195,7 +192,7 @@ FeatureType::FeatureType(SharedLoadInfo const * loadInfo, vector<uint8_t> && buf
 {
   CHECK(m_loadInfo, ());
 
-  m_header = Header(m_data); // Parse the header and optional name/layer/addinfo.
+  m_header = Header(m_data);  // Parse the header and optional name/layer/addinfo.
 }
 
 std::unique_ptr<FeatureType> FeatureType::CreateFromMapObject(osm::MapObject const & emo)
@@ -263,7 +260,7 @@ feature::GeomType FeatureType::GetGeomType() const
   {
   case HeaderGeomType::Line: return GeomType::Line;
   case HeaderGeomType::Area: return GeomType::Area;
-  default: return GeomType::Point; // HeaderGeomType::Point/PointEx
+  default: return GeomType::Point;  // HeaderGeomType::Point/PointEx
   }
 }
 
@@ -287,7 +284,7 @@ void FeatureType::ParseTypes()
     {
       // Possible for newer MWMs with added types.
       LOG(LWARNING, ("Incorrect type index for feature. FeatureID:", m_id, ". Incorrect index:", index,
-                   ". Loaded feature types:", m_types, ". Total count of types:", count));
+                     ". Loaded feature types:", m_types, ". Total count of types:", count));
 
       m_types[i] = c.GetStubType();
     }
@@ -362,9 +359,7 @@ void FeatureType::ParseHeader2()
     if (elemsCount == 0)
       geomScalesMask = bitSource.Read(4);
     else
-    {
       ASSERT(headerGeomType == HeaderGeomType::Area || elemsCount > 1, ());
-    }
   }
 
   ArrayByteSource src(bitSource.RoundPtr());
@@ -574,7 +569,8 @@ FeatureType::GeomStat FeatureType::GetOuterTrianglesStats()
 {
   CHECK(m_loadInfo && m_parsed.m_header2 && !m_parsed.m_triangles, ("Call geometry stats first and once!"));
   int const scalesCount = m_loadInfo->GetScalesCount();
-  ASSERT_LESS_OR_EQUAL(scalesCount, static_cast<int>(DataHeader::kMaxScalesCount), ("MWM has too many geometry scales!"));
+  ASSERT_LESS_OR_EQUAL(scalesCount, static_cast<int>(DataHeader::kMaxScalesCount),
+                       ("MWM has too many geometry scales!"));
   FeatureType::GeomStat res;
 
   auto const headerGeomType = static_cast<HeaderGeomType>(Header(m_data) & HEADER_MASK_GEOMTYPE);
@@ -659,9 +655,7 @@ std::string FeatureType::DebugString()
   m2::PointD keyPoint;
   switch (GetGeomType())
   {
-  case GeomType::Point:
-    keyPoint = m_center;
-    break;
+  case GeomType::Point: keyPoint = m_center; break;
 
   case GeomType::Line:
     if (m_points.empty())
@@ -676,9 +670,7 @@ std::string FeatureType::DebugString()
     keyPoint = (m_triangles[0] + m_triangles[1] + m_triangles[2]) / 3.0;
     break;
 
-  case GeomType::Undefined:
-    ASSERT(false, ());
-    break;
+  case GeomType::Undefined: ASSERT(false, ()); break;
   }
   // Print coordinates in (lat,lon) for better investigation capabilities.
   res += ": " + DebugPrint(keyPoint) + "; " + DebugPrint(mercator::ToLatLon(keyPoint)) + "\n";
@@ -776,13 +768,14 @@ void FeatureType::GetPreferredNames(bool allowTranslit, int8_t deviceLang, featu
 
   ParseCommon();
 
-  feature::GetPreferredNames({ GetNames(), mwmInfo->GetRegionData(), deviceLang, allowTranslit }, out);
+  feature::GetPreferredNames({GetNames(), mwmInfo->GetRegionData(), deviceLang, allowTranslit}, out);
 }
 
 string_view FeatureType::GetReadableName()
 {
   feature::NameParamsOut out;
-  GetReadableName(false /* allowTranslit */, StringUtf8Multilang::GetLangIndex(languages::GetCurrentMapLanguage()), out);
+  GetReadableName(false /* allowTranslit */, StringUtf8Multilang::GetLangIndex(languages::GetCurrentMapLanguage()),
+                  out);
   return out.primary;
 }
 
@@ -797,7 +790,7 @@ void FeatureType::GetReadableName(bool allowTranslit, int8_t deviceLang, feature
 
   ParseCommon();
 
-  feature::GetReadableName({ GetNames(), mwmInfo->GetRegionData(), deviceLang, allowTranslit }, out);
+  feature::GetReadableName({GetNames(), mwmInfo->GetRegionData(), deviceLang, allowTranslit}, out);
 }
 
 string const & FeatureType::GetHouseNumber()
@@ -816,9 +809,7 @@ string_view FeatureType::GetName(int8_t lang)
   // We don't store empty names. UPD: We do for coast features :)
   string_view name;
   if (m_params.name.GetString(lang, name))
-  {
     ASSERT(!name.empty() || m_id.m_mwmId.GetInfo()->GetType() == MwmInfo::COASTS, ());
-  }
 
   return name;
 }
@@ -829,7 +820,10 @@ uint8_t FeatureType::GetRank()
   return m_params.rank;
 }
 
-uint64_t FeatureType::GetPopulation() { return feature::RankToPopulation(GetRank()); }
+uint64_t FeatureType::GetPopulation()
+{
+  return feature::RankToPopulation(GetRank());
+}
 
 string const & FeatureType::GetRef()
 {
@@ -863,6 +857,5 @@ bool FeatureType::HasMetadata(feature::Metadata::EType type)
   if (m_metadata.Has(type))
     return true;
 
-  return base::FindIf(m_metaIds, [&type](auto const & v) { return v.first == type; }) !=
-         m_metaIds.end();
+  return base::FindIf(m_metaIds, [&type](auto const & v) { return v.first == type; }) != m_metaIds.end();
 }
diff --git a/libs/indexer/feature.hpp b/libs/indexer/feature.hpp
index b1bc8979d..1824e0fb3 100644
--- a/libs/indexer/feature.hpp
+++ b/libs/indexer/feature.hpp
@@ -14,12 +14,12 @@
 namespace feature
 {
 class SharedLoadInfo;
-struct NameParamsOut; // Include feature_utils.hpp when using
+struct NameParamsOut;  // Include feature_utils.hpp when using
 
 // "fallback" flag value (1 is taken to distinguish from the "normal" offset value),
 // which means geometry should be loaded from the next offset of the more detailed geom level.
 uint32_t constexpr kGeomOffsetFallback = 1;
-} // namespace feature
+}  // namespace feature
 
 namespace osm
 {
@@ -90,7 +90,11 @@ public:
   /// @name Geometry.
   //@{
   /// This constant values should be equal with feature::FeatureLoader implementation.
-  enum { BEST_GEOMETRY = -1, WORST_GEOMETRY = -2 };
+  enum
+  {
+    BEST_GEOMETRY = -1,
+    WORST_GEOMETRY = -2
+  };
 
   m2::RectD GetLimitRect(int scale);
   m2::RectD const & GetLimitRectChecked() const;
@@ -131,7 +135,7 @@ public:
 
     for (size_t i = 0; i < m_triangles.size();)
     {
-      f(m_triangles[i], m_triangles[i+1], m_triangles[i+2]);
+      f(m_triangles[i], m_triangles[i + 1], m_triangles[i + 2]);
       i += 3;
     }
   }
@@ -203,10 +207,7 @@ private:
     bool m_metaIds : 1;
 
     ParsedFlags() { Reset(); }
-    void Reset()
-    {
-      m_types = m_common = m_header2 = m_points = m_triangles = m_metadata = m_metaIds = false;
-    }
+    void Reset() { m_types = m_common = m_header2 = m_points = m_triangles = m_metadata = m_metaIds = false; }
   };
 
   struct Offsets
diff --git a/libs/indexer/feature_algo.cpp b/libs/indexer/feature_algo.cpp
index b2e74e7a9..29e409bd7 100644
--- a/libs/indexer/feature_algo.cpp
+++ b/libs/indexer/feature_algo.cpp
@@ -40,12 +40,15 @@ m2::PointD GetCenter(FeatureType & f, int scale)
   }
 }
 
-m2::PointD GetCenter(FeatureType & f) { return GetCenter(f, FeatureType::BEST_GEOMETRY); }
+m2::PointD GetCenter(FeatureType & f)
+{
+  return GetCenter(f, FeatureType::BEST_GEOMETRY);
+}
 
 double GetMinDistanceMeters(FeatureType & ft, m2::PointD const & pt, int scale)
 {
   double res = std::numeric_limits<double>::max();
-  auto updateDistanceFn = [&] (m2::PointD const & p)
+  auto updateDistanceFn = [&](m2::PointD const & p)
   {
     double const d = mercator::DistanceOnEarth(p, pt);
     if (d < res)
@@ -55,9 +58,7 @@ double GetMinDistanceMeters(FeatureType & ft, m2::PointD const & pt, int scale)
   GeomType const type = ft.GetGeomType();
   switch (type)
   {
-  case GeomType::Point:
-    updateDistanceFn(ft.GetCenter());
-    break;
+  case GeomType::Point: updateDistanceFn(ft.GetCenter()); break;
 
   case GeomType::Line:
   {
@@ -84,7 +85,8 @@ double GetMinDistanceMeters(FeatureType & ft, m2::PointD const & pt, int scale)
         return;
       }
 
-      auto fn = [&](m2::PointD const & x1, m2::PointD const & x2) {
+      auto fn = [&](m2::PointD const & x1, m2::PointD const & x2)
+      {
         m2::ParametrizedSegment<m2::PointD> const segment(x1, x2);
         updateDistanceFn(segment.ClosestPointTo(pt));
       };
@@ -92,7 +94,6 @@ double GetMinDistanceMeters(FeatureType & ft, m2::PointD const & pt, int scale)
       fn(p1, p2);
       fn(p2, p3);
       fn(p3, p1);
-
     }, scale);
     break;
   }
@@ -111,9 +112,7 @@ double CalcArea(FeatureType & ft)
   if (ft.GetGeomType() == GeomType::Area)
   {
     ft.ForEachTriangle([&area](m2::PointD const & p1, m2::PointD const & p2, m2::PointD const & p3)
-    {
-      area += m2::GetTriangleArea(p1, p2, p3);
-    }, FeatureType::BEST_GEOMETRY);
+    { area += m2::GetTriangleArea(p1, p2, p3); }, FeatureType::BEST_GEOMETRY);
   }
   return area;
 }
diff --git a/libs/indexer/feature_altitude.hpp b/libs/indexer/feature_altitude.hpp
index 12af12dce..90180104c 100644
--- a/libs/indexer/feature_altitude.hpp
+++ b/libs/indexer/feature_altitude.hpp
@@ -45,10 +45,7 @@ struct AltitudeHeader
   }
 
   // Methods below return sizes of parts of altitude section in bytes.
-  size_t GetAltitudeAvailabilitySize() const
-  {
-    return m_featureTableOffset - sizeof(AltitudeHeader);
-  }
+  size_t GetAltitudeAvailabilitySize() const { return m_featureTableOffset - sizeof(AltitudeHeader); }
 
   size_t GetFeatureTableSize() const { return m_altitudesOffset - m_featureTableOffset; }
 
@@ -89,8 +86,7 @@ public:
     for (auto const altitude : m_altitudes)
     {
       CHECK_LESS_OR_EQUAL(minAltitude, altitude, ());
-      uint32_t const delta = bits::ZigZagEncode(static_cast<int32_t>(altitude) -
-                                                static_cast<int32_t>(prevAltitude));
+      uint32_t const delta = bits::ZigZagEncode(static_cast<int32_t>(altitude) - static_cast<int32_t>(prevAltitude));
       // Making serialized value greater than zero.
       CHECK(coding::DeltaCoder::Encode(bits, delta + 1), ());
       prevAltitude = altitude;
@@ -98,8 +94,8 @@ public:
   }
 
   template <class TSource>
-  void Deserialize(geometry::Altitude minAltitude, size_t pointCount,
-                   std::string const & countryFileName, uint32_t featureId, TSource & src)
+  void Deserialize(geometry::Altitude minAltitude, size_t pointCount, std::string const & countryFileName,
+                   uint32_t featureId, TSource & src)
   {
     ASSERT_NOT_EQUAL(pointCount, 0, ());
 
diff --git a/libs/indexer/feature_covering.cpp b/libs/indexer/feature_covering.cpp
index 3b95225d9..8aa15177e 100644
--- a/libs/indexer/feature_covering.cpp
+++ b/libs/indexer/feature_covering.cpp
@@ -14,8 +14,7 @@ public:
   struct Trg
   {
     m2::PointD m_a, m_b, m_c;
-    Trg(m2::PointD const & a, m2::PointD const & b, m2::PointD const & c)
-      : m_a(a), m_b(b), m_c(c) {}
+    Trg(m2::PointD const & a, m2::PointD const & b, m2::PointD const & c) : m_a(a), m_b(b), m_c(c) {}
   };
 
   std::vector<m2::PointD> m_polyline;
@@ -52,35 +51,26 @@ public:
       if (!cellRect.IsIntersect(r))
         continue;
 
-      CellObjectIntersection const res =
-          IntersectCellWithTriangle(cell, m_trg[i].m_a, m_trg[i].m_b, m_trg[i].m_c);
+      CellObjectIntersection const res = IntersectCellWithTriangle(cell, m_trg[i].m_a, m_trg[i].m_b, m_trg[i].m_c);
 
       switch (res)
       {
-      case CELL_OBJECT_NO_INTERSECTION:
-        break;
-      case CELL_INSIDE_OBJECT:
-        return CELL_INSIDE_OBJECT;
+      case CELL_OBJECT_NO_INTERSECTION: break;
+      case CELL_INSIDE_OBJECT: return CELL_INSIDE_OBJECT;
       case CELL_OBJECT_INTERSECT:
-      case OBJECT_INSIDE_CELL:
-        return CELL_OBJECT_INTERSECT;
+      case OBJECT_INSIDE_CELL: return CELL_OBJECT_INTERSECT;
       }
     }
 
     for (size_t i = 1; i < m_polyline.size(); ++i)
     {
-      CellObjectIntersection const res =
-          IntersectCellWithLine(cell, m_polyline[i], m_polyline[i-1]);
+      CellObjectIntersection const res = IntersectCellWithLine(cell, m_polyline[i], m_polyline[i - 1]);
       switch (res)
       {
-      case CELL_OBJECT_NO_INTERSECTION:
-        break;
-      case CELL_INSIDE_OBJECT:
-        ASSERT(false, (cell, i, m_polyline));
-        return CELL_OBJECT_INTERSECT;
+      case CELL_OBJECT_NO_INTERSECTION: break;
+      case CELL_INSIDE_OBJECT: ASSERT(false, (cell, i, m_polyline)); return CELL_OBJECT_INTERSECT;
       case CELL_OBJECT_INTERSECT:
-      case OBJECT_INSIDE_CELL:
-        return CELL_OBJECT_INTERSECT;
+      case OBJECT_INSIDE_CELL: return CELL_OBJECT_INTERSECT;
       }
     }
 
@@ -96,12 +86,9 @@ public:
     return pt;
   }
 
-  void operator() (m2::PointD const & pt)
-  {
-    m_polyline.push_back(ConvertPoint(pt));
-  }
+  void operator()(m2::PointD const & pt) { m_polyline.push_back(ConvertPoint(pt)); }
 
-  void operator() (m2::PointD const & a, m2::PointD const & b, m2::PointD const & c)
+  void operator()(m2::PointD const & a, m2::PointD const & b, m2::PointD const & c)
   {
     m_trg.emplace_back(ConvertPoint(a), ConvertPoint(b), ConvertPoint(c));
   }
@@ -118,8 +105,7 @@ void GetIntersection(FeatureType & f, FeatureIntersector<DEPTH_LEVELS> & fIsect)
   f.ForEachPoint(fIsect, scale);
   f.ForEachTriangle(fIsect, scale);
 
-  CHECK(!(fIsect.m_trg.empty() && fIsect.m_polyline.empty()) &&
-        f.GetLimitRect(scale).IsValid(), (f.DebugString()));
+  CHECK(!(fIsect.m_trg.empty() && fIsect.m_polyline.empty()) && f.GetLimitRect(scale).IsValid(), (f.DebugString()));
 }
 
 template <int DEPTH_LEVELS>
@@ -130,14 +116,12 @@ std::vector<int64_t> CoverIntersection(FeatureIntersector<DEPTH_LEVELS> const &
   {
     m2::PointD const pt = fIsect.m_polyline[0];
     return std::vector<int64_t>(
-        1, m2::CellId<DEPTH_LEVELS>::FromXY(static_cast<uint32_t>(pt.x),
-                                            static_cast<uint32_t>(pt.y), DEPTH_LEVELS - 1)
+        1, m2::CellId<DEPTH_LEVELS>::FromXY(static_cast<uint32_t>(pt.x), static_cast<uint32_t>(pt.y), DEPTH_LEVELS - 1)
                .ToInt64(cellDepth));
   }
 
   std::vector<m2::CellId<DEPTH_LEVELS>> cells;
-  covering::CoverObject(fIsect, cellPenaltyArea, cells, cellDepth,
-                        m2::CellId<DEPTH_LEVELS>::Root());
+  covering::CoverObject(fIsect, cellPenaltyArea, cells, cellDepth, m2::CellId<DEPTH_LEVELS>::Root());
 
   std::vector<int64_t> res(cells.size());
   for (size_t i = 0; i < cells.size(); ++i)
@@ -159,7 +143,7 @@ std::vector<int64_t> CoverFeature(FeatureType & f, int cellDepth, uint64_t cellP
 void SortAndMergeIntervals(Intervals v, Intervals & res)
 {
 #ifdef DEBUG
-  ASSERT ( res.empty(), () );
+  ASSERT(res.empty(), ());
   for (size_t i = 0; i < v.size(); ++i)
     ASSERT_LESS(v[i].first, v[i].second, (i));
 #endif
@@ -168,12 +152,10 @@ void SortAndMergeIntervals(Intervals v, Intervals & res)
 
   res.reserve(v.size());
   for (size_t i = 0; i < v.size(); ++i)
-  {
     if (i == 0 || res.back().second < v[i].first)
       res.push_back(v[i]);
     else
       res.back().second = std::max(res.back().second, v[i].second);
-  }
 }
 
 Intervals SortAndMergeIntervals(Intervals const & v)
@@ -182,4 +164,4 @@ Intervals SortAndMergeIntervals(Intervals const & v)
   SortAndMergeIntervals(v, res);
   return res;
 }
-}
+}  // namespace covering
diff --git a/libs/indexer/feature_covering.hpp b/libs/indexer/feature_covering.hpp
index b2fc9062c..701600c49 100644
--- a/libs/indexer/feature_covering.hpp
+++ b/libs/indexer/feature_covering.hpp
@@ -42,9 +42,8 @@ m2::CellId<DEPTH_LEVELS> GetRectIdAsIs(m2::RectD const & r)
   double const eps = kMwmPointAccuracy;
   using Converter = CellIdConverter<mercator::Bounds, m2::CellId<DEPTH_LEVELS>>;
 
-  return Converter::Cover2PointsWithCell(
-      mercator::ClampX(r.minX() + eps), mercator::ClampY(r.minY() + eps),
-      mercator::ClampX(r.maxX() - eps), mercator::ClampY(r.maxY() - eps));
+  return Converter::Cover2PointsWithCell(mercator::ClampX(r.minX() + eps), mercator::ClampY(r.minY() + eps),
+                                         mercator::ClampX(r.maxX() - eps), mercator::ClampY(r.maxY() - eps));
 }
 
 // Calculate cell coding depth according to max visual scale for mwm.
@@ -79,8 +78,8 @@ void CoverViewportAndAppendLowerLevels(m2::RectD const & r, int cellDepth, Inter
   Intervals intervals;
   for (auto const & id : ids)
   {
-    AppendLowerLevels<DEPTH_LEVELS>(
-        id, cellDepth, [&intervals](Interval const & interval) { intervals.push_back(interval); });
+    AppendLowerLevels<DEPTH_LEVELS>(id, cellDepth,
+                                    [&intervals](Interval const & interval) { intervals.push_back(interval); });
   }
 
   SortAndMergeIntervals(intervals, res);
@@ -116,18 +115,15 @@ public:
     {
       switch (m_mode)
       {
-      case ViewportWithLowLevels:
-        CoverViewportAndAppendLowerLevels<DEPTH_LEVELS>(m_rect, cellDepth, m_res[ind]);
-        break;
+      case ViewportWithLowLevels: CoverViewportAndAppendLowerLevels<DEPTH_LEVELS>(m_rect, cellDepth, m_res[ind]); break;
 
       case LowLevelsOnly:
       {
         m2::CellId<DEPTH_LEVELS> id = GetRectIdAsIs<DEPTH_LEVELS>(m_rect);
         while (id.Level() >= cellDepth)
           id = id.Parent();
-        AppendLowerLevels<DEPTH_LEVELS>(id, cellDepth, [this, ind](Interval const & interval) {
-          m_res[ind].push_back(interval);
-        });
+        AppendLowerLevels<DEPTH_LEVELS>(id, cellDepth,
+                                        [this, ind](Interval const & interval) { m_res[ind].push_back(interval); });
 
         // Check for optimal result intervals.
 #if 0
@@ -142,8 +138,7 @@ public:
       }
 
       case FullCover:
-        m_res[ind].push_back(
-            Intervals::value_type(0, static_cast<int64_t>((uint64_t{1} << 63) - 1)));
+        m_res[ind].push_back(Intervals::value_type(0, static_cast<int64_t>((uint64_t{1} << 63) - 1)));
         break;
 
       case Spiral:
@@ -152,16 +147,15 @@ public:
         CoverSpiral<mercator::Bounds, m2::CellId<DEPTH_LEVELS>>(m_rect, cellDepth - 1, ids);
 
         std::set<Interval> uniqueIds;
-        auto insertInterval = [this, ind, &uniqueIds](Interval const & interval) {
+        auto insertInterval = [this, ind, &uniqueIds](Interval const & interval)
+        {
           if (uniqueIds.insert(interval).second)
             m_res[ind].push_back(interval);
         };
 
         for (auto const & id : ids)
-        {
           if (cellDepth > id.Level())
             AppendLowerLevels<DEPTH_LEVELS>(id, cellDepth, insertInterval);
-        }
       }
       }
     }
@@ -169,4 +163,4 @@ public:
     return m_res[ind];
   }
 };
-}
+}  // namespace covering
diff --git a/libs/indexer/feature_data.cpp b/libs/indexer/feature_data.cpp
index 914008267..a67779c3c 100644
--- a/libs/indexer/feature_data.cpp
+++ b/libs/indexer/feature_data.cpp
@@ -23,7 +23,8 @@ namespace feature
 {
 using namespace std;
 
-template <class ContT> string TypesToString(ContT const & holder)
+template <class ContT>
+string TypesToString(ContT const & holder)
 {
   Classificator const & c = classif();
   string s;
@@ -41,10 +42,7 @@ std::string DebugPrint(TypesHolder const & holder)
 
 TypesHolder::TypesHolder(FeatureType & f) : m_size(0), m_geomType(f.GetGeomType())
 {
-  f.ForEachType([this](uint32_t type)
-  {
-    Add(type);
-  });
+  f.ForEachType([this](uint32_t type) { Add(type); });
 }
 
 bool TypesHolder::HasWithSubclass(uint32_t type) const
@@ -74,10 +72,8 @@ bool TypesHolder::Equals(TypesHolder const & other) const
   auto const b = begin();
   auto const e = end();
   for (auto t : other)
-  {
     if (std::find(b, e, t) == e)
       return false;
-  }
   return true;
 }
 
@@ -109,13 +105,11 @@ public:
     return 0;
   }
 
-  template <class ContT> void SortUselessToEnd(ContT & cont) const
+  template <class ContT>
+  void SortUselessToEnd(ContT & cont) const
   {
     // Put "very common" types to the end of possible PP-description types.
-    std::stable_sort(cont.begin(), cont.end(), [this](uint32_t t1, uint32_t t2)
-    {
-      return Score(t1) < Score(t2);
-    });
+    std::stable_sort(cont.begin(), cont.end(), [this](uint32_t t1, uint32_t t2) { return Score(t1) < Score(t2); });
   }
 
 private:
@@ -125,16 +119,8 @@ private:
     // when we have many types for POI.
     base::StringIL const types1[] = {
         // 1-arity
-        {"building:part"},
-        {"hwtag"},
-        {"psurface"},
-        {"internet_access"},
-        {"organic"},
-        {"wheelchair"},
-        {"cuisine"},
-        {"recycling"},
-        {"area:highway"},
-        {"fee"},
+        {"building:part"}, {"hwtag"},   {"psurface"},  {"internet_access"}, {"organic"},
+        {"wheelchair"},    {"cuisine"}, {"recycling"}, {"area:highway"},    {"fee"},
     };
 
     Classificator const & c = classif();
@@ -153,17 +139,13 @@ private:
       std::sort(v.begin(), v.end());
   }
 
-  bool IsIn(uint8_t idx, uint32_t t) const
-  {
-    return std::binary_search(m_types[idx].begin(), m_types[idx].end(), t);
-  }
+  bool IsIn(uint8_t idx, uint32_t t) const { return std::binary_search(m_types[idx].begin(), m_types[idx].end(), t); }
 
   vector<uint32_t> m_types[3];
 };
-} // namespace
+}  // namespace
 
-uint8_t CalculateHeader(size_t const typesCount, HeaderGeomType const headerGeomType,
-                        FeatureParamsBase const & params)
+uint8_t CalculateHeader(size_t const typesCount, HeaderGeomType const headerGeomType, FeatureParamsBase const & params)
 {
   ASSERT(typesCount != 0, ("Feature should have at least one type."));
   ASSERT_LESS_OR_EQUAL(typesCount, kMaxTypesCount, ());
@@ -206,10 +188,7 @@ void TypesHolder::SortByUseless()
 void TypesHolder::SortBySpec()
 {
   auto const & cl = classif();
-  auto const getPriority = [&cl](uint32_t type)
-  {
-    return cl.GetObject(type)->GetMaxOverlaysPriority();
-  };
+  auto const getPriority = [&cl](uint32_t type) { return cl.GetObject(type)->GetMaxOverlaysPriority(); };
 
   auto const & checker = UselessTypesChecker::Instance();
 
@@ -258,10 +237,9 @@ bool FeatureParamsBase::SetDefaultNameIfEmpty(std::string const & s)
   return true;
 }
 
-bool FeatureParamsBase::operator == (FeatureParamsBase const & rhs) const
+bool FeatureParamsBase::operator==(FeatureParamsBase const & rhs) const
 {
-  return (name == rhs.name && house == rhs.house && ref == rhs.ref &&
-          layer == rhs.layer && rank == rhs.rank);
+  return (name == rhs.name && house == rhs.house && ref == rhs.ref && layer == rhs.layer && rank == rhs.rank);
 }
 
 bool FeatureParamsBase::IsValid() const
@@ -274,8 +252,7 @@ string FeatureParamsBase::DebugString() const
   string const utf8name = DebugPrint(name);
   return ((!utf8name.empty() ? "Name:" + utf8name : "") +
           (layer != LAYER_EMPTY ? " Layer:" + DebugPrint((int)layer) : "") +
-          (rank != 0 ? " Rank:" + DebugPrint((int)rank) : "") +
-          (!house.IsEmpty() ? " House:" + house.Get() : "") +
+          (rank != 0 ? " Rank:" + DebugPrint((int)rank) : "") + (!house.IsEmpty() ? " House:" + house.Get() : "") +
           (!ref.empty() ? " Ref:" + ref : ""));
 }
 
@@ -292,7 +269,7 @@ bool IsDummyName(string_view s)
   return s.empty();
 }
 
-} // namespace
+}  // namespace
 
 /////////////////////////////////////////////////////////////////////////////////////////
 // FeatureParams implementation
@@ -320,8 +297,7 @@ bool FeatureParams::LooksLikeHouseNumber(std::string const & hn)
 
   ASSERT(!hn.empty(), ());
   size_t const sz = hn.size();
-  return strings::IsASCIIDigit(hn[0]) ||
-         (sz == 1 && strings::IsASCIILatin(hn[0])) ||
+  return strings::IsASCIIDigit(hn[0]) || (sz == 1 && strings::IsASCIILatin(hn[0])) ||
          std::count_if(hn.begin(), hn.end(), &strings::IsASCIIDigit) > 0.2 * sz;
 }
 
@@ -489,10 +465,8 @@ bool FeatureParams::IsTypeExist(uint32_t comp, uint8_t level) const
 uint32_t FeatureParams::FindType(uint32_t comp, uint8_t level) const
 {
   for (uint32_t const type : m_types)
-  {
     if (ftype::Trunc(type, level) == comp)
       return type;
-  }
   return ftype::GetEmptyValue();
 }
 
@@ -553,13 +527,13 @@ public:
   {
     // Remain first type and erase second in case of conflict.
     base::StringIL arr[][2] = {
-      {{"hwtag", "yescar"}, {"hwtag", "nocar"}},
-      {{"hwtag", "yesfoot"}, {"hwtag", "nofoot"}},
-      {{"hwtag", "yesbicycle"}, {"hwtag", "nobicycle"}},
-      {{"hwtag", "nobicycle"}, {"hwtag", "bidir_bicycle"}},
-      {{"hwtag", "nobicycle"}, {"hwtag", "onedir_bicycle"}},
-      {{"hwtag", "bidir_bicycle"}, {"hwtag", "onedir_bicycle"}},
-      {{"wheelchair", "yes"}, {"wheelchair", "no"}},
+        {{"hwtag", "yescar"}, {"hwtag", "nocar"}},
+        {{"hwtag", "yesfoot"}, {"hwtag", "nofoot"}},
+        {{"hwtag", "yesbicycle"}, {"hwtag", "nobicycle"}},
+        {{"hwtag", "nobicycle"}, {"hwtag", "bidir_bicycle"}},
+        {{"hwtag", "nobicycle"}, {"hwtag", "onedir_bicycle"}},
+        {{"hwtag", "bidir_bicycle"}, {"hwtag", "onedir_bicycle"}},
+        {{"wheelchair", "yes"}, {"wheelchair", "no"}},
     };
 
     auto const & cl = classif();
@@ -593,7 +567,7 @@ public:
   }
 };
 
-} // namespace
+}  // namespace
 
 bool FeatureBuilderParams::RemoveInconsistentTypes()
 {
diff --git a/libs/indexer/feature_data.hpp b/libs/indexer/feature_data.hpp
index 51c4b1eb8..c0930a085 100644
--- a/libs/indexer/feature_data.hpp
+++ b/libs/indexer/feature_data.hpp
@@ -18,135 +18,135 @@ class FeatureType;
 
 namespace feature
 {
-  enum HeaderMask
+enum HeaderMask
+{
+  HEADER_MASK_TYPE = 7U,
+  HEADER_MASK_HAS_NAME = 1U << 3,
+  HEADER_MASK_HAS_LAYER = 1U << 4,
+  HEADER_MASK_GEOMTYPE = 3U << 5,
+  HEADER_MASK_HAS_ADDINFO = 1U << 7
+};
+
+enum class HeaderGeomType : uint8_t
+{
+  /// Coding geometry feature type in 2 bits.
+  Point = 0,         /// point feature (addinfo = rank)
+  Line = 1U << 5,    /// linear feature (addinfo = ref)
+  Area = 1U << 6,    /// area feature (addinfo = house)
+  PointEx = 3U << 5  /// point feature (addinfo = house)
+};
+
+static constexpr int kMaxTypesCount = HEADER_MASK_TYPE + 1;  // 8, because there should be no features with 0 types
+
+enum Layer : int8_t
+{
+  LAYER_LOW = -10,
+  LAYER_EMPTY = 0,
+  LAYER_HIGH = 10
+};
+
+class TypesHolder
+{
+public:
+  using Types = std::array<uint32_t, kMaxTypesCount>;
+
+  TypesHolder() = default;
+  explicit TypesHolder(GeomType geomType) : m_geomType(geomType) {}
+  explicit TypesHolder(FeatureType & f);
+
+  void Assign(uint32_t type)
   {
-    HEADER_MASK_TYPE = 7U,
-    HEADER_MASK_HAS_NAME = 1U << 3,
-    HEADER_MASK_HAS_LAYER = 1U << 4,
-    HEADER_MASK_GEOMTYPE = 3U << 5,
-    HEADER_MASK_HAS_ADDINFO = 1U << 7
-  };
+    m_types[0] = type;
+    m_size = 1;
+  }
 
-  enum class HeaderGeomType : uint8_t
+  template <class IterT>
+  void Assign(IterT beg, IterT end)
   {
-    /// Coding geometry feature type in 2 bits.
-    Point = 0,         /// point feature (addinfo = rank)
-    Line = 1U << 5,    /// linear feature (addinfo = ref)
-    Area = 1U << 6,    /// area feature (addinfo = house)
-    PointEx = 3U << 5  /// point feature (addinfo = house)
-  };
+    m_size = std::distance(beg, end);
+    CHECK_LESS_OR_EQUAL(m_size, kMaxTypesCount, ());
+    std::copy(beg, end, m_types.begin());
+  }
 
-  static constexpr int kMaxTypesCount = HEADER_MASK_TYPE + 1; // 8, because there should be no features with 0 types
-
-  enum Layer : int8_t
+  void Add(uint32_t type)
   {
-    LAYER_LOW = -10,
-    LAYER_EMPTY = 0,
-    LAYER_HIGH = 10
-  };
+    CHECK_LESS(m_size, kMaxTypesCount, ());
+    m_types[m_size++] = type;
+  }
 
-  class TypesHolder
+  void SafeAdd(uint32_t type)
   {
-  public:
-    using Types = std::array<uint32_t, kMaxTypesCount>;
-
-    TypesHolder() = default;
-    explicit TypesHolder(GeomType geomType) : m_geomType(geomType) {}
-    explicit TypesHolder(FeatureType & f);
-
-    void Assign(uint32_t type)
+    if (!Has(type))
     {
-      m_types[0] = type;
-      m_size = 1;
+      if (m_size < kMaxTypesCount)
+        Add(type);
+      else
+        LOG(LWARNING, ("Type could not be added, MaxTypesCount exceeded"));
     }
+  }
 
-    template <class IterT> void Assign(IterT beg, IterT end)
-    {
-      m_size = std::distance(beg, end);
-      CHECK_LESS_OR_EQUAL(m_size, kMaxTypesCount, ());
-      std::copy(beg, end, m_types.begin());
-    }
+  GeomType GetGeomType() const { return m_geomType; }
 
-    void Add(uint32_t type)
-    {
-      CHECK_LESS(m_size, kMaxTypesCount, ());
-      m_types[m_size++] = type;
-    }
+  size_t Size() const { return m_size; }
+  bool Empty() const { return (m_size == 0); }
 
-    void SafeAdd(uint32_t type)
-    {
-      if (!Has(type))
-      {
-        if (m_size < kMaxTypesCount)
-          Add(type);
-        else
-          LOG(LWARNING, ("Type could not be added, MaxTypesCount exceeded"));
-      }
-    }
+  uint32_t front() const
+  {
+    ASSERT(m_size > 0, ());
+    return m_types[0];
+  }
+  auto begin() const { return m_types.cbegin(); }
+  auto end() const { return m_types.cbegin() + m_size; }
+  auto begin() { return m_types.begin(); }
+  auto end() { return m_types.begin() + m_size; }
 
-    GeomType GetGeomType() const { return m_geomType; }
+  /// Assume that m_types is already sorted by SortBySpec function.
+  uint32_t GetBestType() const
+  {
+    // 0 - is an empty type.
+    return (m_size > 0 ? m_types[0] : 0);
+  }
 
-    size_t Size() const { return m_size; }
-    bool Empty() const { return (m_size == 0); }
+  bool Has(uint32_t type) const { return base::IsExist(*this, type); }
 
-    uint32_t front() const
-    {
-      ASSERT(m_size > 0, ());
-      return m_types[0];
-    }
-    auto begin() const { return m_types.cbegin(); }
-    auto end() const { return m_types.cbegin() + m_size; }
-    auto begin() { return m_types.begin(); }
-    auto end() { return m_types.begin() + m_size; }
+  // More _natural_ way of checking than Has, including subclass types hierarchy.
+  // "railway-station-subway" holder returns true for "railway-station" input.
+  bool HasWithSubclass(uint32_t type) const;
 
-    /// Assume that m_types is already sorted by SortBySpec function.
-    uint32_t GetBestType() const
-    {
-      // 0 - is an empty type.
-      return (m_size > 0 ? m_types[0] : 0);
-    }
+  template <typename Fn>
+  bool RemoveIf(Fn && fn)
+  {
+    size_t const oldSize = m_size;
 
-    bool Has(uint32_t type) const { return base::IsExist(*this, type); }
+    auto const e = std::remove_if(begin(), end(), std::forward<Fn>(fn));
+    m_size = std::distance(begin(), e);
 
-    // More _natural_ way of checking than Has, including subclass types hierarchy.
-    // "railway-station-subway" holder returns true for "railway-station" input.
-    bool HasWithSubclass(uint32_t type) const;
+    return (m_size != oldSize);
+  }
 
-    template <typename Fn>
-    bool RemoveIf(Fn && fn)
-    {
-      size_t const oldSize = m_size;
+  void Remove(uint32_t type);
 
-      auto const e = std::remove_if(begin(), end(), std::forward<Fn>(fn));
-      m_size = std::distance(begin(), e);
+  /// Used in tests only to check UselessTypesChecker
+  /// (which is used in the generator to discard least important types if max types count is exceeded).
+  void SortByUseless();
 
-      return (m_size != oldSize);
-    }
+  /// Sort types by it's specification (more detailed type goes first). Should be used in client app.
+  void SortBySpec();
 
-    void Remove(uint32_t type);
+  bool Equals(TypesHolder const & other) const;
 
-    /// Used in tests only to check UselessTypesChecker
-    /// (which is used in the generator to discard least important types if max types count is exceeded).
-    void SortByUseless();
+  std::vector<std::string> ToObjectNames() const;
 
-    /// Sort types by it's specification (more detailed type goes first). Should be used in client app.
-    void SortBySpec();
+private:
+  Types m_types = {};
+  size_t m_size = 0;
 
-    bool Equals(TypesHolder const & other) const;
+  GeomType m_geomType = GeomType::Undefined;
+};
 
-    std::vector<std::string> ToObjectNames() const;
+std::string DebugPrint(TypesHolder const & holder);
 
-  private:
-    Types m_types = {};
-    size_t m_size = 0;
-
-    GeomType m_geomType = GeomType::Undefined;
-  };
-
-  std::string DebugPrint(TypesHolder const & holder);
-
-  uint8_t CalculateHeader(size_t const typesCount, HeaderGeomType const headerGeomType,
-                          FeatureParamsBase const & params);
+uint8_t CalculateHeader(size_t const typesCount, HeaderGeomType const headerGeomType, FeatureParamsBase const & params);
 }  // namespace feature
 
 struct FeatureParamsBase
@@ -162,7 +162,7 @@ struct FeatureParamsBase
   void MakeZero();
   bool SetDefaultNameIfEmpty(std::string const & s);
 
-  bool operator == (FeatureParamsBase const & rhs) const;
+  bool operator==(FeatureParamsBase const & rhs) const;
 
   bool IsValid() const;
   std::string DebugString() const;
@@ -186,16 +186,10 @@ struct FeatureParamsBase
       auto const headerGeomType = static_cast<HeaderGeomType>(header & HEADER_MASK_GEOMTYPE);
       switch (headerGeomType)
       {
-      case HeaderGeomType::Point:
-        WriteToSink(sink, rank);
-        break;
-      case HeaderGeomType::Line:
-        utils::WriteString(sink, ref);
-        break;
+      case HeaderGeomType::Point: WriteToSink(sink, rank); break;
+      case HeaderGeomType::Line: utils::WriteString(sink, ref); break;
       case HeaderGeomType::Area:
-      case HeaderGeomType::PointEx:
-        house.Write(sink);
-        break;
+      case HeaderGeomType::PointEx: house.Write(sink); break;
       }
     }
   }
@@ -216,16 +210,10 @@ struct FeatureParamsBase
       auto const headerGeomType = static_cast<HeaderGeomType>(header & HEADER_MASK_GEOMTYPE);
       switch (headerGeomType)
       {
-      case HeaderGeomType::Point:
-        rank = ReadPrimitiveFromSource<uint8_t>(src);
-        break;
-      case HeaderGeomType::Line:
-        utils::ReadString(src, ref);
-        break;
+      case HeaderGeomType::Point: rank = ReadPrimitiveFromSource<uint8_t>(src); break;
+      case HeaderGeomType::Line: utils::ReadString(src, ref); break;
       case HeaderGeomType::Area:
-      case HeaderGeomType::PointEx:
-        house.Read(src);
-        break;
+      case HeaderGeomType::PointEx: house.Read(src); break;
       }
     }
   }
@@ -256,7 +244,12 @@ public:
   /// the special subway type for the correspondent city.
   void SetRwSubwayType(char const * cityName);
 
-  enum TypesResult { TYPES_GOOD, TYPES_EMPTY, TYPES_EXCEED_MAX };
+  enum TypesResult
+  {
+    TYPES_GOOD,
+    TYPES_EMPTY,
+    TYPES_EXCEED_MAX
+  };
   TypesResult FinishAddingTypesEx();
   bool FinishAddingTypes() { return FinishAddingTypesEx() != TYPES_EMPTY; }
 
@@ -348,7 +341,8 @@ public:
   void SetStreet(std::string s);
   std::string_view GetStreet() const;
 
-  template <class TSink> void SerializeAddress(TSink & sink) const
+  template <class TSink>
+  void SerializeAddress(TSink & sink) const
   {
     m_addrTags.SerializeForMwmTmp(sink);
   }
diff --git a/libs/indexer/feature_decl.cpp b/libs/indexer/feature_decl.cpp
index 5fc6e4c5a..9bc2c03e9 100644
--- a/libs/indexer/feature_decl.cpp
+++ b/libs/indexer/feature_decl.cpp
@@ -15,10 +15,10 @@ std::string ToString(GeomType type)
 {
   switch (type)
   {
-    case GeomType::Undefined: return "Undefined";
-    case GeomType::Point: return "Point";
-    case GeomType::Line: return "Line";
-    case GeomType::Area: return "Area";
+  case GeomType::Undefined: return "Undefined";
+  case GeomType::Point: return "Point";
+  case GeomType::Line: return "Line";
+  case GeomType::Area: return "Area";
   }
   UNREACHABLE();
 }
@@ -41,7 +41,6 @@ std::string DebugPrint(FeatureID const & id)
   return "{ " + DebugPrint(id.m_mwmId) + ", " + std::to_string(id.m_index) + " }";
 }
 
-
 std::string FeatureID::GetMwmName() const
 {
   return IsValid() ? m_mwmId.GetInfo()->GetCountryName() : std::string();
@@ -59,10 +58,8 @@ bool FeatureID::IsEqualCountry(base::StringIL const & lst) const
 
   auto const & name = m_mwmId.GetInfo()->GetCountryName();
   for (char const * e : lst)
-  {
     if (name.starts_with(e))
       return true;
-  }
   return false;
 }
 
diff --git a/libs/indexer/feature_decl.hpp b/libs/indexer/feature_decl.hpp
index cdc98fed0..e843f90d2 100644
--- a/libs/indexer/feature_decl.hpp
+++ b/libs/indexer/feature_decl.hpp
@@ -39,10 +39,7 @@ struct FeatureID
     return m_index < r.m_index;
   }
 
-  bool operator==(FeatureID const & r) const
-  {
-    return m_mwmId == r.m_mwmId && m_index == r.m_index;
-  }
+  bool operator==(FeatureID const & r) const { return m_mwmId == r.m_mwmId && m_index == r.m_index; }
 
   bool operator!=(FeatureID const & r) const { return !(*this == r); }
 
diff --git a/libs/indexer/feature_impl.cpp b/libs/indexer/feature_impl.cpp
index c1d55a480..28467a956 100644
--- a/libs/indexer/feature_impl.cpp
+++ b/libs/indexer/feature_impl.cpp
@@ -16,4 +16,4 @@ uint64_t RankToPopulation(uint8_t r)
   return static_cast<uint64_t>(std::pow(1.1, r));
 }
 
-} // namespace feature
+}  // namespace feature
diff --git a/libs/indexer/feature_impl.hpp b/libs/indexer/feature_impl.hpp
index d0dd719df..5db1b2c34 100644
--- a/libs/indexer/feature_impl.hpp
+++ b/libs/indexer/feature_impl.hpp
@@ -6,12 +6,15 @@
 
 #include <string>
 
-namespace strings { class UniString; }
+namespace strings
+{
+class UniString;
+}
 
 namespace feature
 {
-int constexpr g_arrWorldScales[] = { 3, 5, 7, scales::GetUpperWorldScale() };
-int constexpr g_arrCountryScales[] = { 10, 12, 14, scales::GetUpperScale() };
+int constexpr g_arrWorldScales[] = {3, 5, 7, scales::GetUpperWorldScale()};
+int constexpr g_arrCountryScales[] = {10, 12, 14, scales::GetUpperScale()};
 static_assert(std::size(g_arrWorldScales) == std::size(g_arrCountryScales));
 
 inline std::string GetTagForIndex(std::string const & prefix, size_t ind)
@@ -22,4 +25,4 @@ inline std::string GetTagForIndex(std::string const & prefix, size_t ind)
 
 uint8_t PopulationToRank(uint64_t p);
 uint64_t RankToPopulation(uint8_t r);
-} // namespace feature
+}  // namespace feature
diff --git a/libs/indexer/feature_meta.cpp b/libs/indexer/feature_meta.cpp
index e9867c802..ca06fadb0 100644
--- a/libs/indexer/feature_meta.cpp
+++ b/libs/indexer/feature_meta.cpp
@@ -22,7 +22,7 @@ char constexpr const * kBaseCommonsUrl =
 #else
     "https://commons.wikimedia.org/wiki/";
 #endif
-} // namespace
+}  // namespace
 
 string Metadata::ToWikiURL(std::string v)
 {
@@ -173,21 +173,15 @@ bool Metadata::TypeFromString(string_view k, Metadata::EType & outType)
 void Metadata::ClearPOIAttribs()
 {
   for (auto i = m_metadata.begin(); i != m_metadata.end();)
-  {
-    if (i->first != Metadata::FMD_ELE &&
-        i->first != Metadata::FMD_POSTCODE &&
-        i->first != Metadata::FMD_FLATS &&
-        i->first != Metadata::FMD_HEIGHT &&
-        i->first != Metadata::FMD_MIN_HEIGHT &&
-        i->first != Metadata::FMD_BUILDING_LEVELS &&
-        i->first != Metadata::FMD_TEST_ID &&
+    if (i->first != Metadata::FMD_ELE && i->first != Metadata::FMD_POSTCODE && i->first != Metadata::FMD_FLATS &&
+        i->first != Metadata::FMD_HEIGHT && i->first != Metadata::FMD_MIN_HEIGHT &&
+        i->first != Metadata::FMD_BUILDING_LEVELS && i->first != Metadata::FMD_TEST_ID &&
         i->first != Metadata::FMD_BUILDING_MIN_LEVEL)
     {
       i = m_metadata.erase(i);
     }
     else
       ++i;
-  }
 }
 
 void RegionData::SetLanguages(vector<string> const & codes)
@@ -211,10 +205,8 @@ void RegionData::GetLanguages(vector<int8_t> & langs) const
 bool RegionData::HasLanguage(int8_t const lang) const
 {
   for (auto const lng : Get(RegionData::Type::RD_LANGUAGES))
-  {
     if (lng == lang)
       return true;
-  }
   return false;
 }
 
@@ -316,17 +308,11 @@ string DebugPrint(Metadata const & metadata)
       res.append(DebugPrint(t)).append("=");
       switch (t)
       {
-      case Metadata::FMD_DESCRIPTION:
-        res += DebugPrint(StringUtf8Multilang::FromBuffer(std::string(sv)));
-        break;
+      case Metadata::FMD_DESCRIPTION: res += DebugPrint(StringUtf8Multilang::FromBuffer(std::string(sv))); break;
       case Metadata::FMD_CUSTOM_IDS:
       case Metadata::FMD_PRICE_RATES:
-      case Metadata::FMD_RATINGS:
-        res += DebugPrint(indexer::CustomKeyValue(sv));
-        break;
-      default:
-        res.append(sv);
-        break;
+      case Metadata::FMD_RATINGS: res += DebugPrint(indexer::CustomKeyValue(sv)); break;
+      default: res.append(sv); break;
       }
     }
   }
diff --git a/libs/indexer/feature_meta.hpp b/libs/indexer/feature_meta.hpp
index 1d765f938..4ff611c3b 100644
--- a/libs/indexer/feature_meta.hpp
+++ b/libs/indexer/feature_meta.hpp
@@ -61,10 +61,7 @@ public:
     }
   }
 
-  inline bool Equals(MetadataBase const & other) const
-  {
-    return m_metadata == other.m_metadata;
-  }
+  inline bool Equals(MetadataBase const & other) const { return m_metadata == other.m_metadata; }
 
   void Clear() { m_metadata.clear(); }
 
@@ -107,9 +104,10 @@ public:
     FMD_FAX_NUMBER = 4,
     FMD_STARS = 5,
     FMD_OPERATOR = 6,
-    //FMD_URL = 7,        // Deprecated, use FMD_WEBSITE
+    // FMD_URL = 7,        // Deprecated, use FMD_WEBSITE
     FMD_WEBSITE = 8,
-    /// @todo We have meta and classifier type at the same type. It's ok now for search, but should be revised in future.
+    /// @todo We have meta and classifier type at the same type. It's ok now for search, but should be revised in
+    /// future.
     FMD_INTERNET = 9,
     FMD_ELE = 10,
     FMD_TURN_LANES = 11,
@@ -148,7 +146,7 @@ public:
     FMD_BUILDING_MIN_LEVEL = 40,
     FMD_WIKIMEDIA_COMMONS = 41,
     FMD_CAPACITY = 42,
-    FMD_WHEELCHAIR = 43, // Value is runtime only, data is taken from the classificator types
+    FMD_WHEELCHAIR = 43,  // Value is runtime only, data is taken from the classificator types
     FMD_LOCAL_REF = 44,
     FMD_DRIVE_THROUGH = 45,
     FMD_WEBSITE_MENU = 46,
@@ -166,7 +164,8 @@ public:
   /// Used to normalize tags like "contact:phone", "phone" and "contact:mobile" to a common metadata enum value.
   static bool TypeFromString(std::string_view osmTagKey, EType & outType);
 
-  template <class FnT> void ForEach(FnT && fn) const
+  template <class FnT>
+  void ForEach(FnT && fn) const
   {
     for (auto const & e : m_metadata)
       fn(static_cast<Metadata::EType>(e.first), e.second);
@@ -193,14 +192,12 @@ class AddressData : public MetadataBase
 public:
   enum class Type : uint8_t
   {
-    Street, Place,
+    Street,
+    Place,
   };
 
   // Store single value only.
-  void Set(Type type, std::string_view s)
-  {
-    Set(type, std::string(s));
-  }
+  void Set(Type type, std::string_view s) { Set(type, std::string(s)); }
   void Set(Type type, std::string s)
   {
     if (!s.empty())
@@ -222,15 +219,15 @@ class RegionData : public MetadataBase
 public:
   enum Type : int8_t
   {
-    RD_LANGUAGES,        // list of written languages
-    RD_DRIVING,          // left- or right-hand driving (letter 'l' or 'r')
-    RD_TIMEZONE,         // UTC timezone offset, floating signed number of hours: -3, 4.5
-    RD_ADDRESS_FORMAT,   // address format, re: mapzen
-    RD_PHONE_FORMAT,     // list of strings in "+N NNN NN-NN-NN" format
-    RD_POSTCODE_FORMAT,  // list of strings in "AAA ANN" format
-    RD_PUBLIC_HOLIDAYS,  // fixed PH dates
-    RD_ALLOW_HOUSENAMES, // 'y' if housenames are commonly used
-    RD_LEAP_WEIGHT_SPEED // speed factor for leap weight computation
+    RD_LANGUAGES,         // list of written languages
+    RD_DRIVING,           // left- or right-hand driving (letter 'l' or 'r')
+    RD_TIMEZONE,          // UTC timezone offset, floating signed number of hours: -3, 4.5
+    RD_ADDRESS_FORMAT,    // address format, re: mapzen
+    RD_PHONE_FORMAT,      // list of strings in "+N NNN NN-NN-NN" format
+    RD_POSTCODE_FORMAT,   // list of strings in "AAA ANN" format
+    RD_PUBLIC_HOLIDAYS,   // fixed PH dates
+    RD_ALLOW_HOUSENAMES,  // 'y' if housenames are commonly used
+    RD_LEAP_WEIGHT_SPEED  // speed factor for leap weight computation
   };
 
   // Special values for month references in public holiday definitions.
@@ -274,17 +271,20 @@ public:
   }
 
   /// @see EdgeEstimator::GetLeapWeightSpeed
-//  double GetLeapWeightSpeed(double defaultValue) const
-//  {
-//    if (Has(Type::RD_LEAP_WEIGHT_SPEED))
-//      return std::stod(Get(Type::RD_LEAP_WEIGHT_SPEED));
-//    return defaultValue;
-//  }
+  //  double GetLeapWeightSpeed(double defaultValue) const
+  //  {
+  //    if (Has(Type::RD_LEAP_WEIGHT_SPEED))
+  //      return std::stod(Get(Type::RD_LEAP_WEIGHT_SPEED));
+  //    return defaultValue;
+  //  }
 };
 
 // Prints types in osm-friendly format.
 std::string ToString(feature::Metadata::EType type);
-inline std::string DebugPrint(feature::Metadata::EType type) { return ToString(type); }
+inline std::string DebugPrint(feature::Metadata::EType type)
+{
+  return ToString(type);
+}
 
 std::string DebugPrint(feature::Metadata const & metadata);
 std::string DebugPrint(feature::AddressData const & addressData);
diff --git a/libs/indexer/feature_source.cpp b/libs/indexer/feature_source.cpp
index 7642d835c..da75bb095 100644
--- a/libs/indexer/feature_source.cpp
+++ b/libs/indexer/feature_source.cpp
@@ -37,7 +37,7 @@ std::unique_ptr<FeatureType> FeatureSource::GetOriginalFeature(uint32_t index) c
   ASSERT(m_handle.IsAlive(), ());
   ASSERT(m_vector, ());
   auto ft = m_vector->GetByIndex(index);
-  ft->SetID({ GetMwmId(), index });
+  ft->SetID({GetMwmId(), index});
   return ft;
 }
 
@@ -46,9 +46,11 @@ FeatureStatus FeatureSource::GetFeatureStatus(uint32_t index) const
   return FeatureStatus::Untouched;
 }
 
-std::unique_ptr<FeatureType> FeatureSource::GetModifiedFeature(uint32_t index) const { return {}; }
+std::unique_ptr<FeatureType> FeatureSource::GetModifiedFeature(uint32_t index) const
+{
+  return {};
+}
 
 void FeatureSource::ForEachAdditionalFeature(m2::RectD const & rect, int scale,
                                              std::function<void(uint32_t)> const & fn) const
-{
-}
+{}
diff --git a/libs/indexer/feature_source.hpp b/libs/indexer/feature_source.hpp
index b1a0d46c0..97f92c855 100644
--- a/libs/indexer/feature_source.hpp
+++ b/libs/indexer/feature_source.hpp
@@ -20,10 +20,13 @@ enum class FeatureStatus
   Created     // The feature was created by a user and has been saved in the editor.
   // Note: If a feature was created by a user but hasn't been saved in the editor yet
   // its status is Untouched.
-}; // enum class FeatureStatus
+};  // enum class FeatureStatus
 
 std::string ToString(FeatureStatus fs);
-inline std::string DebugPrint(FeatureStatus fs) { return ToString(fs); }
+inline std::string DebugPrint(FeatureStatus fs)
+{
+  return ToString(fs);
+}
 
 class FeatureSource
 {
diff --git a/libs/indexer/feature_to_osm.cpp b/libs/indexer/feature_to_osm.cpp
index 07148e3a3..e716b0e13 100644
--- a/libs/indexer/feature_to_osm.cpp
+++ b/libs/indexer/feature_to_osm.cpp
@@ -14,9 +14,9 @@ namespace indexer
 {
 // FeatureIdToGeoObjectIdOneWay --------------------------------------------------------------------
 FeatureIdToGeoObjectIdOneWay::FeatureIdToGeoObjectIdOneWay(DataSource const & dataSource)
-  : m_dataSource(dataSource), m_reader(std::unique_ptr<ModelReader>())
-{
-}
+  : m_dataSource(dataSource)
+  , m_reader(std::unique_ptr<ModelReader>())
+{}
 
 bool FeatureIdToGeoObjectIdOneWay::Load()
 {
@@ -93,10 +93,7 @@ bool FeatureIdToGeoObjectIdOneWay::GetGeoObjectId(FeatureID const & fid, base::G
 }
 
 // FeatureIdToGeoObjectIdTwoWay --------------------------------------------------------------------
-FeatureIdToGeoObjectIdTwoWay::FeatureIdToGeoObjectIdTwoWay(DataSource const & dataSource)
-  : m_dataSource(dataSource)
-{
-}
+FeatureIdToGeoObjectIdTwoWay::FeatureIdToGeoObjectIdTwoWay(DataSource const & dataSource) : m_dataSource(dataSource) {}
 
 bool FeatureIdToGeoObjectIdTwoWay::Load()
 {
diff --git a/libs/indexer/feature_to_osm.hpp b/libs/indexer/feature_to_osm.hpp
index 799165ba2..7f3f8fc26 100644
--- a/libs/indexer/feature_to_osm.hpp
+++ b/libs/indexer/feature_to_osm.hpp
@@ -53,23 +53,15 @@ public:
       return;
 
     if (m_mapNodes != nullptr)
-    {
-      m_mapNodes->ForEach(
-          [&](uint32_t fid, uint64_t serialId) { fn(fid, base::MakeOsmNode(serialId)); });
-    }
+      m_mapNodes->ForEach([&](uint32_t fid, uint64_t serialId) { fn(fid, base::MakeOsmNode(serialId)); });
     if (m_mapWays != nullptr)
-    {
-      m_mapWays->ForEach(
-          [&](uint32_t fid, uint64_t serialId) { fn(fid, base::MakeOsmWay(serialId)); });
-    }
+      m_mapWays->ForEach([&](uint32_t fid, uint64_t serialId) { fn(fid, base::MakeOsmWay(serialId)); });
     if (m_mapRelations != nullptr)
-    {
-      m_mapRelations->ForEach(
-          [&](uint32_t fid, uint64_t serialId) { fn(fid, base::MakeOsmRelation(serialId)); });
-    }
+      m_mapRelations->ForEach([&](uint32_t fid, uint64_t serialId) { fn(fid, base::MakeOsmRelation(serialId)); });
   }
 
   using Id2OsmMapT = MapUint32ToValue<uint64_t>;
+
 private:
   DataSource const & m_dataSource;
   MwmSet::MwmId m_mwmId;
@@ -244,8 +236,7 @@ public:
   }
 
   template <typename Sink>
-  static void SerializeV0(Sink & sink, FeatureIdToGeoObjectIdBimapMem const & map,
-                          HeaderV0 & header)
+  static void SerializeV0(Sink & sink, FeatureIdToGeoObjectIdBimapMem const & map, HeaderV0 & header)
   {
     using Type = base::GeoObjectId::Type;
     auto const startPos = base::checked_cast<uint32_t>(sink.Pos());
@@ -262,14 +253,15 @@ public:
   }
 
   template <typename Sink>
-  static void SerializeV0(Sink & sink, base::GeoObjectId::Type type,
-                          FeatureIdToGeoObjectIdBimapMem const & map, uint32_t & offset)
+  static void SerializeV0(Sink & sink, base::GeoObjectId::Type type, FeatureIdToGeoObjectIdBimapMem const & map,
+                          uint32_t & offset)
   {
     offset = base::checked_cast<uint32_t>(sink.Pos());
     std::vector<std::pair<uint32_t, base::GeoObjectId>> entries;
     entries.reserve(map.Size());
     type = NormalizedType(type);
-    map.ForEachEntry([&entries, type](uint32_t const fid, base::GeoObjectId gid) {
+    map.ForEachEntry([&entries, type](uint32_t const fid, base::GeoObjectId gid)
+    {
       if (NormalizedType(gid.GetType()) == type)
         entries.emplace_back(fid, gid);
     });
@@ -289,8 +281,7 @@ public:
   using Id2OsmMapT = FeatureIdToGeoObjectIdOneWay::Id2OsmMapT;
 
   template <typename Reader>
-  static void DeserializeV0(Reader & reader, HeaderV0 const & header,
-                            FeatureIdToGeoObjectIdOneWay & map)
+  static void DeserializeV0(Reader & reader, HeaderV0 const & header, FeatureIdToGeoObjectIdOneWay & map)
   {
     auto const nodesSize = header.m_waysOffset - header.m_nodesOffset;
     auto const waysSize = header.m_relationsOffset - header.m_waysOffset;
@@ -306,8 +297,7 @@ public:
   }
 
   template <typename Reader>
-  static void DeserializeV0(Reader & reader, HeaderV0 const & header,
-                            FeatureIdToGeoObjectIdBimapMem & memMap)
+  static void DeserializeV0(Reader & reader, HeaderV0 const & header, FeatureIdToGeoObjectIdBimapMem & memMap)
   {
     using Type = base::GeoObjectId::Type;
 
@@ -317,23 +307,18 @@ public:
     auto const waysSize = header.m_relationsOffset - header.m_waysOffset;
     auto const relationsSize = header.m_typesSentinelOffset - header.m_relationsOffset;
 
-    DeserializeV0ToMem(*reader.CreateSubReader(header.m_nodesOffset, nodesSize),
-                       Type::ObsoleteOsmNode, memMap);
-    DeserializeV0ToMem(*reader.CreateSubReader(header.m_waysOffset, waysSize), Type::ObsoleteOsmWay,
+    DeserializeV0ToMem(*reader.CreateSubReader(header.m_nodesOffset, nodesSize), Type::ObsoleteOsmNode, memMap);
+    DeserializeV0ToMem(*reader.CreateSubReader(header.m_waysOffset, waysSize), Type::ObsoleteOsmWay, memMap);
+    DeserializeV0ToMem(*reader.CreateSubReader(header.m_relationsOffset, relationsSize), Type::ObsoleteOsmRelation,
                        memMap);
-    DeserializeV0ToMem(*reader.CreateSubReader(header.m_relationsOffset, relationsSize),
-                       Type::ObsoleteOsmRelation, memMap);
   }
 
   template <typename Reader>
-  static void DeserializeV0ToMem(Reader & reader, base::GeoObjectId::Type type,
-                                 FeatureIdToGeoObjectIdBimapMem & memMap)
+  static void DeserializeV0ToMem(Reader & reader, base::GeoObjectId::Type type, FeatureIdToGeoObjectIdBimapMem & memMap)
   {
     auto const map = MapUint32ToValue<uint64_t>::Load(reader, ReadBlockCallback);
     CHECK(map, ());
-    map->ForEach([&](uint32_t fid, uint64_t & serialId) {
-      memMap.Add(fid, base::GeoObjectId(type, serialId));
-    });
+    map->ForEach([&](uint32_t fid, uint64_t & serialId) { memMap.Add(fid, base::GeoObjectId(type, serialId)); });
   }
 
 private:
@@ -356,8 +341,7 @@ private:
     }
   }
 
-  static void ReadBlockCallback(NonOwningReaderSource & src, uint32_t blockSize,
-                                std::vector<uint64_t> & values)
+  static void ReadBlockCallback(NonOwningReaderSource & src, uint32_t blockSize, std::vector<uint64_t> & values)
   {
     values.reserve(blockSize);
     while (src.Size() > 0)
diff --git a/libs/indexer/feature_utils.cpp b/libs/indexer/feature_utils.cpp
index 1a90b8491..8d2c28447 100644
--- a/libs/indexer/feature_utils.cpp
+++ b/libs/indexer/feature_utils.cpp
@@ -6,9 +6,9 @@
 #include "indexer/ftypes_matcher.hpp"
 #include "indexer/scales.hpp"
 
-#include "platform/preferred_languages.hpp"
-#include "platform/localization.hpp"
 #include "platform/distance.hpp"
+#include "platform/localization.hpp"
+#include "platform/preferred_languages.hpp"
 
 #include "coding/string_utf8_multilang.hpp"
 #include "coding/transliteration.hpp"
@@ -37,10 +37,8 @@ void GetMwmLangName(feature::RegionData const & regionData, StrUtf8 const & src,
   regionData.GetLanguages(mwmLangCodes);
 
   for (auto const code : mwmLangCodes)
-  {
     if (src.GetString(code, out))
       return;
-  }
 }
 
 bool GetTransliteratedName(RegionData const & regionData, StrUtf8 const & src, string & out)
@@ -52,10 +50,8 @@ bool GetTransliteratedName(RegionData const & regionData, StrUtf8 const & src, s
 
   string_view srcName;
   for (auto const code : mwmLangCodes)
-  {
     if (src.GetString(code, srcName) && translator.Transliterate(srcName, code, out))
       return true;
-  }
 
   // If default name is available, interpret it as a name for the first mwm language.
   if (!mwmLangCodes.empty() && src.GetString(StrUtf8::kDefaultCode, srcName))
@@ -84,11 +80,8 @@ bool GetBestName(StrUtf8 const & src, vector<int8_t> const & priorityList, strin
   });
 
   // There are many "junk" names in Arabian island.
-  if (bestIndex < priorityList.size() &&
-    priorityList[bestIndex] == StrUtf8::kInternationalCode)
-  {
+  if (bestIndex < priorityList.size() && priorityList[bestIndex] == StrUtf8::kInternationalCode)
     out = out.substr(0, out.find_first_of(','));
-  }
 
   return bestIndex < priorityList.size();
 }
@@ -96,10 +89,10 @@ bool GetBestName(StrUtf8 const & src, vector<int8_t> const & priorityList, strin
 vector<int8_t> GetSimilarLanguages(int8_t lang)
 {
   static unordered_map<int8_t, vector<int8_t>> const kSimilarLanguages = {
-    {GetIndex("be"), {GetIndex("ru")}},
-    {GetIndex("ja"), {GetIndex("ja_kana"), GetIndex("ja_rm")}},
-    {GetIndex("ko"), {GetIndex("ko_rm")}},
-    {GetIndex("zh"), {GetIndex("zh_pinyin")}}};
+      {GetIndex("be"), {GetIndex("ru")}},
+      {GetIndex("ja"), {GetIndex("ja_kana"), GetIndex("ja_rm")}},
+      {GetIndex("ko"), {GetIndex("ko_rm")}},
+      {GetIndex("zh"), {GetIndex("zh_pinyin")}}};
 
   auto const it = kSimilarLanguages.find(lang);
   if (it != kSimilarLanguages.cend())
@@ -114,16 +107,12 @@ bool IsNativeLang(feature::RegionData const & regionData, int8_t deviceLang)
     return true;
 
   for (auto const lang : languages::GetPreferredLangIndexes())
-  {
     if (regionData.HasLanguage(lang))
       return true;
-  }
 
   for (auto const lang : GetSimilarLanguages(deviceLang))
-  {
     if (regionData.HasLanguage(lang))
       return true;
-  }
 
   return false;
 }
@@ -136,10 +125,8 @@ int8_t DefaultLanguage(feature::RegionData const & regionData, vector<int8_t> co
       return lang;
 
     for (auto const similarLang : GetSimilarLanguages(lang))
-    {
       if (regionData.HasLanguage(similarLang))
         return similarLang;
-    }
   }
 
   return StrUtf8::kDefaultCode;
@@ -211,10 +198,8 @@ vector<string> GetLocalizedTypes(ftypes::BaseChecker const & checker, TypesHolde
   auto const & c = classif();
   vector<string> localized;
   for (auto const t : types)
-  {
     if (checker(t))
       localized.push_back(platform::GetLocalizedTypeName(c.GetReadableObjectName(t)));
-  }
   return localized;
 }
 
@@ -240,28 +225,28 @@ public:
   {
     auto const & cl = classif();
 
-    m_TypeContinent   = cl.GetTypeByPath({"place", "continent"});
-    m_TypeCountry     = cl.GetTypeByPath({"place", "country"});
+    m_TypeContinent = cl.GetTypeByPath({"place", "continent"});
+    m_TypeCountry = cl.GetTypeByPath({"place", "country"});
 
-    m_TypeState       = cl.GetTypeByPath({"place", "state"});
-    m_TypeCounty[0]   = cl.GetTypeByPath({"place", "region"});
-    m_TypeCounty[1]   = cl.GetTypeByPath({"place", "county"});
+    m_TypeState = cl.GetTypeByPath({"place", "state"});
+    m_TypeCounty[0] = cl.GetTypeByPath({"place", "region"});
+    m_TypeCounty[1] = cl.GetTypeByPath({"place", "county"});
 
-    m_TypeCity        = cl.GetTypeByPath({"place", "city"});
-    m_TypeTown        = cl.GetTypeByPath({"place", "town"});
+    m_TypeCity = cl.GetTypeByPath({"place", "city"});
+    m_TypeTown = cl.GetTypeByPath({"place", "town"});
 
-    m_TypeVillage[0]  = cl.GetTypeByPath({"place", "village"});
-    m_TypeVillage[1]  = cl.GetTypeByPath({"place", "suburb"});
+    m_TypeVillage[0] = cl.GetTypeByPath({"place", "village"});
+    m_TypeVillage[1] = cl.GetTypeByPath({"place", "suburb"});
 
-    m_TypeSmallVillage[0]  = cl.GetTypeByPath({"place", "hamlet"});
-    m_TypeSmallVillage[1]  = cl.GetTypeByPath({"place", "locality"});
-    m_TypeSmallVillage[2]  = cl.GetTypeByPath({"place", "farm"});
+    m_TypeSmallVillage[0] = cl.GetTypeByPath({"place", "hamlet"});
+    m_TypeSmallVillage[1] = cl.GetTypeByPath({"place", "locality"});
+    m_TypeSmallVillage[2] = cl.GetTypeByPath({"place", "farm"});
   }
 
   void CorrectScaleForVisibility(TypesHolder const & types, int & scale) const
   {
     pair<int, int> const scaleR = GetDrawableScaleRangeForRules(types, RULE_ANY_TEXT);
-    ASSERT_LESS_OR_EQUAL ( scaleR.first, scaleR.second, () );
+    ASSERT_LESS_OR_EQUAL(scaleR.first, scaleR.second, ());
 
     // Result types can be without visible texts (matched by category).
     if (scaleR.first != -1)
@@ -336,15 +321,14 @@ FeatureEstimator const & GetFeatureEstimator()
 }  // namespace
 
 static constexpr std::string_view kStarSymbol = "★";
-static constexpr std::string_view kMountainSymbol= "▲";
+static constexpr std::string_view kMountainSymbol = "▲";
 static constexpr std::string_view kDrinkingWaterYes = "🚰";
 static constexpr std::string_view kDrinkingWaterNo = "🚱";
 
 NameParamsIn::NameParamsIn(StringUtf8Multilang const & src_, RegionData const & regionData_,
                            std::string_view deviceLang_, bool allowTranslit_)
   : NameParamsIn(src_, regionData_, StringUtf8Multilang::GetLangIndex(deviceLang_), allowTranslit_)
-{
-}
+{}
 
 bool NameParamsIn::IsNativeOrSimilarLang() const
 {
@@ -407,12 +391,14 @@ void GetReadableName(NameParamsIn const & in, NameParamsOut & out)
     GetReadableNameImpl(in, in.IsNativeOrSimilarLang(), out);
 }
 
-string const GetReadableAddress(string const & address) {
+string const GetReadableAddress(string const & address)
+{
   // Instead of housenumber range strings like 123:456, hyphenate like 123 - 456
   string out = address;
   size_t pos = 0;
-  while ((pos = out.find(":", pos)) != string::npos) {
-    out.replace(pos, 1, "\u2009\u2013\u2009"); // thin space + en-dash + thin space
+  while ((pos = out.find(":", pos)) != string::npos)
+  {
+    out.replace(pos, 1, "\u2009\u2013\u2009");  // thin space + en-dash + thin space
     break;
   }
   return out;
@@ -482,7 +468,7 @@ string GetLocalizedFeeType(TypesHolder const & types)
 {
   auto const & isFeeType = ftypes::IsFeeTypeChecker::Instance();
   auto localized_types = GetLocalizedTypes(isFeeType, types);
-  ASSERT_LESS_OR_EQUAL ( localized_types.size(), 1, () );
+  ASSERT_LESS_OR_EQUAL(localized_types.size(), 1, ());
   if (localized_types.empty())
     return "";
   return localized_types[0];
@@ -490,20 +476,17 @@ string GetLocalizedFeeType(TypesHolder const & types)
 
 string GetReadableWheelchairType(TypesHolder const & types)
 {
-    auto const value = ftraits::Wheelchair::GetValue(types);
-    if (!value.has_value())
-      return "";
+  auto const value = ftraits::Wheelchair::GetValue(types);
+  if (!value.has_value())
+    return "";
 
-    switch (*value)
-    {
-      case ftraits::WheelchairAvailability::No:
-        return "wheelchair-no";
-      case ftraits::WheelchairAvailability::Yes:
-        return "wheelchair-yes";
-      case ftraits::WheelchairAvailability::Limited:
-        return "wheelchair-limited";
-    }
-    UNREACHABLE();
+  switch (*value)
+  {
+  case ftraits::WheelchairAvailability::No: return "wheelchair-no";
+  case ftraits::WheelchairAvailability::Yes: return "wheelchair-yes";
+  case ftraits::WheelchairAvailability::Limited: return "wheelchair-limited";
+  }
+  UNREACHABLE();
 }
 
 std::optional<ftraits::WheelchairAvailability> GetWheelchairType(TypesHolder const & types)
@@ -531,10 +514,8 @@ string FormatDrinkingWater(TypesHolder const & types)
 
   switch (*value)
   {
-    case ftraits::DrinkingWaterAvailability::No:
-      return std::string{kDrinkingWaterNo};
-    case ftraits::DrinkingWaterAvailability::Yes:
-      return std::string{kDrinkingWaterYes};
+  case ftraits::DrinkingWaterAvailability::No: return std::string{kDrinkingWaterNo};
+  case ftraits::DrinkingWaterAvailability::Yes: return std::string{kDrinkingWaterYes};
   }
   UNREACHABLE();
 }
@@ -553,7 +534,7 @@ string FormatElevation(string_view elevation)
   {
     double value;
     if (strings::to_double(elevation, value))
-        return std::string{kMountainSymbol} + platform::Distance::FormatAltitude(value);
+      return std::string{kMountainSymbol} + platform::Distance::FormatAltitude(value);
     else
       LOG(LWARNING, ("Invalid elevation metadata:", elevation));
   }
@@ -612,4 +593,4 @@ YesNoUnknown YesNoUnknownFromString(std::string_view str)
     return YesNoUnknown::Unknown;
 }
 
-} // namespace feature
+}  // namespace feature
diff --git a/libs/indexer/feature_utils.hpp b/libs/indexer/feature_utils.hpp
index fc0795170..17a832924 100644
--- a/libs/indexer/feature_utils.hpp
+++ b/libs/indexer/feature_utils.hpp
@@ -11,173 +11,178 @@ class StringUtf8Multilang;
 
 namespace feature
 {
-  static constexpr uint8_t kMaxStarsCount = 7;
-  static constexpr std::string_view kFieldsSeparator = " • ";
-  static constexpr std::string_view kToiletsSymbol = "🚻";
-  static constexpr std::string_view kAtmSymbol = "💳";
-  static constexpr std::string_view kWheelchairSymbol = "♿️";
-  static constexpr std::string_view kWifiSymbol = "🛜";
+static constexpr uint8_t kMaxStarsCount = 7;
+static constexpr std::string_view kFieldsSeparator = " • ";
+static constexpr std::string_view kToiletsSymbol = "🚻";
+static constexpr std::string_view kAtmSymbol = "💳";
+static constexpr std::string_view kWheelchairSymbol = "♿️";
+static constexpr std::string_view kWifiSymbol = "🛜";
 
-  /// OSM internet_access tag values.
-  enum class Internet
+/// OSM internet_access tag values.
+enum class Internet
+{
+  Unknown,   //!< Internet state is unknown (default).
+  Wlan,      //!< Wireless Internet access is present.
+  Terminal,  //!< A computer with internet service.
+  Wired,     //!< Wired Internet access is present.
+  Yes,       //!< Unspecified Internet access is available.
+  No         //!< There is definitely no any Internet access.
+};
+std::string DebugPrint(Internet internet);
+/// @param[in]  inet  Should be lowercase like in DebugPrint.
+Internet InternetFromString(std::string_view inet);
+
+YesNoUnknown YesNoUnknownFromString(std::string_view str);
+
+// Address house numbers interpolation.
+enum class InterpolType : uint8_t
+{
+  None,
+  Odd,
+  Even,
+  Any
+};
+
+class TypesHolder;
+class RegionData;
+
+/// Get viewport scale to show given feature. Used in search.
+int GetFeatureViewportScale(TypesHolder const & types);
+
+// Returns following languages given |lang|:
+// - |lang|;
+// - languages that we know are similar to |lang|;
+std::vector<int8_t> GetSimilar(int8_t deviceLang);
+
+struct NameParamsIn
+{
+  NameParamsIn(StringUtf8Multilang const & src_, RegionData const & regionData_, int8_t deviceLang_,
+               bool allowTranslit_)
+    : src(src_)
+    , regionData(regionData_)
+    , deviceLang(deviceLang_)
+    , allowTranslit(allowTranslit_)
+  {}
+  NameParamsIn(StringUtf8Multilang const & src, RegionData const & regionData, std::string_view deviceLang,
+               bool allowTranslit);
+
+  StringUtf8Multilang const & src;
+  RegionData const & regionData;
+  int8_t const deviceLang;
+  bool allowTranslit;
+
+  bool IsNativeOrSimilarLang() const;
+};
+
+struct NameParamsOut
+{
+  /// In case when primary name is empty it will be propagated from secondary and secondary will be
+  /// cleared. In case when primary name contains secondary name then secondary will be cleared.
+  std::string_view primary, secondary;
+  std::string transliterated;
+
+  /// Call this fuction to get primary name when allowTranslit == true.
+  std::string_view GetPrimary() const { return (!primary.empty() ? primary : std::string_view(transliterated)); }
+
+  void Clear()
   {
-    Unknown,  //!< Internet state is unknown (default).
-    Wlan,     //!< Wireless Internet access is present.
-    Terminal, //!< A computer with internet service.
-    Wired,    //!< Wired Internet access is present.
-    Yes,      //!< Unspecified Internet access is available.
-    No        //!< There is definitely no any Internet access.
-  };
-  std::string DebugPrint(Internet internet);
-  /// @param[in]  inet  Should be lowercase like in DebugPrint.
-  Internet InternetFromString(std::string_view inet);
+    primary = secondary = {};
+    transliterated.clear();
+  }
+};
 
-  YesNoUnknown YesNoUnknownFromString(std::string_view str);
+/// When the language of the device is equal to one of the languages of the MWM
+/// (or similar to device languages) only single name scheme is used. See GetReadableName method.
+/// Primary name using priority:
+/// - device language name;
+/// - languages that we know are similar to device language;
+/// - international name;
+/// - english name;
+/// - transliterated name (if allowed).
+/// Secondary name using priority:
+/// - default name;
+/// - international name;
+/// - country language name;
+/// - english name.
+void GetPreferredNames(NameParamsIn const & in, NameParamsOut & out);
 
-  // Address house numbers interpolation.
-  enum class InterpolType : uint8_t { None, Odd, Even, Any };
+/// When MWM contains user's language (or similar to device languages if provided),
+/// the priority is the following:
+/// - device language name;
+/// - default name;
+/// - languages that we know are similar to device language;
+/// - international name;
+/// - english name;
+/// - transliterated name (if allowed);
+/// - country language name.
+/// When MWM does not contain user's language (or similar to device languages),
+/// the priority is the following:
+/// - device language name;
+/// - languages that we know are similar to device language;
+/// - international name;
+/// - english name;
+/// - transliterated name (if allowed);
+/// - default name;
+/// - country language name.
+void GetReadableName(NameParamsIn const & in, NameParamsOut & out);
 
-  class TypesHolder;
-  class RegionData;
+/// Format house numbers etc to be more human-readable instead of using symbols like 123:456
+std::string const GetReadableAddress(std::string const & address);
 
-  /// Get viewport scale to show given feature. Used in search.
-  int GetFeatureViewportScale(TypesHolder const & types);
+/// Returns language id as return result and name for search on booking in the @name parameter,
+///  the priority is the following:
+/// - default name;
+/// - country language name;
+/// - english name.
+// int8_t GetNameForSearchOnBooking(RegionData const & regionData, StringUtf8Multilang const & src, std::string & name);
 
-  // Returns following languages given |lang|:
-  // - |lang|;
-  // - languages that we know are similar to |lang|;
-  std::vector<int8_t> GetSimilar(int8_t deviceLang);
+/// Returns preferred name when only the device language is available.
+bool GetPreferredName(StringUtf8Multilang const & src, int8_t deviceLang, std::string_view & out);
 
-  struct NameParamsIn
-  {
-    NameParamsIn(StringUtf8Multilang const & src_, RegionData const & regionData_,
-                 int8_t deviceLang_, bool allowTranslit_)
-      : src(src_), regionData(regionData_), deviceLang(deviceLang_), allowTranslit(allowTranslit_)
-    {
-    }
-    NameParamsIn(StringUtf8Multilang const & src, RegionData const & regionData,
-                 std::string_view deviceLang, bool allowTranslit);
+/// Returns priority list of language codes for feature description,
+/// the priority is the following:
+/// - device language codes in order of preference;
+///   - including default language code, if MWM contains the language (or similar to device language if provided);
+///   - including languages that we know are similar to device language;
+/// - international language code;
+/// - english language code;
+/// - default language code;
+std::vector<int8_t> GetDescriptionLangPriority(RegionData const & regionData);
 
-    StringUtf8Multilang const & src;
-    RegionData const & regionData;
-    int8_t const deviceLang;
-    bool allowTranslit;
+// Returns vector of cuisines readable names from classificator.
+std::vector<std::string> GetCuisines(TypesHolder const & types);
 
-    bool IsNativeOrSimilarLang() const;
-  };
+// Returns vector of cuisines names localized by platform.
+std::vector<std::string> GetLocalizedCuisines(TypesHolder const & types);
 
-  struct NameParamsOut
-  {
-    /// In case when primary name is empty it will be propagated from secondary and secondary will be
-    /// cleared. In case when primary name contains secondary name then secondary will be cleared.
-    std::string_view primary, secondary;
-    std::string transliterated;
+// Returns vector of recycling types readable names from classificator.
+std::vector<std::string> GetRecyclingTypes(TypesHolder const & types);
 
-    /// Call this fuction to get primary name when allowTranslit == true.
-    std::string_view GetPrimary() const
-    {
-      return (!primary.empty() ? primary : std::string_view(transliterated));
-    }
+// Returns vector of recycling types localized by platform.
+std::vector<std::string> GetLocalizedRecyclingTypes(TypesHolder const & types);
 
-    void Clear()
-    {
-      primary = secondary = {};
-      transliterated.clear();
-    }
-  };
+// Returns fee type localized by platform.
+std::string GetLocalizedFeeType(TypesHolder const & types);
 
-  /// When the language of the device is equal to one of the languages of the MWM
-  /// (or similar to device languages) only single name scheme is used. See GetReadableName method.
-  /// Primary name using priority:
-  /// - device language name;
-  /// - languages that we know are similar to device language;
-  /// - international name;
-  /// - english name;
-  /// - transliterated name (if allowed).
-  /// Secondary name using priority:
-  /// - default name;
-  /// - international name;
-  /// - country language name;
-  /// - english name.
-  void GetPreferredNames(NameParamsIn const & in, NameParamsOut & out);
+// Returns readable wheelchair type.
+std::string GetReadableWheelchairType(TypesHolder const & types);
 
-  /// When MWM contains user's language (or similar to device languages if provided),
-  /// the priority is the following:
-  /// - device language name;
-  /// - default name;
-  /// - languages that we know are similar to device language;
-  /// - international name;
-  /// - english name;
-  /// - transliterated name (if allowed);
-  /// - country language name.
-  /// When MWM does not contain user's language (or similar to device languages),
-  /// the priority is the following:
-  /// - device language name;
-  /// - languages that we know are similar to device language;
-  /// - international name;
-  /// - english name;
-  /// - transliterated name (if allowed);
-  /// - default name;
-  /// - country language name.
-  void GetReadableName(NameParamsIn const & in, NameParamsOut & out);
+/// @returns wheelchair availability.
+std::optional<ftraits::WheelchairAvailability> GetWheelchairType(TypesHolder const & types);
 
-  /// Format house numbers etc to be more human-readable instead of using symbols like 123:456
-  std::string const GetReadableAddress(std::string const & address);
+/// Returns true if feature has ATM type.
+bool HasAtm(TypesHolder const & types);
 
-  /// Returns language id as return result and name for search on booking in the @name parameter,
-  ///  the priority is the following:
-  /// - default name;
-  /// - country language name;
-  /// - english name.
-  //int8_t GetNameForSearchOnBooking(RegionData const & regionData, StringUtf8Multilang const & src, std::string & name);
+/// Returns true if feature has Toilets type.
+bool HasToilets(TypesHolder const & types);
 
-  /// Returns preferred name when only the device language is available.
-  bool GetPreferredName(StringUtf8Multilang const & src, int8_t deviceLang, std::string_view & out);
+/// @returns formatted drinking water type.
+std::string FormatDrinkingWater(TypesHolder const & types);
 
-  /// Returns priority list of language codes for feature description,
-  /// the priority is the following:
-  /// - device language codes in order of preference;
-  ///   - including default language code, if MWM contains the language (or similar to device language if provided);
-  ///   - including languages that we know are similar to device language;
-  /// - international language code;
-  /// - english language code;
-  /// - default language code;
-  std::vector<int8_t> GetDescriptionLangPriority(RegionData const & regionData);
+/// @returns starsCount of ★ symbol.
+std::string FormatStars(uint8_t starsCount);
 
-  // Returns vector of cuisines readable names from classificator.
-  std::vector<std::string> GetCuisines(TypesHolder const & types);
-
-  // Returns vector of cuisines names localized by platform.
-  std::vector<std::string> GetLocalizedCuisines(TypesHolder const & types);
-
-  // Returns vector of recycling types readable names from classificator.
-  std::vector<std::string> GetRecyclingTypes(TypesHolder const & types);
-
-  // Returns vector of recycling types localized by platform.
-  std::vector<std::string> GetLocalizedRecyclingTypes(TypesHolder const & types);
-
-  // Returns fee type localized by platform.
-  std::string GetLocalizedFeeType(TypesHolder const & types);
-
-  // Returns readable wheelchair type.
-  std::string GetReadableWheelchairType(TypesHolder const & types);
-
-  /// @returns wheelchair availability.
-  std::optional<ftraits::WheelchairAvailability> GetWheelchairType(TypesHolder const & types);
-
-  /// Returns true if feature has ATM type.
-  bool HasAtm(TypesHolder const & types);
-
-  /// Returns true if feature has Toilets type.
-  bool HasToilets(TypesHolder const & types);
-
-  /// @returns formatted drinking water type.
-  std::string FormatDrinkingWater(TypesHolder const & types);
-
-  /// @returns starsCount of ★ symbol.
-  std::string FormatStars(uint8_t starsCount);
-
-  /// @returns formatted elevation with ▲ symbol and units.
-  std::string FormatElevation(std::string_view elevation);
+/// @returns formatted elevation with ▲ symbol and units.
+std::string FormatElevation(std::string_view elevation);
 
 }  // namespace feature
diff --git a/libs/indexer/feature_visibility.cpp b/libs/indexer/feature_visibility.cpp
index 45ab982e4..2e49656bd 100644
--- a/libs/indexer/feature_visibility.cpp
+++ b/libs/indexer/feature_visibility.cpp
@@ -24,11 +24,11 @@ int CorrectScale(int scale)
   CHECK_LESS_OR_EQUAL(scale, scales::GetUpperStyleScale(), ());
   return min(scale, scales::GetUpperStyleScale());
 }
-} // namespace
+}  // namespace
 
 void GetDrawRule(TypesHolder const & types, int level, drule::KeysT & keys)
 {
-  ASSERT ( keys.empty(), () );
+  ASSERT(keys.empty(), ());
   Classificator const & c = classif();
 
   auto const geomType = types.GetGeomType();
@@ -39,7 +39,7 @@ void GetDrawRule(TypesHolder const & types, int level, drule::KeysT & keys)
 
 void GetDrawRule(vector<uint32_t> const & types, int level, GeomType geomType, drule::KeysT & keys)
 {
-  ASSERT ( keys.empty(), () );
+  ASSERT(keys.empty(), ());
   Classificator const & c = classif();
 
   level = CorrectScale(level);
@@ -60,150 +60,146 @@ void FilterRulesByRuntimeSelector(FeatureType & f, int zoomLevel, drule::KeysT &
 
 namespace
 {
-  class IsDrawableRulesChecker
+class IsDrawableRulesChecker
+{
+  int m_scale;
+  GeomType m_geomType;
+  bool m_arr[4];
+
+public:
+  IsDrawableRulesChecker(int scale, GeomType geomType, int rules) : m_scale(scale), m_geomType(geomType)
   {
-    int m_scale;
-    GeomType m_geomType;
-    bool m_arr[4];
+    m_arr[0] = rules & RULE_CAPTION;
+    m_arr[1] = rules & RULE_PATH_TEXT;
+    m_arr[2] = rules & RULE_SYMBOL;
+    m_arr[3] = rules & RULE_LINE;
+  }
 
-  public:
-    IsDrawableRulesChecker(int scale, GeomType geomType, int rules)
-      : m_scale(scale), m_geomType(geomType)
+  bool operator()(ClassifObject const * p) const
+  {
+    drule::KeysT keys;
+    p->GetSuitable(m_scale, m_geomType, keys);
+
+    for (auto const & k : keys)
     {
-      m_arr[0] = rules & RULE_CAPTION;
-      m_arr[1] = rules & RULE_PATH_TEXT;
-      m_arr[2] = rules & RULE_SYMBOL;
-      m_arr[3] = rules & RULE_LINE;
-    }
-
-    bool operator() (ClassifObject const * p) const
-    {
-      drule::KeysT keys;
-      p->GetSuitable(m_scale, m_geomType, keys);
-
-      for (auto const & k : keys)
+      if ((m_arr[0] && k.m_type == drule::caption) || (m_arr[1] && k.m_type == drule::pathtext) ||
+          (m_arr[2] && k.m_type == drule::symbol) || (m_arr[3] && k.m_type == drule::line))
       {
-        if ((m_arr[0] && k.m_type == drule::caption) ||
-            (m_arr[1] && k.m_type == drule::pathtext) ||
-            (m_arr[2] && k.m_type == drule::symbol) ||
-            (m_arr[3] && k.m_type == drule::line))
-        {
-          return true;
-        }
+        return true;
       }
-
-      return false;
     }
-  };
 
-  /// @name Add here classifier types that don't have drawing rules but needed for algorithms.
-  /// @todo The difference between \a TypeAlwaysExists and \a IsUsefulNondrawableType is not
-  /// obvious. TypeAlwaysExists are *indexed* in category search, while IsUsefulNondrawableType are *not*.
-  /// The functions names and set of types looks strange now and definitely should be revised.
-  /// @{
-
-  /// These types will be included in geometry index for the corresponding scale (World or Country).
-  /// Needed for search and routing algorithms.
-  int GetNondrawableStandaloneIndexScale(uint32_t type, GeomType geomType = GeomType::Undefined)
-  {
-    auto const & cl = classif();
-
-    static uint32_t const shuttle = cl.GetTypeByPath({"route", "shuttle_train"});
-    if ((geomType == GeomType::Line || geomType == GeomType::Undefined) && type == shuttle)
-      return scales::GetUpperScale();
-
-    static uint32_t const region = cl.GetTypeByPath({"place", "region"});
-    if ((geomType == GeomType::Point || geomType == GeomType::Undefined) && type == region)
-      return scales::GetUpperWorldScale();
-
-    ftype::TruncValue(type, 1);
-    static uint32_t const addr = cl.GetTypeByPath({"addr:interpolation"});
-    if ((geomType == GeomType::Line || geomType == GeomType::Undefined) && type == addr)
-      return scales::GetUpperScale();
-
-    return -1;
+    return false;
   }
+};
 
-  bool IsUsefulStandaloneType(uint32_t type, GeomType geomType = GeomType::Undefined)
+/// @name Add here classifier types that don't have drawing rules but needed for algorithms.
+/// @todo The difference between \a TypeAlwaysExists and \a IsUsefulNondrawableType is not
+/// obvious. TypeAlwaysExists are *indexed* in category search, while IsUsefulNondrawableType are *not*.
+/// The functions names and set of types looks strange now and definitely should be revised.
+/// @{
+
+/// These types will be included in geometry index for the corresponding scale (World or Country).
+/// Needed for search and routing algorithms.
+int GetNondrawableStandaloneIndexScale(uint32_t type, GeomType geomType = GeomType::Undefined)
+{
+  auto const & cl = classif();
+
+  static uint32_t const shuttle = cl.GetTypeByPath({"route", "shuttle_train"});
+  if ((geomType == GeomType::Line || geomType == GeomType::Undefined) && type == shuttle)
+    return scales::GetUpperScale();
+
+  static uint32_t const region = cl.GetTypeByPath({"place", "region"});
+  if ((geomType == GeomType::Point || geomType == GeomType::Undefined) && type == region)
+    return scales::GetUpperWorldScale();
+
+  ftype::TruncValue(type, 1);
+  static uint32_t const addr = cl.GetTypeByPath({"addr:interpolation"});
+  if ((geomType == GeomType::Line || geomType == GeomType::Undefined) && type == addr)
+    return scales::GetUpperScale();
+
+  return -1;
+}
+
+bool IsUsefulStandaloneType(uint32_t type, GeomType geomType = GeomType::Undefined)
+{
+  return GetNondrawableStandaloneIndexScale(type, geomType) >= 0;
+}
+
+bool TypeAlwaysExists(uint32_t type, GeomType geomType = GeomType::Undefined)
+{
+  auto const & cl = classif();
+  if (!cl.IsTypeValid(type))
+    return false;
+
+  if (IsUsefulStandaloneType(type, geomType))
+    return true;
+
+  uint8_t const typeLevel = ftype::GetLevel(type);
+  ftype::TruncValue(type, 1);
+
+  if (geomType != GeomType::Line)
   {
-    return GetNondrawableStandaloneIndexScale(type, geomType) >= 0;
-  }
-
-  bool TypeAlwaysExists(uint32_t type, GeomType geomType = GeomType::Undefined)
-  {
-    auto const & cl = classif();
-    if (!cl.IsTypeValid(type))
-      return false;
-
-    if (IsUsefulStandaloneType(type, geomType))
-      return true;
-
-    uint8_t const typeLevel = ftype::GetLevel(type);
-    ftype::TruncValue(type, 1);
-
-    if (geomType != GeomType::Line)
-    {
-      static uint32_t const arrTypes[] = {
+    static uint32_t const arrTypes[] = {
         cl.GetTypeByPath({"internet_access"}),
         cl.GetTypeByPath({"toilets"}),
         cl.GetTypeByPath({"drinking_water"}),
+    };
+    if (base::IsExist(arrTypes, type))
+      return true;
+
+    // Exclude generic 1-arity types like [organic].
+    if (typeLevel >= 2)
+    {
+      static uint32_t const arrTypes[] = {
+          cl.GetTypeByPath({"organic"}),
+          cl.GetTypeByPath({"recycling"}),
+          cl.GetTypeByPath({"wheelchair"}),
       };
       if (base::IsExist(arrTypes, type))
         return true;
-
-      // Exclude generic 1-arity types like [organic].
-      if (typeLevel >= 2)
-      {
-        static uint32_t const arrTypes[] = {
-            cl.GetTypeByPath({"organic"}),
-            cl.GetTypeByPath({"recycling"}),
-            cl.GetTypeByPath({"wheelchair"}),
-        };
-        if (base::IsExist(arrTypes, type))
-          return true;
-      }
     }
-
-    static uint32_t const complexEntry = cl.GetTypeByPath({"complex_entry"});
-    return (type == complexEntry);
   }
 
-  bool IsUsefulNondrawableType(uint32_t type, GeomType geomType = GeomType::Undefined)
+  static uint32_t const complexEntry = cl.GetTypeByPath({"complex_entry"});
+  return (type == complexEntry);
+}
+
+bool IsUsefulNondrawableType(uint32_t type, GeomType geomType = GeomType::Undefined)
+{
+  auto const & cl = classif();
+  if (!cl.IsTypeValid(type))
+    return false;
+
+  if (TypeAlwaysExists(type, geomType))
+    return true;
+
+  // Exclude generic 1-arity types like [wheelchair].
+  if (ftype::GetLevel(type) < 2)
+    return false;
+
+  static uint32_t const hwtag = cl.GetTypeByPath({"hwtag"});
+  static uint32_t const psurface = cl.GetTypeByPath({"psurface"});
+
+  /// @todo "roundabout" type itself has caption drawing rules (for point junctions?).
+  if ((geomType == GeomType::Line || geomType == GeomType::Undefined) && ftypes::IsRoundAboutChecker::Instance()(type))
+    return true;
+
+  ftype::TruncValue(type, 1);
+  if (geomType == GeomType::Line || geomType == GeomType::Undefined)
   {
-    auto const & cl = classif();
-    if (!cl.IsTypeValid(type))
-      return false;
-
-    if (TypeAlwaysExists(type, geomType))
+    if (type == hwtag || type == psurface)
       return true;
+  }
 
-    // Exclude generic 1-arity types like [wheelchair].
-    if (ftype::GetLevel(type) < 2)
-      return false;
-
-    static uint32_t const hwtag = cl.GetTypeByPath({"hwtag"});
-    static uint32_t const psurface = cl.GetTypeByPath({"psurface"});
-
-    /// @todo "roundabout" type itself has caption drawing rules (for point junctions?).
-    if ((geomType == GeomType::Line || geomType == GeomType::Undefined) &&
-        ftypes::IsRoundAboutChecker::Instance()(type))
-      return true;
-
-    ftype::TruncValue(type, 1);
-    if (geomType == GeomType::Line || geomType == GeomType::Undefined)
-    {
-      if (type == hwtag || type == psurface)
-        return true;
-    }
-
-    static uint32_t const arrTypes[] = {
+  static uint32_t const arrTypes[] = {
       cl.GetTypeByPath({"cuisine"}),
       cl.GetTypeByPath({"fee"}),
-    };
-    return base::IsExist(arrTypes, type);
-  }
-  /// @}
-} // namespace
+  };
+  return base::IsExist(arrTypes, type);
+}
+/// @}
+}  // namespace
 
 bool IsCategoryNondrawableType(uint32_t type)
 {
@@ -220,10 +216,8 @@ bool CanGenerateLike(vector<uint32_t> const & types, GeomType geomType)
   Classificator const & c = classif();
 
   for (uint32_t t : types)
-  {
     if (IsUsefulStandaloneType(t, geomType) || c.GetObject(t)->IsDrawableLike(geomType, false /* emptyName */))
       return true;
-  }
   return false;
 }
 
@@ -236,8 +230,8 @@ bool IsDrawableForIndexGeometryOnly(TypesHolder const & types, m2::RectD const &
   static uint32_t const buildingPartType = c.GetTypeByPath({"building:part"});
 
   // Exclude too small area features unless it's a part of a coast or a building.
-  if (types.GetGeomType() == GeomType::Area && !types.Has(c.GetCoastType()) &&
-      !types.Has(buildingPartType) && !scales::IsGoodForLevel(level, limitRect))
+  if (types.GetGeomType() == GeomType::Area && !types.Has(c.GetCoastType()) && !types.Has(buildingPartType) &&
+      !scales::IsGoodForLevel(level, limitRect))
     return false;
 
   return true;
@@ -257,18 +251,16 @@ bool IsDrawableForIndexClassifOnly(TypesHolder const & types, int level)
 
   return false;
 }
-} // namespace
+}  // namespace
 
 bool IsDrawableForIndex(FeatureType & ft, int level)
 {
-  return IsDrawableForIndexGeometryOnly(ft, level) &&
-         IsDrawableForIndexClassifOnly(TypesHolder(ft), level);
+  return IsDrawableForIndexGeometryOnly(ft, level) && IsDrawableForIndexClassifOnly(TypesHolder(ft), level);
 }
 
 bool IsDrawableForIndex(TypesHolder const & types, m2::RectD const & limitRect, int level)
 {
-  return IsDrawableForIndexGeometryOnly(types, limitRect, level) &&
-         IsDrawableForIndexClassifOnly(types, level);
+  return IsDrawableForIndexGeometryOnly(types, limitRect, level) && IsDrawableForIndexClassifOnly(types, level);
 }
 
 bool IsDrawableForIndexGeometryOnly(FeatureType & ft, int level)
@@ -299,10 +291,7 @@ bool IsUsefulType(uint32_t t, GeomType geomType, bool emptyName)
 
 bool RemoveUselessTypes(vector<uint32_t> & types, GeomType geomType, bool emptyName)
 {
-  base::EraseIf(types, [&] (uint32_t t)
-  {
-    return !IsUsefulType(t, geomType, emptyName);
-  });
+  base::EraseIf(types, [&](uint32_t t) { return !IsUsefulType(t, geomType, emptyName); });
 
   return !types.empty();
 }
@@ -317,10 +306,8 @@ int GetMinDrawableScale(TypesHolder const & types, m2::RectD const & limitRect)
   int const upBound = scales::GetUpperStyleScale();
 
   for (int level = 0; level <= upBound; ++level)
-  {
     if (IsDrawableForIndex(types, limitRect, level))
       return level;
-  }
 
   return -1;
 }
@@ -345,33 +332,31 @@ int GetMinDrawableScaleClassifOnly(TypesHolder const & types)
   int const upBound = scales::GetUpperStyleScale();
 
   for (int level = 0; level <= upBound; ++level)
-  {
     if (IsDrawableForIndexClassifOnly(types, level))
       return level;
-  }
 
   return -1;
 }
 
 namespace
 {
-  void AddRange(pair<int, int> & dest, pair<int, int> const & src)
+void AddRange(pair<int, int> & dest, pair<int, int> const & src)
+{
+  if (src.first != -1)
   {
-    if (src.first != -1)
-    {
-      ASSERT_GREATER(src.first, -1, ());
-      ASSERT_GREATER(src.second, -1, ());
+    ASSERT_GREATER(src.first, -1, ());
+    ASSERT_GREATER(src.second, -1, ());
 
-      dest.first = min(dest.first, src.first);
-      dest.second = max(dest.second, src.second);
+    dest.first = min(dest.first, src.first);
+    dest.second = max(dest.second, src.second);
 
-      ASSERT_GREATER(dest.first, -1, ());
-      ASSERT_GREATER(dest.second, -1, ());
-    }
+    ASSERT_GREATER(dest.first, -1, ());
+    ASSERT_GREATER(dest.second, -1, ());
   }
+}
 
-  pair<int, int> kInvalidScalesRange(-1, -1);
-} // namespace
+pair<int, int> kInvalidScalesRange(-1, -1);
+}  // namespace
 
 pair<int, int> GetDrawableScaleRange(uint32_t type)
 {
@@ -399,29 +384,25 @@ bool IsVisibleInRange(uint32_t type, pair<int, int> const & scaleRange)
   CHECK(obj, ());
 
   for (int scale = scaleRange.first; scale <= scaleRange.second; ++scale)
-  {
     if (obj->IsDrawable(scale))
       return true;
-  }
   return false;
 }
 
 namespace
 {
-  bool IsDrawableForRules(TypesHolder const & types, int level, int rules)
-  {
-    Classificator const & c = classif();
+bool IsDrawableForRules(TypesHolder const & types, int level, int rules)
+{
+  Classificator const & c = classif();
 
-    IsDrawableRulesChecker doCheck(level, types.GetGeomType(), rules);
-    for (uint32_t t : types)
-    {
-      if (doCheck(c.GetObject(t)))
-        return true;
-    }
+  IsDrawableRulesChecker doCheck(level, types.GetGeomType(), rules);
+  for (uint32_t t : types)
+    if (doCheck(c.GetObject(t)))
+      return true;
 
-    return false;
-  }
-} // namespace
+  return false;
+}
+}  // namespace
 
 pair<int, int> GetDrawableScaleRangeForRules(TypesHolder const & types, int rules)
 {
@@ -463,4 +444,4 @@ bool TypeSetChecker::IsEqual(uint32_t type) const
   ftype::TruncValue(type, m_level);
   return (m_type == type);
 }
-} // namespace feature
+}  // namespace feature
diff --git a/libs/indexer/feature_visibility.hpp b/libs/indexer/feature_visibility.hpp
index 4c63bfa34..68ff84639 100644
--- a/libs/indexer/feature_visibility.hpp
+++ b/libs/indexer/feature_visibility.hpp
@@ -11,84 +11,80 @@ class FeatureType;
 
 namespace feature
 {
-  class TypesHolder;
+class TypesHolder;
 
-  bool IsCategoryNondrawableType(uint32_t type);
-  bool IsUsefulType(uint32_t type);
-  bool IsDrawableForIndex(FeatureType & ft, int level);
-  bool IsDrawableForIndex(TypesHolder const & types, m2::RectD const & limitRect, int level);
+bool IsCategoryNondrawableType(uint32_t type);
+bool IsUsefulType(uint32_t type);
+bool IsDrawableForIndex(FeatureType & ft, int level);
+bool IsDrawableForIndex(TypesHolder const & types, m2::RectD const & limitRect, int level);
 
-  // The separation into ClassifOnly and GeometryOnly versions is needed to speed up
-  // the geometrical index (see indexer/scale_index_builder.hpp).
-  // Technically, the GeometryOnly version uses the classificator, but it only does
-  // so when checking against coastlines.
-  //bool IsDrawableForIndexClassifOnly(TypesHolder const & types, int level);
-  bool IsDrawableForIndexGeometryOnly(FeatureType & ft, int level);
-  //bool IsDrawableForIndexGeometryOnly(TypesHolder const & types, m2::RectD const & limitRect, int level);
+// The separation into ClassifOnly and GeometryOnly versions is needed to speed up
+// the geometrical index (see indexer/scale_index_builder.hpp).
+// Technically, the GeometryOnly version uses the classificator, but it only does
+// so when checking against coastlines.
+// bool IsDrawableForIndexClassifOnly(TypesHolder const & types, int level);
+bool IsDrawableForIndexGeometryOnly(FeatureType & ft, int level);
+// bool IsDrawableForIndexGeometryOnly(TypesHolder const & types, m2::RectD const & limitRect, int level);
 
-  /// @name Generator check functions.
-  /// @{
+/// @name Generator check functions.
+/// @{
 
-  /// Can object with \a types can be generated as \a geomType Feature.
-  /// Should have appropriate drawing rules or satisfy "IsUsefulStandaloneType".
-  bool CanGenerateLike(std::vector<uint32_t> const & types, GeomType geomType);
+/// Can object with \a types can be generated as \a geomType Feature.
+/// Should have appropriate drawing rules or satisfy "IsUsefulStandaloneType".
+bool CanGenerateLike(std::vector<uint32_t> const & types, GeomType geomType);
 
-  /// @return true, if at least one valid type remains.
-  bool RemoveUselessTypes(std::vector<uint32_t> & types, GeomType geomType, bool emptyName = false);
-  /// @}
+/// @return true, if at least one valid type remains.
+bool RemoveUselessTypes(std::vector<uint32_t> & types, GeomType geomType, bool emptyName = false);
+/// @}
 
-  int GetMinDrawableScale(FeatureType & ft);
-  int GetMinDrawableScale(TypesHolder const & types, m2::RectD const & limitRect);
-  //int GetMinDrawableScaleGeometryOnly(TypesHolder const & types, m2::RectD limitRect);
-  int GetMinDrawableScaleClassifOnly(TypesHolder const & types);
+int GetMinDrawableScale(FeatureType & ft);
+int GetMinDrawableScale(TypesHolder const & types, m2::RectD const & limitRect);
+// int GetMinDrawableScaleGeometryOnly(TypesHolder const & types, m2::RectD limitRect);
+int GetMinDrawableScaleClassifOnly(TypesHolder const & types);
 
-  /// @return [-1, -1] if range is not drawable
-  /// @{
-  /// @name Get scale range when feature is visible.
-  std::pair<int, int> GetDrawableScaleRange(uint32_t type);
-  std::pair<int, int> GetDrawableScaleRange(TypesHolder const & types);
-  bool IsVisibleInRange(uint32_t type, std::pair<int, int> const & scaleRange);
+/// @return [-1, -1] if range is not drawable
+/// @{
+/// @name Get scale range when feature is visible.
+std::pair<int, int> GetDrawableScaleRange(uint32_t type);
+std::pair<int, int> GetDrawableScaleRange(TypesHolder const & types);
+bool IsVisibleInRange(uint32_t type, std::pair<int, int> const & scaleRange);
 
-  /// @name Get scale range when feature's text or symbol is visible.
-  enum
+/// @name Get scale range when feature's text or symbol is visible.
+enum
+{
+  RULE_CAPTION = 1,
+  RULE_PATH_TEXT = 2,
+  RULE_ANY_TEXT = RULE_CAPTION | RULE_PATH_TEXT,
+  RULE_SYMBOL = 4,
+
+  RULE_LINE = 8,
+};
+
+std::pair<int, int> GetDrawableScaleRangeForRules(TypesHolder const & types, int rules);
+/// @}
+
+void GetDrawRule(TypesHolder const & types, int level, drule::KeysT & keys);
+void GetDrawRule(std::vector<uint32_t> const & types, int level, GeomType geomType, drule::KeysT & keys);
+void FilterRulesByRuntimeSelector(FeatureType & f, int zoomLevel, drule::KeysT & keys);
+
+/// Used to check whether user types belong to particular classificator set.
+class TypeSetChecker
+{
+  uint32_t m_type;
+  uint8_t m_level;
+
+public:
+  explicit TypeSetChecker(std::initializer_list<char const *> const & lst);
+
+  bool IsEqual(uint32_t type) const;
+  template <class IterT>
+  bool IsEqualR(IterT beg, IterT end) const
   {
-    RULE_CAPTION = 1,
-    RULE_PATH_TEXT = 2,
-    RULE_ANY_TEXT = RULE_CAPTION | RULE_PATH_TEXT,
-    RULE_SYMBOL = 4,
-
-    RULE_LINE = 8,
-  };
-
-  std::pair<int, int> GetDrawableScaleRangeForRules(TypesHolder const & types, int rules);
-  /// @}
-
-  void GetDrawRule(TypesHolder const & types, int level, drule::KeysT & keys);
-  void GetDrawRule(std::vector<uint32_t> const & types, int level, GeomType geomType, drule::KeysT & keys);
-  void FilterRulesByRuntimeSelector(FeatureType & f, int zoomLevel, drule::KeysT & keys);
-
-  /// Used to check whether user types belong to particular classificator set.
-  class TypeSetChecker
-  {
-    uint32_t m_type;
-    uint8_t m_level;
-
-  public:
-    explicit TypeSetChecker(std::initializer_list<char const *> const & lst);
-
-    bool IsEqual(uint32_t type) const;
-    template <class IterT> bool IsEqualR(IterT beg, IterT end) const
-    {
-      while (beg != end)
-      {
-        if (IsEqual(*beg++))
-          return true;
-      }
-      return false;
-    }
-    bool IsEqualV(std::vector<uint32_t> const & v) const
-    {
-      return IsEqualR(v.begin(), v.end());
-    }
-  };
-} // namespace feature
+    while (beg != end)
+      if (IsEqual(*beg++))
+        return true;
+    return false;
+  }
+  bool IsEqualV(std::vector<uint32_t> const & v) const { return IsEqualR(v.begin(), v.end()); }
+};
+}  // namespace feature
diff --git a/libs/indexer/features_offsets_table.cpp b/libs/indexer/features_offsets_table.cpp
index 636d28ff7..392b319f3 100644
--- a/libs/indexer/features_offsets_table.cpp
+++ b/libs/indexer/features_offsets_table.cpp
@@ -19,129 +19,126 @@ using namespace std;
 
 namespace feature
 {
-  void FeaturesOffsetsTable::Builder::PushOffset(uint32_t const offset)
+void FeaturesOffsetsTable::Builder::PushOffset(uint32_t const offset)
+{
+  ASSERT(m_offsets.empty() || m_offsets.back() < offset, ());
+  m_offsets.push_back(offset);
+}
+
+FeaturesOffsetsTable::FeaturesOffsetsTable(succinct::elias_fano::elias_fano_builder & builder) : m_table(&builder) {}
+
+FeaturesOffsetsTable::FeaturesOffsetsTable(string const & filePath)
+{
+  m_pReader.reset(new MmapReader(filePath));
+  succinct::mapper::map(m_table, reinterpret_cast<char const *>(m_pReader->Data()));
+}
+
+// static
+unique_ptr<FeaturesOffsetsTable> FeaturesOffsetsTable::Build(Builder & builder)
+{
+  vector<uint32_t> const & offsets = builder.m_offsets;
+
+  size_t const numOffsets = offsets.size();
+  uint32_t const maxOffset = offsets.empty() ? 0 : offsets.back();
+
+  succinct::elias_fano::elias_fano_builder elias_fano_builder(maxOffset, numOffsets);
+  for (uint32_t offset : offsets)
+    elias_fano_builder.push_back(offset);
+
+  return unique_ptr<FeaturesOffsetsTable>(new FeaturesOffsetsTable(elias_fano_builder));
+}
+
+// static
+unique_ptr<FeaturesOffsetsTable> FeaturesOffsetsTable::LoadImpl(string const & filePath)
+{
+  return unique_ptr<FeaturesOffsetsTable>(new FeaturesOffsetsTable(filePath));
+}
+
+// static
+unique_ptr<FeaturesOffsetsTable> FeaturesOffsetsTable::Load(string const & filePath)
+{
+  if (!GetPlatform().IsFileExistsByFullPath(filePath))
+    return unique_ptr<FeaturesOffsetsTable>();
+  return LoadImpl(filePath);
+}
+
+// static
+unique_ptr<FeaturesOffsetsTable> FeaturesOffsetsTable::Load(FilesContainerR const & cont)
+{
+  unique_ptr<FeaturesOffsetsTable> table(new FeaturesOffsetsTable());
+
+  table->m_file.Open(cont.GetFileName());
+  auto p = cont.GetAbsoluteOffsetAndSize(FEATURE_OFFSETS_FILE_TAG);
+  ASSERT(p.first % 4 == 0, (p.first));  // will get troubles in succinct otherwise
+  table->m_handle.Assign(table->m_file.Map(p.first, p.second, FEATURE_OFFSETS_FILE_TAG));
+
+  succinct::mapper::map(table->m_table, table->m_handle.GetData<char>());
+  return table;
+}
+
+void FeaturesOffsetsTable::Build(FilesContainerR const & cont, string const & storePath)
+{
+  Builder builder;
+  FeaturesVector::ForEachOffset(cont, [&builder](uint32_t offset) { builder.PushOffset(offset); });
+
+  unique_ptr<FeaturesOffsetsTable> table(Build(builder));
+  table->Save(storePath);
+}
+
+void FeaturesOffsetsTable::Save(string const & filePath)
+{
+  LOG(LINFO, ("Saving features offsets table to ", filePath));
+  string const fileNameTmp = filePath + EXTENSION_TMP;
+  succinct::mapper::freeze(m_table, fileNameTmp.c_str());
+  base::RenameFileX(fileNameTmp, filePath);
+}
+
+uint32_t FeaturesOffsetsTable::GetFeatureOffset(size_t index) const
+{
+  ASSERT_LESS(index, size(), ("Index out of bounds", index, size()));
+  return static_cast<uint32_t>(m_table.select(index));
+}
+
+size_t FeaturesOffsetsTable::GetFeatureIndexbyOffset(uint32_t offset) const
+{
+  ASSERT_GREATER(size(), 0, ("We must not ask empty table"));
+  ASSERT_LESS_OR_EQUAL(offset, m_table.select(size() - 1),
+                       ("Offset out of bounds", offset, m_table.select(size() - 1)));
+  ASSERT_GREATER_OR_EQUAL(offset, m_table.select(0), ("Offset out of bounds", offset, m_table.select(size() - 1)));
+  // Binary search in elias_fano list
+  size_t leftBound = 0, rightBound = size();
+  while (leftBound + 1 < rightBound)
   {
-    ASSERT(m_offsets.empty() || m_offsets.back() < offset, ());
-    m_offsets.push_back(offset);
+    size_t middle = leftBound + (rightBound - leftBound) / 2;
+    if (m_table.select(middle) <= offset)
+      leftBound = middle;
+    else
+      rightBound = middle;
   }
+  ASSERT_EQUAL(offset, m_table.select(leftBound), ("Can't find offset", offset, "in the table"));
+  return leftBound;
+}
 
-  FeaturesOffsetsTable::FeaturesOffsetsTable(succinct::elias_fano::elias_fano_builder & builder)
-      : m_table(&builder)
+bool BuildOffsetsTable(string const & filePath)
+{
+  try
   {
-  }
+    string const destPath = filePath + ".offsets";
+    SCOPE_GUARD(fileDeleter, bind(FileWriter::DeleteFileX, destPath));
 
-  FeaturesOffsetsTable::FeaturesOffsetsTable(string const & filePath)
-  {
-    m_pReader.reset(new MmapReader(filePath));
-    succinct::mapper::map(m_table, reinterpret_cast<char const *>(m_pReader->Data()));
-  }
-
-  // static
-  unique_ptr<FeaturesOffsetsTable> FeaturesOffsetsTable::Build(Builder & builder)
-  {
-    vector<uint32_t> const & offsets = builder.m_offsets;
-
-    size_t const numOffsets = offsets.size();
-    uint32_t const maxOffset = offsets.empty() ? 0 : offsets.back();
-
-    succinct::elias_fano::elias_fano_builder elias_fano_builder(maxOffset, numOffsets);
-    for (uint32_t offset : offsets)
-      elias_fano_builder.push_back(offset);
-
-    return unique_ptr<FeaturesOffsetsTable>(new FeaturesOffsetsTable(elias_fano_builder));
-  }
-
-  // static
-  unique_ptr<FeaturesOffsetsTable> FeaturesOffsetsTable::LoadImpl(string const & filePath)
-  {
-    return unique_ptr<FeaturesOffsetsTable>(new FeaturesOffsetsTable(filePath));
-  }
-
-  // static
-  unique_ptr<FeaturesOffsetsTable> FeaturesOffsetsTable::Load(string const & filePath)
-  {
-    if (!GetPlatform().IsFileExistsByFullPath(filePath))
-      return unique_ptr<FeaturesOffsetsTable>();
-    return LoadImpl(filePath);
-  }
-
-  // static
-  unique_ptr<FeaturesOffsetsTable> FeaturesOffsetsTable::Load(FilesContainerR const & cont)
-  {
-    unique_ptr<FeaturesOffsetsTable> table(new FeaturesOffsetsTable());
-
-    table->m_file.Open(cont.GetFileName());
-    auto p = cont.GetAbsoluteOffsetAndSize(FEATURE_OFFSETS_FILE_TAG);
-    ASSERT(p.first % 4 == 0, (p.first)); // will get troubles in succinct otherwise
-    table->m_handle.Assign(table->m_file.Map(p.first, p.second, FEATURE_OFFSETS_FILE_TAG));
-
-    succinct::mapper::map(table->m_table, table->m_handle.GetData<char>());
-    return table;
-  }
-
-  void FeaturesOffsetsTable::Build(FilesContainerR const & cont, string const & storePath)
-  {
-    Builder builder;
-    FeaturesVector::ForEachOffset(cont, [&builder](uint32_t offset) { builder.PushOffset(offset); });
-
-    unique_ptr<FeaturesOffsetsTable> table(Build(builder));
-    table->Save(storePath);
-  }
-
-  void FeaturesOffsetsTable::Save(string const & filePath)
-  {
-    LOG(LINFO, ("Saving features offsets table to ", filePath));
-    string const fileNameTmp = filePath + EXTENSION_TMP;
-    succinct::mapper::freeze(m_table, fileNameTmp.c_str());
-    base::RenameFileX(fileNameTmp, filePath);
-  }
-
-  uint32_t FeaturesOffsetsTable::GetFeatureOffset(size_t index) const
-  {
-    ASSERT_LESS(index, size(), ("Index out of bounds", index, size()));
-    return static_cast<uint32_t>(m_table.select(index));
-  }
-
-  size_t FeaturesOffsetsTable::GetFeatureIndexbyOffset(uint32_t offset) const
-  {
-    ASSERT_GREATER(size(), 0, ("We must not ask empty table"));
-    ASSERT_LESS_OR_EQUAL(offset, m_table.select(size() - 1), ("Offset out of bounds", offset,
-                                                     m_table.select(size() - 1)));
-    ASSERT_GREATER_OR_EQUAL(offset, m_table.select(0), ("Offset out of bounds", offset,
-                                                        m_table.select(size() - 1)));
-    //Binary search in elias_fano list
-    size_t leftBound = 0, rightBound = size();
-    while (leftBound + 1 < rightBound) {
-      size_t middle = leftBound + (rightBound - leftBound) / 2;
-      if (m_table.select(middle) <= offset)
-        leftBound = middle;
-      else
-        rightBound = middle;
-    }
-    ASSERT_EQUAL(offset, m_table.select(leftBound), ("Can't find offset", offset, "in the table"));
-    return leftBound;
-  }
-
-  bool BuildOffsetsTable(string const & filePath)
-  {
-    try
     {
-      string const destPath = filePath + ".offsets";
-      SCOPE_GUARD(fileDeleter, bind(FileWriter::DeleteFileX, destPath));
-
-      {
-        FilesContainerR cont(filePath);
-        feature::FeaturesOffsetsTable::Build(cont, destPath);
-      }
-
-      FilesContainerW(filePath, FileWriter::OP_WRITE_EXISTING).Write(destPath, FEATURE_OFFSETS_FILE_TAG);
-      return true;
-    }
-    catch (RootException const & ex)
-    {
-      LOG(LERROR, ("Generating offsets table failed for", filePath, "reason", ex.Msg()));
-      return false;
+      FilesContainerR cont(filePath);
+      feature::FeaturesOffsetsTable::Build(cont, destPath);
     }
+
+    FilesContainerW(filePath, FileWriter::OP_WRITE_EXISTING).Write(destPath, FEATURE_OFFSETS_FILE_TAG);
+    return true;
   }
+  catch (RootException const & ex)
+  {
+    LOG(LERROR, ("Generating offsets table failed for", filePath, "reason", ex.Msg()));
+    return false;
+  }
+}
 
 }  // namespace feature
diff --git a/libs/indexer/features_offsets_table.hpp b/libs/indexer/features_offsets_table.hpp
index 5c93d9ef7..8be075f64 100644
--- a/libs/indexer/features_offsets_table.hpp
+++ b/libs/indexer/features_offsets_table.hpp
@@ -24,90 +24,90 @@
 
 namespace platform
 {
-  class LocalCountryFile;
+class LocalCountryFile;
 }
 
 namespace feature
 {
-  /// This class is a wrapper around elias-fano encoder, which allows
-  /// to efficiently encode a sequence of strictly increasing features
-  /// offsets in a MWM file and access them by feature's index.
-  class FeaturesOffsetsTable
+/// This class is a wrapper around elias-fano encoder, which allows
+/// to efficiently encode a sequence of strictly increasing features
+/// offsets in a MWM file and access them by feature's index.
+class FeaturesOffsetsTable
+{
+public:
+  /// This class is used to accumulate strictly increasing features
+  /// offsets and then build FeaturesOffsetsTable.
+  class Builder
   {
   public:
-    /// This class is used to accumulate strictly increasing features
-    /// offsets and then build FeaturesOffsetsTable.
-    class Builder
-    {
-    public:
-      /// Adds offset to the end of the sequence of already
-      /// accumulated offsets. Note that offset must be strictly
-      /// greater than all previously added offsets.
-      ///
-      /// \param offset a feature's offset in a MWM file
-      void PushOffset(uint32_t offset);
-
-      /// \return number of already accumulated offsets
-      size_t size() const { return m_offsets.size(); }
-
-    private:
-      friend class FeaturesOffsetsTable;
-
-      std::vector<uint32_t> m_offsets;
-    };
-
-    /// Builds FeaturesOffsetsTable from the strictly increasing
-    /// sequence of file offsets.
+    /// Adds offset to the end of the sequence of already
+    /// accumulated offsets. Note that offset must be strictly
+    /// greater than all previously added offsets.
     ///
-    /// \param builder Builder containing sequence of offsets.
-    /// \return a pointer to an instance of FeaturesOffsetsTable
-    static std::unique_ptr<FeaturesOffsetsTable> Build(Builder & builder);
+    /// \param offset a feature's offset in a MWM file
+    void PushOffset(uint32_t offset);
 
-    /// Load table by full path to the table file.
-    static std::unique_ptr<FeaturesOffsetsTable> Load(std::string const & filePath);
-
-    static std::unique_ptr<FeaturesOffsetsTable> Load(FilesContainerR const & cont);
-    static void Build(FilesContainerR const & cont, std::string const & storePath);
-
-    FeaturesOffsetsTable(FeaturesOffsetsTable const &) = delete;
-    FeaturesOffsetsTable const & operator=(FeaturesOffsetsTable const &) = delete;
-
-    /// Serializes current instance to a section in container.
-    ///
-    /// \param filePath a full path of the file to store data
-    void Save(std::string const & filePath);
-
-    /// \param index index of a feature
-    /// \return offset a feature
-    uint32_t GetFeatureOffset(size_t index) const;
-
-    /// \param offset offset of a feature
-    /// \return index of a feature
-    size_t GetFeatureIndexbyOffset(uint32_t offset) const;
-
-    /// \return number of features offsets in a table.
-    size_t size() const { return static_cast<size_t>(m_table.num_ones()); }
-
-    /// \return byte size of a table, may be slightly different from a
-    ///         real byte size in memory or on disk due to alignment, but
-    ///         can be used in benchmarks, logging, etc.
-    // size_t byte_size() { return static_cast<size_t>(succinct::mapper::size_of(m_table)); }
+    /// \return number of already accumulated offsets
+    size_t size() const { return m_offsets.size(); }
 
   private:
-    FeaturesOffsetsTable(succinct::elias_fano::elias_fano_builder & builder);
-    FeaturesOffsetsTable(std::string const & filePath);
-    FeaturesOffsetsTable() = default;
+    friend class FeaturesOffsetsTable;
 
-    static std::unique_ptr<FeaturesOffsetsTable> LoadImpl(std::string const & filePath);
-
-    succinct::elias_fano m_table;
-    std::unique_ptr<MmapReader> m_pReader;
-
-    ::detail::MappedFile m_file;
-    ::detail::MappedFile::Handle m_handle;
+    std::vector<uint32_t> m_offsets;
   };
 
-  // Builds feature offsets table in an mwm or rebuilds an existing
-  // one.
-  bool BuildOffsetsTable(std::string const & filePath);
+  /// Builds FeaturesOffsetsTable from the strictly increasing
+  /// sequence of file offsets.
+  ///
+  /// \param builder Builder containing sequence of offsets.
+  /// \return a pointer to an instance of FeaturesOffsetsTable
+  static std::unique_ptr<FeaturesOffsetsTable> Build(Builder & builder);
+
+  /// Load table by full path to the table file.
+  static std::unique_ptr<FeaturesOffsetsTable> Load(std::string const & filePath);
+
+  static std::unique_ptr<FeaturesOffsetsTable> Load(FilesContainerR const & cont);
+  static void Build(FilesContainerR const & cont, std::string const & storePath);
+
+  FeaturesOffsetsTable(FeaturesOffsetsTable const &) = delete;
+  FeaturesOffsetsTable const & operator=(FeaturesOffsetsTable const &) = delete;
+
+  /// Serializes current instance to a section in container.
+  ///
+  /// \param filePath a full path of the file to store data
+  void Save(std::string const & filePath);
+
+  /// \param index index of a feature
+  /// \return offset a feature
+  uint32_t GetFeatureOffset(size_t index) const;
+
+  /// \param offset offset of a feature
+  /// \return index of a feature
+  size_t GetFeatureIndexbyOffset(uint32_t offset) const;
+
+  /// \return number of features offsets in a table.
+  size_t size() const { return static_cast<size_t>(m_table.num_ones()); }
+
+  /// \return byte size of a table, may be slightly different from a
+  ///         real byte size in memory or on disk due to alignment, but
+  ///         can be used in benchmarks, logging, etc.
+  // size_t byte_size() { return static_cast<size_t>(succinct::mapper::size_of(m_table)); }
+
+private:
+  FeaturesOffsetsTable(succinct::elias_fano::elias_fano_builder & builder);
+  FeaturesOffsetsTable(std::string const & filePath);
+  FeaturesOffsetsTable() = default;
+
+  static std::unique_ptr<FeaturesOffsetsTable> LoadImpl(std::string const & filePath);
+
+  succinct::elias_fano m_table;
+  std::unique_ptr<MmapReader> m_pReader;
+
+  ::detail::MappedFile m_file;
+  ::detail::MappedFile::Handle m_handle;
+};
+
+// Builds feature offsets table in an mwm or rebuilds an existing
+// one.
+bool BuildOffsetsTable(std::string const & filePath);
 }  // namespace feature
diff --git a/libs/indexer/features_vector.cpp b/libs/indexer/features_vector.cpp
index 326bf623a..3e170424b 100644
--- a/libs/indexer/features_vector.cpp
+++ b/libs/indexer/features_vector.cpp
@@ -1,15 +1,16 @@
 #include "features_vector.hpp"
-#include "features_offsets_table.hpp"
-#include "data_factory.hpp"
 #include "dat_section_header.hpp"
+#include "data_factory.hpp"
+#include "features_offsets_table.hpp"
 
 #include "platform/constants.hpp"
 
-
 FeaturesVector::FeaturesVector(FilesContainerR const & cont, feature::DataHeader const & header,
                                feature::FeaturesOffsetsTable const * table,
                                indexer::MetadataDeserializer * metaDeserializer)
-: m_loadInfo(cont, header), m_table(table), m_metaDeserializer(metaDeserializer)
+  : m_loadInfo(cont, header)
+  , m_table(table)
+  , m_metaDeserializer(metaDeserializer)
 {
   InitRecordsReader();
 }
@@ -20,10 +21,8 @@ void FeaturesVector::InitRecordsReader()
 
   feature::DatSectionHeader header;
   header.Read(*reader.GetPtr());
-  CHECK(header.m_version == feature::DatSectionHeader::Version::V0,
-          (base::Underlying(header.m_version)));
-  m_recordReader = std::make_unique<RecordReader>(
-        reader.SubReader(header.m_featuresOffset, header.m_featuresSize));
+  CHECK(header.m_version == feature::DatSectionHeader::Version::V0, (base::Underlying(header.m_version)));
+  m_recordReader = std::make_unique<RecordReader>(reader.SubReader(header.m_featuresOffset, header.m_featuresSize));
 }
 
 std::unique_ptr<FeatureType> FeaturesVector::GetByIndex(uint32_t index) const
@@ -39,11 +38,12 @@ size_t FeaturesVector::GetNumFeatures() const
 
 FeaturesVectorTest::FeaturesVectorTest(std::string const & filePath)
   : FeaturesVectorTest((FilesContainerR(filePath, READER_CHUNK_LOG_SIZE, READER_CHUNK_LOG_COUNT)))
-{
-}
+{}
 
 FeaturesVectorTest::FeaturesVectorTest(FilesContainerR const & cont)
-  : m_cont(cont), m_header(m_cont), m_vector(m_cont, m_header, nullptr, nullptr)
+  : m_cont(cont)
+  , m_header(m_cont)
+  , m_vector(m_cont, m_header, nullptr, nullptr)
 {
   m_vector.m_table = feature::FeaturesOffsetsTable::Load(m_cont).release();
 
diff --git a/libs/indexer/features_vector.hpp b/libs/indexer/features_vector.hpp
index 4b3cdb043..60728572e 100644
--- a/libs/indexer/features_vector.hpp
+++ b/libs/indexer/features_vector.hpp
@@ -10,7 +10,10 @@
 #include <memory>
 #include <vector>
 
-namespace feature { class FeaturesOffsetsTable; }
+namespace feature
+{
+class FeaturesOffsetsTable;
+}
 
 /// Note! This class is NOT Thread-Safe.
 /// You should have separate instance of Vector for every thread.
@@ -20,14 +23,14 @@ class FeaturesVector
 
 public:
   FeaturesVector(FilesContainerR const & cont, feature::DataHeader const & header,
-                 feature::FeaturesOffsetsTable const * table,
-                 indexer::MetadataDeserializer * metaDeserializer);
+                 feature::FeaturesOffsetsTable const * table, indexer::MetadataDeserializer * metaDeserializer);
 
   std::unique_ptr<FeatureType> GetByIndex(uint32_t index) const;
 
   size_t GetNumFeatures() const;
 
-  template <class ToDo> void ForEach(ToDo && toDo) const
+  template <class ToDo>
+  void ForEach(ToDo && toDo) const
   {
     uint32_t index = 0;
     m_recordReader->ForEachRecord([&](uint32_t pos, std::vector<uint8_t> && data)
@@ -43,19 +46,18 @@ public:
     });
   }
 
-  template <class ToDo> static void ForEachOffset(FilesContainerR const & cont, ToDo && toDo)
+  template <class ToDo>
+  static void ForEachOffset(FilesContainerR const & cont, ToDo && toDo)
   {
     feature::DataHeader header(cont);
     FeaturesVector vec(cont, header);
-    vec.m_recordReader->ForEachRecord(
-        [&](uint32_t pos, std::vector<uint8_t> && /* data */) { toDo(pos); });
+    vec.m_recordReader->ForEachRecord([&](uint32_t pos, std::vector<uint8_t> && /* data */) { toDo(pos); });
   }
 
 private:
   /// Actually, this ctor is needed only for ForEachOffset call.
   /// Didn't find a better solution without big refactoring.
-  FeaturesVector(FilesContainerR const & cont, feature::DataHeader const & header)
-    : m_loadInfo(cont, header)
+  FeaturesVector(FilesContainerR const & cont, feature::DataHeader const & header) : m_loadInfo(cont, header)
   {
     InitRecordsReader();
   }
diff --git a/libs/indexer/ftypes_mapping.hpp b/libs/indexer/ftypes_mapping.hpp
index abf3023b1..623552cbb 100644
--- a/libs/indexer/ftypes_mapping.hpp
+++ b/libs/indexer/ftypes_mapping.hpp
@@ -32,25 +32,15 @@ public:
     return m_mapping.cend();
   }
 
-  ConstIterator End() const
-  {
-    return m_mapping.cend();
-  }
+  ConstIterator End() const { return m_mapping.cend(); }
 
-  bool IsValid(ConstIterator it) const
-  {
-    return it != m_mapping.cend();
-  }
+  bool IsValid(ConstIterator it) const { return it != m_mapping.cend(); }
 
-  bool Contains(feature::TypesHolder const & types) const
-  {
-    return IsValid(Find(types));
-  }
+  bool Contains(feature::TypesHolder const & types) const { return IsValid(Find(types)); }
   template <typename Type, typename... Args>
   void AppendType(Type && type, Args &&... args)
   {
-    m_mapping.emplace(classif().GetTypeByPath(std::forward<Type>(type)),
-                      std::forward<Args>(args)...);
+    m_mapping.emplace(classif().GetTypeByPath(std::forward<Type>(type)), std::forward<Args>(args)...);
   }
 
   template <typename TypesPaths, typename... Args>
diff --git a/libs/indexer/ftypes_matcher.cpp b/libs/indexer/ftypes_matcher.cpp
index c8f620526..485528c35 100644
--- a/libs/indexer/ftypes_matcher.cpp
+++ b/libs/indexer/ftypes_matcher.cpp
@@ -13,7 +13,6 @@
 #include <map>
 #include <sstream>
 
-
 namespace ftypes
 {
 using namespace std;
@@ -158,10 +157,8 @@ void BaseChecker::ForEachType(function<void(uint32_t)> const & fn) const
 bool BaseChecker::operator()(feature::TypesHolder const & types) const
 {
   for (uint32_t t : types)
-  {
     if (IsMatched(t))
       return true;
-  }
 
   return false;
 }
@@ -174,10 +171,8 @@ bool BaseChecker::operator()(FeatureType & ft) const
 bool BaseChecker::operator()(vector<uint32_t> const & types) const
 {
   for (uint32_t t : types)
-  {
     if (IsMatched(t))
       return true;
-  }
 
   return false;
 }
@@ -216,8 +211,9 @@ IsPostPoiChecker::IsPostPoiChecker()
 IsOperatorOthersPoiChecker::IsOperatorOthersPoiChecker()
 {
   Classificator const & c = classif();
-  for (char const * val : {"bicycle_rental", "bureau_de_change", "car_sharing", "car_rental", "fuel", "charging_station",
-                           "parking", "motorcycle_parking", "bicycle_parking", "payment_terminal", "university", "vending_machine"})
+  for (char const * val :
+       {"bicycle_rental", "bureau_de_change", "car_sharing", "car_rental", "fuel", "charging_station", "parking",
+        "motorcycle_parking", "bicycle_parking", "payment_terminal", "university", "vending_machine"})
     m_types.push_back(c.GetTypeByPath({"amenity", val}));
 }
 
@@ -227,7 +223,10 @@ IsRecyclingCentreChecker::IsRecyclingCentreChecker() : BaseChecker(3 /* level */
   m_types.push_back(c.GetTypeByPath({"amenity", "recycling", "centre"}));
 }
 
-uint32_t IsRecyclingCentreChecker::GetType() const { return m_types[0]; }
+uint32_t IsRecyclingCentreChecker::GetType() const
+{
+  return m_types[0];
+}
 
 IsRecyclingContainerChecker::IsRecyclingContainerChecker() : BaseChecker(3 /* level */)
 {
@@ -237,7 +236,10 @@ IsRecyclingContainerChecker::IsRecyclingContainerChecker() : BaseChecker(3 /* le
   m_types.push_back(c.GetTypeByPath({"amenity", "recycling"}));
 }
 
-uint32_t IsRecyclingContainerChecker::GetType() const { return m_types[0]; }
+uint32_t IsRecyclingContainerChecker::GetType() const
+{
+  return m_types[0];
+}
 
 IsRailwayStationChecker::IsRailwayStationChecker()
 {
@@ -267,10 +269,8 @@ IsSquareChecker::IsSquareChecker()
 IsSuburbChecker::IsSuburbChecker()
 {
   Classificator const & c = classif();
-  base::StringIL const types[] = {{"landuse", "residential"},
-                                  {"place", "neighbourhood"},
-                                  {"place", "quarter"},
-                                  {"place", "suburb"}};
+  base::StringIL const types[] = {
+      {"landuse", "residential"}, {"place", "neighbourhood"}, {"place", "quarter"}, {"place", "suburb"}};
   for (auto const & e : types)
     m_types.push_back(c.GetTypeByPath(e));
 
@@ -285,10 +285,8 @@ SuburbType IsSuburbChecker::GetType(uint32_t t) const
 {
   ftype::TruncValue(t, 2);
   for (size_t i = 0; i < m_types.size(); ++i)
-  {
     if (m_types[i] == t)
       return static_cast<SuburbType>(i);
-  }
   return SuburbType::Count;
 }
 
@@ -315,27 +313,27 @@ IsWayChecker::IsWayChecker()
   Classificator const & c = classif();
   std::pair<char const *, SearchRank> const types[] = {
       // type           rank
-      {"cycleway",      Cycleway},
-      {"footway",       Pedestrian},
+      {"cycleway", Cycleway},
+      {"footway", Pedestrian},
       {"living_street", Residential},
-      {"motorway",      Motorway},
+      {"motorway", Motorway},
       {"motorway_link", Motorway},
-      {"path",          Outdoor},
-      {"pedestrian",    Pedestrian},
-      {"primary",       Regular},
-      {"primary_link",  Regular},
-      {"residential",   Residential},
-      {"road",          Minors},
-      {"secondary",     Regular},
-      {"secondary_link",Regular},
-      {"service",       Minors},
-      {"steps",         Pedestrian},
-      {"tertiary",      Regular},
+      {"path", Outdoor},
+      {"pedestrian", Pedestrian},
+      {"primary", Regular},
+      {"primary_link", Regular},
+      {"residential", Residential},
+      {"road", Minors},
+      {"secondary", Regular},
+      {"secondary_link", Regular},
+      {"service", Minors},
+      {"steps", Pedestrian},
+      {"tertiary", Regular},
       {"tertiary_link", Regular},
-      {"track",         Outdoor},
-      {"trunk",         Motorway},
-      {"trunk_link",    Motorway},
-      {"unclassified",  Minors},
+      {"track", Outdoor},
+      {"trunk", Motorway},
+      {"trunk_link", Motorway},
+      {"unclassified", Minors},
   };
 
   m_ranks.Reserve(std::size(types));
@@ -445,14 +443,13 @@ IsPisteChecker::IsPisteChecker() : BaseChecker(1 /* level */)
   m_types.push_back(classif().GetTypeByPath({"piste:type"}));
 }
 
-
 // Used in IsPoiChecker and in IsAddressObjectChecker.
 OneLevelPOIChecker::OneLevelPOIChecker() : ftypes::BaseChecker(1 /* level */)
 {
   Classificator const & c = classif();
 
-  for (auto const * path : {"amenity", "craft", "emergency", "healthcare", "historic", "leisure",
-                            "mountain_pass", "office", "railway", "shop", "sport", "tourism"})
+  for (auto const * path : {"amenity", "craft", "emergency", "healthcare", "historic", "leisure", "mountain_pass",
+                            "office", "railway", "shop", "sport", "tourism"})
     m_types.push_back(c.GetTypeByPath({path}));
 }
 
@@ -460,41 +457,25 @@ OneLevelPOIChecker::OneLevelPOIChecker() : ftypes::BaseChecker(1 /* level */)
 TwoLevelPOIChecker::TwoLevelPOIChecker() : ftypes::BaseChecker(2 /* level */)
 {
   Classificator const & c = classif();
-  base::StringIL arr[] = {
-      {"aeroway", "terminal"},
-      {"aeroway", "gate"},
-      {"building", "train_station"},
-      {"emergency", "defibrillator"},
-      {"emergency", "fire_hydrant"},
-      {"emergency", "phone"},
-      {"highway", "bus_stop"},
-      {"highway", "elevator"},
-      {"highway", "ford"},
-      {"highway", "raceway"},
-      {"highway", "rest_area"},
-      {"highway", "services"},
-      {"highway", "speed_camera"},
-      {"man_made", "communications_tower"},
-      {"man_made", "cross"},
-      {"man_made", "lighthouse"},
-      {"man_made", "water_tap"},
-      {"man_made", "water_well"},
-      {"natural", "beach"},
-      {"natural", "cave_entrance"},
-      {"natural", "geyser"},
-      {"natural", "hot_spring"},
-      {"natural", "peak"},
-      {"natural", "saddle"},
-      {"natural", "spring"},
-      {"natural", "volcano"},
-      {"waterway", "waterfall"}
-  };
+  base::StringIL arr[] = {{"aeroway", "terminal"},       {"aeroway", "gate"},
+                          {"building", "train_station"}, {"emergency", "defibrillator"},
+                          {"emergency", "fire_hydrant"}, {"emergency", "phone"},
+                          {"highway", "bus_stop"},       {"highway", "elevator"},
+                          {"highway", "ford"},           {"highway", "raceway"},
+                          {"highway", "rest_area"},      {"highway", "services"},
+                          {"highway", "speed_camera"},   {"man_made", "communications_tower"},
+                          {"man_made", "cross"},         {"man_made", "lighthouse"},
+                          {"man_made", "water_tap"},     {"man_made", "water_well"},
+                          {"natural", "beach"},          {"natural", "cave_entrance"},
+                          {"natural", "geyser"},         {"natural", "hot_spring"},
+                          {"natural", "peak"},           {"natural", "saddle"},
+                          {"natural", "spring"},         {"natural", "volcano"},
+                          {"waterway", "waterfall"}};
 
   for (auto const & path : arr)
     m_types.push_back(c.GetTypeByPath(path));
 }
 
-
 IsAmenityChecker::IsAmenityChecker() : BaseChecker(1 /* level */)
 {
   m_types.push_back(classif().GetTypeByPath({"amenity"}));
@@ -503,8 +484,7 @@ IsAmenityChecker::IsAmenityChecker() : BaseChecker(1 /* level */)
 IsCheckDateChecker::IsCheckDateChecker() : BaseChecker(1 /* level */)
 {
   Classificator const & c = classif();
-  for (auto const * path : {"amenity", "shop", "leisure", "tourism", "craft",
-                            "emergency", "healthcare", "office"})
+  for (auto const * path : {"amenity", "shop", "leisure", "tourism", "craft", "emergency", "healthcare", "office"})
     m_types.push_back(c.GetTypeByPath({path}));
 }
 
@@ -625,17 +605,11 @@ bool IsBridgeOrTunnelChecker::IsMatched(uint32_t type) const
 IsHotelChecker::IsHotelChecker()
 {
   base::StringIL const types[] = {
-    {"tourism", "alpine_hut"},
-    {"tourism", "apartment"},
-    {"tourism", "camp_site"},
-    {"tourism", "caravan_site"},  /// @todo Sure here?
-    {"tourism", "chalet"},
-    {"tourism", "guest_house"},
-    {"tourism", "hostel"},
-    {"tourism", "hotel"},
-    {"tourism", "motel"},
-    {"tourism", "wilderness_hut"},
-    {"leisure", "resort"},
+      {"tourism", "alpine_hut"},   {"tourism", "apartment"},   {"tourism", "camp_site"},
+      {"tourism", "caravan_site"},  /// @todo Sure here?
+      {"tourism", "chalet"},       {"tourism", "guest_house"}, {"tourism", "hostel"},
+      {"tourism", "hotel"},        {"tourism", "motel"},       {"tourism", "wilderness_hut"},
+      {"leisure", "resort"},
   };
 
   Classificator const & c = classif();
@@ -683,34 +657,30 @@ IsEatChecker::IsEatChecker()
 {
   // The order should be the same as in "enum class Type" declaration.
   /// @todo amenity=ice_cream if we already have biergarten :)
-  base::StringIL const types[] = {{"amenity", "cafe"},
-                                  {"amenity", "fast_food"},
-                                  {"amenity", "restaurant"},
-                                  {"amenity", "bar"},
-                                  {"amenity", "pub"},
-                                  {"amenity", "biergarten"},
-                                  {"amenity", "food_court"},
+  base::StringIL const types[] = {
+      {"amenity", "cafe"}, {"amenity", "fast_food"},  {"amenity", "restaurant"}, {"amenity", "bar"},
+      {"amenity", "pub"},  {"amenity", "biergarten"}, {"amenity", "food_court"},
   };
 
   Classificator const & c = classif();
-//  size_t i = 0;
+  //  size_t i = 0;
   for (auto const & e : types)
   {
     auto const type = c.GetTypeByPath(e);
     m_types.push_back(type);
-//    m_eat2clType[i++] = type;
+    //    m_eat2clType[i++] = type;
   }
 }
 
-//IsEatChecker::Type IsEatChecker::GetType(uint32_t t) const
+// IsEatChecker::Type IsEatChecker::GetType(uint32_t t) const
 //{
-//  for (size_t i = 0; i < m_eat2clType.size(); ++i)
-//  {
-//    if (m_eat2clType[i] == t)
-//      return static_cast<Type>(i);
-//  }
-//  return IsEatChecker::Type::Count;
-//}
+//   for (size_t i = 0; i < m_eat2clType.size(); ++i)
+//   {
+//     if (m_eat2clType[i] == t)
+//       return static_cast<Type>(i);
+//   }
+//   return IsEatChecker::Type::Count;
+// }
 
 IsCuisineChecker::IsCuisineChecker() : BaseChecker(1 /* level */)
 {
@@ -792,14 +762,8 @@ IsLocalityChecker::IsLocalityChecker()
   Classificator const & c = classif();
 
   // Note! The order should be equal with constants in Type enum (add other villages to the end).
-  base::StringIL const types[] = {
-    { "place", "country" },
-    { "place", "state" },
-    { "place", "city" },
-    { "place", "town" },
-    { "place", "village" },
-    { "place", "hamlet" }
-  };
+  base::StringIL const types[] = {{"place", "country"}, {"place", "state"},   {"place", "city"},
+                                  {"place", "town"},    {"place", "village"}, {"place", "hamlet"}};
 
   for (auto const & e : types)
     m_types.push_back(c.GetTypeByPath(e));
@@ -841,12 +805,7 @@ IsStateChecker::IsStateChecker()
 
 IsCityTownOrVillageChecker::IsCityTownOrVillageChecker()
 {
-  base::StringIL const types[] = {
-    {"place", "city"},
-    {"place", "town"},
-    {"place", "village"},
-    {"place", "hamlet"}
-  };
+  base::StringIL const types[] = {{"place", "city"}, {"place", "town"}, {"place", "village"}, {"place", "hamlet"}};
 
   Classificator const & c = classif();
   for (auto const & e : types)
@@ -886,7 +845,6 @@ IsAddressInterpolChecker::IsAddressInterpolChecker() : BaseChecker(1 /* level */
   m_even = c.GetTypeByPath({"addr:interpolation", "even"});
 }
 
-
 uint64_t GetDefPopulation(LocalityType localityType)
 {
   switch (localityType)
diff --git a/libs/indexer/ftypes_matcher.hpp b/libs/indexer/ftypes_matcher.hpp
index ea639000e..008ca54c0 100644
--- a/libs/indexer/ftypes_matcher.hpp
+++ b/libs/indexer/ftypes_matcher.hpp
@@ -10,8 +10,12 @@
 #include <string>
 #include <vector>
 
-#define DECLARE_CHECKER_INSTANCE(CheckerType) static CheckerType const & Instance() { \
-                                              static CheckerType const inst; return inst; }
+#define DECLARE_CHECKER_INSTANCE(CheckerType) \
+  static CheckerType const & Instance()       \
+  {                                           \
+    static CheckerType const inst;            \
+    return inst;                              \
+  }
 
 namespace ftypes
 {
@@ -41,6 +45,7 @@ public:
 class IsPeakChecker : public BaseChecker
 {
   IsPeakChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(IsPeakChecker);
 };
@@ -48,6 +53,7 @@ public:
 class IsATMChecker : public BaseChecker
 {
   IsATMChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(IsATMChecker);
 };
@@ -55,6 +61,7 @@ public:
 class IsSpeedCamChecker : public BaseChecker
 {
   IsSpeedCamChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(IsSpeedCamChecker);
 };
@@ -106,6 +113,7 @@ public:
 class IsRailwayStationChecker : public BaseChecker
 {
   IsRailwayStationChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(IsRailwayStationChecker);
 };
@@ -199,6 +207,7 @@ public:
 class IsAddressObjectChecker : public BaseChecker
 {
   IsAddressObjectChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(IsAddressObjectChecker);
 };
@@ -206,6 +215,7 @@ public:
 class IsAddressChecker : public BaseChecker
 {
   IsAddressChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(IsAddressChecker);
 };
@@ -213,6 +223,7 @@ public:
 class IsVillageChecker : public BaseChecker
 {
   IsVillageChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(IsVillageChecker);
 };
@@ -220,6 +231,7 @@ public:
 class IsOneWayChecker : public BaseChecker
 {
   IsOneWayChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(IsOneWayChecker);
 
@@ -229,6 +241,7 @@ public:
 class IsRoundAboutChecker : public BaseChecker
 {
   IsRoundAboutChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(IsRoundAboutChecker);
 };
@@ -236,6 +249,7 @@ public:
 class IsLinkChecker : public BaseChecker
 {
   IsLinkChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(IsLinkChecker);
 };
@@ -243,6 +257,7 @@ public:
 class IsBuildingChecker : public BaseChecker
 {
   IsBuildingChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(IsBuildingChecker);
 };
@@ -250,6 +265,7 @@ public:
 class IsBuildingPartChecker : public ftypes::BaseChecker
 {
   IsBuildingPartChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(IsBuildingPartChecker);
 };
@@ -257,6 +273,7 @@ public:
 class IsBuildingHasPartsChecker : public ftypes::BaseChecker
 {
   IsBuildingHasPartsChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(IsBuildingHasPartsChecker);
 
@@ -266,6 +283,7 @@ public:
 class IsIsolineChecker : public BaseChecker
 {
   IsIsolineChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(IsIsolineChecker);
 };
@@ -273,11 +291,11 @@ public:
 class IsPisteChecker : public BaseChecker
 {
   IsPisteChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(IsPisteChecker);
 };
 
-
 class OneLevelPOIChecker : public ftypes::BaseChecker
 {
 public:
@@ -302,17 +320,21 @@ public:
   DECLARE_CHECKER_INSTANCE(IsPoiChecker);
 
   bool operator()(FeatureType & ft) const { return m_oneLevel(ft) || m_twoLevel(ft); }
-  template <class T> bool operator()(T const & t) const { return m_oneLevel(t) || m_twoLevel(t); }
+  template <class T>
+  bool operator()(T const & t) const
+  {
+    return m_oneLevel(t) || m_twoLevel(t);
+  }
 
 private:
   OneLevelPOIChecker const m_oneLevel;
   TwoLevelPOIChecker const m_twoLevel;
 };
 
-
 class IsAmenityChecker : public BaseChecker
 {
   IsAmenityChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(IsAmenityChecker);
 
@@ -322,6 +344,7 @@ public:
 class IsCheckDateChecker : public BaseChecker
 {
   IsCheckDateChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(IsCheckDateChecker);
 
@@ -333,6 +356,7 @@ class AttractionsChecker : public BaseChecker
   size_t m_additionalTypesStart;
 
   AttractionsChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(AttractionsChecker);
 
@@ -343,6 +367,7 @@ public:
 class IsPlaceChecker : public BaseChecker
 {
   IsPlaceChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(IsPlaceChecker);
 };
@@ -352,6 +377,7 @@ class IsBridgeOrTunnelChecker : public BaseChecker
   virtual bool IsMatched(uint32_t type) const override;
 
   IsBridgeOrTunnelChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(IsBridgeOrTunnelChecker);
 };
@@ -359,6 +385,7 @@ public:
 class IsIslandChecker : public BaseChecker
 {
   IsIslandChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(IsIslandChecker);
 };
@@ -366,6 +393,7 @@ public:
 class IsLandChecker : public BaseChecker
 {
   IsLandChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(IsLandChecker);
 
@@ -375,6 +403,7 @@ public:
 class IsCoastlineChecker : public BaseChecker
 {
   IsCoastlineChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(IsCoastlineChecker);
 
@@ -384,6 +413,7 @@ public:
 class IsHotelChecker : public BaseChecker
 {
   IsHotelChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(IsHotelChecker);
 };
@@ -393,6 +423,7 @@ public:
 class IsWifiChecker : public BaseChecker
 {
   IsWifiChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(IsWifiChecker);
 
@@ -402,26 +433,26 @@ public:
 class IsEatChecker : public BaseChecker
 {
 public:
-//  enum class Type
-//  {
-//    Cafe = 0,
-//    FastFood,
-//    Restaurant,
-//    Bar,
-//    Pub,
-//    Biergarten,
+  //  enum class Type
+  //  {
+  //    Cafe = 0,
+  //    FastFood,
+  //    Restaurant,
+  //    Bar,
+  //    Pub,
+  //    Biergarten,
 
-//    Count
-//  };
+  //    Count
+  //  };
 
   DECLARE_CHECKER_INSTANCE(IsEatChecker);
 
-//  Type GetType(uint32_t t) const;
+  //  Type GetType(uint32_t t) const;
 
 private:
   IsEatChecker();
 
-//  std::array<uint32_t, base::Underlying(Type::Count)> m_eat2clType;
+  //  std::array<uint32_t, base::Underlying(Type::Count)> m_eat2clType;
 };
 
 class IsCuisineChecker : public BaseChecker
@@ -459,6 +490,7 @@ public:
 class IsCapitalChecker : public BaseChecker
 {
   IsCapitalChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(IsCapitalChecker);
 };
@@ -466,6 +498,7 @@ public:
 class IsPublicTransportStopChecker : public BaseChecker
 {
   IsPublicTransportStopChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(IsPublicTransportStopChecker);
 };
@@ -473,6 +506,7 @@ public:
 class IsTaxiChecker : public BaseChecker
 {
   IsTaxiChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(IsTaxiChecker);
 };
@@ -480,6 +514,7 @@ public:
 class IsMotorwayJunctionChecker : public BaseChecker
 {
   IsMotorwayJunctionChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(IsMotorwayJunctionChecker);
 };
@@ -488,6 +523,7 @@ public:
 class IsWayWithDurationChecker : public BaseChecker
 {
   IsWayWithDurationChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(IsWayWithDurationChecker);
 };
@@ -520,7 +556,8 @@ class IsLocalityChecker : public BaseChecker
 public:
   LocalityType GetType(uint32_t t) const;
 
-  template <class Types> LocalityType GetType(Types const & types) const
+  template <class Types>
+  LocalityType GetType(Types const & types) const
   {
     for (uint32_t const t : types)
     {
@@ -536,10 +573,10 @@ public:
   DECLARE_CHECKER_INSTANCE(IsLocalityChecker);
 };
 
-
 class IsCountryChecker : public BaseChecker
 {
   IsCountryChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(IsCountryChecker);
 };
@@ -547,6 +584,7 @@ public:
 class IsStateChecker : public BaseChecker
 {
   IsStateChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(IsStateChecker);
 };
@@ -554,6 +592,7 @@ public:
 class IsCityTownOrVillageChecker : public BaseChecker
 {
   IsCityTownOrVillageChecker();
+
 public:
   DECLARE_CHECKER_INSTANCE(IsCityTownOrVillageChecker);
 };
@@ -599,7 +638,8 @@ class IsAddressInterpolChecker : public BaseChecker
 public:
   DECLARE_CHECKER_INSTANCE(IsAddressInterpolChecker);
 
-  template <class Range> feature::InterpolType GetInterpolType(Range const & range) const
+  template <class Range>
+  feature::InterpolType GetInterpolType(Range const & range) const
   {
     for (uint32_t t : range)
     {
@@ -616,13 +656,9 @@ public:
     return feature::InterpolType::None;
   }
 
-  feature::InterpolType GetInterpolType(FeatureType & ft) const
-  {
-    return GetInterpolType(feature::TypesHolder(ft));
-  }
+  feature::InterpolType GetInterpolType(FeatureType & ft) const { return GetInterpolType(feature::TypesHolder(ft)); }
 };
 
-
 /// @name Get city radius and population.
 /// @param r Radius in meters.
 //@{
@@ -648,8 +684,8 @@ enum class HighwayClass
   // Adding a new type to distinguish mapped driveway or parking_aisle.
   ServiceMinor,
   Pedestrian,
-  Transported,    // Vehicles are transported by train or ferry.
-  Count           // This value is used for internals only.
+  Transported,  // Vehicles are transported by train or ferry.
+  Count         // This value is used for internals only.
 };
 
 std::string DebugPrint(HighwayClass const cls);
diff --git a/libs/indexer/house_to_street_iface.hpp b/libs/indexer/house_to_street_iface.hpp
index 6c9febc31..014cce633 100644
--- a/libs/indexer/house_to_street_iface.hpp
+++ b/libs/indexer/house_to_street_iface.hpp
@@ -28,14 +28,16 @@ public:
 
   struct Header
   {
-    template <class Sink> void Serialize(Sink & sink) const
+    template <class Sink>
+    void Serialize(Sink & sink) const
     {
       WriteToSink(sink, static_cast<uint8_t>(Version::Latest));
       WriteToSink(sink, m_tableOffset);
       WriteToSink(sink, m_tableSize);
     }
 
-    template <class Source> void Read(Source & source)
+    template <class Source>
+    void Read(Source & source)
     {
       m_version = static_cast<Version>(ReadPrimitiveFromSource<uint8_t>(source));
       m_tableOffset = ReadPrimitiveFromSource<uint32_t>(source);
diff --git a/libs/indexer/index_builder.hpp b/libs/indexer/index_builder.hpp
index 8e1193c66..997f21aba 100644
--- a/libs/indexer/index_builder.hpp
+++ b/libs/indexer/index_builder.hpp
@@ -8,19 +8,19 @@
 namespace indexer
 {
 template <class TFeaturesVector, typename TWriter>
-void BuildIndex(feature::DataHeader const & header, TFeaturesVector const & features,
-                TWriter & writer, std::string const & tmpFilePrefix)
+void BuildIndex(feature::DataHeader const & header, TFeaturesVector const & features, TWriter & writer,
+                std::string const & tmpFilePrefix)
+{
+  LOG(LINFO, ("Building scale index."));
+  uint64_t indexSize;
   {
-    LOG(LINFO, ("Building scale index."));
-    uint64_t indexSize;
-    {
-      SubWriter<TWriter> subWriter(writer);
-      covering::IndexScales(header, features, subWriter, tmpFilePrefix);
-      indexSize = subWriter.Size();
-    }
-    LOG(LINFO, ("Built scale index. Size =", indexSize));
+    SubWriter<TWriter> subWriter(writer);
+    covering::IndexScales(header, features, subWriter, tmpFilePrefix);
+    indexSize = subWriter.Size();
   }
+  LOG(LINFO, ("Built scale index. Size =", indexSize));
+}
 
-  // doesn't throw exceptions
-  bool BuildIndexFromDataFile(std::string const & dataFile, std::string const & tmpFile);
+// doesn't throw exceptions
+bool BuildIndexFromDataFile(std::string const & dataFile, std::string const & tmpFile);
 }  // namespace indexer
diff --git a/libs/indexer/indexer_tests/brands_tests.cpp b/libs/indexer/indexer_tests/brands_tests.cpp
index d2b398be1..5d873637f 100644
--- a/libs/indexer/indexer_tests/brands_tests.cpp
+++ b/libs/indexer/indexer_tests/brands_tests.cpp
@@ -41,15 +41,14 @@ UNIT_TEST(LoadBrands)
 
   {
     Names expectedNames;
-    expectedNames.emplace("McDonald's",   StringUtf8Multilang::GetLangIndex("en"));
-    expectedNames.emplace("Mc Donalds",   StringUtf8Multilang::GetLangIndex("en"));
+    expectedNames.emplace("McDonald's", StringUtf8Multilang::GetLangIndex("en"));
+    expectedNames.emplace("Mc Donalds", StringUtf8Multilang::GetLangIndex("en"));
     expectedNames.emplace("МакДональд'с", StringUtf8Multilang::GetLangIndex("ru"));
-    expectedNames.emplace("Мак Доналдс",  StringUtf8Multilang::GetLangIndex("ru"));
-    expectedNames.emplace("Макдональдз",  StringUtf8Multilang::GetLangIndex("uk"));
+    expectedNames.emplace("Мак Доналдс", StringUtf8Multilang::GetLangIndex("ru"));
+    expectedNames.emplace("Макдональдз", StringUtf8Multilang::GetLangIndex("uk"));
 
     Names names;
-    holder.ForEachNameByKey(
-        "mcdonalds", [&names](BrandsHolder::Brand::Name const & name) { names.insert(name); });
+    holder.ForEachNameByKey("mcdonalds", [&names](BrandsHolder::Brand::Name const & name) { names.insert(name); });
     CHECK_EQUAL(names, expectedNames, ());
   }
 
@@ -60,8 +59,7 @@ UNIT_TEST(LoadBrands)
     expectedNames.emplace("Сабвей", StringUtf8Multilang::GetLangIndex("ru"));
 
     Names names;
-    holder.ForEachNameByKey(
-        "subway", [&names](BrandsHolder::Brand::Name const & name) { names.insert(name); });
+    holder.ForEachNameByKey("subway", [&names](BrandsHolder::Brand::Name const & name) { names.insert(name); });
     CHECK_EQUAL(names, expectedNames, ());
   }
 
@@ -69,8 +67,7 @@ UNIT_TEST(LoadBrands)
     set<string> expectedNames = {"McDonald's", "Mc Donalds"};
 
     set<string> names;
-    holder.ForEachNameByKeyAndLang("mcdonalds", "en",
-                                   [&names](string const & name) { names.insert(name); });
+    holder.ForEachNameByKeyAndLang("mcdonalds", "en", [&names](string const & name) { names.insert(name); });
     CHECK_EQUAL(names, expectedNames, ());
   }
 
@@ -78,8 +75,7 @@ UNIT_TEST(LoadBrands)
     set<string> expectedNames = {"МакДональд'с", "Мак Доналдс"};
 
     set<string> names;
-    holder.ForEachNameByKeyAndLang("mcdonalds", "ru",
-                                   [&names](string const & name) { names.insert(name); });
+    holder.ForEachNameByKeyAndLang("mcdonalds", "ru", [&names](string const & name) { names.insert(name); });
     CHECK_EQUAL(names, expectedNames, ());
   }
 
@@ -87,8 +83,7 @@ UNIT_TEST(LoadBrands)
     set<string> expectedNames = {"Макдональдз"};
 
     set<string> names;
-    holder.ForEachNameByKeyAndLang("mcdonalds", "uk",
-                                   [&names](string const & name) { names.insert(name); });
+    holder.ForEachNameByKeyAndLang("mcdonalds", "uk", [&names](string const & name) { names.insert(name); });
     CHECK_EQUAL(names, expectedNames, ());
   }
 }
diff --git a/libs/indexer/indexer_tests/categories_test.cpp b/libs/indexer/indexer_tests/categories_test.cpp
index c2cb039a0..ab3fda580 100644
--- a/libs/indexer/indexer_tests/categories_test.cpp
+++ b/libs/indexer/indexer_tests/categories_test.cpp
@@ -38,55 +38,54 @@ struct Checker
     switch (m_count)
     {
     case 0:
-      {
-        TEST_EQUAL(cat.m_synonyms.size(), 8, ());
-        TEST_EQUAL(cat.m_synonyms[0].m_locale, CategoriesHolder::MapLocaleToInteger("en"), ());
-        TEST_EQUAL(cat.m_synonyms[0].m_name, "bench", ());
-        TEST_EQUAL(cat.m_synonyms[0].m_prefixLengthToSuggest, 1, ());
-        TEST_EQUAL(cat.m_synonyms[1].m_locale, CategoriesHolder::MapLocaleToInteger("en"), ());
-        TEST_EQUAL(cat.m_synonyms[1].m_name, "sit down", ());
-        TEST_EQUAL(cat.m_synonyms[1].m_prefixLengthToSuggest, 10, ());
-        TEST_EQUAL(cat.m_synonyms[2].m_locale, CategoriesHolder::MapLocaleToInteger("en"), ());
-        TEST_EQUAL(cat.m_synonyms[2].m_name, "to sit", ());
-        TEST_EQUAL(cat.m_synonyms[3].m_locale, CategoriesHolder::MapLocaleToInteger("de"), ());
-        TEST_EQUAL(cat.m_synonyms[3].m_name, "bank", ());
-        TEST_EQUAL(cat.m_synonyms[3].m_prefixLengthToSuggest, 2, ());
-        TEST_EQUAL(cat.m_synonyms[4].m_locale, CategoriesHolder::MapLocaleToInteger("de"), ());
-        TEST_EQUAL(cat.m_synonyms[4].m_name, "auf die strafbank schicken", ());
-        TEST_EQUAL(cat.m_synonyms[5].m_locale, CategoriesHolder::MapLocaleToInteger("zh_CN"), ());
-        TEST_EQUAL(cat.m_synonyms[5].m_locale, CategoriesHolder::MapLocaleToInteger("zh_rCN"), ());
-        TEST_EQUAL(cat.m_synonyms[5].m_locale, CategoriesHolder::MapLocaleToInteger("zh_HANS_CN"), ());
-        TEST_EQUAL(cat.m_synonyms[5].m_locale, CategoriesHolder::MapLocaleToInteger("zh-Hans"), ());
-        TEST_EQUAL(cat.m_synonyms[5].m_name, "长凳", ());
-        TEST_EQUAL(cat.m_synonyms[6].m_locale, CategoriesHolder::MapLocaleToInteger("zh_TW"), ());
-        TEST_EQUAL(cat.m_synonyms[6].m_locale, CategoriesHolder::MapLocaleToInteger("zh-MO"), ());
-        TEST_EQUAL(cat.m_synonyms[6].m_locale, CategoriesHolder::MapLocaleToInteger("zh-rTW"), ());
-        TEST_EQUAL(cat.m_synonyms[6].m_locale, CategoriesHolder::MapLocaleToInteger("zh_HANT_HK"), ());
-        TEST_EQUAL(cat.m_synonyms[6].m_locale, CategoriesHolder::MapLocaleToInteger("zh_HK"), ());
-        TEST_EQUAL(cat.m_synonyms[6].m_locale, CategoriesHolder::MapLocaleToInteger("zh-Hant"), ());
-        TEST_EQUAL(cat.m_synonyms[6].m_name, "長板凳", ());
-        TEST_EQUAL(cat.m_synonyms[7].m_locale, CategoriesHolder::MapLocaleToInteger("da"), ());
-        TEST_EQUAL(cat.m_synonyms[7].m_name, "bænk", ());
-        ++m_count;
-      }
-      break;
+    {
+      TEST_EQUAL(cat.m_synonyms.size(), 8, ());
+      TEST_EQUAL(cat.m_synonyms[0].m_locale, CategoriesHolder::MapLocaleToInteger("en"), ());
+      TEST_EQUAL(cat.m_synonyms[0].m_name, "bench", ());
+      TEST_EQUAL(cat.m_synonyms[0].m_prefixLengthToSuggest, 1, ());
+      TEST_EQUAL(cat.m_synonyms[1].m_locale, CategoriesHolder::MapLocaleToInteger("en"), ());
+      TEST_EQUAL(cat.m_synonyms[1].m_name, "sit down", ());
+      TEST_EQUAL(cat.m_synonyms[1].m_prefixLengthToSuggest, 10, ());
+      TEST_EQUAL(cat.m_synonyms[2].m_locale, CategoriesHolder::MapLocaleToInteger("en"), ());
+      TEST_EQUAL(cat.m_synonyms[2].m_name, "to sit", ());
+      TEST_EQUAL(cat.m_synonyms[3].m_locale, CategoriesHolder::MapLocaleToInteger("de"), ());
+      TEST_EQUAL(cat.m_synonyms[3].m_name, "bank", ());
+      TEST_EQUAL(cat.m_synonyms[3].m_prefixLengthToSuggest, 2, ());
+      TEST_EQUAL(cat.m_synonyms[4].m_locale, CategoriesHolder::MapLocaleToInteger("de"), ());
+      TEST_EQUAL(cat.m_synonyms[4].m_name, "auf die strafbank schicken", ());
+      TEST_EQUAL(cat.m_synonyms[5].m_locale, CategoriesHolder::MapLocaleToInteger("zh_CN"), ());
+      TEST_EQUAL(cat.m_synonyms[5].m_locale, CategoriesHolder::MapLocaleToInteger("zh_rCN"), ());
+      TEST_EQUAL(cat.m_synonyms[5].m_locale, CategoriesHolder::MapLocaleToInteger("zh_HANS_CN"), ());
+      TEST_EQUAL(cat.m_synonyms[5].m_locale, CategoriesHolder::MapLocaleToInteger("zh-Hans"), ());
+      TEST_EQUAL(cat.m_synonyms[5].m_name, "长凳", ());
+      TEST_EQUAL(cat.m_synonyms[6].m_locale, CategoriesHolder::MapLocaleToInteger("zh_TW"), ());
+      TEST_EQUAL(cat.m_synonyms[6].m_locale, CategoriesHolder::MapLocaleToInteger("zh-MO"), ());
+      TEST_EQUAL(cat.m_synonyms[6].m_locale, CategoriesHolder::MapLocaleToInteger("zh-rTW"), ());
+      TEST_EQUAL(cat.m_synonyms[6].m_locale, CategoriesHolder::MapLocaleToInteger("zh_HANT_HK"), ());
+      TEST_EQUAL(cat.m_synonyms[6].m_locale, CategoriesHolder::MapLocaleToInteger("zh_HK"), ());
+      TEST_EQUAL(cat.m_synonyms[6].m_locale, CategoriesHolder::MapLocaleToInteger("zh-Hant"), ());
+      TEST_EQUAL(cat.m_synonyms[6].m_name, "長板凳", ());
+      TEST_EQUAL(cat.m_synonyms[7].m_locale, CategoriesHolder::MapLocaleToInteger("da"), ());
+      TEST_EQUAL(cat.m_synonyms[7].m_name, "bænk", ());
+      ++m_count;
+    }
+    break;
     case 1:
     case 2:
-      {
-        TEST_EQUAL(cat.m_synonyms.size(), 3, ());
-        TEST_EQUAL(cat.m_synonyms[0].m_locale, CategoriesHolder::MapLocaleToInteger("en"), ());
-        TEST_EQUAL(cat.m_synonyms[0].m_name, "village", ());
-        TEST_EQUAL(cat.m_synonyms[1].m_locale, CategoriesHolder::MapLocaleToInteger("de"), ());
-        TEST_EQUAL(cat.m_synonyms[1].m_name, "dorf", ());
-        TEST_EQUAL(cat.m_synonyms[1].m_prefixLengthToSuggest, 2, ());
-        TEST_EQUAL(cat.m_synonyms[2].m_locale, CategoriesHolder::MapLocaleToInteger("de"), ());
-        TEST_EQUAL(cat.m_synonyms[2].m_name, "weiler", ());
-        TEST_EQUAL(cat.m_synonyms[2].m_prefixLengthToSuggest, 4, ());
-        ++m_count;
-      }
-      break;
-    default:
-      TEST(false, ("Too many categories"));
+    {
+      TEST_EQUAL(cat.m_synonyms.size(), 3, ());
+      TEST_EQUAL(cat.m_synonyms[0].m_locale, CategoriesHolder::MapLocaleToInteger("en"), ());
+      TEST_EQUAL(cat.m_synonyms[0].m_name, "village", ());
+      TEST_EQUAL(cat.m_synonyms[1].m_locale, CategoriesHolder::MapLocaleToInteger("de"), ());
+      TEST_EQUAL(cat.m_synonyms[1].m_name, "dorf", ());
+      TEST_EQUAL(cat.m_synonyms[1].m_prefixLengthToSuggest, 2, ());
+      TEST_EQUAL(cat.m_synonyms[2].m_locale, CategoriesHolder::MapLocaleToInteger("de"), ());
+      TEST_EQUAL(cat.m_synonyms[2].m_name, "weiler", ());
+      TEST_EQUAL(cat.m_synonyms[2].m_prefixLengthToSuggest, 4, ());
+      ++m_count;
+    }
+    break;
+    default: TEST(false, ("Too many categories"));
     }
   }
 
@@ -109,10 +108,9 @@ UNIT_TEST(CategoriesHolder_Smoke)
   auto const & mappings = CategoriesHolder::kLocaleMapping;
   for (size_t i = 0; i < mappings.size(); ++i)
   {
-    auto const & mapping  = mappings[i];
+    auto const & mapping = mappings[i];
     TEST_EQUAL(static_cast<int8_t>(i + 1), mapping.m_code, ());
-    TEST_EQUAL(static_cast<int8_t>(i + 1),
-               CategoriesHolder::MapLocaleToInteger(mapping.m_name), (mapping.m_name));
+    TEST_EQUAL(static_cast<int8_t>(i + 1), CategoriesHolder::MapLocaleToInteger(mapping.m_name), (mapping.m_name));
     TEST_EQUAL(CategoriesHolder::MapIntegerToLocale(i + 1), mapping.m_name, ());
   }
 }
@@ -180,8 +178,7 @@ UNIT_TEST(CategoriesIndex_Smoke)
 {
   classificator::Load();
 
-  CategoriesHolder holder(
-      make_unique<MemReader>(g_testCategoriesTxt, sizeof(g_testCategoriesTxt) - 1));
+  CategoriesHolder holder(make_unique<MemReader>(g_testCategoriesTxt, sizeof(g_testCategoriesTxt) - 1));
   CategoriesIndex index(holder);
 
   uint32_t type1 = classif().GetTypeByPath({"amenity", "bench"});
diff --git a/libs/indexer/indexer_tests/cell_id_test.cpp b/libs/indexer/indexer_tests/cell_id_test.cpp
index 69b8119c0..03db7cb65 100644
--- a/libs/indexer/indexer_tests/cell_id_test.cpp
+++ b/libs/indexer/indexer_tests/cell_id_test.cpp
@@ -18,30 +18,26 @@ UNIT_TEST(ToCellId)
 {
   string s("2130000");
   s.append(CellIdT::DEPTH_LEVELS - 1 - s.size(), '0');
-  TEST_EQUAL((CellIdConverter<Bounds<0, 0, 4, 4>, CellIdT>::ToCellId(1.5, 2.5).ToString()),
-             s, ());
-  TEST_EQUAL(CellIdT::FromString(s),
-             (CellIdConverter<Bounds<0, 0, 4, 4>, CellIdT>::ToCellId(1.5, 2.5)), ());
+  TEST_EQUAL((CellIdConverter<Bounds<0, 0, 4, 4>, CellIdT>::ToCellId(1.5, 2.5).ToString()), s, ());
+  TEST_EQUAL(CellIdT::FromString(s), (CellIdConverter<Bounds<0, 0, 4, 4>, CellIdT>::ToCellId(1.5, 2.5)), ());
 }
 
 UNIT_TEST(CommonCell)
 {
-  TEST_EQUAL((CellIdConverter<Bounds<0, 0, 4, 4>, CellIdT>::Cover2PointsWithCell(
-      3.5, 2.5, 2.5, 3.5)),
+  TEST_EQUAL((CellIdConverter<Bounds<0, 0, 4, 4>, CellIdT>::Cover2PointsWithCell(3.5, 2.5, 2.5, 3.5)),
              CellIdT::FromString("3"), ());
-  TEST_EQUAL((CellIdConverter<Bounds<0, 0, 4, 4>, CellIdT>::Cover2PointsWithCell(
-      2.25, 1.75, 2.75, 1.25)),
+  TEST_EQUAL((CellIdConverter<Bounds<0, 0, 4, 4>, CellIdT>::Cover2PointsWithCell(2.25, 1.75, 2.75, 1.25)),
              CellIdT::FromString("12"), ());
 }
 
 namespace
 {
-  template <typename T1, typename T2>
-  bool PairsAlmostEqualULPs(pair<T1, T1> const & p1, pair<T2, T2> const & p2)
-  {
-    return fabs(p1.first - p2.first) + fabs(p1.second - p2.second) < 0.00001;
-  }
+template <typename T1, typename T2>
+bool PairsAlmostEqualULPs(pair<T1, T1> const & p1, pair<T2, T2> const & p2)
+{
+  return fabs(p1.first - p2.first) + fabs(p1.second - p2.second) < 0.00001;
 }
+}  // namespace
 
 UNIT_TEST(CellId_RandomRecode)
 {
@@ -50,10 +46,9 @@ UNIT_TEST(CellId_RandomRecode)
   {
     uint32_t const x = rng() % 2000;
     uint32_t const y = rng() % 1000;
-    m2::PointD const pt =
-        CellIdConverter<Bounds<0, 0, 2000, 1000>, CellIdT>::FromCellId(
-            CellIdConverter<Bounds<0, 0, 2000, 1000>, CellIdT>::ToCellId(x, y));
-    TEST(fabs(pt.x  - x) < 0.0002, (x, y, pt));
+    m2::PointD const pt = CellIdConverter<Bounds<0, 0, 2000, 1000>, CellIdT>::FromCellId(
+        CellIdConverter<Bounds<0, 0, 2000, 1000>, CellIdT>::ToCellId(x, y));
+    TEST(fabs(pt.x - x) < 0.0002, (x, y, pt));
     TEST(fabs(pt.y - y) < 0.0001, (x, y, pt));
   }
 }
diff --git a/libs/indexer/indexer_tests/centers_table_test.cpp b/libs/indexer/indexer_tests/centers_table_test.cpp
index 21788ff59..3bb029400 100644
--- a/libs/indexer/indexer_tests/centers_table_test.cpp
+++ b/libs/indexer/indexer_tests/centers_table_test.cpp
@@ -37,7 +37,6 @@ UNIT_CLASS_TEST(CentersTableTest, Smoke)
 {
   string const kMap = base::JoinPath(GetPlatform().WritableDir(), "minsk-pass.mwm");
 
-
   FeaturesVectorTest fv(kMap);
 
   TBuffer buffer;
@@ -47,8 +46,7 @@ UNIT_CLASS_TEST(CentersTableTest, Smoke)
     feature::DataHeader header(kMap);
 
     builder.SetGeometryParams(header.GetBounds());
-    fv.GetVector().ForEach(
-        [&](FeatureType & ft, uint32_t id) { builder.Put(id, feature::GetCenter(ft)); });
+    fv.GetVector().ForEach([&](FeatureType & ft, uint32_t id) { builder.Put(id, feature::GetCenter(ft)); });
 
     MemWriter<TBuffer> writer(buffer);
     builder.Freeze(writer);
@@ -59,7 +57,8 @@ UNIT_CLASS_TEST(CentersTableTest, Smoke)
     auto table = CentersTable::LoadV1(reader);
     TEST(table.get(), ());
 
-    fv.GetVector().ForEach([&](FeatureType & ft, uint32_t id) {
+    fv.GetVector().ForEach([&](FeatureType & ft, uint32_t id)
+    {
       m2::PointD actual;
       TEST(table->Get(id, actual), ());
 
@@ -85,8 +84,7 @@ UNIT_CLASS_TEST(CentersTableTest, SmokeV0)
     CentersTableBuilder builder;
 
     builder.SetGeometryCodingParamsV0ForTests(codingParams);
-    fv.GetVector().ForEach(
-        [&](FeatureType & ft, uint32_t id) { builder.PutV0ForTests(id, feature::GetCenter(ft)); });
+    fv.GetVector().ForEach([&](FeatureType & ft, uint32_t id) { builder.PutV0ForTests(id, feature::GetCenter(ft)); });
 
     MemWriter<TBuffer> writer(buffer);
     builder.FreezeV0ForTests(writer);
@@ -97,7 +95,8 @@ UNIT_CLASS_TEST(CentersTableTest, SmokeV0)
     auto table = CentersTable::LoadV0(reader, codingParams);
     TEST(table.get(), ());
 
-    fv.GetVector().ForEach([&](FeatureType & ft, uint32_t id) {
+    fv.GetVector().ForEach([&](FeatureType & ft, uint32_t id)
+    {
       m2::PointD actual;
       TEST(table->Get(id, actual), ());
 
diff --git a/libs/indexer/indexer_tests/checker_test.cpp b/libs/indexer/indexer_tests/checker_test.cpp
index 5d3331f1e..7b3d1c18d 100644
--- a/libs/indexer/indexer_tests/checker_test.cpp
+++ b/libs/indexer/indexer_tests/checker_test.cpp
@@ -29,31 +29,20 @@ vector<uint32_t> GetTypes(char const * arr[][roadArrColumnCount], size_t const r
 
 vector<uint32_t> GetStreetTypes()
 {
-  char const * arr[][roadArrColumnCount] =
-  {
-    { "highway", "trunk", "bridge" },
-    { "highway", "tertiary", "tunnel" }
-  };
+  char const * arr[][roadArrColumnCount] = {{"highway", "trunk", "bridge"}, {"highway", "tertiary", "tunnel"}};
   return GetTypes(arr, ARRAY_SIZE(arr));
 }
 
 vector<uint32_t> GetStreetAndNotStreetTypes()
 {
-  char const * arr[][roadArrColumnCount] =
-  {
-    { "highway", "trunk", "bridge" },
-    { "highway", "primary_link", "tunnel" }
-  };
+  char const * arr[][roadArrColumnCount] = {{"highway", "trunk", "bridge"}, {"highway", "primary_link", "tunnel"}};
   return GetTypes(arr, ARRAY_SIZE(arr));
 }
 
 vector<uint32_t> GetLinkTypes()
 {
-  char const * arr[][roadArrColumnCount] =
-  {
-    { "highway", "secondary_link", "bridge" },
-    { "highway", "motorway_link", "tunnel" }
-  };
+  char const * arr[][roadArrColumnCount] = {{"highway", "secondary_link", "bridge"},
+                                            {"highway", "motorway_link", "tunnel"}};
   return GetTypes(arr, ARRAY_SIZE(arr));
 }
 
@@ -70,18 +59,16 @@ UNIT_TEST(IsBridgeOrTunnelChecker)
   classificator::Load();
   auto const & c = classif();
 
-  base::StringIL arrYes[] =
-  {
-    {"highway", "trunk", "bridge"},
-    {"highway", "motorway_link", "tunnel"},
+  base::StringIL arrYes[] = {
+      {"highway", "trunk", "bridge"},
+      {"highway", "motorway_link", "tunnel"},
   };
   for (auto const & e : arrYes)
     TEST(ftypes::IsBridgeOrTunnelChecker::Instance()(c.GetTypeByPath(e)), ());
 
-  base::StringIL arrNo[] =
-  {
-    {"highway", "motorway_junction"},
-    {"highway", "service", "driveway"},
+  base::StringIL arrNo[] = {
+      {"highway", "motorway_junction"},
+      {"highway", "service", "driveway"},
   };
   for (auto const & e : arrNo)
     TEST(!ftypes::IsBridgeOrTunnelChecker::Instance()(c.GetTypeByPath(e)), ());
@@ -138,18 +125,16 @@ UNIT_TEST(IsAttractionsChecker)
   auto const & checker = ftypes::AttractionsChecker::Instance();
 
   base::StringIL arrExceptions[] = {
-    {"tourism", "information"},
-    {"amenity", "ranger_station"},
+      {"tourism", "information"},
+      {"amenity", "ranger_station"},
   };
   std::vector<uint32_t> exceptions;
   for (auto e : arrExceptions)
     exceptions.push_back(c.GetTypeByPath(e));
 
   for (uint32_t const t : search::GetCategoryTypes("sights", "en", GetDefaultCategories()))
-  {
     if (!base::IsExist(exceptions, ftype::Trunc(t, 2)))
       TEST(checker(t), (c.GetFullObjectName(t)));
-  }
 }
 
 UNIT_TEST(IsMotorwayJunctionChecker)
@@ -160,4 +145,4 @@ UNIT_TEST(IsMotorwayJunctionChecker)
   TEST(!ftypes::IsMotorwayJunctionChecker::Instance()(GetStreetTypes()), ());
 }
 
-} // namespacce checker_test
+}  // namespace checker_test
diff --git a/libs/indexer/indexer_tests/cities_boundaries_serdes_tests.cpp b/libs/indexer/indexer_tests/cities_boundaries_serdes_tests.cpp
index fcd227ced..0ac1d5d3b 100644
--- a/libs/indexer/indexer_tests/cities_boundaries_serdes_tests.cpp
+++ b/libs/indexer/indexer_tests/cities_boundaries_serdes_tests.cpp
@@ -122,8 +122,7 @@ UNIT_TEST(CitiesBoundariesSerDes_Smoke)
     boundary0.emplace_back(vector<PointD>{{PointD(3.1415, 2.1828), PointD(2.1828, 3.1415)}});
 
     Boundary boundary1;
-    boundary1.emplace_back(
-        vector<PointD>{{PointD(1.000, 1.000), PointD(1.002, 1.000), PointD(1.002, 1.003)}});
+    boundary1.emplace_back(vector<PointD>{{PointD(1.000, 1.000), PointD(1.002, 1.000), PointD(1.002, 1.003)}});
 
     Boundaries const expected = {{boundary0, boundary1}};
     TestEncodeDecode(expected);
@@ -133,8 +132,7 @@ UNIT_TEST(CitiesBoundariesSerDes_Smoke)
 UNIT_TEST(CitiesBoundaries_Moscow)
 {
   vector<PointD> const points = {
-    {37.04001, 67.55964}, {37.55650, 66.96428}, {38.02513, 67.37082}, {37.50865, 67.96618}
-  };
+      {37.04001, 67.55964}, {37.55650, 66.96428}, {38.02513, 67.37082}, {37.50865, 67.96618}};
 
   PointD const target(37.44765, 67.65243);
 
@@ -189,11 +187,9 @@ UNIT_TEST(CitiesBoundaries_Compression)
   {
     TEST_EQUAL(all1[i].size(), all2[i].size(), ());
     for (size_t j = 0; j < all1[i].size(); ++j)
-    {
       if (!(all1[i][j] == all2[i][j]))
         LOG(LINFO, (i, all1[i][j], all2[i][j]));
-    }
   }
 }
 
-} // namespace cities_boundaries_serdes_tests
+}  // namespace cities_boundaries_serdes_tests
diff --git a/libs/indexer/indexer_tests/classificator_tests.cpp b/libs/indexer/indexer_tests/classificator_tests.cpp
index 58d3f8d65..dac3e056f 100644
--- a/libs/indexer/indexer_tests/classificator_tests.cpp
+++ b/libs/indexer/indexer_tests/classificator_tests.cpp
@@ -99,6 +99,6 @@ UNIT_CLASS_TEST(TestWithClassificator, Classificator_StableIndex)
   TEST(c.IsTypeValid(type), ());
   uint32_t const index = c.GetIndexForType(type);
   TEST_EQUAL(index, 357 - 1, ());
-  TEST_NOT_EQUAL(type, c.GetTypeForIndex(356 - 1), ()); // Restored underground-fee
+  TEST_NOT_EQUAL(type, c.GetTypeForIndex(356 - 1), ());  // Restored underground-fee
   TEST_EQUAL(type, c.GetTypeForIndex(357 - 1), ());
 }
diff --git a/libs/indexer/indexer_tests/drules_selector_parser_test.cpp b/libs/indexer/indexer_tests/drules_selector_parser_test.cpp
index 8ce51d46e..283c7ba84 100644
--- a/libs/indexer/indexer_tests/drules_selector_parser_test.cpp
+++ b/libs/indexer/indexer_tests/drules_selector_parser_test.cpp
@@ -133,18 +133,9 @@ UNIT_TEST(TestDruleSelectorGreaterOrEqual)
 
 UNIT_TEST(TestDruleSelectorInvalid)
 {
-  char const * const badFormats[] =
-  {
-    "",
-    "=badformat",
-    "!=badformat",
-    ">badformat",
-    "<badformat",
-    ">=badformat",
-    "<=badformat",
-    "bad$name",
-    "!bad$name",
-    "bad$name=1000",
+  char const * const badFormats[] = {
+      "",         "=badformat", "!=badformat",   ">badformat", "<badformat", ">=badformat", "<=badformat",
+      "bad$name", "!bad$name",  "bad$name=1000",
   };
 
   for (auto e : badFormats)
@@ -158,7 +149,7 @@ UNIT_TEST(PopulationSelector_Smoke)
 {
   TEST(ParseSelector("population<1000"), ());
   TEST(ParseSelector(vector<string>({"population>1000"})), ());
-  TEST(ParseSelector(vector<string>({"population>=1000","population<=1000000"})), ());
+  TEST(ParseSelector(vector<string>({"population>=1000", "population<=1000000"})), ());
 }
 
 UNIT_TEST(NameSelector_Smoke)
@@ -171,7 +162,7 @@ UNIT_TEST(InvalidSelector_Smoke)
 {
   TEST(!ParseSelector(""), ());
   TEST(!ParseSelector(vector<string>({""})), ());
-  TEST(!ParseSelector(vector<string>({"population>=1000","population<=1000000", ""})), ());
+  TEST(!ParseSelector(vector<string>({"population>=1000", "population<=1000000", ""})), ());
 }
 
-} // namespace drules_selector_parser_test
+}  // namespace drules_selector_parser_test
diff --git a/libs/indexer/indexer_tests/editable_map_object_test.cpp b/libs/indexer/indexer_tests/editable_map_object_test.cpp
index 930f4252e..bb8a030cc 100644
--- a/libs/indexer/indexer_tests/editable_map_object_test.cpp
+++ b/libs/indexer/indexer_tests/editable_map_object_test.cpp
@@ -37,10 +37,8 @@ void CheckExpectations(StringUtf8Multilang const & s, vector<ExpectedName> const
   size_t counter = 0;
   s.ForEach([&expectations, &counter](int8_t const code, string_view name)
   {
-    auto const it = find_if(expectations.begin(), expectations.end(), [&code](ExpectedName const & item)
-    {
-      return GetLangCode(item.m_lang.c_str()) == code;
-    });
+    auto const it = find_if(expectations.begin(), expectations.end(),
+                            [&code](ExpectedName const & item) { return GetLangCode(item.m_lang.c_str()) == code; });
 
     if (it == expectations.end())
       TEST(false, ("Unexpected language code: ", code, ". Expectations: ", expectations));
@@ -49,17 +47,18 @@ void CheckExpectations(StringUtf8Multilang const & s, vector<ExpectedName> const
     ++counter;
   });
 
-  TEST_EQUAL(counter, expectations.size(), ("Unexpected count of names, expected ", expectations.size(),
-                                            ", but turned out ", counter, ". Expectations: ", expectations));
+  TEST_EQUAL(counter, expectations.size(),
+             ("Unexpected count of names, expected ", expectations.size(), ", but turned out ", counter,
+              ". Expectations: ", expectations));
 }
 
 UNIT_TEST(EditableMapObject_SetWebsite)
 {
   pair<char const *, char const *> arr[] = {
-    { "https://some.thing.org", "https://some.thing.org" },
-    { "http://some.thing.org", "http://some.thing.org" },
-    { "some.thing.org", "http://some.thing.org" },
-    { "", "" },
+      {"https://some.thing.org", "https://some.thing.org"},
+      {"http://some.thing.org", "http://some.thing.org"},
+      {"some.thing.org", "http://some.thing.org"},
+      {"", ""},
   };
 
   EditableMapObject emo;
@@ -78,13 +77,13 @@ UNIT_TEST(EditableMapObject_ValidateBuildingLevels)
   TEST(EditableMapObject::ValidateBuildingLevels("25"), ());
   TEST(!EditableMapObject::ValidateBuildingLevels("0"), ());
   TEST(!EditableMapObject::ValidateBuildingLevels("005"), ());
-  TEST(!EditableMapObject::ValidateBuildingLevels(std::to_string(EditableMapObject::kMaximumLevelsEditableByUsers + 1)), ());
+  TEST(!EditableMapObject::ValidateBuildingLevels(std::to_string(EditableMapObject::kMaximumLevelsEditableByUsers + 1)),
+       ());
   TEST(!EditableMapObject::ValidateBuildingLevels("22a"), ());
   TEST(!EditableMapObject::ValidateBuildingLevels("a22"), ());
   TEST(!EditableMapObject::ValidateBuildingLevels("2a22"), ());
   TEST(!EditableMapObject::ValidateBuildingLevels("ab"), ());
-  TEST(!EditableMapObject::ValidateBuildingLevels(
-      "2345534564564453645534545345534564564453645"), ());
+  TEST(!EditableMapObject::ValidateBuildingLevels("2345534564564453645534545345534564564453645"), ());
 }
 
 UNIT_TEST(EditableMapObject_ValidateHouseNumber)
@@ -199,28 +198,44 @@ UNIT_TEST(EditableMapObject_ValidateEmail)
 
 UNIT_TEST(EditableMapObject_ValidateName)
 {
-  vector<string> correctNames = {"abc", "абв", "ᆺᆯㅕ", "꫞ꪺꫀꪸ", "a b?c", "a!b.c", "a(b)c", "a,b.c",
-                                 "a$bc", "a%bc", "a#bc", "a№bc", "c&a", "a[bc"};
-  vector<string> incorrectNames = {"a^bc", "a~bc", "a§bc", "a>bc", "a<bc", "a{bc", "*",
-                                   "a*bc", "a=bc", "a_bc", "a±bc", "a\nbc", "a\tbc", "a\rbc",
-                                   "a\vbc", "a\fbc", "a|bc", "N√", "Hello World!\U0001F600",
-                                   "Exit →", "∫0dx = C", "\U0001210A", "⚠︎", "⚠️"};
+  vector<string> correctNames = {"abc",   "абв",  "ᆺᆯㅕ", "꫞ꪺꫀꪸ",  "a b?c", "a!b.c", "a(b)c",
+                                 "a,b.c", "a$bc", "a%bc", "a#bc", "a№bc",  "c&a",   "a[bc"};
+  vector<string> incorrectNames = {"a^bc",
+                                   "a~bc",
+                                   "a§bc",
+                                   "a>bc",
+                                   "a<bc",
+                                   "a{bc",
+                                   "*",
+                                   "a*bc",
+                                   "a=bc",
+                                   "a_bc",
+                                   "a±bc",
+                                   "a\nbc",
+                                   "a\tbc",
+                                   "a\rbc",
+                                   "a\vbc",
+                                   "a\fbc",
+                                   "a|bc",
+                                   "N√",
+                                   "Hello World!\U0001F600",
+                                   "Exit →",
+                                   "∫0dx = C",
+                                   "\U0001210A",
+                                   "⚠︎",
+                                   "⚠️"};
 
   for (auto const & name : correctNames)
-  {
     TEST(EditableMapObject::ValidateName(name), ());
-  }
 
   for (auto const & name : incorrectNames)
-  {
     TEST(!EditableMapObject::ValidateName(name), ());
-  }
 }
 
 UNIT_TEST(EditableMapObject_CanUseAsDefaultName)
 {
   EditableMapObject emo;
-  vector<int8_t> const nativeMwmLanguages {GetLangCode("de"), GetLangCode("fr")};
+  vector<int8_t> const nativeMwmLanguages{GetLangCode("de"), GetLangCode("fr")};
 
   TEST(EditableMapObject::CanUseAsDefaultName(GetLangCode("de"), nativeMwmLanguages),
        ("Check possibility to use Mwm language code"));
@@ -228,8 +243,7 @@ UNIT_TEST(EditableMapObject_CanUseAsDefaultName)
        ("Check possibility to use Mwm language code"));
   TEST(!EditableMapObject::CanUseAsDefaultName(GetLangCode("int_name"), nativeMwmLanguages),
        ("Check possibility to use international language code"));
-  TEST(!EditableMapObject::CanUseAsDefaultName(100, nativeMwmLanguages),
-       ("Incorrect language code is not supported"));
+  TEST(!EditableMapObject::CanUseAsDefaultName(100, nativeMwmLanguages), ("Incorrect language code is not supported"));
   TEST(!EditableMapObject::CanUseAsDefaultName(GetLangCode("en"), {GetLangCode("abcd")}),
        ("Incorrect Mwm language name is not supported"));
   TEST(!EditableMapObject::CanUseAsDefaultName(GetLangCode("en"), nativeMwmLanguages),
@@ -242,16 +256,13 @@ UNIT_TEST(EditableMapObject_CanUseAsDefaultName)
   names.AddString(GetLangCode("fr"), "second mwm language");
   emo.SetName(names);
 
-  TEST(EditableMapObject::CanUseAsDefaultName(GetLangCode("fr"), nativeMwmLanguages),
-       ("It is possible to fix typo"));
+  TEST(EditableMapObject::CanUseAsDefaultName(GetLangCode("fr"), nativeMwmLanguages), ("It is possible to fix typo"));
 
   names.AddString(GetLangCode("de"), "first mwm language");
   emo.SetName(names);
 
-  TEST(EditableMapObject::CanUseAsDefaultName(GetLangCode("de"), nativeMwmLanguages),
-       ("It is possible to fix typo"));
-  TEST(EditableMapObject::CanUseAsDefaultName(GetLangCode("fr"), nativeMwmLanguages),
-       ("It is possible to fix typo"));
+  TEST(EditableMapObject::CanUseAsDefaultName(GetLangCode("de"), nativeMwmLanguages), ("It is possible to fix typo"));
+  TEST(EditableMapObject::CanUseAsDefaultName(GetLangCode("fr"), nativeMwmLanguages), ("It is possible to fix typo"));
 }
 
 UNIT_TEST(EditableMapObject_GetNamesDataSource)
@@ -272,38 +283,36 @@ UNIT_TEST(EditableMapObject_GetNamesDataSource)
 
   vector<int8_t> nativeMwmLanguages = {GetLangCode("de"), GetLangCode("fr")};
 
-  auto const namesDataSource = EditableMapObject::GetNamesDataSource(
-      emo.GetNameMultilang(), nativeMwmLanguages, GetLangCode("ko"));
+  auto const namesDataSource =
+      EditableMapObject::GetNamesDataSource(emo.GetNameMultilang(), nativeMwmLanguages, GetLangCode("ko"));
 
-  TEST_EQUAL(namesDataSource.names.size(), 9,("All names including the default should be pushed into data source"));
-  TEST_EQUAL(namesDataSource.mandatoryNamesCount, 1,("Mandatory names count should always be 1"));
-  TEST_EQUAL(namesDataSource.names[0].m_code, GetLangCode("default"),("Default is always first in the list"));
+  TEST_EQUAL(namesDataSource.names.size(), 9, ("All names including the default should be pushed into data source"));
+  TEST_EQUAL(namesDataSource.mandatoryNamesCount, 1, ("Mandatory names count should always be 1"));
+  TEST_EQUAL(namesDataSource.names[0].m_code, GetLangCode("default"), ("Default is always first in the list"));
 
   {
     vector<int8_t> nativeMwmLanguages = {GetLangCode("de"), GetLangCode("fr")};
 
-    auto const namesDataSource = EditableMapObject::GetNamesDataSource(
-        emo.GetNameMultilang(), nativeMwmLanguages, GetLangCode("fr"));
-    TEST_EQUAL(namesDataSource.names.size(), 9,("All names including the default should be pushed into data source"));
-    TEST_EQUAL(namesDataSource.mandatoryNamesCount, 1,("Mandatory names count should always be 1"));
+    auto const namesDataSource =
+        EditableMapObject::GetNamesDataSource(emo.GetNameMultilang(), nativeMwmLanguages, GetLangCode("fr"));
+    TEST_EQUAL(namesDataSource.names.size(), 9, ("All names including the default should be pushed into data source"));
+    TEST_EQUAL(namesDataSource.mandatoryNamesCount, 1, ("Mandatory names count should always be 1"));
   }
   {
     vector<int8_t> nativeMwmLanguages = {GetLangCode("fr"), GetLangCode("en")};
 
-    auto const namesDataSource = EditableMapObject::GetNamesDataSource(
-        emo.GetNameMultilang(), nativeMwmLanguages, GetLangCode("fr"));
-    TEST_EQUAL(namesDataSource.names.size(), 9,("All names including the default should be pushed into data source"));
-    TEST_EQUAL(namesDataSource.mandatoryNamesCount, 1,("Mandatory names count should always be 1"));
+    auto const namesDataSource =
+        EditableMapObject::GetNamesDataSource(emo.GetNameMultilang(), nativeMwmLanguages, GetLangCode("fr"));
+    TEST_EQUAL(namesDataSource.names.size(), 9, ("All names including the default should be pushed into data source"));
+    TEST_EQUAL(namesDataSource.mandatoryNamesCount, 1, ("Mandatory names count should always be 1"));
   }
   {
     vector<int8_t> nativeMwmLanguages = {GetLangCode("en"), GetLangCode("en")};
 
-    auto const namesDataSource = EditableMapObject::GetNamesDataSource(
-        emo.GetNameMultilang(), nativeMwmLanguages, GetLangCode("en"));
-    TEST_EQUAL(namesDataSource.names.size(), 9,
-               ("All names including the default should be pushed into data source"));
-    TEST_EQUAL(namesDataSource.mandatoryNamesCount, 1,
-               ("Mandatory names count should always be 1"));
+    auto const namesDataSource =
+        EditableMapObject::GetNamesDataSource(emo.GetNameMultilang(), nativeMwmLanguages, GetLangCode("en"));
+    TEST_EQUAL(namesDataSource.names.size(), 9, ("All names including the default should be pushed into data source"));
+    TEST_EQUAL(namesDataSource.mandatoryNamesCount, 1, ("Mandatory names count should always be 1"));
   }
 }
 
@@ -317,7 +326,7 @@ void SetTypes(EditableMapObject & emo, std::initializer_list<base::StringIL> typ
     holder.Add(cl.GetTypeByPath(t));
   emo.SetTypes(holder);
 }
-} // namespace
+}  // namespace
 
 UNIT_TEST(EditableMapObject_SetInternet)
 {
@@ -542,4 +551,4 @@ UNIT_TEST(EditableMapObject_GetLocalizedAllTypes)
   }
 }
 
-} // namespace editable_map_object_test
+}  // namespace editable_map_object_test
diff --git a/libs/indexer/indexer_tests/feature_metadata_test.cpp b/libs/indexer/indexer_tests/feature_metadata_test.cpp
index f964248f7..6cbbd9218 100644
--- a/libs/indexer/indexer_tests/feature_metadata_test.cpp
+++ b/libs/indexer/indexer_tests/feature_metadata_test.cpp
@@ -15,16 +15,14 @@ using namespace std;
 using feature::Metadata;
 using EType = Metadata::EType;
 
-map<EType, string> const kKeyValues =
-{
-  {EType::FMD_ELE, "12345"},
-  {EType::FMD_EMAIL, "cool@email.at"},
-  // This string is longer than 255 bytes.
-  {EType::FMD_WEBSITE, "http://rskxmkjwnikfnjqhyvkpjgaghhyhukjyenduiuanxgbmndtlpfphdgaizfcpzuiuspcp"
-                       "umeojwvekvjprlutwjmxudyzrlwwsepewevsuqelobqcfdzsoqozkesghojribepbaitivmaqep"
-                       "hheckitonddqhbapdybhetvnwvlchjafepdjaeoaapysdvculxuwjbgdddryodiihvnpvmkgqvs"
-                       "mawbdsrbmnndcozmrgeoahbkhcevxkmtdqnxpxlsju.org"}
-};
+map<EType, string> const kKeyValues = {{EType::FMD_ELE, "12345"},
+                                       {EType::FMD_EMAIL, "cool@email.at"},
+                                       // This string is longer than 255 bytes.
+                                       {EType::FMD_WEBSITE,
+                                        "http://rskxmkjwnikfnjqhyvkpjgaghhyhukjyenduiuanxgbmndtlpfphdgaizfcpzuiuspcp"
+                                        "umeojwvekvjprlutwjmxudyzrlwwsepewevsuqelobqcfdzsoqozkesghojribepbaitivmaqep"
+                                        "hheckitonddqhbapdybhetvnwvlchjafepdjaeoaapysdvculxuwjbgdddryodiihvnpvmkgqvs"
+                                        "mawbdsrbmnndcozmrgeoahbkhcevxkmtdqnxpxlsju.org"}};
 
 UNIT_TEST(Feature_Metadata_GetSet)
 {
@@ -56,9 +54,7 @@ UNIT_TEST(Feature_Metadata_PresentTypes)
   TEST_EQUAL(m.Size(), kKeyValues.size(), ());
 
   m.ForEach([&](Metadata::EType type, std::string const &)
-  {
-    TEST_EQUAL(m.Get(type), kKeyValues.find(type)->second, ());
-  });
+  { TEST_EQUAL(m.Get(type), kKeyValues.find(type)->second, ()); });
 }
 
 UNIT_TEST(Feature_Metadata_MwmTmpSerialization)
@@ -132,4 +128,4 @@ UNIT_TEST(Feature_Metadata_Print)
 
   TEST_EQUAL(DebugPrint(m), "Metadata [description=" + DebugPrint(s) + "]", ());
 }
-} // namespace feature_metadata_test
+}  // namespace feature_metadata_test
diff --git a/libs/indexer/indexer_tests/feature_names_test.cpp b/libs/indexer/indexer_tests/feature_names_test.cpp
index afb086548..b04f263bb 100644
--- a/libs/indexer/indexer_tests/feature_names_test.cpp
+++ b/libs/indexer/indexer_tests/feature_names_test.cpp
@@ -287,8 +287,8 @@ UNIT_TEST(GetPrefferedNamesLocal)
   }
 }
 
-void GetReadableName(feature::RegionData const & regionData, StrUtf8 const & src, int8_t deviceLang,
-                     bool allowTranslit, std::string & name)
+void GetReadableName(feature::RegionData const & regionData, StrUtf8 const & src, int8_t deviceLang, bool allowTranslit,
+                     std::string & name)
 {
   feature::NameParamsIn in{src, regionData, deviceLang, allowTranslit};
   feature::NameParamsOut out;
@@ -560,4 +560,4 @@ UNIT_TEST(GetNameForSearchOnBooking)
   }
 }
 */
-} // namespace feature_names_test
+}  // namespace feature_names_test
diff --git a/libs/indexer/indexer_tests/feature_to_osm_tests.cpp b/libs/indexer/indexer_tests/feature_to_osm_tests.cpp
index c86f1f477..708b09213 100644
--- a/libs/indexer/indexer_tests/feature_to_osm_tests.cpp
+++ b/libs/indexer/indexer_tests/feature_to_osm_tests.cpp
@@ -32,12 +32,11 @@ template <typename Cont>
 Entries GetEntries(Cont const & cont)
 {
   Entries res;
-  cont.ForEachEntry([&res](uint32_t const fid, base::GeoObjectId const & gid) {
-    res.emplace_back(std::make_pair(fid, gid));
-  });
+  cont.ForEachEntry([&res](uint32_t const fid, base::GeoObjectId const & gid)
+  { res.emplace_back(std::make_pair(fid, gid)); });
   std::sort(res.begin(), res.end());
   return res;
-};
+}
 
 class FeatureIdToGeoObjectIdTest : public TestWithCustomMwms
 {
diff --git a/libs/indexer/indexer_tests/feature_types_test.cpp b/libs/indexer/indexer_tests/feature_types_test.cpp
index b96951079..f3e128bf5 100644
--- a/libs/indexer/indexer_tests/feature_types_test.cpp
+++ b/libs/indexer/indexer_tests/feature_types_test.cpp
@@ -7,8 +7,7 @@
 namespace feature_types_test
 {
 
-feature::TypesHolder MakeTypesHolder(std::initializer_list<base::StringIL> const & arr,
-                                     bool sortBySpec = true,
+feature::TypesHolder MakeTypesHolder(std::initializer_list<base::StringIL> const & arr, bool sortBySpec = true,
                                      feature::GeomType geomType = feature::GeomType::Point)
 {
   auto const & cl = classif();
@@ -31,19 +30,23 @@ UNIT_TEST(Feature_UselessTypes)
   auto const & cl = classif();
 
   {
-    feature::TypesHolder types = MakeTypesHolder({
-      {"wheelchair", "yes"},
-      {"building", "train_station"},
-    }, false /* sortBySpec */);
+    feature::TypesHolder types = MakeTypesHolder(
+        {
+            {"wheelchair", "yes"},
+            {"building", "train_station"},
+        },
+        false /* sortBySpec */);
 
     TEST_EQUAL(types.front(), cl.GetTypeByPath({"building", "train_station"}), ());
   }
 
   {
-    feature::TypesHolder types = MakeTypesHolder({
-      {"hwtag", "lit"},
-      {"hwtag", "oneway"},
-    }, false /* sortBySpec */);
+    feature::TypesHolder types = MakeTypesHolder(
+        {
+            {"hwtag", "lit"},
+            {"hwtag", "oneway"},
+        },
+        false /* sortBySpec */);
 
     TEST_EQUAL(types.front(), cl.GetTypeByPath({"hwtag", "oneway"}), ());
   }
@@ -57,28 +60,28 @@ UNIT_TEST(Feature_TypesPriority)
 
   {
     feature::TypesHolder types = MakeTypesHolder({
-      {"wheelchair", "yes"},
-      {"building", "train_station"},
+        {"wheelchair", "yes"},
+        {"building", "train_station"},
     });
 
     TEST_EQUAL(types.front(), cl.GetTypeByPath({"building", "train_station"}), ());
   }
 
   /// @todo post_office should be bigger than copyshop.
-//  {
-//    feature::TypesHolder types = MakeTypesHolder({
-//      {"shop", "copyshop"},
-//      {"amenity", "post_office"},
-//    });
+  //  {
+  //    feature::TypesHolder types = MakeTypesHolder({
+  //      {"shop", "copyshop"},
+  //      {"amenity", "post_office"},
+  //    });
 
-//    TEST_EQUAL(types.front(), cl.GetTypeByPath({"amenity", "post_office"}), ());
-//  }
+  //    TEST_EQUAL(types.front(), cl.GetTypeByPath({"amenity", "post_office"}), ());
+  //  }
 
   {
     feature::TypesHolder types = MakeTypesHolder({
-      {"internet_access", "wlan"},
-      {"amenity", "compressed_air"},
-      {"amenity", "fuel"},
+        {"internet_access", "wlan"},
+        {"amenity", "compressed_air"},
+        {"amenity", "fuel"},
     });
 
     TEST_EQUAL(types.front(), cl.GetTypeByPath({"amenity", "fuel"}), ());
@@ -86,8 +89,8 @@ UNIT_TEST(Feature_TypesPriority)
 
   {
     feature::TypesHolder types = MakeTypesHolder({
-      {"leisure", "pitch"},
-      {"sport", "soccer"},
+        {"leisure", "pitch"},
+        {"sport", "soccer"},
     });
 
     TEST_EQUAL(types.front(), cl.GetTypeByPath({"sport", "soccer"}), ());
@@ -95,8 +98,8 @@ UNIT_TEST(Feature_TypesPriority)
 
   {
     feature::TypesHolder types = MakeTypesHolder({
-      {"amenity", "shelter"},
-      {"highway", "bus_stop"},
+        {"amenity", "shelter"},
+        {"highway", "bus_stop"},
     });
 
     TEST_EQUAL(types.front(), cl.GetTypeByPath({"highway", "bus_stop"}), ());
@@ -104,8 +107,8 @@ UNIT_TEST(Feature_TypesPriority)
 
   {
     feature::TypesHolder types = MakeTypesHolder({
-      {"amenity", "toilets"},
-      {"amenity", "community_centre"},
+        {"amenity", "toilets"},
+        {"amenity", "community_centre"},
     });
 
     TEST_EQUAL(types.front(), cl.GetTypeByPath({"amenity", "community_centre"}), ());
@@ -113,23 +116,25 @@ UNIT_TEST(Feature_TypesPriority)
 
   {
     feature::TypesHolder types = MakeTypesHolder({
-      {"highway", "elevator"},
-      {"emergency", "defibrillator"},
-      {"railway", "subway_entrance"},
+        {"highway", "elevator"},
+        {"emergency", "defibrillator"},
+        {"railway", "subway_entrance"},
     });
 
     TEST_EQUAL(types.front(), cl.GetTypeByPath({"railway", "subway_entrance"}), ());
   }
 
   {
-    feature::TypesHolder types = MakeTypesHolder({
-      {"hwtag", "lit"},
-      {"hwtag", "oneway"},
-      {"highway", "cycleway"},
-    }, true /* sortBySpec */, feature::GeomType::Line);
+    feature::TypesHolder types = MakeTypesHolder(
+        {
+            {"hwtag", "lit"},
+            {"hwtag", "oneway"},
+            {"highway", "cycleway"},
+        },
+        true /* sortBySpec */, feature::GeomType::Line);
 
     TEST_EQUAL(types.front(), cl.GetTypeByPath({"highway", "cycleway"}), ());
   }
 }
 
-} // namespace feature_types_test
+}  // namespace feature_types_test
diff --git a/libs/indexer/indexer_tests/features_offsets_table_test.cpp b/libs/indexer/indexer_tests/features_offsets_table_test.cpp
index d819993df..2752cf1ec 100644
--- a/libs/indexer/indexer_tests/features_offsets_table_test.cpp
+++ b/libs/indexer/indexer_tests/features_offsets_table_test.cpp
@@ -1,7 +1,7 @@
 #include "testing/testing.hpp"
 
-#include "indexer/features_offsets_table.hpp"
 #include "indexer/data_header.hpp"
+#include "indexer/features_offsets_table.hpp"
 #include "indexer/features_vector.hpp"
 
 #include "platform/local_country_file_utils.hpp"
@@ -22,73 +22,73 @@ using namespace std;
 
 namespace feature
 {
-  UNIT_TEST(FeaturesOffsetsTable_Empty)
-  {
-    FeaturesOffsetsTable::Builder builder;
-    unique_ptr<FeaturesOffsetsTable> table(FeaturesOffsetsTable::Build(builder));
-    TEST(table.get(), ());
-    TEST_EQUAL(static_cast<uint64_t>(0), table->size(), ());
-  }
+UNIT_TEST(FeaturesOffsetsTable_Empty)
+{
+  FeaturesOffsetsTable::Builder builder;
+  unique_ptr<FeaturesOffsetsTable> table(FeaturesOffsetsTable::Build(builder));
+  TEST(table.get(), ());
+  TEST_EQUAL(static_cast<uint64_t>(0), table->size(), ());
+}
 
-  UNIT_TEST(FeaturesOffsetsTable_Basic)
-  {
-    FeaturesOffsetsTable::Builder builder;
-    builder.PushOffset(1);
-    builder.PushOffset(4);
-    builder.PushOffset(17);
-    builder.PushOffset(128);
-    builder.PushOffset(129);
-    builder.PushOffset(510);
-    builder.PushOffset(513);
-    builder.PushOffset(1024);
+UNIT_TEST(FeaturesOffsetsTable_Basic)
+{
+  FeaturesOffsetsTable::Builder builder;
+  builder.PushOffset(1);
+  builder.PushOffset(4);
+  builder.PushOffset(17);
+  builder.PushOffset(128);
+  builder.PushOffset(129);
+  builder.PushOffset(510);
+  builder.PushOffset(513);
+  builder.PushOffset(1024);
 
-    unique_ptr<FeaturesOffsetsTable> table(FeaturesOffsetsTable::Build(builder));
-    TEST(table.get(), ());
-    TEST_EQUAL(static_cast<uint64_t>(8), table->size(), ());
+  unique_ptr<FeaturesOffsetsTable> table(FeaturesOffsetsTable::Build(builder));
+  TEST(table.get(), ());
+  TEST_EQUAL(static_cast<uint64_t>(8), table->size(), ());
 
-    TEST_EQUAL(static_cast<uint64_t>(1), table->GetFeatureOffset(0), ());
-    TEST_EQUAL(static_cast<uint64_t>(4), table->GetFeatureOffset(1), ());
-    TEST_EQUAL(static_cast<uint64_t>(17), table->GetFeatureOffset(2), ());
-    TEST_EQUAL(static_cast<uint64_t>(128), table->GetFeatureOffset(3), ());
-    TEST_EQUAL(static_cast<uint64_t>(129), table->GetFeatureOffset(4), ());
-    TEST_EQUAL(static_cast<uint64_t>(510), table->GetFeatureOffset(5), ());
-    TEST_EQUAL(static_cast<uint64_t>(513), table->GetFeatureOffset(6), ());
-    TEST_EQUAL(static_cast<uint64_t>(1024), table->GetFeatureOffset(7), ());
+  TEST_EQUAL(static_cast<uint64_t>(1), table->GetFeatureOffset(0), ());
+  TEST_EQUAL(static_cast<uint64_t>(4), table->GetFeatureOffset(1), ());
+  TEST_EQUAL(static_cast<uint64_t>(17), table->GetFeatureOffset(2), ());
+  TEST_EQUAL(static_cast<uint64_t>(128), table->GetFeatureOffset(3), ());
+  TEST_EQUAL(static_cast<uint64_t>(129), table->GetFeatureOffset(4), ());
+  TEST_EQUAL(static_cast<uint64_t>(510), table->GetFeatureOffset(5), ());
+  TEST_EQUAL(static_cast<uint64_t>(513), table->GetFeatureOffset(6), ());
+  TEST_EQUAL(static_cast<uint64_t>(1024), table->GetFeatureOffset(7), ());
 
-    TEST_EQUAL(static_cast<size_t>(0), table->GetFeatureIndexbyOffset(1), ());
-    TEST_EQUAL(static_cast<size_t>(1), table->GetFeatureIndexbyOffset(4), ());
-    TEST_EQUAL(static_cast<size_t>(2), table->GetFeatureIndexbyOffset(17), ());
-    TEST_EQUAL(static_cast<size_t>(3), table->GetFeatureIndexbyOffset(128), ());
-    TEST_EQUAL(static_cast<size_t>(4), table->GetFeatureIndexbyOffset(129), ());
-    TEST_EQUAL(static_cast<size_t>(5), table->GetFeatureIndexbyOffset(510), ());
-    TEST_EQUAL(static_cast<size_t>(6), table->GetFeatureIndexbyOffset(513), ());
-    TEST_EQUAL(static_cast<size_t>(7), table->GetFeatureIndexbyOffset(1024), ());
-  }
+  TEST_EQUAL(static_cast<size_t>(0), table->GetFeatureIndexbyOffset(1), ());
+  TEST_EQUAL(static_cast<size_t>(1), table->GetFeatureIndexbyOffset(4), ());
+  TEST_EQUAL(static_cast<size_t>(2), table->GetFeatureIndexbyOffset(17), ());
+  TEST_EQUAL(static_cast<size_t>(3), table->GetFeatureIndexbyOffset(128), ());
+  TEST_EQUAL(static_cast<size_t>(4), table->GetFeatureIndexbyOffset(129), ());
+  TEST_EQUAL(static_cast<size_t>(5), table->GetFeatureIndexbyOffset(510), ());
+  TEST_EQUAL(static_cast<size_t>(6), table->GetFeatureIndexbyOffset(513), ());
+  TEST_EQUAL(static_cast<size_t>(7), table->GetFeatureIndexbyOffset(1024), ());
+}
 
-  UNIT_TEST(FeaturesOffsetsTable_ReadWrite)
-  {
-    string const testFileName = "test_file";
-    Platform & pl = GetPlatform();
+UNIT_TEST(FeaturesOffsetsTable_ReadWrite)
+{
+  string const testFileName = "test_file";
+  Platform & pl = GetPlatform();
 
-    FilesContainerR baseContainer(pl.GetReader("minsk-pass" DATA_FILE_EXTENSION));
-    size_t constexpr minFeaturesCount = 5000;
+  FilesContainerR baseContainer(pl.GetReader("minsk-pass" DATA_FILE_EXTENSION));
+  size_t constexpr minFeaturesCount = 5000;
 
-    LocalCountryFile localFile = LocalCountryFile::MakeForTesting(testFileName);
-    CountryIndexes::PreparePlaceOnDisk(localFile);
+  LocalCountryFile localFile = LocalCountryFile::MakeForTesting(testFileName);
+  CountryIndexes::PreparePlaceOnDisk(localFile);
 
-    string const indexFile = CountryIndexes::GetPath(localFile, CountryIndexes::Index::Offsets);
-    SCOPE_GUARD(deleteTestFileIndexGuard, bind(&FileWriter::DeleteFileX, cref(indexFile)));
+  string const indexFile = CountryIndexes::GetPath(localFile, CountryIndexes::Index::Offsets);
+  SCOPE_GUARD(deleteTestFileIndexGuard, bind(&FileWriter::DeleteFileX, cref(indexFile)));
 
-    FeaturesOffsetsTable::Build(baseContainer, indexFile);
+  FeaturesOffsetsTable::Build(baseContainer, indexFile);
 
-    unique_ptr<FeaturesOffsetsTable> table(FeaturesOffsetsTable::Load(baseContainer));
-    TEST(table.get() && table->size() > minFeaturesCount, ());
+  unique_ptr<FeaturesOffsetsTable> table(FeaturesOffsetsTable::Load(baseContainer));
+  TEST(table.get() && table->size() > minFeaturesCount, ());
 
-    unique_ptr<FeaturesOffsetsTable> loadedTable(FeaturesOffsetsTable::Load(indexFile));
-    TEST(loadedTable.get() && loadedTable->size() > minFeaturesCount, ());
+  unique_ptr<FeaturesOffsetsTable> loadedTable(FeaturesOffsetsTable::Load(indexFile));
+  TEST(loadedTable.get() && loadedTable->size() > minFeaturesCount, ());
 
-    TEST_EQUAL(table->size(), loadedTable->size(), ());
-    for (uint64_t i = 0; i < table->size(); ++i)
-      TEST_EQUAL(table->GetFeatureOffset(i), loadedTable->GetFeatureOffset(i), ());
-  }
+  TEST_EQUAL(table->size(), loadedTable->size(), ());
+  for (uint64_t i = 0; i < table->size(); ++i)
+    TEST_EQUAL(table->GetFeatureOffset(i), loadedTable->GetFeatureOffset(i), ());
+}
 }  // namespace feature
diff --git a/libs/indexer/indexer_tests/features_vector_test.cpp b/libs/indexer/indexer_tests/features_vector_test.cpp
index d945cf366..e5a6c02f9 100644
--- a/libs/indexer/indexer_tests/features_vector_test.cpp
+++ b/libs/indexer/indexer_tests/features_vector_test.cpp
@@ -24,27 +24,10 @@ using namespace std;
 //
 // Note, (220006, 145) (220007, 271) are broken and not included in minsk-pass.mwm,
 // corresponding postcode frequencies are decremented.
-vector<pair<int, int>> kCodeFreq = {
-  {220000, 2},
-  {220001, 3},
-  {220004, 10},
-  {220006, 144},
-  {220007, 270},
-  {220010, 4},
-  {220011, 1},
-  {220014, 3},
-  {220030, 247},
-  {220033, 7},
-  {220036, 204},
-  {220039, 15},
-  {220048, 1},
-  {220050, 4},
-  {220069, 5},
-  {220073, 1},
-  {220089, 1},
-  {220121, 1},
-  {721816, 1}
-};
+vector<pair<int, int>> kCodeFreq = {{220000, 2},   {220001, 3},  {220004, 10}, {220006, 144}, {220007, 270},
+                                    {220010, 4},   {220011, 1},  {220014, 3},  {220030, 247}, {220033, 7},
+                                    {220036, 204}, {220039, 15}, {220048, 1},  {220050, 4},   {220069, 5},
+                                    {220073, 1},   {220089, 1},  {220121, 1},  {721816, 1}};
 
 UNIT_TEST(FeaturesVectorTest_ParseMetadata)
 {
@@ -76,4 +59,4 @@ UNIT_TEST(FeaturesVectorTest_ParseMetadata)
   });
   TEST_EQUAL(expected, actual, ());
 }
-} // namespace features_vector_test
+}  // namespace features_vector_test
diff --git a/libs/indexer/indexer_tests/index_builder_test.cpp b/libs/indexer/indexer_tests/index_builder_test.cpp
index 1200566b7..f8b0664ad 100644
--- a/libs/indexer/indexer_tests/index_builder_test.cpp
+++ b/libs/indexer/indexer_tests/index_builder_test.cpp
@@ -47,10 +47,8 @@ UNIT_TEST(BuildIndexTest)
     vector<string> tags;
     originalContainer.ForEachTag(base::MakeBackInsertFunctor(tags));
     for (size_t i = 0; i < tags.size(); ++i)
-    {
       if (tags[i] != INDEX_FILE_TAG)
         containerWriter.Write(originalContainer.GetReader(tags[i]), tags[i]);
-    }
     containerWriter.Write(serialIndex, INDEX_FILE_TAG);
   }
 
diff --git a/libs/indexer/indexer_tests/interval_index_test.cpp b/libs/indexer/indexer_tests/interval_index_test.cpp
index 2e898346c..38c8b3f99 100644
--- a/libs/indexer/indexer_tests/interval_index_test.cpp
+++ b/libs/indexer/indexer_tests/interval_index_test.cpp
@@ -31,11 +31,11 @@ struct CellIdFeaturePairForTest
 
 auto IndexValueInserter(vector<uint32_t> & values)
 {
-  return [inserter = base::MakeBackInsertFunctor(values)] (uint64_t, auto value) { inserter(value); };
-};
-
+  return [inserter = base::MakeBackInsertFunctor(values)](uint64_t, auto value) { inserter(value); };
 }
 
+}  // namespace
+
 UNIT_TEST(IntervalIndex_LevelCount)
 {
   TEST_EQUAL(IntervalIndexBuilder(10, 1, 3).GetLevelCount(), 1, ());
@@ -48,30 +48,31 @@ UNIT_TEST(IntervalIndex_LevelCount)
 
 UNIT_TEST(IntervalIndex_SerializedNodeBitmap)
 {
-  uint32_t const offset = 350; // == 0x15E
-  uint32_t childSizes[8] = { 0, 0, 0, 10, 0, 0, 1000, 0 };
-  char const expSerial [] =
+  uint32_t const offset = 350;  // == 0x15E
+  uint32_t childSizes[8] = {0, 0, 0, 10, 0, 0, 1000, 0};
+  char const expSerial[] =
       "\xBD\x05"  // (350 << 1) + 1 == 701 == 0x2BD - offset encoded as varuint.
       "\x48"      // (1 << 3) | (1 << 6) == 72 == 0x48 - bitmap.
       "\x0A"      // 10 - childSizes[3] encoded as varuint.
       "\xE8\x07"  // 1000 = 0x3E8 - childSizes[6] encoded as varuint.
       "";
   vector<uint8_t> serializedNode;
-  MemWriter<vector<uint8_t> > writer(serializedNode);
+  MemWriter<vector<uint8_t>> writer(serializedNode);
   IntervalIndexBuilder(11, 1, 3).WriteNode(writer, offset, childSizes);
   TEST_EQUAL(serializedNode, vector<uint8_t>(expSerial, expSerial + ARRAY_SIZE(expSerial) - 1), ());
 }
 
 UNIT_TEST(IntervalIndex_SerializedNodeList)
 {
-  uint32_t const offset = 350; // == 0x15E
-  uint32_t childSizes[16] = { 0, 0, 0, 0, 0, 0, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-  char const expSerial [] =
-      "\xBC\x05"         // (350 << 1) + 0 == 700 == 0x2BC - offset encoded as varuint.
-      "\x06" "\xE8\x07"  // 6, 1000
+  uint32_t const offset = 350;  // == 0x15E
+  uint32_t childSizes[16] = {0, 0, 0, 0, 0, 0, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+  char const expSerial[] =
+      "\xBC\x05"  // (350 << 1) + 0 == 700 == 0x2BC - offset encoded as varuint.
+      "\x06"
+      "\xE8\x07"  // 6, 1000
       "";
   vector<uint8_t> serializedNode;
-  MemWriter<vector<uint8_t> > writer(serializedNode);
+  MemWriter<vector<uint8_t>> writer(serializedNode);
   IntervalIndexBuilder(11, 1, 4).WriteNode(writer, offset, childSizes);
   TEST_EQUAL(serializedNode, vector<uint8_t>(expSerial, expSerial + ARRAY_SIZE(expSerial) - 1), ());
 }
@@ -83,11 +84,14 @@ UNIT_TEST(IntervalIndex_SerializedLeaves)
   data.push_back(CellIdFeaturePairForTest(0x1538U, 1));
   data.push_back(CellIdFeaturePairForTest(0x1637U, 2));
   vector<uint8_t> serialLeaves;
-  MemWriter<vector<uint8_t> > writer(serialLeaves);
+  MemWriter<vector<uint8_t>> writer(serialLeaves);
   vector<uint32_t> sizes;
   IntervalIndexBuilder(16, 1, 4).BuildLeaves(writer, data.begin(), data.end(), sizes);
-  char const expSerial [] = "\x37\x00" "\x38\x02" "\x37\x04"; // 0x1537 0x1538 0x1637
-  uint32_t const expSizes [] = { 4, 2 };
+  char const expSerial[] =
+      "\x37\x00"
+      "\x38\x02"
+      "\x37\x04";  // 0x1537 0x1538 0x1637
+  uint32_t const expSizes[] = {4, 2};
   TEST_EQUAL(serialLeaves, vector<uint8_t>(expSerial, expSerial + ARRAY_SIZE(expSerial) - 1), ());
   TEST_EQUAL(sizes, vector<uint32_t>(expSizes, expSizes + ARRAY_SIZE(expSizes)), ());
 }
@@ -98,15 +102,14 @@ UNIT_TEST(IntervalIndex_SerializedNodes)
   data.push_back(CellIdFeaturePairForTest(0x1537U, 0));
   data.push_back(CellIdFeaturePairForTest(0x1538U, 1));
   data.push_back(CellIdFeaturePairForTest(0x1637U, 2));
-  uint32_t const leavesSizes [] = { 4, 2 };
+  uint32_t const leavesSizes[] = {4, 2};
   vector<uint8_t> serialNodes;
-  MemWriter<vector<uint8_t> > writer(serialNodes);
+  MemWriter<vector<uint8_t>> writer(serialNodes);
   vector<uint32_t> sizes;
-  IntervalIndexBuilder(16, 1, 4).BuildLevel(writer, data.begin(), data.end(), 1,
-                                            leavesSizes, leavesSizes + ARRAY_SIZE(leavesSizes),
-                                            sizes);
-  char const expSerial [] = "\x01\x60\x00\x04\x02";
-  uint32_t const expSizes [] = { ARRAY_SIZE(expSerial) - 1 };
+  IntervalIndexBuilder(16, 1, 4).BuildLevel(writer, data.begin(), data.end(), 1, leavesSizes,
+                                            leavesSizes + ARRAY_SIZE(leavesSizes), sizes);
+  char const expSerial[] = "\x01\x60\x00\x04\x02";
+  uint32_t const expSizes[] = {ARRAY_SIZE(expSerial) - 1};
   TEST_EQUAL(serialNodes, vector<uint8_t>(expSerial, expSerial + ARRAY_SIZE(expSerial) - 1), ());
   TEST_EQUAL(sizes, vector<uint32_t>(expSizes, expSizes + ARRAY_SIZE(expSizes)), ());
 }
@@ -118,25 +121,27 @@ UNIT_TEST(IntervalIndex_Serialized)
   data.push_back(CellIdFeaturePairForTest(0x1538U, 1));
   data.push_back(CellIdFeaturePairForTest(0x1637U, 2));
   vector<uint8_t> serialIndex;
-  MemWriter<vector<uint8_t> > writer(serialIndex);
+  MemWriter<vector<uint8_t>> writer(serialIndex);
   IntervalIndexBuilder(16, 1, 4).BuildIndex(writer, data.begin(), data.end());
 
-  char const expSerial [] =
-      "\x01\x02\x04\x01"               // Header
-      "\x14\x00\x00\x00"               // Leaves level offset
-      "\x1A\x00\x00\x00"               // Level 1 offset
-      "\x1F\x00\x00\x00"               // Root level offset
-      "\x22\x00\x00\x00"               // Root level offset
-      "\x37\x00" "\x38\x02" "\x37\x04" // 0x1537 0x1538 0x1637
-      "\x01\x60\x00\x04\x02"           // 0x15, 0x16 node
-      "\x00\x01\x05"                   // Root
+  char const expSerial[] =
+      "\x01\x02\x04\x01"  // Header
+      "\x14\x00\x00\x00"  // Leaves level offset
+      "\x1A\x00\x00\x00"  // Level 1 offset
+      "\x1F\x00\x00\x00"  // Root level offset
+      "\x22\x00\x00\x00"  // Root level offset
+      "\x37\x00"
+      "\x38\x02"
+      "\x37\x04"              // 0x1537 0x1538 0x1637
+      "\x01\x60\x00\x04\x02"  // 0x15, 0x16 node
+      "\x00\x01\x05"          // Root
       "";
 
   TEST_EQUAL(serialIndex, vector<uint8_t>(expSerial, expSerial + ARRAY_SIZE(expSerial) - 1), ());
 
   MemReader reader(&serialIndex[0], serialIndex.size());
   IntervalIndex<MemReader, uint32_t> index(reader);
-  uint32_t expected [] = {0, 1, 2};
+  uint32_t expected[] = {0, 1, 2};
   vector<uint32_t> values;
   TEST_EQUAL(index.KeyEnd(), 0x10000, ());
   index.ForEach(IndexValueInserter(values), 0, 0x10000);
@@ -150,37 +155,37 @@ UNIT_TEST(IntervalIndex_Simple)
   data.push_back(CellIdFeaturePairForTest(0xA0B1C2D200ULL, 1));
   data.push_back(CellIdFeaturePairForTest(0xA0B2C2D100ULL, 2));
   vector<char> serialIndex;
-  MemWriter<vector<char> > writer(serialIndex);
+  MemWriter<vector<char>> writer(serialIndex);
   BuildIntervalIndex(data.begin(), data.end(), writer, 40);
   MemReader reader(&serialIndex[0], serialIndex.size());
   IntervalIndex<MemReader, uint32_t> index(reader);
   TEST_EQUAL(index.KeyEnd(), 0x10000000000ULL, ());
   {
-    uint32_t expected [] = {0, 1, 2};
+    uint32_t expected[] = {0, 1, 2};
     vector<uint32_t> values;
     index.ForEach(IndexValueInserter(values), 0ULL, index.KeyEnd());
     TEST_EQUAL(values, vector<uint32_t>(expected, expected + ARRAY_SIZE(expected)), ());
   }
   {
-    uint32_t expected [] = {0, 1};
+    uint32_t expected[] = {0, 1};
     vector<uint32_t> values;
     index.ForEach(IndexValueInserter(values), 0xA0B1C2D100ULL, 0xA0B1C2D201ULL);
     TEST_EQUAL(values, vector<uint32_t>(expected, expected + ARRAY_SIZE(expected)), ());
   }
   {
-    uint32_t expected [] = {0, 1};
+    uint32_t expected[] = {0, 1};
     vector<uint32_t> values;
     index.ForEach(IndexValueInserter(values), 0x0ULL, 0xA0B1C30000ULL);
     TEST_EQUAL(values, vector<uint32_t>(expected, expected + ARRAY_SIZE(expected)), ());
   }
   {
-    uint32_t expected [] = {0};
+    uint32_t expected[] = {0};
     vector<uint32_t> values;
     index.ForEach(IndexValueInserter(values), 0xA0B1C2D100ULL, 0xA0B1C2D101ULL);
     TEST_EQUAL(values, vector<uint32_t>(expected, expected + ARRAY_SIZE(expected)), ());
   }
   {
-    uint32_t expected [] = {0};
+    uint32_t expected[] = {0};
     vector<uint32_t> values;
     index.ForEach(IndexValueInserter(values), 0xA0B1C2D100ULL, 0xA0B1C2D200ULL);
     TEST_EQUAL(values, vector<uint32_t>(expected, expected + ARRAY_SIZE(expected)), ());
@@ -201,7 +206,7 @@ UNIT_TEST(IntervalIndex_Empty)
 {
   vector<CellIdFeaturePairForTest> data;
   vector<char> serialIndex;
-  MemWriter<vector<char> > writer(serialIndex);
+  MemWriter<vector<char>> writer(serialIndex);
   BuildIntervalIndex(data.begin(), data.end(), writer, 40);
   MemReader reader(&serialIndex[0], serialIndex.size());
   IntervalIndex<MemReader, uint32_t> index(reader);
@@ -220,12 +225,12 @@ UNIT_TEST(IntervalIndex_Simple2)
   data.push_back(CellIdFeaturePairForTest(0xA0B1C2D200ULL, 3));
   data.push_back(CellIdFeaturePairForTest(0xA0B2C2D200ULL, 2));
   vector<char> serialIndex;
-  MemWriter<vector<char> > writer(serialIndex);
+  MemWriter<vector<char>> writer(serialIndex);
   BuildIntervalIndex(data.begin(), data.end(), writer, 40);
   MemReader reader(&serialIndex[0], serialIndex.size());
   IntervalIndex<MemReader, uint32_t> index(reader);
   {
-    uint32_t expected [] = {0, 1, 2, 3};
+    uint32_t expected[] = {0, 1, 2, 3};
     vector<uint32_t> values;
     index.ForEach(IndexValueInserter(values), 0, 0xFFFFFFFFFFULL);
     sort(values.begin(), values.end());
@@ -239,12 +244,12 @@ UNIT_TEST(IntervalIndex_Simple3)
   data.push_back(CellIdFeaturePairForTest(0x0100ULL, 0));
   data.push_back(CellIdFeaturePairForTest(0x0200ULL, 1));
   vector<char> serialIndex;
-  MemWriter<vector<char> > writer(serialIndex);
+  MemWriter<vector<char>> writer(serialIndex);
   BuildIntervalIndex(data.begin(), data.end(), writer, 40);
   MemReader reader(&serialIndex[0], serialIndex.size());
   IntervalIndex<MemReader, uint32_t> index(reader);
   {
-    uint32_t expected [] = {0, 1};
+    uint32_t expected[] = {0, 1};
     vector<uint32_t> values;
     index.ForEach(IndexValueInserter(values), 0, 0xFFFFULL);
     sort(values.begin(), values.end());
@@ -258,12 +263,12 @@ UNIT_TEST(IntervalIndex_Simple4)
   data.push_back(CellIdFeaturePairForTest(0x01030400ULL, 0));
   data.push_back(CellIdFeaturePairForTest(0x02030400ULL, 1));
   vector<char> serialIndex;
-  MemWriter<vector<char> > writer(serialIndex);
+  MemWriter<vector<char>> writer(serialIndex);
   BuildIntervalIndex(data.begin(), data.end(), writer, 40);
   MemReader reader(&serialIndex[0], serialIndex.size());
   IntervalIndex<MemReader, uint32_t> index(reader);
   {
-    uint32_t expected [] = {0, 1};
+    uint32_t expected[] = {0, 1};
     vector<uint32_t> values;
     index.ForEach(IndexValueInserter(values), 0, 0xFFFFFFFFULL);
     sort(values.begin(), values.end());
@@ -279,12 +284,12 @@ UNIT_TEST(IntervalIndex_Simple5)
   data.push_back(CellIdFeaturePairForTest(0xA0B1C2D200ULL, 3));
   data.push_back(CellIdFeaturePairForTest(0xA0B2C2D200ULL, 2));
   vector<char> serialIndex;
-  MemWriter<vector<char> > writer(serialIndex);
+  MemWriter<vector<char>> writer(serialIndex);
   BuildIntervalIndex(data.begin(), data.end(), writer, 40);
   MemReader reader(&serialIndex[0], serialIndex.size());
   IntervalIndex<MemReader, uint32_t> index(reader);
   {
-    uint32_t expected [] = {0, 1, 2, 3};
+    uint32_t expected[] = {0, 1, 2, 3};
     vector<uint32_t> values;
     index.ForEach(IndexValueInserter(values), 0, 0xFFFFFFFFFFULL);
     sort(values.begin(), values.end());
diff --git a/libs/indexer/indexer_tests/metadata_serdes_tests.cpp b/libs/indexer/indexer_tests/metadata_serdes_tests.cpp
index d9b2739b5..8b99c375b 100644
--- a/libs/indexer/indexer_tests/metadata_serdes_tests.cpp
+++ b/libs/indexer/indexer_tests/metadata_serdes_tests.cpp
@@ -25,7 +25,8 @@ UNIT_TEST(MetadataSerDesTest_Smoke)
 {
   Buffer buffer;
 
-  auto const genMeta = [](uint32_t i) {
+  auto const genMeta = [](uint32_t i)
+  {
     feature::Metadata meta;
     meta.Set(Metadata::FMD_TEST_ID, strings::to_string(i));
     return meta;
@@ -73,8 +74,7 @@ UNIT_TEST(MetadataSerDesTest_Smoke)
       TEST_EQUAL(ids.size(), 1, (ids));
       TEST(meta.Has(Metadata::FMD_TEST_ID), (meta));
       TEST_EQUAL(ids[0].first, Metadata::FMD_TEST_ID, (ids));
-      TEST_EQUAL(meta.Get(Metadata::FMD_TEST_ID), deserializer->GetMetaById(ids[0].second),
-                 (i, meta, ids));
+      TEST_EQUAL(meta.Get(Metadata::FMD_TEST_ID), deserializer->GetMetaById(ids[0].second), (i, meta, ids));
     }
   }
 }
diff --git a/libs/indexer/indexer_tests/mwm_set_test.cpp b/libs/indexer/indexer_tests/mwm_set_test.cpp
index 5b868ccca..6f24f4132 100644
--- a/libs/indexer/indexer_tests/mwm_set_test.cpp
+++ b/libs/indexer/indexer_tests/mwm_set_test.cpp
@@ -117,8 +117,7 @@ UNIT_TEST(MwmSetIdTest)
   ScopedMwm mwm3("3.mwm");
 
   TestMwmSet mwmSet;
-  TEST_EQUAL(MwmSet::RegResult::Success,
-             mwmSet.Register(LocalCountryFile::MakeForTesting("3")).second, ());
+  TEST_EQUAL(MwmSet::RegResult::Success, mwmSet.Register(LocalCountryFile::MakeForTesting("3")).second, ());
 
   MwmSet::MwmId const id0 = mwmSet.GetMwmHandleByCountryFile(CountryFile("3")).GetId();
   MwmSet::MwmId const id1 = mwmSet.GetMwmHandleByCountryFile(CountryFile("3")).GetId();
diff --git a/libs/indexer/indexer_tests/postcodes_matcher_tests.cpp b/libs/indexer/indexer_tests/postcodes_matcher_tests.cpp
index 3d7a23846..41c376ee1 100644
--- a/libs/indexer/indexer_tests/postcodes_matcher_tests.cpp
+++ b/libs/indexer/indexer_tests/postcodes_matcher_tests.cpp
@@ -2,7 +2,6 @@
 
 #include "indexer/postcodes_matcher.hpp"
 
-
 namespace postcodes_matcher_test
 {
 using namespace search;
@@ -39,4 +38,4 @@ UNIT_TEST(PostcodesMatcher_Smoke)
   TEST(!LooksLikePostcode("39 с 79", true /* handleAsPrefix */), ());
 }
 
-} // namespace postcodes_matcher_test
+}  // namespace postcodes_matcher_test
diff --git a/libs/indexer/indexer_tests/rank_table_test.cpp b/libs/indexer/indexer_tests/rank_table_test.cpp
index 07a428701..383c7f6b4 100644
--- a/libs/indexer/indexer_tests/rank_table_test.cpp
+++ b/libs/indexer/indexer_tests/rank_table_test.cpp
@@ -9,8 +9,8 @@
 #include "platform/local_country_file.hpp"
 #include "platform/platform.hpp"
 
-#include "coding/files_container.hpp"
 #include "coding/file_writer.hpp"
+#include "coding/files_container.hpp"
 #include "coding/internal/file_data.hpp"
 #include "coding/writer.hpp"
 
diff --git a/libs/indexer/indexer_tests/road_shields_parser_tests.cpp b/libs/indexer/indexer_tests/road_shields_parser_tests.cpp
index bd148cb4a..88e28633d 100644
--- a/libs/indexer/indexer_tests/road_shields_parser_tests.cpp
+++ b/libs/indexer/indexer_tests/road_shields_parser_tests.cpp
@@ -10,7 +10,7 @@ UNIT_TEST(RoadShields_Smoke)
   TEST_EQUAL(shields.size(), 1, ());
   TEST_EQUAL(shields[0].m_type, RoadShieldType::Generic_Orange, ());
 
-  shields = GetRoadShields("Belarus", "M1"); // latin letter M
+  shields = GetRoadShields("Belarus", "M1");  // latin letter M
   TEST_EQUAL(shields.size(), 1, ());
   TEST_EQUAL(shields[0].m_type, RoadShieldType::Generic_Red, ());
 
diff --git a/libs/indexer/indexer_tests/scale_index_reading_tests.cpp b/libs/indexer/indexer_tests/scale_index_reading_tests.cpp
index 90cc61c70..2853b30cd 100644
--- a/libs/indexer/indexer_tests/scale_index_reading_tests.cpp
+++ b/libs/indexer/indexer_tests/scale_index_reading_tests.cpp
@@ -43,17 +43,16 @@ class ScaleIndexReadingTest : public TestWithCustomMwms
 {
 public:
   template <typename ScaleIndex>
-  Names CollectNames(MwmSet::MwmId const & id, ScaleIndex const & index, int scaleForIntervals,
-                     int scaleForZoomLevels, m2::RectD const & rect)
+  Names CollectNames(MwmSet::MwmId const & id, ScaleIndex const & index, int scaleForIntervals, int scaleForZoomLevels,
+                     m2::RectD const & rect)
   {
     covering::CoveringGetter covering(rect, covering::ViewportWithLowLevels);
 
     vector<uint32_t> indices;
     for (auto const & interval : covering.Get<RectId::DEPTH_LEVELS>(scaleForIntervals))
     {
-      index.ForEachInIntervalAndScale(
-          interval.first, interval.second, scaleForZoomLevels,
-          [&](uint64_t /* key */, uint32_t value) { indices.push_back(value); });
+      index.ForEachInIntervalAndScale(interval.first, interval.second, scaleForZoomLevels,
+                                      [&](uint64_t /* key */, uint32_t value) { indices.push_back(value); });
     }
 
     FeaturesLoaderGuard loader(m_dataSource, id);
@@ -81,7 +80,8 @@ UNIT_CLASS_TEST(ScaleIndexReadingTest, Mmap)
   TestPOI c(m2::PointD{1, 1}, "C", "en");
   TestPOI d(m2::PointD{0, 1}, "D", "en");
 
-  auto id = BuildCountry("Wonderland", [&](TestMwmBuilder & builder) {
+  auto id = BuildCountry("Wonderland", [&](TestMwmBuilder & builder)
+  {
     builder.Add(a);
     builder.Add(b);
     builder.Add(c);
@@ -105,27 +105,22 @@ UNIT_CLASS_TEST(ScaleIndexReadingTest, Mmap)
 
   ScaleIndex<ReaderPtr<Reader>> index(subReader, factory);
 
-  auto collectNames = [&](m2::RectD const & rect) {
-    return CollectNames(id, index, header.GetLastScale(), header.GetLastScale(), rect);
-  };
+  auto collectNames = [&](m2::RectD const & rect)
+  { return CollectNames(id, index, header.GetLastScale(), header.GetLastScale(), rect); };
 
   TEST_EQUAL(collectNames(m2::RectD{-0.5, -0.5, 0.5, 0.5}), Names({"A"}), ());
   TEST_EQUAL(collectNames(m2::RectD{0.5, -0.5, 1.5, 1.5}), Names({"B", "C"}), ());
   TEST_EQUAL(collectNames(m2::RectD{-0.5, -0.5, 1.5, 1.5}), Names({"A", "B", "C", "D"}), ());
 
-  auto collectNamesForExactScale = [&](m2::RectD const & rect, int scale) {
-    return CollectNames(id, index, header.GetLastScale(), scale, rect);
-  };
+  auto collectNamesForExactScale = [&](m2::RectD const & rect, int scale)
+  { return CollectNames(id, index, header.GetLastScale(), scale, rect); };
 
   auto const drawableScale = feature::GetMinDrawableScaleClassifOnly(a.GetTypes());
-  CHECK_LESS(drawableScale, header.GetLastScale(),
-             ("Change the test to ensure scales less than last scale work."));
+  CHECK_LESS(drawableScale, header.GetLastScale(), ("Change the test to ensure scales less than last scale work."));
 
-  TEST_EQUAL(collectNamesForExactScale(m2::RectD{-0.5, -0.5, 0.5, 0.5}, drawableScale),
-             Names({"A"}), ());
-  TEST_EQUAL(collectNamesForExactScale(m2::RectD{0.5, -0.5, 1.5, 1.5}, drawableScale),
-             Names({"B", "C"}), ());
-  TEST_EQUAL(collectNamesForExactScale(m2::RectD{-0.5, -0.5, 1.5, 1.5}, drawableScale),
-             Names({"A", "B", "C", "D"}), ());
+  TEST_EQUAL(collectNamesForExactScale(m2::RectD{-0.5, -0.5, 0.5, 0.5}, drawableScale), Names({"A"}), ());
+  TEST_EQUAL(collectNamesForExactScale(m2::RectD{0.5, -0.5, 1.5, 1.5}, drawableScale), Names({"B", "C"}), ());
+  TEST_EQUAL(collectNamesForExactScale(m2::RectD{-0.5, -0.5, 1.5, 1.5}, drawableScale), Names({"A", "B", "C", "D"}),
+             ());
 }
-} // namespace scale_index_reading_tests
+}  // namespace scale_index_reading_tests
diff --git a/libs/indexer/indexer_tests/search_string_utils_test.cpp b/libs/indexer/indexer_tests/search_string_utils_test.cpp
index 7bb09af8b..4cc2a8339 100644
--- a/libs/indexer/indexer_tests/search_string_utils_test.cpp
+++ b/libs/indexer/indexer_tests/search_string_utils_test.cpp
@@ -18,16 +18,10 @@ class Utf8StreetTokensFilter
 public:
   explicit Utf8StreetTokensFilter(vector<pair<string, size_t>> & cont, bool withMisprints = false)
     : m_cont(cont)
-    , m_filter(
-          [&](UniString const & token, size_t tag) { m_cont.emplace_back(ToUtf8(token), tag); },
-          withMisprints)
-  {
-  }
+    , m_filter([&](UniString const & token, size_t tag) { m_cont.emplace_back(ToUtf8(token), tag); }, withMisprints)
+  {}
 
-  void Put(string const & token, bool isPrefix, size_t tag)
-  {
-    m_filter.Put(MakeUniString(token), isPrefix, tag);
-  }
+  void Put(string const & token, bool isPrefix, size_t tag) { m_filter.Put(MakeUniString(token), isPrefix, tag); }
 
 private:
   vector<pair<string, size_t>> & m_cont;
@@ -80,17 +74,26 @@ UNIT_TEST(NormalizeAndSimplifyString_WithOurTambourines)
                         "ăâț", "aat"                    // Romanian
                        };
   */
-  string const arr[] = {"ÜbërÅłłęšß", "uberallesss", // Basic test case.
-                        "Iiİı", "iiii",              // Famous turkish "I" letter bug.
-                        "ЙЁйёШКИЙй", "иеиешкиии",    // Better handling of Russian й letter.
-                        "ØøÆ挜", "ooaeaeoeoe",      // Dansk
-                        "バス", "ハス",
-                        "âàáạăốợồôểềệếỉđưựứửýĂÂĐÊÔƠƯ",
-                        "aaaaaooooeeeeiduuuuyaadeoou",  // Vietnamese
-                        "ăâț", "aat",                   // Romanian
-                        "Триу́мф-Пала́с", "триумф-палас", // Russian accent
-                        "  a   b  c d ", " a b c d ",   // Multiple spaces
-                       };
+  string const arr[] = {
+      "ÜbërÅłłęšß",
+      "uberallesss",  // Basic test case.
+      "Iiİı",
+      "iiii",  // Famous turkish "I" letter bug.
+      "ЙЁйёШКИЙй",
+      "иеиешкиии",  // Better handling of Russian й letter.
+      "ØøÆ挜",
+      "ooaeaeoeoe",  // Dansk
+      "バス",
+      "ハス",
+      "âàáạăốợồôểềệếỉđưựứửýĂÂĐÊÔƠƯ",
+      "aaaaaooooeeeeiduuuuyaadeoou",  // Vietnamese
+      "ăâț",
+      "aat",  // Romanian
+      "Триу́мф-Пала́с",
+      "триумф-палас",  // Russian accent
+      "  a   b  c d ",
+      " a b c d ",  // Multiple spaces
+  };
 
   for (size_t i = 0; i < ARRAY_SIZE(arr); i += 2)
     TEST_EQUAL(arr[i + 1], NormalizeAndSimplifyStringUtf8(arr[i]), ());
@@ -119,10 +122,10 @@ UNIT_TEST(Street_Synonym)
   TEST(!TestStreetSynonym("strase"), ());
   TEST(TestStreetSynonymWithMisprints("strase"), ());
 
-//  TEST(TestStreetSynonym("boulevard"), ());
-//  TEST(TestStreetSynonymWithMisprints("boulevard"), ());
-//  TEST(!TestStreetSynonym("boulevrd"), ());
-//  TEST(TestStreetSynonymWithMisprints("boulevrd"), ());
+  //  TEST(TestStreetSynonym("boulevard"), ());
+  //  TEST(TestStreetSynonymWithMisprints("boulevard"), ());
+  //  TEST(!TestStreetSynonym("boulevrd"), ());
+  //  TEST(TestStreetSynonymWithMisprints("boulevrd"), ());
 
   TEST(TestStreetSynonym("avenue"), ());
   TEST(TestStreetSynonymWithMisprints("avenue"), ());
@@ -157,13 +160,13 @@ UNIT_TEST(Street_PrefixMatch)
   TEST(TestStreetPrefixMatch("ca"), ());
   TEST(TestStreetPrefixMatch("ву"), ());
 
-//  TEST(TestStreetPrefixMatch("п"), ());
-//  TEST(TestStreetPrefixMatch("пр"), ());
-//  TEST(TestStreetPrefixMatch("про"), ());
-//  TEST(TestStreetPrefixMatch("прое"), ());
-//  TEST(TestStreetPrefixMatch("проез"), ());
-//  TEST(TestStreetPrefixMatch("проезд"), ());
-//  TEST(!TestStreetPrefixMatch("проездд"), ());
+  //  TEST(TestStreetPrefixMatch("п"), ());
+  //  TEST(TestStreetPrefixMatch("пр"), ());
+  //  TEST(TestStreetPrefixMatch("про"), ());
+  //  TEST(TestStreetPrefixMatch("прое"), ());
+  //  TEST(TestStreetPrefixMatch("проез"), ());
+  //  TEST(TestStreetPrefixMatch("проезд"), ());
+  //  TEST(!TestStreetPrefixMatch("проездд"), ());
 
   TEST(TestStreetPrefixMatchWithMisprints("ул"), ());
   TEST(!TestStreetPrefixMatch("уле"), ());
@@ -176,8 +179,8 @@ UNIT_TEST(Street_PrefixMatch)
   TEST(TestStreetPrefixMatchWithMisprints("roadx"), ());
   TEST(!TestStreetPrefixMatchWithMisprints("roadxx"), ());
 
-  TEST(!TestStreetPrefixMatchWithMisprints("groad"), ());   // road, but no
-  TEST(TestStreetPrefixMatchWithMisprints("karre"), ());    // carrer
+  TEST(!TestStreetPrefixMatchWithMisprints("groad"), ());  // road, but no
+  TEST(TestStreetPrefixMatchWithMisprints("karre"), ());   // carrer
   TEST(!TestStreetPrefixMatchWithMisprints("karrerx"), ());
 }
 
@@ -247,8 +250,7 @@ UNIT_TEST(Street_TokensFilter)
     List actualWithoutMisprints;
 
     Utf8StreetTokensFilter filterWithMisprints(actualWithMisprints, true /* withMisprints */);
-    Utf8StreetTokensFilter filterWithoutMisprints(actualWithoutMisprints,
-                                                  false /* withMisprints */);
+    Utf8StreetTokensFilter filterWithoutMisprints(actualWithoutMisprints, false /* withMisprints */);
     filterWithMisprints.Put("ленинский", false /* isPrefix */, 0 /* tag */);
     filterWithoutMisprints.Put("ленинский", false /* isPrefix */, 0 /* tag */);
     filterWithMisprints.Put("пропект", false /* isPrefix */, 1 /* tag */);
@@ -264,8 +266,7 @@ UNIT_TEST(Street_TokensFilter)
     List actualWithoutMisprints;
 
     Utf8StreetTokensFilter filterWithMisprints(actualWithMisprints, true /* withMisprints */);
-    Utf8StreetTokensFilter filterWithoutMisprints(actualWithoutMisprints,
-                                                  false /* withMisprints */);
+    Utf8StreetTokensFilter filterWithoutMisprints(actualWithoutMisprints, false /* withMisprints */);
     filterWithMisprints.Put("улица", false /* isPrefix */, 0 /* tag */);
     filterWithoutMisprints.Put("улица", false /* isPrefix */, 0 /* tag */);
     filterWithMisprints.Put("набрежная", false /* isPrefix */, 1 /* tag */);
@@ -291,9 +292,7 @@ UNIT_TEST(NormalizeAndSimplifyString_Apostrophe)
 UNIT_TEST(Steet_GetStreetNameAsKey)
 {
   auto const Check = [](std::string_view src, std::string_view expected)
-  {
-    TEST_EQUAL(GetStreetNameAsKey(src, true /* ignoreStreetSynonyms */), strings::MakeUniString(expected), ());
-  };
+  { TEST_EQUAL(GetStreetNameAsKey(src, true /* ignoreStreetSynonyms */), strings::MakeUniString(expected), ()); };
 
   {
     std::string_view const ethalon = "680northwest";
@@ -303,17 +302,15 @@ UNIT_TEST(Steet_GetStreetNameAsKey)
   }
 
   Check("North 20th Rd", "20thnorth");
-  Check("Lane st", "lane st");         /// @todo Probably, doesn't matter here?
-  Check("West North", "westnorth");    /// @todo Should order?
+  Check("Lane st", "lane st");       /// @todo Probably, doesn't matter here?
+  Check("West North", "westnorth");  /// @todo Should order?
   Check("NW", "northwest");
 }
 
 UNIT_TEST(Steet_GetNormalizedStreetName)
 {
   auto const Check = [](std::string_view s1, std::string_view s2)
-  {
-    TEST_EQUAL(GetNormalizedStreetName(s1), GetNormalizedStreetName(s2), ());
-  };
+  { TEST_EQUAL(GetNormalizedStreetName(s1), GetNormalizedStreetName(s2), ()); };
 
   Check("Lane G", "G Ln");
   Check("South Grapetree Road", "S Grape Tree Rd");
@@ -336,19 +333,19 @@ UNIT_TEST(Steet_GetNormalizedStreetName)
 
   /// @todo Fancy examples:
   // https://www.openstreetmap.org/way/1188750428
-  //Check("East Ridge Road", "E Rdg");
-  //Check("7th Street", "Sevens St");
+  // Check("East Ridge Road", "E Rdg");
+  // Check("7th Street", "Sevens St");
   // https://www.openstreetmap.org/way/8605899
-  //Check("Beaver Crest Drive", "Beaver Crst");
+  // Check("Beaver Crest Drive", "Beaver Crst");
   // https://www.openstreetmap.org/way/8607254
-  //Check("St Annes Drive", "Saint Annes Dr");
+  // Check("St Annes Drive", "Saint Annes Dr");
   // https://www.openstreetmap.org/way/7703018
-  //Check("AL 60", "Al Highway 60");
+  // Check("AL 60", "Al Highway 60");
   // https://www.openstreetmap.org/way/7705380
   // Seems like it means "Centerville Street" or "County Road 25"
-  //Check("Centreville Street", "Centerville St Co Rd 25");
+  // Check("Centreville Street", "Centerville St Co Rd 25");
   // https://www.openstreetmap.org/way/23629713
-  //Check("Northeast Martin Luther King Junior Boulevard", "NE M L King Blvd");
+  // Check("Northeast Martin Luther King Junior Boulevard", "NE M L King Blvd");
 }
 
-} // namespace search_string_utils_test
+}  // namespace search_string_utils_test
diff --git a/libs/indexer/indexer_tests/sort_and_merge_intervals_test.cpp b/libs/indexer/indexer_tests/sort_and_merge_intervals_test.cpp
index c5a9dae9d..8a41bd86e 100644
--- a/libs/indexer/indexer_tests/sort_and_merge_intervals_test.cpp
+++ b/libs/indexer/indexer_tests/sort_and_merge_intervals_test.cpp
@@ -1,5 +1,5 @@
-#include "testing/testing.hpp"
 #include "indexer/feature_covering.hpp"
+#include "testing/testing.hpp"
 
 #include <vector>
 
@@ -7,16 +7,16 @@ using namespace std;
 
 UNIT_TEST(SortAndMergeIntervals_1Interval)
 {
-  vector<pair<int64_t, int64_t> > v;
+  vector<pair<int64_t, int64_t>> v;
   v.push_back(make_pair(1ULL, 2ULL));
   TEST_EQUAL(covering::SortAndMergeIntervals(v), v, ());
 }
 UNIT_TEST(SortAndMergeIntervals_2NotSortedNotOverlappin)
 {
-  vector<pair<int64_t, int64_t> > v;
+  vector<pair<int64_t, int64_t>> v;
   v.push_back(make_pair(3ULL, 4ULL));
   v.push_back(make_pair(1ULL, 2ULL));
-  vector<pair<int64_t, int64_t> > e;
+  vector<pair<int64_t, int64_t>> e;
   e.push_back(make_pair(1ULL, 2ULL));
   e.push_back(make_pair(3ULL, 4ULL));
   TEST_EQUAL(covering::SortAndMergeIntervals(v), e, ());
@@ -24,43 +24,40 @@ UNIT_TEST(SortAndMergeIntervals_2NotSortedNotOverlappin)
 
 UNIT_TEST(SortAndMergeIntervals_BorderMerge)
 {
-  vector<pair<int64_t, int64_t> > v;
+  vector<pair<int64_t, int64_t>> v;
   v.push_back(make_pair(1ULL, 2ULL));
   v.push_back(make_pair(2ULL, 3ULL));
-  vector<pair<int64_t, int64_t> > e;
+  vector<pair<int64_t, int64_t>> e;
   e.push_back(make_pair(1ULL, 3ULL));
   TEST_EQUAL(covering::SortAndMergeIntervals(v), e, ());
 }
 
 UNIT_TEST(SortAndMergeIntervals_Overlap)
 {
-  vector<pair<int64_t, int64_t> > v;
+  vector<pair<int64_t, int64_t>> v;
   v.push_back(make_pair(1ULL, 3ULL));
   v.push_back(make_pair(2ULL, 4ULL));
-  vector<pair<int64_t, int64_t> > e;
+  vector<pair<int64_t, int64_t>> e;
   e.push_back(make_pair(1ULL, 4ULL));
   TEST_EQUAL(covering::SortAndMergeIntervals(v), e, ());
 }
 
 UNIT_TEST(SortAndMergeIntervals_Contain)
 {
-  vector<pair<int64_t, int64_t> > v;
+  vector<pair<int64_t, int64_t>> v;
   v.push_back(make_pair(2ULL, 3ULL));
   v.push_back(make_pair(1ULL, 4ULL));
-  vector<pair<int64_t, int64_t> > e;
+  vector<pair<int64_t, int64_t>> e;
   e.push_back(make_pair(1ULL, 4ULL));
   TEST_EQUAL(covering::SortAndMergeIntervals(v), e, ());
 }
 
 UNIT_TEST(SortAndMergeIntervals_ContainAndTouchBorder)
 {
-  vector<pair<int64_t, int64_t> > v;
+  vector<pair<int64_t, int64_t>> v;
   v.push_back(make_pair(1ULL, 3ULL));
   v.push_back(make_pair(1ULL, 4ULL));
-  vector<pair<int64_t, int64_t> > e;
+  vector<pair<int64_t, int64_t>> e;
   e.push_back(make_pair(1ULL, 4ULL));
   TEST_EQUAL(covering::SortAndMergeIntervals(v), e, ());
 }
-
-
-
diff --git a/libs/indexer/indexer_tests/succinct_trie_test.cpp b/libs/indexer/indexer_tests/succinct_trie_test.cpp
index 2b4bc51a9..a30ed7d77 100644
--- a/libs/indexer/indexer_tests/succinct_trie_test.cpp
+++ b/libs/indexer/indexer_tests/succinct_trie_test.cpp
@@ -22,10 +22,7 @@ namespace
 struct StringsFileEntryMock
 {
   StringsFileEntryMock() = default;
-  StringsFileEntryMock(string const & key, uint8_t value)
-    : m_key(key.begin(), key.end()), m_value(value)
-  {
-  }
+  StringsFileEntryMock(string const & key, uint8_t value) : m_key(key.begin(), key.end()), m_value(value) {}
 
   trie::TrieChar const * GetKeyData() { return m_key.data(); }
 
@@ -41,12 +38,9 @@ struct StringsFileEntryMock
     swap(m_value, o.m_value);
   }
 
-  bool operator==(const StringsFileEntryMock & o) const
-  {
-    return m_key == o.m_key && m_value == o.m_value;
-  }
+  bool operator==(StringsFileEntryMock const & o) const { return m_key == o.m_key && m_value == o.m_value; }
 
-  bool operator<(const StringsFileEntryMock & o) const
+  bool operator<(StringsFileEntryMock const & o) const
   {
     if (m_key != o.m_key)
       return m_key < o.m_key;
@@ -135,8 +129,8 @@ void CollectInSubtree(TSimpleIterator & root, vector<uint8_t> & collectedValues)
 template <typename TWriter>
 void BuildFromSimpleValueList(TWriter & writer, vector<StringsFileEntryMock> & data)
 {
-  trie::BuildSuccinctTrie<TWriter, vector<StringsFileEntryMock>::iterator,
-                          SimpleValueList<TWriter>>(writer, data.begin(), data.end());
+  trie::BuildSuccinctTrie<TWriter, vector<StringsFileEntryMock>::iterator, SimpleValueList<TWriter>>(
+      writer, data.begin(), data.end());
 }
 }  // namespace
 
@@ -217,9 +211,8 @@ UNIT_TEST(SuccinctTrie_MoveToString)
   using TWriter = MemWriter<vector<uint8_t>>;
   TWriter memWriter(buf);
 
-  vector<StringsFileEntryMock> data = {
-      StringsFileEntryMock("abcde", 1), StringsFileEntryMock("aaaaa", 2),
-      StringsFileEntryMock("aaa", 3), StringsFileEntryMock("aaa", 4)};
+  vector<StringsFileEntryMock> data = {StringsFileEntryMock("abcde", 1), StringsFileEntryMock("aaaaa", 2),
+                                       StringsFileEntryMock("aaa", 3), StringsFileEntryMock("aaa", 4)};
   sort(data.begin(), data.end());
 
   BuildFromSimpleValueList(memWriter, data);
diff --git a/libs/indexer/indexer_tests/test_mwm_set.hpp b/libs/indexer/indexer_tests/test_mwm_set.hpp
index aec100049..ffc61b50f 100644
--- a/libs/indexer/indexer_tests/test_mwm_set.hpp
+++ b/libs/indexer/indexer_tests/test_mwm_set.hpp
@@ -38,4 +38,4 @@ protected:
   //@}
 };
 
-}  // namespace
+}  // namespace tests
diff --git a/libs/indexer/indexer_tests/test_type.cpp b/libs/indexer/indexer_tests/test_type.cpp
index b67cdbaf7..3c927b368 100644
--- a/libs/indexer/indexer_tests/test_type.cpp
+++ b/libs/indexer/indexer_tests/test_type.cpp
@@ -4,43 +4,43 @@
 
 namespace
 {
-  void check_values_array(uint8_t values[], uint8_t count)
+void check_values_array(uint8_t values[], uint8_t count)
+{
+  uint32_t type = ftype::GetEmptyValue();
+
+  for (uint8_t i = 0; i < count; ++i)
+    ftype::PushValue(type, values[i]);
+
+  for (uint8_t i = 0; i < count; ++i)
+    TEST_EQUAL(ftype::GetValue(type, i), values[i], ());
+
+  while (count > 0)
   {
-    uint32_t type = ftype::GetEmptyValue();
-
-    for (uint8_t i = 0; i < count; ++i)
-      ftype::PushValue(type, values[i]);
-
-    for (uint8_t i = 0; i < count; ++i)
-      TEST_EQUAL(ftype::GetValue(type, i), values[i], ());
-
-    while (count > 0)
-    {
-      TEST_EQUAL(ftype::GetLevel(type), count, ());
-      ftype::PopValue(type);
-      --count;
-    }
-
-    TEST_EQUAL(ftype::GetLevel(type), 0, ());
-    TEST_EQUAL(type, ftype::GetEmptyValue(), (type));
+    TEST_EQUAL(ftype::GetLevel(type), count, ());
+    ftype::PopValue(type);
+    --count;
   }
+
+  TEST_EQUAL(ftype::GetLevel(type), 0, ());
+  TEST_EQUAL(type, ftype::GetEmptyValue(), (type));
 }
+}  // namespace
 
 UNIT_TEST(SetGetTypes)
 {
-  uint8_t v1[] = { 6, 30, 0, 1 };
+  uint8_t v1[] = {6, 30, 0, 1};
   check_values_array(v1, 4);
   check_values_array(v1, 3);
 
-  uint8_t v2[] = { 0, 0, 0, 0 };
+  uint8_t v2[] = {0, 0, 0, 0};
   check_values_array(v2, 4);
   check_values_array(v2, 3);
 
-  uint8_t v3[] = { 1, 1, 1, 1 };
+  uint8_t v3[] = {1, 1, 1, 1};
   check_values_array(v3, 4);
   check_values_array(v3, 3);
 
-  uint8_t v4[] = { 63, 63, 63, 63 };
+  uint8_t v4[] = {63, 63, 63, 63};
   check_values_array(v4, 4);
   check_values_array(v4, 3);
 }
diff --git a/libs/indexer/indexer_tests/tree_node_tests.cpp b/libs/indexer/indexer_tests/tree_node_tests.cpp
index d8f25a444..0723d40be 100644
--- a/libs/indexer/indexer_tests/tree_node_tests.cpp
+++ b/libs/indexer/indexer_tests/tree_node_tests.cpp
@@ -33,14 +33,13 @@ UNIT_TEST(TreeNode_PreOrderVisit)
 {
   auto const tree = MakeTree();
   std::vector<int> res;
-  tree_node::PreOrderVisit(tree, [&](auto const & node) {
-    res.emplace_back(node->GetData());
-  });
+  tree_node::PreOrderVisit(tree, [&](auto const & node) { res.emplace_back(node->GetData()); });
   std::vector<int> const expected = {1, 21, 31, 32, 33, 34, 22, 35, 36};
   TEST_EQUAL(res, expected, ());
 
   auto countVisitedNode = 0;
-  tree_node::PreOrderVisit(tree, [&](auto const & node) {
+  tree_node::PreOrderVisit(tree, [&](auto const & node)
+  {
     ++countVisitedNode;
     return node->GetData() == 32 ? base::ControlFlow::Break : base::ControlFlow::Continue;
   });
@@ -97,11 +96,9 @@ UNIT_TEST(TreeNode_GetPath)
   auto const tree = MakeTree();
   auto const node33 = tree_node::FindIf(tree, [](auto const & d) { return d == 33; });
   auto const path = tree_node::GetPathToRoot(node33);
-  tree_node::types::Ptrs<int> expected = {
-    tree_node::FindIf(tree, [](auto const & d) { return d == 33; }),
-    tree_node::FindIf(tree, [](auto const & d) { return d == 21; }),
-    tree_node::FindIf(tree, [](auto const & d) { return d == 1; })
-  };
+  tree_node::types::Ptrs<int> expected = {tree_node::FindIf(tree, [](auto const & d) { return d == 33; }),
+                                          tree_node::FindIf(tree, [](auto const & d) { return d == 21; }),
+                                          tree_node::FindIf(tree, [](auto const & d) { return d == 1; })};
   TEST_EQUAL(path, expected, ());
 }
 
@@ -121,9 +118,7 @@ UNIT_TEST(TreeNode_IsEqual)
 UNIT_TEST(TreeNode_TransformToTree)
 {
   auto const tree = MakeTree();
-  auto const newTree = tree_node::TransformToTree(tree, [](auto const & data) {
-    return std::to_string(data);
-  });
+  auto const newTree = tree_node::TransformToTree(tree, [](auto const & data) { return std::to_string(data); });
 
   auto expected = tree_node::MakeTreeNode<std::string>("1");
   auto node11 = tree_node::MakeTreeNode<std::string>("21");
@@ -157,15 +152,13 @@ UNIT_TEST(TreeNode_DebugPrint)
 UNIT_TEST(TreeNode_Forest)
 {
   tree_node::Forest<int> forest;
-  std::set<tree_node::types::Ptr<int>> s = {
-    MakeTree(),
-    tree_node::MakeTreeNode(10)
-  };
+  std::set<tree_node::types::Ptr<int>> s = {MakeTree(), tree_node::MakeTreeNode(10)};
   for (auto const & tree : s)
     forest.Append(tree);
 
   TEST_EQUAL(forest.Size(), 2, ());
-  forest.ForEachTree([&](auto const & tree) {
+  forest.ForEachTree([&](auto const & tree)
+  {
     auto const count = s.erase(tree);
     TEST_EQUAL(count, 1, ());
   });
diff --git a/libs/indexer/indexer_tests/trie_test.cpp b/libs/indexer/indexer_tests/trie_test.cpp
index 9eb545cd3..64f715b8d 100644
--- a/libs/indexer/indexer_tests/trie_test.cpp
+++ b/libs/indexer/indexer_tests/trie_test.cpp
@@ -109,7 +109,7 @@ private:
   vector<Value> m_values;
 };
 
-#define ZENC bits::ZigZagEncode
+#define ZENC    bits::ZigZagEncode
 #define MKSC(x) static_cast<signed char>(x)
 #define MKUC(x) static_cast<uint8_t>(x)
 
@@ -119,36 +119,101 @@ UNIT_TEST(TrieBuilder_WriteNode_Smoke)
   PushBackByteSink<vector<uint8_t>> sink(buf);
   ChildNodeInfo children[] = {
       ChildNodeInfo(true, 1, "1A"), ChildNodeInfo(false, 2, "B"), ChildNodeInfo(false, 3, "zz"),
-      ChildNodeInfo(true, 4,
-                    "abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij"),
+      ChildNodeInfo(true, 4, "abcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij"),
       ChildNodeInfo(true, 5, "a")};
 
   ValueList<char> valueList;
   valueList.Init({'1', '2', '3'});
-  trie::WriteNode(sink, SingleValueSerializer<char>(), 0, valueList, &children[0],
-                  &children[0] + ARRAY_SIZE(children));
+  trie::WriteNode(sink, SingleValueSerializer<char>(), 0, valueList, &children[0], &children[0] + ARRAY_SIZE(children));
   uint8_t const expected[] = {
       BOOST_BINARY(11000101),  // Header: [0b11] [0b000101]
       3,                       // Number of values
-      '1', '2', '3',           // Values
+      '1',
+      '2',
+      '3',                     // Values
       BOOST_BINARY(10000001),  // Child 1: header: [+leaf] [-supershort]  [2 symbols]
-      MKUC(ZENC(MKSC('1'))), MKUC(ZENC(MKSC('A') - MKSC('1'))),  // Child 1: edge
-      1,                                                         // Child 1: size
+      MKUC(ZENC(MKSC('1'))),
+      MKUC(ZENC(MKSC('A') - MKSC('1'))),       // Child 1: edge
+      1,                                       // Child 1: size
       MKUC(64 | ZENC(MKSC('B') - MKSC('1'))),  // Child 2: header: [-leaf] [+supershort]
       2,                                       // Child 2: size
-      BOOST_BINARY(00000001),                // Child 3: header: [-leaf] [-supershort]  [2 symbols]
-      MKUC(ZENC(MKSC('z') - MKSC('B'))), 0,  // Child 3: edge
-      3,                                     // Child 3: size
+      BOOST_BINARY(00000001),                  // Child 3: header: [-leaf] [-supershort]  [2 symbols]
+      MKUC(ZENC(MKSC('z') - MKSC('B'))),
+      0,                       // Child 3: edge
+      3,                       // Child 3: size
       BOOST_BINARY(10111111),  // Child 4: header: [+leaf] [-supershort]  [>= 63 symbols]
       69,                      // Child 4: edgeSize - 1
-      MKUC(ZENC(MKSC('a') - MKSC('z'))), 2, 2, 2, 2, 2, 2, 2, 2, 2,  // Child 4: edge
-      MKUC(ZENC(MKSC('a') - MKSC('j'))), 2, 2, 2, 2, 2, 2, 2, 2, 2,  // Child 4: edge
-      MKUC(ZENC(MKSC('a') - MKSC('j'))), 2, 2, 2, 2, 2, 2, 2, 2, 2,  // Child 4: edge
-      MKUC(ZENC(MKSC('a') - MKSC('j'))), 2, 2, 2, 2, 2, 2, 2, 2, 2,  // Child 4: edge
-      MKUC(ZENC(MKSC('a') - MKSC('j'))), 2, 2, 2, 2, 2, 2, 2, 2, 2,  // Child 4: edge
-      MKUC(ZENC(MKSC('a') - MKSC('j'))), 2, 2, 2, 2, 2, 2, 2, 2, 2,  // Child 4: edge
-      MKUC(ZENC(MKSC('a') - MKSC('j'))), 2, 2, 2, 2, 2, 2, 2, 2, 2,  // Child 4: edge
-      4,                                                             // Child 4: size
+      MKUC(ZENC(MKSC('a') - MKSC('z'))),
+      2,
+      2,
+      2,
+      2,
+      2,
+      2,
+      2,
+      2,
+      2,  // Child 4: edge
+      MKUC(ZENC(MKSC('a') - MKSC('j'))),
+      2,
+      2,
+      2,
+      2,
+      2,
+      2,
+      2,
+      2,
+      2,  // Child 4: edge
+      MKUC(ZENC(MKSC('a') - MKSC('j'))),
+      2,
+      2,
+      2,
+      2,
+      2,
+      2,
+      2,
+      2,
+      2,  // Child 4: edge
+      MKUC(ZENC(MKSC('a') - MKSC('j'))),
+      2,
+      2,
+      2,
+      2,
+      2,
+      2,
+      2,
+      2,
+      2,  // Child 4: edge
+      MKUC(ZENC(MKSC('a') - MKSC('j'))),
+      2,
+      2,
+      2,
+      2,
+      2,
+      2,
+      2,
+      2,
+      2,  // Child 4: edge
+      MKUC(ZENC(MKSC('a') - MKSC('j'))),
+      2,
+      2,
+      2,
+      2,
+      2,
+      2,
+      2,
+      2,
+      2,  // Child 4: edge
+      MKUC(ZENC(MKSC('a') - MKSC('j'))),
+      2,
+      2,
+      2,
+      2,
+      2,
+      2,
+      2,
+      2,
+      2,                                       // Child 4: edge
+      4,                                       // Child 4: size
       MKUC(BOOST_BINARY(11000000) | ZENC(0)),  // Child 5: header: [+leaf] [+supershort]
   };
 
@@ -187,10 +252,7 @@ UNIT_TEST(TrieBuilder_Build)
         using KeyValuePair = pair<Key, Value>;
 
         vector<KeyValuePair> v;
-        auto makeKey = [](string const & s)
-        {
-          return Key(s.begin(), s.end());
-        };
+        auto makeKey = [](string const & s) { return Key(s.begin(), s.end()); };
         if (i0 >= 0)
           v.emplace_back(makeKey(possibleStrings[i0]), i0);
         if (i1 >= 0)
@@ -204,17 +266,14 @@ UNIT_TEST(TrieBuilder_Build)
         vector<uint8_t> buf;
         PushBackByteSink<vector<uint8_t>> sink(buf);
         SingleValueSerializer<uint32_t> serializer;
-        trie::Build<PushBackByteSink<vector<uint8_t>>, Key, ValueList<uint32_t>,
-                    SingleValueSerializer<uint32_t>>(sink, serializer, v);
+        trie::Build<PushBackByteSink<vector<uint8_t>>, Key, ValueList<uint32_t>, SingleValueSerializer<uint32_t>>(
+            sink, serializer, v);
         reverse(buf.begin(), buf.end());
 
         MemReader memReader = MemReader(&buf[0], buf.size());
         auto const root = trie::ReadTrie<MemReader, ValueList<uint32_t>>(memReader, serializer);
         vector<KeyValuePair> res;
-        auto addKeyValuePair = [&res](Key const & k, Value const & v)
-        {
-          res.emplace_back(k, v);
-        };
+        auto addKeyValuePair = [&res](Key const & k, Value const & v) { res.emplace_back(k, v); };
         trie::ForEachRef(*root, addKeyValuePair, Key{});
         sort(res.begin(), res.end());
         TEST_EQUAL(v, res, ());
@@ -223,4 +282,4 @@ UNIT_TEST(TrieBuilder_Build)
   }
 }
 
-} // namespace trie_test
+}  // namespace trie_test
diff --git a/libs/indexer/indexer_tests/validate_and_format_contacts_test.cpp b/libs/indexer/indexer_tests/validate_and_format_contacts_test.cpp
index 0c8d041dd..2daf86f75 100644
--- a/libs/indexer/indexer_tests/validate_and_format_contacts_test.cpp
+++ b/libs/indexer/indexer_tests/validate_and_format_contacts_test.cpp
@@ -16,8 +16,10 @@ UNIT_TEST(EditableMapObject_ValidateAndFormat_facebook)
   TEST_EQUAL(osm::ValidateAndFormat_facebook("https://www.facebook.com/OpenStreetMap"), "OpenStreetMap", ());
   TEST_EQUAL(osm::ValidateAndFormat_facebook("https://de-de.facebook.de/Open_Street_Map"), "Open_Street_Map", ());
   TEST_EQUAL(osm::ValidateAndFormat_facebook("https://en-us.facebook.com/OpenStreetMap"), "OpenStreetMap", ());
-  TEST_EQUAL(osm::ValidateAndFormat_facebook("https://de-de.facebook.com/profile.php?id=100085707580841"), "100085707580841", ());
-  TEST_EQUAL(osm::ValidateAndFormat_facebook("http://facebook.com/profile.php?share=app&id=100086487430889#m"), "100086487430889", ());
+  TEST_EQUAL(osm::ValidateAndFormat_facebook("https://de-de.facebook.com/profile.php?id=100085707580841"),
+             "100085707580841", ());
+  TEST_EQUAL(osm::ValidateAndFormat_facebook("http://facebook.com/profile.php?share=app&id=100086487430889#m"),
+             "100086487430889", ());
   TEST_EQUAL(osm::ValidateAndFormat_facebook("some.good.page"), "some.good.page", ());
   TEST_EQUAL(osm::ValidateAndFormat_facebook("@tree-house-interiors"), "tree-house-interiors", ());
 
@@ -39,8 +41,11 @@ UNIT_TEST(EditableMapObject_ValidateAndFormat_instagram)
   TEST_EQUAL(osm::ValidateAndFormat_instagram("https://www.instagram.com/openstreetmapus"), "openstreetmapus", ());
   TEST_EQUAL(osm::ValidateAndFormat_instagram("https://en-us.instagram.com/openstreetmapus"), "openstreetmapus", ());
   TEST_EQUAL(osm::ValidateAndFormat_instagram("@open_street_map_us"), "open_street_map_us", ());
-  TEST_EQUAL(osm::ValidateAndFormat_instagram("https://www.instagram.com/explore/locations/358536820/trivium-sport-en-dance/"), "explore/locations/358536820/trivium-sport-en-dance", ());
-  TEST_EQUAL(osm::ValidateAndFormat_instagram("https://www.instagram.com/p/BvkgKZNDbqN/?ghid=UwPchX7B"), "p/BvkgKZNDbqN", ());
+  TEST_EQUAL(
+      osm::ValidateAndFormat_instagram("https://www.instagram.com/explore/locations/358536820/trivium-sport-en-dance/"),
+      "explore/locations/358536820/trivium-sport-en-dance", ());
+  TEST_EQUAL(osm::ValidateAndFormat_instagram("https://www.instagram.com/p/BvkgKZNDbqN/?ghid=UwPchX7B"),
+             "p/BvkgKZNDbqN", ());
 
   TEST_EQUAL(osm::ValidateAndFormat_instagram("facebook.com/osm_us"), "", ());
   TEST_EQUAL(osm::ValidateAndFormat_instagram(".dots_not_allowed."), "", ());
@@ -93,15 +98,20 @@ UNIT_TEST(EditableMapObject_ValidateAndFormat_contactLine)
   TEST_EQUAL(osm::ValidateAndFormat_contactLine("https://line.me/R/ti/p/%40b30h5mdj11"), "b30h5mdj11", ());
   TEST_EQUAL(osm::ValidateAndFormat_contactLine("http://line.me/R/home/public/main?id=hmczqsbav5"), "hmczqsbav5", ());
   TEST_EQUAL(osm::ValidateAndFormat_contactLine("https://line.me/R/home/public/main?id=wa1gvx91jb"), "wa1gvx91jb", ());
-  TEST_EQUAL(osm::ValidateAndFormat_contactLine("http://line.me/R/home/public/profile?id=5qll5dyqqu"), "5qll5dyqqu", ());
-  TEST_EQUAL(osm::ValidateAndFormat_contactLine("https://line.me/R/home/public/profile?id=r90ck7n1rq"), "r90ck7n1rq", ());
-  TEST_EQUAL(osm::ValidateAndFormat_contactLine("https://line.me/R/home/public/profile?id=r90ck7n1rq"), "r90ck7n1rq", ());
+  TEST_EQUAL(osm::ValidateAndFormat_contactLine("http://line.me/R/home/public/profile?id=5qll5dyqqu"), "5qll5dyqqu",
+             ());
+  TEST_EQUAL(osm::ValidateAndFormat_contactLine("https://line.me/R/home/public/profile?id=r90ck7n1rq"), "r90ck7n1rq",
+             ());
+  TEST_EQUAL(osm::ValidateAndFormat_contactLine("https://line.me/R/home/public/profile?id=r90ck7n1rq"), "r90ck7n1rq",
+             ());
   TEST_EQUAL(osm::ValidateAndFormat_contactLine("https://page.line.me/fom5198h"), "fom5198h", ());
   TEST_EQUAL(osm::ValidateAndFormat_contactLine("https://page.line.me/qn58n8g?web=mobile"), "qn58n8g", ());
   TEST_EQUAL(osm::ValidateAndFormat_contactLine("https://page.line.me/?accountId=673watcr"), "673watcr", ());
   TEST_EQUAL(osm::ValidateAndFormat_contactLine("page.line.me/?accountId=673watcr"), "673watcr", ());
-  TEST_EQUAL(osm::ValidateAndFormat_contactLine("https://liff.line.me/1645278921-kWRPP32q/?accountId=673watcr"), "liff.line.me/1645278921-kWRPP32q/?accountId=673watcr", ());
-  TEST_EQUAL(osm::ValidateAndFormat_contactLine("https://abc.line.me/en/some/page?id=xaladqv"), "abc.line.me/en/some/page?id=xaladqv", ());
+  TEST_EQUAL(osm::ValidateAndFormat_contactLine("https://liff.line.me/1645278921-kWRPP32q/?accountId=673watcr"),
+             "liff.line.me/1645278921-kWRPP32q/?accountId=673watcr", ());
+  TEST_EQUAL(osm::ValidateAndFormat_contactLine("https://abc.line.me/en/some/page?id=xaladqv"),
+             "abc.line.me/en/some/page?id=xaladqv", ());
   TEST_EQUAL(osm::ValidateAndFormat_contactLine("@abcd"), "abcd", ());
   TEST_EQUAL(osm::ValidateAndFormat_contactLine("@-hyphen-test-"), "-hyphen-test-", ());
 
@@ -159,9 +169,9 @@ UNIT_TEST(EditableMapObject_ValidateFacebookPage)
   TEST(osm::ValidateFacebookPage("Quaama-Volunteer-Bushfire-Brigade-526790054021506"), ());
   TEST(osm::ValidateFacebookPage("Páter-Bonifác-Restaurant-Budapest-111001693867133"), ());
   TEST(osm::ValidateFacebookPage("MÊGÅ--CÄFË-3141592653589793"), ());
-  TEST(osm::ValidateFacebookPage("ресторан"), ()); // Cyrillic
-  TEST(osm::ValidateFacebookPage("საქართველო"), ()); // Georgian
-  TEST(osm::ValidateFacebookPage("日本語"), ()); // Japanese
+  TEST(osm::ValidateFacebookPage("ресторан"), ());    // Cyrillic
+  TEST(osm::ValidateFacebookPage("საქართველო"), ());  // Georgian
+  TEST(osm::ValidateFacebookPage("日本語"), ());      // Japanese
   TEST(osm::ValidateFacebookPage("@tree-house-interiors"), ());
   TEST(osm::ValidateFacebookPage("allow_underscore-1234567890"), ());
   TEST(osm::ValidateFacebookPage("alexander.net"), ());
@@ -173,7 +183,7 @@ UNIT_TEST(EditableMapObject_ValidateFacebookPage)
   TEST(!osm::ValidateFacebookPage("spaces are not welcome here"), ());
 
   constexpr char kForbiddenFBSymbols[] = " !@^*()~[]{}#$%&;,:+\"'/\\";
-  for(size_t i=0; i<std::size(kForbiddenFBSymbols)-1; i++)
+  for (size_t i = 0; i < std::size(kForbiddenFBSymbols) - 1; i++)
   {
     auto test_str = std::string("special-symbol-") + kForbiddenFBSymbols[i] + "-forbidden";
     TEST(!osm::ValidateFacebookPage(test_str), (test_str));
@@ -182,7 +192,7 @@ UNIT_TEST(EditableMapObject_ValidateFacebookPage)
   // Symbols "£€¥" are not allowed, but to check such cases it requires unicode magic. Not supported currently.
   // TODO: find all restricted *Unicode* symbols from https://www.facebook.com/pages/create page
   //       and them to the test
-  //TEST(!osm::ValidateFacebookPage(u8"you-shall-not-pass-£€¥"), ());
+  // TEST(!osm::ValidateFacebookPage(u8"you-shall-not-pass-£€¥"), ());
 }
 
 UNIT_TEST(EditableMapObject_ValidateInstagramPage)
@@ -254,8 +264,8 @@ UNIT_TEST(EditableMapObject_ValidateVkPage)
   TEST(!osm::ValidateVkPage("AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"), ());
   TEST(!osm::ValidateVkPage("_invalid_underscores_"), ());
   TEST(!osm::ValidateVkPage("invalid-dashes"), ());
-  //TEST(!osm::ValidateVkPage("to.ma.ny.do.ts"), ()); //TODO: it's hard to test such cases. Skip for now
-  //TEST(!osm::ValidateVkPage("dots.__.dots"), ()); //TODO: it's hard to test such cases. Skip for now
+  // TEST(!osm::ValidateVkPage("to.ma.ny.do.ts"), ()); //TODO: it's hard to test such cases. Skip for now
+  // TEST(!osm::ValidateVkPage("dots.__.dots"), ()); //TODO: it's hard to test such cases. Skip for now
   TEST(!osm::ValidateVkPage("instagram.com/hello_world"), ());
   TEST(!osm::ValidateVkPage("https://instagram.com/hello_world"), ());
 }
@@ -330,15 +340,28 @@ UNIT_TEST(EditableMapObject_ValidateBlueskyPage)
 
 UNIT_TEST(EditableMapObject_socialContactToURL)
 {
-  TEST_EQUAL(osm::socialContactToURL(osm::MapObject::MetadataID::FMD_CONTACT_INSTAGRAM, "some_page_name"), "https://instagram.com/some_page_name", ());
-  TEST_EQUAL(osm::socialContactToURL(osm::MapObject::MetadataID::FMD_CONTACT_INSTAGRAM, "p/BvkgKZNDbqN"), "https://instagram.com/p/BvkgKZNDbqN", ());
-  TEST_EQUAL(osm::socialContactToURL(osm::MapObject::MetadataID::FMD_CONTACT_FACEBOOK, "100086487430889"), "https://facebook.com/100086487430889", ());
-  TEST_EQUAL(osm::socialContactToURL(osm::MapObject::MetadataID::FMD_CONTACT_FACEBOOK, "nova.poshta.official"), "https://facebook.com/nova.poshta.official", ());
-  TEST_EQUAL(osm::socialContactToURL(osm::MapObject::MetadataID::FMD_CONTACT_FACEBOOK, "pg/ESQ-336537783591903/about"), "https://facebook.com/pg/ESQ-336537783591903/about", ());
-  TEST_EQUAL(osm::socialContactToURL(osm::MapObject::MetadataID::FMD_CONTACT_TWITTER, "carmelopizza"), "https://twitter.com/carmelopizza", ());
-  TEST_EQUAL(osm::socialContactToURL(osm::MapObject::MetadataID::FMD_CONTACT_TWITTER, "demhamburguesa/status/688001869269078016"), "https://twitter.com/demhamburguesa/status/688001869269078016", ());
-  TEST_EQUAL(osm::socialContactToURL(osm::MapObject::MetadataID::FMD_CONTACT_VK, "beerhousebar"), "https://vk.com/beerhousebar", ());
-  TEST_EQUAL(osm::socialContactToURL(osm::MapObject::MetadataID::FMD_CONTACT_VK, "wall-41524_29351"), "https://vk.com/wall-41524_29351", ());
-  TEST_EQUAL(osm::socialContactToURL(osm::MapObject::MetadataID::FMD_CONTACT_LINE, "a26235875"), "https://line.me/R/ti/p/@a26235875", ());
-  TEST_EQUAL(osm::socialContactToURL(osm::MapObject::MetadataID::FMD_CONTACT_LINE, "liff.line.me/1645278921-kWRPP32q/?accountId=673watcr"), "https://liff.line.me/1645278921-kWRPP32q/?accountId=673watcr", ());
-}
\ No newline at end of file
+  TEST_EQUAL(osm::socialContactToURL(osm::MapObject::MetadataID::FMD_CONTACT_INSTAGRAM, "some_page_name"),
+             "https://instagram.com/some_page_name", ());
+  TEST_EQUAL(osm::socialContactToURL(osm::MapObject::MetadataID::FMD_CONTACT_INSTAGRAM, "p/BvkgKZNDbqN"),
+             "https://instagram.com/p/BvkgKZNDbqN", ());
+  TEST_EQUAL(osm::socialContactToURL(osm::MapObject::MetadataID::FMD_CONTACT_FACEBOOK, "100086487430889"),
+             "https://facebook.com/100086487430889", ());
+  TEST_EQUAL(osm::socialContactToURL(osm::MapObject::MetadataID::FMD_CONTACT_FACEBOOK, "nova.poshta.official"),
+             "https://facebook.com/nova.poshta.official", ());
+  TEST_EQUAL(osm::socialContactToURL(osm::MapObject::MetadataID::FMD_CONTACT_FACEBOOK, "pg/ESQ-336537783591903/about"),
+             "https://facebook.com/pg/ESQ-336537783591903/about", ());
+  TEST_EQUAL(osm::socialContactToURL(osm::MapObject::MetadataID::FMD_CONTACT_TWITTER, "carmelopizza"),
+             "https://twitter.com/carmelopizza", ());
+  TEST_EQUAL(osm::socialContactToURL(osm::MapObject::MetadataID::FMD_CONTACT_TWITTER,
+                                     "demhamburguesa/status/688001869269078016"),
+             "https://twitter.com/demhamburguesa/status/688001869269078016", ());
+  TEST_EQUAL(osm::socialContactToURL(osm::MapObject::MetadataID::FMD_CONTACT_VK, "beerhousebar"),
+             "https://vk.com/beerhousebar", ());
+  TEST_EQUAL(osm::socialContactToURL(osm::MapObject::MetadataID::FMD_CONTACT_VK, "wall-41524_29351"),
+             "https://vk.com/wall-41524_29351", ());
+  TEST_EQUAL(osm::socialContactToURL(osm::MapObject::MetadataID::FMD_CONTACT_LINE, "a26235875"),
+             "https://line.me/R/ti/p/@a26235875", ());
+  TEST_EQUAL(osm::socialContactToURL(osm::MapObject::MetadataID::FMD_CONTACT_LINE,
+                                     "liff.line.me/1645278921-kWRPP32q/?accountId=673watcr"),
+             "https://liff.line.me/1645278921-kWRPP32q/?accountId=673watcr", ());
+}
diff --git a/libs/indexer/indexer_tests/visibility_test.cpp b/libs/indexer/indexer_tests/visibility_test.cpp
index e1006a366..8a0a8ac06 100644
--- a/libs/indexer/indexer_tests/visibility_test.cpp
+++ b/libs/indexer/indexer_tests/visibility_test.cpp
@@ -1,9 +1,9 @@
 #include "testing/testing.hpp"
 
-#include "indexer/feature_data.hpp"
-#include "indexer/feature_visibility.hpp"
 #include "indexer/classificator.hpp"
 #include "indexer/classificator_loader.hpp"
+#include "indexer/feature_data.hpp"
+#include "indexer/feature_visibility.hpp"
 #include "indexer/scales.hpp"
 
 #include "base/logging.hpp"
@@ -32,21 +32,20 @@ class DoGetMaxLowMinHighZoom
   }
 
 public:
-  explicit DoGetMaxLowMinHighZoom(Classificator const & c)
-    : m_classif(classif()), m_res(-1, 1000)
+  explicit DoGetMaxLowMinHighZoom(Classificator const & c) : m_classif(classif()), m_res(-1, 1000)
   {
     char const * arr[][2] = {
-      {"highway", "bus_stop"},
-      {"highway", "speed_camera"},
-      {"highway", "world_level"},
-      {"highway", "world_towns_level"},
+        {"highway", "bus_stop"},
+        {"highway", "speed_camera"},
+        {"highway", "world_level"},
+        {"highway", "world_towns_level"},
     };
 
     for (size_t i = 0; i < ARRAY_SIZE(arr); ++i)
       m_skip.insert(c.GetTypeByPath(vector<string>(arr[i], arr[i] + 2)));
   }
 
-  void operator() (ClassifObject const * p, uint32_t type)
+  void operator()(ClassifObject const * p, uint32_t type)
   {
     if (IsSkip(type))
       return;
@@ -74,13 +73,13 @@ public:
   }
 };
 
-}
+}  // namespace
 
 UNIT_TEST(VisibleScales_Highway)
 {
   Classificator const & c = classif();
 
-  char const * arr[] = { "highway" };
+  char const * arr[] = {"highway"};
   uint32_t const type = c.GetTypeByPath(vector<string>(arr, arr + 1));
 
   ClassifObject const * pObj = c.GetObject(type);
diff --git a/libs/indexer/interval_index.hpp b/libs/indexer/interval_index.hpp
index 94f6072be..165791eae 100644
--- a/libs/indexer/interval_index.hpp
+++ b/libs/indexer/interval_index.hpp
@@ -1,6 +1,6 @@
 #pragma once
-#include "coding/endianness.hpp"
 #include "coding/byte_stream.hpp"
+#include "coding/endianness.hpp"
 #include "coding/reader.hpp"
 #include "coding/varint.hpp"
 
@@ -29,15 +29,18 @@ public:
     return 1 << (bitsPerLevel - 3);
   }
 
-  enum { kVersion = 1 };
+  enum
+  {
+    kVersion = 1
+  };
 };
 
 template <class ReaderT, typename Value>
 class IntervalIndex : public IntervalIndexBase
 {
   typedef IntervalIndexBase base_t;
-public:
 
+public:
   explicit IntervalIndex(ReaderT const & reader) : m_Reader(reader)
   {
     ReaderSource<ReaderT> src(reader);
@@ -48,10 +51,7 @@ public:
         m_LevelOffsets.push_back(ReadPrimitiveFromSource<uint32_t>(src));
   }
 
-  uint64_t KeyEnd() const
-  {
-    return 1ULL << (m_Header.m_Levels * m_Header.m_BitsPerLevel + m_Header.m_LeafBytes * 8);
-  }
+  uint64_t KeyEnd() const { return 1ULL << (m_Header.m_Levels * m_Header.m_BitsPerLevel + m_Header.m_LeafBytes * 8); }
 
   template <typename F>
   void ForEach(F const & f, uint64_t beg, uint64_t end) const
@@ -66,16 +66,14 @@ public:
         end = KeyEnd();
       --end;  // end is inclusive in ForEachImpl().
       ForEachNode(f, beg, end, m_Header.m_Levels, 0,
-                  m_LevelOffsets[m_Header.m_Levels + 1] - m_LevelOffsets[m_Header.m_Levels],
-                  0 /* started keyBase */);
+                  m_LevelOffsets[m_Header.m_Levels + 1] - m_LevelOffsets[m_Header.m_Levels], 0 /* started keyBase */);
     }
   }
 
 private:
   template <typename F>
-  void ForEachLeaf(F const & f, uint64_t const beg, uint64_t const end,
-      uint32_t const offset, uint32_t const size,
-      uint64_t keyBase /* discarded part of object key value in the parent nodes*/) const
+  void ForEachLeaf(F const & f, uint64_t const beg, uint64_t const end, uint32_t const offset, uint32_t const size,
+                   uint64_t keyBase /* discarded part of object key value in the parent nodes*/) const
   {
     buffer_vector<uint8_t, 1024> data;
     data.resize(size);
@@ -99,9 +97,8 @@ private:
   }
 
   template <typename F>
-  void ForEachNode(F const & f, uint64_t beg, uint64_t end, int level,
-      uint32_t offset, uint32_t size,
-      uint64_t keyBase /* discarded part of object key value in the parent nodes */) const
+  void ForEachNode(F const & f, uint64_t beg, uint64_t end, int level, uint32_t offset, uint32_t size,
+                   uint64_t keyBase /* discarded part of object key value in the parent nodes */) const
   {
     ASSERT(size > 0, ());
     offset += m_LevelOffsets[level];
@@ -147,8 +144,7 @@ private:
           childOffset += childSize;
         }
       }
-      ASSERT(end0 != (static_cast<uint32_t>(1) << m_Header.m_BitsPerLevel) - 1 ||
-             src.Ptr() == data.data() + size,
+      ASSERT(end0 != (static_cast<uint32_t>(1) << m_Header.m_BitsPerLevel) - 1 || src.Ptr() == data.data() + size,
              (beg, end, beg0, end0, offset, size, src.Ptr(), data.data()));
     }
     else
diff --git a/libs/indexer/interval_index_builder.hpp b/libs/indexer/interval_index_builder.hpp
index 007b0748e..b88fb7e0e 100644
--- a/libs/indexer/interval_index_builder.hpp
+++ b/libs/indexer/interval_index_builder.hpp
@@ -37,7 +37,8 @@ class IntervalIndexBuilder
 {
 public:
   IntervalIndexBuilder(uint32_t keyBits, uint32_t leafBytes, uint32_t bitsPerLevel = 8)
-    : m_BitsPerLevel(bitsPerLevel), m_LeafBytes(leafBytes)
+    : m_BitsPerLevel(bitsPerLevel)
+    , m_LeafBytes(leafBytes)
   {
     CHECK_GREATER(leafBytes, 0, ());
     CHECK_LESS(keyBits, 63, ());
@@ -134,10 +135,7 @@ public:
         prev = it->GetCell();
       }
       if (maxCount > 0)
-      {
-        LOG(LINFO, ("Most populous cell:", maxCount, mostPopulousCell.GetCell(),
-                    mostPopulousCell.GetValue()));
-      }
+        LOG(LINFO, ("Most populous cell:", maxCount, mostPopulousCell.GetCell(), mostPopulousCell.GetValue()));
     }
 
     uint32_t const keyBits = 8 * m_LeafBytes + m_Levels * m_BitsPerLevel;
@@ -157,7 +155,7 @@ public:
     std::vector<uint8_t> bitmapSerial, listSerial;
     bitmapSerial.reserve(1024);
     listSerial.reserve(1024);
-    PushBackByteSink<std::vector<uint8_t> > bitmapSink(bitmapSerial), listSink(listSerial);
+    PushBackByteSink<std::vector<uint8_t>> bitmapSink(bitmapSerial), listSink(listSerial);
     WriteBitmapNode(bitmapSink, offset, childSizes);
     WriteListNode(listSink, offset, childSizes);
     if (bitmapSerial.size() <= listSerial.size())
@@ -175,9 +173,8 @@ public:
   }
 
   template <class Writer, typename CellIdValueIter>
-  void BuildLevel(Writer & writer, CellIdValueIter const & beg, CellIdValueIter const & end,
-                  int level, uint32_t const * childSizesBeg, uint32_t const * childSizesEnd,
-                  std::vector<uint32_t> & sizes)
+  void BuildLevel(Writer & writer, CellIdValueIter const & beg, CellIdValueIter const & end, int level,
+                  uint32_t const * childSizesBeg, uint32_t const * childSizesEnd, std::vector<uint32_t> & sizes)
   {
     UNUSED_VALUE(childSizesEnd);
     ASSERT_GREATER(level, 0, ());
@@ -200,7 +197,7 @@ public:
       }
 
       nextChildOffset += *childSizesBeg;
-      expandedSizes[key & m_LastBitsMask] +=  *childSizesBeg;
+      expandedSizes[key & m_LastBitsMask] += *childSizesBeg;
       ++childSizesBeg;
       prevKey = key;
     }
@@ -275,8 +272,7 @@ private:
 };
 
 template <class Writer, typename CellIdValueIter>
-void BuildIntervalIndex(CellIdValueIter const & beg, CellIdValueIter const & end, Writer & writer,
-                        uint32_t keyBits)
+void BuildIntervalIndex(CellIdValueIter const & beg, CellIdValueIter const & end, Writer & writer, uint32_t keyBits)
 {
   IntervalIndexBuilder(keyBits, 1).BuildIndex(writer, beg, end);
 }
diff --git a/libs/indexer/isolines_info.cpp b/libs/indexer/isolines_info.cpp
index 757cf3061..9340228ad 100644
--- a/libs/indexer/isolines_info.cpp
+++ b/libs/indexer/isolines_info.cpp
@@ -6,8 +6,7 @@
 
 namespace isolines
 {
-bool LoadIsolinesInfo(DataSource const & dataSource, MwmSet::MwmId const & mwmId,
-                      IsolinesInfo & info)
+bool LoadIsolinesInfo(DataSource const & dataSource, MwmSet::MwmId const & mwmId, IsolinesInfo & info)
 {
   auto const handle = dataSource.GetMwmHandleById(mwmId);
 
diff --git a/libs/indexer/isolines_info.hpp b/libs/indexer/isolines_info.hpp
index aa068331a..994a896bd 100644
--- a/libs/indexer/isolines_info.hpp
+++ b/libs/indexer/isolines_info.hpp
@@ -52,9 +52,9 @@ enum class Version : uint8_t
 class Serializer
 {
 public:
-  explicit Serializer(IsolinesInfo && info): m_info(info) {}
+  explicit Serializer(IsolinesInfo && info) : m_info(info) {}
 
-  template<typename Sink>
+  template <typename Sink>
   void Serialize(Sink & sink)
   {
     WriteToSink(sink, static_cast<std::underlying_type_t<Version>>(Version::Latest));
@@ -70,14 +70,13 @@ private:
 class Deserializer
 {
 public:
-  explicit Deserializer(IsolinesInfo & info): m_info(info) {}
+  explicit Deserializer(IsolinesInfo & info) : m_info(info) {}
 
-  template<typename Reader>
+  template <typename Reader>
   bool Deserialize(Reader & reader)
   {
     NonOwningReaderSource source(reader);
-    auto const version = static_cast<Version>(
-        ReadPrimitiveFromSource<std::underlying_type_t<Version>>(source));
+    auto const version = static_cast<Version>(ReadPrimitiveFromSource<std::underlying_type_t<Version>>(source));
 
     auto subReader = reader.CreateSubReader(source.Pos(), source.Size());
     CHECK(subReader, ());
@@ -92,7 +91,7 @@ public:
   }
 
 private:
-  template<typename Reader>
+  template <typename Reader>
   bool DeserializeV0(Reader & reader)
   {
     NonOwningReaderSource source(reader);
@@ -105,6 +104,5 @@ private:
   IsolinesInfo & m_info;
 };
 
-bool LoadIsolinesInfo(DataSource const & dataSource, MwmSet::MwmId const & mwmId,
-                      IsolinesInfo & info);
+bool LoadIsolinesInfo(DataSource const & dataSource, MwmSet::MwmId const & mwmId, IsolinesInfo & info);
 }  // namespace isolines
diff --git a/libs/indexer/map_object.cpp b/libs/indexer/map_object.cpp
index 05ae0b501..b3315a563 100644
--- a/libs/indexer/map_object.cpp
+++ b/libs/indexer/map_object.cpp
@@ -7,9 +7,9 @@
 
 #include "geometry/mercator.hpp"
 
+#include "platform/distance.hpp"
 #include "platform/localization.hpp"
 #include "platform/measurement_utils.hpp"
-#include "platform/distance.hpp"
 
 #include "base/logging.hpp"
 #include "base/string_utils.hpp"
@@ -25,10 +25,7 @@ void MapObject::SetFromFeatureType(FeatureType & ft)
 
   Classificator const & cl = classif();
   m_types = feature::TypesHolder(ft);
-  m_types.RemoveIf([&cl](uint32_t t)
-  {
-    return !cl.IsTypeValid(t);
-  });
+  m_types.RemoveIf([&cl](uint32_t t) { return !cl.IsTypeValid(t); });
   // Actually, we can't select object on map with invalid (non-drawable or deprecated) type.
   // TODO: in android prod a user will see an "empty" PP if a spot is selected in old mwm
   // where a deprecated feature was; and could crash if play with routing to it, bookmarking it..
@@ -49,7 +46,7 @@ void MapObject::SetFromFeatureType(FeatureType & ft)
     assign_range(m_triangles, ft.GetTrianglesAsPoints(FeatureType::BEST_GEOMETRY));
   else if (m_geomType == feature::GeomType::Line)
     assign_range(m_points, ft.GetPoints(FeatureType::BEST_GEOMETRY));
-    
+
   // Fill runtime metadata
   m_metadata.Set(feature::Metadata::EType::FMD_WHEELCHAIR, feature::GetReadableWheelchairType(m_types));
 
@@ -59,12 +56,30 @@ void MapObject::SetFromFeatureType(FeatureType & ft)
 #endif
 }
 
-FeatureID const & MapObject::GetID() const { return m_featureID; }
-ms::LatLon MapObject::GetLatLon() const { return mercator::ToLatLon(m_mercator); }
-m2::PointD const & MapObject::GetMercator() const { return m_mercator; }
-vector<m2::PointD> const & MapObject::GetTriangesAsPoints() const { return m_triangles; }
-vector<m2::PointD> const & MapObject::GetPoints() const { return m_points; }
-feature::TypesHolder const & MapObject::GetTypes() const { return m_types; }
+FeatureID const & MapObject::GetID() const
+{
+  return m_featureID;
+}
+ms::LatLon MapObject::GetLatLon() const
+{
+  return mercator::ToLatLon(m_mercator);
+}
+m2::PointD const & MapObject::GetMercator() const
+{
+  return m_mercator;
+}
+vector<m2::PointD> const & MapObject::GetTriangesAsPoints() const
+{
+  return m_triangles;
+}
+vector<m2::PointD> const & MapObject::GetPoints() const
+{
+  return m_points;
+}
+feature::TypesHolder const & MapObject::GetTypes() const
+{
+  return m_types;
+}
 
 string_view MapObject::GetDefaultName() const
 {
@@ -78,7 +93,10 @@ StringUtf8Multilang const & MapObject::GetNameMultilang() const
   return m_name;
 }
 
-string const & MapObject::GetHouseNumber() const { return m_houseNumber; }
+string const & MapObject::GetHouseNumber() const
+{
+  return m_houseNumber;
+}
 
 std::string_view MapObject::GetPostcode() const
 {
@@ -117,22 +135,22 @@ std::string MapObject::GetLocalizedAllTypes(bool withMainType) const
     // Ignore types that are not POI
     if (!isMainType && !isPoi(type))
       continue;
-      
+
     // Ignore general amenity
     if (!isMainType && amenityChecker.GetType() == type)
       continue;
-      
+
     isMainType = false;
-    
+
     // Add fields separator between types
     if (isFirst)
       isFirst = false;
     else
       oss << feature::kFieldsSeparator;
-    
+
     oss << platform::GetLocalizedTypeName(classif().GetReadableObjectName(type));
   }
-  
+
   return oss.str();
 }
 
@@ -146,7 +164,7 @@ std::string MapObject::GetAllReadableTypes() const
 
   for (auto const type : copy)
     oss << classif().GetReadableObjectName(type) << feature::kFieldsSeparator;
-  
+
   return oss.str();
 }
 
@@ -165,14 +183,20 @@ feature::Internet MapObject::GetInternet() const
   return feature::InternetFromString(m_metadata.Get(MetadataID::FMD_INTERNET));
 }
 
-vector<string> MapObject::GetCuisines() const { return feature::GetCuisines(m_types); }
+vector<string> MapObject::GetCuisines() const
+{
+  return feature::GetCuisines(m_types);
+}
 
 vector<string> MapObject::GetLocalizedCuisines() const
 {
   return feature::GetLocalizedCuisines(m_types);
 }
 
-vector<string> MapObject::GetRecyclingTypes() const { return feature::GetRecyclingTypes(m_types); }
+vector<string> MapObject::GetRecyclingTypes() const
+{
+  return feature::GetRecyclingTypes(m_types);
+}
 
 vector<string> MapObject::GetLocalizedRecyclingTypes() const
 {
@@ -218,8 +242,17 @@ int MapObject::GetStars() const
   return count;
 }
 
-bool MapObject::IsPointType() const { return m_geomType == feature::GeomType::Point; }
-bool MapObject::IsBuilding() const { return ftypes::IsBuildingChecker::Instance()(m_types); }
-bool MapObject::IsPublicTransportStop() const { return ftypes::IsPublicTransportStopChecker::Instance()(m_types); }
+bool MapObject::IsPointType() const
+{
+  return m_geomType == feature::GeomType::Point;
+}
+bool MapObject::IsBuilding() const
+{
+  return ftypes::IsBuildingChecker::Instance()(m_types);
+}
+bool MapObject::IsPublicTransportStop() const
+{
+  return ftypes::IsPublicTransportStopChecker::Instance()(m_types);
+}
 
 }  // namespace osm
diff --git a/libs/indexer/map_object.hpp b/libs/indexer/map_object.hpp
index 7c765ad80..aa34e429f 100644
--- a/libs/indexer/map_object.hpp
+++ b/libs/indexer/map_object.hpp
@@ -44,7 +44,8 @@ public:
 
   std::string_view GetMetadata(MetadataID type) const;
 
-  template <class FnT> void ForEachMetadataReadable(FnT && fn) const
+  template <class FnT>
+  void ForEachMetadataReadable(FnT && fn) const
   {
     m_metadata.ForEach([&fn](MetadataID id, std::string const & value)
     {
@@ -58,8 +59,7 @@ public:
       case MetadataID::FMD_CUSTOM_IDS:
       case MetadataID::FMD_PRICE_RATES:
       case MetadataID::FMD_RATINGS:
-      case MetadataID::FMD_EXTERNAL_URI:
-        break;
+      case MetadataID::FMD_EXTERNAL_URI: break;
       default: fn(id, value); break;
       }
     });
@@ -92,8 +92,8 @@ public:
   /// @}
 
   bool IsPointType() const;
-  feature::GeomType GetGeomType() const { return m_geomType; };
-  int8_t GetLayer() const { return m_layer; };
+  feature::GeomType GetGeomType() const { return m_geomType; }
+  int8_t GetLayer() const { return m_layer; }
 
   /// @returns true if object is of building type.
   bool IsBuilding() const;
@@ -105,14 +105,14 @@ public:
 
   /// @returns all localized POI types separated by kFieldsSeparator to display in UI.
   std::string GetLocalizedAllTypes(bool withMainType) const;
-    
+
 protected:
   /// @returns "the best" single type to display in UI.
   std::string GetLocalizedType() const;
 
   /// @returns all readable internal types separated by kFieldsSeparator for debugging.
   std::string GetAllReadableTypes() const;
-    
+
   FeatureID m_featureID;
   m2::PointD m_mercator;
 
diff --git a/libs/indexer/map_style.cpp b/libs/indexer/map_style.cpp
index 6753f8a67..b64e8cf32 100644
--- a/libs/indexer/map_style.cpp
+++ b/libs/indexer/map_style.cpp
@@ -27,23 +27,15 @@ std::string MapStyleToString(MapStyle mapStyle)
 {
   switch (mapStyle)
   {
-  case MapStyleDefaultDark:
-    return "MapStyleDefaultDark";
-  case MapStyleDefaultLight:
-    return "MapStyleDefaultLight";
-  case MapStyleMerged:
-    return "MapStyleMerged";
-  case MapStyleVehicleDark:
-    return "MapStyleVehicleDark";
-  case MapStyleVehicleLight:
-    return "MapStyleVehicleLight";
-  case MapStyleOutdoorsDark:
-    return "MapStyleOutdoorsDark";
-  case MapStyleOutdoorsLight:
-    return "MapStyleOutdoorsLight";
+  case MapStyleDefaultDark: return "MapStyleDefaultDark";
+  case MapStyleDefaultLight: return "MapStyleDefaultLight";
+  case MapStyleMerged: return "MapStyleMerged";
+  case MapStyleVehicleDark: return "MapStyleVehicleDark";
+  case MapStyleVehicleLight: return "MapStyleVehicleLight";
+  case MapStyleOutdoorsDark: return "MapStyleOutdoorsDark";
+  case MapStyleOutdoorsLight: return "MapStyleOutdoorsLight";
 
-  case MapStyleCount:
-    break;
+  case MapStyleCount: break;
   }
   ASSERT(false, ());
   return std::string();
@@ -54,14 +46,11 @@ std::string DebugPrint(MapStyle mapStyle)
   return MapStyleToString(mapStyle);
 }
 
-
 bool MapStyleIsDark(MapStyle mapStyle)
 {
-  for (const auto darkStyle : {MapStyleDefaultDark, MapStyleVehicleDark, MapStyleOutdoorsDark})
-  {
+  for (auto const darkStyle : {MapStyleDefaultDark, MapStyleVehicleDark, MapStyleOutdoorsDark})
     if (mapStyle == darkStyle)
       return true;
-  }
   return false;
 }
 
@@ -72,15 +61,10 @@ MapStyle GetDarkMapStyleVariant(MapStyle mapStyle)
 
   switch (mapStyle)
   {
-  case MapStyleDefaultLight:
-    return MapStyleDefaultDark;
-  case MapStyleVehicleLight:
-    return MapStyleVehicleDark;
-  case MapStyleOutdoorsLight:
-    return MapStyleOutdoorsDark;
-  default:
-    CHECK(false, ());
-    return MapStyleDefaultDark;
+  case MapStyleDefaultLight: return MapStyleDefaultDark;
+  case MapStyleVehicleLight: return MapStyleVehicleDark;
+  case MapStyleOutdoorsLight: return MapStyleOutdoorsDark;
+  default: CHECK(false, ()); return MapStyleDefaultDark;
   }
 }
 
@@ -91,14 +75,9 @@ MapStyle GetLightMapStyleVariant(MapStyle mapStyle)
 
   switch (mapStyle)
   {
-  case MapStyleDefaultDark:
-    return MapStyleDefaultLight;
-  case MapStyleVehicleDark:
-    return MapStyleVehicleLight;
-  case MapStyleOutdoorsDark:
-    return MapStyleOutdoorsLight;
-  default:
-    CHECK(false, ());
-    return MapStyleDefaultLight;
+  case MapStyleDefaultDark: return MapStyleDefaultLight;
+  case MapStyleVehicleDark: return MapStyleVehicleLight;
+  case MapStyleOutdoorsDark: return MapStyleOutdoorsLight;
+  default: CHECK(false, ()); return MapStyleDefaultLight;
   }
 }
diff --git a/libs/indexer/map_style_reader.cpp b/libs/indexer/map_style_reader.cpp
index cc0f98550..f7db3652a 100644
--- a/libs/indexer/map_style_reader.cpp
+++ b/libs/indexer/map_style_reader.cpp
@@ -20,7 +20,7 @@ std::string const kStylesOverrideDir = "styles";
 
 #ifdef BUILD_DESIGNER
 std::string const kSuffixDesignTool = "_design";
-#endif // BUILD_DESIGNER
+#endif  // BUILD_DESIGNER
 
 std::string GetStyleRulesSuffix(MapStyle mapStyle)
 {
@@ -29,27 +29,19 @@ std::string GetStyleRulesSuffix(MapStyle mapStyle)
 #else
   switch (mapStyle)
   {
-  case MapStyleDefaultDark:
-    return kSuffixDefaultDark;
-  case MapStyleDefaultLight:
-    return kSuffixDefaultLight;
-  case MapStyleVehicleDark:
-    return kSuffixVehicleDark;
-  case MapStyleVehicleLight:
-    return kSuffixVehicleLight;
-  case MapStyleOutdoorsLight:
-    return kSuffixOutdoorsLight;
-  case MapStyleOutdoorsDark:
-    return kSuffixOutdoorsDark;
-  case MapStyleMerged:
-    return {};
+  case MapStyleDefaultDark: return kSuffixDefaultDark;
+  case MapStyleDefaultLight: return kSuffixDefaultLight;
+  case MapStyleVehicleDark: return kSuffixVehicleDark;
+  case MapStyleVehicleLight: return kSuffixVehicleLight;
+  case MapStyleOutdoorsLight: return kSuffixOutdoorsLight;
+  case MapStyleOutdoorsDark: return kSuffixOutdoorsDark;
+  case MapStyleMerged: return {};
 
-  case MapStyleCount:
-    break;
+  case MapStyleCount: break;
   }
   LOG(LWARNING, ("Unknown map style", mapStyle));
   return kSuffixDefaultLight;
-#endif // BUILD_DESIGNER
+#endif  // BUILD_DESIGNER
 }
 
 std::string GetStyleResourcesSuffix(MapStyle mapStyle)
@@ -63,27 +55,21 @@ std::string GetStyleResourcesSuffix(MapStyle mapStyle)
   {
   case MapStyleDefaultDark:
   case MapStyleVehicleDark:
-  case MapStyleOutdoorsDark:
-    return kSuffixDark;
+  case MapStyleOutdoorsDark: return kSuffixDark;
   case MapStyleDefaultLight:
   case MapStyleVehicleLight:
-  case MapStyleOutdoorsLight:
-    return kSuffixLight;
-  case MapStyleMerged:
-    return {};
+  case MapStyleOutdoorsLight: return kSuffixLight;
+  case MapStyleMerged: return {};
 
-  case MapStyleCount:
-    break;
+  case MapStyleCount: break;
   }
   LOG(LWARNING, ("Unknown map style", mapStyle));
   return kSuffixLight;
-#endif // BUILD_DESIGNER
+#endif  // BUILD_DESIGNER
 }
 }  // namespace
 
-StyleReader::StyleReader()
-  : m_mapStyle(kDefaultMapStyle)
-{}
+StyleReader::StyleReader() : m_mapStyle(kDefaultMapStyle) {}
 
 void StyleReader::SetCurrentStyle(MapStyle mapStyle)
 {
@@ -97,17 +83,14 @@ MapStyle StyleReader::GetCurrentStyle() const
 
 bool StyleReader::IsCarNavigationStyle() const
 {
-  return m_mapStyle == MapStyle::MapStyleVehicleLight ||
-         m_mapStyle == MapStyle::MapStyleVehicleDark;
+  return m_mapStyle == MapStyle::MapStyleVehicleLight || m_mapStyle == MapStyle::MapStyleVehicleDark;
 }
 
 ReaderPtr<Reader> StyleReader::GetDrawingRulesReader() const
 {
-  std::string rulesFile =
-      std::string("drules_proto") + GetStyleRulesSuffix(GetCurrentStyle()) + ".bin";
+  std::string rulesFile = std::string("drules_proto") + GetStyleRulesSuffix(GetCurrentStyle()) + ".bin";
 
-  auto overriddenRulesFile =
-      base::JoinPath(GetPlatform().WritableDir(), kStylesOverrideDir, rulesFile);
+  auto overriddenRulesFile = base::JoinPath(GetPlatform().WritableDir(), kStylesOverrideDir, rulesFile);
   if (Platform::IsFileExistsByFullPath(overriddenRulesFile))
     rulesFile = overriddenRulesFile;
 
@@ -119,10 +102,10 @@ ReaderPtr<Reader> StyleReader::GetDrawingRulesReader() const
 #endif
 }
 
-ReaderPtr<Reader> StyleReader::GetResourceReader(std::string const & file,
-                                                 std::string_view density) const
+ReaderPtr<Reader> StyleReader::GetResourceReader(std::string const & file, std::string_view density) const
 {
-  std::string resFile = base::JoinPath("symbols", std::string{density}, GetStyleResourcesSuffix(GetCurrentStyle()), file);
+  std::string resFile =
+      base::JoinPath("symbols", std::string{density}, GetStyleResourcesSuffix(GetCurrentStyle()), file);
 
   auto overriddenResFile = base::JoinPath(GetPlatform().WritableDir(), kStylesOverrideDir, resFile);
   if (GetPlatform().IsFileExistsByFullPath(overriddenResFile))
diff --git a/libs/indexer/metadata_serdes.cpp b/libs/indexer/metadata_serdes.cpp
index 543d63ac1..19b0cc411 100644
--- a/libs/indexer/metadata_serdes.cpp
+++ b/libs/indexer/metadata_serdes.cpp
@@ -62,20 +62,17 @@ unique_ptr<MetadataDeserializer> MetadataDeserializer::Load(Reader & reader)
   Header header;
   header.Read(reader);
 
-  deserializer->m_stringsSubreader =
-      reader.CreateSubReader(header.m_stringsOffset, header.m_stringsSize);
+  deserializer->m_stringsSubreader = reader.CreateSubReader(header.m_stringsOffset, header.m_stringsSize);
   if (!deserializer->m_stringsSubreader)
     return {};
   deserializer->m_strings.InitializeIfNeeded(*deserializer->m_stringsSubreader);
 
-  deserializer->m_mapSubreader =
-      reader.CreateSubReader(header.m_metadataMapOffset, header.m_metadataMapSize);
+  deserializer->m_mapSubreader = reader.CreateSubReader(header.m_metadataMapOffset, header.m_metadataMapSize);
   if (!deserializer->m_mapSubreader)
     return {};
 
   // Decodes block encoded by writeBlockCallback from MetadataBuilder::Freeze.
-  auto const readBlockCallback = [&](NonOwningReaderSource & source, uint32_t blockSize,
-                                     vector<MetaIds> & values)
+  auto const readBlockCallback = [&](NonOwningReaderSource & source, uint32_t blockSize, vector<MetaIds> & values)
   {
     values.resize(blockSize);
     for (size_t i = 0; i < blockSize && source.Size() > 0; ++i)
@@ -156,13 +153,13 @@ void MetadataBuilder::Freeze(Writer & writer) const
     // stringsWriter destructor writes strings section index right after strings.
   }
 
-  header.m_stringsSize =
-      base::asserted_cast<uint32_t>(writer.Pos() - header.m_stringsOffset - startOffset);
+  header.m_stringsSize = base::asserted_cast<uint32_t>(writer.Pos() - header.m_stringsOffset - startOffset);
   bytesWritten = writer.Pos();
   coding::WritePadding(writer, bytesWritten);
 
   header.m_metadataMapOffset = base::asserted_cast<uint32_t>(writer.Pos() - startOffset);
-  auto const writeBlockCallback = [](auto & w, auto begin, auto end) {
+  auto const writeBlockCallback = [](auto & w, auto begin, auto end)
+  {
     for (auto it = begin; it != end; ++it)
     {
       MetadataDeserializer::MetaIds const & metaIds = *it;
@@ -173,16 +170,12 @@ void MetadataBuilder::Freeze(Writer & writer) const
 
       WriteVarUint(w, metaIds[0].second);
       for (size_t i = 1; i < it->size(); ++i)
-      {
-        WriteVarInt(w, static_cast<int32_t>(metaIds[i].second) -
-                           static_cast<int32_t>(metaIds[i - 1].second));
-      }
+        WriteVarInt(w, static_cast<int32_t>(metaIds[i].second) - static_cast<int32_t>(metaIds[i - 1].second));
     }
   };
   m_builder.Freeze(writer, writeBlockCallback);
 
-  header.m_metadataMapSize =
-      base::asserted_cast<uint32_t>(writer.Pos() - header.m_metadataMapOffset - startOffset);
+  header.m_metadataMapSize = base::asserted_cast<uint32_t>(writer.Pos() - header.m_metadataMapOffset - startOffset);
 
   auto const endOffset = writer.Pos();
   writer.Seek(startOffset);
diff --git a/libs/indexer/mwm_set.cpp b/libs/indexer/mwm_set.cpp
index 66b0a6896..8a29ec3b1 100644
--- a/libs/indexer/mwm_set.cpp
+++ b/libs/indexer/mwm_set.cpp
@@ -16,7 +16,6 @@
 #include <exception>
 #include <sstream>
 
-
 using namespace std;
 using platform::CountryFile;
 using platform::LocalCountryFile;
@@ -36,7 +35,7 @@ MwmInfo::MwmTypeT MwmInfo::GetType() const
 bool MwmSet::MwmId::IsDeregistered(platform::LocalCountryFile const & deregisteredCountryFile) const
 {
   return m_info && m_info->GetStatus() == MwmInfo::STATUS_DEREGISTERED &&
-    m_info->GetLocalFile() == deregisteredCountryFile;
+         m_info->GetLocalFile() == deregisteredCountryFile;
 }
 
 string DebugPrint(MwmSet::MwmId const & id)
@@ -51,14 +50,16 @@ string DebugPrint(MwmSet::MwmId const & id)
 
 MwmSet::MwmHandle::MwmHandle() : m_mwmSet(nullptr), m_value(nullptr) {}
 
-MwmSet::MwmHandle::MwmHandle(MwmSet & mwmSet, MwmId const & mwmId,
-                             unique_ptr<MwmValue> && value)
-  : m_mwmId(mwmId), m_mwmSet(&mwmSet), m_value(std::move(value))
-{
-}
+MwmSet::MwmHandle::MwmHandle(MwmSet & mwmSet, MwmId const & mwmId, unique_ptr<MwmValue> && value)
+  : m_mwmId(mwmId)
+  , m_mwmSet(&mwmSet)
+  , m_value(std::move(value))
+{}
 
 MwmSet::MwmHandle::MwmHandle(MwmHandle && handle)
-  : m_mwmId(std::move(handle.m_mwmId)), m_mwmSet(handle.m_mwmSet), m_value(std::move(handle.m_value))
+  : m_mwmId(std::move(handle.m_mwmId))
+  , m_mwmSet(handle.m_mwmSet)
+  , m_value(std::move(handle.m_value))
 {
   handle.m_mwmSet = nullptr;
   handle.m_mwmId.Reset();
@@ -139,8 +140,7 @@ pair<MwmSet::MwmId, MwmSet::RegResult> MwmSet::Register(LocalCountryFile const &
   return result;
 }
 
-pair<MwmSet::MwmId, MwmSet::RegResult> MwmSet::RegisterImpl(LocalCountryFile const & localFile,
-                                                            EventList & events)
+pair<MwmSet::MwmId, MwmSet::RegResult> MwmSet::RegisterImpl(LocalCountryFile const & localFile, EventList & events)
 {
   // This function can throw an exception for a bad mwm file.
   shared_ptr<MwmInfo> info(CreateInfo(localFile));
@@ -183,10 +183,7 @@ bool MwmSet::DeregisterImpl(MwmId const & id, EventList & events)
 bool MwmSet::Deregister(CountryFile const & countryFile)
 {
   bool deregistered = false;
-  WithEventLog([&](EventList & events)
-               {
-                 deregistered = DeregisterImpl(countryFile, events);
-               });
+  WithEventLog([&](EventList & events) { deregistered = DeregisterImpl(countryFile, events); });
   return deregistered;
 }
 
@@ -214,10 +211,8 @@ void MwmSet::GetMwmsInfo(vector<shared_ptr<MwmInfo>> & info) const
   info.clear();
   info.reserve(m_info.size());
   for (auto const & p : m_info)
-  {
     if (!p.second.empty())
       info.push_back(p.second.back());
-  }
 }
 
 void MwmSet::SetStatus(MwmInfo & info, MwmInfo::Status status, EventList & events)
@@ -228,14 +223,9 @@ void MwmSet::SetStatus(MwmInfo & info, MwmInfo::Status status, EventList & event
 
   switch (status)
   {
-  case MwmInfo::STATUS_REGISTERED:
-    events.Add(Event(Event::TYPE_REGISTERED, info.GetLocalFile()));
-    break;
-  case MwmInfo::STATUS_MARKED_TO_DEREGISTER:
-    break;
-  case MwmInfo::STATUS_DEREGISTERED:
-    events.Add(Event(Event::TYPE_DEREGISTERED, info.GetLocalFile()));
-    break;
+  case MwmInfo::STATUS_REGISTERED: events.Add(Event(Event::TYPE_REGISTERED, info.GetLocalFile())); break;
+  case MwmInfo::STATUS_MARKED_TO_DEREGISTER: break;
+  case MwmInfo::STATUS_DEREGISTERED: events.Add(Event(Event::TYPE_DEREGISTERED, info.GetLocalFile())); break;
   }
 }
 
@@ -245,12 +235,8 @@ void MwmSet::ProcessEventList(EventList & events)
   {
     switch (event.m_type)
     {
-    case Event::TYPE_REGISTERED:
-      m_observers.ForEach(&Observer::OnMapRegistered, event.m_file);
-      break;
-    case Event::TYPE_DEREGISTERED:
-      m_observers.ForEach(&Observer::OnMapDeregistered, event.m_file);
-      break;
+    case Event::TYPE_REGISTERED: m_observers.ForEach(&Observer::OnMapRegistered, event.m_file); break;
+    case Event::TYPE_DEREGISTERED: m_observers.ForEach(&Observer::OnMapDeregistered, event.m_file); break;
     }
   }
 }
@@ -258,10 +244,7 @@ void MwmSet::ProcessEventList(EventList & events)
 unique_ptr<MwmValue> MwmSet::LockValue(MwmId const & id)
 {
   unique_ptr<MwmValue> result;
-  WithEventLog([&](EventList & events)
-               {
-                 result = LockValueImpl(id, events);
-               });
+  WithEventLog([&](EventList & events) { result = LockValueImpl(id, events); });
   return result;
 }
 
@@ -273,7 +256,7 @@ unique_ptr<MwmValue> MwmSet::LockValueImpl(MwmId const & id, EventList & events)
 
   // It's better to return valid "value pointer" even for "out-of-date" files,
   // because they can be locked for a long time by other algos.
-  //if (!info->IsUpToDate())
+  // if (!info->IsUpToDate())
   //  return TMwmValuePtr();
 
   ++info->m_numRefs;
@@ -311,10 +294,7 @@ unique_ptr<MwmValue> MwmSet::LockValueImpl(MwmId const & id, EventList & events)
 
 void MwmSet::UnlockValue(MwmId const & id, unique_ptr<MwmValue> p)
 {
-  WithEventLog([&](EventList & events)
-               {
-                 UnlockValueImpl(id, std::move(p), events);
-               });
+  WithEventLog([&](EventList & events) { UnlockValueImpl(id, std::move(p), events); });
 }
 
 void MwmSet::UnlockValueImpl(MwmId const & id, unique_ptr<MwmValue> p, EventList & events)
@@ -368,19 +348,14 @@ MwmSet::MwmHandle MwmSet::GetMwmHandleByCountryFile(CountryFile const & countryF
 {
   MwmSet::MwmHandle handle;
   WithEventLog([&](EventList & events)
-               {
-                 handle = GetMwmHandleByIdImpl(GetMwmIdByCountryFileImpl(countryFile), events);
-               });
+  { handle = GetMwmHandleByIdImpl(GetMwmIdByCountryFileImpl(countryFile), events); });
   return handle;
 }
 
 MwmSet::MwmHandle MwmSet::GetMwmHandleById(MwmId const & id)
 {
   MwmSet::MwmHandle handle;
-  WithEventLog([&](EventList & events)
-               {
-                 handle = GetMwmHandleByIdImpl(id, events);
-               });
+  WithEventLog([&](EventList & events) { handle = GetMwmHandleByIdImpl(id, events); });
   return handle;
 }
 
@@ -392,21 +367,22 @@ MwmSet::MwmHandle MwmSet::GetMwmHandleByIdImpl(MwmId const & id, EventList & eve
   return MwmHandle(*this, id, std::move(value));
 }
 
-void MwmSet::ClearCacheImpl(Cache::iterator beg, Cache::iterator end) { m_cache.erase(beg, end); }
+void MwmSet::ClearCacheImpl(Cache::iterator beg, Cache::iterator end)
+{
+  m_cache.erase(beg, end);
+}
 
 void MwmSet::ClearCache(MwmId const & id)
 {
-  auto sameId = [&id](pair<MwmSet::MwmId, unique_ptr<MwmValue>> const & p)
-  {
-    return (p.first == id);
-  };
+  auto sameId = [&id](pair<MwmSet::MwmId, unique_ptr<MwmValue>> const & p) { return (p.first == id); };
   ClearCacheImpl(base::RemoveIfKeepValid(m_cache.begin(), m_cache.end(), sameId), m_cache.end());
 }
 
 // MwmValue ----------------------------------------------------------------------------------------
 
 MwmValue::MwmValue(LocalCountryFile const & localFile)
-  : m_cont(platform::GetCountryReader(localFile, MapFileType::Map)), m_file(localFile)
+  : m_cont(platform::GetCountryReader(localFile, MapFileType::Map))
+  , m_file(localFile)
 {
   m_factory.Load(m_cont);
 }
@@ -425,16 +401,11 @@ string DebugPrint(MwmSet::RegResult result)
 {
   switch (result)
   {
-    case MwmSet::RegResult::Success:
-      return "Success";
-    case MwmSet::RegResult::VersionAlreadyExists:
-      return "VersionAlreadyExists";
-    case MwmSet::RegResult::VersionTooOld:
-      return "VersionTooOld";
-    case MwmSet::RegResult::BadFile:
-      return "BadFile";
-    case MwmSet::RegResult::UnsupportedFileFormat:
-      return "UnsupportedFileFormat";
+  case MwmSet::RegResult::Success: return "Success";
+  case MwmSet::RegResult::VersionAlreadyExists: return "VersionAlreadyExists";
+  case MwmSet::RegResult::VersionTooOld: return "VersionTooOld";
+  case MwmSet::RegResult::BadFile: return "BadFile";
+  case MwmSet::RegResult::UnsupportedFileFormat: return "UnsupportedFileFormat";
   }
   UNREACHABLE();
 }
@@ -443,8 +414,8 @@ string DebugPrint(MwmSet::Event::Type type)
 {
   switch (type)
   {
-    case MwmSet::Event::TYPE_REGISTERED: return "Registered";
-    case MwmSet::Event::TYPE_DEREGISTERED: return "Deregistered";
+  case MwmSet::Event::TYPE_REGISTERED: return "Registered";
+  case MwmSet::Event::TYPE_DEREGISTERED: return "Deregistered";
   }
   return "Undefined";
 }
diff --git a/libs/indexer/mwm_set.hpp b/libs/indexer/mwm_set.hpp
index 4c649fae5..d16cd6448 100644
--- a/libs/indexer/mwm_set.hpp
+++ b/libs/indexer/mwm_set.hpp
@@ -21,7 +21,10 @@
 #include <utility>
 #include <vector>
 
-namespace feature { class FeaturesOffsetsTable; }
+namespace feature
+{
+class FeaturesOffsetsTable;
+}
 
 /// Information about stored mwm.
 class MwmInfo
@@ -179,15 +182,12 @@ public:
     };
 
     Event() = default;
-    Event(Type type, platform::LocalCountryFile const & file)
-      : m_type(type), m_file(file)
-    {
-    }
-    Event(Type type, platform::LocalCountryFile const & newFile,
-          platform::LocalCountryFile const & oldFile)
-      : m_type(type), m_file(newFile), m_oldFile(oldFile)
-    {
-    }
+    Event(Type type, platform::LocalCountryFile const & file) : m_type(type), m_file(file) {}
+    Event(Type type, platform::LocalCountryFile const & newFile, platform::LocalCountryFile const & oldFile)
+      : m_type(type)
+      , m_file(newFile)
+      , m_oldFile(oldFile)
+    {}
 
     bool operator==(Event const & rhs) const
     {
@@ -253,9 +253,9 @@ public:
   /// registered file) or when all registered corresponding mwm files
   /// are older than the localFile (in this case mwm handle will point
   /// to just-registered file).
+
 protected:
-  std::pair<MwmId, RegResult> RegisterImpl(platform::LocalCountryFile const & localFile,
-                                           EventList & events);
+  std::pair<MwmId, RegResult> RegisterImpl(platform::LocalCountryFile const & localFile, EventList & events);
 
 public:
   std::pair<MwmId, RegResult> Register(platform::LocalCountryFile const & localFile);
@@ -263,6 +263,7 @@ public:
 
   /// @name Remove mwm.
   //@{
+
 protected:
   /// Deregisters a map from internal records.
   ///
@@ -304,10 +305,7 @@ public:
   /// Now this function looks like workaround, but it allows to avoid ugly const_cast everywhere..
   /// Client code usually holds const reference to DataSource, but implementation is non-const.
   /// @todo Actually, we need to define, is this behaviour (getting Handle) const or non-const.
-  MwmHandle GetMwmHandleById(MwmId const & id) const
-  {
-    return const_cast<MwmSet *>(this)->GetMwmHandleById(id);
-  }
+  MwmHandle GetMwmHandleById(MwmId const & id) const { return const_cast<MwmSet *>(this)->GetMwmHandleById(id); }
 
 protected:
   virtual std::unique_ptr<MwmInfo> CreateInfo(platform::LocalCountryFile const & localFile) const = 0;
@@ -369,7 +367,7 @@ protected:
 
 private:
   base::ObserverListSafe<Observer> m_observers;
-}; // class MwmSet
+};  // class MwmSet
 
 class MwmValue
 {
@@ -385,15 +383,14 @@ public:
   explicit MwmValue(platform::LocalCountryFile const & localFile);
   void SetTable(MwmInfoEx & info);
 
-  feature::DataHeader const & GetHeader() const  { return m_factory.GetHeader(); }
+  feature::DataHeader const & GetHeader() const { return m_factory.GetHeader(); }
   feature::RegionData const & GetRegionData() const { return m_factory.GetRegionData(); }
   version::MwmVersion const & GetMwmVersion() const { return m_factory.GetMwmVersion(); }
   std::string const & GetCountryFileName() const { return m_file.GetCountryName(); }
 
   bool HasSearchIndex() const { return m_cont.IsExist(SEARCH_INDEX_FILE_TAG); }
   bool HasGeometryIndex() const { return m_cont.IsExist(INDEX_FILE_TAG); }
-}; // class MwmValue
-
+};  // class MwmValue
 
 std::string DebugPrint(MwmSet::RegResult result);
 std::string DebugPrint(MwmSet::Event::Type type);
@@ -401,11 +398,9 @@ std::string DebugPrint(MwmSet::Event const & event);
 
 namespace std
 {
-template <> struct hash<MwmSet::MwmId>
+template <>
+struct hash<MwmSet::MwmId>
 {
-  size_t operator()(MwmSet::MwmId const & id) const
-  {
-    return std::hash<std::shared_ptr<MwmInfo>>()(id.GetInfo());
-  }
+  size_t operator()(MwmSet::MwmId const & id) const { return std::hash<std::shared_ptr<MwmInfo>>()(id.GetInfo()); }
 };
 }  // namespace std
diff --git a/libs/indexer/postcodes_matcher.cpp b/libs/indexer/postcodes_matcher.cpp
index 582a05716..72efd67a4 100644
--- a/libs/indexer/postcodes_matcher.cpp
+++ b/libs/indexer/postcodes_matcher.cpp
@@ -26,12 +26,11 @@ namespace
 // search/search_quality/clusterize_postcodes.lisp for details how
 // these patterns were constructed.
 char const * const g_patterns[] = {
-    "aa nnnn",   "aa nnnnn",   "aaa nnnn",    "aan",      "aan naa",  "aana naa", "aann",
-    "aann naa",  "aannaa",     "aannnaa",     "aannnn",   "an naa",   "ana naa",  "ana nan",
-    "ananan",    "ann aann",   "ann naa",     "annnnaaa", "nn nnn",   "nnn",      "nnn nn",
-    "nnn nnn",   "nnn nnnn",   "nnnn",        "nnnn aa",  "nnnn nnn", "nnnnaa",   "nnnnn",
-    "nnnnn nnn", "nnnnn nnnn", "nnnnn nnnnn", "nnnnnn",   "nnnnnnn",  "nnnnnnnn", "〒nnn nnnn",
-    "annnn", "ana aaaa"};
+    "aa nnnn", "aa nnnnn", "aaa nnnn",   "aan",    "aan naa",   "aana naa",   "aann",        "aann naa",
+    "aannaa",  "aannnaa",  "aannnn",     "an naa", "ana naa",   "ana nan",    "ananan",      "ann aann",
+    "ann naa", "annnnaaa", "nn nnn",     "nnn",    "nnn nn",    "nnn nnn",    "nnn nnnn",    "nnnn",
+    "nnnn aa", "nnnn nnn", "nnnnaa",     "nnnnn",  "nnnnn nnn", "nnnnn nnnn", "nnnnn nnnnn", "nnnnnn",
+    "nnnnnnn", "nnnnnnnn", "〒nnn nnnn", "annnn",  "ana aaaa"};
 
 UniChar SimplifyChar(UniChar const & c)
 {
@@ -58,9 +57,8 @@ public:
 
   bool HasString(StringSliceBase const & slice, bool isPrefix) const
   {
-    auto const status =
-        m_strings.Has(make_transform_iterator(JoinIterator::Begin(slice), &SimplifyChar),
-                      make_transform_iterator(JoinIterator::End(slice), &SimplifyChar));
+    auto const status = m_strings.Has(make_transform_iterator(JoinIterator::Begin(slice), &SimplifyChar),
+                                      make_transform_iterator(JoinIterator::End(slice), &SimplifyChar));
     switch (status)
     {
     case TStringSet::Status::Absent: return false;
@@ -109,5 +107,8 @@ bool LooksLikePostcode(string_view sv, bool isPrefix)
   return LooksLikePostcode(StringSlice(tokens), isPrefix && lastTokenIsPrefix);
 }
 
-size_t GetMaxNumTokensInPostcode() { return GetPostcodesMatcher().GetMaxNumTokensInPostcode(); }
-} // namespace search
+size_t GetMaxNumTokensInPostcode()
+{
+  return GetPostcodesMatcher().GetMaxNumTokensInPostcode();
+}
+}  // namespace search
diff --git a/libs/indexer/rank_table.cpp b/libs/indexer/rank_table.cpp
index 82c329364..90bcece6d 100644
--- a/libs/indexer/rank_table.cpp
+++ b/libs/indexer/rank_table.cpp
@@ -5,8 +5,8 @@
 #include "indexer/features_vector.hpp"
 #include "indexer/ftypes_matcher.hpp"
 
-#include "coding/files_container.hpp"
 #include "coding/file_writer.hpp"
+#include "coding/files_container.hpp"
 #include "coding/memory_region.hpp"
 #include "coding/reader.hpp"
 #include "coding/simple_dense_coding.hpp"
@@ -21,7 +21,6 @@
 
 #include "defines.hpp"
 
-
 namespace search
 {
 using namespace std;
@@ -31,8 +30,7 @@ namespace
 size_t constexpr kVersionOffset = 0;
 size_t constexpr kHeaderSize = 8;
 
-unique_ptr<CopiedMemoryRegion> GetMemoryRegionForTag(FilesContainerR const & rcont,
-                                                     FilesContainerBase::Tag const & tag)
+unique_ptr<CopiedMemoryRegion> GetMemoryRegionForTag(FilesContainerR const & rcont, FilesContainerBase::Tag const & tag)
 {
   if (!rcont.IsExist(tag))
     return {};
@@ -66,7 +64,7 @@ public:
   {
     // i can be greater than Size() for features created by user in the Editor.
     // May be there is a better way to inject this code. Without this check search engine crashes here.
-    //ASSERT_LESS(i, Size(), ());
+    // ASSERT_LESS(i, Size(), ());
     if (i >= Size())
       return kNoRank;
 
@@ -88,7 +86,8 @@ public:
   }
 
   // Loads RankTableV0 from a raw memory region.
-  template <class TRegion> static unique_ptr<RankTableV0> Load(unique_ptr<TRegion> && region)
+  template <class TRegion>
+  static unique_ptr<RankTableV0> Load(unique_ptr<TRegion> && region)
   {
     auto table = make_unique<RankTableV0>();
     table->m_region = std::move(region);
@@ -185,8 +184,7 @@ void SearchRankTableBuilder::CalcSearchRanks(FilesContainerR & rcont, vector<uin
   feature::DataHeader header(rcont);
   FeaturesVector featuresVector(rcont, header, nullptr, nullptr);
 
-  featuresVector.ForEach(
-      [&ranks](FeatureType & ft, uint32_t /* index */) { ranks.push_back(CalcSearchRank(ft)); });
+  featuresVector.ForEach([&ranks](FeatureType & ft, uint32_t /* index */) { ranks.push_back(CalcSearchRank(ft)); });
 }
 
 // static
@@ -213,8 +211,7 @@ bool SearchRankTableBuilder::CreateIfNotExists(string const & mapPath) noexcept
 }
 
 // static
-void RankTableBuilder::Create(vector<uint8_t> const & ranks, FilesContainerW & wcont,
-                              string const & sectionName)
+void RankTableBuilder::Create(vector<uint8_t> const & ranks, FilesContainerW & wcont, string const & sectionName)
 {
   RankTableV0 table(ranks);
   SerializeRankTable(table, wcont, sectionName);
diff --git a/libs/indexer/rank_table.hpp b/libs/indexer/rank_table.hpp
index 98151fa26..8398264a5 100644
--- a/libs/indexer/rank_table.hpp
+++ b/libs/indexer/rank_table.hpp
@@ -68,8 +68,7 @@ public:
   // *NOTE* Return value can outlive |rcont|. Also note that there is
   // undefined behaviour if ranks section exists but internally
   // damaged.
-  static std::unique_ptr<RankTable> Load(FilesContainerR const & rcont,
-                                         std::string const & sectionName);
+  static std::unique_ptr<RankTable> Load(FilesContainerR const & rcont, std::string const & sectionName);
 
   // Maps whole section corresponding to a rank table and deserializes
   // it. Returns nullptr if there're no ranks section, rank table's
@@ -80,8 +79,7 @@ public:
   // destructed before |mcont| is closed. Also note that there're
   // undefined behaviour if ranks section exists but internally
   // damaged.
-  static std::unique_ptr<RankTable> Load(FilesMappingContainer const & mcont,
-                                         std::string const & sectionName);
+  static std::unique_ptr<RankTable> Load(FilesMappingContainer const & mcont, std::string const & sectionName);
 };
 
 // A builder class for rank tables.
@@ -91,8 +89,7 @@ public:
   // Force creation of a rank table from array of ranks. Existing rank
   // table is removed (if any). Note that |wcont| must be instantiated
   // as FileWriter::OP_WRITE_EXISTING.
-  static void Create(std::vector<uint8_t> const & ranks, FilesContainerW & wcont,
-                     std::string const & sectionName);
+  static void Create(std::vector<uint8_t> const & ranks, FilesContainerW & wcont, std::string const & sectionName);
 };
 
 class SearchRankTableBuilder
diff --git a/libs/indexer/road_shields_parser.cpp b/libs/indexer/road_shields_parser.cpp
index d79f4c949..e4b000beb 100644
--- a/libs/indexer/road_shields_parser.cpp
+++ b/libs/indexer/road_shields_parser.cpp
@@ -36,12 +36,11 @@ std::array<std::string, 61> const kStatesCode = {{
     "NJ", "NM", "NY", "NC", "ND", "OH", "OK", "OR", "PA", "RI", "SC", "SD", "TN", "TX", "UT",
     "VT", "VA", "WA", "WV", "WI", "WY", "AS", "GU", "MP", "PR", "VI", "UM", "FM", "MH", "PW",
 
-    "SR",   // common prefix for State Road
+    "SR",  // common prefix for State Road
 }};
 
-std::array<std::string, 13> const kModifiers = {{"alt", "alternate", "bus", "business", "bypass",
-                                                 "historic", "connector", "loop", "scenic", "spur",
-                                                 "temporary", "toll", "truck"}};
+std::array<std::string, 13> const kModifiers = {{"alt", "alternate", "bus", "business", "bypass", "historic",
+                                                 "connector", "loop", "scenic", "spur", "temporary", "toll", "truck"}};
 
 // Shields based on a network tag in a route=road relation.
 std::unordered_map<std::string, RoadShieldType> const kRoadNetworkShields = {
@@ -164,9 +163,7 @@ public:
     });
 
     result.erase_if([&defaultShields](RoadShield const & shield)
-    {
-      return std::find(defaultShields.begin(), defaultShields.end(), shield) != defaultShields.end();
-    });
+    { return std::find(defaultShields.begin(), defaultShields.end(), shield) != defaultShields.end(); });
 
     return result;
   }
@@ -267,11 +264,10 @@ public:
 class DefaultTypeRoadShieldParser : public RoadShieldParser
 {
 public:
-  DefaultTypeRoadShieldParser(std::string const & baseRoadNumber,
-                              RoadShieldType const & defaultType)
-    : RoadShieldParser(baseRoadNumber), m_type(defaultType)
-  {
-  }
+  DefaultTypeRoadShieldParser(std::string const & baseRoadNumber, RoadShieldType const & defaultType)
+    : RoadShieldParser(baseRoadNumber)
+    , m_type(defaultType)
+  {}
 
   RoadShield ParseRoadShield(std::string_view rawText) const override
   {
@@ -293,10 +289,7 @@ public:
   struct Entry
   {
     Entry() = default;
-    Entry(std::string_view name, RoadShieldType type)
-      : m_name(name), m_type(type)
-    {
-    }
+    Entry(std::string_view name, RoadShieldType type) : m_name(name), m_type(type) {}
 
     std::string_view m_name;
     RoadShieldType m_type = RoadShieldType::Default;
@@ -306,9 +299,10 @@ public:
 
   SimpleRoadShieldParser(std::string const & baseRoadNumber, ShieldTypes && types,
                          RoadShieldType defaultType = RoadShieldType::Default)
-    : RoadShieldParser(baseRoadNumber), m_types(std::move(types)), m_defaultType(defaultType)
-  {
-  }
+    : RoadShieldParser(baseRoadNumber)
+    , m_types(std::move(types))
+    , m_defaultType(defaultType)
+  {}
 
   RoadShield ParseRoadShield(std::string_view rawText) const override
   {
@@ -327,7 +321,7 @@ public:
       }
     }
 
-    return { type, rawText };
+    return {type, rawText};
   }
 
 private:
@@ -346,10 +340,7 @@ public:
   struct Entry
   {
     Entry() = default;
-    Entry(uint16_t low, uint16_t high, RoadShieldType type)
-      : m_low(low), m_high(high), m_type(type)
-    {
-    }
+    Entry(uint16_t low, uint16_t high, RoadShieldType type) : m_low(low), m_high(high), m_type(type) {}
 
     uint16_t m_low, m_high;
     RoadShieldType m_type = RoadShieldType::Default;
@@ -359,9 +350,9 @@ public:
   using ShieldTypes = buffer_vector<Entry, 8>;
 
   NumericRoadShieldParser(std::string const & baseRoadNumber, ShieldTypes && types)
-    : RoadShieldParser(baseRoadNumber), m_types(std::move(types))
-  {
-  }
+    : RoadShieldParser(baseRoadNumber)
+    , m_types(std::move(types))
+  {}
 
   RoadShield ParseRoadShield(std::string_view rawText) const override
   {
@@ -372,10 +363,8 @@ public:
     if (strings::to_uint(rawText, ref))
     {
       for (auto const & p : m_types)
-      {
         if (p.m_low <= ref && (ref <= p.m_high || p.m_high == kAnyHigherRoadNumber))
           return RoadShield(p.m_type, rawText);
-      }
     }
 
     return RoadShield(RoadShieldType::Default, rawText);
@@ -392,7 +381,9 @@ public:
   {
     Entry() = default;
     Entry(std::string_view simpleName, std::string_view unicodeName, RoadShieldType type)
-      : m_simpleName(simpleName), m_unicodeName(unicodeName), m_type(type)
+      : m_simpleName(simpleName)
+      , m_unicodeName(unicodeName)
+      , m_type(type)
     {
       ASSERT_NOT_EQUAL(simpleName, unicodeName, ());
       ASSERT_LESS_OR_EQUAL(simpleName.size(), unicodeName.size(), ());
@@ -407,9 +398,10 @@ public:
 
   SimpleUnicodeRoadShieldParser(std::string const & baseRoadNumber, ShieldTypes && types,
                                 RoadShieldType defaultType = RoadShieldType::Default)
-    : RoadShieldParser(baseRoadNumber), m_types(std::move(types)), m_defaultType(defaultType)
-  {
-  }
+    : RoadShieldParser(baseRoadNumber)
+    , m_types(std::move(types))
+    , m_defaultType(defaultType)
+  {}
 
   RoadShield ParseRoadShield(std::string_view rawText) const override
   {
@@ -442,8 +434,7 @@ class RussiaRoadShieldParser : public DefaultTypeRoadShieldParser
 public:
   explicit RussiaRoadShieldParser(std::string const & baseRoadNumber)
     : DefaultTypeRoadShieldParser(baseRoadNumber, RoadShieldType::Generic_Blue)
-  {
-  }
+  {}
 };
 
 class SpainRoadShieldParser : public DefaultTypeRoadShieldParser
@@ -451,18 +442,15 @@ class SpainRoadShieldParser : public DefaultTypeRoadShieldParser
 public:
   explicit SpainRoadShieldParser(std::string const & baseRoadNumber)
     : DefaultTypeRoadShieldParser(baseRoadNumber, RoadShieldType::Generic_Blue)
-  {
-  }
+  {}
 };
 
 class UKRoadShieldParser : public SimpleRoadShieldParser
 {
 public:
   explicit UKRoadShieldParser(std::string const & baseRoadNumber)
-    : SimpleRoadShieldParser(baseRoadNumber, {{"M", RoadShieldType::Generic_Blue},
-                                              {"A", RoadShieldType::UK_Highway}})
-  {
-  }
+    : SimpleRoadShieldParser(baseRoadNumber, {{"M", RoadShieldType::Generic_Blue}, {"A", RoadShieldType::UK_Highway}})
+  {}
 };
 
 class FranceRoadShieldParser : public SimpleRoadShieldParser
@@ -474,8 +462,7 @@ public:
                                               {"E", RoadShieldType::Generic_Green},
                                               {"D", RoadShieldType::Generic_Orange},
                                               {"M", RoadShieldType::Generic_Blue}})
-  {
-  }
+  {}
 };
 
 class GermanyRoadShieldParser : public SimpleRoadShieldParser
@@ -486,8 +473,7 @@ public:
                                               {"B", RoadShieldType::Generic_Orange},
                                               {"L", RoadShieldType::Generic_White},
                                               {"K", RoadShieldType::Generic_White}})
-  {
-  }
+  {}
 };
 
 class UkraineRoadShieldParser : public SimpleUnicodeRoadShieldParser
@@ -495,13 +481,11 @@ class UkraineRoadShieldParser : public SimpleUnicodeRoadShieldParser
 public:
   // The second parameter in the constructor is a cyrillic symbol.
   explicit UkraineRoadShieldParser(std::string const & baseRoadNumber)
-    : SimpleUnicodeRoadShieldParser(baseRoadNumber,
-                                    {{"M", "М", RoadShieldType::Generic_Blue},
-                                     {"H", "Н", RoadShieldType::Generic_Blue},
-                                     {"P", "Р", RoadShieldType::Generic_Blue},
-                                     {"E", "Е", RoadShieldType::Generic_Green}})
-  {
-  }
+    : SimpleUnicodeRoadShieldParser(baseRoadNumber, {{"M", "М", RoadShieldType::Generic_Blue},
+                                                     {"H", "Н", RoadShieldType::Generic_Blue},
+                                                     {"P", "Р", RoadShieldType::Generic_Blue},
+                                                     {"E", "Е", RoadShieldType::Generic_Green}})
+  {}
 };
 
 class BelarusRoadShieldParser : public SimpleUnicodeRoadShieldParser
@@ -509,12 +493,10 @@ class BelarusRoadShieldParser : public SimpleUnicodeRoadShieldParser
 public:
   // The second parameter in the constructor is a cyrillic symbol.
   explicit BelarusRoadShieldParser(std::string const & baseRoadNumber)
-    : SimpleUnicodeRoadShieldParser(baseRoadNumber,
-                                    {{"M", "М", RoadShieldType::Generic_Red},
-                                     {"P", "Р", RoadShieldType::Generic_Red},
-                                     {"E", "Е", RoadShieldType::Generic_Green}})
-  {
-  }
+    : SimpleUnicodeRoadShieldParser(baseRoadNumber, {{"M", "М", RoadShieldType::Generic_Red},
+                                                     {"P", "Р", RoadShieldType::Generic_Red},
+                                                     {"E", "Е", RoadShieldType::Generic_Green}})
+  {}
 };
 
 class LatviaRoadShieldParser : public SimpleRoadShieldParser
@@ -524,8 +506,7 @@ public:
     : SimpleRoadShieldParser(baseRoadNumber, {{"A", RoadShieldType::Generic_Red},
                                               {"E", RoadShieldType::Generic_Green},
                                               {"P", RoadShieldType::Generic_Blue}})
-  {
-  }
+  {}
 };
 
 class NetherlandsRoadShieldParser : public SimpleRoadShieldParser
@@ -535,8 +516,7 @@ public:
     : SimpleRoadShieldParser(baseRoadNumber, {{"A", RoadShieldType::Generic_Red},
                                               {"E", RoadShieldType::Generic_Green},
                                               {"N", RoadShieldType::Generic_Orange}})
-  {
-  }
+  {}
 };
 
 class FinlandRoadShieldParser : public NumericRoadShieldParser
@@ -548,8 +528,7 @@ public:
                                                {100, 999, RoadShieldType::Generic_White},
                                                {1000, 9999, RoadShieldType::Generic_Blue},
                                                {10000, kAnyHigherRoadNumber, RoadShieldType::Hidden}})
-  {
-  }
+  {}
 };
 
 class EstoniaRoadShieldParser : public NumericRoadShieldParser
@@ -562,48 +541,43 @@ public:
                                                {93, 95, RoadShieldType::Generic_Orange},
                                                {96, 999, RoadShieldType::Generic_White},
                                                {1000, kAnyHigherRoadNumber, RoadShieldType::Hidden}})
-  {
-  }
+  {}
 };
 
 class MalaysiaRoadShieldParser : public SimpleRoadShieldParser
 {
 public:
   explicit MalaysiaRoadShieldParser(std::string const & baseRoadNumber)
-    : SimpleRoadShieldParser(baseRoadNumber, {{"AH", RoadShieldType::Generic_Blue},
-                                              {"E", RoadShieldType::Generic_Blue}},
-                                              RoadShieldType::Generic_Orange)
-  {
-  }
+    : SimpleRoadShieldParser(baseRoadNumber,
+                             {{"AH", RoadShieldType::Generic_Blue}, {"E", RoadShieldType::Generic_Blue}},
+                             RoadShieldType::Generic_Orange)
+  {}
 };
 
 class CyprusRoadShieldParser : public SimpleRoadShieldParser
 {
 public:
   explicit CyprusRoadShieldParser(std::string const & baseRoadNumber)
-    : SimpleRoadShieldParser(baseRoadNumber, {// North Cuprus.
-                                              {"D.", RoadShieldType::Generic_Blue},   // White font.
-                                              {"GM.", RoadShieldType::Generic_White}, // Blue font.
-                                              {"GZ.", RoadShieldType::Generic_White}, // Blue font.
-                                              {"GR.", RoadShieldType::Generic_White}, // Blue font.
-                                              {"LF.", RoadShieldType::Generic_White}, // Blue font.
-                                              {"İK.", RoadShieldType::Generic_White}, // Blue font.
-                                              // South Cyprus.
-                                              {"A", RoadShieldType::Generic_Green},   // Yellow font. Hexagon.
-                                              {"B", RoadShieldType::Generic_Blue},    // Yellow font.
-                                              {"E", RoadShieldType::Generic_Blue},    // Yellow font.
-                                              {"F", RoadShieldType::Generic_Blue},    // Yellow font.
-                                              {"U", RoadShieldType::Generic_Blue}})   // Yellow font.
-  {
-  }
+    : SimpleRoadShieldParser(baseRoadNumber, {                                         // North Cuprus.
+                                              {"D.", RoadShieldType::Generic_Blue},    // White font.
+                                              {"GM.", RoadShieldType::Generic_White},  // Blue font.
+                                              {"GZ.", RoadShieldType::Generic_White},  // Blue font.
+                                              {"GR.", RoadShieldType::Generic_White},  // Blue font.
+                                              {"LF.", RoadShieldType::Generic_White},  // Blue font.
+                                              {"İK.", RoadShieldType::Generic_White},  // Blue font.
+                                                                                       // South Cyprus.
+                                              {"A", RoadShieldType::Generic_Green},  // Yellow font. Hexagon.
+                                              {"B", RoadShieldType::Generic_Blue},   // Yellow font.
+                                              {"E", RoadShieldType::Generic_Blue},   // Yellow font.
+                                              {"F", RoadShieldType::Generic_Blue},   // Yellow font.
+                                              {"U", RoadShieldType::Generic_Blue}})  // Yellow font.
+  {}
 };
 
 class MexicoRoadShieldParser : public RoadShieldParser
 {
 public:
-  explicit MexicoRoadShieldParser(std::string const & baseRoadNumber)
-    : RoadShieldParser(baseRoadNumber)
-  {}
+  explicit MexicoRoadShieldParser(std::string const & baseRoadNumber) : RoadShieldParser(baseRoadNumber) {}
 
   RoadShield ParseRoadShield(std::string_view rawText) const override
   {
@@ -710,10 +684,8 @@ std::vector<std::string> GetRoadShieldsNames(FeatureType & ft)
   std::vector<std::string> names;
   auto const & ref = ft.GetRef();
   if (!ref.empty() && IsStreetOrSquareChecker::Instance()(ft))
-  {
     for (auto && shield : GetRoadShields(ref))
       names.push_back(std::move(shield.m_name));
-  }
   return names;
 }
 
diff --git a/libs/indexer/road_shields_parser.hpp b/libs/indexer/road_shields_parser.hpp
index a0409c66c..a7d62f881 100644
--- a/libs/indexer/road_shields_parser.hpp
+++ b/libs/indexer/road_shields_parser.hpp
@@ -32,12 +32,11 @@ struct RoadShield
   std::string m_additionalText;
 
   RoadShield() = default;
-  RoadShield(RoadShieldType const & type, std::string_view name)
-  : m_type(type), m_name(name)
-  {}
-  RoadShield(RoadShieldType const & type, std::string const & name,
-             std::string const & additionalText)
-  : m_type(type), m_name(name), m_additionalText(additionalText)
+  RoadShield(RoadShieldType const & type, std::string_view name) : m_type(type), m_name(name) {}
+  RoadShield(RoadShieldType const & type, std::string const & name, std::string const & additionalText)
+    : m_type(type)
+    , m_name(name)
+    , m_additionalText(additionalText)
   {}
 
   inline bool operator<(RoadShield const & other) const
@@ -73,4 +72,3 @@ std::string DebugPrint(RoadShield const & shield);
 }  // namespace ftypes
 
 using GeneratedRoadShields = std::map<ftypes::RoadShield, std::vector<m2::RectD>>;
-
diff --git a/libs/indexer/scale_index.hpp b/libs/indexer/scale_index.hpp
index e709646b3..60f8e226a 100644
--- a/libs/indexer/scale_index.hpp
+++ b/libs/indexer/scale_index.hpp
@@ -9,7 +9,6 @@
 #include <memory>
 #include <vector>
 
-
 /// Index bucket <--> Draw scale range.
 /// Using default one-to-one mapping.
 class ScaleIndexBase
@@ -18,10 +17,7 @@ public:
   static uint32_t GetBucketsCount() { return 18; }
   static uint32_t BucketByScale(int scale) { return static_cast<uint32_t>(scale); }
   /// @return Range like [x, y).
-  static std::pair<uint32_t, uint32_t> ScaleRangeForBucket(uint32_t bucket)
-  {
-    return {bucket, bucket + 1};
-  }
+  static std::pair<uint32_t, uint32_t> ScaleRangeForBucket(uint32_t bucket) { return {bucket, bucket + 1}; }
 };
 
 template <class Reader>
@@ -32,15 +28,9 @@ public:
 
   ScaleIndex(Reader const & reader, IndexFactory const & factory) { Attach(reader, factory); }
 
-  ~ScaleIndex()
-  {
-    Clear();
-  }
+  ~ScaleIndex() { Clear(); }
 
-  void Clear()
-  {
-    m_IndexForScale.clear();
-  }
+  void Clear() { m_IndexForScale.clear(); }
 
   void Attach(Reader const & reader, IndexFactory const & factory)
   {
@@ -57,10 +47,8 @@ public:
   {
     auto const scaleBucket = BucketByScale(scale);
     if (scaleBucket < m_IndexForScale.size())
-    {
       for (size_t i = 0; i <= scaleBucket; ++i)
         m_IndexForScale[i]->ForEach(fn, beg, end);
-    }
   }
 
 private:
diff --git a/libs/indexer/scale_index_builder.hpp b/libs/indexer/scale_index_builder.hpp
index 5f9a5d0f1..540950bc2 100644
--- a/libs/indexer/scale_index_builder.hpp
+++ b/libs/indexer/scale_index_builder.hpp
@@ -26,7 +26,6 @@
 #include <utility>
 #include <vector>
 
-
 namespace covering
 {
 template <class TDisplacementManager>
@@ -56,8 +55,8 @@ public:
   void operator()(Feature & ft, uint32_t index) const
   {
     m_scalesIdx = 0;
-    uint32_t const minScaleClassif = std::min(
-        scales::GetUpperScale(), feature::GetMinDrawableScaleClassifOnly(feature::TypesHolder(ft)));
+    uint32_t const minScaleClassif =
+        std::min(scales::GetUpperScale(), feature::GetMinDrawableScaleClassifOnly(feature::TypesHolder(ft)));
     // The classificator won't allow this feature to be drawable for smaller
     // scales so the first buckets can be safely skipped.
     // todo(@pimenov) Parallelizing this loop may be helpful.
@@ -71,9 +70,7 @@ public:
 
       // Check feature's geometry and visibility.
       if (!FeatureShouldBeIndexed(ft, static_cast<int>(bucket), bucket == minScaleClassif /* needReset */))
-      {
         continue;
-      }
 
       std::vector<int64_t> const cells = covering::CoverFeature(ft, m_codingDepth, 250);
       m_displacement.Add(cells, bucket, ft, index);
@@ -124,8 +121,8 @@ private:
 };
 
 template <class FeaturesVector, class Writer>
-void IndexScales(feature::DataHeader const & header, FeaturesVector const & features,
-                 Writer & writer, std::string const &)
+void IndexScales(feature::DataHeader const & header, FeaturesVector const & features, Writer & writer,
+                 std::string const &)
 {
   // TODO: Make scale bucketing dynamic.
 
@@ -134,9 +131,7 @@ void IndexScales(feature::DataHeader const & header, FeaturesVector const & feat
   std::vector<CellFeatureBucketTuple> cellsToFeaturesAllBuckets;
   {
     auto const PushCFT = [&cellsToFeaturesAllBuckets](CellFeatureBucketTuple const & v)
-    {
-      cellsToFeaturesAllBuckets.push_back(v);
-    };
+    { cellsToFeaturesAllBuckets.push_back(v); };
     using TDisplacementManager = DisplacementManager<decltype(PushCFT)>;
 
     // Single-point features are heuristically rearranged and filtered to simplify
@@ -146,8 +141,7 @@ void IndexScales(feature::DataHeader const & header, FeaturesVector const & feat
     TDisplacementManager manager(PushCFT);
     std::vector<uint32_t> featuresInBucket(bucketsCount);
     std::vector<uint32_t> cellsInBucket(bucketsCount);
-    features.ForEach(
-        FeatureCoverer<TDisplacementManager>(header, manager, featuresInBucket, cellsInBucket));
+    features.ForEach(FeatureCoverer<TDisplacementManager>(header, manager, featuresInBucket, cellsInBucket));
     manager.Displace();
     std::sort(cellsToFeaturesAllBuckets.begin(), cellsToFeaturesAllBuckets.end());
 
@@ -177,8 +171,7 @@ void IndexScales(feature::DataHeader const & header, FeaturesVector const & feat
 
     SubWriter<Writer> subWriter(writer);
     LOG(LINFO, ("Building interval index for bucket:", bucket));
-    BuildIntervalIndex(cellsToFeatures.begin(), cellsToFeatures.end(), subWriter,
-                       RectId::DEPTH_LEVELS * 2 + 1);
+    BuildIntervalIndex(cellsToFeatures.begin(), cellsToFeatures.end(), subWriter, RectId::DEPTH_LEVELS * 2 + 1);
 
     recordWriter.FinishRecord();
   }
diff --git a/libs/indexer/scales.cpp b/libs/indexer/scales.cpp
index 945be4287..9c89c69a7 100644
--- a/libs/indexer/scales.cpp
+++ b/libs/indexer/scales.cpp
@@ -1,95 +1,95 @@
 #include "indexer/scales.hpp"
 
-#include "indexer/feature_algo.hpp"
 #include "geometry/mercator.hpp"
+#include "indexer/feature_algo.hpp"
 
 #include <algorithm>
 #include <cmath>
 
 namespace scales
 {
-  static const int INITIAL_LEVEL = 1;
+static int const INITIAL_LEVEL = 1;
 
-  int GetMinAllowableIn3dScale()
-  {
-    return std::min(16, std::min(GetNavigation3dScale(), GetPedestrianNavigation3dScale()));
-  }
+int GetMinAllowableIn3dScale()
+{
+  return std::min(16, std::min(GetNavigation3dScale(), GetPedestrianNavigation3dScale()));
+}
 
-  double GetScaleLevelD(double ratio)
-  {
-    double const level = std::min(static_cast<double>(GetUpperScale()), std::log2(ratio) + INITIAL_LEVEL);
-    return level < 0.0 ? 0.0 : level;
-  }
+double GetScaleLevelD(double ratio)
+{
+  double const level = std::min(static_cast<double>(GetUpperScale()), std::log2(ratio) + INITIAL_LEVEL);
+  return level < 0.0 ? 0.0 : level;
+}
 
-  double GetScaleLevelD(m2::RectD const & r)
-  {
-    // TODO: fix scale factors for mercator projection
-    double const dx = mercator::Bounds::kRangeX / r.SizeX();
-    double const dy = mercator::Bounds::kRangeY / r.SizeY();
+double GetScaleLevelD(m2::RectD const & r)
+{
+  // TODO: fix scale factors for mercator projection
+  double const dx = mercator::Bounds::kRangeX / r.SizeX();
+  double const dy = mercator::Bounds::kRangeY / r.SizeY();
 
-    // get the average ratio
-    return GetScaleLevelD((dx + dy) / 2.0);
-  }
+  // get the average ratio
+  return GetScaleLevelD((dx + dy) / 2.0);
+}
 
-  int GetScaleLevel(double ratio)
-  {
-    return std::lround(GetScaleLevelD(ratio));
-  }
+int GetScaleLevel(double ratio)
+{
+  return std::lround(GetScaleLevelD(ratio));
+}
 
-  int GetScaleLevel(m2::RectD const & r)
-  {
-    return std::lround(GetScaleLevelD(r));
-  }
+int GetScaleLevel(m2::RectD const & r)
+{
+  return std::lround(GetScaleLevelD(r));
+}
 
-  namespace
-  {
-    double GetEpsilonImpl(long level, double pixelTolerance)
-    {
-      return mercator::Bounds::kRangeX * pixelTolerance / double(256L << level);
-    }
-  }
+namespace
+{
+double GetEpsilonImpl(long level, double pixelTolerance)
+{
+  return mercator::Bounds::kRangeX * pixelTolerance / double(256L << level);
+}
+}  // namespace
 
-  double GetEpsilonForLevel(int level)
-  {
-    return GetEpsilonImpl(level, 7);
-  }
+double GetEpsilonForLevel(int level)
+{
+  return GetEpsilonImpl(level, 7);
+}
 
-  double GetEpsilonForSimplify(int level)
-  {
-    // Keep better geometries on highest zoom to allow scaling them deeper.
-    // Effectively it leads to x26 precision difference from geom scale 2 to 3.
-    // Keep crude geometries for all other zooms,
-    // x4 precision difference from geom scale 0 to 1 and 1 to 2.
-    if (level == GetUpperScale())
-      return GetEpsilonImpl(level, 0.4);
-    else
-      return GetEpsilonImpl(level, 1.3);
-  }
+double GetEpsilonForSimplify(int level)
+{
+  // Keep better geometries on highest zoom to allow scaling them deeper.
+  // Effectively it leads to x26 precision difference from geom scale 2 to 3.
+  // Keep crude geometries for all other zooms,
+  // x4 precision difference from geom scale 0 to 1 and 1 to 2.
+  if (level == GetUpperScale())
+    return GetEpsilonImpl(level, 0.4);
+  else
+    return GetEpsilonImpl(level, 1.3);
+}
 
-  double GetEpsilonForHousenumbers(int level)
-  {
-    // Leads to housenumbers either not fitting into buildings on zl16.
-    ASSERT_LESS(level, GetPointHousenumbersScale(), ());
-    return GetEpsilonImpl(level, 30);
-  }
+double GetEpsilonForHousenumbers(int level)
+{
+  // Leads to housenumbers either not fitting into buildings on zl16.
+  ASSERT_LESS(level, GetPointHousenumbersScale(), ());
+  return GetEpsilonImpl(level, 30);
+}
 
-  bool IsGoodForLevel(int level, m2::RectD const & r)
-  {
-    ASSERT(level >= 0 && level <= GetUpperScale(), (level));
-    // assume that feature is always visible in upper scale
-    return (level == GetUpperScale() || std::max(r.SizeX(), r.SizeY()) > GetEpsilonForLevel(level));
-  }
+bool IsGoodForLevel(int level, m2::RectD const & r)
+{
+  ASSERT(level >= 0 && level <= GetUpperScale(), (level));
+  // assume that feature is always visible in upper scale
+  return (level == GetUpperScale() || std::max(r.SizeX(), r.SizeY()) > GetEpsilonForLevel(level));
+}
 
-  bool IsGoodOutlineForLevel(int level, Points const & poly)
-  {
-    // Areas and closed lines have the same first and last points.
-    // Hence the minimum number of outline points is 4.
-    if (poly.size() < 4)
-      return false;
+bool IsGoodOutlineForLevel(int level, Points const & poly)
+{
+  // Areas and closed lines have the same first and last points.
+  // Hence the minimum number of outline points is 4.
+  if (poly.size() < 4)
+    return false;
 
-    m2::RectD r;
-    feature::CalcRect(poly, r);
+  m2::RectD r;
+  feature::CalcRect(poly, r);
 
-    return IsGoodForLevel(level, r);
-  }
-} // namespace scales
+  return IsGoodForLevel(level, r);
+}
+}  // namespace scales
diff --git a/libs/indexer/scales.hpp b/libs/indexer/scales.hpp
index 1efdd829b..55b271ed4 100644
--- a/libs/indexer/scales.hpp
+++ b/libs/indexer/scales.hpp
@@ -1,48 +1,80 @@
 #pragma once
 
-#include "geometry/rect2d.hpp"
 #include "geometry/point2d.hpp"
-
+#include "geometry/rect2d.hpp"
 
 namespace scales
 {
-  constexpr int UPPER_STYLE_SCALE = 20;
+constexpr int UPPER_STYLE_SCALE = 20;
 
-  /// Upper scale for data generation and indexer buckets.
-  constexpr int GetUpperScale() { return 17; }
-  /// Upper scale according to drawing rules.
-  constexpr int GetUpperStyleScale() { return UPPER_STYLE_SCALE; }
-  /// Upper scales for World visible styles and indexer buckets.
-  constexpr int GetUpperWorldScale() { return 9; }
-  /// Upper scale level for countries.
-  constexpr int GetUpperCountryScale() { return GetUpperWorldScale() + 1; }
-  /// Upper scale for user comfort view (e.g. location zoom).
-  constexpr int GetUpperComfortScale() { return 17; }
-  /// Default navigation mode scale.
-  constexpr int GetNavigationScale() { return 16; }
-  /// Default pedestrian navigation mode scale.
-  constexpr int GetPedestrianNavigationScale() { return 17; }
-  /// Default navigation 3d mode scale.
-  constexpr int GetNavigation3dScale() { return 17; }
-  /// Default pedestrian navigation 3d mode scale.
-  constexpr int GetPedestrianNavigation3dScale() { return 17; }
-  /// Default scale in adding-new-place mode.
-  constexpr int GetAddNewPlaceScale() { return 18; }
-  /// Lower scale when standalone point housenumbers (of building-address type) become visible.
-  constexpr int GetPointHousenumbersScale() { return 17; }
-
-  int GetMinAllowableIn3dScale();
-
-  double GetScaleLevelD(double ratio);
-  double GetScaleLevelD(m2::RectD const & r);
-  int GetScaleLevel(double ratio);
-  int GetScaleLevel(m2::RectD const & r);
-
-  double GetEpsilonForLevel(int level);
-  double GetEpsilonForSimplify(int level);
-  double GetEpsilonForHousenumbers(int level);
-  bool IsGoodForLevel(int level, m2::RectD const & r);
-
-  using Points = std::vector<m2::PointD>;
-  bool IsGoodOutlineForLevel(int level, Points const & poly);
+/// Upper scale for data generation and indexer buckets.
+constexpr int GetUpperScale()
+{
+  return 17;
 }
+/// Upper scale according to drawing rules.
+constexpr int GetUpperStyleScale()
+{
+  return UPPER_STYLE_SCALE;
+}
+/// Upper scales for World visible styles and indexer buckets.
+constexpr int GetUpperWorldScale()
+{
+  return 9;
+}
+/// Upper scale level for countries.
+constexpr int GetUpperCountryScale()
+{
+  return GetUpperWorldScale() + 1;
+}
+/// Upper scale for user comfort view (e.g. location zoom).
+constexpr int GetUpperComfortScale()
+{
+  return 17;
+}
+/// Default navigation mode scale.
+constexpr int GetNavigationScale()
+{
+  return 16;
+}
+/// Default pedestrian navigation mode scale.
+constexpr int GetPedestrianNavigationScale()
+{
+  return 17;
+}
+/// Default navigation 3d mode scale.
+constexpr int GetNavigation3dScale()
+{
+  return 17;
+}
+/// Default pedestrian navigation 3d mode scale.
+constexpr int GetPedestrianNavigation3dScale()
+{
+  return 17;
+}
+/// Default scale in adding-new-place mode.
+constexpr int GetAddNewPlaceScale()
+{
+  return 18;
+}
+/// Lower scale when standalone point housenumbers (of building-address type) become visible.
+constexpr int GetPointHousenumbersScale()
+{
+  return 17;
+}
+
+int GetMinAllowableIn3dScale();
+
+double GetScaleLevelD(double ratio);
+double GetScaleLevelD(m2::RectD const & r);
+int GetScaleLevel(double ratio);
+int GetScaleLevel(m2::RectD const & r);
+
+double GetEpsilonForLevel(int level);
+double GetEpsilonForSimplify(int level);
+double GetEpsilonForHousenumbers(int level);
+bool IsGoodForLevel(int level, m2::RectD const & r);
+
+using Points = std::vector<m2::PointD>;
+bool IsGoodOutlineForLevel(int level, Points const & poly);
+}  // namespace scales
diff --git a/libs/indexer/scales_patch.hpp b/libs/indexer/scales_patch.hpp
index 81224f3eb..729e5bfe1 100644
--- a/libs/indexer/scales_patch.hpp
+++ b/libs/indexer/scales_patch.hpp
@@ -18,9 +18,12 @@ inline uint32_t PatchMaxDrawableScale(uint32_t s)
   std::min(s + kPatchScaleShift, static_cast<uint32_t>(GetUpperStyleScale()));
 }
 
-#else // BUILD_DESIGNER
+#else  // BUILD_DESIGNER
 
-inline uint32_t PatchMinDrawableScale(uint32_t s) { return s; }
+inline uint32_t PatchMinDrawableScale(uint32_t s)
+{
+  return s;
+}
 
 inline uint32_t PatchMaxDrawableScale(uint32_t s)
 {
@@ -29,5 +32,5 @@ inline uint32_t PatchMaxDrawableScale(uint32_t s)
   return (s == GetUpperScale()) ? GetUpperStyleScale() : s;
 }
 
-#endif // BUILD_DESIGNER
-} // namespace scales
+#endif  // BUILD_DESIGNER
+}  // namespace scales
diff --git a/libs/indexer/search_delimiters.cpp b/libs/indexer/search_delimiters.cpp
index 774674762..1a4a02bf5 100644
--- a/libs/indexer/search_delimiters.cpp
+++ b/libs/indexer/search_delimiters.cpp
@@ -63,8 +63,7 @@ bool Delimiters::operator()(strings::UniChar c) const
 // DelimitersWithExceptions ------------------------------------------------------------------------
 DelimitersWithExceptions::DelimitersWithExceptions(std::vector<strings::UniChar> const & exceptions)
   : m_exceptions(exceptions)
-{
-}
+{}
 
 bool DelimitersWithExceptions::operator()(strings::UniChar c) const
 {
diff --git a/libs/indexer/search_string_utils.cpp b/libs/indexer/search_string_utils.cpp
index d69076167..715500188 100644
--- a/libs/indexer/search_string_utils.cpp
+++ b/libs/indexer/search_string_utils.cpp
@@ -22,16 +22,10 @@ using namespace strings;
 namespace
 {
 std::vector<UniString> const kAllowedMisprints = {
-    MakeUniString("ckq"),
-    MakeUniString("eyjiu"),
-    MakeUniString("gh"),
-    MakeUniString("pf"),
-    MakeUniString("vw"),
+    MakeUniString("ckq"), MakeUniString("eyjiu"), MakeUniString("gh"), MakeUniString("pf"), MakeUniString("vw"),
 
     // Russian
-    MakeUniString("ао"),
-    MakeUniString("еиэ"),
-    MakeUniString("шщ"),
+    MakeUniString("ао"), MakeUniString("еиэ"), MakeUniString("шщ"),
 
     // Spanish
     MakeUniString("jh"),  // "Jose" <-> "Hose"
@@ -39,17 +33,16 @@ std::vector<UniString> const kAllowedMisprints = {
 };
 
 std::pair<UniString, UniString> const kPreprocessReplacements[] = {
-    {MakeUniString("пр-т"),  MakeUniString("проспект")},
-    {MakeUniString("пр-д"),  MakeUniString("проезд")},
+    {MakeUniString("пр-т"), MakeUniString("проспект")},
+    {MakeUniString("пр-д"), MakeUniString("проезд")},
     {MakeUniString("наб-я"), MakeUniString("набережная")},
     {MakeUniString("м-н"), MakeUniString("микрорайон")},
 };
 
-
 void TransliterateHiraganaToKatakana(UniString & s)
 {
   // Transliteration is heavy. Check we have any hiragana symbol before transliteration.
-  if (!base::AnyOf(s, [](UniChar c){ return c >= 0x3041 && c<= 0x309F; }))
+  if (!base::AnyOf(s, [](UniChar c) { return c >= 0x3041 && c <= 0x309F; }))
     return;
 
   InitTransliterationInstanceWithDefaultDirs();
@@ -101,21 +94,15 @@ UniString NormalizeAndSimplifyString(std::string_view s)
     // Replace "d with stroke" to simple d letter. Used in Vietnamese.
     // (unicode-compliant implementation leaves it unchanged)
     case 0x0110:
-    case 0x0111:
-      c = 'd';
-      break;
+    case 0x0111: c = 'd'; break;
     // Replace small turkish dotless 'ı' with dotted 'i'.  Our own
     // invented hack to avoid well-known Turkish I-letter bug.
-    case 0x0131:
-      c = 'i';
-      break;
+    case 0x0131: c = 'i'; break;
     // Replace capital turkish dotted 'İ' with dotted lowercased 'i'.
     // Here we need to handle this case manually too, because default
     // unicode-compliant implementation of MakeLowerCase converts 'İ'
     // to 'i' + 0x0307.
-    case 0x0130:
-      c = 'i';
-      break;
+    case 0x0130: c = 'i'; break;
     // Some Danish-specific hacks.
     case 0x00d8:  // Ø
     case 0x00f8:  // ø
@@ -154,10 +141,7 @@ UniString NormalizeAndSimplifyString(std::string_view s)
   });
 
   // Replace sequence of spaces with single one.
-  base::Unique(uniString, [](UniChar l, UniChar r)
-  {
-    return (l == r && l == ' ');
-  });
+  base::Unique(uniString, [](UniChar l, UniChar r) { return (l == r && l == ' '); });
 
   return uniString;
 
@@ -193,8 +177,7 @@ void PreprocessBeforeTokenization(UniString & query)
   for (auto const & replacement : kPreprocessReplacements)
   {
     auto start = query.begin();
-    while ((start = std::search(start, query.end(), replacement.first.begin(),
-                                replacement.first.end())) != query.end())
+    while ((start = std::search(start, query.end(), replacement.first.begin(), replacement.first.end())) != query.end())
     {
       auto end = start + replacement.first.size();
       if ((start == query.begin() || delims(*(start - 1))) && (end == query.end() || delims(*end)))
@@ -279,7 +262,7 @@ public:
 
   static StreetsSynonymsHolder const & Instance()
   {
-    static const StreetsSynonymsHolder holder;
+    static StreetsSynonymsHolder const holder;
     return holder;
   }
 
@@ -327,72 +310,100 @@ private:
   // Note! If "street" is present here, it should contain all possible synonyms (avenue -> av, ave).
   StreetsSynonymsHolder()
   {
-    char const * affics[] =
-    {
-      // Russian - Русский
-      "улица", "ул", "проспект",
+    char const * affics[] = {
+        // Russian - Русский
+        "улица",
+        "ул",
+        "проспект",
 
-      // English - English
-      "street", "st", "road", "rd", "drive", "dr", "lane", "ln", "avenue", "av", "ave",
+        // English - English
+        "street",
+        "st",
+        "road",
+        "rd",
+        "drive",
+        "dr",
+        "lane",
+        "ln",
+        "avenue",
+        "av",
+        "ave",
 
-      // Belarusian - Беларуская мова
-      "вуліца", "вул", "праспект",
+        // Belarusian - Беларуская мова
+        "вуліца",
+        "вул",
+        "праспект",
 
-      // Arabic
-      "شارع",
+        // Arabic
+        "شارع",
 
-      // Armenian
-      "փողոց",
+        // Armenian
+        "փողոց",
 
-      // Catalan language (Barcelona, Valencia, ...)
-      "carrer", "avinguda",
+        // Catalan language (Barcelona, Valencia, ...)
+        "carrer",
+        "avinguda",
 
-      // Croatian - Hrvatski
-      "ulica",  // Also common used transcription from RU
+        // Croatian - Hrvatski
+        "ulica",  // Also common used transcription from RU
 
-      // French - Français
-      "rue", "avenue",
+        // French - Français
+        "rue",
+        "avenue",
 
-      // Georgia
-      "ქუჩა",
+        // Georgia
+        "ქუჩა",
 
-      // German - Deutsch
-      "straße", "str", "platz", "pl",
+        // German - Deutsch
+        "straße",
+        "str",
+        "platz",
+        "pl",
 
-      // Hungarian - Magyar
-      "utca", "út",
+        // Hungarian - Magyar
+        "utca",
+        "út",
 
-      // Indonesia
-      "jalan",
+        // Indonesia
+        "jalan",
 
-      // Italian - Italiano
-      "via", "viale", "piazza",
+        // Italian - Italiano
+        "via",
+        "viale",
+        "piazza",
 
-      /// @todo Also expect that this synonyms should be in categories.txt list, but we dont support lt, lv langs now.
-      /// @{
-      // Latvian - Latviešu
-      "iela",
-      // Lithuanian - Lietuvių
-      "gatvė", "g.",
-      ///@}
+        /// @todo Also expect that this synonyms should be in categories.txt list, but we dont support lt, lv langs now.
+        /// @{
+        // Latvian - Latviešu
+        "iela",
+        // Lithuanian - Lietuvių
+        "gatvė",
+        "g.",
+        ///@}
 
-      // Portuguese - Português
-      "rua",
+        // Portuguese - Português
+        "rua",
 
-      // Romanian - Română (Moldova)
-      "strada",
+        // Romanian - Română (Moldova)
+        "strada",
 
-      // Spanish - Español
-      "calle", "avenida", "plaza",
+        // Spanish - Español
+        "calle",
+        "avenida",
+        "plaza",
 
-      // Turkish - Türkçe
-      "sokağı", "sokak", "sk",
+        // Turkish - Türkçe
+        "sokağı",
+        "sokak",
+        "sk",
 
-      // Ukrainian - Українська
-      "вулиця", "вул", "проспект",
+        // Ukrainian - Українська
+        "вулиця",
+        "вул",
+        "проспект",
 
-      // Vietnamese - Tiếng Việt
-      "đường",
+        // Vietnamese - Tiếng Việt
+        "đường",
     };
 
     for (auto const * s : affics)
@@ -407,13 +418,11 @@ class SynonymsHolderBase
   std::vector<UniString> m_strings;
 
 protected:
-  void Add(char const * s)
-  {
-    m_strings.emplace_back(NormalizeAndSimplifyString(s));
-  }
+  void Add(char const * s) { m_strings.emplace_back(NormalizeAndSimplifyString(s)); }
 
 public:
-  template <class FnT> bool ApplyIf(UniString const & s, FnT && fn) const
+  template <class FnT>
+  bool ApplyIf(UniString const & s, FnT && fn) const
   {
     for (size_t i = 0; i < m_strings.size(); ++i)
     {
@@ -434,8 +443,8 @@ public:
   StreetsDirectionsHolder()
   {
     // ("short name", "full name")
-    for (auto const * s : {"n", "north", "s", "south", "w", "west", "e", "east",
-                           "ne", "northeast", "nw", "northwest", "se", "southeast", "sw", "southwest" })
+    for (auto const * s : {"n", "north", "s", "south", "w", "west", "e", "east", "ne", "northeast", "nw", "northwest",
+                           "se", "southeast", "sw", "southwest"})
     {
       Add(s);
     }
@@ -448,16 +457,16 @@ public:
   StreetsAbbreviationsHolder()
   {
     // ("short name", "full name")
-    for (auto const * s : {"st", "street", "rd", "road", "dr", "drive", "ln", "lane", "av", "avenue", "ave", "avenue",
-                           "hwy", "highway", "rte", "route", "blvd", "boulevard", "trl", "trail", "pl", "place",
-                           "rdg", "ridge", "spr", "spur", "ter", "terrace", "vw", "view", "cir", "circle", "ct", "court",
-                           "pkwy", "parkway", "lp", "loop", "vis", "vista", "cv", "cove", "trce", "trace", "crst", "crest",
-                           "cres", "crescent", "xing", "crossing", "blf", "bluff",
-                          // Some fancy synonyms:
-                           "co", "county", "mtn", "mountain", "clfs", "cliffs",
-                          // Integers:
-                           "first", "1st", "second", "2nd", "third", "3rd", "fourth", "4th", "fifth", "5th",
-                           "sixth", "6th", "seventh", "7th", "eighth", "8th", "ninth", "9th"})
+    for (auto const * s :
+         {"st", "street", "rd", "road", "dr", "drive", "ln", "lane", "av", "avenue", "ave", "avenue", "hwy", "highway",
+          "rte", "route", "blvd", "boulevard", "trl", "trail", "pl", "place", "rdg", "ridge", "spr", "spur", "ter",
+          "terrace", "vw", "view", "cir", "circle", "ct", "court", "pkwy", "parkway", "lp", "loop", "vis", "vista",
+          "cv", "cove", "trce", "trace", "crst", "crest", "cres", "crescent", "xing", "crossing", "blf", "bluff",
+          // Some fancy synonyms:
+          "co", "county", "mtn", "mountain", "clfs", "cliffs",
+          // Integers:
+          "first", "1st", "second", "2nd", "third", "3rd", "fourth", "4th", "fifth", "5th", "sixth", "6th", "seventh",
+          "7th", "eighth", "8th", "ninth", "9th"})
     {
       Add(s);
     }
@@ -543,7 +552,10 @@ strings::UniString GetNormalizedStreetName(std::string_view name)
   return res;
 }
 
-bool IsStreetSynonym(UniString const & s) { return StreetsSynonymsHolder::Instance().FullMatch(s); }
+bool IsStreetSynonym(UniString const & s)
+{
+  return StreetsSynonymsHolder::Instance().FullMatch(s);
+}
 
 bool IsStreetSynonymPrefix(UniString const & s)
 {
@@ -585,18 +597,15 @@ void StreetTokensFilter::Put(UniString const & token, bool isPrefix, size_t tag)
         return;
     }
   }
+  else if (m_withMisprints)
+  {
+    if (IsStreetSynonymWithMisprints(token))
+      return;
+  }
   else
   {
-    if (m_withMisprints)
-    {
-      if (IsStreetSynonymWithMisprints(token))
-        return;
-    }
-    else
-    {
-      if (IsStreetSynonym(token))
-        return;
-    }
+    if (IsStreetSynonym(token))
+      return;
   }
 
   m_callback(token, tag);
@@ -605,8 +614,8 @@ void StreetTokensFilter::Put(UniString const & token, bool isPrefix, size_t tag)
 String2StringMap const & GetDACHStreets()
 {
   static String2StringMap res = {
-    { MakeUniString("strasse"), MakeUniString("str") },
-    { MakeUniString("platz"), MakeUniString("pl") },
+      {MakeUniString("strasse"), MakeUniString("str")},
+      {MakeUniString("platz"), MakeUniString("pl")},
   };
   return res;
 }
diff --git a/libs/indexer/search_string_utils.hpp b/libs/indexer/search_string_utils.hpp
index 2e6b07809..39ccb691c 100644
--- a/libs/indexer/search_string_utils.hpp
+++ b/libs/indexer/search_string_utils.hpp
@@ -62,9 +62,9 @@ void SplitUniString(strings::UniString const & uniS, Fn && fn, Delims const & de
     strings::UniString str(beg + i, beg + j);
 
     // Transform "xyz's" -> "xyzs".
-    if (j+1 < count && uniS[j] == '\'' && uniS[j+1] == 's' && (j+2 == count || delims(uniS[j+2])))
+    if (j + 1 < count && uniS[j] == '\'' && uniS[j + 1] == 's' && (j + 2 == count || delims(uniS[j + 2])))
     {
-      str.push_back(uniS[j+1]);
+      str.push_back(uniS[j + 1]);
       j += 2;
     }
 
@@ -116,9 +116,9 @@ public:
 
   template <typename C>
   StreetTokensFilter(C && callback, bool withMisprints)
-    : m_callback(std::forward<C>(callback)), m_withMisprints(withMisprints)
-  {
-  }
+    : m_callback(std::forward<C>(callback))
+    , m_withMisprints(withMisprints)
+  {}
 
   // Puts token to the filter. Filter checks following cases:
   // * when |token| is the first street synonym met so far, it's delayed
@@ -136,4 +136,4 @@ private:
 using String2StringMap = std::map<strings::UniString, strings::UniString>;
 String2StringMap const & GetDACHStreets();
 
-} // namespace search
+}  // namespace search
diff --git a/libs/indexer/shared_load_info.cpp b/libs/indexer/shared_load_info.cpp
index c244ce5a0..fc399effe 100644
--- a/libs/indexer/shared_load_info.cpp
+++ b/libs/indexer/shared_load_info.cpp
@@ -6,10 +6,8 @@
 
 namespace feature
 {
-SharedLoadInfo::SharedLoadInfo(FilesContainerR const & cont, DataHeader const & header)
-  : m_cont(cont), m_header(header)
-{
-}
+SharedLoadInfo::SharedLoadInfo(FilesContainerR const & cont, DataHeader const & header) : m_cont(cont), m_header(header)
+{}
 
 SharedLoadInfo::Reader SharedLoadInfo::GetDataReader() const
 {
diff --git a/libs/indexer/string_set.hpp b/libs/indexer/string_set.hpp
index 5133a07c8..e3f8e75db 100644
--- a/libs/indexer/string_set.hpp
+++ b/libs/indexer/string_set.hpp
@@ -57,10 +57,8 @@ private:
     Node const * Move(TChar c) const
     {
       for (auto const & p : m_moves)
-      {
         if (p.first == c)
           return p.second.get();
-      }
       return nullptr;
     }
 
@@ -80,10 +78,8 @@ private:
     Node & MakeMove(TChar c)
     {
       for (auto const & p : m_moves)
-      {
         if (p.first == c)
           return *p.second;
-      }
       m_moves.emplace_back(c, std::make_unique<Node>());
       return *m_moves.back().second;
     }
diff --git a/libs/indexer/succinct_trie_reader.hpp b/libs/indexer/succinct_trie_reader.hpp
index d91f5da1f..2a853e5c0 100644
--- a/libs/indexer/succinct_trie_reader.hpp
+++ b/libs/indexer/succinct_trie_reader.hpp
@@ -15,17 +15,16 @@
 #include <vector>
 
 #if defined(__clang__)
- #pragma clang diagnostic push
- #pragma clang diagnostic ignored "-Wunused-private-field"
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunused-private-field"
 #endif
 
 #include "3party/succinct/rs_bit_vector.hpp"
 
 #if defined(__clang__)
-  #pragma clang diagnostic pop
+#pragma clang diagnostic pop
 #endif
 
-
 namespace trie
 {
 // This class is used to read the data that is common to every node
@@ -39,7 +38,8 @@ public:
   using TValue = typename TValueReader::ValueType;
 
   TopologyAndOffsets(TReader const & reader, TValueReader const & valueReader)
-    : m_reader(reader), m_valueReader(valueReader)
+    : m_reader(reader)
+    , m_valueReader(valueReader)
   {
     Parse();
   }
@@ -142,11 +142,12 @@ public:
   using TValue = typename TValueReader::ValueType;
   using TCommonData = TopologyAndOffsets<TReader, TValueReader>;
 
-  SuccinctTrieIterator(TReader const & reader, std::shared_ptr<TCommonData> common,
-                       uint32_t nodeBitPosition)
-    : m_reader(reader), m_common(common), m_nodeBitPosition(nodeBitPosition), m_valuesRead(false)
-  {
-  }
+  SuccinctTrieIterator(TReader const & reader, std::shared_ptr<TCommonData> common, uint32_t nodeBitPosition)
+    : m_reader(reader)
+    , m_common(common)
+    , m_nodeBitPosition(nodeBitPosition)
+    , m_valuesRead(false)
+  {}
 
   std::unique_ptr<SuccinctTrieIterator> Clone() const
   {
@@ -159,15 +160,11 @@ public:
     ASSERT_EQUAL(m_common->GetTopology()[m_nodeBitPosition - 1], 1, (m_nodeBitPosition));
 
     // rank(x) returns the number of ones in [0, x) but we count bit positions from 1
-    uint32_t childBitPosition =
-        base::asserted_cast<uint32_t>(2 * m_common->GetTopology().rank(m_nodeBitPosition));
+    uint32_t childBitPosition = base::asserted_cast<uint32_t>(2 * m_common->GetTopology().rank(m_nodeBitPosition));
     if (i == 1)
       ++childBitPosition;
-    if (childBitPosition > 2 * m_common->NumNodes() ||
-        m_common->GetTopology()[childBitPosition - 1] == 0)
-    {
+    if (childBitPosition > 2 * m_common->NumNodes() || m_common->GetTopology()[childBitPosition - 1] == 0)
       return nullptr;
-    }
     return std::make_unique<SuccinctTrieIterator>(m_reader, m_common, childBitPosition);
   }
 
@@ -228,13 +225,13 @@ private:
       return;
     m_valuesRead = true;
     // Back to 0-based indices.
-    uint32_t m_nodeId =
-        base::checked_cast<uint32_t>(m_common->GetTopology().rank(m_nodeBitPosition) - 1);
+    uint32_t m_nodeId = base::checked_cast<uint32_t>(m_common->GetTopology().rank(m_nodeBitPosition) - 1);
     if (!m_common->NodeIsFinal(m_nodeId))
       return;
     uint32_t offset = m_common->Offset(m_nodeId);
     uint32_t size = m_common->ValueListSize(m_nodeId);
-    ReaderPtr<TReader> subReaderPtr(std::unique_ptr<TReader>(static_cast<TReader*>(m_reader.CreateSubReader(offset, size).release())));
+    ReaderPtr<TReader> subReaderPtr(
+        std::unique_ptr<TReader>(static_cast<TReader *>(m_reader.CreateSubReader(offset, size).release())));
     ReaderSource<ReaderPtr<TReader>> src(subReaderPtr);
     while (src.Size() > 0)
     {
@@ -256,8 +253,8 @@ private:
 };
 
 template <typename TReader, typename TValueReader>
-std::unique_ptr<SuccinctTrieIterator<TReader, TValueReader>> ReadSuccinctTrie(
-    TReader const & reader, TValueReader valueReader = TValueReader())
+std::unique_ptr<SuccinctTrieIterator<TReader, TValueReader>> ReadSuccinctTrie(TReader const & reader,
+                                                                              TValueReader valueReader = TValueReader())
 {
   using TCommonData = TopologyAndOffsets<TReader, TValueReader>;
   using TIter = SuccinctTrieIterator<TReader, TValueReader>;
diff --git a/libs/indexer/transliteration_loader.cpp b/libs/indexer/transliteration_loader.cpp
index 76cd1441a..9ef60ab6a 100644
--- a/libs/indexer/transliteration_loader.cpp
+++ b/libs/indexer/transliteration_loader.cpp
@@ -5,8 +5,8 @@
 #include "coding/transliteration.hpp"
 #include "coding/zip_reader.hpp"
 
-#include "base/file_name_utils.hpp"
 #include "base/exception.hpp"
+#include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
 
 #include <string>
diff --git a/libs/indexer/tree_structure.hpp b/libs/indexer/tree_structure.hpp
index 4ae5683ff..586b54401 100644
--- a/libs/indexer/tree_structure.hpp
+++ b/libs/indexer/tree_structure.hpp
@@ -12,8 +12,9 @@ bool LoadTreeAsText(std::istream & s, ToDo & toDo)
 {
   std::string name;
   s >> name;
-  ASSERT ( !name.empty(), ("Error in classificator file") );
-  if (name == "{}") return false;
+  ASSERT(!name.empty(), ("Error in classificator file"));
+  if (name == "{}")
+    return false;
 
   // set key name
   toDo.Name(name);
@@ -41,9 +42,9 @@ bool LoadTreeAsText(std::istream & s, ToDo & toDo)
       }
     }
 
-    ASSERT ( i <= 128, ("too many features at level = ", name) );
+    ASSERT(i <= 128, ("too many features at level = ", name));
   }
 
   return true;
 }
-}
+}  // namespace tree
diff --git a/libs/indexer/trie.hpp b/libs/indexer/trie.hpp
index c330b2173..6abb52ba1 100644
--- a/libs/indexer/trie.hpp
+++ b/libs/indexer/trie.hpp
@@ -31,7 +31,8 @@ struct Iterator
     Edge() = default;
 
     template <typename It>
-    Edge(It begin, It end): m_label(begin, end) {}
+    Edge(It begin, It end) : m_label(begin, end)
+    {}
 
     EdgeLabel m_label;
   };
@@ -57,7 +58,8 @@ public:
   explicit MemTrieIterator(InnerIterator const & innerIt)
   {
     Base::m_values = innerIt.GetValues();
-    innerIt.ForEachMove([&](Char c, InnerIterator it) {
+    innerIt.ForEachMove([&](Char c, InnerIterator it)
+    {
       auto const label = it.GetLabel();
       Base::m_edges.emplace_back();
       auto & edge = Base::m_edges.back().m_label;
diff --git a/libs/indexer/trie_builder.hpp b/libs/indexer/trie_builder.hpp
index e0f0fd062..bd3e1c275 100644
--- a/libs/indexer/trie_builder.hpp
+++ b/libs/indexer/trie_builder.hpp
@@ -47,9 +47,8 @@
 namespace trie
 {
 template <typename Sink, typename ChildIter, typename ValueList, typename Serializer>
-void WriteNode(Sink & sink, Serializer const & serializer, TrieChar baseChar,
-               ValueList const & valueList, ChildIter const begChild, ChildIter const endChild,
-               bool isRoot = false)
+void WriteNode(Sink & sink, Serializer const & serializer, TrieChar baseChar, ValueList const & valueList,
+               ChildIter const begChild, ChildIter const endChild, bool isRoot = false)
 {
   uint32_t const valueCount = base::asserted_cast<uint32_t>(valueList.Size());
   if (begChild == endChild && !isRoot)
@@ -69,8 +68,7 @@ void WriteNode(Sink & sink, Serializer const & serializer, TrieChar baseChar,
     return;
   }
   uint32_t const childCount = base::asserted_cast<uint32_t>(endChild - begChild);
-  uint8_t const header =
-      static_cast<uint32_t>((std::min(valueCount, 3U) << 6) + std::min(childCount, 63U));
+  uint8_t const header = static_cast<uint32_t>((std::min(valueCount, 3U) << 6) + std::min(childCount, 63U));
   sink.Write(&header, 1);
   if (valueCount >= 3)
     WriteVarUint(sink, valueCount);
@@ -120,9 +118,7 @@ void WriteNode(Sink & sink, Serializer const & serializer, TrieChar baseChar,
 
 struct ChildInfo
 {
-  ChildInfo(bool isLeaf, uint32_t size, TrieChar c) : m_isLeaf(isLeaf), m_size(size), m_edge(1, c)
-  {
-  }
+  ChildInfo(bool isLeaf, uint32_t size, TrieChar c) : m_isLeaf(isLeaf), m_size(size), m_edge(1, c) {}
 
   uint32_t Size() const { return m_size; }
   bool IsLeaf() const { return m_isLeaf; }
@@ -171,15 +167,14 @@ struct NodeInfo
 };
 
 template <typename Sink, typename ValueList, typename Serializer>
-void WriteNodeReverse(Sink & sink, Serializer const & serializer, TrieChar baseChar,
-                      NodeInfo<ValueList> & node, bool isRoot = false)
+void WriteNodeReverse(Sink & sink, Serializer const & serializer, TrieChar baseChar, NodeInfo<ValueList> & node,
+                      bool isRoot = false)
 {
   using OutStorage = buffer_vector<uint8_t, 64>;
   OutStorage out;
   PushBackByteSink<OutStorage> outSink(out);
   node.FinalizeValueList();
-  WriteNode(outSink, serializer, baseChar, node.m_valueList, node.m_children.rbegin(),
-            node.m_children.rend(), isRoot);
+  WriteNode(outSink, serializer, baseChar, node.m_valueList, node.m_children.rbegin(), node.m_children.rend(), isRoot);
   std::reverse(out.begin(), out.end());
   sink.Write(out.data(), out.size());
 }
@@ -204,8 +199,8 @@ void PopNodes(Sink & sink, Serializer const & serializer, Nodes & nodes, size_t
     else
     {
       WriteNodeReverse(sink, serializer, node.m_char, node);
-      prevNode.m_children.emplace_back(
-          node.m_children.empty(), static_cast<uint32_t>(sink.Pos() - node.m_begPos), node.m_char);
+      prevNode.m_children.emplace_back(node.m_children.empty(), static_cast<uint32_t>(sink.Pos() - node.m_begPos),
+                                       node.m_char);
     }
 
     nodes.pop_back();
diff --git a/libs/indexer/trie_reader.hpp b/libs/indexer/trie_reader.hpp
index b47c41006..242c9d6cb 100644
--- a/libs/indexer/trie_reader.hpp
+++ b/libs/indexer/trie_reader.hpp
@@ -54,7 +54,8 @@ public:
   using Iterator<ValueList>::m_edges;
 
   Iterator0(Reader const & reader, TrieChar baseChar, Serializer const & serializer)
-    : m_reader(reader), m_serializer(serializer)
+    : m_reader(reader)
+    , m_serializer(serializer)
   {
     ParseNode(baseChar);
   }
@@ -74,13 +75,10 @@ public:
     uint32_t const size = m_edgeInfo[i + 1].m_offset - offset;
 
     if (m_edgeInfo[i].m_isLeaf)
-    {
-      return std::make_unique<LeafIterator0<ValueList, Serializer>>(m_reader.SubReader(offset, size),
-                                                                    m_serializer);
-    }
+      return std::make_unique<LeafIterator0<ValueList, Serializer>>(m_reader.SubReader(offset, size), m_serializer);
 
-    return std::make_unique<Iterator0<Reader, ValueList, Serializer>>(
-        m_reader.SubReader(offset, size), this->m_edges[i].m_label.back(), m_serializer);
+    return std::make_unique<Iterator0<Reader, ValueList, Serializer>>(m_reader.SubReader(offset, size),
+                                                                      this->m_edges[i].m_label.back(), m_serializer);
   }
 
 private:
@@ -161,7 +159,6 @@ private:
 template <class Reader, class ValueList, class Serializer>
 std::unique_ptr<Iterator<ValueList>> ReadTrie(Reader const & reader, Serializer const & serializer)
 {
-  return std::make_unique<Iterator0<Reader, ValueList, Serializer>>(reader, kDefaultChar,
-                                                                    serializer);
+  return std::make_unique<Iterator0<Reader, ValueList, Serializer>>(reader, kDefaultChar, serializer);
 }
 }  // namespace trie
diff --git a/libs/indexer/types_mapping.cpp b/libs/indexer/types_mapping.cpp
index ee6cf655f..dfa4389f0 100644
--- a/libs/indexer/types_mapping.cpp
+++ b/libs/indexer/types_mapping.cpp
@@ -46,7 +46,7 @@ void IndexAndTypeMapping::Load(istream & s)
 
 void IndexAndTypeMapping::Add(uint32_t ind, uint32_t type, bool isMainTypeDescription)
 {
-  ASSERT_EQUAL ( ind, m_types.size(), () );
+  ASSERT_EQUAL(ind, m_types.size(), ());
 
   m_types.push_back(type);
   if (isMainTypeDescription)
diff --git a/libs/indexer/types_mapping.hpp b/libs/indexer/types_mapping.hpp
index 65b932bce..a26e8d707 100644
--- a/libs/indexer/types_mapping.hpp
+++ b/libs/indexer/types_mapping.hpp
@@ -6,7 +6,6 @@
 #include <map>
 #include <vector>
 
-
 class IndexAndTypeMapping
 {
 public:
@@ -16,10 +15,7 @@ public:
 
   static constexpr uint32_t INVALID_TYPE = 0;
   /// @return INVALID_TYPE If \a ind is out of bounds.
-  uint32_t GetType(uint32_t ind) const
-  {
-    return ind < m_types.size() ? m_types[ind] : INVALID_TYPE;
-  }
+  uint32_t GetType(uint32_t ind) const { return ind < m_types.size() ? m_types[ind] : INVALID_TYPE; }
 
   uint32_t GetIndex(uint32_t t) const;
 
diff --git a/libs/indexer/utils.cpp b/libs/indexer/utils.cpp
index 57cb3313d..2efcef88f 100644
--- a/libs/indexer/utils.cpp
+++ b/libs/indexer/utils.cpp
@@ -4,8 +4,7 @@ namespace indexer
 {
 using namespace std;
 
-MwmSet::MwmHandle FindWorld(DataSource const & dataSource,
-                            vector<shared_ptr<MwmInfo>> const & infos)
+MwmSet::MwmHandle FindWorld(DataSource const & dataSource, vector<shared_ptr<MwmInfo>> const & infos)
 {
   MwmSet::MwmHandle handle;
   for (auto const & info : infos)
diff --git a/libs/indexer/utils.hpp b/libs/indexer/utils.hpp
index a739fbe59..bf452b17d 100644
--- a/libs/indexer/utils.hpp
+++ b/libs/indexer/utils.hpp
@@ -1,14 +1,13 @@
 #pragma once
 
-#include "indexer/mwm_set.hpp"
 #include "indexer/data_source.hpp"
+#include "indexer/mwm_set.hpp"
 
 #include <memory>
 #include <vector>
 
 namespace indexer
 {
-MwmSet::MwmHandle FindWorld(DataSource const & dataSource,
-                            std::vector<std::shared_ptr<MwmInfo>> const & infos);
+MwmSet::MwmHandle FindWorld(DataSource const & dataSource, std::vector<std::shared_ptr<MwmInfo>> const & infos);
 MwmSet::MwmHandle FindWorld(DataSource const & dataSource);
 }  // namespace indexer
diff --git a/libs/indexer/validate_and_format_contacts.cpp b/libs/indexer/validate_and_format_contacts.cpp
index 96a4609a2..215d77492 100644
--- a/libs/indexer/validate_and_format_contacts.cpp
+++ b/libs/indexer/validate_and_format_contacts.cpp
@@ -4,7 +4,7 @@
 
 #include "base/string_utils.hpp"
 
-#include <cstring>    // strlen
+#include <cstring>  // strlen
 #include <regex>
 
 namespace osm
@@ -75,9 +75,9 @@ bool IsProtocolSpecified(string const & website)
 
 string fediverseHandleToUrl(string_view handle)
 {
-    // Convert stored username@domain.name to https://domain.name/username
-    vector<string_view> const handleElements = strings::Tokenize(handle, "@");
-    return string{kHttps}.append(handleElements[1]).append("/@").append(handleElements[0]);
+  // Convert stored username@domain.name to https://domain.name/username
+  vector<string_view> const handleElements = strings::Tokenize(handle, "@");
+  return string{kHttps}.append(handleElements[1]).append("/@").append(handleElements[0]);
 }
 
 // TODO: Current implementation looks only for restricted symbols from ASCII block ignoring
@@ -87,15 +87,11 @@ string fediverseHandleToUrl(string_view handle)
 bool containsInvalidFBSymbol(string const & facebookPage, size_t startIndex = 0)
 {
   auto const size = facebookPage.size();
-  for (auto i=startIndex; i<size; ++i)
+  for (auto i = startIndex; i < size; ++i)
   {
-    const char ch = facebookPage[i];
+    char const ch = facebookPage[i];
     // Forbid all ASCII symbols except '-', '.', and '_'
-    if ((ch >= ' ' && ch <= ',') ||
-        ch == '/' ||
-        (ch >= ':' && ch <= '@') ||
-        (ch >= '[' && ch <= '^') ||
-        ch == '`' ||
+    if ((ch >= ' ' && ch <= ',') || ch == '/' || (ch >= ':' && ch <= '@') || (ch >= '[' && ch <= '^') || ch == '`' ||
         (ch >= '{' && ch <= '~'))
       return true;
   }
@@ -120,7 +116,7 @@ string ValidateAndFormat_facebook(string const & facebookPage)
     if (facebookPage.length() >= 6 && !containsInvalidFBSymbol(facebookPage, 1))
       return facebookPage.substr(1);
     else
-      return {}; // Invalid symbol in Facebook username of page name.
+      return {};  // Invalid symbol in Facebook username of page name.
   }
   else
   {
@@ -135,8 +131,8 @@ string ValidateAndFormat_facebook(string const & facebookPage)
   url::Url const url = url::Url::FromString(facebookPage);
   string const domain = strings::MakeLowerCase(url.GetHost());
   // Check Facebook domain name.
-  if (domain.starts_with(kFacebookDot) || domain.starts_with(kFbDot) ||
-      domain.find(".facebook.") != string::npos || domain.find(".fb.") != string::npos)
+  if (domain.starts_with(kFacebookDot) || domain.starts_with(kFbDot) || domain.find(".facebook.") != string::npos ||
+      domain.find(".fb.") != string::npos)
   {
     auto webPath = url.GetPath();
     // In case of https://www.facebook.com/profile.php?id=100085707580841 extract only ID.
@@ -242,8 +238,7 @@ string ValidateAndFormat_vk(string const & vkPage)
   auto const url = url::Url::FromString(vkPage);
   auto const domain = strings::MakeLowerCase(url.GetHost());
   // Check VK domain name: "vk.com" or "vkontakte.ru" or "*.vk.com" or "*.vkontakte.ru".
-  if (domain == kVkCom || domain.ends_with(kDotVkCom) ||
-      domain == kVkontakteRu || domain.ends_with(kDotVkontakteRu))
+  if (domain == kVkCom || domain.ends_with(kDotVkCom) || domain == kVkontakteRu || domain.ends_with(kDotVkontakteRu))
   {
     auto webPath = url.GetPath();
     // Strip last '/' symbol.
@@ -350,20 +345,20 @@ string ValidateAndFormat_fediverse(string const & fediPage)
   url::Url const parsedUrl = url::Url::FromString(fediPage);
   string const parsedDomain = strings::MakeLowerCase(parsedUrl.GetHost());
   string path = parsedUrl.GetPath();
-  path.erase(path.find_last_not_of('/') + 1); // Strip any trailing '/' symbol
+  path.erase(path.find_last_not_of('/') + 1);  // Strip any trailing '/' symbol
 
   // Could be /users/ type - check and remove to be left with just username.
-  if (path.starts_with("users/")) // first slash is already removed by GetPath()
+  if (path.starts_with("users/"))  // first slash is already removed by GetPath()
   {
     path.erase(0, 6);
-    path = stripAtSymbol(path); // handle technically wrong but parseable domain/users/@username
+    path = stripAtSymbol(path);  // handle technically wrong but parseable domain/users/@username
   }
   // domain.name/@username - username has to start with @
   else if (path.starts_with("@"))
     path = stripAtSymbol(path);
   // unknown/invalid format
   else
-      return {};
+    return {};
 
   // Then construct the final username@domain.name format
   path.append("@").append(parsedDomain);
@@ -394,8 +389,8 @@ string ValidateAndFormat_bluesky(string const & bskyPage)
     // First remove url bits if they exist
     if (domain.starts_with(kBskyApp) && path.starts_with("profile/"))
     {
-      path.erase(0, 8); // Strip "profile/" part
-      path.erase(path.find_last_not_of('/') + 1); // Strip last '/' symbol if exists
+      path.erase(0, 8);                            // Strip "profile/" part
+      path.erase(path.find_last_not_of('/') + 1);  // Strip last '/' symbol if exists
 
       // Then make sure it matches {@?}{user/domain.name}
       if (regex_match(path, s_blueskyRegex))
@@ -448,8 +443,8 @@ bool ValidateFacebookPage(string const & page)
 
   string const domain = strings::MakeLowerCase(url::Url::FromString(page).GetHost());
   // Validate domain name: "facebook.*" or "fb.*" or "*.facebook.*" or "*.fb.*".
-  return (domain.starts_with(kFacebookDot) || domain.starts_with(kFbDot) ||
-          domain.find(".facebook.") != string::npos || domain.find(".fb.") != string::npos);
+  return (domain.starts_with(kFacebookDot) || domain.starts_with(kFbDot) || domain.find(".facebook.") != string::npos ||
+          domain.find(".fb.") != string::npos);
 }
 
 bool ValidateInstagramPage(string const & page)
@@ -474,7 +469,7 @@ bool ValidateTwitterPage(string const & page)
     return true;
 
   if (!ValidateWebsite(page))
-    return regex_match(page, s_twitterRegex); // Rules are defined here: https://stackoverflow.com/q/11361044
+    return regex_match(page, s_twitterRegex);  // Rules are defined here: https://stackoverflow.com/q/11361044
 
   string const domain = strings::MakeLowerCase(url::Url::FromString(page).GetHost());
   return domain == kXCom || domain.ends_with(kDotXCom) || domain == kTwitterCom || domain.ends_with(kDotTwitterCom);
@@ -510,8 +505,7 @@ bool ValidateVkPage(string const & page)
     return false;
 
   string const domain = strings::MakeLowerCase(url::Url::FromString(page).GetHost());
-  return domain == kVkCom || domain.ends_with(kDotVkCom)
-         || domain == kVkontakteRu || domain.ends_with(kDotVkontakteRu);
+  return domain == kVkCom || domain.ends_with(kDotVkCom) || domain == kVkontakteRu || domain.ends_with(kDotVkontakteRu);
 }
 
 bool ValidateLinePage(string const & page)
@@ -556,10 +550,10 @@ bool ValidateFediversePage(string const & page)
   string path = pageUrl.GetPath();
 
   // Could be /users/ type - check and remove to be left with just username.
-  if (path.starts_with("users/")) // first slash is already removed by GetPath()
+  if (path.starts_with("users/"))  // first slash is already removed by GetPath()
   {
     path.erase(0, 6);
-    path = stripAtSymbol(path); // handle technically wrong but parseable domain/users/@username
+    path = stripAtSymbol(path);  // handle technically wrong but parseable domain/users/@username
   }
   // domain.name/@username - username has to start with @
   else if (path.starts_with("@"))
@@ -568,7 +562,7 @@ bool ValidateFediversePage(string const & page)
   else
     return false;
 
-  path.erase(path.find_last_not_of('/') + 1); // Strip any trailing '/' symbol
+  path.erase(path.find_last_not_of('/') + 1);  // Strip any trailing '/' symbol
   // Then construct the username@domain.name format
   path.append("@").append(domain);
   // And return if it's valid or not
@@ -597,8 +591,8 @@ bool ValidateBlueskyPage(string const & page)
   // First remove url bits if they exist
   if (domain.starts_with(kBskyApp) && path.starts_with("profile/"))
   {
-    path.erase(0, 8); // Strip "profile/" part
-    path.erase(path.find_last_not_of('/') + 1); // Strip last '/' symbol if exists
+    path.erase(0, 8);                            // Strip "profile/" part
+    path.erase(path.find_last_not_of('/') + 1);  // Strip last '/' symbol if exists
     // Then try to parse the remaining text as a username again
     if (regex_match(path, s_blueskyRegex))
       return true;
@@ -609,19 +603,17 @@ bool ValidateBlueskyPage(string const & page)
 
 bool isSocialContactTag(string_view tag)
 {
-  return tag == kInstagram || tag == kFacebook || tag == kTwitter || tag == kVk || tag == kLine || tag == kFediverse || tag == kBluesky || tag == kPanoramax;
+  return tag == kInstagram || tag == kFacebook || tag == kTwitter || tag == kVk || tag == kLine || tag == kFediverse ||
+         tag == kBluesky || tag == kPanoramax;
 }
 
 bool isSocialContactTag(MapObject::MetadataID const metaID)
 {
   return metaID == MapObject::MetadataID::FMD_CONTACT_INSTAGRAM ||
          metaID == MapObject::MetadataID::FMD_CONTACT_FACEBOOK ||
-         metaID == MapObject::MetadataID::FMD_CONTACT_TWITTER ||
-         metaID == MapObject::MetadataID::FMD_CONTACT_VK ||
-         metaID == MapObject::MetadataID::FMD_CONTACT_LINE ||
-         metaID == MapObject::MetadataID::FMD_CONTACT_FEDIVERSE ||
-         metaID == MapObject::MetadataID::FMD_CONTACT_BLUESKY ||
-         metaID == MapObject::MetadataID::FMD_PANORAMAX;
+         metaID == MapObject::MetadataID::FMD_CONTACT_TWITTER || metaID == MapObject::MetadataID::FMD_CONTACT_VK ||
+         metaID == MapObject::MetadataID::FMD_CONTACT_LINE || metaID == MapObject::MetadataID::FMD_CONTACT_FEDIVERSE ||
+         metaID == MapObject::MetadataID::FMD_CONTACT_BLUESKY || metaID == MapObject::MetadataID::FMD_PANORAMAX;
 }
 
 // Functions ValidateAndFormat_{facebook,instagram,twitter,vk}(...) by default strip domain name
@@ -640,13 +632,13 @@ string socialContactToURL(string_view tag, string_view value)
     return string{kUrlVk}.append(value);
   if (tag == kFediverse)
     return fediverseHandleToUrl(value);
-  if (tag == kBluesky) // In future
+  if (tag == kBluesky)  // In future
     return string{kUrlBluesky}.append(value);
   if (tag == kLine)
   {
-    if (value.find('/') == string::npos) // 'value' is a username.
+    if (value.find('/') == string::npos)  // 'value' is a username.
       return string{kUrlLine}.append(value);
-    else // 'value' is an URL.
+    else  // 'value' is an URL.
       return string{kHttps}.append(value);
   }
   if (tag == kPanoramax)
@@ -661,28 +653,20 @@ string socialContactToURL(MapObject::MetadataID metaID, string_view value)
 
   switch (metaID)
   {
-    case MapObject::MetadataID::FMD_CONTACT_INSTAGRAM:
-      return string{kUrlInstagram}.append(value);
-    case MapObject::MetadataID::FMD_CONTACT_FACEBOOK:
-      return string{kUrlFacebook}.append(value);
-    case MapObject::MetadataID::FMD_CONTACT_TWITTER:
-      return string{kUrlTwitter}.append(value);
-    case MapObject::MetadataID::FMD_CONTACT_VK:
-      return string{kUrlVk}.append(value);
-    case MapObject::MetadataID::FMD_CONTACT_FEDIVERSE:
-      return fediverseHandleToUrl(value);
-    case MapObject::MetadataID::FMD_CONTACT_BLUESKY:
-      return string{kUrlBluesky}.append(value);
-    case MapObject::MetadataID::FMD_CONTACT_LINE:
-      if (value.find('/') == string::npos) // 'value' is a username.
-        return string{kUrlLine}.append(value);
-      else // 'value' is an URL.
-        return string{kHttps}.append(value);
-    case MapObject::MetadataID::FMD_PANORAMAX:
-      return string{kUrlPanoramax}.append(value);
-    default:
-      return string{value};
+  case MapObject::MetadataID::FMD_CONTACT_INSTAGRAM: return string{kUrlInstagram}.append(value);
+  case MapObject::MetadataID::FMD_CONTACT_FACEBOOK: return string{kUrlFacebook}.append(value);
+  case MapObject::MetadataID::FMD_CONTACT_TWITTER: return string{kUrlTwitter}.append(value);
+  case MapObject::MetadataID::FMD_CONTACT_VK: return string{kUrlVk}.append(value);
+  case MapObject::MetadataID::FMD_CONTACT_FEDIVERSE: return fediverseHandleToUrl(value);
+  case MapObject::MetadataID::FMD_CONTACT_BLUESKY: return string{kUrlBluesky}.append(value);
+  case MapObject::MetadataID::FMD_CONTACT_LINE:
+    if (value.find('/') == string::npos)  // 'value' is a username.
+      return string{kUrlLine}.append(value);
+    else  // 'value' is an URL.
+      return string{kHttps}.append(value);
+  case MapObject::MetadataID::FMD_PANORAMAX: return string{kUrlPanoramax}.append(value);
+  default: return string{value};
   }
 }
 
-} // namespace osm
+}  // namespace osm
diff --git a/libs/kml/header_binary.hpp b/libs/kml/header_binary.hpp
index cc00eab3f..7e7dfd4cf 100644
--- a/libs/kml/header_binary.hpp
+++ b/libs/kml/header_binary.hpp
@@ -11,25 +11,25 @@ namespace binary
 enum class Version : uint8_t
 {
   V0 = 0,
-  V1 = 1,   // 11th April 2018: new Point2D storage, added deviceId, feature name -> custom name.
-  V2 = 2,   // 25th April 2018: added serverId.
-  V3 = 3,   // 7th May 2018: persistent feature types. V3 is binary compatible with lower versions.
-  V4 = 4,   // 26th August 2019: key-value properties and nearestToponym for bookmarks and tracks,
-            // cities -> toponyms.
-  V5 = 5,   // 21st November 2019: extended color palette.
-  V6 = 6,   // 3rd December 2019: extended bookmark icons. V6 is binary compatible with V4 and V5
-            // versions.
-  V7 = 7,   // 13th February 2020: track points are replaced by points with altitude.
-  V8 = 8,   // 24 September 2020: add compilations to types and corresponding section to kmb and
-            // tags to kml
-  V9 = 9,   // 01 October 2020: add minZoom to bookmarks
+  V1 = 1,  // 11th April 2018: new Point2D storage, added deviceId, feature name -> custom name.
+  V2 = 2,  // 25th April 2018: added serverId.
+  V3 = 3,  // 7th May 2018: persistent feature types. V3 is binary compatible with lower versions.
+  V4 = 4,  // 26th August 2019: key-value properties and nearestToponym for bookmarks and tracks,
+           // cities -> toponyms.
+  V5 = 5,  // 21st November 2019: extended color palette.
+  V6 = 6,  // 3rd December 2019: extended bookmark icons. V6 is binary compatible with V4 and V5
+           // versions.
+  V7 = 7,  // 13th February 2020: track points are replaced by points with altitude.
+  V8 = 8,  // 24 September 2020: add compilations to types and corresponding section to kmb and
+           // tags to kml
+  V9 = 9,  // 01 October 2020: add minZoom to bookmarks
   Latest = V9,
-  V8MM = 10, // 27 July 2023: MapsMe released version v15.0.71617. Technically its version is 8
-             // (first byte is 0x08), but it's not compatible with V8 from this repo. It has
-             // no compilations.
-  V9MM = 11  // In July 2024 MapsMe released version with a new KMB format. Technically its version is 9
-             // (first byte is 0x09), but it's not compatible with OrganicMaps V9 from this repo.
-             // It supports multiline geometry.
+  V8MM = 10,  // 27 July 2023: MapsMe released version v15.0.71617. Technically its version is 8
+              // (first byte is 0x08), but it's not compatible with V8 from this repo. It has
+              // no compilations.
+  V9MM = 11   // In July 2024 MapsMe released version with a new KMB format. Technically its version is 9
+              // (first byte is 0x09), but it's not compatible with OrganicMaps V9 from this repo.
+              // It supports multiline geometry.
 };
 
 inline std::string DebugPrint(Version v)
@@ -75,10 +75,7 @@ struct Header
     return visitor.m_size;
   }
 
-  bool HasCompilationsSection() const
-  {
-    return m_version == Version::V8 || m_version == Version::V9;
-  }
+  bool HasCompilationsSection() const { return m_version == Version::V8 || m_version == Version::V9; }
 
   Version m_version = Version::Latest;
   uint64_t m_categoryOffset = 0;
diff --git a/libs/kml/kmb_to_kml/kmb_to_kml.cpp b/libs/kml/kmb_to_kml/kmb_to_kml.cpp
index 60aa36b48..764dd76f6 100644
--- a/libs/kml/kmb_to_kml/kmb_to_kml.cpp
+++ b/libs/kml/kmb_to_kml/kmb_to_kml.cpp
@@ -8,10 +8,10 @@
 
 #include <iostream>
 
-
-int main(int argc, char** argv)
+int main(int argc, char ** argv)
 {
-  if (argc < 2) {
+  if (argc < 2)
+  {
     std::cout << "Converts kmb file(s) to kml\n";
     std::cout << "Usage: " << argv[0] << " path_to_kmb_file [path_to_another_kmb_file...]\n";
     return 1;
@@ -54,6 +54,7 @@ int main(int argc, char** argv)
       return 1;
     }
     std::cout << "Saved converted file as " << filePath << std::endl;
-  } while (--argc > 1);
+  }
+  while (--argc > 1);
   return 0;
 }
diff --git a/libs/kml/kml_tests/gpx_tests.cpp b/libs/kml/kml_tests/gpx_tests.cpp
index a1d90a26c..1d77396fe 100644
--- a/libs/kml/kml_tests/gpx_tests.cpp
+++ b/libs/kml/kml_tests/gpx_tests.cpp
@@ -14,11 +14,12 @@ namespace gpx_tests
 static kml::FileData LoadGpxFromString(std::string_view content)
 {
   TEST_NO_THROW(
-  {
-    kml::FileData dataFromText;
-    kml::DeserializerGpx(dataFromText).Deserialize(MemReader(content));
-    return dataFromText;
-  }, ());
+      {
+        kml::FileData dataFromText;
+        kml::DeserializerGpx(dataFromText).Deserialize(MemReader(content));
+        return dataFromText;
+      },
+      ());
 }
 
 static kml::FileData LoadGpxFromFile(std::string const & file)
@@ -122,12 +123,14 @@ UNIT_TEST(Gpx_Test_Track_Without_Timestamps)
   {
     auto const & line = lines[0];
     TEST_EQUAL(line.size(), 3, ());
-    TEST_EQUAL(line.back(), geometry::PointWithAltitude(mercator::FromLatLon(54.05293900056246, 25.72998046875), 0), ());
+    TEST_EQUAL(line.back(), geometry::PointWithAltitude(mercator::FromLatLon(54.05293900056246, 25.72998046875), 0),
+               ());
   }
   {
     auto const & line = lines[1];
     TEST_EQUAL(line.size(), 2, ());
-    TEST_EQUAL(line.back(), geometry::PointWithAltitude(mercator::FromLatLon(54.32933804825253, 25.136718750000004), 0), ());
+    TEST_EQUAL(line.back(), geometry::PointWithAltitude(mercator::FromLatLon(54.32933804825253, 25.136718750000004), 0),
+               ());
   }
   // Also test default colors for tracks.
   {
@@ -284,8 +287,10 @@ UNIT_TEST(Route)
   auto line = dataFromFile.m_tracksData[0].m_geometry.m_lines[0];
   TEST_EQUAL(line.size(), 2, ());
   TEST_EQUAL(dataFromFile.m_categoryData.m_name[kml::kDefaultLang], "Some random route", ());
-  TEST_EQUAL(line[0], geometry::PointWithAltitude(mercator::FromLatLon(48.20984622935899, 16.376023292541507), 184), ());
-  TEST_EQUAL(line[1], geometry::PointWithAltitude(mercator::FromLatLon(48.209503040543545, 16.381065845489506), 187), ());
+  TEST_EQUAL(line[0], geometry::PointWithAltitude(mercator::FromLatLon(48.20984622935899, 16.376023292541507), 184),
+             ());
+  TEST_EQUAL(line[1], geometry::PointWithAltitude(mercator::FromLatLon(48.209503040543545, 16.381065845489506), 187),
+             ());
 }
 
 UNIT_TEST(Color)
@@ -396,5 +401,4 @@ UNIT_TEST(MapGarminColor)
   TEST_EQUAL("DarkYellow", kml::gpx::MapGarminColor(0xb5b721ff), ());
 }
 
-
 }  // namespace gpx_tests
diff --git a/libs/kml/kml_tests/minzoom_quadtree_tests.cpp b/libs/kml/kml_tests/minzoom_quadtree_tests.cpp
index 57e32b4e4..c0897a297 100644
--- a/libs/kml/kml_tests/minzoom_quadtree_tests.cpp
+++ b/libs/kml/kml_tests/minzoom_quadtree_tests.cpp
@@ -36,10 +36,8 @@ UNIT_TEST(Kml_MinzoomQuadtree_PopulationGrowthRate)
     size_t const kMaxDepth = 5;
     double const step = 1.0 / (1 << kMaxDepth);
     for (int x = 0; x < (1 << kMaxDepth); ++x)
-    {
       for (int y = 0; y < (1 << kMaxDepth); ++y)
         minZoomQuadtree.Add(MakeGlobalPoint((0.5 + x) * step, (0.5 + y) * step), 0.0 /* rank */);
-    }
     double const kCountPerTile = 1.0;
     std::map<int /* zoom */, size_t> populationCount;
     auto const incZoomPopulation = [&](double & rank, int zoom)
@@ -59,16 +57,13 @@ UNIT_TEST(Kml_MinzoomQuadtree_PopulationGrowthRate)
     TEST_EQUAL(partialSums.front(), 1, ());
     TEST_EQUAL(partialSums.back(), (1 << (kMaxDepth * 2)), ());
     auto const isGrowthExponential = [](size_t lhs, size_t rhs) { return rhs != 4 * lhs; };
-    TEST(std::adjacent_find(partialSums.cbegin(), partialSums.cend(), isGrowthExponential) ==
-         partialSums.cend(), (partialSums));
+    TEST(std::adjacent_find(partialSums.cbegin(), partialSums.cend(), isGrowthExponential) == partialSums.cend(),
+         (partialSums));
   }
 
   std::mt19937 g(0);
 
-  auto const gen = [&g]
-  {
-    return std::generate_canonical<double, std::numeric_limits<uint32_t>::digits>(g);
-  };
+  auto const gen = [&g] { return std::generate_canonical<double, std::numeric_limits<uint32_t>::digits>(g); };
 
   for (int i = 0; i < 5; ++i)
   {
@@ -100,7 +95,8 @@ UNIT_TEST(Kml_MinzoomQuadtree_PopulationGrowthRate)
     for (size_t i = 0; i < partialSums.size(); ++i)
     {
       auto const maxAbsErr = 4.0 * std::ceil(std::sqrt(kCountPerTile * areaScale)) + 4.0;
-      TEST_LESS_OR_EQUAL(partialSums[i], kCountPerTile * areaScale + maxAbsErr, (kCountPerTile, maxAbsErr, partialSums));
+      TEST_LESS_OR_EQUAL(partialSums[i], kCountPerTile * areaScale + maxAbsErr,
+                         (kCountPerTile, maxAbsErr, partialSums));
       areaScale *= 4.0;
     }
   }
@@ -123,10 +119,7 @@ UNIT_TEST(Kml_MinzoomQuadtree_CornerCases)
   {
     kml::MinZoomQuadtree<double /* rank */, std::less<double>> minZoomQuadtree{{} /* less */};
     double const kCountPerTile = 100.0;
-    auto const unreachable = [&](double & /* rank */, int /* zoom */)
-    {
-      TEST(false, ());
-    };
+    auto const unreachable = [&](double & /* rank */, int /* zoom */) { TEST(false, ()); };
     minZoomQuadtree.SetMinZoom(kCountPerTile, scales::GetUpperStyleScale(), unreachable);
   }
 }
@@ -137,10 +130,8 @@ UNIT_TEST(Kml_MinzoomQuadtree_MaxZoom)
   size_t const kMaxDepth = 5;
   double const step = 1.0 / (1 << kMaxDepth);
   for (int x = 0; x < (1 << kMaxDepth); ++x)
-  {
     for (int y = 0; y < (1 << kMaxDepth); ++y)
       minZoomQuadtree.Add(MakeGlobalPoint((0.5 + x) * step, (0.5 + y) * step), 0.0 /* rank */);
-  }
   double const kCountPerTile = 1.0;
   std::map<int /* zoom */, size_t> populationCount;
   auto const incZoomPopulation = [&](double & rank, int zoom)
@@ -162,6 +153,7 @@ UNIT_TEST(Kml_MinzoomQuadtree_MaxZoom)
   TEST_EQUAL(partialSums.back(), (1 << (kMaxDepth * 2)), ());
   auto const isGrowthExponential = [](size_t lhs, size_t rhs) { return rhs != 4 * lhs; };
   TEST(std::adjacent_find(partialSums.cbegin(), std::prev(partialSums.cend()), isGrowthExponential) ==
-       std::prev(partialSums.cend()), (partialSums));
+           std::prev(partialSums.cend()),
+       (partialSums));
   TEST_LESS_OR_EQUAL(4 * *std::prev(partialSums.cend(), 2), partialSums.back(), ());
 }
diff --git a/libs/kml/kml_tests/serdes_tests.cpp b/libs/kml/kml_tests/serdes_tests.cpp
index e66ba164c..477bb05fc 100644
--- a/libs/kml/kml_tests/serdes_tests.cpp
+++ b/libs/kml/kml_tests/serdes_tests.cpp
@@ -87,9 +87,7 @@ kml::FileData GenerateKmlFileData()
   bookmarkData.m_visible = false;
   bookmarkData.m_nearestToponym = "12345";
   bookmarkData.m_minZoom = 10;
-  bookmarkData.m_properties = {{"bm_property1", "value1"},
-                               {"bm_property2", "value2"},
-                               {"score", "5"}};
+  bookmarkData.m_properties = {{"bm_property1", "value1"}, {"bm_property2", "value2"}, {"score", "5"}};
   bookmarkData.m_compilations = {1, 2, 3, 4, 5};
   result.m_bookmarksData.emplace_back(std::move(bookmarkData));
 
@@ -103,9 +101,7 @@ kml::FileData GenerateKmlFileData()
                         {7.0, {kml::PredefinedColor::None, 0x00ff00ff}}};
   trackData.m_timestamp = kml::TimestampClock::from_time_t(900);
 
-  trackData.m_geometry.AddLine({
-    {{45.9242, 56.8679}, 1}, {{45.2244, 56.2786}, 2}, {{45.1964, 56.9832}, 3}
-  });
+  trackData.m_geometry.AddLine({{{45.9242, 56.8679}, 1}, {{45.2244, 56.2786}, 2}, {{45.1964, 56.9832}, 3}});
 
   trackData.m_visible = false;
   trackData.m_nearestToponyms = {"12345", "54321", "98765"};
@@ -166,9 +162,7 @@ kml::FileData GenerateKmlFileDataForTrackWithoutTimestamps()
   auto data = GenerateKmlFileData();
   auto & trackData = data.m_tracksData[0];
   trackData.m_geometry.Clear();
-  trackData.m_geometry.AddLine({
-    {{45.9242, 56.8679}, 1}, {{45.2244, 56.2786}, 2}, {{45.1964, 56.9832}, 3}
-  });
+  trackData.m_geometry.AddLine({{{45.9242, 56.8679}, 1}, {{45.2244, 56.2786}, 2}, {{45.1964, 56.9832}, 3}});
   trackData.m_geometry.AddTimestamps({});
   return data;
 }
@@ -180,21 +174,15 @@ kml::FileData GenerateKmlFileDataForTrackWithTimestamps()
   trackData.m_geometry.Clear();
 
   // track 1 (without timestamps)
-  trackData.m_geometry.AddLine({
-    {{45.9242, 56.8679}, 1}, {{45.2244, 56.2786}, 2}, {{45.1964, 56.9832}, 3}
-  });
+  trackData.m_geometry.AddLine({{{45.9242, 56.8679}, 1}, {{45.2244, 56.2786}, 2}, {{45.1964, 56.9832}, 3}});
   trackData.m_geometry.AddTimestamps({});
 
   // track 2
-  trackData.m_geometry.AddLine({
-    {{45.9242, 56.8679}, 1}, {{45.2244, 56.2786}, 2}, {{45.1964, 56.9832}, 3}
-  });
+  trackData.m_geometry.AddLine({{{45.9242, 56.8679}, 1}, {{45.2244, 56.2786}, 2}, {{45.1964, 56.9832}, 3}});
   trackData.m_geometry.AddTimestamps({0.0, 1.0, 2.0});
 
   // track 3
-  trackData.m_geometry.AddLine({
-    {{45.9242, 56.8679}, 1}, {{45.2244, 56.2786}, 2}
-  });
+  trackData.m_geometry.AddLine({{{45.9242, 56.8679}, 1}, {{45.2244, 56.2786}, 2}});
   trackData.m_geometry.AddTimestamps({0.0, 1.0});
   return data;
 }
@@ -207,28 +195,30 @@ UNIT_TEST(Kml_Deserialization_Text_Bin_Memory)
 
   kml::FileData dataFromText;
   TEST_NO_THROW(
-  {
-    kml::DeserializerKml des(dataFromText);
-    MemReader reader(kTextKml, strlen(kTextKml));
-    des.Deserialize(reader);
-  }, ());
+      {
+        kml::DeserializerKml des(dataFromText);
+        MemReader reader(kTextKml, strlen(kTextKml));
+        des.Deserialize(reader);
+      },
+      ());
 
-// TODO: uncomment to output bytes to the log.
-//  std::vector<uint8_t> buffer;
-//  {
-//    kml::binary::SerializerKml ser(dataFromText);
-//    MemWriter<decltype(buffer)> sink(buffer);
-//    ser.Serialize(sink);
-//  }
-//  LOG(LINFO, (FormatBytesFromBuffer(buffer)));
+  // TODO: uncomment to output bytes to the log.
+  //  std::vector<uint8_t> buffer;
+  //  {
+  //    kml::binary::SerializerKml ser(dataFromText);
+  //    MemWriter<decltype(buffer)> sink(buffer);
+  //    ser.Serialize(sink);
+  //  }
+  //  LOG(LINFO, (FormatBytesFromBuffer(buffer)));
 
   kml::FileData dataFromBin;
   TEST_NO_THROW(
-  {
-    MemReader reader(kBinKml.data(), kBinKml.size());
-    kml::binary::DeserializerKml des(dataFromBin);
-    des.Deserialize(reader);
-  }, ());
+      {
+        MemReader reader(kBinKml.data(), kBinKml.size());
+        kml::binary::DeserializerKml des(dataFromBin);
+        des.Deserialize(reader);
+      },
+      ());
 
   TEST_EQUAL(dataFromText, dataFromBin, ());
 }
@@ -295,26 +285,29 @@ UNIT_TEST(Kml_Deserialization_Text_File)
   std::string const kmlFile = base::JoinPath(GetPlatform().TmpDir(), "tmp.kml");
   SCOPE_GUARD(fileGuard, std::bind(&FileWriter::DeleteFileX, kmlFile));
   TEST_NO_THROW(
-  {
-    FileWriter file(kmlFile);
-    file.Write(kTextKml, strlen(kTextKml));
-  }, ());
+      {
+        FileWriter file(kmlFile);
+        file.Write(kTextKml, strlen(kTextKml));
+      },
+      ());
 
   kml::FileData dataFromFile;
   TEST_NO_THROW(
-  {
-    kml::DeserializerKml des(dataFromFile);
-    FileReader reader(kmlFile);
-    des.Deserialize(reader);
-  }, ());
+      {
+        kml::DeserializerKml des(dataFromFile);
+        FileReader reader(kmlFile);
+        des.Deserialize(reader);
+      },
+      ());
 
   kml::FileData dataFromText;
   TEST_NO_THROW(
-  {
-    kml::DeserializerKml des(dataFromText);
-    MemReader reader(kTextKml, strlen(kTextKml));
-    des.Deserialize(reader);
-  }, ());
+      {
+        kml::DeserializerKml des(dataFromText);
+        MemReader reader(kTextKml, strlen(kTextKml));
+        des.Deserialize(reader);
+      },
+      ());
   TEST_EQUAL(dataFromFile, dataFromText, ());
 }
 
@@ -324,26 +317,29 @@ UNIT_TEST(Kml_Deserialization_Bin_File)
   std::string const kmbFile = base::JoinPath(GetPlatform().TmpDir(), "tmp.kmb");
   SCOPE_GUARD(fileGuard, std::bind(&FileWriter::DeleteFileX, kmbFile));
   TEST_NO_THROW(
-  {
-    FileWriter file(kmbFile);
-    file.Write(kBinKml.data(), kBinKml.size());
-  }, ());
+      {
+        FileWriter file(kmbFile);
+        file.Write(kBinKml.data(), kBinKml.size());
+      },
+      ());
 
   kml::FileData dataFromFile;
   TEST_NO_THROW(
-  {
-    kml::binary::DeserializerKml des(dataFromFile);
-    FileReader reader(kmbFile);
-    des.Deserialize(reader);
-  }, ());
+      {
+        kml::binary::DeserializerKml des(dataFromFile);
+        FileReader reader(kmbFile);
+        des.Deserialize(reader);
+      },
+      ());
 
   kml::FileData dataFromBin;
   TEST_NO_THROW(
-  {
-    kml::binary::DeserializerKml des(dataFromBin);
-    MemReader reader(kBinKml.data(), kBinKml.size());
-    des.Deserialize(reader);
-  }, ());
+      {
+        kml::binary::DeserializerKml des(dataFromBin);
+        MemReader reader(kBinKml.data(), kBinKml.size());
+        des.Deserialize(reader);
+      },
+      ());
 
   TEST_EQUAL(dataFromFile, dataFromBin, ());
 }
@@ -357,19 +353,21 @@ UNIT_TEST(Kml_Serialization_Bin_File)
   std::string const kmbFile = base::JoinPath(GetPlatform().TmpDir(), "tmp.kmb");
   SCOPE_GUARD(fileGuard, std::bind(&FileWriter::DeleteFileX, kmbFile));
   TEST_NO_THROW(
-  {
-    kml::binary::SerializerKml ser(data);
-    FileWriter writer(kmbFile);
-    ser.Serialize(writer);
-  }, ());
+      {
+        kml::binary::SerializerKml ser(data);
+        FileWriter writer(kmbFile);
+        ser.Serialize(writer);
+      },
+      ());
 
   kml::FileData dataFromFile;
   TEST_NO_THROW(
-  {
-    kml::binary::DeserializerKml des(dataFromFile);
-    FileReader reader(kmbFile);
-    des.Deserialize(reader);
-  }, ());
+      {
+        kml::binary::DeserializerKml des(dataFromFile);
+        FileReader reader(kmbFile);
+        des.Deserialize(reader);
+      },
+      ());
 
   TEST_EQUAL(data, dataFromFile, ());
 }
@@ -387,37 +385,40 @@ UNIT_TEST(Kml_Serialization_Text_File_Track_Without_Timestamps)
   std::string const kmlFile = base::JoinPath(GetPlatform().TmpDir(), "tmp.kml");
   SCOPE_GUARD(fileGuard, std::bind(&FileWriter::DeleteFileX, kmlFile));
   TEST_NO_THROW(
-  {
-    kml::SerializerKml ser(data);
-    FileWriter sink(kmlFile);
-    ser.Serialize(sink);
-  }, ());
+      {
+        kml::SerializerKml ser(data);
+        FileWriter sink(kmlFile);
+        ser.Serialize(sink);
+      },
+      ());
 
-// TODO: uncomment to output KML to the log.
-//  std::string buffer;
-//  {
-//    kml::SerializerKml ser(data);
-//    MemWriter<decltype(buffer)> sink(buffer);
-//    ser.Serialize(sink);
-//  }
-//  LOG(LINFO, (buffer));
+  // TODO: uncomment to output KML to the log.
+  //  std::string buffer;
+  //  {
+  //    kml::SerializerKml ser(data);
+  //    MemWriter<decltype(buffer)> sink(buffer);
+  //    ser.Serialize(sink);
+  //  }
+  //  LOG(LINFO, (buffer));
 
   kml::FileData dataFromGeneratedFile;
   TEST_NO_THROW(
-  {
-    kml::DeserializerKml des(dataFromGeneratedFile);
-    FileReader reader(kmlFile);
-    des.Deserialize(reader);
-  }, ());
+      {
+        kml::DeserializerKml des(dataFromGeneratedFile);
+        FileReader reader(kmlFile);
+        des.Deserialize(reader);
+      },
+      ());
   TEST_EQUAL(dataFromGeneratedFile, data, ());
 
   kml::FileData dataFromFile;
   TEST_NO_THROW(
-  {
-    kml::DeserializerKml des(dataFromFile);
-    FileReader reader(GetPlatform().TestsDataPathForFile("test_data/kml/generated.kml"));
-    des.Deserialize(reader);
-  }, ());
+      {
+        kml::DeserializerKml des(dataFromFile);
+        FileReader reader(GetPlatform().TestsDataPathForFile("test_data/kml/generated.kml"));
+        des.Deserialize(reader);
+      },
+      ());
   TEST_EQUAL(dataFromFile, data, ());
 
   std::string dataFromFileBuffer;
@@ -444,28 +445,31 @@ UNIT_TEST(Kml_Serialization_Text_File_Tracks_With_Timestamps)
   std::string const kmlFile = base::JoinPath(GetPlatform().TmpDir(), "tmp.kml");
   SCOPE_GUARD(fileGuard, std::bind(&FileWriter::DeleteFileX, kmlFile));
   TEST_NO_THROW(
-  {
-    kml::SerializerKml ser(data);
-    FileWriter sink(kmlFile);
-    ser.Serialize(sink);
-  }, ());
+      {
+        kml::SerializerKml ser(data);
+        FileWriter sink(kmlFile);
+        ser.Serialize(sink);
+      },
+      ());
 
   kml::FileData dataFromGeneratedFile;
   TEST_NO_THROW(
-  {
-    kml::DeserializerKml des(dataFromGeneratedFile);
-    FileReader reader(kmlFile);
-    des.Deserialize(reader);
-  }, ());
+      {
+        kml::DeserializerKml des(dataFromGeneratedFile);
+        FileReader reader(kmlFile);
+        des.Deserialize(reader);
+      },
+      ());
   TEST_EQUAL(dataFromGeneratedFile, data, ());
 
   kml::FileData dataFromFile;
   TEST_NO_THROW(
-  {
-    kml::DeserializerKml des(dataFromFile);
-    FileReader reader(GetPlatform().TestsDataPathForFile("test_data/kml/generated_mixed_tracks.kml"));
-    des.Deserialize(reader);
-  }, ());
+      {
+        kml::DeserializerKml des(dataFromFile);
+        FileReader reader(GetPlatform().TestsDataPathForFile("test_data/kml/generated_mixed_tracks.kml"));
+        des.Deserialize(reader);
+      },
+      ());
   TEST_EQUAL(dataFromFile, data, ());
 }
 
@@ -474,19 +478,21 @@ UNIT_TEST(Kml_Deserialization_From_Bin_V3_And_V4)
 {
   kml::FileData dataFromBinV3;
   TEST_NO_THROW(
-  {
-    MemReader reader(kBinKmlV3.data(), kBinKmlV3.size());
-    kml::binary::DeserializerKml des(dataFromBinV3);
-    des.Deserialize(reader);
-  }, ());
+      {
+        MemReader reader(kBinKmlV3.data(), kBinKmlV3.size());
+        kml::binary::DeserializerKml des(dataFromBinV3);
+        des.Deserialize(reader);
+      },
+      ());
 
   kml::FileData dataFromBinV4;
   TEST_NO_THROW(
-  {
-    MemReader reader(kBinKmlV4.data(), kBinKmlV4.size());
-    kml::binary::DeserializerKml des(dataFromBinV4);
-    des.Deserialize(reader);
-  }, ());
+      {
+        MemReader reader(kBinKmlV4.data(), kBinKmlV4.size());
+        kml::binary::DeserializerKml des(dataFromBinV4);
+        des.Deserialize(reader);
+      },
+      ());
   TEST_EQUAL(dataFromBinV3, dataFromBinV4, ());
 }
 
@@ -494,40 +500,43 @@ UNIT_TEST(Kml_Deserialization_From_Bin_V6_And_V7)
 {
   kml::FileData dataFromBinV6;
   TEST_NO_THROW(
-  {
-    MemReader reader(kBinKmlV6.data(), kBinKmlV6.size());
-    kml::binary::DeserializerKml des(dataFromBinV6);
-    des.Deserialize(reader);
-  }, ());
+      {
+        MemReader reader(kBinKmlV6.data(), kBinKmlV6.size());
+        kml::binary::DeserializerKml des(dataFromBinV6);
+        des.Deserialize(reader);
+      },
+      ());
 
   kml::FileData dataFromBinV7;
   TEST_NO_THROW(
-  {
-    MemReader reader(kBinKmlV7.data(), kBinKmlV7.size());
-    kml::binary::DeserializerKml des(dataFromBinV7);
-    des.Deserialize(reader);
-  }, ());
+      {
+        MemReader reader(kBinKmlV7.data(), kBinKmlV7.size());
+        kml::binary::DeserializerKml des(dataFromBinV7);
+        des.Deserialize(reader);
+      },
+      ());
   TEST_EQUAL(dataFromBinV6, dataFromBinV7, ());
 }
 
-
 UNIT_TEST(Kml_Deserialization_From_Bin_V7_And_V8)
 {
   kml::FileData dataFromBinV7;
   TEST_NO_THROW(
-  {
-    MemReader reader(kBinKmlV7.data(), kBinKmlV7.size());
-    kml::binary::DeserializerKml des(dataFromBinV7);
-    des.Deserialize(reader);
-  }, ());
+      {
+        MemReader reader(kBinKmlV7.data(), kBinKmlV7.size());
+        kml::binary::DeserializerKml des(dataFromBinV7);
+        des.Deserialize(reader);
+      },
+      ());
 
   kml::FileData dataFromBinV8;
   TEST_NO_THROW(
-  {
-    MemReader reader(kBinKmlV8.data(), kBinKmlV8.size());
-    kml::binary::DeserializerKml des(dataFromBinV8);
-    des.Deserialize(reader);
-  }, ());
+      {
+        MemReader reader(kBinKmlV8.data(), kBinKmlV8.size());
+        kml::binary::DeserializerKml des(dataFromBinV8);
+        des.Deserialize(reader);
+      },
+      ());
   TEST_EQUAL(dataFromBinV7, dataFromBinV8, ());
 }
 
@@ -535,22 +544,24 @@ UNIT_TEST(Kml_Deserialization_From_Bin_V8_And_V8MM)
 {
   kml::FileData dataFromBinV8;
   TEST_NO_THROW(
-  {
-    MemReader reader(kBinKmlV8.data(), kBinKmlV8.size());
-    kml::binary::DeserializerKml des(dataFromBinV8);
-    des.Deserialize(reader);
-  }, ());
+      {
+        MemReader reader(kBinKmlV8.data(), kBinKmlV8.size());
+        kml::binary::DeserializerKml des(dataFromBinV8);
+        des.Deserialize(reader);
+      },
+      ());
 
   kml::FileData dataFromBinV8MM;
   TEST_NO_THROW(
-  {
-    MemReader reader(kBinKmlV8MM.data(), kBinKmlV8MM.size());
-    kml::binary::DeserializerKml des(dataFromBinV8MM);
-    des.Deserialize(reader);
-  }, ());
+      {
+        MemReader reader(kBinKmlV8MM.data(), kBinKmlV8MM.size());
+        kml::binary::DeserializerKml des(dataFromBinV8MM);
+        des.Deserialize(reader);
+      },
+      ());
 
-// Can't compare dataFromBinV8.m_categoryData and dataFromBinV8MM.m_categoryData directly
-// because new format has less properties and different m_id. Compare some properties here:
+  // Can't compare dataFromBinV8.m_categoryData and dataFromBinV8MM.m_categoryData directly
+  // because new format has less properties and different m_id. Compare some properties here:
   TEST_EQUAL(dataFromBinV8.m_categoryData.m_name, dataFromBinV8MM.m_categoryData.m_name, ());
   TEST_EQUAL(dataFromBinV8.m_categoryData.m_description, dataFromBinV8MM.m_categoryData.m_description, ());
   TEST_EQUAL(dataFromBinV8.m_categoryData.m_annotation, dataFromBinV8MM.m_categoryData.m_annotation, ());
@@ -569,19 +580,21 @@ UNIT_TEST(Kml_Deserialization_From_KMB_V8_And_V9MM)
 {
   kml::FileData dataFromBinV8;
   TEST_NO_THROW(
-  {
-    MemReader reader(kBinKmlV8.data(), kBinKmlV8.size());
-    kml::binary::DeserializerKml des(dataFromBinV8);
-    des.Deserialize(reader);
-  }, ());
+      {
+        MemReader reader(kBinKmlV8.data(), kBinKmlV8.size());
+        kml::binary::DeserializerKml des(dataFromBinV8);
+        des.Deserialize(reader);
+      },
+      ());
 
   kml::FileData dataFromBinV9MM;
   TEST_NO_THROW(
-  {
-    MemReader reader(kBinKmlV9MM.data(), kBinKmlV9MM.size());
-    kml::binary::DeserializerKml des(dataFromBinV9MM);
-    des.Deserialize(reader);
-  }, ());
+      {
+        MemReader reader(kBinKmlV9MM.data(), kBinKmlV9MM.size());
+        kml::binary::DeserializerKml des(dataFromBinV9MM);
+        des.Deserialize(reader);
+      },
+      ());
 
   // Can't compare dataFromBinV8.m_categoryData and dataFromBinV9MM.m_categoryData directly
   // because new format has less properties and different m_id. Compare some properties here:
@@ -595,10 +608,12 @@ UNIT_TEST(Kml_Deserialization_From_KMB_V8_And_V9MM)
   TEST_EQUAL(dataFromBinV8.m_categoryData.m_tags, dataFromBinV9MM.m_categoryData.m_tags, ());
   TEST_EQUAL(dataFromBinV8.m_categoryData.m_properties, dataFromBinV9MM.m_categoryData.m_properties, ());
 
-  dataFromBinV8.m_bookmarksData[0].m_id = dataFromBinV9MM.m_bookmarksData[0].m_id; // V8 and V9MM bookmarks have different IDs. Fix ID value manually.
+  dataFromBinV8.m_bookmarksData[0].m_id =
+      dataFromBinV9MM.m_bookmarksData[0].m_id;  // V8 and V9MM bookmarks have different IDs. Fix ID value manually.
   TEST_EQUAL(dataFromBinV8.m_bookmarksData, dataFromBinV9MM.m_bookmarksData, ());
 
-  dataFromBinV8.m_tracksData[0].m_id = dataFromBinV9MM.m_tracksData[0].m_id; // V8 and V9MM tracks have different IDs. Fix ID value manually.
+  dataFromBinV8.m_tracksData[0].m_id =
+      dataFromBinV9MM.m_tracksData[0].m_id;  // V8 and V9MM tracks have different IDs. Fix ID value manually.
   TEST_EQUAL(dataFromBinV8.m_tracksData, dataFromBinV9MM.m_tracksData, ());
 }
 
@@ -606,11 +621,12 @@ UNIT_TEST(Kml_Deserialization_From_KMB_V9MM_With_MultiGeometry)
 {
   kml::FileData dataFromBinV9MM;
   TEST_NO_THROW(
-  {
-    MemReader reader(kBinKmlMultiGeometryV9MM.data(), kBinKmlMultiGeometryV9MM.size());
-    kml::binary::DeserializerKml des(dataFromBinV9MM);
-    des.Deserialize(reader);
-  }, ());
+      {
+        MemReader reader(kBinKmlMultiGeometryV9MM.data(), kBinKmlMultiGeometryV9MM.size());
+        kml::binary::DeserializerKml des(dataFromBinV9MM);
+        des.Deserialize(reader);
+      },
+      ());
 
   TEST_EQUAL(dataFromBinV9MM.m_tracksData.size(), 1, ());
 
@@ -689,10 +705,7 @@ UNIT_TEST(Kml_Ver_2_3)
     </kml>)";
 
   kml::FileData fData;
-  TEST_NO_THROW(
-  {
-    kml::DeserializerKml(fData).Deserialize(MemReader(data));
-  }, ());
+  TEST_NO_THROW({ kml::DeserializerKml(fData).Deserialize(MemReader(data)); }, ());
 
   TEST_EQUAL(fData.m_tracksData.size(), 1, ());
   auto const & geom = fData.m_tracksData[0].m_geometry;
@@ -736,10 +749,7 @@ UNIT_TEST(Kml_Placemark_contains_both_Bookmark_and_Track_data)
 </kml>)";
 
   kml::FileData fData;
-  TEST_NO_THROW(
-  {
-    kml::DeserializerKml(fData).Deserialize(MemReader(input));
-  }, ());
+  TEST_NO_THROW({ kml::DeserializerKml(fData).Deserialize(MemReader(input)); }, ());
 
   TEST_EQUAL(fData.m_bookmarksData.size(), 2, ());
   TEST_EQUAL(fData.m_tracksData.size(), 2, ());
@@ -772,10 +782,7 @@ UNIT_TEST(Fix_Invisible_Color_Bug_In_Gpx_Tracks)
 </kml>)";
 
   kml::FileData fData;
-  TEST_NO_THROW(
-  {
-    kml::DeserializerKml(fData).Deserialize(MemReader(input));
-  }, ());
+  TEST_NO_THROW({ kml::DeserializerKml(fData).Deserialize(MemReader(input)); }, ());
 
   TEST_EQUAL(fData.m_tracksData.size(), 2, ());
   TEST_EQUAL(fData.m_tracksData[0].m_layers.size(), 1, ());
@@ -788,11 +795,13 @@ UNIT_TEST(Kml_Tracks_With_Different_Points_And_Timestamps_Order)
 {
   kml::FileData dataFromFile;
   TEST_NO_THROW(
-  {
-    kml::DeserializerKml des(dataFromFile);
-    FileReader reader(GetPlatform().TestsDataPathForFile("test_data/kml/track_with_timestams_different_orders.kml"));
-    des.Deserialize(reader);
-  }, ());
+      {
+        kml::DeserializerKml des(dataFromFile);
+        FileReader reader(
+            GetPlatform().TestsDataPathForFile("test_data/kml/track_with_timestams_different_orders.kml"));
+        des.Deserialize(reader);
+      },
+      ());
 
   TEST_EQUAL(dataFromFile.m_tracksData.size(), 1, ());
   auto const & geom = dataFromFile.m_tracksData[0].m_geometry;
@@ -810,11 +819,12 @@ UNIT_TEST(Kml_Track_Points_And_Timestamps_Sizes_Mismatch)
 {
   kml::FileData dataFromFile;
   TEST_ANY_THROW(
-  {
-    kml::DeserializerKml des(dataFromFile);
-    FileReader reader(GetPlatform().TestsDataPathForFile("test_data/kml/track_with_timestamps_mismatch.kml"));
-    des.Deserialize(reader);
-  }, ());
+      {
+        kml::DeserializerKml des(dataFromFile);
+        FileReader reader(GetPlatform().TestsDataPathForFile("test_data/kml/track_with_timestamps_mismatch.kml"));
+        des.Deserialize(reader);
+      },
+      ());
   TEST_EQUAL(dataFromFile.m_tracksData.size(), 0, ());
 }
 
@@ -840,10 +850,7 @@ UNIT_TEST(Kml_Import_OpenTracks)
 </kml>)";
 
   kml::FileData fData;
-  TEST_NO_THROW(
-  {
-    kml::DeserializerKml(fData).Deserialize(MemReader(input));
-  }, ());
+  TEST_NO_THROW({ kml::DeserializerKml(fData).Deserialize(MemReader(input)); }, ());
 
   {
     TEST_EQUAL(fData.m_tracksData.size(), 1, ());
@@ -858,11 +865,12 @@ UNIT_TEST(Kml_Import_OpenTracks)
 
   fData = {};
   TEST_NO_THROW(
-  {
-    kml::DeserializerKml des(fData);
-    FileReader reader(GetPlatform().TestsDataPathForFile("test_data/kml/track_from_OpenTracks.kml"));
-    des.Deserialize(reader);
-  }, ());
+      {
+        kml::DeserializerKml des(fData);
+        FileReader reader(GetPlatform().TestsDataPathForFile("test_data/kml/track_from_OpenTracks.kml"));
+        des.Deserialize(reader);
+      },
+      ());
 
   {
     TEST_EQUAL(fData.m_tracksData.size(), 1, ());
@@ -896,10 +904,7 @@ UNIT_TEST(Kml_BadTracks)
 </kml>)";
 
   kml::FileData fData;
-  TEST_NO_THROW(
-  {
-    kml::DeserializerKml(fData).Deserialize(MemReader(input));
-  }, ());
+  TEST_NO_THROW({ kml::DeserializerKml(fData).Deserialize(MemReader(input)); }, ());
 
   {
     TEST_EQUAL(fData.m_tracksData.size(), 1, ());
diff --git a/libs/kml/kml_tests/tests_data.hpp b/libs/kml/kml_tests/tests_data.hpp
index 0f9b974d9..e2fd397af 100644
--- a/libs/kml/kml_tests/tests_data.hpp
+++ b/libs/kml/kml_tests/tests_data.hpp
@@ -4,1730 +4,1475 @@ char const * kTextKml =
     "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
     "<kml xmlns=\"http://earth.google.com/kml/2.2\">"
     "<Document>"
-      "<name>MapName</name>"
-      "<description><![CDATA[MapDescription]]></description>"
-      "<visibility>0</visibility>"
-      "<Style id=\"placemark-blue\">"
-        "<IconStyle>"
-          "<Icon>"
-            "<href>https://comaps.at/placemarks/placemark-blue.png</href>"
-          "</Icon>"
-        "</IconStyle>"
-      "</Style>"
-      "<Style id=\"placemark-brown\">"
-        "<IconStyle>"
-          "<Icon>"
-            "<href>https://comaps.at/placemarks/placemark-brown.png</href>"
-          "</Icon>"
-        "</IconStyle>"
-      "</Style>"
-      "<Style id=\"placemark-green\">"
-        "<IconStyle>"
-          "<Icon>"
-            "<href>https://comaps.at/placemarks/placemark-green.png</href>"
-          "</Icon>"
-        "</IconStyle>"
-      "</Style>"
-      "<Style id=\"placemark-orange\">"
-        "<IconStyle>"
-          "<Icon>"
-            "<href>https://comaps.at/placemarks/placemark-orange.png</href>"
-          "</Icon>"
-        "</IconStyle>"
-      "</Style>"
-      "<Style id=\"placemark-pink\">"
-        "<IconStyle>"
-          "<Icon>"
-            "<href>https://comaps.at/placemarks/placemark-pink.png</href>"
-          "</Icon>"
-        "</IconStyle>"
-      "</Style>"
-      "<Style id=\"placemark-purple\">"
-        "<IconStyle>"
-          "<Icon>"
-            "<href>https://comaps.at/placemarks/placemark-purple.png</href>"
-          "</Icon>"
-        "</IconStyle>"
-      "</Style>"
-      "<Style id=\"placemark-red\">"
-        "<IconStyle>"
-          "<Icon>"
-            "<href>https://comaps.at/placemarks/placemark-red.png</href>"
-          "</Icon>"
-        "</IconStyle>"
-      "</Style>"
-      "<Placemark>"
-        "<name>Nebraska</name>"
-        "<description><![CDATA[]]></description>"
-        "<styleUrl>#placemark-lime</styleUrl>"
-        "<Point>"
-          "<coordinates>-99.901810,41.492538,0.000000</coordinates>"
-        "</Point>"
-      "</Placemark>"
-      "<Placemark>"
-        "<name>Monongahela National Forest</name>"
-        "<description><![CDATA[Huttonsville, WV 26273<br>]]></description>"
-        "<styleUrl>#placemark-pink</styleUrl>"
-        "<TimeStamp>"
-          "<when>1986-08-12T07:10:43Z</when>"
-        "</TimeStamp>"
-        "<Point>"
-          "<coordinates>-79.829674,38.627785,0.000000</coordinates>"
-        "</Point>"
-      "</Placemark>"
-      "<Placemark>"
-        "<name>From: Минск, Минская область, Беларусь</name>"
-        "<description><![CDATA[]]></description>"
-        "<styleUrl>#placemark-blue</styleUrl>"
-        "<TimeStamp>"
-          "<when>1998-03-03T03:04:48+01:30</when>"
-        "</TimeStamp>"
-        "<Point>"
-          "<coordinates>27.566765,53.900047,0</coordinates>"
-        "</Point>"
-      "</Placemark>"
-      "<Placemark>"
-        "<name><![CDATA[<MWM & Sons>]]></name>"
-        "<description><![CDATA[Amps & <brackets>]]></description>"
-        "<styleUrl>#placemark-green</styleUrl>"
-        "<TimeStamp>"
-          "<when>2048 bytes in two kilobytes - some invalid timestamp</when>"
-        "</TimeStamp>"
-        "<Point>"
-          "<coordinates>27.551532,53.89306</coordinates>"
-        "</Point>"
-      "</Placemark>"
+    "<name>MapName</name>"
+    "<description><![CDATA[MapDescription]]></description>"
+    "<visibility>0</visibility>"
+    "<Style id=\"placemark-blue\">"
+    "<IconStyle>"
+    "<Icon>"
+    "<href>https://comaps.at/placemarks/placemark-blue.png</href>"
+    "</Icon>"
+    "</IconStyle>"
+    "</Style>"
+    "<Style id=\"placemark-brown\">"
+    "<IconStyle>"
+    "<Icon>"
+    "<href>https://comaps.at/placemarks/placemark-brown.png</href>"
+    "</Icon>"
+    "</IconStyle>"
+    "</Style>"
+    "<Style id=\"placemark-green\">"
+    "<IconStyle>"
+    "<Icon>"
+    "<href>https://comaps.at/placemarks/placemark-green.png</href>"
+    "</Icon>"
+    "</IconStyle>"
+    "</Style>"
+    "<Style id=\"placemark-orange\">"
+    "<IconStyle>"
+    "<Icon>"
+    "<href>https://comaps.at/placemarks/placemark-orange.png</href>"
+    "</Icon>"
+    "</IconStyle>"
+    "</Style>"
+    "<Style id=\"placemark-pink\">"
+    "<IconStyle>"
+    "<Icon>"
+    "<href>https://comaps.at/placemarks/placemark-pink.png</href>"
+    "</Icon>"
+    "</IconStyle>"
+    "</Style>"
+    "<Style id=\"placemark-purple\">"
+    "<IconStyle>"
+    "<Icon>"
+    "<href>https://comaps.at/placemarks/placemark-purple.png</href>"
+    "</Icon>"
+    "</IconStyle>"
+    "</Style>"
+    "<Style id=\"placemark-red\">"
+    "<IconStyle>"
+    "<Icon>"
+    "<href>https://comaps.at/placemarks/placemark-red.png</href>"
+    "</Icon>"
+    "</IconStyle>"
+    "</Style>"
+    "<Placemark>"
+    "<name>Nebraska</name>"
+    "<description><![CDATA[]]></description>"
+    "<styleUrl>#placemark-lime</styleUrl>"
+    "<Point>"
+    "<coordinates>-99.901810,41.492538,0.000000</coordinates>"
+    "</Point>"
+    "</Placemark>"
+    "<Placemark>"
+    "<name>Monongahela National Forest</name>"
+    "<description><![CDATA[Huttonsville, WV 26273<br>]]></description>"
+    "<styleUrl>#placemark-pink</styleUrl>"
+    "<TimeStamp>"
+    "<when>1986-08-12T07:10:43Z</when>"
+    "</TimeStamp>"
+    "<Point>"
+    "<coordinates>-79.829674,38.627785,0.000000</coordinates>"
+    "</Point>"
+    "</Placemark>"
+    "<Placemark>"
+    "<name>From: Минск, Минская область, Беларусь</name>"
+    "<description><![CDATA[]]></description>"
+    "<styleUrl>#placemark-blue</styleUrl>"
+    "<TimeStamp>"
+    "<when>1998-03-03T03:04:48+01:30</when>"
+    "</TimeStamp>"
+    "<Point>"
+    "<coordinates>27.566765,53.900047,0</coordinates>"
+    "</Point>"
+    "</Placemark>"
+    "<Placemark>"
+    "<name><![CDATA[<MWM & Sons>]]></name>"
+    "<description><![CDATA[Amps & <brackets>]]></description>"
+    "<styleUrl>#placemark-green</styleUrl>"
+    "<TimeStamp>"
+    "<when>2048 bytes in two kilobytes - some invalid timestamp</when>"
+    "</TimeStamp>"
+    "<Point>"
+    "<coordinates>27.551532,53.89306</coordinates>"
+    "</Point>"
+    "</Placemark>"
     "</Document>"
     "</kml>";
 
 std::vector<uint8_t> const kBinKmlV3 = {
-  0x03, 0x26, 0x41, 0x3A, 0x38, 0x62, 0x66, 0x39, 0x33, 0x62, 0x64, 0x65, 0x2D, 0x66, 0x38, 0x31,
-  0x61, 0x2D, 0x34, 0x66, 0x31, 0x63, 0x2D, 0x38, 0x36, 0x34, 0x30, 0x2D, 0x66, 0x63, 0x39, 0x65,
-  0x32, 0x61, 0x38, 0x34, 0x32, 0x33, 0x36, 0x39, 0x24, 0x34, 0x32, 0x37, 0x33, 0x62, 0x38, 0x64,
-  0x33, 0x2D, 0x33, 0x37, 0x30, 0x66, 0x2D, 0x34, 0x38, 0x64, 0x39, 0x2D, 0x39, 0x64, 0x33, 0x35,
-  0x2D, 0x37, 0x64, 0x66, 0x38, 0x34, 0x65, 0x61, 0x38, 0x64, 0x36, 0x61, 0x37, 0x1E, 0x28, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x01,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x86, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE6, 0x26,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD9, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x9D, 0xA1, 0xD1, 0xEC, 0x05, 0x01, 0x00, 0x04, 0x01, 0x19, 0x06, 0x00,
-  0x08, 0x04, 0x00, 0x02, 0x01, 0x03, 0x06, 0x04, 0x19, 0x01, 0x00, 0x04, 0x00, 0x06, 0x01, 0x07,
-  0x06, 0x08, 0x19, 0x05, 0x01, 0x00, 0x09, 0x01, 0x00, 0x0A, 0x01, 0x00, 0x0B, 0x06, 0x00, 0x0C,
-  0x01, 0x0D, 0x02, 0x0E, 0x03, 0x0F, 0x04, 0x10, 0x05, 0x11, 0x00, 0x04, 0xC3, 0x0F, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xB0, 0xB6,
-  0xE9, 0x05, 0xE0, 0xB9, 0xBF, 0x9B, 0x02, 0xA1, 0x99, 0xE5, 0xC2, 0x02, 0x00, 0x03, 0x04, 0x00,
-  0x12, 0x01, 0x14, 0x06, 0x15, 0x19, 0x13, 0x04, 0x00, 0x16, 0x01, 0x18, 0x06, 0x19, 0x19, 0x17,
-  0x00, 0xC4, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0xFF, 0xB0, 0xB6, 0xE9, 0x05, 0x9F, 0xA1, 0xC5, 0x9B, 0x02, 0xF1, 0xE0, 0xEB, 0xC2,
-  0x02, 0x00, 0x03, 0x04, 0x00, 0x1A, 0x01, 0x1C, 0x06, 0x1D, 0x19, 0x1B, 0x04, 0x00, 0x1E, 0x01,
-  0x20, 0x06, 0x21, 0x19, 0x1F, 0x00, 0xC5, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xB0, 0xB6, 0xE9, 0x05, 0xF6, 0xFE, 0xCF, 0x9B,
-  0x02, 0x97, 0xDB, 0xEF, 0xC2, 0x02, 0x00, 0x03, 0x04, 0x00, 0x22, 0x01, 0x24, 0x06, 0x25, 0x19,
-  0x23, 0x04, 0x00, 0x26, 0x01, 0x28, 0x06, 0x29, 0x19, 0x27, 0x00, 0xC6, 0x0F, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xB0, 0xB6, 0xE9,
-  0x05, 0x80, 0xDC, 0xC1, 0x9B, 0x02, 0x81, 0xF2, 0xE4, 0xC2, 0x02, 0x00, 0x03, 0x04, 0x00, 0x2A,
-  0x01, 0x2C, 0x06, 0x2D, 0x19, 0x2B, 0x04, 0x00, 0x2E, 0x01, 0x30, 0x06, 0x31, 0x19, 0x2F, 0x00,
-  0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xB3, 0xE6, 0xCC, 0x19, 0x00,
-  0xFF, 0x22, 0x11, 0xEE, 0xFF, 0xB0, 0xB6, 0xE9, 0x05, 0xAA, 0x02, 0xC0, 0xF0, 0xE7, 0xB6, 0x04,
-  0xFE, 0xFF, 0xC8, 0x85, 0x05, 0xE0, 0x78, 0xFD, 0x1C, 0xE0, 0xB3, 0x01, 0xC0, 0x30, 0xFC, 0x90,
-  0x03, 0xC2, 0xBB, 0x02, 0x86, 0x9D, 0x03, 0xFE, 0xAB, 0x01, 0xFE, 0xA5, 0x03, 0xFE, 0x9A, 0x01,
-  0x80, 0xBD, 0x02, 0x84, 0x14, 0xFE, 0x6B, 0xFA, 0x31, 0x80, 0xF9, 0x01, 0xFF, 0xB8, 0x01, 0xFD,
-  0x59, 0xFF, 0xD7, 0x01, 0xFE, 0xC0, 0x01, 0xF9, 0x8C, 0x01, 0x82, 0x54, 0xFF, 0xA8, 0x01, 0xFE,
-  0xC7, 0x04, 0xFC, 0x6F, 0xFD, 0x36, 0x84, 0x51, 0xFE, 0x7A, 0xFA, 0x31, 0x81, 0x38, 0x82, 0x50,
-  0x84, 0x49, 0x82, 0x50, 0x80, 0x69, 0xFF, 0x84, 0x01, 0xFE, 0x43, 0x82, 0x4A, 0x80, 0x5A, 0xFC,
-  0xF1, 0x01, 0x82, 0x90, 0x02, 0xFE, 0x52, 0xFC, 0x58, 0xF9, 0x36, 0x84, 0x0C, 0xFA, 0x5F, 0x82,
-  0x75, 0xFF, 0x05, 0x83, 0x0E, 0x84, 0x3F, 0x82, 0x4A, 0x80, 0xBE, 0x01, 0x81, 0x0F, 0xFE, 0x3F,
-  0x82, 0x3F, 0x80, 0x35, 0x83, 0xA6, 0x02, 0xFE, 0x9E, 0x02, 0x86, 0xA2, 0x01, 0x84, 0xB2, 0x01,
-  0xFC, 0xF4, 0x02, 0xFE, 0xFD, 0x01, 0x80, 0x83, 0x01, 0x80, 0xA3, 0x01, 0x82, 0x0A, 0x82, 0x97,
-  0x01, 0xFC, 0xDE, 0x02, 0x80, 0xC4, 0x01, 0x82, 0x20, 0xFE, 0xCC, 0x01, 0x82, 0x73, 0xFC, 0xAD,
-  0x01, 0xFE, 0x39, 0x82, 0xA6, 0x01, 0x82, 0x8F, 0x01, 0x80, 0x21, 0x80, 0x30, 0x82, 0xF4, 0x01,
-  0x80, 0x35, 0xFE, 0x58, 0x82, 0x73, 0x80, 0x0B, 0xFE, 0xCB, 0x01, 0x82, 0x12, 0x80, 0x7A, 0xFB,
-  0x0C, 0xFC, 0x89, 0x02, 0x85, 0xA2, 0x01, 0x82, 0x13, 0xFF, 0xD1, 0x01, 0x80, 0x60, 0xFF, 0x48,
-  0x82, 0x50, 0x80, 0x28, 0x82, 0x3F, 0xFF, 0x22, 0x85, 0x42, 0x80, 0x06, 0xFF, 0x2F, 0xF9, 0x3F,
-  0x84, 0x7B, 0x85, 0x70, 0xFE, 0xEE, 0x01, 0x82, 0x02, 0xFE, 0x9B, 0x01, 0x80, 0x38, 0x84, 0x6A,
-  0xFB, 0x24, 0x80, 0x30, 0xFE, 0x3D, 0xFE, 0x50, 0xFE, 0x08, 0x80, 0x46, 0x84, 0x9C, 0x01, 0x82,
-  0x02, 0x85, 0x5E, 0xFC, 0x81, 0x01, 0x82, 0x89, 0x01, 0xFB, 0x12, 0x81, 0x67, 0x82, 0x7C, 0x82,
-  0x3A, 0xFC, 0xAD, 0x01, 0x81, 0x12, 0x82, 0x5B, 0xFB, 0x4C, 0xFC, 0x1F, 0x80, 0x17, 0x80, 0x18,
-  0xFF, 0x38, 0x80, 0x90, 0x01, 0xFD, 0x15, 0x84, 0xBC, 0x02, 0xFA, 0x5B, 0xFE, 0x2B, 0xFB, 0x1D,
-  0x84, 0xBF, 0x01, 0xFF, 0x33, 0xFA, 0x47, 0xFD, 0x47, 0x86, 0x46, 0xFE, 0x03, 0xFC, 0x14, 0xFF,
-  0x1C, 0x82, 0x5D, 0x00, 0xFE, 0x44, 0xFC, 0x2B, 0x84, 0x93, 0x01, 0x86, 0xA2, 0x01, 0x81, 0x36,
-  0x87, 0x87, 0x01, 0xFE, 0x11, 0xFD, 0x2C, 0x80, 0x25, 0x82, 0x4C, 0x80, 0x1D, 0xFF, 0x11, 0xFE,
-  0x20, 0xFE, 0x2C, 0x82, 0xB3, 0x01, 0x82, 0x45, 0x82, 0x2B, 0x80, 0x3F, 0xFE, 0x3F, 0x84, 0x0D,
-  0xFF, 0x5B, 0x85, 0xA2, 0x01, 0x82, 0x2D, 0x82, 0x01, 0xFE, 0x32, 0x80, 0x4F, 0xFE, 0x64, 0xFE,
-  0x3C, 0xF9, 0x4D, 0xFF, 0x8D, 0x01, 0x80, 0x32, 0x86, 0x16, 0xFA, 0x31, 0x00, 0x86, 0x65, 0xFE,
-  0x53, 0x80, 0x5E, 0x83, 0x2B, 0xFA, 0x65, 0x86, 0x21, 0x82, 0xA9, 0x02, 0x81, 0x96, 0x01, 0x84,
-  0x70, 0xFF, 0x7C, 0xFA, 0x24, 0x80, 0x23, 0x80, 0x84, 0x02, 0x83, 0x87, 0x01, 0xF9, 0x19, 0x80,
-  0x4A, 0xFE, 0x3D, 0x84, 0x0F, 0xFE, 0x1E, 0x83, 0x64, 0xFE, 0x7A, 0xFF, 0x27, 0x82, 0x55, 0x86,
-  0x0F, 0x82, 0x68, 0x83, 0x1F, 0x80, 0x9F, 0x01, 0xFE, 0x2B, 0xFE, 0x90, 0x01, 0x84, 0x03, 0x82,
-  0xE9, 0x03, 0x82, 0x90, 0x01, 0x82, 0xC2, 0x01, 0xF8, 0x28, 0xFE, 0x86, 0x05, 0x82, 0x80, 0x02,
-  0xFC, 0x72, 0x84, 0x58, 0x82, 0x20, 0x82, 0x01, 0x81, 0x2B, 0x85, 0x31, 0xFB, 0x39, 0xFF, 0x5A,
-  0xFF, 0x03, 0xFD, 0x91, 0x01, 0x80, 0x25, 0x83, 0x85, 0x01, 0x81, 0x3F, 0xF7, 0xCC, 0x02, 0xFE,
-  0x27, 0x83, 0x14, 0xFF, 0x6C, 0xFD, 0xE4, 0x01, 0xFD, 0xBA, 0x02, 0xFF, 0xF9, 0x01, 0x82, 0x75,
-  0x83, 0x5F, 0xFD, 0x11, 0xFF, 0x22, 0x83, 0x3E, 0xFB, 0x08, 0xFF, 0x11, 0xFD, 0x21, 0xFD, 0x32,
-  0xFF, 0x16, 0x83, 0x2A, 0x81, 0x42, 0x80, 0x18, 0x83, 0x0E, 0xFD, 0x43, 0xFB, 0x6C, 0xFB, 0x70,
-  0x83, 0x32, 0xFA, 0x31, 0xFF, 0x86, 0x01, 0x86, 0x4F, 0xFB, 0x2C, 0xFF, 0x98, 0x01, 0x83, 0xBA,
-  0x01, 0x81, 0x6F, 0xF9, 0x54, 0x81, 0x59, 0x81, 0x25, 0x81, 0x5B, 0xFF, 0x4B, 0xFF, 0x2F, 0x82,
-  0x1E, 0xF9, 0x1B, 0x83, 0x03, 0x81, 0x92, 0x03, 0x81, 0x81, 0x02, 0x83, 0x07, 0xFB, 0x39, 0xFD,
-  0x36, 0x82, 0x08, 0xFD, 0x74, 0xFF, 0x29, 0xFE, 0x16, 0x85, 0x10, 0xFD, 0x3D, 0xFF, 0x11, 0x81,
-  0xC0, 0x01, 0xFF, 0x72, 0xFD, 0x7A, 0xFD, 0x1B, 0x83, 0x1D, 0x82, 0x13, 0xFB, 0x9A, 0x02, 0xFF,
-  0x96, 0x01, 0x81, 0x1A, 0x81, 0x37, 0xFD, 0xCB, 0x01, 0x80, 0x18, 0x81, 0xB9, 0x01, 0x84, 0x08,
-  0xFF, 0x33, 0x81, 0x25, 0x81, 0x94, 0x01, 0x82, 0x6E, 0xFB, 0x12, 0xFA, 0x25, 0xFD, 0x41, 0x82,
-  0x1F, 0x81, 0x27, 0xFD, 0x21, 0xFF, 0xE0, 0x01, 0xFE, 0x04, 0x81, 0x45, 0x80, 0x36, 0xFF, 0x47,
-  0xFE, 0x0A, 0xFD, 0x7A, 0xF9, 0x2C, 0x81, 0x6F, 0x83, 0x26, 0xFD, 0x83, 0x01, 0x81, 0x4A, 0x82,
-  0x0F, 0xFD, 0x2F, 0x83, 0x22, 0xFE, 0x04, 0xFF, 0x6E, 0xF9, 0x3D, 0xFF, 0x2F, 0x80, 0x12, 0xFF,
-  0x2B, 0x83, 0x33, 0xFD, 0x90, 0x01, 0xFD, 0x65, 0x81, 0x45, 0xFF, 0x05, 0xFD, 0x6B, 0x83, 0x53,
-  0xFF, 0x58, 0xFD, 0x5F, 0xFF, 0x38, 0x81, 0x0D, 0x81, 0x04, 0xFF, 0x18, 0x81, 0x68, 0x80, 0x19,
-  0xFD, 0x87, 0x01, 0x81, 0x38, 0xFF, 0x0C, 0xFB, 0x15, 0xFD, 0x81, 0x01, 0x84, 0x03, 0xFD, 0x4C,
-  0xFF, 0x36, 0xFF, 0x2F, 0xFA, 0x2B, 0xFF, 0x24, 0x82, 0x51, 0x81, 0x48, 0x84, 0x22, 0x81, 0x17,
-  0xFA, 0x2B, 0xFB, 0xF7, 0x01, 0x80, 0x13, 0x83, 0x73, 0xFF, 0x49, 0xFB, 0x0B, 0xF9, 0x43, 0x83,
-  0x17, 0xFC, 0x51, 0x81, 0x2D, 0xFE, 0x34, 0xFB, 0x5E, 0x86, 0x2A, 0x83, 0x5F, 0x81, 0x21, 0xFF,
-  0x0C, 0x82, 0x21, 0xFD, 0x41, 0xFC, 0x0D, 0x82, 0x19, 0x82, 0x2D, 0x81, 0x59, 0x80, 0x12, 0xFD,
-  0x80, 0x01, 0xFF, 0x24, 0xFD, 0x48, 0xFF, 0x47, 0xFF, 0xB0, 0x01, 0x82, 0x13, 0x81, 0x85, 0x01,
-  0x00, 0x83, 0x70, 0xFA, 0x5C, 0xFD, 0x7C, 0x82, 0x26, 0x81, 0x4A, 0x81, 0x0E, 0xFB, 0x3D, 0x82,
-  0x1A, 0xFF, 0x89, 0x01, 0xFB, 0x20, 0xFF, 0x3A, 0xFA, 0x31, 0xFF, 0x9C, 0x01, 0xF9, 0x49, 0xFD,
-  0x90, 0x01, 0x80, 0x36, 0x83, 0x75, 0xF8, 0x67, 0xFF, 0x35, 0x88, 0x1E, 0xFF, 0x41, 0x85, 0x3B,
-  0x81, 0x38, 0x84, 0x08, 0xFB, 0x14, 0x82, 0x14, 0x81, 0x4C, 0xFC, 0x26, 0xFE, 0x4C, 0xFF, 0x77,
-  0xFF, 0x0C, 0xFF, 0x24, 0x84, 0x05, 0xFF, 0x3C, 0x81, 0x2B, 0xFD, 0x09, 0xFD, 0x2B, 0x80, 0x1E,
-  0x83, 0x1B, 0xFF, 0x18, 0x84, 0x12, 0xFF, 0x3C, 0x81, 0x13, 0xFF, 0x10, 0xFB, 0x30, 0xFE, 0x1B,
-  0x81, 0x20, 0x80, 0x12, 0xFF, 0x4C, 0xFE, 0x0A, 0x81, 0xEB, 0x01, 0xFF, 0x41, 0xFD, 0x64, 0x82,
-  0x44, 0x81, 0x36, 0x81, 0x02, 0xFB, 0x35, 0x84, 0x22, 0x81, 0x08, 0xFC, 0x21, 0xFF, 0x8B, 0x01,
-  0x86, 0x16, 0x81, 0x38, 0x87, 0x3C, 0xFF, 0x19, 0x88, 0x3C, 0x82, 0x0E, 0xFC, 0x45, 0x80, 0x4B,
-  0x84, 0x09, 0xFF, 0x11, 0xFA, 0x31, 0xFF, 0xA3, 0x01, 0x82, 0x86, 0x01, 0x82, 0x04, 0xC2, 0x26,
-  0xDD, 0x2C, 0xE4, 0x2C, 0xD0, 0x0E, 0xF0, 0x2F, 0xD0, 0x5F, 0xF4, 0x44, 0xA2, 0x05, 0xA6, 0x95,
-  0x01, 0xA0, 0x83, 0x01, 0xA4, 0x62, 0xCB, 0x35, 0xAF, 0x54, 0xB0, 0x1C, 0xAB, 0x62, 0xE2, 0x38,
-  0xE1, 0x2B, 0xC2, 0x18, 0xB5, 0x52, 0xE6, 0x27, 0xAA, 0x5B, 0xE4, 0x40, 0x59, 0xD2, 0x14, 0xF6,
-  0x2E, 0xD0, 0x45, 0xF0, 0x04, 0xAD, 0x1D, 0x87, 0x1D, 0xD2, 0x7F, 0x8B, 0x16, 0xA6, 0x11, 0xB2,
-  0x25, 0xE2, 0x2D, 0xC9, 0x06, 0xB0, 0x1A, 0xFC, 0x3D, 0xB0, 0x2E, 0xF6, 0x3A, 0xA0, 0x2F, 0x8B,
-  0x09, 0xBB, 0x0D, 0xA8, 0x30, 0xC6, 0x21, 0xAC, 0x2C, 0x8E, 0x08, 0x9C, 0xB0, 0x01, 0xF5, 0x02,
-  0xE3, 0xA3, 0x01, 0xF5, 0x26, 0xE5, 0x40, 0x8C, 0x0D, 0xA7, 0x29, 0xF7, 0x32, 0xDA, 0x07, 0xF7,
-  0x3F, 0xC3, 0x74, 0xF1, 0x36, 0xBC, 0x02, 0xF5, 0x12, 0xC9, 0x25, 0xBB, 0x76, 0x9C, 0x1A, 0xC6,
-  0x1D, 0xA0, 0x1E, 0xC9, 0x45, 0x49, 0x93, 0x13, 0xD5, 0x3A, 0x95, 0x4D, 0xAC, 0x03, 0xA5, 0x20,
-  0xA7, 0x54, 0xA5, 0x11, 0x98, 0x4E, 0xA3, 0x3B, 0x9C, 0x2C, 0xE9, 0x1D, 0x9A, 0x61, 0x9E, 0x2C,
-  0x9A, 0x56, 0xBF, 0x6C, 0xE7, 0x4D, 0xB7, 0x1B, 0xEF, 0x3C, 0xC4, 0x0A, 0xE7, 0x64, 0xBD, 0x66,
-  0xEB, 0x4B, 0xB3, 0x12, 0xD9, 0x31, 0xB9, 0x0C, 0xAA, 0x19, 0xFE, 0x09, 0xFC, 0x44, 0x82, 0x15,
-  0x84, 0x09, 0x83, 0x3C, 0x80, 0x54, 0xFD, 0x20, 0xFC, 0x74, 0xFD, 0x48, 0xFF, 0xCB, 0x01, 0xFF,
-  0x47, 0xFB, 0x43, 0x83, 0x68, 0xFE, 0x81, 0x01, 0xFB, 0x48, 0xFD, 0x4C, 0x80, 0x3B, 0x81, 0x4F,
-  0x83, 0x80, 0x01, 0x81, 0x38, 0x82, 0x38, 0xF9, 0x49, 0xFD, 0xCB, 0x04, 0xFF, 0x72, 0xFF, 0x52,
-  0xFA, 0xAA, 0x01, 0x83, 0xBF, 0x01, 0x82, 0x8C, 0x01, 0x84, 0x58, 0xFE, 0xD6, 0x01, 0x81, 0xF8,
-  0x01, 0x80, 0xB8, 0x01, 0xFF, 0x6A, 0xFB, 0x2C, 0xFD, 0xBF, 0x02, 0x81, 0x18, 0x81, 0xC2, 0x06,
-  0x81, 0xCB, 0x02, 0xFD, 0x8D, 0x03, 0xB9, 0xAF, 0x02, 0x02, 0x04, 0x00, 0x32, 0x01, 0x34, 0x06,
-  0x35, 0x19, 0x33, 0x00, 0x5D, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x4A, 0x4A,
-  0x3C, 0x8E, 0x09, 0x95, 0x0C, 0x95, 0x0C, 0xFB, 0x0A, 0x29, 0x0A, 0x24, 0x0A, 0x03, 0x0A, 0x0E,
-  0x09, 0x0A, 0x27, 0x24, 0x27, 0x24, 0xE6, 0x04, 0x83, 0x05, 0xE6, 0x04, 0xF8, 0x04, 0x1C, 0x15,
-  0x1C, 0x15, 0xCB, 0x0B, 0xCC, 0x0B, 0xCB, 0x0B, 0x9E, 0x0B, 0x21, 0x29, 0x21, 0x22, 0xF7, 0x06,
-  0xA5, 0x06, 0xF7, 0x06, 0xE3, 0x06, 0x1A, 0x1C, 0x1A, 0x15, 0xA8, 0x05, 0xCD, 0x05, 0xA8, 0x05,
-  0xED, 0x05, 0x4A, 0x28, 0x4A, 0x3C, 0xA0, 0x2D, 0x80, 0x01, 0x00, 0x01, 0x00, 0x01, 0x04, 0x01,
-  0x03, 0x04, 0x02, 0x05, 0x05, 0x04, 0x07, 0x05, 0x07, 0x09, 0x05, 0x03, 0x0B, 0x05, 0x06, 0x0D,
-  0x05, 0x05, 0x0F, 0x06, 0x0C, 0x15, 0x06, 0x09, 0x17, 0x05, 0x08, 0x19, 0x07, 0x0E, 0x1B, 0x06,
-  0x0B, 0x1D, 0x06, 0x0A, 0x1F, 0x06, 0x0D, 0x2F, 0x07, 0x11, 0x35, 0x07, 0x10, 0x39, 0x07, 0x0F,
-  0x3B, 0x08, 0x17, 0x3D, 0x09, 0x1C, 0x3F, 0x07, 0x12, 0x59, 0x08, 0x14, 0x6F, 0x08, 0x19, 0x75,
-  0x08, 0x13, 0x79, 0x08, 0x15, 0x7B, 0x08, 0x18, 0x7D, 0x0A, 0x23, 0x7F, 0x0A, 0x24, 0xBB, 0x01,
-  0x09, 0x1F, 0xBD, 0x01, 0x09, 0x1E, 0xD9, 0x01, 0x09, 0x1A, 0xEF, 0x01, 0x0A, 0x2E, 0xF5, 0x01,
-  0x08, 0x16, 0xF9, 0x01, 0x0A, 0x21, 0xFB, 0x01, 0x09, 0x20, 0xFD, 0x01, 0x0A, 0x2B, 0xFF, 0x01,
-  0x0B, 0x29, 0xBD, 0x02, 0x09, 0x1D, 0xFD, 0x02, 0x0D, 0x61, 0xFF, 0x02, 0x0A, 0x2D, 0xBB, 0x03,
-  0x0A, 0x22, 0xBD, 0x03, 0x0B, 0x25, 0xD9, 0x03, 0x09, 0x1B, 0xEF, 0x03, 0x0B, 0x36, 0xF9, 0x03,
-  0x0B, 0x2A, 0xFB, 0x03, 0x0A, 0x26, 0xFD, 0x03, 0x0C, 0x40, 0xFF, 0x03, 0x0C, 0x3F, 0xFD, 0x04,
-  0x0E, 0x84, 0x01, 0xFF, 0x04, 0x0B, 0x3E, 0xEF, 0x05, 0x0A, 0x35, 0xF9, 0x05, 0x0A, 0x28, 0xFD,
-  0x05, 0x0B, 0x33, 0xFF, 0x05, 0x0A, 0x2F, 0xFD, 0x06, 0x0C, 0x75, 0xFF, 0x06, 0x0A, 0x34, 0xBB,
-  0x07, 0x0A, 0x27, 0xBD, 0x07, 0x0B, 0x2C, 0xEF, 0x07, 0x0B, 0x3A, 0xF9, 0x07, 0x0C, 0x37, 0xFB,
-  0x07, 0x0B, 0x30, 0xFD, 0x07, 0x0D, 0x55, 0xFF, 0x07, 0x0B, 0x4C, 0xFF, 0x09, 0x0C, 0x78, 0xFD,
-  0x0A, 0x0E, 0x72, 0xBD, 0x0B, 0x0E, 0xB8, 0x01, 0xEF, 0x0B, 0x0B, 0x38, 0xF9, 0x0B, 0x0B, 0x32,
-  0xFD, 0x0B, 0x0E, 0x48, 0xFF, 0x0B, 0x0D, 0x44, 0xFD, 0x0C, 0x0D, 0x9C, 0x01, 0xFF, 0x0C, 0x0B,
-  0x49, 0xFD, 0x0D, 0x0B, 0x39, 0xFD, 0x0E, 0x0C, 0x7B, 0xBD, 0x0F, 0x0B, 0x31, 0xEF, 0x0F, 0x0B,
-  0x3B, 0xF9, 0x0F, 0x0B, 0x3C, 0xFB, 0x0F, 0x0B, 0x3D, 0xFD, 0x0F, 0x0E, 0x5D, 0xFF, 0x0F, 0x0B,
-  0x77, 0xFD, 0x12, 0x0E, 0x6C, 0xFD, 0x13, 0x0E, 0x45, 0xFF, 0x13, 0x0C, 0x43, 0xFD, 0x14, 0x0E,
-  0x93, 0x01, 0xFD, 0x16, 0x0C, 0x76, 0xF9, 0x17, 0x0C, 0x41, 0xFD, 0x17, 0x0D, 0x57, 0xFF, 0x19,
-  0x0C, 0x79, 0xFD, 0x1A, 0x0C, 0x73, 0xBD, 0x1B, 0x0E, 0xC4, 0x01, 0xFD, 0x1B, 0x0E, 0x51, 0xFF,
-  0x1B, 0x0C, 0x74, 0xFD, 0x1C, 0x0E, 0xA1, 0x01, 0xFD, 0x1E, 0x0D, 0x7E, 0xFD, 0x1F, 0x0C, 0x5E,
-  0xFD, 0x22, 0x0D, 0x6A, 0xFD, 0x24, 0x0D, 0x8F, 0x01, 0xFD, 0x27, 0x0D, 0x56, 0xFD, 0x2A, 0x0D,
-  0x7C, 0xBD, 0x2B, 0x0D, 0xBE, 0x01, 0xFD, 0x2B, 0x0D, 0x4B, 0xFF, 0x2B, 0x0D, 0xE2, 0x01, 0xFD,
-  0x2C, 0x0D, 0xA0, 0x01, 0xFD, 0x2F, 0x0E, 0x60, 0xFD, 0x32, 0x0E, 0x6F, 0xFD, 0x33, 0x0D, 0x46,
-  0xFD, 0x34, 0x0D, 0x94, 0x01, 0xFD, 0x37, 0x0E, 0x5B, 0xBD, 0x3B, 0x0D, 0xC5, 0x01, 0xFD, 0x3B,
-  0x0E, 0x54, 0xFD, 0x3C, 0x0E, 0xA5, 0x01, 0xFD, 0x3E, 0x0D, 0x7F, 0xFD, 0x44, 0x0E, 0x8B, 0x01,
-  0xFD, 0x4A, 0x0E, 0x80, 0x01, 0xBD, 0x4B, 0x0E, 0xBD, 0x01, 0xFD, 0x4B, 0x0E, 0x4A, 0xFD, 0x4F,
-  0x0E, 0x5F, 0xFD, 0x52, 0x0E, 0x6D, 0xFD, 0x53, 0x0E, 0x47, 0xFD, 0x54, 0x0E, 0x9F, 0x01, 0xBD,
-  0x5B, 0x0E, 0xC6, 0x01, 0xFD, 0x5B, 0x0E, 0x52, 0xFD, 0x5C, 0x0E, 0xA4, 0x01, 0xFD, 0x6F, 0x0E,
-  0x69, 0xFD, 0x72, 0x0E, 0x70, 0xFD, 0x77, 0x0E, 0x5C, 0xFD, 0x7B, 0x0E, 0x5A, 0xFD, 0x7C, 0x0E,
-  0xA6, 0x01, 0xE3, 0xA7, 0x01, 0x7D, 0xE1, 0x5D, 0x7D, 0x69, 0xFF, 0x4D, 0x9F, 0xB1, 0xBB, 0xF6,
-  0x4F, 0xFA, 0x72, 0x7D, 0xD1, 0x7F, 0xFF, 0x3F, 0xA6, 0x2F, 0x19, 0x7D, 0xD7, 0xCC, 0x7F, 0xF7,
-  0x65, 0x56, 0x71, 0xFE, 0xEF, 0x9F, 0xB6, 0x92, 0xB3, 0x8D, 0x33, 0x27, 0x99, 0xBE, 0x1E, 0x56,
-  0xA3, 0xF6, 0x18, 0x0B, 0xF3, 0xDF, 0x61, 0xAD, 0xAF, 0xF9, 0x74, 0xAB, 0xB1, 0x8A, 0x92, 0xF4,
-  0xAD, 0x47, 0xFE, 0x5A, 0x04, 0x36, 0x11, 0x15, 0x45, 0xFF, 0xEB, 0x96, 0x56, 0xD6, 0x20, 0x42,
-  0xC4, 0x7B, 0xAA, 0xDA, 0xA3, 0x6B, 0xA3, 0x96, 0x49, 0xFE, 0x2F, 0x00, 0xAD, 0x54, 0xB7, 0xB8,
-  0xBF, 0x62, 0x33, 0xE3, 0xD4, 0x16, 0x12, 0xFF, 0x29, 0xB8, 0x32, 0x73, 0xFB, 0x93, 0x84, 0x55,
-  0x98, 0x3E, 0xAD, 0x7B, 0x15, 0x53, 0x6A, 0x22, 0x54, 0xA6, 0xCA, 0xE0, 0xAC, 0x8A, 0x08, 0x42,
-  0x86, 0x93, 0x48, 0x15, 0x88, 0x8B, 0x6F, 0xAA, 0xAD, 0x34, 0x2B, 0x8C, 0x2A, 0x25, 0x26, 0x68,
-  0x9E, 0xFF, 0xA5, 0xF4, 0xD9, 0x56, 0xB9, 0xFD, 0xF5, 0xDC, 0xA9, 0xCE, 0xA9, 0xF9, 0x49, 0xA4,
-  0x01, 0x48, 0x22, 0xB0, 0x55, 0x74, 0xA7, 0x35, 0xB9, 0xC7, 0x1A, 0xD1, 0xDC, 0x5C, 0x97, 0x48,
-  0xB9, 0x26, 0x2C, 0x6B, 0xEA, 0x9F, 0xCD, 0xED, 0x9B, 0x63, 0xD3, 0x27, 0x3B, 0xDE, 0x8E, 0x4F,
-  0x5A, 0xDF, 0x4B, 0x03, 0x00, 0x5A, 0x74, 0x87, 0x2F, 0x49, 0xAE, 0xFE, 0xC6, 0x06, 0x6A, 0x5B,
-  0x03, 0x2A, 0xD7, 0x18, 0x81, 0x4C, 0xE8, 0xBB, 0xAA, 0xFE, 0xA7, 0x0E, 0xE8, 0xCA, 0x72, 0xFE,
-  0x19, 0x2F, 0x0B, 0x40, 0x09, 0x42, 0x27, 0xD0, 0x62, 0x24, 0xCC, 0x77, 0x75, 0x45, 0x2B, 0x6A,
-  0xD2, 0xB6, 0x15, 0x61, 0xB3, 0xA9, 0xB5, 0x51, 0xD6, 0xF3, 0x3F, 0x6F, 0x19, 0xFF, 0x0C, 0x04,
-  0x2C, 0x71, 0x9E, 0x57, 0xA1, 0xCA, 0xA8, 0xAD, 0x82, 0xDF, 0x1A, 0x13, 0x50, 0x62, 0x89, 0xCC,
-  0x4A, 0x6B, 0x2A, 0x50, 0x43, 0x5A, 0xA9, 0x01, 0x00, 0xC8, 0xC4, 0x4A, 0x2E, 0x24, 0x7E, 0x09,
-  0x06, 0x36, 0xAB, 0x12, 0xE7, 0xAE, 0x3E, 0x2B, 0xA5, 0x92, 0x0E, 0xB4, 0xAF, 0x1B, 0xC7, 0xD6,
-  0x25, 0x63, 0xD4, 0x3A, 0xC9, 0xA7, 0x39, 0x5E, 0x9A, 0x91, 0x8F, 0xA5, 0x73, 0x3B, 0x49, 0x08,
-  0x13, 0x88, 0x2B, 0x49, 0x46, 0x1A, 0xE3, 0x18, 0x4D, 0x92, 0x44, 0x9D, 0x3A, 0x83, 0x55, 0x6C,
-  0x3A, 0x95, 0xCD, 0xAB, 0x47, 0x9D, 0xCF, 0xB2, 0x4F, 0x65, 0x6C, 0x45, 0x28, 0xA6, 0xCA, 0x7C,
-  0x8E, 0x62, 0x71, 0xFB, 0x9E, 0xC0, 0xF8, 0x84, 0x4A, 0x31, 0x9A, 0xB0, 0x8C, 0xD1, 0x5C, 0x21,
-  0x83, 0xFE, 0x56, 0x71, 0x15, 0x83, 0xC7, 0x71, 0x1F, 0x83, 0xA2, 0x35, 0x63, 0x9F, 0xE2, 0x01,
-  0x64, 0x8C, 0x9C, 0xE5, 0x28, 0xAE, 0xEB, 0x11, 0xEA, 0x6F, 0x45, 0xB8, 0x72, 0xDE, 0x14, 0x1F,
-  0xCE, 0x04, 0x70, 0x63, 0xF5, 0xD5, 0x2F, 0xBD, 0x62, 0x65, 0xC5, 0xC9, 0xA9, 0xAF, 0xD0, 0x39,
-  0x1E, 0xFB, 0xE5, 0x2E, 0x56, 0x9B, 0x95, 0x73, 0x53, 0x75, 0x96, 0xD5, 0x3F, 0xD3, 0x7A, 0x05,
-  0x5E, 0x95, 0x65, 0x27, 0x36, 0x8D, 0x0A, 0x23, 0x14, 0xCD, 0xD5, 0x14, 0x35, 0xFB, 0xD5, 0x24,
-  0xC5, 0xB2, 0x14, 0x45, 0x46, 0xD1, 0x43, 0xF5, 0x2C, 0xB0, 0xB8, 0x29, 0x66, 0x45, 0xCE, 0x8A,
-  0x12, 0x09, 0x5F, 0x3B, 0x75, 0x29, 0xD3, 0x26, 0x63, 0xBB, 0x4F, 0x4E, 0xE7, 0xA0, 0xE3, 0xA6,
-  0x49, 0xE5, 0x56, 0xEB, 0x49, 0x4B, 0x8A, 0x58, 0x2D, 0x62, 0x6E, 0x74, 0x41, 0x49, 0xD1, 0x09,
-  0x0F, 0x81, 0x4D, 0xDB, 0x42, 0x55, 0x0D, 0xA4, 0xB8, 0xF1, 0xD8, 0xB6, 0xB3, 0x75, 0x54, 0x92,
-  0x1D, 0x45, 0x5E, 0x7B, 0xD2, 0x68, 0x91, 0xCB, 0x6B, 0x5F, 0x51, 0x72, 0x35, 0x39, 0x45, 0x8A,
-  0xB6, 0x69, 0x26, 0x95, 0x6A, 0xE4, 0x39, 0xB9, 0x97, 0x56, 0x3F, 0xB5, 0xB3, 0xBA, 0xB0, 0x5E,
-  0xB7, 0x71, 0x32, 0x71, 0x24, 0xB7, 0xE6, 0xE9, 0x9A, 0xA8, 0x33, 0xE7, 0x75, 0x7B, 0x8A, 0xAA,
-  0x58, 0xDF, 0x93, 0x66, 0x1E, 0xB5, 0x6E, 0x1C, 0xBC, 0x8C, 0xC7, 0xCB, 0x68, 0x72, 0x32, 0x96,
-  0x83, 0x4D, 0x4E, 0x66, 0xCD, 0xB8, 0xBA, 0x51, 0x24, 0xD9, 0xED, 0x7D, 0xED, 0xD6, 0xF2, 0x32,
-  0x9D, 0xAF, 0x65, 0x9D, 0x4D, 0x26, 0xE7, 0x24, 0x94, 0x2C, 0x3D, 0xC0, 0x4B, 0x53, 0xBF, 0xC9,
-  0xE3, 0xAA, 0x03, 0x63, 0xC9, 0x74, 0x8F, 0x19, 0x45, 0x52, 0x9A, 0xA2, 0x79, 0xC9, 0x93, 0xD4,
-  0x96, 0xE3, 0x7A, 0xDA, 0x0F, 0x9D, 0x71, 0x84, 0x5C, 0x97, 0x7C, 0x2A, 0x45, 0x08, 0xD7, 0x72,
-  0x33, 0x8A, 0xE4, 0xF1, 0xAC, 0xAE, 0xB3, 0x95, 0xEF, 0x74, 0xDD, 0x7C, 0xA5, 0xFA, 0x35, 0xED,
-  0xB4, 0x08, 0x73, 0x53, 0xCF, 0x6D, 0xD2, 0xB8, 0x5A, 0x55, 0x72, 0xAB, 0x12, 0xD2, 0xD6, 0x19,
-  0x97, 0xBA, 0x97, 0xD1, 0xC9, 0x39, 0x8A, 0xE4, 0x65, 0x2F, 0xF5, 0x8F, 0xA3, 0xD8, 0xD8, 0xAD,
-  0xC9, 0x52, 0xEF, 0x97, 0x55, 0xBE, 0xBC, 0x2A, 0xAB, 0xCA, 0x70, 0x92, 0x3D, 0x61, 0x25, 0x95,
-  0x9F, 0xC7, 0x91, 0xF1, 0x79, 0x93, 0xB2, 0xC2, 0x71, 0x3B, 0xB9, 0xB8, 0x0E, 0x32, 0x8E, 0xA6,
-  0x19, 0x8C, 0x64, 0x84, 0x50, 0x93, 0x14, 0x53, 0x37, 0xF5, 0xE9, 0x6D, 0xEF, 0x74, 0xB1, 0x77,
-  0x32, 0xBB, 0x14, 0x9B, 0x7A, 0x59, 0x96, 0xED, 0xD5, 0x1D, 0x2D, 0x4A, 0x1F, 0xDD, 0x6C, 0x93,
-  0x47, 0x12, 0xCE, 0xCA, 0xA4, 0x15, 0xED, 0x4C, 0xEB, 0xE2, 0xD5, 0x5A, 0xF4, 0x39, 0xDD, 0xB3,
-  0x6A, 0x79, 0xAB, 0x03, 0xEA, 0xE2, 0x39, 0x5B, 0x7B, 0xE5, 0xBA, 0x54, 0x92, 0xDE, 0xF8, 0x63,
-  0xBF, 0x11, 0xC6, 0xA8, 0xCA, 0x99, 0xDA, 0x95, 0x8B, 0x2A, 0x5E, 0x91, 0xCE, 0xF9, 0x52, 0x6A,
-  0x0A, 0xDE, 0x64, 0xC9, 0x84, 0x4A, 0x11, 0x7A, 0x4A, 0x12, 0xF2, 0xB9, 0x6F, 0x1E, 0xC5, 0xC8,
-  0x47, 0xA5, 0x44, 0x39, 0x6F, 0x83, 0xF1, 0x7D, 0xD6, 0x12, 0x4A, 0xFF, 0x42, 0x16, 0xDA, 0x2F,
-  0x6F, 0xD5, 0xFC, 0xE4, 0x96, 0xCE, 0xCE, 0xFA, 0x2C, 0x4D, 0x3D, 0x08, 0x2D, 0x4A, 0x75, 0x6F,
-  0x69, 0x3B, 0x57, 0x5F, 0xD1, 0xAD, 0xAD, 0xD3, 0x02, 0x23, 0xBA, 0xEA, 0x39, 0x9B, 0xA9, 0x2D,
-  0x1C, 0x91, 0xE2, 0x15, 0x2B, 0x4D, 0xBB, 0xD5, 0x6D, 0xAD, 0xD7, 0x2F, 0x17, 0xD5, 0x69, 0x56,
-  0x2F, 0x13, 0xC6, 0xD3, 0x4A, 0x44, 0x8B, 0x7D, 0x01, 0x8E, 0x54, 0xFB, 0x72, 0x2D, 0x13, 0x76,
-  0x0E, 0xB3, 0x75, 0xF1, 0x49, 0x56, 0xD7, 0x22, 0x45, 0x6A, 0x25, 0xD7, 0x4D, 0x39, 0x27, 0x95,
-  0x92, 0x4E, 0x67, 0x10, 0x02, 0xE4, 0x5C, 0x3F, 0x3B, 0x6A, 0x42, 0x48, 0x5E, 0x78, 0x93, 0x65,
-  0x5C, 0x45, 0x65, 0x1F, 0x42, 0x42, 0x41, 0x25, 0xCF, 0x95, 0xAB, 0x01, 0xA0, 0xD4, 0x5C, 0xE4,
-  0xEB, 0xF3, 0xF9, 0xD4, 0xE2, 0xEB, 0x31, 0xB6, 0x3A, 0x5B, 0x93, 0x22, 0xF3, 0x94, 0x5B, 0xEA,
-  0x3A, 0x23, 0xD5, 0x8C, 0x0C, 0x42, 0x91, 0x33, 0x59, 0xD6, 0xF6, 0xC9, 0x99, 0xAF, 0xE4, 0xE5,
-  0x3E, 0x75, 0x3A, 0xB7, 0x6C, 0xAA, 0xAA, 0x7D, 0xC9, 0x2B, 0xAC, 0x25, 0xC8, 0x7B, 0x7E, 0xB7,
-  0xAC, 0xD1, 0xC7, 0xD4, 0x49, 0x99, 0x38, 0x29, 0x46, 0xAA, 0x19, 0xE9, 0x40, 0xF7, 0x8B, 0x53,
-  0xAE, 0x1B, 0xCE, 0x63, 0x53, 0xB9, 0xF5, 0xE8, 0x54, 0x4E, 0x2E, 0xF0, 0x08, 0xAB, 0x87, 0x6C,
-  0x7E, 0xF2, 0x64, 0x1C, 0x1A, 0x3A, 0x57, 0xB2, 0x67, 0x2C, 0x01, 0x42, 0xC1, 0xD8, 0x95, 0xBB,
-  0xDE, 0xCA, 0x2F, 0xCD, 0x6C, 0x29, 0x45, 0xDC, 0xD1, 0xBD, 0xC6, 0x2F, 0x34, 0xF1, 0x8A, 0xF1,
-  0x48, 0xB6, 0x54, 0x99, 0xAA, 0xB2, 0xBE, 0x5F, 0xB5, 0x55, 0xC6, 0x05, 0x2C, 0xB7, 0xAE, 0xAB,
-  0x0F, 0xED, 0x2C, 0xC9, 0x48, 0x27, 0x93, 0x7C, 0xB7, 0x48, 0xDA, 0x94, 0x46, 0x20, 0xCA, 0x57,
-  0xA1, 0x3B, 0xF7, 0xA8, 0x0B, 0x67, 0x00, 0x00, 0xA5, 0xEE, 0x66, 0xE9, 0x16, 0xBC, 0x3E, 0xB9,
-  0x2E, 0x73, 0x2C, 0x9B, 0xEA, 0x24, 0x8D, 0xEF, 0xB9, 0x2B, 0xB0, 0xF4, 0xA9, 0xB2, 0x59, 0xAE,
-  0x2F, 0x5A, 0x64, 0x1C, 0x39, 0x2F, 0x45, 0x33, 0x8E, 0xF0, 0x59, 0xC2, 0xA6, 0x4E, 0x02, 0x3F,
-  0x4D, 0x4D, 0x25, 0x69, 0x08, 0x3C, 0xDE, 0x2C, 0xA1, 0xE1, 0xBA, 0xC2, 0x08, 0xCD, 0x72, 0x5C,
-  0x14, 0xCB, 0x92, 0x6C, 0x9A, 0xB1, 0x40, 0x52, 0x24, 0xC5, 0x12, 0x8E, 0xCE, 0x72, 0x71, 0x8C,
-  0xDD, 0x65, 0x93, 0x24, 0xE1, 0xDA, 0x10, 0x6A, 0xC2, 0xD2, 0x64, 0x96, 0x4D, 0x53, 0x84, 0x8C,
-  0xA6, 0xE1, 0xD1, 0xD4, 0x35, 0x39, 0x2C, 0x50, 0x27, 0x39, 0x96, 0x75, 0x5F, 0xB9, 0xCA, 0x2D,
-  0xB8, 0x68, 0xA3, 0x08, 0xEB, 0x75, 0xE6, 0xAA, 0xB2, 0x96, 0xCA, 0xB1, 0x5E, 0xDD, 0xD9, 0xCE,
-  0xDD, 0x56, 0x4B, 0xA1, 0x85, 0x2F, 0xDA, 0x53, 0x7E, 0x79, 0xED, 0x6C, 0xD8, 0xEE, 0xE6, 0x50,
-  0x1F, 0x29, 0x75, 0x13, 0x29, 0x92, 0xA7, 0xD6, 0x52, 0x44, 0x93, 0x76, 0xD7, 0x5C, 0x2F, 0x5B,
-  0x2E, 0x9E, 0xC8, 0x53, 0x3C, 0x4A, 0xA9, 0xE5, 0x24, 0xC1, 0xD6, 0xB4, 0x35, 0x76, 0xAA, 0x75,
-  0x64, 0x86, 0x25, 0x56, 0xA0, 0x2F, 0x20, 0x54, 0xF2, 0x3D, 0x52, 0xF1, 0x95, 0x4C, 0x9E, 0x75,
-  0xFD, 0x2A, 0xA1, 0x8A, 0x2D, 0x6F, 0x52, 0xEE, 0xC4, 0x9C, 0xBA, 0x52, 0xE8, 0xE2, 0x69, 0xAF,
-  0xD8, 0xAB, 0xD4, 0x3A, 0x11, 0xFA, 0x10, 0x3A, 0x57, 0x43, 0xAF, 0x3A, 0x8C, 0xE3, 0xE5, 0x15,
-  0x56, 0x90, 0xB3, 0x50, 0x09, 0x95, 0xBF, 0x00, 0x00, 0x19, 0xF0, 0xB3, 0xE9, 0x24, 0x49, 0xE2,
-  0xD8, 0x5C, 0xF9, 0xEA, 0xAC, 0x9C, 0x07, 0x6F, 0xAE, 0x97, 0x8C, 0x57, 0xE6, 0xFB, 0x82, 0x2F,
-  0x54, 0x46, 0x76, 0x09, 0x01, 0x42, 0x92, 0x14, 0x95, 0xA2, 0x28, 0x92, 0x90, 0x67, 0x8C, 0x40,
-  0x12, 0x55, 0xEB, 0x6A, 0xA9, 0x57, 0x34, 0xA9, 0xD4, 0xF2, 0x5A, 0x91, 0x9F, 0xCA, 0xE9, 0xEF,
-  0xEB, 0xB3, 0xFA, 0x57, 0xEB, 0x7E, 0xA6, 0x9B, 0xCC, 0xBE, 0xEE, 0xA6, 0xDA, 0x2A, 0x5D, 0xE0,
-  0xB4, 0xBA, 0x93, 0x93, 0xA2, 0x9D, 0xEC, 0xF3, 0x0A, 0x56, 0x25, 0xA9, 0xB2, 0x37, 0xA1, 0x4A,
-  0xA3, 0xF4, 0x83, 0xD9, 0x1F, 0x76, 0xF4, 0xC4, 0xDE, 0x55, 0x09, 0xDD, 0xA7, 0x0E, 0x00, 0xD0,
-  0x07, 0x00, 0xA0, 0xFF, 0x01, 0x00, 0xFB, 0x13, 0x00, 0x80, 0x47, 0x18, 0xB0, 0xF0, 0xC8, 0xB9,
-  0x6A, 0xD9, 0x0C, 0x63, 0xF3, 0xFA, 0xFA, 0xF1, 0x52, 0xD2, 0xB5, 0x22, 0x66, 0xBF, 0x3B, 0xA9,
-  0x25, 0x6F, 0xF9, 0xCE, 0xCF, 0x2A, 0xC2, 0xDD, 0xF9, 0xEC, 0xCB, 0x74, 0xA5, 0xAA, 0x95, 0x8B,
-  0x32, 0x75, 0x5F, 0x75, 0x66, 0x13, 0x27, 0x85, 0x4A, 0xA7, 0xA2, 0x94, 0x0D, 0x39, 0x95, 0x91,
-  0x8F, 0x1B, 0x1A, 0x3A, 0xC5, 0xF9, 0xCB, 0x2E, 0x79, 0xD0, 0x43, 0xCE, 0xF8, 0x17, 0xF5, 0x28,
-  0x79, 0xF9, 0xA0, 0x24, 0x3C, 0x05, 0x0D, 0xFD, 0x3B, 0x00, 0xA0, 0x04, 0x1A, 0x00, 0x60, 0x01,
-  0x00, 0xDE, 0xC1, 0xE0, 0x5F, 0x3C, 0xAB, 0x02, 0x00, 0xC0, 0xF9, 0x90, 0xD0, 0x3B, 0xE4, 0x77,
-  0x6F, 0xB7, 0xC6, 0x0B, 0x81, 0x6C, 0x7A, 0x23, 0xB2, 0x2B, 0xF2, 0x84, 0x74, 0xF6, 0x22, 0x7D,
-  0x73, 0x67, 0x98, 0x28, 0x27, 0x25, 0x69, 0xED, 0x28, 0xB2, 0xF9, 0x29, 0x7A, 0x5A, 0x07, 0xD9,
-  0xCF, 0xB3, 0x45, 0x94, 0x5E, 0x31, 0x7A, 0xE8, 0xE9, 0x43, 0xEA, 0xD6, 0x95, 0x04, 0x71, 0x3A,
-  0x91, 0x84, 0x84, 0xE5, 0xD8, 0x4D, 0xCE, 0xE7, 0x6B, 0xEE, 0xAC, 0x2D, 0xD2, 0x15, 0x65, 0x6A,
-  0x59, 0xB1, 0xB7, 0x5B, 0x8F, 0xB7, 0x1E, 0x79, 0xD9, 0x4F, 0x04, 0x7E, 0xBB, 0x7C, 0x64, 0xCF,
-  0xE6, 0x57, 0x17, 0xB5, 0x9C, 0x57, 0x25, 0xE5, 0x13, 0x3B, 0xD9, 0xF2, 0x1D, 0xCD, 0xAE, 0xF1,
-  0x6D, 0xC7, 0xAD, 0xC6, 0xEE, 0x6E, 0x8C, 0x51, 0xF4, 0xD4, 0x4B, 0xC6, 0xE9, 0x64, 0xFB, 0x37,
-  0x9E, 0x1E, 0xB5, 0x57, 0x2A, 0x20, 0x00, 0x00, 0xD9, 0x01, 0x00, 0xD9, 0x13, 0x00, 0x20, 0x27,
-  0x97, 0x5F, 0x00, 0xC0, 0x1E, 0x7A, 0x07, 0x00, 0xE8, 0x00, 0x00, 0x00, 0x00, 0x03, 0xD8, 0x05,
-  0x00, 0x08, 0xF4, 0xBF, 0xFE, 0x03, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x80, 0xAD, 0xA7, 0x10, 0x04, 0x40, 0xD8, 0x05, 0x00, 0x88, 0x01, 0x00, 0xB0, 0x23, 0x08, 0x41,
-  0x0D, 0x00, 0xD0, 0x8F, 0x4B, 0xEF, 0x4C, 0x43, 0x1F, 0x00, 0x80, 0x85, 0x3E, 0xF0, 0x0E, 0xF2,
-  0xC5, 0x45, 0x87, 0x7A, 0x00, 0x40, 0x8F, 0x05, 0x00, 0x80, 0x6A, 0x27, 0xD3, 0x01, 0x00, 0x26,
-  0x3F, 0x06, 0x23, 0x88, 0x18, 0xF4, 0x6F, 0x07, 0x00, 0x30, 0x1C, 0x04, 0x30, 0x48, 0x54, 0x00,
-  0x80, 0x04, 0x80, 0xDD, 0x10, 0x58, 0x08, 0x00, 0x12, 0x3E, 0x9C, 0xDD, 0x67, 0x90, 0xE3, 0x43,
-  0x36, 0x00, 0xC0, 0x34, 0x00, 0x40, 0xAB, 0x21, 0x83, 0x08, 0xB8, 0x00, 0x80, 0x0A, 0x0D, 0x0B,
-  0xB9, 0x07, 0x0B, 0x75, 0xE4, 0x88, 0xE8, 0x30, 0x28, 0x00, 0x80, 0x3C, 0xBC, 0x00, 0x00, 0xAB,
-  0x20, 0xD7, 0x7D, 0xA8, 0x00, 0x00, 0xFA, 0x41, 0x62, 0x7B, 0x03, 0x00, 0x64, 0x21, 0x83, 0x86,
-  0xD5, 0xD0, 0x01, 0x00, 0x32, 0xCF, 0x83, 0x1C, 0xC8, 0x12, 0xC8, 0xDB, 0x58, 0xD0, 0x7F, 0x9E,
-  0x1D, 0x4D, 0x01, 0x00, 0x00, 0xC8, 0x61, 0x07, 0x83, 0x1D, 0x7C, 0xA8, 0x65, 0x32, 0x22, 0x84,
-  0x71, 0xC2, 0x07, 0x68, 0x38, 0x00, 0x80, 0x3C, 0x04, 0x00, 0xE0, 0x20, 0x83, 0x40, 0x1D, 0x00,
-  0x00, 0x3A, 0x14, 0x54, 0x78, 0x61, 0x43, 0x5F, 0x09, 0x00, 0x08, 0x2C, 0x34, 0xC0, 0x86, 0x8A,
-  0x4C, 0x0D, 0x09, 0x09, 0x00, 0x70, 0x2B, 0x00, 0xC0, 0xDE, 0xD3, 0xB0, 0x87, 0x11, 0x68, 0x98,
-  0x6F, 0xED, 0xA0, 0x06, 0x00, 0xC8, 0xCC, 0xC2, 0x0B, 0x90, 0x19, 0x7C, 0xFC, 0x10, 0x7D, 0x0F,
-  0x00, 0xD0, 0xB0, 0x90, 0xC3, 0x2B, 0x00, 0x00, 0x19, 0x54, 0x75, 0x99, 0x82, 0x2F, 0x07, 0x00,
-  0x78, 0x21, 0x53, 0xE0, 0x00, 0x00, 0xA0, 0x43, 0x97, 0xC3, 0x6A, 0xE8, 0x12, 0x76, 0xB0, 0x61,
-  0x43, 0x87, 0xEE, 0x41, 0x87, 0xC1, 0x45, 0x00, 0x2A, 0x3D, 0xFC, 0x01, 0x00, 0xC8, 0x92, 0x07,
-  0x00, 0xD8, 0x23, 0x20, 0x02, 0x00, 0xC0, 0x13, 0x00, 0x00, 0x44, 0x00, 0x06, 0x00, 0x00, 0x00,
-  0x80, 0x5D, 0xC1, 0xBF, 0x41, 0x3E, 0x41, 0x0B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x44, 0x00, 0x00,
-  0x00, 0xC0, 0x5F, 0x00, 0x80, 0x17, 0x00, 0xA0, 0xD3, 0x8F, 0xFD, 0x44, 0x3E, 0x00, 0x00, 0x00,
-  0x80, 0x00, 0x00, 0x10, 0x44, 0x04, 0x20, 0x08, 0x84, 0x00, 0x02, 0x01, 0x10, 0x01, 0x00, 0x40,
-  0x84, 0x08, 0xD0, 0xFF, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x23, 0xDF, 0x96,
-  0xD1, 0xD7, 0x20, 0x78, 0x02, 0x68, 0x01, 0x7E, 0xE1, 0x9D, 0x90, 0x04, 0x21, 0x00, 0xFC, 0x35,
-  0x53, 0x17, 0x98, 0xDA, 0x00, 0x00, 0xF8, 0x05, 0x40, 0x22, 0x00, 0x40, 0x08, 0x84, 0x10, 0x42,
-  0xDF, 0x82, 0x00, 0xC0, 0x04, 0x00, 0x00, 0x70, 0x03, 0x00, 0x00, 0x00, 0x00, 0x06, 0x21, 0x04,
-  0x22, 0x08, 0x01, 0x00, 0x44, 0xF4, 0xD9, 0x00, 0x00, 0x00, 0x00, 0x20, 0x5F, 0x03, 0xFD, 0x42,
-  0xA4, 0x12, 0x00, 0x80, 0xBE, 0x08, 0x01, 0x44, 0x58, 0x01, 0xF9, 0x0D, 0x14, 0x41, 0x10, 0x22,
-  0x00, 0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0xB2, 0x07, 0x00, 0x00, 0x80, 0x94, 0x06, 0x00, 0x00,
-  0xA8, 0x05, 0x46, 0x00, 0x32, 0xFD, 0x36, 0x80, 0xAA, 0x5F, 0x29, 0xDA, 0xE4, 0x46, 0xC3, 0xDF,
-  0x31, 0x08, 0x40, 0x9A, 0x01, 0xC4, 0xFF, 0x41, 0xDF, 0x24, 0x00, 0x00, 0x00, 0x00, 0x52, 0xF0,
-  0x05, 0x00, 0x00, 0x00, 0xEA, 0xF2, 0x06, 0x00, 0xB0, 0x0B, 0x44, 0x11, 0x7E, 0x96, 0x40, 0xA8,
-  0x02, 0x92, 0x35, 0x23, 0x04, 0x08, 0x01, 0x10, 0x01, 0x00, 0x84, 0x80, 0x10, 0xBC, 0x1F, 0x04,
-  0x60, 0x82, 0x20, 0x40, 0x04, 0x00, 0x80, 0xFD, 0xEC, 0x17, 0x08, 0x0B, 0x63, 0xB2, 0xBD, 0x67,
-  0x5F, 0x1F, 0x27, 0xFF, 0x3D, 0xC7, 0xB4, 0xBA, 0x48, 0x8A, 0x3E, 0x7E, 0x1A, 0x89, 0xA0, 0xA8,
-  0x84, 0x14, 0x46, 0x4A, 0xD6, 0x9D, 0x6C, 0x58, 0x56, 0x32, 0xB2, 0x2B, 0x29, 0x79, 0x77, 0x3D,
-  0xE5, 0xB8, 0x0B, 0x13, 0x26, 0xFD, 0xA3, 0xDF, 0x6D, 0x6E, 0x28, 0x7C, 0x26, 0xAA, 0xBE, 0xDB,
-  0x4E, 0x69, 0xD3, 0x5B, 0xBF, 0xFB, 0x94, 0x6E, 0xCB, 0xFC, 0xE9, 0x1D, 0xB9, 0xD7, 0xF5, 0x4D,
-  0x57, 0xBA, 0xD7, 0xBC, 0xD2, 0x96, 0x93, 0x9E, 0x23, 0xCD, 0x8C, 0xCE, 0x5A, 0x45, 0x42, 0xF4,
-  0xC9, 0x5C, 0xCA, 0x85, 0x57, 0xC9, 0xDC, 0xC8, 0xFF, 0xB7, 0x3C, 0x9D, 0xCC, 0x97, 0xC9, 0x4F,
-  0x59, 0xB5, 0xA6, 0xF5, 0xC7, 0xB9, 0xA7, 0xC5, 0xE3, 0x22, 0x52, 0x3C, 0x12, 0x32, 0x11, 0x25,
-  0xBD, 0x6A, 0x4B, 0xD8, 0x3A, 0x46, 0x9C, 0x6A, 0x72, 0x2B, 0x7F, 0x50, 0xC6, 0x0F, 0x55, 0x82,
-  0x98, 0xEA, 0x2B, 0xC5, 0x64, 0xA5, 0xB2, 0x3C, 0x69, 0x7A, 0x02, 0x00, 0x32, 0x00, 0x80, 0x7E,
-  0x21, 0xD0, 0x7B, 0xFC, 0xBD, 0xB7, 0x1B, 0x5E, 0x6F, 0x5B, 0x17, 0xEA, 0x5E, 0xB8, 0x00, 0x80,
-  0xBC, 0x4C, 0x64, 0xE5, 0x37, 0xA1, 0x5E, 0x45, 0x03, 0x6C, 0xF6, 0xC6, 0x28, 0x5A, 0x46, 0xBF,
-  0xE6, 0xFF, 0x21, 0x69, 0x79, 0xD2, 0x32, 0x3B, 0x3D, 0x7C, 0xA9, 0xC8, 0x39, 0x3E, 0xBD, 0xC3,
-  0x04, 0xE8, 0xDB, 0x00, 0xD4, 0xE3, 0xA4, 0xAE, 0xE5, 0x84, 0xE0, 0xE9, 0xD2, 0xF5, 0x09, 0xA0,
-  0x4B, 0x7F, 0x00, 0x00, 0xFE, 0xC0, 0x50, 0xC7, 0x9B, 0x4E, 0x12, 0x08, 0x74, 0x59, 0x0A, 0x7D,
-  0xAB, 0xAF, 0xEB, 0x47, 0xCC, 0xC2, 0x9E, 0x07, 0x40, 0x9E, 0xFA, 0xF4, 0x50, 0xB2, 0xF5, 0xDA,
-  0x75, 0xB3, 0xA5, 0xBD, 0x3C, 0x74, 0x2D, 0xD5, 0x23, 0x50, 0x61, 0x04, 0xF8, 0x5B, 0xE0, 0x15,
-  0xA9, 0x32, 0xEA, 0x2C, 0xE3, 0xAF, 0xE9, 0x25, 0x99, 0x64, 0x4C, 0xD5, 0xC8, 0xFD, 0x84, 0xFA,
-  0x77, 0x8B, 0x7C, 0x5B, 0xD1, 0xC9, 0xF2, 0xAE, 0x90, 0xB0, 0x73, 0x74, 0xFE, 0x90, 0x65, 0x2D,
-  0x40, 0x2E, 0x00, 0x1F, 0xDC, 0x93, 0xE8, 0xB5, 0x90, 0x5D, 0xC1, 0x83, 0x4D, 0xFB, 0x15, 0x00,
-  0x2A, 0xBF, 0x5D, 0x09, 0xF2, 0x2A, 0x9B, 0x0E, 0x59, 0x03, 0xB4, 0x19, 0xEC, 0xBE, 0xB2, 0x25,
-  0x3B, 0x72, 0xD3, 0xD7, 0x17, 0x03, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x27, 0x00, 0x40, 0xDF, 0x2D,
-  0xD9, 0xDA, 0xD0, 0x2B, 0x33, 0xC9, 0x1A, 0xA6, 0x43, 0x85, 0x1E, 0x05, 0x28, 0x5B, 0xAF, 0x9F,
-  0x2A, 0xEB, 0xE6, 0xCC, 0xCC, 0x4F, 0xEF, 0x01, 0x00, 0xF0, 0xE1, 0x03, 0x00, 0xDC, 0x18, 0x3D,
-  0x3D, 0x3A, 0x21, 0x64, 0xAA, 0xA6, 0xB2, 0x55, 0x6B, 0xE6, 0x8B, 0x74, 0x9B, 0xB7, 0xDE, 0x8D,
-  0xFB, 0x16, 0x62, 0x27, 0x9B, 0xEC, 0x72, 0x59, 0x60, 0x5F, 0xF8, 0x40, 0xA6, 0xD9, 0xE7, 0xD5,
-  0xB3, 0x6F, 0xB0, 0x2A, 0x4D, 0x7A, 0xCB, 0xC8, 0x6C, 0x9D, 0x7F, 0xCA, 0x09, 0x00, 0x40, 0xC5,
-  0x52, 0xD0, 0x06, 0xC0, 0xD2, 0x15, 0xBD, 0xAC, 0xD0, 0x4B, 0x26, 0x7B, 0x10, 0x11, 0x71, 0x01,
-  0x4D, 0x80, 0x70, 0x6B, 0x46, 0x12, 0x08, 0x33, 0x46, 0x18, 0x71, 0xBD, 0x95, 0xCF, 0xB3, 0xC3,
-  0x5B, 0xD1, 0x69, 0x1E, 0xB9, 0xFB, 0x64, 0x1A, 0x8E, 0x08, 0x0B, 0x20, 0x40, 0x08, 0x10, 0xE0,
-  0x7B, 0xAB, 0xF3, 0xB0, 0x6E, 0xEC, 0xF3, 0xC8, 0xC8, 0xA1, 0xBE, 0x91, 0x64, 0xDD, 0x59, 0xB3,
-  0xBD, 0xE9, 0xD0, 0x37, 0x88, 0x1C, 0xF5, 0x01, 0x80, 0xC5, 0xFF, 0x67, 0x66, 0xBE, 0xC0, 0xDB,
-  0xAE, 0xFF, 0xF5, 0xBE, 0x78, 0xC3, 0xAD, 0x07, 0x3B, 0x18, 0x00, 0x00, 0x4F, 0xF5, 0xB0, 0xEF,
-  0xD7, 0xA4, 0x98, 0x34, 0x6F, 0x92, 0x3A, 0xD9, 0xB5, 0x84, 0x66, 0x5A, 0xDA, 0x0A, 0x80, 0x2A,
-  0x10, 0xE4, 0xE5, 0xC1, 0xFB, 0x00, 0x70, 0x8A, 0x93, 0x7B, 0x00, 0x00, 0x37, 0x3F, 0xB2, 0xC0,
-  0x9F, 0xB0, 0x1B, 0xDE, 0x01, 0x00, 0xF4, 0x0E, 0xFF, 0xF9, 0xEF, 0xBB, 0x88, 0x63, 0x7F, 0x02,
-  0x91, 0x50, 0xEF, 0x6F, 0x00, 0xC0, 0xD6, 0x21, 0x97, 0x03, 0x7D, 0x08, 0x00, 0x70, 0xFF, 0x39,
-  0x74, 0x4A, 0x38, 0xA2, 0xB7, 0xFC, 0x43, 0x80, 0x13, 0xC1, 0x83, 0x5D, 0xF3, 0x8A, 0x0A, 0x20,
-  0x9C, 0x30, 0x41, 0xE4, 0xAF, 0x0A, 0x74, 0x02, 0x76, 0x97, 0xEF, 0x5E, 0x8C, 0x83, 0xB8, 0x03,
-  0x0D, 0xFC, 0x19, 0x00, 0x00, 0x00, 0x30, 0xA8, 0xC2, 0x5B, 0x94, 0x10, 0xAF, 0xF7, 0x73, 0x58,
-  0x0D, 0x29, 0x6D, 0x00, 0x00, 0x2B, 0xEB, 0x1D, 0xFC, 0x17, 0xF4, 0x1B, 0x2F, 0xF4, 0x04, 0x00,
-  0xEC, 0xBB, 0x00, 0x7E, 0xC1, 0xE7, 0xF3, 0x20, 0x00, 0x3F, 0xE1, 0x7D, 0xD8, 0x85, 0x9C, 0x0B,
-  0xB8, 0x42, 0x14, 0x74, 0xB8, 0x8E, 0x85, 0x88, 0x56, 0x8D, 0xAC, 0x14, 0x91, 0x92, 0x88, 0x41,
-  0x1A, 0x23, 0x04, 0x3A, 0x9A, 0x94, 0x24, 0x53, 0x22, 0x49, 0x2B, 0xC2, 0x29, 0x49, 0x5F, 0x8D,
-  0x10, 0x22, 0x40, 0xF4, 0xF9, 0x7A, 0x0B, 0xC1, 0x39, 0xC1, 0x12, 0x6E, 0xB4, 0xD6, 0x92, 0x75,
-  0x0C, 0x0E, 0xA8, 0x74, 0x89, 0xEC, 0xBA, 0x86, 0x74, 0xC5, 0x08, 0x0B, 0x90, 0x04, 0xEA, 0x8D,
-  0x8C, 0x84, 0x0A, 0x04, 0xA0, 0x29, 0x80, 0xAF, 0x96, 0x18, 0x10, 0xC2, 0xD5, 0xCB, 0xF2, 0x20,
-  0xA1, 0x02, 0x11, 0x00, 0x57, 0x00, 0x00, 0x80, 0x10, 0x42, 0x40, 0x27, 0x18, 0x01, 0x00, 0x92,
-  0x63, 0x9A, 0x50, 0x00, 0x41, 0x28, 0x90, 0x52, 0x04, 0x9A, 0x28, 0x08, 0x9A, 0x90, 0x94, 0x51,
-  0x02, 0x9A, 0x90, 0xC6, 0x00, 0x09, 0x21, 0x00, 0x81, 0xA2, 0x0C, 0x42, 0x32, 0x14, 0x49, 0x68,
-  0x8A, 0xAC, 0xFE, 0x14, 0x00, 0xF0, 0x67, 0x04, 0xE6, 0x0F, 0x00, 0x40, 0xD6, 0x1B, 0xD2, 0x45,
-  0xC1, 0x40, 0x41, 0xF5, 0x40, 0x15, 0xB0, 0x82, 0xA8, 0x07, 0x00, 0x34, 0x24, 0x68, 0xA5, 0x25,
-  0x26, 0x00, 0xF6, 0x94, 0x51, 0x14, 0x0F, 0x35, 0x26, 0x33, 0xF4, 0x2A, 0x12, 0xB2, 0x8A, 0xE4,
-  0x58, 0x3D, 0x96, 0x24, 0x05, 0x28, 0x01, 0xB4, 0x18, 0x65, 0xA6, 0xAA, 0x9A, 0xA5, 0x01, 0x4A,
-  0x00, 0x24, 0xCD, 0x2C, 0xBF, 0x88, 0x98, 0x82, 0x80, 0x31, 0x06, 0xE0, 0xC0, 0x83, 0x00, 0x00,
-  0xFC, 0x2E, 0x00, 0xB0, 0x55, 0x33, 0x65, 0x02, 0x00, 0xB0, 0x00, 0x00, 0x98, 0x73, 0xC1, 0xA0,
-  0x12, 0x13, 0xD1, 0xB4, 0x05, 0x20, 0x00, 0x66, 0x37, 0xD1, 0xE4, 0x29, 0x29, 0x6E, 0x49, 0xF1,
-  0x8C, 0x09, 0x2A, 0x0D, 0x00, 0x00, 0x4A, 0x44, 0x1A, 0x20, 0x6E, 0x2B, 0x2A, 0xA1, 0x13, 0x60,
-  0x68, 0xC6, 0x05, 0x00, 0xA4, 0x39, 0x29, 0xFC, 0x83, 0x06, 0xA4, 0x48, 0x70, 0xFE, 0xD2, 0x9E,
-  0x2A, 0x89, 0x3E, 0x4F, 0xA7, 0x52, 0x50, 0x9B, 0xD4, 0x15, 0xBB, 0xFA, 0x19, 0x90, 0x4D, 0x0D,
-  0xFD, 0x5C, 0xB7, 0x0A, 0x4B, 0x62, 0xBF, 0x4C, 0xC2, 0x5A, 0x43, 0x15, 0xD8, 0x04, 0xA0, 0x73,
-  0x19, 0x64, 0x84, 0xE9, 0x42, 0xCF, 0x48, 0x82, 0xDD, 0xCA, 0x54, 0x05, 0xA3, 0x1B, 0x3C, 0x8E,
-  0x70, 0xD4, 0x9C, 0x86, 0x43, 0x74, 0x1E, 0x79, 0x9A, 0x4E, 0xA8, 0xE9, 0x8C, 0xCA, 0xE7, 0xA8,
-  0x29, 0xA9, 0x43, 0x4E, 0xEE, 0x2B, 0xBD, 0x37, 0x2F, 0x0B, 0x19, 0x81, 0x97, 0x50, 0x29, 0xED,
-  0xCC, 0xA4, 0xC7, 0x4B, 0xAA, 0x95, 0xED, 0x1B, 0x15, 0x6E, 0x98, 0x2D, 0x52, 0xD0, 0x67, 0x62,
-  0x5E, 0xAA, 0x15, 0x42, 0x51, 0x3A, 0x9B, 0x26, 0xED, 0x6F, 0xE9, 0x84, 0x12, 0x80, 0xD7, 0x7A,
-  0xDA, 0xE9, 0x7C, 0x32, 0xC5, 0x4F, 0xAB, 0xD4, 0x34, 0x19, 0x1D, 0xB2, 0x9E, 0xB1, 0x1C, 0xCF,
-  0xF9, 0x52, 0x8A, 0x82, 0x2B, 0x40, 0x7E, 0x7F, 0xEA, 0x24, 0xB9, 0x00, 0x6B, 0xFB, 0x8C, 0x77,
-  0xAB, 0x5B, 0x28, 0xA9, 0x5F, 0x73, 0xC0, 0x13, 0xCE, 0x5A, 0x2B, 0xA6, 0x42, 0xE5, 0x85, 0xF1,
-  0x79, 0x59, 0x95, 0xD8, 0x8A, 0x84, 0x21, 0x39, 0xAD, 0x95, 0xAB, 0x26, 0x57, 0xC6, 0x05, 0x84,
-  0xD0, 0x09, 0xD5, 0x44, 0xED, 0xA6, 0x9C, 0x8A, 0x76, 0x34, 0x45, 0xAE, 0x64, 0x97, 0xC8, 0xAF,
-  0xAB, 0x58, 0xB5, 0x3D, 0x6F, 0x5E, 0x60, 0x4F, 0x25, 0x4F, 0xFE, 0x15, 0x49, 0xCE, 0x26, 0x49,
-  0x5D, 0x89, 0x6D, 0x06, 0xBF, 0x9F, 0xBA, 0xD4, 0x8A, 0x33, 0xAF, 0x85, 0x54, 0x57, 0x6B, 0x14,
-  0x7B, 0x1E, 0xFC, 0x14, 0x59, 0x32, 0x32, 0xF8, 0xE8, 0x9A, 0x67, 0x98, 0x2F, 0x8A, 0x9F, 0x3D,
-  0x69, 0x9B, 0xB6, 0x3A, 0xB9, 0x34, 0x74, 0x4E, 0xBD, 0x90, 0xBF, 0xFB, 0xD0, 0x1B, 0x00, 0x40,
-  0x72, 0x3C, 0x6E, 0x36, 0xE9, 0xDA, 0x7C, 0x92, 0x31, 0x8E, 0x93, 0x19, 0xFB, 0x01, 0x00, 0x7A,
-  0x9F, 0x85, 0x27, 0x67, 0x7F, 0x19, 0x74, 0x76, 0x61, 0x0C, 0xEA, 0x05, 0x76, 0x84, 0x8C, 0x24,
-  0xEA, 0x73, 0x88, 0xA5, 0x0E, 0xFB, 0x47, 0x1F, 0xEF, 0xAF, 0xEF, 0x9C, 0xB4, 0x0B, 0x57, 0x16,
-  0xC1, 0x16, 0xC8, 0x08, 0x35, 0xE1, 0xCA, 0x8E, 0x1D, 0x61, 0x69, 0x3A, 0x45, 0xD1, 0xD8, 0x33,
-  0x2A, 0x45, 0x08, 0xD9, 0xD4, 0x59, 0x6F, 0xFB, 0x54, 0x99, 0x84, 0xDE, 0x00, 0x00, 0x62, 0x03,
-  0x00, 0x44, 0x26, 0x82, 0x20, 0x7F, 0x63, 0xBE, 0xF0, 0x7E, 0xC0, 0xBF, 0x35, 0x49, 0x4D, 0x0F,
-  0x79, 0x35, 0xC5, 0x0A, 0x51, 0xE7, 0x91, 0xA3, 0x07, 0x7A, 0x65, 0x43, 0xFA, 0xC1, 0x45, 0x97,
-  0x85, 0x6D, 0xB2, 0xE3, 0x77, 0x52, 0x5B, 0xDE, 0x1B, 0xEC, 0xAD, 0x00, 0x00, 0x7A, 0x9E, 0xA2,
-  0x47, 0x56, 0xBD, 0xFF, 0xC8, 0xBB, 0x8A, 0xEC, 0x76, 0xDE, 0xFF, 0xEB, 0x20, 0x76, 0xAF, 0xD5,
-  0xE9, 0x59, 0x5B, 0xD7, 0xCA, 0xC9, 0x16, 0x6C, 0xF1, 0x04, 0xD1, 0x85, 0x41, 0x88, 0x08, 0xC8,
-  0x7E, 0x36, 0xDD, 0xFB, 0xF2, 0x2F, 0x45, 0x54, 0xB7, 0xF1, 0xEC, 0x39, 0xA0, 0xBE, 0x8A, 0x5A,
-  0xB4, 0x7D, 0xD3, 0xEB, 0x27, 0x6F, 0x07, 0x00, 0x40, 0x79, 0x22, 0xC0, 0xDE, 0x54, 0x47, 0xE0,
-  0x5F, 0x5B, 0x7F, 0x20, 0x67, 0xEE, 0xA9, 0x50, 0x7A, 0xEC, 0xD3, 0xC9, 0x2E, 0x22, 0x6E, 0x70,
-  0x6A, 0xE0, 0xCA, 0xB9, 0x4F, 0x63, 0x27, 0x3F, 0x2E, 0x5F, 0xB7, 0x6D, 0x6F, 0xAD, 0xB0, 0xB3,
-  0xAD, 0x34, 0x53, 0x28, 0x65, 0xD9, 0x59, 0x2D, 0xCA, 0xAC, 0x32, 0x23, 0x22, 0xA5, 0xFA, 0x55,
-  0x56, 0xB4, 0x88, 0xA3, 0x2E, 0x32, 0x35, 0xB5, 0x77, 0xCA, 0x51, 0xDD, 0xCA, 0x2F, 0x5D, 0xC5,
-  0xB4, 0x2E, 0x3D, 0x25, 0xB9, 0xE5, 0x9B, 0x49, 0x56, 0xA6, 0x96, 0x9F, 0x32, 0xEB, 0x46, 0xED,
-  0xB5, 0xBD, 0xDE, 0x79, 0xCE, 0x3B, 0xF3, 0xD5, 0xE9, 0x5E, 0x13, 0xE8, 0xC5, 0x96, 0xA7, 0x65,
-  0x75, 0xAF, 0x23, 0x95, 0xA6, 0x0B, 0xEA, 0x07, 0x00, 0xB8, 0xCD, 0x2F, 0x6B, 0x89, 0x8B, 0x8E,
-  0xE4, 0x4F, 0xC8, 0x54, 0xFF, 0x52, 0xF7, 0xDC, 0xB2, 0xCF, 0xCA, 0x2B, 0xE8, 0x61, 0xCF, 0x80,
-  0x47, 0xE0, 0x29, 0x37, 0xD1, 0x53, 0x91, 0xB1, 0xCB, 0xD5, 0x5E, 0x99, 0xED, 0xB7, 0x0B, 0xEC,
-  0xC8, 0xF3, 0x7B, 0x6A, 0x3E, 0x79, 0xD1, 0xC3, 0xF2, 0x15, 0x75, 0xAD, 0x3E, 0x4C, 0x32, 0xD4,
-  0x05, 0xF7, 0xCC, 0xB7, 0x2A, 0x2C, 0x68, 0xA7, 0x8B, 0xD4, 0xAA, 0xB9, 0x82, 0x95, 0x95, 0x62,
-  0xA5, 0x44, 0x71, 0x86, 0x21, 0xA4, 0x27, 0x19, 0x65, 0x8C, 0x5F, 0x18, 0xD4, 0x28, 0x7E, 0x36,
-  0x55, 0x3E, 0x38, 0xF6, 0x76, 0xA9, 0x12, 0x18, 0x01, 0xA0, 0x3D, 0x05, 0x08, 0xFB, 0x76, 0xB3,
-  0xD5, 0x6B, 0xFD, 0xC1, 0xF4, 0x58, 0xD9, 0x67, 0xE5, 0xA9, 0x6E, 0x6E, 0xFB, 0xF9, 0x01, 0xC7,
-  0xAA, 0xDC, 0x3D, 0x34, 0xB4, 0x4A, 0x9E, 0x13, 0xAF, 0xD9, 0xD1, 0x5A, 0x5C, 0x90, 0x45, 0x3F,
-  0xB3, 0x5A, 0xE6, 0xBC, 0xF9, 0x09, 0xDF, 0xD2, 0x85, 0xEC, 0x8A, 0x9A, 0xDB, 0x43, 0xA5, 0x81,
-  0x66, 0x53, 0x24, 0x6F, 0xCA, 0x37, 0x75, 0x9D, 0x17, 0x9D, 0x25, 0xFB, 0xD3, 0xD8, 0x3B, 0x4D,
-  0xEE, 0x4D, 0x27, 0xBB, 0x82, 0x90, 0xD9, 0x97, 0xD5, 0x6D, 0x13, 0x7A, 0x0A, 0x29, 0xD2, 0x1F,
-  0x00, 0xAE, 0x0D, 0x64, 0xF5, 0xD1, 0xC7, 0x4D, 0x69, 0x9E, 0x92, 0xFC, 0x16, 0xF2, 0xE9, 0x22,
-  0xEB, 0x28, 0x17, 0x10, 0x00, 0x68, 0x9B, 0x5E, 0x8F, 0x37, 0xDF, 0x4D, 0x3D, 0x13, 0x00, 0xA8,
-  0xEC, 0x14, 0xB4, 0x9A, 0x84, 0x24, 0xA1, 0x16, 0xF5, 0x19, 0x50, 0xEC, 0x0C, 0xD8, 0xDB, 0xA9,
-  0x03, 0x19, 0x9B, 0x3D, 0x81, 0xFD, 0x36, 0x00, 0xF9, 0x41, 0x74, 0x80, 0x4E, 0x97, 0xB6, 0x1C,
-  0x86, 0xDE, 0x03, 0x00, 0x00, 0xD8, 0x2F, 0x00, 0xEC, 0xDF, 0x20, 0xBB, 0x48, 0x78, 0x40, 0xA8,
-  0x10, 0xF6, 0x05, 0x00, 0xA0, 0xEF, 0x03, 0x56, 0xF3, 0xD7, 0xE0, 0xAF, 0xC8, 0x43, 0xEF, 0xF1,
-  0x1F, 0xE8, 0x7D, 0x0E, 0xF9, 0x83, 0x00, 0x00, 0xE4, 0x17, 0x71, 0xDF, 0x83, 0x6C, 0xD9, 0x44,
-  0xAF, 0xF1, 0xC0, 0x0F, 0xD0, 0x6F, 0x24, 0x75, 0xFE, 0x12, 0x21, 0xFF, 0xF2, 0x7C, 0x42, 0xBD,
-  0x02, 0x16, 0xAA, 0x40, 0x0B, 0xC0, 0x9F, 0xD4, 0x0C, 0x80, 0x02, 0xF8, 0x60, 0x98, 0x00, 0x13,
-  0x00, 0x2D, 0x21, 0x4E, 0x37, 0x95, 0xE7, 0x4F, 0x58, 0x93, 0x5D, 0xBE, 0xE9, 0x2D, 0x75, 0xB8,
-  0x42, 0xC1, 0x86, 0x53, 0x19, 0x40, 0xD8, 0x62, 0x30, 0x00, 0x08, 0x30, 0x50, 0x01, 0x00, 0x06,
-  0x30, 0x02, 0x44, 0xA0, 0xC5, 0x06, 0x00, 0x08, 0xA4, 0x10, 0x62, 0x5D, 0x73, 0xD3, 0x0D, 0xA9,
-  0x98, 0x8A, 0x41, 0xB2, 0x59, 0x60, 0x5A, 0x6C, 0x1D, 0xB3, 0xFF, 0x6A, 0xC1, 0x8F, 0x3E, 0x4C,
-  0xC2, 0x05, 0x21, 0x10, 0x02, 0x00, 0x9D, 0x73, 0x41, 0x43, 0x8A, 0xF6, 0xE0, 0x58, 0x45, 0xC0,
-  0x01, 0x28, 0xCE, 0x9A, 0x06, 0x42, 0xA0, 0x1E, 0x00, 0x23, 0x6E, 0x9B, 0x92, 0xCA, 0x18, 0x05,
-  0x00, 0x98, 0x38, 0x5F, 0x3C, 0x69, 0x0A, 0x96, 0x00, 0x49, 0xF5, 0xA4, 0xE2, 0x44, 0x1F, 0x43,
-  0xFB, 0x6B, 0x3E, 0xF9, 0x91, 0x30, 0x22, 0x27, 0x92, 0x00, 0x08, 0x21, 0x44, 0x88, 0xAF, 0x68,
-  0x4B, 0xA1, 0x21, 0x04, 0x8A, 0x30, 0x08, 0xB1, 0x0C, 0x00, 0xA0, 0x4A, 0xBF, 0x18, 0x70, 0xE2,
-  0xA7, 0x1B, 0x50, 0x2C, 0x13, 0x00, 0x20, 0x40, 0x00, 0xF2, 0x17, 0x10, 0xE0, 0x19, 0x03, 0x02,
-  0x21, 0x84, 0x10, 0x08, 0x01, 0x28, 0x61, 0x84, 0x10, 0x42, 0x00, 0x32, 0xCD, 0x20, 0x09, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x10, 0xC2, 0xA0, 0x93, 0x5F, 0x43, 0x52, 0xCB, 0x5C, 0x49,
-  0xD8, 0x0B, 0xAA, 0x70, 0x15, 0x53, 0x13, 0x18, 0x7C, 0x02, 0x54, 0x36, 0x61, 0x8C, 0x9A, 0xD1,
-  0x3C, 0x88, 0x4A, 0x2C, 0x00, 0x10, 0x92, 0x51, 0x04, 0x02, 0x81, 0x00, 0x4B, 0x60, 0x00, 0x45,
-  0x13, 0x96, 0x30, 0xF2, 0x41, 0xE6, 0x3F, 0x2A, 0x9C, 0xF0, 0x1A, 0x47, 0xE5, 0xDD, 0x47, 0x06,
-  0xD0, 0xC0, 0x63, 0x64, 0x6A, 0x5B, 0x66, 0x62, 0x29, 0x5D, 0x40, 0x33, 0xA4, 0x0E, 0x2D, 0x4B,
-  0xAC, 0x06, 0xA8, 0xA4, 0xC1, 0x80, 0x40, 0x08, 0x21, 0xD0, 0x5F, 0x01, 0x00, 0x91, 0x0B, 0x7B,
-  0x95, 0xA9, 0xC6, 0x7E, 0xF8, 0x6B, 0xFE, 0x16, 0x64, 0xDF, 0xD3, 0x2F, 0x3D, 0x66, 0xF7, 0xD6,
-  0x5A, 0x55, 0x95, 0x5C, 0xEB, 0x57, 0x9A, 0x6D, 0x56, 0xB9, 0x4F, 0xEA, 0xB6, 0xAE, 0x2A, 0x77,
-  0x82, 0xBF, 0xBF, 0x80, 0xF2, 0x14, 0x6E, 0x6A, 0x09, 0x2B, 0x2C, 0xFE, 0x34, 0xF7, 0x71, 0xCE,
-  0x4D, 0xB6, 0x8C, 0x91, 0xA6, 0xA5, 0x0C, 0x00, 0x00, 0x08, 0x6C, 0x00, 0x80, 0x24, 0x1B, 0xBE,
-  0x3D, 0xFB, 0x80, 0x3C, 0x2F, 0x7F, 0x48, 0x58, 0x78, 0x04, 0x90, 0x4C, 0x59, 0x42, 0x3E, 0x62,
-  0x62, 0xCC, 0x5C, 0x4A, 0xBF, 0x63, 0x4A, 0x69, 0xD3, 0xFB, 0xE6, 0x68, 0xD8, 0xB7, 0xF4, 0x7D,
-  0x4D, 0xF7, 0x79, 0x03, 0x9D, 0x2D, 0x30, 0xA8, 0x97, 0xA7, 0x03, 0x00, 0x34, 0xAF, 0xBF, 0x23,
-  0x42, 0x2D, 0x0C, 0x44, 0x10, 0x0C, 0x22, 0x80, 0x10, 0x88, 0x4E, 0x66, 0x64, 0x92, 0xF4, 0xE4,
-  0x37, 0xFB, 0xB6, 0xE7, 0x5E, 0xAB, 0x16, 0x5B, 0x71, 0x0E, 0x00, 0x2A, 0x35, 0x39, 0x03, 0x78,
-  0xE4, 0x35, 0x95, 0x2E, 0x36, 0x00, 0x4D, 0x4E, 0x2F, 0x5C, 0x74, 0xA4, 0xC0, 0x33, 0x3B, 0x3D,
-  0xBA, 0xF4, 0xA9, 0xE5, 0x10, 0x65, 0xD3, 0xB5, 0xC9, 0xEC, 0xCC, 0xC4, 0x69, 0xEA, 0x11, 0xB7,
-  0x04, 0x17, 0x20, 0x1D, 0x44, 0x4E, 0xF8, 0x4F, 0x64, 0xB2, 0xFD, 0xC4, 0xF9, 0x79, 0x5C, 0x7B,
-  0xC2, 0x7B, 0x01, 0x00, 0xD2, 0x1B, 0x00, 0x58, 0x4E, 0xD4, 0x61, 0xFF, 0x08, 0x40, 0xD6, 0x41,
-  0x64, 0x21, 0xB5, 0x2C, 0xF5, 0x91, 0x0A, 0xE9, 0x66, 0xB2, 0x56, 0x7D, 0xAA, 0x8E, 0x41, 0xF4,
-  0x0E, 0x00, 0xD0, 0x0D, 0xB2, 0xB2, 0x1B, 0x8C, 0x00, 0x00, 0x2B, 0x88, 0x88, 0x00, 0x80, 0x08,
-  0x00, 0x10, 0x01, 0xEA, 0x04, 0x00, 0x10, 0x42, 0xAF, 0xBA, 0xC7, 0xCD, 0x23, 0x82, 0x48, 0x0B,
-  0x3D, 0xA5, 0xFF, 0x2D, 0xBC, 0x14, 0x3A, 0xB8, 0xD1, 0xC6, 0xD6, 0xA6, 0x00, 0x00, 0x1B, 0x7E,
-  0x2A, 0xA1, 0xC9, 0x53, 0xB3, 0x81, 0xEB, 0x93, 0xB0, 0x95, 0x82, 0x2E, 0x26, 0x0B, 0x6C, 0x76,
-  0x7D, 0x56, 0xCA, 0x09, 0x99, 0xAC, 0x64, 0x37, 0xAD, 0x01, 0xA0, 0xAD, 0x47, 0x29, 0x9E, 0x79,
-  0x3C, 0x01, 0x7E, 0x7B, 0x4F, 0x94, 0x28, 0x46, 0x48, 0xAE, 0x57, 0x2F, 0x83, 0x40, 0x40, 0x09,
-  0xD0, 0xBC, 0xA7, 0xAE, 0xDF, 0x9B, 0x69, 0xBF, 0x58, 0xB5, 0x7D, 0x60, 0x9F, 0x0E, 0x99, 0x7B,
-  0x61, 0x0F, 0xEF, 0xAF, 0x03, 0xD4, 0xEC, 0x81, 0x11, 0x48, 0xC2, 0x08, 0x40, 0x00, 0x02, 0x21,
-  0xC0, 0x91, 0x9F, 0xCA, 0x99, 0xA7, 0xBE, 0xA8, 0x0D, 0x28, 0x59, 0x0C, 0x6A, 0x30, 0x9D, 0x4F,
-  0x00, 0xD8, 0xAB, 0xCC, 0x63, 0x50, 0xD9, 0x07, 0x58, 0x60, 0x9A, 0x9C, 0x61, 0x10, 0x81, 0x0A,
-  0xA0, 0xD9, 0x0C, 0x00, 0x60, 0x85, 0xCD, 0xDD, 0x76, 0xED, 0x17, 0x52, 0x5E, 0xE4, 0x9E, 0xF7,
-  0x55, 0x86, 0x2C, 0x00, 0xD4, 0xA5, 0x75, 0xC2, 0x1C, 0xC5, 0xCA, 0x99, 0x55, 0xFF, 0x9D, 0xF4,
-  0x8A, 0xB8, 0x09, 0x5C, 0x0D, 0x6F, 0xF8, 0xC3, 0xF8, 0x38, 0xBD, 0x75, 0xC8, 0xF7, 0xD3, 0x04,
-  0xBC, 0x6F, 0xF5, 0x97, 0x00, 0x80, 0x64, 0xCB, 0x92, 0x09, 0x00, 0x99, 0x57, 0x99, 0xC8, 0x14,
-  0xF5, 0xF1, 0xE4, 0xF3, 0xCA, 0x16, 0x03, 0x08, 0xC4, 0x3B, 0xA1, 0x36, 0x08, 0x15, 0x02, 0x00,
-  0x20, 0x2F, 0xF3, 0xB9, 0x4C, 0x09, 0x26, 0x52, 0x20, 0x96, 0x99, 0x33, 0x13, 0x29, 0x4C, 0x48,
-  0xDF, 0x90, 0x2D, 0xEA, 0x82, 0x26, 0x94, 0x99, 0x8B, 0x73, 0x42, 0x8A, 0x98, 0x92, 0xD0, 0x7C,
-  0x31, 0x37, 0xA2, 0xD7, 0x4D, 0x37, 0x3B, 0xDA, 0xCA, 0x2A, 0x0D, 0x04, 0x00, 0x93, 0xDA, 0x82,
-  0x8E, 0xE8, 0xE2, 0x31, 0x92, 0xC8, 0x06, 0x08, 0x37, 0x0F, 0x00, 0xB0, 0x6D, 0x9C, 0x70, 0x9B,
-  0xE4, 0x3E, 0x73, 0x63, 0xA5, 0x10, 0xC6, 0x2B, 0x44, 0x4A, 0x0D, 0x71, 0xA5, 0x4F, 0xB2, 0xC6,
-  0xA8, 0x56, 0x3E, 0xFC, 0x42, 0x75, 0x47, 0xB8, 0x21, 0xD2, 0x06, 0x12, 0xBA, 0x54, 0x8D, 0x26,
-  0xA6, 0x3E, 0x69, 0x01, 0x08, 0x77, 0x5B, 0xC3, 0x15, 0x8F, 0xB8, 0x91, 0x9E, 0x0B, 0xE0, 0x00,
-  0x6C, 0x05, 0x00, 0x31, 0x09, 0x29, 0xA2, 0xAD, 0x43, 0xE2, 0x01, 0x80, 0x02, 0x00, 0x68, 0xFA,
-  0xE5, 0x5E, 0x42, 0x6C, 0xB6, 0x21, 0xC5, 0x05, 0x28, 0x3D, 0x43, 0xFF, 0x5C, 0xD3, 0xC1, 0x12,
-  0x51, 0xC9, 0xDD, 0x56, 0x95, 0x66, 0x77, 0x51, 0x5B, 0x43, 0x64, 0x32, 0xC8, 0x09, 0xD3, 0x45,
-  0x6E, 0xBB, 0x57, 0xEB, 0x3E, 0xA0, 0x4B, 0x91, 0xD4, 0x04, 0x8A, 0x51, 0x84, 0x8C, 0x32, 0xAE,
-  0x29, 0xC9, 0x20, 0x40, 0x08, 0x41, 0x88, 0x01, 0x00, 0x10, 0x65, 0xA2, 0x44, 0x84, 0xF0, 0x66,
-  0x9F, 0x37, 0xF5, 0x1D, 0x58, 0xCD, 0x88, 0x80, 0x5C, 0xEF, 0x13, 0x78, 0x00, 0xF9, 0x46, 0xB7,
-  0x8C, 0xD2, 0x53, 0x4D, 0xCB, 0xD0, 0xB2, 0x4D, 0x2E, 0x24, 0x40, 0x41, 0xC8, 0x80, 0x5C, 0x65,
-  0x35, 0x17, 0x8D, 0x2D, 0xD0, 0x64, 0xB9, 0x39, 0xC9, 0xA7, 0x20, 0x30, 0xC2, 0x4B, 0x06, 0x03,
-  0xFD, 0x54, 0x5F, 0xBB, 0x8E, 0xC9, 0x3B, 0x97, 0xEC, 0x59, 0x92, 0x09, 0x0D, 0xBC, 0xBC, 0x80,
-  0xCA, 0x4C, 0x4E, 0x7F, 0xBC, 0x6E, 0x5E, 0x2E, 0x69, 0xFE, 0x8D, 0xD3, 0x6A, 0x1E, 0x40, 0x48,
-  0x76, 0x12, 0xAF, 0x0F, 0x35, 0x91, 0xC4, 0xC0, 0xB5, 0x40, 0xA6, 0x81, 0xD0, 0xCB, 0xAA, 0x07,
-  0x00, 0x68, 0x15, 0x4A, 0x4A, 0xF8, 0xB5, 0x73, 0x34, 0x00, 0x21, 0xD0, 0xBC, 0x49, 0x5A, 0x1A,
-  0x00, 0x03, 0x48, 0x93, 0xDF, 0xC4, 0x00, 0x4A, 0x33, 0x93, 0x41, 0xF2, 0x5D, 0x56, 0x02, 0x00,
-  0x0C, 0x16, 0x16, 0x8A, 0xBC, 0x1D, 0x5F, 0x42, 0x3D, 0x00, 0x46, 0x2C, 0xDC, 0x19, 0x80, 0x33,
-  0x13, 0xC4, 0x3C, 0x86, 0x27, 0xB6, 0x78, 0x65, 0x5D, 0xF4, 0x17, 0xDD, 0x66, 0x29, 0xBB, 0xCB,
-  0xF8, 0x74, 0x3E, 0x03, 0xB2, 0xD5, 0x5E, 0x1D, 0x9B, 0xEE, 0xEF, 0xC5, 0x53, 0x15, 0x22, 0x66,
-  0x96, 0x32, 0x26, 0x62, 0xC4, 0x72, 0x24, 0x5C, 0x45, 0x84, 0xB1, 0xE6, 0x24, 0xA4, 0x24, 0x24,
-  0xC7, 0x24, 0x49, 0x94, 0xD0, 0x52, 0xD2, 0x5A, 0x34, 0xD1, 0x30, 0xA5, 0xE1, 0x2D, 0x40, 0x71,
-  0x44, 0x0A, 0xC8, 0x89, 0xA8, 0x8D, 0xDD, 0x02, 0x74, 0x38, 0x1C, 0xAE, 0x48, 0xA8, 0x84, 0xD0,
-  0x35, 0x14, 0xF9, 0x03, 0x00, 0x38, 0x8A, 0x4A, 0xA0, 0xDE, 0xC1, 0xAD, 0xA1, 0xE8, 0x10, 0xC2,
-  0x51, 0xBA, 0x03, 0xDA, 0x69, 0x41, 0x04, 0x7A, 0x8D, 0x11, 0x02, 0x9C, 0x05, 0x00, 0x88, 0x03,
-  0x40, 0xDA, 0x12, 0x34, 0x00, 0xC8, 0x45, 0xB3, 0x96, 0x36, 0x48, 0x71, 0xD1, 0x5A, 0xC0, 0x0D,
-  0x13, 0xA0, 0x95, 0xBC, 0x05, 0xD8, 0xAD, 0xEA, 0x2C, 0x40, 0xF4, 0x29, 0x57, 0x09, 0xAE, 0x83,
-  0x2A, 0x90, 0x17, 0x46, 0x02, 0x03, 0xC3, 0x0C, 0x22, 0x05, 0x52, 0x32, 0x41, 0x84, 0x10, 0x08,
-  0x00, 0x29, 0x88, 0x00, 0xC9, 0xEE, 0xAE, 0xCA, 0x12, 0x42, 0xD1, 0x02, 0x49, 0x9A, 0x90, 0x10,
-  0x29, 0x26, 0x0C, 0x33, 0xCC, 0x10, 0x93, 0xAC, 0x52, 0xA2, 0x04, 0xE5, 0x2B, 0xA9, 0x88, 0x3C,
-  0x91, 0x52, 0x44, 0x28, 0x8E, 0x22, 0x89, 0x14, 0x73, 0x86, 0x08, 0x25, 0x9C, 0x12, 0x60, 0x19,
-  0x02, 0x14, 0x69, 0xC7, 0x2A, 0xF7, 0x68, 0x12, 0x20, 0x04, 0x2A, 0x24, 0x57, 0x29, 0x9A, 0x50,
-  0x84, 0x48, 0x01, 0xB8, 0x02, 0xA4, 0x56, 0x4C, 0x02, 0x94, 0x28, 0x41, 0x15, 0x21, 0x44, 0xA4,
-  0x62, 0x40, 0x13, 0x7A, 0x6E, 0xA0, 0x04, 0x3D, 0x84, 0x96, 0x98, 0x5D, 0x01, 0xFB, 0x05, 0x9C,
-  0xD5, 0x30, 0x11, 0x02, 0x52, 0x17, 0x70, 0x04, 0x57, 0x31, 0xDE, 0x62, 0x02, 0xD9, 0x0E, 0xC6,
-  0x10, 0x8F, 0x12, 0x81, 0x2B, 0x84, 0x26, 0x19, 0x31, 0x33, 0x00, 0x42, 0x08, 0xC4, 0x0C, 0x00,
-  0x86, 0x10, 0x21, 0x98, 0x18, 0x41, 0x20, 0x02, 0x21, 0x10, 0x75, 0xA3, 0x08, 0xA5, 0x18, 0xC4,
-  0x18, 0x30, 0x02, 0x63, 0x46, 0xC0, 0x50, 0x91, 0xA6, 0x14, 0xC0, 0x48, 0x4C, 0x51, 0x7C, 0xC2,
-  0x17, 0x2B, 0x14, 0x39, 0x55, 0x8A, 0x11, 0x5F, 0xAA, 0x02, 0xCD, 0x05, 0xED, 0x00, 0x00, 0x31,
-  0xC5, 0x7B, 0x43, 0xD7, 0xC6, 0x1B, 0xC2, 0x59, 0xF7, 0xA7, 0x60, 0x59, 0x63, 0xA9, 0x75, 0x20,
-  0xB5, 0xC0, 0x6F, 0x3A, 0x09, 0x21, 0x2C, 0x33, 0x62, 0x0C, 0x80, 0x50, 0x25, 0x31, 0x12, 0x52,
-  0x20, 0x4D, 0x4C, 0x40, 0xD4, 0x37, 0xFB, 0x43, 0x69, 0x91, 0x22, 0xB3, 0x6A, 0xC1, 0xCD, 0xD4,
-  0x3F, 0xC2, 0x52, 0xDA, 0x2A, 0x07, 0x17, 0x6B, 0xD0, 0x02, 0xAE, 0x60, 0x80, 0xE2, 0x18, 0x91,
-  0xF5, 0x47, 0x69, 0xB4, 0xA0, 0x6B, 0x61, 0x8A, 0x88, 0x12, 0xC4, 0x66, 0x1C, 0x65, 0x08, 0xC4,
-  0x8C, 0xEC, 0xD5, 0x96, 0xED, 0x29, 0x7B, 0xFF, 0x48, 0xAD, 0x7A, 0x08, 0xD7, 0x2D, 0x6F, 0x4B,
-  0x07, 0x00, 0x80, 0xA2, 0x45, 0xAA, 0x57, 0x00, 0x00, 0xF8, 0x10, 0x84, 0x4C, 0x9E, 0x34, 0x29,
-  0xA7, 0x08, 0x57, 0x31, 0x9B, 0x15, 0x4B, 0x51, 0xA4, 0x41, 0x32, 0x18, 0x21, 0x09, 0x50, 0x04,
-  0xA8, 0x1F, 0x46, 0xD2, 0x40, 0x4B, 0xAB, 0x4D, 0x88, 0x06, 0x00, 0x4C, 0x53, 0xBF, 0x00, 0x6F,
-  0x49, 0xB3, 0x60, 0x69, 0x18, 0x13, 0xA8, 0x0F, 0xAD, 0xE4, 0xBB, 0x53, 0x17, 0x6D, 0x6A, 0xAD,
-  0x0A, 0x75, 0x06, 0xCC, 0xCA, 0x95, 0xC4, 0x86, 0xE8, 0x24, 0xAA, 0xE3, 0x0A, 0x33, 0xF5, 0x11,
-  0x00, 0x58, 0x15, 0x06, 0x00, 0x90, 0xB3, 0x2F, 0x41, 0x9D, 0x24, 0x79, 0xAC, 0x24, 0x4F, 0xE9,
-  0xE5, 0x46, 0xBA, 0x32, 0xA7, 0x52, 0x14, 0x97, 0x02, 0xB2, 0x24, 0xED, 0x6A, 0x91, 0x8C, 0x56,
-  0xF2, 0xB6, 0x54, 0x69, 0x07, 0x78, 0xDA, 0xD5, 0xA9, 0xAA, 0x5C, 0x54, 0x77, 0xBE, 0xEF, 0x39,
-  0x99, 0xBD, 0x74, 0xDB, 0x91, 0xC4, 0xE6, 0xF5, 0xC8, 0xD8, 0x10, 0x0A, 0x5F, 0xA0, 0x08, 0x00,
-  0xC0, 0xD3, 0xBA, 0x4C, 0x4A, 0x35, 0x6D, 0x22, 0xDD, 0xED, 0x6C, 0xED, 0x0B, 0x5A, 0xEE, 0xD0,
-  0x6A, 0xA3, 0xB9, 0x83, 0xA4, 0x08, 0x00, 0xFD, 0x08, 0x84, 0x10, 0x02, 0x44, 0xE6, 0xDC, 0xA1,
-  0x37, 0x98, 0x21, 0xC4, 0x16, 0x8F, 0xCB, 0xE0, 0xBD, 0x59, 0x06, 0xC2, 0xE3, 0x49, 0x77, 0xF7,
-  0xF9, 0x07, 0x00, 0x42, 0xA1, 0xF6, 0x03, 0x23, 0xA1, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0xB6, 0x1E, 0xB5, 0xF6, 0x1B, 0x43, 0x29, 0x93, 0x8A, 0x8A, 0x2A, 0xFF, 0xD4, 0xE6,
-  0x6A, 0x19, 0x3B, 0x52, 0x5E, 0x1F, 0x8B, 0x4C, 0xB6, 0x27, 0xBC, 0x2B, 0x4E, 0xA6, 0x60, 0x05,
-  0x26, 0x22, 0xCB, 0xCE, 0x5B, 0xF6, 0x2C, 0x00, 0x18, 0xD4, 0xF6, 0x96, 0x5B, 0x05, 0x91, 0xF3,
-  0x92, 0xAF, 0xAF, 0xF9, 0xBD, 0xC9, 0xA9, 0xDB, 0x1F, 0x20, 0xC3, 0xEA, 0x47, 0xA0, 0xD9, 0xF2,
-  0xBC, 0x65, 0x2B, 0xCF, 0x6A, 0x22, 0x05, 0x63, 0x42, 0xA4, 0xBD, 0xA3, 0x52, 0x43, 0x02, 0x00,
-  0x44, 0x27, 0x2B, 0xEB, 0x02, 0xE3, 0x27, 0x30, 0xCC, 0x13, 0x60, 0xE7, 0xEB, 0xB1, 0x4C, 0xA1,
-  0x7F, 0x08, 0x7E, 0xBE, 0xCE, 0x52, 0x78, 0x7C, 0x80, 0x51, 0xA3, 0x78, 0x27, 0x41, 0x4E, 0x1D,
-  0xDE, 0x55, 0x1F, 0x00, 0x48, 0xAA, 0x24, 0x21, 0xA9, 0xF7, 0xC3, 0x23, 0x4B, 0x36, 0x90, 0x2D,
-  0xE5, 0x90, 0xB3, 0xF1, 0x80, 0xFA, 0x40, 0xC3, 0xB5, 0x7C, 0x3B, 0x00, 0x00, 0x78, 0xC9, 0x38,
-  0xDE, 0x0D, 0x10, 0x55, 0x8F, 0x91, 0x03, 0xC0, 0xA6, 0x94, 0x7C, 0x01, 0x00, 0x00, 0xD4, 0xE3,
-  0x00, 0x24, 0x7B, 0xCD, 0x73, 0xD5, 0xBD, 0x37, 0x5C, 0xF7, 0x25, 0xF3, 0xF8, 0x91, 0x6A, 0xE3,
-  0x95, 0x68, 0x21, 0x01, 0x9B, 0x26, 0x9F, 0x62, 0x42, 0x66, 0x4B, 0x6B, 0x46, 0xA6, 0x11, 0x1D,
-  0x72, 0x0A, 0x36, 0xA7, 0xDB, 0xEA, 0xF8, 0x7A, 0x75, 0x4A, 0x76, 0x00, 0x00, 0x00, 0x40, 0x9F,
-  0x20, 0x00, 0x17, 0x2F, 0x17, 0x30, 0x00, 0xAE, 0xF0, 0xA6, 0x43, 0xD8, 0xB1, 0xB7, 0x44, 0x2D,
-  0x2A, 0x03, 0x42, 0x80, 0x22, 0x41, 0x48, 0x28, 0xA8, 0x09, 0x17, 0xFC, 0x11, 0xA0, 0xF8, 0xBC,
-  0x00, 0x00, 0xD8, 0x17, 0x93, 0xB5, 0xC5, 0x5E, 0x7D, 0x91, 0xF7, 0x60, 0xF8, 0xF4, 0xDB, 0x8A,
-  0x64, 0xED, 0xFA, 0x1B, 0x00, 0xDB, 0x6E, 0x4E, 0xE8, 0x10, 0x38, 0x6C, 0xA2, 0x6A, 0xD9, 0x4E,
-  0x6F, 0x70, 0xBD, 0x04, 0x80, 0x3A, 0x61, 0x74, 0x62, 0x65, 0xE3, 0xBF, 0x8C, 0xED, 0xF9, 0xD5,
-  0xCE, 0x5D, 0x63, 0x4F, 0x3E, 0xF2, 0x45, 0x1F, 0xDA, 0x08, 0xF9, 0xE5, 0x7D, 0x02, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x42, 0x00, 0x20, 0x20, 0x02, 0x00, 0x00, 0x00, 0x10, 0x01, 0x00, 0x11,
-  0x88, 0x00, 0x00, 0x4F, 0x09, 0xE0, 0xA7, 0x0D, 0xEA, 0x09, 0x80, 0xDD, 0x75, 0xAA, 0x99, 0x07,
-  0x00, 0xD0, 0x6C, 0x16, 0x2D, 0x85, 0x81, 0x1B, 0x90, 0xE4, 0x0B, 0x06, 0x65, 0x1C, 0x81, 0x4E,
-  0x39, 0x41, 0x04, 0x2C, 0x04, 0xF8, 0x5F, 0xB2, 0x48, 0x70, 0x35, 0xFF, 0x48, 0xE5, 0x98, 0xF7,
-  0xD0, 0xD1, 0x12, 0x30, 0x01, 0x9D, 0x38, 0xE1, 0x13, 0xF0, 0x03, 0x00, 0x54, 0x56, 0x55, 0x70,
-  0x88, 0x73, 0x67, 0x02, 0xA0, 0x84, 0xD9, 0xC0, 0x4E, 0x00, 0xE4, 0x02, 0x26, 0x38, 0x02, 0x58,
-  0xC1, 0x08, 0x20, 0x5C, 0x13, 0xF6, 0x6F, 0x22, 0xC4, 0x4A, 0xAD, 0xB4, 0xB1, 0x22, 0x15, 0xC5,
-  0x48, 0x31, 0x02, 0xFE, 0x0D, 0x4B, 0x99, 0x13, 0xB0, 0x24, 0x63, 0x9C, 0x92, 0xA4, 0x00, 0x0A,
-  0x88, 0x16, 0x49, 0x68, 0xC5, 0x4A, 0xA4, 0x40, 0x12, 0x2D, 0x8C, 0x10, 0x0E, 0xC6, 0x2E, 0x00,
-  0x00, 0x00, 0xC0, 0x60, 0x8E, 0x40, 0x60, 0xE9, 0x43, 0x2E, 0xA7, 0x67, 0x8F, 0x23, 0x97, 0x8A,
-  0xD8, 0x0C, 0x27, 0x50, 0xA5, 0xE7, 0xD8, 0x00, 0x00, 0x60, 0x8A, 0xC6, 0x15, 0xE9, 0x2A, 0x9E,
-  0xC6, 0xD5, 0xB6, 0x1E, 0xEB, 0x9E, 0xAE, 0x25, 0x00, 0x40, 0x72, 0xB5, 0x32, 0x14, 0x60, 0xB5,
-  0x06, 0x35, 0x00, 0xC0, 0x41, 0x35, 0x15, 0xA0, 0xA0, 0x28, 0x98, 0x30, 0xD4, 0x1E, 0x25, 0xE4,
-  0x4A, 0x92, 0x74, 0x92, 0x09, 0x84, 0x10, 0xC6, 0x80, 0xB1, 0x62, 0x03, 0x45, 0x20, 0x02, 0x17,
-  0x0F, 0xD0, 0x1B, 0x19, 0xF9, 0xA8, 0xB0, 0x80, 0x2D, 0x7B, 0x46, 0x9C, 0xF6, 0x8F, 0xCD, 0x0B,
-  0xE9, 0xC8, 0x84, 0x4C, 0x88, 0xE8, 0xA9, 0xD6, 0xC9, 0x99, 0x0A, 0x70, 0x3F, 0x01, 0x96, 0xF1,
-  0xAC, 0x7E, 0x48, 0x28, 0x8D, 0xCE, 0x6B, 0x7C, 0x10, 0x71, 0xD4, 0x34, 0x00, 0x74, 0x5F, 0x9D,
-  0xD0, 0x59, 0xC7, 0xC4, 0xF2, 0xF3, 0x42, 0xCE, 0x0B, 0x55, 0x69, 0x1E, 0x9B, 0x06, 0x12, 0x00,
-  0x00, 0x40, 0xBE, 0xC8, 0x4D, 0xDB, 0x87, 0x7E, 0xAC, 0x8C, 0x82, 0x2D, 0x42, 0x50, 0xFF, 0x4B,
-  0x00, 0x80, 0x8B, 0xA5, 0xB5, 0xE8, 0x1D, 0xA2, 0x69, 0x10, 0x41, 0x88, 0x10, 0xA6, 0x21, 0xBC,
-  0xCF, 0xA0, 0x48, 0x4A, 0x92, 0xB2, 0xA4, 0xA4, 0xE4, 0x40, 0x84, 0xA0, 0xE7, 0x37, 0xA4, 0x2C,
-  0x00, 0xF0, 0x06, 0x32, 0x75, 0x7B, 0x80, 0xCA, 0x4E, 0x71, 0x38, 0x1E, 0x70, 0x8A, 0x86, 0x0F,
-  0x40, 0x03, 0x00, 0x6F, 0x9A, 0xAC, 0x34, 0xDF, 0x67, 0x73, 0x0C, 0x72, 0x81, 0x04, 0x66, 0x50,
-  0x07, 0xE3, 0x52, 0xD7, 0xA3, 0xE0, 0xEF, 0xB4, 0xB8, 0x9F, 0x5D, 0x15, 0x09, 0x65, 0xA2, 0x84,
-  0x38, 0xA5, 0xC8, 0x1A, 0xEF, 0x49, 0xAB, 0x27, 0x00, 0xB2, 0xCB, 0xF2, 0x2B, 0xA1, 0xC9, 0x8A,
-  0x55, 0x6B, 0x8A, 0x00, 0x38, 0x68, 0x5E, 0x92, 0x2F, 0xC8, 0x4B, 0x7A, 0x66, 0x65, 0xEC, 0x8A,
-  0x25, 0xA6, 0xCF, 0x35, 0xB3, 0xDB, 0x34, 0x81, 0x94, 0x7D, 0x89, 0x56, 0x20, 0x4B, 0x00, 0xBE,
-  0xDC, 0x52, 0x90, 0x8A, 0x64, 0x97, 0x30, 0xB2, 0x9F, 0xA5, 0x5E, 0xB7, 0xD9, 0xEE, 0x15, 0x16,
-  0x66, 0x46, 0x26, 0x24, 0xAF, 0x00, 0xBD, 0xB3, 0xB9, 0x9A, 0x4D, 0x33, 0x92, 0xAB, 0x7B, 0x7C,
-  0xDB, 0xD2, 0x3C, 0xAE, 0xA2, 0xC8, 0x6B, 0x3A, 0xDF, 0x4A, 0x02, 0x4D, 0x0B, 0x00, 0x89, 0xB0,
-  0x2C, 0x23, 0x09, 0x39, 0x21, 0x09, 0x2C, 0x34, 0xE3, 0xD7, 0x0C, 0x16, 0x08, 0x5A, 0xB4, 0xFB,
-  0x59, 0x96, 0x10, 0xB8, 0x36, 0x05, 0x59, 0x00, 0x80, 0x62, 0x83, 0x8A, 0xD8, 0x92, 0x53, 0x1E,
-  0x5D, 0x49, 0xCB, 0xA6, 0xD2, 0x89, 0xAB, 0x59, 0xB9, 0x48, 0x07, 0x26, 0xA5, 0x54, 0x8C, 0xC2,
-  0xF1, 0x79, 0x2C, 0x5D, 0x80, 0xD3, 0x24, 0xC9, 0x05, 0x81, 0x24, 0x00, 0x90, 0x8B, 0x84, 0xCD,
-  0xB4, 0x67, 0xA2, 0xEA, 0x92, 0xB8, 0xC2, 0x1A, 0x00, 0x50, 0x36, 0xD3, 0x81, 0x05, 0x80, 0x23,
-  0x10, 0xC2, 0xD1, 0x24, 0x93, 0xC0, 0x4E, 0x1B, 0x51, 0x59, 0x4B, 0x12, 0xD7, 0xD3, 0x56, 0xC3,
-  0x76, 0x7E, 0x88, 0x01, 0x18, 0xD1, 0xC5, 0x5D, 0x04, 0x8F, 0x81, 0x27, 0xB8, 0x08, 0xD1, 0x68,
-  0x8B, 0x4F, 0x0B, 0x10, 0x5A, 0x00, 0xA4, 0x6E, 0x68, 0xA2, 0x94, 0x01, 0x73, 0xFF, 0x4E, 0x00,
-  0x00, 0x2A, 0x1F, 0x38, 0x13, 0xCB, 0x91, 0x2D, 0x2A, 0x4D, 0x83, 0x01, 0xD9, 0x9F, 0xBD, 0x0B,
-  0x4A, 0x4A, 0xC9, 0x38, 0xAA, 0x26, 0xA7, 0x98, 0xD6, 0xC4, 0xF4, 0x4C, 0x29, 0xB3, 0x61, 0xFB,
-  0x0E, 0xD1, 0x52, 0x9D, 0xF2, 0xA8, 0x18, 0xEB, 0x76, 0x8D, 0x50, 0x6E, 0x1B, 0x5D, 0x11, 0xA8,
-  0xCA, 0x68, 0x2D, 0x24, 0x50, 0x90, 0x35, 0x12, 0x5A, 0xBB, 0xA7, 0x95, 0x00, 0x00, 0x2B, 0x90,
-  0xB6, 0x2D, 0x7A, 0x65, 0x36, 0xF5, 0x41, 0x4E, 0xF8, 0xCE, 0xDD, 0x4E, 0x49, 0x0B, 0x03, 0xC8,
-  0x8C, 0x50, 0x4A, 0x29, 0xE8, 0xEF, 0xC0, 0x4A, 0x68, 0xEB, 0x35, 0xD5, 0xB1, 0x92, 0xB8, 0x79,
-  0xE9, 0xA5, 0xF2, 0x21, 0x71, 0x5D, 0xA3, 0x6B, 0x88, 0x5B, 0x64, 0x2C, 0xA1, 0xA8, 0x1D, 0xD9,
-  0x5C, 0xDD, 0x3B, 0xCB, 0x67, 0xC3, 0xE0, 0xE8, 0x74, 0xD3, 0x84, 0x24, 0x04, 0x00, 0x36, 0x8C,
-  0x10, 0xA5, 0x7A, 0x52, 0xBA, 0xAE, 0x9D, 0x78, 0xBC, 0xC7, 0x75, 0x84, 0xA8, 0x68, 0xA7, 0x24,
-  0x1D, 0x36, 0xCD, 0x5A, 0xB9, 0xE7, 0x29, 0x81, 0xCA, 0xC9, 0x45, 0xE5, 0xBB, 0xA9, 0xDA, 0xAE,
-  0x6D, 0xE4, 0x74, 0xC6, 0x0C, 0x4B, 0x0B, 0x22, 0xB6, 0x29, 0x5D, 0x4A, 0x45, 0xA4, 0x66, 0x92,
-  0x41, 0x56, 0xD8, 0x65, 0x5D, 0x04, 0x42, 0x14, 0x00, 0x40, 0x5E, 0x65, 0x09, 0xBB, 0x5F, 0x0B,
-  0x01, 0xC2, 0x09, 0x34, 0x00, 0x80, 0x79, 0xD2, 0x28, 0x9B, 0x26, 0xEC, 0x8C, 0xF2, 0x8D, 0x16,
-  0xD1, 0xF6, 0xE2, 0x57, 0x5F, 0x43, 0x2B, 0x6B, 0x08, 0x22, 0xEA, 0x8A, 0x89, 0x54, 0x18, 0xCF,
-  0x53, 0x68, 0x45, 0x99, 0xD1, 0x34, 0xE8, 0x6C, 0x26, 0x6A, 0x99, 0x38, 0xE5, 0x04, 0xD4, 0x99,
-  0xF8, 0x52, 0x98, 0x3B, 0x99, 0xA4, 0x02, 0x00, 0xDA, 0xBF, 0xEF, 0x4F, 0x4B, 0x78, 0xE5, 0x5E,
-  0x41, 0x4E, 0x33, 0x95, 0xBC, 0xC9, 0xC0, 0x05, 0xB6, 0x34, 0x3C, 0xAF, 0x94, 0xCB, 0xAD, 0xE3,
-  0xCF, 0x8A, 0xC7, 0x51, 0x90, 0x25, 0x40, 0x76, 0x00, 0x40, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0xA1, 0x19, 0x00, 0x23, 0x00,
-  0xC0, 0x12, 0x58, 0xF7, 0xAC, 0x6E, 0x48, 0xA1, 0x68, 0x19, 0xE4, 0x32, 0xD6, 0x6A, 0x18, 0x90,
-  0x5C, 0x3B, 0x68, 0x92, 0xB4, 0x53, 0x0C, 0xED, 0x4E, 0x97, 0xF7, 0x69, 0xD5, 0xC4, 0x27, 0x0B,
-  0x1B, 0x6E, 0x04, 0xF7, 0xC1, 0x29, 0x06, 0x00, 0x8C, 0x00, 0x00, 0x60, 0x14, 0x37, 0x89, 0xFF,
-  0x19, 0x5A, 0xC4, 0x8E, 0xA1, 0xA1, 0x61, 0xF0, 0xBA, 0x80, 0x41, 0x17, 0x1D, 0x00, 0x20, 0x80,
-  0x86, 0x4E, 0x98, 0xFD, 0x03, 0x00, 0x46, 0x15, 0x22, 0x0E, 0x8A, 0xD4, 0x53, 0x02, 0xAC, 0xA2,
-  0x81, 0xBC, 0x92, 0x69, 0xBA, 0xAC, 0x24, 0x8A, 0xB6, 0x2F, 0x6F, 0xAD, 0x96, 0xC3, 0x02, 0x00,
-  0x94, 0x52, 0xD5, 0x52, 0x5E, 0x5D, 0xEE, 0x3C, 0x27, 0x03, 0x36, 0x21, 0xA3, 0x2B, 0xEE, 0xCC,
-  0x44, 0x53, 0xD8, 0xB6, 0xF4, 0x16, 0xE9, 0xEB, 0xB5, 0x3A, 0x26, 0x76, 0xD2, 0x98, 0xD8, 0xD0,
-  0x85, 0x79, 0x67, 0x25, 0x44, 0x60, 0xCD, 0x28, 0x66, 0xAC, 0xF7, 0xEE, 0x57, 0xDB, 0x69, 0xEE,
-  0xD5, 0x33, 0xB2, 0xC2, 0x33, 0x4F, 0x3A, 0xD9, 0xAF, 0x52, 0x9A, 0xF8, 0x14, 0x40, 0x95, 0x60,
-  0x4C, 0x7A, 0x66, 0x45, 0x01, 0x64, 0x9B, 0x52, 0xAA, 0xA9, 0xBE, 0xCC, 0x75, 0xD6, 0x3A, 0xB6,
-  0xB4, 0x62, 0x97, 0x7E, 0xF4, 0x89, 0xB2, 0xE3, 0xAB, 0x43, 0x66, 0xEA, 0xBF, 0xA7, 0x01, 0xF2,
-  0x23, 0xAB, 0xD8, 0x29, 0x94, 0x90, 0xE7, 0x94, 0x6C, 0x00, 0xA8, 0xFE, 0xDC, 0x24, 0x59, 0xD8,
-  0x69, 0xBB, 0xFD, 0x00, 0x84, 0x2C, 0x4B, 0xE0, 0xD8, 0xC9, 0xBF, 0xFA, 0xB7, 0x4A, 0xF7, 0xAF,
-  0xA9, 0x6E, 0xC9, 0x3F, 0x84, 0x7C, 0x6C, 0xF6, 0x04, 0x22, 0xA3, 0xE4, 0x00, 0xF4, 0xEC, 0xF1,
-  0xA1, 0x0E, 0xD1, 0x6B, 0x00, 0xEC, 0x01, 0xCE, 0xCE, 0x82, 0xF7, 0xBE, 0x78, 0x02, 0xD9, 0xBD,
-  0x3E, 0x37, 0x00, 0x01, 0x21, 0x00, 0x00, 0x21, 0xB2, 0xFA, 0x8D, 0xFC, 0x03, 0x62, 0x4B, 0xAF,
-  0x1A, 0xD3, 0x6B, 0xAB, 0x6F, 0xB5, 0x4C, 0xDE, 0xC2, 0x43, 0x46, 0x06, 0xC0, 0xA8, 0x36, 0x37,
-  0x81, 0xED, 0x65, 0x7C, 0xD1, 0x0E, 0x00, 0x00, 0xE0, 0xDD, 0x7A, 0xD5, 0xFE, 0x40, 0x95, 0x49,
-  0xD8, 0xFF, 0x81, 0x72, 0x10, 0x20, 0x84, 0xCA, 0x55, 0x40, 0x52, 0xE9, 0xE4, 0x13, 0x4B, 0x90,
-  0x8F, 0xB1, 0x84, 0x90, 0x7F, 0x00, 0x50, 0x52, 0x78, 0x35, 0xF9, 0xE2, 0x66, 0xE5, 0x8F, 0x4A,
-  0xAD, 0x6E, 0x1B, 0x48, 0x42, 0xFD, 0x4E, 0x4C, 0x02, 0x80, 0xC8, 0x6E, 0x6C, 0x42, 0x4A, 0x41,
-  0xCF, 0x9C, 0x5B, 0x0B, 0x4C, 0xC3, 0xEB, 0x7E, 0x76, 0xDE, 0xED, 0x11, 0x4E, 0x80, 0xAC, 0x00,
-  0x64, 0xD8, 0xCB, 0xFB, 0x65, 0x2B, 0xFC, 0x7A, 0x05, 0x11, 0x00, 0x11, 0xE0, 0x4E, 0xC8, 0x24,
-  0x23, 0x3A, 0x44, 0xA0, 0x0C, 0x03, 0xBF, 0xAF, 0x21, 0x95, 0x09, 0xCD, 0xB8, 0x21, 0x91, 0x50,
-  0x1B, 0x49, 0x24, 0xA3, 0x32, 0x46, 0x58, 0x34, 0x09, 0x00, 0x10, 0xD8, 0x14, 0x2C, 0x21, 0x34,
-  0x67, 0x19, 0x28, 0x8A, 0x13, 0x12, 0x00, 0x47, 0x68, 0xFE, 0x31, 0xC5, 0x09, 0x27, 0x81, 0x96,
-  0x00, 0x30, 0x72, 0xA5, 0x70, 0x10, 0xB4, 0xC0, 0x0C, 0x13, 0x7F, 0xFB, 0x4C, 0x17, 0x68, 0x81,
-  0x73, 0xF1, 0x4E, 0xAA, 0x42, 0xF7, 0x16, 0x2D, 0xA9, 0x69, 0xA3, 0x14, 0x00, 0xB7, 0x53, 0x4A,
-  0x43, 0x23, 0x05, 0x00, 0x78, 0x5A, 0x89, 0x02, 0x89, 0xB0, 0x84, 0x40, 0x00, 0x20, 0x69, 0x48,
-  0x82, 0x2D, 0x00, 0x80, 0x8C, 0x00, 0x4C, 0x97, 0x12, 0xD4, 0x05, 0xDA, 0x63, 0x00, 0x70, 0x02,
-  0x00, 0x00, 0x00, 0x24, 0x01, 0x00, 0x5C, 0x3C, 0x03, 0x00, 0x24, 0x04, 0xA8, 0xC6, 0xE8, 0xCF,
-  0x00, 0x80, 0x01, 0x50, 0x81, 0x22, 0x8C, 0x30, 0x76, 0x17, 0x60, 0x09, 0x57, 0xC1, 0x35, 0x63,
-  0x79, 0x84, 0x66, 0xA9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xDF, 0xAB, 0x4D, 0x55, 0x2D,
-  0x2B, 0x80, 0x22, 0x26, 0x4A, 0x20, 0xC5, 0x39, 0xE0, 0x9C, 0x9B, 0x02, 0x00, 0xA4, 0xEB, 0x00,
-  0x00, 0x80, 0x34, 0xB7, 0x05, 0x09, 0x50, 0xAC, 0x68, 0xC5, 0x8D, 0x99, 0x33, 0x5A, 0x02, 0x8C,
-  0x80, 0x43, 0x80, 0xE9, 0xFE, 0x2B, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9B, 0xDE,
-  0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD0, 0xA7, 0x01, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x30, 0x00, 0xF4, 0x76, 0x80, 0xDE, 0x16, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0xC0, 0xBB, 0x74, 0xFD, 0x57, 0xDE, 0xBF, 0x1F, 0x1F,
-  0xF0, 0x5B, 0xD1, 0x9F, 0xB3, 0x60, 0xF2, 0x83, 0x7E, 0xF4, 0xEA, 0xF6, 0xE4, 0xD5, 0xF7, 0xA6,
-  0xE7, 0x5E, 0xDB, 0xA7, 0x37, 0xAF, 0xF3, 0xE7, 0x32, 0x09, 0x10, 0x72, 0x1F, 0x40, 0xA6, 0x9F,
-  0xEF, 0x2F, 0x5D, 0x5D, 0xD6, 0xAE, 0xC8, 0x4A, 0xE1, 0xA9, 0x47, 0x50, 0x5A, 0xDB, 0x35, 0x00,
-  0x56, 0x84, 0xFC, 0x29, 0x66, 0x1A, 0x4A, 0x31, 0x2B, 0x61, 0x12, 0x10, 0x01, 0x22, 0x08, 0xAC,
-  0x94, 0x0C, 0xB9, 0x44, 0x89, 0xBB, 0x12, 0x00, 0x6E, 0xAC, 0x10, 0xD2, 0x41, 0x48, 0x25, 0x15,
-  0xAB, 0x71, 0x82, 0xC2, 0x1A, 0x00, 0x00, 0x39, 0x30, 0x22, 0x80, 0xAC, 0x04, 0x60, 0x80, 0x00,
-  0x00, 0x01, 0x00, 0x36,
+    0x03, 0x26, 0x41, 0x3A, 0x38, 0x62, 0x66, 0x39, 0x33, 0x62, 0x64, 0x65, 0x2D, 0x66, 0x38, 0x31, 0x61, 0x2D, 0x34,
+    0x66, 0x31, 0x63, 0x2D, 0x38, 0x36, 0x34, 0x30, 0x2D, 0x66, 0x63, 0x39, 0x65, 0x32, 0x61, 0x38, 0x34, 0x32, 0x33,
+    0x36, 0x39, 0x24, 0x34, 0x32, 0x37, 0x33, 0x62, 0x38, 0x64, 0x33, 0x2D, 0x33, 0x37, 0x30, 0x66, 0x2D, 0x34, 0x38,
+    0x64, 0x39, 0x2D, 0x39, 0x64, 0x33, 0x35, 0x2D, 0x37, 0x64, 0x66, 0x38, 0x34, 0x65, 0x61, 0x38, 0x64, 0x36, 0x61,
+    0x37, 0x1E, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42,
+    0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x86, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE6, 0x26, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xD9, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9D,
+    0xA1, 0xD1, 0xEC, 0x05, 0x01, 0x00, 0x04, 0x01, 0x19, 0x06, 0x00, 0x08, 0x04, 0x00, 0x02, 0x01, 0x03, 0x06, 0x04,
+    0x19, 0x01, 0x00, 0x04, 0x00, 0x06, 0x01, 0x07, 0x06, 0x08, 0x19, 0x05, 0x01, 0x00, 0x09, 0x01, 0x00, 0x0A, 0x01,
+    0x00, 0x0B, 0x06, 0x00, 0x0C, 0x01, 0x0D, 0x02, 0x0E, 0x03, 0x0F, 0x04, 0x10, 0x05, 0x11, 0x00, 0x04, 0xC3, 0x0F,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xB0, 0xB6, 0xE9,
+    0x05, 0xE0, 0xB9, 0xBF, 0x9B, 0x02, 0xA1, 0x99, 0xE5, 0xC2, 0x02, 0x00, 0x03, 0x04, 0x00, 0x12, 0x01, 0x14, 0x06,
+    0x15, 0x19, 0x13, 0x04, 0x00, 0x16, 0x01, 0x18, 0x06, 0x19, 0x19, 0x17, 0x00, 0xC4, 0x0F, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xB0, 0xB6, 0xE9, 0x05, 0x9F, 0xA1, 0xC5,
+    0x9B, 0x02, 0xF1, 0xE0, 0xEB, 0xC2, 0x02, 0x00, 0x03, 0x04, 0x00, 0x1A, 0x01, 0x1C, 0x06, 0x1D, 0x19, 0x1B, 0x04,
+    0x00, 0x1E, 0x01, 0x20, 0x06, 0x21, 0x19, 0x1F, 0x00, 0xC5, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xB0, 0xB6, 0xE9, 0x05, 0xF6, 0xFE, 0xCF, 0x9B, 0x02, 0x97, 0xDB,
+    0xEF, 0xC2, 0x02, 0x00, 0x03, 0x04, 0x00, 0x22, 0x01, 0x24, 0x06, 0x25, 0x19, 0x23, 0x04, 0x00, 0x26, 0x01, 0x28,
+    0x06, 0x29, 0x19, 0x27, 0x00, 0xC6, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0xFF, 0xB0, 0xB6, 0xE9, 0x05, 0x80, 0xDC, 0xC1, 0x9B, 0x02, 0x81, 0xF2, 0xE4, 0xC2, 0x02, 0x00,
+    0x03, 0x04, 0x00, 0x2A, 0x01, 0x2C, 0x06, 0x2D, 0x19, 0x2B, 0x04, 0x00, 0x2E, 0x01, 0x30, 0x06, 0x31, 0x19, 0x2F,
+    0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xB3, 0xE6, 0xCC, 0x19, 0x00, 0xFF, 0x22,
+    0x11, 0xEE, 0xFF, 0xB0, 0xB6, 0xE9, 0x05, 0xAA, 0x02, 0xC0, 0xF0, 0xE7, 0xB6, 0x04, 0xFE, 0xFF, 0xC8, 0x85, 0x05,
+    0xE0, 0x78, 0xFD, 0x1C, 0xE0, 0xB3, 0x01, 0xC0, 0x30, 0xFC, 0x90, 0x03, 0xC2, 0xBB, 0x02, 0x86, 0x9D, 0x03, 0xFE,
+    0xAB, 0x01, 0xFE, 0xA5, 0x03, 0xFE, 0x9A, 0x01, 0x80, 0xBD, 0x02, 0x84, 0x14, 0xFE, 0x6B, 0xFA, 0x31, 0x80, 0xF9,
+    0x01, 0xFF, 0xB8, 0x01, 0xFD, 0x59, 0xFF, 0xD7, 0x01, 0xFE, 0xC0, 0x01, 0xF9, 0x8C, 0x01, 0x82, 0x54, 0xFF, 0xA8,
+    0x01, 0xFE, 0xC7, 0x04, 0xFC, 0x6F, 0xFD, 0x36, 0x84, 0x51, 0xFE, 0x7A, 0xFA, 0x31, 0x81, 0x38, 0x82, 0x50, 0x84,
+    0x49, 0x82, 0x50, 0x80, 0x69, 0xFF, 0x84, 0x01, 0xFE, 0x43, 0x82, 0x4A, 0x80, 0x5A, 0xFC, 0xF1, 0x01, 0x82, 0x90,
+    0x02, 0xFE, 0x52, 0xFC, 0x58, 0xF9, 0x36, 0x84, 0x0C, 0xFA, 0x5F, 0x82, 0x75, 0xFF, 0x05, 0x83, 0x0E, 0x84, 0x3F,
+    0x82, 0x4A, 0x80, 0xBE, 0x01, 0x81, 0x0F, 0xFE, 0x3F, 0x82, 0x3F, 0x80, 0x35, 0x83, 0xA6, 0x02, 0xFE, 0x9E, 0x02,
+    0x86, 0xA2, 0x01, 0x84, 0xB2, 0x01, 0xFC, 0xF4, 0x02, 0xFE, 0xFD, 0x01, 0x80, 0x83, 0x01, 0x80, 0xA3, 0x01, 0x82,
+    0x0A, 0x82, 0x97, 0x01, 0xFC, 0xDE, 0x02, 0x80, 0xC4, 0x01, 0x82, 0x20, 0xFE, 0xCC, 0x01, 0x82, 0x73, 0xFC, 0xAD,
+    0x01, 0xFE, 0x39, 0x82, 0xA6, 0x01, 0x82, 0x8F, 0x01, 0x80, 0x21, 0x80, 0x30, 0x82, 0xF4, 0x01, 0x80, 0x35, 0xFE,
+    0x58, 0x82, 0x73, 0x80, 0x0B, 0xFE, 0xCB, 0x01, 0x82, 0x12, 0x80, 0x7A, 0xFB, 0x0C, 0xFC, 0x89, 0x02, 0x85, 0xA2,
+    0x01, 0x82, 0x13, 0xFF, 0xD1, 0x01, 0x80, 0x60, 0xFF, 0x48, 0x82, 0x50, 0x80, 0x28, 0x82, 0x3F, 0xFF, 0x22, 0x85,
+    0x42, 0x80, 0x06, 0xFF, 0x2F, 0xF9, 0x3F, 0x84, 0x7B, 0x85, 0x70, 0xFE, 0xEE, 0x01, 0x82, 0x02, 0xFE, 0x9B, 0x01,
+    0x80, 0x38, 0x84, 0x6A, 0xFB, 0x24, 0x80, 0x30, 0xFE, 0x3D, 0xFE, 0x50, 0xFE, 0x08, 0x80, 0x46, 0x84, 0x9C, 0x01,
+    0x82, 0x02, 0x85, 0x5E, 0xFC, 0x81, 0x01, 0x82, 0x89, 0x01, 0xFB, 0x12, 0x81, 0x67, 0x82, 0x7C, 0x82, 0x3A, 0xFC,
+    0xAD, 0x01, 0x81, 0x12, 0x82, 0x5B, 0xFB, 0x4C, 0xFC, 0x1F, 0x80, 0x17, 0x80, 0x18, 0xFF, 0x38, 0x80, 0x90, 0x01,
+    0xFD, 0x15, 0x84, 0xBC, 0x02, 0xFA, 0x5B, 0xFE, 0x2B, 0xFB, 0x1D, 0x84, 0xBF, 0x01, 0xFF, 0x33, 0xFA, 0x47, 0xFD,
+    0x47, 0x86, 0x46, 0xFE, 0x03, 0xFC, 0x14, 0xFF, 0x1C, 0x82, 0x5D, 0x00, 0xFE, 0x44, 0xFC, 0x2B, 0x84, 0x93, 0x01,
+    0x86, 0xA2, 0x01, 0x81, 0x36, 0x87, 0x87, 0x01, 0xFE, 0x11, 0xFD, 0x2C, 0x80, 0x25, 0x82, 0x4C, 0x80, 0x1D, 0xFF,
+    0x11, 0xFE, 0x20, 0xFE, 0x2C, 0x82, 0xB3, 0x01, 0x82, 0x45, 0x82, 0x2B, 0x80, 0x3F, 0xFE, 0x3F, 0x84, 0x0D, 0xFF,
+    0x5B, 0x85, 0xA2, 0x01, 0x82, 0x2D, 0x82, 0x01, 0xFE, 0x32, 0x80, 0x4F, 0xFE, 0x64, 0xFE, 0x3C, 0xF9, 0x4D, 0xFF,
+    0x8D, 0x01, 0x80, 0x32, 0x86, 0x16, 0xFA, 0x31, 0x00, 0x86, 0x65, 0xFE, 0x53, 0x80, 0x5E, 0x83, 0x2B, 0xFA, 0x65,
+    0x86, 0x21, 0x82, 0xA9, 0x02, 0x81, 0x96, 0x01, 0x84, 0x70, 0xFF, 0x7C, 0xFA, 0x24, 0x80, 0x23, 0x80, 0x84, 0x02,
+    0x83, 0x87, 0x01, 0xF9, 0x19, 0x80, 0x4A, 0xFE, 0x3D, 0x84, 0x0F, 0xFE, 0x1E, 0x83, 0x64, 0xFE, 0x7A, 0xFF, 0x27,
+    0x82, 0x55, 0x86, 0x0F, 0x82, 0x68, 0x83, 0x1F, 0x80, 0x9F, 0x01, 0xFE, 0x2B, 0xFE, 0x90, 0x01, 0x84, 0x03, 0x82,
+    0xE9, 0x03, 0x82, 0x90, 0x01, 0x82, 0xC2, 0x01, 0xF8, 0x28, 0xFE, 0x86, 0x05, 0x82, 0x80, 0x02, 0xFC, 0x72, 0x84,
+    0x58, 0x82, 0x20, 0x82, 0x01, 0x81, 0x2B, 0x85, 0x31, 0xFB, 0x39, 0xFF, 0x5A, 0xFF, 0x03, 0xFD, 0x91, 0x01, 0x80,
+    0x25, 0x83, 0x85, 0x01, 0x81, 0x3F, 0xF7, 0xCC, 0x02, 0xFE, 0x27, 0x83, 0x14, 0xFF, 0x6C, 0xFD, 0xE4, 0x01, 0xFD,
+    0xBA, 0x02, 0xFF, 0xF9, 0x01, 0x82, 0x75, 0x83, 0x5F, 0xFD, 0x11, 0xFF, 0x22, 0x83, 0x3E, 0xFB, 0x08, 0xFF, 0x11,
+    0xFD, 0x21, 0xFD, 0x32, 0xFF, 0x16, 0x83, 0x2A, 0x81, 0x42, 0x80, 0x18, 0x83, 0x0E, 0xFD, 0x43, 0xFB, 0x6C, 0xFB,
+    0x70, 0x83, 0x32, 0xFA, 0x31, 0xFF, 0x86, 0x01, 0x86, 0x4F, 0xFB, 0x2C, 0xFF, 0x98, 0x01, 0x83, 0xBA, 0x01, 0x81,
+    0x6F, 0xF9, 0x54, 0x81, 0x59, 0x81, 0x25, 0x81, 0x5B, 0xFF, 0x4B, 0xFF, 0x2F, 0x82, 0x1E, 0xF9, 0x1B, 0x83, 0x03,
+    0x81, 0x92, 0x03, 0x81, 0x81, 0x02, 0x83, 0x07, 0xFB, 0x39, 0xFD, 0x36, 0x82, 0x08, 0xFD, 0x74, 0xFF, 0x29, 0xFE,
+    0x16, 0x85, 0x10, 0xFD, 0x3D, 0xFF, 0x11, 0x81, 0xC0, 0x01, 0xFF, 0x72, 0xFD, 0x7A, 0xFD, 0x1B, 0x83, 0x1D, 0x82,
+    0x13, 0xFB, 0x9A, 0x02, 0xFF, 0x96, 0x01, 0x81, 0x1A, 0x81, 0x37, 0xFD, 0xCB, 0x01, 0x80, 0x18, 0x81, 0xB9, 0x01,
+    0x84, 0x08, 0xFF, 0x33, 0x81, 0x25, 0x81, 0x94, 0x01, 0x82, 0x6E, 0xFB, 0x12, 0xFA, 0x25, 0xFD, 0x41, 0x82, 0x1F,
+    0x81, 0x27, 0xFD, 0x21, 0xFF, 0xE0, 0x01, 0xFE, 0x04, 0x81, 0x45, 0x80, 0x36, 0xFF, 0x47, 0xFE, 0x0A, 0xFD, 0x7A,
+    0xF9, 0x2C, 0x81, 0x6F, 0x83, 0x26, 0xFD, 0x83, 0x01, 0x81, 0x4A, 0x82, 0x0F, 0xFD, 0x2F, 0x83, 0x22, 0xFE, 0x04,
+    0xFF, 0x6E, 0xF9, 0x3D, 0xFF, 0x2F, 0x80, 0x12, 0xFF, 0x2B, 0x83, 0x33, 0xFD, 0x90, 0x01, 0xFD, 0x65, 0x81, 0x45,
+    0xFF, 0x05, 0xFD, 0x6B, 0x83, 0x53, 0xFF, 0x58, 0xFD, 0x5F, 0xFF, 0x38, 0x81, 0x0D, 0x81, 0x04, 0xFF, 0x18, 0x81,
+    0x68, 0x80, 0x19, 0xFD, 0x87, 0x01, 0x81, 0x38, 0xFF, 0x0C, 0xFB, 0x15, 0xFD, 0x81, 0x01, 0x84, 0x03, 0xFD, 0x4C,
+    0xFF, 0x36, 0xFF, 0x2F, 0xFA, 0x2B, 0xFF, 0x24, 0x82, 0x51, 0x81, 0x48, 0x84, 0x22, 0x81, 0x17, 0xFA, 0x2B, 0xFB,
+    0xF7, 0x01, 0x80, 0x13, 0x83, 0x73, 0xFF, 0x49, 0xFB, 0x0B, 0xF9, 0x43, 0x83, 0x17, 0xFC, 0x51, 0x81, 0x2D, 0xFE,
+    0x34, 0xFB, 0x5E, 0x86, 0x2A, 0x83, 0x5F, 0x81, 0x21, 0xFF, 0x0C, 0x82, 0x21, 0xFD, 0x41, 0xFC, 0x0D, 0x82, 0x19,
+    0x82, 0x2D, 0x81, 0x59, 0x80, 0x12, 0xFD, 0x80, 0x01, 0xFF, 0x24, 0xFD, 0x48, 0xFF, 0x47, 0xFF, 0xB0, 0x01, 0x82,
+    0x13, 0x81, 0x85, 0x01, 0x00, 0x83, 0x70, 0xFA, 0x5C, 0xFD, 0x7C, 0x82, 0x26, 0x81, 0x4A, 0x81, 0x0E, 0xFB, 0x3D,
+    0x82, 0x1A, 0xFF, 0x89, 0x01, 0xFB, 0x20, 0xFF, 0x3A, 0xFA, 0x31, 0xFF, 0x9C, 0x01, 0xF9, 0x49, 0xFD, 0x90, 0x01,
+    0x80, 0x36, 0x83, 0x75, 0xF8, 0x67, 0xFF, 0x35, 0x88, 0x1E, 0xFF, 0x41, 0x85, 0x3B, 0x81, 0x38, 0x84, 0x08, 0xFB,
+    0x14, 0x82, 0x14, 0x81, 0x4C, 0xFC, 0x26, 0xFE, 0x4C, 0xFF, 0x77, 0xFF, 0x0C, 0xFF, 0x24, 0x84, 0x05, 0xFF, 0x3C,
+    0x81, 0x2B, 0xFD, 0x09, 0xFD, 0x2B, 0x80, 0x1E, 0x83, 0x1B, 0xFF, 0x18, 0x84, 0x12, 0xFF, 0x3C, 0x81, 0x13, 0xFF,
+    0x10, 0xFB, 0x30, 0xFE, 0x1B, 0x81, 0x20, 0x80, 0x12, 0xFF, 0x4C, 0xFE, 0x0A, 0x81, 0xEB, 0x01, 0xFF, 0x41, 0xFD,
+    0x64, 0x82, 0x44, 0x81, 0x36, 0x81, 0x02, 0xFB, 0x35, 0x84, 0x22, 0x81, 0x08, 0xFC, 0x21, 0xFF, 0x8B, 0x01, 0x86,
+    0x16, 0x81, 0x38, 0x87, 0x3C, 0xFF, 0x19, 0x88, 0x3C, 0x82, 0x0E, 0xFC, 0x45, 0x80, 0x4B, 0x84, 0x09, 0xFF, 0x11,
+    0xFA, 0x31, 0xFF, 0xA3, 0x01, 0x82, 0x86, 0x01, 0x82, 0x04, 0xC2, 0x26, 0xDD, 0x2C, 0xE4, 0x2C, 0xD0, 0x0E, 0xF0,
+    0x2F, 0xD0, 0x5F, 0xF4, 0x44, 0xA2, 0x05, 0xA6, 0x95, 0x01, 0xA0, 0x83, 0x01, 0xA4, 0x62, 0xCB, 0x35, 0xAF, 0x54,
+    0xB0, 0x1C, 0xAB, 0x62, 0xE2, 0x38, 0xE1, 0x2B, 0xC2, 0x18, 0xB5, 0x52, 0xE6, 0x27, 0xAA, 0x5B, 0xE4, 0x40, 0x59,
+    0xD2, 0x14, 0xF6, 0x2E, 0xD0, 0x45, 0xF0, 0x04, 0xAD, 0x1D, 0x87, 0x1D, 0xD2, 0x7F, 0x8B, 0x16, 0xA6, 0x11, 0xB2,
+    0x25, 0xE2, 0x2D, 0xC9, 0x06, 0xB0, 0x1A, 0xFC, 0x3D, 0xB0, 0x2E, 0xF6, 0x3A, 0xA0, 0x2F, 0x8B, 0x09, 0xBB, 0x0D,
+    0xA8, 0x30, 0xC6, 0x21, 0xAC, 0x2C, 0x8E, 0x08, 0x9C, 0xB0, 0x01, 0xF5, 0x02, 0xE3, 0xA3, 0x01, 0xF5, 0x26, 0xE5,
+    0x40, 0x8C, 0x0D, 0xA7, 0x29, 0xF7, 0x32, 0xDA, 0x07, 0xF7, 0x3F, 0xC3, 0x74, 0xF1, 0x36, 0xBC, 0x02, 0xF5, 0x12,
+    0xC9, 0x25, 0xBB, 0x76, 0x9C, 0x1A, 0xC6, 0x1D, 0xA0, 0x1E, 0xC9, 0x45, 0x49, 0x93, 0x13, 0xD5, 0x3A, 0x95, 0x4D,
+    0xAC, 0x03, 0xA5, 0x20, 0xA7, 0x54, 0xA5, 0x11, 0x98, 0x4E, 0xA3, 0x3B, 0x9C, 0x2C, 0xE9, 0x1D, 0x9A, 0x61, 0x9E,
+    0x2C, 0x9A, 0x56, 0xBF, 0x6C, 0xE7, 0x4D, 0xB7, 0x1B, 0xEF, 0x3C, 0xC4, 0x0A, 0xE7, 0x64, 0xBD, 0x66, 0xEB, 0x4B,
+    0xB3, 0x12, 0xD9, 0x31, 0xB9, 0x0C, 0xAA, 0x19, 0xFE, 0x09, 0xFC, 0x44, 0x82, 0x15, 0x84, 0x09, 0x83, 0x3C, 0x80,
+    0x54, 0xFD, 0x20, 0xFC, 0x74, 0xFD, 0x48, 0xFF, 0xCB, 0x01, 0xFF, 0x47, 0xFB, 0x43, 0x83, 0x68, 0xFE, 0x81, 0x01,
+    0xFB, 0x48, 0xFD, 0x4C, 0x80, 0x3B, 0x81, 0x4F, 0x83, 0x80, 0x01, 0x81, 0x38, 0x82, 0x38, 0xF9, 0x49, 0xFD, 0xCB,
+    0x04, 0xFF, 0x72, 0xFF, 0x52, 0xFA, 0xAA, 0x01, 0x83, 0xBF, 0x01, 0x82, 0x8C, 0x01, 0x84, 0x58, 0xFE, 0xD6, 0x01,
+    0x81, 0xF8, 0x01, 0x80, 0xB8, 0x01, 0xFF, 0x6A, 0xFB, 0x2C, 0xFD, 0xBF, 0x02, 0x81, 0x18, 0x81, 0xC2, 0x06, 0x81,
+    0xCB, 0x02, 0xFD, 0x8D, 0x03, 0xB9, 0xAF, 0x02, 0x02, 0x04, 0x00, 0x32, 0x01, 0x34, 0x06, 0x35, 0x19, 0x33, 0x00,
+    0x5D, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x4A, 0x4A, 0x3C, 0x8E, 0x09, 0x95, 0x0C, 0x95, 0x0C,
+    0xFB, 0x0A, 0x29, 0x0A, 0x24, 0x0A, 0x03, 0x0A, 0x0E, 0x09, 0x0A, 0x27, 0x24, 0x27, 0x24, 0xE6, 0x04, 0x83, 0x05,
+    0xE6, 0x04, 0xF8, 0x04, 0x1C, 0x15, 0x1C, 0x15, 0xCB, 0x0B, 0xCC, 0x0B, 0xCB, 0x0B, 0x9E, 0x0B, 0x21, 0x29, 0x21,
+    0x22, 0xF7, 0x06, 0xA5, 0x06, 0xF7, 0x06, 0xE3, 0x06, 0x1A, 0x1C, 0x1A, 0x15, 0xA8, 0x05, 0xCD, 0x05, 0xA8, 0x05,
+    0xED, 0x05, 0x4A, 0x28, 0x4A, 0x3C, 0xA0, 0x2D, 0x80, 0x01, 0x00, 0x01, 0x00, 0x01, 0x04, 0x01, 0x03, 0x04, 0x02,
+    0x05, 0x05, 0x04, 0x07, 0x05, 0x07, 0x09, 0x05, 0x03, 0x0B, 0x05, 0x06, 0x0D, 0x05, 0x05, 0x0F, 0x06, 0x0C, 0x15,
+    0x06, 0x09, 0x17, 0x05, 0x08, 0x19, 0x07, 0x0E, 0x1B, 0x06, 0x0B, 0x1D, 0x06, 0x0A, 0x1F, 0x06, 0x0D, 0x2F, 0x07,
+    0x11, 0x35, 0x07, 0x10, 0x39, 0x07, 0x0F, 0x3B, 0x08, 0x17, 0x3D, 0x09, 0x1C, 0x3F, 0x07, 0x12, 0x59, 0x08, 0x14,
+    0x6F, 0x08, 0x19, 0x75, 0x08, 0x13, 0x79, 0x08, 0x15, 0x7B, 0x08, 0x18, 0x7D, 0x0A, 0x23, 0x7F, 0x0A, 0x24, 0xBB,
+    0x01, 0x09, 0x1F, 0xBD, 0x01, 0x09, 0x1E, 0xD9, 0x01, 0x09, 0x1A, 0xEF, 0x01, 0x0A, 0x2E, 0xF5, 0x01, 0x08, 0x16,
+    0xF9, 0x01, 0x0A, 0x21, 0xFB, 0x01, 0x09, 0x20, 0xFD, 0x01, 0x0A, 0x2B, 0xFF, 0x01, 0x0B, 0x29, 0xBD, 0x02, 0x09,
+    0x1D, 0xFD, 0x02, 0x0D, 0x61, 0xFF, 0x02, 0x0A, 0x2D, 0xBB, 0x03, 0x0A, 0x22, 0xBD, 0x03, 0x0B, 0x25, 0xD9, 0x03,
+    0x09, 0x1B, 0xEF, 0x03, 0x0B, 0x36, 0xF9, 0x03, 0x0B, 0x2A, 0xFB, 0x03, 0x0A, 0x26, 0xFD, 0x03, 0x0C, 0x40, 0xFF,
+    0x03, 0x0C, 0x3F, 0xFD, 0x04, 0x0E, 0x84, 0x01, 0xFF, 0x04, 0x0B, 0x3E, 0xEF, 0x05, 0x0A, 0x35, 0xF9, 0x05, 0x0A,
+    0x28, 0xFD, 0x05, 0x0B, 0x33, 0xFF, 0x05, 0x0A, 0x2F, 0xFD, 0x06, 0x0C, 0x75, 0xFF, 0x06, 0x0A, 0x34, 0xBB, 0x07,
+    0x0A, 0x27, 0xBD, 0x07, 0x0B, 0x2C, 0xEF, 0x07, 0x0B, 0x3A, 0xF9, 0x07, 0x0C, 0x37, 0xFB, 0x07, 0x0B, 0x30, 0xFD,
+    0x07, 0x0D, 0x55, 0xFF, 0x07, 0x0B, 0x4C, 0xFF, 0x09, 0x0C, 0x78, 0xFD, 0x0A, 0x0E, 0x72, 0xBD, 0x0B, 0x0E, 0xB8,
+    0x01, 0xEF, 0x0B, 0x0B, 0x38, 0xF9, 0x0B, 0x0B, 0x32, 0xFD, 0x0B, 0x0E, 0x48, 0xFF, 0x0B, 0x0D, 0x44, 0xFD, 0x0C,
+    0x0D, 0x9C, 0x01, 0xFF, 0x0C, 0x0B, 0x49, 0xFD, 0x0D, 0x0B, 0x39, 0xFD, 0x0E, 0x0C, 0x7B, 0xBD, 0x0F, 0x0B, 0x31,
+    0xEF, 0x0F, 0x0B, 0x3B, 0xF9, 0x0F, 0x0B, 0x3C, 0xFB, 0x0F, 0x0B, 0x3D, 0xFD, 0x0F, 0x0E, 0x5D, 0xFF, 0x0F, 0x0B,
+    0x77, 0xFD, 0x12, 0x0E, 0x6C, 0xFD, 0x13, 0x0E, 0x45, 0xFF, 0x13, 0x0C, 0x43, 0xFD, 0x14, 0x0E, 0x93, 0x01, 0xFD,
+    0x16, 0x0C, 0x76, 0xF9, 0x17, 0x0C, 0x41, 0xFD, 0x17, 0x0D, 0x57, 0xFF, 0x19, 0x0C, 0x79, 0xFD, 0x1A, 0x0C, 0x73,
+    0xBD, 0x1B, 0x0E, 0xC4, 0x01, 0xFD, 0x1B, 0x0E, 0x51, 0xFF, 0x1B, 0x0C, 0x74, 0xFD, 0x1C, 0x0E, 0xA1, 0x01, 0xFD,
+    0x1E, 0x0D, 0x7E, 0xFD, 0x1F, 0x0C, 0x5E, 0xFD, 0x22, 0x0D, 0x6A, 0xFD, 0x24, 0x0D, 0x8F, 0x01, 0xFD, 0x27, 0x0D,
+    0x56, 0xFD, 0x2A, 0x0D, 0x7C, 0xBD, 0x2B, 0x0D, 0xBE, 0x01, 0xFD, 0x2B, 0x0D, 0x4B, 0xFF, 0x2B, 0x0D, 0xE2, 0x01,
+    0xFD, 0x2C, 0x0D, 0xA0, 0x01, 0xFD, 0x2F, 0x0E, 0x60, 0xFD, 0x32, 0x0E, 0x6F, 0xFD, 0x33, 0x0D, 0x46, 0xFD, 0x34,
+    0x0D, 0x94, 0x01, 0xFD, 0x37, 0x0E, 0x5B, 0xBD, 0x3B, 0x0D, 0xC5, 0x01, 0xFD, 0x3B, 0x0E, 0x54, 0xFD, 0x3C, 0x0E,
+    0xA5, 0x01, 0xFD, 0x3E, 0x0D, 0x7F, 0xFD, 0x44, 0x0E, 0x8B, 0x01, 0xFD, 0x4A, 0x0E, 0x80, 0x01, 0xBD, 0x4B, 0x0E,
+    0xBD, 0x01, 0xFD, 0x4B, 0x0E, 0x4A, 0xFD, 0x4F, 0x0E, 0x5F, 0xFD, 0x52, 0x0E, 0x6D, 0xFD, 0x53, 0x0E, 0x47, 0xFD,
+    0x54, 0x0E, 0x9F, 0x01, 0xBD, 0x5B, 0x0E, 0xC6, 0x01, 0xFD, 0x5B, 0x0E, 0x52, 0xFD, 0x5C, 0x0E, 0xA4, 0x01, 0xFD,
+    0x6F, 0x0E, 0x69, 0xFD, 0x72, 0x0E, 0x70, 0xFD, 0x77, 0x0E, 0x5C, 0xFD, 0x7B, 0x0E, 0x5A, 0xFD, 0x7C, 0x0E, 0xA6,
+    0x01, 0xE3, 0xA7, 0x01, 0x7D, 0xE1, 0x5D, 0x7D, 0x69, 0xFF, 0x4D, 0x9F, 0xB1, 0xBB, 0xF6, 0x4F, 0xFA, 0x72, 0x7D,
+    0xD1, 0x7F, 0xFF, 0x3F, 0xA6, 0x2F, 0x19, 0x7D, 0xD7, 0xCC, 0x7F, 0xF7, 0x65, 0x56, 0x71, 0xFE, 0xEF, 0x9F, 0xB6,
+    0x92, 0xB3, 0x8D, 0x33, 0x27, 0x99, 0xBE, 0x1E, 0x56, 0xA3, 0xF6, 0x18, 0x0B, 0xF3, 0xDF, 0x61, 0xAD, 0xAF, 0xF9,
+    0x74, 0xAB, 0xB1, 0x8A, 0x92, 0xF4, 0xAD, 0x47, 0xFE, 0x5A, 0x04, 0x36, 0x11, 0x15, 0x45, 0xFF, 0xEB, 0x96, 0x56,
+    0xD6, 0x20, 0x42, 0xC4, 0x7B, 0xAA, 0xDA, 0xA3, 0x6B, 0xA3, 0x96, 0x49, 0xFE, 0x2F, 0x00, 0xAD, 0x54, 0xB7, 0xB8,
+    0xBF, 0x62, 0x33, 0xE3, 0xD4, 0x16, 0x12, 0xFF, 0x29, 0xB8, 0x32, 0x73, 0xFB, 0x93, 0x84, 0x55, 0x98, 0x3E, 0xAD,
+    0x7B, 0x15, 0x53, 0x6A, 0x22, 0x54, 0xA6, 0xCA, 0xE0, 0xAC, 0x8A, 0x08, 0x42, 0x86, 0x93, 0x48, 0x15, 0x88, 0x8B,
+    0x6F, 0xAA, 0xAD, 0x34, 0x2B, 0x8C, 0x2A, 0x25, 0x26, 0x68, 0x9E, 0xFF, 0xA5, 0xF4, 0xD9, 0x56, 0xB9, 0xFD, 0xF5,
+    0xDC, 0xA9, 0xCE, 0xA9, 0xF9, 0x49, 0xA4, 0x01, 0x48, 0x22, 0xB0, 0x55, 0x74, 0xA7, 0x35, 0xB9, 0xC7, 0x1A, 0xD1,
+    0xDC, 0x5C, 0x97, 0x48, 0xB9, 0x26, 0x2C, 0x6B, 0xEA, 0x9F, 0xCD, 0xED, 0x9B, 0x63, 0xD3, 0x27, 0x3B, 0xDE, 0x8E,
+    0x4F, 0x5A, 0xDF, 0x4B, 0x03, 0x00, 0x5A, 0x74, 0x87, 0x2F, 0x49, 0xAE, 0xFE, 0xC6, 0x06, 0x6A, 0x5B, 0x03, 0x2A,
+    0xD7, 0x18, 0x81, 0x4C, 0xE8, 0xBB, 0xAA, 0xFE, 0xA7, 0x0E, 0xE8, 0xCA, 0x72, 0xFE, 0x19, 0x2F, 0x0B, 0x40, 0x09,
+    0x42, 0x27, 0xD0, 0x62, 0x24, 0xCC, 0x77, 0x75, 0x45, 0x2B, 0x6A, 0xD2, 0xB6, 0x15, 0x61, 0xB3, 0xA9, 0xB5, 0x51,
+    0xD6, 0xF3, 0x3F, 0x6F, 0x19, 0xFF, 0x0C, 0x04, 0x2C, 0x71, 0x9E, 0x57, 0xA1, 0xCA, 0xA8, 0xAD, 0x82, 0xDF, 0x1A,
+    0x13, 0x50, 0x62, 0x89, 0xCC, 0x4A, 0x6B, 0x2A, 0x50, 0x43, 0x5A, 0xA9, 0x01, 0x00, 0xC8, 0xC4, 0x4A, 0x2E, 0x24,
+    0x7E, 0x09, 0x06, 0x36, 0xAB, 0x12, 0xE7, 0xAE, 0x3E, 0x2B, 0xA5, 0x92, 0x0E, 0xB4, 0xAF, 0x1B, 0xC7, 0xD6, 0x25,
+    0x63, 0xD4, 0x3A, 0xC9, 0xA7, 0x39, 0x5E, 0x9A, 0x91, 0x8F, 0xA5, 0x73, 0x3B, 0x49, 0x08, 0x13, 0x88, 0x2B, 0x49,
+    0x46, 0x1A, 0xE3, 0x18, 0x4D, 0x92, 0x44, 0x9D, 0x3A, 0x83, 0x55, 0x6C, 0x3A, 0x95, 0xCD, 0xAB, 0x47, 0x9D, 0xCF,
+    0xB2, 0x4F, 0x65, 0x6C, 0x45, 0x28, 0xA6, 0xCA, 0x7C, 0x8E, 0x62, 0x71, 0xFB, 0x9E, 0xC0, 0xF8, 0x84, 0x4A, 0x31,
+    0x9A, 0xB0, 0x8C, 0xD1, 0x5C, 0x21, 0x83, 0xFE, 0x56, 0x71, 0x15, 0x83, 0xC7, 0x71, 0x1F, 0x83, 0xA2, 0x35, 0x63,
+    0x9F, 0xE2, 0x01, 0x64, 0x8C, 0x9C, 0xE5, 0x28, 0xAE, 0xEB, 0x11, 0xEA, 0x6F, 0x45, 0xB8, 0x72, 0xDE, 0x14, 0x1F,
+    0xCE, 0x04, 0x70, 0x63, 0xF5, 0xD5, 0x2F, 0xBD, 0x62, 0x65, 0xC5, 0xC9, 0xA9, 0xAF, 0xD0, 0x39, 0x1E, 0xFB, 0xE5,
+    0x2E, 0x56, 0x9B, 0x95, 0x73, 0x53, 0x75, 0x96, 0xD5, 0x3F, 0xD3, 0x7A, 0x05, 0x5E, 0x95, 0x65, 0x27, 0x36, 0x8D,
+    0x0A, 0x23, 0x14, 0xCD, 0xD5, 0x14, 0x35, 0xFB, 0xD5, 0x24, 0xC5, 0xB2, 0x14, 0x45, 0x46, 0xD1, 0x43, 0xF5, 0x2C,
+    0xB0, 0xB8, 0x29, 0x66, 0x45, 0xCE, 0x8A, 0x12, 0x09, 0x5F, 0x3B, 0x75, 0x29, 0xD3, 0x26, 0x63, 0xBB, 0x4F, 0x4E,
+    0xE7, 0xA0, 0xE3, 0xA6, 0x49, 0xE5, 0x56, 0xEB, 0x49, 0x4B, 0x8A, 0x58, 0x2D, 0x62, 0x6E, 0x74, 0x41, 0x49, 0xD1,
+    0x09, 0x0F, 0x81, 0x4D, 0xDB, 0x42, 0x55, 0x0D, 0xA4, 0xB8, 0xF1, 0xD8, 0xB6, 0xB3, 0x75, 0x54, 0x92, 0x1D, 0x45,
+    0x5E, 0x7B, 0xD2, 0x68, 0x91, 0xCB, 0x6B, 0x5F, 0x51, 0x72, 0x35, 0x39, 0x45, 0x8A, 0xB6, 0x69, 0x26, 0x95, 0x6A,
+    0xE4, 0x39, 0xB9, 0x97, 0x56, 0x3F, 0xB5, 0xB3, 0xBA, 0xB0, 0x5E, 0xB7, 0x71, 0x32, 0x71, 0x24, 0xB7, 0xE6, 0xE9,
+    0x9A, 0xA8, 0x33, 0xE7, 0x75, 0x7B, 0x8A, 0xAA, 0x58, 0xDF, 0x93, 0x66, 0x1E, 0xB5, 0x6E, 0x1C, 0xBC, 0x8C, 0xC7,
+    0xCB, 0x68, 0x72, 0x32, 0x96, 0x83, 0x4D, 0x4E, 0x66, 0xCD, 0xB8, 0xBA, 0x51, 0x24, 0xD9, 0xED, 0x7D, 0xED, 0xD6,
+    0xF2, 0x32, 0x9D, 0xAF, 0x65, 0x9D, 0x4D, 0x26, 0xE7, 0x24, 0x94, 0x2C, 0x3D, 0xC0, 0x4B, 0x53, 0xBF, 0xC9, 0xE3,
+    0xAA, 0x03, 0x63, 0xC9, 0x74, 0x8F, 0x19, 0x45, 0x52, 0x9A, 0xA2, 0x79, 0xC9, 0x93, 0xD4, 0x96, 0xE3, 0x7A, 0xDA,
+    0x0F, 0x9D, 0x71, 0x84, 0x5C, 0x97, 0x7C, 0x2A, 0x45, 0x08, 0xD7, 0x72, 0x33, 0x8A, 0xE4, 0xF1, 0xAC, 0xAE, 0xB3,
+    0x95, 0xEF, 0x74, 0xDD, 0x7C, 0xA5, 0xFA, 0x35, 0xED, 0xB4, 0x08, 0x73, 0x53, 0xCF, 0x6D, 0xD2, 0xB8, 0x5A, 0x55,
+    0x72, 0xAB, 0x12, 0xD2, 0xD6, 0x19, 0x97, 0xBA, 0x97, 0xD1, 0xC9, 0x39, 0x8A, 0xE4, 0x65, 0x2F, 0xF5, 0x8F, 0xA3,
+    0xD8, 0xD8, 0xAD, 0xC9, 0x52, 0xEF, 0x97, 0x55, 0xBE, 0xBC, 0x2A, 0xAB, 0xCA, 0x70, 0x92, 0x3D, 0x61, 0x25, 0x95,
+    0x9F, 0xC7, 0x91, 0xF1, 0x79, 0x93, 0xB2, 0xC2, 0x71, 0x3B, 0xB9, 0xB8, 0x0E, 0x32, 0x8E, 0xA6, 0x19, 0x8C, 0x64,
+    0x84, 0x50, 0x93, 0x14, 0x53, 0x37, 0xF5, 0xE9, 0x6D, 0xEF, 0x74, 0xB1, 0x77, 0x32, 0xBB, 0x14, 0x9B, 0x7A, 0x59,
+    0x96, 0xED, 0xD5, 0x1D, 0x2D, 0x4A, 0x1F, 0xDD, 0x6C, 0x93, 0x47, 0x12, 0xCE, 0xCA, 0xA4, 0x15, 0xED, 0x4C, 0xEB,
+    0xE2, 0xD5, 0x5A, 0xF4, 0x39, 0xDD, 0xB3, 0x6A, 0x79, 0xAB, 0x03, 0xEA, 0xE2, 0x39, 0x5B, 0x7B, 0xE5, 0xBA, 0x54,
+    0x92, 0xDE, 0xF8, 0x63, 0xBF, 0x11, 0xC6, 0xA8, 0xCA, 0x99, 0xDA, 0x95, 0x8B, 0x2A, 0x5E, 0x91, 0xCE, 0xF9, 0x52,
+    0x6A, 0x0A, 0xDE, 0x64, 0xC9, 0x84, 0x4A, 0x11, 0x7A, 0x4A, 0x12, 0xF2, 0xB9, 0x6F, 0x1E, 0xC5, 0xC8, 0x47, 0xA5,
+    0x44, 0x39, 0x6F, 0x83, 0xF1, 0x7D, 0xD6, 0x12, 0x4A, 0xFF, 0x42, 0x16, 0xDA, 0x2F, 0x6F, 0xD5, 0xFC, 0xE4, 0x96,
+    0xCE, 0xCE, 0xFA, 0x2C, 0x4D, 0x3D, 0x08, 0x2D, 0x4A, 0x75, 0x6F, 0x69, 0x3B, 0x57, 0x5F, 0xD1, 0xAD, 0xAD, 0xD3,
+    0x02, 0x23, 0xBA, 0xEA, 0x39, 0x9B, 0xA9, 0x2D, 0x1C, 0x91, 0xE2, 0x15, 0x2B, 0x4D, 0xBB, 0xD5, 0x6D, 0xAD, 0xD7,
+    0x2F, 0x17, 0xD5, 0x69, 0x56, 0x2F, 0x13, 0xC6, 0xD3, 0x4A, 0x44, 0x8B, 0x7D, 0x01, 0x8E, 0x54, 0xFB, 0x72, 0x2D,
+    0x13, 0x76, 0x0E, 0xB3, 0x75, 0xF1, 0x49, 0x56, 0xD7, 0x22, 0x45, 0x6A, 0x25, 0xD7, 0x4D, 0x39, 0x27, 0x95, 0x92,
+    0x4E, 0x67, 0x10, 0x02, 0xE4, 0x5C, 0x3F, 0x3B, 0x6A, 0x42, 0x48, 0x5E, 0x78, 0x93, 0x65, 0x5C, 0x45, 0x65, 0x1F,
+    0x42, 0x42, 0x41, 0x25, 0xCF, 0x95, 0xAB, 0x01, 0xA0, 0xD4, 0x5C, 0xE4, 0xEB, 0xF3, 0xF9, 0xD4, 0xE2, 0xEB, 0x31,
+    0xB6, 0x3A, 0x5B, 0x93, 0x22, 0xF3, 0x94, 0x5B, 0xEA, 0x3A, 0x23, 0xD5, 0x8C, 0x0C, 0x42, 0x91, 0x33, 0x59, 0xD6,
+    0xF6, 0xC9, 0x99, 0xAF, 0xE4, 0xE5, 0x3E, 0x75, 0x3A, 0xB7, 0x6C, 0xAA, 0xAA, 0x7D, 0xC9, 0x2B, 0xAC, 0x25, 0xC8,
+    0x7B, 0x7E, 0xB7, 0xAC, 0xD1, 0xC7, 0xD4, 0x49, 0x99, 0x38, 0x29, 0x46, 0xAA, 0x19, 0xE9, 0x40, 0xF7, 0x8B, 0x53,
+    0xAE, 0x1B, 0xCE, 0x63, 0x53, 0xB9, 0xF5, 0xE8, 0x54, 0x4E, 0x2E, 0xF0, 0x08, 0xAB, 0x87, 0x6C, 0x7E, 0xF2, 0x64,
+    0x1C, 0x1A, 0x3A, 0x57, 0xB2, 0x67, 0x2C, 0x01, 0x42, 0xC1, 0xD8, 0x95, 0xBB, 0xDE, 0xCA, 0x2F, 0xCD, 0x6C, 0x29,
+    0x45, 0xDC, 0xD1, 0xBD, 0xC6, 0x2F, 0x34, 0xF1, 0x8A, 0xF1, 0x48, 0xB6, 0x54, 0x99, 0xAA, 0xB2, 0xBE, 0x5F, 0xB5,
+    0x55, 0xC6, 0x05, 0x2C, 0xB7, 0xAE, 0xAB, 0x0F, 0xED, 0x2C, 0xC9, 0x48, 0x27, 0x93, 0x7C, 0xB7, 0x48, 0xDA, 0x94,
+    0x46, 0x20, 0xCA, 0x57, 0xA1, 0x3B, 0xF7, 0xA8, 0x0B, 0x67, 0x00, 0x00, 0xA5, 0xEE, 0x66, 0xE9, 0x16, 0xBC, 0x3E,
+    0xB9, 0x2E, 0x73, 0x2C, 0x9B, 0xEA, 0x24, 0x8D, 0xEF, 0xB9, 0x2B, 0xB0, 0xF4, 0xA9, 0xB2, 0x59, 0xAE, 0x2F, 0x5A,
+    0x64, 0x1C, 0x39, 0x2F, 0x45, 0x33, 0x8E, 0xF0, 0x59, 0xC2, 0xA6, 0x4E, 0x02, 0x3F, 0x4D, 0x4D, 0x25, 0x69, 0x08,
+    0x3C, 0xDE, 0x2C, 0xA1, 0xE1, 0xBA, 0xC2, 0x08, 0xCD, 0x72, 0x5C, 0x14, 0xCB, 0x92, 0x6C, 0x9A, 0xB1, 0x40, 0x52,
+    0x24, 0xC5, 0x12, 0x8E, 0xCE, 0x72, 0x71, 0x8C, 0xDD, 0x65, 0x93, 0x24, 0xE1, 0xDA, 0x10, 0x6A, 0xC2, 0xD2, 0x64,
+    0x96, 0x4D, 0x53, 0x84, 0x8C, 0xA6, 0xE1, 0xD1, 0xD4, 0x35, 0x39, 0x2C, 0x50, 0x27, 0x39, 0x96, 0x75, 0x5F, 0xB9,
+    0xCA, 0x2D, 0xB8, 0x68, 0xA3, 0x08, 0xEB, 0x75, 0xE6, 0xAA, 0xB2, 0x96, 0xCA, 0xB1, 0x5E, 0xDD, 0xD9, 0xCE, 0xDD,
+    0x56, 0x4B, 0xA1, 0x85, 0x2F, 0xDA, 0x53, 0x7E, 0x79, 0xED, 0x6C, 0xD8, 0xEE, 0xE6, 0x50, 0x1F, 0x29, 0x75, 0x13,
+    0x29, 0x92, 0xA7, 0xD6, 0x52, 0x44, 0x93, 0x76, 0xD7, 0x5C, 0x2F, 0x5B, 0x2E, 0x9E, 0xC8, 0x53, 0x3C, 0x4A, 0xA9,
+    0xE5, 0x24, 0xC1, 0xD6, 0xB4, 0x35, 0x76, 0xAA, 0x75, 0x64, 0x86, 0x25, 0x56, 0xA0, 0x2F, 0x20, 0x54, 0xF2, 0x3D,
+    0x52, 0xF1, 0x95, 0x4C, 0x9E, 0x75, 0xFD, 0x2A, 0xA1, 0x8A, 0x2D, 0x6F, 0x52, 0xEE, 0xC4, 0x9C, 0xBA, 0x52, 0xE8,
+    0xE2, 0x69, 0xAF, 0xD8, 0xAB, 0xD4, 0x3A, 0x11, 0xFA, 0x10, 0x3A, 0x57, 0x43, 0xAF, 0x3A, 0x8C, 0xE3, 0xE5, 0x15,
+    0x56, 0x90, 0xB3, 0x50, 0x09, 0x95, 0xBF, 0x00, 0x00, 0x19, 0xF0, 0xB3, 0xE9, 0x24, 0x49, 0xE2, 0xD8, 0x5C, 0xF9,
+    0xEA, 0xAC, 0x9C, 0x07, 0x6F, 0xAE, 0x97, 0x8C, 0x57, 0xE6, 0xFB, 0x82, 0x2F, 0x54, 0x46, 0x76, 0x09, 0x01, 0x42,
+    0x92, 0x14, 0x95, 0xA2, 0x28, 0x92, 0x90, 0x67, 0x8C, 0x40, 0x12, 0x55, 0xEB, 0x6A, 0xA9, 0x57, 0x34, 0xA9, 0xD4,
+    0xF2, 0x5A, 0x91, 0x9F, 0xCA, 0xE9, 0xEF, 0xEB, 0xB3, 0xFA, 0x57, 0xEB, 0x7E, 0xA6, 0x9B, 0xCC, 0xBE, 0xEE, 0xA6,
+    0xDA, 0x2A, 0x5D, 0xE0, 0xB4, 0xBA, 0x93, 0x93, 0xA2, 0x9D, 0xEC, 0xF3, 0x0A, 0x56, 0x25, 0xA9, 0xB2, 0x37, 0xA1,
+    0x4A, 0xA3, 0xF4, 0x83, 0xD9, 0x1F, 0x76, 0xF4, 0xC4, 0xDE, 0x55, 0x09, 0xDD, 0xA7, 0x0E, 0x00, 0xD0, 0x07, 0x00,
+    0xA0, 0xFF, 0x01, 0x00, 0xFB, 0x13, 0x00, 0x80, 0x47, 0x18, 0xB0, 0xF0, 0xC8, 0xB9, 0x6A, 0xD9, 0x0C, 0x63, 0xF3,
+    0xFA, 0xFA, 0xF1, 0x52, 0xD2, 0xB5, 0x22, 0x66, 0xBF, 0x3B, 0xA9, 0x25, 0x6F, 0xF9, 0xCE, 0xCF, 0x2A, 0xC2, 0xDD,
+    0xF9, 0xEC, 0xCB, 0x74, 0xA5, 0xAA, 0x95, 0x8B, 0x32, 0x75, 0x5F, 0x75, 0x66, 0x13, 0x27, 0x85, 0x4A, 0xA7, 0xA2,
+    0x94, 0x0D, 0x39, 0x95, 0x91, 0x8F, 0x1B, 0x1A, 0x3A, 0xC5, 0xF9, 0xCB, 0x2E, 0x79, 0xD0, 0x43, 0xCE, 0xF8, 0x17,
+    0xF5, 0x28, 0x79, 0xF9, 0xA0, 0x24, 0x3C, 0x05, 0x0D, 0xFD, 0x3B, 0x00, 0xA0, 0x04, 0x1A, 0x00, 0x60, 0x01, 0x00,
+    0xDE, 0xC1, 0xE0, 0x5F, 0x3C, 0xAB, 0x02, 0x00, 0xC0, 0xF9, 0x90, 0xD0, 0x3B, 0xE4, 0x77, 0x6F, 0xB7, 0xC6, 0x0B,
+    0x81, 0x6C, 0x7A, 0x23, 0xB2, 0x2B, 0xF2, 0x84, 0x74, 0xF6, 0x22, 0x7D, 0x73, 0x67, 0x98, 0x28, 0x27, 0x25, 0x69,
+    0xED, 0x28, 0xB2, 0xF9, 0x29, 0x7A, 0x5A, 0x07, 0xD9, 0xCF, 0xB3, 0x45, 0x94, 0x5E, 0x31, 0x7A, 0xE8, 0xE9, 0x43,
+    0xEA, 0xD6, 0x95, 0x04, 0x71, 0x3A, 0x91, 0x84, 0x84, 0xE5, 0xD8, 0x4D, 0xCE, 0xE7, 0x6B, 0xEE, 0xAC, 0x2D, 0xD2,
+    0x15, 0x65, 0x6A, 0x59, 0xB1, 0xB7, 0x5B, 0x8F, 0xB7, 0x1E, 0x79, 0xD9, 0x4F, 0x04, 0x7E, 0xBB, 0x7C, 0x64, 0xCF,
+    0xE6, 0x57, 0x17, 0xB5, 0x9C, 0x57, 0x25, 0xE5, 0x13, 0x3B, 0xD9, 0xF2, 0x1D, 0xCD, 0xAE, 0xF1, 0x6D, 0xC7, 0xAD,
+    0xC6, 0xEE, 0x6E, 0x8C, 0x51, 0xF4, 0xD4, 0x4B, 0xC6, 0xE9, 0x64, 0xFB, 0x37, 0x9E, 0x1E, 0xB5, 0x57, 0x2A, 0x20,
+    0x00, 0x00, 0xD9, 0x01, 0x00, 0xD9, 0x13, 0x00, 0x20, 0x27, 0x97, 0x5F, 0x00, 0xC0, 0x1E, 0x7A, 0x07, 0x00, 0xE8,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0xD8, 0x05, 0x00, 0x08, 0xF4, 0xBF, 0xFE, 0x03, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x80, 0xAD, 0xA7, 0x10, 0x04, 0x40, 0xD8, 0x05, 0x00, 0x88, 0x01, 0x00, 0xB0, 0x23, 0x08,
+    0x41, 0x0D, 0x00, 0xD0, 0x8F, 0x4B, 0xEF, 0x4C, 0x43, 0x1F, 0x00, 0x80, 0x85, 0x3E, 0xF0, 0x0E, 0xF2, 0xC5, 0x45,
+    0x87, 0x7A, 0x00, 0x40, 0x8F, 0x05, 0x00, 0x80, 0x6A, 0x27, 0xD3, 0x01, 0x00, 0x26, 0x3F, 0x06, 0x23, 0x88, 0x18,
+    0xF4, 0x6F, 0x07, 0x00, 0x30, 0x1C, 0x04, 0x30, 0x48, 0x54, 0x00, 0x80, 0x04, 0x80, 0xDD, 0x10, 0x58, 0x08, 0x00,
+    0x12, 0x3E, 0x9C, 0xDD, 0x67, 0x90, 0xE3, 0x43, 0x36, 0x00, 0xC0, 0x34, 0x00, 0x40, 0xAB, 0x21, 0x83, 0x08, 0xB8,
+    0x00, 0x80, 0x0A, 0x0D, 0x0B, 0xB9, 0x07, 0x0B, 0x75, 0xE4, 0x88, 0xE8, 0x30, 0x28, 0x00, 0x80, 0x3C, 0xBC, 0x00,
+    0x00, 0xAB, 0x20, 0xD7, 0x7D, 0xA8, 0x00, 0x00, 0xFA, 0x41, 0x62, 0x7B, 0x03, 0x00, 0x64, 0x21, 0x83, 0x86, 0xD5,
+    0xD0, 0x01, 0x00, 0x32, 0xCF, 0x83, 0x1C, 0xC8, 0x12, 0xC8, 0xDB, 0x58, 0xD0, 0x7F, 0x9E, 0x1D, 0x4D, 0x01, 0x00,
+    0x00, 0xC8, 0x61, 0x07, 0x83, 0x1D, 0x7C, 0xA8, 0x65, 0x32, 0x22, 0x84, 0x71, 0xC2, 0x07, 0x68, 0x38, 0x00, 0x80,
+    0x3C, 0x04, 0x00, 0xE0, 0x20, 0x83, 0x40, 0x1D, 0x00, 0x00, 0x3A, 0x14, 0x54, 0x78, 0x61, 0x43, 0x5F, 0x09, 0x00,
+    0x08, 0x2C, 0x34, 0xC0, 0x86, 0x8A, 0x4C, 0x0D, 0x09, 0x09, 0x00, 0x70, 0x2B, 0x00, 0xC0, 0xDE, 0xD3, 0xB0, 0x87,
+    0x11, 0x68, 0x98, 0x6F, 0xED, 0xA0, 0x06, 0x00, 0xC8, 0xCC, 0xC2, 0x0B, 0x90, 0x19, 0x7C, 0xFC, 0x10, 0x7D, 0x0F,
+    0x00, 0xD0, 0xB0, 0x90, 0xC3, 0x2B, 0x00, 0x00, 0x19, 0x54, 0x75, 0x99, 0x82, 0x2F, 0x07, 0x00, 0x78, 0x21, 0x53,
+    0xE0, 0x00, 0x00, 0xA0, 0x43, 0x97, 0xC3, 0x6A, 0xE8, 0x12, 0x76, 0xB0, 0x61, 0x43, 0x87, 0xEE, 0x41, 0x87, 0xC1,
+    0x45, 0x00, 0x2A, 0x3D, 0xFC, 0x01, 0x00, 0xC8, 0x92, 0x07, 0x00, 0xD8, 0x23, 0x20, 0x02, 0x00, 0xC0, 0x13, 0x00,
+    0x00, 0x44, 0x00, 0x06, 0x00, 0x00, 0x00, 0x80, 0x5D, 0xC1, 0xBF, 0x41, 0x3E, 0x41, 0x0B, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x44, 0x00, 0x00, 0x00, 0xC0, 0x5F, 0x00, 0x80, 0x17, 0x00, 0xA0, 0xD3, 0x8F, 0xFD, 0x44, 0x3E, 0x00, 0x00,
+    0x00, 0x80, 0x00, 0x00, 0x10, 0x44, 0x04, 0x20, 0x08, 0x84, 0x00, 0x02, 0x01, 0x10, 0x01, 0x00, 0x40, 0x84, 0x08,
+    0xD0, 0xFF, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x23, 0xDF, 0x96, 0xD1, 0xD7, 0x20, 0x78, 0x02,
+    0x68, 0x01, 0x7E, 0xE1, 0x9D, 0x90, 0x04, 0x21, 0x00, 0xFC, 0x35, 0x53, 0x17, 0x98, 0xDA, 0x00, 0x00, 0xF8, 0x05,
+    0x40, 0x22, 0x00, 0x40, 0x08, 0x84, 0x10, 0x42, 0xDF, 0x82, 0x00, 0xC0, 0x04, 0x00, 0x00, 0x70, 0x03, 0x00, 0x00,
+    0x00, 0x00, 0x06, 0x21, 0x04, 0x22, 0x08, 0x01, 0x00, 0x44, 0xF4, 0xD9, 0x00, 0x00, 0x00, 0x00, 0x20, 0x5F, 0x03,
+    0xFD, 0x42, 0xA4, 0x12, 0x00, 0x80, 0xBE, 0x08, 0x01, 0x44, 0x58, 0x01, 0xF9, 0x0D, 0x14, 0x41, 0x10, 0x22, 0x00,
+    0x00, 0x00, 0x00, 0x88, 0x00, 0x00, 0xB2, 0x07, 0x00, 0x00, 0x80, 0x94, 0x06, 0x00, 0x00, 0xA8, 0x05, 0x46, 0x00,
+    0x32, 0xFD, 0x36, 0x80, 0xAA, 0x5F, 0x29, 0xDA, 0xE4, 0x46, 0xC3, 0xDF, 0x31, 0x08, 0x40, 0x9A, 0x01, 0xC4, 0xFF,
+    0x41, 0xDF, 0x24, 0x00, 0x00, 0x00, 0x00, 0x52, 0xF0, 0x05, 0x00, 0x00, 0x00, 0xEA, 0xF2, 0x06, 0x00, 0xB0, 0x0B,
+    0x44, 0x11, 0x7E, 0x96, 0x40, 0xA8, 0x02, 0x92, 0x35, 0x23, 0x04, 0x08, 0x01, 0x10, 0x01, 0x00, 0x84, 0x80, 0x10,
+    0xBC, 0x1F, 0x04, 0x60, 0x82, 0x20, 0x40, 0x04, 0x00, 0x80, 0xFD, 0xEC, 0x17, 0x08, 0x0B, 0x63, 0xB2, 0xBD, 0x67,
+    0x5F, 0x1F, 0x27, 0xFF, 0x3D, 0xC7, 0xB4, 0xBA, 0x48, 0x8A, 0x3E, 0x7E, 0x1A, 0x89, 0xA0, 0xA8, 0x84, 0x14, 0x46,
+    0x4A, 0xD6, 0x9D, 0x6C, 0x58, 0x56, 0x32, 0xB2, 0x2B, 0x29, 0x79, 0x77, 0x3D, 0xE5, 0xB8, 0x0B, 0x13, 0x26, 0xFD,
+    0xA3, 0xDF, 0x6D, 0x6E, 0x28, 0x7C, 0x26, 0xAA, 0xBE, 0xDB, 0x4E, 0x69, 0xD3, 0x5B, 0xBF, 0xFB, 0x94, 0x6E, 0xCB,
+    0xFC, 0xE9, 0x1D, 0xB9, 0xD7, 0xF5, 0x4D, 0x57, 0xBA, 0xD7, 0xBC, 0xD2, 0x96, 0x93, 0x9E, 0x23, 0xCD, 0x8C, 0xCE,
+    0x5A, 0x45, 0x42, 0xF4, 0xC9, 0x5C, 0xCA, 0x85, 0x57, 0xC9, 0xDC, 0xC8, 0xFF, 0xB7, 0x3C, 0x9D, 0xCC, 0x97, 0xC9,
+    0x4F, 0x59, 0xB5, 0xA6, 0xF5, 0xC7, 0xB9, 0xA7, 0xC5, 0xE3, 0x22, 0x52, 0x3C, 0x12, 0x32, 0x11, 0x25, 0xBD, 0x6A,
+    0x4B, 0xD8, 0x3A, 0x46, 0x9C, 0x6A, 0x72, 0x2B, 0x7F, 0x50, 0xC6, 0x0F, 0x55, 0x82, 0x98, 0xEA, 0x2B, 0xC5, 0x64,
+    0xA5, 0xB2, 0x3C, 0x69, 0x7A, 0x02, 0x00, 0x32, 0x00, 0x80, 0x7E, 0x21, 0xD0, 0x7B, 0xFC, 0xBD, 0xB7, 0x1B, 0x5E,
+    0x6F, 0x5B, 0x17, 0xEA, 0x5E, 0xB8, 0x00, 0x80, 0xBC, 0x4C, 0x64, 0xE5, 0x37, 0xA1, 0x5E, 0x45, 0x03, 0x6C, 0xF6,
+    0xC6, 0x28, 0x5A, 0x46, 0xBF, 0xE6, 0xFF, 0x21, 0x69, 0x79, 0xD2, 0x32, 0x3B, 0x3D, 0x7C, 0xA9, 0xC8, 0x39, 0x3E,
+    0xBD, 0xC3, 0x04, 0xE8, 0xDB, 0x00, 0xD4, 0xE3, 0xA4, 0xAE, 0xE5, 0x84, 0xE0, 0xE9, 0xD2, 0xF5, 0x09, 0xA0, 0x4B,
+    0x7F, 0x00, 0x00, 0xFE, 0xC0, 0x50, 0xC7, 0x9B, 0x4E, 0x12, 0x08, 0x74, 0x59, 0x0A, 0x7D, 0xAB, 0xAF, 0xEB, 0x47,
+    0xCC, 0xC2, 0x9E, 0x07, 0x40, 0x9E, 0xFA, 0xF4, 0x50, 0xB2, 0xF5, 0xDA, 0x75, 0xB3, 0xA5, 0xBD, 0x3C, 0x74, 0x2D,
+    0xD5, 0x23, 0x50, 0x61, 0x04, 0xF8, 0x5B, 0xE0, 0x15, 0xA9, 0x32, 0xEA, 0x2C, 0xE3, 0xAF, 0xE9, 0x25, 0x99, 0x64,
+    0x4C, 0xD5, 0xC8, 0xFD, 0x84, 0xFA, 0x77, 0x8B, 0x7C, 0x5B, 0xD1, 0xC9, 0xF2, 0xAE, 0x90, 0xB0, 0x73, 0x74, 0xFE,
+    0x90, 0x65, 0x2D, 0x40, 0x2E, 0x00, 0x1F, 0xDC, 0x93, 0xE8, 0xB5, 0x90, 0x5D, 0xC1, 0x83, 0x4D, 0xFB, 0x15, 0x00,
+    0x2A, 0xBF, 0x5D, 0x09, 0xF2, 0x2A, 0x9B, 0x0E, 0x59, 0x03, 0xB4, 0x19, 0xEC, 0xBE, 0xB2, 0x25, 0x3B, 0x72, 0xD3,
+    0xD7, 0x17, 0x03, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x27, 0x00, 0x40, 0xDF, 0x2D, 0xD9, 0xDA, 0xD0, 0x2B, 0x33, 0xC9,
+    0x1A, 0xA6, 0x43, 0x85, 0x1E, 0x05, 0x28, 0x5B, 0xAF, 0x9F, 0x2A, 0xEB, 0xE6, 0xCC, 0xCC, 0x4F, 0xEF, 0x01, 0x00,
+    0xF0, 0xE1, 0x03, 0x00, 0xDC, 0x18, 0x3D, 0x3D, 0x3A, 0x21, 0x64, 0xAA, 0xA6, 0xB2, 0x55, 0x6B, 0xE6, 0x8B, 0x74,
+    0x9B, 0xB7, 0xDE, 0x8D, 0xFB, 0x16, 0x62, 0x27, 0x9B, 0xEC, 0x72, 0x59, 0x60, 0x5F, 0xF8, 0x40, 0xA6, 0xD9, 0xE7,
+    0xD5, 0xB3, 0x6F, 0xB0, 0x2A, 0x4D, 0x7A, 0xCB, 0xC8, 0x6C, 0x9D, 0x7F, 0xCA, 0x09, 0x00, 0x40, 0xC5, 0x52, 0xD0,
+    0x06, 0xC0, 0xD2, 0x15, 0xBD, 0xAC, 0xD0, 0x4B, 0x26, 0x7B, 0x10, 0x11, 0x71, 0x01, 0x4D, 0x80, 0x70, 0x6B, 0x46,
+    0x12, 0x08, 0x33, 0x46, 0x18, 0x71, 0xBD, 0x95, 0xCF, 0xB3, 0xC3, 0x5B, 0xD1, 0x69, 0x1E, 0xB9, 0xFB, 0x64, 0x1A,
+    0x8E, 0x08, 0x0B, 0x20, 0x40, 0x08, 0x10, 0xE0, 0x7B, 0xAB, 0xF3, 0xB0, 0x6E, 0xEC, 0xF3, 0xC8, 0xC8, 0xA1, 0xBE,
+    0x91, 0x64, 0xDD, 0x59, 0xB3, 0xBD, 0xE9, 0xD0, 0x37, 0x88, 0x1C, 0xF5, 0x01, 0x80, 0xC5, 0xFF, 0x67, 0x66, 0xBE,
+    0xC0, 0xDB, 0xAE, 0xFF, 0xF5, 0xBE, 0x78, 0xC3, 0xAD, 0x07, 0x3B, 0x18, 0x00, 0x00, 0x4F, 0xF5, 0xB0, 0xEF, 0xD7,
+    0xA4, 0x98, 0x34, 0x6F, 0x92, 0x3A, 0xD9, 0xB5, 0x84, 0x66, 0x5A, 0xDA, 0x0A, 0x80, 0x2A, 0x10, 0xE4, 0xE5, 0xC1,
+    0xFB, 0x00, 0x70, 0x8A, 0x93, 0x7B, 0x00, 0x00, 0x37, 0x3F, 0xB2, 0xC0, 0x9F, 0xB0, 0x1B, 0xDE, 0x01, 0x00, 0xF4,
+    0x0E, 0xFF, 0xF9, 0xEF, 0xBB, 0x88, 0x63, 0x7F, 0x02, 0x91, 0x50, 0xEF, 0x6F, 0x00, 0xC0, 0xD6, 0x21, 0x97, 0x03,
+    0x7D, 0x08, 0x00, 0x70, 0xFF, 0x39, 0x74, 0x4A, 0x38, 0xA2, 0xB7, 0xFC, 0x43, 0x80, 0x13, 0xC1, 0x83, 0x5D, 0xF3,
+    0x8A, 0x0A, 0x20, 0x9C, 0x30, 0x41, 0xE4, 0xAF, 0x0A, 0x74, 0x02, 0x76, 0x97, 0xEF, 0x5E, 0x8C, 0x83, 0xB8, 0x03,
+    0x0D, 0xFC, 0x19, 0x00, 0x00, 0x00, 0x30, 0xA8, 0xC2, 0x5B, 0x94, 0x10, 0xAF, 0xF7, 0x73, 0x58, 0x0D, 0x29, 0x6D,
+    0x00, 0x00, 0x2B, 0xEB, 0x1D, 0xFC, 0x17, 0xF4, 0x1B, 0x2F, 0xF4, 0x04, 0x00, 0xEC, 0xBB, 0x00, 0x7E, 0xC1, 0xE7,
+    0xF3, 0x20, 0x00, 0x3F, 0xE1, 0x7D, 0xD8, 0x85, 0x9C, 0x0B, 0xB8, 0x42, 0x14, 0x74, 0xB8, 0x8E, 0x85, 0x88, 0x56,
+    0x8D, 0xAC, 0x14, 0x91, 0x92, 0x88, 0x41, 0x1A, 0x23, 0x04, 0x3A, 0x9A, 0x94, 0x24, 0x53, 0x22, 0x49, 0x2B, 0xC2,
+    0x29, 0x49, 0x5F, 0x8D, 0x10, 0x22, 0x40, 0xF4, 0xF9, 0x7A, 0x0B, 0xC1, 0x39, 0xC1, 0x12, 0x6E, 0xB4, 0xD6, 0x92,
+    0x75, 0x0C, 0x0E, 0xA8, 0x74, 0x89, 0xEC, 0xBA, 0x86, 0x74, 0xC5, 0x08, 0x0B, 0x90, 0x04, 0xEA, 0x8D, 0x8C, 0x84,
+    0x0A, 0x04, 0xA0, 0x29, 0x80, 0xAF, 0x96, 0x18, 0x10, 0xC2, 0xD5, 0xCB, 0xF2, 0x20, 0xA1, 0x02, 0x11, 0x00, 0x57,
+    0x00, 0x00, 0x80, 0x10, 0x42, 0x40, 0x27, 0x18, 0x01, 0x00, 0x92, 0x63, 0x9A, 0x50, 0x00, 0x41, 0x28, 0x90, 0x52,
+    0x04, 0x9A, 0x28, 0x08, 0x9A, 0x90, 0x94, 0x51, 0x02, 0x9A, 0x90, 0xC6, 0x00, 0x09, 0x21, 0x00, 0x81, 0xA2, 0x0C,
+    0x42, 0x32, 0x14, 0x49, 0x68, 0x8A, 0xAC, 0xFE, 0x14, 0x00, 0xF0, 0x67, 0x04, 0xE6, 0x0F, 0x00, 0x40, 0xD6, 0x1B,
+    0xD2, 0x45, 0xC1, 0x40, 0x41, 0xF5, 0x40, 0x15, 0xB0, 0x82, 0xA8, 0x07, 0x00, 0x34, 0x24, 0x68, 0xA5, 0x25, 0x26,
+    0x00, 0xF6, 0x94, 0x51, 0x14, 0x0F, 0x35, 0x26, 0x33, 0xF4, 0x2A, 0x12, 0xB2, 0x8A, 0xE4, 0x58, 0x3D, 0x96, 0x24,
+    0x05, 0x28, 0x01, 0xB4, 0x18, 0x65, 0xA6, 0xAA, 0x9A, 0xA5, 0x01, 0x4A, 0x00, 0x24, 0xCD, 0x2C, 0xBF, 0x88, 0x98,
+    0x82, 0x80, 0x31, 0x06, 0xE0, 0xC0, 0x83, 0x00, 0x00, 0xFC, 0x2E, 0x00, 0xB0, 0x55, 0x33, 0x65, 0x02, 0x00, 0xB0,
+    0x00, 0x00, 0x98, 0x73, 0xC1, 0xA0, 0x12, 0x13, 0xD1, 0xB4, 0x05, 0x20, 0x00, 0x66, 0x37, 0xD1, 0xE4, 0x29, 0x29,
+    0x6E, 0x49, 0xF1, 0x8C, 0x09, 0x2A, 0x0D, 0x00, 0x00, 0x4A, 0x44, 0x1A, 0x20, 0x6E, 0x2B, 0x2A, 0xA1, 0x13, 0x60,
+    0x68, 0xC6, 0x05, 0x00, 0xA4, 0x39, 0x29, 0xFC, 0x83, 0x06, 0xA4, 0x48, 0x70, 0xFE, 0xD2, 0x9E, 0x2A, 0x89, 0x3E,
+    0x4F, 0xA7, 0x52, 0x50, 0x9B, 0xD4, 0x15, 0xBB, 0xFA, 0x19, 0x90, 0x4D, 0x0D, 0xFD, 0x5C, 0xB7, 0x0A, 0x4B, 0x62,
+    0xBF, 0x4C, 0xC2, 0x5A, 0x43, 0x15, 0xD8, 0x04, 0xA0, 0x73, 0x19, 0x64, 0x84, 0xE9, 0x42, 0xCF, 0x48, 0x82, 0xDD,
+    0xCA, 0x54, 0x05, 0xA3, 0x1B, 0x3C, 0x8E, 0x70, 0xD4, 0x9C, 0x86, 0x43, 0x74, 0x1E, 0x79, 0x9A, 0x4E, 0xA8, 0xE9,
+    0x8C, 0xCA, 0xE7, 0xA8, 0x29, 0xA9, 0x43, 0x4E, 0xEE, 0x2B, 0xBD, 0x37, 0x2F, 0x0B, 0x19, 0x81, 0x97, 0x50, 0x29,
+    0xED, 0xCC, 0xA4, 0xC7, 0x4B, 0xAA, 0x95, 0xED, 0x1B, 0x15, 0x6E, 0x98, 0x2D, 0x52, 0xD0, 0x67, 0x62, 0x5E, 0xAA,
+    0x15, 0x42, 0x51, 0x3A, 0x9B, 0x26, 0xED, 0x6F, 0xE9, 0x84, 0x12, 0x80, 0xD7, 0x7A, 0xDA, 0xE9, 0x7C, 0x32, 0xC5,
+    0x4F, 0xAB, 0xD4, 0x34, 0x19, 0x1D, 0xB2, 0x9E, 0xB1, 0x1C, 0xCF, 0xF9, 0x52, 0x8A, 0x82, 0x2B, 0x40, 0x7E, 0x7F,
+    0xEA, 0x24, 0xB9, 0x00, 0x6B, 0xFB, 0x8C, 0x77, 0xAB, 0x5B, 0x28, 0xA9, 0x5F, 0x73, 0xC0, 0x13, 0xCE, 0x5A, 0x2B,
+    0xA6, 0x42, 0xE5, 0x85, 0xF1, 0x79, 0x59, 0x95, 0xD8, 0x8A, 0x84, 0x21, 0x39, 0xAD, 0x95, 0xAB, 0x26, 0x57, 0xC6,
+    0x05, 0x84, 0xD0, 0x09, 0xD5, 0x44, 0xED, 0xA6, 0x9C, 0x8A, 0x76, 0x34, 0x45, 0xAE, 0x64, 0x97, 0xC8, 0xAF, 0xAB,
+    0x58, 0xB5, 0x3D, 0x6F, 0x5E, 0x60, 0x4F, 0x25, 0x4F, 0xFE, 0x15, 0x49, 0xCE, 0x26, 0x49, 0x5D, 0x89, 0x6D, 0x06,
+    0xBF, 0x9F, 0xBA, 0xD4, 0x8A, 0x33, 0xAF, 0x85, 0x54, 0x57, 0x6B, 0x14, 0x7B, 0x1E, 0xFC, 0x14, 0x59, 0x32, 0x32,
+    0xF8, 0xE8, 0x9A, 0x67, 0x98, 0x2F, 0x8A, 0x9F, 0x3D, 0x69, 0x9B, 0xB6, 0x3A, 0xB9, 0x34, 0x74, 0x4E, 0xBD, 0x90,
+    0xBF, 0xFB, 0xD0, 0x1B, 0x00, 0x40, 0x72, 0x3C, 0x6E, 0x36, 0xE9, 0xDA, 0x7C, 0x92, 0x31, 0x8E, 0x93, 0x19, 0xFB,
+    0x01, 0x00, 0x7A, 0x9F, 0x85, 0x27, 0x67, 0x7F, 0x19, 0x74, 0x76, 0x61, 0x0C, 0xEA, 0x05, 0x76, 0x84, 0x8C, 0x24,
+    0xEA, 0x73, 0x88, 0xA5, 0x0E, 0xFB, 0x47, 0x1F, 0xEF, 0xAF, 0xEF, 0x9C, 0xB4, 0x0B, 0x57, 0x16, 0xC1, 0x16, 0xC8,
+    0x08, 0x35, 0xE1, 0xCA, 0x8E, 0x1D, 0x61, 0x69, 0x3A, 0x45, 0xD1, 0xD8, 0x33, 0x2A, 0x45, 0x08, 0xD9, 0xD4, 0x59,
+    0x6F, 0xFB, 0x54, 0x99, 0x84, 0xDE, 0x00, 0x00, 0x62, 0x03, 0x00, 0x44, 0x26, 0x82, 0x20, 0x7F, 0x63, 0xBE, 0xF0,
+    0x7E, 0xC0, 0xBF, 0x35, 0x49, 0x4D, 0x0F, 0x79, 0x35, 0xC5, 0x0A, 0x51, 0xE7, 0x91, 0xA3, 0x07, 0x7A, 0x65, 0x43,
+    0xFA, 0xC1, 0x45, 0x97, 0x85, 0x6D, 0xB2, 0xE3, 0x77, 0x52, 0x5B, 0xDE, 0x1B, 0xEC, 0xAD, 0x00, 0x00, 0x7A, 0x9E,
+    0xA2, 0x47, 0x56, 0xBD, 0xFF, 0xC8, 0xBB, 0x8A, 0xEC, 0x76, 0xDE, 0xFF, 0xEB, 0x20, 0x76, 0xAF, 0xD5, 0xE9, 0x59,
+    0x5B, 0xD7, 0xCA, 0xC9, 0x16, 0x6C, 0xF1, 0x04, 0xD1, 0x85, 0x41, 0x88, 0x08, 0xC8, 0x7E, 0x36, 0xDD, 0xFB, 0xF2,
+    0x2F, 0x45, 0x54, 0xB7, 0xF1, 0xEC, 0x39, 0xA0, 0xBE, 0x8A, 0x5A, 0xB4, 0x7D, 0xD3, 0xEB, 0x27, 0x6F, 0x07, 0x00,
+    0x40, 0x79, 0x22, 0xC0, 0xDE, 0x54, 0x47, 0xE0, 0x5F, 0x5B, 0x7F, 0x20, 0x67, 0xEE, 0xA9, 0x50, 0x7A, 0xEC, 0xD3,
+    0xC9, 0x2E, 0x22, 0x6E, 0x70, 0x6A, 0xE0, 0xCA, 0xB9, 0x4F, 0x63, 0x27, 0x3F, 0x2E, 0x5F, 0xB7, 0x6D, 0x6F, 0xAD,
+    0xB0, 0xB3, 0xAD, 0x34, 0x53, 0x28, 0x65, 0xD9, 0x59, 0x2D, 0xCA, 0xAC, 0x32, 0x23, 0x22, 0xA5, 0xFA, 0x55, 0x56,
+    0xB4, 0x88, 0xA3, 0x2E, 0x32, 0x35, 0xB5, 0x77, 0xCA, 0x51, 0xDD, 0xCA, 0x2F, 0x5D, 0xC5, 0xB4, 0x2E, 0x3D, 0x25,
+    0xB9, 0xE5, 0x9B, 0x49, 0x56, 0xA6, 0x96, 0x9F, 0x32, 0xEB, 0x46, 0xED, 0xB5, 0xBD, 0xDE, 0x79, 0xCE, 0x3B, 0xF3,
+    0xD5, 0xE9, 0x5E, 0x13, 0xE8, 0xC5, 0x96, 0xA7, 0x65, 0x75, 0xAF, 0x23, 0x95, 0xA6, 0x0B, 0xEA, 0x07, 0x00, 0xB8,
+    0xCD, 0x2F, 0x6B, 0x89, 0x8B, 0x8E, 0xE4, 0x4F, 0xC8, 0x54, 0xFF, 0x52, 0xF7, 0xDC, 0xB2, 0xCF, 0xCA, 0x2B, 0xE8,
+    0x61, 0xCF, 0x80, 0x47, 0xE0, 0x29, 0x37, 0xD1, 0x53, 0x91, 0xB1, 0xCB, 0xD5, 0x5E, 0x99, 0xED, 0xB7, 0x0B, 0xEC,
+    0xC8, 0xF3, 0x7B, 0x6A, 0x3E, 0x79, 0xD1, 0xC3, 0xF2, 0x15, 0x75, 0xAD, 0x3E, 0x4C, 0x32, 0xD4, 0x05, 0xF7, 0xCC,
+    0xB7, 0x2A, 0x2C, 0x68, 0xA7, 0x8B, 0xD4, 0xAA, 0xB9, 0x82, 0x95, 0x95, 0x62, 0xA5, 0x44, 0x71, 0x86, 0x21, 0xA4,
+    0x27, 0x19, 0x65, 0x8C, 0x5F, 0x18, 0xD4, 0x28, 0x7E, 0x36, 0x55, 0x3E, 0x38, 0xF6, 0x76, 0xA9, 0x12, 0x18, 0x01,
+    0xA0, 0x3D, 0x05, 0x08, 0xFB, 0x76, 0xB3, 0xD5, 0x6B, 0xFD, 0xC1, 0xF4, 0x58, 0xD9, 0x67, 0xE5, 0xA9, 0x6E, 0x6E,
+    0xFB, 0xF9, 0x01, 0xC7, 0xAA, 0xDC, 0x3D, 0x34, 0xB4, 0x4A, 0x9E, 0x13, 0xAF, 0xD9, 0xD1, 0x5A, 0x5C, 0x90, 0x45,
+    0x3F, 0xB3, 0x5A, 0xE6, 0xBC, 0xF9, 0x09, 0xDF, 0xD2, 0x85, 0xEC, 0x8A, 0x9A, 0xDB, 0x43, 0xA5, 0x81, 0x66, 0x53,
+    0x24, 0x6F, 0xCA, 0x37, 0x75, 0x9D, 0x17, 0x9D, 0x25, 0xFB, 0xD3, 0xD8, 0x3B, 0x4D, 0xEE, 0x4D, 0x27, 0xBB, 0x82,
+    0x90, 0xD9, 0x97, 0xD5, 0x6D, 0x13, 0x7A, 0x0A, 0x29, 0xD2, 0x1F, 0x00, 0xAE, 0x0D, 0x64, 0xF5, 0xD1, 0xC7, 0x4D,
+    0x69, 0x9E, 0x92, 0xFC, 0x16, 0xF2, 0xE9, 0x22, 0xEB, 0x28, 0x17, 0x10, 0x00, 0x68, 0x9B, 0x5E, 0x8F, 0x37, 0xDF,
+    0x4D, 0x3D, 0x13, 0x00, 0xA8, 0xEC, 0x14, 0xB4, 0x9A, 0x84, 0x24, 0xA1, 0x16, 0xF5, 0x19, 0x50, 0xEC, 0x0C, 0xD8,
+    0xDB, 0xA9, 0x03, 0x19, 0x9B, 0x3D, 0x81, 0xFD, 0x36, 0x00, 0xF9, 0x41, 0x74, 0x80, 0x4E, 0x97, 0xB6, 0x1C, 0x86,
+    0xDE, 0x03, 0x00, 0x00, 0xD8, 0x2F, 0x00, 0xEC, 0xDF, 0x20, 0xBB, 0x48, 0x78, 0x40, 0xA8, 0x10, 0xF6, 0x05, 0x00,
+    0xA0, 0xEF, 0x03, 0x56, 0xF3, 0xD7, 0xE0, 0xAF, 0xC8, 0x43, 0xEF, 0xF1, 0x1F, 0xE8, 0x7D, 0x0E, 0xF9, 0x83, 0x00,
+    0x00, 0xE4, 0x17, 0x71, 0xDF, 0x83, 0x6C, 0xD9, 0x44, 0xAF, 0xF1, 0xC0, 0x0F, 0xD0, 0x6F, 0x24, 0x75, 0xFE, 0x12,
+    0x21, 0xFF, 0xF2, 0x7C, 0x42, 0xBD, 0x02, 0x16, 0xAA, 0x40, 0x0B, 0xC0, 0x9F, 0xD4, 0x0C, 0x80, 0x02, 0xF8, 0x60,
+    0x98, 0x00, 0x13, 0x00, 0x2D, 0x21, 0x4E, 0x37, 0x95, 0xE7, 0x4F, 0x58, 0x93, 0x5D, 0xBE, 0xE9, 0x2D, 0x75, 0xB8,
+    0x42, 0xC1, 0x86, 0x53, 0x19, 0x40, 0xD8, 0x62, 0x30, 0x00, 0x08, 0x30, 0x50, 0x01, 0x00, 0x06, 0x30, 0x02, 0x44,
+    0xA0, 0xC5, 0x06, 0x00, 0x08, 0xA4, 0x10, 0x62, 0x5D, 0x73, 0xD3, 0x0D, 0xA9, 0x98, 0x8A, 0x41, 0xB2, 0x59, 0x60,
+    0x5A, 0x6C, 0x1D, 0xB3, 0xFF, 0x6A, 0xC1, 0x8F, 0x3E, 0x4C, 0xC2, 0x05, 0x21, 0x10, 0x02, 0x00, 0x9D, 0x73, 0x41,
+    0x43, 0x8A, 0xF6, 0xE0, 0x58, 0x45, 0xC0, 0x01, 0x28, 0xCE, 0x9A, 0x06, 0x42, 0xA0, 0x1E, 0x00, 0x23, 0x6E, 0x9B,
+    0x92, 0xCA, 0x18, 0x05, 0x00, 0x98, 0x38, 0x5F, 0x3C, 0x69, 0x0A, 0x96, 0x00, 0x49, 0xF5, 0xA4, 0xE2, 0x44, 0x1F,
+    0x43, 0xFB, 0x6B, 0x3E, 0xF9, 0x91, 0x30, 0x22, 0x27, 0x92, 0x00, 0x08, 0x21, 0x44, 0x88, 0xAF, 0x68, 0x4B, 0xA1,
+    0x21, 0x04, 0x8A, 0x30, 0x08, 0xB1, 0x0C, 0x00, 0xA0, 0x4A, 0xBF, 0x18, 0x70, 0xE2, 0xA7, 0x1B, 0x50, 0x2C, 0x13,
+    0x00, 0x20, 0x40, 0x00, 0xF2, 0x17, 0x10, 0xE0, 0x19, 0x03, 0x02, 0x21, 0x84, 0x10, 0x08, 0x01, 0x28, 0x61, 0x84,
+    0x10, 0x42, 0x00, 0x32, 0xCD, 0x20, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x10, 0xC2, 0xA0, 0x93, 0x5F,
+    0x43, 0x52, 0xCB, 0x5C, 0x49, 0xD8, 0x0B, 0xAA, 0x70, 0x15, 0x53, 0x13, 0x18, 0x7C, 0x02, 0x54, 0x36, 0x61, 0x8C,
+    0x9A, 0xD1, 0x3C, 0x88, 0x4A, 0x2C, 0x00, 0x10, 0x92, 0x51, 0x04, 0x02, 0x81, 0x00, 0x4B, 0x60, 0x00, 0x45, 0x13,
+    0x96, 0x30, 0xF2, 0x41, 0xE6, 0x3F, 0x2A, 0x9C, 0xF0, 0x1A, 0x47, 0xE5, 0xDD, 0x47, 0x06, 0xD0, 0xC0, 0x63, 0x64,
+    0x6A, 0x5B, 0x66, 0x62, 0x29, 0x5D, 0x40, 0x33, 0xA4, 0x0E, 0x2D, 0x4B, 0xAC, 0x06, 0xA8, 0xA4, 0xC1, 0x80, 0x40,
+    0x08, 0x21, 0xD0, 0x5F, 0x01, 0x00, 0x91, 0x0B, 0x7B, 0x95, 0xA9, 0xC6, 0x7E, 0xF8, 0x6B, 0xFE, 0x16, 0x64, 0xDF,
+    0xD3, 0x2F, 0x3D, 0x66, 0xF7, 0xD6, 0x5A, 0x55, 0x95, 0x5C, 0xEB, 0x57, 0x9A, 0x6D, 0x56, 0xB9, 0x4F, 0xEA, 0xB6,
+    0xAE, 0x2A, 0x77, 0x82, 0xBF, 0xBF, 0x80, 0xF2, 0x14, 0x6E, 0x6A, 0x09, 0x2B, 0x2C, 0xFE, 0x34, 0xF7, 0x71, 0xCE,
+    0x4D, 0xB6, 0x8C, 0x91, 0xA6, 0xA5, 0x0C, 0x00, 0x00, 0x08, 0x6C, 0x00, 0x80, 0x24, 0x1B, 0xBE, 0x3D, 0xFB, 0x80,
+    0x3C, 0x2F, 0x7F, 0x48, 0x58, 0x78, 0x04, 0x90, 0x4C, 0x59, 0x42, 0x3E, 0x62, 0x62, 0xCC, 0x5C, 0x4A, 0xBF, 0x63,
+    0x4A, 0x69, 0xD3, 0xFB, 0xE6, 0x68, 0xD8, 0xB7, 0xF4, 0x7D, 0x4D, 0xF7, 0x79, 0x03, 0x9D, 0x2D, 0x30, 0xA8, 0x97,
+    0xA7, 0x03, 0x00, 0x34, 0xAF, 0xBF, 0x23, 0x42, 0x2D, 0x0C, 0x44, 0x10, 0x0C, 0x22, 0x80, 0x10, 0x88, 0x4E, 0x66,
+    0x64, 0x92, 0xF4, 0xE4, 0x37, 0xFB, 0xB6, 0xE7, 0x5E, 0xAB, 0x16, 0x5B, 0x71, 0x0E, 0x00, 0x2A, 0x35, 0x39, 0x03,
+    0x78, 0xE4, 0x35, 0x95, 0x2E, 0x36, 0x00, 0x4D, 0x4E, 0x2F, 0x5C, 0x74, 0xA4, 0xC0, 0x33, 0x3B, 0x3D, 0xBA, 0xF4,
+    0xA9, 0xE5, 0x10, 0x65, 0xD3, 0xB5, 0xC9, 0xEC, 0xCC, 0xC4, 0x69, 0xEA, 0x11, 0xB7, 0x04, 0x17, 0x20, 0x1D, 0x44,
+    0x4E, 0xF8, 0x4F, 0x64, 0xB2, 0xFD, 0xC4, 0xF9, 0x79, 0x5C, 0x7B, 0xC2, 0x7B, 0x01, 0x00, 0xD2, 0x1B, 0x00, 0x58,
+    0x4E, 0xD4, 0x61, 0xFF, 0x08, 0x40, 0xD6, 0x41, 0x64, 0x21, 0xB5, 0x2C, 0xF5, 0x91, 0x0A, 0xE9, 0x66, 0xB2, 0x56,
+    0x7D, 0xAA, 0x8E, 0x41, 0xF4, 0x0E, 0x00, 0xD0, 0x0D, 0xB2, 0xB2, 0x1B, 0x8C, 0x00, 0x00, 0x2B, 0x88, 0x88, 0x00,
+    0x80, 0x08, 0x00, 0x10, 0x01, 0xEA, 0x04, 0x00, 0x10, 0x42, 0xAF, 0xBA, 0xC7, 0xCD, 0x23, 0x82, 0x48, 0x0B, 0x3D,
+    0xA5, 0xFF, 0x2D, 0xBC, 0x14, 0x3A, 0xB8, 0xD1, 0xC6, 0xD6, 0xA6, 0x00, 0x00, 0x1B, 0x7E, 0x2A, 0xA1, 0xC9, 0x53,
+    0xB3, 0x81, 0xEB, 0x93, 0xB0, 0x95, 0x82, 0x2E, 0x26, 0x0B, 0x6C, 0x76, 0x7D, 0x56, 0xCA, 0x09, 0x99, 0xAC, 0x64,
+    0x37, 0xAD, 0x01, 0xA0, 0xAD, 0x47, 0x29, 0x9E, 0x79, 0x3C, 0x01, 0x7E, 0x7B, 0x4F, 0x94, 0x28, 0x46, 0x48, 0xAE,
+    0x57, 0x2F, 0x83, 0x40, 0x40, 0x09, 0xD0, 0xBC, 0xA7, 0xAE, 0xDF, 0x9B, 0x69, 0xBF, 0x58, 0xB5, 0x7D, 0x60, 0x9F,
+    0x0E, 0x99, 0x7B, 0x61, 0x0F, 0xEF, 0xAF, 0x03, 0xD4, 0xEC, 0x81, 0x11, 0x48, 0xC2, 0x08, 0x40, 0x00, 0x02, 0x21,
+    0xC0, 0x91, 0x9F, 0xCA, 0x99, 0xA7, 0xBE, 0xA8, 0x0D, 0x28, 0x59, 0x0C, 0x6A, 0x30, 0x9D, 0x4F, 0x00, 0xD8, 0xAB,
+    0xCC, 0x63, 0x50, 0xD9, 0x07, 0x58, 0x60, 0x9A, 0x9C, 0x61, 0x10, 0x81, 0x0A, 0xA0, 0xD9, 0x0C, 0x00, 0x60, 0x85,
+    0xCD, 0xDD, 0x76, 0xED, 0x17, 0x52, 0x5E, 0xE4, 0x9E, 0xF7, 0x55, 0x86, 0x2C, 0x00, 0xD4, 0xA5, 0x75, 0xC2, 0x1C,
+    0xC5, 0xCA, 0x99, 0x55, 0xFF, 0x9D, 0xF4, 0x8A, 0xB8, 0x09, 0x5C, 0x0D, 0x6F, 0xF8, 0xC3, 0xF8, 0x38, 0xBD, 0x75,
+    0xC8, 0xF7, 0xD3, 0x04, 0xBC, 0x6F, 0xF5, 0x97, 0x00, 0x80, 0x64, 0xCB, 0x92, 0x09, 0x00, 0x99, 0x57, 0x99, 0xC8,
+    0x14, 0xF5, 0xF1, 0xE4, 0xF3, 0xCA, 0x16, 0x03, 0x08, 0xC4, 0x3B, 0xA1, 0x36, 0x08, 0x15, 0x02, 0x00, 0x20, 0x2F,
+    0xF3, 0xB9, 0x4C, 0x09, 0x26, 0x52, 0x20, 0x96, 0x99, 0x33, 0x13, 0x29, 0x4C, 0x48, 0xDF, 0x90, 0x2D, 0xEA, 0x82,
+    0x26, 0x94, 0x99, 0x8B, 0x73, 0x42, 0x8A, 0x98, 0x92, 0xD0, 0x7C, 0x31, 0x37, 0xA2, 0xD7, 0x4D, 0x37, 0x3B, 0xDA,
+    0xCA, 0x2A, 0x0D, 0x04, 0x00, 0x93, 0xDA, 0x82, 0x8E, 0xE8, 0xE2, 0x31, 0x92, 0xC8, 0x06, 0x08, 0x37, 0x0F, 0x00,
+    0xB0, 0x6D, 0x9C, 0x70, 0x9B, 0xE4, 0x3E, 0x73, 0x63, 0xA5, 0x10, 0xC6, 0x2B, 0x44, 0x4A, 0x0D, 0x71, 0xA5, 0x4F,
+    0xB2, 0xC6, 0xA8, 0x56, 0x3E, 0xFC, 0x42, 0x75, 0x47, 0xB8, 0x21, 0xD2, 0x06, 0x12, 0xBA, 0x54, 0x8D, 0x26, 0xA6,
+    0x3E, 0x69, 0x01, 0x08, 0x77, 0x5B, 0xC3, 0x15, 0x8F, 0xB8, 0x91, 0x9E, 0x0B, 0xE0, 0x00, 0x6C, 0x05, 0x00, 0x31,
+    0x09, 0x29, 0xA2, 0xAD, 0x43, 0xE2, 0x01, 0x80, 0x02, 0x00, 0x68, 0xFA, 0xE5, 0x5E, 0x42, 0x6C, 0xB6, 0x21, 0xC5,
+    0x05, 0x28, 0x3D, 0x43, 0xFF, 0x5C, 0xD3, 0xC1, 0x12, 0x51, 0xC9, 0xDD, 0x56, 0x95, 0x66, 0x77, 0x51, 0x5B, 0x43,
+    0x64, 0x32, 0xC8, 0x09, 0xD3, 0x45, 0x6E, 0xBB, 0x57, 0xEB, 0x3E, 0xA0, 0x4B, 0x91, 0xD4, 0x04, 0x8A, 0x51, 0x84,
+    0x8C, 0x32, 0xAE, 0x29, 0xC9, 0x20, 0x40, 0x08, 0x41, 0x88, 0x01, 0x00, 0x10, 0x65, 0xA2, 0x44, 0x84, 0xF0, 0x66,
+    0x9F, 0x37, 0xF5, 0x1D, 0x58, 0xCD, 0x88, 0x80, 0x5C, 0xEF, 0x13, 0x78, 0x00, 0xF9, 0x46, 0xB7, 0x8C, 0xD2, 0x53,
+    0x4D, 0xCB, 0xD0, 0xB2, 0x4D, 0x2E, 0x24, 0x40, 0x41, 0xC8, 0x80, 0x5C, 0x65, 0x35, 0x17, 0x8D, 0x2D, 0xD0, 0x64,
+    0xB9, 0x39, 0xC9, 0xA7, 0x20, 0x30, 0xC2, 0x4B, 0x06, 0x03, 0xFD, 0x54, 0x5F, 0xBB, 0x8E, 0xC9, 0x3B, 0x97, 0xEC,
+    0x59, 0x92, 0x09, 0x0D, 0xBC, 0xBC, 0x80, 0xCA, 0x4C, 0x4E, 0x7F, 0xBC, 0x6E, 0x5E, 0x2E, 0x69, 0xFE, 0x8D, 0xD3,
+    0x6A, 0x1E, 0x40, 0x48, 0x76, 0x12, 0xAF, 0x0F, 0x35, 0x91, 0xC4, 0xC0, 0xB5, 0x40, 0xA6, 0x81, 0xD0, 0xCB, 0xAA,
+    0x07, 0x00, 0x68, 0x15, 0x4A, 0x4A, 0xF8, 0xB5, 0x73, 0x34, 0x00, 0x21, 0xD0, 0xBC, 0x49, 0x5A, 0x1A, 0x00, 0x03,
+    0x48, 0x93, 0xDF, 0xC4, 0x00, 0x4A, 0x33, 0x93, 0x41, 0xF2, 0x5D, 0x56, 0x02, 0x00, 0x0C, 0x16, 0x16, 0x8A, 0xBC,
+    0x1D, 0x5F, 0x42, 0x3D, 0x00, 0x46, 0x2C, 0xDC, 0x19, 0x80, 0x33, 0x13, 0xC4, 0x3C, 0x86, 0x27, 0xB6, 0x78, 0x65,
+    0x5D, 0xF4, 0x17, 0xDD, 0x66, 0x29, 0xBB, 0xCB, 0xF8, 0x74, 0x3E, 0x03, 0xB2, 0xD5, 0x5E, 0x1D, 0x9B, 0xEE, 0xEF,
+    0xC5, 0x53, 0x15, 0x22, 0x66, 0x96, 0x32, 0x26, 0x62, 0xC4, 0x72, 0x24, 0x5C, 0x45, 0x84, 0xB1, 0xE6, 0x24, 0xA4,
+    0x24, 0x24, 0xC7, 0x24, 0x49, 0x94, 0xD0, 0x52, 0xD2, 0x5A, 0x34, 0xD1, 0x30, 0xA5, 0xE1, 0x2D, 0x40, 0x71, 0x44,
+    0x0A, 0xC8, 0x89, 0xA8, 0x8D, 0xDD, 0x02, 0x74, 0x38, 0x1C, 0xAE, 0x48, 0xA8, 0x84, 0xD0, 0x35, 0x14, 0xF9, 0x03,
+    0x00, 0x38, 0x8A, 0x4A, 0xA0, 0xDE, 0xC1, 0xAD, 0xA1, 0xE8, 0x10, 0xC2, 0x51, 0xBA, 0x03, 0xDA, 0x69, 0x41, 0x04,
+    0x7A, 0x8D, 0x11, 0x02, 0x9C, 0x05, 0x00, 0x88, 0x03, 0x40, 0xDA, 0x12, 0x34, 0x00, 0xC8, 0x45, 0xB3, 0x96, 0x36,
+    0x48, 0x71, 0xD1, 0x5A, 0xC0, 0x0D, 0x13, 0xA0, 0x95, 0xBC, 0x05, 0xD8, 0xAD, 0xEA, 0x2C, 0x40, 0xF4, 0x29, 0x57,
+    0x09, 0xAE, 0x83, 0x2A, 0x90, 0x17, 0x46, 0x02, 0x03, 0xC3, 0x0C, 0x22, 0x05, 0x52, 0x32, 0x41, 0x84, 0x10, 0x08,
+    0x00, 0x29, 0x88, 0x00, 0xC9, 0xEE, 0xAE, 0xCA, 0x12, 0x42, 0xD1, 0x02, 0x49, 0x9A, 0x90, 0x10, 0x29, 0x26, 0x0C,
+    0x33, 0xCC, 0x10, 0x93, 0xAC, 0x52, 0xA2, 0x04, 0xE5, 0x2B, 0xA9, 0x88, 0x3C, 0x91, 0x52, 0x44, 0x28, 0x8E, 0x22,
+    0x89, 0x14, 0x73, 0x86, 0x08, 0x25, 0x9C, 0x12, 0x60, 0x19, 0x02, 0x14, 0x69, 0xC7, 0x2A, 0xF7, 0x68, 0x12, 0x20,
+    0x04, 0x2A, 0x24, 0x57, 0x29, 0x9A, 0x50, 0x84, 0x48, 0x01, 0xB8, 0x02, 0xA4, 0x56, 0x4C, 0x02, 0x94, 0x28, 0x41,
+    0x15, 0x21, 0x44, 0xA4, 0x62, 0x40, 0x13, 0x7A, 0x6E, 0xA0, 0x04, 0x3D, 0x84, 0x96, 0x98, 0x5D, 0x01, 0xFB, 0x05,
+    0x9C, 0xD5, 0x30, 0x11, 0x02, 0x52, 0x17, 0x70, 0x04, 0x57, 0x31, 0xDE, 0x62, 0x02, 0xD9, 0x0E, 0xC6, 0x10, 0x8F,
+    0x12, 0x81, 0x2B, 0x84, 0x26, 0x19, 0x31, 0x33, 0x00, 0x42, 0x08, 0xC4, 0x0C, 0x00, 0x86, 0x10, 0x21, 0x98, 0x18,
+    0x41, 0x20, 0x02, 0x21, 0x10, 0x75, 0xA3, 0x08, 0xA5, 0x18, 0xC4, 0x18, 0x30, 0x02, 0x63, 0x46, 0xC0, 0x50, 0x91,
+    0xA6, 0x14, 0xC0, 0x48, 0x4C, 0x51, 0x7C, 0xC2, 0x17, 0x2B, 0x14, 0x39, 0x55, 0x8A, 0x11, 0x5F, 0xAA, 0x02, 0xCD,
+    0x05, 0xED, 0x00, 0x00, 0x31, 0xC5, 0x7B, 0x43, 0xD7, 0xC6, 0x1B, 0xC2, 0x59, 0xF7, 0xA7, 0x60, 0x59, 0x63, 0xA9,
+    0x75, 0x20, 0xB5, 0xC0, 0x6F, 0x3A, 0x09, 0x21, 0x2C, 0x33, 0x62, 0x0C, 0x80, 0x50, 0x25, 0x31, 0x12, 0x52, 0x20,
+    0x4D, 0x4C, 0x40, 0xD4, 0x37, 0xFB, 0x43, 0x69, 0x91, 0x22, 0xB3, 0x6A, 0xC1, 0xCD, 0xD4, 0x3F, 0xC2, 0x52, 0xDA,
+    0x2A, 0x07, 0x17, 0x6B, 0xD0, 0x02, 0xAE, 0x60, 0x80, 0xE2, 0x18, 0x91, 0xF5, 0x47, 0x69, 0xB4, 0xA0, 0x6B, 0x61,
+    0x8A, 0x88, 0x12, 0xC4, 0x66, 0x1C, 0x65, 0x08, 0xC4, 0x8C, 0xEC, 0xD5, 0x96, 0xED, 0x29, 0x7B, 0xFF, 0x48, 0xAD,
+    0x7A, 0x08, 0xD7, 0x2D, 0x6F, 0x4B, 0x07, 0x00, 0x80, 0xA2, 0x45, 0xAA, 0x57, 0x00, 0x00, 0xF8, 0x10, 0x84, 0x4C,
+    0x9E, 0x34, 0x29, 0xA7, 0x08, 0x57, 0x31, 0x9B, 0x15, 0x4B, 0x51, 0xA4, 0x41, 0x32, 0x18, 0x21, 0x09, 0x50, 0x04,
+    0xA8, 0x1F, 0x46, 0xD2, 0x40, 0x4B, 0xAB, 0x4D, 0x88, 0x06, 0x00, 0x4C, 0x53, 0xBF, 0x00, 0x6F, 0x49, 0xB3, 0x60,
+    0x69, 0x18, 0x13, 0xA8, 0x0F, 0xAD, 0xE4, 0xBB, 0x53, 0x17, 0x6D, 0x6A, 0xAD, 0x0A, 0x75, 0x06, 0xCC, 0xCA, 0x95,
+    0xC4, 0x86, 0xE8, 0x24, 0xAA, 0xE3, 0x0A, 0x33, 0xF5, 0x11, 0x00, 0x58, 0x15, 0x06, 0x00, 0x90, 0xB3, 0x2F, 0x41,
+    0x9D, 0x24, 0x79, 0xAC, 0x24, 0x4F, 0xE9, 0xE5, 0x46, 0xBA, 0x32, 0xA7, 0x52, 0x14, 0x97, 0x02, 0xB2, 0x24, 0xED,
+    0x6A, 0x91, 0x8C, 0x56, 0xF2, 0xB6, 0x54, 0x69, 0x07, 0x78, 0xDA, 0xD5, 0xA9, 0xAA, 0x5C, 0x54, 0x77, 0xBE, 0xEF,
+    0x39, 0x99, 0xBD, 0x74, 0xDB, 0x91, 0xC4, 0xE6, 0xF5, 0xC8, 0xD8, 0x10, 0x0A, 0x5F, 0xA0, 0x08, 0x00, 0xC0, 0xD3,
+    0xBA, 0x4C, 0x4A, 0x35, 0x6D, 0x22, 0xDD, 0xED, 0x6C, 0xED, 0x0B, 0x5A, 0xEE, 0xD0, 0x6A, 0xA3, 0xB9, 0x83, 0xA4,
+    0x08, 0x00, 0xFD, 0x08, 0x84, 0x10, 0x02, 0x44, 0xE6, 0xDC, 0xA1, 0x37, 0x98, 0x21, 0xC4, 0x16, 0x8F, 0xCB, 0xE0,
+    0xBD, 0x59, 0x06, 0xC2, 0xE3, 0x49, 0x77, 0xF7, 0xF9, 0x07, 0x00, 0x42, 0xA1, 0xF6, 0x03, 0x23, 0xA1, 0x16, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB6, 0x1E, 0xB5, 0xF6, 0x1B, 0x43, 0x29, 0x93, 0x8A, 0x8A, 0x2A, 0xFF,
+    0xD4, 0xE6, 0x6A, 0x19, 0x3B, 0x52, 0x5E, 0x1F, 0x8B, 0x4C, 0xB6, 0x27, 0xBC, 0x2B, 0x4E, 0xA6, 0x60, 0x05, 0x26,
+    0x22, 0xCB, 0xCE, 0x5B, 0xF6, 0x2C, 0x00, 0x18, 0xD4, 0xF6, 0x96, 0x5B, 0x05, 0x91, 0xF3, 0x92, 0xAF, 0xAF, 0xF9,
+    0xBD, 0xC9, 0xA9, 0xDB, 0x1F, 0x20, 0xC3, 0xEA, 0x47, 0xA0, 0xD9, 0xF2, 0xBC, 0x65, 0x2B, 0xCF, 0x6A, 0x22, 0x05,
+    0x63, 0x42, 0xA4, 0xBD, 0xA3, 0x52, 0x43, 0x02, 0x00, 0x44, 0x27, 0x2B, 0xEB, 0x02, 0xE3, 0x27, 0x30, 0xCC, 0x13,
+    0x60, 0xE7, 0xEB, 0xB1, 0x4C, 0xA1, 0x7F, 0x08, 0x7E, 0xBE, 0xCE, 0x52, 0x78, 0x7C, 0x80, 0x51, 0xA3, 0x78, 0x27,
+    0x41, 0x4E, 0x1D, 0xDE, 0x55, 0x1F, 0x00, 0x48, 0xAA, 0x24, 0x21, 0xA9, 0xF7, 0xC3, 0x23, 0x4B, 0x36, 0x90, 0x2D,
+    0xE5, 0x90, 0xB3, 0xF1, 0x80, 0xFA, 0x40, 0xC3, 0xB5, 0x7C, 0x3B, 0x00, 0x00, 0x78, 0xC9, 0x38, 0xDE, 0x0D, 0x10,
+    0x55, 0x8F, 0x91, 0x03, 0xC0, 0xA6, 0x94, 0x7C, 0x01, 0x00, 0x00, 0xD4, 0xE3, 0x00, 0x24, 0x7B, 0xCD, 0x73, 0xD5,
+    0xBD, 0x37, 0x5C, 0xF7, 0x25, 0xF3, 0xF8, 0x91, 0x6A, 0xE3, 0x95, 0x68, 0x21, 0x01, 0x9B, 0x26, 0x9F, 0x62, 0x42,
+    0x66, 0x4B, 0x6B, 0x46, 0xA6, 0x11, 0x1D, 0x72, 0x0A, 0x36, 0xA7, 0xDB, 0xEA, 0xF8, 0x7A, 0x75, 0x4A, 0x76, 0x00,
+    0x00, 0x00, 0x40, 0x9F, 0x20, 0x00, 0x17, 0x2F, 0x17, 0x30, 0x00, 0xAE, 0xF0, 0xA6, 0x43, 0xD8, 0xB1, 0xB7, 0x44,
+    0x2D, 0x2A, 0x03, 0x42, 0x80, 0x22, 0x41, 0x48, 0x28, 0xA8, 0x09, 0x17, 0xFC, 0x11, 0xA0, 0xF8, 0xBC, 0x00, 0x00,
+    0xD8, 0x17, 0x93, 0xB5, 0xC5, 0x5E, 0x7D, 0x91, 0xF7, 0x60, 0xF8, 0xF4, 0xDB, 0x8A, 0x64, 0xED, 0xFA, 0x1B, 0x00,
+    0xDB, 0x6E, 0x4E, 0xE8, 0x10, 0x38, 0x6C, 0xA2, 0x6A, 0xD9, 0x4E, 0x6F, 0x70, 0xBD, 0x04, 0x80, 0x3A, 0x61, 0x74,
+    0x62, 0x65, 0xE3, 0xBF, 0x8C, 0xED, 0xF9, 0xD5, 0xCE, 0x5D, 0x63, 0x4F, 0x3E, 0xF2, 0x45, 0x1F, 0xDA, 0x08, 0xF9,
+    0xE5, 0x7D, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x42, 0x00, 0x20, 0x20, 0x02, 0x00, 0x00, 0x00, 0x10, 0x01,
+    0x00, 0x11, 0x88, 0x00, 0x00, 0x4F, 0x09, 0xE0, 0xA7, 0x0D, 0xEA, 0x09, 0x80, 0xDD, 0x75, 0xAA, 0x99, 0x07, 0x00,
+    0xD0, 0x6C, 0x16, 0x2D, 0x85, 0x81, 0x1B, 0x90, 0xE4, 0x0B, 0x06, 0x65, 0x1C, 0x81, 0x4E, 0x39, 0x41, 0x04, 0x2C,
+    0x04, 0xF8, 0x5F, 0xB2, 0x48, 0x70, 0x35, 0xFF, 0x48, 0xE5, 0x98, 0xF7, 0xD0, 0xD1, 0x12, 0x30, 0x01, 0x9D, 0x38,
+    0xE1, 0x13, 0xF0, 0x03, 0x00, 0x54, 0x56, 0x55, 0x70, 0x88, 0x73, 0x67, 0x02, 0xA0, 0x84, 0xD9, 0xC0, 0x4E, 0x00,
+    0xE4, 0x02, 0x26, 0x38, 0x02, 0x58, 0xC1, 0x08, 0x20, 0x5C, 0x13, 0xF6, 0x6F, 0x22, 0xC4, 0x4A, 0xAD, 0xB4, 0xB1,
+    0x22, 0x15, 0xC5, 0x48, 0x31, 0x02, 0xFE, 0x0D, 0x4B, 0x99, 0x13, 0xB0, 0x24, 0x63, 0x9C, 0x92, 0xA4, 0x00, 0x0A,
+    0x88, 0x16, 0x49, 0x68, 0xC5, 0x4A, 0xA4, 0x40, 0x12, 0x2D, 0x8C, 0x10, 0x0E, 0xC6, 0x2E, 0x00, 0x00, 0x00, 0xC0,
+    0x60, 0x8E, 0x40, 0x60, 0xE9, 0x43, 0x2E, 0xA7, 0x67, 0x8F, 0x23, 0x97, 0x8A, 0xD8, 0x0C, 0x27, 0x50, 0xA5, 0xE7,
+    0xD8, 0x00, 0x00, 0x60, 0x8A, 0xC6, 0x15, 0xE9, 0x2A, 0x9E, 0xC6, 0xD5, 0xB6, 0x1E, 0xEB, 0x9E, 0xAE, 0x25, 0x00,
+    0x40, 0x72, 0xB5, 0x32, 0x14, 0x60, 0xB5, 0x06, 0x35, 0x00, 0xC0, 0x41, 0x35, 0x15, 0xA0, 0xA0, 0x28, 0x98, 0x30,
+    0xD4, 0x1E, 0x25, 0xE4, 0x4A, 0x92, 0x74, 0x92, 0x09, 0x84, 0x10, 0xC6, 0x80, 0xB1, 0x62, 0x03, 0x45, 0x20, 0x02,
+    0x17, 0x0F, 0xD0, 0x1B, 0x19, 0xF9, 0xA8, 0xB0, 0x80, 0x2D, 0x7B, 0x46, 0x9C, 0xF6, 0x8F, 0xCD, 0x0B, 0xE9, 0xC8,
+    0x84, 0x4C, 0x88, 0xE8, 0xA9, 0xD6, 0xC9, 0x99, 0x0A, 0x70, 0x3F, 0x01, 0x96, 0xF1, 0xAC, 0x7E, 0x48, 0x28, 0x8D,
+    0xCE, 0x6B, 0x7C, 0x10, 0x71, 0xD4, 0x34, 0x00, 0x74, 0x5F, 0x9D, 0xD0, 0x59, 0xC7, 0xC4, 0xF2, 0xF3, 0x42, 0xCE,
+    0x0B, 0x55, 0x69, 0x1E, 0x9B, 0x06, 0x12, 0x00, 0x00, 0x40, 0xBE, 0xC8, 0x4D, 0xDB, 0x87, 0x7E, 0xAC, 0x8C, 0x82,
+    0x2D, 0x42, 0x50, 0xFF, 0x4B, 0x00, 0x80, 0x8B, 0xA5, 0xB5, 0xE8, 0x1D, 0xA2, 0x69, 0x10, 0x41, 0x88, 0x10, 0xA6,
+    0x21, 0xBC, 0xCF, 0xA0, 0x48, 0x4A, 0x92, 0xB2, 0xA4, 0xA4, 0xE4, 0x40, 0x84, 0xA0, 0xE7, 0x37, 0xA4, 0x2C, 0x00,
+    0xF0, 0x06, 0x32, 0x75, 0x7B, 0x80, 0xCA, 0x4E, 0x71, 0x38, 0x1E, 0x70, 0x8A, 0x86, 0x0F, 0x40, 0x03, 0x00, 0x6F,
+    0x9A, 0xAC, 0x34, 0xDF, 0x67, 0x73, 0x0C, 0x72, 0x81, 0x04, 0x66, 0x50, 0x07, 0xE3, 0x52, 0xD7, 0xA3, 0xE0, 0xEF,
+    0xB4, 0xB8, 0x9F, 0x5D, 0x15, 0x09, 0x65, 0xA2, 0x84, 0x38, 0xA5, 0xC8, 0x1A, 0xEF, 0x49, 0xAB, 0x27, 0x00, 0xB2,
+    0xCB, 0xF2, 0x2B, 0xA1, 0xC9, 0x8A, 0x55, 0x6B, 0x8A, 0x00, 0x38, 0x68, 0x5E, 0x92, 0x2F, 0xC8, 0x4B, 0x7A, 0x66,
+    0x65, 0xEC, 0x8A, 0x25, 0xA6, 0xCF, 0x35, 0xB3, 0xDB, 0x34, 0x81, 0x94, 0x7D, 0x89, 0x56, 0x20, 0x4B, 0x00, 0xBE,
+    0xDC, 0x52, 0x90, 0x8A, 0x64, 0x97, 0x30, 0xB2, 0x9F, 0xA5, 0x5E, 0xB7, 0xD9, 0xEE, 0x15, 0x16, 0x66, 0x46, 0x26,
+    0x24, 0xAF, 0x00, 0xBD, 0xB3, 0xB9, 0x9A, 0x4D, 0x33, 0x92, 0xAB, 0x7B, 0x7C, 0xDB, 0xD2, 0x3C, 0xAE, 0xA2, 0xC8,
+    0x6B, 0x3A, 0xDF, 0x4A, 0x02, 0x4D, 0x0B, 0x00, 0x89, 0xB0, 0x2C, 0x23, 0x09, 0x39, 0x21, 0x09, 0x2C, 0x34, 0xE3,
+    0xD7, 0x0C, 0x16, 0x08, 0x5A, 0xB4, 0xFB, 0x59, 0x96, 0x10, 0xB8, 0x36, 0x05, 0x59, 0x00, 0x80, 0x62, 0x83, 0x8A,
+    0xD8, 0x92, 0x53, 0x1E, 0x5D, 0x49, 0xCB, 0xA6, 0xD2, 0x89, 0xAB, 0x59, 0xB9, 0x48, 0x07, 0x26, 0xA5, 0x54, 0x8C,
+    0xC2, 0xF1, 0x79, 0x2C, 0x5D, 0x80, 0xD3, 0x24, 0xC9, 0x05, 0x81, 0x24, 0x00, 0x90, 0x8B, 0x84, 0xCD, 0xB4, 0x67,
+    0xA2, 0xEA, 0x92, 0xB8, 0xC2, 0x1A, 0x00, 0x50, 0x36, 0xD3, 0x81, 0x05, 0x80, 0x23, 0x10, 0xC2, 0xD1, 0x24, 0x93,
+    0xC0, 0x4E, 0x1B, 0x51, 0x59, 0x4B, 0x12, 0xD7, 0xD3, 0x56, 0xC3, 0x76, 0x7E, 0x88, 0x01, 0x18, 0xD1, 0xC5, 0x5D,
+    0x04, 0x8F, 0x81, 0x27, 0xB8, 0x08, 0xD1, 0x68, 0x8B, 0x4F, 0x0B, 0x10, 0x5A, 0x00, 0xA4, 0x6E, 0x68, 0xA2, 0x94,
+    0x01, 0x73, 0xFF, 0x4E, 0x00, 0x00, 0x2A, 0x1F, 0x38, 0x13, 0xCB, 0x91, 0x2D, 0x2A, 0x4D, 0x83, 0x01, 0xD9, 0x9F,
+    0xBD, 0x0B, 0x4A, 0x4A, 0xC9, 0x38, 0xAA, 0x26, 0xA7, 0x98, 0xD6, 0xC4, 0xF4, 0x4C, 0x29, 0xB3, 0x61, 0xFB, 0x0E,
+    0xD1, 0x52, 0x9D, 0xF2, 0xA8, 0x18, 0xEB, 0x76, 0x8D, 0x50, 0x6E, 0x1B, 0x5D, 0x11, 0xA8, 0xCA, 0x68, 0x2D, 0x24,
+    0x50, 0x90, 0x35, 0x12, 0x5A, 0xBB, 0xA7, 0x95, 0x00, 0x00, 0x2B, 0x90, 0xB6, 0x2D, 0x7A, 0x65, 0x36, 0xF5, 0x41,
+    0x4E, 0xF8, 0xCE, 0xDD, 0x4E, 0x49, 0x0B, 0x03, 0xC8, 0x8C, 0x50, 0x4A, 0x29, 0xE8, 0xEF, 0xC0, 0x4A, 0x68, 0xEB,
+    0x35, 0xD5, 0xB1, 0x92, 0xB8, 0x79, 0xE9, 0xA5, 0xF2, 0x21, 0x71, 0x5D, 0xA3, 0x6B, 0x88, 0x5B, 0x64, 0x2C, 0xA1,
+    0xA8, 0x1D, 0xD9, 0x5C, 0xDD, 0x3B, 0xCB, 0x67, 0xC3, 0xE0, 0xE8, 0x74, 0xD3, 0x84, 0x24, 0x04, 0x00, 0x36, 0x8C,
+    0x10, 0xA5, 0x7A, 0x52, 0xBA, 0xAE, 0x9D, 0x78, 0xBC, 0xC7, 0x75, 0x84, 0xA8, 0x68, 0xA7, 0x24, 0x1D, 0x36, 0xCD,
+    0x5A, 0xB9, 0xE7, 0x29, 0x81, 0xCA, 0xC9, 0x45, 0xE5, 0xBB, 0xA9, 0xDA, 0xAE, 0x6D, 0xE4, 0x74, 0xC6, 0x0C, 0x4B,
+    0x0B, 0x22, 0xB6, 0x29, 0x5D, 0x4A, 0x45, 0xA4, 0x66, 0x92, 0x41, 0x56, 0xD8, 0x65, 0x5D, 0x04, 0x42, 0x14, 0x00,
+    0x40, 0x5E, 0x65, 0x09, 0xBB, 0x5F, 0x0B, 0x01, 0xC2, 0x09, 0x34, 0x00, 0x80, 0x79, 0xD2, 0x28, 0x9B, 0x26, 0xEC,
+    0x8C, 0xF2, 0x8D, 0x16, 0xD1, 0xF6, 0xE2, 0x57, 0x5F, 0x43, 0x2B, 0x6B, 0x08, 0x22, 0xEA, 0x8A, 0x89, 0x54, 0x18,
+    0xCF, 0x53, 0x68, 0x45, 0x99, 0xD1, 0x34, 0xE8, 0x6C, 0x26, 0x6A, 0x99, 0x38, 0xE5, 0x04, 0xD4, 0x99, 0xF8, 0x52,
+    0x98, 0x3B, 0x99, 0xA4, 0x02, 0x00, 0xDA, 0xBF, 0xEF, 0x4F, 0x4B, 0x78, 0xE5, 0x5E, 0x41, 0x4E, 0x33, 0x95, 0xBC,
+    0xC9, 0xC0, 0x05, 0xB6, 0x34, 0x3C, 0xAF, 0x94, 0xCB, 0xAD, 0xE3, 0xCF, 0x8A, 0xC7, 0x51, 0x90, 0x25, 0x40, 0x76,
+    0x00, 0x40, 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20,
+    0xA1, 0x19, 0x00, 0x23, 0x00, 0xC0, 0x12, 0x58, 0xF7, 0xAC, 0x6E, 0x48, 0xA1, 0x68, 0x19, 0xE4, 0x32, 0xD6, 0x6A,
+    0x18, 0x90, 0x5C, 0x3B, 0x68, 0x92, 0xB4, 0x53, 0x0C, 0xED, 0x4E, 0x97, 0xF7, 0x69, 0xD5, 0xC4, 0x27, 0x0B, 0x1B,
+    0x6E, 0x04, 0xF7, 0xC1, 0x29, 0x06, 0x00, 0x8C, 0x00, 0x00, 0x60, 0x14, 0x37, 0x89, 0xFF, 0x19, 0x5A, 0xC4, 0x8E,
+    0xA1, 0xA1, 0x61, 0xF0, 0xBA, 0x80, 0x41, 0x17, 0x1D, 0x00, 0x20, 0x80, 0x86, 0x4E, 0x98, 0xFD, 0x03, 0x00, 0x46,
+    0x15, 0x22, 0x0E, 0x8A, 0xD4, 0x53, 0x02, 0xAC, 0xA2, 0x81, 0xBC, 0x92, 0x69, 0xBA, 0xAC, 0x24, 0x8A, 0xB6, 0x2F,
+    0x6F, 0xAD, 0x96, 0xC3, 0x02, 0x00, 0x94, 0x52, 0xD5, 0x52, 0x5E, 0x5D, 0xEE, 0x3C, 0x27, 0x03, 0x36, 0x21, 0xA3,
+    0x2B, 0xEE, 0xCC, 0x44, 0x53, 0xD8, 0xB6, 0xF4, 0x16, 0xE9, 0xEB, 0xB5, 0x3A, 0x26, 0x76, 0xD2, 0x98, 0xD8, 0xD0,
+    0x85, 0x79, 0x67, 0x25, 0x44, 0x60, 0xCD, 0x28, 0x66, 0xAC, 0xF7, 0xEE, 0x57, 0xDB, 0x69, 0xEE, 0xD5, 0x33, 0xB2,
+    0xC2, 0x33, 0x4F, 0x3A, 0xD9, 0xAF, 0x52, 0x9A, 0xF8, 0x14, 0x40, 0x95, 0x60, 0x4C, 0x7A, 0x66, 0x45, 0x01, 0x64,
+    0x9B, 0x52, 0xAA, 0xA9, 0xBE, 0xCC, 0x75, 0xD6, 0x3A, 0xB6, 0xB4, 0x62, 0x97, 0x7E, 0xF4, 0x89, 0xB2, 0xE3, 0xAB,
+    0x43, 0x66, 0xEA, 0xBF, 0xA7, 0x01, 0xF2, 0x23, 0xAB, 0xD8, 0x29, 0x94, 0x90, 0xE7, 0x94, 0x6C, 0x00, 0xA8, 0xFE,
+    0xDC, 0x24, 0x59, 0xD8, 0x69, 0xBB, 0xFD, 0x00, 0x84, 0x2C, 0x4B, 0xE0, 0xD8, 0xC9, 0xBF, 0xFA, 0xB7, 0x4A, 0xF7,
+    0xAF, 0xA9, 0x6E, 0xC9, 0x3F, 0x84, 0x7C, 0x6C, 0xF6, 0x04, 0x22, 0xA3, 0xE4, 0x00, 0xF4, 0xEC, 0xF1, 0xA1, 0x0E,
+    0xD1, 0x6B, 0x00, 0xEC, 0x01, 0xCE, 0xCE, 0x82, 0xF7, 0xBE, 0x78, 0x02, 0xD9, 0xBD, 0x3E, 0x37, 0x00, 0x01, 0x21,
+    0x00, 0x00, 0x21, 0xB2, 0xFA, 0x8D, 0xFC, 0x03, 0x62, 0x4B, 0xAF, 0x1A, 0xD3, 0x6B, 0xAB, 0x6F, 0xB5, 0x4C, 0xDE,
+    0xC2, 0x43, 0x46, 0x06, 0xC0, 0xA8, 0x36, 0x37, 0x81, 0xED, 0x65, 0x7C, 0xD1, 0x0E, 0x00, 0x00, 0xE0, 0xDD, 0x7A,
+    0xD5, 0xFE, 0x40, 0x95, 0x49, 0xD8, 0xFF, 0x81, 0x72, 0x10, 0x20, 0x84, 0xCA, 0x55, 0x40, 0x52, 0xE9, 0xE4, 0x13,
+    0x4B, 0x90, 0x8F, 0xB1, 0x84, 0x90, 0x7F, 0x00, 0x50, 0x52, 0x78, 0x35, 0xF9, 0xE2, 0x66, 0xE5, 0x8F, 0x4A, 0xAD,
+    0x6E, 0x1B, 0x48, 0x42, 0xFD, 0x4E, 0x4C, 0x02, 0x80, 0xC8, 0x6E, 0x6C, 0x42, 0x4A, 0x41, 0xCF, 0x9C, 0x5B, 0x0B,
+    0x4C, 0xC3, 0xEB, 0x7E, 0x76, 0xDE, 0xED, 0x11, 0x4E, 0x80, 0xAC, 0x00, 0x64, 0xD8, 0xCB, 0xFB, 0x65, 0x2B, 0xFC,
+    0x7A, 0x05, 0x11, 0x00, 0x11, 0xE0, 0x4E, 0xC8, 0x24, 0x23, 0x3A, 0x44, 0xA0, 0x0C, 0x03, 0xBF, 0xAF, 0x21, 0x95,
+    0x09, 0xCD, 0xB8, 0x21, 0x91, 0x50, 0x1B, 0x49, 0x24, 0xA3, 0x32, 0x46, 0x58, 0x34, 0x09, 0x00, 0x10, 0xD8, 0x14,
+    0x2C, 0x21, 0x34, 0x67, 0x19, 0x28, 0x8A, 0x13, 0x12, 0x00, 0x47, 0x68, 0xFE, 0x31, 0xC5, 0x09, 0x27, 0x81, 0x96,
+    0x00, 0x30, 0x72, 0xA5, 0x70, 0x10, 0xB4, 0xC0, 0x0C, 0x13, 0x7F, 0xFB, 0x4C, 0x17, 0x68, 0x81, 0x73, 0xF1, 0x4E,
+    0xAA, 0x42, 0xF7, 0x16, 0x2D, 0xA9, 0x69, 0xA3, 0x14, 0x00, 0xB7, 0x53, 0x4A, 0x43, 0x23, 0x05, 0x00, 0x78, 0x5A,
+    0x89, 0x02, 0x89, 0xB0, 0x84, 0x40, 0x00, 0x20, 0x69, 0x48, 0x82, 0x2D, 0x00, 0x80, 0x8C, 0x00, 0x4C, 0x97, 0x12,
+    0xD4, 0x05, 0xDA, 0x63, 0x00, 0x70, 0x02, 0x00, 0x00, 0x00, 0x24, 0x01, 0x00, 0x5C, 0x3C, 0x03, 0x00, 0x24, 0x04,
+    0xA8, 0xC6, 0xE8, 0xCF, 0x00, 0x80, 0x01, 0x50, 0x81, 0x22, 0x8C, 0x30, 0x76, 0x17, 0x60, 0x09, 0x57, 0xC1, 0x35,
+    0x63, 0x79, 0x84, 0x66, 0xA9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0xDF, 0xAB, 0x4D, 0x55, 0x2D, 0x2B, 0x80,
+    0x22, 0x26, 0x4A, 0x20, 0xC5, 0x39, 0xE0, 0x9C, 0x9B, 0x02, 0x00, 0xA4, 0xEB, 0x00, 0x00, 0x80, 0x34, 0xB7, 0x05,
+    0x09, 0x50, 0xAC, 0x68, 0xC5, 0x8D, 0x99, 0x33, 0x5A, 0x02, 0x8C, 0x80, 0x43, 0x80, 0xE9, 0xFE, 0x2B, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x7A, 0x9B, 0xDE, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD0,
+    0xA7, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x30, 0x00, 0xF4, 0x76, 0x80, 0xDE, 0x16, 0x00, 0x00, 0x00, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0xC0, 0xBB, 0x74, 0xFD, 0x57, 0xDE, 0xBF, 0x1F, 0x1F, 0xF0,
+    0x5B, 0xD1, 0x9F, 0xB3, 0x60, 0xF2, 0x83, 0x7E, 0xF4, 0xEA, 0xF6, 0xE4, 0xD5, 0xF7, 0xA6, 0xE7, 0x5E, 0xDB, 0xA7,
+    0x37, 0xAF, 0xF3, 0xE7, 0x32, 0x09, 0x10, 0x72, 0x1F, 0x40, 0xA6, 0x9F, 0xEF, 0x2F, 0x5D, 0x5D, 0xD6, 0xAE, 0xC8,
+    0x4A, 0xE1, 0xA9, 0x47, 0x50, 0x5A, 0xDB, 0x35, 0x00, 0x56, 0x84, 0xFC, 0x29, 0x66, 0x1A, 0x4A, 0x31, 0x2B, 0x61,
+    0x12, 0x10, 0x01, 0x22, 0x08, 0xAC, 0x94, 0x0C, 0xB9, 0x44, 0x89, 0xBB, 0x12, 0x00, 0x6E, 0xAC, 0x10, 0xD2, 0x41,
+    0x48, 0x25, 0x15, 0xAB, 0x71, 0x82, 0xC2, 0x1A, 0x00, 0x00, 0x39, 0x30, 0x22, 0x80, 0xAC, 0x04, 0x60, 0x80, 0x00,
+    0x00, 0x01, 0x00, 0x36,
 };
 
 std::vector<uint8_t> const kBinKmlV4 = {
-  0x04, 0x26, 0x41, 0x3A, 0x38, 0x62, 0x66, 0x39, 0x33, 0x62, 0x64, 0x65, 0x2D, 0x66, 0x38, 0x31,
-  0x61, 0x2D, 0x34, 0x66, 0x31, 0x63, 0x2D, 0x38, 0x36, 0x34, 0x30, 0x2D, 0x66, 0x63, 0x39, 0x65,
-  0x32, 0x61, 0x38, 0x34, 0x32, 0x33, 0x36, 0x39, 0x24, 0x34, 0x32, 0x37, 0x33, 0x62, 0x38, 0x64,
-  0x33, 0x2D, 0x33, 0x37, 0x30, 0x66, 0x2D, 0x34, 0x38, 0x64, 0x39, 0x2D, 0x39, 0x64, 0x33, 0x35,
-  0x2D, 0x37, 0x64, 0x66, 0x38, 0x34, 0x65, 0x61, 0x38, 0x64, 0x36, 0x61, 0x37, 0x1E, 0x28, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x56, 0x01,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9D, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF9, 0x26,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD9, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x9D, 0xA1, 0xD1, 0xEC, 0x05, 0x01, 0x04, 0x01, 0x19, 0x06, 0x00, 0x09,
-  0x04, 0x00, 0x02, 0x01, 0x03, 0x06, 0x04, 0x19, 0x01, 0x00, 0x04, 0x00, 0x06, 0x01, 0x07, 0x06,
-  0x08, 0x19, 0x05, 0x01, 0x00, 0x09, 0x01, 0x00, 0x0A, 0x01, 0x00, 0x0B, 0x06, 0x00, 0x0C, 0x01,
-  0x0D, 0x02, 0x0E, 0x03, 0x0F, 0x04, 0x10, 0x05, 0x11, 0x00, 0x00, 0x04, 0xC3, 0x0F, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xB0, 0xB6,
-  0xE9, 0x05, 0xE0, 0xB9, 0xBF, 0x9B, 0x02, 0xA1, 0x99, 0xE5, 0xC2, 0x02, 0x00, 0x01, 0x05, 0x04,
-  0x00, 0x13, 0x01, 0x14, 0x06, 0x15, 0x19, 0x12, 0x04, 0x00, 0x17, 0x01, 0x18, 0x06, 0x19, 0x19,
-  0x16, 0x00, 0x01, 0x00, 0x00, 0x00, 0xC4, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xB0, 0xB6, 0xE9, 0x05, 0x9F, 0xA1, 0xC5, 0x9B,
-  0x02, 0xF1, 0xE0, 0xEB, 0xC2, 0x02, 0x00, 0x01, 0x05, 0x04, 0x00, 0x1B, 0x01, 0x1C, 0x06, 0x1D,
-  0x19, 0x1A, 0x04, 0x00, 0x1F, 0x01, 0x20, 0x06, 0x21, 0x19, 0x1E, 0x00, 0x01, 0x00, 0x00, 0x00,
-  0xC5, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0xFF, 0xB0, 0xB6, 0xE9, 0x05, 0xF6, 0xFE, 0xCF, 0x9B, 0x02, 0x97, 0xDB, 0xEF, 0xC2, 0x02,
-  0x00, 0x01, 0x05, 0x04, 0x00, 0x23, 0x01, 0x24, 0x06, 0x25, 0x19, 0x22, 0x04, 0x00, 0x27, 0x01,
-  0x28, 0x06, 0x29, 0x19, 0x26, 0x00, 0x01, 0x00, 0x00, 0x00, 0xC6, 0x0F, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xB0, 0xB6, 0xE9, 0x05,
-  0x80, 0xDC, 0xC1, 0x9B, 0x02, 0x81, 0xF2, 0xE4, 0xC2, 0x02, 0x00, 0x01, 0x05, 0x04, 0x00, 0x2B,
-  0x01, 0x2C, 0x06, 0x2D, 0x19, 0x2A, 0x04, 0x00, 0x2F, 0x01, 0x30, 0x06, 0x31, 0x19, 0x2E, 0x00,
-  0x01, 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xB3,
-  0xE6, 0xCC, 0x19, 0x00, 0xFF, 0x22, 0x11, 0xEE, 0xFF, 0xB0, 0xB6, 0xE9, 0x05, 0xAA, 0x02, 0xC0,
-  0xF0, 0xE7, 0xB6, 0x04, 0xFE, 0xFF, 0xC8, 0x85, 0x05, 0xE0, 0x78, 0xFD, 0x1C, 0xE0, 0xB3, 0x01,
-  0xC0, 0x30, 0xFC, 0x90, 0x03, 0xC2, 0xBB, 0x02, 0x86, 0x9D, 0x03, 0xFE, 0xAB, 0x01, 0xFE, 0xA5,
-  0x03, 0xFE, 0x9A, 0x01, 0x80, 0xBD, 0x02, 0x84, 0x14, 0xFE, 0x6B, 0xFA, 0x31, 0x80, 0xF9, 0x01,
-  0xFF, 0xB8, 0x01, 0xFD, 0x59, 0xFF, 0xD7, 0x01, 0xFE, 0xC0, 0x01, 0xF9, 0x8C, 0x01, 0x82, 0x54,
-  0xFF, 0xA8, 0x01, 0xFE, 0xC7, 0x04, 0xFC, 0x6F, 0xFD, 0x36, 0x84, 0x51, 0xFE, 0x7A, 0xFA, 0x31,
-  0x81, 0x38, 0x82, 0x50, 0x84, 0x49, 0x82, 0x50, 0x80, 0x69, 0xFF, 0x84, 0x01, 0xFE, 0x43, 0x82,
-  0x4A, 0x80, 0x5A, 0xFC, 0xF1, 0x01, 0x82, 0x90, 0x02, 0xFE, 0x52, 0xFC, 0x58, 0xF9, 0x36, 0x84,
-  0x0C, 0xFA, 0x5F, 0x82, 0x75, 0xFF, 0x05, 0x83, 0x0E, 0x84, 0x3F, 0x82, 0x4A, 0x80, 0xBE, 0x01,
-  0x81, 0x0F, 0xFE, 0x3F, 0x82, 0x3F, 0x80, 0x35, 0x83, 0xA6, 0x02, 0xFE, 0x9E, 0x02, 0x86, 0xA2,
-  0x01, 0x84, 0xB2, 0x01, 0xFC, 0xF4, 0x02, 0xFE, 0xFD, 0x01, 0x80, 0x83, 0x01, 0x80, 0xA3, 0x01,
-  0x82, 0x0A, 0x82, 0x97, 0x01, 0xFC, 0xDE, 0x02, 0x80, 0xC4, 0x01, 0x82, 0x20, 0xFE, 0xCC, 0x01,
-  0x82, 0x73, 0xFC, 0xAD, 0x01, 0xFE, 0x39, 0x82, 0xA6, 0x01, 0x82, 0x8F, 0x01, 0x80, 0x21, 0x80,
-  0x30, 0x82, 0xF4, 0x01, 0x80, 0x35, 0xFE, 0x58, 0x82, 0x73, 0x80, 0x0B, 0xFE, 0xCB, 0x01, 0x82,
-  0x12, 0x80, 0x7A, 0xFB, 0x0C, 0xFC, 0x89, 0x02, 0x85, 0xA2, 0x01, 0x82, 0x13, 0xFF, 0xD1, 0x01,
-  0x80, 0x60, 0xFF, 0x48, 0x82, 0x50, 0x80, 0x28, 0x82, 0x3F, 0xFF, 0x22, 0x85, 0x42, 0x80, 0x06,
-  0xFF, 0x2F, 0xF9, 0x3F, 0x84, 0x7B, 0x85, 0x70, 0xFE, 0xEE, 0x01, 0x82, 0x02, 0xFE, 0x9B, 0x01,
-  0x80, 0x38, 0x84, 0x6A, 0xFB, 0x24, 0x80, 0x30, 0xFE, 0x3D, 0xFE, 0x50, 0xFE, 0x08, 0x80, 0x46,
-  0x84, 0x9C, 0x01, 0x82, 0x02, 0x85, 0x5E, 0xFC, 0x81, 0x01, 0x82, 0x89, 0x01, 0xFB, 0x12, 0x81,
-  0x67, 0x82, 0x7C, 0x82, 0x3A, 0xFC, 0xAD, 0x01, 0x81, 0x12, 0x82, 0x5B, 0xFB, 0x4C, 0xFC, 0x1F,
-  0x80, 0x17, 0x80, 0x18, 0xFF, 0x38, 0x80, 0x90, 0x01, 0xFD, 0x15, 0x84, 0xBC, 0x02, 0xFA, 0x5B,
-  0xFE, 0x2B, 0xFB, 0x1D, 0x84, 0xBF, 0x01, 0xFF, 0x33, 0xFA, 0x47, 0xFD, 0x47, 0x86, 0x46, 0xFE,
-  0x03, 0xFC, 0x14, 0xFF, 0x1C, 0x82, 0x5D, 0x00, 0xFE, 0x44, 0xFC, 0x2B, 0x84, 0x93, 0x01, 0x86,
-  0xA2, 0x01, 0x81, 0x36, 0x87, 0x87, 0x01, 0xFE, 0x11, 0xFD, 0x2C, 0x80, 0x25, 0x82, 0x4C, 0x80,
-  0x1D, 0xFF, 0x11, 0xFE, 0x20, 0xFE, 0x2C, 0x82, 0xB3, 0x01, 0x82, 0x45, 0x82, 0x2B, 0x80, 0x3F,
-  0xFE, 0x3F, 0x84, 0x0D, 0xFF, 0x5B, 0x85, 0xA2, 0x01, 0x82, 0x2D, 0x82, 0x01, 0xFE, 0x32, 0x80,
-  0x4F, 0xFE, 0x64, 0xFE, 0x3C, 0xF9, 0x4D, 0xFF, 0x8D, 0x01, 0x80, 0x32, 0x86, 0x16, 0xFA, 0x31,
-  0x00, 0x86, 0x65, 0xFE, 0x53, 0x80, 0x5E, 0x83, 0x2B, 0xFA, 0x65, 0x86, 0x21, 0x82, 0xA9, 0x02,
-  0x81, 0x96, 0x01, 0x84, 0x70, 0xFF, 0x7C, 0xFA, 0x24, 0x80, 0x23, 0x80, 0x84, 0x02, 0x83, 0x87,
-  0x01, 0xF9, 0x19, 0x80, 0x4A, 0xFE, 0x3D, 0x84, 0x0F, 0xFE, 0x1E, 0x83, 0x64, 0xFE, 0x7A, 0xFF,
-  0x27, 0x82, 0x55, 0x86, 0x0F, 0x82, 0x68, 0x83, 0x1F, 0x80, 0x9F, 0x01, 0xFE, 0x2B, 0xFE, 0x90,
-  0x01, 0x84, 0x03, 0x82, 0xE9, 0x03, 0x82, 0x90, 0x01, 0x82, 0xC2, 0x01, 0xF8, 0x28, 0xFE, 0x86,
-  0x05, 0x82, 0x80, 0x02, 0xFC, 0x72, 0x84, 0x58, 0x82, 0x20, 0x82, 0x01, 0x81, 0x2B, 0x85, 0x31,
-  0xFB, 0x39, 0xFF, 0x5A, 0xFF, 0x03, 0xFD, 0x91, 0x01, 0x80, 0x25, 0x83, 0x85, 0x01, 0x81, 0x3F,
-  0xF7, 0xCC, 0x02, 0xFE, 0x27, 0x83, 0x14, 0xFF, 0x6C, 0xFD, 0xE4, 0x01, 0xFD, 0xBA, 0x02, 0xFF,
-  0xF9, 0x01, 0x82, 0x75, 0x83, 0x5F, 0xFD, 0x11, 0xFF, 0x22, 0x83, 0x3E, 0xFB, 0x08, 0xFF, 0x11,
-  0xFD, 0x21, 0xFD, 0x32, 0xFF, 0x16, 0x83, 0x2A, 0x81, 0x42, 0x80, 0x18, 0x83, 0x0E, 0xFD, 0x43,
-  0xFB, 0x6C, 0xFB, 0x70, 0x83, 0x32, 0xFA, 0x31, 0xFF, 0x86, 0x01, 0x86, 0x4F, 0xFB, 0x2C, 0xFF,
-  0x98, 0x01, 0x83, 0xBA, 0x01, 0x81, 0x6F, 0xF9, 0x54, 0x81, 0x59, 0x81, 0x25, 0x81, 0x5B, 0xFF,
-  0x4B, 0xFF, 0x2F, 0x82, 0x1E, 0xF9, 0x1B, 0x83, 0x03, 0x81, 0x92, 0x03, 0x81, 0x81, 0x02, 0x83,
-  0x07, 0xFB, 0x39, 0xFD, 0x36, 0x82, 0x08, 0xFD, 0x74, 0xFF, 0x29, 0xFE, 0x16, 0x85, 0x10, 0xFD,
-  0x3D, 0xFF, 0x11, 0x81, 0xC0, 0x01, 0xFF, 0x72, 0xFD, 0x7A, 0xFD, 0x1B, 0x83, 0x1D, 0x82, 0x13,
-  0xFB, 0x9A, 0x02, 0xFF, 0x96, 0x01, 0x81, 0x1A, 0x81, 0x37, 0xFD, 0xCB, 0x01, 0x80, 0x18, 0x81,
-  0xB9, 0x01, 0x84, 0x08, 0xFF, 0x33, 0x81, 0x25, 0x81, 0x94, 0x01, 0x82, 0x6E, 0xFB, 0x12, 0xFA,
-  0x25, 0xFD, 0x41, 0x82, 0x1F, 0x81, 0x27, 0xFD, 0x21, 0xFF, 0xE0, 0x01, 0xFE, 0x04, 0x81, 0x45,
-  0x80, 0x36, 0xFF, 0x47, 0xFE, 0x0A, 0xFD, 0x7A, 0xF9, 0x2C, 0x81, 0x6F, 0x83, 0x26, 0xFD, 0x83,
-  0x01, 0x81, 0x4A, 0x82, 0x0F, 0xFD, 0x2F, 0x83, 0x22, 0xFE, 0x04, 0xFF, 0x6E, 0xF9, 0x3D, 0xFF,
-  0x2F, 0x80, 0x12, 0xFF, 0x2B, 0x83, 0x33, 0xFD, 0x90, 0x01, 0xFD, 0x65, 0x81, 0x45, 0xFF, 0x05,
-  0xFD, 0x6B, 0x83, 0x53, 0xFF, 0x58, 0xFD, 0x5F, 0xFF, 0x38, 0x81, 0x0D, 0x81, 0x04, 0xFF, 0x18,
-  0x81, 0x68, 0x80, 0x19, 0xFD, 0x87, 0x01, 0x81, 0x38, 0xFF, 0x0C, 0xFB, 0x15, 0xFD, 0x81, 0x01,
-  0x84, 0x03, 0xFD, 0x4C, 0xFF, 0x36, 0xFF, 0x2F, 0xFA, 0x2B, 0xFF, 0x24, 0x82, 0x51, 0x81, 0x48,
-  0x84, 0x22, 0x81, 0x17, 0xFA, 0x2B, 0xFB, 0xF7, 0x01, 0x80, 0x13, 0x83, 0x73, 0xFF, 0x49, 0xFB,
-  0x0B, 0xF9, 0x43, 0x83, 0x17, 0xFC, 0x51, 0x81, 0x2D, 0xFE, 0x34, 0xFB, 0x5E, 0x86, 0x2A, 0x83,
-  0x5F, 0x81, 0x21, 0xFF, 0x0C, 0x82, 0x21, 0xFD, 0x41, 0xFC, 0x0D, 0x82, 0x19, 0x82, 0x2D, 0x81,
-  0x59, 0x80, 0x12, 0xFD, 0x80, 0x01, 0xFF, 0x24, 0xFD, 0x48, 0xFF, 0x47, 0xFF, 0xB0, 0x01, 0x82,
-  0x13, 0x81, 0x85, 0x01, 0x00, 0x83, 0x70, 0xFA, 0x5C, 0xFD, 0x7C, 0x82, 0x26, 0x81, 0x4A, 0x81,
-  0x0E, 0xFB, 0x3D, 0x82, 0x1A, 0xFF, 0x89, 0x01, 0xFB, 0x20, 0xFF, 0x3A, 0xFA, 0x31, 0xFF, 0x9C,
-  0x01, 0xF9, 0x49, 0xFD, 0x90, 0x01, 0x80, 0x36, 0x83, 0x75, 0xF8, 0x67, 0xFF, 0x35, 0x88, 0x1E,
-  0xFF, 0x41, 0x85, 0x3B, 0x81, 0x38, 0x84, 0x08, 0xFB, 0x14, 0x82, 0x14, 0x81, 0x4C, 0xFC, 0x26,
-  0xFE, 0x4C, 0xFF, 0x77, 0xFF, 0x0C, 0xFF, 0x24, 0x84, 0x05, 0xFF, 0x3C, 0x81, 0x2B, 0xFD, 0x09,
-  0xFD, 0x2B, 0x80, 0x1E, 0x83, 0x1B, 0xFF, 0x18, 0x84, 0x12, 0xFF, 0x3C, 0x81, 0x13, 0xFF, 0x10,
-  0xFB, 0x30, 0xFE, 0x1B, 0x81, 0x20, 0x80, 0x12, 0xFF, 0x4C, 0xFE, 0x0A, 0x81, 0xEB, 0x01, 0xFF,
-  0x41, 0xFD, 0x64, 0x82, 0x44, 0x81, 0x36, 0x81, 0x02, 0xFB, 0x35, 0x84, 0x22, 0x81, 0x08, 0xFC,
-  0x21, 0xFF, 0x8B, 0x01, 0x86, 0x16, 0x81, 0x38, 0x87, 0x3C, 0xFF, 0x19, 0x88, 0x3C, 0x82, 0x0E,
-  0xFC, 0x45, 0x80, 0x4B, 0x84, 0x09, 0xFF, 0x11, 0xFA, 0x31, 0xFF, 0xA3, 0x01, 0x82, 0x86, 0x01,
-  0x82, 0x04, 0xC2, 0x26, 0xDD, 0x2C, 0xE4, 0x2C, 0xD0, 0x0E, 0xF0, 0x2F, 0xD0, 0x5F, 0xF4, 0x44,
-  0xA2, 0x05, 0xA6, 0x95, 0x01, 0xA0, 0x83, 0x01, 0xA4, 0x62, 0xCB, 0x35, 0xAF, 0x54, 0xB0, 0x1C,
-  0xAB, 0x62, 0xE2, 0x38, 0xE1, 0x2B, 0xC2, 0x18, 0xB5, 0x52, 0xE6, 0x27, 0xAA, 0x5B, 0xE4, 0x40,
-  0x59, 0xD2, 0x14, 0xF6, 0x2E, 0xD0, 0x45, 0xF0, 0x04, 0xAD, 0x1D, 0x87, 0x1D, 0xD2, 0x7F, 0x8B,
-  0x16, 0xA6, 0x11, 0xB2, 0x25, 0xE2, 0x2D, 0xC9, 0x06, 0xB0, 0x1A, 0xFC, 0x3D, 0xB0, 0x2E, 0xF6,
-  0x3A, 0xA0, 0x2F, 0x8B, 0x09, 0xBB, 0x0D, 0xA8, 0x30, 0xC6, 0x21, 0xAC, 0x2C, 0x8E, 0x08, 0x9C,
-  0xB0, 0x01, 0xF5, 0x02, 0xE3, 0xA3, 0x01, 0xF5, 0x26, 0xE5, 0x40, 0x8C, 0x0D, 0xA7, 0x29, 0xF7,
-  0x32, 0xDA, 0x07, 0xF7, 0x3F, 0xC3, 0x74, 0xF1, 0x36, 0xBC, 0x02, 0xF5, 0x12, 0xC9, 0x25, 0xBB,
-  0x76, 0x9C, 0x1A, 0xC6, 0x1D, 0xA0, 0x1E, 0xC9, 0x45, 0x49, 0x93, 0x13, 0xD5, 0x3A, 0x95, 0x4D,
-  0xAC, 0x03, 0xA5, 0x20, 0xA7, 0x54, 0xA5, 0x11, 0x98, 0x4E, 0xA3, 0x3B, 0x9C, 0x2C, 0xE9, 0x1D,
-  0x9A, 0x61, 0x9E, 0x2C, 0x9A, 0x56, 0xBF, 0x6C, 0xE7, 0x4D, 0xB7, 0x1B, 0xEF, 0x3C, 0xC4, 0x0A,
-  0xE7, 0x64, 0xBD, 0x66, 0xEB, 0x4B, 0xB3, 0x12, 0xD9, 0x31, 0xB9, 0x0C, 0xAA, 0x19, 0xFE, 0x09,
-  0xFC, 0x44, 0x82, 0x15, 0x84, 0x09, 0x83, 0x3C, 0x80, 0x54, 0xFD, 0x20, 0xFC, 0x74, 0xFD, 0x48,
-  0xFF, 0xCB, 0x01, 0xFF, 0x47, 0xFB, 0x43, 0x83, 0x68, 0xFE, 0x81, 0x01, 0xFB, 0x48, 0xFD, 0x4C,
-  0x80, 0x3B, 0x81, 0x4F, 0x83, 0x80, 0x01, 0x81, 0x38, 0x82, 0x38, 0xF9, 0x49, 0xFD, 0xCB, 0x04,
-  0xFF, 0x72, 0xFF, 0x52, 0xFA, 0xAA, 0x01, 0x83, 0xBF, 0x01, 0x82, 0x8C, 0x01, 0x84, 0x58, 0xFE,
-  0xD6, 0x01, 0x81, 0xF8, 0x01, 0x80, 0xB8, 0x01, 0xFF, 0x6A, 0xFB, 0x2C, 0xFD, 0xBF, 0x02, 0x81,
-  0x18, 0x81, 0xC2, 0x06, 0x81, 0xCB, 0x02, 0xFD, 0x8D, 0x03, 0xB9, 0xAF, 0x02, 0x01, 0x04, 0x04,
-  0x00, 0x33, 0x01, 0x34, 0x06, 0x35, 0x19, 0x32, 0x00, 0x00, 0x00, 0x59, 0x20, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x28, 0x4A, 0x4A, 0x3C, 0x8E, 0x09, 0x95, 0x0C, 0x95, 0x0C, 0xFB, 0x0A,
-  0x29, 0x0A, 0x24, 0x0A, 0x03, 0x0A, 0x0E, 0x09, 0x0A, 0x24, 0x27, 0x27, 0x24, 0x83, 0x05, 0xE6,
-  0x04, 0xE6, 0x04, 0xF8, 0x04, 0x15, 0x1C, 0x1C, 0x15, 0xCC, 0x0B, 0xCB, 0x0B, 0xCB, 0x0B, 0x9E,
-  0x0B, 0x29, 0x21, 0x21, 0x22, 0xA5, 0x06, 0xF7, 0x06, 0xF7, 0x06, 0xE3, 0x06, 0x1C, 0x1A, 0x1A,
-  0x15, 0xCD, 0x05, 0xA8, 0x05, 0xA8, 0x05, 0xED, 0x05, 0x28, 0x4A, 0x4A, 0x3C, 0xA0, 0x2D, 0x80,
-  0x01, 0x00, 0x01, 0x00, 0x01, 0x04, 0x01, 0x03, 0x04, 0x02, 0x05, 0x05, 0x04, 0x07, 0x05, 0x06,
-  0x09, 0x05, 0x03, 0x0B, 0x06, 0x0B, 0x0D, 0x05, 0x05, 0x0F, 0x05, 0x07, 0x15, 0x06, 0x09, 0x17,
-  0x06, 0x0D, 0x19, 0x07, 0x0E, 0x1B, 0x06, 0x0C, 0x1D, 0x06, 0x0A, 0x1F, 0x05, 0x08, 0x2B, 0x08,
-  0x17, 0x35, 0x07, 0x10, 0x37, 0x07, 0x14, 0x39, 0x07, 0x0F, 0x3B, 0x07, 0x11, 0x3D, 0x09, 0x1C,
-  0x59, 0x08, 0x12, 0x6B, 0x08, 0x18, 0x75, 0x08, 0x13, 0x77, 0x0A, 0x24, 0x79, 0x08, 0x15, 0x7B,
-  0x08, 0x19, 0x7D, 0x09, 0x1D, 0xAB, 0x01, 0x09, 0x1F, 0xBD, 0x01, 0x09, 0x1E, 0xD9, 0x01, 0x09,
-  0x1B, 0xEB, 0x01, 0x09, 0x20, 0xF5, 0x01, 0x08, 0x16, 0xF7, 0x01, 0x0B, 0x29, 0xF9, 0x01, 0x09,
-  0x1A, 0xFB, 0x01, 0x0A, 0x2E, 0xFD, 0x01, 0x0A, 0x2B, 0xBD, 0x02, 0x0A, 0x23, 0xF7, 0x02, 0x0A,
-  0x2D, 0xFD, 0x02, 0x0D, 0x61, 0xAB, 0x03, 0x0A, 0x22, 0xBD, 0x03, 0x0B, 0x25, 0xD9, 0x03, 0x0B,
-  0x2A, 0xEB, 0x03, 0x0A, 0x26, 0xF7, 0x03, 0x0C, 0x3F, 0xF9, 0x03, 0x0A, 0x21, 0xFB, 0x03, 0x0B,
-  0x36, 0xFD, 0x03, 0x0C, 0x40, 0xF7, 0x04, 0x0B, 0x3E, 0xF7, 0x05, 0x0A, 0x2F, 0xFB, 0x05, 0x0A,
-  0x35, 0xFD, 0x05, 0x0B, 0x33, 0xBD, 0x06, 0x0E, 0x84, 0x01, 0xF7, 0x06, 0x0A, 0x34, 0xFD, 0x06,
-  0x0C, 0x75, 0xAB, 0x07, 0x0A, 0x27, 0xBD, 0x07, 0x0B, 0x2C, 0xD9, 0x07, 0x0C, 0x37, 0xEB, 0x07,
-  0x0B, 0x30, 0xF7, 0x07, 0x0B, 0x4C, 0xF9, 0x07, 0x0A, 0x28, 0xFB, 0x07, 0x0B, 0x3A, 0xFD, 0x07,
-  0x0D, 0x55, 0xF7, 0x09, 0x0C, 0x78, 0xFD, 0x0A, 0x0E, 0x72, 0xBD, 0x0B, 0x0E, 0xB8, 0x01, 0xD9,
-  0x0B, 0x0B, 0x32, 0xF7, 0x0B, 0x0D, 0x44, 0xFB, 0x0B, 0x0B, 0x38, 0xFD, 0x0B, 0x0E, 0x48, 0xF7,
-  0x0C, 0x0B, 0x49, 0xFD, 0x0D, 0x0B, 0x39, 0xBD, 0x0E, 0x0D, 0x9C, 0x01, 0xFD, 0x0E, 0x0C, 0x7B,
-  0xBD, 0x0F, 0x0B, 0x31, 0xD9, 0x0F, 0x0B, 0x3C, 0xEB, 0x0F, 0x0B, 0x3D, 0xF7, 0x0F, 0x0B, 0x77,
-  0xFB, 0x0F, 0x0B, 0x3B, 0xFD, 0x0F, 0x0E, 0x5D, 0xFD, 0x12, 0x0E, 0x6C, 0xF7, 0x13, 0x0C, 0x43,
-  0xFD, 0x13, 0x0E, 0x45, 0xBD, 0x16, 0x0E, 0x93, 0x01, 0xFD, 0x16, 0x0C, 0x76, 0xD9, 0x17, 0x0C,
-  0x41, 0xFD, 0x17, 0x0D, 0x57, 0xF7, 0x19, 0x0C, 0x79, 0xFD, 0x1A, 0x0C, 0x73, 0xBD, 0x1B, 0x0E,
-  0xC4, 0x01, 0xF7, 0x1B, 0x0C, 0x74, 0xFD, 0x1B, 0x0E, 0x51, 0xBD, 0x1E, 0x0E, 0xA1, 0x01, 0xFD,
-  0x1E, 0x0D, 0x7E, 0xFD, 0x1F, 0x0C, 0x5E, 0xFD, 0x22, 0x0D, 0x6A, 0xBD, 0x26, 0x0D, 0x8F, 0x01,
-  0xFD, 0x27, 0x0D, 0x56, 0xFD, 0x2A, 0x0D, 0x7C, 0xBD, 0x2B, 0x0D, 0xBE, 0x01, 0xF7, 0x2B, 0x0D,
-  0xE2, 0x01, 0xFD, 0x2B, 0x0D, 0x4B, 0xBD, 0x2E, 0x0D, 0xA0, 0x01, 0xFD, 0x2F, 0x0E, 0x60, 0xFD,
-  0x32, 0x0E, 0x6F, 0xFD, 0x33, 0x0D, 0x46, 0xBD, 0x36, 0x0D, 0x94, 0x01, 0xFD, 0x37, 0x0E, 0x5B,
-  0xBD, 0x3B, 0x0D, 0xC5, 0x01, 0xFD, 0x3B, 0x0E, 0x54, 0xBD, 0x3E, 0x0E, 0xA5, 0x01, 0xFD, 0x3E,
-  0x0D, 0x7F, 0xBD, 0x46, 0x0E, 0x8B, 0x01, 0xFD, 0x4A, 0x0E, 0x80, 0x01, 0xBD, 0x4B, 0x0E, 0xBD,
-  0x01, 0xFD, 0x4B, 0x0E, 0x4A, 0xFD, 0x4F, 0x0E, 0x5F, 0xFD, 0x52, 0x0E, 0x6D, 0xFD, 0x53, 0x0E,
-  0x47, 0xBD, 0x56, 0x0E, 0x9F, 0x01, 0xBD, 0x5B, 0x0E, 0xC6, 0x01, 0xFD, 0x5B, 0x0E, 0x52, 0xBD,
-  0x5E, 0x0E, 0xA4, 0x01, 0xFD, 0x6F, 0x0E, 0x69, 0xFD, 0x72, 0x0E, 0x70, 0xFD, 0x77, 0x0E, 0x5C,
-  0xFD, 0x7B, 0x0E, 0x5A, 0xBD, 0x7E, 0x0E, 0xA6, 0x01, 0xE3, 0xA7, 0x01, 0x7D, 0x61, 0x5F, 0x7D,
-  0x69, 0xFF, 0x4D, 0xCF, 0xB1, 0xBA, 0x76, 0x4F, 0xFA, 0x72, 0x7D, 0xD1, 0x7D, 0xDF, 0x3F, 0xA6,
-  0x2F, 0x19, 0x7D, 0xD7, 0xCC, 0x7D, 0xF7, 0x65, 0x4E, 0xF1, 0xEE, 0xEF, 0x9E, 0x96, 0x92, 0xB3,
-  0x8C, 0x37, 0x2F, 0x99, 0xBE, 0x1E, 0x4E, 0xA3, 0xB6, 0x19, 0x07, 0x73, 0xDF, 0xE1, 0x9C, 0xAB,
-  0xB9, 0x74, 0xA7, 0x71, 0x8A, 0x92, 0xF4, 0xAD, 0x4D, 0xF6, 0x3A, 0x04, 0x16, 0x11, 0x15, 0x45,
-  0xFF, 0xEB, 0x8E, 0x56, 0xCE, 0x20, 0x42, 0xC4, 0x7E, 0xAA, 0xDA, 0xA6, 0x6B, 0xA3, 0x96, 0x49,
-  0xEE, 0x2F, 0x00, 0xAD, 0x54, 0xBF, 0xF8, 0x59, 0xC5, 0x62, 0xC6, 0xAB, 0x1D, 0x24, 0xEE, 0x53,
-  0xF0, 0x65, 0xE6, 0xF7, 0x27, 0x09, 0xA7, 0x30, 0x3D, 0x5B, 0xB7, 0x2B, 0xA6, 0xD4, 0x44, 0xA8,
-  0x4C, 0x95, 0xC1, 0x3B, 0x15, 0x11, 0x84, 0x0C, 0x2F, 0x91, 0x2A, 0x10, 0x1F, 0xD7, 0x54, 0x4B,
-  0x69, 0x4E, 0x18, 0x55, 0x4A, 0x4C, 0xD0, 0x6C, 0xF7, 0x4B, 0xE9, 0xB2, 0x9C, 0xF2, 0xFB, 0xEB,
-  0xFB, 0x53, 0xBD, 0x57, 0x93, 0x25, 0x91, 0x06, 0x20, 0x89, 0xC0, 0x52, 0xD1, 0xBD, 0xD6, 0xE4,
-  0x36, 0x67, 0x44, 0xF3, 0x73, 0x5D, 0x22, 0xE5, 0x9A, 0x70, 0x9C, 0xA9, 0xDF, 0x16, 0xBF, 0x6F,
-  0x9E, 0x45, 0xCF, 0xEC, 0xD8, 0x7B, 0x2E, 0xE9, 0x5C, 0x3B, 0x0D, 0x00, 0x68, 0xD1, 0x3D, 0xAE,
-  0x24, 0xF9, 0xFA, 0x1B, 0x0B, 0xA8, 0x2D, 0x0D, 0xA8, 0x7C, 0x63, 0x04, 0x32, 0xA1, 0xEF, 0xAA,
-  0xFA, 0x2C, 0x75, 0x40, 0x57, 0x8E, 0x77, 0xCF, 0xD8, 0x39, 0x00, 0x4A, 0x10, 0x3A, 0x81, 0x16,
-  0x23, 0x61, 0xAE, 0xAF, 0x2B, 0x5A, 0x51, 0x93, 0x96, 0xA5, 0x08, 0x8B, 0x45, 0xAD, 0x8D, 0x72,
-  0xB6, 0xFB, 0xD9, 0xCB, 0xB8, 0x67, 0x20, 0xE0, 0x88, 0xB7, 0xED, 0x0A, 0x55, 0x46, 0xED, 0x14,
-  0x64, 0x9D, 0x31, 0x01, 0x25, 0x8E, 0xC8, 0x9C, 0x74, 0xA6, 0x02, 0x35, 0xA4, 0x93, 0x1A, 0x00,
-  0x80, 0x4C, 0x9C, 0xE4, 0x43, 0x22, 0x2B, 0xC1, 0xC0, 0xE2, 0x54, 0xE2, 0xFD, 0xD3, 0x73, 0xA5,
-  0x54, 0xD2, 0x83, 0x76, 0x75, 0xE3, 0x59, 0xBA, 0x64, 0x8C, 0x5A, 0x27, 0xB9, 0x34, 0xCF, 0x4E,
-  0x33, 0xF2, 0x73, 0x74, 0x7E, 0x27, 0x09, 0x61, 0x02, 0xF1, 0x25, 0xC9, 0x48, 0x63, 0x3C, 0xA3,
-  0x49, 0x92, 0xA8, 0x53, 0x67, 0x70, 0x8A, 0x45, 0xA7, 0xB2, 0xD8, 0xF5, 0xA8, 0x73, 0x39, 0xD6,
-  0xA9, 0x8C, 0xA5, 0x08, 0xC5, 0x54, 0x99, 0xCB, 0x53, 0x1C, 0x7E, 0xDF, 0x13, 0x18, 0x97, 0x50,
-  0x29, 0x46, 0x13, 0x8E, 0x31, 0x9A, 0x2F, 0x64, 0xD0, 0xDF, 0x2A, 0xBE, 0x62, 0xB0, 0x79, 0xFE,
-  0x66, 0x50, 0xB4, 0x66, 0xAC, 0x53, 0x6C, 0x80, 0x8C, 0x91, 0x73, 0x3C, 0xC5, 0xF7, 0x6D, 0x42,
-  0xFD, 0xAF, 0x08, 0x5F, 0xCE, 0x9E, 0xE2, 0xC2, 0x9B, 0x00, 0x7E, 0x9C, 0xBE, 0x7A, 0xA5, 0x5D,
-  0x9C, 0x5B, 0xBC, 0x9C, 0xFA, 0x0A, 0x9D, 0x67, 0xB3, 0x5E, 0xEE, 0xE3, 0xB4, 0x39, 0x39, 0x3F,
-  0x55, 0xEF, 0x38, 0xFD, 0x33, 0x9D, 0x5D, 0x60, 0x57, 0x39, 0x56, 0x62, 0xD1, 0xA8, 0x30, 0x42,
-  0xD1, 0x7C, 0x4D, 0x51, 0xB3, 0x5E, 0x4D, 0x52, 0x1C, 0x47, 0x51, 0x64, 0x14, 0x3D, 0x54, 0xDB,
-  0x01, 0x87, 0x9F, 0x62, 0x4E, 0xE4, 0x9C, 0x28, 0x91, 0x70, 0xB5, 0x57, 0x97, 0x32, 0x6D, 0x32,
-  0x96, 0xBF, 0xE5, 0x74, 0x1E, 0x3A, 0x7E, 0x9A, 0x54, 0x7E, 0x75, 0xB6, 0x74, 0xA4, 0x88, 0xD3,
-  0x22, 0xE6, 0x47, 0x17, 0x94, 0x14, 0x9D, 0xB0, 0x11, 0x58, 0xB4, 0x25, 0x54, 0xD5, 0x40, 0x8A,
-  0x1F, 0x9B, 0x65, 0x79, 0x4B, 0x47, 0x25, 0x59, 0x51, 0xE4, 0xB5, 0x2D, 0x8D, 0x16, 0xB9, 0xBC,
-  0x76, 0x15, 0x25, 0x57, 0x93, 0x53, 0xA4, 0x68, 0x8B, 0x66, 0x52, 0xA9, 0x46, 0x9E, 0x97, 0xDB,
-  0x69, 0xF5, 0x53, 0x7B, 0xA7, 0x0B, 0x67, 0xF7, 0x1B, 0x2F, 0x13, 0x4F, 0xF2, 0x6B, 0xB6, 0xAE,
-  0x89, 0x3A, 0xF3, 0x76, 0xBF, 0x8F, 0xA8, 0x8A, 0x73, 0x6D, 0x69, 0x66, 0x53, 0xEB, 0xC6, 0xC3,
-  0xCE, 0xD8, 0xEC, 0x8C, 0x26, 0x27, 0xE3, 0x78, 0x58, 0xE4, 0x64, 0xCE, 0x8C, 0xAF, 0x1B, 0x45,
-  0x92, 0xCD, 0xDA, 0xD5, 0x7E, 0x2D, 0x2F, 0xD3, 0xB9, 0xDA, 0xED, 0x2D, 0x32, 0x39, 0x2F, 0xA1,
-  0xDC, 0xF4, 0x00, 0x3B, 0x4D, 0xFD, 0x22, 0x8F, 0xAF, 0x0E, 0x8C, 0x23, 0xD3, 0x6D, 0x66, 0x14,
-  0x49, 0x69, 0x8A, 0x66, 0x27, 0x4F, 0x52, 0x3B, 0x9E, 0x6F, 0x6B, 0x59, 0xE8, 0x8C, 0x27, 0xE4,
-  0xBA, 0xE4, 0x52, 0x29, 0x42, 0xF8, 0x8E, 0x9F, 0x51, 0x24, 0x9B, 0xED, 0x74, 0x9D, 0xA5, 0x5C,
-  0xAF, 0xEB, 0xE6, 0x2A, 0x55, 0x56, 0xD3, 0x5E, 0x8B, 0x30, 0x3F, 0xF5, 0x59, 0x26, 0x8D, 0xAF,
-  0x55, 0x25, 0x77, 0x2A, 0x21, 0x2D, 0x9D, 0xF1, 0xA9, 0xDB, 0x19, 0x9D, 0x9C, 0xA7, 0x48, 0x76,
-  0xD6, 0x52, 0xFF, 0x78, 0x8A, 0x85, 0xD5, 0x9A, 0x9B, 0x7A, 0x59, 0xB7, 0x72, 0xE5, 0x55, 0xB7,
-  0x2A, 0xC3, 0x4B, 0xD6, 0x84, 0x93, 0x54, 0xB2, 0x6C, 0x9E, 0x8C, 0xCB, 0x9E, 0x74, 0x0B, 0xCF,
-  0xEF, 0xE4, 0xE2, 0x7B, 0xC8, 0x78, 0x9A, 0x66, 0x30, 0x92, 0x11, 0x42, 0x4D, 0x52, 0x4C, 0xDD,
-  0xD4, 0xA7, 0xBD, 0xB5, 0xD7, 0xC5, 0xDA, 0xCB, 0xAC, 0x52, 0x2C, 0xEA, 0xDD, 0x1C, 0xCB, 0xAE,
-  0x7B, 0x5A, 0x94, 0x9E, 0xBA, 0x59, 0x26, 0x8F, 0x24, 0xBC, 0x93, 0x49, 0x27, 0xDA, 0x9B, 0xD6,
-  0xC5, 0xAE, 0xB5, 0xE8, 0x79, 0xBA, 0xED, 0xD4, 0xF2, 0x4E, 0x07, 0xD4, 0xC5, 0xF6, 0x96, 0xB6,
-  0xCB, 0x75, 0xA9, 0x24, 0xBD, 0x71, 0xC7, 0x7A, 0x23, 0x8C, 0x51, 0x95, 0x37, 0xB5, 0x2F, 0x17,
-  0x55, 0xEC, 0x22, 0xBD, 0x77, 0xA5, 0xD4, 0x14, 0xEC, 0xB9, 0xC9, 0x84, 0x4A, 0x11, 0xFA, 0x48,
-  0x12, 0xF2, 0xFB, 0x7B, 0x36, 0xC5, 0xC8, 0x4F, 0xA5, 0x44, 0x79, 0x7B, 0x83, 0x71, 0x5D, 0xCE,
-  0x11, 0x4A, 0xFF, 0xC2, 0x0D, 0x2D, 0x2B, 0xEF, 0xD4, 0x64, 0xC9, 0x1D, 0x9D, 0x95, 0x73, 0x39,
-  0x9A, 0x7A, 0x10, 0x5A, 0x94, 0xEA, 0xFF, 0xD2, 0x56, 0xBE, 0xBE, 0xA2, 0x3B, 0x4B, 0xA7, 0x05,
-  0x46, 0x74, 0xD5, 0xF6, 0x16, 0x53, 0x3B, 0x78, 0x22, 0xC5, 0x2E, 0x4E, 0x9A, 0xF6, 0xAB, 0xDF,
-  0x5A, 0xAF, 0xAC, 0x5C, 0x54, 0xAF, 0x39, 0xBD, 0x4C, 0x18, 0x5B, 0x2B, 0x11, 0x2D, 0xD6, 0x05,
-  0x78, 0x52, 0xED, 0xCA, 0xB5, 0x4C, 0x58, 0x79, 0xCC, 0xD2, 0xC5, 0x25, 0x39, 0x5D, 0x8B, 0x14,
-  0xA9, 0x95, 0x5C, 0x37, 0xE5, 0xBD, 0x54, 0x4A, 0x7A, 0x9D, 0x41, 0x08, 0x90, 0xF3, 0x65, 0x59,
-  0x51, 0x13, 0x42, 0xB2, 0xC3, 0x9E, 0x9B, 0xF1, 0x15, 0x95, 0x75, 0x08, 0x09, 0x05, 0x95, 0x3C,
-  0x5F, 0xAE, 0x06, 0x80, 0x52, 0xF3, 0x91, 0xBF, 0xCB, 0xE5, 0x52, 0x8B, 0xAB, 0xC7, 0x58, 0xEA,
-  0x2C, 0x4D, 0x8A, 0xCC, 0x56, 0x7E, 0xA9, 0xEB, 0x8C, 0x54, 0x33, 0x32, 0x08, 0x45, 0xCE, 0xDC,
-  0x9C, 0xE5, 0x92, 0x33, 0x57, 0xC9, 0xCB, 0x5D, 0xEA, 0x74, 0x7E, 0x59, 0x54, 0x55, 0xBB, 0x92,
-  0x5D, 0x38, 0x47, 0x90, 0xB7, 0x65, 0xFD, 0x72, 0x46, 0x4F, 0x53, 0x27, 0x65, 0xE2, 0xA5, 0x18,
-  0xA9, 0x66, 0xA4, 0x07, 0x5D, 0x56, 0xBC, 0xF2, 0xFD, 0xF0, 0x36, 0x8B, 0xCA, 0xAF, 0x47, 0xA7,
-  0xF2, 0x72, 0x81, 0x4D, 0x38, 0x3D, 0xE4, 0x93, 0x25, 0x4F, 0xC6, 0xA3, 0xA1, 0xF3, 0x25, 0x6B,
-  0xC6, 0x11, 0x20, 0x14, 0x8C, 0x55, 0xB9, 0x6F, 0xAF, 0x64, 0xA5, 0x99, 0x25, 0xA5, 0x88, 0x3F,
-  0xBA, 0xDD, 0xC8, 0x0A, 0x4D, 0xEC, 0x62, 0x6C, 0x92, 0x25, 0x55, 0xA6, 0xAA, 0x9C, 0x2B, 0xAB,
-  0x5A, 0x2A, 0xE3, 0x03, 0x8E, 0x5F, 0xD7, 0xD5, 0x87, 0xF6, 0x8E, 0x64, 0xA4, 0x97, 0x49, 0xAE,
-  0x5F, 0x24, 0x6D, 0x4A, 0x23, 0x10, 0xE5, 0xAA, 0xD0, 0xBD, 0xFF, 0xD4, 0x85, 0x37, 0x00, 0x80,
-  0x52, 0xF7, 0x6F, 0xBA, 0x03, 0xBB, 0x4B, 0xAE, 0xCB, 0x3C, 0xC7, 0xA2, 0x7A, 0x49, 0xE3, 0xDA,
-  0xFE, 0x09, 0x1C, 0x3D, 0xAB, 0x7C, 0x8E, 0xEF, 0x8A, 0x16, 0x19, 0x4F, 0xCE, 0x4E, 0xD1, 0x8C,
-  0x27, 0x5C, 0x8E, 0xB0, 0xA8, 0x93, 0x40, 0x96, 0xA6, 0xA6, 0x92, 0x34, 0x04, 0x36, 0x7B, 0x8E,
-  0xD0, 0xF0, 0x7D, 0x61, 0x84, 0xE6, 0x78, 0x3E, 0x8A, 0xE3, 0x48, 0x16, 0xCD, 0x38, 0x20, 0x29,
-  0x92, 0xE2, 0x08, 0x4F, 0xE7, 0xF8, 0x78, 0xC6, 0xEA, 0xF2, 0x49, 0x92, 0xF0, 0x2D, 0x08, 0x35,
-  0xE1, 0x68, 0x32, 0xC7, 0xA2, 0x29, 0x42, 0x46, 0xD3, 0xB0, 0x69, 0xEA, 0x9A, 0x1C, 0x0E, 0xA8,
-  0x93, 0x3C, 0xC7, 0xF9, 0xBB, 0x5C, 0xE5, 0x17, 0x7C, 0xB4, 0x51, 0x84, 0xB3, 0x7B, 0xF3, 0x55,
-  0xB7, 0xA3, 0xF2, 0x9C, 0x5D, 0xF7, 0x96, 0xF7, 0x97, 0xD3, 0x52, 0x68, 0xE1, 0x8A, 0xB6, 0x95,
-  0xAC, 0xBC, 0xF6, 0x16, 0x2C, 0x7F, 0xF1, 0xA8, 0x8F, 0x94, 0xBA, 0x89, 0x14, 0xC9, 0x56, 0x6B,
-  0x29, 0xA2, 0x49, 0xAB, 0x6B, 0xBE, 0x9D, 0x25, 0x17, 0x5B, 0xE4, 0x29, 0x36, 0xA5, 0xD4, 0x72,
-  0x92, 0x60, 0x69, 0xDA, 0x19, 0x2B, 0xD5, 0x79, 0x32, 0xC3, 0x11, 0x27, 0xD0, 0x17, 0x10, 0x2A,
-  0xF9, 0x3F, 0xA9, 0xB8, 0x4A, 0x26, 0xCF, 0xF9, 0xB2, 0x2A, 0xA1, 0x8A, 0x25, 0x6F, 0x52, 0xEE,
-  0xC5, 0xBC, 0xBA, 0x52, 0xE8, 0x62, 0x6B, 0xBB, 0x58, 0xAB, 0xD4, 0x3A, 0x11, 0x7A, 0x12, 0x3A,
-  0x5F, 0x43, 0xAF, 0x3A, 0x8C, 0x67, 0x67, 0x17, 0x4E, 0x90, 0x73, 0x50, 0x09, 0x95, 0xBB, 0x00,
-  0x00, 0x19, 0x90, 0x65, 0xD1, 0x49, 0x92, 0xC4, 0xB3, 0xF8, 0xF2, 0xD7, 0x39, 0x39, 0x1B, 0xF6,
-  0x7C, 0x3B, 0x19, 0xBB, 0xCC, 0x75, 0x05, 0x57, 0xA8, 0x8C, 0x6C, 0x12, 0x02, 0x84, 0x24, 0x29,
-  0x2A, 0x45, 0x51, 0x24, 0x21, 0xCF, 0x18, 0x81, 0x24, 0xAA, 0xD6, 0xD5, 0x52, 0xAF, 0x68, 0x52,
-  0xA9, 0xE5, 0xB5, 0x22, 0x3B, 0x95, 0xD7, 0xDF, 0xD7, 0xDF, 0xFA, 0x57, 0xEB, 0xB2, 0x4C, 0x37,
-  0x99, 0x75, 0xDD, 0x4F, 0xB5, 0x53, 0xBA, 0xC0, 0x6B, 0x75, 0x2F, 0x27, 0x45, 0x7B, 0xD9, 0x66,
-  0x17, 0x9C, 0x4A, 0x52, 0x65, 0x6B, 0x42, 0x95, 0x46, 0xE9, 0x07, 0xB3, 0x3E, 0xAC, 0xE8, 0x83,
-  0xB5, 0xAF, 0x12, 0xBA, 0x4B, 0x1D, 0x00, 0xA0, 0x27, 0x00, 0x40, 0xFF, 0x03, 0x00, 0xD6, 0x27,
-  0x00, 0x00, 0x9B, 0x30, 0xE0, 0x60, 0x93, 0xF3, 0xD5, 0xF2, 0x19, 0xC6, 0x62, 0x77, 0xF5, 0x63,
-  0xA7, 0xA4, 0xEF, 0x44, 0xCC, 0x7A, 0x7F, 0x52, 0x4B, 0xF6, 0xF2, 0x9F, 0x2C, 0xA7, 0x08, 0x7F,
-  0xE5, 0xB2, 0x2E, 0xD3, 0x95, 0xAA, 0x56, 0x3E, 0xCA, 0xD4, 0x5D, 0xD5, 0x9B, 0x45, 0xBC, 0x14,
-  0x2A, 0x9D, 0x8A, 0x52, 0x16, 0xE4, 0x54, 0x46, 0x7E, 0x7E, 0x68, 0xE8, 0x14, 0xEF, 0x2E, 0xAB,
-  0xE4, 0x41, 0x0F, 0x39, 0xE3, 0x5E, 0xD4, 0xA3, 0xE4, 0xE5, 0x87, 0x92, 0xB0, 0x15, 0x34, 0xF4,
-  0xEF, 0x00, 0x80, 0x12, 0x68, 0x00, 0x80, 0x03, 0x00, 0xD8, 0x07, 0x83, 0x7B, 0xB1, 0x9D, 0x0A,
-  0x00, 0x00, 0xEF, 0x42, 0x42, 0xEF, 0x90, 0xDD, 0xB5, 0xD5, 0x1A, 0x3B, 0x04, 0xF2, 0xE9, 0x8D,
-  0xC8, 0xA6, 0xC8, 0x13, 0xD2, 0x5B, 0x8B, 0x74, 0xCD, 0x9F, 0x61, 0xA2, 0xBC, 0x94, 0xA4, 0xB3,
-  0xA2, 0xC8, 0x27, 0x4B, 0xD1, 0xC7, 0x79, 0xC8, 0xF6, 0xB6, 0x25, 0xA2, 0xF4, 0x8A, 0xD1, 0x43,
-  0x1F, 0x17, 0x52, 0x77, 0xBE, 0x24, 0x88, 0xD7, 0x89, 0x24, 0x24, 0x1C, 0xCF, 0x6A, 0x72, 0x2E,
-  0x57, 0xF3, 0xE7, 0x2C, 0x91, 0xBE, 0x28, 0x53, 0xBB, 0xC5, 0xDA, 0x6A, 0x3D, 0xF6, 0x7A, 0xE4,
-  0x65, 0x7B, 0x11, 0xC8, 0x5A, 0xE5, 0x22, 0x5B, 0x3E, 0x75, 0x75, 0x6A, 0x39, 0xBB, 0x4A, 0xCA,
-  0x2F, 0x56, 0xF2, 0xE5, 0x3F, 0x9A, 0x55, 0xE3, 0x5A, 0x9E, 0x5F, 0x8D, 0xD5, 0xFD, 0x18, 0xA3,
-  0xE8, 0xA3, 0x97, 0x8C, 0xD7, 0xC9, 0x77, 0x6F, 0x6C, 0xB5, 0x5A, 0x8F, 0x54, 0x40, 0x00, 0x00,
-  0xB2, 0x01, 0x00, 0xB2, 0x25, 0x00, 0x40, 0x4E, 0x2E, 0xBB, 0x00, 0x80, 0x35, 0xF4, 0x0E, 0x00,
-  0xD0, 0x01, 0x00, 0x00, 0x00, 0x06, 0xB0, 0x0A, 0x00, 0x10, 0xE8, 0x7F, 0xFD, 0x07, 0x00, 0x20,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x1F, 0x21, 0x08, 0x80, 0xB0, 0x0A,
-  0x00, 0x10, 0x03, 0x00, 0x60, 0x45, 0x10, 0x82, 0x1D, 0x00, 0xA0, 0x1F, 0x9F, 0xDE, 0x99, 0x86,
-  0x9E, 0x00, 0x00, 0x07, 0x3D, 0x61, 0x1F, 0xE4, 0x8F, 0x8F, 0x0E, 0xF5, 0x00, 0x80, 0x1E, 0x07,
-  0x00, 0x00, 0xD5, 0x4A, 0xA6, 0x03, 0x00, 0x4C, 0x76, 0x0C, 0x46, 0x10, 0x31, 0xE8, 0xDF, 0x1E,
-  0x00, 0x60, 0x78, 0x08, 0x60, 0x90, 0xA8, 0x00, 0x00, 0x09, 0x00, 0xAB, 0x21, 0x70, 0x10, 0x00,
-  0x24, 0x5C, 0x78, 0xAB, 0xCF, 0x20, 0xC7, 0x85, 0x7C, 0x00, 0x80, 0x69, 0x00, 0x80, 0x56, 0x43,
-  0x06, 0x11, 0xF0, 0x01, 0x00, 0x15, 0x1A, 0x0E, 0x72, 0x1B, 0x0E, 0xEA, 0xC8, 0x11, 0xD1, 0x61,
-  0x50, 0x00, 0x00, 0x79, 0xD8, 0x01, 0x00, 0x4E, 0x41, 0xAE, 0xBB, 0x50, 0x01, 0x00, 0xF4, 0x83,
-  0xC4, 0xB2, 0x07, 0x00, 0xB8, 0x21, 0x83, 0x86, 0xD3, 0xD0, 0x01, 0x00, 0x32, 0xDB, 0x86, 0x1C,
-  0xB8, 0x09, 0xE4, 0x2D, 0x1C, 0xE8, 0x3F, 0xDF, 0x8A, 0xA6, 0x00, 0x00, 0x00, 0xE4, 0xB0, 0x82,
-  0xC1, 0x0A, 0x2E, 0xD4, 0x32, 0x19, 0x11, 0xC2, 0x78, 0xE1, 0x02, 0x34, 0x3C, 0x00, 0x40, 0x1E,
-  0x02, 0x00, 0xF0, 0x90, 0x41, 0xA0, 0x0E, 0x00, 0x00, 0x1D, 0x0A, 0x2A, 0xEC, 0xB0, 0xA0, 0xAF,
-  0x04, 0x00, 0x04, 0x0E, 0x1A, 0x60, 0x41, 0x45, 0xA6, 0x86, 0x84, 0x04, 0x00, 0xF8, 0x15, 0x00,
-  0x60, 0x6D, 0x6B, 0x58, 0xC3, 0x08, 0x34, 0xCC, 0x75, 0x56, 0x50, 0x03, 0x00, 0x64, 0xE6, 0x60,
-  0x07, 0xC8, 0x0C, 0x2E, 0xB2, 0x10, 0x7D, 0x0F, 0x00, 0xD0, 0x70, 0x90, 0xC3, 0x2E, 0x00, 0x00,
-  0x19, 0x54, 0x75, 0x99, 0x82, 0x2B, 0x07, 0x00, 0xD8, 0x21, 0x53, 0xE0, 0x01, 0x00, 0xA0, 0x43,
-  0x97, 0xC3, 0x69, 0xE8, 0x12, 0x56, 0xB0, 0x60, 0x41, 0x87, 0x6E, 0x43, 0x87, 0xC1, 0x47, 0x00,
-  0x2A, 0x3D, 0xDC, 0x01, 0x00, 0xB8, 0xC9, 0x03, 0x00, 0xAC, 0x11, 0x10, 0x01, 0x00, 0x60, 0x0B,
-  0x00, 0x00, 0x22, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0xAB, 0x82, 0x7B, 0xF3, 0x1B, 0xD0, 0x02,
-  0x00, 0x00, 0x00, 0x00, 0x40, 0x04, 0x00, 0x00, 0x00, 0xDC, 0x05, 0x00, 0xD8, 0x01, 0x00, 0x3A,
-  0xFD, 0x58, 0x4F, 0xE4, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x41, 0x44, 0x00, 0x82, 0x40,
-  0x08, 0x20, 0x10, 0x00, 0x11, 0x00, 0x00, 0x44, 0x88, 0x00, 0xFD, 0x2F, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x78, 0xF2, 0xAF, 0x32, 0xFA, 0x1A, 0x04, 0x5B, 0x00, 0x2D, 0x40, 0x56,
-  0xD8, 0x27, 0x24, 0x41, 0x08, 0x00, 0x77, 0xD5, 0x4D, 0x04, 0xD2, 0x1F, 0x00, 0x00, 0x59, 0x01,
-  0x90, 0x08, 0x00, 0x10, 0x02, 0x21, 0x84, 0xD0, 0xB7, 0x20, 0x00, 0x30, 0x01, 0x00, 0x00, 0xFC,
-  0x00, 0x00, 0x00, 0x00, 0x80, 0x41, 0x08, 0x81, 0x08, 0x42, 0x00, 0x00, 0x11, 0x3D, 0x37, 0x00,
-  0x00, 0x00, 0x00, 0xC8, 0xDF, 0x40, 0xBF, 0x10, 0xA9, 0x04, 0x00, 0xA0, 0x2F, 0x42, 0x00, 0x11,
-  0x4E, 0x40, 0x76, 0x03, 0x45, 0x10, 0x84, 0x08, 0x00, 0x00, 0x00, 0x00, 0x22, 0x00, 0x80, 0x6C,
-  0x01, 0x00, 0x00, 0x60, 0x04, 0x00, 0x00, 0x50, 0x0B, 0x8C, 0x00, 0x64, 0xFA, 0x6D, 0x00, 0xD5,
-  0xE8, 0x97, 0x96, 0x0B, 0x0D, 0x77, 0xC7, 0x20, 0x00, 0x6B, 0x33, 0x80, 0xB8, 0x3F, 0xE8, 0x9B,
-  0x04, 0x00, 0x00, 0x00, 0x40, 0x0A, 0x32, 0x01, 0x00, 0x00, 0x80, 0x11, 0x00, 0x80, 0x55, 0x20,
-  0x92, 0xB0, 0x53, 0x04, 0x42, 0xAD, 0x1B, 0x14, 0x2B, 0xC2, 0x08, 0x10, 0x02, 0x20, 0x02, 0x00,
-  0x08, 0x01, 0x21, 0xD8, 0x3F, 0x08, 0xC0, 0x04, 0x41, 0x80, 0x08, 0x00, 0x00, 0xEB, 0x59, 0x2F,
-  0x10, 0x0E, 0xC6, 0x5C, 0xFB, 0x59, 0xD7, 0xD3, 0xCB, 0x7E, 0x8F, 0x31, 0xAD, 0x2E, 0x92, 0xA2,
-  0xA7, 0x5E, 0x1A, 0x89, 0xA0, 0xA8, 0x84, 0x14, 0x46, 0x4A, 0xCE, 0x9F, 0x1A, 0x8E, 0x93, 0x8C,
-  0x6C, 0x4A, 0x4A, 0xF6, 0x3D, 0x5B, 0x79, 0xFE, 0xC1, 0x84, 0x49, 0xF7, 0xE8, 0x77, 0x9B, 0x1F,
-  0x0A, 0x97, 0x89, 0xAA, 0xEF, 0x96, 0x57, 0xDA, 0xF4, 0xD6, 0xEB, 0x6F, 0xA5, 0x5B, 0x32, 0x77,
-  0xDA, 0x47, 0x6E, 0xF7, 0x5D, 0xD3, 0x95, 0x6E, 0x37, 0xBB, 0xB4, 0xE4, 0xA4, 0xED, 0x49, 0x33,
-  0xA3, 0x73, 0x4E, 0x91, 0x10, 0x3D, 0x33, 0x97, 0x72, 0x61, 0x57, 0x32, 0x3F, 0xB2, 0x7F, 0x1D,
-  0x5B, 0x27, 0x73, 0x65, 0xB2, 0x53, 0x4E, 0xAD, 0x69, 0xFD, 0xF1, 0xFE, 0x6B, 0xB1, 0xF9, 0x88,
-  0x14, 0x9B, 0x84, 0x4C, 0x44, 0x49, 0xBB, 0xDA, 0x11, 0x96, 0x8E, 0x11, 0xAF, 0x9A, 0xDC, 0xC9,
-  0x1E, 0x94, 0x91, 0x85, 0x2A, 0x41, 0x4C, 0x75, 0x95, 0x62, 0x6E, 0xA9, 0x1C, 0x5B, 0x9A, 0x3E,
-  0x00, 0x80, 0x0C, 0x00, 0xA0, 0x5F, 0x08, 0xF4, 0x1E, 0x77, 0xAF, 0xAD, 0x86, 0xDD, 0xDE, 0xD2,
-  0x85, 0xBA, 0x1D, 0x3E, 0x00, 0x20, 0x2F, 0x13, 0xB7, 0xEC, 0x26, 0xD4, 0xAB, 0x68, 0x80, 0xC5,
-  0xDA, 0x18, 0x45, 0xCB, 0xE8, 0xD7, 0xDC, 0x3F, 0x24, 0x2D, 0x4F, 0x3A, 0x66, 0xA5, 0x87, 0x2B,
-  0x15, 0x39, 0xCF, 0xA5, 0x77, 0x98, 0x00, 0x7D, 0x1B, 0x80, 0x7A, 0xBC, 0xD4, 0xB5, 0x9C, 0x10,
-  0x6C, 0x5D, 0xFA, 0x2E, 0x01, 0x74, 0xE9, 0x0E, 0x00, 0xC0, 0x1D, 0x18, 0xEA, 0xD8, 0xD3, 0x49,
-  0x02, 0x81, 0xEE, 0xA6, 0xD0, 0xB7, 0xFA, 0xBA, 0x7E, 0xC4, 0x1C, 0xAC, 0xD9, 0x00, 0xE4, 0xA9,
-  0x4F, 0x1B, 0x25, 0x5F, 0xAF, 0x55, 0x3F, 0x5F, 0x5A, 0xCB, 0x43, 0xD7, 0x52, 0x3D, 0x02, 0x15,
-  0x46, 0x80, 0xBB, 0x05, 0x76, 0x91, 0x2A, 0xA3, 0xCE, 0x31, 0xEE, 0x9A, 0x5E, 0x92, 0x49, 0xC6,
-  0x54, 0x8D, 0x5C, 0x96, 0x50, 0xBF, 0x6F, 0x91, 0x7F, 0x2B, 0x3A, 0x37, 0xFB, 0x0A, 0x09, 0x2B,
-  0x4F, 0xE7, 0x0E, 0x37, 0xE7, 0x00, 0x72, 0x01, 0xB8, 0xE0, 0xBF, 0x44, 0xAF, 0x83, 0x6C, 0x0A,
-  0x36, 0x2C, 0x5A, 0x56, 0x01, 0xA0, 0x92, 0xB5, 0x2A, 0x41, 0x5E, 0x65, 0xD1, 0xE1, 0x36, 0x40,
-  0x9B, 0xC1, 0xEA, 0x27, 0x5F, 0xB2, 0x22, 0x37, 0x7D, 0xFD, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x5C, 0x02, 0x00, 0xF4, 0xDD, 0x91, 0xAF, 0x0D, 0xBD, 0x32, 0x93, 0x9C, 0x61, 0x3A, 0x54, 0xE8,
-  0x51, 0x80, 0xB2, 0xF4, 0xCA, 0x52, 0xDD, 0x7E, 0xCE, 0xCC, 0x64, 0xE9, 0x3D, 0x00, 0x00, 0x2E,
-  0x5C, 0x00, 0x80, 0x1F, 0xA3, 0x8F, 0x4D, 0x27, 0x84, 0x4C, 0xD5, 0x54, 0x96, 0xEA, 0xCC, 0x5C,
-  0x91, 0x7E, 0xB3, 0xD7, 0xBB, 0xF1, 0xF7, 0x42, 0xAC, 0xE4, 0x93, 0x4D, 0xEE, 0x06, 0xD6, 0x85,
-  0x0B, 0x64, 0x9A, 0x75, 0x76, 0x7D, 0xFA, 0x06, 0xA7, 0xD2, 0xA4, 0xBD, 0x8C, 0xCC, 0xD2, 0xB9,
-  0xA7, 0x9C, 0x00, 0x00, 0x54, 0x1C, 0x05, 0x6D, 0x00, 0x1C, 0x5D, 0xD1, 0xCB, 0x09, 0xBD, 0x64,
-  0xB2, 0x05, 0x11, 0x11, 0x1F, 0xD0, 0x04, 0x08, 0xBF, 0x66, 0x24, 0x81, 0x30, 0x63, 0x84, 0x11,
-  0xDF, 0x5E, 0xB9, 0x6C, 0x2B, 0xEC, 0x15, 0x9D, 0x66, 0x93, 0xFB, 0x5B, 0xA6, 0xE1, 0x89, 0x70,
-  0x00, 0x02, 0x84, 0x00, 0x01, 0xAE, 0xBD, 0x3A, 0x1B, 0xE7, 0xC7, 0x3A, 0x9B, 0x8C, 0x1C, 0xEA,
-  0x1B, 0xC9, 0xED, 0xCF, 0x99, 0x65, 0x4F, 0x87, 0xBE, 0x41, 0xE4, 0xA8, 0x0F, 0x00, 0x1C, 0xEE,
-  0x3F, 0x33, 0x73, 0x05, 0xF6, 0x56, 0xDD, 0xAF, 0xF7, 0xC5, 0x1E, 0x7E, 0x3D, 0x58, 0xC1, 0x00,
-  0x00, 0xD8, 0xAA, 0x8D, 0x75, 0x59, 0x4D, 0x8A, 0x49, 0xB3, 0x27, 0xA9, 0x93, 0x4D, 0x4B, 0x68,
-  0xA6, 0xA5, 0xA5, 0x00, 0xA8, 0x02, 0x41, 0x5E, 0x1E, 0xEC, 0x0F, 0x00, 0xAF, 0x78, 0xB9, 0x0D,
-  0x00, 0xF0, 0xB3, 0xE3, 0x06, 0xEE, 0x84, 0xD5, 0xB0, 0x0F, 0x00, 0xA0, 0x77, 0xB8, 0xCF, 0x7B,
-  0xF7, 0x45, 0x3C, 0xEB, 0x13, 0x88, 0x84, 0x7A, 0x77, 0x03, 0x00, 0x96, 0x0E, 0xB9, 0x1C, 0xE8,
-  0x49, 0x00, 0x80, 0x7F, 0xCF, 0xA1, 0x53, 0xC2, 0x13, 0xBD, 0xE5, 0x1D, 0x02, 0xBC, 0x08, 0x36,
-  0xAC, 0x9A, 0x5D, 0x54, 0x00, 0xE1, 0x85, 0x09, 0x22, 0x7B, 0x55, 0xA0, 0x13, 0xB0, 0xBA, 0xFC,
-  0xD7, 0x62, 0x3C, 0xC4, 0x1F, 0x68, 0xE0, 0xCE, 0x00, 0x00, 0x00, 0x80, 0x41, 0x15, 0xF6, 0xA2,
-  0x84, 0xD8, 0xED, 0x9F, 0xC7, 0x69, 0x48, 0x69, 0x01, 0x00, 0x38, 0xB7, 0x7D, 0x70, 0x5F, 0xD0,
-  0x6F, 0xEC, 0xD0, 0x07, 0x00, 0xB0, 0xEE, 0x03, 0xC8, 0x0A, 0x2E, 0x97, 0x0D, 0x01, 0xC8, 0x12,
-  0xF6, 0x87, 0x55, 0xC8, 0xF9, 0x80, 0x2F, 0x44, 0x41, 0x87, 0xEF, 0x39, 0x88, 0x68, 0xD5, 0xB8,
-  0xA5, 0x88, 0x94, 0x44, 0x0C, 0xD2, 0x18, 0x21, 0xD0, 0xD1, 0xA4, 0x24, 0x99, 0x12, 0x49, 0x3A,
-  0x11, 0x5E, 0x49, 0xFA, 0x6A, 0x84, 0x10, 0x01, 0xA2, 0xE7, 0xD7, 0x5B, 0x08, 0xDE, 0x0B, 0x8E,
-  0xF0, 0xA3, 0xB5, 0x96, 0x9C, 0x67, 0xF0, 0x40, 0xA5, 0x4B, 0x64, 0xD3, 0x35, 0xA4, 0x2F, 0x46,
-  0x38, 0x80, 0x24, 0x50, 0x6F, 0x64, 0x24, 0x54, 0x20, 0x00, 0x4D, 0x01, 0x5C, 0xB5, 0xC4, 0x80,
-  0x10, 0xBE, 0x5E, 0x8E, 0x0D, 0x09, 0x15, 0x88, 0x00, 0xF8, 0x02, 0x00, 0x00, 0x84, 0x10, 0x02,
-  0x3A, 0xC1, 0x08, 0x00, 0x90, 0x3C, 0xD3, 0x84, 0x02, 0x08, 0x42, 0x81, 0x94, 0x22, 0xD0, 0x44,
-  0x41, 0xD0, 0x84, 0xA4, 0x8C, 0x12, 0xD0, 0x84, 0x34, 0x06, 0x48, 0x08, 0x01, 0x08, 0x14, 0x65,
-  0x10, 0x92, 0xA1, 0x48, 0x42, 0x53, 0xDC, 0xFA, 0x53, 0x00, 0xC0, 0x9D, 0x11, 0x98, 0x3B, 0x00,
-  0x00, 0xB7, 0x3D, 0xA4, 0x8F, 0x82, 0x81, 0x82, 0x6A, 0x83, 0x2A, 0xE0, 0x04, 0x51, 0x0F, 0x00,
-  0x68, 0x48, 0xD0, 0x4A, 0x4B, 0x4C, 0x00, 0xAC, 0x29, 0xA3, 0x28, 0x36, 0x6A, 0x4C, 0x66, 0xE8,
-  0x55, 0x24, 0xDC, 0x8A, 0xE4, 0x39, 0x3D, 0x8E, 0x24, 0x05, 0x28, 0x01, 0xB4, 0x18, 0x65, 0xA6,
-  0xAA, 0x9A, 0xA3, 0x01, 0x4A, 0x00, 0x24, 0xCD, 0x1C, 0x59, 0x11, 0x31, 0x05, 0x01, 0x63, 0x0C,
-  0xC0, 0x83, 0x0D, 0x01, 0x00, 0xC8, 0xFA, 0x00, 0xC0, 0x52, 0xCD, 0x94, 0x09, 0x00, 0xC0, 0x01,
-  0x00, 0x60, 0xDE, 0x07, 0x83, 0x4A, 0x4C, 0x44, 0xD3, 0x0E, 0x80, 0x00, 0x98, 0xD5, 0x44, 0x93,
-  0xA7, 0xA4, 0xF8, 0x25, 0xC5, 0x36, 0x26, 0xA8, 0x34, 0x00, 0x00, 0x28, 0x11, 0x69, 0x80, 0xF8,
-  0xAD, 0xA8, 0x84, 0x4E, 0x80, 0xA1, 0x19, 0x1F, 0x00, 0x90, 0xE6, 0xA5, 0x70, 0x0F, 0x1A, 0x90,
-  0x22, 0xC1, 0xBB, 0x4B, 0xDB, 0xAA, 0x24, 0x7A, 0x3E, 0x9D, 0x4A, 0x41, 0x6D, 0x52, 0x57, 0xAC,
-  0xEA, 0x67, 0x40, 0x3E, 0x35, 0xF4, 0xF3, 0xFD, 0x2A, 0x1C, 0x89, 0xF5, 0x32, 0x09, 0xE7, 0x0C,
-  0x55, 0x60, 0x11, 0x80, 0xCE, 0x67, 0x90, 0x11, 0xA6, 0x0B, 0x7D, 0x22, 0x09, 0x56, 0x2B, 0x53,
-  0x15, 0x8C, 0x6E, 0xB0, 0x79, 0xC2, 0x53, 0xF3, 0x1A, 0x1E, 0xD1, 0xD9, 0xE4, 0x69, 0x3A, 0xA1,
-  0xA6, 0x33, 0x2A, 0x97, 0xA7, 0xA6, 0xA4, 0x0E, 0x39, 0xB9, 0xAB, 0xF4, 0xDE, 0xEC, 0x1C, 0x64,
-  0x04, 0x76, 0x42, 0xA5, 0xB4, 0x37, 0x93, 0x36, 0x3B, 0xA9, 0x56, 0x96, 0x6B, 0x54, 0xF8, 0x61,
-  0x96, 0x48, 0x41, 0xCF, 0x89, 0xD9, 0xA9, 0x4E, 0x08, 0x45, 0xE9, 0x2C, 0x9A, 0xB4, 0xBE, 0xA3,
-  0x13, 0x4A, 0x00, 0x76, 0x67, 0x6B, 0xAF, 0x73, 0xC9, 0x14, 0x59, 0x5A, 0xA5, 0xA6, 0xC9, 0xE8,
-  0x70, 0xDB, 0xC6, 0xF1, 0x6C, 0xEF, 0x4A, 0x29, 0x0A, 0xBE, 0x00, 0xD9, 0xCD, 0x52, 0x27, 0xC9,
-  0x05, 0x38, 0xCB, 0x65, 0xEC, 0x5B, 0xFD, 0x42, 0x49, 0xFD, 0x9A, 0x07, 0xB6, 0xF0, 0xCE, 0x39,
-  0x31, 0x15, 0x2A, 0x3B, 0x8C, 0xCB, 0xCE, 0xA9, 0xC4, 0x52, 0x24, 0x0C, 0xC9, 0x6B, 0xAD, 0x7C,
-  0x35, 0xB9, 0x32, 0x3E, 0x20, 0x84, 0x4E, 0xA8, 0x26, 0x6A, 0x3F, 0xE5, 0x54, 0xB4, 0xA7, 0x29,
-  0x72, 0x25, 0x9B, 0x44, 0x76, 0x7D, 0xC5, 0xA9, 0xAD, 0xD9, 0xB3, 0x03, 0x6B, 0x2A, 0x79, 0xB2,
-  0xAF, 0x48, 0x72, 0x16, 0x49, 0xEA, 0x4A, 0x2C, 0x33, 0xC8, 0xCA, 0x52, 0x97, 0x5A, 0xF1, 0x66,
-  0x77, 0x90, 0xEA, 0x6A, 0x8D, 0x62, 0xCD, 0x86, 0x2C, 0xC5, 0x4D, 0x46, 0x06, 0x17, 0x5D, 0xB3,
-  0x0D, 0x73, 0x45, 0x91, 0x65, 0x4D, 0x5A, 0xA6, 0x9D, 0x4E, 0x2E, 0x0D, 0x9D, 0x57, 0x2F, 0x64,
-  0xEF, 0x3A, 0xF4, 0x06, 0x00, 0x90, 0x3C, 0x9B, 0x9F, 0x4F, 0xFA, 0x16, 0x97, 0x64, 0x8C, 0xE7,
-  0x65, 0xC6, 0x7A, 0x00, 0x80, 0xDE, 0xDF, 0xB0, 0xE5, 0xAC, 0x2F, 0x83, 0xCE, 0x2A, 0x8C, 0x41,
-  0xBD, 0xC0, 0x8A, 0x90, 0x91, 0x44, 0x7D, 0x0E, 0x71, 0xD4, 0x61, 0xFD, 0xE8, 0x69, 0xFF, 0xF5,
-  0x9D, 0x97, 0x56, 0xE1, 0xBB, 0x11, 0x2C, 0x81, 0x8C, 0x50, 0x13, 0xBE, 0x6C, 0x58, 0x11, 0x8E,
-  0xA6, 0x53, 0x14, 0x8D, 0x35, 0xA3, 0x52, 0x84, 0x90, 0x4F, 0x9D, 0xB3, 0xB7, 0x4E, 0x95, 0x49,
-  0xE8, 0x0D, 0x00, 0x20, 0x16, 0x00, 0x40, 0x64, 0x22, 0x08, 0xB2, 0x37, 0xE6, 0x0A, 0xFB, 0x07,
-  0xDC, 0x5B, 0x93, 0xD4, 0xF4, 0x90, 0x57, 0x53, 0x9C, 0x10, 0x75, 0x36, 0x39, 0x7A, 0xA0, 0x57,
-  0x3E, 0xA4, 0x2C, 0xF8, 0xE8, 0x6E, 0x58, 0x26, 0x1B, 0xB2, 0x5E, 0x6A, 0xC7, 0x7E, 0x83, 0xB5,
-  0x13, 0x00, 0x40, 0x9F, 0x57, 0xF4, 0xB8, 0xD5, 0xBB, 0x8F, 0xBC, 0xAF, 0xC8, 0x66, 0x65, 0xFF,
-  0x59, 0x1D, 0xC4, 0xEA, 0xB5, 0x3A, 0x7D, 0x6A, 0xE7, 0x3B, 0x39, 0xF9, 0x82, 0x25, 0xB6, 0x20,
-  0xBA, 0x30, 0x08, 0x11, 0x01, 0xD9, 0xDE, 0xA2, 0xDB, 0x5F, 0xF6, 0xA5, 0x88, 0xEA, 0x37, 0xB6,
-  0x35, 0x0F, 0xD4, 0x57, 0x51, 0x8B, 0xB6, 0x6E, 0x7A, 0x65, 0xC9, 0x5B, 0x01, 0x00, 0x50, 0xB6,
-  0x08, 0xB0, 0x36, 0xD5, 0x13, 0xB8, 0xD7, 0xD2, 0x1F, 0xC8, 0x99, 0xFF, 0x2A, 0x94, 0x1E, 0xEB,
-  0x74, 0xB2, 0x89, 0x88, 0x1F, 0xBC, 0x1A, 0xF8, 0x72, 0xFE, 0xD6, 0x58, 0xC9, 0x8E, 0xCF, 0xD5,
-  0x2D, 0xCB, 0x5E, 0x2B, 0xAC, 0x2C, 0x27, 0xCD, 0x14, 0x4A, 0x39, 0x56, 0x4E, 0x8B, 0x32, 0xA7,
-  0xCC, 0x88, 0x48, 0xA9, 0xFE, 0x94, 0x13, 0x2D, 0xE2, 0xA9, 0x8B, 0x4C, 0x4D, 0x6D, 0x9F, 0xF2,
-  0x54, 0xBF, 0x92, 0x95, 0xBE, 0x62, 0x5A, 0x97, 0xB6, 0x92, 0xFC, 0x72, 0xCD, 0x24, 0x27, 0x53,
-  0xCB, 0x4E, 0x99, 0xF3, 0xA3, 0xB6, 0x5B, 0x76, 0xFB, 0x6C, 0x6F, 0x9F, 0xB9, 0xEA, 0x74, 0xBB,
-  0x09, 0xF4, 0x62, 0xC9, 0xD3, 0x6E, 0xDD, 0xEE, 0x49, 0xA5, 0xE9, 0x82, 0xFA, 0x01, 0x00, 0x7E,
-  0x93, 0x75, 0x3B, 0xE2, 0xA3, 0x23, 0xB9, 0x13, 0x32, 0xD5, 0xBD, 0xD4, 0x6D, 0xBF, 0xAC, 0x73,
-  0xF2, 0x0A, 0x7A, 0x58, 0x33, 0x60, 0x13, 0xD8, 0xCA, 0x4F, 0xF4, 0x51, 0x64, 0xAC, 0xF2, 0xB5,
-  0x5D, 0x66, 0xC9, 0x5A, 0x05, 0x56, 0xE4, 0xC9, 0xDA, 0x6A, 0x2E, 0x79, 0xD1, 0xC3, 0x71, 0x15,
-  0x75, 0xAD, 0x3E, 0x4C, 0x32, 0xD4, 0x05, 0xFF, 0xCD, 0x75, 0x2A, 0x1C, 0x68, 0xAF, 0x8B, 0xD4,
-  0xAA, 0xF9, 0x82, 0x73, 0x4B, 0x71, 0x52, 0xA2, 0x78, 0xC3, 0x10, 0xD2, 0x96, 0x8C, 0x32, 0x46,
-  0x56, 0x18, 0xD4, 0x28, 0xB2, 0x2C, 0xAA, 0xFC, 0xF0, 0xAC, 0xAD, 0x52, 0x25, 0x30, 0x02, 0x40,
-  0xDB, 0x0A, 0x10, 0xD6, 0xAD, 0x66, 0xA9, 0xD7, 0xFA, 0x83, 0xE9, 0x71, 0xB2, 0xCD, 0xC9, 0x53,
-  0xFD, 0xDC, 0x92, 0x25, 0x0B, 0x78, 0x4E, 0xE5, 0xAF, 0xA1, 0xA1, 0x55, 0xF2, 0xBC, 0xD8, 0xCD,
-  0x8A, 0xD6, 0xE2, 0x83, 0x1B, 0xFD, 0xCC, 0x69, 0x99, 0xB7, 0x27, 0x4B, 0xB8, 0x8E, 0x2E, 0x64,
-  0x53, 0xD4, 0xFC, 0x1E, 0x2A, 0x0D, 0x34, 0x8B, 0x22, 0xD9, 0x53, 0xAE, 0xA9, 0xEB, 0xEC, 0xE8,
-  0x1C, 0xD9, 0xB6, 0xC6, 0xDA, 0x6B, 0x72, 0x7B, 0x3A, 0xD9, 0x14, 0x84, 0xCC, 0xBA, 0x5B, 0xB7,
-  0x4C, 0xE8, 0x23, 0xA4, 0x48, 0x77, 0x00, 0xF8, 0x16, 0x70, 0xEB, 0xA9, 0xA7, 0x9F, 0xD2, 0x6C,
-  0x25, 0xC9, 0x3A, 0xC8, 0xAF, 0x8B, 0xDB, 0x53, 0x3E, 0x20, 0x00, 0xD0, 0x16, 0xBD, 0x36, 0x7B,
-  0xAE, 0x9F, 0xFA, 0x24, 0x00, 0x50, 0x59, 0x29, 0x68, 0x35, 0x09, 0x49, 0x42, 0x2D, 0xEA, 0x33,
-  0xA0, 0x58, 0x19, 0xB0, 0xB6, 0x52, 0x07, 0x32, 0x16, 0x6B, 0x02, 0xEB, 0x2D, 0x00, 0xB2, 0x83,
-  0xE8, 0x00, 0x9D, 0x2E, 0x2D, 0x39, 0x0C, 0xBD, 0x07, 0x00, 0x00, 0xB0, 0x5E, 0x00, 0x58, 0xBF,
-  0x41, 0x36, 0x91, 0xB0, 0x81, 0x50, 0x21, 0xAC, 0x0B, 0x00, 0x40, 0xDF, 0x07, 0x9C, 0xE6, 0xAE,
-  0xC1, 0x5D, 0x91, 0x87, 0xDE, 0xE3, 0x3E, 0xD0, 0xFB, 0x1C, 0xB2, 0x07, 0x01, 0x00, 0xC8, 0x2E,
-  0xE2, 0xEF, 0x07, 0xF9, 0xF2, 0x89, 0x5E, 0x63, 0x83, 0x2C, 0x40, 0xBF, 0x91, 0xD4, 0xB9, 0x4B,
-  0x84, 0xEC, 0xCB, 0x73, 0x09, 0xF5, 0x0A, 0x38, 0xA8, 0x02, 0x2D, 0x00, 0x77, 0x52, 0x33, 0x00,
-  0x0A, 0xE0, 0x82, 0x61, 0x02, 0x4C, 0x00, 0xB4, 0x84, 0x78, 0xDD, 0x54, 0xB6, 0x3B, 0xE1, 0x4C,
-  0x36, 0xF9, 0xA7, 0xBD, 0xD4, 0xE1, 0x0B, 0x05, 0x0B, 0x5E, 0x65, 0x00, 0x61, 0x89, 0xC1, 0x00,
-  0x20, 0xC0, 0x40, 0x05, 0x00, 0x18, 0xC0, 0x08, 0x10, 0x81, 0x16, 0x0B, 0x00, 0x20, 0x90, 0x42,
-  0x88, 0xF3, 0xCD, 0x4F, 0x3F, 0xA4, 0x62, 0x2A, 0x06, 0xC9, 0xE2, 0x80, 0x69, 0xB1, 0x74, 0xCC,
-  0xFA, 0xAB, 0x03, 0x59, 0xF4, 0x64, 0x12, 0x3E, 0x08, 0x81, 0x10, 0x00, 0xE8, 0xBC, 0x0F, 0x1A,
-  0x52, 0xB4, 0x0D, 0xCF, 0x29, 0x02, 0x1E, 0x40, 0xF1, 0xCE, 0x34, 0x10, 0x02, 0xF5, 0x00, 0x18,
-  0xF1, 0xDB, 0x94, 0x54, 0xC6, 0x28, 0x00, 0xC0, 0xC4, 0xBB, 0x62, 0x4B, 0x53, 0x70, 0x04, 0x48,
-  0xAA, 0x2D, 0x15, 0x2F, 0x7A, 0x1A, 0xDA, 0x5D, 0x73, 0xC9, 0x8E, 0x84, 0x11, 0x39, 0x91, 0x04,
-  0x40, 0x08, 0x21, 0x42, 0x5C, 0x45, 0x3B, 0x0A, 0x0D, 0x21, 0x50, 0x84, 0x41, 0x88, 0x63, 0x00,
-  0x00, 0x55, 0xCA, 0x8A, 0x01, 0x2F, 0xB2, 0x74, 0x03, 0x8A, 0x63, 0x02, 0x00, 0x04, 0x08, 0x40,
-  0xF6, 0x02, 0x02, 0x6C, 0x63, 0x40, 0x20, 0x84, 0x10, 0x02, 0x21, 0x00, 0x25, 0x8C, 0x10, 0x42,
-  0x08, 0x40, 0xA6, 0x19, 0x24, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x42, 0x18, 0x74,
-  0xB2, 0x6B, 0x48, 0x6A, 0x99, 0x2F, 0x09, 0x6B, 0x41, 0x15, 0xBE, 0x62, 0x6A, 0x02, 0x83, 0x4B,
-  0x80, 0xCA, 0x22, 0x8C, 0x51, 0x33, 0x9A, 0x0D, 0x51, 0x89, 0x03, 0x00, 0x42, 0x32, 0x8A, 0x40,
-  0x20, 0x10, 0xE0, 0x08, 0x0C, 0xA0, 0x68, 0xC2, 0x11, 0x46, 0x7E, 0xC8, 0xDC, 0x47, 0x85, 0x17,
-  0x76, 0xE3, 0xA9, 0xEC, 0xBB, 0xC9, 0x00, 0x1A, 0xD8, 0x8C, 0x4C, 0x6D, 0xC9, 0x4C, 0x1C, 0xA5,
-  0x0B, 0x68, 0x86, 0xD4, 0xA1, 0xDD, 0xC4, 0x69, 0x80, 0x4A, 0x1A, 0x0C, 0x08, 0x84, 0x10, 0x02,
-  0xFD, 0x15, 0x00, 0x10, 0xB9, 0xB0, 0x56, 0x99, 0x6A, 0xAC, 0x87, 0xBB, 0xE6, 0x6E, 0x41, 0xB6,
-  0x35, 0xFD, 0xD2, 0x63, 0x56, 0x6F, 0xAD, 0x55, 0x55, 0xC9, 0xB5, 0x7E, 0xA5, 0x59, 0xE6, 0x94,
-  0xBF, 0xA5, 0x6E, 0xE9, 0xAA, 0xF2, 0x27, 0xB8, 0xFB, 0x0A, 0x28, 0x5B, 0xE1, 0xA7, 0x96, 0x70,
-  0xC2, 0xE1, 0x4E, 0xF3, 0x37, 0xEF, 0xFD, 0x64, 0xC9, 0x18, 0x69, 0x5A, 0xCA, 0x00, 0x00, 0x80,
-  0xC0, 0x02, 0x00, 0x48, 0xF2, 0xE1, 0x5A, 0xB3, 0x0E, 0xC8, 0xB3, 0x73, 0x87, 0x84, 0x83, 0x4D,
-  0x00, 0xC9, 0x94, 0x23, 0xE4, 0x27, 0x26, 0xC6, 0xCC, 0xA7, 0xF4, 0x3B, 0xA6, 0x94, 0x36, 0xBD,
-  0x6F, 0x9E, 0x86, 0x75, 0x47, 0xDF, 0xD7, 0x74, 0x97, 0x3D, 0xD0, 0x59, 0x02, 0x83, 0x7A, 0x79,
-  0x3A, 0x00, 0x40, 0xB3, 0xBB, 0x3B, 0x22, 0xD4, 0xC2, 0x40, 0x04, 0xC1, 0x20, 0x02, 0x08, 0x81,
-  0xE8, 0x64, 0x46, 0x26, 0x49, 0x5B, 0x76, 0xB3, 0x2D, 0x6B, 0xFE, 0x77, 0x6A, 0xB1, 0x14, 0xEF,
-  0x01, 0xA0, 0x52, 0x93, 0x33, 0x80, 0x4D, 0x5E, 0x53, 0xE9, 0x62, 0x01, 0xD0, 0xE4, 0xF4, 0xC2,
-  0x47, 0x47, 0x0A, 0x6C, 0xB3, 0xD2, 0xA3, 0x4B, 0x97, 0x5A, 0x0E, 0x51, 0x16, 0x5D, 0x9B, 0xCC,
-  0xCA, 0x4C, 0xBC, 0xA6, 0x1E, 0xF1, 0x4B, 0xF0, 0x01, 0xD2, 0x43, 0xE4, 0x84, 0xFB, 0x44, 0x26,
-  0x5F, 0x96, 0x78, 0x59, 0x36, 0xDF, 0x9A, 0xB0, 0x5F, 0x00, 0x80, 0xB4, 0x07, 0x00, 0x8E, 0x17,
-  0x75, 0x58, 0x3F, 0x02, 0x70, 0x7B, 0x88, 0x1B, 0x52, 0xBB, 0xA9, 0x8F, 0x54, 0x48, 0x3F, 0x73,
-  0x3B, 0xF5, 0xA9, 0x7A, 0x06, 0xD1, 0x3B, 0x00, 0x40, 0x37, 0xB8, 0x65, 0x33, 0x18, 0x01, 0x00,
-  0x4E, 0x10, 0x11, 0x01, 0x00, 0x11, 0x00, 0x20, 0x02, 0xD4, 0x09, 0x00, 0x20, 0x84, 0x5E, 0x75,
-  0x9B, 0x9F, 0x47, 0x04, 0x91, 0x0E, 0xFA, 0x48, 0xF7, 0x3B, 0xD8, 0x29, 0x74, 0xF0, 0xA3, 0x8D,
-  0xA5, 0x4D, 0x01, 0x00, 0x16, 0x64, 0xA9, 0x84, 0x26, 0x4F, 0xCD, 0x02, 0xBE, 0x4B, 0xC2, 0x52,
-  0x0A, 0xBA, 0x98, 0x1B, 0x58, 0xAC, 0xBA, 0x9C, 0x94, 0x13, 0x32, 0xB7, 0x64, 0x35, 0xAD, 0x01,
-  0xA0, 0x9D, 0x4D, 0x29, 0xB6, 0xD9, 0x6C, 0x01, 0xB2, 0xD6, 0xB6, 0x28, 0x51, 0x8C, 0x90, 0x7C,
-  0xBB, 0x5E, 0x06, 0x81, 0x80, 0x12, 0xA0, 0xD9, 0x4F, 0x5D, 0xBF, 0x17, 0xD3, 0xB2, 0xE2, 0xD4,
-  0xD6, 0x81, 0x75, 0x3A, 0x64, 0xFE, 0x87, 0x35, 0xEC, 0xBF, 0x0E, 0x50, 0xB3, 0x06, 0x46, 0x20,
-  0x09, 0x23, 0x00, 0x01, 0x08, 0x84, 0x00, 0x4F, 0x76, 0x2A, 0x6F, 0xB6, 0xFA, 0xA2, 0x36, 0xA0,
-  0xDC, 0x18, 0xD4, 0x60, 0x3A, 0x97, 0x00, 0xB0, 0x56, 0x99, 0xCD, 0xA0, 0xB2, 0x0E, 0x70, 0xC0,
-  0x34, 0x39, 0xC3, 0x20, 0x02, 0x15, 0x40, 0xB3, 0x18, 0x00, 0xC0, 0x09, 0x8B, 0xBF, 0xAC, 0x5A,
-  0x2F, 0xA4, 0xBC, 0xC8, 0x6D, 0xFB, 0xAB, 0x0C, 0x37, 0x00, 0xD4, 0xA5, 0xF3, 0xC2, 0x3C, 0xC5,
-  0xC9, 0x99, 0x53, 0x7F, 0xBD, 0xB4, 0x8B, 0xF8, 0x09, 0x7C, 0x0D, 0x7B, 0xB8, 0xC3, 0xB8, 0x78,
-  0xBD, 0x75, 0xC8, 0xFF, 0xD2, 0x04, 0xEC, 0xEF, 0xF4, 0x97, 0x00, 0x80, 0x64, 0xB9, 0xC9, 0x04,
-  0x80, 0xCC, 0xAE, 0x4C, 0x64, 0x8A, 0xFA, 0xD8, 0xF2, 0xDB, 0xE5, 0x8B, 0x01, 0x04, 0x62, 0x9F,
-  0x50, 0x1B, 0x84, 0x0A, 0x01, 0x00, 0x90, 0x97, 0xB9, 0x7C, 0xA6, 0x04, 0x13, 0x29, 0x10, 0xC7,
-  0xCC, 0x9B, 0x89, 0x14, 0x26, 0xA4, 0x6B, 0xC8, 0x17, 0x75, 0x41, 0x13, 0xCA, 0xCC, 0xC7, 0x7B,
-  0x21, 0x45, 0x4C, 0x49, 0x68, 0xAE, 0x98, 0x1F, 0xD1, 0xEB, 0xA7, 0x9F, 0x0D, 0xED, 0xDC, 0x4A,
-  0x03, 0x01, 0xC0, 0xA4, 0x76, 0xA0, 0x23, 0xBA, 0xD8, 0x8C, 0x24, 0xF2, 0x01, 0xC2, 0xCF, 0x03,
-  0x00, 0x2C, 0x0B, 0x2F, 0xFC, 0x26, 0xF9, 0xDB, 0xFC, 0x38, 0x29, 0x84, 0xB1, 0x0B, 0x91, 0x52,
-  0x43, 0x7C, 0xE9, 0x92, 0x9C, 0x31, 0xAA, 0x93, 0x1F, 0x59, 0xA1, 0xFA, 0x23, 0xFC, 0x10, 0x69,
-  0x01, 0x09, 0x5D, 0xAA, 0x46, 0x13, 0x53, 0x9F, 0xB4, 0x00, 0x84, 0xBF, 0x9C, 0xE1, 0x8B, 0x4D,
-  0xFC, 0x48, 0xDB, 0x07, 0xF0, 0x00, 0x96, 0x02, 0x80, 0x98, 0x84, 0x14, 0xD1, 0xCE, 0x23, 0xB1,
-  0x01, 0x40, 0x01, 0x00, 0x34, 0xFD, 0xF2, 0x3F, 0x21, 0x16, 0xCB, 0x90, 0xE2, 0x03, 0x94, 0x3E,
-  0xA1, 0x7F, 0x9E, 0xE9, 0xE0, 0x88, 0xA8, 0xE4, 0x7E, 0xAB, 0x4A, 0xB3, 0xBA, 0xA8, 0x9D, 0x21,
-  0x32, 0x19, 0xE4, 0x84, 0xE9, 0x22, 0xB7, 0xFC, 0xAF, 0x75, 0x17, 0xD0, 0xA5, 0x48, 0x6A, 0x02,
-  0xC5, 0x28, 0x42, 0x46, 0x19, 0xDF, 0x94, 0x64, 0x10, 0x20, 0x84, 0x20, 0xC4, 0x00, 0x00, 0x88,
-  0x32, 0x51, 0x22, 0x42, 0xD8, 0xB3, 0xCE, 0x9E, 0xFA, 0x0E, 0x9C, 0x66, 0x44, 0x40, 0xAE, 0xF7,
-  0x09, 0x6C, 0x80, 0xFC, 0xA3, 0x3B, 0x46, 0xE9, 0xA3, 0xA6, 0x65, 0x68, 0xF9, 0x26, 0x17, 0x12,
-  0xA0, 0x20, 0x64, 0x40, 0xAE, 0x72, 0x9A, 0x8F, 0xC6, 0x12, 0x68, 0x6E, 0x7E, 0x4E, 0x72, 0x29,
-  0x08, 0x8C, 0xB0, 0x93, 0xC1, 0x40, 0x3F, 0xD5, 0xD5, 0xBE, 0x67, 0xF2, 0xDE, 0x27, 0xDB, 0x4D,
-  0x32, 0xA1, 0x81, 0x9D, 0x1D, 0x50, 0x99, 0xC9, 0xE9, 0x8F, 0xDD, 0xCF, 0xCB, 0x25, 0xCD, 0xBD,
-  0xF1, 0x5A, 0xCD, 0x06, 0x08, 0xC9, 0x4A, 0x62, 0x77, 0xA1, 0x26, 0x92, 0x18, 0xF8, 0x0E, 0xC8,
-  0x34, 0x10, 0x7A, 0x39, 0xF5, 0x00, 0x00, 0xAD, 0x42, 0x49, 0x09, 0x59, 0xED, 0x3D, 0x0D, 0x40,
-  0x08, 0x34, 0x7B, 0x92, 0x96, 0x06, 0xC0, 0x00, 0xD2, 0x64, 0x37, 0x31, 0x80, 0xD2, 0xCC, 0x64,
-  0x90, 0x5C, 0x9F, 0x93, 0x00, 0x00, 0x83, 0x83, 0x83, 0x22, 0x6F, 0xC5, 0x95, 0x50, 0x0F, 0x80,
-  0x11, 0x07, 0x7F, 0x06, 0xE0, 0xCD, 0x04, 0x31, 0x9B, 0x61, 0x8B, 0x25, 0x76, 0xB7, 0x8F, 0xFE,
-  0xA2, 0x5B, 0x1C, 0x65, 0x75, 0x19, 0x97, 0xCE, 0x65, 0x40, 0xBE, 0xDA, 0xAE, 0x63, 0xD1, 0xDD,
-  0x7D, 0xD8, 0xAA, 0x42, 0xC4, 0xCC, 0x51, 0xC6, 0x44, 0x8C, 0x38, 0x9E, 0x84, 0xAF, 0x88, 0x30,
-  0xCE, 0xBC, 0x84, 0x94, 0x84, 0xE4, 0x99, 0x24, 0x89, 0x12, 0x5A, 0x4A, 0x5A, 0x8B, 0x26, 0x1A,
-  0xA6, 0x34, 0xEC, 0x05, 0x28, 0x9E, 0x48, 0x01, 0x39, 0x11, 0xB5, 0xB1, 0x5A, 0x80, 0x0E, 0x8F,
-  0xC7, 0x17, 0x09, 0x95, 0x10, 0xBA, 0x86, 0x22, 0x7B, 0x00, 0x00, 0x4F, 0x51, 0x09, 0xD4, 0x7B,
-  0xF8, 0x35, 0x14, 0x1D, 0x42, 0x78, 0x4A, 0xF7, 0x40, 0x7B, 0x2D, 0x88, 0x40, 0xAF, 0x31, 0x42,
-  0x80, 0x77, 0x00, 0x00, 0xF1, 0x00, 0x48, 0x4B, 0x82, 0x06, 0x00, 0xB9, 0x68, 0xCE, 0xD1, 0x06,
-  0x29, 0x3E, 0x5A, 0x0B, 0xF8, 0x61, 0x02, 0xB4, 0x92, 0x77, 0x00, 0xAB, 0x55, 0x9D, 0x03, 0x88,
-  0x9E, 0xE5, 0x2B, 0xC1, 0xF7, 0x50, 0x05, 0xF2, 0xC2, 0x48, 0x60, 0x60, 0x98, 0x41, 0xA4, 0x40,
-  0x4A, 0x26, 0x88, 0x10, 0x02, 0x01, 0x20, 0x05, 0x11, 0x20, 0x59, 0xDD, 0x57, 0x39, 0x42, 0x28,
-  0x5A, 0x20, 0x49, 0x13, 0x12, 0x22, 0xC5, 0x84, 0x61, 0x86, 0x19, 0x62, 0x92, 0x53, 0x4A, 0x94,
-  0xA0, 0x5C, 0x25, 0x15, 0x91, 0x27, 0x52, 0x8A, 0x08, 0xC5, 0x53, 0x24, 0x91, 0x62, 0xDE, 0x10,
-  0xA1, 0x84, 0x57, 0x02, 0x1C, 0x43, 0x80, 0x22, 0xAD, 0x38, 0xE5, 0x3F, 0x4D, 0x02, 0x84, 0x40,
-  0x85, 0xE4, 0x2B, 0x45, 0x13, 0x8A, 0x10, 0x29, 0x00, 0x5F, 0x80, 0xD4, 0x8A, 0x49, 0x80, 0x12,
-  0x25, 0xA8, 0x22, 0x84, 0x88, 0x54, 0x0C, 0x68, 0x42, 0x9F, 0x05, 0x94, 0xA0, 0x87, 0xD0, 0x12,
-  0xB3, 0x2A, 0x60, 0xBD, 0x80, 0x77, 0x1A, 0x26, 0x42, 0x40, 0xEA, 0x02, 0x9E, 0xE0, 0x2B, 0xC6,
-  0x5E, 0x4C, 0x20, 0xDF, 0xC3, 0x18, 0x62, 0x53, 0x22, 0xF0, 0x85, 0xD0, 0x24, 0x23, 0x66, 0x06,
-  0x40, 0x08, 0x81, 0x98, 0x01, 0xC0, 0x10, 0x22, 0x04, 0x13, 0x23, 0x08, 0x44, 0x20, 0x04, 0xA2,
-  0x6E, 0x14, 0xA1, 0x14, 0x83, 0x18, 0x03, 0x46, 0x60, 0xCC, 0x08, 0x18, 0x2A, 0xD2, 0x94, 0x02,
-  0x18, 0x89, 0x29, 0x8A, 0x4B, 0xB8, 0xE2, 0x84, 0x22, 0xA7, 0x4A, 0x31, 0xE2, 0x4A, 0x55, 0xA0,
-  0xF9, 0xA0, 0x3D, 0x00, 0x20, 0xA6, 0xD8, 0x6F, 0xE8, 0xDA, 0xD8, 0x43, 0x78, 0xE7, 0x67, 0x29,
-  0x38, 0xCE, 0x38, 0x6A, 0x1D, 0x48, 0x2D, 0x90, 0x35, 0x9D, 0x84, 0x10, 0x8E, 0x19, 0x31, 0x06,
-  0x40, 0xA8, 0x92, 0x18, 0x09, 0x29, 0x90, 0x26, 0x26, 0x20, 0xEA, 0x9B, 0xF5, 0xA1, 0xB4, 0x48,
-  0x91, 0x39, 0xB5, 0xE0, 0x67, 0xEA, 0x37, 0xE1, 0x28, 0xED, 0x94, 0x87, 0x8F, 0x33, 0x68, 0x01,
-  0x5F, 0x30, 0x40, 0xF1, 0x8C, 0xB8, 0xDD, 0x51, 0x1A, 0x2D, 0xE8, 0x5A, 0x98, 0x22, 0xA2, 0x04,
-  0xB1, 0x18, 0x4F, 0x19, 0x02, 0x31, 0x23, 0x5B, 0xB5, 0xE4, 0xDB, 0xCA, 0xDA, 0x3D, 0x52, 0xAB,
-  0x36, 0xC2, 0xF7, 0xCB, 0xDE, 0xD1, 0x01, 0x00, 0xA0, 0x68, 0x91, 0xEA, 0x15, 0x00, 0x00, 0x2E,
-  0x04, 0x21, 0x93, 0x27, 0x4D, 0xCA, 0x29, 0xC2, 0x57, 0xCC, 0xE2, 0xC4, 0x51, 0x14, 0x69, 0x90,
-  0x0C, 0x46, 0x48, 0x02, 0x14, 0x01, 0xEA, 0x87, 0x91, 0x34, 0xD0, 0xD2, 0x69, 0x13, 0xA2, 0x01,
-  0x00, 0xD3, 0xD4, 0x1F, 0xC0, 0x5E, 0xD2, 0x1C, 0x38, 0x1A, 0xC6, 0x04, 0xEA, 0x43, 0x2B, 0xF9,
-  0xAF, 0xD4, 0x45, 0x9B, 0x5A, 0xAB, 0x42, 0x9D, 0x01, 0x73, 0x72, 0x25, 0xB1, 0x20, 0x3A, 0x89,
-  0xEA, 0xF9, 0xC2, 0x4C, 0x7D, 0x04, 0x00, 0x4E, 0x85, 0x01, 0x00, 0xE4, 0xAC, 0x4B, 0x50, 0x27,
-  0x49, 0x36, 0x27, 0xC9, 0x53, 0x7A, 0xF9, 0x91, 0xBE, 0xCC, 0xAB, 0x14, 0xC5, 0xA7, 0x80, 0x9B,
-  0xA4, 0x7D, 0x2D, 0x92, 0xD1, 0x4A, 0xDE, 0x92, 0x2A, 0xED, 0x01, 0x5B, 0xFB, 0x3A, 0x55, 0x95,
-  0x8B, 0xEA, 0xCF, 0x75, 0x6D, 0x2F, 0xB3, 0x96, 0x7E, 0x7B, 0x92, 0x58, 0xEC, 0x36, 0x19, 0x0B,
-  0x42, 0xE1, 0x0A, 0x14, 0x01, 0x00, 0xD8, 0x5A, 0x97, 0x49, 0xA9, 0xA6, 0x4D, 0xA4, 0xBF, 0xBC,
-  0xA5, 0x5D, 0x41, 0xCB, 0x3D, 0x5A, 0x6D, 0x34, 0x7F, 0x90, 0x14, 0x01, 0xA0, 0x1F, 0x81, 0x10,
-  0x42, 0x80, 0xC8, 0xBC, 0x3F, 0xF4, 0x06, 0x33, 0x84, 0x58, 0x62, 0xF3, 0x19, 0xEC, 0xF7, 0x66,
-  0x20, 0x6C, 0xB6, 0xF4, 0x57, 0x9F, 0x7B, 0x00, 0x20, 0x14, 0x6A, 0x59, 0x60, 0x24, 0xD4, 0x02,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xD2, 0xA3, 0xD6, 0xB2, 0xC6, 0x50, 0xCA, 0xA4,
-  0xA2, 0xA2, 0xCA, 0x3E, 0xB5, 0xF9, 0x5A, 0xC6, 0x8A, 0x94, 0xD7, 0xD3, 0x21, 0x93, 0x6F, 0x0B,
-  0xFB, 0x8A, 0x97, 0x29, 0x38, 0x81, 0x89, 0xB8, 0x59, 0xD9, 0xCB, 0x76, 0x03, 0x80, 0x41, 0x6D,
-  0xED, 0xF8, 0x55, 0x10, 0x39, 0x3B, 0xF9, 0xBB, 0x9A, 0xAC, 0x3D, 0x39, 0x75, 0xEB, 0x03, 0x64,
-  0x38, 0xFD, 0x08, 0x34, 0x4B, 0x9E, 0xBD, 0x7C, 0x65, 0x3B, 0x4D, 0xA4, 0x60, 0x4C, 0x88, 0xB4,
-  0xF6, 0x54, 0x6A, 0x48, 0x00, 0x80, 0xE8, 0xDC, 0x6E, 0x1F, 0x18, 0x59, 0x02, 0xC3, 0x6C, 0x01,
-  0x56, 0xAE, 0x1E, 0xC7, 0x14, 0xFA, 0x87, 0x20, 0xCB, 0xD5, 0x39, 0x0A, 0x9B, 0x0B, 0x30, 0x6A,
-  0x14, 0xFB, 0x24, 0xC8, 0xA9, 0xC3, 0xBE, 0xEA, 0x03, 0x00, 0x49, 0x95, 0x24, 0x24, 0xF5, 0xB2,
-  0xB0, 0xB9, 0xC9, 0x07, 0xF2, 0xA5, 0x1C, 0x72, 0x16, 0x36, 0x50, 0x1F, 0x68, 0xF8, 0x8E, 0x6B,
-  0x05, 0x00, 0x00, 0x3B, 0x19, 0xCF, 0xBE, 0x01, 0xA2, 0xEA, 0x31, 0x72, 0x00, 0x58, 0x94, 0x92,
-  0x3F, 0x00, 0x00, 0x80, 0x7A, 0x3C, 0x80, 0x64, 0xAD, 0xD9, 0xBE, 0xBA, 0xFD, 0x86, 0xEF, 0xEF,
-  0x64, 0x36, 0x59, 0xA4, 0xDA, 0xD8, 0x25, 0x5A, 0x48, 0xC0, 0xA2, 0xC9, 0xAF, 0x98, 0x90, 0x59,
-  0xD2, 0x99, 0x91, 0x69, 0x44, 0x87, 0x9C, 0x82, 0xC5, 0xEB, 0x96, 0x3A, 0xAE, 0x5E, 0x9D, 0x92,
-  0x0D, 0x00, 0x00, 0x00, 0xD0, 0x33, 0x08, 0xC0, 0xC7, 0xCE, 0x07, 0x0C, 0x80, 0x2F, 0xEC, 0xE9,
-  0x10, 0x56, 0xAC, 0x1D, 0x51, 0x8B, 0xCA, 0x80, 0x10, 0xA0, 0x48, 0x10, 0x12, 0x0A, 0x6A, 0xC2,
-  0x07, 0x77, 0x04, 0x28, 0x2E, 0x3B, 0x00, 0x00, 0xD6, 0xC5, 0xDC, 0x96, 0x58, 0xAB, 0x2F, 0xF2,
-  0x36, 0x0C, 0x97, 0x7E, 0x3B, 0x91, 0x9C, 0x55, 0x77, 0x03, 0x60, 0x59, 0xCD, 0x0B, 0x1D, 0x02,
-  0x8F, 0x45, 0x54, 0x2D, 0xDF, 0xEB, 0x0D, 0xBE, 0x9D, 0x00, 0x50, 0x27, 0x8C, 0x4E, 0x9C, 0x7C,
-  0xDC, 0x97, 0xB1, 0x6C, 0x59, 0xB5, 0xF7, 0xCF, 0x58, 0x93, 0x9F, 0xFC, 0xD1, 0x93, 0x36, 0x42,
-  0x76, 0xD9, 0x9F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x10, 0x00, 0x08, 0x00, 0x00, 0x00,
-  0x00, 0x11, 0x44, 0x00, 0x84, 0x00, 0x00, 0x00, 0x5B, 0x09, 0x20, 0x4B, 0x1B, 0xD4, 0x13, 0x00,
-  0xAB, 0xEB, 0x54, 0x33, 0x1B, 0x00, 0xA0, 0x59, 0x1C, 0x5A, 0x0A, 0x03, 0x3F, 0x20, 0xC9, 0x1F,
-  0x0C, 0xCA, 0x78, 0x02, 0x9D, 0xF2, 0x82, 0x08, 0x38, 0x08, 0x70, 0xBF, 0xE4, 0x90, 0xE0, 0x6B,
-  0xEE, 0x91, 0xCA, 0x33, 0xFB, 0xA1, 0xA3, 0x25, 0x60, 0x02, 0x3A, 0xF1, 0xC2, 0x25, 0x20, 0x0B,
-  0x00, 0x50, 0x39, 0x55, 0xC1, 0x23, 0xDE, 0x9F, 0x09, 0x80, 0x12, 0x66, 0x01, 0x2B, 0x01, 0x90,
-  0x0B, 0x98, 0xE0, 0x09, 0xE0, 0x04, 0x23, 0x80, 0xF0, 0x4D, 0x58, 0xBF, 0x89, 0x10, 0x27, 0xB5,
-  0xD2, 0xC6, 0x89, 0x54, 0x14, 0x23, 0xC5, 0x08, 0xB8, 0x37, 0x1C, 0x65, 0x5E, 0xC0, 0x91, 0x8C,
-  0xF1, 0x4A, 0x92, 0x02, 0x28, 0x20, 0x5A, 0x24, 0xA1, 0x15, 0x27, 0x91, 0x02, 0x49, 0xB4, 0x30,
-  0x42, 0x78, 0x18, 0xAB, 0x00, 0x00, 0x00, 0x00, 0x83, 0x79, 0x02, 0x81, 0xA3, 0x27, 0xB9, 0x9C,
-  0x3E, 0x3D, 0x9E, 0x5C, 0x2A, 0x62, 0x31, 0xBC, 0x40, 0x95, 0xB6, 0x67, 0x01, 0x00, 0x80, 0x29,
-  0x1A, 0x5F, 0xA4, 0xAF, 0xD8, 0x1A, 0x5F, 0x5B, 0x7A, 0x9C, 0xFF, 0xBA, 0x96, 0x00, 0x00, 0xC9,
-  0xD7, 0xCA, 0x50, 0x80, 0xD3, 0x1A, 0xD4, 0x00, 0x00, 0x0F, 0xD5, 0x54, 0x80, 0x82, 0xA2, 0x60,
-  0xC2, 0x50, 0xDB, 0x94, 0x90, 0x2B, 0x49, 0xD2, 0x49, 0x26, 0x10, 0x42, 0x18, 0x03, 0xC6, 0x89,
-  0x05, 0x14, 0x81, 0x08, 0x7C, 0x6C, 0x40, 0x6F, 0x64, 0xE4, 0xA7, 0xC2, 0x01, 0x96, 0x6C, 0x19,
-  0xF1, 0xDA, 0x3D, 0x16, 0x3B, 0xA4, 0x27, 0x13, 0x32, 0x21, 0xA2, 0x8F, 0x5A, 0x27, 0x67, 0x2A,
-  0xC0, 0xBF, 0x04, 0x38, 0xC6, 0x76, 0xFA, 0x21, 0xA1, 0x34, 0x3A, 0xBB, 0x71, 0x41, 0xC4, 0x53,
-  0xD3, 0x00, 0xD0, 0x5D, 0x75, 0x42, 0xE7, 0x3C, 0x13, 0x47, 0x96, 0x1D, 0x72, 0x76, 0xA8, 0x4A,
-  0xB3, 0x59, 0x34, 0x90, 0x00, 0x00, 0x00, 0xF2, 0x47, 0x6E, 0xDA, 0x3A, 0xF4, 0xE3, 0x64, 0x14,
-  0x2C, 0x11, 0x82, 0xFA, 0xAC, 0x04, 0x00, 0xF8, 0x38, 0x5A, 0x8B, 0xDE, 0x21, 0x9A, 0x06, 0x11,
-  0x84, 0x08, 0x61, 0x1A, 0xC2, 0xFE, 0x0C, 0x8A, 0xA4, 0x24, 0xE9, 0x26, 0x25, 0x25, 0x07, 0x22,
-  0x04, 0x7D, 0xAE, 0x21, 0xDD, 0x00, 0xC0, 0x1E, 0xC8, 0xD4, 0xAD, 0x01, 0x2A, 0x2B, 0xC5, 0xE3,
-  0xD9, 0xC0, 0x2B, 0x1A, 0x2E, 0x00, 0x0D, 0x00, 0xEC, 0x69, 0x6E, 0x69, 0xAE, 0xCB, 0xE2, 0x19,
-  0xE4, 0x02, 0x09, 0xCC, 0xA0, 0x0E, 0xC6, 0xA7, 0xAE, 0x47, 0xC1, 0xDD, 0xE9, 0xF0, 0x2F, 0xAB,
-  0x2A, 0x12, 0xCA, 0x44, 0x09, 0xF1, 0x4A, 0x71, 0x1B, 0xFB, 0x49, 0xA7, 0x0F, 0x00, 0xB2, 0xB9,
-  0xC9, 0x2A, 0xA1, 0xB9, 0xC5, 0xA9, 0x35, 0x45, 0x00, 0x3C, 0x34, 0x3B, 0xC9, 0x15, 0xE4, 0x25,
-  0x7D, 0x6E, 0x19, 0xAB, 0xE2, 0x88, 0xE9, 0x79, 0xCD, 0xAC, 0x36, 0x4D, 0x20, 0x65, 0x3B, 0xA2,
-  0x15, 0xB8, 0x09, 0xC0, 0x95, 0x3B, 0x0A, 0x52, 0x91, 0xAC, 0x12, 0x46, 0xB6, 0x77, 0xD4, 0xEB,
-  0x16, 0xCB, 0xFF, 0xC2, 0xC1, 0xCC, 0xC8, 0x84, 0x64, 0x17, 0xA0, 0x77, 0x16, 0x5F, 0xB3, 0x68,
-  0x46, 0xF2, 0x75, 0x9B, 0x6B, 0x39, 0x9A, 0xCD, 0x57, 0x14, 0x79, 0x4D, 0xE7, 0x3A, 0x49, 0xA0,
-  0x69, 0x01, 0x20, 0x11, 0x8E, 0x63, 0x24, 0x21, 0x27, 0x24, 0x81, 0x83, 0x66, 0x64, 0x35, 0x83,
-  0x03, 0x82, 0x16, 0xED, 0x5F, 0x8E, 0x23, 0x04, 0xBE, 0x45, 0xC1, 0x0D, 0x00, 0x50, 0x2C, 0x50,
-  0x11, 0x4B, 0xF2, 0xCA, 0xA6, 0x2B, 0xE9, 0x58, 0x54, 0x3A, 0xF1, 0x35, 0x27, 0x17, 0xE9, 0xC1,
-  0xA4, 0x94, 0x8A, 0x51, 0x78, 0x2E, 0x9B, 0xA3, 0x0B, 0xF0, 0x9A, 0x24, 0xF9, 0x20, 0x90, 0x04,
-  0x00, 0x72, 0x91, 0xB0, 0x98, 0xB6, 0x4D, 0x54, 0x5D, 0x12, 0x5F, 0x38, 0x03, 0x00, 0xCA, 0x62,
-  0x3A, 0x70, 0x00, 0xF0, 0x04, 0x42, 0x78, 0x9A, 0x64, 0x12, 0x58, 0x69, 0x23, 0x2A, 0xE7, 0x48,
-  0xE2, 0xDB, 0xDA, 0x69, 0x58, 0x5E, 0x16, 0x62, 0x00, 0x46, 0x74, 0xF1, 0x0F, 0xC1, 0x66, 0x60,
-  0x0B, 0x3E, 0x42, 0x34, 0xDA, 0xE1, 0xD2, 0x02, 0x84, 0x16, 0x00, 0xA9, 0x1B, 0x9A, 0x28, 0x65,
-  0xC0, 0xFC, 0xBB, 0x13, 0x00, 0x80, 0xCA, 0x05, 0xDE, 0xC4, 0xF1, 0xE4, 0x8B, 0x4A, 0xD3, 0x60,
-  0x40, 0xB6, 0x6D, 0xED, 0x83, 0x92, 0x52, 0x32, 0x9E, 0xAA, 0xC9, 0x29, 0xA6, 0x35, 0x31, 0x7D,
-  0x52, 0xCA, 0x2C, 0x58, 0xAE, 0x47, 0xB4, 0x54, 0xA7, 0x6C, 0x2A, 0xC6, 0xF9, 0x5D, 0x23, 0x94,
-  0xDF, 0x46, 0x57, 0x04, 0xAA, 0x32, 0x5A, 0x0B, 0x09, 0x14, 0xDC, 0x46, 0x42, 0x6B, 0xFF, 0xB5,
-  0x12, 0x00, 0xE0, 0x04, 0xD2, 0xB2, 0x44, 0xAF, 0xCC, 0xA2, 0x3E, 0xC8, 0x09, 0xD7, 0xFB, 0xCB,
-  0x2B, 0xE9, 0x60, 0x00, 0x99, 0x11, 0x4A, 0x29, 0x05, 0xFD, 0x1D, 0x38, 0x09, 0xED, 0xEC, 0xA6,
-  0x7A, 0x4E, 0x12, 0x3F, 0x2F, 0xED, 0x54, 0x2E, 0x24, 0xBE, 0x6F, 0x74, 0x0D, 0xF1, 0x8B, 0x8C,
-  0x23, 0x14, 0xB5, 0x27, 0x9F, 0xAF, 0xDB, 0xE7, 0xB8, 0x2C, 0x18, 0x3C, 0x9D, 0x6E, 0x9A, 0x90,
-  0x84, 0x00, 0xC0, 0x82, 0x11, 0xA2, 0x54, 0x5B, 0x4A, 0xDF, 0xB7, 0x12, 0x9B, 0xFD, 0xF8, 0x9E,
-  0x10, 0x15, 0xED, 0x95, 0xA4, 0xC3, 0xA2, 0x39, 0x27, 0xB7, 0x6D, 0x25, 0x50, 0x79, 0xB9, 0xA8,
-  0x5C, 0x3F, 0x55, 0xCB, 0xB7, 0x8C, 0x9C, 0xCE, 0x98, 0xE1, 0x68, 0x41, 0xC4, 0x32, 0xA5, 0x4B,
-  0xA9, 0x88, 0xD4, 0x4C, 0x32, 0xB8, 0x85, 0x55, 0xCE, 0x47, 0x20, 0x44, 0x01, 0x00, 0xE4, 0x55,
-  0x8E, 0xB0, 0xFA, 0x77, 0x10, 0x20, 0xBC, 0x40, 0x03, 0x00, 0x98, 0x2D, 0x8D, 0xB2, 0x68, 0xC2,
-  0xCA, 0x28, 0xD7, 0x68, 0x11, 0x6D, 0x2D, 0xB2, 0xEA, 0x6B, 0x68, 0xE5, 0x0C, 0x41, 0x44, 0x5D,
-  0x31, 0x91, 0x0A, 0x63, 0xDB, 0x0A, 0xAD, 0x28, 0x33, 0x9A, 0x06, 0x9D, 0xC5, 0x44, 0x2D, 0x13,
-  0xAF, 0xBC, 0x80, 0x3A, 0x13, 0x57, 0x0A, 0xF3, 0x27, 0x93, 0x54, 0x00, 0x40, 0xBB, 0x77, 0xFF,
-  0xE9, 0x08, 0xBB, 0xDC, 0x2E, 0xC8, 0x69, 0xA6, 0x92, 0x37, 0x19, 0xF8, 0xC0, 0x92, 0x86, 0x6D,
-  0x97, 0x72, 0xB9, 0xF3, 0xDC, 0x59, 0xB1, 0x79, 0x0A, 0x6E, 0x02, 0x64, 0x03, 0x00, 0xD4, 0x01,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12,
-  0x9A, 0x01, 0x30, 0x02, 0x00, 0x1C, 0x81, 0xF3, 0xDF, 0xE9, 0x86, 0x14, 0x8A, 0x96, 0x41, 0x2E,
-  0xE3, 0x9C, 0x86, 0x01, 0xC9, 0xB7, 0x82, 0x26, 0x49, 0x2B, 0xC5, 0xD0, 0xFE, 0x74, 0x79, 0x97,
-  0x56, 0x4D, 0x5C, 0x6E, 0x58, 0xF0, 0x23, 0xF8, 0x1B, 0x5E, 0x31, 0x00, 0x60, 0x04, 0x00, 0x00,
-  0xA3, 0xF8, 0x49, 0xDC, 0xCF, 0xD0, 0x22, 0x56, 0x0C, 0x0D, 0x0D, 0x83, 0xDD, 0x07, 0x0C, 0xBA,
-  0xE8, 0x00, 0x00, 0x01, 0x34, 0x74, 0xC2, 0xAC, 0x1F, 0x00, 0x30, 0xAA, 0x10, 0xF1, 0x50, 0xA4,
-  0x3E, 0x12, 0xE0, 0x14, 0x0D, 0xE4, 0x95, 0x4C, 0xD3, 0xDD, 0x92, 0x28, 0xDA, 0xBA, 0xBC, 0x73,
-  0x5A, 0x0E, 0x07, 0x00, 0x50, 0x4A, 0x55, 0x4B, 0x79, 0x75, 0xB9, 0xB7, 0xBD, 0x0C, 0x58, 0x84,
-  0x8C, 0xAE, 0xF8, 0x33, 0x13, 0x4D, 0x61, 0x59, 0xD2, 0x5E, 0xA4, 0xAB, 0xD7, 0xE9, 0x98, 0x58,
-  0x49, 0x63, 0x62, 0x41, 0x17, 0x66, 0x9F, 0x93, 0x10, 0x81, 0x33, 0xA3, 0x98, 0x71, 0xF6, 0xBB,
-  0x5E, 0x6D, 0xA5, 0xF9, 0x5F, 0x9F, 0xB8, 0x85, 0x6D, 0xB6, 0xF4, 0xB2, 0x7D, 0xA5, 0x34, 0x71,
-  0x29, 0x80, 0x2A, 0xC1, 0x98, 0xB4, 0xCD, 0x89, 0x02, 0xC8, 0x37, 0xA5, 0x54, 0x53, 0x5D, 0x99,
-  0xEF, 0x9D, 0xF3, 0x2C, 0xE9, 0xC4, 0x2A, 0xFD, 0xE8, 0x19, 0x65, 0xC3, 0x55, 0x87, 0xCC, 0xD4,
-  0x5F, 0x5B, 0x03, 0x64, 0xC7, 0xAD, 0x58, 0x29, 0x94, 0x90, 0xE7, 0x95, 0x7C, 0x00, 0xA8, 0xEE,
-  0xDC, 0x24, 0x37, 0xAC, 0xB4, 0xD5, 0xB2, 0x00, 0x84, 0x9B, 0x23, 0xF0, 0xAC, 0x64, 0x5F, 0xFD,
-  0x5E, 0xA5, 0xBB, 0xD7, 0x54, 0xBF, 0x64, 0x1F, 0x42, 0x7E, 0x16, 0x6B, 0x02, 0x91, 0x51, 0x72,
-  0x00, 0xFA, 0xF4, 0xB8, 0x50, 0x87, 0xE8, 0x35, 0x00, 0xD6, 0x00, 0x6F, 0xE5, 0xC0, 0x7E, 0x77,
-  0x6C, 0x81, 0x6C, 0x76, 0x97, 0x1F, 0x80, 0x80, 0x10, 0x00, 0x80, 0x10, 0xB7, 0x7E, 0x23, 0xFB,
-  0x80, 0x58, 0xD2, 0xAE, 0xC6, 0xF4, 0x5A, 0xEA, 0x5B, 0x2D, 0x93, 0x77, 0xB0, 0x91, 0x91, 0x01,
-  0x30, 0xAA, 0xC5, 0x4F, 0x60, 0xD9, 0x19, 0x57, 0xB4, 0x07, 0x00, 0x00, 0xD8, 0xB7, 0x5E, 0xB5,
-  0x3E, 0x50, 0x65, 0x12, 0xD6, 0xFF, 0xA0, 0x3C, 0x04, 0x08, 0xA1, 0xF2, 0x15, 0x90, 0x54, 0x3A,
-  0xF9, 0xC5, 0x11, 0xE4, 0x67, 0x1C, 0x21, 0x64, 0x1F, 0x00, 0x94, 0x14, 0x76, 0x4D, 0xFE, 0xF8,
-  0xB7, 0xEC, 0x51, 0xA9, 0xD5, 0x2D, 0x03, 0x49, 0xA8, 0x5F, 0x89, 0x49, 0x00, 0x10, 0xD9, 0x8C,
-  0x45, 0x48, 0x29, 0xE8, 0x93, 0xF3, 0x6B, 0x81, 0x69, 0xD8, 0xFD, 0xCB, 0xCA, 0xBE, 0x3D, 0xC2,
-  0x0B, 0x70, 0x0B, 0x40, 0x86, 0xB5, 0xBC, 0xAC, 0x7C, 0x85, 0xAC, 0x5E, 0x41, 0x04, 0x40, 0x04,
-  0xF8, 0x13, 0x32, 0xC9, 0x88, 0x0E, 0x11, 0x28, 0xC3, 0x40, 0xD6, 0xD5, 0x90, 0xCA, 0x84, 0x66,
-  0xFC, 0x90, 0x48, 0xA8, 0x8D, 0x24, 0x92, 0x51, 0x19, 0x23, 0x1C, 0x9A, 0x04, 0x00, 0x08, 0x2C,
-  0x0A, 0x8E, 0x10, 0x9A, 0x77, 0x0C, 0x14, 0xC5, 0x0B, 0x09, 0x80, 0x27, 0x34, 0xF7, 0x98, 0xE2,
-  0x85, 0x97, 0x40, 0x4B, 0x00, 0x18, 0xB9, 0x52, 0x78, 0x08, 0x5A, 0x60, 0x86, 0x89, 0xBB, 0x5D,
-  0xA6, 0x0B, 0xB4, 0xC0, 0xFB, 0xD8, 0x27, 0x55, 0xA1, 0xDB, 0x8B, 0x96, 0xD4, 0xB4, 0x51, 0x0A,
-  0x80, 0xDF, 0x29, 0xA5, 0xA1, 0x91, 0x02, 0x00, 0x6C, 0xAD, 0x44, 0x81, 0x44, 0x38, 0x42, 0x20,
-  0x00, 0x90, 0x34, 0x24, 0xC1, 0x12, 0x00, 0x40, 0x46, 0x00, 0xA6, 0x4B, 0x09, 0xEA, 0x02, 0x6D,
-  0x33, 0x00, 0x78, 0x01, 0x00, 0x00, 0x00, 0x92, 0x00, 0x00, 0x3E, 0xB6, 0x01, 0x00, 0x12, 0x02,
-  0x54, 0x63, 0xF4, 0x67, 0x00, 0xC0, 0x00, 0xA8, 0x40, 0x11, 0x46, 0x18, 0xAB, 0x0B, 0x70, 0x84,
-  0xAF, 0xE0, 0x9B, 0x71, 0x6C, 0x42, 0x73, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8A, 0x6B,
-  0xD7, 0xA6, 0xAA, 0x8E, 0x13, 0x40, 0x11, 0x13, 0x25, 0x90, 0xE2, 0x3D, 0xF0, 0xDE, 0x4F, 0x01,
-  0x00, 0xD2, 0xF7, 0x00, 0x00, 0x40, 0x9A, 0xDF, 0x82, 0x04, 0x28, 0x4E, 0xB4, 0xE2, 0xC7, 0xCC,
-  0x1B, 0x2D, 0x01, 0x46, 0xC0, 0x23, 0xC0, 0x74, 0xF7, 0x15, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0xBD, 0x4D, 0x6F, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE8, 0xD9,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x7A, 0x3B, 0x40, 0x6F, 0x0B, 0x00, 0x00,
-  0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x60, 0x5F, 0xBA, 0xFE, 0x2B,
-  0xEF, 0xDE, 0x8B, 0x0B, 0xC8, 0x3A, 0xD1, 0x9F, 0x6F, 0x30, 0xD9, 0x41, 0x3F, 0x7A, 0x75, 0x6B,
-  0xF2, 0xEA, 0x7B, 0xD3, 0x67, 0xAD, 0xAD, 0xD3, 0x9B, 0xDD, 0xBB, 0x73, 0x99, 0x04, 0x08, 0xB9,
-  0x0B, 0x20, 0xD3, 0xCF, 0x75, 0x97, 0xAE, 0xEE, 0xB6, 0x2A, 0x6E, 0x29, 0x6C, 0xF5, 0x08, 0x4A,
-  0x6B, 0xAB, 0x06, 0xC0, 0x89, 0x90, 0x3D, 0xC5, 0x4C, 0x43, 0x29, 0xE6, 0x24, 0x4C, 0x02, 0x22,
-  0x40, 0x04, 0x81, 0x93, 0x92, 0x21, 0x97, 0x28, 0xF1, 0x4F, 0x02, 0xC0, 0x8F, 0x13, 0x42, 0x7A,
-  0x08, 0xA9, 0xA4, 0xE2, 0x34, 0x5E, 0x50, 0x38, 0x03, 0x00, 0x20, 0x07, 0x46, 0x04, 0x70, 0x4B,
-  0x00, 0x06, 0x08, 0x00, 0x01, 0x00, 0x36,
+    0x04, 0x26, 0x41, 0x3A, 0x38, 0x62, 0x66, 0x39, 0x33, 0x62, 0x64, 0x65, 0x2D, 0x66, 0x38, 0x31, 0x61, 0x2D, 0x34,
+    0x66, 0x31, 0x63, 0x2D, 0x38, 0x36, 0x34, 0x30, 0x2D, 0x66, 0x63, 0x39, 0x65, 0x32, 0x61, 0x38, 0x34, 0x32, 0x33,
+    0x36, 0x39, 0x24, 0x34, 0x32, 0x37, 0x33, 0x62, 0x38, 0x64, 0x33, 0x2D, 0x33, 0x37, 0x30, 0x66, 0x2D, 0x34, 0x38,
+    0x64, 0x39, 0x2D, 0x39, 0x64, 0x33, 0x35, 0x2D, 0x37, 0x64, 0x66, 0x38, 0x34, 0x65, 0x61, 0x38, 0x64, 0x36, 0x61,
+    0x37, 0x1E, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x56,
+    0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9D, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF9, 0x26, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xD9, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9D,
+    0xA1, 0xD1, 0xEC, 0x05, 0x01, 0x04, 0x01, 0x19, 0x06, 0x00, 0x09, 0x04, 0x00, 0x02, 0x01, 0x03, 0x06, 0x04, 0x19,
+    0x01, 0x00, 0x04, 0x00, 0x06, 0x01, 0x07, 0x06, 0x08, 0x19, 0x05, 0x01, 0x00, 0x09, 0x01, 0x00, 0x0A, 0x01, 0x00,
+    0x0B, 0x06, 0x00, 0x0C, 0x01, 0x0D, 0x02, 0x0E, 0x03, 0x0F, 0x04, 0x10, 0x05, 0x11, 0x00, 0x00, 0x04, 0xC3, 0x0F,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xB0, 0xB6, 0xE9,
+    0x05, 0xE0, 0xB9, 0xBF, 0x9B, 0x02, 0xA1, 0x99, 0xE5, 0xC2, 0x02, 0x00, 0x01, 0x05, 0x04, 0x00, 0x13, 0x01, 0x14,
+    0x06, 0x15, 0x19, 0x12, 0x04, 0x00, 0x17, 0x01, 0x18, 0x06, 0x19, 0x19, 0x16, 0x00, 0x01, 0x00, 0x00, 0x00, 0xC4,
+    0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xB0, 0xB6,
+    0xE9, 0x05, 0x9F, 0xA1, 0xC5, 0x9B, 0x02, 0xF1, 0xE0, 0xEB, 0xC2, 0x02, 0x00, 0x01, 0x05, 0x04, 0x00, 0x1B, 0x01,
+    0x1C, 0x06, 0x1D, 0x19, 0x1A, 0x04, 0x00, 0x1F, 0x01, 0x20, 0x06, 0x21, 0x19, 0x1E, 0x00, 0x01, 0x00, 0x00, 0x00,
+    0xC5, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xB0,
+    0xB6, 0xE9, 0x05, 0xF6, 0xFE, 0xCF, 0x9B, 0x02, 0x97, 0xDB, 0xEF, 0xC2, 0x02, 0x00, 0x01, 0x05, 0x04, 0x00, 0x23,
+    0x01, 0x24, 0x06, 0x25, 0x19, 0x22, 0x04, 0x00, 0x27, 0x01, 0x28, 0x06, 0x29, 0x19, 0x26, 0x00, 0x01, 0x00, 0x00,
+    0x00, 0xC6, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
+    0xB0, 0xB6, 0xE9, 0x05, 0x80, 0xDC, 0xC1, 0x9B, 0x02, 0x81, 0xF2, 0xE4, 0xC2, 0x02, 0x00, 0x01, 0x05, 0x04, 0x00,
+    0x2B, 0x01, 0x2C, 0x06, 0x2D, 0x19, 0x2A, 0x04, 0x00, 0x2F, 0x01, 0x30, 0x06, 0x31, 0x19, 0x2E, 0x00, 0x01, 0x00,
+    0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xB3, 0xE6, 0xCC, 0x19, 0x00, 0xFF,
+    0x22, 0x11, 0xEE, 0xFF, 0xB0, 0xB6, 0xE9, 0x05, 0xAA, 0x02, 0xC0, 0xF0, 0xE7, 0xB6, 0x04, 0xFE, 0xFF, 0xC8, 0x85,
+    0x05, 0xE0, 0x78, 0xFD, 0x1C, 0xE0, 0xB3, 0x01, 0xC0, 0x30, 0xFC, 0x90, 0x03, 0xC2, 0xBB, 0x02, 0x86, 0x9D, 0x03,
+    0xFE, 0xAB, 0x01, 0xFE, 0xA5, 0x03, 0xFE, 0x9A, 0x01, 0x80, 0xBD, 0x02, 0x84, 0x14, 0xFE, 0x6B, 0xFA, 0x31, 0x80,
+    0xF9, 0x01, 0xFF, 0xB8, 0x01, 0xFD, 0x59, 0xFF, 0xD7, 0x01, 0xFE, 0xC0, 0x01, 0xF9, 0x8C, 0x01, 0x82, 0x54, 0xFF,
+    0xA8, 0x01, 0xFE, 0xC7, 0x04, 0xFC, 0x6F, 0xFD, 0x36, 0x84, 0x51, 0xFE, 0x7A, 0xFA, 0x31, 0x81, 0x38, 0x82, 0x50,
+    0x84, 0x49, 0x82, 0x50, 0x80, 0x69, 0xFF, 0x84, 0x01, 0xFE, 0x43, 0x82, 0x4A, 0x80, 0x5A, 0xFC, 0xF1, 0x01, 0x82,
+    0x90, 0x02, 0xFE, 0x52, 0xFC, 0x58, 0xF9, 0x36, 0x84, 0x0C, 0xFA, 0x5F, 0x82, 0x75, 0xFF, 0x05, 0x83, 0x0E, 0x84,
+    0x3F, 0x82, 0x4A, 0x80, 0xBE, 0x01, 0x81, 0x0F, 0xFE, 0x3F, 0x82, 0x3F, 0x80, 0x35, 0x83, 0xA6, 0x02, 0xFE, 0x9E,
+    0x02, 0x86, 0xA2, 0x01, 0x84, 0xB2, 0x01, 0xFC, 0xF4, 0x02, 0xFE, 0xFD, 0x01, 0x80, 0x83, 0x01, 0x80, 0xA3, 0x01,
+    0x82, 0x0A, 0x82, 0x97, 0x01, 0xFC, 0xDE, 0x02, 0x80, 0xC4, 0x01, 0x82, 0x20, 0xFE, 0xCC, 0x01, 0x82, 0x73, 0xFC,
+    0xAD, 0x01, 0xFE, 0x39, 0x82, 0xA6, 0x01, 0x82, 0x8F, 0x01, 0x80, 0x21, 0x80, 0x30, 0x82, 0xF4, 0x01, 0x80, 0x35,
+    0xFE, 0x58, 0x82, 0x73, 0x80, 0x0B, 0xFE, 0xCB, 0x01, 0x82, 0x12, 0x80, 0x7A, 0xFB, 0x0C, 0xFC, 0x89, 0x02, 0x85,
+    0xA2, 0x01, 0x82, 0x13, 0xFF, 0xD1, 0x01, 0x80, 0x60, 0xFF, 0x48, 0x82, 0x50, 0x80, 0x28, 0x82, 0x3F, 0xFF, 0x22,
+    0x85, 0x42, 0x80, 0x06, 0xFF, 0x2F, 0xF9, 0x3F, 0x84, 0x7B, 0x85, 0x70, 0xFE, 0xEE, 0x01, 0x82, 0x02, 0xFE, 0x9B,
+    0x01, 0x80, 0x38, 0x84, 0x6A, 0xFB, 0x24, 0x80, 0x30, 0xFE, 0x3D, 0xFE, 0x50, 0xFE, 0x08, 0x80, 0x46, 0x84, 0x9C,
+    0x01, 0x82, 0x02, 0x85, 0x5E, 0xFC, 0x81, 0x01, 0x82, 0x89, 0x01, 0xFB, 0x12, 0x81, 0x67, 0x82, 0x7C, 0x82, 0x3A,
+    0xFC, 0xAD, 0x01, 0x81, 0x12, 0x82, 0x5B, 0xFB, 0x4C, 0xFC, 0x1F, 0x80, 0x17, 0x80, 0x18, 0xFF, 0x38, 0x80, 0x90,
+    0x01, 0xFD, 0x15, 0x84, 0xBC, 0x02, 0xFA, 0x5B, 0xFE, 0x2B, 0xFB, 0x1D, 0x84, 0xBF, 0x01, 0xFF, 0x33, 0xFA, 0x47,
+    0xFD, 0x47, 0x86, 0x46, 0xFE, 0x03, 0xFC, 0x14, 0xFF, 0x1C, 0x82, 0x5D, 0x00, 0xFE, 0x44, 0xFC, 0x2B, 0x84, 0x93,
+    0x01, 0x86, 0xA2, 0x01, 0x81, 0x36, 0x87, 0x87, 0x01, 0xFE, 0x11, 0xFD, 0x2C, 0x80, 0x25, 0x82, 0x4C, 0x80, 0x1D,
+    0xFF, 0x11, 0xFE, 0x20, 0xFE, 0x2C, 0x82, 0xB3, 0x01, 0x82, 0x45, 0x82, 0x2B, 0x80, 0x3F, 0xFE, 0x3F, 0x84, 0x0D,
+    0xFF, 0x5B, 0x85, 0xA2, 0x01, 0x82, 0x2D, 0x82, 0x01, 0xFE, 0x32, 0x80, 0x4F, 0xFE, 0x64, 0xFE, 0x3C, 0xF9, 0x4D,
+    0xFF, 0x8D, 0x01, 0x80, 0x32, 0x86, 0x16, 0xFA, 0x31, 0x00, 0x86, 0x65, 0xFE, 0x53, 0x80, 0x5E, 0x83, 0x2B, 0xFA,
+    0x65, 0x86, 0x21, 0x82, 0xA9, 0x02, 0x81, 0x96, 0x01, 0x84, 0x70, 0xFF, 0x7C, 0xFA, 0x24, 0x80, 0x23, 0x80, 0x84,
+    0x02, 0x83, 0x87, 0x01, 0xF9, 0x19, 0x80, 0x4A, 0xFE, 0x3D, 0x84, 0x0F, 0xFE, 0x1E, 0x83, 0x64, 0xFE, 0x7A, 0xFF,
+    0x27, 0x82, 0x55, 0x86, 0x0F, 0x82, 0x68, 0x83, 0x1F, 0x80, 0x9F, 0x01, 0xFE, 0x2B, 0xFE, 0x90, 0x01, 0x84, 0x03,
+    0x82, 0xE9, 0x03, 0x82, 0x90, 0x01, 0x82, 0xC2, 0x01, 0xF8, 0x28, 0xFE, 0x86, 0x05, 0x82, 0x80, 0x02, 0xFC, 0x72,
+    0x84, 0x58, 0x82, 0x20, 0x82, 0x01, 0x81, 0x2B, 0x85, 0x31, 0xFB, 0x39, 0xFF, 0x5A, 0xFF, 0x03, 0xFD, 0x91, 0x01,
+    0x80, 0x25, 0x83, 0x85, 0x01, 0x81, 0x3F, 0xF7, 0xCC, 0x02, 0xFE, 0x27, 0x83, 0x14, 0xFF, 0x6C, 0xFD, 0xE4, 0x01,
+    0xFD, 0xBA, 0x02, 0xFF, 0xF9, 0x01, 0x82, 0x75, 0x83, 0x5F, 0xFD, 0x11, 0xFF, 0x22, 0x83, 0x3E, 0xFB, 0x08, 0xFF,
+    0x11, 0xFD, 0x21, 0xFD, 0x32, 0xFF, 0x16, 0x83, 0x2A, 0x81, 0x42, 0x80, 0x18, 0x83, 0x0E, 0xFD, 0x43, 0xFB, 0x6C,
+    0xFB, 0x70, 0x83, 0x32, 0xFA, 0x31, 0xFF, 0x86, 0x01, 0x86, 0x4F, 0xFB, 0x2C, 0xFF, 0x98, 0x01, 0x83, 0xBA, 0x01,
+    0x81, 0x6F, 0xF9, 0x54, 0x81, 0x59, 0x81, 0x25, 0x81, 0x5B, 0xFF, 0x4B, 0xFF, 0x2F, 0x82, 0x1E, 0xF9, 0x1B, 0x83,
+    0x03, 0x81, 0x92, 0x03, 0x81, 0x81, 0x02, 0x83, 0x07, 0xFB, 0x39, 0xFD, 0x36, 0x82, 0x08, 0xFD, 0x74, 0xFF, 0x29,
+    0xFE, 0x16, 0x85, 0x10, 0xFD, 0x3D, 0xFF, 0x11, 0x81, 0xC0, 0x01, 0xFF, 0x72, 0xFD, 0x7A, 0xFD, 0x1B, 0x83, 0x1D,
+    0x82, 0x13, 0xFB, 0x9A, 0x02, 0xFF, 0x96, 0x01, 0x81, 0x1A, 0x81, 0x37, 0xFD, 0xCB, 0x01, 0x80, 0x18, 0x81, 0xB9,
+    0x01, 0x84, 0x08, 0xFF, 0x33, 0x81, 0x25, 0x81, 0x94, 0x01, 0x82, 0x6E, 0xFB, 0x12, 0xFA, 0x25, 0xFD, 0x41, 0x82,
+    0x1F, 0x81, 0x27, 0xFD, 0x21, 0xFF, 0xE0, 0x01, 0xFE, 0x04, 0x81, 0x45, 0x80, 0x36, 0xFF, 0x47, 0xFE, 0x0A, 0xFD,
+    0x7A, 0xF9, 0x2C, 0x81, 0x6F, 0x83, 0x26, 0xFD, 0x83, 0x01, 0x81, 0x4A, 0x82, 0x0F, 0xFD, 0x2F, 0x83, 0x22, 0xFE,
+    0x04, 0xFF, 0x6E, 0xF9, 0x3D, 0xFF, 0x2F, 0x80, 0x12, 0xFF, 0x2B, 0x83, 0x33, 0xFD, 0x90, 0x01, 0xFD, 0x65, 0x81,
+    0x45, 0xFF, 0x05, 0xFD, 0x6B, 0x83, 0x53, 0xFF, 0x58, 0xFD, 0x5F, 0xFF, 0x38, 0x81, 0x0D, 0x81, 0x04, 0xFF, 0x18,
+    0x81, 0x68, 0x80, 0x19, 0xFD, 0x87, 0x01, 0x81, 0x38, 0xFF, 0x0C, 0xFB, 0x15, 0xFD, 0x81, 0x01, 0x84, 0x03, 0xFD,
+    0x4C, 0xFF, 0x36, 0xFF, 0x2F, 0xFA, 0x2B, 0xFF, 0x24, 0x82, 0x51, 0x81, 0x48, 0x84, 0x22, 0x81, 0x17, 0xFA, 0x2B,
+    0xFB, 0xF7, 0x01, 0x80, 0x13, 0x83, 0x73, 0xFF, 0x49, 0xFB, 0x0B, 0xF9, 0x43, 0x83, 0x17, 0xFC, 0x51, 0x81, 0x2D,
+    0xFE, 0x34, 0xFB, 0x5E, 0x86, 0x2A, 0x83, 0x5F, 0x81, 0x21, 0xFF, 0x0C, 0x82, 0x21, 0xFD, 0x41, 0xFC, 0x0D, 0x82,
+    0x19, 0x82, 0x2D, 0x81, 0x59, 0x80, 0x12, 0xFD, 0x80, 0x01, 0xFF, 0x24, 0xFD, 0x48, 0xFF, 0x47, 0xFF, 0xB0, 0x01,
+    0x82, 0x13, 0x81, 0x85, 0x01, 0x00, 0x83, 0x70, 0xFA, 0x5C, 0xFD, 0x7C, 0x82, 0x26, 0x81, 0x4A, 0x81, 0x0E, 0xFB,
+    0x3D, 0x82, 0x1A, 0xFF, 0x89, 0x01, 0xFB, 0x20, 0xFF, 0x3A, 0xFA, 0x31, 0xFF, 0x9C, 0x01, 0xF9, 0x49, 0xFD, 0x90,
+    0x01, 0x80, 0x36, 0x83, 0x75, 0xF8, 0x67, 0xFF, 0x35, 0x88, 0x1E, 0xFF, 0x41, 0x85, 0x3B, 0x81, 0x38, 0x84, 0x08,
+    0xFB, 0x14, 0x82, 0x14, 0x81, 0x4C, 0xFC, 0x26, 0xFE, 0x4C, 0xFF, 0x77, 0xFF, 0x0C, 0xFF, 0x24, 0x84, 0x05, 0xFF,
+    0x3C, 0x81, 0x2B, 0xFD, 0x09, 0xFD, 0x2B, 0x80, 0x1E, 0x83, 0x1B, 0xFF, 0x18, 0x84, 0x12, 0xFF, 0x3C, 0x81, 0x13,
+    0xFF, 0x10, 0xFB, 0x30, 0xFE, 0x1B, 0x81, 0x20, 0x80, 0x12, 0xFF, 0x4C, 0xFE, 0x0A, 0x81, 0xEB, 0x01, 0xFF, 0x41,
+    0xFD, 0x64, 0x82, 0x44, 0x81, 0x36, 0x81, 0x02, 0xFB, 0x35, 0x84, 0x22, 0x81, 0x08, 0xFC, 0x21, 0xFF, 0x8B, 0x01,
+    0x86, 0x16, 0x81, 0x38, 0x87, 0x3C, 0xFF, 0x19, 0x88, 0x3C, 0x82, 0x0E, 0xFC, 0x45, 0x80, 0x4B, 0x84, 0x09, 0xFF,
+    0x11, 0xFA, 0x31, 0xFF, 0xA3, 0x01, 0x82, 0x86, 0x01, 0x82, 0x04, 0xC2, 0x26, 0xDD, 0x2C, 0xE4, 0x2C, 0xD0, 0x0E,
+    0xF0, 0x2F, 0xD0, 0x5F, 0xF4, 0x44, 0xA2, 0x05, 0xA6, 0x95, 0x01, 0xA0, 0x83, 0x01, 0xA4, 0x62, 0xCB, 0x35, 0xAF,
+    0x54, 0xB0, 0x1C, 0xAB, 0x62, 0xE2, 0x38, 0xE1, 0x2B, 0xC2, 0x18, 0xB5, 0x52, 0xE6, 0x27, 0xAA, 0x5B, 0xE4, 0x40,
+    0x59, 0xD2, 0x14, 0xF6, 0x2E, 0xD0, 0x45, 0xF0, 0x04, 0xAD, 0x1D, 0x87, 0x1D, 0xD2, 0x7F, 0x8B, 0x16, 0xA6, 0x11,
+    0xB2, 0x25, 0xE2, 0x2D, 0xC9, 0x06, 0xB0, 0x1A, 0xFC, 0x3D, 0xB0, 0x2E, 0xF6, 0x3A, 0xA0, 0x2F, 0x8B, 0x09, 0xBB,
+    0x0D, 0xA8, 0x30, 0xC6, 0x21, 0xAC, 0x2C, 0x8E, 0x08, 0x9C, 0xB0, 0x01, 0xF5, 0x02, 0xE3, 0xA3, 0x01, 0xF5, 0x26,
+    0xE5, 0x40, 0x8C, 0x0D, 0xA7, 0x29, 0xF7, 0x32, 0xDA, 0x07, 0xF7, 0x3F, 0xC3, 0x74, 0xF1, 0x36, 0xBC, 0x02, 0xF5,
+    0x12, 0xC9, 0x25, 0xBB, 0x76, 0x9C, 0x1A, 0xC6, 0x1D, 0xA0, 0x1E, 0xC9, 0x45, 0x49, 0x93, 0x13, 0xD5, 0x3A, 0x95,
+    0x4D, 0xAC, 0x03, 0xA5, 0x20, 0xA7, 0x54, 0xA5, 0x11, 0x98, 0x4E, 0xA3, 0x3B, 0x9C, 0x2C, 0xE9, 0x1D, 0x9A, 0x61,
+    0x9E, 0x2C, 0x9A, 0x56, 0xBF, 0x6C, 0xE7, 0x4D, 0xB7, 0x1B, 0xEF, 0x3C, 0xC4, 0x0A, 0xE7, 0x64, 0xBD, 0x66, 0xEB,
+    0x4B, 0xB3, 0x12, 0xD9, 0x31, 0xB9, 0x0C, 0xAA, 0x19, 0xFE, 0x09, 0xFC, 0x44, 0x82, 0x15, 0x84, 0x09, 0x83, 0x3C,
+    0x80, 0x54, 0xFD, 0x20, 0xFC, 0x74, 0xFD, 0x48, 0xFF, 0xCB, 0x01, 0xFF, 0x47, 0xFB, 0x43, 0x83, 0x68, 0xFE, 0x81,
+    0x01, 0xFB, 0x48, 0xFD, 0x4C, 0x80, 0x3B, 0x81, 0x4F, 0x83, 0x80, 0x01, 0x81, 0x38, 0x82, 0x38, 0xF9, 0x49, 0xFD,
+    0xCB, 0x04, 0xFF, 0x72, 0xFF, 0x52, 0xFA, 0xAA, 0x01, 0x83, 0xBF, 0x01, 0x82, 0x8C, 0x01, 0x84, 0x58, 0xFE, 0xD6,
+    0x01, 0x81, 0xF8, 0x01, 0x80, 0xB8, 0x01, 0xFF, 0x6A, 0xFB, 0x2C, 0xFD, 0xBF, 0x02, 0x81, 0x18, 0x81, 0xC2, 0x06,
+    0x81, 0xCB, 0x02, 0xFD, 0x8D, 0x03, 0xB9, 0xAF, 0x02, 0x01, 0x04, 0x04, 0x00, 0x33, 0x01, 0x34, 0x06, 0x35, 0x19,
+    0x32, 0x00, 0x00, 0x00, 0x59, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x4A, 0x4A, 0x3C, 0x8E, 0x09,
+    0x95, 0x0C, 0x95, 0x0C, 0xFB, 0x0A, 0x29, 0x0A, 0x24, 0x0A, 0x03, 0x0A, 0x0E, 0x09, 0x0A, 0x24, 0x27, 0x27, 0x24,
+    0x83, 0x05, 0xE6, 0x04, 0xE6, 0x04, 0xF8, 0x04, 0x15, 0x1C, 0x1C, 0x15, 0xCC, 0x0B, 0xCB, 0x0B, 0xCB, 0x0B, 0x9E,
+    0x0B, 0x29, 0x21, 0x21, 0x22, 0xA5, 0x06, 0xF7, 0x06, 0xF7, 0x06, 0xE3, 0x06, 0x1C, 0x1A, 0x1A, 0x15, 0xCD, 0x05,
+    0xA8, 0x05, 0xA8, 0x05, 0xED, 0x05, 0x28, 0x4A, 0x4A, 0x3C, 0xA0, 0x2D, 0x80, 0x01, 0x00, 0x01, 0x00, 0x01, 0x04,
+    0x01, 0x03, 0x04, 0x02, 0x05, 0x05, 0x04, 0x07, 0x05, 0x06, 0x09, 0x05, 0x03, 0x0B, 0x06, 0x0B, 0x0D, 0x05, 0x05,
+    0x0F, 0x05, 0x07, 0x15, 0x06, 0x09, 0x17, 0x06, 0x0D, 0x19, 0x07, 0x0E, 0x1B, 0x06, 0x0C, 0x1D, 0x06, 0x0A, 0x1F,
+    0x05, 0x08, 0x2B, 0x08, 0x17, 0x35, 0x07, 0x10, 0x37, 0x07, 0x14, 0x39, 0x07, 0x0F, 0x3B, 0x07, 0x11, 0x3D, 0x09,
+    0x1C, 0x59, 0x08, 0x12, 0x6B, 0x08, 0x18, 0x75, 0x08, 0x13, 0x77, 0x0A, 0x24, 0x79, 0x08, 0x15, 0x7B, 0x08, 0x19,
+    0x7D, 0x09, 0x1D, 0xAB, 0x01, 0x09, 0x1F, 0xBD, 0x01, 0x09, 0x1E, 0xD9, 0x01, 0x09, 0x1B, 0xEB, 0x01, 0x09, 0x20,
+    0xF5, 0x01, 0x08, 0x16, 0xF7, 0x01, 0x0B, 0x29, 0xF9, 0x01, 0x09, 0x1A, 0xFB, 0x01, 0x0A, 0x2E, 0xFD, 0x01, 0x0A,
+    0x2B, 0xBD, 0x02, 0x0A, 0x23, 0xF7, 0x02, 0x0A, 0x2D, 0xFD, 0x02, 0x0D, 0x61, 0xAB, 0x03, 0x0A, 0x22, 0xBD, 0x03,
+    0x0B, 0x25, 0xD9, 0x03, 0x0B, 0x2A, 0xEB, 0x03, 0x0A, 0x26, 0xF7, 0x03, 0x0C, 0x3F, 0xF9, 0x03, 0x0A, 0x21, 0xFB,
+    0x03, 0x0B, 0x36, 0xFD, 0x03, 0x0C, 0x40, 0xF7, 0x04, 0x0B, 0x3E, 0xF7, 0x05, 0x0A, 0x2F, 0xFB, 0x05, 0x0A, 0x35,
+    0xFD, 0x05, 0x0B, 0x33, 0xBD, 0x06, 0x0E, 0x84, 0x01, 0xF7, 0x06, 0x0A, 0x34, 0xFD, 0x06, 0x0C, 0x75, 0xAB, 0x07,
+    0x0A, 0x27, 0xBD, 0x07, 0x0B, 0x2C, 0xD9, 0x07, 0x0C, 0x37, 0xEB, 0x07, 0x0B, 0x30, 0xF7, 0x07, 0x0B, 0x4C, 0xF9,
+    0x07, 0x0A, 0x28, 0xFB, 0x07, 0x0B, 0x3A, 0xFD, 0x07, 0x0D, 0x55, 0xF7, 0x09, 0x0C, 0x78, 0xFD, 0x0A, 0x0E, 0x72,
+    0xBD, 0x0B, 0x0E, 0xB8, 0x01, 0xD9, 0x0B, 0x0B, 0x32, 0xF7, 0x0B, 0x0D, 0x44, 0xFB, 0x0B, 0x0B, 0x38, 0xFD, 0x0B,
+    0x0E, 0x48, 0xF7, 0x0C, 0x0B, 0x49, 0xFD, 0x0D, 0x0B, 0x39, 0xBD, 0x0E, 0x0D, 0x9C, 0x01, 0xFD, 0x0E, 0x0C, 0x7B,
+    0xBD, 0x0F, 0x0B, 0x31, 0xD9, 0x0F, 0x0B, 0x3C, 0xEB, 0x0F, 0x0B, 0x3D, 0xF7, 0x0F, 0x0B, 0x77, 0xFB, 0x0F, 0x0B,
+    0x3B, 0xFD, 0x0F, 0x0E, 0x5D, 0xFD, 0x12, 0x0E, 0x6C, 0xF7, 0x13, 0x0C, 0x43, 0xFD, 0x13, 0x0E, 0x45, 0xBD, 0x16,
+    0x0E, 0x93, 0x01, 0xFD, 0x16, 0x0C, 0x76, 0xD9, 0x17, 0x0C, 0x41, 0xFD, 0x17, 0x0D, 0x57, 0xF7, 0x19, 0x0C, 0x79,
+    0xFD, 0x1A, 0x0C, 0x73, 0xBD, 0x1B, 0x0E, 0xC4, 0x01, 0xF7, 0x1B, 0x0C, 0x74, 0xFD, 0x1B, 0x0E, 0x51, 0xBD, 0x1E,
+    0x0E, 0xA1, 0x01, 0xFD, 0x1E, 0x0D, 0x7E, 0xFD, 0x1F, 0x0C, 0x5E, 0xFD, 0x22, 0x0D, 0x6A, 0xBD, 0x26, 0x0D, 0x8F,
+    0x01, 0xFD, 0x27, 0x0D, 0x56, 0xFD, 0x2A, 0x0D, 0x7C, 0xBD, 0x2B, 0x0D, 0xBE, 0x01, 0xF7, 0x2B, 0x0D, 0xE2, 0x01,
+    0xFD, 0x2B, 0x0D, 0x4B, 0xBD, 0x2E, 0x0D, 0xA0, 0x01, 0xFD, 0x2F, 0x0E, 0x60, 0xFD, 0x32, 0x0E, 0x6F, 0xFD, 0x33,
+    0x0D, 0x46, 0xBD, 0x36, 0x0D, 0x94, 0x01, 0xFD, 0x37, 0x0E, 0x5B, 0xBD, 0x3B, 0x0D, 0xC5, 0x01, 0xFD, 0x3B, 0x0E,
+    0x54, 0xBD, 0x3E, 0x0E, 0xA5, 0x01, 0xFD, 0x3E, 0x0D, 0x7F, 0xBD, 0x46, 0x0E, 0x8B, 0x01, 0xFD, 0x4A, 0x0E, 0x80,
+    0x01, 0xBD, 0x4B, 0x0E, 0xBD, 0x01, 0xFD, 0x4B, 0x0E, 0x4A, 0xFD, 0x4F, 0x0E, 0x5F, 0xFD, 0x52, 0x0E, 0x6D, 0xFD,
+    0x53, 0x0E, 0x47, 0xBD, 0x56, 0x0E, 0x9F, 0x01, 0xBD, 0x5B, 0x0E, 0xC6, 0x01, 0xFD, 0x5B, 0x0E, 0x52, 0xBD, 0x5E,
+    0x0E, 0xA4, 0x01, 0xFD, 0x6F, 0x0E, 0x69, 0xFD, 0x72, 0x0E, 0x70, 0xFD, 0x77, 0x0E, 0x5C, 0xFD, 0x7B, 0x0E, 0x5A,
+    0xBD, 0x7E, 0x0E, 0xA6, 0x01, 0xE3, 0xA7, 0x01, 0x7D, 0x61, 0x5F, 0x7D, 0x69, 0xFF, 0x4D, 0xCF, 0xB1, 0xBA, 0x76,
+    0x4F, 0xFA, 0x72, 0x7D, 0xD1, 0x7D, 0xDF, 0x3F, 0xA6, 0x2F, 0x19, 0x7D, 0xD7, 0xCC, 0x7D, 0xF7, 0x65, 0x4E, 0xF1,
+    0xEE, 0xEF, 0x9E, 0x96, 0x92, 0xB3, 0x8C, 0x37, 0x2F, 0x99, 0xBE, 0x1E, 0x4E, 0xA3, 0xB6, 0x19, 0x07, 0x73, 0xDF,
+    0xE1, 0x9C, 0xAB, 0xB9, 0x74, 0xA7, 0x71, 0x8A, 0x92, 0xF4, 0xAD, 0x4D, 0xF6, 0x3A, 0x04, 0x16, 0x11, 0x15, 0x45,
+    0xFF, 0xEB, 0x8E, 0x56, 0xCE, 0x20, 0x42, 0xC4, 0x7E, 0xAA, 0xDA, 0xA6, 0x6B, 0xA3, 0x96, 0x49, 0xEE, 0x2F, 0x00,
+    0xAD, 0x54, 0xBF, 0xF8, 0x59, 0xC5, 0x62, 0xC6, 0xAB, 0x1D, 0x24, 0xEE, 0x53, 0xF0, 0x65, 0xE6, 0xF7, 0x27, 0x09,
+    0xA7, 0x30, 0x3D, 0x5B, 0xB7, 0x2B, 0xA6, 0xD4, 0x44, 0xA8, 0x4C, 0x95, 0xC1, 0x3B, 0x15, 0x11, 0x84, 0x0C, 0x2F,
+    0x91, 0x2A, 0x10, 0x1F, 0xD7, 0x54, 0x4B, 0x69, 0x4E, 0x18, 0x55, 0x4A, 0x4C, 0xD0, 0x6C, 0xF7, 0x4B, 0xE9, 0xB2,
+    0x9C, 0xF2, 0xFB, 0xEB, 0xFB, 0x53, 0xBD, 0x57, 0x93, 0x25, 0x91, 0x06, 0x20, 0x89, 0xC0, 0x52, 0xD1, 0xBD, 0xD6,
+    0xE4, 0x36, 0x67, 0x44, 0xF3, 0x73, 0x5D, 0x22, 0xE5, 0x9A, 0x70, 0x9C, 0xA9, 0xDF, 0x16, 0xBF, 0x6F, 0x9E, 0x45,
+    0xCF, 0xEC, 0xD8, 0x7B, 0x2E, 0xE9, 0x5C, 0x3B, 0x0D, 0x00, 0x68, 0xD1, 0x3D, 0xAE, 0x24, 0xF9, 0xFA, 0x1B, 0x0B,
+    0xA8, 0x2D, 0x0D, 0xA8, 0x7C, 0x63, 0x04, 0x32, 0xA1, 0xEF, 0xAA, 0xFA, 0x2C, 0x75, 0x40, 0x57, 0x8E, 0x77, 0xCF,
+    0xD8, 0x39, 0x00, 0x4A, 0x10, 0x3A, 0x81, 0x16, 0x23, 0x61, 0xAE, 0xAF, 0x2B, 0x5A, 0x51, 0x93, 0x96, 0xA5, 0x08,
+    0x8B, 0x45, 0xAD, 0x8D, 0x72, 0xB6, 0xFB, 0xD9, 0xCB, 0xB8, 0x67, 0x20, 0xE0, 0x88, 0xB7, 0xED, 0x0A, 0x55, 0x46,
+    0xED, 0x14, 0x64, 0x9D, 0x31, 0x01, 0x25, 0x8E, 0xC8, 0x9C, 0x74, 0xA6, 0x02, 0x35, 0xA4, 0x93, 0x1A, 0x00, 0x80,
+    0x4C, 0x9C, 0xE4, 0x43, 0x22, 0x2B, 0xC1, 0xC0, 0xE2, 0x54, 0xE2, 0xFD, 0xD3, 0x73, 0xA5, 0x54, 0xD2, 0x83, 0x76,
+    0x75, 0xE3, 0x59, 0xBA, 0x64, 0x8C, 0x5A, 0x27, 0xB9, 0x34, 0xCF, 0x4E, 0x33, 0xF2, 0x73, 0x74, 0x7E, 0x27, 0x09,
+    0x61, 0x02, 0xF1, 0x25, 0xC9, 0x48, 0x63, 0x3C, 0xA3, 0x49, 0x92, 0xA8, 0x53, 0x67, 0x70, 0x8A, 0x45, 0xA7, 0xB2,
+    0xD8, 0xF5, 0xA8, 0x73, 0x39, 0xD6, 0xA9, 0x8C, 0xA5, 0x08, 0xC5, 0x54, 0x99, 0xCB, 0x53, 0x1C, 0x7E, 0xDF, 0x13,
+    0x18, 0x97, 0x50, 0x29, 0x46, 0x13, 0x8E, 0x31, 0x9A, 0x2F, 0x64, 0xD0, 0xDF, 0x2A, 0xBE, 0x62, 0xB0, 0x79, 0xFE,
+    0x66, 0x50, 0xB4, 0x66, 0xAC, 0x53, 0x6C, 0x80, 0x8C, 0x91, 0x73, 0x3C, 0xC5, 0xF7, 0x6D, 0x42, 0xFD, 0xAF, 0x08,
+    0x5F, 0xCE, 0x9E, 0xE2, 0xC2, 0x9B, 0x00, 0x7E, 0x9C, 0xBE, 0x7A, 0xA5, 0x5D, 0x9C, 0x5B, 0xBC, 0x9C, 0xFA, 0x0A,
+    0x9D, 0x67, 0xB3, 0x5E, 0xEE, 0xE3, 0xB4, 0x39, 0x39, 0x3F, 0x55, 0xEF, 0x38, 0xFD, 0x33, 0x9D, 0x5D, 0x60, 0x57,
+    0x39, 0x56, 0x62, 0xD1, 0xA8, 0x30, 0x42, 0xD1, 0x7C, 0x4D, 0x51, 0xB3, 0x5E, 0x4D, 0x52, 0x1C, 0x47, 0x51, 0x64,
+    0x14, 0x3D, 0x54, 0xDB, 0x01, 0x87, 0x9F, 0x62, 0x4E, 0xE4, 0x9C, 0x28, 0x91, 0x70, 0xB5, 0x57, 0x97, 0x32, 0x6D,
+    0x32, 0x96, 0xBF, 0xE5, 0x74, 0x1E, 0x3A, 0x7E, 0x9A, 0x54, 0x7E, 0x75, 0xB6, 0x74, 0xA4, 0x88, 0xD3, 0x22, 0xE6,
+    0x47, 0x17, 0x94, 0x14, 0x9D, 0xB0, 0x11, 0x58, 0xB4, 0x25, 0x54, 0xD5, 0x40, 0x8A, 0x1F, 0x9B, 0x65, 0x79, 0x4B,
+    0x47, 0x25, 0x59, 0x51, 0xE4, 0xB5, 0x2D, 0x8D, 0x16, 0xB9, 0xBC, 0x76, 0x15, 0x25, 0x57, 0x93, 0x53, 0xA4, 0x68,
+    0x8B, 0x66, 0x52, 0xA9, 0x46, 0x9E, 0x97, 0xDB, 0x69, 0xF5, 0x53, 0x7B, 0xA7, 0x0B, 0x67, 0xF7, 0x1B, 0x2F, 0x13,
+    0x4F, 0xF2, 0x6B, 0xB6, 0xAE, 0x89, 0x3A, 0xF3, 0x76, 0xBF, 0x8F, 0xA8, 0x8A, 0x73, 0x6D, 0x69, 0x66, 0x53, 0xEB,
+    0xC6, 0xC3, 0xCE, 0xD8, 0xEC, 0x8C, 0x26, 0x27, 0xE3, 0x78, 0x58, 0xE4, 0x64, 0xCE, 0x8C, 0xAF, 0x1B, 0x45, 0x92,
+    0xCD, 0xDA, 0xD5, 0x7E, 0x2D, 0x2F, 0xD3, 0xB9, 0xDA, 0xED, 0x2D, 0x32, 0x39, 0x2F, 0xA1, 0xDC, 0xF4, 0x00, 0x3B,
+    0x4D, 0xFD, 0x22, 0x8F, 0xAF, 0x0E, 0x8C, 0x23, 0xD3, 0x6D, 0x66, 0x14, 0x49, 0x69, 0x8A, 0x66, 0x27, 0x4F, 0x52,
+    0x3B, 0x9E, 0x6F, 0x6B, 0x59, 0xE8, 0x8C, 0x27, 0xE4, 0xBA, 0xE4, 0x52, 0x29, 0x42, 0xF8, 0x8E, 0x9F, 0x51, 0x24,
+    0x9B, 0xED, 0x74, 0x9D, 0xA5, 0x5C, 0xAF, 0xEB, 0xE6, 0x2A, 0x55, 0x56, 0xD3, 0x5E, 0x8B, 0x30, 0x3F, 0xF5, 0x59,
+    0x26, 0x8D, 0xAF, 0x55, 0x25, 0x77, 0x2A, 0x21, 0x2D, 0x9D, 0xF1, 0xA9, 0xDB, 0x19, 0x9D, 0x9C, 0xA7, 0x48, 0x76,
+    0xD6, 0x52, 0xFF, 0x78, 0x8A, 0x85, 0xD5, 0x9A, 0x9B, 0x7A, 0x59, 0xB7, 0x72, 0xE5, 0x55, 0xB7, 0x2A, 0xC3, 0x4B,
+    0xD6, 0x84, 0x93, 0x54, 0xB2, 0x6C, 0x9E, 0x8C, 0xCB, 0x9E, 0x74, 0x0B, 0xCF, 0xEF, 0xE4, 0xE2, 0x7B, 0xC8, 0x78,
+    0x9A, 0x66, 0x30, 0x92, 0x11, 0x42, 0x4D, 0x52, 0x4C, 0xDD, 0xD4, 0xA7, 0xBD, 0xB5, 0xD7, 0xC5, 0xDA, 0xCB, 0xAC,
+    0x52, 0x2C, 0xEA, 0xDD, 0x1C, 0xCB, 0xAE, 0x7B, 0x5A, 0x94, 0x9E, 0xBA, 0x59, 0x26, 0x8F, 0x24, 0xBC, 0x93, 0x49,
+    0x27, 0xDA, 0x9B, 0xD6, 0xC5, 0xAE, 0xB5, 0xE8, 0x79, 0xBA, 0xED, 0xD4, 0xF2, 0x4E, 0x07, 0xD4, 0xC5, 0xF6, 0x96,
+    0xB6, 0xCB, 0x75, 0xA9, 0x24, 0xBD, 0x71, 0xC7, 0x7A, 0x23, 0x8C, 0x51, 0x95, 0x37, 0xB5, 0x2F, 0x17, 0x55, 0xEC,
+    0x22, 0xBD, 0x77, 0xA5, 0xD4, 0x14, 0xEC, 0xB9, 0xC9, 0x84, 0x4A, 0x11, 0xFA, 0x48, 0x12, 0xF2, 0xFB, 0x7B, 0x36,
+    0xC5, 0xC8, 0x4F, 0xA5, 0x44, 0x79, 0x7B, 0x83, 0x71, 0x5D, 0xCE, 0x11, 0x4A, 0xFF, 0xC2, 0x0D, 0x2D, 0x2B, 0xEF,
+    0xD4, 0x64, 0xC9, 0x1D, 0x9D, 0x95, 0x73, 0x39, 0x9A, 0x7A, 0x10, 0x5A, 0x94, 0xEA, 0xFF, 0xD2, 0x56, 0xBE, 0xBE,
+    0xA2, 0x3B, 0x4B, 0xA7, 0x05, 0x46, 0x74, 0xD5, 0xF6, 0x16, 0x53, 0x3B, 0x78, 0x22, 0xC5, 0x2E, 0x4E, 0x9A, 0xF6,
+    0xAB, 0xDF, 0x5A, 0xAF, 0xAC, 0x5C, 0x54, 0xAF, 0x39, 0xBD, 0x4C, 0x18, 0x5B, 0x2B, 0x11, 0x2D, 0xD6, 0x05, 0x78,
+    0x52, 0xED, 0xCA, 0xB5, 0x4C, 0x58, 0x79, 0xCC, 0xD2, 0xC5, 0x25, 0x39, 0x5D, 0x8B, 0x14, 0xA9, 0x95, 0x5C, 0x37,
+    0xE5, 0xBD, 0x54, 0x4A, 0x7A, 0x9D, 0x41, 0x08, 0x90, 0xF3, 0x65, 0x59, 0x51, 0x13, 0x42, 0xB2, 0xC3, 0x9E, 0x9B,
+    0xF1, 0x15, 0x95, 0x75, 0x08, 0x09, 0x05, 0x95, 0x3C, 0x5F, 0xAE, 0x06, 0x80, 0x52, 0xF3, 0x91, 0xBF, 0xCB, 0xE5,
+    0x52, 0x8B, 0xAB, 0xC7, 0x58, 0xEA, 0x2C, 0x4D, 0x8A, 0xCC, 0x56, 0x7E, 0xA9, 0xEB, 0x8C, 0x54, 0x33, 0x32, 0x08,
+    0x45, 0xCE, 0xDC, 0x9C, 0xE5, 0x92, 0x33, 0x57, 0xC9, 0xCB, 0x5D, 0xEA, 0x74, 0x7E, 0x59, 0x54, 0x55, 0xBB, 0x92,
+    0x5D, 0x38, 0x47, 0x90, 0xB7, 0x65, 0xFD, 0x72, 0x46, 0x4F, 0x53, 0x27, 0x65, 0xE2, 0xA5, 0x18, 0xA9, 0x66, 0xA4,
+    0x07, 0x5D, 0x56, 0xBC, 0xF2, 0xFD, 0xF0, 0x36, 0x8B, 0xCA, 0xAF, 0x47, 0xA7, 0xF2, 0x72, 0x81, 0x4D, 0x38, 0x3D,
+    0xE4, 0x93, 0x25, 0x4F, 0xC6, 0xA3, 0xA1, 0xF3, 0x25, 0x6B, 0xC6, 0x11, 0x20, 0x14, 0x8C, 0x55, 0xB9, 0x6F, 0xAF,
+    0x64, 0xA5, 0x99, 0x25, 0xA5, 0x88, 0x3F, 0xBA, 0xDD, 0xC8, 0x0A, 0x4D, 0xEC, 0x62, 0x6C, 0x92, 0x25, 0x55, 0xA6,
+    0xAA, 0x9C, 0x2B, 0xAB, 0x5A, 0x2A, 0xE3, 0x03, 0x8E, 0x5F, 0xD7, 0xD5, 0x87, 0xF6, 0x8E, 0x64, 0xA4, 0x97, 0x49,
+    0xAE, 0x5F, 0x24, 0x6D, 0x4A, 0x23, 0x10, 0xE5, 0xAA, 0xD0, 0xBD, 0xFF, 0xD4, 0x85, 0x37, 0x00, 0x80, 0x52, 0xF7,
+    0x6F, 0xBA, 0x03, 0xBB, 0x4B, 0xAE, 0xCB, 0x3C, 0xC7, 0xA2, 0x7A, 0x49, 0xE3, 0xDA, 0xFE, 0x09, 0x1C, 0x3D, 0xAB,
+    0x7C, 0x8E, 0xEF, 0x8A, 0x16, 0x19, 0x4F, 0xCE, 0x4E, 0xD1, 0x8C, 0x27, 0x5C, 0x8E, 0xB0, 0xA8, 0x93, 0x40, 0x96,
+    0xA6, 0xA6, 0x92, 0x34, 0x04, 0x36, 0x7B, 0x8E, 0xD0, 0xF0, 0x7D, 0x61, 0x84, 0xE6, 0x78, 0x3E, 0x8A, 0xE3, 0x48,
+    0x16, 0xCD, 0x38, 0x20, 0x29, 0x92, 0xE2, 0x08, 0x4F, 0xE7, 0xF8, 0x78, 0xC6, 0xEA, 0xF2, 0x49, 0x92, 0xF0, 0x2D,
+    0x08, 0x35, 0xE1, 0x68, 0x32, 0xC7, 0xA2, 0x29, 0x42, 0x46, 0xD3, 0xB0, 0x69, 0xEA, 0x9A, 0x1C, 0x0E, 0xA8, 0x93,
+    0x3C, 0xC7, 0xF9, 0xBB, 0x5C, 0xE5, 0x17, 0x7C, 0xB4, 0x51, 0x84, 0xB3, 0x7B, 0xF3, 0x55, 0xB7, 0xA3, 0xF2, 0x9C,
+    0x5D, 0xF7, 0x96, 0xF7, 0x97, 0xD3, 0x52, 0x68, 0xE1, 0x8A, 0xB6, 0x95, 0xAC, 0xBC, 0xF6, 0x16, 0x2C, 0x7F, 0xF1,
+    0xA8, 0x8F, 0x94, 0xBA, 0x89, 0x14, 0xC9, 0x56, 0x6B, 0x29, 0xA2, 0x49, 0xAB, 0x6B, 0xBE, 0x9D, 0x25, 0x17, 0x5B,
+    0xE4, 0x29, 0x36, 0xA5, 0xD4, 0x72, 0x92, 0x60, 0x69, 0xDA, 0x19, 0x2B, 0xD5, 0x79, 0x32, 0xC3, 0x11, 0x27, 0xD0,
+    0x17, 0x10, 0x2A, 0xF9, 0x3F, 0xA9, 0xB8, 0x4A, 0x26, 0xCF, 0xF9, 0xB2, 0x2A, 0xA1, 0x8A, 0x25, 0x6F, 0x52, 0xEE,
+    0xC5, 0xBC, 0xBA, 0x52, 0xE8, 0x62, 0x6B, 0xBB, 0x58, 0xAB, 0xD4, 0x3A, 0x11, 0x7A, 0x12, 0x3A, 0x5F, 0x43, 0xAF,
+    0x3A, 0x8C, 0x67, 0x67, 0x17, 0x4E, 0x90, 0x73, 0x50, 0x09, 0x95, 0xBB, 0x00, 0x00, 0x19, 0x90, 0x65, 0xD1, 0x49,
+    0x92, 0xC4, 0xB3, 0xF8, 0xF2, 0xD7, 0x39, 0x39, 0x1B, 0xF6, 0x7C, 0x3B, 0x19, 0xBB, 0xCC, 0x75, 0x05, 0x57, 0xA8,
+    0x8C, 0x6C, 0x12, 0x02, 0x84, 0x24, 0x29, 0x2A, 0x45, 0x51, 0x24, 0x21, 0xCF, 0x18, 0x81, 0x24, 0xAA, 0xD6, 0xD5,
+    0x52, 0xAF, 0x68, 0x52, 0xA9, 0xE5, 0xB5, 0x22, 0x3B, 0x95, 0xD7, 0xDF, 0xD7, 0xDF, 0xFA, 0x57, 0xEB, 0xB2, 0x4C,
+    0x37, 0x99, 0x75, 0xDD, 0x4F, 0xB5, 0x53, 0xBA, 0xC0, 0x6B, 0x75, 0x2F, 0x27, 0x45, 0x7B, 0xD9, 0x66, 0x17, 0x9C,
+    0x4A, 0x52, 0x65, 0x6B, 0x42, 0x95, 0x46, 0xE9, 0x07, 0xB3, 0x3E, 0xAC, 0xE8, 0x83, 0xB5, 0xAF, 0x12, 0xBA, 0x4B,
+    0x1D, 0x00, 0xA0, 0x27, 0x00, 0x40, 0xFF, 0x03, 0x00, 0xD6, 0x27, 0x00, 0x00, 0x9B, 0x30, 0xE0, 0x60, 0x93, 0xF3,
+    0xD5, 0xF2, 0x19, 0xC6, 0x62, 0x77, 0xF5, 0x63, 0xA7, 0xA4, 0xEF, 0x44, 0xCC, 0x7A, 0x7F, 0x52, 0x4B, 0xF6, 0xF2,
+    0x9F, 0x2C, 0xA7, 0x08, 0x7F, 0xE5, 0xB2, 0x2E, 0xD3, 0x95, 0xAA, 0x56, 0x3E, 0xCA, 0xD4, 0x5D, 0xD5, 0x9B, 0x45,
+    0xBC, 0x14, 0x2A, 0x9D, 0x8A, 0x52, 0x16, 0xE4, 0x54, 0x46, 0x7E, 0x7E, 0x68, 0xE8, 0x14, 0xEF, 0x2E, 0xAB, 0xE4,
+    0x41, 0x0F, 0x39, 0xE3, 0x5E, 0xD4, 0xA3, 0xE4, 0xE5, 0x87, 0x92, 0xB0, 0x15, 0x34, 0xF4, 0xEF, 0x00, 0x80, 0x12,
+    0x68, 0x00, 0x80, 0x03, 0x00, 0xD8, 0x07, 0x83, 0x7B, 0xB1, 0x9D, 0x0A, 0x00, 0x00, 0xEF, 0x42, 0x42, 0xEF, 0x90,
+    0xDD, 0xB5, 0xD5, 0x1A, 0x3B, 0x04, 0xF2, 0xE9, 0x8D, 0xC8, 0xA6, 0xC8, 0x13, 0xD2, 0x5B, 0x8B, 0x74, 0xCD, 0x9F,
+    0x61, 0xA2, 0xBC, 0x94, 0xA4, 0xB3, 0xA2, 0xC8, 0x27, 0x4B, 0xD1, 0xC7, 0x79, 0xC8, 0xF6, 0xB6, 0x25, 0xA2, 0xF4,
+    0x8A, 0xD1, 0x43, 0x1F, 0x17, 0x52, 0x77, 0xBE, 0x24, 0x88, 0xD7, 0x89, 0x24, 0x24, 0x1C, 0xCF, 0x6A, 0x72, 0x2E,
+    0x57, 0xF3, 0xE7, 0x2C, 0x91, 0xBE, 0x28, 0x53, 0xBB, 0xC5, 0xDA, 0x6A, 0x3D, 0xF6, 0x7A, 0xE4, 0x65, 0x7B, 0x11,
+    0xC8, 0x5A, 0xE5, 0x22, 0x5B, 0x3E, 0x75, 0x75, 0x6A, 0x39, 0xBB, 0x4A, 0xCA, 0x2F, 0x56, 0xF2, 0xE5, 0x3F, 0x9A,
+    0x55, 0xE3, 0x5A, 0x9E, 0x5F, 0x8D, 0xD5, 0xFD, 0x18, 0xA3, 0xE8, 0xA3, 0x97, 0x8C, 0xD7, 0xC9, 0x77, 0x6F, 0x6C,
+    0xB5, 0x5A, 0x8F, 0x54, 0x40, 0x00, 0x00, 0xB2, 0x01, 0x00, 0xB2, 0x25, 0x00, 0x40, 0x4E, 0x2E, 0xBB, 0x00, 0x80,
+    0x35, 0xF4, 0x0E, 0x00, 0xD0, 0x01, 0x00, 0x00, 0x00, 0x06, 0xB0, 0x0A, 0x00, 0x10, 0xE8, 0x7F, 0xFD, 0x07, 0x00,
+    0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4B, 0x1F, 0x21, 0x08, 0x80, 0xB0, 0x0A, 0x00, 0x10,
+    0x03, 0x00, 0x60, 0x45, 0x10, 0x82, 0x1D, 0x00, 0xA0, 0x1F, 0x9F, 0xDE, 0x99, 0x86, 0x9E, 0x00, 0x00, 0x07, 0x3D,
+    0x61, 0x1F, 0xE4, 0x8F, 0x8F, 0x0E, 0xF5, 0x00, 0x80, 0x1E, 0x07, 0x00, 0x00, 0xD5, 0x4A, 0xA6, 0x03, 0x00, 0x4C,
+    0x76, 0x0C, 0x46, 0x10, 0x31, 0xE8, 0xDF, 0x1E, 0x00, 0x60, 0x78, 0x08, 0x60, 0x90, 0xA8, 0x00, 0x00, 0x09, 0x00,
+    0xAB, 0x21, 0x70, 0x10, 0x00, 0x24, 0x5C, 0x78, 0xAB, 0xCF, 0x20, 0xC7, 0x85, 0x7C, 0x00, 0x80, 0x69, 0x00, 0x80,
+    0x56, 0x43, 0x06, 0x11, 0xF0, 0x01, 0x00, 0x15, 0x1A, 0x0E, 0x72, 0x1B, 0x0E, 0xEA, 0xC8, 0x11, 0xD1, 0x61, 0x50,
+    0x00, 0x00, 0x79, 0xD8, 0x01, 0x00, 0x4E, 0x41, 0xAE, 0xBB, 0x50, 0x01, 0x00, 0xF4, 0x83, 0xC4, 0xB2, 0x07, 0x00,
+    0xB8, 0x21, 0x83, 0x86, 0xD3, 0xD0, 0x01, 0x00, 0x32, 0xDB, 0x86, 0x1C, 0xB8, 0x09, 0xE4, 0x2D, 0x1C, 0xE8, 0x3F,
+    0xDF, 0x8A, 0xA6, 0x00, 0x00, 0x00, 0xE4, 0xB0, 0x82, 0xC1, 0x0A, 0x2E, 0xD4, 0x32, 0x19, 0x11, 0xC2, 0x78, 0xE1,
+    0x02, 0x34, 0x3C, 0x00, 0x40, 0x1E, 0x02, 0x00, 0xF0, 0x90, 0x41, 0xA0, 0x0E, 0x00, 0x00, 0x1D, 0x0A, 0x2A, 0xEC,
+    0xB0, 0xA0, 0xAF, 0x04, 0x00, 0x04, 0x0E, 0x1A, 0x60, 0x41, 0x45, 0xA6, 0x86, 0x84, 0x04, 0x00, 0xF8, 0x15, 0x00,
+    0x60, 0x6D, 0x6B, 0x58, 0xC3, 0x08, 0x34, 0xCC, 0x75, 0x56, 0x50, 0x03, 0x00, 0x64, 0xE6, 0x60, 0x07, 0xC8, 0x0C,
+    0x2E, 0xB2, 0x10, 0x7D, 0x0F, 0x00, 0xD0, 0x70, 0x90, 0xC3, 0x2E, 0x00, 0x00, 0x19, 0x54, 0x75, 0x99, 0x82, 0x2B,
+    0x07, 0x00, 0xD8, 0x21, 0x53, 0xE0, 0x01, 0x00, 0xA0, 0x43, 0x97, 0xC3, 0x69, 0xE8, 0x12, 0x56, 0xB0, 0x60, 0x41,
+    0x87, 0x6E, 0x43, 0x87, 0xC1, 0x47, 0x00, 0x2A, 0x3D, 0xDC, 0x01, 0x00, 0xB8, 0xC9, 0x03, 0x00, 0xAC, 0x11, 0x10,
+    0x01, 0x00, 0x60, 0x0B, 0x00, 0x00, 0x22, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0xAB, 0x82, 0x7B, 0xF3, 0x1B, 0xD0,
+    0x02, 0x00, 0x00, 0x00, 0x00, 0x40, 0x04, 0x00, 0x00, 0x00, 0xDC, 0x05, 0x00, 0xD8, 0x01, 0x00, 0x3A, 0xFD, 0x58,
+    0x4F, 0xE4, 0x07, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x41, 0x44, 0x00, 0x82, 0x40, 0x08, 0x20, 0x10, 0x00, 0x11,
+    0x00, 0x00, 0x44, 0x88, 0x00, 0xFD, 0x2F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x78, 0xF2, 0xAF, 0x32,
+    0xFA, 0x1A, 0x04, 0x5B, 0x00, 0x2D, 0x40, 0x56, 0xD8, 0x27, 0x24, 0x41, 0x08, 0x00, 0x77, 0xD5, 0x4D, 0x04, 0xD2,
+    0x1F, 0x00, 0x00, 0x59, 0x01, 0x90, 0x08, 0x00, 0x10, 0x02, 0x21, 0x84, 0xD0, 0xB7, 0x20, 0x00, 0x30, 0x01, 0x00,
+    0x00, 0xFC, 0x00, 0x00, 0x00, 0x00, 0x80, 0x41, 0x08, 0x81, 0x08, 0x42, 0x00, 0x00, 0x11, 0x3D, 0x37, 0x00, 0x00,
+    0x00, 0x00, 0xC8, 0xDF, 0x40, 0xBF, 0x10, 0xA9, 0x04, 0x00, 0xA0, 0x2F, 0x42, 0x00, 0x11, 0x4E, 0x40, 0x76, 0x03,
+    0x45, 0x10, 0x84, 0x08, 0x00, 0x00, 0x00, 0x00, 0x22, 0x00, 0x80, 0x6C, 0x01, 0x00, 0x00, 0x60, 0x04, 0x00, 0x00,
+    0x50, 0x0B, 0x8C, 0x00, 0x64, 0xFA, 0x6D, 0x00, 0xD5, 0xE8, 0x97, 0x96, 0x0B, 0x0D, 0x77, 0xC7, 0x20, 0x00, 0x6B,
+    0x33, 0x80, 0xB8, 0x3F, 0xE8, 0x9B, 0x04, 0x00, 0x00, 0x00, 0x40, 0x0A, 0x32, 0x01, 0x00, 0x00, 0x80, 0x11, 0x00,
+    0x80, 0x55, 0x20, 0x92, 0xB0, 0x53, 0x04, 0x42, 0xAD, 0x1B, 0x14, 0x2B, 0xC2, 0x08, 0x10, 0x02, 0x20, 0x02, 0x00,
+    0x08, 0x01, 0x21, 0xD8, 0x3F, 0x08, 0xC0, 0x04, 0x41, 0x80, 0x08, 0x00, 0x00, 0xEB, 0x59, 0x2F, 0x10, 0x0E, 0xC6,
+    0x5C, 0xFB, 0x59, 0xD7, 0xD3, 0xCB, 0x7E, 0x8F, 0x31, 0xAD, 0x2E, 0x92, 0xA2, 0xA7, 0x5E, 0x1A, 0x89, 0xA0, 0xA8,
+    0x84, 0x14, 0x46, 0x4A, 0xCE, 0x9F, 0x1A, 0x8E, 0x93, 0x8C, 0x6C, 0x4A, 0x4A, 0xF6, 0x3D, 0x5B, 0x79, 0xFE, 0xC1,
+    0x84, 0x49, 0xF7, 0xE8, 0x77, 0x9B, 0x1F, 0x0A, 0x97, 0x89, 0xAA, 0xEF, 0x96, 0x57, 0xDA, 0xF4, 0xD6, 0xEB, 0x6F,
+    0xA5, 0x5B, 0x32, 0x77, 0xDA, 0x47, 0x6E, 0xF7, 0x5D, 0xD3, 0x95, 0x6E, 0x37, 0xBB, 0xB4, 0xE4, 0xA4, 0xED, 0x49,
+    0x33, 0xA3, 0x73, 0x4E, 0x91, 0x10, 0x3D, 0x33, 0x97, 0x72, 0x61, 0x57, 0x32, 0x3F, 0xB2, 0x7F, 0x1D, 0x5B, 0x27,
+    0x73, 0x65, 0xB2, 0x53, 0x4E, 0xAD, 0x69, 0xFD, 0xF1, 0xFE, 0x6B, 0xB1, 0xF9, 0x88, 0x14, 0x9B, 0x84, 0x4C, 0x44,
+    0x49, 0xBB, 0xDA, 0x11, 0x96, 0x8E, 0x11, 0xAF, 0x9A, 0xDC, 0xC9, 0x1E, 0x94, 0x91, 0x85, 0x2A, 0x41, 0x4C, 0x75,
+    0x95, 0x62, 0x6E, 0xA9, 0x1C, 0x5B, 0x9A, 0x3E, 0x00, 0x80, 0x0C, 0x00, 0xA0, 0x5F, 0x08, 0xF4, 0x1E, 0x77, 0xAF,
+    0xAD, 0x86, 0xDD, 0xDE, 0xD2, 0x85, 0xBA, 0x1D, 0x3E, 0x00, 0x20, 0x2F, 0x13, 0xB7, 0xEC, 0x26, 0xD4, 0xAB, 0x68,
+    0x80, 0xC5, 0xDA, 0x18, 0x45, 0xCB, 0xE8, 0xD7, 0xDC, 0x3F, 0x24, 0x2D, 0x4F, 0x3A, 0x66, 0xA5, 0x87, 0x2B, 0x15,
+    0x39, 0xCF, 0xA5, 0x77, 0x98, 0x00, 0x7D, 0x1B, 0x80, 0x7A, 0xBC, 0xD4, 0xB5, 0x9C, 0x10, 0x6C, 0x5D, 0xFA, 0x2E,
+    0x01, 0x74, 0xE9, 0x0E, 0x00, 0xC0, 0x1D, 0x18, 0xEA, 0xD8, 0xD3, 0x49, 0x02, 0x81, 0xEE, 0xA6, 0xD0, 0xB7, 0xFA,
+    0xBA, 0x7E, 0xC4, 0x1C, 0xAC, 0xD9, 0x00, 0xE4, 0xA9, 0x4F, 0x1B, 0x25, 0x5F, 0xAF, 0x55, 0x3F, 0x5F, 0x5A, 0xCB,
+    0x43, 0xD7, 0x52, 0x3D, 0x02, 0x15, 0x46, 0x80, 0xBB, 0x05, 0x76, 0x91, 0x2A, 0xA3, 0xCE, 0x31, 0xEE, 0x9A, 0x5E,
+    0x92, 0x49, 0xC6, 0x54, 0x8D, 0x5C, 0x96, 0x50, 0xBF, 0x6F, 0x91, 0x7F, 0x2B, 0x3A, 0x37, 0xFB, 0x0A, 0x09, 0x2B,
+    0x4F, 0xE7, 0x0E, 0x37, 0xE7, 0x00, 0x72, 0x01, 0xB8, 0xE0, 0xBF, 0x44, 0xAF, 0x83, 0x6C, 0x0A, 0x36, 0x2C, 0x5A,
+    0x56, 0x01, 0xA0, 0x92, 0xB5, 0x2A, 0x41, 0x5E, 0x65, 0xD1, 0xE1, 0x36, 0x40, 0x9B, 0xC1, 0xEA, 0x27, 0x5F, 0xB2,
+    0x22, 0x37, 0x7D, 0xFD, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x02, 0x00, 0xF4, 0xDD, 0x91, 0xAF, 0x0D, 0xBD,
+    0x32, 0x93, 0x9C, 0x61, 0x3A, 0x54, 0xE8, 0x51, 0x80, 0xB2, 0xF4, 0xCA, 0x52, 0xDD, 0x7E, 0xCE, 0xCC, 0x64, 0xE9,
+    0x3D, 0x00, 0x00, 0x2E, 0x5C, 0x00, 0x80, 0x1F, 0xA3, 0x8F, 0x4D, 0x27, 0x84, 0x4C, 0xD5, 0x54, 0x96, 0xEA, 0xCC,
+    0x5C, 0x91, 0x7E, 0xB3, 0xD7, 0xBB, 0xF1, 0xF7, 0x42, 0xAC, 0xE4, 0x93, 0x4D, 0xEE, 0x06, 0xD6, 0x85, 0x0B, 0x64,
+    0x9A, 0x75, 0x76, 0x7D, 0xFA, 0x06, 0xA7, 0xD2, 0xA4, 0xBD, 0x8C, 0xCC, 0xD2, 0xB9, 0xA7, 0x9C, 0x00, 0x00, 0x54,
+    0x1C, 0x05, 0x6D, 0x00, 0x1C, 0x5D, 0xD1, 0xCB, 0x09, 0xBD, 0x64, 0xB2, 0x05, 0x11, 0x11, 0x1F, 0xD0, 0x04, 0x08,
+    0xBF, 0x66, 0x24, 0x81, 0x30, 0x63, 0x84, 0x11, 0xDF, 0x5E, 0xB9, 0x6C, 0x2B, 0xEC, 0x15, 0x9D, 0x66, 0x93, 0xFB,
+    0x5B, 0xA6, 0xE1, 0x89, 0x70, 0x00, 0x02, 0x84, 0x00, 0x01, 0xAE, 0xBD, 0x3A, 0x1B, 0xE7, 0xC7, 0x3A, 0x9B, 0x8C,
+    0x1C, 0xEA, 0x1B, 0xC9, 0xED, 0xCF, 0x99, 0x65, 0x4F, 0x87, 0xBE, 0x41, 0xE4, 0xA8, 0x0F, 0x00, 0x1C, 0xEE, 0x3F,
+    0x33, 0x73, 0x05, 0xF6, 0x56, 0xDD, 0xAF, 0xF7, 0xC5, 0x1E, 0x7E, 0x3D, 0x58, 0xC1, 0x00, 0x00, 0xD8, 0xAA, 0x8D,
+    0x75, 0x59, 0x4D, 0x8A, 0x49, 0xB3, 0x27, 0xA9, 0x93, 0x4D, 0x4B, 0x68, 0xA6, 0xA5, 0xA5, 0x00, 0xA8, 0x02, 0x41,
+    0x5E, 0x1E, 0xEC, 0x0F, 0x00, 0xAF, 0x78, 0xB9, 0x0D, 0x00, 0xF0, 0xB3, 0xE3, 0x06, 0xEE, 0x84, 0xD5, 0xB0, 0x0F,
+    0x00, 0xA0, 0x77, 0xB8, 0xCF, 0x7B, 0xF7, 0x45, 0x3C, 0xEB, 0x13, 0x88, 0x84, 0x7A, 0x77, 0x03, 0x00, 0x96, 0x0E,
+    0xB9, 0x1C, 0xE8, 0x49, 0x00, 0x80, 0x7F, 0xCF, 0xA1, 0x53, 0xC2, 0x13, 0xBD, 0xE5, 0x1D, 0x02, 0xBC, 0x08, 0x36,
+    0xAC, 0x9A, 0x5D, 0x54, 0x00, 0xE1, 0x85, 0x09, 0x22, 0x7B, 0x55, 0xA0, 0x13, 0xB0, 0xBA, 0xFC, 0xD7, 0x62, 0x3C,
+    0xC4, 0x1F, 0x68, 0xE0, 0xCE, 0x00, 0x00, 0x00, 0x80, 0x41, 0x15, 0xF6, 0xA2, 0x84, 0xD8, 0xED, 0x9F, 0xC7, 0x69,
+    0x48, 0x69, 0x01, 0x00, 0x38, 0xB7, 0x7D, 0x70, 0x5F, 0xD0, 0x6F, 0xEC, 0xD0, 0x07, 0x00, 0xB0, 0xEE, 0x03, 0xC8,
+    0x0A, 0x2E, 0x97, 0x0D, 0x01, 0xC8, 0x12, 0xF6, 0x87, 0x55, 0xC8, 0xF9, 0x80, 0x2F, 0x44, 0x41, 0x87, 0xEF, 0x39,
+    0x88, 0x68, 0xD5, 0xB8, 0xA5, 0x88, 0x94, 0x44, 0x0C, 0xD2, 0x18, 0x21, 0xD0, 0xD1, 0xA4, 0x24, 0x99, 0x12, 0x49,
+    0x3A, 0x11, 0x5E, 0x49, 0xFA, 0x6A, 0x84, 0x10, 0x01, 0xA2, 0xE7, 0xD7, 0x5B, 0x08, 0xDE, 0x0B, 0x8E, 0xF0, 0xA3,
+    0xB5, 0x96, 0x9C, 0x67, 0xF0, 0x40, 0xA5, 0x4B, 0x64, 0xD3, 0x35, 0xA4, 0x2F, 0x46, 0x38, 0x80, 0x24, 0x50, 0x6F,
+    0x64, 0x24, 0x54, 0x20, 0x00, 0x4D, 0x01, 0x5C, 0xB5, 0xC4, 0x80, 0x10, 0xBE, 0x5E, 0x8E, 0x0D, 0x09, 0x15, 0x88,
+    0x00, 0xF8, 0x02, 0x00, 0x00, 0x84, 0x10, 0x02, 0x3A, 0xC1, 0x08, 0x00, 0x90, 0x3C, 0xD3, 0x84, 0x02, 0x08, 0x42,
+    0x81, 0x94, 0x22, 0xD0, 0x44, 0x41, 0xD0, 0x84, 0xA4, 0x8C, 0x12, 0xD0, 0x84, 0x34, 0x06, 0x48, 0x08, 0x01, 0x08,
+    0x14, 0x65, 0x10, 0x92, 0xA1, 0x48, 0x42, 0x53, 0xDC, 0xFA, 0x53, 0x00, 0xC0, 0x9D, 0x11, 0x98, 0x3B, 0x00, 0x00,
+    0xB7, 0x3D, 0xA4, 0x8F, 0x82, 0x81, 0x82, 0x6A, 0x83, 0x2A, 0xE0, 0x04, 0x51, 0x0F, 0x00, 0x68, 0x48, 0xD0, 0x4A,
+    0x4B, 0x4C, 0x00, 0xAC, 0x29, 0xA3, 0x28, 0x36, 0x6A, 0x4C, 0x66, 0xE8, 0x55, 0x24, 0xDC, 0x8A, 0xE4, 0x39, 0x3D,
+    0x8E, 0x24, 0x05, 0x28, 0x01, 0xB4, 0x18, 0x65, 0xA6, 0xAA, 0x9A, 0xA3, 0x01, 0x4A, 0x00, 0x24, 0xCD, 0x1C, 0x59,
+    0x11, 0x31, 0x05, 0x01, 0x63, 0x0C, 0xC0, 0x83, 0x0D, 0x01, 0x00, 0xC8, 0xFA, 0x00, 0xC0, 0x52, 0xCD, 0x94, 0x09,
+    0x00, 0xC0, 0x01, 0x00, 0x60, 0xDE, 0x07, 0x83, 0x4A, 0x4C, 0x44, 0xD3, 0x0E, 0x80, 0x00, 0x98, 0xD5, 0x44, 0x93,
+    0xA7, 0xA4, 0xF8, 0x25, 0xC5, 0x36, 0x26, 0xA8, 0x34, 0x00, 0x00, 0x28, 0x11, 0x69, 0x80, 0xF8, 0xAD, 0xA8, 0x84,
+    0x4E, 0x80, 0xA1, 0x19, 0x1F, 0x00, 0x90, 0xE6, 0xA5, 0x70, 0x0F, 0x1A, 0x90, 0x22, 0xC1, 0xBB, 0x4B, 0xDB, 0xAA,
+    0x24, 0x7A, 0x3E, 0x9D, 0x4A, 0x41, 0x6D, 0x52, 0x57, 0xAC, 0xEA, 0x67, 0x40, 0x3E, 0x35, 0xF4, 0xF3, 0xFD, 0x2A,
+    0x1C, 0x89, 0xF5, 0x32, 0x09, 0xE7, 0x0C, 0x55, 0x60, 0x11, 0x80, 0xCE, 0x67, 0x90, 0x11, 0xA6, 0x0B, 0x7D, 0x22,
+    0x09, 0x56, 0x2B, 0x53, 0x15, 0x8C, 0x6E, 0xB0, 0x79, 0xC2, 0x53, 0xF3, 0x1A, 0x1E, 0xD1, 0xD9, 0xE4, 0x69, 0x3A,
+    0xA1, 0xA6, 0x33, 0x2A, 0x97, 0xA7, 0xA6, 0xA4, 0x0E, 0x39, 0xB9, 0xAB, 0xF4, 0xDE, 0xEC, 0x1C, 0x64, 0x04, 0x76,
+    0x42, 0xA5, 0xB4, 0x37, 0x93, 0x36, 0x3B, 0xA9, 0x56, 0x96, 0x6B, 0x54, 0xF8, 0x61, 0x96, 0x48, 0x41, 0xCF, 0x89,
+    0xD9, 0xA9, 0x4E, 0x08, 0x45, 0xE9, 0x2C, 0x9A, 0xB4, 0xBE, 0xA3, 0x13, 0x4A, 0x00, 0x76, 0x67, 0x6B, 0xAF, 0x73,
+    0xC9, 0x14, 0x59, 0x5A, 0xA5, 0xA6, 0xC9, 0xE8, 0x70, 0xDB, 0xC6, 0xF1, 0x6C, 0xEF, 0x4A, 0x29, 0x0A, 0xBE, 0x00,
+    0xD9, 0xCD, 0x52, 0x27, 0xC9, 0x05, 0x38, 0xCB, 0x65, 0xEC, 0x5B, 0xFD, 0x42, 0x49, 0xFD, 0x9A, 0x07, 0xB6, 0xF0,
+    0xCE, 0x39, 0x31, 0x15, 0x2A, 0x3B, 0x8C, 0xCB, 0xCE, 0xA9, 0xC4, 0x52, 0x24, 0x0C, 0xC9, 0x6B, 0xAD, 0x7C, 0x35,
+    0xB9, 0x32, 0x3E, 0x20, 0x84, 0x4E, 0xA8, 0x26, 0x6A, 0x3F, 0xE5, 0x54, 0xB4, 0xA7, 0x29, 0x72, 0x25, 0x9B, 0x44,
+    0x76, 0x7D, 0xC5, 0xA9, 0xAD, 0xD9, 0xB3, 0x03, 0x6B, 0x2A, 0x79, 0xB2, 0xAF, 0x48, 0x72, 0x16, 0x49, 0xEA, 0x4A,
+    0x2C, 0x33, 0xC8, 0xCA, 0x52, 0x97, 0x5A, 0xF1, 0x66, 0x77, 0x90, 0xEA, 0x6A, 0x8D, 0x62, 0xCD, 0x86, 0x2C, 0xC5,
+    0x4D, 0x46, 0x06, 0x17, 0x5D, 0xB3, 0x0D, 0x73, 0x45, 0x91, 0x65, 0x4D, 0x5A, 0xA6, 0x9D, 0x4E, 0x2E, 0x0D, 0x9D,
+    0x57, 0x2F, 0x64, 0xEF, 0x3A, 0xF4, 0x06, 0x00, 0x90, 0x3C, 0x9B, 0x9F, 0x4F, 0xFA, 0x16, 0x97, 0x64, 0x8C, 0xE7,
+    0x65, 0xC6, 0x7A, 0x00, 0x80, 0xDE, 0xDF, 0xB0, 0xE5, 0xAC, 0x2F, 0x83, 0xCE, 0x2A, 0x8C, 0x41, 0xBD, 0xC0, 0x8A,
+    0x90, 0x91, 0x44, 0x7D, 0x0E, 0x71, 0xD4, 0x61, 0xFD, 0xE8, 0x69, 0xFF, 0xF5, 0x9D, 0x97, 0x56, 0xE1, 0xBB, 0x11,
+    0x2C, 0x81, 0x8C, 0x50, 0x13, 0xBE, 0x6C, 0x58, 0x11, 0x8E, 0xA6, 0x53, 0x14, 0x8D, 0x35, 0xA3, 0x52, 0x84, 0x90,
+    0x4F, 0x9D, 0xB3, 0xB7, 0x4E, 0x95, 0x49, 0xE8, 0x0D, 0x00, 0x20, 0x16, 0x00, 0x40, 0x64, 0x22, 0x08, 0xB2, 0x37,
+    0xE6, 0x0A, 0xFB, 0x07, 0xDC, 0x5B, 0x93, 0xD4, 0xF4, 0x90, 0x57, 0x53, 0x9C, 0x10, 0x75, 0x36, 0x39, 0x7A, 0xA0,
+    0x57, 0x3E, 0xA4, 0x2C, 0xF8, 0xE8, 0x6E, 0x58, 0x26, 0x1B, 0xB2, 0x5E, 0x6A, 0xC7, 0x7E, 0x83, 0xB5, 0x13, 0x00,
+    0x40, 0x9F, 0x57, 0xF4, 0xB8, 0xD5, 0xBB, 0x8F, 0xBC, 0xAF, 0xC8, 0x66, 0x65, 0xFF, 0x59, 0x1D, 0xC4, 0xEA, 0xB5,
+    0x3A, 0x7D, 0x6A, 0xE7, 0x3B, 0x39, 0xF9, 0x82, 0x25, 0xB6, 0x20, 0xBA, 0x30, 0x08, 0x11, 0x01, 0xD9, 0xDE, 0xA2,
+    0xDB, 0x5F, 0xF6, 0xA5, 0x88, 0xEA, 0x37, 0xB6, 0x35, 0x0F, 0xD4, 0x57, 0x51, 0x8B, 0xB6, 0x6E, 0x7A, 0x65, 0xC9,
+    0x5B, 0x01, 0x00, 0x50, 0xB6, 0x08, 0xB0, 0x36, 0xD5, 0x13, 0xB8, 0xD7, 0xD2, 0x1F, 0xC8, 0x99, 0xFF, 0x2A, 0x94,
+    0x1E, 0xEB, 0x74, 0xB2, 0x89, 0x88, 0x1F, 0xBC, 0x1A, 0xF8, 0x72, 0xFE, 0xD6, 0x58, 0xC9, 0x8E, 0xCF, 0xD5, 0x2D,
+    0xCB, 0x5E, 0x2B, 0xAC, 0x2C, 0x27, 0xCD, 0x14, 0x4A, 0x39, 0x56, 0x4E, 0x8B, 0x32, 0xA7, 0xCC, 0x88, 0x48, 0xA9,
+    0xFE, 0x94, 0x13, 0x2D, 0xE2, 0xA9, 0x8B, 0x4C, 0x4D, 0x6D, 0x9F, 0xF2, 0x54, 0xBF, 0x92, 0x95, 0xBE, 0x62, 0x5A,
+    0x97, 0xB6, 0x92, 0xFC, 0x72, 0xCD, 0x24, 0x27, 0x53, 0xCB, 0x4E, 0x99, 0xF3, 0xA3, 0xB6, 0x5B, 0x76, 0xFB, 0x6C,
+    0x6F, 0x9F, 0xB9, 0xEA, 0x74, 0xBB, 0x09, 0xF4, 0x62, 0xC9, 0xD3, 0x6E, 0xDD, 0xEE, 0x49, 0xA5, 0xE9, 0x82, 0xFA,
+    0x01, 0x00, 0x7E, 0x93, 0x75, 0x3B, 0xE2, 0xA3, 0x23, 0xB9, 0x13, 0x32, 0xD5, 0xBD, 0xD4, 0x6D, 0xBF, 0xAC, 0x73,
+    0xF2, 0x0A, 0x7A, 0x58, 0x33, 0x60, 0x13, 0xD8, 0xCA, 0x4F, 0xF4, 0x51, 0x64, 0xAC, 0xF2, 0xB5, 0x5D, 0x66, 0xC9,
+    0x5A, 0x05, 0x56, 0xE4, 0xC9, 0xDA, 0x6A, 0x2E, 0x79, 0xD1, 0xC3, 0x71, 0x15, 0x75, 0xAD, 0x3E, 0x4C, 0x32, 0xD4,
+    0x05, 0xFF, 0xCD, 0x75, 0x2A, 0x1C, 0x68, 0xAF, 0x8B, 0xD4, 0xAA, 0xF9, 0x82, 0x73, 0x4B, 0x71, 0x52, 0xA2, 0x78,
+    0xC3, 0x10, 0xD2, 0x96, 0x8C, 0x32, 0x46, 0x56, 0x18, 0xD4, 0x28, 0xB2, 0x2C, 0xAA, 0xFC, 0xF0, 0xAC, 0xAD, 0x52,
+    0x25, 0x30, 0x02, 0x40, 0xDB, 0x0A, 0x10, 0xD6, 0xAD, 0x66, 0xA9, 0xD7, 0xFA, 0x83, 0xE9, 0x71, 0xB2, 0xCD, 0xC9,
+    0x53, 0xFD, 0xDC, 0x92, 0x25, 0x0B, 0x78, 0x4E, 0xE5, 0xAF, 0xA1, 0xA1, 0x55, 0xF2, 0xBC, 0xD8, 0xCD, 0x8A, 0xD6,
+    0xE2, 0x83, 0x1B, 0xFD, 0xCC, 0x69, 0x99, 0xB7, 0x27, 0x4B, 0xB8, 0x8E, 0x2E, 0x64, 0x53, 0xD4, 0xFC, 0x1E, 0x2A,
+    0x0D, 0x34, 0x8B, 0x22, 0xD9, 0x53, 0xAE, 0xA9, 0xEB, 0xEC, 0xE8, 0x1C, 0xD9, 0xB6, 0xC6, 0xDA, 0x6B, 0x72, 0x7B,
+    0x3A, 0xD9, 0x14, 0x84, 0xCC, 0xBA, 0x5B, 0xB7, 0x4C, 0xE8, 0x23, 0xA4, 0x48, 0x77, 0x00, 0xF8, 0x16, 0x70, 0xEB,
+    0xA9, 0xA7, 0x9F, 0xD2, 0x6C, 0x25, 0xC9, 0x3A, 0xC8, 0xAF, 0x8B, 0xDB, 0x53, 0x3E, 0x20, 0x00, 0xD0, 0x16, 0xBD,
+    0x36, 0x7B, 0xAE, 0x9F, 0xFA, 0x24, 0x00, 0x50, 0x59, 0x29, 0x68, 0x35, 0x09, 0x49, 0x42, 0x2D, 0xEA, 0x33, 0xA0,
+    0x58, 0x19, 0xB0, 0xB6, 0x52, 0x07, 0x32, 0x16, 0x6B, 0x02, 0xEB, 0x2D, 0x00, 0xB2, 0x83, 0xE8, 0x00, 0x9D, 0x2E,
+    0x2D, 0x39, 0x0C, 0xBD, 0x07, 0x00, 0x00, 0xB0, 0x5E, 0x00, 0x58, 0xBF, 0x41, 0x36, 0x91, 0xB0, 0x81, 0x50, 0x21,
+    0xAC, 0x0B, 0x00, 0x40, 0xDF, 0x07, 0x9C, 0xE6, 0xAE, 0xC1, 0x5D, 0x91, 0x87, 0xDE, 0xE3, 0x3E, 0xD0, 0xFB, 0x1C,
+    0xB2, 0x07, 0x01, 0x00, 0xC8, 0x2E, 0xE2, 0xEF, 0x07, 0xF9, 0xF2, 0x89, 0x5E, 0x63, 0x83, 0x2C, 0x40, 0xBF, 0x91,
+    0xD4, 0xB9, 0x4B, 0x84, 0xEC, 0xCB, 0x73, 0x09, 0xF5, 0x0A, 0x38, 0xA8, 0x02, 0x2D, 0x00, 0x77, 0x52, 0x33, 0x00,
+    0x0A, 0xE0, 0x82, 0x61, 0x02, 0x4C, 0x00, 0xB4, 0x84, 0x78, 0xDD, 0x54, 0xB6, 0x3B, 0xE1, 0x4C, 0x36, 0xF9, 0xA7,
+    0xBD, 0xD4, 0xE1, 0x0B, 0x05, 0x0B, 0x5E, 0x65, 0x00, 0x61, 0x89, 0xC1, 0x00, 0x20, 0xC0, 0x40, 0x05, 0x00, 0x18,
+    0xC0, 0x08, 0x10, 0x81, 0x16, 0x0B, 0x00, 0x20, 0x90, 0x42, 0x88, 0xF3, 0xCD, 0x4F, 0x3F, 0xA4, 0x62, 0x2A, 0x06,
+    0xC9, 0xE2, 0x80, 0x69, 0xB1, 0x74, 0xCC, 0xFA, 0xAB, 0x03, 0x59, 0xF4, 0x64, 0x12, 0x3E, 0x08, 0x81, 0x10, 0x00,
+    0xE8, 0xBC, 0x0F, 0x1A, 0x52, 0xB4, 0x0D, 0xCF, 0x29, 0x02, 0x1E, 0x40, 0xF1, 0xCE, 0x34, 0x10, 0x02, 0xF5, 0x00,
+    0x18, 0xF1, 0xDB, 0x94, 0x54, 0xC6, 0x28, 0x00, 0xC0, 0xC4, 0xBB, 0x62, 0x4B, 0x53, 0x70, 0x04, 0x48, 0xAA, 0x2D,
+    0x15, 0x2F, 0x7A, 0x1A, 0xDA, 0x5D, 0x73, 0xC9, 0x8E, 0x84, 0x11, 0x39, 0x91, 0x04, 0x40, 0x08, 0x21, 0x42, 0x5C,
+    0x45, 0x3B, 0x0A, 0x0D, 0x21, 0x50, 0x84, 0x41, 0x88, 0x63, 0x00, 0x00, 0x55, 0xCA, 0x8A, 0x01, 0x2F, 0xB2, 0x74,
+    0x03, 0x8A, 0x63, 0x02, 0x00, 0x04, 0x08, 0x40, 0xF6, 0x02, 0x02, 0x6C, 0x63, 0x40, 0x20, 0x84, 0x10, 0x02, 0x21,
+    0x00, 0x25, 0x8C, 0x10, 0x42, 0x08, 0x40, 0xA6, 0x19, 0x24, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x42,
+    0x18, 0x74, 0xB2, 0x6B, 0x48, 0x6A, 0x99, 0x2F, 0x09, 0x6B, 0x41, 0x15, 0xBE, 0x62, 0x6A, 0x02, 0x83, 0x4B, 0x80,
+    0xCA, 0x22, 0x8C, 0x51, 0x33, 0x9A, 0x0D, 0x51, 0x89, 0x03, 0x00, 0x42, 0x32, 0x8A, 0x40, 0x20, 0x10, 0xE0, 0x08,
+    0x0C, 0xA0, 0x68, 0xC2, 0x11, 0x46, 0x7E, 0xC8, 0xDC, 0x47, 0x85, 0x17, 0x76, 0xE3, 0xA9, 0xEC, 0xBB, 0xC9, 0x00,
+    0x1A, 0xD8, 0x8C, 0x4C, 0x6D, 0xC9, 0x4C, 0x1C, 0xA5, 0x0B, 0x68, 0x86, 0xD4, 0xA1, 0xDD, 0xC4, 0x69, 0x80, 0x4A,
+    0x1A, 0x0C, 0x08, 0x84, 0x10, 0x02, 0xFD, 0x15, 0x00, 0x10, 0xB9, 0xB0, 0x56, 0x99, 0x6A, 0xAC, 0x87, 0xBB, 0xE6,
+    0x6E, 0x41, 0xB6, 0x35, 0xFD, 0xD2, 0x63, 0x56, 0x6F, 0xAD, 0x55, 0x55, 0xC9, 0xB5, 0x7E, 0xA5, 0x59, 0xE6, 0x94,
+    0xBF, 0xA5, 0x6E, 0xE9, 0xAA, 0xF2, 0x27, 0xB8, 0xFB, 0x0A, 0x28, 0x5B, 0xE1, 0xA7, 0x96, 0x70, 0xC2, 0xE1, 0x4E,
+    0xF3, 0x37, 0xEF, 0xFD, 0x64, 0xC9, 0x18, 0x69, 0x5A, 0xCA, 0x00, 0x00, 0x80, 0xC0, 0x02, 0x00, 0x48, 0xF2, 0xE1,
+    0x5A, 0xB3, 0x0E, 0xC8, 0xB3, 0x73, 0x87, 0x84, 0x83, 0x4D, 0x00, 0xC9, 0x94, 0x23, 0xE4, 0x27, 0x26, 0xC6, 0xCC,
+    0xA7, 0xF4, 0x3B, 0xA6, 0x94, 0x36, 0xBD, 0x6F, 0x9E, 0x86, 0x75, 0x47, 0xDF, 0xD7, 0x74, 0x97, 0x3D, 0xD0, 0x59,
+    0x02, 0x83, 0x7A, 0x79, 0x3A, 0x00, 0x40, 0xB3, 0xBB, 0x3B, 0x22, 0xD4, 0xC2, 0x40, 0x04, 0xC1, 0x20, 0x02, 0x08,
+    0x81, 0xE8, 0x64, 0x46, 0x26, 0x49, 0x5B, 0x76, 0xB3, 0x2D, 0x6B, 0xFE, 0x77, 0x6A, 0xB1, 0x14, 0xEF, 0x01, 0xA0,
+    0x52, 0x93, 0x33, 0x80, 0x4D, 0x5E, 0x53, 0xE9, 0x62, 0x01, 0xD0, 0xE4, 0xF4, 0xC2, 0x47, 0x47, 0x0A, 0x6C, 0xB3,
+    0xD2, 0xA3, 0x4B, 0x97, 0x5A, 0x0E, 0x51, 0x16, 0x5D, 0x9B, 0xCC, 0xCA, 0x4C, 0xBC, 0xA6, 0x1E, 0xF1, 0x4B, 0xF0,
+    0x01, 0xD2, 0x43, 0xE4, 0x84, 0xFB, 0x44, 0x26, 0x5F, 0x96, 0x78, 0x59, 0x36, 0xDF, 0x9A, 0xB0, 0x5F, 0x00, 0x80,
+    0xB4, 0x07, 0x00, 0x8E, 0x17, 0x75, 0x58, 0x3F, 0x02, 0x70, 0x7B, 0x88, 0x1B, 0x52, 0xBB, 0xA9, 0x8F, 0x54, 0x48,
+    0x3F, 0x73, 0x3B, 0xF5, 0xA9, 0x7A, 0x06, 0xD1, 0x3B, 0x00, 0x40, 0x37, 0xB8, 0x65, 0x33, 0x18, 0x01, 0x00, 0x4E,
+    0x10, 0x11, 0x01, 0x00, 0x11, 0x00, 0x20, 0x02, 0xD4, 0x09, 0x00, 0x20, 0x84, 0x5E, 0x75, 0x9B, 0x9F, 0x47, 0x04,
+    0x91, 0x0E, 0xFA, 0x48, 0xF7, 0x3B, 0xD8, 0x29, 0x74, 0xF0, 0xA3, 0x8D, 0xA5, 0x4D, 0x01, 0x00, 0x16, 0x64, 0xA9,
+    0x84, 0x26, 0x4F, 0xCD, 0x02, 0xBE, 0x4B, 0xC2, 0x52, 0x0A, 0xBA, 0x98, 0x1B, 0x58, 0xAC, 0xBA, 0x9C, 0x94, 0x13,
+    0x32, 0xB7, 0x64, 0x35, 0xAD, 0x01, 0xA0, 0x9D, 0x4D, 0x29, 0xB6, 0xD9, 0x6C, 0x01, 0xB2, 0xD6, 0xB6, 0x28, 0x51,
+    0x8C, 0x90, 0x7C, 0xBB, 0x5E, 0x06, 0x81, 0x80, 0x12, 0xA0, 0xD9, 0x4F, 0x5D, 0xBF, 0x17, 0xD3, 0xB2, 0xE2, 0xD4,
+    0xD6, 0x81, 0x75, 0x3A, 0x64, 0xFE, 0x87, 0x35, 0xEC, 0xBF, 0x0E, 0x50, 0xB3, 0x06, 0x46, 0x20, 0x09, 0x23, 0x00,
+    0x01, 0x08, 0x84, 0x00, 0x4F, 0x76, 0x2A, 0x6F, 0xB6, 0xFA, 0xA2, 0x36, 0xA0, 0xDC, 0x18, 0xD4, 0x60, 0x3A, 0x97,
+    0x00, 0xB0, 0x56, 0x99, 0xCD, 0xA0, 0xB2, 0x0E, 0x70, 0xC0, 0x34, 0x39, 0xC3, 0x20, 0x02, 0x15, 0x40, 0xB3, 0x18,
+    0x00, 0xC0, 0x09, 0x8B, 0xBF, 0xAC, 0x5A, 0x2F, 0xA4, 0xBC, 0xC8, 0x6D, 0xFB, 0xAB, 0x0C, 0x37, 0x00, 0xD4, 0xA5,
+    0xF3, 0xC2, 0x3C, 0xC5, 0xC9, 0x99, 0x53, 0x7F, 0xBD, 0xB4, 0x8B, 0xF8, 0x09, 0x7C, 0x0D, 0x7B, 0xB8, 0xC3, 0xB8,
+    0x78, 0xBD, 0x75, 0xC8, 0xFF, 0xD2, 0x04, 0xEC, 0xEF, 0xF4, 0x97, 0x00, 0x80, 0x64, 0xB9, 0xC9, 0x04, 0x80, 0xCC,
+    0xAE, 0x4C, 0x64, 0x8A, 0xFA, 0xD8, 0xF2, 0xDB, 0xE5, 0x8B, 0x01, 0x04, 0x62, 0x9F, 0x50, 0x1B, 0x84, 0x0A, 0x01,
+    0x00, 0x90, 0x97, 0xB9, 0x7C, 0xA6, 0x04, 0x13, 0x29, 0x10, 0xC7, 0xCC, 0x9B, 0x89, 0x14, 0x26, 0xA4, 0x6B, 0xC8,
+    0x17, 0x75, 0x41, 0x13, 0xCA, 0xCC, 0xC7, 0x7B, 0x21, 0x45, 0x4C, 0x49, 0x68, 0xAE, 0x98, 0x1F, 0xD1, 0xEB, 0xA7,
+    0x9F, 0x0D, 0xED, 0xDC, 0x4A, 0x03, 0x01, 0xC0, 0xA4, 0x76, 0xA0, 0x23, 0xBA, 0xD8, 0x8C, 0x24, 0xF2, 0x01, 0xC2,
+    0xCF, 0x03, 0x00, 0x2C, 0x0B, 0x2F, 0xFC, 0x26, 0xF9, 0xDB, 0xFC, 0x38, 0x29, 0x84, 0xB1, 0x0B, 0x91, 0x52, 0x43,
+    0x7C, 0xE9, 0x92, 0x9C, 0x31, 0xAA, 0x93, 0x1F, 0x59, 0xA1, 0xFA, 0x23, 0xFC, 0x10, 0x69, 0x01, 0x09, 0x5D, 0xAA,
+    0x46, 0x13, 0x53, 0x9F, 0xB4, 0x00, 0x84, 0xBF, 0x9C, 0xE1, 0x8B, 0x4D, 0xFC, 0x48, 0xDB, 0x07, 0xF0, 0x00, 0x96,
+    0x02, 0x80, 0x98, 0x84, 0x14, 0xD1, 0xCE, 0x23, 0xB1, 0x01, 0x40, 0x01, 0x00, 0x34, 0xFD, 0xF2, 0x3F, 0x21, 0x16,
+    0xCB, 0x90, 0xE2, 0x03, 0x94, 0x3E, 0xA1, 0x7F, 0x9E, 0xE9, 0xE0, 0x88, 0xA8, 0xE4, 0x7E, 0xAB, 0x4A, 0xB3, 0xBA,
+    0xA8, 0x9D, 0x21, 0x32, 0x19, 0xE4, 0x84, 0xE9, 0x22, 0xB7, 0xFC, 0xAF, 0x75, 0x17, 0xD0, 0xA5, 0x48, 0x6A, 0x02,
+    0xC5, 0x28, 0x42, 0x46, 0x19, 0xDF, 0x94, 0x64, 0x10, 0x20, 0x84, 0x20, 0xC4, 0x00, 0x00, 0x88, 0x32, 0x51, 0x22,
+    0x42, 0xD8, 0xB3, 0xCE, 0x9E, 0xFA, 0x0E, 0x9C, 0x66, 0x44, 0x40, 0xAE, 0xF7, 0x09, 0x6C, 0x80, 0xFC, 0xA3, 0x3B,
+    0x46, 0xE9, 0xA3, 0xA6, 0x65, 0x68, 0xF9, 0x26, 0x17, 0x12, 0xA0, 0x20, 0x64, 0x40, 0xAE, 0x72, 0x9A, 0x8F, 0xC6,
+    0x12, 0x68, 0x6E, 0x7E, 0x4E, 0x72, 0x29, 0x08, 0x8C, 0xB0, 0x93, 0xC1, 0x40, 0x3F, 0xD5, 0xD5, 0xBE, 0x67, 0xF2,
+    0xDE, 0x27, 0xDB, 0x4D, 0x32, 0xA1, 0x81, 0x9D, 0x1D, 0x50, 0x99, 0xC9, 0xE9, 0x8F, 0xDD, 0xCF, 0xCB, 0x25, 0xCD,
+    0xBD, 0xF1, 0x5A, 0xCD, 0x06, 0x08, 0xC9, 0x4A, 0x62, 0x77, 0xA1, 0x26, 0x92, 0x18, 0xF8, 0x0E, 0xC8, 0x34, 0x10,
+    0x7A, 0x39, 0xF5, 0x00, 0x00, 0xAD, 0x42, 0x49, 0x09, 0x59, 0xED, 0x3D, 0x0D, 0x40, 0x08, 0x34, 0x7B, 0x92, 0x96,
+    0x06, 0xC0, 0x00, 0xD2, 0x64, 0x37, 0x31, 0x80, 0xD2, 0xCC, 0x64, 0x90, 0x5C, 0x9F, 0x93, 0x00, 0x00, 0x83, 0x83,
+    0x83, 0x22, 0x6F, 0xC5, 0x95, 0x50, 0x0F, 0x80, 0x11, 0x07, 0x7F, 0x06, 0xE0, 0xCD, 0x04, 0x31, 0x9B, 0x61, 0x8B,
+    0x25, 0x76, 0xB7, 0x8F, 0xFE, 0xA2, 0x5B, 0x1C, 0x65, 0x75, 0x19, 0x97, 0xCE, 0x65, 0x40, 0xBE, 0xDA, 0xAE, 0x63,
+    0xD1, 0xDD, 0x7D, 0xD8, 0xAA, 0x42, 0xC4, 0xCC, 0x51, 0xC6, 0x44, 0x8C, 0x38, 0x9E, 0x84, 0xAF, 0x88, 0x30, 0xCE,
+    0xBC, 0x84, 0x94, 0x84, 0xE4, 0x99, 0x24, 0x89, 0x12, 0x5A, 0x4A, 0x5A, 0x8B, 0x26, 0x1A, 0xA6, 0x34, 0xEC, 0x05,
+    0x28, 0x9E, 0x48, 0x01, 0x39, 0x11, 0xB5, 0xB1, 0x5A, 0x80, 0x0E, 0x8F, 0xC7, 0x17, 0x09, 0x95, 0x10, 0xBA, 0x86,
+    0x22, 0x7B, 0x00, 0x00, 0x4F, 0x51, 0x09, 0xD4, 0x7B, 0xF8, 0x35, 0x14, 0x1D, 0x42, 0x78, 0x4A, 0xF7, 0x40, 0x7B,
+    0x2D, 0x88, 0x40, 0xAF, 0x31, 0x42, 0x80, 0x77, 0x00, 0x00, 0xF1, 0x00, 0x48, 0x4B, 0x82, 0x06, 0x00, 0xB9, 0x68,
+    0xCE, 0xD1, 0x06, 0x29, 0x3E, 0x5A, 0x0B, 0xF8, 0x61, 0x02, 0xB4, 0x92, 0x77, 0x00, 0xAB, 0x55, 0x9D, 0x03, 0x88,
+    0x9E, 0xE5, 0x2B, 0xC1, 0xF7, 0x50, 0x05, 0xF2, 0xC2, 0x48, 0x60, 0x60, 0x98, 0x41, 0xA4, 0x40, 0x4A, 0x26, 0x88,
+    0x10, 0x02, 0x01, 0x20, 0x05, 0x11, 0x20, 0x59, 0xDD, 0x57, 0x39, 0x42, 0x28, 0x5A, 0x20, 0x49, 0x13, 0x12, 0x22,
+    0xC5, 0x84, 0x61, 0x86, 0x19, 0x62, 0x92, 0x53, 0x4A, 0x94, 0xA0, 0x5C, 0x25, 0x15, 0x91, 0x27, 0x52, 0x8A, 0x08,
+    0xC5, 0x53, 0x24, 0x91, 0x62, 0xDE, 0x10, 0xA1, 0x84, 0x57, 0x02, 0x1C, 0x43, 0x80, 0x22, 0xAD, 0x38, 0xE5, 0x3F,
+    0x4D, 0x02, 0x84, 0x40, 0x85, 0xE4, 0x2B, 0x45, 0x13, 0x8A, 0x10, 0x29, 0x00, 0x5F, 0x80, 0xD4, 0x8A, 0x49, 0x80,
+    0x12, 0x25, 0xA8, 0x22, 0x84, 0x88, 0x54, 0x0C, 0x68, 0x42, 0x9F, 0x05, 0x94, 0xA0, 0x87, 0xD0, 0x12, 0xB3, 0x2A,
+    0x60, 0xBD, 0x80, 0x77, 0x1A, 0x26, 0x42, 0x40, 0xEA, 0x02, 0x9E, 0xE0, 0x2B, 0xC6, 0x5E, 0x4C, 0x20, 0xDF, 0xC3,
+    0x18, 0x62, 0x53, 0x22, 0xF0, 0x85, 0xD0, 0x24, 0x23, 0x66, 0x06, 0x40, 0x08, 0x81, 0x98, 0x01, 0xC0, 0x10, 0x22,
+    0x04, 0x13, 0x23, 0x08, 0x44, 0x20, 0x04, 0xA2, 0x6E, 0x14, 0xA1, 0x14, 0x83, 0x18, 0x03, 0x46, 0x60, 0xCC, 0x08,
+    0x18, 0x2A, 0xD2, 0x94, 0x02, 0x18, 0x89, 0x29, 0x8A, 0x4B, 0xB8, 0xE2, 0x84, 0x22, 0xA7, 0x4A, 0x31, 0xE2, 0x4A,
+    0x55, 0xA0, 0xF9, 0xA0, 0x3D, 0x00, 0x20, 0xA6, 0xD8, 0x6F, 0xE8, 0xDA, 0xD8, 0x43, 0x78, 0xE7, 0x67, 0x29, 0x38,
+    0xCE, 0x38, 0x6A, 0x1D, 0x48, 0x2D, 0x90, 0x35, 0x9D, 0x84, 0x10, 0x8E, 0x19, 0x31, 0x06, 0x40, 0xA8, 0x92, 0x18,
+    0x09, 0x29, 0x90, 0x26, 0x26, 0x20, 0xEA, 0x9B, 0xF5, 0xA1, 0xB4, 0x48, 0x91, 0x39, 0xB5, 0xE0, 0x67, 0xEA, 0x37,
+    0xE1, 0x28, 0xED, 0x94, 0x87, 0x8F, 0x33, 0x68, 0x01, 0x5F, 0x30, 0x40, 0xF1, 0x8C, 0xB8, 0xDD, 0x51, 0x1A, 0x2D,
+    0xE8, 0x5A, 0x98, 0x22, 0xA2, 0x04, 0xB1, 0x18, 0x4F, 0x19, 0x02, 0x31, 0x23, 0x5B, 0xB5, 0xE4, 0xDB, 0xCA, 0xDA,
+    0x3D, 0x52, 0xAB, 0x36, 0xC2, 0xF7, 0xCB, 0xDE, 0xD1, 0x01, 0x00, 0xA0, 0x68, 0x91, 0xEA, 0x15, 0x00, 0x00, 0x2E,
+    0x04, 0x21, 0x93, 0x27, 0x4D, 0xCA, 0x29, 0xC2, 0x57, 0xCC, 0xE2, 0xC4, 0x51, 0x14, 0x69, 0x90, 0x0C, 0x46, 0x48,
+    0x02, 0x14, 0x01, 0xEA, 0x87, 0x91, 0x34, 0xD0, 0xD2, 0x69, 0x13, 0xA2, 0x01, 0x00, 0xD3, 0xD4, 0x1F, 0xC0, 0x5E,
+    0xD2, 0x1C, 0x38, 0x1A, 0xC6, 0x04, 0xEA, 0x43, 0x2B, 0xF9, 0xAF, 0xD4, 0x45, 0x9B, 0x5A, 0xAB, 0x42, 0x9D, 0x01,
+    0x73, 0x72, 0x25, 0xB1, 0x20, 0x3A, 0x89, 0xEA, 0xF9, 0xC2, 0x4C, 0x7D, 0x04, 0x00, 0x4E, 0x85, 0x01, 0x00, 0xE4,
+    0xAC, 0x4B, 0x50, 0x27, 0x49, 0x36, 0x27, 0xC9, 0x53, 0x7A, 0xF9, 0x91, 0xBE, 0xCC, 0xAB, 0x14, 0xC5, 0xA7, 0x80,
+    0x9B, 0xA4, 0x7D, 0x2D, 0x92, 0xD1, 0x4A, 0xDE, 0x92, 0x2A, 0xED, 0x01, 0x5B, 0xFB, 0x3A, 0x55, 0x95, 0x8B, 0xEA,
+    0xCF, 0x75, 0x6D, 0x2F, 0xB3, 0x96, 0x7E, 0x7B, 0x92, 0x58, 0xEC, 0x36, 0x19, 0x0B, 0x42, 0xE1, 0x0A, 0x14, 0x01,
+    0x00, 0xD8, 0x5A, 0x97, 0x49, 0xA9, 0xA6, 0x4D, 0xA4, 0xBF, 0xBC, 0xA5, 0x5D, 0x41, 0xCB, 0x3D, 0x5A, 0x6D, 0x34,
+    0x7F, 0x90, 0x14, 0x01, 0xA0, 0x1F, 0x81, 0x10, 0x42, 0x80, 0xC8, 0xBC, 0x3F, 0xF4, 0x06, 0x33, 0x84, 0x58, 0x62,
+    0xF3, 0x19, 0xEC, 0xF7, 0x66, 0x20, 0x6C, 0xB6, 0xF4, 0x57, 0x9F, 0x7B, 0x00, 0x20, 0x14, 0x6A, 0x59, 0x60, 0x24,
+    0xD4, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0xD2, 0xA3, 0xD6, 0xB2, 0xC6, 0x50, 0xCA, 0xA4, 0xA2,
+    0xA2, 0xCA, 0x3E, 0xB5, 0xF9, 0x5A, 0xC6, 0x8A, 0x94, 0xD7, 0xD3, 0x21, 0x93, 0x6F, 0x0B, 0xFB, 0x8A, 0x97, 0x29,
+    0x38, 0x81, 0x89, 0xB8, 0x59, 0xD9, 0xCB, 0x76, 0x03, 0x80, 0x41, 0x6D, 0xED, 0xF8, 0x55, 0x10, 0x39, 0x3B, 0xF9,
+    0xBB, 0x9A, 0xAC, 0x3D, 0x39, 0x75, 0xEB, 0x03, 0x64, 0x38, 0xFD, 0x08, 0x34, 0x4B, 0x9E, 0xBD, 0x7C, 0x65, 0x3B,
+    0x4D, 0xA4, 0x60, 0x4C, 0x88, 0xB4, 0xF6, 0x54, 0x6A, 0x48, 0x00, 0x80, 0xE8, 0xDC, 0x6E, 0x1F, 0x18, 0x59, 0x02,
+    0xC3, 0x6C, 0x01, 0x56, 0xAE, 0x1E, 0xC7, 0x14, 0xFA, 0x87, 0x20, 0xCB, 0xD5, 0x39, 0x0A, 0x9B, 0x0B, 0x30, 0x6A,
+    0x14, 0xFB, 0x24, 0xC8, 0xA9, 0xC3, 0xBE, 0xEA, 0x03, 0x00, 0x49, 0x95, 0x24, 0x24, 0xF5, 0xB2, 0xB0, 0xB9, 0xC9,
+    0x07, 0xF2, 0xA5, 0x1C, 0x72, 0x16, 0x36, 0x50, 0x1F, 0x68, 0xF8, 0x8E, 0x6B, 0x05, 0x00, 0x00, 0x3B, 0x19, 0xCF,
+    0xBE, 0x01, 0xA2, 0xEA, 0x31, 0x72, 0x00, 0x58, 0x94, 0x92, 0x3F, 0x00, 0x00, 0x80, 0x7A, 0x3C, 0x80, 0x64, 0xAD,
+    0xD9, 0xBE, 0xBA, 0xFD, 0x86, 0xEF, 0xEF, 0x64, 0x36, 0x59, 0xA4, 0xDA, 0xD8, 0x25, 0x5A, 0x48, 0xC0, 0xA2, 0xC9,
+    0xAF, 0x98, 0x90, 0x59, 0xD2, 0x99, 0x91, 0x69, 0x44, 0x87, 0x9C, 0x82, 0xC5, 0xEB, 0x96, 0x3A, 0xAE, 0x5E, 0x9D,
+    0x92, 0x0D, 0x00, 0x00, 0x00, 0xD0, 0x33, 0x08, 0xC0, 0xC7, 0xCE, 0x07, 0x0C, 0x80, 0x2F, 0xEC, 0xE9, 0x10, 0x56,
+    0xAC, 0x1D, 0x51, 0x8B, 0xCA, 0x80, 0x10, 0xA0, 0x48, 0x10, 0x12, 0x0A, 0x6A, 0xC2, 0x07, 0x77, 0x04, 0x28, 0x2E,
+    0x3B, 0x00, 0x00, 0xD6, 0xC5, 0xDC, 0x96, 0x58, 0xAB, 0x2F, 0xF2, 0x36, 0x0C, 0x97, 0x7E, 0x3B, 0x91, 0x9C, 0x55,
+    0x77, 0x03, 0x60, 0x59, 0xCD, 0x0B, 0x1D, 0x02, 0x8F, 0x45, 0x54, 0x2D, 0xDF, 0xEB, 0x0D, 0xBE, 0x9D, 0x00, 0x50,
+    0x27, 0x8C, 0x4E, 0x9C, 0x7C, 0xDC, 0x97, 0xB1, 0x6C, 0x59, 0xB5, 0xF7, 0xCF, 0x58, 0x93, 0x9F, 0xFC, 0xD1, 0x93,
+    0x36, 0x42, 0x76, 0xD9, 0x9F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x10, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00,
+    0x11, 0x44, 0x00, 0x84, 0x00, 0x00, 0x00, 0x5B, 0x09, 0x20, 0x4B, 0x1B, 0xD4, 0x13, 0x00, 0xAB, 0xEB, 0x54, 0x33,
+    0x1B, 0x00, 0xA0, 0x59, 0x1C, 0x5A, 0x0A, 0x03, 0x3F, 0x20, 0xC9, 0x1F, 0x0C, 0xCA, 0x78, 0x02, 0x9D, 0xF2, 0x82,
+    0x08, 0x38, 0x08, 0x70, 0xBF, 0xE4, 0x90, 0xE0, 0x6B, 0xEE, 0x91, 0xCA, 0x33, 0xFB, 0xA1, 0xA3, 0x25, 0x60, 0x02,
+    0x3A, 0xF1, 0xC2, 0x25, 0x20, 0x0B, 0x00, 0x50, 0x39, 0x55, 0xC1, 0x23, 0xDE, 0x9F, 0x09, 0x80, 0x12, 0x66, 0x01,
+    0x2B, 0x01, 0x90, 0x0B, 0x98, 0xE0, 0x09, 0xE0, 0x04, 0x23, 0x80, 0xF0, 0x4D, 0x58, 0xBF, 0x89, 0x10, 0x27, 0xB5,
+    0xD2, 0xC6, 0x89, 0x54, 0x14, 0x23, 0xC5, 0x08, 0xB8, 0x37, 0x1C, 0x65, 0x5E, 0xC0, 0x91, 0x8C, 0xF1, 0x4A, 0x92,
+    0x02, 0x28, 0x20, 0x5A, 0x24, 0xA1, 0x15, 0x27, 0x91, 0x02, 0x49, 0xB4, 0x30, 0x42, 0x78, 0x18, 0xAB, 0x00, 0x00,
+    0x00, 0x00, 0x83, 0x79, 0x02, 0x81, 0xA3, 0x27, 0xB9, 0x9C, 0x3E, 0x3D, 0x9E, 0x5C, 0x2A, 0x62, 0x31, 0xBC, 0x40,
+    0x95, 0xB6, 0x67, 0x01, 0x00, 0x80, 0x29, 0x1A, 0x5F, 0xA4, 0xAF, 0xD8, 0x1A, 0x5F, 0x5B, 0x7A, 0x9C, 0xFF, 0xBA,
+    0x96, 0x00, 0x00, 0xC9, 0xD7, 0xCA, 0x50, 0x80, 0xD3, 0x1A, 0xD4, 0x00, 0x00, 0x0F, 0xD5, 0x54, 0x80, 0x82, 0xA2,
+    0x60, 0xC2, 0x50, 0xDB, 0x94, 0x90, 0x2B, 0x49, 0xD2, 0x49, 0x26, 0x10, 0x42, 0x18, 0x03, 0xC6, 0x89, 0x05, 0x14,
+    0x81, 0x08, 0x7C, 0x6C, 0x40, 0x6F, 0x64, 0xE4, 0xA7, 0xC2, 0x01, 0x96, 0x6C, 0x19, 0xF1, 0xDA, 0x3D, 0x16, 0x3B,
+    0xA4, 0x27, 0x13, 0x32, 0x21, 0xA2, 0x8F, 0x5A, 0x27, 0x67, 0x2A, 0xC0, 0xBF, 0x04, 0x38, 0xC6, 0x76, 0xFA, 0x21,
+    0xA1, 0x34, 0x3A, 0xBB, 0x71, 0x41, 0xC4, 0x53, 0xD3, 0x00, 0xD0, 0x5D, 0x75, 0x42, 0xE7, 0x3C, 0x13, 0x47, 0x96,
+    0x1D, 0x72, 0x76, 0xA8, 0x4A, 0xB3, 0x59, 0x34, 0x90, 0x00, 0x00, 0x00, 0xF2, 0x47, 0x6E, 0xDA, 0x3A, 0xF4, 0xE3,
+    0x64, 0x14, 0x2C, 0x11, 0x82, 0xFA, 0xAC, 0x04, 0x00, 0xF8, 0x38, 0x5A, 0x8B, 0xDE, 0x21, 0x9A, 0x06, 0x11, 0x84,
+    0x08, 0x61, 0x1A, 0xC2, 0xFE, 0x0C, 0x8A, 0xA4, 0x24, 0xE9, 0x26, 0x25, 0x25, 0x07, 0x22, 0x04, 0x7D, 0xAE, 0x21,
+    0xDD, 0x00, 0xC0, 0x1E, 0xC8, 0xD4, 0xAD, 0x01, 0x2A, 0x2B, 0xC5, 0xE3, 0xD9, 0xC0, 0x2B, 0x1A, 0x2E, 0x00, 0x0D,
+    0x00, 0xEC, 0x69, 0x6E, 0x69, 0xAE, 0xCB, 0xE2, 0x19, 0xE4, 0x02, 0x09, 0xCC, 0xA0, 0x0E, 0xC6, 0xA7, 0xAE, 0x47,
+    0xC1, 0xDD, 0xE9, 0xF0, 0x2F, 0xAB, 0x2A, 0x12, 0xCA, 0x44, 0x09, 0xF1, 0x4A, 0x71, 0x1B, 0xFB, 0x49, 0xA7, 0x0F,
+    0x00, 0xB2, 0xB9, 0xC9, 0x2A, 0xA1, 0xB9, 0xC5, 0xA9, 0x35, 0x45, 0x00, 0x3C, 0x34, 0x3B, 0xC9, 0x15, 0xE4, 0x25,
+    0x7D, 0x6E, 0x19, 0xAB, 0xE2, 0x88, 0xE9, 0x79, 0xCD, 0xAC, 0x36, 0x4D, 0x20, 0x65, 0x3B, 0xA2, 0x15, 0xB8, 0x09,
+    0xC0, 0x95, 0x3B, 0x0A, 0x52, 0x91, 0xAC, 0x12, 0x46, 0xB6, 0x77, 0xD4, 0xEB, 0x16, 0xCB, 0xFF, 0xC2, 0xC1, 0xCC,
+    0xC8, 0x84, 0x64, 0x17, 0xA0, 0x77, 0x16, 0x5F, 0xB3, 0x68, 0x46, 0xF2, 0x75, 0x9B, 0x6B, 0x39, 0x9A, 0xCD, 0x57,
+    0x14, 0x79, 0x4D, 0xE7, 0x3A, 0x49, 0xA0, 0x69, 0x01, 0x20, 0x11, 0x8E, 0x63, 0x24, 0x21, 0x27, 0x24, 0x81, 0x83,
+    0x66, 0x64, 0x35, 0x83, 0x03, 0x82, 0x16, 0xED, 0x5F, 0x8E, 0x23, 0x04, 0xBE, 0x45, 0xC1, 0x0D, 0x00, 0x50, 0x2C,
+    0x50, 0x11, 0x4B, 0xF2, 0xCA, 0xA6, 0x2B, 0xE9, 0x58, 0x54, 0x3A, 0xF1, 0x35, 0x27, 0x17, 0xE9, 0xC1, 0xA4, 0x94,
+    0x8A, 0x51, 0x78, 0x2E, 0x9B, 0xA3, 0x0B, 0xF0, 0x9A, 0x24, 0xF9, 0x20, 0x90, 0x04, 0x00, 0x72, 0x91, 0xB0, 0x98,
+    0xB6, 0x4D, 0x54, 0x5D, 0x12, 0x5F, 0x38, 0x03, 0x00, 0xCA, 0x62, 0x3A, 0x70, 0x00, 0xF0, 0x04, 0x42, 0x78, 0x9A,
+    0x64, 0x12, 0x58, 0x69, 0x23, 0x2A, 0xE7, 0x48, 0xE2, 0xDB, 0xDA, 0x69, 0x58, 0x5E, 0x16, 0x62, 0x00, 0x46, 0x74,
+    0xF1, 0x0F, 0xC1, 0x66, 0x60, 0x0B, 0x3E, 0x42, 0x34, 0xDA, 0xE1, 0xD2, 0x02, 0x84, 0x16, 0x00, 0xA9, 0x1B, 0x9A,
+    0x28, 0x65, 0xC0, 0xFC, 0xBB, 0x13, 0x00, 0x80, 0xCA, 0x05, 0xDE, 0xC4, 0xF1, 0xE4, 0x8B, 0x4A, 0xD3, 0x60, 0x40,
+    0xB6, 0x6D, 0xED, 0x83, 0x92, 0x52, 0x32, 0x9E, 0xAA, 0xC9, 0x29, 0xA6, 0x35, 0x31, 0x7D, 0x52, 0xCA, 0x2C, 0x58,
+    0xAE, 0x47, 0xB4, 0x54, 0xA7, 0x6C, 0x2A, 0xC6, 0xF9, 0x5D, 0x23, 0x94, 0xDF, 0x46, 0x57, 0x04, 0xAA, 0x32, 0x5A,
+    0x0B, 0x09, 0x14, 0xDC, 0x46, 0x42, 0x6B, 0xFF, 0xB5, 0x12, 0x00, 0xE0, 0x04, 0xD2, 0xB2, 0x44, 0xAF, 0xCC, 0xA2,
+    0x3E, 0xC8, 0x09, 0xD7, 0xFB, 0xCB, 0x2B, 0xE9, 0x60, 0x00, 0x99, 0x11, 0x4A, 0x29, 0x05, 0xFD, 0x1D, 0x38, 0x09,
+    0xED, 0xEC, 0xA6, 0x7A, 0x4E, 0x12, 0x3F, 0x2F, 0xED, 0x54, 0x2E, 0x24, 0xBE, 0x6F, 0x74, 0x0D, 0xF1, 0x8B, 0x8C,
+    0x23, 0x14, 0xB5, 0x27, 0x9F, 0xAF, 0xDB, 0xE7, 0xB8, 0x2C, 0x18, 0x3C, 0x9D, 0x6E, 0x9A, 0x90, 0x84, 0x00, 0xC0,
+    0x82, 0x11, 0xA2, 0x54, 0x5B, 0x4A, 0xDF, 0xB7, 0x12, 0x9B, 0xFD, 0xF8, 0x9E, 0x10, 0x15, 0xED, 0x95, 0xA4, 0xC3,
+    0xA2, 0x39, 0x27, 0xB7, 0x6D, 0x25, 0x50, 0x79, 0xB9, 0xA8, 0x5C, 0x3F, 0x55, 0xCB, 0xB7, 0x8C, 0x9C, 0xCE, 0x98,
+    0xE1, 0x68, 0x41, 0xC4, 0x32, 0xA5, 0x4B, 0xA9, 0x88, 0xD4, 0x4C, 0x32, 0xB8, 0x85, 0x55, 0xCE, 0x47, 0x20, 0x44,
+    0x01, 0x00, 0xE4, 0x55, 0x8E, 0xB0, 0xFA, 0x77, 0x10, 0x20, 0xBC, 0x40, 0x03, 0x00, 0x98, 0x2D, 0x8D, 0xB2, 0x68,
+    0xC2, 0xCA, 0x28, 0xD7, 0x68, 0x11, 0x6D, 0x2D, 0xB2, 0xEA, 0x6B, 0x68, 0xE5, 0x0C, 0x41, 0x44, 0x5D, 0x31, 0x91,
+    0x0A, 0x63, 0xDB, 0x0A, 0xAD, 0x28, 0x33, 0x9A, 0x06, 0x9D, 0xC5, 0x44, 0x2D, 0x13, 0xAF, 0xBC, 0x80, 0x3A, 0x13,
+    0x57, 0x0A, 0xF3, 0x27, 0x93, 0x54, 0x00, 0x40, 0xBB, 0x77, 0xFF, 0xE9, 0x08, 0xBB, 0xDC, 0x2E, 0xC8, 0x69, 0xA6,
+    0x92, 0x37, 0x19, 0xF8, 0xC0, 0x92, 0x86, 0x6D, 0x97, 0x72, 0xB9, 0xF3, 0xDC, 0x59, 0xB1, 0x79, 0x0A, 0x6E, 0x02,
+    0x64, 0x03, 0x00, 0xD4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x12, 0x9A, 0x01, 0x30, 0x02, 0x00, 0x1C, 0x81, 0xF3, 0xDF, 0xE9, 0x86, 0x14, 0x8A, 0x96, 0x41, 0x2E, 0xE3,
+    0x9C, 0x86, 0x01, 0xC9, 0xB7, 0x82, 0x26, 0x49, 0x2B, 0xC5, 0xD0, 0xFE, 0x74, 0x79, 0x97, 0x56, 0x4D, 0x5C, 0x6E,
+    0x58, 0xF0, 0x23, 0xF8, 0x1B, 0x5E, 0x31, 0x00, 0x60, 0x04, 0x00, 0x00, 0xA3, 0xF8, 0x49, 0xDC, 0xCF, 0xD0, 0x22,
+    0x56, 0x0C, 0x0D, 0x0D, 0x83, 0xDD, 0x07, 0x0C, 0xBA, 0xE8, 0x00, 0x00, 0x01, 0x34, 0x74, 0xC2, 0xAC, 0x1F, 0x00,
+    0x30, 0xAA, 0x10, 0xF1, 0x50, 0xA4, 0x3E, 0x12, 0xE0, 0x14, 0x0D, 0xE4, 0x95, 0x4C, 0xD3, 0xDD, 0x92, 0x28, 0xDA,
+    0xBA, 0xBC, 0x73, 0x5A, 0x0E, 0x07, 0x00, 0x50, 0x4A, 0x55, 0x4B, 0x79, 0x75, 0xB9, 0xB7, 0xBD, 0x0C, 0x58, 0x84,
+    0x8C, 0xAE, 0xF8, 0x33, 0x13, 0x4D, 0x61, 0x59, 0xD2, 0x5E, 0xA4, 0xAB, 0xD7, 0xE9, 0x98, 0x58, 0x49, 0x63, 0x62,
+    0x41, 0x17, 0x66, 0x9F, 0x93, 0x10, 0x81, 0x33, 0xA3, 0x98, 0x71, 0xF6, 0xBB, 0x5E, 0x6D, 0xA5, 0xF9, 0x5F, 0x9F,
+    0xB8, 0x85, 0x6D, 0xB6, 0xF4, 0xB2, 0x7D, 0xA5, 0x34, 0x71, 0x29, 0x80, 0x2A, 0xC1, 0x98, 0xB4, 0xCD, 0x89, 0x02,
+    0xC8, 0x37, 0xA5, 0x54, 0x53, 0x5D, 0x99, 0xEF, 0x9D, 0xF3, 0x2C, 0xE9, 0xC4, 0x2A, 0xFD, 0xE8, 0x19, 0x65, 0xC3,
+    0x55, 0x87, 0xCC, 0xD4, 0x5F, 0x5B, 0x03, 0x64, 0xC7, 0xAD, 0x58, 0x29, 0x94, 0x90, 0xE7, 0x95, 0x7C, 0x00, 0xA8,
+    0xEE, 0xDC, 0x24, 0x37, 0xAC, 0xB4, 0xD5, 0xB2, 0x00, 0x84, 0x9B, 0x23, 0xF0, 0xAC, 0x64, 0x5F, 0xFD, 0x5E, 0xA5,
+    0xBB, 0xD7, 0x54, 0xBF, 0x64, 0x1F, 0x42, 0x7E, 0x16, 0x6B, 0x02, 0x91, 0x51, 0x72, 0x00, 0xFA, 0xF4, 0xB8, 0x50,
+    0x87, 0xE8, 0x35, 0x00, 0xD6, 0x00, 0x6F, 0xE5, 0xC0, 0x7E, 0x77, 0x6C, 0x81, 0x6C, 0x76, 0x97, 0x1F, 0x80, 0x80,
+    0x10, 0x00, 0x80, 0x10, 0xB7, 0x7E, 0x23, 0xFB, 0x80, 0x58, 0xD2, 0xAE, 0xC6, 0xF4, 0x5A, 0xEA, 0x5B, 0x2D, 0x93,
+    0x77, 0xB0, 0x91, 0x91, 0x01, 0x30, 0xAA, 0xC5, 0x4F, 0x60, 0xD9, 0x19, 0x57, 0xB4, 0x07, 0x00, 0x00, 0xD8, 0xB7,
+    0x5E, 0xB5, 0x3E, 0x50, 0x65, 0x12, 0xD6, 0xFF, 0xA0, 0x3C, 0x04, 0x08, 0xA1, 0xF2, 0x15, 0x90, 0x54, 0x3A, 0xF9,
+    0xC5, 0x11, 0xE4, 0x67, 0x1C, 0x21, 0x64, 0x1F, 0x00, 0x94, 0x14, 0x76, 0x4D, 0xFE, 0xF8, 0xB7, 0xEC, 0x51, 0xA9,
+    0xD5, 0x2D, 0x03, 0x49, 0xA8, 0x5F, 0x89, 0x49, 0x00, 0x10, 0xD9, 0x8C, 0x45, 0x48, 0x29, 0xE8, 0x93, 0xF3, 0x6B,
+    0x81, 0x69, 0xD8, 0xFD, 0xCB, 0xCA, 0xBE, 0x3D, 0xC2, 0x0B, 0x70, 0x0B, 0x40, 0x86, 0xB5, 0xBC, 0xAC, 0x7C, 0x85,
+    0xAC, 0x5E, 0x41, 0x04, 0x40, 0x04, 0xF8, 0x13, 0x32, 0xC9, 0x88, 0x0E, 0x11, 0x28, 0xC3, 0x40, 0xD6, 0xD5, 0x90,
+    0xCA, 0x84, 0x66, 0xFC, 0x90, 0x48, 0xA8, 0x8D, 0x24, 0x92, 0x51, 0x19, 0x23, 0x1C, 0x9A, 0x04, 0x00, 0x08, 0x2C,
+    0x0A, 0x8E, 0x10, 0x9A, 0x77, 0x0C, 0x14, 0xC5, 0x0B, 0x09, 0x80, 0x27, 0x34, 0xF7, 0x98, 0xE2, 0x85, 0x97, 0x40,
+    0x4B, 0x00, 0x18, 0xB9, 0x52, 0x78, 0x08, 0x5A, 0x60, 0x86, 0x89, 0xBB, 0x5D, 0xA6, 0x0B, 0xB4, 0xC0, 0xFB, 0xD8,
+    0x27, 0x55, 0xA1, 0xDB, 0x8B, 0x96, 0xD4, 0xB4, 0x51, 0x0A, 0x80, 0xDF, 0x29, 0xA5, 0xA1, 0x91, 0x02, 0x00, 0x6C,
+    0xAD, 0x44, 0x81, 0x44, 0x38, 0x42, 0x20, 0x00, 0x90, 0x34, 0x24, 0xC1, 0x12, 0x00, 0x40, 0x46, 0x00, 0xA6, 0x4B,
+    0x09, 0xEA, 0x02, 0x6D, 0x33, 0x00, 0x78, 0x01, 0x00, 0x00, 0x00, 0x92, 0x00, 0x00, 0x3E, 0xB6, 0x01, 0x00, 0x12,
+    0x02, 0x54, 0x63, 0xF4, 0x67, 0x00, 0xC0, 0x00, 0xA8, 0x40, 0x11, 0x46, 0x18, 0xAB, 0x0B, 0x70, 0x84, 0xAF, 0xE0,
+    0x9B, 0x71, 0x6C, 0x42, 0x73, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8A, 0x6B, 0xD7, 0xA6, 0xAA, 0x8E, 0x13,
+    0x40, 0x11, 0x13, 0x25, 0x90, 0xE2, 0x3D, 0xF0, 0xDE, 0x4F, 0x01, 0x00, 0xD2, 0xF7, 0x00, 0x00, 0x40, 0x9A, 0xDF,
+    0x82, 0x04, 0x28, 0x4E, 0xB4, 0xE2, 0xC7, 0xCC, 0x1B, 0x2D, 0x01, 0x46, 0xC0, 0x23, 0xC0, 0x74, 0xF7, 0x15, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xBD, 0x4D, 0x6F, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0xE8, 0xD9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x7A, 0x3B, 0x40, 0x6F, 0x0B, 0x00, 0x00, 0x80,
+    0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x60, 0x5F, 0xBA, 0xFE, 0x2B, 0xEF, 0xDE, 0x8B, 0x0B,
+    0xC8, 0x3A, 0xD1, 0x9F, 0x6F, 0x30, 0xD9, 0x41, 0x3F, 0x7A, 0x75, 0x6B, 0xF2, 0xEA, 0x7B, 0xD3, 0x67, 0xAD, 0xAD,
+    0xD3, 0x9B, 0xDD, 0xBB, 0x73, 0x99, 0x04, 0x08, 0xB9, 0x0B, 0x20, 0xD3, 0xCF, 0x75, 0x97, 0xAE, 0xEE, 0xB6, 0x2A,
+    0x6E, 0x29, 0x6C, 0xF5, 0x08, 0x4A, 0x6B, 0xAB, 0x06, 0xC0, 0x89, 0x90, 0x3D, 0xC5, 0x4C, 0x43, 0x29, 0xE6, 0x24,
+    0x4C, 0x02, 0x22, 0x40, 0x04, 0x81, 0x93, 0x92, 0x21, 0x97, 0x28, 0xF1, 0x4F, 0x02, 0xC0, 0x8F, 0x13, 0x42, 0x7A,
+    0x08, 0xA9, 0xA4, 0xE2, 0x34, 0x5E, 0x50, 0x38, 0x03, 0x00, 0x20, 0x07, 0x46, 0x04, 0x70, 0x4B, 0x00, 0x06, 0x08,
+    0x00, 0x01, 0x00, 0x36,
 };
 
 std::vector<uint8_t> const kBinKml = {
-  0x09, 0x00, 0x00, 0x1E, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x26, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0x01, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x28, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9A, 0x02, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-  0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x01,
-  0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x04, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x0D, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x8D, 0xB7, 0xF5, 0x71, 0xFC, 0x8C, 0xFC, 0xC0, 0x02, 0x00, 0x01,
-  0x01, 0x00, 0x00, 0x00, 0x00, 0x05, 0x01, 0x00, 0x03, 0x00, 0x01, 0x00, 0x04, 0x01, 0x00, 0x00,
-  0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0xF3, 0xC2, 0xFB, 0xF9, 0x01, 0xE3, 0xB9, 0xBB, 0x8E, 0x01, 0xC3, 0xC5, 0xD2, 0xBB,
-  0x02, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x05, 0x01, 0x00, 0x05, 0x01, 0x00, 0x06, 0x01,
-  0x00, 0x07, 0x01, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x02,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB8, 0xBC, 0xED, 0xA7, 0x03, 0x97, 0xB0, 0x9A, 0xA7,
-  0x02, 0xA4, 0xD6, 0xAE, 0xDB, 0x02, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x05, 0x01, 0x00,
-  0x08, 0x00, 0x01, 0x00, 0x09, 0x01, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-  0xFF, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9C, 0xCD, 0x97, 0xA7, 0x02,
-  0xFD, 0xC1, 0xAC, 0xDB, 0x02, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x05, 0x01, 0x00, 0x0A,
-  0x01, 0x00, 0x0B, 0x01, 0x00, 0x0C, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x01, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0E, 0x08, 0x08, 0x1B, 0x1A, 0x1B, 0x41, 0x41, 0x0C, 0x11,
-  0x0C, 0x37, 0x3E, 0x00, 0x01, 0x00, 0x01, 0x06, 0x01, 0x03, 0x09, 0x03, 0x05, 0x05, 0x07, 0x07,
-  0x07, 0x41, 0x09, 0x06, 0x0A, 0x0B, 0x08, 0x8D, 0x01, 0x0D, 0x07, 0x10, 0x0F, 0x08, 0x71, 0x11,
-  0x05, 0x02, 0x13, 0x06, 0x04, 0x15, 0x06, 0x0B, 0x17, 0x07, 0x5E, 0x19, 0x05, 0x0D, 0x1B, 0x07,
-  0xBA, 0x01, 0x1D, 0x08, 0x1C, 0x1F, 0x06, 0x75, 0x21, 0x06, 0x06, 0x23, 0x06, 0x09, 0x27, 0x08,
-  0x4E, 0x29, 0x06, 0x12, 0x2B, 0x07, 0x91, 0x01, 0x2D, 0x08, 0x14, 0x2F, 0x07, 0x73, 0x33, 0x06,
-  0x05, 0x35, 0x07, 0x0C, 0x37, 0x08, 0x63, 0x3B, 0x07, 0xC0, 0x01, 0x3D, 0x08, 0x31, 0x3F, 0x07,
-  0x77, 0x43, 0x07, 0x08, 0x47, 0x08, 0x48, 0x4B, 0x08, 0x90, 0x01, 0x4D, 0x07, 0x13, 0x4F, 0x07,
-  0x72, 0x57, 0x07, 0x62, 0x5B, 0x07, 0xBD, 0x01, 0x5D, 0x07, 0x29, 0x67, 0x07, 0x57, 0x6B, 0x08,
-  0xA1, 0x01, 0x6D, 0x08, 0x18, 0x6F, 0x08, 0x76, 0x75, 0x07, 0x0F, 0x77, 0x07, 0x68, 0x7B, 0x07,
-  0xD1, 0x01, 0x7D, 0x08, 0x3F, 0x7F, 0x07, 0x79, 0x83, 0x01, 0x08, 0xB8, 0x01, 0x8B, 0x01, 0x08,
-  0x8F, 0x01, 0x8F, 0x01, 0x08, 0x74, 0x9D, 0x01, 0x08, 0x25, 0xA7, 0x01, 0x08, 0x59, 0xAD, 0x01,
-  0x08, 0x17, 0xB7, 0x01, 0x08, 0x6D, 0xBD, 0x01, 0x08, 0x3E, 0xC7, 0x01, 0x08, 0x4B, 0xCB, 0x01,
-  0x08, 0x96, 0x01, 0xEB, 0x01, 0x08, 0xB7, 0x01, 0xED, 0x01, 0x08, 0x19, 0xEF, 0x01, 0x08, 0x8A,
-  0x01, 0xFD, 0x01, 0x08, 0x40, 0x83, 0x02, 0x09, 0x0E, 0xA0, 0x02, 0xAF, 0x13, 0xE7, 0xEE, 0xAD,
-  0x1B, 0x51, 0x0F, 0x7D, 0x02, 0x8B, 0xBA, 0xDC, 0x17, 0x6C, 0x0C, 0xE8, 0x3F, 0xF4, 0x7A, 0x70,
-  0x54, 0x0E, 0x25, 0xE5, 0x6D, 0xFE, 0x26, 0xE1, 0xCF, 0xD5, 0xB1, 0x7A, 0xD1, 0x32, 0x1C, 0x8A,
-  0x5F, 0x54, 0xDA, 0xC4, 0x56, 0x9F, 0xFC, 0x54, 0x5C, 0x8A, 0x49, 0x94, 0x65, 0x55, 0x23, 0x49,
-  0x43, 0x2F, 0xE7, 0x51, 0xAE, 0x19, 0xFD, 0x9B, 0xCC, 0x95, 0xE7, 0x2C, 0xCB, 0xDF, 0xCF, 0x74,
-  0x1A, 0x01, 0x0C, 0x4D, 0x54, 0x52, 0x77, 0xB5, 0x8B, 0x51, 0xB3, 0x3C, 0x22, 0x31, 0x30, 0xD4,
-  0x5E, 0x8D, 0x41, 0x3D, 0x11, 0x88, 0x0D, 0xF3, 0x64, 0x9E, 0xFF, 0xD7, 0x70, 0x0F, 0x00, 0x80,
-  0x3D, 0x00, 0x00, 0x00, 0x80, 0x0E, 0xB0, 0x45, 0xA7, 0x9D, 0x65, 0x6B, 0x78, 0xC7, 0xC6, 0xBA,
-  0x2D, 0x46, 0x83, 0x76, 0x08, 0xAC, 0x14, 0x4B, 0x56, 0xA2, 0x09, 0x01, 0x00, 0x0D,
+    0x09, 0x00, 0x00, 0x1E, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x26, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x27, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x28, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9A, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x09, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x04, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x0D, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x8D, 0xB7, 0xF5, 0x71, 0xFC, 0x8C, 0xFC, 0xC0, 0x02, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00,
+    0x05, 0x01, 0x00, 0x03, 0x00, 0x01, 0x00, 0x04, 0x01, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xF3, 0xC2, 0xFB, 0xF9, 0x01, 0xE3, 0xB9, 0xBB, 0x8E,
+    0x01, 0xC3, 0xC5, 0xD2, 0xBB, 0x02, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x05, 0x01, 0x00, 0x05, 0x01, 0x00,
+    0x06, 0x01, 0x00, 0x07, 0x01, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x02, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB8, 0xBC, 0xED, 0xA7, 0x03, 0x97, 0xB0, 0x9A, 0xA7, 0x02, 0xA4, 0xD6, 0xAE,
+    0xDB, 0x02, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x05, 0x01, 0x00, 0x08, 0x00, 0x01, 0x00, 0x09, 0x01, 0x00,
+    0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x9C, 0xCD, 0x97, 0xA7, 0x02, 0xFD, 0xC1, 0xAC, 0xDB, 0x02, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x05,
+    0x01, 0x00, 0x0A, 0x01, 0x00, 0x0B, 0x01, 0x00, 0x0C, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x01, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x0E, 0x08, 0x08, 0x1B, 0x1A, 0x1B, 0x41, 0x41, 0x0C, 0x11, 0x0C, 0x37, 0x3E,
+    0x00, 0x01, 0x00, 0x01, 0x06, 0x01, 0x03, 0x09, 0x03, 0x05, 0x05, 0x07, 0x07, 0x07, 0x41, 0x09, 0x06, 0x0A, 0x0B,
+    0x08, 0x8D, 0x01, 0x0D, 0x07, 0x10, 0x0F, 0x08, 0x71, 0x11, 0x05, 0x02, 0x13, 0x06, 0x04, 0x15, 0x06, 0x0B, 0x17,
+    0x07, 0x5E, 0x19, 0x05, 0x0D, 0x1B, 0x07, 0xBA, 0x01, 0x1D, 0x08, 0x1C, 0x1F, 0x06, 0x75, 0x21, 0x06, 0x06, 0x23,
+    0x06, 0x09, 0x27, 0x08, 0x4E, 0x29, 0x06, 0x12, 0x2B, 0x07, 0x91, 0x01, 0x2D, 0x08, 0x14, 0x2F, 0x07, 0x73, 0x33,
+    0x06, 0x05, 0x35, 0x07, 0x0C, 0x37, 0x08, 0x63, 0x3B, 0x07, 0xC0, 0x01, 0x3D, 0x08, 0x31, 0x3F, 0x07, 0x77, 0x43,
+    0x07, 0x08, 0x47, 0x08, 0x48, 0x4B, 0x08, 0x90, 0x01, 0x4D, 0x07, 0x13, 0x4F, 0x07, 0x72, 0x57, 0x07, 0x62, 0x5B,
+    0x07, 0xBD, 0x01, 0x5D, 0x07, 0x29, 0x67, 0x07, 0x57, 0x6B, 0x08, 0xA1, 0x01, 0x6D, 0x08, 0x18, 0x6F, 0x08, 0x76,
+    0x75, 0x07, 0x0F, 0x77, 0x07, 0x68, 0x7B, 0x07, 0xD1, 0x01, 0x7D, 0x08, 0x3F, 0x7F, 0x07, 0x79, 0x83, 0x01, 0x08,
+    0xB8, 0x01, 0x8B, 0x01, 0x08, 0x8F, 0x01, 0x8F, 0x01, 0x08, 0x74, 0x9D, 0x01, 0x08, 0x25, 0xA7, 0x01, 0x08, 0x59,
+    0xAD, 0x01, 0x08, 0x17, 0xB7, 0x01, 0x08, 0x6D, 0xBD, 0x01, 0x08, 0x3E, 0xC7, 0x01, 0x08, 0x4B, 0xCB, 0x01, 0x08,
+    0x96, 0x01, 0xEB, 0x01, 0x08, 0xB7, 0x01, 0xED, 0x01, 0x08, 0x19, 0xEF, 0x01, 0x08, 0x8A, 0x01, 0xFD, 0x01, 0x08,
+    0x40, 0x83, 0x02, 0x09, 0x0E, 0xA0, 0x02, 0xAF, 0x13, 0xE7, 0xEE, 0xAD, 0x1B, 0x51, 0x0F, 0x7D, 0x02, 0x8B, 0xBA,
+    0xDC, 0x17, 0x6C, 0x0C, 0xE8, 0x3F, 0xF4, 0x7A, 0x70, 0x54, 0x0E, 0x25, 0xE5, 0x6D, 0xFE, 0x26, 0xE1, 0xCF, 0xD5,
+    0xB1, 0x7A, 0xD1, 0x32, 0x1C, 0x8A, 0x5F, 0x54, 0xDA, 0xC4, 0x56, 0x9F, 0xFC, 0x54, 0x5C, 0x8A, 0x49, 0x94, 0x65,
+    0x55, 0x23, 0x49, 0x43, 0x2F, 0xE7, 0x51, 0xAE, 0x19, 0xFD, 0x9B, 0xCC, 0x95, 0xE7, 0x2C, 0xCB, 0xDF, 0xCF, 0x74,
+    0x1A, 0x01, 0x0C, 0x4D, 0x54, 0x52, 0x77, 0xB5, 0x8B, 0x51, 0xB3, 0x3C, 0x22, 0x31, 0x30, 0xD4, 0x5E, 0x8D, 0x41,
+    0x3D, 0x11, 0x88, 0x0D, 0xF3, 0x64, 0x9E, 0xFF, 0xD7, 0x70, 0x0F, 0x00, 0x80, 0x3D, 0x00, 0x00, 0x00, 0x80, 0x0E,
+    0xB0, 0x45, 0xA7, 0x9D, 0x65, 0x6B, 0x78, 0xC7, 0xC6, 0xBA, 0x2D, 0x46, 0x83, 0x76, 0x08, 0xAC, 0x14, 0x4B, 0x56,
+    0xA2, 0x09, 0x01, 0x00, 0x0D,
 };
 
 std::vector<uint8_t> const kBinKmlV6 = {
-  0x06, 0x00, 0x13, 0x41, 0x41, 0x41, 0x41, 0x2D, 0x42, 0x42, 0x42, 0x42, 0x2D, 0x43, 0x43, 0x43,
-  0x43, 0x2D, 0x44, 0x44, 0x44, 0x44, 0x1E, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6F,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09,
-  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x53, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
-  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x8E, 0x85, 0xD7, 0xC7, 0x03, 0x37, 0x02, 0x00,
-  0x00, 0xE8, 0x07, 0x01, 0x03, 0x01, 0x02, 0x08, 0x09, 0x02, 0x00, 0x02, 0x08, 0x01, 0x02, 0x00,
-  0x03, 0x01, 0x04, 0x02, 0x00, 0x06, 0x08, 0x05, 0x01, 0x00, 0x07, 0x01, 0x00, 0x08, 0x01, 0x00,
-  0x09, 0x03, 0x00, 0x0A, 0x01, 0x0B, 0x02, 0x0C, 0x02, 0x00, 0x0D, 0x01, 0x0E, 0x04, 0x00, 0x0F,
-  0x01, 0x10, 0x02, 0x11, 0x03, 0x12, 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x02,
-  0xCE, 0x02, 0x00, 0x00, 0xCB, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F,
-  0xA0, 0x06, 0xB5, 0x9F, 0xA8, 0xC1, 0x02, 0x8C, 0xBE, 0xF0, 0xD0, 0x02, 0x01, 0x00, 0x00, 0x05,
-  0x02, 0x00, 0x14, 0x08, 0x13, 0x02, 0x00, 0x16, 0x08, 0x15, 0x02, 0x00, 0x17, 0x01, 0x18, 0x01,
-  0x00, 0x19, 0x04, 0x00, 0x1A, 0x01, 0x1B, 0x02, 0x1C, 0x03, 0x1D, 0x01, 0xFF, 0xFF, 0xFF, 0xFF,
-  0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x02, 0xBD, 0x94, 0xDC, 0x1E, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0xC8,
-  0xC2, 0xEB, 0x23, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x84, 0x07, 0x03, 0xEA, 0xBE, 0xD0, 0x82, 0x05,
-  0x98, 0xFC, 0xE0, 0xA1, 0x05, 0x85, 0xE5, 0xFE, 0x01, 0xAD, 0xC7, 0xD6, 0x01, 0xF1, 0x98, 0x0A,
-  0xE2, 0xC4, 0x80, 0x02, 0x00, 0x04, 0x02, 0x00, 0x1F, 0x08, 0x1E, 0x02, 0x00, 0x21, 0x08, 0x20,
-  0x03, 0x00, 0x22, 0x01, 0x23, 0x02, 0x24, 0x04, 0x00, 0x25, 0x01, 0x26, 0x02, 0x27, 0x03, 0x28,
-  0x47, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x0D, 0x0F, 0x0F, 0x21, 0x10, 0x19,
-  0x07, 0x05, 0x09, 0x03, 0x09, 0x05, 0x05, 0x09, 0x06, 0x09, 0x06, 0x1B, 0x0D, 0x2C, 0x19, 0x20,
-  0x11, 0x05, 0x0C, 0x06, 0x0C, 0x06, 0x19, 0x0A, 0x2C, 0x16, 0x05, 0x05, 0x05, 0x0C, 0x06, 0x0C,
-  0x06, 0xCE, 0x03, 0x4F, 0x00, 0x01, 0x00, 0x01, 0x04, 0x01, 0x03, 0x05, 0x02, 0x05, 0x07, 0x18,
-  0x07, 0x06, 0x05, 0x09, 0x06, 0x06, 0x0B, 0x07, 0x04, 0x0D, 0x09, 0x6C, 0x0F, 0x05, 0x08, 0x13,
-  0x05, 0x03, 0x15, 0x09, 0x2F, 0x17, 0x06, 0x10, 0x19, 0x07, 0x07, 0x1B, 0x06, 0x09, 0x1D, 0x08,
-  0x7C, 0x1F, 0x07, 0x12, 0x25, 0x09, 0x23, 0x27, 0x06, 0x0D, 0x29, 0x07, 0x0C, 0x2B, 0x06, 0x0A,
-  0x2D, 0x07, 0x78, 0x35, 0x09, 0x41, 0x37, 0x06, 0x14, 0x39, 0x09, 0xB5, 0x01, 0x3B, 0x07, 0x0E,
-  0x3D, 0x08, 0x8D, 0x01, 0x3F, 0x07, 0x1A, 0x45, 0x09, 0x1C, 0x4B, 0x07, 0x0B, 0x4D, 0x08, 0x74,
-  0x55, 0x08, 0x3E, 0x59, 0x09, 0xBF, 0x01, 0x5D, 0x08, 0x7E, 0x5F, 0x07, 0x16, 0x65, 0x08, 0x28,
-  0x69, 0x08, 0x0F, 0x6D, 0x08, 0x79, 0x75, 0x08, 0x44, 0x79, 0x08, 0xBB, 0x01, 0x7B, 0x09, 0x13,
-  0x7D, 0x09, 0x9B, 0x01, 0x7F, 0x07, 0x1B, 0x8D, 0x01, 0x09, 0x6E, 0x95, 0x01, 0x09, 0x3B, 0x9D,
-  0x01, 0x08, 0x7D, 0xA5, 0x01, 0x08, 0x26, 0xB5, 0x01, 0x08, 0x42, 0xB9, 0x01, 0x08, 0xB9, 0x01,
-  0xBD, 0x01, 0x09, 0x8F, 0x01, 0xC5, 0x01, 0x09, 0x21, 0xCD, 0x01, 0x09, 0x75, 0xD5, 0x01, 0x08,
-  0x40, 0xD9, 0x01, 0x08, 0xC1, 0x01, 0xDD, 0x01, 0x08, 0x7F, 0xE5, 0x01, 0x09, 0x29, 0xE9, 0x01,
-  0x08, 0xD1, 0x01, 0xED, 0x01, 0x08, 0x7B, 0xF5, 0x01, 0x09, 0x61, 0xF9, 0x01, 0x09, 0xBD, 0x01,
-  0xFB, 0x01, 0x08, 0x17, 0xFD, 0x01, 0x09, 0xAC, 0x01, 0x8D, 0x02, 0x09, 0x6D, 0x95, 0x02, 0x09,
-  0x39, 0xA5, 0x02, 0x09, 0x24, 0xB5, 0x02, 0x09, 0x43, 0xB9, 0x02, 0x09, 0xBA, 0x01, 0xC5, 0x02,
-  0x09, 0x20, 0xD9, 0x02, 0x09, 0xC0, 0x01, 0xFB, 0x02, 0x09, 0x15, 0xFD, 0x02, 0x09, 0xAA, 0x01,
-  0x8D, 0x03, 0x09, 0x6F, 0x95, 0x03, 0x09, 0x3F, 0xBD, 0x03, 0x09, 0x98, 0x01, 0xC5, 0x03, 0x09,
-  0x22, 0xCD, 0x03, 0x09, 0x8A, 0x01, 0xE5, 0x03, 0x09, 0x2A, 0xF5, 0x03, 0x09, 0x68, 0xF9, 0x03,
-  0x09, 0xBE, 0x01, 0xFD, 0x03, 0x09, 0xB4, 0x01, 0xC0, 0x04, 0x4D, 0xD0, 0x20, 0xA2, 0xAD, 0xFE,
-  0xD4, 0x2B, 0x87, 0x08, 0xE4, 0x46, 0xAB, 0x52, 0x6D, 0x52, 0x51, 0x53, 0xC3, 0x55, 0x55, 0x44,
-  0x48, 0x11, 0x4F, 0x15, 0x4C, 0xA6, 0x45, 0x65, 0x81, 0x6A, 0x09, 0xC2, 0x44, 0x8D, 0xDA, 0x9A,
-  0x75, 0xEB, 0xD5, 0xB8, 0x2E, 0xFF, 0xEE, 0xCA, 0xD9, 0xBF, 0xB0, 0x3F, 0xF2, 0x5A, 0x1D, 0xA2,
-  0x6D, 0xF8, 0x35, 0xEB, 0x02, 0xD5, 0xEA, 0xB5, 0x3F, 0x47, 0xA2, 0xF5, 0xFF, 0x76, 0x6F, 0x5E,
-  0xB4, 0x28, 0x70, 0x4E, 0xB6, 0x35, 0xD5, 0x0D, 0x66, 0x17, 0x28, 0x41, 0x23, 0x40, 0xA6, 0x50,
-  0xF2, 0x1E, 0xE7, 0x83, 0x14, 0x65, 0x71, 0xC6, 0x2E, 0xCD, 0x98, 0x67, 0xA6, 0x34, 0x40, 0xBB,
-  0xE7, 0x7E, 0x92, 0x38, 0x2C, 0xAD, 0x9D, 0x9F, 0xC3, 0xB6, 0x1B, 0x16, 0x30, 0x9D, 0xA0, 0x50,
-  0xAC, 0x73, 0xF5, 0x8B, 0x07, 0xEE, 0xE2, 0x1D, 0xFF, 0x10, 0x71, 0x7D, 0x77, 0x04, 0xC6, 0x97,
-  0x37, 0xEC, 0x01, 0xFB, 0x60, 0x0E, 0x83, 0x3B, 0x93, 0x9A, 0x80, 0x63, 0x01, 0x30, 0x87, 0x45,
-  0x92, 0x44, 0x88, 0xB7, 0x77, 0x79, 0x4A, 0xFB, 0x80, 0x1B, 0xAC, 0x07, 0xE5, 0xD9, 0xE6, 0x7F,
-  0x05, 0x99, 0x74, 0x00, 0x00, 0x00, 0x90, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x69, 0xCF, 0xCF, 0x18, 0x45, 0x35, 0x27, 0x72, 0xF5, 0x2E, 0x07, 0x4A, 0x43, 0x59,
-  0x10, 0x7A, 0x7A, 0x64, 0xE9, 0x07, 0xC2, 0x96, 0x95, 0xBC, 0x6C, 0x92, 0x3E, 0xCB, 0x2D, 0x8A,
-  0x8C, 0xC0, 0xB2, 0x02, 0x13, 0xE8, 0x9B, 0xBA, 0x48, 0xC8, 0x77, 0x91, 0x88, 0xC7, 0x06, 0x6C,
-  0xE1, 0x03, 0x64, 0xBC, 0xEC, 0x43, 0x02, 0x01, 0x00, 0x29,
+    0x06, 0x00, 0x13, 0x41, 0x41, 0x41, 0x41, 0x2D, 0x42, 0x42, 0x42, 0x42, 0x2D, 0x43, 0x43, 0x43, 0x43, 0x2D, 0x44,
+    0x44, 0x44, 0x44, 0x1E, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0xB4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x09, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x53, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x8E, 0x85, 0xD7, 0xC7,
+    0x03, 0x37, 0x02, 0x00, 0x00, 0xE8, 0x07, 0x01, 0x03, 0x01, 0x02, 0x08, 0x09, 0x02, 0x00, 0x02, 0x08, 0x01, 0x02,
+    0x00, 0x03, 0x01, 0x04, 0x02, 0x00, 0x06, 0x08, 0x05, 0x01, 0x00, 0x07, 0x01, 0x00, 0x08, 0x01, 0x00, 0x09, 0x03,
+    0x00, 0x0A, 0x01, 0x0B, 0x02, 0x0C, 0x02, 0x00, 0x0D, 0x01, 0x0E, 0x04, 0x00, 0x0F, 0x01, 0x10, 0x02, 0x11, 0x03,
+    0x12, 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x02, 0xCE, 0x02, 0x00, 0x00, 0xCB, 0x02, 0x00, 0x00,
+    0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA0, 0x06, 0xB5, 0x9F, 0xA8, 0xC1, 0x02, 0x8C, 0xBE, 0xF0, 0xD0,
+    0x02, 0x01, 0x00, 0x00, 0x05, 0x02, 0x00, 0x14, 0x08, 0x13, 0x02, 0x00, 0x16, 0x08, 0x15, 0x02, 0x00, 0x17, 0x01,
+    0x18, 0x01, 0x00, 0x19, 0x04, 0x00, 0x1A, 0x01, 0x1B, 0x02, 0x1C, 0x03, 0x1D, 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0x00, 0x02, 0xBD, 0x94, 0xDC, 0x1E, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0xC8, 0xC2, 0xEB, 0x23, 0x00,
+    0xFF, 0x00, 0xFF, 0x00, 0x84, 0x07, 0x03, 0xEA, 0xBE, 0xD0, 0x82, 0x05, 0x98, 0xFC, 0xE0, 0xA1, 0x05, 0x85, 0xE5,
+    0xFE, 0x01, 0xAD, 0xC7, 0xD6, 0x01, 0xF1, 0x98, 0x0A, 0xE2, 0xC4, 0x80, 0x02, 0x00, 0x04, 0x02, 0x00, 0x1F, 0x08,
+    0x1E, 0x02, 0x00, 0x21, 0x08, 0x20, 0x03, 0x00, 0x22, 0x01, 0x23, 0x02, 0x24, 0x04, 0x00, 0x25, 0x01, 0x26, 0x02,
+    0x27, 0x03, 0x28, 0x47, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x0D, 0x0F, 0x0F, 0x21, 0x10, 0x19,
+    0x07, 0x05, 0x09, 0x03, 0x09, 0x05, 0x05, 0x09, 0x06, 0x09, 0x06, 0x1B, 0x0D, 0x2C, 0x19, 0x20, 0x11, 0x05, 0x0C,
+    0x06, 0x0C, 0x06, 0x19, 0x0A, 0x2C, 0x16, 0x05, 0x05, 0x05, 0x0C, 0x06, 0x0C, 0x06, 0xCE, 0x03, 0x4F, 0x00, 0x01,
+    0x00, 0x01, 0x04, 0x01, 0x03, 0x05, 0x02, 0x05, 0x07, 0x18, 0x07, 0x06, 0x05, 0x09, 0x06, 0x06, 0x0B, 0x07, 0x04,
+    0x0D, 0x09, 0x6C, 0x0F, 0x05, 0x08, 0x13, 0x05, 0x03, 0x15, 0x09, 0x2F, 0x17, 0x06, 0x10, 0x19, 0x07, 0x07, 0x1B,
+    0x06, 0x09, 0x1D, 0x08, 0x7C, 0x1F, 0x07, 0x12, 0x25, 0x09, 0x23, 0x27, 0x06, 0x0D, 0x29, 0x07, 0x0C, 0x2B, 0x06,
+    0x0A, 0x2D, 0x07, 0x78, 0x35, 0x09, 0x41, 0x37, 0x06, 0x14, 0x39, 0x09, 0xB5, 0x01, 0x3B, 0x07, 0x0E, 0x3D, 0x08,
+    0x8D, 0x01, 0x3F, 0x07, 0x1A, 0x45, 0x09, 0x1C, 0x4B, 0x07, 0x0B, 0x4D, 0x08, 0x74, 0x55, 0x08, 0x3E, 0x59, 0x09,
+    0xBF, 0x01, 0x5D, 0x08, 0x7E, 0x5F, 0x07, 0x16, 0x65, 0x08, 0x28, 0x69, 0x08, 0x0F, 0x6D, 0x08, 0x79, 0x75, 0x08,
+    0x44, 0x79, 0x08, 0xBB, 0x01, 0x7B, 0x09, 0x13, 0x7D, 0x09, 0x9B, 0x01, 0x7F, 0x07, 0x1B, 0x8D, 0x01, 0x09, 0x6E,
+    0x95, 0x01, 0x09, 0x3B, 0x9D, 0x01, 0x08, 0x7D, 0xA5, 0x01, 0x08, 0x26, 0xB5, 0x01, 0x08, 0x42, 0xB9, 0x01, 0x08,
+    0xB9, 0x01, 0xBD, 0x01, 0x09, 0x8F, 0x01, 0xC5, 0x01, 0x09, 0x21, 0xCD, 0x01, 0x09, 0x75, 0xD5, 0x01, 0x08, 0x40,
+    0xD9, 0x01, 0x08, 0xC1, 0x01, 0xDD, 0x01, 0x08, 0x7F, 0xE5, 0x01, 0x09, 0x29, 0xE9, 0x01, 0x08, 0xD1, 0x01, 0xED,
+    0x01, 0x08, 0x7B, 0xF5, 0x01, 0x09, 0x61, 0xF9, 0x01, 0x09, 0xBD, 0x01, 0xFB, 0x01, 0x08, 0x17, 0xFD, 0x01, 0x09,
+    0xAC, 0x01, 0x8D, 0x02, 0x09, 0x6D, 0x95, 0x02, 0x09, 0x39, 0xA5, 0x02, 0x09, 0x24, 0xB5, 0x02, 0x09, 0x43, 0xB9,
+    0x02, 0x09, 0xBA, 0x01, 0xC5, 0x02, 0x09, 0x20, 0xD9, 0x02, 0x09, 0xC0, 0x01, 0xFB, 0x02, 0x09, 0x15, 0xFD, 0x02,
+    0x09, 0xAA, 0x01, 0x8D, 0x03, 0x09, 0x6F, 0x95, 0x03, 0x09, 0x3F, 0xBD, 0x03, 0x09, 0x98, 0x01, 0xC5, 0x03, 0x09,
+    0x22, 0xCD, 0x03, 0x09, 0x8A, 0x01, 0xE5, 0x03, 0x09, 0x2A, 0xF5, 0x03, 0x09, 0x68, 0xF9, 0x03, 0x09, 0xBE, 0x01,
+    0xFD, 0x03, 0x09, 0xB4, 0x01, 0xC0, 0x04, 0x4D, 0xD0, 0x20, 0xA2, 0xAD, 0xFE, 0xD4, 0x2B, 0x87, 0x08, 0xE4, 0x46,
+    0xAB, 0x52, 0x6D, 0x52, 0x51, 0x53, 0xC3, 0x55, 0x55, 0x44, 0x48, 0x11, 0x4F, 0x15, 0x4C, 0xA6, 0x45, 0x65, 0x81,
+    0x6A, 0x09, 0xC2, 0x44, 0x8D, 0xDA, 0x9A, 0x75, 0xEB, 0xD5, 0xB8, 0x2E, 0xFF, 0xEE, 0xCA, 0xD9, 0xBF, 0xB0, 0x3F,
+    0xF2, 0x5A, 0x1D, 0xA2, 0x6D, 0xF8, 0x35, 0xEB, 0x02, 0xD5, 0xEA, 0xB5, 0x3F, 0x47, 0xA2, 0xF5, 0xFF, 0x76, 0x6F,
+    0x5E, 0xB4, 0x28, 0x70, 0x4E, 0xB6, 0x35, 0xD5, 0x0D, 0x66, 0x17, 0x28, 0x41, 0x23, 0x40, 0xA6, 0x50, 0xF2, 0x1E,
+    0xE7, 0x83, 0x14, 0x65, 0x71, 0xC6, 0x2E, 0xCD, 0x98, 0x67, 0xA6, 0x34, 0x40, 0xBB, 0xE7, 0x7E, 0x92, 0x38, 0x2C,
+    0xAD, 0x9D, 0x9F, 0xC3, 0xB6, 0x1B, 0x16, 0x30, 0x9D, 0xA0, 0x50, 0xAC, 0x73, 0xF5, 0x8B, 0x07, 0xEE, 0xE2, 0x1D,
+    0xFF, 0x10, 0x71, 0x7D, 0x77, 0x04, 0xC6, 0x97, 0x37, 0xEC, 0x01, 0xFB, 0x60, 0x0E, 0x83, 0x3B, 0x93, 0x9A, 0x80,
+    0x63, 0x01, 0x30, 0x87, 0x45, 0x92, 0x44, 0x88, 0xB7, 0x77, 0x79, 0x4A, 0xFB, 0x80, 0x1B, 0xAC, 0x07, 0xE5, 0xD9,
+    0xE6, 0x7F, 0x05, 0x99, 0x74, 0x00, 0x00, 0x00, 0x90, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x69, 0xCF, 0xCF, 0x18, 0x45, 0x35, 0x27, 0x72, 0xF5, 0x2E, 0x07, 0x4A, 0x43, 0x59, 0x10, 0x7A, 0x7A, 0x64,
+    0xE9, 0x07, 0xC2, 0x96, 0x95, 0xBC, 0x6C, 0x92, 0x3E, 0xCB, 0x2D, 0x8A, 0x8C, 0xC0, 0xB2, 0x02, 0x13, 0xE8, 0x9B,
+    0xBA, 0x48, 0xC8, 0x77, 0x91, 0x88, 0xC7, 0x06, 0x6C, 0xE1, 0x03, 0x64, 0xBC, 0xEC, 0x43, 0x02, 0x01, 0x00, 0x29,
 };
 
 std::vector<uint8_t> const kBinKmlV7 = {
-  0x07, 0x00, 0x13, 0x41, 0x41, 0x41, 0x41, 0x2D, 0x42, 0x42, 0x42, 0x42, 0x2D, 0x43, 0x43, 0x43,
-  0x43, 0x2D, 0x44, 0x44, 0x44, 0x44, 0x1E, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6F,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C,
-  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x56, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF,
-  0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x8E, 0x85, 0xD7, 0xC7, 0x03, 0x37, 0x02, 0x00,
-  0x00, 0xE8, 0x07, 0x01, 0x03, 0x01, 0x02, 0x08, 0x09, 0x02, 0x00, 0x02, 0x08, 0x01, 0x02, 0x00,
-  0x03, 0x01, 0x04, 0x02, 0x00, 0x06, 0x08, 0x05, 0x01, 0x00, 0x07, 0x01, 0x00, 0x08, 0x01, 0x00,
-  0x09, 0x03, 0x00, 0x0A, 0x01, 0x0B, 0x02, 0x0C, 0x02, 0x00, 0x0D, 0x01, 0x0E, 0x04, 0x00, 0x0F,
-  0x01, 0x10, 0x02, 0x11, 0x03, 0x12, 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x02,
-  0xCE, 0x02, 0x00, 0x00, 0xCB, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F,
-  0xA0, 0x06, 0xB5, 0x9F, 0xA8, 0xC1, 0x02, 0x8C, 0xBE, 0xF0, 0xD0, 0x02, 0x01, 0x00, 0x00, 0x05,
-  0x02, 0x00, 0x14, 0x08, 0x13, 0x02, 0x00, 0x16, 0x08, 0x15, 0x02, 0x00, 0x17, 0x01, 0x18, 0x01,
-  0x00, 0x19, 0x04, 0x00, 0x1A, 0x01, 0x1B, 0x02, 0x1C, 0x03, 0x1D, 0x01, 0xFF, 0xFF, 0xFF, 0xFF,
-  0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x02, 0xBD, 0x94, 0xDC, 0x1E, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0xC8,
-  0xC2, 0xEB, 0x23, 0x00, 0xFF, 0x00, 0xFF, 0x00, 0x84, 0x07, 0x03, 0xEA, 0xBE, 0xD0, 0x82, 0x05,
-  0x98, 0xFC, 0xE0, 0xA1, 0x05, 0x85, 0xE5, 0xFE, 0x01, 0xAD, 0xC7, 0xD6, 0x01, 0xF1, 0x98, 0x0A,
-  0xE2, 0xC4, 0x80, 0x02, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x00, 0x1F, 0x08, 0x1E, 0x02, 0x00,
-  0x21, 0x08, 0x20, 0x03, 0x00, 0x22, 0x01, 0x23, 0x02, 0x24, 0x04, 0x00, 0x25, 0x01, 0x26, 0x02,
-  0x27, 0x03, 0x28, 0x47, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x0D, 0x0F, 0x0F,
-  0x21, 0x10, 0x19, 0x07, 0x05, 0x09, 0x03, 0x09, 0x05, 0x05, 0x09, 0x06, 0x09, 0x06, 0x1B, 0x0D,
-  0x2C, 0x19, 0x20, 0x11, 0x05, 0x0C, 0x06, 0x0C, 0x06, 0x19, 0x0A, 0x2C, 0x16, 0x05, 0x05, 0x05,
-  0x0C, 0x06, 0x0C, 0x06, 0xCE, 0x03, 0x4F, 0x00, 0x01, 0x00, 0x01, 0x04, 0x01, 0x03, 0x05, 0x02,
-  0x05, 0x07, 0x18, 0x07, 0x06, 0x05, 0x09, 0x06, 0x06, 0x0B, 0x07, 0x04, 0x0D, 0x09, 0x6C, 0x0F,
-  0x05, 0x08, 0x13, 0x05, 0x03, 0x15, 0x09, 0x2F, 0x17, 0x06, 0x10, 0x19, 0x07, 0x07, 0x1B, 0x06,
-  0x09, 0x1D, 0x08, 0x7C, 0x1F, 0x07, 0x12, 0x25, 0x09, 0x23, 0x27, 0x06, 0x0D, 0x29, 0x07, 0x0C,
-  0x2B, 0x06, 0x0A, 0x2D, 0x07, 0x78, 0x35, 0x09, 0x41, 0x37, 0x06, 0x14, 0x39, 0x09, 0xB5, 0x01,
-  0x3B, 0x07, 0x0E, 0x3D, 0x08, 0x8D, 0x01, 0x3F, 0x07, 0x1A, 0x45, 0x09, 0x1C, 0x4B, 0x07, 0x0B,
-  0x4D, 0x08, 0x74, 0x55, 0x08, 0x3E, 0x59, 0x09, 0xBF, 0x01, 0x5D, 0x08, 0x7E, 0x5F, 0x07, 0x16,
-  0x65, 0x08, 0x28, 0x69, 0x08, 0x0F, 0x6D, 0x08, 0x79, 0x75, 0x08, 0x44, 0x79, 0x08, 0xBB, 0x01,
-  0x7B, 0x09, 0x13, 0x7D, 0x09, 0x9B, 0x01, 0x7F, 0x07, 0x1B, 0x8D, 0x01, 0x09, 0x6E, 0x95, 0x01,
-  0x09, 0x3B, 0x9D, 0x01, 0x08, 0x7D, 0xA5, 0x01, 0x08, 0x26, 0xB5, 0x01, 0x08, 0x42, 0xB9, 0x01,
-  0x08, 0xB9, 0x01, 0xBD, 0x01, 0x09, 0x8F, 0x01, 0xC5, 0x01, 0x09, 0x21, 0xCD, 0x01, 0x09, 0x75,
-  0xD5, 0x01, 0x08, 0x40, 0xD9, 0x01, 0x08, 0xC1, 0x01, 0xDD, 0x01, 0x08, 0x7F, 0xE5, 0x01, 0x09,
-  0x29, 0xE9, 0x01, 0x08, 0xD1, 0x01, 0xED, 0x01, 0x08, 0x7B, 0xF5, 0x01, 0x09, 0x61, 0xF9, 0x01,
-  0x09, 0xBD, 0x01, 0xFB, 0x01, 0x08, 0x17, 0xFD, 0x01, 0x09, 0xAC, 0x01, 0x8D, 0x02, 0x09, 0x6D,
-  0x95, 0x02, 0x09, 0x39, 0xA5, 0x02, 0x09, 0x24, 0xB5, 0x02, 0x09, 0x43, 0xB9, 0x02, 0x09, 0xBA,
-  0x01, 0xC5, 0x02, 0x09, 0x20, 0xD9, 0x02, 0x09, 0xC0, 0x01, 0xFB, 0x02, 0x09, 0x15, 0xFD, 0x02,
-  0x09, 0xAA, 0x01, 0x8D, 0x03, 0x09, 0x6F, 0x95, 0x03, 0x09, 0x3F, 0xBD, 0x03, 0x09, 0x98, 0x01,
-  0xC5, 0x03, 0x09, 0x22, 0xCD, 0x03, 0x09, 0x8A, 0x01, 0xE5, 0x03, 0x09, 0x2A, 0xF5, 0x03, 0x09,
-  0x68, 0xF9, 0x03, 0x09, 0xBE, 0x01, 0xFD, 0x03, 0x09, 0xB4, 0x01, 0xC0, 0x04, 0x4D, 0xD0, 0x20,
-  0xA2, 0xAD, 0xFE, 0xD4, 0x2B, 0x87, 0x08, 0xE4, 0x46, 0xAB, 0x52, 0x6D, 0x52, 0x51, 0x53, 0xC3,
-  0x55, 0x55, 0x44, 0x48, 0x11, 0x4F, 0x15, 0x4C, 0xA6, 0x45, 0x65, 0x81, 0x6A, 0x09, 0xC2, 0x44,
-  0x8D, 0xDA, 0x9A, 0x75, 0xEB, 0xD5, 0xB8, 0x2E, 0xFF, 0xEE, 0xCA, 0xD9, 0xBF, 0xB0, 0x3F, 0xF2,
-  0x5A, 0x1D, 0xA2, 0x6D, 0xF8, 0x35, 0xEB, 0x02, 0xD5, 0xEA, 0xB5, 0x3F, 0x47, 0xA2, 0xF5, 0xFF,
-  0x76, 0x6F, 0x5E, 0xB4, 0x28, 0x70, 0x4E, 0xB6, 0x35, 0xD5, 0x0D, 0x66, 0x17, 0x28, 0x41, 0x23,
-  0x40, 0xA6, 0x50, 0xF2, 0x1E, 0xE7, 0x83, 0x14, 0x65, 0x71, 0xC6, 0x2E, 0xCD, 0x98, 0x67, 0xA6,
-  0x34, 0x40, 0xBB, 0xE7, 0x7E, 0x92, 0x38, 0x2C, 0xAD, 0x9D, 0x9F, 0xC3, 0xB6, 0x1B, 0x16, 0x30,
-  0x9D, 0xA0, 0x50, 0xAC, 0x73, 0xF5, 0x8B, 0x07, 0xEE, 0xE2, 0x1D, 0xFF, 0x10, 0x71, 0x7D, 0x77,
-  0x04, 0xC6, 0x97, 0x37, 0xEC, 0x01, 0xFB, 0x60, 0x0E, 0x83, 0x3B, 0x93, 0x9A, 0x80, 0x63, 0x01,
-  0x30, 0x87, 0x45, 0x92, 0x44, 0x88, 0xB7, 0x77, 0x79, 0x4A, 0xFB, 0x80, 0x1B, 0xAC, 0x07, 0xE5,
-  0xD9, 0xE6, 0x7F, 0x05, 0x99, 0x74, 0x00, 0x00, 0x00, 0x90, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x69, 0xCF, 0xCF, 0x18, 0x45, 0x35, 0x27, 0x72, 0xF5, 0x2E, 0x07,
-  0x4A, 0x43, 0x59, 0x10, 0x7A, 0x7A, 0x64, 0xE9, 0x07, 0xC2, 0x96, 0x95, 0xBC, 0x6C, 0x92, 0x3E,
-  0xCB, 0x2D, 0x8A, 0x8C, 0xC0, 0xB2, 0x02, 0x13, 0xE8, 0x9B, 0xBA, 0x48, 0xC8, 0x77, 0x91, 0x88,
-  0xC7, 0x06, 0x6C, 0xE1, 0x03, 0x64, 0xBC, 0xEC, 0x43, 0x02, 0x01, 0x00, 0x29,
+    0x07, 0x00, 0x13, 0x41, 0x41, 0x41, 0x41, 0x2D, 0x42, 0x42, 0x42, 0x42, 0x2D, 0x43, 0x43, 0x43, 0x43, 0x2D, 0x44,
+    0x44, 0x44, 0x44, 0x1E, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x6F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0xB4, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x56, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x01, 0x8E, 0x85, 0xD7, 0xC7,
+    0x03, 0x37, 0x02, 0x00, 0x00, 0xE8, 0x07, 0x01, 0x03, 0x01, 0x02, 0x08, 0x09, 0x02, 0x00, 0x02, 0x08, 0x01, 0x02,
+    0x00, 0x03, 0x01, 0x04, 0x02, 0x00, 0x06, 0x08, 0x05, 0x01, 0x00, 0x07, 0x01, 0x00, 0x08, 0x01, 0x00, 0x09, 0x03,
+    0x00, 0x0A, 0x01, 0x0B, 0x02, 0x0C, 0x02, 0x00, 0x0D, 0x01, 0x0E, 0x04, 0x00, 0x0F, 0x01, 0x10, 0x02, 0x11, 0x03,
+    0x12, 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x02, 0xCE, 0x02, 0x00, 0x00, 0xCB, 0x02, 0x00, 0x00,
+    0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xA0, 0x06, 0xB5, 0x9F, 0xA8, 0xC1, 0x02, 0x8C, 0xBE, 0xF0, 0xD0,
+    0x02, 0x01, 0x00, 0x00, 0x05, 0x02, 0x00, 0x14, 0x08, 0x13, 0x02, 0x00, 0x16, 0x08, 0x15, 0x02, 0x00, 0x17, 0x01,
+    0x18, 0x01, 0x00, 0x19, 0x04, 0x00, 0x1A, 0x01, 0x1B, 0x02, 0x1C, 0x03, 0x1D, 0x01, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+    0xFF, 0xFF, 0xFF, 0x00, 0x02, 0xBD, 0x94, 0xDC, 0x1E, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0xC8, 0xC2, 0xEB, 0x23, 0x00,
+    0xFF, 0x00, 0xFF, 0x00, 0x84, 0x07, 0x03, 0xEA, 0xBE, 0xD0, 0x82, 0x05, 0x98, 0xFC, 0xE0, 0xA1, 0x05, 0x85, 0xE5,
+    0xFE, 0x01, 0xAD, 0xC7, 0xD6, 0x01, 0xF1, 0x98, 0x0A, 0xE2, 0xC4, 0x80, 0x02, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02,
+    0x00, 0x1F, 0x08, 0x1E, 0x02, 0x00, 0x21, 0x08, 0x20, 0x03, 0x00, 0x22, 0x01, 0x23, 0x02, 0x24, 0x04, 0x00, 0x25,
+    0x01, 0x26, 0x02, 0x27, 0x03, 0x28, 0x47, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x0D, 0x0F, 0x0F,
+    0x21, 0x10, 0x19, 0x07, 0x05, 0x09, 0x03, 0x09, 0x05, 0x05, 0x09, 0x06, 0x09, 0x06, 0x1B, 0x0D, 0x2C, 0x19, 0x20,
+    0x11, 0x05, 0x0C, 0x06, 0x0C, 0x06, 0x19, 0x0A, 0x2C, 0x16, 0x05, 0x05, 0x05, 0x0C, 0x06, 0x0C, 0x06, 0xCE, 0x03,
+    0x4F, 0x00, 0x01, 0x00, 0x01, 0x04, 0x01, 0x03, 0x05, 0x02, 0x05, 0x07, 0x18, 0x07, 0x06, 0x05, 0x09, 0x06, 0x06,
+    0x0B, 0x07, 0x04, 0x0D, 0x09, 0x6C, 0x0F, 0x05, 0x08, 0x13, 0x05, 0x03, 0x15, 0x09, 0x2F, 0x17, 0x06, 0x10, 0x19,
+    0x07, 0x07, 0x1B, 0x06, 0x09, 0x1D, 0x08, 0x7C, 0x1F, 0x07, 0x12, 0x25, 0x09, 0x23, 0x27, 0x06, 0x0D, 0x29, 0x07,
+    0x0C, 0x2B, 0x06, 0x0A, 0x2D, 0x07, 0x78, 0x35, 0x09, 0x41, 0x37, 0x06, 0x14, 0x39, 0x09, 0xB5, 0x01, 0x3B, 0x07,
+    0x0E, 0x3D, 0x08, 0x8D, 0x01, 0x3F, 0x07, 0x1A, 0x45, 0x09, 0x1C, 0x4B, 0x07, 0x0B, 0x4D, 0x08, 0x74, 0x55, 0x08,
+    0x3E, 0x59, 0x09, 0xBF, 0x01, 0x5D, 0x08, 0x7E, 0x5F, 0x07, 0x16, 0x65, 0x08, 0x28, 0x69, 0x08, 0x0F, 0x6D, 0x08,
+    0x79, 0x75, 0x08, 0x44, 0x79, 0x08, 0xBB, 0x01, 0x7B, 0x09, 0x13, 0x7D, 0x09, 0x9B, 0x01, 0x7F, 0x07, 0x1B, 0x8D,
+    0x01, 0x09, 0x6E, 0x95, 0x01, 0x09, 0x3B, 0x9D, 0x01, 0x08, 0x7D, 0xA5, 0x01, 0x08, 0x26, 0xB5, 0x01, 0x08, 0x42,
+    0xB9, 0x01, 0x08, 0xB9, 0x01, 0xBD, 0x01, 0x09, 0x8F, 0x01, 0xC5, 0x01, 0x09, 0x21, 0xCD, 0x01, 0x09, 0x75, 0xD5,
+    0x01, 0x08, 0x40, 0xD9, 0x01, 0x08, 0xC1, 0x01, 0xDD, 0x01, 0x08, 0x7F, 0xE5, 0x01, 0x09, 0x29, 0xE9, 0x01, 0x08,
+    0xD1, 0x01, 0xED, 0x01, 0x08, 0x7B, 0xF5, 0x01, 0x09, 0x61, 0xF9, 0x01, 0x09, 0xBD, 0x01, 0xFB, 0x01, 0x08, 0x17,
+    0xFD, 0x01, 0x09, 0xAC, 0x01, 0x8D, 0x02, 0x09, 0x6D, 0x95, 0x02, 0x09, 0x39, 0xA5, 0x02, 0x09, 0x24, 0xB5, 0x02,
+    0x09, 0x43, 0xB9, 0x02, 0x09, 0xBA, 0x01, 0xC5, 0x02, 0x09, 0x20, 0xD9, 0x02, 0x09, 0xC0, 0x01, 0xFB, 0x02, 0x09,
+    0x15, 0xFD, 0x02, 0x09, 0xAA, 0x01, 0x8D, 0x03, 0x09, 0x6F, 0x95, 0x03, 0x09, 0x3F, 0xBD, 0x03, 0x09, 0x98, 0x01,
+    0xC5, 0x03, 0x09, 0x22, 0xCD, 0x03, 0x09, 0x8A, 0x01, 0xE5, 0x03, 0x09, 0x2A, 0xF5, 0x03, 0x09, 0x68, 0xF9, 0x03,
+    0x09, 0xBE, 0x01, 0xFD, 0x03, 0x09, 0xB4, 0x01, 0xC0, 0x04, 0x4D, 0xD0, 0x20, 0xA2, 0xAD, 0xFE, 0xD4, 0x2B, 0x87,
+    0x08, 0xE4, 0x46, 0xAB, 0x52, 0x6D, 0x52, 0x51, 0x53, 0xC3, 0x55, 0x55, 0x44, 0x48, 0x11, 0x4F, 0x15, 0x4C, 0xA6,
+    0x45, 0x65, 0x81, 0x6A, 0x09, 0xC2, 0x44, 0x8D, 0xDA, 0x9A, 0x75, 0xEB, 0xD5, 0xB8, 0x2E, 0xFF, 0xEE, 0xCA, 0xD9,
+    0xBF, 0xB0, 0x3F, 0xF2, 0x5A, 0x1D, 0xA2, 0x6D, 0xF8, 0x35, 0xEB, 0x02, 0xD5, 0xEA, 0xB5, 0x3F, 0x47, 0xA2, 0xF5,
+    0xFF, 0x76, 0x6F, 0x5E, 0xB4, 0x28, 0x70, 0x4E, 0xB6, 0x35, 0xD5, 0x0D, 0x66, 0x17, 0x28, 0x41, 0x23, 0x40, 0xA6,
+    0x50, 0xF2, 0x1E, 0xE7, 0x83, 0x14, 0x65, 0x71, 0xC6, 0x2E, 0xCD, 0x98, 0x67, 0xA6, 0x34, 0x40, 0xBB, 0xE7, 0x7E,
+    0x92, 0x38, 0x2C, 0xAD, 0x9D, 0x9F, 0xC3, 0xB6, 0x1B, 0x16, 0x30, 0x9D, 0xA0, 0x50, 0xAC, 0x73, 0xF5, 0x8B, 0x07,
+    0xEE, 0xE2, 0x1D, 0xFF, 0x10, 0x71, 0x7D, 0x77, 0x04, 0xC6, 0x97, 0x37, 0xEC, 0x01, 0xFB, 0x60, 0x0E, 0x83, 0x3B,
+    0x93, 0x9A, 0x80, 0x63, 0x01, 0x30, 0x87, 0x45, 0x92, 0x44, 0x88, 0xB7, 0x77, 0x79, 0x4A, 0xFB, 0x80, 0x1B, 0xAC,
+    0x07, 0xE5, 0xD9, 0xE6, 0x7F, 0x05, 0x99, 0x74, 0x00, 0x00, 0x00, 0x90, 0x0E, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x69, 0xCF, 0xCF, 0x18, 0x45, 0x35, 0x27, 0x72, 0xF5, 0x2E, 0x07, 0x4A, 0x43, 0x59, 0x10,
+    0x7A, 0x7A, 0x64, 0xE9, 0x07, 0xC2, 0x96, 0x95, 0xBC, 0x6C, 0x92, 0x3E, 0xCB, 0x2D, 0x8A, 0x8C, 0xC0, 0xB2, 0x02,
+    0x13, 0xE8, 0x9B, 0xBA, 0x48, 0xC8, 0x77, 0x91, 0x88, 0xC7, 0x06, 0x6C, 0xE1, 0x03, 0x64, 0xBC, 0xEC, 0x43, 0x02,
+    0x01, 0x00, 0x29,
 };
 
 // kBinKmlV8 contains the same bookmarks and tracks as kBinKmlV7
 std::vector<uint8_t> const kBinKmlV8 = {
-  0x08, 0x00, 0x13, 0x41, 0x41, 0x41, 0x41, 0x2d, 0x42, 0x42, 0x42, 0x42, 0x2d, 0x43, 0x43, 0x43,
-  0x43, 0x2d, 0x44, 0x44, 0x44, 0x44, 0x1e, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e,
-  0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5f,
-  0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x01, 0x8e, 0x85, 0xd7, 0xc7, 0x03, 0x37, 0x02,
-  0x00, 0x00, 0xe8, 0x07, 0x01, 0x03, 0x01, 0x02, 0x08, 0x09, 0x02, 0x00, 0x02, 0x08, 0x01, 0x02,
-  0x00, 0x04, 0x01, 0x03, 0x02, 0x00, 0x06, 0x08, 0x05, 0x01, 0x00, 0x07, 0x01, 0x00, 0x08, 0x01,
-  0x00, 0x09, 0x03, 0x00, 0x0a, 0x01, 0x0b, 0x02, 0x0c, 0x02, 0x00, 0x0d, 0x01, 0x0e, 0x04, 0x00,
-  0x0f, 0x01, 0x10, 0x02, 0x11, 0x03, 0x12, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-  0x02, 0xce, 0x02, 0x00, 0x00, 0xcb, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x0f, 0xa0, 0x06, 0xb5, 0x9f, 0xa8, 0xc1, 0x02, 0x8c, 0xbe, 0xf0, 0xd0, 0x02, 0x01, 0x00, 0x00,
-  0x00, 0x05, 0x02, 0x00, 0x14, 0x08, 0x13, 0x02, 0x00, 0x16, 0x08, 0x15, 0x02, 0x00, 0x18, 0x01,
-  0x17, 0x01, 0x00, 0x19, 0x04, 0x00, 0x1a, 0x01, 0x1b, 0x02, 0x1c, 0x03, 0x1d, 0x01, 0xff, 0xff,
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x02, 0xbd, 0x94, 0xdc, 0x1e, 0x00, 0xff, 0x00, 0x00,
-  0xff, 0xc8, 0xc2, 0xeb, 0x23, 0x00, 0xff, 0x00, 0xff, 0x00, 0x84, 0x07, 0x03, 0xea, 0xbe, 0xd0,
-  0x82, 0x05, 0x98, 0xfc, 0xe0, 0xa1, 0x05, 0x85, 0xe5, 0xfe, 0x01, 0xad, 0xc7, 0xd6, 0x01, 0xf1,
-  0x98, 0x0a, 0xe2, 0xc4, 0x80, 0x02, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x00, 0x1f, 0x08, 0x1e,
-  0x02, 0x00, 0x21, 0x08, 0x20, 0x03, 0x00, 0x22, 0x01, 0x23, 0x02, 0x24, 0x04, 0x00, 0x25, 0x01,
-  0x26, 0x02, 0x27, 0x03, 0x28, 0x00, 0x3d, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23,
-  0x0d, 0x0f, 0x0f, 0x21, 0x10, 0x19, 0x07, 0x05, 0x09, 0x03, 0x09, 0x05, 0x05, 0x09, 0x06, 0x09,
-  0x06, 0x1b, 0x0d, 0x2c, 0x19, 0x11, 0x20, 0x05, 0x0c, 0x06, 0x0c, 0x06, 0x19, 0x0a, 0x2c, 0x16,
-  0x05, 0x05, 0x05, 0x0c, 0x06, 0x0c, 0x06, 0xce, 0x03, 0x4d, 0x00, 0x01, 0x00, 0x01, 0x04, 0x01,
-  0x03, 0x05, 0x02, 0x05, 0x09, 0x21, 0x07, 0x05, 0x03, 0x09, 0x06, 0x06, 0x0b, 0x07, 0x04, 0x0d,
-  0x07, 0x78, 0x0f, 0x06, 0x05, 0x13, 0x07, 0x11, 0x15, 0x09, 0x41, 0x17, 0x07, 0x0f, 0x19, 0x06,
-  0x09, 0x1b, 0x07, 0x10, 0x1d, 0x09, 0x8a, 0x01, 0x1f, 0x05, 0x08, 0x25, 0x08, 0x2f, 0x29, 0x07,
-  0x07, 0x2b, 0x07, 0x0c, 0x2d, 0x08, 0x7c, 0x2f, 0x06, 0x0d, 0x33, 0x09, 0x13, 0x35, 0x09, 0x68,
-  0x37, 0x06, 0x14, 0x39, 0x07, 0x0a, 0x3b, 0x07, 0x1a, 0x3d, 0x09, 0xb4, 0x01, 0x45, 0x08, 0x26,
-  0x4b, 0x07, 0x18, 0x4d, 0x08, 0x79, 0x53, 0x07, 0x12, 0x55, 0x09, 0x44, 0x57, 0x07, 0xd1, 0x01,
-  0x5b, 0x08, 0x15, 0x5d, 0x09, 0x98, 0x01, 0x65, 0x08, 0x3f, 0x69, 0x09, 0xbe, 0x01, 0x6b, 0x07,
-  0x0e, 0x6d, 0x08, 0x7e, 0x73, 0x07, 0x17, 0x75, 0x09, 0x70, 0x79, 0x07, 0x0b, 0x7b, 0x08, 0x1b,
-  0x7d, 0x09, 0xba, 0x01, 0x85, 0x01, 0x08, 0x23, 0x95, 0x01, 0x08, 0x42, 0x9d, 0x01, 0x08, 0x8d,
-  0x01, 0xa5, 0x01, 0x09, 0x39, 0xad, 0x01, 0x08, 0x7d, 0xb3, 0x01, 0x08, 0xc0, 0x01, 0xb5, 0x01,
-  0x09, 0x6d, 0xbd, 0x01, 0x08, 0xb9, 0x01, 0xc5, 0x01, 0x08, 0x28, 0xcd, 0x01, 0x08, 0x7b, 0xd5,
-  0x01, 0x08, 0x45, 0xdb, 0x01, 0x08, 0x16, 0xdd, 0x01, 0x09, 0xaa, 0x01, 0xe5, 0x01, 0x08, 0x40,
-  0xe9, 0x01, 0x08, 0xc1, 0x01, 0xed, 0x01, 0x08, 0x7f, 0xf5, 0x01, 0x08, 0x74, 0xfb, 0x01, 0x08,
-  0x20, 0xfd, 0x01, 0x08, 0xbb, 0x01, 0x85, 0x02, 0x09, 0x29, 0x95, 0x02, 0x09, 0x43, 0x9d, 0x02,
-  0x09, 0x8f, 0x01, 0xb3, 0x02, 0x09, 0x1d, 0xb5, 0x02, 0x09, 0x6c, 0xbd, 0x02, 0x09, 0xb5, 0x01,
-  0xd5, 0x02, 0x09, 0x61, 0xdd, 0x02, 0x09, 0x9b, 0x01, 0xe9, 0x02, 0x09, 0xbf, 0x01, 0xf5, 0x02,
-  0x09, 0x75, 0xfd, 0x02, 0x09, 0xbd, 0x01, 0xa5, 0x03, 0x09, 0x3b, 0xb5, 0x03, 0x09, 0x6e, 0xdd,
-  0x03, 0x09, 0xac, 0x01, 0xc0, 0x04, 0xf5, 0x50, 0x53, 0x34, 0xd5, 0x18, 0x3a, 0xf6, 0x14, 0x81,
-  0xde, 0x68, 0x94, 0xae, 0x4c, 0x4a, 0xa9, 0xaf, 0x95, 0x26, 0x5f, 0x16, 0x11, 0x5e, 0x22, 0x53,
-  0x06, 0x87, 0x63, 0x51, 0x2e, 0x50, 0x41, 0x82, 0x70, 0x50, 0x59, 0xb1, 0x4a, 0x75, 0x6e, 0x52,
-  0xa7, 0x7a, 0xb3, 0x8e, 0x3e, 0x3d, 0x96, 0xf3, 0xd1, 0xdf, 0x68, 0x11, 0x4d, 0xc3, 0xae, 0x6e,
-  0x1b, 0x28, 0x57, 0xb5, 0xf9, 0x7b, 0x12, 0x8d, 0xdd, 0x56, 0x7b, 0xe6, 0x47, 0x83, 0x39, 0xef,
-  0x21, 0x5b, 0xb5, 0x83, 0xd1, 0x06, 0x0a, 0xa9, 0x0d, 0xb8, 0xa4, 0x96, 0x85, 0xf7, 0x78, 0x33,
-  0x58, 0x51, 0x1c, 0x3f, 0xd6, 0x17, 0xe3, 0xbc, 0xa9, 0xa2, 0x00, 0xcd, 0xbe, 0xfb, 0x93, 0xc4,
-  0x23, 0x2f, 0xd7, 0x3a, 0x7d, 0xb2, 0xf5, 0xb0, 0x80, 0xe3, 0x05, 0xcb, 0xfd, 0xd6, 0x9c, 0x5d,
-  0x7c, 0x70, 0x17, 0x68, 0xd9, 0x0b, 0x11, 0x9b, 0xed, 0x35, 0x81, 0xb1, 0xcd, 0x1f, 0x66, 0x80,
-  0x39, 0x38, 0xc3, 0xe0, 0x4e, 0xad, 0x0e, 0xe0, 0x59, 0x00, 0x9c, 0x61, 0x91, 0x24, 0x22, 0xe2,
-  0x6f, 0xe5, 0x5f, 0x97, 0x29, 0xb8, 0x41, 0xee, 0xa1, 0x20, 0xd9, 0xd9, 0xcb, 0x81, 0xd4, 0x15,
-  0x00, 0x00, 0x00, 0x5c, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0xf2,
-  0xed, 0x4c, 0xc6, 0xbe, 0x0e, 0x44, 0xaf, 0x2e, 0x25, 0xa0, 0x28, 0x14, 0x07, 0xa1, 0xb3, 0x53,
-  0xda, 0xee, 0x20, 0x64, 0xb3, 0xf4, 0xa7, 0x93, 0x74, 0xcd, 0x67, 0x31, 0x73, 0x04, 0xf2, 0x25,
-  0x1c, 0xa0, 0xdb, 0x6a, 0x43, 0x42, 0xdf, 0x0d, 0x89, 0xf8, 0x64, 0x40, 0x16, 0xa6, 0x40, 0xca,
-  0x4f, 0x7f, 0x24, 0x01, 0x00, 0x29
-};
+    0x08, 0x00, 0x13, 0x41, 0x41, 0x41, 0x41, 0x2d, 0x42, 0x42, 0x42, 0x42, 0x2d, 0x43, 0x43, 0x43, 0x43, 0x2d, 0x44,
+    0x44, 0x44, 0x44, 0x1e, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0xc6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1f, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5f, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x01, 0x8e, 0x85, 0xd7, 0xc7, 0x03, 0x37,
+    0x02, 0x00, 0x00, 0xe8, 0x07, 0x01, 0x03, 0x01, 0x02, 0x08, 0x09, 0x02, 0x00, 0x02, 0x08, 0x01, 0x02, 0x00, 0x04,
+    0x01, 0x03, 0x02, 0x00, 0x06, 0x08, 0x05, 0x01, 0x00, 0x07, 0x01, 0x00, 0x08, 0x01, 0x00, 0x09, 0x03, 0x00, 0x0a,
+    0x01, 0x0b, 0x02, 0x0c, 0x02, 0x00, 0x0d, 0x01, 0x0e, 0x04, 0x00, 0x0f, 0x01, 0x10, 0x02, 0x11, 0x03, 0x12, 0x01,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x02, 0xce, 0x02, 0x00, 0x00, 0xcb, 0x02, 0x00, 0x00, 0x02, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0xa0, 0x06, 0xb5, 0x9f, 0xa8, 0xc1, 0x02, 0x8c, 0xbe, 0xf0, 0xd0, 0x02, 0x01,
+    0x00, 0x00, 0x00, 0x05, 0x02, 0x00, 0x14, 0x08, 0x13, 0x02, 0x00, 0x16, 0x08, 0x15, 0x02, 0x00, 0x18, 0x01, 0x17,
+    0x01, 0x00, 0x19, 0x04, 0x00, 0x1a, 0x01, 0x1b, 0x02, 0x1c, 0x03, 0x1d, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0x00, 0x02, 0xbd, 0x94, 0xdc, 0x1e, 0x00, 0xff, 0x00, 0x00, 0xff, 0xc8, 0xc2, 0xeb, 0x23, 0x00, 0xff,
+    0x00, 0xff, 0x00, 0x84, 0x07, 0x03, 0xea, 0xbe, 0xd0, 0x82, 0x05, 0x98, 0xfc, 0xe0, 0xa1, 0x05, 0x85, 0xe5, 0xfe,
+    0x01, 0xad, 0xc7, 0xd6, 0x01, 0xf1, 0x98, 0x0a, 0xe2, 0xc4, 0x80, 0x02, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x00,
+    0x1f, 0x08, 0x1e, 0x02, 0x00, 0x21, 0x08, 0x20, 0x03, 0x00, 0x22, 0x01, 0x23, 0x02, 0x24, 0x04, 0x00, 0x25, 0x01,
+    0x26, 0x02, 0x27, 0x03, 0x28, 0x00, 0x3d, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x0d, 0x0f, 0x0f,
+    0x21, 0x10, 0x19, 0x07, 0x05, 0x09, 0x03, 0x09, 0x05, 0x05, 0x09, 0x06, 0x09, 0x06, 0x1b, 0x0d, 0x2c, 0x19, 0x11,
+    0x20, 0x05, 0x0c, 0x06, 0x0c, 0x06, 0x19, 0x0a, 0x2c, 0x16, 0x05, 0x05, 0x05, 0x0c, 0x06, 0x0c, 0x06, 0xce, 0x03,
+    0x4d, 0x00, 0x01, 0x00, 0x01, 0x04, 0x01, 0x03, 0x05, 0x02, 0x05, 0x09, 0x21, 0x07, 0x05, 0x03, 0x09, 0x06, 0x06,
+    0x0b, 0x07, 0x04, 0x0d, 0x07, 0x78, 0x0f, 0x06, 0x05, 0x13, 0x07, 0x11, 0x15, 0x09, 0x41, 0x17, 0x07, 0x0f, 0x19,
+    0x06, 0x09, 0x1b, 0x07, 0x10, 0x1d, 0x09, 0x8a, 0x01, 0x1f, 0x05, 0x08, 0x25, 0x08, 0x2f, 0x29, 0x07, 0x07, 0x2b,
+    0x07, 0x0c, 0x2d, 0x08, 0x7c, 0x2f, 0x06, 0x0d, 0x33, 0x09, 0x13, 0x35, 0x09, 0x68, 0x37, 0x06, 0x14, 0x39, 0x07,
+    0x0a, 0x3b, 0x07, 0x1a, 0x3d, 0x09, 0xb4, 0x01, 0x45, 0x08, 0x26, 0x4b, 0x07, 0x18, 0x4d, 0x08, 0x79, 0x53, 0x07,
+    0x12, 0x55, 0x09, 0x44, 0x57, 0x07, 0xd1, 0x01, 0x5b, 0x08, 0x15, 0x5d, 0x09, 0x98, 0x01, 0x65, 0x08, 0x3f, 0x69,
+    0x09, 0xbe, 0x01, 0x6b, 0x07, 0x0e, 0x6d, 0x08, 0x7e, 0x73, 0x07, 0x17, 0x75, 0x09, 0x70, 0x79, 0x07, 0x0b, 0x7b,
+    0x08, 0x1b, 0x7d, 0x09, 0xba, 0x01, 0x85, 0x01, 0x08, 0x23, 0x95, 0x01, 0x08, 0x42, 0x9d, 0x01, 0x08, 0x8d, 0x01,
+    0xa5, 0x01, 0x09, 0x39, 0xad, 0x01, 0x08, 0x7d, 0xb3, 0x01, 0x08, 0xc0, 0x01, 0xb5, 0x01, 0x09, 0x6d, 0xbd, 0x01,
+    0x08, 0xb9, 0x01, 0xc5, 0x01, 0x08, 0x28, 0xcd, 0x01, 0x08, 0x7b, 0xd5, 0x01, 0x08, 0x45, 0xdb, 0x01, 0x08, 0x16,
+    0xdd, 0x01, 0x09, 0xaa, 0x01, 0xe5, 0x01, 0x08, 0x40, 0xe9, 0x01, 0x08, 0xc1, 0x01, 0xed, 0x01, 0x08, 0x7f, 0xf5,
+    0x01, 0x08, 0x74, 0xfb, 0x01, 0x08, 0x20, 0xfd, 0x01, 0x08, 0xbb, 0x01, 0x85, 0x02, 0x09, 0x29, 0x95, 0x02, 0x09,
+    0x43, 0x9d, 0x02, 0x09, 0x8f, 0x01, 0xb3, 0x02, 0x09, 0x1d, 0xb5, 0x02, 0x09, 0x6c, 0xbd, 0x02, 0x09, 0xb5, 0x01,
+    0xd5, 0x02, 0x09, 0x61, 0xdd, 0x02, 0x09, 0x9b, 0x01, 0xe9, 0x02, 0x09, 0xbf, 0x01, 0xf5, 0x02, 0x09, 0x75, 0xfd,
+    0x02, 0x09, 0xbd, 0x01, 0xa5, 0x03, 0x09, 0x3b, 0xb5, 0x03, 0x09, 0x6e, 0xdd, 0x03, 0x09, 0xac, 0x01, 0xc0, 0x04,
+    0xf5, 0x50, 0x53, 0x34, 0xd5, 0x18, 0x3a, 0xf6, 0x14, 0x81, 0xde, 0x68, 0x94, 0xae, 0x4c, 0x4a, 0xa9, 0xaf, 0x95,
+    0x26, 0x5f, 0x16, 0x11, 0x5e, 0x22, 0x53, 0x06, 0x87, 0x63, 0x51, 0x2e, 0x50, 0x41, 0x82, 0x70, 0x50, 0x59, 0xb1,
+    0x4a, 0x75, 0x6e, 0x52, 0xa7, 0x7a, 0xb3, 0x8e, 0x3e, 0x3d, 0x96, 0xf3, 0xd1, 0xdf, 0x68, 0x11, 0x4d, 0xc3, 0xae,
+    0x6e, 0x1b, 0x28, 0x57, 0xb5, 0xf9, 0x7b, 0x12, 0x8d, 0xdd, 0x56, 0x7b, 0xe6, 0x47, 0x83, 0x39, 0xef, 0x21, 0x5b,
+    0xb5, 0x83, 0xd1, 0x06, 0x0a, 0xa9, 0x0d, 0xb8, 0xa4, 0x96, 0x85, 0xf7, 0x78, 0x33, 0x58, 0x51, 0x1c, 0x3f, 0xd6,
+    0x17, 0xe3, 0xbc, 0xa9, 0xa2, 0x00, 0xcd, 0xbe, 0xfb, 0x93, 0xc4, 0x23, 0x2f, 0xd7, 0x3a, 0x7d, 0xb2, 0xf5, 0xb0,
+    0x80, 0xe3, 0x05, 0xcb, 0xfd, 0xd6, 0x9c, 0x5d, 0x7c, 0x70, 0x17, 0x68, 0xd9, 0x0b, 0x11, 0x9b, 0xed, 0x35, 0x81,
+    0xb1, 0xcd, 0x1f, 0x66, 0x80, 0x39, 0x38, 0xc3, 0xe0, 0x4e, 0xad, 0x0e, 0xe0, 0x59, 0x00, 0x9c, 0x61, 0x91, 0x24,
+    0x22, 0xe2, 0x6f, 0xe5, 0x5f, 0x97, 0x29, 0xb8, 0x41, 0xee, 0xa1, 0x20, 0xd9, 0xd9, 0xcb, 0x81, 0xd4, 0x15, 0x00,
+    0x00, 0x00, 0x5c, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x60, 0xf2, 0xed, 0x4c, 0xc6, 0xbe,
+    0x0e, 0x44, 0xaf, 0x2e, 0x25, 0xa0, 0x28, 0x14, 0x07, 0xa1, 0xb3, 0x53, 0xda, 0xee, 0x20, 0x64, 0xb3, 0xf4, 0xa7,
+    0x93, 0x74, 0xcd, 0x67, 0x31, 0x73, 0x04, 0xf2, 0x25, 0x1c, 0xa0, 0xdb, 0x6a, 0x43, 0x42, 0xdf, 0x0d, 0x89, 0xf8,
+    0x64, 0x40, 0x16, 0xa6, 0x40, 0xca, 0x4f, 0x7f, 0x24, 0x01, 0x00, 0x29};
 
 // kBinKmlV8MM contains the same bookmarks and tracks as kBinKmlV7
 std::vector<uint8_t> const kBinKmlV8MM = {
-  0x08, 0x26, 0x41, 0x3a, 0x33, 0x66, 0x31, 0x66, 0x61, 0x39, 0x34, 0x32, 0x2d, 0x66, 0x64, 0x63,
-  0x61, 0x2d, 0x34, 0x36, 0x30, 0x33, 0x2d, 0x61, 0x35, 0x62, 0x30, 0x2d, 0x61, 0x30, 0x39, 0x39,
-  0x35, 0x66, 0x65, 0x36, 0x34, 0x34, 0x33, 0x34, 0x00, 0x1e, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb9, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x15, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b, 0x03, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0xee, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x8e, 0x85, 0xd7, 0xc7, 0x03,
-  0x37, 0x02, 0x00, 0x00, 0xcf, 0xf5, 0x8e, 0xc1, 0xa8, 0x31, 0x01, 0x03, 0x01, 0x02, 0x08, 0x09,
-  0x02, 0x00, 0x02, 0x08, 0x01, 0x02, 0x00, 0x03, 0x01, 0x04, 0x02, 0x00, 0x06, 0x08, 0x05, 0x01,
-  0x00, 0x07, 0x01, 0x00, 0x08, 0x01, 0x00, 0x09, 0x03, 0x00, 0x0a, 0x01, 0x0b, 0x02, 0x0c, 0x02,
-  0x00, 0x0d, 0x01, 0x0e, 0x04, 0x00, 0x0f, 0x01, 0x10, 0x02, 0x11, 0x03, 0x12, 0x01, 0xff, 0xff,
-  0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x02, 0xce, 0x02, 0x00, 0x00, 0xcb, 0x02, 0x00, 0x00, 0x02,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x80, 0xea, 0x30, 0xb5, 0x9f, 0xa8, 0xc1, 0x02, 0x8c,
-  0xbe, 0xf0, 0xd0, 0x02, 0x01, 0x00, 0x00, 0x05, 0x02, 0x00, 0x13, 0x08, 0x14, 0x02, 0x00, 0x15,
-  0x08, 0x16, 0x02, 0x00, 0x17, 0x01, 0x18, 0x01, 0x00, 0x19, 0x04, 0x00, 0x1a, 0x01, 0x1b, 0x02,
-  0x1c, 0x03, 0x1d, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x02, 0xbd, 0x94,
-  0xdc, 0x1e, 0x00, 0xff, 0x00, 0x00, 0xff, 0xc8, 0xc2, 0xeb, 0x23, 0x00, 0xff, 0x00, 0xff, 0x00,
-  0xa0, 0xf7, 0x36, 0x03, 0xea, 0xbe, 0xd0, 0x82, 0x05, 0x98, 0xfc, 0xe0, 0xa1, 0x05, 0x85, 0xe5,
-  0xfe, 0x01, 0xad, 0xc7, 0xd6, 0x01, 0xf1, 0x98, 0x0a, 0xe2, 0xc4, 0x80, 0x02, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x00, 0x1e, 0x08, 0x1f, 0x02, 0x00, 0x20, 0x08, 0x21, 0x03,
-  0x00, 0x22, 0x01, 0x23, 0x02, 0x24, 0x04, 0x00, 0x25, 0x01, 0x26, 0x02, 0x27, 0x03, 0x28, 0x43,
-  0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x0d, 0x0f, 0x0f, 0x21, 0x10, 0x19, 0x07,
-  0x05, 0x09, 0x03, 0x09, 0x05, 0x05, 0x09, 0x06, 0x09, 0x06, 0x0d, 0x1b, 0x19, 0x2c, 0x20, 0x11,
-  0x05, 0x0c, 0x06, 0x0c, 0x06, 0x0a, 0x19, 0x16, 0x2c, 0x05, 0x05, 0x05, 0x0c, 0x06, 0x0c, 0x06,
-  0xce, 0x03, 0x4f, 0x00, 0x01, 0x00, 0x01, 0x04, 0x01, 0x03, 0x06, 0x02, 0x05, 0x06, 0x05, 0x07,
-  0x07, 0x04, 0x09, 0x05, 0x03, 0x0b, 0x08, 0x6d, 0x0d, 0x06, 0x07, 0x0f, 0x07, 0x1b, 0x13, 0x06,
-  0x06, 0x15, 0x05, 0x08, 0x17, 0x07, 0x10, 0x19, 0x06, 0x0a, 0x1b, 0x08, 0x7d, 0x1d, 0x07, 0x0e,
-  0x1f, 0x09, 0x39, 0x23, 0x08, 0xbb, 0x01, 0x25, 0x07, 0x0f, 0x27, 0x06, 0x0d, 0x2b, 0x09, 0x79,
-  0x2d, 0x06, 0x0c, 0x2f, 0x08, 0x22, 0x33, 0x06, 0x09, 0x37, 0x07, 0x16, 0x39, 0x07, 0x18, 0x3b,
-  0x09, 0x9b, 0x01, 0x3d, 0x06, 0x14, 0x3f, 0x08, 0x42, 0x47, 0x07, 0x0b, 0x4b, 0x08, 0x74, 0x4f,
-  0x09, 0x1c, 0x57, 0x08, 0x11, 0x5b, 0x08, 0x8d, 0x01, 0x5d, 0x07, 0xd1, 0x01, 0x5f, 0x08, 0x3f,
-  0x63, 0x09, 0xbf, 0x01, 0x65, 0x07, 0x12, 0x6b, 0x08, 0x7b, 0x6f, 0x09, 0x26, 0x77, 0x08, 0x17,
-  0x79, 0x07, 0x77, 0x7b, 0x09, 0xb5, 0x01, 0x7f, 0x08, 0x44, 0x8b, 0x01, 0x09, 0x6f, 0x9b, 0x01,
-  0x08, 0x7e, 0x9f, 0x01, 0x08, 0x3e, 0xa3, 0x01, 0x08, 0xbd, 0x01, 0xab, 0x01, 0x08, 0x7a, 0xaf,
-  0x01, 0x09, 0x23, 0xbb, 0x01, 0x09, 0xac, 0x01, 0xbf, 0x01, 0x09, 0x43, 0xcb, 0x01, 0x08, 0x78,
-  0xcf, 0x01, 0x08, 0x21, 0xd7, 0x01, 0x09, 0x13, 0xdb, 0x01, 0x09, 0x8f, 0x01, 0xdf, 0x01, 0x09,
-  0x40, 0xe3, 0x01, 0x08, 0xc1, 0x01, 0xeb, 0x01, 0x08, 0x7c, 0xef, 0x01, 0x09, 0x29, 0xf7, 0x01,
-  0x09, 0x19, 0xfb, 0x01, 0x08, 0xb9, 0x01, 0xff, 0x01, 0x09, 0x68, 0x9f, 0x02, 0x09, 0x3b, 0xab,
-  0x02, 0x09, 0x8a, 0x01, 0xbb, 0x02, 0x09, 0xaa, 0x01, 0xcf, 0x02, 0x09, 0x1d, 0xe3, 0x02, 0x09,
-  0xc0, 0x01, 0xef, 0x02, 0x09, 0x27, 0xfb, 0x02, 0x09, 0xbe, 0x01, 0x8b, 0x03, 0x09, 0x76, 0xaf,
-  0x03, 0x09, 0x25, 0xbb, 0x03, 0x09, 0xb2, 0x01, 0xbf, 0x03, 0x09, 0x60, 0xd7, 0x03, 0x09, 0x15,
-  0xdb, 0x03, 0x09, 0x98, 0x01, 0xdf, 0x03, 0x09, 0x41, 0xef, 0x03, 0x09, 0x30, 0xf7, 0x03, 0x09,
-  0x1a, 0xff, 0x03, 0x09, 0x6c, 0xc0, 0x04, 0x4b, 0xe0, 0xbf, 0x15, 0xff, 0x92, 0x6d, 0x7b, 0x44,
-  0x60, 0x3f, 0x96, 0x3f, 0xfe, 0x4c, 0x1f, 0xec, 0x5e, 0xc8, 0x7c, 0x46, 0x84, 0x96, 0xa8, 0x3e,
-  0x61, 0x90, 0x38, 0x7c, 0x09, 0x7c, 0x33, 0x21, 0x24, 0x7c, 0xff, 0xf9, 0xf5, 0x97, 0x5d, 0x16,
-  0xfd, 0xed, 0x3d, 0x17, 0x5f, 0x95, 0xee, 0x6e, 0x23, 0x29, 0xbf, 0x26, 0x96, 0x07, 0xf7, 0x96,
-  0x36, 0xc0, 0x97, 0xdf, 0xab, 0x55, 0x31, 0xc9, 0x3f, 0x6e, 0x9b, 0xb3, 0x1a, 0x79, 0x72, 0x9c,
-  0x89, 0x39, 0x6b, 0x37, 0x41, 0xda, 0x00, 0x2f, 0x2c, 0x00, 0x9a, 0xdc, 0xab, 0x7e, 0x38, 0x2b,
-  0xb4, 0xbc, 0x0d, 0x67, 0xa7, 0x24, 0xa5, 0xb3, 0x79, 0x1d, 0x60, 0x55, 0xd5, 0xd7, 0x29, 0x0a,
-  0x47, 0xd9, 0x7a, 0xb9, 0x60, 0xee, 0x0c, 0x0e, 0x90, 0x9c, 0x20, 0xf7, 0xbc, 0x9e, 0xb9, 0x1f,
-  0x15, 0xf4, 0x2f, 0x6b, 0x8f, 0x10, 0x71, 0xb9, 0x75, 0x08, 0x0c, 0x37, 0xea, 0xe0, 0x1a, 0xb8,
-  0x03, 0x69, 0x30, 0xd0, 0x37, 0x6d, 0x02, 0x14, 0x07, 0x80, 0x34, 0x38, 0x4c, 0x26, 0xa2, 0x5e,
-  0x3f, 0x9e, 0x4a, 0x65, 0xd0, 0x83, 0xac, 0xe0, 0x29, 0x73, 0x7a, 0x64, 0xa0, 0xe9, 0x02, 0x00,
-  0x00, 0x80, 0x2e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8c, 0xd6, 0xc7,
-  0x15, 0xf1, 0x6c, 0x25, 0xb1, 0x6f, 0xfb, 0x3b, 0xf0, 0x26, 0xcc, 0x41, 0xd8, 0xda, 0x32, 0x66,
-  0x17, 0x08, 0xf3, 0x58, 0x46, 0xc6, 0x99, 0x76, 0x1c, 0xcd, 0x4f, 0x22, 0x70, 0x7c, 0x4f, 0x02,
-  0x76, 0xb6, 0x17, 0x26, 0x46, 0x2f, 0x4c, 0xa2, 0x32, 0x03, 0x73, 0x28, 0x03, 0x8d, 0x3a, 0x5e,
-  0x98, 0x00, 0x01, 0x00, 0x29
-};
+    0x08, 0x26, 0x41, 0x3a, 0x33, 0x66, 0x31, 0x66, 0x61, 0x39, 0x34, 0x32, 0x2d, 0x66, 0x64, 0x63, 0x61, 0x2d, 0x34,
+    0x36, 0x30, 0x33, 0x2d, 0x61, 0x35, 0x62, 0x30, 0x2d, 0x61, 0x30, 0x39, 0x39, 0x35, 0x66, 0x65, 0x36, 0x34, 0x34,
+    0x33, 0x34, 0x00, 0x1e, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0xb9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x15, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5b, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xee, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x8e, 0x85, 0xd7, 0xc7,
+    0x03, 0x37, 0x02, 0x00, 0x00, 0xcf, 0xf5, 0x8e, 0xc1, 0xa8, 0x31, 0x01, 0x03, 0x01, 0x02, 0x08, 0x09, 0x02, 0x00,
+    0x02, 0x08, 0x01, 0x02, 0x00, 0x03, 0x01, 0x04, 0x02, 0x00, 0x06, 0x08, 0x05, 0x01, 0x00, 0x07, 0x01, 0x00, 0x08,
+    0x01, 0x00, 0x09, 0x03, 0x00, 0x0a, 0x01, 0x0b, 0x02, 0x0c, 0x02, 0x00, 0x0d, 0x01, 0x0e, 0x04, 0x00, 0x0f, 0x01,
+    0x10, 0x02, 0x11, 0x03, 0x12, 0x01, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x02, 0xce, 0x02, 0x00, 0x00,
+    0xcb, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x80, 0xea, 0x30, 0xb5, 0x9f, 0xa8, 0xc1,
+    0x02, 0x8c, 0xbe, 0xf0, 0xd0, 0x02, 0x01, 0x00, 0x00, 0x05, 0x02, 0x00, 0x13, 0x08, 0x14, 0x02, 0x00, 0x15, 0x08,
+    0x16, 0x02, 0x00, 0x17, 0x01, 0x18, 0x01, 0x00, 0x19, 0x04, 0x00, 0x1a, 0x01, 0x1b, 0x02, 0x1c, 0x03, 0x1d, 0x01,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x02, 0xbd, 0x94, 0xdc, 0x1e, 0x00, 0xff, 0x00, 0x00, 0xff,
+    0xc8, 0xc2, 0xeb, 0x23, 0x00, 0xff, 0x00, 0xff, 0x00, 0xa0, 0xf7, 0x36, 0x03, 0xea, 0xbe, 0xd0, 0x82, 0x05, 0x98,
+    0xfc, 0xe0, 0xa1, 0x05, 0x85, 0xe5, 0xfe, 0x01, 0xad, 0xc7, 0xd6, 0x01, 0xf1, 0x98, 0x0a, 0xe2, 0xc4, 0x80, 0x02,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x00, 0x1e, 0x08, 0x1f, 0x02, 0x00, 0x20, 0x08, 0x21, 0x03,
+    0x00, 0x22, 0x01, 0x23, 0x02, 0x24, 0x04, 0x00, 0x25, 0x01, 0x26, 0x02, 0x27, 0x03, 0x28, 0x43, 0x02, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x0d, 0x0f, 0x0f, 0x21, 0x10, 0x19, 0x07, 0x05, 0x09, 0x03, 0x09, 0x05, 0x05,
+    0x09, 0x06, 0x09, 0x06, 0x0d, 0x1b, 0x19, 0x2c, 0x20, 0x11, 0x05, 0x0c, 0x06, 0x0c, 0x06, 0x0a, 0x19, 0x16, 0x2c,
+    0x05, 0x05, 0x05, 0x0c, 0x06, 0x0c, 0x06, 0xce, 0x03, 0x4f, 0x00, 0x01, 0x00, 0x01, 0x04, 0x01, 0x03, 0x06, 0x02,
+    0x05, 0x06, 0x05, 0x07, 0x07, 0x04, 0x09, 0x05, 0x03, 0x0b, 0x08, 0x6d, 0x0d, 0x06, 0x07, 0x0f, 0x07, 0x1b, 0x13,
+    0x06, 0x06, 0x15, 0x05, 0x08, 0x17, 0x07, 0x10, 0x19, 0x06, 0x0a, 0x1b, 0x08, 0x7d, 0x1d, 0x07, 0x0e, 0x1f, 0x09,
+    0x39, 0x23, 0x08, 0xbb, 0x01, 0x25, 0x07, 0x0f, 0x27, 0x06, 0x0d, 0x2b, 0x09, 0x79, 0x2d, 0x06, 0x0c, 0x2f, 0x08,
+    0x22, 0x33, 0x06, 0x09, 0x37, 0x07, 0x16, 0x39, 0x07, 0x18, 0x3b, 0x09, 0x9b, 0x01, 0x3d, 0x06, 0x14, 0x3f, 0x08,
+    0x42, 0x47, 0x07, 0x0b, 0x4b, 0x08, 0x74, 0x4f, 0x09, 0x1c, 0x57, 0x08, 0x11, 0x5b, 0x08, 0x8d, 0x01, 0x5d, 0x07,
+    0xd1, 0x01, 0x5f, 0x08, 0x3f, 0x63, 0x09, 0xbf, 0x01, 0x65, 0x07, 0x12, 0x6b, 0x08, 0x7b, 0x6f, 0x09, 0x26, 0x77,
+    0x08, 0x17, 0x79, 0x07, 0x77, 0x7b, 0x09, 0xb5, 0x01, 0x7f, 0x08, 0x44, 0x8b, 0x01, 0x09, 0x6f, 0x9b, 0x01, 0x08,
+    0x7e, 0x9f, 0x01, 0x08, 0x3e, 0xa3, 0x01, 0x08, 0xbd, 0x01, 0xab, 0x01, 0x08, 0x7a, 0xaf, 0x01, 0x09, 0x23, 0xbb,
+    0x01, 0x09, 0xac, 0x01, 0xbf, 0x01, 0x09, 0x43, 0xcb, 0x01, 0x08, 0x78, 0xcf, 0x01, 0x08, 0x21, 0xd7, 0x01, 0x09,
+    0x13, 0xdb, 0x01, 0x09, 0x8f, 0x01, 0xdf, 0x01, 0x09, 0x40, 0xe3, 0x01, 0x08, 0xc1, 0x01, 0xeb, 0x01, 0x08, 0x7c,
+    0xef, 0x01, 0x09, 0x29, 0xf7, 0x01, 0x09, 0x19, 0xfb, 0x01, 0x08, 0xb9, 0x01, 0xff, 0x01, 0x09, 0x68, 0x9f, 0x02,
+    0x09, 0x3b, 0xab, 0x02, 0x09, 0x8a, 0x01, 0xbb, 0x02, 0x09, 0xaa, 0x01, 0xcf, 0x02, 0x09, 0x1d, 0xe3, 0x02, 0x09,
+    0xc0, 0x01, 0xef, 0x02, 0x09, 0x27, 0xfb, 0x02, 0x09, 0xbe, 0x01, 0x8b, 0x03, 0x09, 0x76, 0xaf, 0x03, 0x09, 0x25,
+    0xbb, 0x03, 0x09, 0xb2, 0x01, 0xbf, 0x03, 0x09, 0x60, 0xd7, 0x03, 0x09, 0x15, 0xdb, 0x03, 0x09, 0x98, 0x01, 0xdf,
+    0x03, 0x09, 0x41, 0xef, 0x03, 0x09, 0x30, 0xf7, 0x03, 0x09, 0x1a, 0xff, 0x03, 0x09, 0x6c, 0xc0, 0x04, 0x4b, 0xe0,
+    0xbf, 0x15, 0xff, 0x92, 0x6d, 0x7b, 0x44, 0x60, 0x3f, 0x96, 0x3f, 0xfe, 0x4c, 0x1f, 0xec, 0x5e, 0xc8, 0x7c, 0x46,
+    0x84, 0x96, 0xa8, 0x3e, 0x61, 0x90, 0x38, 0x7c, 0x09, 0x7c, 0x33, 0x21, 0x24, 0x7c, 0xff, 0xf9, 0xf5, 0x97, 0x5d,
+    0x16, 0xfd, 0xed, 0x3d, 0x17, 0x5f, 0x95, 0xee, 0x6e, 0x23, 0x29, 0xbf, 0x26, 0x96, 0x07, 0xf7, 0x96, 0x36, 0xc0,
+    0x97, 0xdf, 0xab, 0x55, 0x31, 0xc9, 0x3f, 0x6e, 0x9b, 0xb3, 0x1a, 0x79, 0x72, 0x9c, 0x89, 0x39, 0x6b, 0x37, 0x41,
+    0xda, 0x00, 0x2f, 0x2c, 0x00, 0x9a, 0xdc, 0xab, 0x7e, 0x38, 0x2b, 0xb4, 0xbc, 0x0d, 0x67, 0xa7, 0x24, 0xa5, 0xb3,
+    0x79, 0x1d, 0x60, 0x55, 0xd5, 0xd7, 0x29, 0x0a, 0x47, 0xd9, 0x7a, 0xb9, 0x60, 0xee, 0x0c, 0x0e, 0x90, 0x9c, 0x20,
+    0xf7, 0xbc, 0x9e, 0xb9, 0x1f, 0x15, 0xf4, 0x2f, 0x6b, 0x8f, 0x10, 0x71, 0xb9, 0x75, 0x08, 0x0c, 0x37, 0xea, 0xe0,
+    0x1a, 0xb8, 0x03, 0x69, 0x30, 0xd0, 0x37, 0x6d, 0x02, 0x14, 0x07, 0x80, 0x34, 0x38, 0x4c, 0x26, 0xa2, 0x5e, 0x3f,
+    0x9e, 0x4a, 0x65, 0xd0, 0x83, 0xac, 0xe0, 0x29, 0x73, 0x7a, 0x64, 0xa0, 0xe9, 0x02, 0x00, 0x00, 0x80, 0x2e, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x8c, 0xd6, 0xc7, 0x15, 0xf1, 0x6c, 0x25, 0xb1, 0x6f, 0xfb,
+    0x3b, 0xf0, 0x26, 0xcc, 0x41, 0xd8, 0xda, 0x32, 0x66, 0x17, 0x08, 0xf3, 0x58, 0x46, 0xc6, 0x99, 0x76, 0x1c, 0xcd,
+    0x4f, 0x22, 0x70, 0x7c, 0x4f, 0x02, 0x76, 0xb6, 0x17, 0x26, 0x46, 0x2f, 0x4c, 0xa2, 0x32, 0x03, 0x73, 0x28, 0x03,
+    0x8d, 0x3a, 0x5e, 0x98, 0x00, 0x01, 0x00, 0x29};
 
 // kBinKmlV9MM contains the same bookmarks and tracks as kBinKmlV8
 std::vector<uint8_t> const kBinKmlV9MM = {
-  0x09, 0x26, 0x41, 0x3a, 0x33, 0x39, 0x37, 0x33, 0x65, 0x66, 0x34, 0x64, 0x2d, 0x66, 0x35, 0x31,
-  0x65, 0x2d, 0x34, 0x61, 0x37, 0x31, 0x2d, 0x38, 0x65, 0x64, 0x34, 0x2d, 0x64, 0x65, 0x61, 0x33,
-  0x63, 0x31, 0x39, 0x30, 0x64, 0x61, 0x63, 0x35, 0x00, 0x1e, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb9, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x16, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x67, 0x03, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0xea, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x8e, 0x85, 0xd7, 0xc7, 0x03,
-  0x37, 0x02, 0x00, 0x00, 0xeb, 0x8c, 0x98, 0xfd, 0x94, 0x32, 0x01, 0x03, 0x01, 0x02, 0x08, 0x09,
-  0x02, 0x00, 0x02, 0x08, 0x01, 0x02, 0x00, 0x04, 0x01, 0x03, 0x02, 0x00, 0x06, 0x08, 0x05, 0x01,
-  0x00, 0x07, 0x01, 0x00, 0x08, 0x01, 0x00, 0x09, 0x03, 0x00, 0x0a, 0x01, 0x0b, 0x02, 0x0c, 0x02,
-  0x00, 0x0d, 0x01, 0x0e, 0x04, 0x00, 0x0f, 0x01, 0x10, 0x02, 0x11, 0x03, 0x12, 0x01, 0x02, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xce, 0x02, 0x00, 0x00, 0xcb, 0x02, 0x00, 0x00, 0x02,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x80, 0xea, 0x30, 0xb5, 0x9f, 0xa8, 0xc1, 0x02, 0x8c,
-  0xbe, 0xf0, 0xd0, 0x02, 0x01, 0x00, 0x00, 0x05, 0x02, 0x00, 0x14, 0x08, 0x13, 0x02, 0x00, 0x16,
-  0x08, 0x15, 0x02, 0x00, 0x18, 0x01, 0x17, 0x01, 0x00, 0x19, 0x04, 0x00, 0x1a, 0x01, 0x1b, 0x02,
-  0x1c, 0x03, 0x1d, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xbd, 0x94,
-  0xdc, 0x1e, 0x00, 0xff, 0x00, 0x00, 0xff, 0xc8, 0xc2, 0xeb, 0x23, 0x00, 0xff, 0x00, 0xff, 0x00,
-  0xa0, 0xf7, 0x36, 0x01, 0x03, 0xea, 0xbe, 0xd0, 0x82, 0x05, 0x98, 0xfc, 0xe0, 0xa1, 0x05, 0x85,
-  0xe5, 0xfe, 0x01, 0xad, 0xc7, 0xd6, 0x01, 0xf1, 0x98, 0x0a, 0xe2, 0xc4, 0x80, 0x02, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x00, 0x1e, 0x08, 0x1f, 0x02, 0x00, 0x20, 0x08, 0x21,
-  0x03, 0x00, 0x22, 0x01, 0x23, 0x02, 0x24, 0x04, 0x00, 0x25, 0x01, 0x26, 0x02, 0x27, 0x03, 0x28,
-  0x4e, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x0d, 0x0f, 0x0f, 0x21, 0x10, 0x19,
-  0x07, 0x05, 0x09, 0x03, 0x09, 0x05, 0x05, 0x09, 0x06, 0x09, 0x06, 0x1b, 0x0d, 0x2c, 0x19, 0x11,
-  0x20, 0x05, 0x0c, 0x06, 0x0c, 0x06, 0x0a, 0x19, 0x16, 0x2c, 0x05, 0x05, 0x05, 0x0c, 0x06, 0x0c,
-  0x06, 0xce, 0x03, 0x51, 0x00, 0x01, 0x00, 0x01, 0x04, 0x01, 0x03, 0x05, 0x03, 0x05, 0x08, 0x23,
-  0x07, 0x07, 0x04, 0x09, 0x06, 0x02, 0x0b, 0x05, 0x08, 0x0d, 0x07, 0x78, 0x0f, 0x06, 0x0d, 0x13,
-  0x06, 0x05, 0x15, 0x08, 0x42, 0x17, 0x07, 0x0c, 0x19, 0x06, 0x06, 0x1b, 0x06, 0x12, 0x1d, 0x08,
-  0x8d, 0x01, 0x1f, 0x07, 0x11, 0x25, 0x09, 0x39, 0x27, 0x07, 0x1a, 0x29, 0x07, 0x07, 0x2d, 0x08,
-  0x7d, 0x2f, 0x07, 0x0f, 0x33, 0x06, 0x0a, 0x35, 0x09, 0x6d, 0x37, 0x08, 0x17, 0x39, 0x06, 0x09,
-  0x3b, 0x06, 0x14, 0x3d, 0x08, 0xb9, 0x01, 0x3f, 0x07, 0x16, 0x45, 0x08, 0x28, 0x47, 0x07, 0x0b,
-  0x4d, 0x08, 0x7b, 0x55, 0x08, 0x45, 0x57, 0x07, 0x0e, 0x5d, 0x09, 0xaa, 0x01, 0x5f, 0x09, 0x13,
-  0x65, 0x08, 0x40, 0x67, 0x07, 0x1b, 0x69, 0x08, 0xc1, 0x01, 0x6d, 0x08, 0x7f, 0x6f, 0x07, 0x10,
-  0x75, 0x09, 0x75, 0x77, 0x08, 0x1d, 0x7d, 0x08, 0xbb, 0x01, 0x7f, 0x07, 0x18, 0x85, 0x01, 0x09,
-  0x25, 0x95, 0x01, 0x09, 0x44, 0x9d, 0x01, 0x09, 0x98, 0x01, 0xa5, 0x01, 0x08, 0x3f, 0xad, 0x01,
-  0x08, 0x7e, 0xb5, 0x01, 0x09, 0x70, 0xb7, 0x01, 0x09, 0x19, 0xbd, 0x01, 0x09, 0xba, 0x01, 0xc5,
-  0x01, 0x09, 0x2f, 0xcd, 0x01, 0x08, 0x7c, 0xd5, 0x01, 0x09, 0x68, 0xdd, 0x01, 0x09, 0xb2, 0x01,
-  0xdf, 0x01, 0x08, 0xc0, 0x01, 0xe5, 0x01, 0x09, 0x41, 0xe9, 0x01, 0x08, 0xd1, 0x01, 0xed, 0x01,
-  0x09, 0x8a, 0x01, 0xf5, 0x01, 0x08, 0x79, 0xf7, 0x01, 0x09, 0x21, 0xfd, 0x01, 0x09, 0xbe, 0x01,
-  0xa5, 0x02, 0x09, 0x3b, 0xb5, 0x02, 0x09, 0x6e, 0xdd, 0x02, 0x09, 0xac, 0x01, 0xdf, 0x02, 0x09,
-  0x15, 0xf5, 0x02, 0x09, 0x76, 0x85, 0x03, 0x09, 0x26, 0x95, 0x03, 0x09, 0x61, 0x9d, 0x03, 0x09,
-  0x9b, 0x01, 0xb5, 0x03, 0x09, 0x74, 0xb7, 0x03, 0x09, 0x20, 0xbd, 0x03, 0x09, 0xbd, 0x01, 0xc5,
-  0x03, 0x09, 0x30, 0xd5, 0x03, 0x09, 0x6c, 0xdd, 0x03, 0x09, 0xb5, 0x01, 0xe5, 0x03, 0x09, 0x43,
-  0xed, 0x03, 0x09, 0x8f, 0x01, 0xf7, 0x03, 0x09, 0x22, 0xfd, 0x03, 0x09, 0xbf, 0x01, 0xc0, 0x04,
-  0xb5, 0xa1, 0x7a, 0x44, 0x7d, 0xb5, 0xa1, 0x7d, 0x77, 0x11, 0xe8, 0x89, 0x46, 0xc9, 0x8a, 0xac,
-  0x84, 0x6e, 0x35, 0xfa, 0x1d, 0x4b, 0x23, 0xc2, 0x43, 0xe4, 0x4a, 0x21, 0x19, 0xc4, 0xa1, 0x4c,
-  0xa0, 0x9c, 0x0c, 0x61, 0xa0, 0xa2, 0x7c, 0xa5, 0xaa, 0xf9, 0x53, 0xab, 0xaa, 0xee, 0x35, 0x7a,
-  0x6d, 0xff, 0x9b, 0xbe, 0xad, 0xd1, 0x2c, 0xea, 0x13, 0xa7, 0x3a, 0xad, 0xa0, 0x4c, 0xe5, 0xa6,
-  0x65, 0xca, 0x34, 0xce, 0xbf, 0xb6, 0xdc, 0x8a, 0x06, 0x7f, 0x9e, 0x41, 0x7e, 0x69, 0x03, 0x49,
-  0x2b, 0x28, 0xa0, 0x26, 0xe0, 0x95, 0xba, 0x55, 0xb0, 0x27, 0x4f, 0x0e, 0x17, 0x8a, 0xc2, 0xba,
-  0xbe, 0x8c, 0xf1, 0xa4, 0x0a, 0x07, 0x68, 0xb2, 0xec, 0x4b, 0x16, 0x93, 0xa3, 0xb9, 0x65, 0x9b,
-  0xe4, 0xd7, 0xc4, 0x01, 0x86, 0x07, 0xfc, 0xef, 0xb5, 0xcc, 0x4e, 0xb1, 0xc0, 0x7e, 0xbf, 0xf9,
-  0x1c, 0xc4, 0xfb, 0x77, 0x25, 0x90, 0xfc, 0x58, 0x89, 0x2f, 0xe0, 0x06, 0x8c, 0x44, 0xc2, 0x9e,
-  0xba, 0x0c, 0xc0, 0x74, 0x00, 0x18, 0x89, 0x43, 0x96, 0x45, 0x88, 0xf5, 0x75, 0x7e, 0xbc, 0x36,
-  0xb0, 0x83, 0x79, 0xe2, 0x8e, 0x7c, 0x9c, 0x67, 0x90, 0x4a, 0x07, 0x00, 0x00, 0x00, 0xe9, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x59, 0x4e, 0x1f, 0x71, 0x5b, 0x3b,
-  0xa2, 0x47, 0xa7, 0x62, 0xa0, 0x50, 0x28, 0x0a, 0x42, 0x47, 0x87, 0xfe, 0x5d, 0x41, 0xc8, 0xbf,
-  0xe9, 0x4b, 0x23, 0xeb, 0x7c, 0x94, 0xdf, 0x45, 0xe0, 0x58, 0x9c, 0x01, 0x74, 0xb9, 0xbc, 0xc9,
-  0xe8, 0xfd, 0x26, 0x13, 0x8b, 0x1c, 0xc8, 0xc3, 0x06, 0xa4, 0xac, 0xb4, 0x49, 0x06, 0x01, 0x00,
-  0x29
-};
+    0x09, 0x26, 0x41, 0x3a, 0x33, 0x39, 0x37, 0x33, 0x65, 0x66, 0x34, 0x64, 0x2d, 0x66, 0x35, 0x31, 0x65, 0x2d, 0x34,
+    0x61, 0x37, 0x31, 0x2d, 0x38, 0x65, 0x64, 0x34, 0x2d, 0x64, 0x65, 0x61, 0x33, 0x63, 0x31, 0x39, 0x30, 0x64, 0x61,
+    0x63, 0x35, 0x00, 0x1e, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0xb9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x16, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x67, 0x03,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xea, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x8e, 0x85, 0xd7, 0xc7,
+    0x03, 0x37, 0x02, 0x00, 0x00, 0xeb, 0x8c, 0x98, 0xfd, 0x94, 0x32, 0x01, 0x03, 0x01, 0x02, 0x08, 0x09, 0x02, 0x00,
+    0x02, 0x08, 0x01, 0x02, 0x00, 0x04, 0x01, 0x03, 0x02, 0x00, 0x06, 0x08, 0x05, 0x01, 0x00, 0x07, 0x01, 0x00, 0x08,
+    0x01, 0x00, 0x09, 0x03, 0x00, 0x0a, 0x01, 0x0b, 0x02, 0x0c, 0x02, 0x00, 0x0d, 0x01, 0x0e, 0x04, 0x00, 0x0f, 0x01,
+    0x10, 0x02, 0x11, 0x03, 0x12, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xce, 0x02, 0x00, 0x00,
+    0xcb, 0x02, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0f, 0x80, 0xea, 0x30, 0xb5, 0x9f, 0xa8, 0xc1,
+    0x02, 0x8c, 0xbe, 0xf0, 0xd0, 0x02, 0x01, 0x00, 0x00, 0x05, 0x02, 0x00, 0x14, 0x08, 0x13, 0x02, 0x00, 0x16, 0x08,
+    0x15, 0x02, 0x00, 0x18, 0x01, 0x17, 0x01, 0x00, 0x19, 0x04, 0x00, 0x1a, 0x01, 0x1b, 0x02, 0x1c, 0x03, 0x1d, 0x01,
+    0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xbd, 0x94, 0xdc, 0x1e, 0x00, 0xff, 0x00, 0x00, 0xff,
+    0xc8, 0xc2, 0xeb, 0x23, 0x00, 0xff, 0x00, 0xff, 0x00, 0xa0, 0xf7, 0x36, 0x01, 0x03, 0xea, 0xbe, 0xd0, 0x82, 0x05,
+    0x98, 0xfc, 0xe0, 0xa1, 0x05, 0x85, 0xe5, 0xfe, 0x01, 0xad, 0xc7, 0xd6, 0x01, 0xf1, 0x98, 0x0a, 0xe2, 0xc4, 0x80,
+    0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x02, 0x00, 0x1e, 0x08, 0x1f, 0x02, 0x00, 0x20, 0x08, 0x21,
+    0x03, 0x00, 0x22, 0x01, 0x23, 0x02, 0x24, 0x04, 0x00, 0x25, 0x01, 0x26, 0x02, 0x27, 0x03, 0x28, 0x4e, 0x02, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x0d, 0x0f, 0x0f, 0x21, 0x10, 0x19, 0x07, 0x05, 0x09, 0x03, 0x09, 0x05,
+    0x05, 0x09, 0x06, 0x09, 0x06, 0x1b, 0x0d, 0x2c, 0x19, 0x11, 0x20, 0x05, 0x0c, 0x06, 0x0c, 0x06, 0x0a, 0x19, 0x16,
+    0x2c, 0x05, 0x05, 0x05, 0x0c, 0x06, 0x0c, 0x06, 0xce, 0x03, 0x51, 0x00, 0x01, 0x00, 0x01, 0x04, 0x01, 0x03, 0x05,
+    0x03, 0x05, 0x08, 0x23, 0x07, 0x07, 0x04, 0x09, 0x06, 0x02, 0x0b, 0x05, 0x08, 0x0d, 0x07, 0x78, 0x0f, 0x06, 0x0d,
+    0x13, 0x06, 0x05, 0x15, 0x08, 0x42, 0x17, 0x07, 0x0c, 0x19, 0x06, 0x06, 0x1b, 0x06, 0x12, 0x1d, 0x08, 0x8d, 0x01,
+    0x1f, 0x07, 0x11, 0x25, 0x09, 0x39, 0x27, 0x07, 0x1a, 0x29, 0x07, 0x07, 0x2d, 0x08, 0x7d, 0x2f, 0x07, 0x0f, 0x33,
+    0x06, 0x0a, 0x35, 0x09, 0x6d, 0x37, 0x08, 0x17, 0x39, 0x06, 0x09, 0x3b, 0x06, 0x14, 0x3d, 0x08, 0xb9, 0x01, 0x3f,
+    0x07, 0x16, 0x45, 0x08, 0x28, 0x47, 0x07, 0x0b, 0x4d, 0x08, 0x7b, 0x55, 0x08, 0x45, 0x57, 0x07, 0x0e, 0x5d, 0x09,
+    0xaa, 0x01, 0x5f, 0x09, 0x13, 0x65, 0x08, 0x40, 0x67, 0x07, 0x1b, 0x69, 0x08, 0xc1, 0x01, 0x6d, 0x08, 0x7f, 0x6f,
+    0x07, 0x10, 0x75, 0x09, 0x75, 0x77, 0x08, 0x1d, 0x7d, 0x08, 0xbb, 0x01, 0x7f, 0x07, 0x18, 0x85, 0x01, 0x09, 0x25,
+    0x95, 0x01, 0x09, 0x44, 0x9d, 0x01, 0x09, 0x98, 0x01, 0xa5, 0x01, 0x08, 0x3f, 0xad, 0x01, 0x08, 0x7e, 0xb5, 0x01,
+    0x09, 0x70, 0xb7, 0x01, 0x09, 0x19, 0xbd, 0x01, 0x09, 0xba, 0x01, 0xc5, 0x01, 0x09, 0x2f, 0xcd, 0x01, 0x08, 0x7c,
+    0xd5, 0x01, 0x09, 0x68, 0xdd, 0x01, 0x09, 0xb2, 0x01, 0xdf, 0x01, 0x08, 0xc0, 0x01, 0xe5, 0x01, 0x09, 0x41, 0xe9,
+    0x01, 0x08, 0xd1, 0x01, 0xed, 0x01, 0x09, 0x8a, 0x01, 0xf5, 0x01, 0x08, 0x79, 0xf7, 0x01, 0x09, 0x21, 0xfd, 0x01,
+    0x09, 0xbe, 0x01, 0xa5, 0x02, 0x09, 0x3b, 0xb5, 0x02, 0x09, 0x6e, 0xdd, 0x02, 0x09, 0xac, 0x01, 0xdf, 0x02, 0x09,
+    0x15, 0xf5, 0x02, 0x09, 0x76, 0x85, 0x03, 0x09, 0x26, 0x95, 0x03, 0x09, 0x61, 0x9d, 0x03, 0x09, 0x9b, 0x01, 0xb5,
+    0x03, 0x09, 0x74, 0xb7, 0x03, 0x09, 0x20, 0xbd, 0x03, 0x09, 0xbd, 0x01, 0xc5, 0x03, 0x09, 0x30, 0xd5, 0x03, 0x09,
+    0x6c, 0xdd, 0x03, 0x09, 0xb5, 0x01, 0xe5, 0x03, 0x09, 0x43, 0xed, 0x03, 0x09, 0x8f, 0x01, 0xf7, 0x03, 0x09, 0x22,
+    0xfd, 0x03, 0x09, 0xbf, 0x01, 0xc0, 0x04, 0xb5, 0xa1, 0x7a, 0x44, 0x7d, 0xb5, 0xa1, 0x7d, 0x77, 0x11, 0xe8, 0x89,
+    0x46, 0xc9, 0x8a, 0xac, 0x84, 0x6e, 0x35, 0xfa, 0x1d, 0x4b, 0x23, 0xc2, 0x43, 0xe4, 0x4a, 0x21, 0x19, 0xc4, 0xa1,
+    0x4c, 0xa0, 0x9c, 0x0c, 0x61, 0xa0, 0xa2, 0x7c, 0xa5, 0xaa, 0xf9, 0x53, 0xab, 0xaa, 0xee, 0x35, 0x7a, 0x6d, 0xff,
+    0x9b, 0xbe, 0xad, 0xd1, 0x2c, 0xea, 0x13, 0xa7, 0x3a, 0xad, 0xa0, 0x4c, 0xe5, 0xa6, 0x65, 0xca, 0x34, 0xce, 0xbf,
+    0xb6, 0xdc, 0x8a, 0x06, 0x7f, 0x9e, 0x41, 0x7e, 0x69, 0x03, 0x49, 0x2b, 0x28, 0xa0, 0x26, 0xe0, 0x95, 0xba, 0x55,
+    0xb0, 0x27, 0x4f, 0x0e, 0x17, 0x8a, 0xc2, 0xba, 0xbe, 0x8c, 0xf1, 0xa4, 0x0a, 0x07, 0x68, 0xb2, 0xec, 0x4b, 0x16,
+    0x93, 0xa3, 0xb9, 0x65, 0x9b, 0xe4, 0xd7, 0xc4, 0x01, 0x86, 0x07, 0xfc, 0xef, 0xb5, 0xcc, 0x4e, 0xb1, 0xc0, 0x7e,
+    0xbf, 0xf9, 0x1c, 0xc4, 0xfb, 0x77, 0x25, 0x90, 0xfc, 0x58, 0x89, 0x2f, 0xe0, 0x06, 0x8c, 0x44, 0xc2, 0x9e, 0xba,
+    0x0c, 0xc0, 0x74, 0x00, 0x18, 0x89, 0x43, 0x96, 0x45, 0x88, 0xf5, 0x75, 0x7e, 0xbc, 0x36, 0xb0, 0x83, 0x79, 0xe2,
+    0x8e, 0x7c, 0x9c, 0x67, 0x90, 0x4a, 0x07, 0x00, 0x00, 0x00, 0xe9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0xf0, 0x59, 0x4e, 0x1f, 0x71, 0x5b, 0x3b, 0xa2, 0x47, 0xa7, 0x62, 0xa0, 0x50, 0x28, 0x0a, 0x42, 0x47,
+    0x87, 0xfe, 0x5d, 0x41, 0xc8, 0xbf, 0xe9, 0x4b, 0x23, 0xeb, 0x7c, 0x94, 0xdf, 0x45, 0xe0, 0x58, 0x9c, 0x01, 0x74,
+    0xb9, 0xbc, 0xc9, 0xe8, 0xfd, 0x26, 0x13, 0x8b, 0x1c, 0xc8, 0xc3, 0x06, 0xa4, 0xac, 0xb4, 0x49, 0x06, 0x01, 0x00,
+    0x29};
 
 // kBinKmlMultiGeometryV9MM contains the track with two lines in geometry
 std::vector<uint8_t> const kBinKmlMultiGeometryV9MM = {
-  0x09, 0x26, 0x41, 0x3a, 0x33, 0x39, 0x37, 0x33, 0x65, 0x66, 0x34, 0x64, 0x2d, 0x66, 0x35, 0x31,
-  0x65, 0x2d, 0x34, 0x61, 0x37, 0x31, 0x2d, 0x38, 0x65, 0x64, 0x34, 0x2d, 0x64, 0x65, 0x61, 0x33,
-  0x63, 0x31, 0x39, 0x30, 0x64, 0x61, 0x63, 0x35, 0x00, 0x1e, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0xa2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x01, 0x00, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0xfc, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-  0xd3, 0xd0, 0xc3, 0x90, 0x95, 0x32, 0x00, 0x00, 0x09, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02,
-  0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x13, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xb3, 0xe6, 0xcc, 0x19, 0x00, 0xff, 0xc7, 0x6e,
-  0x00, 0x00, 0x02, 0x03, 0x84, 0x92, 0xe7, 0x90, 0x04, 0xe2, 0x85, 0x84, 0x9f, 0x05, 0xf5, 0x02,
-  0xad, 0x05, 0xa3, 0x01, 0x85, 0x02, 0xff, 0xff, 0x03, 0x00, 0x00, 0x03, 0xa0, 0x8a, 0xe9, 0x90,
-  0x04, 0xdc, 0x89, 0x87, 0x9f, 0x05, 0x0c, 0xe9, 0x02, 0x9b, 0x02, 0x09, 0xff, 0xff, 0x03, 0x00,
-  0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00,
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x0b, 0x11, 0x06, 0x1d, 0x00, 0x04, 0x01, 0x01, 0x05, 0x0b,
-  0x02, 0x04, 0x6d, 0x03, 0x05, 0x3c, 0x04, 0x06, 0x03, 0x05, 0x04, 0x10, 0x06, 0x04, 0x71, 0x07,
-  0x05, 0x66, 0x08, 0x04, 0x75, 0x09, 0x05, 0x0f, 0x0a, 0x05, 0x73, 0x0b, 0x05, 0x57, 0x0c, 0x05,
-  0x06, 0x0d, 0x05, 0x32, 0x0e, 0x05, 0x77, 0x0f, 0x05, 0x6c, 0x11, 0x05, 0x0d, 0x13, 0x05, 0x4e,
-  0x14, 0x06, 0x05, 0x17, 0x05, 0x69, 0x19, 0x05, 0x2f, 0x1a, 0x05, 0x74, 0x1b, 0x05, 0x5d, 0x1c,
-  0x05, 0x08, 0x1d, 0x05, 0x37, 0x1e, 0x05, 0x79, 0x1f, 0x05, 0x6e, 0x24, 0x06, 0x04, 0x34, 0x06,
-  0x0a, 0x28, 0xfe, 0xa0, 0xf5, 0xf6, 0xc1, 0xf4, 0xbb, 0x38, 0xe8, 0x29, 0x99, 0xe0, 0x0b, 0xa4,
-  0x4a, 0x99, 0x03, 0xce, 0x28, 0x46, 0x46, 0xc0, 0x90, 0x36, 0x01, 0x00, 0x04
-};
+    0x09, 0x26, 0x41, 0x3a, 0x33, 0x39, 0x37, 0x33, 0x65, 0x66, 0x34, 0x64, 0x2d, 0x66, 0x35, 0x31, 0x65, 0x2d, 0x34,
+    0x61, 0x37, 0x31, 0x2d, 0x38, 0x65, 0x64, 0x34, 0x2d, 0x64, 0x65, 0x61, 0x33, 0x63, 0x31, 0x39, 0x30, 0x64, 0x61,
+    0x63, 0x35, 0x00, 0x1e, 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x52, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xa2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23, 0x01,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0xd3, 0xd0, 0xc3, 0x90, 0x95, 0x32, 0x00, 0x00, 0x09, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x02, 0x01, 0x00,
+    0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x13, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x01, 0xb3, 0xe6, 0xcc, 0x19, 0x00, 0xff, 0xc7, 0x6e, 0x00, 0x00, 0x02, 0x03, 0x84, 0x92, 0xe7, 0x90,
+    0x04, 0xe2, 0x85, 0x84, 0x9f, 0x05, 0xf5, 0x02, 0xad, 0x05, 0xa3, 0x01, 0x85, 0x02, 0xff, 0xff, 0x03, 0x00, 0x00,
+    0x03, 0xa0, 0x8a, 0xe9, 0x90, 0x04, 0xdc, 0x89, 0x87, 0x9f, 0x05, 0x0c, 0xe9, 0x02, 0x9b, 0x02, 0x09, 0xff, 0xff,
+    0x03, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x7e, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x0c, 0x0b, 0x11, 0x06, 0x1d, 0x00, 0x04, 0x01, 0x01, 0x05, 0x0b, 0x02, 0x04, 0x6d, 0x03,
+    0x05, 0x3c, 0x04, 0x06, 0x03, 0x05, 0x04, 0x10, 0x06, 0x04, 0x71, 0x07, 0x05, 0x66, 0x08, 0x04, 0x75, 0x09, 0x05,
+    0x0f, 0x0a, 0x05, 0x73, 0x0b, 0x05, 0x57, 0x0c, 0x05, 0x06, 0x0d, 0x05, 0x32, 0x0e, 0x05, 0x77, 0x0f, 0x05, 0x6c,
+    0x11, 0x05, 0x0d, 0x13, 0x05, 0x4e, 0x14, 0x06, 0x05, 0x17, 0x05, 0x69, 0x19, 0x05, 0x2f, 0x1a, 0x05, 0x74, 0x1b,
+    0x05, 0x5d, 0x1c, 0x05, 0x08, 0x1d, 0x05, 0x37, 0x1e, 0x05, 0x79, 0x1f, 0x05, 0x6e, 0x24, 0x06, 0x04, 0x34, 0x06,
+    0x0a, 0x28, 0xfe, 0xa0, 0xf5, 0xf6, 0xc1, 0xf4, 0xbb, 0x38, 0xe8, 0x29, 0x99, 0xe0, 0x0b, 0xa4, 0x4a, 0x99, 0x03,
+    0xce, 0x28, 0x46, 0x46, 0xc0, 0x90, 0x36, 0x01, 0x00, 0x04};
diff --git a/libs/kml/kml_to_kmb/kml_to_kmb.cpp b/libs/kml/kml_to_kmb/kml_to_kmb.cpp
index 241c64d3e..1e0f6437d 100644
--- a/libs/kml/kml_to_kmb/kml_to_kmb.cpp
+++ b/libs/kml/kml_to_kmb/kml_to_kmb.cpp
@@ -9,8 +9,7 @@
 
 #include <iostream>
 
-
-int main(int argc, char** argv)
+int main(int argc, char ** argv)
 {
   if (argc < 2)
   {
diff --git a/libs/kml/minzoom_quadtree.hpp b/libs/kml/minzoom_quadtree.hpp
index 36715bc59..ae673aa34 100644
--- a/libs/kml/minzoom_quadtree.hpp
+++ b/libs/kml/minzoom_quadtree.hpp
@@ -34,7 +34,10 @@ public:
   MinZoomQuadtree(Less const & less) : m_less{less} {}
 
   template <typename V>
-  void Add(m2::PointD const & point, V && value) { m_quadtree.emplace_back(point, std::forward<V>(value)); }
+  void Add(m2::PointD const & point, V && value)
+  {
+    m_quadtree.emplace_back(point, std::forward<V>(value));
+  }
 
   void Clear() { m_quadtree.clear(); }
 
@@ -57,8 +60,7 @@ public:
 
     // `spacing` is an characteristic interval between values on the map as if they spaced
     // uniformly across the map providing required density (i.e. "count per tile area").
-    double spacing = std::min(mercator::Bounds::kRangeX / bbox.SizeX(),
-                              mercator::Bounds::kRangeY / bbox.SizeY());
+    double spacing = std::min(mercator::Bounds::kRangeX / bbox.SizeX(), mercator::Bounds::kRangeY / bbox.SizeY());
     spacing /= std::sqrt(countPerTile);
 
     // `spacing` value decomposed into a normalized fraction and an integral power of two.
@@ -72,10 +74,8 @@ public:
 
     auto const setMaxZoom = [&](auto const treeBeg, auto const treeEnd)
     {
-      auto const topRanked = std::max_element(treeBeg, treeEnd, [&](auto const & lhs, auto const & rhs)
-      {
-        return m_less(lhs.m_value, rhs.m_value);
-      });
+      auto const topRanked = std::max_element(
+          treeBeg, treeEnd, [&](auto const & lhs, auto const & rhs) { return m_less(lhs.m_value, rhs.m_value); });
       auto const setMaxZoom = [&](auto & elem) { setMinZoom(elem.m_value, maxZoom); };
       std::for_each(treeBeg, topRanked, setMaxZoom);
       std::for_each(std::next(topRanked), treeEnd, setMaxZoom);
@@ -106,8 +106,7 @@ public:
 
     int constexpr depthMax = std::numeric_limits<uint32_t>::digits;
     uint64_t constexpr firstLevelMask = uint64_t{0b11} << ((depthMax - 1) * 2);
-    auto const traverse = [&](auto const & traverse, auto const treeBeg, auto const treeEnd,
-                              int depth) -> Element *
+    auto const traverse = [&](auto const & traverse, auto const treeBeg, auto const treeEnd, int depth) -> Element *
     {
       if (treeBeg == treeEnd)
         return nullptr;
@@ -123,9 +122,7 @@ public:
       uint64_t const quadIncrement = treeLevelMask & (treeLevelMask >> 1);
       uint64_t quadIndex = 0;
       auto const quadMaskEqual = [&](auto const & elem) -> bool
-      {
-        return (elem.m_zCurveCoord & treeLevelMask) == quadIndex;
-      };
+      { return (elem.m_zCurveCoord & treeLevelMask) == quadIndex; };
       auto quadBeg = treeBeg;
       for (int quadrant = 0; quadrant < 4; ++quadrant)
       {
@@ -157,9 +154,8 @@ private:
   struct Element
   {
     template <typename V>
-    Element(m2::PointD const & point, V && value)
-      : m_point{point}
-      , m_value{std::forward<V>(value)}
+    Element(m2::PointD const & point, V && value) : m_point{point}
+                                                  , m_value{std::forward<V>(value)}
     {}
 
     bool operator<(Element const & rhs) const { return m_zCurveCoord < rhs.m_zCurveCoord; }
diff --git a/libs/kml/pykmlib/bindings.cpp b/libs/kml/pykmlib/bindings.cpp
index 167abca30..008017994 100644
--- a/libs/kml/pykmlib/bindings.cpp
+++ b/libs/kml/pykmlib/bindings.cpp
@@ -31,8 +31,8 @@
 #endif
 
 #include "pyhelpers/module_version.hpp"
-#include "pyhelpers/vector_uint8.hpp"
 #include "pyhelpers/vector_list_conversion.hpp"
+#include "pyhelpers/vector_uint8.hpp"
 
 #include <boost/python.hpp>
 #include <boost/python/args.hpp>
@@ -116,7 +116,7 @@ struct LocalizableStringAdapter
     out << "[";
     for (auto it = str.begin(); it != str.end(); ++it)
     {
-      out << "'"<< StringUtf8Multilang::GetLangByCode(it->first) << "':'" << it->second << "'";
+      out << "'" << StringUtf8Multilang::GetLangByCode(it->first) << "':'" << it->second << "'";
       auto it2 = it;
       it2++;
       if (it2 != str.end())
@@ -131,20 +131,14 @@ std::string LatLonToString(ms::LatLon const & latLon);
 
 struct PointWithAltitudeAdapter
 {
-  static m2::PointD const & GetPoint(geometry::PointWithAltitude const & ptWithAlt)
-  {
-    return ptWithAlt.GetPoint();
-  }
+  static m2::PointD const & GetPoint(geometry::PointWithAltitude const & ptWithAlt) { return ptWithAlt.GetPoint(); }
 
   static geometry::Altitude GetAltitude(geometry::PointWithAltitude const & ptWithAlt)
   {
     return ptWithAlt.GetAltitude();
   }
 
-  static void SetPoint(geometry::PointWithAltitude & ptWithAlt, m2::PointD const & pt)
-  {
-    ptWithAlt.SetPoint(pt);
-  }
+  static void SetPoint(geometry::PointWithAltitude & ptWithAlt, m2::PointD const & pt) { ptWithAlt.SetPoint(pt); }
 
   static void SetAltitude(geometry::PointWithAltitude & ptWithAlt, geometry::Altitude altitude)
   {
@@ -157,8 +151,7 @@ struct PointWithAltitudeAdapter
     std::ostringstream out;
     out << "["
         << "point:" << LatLonToString(latLon) << ", "
-        << "altitude:" << ptWithAlt.GetAltitude()
-        << "]";
+        << "altitude:" << ptWithAlt.GetAltitude() << "]";
     return out.str();
   }
 };
@@ -173,10 +166,7 @@ struct PropertiesAdapter
     throw std::runtime_error("Property not found. key: " + key);
   }
 
-  static void Set(Properties & props, std::string const & key, std::string const & val)
-  {
-    props[key] = val;
-  }
+  static void Set(Properties & props, std::string const & key, std::string const & val) { props[key] = val; }
 
   static void Delete(Properties & props, std::string const & key)
   {
@@ -212,7 +202,7 @@ struct PropertiesAdapter
     out << "[";
     for (auto it = props.begin(); it != props.end(); ++it)
     {
-      out << "'"<< it->first << "':'" << it->second << "'";
+      out << "'" << it->first << "':'" << it->second << "'";
       auto it2 = it;
       it2++;
       if (it2 != props.end())
@@ -226,10 +216,7 @@ struct PropertiesAdapter
 template <typename T>
 struct VectorAdapter
 {
-  static boost::python::list Get(std::vector<T> const & v)
-  {
-    return pyhelpers::StdVectorToPythonList(v);
-  }
+  static boost::python::list Get(std::vector<T> const & v) { return pyhelpers::StdVectorToPythonList(v); }
 
   static void Set(std::vector<T> & v, boost::python::object const & iterable)
   {
@@ -241,10 +228,7 @@ struct VectorAdapter
     v = pyhelpers::PythonListToStdVector<T>(iterable);
   }
 
-  static void PrintType(std::ostringstream & out, T const & t)
-  {
-    out << t;
-  }
+  static void PrintType(std::ostringstream & out, T const & t) { out << t; }
 
   static std::string ToString(std::vector<T> const & v)
   {
@@ -261,26 +245,26 @@ struct VectorAdapter
   }
 };
 
-template<>
+template <>
 void VectorAdapter<uint8_t>::PrintType(std::ostringstream & out, uint8_t const & t)
 {
   out << static_cast<uint32_t>(t);
 }
 
-template<>
+template <>
 void VectorAdapter<std::string>::PrintType(std::ostringstream & out, std::string const & s)
 {
   out << "'" << s << "'";
 }
 
 std::string TrackLayerToString(TrackLayer const & trackLayer);
-template<>
+template <>
 void VectorAdapter<TrackLayer>::PrintType(std::ostringstream & out, TrackLayer const & t)
 {
   out << TrackLayerToString(t);
 }
 
-template<>
+template <>
 void VectorAdapter<geometry::PointWithAltitude>::PrintType(std::ostringstream & out,
                                                            geometry::PointWithAltitude const & pt)
 {
@@ -288,21 +272,21 @@ void VectorAdapter<geometry::PointWithAltitude>::PrintType(std::ostringstream &
 }
 
 std::string BookmarkDataToString(BookmarkData const & bm);
-template<>
+template <>
 void VectorAdapter<BookmarkData>::PrintType(std::ostringstream & out, BookmarkData const & bm)
 {
   out << BookmarkDataToString(bm);
 }
 
 std::string TrackDataToString(TrackData const & t);
-template<>
+template <>
 void VectorAdapter<TrackData>::PrintType(std::ostringstream & out, TrackData const & t)
 {
   out << TrackDataToString(t);
 }
 
 std::string CategoryDataToString(CategoryData const & c);
-template<>
+template <>
 void VectorAdapter<CategoryData>::PrintType(std::ostringstream & out, CategoryData const & c)
 {
   out << CategoryDataToString(c);
@@ -386,9 +370,7 @@ std::string ColorDataToString(ColorData const & c)
 {
   std::ostringstream out;
   out << "["
-      << "predefined_color:"
-      << PredefinedColorToString(c.m_predefinedColor)
-      << ", "
+      << "predefined_color:" << PredefinedColorToString(c.m_predefinedColor) << ", "
       << "rgba:" << c.m_rgba << "]";
   return out.str();
 }
@@ -398,8 +380,7 @@ std::string LatLonToString(ms::LatLon const & latLon)
   std::ostringstream out;
   out << "["
       << "lat:" << latLon.m_lat << ", "
-      << "lon:" << latLon.m_lon
-      << "]";
+      << "lon:" << latLon.m_lon << "]";
   return out.str();
 }
 
@@ -432,8 +413,7 @@ std::string BookmarkDataToString(BookmarkData const & bm)
       << "visible:" << (bm.m_visible ? "True" : "False") << ", "
       << "nearest_toponym:'" << bm.m_nearestToponym << "', "
       << "compilations:" << VectorAdapter<uint64_t>::ToString(bm.m_compilations) << ", "
-      << "properties:" << PropertiesAdapter::ToString(bm.m_properties)
-      << "]";
+      << "properties:" << PropertiesAdapter::ToString(bm.m_properties) << "]";
   return out.str();
 }
 
@@ -442,8 +422,7 @@ std::string TrackLayerToString(TrackLayer const & trackLayer)
   std::ostringstream out;
   out << "["
       << "line_width:" << trackLayer.m_lineWidth << ", "
-      << "color:" << ColorDataToString(trackLayer.m_color)
-      << "]";
+      << "color:" << ColorDataToString(trackLayer.m_color) << "]";
   return out.str();
 }
 
@@ -456,12 +435,11 @@ std::string TrackDataToString(TrackData const & t)
       << "description:" << LocalizableStringAdapter::ToString(t.m_description) << ", "
       << "timestamp:" << DebugPrint(t.m_timestamp) << ", "
       << "layers:" << VectorAdapter<TrackLayer>::ToString(t.m_layers) << ", "
-      << "points_with_altitudes:"
-      << VectorAdapter<geometry::PointWithAltitude>::ToString(t.m_pointsWithAltitudes) << ", "
+      << "points_with_altitudes:" << VectorAdapter<geometry::PointWithAltitude>::ToString(t.m_pointsWithAltitudes)
+      << ", "
       << "visible:" << (t.m_visible ? "True" : "False") << ", "
       << "nearest_toponyms:" << VectorAdapter<std::string>::ToString(t.m_nearestToponyms) << ", "
-      << "properties:" << PropertiesAdapter::ToString(t.m_properties)
-      << "]";
+      << "properties:" << PropertiesAdapter::ToString(t.m_properties) << "]";
   return out.str();
 }
 
@@ -499,8 +477,7 @@ std::string CategoryDataToString(CategoryData const & c)
       << "tags:" << VectorAdapter<std::string>::ToString(c.m_tags) << ", "
       << "toponyms:" << VectorAdapter<std::string>::ToString(c.m_toponyms) << ", "
       << "languages:" << LanguagesListToString(c.m_languageCodes) << ", "
-      << "properties:" << PropertiesAdapter::ToString(c.m_properties)
-      << "]";
+      << "properties:" << PropertiesAdapter::ToString(c.m_properties) << "]";
   return out.str();
 }
 
@@ -512,17 +489,13 @@ std::string FileDataToString(FileData const & fd)
       << "category:" << CategoryDataToString(fd.m_categoryData) << ", "
       << "bookmarks:" << VectorAdapter<BookmarkData>::ToString(fd.m_bookmarksData) << ", "
       << "tracks:" << VectorAdapter<TrackData>::ToString(fd.m_tracksData) << ", "
-      << "compilations:" << VectorAdapter<CategoryData>::ToString(fd.m_compilationsData)
-      << "]";
+      << "compilations:" << VectorAdapter<CategoryData>::ToString(fd.m_compilationsData) << "]";
   return out.str();
 }
 
 struct TimestampConverter
 {
-  TimestampConverter()
-  {
-    converter::registry::push_back(&convertible, &construct, type_id<Timestamp>());
-  }
+  TimestampConverter() { converter::registry::push_back(&convertible, &construct, type_id<Timestamp>()); }
 
   static void * convertible(PyObject * objPtr)
   {
@@ -535,8 +508,7 @@ struct TimestampConverter
   static void construct(PyObject * objPtr, converter::rvalue_from_python_stage1_data * data)
   {
     auto const ts = FromSecondsSinceEpoch(extract<uint64_t>(objPtr));
-    void * storage =
-      reinterpret_cast<converter::rvalue_from_python_storage<Timestamp> *>(data)->storage.bytes;
+    void * storage = reinterpret_cast<converter::rvalue_from_python_storage<Timestamp> *>(data)->storage.bytes;
     new (storage) Timestamp(ts);
     data->convertible = storage;
   }
@@ -544,10 +516,7 @@ struct TimestampConverter
 
 struct LatLonConverter
 {
-  LatLonConverter()
-  {
-    converter::registry::push_back(&convertible, &construct, type_id<m2::PointD>());
-  }
+  LatLonConverter() { converter::registry::push_back(&convertible, &construct, type_id<m2::PointD>()); }
 
   static void * convertible(PyObject * objPtr)
   {
@@ -561,8 +530,7 @@ struct LatLonConverter
   {
     ms::LatLon latLon = extract<ms::LatLon>(objPtr);
     m2::PointD pt(mercator::LonToX(latLon.m_lon), mercator::LatToY(latLon.m_lat));
-    void * storage =
-      reinterpret_cast<converter::rvalue_from_python_storage<m2::PointD> *>(data)->storage.bytes;
+    void * storage = reinterpret_cast<converter::rvalue_from_python_storage<m2::PointD> *>(data)->storage.bytes;
     new (storage) m2::PointD(pt);
     data->convertible = storage;
   }
@@ -654,8 +622,7 @@ FileData ImportKml(std::string const & str)
   return data;
 }
 
-void LoadClassificatorTypes(std::string const & classificatorFileStr,
-                            std::string const & typesFileStr)
+void LoadClassificatorTypes(std::string const & classificatorFileStr, std::string const & typesFileStr)
 {
   classificator::LoadTypes(classificatorFileStr, typesFileStr);
 }
@@ -708,253 +675,252 @@ BOOST_PYTHON_MODULE(pykmlib)
   LatLonConverter();
 
   enum_<PredefinedColor>("PredefinedColor")
-    .value(PredefinedColorToString(PredefinedColor::None).c_str(), PredefinedColor::None)
-    .value(PredefinedColorToString(PredefinedColor::Red).c_str(), PredefinedColor::Red)
-    .value(PredefinedColorToString(PredefinedColor::Blue).c_str(), PredefinedColor::Blue)
-    .value(PredefinedColorToString(PredefinedColor::Purple).c_str(), PredefinedColor::Purple)
-    .value(PredefinedColorToString(PredefinedColor::Yellow).c_str(), PredefinedColor::Yellow)
-    .value(PredefinedColorToString(PredefinedColor::Pink).c_str(), PredefinedColor::Pink)
-    .value(PredefinedColorToString(PredefinedColor::Brown).c_str(), PredefinedColor::Brown)
-    .value(PredefinedColorToString(PredefinedColor::Green).c_str(), PredefinedColor::Green)
-    .value(PredefinedColorToString(PredefinedColor::Orange).c_str(), PredefinedColor::Orange)
-    .value(PredefinedColorToString(PredefinedColor::DeepPurple).c_str(), PredefinedColor::DeepPurple)
-    .value(PredefinedColorToString(PredefinedColor::LightBlue).c_str(), PredefinedColor::LightBlue)
-    .value(PredefinedColorToString(PredefinedColor::Cyan).c_str(), PredefinedColor::Cyan)
-    .value(PredefinedColorToString(PredefinedColor::Teal).c_str(), PredefinedColor::Teal)
-    .value(PredefinedColorToString(PredefinedColor::Lime).c_str(), PredefinedColor::Lime)
-    .value(PredefinedColorToString(PredefinedColor::DeepOrange).c_str(), PredefinedColor::DeepOrange)
-    .value(PredefinedColorToString(PredefinedColor::Gray).c_str(), PredefinedColor::Gray)
-    .value(PredefinedColorToString(PredefinedColor::BlueGray).c_str(), PredefinedColor::BlueGray)
-    .export_values();
+      .value(PredefinedColorToString(PredefinedColor::None).c_str(), PredefinedColor::None)
+      .value(PredefinedColorToString(PredefinedColor::Red).c_str(), PredefinedColor::Red)
+      .value(PredefinedColorToString(PredefinedColor::Blue).c_str(), PredefinedColor::Blue)
+      .value(PredefinedColorToString(PredefinedColor::Purple).c_str(), PredefinedColor::Purple)
+      .value(PredefinedColorToString(PredefinedColor::Yellow).c_str(), PredefinedColor::Yellow)
+      .value(PredefinedColorToString(PredefinedColor::Pink).c_str(), PredefinedColor::Pink)
+      .value(PredefinedColorToString(PredefinedColor::Brown).c_str(), PredefinedColor::Brown)
+      .value(PredefinedColorToString(PredefinedColor::Green).c_str(), PredefinedColor::Green)
+      .value(PredefinedColorToString(PredefinedColor::Orange).c_str(), PredefinedColor::Orange)
+      .value(PredefinedColorToString(PredefinedColor::DeepPurple).c_str(), PredefinedColor::DeepPurple)
+      .value(PredefinedColorToString(PredefinedColor::LightBlue).c_str(), PredefinedColor::LightBlue)
+      .value(PredefinedColorToString(PredefinedColor::Cyan).c_str(), PredefinedColor::Cyan)
+      .value(PredefinedColorToString(PredefinedColor::Teal).c_str(), PredefinedColor::Teal)
+      .value(PredefinedColorToString(PredefinedColor::Lime).c_str(), PredefinedColor::Lime)
+      .value(PredefinedColorToString(PredefinedColor::DeepOrange).c_str(), PredefinedColor::DeepOrange)
+      .value(PredefinedColorToString(PredefinedColor::Gray).c_str(), PredefinedColor::Gray)
+      .value(PredefinedColorToString(PredefinedColor::BlueGray).c_str(), PredefinedColor::BlueGray)
+      .export_values();
 
   enum_<AccessRules>("AccessRules")
-    .value(AccessRulesToString(AccessRules::Local).c_str(), AccessRules::Local)
-    .value(AccessRulesToString(AccessRules::DirectLink).c_str(), AccessRules::DirectLink)
-    .value(AccessRulesToString(AccessRules::P2P).c_str(), AccessRules::P2P)
-    .value(AccessRulesToString(AccessRules::Paid).c_str(), AccessRules::Paid)
-    .value(AccessRulesToString(AccessRules::Public).c_str(), AccessRules::Public)
-    .value(AccessRulesToString(AccessRules::AuthorOnly).c_str(), AccessRules::AuthorOnly)
-    .export_values();
+      .value(AccessRulesToString(AccessRules::Local).c_str(), AccessRules::Local)
+      .value(AccessRulesToString(AccessRules::DirectLink).c_str(), AccessRules::DirectLink)
+      .value(AccessRulesToString(AccessRules::P2P).c_str(), AccessRules::P2P)
+      .value(AccessRulesToString(AccessRules::Paid).c_str(), AccessRules::Paid)
+      .value(AccessRulesToString(AccessRules::Public).c_str(), AccessRules::Public)
+      .value(AccessRulesToString(AccessRules::AuthorOnly).c_str(), AccessRules::AuthorOnly)
+      .export_values();
 
   enum_<BookmarkIcon>("BookmarkIcon")
-    .value(BookmarkIconToString(BookmarkIcon::None).c_str(), BookmarkIcon::None)
-    .value(BookmarkIconToString(BookmarkIcon::Hotel).c_str(), BookmarkIcon::Hotel)
-    .value(BookmarkIconToString(BookmarkIcon::Animals).c_str(), BookmarkIcon::Animals)
-    .value(BookmarkIconToString(BookmarkIcon::Buddhism).c_str(), BookmarkIcon::Buddhism)
-    .value(BookmarkIconToString(BookmarkIcon::Building).c_str(), BookmarkIcon::Building)
-    .value(BookmarkIconToString(BookmarkIcon::Christianity).c_str(), BookmarkIcon::Christianity)
-    .value(BookmarkIconToString(BookmarkIcon::Entertainment).c_str(), BookmarkIcon::Entertainment)
-    .value(BookmarkIconToString(BookmarkIcon::Exchange).c_str(), BookmarkIcon::Exchange)
-    .value(BookmarkIconToString(BookmarkIcon::Food).c_str(), BookmarkIcon::Food)
-    .value(BookmarkIconToString(BookmarkIcon::Gas).c_str(), BookmarkIcon::Gas)
-    .value(BookmarkIconToString(BookmarkIcon::Judaism).c_str(), BookmarkIcon::Judaism)
-    .value(BookmarkIconToString(BookmarkIcon::Medicine).c_str(), BookmarkIcon::Medicine)
-    .value(BookmarkIconToString(BookmarkIcon::Mountain).c_str(), BookmarkIcon::Mountain)
-    .value(BookmarkIconToString(BookmarkIcon::Museum).c_str(), BookmarkIcon::Museum)
-    .value(BookmarkIconToString(BookmarkIcon::Islam).c_str(), BookmarkIcon::Islam)
-    .value(BookmarkIconToString(BookmarkIcon::Park).c_str(), BookmarkIcon::Park)
-    .value(BookmarkIconToString(BookmarkIcon::Parking).c_str(), BookmarkIcon::Parking)
-    .value(BookmarkIconToString(BookmarkIcon::Shop).c_str(), BookmarkIcon::Shop)
-    .value(BookmarkIconToString(BookmarkIcon::Sights).c_str(), BookmarkIcon::Sights)
-    .value(BookmarkIconToString(BookmarkIcon::Swim).c_str(), BookmarkIcon::Swim)
-    .value(BookmarkIconToString(BookmarkIcon::Water).c_str(), BookmarkIcon::Water)
-    .value(BookmarkIconToString(BookmarkIcon::Bar).c_str(), BookmarkIcon::Bar)
-    .value(BookmarkIconToString(BookmarkIcon::Transport).c_str(), BookmarkIcon::Transport)
-    .value(BookmarkIconToString(BookmarkIcon::Viewpoint).c_str(), BookmarkIcon::Viewpoint)
-    .value(BookmarkIconToString(BookmarkIcon::Sport).c_str(), BookmarkIcon::Sport)
-    .value(BookmarkIconToString(BookmarkIcon::Start).c_str(), BookmarkIcon::Start)
-    .value(BookmarkIconToString(BookmarkIcon::Finish).c_str(), BookmarkIcon::Finish)
-    .export_values();
+      .value(BookmarkIconToString(BookmarkIcon::None).c_str(), BookmarkIcon::None)
+      .value(BookmarkIconToString(BookmarkIcon::Hotel).c_str(), BookmarkIcon::Hotel)
+      .value(BookmarkIconToString(BookmarkIcon::Animals).c_str(), BookmarkIcon::Animals)
+      .value(BookmarkIconToString(BookmarkIcon::Buddhism).c_str(), BookmarkIcon::Buddhism)
+      .value(BookmarkIconToString(BookmarkIcon::Building).c_str(), BookmarkIcon::Building)
+      .value(BookmarkIconToString(BookmarkIcon::Christianity).c_str(), BookmarkIcon::Christianity)
+      .value(BookmarkIconToString(BookmarkIcon::Entertainment).c_str(), BookmarkIcon::Entertainment)
+      .value(BookmarkIconToString(BookmarkIcon::Exchange).c_str(), BookmarkIcon::Exchange)
+      .value(BookmarkIconToString(BookmarkIcon::Food).c_str(), BookmarkIcon::Food)
+      .value(BookmarkIconToString(BookmarkIcon::Gas).c_str(), BookmarkIcon::Gas)
+      .value(BookmarkIconToString(BookmarkIcon::Judaism).c_str(), BookmarkIcon::Judaism)
+      .value(BookmarkIconToString(BookmarkIcon::Medicine).c_str(), BookmarkIcon::Medicine)
+      .value(BookmarkIconToString(BookmarkIcon::Mountain).c_str(), BookmarkIcon::Mountain)
+      .value(BookmarkIconToString(BookmarkIcon::Museum).c_str(), BookmarkIcon::Museum)
+      .value(BookmarkIconToString(BookmarkIcon::Islam).c_str(), BookmarkIcon::Islam)
+      .value(BookmarkIconToString(BookmarkIcon::Park).c_str(), BookmarkIcon::Park)
+      .value(BookmarkIconToString(BookmarkIcon::Parking).c_str(), BookmarkIcon::Parking)
+      .value(BookmarkIconToString(BookmarkIcon::Shop).c_str(), BookmarkIcon::Shop)
+      .value(BookmarkIconToString(BookmarkIcon::Sights).c_str(), BookmarkIcon::Sights)
+      .value(BookmarkIconToString(BookmarkIcon::Swim).c_str(), BookmarkIcon::Swim)
+      .value(BookmarkIconToString(BookmarkIcon::Water).c_str(), BookmarkIcon::Water)
+      .value(BookmarkIconToString(BookmarkIcon::Bar).c_str(), BookmarkIcon::Bar)
+      .value(BookmarkIconToString(BookmarkIcon::Transport).c_str(), BookmarkIcon::Transport)
+      .value(BookmarkIconToString(BookmarkIcon::Viewpoint).c_str(), BookmarkIcon::Viewpoint)
+      .value(BookmarkIconToString(BookmarkIcon::Sport).c_str(), BookmarkIcon::Sport)
+      .value(BookmarkIconToString(BookmarkIcon::Start).c_str(), BookmarkIcon::Start)
+      .value(BookmarkIconToString(BookmarkIcon::Finish).c_str(), BookmarkIcon::Finish)
+      .export_values();
 
   enum_<CompilationType>("CompilationType")
-    .value(CompilationTypeToString(CompilationType::Category).c_str(), CompilationType::Category)
-    .value(CompilationTypeToString(CompilationType::Collection).c_str(), CompilationType::Collection)
-    .value(CompilationTypeToString(CompilationType::Day).c_str(), CompilationType::Day)
-    .export_values();
+      .value(CompilationTypeToString(CompilationType::Category).c_str(), CompilationType::Category)
+      .value(CompilationTypeToString(CompilationType::Collection).c_str(), CompilationType::Collection)
+      .value(CompilationTypeToString(CompilationType::Day).c_str(), CompilationType::Day)
+      .export_values();
 
   class_<ColorData>("ColorData")
-    .def_readwrite("predefined_color", &ColorData::m_predefinedColor)
-    .def_readwrite("rgba", &ColorData::m_rgba)
-    .def("__eq__", &ColorData::operator==)
-    .def("__ne__", &ColorData::operator!=)
-    .def("__str__", &ColorDataToString);
+      .def_readwrite("predefined_color", &ColorData::m_predefinedColor)
+      .def_readwrite("rgba", &ColorData::m_rgba)
+      .def("__eq__", &ColorData::operator==)
+      .def("__ne__", &ColorData::operator!=)
+      .def("__str__", &ColorDataToString);
 
   class_<LocalizableString>("LocalizableString")
-    .def("__len__", &LocalizableString::size)
-    .def("clear", &LocalizableString::clear)
-    .def("__getitem__", &LocalizableStringAdapter::Get, return_value_policy<copy_const_reference>())
-    .def("__setitem__", &LocalizableStringAdapter::Set, with_custodian_and_ward<1,2>())
-    .def("__delitem__", &LocalizableStringAdapter::Delete)
-    .def("get_dict", &LocalizableStringAdapter::GetDict)
-    .def("set_dict", &LocalizableStringAdapter::SetDict)
-    .def("__str__", &LocalizableStringAdapter::ToString);
+      .def("__len__", &LocalizableString::size)
+      .def("clear", &LocalizableString::clear)
+      .def("__getitem__", &LocalizableStringAdapter::Get, return_value_policy<copy_const_reference>())
+      .def("__setitem__", &LocalizableStringAdapter::Set, with_custodian_and_ward<1, 2>())
+      .def("__delitem__", &LocalizableStringAdapter::Delete)
+      .def("get_dict", &LocalizableStringAdapter::GetDict)
+      .def("set_dict", &LocalizableStringAdapter::SetDict)
+      .def("__str__", &LocalizableStringAdapter::ToString);
 
   class_<std::vector<std::string>>("StringList")
-    .def(vector_indexing_suite<std::vector<std::string>>())
-    .def("get_list", &VectorAdapter<std::string>::Get)
-    .def("set_list", &VectorAdapter<std::string>::Set)
-    .def("__str__", &VectorAdapter<std::string>::ToString);
+      .def(vector_indexing_suite<std::vector<std::string>>())
+      .def("get_list", &VectorAdapter<std::string>::Get)
+      .def("set_list", &VectorAdapter<std::string>::Set)
+      .def("__str__", &VectorAdapter<std::string>::ToString);
 
   class_<std::vector<uint64_t>>("Uint64List")
-    .def(vector_indexing_suite<std::vector<uint64_t>>())
-    .def("get_list", &VectorAdapter<uint64_t>::Get)
-    .def("set_list", &VectorAdapter<uint64_t>::Set)
-    .def("__str__", &VectorAdapter<uint64_t>::ToString);
+      .def(vector_indexing_suite<std::vector<uint64_t>>())
+      .def("get_list", &VectorAdapter<uint64_t>::Get)
+      .def("set_list", &VectorAdapter<uint64_t>::Set)
+      .def("__str__", &VectorAdapter<uint64_t>::ToString);
 
   class_<std::vector<uint32_t>>("Uint32List")
-    .def(vector_indexing_suite<std::vector<uint32_t>>())
-    .def("get_list", &VectorAdapter<uint32_t>::Get)
-    .def("set_list", &VectorAdapter<uint32_t>::Set)
-    .def("__str__", &VectorAdapter<uint32_t>::ToString);
+      .def(vector_indexing_suite<std::vector<uint32_t>>())
+      .def("get_list", &VectorAdapter<uint32_t>::Get)
+      .def("set_list", &VectorAdapter<uint32_t>::Set)
+      .def("__str__", &VectorAdapter<uint32_t>::ToString);
 
   class_<std::vector<uint8_t>>("Uint8List")
-    .def(vector_indexing_suite<std::vector<uint8_t>>())
-    .def("get_list", &VectorAdapter<uint8_t>::Get)
-    .def("set_list", &VectorAdapter<uint8_t>::Set)
-    .def("__str__", &VectorAdapter<uint8_t>::ToString);
+      .def(vector_indexing_suite<std::vector<uint8_t>>())
+      .def("get_list", &VectorAdapter<uint8_t>::Get)
+      .def("set_list", &VectorAdapter<uint8_t>::Set)
+      .def("__str__", &VectorAdapter<uint8_t>::ToString);
 
   class_<ms::LatLon>("LatLon", init<double, double>())
-    .def_readwrite("lat", &ms::LatLon::m_lat)
-    .def_readwrite("lon", &ms::LatLon::m_lon)
-    .def("__str__", &LatLonToString);
+      .def_readwrite("lat", &ms::LatLon::m_lat)
+      .def_readwrite("lon", &ms::LatLon::m_lon)
+      .def("__str__", &LatLonToString);
 
   class_<geometry::PointWithAltitude>("PointWithAltitude")
-    .def("get_point", &PointWithAltitudeAdapter::GetPoint, return_value_policy<copy_const_reference>())
-    .def("set_point", &PointWithAltitudeAdapter::SetPoint)
-    .def("get_altitude", &PointWithAltitudeAdapter::GetAltitude)
-    .def("set_altitude", &PointWithAltitudeAdapter::SetAltitude)
-    .def("__str__", &PointWithAltitudeAdapter::ToString);
+      .def("get_point", &PointWithAltitudeAdapter::GetPoint, return_value_policy<copy_const_reference>())
+      .def("set_point", &PointWithAltitudeAdapter::SetPoint)
+      .def("get_altitude", &PointWithAltitudeAdapter::GetAltitude)
+      .def("set_altitude", &PointWithAltitudeAdapter::SetAltitude)
+      .def("__str__", &PointWithAltitudeAdapter::ToString);
 
   class_<m2::PointD>("PointD");
 
   class_<Timestamp>("Timestamp");
 
   class_<Properties>("Properties")
-    .def("__len__", &Properties::size)
-    .def("clear", &Properties::clear)
-    .def("__getitem__", &PropertiesAdapter::Get, return_value_policy<copy_const_reference>())
-    .def("__setitem__", &PropertiesAdapter::Set, with_custodian_and_ward<1,2>())
-    .def("__delitem__", &PropertiesAdapter::Delete)
-    .def("get_dict", &PropertiesAdapter::GetDict)
-    .def("set_dict", &PropertiesAdapter::SetDict)
-    .def("__str__", &PropertiesAdapter::ToString);
+      .def("__len__", &Properties::size)
+      .def("clear", &Properties::clear)
+      .def("__getitem__", &PropertiesAdapter::Get, return_value_policy<copy_const_reference>())
+      .def("__setitem__", &PropertiesAdapter::Set, with_custodian_and_ward<1, 2>())
+      .def("__delitem__", &PropertiesAdapter::Delete)
+      .def("get_dict", &PropertiesAdapter::GetDict)
+      .def("set_dict", &PropertiesAdapter::SetDict)
+      .def("__str__", &PropertiesAdapter::ToString);
 
   class_<BookmarkData>("BookmarkData")
-    .def_readwrite("name", &BookmarkData::m_name)
-    .def_readwrite("description", &BookmarkData::m_description)
-    .def_readwrite("feature_types", &BookmarkData::m_featureTypes)
-    .def_readwrite("custom_name", &BookmarkData::m_customName)
-    .def_readwrite("color", &BookmarkData::m_color)
-    .def_readwrite("icon", &BookmarkData::m_icon)
-    .def_readwrite("viewport_scale", &BookmarkData::m_viewportScale)
-    .def_readwrite("timestamp", &BookmarkData::m_timestamp)
-    .def_readwrite("point", &BookmarkData::m_point)
-    .def_readwrite("bound_tracks", &BookmarkData::m_boundTracks)
-    .def_readwrite("visible", &BookmarkData::m_visible)
-    .def_readwrite("nearest_toponym", &BookmarkData::m_nearestToponym)
-    .def_readwrite("compilations", &BookmarkData::m_compilations)
-    .def_readwrite("properties", &BookmarkData::m_properties)
-    .def("__eq__", &BookmarkData::operator==)
-    .def("__ne__", &BookmarkData::operator!=)
-    .def("__str__", &BookmarkDataToString);
+      .def_readwrite("name", &BookmarkData::m_name)
+      .def_readwrite("description", &BookmarkData::m_description)
+      .def_readwrite("feature_types", &BookmarkData::m_featureTypes)
+      .def_readwrite("custom_name", &BookmarkData::m_customName)
+      .def_readwrite("color", &BookmarkData::m_color)
+      .def_readwrite("icon", &BookmarkData::m_icon)
+      .def_readwrite("viewport_scale", &BookmarkData::m_viewportScale)
+      .def_readwrite("timestamp", &BookmarkData::m_timestamp)
+      .def_readwrite("point", &BookmarkData::m_point)
+      .def_readwrite("bound_tracks", &BookmarkData::m_boundTracks)
+      .def_readwrite("visible", &BookmarkData::m_visible)
+      .def_readwrite("nearest_toponym", &BookmarkData::m_nearestToponym)
+      .def_readwrite("compilations", &BookmarkData::m_compilations)
+      .def_readwrite("properties", &BookmarkData::m_properties)
+      .def("__eq__", &BookmarkData::operator==)
+      .def("__ne__", &BookmarkData::operator!=)
+      .def("__str__", &BookmarkDataToString);
 
   class_<TrackLayer>("TrackLayer")
-    .def_readwrite("line_width", &TrackLayer::m_lineWidth)
-    .def_readwrite("color", &TrackLayer::m_color)
-    .def("__eq__", &TrackLayer::operator==)
-    .def("__ne__", &TrackLayer::operator!=)
-    .def("__str__", &TrackLayerToString);
+      .def_readwrite("line_width", &TrackLayer::m_lineWidth)
+      .def_readwrite("color", &TrackLayer::m_color)
+      .def("__eq__", &TrackLayer::operator==)
+      .def("__ne__", &TrackLayer::operator!=)
+      .def("__str__", &TrackLayerToString);
 
   class_<std::vector<TrackLayer>>("TrackLayerList")
-    .def(vector_indexing_suite<std::vector<TrackLayer>>())
-    .def("get_list", &VectorAdapter<TrackLayer>::Get)
-    .def("set_list", &VectorAdapter<TrackLayer>::Set)
-    .def("__str__", &VectorAdapter<TrackLayer>::ToString);
+      .def(vector_indexing_suite<std::vector<TrackLayer>>())
+      .def("get_list", &VectorAdapter<TrackLayer>::Get)
+      .def("set_list", &VectorAdapter<TrackLayer>::Set)
+      .def("__str__", &VectorAdapter<TrackLayer>::ToString);
 
   class_<std::vector<m2::PointD>>("PointDList")
-    .def(vector_indexing_suite<std::vector<m2::PointD>>())
-    .def("get_list", &VectorAdapter<m2::PointD>::Get)
-    .def("set_list", &VectorAdapter<m2::PointD>::Set)
-    .def("__str__", &VectorAdapter<m2::PointD>::ToString);
+      .def(vector_indexing_suite<std::vector<m2::PointD>>())
+      .def("get_list", &VectorAdapter<m2::PointD>::Get)
+      .def("set_list", &VectorAdapter<m2::PointD>::Set)
+      .def("__str__", &VectorAdapter<m2::PointD>::ToString);
 
   class_<std::vector<geometry::PointWithAltitude>>("PointWithAltitudeList")
-    .def(vector_indexing_suite<std::vector<geometry::PointWithAltitude>>())
-    .def("get_list", &VectorAdapter<geometry::PointWithAltitude>::Get)
-    .def("set_list", &VectorAdapter<geometry::PointWithAltitude>::Set)
-    .def("__str__", &VectorAdapter<geometry::PointWithAltitude>::ToString);
+      .def(vector_indexing_suite<std::vector<geometry::PointWithAltitude>>())
+      .def("get_list", &VectorAdapter<geometry::PointWithAltitude>::Get)
+      .def("set_list", &VectorAdapter<geometry::PointWithAltitude>::Set)
+      .def("__str__", &VectorAdapter<geometry::PointWithAltitude>::ToString);
 
-  class_<std::vector<ms::LatLon>>("LatLonList")
-    .def(vector_indexing_suite<std::vector<ms::LatLon>>());
+  class_<std::vector<ms::LatLon>>("LatLonList").def(vector_indexing_suite<std::vector<ms::LatLon>>());
 
   class_<TrackData>("TrackData")
-    .def_readwrite("local_id", &TrackData::m_localId)
-    .def_readwrite("name", &TrackData::m_name)
-    .def_readwrite("description", &TrackData::m_description)
-    .def_readwrite("timestamp", &TrackData::m_timestamp)
-    .def_readwrite("layers", &TrackData::m_layers)
-    .def_readwrite("points_with_altitudes", &TrackData::m_pointsWithAltitudes)
-    .def_readwrite("visible", &TrackData::m_visible)
-    .def_readwrite("nearest_toponyms", &TrackData::m_nearestToponyms)
-    .def_readwrite("properties", &TrackData::m_properties)
-    .def("__eq__", &TrackData::operator==)
-    .def("__ne__", &TrackData::operator!=)
-    .def("__str__", &TrackDataToString);
+      .def_readwrite("local_id", &TrackData::m_localId)
+      .def_readwrite("name", &TrackData::m_name)
+      .def_readwrite("description", &TrackData::m_description)
+      .def_readwrite("timestamp", &TrackData::m_timestamp)
+      .def_readwrite("layers", &TrackData::m_layers)
+      .def_readwrite("points_with_altitudes", &TrackData::m_pointsWithAltitudes)
+      .def_readwrite("visible", &TrackData::m_visible)
+      .def_readwrite("nearest_toponyms", &TrackData::m_nearestToponyms)
+      .def_readwrite("properties", &TrackData::m_properties)
+      .def("__eq__", &TrackData::operator==)
+      .def("__ne__", &TrackData::operator!=)
+      .def("__str__", &TrackDataToString);
 
   class_<std::vector<int8_t>>("LanguageList")
-    .def(vector_indexing_suite<std::vector<int8_t>>())
-    .def("get_list", &GetLanguages)
-    .def("set_list", &SetLanguages)
-    .def("__str__", &LanguagesListToString);
+      .def(vector_indexing_suite<std::vector<int8_t>>())
+      .def("get_list", &GetLanguages)
+      .def("set_list", &SetLanguages)
+      .def("__str__", &LanguagesListToString);
 
   class_<CategoryData>("CategoryData")
-    .def_readwrite("type", &CategoryData::m_type)
-    .def_readwrite("compilation_id", &CategoryData::m_compilationId)
-    .def_readwrite("name", &CategoryData::m_name)
-    .def_readwrite("annotation", &CategoryData::m_annotation)
-    .def_readwrite("description", &CategoryData::m_description)
-    .def_readwrite("image_url", &CategoryData::m_imageUrl)
-    .def_readwrite("visible", &CategoryData::m_visible)
-    .def_readwrite("author_name", &CategoryData::m_authorName)
-    .def_readwrite("author_id", &CategoryData::m_authorId)
-    .def_readwrite("last_modified", &CategoryData::m_lastModified)
-    .def_readwrite("rating", &CategoryData::m_rating)
-    .def_readwrite("reviews_number", &CategoryData::m_reviewsNumber)
-    .def_readwrite("access_rules", &CategoryData::m_accessRules)
-    .def_readwrite("tags", &CategoryData::m_tags)
-    .def_readwrite("toponyms", &CategoryData::m_toponyms)
-    .def_readwrite("languages", &CategoryData::m_languageCodes)
-    .def_readwrite("properties", &CategoryData::m_properties)
-    .def("__eq__", &CategoryData::operator==)
-    .def("__ne__", &CategoryData::operator!=)
-    .def("__str__", &CategoryDataToString);
+      .def_readwrite("type", &CategoryData::m_type)
+      .def_readwrite("compilation_id", &CategoryData::m_compilationId)
+      .def_readwrite("name", &CategoryData::m_name)
+      .def_readwrite("annotation", &CategoryData::m_annotation)
+      .def_readwrite("description", &CategoryData::m_description)
+      .def_readwrite("image_url", &CategoryData::m_imageUrl)
+      .def_readwrite("visible", &CategoryData::m_visible)
+      .def_readwrite("author_name", &CategoryData::m_authorName)
+      .def_readwrite("author_id", &CategoryData::m_authorId)
+      .def_readwrite("last_modified", &CategoryData::m_lastModified)
+      .def_readwrite("rating", &CategoryData::m_rating)
+      .def_readwrite("reviews_number", &CategoryData::m_reviewsNumber)
+      .def_readwrite("access_rules", &CategoryData::m_accessRules)
+      .def_readwrite("tags", &CategoryData::m_tags)
+      .def_readwrite("toponyms", &CategoryData::m_toponyms)
+      .def_readwrite("languages", &CategoryData::m_languageCodes)
+      .def_readwrite("properties", &CategoryData::m_properties)
+      .def("__eq__", &CategoryData::operator==)
+      .def("__ne__", &CategoryData::operator!=)
+      .def("__str__", &CategoryDataToString);
 
   class_<std::vector<BookmarkData>>("BookmarkList")
-    .def(vector_indexing_suite<std::vector<BookmarkData>>())
-    .def("get_list", &VectorAdapter<BookmarkData>::Get)
-    .def("set_list", &VectorAdapter<BookmarkData>::Set)
-    .def("__str__", &VectorAdapter<BookmarkData>::ToString);
+      .def(vector_indexing_suite<std::vector<BookmarkData>>())
+      .def("get_list", &VectorAdapter<BookmarkData>::Get)
+      .def("set_list", &VectorAdapter<BookmarkData>::Set)
+      .def("__str__", &VectorAdapter<BookmarkData>::ToString);
 
   class_<std::vector<TrackData>>("TrackList")
-    .def(vector_indexing_suite<std::vector<TrackData>>())
-    .def("get_list", &VectorAdapter<TrackData>::Get)
-    .def("set_list", &VectorAdapter<TrackData>::Set)
-    .def("__str__", &VectorAdapter<TrackData>::ToString);
+      .def(vector_indexing_suite<std::vector<TrackData>>())
+      .def("get_list", &VectorAdapter<TrackData>::Get)
+      .def("set_list", &VectorAdapter<TrackData>::Set)
+      .def("__str__", &VectorAdapter<TrackData>::ToString);
 
   class_<std::vector<CategoryData>>("CompilationList")
-    .def(vector_indexing_suite<std::vector<CategoryData>>())
-    .def("get_list", &VectorAdapter<CategoryData>::Get)
-    .def("set_list", &VectorAdapter<CategoryData>::Set)
-    .def("__str__", &VectorAdapter<CategoryData>::ToString);
+      .def(vector_indexing_suite<std::vector<CategoryData>>())
+      .def("get_list", &VectorAdapter<CategoryData>::Get)
+      .def("set_list", &VectorAdapter<CategoryData>::Set)
+      .def("__str__", &VectorAdapter<CategoryData>::ToString);
 
   class_<FileData>("FileData")
-    .def_readwrite("server_id", &FileData::m_serverId)
-    .def_readwrite("category", &FileData::m_categoryData)
-    .def_readwrite("bookmarks", &FileData::m_bookmarksData)
-    .def_readwrite("tracks", &FileData::m_tracksData)
-    .def_readwrite("compilations", &FileData::m_compilationsData)
-    .def("__eq__", &FileData::operator==)
-    .def("__ne__", &FileData::operator!=)
-    .def("__str__", &FileDataToString);
+      .def_readwrite("server_id", &FileData::m_serverId)
+      .def_readwrite("category", &FileData::m_categoryData)
+      .def_readwrite("bookmarks", &FileData::m_bookmarksData)
+      .def_readwrite("tracks", &FileData::m_tracksData)
+      .def_readwrite("compilations", &FileData::m_compilationsData)
+      .def("__eq__", &FileData::operator==)
+      .def("__ne__", &FileData::operator!=)
+      .def("__str__", &FileDataToString);
 
   def("set_bookmarks_min_zoom", &SetBookmarksMinZoom);
 
diff --git a/libs/kml/serdes.cpp b/libs/kml/serdes.cpp
index 5107439e3..ae40ce442 100644
--- a/libs/kml/serdes.cpp
+++ b/libs/kml/serdes.cpp
@@ -51,11 +51,9 @@ std::string_view constexpr kKmlFooter =
     "</Document>\n"
     "</kml>\n";
 
-std::string_view constexpr kExtendedDataHeader =
-    "<ExtendedData xmlns:mwm=\"https://comaps.app\">\n";
+std::string_view constexpr kExtendedDataHeader = "<ExtendedData xmlns:mwm=\"https://comaps.app\">\n";
 
-std::string_view constexpr kExtendedDataFooter =
-    "</ExtendedData>\n";
+std::string_view constexpr kExtendedDataFooter = "</ExtendedData>\n";
 
 std::string const kCompilationFooter = "</" + kCompilation + ">\n";
 
@@ -119,8 +117,7 @@ std::string GetStyleForPredefinedColor(PredefinedColor color)
   case PredefinedColor::Gray: return "placemark-gray";
   case PredefinedColor::BlueGray: return "placemark-bluegray";
   case PredefinedColor::None:
-  case PredefinedColor::Count:
-    return {};
+  case PredefinedColor::Count: return {};
   }
   UNREACHABLE();
 }
@@ -136,8 +133,7 @@ BookmarkIcon GetIcon(std::string const & iconName)
   return BookmarkIcon::None;
 }
 
-void SaveStyle(Writer & writer, std::string const & style,
-               std::string_view const & indent)
+void SaveStyle(Writer & writer, std::string const & style, std::string_view const & indent)
 {
   if (style.empty())
     return;
@@ -153,10 +149,8 @@ void SaveStyle(Writer & writer, std::string const & style,
 
 void SaveColorToABGR(Writer & writer, uint32_t rgba)
 {
-  writer << NumToHex(static_cast<uint8_t>(rgba & 0xFF))
-         << NumToHex(static_cast<uint8_t>((rgba >> 8) & 0xFF))
-         << NumToHex(static_cast<uint8_t>((rgba >> 16) & 0xFF))
-         << NumToHex(static_cast<uint8_t>((rgba >> 24) & 0xFF));
+  writer << NumToHex(static_cast<uint8_t>(rgba & 0xFF)) << NumToHex(static_cast<uint8_t>((rgba >> 8) & 0xFF))
+         << NumToHex(static_cast<uint8_t>((rgba >> 16) & 0xFF)) << NumToHex(static_cast<uint8_t>((rgba >> 24) & 0xFF));
 }
 
 std::string TimestampToString(Timestamp const & timestamp)
@@ -168,14 +162,13 @@ std::string TimestampToString(Timestamp const & timestamp)
   return strTimeStamp;
 }
 
-void SaveLocalizableString(Writer & writer, LocalizableString const & str,
-                           std::string const & tagName, std::string_view const & indent)
+void SaveLocalizableString(Writer & writer, LocalizableString const & str, std::string const & tagName,
+                           std::string_view const & indent)
 {
   writer << indent << "<mwm:" << tagName << ">\n";
   for (auto const & s : str)
   {
-    writer << indent << kIndent2 << "<mwm:lang code=\""
-           << StringUtf8Multilang::GetLangByCode(s.first) << "\">";
+    writer << indent << kIndent2 << "<mwm:lang code=\"" << StringUtf8Multilang::GetLangByCode(s.first) << "\">";
     SaveStringWithCDATA(writer, s.second);
     writer << "</mwm:lang>\n";
   }
@@ -183,9 +176,8 @@ void SaveLocalizableString(Writer & writer, LocalizableString const & str,
 }
 
 template <class StringViewLike>
-void SaveStringsArray(Writer & writer,
-                      std::vector<StringViewLike> const & stringsArray,
-                      std::string const & tagName, std::string_view const & indent)
+void SaveStringsArray(Writer & writer, std::vector<StringViewLike> const & stringsArray, std::string const & tagName,
+                      std::string_view const & indent)
 {
   if (stringsArray.empty())
     return;
@@ -207,9 +199,8 @@ void SaveStringsArray(Writer & writer,
   writer << indent << "</mwm:" << tagName << ">\n";
 }
 
-void SaveStringsMap(Writer & writer,
-                    std::map<std::string, std::string> const & stringsMap,
-                    std::string const & tagName, std::string_view const & indent)
+void SaveStringsMap(Writer & writer, std::map<std::string, std::string> const & stringsMap, std::string const & tagName,
+                    std::string_view const & indent)
 {
   if (stringsMap.empty())
     return;
@@ -224,12 +215,10 @@ void SaveStringsMap(Writer & writer,
   writer << indent << "</mwm:" << tagName << ">\n";
 }
 
-void SaveCategoryData(Writer & writer, CategoryData const & categoryData,
-                      std::string const & extendedServerId,
+void SaveCategoryData(Writer & writer, CategoryData const & categoryData, std::string const & extendedServerId,
                       std::vector<CategoryData> const * compilationData);
 
-void SaveCategoryExtendedData(Writer & writer, CategoryData const & categoryData,
-                              std::string const & extendedServerId,
+void SaveCategoryExtendedData(Writer & writer, CategoryData const & categoryData, std::string const & extendedServerId,
                               std::vector<CategoryData> const * compilationData)
 {
   if (compilationData)
@@ -255,8 +244,7 @@ void SaveCategoryExtendedData(Writer & writer, CategoryData const & categoryData
   SaveLocalizableString(writer, categoryData.m_description, "description", indent);
 
   if (!compilationData)
-    writer << indent << "<mwm:visibility>" << (categoryData.m_visible ? "1" : "0")
-           << "</mwm:visibility>\n";
+    writer << indent << "<mwm:visibility>" << (categoryData.m_visible ? "1" : "0") << "</mwm:visibility>\n";
 
   if (!categoryData.m_imageUrl.empty())
     writer << indent << "<mwm:imageUrl>" << categoryData.m_imageUrl << "</mwm:imageUrl>\n";
@@ -276,10 +264,7 @@ void SaveCategoryExtendedData(Writer & writer, CategoryData const & categoryData
 
   double constexpr kEps = 1e-5;
   if (fabs(categoryData.m_rating) > kEps)
-  {
-    writer << indent << "<mwm:rating>" << strings::to_string(categoryData.m_rating)
-           << "</mwm:rating>\n";
-  }
+    writer << indent << "<mwm:rating>" << strings::to_string(categoryData.m_rating) << "</mwm:rating>\n";
 
   if (categoryData.m_reviewsNumber > 0)
   {
@@ -287,8 +272,7 @@ void SaveCategoryExtendedData(Writer & writer, CategoryData const & categoryData
            << "</mwm:reviewsNumber>\n";
   }
 
-  writer << indent << "<mwm:accessRules>" << DebugPrint(categoryData.m_accessRules)
-         << "</mwm:accessRules>\n";
+  writer << indent << "<mwm:accessRules>" << DebugPrint(categoryData.m_accessRules) << "</mwm:accessRules>\n";
 
   SaveStringsArray(writer, categoryData.m_tags, "tags", indent);
 
@@ -305,11 +289,8 @@ void SaveCategoryExtendedData(Writer & writer, CategoryData const & categoryData
   SaveStringsMap(writer, categoryData.m_properties, "properties", indent);
 
   if (compilationData)
-  {
     for (auto const & compilationDatum : *compilationData)
-      SaveCategoryData(writer, compilationDatum, {} /* extendedServerId */,
-                       nullptr /* compilationData */);
-  }
+      SaveCategoryData(writer, compilationDatum, {} /* extendedServerId */, nullptr /* compilationData */);
 
   if (compilationData)
     writer << kIndent2 << kExtendedDataFooter;
@@ -317,8 +298,7 @@ void SaveCategoryExtendedData(Writer & writer, CategoryData const & categoryData
     writer << kIndent4 << kCompilationFooter;
 }
 
-void SaveCategoryData(Writer & writer, CategoryData const & categoryData,
-                      std::string const & extendedServerId,
+void SaveCategoryData(Writer & writer, CategoryData const & categoryData, std::string const & extendedServerId,
                       std::vector<CategoryData> const * compilationData)
 {
   if (compilationData)
@@ -400,10 +380,7 @@ void SaveBookmarkExtendedData(Writer & writer, BookmarkData const & bookmarkData
   }
 
   if (bookmarkData.m_minZoom > 1)
-  {
-    writer << kIndent6 << "<mwm:minZoom>" << strings::to_string(bookmarkData.m_minZoom)
-           << "</mwm:minZoom>\n";
-  }
+    writer << kIndent6 << "<mwm:minZoom>" << strings::to_string(bookmarkData.m_minZoom) << "</mwm:minZoom>\n";
 
   SaveStringsMap(writer, bookmarkData.m_properties, "properties", kIndent6);
 
@@ -435,23 +412,18 @@ void SaveBookmarkData(Writer & writer, BookmarkData const & bookmarkData)
   }
 
   if (bookmarkData.m_timestamp != Timestamp())
-  {
-    writer << kIndent4 << "<TimeStamp><when>" << TimestampToString(bookmarkData.m_timestamp)
-           << "</when></TimeStamp>\n";
-  }
+    writer << kIndent4 << "<TimeStamp><when>" << TimestampToString(bookmarkData.m_timestamp) << "</when></TimeStamp>\n";
 
   auto const style = GetStyleForPredefinedColor(bookmarkData.m_color.m_predefinedColor);
   writer << kIndent4 << "<styleUrl>#" << style << "</styleUrl>\n"
-         << kIndent4 << "<Point><coordinates>" << PointToLineString(bookmarkData.m_point)
-         << "</coordinates></Point>\n";
+         << kIndent4 << "<Point><coordinates>" << PointToLineString(bookmarkData.m_point) << "</coordinates></Point>\n";
 
   SaveBookmarkExtendedData(writer, bookmarkData);
 
   writer << kIndent2 << "</Placemark>\n";
 }
 
-void SaveTrackLayer(Writer & writer, TrackLayer const & layer,
-                    std::string_view const & indent)
+void SaveTrackLayer(Writer & writer, TrackLayer const & layer, std::string_view const & indent)
 {
   writer << indent << "<color>";
   SaveColorToABGR(writer, layer.m_color.m_rgba);
@@ -607,10 +579,7 @@ void SaveTrackData(Writer & writer, TrackData const & trackData)
   writer << kIndent4 << "</LineStyle></Style>\n";
 
   if (trackData.m_timestamp != Timestamp())
-  {
-    writer << kIndent4 << "<TimeStamp><when>" << TimestampToString(trackData.m_timestamp)
-           << "</when></TimeStamp>\n";
-  }
+    writer << kIndent4 << "<TimeStamp><when>" << TimestampToString(trackData.m_timestamp) << "</when></TimeStamp>\n";
 
   SaveTrackGeometry(writer, trackData.m_geometry);
   SaveTrackExtendedData(writer, trackData);
@@ -618,8 +587,7 @@ void SaveTrackData(Writer & writer, TrackData const & trackData)
   writer << kIndent2 << "</Placemark>\n";
 }
 
-bool ParsePoint(std::string_view s, char const * delim, m2::PointD & pt,
-                geometry::Altitude & altitude)
+bool ParsePoint(std::string_view s, char const * delim, m2::PointD & pt, geometry::Altitude & altitude)
 {
   // Order in string is: lon, lat, z.
   strings::SimpleTokenizer iter(s, delim);
@@ -650,8 +618,7 @@ bool ParsePoint(std::string_view s, char const * delim, m2::PointD & pt)
   return ParsePoint(s, delim, pt, dummyAltitude);
 }
 
-bool ParsePointWithAltitude(std::string_view s, char const * delim,
-                            geometry::PointWithAltitude & point)
+bool ParsePointWithAltitude(std::string_view s, char const * delim, geometry::PointWithAltitude & point)
 {
   geometry::Altitude altitude = geometry::kInvalidAltitude;
   m2::PointD pt;
@@ -670,8 +637,7 @@ void KmlWriter::Write(FileData const & fileData)
   m_writer << kKmlHeader;
 
   // Save category.
-  SaveCategoryData(m_writer, fileData.m_categoryData, fileData.m_serverId,
-                   &fileData.m_compilationsData);
+  SaveCategoryData(m_writer, fileData.m_categoryData, fileData.m_serverId, &fileData.m_compilationsData);
 
   // Save bookmarks.
   for (auto const & bookmarkData : fileData.m_bookmarksData)
@@ -733,8 +699,8 @@ void KmlParser::SetOrigin(std::string const & s)
     m_org = pt;
 }
 
-void KmlParser::ParseAndAddPoints(MultiGeometry::LineT & line, std::string_view s,
-                                  char const * blockSeparator, char const * coordSeparator)
+void KmlParser::ParseAndAddPoints(MultiGeometry::LineT & line, std::string_view s, char const * blockSeparator,
+                                  char const * coordSeparator)
 {
   strings::Tokenize(s, blockSeparator, [&](std::string_view v)
   {
@@ -779,9 +745,9 @@ bool KmlParser::MakeValid()
       size_t const pointsSize = m_geometry.m_lines[lineIdx].size();
       if (pointsSize + (skipSet ? skipSet->size() : 0) != timestamps.size())
       {
-        MYTHROW(kml::DeserializerKml::DeserializeException, ("Timestamps size", timestamps.size(),
-                                                             "mismatch with the points size:", pointsSize,
-                                                             "for the track:", lineIdx));
+        MYTHROW(kml::DeserializerKml::DeserializeException,
+                ("Timestamps size", timestamps.size(), "mismatch with the points size:", pointsSize,
+                 "for the track:", lineIdx));
       }
 
       if (skipSet)
@@ -978,8 +944,8 @@ void KmlParser::Pop(std::string_view tag)
         data.m_compilations = std::move(m_compilations);
 
         // Here we set custom name from 'name' field for KML-files exported from 3rd-party services.
-        if (data.m_name.size() == 1 && data.m_name.begin()->first == kDefaultLangCode &&
-            data.m_customName.empty() && data.m_featureTypes.empty())
+        if (data.m_name.size() == 1 && data.m_name.begin()->first == kDefaultLangCode && data.m_customName.empty() &&
+            data.m_featureTypes.empty())
         {
           data.m_customName = data.m_name;
         }
@@ -1275,8 +1241,7 @@ void KmlParser::CharData(std::string & value)
           m_trackWidth = val;
       }
     }
-    else if (ppTag == kStyleMap && prevTag == kPair && currTag == kStyleUrl &&
-             m_styleUrlKey == "normal")
+    else if (ppTag == kStyleMap && prevTag == kPair && currTag == kStyleUrl && m_styleUrlKey == "normal")
     {
       if (!m_mapStyleId.empty())
         m_mapStyle2Style[m_mapStyleId] = value;
@@ -1443,8 +1408,7 @@ kml::TrackLayer KmlParser::GetDefaultTrackLayer()
   return layer;
 }
 
-DeserializerKml::DeserializerKml(FileData & fileData)
-  : m_fileData(fileData)
+DeserializerKml::DeserializerKml(FileData & fileData) : m_fileData(fileData)
 {
   m_fileData = {};
 }
diff --git a/libs/kml/serdes.hpp b/libs/kml/serdes.hpp
index 8cc96b39c..1486bbd3a 100644
--- a/libs/kml/serdes.hpp
+++ b/libs/kml/serdes.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "kml/types.hpp"
 #include "kml/serdes_common.hpp"
+#include "kml/types.hpp"
 
 #include "coding/parse_xml.hpp"
 #include "coding/reader.hpp"
@@ -20,9 +20,7 @@ class KmlWriter
 public:
   DECLARE_EXCEPTION(WriteKmlException, RootException);
 
-  explicit KmlWriter(Writer & writer)
-    : m_writer(writer)
-  {}
+  explicit KmlWriter(Writer & writer) : m_writer(writer) {}
 
   void Write(FileData const & fileData);
 
@@ -35,9 +33,7 @@ class SerializerKml
 public:
   DECLARE_EXCEPTION(SerializeException, RootException);
 
-  explicit SerializerKml(FileData const & fileData)
-    : m_fileData(fileData)
-  {}
+  explicit SerializerKml(FileData const & fileData) : m_fileData(fileData) {}
 
   template <typename Sink>
   void Serialize(Sink & sink)
@@ -63,8 +59,7 @@ public:
   void CharData(std::string & value);
   /// @}
 
-  bool IsValidAttribute(std::string_view type, std::string const & value,
-                        std::string const & attrInLowerCase) const;
+  bool IsValidAttribute(std::string_view type, std::string const & value, std::string const & attrInLowerCase) const;
 
   static kml::TrackLayer GetDefaultTrackLayer();
 
@@ -82,12 +77,12 @@ private:
 
   void ResetPoint();
   void SetOrigin(std::string const & s);
-  static void ParseAndAddPoints(MultiGeometry::LineT & line, std::string_view s,
-                                char const * blockSeparator, char const * coordSeparator);
+  static void ParseAndAddPoints(MultiGeometry::LineT & line, std::string_view s, char const * blockSeparator,
+                                char const * coordSeparator);
   void ParseLineString(std::string const & s);
 
   bool MakeValid();
-  void ParseColor(std::string const &value);
+  void ParseColor(std::string const & value);
   bool GetColorForStyle(std::string const & styleUrl, uint32_t & color) const;
   double GetTrackWidthForStyle(std::string const & styleUrl) const;
 
diff --git a/libs/kml/serdes_binary.cpp b/libs/kml/serdes_binary.cpp
index ca67db120..585ce16aa 100644
--- a/libs/kml/serdes_binary.cpp
+++ b/libs/kml/serdes_binary.cpp
@@ -4,8 +4,7 @@ namespace kml
 {
 namespace binary
 {
-SerializerKml::SerializerKml(FileData & data)
-  : m_data(data)
+SerializerKml::SerializerKml(FileData & data) : m_data(data)
 {
   ClearCollectionIndex();
 
@@ -29,8 +28,7 @@ void SerializerKml::ClearCollectionIndex()
   m_data.Visit(clearVisitor);
 }
 
-DeserializerKml::DeserializerKml(FileData & data)
-  : m_data(data)
+DeserializerKml::DeserializerKml(FileData & data) : m_data(data)
 {
   m_data = {};
 }
diff --git a/libs/kml/serdes_binary.hpp b/libs/kml/serdes_binary.hpp
index 32302fb5a..95ca114c7 100644
--- a/libs/kml/serdes_binary.hpp
+++ b/libs/kml/serdes_binary.hpp
@@ -1,13 +1,13 @@
 #pragma once
 
 #include "kml/header_binary.hpp"
+#include "kml/types.hpp"
 #include "kml/types_v3.hpp"
 #include "kml/types_v6.hpp"
 #include "kml/types_v7.hpp"
 #include "kml/types_v8.hpp"
 #include "kml/types_v8mm.hpp"
 #include "kml/types_v9mm.hpp"
-#include "kml/types.hpp"
 #include "kml/visitors.hpp"
 
 #include "coding/text_storage.hpp"
@@ -127,14 +127,12 @@ protected:
 
 template <typename T, typename = void>
 struct HasCompilationsData : std::false_type
-{
-};
+{};
 
 template <typename T>
 struct HasCompilationsData<T, std::void_t<decltype(T::m_compilationsData)>>
   : std::is_same<decltype(T::m_compilationsData), std::vector<CategoryData>>
-{
-};
+{};
 
 class DeserializerKml
 {
@@ -150,9 +148,8 @@ public:
     NonOwningReaderSource source(reader);
     m_header.m_version = ReadPrimitiveFromSource<Version>(source);
 
-    if (m_header.m_version != Version::V2 && m_header.m_version != Version::V3 &&
-        m_header.m_version != Version::V4 && m_header.m_version != Version::V5 &&
-        m_header.m_version != Version::V6 && m_header.m_version != Version::V7 &&
+    if (m_header.m_version != Version::V2 && m_header.m_version != Version::V3 && m_header.m_version != Version::V4 &&
+        m_header.m_version != Version::V5 && m_header.m_version != Version::V6 && m_header.m_version != Version::V7 &&
         m_header.m_version != Version::V8 && m_header.m_version != Version::V9)
     {
       MYTHROW(DeserializeException, ("Incorrect file version."));
@@ -263,9 +260,8 @@ private:
       // Check if file has Opensource V8/V9 or MapsMe V8/V9 format.
       // Actual V8/V9 format has 6 offsets (uint64_t) in header. While V8MM/V9MM has 5 offsets.
       // It means that first section (usually categories) has offset 0x28 = 40 = 5 * 8.
-      if (m_header.m_categoryOffset == 0x28 || m_header.m_bookmarksOffset == 0x28 ||
-          m_header.m_tracksOffset == 0x28 || m_header.m_stringsOffset == 0x28 ||
-          m_header.m_compilationsOffset == 0x28)
+      if (m_header.m_categoryOffset == 0x28 || m_header.m_bookmarksOffset == 0x28 || m_header.m_tracksOffset == 0x28 ||
+          m_header.m_stringsOffset == 0x28 || m_header.m_compilationsOffset == 0x28)
       {
         m_header.m_version = (m_header.m_version == Version::V8 ? Version::V8MM : Version::V9MM);
         LOG(LINFO, ("KMB file has version", m_header.m_version));
@@ -279,8 +275,7 @@ private:
   }
 
   template <typename ReaderType>
-  std::unique_ptr<Reader> CreateSubReader(ReaderType const & reader,
-                                          uint64_t startPos, uint64_t endPos)
+  std::unique_ptr<Reader> CreateSubReader(ReaderType const & reader, uint64_t startPos, uint64_t endPos)
   {
     ASSERT(m_initialized, ());
     ASSERT_GREATER_OR_EQUAL(endPos, startPos, ());
diff --git a/libs/kml/serdes_binary_v8.hpp b/libs/kml/serdes_binary_v8.hpp
index 795d68550..eebfa8290 100644
--- a/libs/kml/serdes_binary_v8.hpp
+++ b/libs/kml/serdes_binary_v8.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "kml/serdes_binary.hpp"
-#include "kml/types_v8.hpp"
 #include "kml/types.hpp"
+#include "kml/types_v8.hpp"
 #include "kml/visitors.hpp"
 
 #include <string>
@@ -15,7 +15,7 @@ namespace kml::binary
 class SerializerKmlV8 : public SerializerKml
 {
 public:
-  explicit SerializerKmlV8(FileData & data) : SerializerKml(data) {};
+  explicit SerializerKmlV8(FileData & data) : SerializerKml(data) {}
 
   template <typename Sink>
   void Serialize(Sink & sink)
@@ -80,7 +80,7 @@ public:
     // Downgrade bookmark format from Latest to V8
     std::vector<BookmarkDataV8> bookmarksDataV8;
     bookmarksDataV8.reserve(m_data.m_bookmarksData.size());
-    for (BookmarkData &bm : m_data.m_bookmarksData)
+    for (BookmarkData & bm : m_data.m_bookmarksData)
       bookmarksDataV8.push_back(BookmarkDataV8(bm));
     visitor(bookmarksDataV8);
   }
diff --git a/libs/kml/serdes_common.cpp b/libs/kml/serdes_common.cpp
index 01e644246..4ca2827a4 100644
--- a/libs/kml/serdes_common.cpp
+++ b/libs/kml/serdes_common.cpp
@@ -1,7 +1,7 @@
-#include "base/string_utils.hpp"
 #include "kml/serdes_common.hpp"
-#include "geometry/mercator.hpp"
 #include <sstream>
+#include "base/string_utils.hpp"
+#include "geometry/mercator.hpp"
 
 namespace kml
 {
@@ -49,12 +49,14 @@ void SaveStringWithCDATA(Writer & writer, std::string s)
   // This solution is a simple ASCII-range check that does not check symbols from other unicode ranges
   // (they will require a more complex and slower approach of converting UTF-8 string to unicode first).
   // It should be enough for many cases, according to user reports and wrong characters in their data.
-  s.erase(std::remove_if(s.begin(), s.end(), [](unsigned char c)
-                         {
-                           if (c >= 0x20 || c == 0x09 || c == 0x0a || c == 0x0d)
-                             return false;
-                           return true;
-                         }), s.end());
+  s.erase(std::remove_if(s.begin(), s.end(),
+                         [](unsigned char c)
+  {
+    if (c >= 0x20 || c == 0x09 || c == 0x0a || c == 0x0d)
+      return false;
+    return true;
+  }),
+          s.end());
 
   if (s.empty())
     return;
@@ -69,9 +71,8 @@ void SaveStringWithCDATA(Writer & writer, std::string s)
 std::string const * GetDefaultLanguage(LocalizableString const & lstr)
 {
   auto const find = lstr.find(kDefaultLang);
-  if (find != lstr.end()) {
+  if (find != lstr.end())
     return &find->second;
-  }
   return nullptr;
 }
 
diff --git a/libs/kml/serdes_common.hpp b/libs/kml/serdes_common.hpp
index d01721009..cab89da17 100644
--- a/libs/kml/serdes_common.hpp
+++ b/libs/kml/serdes_common.hpp
@@ -16,8 +16,8 @@ auto constexpr kDefaultTrackColor = 0x006ec7ff;
 template <typename Channel>
 uint32_t ToRGBA(Channel red, Channel green, Channel blue, Channel alpha)
 {
-  return static_cast<uint8_t>(red) << 24 | static_cast<uint8_t>(green) << 16 |
-         static_cast<uint8_t>(blue) << 8 | static_cast<uint8_t>(alpha);
+  return static_cast<uint8_t>(red) << 24 | static_cast<uint8_t>(green) << 16 | static_cast<uint8_t>(blue) << 8 |
+         static_cast<uint8_t>(alpha);
 }
 
 std::string PointToString(m2::PointD const & org, char const separator);
@@ -28,11 +28,11 @@ std::string PointToGxString(geometry::PointWithAltitude const & pt);
 void SaveStringWithCDATA(Writer & writer, std::string s);
 std::string const * GetDefaultLanguage(LocalizableString const & lstr);
 
-std::string_view constexpr kIndent0 {};
-std::string_view constexpr kIndent2 {"  "};
-std::string_view constexpr kIndent4 {"    "};
-std::string_view constexpr kIndent6 {"      "};
-std::string_view constexpr kIndent8 {"        "};
-std::string_view constexpr kIndent10 {"          "};
+std::string_view constexpr kIndent0{};
+std::string_view constexpr kIndent2{"  "};
+std::string_view constexpr kIndent4{"    "};
+std::string_view constexpr kIndent6{"      "};
+std::string_view constexpr kIndent8{"        "};
+std::string_view constexpr kIndent10{"          "};
 
 }  // namespace kml
diff --git a/libs/kml/serdes_gpx.cpp b/libs/kml/serdes_gpx.cpp
index 5b2a67354..cb6e2e0ff 100644
--- a/libs/kml/serdes_gpx.cpp
+++ b/libs/kml/serdes_gpx.cpp
@@ -9,7 +9,6 @@
 #include "base/assert.hpp"
 #include "base/string_utils.hpp"
 
-
 namespace kml
 {
 namespace gpx
@@ -46,9 +45,9 @@ int constexpr kInvalidColor = 0;
 }  // namespace
 
 GpxParser::GpxParser(FileData & data)
-: m_data{data}
-, m_categoryData{&m_data.m_categoryData}
-, m_globalColor{kInvalidColor}
+  : m_data{data}
+  , m_categoryData{&m_data.m_categoryData}
+  , m_globalColor{kInvalidColor}
 {
   ResetPoint();
 }
@@ -112,9 +111,8 @@ bool GpxParser::Push(std::string tag)
 bool GpxParser::IsValidCoordinatesPosition() const
 {
   std::string const & lastTag = GetTagFromEnd(0);
-  return lastTag == gpx::kWpt
-      || (lastTag == gpx::kTrkPt && GetTagFromEnd(1) == gpx::kTrkSeg)
-      || (lastTag == gpx::kRtePt && GetTagFromEnd(1) == gpx::kRte);
+  return lastTag == gpx::kWpt || (lastTag == gpx::kTrkPt && GetTagFromEnd(1) == gpx::kTrkSeg) ||
+         (lastTag == gpx::kRtePt && GetTagFromEnd(1) == gpx::kRte);
 }
 
 void GpxParser::AddAttr(std::string_view attr, char const * value)
@@ -153,19 +151,18 @@ std::optional<uint32_t> GpxParser::ParseColorFromHexString(std::string_view colo
   {
   case 3: return kml::ToRGBA(colorBytes[0], colorBytes[1], colorBytes[2], (char)255);
   case 4: return kml::ToRGBA(colorBytes[1], colorBytes[2], colorBytes[3], colorBytes[0]);
-  default:
-    LOG(LWARNING, ("Invalid color value", colorStr));
-    return {};
+  default: LOG(LWARNING, ("Invalid color value", colorStr)); return {};
   }
 }
 
 void GpxParser::ParseColor(std::string_view colorStr)
 {
-  if (const auto parsed = ParseColorFromHexString(colorStr); parsed)
+  if (auto const parsed = ParseColorFromHexString(colorStr); parsed)
     m_color = parsed.value();
 }
 
-// https://osmand.net/docs/technical/osmand-file-formats/osmand-gpx/. Supported colors: #AARRGGBB/#RRGGBB/AARRGGBB/RRGGBB
+// https://osmand.net/docs/technical/osmand-file-formats/osmand-gpx/. Supported colors:
+// #AARRGGBB/#RRGGBB/AARRGGBB/RRGGBB
 void GpxParser::ParseOsmandColor(std::string const & value)
 {
   auto const color = ParseColorFromHexString(value);
@@ -189,24 +186,11 @@ void GpxParser::ParseOsmandColor(std::string const & value)
 void GpxParser::ParseGarminColor(std::string const & v)
 {
   static std::unordered_map<std::string, std::string> const kGarminToHex = {
-      {"Black", "000000"},
-      {"DarkRed", "8b0000"},
-      {"DarkGreen", "006400"},
-      {"DarkYellow", "b5b820"},
-      {"DarkBlue", "00008b"},
-      {"DarkMagenta", "8b008b"},
-      {"DarkCyan", "008b8b"},
-      {"LightGray", "cccccc"},
-      {"DarkGray", "444444"},
-      {"Red", "ff0000"},
-      {"Green", "00ff00"},
-      {"Yellow", "ffff00"},
-      {"Blue", "0000ff"},
-      {"Magenta", "ff00ff"},
-      {"Cyan", "00ffff"},
-      {"White", "ffffff"},
-      {"Transparent", "ff0000"}
-  };
+      {"Black", "000000"},      {"DarkRed", "8b0000"},     {"DarkGreen", "006400"}, {"DarkYellow", "b5b820"},
+      {"DarkBlue", "00008b"},   {"DarkMagenta", "8b008b"}, {"DarkCyan", "008b8b"},  {"LightGray", "cccccc"},
+      {"DarkGray", "444444"},   {"Red", "ff0000"},         {"Green", "00ff00"},     {"Yellow", "ffff00"},
+      {"Blue", "0000ff"},       {"Magenta", "ff00ff"},     {"Cyan", "00ffff"},      {"White", "ffffff"},
+      {"Transparent", "ff0000"}};
   auto const it = kGarminToHex.find(v);
   if (it != kGarminToHex.end())
   {
@@ -250,7 +234,7 @@ void GpxParser::CheckAndCorrectTimestamps()
             else
             {
               // naive interpolation
-              auto const last = m_timestamps[i-1];
+              auto const last = m_timestamps[i - 1];
               auto count = j - i + 1;
               double const delta = (m_timestamps[j] - last) / double(count);
               for (size_t k = 1; k < count; ++k)
@@ -264,7 +248,7 @@ void GpxParser::CheckAndCorrectTimestamps()
         {
           // Ending range assign to the last valid timestamp.
           ASSERT(i > 0, ());
-          auto const last = m_timestamps[i-1];
+          auto const last = m_timestamps[i - 1];
           while (i < j)
             m_timestamps[i++] = last;
         }
@@ -487,31 +471,28 @@ struct RGBAToGarmin
   std::string_view color;
 };
 
-auto constexpr kRGBAToGarmin = std::to_array<RGBAToGarmin>({
-    {0x000000ff, "Black"},
-    {0x8b0000ff, "DarkRed"},
-    {0x006400ff, "DarkGreen"},
-    {0xb5b820ff, "DarkYellow"},
-    {0x00008bff, "DarkBlue"},
-    {0x8b008bff, "DarkMagenta"},
-    {0x008b8bff, "DarkCyan"},
-    {0xccccccff, "LightGray"},
-    {0x444444ff, "DarkGray"},
-    {0xff0000ff, "Red"},
-    {0x00ff00ff, "Green"},
-    {0xffff00ff, "Yellow"},
-    {0x0000ffff, "Blue"},
-    {0xff00ffff, "Magenta"},
-    {0x00ffffff, "Cyan"},
-    {0xffffffff, "White"}
-});
-
+auto constexpr kRGBAToGarmin = std::to_array<RGBAToGarmin>({{0x000000ff, "Black"},
+                                                            {0x8b0000ff, "DarkRed"},
+                                                            {0x006400ff, "DarkGreen"},
+                                                            {0xb5b820ff, "DarkYellow"},
+                                                            {0x00008bff, "DarkBlue"},
+                                                            {0x8b008bff, "DarkMagenta"},
+                                                            {0x008b8bff, "DarkCyan"},
+                                                            {0xccccccff, "LightGray"},
+                                                            {0x444444ff, "DarkGray"},
+                                                            {0xff0000ff, "Red"},
+                                                            {0x00ff00ff, "Green"},
+                                                            {0xffff00ff, "Yellow"},
+                                                            {0x0000ffff, "Blue"},
+                                                            {0xff00ffff, "Magenta"},
+                                                            {0x00ffffff, "Cyan"},
+                                                            {0xffffffff, "White"}});
 
 std::string_view MapGarminColor(uint32_t rgba)
 {
   std::string_view closestColor = kRGBAToGarmin[0].color;
   auto minDistance = std::numeric_limits<int>::max();
-  for (const auto & [rgbaGarmin, color] : kRGBAToGarmin)
+  for (auto const & [rgbaGarmin, color] : kRGBAToGarmin)
   {
     auto const distance = ColorDistance(rgba, rgbaGarmin);
 
@@ -540,17 +521,14 @@ std::string CoordToString(double c)
 
 void SaveColorToRGB(Writer & writer, uint32_t rgba)
 {
-  writer << NumToHex(static_cast<uint8_t>(rgba >> 24 & 0xFF))
-         << NumToHex(static_cast<uint8_t>((rgba >> 16) & 0xFF))
+  writer << NumToHex(static_cast<uint8_t>(rgba >> 24 & 0xFF)) << NumToHex(static_cast<uint8_t>((rgba >> 16) & 0xFF))
          << NumToHex(static_cast<uint8_t>((rgba >> 8) & 0xFF));
 }
 
 void SaveColorToARGB(Writer & writer, uint32_t rgba)
 {
-  writer << NumToHex(static_cast<uint8_t>(rgba & 0xFF))
-         << NumToHex(static_cast<uint8_t>(rgba >> 24 & 0xFF))
-         << NumToHex(static_cast<uint8_t>((rgba >> 16) & 0xFF))
-         << NumToHex(static_cast<uint8_t>((rgba >> 8) & 0xFF));
+  writer << NumToHex(static_cast<uint8_t>(rgba & 0xFF)) << NumToHex(static_cast<uint8_t>(rgba >> 24 & 0xFF))
+         << NumToHex(static_cast<uint8_t>((rgba >> 16) & 0xFF)) << NumToHex(static_cast<uint8_t>((rgba >> 8) & 0xFF));
 }
 
 void SaveCategoryData(Writer & writer, CategoryData const & categoryData)
@@ -687,8 +665,7 @@ void GpxWriter::Write(FileData const & fileData)
 
 }  // namespace gpx
 
-DeserializerGpx::DeserializerGpx(FileData & fileData)
-: m_fileData(fileData)
+DeserializerGpx::DeserializerGpx(FileData & fileData) : m_fileData(fileData)
 {
   m_fileData = {};
 }
diff --git a/libs/kml/serdes_gpx.hpp b/libs/kml/serdes_gpx.hpp
index 593d169b1..d5c42a7dc 100644
--- a/libs/kml/serdes_gpx.hpp
+++ b/libs/kml/serdes_gpx.hpp
@@ -22,9 +22,7 @@ class GpxWriter
 public:
   DECLARE_EXCEPTION(WriteGpxException, RootException);
 
-  explicit GpxWriter(Writer & writer)
-    : m_writer(writer)
-  {}
+  explicit GpxWriter(Writer & writer) : m_writer(writer) {}
 
   void Write(FileData const & fileData);
 
@@ -37,9 +35,7 @@ class SerializerGpx
 public:
   DECLARE_EXCEPTION(SerializeException, RootException);
 
-  explicit SerializerGpx(FileData const & fileData)
-    : m_fileData(fileData)
-  {}
+  explicit SerializerGpx(FileData const & fileData) : m_fileData(fileData) {}
 
   template <typename Sink>
   void Serialize(Sink & sink)
@@ -87,7 +83,7 @@ private:
   GeometryType m_geometryType;
   MultiGeometry m_geometry;
   uint32_t m_color;
-  uint32_t m_globalColor; // To support OSMAnd extensions with single color per GPX file
+  uint32_t m_globalColor;  // To support OSMAnd extensions with single color per GPX file
 
   std::string m_name;
   std::string m_description;
diff --git a/libs/kml/type_utils.cpp b/libs/kml/type_utils.cpp
index be6979190..3f7b980dc 100644
--- a/libs/kml/type_utils.cpp
+++ b/libs/kml/type_utils.cpp
@@ -52,7 +52,7 @@ std::string GetPreferredBookmarkStr(LocalizableString const & name, feature::Reg
     nameMultilang.AddString(pair.first, pair.second);
 
   feature::NameParamsOut out;
-  feature::GetReadableName({ nameMultilang, regionData, languageNorm, false /* allowTranslit */ }, out);
+  feature::GetReadableName({nameMultilang, regionData, languageNorm, false /* allowTranslit */}, out);
   return std::string(out.primary);
 }
 
diff --git a/libs/kml/type_utils.hpp b/libs/kml/type_utils.hpp
index a08803095..8fd3063fe 100644
--- a/libs/kml/type_utils.hpp
+++ b/libs/kml/type_utils.hpp
@@ -10,13 +10,17 @@
 #include <unordered_map>
 #include <vector>
 
-namespace feature { class RegionData; }
+namespace feature
+{
+class RegionData;
+}
 
 namespace kml
 {
 using TimestampClock = std::chrono::system_clock;
 using Timestamp = std::chrono::time_point<TimestampClock>;
-class TimestampMillis : public Timestamp {
+class TimestampMillis : public Timestamp
+{
 public:
   TimestampMillis() = default;
   explicit TimestampMillis(Timestamp const & ts) : Timestamp{ts} {}
@@ -98,16 +102,15 @@ inline void SetDefaultStr(LocalizableString & localizableStr, std::string const
 bool IsEqual(m2::PointD const & lhs, m2::PointD const & rhs);
 bool IsEqual(geometry::PointWithAltitude const & lhs, geometry::PointWithAltitude const & rhs);
 
-template <class T> bool IsEqual(std::vector<T> const & lhs, std::vector<T> const & rhs)
+template <class T>
+bool IsEqual(std::vector<T> const & lhs, std::vector<T> const & rhs)
 {
   if (lhs.size() != rhs.size())
     return false;
 
   for (size_t i = 0; i < lhs.size(); ++i)
-  {
     if (!IsEqual(lhs[i], rhs[i]))
       return false;
-  }
 
   return true;
 }
@@ -129,9 +132,10 @@ std::string GetLocalizedFeatureType(std::vector<uint32_t> const & types);
   void ClearCollectionIndex()                          \
   {                                                    \
     m_collectionIndex.clear();                         \
-  }                                                    \
+  }
 
 #define VISITOR_COLLECTABLE visitor(m_collectionIndex, "collectionIndex")
 
-#define SKIP_VISITING(Type) void operator()(Type, char const * = nullptr) {}
+#define SKIP_VISITING(Type)                        \
+  void operator()(Type, char const * = nullptr) {}
 }  // namespace kml
diff --git a/libs/kml/types.cpp b/libs/kml/types.cpp
index 4a76b7994..c54396f80 100644
--- a/libs/kml/types.cpp
+++ b/libs/kml/types.cpp
@@ -23,10 +23,7 @@ void SetBookmarksMinZoom(FileData & fileData, double countPerTile, int maxZoom)
       UNUSED_VALUE(strings::to_int(s->second, score));
     minZoomQuadtree.Add(bm.m_point, ValueType{&bm, score});
   }
-  auto const setMinZoom = [](ValueType & valueType, int minZoom)
-  {
-    valueType.first->m_minZoom = minZoom;
-  };
+  auto const setMinZoom = [](ValueType & valueType, int minZoom) { valueType.first->m_minZoom = minZoom; };
   minZoomQuadtree.SetMinZoom(countPerTile, maxZoom, setMinZoom);
 }
 
@@ -36,7 +33,7 @@ bool MultiGeometry::IsValid() const
   return !m_lines.empty();
 }
 
-void MultiGeometry::Clear() 
+void MultiGeometry::Clear()
 {
   m_lines.clear();
   m_timestamps.clear();
@@ -47,10 +44,8 @@ bool MultiGeometry::HasTimestamps() const
   if (m_timestamps.empty())
     return false;
   for (auto const & timestamp : m_timestamps)
-  {
     if (!timestamp.empty())
       return true;
-  }
   return false;
 }
 
diff --git a/libs/kml/types.hpp b/libs/kml/types.hpp
index 97c542a63..dbe1c91f2 100644
--- a/libs/kml/types.hpp
+++ b/libs/kml/types.hpp
@@ -70,7 +70,7 @@ inline std::string DebugPrint(PredefinedColor color)
 {
   switch (color)
   {
-  using enum kml::PredefinedColor;
+    using enum kml::PredefinedColor;
   case None: return "None";
   case Red: return "Red";
   case Blue: return "Blue";
@@ -97,7 +97,7 @@ inline dp::Color ColorFromPredefinedColor(PredefinedColor color)
 {
   switch (color)
   {
-  using enum kml::PredefinedColor;
+    using enum kml::PredefinedColor;
   case Red: return dp::Color(229, 27, 35, 255);
   case Pink: return dp::Color(255, 65, 130, 255);
   case Purple: return dp::Color(155, 36, 178, 255);
@@ -139,7 +139,7 @@ inline std::string DebugPrint(AccessRules accessRules)
 {
   switch (accessRules)
   {
-  using enum kml::AccessRules;
+    using enum kml::AccessRules;
   case Local: return "Local";
   case Public: return "Public";
   case DirectLink: return "DirectLink";
@@ -163,7 +163,7 @@ inline std::string DebugPrint(CompilationType compilationType)
 {
   switch (compilationType)
   {
-  using enum kml::CompilationType;
+    using enum kml::CompilationType;
   case Category: return "Category";
   case Collection: return "Collection";
   case Day: return "Day";
@@ -221,7 +221,7 @@ inline std::string ToString(BookmarkIcon icon)
 {
   switch (icon)
   {
-  using enum kml::BookmarkIcon;
+    using enum kml::BookmarkIcon;
   case None: return "None";
   case Hotel: return "Hotel";
   case Animals: return "Animals";
@@ -269,8 +269,7 @@ inline std::string ToString(BookmarkIcon icon)
 // will affect previous kmb versions, where this structure was used.
 struct ColorData
 {
-  DECLARE_VISITOR_AND_DEBUG_PRINT(ColorData, visitor(m_predefinedColor, "predefinedColor"),
-                                  visitor(m_rgba, "rgba"))
+  DECLARE_VISITOR_AND_DEBUG_PRINT(ColorData, visitor(m_predefinedColor, "predefinedColor"), visitor(m_rgba, "rgba"))
 
   bool operator==(ColorData const & data) const
   {
@@ -291,43 +290,27 @@ struct ColorData
 // in case of any changes of its binary format.
 struct BookmarkData
 {
-  DECLARE_VISITOR_AND_DEBUG_PRINT(BookmarkData, visitor(m_id, "id"),
-                                  visitor(m_name, "name"),
-                                  visitor(m_description, "description"),
-                                  visitor(m_featureTypes, "featureTypes"),
-                                  visitor(m_customName, "customName"),
-                                  visitor(m_color, "color"),
-                                  visitor(m_icon, "icon"),
-                                  visitor(m_viewportScale, "viewportScale"),
-                                  visitor(m_timestamp, "timestamp"),
-                                  visitor(m_point, "point"),
-                                  visitor(m_boundTracks, "boundTracks"),
-                                  visitor(m_visible, "visible"),
-                                  visitor(m_nearestToponym, "nearestToponym"),
-                                  visitor(m_minZoom, "minZoom"),
-                                  visitor(m_compilations, "compilations"),
-                                  visitor(m_properties, "properties"),
+  DECLARE_VISITOR_AND_DEBUG_PRINT(BookmarkData, visitor(m_id, "id"), visitor(m_name, "name"),
+                                  visitor(m_description, "description"), visitor(m_featureTypes, "featureTypes"),
+                                  visitor(m_customName, "customName"), visitor(m_color, "color"),
+                                  visitor(m_icon, "icon"), visitor(m_viewportScale, "viewportScale"),
+                                  visitor(m_timestamp, "timestamp"), visitor(m_point, "point"),
+                                  visitor(m_boundTracks, "boundTracks"), visitor(m_visible, "visible"),
+                                  visitor(m_nearestToponym, "nearestToponym"), visitor(m_minZoom, "minZoom"),
+                                  visitor(m_compilations, "compilations"), visitor(m_properties, "properties"),
                                   VISITOR_COLLECTABLE)
 
-  DECLARE_COLLECTABLE(LocalizableStringIndex, m_name, m_description, m_customName,
-                      m_nearestToponym, m_properties)
+  DECLARE_COLLECTABLE(LocalizableStringIndex, m_name, m_description, m_customName, m_nearestToponym, m_properties)
 
   bool operator==(BookmarkData const & data) const
   {
-    return m_id == data.m_id && m_name == data.m_name &&
-           m_description == data.m_description &&
-           m_color == data.m_color && m_icon == data.m_icon &&
-           m_viewportScale == data.m_viewportScale &&
-           IsEqual(m_timestamp, data.m_timestamp) &&
-           m_point.EqualDxDy(data.m_point, kMwmPointAccuracy) &&
-           m_featureTypes == data.m_featureTypes &&
-           m_customName == data.m_customName &&
-           m_boundTracks == data.m_boundTracks &&
-           m_visible == data.m_visible &&
-           m_nearestToponym == data.m_nearestToponym &&
-           m_minZoom == data.m_minZoom &&
-           m_compilations == data.m_compilations &&
-           m_properties == data.m_properties;
+    return m_id == data.m_id && m_name == data.m_name && m_description == data.m_description &&
+           m_color == data.m_color && m_icon == data.m_icon && m_viewportScale == data.m_viewportScale &&
+           IsEqual(m_timestamp, data.m_timestamp) && m_point.EqualDxDy(data.m_point, kMwmPointAccuracy) &&
+           m_featureTypes == data.m_featureTypes && m_customName == data.m_customName &&
+           m_boundTracks == data.m_boundTracks && m_visible == data.m_visible &&
+           m_nearestToponym == data.m_nearestToponym && m_minZoom == data.m_minZoom &&
+           m_compilations == data.m_compilations && m_properties == data.m_properties;
   }
 
   bool operator!=(BookmarkData const & data) const { return !operator==(data); }
@@ -371,8 +354,7 @@ struct BookmarkData
 // will affect previous kmb versions, where this structure was used.
 struct TrackLayer
 {
-  DECLARE_VISITOR_AND_DEBUG_PRINT(TrackLayer, visitor(m_lineWidth, "lineWidth"),
-                                  visitor(m_color, "color"))
+  DECLARE_VISITOR_AND_DEBUG_PRINT(TrackLayer, visitor(m_lineWidth, "lineWidth"), visitor(m_color, "color"))
 
   bool operator==(TrackLayer const & layer) const
   {
@@ -428,16 +410,11 @@ struct MultiGeometry
 
 struct TrackData
 {
-  DECLARE_VISITOR_AND_DEBUG_PRINT(TrackData, visitor(m_id, "id"),
-                                  visitor(m_localId, "localId"),
-                                  visitor(m_name, "name"),
-                                  visitor(m_description, "description"),
-                                  visitor(m_layers, "layers"),
-                                  visitor(m_timestamp, "timestamp"),
-                                  visitor(m_geometry, "geometry"),
-                                  visitor(m_visible, "visible"),
-                                  visitor(m_nearestToponyms, "nearestToponyms"),
-                                  visitor(m_properties, "properties"),
+  DECLARE_VISITOR_AND_DEBUG_PRINT(TrackData, visitor(m_id, "id"), visitor(m_localId, "localId"),
+                                  visitor(m_name, "name"), visitor(m_description, "description"),
+                                  visitor(m_layers, "layers"), visitor(m_timestamp, "timestamp"),
+                                  visitor(m_geometry, "geometry"), visitor(m_visible, "visible"),
+                                  visitor(m_nearestToponyms, "nearestToponyms"), visitor(m_properties, "properties"),
                                   VISITOR_COLLECTABLE)
 
   DECLARE_COLLECTABLE(LocalizableStringIndex, m_name, m_description, m_nearestToponyms, m_properties)
@@ -445,10 +422,9 @@ struct TrackData
   bool operator==(TrackData const & data) const
   {
     return m_id == data.m_id && m_localId == data.m_localId && m_name == data.m_name &&
-           m_description == data.m_description && m_layers == data.m_layers &&
-           IsEqual(m_timestamp, data.m_timestamp) && m_geometry == data.m_geometry &&
-           m_visible == data.m_visible && m_nearestToponyms == data.m_nearestToponyms &&
-           m_properties == data.m_properties;
+           m_description == data.m_description && m_layers == data.m_layers && IsEqual(m_timestamp, data.m_timestamp) &&
+           m_geometry == data.m_geometry && m_visible == data.m_visible &&
+           m_nearestToponyms == data.m_nearestToponyms && m_properties == data.m_properties;
   }
 
   bool operator!=(TrackData const & data) const { return !operator==(data); }
@@ -480,41 +456,29 @@ struct TrackData
 // in case of any changes of its binary format.
 struct CategoryData
 {
-  DECLARE_VISITOR_AND_DEBUG_PRINT(CategoryData, visitor(m_id, "id"),
-                                  visitor(m_compilationId, "compilationId"),
-                                  visitor(m_type, "type"),
-                                  visitor(m_name, "name"),
-                                  visitor(m_imageUrl, "imageUrl"),
-                                  visitor(m_annotation, "annotation"),
-                                  visitor(m_description, "description"),
-                                  visitor(m_visible, "visible"),
-                                  visitor(m_authorName, "authorName"),
-                                  visitor(m_authorId, "authorId"),
-                                  visitor(m_rating, "rating"),
-                                  visitor(m_reviewsNumber, "reviewsNumber"),
-                                  visitor(m_lastModified, "lastModified"),
-                                  visitor(m_accessRules, "accessRules"),
-                                  visitor(m_tags, "tags"),
-                                  visitor(m_toponyms, "toponyms"),
-                                  visitor(m_languageCodes, "languageCodes"),
-                                  visitor(m_properties, "properties"),
-                                  VISITOR_COLLECTABLE)
+  DECLARE_VISITOR_AND_DEBUG_PRINT(CategoryData, visitor(m_id, "id"), visitor(m_compilationId, "compilationId"),
+                                  visitor(m_type, "type"), visitor(m_name, "name"), visitor(m_imageUrl, "imageUrl"),
+                                  visitor(m_annotation, "annotation"), visitor(m_description, "description"),
+                                  visitor(m_visible, "visible"), visitor(m_authorName, "authorName"),
+                                  visitor(m_authorId, "authorId"), visitor(m_rating, "rating"),
+                                  visitor(m_reviewsNumber, "reviewsNumber"), visitor(m_lastModified, "lastModified"),
+                                  visitor(m_accessRules, "accessRules"), visitor(m_tags, "tags"),
+                                  visitor(m_toponyms, "toponyms"), visitor(m_languageCodes, "languageCodes"),
+                                  visitor(m_properties, "properties"), VISITOR_COLLECTABLE)
 
-  DECLARE_COLLECTABLE(LocalizableStringIndex, m_name, m_annotation, m_description,
-                      m_imageUrl, m_authorName, m_authorId, m_tags, m_toponyms, m_properties)
+  DECLARE_COLLECTABLE(LocalizableStringIndex, m_name, m_annotation, m_description, m_imageUrl, m_authorName, m_authorId,
+                      m_tags, m_toponyms, m_properties)
 
   bool operator==(CategoryData const & data) const
   {
     double constexpr kEps = 1e-5;
-    return m_id == data.m_id && m_compilationId == data.m_compilationId &&
-           m_type == data.m_type && m_name == data.m_name && m_imageUrl == data.m_imageUrl &&
-           m_annotation == data.m_annotation && m_description == data.m_description &&
-           m_visible == data.m_visible && m_accessRules == data.m_accessRules &&
+    return m_id == data.m_id && m_compilationId == data.m_compilationId && m_type == data.m_type &&
+           m_name == data.m_name && m_imageUrl == data.m_imageUrl && m_annotation == data.m_annotation &&
+           m_description == data.m_description && m_visible == data.m_visible && m_accessRules == data.m_accessRules &&
            m_authorName == data.m_authorName && m_authorId == data.m_authorId &&
            fabs(m_rating - data.m_rating) < kEps && m_reviewsNumber == data.m_reviewsNumber &&
-           IsEqual(m_lastModified, data.m_lastModified) && m_tags == data.m_tags &&
-           m_toponyms == data.m_toponyms && m_languageCodes == data.m_languageCodes &&
-           m_properties == data.m_properties;
+           IsEqual(m_lastModified, data.m_lastModified) && m_tags == data.m_tags && m_toponyms == data.m_toponyms &&
+           m_languageCodes == data.m_languageCodes && m_properties == data.m_properties;
   }
 
   bool operator!=(CategoryData const & data) const { return !operator==(data); }
@@ -561,10 +525,8 @@ struct CategoryData
 
 struct FileData
 {
-  DECLARE_VISITOR_AND_DEBUG_PRINT(FileData, visitor(m_serverId, "serverId"),
-                                  visitor(m_categoryData, "category"),
-                                  visitor(m_bookmarksData, "bookmarks"),
-                                  visitor(m_tracksData, "tracks"),
+  DECLARE_VISITOR_AND_DEBUG_PRINT(FileData, visitor(m_serverId, "serverId"), visitor(m_categoryData, "category"),
+                                  visitor(m_bookmarksData, "bookmarks"), visitor(m_tracksData, "tracks"),
                                   visitor(m_compilationsData, "compilations"))
 
   bool operator==(FileData const & data) const
diff --git a/libs/kml/types_v3.hpp b/libs/kml/types_v3.hpp
index f5ebfad11..d0f085e03 100644
--- a/libs/kml/types_v3.hpp
+++ b/libs/kml/types_v3.hpp
@@ -17,32 +17,22 @@ namespace kml
 {
 struct BookmarkDataV3
 {
-  DECLARE_VISITOR_AND_DEBUG_PRINT(BookmarkDataV3, visitor(m_id, "id"),
-                                  visitor(m_name, "name"),
-                                  visitor(m_description, "description"),
-                                  visitor(m_featureTypes, "featureTypes"),
-                                  visitor(m_customName, "customName"),
-                                  visitor(m_color, "color"),
-                                  visitor(m_icon, "icon"),
-                                  visitor(m_viewportScale, "viewportScale"),
-                                  visitor(m_timestamp, "timestamp"),
-                                  visitor(m_point, "point"),
-                                  visitor(m_boundTracks, "boundTracks"),
-                                  VISITOR_COLLECTABLE)
+  DECLARE_VISITOR_AND_DEBUG_PRINT(BookmarkDataV3, visitor(m_id, "id"), visitor(m_name, "name"),
+                                  visitor(m_description, "description"), visitor(m_featureTypes, "featureTypes"),
+                                  visitor(m_customName, "customName"), visitor(m_color, "color"),
+                                  visitor(m_icon, "icon"), visitor(m_viewportScale, "viewportScale"),
+                                  visitor(m_timestamp, "timestamp"), visitor(m_point, "point"),
+                                  visitor(m_boundTracks, "boundTracks"), VISITOR_COLLECTABLE)
 
   DECLARE_COLLECTABLE(LocalizableStringIndex, m_name, m_description, m_customName)
 
   bool operator==(BookmarkDataV3 const & data) const
   {
     double constexpr kEps = 1e-5;
-    return m_id == data.m_id && m_name == data.m_name &&
-           m_description == data.m_description &&
-           m_color == data.m_color && m_icon == data.m_icon &&
-           m_viewportScale == data.m_viewportScale &&
-           IsEqual(m_timestamp, data.m_timestamp) &&
-           m_point.EqualDxDy(data.m_point, kEps) &&
-           m_featureTypes == data.m_featureTypes &&
-           m_customName == data.m_customName &&
+    return m_id == data.m_id && m_name == data.m_name && m_description == data.m_description &&
+           m_color == data.m_color && m_icon == data.m_icon && m_viewportScale == data.m_viewportScale &&
+           IsEqual(m_timestamp, data.m_timestamp) && m_point.EqualDxDy(data.m_point, kEps) &&
+           m_featureTypes == data.m_featureTypes && m_customName == data.m_customName &&
            m_boundTracks == data.m_boundTracks;
   }
 
@@ -91,22 +81,18 @@ struct BookmarkDataV3
 
 struct TrackDataV3
 {
-  DECLARE_VISITOR_AND_DEBUG_PRINT(TrackDataV3, visitor(m_id, "id"),
-                                  visitor(m_localId, "localId"),
-                                  visitor(m_name, "name"),
-                                  visitor(m_description, "description"),
-                                  visitor(m_layers, "layers"),
-                                  visitor(m_timestamp, "timestamp"),
-                                  visitor(m_points, "points"),
-                                  VISITOR_COLLECTABLE)
+  DECLARE_VISITOR_AND_DEBUG_PRINT(TrackDataV3, visitor(m_id, "id"), visitor(m_localId, "localId"),
+                                  visitor(m_name, "name"), visitor(m_description, "description"),
+                                  visitor(m_layers, "layers"), visitor(m_timestamp, "timestamp"),
+                                  visitor(m_points, "points"), VISITOR_COLLECTABLE)
 
   DECLARE_COLLECTABLE(LocalizableStringIndex, m_name, m_description)
 
   bool operator==(TrackDataV3 const & data) const
   {
     return m_id == data.m_id && m_localId == data.m_localId && m_name == data.m_name &&
-           m_description == data.m_description && m_layers == data.m_layers &&
-           IsEqual(m_timestamp, data.m_timestamp) && IsEqual(m_points, data.m_points);
+           m_description == data.m_description && m_layers == data.m_layers && IsEqual(m_timestamp, data.m_timestamp) &&
+           IsEqual(m_points, data.m_points);
   }
 
   bool operator!=(TrackDataV3 const & data) const { return !operator==(data); }
@@ -142,38 +128,28 @@ struct TrackDataV3
 
 struct CategoryDataV3
 {
-  DECLARE_VISITOR_AND_DEBUG_PRINT(CategoryDataV3, visitor(m_id, "id"),
-                                  visitor(m_name, "name"),
-                                  visitor(m_imageUrl, "imageUrl"),
-                                  visitor(m_annotation, "annotation"),
-                                  visitor(m_description, "description"),
-                                  visitor(m_visible, "visible"),
-                                  visitor(m_authorName, "authorName"),
-                                  visitor(m_authorId, "authorId"),
-                                  visitor(m_rating, "rating"),
-                                  visitor(m_reviewsNumber, "reviewsNumber"),
-                                  visitor(m_lastModified, "lastModified"),
-                                  visitor(m_accessRules, "accessRules"),
-                                  visitor(m_tags, "tags"),
-                                  visitor(m_cities, "cities"),
-                                  visitor(m_languageCodes, "languageCodes"),
-                                  visitor(m_properties, "properties"),
+  DECLARE_VISITOR_AND_DEBUG_PRINT(CategoryDataV3, visitor(m_id, "id"), visitor(m_name, "name"),
+                                  visitor(m_imageUrl, "imageUrl"), visitor(m_annotation, "annotation"),
+                                  visitor(m_description, "description"), visitor(m_visible, "visible"),
+                                  visitor(m_authorName, "authorName"), visitor(m_authorId, "authorId"),
+                                  visitor(m_rating, "rating"), visitor(m_reviewsNumber, "reviewsNumber"),
+                                  visitor(m_lastModified, "lastModified"), visitor(m_accessRules, "accessRules"),
+                                  visitor(m_tags, "tags"), visitor(m_cities, "cities"),
+                                  visitor(m_languageCodes, "languageCodes"), visitor(m_properties, "properties"),
                                   VISITOR_COLLECTABLE)
 
-  DECLARE_COLLECTABLE(LocalizableStringIndex, m_name, m_annotation, m_description,
-                      m_imageUrl, m_authorName, m_authorId, m_tags, m_properties)
+  DECLARE_COLLECTABLE(LocalizableStringIndex, m_name, m_annotation, m_description, m_imageUrl, m_authorName, m_authorId,
+                      m_tags, m_properties)
 
   bool operator==(CategoryDataV3 const & data) const
   {
     double constexpr kEps = 1e-5;
     return m_id == data.m_id && m_name == data.m_name && m_imageUrl == data.m_imageUrl &&
-           m_annotation == data.m_annotation && m_description == data.m_description &&
-           m_visible == data.m_visible && m_accessRules == data.m_accessRules &&
-           m_authorName == data.m_authorName && m_authorId == data.m_authorId &&
+           m_annotation == data.m_annotation && m_description == data.m_description && m_visible == data.m_visible &&
+           m_accessRules == data.m_accessRules && m_authorName == data.m_authorName && m_authorId == data.m_authorId &&
            fabs(m_rating - data.m_rating) < kEps && m_reviewsNumber == data.m_reviewsNumber &&
-           IsEqual(m_lastModified, data.m_lastModified) && m_tags == data.m_tags &&
-           IsEqual(m_cities, data.m_cities) && m_languageCodes == data.m_languageCodes &&
-           m_properties == data.m_properties;
+           IsEqual(m_lastModified, data.m_lastModified) && m_tags == data.m_tags && IsEqual(m_cities, data.m_cities) &&
+           m_languageCodes == data.m_languageCodes && m_properties == data.m_properties;
   }
 
   bool operator!=(CategoryDataV3 const & data) const { return !operator==(data); }
@@ -236,10 +212,8 @@ struct CategoryDataV3
 
 struct FileDataV3
 {
-  DECLARE_VISITOR_AND_DEBUG_PRINT(FileDataV3, visitor(m_serverId, "serverId"),
-                                  visitor(m_categoryData, "category"),
-                                  visitor(m_bookmarksData, "bookmarks"),
-                                  visitor(m_tracksData, "tracks"))
+  DECLARE_VISITOR_AND_DEBUG_PRINT(FileDataV3, visitor(m_serverId, "serverId"), visitor(m_categoryData, "category"),
+                                  visitor(m_bookmarksData, "bookmarks"), visitor(m_tracksData, "tracks"))
 
   bool operator==(FileDataV3 const & data) const
   {
diff --git a/libs/kml/types_v6.hpp b/libs/kml/types_v6.hpp
index 3ad2b428b..7b51bbacf 100644
--- a/libs/kml/types_v6.hpp
+++ b/libs/kml/types_v6.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "kml/type_utils.hpp"
-#include "kml/types_v7.hpp"
 #include "kml/types.hpp"
+#include "kml/types_v7.hpp"
 
 #include "base/visitor.hpp"
 
@@ -21,16 +21,11 @@ using BookmarkDataV6 = BookmarkDataV7;
 // Saved V6 version of TrackData to support migration from V6 to V7.
 struct TrackDataV6
 {
-  DECLARE_VISITOR_AND_DEBUG_PRINT(TrackDataV6, visitor(m_id, "id"),
-                                  visitor(m_localId, "localId"),
-                                  visitor(m_name, "name"),
-                                  visitor(m_description, "description"),
-                                  visitor(m_layers, "layers"),
-                                  visitor(m_timestamp, "timestamp"),
-                                  visitor(m_points, "points"),
-                                  visitor(m_visible, "visible"),
-                                  visitor(m_nearestToponyms, "nearestToponyms"),
-                                  visitor(m_properties, "properties"),
+  DECLARE_VISITOR_AND_DEBUG_PRINT(TrackDataV6, visitor(m_id, "id"), visitor(m_localId, "localId"),
+                                  visitor(m_name, "name"), visitor(m_description, "description"),
+                                  visitor(m_layers, "layers"), visitor(m_timestamp, "timestamp"),
+                                  visitor(m_points, "points"), visitor(m_visible, "visible"),
+                                  visitor(m_nearestToponyms, "nearestToponyms"), visitor(m_properties, "properties"),
                                   VISITOR_COLLECTABLE)
 
   DECLARE_COLLECTABLE(LocalizableStringIndex, m_name, m_description, m_nearestToponyms, m_properties)
@@ -38,10 +33,9 @@ struct TrackDataV6
   bool operator==(TrackDataV6 const & data) const
   {
     return m_id == data.m_id && m_localId == data.m_localId && m_name == data.m_name &&
-           m_description == data.m_description && m_layers == data.m_layers &&
-           IsEqual(m_timestamp, data.m_timestamp) && IsEqual(m_points, data.m_points) &&
-           m_visible == data.m_visible && m_nearestToponyms == data.m_nearestToponyms &&
-           m_properties == data.m_properties;
+           m_description == data.m_description && m_layers == data.m_layers && IsEqual(m_timestamp, data.m_timestamp) &&
+           IsEqual(m_points, data.m_points) && m_visible == data.m_visible &&
+           m_nearestToponyms == data.m_nearestToponyms && m_properties == data.m_properties;
   }
 
   bool operator!=(TrackDataV6 const & data) const { return !operator==(data); }
@@ -89,10 +83,8 @@ using CategoryDataV6 = CategoryDataV7;
 
 struct FileDataV6
 {
-  DECLARE_VISITOR_AND_DEBUG_PRINT(FileDataV6, visitor(m_serverId, "serverId"),
-                                  visitor(m_categoryData, "category"),
-                                  visitor(m_bookmarksData, "bookmarks"),
-                                  visitor(m_tracksData, "tracks"))
+  DECLARE_VISITOR_AND_DEBUG_PRINT(FileDataV6, visitor(m_serverId, "serverId"), visitor(m_categoryData, "category"),
+                                  visitor(m_bookmarksData, "bookmarks"), visitor(m_tracksData, "tracks"))
 
   bool operator==(FileDataV6 const & data) const
   {
diff --git a/libs/kml/types_v7.hpp b/libs/kml/types_v7.hpp
index fa47592f1..c92400ab3 100644
--- a/libs/kml/types_v7.hpp
+++ b/libs/kml/types_v7.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "kml/type_utils.hpp"
-#include "kml/types_v8.hpp"
 #include "kml/types.hpp"
+#include "kml/types_v8.hpp"
 
 #include "base/visitor.hpp"
 
@@ -18,39 +18,25 @@ namespace kml
 // TODO(tomilov): check that BookmarkData changed in V8
 struct BookmarkDataV7
 {
-  DECLARE_VISITOR_AND_DEBUG_PRINT(BookmarkDataV7, visitor(m_id, "id"),
-                                  visitor(m_name, "name"),
-                                  visitor(m_description, "description"),
-                                  visitor(m_featureTypes, "featureTypes"),
-                                  visitor(m_customName, "customName"),
-                                  visitor(m_color, "color"),
-                                  visitor(m_icon, "icon"),
-                                  visitor(m_viewportScale, "viewportScale"),
-                                  visitor(m_timestamp, "timestamp"),
-                                  visitor(m_point, "point"),
-                                  visitor(m_boundTracks, "boundTracks"),
-                                  visitor(m_visible, "visible"),
-                                  visitor(m_nearestToponym, "nearestToponym"),
-                                  visitor(m_properties, "properties"),
+  DECLARE_VISITOR_AND_DEBUG_PRINT(BookmarkDataV7, visitor(m_id, "id"), visitor(m_name, "name"),
+                                  visitor(m_description, "description"), visitor(m_featureTypes, "featureTypes"),
+                                  visitor(m_customName, "customName"), visitor(m_color, "color"),
+                                  visitor(m_icon, "icon"), visitor(m_viewportScale, "viewportScale"),
+                                  visitor(m_timestamp, "timestamp"), visitor(m_point, "point"),
+                                  visitor(m_boundTracks, "boundTracks"), visitor(m_visible, "visible"),
+                                  visitor(m_nearestToponym, "nearestToponym"), visitor(m_properties, "properties"),
                                   VISITOR_COLLECTABLE)
 
-  DECLARE_COLLECTABLE(LocalizableStringIndex, m_name, m_description, m_customName,
-                      m_nearestToponym, m_properties)
+  DECLARE_COLLECTABLE(LocalizableStringIndex, m_name, m_description, m_customName, m_nearestToponym, m_properties)
 
   bool operator==(BookmarkDataV7 const & data) const
   {
-    return m_id == data.m_id && m_name == data.m_name &&
-           m_description == data.m_description &&
-           m_color == data.m_color && m_icon == data.m_icon &&
-           m_viewportScale == data.m_viewportScale &&
-           IsEqual(m_timestamp, data.m_timestamp) &&
-           m_point.EqualDxDy(data.m_point, kMwmPointAccuracy) &&
-           m_featureTypes == data.m_featureTypes &&
-           m_customName == data.m_customName &&
-           m_boundTracks == data.m_boundTracks &&
-           m_visible == data.m_visible &&
-           m_nearestToponym == data.m_nearestToponym &&
-           m_properties == data.m_properties;
+    return m_id == data.m_id && m_name == data.m_name && m_description == data.m_description &&
+           m_color == data.m_color && m_icon == data.m_icon && m_viewportScale == data.m_viewportScale &&
+           IsEqual(m_timestamp, data.m_timestamp) && m_point.EqualDxDy(data.m_point, kMwmPointAccuracy) &&
+           m_featureTypes == data.m_featureTypes && m_customName == data.m_customName &&
+           m_boundTracks == data.m_boundTracks && m_visible == data.m_visible &&
+           m_nearestToponym == data.m_nearestToponym && m_properties == data.m_properties;
   }
 
   bool operator!=(BookmarkDataV7 const & data) const { return !operator==(data); }
@@ -111,38 +97,28 @@ using TrackDataV7 = TrackDataV8;
 // TODO(tomilov): check that CategoryData changed in V8
 struct CategoryDataV7
 {
-  DECLARE_VISITOR_AND_DEBUG_PRINT(CategoryDataV7, visitor(m_id, "id"),
-                                  visitor(m_name, "name"),
-                                  visitor(m_imageUrl, "imageUrl"),
-                                  visitor(m_annotation, "annotation"),
-                                  visitor(m_description, "description"),
-                                  visitor(m_visible, "visible"),
-                                  visitor(m_authorName, "authorName"),
-                                  visitor(m_authorId, "authorId"),
-                                  visitor(m_rating, "rating"),
-                                  visitor(m_reviewsNumber, "reviewsNumber"),
-                                  visitor(m_lastModified, "lastModified"),
-                                  visitor(m_accessRules, "accessRules"),
-                                  visitor(m_tags, "tags"),
-                                  visitor(m_toponyms, "toponyms"),
-                                  visitor(m_languageCodes, "languageCodes"),
-                                  visitor(m_properties, "properties"),
+  DECLARE_VISITOR_AND_DEBUG_PRINT(CategoryDataV7, visitor(m_id, "id"), visitor(m_name, "name"),
+                                  visitor(m_imageUrl, "imageUrl"), visitor(m_annotation, "annotation"),
+                                  visitor(m_description, "description"), visitor(m_visible, "visible"),
+                                  visitor(m_authorName, "authorName"), visitor(m_authorId, "authorId"),
+                                  visitor(m_rating, "rating"), visitor(m_reviewsNumber, "reviewsNumber"),
+                                  visitor(m_lastModified, "lastModified"), visitor(m_accessRules, "accessRules"),
+                                  visitor(m_tags, "tags"), visitor(m_toponyms, "toponyms"),
+                                  visitor(m_languageCodes, "languageCodes"), visitor(m_properties, "properties"),
                                   VISITOR_COLLECTABLE)
 
-  DECLARE_COLLECTABLE(LocalizableStringIndex, m_name, m_annotation, m_description,
-                      m_imageUrl, m_authorName, m_authorId, m_tags, m_toponyms, m_properties)
+  DECLARE_COLLECTABLE(LocalizableStringIndex, m_name, m_annotation, m_description, m_imageUrl, m_authorName, m_authorId,
+                      m_tags, m_toponyms, m_properties)
 
   bool operator==(CategoryDataV7 const & data) const
   {
     double constexpr kEps = 1e-5;
     return m_id == data.m_id && m_name == data.m_name && m_imageUrl == data.m_imageUrl &&
-           m_annotation == data.m_annotation && m_description == data.m_description &&
-           m_visible == data.m_visible && m_accessRules == data.m_accessRules &&
-           m_authorName == data.m_authorName && m_authorId == data.m_authorId &&
+           m_annotation == data.m_annotation && m_description == data.m_description && m_visible == data.m_visible &&
+           m_accessRules == data.m_accessRules && m_authorName == data.m_authorName && m_authorId == data.m_authorId &&
            fabs(m_rating - data.m_rating) < kEps && m_reviewsNumber == data.m_reviewsNumber &&
-           IsEqual(m_lastModified, data.m_lastModified) && m_tags == data.m_tags &&
-           m_toponyms == data.m_toponyms && m_languageCodes == data.m_languageCodes &&
-           m_properties == data.m_properties;
+           IsEqual(m_lastModified, data.m_lastModified) && m_tags == data.m_tags && m_toponyms == data.m_toponyms &&
+           m_languageCodes == data.m_languageCodes && m_properties == data.m_properties;
   }
 
   bool operator!=(CategoryDataV7 const & data) const { return !operator==(data); }
@@ -205,10 +181,8 @@ struct CategoryDataV7
 
 struct FileDataV7
 {
-  DECLARE_VISITOR_AND_DEBUG_PRINT(FileDataV7, visitor(m_serverId, "serverId"),
-                                  visitor(m_categoryData, "category"),
-                                  visitor(m_bookmarksData, "bookmarks"),
-                                  visitor(m_tracksData, "tracks"))
+  DECLARE_VISITOR_AND_DEBUG_PRINT(FileDataV7, visitor(m_serverId, "serverId"), visitor(m_categoryData, "category"),
+                                  visitor(m_bookmarksData, "bookmarks"), visitor(m_tracksData, "tracks"))
 
   bool operator==(FileDataV7 const & data) const
   {
diff --git a/libs/kml/types_v8.hpp b/libs/kml/types_v8.hpp
index d433d833c..fb8744d97 100644
--- a/libs/kml/types_v8.hpp
+++ b/libs/kml/types_v8.hpp
@@ -7,40 +7,25 @@ namespace kml
 
 struct BookmarkDataV8
 {
-  DECLARE_VISITOR_AND_DEBUG_PRINT(BookmarkDataV8, visitor(m_id, "id"),
-                                  visitor(m_name, "name"),
-                                  visitor(m_description, "description"),
-                                  visitor(m_featureTypes, "featureTypes"),
-                                  visitor(m_customName, "customName"),
-                                  visitor(m_color, "color"),
-                                  visitor(m_icon, "icon"),
-                                  visitor(m_viewportScale, "viewportScale"),
-                                  visitor(m_timestamp, "timestamp"),
-                                  visitor(m_point, "point"),
-                                  visitor(m_boundTracks, "boundTracks"),
-                                  visitor(m_visible, "visible"),
-                                  visitor(m_nearestToponym, "nearestToponym"),
-                                  visitor(m_properties, "properties"),
-                                  visitor(m_compilations, "compilations"),
-                                  VISITOR_COLLECTABLE)
+  DECLARE_VISITOR_AND_DEBUG_PRINT(BookmarkDataV8, visitor(m_id, "id"), visitor(m_name, "name"),
+                                  visitor(m_description, "description"), visitor(m_featureTypes, "featureTypes"),
+                                  visitor(m_customName, "customName"), visitor(m_color, "color"),
+                                  visitor(m_icon, "icon"), visitor(m_viewportScale, "viewportScale"),
+                                  visitor(m_timestamp, "timestamp"), visitor(m_point, "point"),
+                                  visitor(m_boundTracks, "boundTracks"), visitor(m_visible, "visible"),
+                                  visitor(m_nearestToponym, "nearestToponym"), visitor(m_properties, "properties"),
+                                  visitor(m_compilations, "compilations"), VISITOR_COLLECTABLE)
 
-  DECLARE_COLLECTABLE(LocalizableStringIndex, m_name, m_description, m_customName,
-                      m_nearestToponym, m_properties)
+  DECLARE_COLLECTABLE(LocalizableStringIndex, m_name, m_description, m_customName, m_nearestToponym, m_properties)
 
   bool operator==(BookmarkDataV8 const & data) const
   {
-    return m_id == data.m_id && m_name == data.m_name &&
-           m_description == data.m_description &&
-           m_color == data.m_color && m_icon == data.m_icon &&
-           m_viewportScale == data.m_viewportScale &&
-           IsEqual(m_timestamp, data.m_timestamp) &&
-           m_point.EqualDxDy(data.m_point, kMwmPointAccuracy) &&
-           m_featureTypes == data.m_featureTypes &&
-           m_customName == data.m_customName &&
-           m_boundTracks == data.m_boundTracks &&
-           m_visible == data.m_visible &&
-           m_nearestToponym == data.m_nearestToponym &&
-           m_properties == data.m_properties &&
+    return m_id == data.m_id && m_name == data.m_name && m_description == data.m_description &&
+           m_color == data.m_color && m_icon == data.m_icon && m_viewportScale == data.m_viewportScale &&
+           IsEqual(m_timestamp, data.m_timestamp) && m_point.EqualDxDy(data.m_point, kMwmPointAccuracy) &&
+           m_featureTypes == data.m_featureTypes && m_customName == data.m_customName &&
+           m_boundTracks == data.m_boundTracks && m_visible == data.m_visible &&
+           m_nearestToponym == data.m_nearestToponym && m_properties == data.m_properties &&
            m_compilations == data.m_compilations;
   }
 
@@ -129,10 +114,8 @@ using CategoryDataV8 = CategoryDataV9;
 
 struct FileDataV8
 {
-  DECLARE_VISITOR_AND_DEBUG_PRINT(FileDataV8, visitor(m_serverId, "serverId"),
-                                  visitor(m_categoryData, "category"),
-                                  visitor(m_bookmarksData, "bookmarks"),
-                                  visitor(m_tracksData, "tracks"),
+  DECLARE_VISITOR_AND_DEBUG_PRINT(FileDataV8, visitor(m_serverId, "serverId"), visitor(m_categoryData, "category"),
+                                  visitor(m_bookmarksData, "bookmarks"), visitor(m_tracksData, "tracks"),
                                   visitor(m_compilationData, "compilations"))
 
   bool operator==(FileDataV8 const & data) const
diff --git a/libs/kml/types_v8mm.hpp b/libs/kml/types_v8mm.hpp
index d5ef985b8..a7c5ec087 100644
--- a/libs/kml/types_v8mm.hpp
+++ b/libs/kml/types_v8mm.hpp
@@ -7,39 +7,25 @@ namespace kml
 // BookmarkDataV8MM contains the same fields as BookmarkDataV8 but without compilations.
 struct BookmarkDataV8MM
 {
-  DECLARE_VISITOR_AND_DEBUG_PRINT(BookmarkDataV8MM, visitor(m_id, "id"),
-                                  visitor(m_name, "name"),
-                                  visitor(m_description, "description"),
-                                  visitor(m_featureTypes, "featureTypes"),
-                                  visitor(m_customName, "customName"),
-                                  visitor(m_color, "color"),
-                                  visitor(m_icon, "icon"),
-                                  visitor(m_viewportScale, "viewportScale"),
-                                  visitor(m_timestamp, "timestamp"),
-                                  visitor(m_point, "point"),
-                                  visitor(m_boundTracks, "boundTracks"),
-                                  visitor(m_visible, "visible"),
-                                  visitor(m_nearestToponym, "nearestToponym"),
-                                  visitor(m_properties, "properties"),
+  DECLARE_VISITOR_AND_DEBUG_PRINT(BookmarkDataV8MM, visitor(m_id, "id"), visitor(m_name, "name"),
+                                  visitor(m_description, "description"), visitor(m_featureTypes, "featureTypes"),
+                                  visitor(m_customName, "customName"), visitor(m_color, "color"),
+                                  visitor(m_icon, "icon"), visitor(m_viewportScale, "viewportScale"),
+                                  visitor(m_timestamp, "timestamp"), visitor(m_point, "point"),
+                                  visitor(m_boundTracks, "boundTracks"), visitor(m_visible, "visible"),
+                                  visitor(m_nearestToponym, "nearestToponym"), visitor(m_properties, "properties"),
                                   VISITOR_COLLECTABLE)
 
-  DECLARE_COLLECTABLE(LocalizableStringIndex, m_name, m_description, m_customName,
-                      m_nearestToponym, m_properties)
+  DECLARE_COLLECTABLE(LocalizableStringIndex, m_name, m_description, m_customName, m_nearestToponym, m_properties)
 
   bool operator==(BookmarkDataV8MM const & data) const
   {
-    return m_id == data.m_id && m_name == data.m_name &&
-           m_description == data.m_description &&
-           m_color == data.m_color && m_icon == data.m_icon &&
-           m_viewportScale == data.m_viewportScale &&
-           IsEqual(m_timestamp, data.m_timestamp) &&
-           m_point.EqualDxDy(data.m_point, kMwmPointAccuracy) &&
-           m_featureTypes == data.m_featureTypes &&
-           m_customName == data.m_customName &&
-           m_boundTracks == data.m_boundTracks &&
-           m_visible == data.m_visible &&
-           m_nearestToponym == data.m_nearestToponym &&
-           m_properties == data.m_properties;
+    return m_id == data.m_id && m_name == data.m_name && m_description == data.m_description &&
+           m_color == data.m_color && m_icon == data.m_icon && m_viewportScale == data.m_viewportScale &&
+           IsEqual(m_timestamp, data.m_timestamp) && m_point.EqualDxDy(data.m_point, kMwmPointAccuracy) &&
+           m_featureTypes == data.m_featureTypes && m_customName == data.m_customName &&
+           m_boundTracks == data.m_boundTracks && m_visible == data.m_visible &&
+           m_nearestToponym == data.m_nearestToponym && m_properties == data.m_properties;
   }
 
   bool operator!=(BookmarkDataV8MM const & data) const { return !operator==(data); }
@@ -97,19 +83,14 @@ struct BookmarkDataV8MM
 
 struct TrackDataV8MM
 {
-  DECLARE_VISITOR_AND_DEBUG_PRINT(TrackDataV8MM, visitor(m_id, "id"),
-                                  visitor(m_localId, "localId"),
-                                  visitor(m_name, "name"),
-                                  visitor(m_description, "description"),
-                                  visitor(m_layers, "layers"),
-                                  visitor(m_timestamp, "timestamp"),
-                                  visitor(m_geometry, "geometry"),
-                                  visitor(m_visible, "visible"),
-                                  visitor(m_constant1, "constant1"), // Extra field introduced in V8MM.
-                                  visitor(m_constant2, "constant2"), // Extra field introduced in V8MM.
-                                  visitor(m_constant3, "constant3"), // Extra field introduced in V8MM.
-                                  visitor(m_nearestToponyms, "nearestToponyms"),
-                                  visitor(m_properties, "properties"),
+  DECLARE_VISITOR_AND_DEBUG_PRINT(TrackDataV8MM, visitor(m_id, "id"), visitor(m_localId, "localId"),
+                                  visitor(m_name, "name"), visitor(m_description, "description"),
+                                  visitor(m_layers, "layers"), visitor(m_timestamp, "timestamp"),
+                                  visitor(m_geometry, "geometry"), visitor(m_visible, "visible"),
+                                  visitor(m_constant1, "constant1"),  // Extra field introduced in V8MM.
+                                  visitor(m_constant2, "constant2"),  // Extra field introduced in V8MM.
+                                  visitor(m_constant3, "constant3"),  // Extra field introduced in V8MM.
+                                  visitor(m_nearestToponyms, "nearestToponyms"), visitor(m_properties, "properties"),
                                   VISITOR_COLLECTABLE)
 
   DECLARE_COLLECTABLE(LocalizableStringIndex, m_name, m_description, m_nearestToponyms, m_properties)
@@ -117,10 +98,9 @@ struct TrackDataV8MM
   bool operator==(TrackDataV8MM const & data) const
   {
     return m_id == data.m_id && m_localId == data.m_localId && m_name == data.m_name &&
-           m_description == data.m_description && m_layers == data.m_layers &&
-           IsEqual(m_timestamp, data.m_timestamp) && m_geometry == data.m_geometry &&
-           m_visible == data.m_visible && m_nearestToponyms == data.m_nearestToponyms &&
-           m_properties == data.m_properties;
+           m_description == data.m_description && m_layers == data.m_layers && IsEqual(m_timestamp, data.m_timestamp) &&
+           m_geometry == data.m_geometry && m_visible == data.m_visible &&
+           m_nearestToponyms == data.m_nearestToponyms && m_properties == data.m_properties;
   }
 
   bool operator!=(TrackDataV8MM const & data) const { return !operator==(data); }
@@ -166,41 +146,30 @@ struct TrackDataV8MM
   Properties m_properties;
 };
 
-
 // CategoryData8MM contains the same fields as CategoryData8 but with no compilations
 struct CategoryDataV8MM
 {
-  DECLARE_VISITOR_AND_DEBUG_PRINT(CategoryDataV8MM, visitor(m_id, "id"),
-                                  visitor(m_name, "name"),
-                                  visitor(m_imageUrl, "imageUrl"),
-                                  visitor(m_annotation, "annotation"),
-                                  visitor(m_description, "description"),
-                                  visitor(m_visible, "visible"),
-                                  visitor(m_authorName, "authorName"),
-                                  visitor(m_authorId, "authorId"),
-                                  visitor(m_rating, "rating"),
-                                  visitor(m_reviewsNumber, "reviewsNumber"),
-                                  visitor(m_lastModified, "lastModified"),
-                                  visitor(m_accessRules, "accessRules"),
-                                  visitor(m_tags, "tags"),
-                                  visitor(m_toponyms, "toponyms"),
-                                  visitor(m_languageCodes, "languageCodes"),
-                                  visitor(m_properties, "properties"),
+  DECLARE_VISITOR_AND_DEBUG_PRINT(CategoryDataV8MM, visitor(m_id, "id"), visitor(m_name, "name"),
+                                  visitor(m_imageUrl, "imageUrl"), visitor(m_annotation, "annotation"),
+                                  visitor(m_description, "description"), visitor(m_visible, "visible"),
+                                  visitor(m_authorName, "authorName"), visitor(m_authorId, "authorId"),
+                                  visitor(m_rating, "rating"), visitor(m_reviewsNumber, "reviewsNumber"),
+                                  visitor(m_lastModified, "lastModified"), visitor(m_accessRules, "accessRules"),
+                                  visitor(m_tags, "tags"), visitor(m_toponyms, "toponyms"),
+                                  visitor(m_languageCodes, "languageCodes"), visitor(m_properties, "properties"),
                                   VISITOR_COLLECTABLE)
 
-  DECLARE_COLLECTABLE(LocalizableStringIndex, m_name, m_annotation, m_description,
-                      m_imageUrl, m_authorName, m_authorId, m_tags, m_toponyms, m_properties)
+  DECLARE_COLLECTABLE(LocalizableStringIndex, m_name, m_annotation, m_description, m_imageUrl, m_authorName, m_authorId,
+                      m_tags, m_toponyms, m_properties)
 
   bool operator==(CategoryDataV8MM const & data) const
   {
     double constexpr kEps = 1e-5;
-    return m_id == data.m_id && m_name == data.m_name &&
-           m_imageUrl == data.m_imageUrl && m_annotation == data.m_annotation &&
-           m_description == data.m_description && m_visible == data.m_visible &&
-           m_accessRules == data.m_accessRules && m_authorName == data.m_authorName &&
-           m_authorId == data.m_authorId && fabs(m_rating - data.m_rating) < kEps &&
-           m_reviewsNumber == data.m_reviewsNumber && IsEqual(m_lastModified, data.m_lastModified) &&
-           m_tags == data.m_tags && m_toponyms == data.m_toponyms &&
+    return m_id == data.m_id && m_name == data.m_name && m_imageUrl == data.m_imageUrl &&
+           m_annotation == data.m_annotation && m_description == data.m_description && m_visible == data.m_visible &&
+           m_accessRules == data.m_accessRules && m_authorName == data.m_authorName && m_authorId == data.m_authorId &&
+           fabs(m_rating - data.m_rating) < kEps && m_reviewsNumber == data.m_reviewsNumber &&
+           IsEqual(m_lastModified, data.m_lastModified) && m_tags == data.m_tags && m_toponyms == data.m_toponyms &&
            m_languageCodes == data.m_languageCodes && m_properties == data.m_properties;
   }
 
@@ -208,7 +177,7 @@ struct CategoryDataV8MM
   {
     CategoryData data;
     data.m_id = m_id;
-    data.m_type = CompilationType::Category; // Format V8MM doesn't have m_type. Using default
+    data.m_type = CompilationType::Category;  // Format V8MM doesn't have m_type. Using default
     data.m_name = m_name;
     data.m_imageUrl = m_imageUrl;
     data.m_annotation = m_annotation;
@@ -264,12 +233,11 @@ struct CategoryDataV8MM
 };
 
 // FileDataV8MM contains the same sections as FileDataV8 but with no compilations
-template <class TrackDataT> struct FileDataMMImpl
+template <class TrackDataT>
+struct FileDataMMImpl
 {
-  DECLARE_VISITOR_AND_DEBUG_PRINT(FileDataMMImpl, visitor(m_serverId, "serverId"),
-                                  visitor(m_categoryData, "category"),
-                                  visitor(m_bookmarksData, "bookmarks"),
-                                  visitor(m_tracksData, "tracks"))
+  DECLARE_VISITOR_AND_DEBUG_PRINT(FileDataMMImpl, visitor(m_serverId, "serverId"), visitor(m_categoryData, "category"),
+                                  visitor(m_bookmarksData, "bookmarks"), visitor(m_tracksData, "tracks"))
 
   bool operator==(FileDataMMImpl const & data) const
   {
diff --git a/libs/kml/types_v9mm.hpp b/libs/kml/types_v9mm.hpp
index 685ab6d57..7058900eb 100644
--- a/libs/kml/types_v9mm.hpp
+++ b/libs/kml/types_v9mm.hpp
@@ -10,20 +10,13 @@ MultiGeometry mergeGeometry(std::vector<MultiGeometry> && aGeometries);
 
 struct TrackDataV9MM : TrackDataV8MM
 {
-  DECLARE_VISITOR_AND_DEBUG_PRINT(TrackDataV9MM, visitor(m_id, "id"),
-                                  visitor(m_localId, "localId"),
-                                  visitor(m_name, "name"),
-                                  visitor(m_description, "description"),
-                                  visitor(m_layers, "layers"),
-                                  visitor(m_timestamp, "timestamp"),
-                                  visitor(m_multiGeometry, "multiGeometry"), // V9MM introduced multiGeometry instead of a single one
-                                  visitor(m_visible, "visible"),
-                                  visitor(m_constant1, "constant1"),
-                                  visitor(m_constant2, "constant2"),
-                                  visitor(m_constant3, "constant3"),
-                                  visitor(m_nearestToponyms, "nearestToponyms"),
-                                  visitor(m_properties, "properties"),
-                                  VISITOR_COLLECTABLE)
+  DECLARE_VISITOR_AND_DEBUG_PRINT(
+      TrackDataV9MM, visitor(m_id, "id"), visitor(m_localId, "localId"), visitor(m_name, "name"),
+      visitor(m_description, "description"), visitor(m_layers, "layers"), visitor(m_timestamp, "timestamp"),
+      visitor(m_multiGeometry, "multiGeometry"),  // V9MM introduced multiGeometry instead of a single one
+      visitor(m_visible, "visible"), visitor(m_constant1, "constant1"), visitor(m_constant2, "constant2"),
+      visitor(m_constant3, "constant3"), visitor(m_nearestToponyms, "nearestToponyms"),
+      visitor(m_properties, "properties"), VISITOR_COLLECTABLE)
 
   DECLARE_COLLECTABLE(LocalizableStringIndex, m_name, m_description, m_nearestToponyms, m_properties)
 
@@ -46,7 +39,6 @@ struct TrackDataV9MM : TrackDataV8MM
   std::vector<MultiGeometry> m_multiGeometry;
 };
 
-
 // Contains the same sections as FileDataV8MM but with changed m_tracksData format
 using FileDataV9MM = FileDataMMImpl<TrackDataV9MM>;
 
diff --git a/libs/kml/visitors.hpp b/libs/kml/visitors.hpp
index bf7f76a15..4ed020644 100644
--- a/libs/kml/visitors.hpp
+++ b/libs/kml/visitors.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
+#include "kml/types.hpp"
 #include "kml/types_v3.hpp"
 #include "kml/types_v6.hpp"
 #include "kml/types_v7.hpp"
-#include "kml/types.hpp"
 
 #include "coding/geometry_coding.hpp"
 #include "coding/point_coding.hpp"
@@ -25,10 +25,16 @@ class CollectorVisitor
   template <typename T>
   class HasCollectionMethods
   {
-    template <typename C> static char Test(decltype(&C::ClearCollectionIndex));
-    template <typename C> static int Test(...);
+    template <typename C>
+    static char Test(decltype(&C::ClearCollectionIndex));
+    template <typename C>
+    static int Test(...);
+
   public:
-    enum {value = sizeof(Test<T>(0)) == sizeof(char)};
+    enum
+    {
+      value = sizeof(Test<T>(0)) == sizeof(char)
+    };
   };
 
   // All types which will be visited to collect.
@@ -36,22 +42,17 @@ class CollectorVisitor
   class VisitedTypes
   {
   public:
-    enum {value = std::is_same<T, BookmarkData>::value ||
-                  std::is_same<T, TrackData>::value ||
-                  std::is_same<T, CategoryData>::value ||
-                  std::is_same<T, FileData>::value ||
-                  std::is_same<T, BookmarkDataV3>::value ||
-                  std::is_same<T, TrackDataV3>::value ||
-                  std::is_same<T, CategoryDataV3>::value ||
-                  std::is_same<T, FileDataV3>::value ||
-                  std::is_same<T, BookmarkDataV6>::value ||
-                  std::is_same<T, TrackDataV6>::value ||
-                  std::is_same<T, CategoryDataV6>::value ||
-                  std::is_same<T, FileDataV6>::value ||
-                  std::is_same<T, BookmarkDataV7>::value ||
-                  std::is_same<T, TrackDataV7>::value ||
-                  std::is_same<T, CategoryDataV7>::value ||
-                  std::is_same<T, FileDataV7>::value};
+    enum
+    {
+      value = std::is_same<T, BookmarkData>::value || std::is_same<T, TrackData>::value ||
+              std::is_same<T, CategoryData>::value || std::is_same<T, FileData>::value ||
+              std::is_same<T, BookmarkDataV3>::value || std::is_same<T, TrackDataV3>::value ||
+              std::is_same<T, CategoryDataV3>::value || std::is_same<T, FileDataV3>::value ||
+              std::is_same<T, BookmarkDataV6>::value || std::is_same<T, TrackDataV6>::value ||
+              std::is_same<T, CategoryDataV6>::value || std::is_same<T, FileDataV6>::value ||
+              std::is_same<T, BookmarkDataV7>::value || std::is_same<T, TrackDataV7>::value ||
+              std::is_same<T, CategoryDataV7>::value || std::is_same<T, FileDataV7>::value
+    };
   };
 
 public:
@@ -61,8 +62,7 @@ public:
   {}
 
   template <typename T>
-  std::enable_if_t<HasCollectionMethods<T>::value>
-  PerformActionIfPossible(T & t)
+  std::enable_if_t<HasCollectionMethods<T>::value> PerformActionIfPossible(T & t)
   {
     if (m_clearIndex)
       t.ClearCollectionIndex();
@@ -71,17 +71,18 @@ public:
   }
 
   template <typename T>
-  std::enable_if_t<!HasCollectionMethods<T>::value> PerformActionIfPossible(T & t) {}
+  std::enable_if_t<!HasCollectionMethods<T>::value> PerformActionIfPossible(T & t)
+  {}
 
   template <typename T>
-  std::enable_if_t<VisitedTypes<T>::value>
-  VisitIfPossible(T & t)
+  std::enable_if_t<VisitedTypes<T>::value> VisitIfPossible(T & t)
   {
     t.Visit(*this);
   }
 
   template <typename T>
-  std::enable_if_t<!VisitedTypes<T>::value> VisitIfPossible(T & t) {}
+  std::enable_if_t<!VisitedTypes<T>::value> VisitIfPossible(T & t)
+  {}
 
   template <typename T>
   void operator()(T & t, char const * /* name */ = nullptr)
@@ -112,8 +113,7 @@ public:
   }
 
   template <typename... OtherStrings>
-  void Collect(LocalizableStringIndex & index, LocalizableString const & str,
-               OtherStrings const & ... args)
+  void Collect(LocalizableStringIndex & index, LocalizableString const & str, OtherStrings const &... args)
   {
     index.emplace_back(LocalizableStringSubIndex());
     for (auto const & p : str)
@@ -123,8 +123,7 @@ public:
   }
 
   template <typename... OtherStrings>
-  void Collect(LocalizableStringIndex & index, std::string const & str,
-               OtherStrings const & ... args)
+  void Collect(LocalizableStringIndex & index, std::string const & str, OtherStrings const &... args)
   {
     int8_t constexpr kFakeIndex = 0;
     index.emplace_back(LocalizableStringSubIndex());
@@ -134,9 +133,8 @@ public:
   }
 
   template <typename... OtherStrings>
-  void Collect(LocalizableStringIndex & index,
-               std::vector<std::string> const & stringsArray,
-               OtherStrings const & ... args)
+  void Collect(LocalizableStringIndex & index, std::vector<std::string> const & stringsArray,
+               OtherStrings const &... args)
   {
     index.emplace_back(LocalizableStringSubIndex());
     auto constexpr kMaxSize = static_cast<size_t>(std::numeric_limits<int8_t>::max());
@@ -148,8 +146,7 @@ public:
   }
 
   template <typename... OtherStrings>
-  void Collect(LocalizableStringIndex & index, Properties const & properties,
-               OtherStrings const & ... args)
+  void Collect(LocalizableStringIndex & index, Properties const & properties, OtherStrings const &... args)
   {
     index.emplace_back(LocalizableStringSubIndex());
     auto constexpr kMaxSize = std::numeric_limits<int8_t>::max() - 1;
@@ -166,13 +163,13 @@ public:
   }
 
   template <typename...>
-  void Collect(LocalizableStringIndex & index) {}
+  void Collect(LocalizableStringIndex & index)
+  {}
 
   std::vector<std::string> && StealCollection() { return std::move(m_collection); }
 
 private:
-  void CollectString(LocalizableStringSubIndex & subIndex, int8_t code,
-                     std::string const & str)
+  void CollectString(LocalizableStringSubIndex & subIndex, int8_t code, std::string const & str)
   {
     if (str.empty())
     {
@@ -257,30 +254,18 @@ template <typename Sink>
 class CategorySerializerVisitor
 {
 public:
-  explicit CategorySerializerVisitor(Sink & sink, uint8_t doubleBits)
-    : m_sink(sink)
-    , m_doubleBits(doubleBits)
-  {}
+  explicit CategorySerializerVisitor(Sink & sink, uint8_t doubleBits) : m_sink(sink), m_doubleBits(doubleBits) {}
 
   void operator()(LocalizableStringIndex const & index, char const * /* name */ = nullptr)
   {
     WriteLocalizableStringIndex(m_sink, index);
   }
 
-  void operator()(bool b, char const * /* name */ = nullptr)
-  {
-    (*this)(static_cast<uint8_t>(b));
-  }
+  void operator()(bool b, char const * /* name */ = nullptr) { (*this)(static_cast<uint8_t>(b)); }
 
-  void operator()(AccessRules rules, char const * /* name */ = nullptr)
-  {
-    (*this)(static_cast<uint8_t>(rules));
-  }
+  void operator()(AccessRules rules, char const * /* name */ = nullptr) { (*this)(static_cast<uint8_t>(rules)); }
 
-  void operator()(CompilationType type, char const * /* name */ = nullptr)
-  {
-    (*this)(static_cast<uint8_t>(type));
-  }
+  void operator()(CompilationType type, char const * /* name */ = nullptr) { (*this)(static_cast<uint8_t>(type)); }
 
   void operator()(Timestamp const & t, char const * /* name */ = nullptr)
   {
@@ -298,10 +283,7 @@ public:
     WriteVarUint(m_sink, encoded);
   }
 
-  void operator()(m2::PointD const & pt, char const * /* name */ = nullptr)
-  {
-    WritePointD(m_sink, pt, m_doubleBits);
-  }
+  void operator()(m2::PointD const & pt, char const * /* name */ = nullptr) { WritePointD(m_sink, pt, m_doubleBits); }
 
   void operator()(CategoryData const & compilationData, char const * /* name */ = nullptr)
   {
@@ -317,15 +299,13 @@ public:
   }
 
   template <typename D>
-  std::enable_if_t<std::is_integral<D>::value>
-  operator()(D d, char const * /* name */ = nullptr)
+  std::enable_if_t<std::is_integral<D>::value> operator()(D d, char const * /* name */ = nullptr)
   {
     WriteToSink(m_sink, d);
   }
 
   template <typename R>
-  std::enable_if_t<!std::is_integral<R>::value>
-  operator()(R const & r, char const * /* name */ = nullptr)
+  std::enable_if_t<!std::is_integral<R>::value> operator()(R const & r, char const * /* name */ = nullptr)
   {
     r.Visit(*this);
   }
@@ -347,25 +327,16 @@ template <typename Sink>
 class BookmarkSerializerVisitor
 {
 public:
-  explicit BookmarkSerializerVisitor(Sink & sink, uint8_t doubleBits)
-    : m_sink(sink)
-    , m_doubleBits(doubleBits)
-  {}
+  explicit BookmarkSerializerVisitor(Sink & sink, uint8_t doubleBits) : m_sink(sink), m_doubleBits(doubleBits) {}
 
   void operator()(LocalizableStringIndex const & index, char const * /* name */ = nullptr)
   {
     WriteLocalizableStringIndex(m_sink, index);
   }
 
-  void operator()(bool b, char const * /* name */ = nullptr)
-  {
-    (*this)(static_cast<uint8_t>(b));
-  }
+  void operator()(bool b, char const * /* name */ = nullptr) { (*this)(static_cast<uint8_t>(b)); }
 
-  void operator()(m2::PointD const & pt, char const * /* name */ = nullptr)
-  {
-    WritePointD(m_sink, pt, m_doubleBits);
-  }
+  void operator()(m2::PointD const & pt, char const * /* name */ = nullptr) { WritePointD(m_sink, pt, m_doubleBits); }
 
   void operator()(geometry::PointWithAltitude const & pt, char const * /* name */ = nullptr)
   {
@@ -389,15 +360,9 @@ public:
     WriteVarUint(m_sink, ToSecondsSinceEpoch(t) * 1000);
   }
 
-  void operator()(PredefinedColor color, char const * /* name */ = nullptr)
-  {
-    (*this)(static_cast<uint8_t>(color));
-  }
+  void operator()(PredefinedColor color, char const * /* name */ = nullptr) { (*this)(static_cast<uint8_t>(color)); }
 
-  void operator()(BookmarkIcon icon, char const * /* name */ = nullptr)
-  {
-    (*this)(static_cast<uint16_t>(icon));
-  }
+  void operator()(BookmarkIcon icon, char const * /* name */ = nullptr) { (*this)(static_cast<uint16_t>(icon)); }
 
   template <typename T>
   void operator()(std::vector<T> const & vs, char const * /* name */ = nullptr)
@@ -407,7 +372,8 @@ public:
       (*this)(v);
   }
 
-  template <class T> void SavePointsSequence(std::vector<T> const & points)
+  template <class T>
+  void SavePointsSequence(std::vector<T> const & points)
   {
     WriteVarUint(m_sink, static_cast<uint32_t>(points.size()));
     m2::PointU lastUpt = m2::PointU::Zero();
@@ -444,15 +410,13 @@ public:
   }
 
   template <typename D>
-  std::enable_if_t<std::is_integral<D>::value>
-  operator()(D d, char const * /* name */ = nullptr)
+  std::enable_if_t<std::is_integral<D>::value> operator()(D d, char const * /* name */ = nullptr)
   {
     WriteToSink(m_sink, d);
   }
 
   template <typename R>
-  std::enable_if_t<!std::is_integral<R>::value>
-  operator()(R const & r, char const * /* name */ = nullptr)
+  std::enable_if_t<!std::is_integral<R>::value> operator()(R const & r, char const * /* name */ = nullptr)
   {
     r.Visit(*this);
   }
@@ -472,9 +436,7 @@ template <typename Source>
 class CategoryDeserializerVisitor
 {
 public:
-  explicit CategoryDeserializerVisitor(Source & source, uint8_t doubleBits)
-    : m_source(source)
-    , m_doubleBits(doubleBits)
+  explicit CategoryDeserializerVisitor(Source & source, uint8_t doubleBits) : m_source(source), m_doubleBits(doubleBits)
   {}
 
   void operator()(LocalizableStringIndex & index, char const * /* name */ = nullptr)
@@ -515,15 +477,9 @@ public:
     d = Uint32ToDouble(v, kMinRating, kMaxRating, m_doubleBits);
   }
 
-  void operator()(m2::PointD & pt, char const * /* name */ = nullptr)
-  {
-    pt = ReadPointD(m_source, m_doubleBits);
-  }
+  void operator()(m2::PointD & pt, char const * /* name */ = nullptr) { pt = ReadPointD(m_source, m_doubleBits); }
 
-  void operator()(CategoryData & compilationData, char const * /* name */ = nullptr)
-  {
-    compilationData.Visit(*this);
-  }
+  void operator()(CategoryData & compilationData, char const * /* name */ = nullptr) { compilationData.Visit(*this); }
 
   template <typename T>
   void operator()(std::vector<T> & vs, char const * /* name */ = nullptr)
@@ -538,15 +494,13 @@ public:
   }
 
   template <typename D>
-  std::enable_if_t<std::is_integral<D>::value>
-  operator()(D & d, char const * /* name */ = nullptr)
+  std::enable_if_t<std::is_integral<D>::value> operator()(D & d, char const * /* name */ = nullptr)
   {
     d = ReadPrimitiveFromSource<D>(m_source);
   }
 
   template <typename R>
-  std::enable_if_t<!std::is_integral<R>::value>
-  operator()(R & r, char const * /* name */ = nullptr)
+  std::enable_if_t<!std::is_integral<R>::value> operator()(R & r, char const * /* name */ = nullptr)
   {
     r.Visit(*this);
   }
@@ -568,9 +522,7 @@ template <typename Source>
 class BookmarkDeserializerVisitor
 {
 public:
-  explicit BookmarkDeserializerVisitor(Source & source, uint8_t doubleBits)
-    : m_source(source)
-    , m_doubleBits(doubleBits)
+  explicit BookmarkDeserializerVisitor(Source & source, uint8_t doubleBits) : m_source(source), m_doubleBits(doubleBits)
   {}
 
   void operator()(LocalizableStringIndex & index, char const * /* name */ = nullptr)
@@ -583,10 +535,7 @@ public:
     b = static_cast<bool>(ReadPrimitiveFromSource<uint8_t>(m_source));
   }
 
-  void operator()(m2::PointD & pt, char const * /* name */ = nullptr)
-  {
-    pt = ReadPointD(m_source, m_doubleBits);
-  }
+  void operator()(m2::PointD & pt, char const * /* name */ = nullptr) { pt = ReadPointD(m_source, m_doubleBits); }
 
   void operator()(geometry::PointWithAltitude & pt, char const * /* name */ = nullptr)
   {
@@ -639,7 +588,8 @@ public:
     }
   }
 
-  template <class T> void LoadPointsSequence(std::vector<T> & points)
+  template <class T>
+  void LoadPointsSequence(std::vector<T> & points)
   {
     auto const sz = ReadVarUint<uint32_t, Source>(this->m_source);
     points.reserve(sz);
@@ -651,10 +601,7 @@ public:
     }
   }
 
-  void operator()(std::vector<m2::PointD> & points, char const * /* name */ = nullptr)
-  {
-    LoadPointsSequence(points);
-  }
+  void operator()(std::vector<m2::PointD> & points, char const * /* name */ = nullptr) { LoadPointsSequence(points); }
 
   void operator()(MultiGeometry::LineT & points, char const * /* name */ = nullptr)
   {
@@ -677,15 +624,13 @@ public:
   }
 
   template <typename D>
-  std::enable_if_t<std::is_integral<D>::value>
-  operator()(D & d, char const * /* name */ = nullptr)
+  std::enable_if_t<std::is_integral<D>::value> operator()(D & d, char const * /* name */ = nullptr)
   {
     d = ReadPrimitiveFromSource<D>(m_source);
   }
 
   template <typename R>
-  std::enable_if_t<!std::is_integral<R>::value>
-  operator()(R & r, char const * /* name */ = nullptr)
+  std::enable_if_t<!std::is_integral<R>::value> operator()(R & r, char const * /* name */ = nullptr)
   {
     r.Visit(*this);
   }
@@ -705,13 +650,10 @@ template <typename Reader>
 class DeserializedStringCollector
 {
 public:
-  explicit DeserializedStringCollector(coding::BlockedTextStorage<Reader> & textStorage)
-    : m_textStorage(textStorage)
-  {}
+  explicit DeserializedStringCollector(coding::BlockedTextStorage<Reader> & textStorage) : m_textStorage(textStorage) {}
 
   template <typename... OtherStrings>
-  void Collect(LocalizableStringIndex & index, LocalizableString & str,
-               OtherStrings & ... args)
+  void Collect(LocalizableStringIndex & index, LocalizableString & str, OtherStrings &... args)
   {
     if (!SwitchSubIndexIfNeeded(index))
       return;
@@ -725,8 +667,7 @@ public:
   }
 
   template <typename... OtherStrings>
-  void Collect(LocalizableStringIndex & index, std::string & str,
-               OtherStrings & ... args)
+  void Collect(LocalizableStringIndex & index, std::string & str, OtherStrings &... args)
   {
     if (!SwitchSubIndexIfNeeded(index))
       return;
@@ -742,9 +683,7 @@ public:
   }
 
   template <typename... OtherStrings>
-  void Collect(LocalizableStringIndex & index,
-               std::vector<std::string> & stringsArray,
-               OtherStrings & ... args)
+  void Collect(LocalizableStringIndex & index, std::vector<std::string> & stringsArray, OtherStrings &... args)
   {
     if (!SwitchSubIndexIfNeeded(index))
       return;
@@ -759,8 +698,7 @@ public:
   }
 
   template <typename... OtherStrings>
-  void Collect(LocalizableStringIndex & index, Properties & properties,
-               OtherStrings & ... args)
+  void Collect(LocalizableStringIndex & index, Properties & properties, OtherStrings &... args)
   {
     if (!SwitchSubIndexIfNeeded(index))
       return;
@@ -768,17 +706,15 @@ public:
     auto subIndex = index[m_counter];
     auto const sz = static_cast<int8_t>(subIndex.size() / 2);
     for (int8_t i = 0; i < sz; i++)
-    {
-      properties.insert(std::make_pair(ExtractString(subIndex[2 * i]),
-                                       ExtractString(subIndex[2 * i + 1])));
-    }
+      properties.insert(std::make_pair(ExtractString(subIndex[2 * i]), ExtractString(subIndex[2 * i + 1])));
 
     m_counter++;
     Collect(index, args...);
   }
 
   template <typename...>
-  void Collect(LocalizableStringIndex & index) {}
+  void Collect(LocalizableStringIndex & index)
+  {}
 
 private:
   bool SwitchSubIndexIfNeeded(LocalizableStringIndex & index)
diff --git a/libs/map/api_mark_point.cpp b/libs/map/api_mark_point.cpp
index 5793a6f30..dbdecdd2b 100644
--- a/libs/map/api_mark_point.cpp
+++ b/libs/map/api_mark_point.cpp
@@ -6,24 +6,22 @@
 
 namespace style
 {
-std::map<std::string, std::string> kStyleToColor = {
-  {"placemark-red", "BookmarkRed"},
-  {"placemark-blue", "BookmarkBlue"},
-  {"placemark-purple", "BookmarkPurple"},
-  {"placemark-yellow", "BookmarkYellow"},
-  {"placemark-pink", "BookmarkPink"},
-  {"placemark-brown", "BookmarkBrown"},
-  {"placemark-green", "BookmarkGreen"},
-  {"placemark-orange", "BookmarkOrange"},
-  {"placemark-deeppurple", "BookmarkDeepPurple"},
-  {"placemark-lightblue", "BookmarkLightBlue"},
-  {"placemark-cyan", "BookmarkCyan"},
-  {"placemark-teal", "BookmarkTeal"},
-  {"placemark-lime", "BookmarkLime"},
-  {"placemark-deeporange", "BookmarkDeepOrange"},
-  {"placemark-gray", "BookmarkGray"},
-  {"placemark-bluegray", "BookmarkBlueGray"}
-};
+std::map<std::string, std::string> kStyleToColor = {{"placemark-red", "BookmarkRed"},
+                                                    {"placemark-blue", "BookmarkBlue"},
+                                                    {"placemark-purple", "BookmarkPurple"},
+                                                    {"placemark-yellow", "BookmarkYellow"},
+                                                    {"placemark-pink", "BookmarkPink"},
+                                                    {"placemark-brown", "BookmarkBrown"},
+                                                    {"placemark-green", "BookmarkGreen"},
+                                                    {"placemark-orange", "BookmarkOrange"},
+                                                    {"placemark-deeppurple", "BookmarkDeepPurple"},
+                                                    {"placemark-lightblue", "BookmarkLightBlue"},
+                                                    {"placemark-cyan", "BookmarkCyan"},
+                                                    {"placemark-teal", "BookmarkTeal"},
+                                                    {"placemark-lime", "BookmarkLime"},
+                                                    {"placemark-deeporange", "BookmarkDeepOrange"},
+                                                    {"placemark-gray", "BookmarkGray"},
+                                                    {"placemark-bluegray", "BookmarkBlueGray"}};
 
 std::string GetSupportedStyle(std::string const & style)
 {
@@ -32,11 +30,9 @@ std::string GetSupportedStyle(std::string const & style)
     return "BookmarkGreen";
   return it->second;
 }
-}  // style
+}  // namespace style
 
-ApiMarkPoint::ApiMarkPoint(m2::PointD const & ptOrg)
-  : UserMark(ptOrg, UserMark::Type::API)
-{}
+ApiMarkPoint::ApiMarkPoint(m2::PointD const & ptOrg) : UserMark(ptOrg, UserMark::Type::API) {}
 
 ApiMarkPoint::ApiMarkPoint(std::string const & name, std::string const & id, std::string const & style,
                            m2::PointD const & ptOrg)
@@ -48,7 +44,7 @@ ApiMarkPoint::ApiMarkPoint(std::string const & name, std::string const & id, std
 
 drape_ptr<df::UserPointMark::SymbolNameZoomInfo> ApiMarkPoint::GetSymbolNames() const
 {
-  //TODO: use its own icon.
+  // TODO: use its own icon.
   auto symbol = make_unique_dp<SymbolNameZoomInfo>();
   symbol->insert(std::make_pair(1 /* zoomLevel */, "coloredmark-default-s"));
   return symbol;
diff --git a/libs/map/api_mark_point.hpp b/libs/map/api_mark_point.hpp
index 2e2b7844f..59d3764ce 100644
--- a/libs/map/api_mark_point.hpp
+++ b/libs/map/api_mark_point.hpp
@@ -11,15 +11,14 @@ namespace style
 {
 // Fixes icons which are not supported by CoMaps.
 std::string GetSupportedStyle(std::string const & style);
-}  // style
+}  // namespace style
 
 class ApiMarkPoint : public UserMark
 {
 public:
   ApiMarkPoint(m2::PointD const & ptOrg);
 
-  ApiMarkPoint(std::string const & name, std::string const & id, std::string const & style,
-               m2::PointD const & ptOrg);
+  ApiMarkPoint(std::string const & name, std::string const & id, std::string const & style, m2::PointD const & ptOrg);
 
   drape_ptr<SymbolNameZoomInfo> GetSymbolNames() const override;
   df::ColorConstant GetColorConstant() const override;
diff --git a/libs/map/benchmark_tool/api.cpp b/libs/map/benchmark_tool/api.cpp
index 5a95ce93f..871bf0154 100644
--- a/libs/map/benchmark_tool/api.cpp
+++ b/libs/map/benchmark_tool/api.cpp
@@ -24,7 +24,7 @@ void Result::CalcMetrics()
     sort(m_time.begin(), m_time.end());
 
     m_max = m_time.back();
-    m_med = m_time[m_time.size()/2];
+    m_med = m_time[m_time.size() / 2];
     m_all = accumulate(m_time.begin(), m_time.end(), 0.0);
     m_avg = m_all / m_time.size();
 
@@ -36,7 +36,7 @@ void Result::CalcMetrics()
 
 void AllResult::Print()
 {
-  //m_reading.PrintAllTimes();
+  // m_reading.PrintAllTimes();
   m_reading.CalcMetrics();
 
   if (m_all < 0.0)
@@ -45,12 +45,10 @@ void AllResult::Print()
   {
     cout << fixed << setprecision(10);
     size_t const count = 1000;
-    cout << "FRAME*1000[ median:" << m_reading.m_med * count <<
-            " avg:" << m_reading.m_avg * count <<
-            " max:" << m_reading.m_max * count << " ] ";
-    cout << "TOTAL[ idx:" << m_all - m_reading.m_all <<
-            " decoding:" << m_reading.m_all <<
-            " summ:" << m_all << " ]" << endl;
+    cout << "FRAME*1000[ median:" << m_reading.m_med * count << " avg:" << m_reading.m_avg * count
+         << " max:" << m_reading.m_max * count << " ] ";
+    cout << "TOTAL[ idx:" << m_all - m_reading.m_all << " decoding:" << m_reading.m_all << " summ:" << m_all << " ]"
+         << endl;
   }
 }
 }  // namespace bench
diff --git a/libs/map/benchmark_tool/api.hpp b/libs/map/benchmark_tool/api.hpp
index 1c231cd66..1aa6af26f 100644
--- a/libs/map/benchmark_tool/api.hpp
+++ b/libs/map/benchmark_tool/api.hpp
@@ -6,43 +6,37 @@
 
 namespace bench
 {
-  class Result
-  {
-  public:
-    void Add(double t)
-    {
-      m_time.push_back(t);
-    }
+class Result
+{
+public:
+  void Add(double t) { m_time.push_back(t); }
 
-    void Add(Result const & r)
-    {
-      m_time.insert(m_time.end(), r.m_time.begin(), r.m_time.end());
-    }
+  void Add(Result const & r) { m_time.insert(m_time.end(), r.m_time.begin(), r.m_time.end()); }
 
-    void PrintAllTimes();
-    void CalcMetrics();
+  void PrintAllTimes();
+  void CalcMetrics();
 
-    double m_all = 0.0;
-    double m_max = 0.0;
-    double m_avg = 0.0;
-    double m_med = 0.0;
+  double m_all = 0.0;
+  double m_max = 0.0;
+  double m_avg = 0.0;
+  double m_med = 0.0;
 
-  private:
-    std::vector<double> m_time;
-  };
+private:
+  std::vector<double> m_time;
+};
 
-  class AllResult
-  {
-  public:
-    AllResult() = default;
+class AllResult
+{
+public:
+  AllResult() = default;
 
-    void Add(double t) { m_all += t; }
-    void Print();
+  void Add(double t) { m_all += t; }
+  void Print();
 
-    Result m_reading;
-    double m_all = 0.0;
-  };
+  Result m_reading;
+  double m_all = 0.0;
+};
 
-  /// @param[in] count number of times to run benchmark
-  void RunFeaturesLoadingBenchmark(std::string filePath, std::pair<int, int> scaleR, AllResult & res);
+/// @param[in] count number of times to run benchmark
+void RunFeaturesLoadingBenchmark(std::string filePath, std::pair<int, int> scaleR, AllResult & res);
 }  // namespace bench
diff --git a/libs/map/benchmark_tool/features_loading.cpp b/libs/map/benchmark_tool/features_loading.cpp
index 11f4ebfe5..66e54c287 100644
--- a/libs/map/benchmark_tool/features_loading.cpp
+++ b/libs/map/benchmark_tool/features_loading.cpp
@@ -20,84 +20,84 @@ namespace bench
 {
 namespace
 {
-  class Accumulator
-  {
-  public:
-    explicit Accumulator(Result & res) : m_res(res) {}
+class Accumulator
+{
+public:
+  explicit Accumulator(Result & res) : m_res(res) {}
 
-    void Reset(int scale)
+  void Reset(int scale)
+  {
+    m_scale = scale;
+    m_count = 0;
+  }
+
+  bool IsEmpty() const { return m_count == 0; }
+
+  void operator()(FeatureType & ft)
+  {
+    ++m_count;
+
+    m_timer.Reset();
+
+    drule::KeysT keys;
+    UNUSED_VALUE(feature::GetDrawRule(feature::TypesHolder(ft), m_scale, keys));
+
+    if (!keys.empty())
     {
-      m_scale = scale;
-      m_count = 0;
+      // Call this function to load feature's inner data and geometry.
+      UNUSED_VALUE(ft.IsEmptyGeometry(m_scale));
     }
 
-    bool IsEmpty() const { return m_count == 0; }
+    m_res.Add(m_timer.ElapsedSeconds());
+  }
 
-    void operator()(FeatureType & ft)
+private:
+  base::Timer m_timer;
+  size_t m_count = 0;
+
+  Result & m_res;
+
+  int m_scale = 0;
+};
+
+void RunBenchmark(FeaturesFetcher const & src, m2::RectD const & rect, pair<int, int> const & scaleRange,
+                  AllResult & res)
+{
+  ASSERT_LESS_OR_EQUAL(scaleRange.first, scaleRange.second, ());
+
+  vector<m2::RectD> rects;
+  rects.push_back(rect);
+
+  Accumulator acc(res.m_reading);
+
+  while (!rects.empty())
+  {
+    m2::RectD const r = rects.back();
+    rects.pop_back();
+
+    bool doDivide = true;
+    int const scale = scales::GetScaleLevel(r);
+    if (scale >= scaleRange.first)
     {
-      ++m_count;
+      acc.Reset(scale);
 
-      m_timer.Reset();
+      base::Timer timer;
+      src.ForEachFeature(r, acc, scale);
+      res.Add(timer.ElapsedSeconds());
 
-      drule::KeysT keys;
-      UNUSED_VALUE(feature::GetDrawRule(feature::TypesHolder(ft), m_scale, keys));
-
-      if (!keys.empty())
-      {
-        // Call this function to load feature's inner data and geometry.
-        UNUSED_VALUE(ft.IsEmptyGeometry(m_scale));
-      }
-
-      m_res.Add(m_timer.ElapsedSeconds());
+      doDivide = !acc.IsEmpty();
     }
 
-  private:
-    base::Timer m_timer;
-    size_t m_count = 0;
-
-    Result & m_res;
-
-    int m_scale = 0;
-  };
-
-  void RunBenchmark(FeaturesFetcher const & src, m2::RectD const & rect,
-                    pair<int, int> const & scaleRange, AllResult & res)
-  {
-    ASSERT_LESS_OR_EQUAL(scaleRange.first, scaleRange.second, ());
-
-    vector<m2::RectD> rects;
-    rects.push_back(rect);
-
-    Accumulator acc(res.m_reading);
-
-    while (!rects.empty())
+    if (doDivide && scale < scaleRange.second)
     {
-      m2::RectD const r = rects.back();
-      rects.pop_back();
-
-      bool doDivide = true;
-      int const scale = scales::GetScaleLevel(r);
-      if (scale >= scaleRange.first)
-      {
-        acc.Reset(scale);
-
-        base::Timer timer;
-        src.ForEachFeature(r, acc, scale);
-        res.Add(timer.ElapsedSeconds());
-
-        doDivide = !acc.IsEmpty();
-      }
-
-      if (doDivide && scale < scaleRange.second)
-      {
-        m2::RectD r1, r2;
-        r.DivideByGreaterSize(r1, r2);
-        rects.push_back(r1);
-        rects.push_back(r2);
-      }
+      m2::RectD r1, r2;
+      r.DivideByGreaterSize(r1, r2);
+      rects.push_back(r1);
+      rects.push_back(r2);
     }
   }
 }
+}  // namespace
 
 void RunFeaturesLoadingBenchmark(string fileName, pair<int, int> scaleRange, AllResult & res)
 {
diff --git a/libs/map/benchmark_tools.cpp b/libs/map/benchmark_tools.cpp
index 1377a18ac..e97c6d0b4 100644
--- a/libs/map/benchmark_tools.cpp
+++ b/libs/map/benchmark_tools.cpp
@@ -46,10 +46,8 @@ void RunScenario(Framework * framework, std::shared_ptr<BenchmarkHandle> handle)
 #ifdef DRAPE_MEASURER_BENCHMARK
     for (auto const & it : handle->m_drapeStatistic)
     {
-      LOG(LINFO, ("\n ***** Report for scenario", it.first, "*****\n",
-                  it.second.ToString(),
+      LOG(LINFO, ("\n ***** Report for scenario", it.first, "*****\n", it.second.ToString(),
                   "\n ***** Report for scenario", it.first, "*****\n"));
-
     }
 #endif
     return;
@@ -63,8 +61,7 @@ void RunScenario(Framework * framework, std::shared_ptr<BenchmarkHandle> handle)
 #ifdef DRAPE_MEASURER_BENCHMARK
     df::DrapeMeasurer::Instance().Start();
 #endif
-  },
-  [framework, handle](std::string const & name)
+  }, [framework, handle](std::string const & name)
   {
 #ifdef DRAPE_MEASURER_BENCHMARK
     df::DrapeMeasurer::Instance().Stop();
@@ -91,7 +88,7 @@ void RunGraphicsBenchmark(Framework * framework)
   auto const fn = base::JoinPath(GetPlatform().SettingsDir(), "graphics_benchmark.json");
   if (!GetPlatform().IsFileExistsByFullPath(fn))
     return;
-  
+
   std::string benchmarkData;
   try
   {
@@ -102,7 +99,7 @@ void RunGraphicsBenchmark(Framework * framework)
     LOG(LCRITICAL, ("Error reading benchmark file: ", e.what()));
     return;
   }
-  
+
   std::shared_ptr<BenchmarkHandle> handle = std::make_shared<BenchmarkHandle>();
 
   // Parse scenarios.
@@ -154,7 +151,7 @@ void RunGraphicsBenchmark(Framework * framework)
             m2::PointD const pt = mercator::FromLatLon(lat, lon);
             points.push_back(pt);
             scenario.push_back(std::unique_ptr<ScenarioManager::Action>(
-                                 new ScenarioManager::CenterViewportAction(pt, static_cast<int>(zoomLevel))));
+                new ScenarioManager::CenterViewportAction(pt, static_cast<int>(zoomLevel))));
           }
         }
       }
@@ -183,19 +180,18 @@ void RunGraphicsBenchmark(Framework * framework)
   // Download regions and run scenarios after downloading.
   if (!handle->m_regionsToDownload.empty())
   {
-    framework->GetStorage().Subscribe(
-        [framework, handle](storage::CountryId const & countryId) {
-          if (base::IsExist(handle->m_regionsToDownload, countryId))
-          {
-            handle->m_regionsToDownloadCounter++;
-            if (handle->m_regionsToDownloadCounter == handle->m_regionsToDownload.size())
-            {
-              handle->m_regionsToDownload.clear();
-              RunScenario(framework, handle);
-            }
-          }
-        },
-        [](storage::CountryId const &, downloader::Progress const &) {});
+    framework->GetStorage().Subscribe([framework, handle](storage::CountryId const & countryId)
+    {
+      if (base::IsExist(handle->m_regionsToDownload, countryId))
+      {
+        handle->m_regionsToDownloadCounter++;
+        if (handle->m_regionsToDownloadCounter == handle->m_regionsToDownload.size())
+        {
+          handle->m_regionsToDownload.clear();
+          RunScenario(framework, handle);
+        }
+      }
+    }, [](storage::CountryId const &, downloader::Progress const &) {});
 
     for (auto const & countryId : handle->m_regionsToDownload)
       framework->GetStorage().DownloadNode(countryId);
diff --git a/libs/map/benchmark_tools.hpp b/libs/map/benchmark_tools.hpp
index 2e084c433..4f31df171 100644
--- a/libs/map/benchmark_tools.hpp
+++ b/libs/map/benchmark_tools.hpp
@@ -5,4 +5,4 @@ class Framework;
 namespace benchmark
 {
 void RunGraphicsBenchmark(Framework * framework);
-} //  namespace benchmark
+}  //  namespace benchmark
diff --git a/libs/map/bookmark.cpp b/libs/map/bookmark.cpp
index 1418330cc..20c8f6d01 100644
--- a/libs/map/bookmark.cpp
+++ b/libs/map/bookmark.cpp
@@ -7,7 +7,6 @@
 
 #include <sstream>
 
-
 namespace
 {
 std::string GetBookmarkIconType(kml::BookmarkIcon const & icon)
@@ -52,9 +51,7 @@ std::string GetBookmarkIconType(kml::BookmarkIcon const & icon)
   case kml::BookmarkIcon::BicycleParkingCovered: return "bicycle_parking_covered";
   case kml::BookmarkIcon::BicycleRental: return "bicycle_rental";
   case kml::BookmarkIcon::FastFood: return "fast_food";
-  case kml::BookmarkIcon::Count:
-    ASSERT(false, ("Invalid bookmark icon type"));
-    return {};
+  case kml::BookmarkIcon::Count: ASSERT(false, ("Invalid bookmark icon type")); return {};
   }
   UNREACHABLE();
 }
@@ -63,9 +60,7 @@ std::string const kCustomImageProperty = "CustomImage";
 std::string const kHasElevationProfileProperty = "has_elevation_profile";
 }  // namespace
 
-Bookmark::Bookmark(m2::PointD const & ptOrg)
-  : Base(ptOrg, UserMark::BOOKMARK)
-  , m_groupId(kml::kInvalidMarkGroupId)
+Bookmark::Bookmark(m2::PointD const & ptOrg) : Base(ptOrg, UserMark::BOOKMARK), m_groupId(kml::kInvalidMarkGroupId)
 {
   m_data.m_point = ptOrg;
   m_data.m_id = GetId();
@@ -154,41 +149,24 @@ df::ColorConstant Bookmark::GetColorConstant() const
 {
   switch (m_data.m_color.m_predefinedColor)
   {
-    case kml::PredefinedColor::Red:
-      return "BookmarkRed";
-    case kml::PredefinedColor::Blue:
-      return "BookmarkBlue";
-    case kml::PredefinedColor::Purple:
-      return "BookmarkPurple";
-    case kml::PredefinedColor::Yellow:
-      return "BookmarkYellow";
-    case kml::PredefinedColor::Pink:
-      return "BookmarkPink";
-    case kml::PredefinedColor::Brown:
-      return "BookmarkBrown";
-    case kml::PredefinedColor::Green:
-      return "BookmarkGreen";
-    case kml::PredefinedColor::Orange:
-      return "BookmarkOrange";
-    case kml::PredefinedColor::DeepPurple:
-      return "BookmarkDeepPurple";
-    case kml::PredefinedColor::LightBlue:
-      return "BookmarkLightBlue";
-    case kml::PredefinedColor::Cyan:
-      return "BookmarkCyan";
-    case kml::PredefinedColor::Teal:
-      return "BookmarkTeal";
-    case kml::PredefinedColor::Lime:
-      return "BookmarkLime";
-    case kml::PredefinedColor::DeepOrange:
-      return "BookmarkDeepOrange";
-    case kml::PredefinedColor::Gray:
-      return "BookmarkGray";
-    case kml::PredefinedColor::BlueGray:
-      return "BookmarkBlueGray";
-    case kml::PredefinedColor::None:
-    case kml::PredefinedColor::Count:
-      return "BookmarkRed";
+  case kml::PredefinedColor::Red: return "BookmarkRed";
+  case kml::PredefinedColor::Blue: return "BookmarkBlue";
+  case kml::PredefinedColor::Purple: return "BookmarkPurple";
+  case kml::PredefinedColor::Yellow: return "BookmarkYellow";
+  case kml::PredefinedColor::Pink: return "BookmarkPink";
+  case kml::PredefinedColor::Brown: return "BookmarkBrown";
+  case kml::PredefinedColor::Green: return "BookmarkGreen";
+  case kml::PredefinedColor::Orange: return "BookmarkOrange";
+  case kml::PredefinedColor::DeepPurple: return "BookmarkDeepPurple";
+  case kml::PredefinedColor::LightBlue: return "BookmarkLightBlue";
+  case kml::PredefinedColor::Cyan: return "BookmarkCyan";
+  case kml::PredefinedColor::Teal: return "BookmarkTeal";
+  case kml::PredefinedColor::Lime: return "BookmarkLime";
+  case kml::PredefinedColor::DeepOrange: return "BookmarkDeepOrange";
+  case kml::PredefinedColor::Gray: return "BookmarkGray";
+  case kml::PredefinedColor::BlueGray: return "BookmarkBlueGray";
+  case kml::PredefinedColor::None:
+  case kml::PredefinedColor::Count: return "BookmarkRed";
   }
   UNREACHABLE();
 }
diff --git a/libs/map/bookmark.hpp b/libs/map/bookmark.hpp
index a3eb74d02..c0655cb56 100644
--- a/libs/map/bookmark.hpp
+++ b/libs/map/bookmark.hpp
@@ -13,6 +13,7 @@
 class Bookmark : public UserMark
 {
   using Base = UserMark;
+
 public:
   explicit Bookmark(m2::PointD const & ptOrg);
 
diff --git a/libs/map/bookmark_helpers.cpp b/libs/map/bookmark_helpers.cpp
index 6d1b83e24..e4e05605e 100644
--- a/libs/map/bookmark_helpers.cpp
+++ b/libs/map/bookmark_helpers.cpp
@@ -29,186 +29,182 @@ namespace
 {
 struct BookmarkMatchInfo
 {
-  BookmarkMatchInfo(kml::BookmarkIcon icon, BookmarkBaseType type)
-    : m_icon(icon)
-    , m_type(type)
-  {}
+  BookmarkMatchInfo(kml::BookmarkIcon icon, BookmarkBaseType type) : m_icon(icon), m_type(type) {}
 
   kml::BookmarkIcon m_icon;
   BookmarkBaseType m_type;
 };
 
 std::map<std::string, BookmarkMatchInfo> const kFeatureTypeToBookmarkMatchInfo = {
-  {"amenity-veterinary", {kml::BookmarkIcon::Animals, BookmarkBaseType::Animals}},
-  {"leisure-dog_park", {kml::BookmarkIcon::Animals, BookmarkBaseType::Animals}},
-  {"tourism-zoo", {kml::BookmarkIcon::Animals, BookmarkBaseType::Animals}},
+    {"amenity-veterinary", {kml::BookmarkIcon::Animals, BookmarkBaseType::Animals}},
+    {"leisure-dog_park", {kml::BookmarkIcon::Animals, BookmarkBaseType::Animals}},
+    {"tourism-zoo", {kml::BookmarkIcon::Animals, BookmarkBaseType::Animals}},
 
-  {"amenity-bar", {kml::BookmarkIcon::Bar, BookmarkBaseType::Food}},
-  {"amenity-biergarten", {kml::BookmarkIcon::Pub, BookmarkBaseType::Food}},
-  {"amenity-pub", {kml::BookmarkIcon::Pub, BookmarkBaseType::Food}},
-  {"amenity-cafe", {kml::BookmarkIcon::Cafe, BookmarkBaseType::Food}},
+    {"amenity-bar", {kml::BookmarkIcon::Bar, BookmarkBaseType::Food}},
+    {"amenity-biergarten", {kml::BookmarkIcon::Pub, BookmarkBaseType::Food}},
+    {"amenity-pub", {kml::BookmarkIcon::Pub, BookmarkBaseType::Food}},
+    {"amenity-cafe", {kml::BookmarkIcon::Cafe, BookmarkBaseType::Food}},
 
-  {"amenity-bbq", {kml::BookmarkIcon::Food, BookmarkBaseType::Food}},
-  {"amenity-food_court", {kml::BookmarkIcon::Food, BookmarkBaseType::Food}},
-  {"amenity-restaurant", {kml::BookmarkIcon::Food, BookmarkBaseType::Food}},
-  {"leisure-picnic_table", {kml::BookmarkIcon::Food, BookmarkBaseType::Food}},
-  {"tourism-picnic_site", {kml::BookmarkIcon::Food, BookmarkBaseType::Food}},
+    {"amenity-bbq", {kml::BookmarkIcon::Food, BookmarkBaseType::Food}},
+    {"amenity-food_court", {kml::BookmarkIcon::Food, BookmarkBaseType::Food}},
+    {"amenity-restaurant", {kml::BookmarkIcon::Food, BookmarkBaseType::Food}},
+    {"leisure-picnic_table", {kml::BookmarkIcon::Food, BookmarkBaseType::Food}},
+    {"tourism-picnic_site", {kml::BookmarkIcon::Food, BookmarkBaseType::Food}},
 
-  {"amenity-fast_food", {kml::BookmarkIcon::FastFood, BookmarkBaseType::Food}},
+    {"amenity-fast_food", {kml::BookmarkIcon::FastFood, BookmarkBaseType::Food}},
 
-  {"amenity-place_of_worship-buddhist", {kml::BookmarkIcon::Buddhism, BookmarkBaseType::ReligiousPlace}},
+    {"amenity-place_of_worship-buddhist", {kml::BookmarkIcon::Buddhism, BookmarkBaseType::ReligiousPlace}},
 
-  {"amenity-college", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}},
-  {"amenity-courthouse", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}},
-  {"amenity-kindergarten", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}},
-  {"amenity-library", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}},
-  {"amenity-police", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}},
-  {"amenity-prison", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}},
-  {"amenity-school", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}},
-  {"building-university", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}},
-  {"office", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}},
-  {"office-diplomatic", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}},
-  {"office-lawyer", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}},
+    {"amenity-college", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}},
+    {"amenity-courthouse", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}},
+    {"amenity-kindergarten", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}},
+    {"amenity-library", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}},
+    {"amenity-police", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}},
+    {"amenity-prison", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}},
+    {"amenity-school", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}},
+    {"building-university", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}},
+    {"office", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}},
+    {"office-diplomatic", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}},
+    {"office-lawyer", {kml::BookmarkIcon::Building, BookmarkBaseType::Building}},
 
-  {"amenity-grave_yard-christian", {kml::BookmarkIcon::Christianity, BookmarkBaseType::ReligiousPlace}},
-  {"amenity-place_of_worship-christian", {kml::BookmarkIcon::Christianity, BookmarkBaseType::ReligiousPlace}},
-  {"landuse-cemetery-christian", {kml::BookmarkIcon::Christianity, BookmarkBaseType::ReligiousPlace}},
+    {"amenity-grave_yard-christian", {kml::BookmarkIcon::Christianity, BookmarkBaseType::ReligiousPlace}},
+    {"amenity-place_of_worship-christian", {kml::BookmarkIcon::Christianity, BookmarkBaseType::ReligiousPlace}},
+    {"landuse-cemetery-christian", {kml::BookmarkIcon::Christianity, BookmarkBaseType::ReligiousPlace}},
 
-  {"amenity-casino", {kml::BookmarkIcon::Entertainment, BookmarkBaseType::Entertainment}},
-  {"amenity-cinema", {kml::BookmarkIcon::Entertainment, BookmarkBaseType::Entertainment}},
-  {"amenity-nightclub", {kml::BookmarkIcon::Entertainment, BookmarkBaseType::Entertainment}},
-  {"shop-bookmaker", {kml::BookmarkIcon::Entertainment, BookmarkBaseType::Entertainment}},
-  {"tourism-theme_park", {kml::BookmarkIcon::Entertainment, BookmarkBaseType::Entertainment}},
-    
-  {"amenity-theatre", {kml::BookmarkIcon::Theatre, BookmarkBaseType::Entertainment}},
+    {"amenity-casino", {kml::BookmarkIcon::Entertainment, BookmarkBaseType::Entertainment}},
+    {"amenity-cinema", {kml::BookmarkIcon::Entertainment, BookmarkBaseType::Entertainment}},
+    {"amenity-nightclub", {kml::BookmarkIcon::Entertainment, BookmarkBaseType::Entertainment}},
+    {"shop-bookmaker", {kml::BookmarkIcon::Entertainment, BookmarkBaseType::Entertainment}},
+    {"tourism-theme_park", {kml::BookmarkIcon::Entertainment, BookmarkBaseType::Entertainment}},
 
-  {"amenity-atm", {kml::BookmarkIcon::Bank, BookmarkBaseType::Exchange}},
-  {"amenity-bank", {kml::BookmarkIcon::Bank, BookmarkBaseType::Exchange}},
-  {"shop-money_lender", {kml::BookmarkIcon::Bank, BookmarkBaseType::Exchange}},
+    {"amenity-theatre", {kml::BookmarkIcon::Theatre, BookmarkBaseType::Entertainment}},
 
-  {"amenity-bureau_de_change", {kml::BookmarkIcon::Exchange, BookmarkBaseType::Exchange}},
+    {"amenity-atm", {kml::BookmarkIcon::Bank, BookmarkBaseType::Exchange}},
+    {"amenity-bank", {kml::BookmarkIcon::Bank, BookmarkBaseType::Exchange}},
+    {"shop-money_lender", {kml::BookmarkIcon::Bank, BookmarkBaseType::Exchange}},
 
-  {"amenity-charging_station", {kml::BookmarkIcon::ChargingStation, BookmarkBaseType::Gas}},
-  {"amenity-charging_station-bicycle", {kml::BookmarkIcon::ChargingStation, BookmarkBaseType::Gas}},
-  {"amenity-charging_station-motorcar", {kml::BookmarkIcon::ChargingStation, BookmarkBaseType::Gas}},
-  {"amenity-fuel", {kml::BookmarkIcon::Gas, BookmarkBaseType::Gas}},
+    {"amenity-bureau_de_change", {kml::BookmarkIcon::Exchange, BookmarkBaseType::Exchange}},
 
-  {"tourism-alpine_hut", {kml::BookmarkIcon::Hotel, BookmarkBaseType::Hotel}},
-  {"tourism-camp_site", {kml::BookmarkIcon::Hotel, BookmarkBaseType::Hotel}},
-  {"tourism-chalet", {kml::BookmarkIcon::Hotel, BookmarkBaseType::Hotel}},
-  {"tourism-guest_house", {kml::BookmarkIcon::Hotel, BookmarkBaseType::Hotel}},
-  {"tourism-hostel", {kml::BookmarkIcon::Hotel, BookmarkBaseType::Hotel}},
-  {"tourism-hotel", {kml::BookmarkIcon::Hotel, BookmarkBaseType::Hotel}},
-  {"tourism-motel", {kml::BookmarkIcon::Hotel, BookmarkBaseType::Hotel}},
-  {"tourism-resort", {kml::BookmarkIcon::Hotel, BookmarkBaseType::Hotel}},
-  {"tourism-wilderness_hut", {kml::BookmarkIcon::Hotel, BookmarkBaseType::Hotel}},
-  {"tourism-apartment", {kml::BookmarkIcon::Hotel, BookmarkBaseType::Hotel}},
+    {"amenity-charging_station", {kml::BookmarkIcon::ChargingStation, BookmarkBaseType::Gas}},
+    {"amenity-charging_station-bicycle", {kml::BookmarkIcon::ChargingStation, BookmarkBaseType::Gas}},
+    {"amenity-charging_station-motorcar", {kml::BookmarkIcon::ChargingStation, BookmarkBaseType::Gas}},
+    {"amenity-fuel", {kml::BookmarkIcon::Gas, BookmarkBaseType::Gas}},
 
-  {"amenity-place_of_worship-muslim", {kml::BookmarkIcon::Islam, BookmarkBaseType::ReligiousPlace}},
+    {"tourism-alpine_hut", {kml::BookmarkIcon::Hotel, BookmarkBaseType::Hotel}},
+    {"tourism-camp_site", {kml::BookmarkIcon::Hotel, BookmarkBaseType::Hotel}},
+    {"tourism-chalet", {kml::BookmarkIcon::Hotel, BookmarkBaseType::Hotel}},
+    {"tourism-guest_house", {kml::BookmarkIcon::Hotel, BookmarkBaseType::Hotel}},
+    {"tourism-hostel", {kml::BookmarkIcon::Hotel, BookmarkBaseType::Hotel}},
+    {"tourism-hotel", {kml::BookmarkIcon::Hotel, BookmarkBaseType::Hotel}},
+    {"tourism-motel", {kml::BookmarkIcon::Hotel, BookmarkBaseType::Hotel}},
+    {"tourism-resort", {kml::BookmarkIcon::Hotel, BookmarkBaseType::Hotel}},
+    {"tourism-wilderness_hut", {kml::BookmarkIcon::Hotel, BookmarkBaseType::Hotel}},
+    {"tourism-apartment", {kml::BookmarkIcon::Hotel, BookmarkBaseType::Hotel}},
 
-  {"amenity-place_of_worship-jewish", {kml::BookmarkIcon::Judaism, BookmarkBaseType::ReligiousPlace}},
+    {"amenity-place_of_worship-muslim", {kml::BookmarkIcon::Islam, BookmarkBaseType::ReligiousPlace}},
 
-  {"amenity-childcare", {kml::BookmarkIcon::Medicine, BookmarkBaseType::Medicine}},
-  {"amenity-clinic", {kml::BookmarkIcon::Medicine, BookmarkBaseType::Medicine}},
-  {"amenity-dentist", {kml::BookmarkIcon::Medicine, BookmarkBaseType::Medicine}},
-  {"amenity-doctors", {kml::BookmarkIcon::Medicine, BookmarkBaseType::Medicine}},
-  {"amenity-hospital", {kml::BookmarkIcon::Medicine, BookmarkBaseType::Medicine}},
-  {"emergency-defibrillator", {kml::BookmarkIcon::Medicine, BookmarkBaseType::Medicine}},
-    
-  {"amenity-pharmacy", {kml::BookmarkIcon::Pharmacy, BookmarkBaseType::Medicine}},
+    {"amenity-place_of_worship-jewish", {kml::BookmarkIcon::Judaism, BookmarkBaseType::ReligiousPlace}},
 
-  {"natural-bare_rock", {kml::BookmarkIcon::Mountain, BookmarkBaseType::Mountain}},
-  {"natural-cave_entrance", {kml::BookmarkIcon::Mountain, BookmarkBaseType::Mountain}},
-  {"natural-peak", {kml::BookmarkIcon::Mountain, BookmarkBaseType::Mountain}},
-  {"natural-rock", {kml::BookmarkIcon::Mountain, BookmarkBaseType::Mountain}},
-  {"natural-volcano", {kml::BookmarkIcon::Mountain, BookmarkBaseType::Mountain}},
+    {"amenity-childcare", {kml::BookmarkIcon::Medicine, BookmarkBaseType::Medicine}},
+    {"amenity-clinic", {kml::BookmarkIcon::Medicine, BookmarkBaseType::Medicine}},
+    {"amenity-dentist", {kml::BookmarkIcon::Medicine, BookmarkBaseType::Medicine}},
+    {"amenity-doctors", {kml::BookmarkIcon::Medicine, BookmarkBaseType::Medicine}},
+    {"amenity-hospital", {kml::BookmarkIcon::Medicine, BookmarkBaseType::Medicine}},
+    {"emergency-defibrillator", {kml::BookmarkIcon::Medicine, BookmarkBaseType::Medicine}},
 
-  {"amenity-arts_centre", {kml::BookmarkIcon::Art, BookmarkBaseType::Museum}},
-  {"tourism-gallery", {kml::BookmarkIcon::Art, BookmarkBaseType::Museum}},
+    {"amenity-pharmacy", {kml::BookmarkIcon::Pharmacy, BookmarkBaseType::Medicine}},
 
-  {"tourism-museum", {kml::BookmarkIcon::Museum, BookmarkBaseType::Museum}},
+    {"natural-bare_rock", {kml::BookmarkIcon::Mountain, BookmarkBaseType::Mountain}},
+    {"natural-cave_entrance", {kml::BookmarkIcon::Mountain, BookmarkBaseType::Mountain}},
+    {"natural-peak", {kml::BookmarkIcon::Mountain, BookmarkBaseType::Mountain}},
+    {"natural-rock", {kml::BookmarkIcon::Mountain, BookmarkBaseType::Mountain}},
+    {"natural-volcano", {kml::BookmarkIcon::Mountain, BookmarkBaseType::Mountain}},
 
-  {"boundary-national_park", {kml::BookmarkIcon::Park, BookmarkBaseType::Park}},
-  {"landuse-forest", {kml::BookmarkIcon::Park, BookmarkBaseType::Park}},
-  {"leisure-garden", {kml::BookmarkIcon::Park, BookmarkBaseType::Park}},
-  {"leisure-nature_reserve", {kml::BookmarkIcon::Park, BookmarkBaseType::Park}},
-  {"leisure-park", {kml::BookmarkIcon::Park, BookmarkBaseType::Park}},
+    {"amenity-arts_centre", {kml::BookmarkIcon::Art, BookmarkBaseType::Museum}},
+    {"tourism-gallery", {kml::BookmarkIcon::Art, BookmarkBaseType::Museum}},
 
-  {"amenity-bicycle_parking", {kml::BookmarkIcon::BicycleParking, BookmarkBaseType::Parking}},
-  {"amenity-bicycle_parking-covered", {kml::BookmarkIcon::BicycleParkingCovered, BookmarkBaseType::Parking}},
-  {"amenity-bicycle_rental", {kml::BookmarkIcon::BicycleRental, BookmarkBaseType::Parking}},
+    {"tourism-museum", {kml::BookmarkIcon::Museum, BookmarkBaseType::Museum}},
 
-  {"amenity-motorcycle_parking", {kml::BookmarkIcon::Parking, BookmarkBaseType::Parking}},
-  {"amenity-parking", {kml::BookmarkIcon::Parking, BookmarkBaseType::Parking}},
-  {"highway-services", {kml::BookmarkIcon::Parking, BookmarkBaseType::Parking}},
-  {"tourism-caravan_site", {kml::BookmarkIcon::Parking, BookmarkBaseType::Parking}},
-  {"amenity-vending_machine-parking_tickets", {kml::BookmarkIcon::Parking, BookmarkBaseType::Parking}},
+    {"boundary-national_park", {kml::BookmarkIcon::Park, BookmarkBaseType::Park}},
+    {"landuse-forest", {kml::BookmarkIcon::Park, BookmarkBaseType::Park}},
+    {"leisure-garden", {kml::BookmarkIcon::Park, BookmarkBaseType::Park}},
+    {"leisure-nature_reserve", {kml::BookmarkIcon::Park, BookmarkBaseType::Park}},
+    {"leisure-park", {kml::BookmarkIcon::Park, BookmarkBaseType::Park}},
 
-  {"amenity-ice_cream", {kml::BookmarkIcon::Shop, BookmarkBaseType::Shop}},
-  {"amenity-marketplace", {kml::BookmarkIcon::Shop, BookmarkBaseType::Shop}},
-  {"amenity-vending_machine", {kml::BookmarkIcon::Shop, BookmarkBaseType::Shop}},
-  {"shop", {kml::BookmarkIcon::Shop, BookmarkBaseType::Shop}},
+    {"amenity-bicycle_parking", {kml::BookmarkIcon::BicycleParking, BookmarkBaseType::Parking}},
+    {"amenity-bicycle_parking-covered", {kml::BookmarkIcon::BicycleParkingCovered, BookmarkBaseType::Parking}},
+    {"amenity-bicycle_rental", {kml::BookmarkIcon::BicycleRental, BookmarkBaseType::Parking}},
 
-  {"amenity-place_of_worship", {kml::BookmarkIcon::Sights, BookmarkBaseType::ReligiousPlace}},
-  {"historic-archaeological_site", {kml::BookmarkIcon::Sights, BookmarkBaseType::Sights}},
-  {"historic-boundary_stone", {kml::BookmarkIcon::Sights, BookmarkBaseType::Sights}},
-  {"historic-castle", {kml::BookmarkIcon::Sights, BookmarkBaseType::Sights}},
-  {"historic-fort", {kml::BookmarkIcon::Sights, BookmarkBaseType::Sights}},
-  {"historic-memorial", {kml::BookmarkIcon::Sights, BookmarkBaseType::Sights}},
-  {"historic-monument", {kml::BookmarkIcon::Sights, BookmarkBaseType::Sights}},
-  {"historic-ruins", {kml::BookmarkIcon::Sights, BookmarkBaseType::Sights}},
-  {"historic-ship", {kml::BookmarkIcon::Sights, BookmarkBaseType::Sights}},
-  {"historic-tomb", {kml::BookmarkIcon::Sights, BookmarkBaseType::Sights}},
-  {"historic-wayside_cross", {kml::BookmarkIcon::Sights, BookmarkBaseType::Sights}},
-  {"historic-wayside_shrine", {kml::BookmarkIcon::Sights, BookmarkBaseType::Sights}},
-  {"tourism-artwork", {kml::BookmarkIcon::Sights, BookmarkBaseType::Sights}},
-  {"tourism-attraction", {kml::BookmarkIcon::Sights, BookmarkBaseType::Sights}},
-  {"waterway-waterfall", {kml::BookmarkIcon::Sights, BookmarkBaseType::Sights}},
+    {"amenity-motorcycle_parking", {kml::BookmarkIcon::Parking, BookmarkBaseType::Parking}},
+    {"amenity-parking", {kml::BookmarkIcon::Parking, BookmarkBaseType::Parking}},
+    {"highway-services", {kml::BookmarkIcon::Parking, BookmarkBaseType::Parking}},
+    {"tourism-caravan_site", {kml::BookmarkIcon::Parking, BookmarkBaseType::Parking}},
+    {"amenity-vending_machine-parking_tickets", {kml::BookmarkIcon::Parking, BookmarkBaseType::Parking}},
 
-  {"tourism-information", {kml::BookmarkIcon::Information, BookmarkBaseType::Sights}},
-  {"tourism-information-office", {kml::BookmarkIcon::Information, BookmarkBaseType::Sights}},
-  {"tourism-information-visitor_centre", {kml::BookmarkIcon::Information, BookmarkBaseType::Sights}},
+    {"amenity-ice_cream", {kml::BookmarkIcon::Shop, BookmarkBaseType::Shop}},
+    {"amenity-marketplace", {kml::BookmarkIcon::Shop, BookmarkBaseType::Shop}},
+    {"amenity-vending_machine", {kml::BookmarkIcon::Shop, BookmarkBaseType::Shop}},
+    {"shop", {kml::BookmarkIcon::Shop, BookmarkBaseType::Shop}},
 
-  {"leisure-fitness_centre", {kml::BookmarkIcon::Sport, BookmarkBaseType::Entertainment}},
-  {"leisure-skiing", {kml::BookmarkIcon::Sport, BookmarkBaseType::Entertainment}},
-  {"leisure-sports_centre-climbing", {kml::BookmarkIcon::Sport, BookmarkBaseType::Entertainment}},
-  {"leisure-sports_centre-shooting", {kml::BookmarkIcon::Sport, BookmarkBaseType::Entertainment}},
-  {"leisure-sports_centre-yoga", {kml::BookmarkIcon::Sport, BookmarkBaseType::Entertainment}},
-  {"sport", {kml::BookmarkIcon::Sport, BookmarkBaseType::Entertainment}},
-    
-  {"leisure-stadium", {kml::BookmarkIcon::Stadium, BookmarkBaseType::Entertainment}},
+    {"amenity-place_of_worship", {kml::BookmarkIcon::Sights, BookmarkBaseType::ReligiousPlace}},
+    {"historic-archaeological_site", {kml::BookmarkIcon::Sights, BookmarkBaseType::Sights}},
+    {"historic-boundary_stone", {kml::BookmarkIcon::Sights, BookmarkBaseType::Sights}},
+    {"historic-castle", {kml::BookmarkIcon::Sights, BookmarkBaseType::Sights}},
+    {"historic-fort", {kml::BookmarkIcon::Sights, BookmarkBaseType::Sights}},
+    {"historic-memorial", {kml::BookmarkIcon::Sights, BookmarkBaseType::Sights}},
+    {"historic-monument", {kml::BookmarkIcon::Sights, BookmarkBaseType::Sights}},
+    {"historic-ruins", {kml::BookmarkIcon::Sights, BookmarkBaseType::Sights}},
+    {"historic-ship", {kml::BookmarkIcon::Sights, BookmarkBaseType::Sights}},
+    {"historic-tomb", {kml::BookmarkIcon::Sights, BookmarkBaseType::Sights}},
+    {"historic-wayside_cross", {kml::BookmarkIcon::Sights, BookmarkBaseType::Sights}},
+    {"historic-wayside_shrine", {kml::BookmarkIcon::Sights, BookmarkBaseType::Sights}},
+    {"tourism-artwork", {kml::BookmarkIcon::Sights, BookmarkBaseType::Sights}},
+    {"tourism-attraction", {kml::BookmarkIcon::Sights, BookmarkBaseType::Sights}},
+    {"waterway-waterfall", {kml::BookmarkIcon::Sights, BookmarkBaseType::Sights}},
 
-  {"leisure-sports_centre-swimming", {kml::BookmarkIcon::Swim, BookmarkBaseType::Swim}},
-  {"leisure-swimming_pool", {kml::BookmarkIcon::Swim, BookmarkBaseType::Swim}},
-  {"leisure-water_park", {kml::BookmarkIcon::Swim, BookmarkBaseType::Swim}},
-  {"natural-beach", {kml::BookmarkIcon::Swim, BookmarkBaseType::Swim}},
-  {"sport-diving", {kml::BookmarkIcon::Swim, BookmarkBaseType::Swim}},
-  {"sport-scuba_diving", {kml::BookmarkIcon::Swim, BookmarkBaseType::Swim}},
-  {"sport-swimming", {kml::BookmarkIcon::Swim, BookmarkBaseType::Swim}},
+    {"tourism-information", {kml::BookmarkIcon::Information, BookmarkBaseType::Sights}},
+    {"tourism-information-office", {kml::BookmarkIcon::Information, BookmarkBaseType::Sights}},
+    {"tourism-information-visitor_centre", {kml::BookmarkIcon::Information, BookmarkBaseType::Sights}},
 
-  {"aeroway-aerodrome", {kml::BookmarkIcon::Transport, BookmarkBaseType::None}},
-  {"aeroway-aerodrome-international", {kml::BookmarkIcon::Transport, BookmarkBaseType::None}},
-  {"amenity-bus_station", {kml::BookmarkIcon::Transport, BookmarkBaseType::None}},
-  {"amenity-car_sharing", {kml::BookmarkIcon::Transport, BookmarkBaseType::None}},
-  {"amenity-ferry_terminal", {kml::BookmarkIcon::Transport, BookmarkBaseType::None}},
-  {"amenity-taxi", {kml::BookmarkIcon::Transport, BookmarkBaseType::None}},
-  {"building-train_station", {kml::BookmarkIcon::Transport, BookmarkBaseType::Building}},
-  {"highway-bus_stop", {kml::BookmarkIcon::Transport, BookmarkBaseType::None}},
-  {"public_transport-platform", {kml::BookmarkIcon::Transport, BookmarkBaseType::None}},
-  {"railway-halt", {kml::BookmarkIcon::Transport, BookmarkBaseType::None}},
-  {"railway-station", {kml::BookmarkIcon::Transport, BookmarkBaseType::None}},
-  {"railway-tram_stop", {kml::BookmarkIcon::Transport, BookmarkBaseType::None}},
+    {"leisure-fitness_centre", {kml::BookmarkIcon::Sport, BookmarkBaseType::Entertainment}},
+    {"leisure-skiing", {kml::BookmarkIcon::Sport, BookmarkBaseType::Entertainment}},
+    {"leisure-sports_centre-climbing", {kml::BookmarkIcon::Sport, BookmarkBaseType::Entertainment}},
+    {"leisure-sports_centre-shooting", {kml::BookmarkIcon::Sport, BookmarkBaseType::Entertainment}},
+    {"leisure-sports_centre-yoga", {kml::BookmarkIcon::Sport, BookmarkBaseType::Entertainment}},
+    {"sport", {kml::BookmarkIcon::Sport, BookmarkBaseType::Entertainment}},
 
-  {"tourism-viewpoint", {kml::BookmarkIcon::Viewpoint, BookmarkBaseType::Sights}},
+    {"leisure-stadium", {kml::BookmarkIcon::Stadium, BookmarkBaseType::Entertainment}},
 
-  {"amenity-drinking_water", {kml::BookmarkIcon::Water, BookmarkBaseType::Water}},
-  {"amenity-fountain", {kml::BookmarkIcon::Water, BookmarkBaseType::Water}},
-  {"amenity-water_point", {kml::BookmarkIcon::Water, BookmarkBaseType::Water}},
-  {"man_made-water_tap", {kml::BookmarkIcon::Water, BookmarkBaseType::Water}},
-  {"natural-spring", {kml::BookmarkIcon::Water, BookmarkBaseType::Water}},
+    {"leisure-sports_centre-swimming", {kml::BookmarkIcon::Swim, BookmarkBaseType::Swim}},
+    {"leisure-swimming_pool", {kml::BookmarkIcon::Swim, BookmarkBaseType::Swim}},
+    {"leisure-water_park", {kml::BookmarkIcon::Swim, BookmarkBaseType::Swim}},
+    {"natural-beach", {kml::BookmarkIcon::Swim, BookmarkBaseType::Swim}},
+    {"sport-diving", {kml::BookmarkIcon::Swim, BookmarkBaseType::Swim}},
+    {"sport-scuba_diving", {kml::BookmarkIcon::Swim, BookmarkBaseType::Swim}},
+    {"sport-swimming", {kml::BookmarkIcon::Swim, BookmarkBaseType::Swim}},
 
-  {"shop-funeral_directors", {kml::BookmarkIcon::None, BookmarkBaseType::None}}
-};
+    {"aeroway-aerodrome", {kml::BookmarkIcon::Transport, BookmarkBaseType::None}},
+    {"aeroway-aerodrome-international", {kml::BookmarkIcon::Transport, BookmarkBaseType::None}},
+    {"amenity-bus_station", {kml::BookmarkIcon::Transport, BookmarkBaseType::None}},
+    {"amenity-car_sharing", {kml::BookmarkIcon::Transport, BookmarkBaseType::None}},
+    {"amenity-ferry_terminal", {kml::BookmarkIcon::Transport, BookmarkBaseType::None}},
+    {"amenity-taxi", {kml::BookmarkIcon::Transport, BookmarkBaseType::None}},
+    {"building-train_station", {kml::BookmarkIcon::Transport, BookmarkBaseType::Building}},
+    {"highway-bus_stop", {kml::BookmarkIcon::Transport, BookmarkBaseType::None}},
+    {"public_transport-platform", {kml::BookmarkIcon::Transport, BookmarkBaseType::None}},
+    {"railway-halt", {kml::BookmarkIcon::Transport, BookmarkBaseType::None}},
+    {"railway-station", {kml::BookmarkIcon::Transport, BookmarkBaseType::None}},
+    {"railway-tram_stop", {kml::BookmarkIcon::Transport, BookmarkBaseType::None}},
+
+    {"tourism-viewpoint", {kml::BookmarkIcon::Viewpoint, BookmarkBaseType::Sights}},
+
+    {"amenity-drinking_water", {kml::BookmarkIcon::Water, BookmarkBaseType::Water}},
+    {"amenity-fountain", {kml::BookmarkIcon::Water, BookmarkBaseType::Water}},
+    {"amenity-water_point", {kml::BookmarkIcon::Water, BookmarkBaseType::Water}},
+    {"man_made-water_tap", {kml::BookmarkIcon::Water, BookmarkBaseType::Water}},
+    {"natural-spring", {kml::BookmarkIcon::Water, BookmarkBaseType::Water}},
+
+    {"shop-funeral_directors", {kml::BookmarkIcon::None, BookmarkBaseType::None}}};
 
 void ValidateKmlData(std::unique_ptr<kml::FileData> & data)
 {
@@ -216,10 +212,8 @@ void ValidateKmlData(std::unique_ptr<kml::FileData> & data)
     return;
 
   for (auto & t : data->m_tracksData)
-  {
     if (t.m_layers.empty())
       t.m_layers.emplace_back(kml::KmlParser::GetDefaultTrackLayer());
-  }
 }
 
 /// @todo(KK): This code is a temporary solution for the filtering the duplicated points in KMLs.
@@ -246,7 +240,8 @@ void RemoveDuplicatedTrackPoints(std::unique_ptr<kml::FileData> & data)
 
       bool const hasTimestamps = geometry.HasTimestampsFor(lineIndex);
       if (hasTimestamps && timestamps.size() != line.size())
-        MYTHROW(kml::DeserializerKml::DeserializeException, ("Timestamps count", timestamps.size(), "doesn't match points count", line.size()));
+        MYTHROW(kml::DeserializerKml::DeserializeException,
+                ("Timestamps count", timestamps.size(), "doesn't match points count", line.size()));
 
       validGeometry.m_lines.emplace_back();
       validGeometry.m_timestamps.emplace_back();
@@ -279,10 +274,8 @@ bool IsBadCharForPath(strings::UniChar c)
   if (c < ' ')
     return true;
   for (strings::UniChar const illegalChar : {':', '/', '\\', '<', '>', '\"', '|', '?', '*'})
-  {
     if (illegalChar == c)
       return true;
-  }
 
   return false;
 }
@@ -336,7 +329,8 @@ std::string GenerateUniqueFileName(std::string const & path, std::string name, s
     if (!Platform::IsFileExistsByFullPath(res))
       break;
     suffix = strings::to_string(counter++);
-  } while (true);
+  }
+  while (true);
 
   return res;
 }
@@ -388,7 +382,7 @@ void FillEmptyNames(std::unique_ptr<kml::FileData> & kmlData, std::string const
     return;
 
   auto const emptyNames = std::count_if(kmlData->m_tracksData.begin(), kmlData->m_tracksData.end(),
-                                  [](const kml::TrackData & t) { return t.m_name.empty(); });
+                                        [](kml::TrackData const & t) { return t.m_name.empty(); });
   if (emptyNames == 0)
     return;
 
@@ -464,8 +458,8 @@ std::vector<std::string> GetFilePathsToLoadFromKmz(std::string const & filePath)
     ZipFileReader::FileList files;
     ZipFileReader::FilesList(filePath, files);
     files.erase(std::remove_if(files.begin(), files.end(),
-        [](auto const & file){ return GetLowercaseFileExt(file.first) != kKmlExtension; }),
-        files.end());
+                               [](auto const & file) { return GetLowercaseFileExt(file.first) != kKmlExtension; }),
+                files.end());
     for (auto const & [kmlFileInZip, size] : files)
     {
       auto const name = base::FileNameFromFullPath(kmlFileInZip);
@@ -598,17 +592,14 @@ bool SaveKmlFile(kml::FileData & kmlData, std::string const & file, KmlFileType
 bool SaveKmlFileSafe(kml::FileData & kmlData, std::string const & file, KmlFileType fileType)
 {
   LOG(LINFO, ("Save kml file of type", fileType, "to", file));
-  return base::WriteToTempAndRenameToFile(file, [&kmlData, fileType](std::string const & fileName)
-  {
-    return SaveKmlFile(kmlData, fileName, fileType);
-  });
+  return base::WriteToTempAndRenameToFile(
+      file, [&kmlData, fileType](std::string const & fileName) { return SaveKmlFile(kmlData, fileName, fileType); });
 }
 
 bool SaveKmlFileByExt(kml::FileData & kmlData, std::string const & file)
 {
   auto const ext = base::GetFileExtension(file);
-  return SaveKmlFileSafe(kmlData, file, ext == kKmbExtension ? KmlFileType::Binary
-                                                             : KmlFileType::Text);
+  return SaveKmlFileSafe(kmlData, file, ext == kKmbExtension ? KmlFileType::Binary : KmlFileType::Text);
 }
 
 bool SaveKmlData(kml::FileData & kmlData, Writer & writer, KmlFileType fileType)
@@ -676,7 +667,8 @@ BookmarkBaseType GetBookmarkBaseType(std::vector<uint32_t> const & featureTypes)
       auto const itType = kFeatureTypeToBookmarkMatchInfo.find(typeStr);
       if (itType != kFeatureTypeToBookmarkMatchInfo.cend())
         return itType->second.m_type;
-    } while (TruncType(typeStr));
+    }
+    while (TruncType(typeStr));
   }
   return BookmarkBaseType::None;
 }
@@ -690,7 +682,8 @@ kml::BookmarkIcon GetBookmarkIconByFeatureType(uint32_t type)
     auto const itIcon = kFeatureTypeToBookmarkMatchInfo.find(typeStr);
     if (itIcon != kFeatureTypeToBookmarkMatchInfo.cend())
       return itIcon->second.m_icon;
-  } while (TruncType(typeStr));
+  }
+  while (TruncType(typeStr));
 
   return kml::BookmarkIcon::None;
 }
diff --git a/libs/map/bookmark_helpers.hpp b/libs/map/bookmark_helpers.hpp
index 6ad5576bb..c046290f4 100644
--- a/libs/map/bookmark_helpers.hpp
+++ b/libs/map/bookmark_helpers.hpp
@@ -13,10 +13,7 @@ struct BookmarkInfo
 {
   BookmarkInfo() = default;
 
-  BookmarkInfo(kml::MarkId id, kml::BookmarkData const & data)
-    : m_bookmarkId(id)
-    , m_bookmarkData(data)
-  {}
+  BookmarkInfo(kml::MarkId id, kml::BookmarkData const & data) : m_bookmarkId(id), m_bookmarkData(data) {}
 
   BookmarkInfo(kml::MarkId id, kml::BookmarkData const & data, search::ReverseGeocoder::RegionAddress const & address)
     : m_bookmarkId(id)
@@ -97,7 +94,7 @@ inline std::string DebugPrint(KmlFileType fileType)
 std::string GetBookmarksDirectory();
 std::string GetTrashDirectory();
 std::string RemoveInvalidSymbols(std::string const & name);
-std::string GenerateUniqueFileName(const std::string & path, std::string name, std::string_view ext = kKmlExtension);
+std::string GenerateUniqueFileName(std::string const & path, std::string name, std::string_view ext = kKmlExtension);
 std::string GenerateValidAndUniqueFilePathForKML(std::string const & fileName);
 std::string GenerateValidAndUniqueFilePathForGPX(std::string const & fileName);
 std::string GenerateValidAndUniqueTrashedFilePath(std::string const & fileName);
@@ -122,7 +119,10 @@ bool SaveKmlFileByExt(kml::FileData & kmlData, std::string const & file);
 
 void ResetIds(kml::FileData & kmlData);
 
-namespace feature { class TypesHolder; }
+namespace feature
+{
+class TypesHolder;
+}
 void SaveFeatureTypes(feature::TypesHolder const & types, kml::BookmarkData & bmData);
 
 std::string GetPreferredBookmarkName(kml::BookmarkData const & bmData);
diff --git a/libs/map/bookmark_manager.cpp b/libs/map/bookmark_manager.cpp
index 423cdb4a5..81ff5b556 100644
--- a/libs/map/bookmark_manager.cpp
+++ b/libs/map/bookmark_manager.cpp
@@ -1,9 +1,9 @@
 #include "map/bookmark_manager.hpp"
+#include "map/gps_tracker.hpp"
 #include "map/search_api.hpp"
+#include "map/track_mark.hpp"
 #include "map/user_mark.hpp"
 #include "map/user_mark_id_storage.hpp"
-#include "map/track_mark.hpp"
-#include "map/gps_tracker.hpp"
 
 #include "drape_frontend/drape_engine.hpp"
 #include "drape_frontend/selection_shape.hpp"
@@ -56,8 +56,7 @@ public:
     , m_minD{minD}
     , m_rect{rect}
     , m_globalCenter{rect.GlobalCenter()}
-  {
-  }
+  {}
 
   void operator()(UserMark const * mark)
   {
@@ -87,7 +86,8 @@ std::string GetFileNameForExport(BookmarkManager::KMLDataCollectionPtr::element_
   return fileName;
 }
 
-BookmarkManager::SharingResult ExportSingleFileKml(BookmarkManager::KMLDataCollectionPtr::element_type::value_type const & kmlToShare)
+BookmarkManager::SharingResult ExportSingleFileKml(
+    BookmarkManager::KMLDataCollectionPtr::element_type::value_type const & kmlToShare)
 {
   std::string const fileName = GetFileNameForExport(kmlToShare);
 
@@ -107,7 +107,8 @@ BookmarkManager::SharingResult ExportSingleFileKml(BookmarkManager::KMLDataColle
   return {{categoryId}, std::move(tmpFilePath), kKMZMimeType};
 }
 
-BookmarkManager::SharingResult ExportSingleFileGpx(BookmarkManager::KMLDataCollectionPtr::element_type::value_type const & kmlToShare)
+BookmarkManager::SharingResult ExportSingleFileGpx(
+    BookmarkManager::KMLDataCollectionPtr::element_type::value_type const & kmlToShare)
 {
   std::string const fileName = GetFileNameForExport(kmlToShare);
   auto filePath = base::JoinPath(GetPlatform().TmpDir(), fileName + std::string{kGpxExtension});
@@ -121,7 +122,8 @@ std::string BuildIndexFile(std::vector<std::string> const & filesForIndex)
 {
   std::string const filePath = base::JoinPath(GetPlatform().TmpDir(), "doc.kml");
   FileWriter fileWriter(filePath);
-  std::string content = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+  std::string content =
+      "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
       "<kml xmlns=\"http://earth.google.com/kml/2.0\">\n"
       "<Document>\n"
       "<name>CoMaps Bookmarks and Tracks</name>\n";
@@ -133,8 +135,9 @@ std::string BuildIndexFile(std::vector<std::string> const & filesForIndex)
     content.append(fileName);
     content.append("</href></Link></NetworkLink>\n");
   }
-  content.append("</Document>\n"
-             "</kml>");
+  content.append(
+      "</Document>\n"
+      "</kml>");
   fileWriter.Write(content.c_str(), content.length());
   return filePath;
 }
@@ -186,7 +189,8 @@ BookmarkManager::SharingResult ExportMultipleFiles(BookmarkManager::KMLDataColle
   return {std::move(categoriesIds), std::move(kmzFilePath), kKMZMimeType};
 }
 
-BookmarkManager::SharingResult GetFileForSharing(BookmarkManager::KMLDataCollectionPtr collection, KmlFileType kmlFileType)
+BookmarkManager::SharingResult GetFileForSharing(BookmarkManager::KMLDataCollectionPtr collection,
+                                                 KmlFileType kmlFileType)
 {
   if (collection->size() > 1)
     return ExportMultipleFiles(collection);
@@ -196,11 +200,12 @@ BookmarkManager::SharingResult GetFileForSharing(BookmarkManager::KMLDataCollect
   case KmlFileType::Gpx: return ExportSingleFileGpx(collection->front());
   default:
     LOG(LERROR, ("Unexpected file type", kmlFileType));
-    return {{collection->front().second->m_categoryData.m_id}, BookmarkManager::SharingResult::Code::FileError,"Unexpected file type"};
+    return {{collection->front().second->m_categoryData.m_id},
+            BookmarkManager::SharingResult::Code::FileError,
+            "Unexpected file type"};
   }
 }
 
-
 std::string ToString(BookmarkManager::SortingType type)
 {
   switch (type)
@@ -412,11 +417,8 @@ size_t BookmarkManager::GetRecentlyDeletedCategoriesCount() const
 
 BookmarkManager::KMLDataCollectionPtr BookmarkManager::GetRecentlyDeletedCategories()
 {
-  auto collection = LoadBookmarks(GetTrashDirectory(), kKmlExtension, KmlFileType::Text,
-                                  [](kml::FileData const &)
-                                  {
-    return true;
-  });
+  auto collection =
+      LoadBookmarks(GetTrashDirectory(), kKmlExtension, KmlFileType::Text, [](kml::FileData const &) { return true; });
   return collection;
 }
 
@@ -430,7 +432,8 @@ void BookmarkManager::RecoverRecentlyDeletedCategoriesAtPaths(std::vector<std::s
   CHECK_THREAD_CHECKER(m_threadChecker, ());
   for (auto const & deletedFilePath : filePaths)
   {
-    CHECK(IsRecentlyDeletedCategory(deletedFilePath), ("The category at path", deletedFilePath, "should be in the trash."));
+    CHECK(IsRecentlyDeletedCategory(deletedFilePath),
+          ("The category at path", deletedFilePath, "should be in the trash."));
     CHECK(Platform::IsFileExistsByFullPath(deletedFilePath), ("File should exist to be recovered.", deletedFilePath));
     auto recoveredFilePath = GenerateValidAndUniqueFilePathForKML(base::GetNameFromFullPathWithoutExt(deletedFilePath));
     base::MoveFileX(deletedFilePath, recoveredFilePath);
@@ -444,7 +447,8 @@ void BookmarkManager::DeleteRecentlyDeletedCategoriesAtPaths(std::vector<std::st
   CHECK_THREAD_CHECKER(m_threadChecker, ());
   for (auto const & deletedFilePath : deletedFilePaths)
   {
-    CHECK(IsRecentlyDeletedCategory(deletedFilePath), ("The category at path", deletedFilePath, "should be in the trash."));
+    CHECK(IsRecentlyDeletedCategory(deletedFilePath),
+          ("The category at path", deletedFilePath, "should be in the trash."));
     base::DeleteFileX(deletedFilePath);
     LOG(LINFO, ("Recently deleted category at", deletedFilePath, "is deleted"));
   }
@@ -454,18 +458,14 @@ void BookmarkManager::DetachUserMark(kml::MarkId bmId, kml::MarkGroupId catId)
 {
   GetGroup(catId)->DetachUserMark(bmId);
   for (auto const compilationId : GetCategoryData(catId).m_compilationIds)
-  {
     GetGroup(compilationId)->DetachUserMark(bmId);
-  }
   m_changesTracker.OnDetachBookmark(bmId, catId);
 }
 
 void BookmarkManager::DeleteCompilations(kml::GroupIdCollection const & compilations)
 {
   for (auto const compilationId : compilations)
-  {
     m_compilations.erase(compilationId);
-  }
 }
 
 Track * BookmarkManager::CreateTrack(kml::TrackData && trackData)
@@ -565,10 +565,8 @@ void BookmarkManager::NotifyChanges(bool saveChangesOnDisk)
   CHECK_THREAD_CHECKER(m_threadChecker, ());
 
   m_changesTracker.AcceptDirtyItems();
-  if (!m_firstDrapeNotification &&
-    !m_changesTracker.HasChanges() &&
-    !m_bookmarksChangesTracker.HasChanges() &&
-    !m_drapeChangesTracker.HasChanges())
+  if (!m_firstDrapeNotification && !m_changesTracker.HasChanges() && !m_bookmarksChangesTracker.HasChanges() &&
+      !m_drapeChangesTracker.HasChanges())
   {
     return;
   }
@@ -590,10 +588,8 @@ void BookmarkManager::NotifyChanges(bool saveChangesOnDisk)
   {
     kml::GroupIdCollection categoriesToSave;
     for (auto groupId : m_bookmarksChangesTracker.GetUpdatedGroupIds())
-    {
       if (IsBookmarkCategory(groupId) && GetBmCategory(groupId)->IsAutoSaveEnabled())
         categoriesToSave.push_back(groupId);
-    }
 
     // During the category reloading/updating the file saving should be skipped
     // because of the file is already up to date.
@@ -675,8 +671,8 @@ void BookmarkManager::ResetLastSortingType(kml::MarkGroupId groupId)
   SaveMetadata();
 }
 
-std::vector<BookmarkManager::SortingType> BookmarkManager::GetAvailableSortingTypes(
-  kml::MarkGroupId groupId, bool hasMyPosition) const
+std::vector<BookmarkManager::SortingType> BookmarkManager::GetAvailableSortingTypes(kml::MarkGroupId groupId,
+                                                                                    bool hasMyPosition) const
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
   ASSERT(IsBookmarkCategory(groupId), ());
@@ -737,8 +733,7 @@ std::vector<BookmarkManager::SortingType> BookmarkManager::GetAvailableSortingTy
 }
 
 template <typename T, typename R>
-BookmarkManager::SortedByTimeBlockType GetSortedByTimeBlockType(
-  std::chrono::duration<T, R> const & timePeriod)
+BookmarkManager::SortedByTimeBlockType GetSortedByTimeBlockType(std::chrono::duration<T, R> const & timePeriod)
 {
   auto constexpr kDay = std::chrono::hours(24);
   auto constexpr kWeek = 7 * kDay;
@@ -759,16 +754,11 @@ std::string BookmarkManager::GetSortedByTimeBlockName(SortedByTimeBlockType bloc
 {
   switch (blockType)
   {
-  case SortedByTimeBlockType::WeekAgo:
-    return platform::GetLocalizedString("week_ago_sorttype");
-  case SortedByTimeBlockType::MonthAgo:
-    return platform::GetLocalizedString("month_ago_sorttype");
-  case SortedByTimeBlockType::MoreThanMonthAgo:
-    return platform::GetLocalizedString("moremonth_ago_sorttype");
-  case SortedByTimeBlockType::MoreThanYearAgo:
-    return platform::GetLocalizedString("moreyear_ago_sorttype");
-  case SortedByTimeBlockType::Others:
-    return GetOthersSortedBlockName();
+  case SortedByTimeBlockType::WeekAgo: return platform::GetLocalizedString("week_ago_sorttype");
+  case SortedByTimeBlockType::MonthAgo: return platform::GetLocalizedString("month_ago_sorttype");
+  case SortedByTimeBlockType::MoreThanMonthAgo: return platform::GetLocalizedString("moremonth_ago_sorttype");
+  case SortedByTimeBlockType::MoreThanYearAgo: return platform::GetLocalizedString("moreyear_ago_sorttype");
+  case SortedByTimeBlockType::Others: return GetOthersSortedBlockName();
   }
   UNREACHABLE();
 }
@@ -823,10 +813,10 @@ void BookmarkManager::UpdateElevationMyPosition(kml::TrackId const & trackId)
       return;
     m_lastElevationMyPosition = m_myPositionMark->GetPivot();
 
-    auto const snapRect = mercator::RectByCenterXYAndSizeInMeters(m_myPositionMark->GetPivot(),
-                                                                  kMyPositionTrackSnapInMeters);
-    auto const selectionInfo = FindNearestTrack(
-      snapRect, [trackId](Track const *track) { return track->GetId() == trackId; });
+    auto const snapRect =
+        mercator::RectByCenterXYAndSizeInMeters(m_myPositionMark->GetPivot(), kMyPositionTrackSnapInMeters);
+    auto const selectionInfo =
+        FindNearestTrack(snapRect, [trackId](Track const * track) { return track->GetId() == trackId; });
     if (selectionInfo.m_trackId == trackId)
       myPositionDistance = selectionInfo.m_distFromBegM;
   }
@@ -843,8 +833,7 @@ void BookmarkManager::UpdateElevationMyPosition(kml::TrackId const & trackId)
   auto trackSelectionMark = GetMarkForEdit<TrackSelectionMark>(markId);
 
   double const kEpsMeters = 1e-2;
-  if (!AlmostEqualAbs(trackSelectionMark->GetMyPositionDistance(),
-                            myPositionDistance, kEpsMeters))
+  if (!AlmostEqualAbs(trackSelectionMark->GetMyPositionDistance(), myPositionDistance, kEpsMeters))
   {
     trackSelectionMark->SetMyPositionDistance(myPositionDistance);
     if (m_elevationMyPositionChanged)
@@ -863,8 +852,7 @@ double BookmarkManager::GetElevationMyPosition(kml::TrackId const & trackId) con
   return trackSelectionMark->GetMyPositionDistance();
 }
 
-void BookmarkManager::SetElevationMyPositionChangedCallback(
-    ElevationMyPositionChangedCallback const & cb)
+void BookmarkManager::SetElevationMyPositionChangedCallback(ElevationMyPositionChangedCallback const & cb)
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
 
@@ -880,9 +868,8 @@ void BookmarkManager::SetElevationActivePoint(kml::TrackId const & trackId, m2::
 
   SetTrackSelectionInfo({trackId, pt, targetDistance}, false /* notifyListeners */);
 
-  m_drapeEngine.SafeCall(&df::DrapeEngine::SelectObject,
-                         df::SelectionShape::ESelectedObject::OBJECT_TRACK, pt, FeatureID(),
-                         false /* isAnim */, false /* isGeometrySelectionAllowed */,
+  m_drapeEngine.SafeCall(&df::DrapeEngine::SelectObject, df::SelectionShape::ESelectedObject::OBJECT_TRACK, pt,
+                         FeatureID(), false /* isAnim */, false /* isGeometrySelectionAllowed */,
                          true /* isSelectionShapeVisible */);
 }
 
@@ -904,8 +891,8 @@ void BookmarkManager::SetElevationActivePointChangedCallback(ElevationActivePoin
   m_elevationActivePointChanged = cb;
 }
 
-Track::TrackSelectionInfo BookmarkManager::FindNearestTrack(
-    m2::RectD const & touchRect, TracksFilter const & tracksFilter) const
+Track::TrackSelectionInfo BookmarkManager::FindNearestTrack(m2::RectD const & touchRect,
+                                                            TracksFilter const & tracksFilter) const
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
   Track::TrackSelectionInfo selectionInfo;
@@ -937,7 +924,7 @@ Track::TrackSelectionInfo BookmarkManager::GetTrackSelectionInfo(kml::TrackId co
     return {};
 
   auto const mark = GetMark<TrackSelectionMark>(markId);
-  return { trackId, mark->GetPivot(), mark->GetDistance() };
+  return {trackId, mark->GetPivot(), mark->GetDistance()};
 }
 
 kml::MarkId BookmarkManager::GetTrackSelectionMarkId(kml::TrackId trackId) const
@@ -963,8 +950,7 @@ int BookmarkManager::GetTrackSelectionMarkMinZoom(kml::TrackId trackId) const
   return zoom;
 }
 
-void BookmarkManager::SetTrackSelectionMark(kml::TrackId trackId, m2::PointD const & pt,
-                                            double distance)
+void BookmarkManager::SetTrackSelectionMark(kml::TrackId trackId, m2::PointD const & pt, double distance)
 {
   auto const markId = GetTrackSelectionMarkId(trackId);
 
@@ -1011,8 +997,7 @@ void BookmarkManager::ResetTrackInfoMark(kml::TrackId trackId)
   }
 }
 
-void BookmarkManager::SetTrackSelectionInfo(Track::TrackSelectionInfo const & trackSelectionInfo,
-                                            bool notifyListeners)
+void BookmarkManager::SetTrackSelectionInfo(Track::TrackSelectionInfo const & trackSelectionInfo, bool notifyListeners)
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
   CHECK_NOT_EQUAL(trackSelectionInfo.m_trackId, kml::kInvalidTrackId, ());
@@ -1020,8 +1005,7 @@ void BookmarkManager::SetTrackSelectionInfo(Track::TrackSelectionInfo const & tr
   auto const markId = GetTrackSelectionMarkId(trackSelectionInfo.m_trackId);
   if (markId == kml::kInvalidMarkId)
   {
-    SetTrackSelectionMark(trackSelectionInfo.m_trackId,
-                          trackSelectionInfo.m_trackPoint,
+    SetTrackSelectionMark(trackSelectionInfo.m_trackId, trackSelectionInfo.m_trackPoint,
                           trackSelectionInfo.m_distFromBegM);
     return;
   }
@@ -1079,19 +1063,17 @@ kml::GroupIdCollection BookmarkManager::GetChildrenCollections(kml::MarkGroupId
   return GetCompilationOfType(parentId, kml::CompilationType::Collection);
 }
 
-kml::GroupIdCollection BookmarkManager::GetCompilationOfType(kml::MarkGroupId parentId,
-                                                             kml::CompilationType type) const
+kml::GroupIdCollection BookmarkManager::GetCompilationOfType(kml::MarkGroupId parentId, kml::CompilationType type) const
 {
   kml::GroupIdCollection result;
   auto const & compilations = GetCategoryData(parentId).m_compilationIds;
-  std::copy_if(compilations.cbegin(), compilations.cend(), std::back_inserter(result),
-               [this, type](auto const groupId)
-               {
-                 auto const compilation = m_compilations.find(groupId);
-                 CHECK(compilation != m_compilations.end(), ());
-                 auto const & child = *compilation->second;
-                 return child.GetCategoryData().m_type == type;
-               });
+  std::copy_if(compilations.cbegin(), compilations.cend(), std::back_inserter(result), [this, type](auto const groupId)
+  {
+    auto const compilation = m_compilations.find(groupId);
+    CHECK(compilation != m_compilations.end(), ());
+    auto const & child = *compilation->second;
+    return child.GetCategoryData().m_type == type;
+  });
 
   return result;
 }
@@ -1126,7 +1108,7 @@ kml::TrackId BookmarkManager::SaveTrackRecording(std::string trackName)
   line.reserve(trackSize);
   timestamps.reserve(trackSize);
 
-  tracker.ForEachTrackPoint([&line, &timestamps](location::GpsInfo const & pt, size_t id)->bool
+  tracker.ForEachTrackPoint([&line, &timestamps](location::GpsInfo const & pt, size_t id) -> bool
   {
     line.emplace_back(mercator::FromLatLon(pt.m_latitude, pt.m_longitude), pt.m_altitude);
     timestamps.emplace_back(pt.m_timestamp);
@@ -1181,7 +1163,8 @@ std::string BookmarkManager::GenerateSavedRouteName(std::string const & from, st
   return GenerateTrackRecordingName();
 }
 
-kml::TrackId BookmarkManager::SaveRoute(std::vector<geometry::PointWithAltitude> const & points, std::string const & from, std::string const & to)
+kml::TrackId BookmarkManager::SaveRoute(std::vector<geometry::PointWithAltitude> const & points,
+                                        std::string const & from, std::string const & to)
 {
   CHECK(!points.empty(), ("Route points should not be empty"));
 
@@ -1233,8 +1216,7 @@ void BookmarkManager::PrepareBookmarksAddresses(std::vector<SortBookmarkData> &
   }
 }
 
-void BookmarkManager::FilterInvalidData(SortedBlocksCollection & sortedBlocks,
-                                        AddressesCollection & newAddresses) const
+void BookmarkManager::FilterInvalidData(SortedBlocksCollection & sortedBlocks, AddressesCollection & newAddresses) const
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
 
@@ -1244,16 +1226,11 @@ void BookmarkManager::FilterInvalidData(SortedBlocksCollection & sortedBlocks,
     FilterInvalidTracks(block.m_trackIds);
   }
 
-  base::EraseIf(sortedBlocks, [](SortedBlock const & block)
-                              {
-                                return block.m_trackIds.empty() && block.m_markIds.empty();
-                              });
+  base::EraseIf(sortedBlocks,
+                [](SortedBlock const & block) { return block.m_trackIds.empty() && block.m_markIds.empty(); });
 
-  base::EraseIf(newAddresses, [this](std::pair<kml::MarkId,
-                                               search::ReverseGeocoder::RegionAddress> const & item)
-                              {
-                                return GetBookmark(item.first) == nullptr;
-                              });
+  base::EraseIf(newAddresses, [this](std::pair<kml::MarkId, search::ReverseGeocoder::RegionAddress> const & item)
+  { return GetBookmark(item.first) == nullptr; });
 }
 
 void BookmarkManager::SetBookmarksAddresses(AddressesCollection const & addresses)
@@ -1300,25 +1277,18 @@ void BookmarkManager::SortTracksByTime(std::vector<SortTrackData> & tracks)
     return;
 
   std::sort(tracks.begin(), tracks.end(),
-            [](SortTrackData const & lbm, SortTrackData const & rbm)
-            {
-              return lbm.m_timestamp > rbm.m_timestamp;
-            });
+            [](SortTrackData const & lbm, SortTrackData const & rbm) { return lbm.m_timestamp > rbm.m_timestamp; });
 }
 
 // static
 void BookmarkManager::SortTracksByName(std::vector<SortTrackData> & tracks)
 {
   std::sort(tracks.begin(), tracks.end(),
-            [](SortTrackData const & lbm, SortTrackData const & rbm)
-            {
-              return lbm.m_name < rbm.m_name;
-            });
+            [](SortTrackData const & lbm, SortTrackData const & rbm) { return lbm.m_name < rbm.m_name; });
 }
 
 void BookmarkManager::SortByDistance(std::vector<SortBookmarkData> const & bookmarksForSort,
-                                     std::vector<SortTrackData> const & tracksForSort,
-                                     m2::PointD const & myPosition,
+                                     std::vector<SortTrackData> const & tracksForSort, m2::PointD const & myPosition,
                                      SortedBlocksCollection & sortedBlocks)
 {
   CHECK(m_regionAddressGetter != nullptr, ());
@@ -1335,10 +1305,7 @@ void BookmarkManager::SortByDistance(std::vector<SortBookmarkData> const & bookm
 
   std::sort(sortedMarks.begin(), sortedMarks.end(),
             [](std::pair<SortBookmarkData const *, double> const & lbm,
-               std::pair<SortBookmarkData const *, double> const & rbm)
-            {
-              return lbm.second < rbm.second;
-            });
+               std::pair<SortBookmarkData const *, double> const & rbm) { return lbm.second < rbm.second; });
 
   std::map<search::ReverseGeocoder::RegionAddress, size_t> regionBlockIndices;
   SortedBlock othersBlock;
@@ -1354,7 +1321,7 @@ void BookmarkManager::SortByDistance(std::vector<SortBookmarkData> const & bookm
     }
 
     auto const currentRegion =
-      distance < kNearDistanceInMeters ? search::ReverseGeocoder::RegionAddress() : mark.m_address;
+        distance < kNearDistanceInMeters ? search::ReverseGeocoder::RegionAddress() : mark.m_address;
 
     size_t blockIndex;
     auto const it = regionBlockIndices.find(currentRegion);
@@ -1398,11 +1365,8 @@ void BookmarkManager::SortByTime(std::vector<SortBookmarkData> const & bookmarks
   for (auto const & mark : bookmarksForSort)
     sortedMarks.push_back(&mark);
 
-  std::sort(sortedMarks.begin(), sortedMarks.end(),
-            [](SortBookmarkData const * lbm, SortBookmarkData const * rbm)
-            {
-              return lbm->m_timestamp > rbm->m_timestamp;
-            });
+  std::sort(sortedMarks.begin(), sortedMarks.end(), [](SortBookmarkData const * lbm, SortBookmarkData const * rbm)
+  { return lbm->m_timestamp > rbm->m_timestamp; });
 
   auto const currentTime = kml::TimestampClock::now();
 
@@ -1444,11 +1408,8 @@ void BookmarkManager::SortByType(std::vector<SortBookmarkData> const & bookmarks
   for (auto const & mark : bookmarksForSort)
     sortedMarks.push_back(&mark);
 
-  std::sort(sortedMarks.begin(), sortedMarks.end(),
-            [](SortBookmarkData const * lbm, SortBookmarkData const * rbm)
-            {
-              return lbm->m_timestamp > rbm->m_timestamp;
-            });
+  std::sort(sortedMarks.begin(), sortedMarks.end(), [](SortBookmarkData const * lbm, SortBookmarkData const * rbm)
+  { return lbm->m_timestamp > rbm->m_timestamp; });
 
   std::map<BookmarkBaseType, size_t> typesCount;
   size_t othersTypeMarksCount = 0;
@@ -1466,16 +1427,14 @@ void BookmarkManager::SortByType(std::vector<SortBookmarkData> const & bookmarks
 
   std::vector<std::pair<BookmarkBaseType, size_t>> sortedTypes;
   for (auto const & typeCount : typesCount)
-  {
     if (typeCount.second < kMinCommonTypesCount && typeCount.first != BookmarkBaseType::Hotel)
       othersTypeMarksCount += typeCount.second;
     else
       sortedTypes.emplace_back(typeCount);
-  }
 
   std::sort(sortedTypes.begin(), sortedTypes.end(),
-            [](std::pair<BookmarkBaseType, size_t> const & l,
-               std::pair<BookmarkBaseType, size_t> const & r){ return l.second > r.second; });
+            [](std::pair<BookmarkBaseType, size_t> const & l, std::pair<BookmarkBaseType, size_t> const & r)
+  { return l.second > r.second; });
 
   std::map<BookmarkBaseType, size_t> blockIndices;
   sortedBlocks.reserve(sortedBlocks.size() + sortedTypes.size() + (othersTypeMarksCount > 0 ? 1 : 0));
@@ -1500,15 +1459,10 @@ void BookmarkManager::SortByType(std::vector<SortBookmarkData> const & bookmarks
   for (auto mark : sortedMarks)
   {
     auto const type = mark->m_type;
-    if (type == BookmarkBaseType::None ||
-      (type != BookmarkBaseType::Hotel && typesCount[type] < kMinCommonTypesCount))
-    {
+    if (type == BookmarkBaseType::None || (type != BookmarkBaseType::Hotel && typesCount[type] < kMinCommonTypesCount))
       sortedBlocks.back().m_markIds.push_back(mark->m_id);
-    }
     else
-    {
       sortedBlocks[blockIndices[type]].m_markIds.push_back(mark->m_id);
-    }
   }
 }
 
@@ -1526,10 +1480,7 @@ void BookmarkManager::SortByName(std::vector<SortBookmarkData> const & bookmarks
     sortedMarks.push_back(&mark);
 
   std::sort(sortedMarks.begin(), sortedMarks.end(),
-            [](SortBookmarkData const * lbm, SortBookmarkData const * rbm)
-            {
-              return lbm->m_name < rbm->m_name;
-            });
+            [](SortBookmarkData const * lbm, SortBookmarkData const * rbm) { return lbm->m_name < rbm->m_name; });
 
   // Put all bookmarks into one block
   SortedBlock bookmarkBlock;
@@ -1550,15 +1501,9 @@ void BookmarkManager::GetSortedCategoryImpl(SortParams const & params,
     CHECK(params.m_hasMyPosition, ());
     SortByDistance(bookmarksForSort, tracksForSort, params.m_myPosition, sortedBlocks);
     return;
-  case SortingType::ByTime:
-    SortByTime(bookmarksForSort, tracksForSort, sortedBlocks);
-    return;
-  case SortingType::ByType:
-    SortByType(bookmarksForSort, tracksForSort, sortedBlocks);
-    return;
-  case SortingType::ByName:
-    SortByName(bookmarksForSort, tracksForSort, sortedBlocks);
-    return;
+  case SortingType::ByTime: SortByTime(bookmarksForSort, tracksForSort, sortedBlocks); return;
+  case SortingType::ByType: SortByType(bookmarksForSort, tracksForSort, sortedBlocks); return;
+  case SortingType::ByName: SortByName(bookmarksForSort, tracksForSort, sortedBlocks); return;
   }
   UNREACHABLE();
 }
@@ -1606,9 +1551,8 @@ void BookmarkManager::GetSortedCategory(SortParams const & params)
     return;
   }
 
-  GetPlatform().RunTask(Platform::Thread::Background,
-                        [this, params, bookmarksForSort = std::move(bookmarksForSort),
-                          tracksForSort = std::move(tracksForSort)]() mutable
+  GetPlatform().RunTask(Platform::Thread::Background, [this, params, bookmarksForSort = std::move(bookmarksForSort),
+                                                       tracksForSort = std::move(tracksForSort)]() mutable
   {
     std::unique_lock const lock(m_regionAddressMutex);
     if (m_regionAddressGetter == nullptr)
@@ -1628,8 +1572,7 @@ void BookmarkManager::GetSortedCategory(SortParams const & params)
     SortedBlocksCollection sortedBlocks;
     GetSortedCategoryImpl(params, bookmarksForSort, tracksForSort, sortedBlocks);
 
-    GetPlatform().RunTask(Platform::Thread::Gui, [this, params,
-                                                  newAddresses = std::move(newAddresses),
+    GetPlatform().RunTask(Platform::Thread::Gui, [this, params, newAddresses = std::move(newAddresses),
                                                   sortedBlocks = std::move(sortedBlocks)]() mutable
     {
       FilterInvalidData(sortedBlocks, newAddresses);
@@ -1719,10 +1662,8 @@ kml::MarkGroupId BookmarkManager::GetCategoryByFileName(std::string const & file
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
   for (auto const & c : m_categories)
-  {
     if (c.second->GetFileName() == fileName)
       return c.second->GetID();
-  }
   return kml::kInvalidMarkGroupId;
 }
 
@@ -1764,10 +1705,8 @@ kml::MarkGroupId BookmarkManager::GetCategoryId(std::string const & name) const
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
   for (auto const & category : m_categories)
-  {
     if (category.second->GetName() == name)
       return category.first;
-  }
   return kml::kInvalidMarkGroupId;
 }
 
@@ -1859,20 +1798,21 @@ void BookmarkManager::RequestSymbolSizes()
   symbols.push_back(kLargestBookmarkSymbolName);
   symbols.push_back(TrackSelectionMark::GetInitialSymbolName());
 
-  m_drapeEngine.SafeCall(
-      &df::DrapeEngine::RequestSymbolsSize, symbols,
-      [this](std::map<std::string, m2::PointF> && sizes) {
-        GetPlatform().RunTask(Platform::Thread::Gui, [this, sizes = std::move(sizes)]() mutable {
-          auto es = GetEditSession();
-          auto infoMark = GetMarkForEdit<TrackInfoMark>(m_trackInfoMarkId);
-          auto const & sz = sizes.at(TrackSelectionMark::GetInitialSymbolName());
-          infoMark->SetOffset(m2::PointF(0.0, -sz.y / 2));
-          m_maxBookmarkSymbolSize = sizes.at(kLargestBookmarkSymbolName);
-          m_symbolSizesAcquired = true;
-          if (m_onSymbolSizesAcquiredFn)
-            m_onSymbolSizesAcquiredFn();
-        });
-      });
+  m_drapeEngine.SafeCall(&df::DrapeEngine::RequestSymbolsSize, symbols,
+                         [this](std::map<std::string, m2::PointF> && sizes)
+  {
+    GetPlatform().RunTask(Platform::Thread::Gui, [this, sizes = std::move(sizes)]() mutable
+    {
+      auto es = GetEditSession();
+      auto infoMark = GetMarkForEdit<TrackInfoMark>(m_trackInfoMarkId);
+      auto const & sz = sizes.at(TrackSelectionMark::GetInitialSymbolName());
+      infoMark->SetOffset(m2::PointF(0.0, -sz.y / 2));
+      m_maxBookmarkSymbolSize = sizes.at(kLargestBookmarkSymbolName);
+      m_symbolSizesAcquired = true;
+      if (m_onSymbolSizesAcquiredFn)
+        m_onSymbolSizesAcquiredFn();
+    });
+  });
 }
 
 void BookmarkManager::SetDrapeEngine(ref_ptr<df::DrapeEngine> engine)
@@ -1914,8 +1854,7 @@ void BookmarkManager::SetAsyncLoadingCallbacks(AsyncLoadingCallbacks && callback
   m_asyncLoadingCallbacks = std::move(callbacks);
 }
 
-bool BookmarkManager::AreSymbolSizesAcquired(
-    BookmarkManager::OnSymbolSizesAcquiredCallback && callback)
+bool BookmarkManager::AreSymbolSizesAcquired(BookmarkManager::OnSymbolSizesAcquiredCallback && callback)
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
   if (m_symbolSizesAcquired)
@@ -1962,8 +1901,7 @@ void BookmarkManager::LoadState()
   settings::TryGet(kLastEditedBookmarkCategory, m_lastCategoryUrl);
 
   uint32_t color;
-  if (settings::Get(kLastEditedBookmarkColor, color) &&
-      color > static_cast<uint32_t>(kml::PredefinedColor::None) &&
+  if (settings::Get(kLastEditedBookmarkColor, color) && color > static_cast<uint32_t>(kml::PredefinedColor::None) &&
       color < static_cast<uint32_t>(kml::PredefinedColor::Count))
   {
     m_lastColor = static_cast<kml::PredefinedColor>(color);
@@ -1994,12 +1932,10 @@ void BookmarkManager::CleanupInvalidMetadata()
 
   auto it = m_metadata.m_entriesProperties.begin();
   while (it != m_metadata.m_entriesProperties.end())
-  {
     if (activeEntries.find(it->first) == activeEntries.end() || it->second.m_values.empty())
       it = m_metadata.m_entriesProperties.erase(it);
     else
       ++it;
-  }
 }
 
 void BookmarkManager::SaveMetadata()
@@ -2063,9 +1999,9 @@ void BookmarkManager::LoadMetadata()
   m_metadata = metadata;
 }
 
-BookmarkManager::KMLDataCollectionPtr BookmarkManager::LoadBookmarks(
-    std::string const & dir, std::string_view ext, KmlFileType fileType,
-    BookmarksChecker const & checker)
+BookmarkManager::KMLDataCollectionPtr BookmarkManager::LoadBookmarks(std::string const & dir, std::string_view ext,
+                                                                     KmlFileType fileType,
+                                                                     BookmarksChecker const & checker)
 {
   Platform::FilesList files;
   Platform::GetFilesByExt(dir, ext, files);
@@ -2098,8 +2034,7 @@ void BookmarkManager::LoadBookmarks()
   NotifyAboutStartAsyncLoading();
   GetPlatform().RunTask(Platform::Thread::File, [this]()
   {
-    auto collection = LoadBookmarks(GetBookmarksDirectory(), kKmlExtension, KmlFileType::Text,
-                                    [](kml::FileData const &)
+    auto collection = LoadBookmarks(GetBookmarksDirectory(), kKmlExtension, KmlFileType::Text, [](kml::FileData const &)
     {
       return true;  // Allow to load any files from the bookmarks directory.
     });
@@ -2256,7 +2191,7 @@ void BookmarkManager::NotifyAboutFinishAsyncLoading(KMLDataCollectionPtr && coll
         ReloadBookmarkRoutine(m_bookmarkLoadingQueue.front().m_filename);
       else
         LoadBookmarkRoutine(m_bookmarkLoadingQueue.front().m_filename,
-                          m_bookmarkLoadingQueue.front().m_isTemporaryFile);
+                            m_bookmarkLoadingQueue.front().m_isTemporaryFile);
       m_bookmarkLoadingQueue.pop_front();
     }
     else
@@ -2268,8 +2203,7 @@ void BookmarkManager::NotifyAboutFinishAsyncLoading(KMLDataCollectionPtr && coll
   });
 }
 
-void BookmarkManager::NotifyAboutFile(bool success, std::string const & filePath,
-                                      bool isTemporaryFile)
+void BookmarkManager::NotifyAboutFile(bool success, std::string const & filePath, bool isTemporaryFile)
 {
   if (m_needTeardown)
     return;
@@ -2443,10 +2377,8 @@ void BookmarkManager::SendBookmarksChanges(MarksChangesTracker const & changesTr
     auto const & removedIds = changesTracker.GetRemovedMarkIds();
     bookmarkIds.reserve(removedIds.size());
     for (auto markId : removedIds)
-    {
       if (IsBookmark(markId))
         bookmarkIds.push_back(markId);
-    }
     if (!bookmarkIds.empty())
       m_callbacks.m_deletedBookmarksCallback(bookmarkIds);
   }
@@ -2491,7 +2423,7 @@ void BookmarkManager::UpdateBmGroupIdList()
 
   m_unsortedBmGroupsIdList.clear();
   m_unsortedBmGroupsIdList.resize(count);
-  size_t i {0};
+  size_t i{0};
   for (auto const & [markGroupId, _] : m_categories)
     m_unsortedBmGroupsIdList[i++] = markGroupId;
 }
@@ -2511,9 +2443,7 @@ std::vector<kml::MarkGroupId> BookmarkManager::GetSortedBmGroupIdList() const
     vec.emplace_back(markGroupId, categoryPtr.get());
 
   std::sort(vec.begin(), vec.end(), [](PairT const & lhs, PairT const & rhs)
-  {
-    return lhs.second->GetLastModifiedTime() > rhs.second->GetLastModifiedTime();
-  });
+  { return lhs.second->GetLastModifiedTime() > rhs.second->GetLastModifiedTime(); });
 
   for (size_t i = 0; i < count; ++i)
     sortedList.push_back(vec[i].first);
@@ -2552,7 +2482,8 @@ kml::MarkGroupId BookmarkManager::CreateBookmarkCategory(std::string const & nam
   return groupId;
 }
 
-void BookmarkManager::UpdateBookmarkCategory(kml::MarkGroupId & groupId, kml::CategoryData && data, bool autoSave /* = true */)
+void BookmarkManager::UpdateBookmarkCategory(kml::MarkGroupId & groupId, kml::CategoryData && data,
+                                             bool autoSave /* = true */)
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
   CHECK_NOT_EQUAL(m_categories.count(groupId), 0, ());
@@ -2682,9 +2613,7 @@ UserMark const * BookmarkManager::FindNearestUserMark(TTouchRectHolder const & h
   // For each type X in the condition, ordered by priority:
   //  - look for the closest mark among the marks of the same type X.
   //  - if the mark has been found, stop looking for a closer one in the other types.
-  if (finder(UserMark::Type::ROUTING) ||
-      finder(UserMark::Type::ROAD_WARNING) ||
-      finder(UserMark::Type::SEARCH) ||
+  if (finder(UserMark::Type::ROUTING) || finder(UserMark::Type::ROAD_WARNING) || finder(UserMark::Type::SEARCH) ||
       finder(UserMark::Type::API))
   {
     return finder.GetFoundMark();
@@ -2741,7 +2670,7 @@ void BookmarkManager::CreateCategories(KMLDataCollection && dataCollection, bool
     if (!UserMarkIdStorage::Instance().CheckIds(fileData) || HasDuplicatedIds(fileData))
     {
       LOG(LINFO, ("Reset bookmark ids in the file", fileName));
-      //TODO: notify subscribers(like search subsystem). This KML could have been indexed.
+      // TODO: notify subscribers(like search subsystem). This KML could have been indexed.
       ResetIds(fileData);
     }
 
@@ -2749,10 +2678,7 @@ void BookmarkManager::CreateCategories(KMLDataCollection && dataCollection, bool
     std::unordered_set<std::string> compilationNames;
     for (auto & compilation : fileData.m_compilationsData)
     {
-      SetUniqueName(compilation, [&compilationNames](auto const & name)
-      {
-        return compilationNames.count(name) == 0;
-      });
+      SetUniqueName(compilation, [&compilationNames](auto const & name) { return compilationNames.count(name) == 0; });
 
       auto const compilationId = compilation.m_compilationId;
       auto childGroup = CreateBookmarkCompilation(std::move(compilation));
@@ -2853,22 +2779,17 @@ bool BookmarkManager::HasDuplicatedIds(kml::FileData const & fileData) const
   }
 
   for (auto const & b : fileData.m_bookmarksData)
-  {
     if (b.m_id != kml::kInvalidMarkId && m_bookmarks.count(b.m_id) > 0)
       return true;
-  }
 
   for (auto const & t : fileData.m_tracksData)
-  {
     if (t.m_id != kml::kInvalidTrackId && m_tracks.count(t.m_id) > 0)
       return true;
-  }
 
   for (auto const & c : fileData.m_compilationsData)
   {
     if (c.m_id != kml::kInvalidMarkGroupId &&
-        (m_categories.find(c.m_id) != m_categories.cend() ||
-         m_compilations.find(c.m_id) != m_compilations.cend()))
+        (m_categories.find(c.m_id) != m_categories.cend() || m_compilations.find(c.m_id) != m_compilations.cend()))
     {
       return true;
     }
@@ -2941,8 +2862,7 @@ bool BookmarkManager::SaveBookmarkCategory(kml::MarkGroupId groupId)
   return SaveKmlFileByExt(kmlData, file);
 }
 
-bool BookmarkManager::SaveBookmarkCategory(kml::MarkGroupId groupId, Writer & writer,
-                                           KmlFileType fileType) const
+bool BookmarkManager::SaveBookmarkCategory(kml::MarkGroupId groupId, Writer & writer, KmlFileType fileType) const
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
   auto * group = GetBmCategory(groupId);
@@ -2950,7 +2870,6 @@ bool BookmarkManager::SaveBookmarkCategory(kml::MarkGroupId groupId, Writer & wr
   return SaveKmlData(*kmlData, writer, fileType);
 }
 
-
 BookmarkManager::KMLDataCollectionPtr BookmarkManager::PrepareToSaveBookmarksForTrack(kml::TrackId trackId)
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
@@ -2969,7 +2888,7 @@ BookmarkManager::KMLDataCollectionPtr BookmarkManager::PrepareToSaveBookmarksFor
 }
 
 BookmarkManager::KMLDataCollectionPtr BookmarkManager::PrepareToSaveBookmarks(
-  kml::GroupIdCollection const & groupIdCollection)
+    kml::GroupIdCollection const & groupIdCollection)
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
 
@@ -3026,7 +2945,8 @@ void BookmarkManager::SaveBookmarks(kml::GroupIdCollection const & groupIdCollec
   });
 }
 
-void BookmarkManager::PrepareTrackFileForSharing(kml::TrackId trackId, SharingHandler && handler, KmlFileType kmlFileType)
+void BookmarkManager::PrepareTrackFileForSharing(kml::TrackId trackId, SharingHandler && handler,
+                                                 KmlFileType kmlFileType)
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
   ASSERT(handler, ());
@@ -3037,13 +2957,14 @@ void BookmarkManager::PrepareTrackFileForSharing(kml::TrackId trackId, SharingHa
   }
   else
   {
-    GetPlatform().RunTask(Platform::Thread::File,
-                          [collection = std::move(collection), handler = std::move(handler), kmlFileType = kmlFileType]() mutable
-                          { handler(GetFileForSharing(std::move(collection), kmlFileType)); });
+    GetPlatform().RunTask(Platform::Thread::File, [collection = std::move(collection), handler = std::move(handler),
+                                                   kmlFileType = kmlFileType]() mutable
+    { handler(GetFileForSharing(std::move(collection), kmlFileType)); });
   }
 }
 
-void BookmarkManager::PrepareFileForSharing(kml::GroupIdCollection && categoriesIds, SharingHandler && handler, KmlFileType kmlFileType)
+void BookmarkManager::PrepareFileForSharing(kml::GroupIdCollection && categoriesIds, SharingHandler && handler,
+                                            KmlFileType kmlFileType)
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
   ASSERT(handler, ());
@@ -3066,9 +2987,9 @@ void BookmarkManager::PrepareFileForSharing(kml::GroupIdCollection && categories
   }
   else
   {
-    GetPlatform().RunTask(Platform::Thread::File,
-                          [collection = std::move(collection), handler = std::move(handler), kmlFileType = kmlFileType]() mutable
-                          { handler(GetFileForSharing(std::move(collection), kmlFileType)); });
+    GetPlatform().RunTask(Platform::Thread::File, [collection = std::move(collection), handler = std::move(handler),
+                                                   kmlFileType = kmlFileType]() mutable
+    { handler(GetFileForSharing(std::move(collection), kmlFileType)); });
   }
 }
 
@@ -3076,17 +2997,16 @@ void BookmarkManager::PrepareAllFilesForSharing(SharingHandler && handler)
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
   ASSERT(handler, ());
-  PrepareFileForSharing(decltype(m_unsortedBmGroupsIdList){m_unsortedBmGroupsIdList}, std::move(handler), KmlFileType::Text);
+  PrepareFileForSharing(decltype(m_unsortedBmGroupsIdList){m_unsortedBmGroupsIdList}, std::move(handler),
+                        KmlFileType::Text);
 }
 
 bool BookmarkManager::AreAllCategoriesEmpty() const
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
   for (auto const & c : m_categories)
-  {
     if (!c.second->IsEmpty())
       return false;
-  }
   return true;
 }
 
@@ -3100,10 +3020,8 @@ bool BookmarkManager::IsUsedCategoryName(std::string const & name) const
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
   for (auto const & c : m_categories)
-  {
     if (c.second->GetName() == name)
       return true;
-  }
   return false;
 }
 
@@ -3121,10 +3039,8 @@ bool BookmarkManager::CheckVisibility(bool isVisible) const
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
   for (auto const & category : m_categories)
-  {
     if (category.second->IsVisible() != isVisible)
       return false;
-  }
 
   return true;
 }
@@ -3134,9 +3050,7 @@ void BookmarkManager::SetAllCategoriesVisibility(bool visible)
   CHECK_THREAD_CHECKER(m_threadChecker, ());
   auto session = GetEditSession();
   for (auto const & category : m_categories)
-  {
     category.second->SetIsVisible(visible);
-  }
 }
 
 void BookmarkManager::SetChildCategoriesVisibility(kml::MarkGroupId categoryId, kml::CompilationType compilationType,
@@ -3190,13 +3104,13 @@ void BookmarkManager::EnableTestMode(bool enable)
 void BookmarkManager::FilterInvalidBookmarks(kml::MarkIdCollection & bookmarks) const
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
-  base::EraseIf(bookmarks, [this](kml::MarkId const & id){ return GetBookmark(id) == nullptr; });
+  base::EraseIf(bookmarks, [this](kml::MarkId const & id) { return GetBookmark(id) == nullptr; });
 }
 
 void BookmarkManager::FilterInvalidTracks(kml::TrackIdCollection & tracks) const
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
-  base::EraseIf(tracks, [this](kml::TrackId const & id){ return GetTrack(id) == nullptr; });
+  base::EraseIf(tracks, [this](kml::TrackId const & id) { return GetTrack(id) == nullptr; });
 }
 
 kml::GroupIdSet BookmarkManager::MarksChangesTracker::GetAllGroupIds() const
@@ -3332,14 +3246,12 @@ void BookmarkManager::MarksChangesTracker::InferVisibility(BookmarkCategory * co
   }
 }
 
-void BookmarkManager::MarksChangesTracker::OnAttachBookmark(kml::MarkId markId,
-                                                            kml::MarkGroupId catId)
+void BookmarkManager::MarksChangesTracker::OnAttachBookmark(kml::MarkId markId, kml::MarkGroupId catId)
 {
   InsertBookmark(markId, catId, m_attachedBookmarks, m_detachedBookmarks);
 }
 
-void BookmarkManager::MarksChangesTracker::OnDetachBookmark(kml::MarkId markId,
-                                                            kml::MarkGroupId catId)
+void BookmarkManager::MarksChangesTracker::OnDetachBookmark(kml::MarkId markId, kml::MarkGroupId catId)
 {
   InsertBookmark(markId, catId, m_detachedBookmarks, m_attachedBookmarks);
 }
@@ -3442,7 +3354,7 @@ void BookmarkManager::MarksChangesTracker::AcceptDirtyItems()
       m_updatedGroups.insert(line->GetGroupId());
       line->ResetChanges();
     }
-   }
+  }
   m_updatedLines.swap(dirtyLines);
 
   for (auto const markId : m_createdMarks)
@@ -3538,26 +3450,20 @@ void BookmarkManager::MarksChangesTracker::AddChanges(MarksChangesTracker const
     OnUpdateLine(lineId);
 
   for (auto const & attachedInfo : changes.m_attachedBookmarks)
-  {
     for (auto const markId : attachedInfo.second)
       OnAttachBookmark(markId, attachedInfo.first);
-  }
 
   for (auto const & detachedInfo : changes.m_detachedBookmarks)
-  {
     for (auto const markId : detachedInfo.second)
       OnDetachBookmark(markId, detachedInfo.first);
-  }
 }
 
 bool BookmarkManager::SortedBlock::operator==(SortedBlock const & other) const
 {
-  return m_blockName == other.m_blockName && m_markIds == other.m_markIds &&
-    m_trackIds == other.m_trackIds;
+  return m_blockName == other.m_blockName && m_markIds == other.m_markIds && m_trackIds == other.m_trackIds;
 }
 
-bool BookmarkManager::Properties::GetProperty(std::string const & propertyName,
-                                              std::string & value) const
+bool BookmarkManager::Properties::GetProperty(std::string const & propertyName, std::string & value) const
 {
   auto const it = m_values.find(propertyName);
   if (it == m_values.end())
@@ -3566,8 +3472,7 @@ bool BookmarkManager::Properties::GetProperty(std::string const & propertyName,
   return true;
 }
 
-bool BookmarkManager::Metadata::GetEntryProperty(std::string const & entryName,
-                                                 std::string const & propertyName,
+bool BookmarkManager::Metadata::GetEntryProperty(std::string const & entryName, std::string const & propertyName,
                                                  std::string & value) const
 {
   auto const it = m_entriesProperties.find(entryName);
@@ -3577,8 +3482,7 @@ bool BookmarkManager::Metadata::GetEntryProperty(std::string const & entryName,
   return it->second.GetProperty(propertyName, value);
 }
 
-BookmarkManager::EditSession::EditSession(BookmarkManager & manager)
-  : m_bmManager(manager)
+BookmarkManager::EditSession::EditSession(BookmarkManager & manager) : m_bmManager(manager)
 {
   m_bmManager.OnEditSessionOpened();
 }
@@ -3638,8 +3542,8 @@ void BookmarkManager::EditSession::SetIsVisible(kml::MarkGroupId groupId, bool v
   m_bmManager.SetIsVisible(groupId, visible);
 }
 
-void BookmarkManager::EditSession::MoveBookmark(
-  kml::MarkId bmID, kml::MarkGroupId curGroupID, kml::MarkGroupId newGroupID)
+void BookmarkManager::EditSession::MoveBookmark(kml::MarkId bmID, kml::MarkGroupId curGroupID,
+                                                kml::MarkGroupId newGroupID)
 {
   m_bmManager.MoveBookmark(bmID, curGroupID, newGroupID);
 }
@@ -3651,7 +3555,7 @@ void BookmarkManager::EditSession::UpdateBookmark(kml::MarkId bmId, kml::Bookmar
 
 void BookmarkManager::EditSession::UpdateTrack(kml::TrackId trackId, kml::TrackData const & trackData)
 {
-  return m_bmManager.UpdateTrack(trackId,trackData);
+  return m_bmManager.UpdateTrack(trackId, trackData);
 }
 
 void BookmarkManager::EditSession::ChangeTrackColor(kml::TrackId trackId, dp::Color color)
@@ -3669,7 +3573,8 @@ void BookmarkManager::EditSession::DetachBookmark(kml::MarkId bmId, kml::MarkGro
   m_bmManager.DetachBookmark(bmId, groupId);
 }
 
-void BookmarkManager::EditSession::MoveTrack(kml::TrackId trackID, kml::MarkGroupId curGroupID, kml::MarkGroupId newGroupID)
+void BookmarkManager::EditSession::MoveTrack(kml::TrackId trackID, kml::MarkGroupId curGroupID,
+                                             kml::MarkGroupId newGroupID)
 {
   m_bmManager.MoveTrack(trackID, curGroupID, newGroupID);
 }
@@ -3689,8 +3594,7 @@ void BookmarkManager::EditSession::SetCategoryName(kml::MarkGroupId categoryId,
   m_bmManager.SetCategoryName(categoryId, name);
 }
 
-void BookmarkManager::EditSession::SetCategoryDescription(kml::MarkGroupId categoryId,
-                                                          std::string const & desc)
+void BookmarkManager::EditSession::SetCategoryDescription(kml::MarkGroupId categoryId, std::string const & desc)
 {
   m_bmManager.SetCategoryDescription(categoryId, desc);
 }
diff --git a/libs/map/bookmark_manager.hpp b/libs/map/bookmark_manager.hpp
index faeaffa3e..cf5e663d0 100644
--- a/libs/map/bookmark_manager.hpp
+++ b/libs/map/bookmark_manager.hpp
@@ -78,14 +78,11 @@ public:
     using AttachedBookmarksCallback = std::function<void(std::vector<BookmarkGroupInfo> const &)>;
     using DetachedBookmarksCallback = std::function<void(std::vector<BookmarkGroupInfo> const &)>;
 
-    template <typename StringsBundleProvider, typename SearchAPIProvider,
-              typename CreateListener, typename UpdateListener,
-              typename DeleteListener, typename AttachListener, typename DetachListener>
-    Callbacks(StringsBundleProvider && stringsBundleProvider,
-              SearchAPIProvider && searchAPIProvider,
-              CreateListener && createListener, UpdateListener && updateListener,
-              DeleteListener && deleteListener, AttachListener && attachListener,
-              DetachListener && detachListener)
+    template <typename StringsBundleProvider, typename SearchAPIProvider, typename CreateListener,
+              typename UpdateListener, typename DeleteListener, typename AttachListener, typename DetachListener>
+    Callbacks(StringsBundleProvider && stringsBundleProvider, SearchAPIProvider && searchAPIProvider,
+              CreateListener && createListener, UpdateListener && updateListener, DeleteListener && deleteListener,
+              AttachListener && attachListener, DetachListener && detachListener)
       : m_getStringsBundle(std::forward<StringsBundleProvider>(stringsBundleProvider))
       , m_getSearchAPI(std::forward<SearchAPIProvider>(searchAPIProvider))
       , m_createdBookmarksCallback(std::forward<CreateListener>(createListener))
@@ -160,11 +157,11 @@ public:
     void SetCategoryDescription(kml::MarkGroupId categoryId, std::string const & desc);
     void SetCategoryTags(kml::MarkGroupId categoryId, std::vector<std::string> const & tags);
     void SetCategoryAccessRules(kml::MarkGroupId categoryId, kml::AccessRules accessRules);
-    void SetCategoryCustomProperty(kml::MarkGroupId categoryId, std::string const & key,
-                                   std::string const & value);
-    
+    void SetCategoryCustomProperty(kml::MarkGroupId categoryId, std::string const & key, std::string const & value);
+
     /// Removes the category from the list of categories and deletes the related file.
-    /// @param permanently If true, the file will be removed from the disk. If false, the file will be marked as deleted and moved into a trash.
+    /// @param permanently If true, the file will be removed from the disk. If false, the file will be marked as deleted
+    /// and moved into a trash.
     bool DeleteBmCategory(kml::MarkGroupId groupId, bool permanently);
     void NotifyChanges();
 
@@ -176,8 +173,7 @@ public:
 
   void SetDrapeEngine(ref_ptr<df::DrapeEngine> engine);
 
-  void InitRegionAddressGetter(DataSource const & dataSource,
-                               storage::CountryInfoGetter const & infoGetter);
+  void InitRegionAddressGetter(DataSource const & dataSource, storage::CountryInfoGetter const & infoGetter);
 
   void SetBookmarksChangedCallback(BookmarksChangedCallback && callback);
   void SetCategoriesChangedCallback(CategoriesChangedCallback && callback);
@@ -255,8 +251,7 @@ public:
     OnResults m_onResults;
   };
 
-  std::vector<SortingType> GetAvailableSortingTypes(kml::MarkGroupId groupId,
-                                                    bool hasMyPosition) const;
+  std::vector<SortingType> GetAvailableSortingTypes(kml::MarkGroupId groupId, bool hasMyPosition) const;
   void GetSortedCategory(SortParams const & params);
 
   bool GetLastSortingType(kml::MarkGroupId groupId, SortingType & sortingType) const;
@@ -283,7 +278,7 @@ public:
 
   kml::GroupIdCollection const & GetUnsortedBmGroupsIdList() const { return m_unsortedBmGroupsIdList; }
   kml::GroupIdCollection GetSortedBmGroupIdList() const;
-  size_t GetBmGroupsCount() const { return m_unsortedBmGroupsIdList.size(); };
+  size_t GetBmGroupsCount() const { return m_unsortedBmGroupsIdList.size(); }
   bool HasBmCategory(kml::MarkGroupId groupId) const;
   bool HasBookmark(kml::MarkId markId) const;
   bool HasTrack(kml::TrackId trackId) const;
@@ -326,7 +321,7 @@ public:
       FileError
     };
 
-    SharingResult(kml::GroupIdCollection && categoriesIds, std::string && sharingPath, const std::string & mimeType)
+    SharingResult(kml::GroupIdCollection && categoriesIds, std::string && sharingPath, std::string const & mimeType)
       : m_categoriesIds(categoriesIds)
       , m_code(Code::Success)
       , m_sharingPath(std::move(sharingPath))
@@ -352,7 +347,8 @@ public:
   };
 
   using SharingHandler = platform::SafeCallback<void(SharingResult const & result)>;
-  void PrepareFileForSharing(kml::GroupIdCollection && categoriesIds, SharingHandler && handler, KmlFileType kmlFileType);
+  void PrepareFileForSharing(kml::GroupIdCollection && categoriesIds, SharingHandler && handler,
+                             KmlFileType kmlFileType);
   void PrepareTrackFileForSharing(kml::TrackId trackId, SharingHandler && handler, KmlFileType kmlFileType);
   void PrepareAllFilesForSharing(SharingHandler && handler);
 
@@ -363,8 +359,7 @@ public:
   bool AreAllCategoriesVisible() const;
   bool AreAllCategoriesInvisible() const;
   void SetAllCategoriesVisibility(bool visible);
-  void SetChildCategoriesVisibility(kml::MarkGroupId categoryId, kml::CompilationType compilationType,
-                                    bool visible);
+  void SetChildCategoriesVisibility(kml::MarkGroupId categoryId, kml::CompilationType compilationType, bool visible);
 
   void SetNotificationsEnabled(bool enabled);
   bool AreNotificationsEnabled() const;
@@ -376,9 +371,9 @@ public:
   bool SaveBookmarkCategory(kml::MarkGroupId groupId);
   bool SaveBookmarkCategory(kml::MarkGroupId groupId, Writer & writer, KmlFileType fileType) const;
 
-  bool HasRecentlyDeletedBookmark() const { return m_recentlyDeletedBookmark.operator bool(); };
+  bool HasRecentlyDeletedBookmark() const { return m_recentlyDeletedBookmark.operator bool(); }
   void ResetRecentlyDeletedBookmark();
-  
+
   size_t GetRecentlyDeletedCategoriesCount() const;
   BookmarkManager::KMLDataCollectionPtr GetRecentlyDeletedCategories();
   bool IsRecentlyDeletedCategory(std::string const & filePath) const;
@@ -417,8 +412,8 @@ public:
   void SetElevationMyPositionChangedCallback(ElevationMyPositionChangedCallback const & cb);
 
   using TracksFilter = std::function<bool(Track const * track)>;
-  Track::TrackSelectionInfo FindNearestTrack(
-      m2::RectD const & touchRect, TracksFilter const & tracksFilter = nullptr) const;
+  Track::TrackSelectionInfo FindNearestTrack(m2::RectD const & touchRect,
+                                             TracksFilter const & tracksFilter = nullptr) const;
   Track::TrackSelectionInfo GetTrackSelectionInfo(kml::TrackId const & trackId) const;
 
   void SetTrackSelectionInfo(Track::TrackSelectionInfo const & trackSelectionInfo, bool notifyListeners);
@@ -435,14 +430,14 @@ public:
   std::string GenerateTrackRecordingName() const;
   dp::Color GenerateTrackRecordingColor() const;
 
-  kml::TrackId SaveRoute(std::vector<geometry::PointWithAltitude> const & points, std::string const & from, std::string const & to);
+  kml::TrackId SaveRoute(std::vector<geometry::PointWithAltitude> const & points, std::string const & from,
+                         std::string const & to);
 
 private:
   class MarksChangesTracker : public df::UserMarksProvider
   {
   public:
-    explicit MarksChangesTracker(BookmarkManager * bmManager)
-      : m_bmManager(bmManager)
+    explicit MarksChangesTracker(BookmarkManager * bmManager) : m_bmManager(bmManager)
     {
       CHECK(m_bmManager != nullptr, ());
     }
@@ -495,8 +490,8 @@ private:
     void OnBecomeVisibleGroup(kml::MarkGroupId groupId);
     void OnBecomeInvisibleGroup(kml::MarkGroupId groupId);
 
-    static void InsertBookmark(kml::MarkId markId, kml::MarkGroupId catId,
-                               GroupMarkIdSet & setToInsert, GroupMarkIdSet & setToErase);
+    static void InsertBookmark(kml::MarkId markId, kml::MarkGroupId catId, GroupMarkIdSet & setToInsert,
+                               GroupMarkIdSet & setToErase);
     static bool HasBookmarkCategories(kml::GroupIdSet const & groupIds);
 
     void InferVisibility(BookmarkCategory * const group);
@@ -554,10 +549,8 @@ private:
     CHECK_THREAD_CHECKER(m_threadChecker, ());
     std::list<kml::MarkId> marksToDelete;
     for (auto markId : GetUserMarkIds(type))
-    {
       if (deletePredicate(GetMark<UserMarkT>(markId)))
         marksToDelete.push_back(markId);
-    }
     // Delete after iterating to avoid iterators invalidation issues.
     for (auto markId : marksToDelete)
       DeleteUserMark(markId);
@@ -633,8 +626,8 @@ private:
   void ReloadBookmarkRoutine(std::string const & filePath);
 
   using BookmarksChecker = std::function<bool(kml::FileData const &)>;
-  KMLDataCollectionPtr LoadBookmarks(std::string const & dir, std::string_view ext,
-                                     KmlFileType fileType, BookmarksChecker const & checker);
+  KMLDataCollectionPtr LoadBookmarks(std::string const & dir, std::string_view ext, KmlFileType fileType,
+                                     BookmarksChecker const & checker);
 
   void GetDirtyGroups(kml::GroupIdSet & dirtyGroups) const;
   void UpdateBmGroupIdList();
@@ -691,29 +684,25 @@ private:
     kml::Timestamp m_timestamp;
   };
 
-  void GetSortedCategoryImpl(SortParams const & params,
-                             std::vector<SortBookmarkData> const & bookmarksForSort,
-                             std::vector<SortTrackData> const & tracksForSort,
-                             SortedBlocksCollection & sortedBlocks);
+  void GetSortedCategoryImpl(SortParams const & params, std::vector<SortBookmarkData> const & bookmarksForSort,
+                             std::vector<SortTrackData> const & tracksForSort, SortedBlocksCollection & sortedBlocks);
 
   void SortByDistance(std::vector<SortBookmarkData> const & bookmarksForSort,
-                      std::vector<SortTrackData> const & tracksForSort,
-                      m2::PointD const & myPosition, SortedBlocksCollection & sortedBlocks);
+                      std::vector<SortTrackData> const & tracksForSort, m2::PointD const & myPosition,
+                      SortedBlocksCollection & sortedBlocks);
   static void SortByTime(std::vector<SortBookmarkData> const & bookmarksForSort,
-                         std::vector<SortTrackData> const & tracksForSort,
-                         SortedBlocksCollection & sortedBlocks);
+                         std::vector<SortTrackData> const & tracksForSort, SortedBlocksCollection & sortedBlocks);
   static void SortByType(std::vector<SortBookmarkData> const & bookmarksForSort,
-                         std::vector<SortTrackData> const & tracksForSort,
-                         SortedBlocksCollection & sortedBlocks);
+                         std::vector<SortTrackData> const & tracksForSort, SortedBlocksCollection & sortedBlocks);
   static void SortByName(std::vector<SortBookmarkData> const & bookmarksForSort,
-                         std::vector<SortTrackData> const & tracksForSort,
-                         SortedBlocksCollection & sortedBlocks);
+                         std::vector<SortTrackData> const & tracksForSort, SortedBlocksCollection & sortedBlocks);
 
   using AddressesCollection = std::vector<std::pair<kml::MarkId, search::ReverseGeocoder::RegionAddress>>;
   void PrepareBookmarksAddresses(std::vector<SortBookmarkData> & bookmarksForSort, AddressesCollection & newAddresses);
   void FilterInvalidData(SortedBlocksCollection & sortedBlocks, AddressesCollection & newAddresses) const;
   void SetBookmarksAddresses(AddressesCollection const & addresses);
-  static void AddTracksSortedBlock(std::vector<SortTrackData> const & sortedTracks, SortedBlocksCollection & sortedBlocks);
+  static void AddTracksSortedBlock(std::vector<SortTrackData> const & sortedTracks,
+                                   SortedBlocksCollection & sortedBlocks);
   static void SortTracksByTime(std::vector<SortTrackData> & tracks);
   static void SortTracksByName(std::vector<SortTrackData> & tracks);
 
@@ -784,7 +773,9 @@ private:
   struct BookmarkLoaderInfo
   {
     BookmarkLoaderInfo(std::string const & filename, bool isTemporaryFile, bool isReloading)
-      : m_filename(filename), m_isTemporaryFile(isTemporaryFile), m_isReloading(isReloading)
+      : m_filename(filename)
+      , m_isTemporaryFile(isTemporaryFile)
+      , m_isReloading(isReloading)
     {}
 
     std::string m_filename;
@@ -802,15 +793,13 @@ private:
 
   struct ExpiredCategory
   {
-    ExpiredCategory(kml::MarkGroupId id, std::string const & serverId)
-      : m_id(id), m_serverId(serverId) {}
+    ExpiredCategory(kml::MarkGroupId id, std::string const & serverId) : m_id(id), m_serverId(serverId) {}
 
     kml::MarkGroupId m_id;
     std::string m_serverId;
   };
   std::vector<ExpiredCategory> m_expiredCategories;
 
-
   struct Properties
   {
     DECLARE_VISITOR_AND_DEBUG_PRINT(Properties, visitor(m_values, "values"))
@@ -825,8 +814,7 @@ private:
     DECLARE_VISITOR_AND_DEBUG_PRINT(Metadata, visitor(m_entriesProperties, "entriesProperties"),
                                     visitor(m_commonProperties, "commonProperties"))
 
-    bool GetEntryProperty(std::string const & entryName, std::string const & propertyName,
-                          std::string & value) const;
+    bool GetEntryProperty(std::string const & entryName, std::string const & propertyName, std::string & value) const;
 
     std::map<std::string, Properties> m_entriesProperties;
     Properties m_commonProperties;
diff --git a/libs/map/chart_generator.cpp b/libs/map/chart_generator.cpp
index 86d68d782..d0af10a0e 100644
--- a/libs/map/chart_generator.cpp
+++ b/libs/map/chart_generator.cpp
@@ -34,14 +34,13 @@ struct BlendAdaptor
     ScaleMask = color_type::base_mask,
   };
 
-  static AGG_INLINE void blend_pix(unsigned op, TValueType * p, unsigned cr, unsigned cg,
-                                   unsigned cb, unsigned ca, unsigned cover)
+  static AGG_INLINE void blend_pix(unsigned op, TValueType * p, unsigned cr, unsigned cg, unsigned cb, unsigned ca,
+                                   unsigned cover)
   {
     using TBlendTable = agg::comp_op_table_rgba<Color, Order>;
     if (p[Order::A])
     {
-      TBlendTable::g_comp_op_func[op](p, (cr * ca + ScaleMask) >> ScaleShift,
-                                      (cg * ca + ScaleMask) >> ScaleShift,
+      TBlendTable::g_comp_op_func[op](p, (cr * ca + ScaleMask) >> ScaleShift, (cg * ca + ScaleMask) >> ScaleShift,
                                       (cb * ca + ScaleMask) >> ScaleShift, ca, cover);
     }
     else
@@ -55,17 +54,14 @@ agg::rgba8 GetLineColor(MapStyle mapStyle)
 {
   switch (mapStyle)
   {
-  case MapStyleCount:
-    LOG(LERROR, ("Wrong map style param."));  // fallthrough
+  case MapStyleCount: LOG(LERROR, ("Wrong map style param."));  // fallthrough
   case MapStyleDefaultDark:
   case MapStyleVehicleDark:
-  case MapStyleOutdoorsDark:
-    return agg::rgba8(255, 230, 140, 255);
+  case MapStyleOutdoorsDark: return agg::rgba8(255, 230, 140, 255);
   case MapStyleDefaultLight:
   case MapStyleVehicleLight:
   case MapStyleOutdoorsLight:
-  case MapStyleMerged:
-    return agg::rgba8(30, 150, 240, 255);
+  case MapStyleMerged: return agg::rgba8(30, 150, 240, 255);
   }
   UNREACHABLE();
 }
@@ -80,13 +76,11 @@ agg::rgba8 GetCurveColor(MapStyle mapStyle)
     // No need break or return here.
   case MapStyleDefaultDark:
   case MapStyleVehicleDark:
-  case MapStyleOutdoorsDark:
-    return agg::rgba8(255, 230, 140, 20);
+  case MapStyleOutdoorsDark: return agg::rgba8(255, 230, 140, 20);
   case MapStyleDefaultLight:
   case MapStyleVehicleLight:
   case MapStyleOutdoorsLight:
-  case MapStyleMerged:
-    return agg::rgba8(30, 150, 240, 20);
+  case MapStyleMerged: return agg::rgba8(30, 150, 240, 20);
   }
   UNREACHABLE();
 }
@@ -110,9 +104,8 @@ void ReflectChartData(vector<double> & chartData)
     chartData[i] = -chartData[i];
 }
 
-bool NormalizeChartData(vector<double> const & distanceDataM,
-                        geometry::Altitudes const & altitudeDataM, size_t resultPointCount,
-                        vector<double> & uniformAltitudeDataM)
+bool NormalizeChartData(vector<double> const & distanceDataM, geometry::Altitudes const & altitudeDataM,
+                        size_t resultPointCount, vector<double> & uniformAltitudeDataM)
 {
   double constexpr kEpsilon = 1e-6;
 
@@ -134,7 +127,8 @@ bool NormalizeChartData(vector<double> const & distanceDataM,
     return true;
   }
 
-  auto const calculateAltitude = [&](double distFormStartM) {
+  auto const calculateAltitude = [&](double distFormStartM)
+  {
     if (distFormStartM <= distanceDataM.front())
       return static_cast<double>(altitudeDataM.front());
     if (distFormStartM >= distanceDataM.back())
@@ -150,8 +144,7 @@ bool NormalizeChartData(vector<double> const & distanceDataM,
 
     double const k = (altitudeDataM[nextPointIdx] - altitudeDataM[prevPointIdx]) /
                      (distanceDataM[nextPointIdx] - distanceDataM[prevPointIdx]);
-    return static_cast<double>(altitudeDataM[prevPointIdx]) +
-           k * (distFormStartM - distanceDataM[prevPointIdx]);
+    return static_cast<double>(altitudeDataM[prevPointIdx]) + k * (distFormStartM - distanceDataM[prevPointIdx]);
   };
 
   double const routeLenM = distanceDataM.back();
@@ -164,8 +157,8 @@ bool NormalizeChartData(vector<double> const & distanceDataM,
   return true;
 }
 
-bool GenerateYAxisChartData(uint32_t height, double minMetersPerPxl,
-                            vector<double> const & altitudeDataM, vector<double> & yAxisDataPxl)
+bool GenerateYAxisChartData(uint32_t height, double minMetersPerPxl, vector<double> const & altitudeDataM,
+                            vector<double> & yAxisDataPxl)
 {
   if (altitudeDataM.empty())
   {
@@ -211,8 +204,8 @@ bool GenerateYAxisChartData(uint32_t height, double minMetersPerPxl,
   return true;
 }
 
-bool GenerateChartByPoints(uint32_t width, uint32_t height, vector<m2::PointD> const & geometry,
-                           MapStyle mapStyle, vector<uint8_t> & frameBuffer)
+bool GenerateChartByPoints(uint32_t width, uint32_t height, vector<m2::PointD> const & geometry, MapStyle mapStyle,
+                           vector<uint8_t> & frameBuffer)
 {
   frameBuffer.clear();
   if (width == 0 || height == 0)
@@ -234,8 +227,8 @@ bool GenerateChartByPoints(uint32_t width, uint32_t height, vector<m2::PointD> c
   TBaseRenderer baseRenderer(pixelFormat);
 
   frameBuffer.assign(width * kAltitudeChartBPP * height, 0);
-  renderBuffer.attach(&frameBuffer[0], static_cast<unsigned>(width),
-                      static_cast<unsigned>(height), static_cast<int>(width * kAltitudeChartBPP));
+  renderBuffer.attach(&frameBuffer[0], static_cast<unsigned>(width), static_cast<unsigned>(height),
+                      static_cast<int>(width * kAltitudeChartBPP));
 
   // Background.
   baseRenderer.reset_clipping(true);
@@ -276,8 +269,7 @@ bool GenerateChartByPoints(uint32_t width, uint32_t height, vector<m2::PointD> c
 }
 
 bool GenerateChart(uint32_t width, uint32_t height, vector<double> const & distanceDataM,
-                   geometry::Altitudes const & altitudeDataM, MapStyle mapStyle,
-                   vector<uint8_t> & frameBuffer)
+                   geometry::Altitudes const & altitudeDataM, MapStyle mapStyle, vector<uint8_t> & frameBuffer)
 {
   if (distanceDataM.size() != altitudeDataM.size())
   {
diff --git a/libs/map/chart_generator.hpp b/libs/map/chart_generator.hpp
index 946546cca..20665e691 100644
--- a/libs/map/chart_generator.hpp
+++ b/libs/map/chart_generator.hpp
@@ -19,9 +19,8 @@ void ReflectChartData(std::vector<double> & chartData);
 /// \brief fills uniformAltitudeDataM with altitude data which evenly distributed by
 /// |resultPointCount| points. |distanceDataM| and |altitudeDataM| form a curve of route altitude.
 /// This method is used to generalize and evenly distribute points of the chart.
-bool NormalizeChartData(std::vector<double> const & distanceDataM,
-                        geometry::Altitudes const & altitudeDataM, size_t resultPointCount,
-                        std::vector<double> & uniformAltitudeDataM);
+bool NormalizeChartData(std::vector<double> const & distanceDataM, geometry::Altitudes const & altitudeDataM,
+                        size_t resultPointCount, std::vector<double> & uniformAltitudeDataM);
 
 /// \brief fills |yAxisDataPxl|. |yAxisDataPxl| is formed to pevent displaying
 /// big waves on the chart in case of small deviation in absolute values in |yAxisData|.
@@ -29,8 +28,7 @@ bool NormalizeChartData(std::vector<double> const & distanceDataM,
 /// \param minMetersInPixel minimum meter number per height pixel.
 /// \param altitudeDataM altitude data vector in meters.
 /// \param yAxisDataPxl Y-axis data of altitude chart in pixels.
-bool GenerateYAxisChartData(uint32_t height, double minMetersPerPxl,
-                            std::vector<double> const & altitudeDataM,
+bool GenerateYAxisChartData(uint32_t height, double minMetersPerPxl, std::vector<double> const & altitudeDataM,
                             std::vector<double> & yAxisDataPxl);
 
 /// \brief generates chart image on a canvas with size |width|, |height| with |geometry|.
@@ -41,11 +39,9 @@ bool GenerateYAxisChartData(uint32_t height, double minMetersPerPxl,
 /// \param mapStyle is a current map style.
 /// \param frameBuffer is a vector for a result image. It's resized in this method.
 /// It's filled with RGBA(8888) image date.
-bool GenerateChartByPoints(uint32_t width, uint32_t height,
-                           std::vector<m2::PointD> const & geometry, MapStyle mapStyle,
+bool GenerateChartByPoints(uint32_t width, uint32_t height, std::vector<m2::PointD> const & geometry, MapStyle mapStyle,
                            std::vector<uint8_t> & frameBuffer);
 
 bool GenerateChart(uint32_t width, uint32_t height, std::vector<double> const & distanceDataM,
-                   geometry::Altitudes const & altitudeDataM, MapStyle mapStyle,
-                   std::vector<uint8_t> & frameBuffer);
+                   geometry::Altitudes const & altitudeDataM, MapStyle mapStyle, std::vector<uint8_t> & frameBuffer);
 }  // namespace maps
diff --git a/libs/map/elevation_info.hpp b/libs/map/elevation_info.hpp
index e80fd2fef..33938f71a 100644
--- a/libs/map/elevation_info.hpp
+++ b/libs/map/elevation_info.hpp
@@ -2,8 +2,8 @@
 
 #include "kml/types.hpp"
 
-#include "geometry/point_with_altitude.hpp"
 #include "geometry/latlon.hpp"
+#include "geometry/point_with_altitude.hpp"
 
 #include "platform/location.hpp"
 
@@ -16,11 +16,9 @@ struct ElevationInfo
 public:
   struct Point
   {
-    Point(geometry::PointWithAltitude point, double distance)
-    : m_point(point), m_distance(distance)
-    {}
-    const geometry::PointWithAltitude m_point;
-    const double m_distance;
+    Point(geometry::PointWithAltitude point, double distance) : m_point(point), m_distance(distance) {}
+    geometry::PointWithAltitude const m_point;
+    double const m_distance;
   };
 
   using Points = std::vector<Point>;
@@ -41,10 +39,10 @@ public:
 
   void AddGpsPoints(GpsPoints const & points);
 
-  size_t GetSize() const { return m_points.size(); };
-  Points const & GetPoints() const { return m_points; };
+  size_t GetSize() const { return m_points.size(); }
+  Points const & GetPoints() const { return m_points; }
   uint8_t GetDifficulty() const { return m_difficulty; }
-  SegmentsDistances const & GetSegmentsDistances() const { return m_segmentsDistances; };
+  SegmentsDistances const & GetSegmentsDistances() const { return m_segmentsDistances; }
 
 private:
   // Points with distance from start of the track and altitude.
diff --git a/libs/map/everywhere_search_callback.cpp b/libs/map/everywhere_search_callback.cpp
index ffffb4ff1..d921d07bf 100644
--- a/libs/map/everywhere_search_callback.cpp
+++ b/libs/map/everywhere_search_callback.cpp
@@ -19,8 +19,6 @@ void EverywhereSearchCallback::operator()(Results const & results)
     m_productInfo.push_back(m_delegate.GetProductInfo(results[i]));
 
   m_delegate.RunUITask([onResults = m_onResults, results, productInfo = m_productInfo]() mutable
-  {
-    onResults(std::move(results), std::move(productInfo));
-  });
+  { onResults(std::move(results), std::move(productInfo)); });
 }
 }  // namespace search
diff --git a/libs/map/extrapolation/extrapolator.cpp b/libs/map/extrapolation/extrapolator.cpp
index 415cb289a..7beb319af 100644
--- a/libs/map/extrapolation/extrapolator.cpp
+++ b/libs/map/extrapolation/extrapolator.cpp
@@ -23,15 +23,13 @@ class LinearExtrapolator
 {
 public:
   LinearExtrapolator(uint64_t timeBetweenMs, uint64_t timeAfterMs)
-    : m_timeBetweenMs(timeBetweenMs), m_timeAfterMs(timeAfterMs)
+    : m_timeBetweenMs(timeBetweenMs)
+    , m_timeAfterMs(timeAfterMs)
   {
     CHECK_NOT_EQUAL(m_timeBetweenMs, 0, ());
   }
 
-  double Extrapolate(double x1, double x2) const
-  {
-    return x2 + ((x2 - x1) / m_timeBetweenMs) * m_timeAfterMs;
-  }
+  double Extrapolate(double x1, double x2) const { return x2 + ((x2 - x1) / m_timeBetweenMs) * m_timeAfterMs; }
 
 private:
   uint64_t m_timeBetweenMs;
@@ -43,8 +41,7 @@ namespace extrapolation
 {
 using namespace std;
 
-location::GpsInfo LinearExtrapolation(location::GpsInfo const & gpsInfo1,
-                                      location::GpsInfo const & gpsInfo2,
+location::GpsInfo LinearExtrapolation(location::GpsInfo const & gpsInfo1, location::GpsInfo const & gpsInfo2,
                                       uint64_t timeAfterPoint2Ms)
 {
   if (gpsInfo2.m_timestamp <= gpsInfo1.m_timestamp)
@@ -53,8 +50,7 @@ location::GpsInfo LinearExtrapolation(location::GpsInfo const & gpsInfo1,
     return gpsInfo2;
   }
 
-  auto const timeBetweenPointsMs =
-      static_cast<uint64_t>((gpsInfo2.m_timestamp - gpsInfo1.m_timestamp) * 1000);
+  auto const timeBetweenPointsMs = static_cast<uint64_t>((gpsInfo2.m_timestamp - gpsInfo1.m_timestamp) * 1000);
   if (timeBetweenPointsMs == 0)
     return gpsInfo2;
 
@@ -62,10 +58,8 @@ location::GpsInfo LinearExtrapolation(location::GpsInfo const & gpsInfo1,
   LinearExtrapolator const e(timeBetweenPointsMs, timeAfterPoint2Ms);
 
   result.m_timestamp += static_cast<double>(timeAfterPoint2Ms) / 1000.0;
-  result.m_longitude =
-      math::Clamp(e.Extrapolate(gpsInfo1.m_longitude, gpsInfo2.m_longitude), -180.0, 180.0);
-  result.m_latitude =
-      math::Clamp(e.Extrapolate(gpsInfo1.m_latitude, gpsInfo2.m_latitude), -90.0, 90.0);
+  result.m_longitude = math::Clamp(e.Extrapolate(gpsInfo1.m_longitude, gpsInfo2.m_longitude), -180.0, 180.0);
+  result.m_latitude = math::Clamp(e.Extrapolate(gpsInfo1.m_latitude, gpsInfo2.m_latitude), -90.0, 90.0);
   result.m_altitude = e.Extrapolate(gpsInfo1.m_altitude, gpsInfo2.m_altitude);
 
   // @TODO(bykoianko) Now |result.m_bearing| == |gpsInfo2.m_bearing|.
@@ -86,9 +80,7 @@ bool AreCoordsGoodForExtrapolation(location::GpsInfo const & info1, location::Gp
   if (!info1.IsValid() || !info2.IsValid())
     return false;
 
-  double const distM =
-      ms::DistanceOnEarth(info1.m_latitude, info1.m_longitude,
-                          info2.m_latitude, info2.m_longitude);
+  double const distM = ms::DistanceOnEarth(info1.m_latitude, info1.m_longitude, info2.m_latitude, info2.m_longitude);
 
   double const timeS = info2.m_timestamp - info1.m_timestamp;
   if (timeS <= 0.0)
@@ -96,24 +88,21 @@ bool AreCoordsGoodForExtrapolation(location::GpsInfo const & info1, location::Gp
 
   // |maxDistAfterExtrapolationM| is maximum possible distance from |info2| to
   // the furthest extrapolated point.
-  double const maxDistAfterExtrapolationM =
-      distM * (Extrapolator::kMaxExtrapolationTimeMs / 1000.0) / timeS;
+  double const maxDistAfterExtrapolationM = distM * (Extrapolator::kMaxExtrapolationTimeMs / 1000.0) / timeS;
   // |maxDistForAllExtrapolationsM| is maximum possible distance from |info2| to
   // all extrapolated points in any cases.
-  double const maxDistForAllExtrapolationsM =
-      kMaxExtrapolationSpeedMPS * kMaxExtrapolationTimeSeconds;
-  double const distLastGpsInfoToMeridian180 = ms::DistanceOnEarth(
-      info2.m_latitude, info2.m_longitude, info2.m_latitude, 180.0 /* lon2Deg */);
+  double const maxDistForAllExtrapolationsM = kMaxExtrapolationSpeedMPS * kMaxExtrapolationTimeSeconds;
+  double const distLastGpsInfoToMeridian180 =
+      ms::DistanceOnEarth(info2.m_latitude, info2.m_longitude, info2.m_latitude, 180.0 /* lon2Deg */);
   // Switching off extrapolation if |info2| are so close to meridian 180 that extrapolated
   // points may cross meridian 180 or if |info1| and |info2| are located on
   // different sides of meridian 180.
   if (distLastGpsInfoToMeridian180 < maxDistAfterExtrapolationM ||
-      (distLastGpsInfoToMeridian180 < maxDistForAllExtrapolationsM &&
-       info2.m_longitude * info1.m_longitude < 0.0) ||
-      ms::DistanceOnEarth(info2.m_latitude, info2.m_longitude, 90.0 /* lat2Deg */,
-                          info2.m_longitude) < maxDistAfterExtrapolationM ||
-      ms::DistanceOnEarth(info2.m_latitude, info2.m_longitude, -90.0 /* lat2Deg */,
-                          info2.m_longitude) < maxDistAfterExtrapolationM)
+      (distLastGpsInfoToMeridian180 < maxDistForAllExtrapolationsM && info2.m_longitude * info1.m_longitude < 0.0) ||
+      ms::DistanceOnEarth(info2.m_latitude, info2.m_longitude, 90.0 /* lat2Deg */, info2.m_longitude) <
+          maxDistAfterExtrapolationM ||
+      ms::DistanceOnEarth(info2.m_latitude, info2.m_longitude, -90.0 /* lat2Deg */, info2.m_longitude) <
+          maxDistAfterExtrapolationM)
   {
     return false;
   }
@@ -124,13 +113,14 @@ bool AreCoordsGoodForExtrapolation(location::GpsInfo const & info1, location::Gp
 
   // @TODO(bykoianko) Switching off extrapolation based on acceleration should be implemented.
   // Switching off extrapolation based on speed, distance and time.
-  return distM / timeS <= kMaxExtrapolationSpeedMPS &&
-         distM <= kMaxExtrapolationDistMeters && timeS <= kMaxExtrapolationTimeSeconds;
+  return distM / timeS <= kMaxExtrapolationSpeedMPS && distM <= kMaxExtrapolationDistMeters &&
+         timeS <= kMaxExtrapolationTimeSeconds;
 }
 
 // Extrapolator ------------------------------------------------------------------------------------
 Extrapolator::Extrapolator(ExtrapolatedLocationUpdateFn const & update)
-  : m_isEnabled(false), m_extrapolatedLocationUpdate(update)
+  : m_isEnabled(false)
+  , m_extrapolatedLocationUpdate(update)
 {
   RunTaskOnBackgroundThread(false /* delayed */);
 }
@@ -175,10 +165,7 @@ void Extrapolator::ExtrapolatedLocationUpdate(uint64_t locationUpdateCounter)
   }
 
   if (gpsInfo.IsValid())
-  {
-    GetPlatform().RunTask(Platform::Thread::Gui,
-                          [this, gpsInfo]() { m_extrapolatedLocationUpdate(gpsInfo); });
-  }
+    GetPlatform().RunTask(Platform::Thread::Gui, [this, gpsInfo]() { m_extrapolatedLocationUpdate(gpsInfo); });
 
   {
     lock_guard<mutex> guard(m_mutex);
@@ -201,17 +188,13 @@ void Extrapolator::RunTaskOnBackgroundThread(bool delayed)
   if (delayed)
   {
     auto constexpr period = std::chrono::milliseconds(kExtrapolationPeriodMs);
-    GetPlatform().RunDelayedTask(Platform::Thread::Background, period, [this, locationUpdateCounter]
-    {
-      ExtrapolatedLocationUpdate(locationUpdateCounter);
-    });
+    GetPlatform().RunDelayedTask(Platform::Thread::Background, period,
+                                 [this, locationUpdateCounter] { ExtrapolatedLocationUpdate(locationUpdateCounter); });
   }
   else
   {
-    GetPlatform().RunTask(Platform::Thread::Background, [this, locationUpdateCounter]
-    {
-      ExtrapolatedLocationUpdate(locationUpdateCounter);
-    });
+    GetPlatform().RunTask(Platform::Thread::Background,
+                          [this, locationUpdateCounter] { ExtrapolatedLocationUpdate(locationUpdateCounter); });
   }
 }
 
diff --git a/libs/map/extrapolation/extrapolator.hpp b/libs/map/extrapolation/extrapolator.hpp
index 4ae20fe2f..30dd3b59d 100644
--- a/libs/map/extrapolation/extrapolator.hpp
+++ b/libs/map/extrapolation/extrapolator.hpp
@@ -11,15 +11,13 @@ namespace extrapolation
 {
 /// \brief Returns extrapolated position after |point2| in |timeAfterPoint2Ms|.
 /// \note |timeAfterPoint2Ms| should be reasonably small (several seconds maximum).
-location::GpsInfo LinearExtrapolation(location::GpsInfo const & gpsInfo1,
-                                      location::GpsInfo const & gpsInfo2,
+location::GpsInfo LinearExtrapolation(location::GpsInfo const & gpsInfo1, location::GpsInfo const & gpsInfo2,
                                       uint64_t timeAfterPoint2Ms);
 
 /// \returns true if linear extrapolation based on |info1| and |info2| should be done.
 /// \param info1 location information about point gotten before last one.
 /// \param info2 the latest location information.
-bool AreCoordsGoodForExtrapolation(location::GpsInfo const & info1,
-                                   location::GpsInfo const & info2);
+bool AreCoordsGoodForExtrapolation(location::GpsInfo const & info1, location::GpsInfo const & info2);
 
 /// \brief This class implements linear extrapolation based on methods LinearExtrapolation()
 /// and AreCoordsGoodForExtrapolation(). The idea implemented in this class is
diff --git a/libs/map/extrapolation_benchmark/extrapolation_benchmark.cpp b/libs/map/extrapolation_benchmark/extrapolation_benchmark.cpp
index f581a25ef..1e5b1c36a 100644
--- a/libs/map/extrapolation_benchmark/extrapolation_benchmark.cpp
+++ b/libs/map/extrapolation_benchmark/extrapolation_benchmark.cpp
@@ -44,10 +44,7 @@ namespace
 {
 struct GpsPoint
 {
-  GpsPoint(double timestampS, double lat, double lon)
-    : m_timestampS(timestampS), m_lat(lat), m_lon(lon)
-  {
-  }
+  GpsPoint(double timestampS, double lat, double lon) : m_timestampS(timestampS), m_lat(lat), m_lon(lon) {}
 
   double m_timestampS;
   // @TODO(bykoianko) Using LatLog type instead of two double should be considered.
@@ -194,8 +191,7 @@ int main(int argc, char * argv[])
   Tracks tracks;
   if (!Parse(FLAGS_csv_path, tracks))
   {
-    LOG(LERROR, ("An error while parsing", FLAGS_csv_path,
-                 "file. Please check if it has a correct format."));
+    LOG(LERROR, ("An error while parsing", FLAGS_csv_path, "file. Please check if it has a correct format."));
     return -1;
   }
 
@@ -209,25 +205,21 @@ int main(int argc, char * argv[])
   {
     double trackLenM = 0;
     for (size_t j = 1; j < t.size(); ++j)
-    {
-      trackLenM += ms::DistanceOnEarth(ms::LatLon(t[j - 1].m_lat, t[j - 1].m_lon),
-                                       ms::LatLon(t[j].m_lat, t[j].m_lon));
-    }
+      trackLenM += ms::DistanceOnEarth(ms::LatLon(t[j - 1].m_lat, t[j - 1].m_lon), ms::LatLon(t[j].m_lat, t[j].m_lon));
     trackLengths += trackLenM;
   }
 
   LOG(LINFO, ("General tracks statistics."
               "\n  Number of tracks:",
-              tracks.size(), "\n  Number of track points:", trackPointNum,
-              "\n  Average points per track:", trackPointNum / tracks.size(),
-              "\n  Average track length:", trackLengths / tracks.size(), "meters"));
+              tracks.size(), "\n  Number of track points:", trackPointNum, "\n  Average points per track:",
+              trackPointNum / tracks.size(), "\n  Average track length:", trackLengths / tracks.size(), "meters"));
 
   // For all points of each track in |tracks| some extrapolations will be calculated.
   // The number of extrapolations depends on |Extrapolator::kExtrapolationPeriodMs|
   // and |Extrapolator::kMaxExtrapolationTimeMs| and equal for all points.
   // Then cumulative moving average and variance of each extrapolation will be printed.
-  auto const extrapolationNumber = static_cast<size_t>(Extrapolator::kMaxExtrapolationTimeMs /
-                                                       Extrapolator::kExtrapolationPeriodMs);
+  auto const extrapolationNumber =
+      static_cast<size_t>(Extrapolator::kMaxExtrapolationTimeMs / Extrapolator::kExtrapolationPeriodMs);
   MovingAverageVec mes(extrapolationNumber);
   MovingAverageVec squareMes(extrapolationNumber);
   // Number of extrapolations for which projections are calculated successfully.
@@ -258,28 +250,25 @@ int main(int argc, char * argv[])
       vector<double> onePointDeviations;
       vector<double> onePointDeviationsSquared;
       bool projFound = true;
-      for (size_t timeMs = Extrapolator::kExtrapolationPeriodMs;
-           timeMs <= Extrapolator::kMaxExtrapolationTimeMs;
+      for (size_t timeMs = Extrapolator::kExtrapolationPeriodMs; timeMs <= Extrapolator::kMaxExtrapolationTimeMs;
            timeMs += Extrapolator::kExtrapolationPeriodMs)
       {
         GpsInfo const extrapolated = LinearExtrapolation(info1, info2, timeMs);
-        m2::PointD const extrapolatedMerc =
-            mercator::FromLatLon(extrapolated.m_latitude, extrapolated.m_longitude);
+        m2::PointD const extrapolatedMerc = mercator::FromLatLon(extrapolated.m_latitude, extrapolated.m_longitude);
 
         double const kHalfSquareSide = 100.0;
         // |kHalfSquareSide| is chosen based on maximum value of GpsInfo::m_horizontalAccuracy
         // which is used calculation of projection in production code.
-        m2::RectD const posSquare = mercator::MetersToXY(
-            extrapolated.m_longitude, extrapolated.m_latitude, kHalfSquareSide);
+        m2::RectD const posSquare =
+            mercator::MetersToXY(extrapolated.m_longitude, extrapolated.m_latitude, kHalfSquareSide);
         // One is deducted from polyline size because in GetClosestProjectionInInterval()
         // is used segment indices but not point indices.
         auto const & iter = followedPoly.GetClosestProjectionInInterval(
-            posSquare,
-            [&extrapolatedMerc](FollowedPolyline::Iter const & it) {
-              ASSERT(it.IsValid(), ());
-              return mercator::DistanceOnEarth(it.m_pt, extrapolatedMerc);
-            },
-            0 /* start segment index */, followedPoly.GetPolyline().GetSize() - 1);
+            posSquare, [&extrapolatedMerc](FollowedPolyline::Iter const & it)
+        {
+          ASSERT(it.IsValid(), ());
+          return mercator::DistanceOnEarth(it.m_pt, extrapolatedMerc);
+        }, 0 /* start segment index */, followedPoly.GetPolyline().GetSize() - 1);
 
         if (iter.IsValid())
         {
@@ -309,19 +298,17 @@ int main(int argc, char * argv[])
   }
 
   CHECK_GREATER(extrapolationNumber, 0, ());
-  LOG(LINFO, ("\n  Processed", mes.Get()[0].GetCounter(), "points.\n", "  ",
-              mes.Get()[0].GetCounter() * extrapolationNumber, "extrapolations is calculated.\n",
-              "  Projection is calculated for", projectionCounter, "extrapolations."));
-
   LOG(LINFO,
-      ("Cumulative moving average, variance and standard deviation for each extrapolation:"));
+      ("\n  Processed", mes.Get()[0].GetCounter(), "points.\n", "  ", mes.Get()[0].GetCounter() * extrapolationNumber,
+       "extrapolations is calculated.\n", "  Projection is calculated for", projectionCounter, "extrapolations."));
+
+  LOG(LINFO, ("Cumulative moving average, variance and standard deviation for each extrapolation:"));
   for (size_t i = 0; i < extrapolationNumber; ++i)
   {
     double const variance = squareMes.Get()[i].Get() - math::Pow2(mes.Get()[i].Get());
-    LOG(LINFO,
-        ("Extrapolation", i + 1, ",", Extrapolator::kExtrapolationPeriodMs * (i + 1),
-         "seconds after point two. Cumulative moving average =", mes.Get()[i].Get(), "meters.",
-         "Variance =", max(0.0, variance), ". Standard deviation =", sqrt(max(0.0, variance))));
+    LOG(LINFO, ("Extrapolation", i + 1, ",", Extrapolator::kExtrapolationPeriodMs * (i + 1),
+                "seconds after point two. Cumulative moving average =", mes.Get()[i].Get(), "meters.",
+                "Variance =", max(0.0, variance), ". Standard deviation =", sqrt(max(0.0, variance))));
   }
 
   return 0;
diff --git a/libs/map/features_fetcher.cpp b/libs/map/features_fetcher.cpp
index b5fd927ec..f3978d768 100644
--- a/libs/map/features_fetcher.cpp
+++ b/libs/map/features_fetcher.cpp
@@ -10,9 +10,15 @@
 using platform::CountryFile;
 using platform::LocalCountryFile;
 
-FeaturesFetcher::FeaturesFetcher() { m_dataSource.AddObserver(*this); }
+FeaturesFetcher::FeaturesFetcher()
+{
+  m_dataSource.AddObserver(*this);
+}
 
-FeaturesFetcher::~FeaturesFetcher() { m_dataSource.RemoveObserver(*this); }
+FeaturesFetcher::~FeaturesFetcher()
+{
+  m_dataSource.RemoveObserver(*this);
+}
 
 // While reading any files (classificator or mwm), there are 2 types of possible exceptions:
 // Reader::Exception, FileAbsentException.
@@ -30,8 +36,7 @@ void FeaturesFetcher::InitClassificator()
   }
 }
 
-std::pair<MwmSet::MwmId, MwmSet::RegResult> FeaturesFetcher::RegisterMap(
-    LocalCountryFile const & localFile)
+std::pair<MwmSet::MwmId, MwmSet::RegResult> FeaturesFetcher::RegisterMap(LocalCountryFile const & localFile)
 {
   try
   {
@@ -62,9 +67,15 @@ bool FeaturesFetcher::DeregisterMap(CountryFile const & countryFile)
   return m_dataSource.Deregister(countryFile);
 }
 
-void FeaturesFetcher::Clear() { m_dataSource.Clear(); }
+void FeaturesFetcher::Clear()
+{
+  m_dataSource.Clear();
+}
 
-void FeaturesFetcher::ClearCaches() { m_dataSource.ClearCache(); }
+void FeaturesFetcher::ClearCaches()
+{
+  m_dataSource.ClearCache();
+}
 
 m2::RectD FeaturesFetcher::GetWorldRect() const
 {
diff --git a/libs/map/features_fetcher.hpp b/libs/map/features_fetcher.hpp
index 03bbb0499..b0aabed1a 100644
--- a/libs/map/features_fetcher.hpp
+++ b/libs/map/features_fetcher.hpp
@@ -26,10 +26,7 @@ public:
 
   void InitClassificator();
 
-  void SetOnMapDeregisteredCallback(MapDeregisteredCallback const & callback)
-  {
-    m_onMapDeregistered = callback;
-  }
+  void SetOnMapDeregisteredCallback(MapDeregisteredCallback const & callback) { m_onMapDeregistered = callback; }
 
   // Registers a new map.
   std::pair<MwmSet::MwmId, MwmSet::RegResult> RegisterMap(platform::LocalCountryFile const & localFile);
diff --git a/libs/map/framework.cpp b/libs/map/framework.cpp
index f81cfebb3..f717e2831 100644
--- a/libs/map/framework.cpp
+++ b/libs/map/framework.cpp
@@ -1,9 +1,9 @@
 #include "map/framework.hpp"
 #include "map/benchmark_tools.hpp"
 #include "map/gps_tracker.hpp"
-#include "map/user_mark.hpp"
-#include "map/track_mark.hpp"
 #include "map/place_page_info.hpp"
+#include "map/track_mark.hpp"
+#include "map/user_mark.hpp"
 
 #include "ge0/url_generator.hpp"
 
@@ -16,8 +16,8 @@
 #include "search/engine.hpp"
 #include "search/locality_finder.hpp"
 
-#include "storage/storage.hpp"
 #include "storage/country_info_getter.hpp"
+#include "storage/storage.hpp"
 #include "storage/storage_helpers.hpp"
 
 #include "drape_frontend/color_constants.hpp"
@@ -69,7 +69,6 @@
 
 #include <algorithm>
 
-
 using namespace location;
 using namespace routing;
 using namespace storage;
@@ -109,13 +108,12 @@ std::string_view constexpr kPlacePageSelectedProduct = "PlacePageSelectedProduct
 
 std::string_view constexpr kProductsPopupCloseReasonCloseStr = "close";
 std::string_view constexpr kProductsPopupCloseReasonRemindLaterStr = "remind_later";
-std::string_view constexpr kProductsPopupCloseReasonAlreadyDonatedStr =  "already_donated";
+std::string_view constexpr kProductsPopupCloseReasonAlreadyDonatedStr = "already_donated";
 std::string_view constexpr kProductsPopupCloseReasonSelectProductStr = "select_product";
 
 auto constexpr kLargeFontsScaleFactor = 1.6;
 size_t constexpr kMaxTrafficCacheSizeBytes = 64 /* Mb */ * 1024 * 1024;
 
-
 // TODO!
 // To adjust GpsTrackFilter was added secret command "?gpstrackaccuracy:xxx;"
 // where xxx is a new value for horizontal accuracy.
@@ -252,8 +250,8 @@ void Framework::OnViewportChanged(ScreenBase const & screen)
   // change the viewport from the drape engine's point of view but leave it almost
   // the same from the point of view of the framework and all its subsystems such as search api.
   // Additional filtering may be done by each subsystem.
-  auto const isSameViewport = m2::IsEqual(screen.ClipRect(), m_currentModelView.ClipRect(),
-                                          kMwmPointAccuracy, kMwmPointAccuracy);
+  auto const isSameViewport =
+      m2::IsEqual(screen.ClipRect(), m_currentModelView.ClipRect(), kMwmPointAccuracy, kMwmPointAccuracy);
   if (isSameViewport)
     return;
 
@@ -274,22 +272,17 @@ Framework::Framework(FrameworkParams const & params, bool loadMaps)
   : m_enabledDiffs(params.m_enableDiffs)
   , m_isRenderingEnabled(true)
   , m_transitManager(m_featuresFetcher.GetDataSource(),
-                     [this](FeatureCallback const & fn, vector<FeatureID> const & features) {
-                       return m_featuresFetcher.ReadFeatures(fn, features);
-                     },
-                     bind(&Framework::GetMwmsByRect, this, _1, false /* rough */))
-  , m_isolinesManager(m_featuresFetcher.GetDataSource(),
-                      bind(&Framework::GetMwmsByRect, this, _1, false /* rough */))
-  , m_routingManager(
-        RoutingManager::Callbacks(
-            [this]() -> DataSource & { return m_featuresFetcher.GetDataSource(); },
-            [this]() -> storage::CountryInfoGetter const & { return GetCountryInfoGetter(); },
-            [this](string const & id) -> string { return m_storage.GetParentIdFor(id); },
-            [this]() -> StringsBundle const & { return m_stringsBundle; },
-            [this]() -> power_management::PowerManager const & { return m_powerManager; }),
-        static_cast<RoutingManager::Delegate &>(*this))
-  , m_trafficManager(bind(&Framework::GetMwmsByRect, this, _1, false /* rough */),
-                     kMaxTrafficCacheSizeBytes, m_routingManager.RoutingSession())
+                     [this](FeatureCallback const & fn, vector<FeatureID> const & features)
+{ return m_featuresFetcher.ReadFeatures(fn, features); }, bind(&Framework::GetMwmsByRect, this, _1, false /* rough */))
+  , m_isolinesManager(m_featuresFetcher.GetDataSource(), bind(&Framework::GetMwmsByRect, this, _1, false /* rough */))
+  , m_routingManager(RoutingManager::Callbacks([this]() -> DataSource & { return m_featuresFetcher.GetDataSource(); },
+                                               [this]() -> storage::CountryInfoGetter const &
+{ return GetCountryInfoGetter(); }, [this](string const & id) -> string { return m_storage.GetParentIdFor(id); },
+                                               [this]() -> StringsBundle const &
+{ return m_stringsBundle; }, [this]() -> power_management::PowerManager const & { return m_powerManager; }),
+                     static_cast<RoutingManager::Delegate &>(*this))
+  , m_trafficManager(bind(&Framework::GetMwmsByRect, this, _1, false /* rough */), kMaxTrafficCacheSizeBytes,
+                     m_routingManager.RoutingSession())
   , m_lastReportedCountry(kInvalidCountryId)
   , m_popularityLoader(m_featuresFetcher.GetDataSource(), POPULARITY_RANKS_FILE_TAG)
   , m_descriptionsLoader(std::make_unique<descriptions::Loader>(m_featuresFetcher.GetDataSource()))
@@ -333,8 +326,7 @@ Framework::Framework(FrameworkParams const & params, bool loadMaps)
   LOG(LDEBUG, ("Search API initialized, part 1"));
 
   m_bmManager = make_unique<BookmarkManager>(BookmarkManager::Callbacks(
-      [this]() -> StringsBundle const & { return m_stringsBundle; },
-      [this]() -> SearchAPI & { return GetSearchAPI(); },
+      [this]() -> StringsBundle const & { return m_stringsBundle; }, [this]() -> SearchAPI & { return GetSearchAPI(); },
       [this](vector<BookmarkInfo> const & marks) { GetSearchAPI().OnBookmarksCreated(marks); },
       [this](vector<BookmarkInfo> const & marks) { GetSearchAPI().OnBookmarksUpdated(marks); },
       [this](vector<kml::MarkId> const & marks) { GetSearchAPI().OnBookmarksDeleted(marks); },
@@ -362,7 +354,7 @@ Framework::Framework(FrameworkParams const & params, bool loadMaps)
   LOG(LINFO, ("System languages:", languages::GetPreferred()));
 
   editor.SetDelegate(make_unique<search::EditorDelegate>(m_featuresFetcher.GetDataSource()));
-  editor.SetInvalidateFn([this](){ InvalidateRect(GetCurrentViewport()); });
+  editor.SetInvalidateFn([this]() { InvalidateRect(GetCurrentViewport()); });
 
   /// @todo Uncomment when we will integrate a traffic provider.
   // m_trafficManager.SetCurrentDataVersion(m_storage.GetCurrentDataVersion());
@@ -406,8 +398,7 @@ void Framework::ShowNode(storage::CountryId const & countryId)
   ShowRect(CalcLimitRect(countryId, GetStorage(), GetCountryInfoGetter()));
 }
 
-void Framework::OnCountryFileDownloaded(storage::CountryId const &,
-                                        storage::LocalFilePtr const localFile)
+void Framework::OnCountryFileDownloaded(storage::CountryId const &, storage::LocalFilePtr const localFile)
 {
   // Soft reset to signal that mwm file may be out of date in routing caches.
   m_routingManager.ResetRoutingSession();
@@ -430,8 +421,7 @@ void Framework::OnCountryFileDownloaded(storage::CountryId const &,
   GetSearchAPI().ClearCaches();
 }
 
-bool Framework::OnCountryFileDelete(storage::CountryId const & countryId,
-                                    storage::LocalFilePtr const localFile)
+bool Framework::OnCountryFileDelete(storage::CountryId const & countryId, storage::LocalFilePtr const localFile)
 {
   // Soft reset to signal that mwm file may be out of date in routing caches.
   m_routingManager.ResetRoutingSession();
@@ -479,12 +469,12 @@ void Framework::OnMapDeregistered(platform::LocalCountryFile const & localFile)
 bool Framework::HasUnsavedEdits(storage::CountryId const & countryId)
 {
   bool hasUnsavedChanges = false;
-  auto const forEachInSubtree = [&hasUnsavedChanges, this](storage::CountryId const & fileName,
-                                                           bool groupNode) {
+  auto const forEachInSubtree = [&hasUnsavedChanges, this](storage::CountryId const & fileName, bool groupNode)
+  {
     if (groupNode)
       return;
     hasUnsavedChanges |= osm::Editor::Instance().HaveMapEditsToUpload(
-          m_featuresFetcher.GetDataSource().GetMwmIdByCountryFile(platform::CountryFile(fileName)));
+        m_featuresFetcher.GetDataSource().GetMwmIdByCountryFile(platform::CountryFile(fileName)));
   };
   GetStorage().ForEachInSubtree(countryId, forEachInSubtree);
   return hasUnsavedChanges;
@@ -585,21 +575,11 @@ void Framework::FillUserMarkInfo(UserMark const * mark, place_page::Info & outIn
 
   switch (mark->GetMarkType())
   {
-  case UserMark::Type::API:
-    FillApiMarkInfo(*static_cast<ApiMarkPoint const *>(mark), outInfo);
-    break;
-  case UserMark::Type::BOOKMARK:
-    FillBookmarkInfo(*static_cast<Bookmark const *>(mark), outInfo);
-    break;
-  case UserMark::Type::SEARCH:
-    FillSearchResultInfo(*static_cast<SearchMarkPoint const *>(mark), outInfo);
-    break;
-  case UserMark::Type::ROUTING:
-    FillRouteMarkInfo(*static_cast<RouteMarkPoint const *>(mark), outInfo);
-    break;
-  case UserMark::Type::ROAD_WARNING:
-    FillRoadTypeMarkInfo(*static_cast<RoadWarningMark const *>(mark), outInfo);
-    break;
+  case UserMark::Type::API: FillApiMarkInfo(*static_cast<ApiMarkPoint const *>(mark), outInfo); break;
+  case UserMark::Type::BOOKMARK: FillBookmarkInfo(*static_cast<Bookmark const *>(mark), outInfo); break;
+  case UserMark::Type::SEARCH: FillSearchResultInfo(*static_cast<SearchMarkPoint const *>(mark), outInfo); break;
+  case UserMark::Type::ROUTING: FillRouteMarkInfo(*static_cast<RouteMarkPoint const *>(mark), outInfo); break;
+  case UserMark::Type::ROAD_WARNING: FillRoadTypeMarkInfo(*static_cast<RoadWarningMark const *>(mark), outInfo); break;
   case UserMark::Type::TRACK_INFO:
   {
     auto const & infoMark = *static_cast<TrackInfoMark const *>(mark);
@@ -622,8 +602,7 @@ void Framework::FillUserMarkInfo(UserMark const * mark, place_page::Info & outIn
     FillSpeedCameraMarkInfo(*static_cast<SpeedCameraMark const *>(mark), outInfo);
     break;
   }
-  default:
-    CHECK(false, ("Unexpected user mark type", mark->GetMarkType()));
+  default: CHECK(false, ("Unexpected user mark type", mark->GetMarkType()));
   }
 
   SetPlacePageLocation(outInfo);
@@ -637,8 +616,8 @@ void Framework::FillBookmarkInfo(Bookmark const & bmk, place_page::Info & info)
   info.SetBookmarkCategoryId(bmk.GetGroupId());
   auto const description = GetPreferredBookmarkStr(info.GetBookmarkData().m_description);
   auto const openingMode = m_routingManager.IsRoutingActive() || description.empty()
-                     ? place_page::OpeningMode::Preview
-                     : place_page::OpeningMode::PreviewPlus;
+                             ? place_page::OpeningMode::Preview
+                             : place_page::OpeningMode::PreviewPlus;
   info.SetOpeningMode(openingMode);
   if (bmk.CanFillPlacePageMetadata())
   {
@@ -653,8 +632,7 @@ void Framework::FillBookmarkInfo(Bookmark const & bmk, place_page::Info & info)
   }
 }
 
-void Framework::FillTrackInfo(Track const & track, m2::PointD const & trackPoint,
-                              place_page::Info & info) const
+void Framework::FillTrackInfo(Track const & track, m2::PointD const & trackPoint, place_page::Info & info) const
 {
   info.SetTrackId(track.GetId());
   info.SetBookmarkCategoryId(track.GetGroupId());
@@ -692,14 +670,12 @@ void Framework::FillFeatureInfo(FeatureID const & fid, place_page::Info & info)
 }
 
 void Framework::FillPointInfo(place_page::Info & info, m2::PointD const & mercator,
-                              string const & customTitle /* = {} */,
-                              FeatureMatcher && matcher /* = nullptr */) const
+                              string const & customTitle /* = {} */, FeatureMatcher && matcher /* = nullptr */) const
 {
   auto const fid = GetFeatureAtPoint(mercator, std::move(matcher));
   if (fid.IsValid())
   {
-    m_featuresFetcher.GetDataSource().ReadFeature(
-        [&](FeatureType & ft) { FillInfoFromFeatureType(ft, info); }, fid);
+    m_featuresFetcher.GetDataSource().ReadFeature([&](FeatureType & ft) { FillInfoFromFeatureType(ft, info); }, fid);
     // This line overwrites mercator center from area feature which can be far away.
     info.SetMercator(mercator);
   }
@@ -720,8 +696,7 @@ void Framework::FillNotMatchedPlaceInfo(place_page::Info & info, m2::PointD cons
   info.SetMercator(mercator);
 }
 
-void Framework::FillPostcodeInfo(string const & postcode, m2::PointD const & mercator,
-                                 place_page::Info & info) const
+void Framework::FillPostcodeInfo(string const & postcode, m2::PointD const & mercator, place_page::Info & info) const
 {
   info.SetCustomNames(postcode, m_stringsBundle.GetString("postal_code"));
   info.SetMercator(mercator);
@@ -730,8 +705,7 @@ void Framework::FillPostcodeInfo(string const & postcode, m2::PointD const & mer
 void Framework::FillInfoFromFeatureType(FeatureType & ft, place_page::Info & info) const
 {
   auto const featureStatus = osm::Editor::Instance().GetFeatureStatus(ft.GetID());
-  ASSERT_NOT_EQUAL(featureStatus, FeatureStatus::Deleted,
-                   ("Deleted features cannot be selected from UI."));
+  ASSERT_NOT_EQUAL(featureStatus, FeatureStatus::Deleted, ("Deleted features cannot be selected from UI."));
   info.SetFeatureStatus(featureStatus);
 
   if (ftypes::IsAddressObjectChecker::Instance()(ft))
@@ -904,7 +878,8 @@ void Framework::ShowTrack(kml::TrackId trackId)
   es.SetIsVisible(track->GetGroupId(), true /* visible */);
 
   if (m_drapeEngine)
-    m_drapeEngine->SetModelViewRect(rect, true, scales::GetScaleLevel(rect), true /* isAnim */, true /* trackVisibleViewport */);
+    m_drapeEngine->SetModelViewRect(rect, true, scales::GetScaleLevel(rect), true /* isAnim */,
+                                    true /* trackVisibleViewport */);
 
   ActivateMapSelection();
 }
@@ -1035,8 +1010,7 @@ void Framework::ShowRect(m2::RectD const & rect, int maxScale, bool animation, b
   if (m_drapeEngine == nullptr)
     return;
 
-  m_drapeEngine->SetModelViewRect(rect, true /* applyRotation */, maxScale /* zoom */, animation,
-                                  useVisibleViewport);
+  m_drapeEngine->SetModelViewRect(rect, true /* applyRotation */, maxScale /* zoom */, animation, useVisibleViewport);
 }
 
 void Framework::ShowRect(m2::AnyRectD const & rect, bool animation, bool useVisibleViewport)
@@ -1085,11 +1059,11 @@ namespace
 
 double ScaleModeToFactor(Framework::EScaleMode mode)
 {
-  double factors[] = { 2.0, 1.5, 0.5, 0.67 };
+  double factors[] = {2.0, 1.5, 0.5, 0.67};
   return factors[mode];
 }
 
-} // namespace
+}  // namespace
 
 void Framework::Scale(EScaleMode mode, bool isAnim)
 {
@@ -1251,9 +1225,8 @@ void Framework::InitSearchAPI(size_t numThreads)
   ASSERT(m_infoGetter.get(), ());
   try
   {
-    m_searchAPI =
-        make_unique<SearchAPI>(m_featuresFetcher.GetDataSource(), m_storage, *m_infoGetter,
-                               numThreads, static_cast<SearchAPI::Delegate &>(*this));
+    m_searchAPI = make_unique<SearchAPI>(m_featuresFetcher.GetDataSource(), m_storage, *m_infoGetter, numThreads,
+                                         static_cast<SearchAPI::Delegate &>(*this));
   }
   catch (RootException const & e)
   {
@@ -1443,8 +1416,7 @@ void Framework::FillSearchResultsMarks(SearchResultsIterT beg, SearchResultsIter
   }
 }
 
-bool Framework::GetDistanceAndAzimut(m2::PointD const & point,
-                                     double lat, double lon, double north,
+bool Framework::GetDistanceAndAzimut(m2::PointD const & point, double lat, double lon, double north,
                                      platform::Distance & distance, double & azimut)
 {
 #ifdef FIXED_LOCATION
@@ -1463,7 +1435,7 @@ bool Framework::GetDistanceAndAzimut(m2::PointD const & point,
 
   azimut = ang::Azimuth(mercator::FromLatLon(lat, lon), point, north);
 
-  double const pi2 = 2.0*math::pi;
+  double const pi2 = 2.0 * math::pi;
   if (azimut < 0.0)
     azimut += pi2;
   else if (azimut > pi2)
@@ -1475,15 +1447,11 @@ bool Framework::GetDistanceAndAzimut(m2::PointD const & point,
 
 void Framework::CreateDrapeEngine(ref_ptr<dp::GraphicsContextFactory> contextFactory, DrapeCreationParams && params)
 {
-  auto idReadFn = [this](df::MapDataProvider::TReadCallback<FeatureID const> const & fn,
-                         m2::RectD const & r,
+  auto idReadFn = [this](df::MapDataProvider::TReadCallback<FeatureID const> const & fn, m2::RectD const & r,
                          int scale) -> void { m_featuresFetcher.ForEachFeatureID(r, fn, scale); };
 
   auto featureReadFn = [this](df::MapDataProvider::TReadCallback<FeatureType> const & fn,
-                              vector<FeatureID> const & ids) -> void
-  {
-    m_featuresFetcher.ReadFeatures(fn, ids);
-  };
+                              vector<FeatureID> const & ids) -> void { m_featuresFetcher.ReadFeatures(fn, ids); };
 
   auto myPositionModeChangedFn = [this](location::EMyPositionMode mode, bool routingActive)
   {
@@ -1498,9 +1466,7 @@ void Framework::CreateDrapeEngine(ref_ptr<dp::GraphicsContextFactory> contextFac
     });
   };
 
-  auto overlaysShowStatsFn = [](list<df::OverlayShowEvent> &&)
-  {
-  };
+  auto overlaysShowStatsFn = [](list<df::OverlayShowEvent> &&) {};
 
   auto onGraphicsContextInitialized = [this]()
   {
@@ -1527,36 +1493,25 @@ void Framework::CreateDrapeEngine(ref_ptr<dp::GraphicsContextFactory> contextFac
   auto const fontsScaleFactor = LoadLargeFontsSize() ? kLargeFontsScaleFactor : 1.0;
 
   df::DrapeEngine::Params p(
-      params.m_apiVersion, contextFactory,
-      dp::Viewport(0, 0, params.m_surfaceWidth, params.m_surfaceHeight),
-      df::MapDataProvider(std::move(idReadFn), std::move(featureReadFn),
-                          std::move(isCountryLoadedByNameFn), std::move(updateCurrentCountryFn)),
+      params.m_apiVersion, contextFactory, dp::Viewport(0, 0, params.m_surfaceWidth, params.m_surfaceHeight),
+      df::MapDataProvider(std::move(idReadFn), std::move(featureReadFn), std::move(isCountryLoadedByNameFn),
+                          std::move(updateCurrentCountryFn)),
       params.m_hints, params.m_visualScale, fontsScaleFactor, std::move(params.m_widgetsInitInfo),
       std::move(myPositionModeChangedFn), allow3dBuildings, trafficEnabled, isolinesEnabled,
       params.m_isChoosePositionMode, params.m_isChoosePositionMode, GetSelectedFeatureTriangles(),
-      m_routingManager.IsRoutingActive() && m_routingManager.IsRoutingFollowing(),
-      isAutozoomEnabled, simplifiedTrafficColors, std::nullopt /* arrow3dCustomDecl */,
-      std::move(overlaysShowStatsFn), std::move(onGraphicsContextInitialized),
-      std::move(params.m_renderInjectionHandler));
+      m_routingManager.IsRoutingActive() && m_routingManager.IsRoutingFollowing(), isAutozoomEnabled,
+      simplifiedTrafficColors, std::nullopt /* arrow3dCustomDecl */, std::move(overlaysShowStatsFn),
+      std::move(onGraphicsContextInitialized), std::move(params.m_renderInjectionHandler));
 
   m_drapeEngine = make_unique_dp<df::DrapeEngine>(std::move(p));
   m_drapeEngine->SetModelViewListener([this](ScreenBase const & screen)
-  {
-    GetPlatform().RunTask(Platform::Thread::Gui, [this, screen](){ OnViewportChanged(screen); });
-  });
+  { GetPlatform().RunTask(Platform::Thread::Gui, [this, screen]() { OnViewportChanged(screen); }); });
   m_drapeEngine->SetTapEventInfoListener([this](df::TapInfo const & tapInfo)
-  {
-    GetPlatform().RunTask(Platform::Thread::Gui, [this, tapInfo]()
-    {
-      OnTapEvent(place_page::BuildInfo(tapInfo));
-    });
-  });
+  { GetPlatform().RunTask(Platform::Thread::Gui, [this, tapInfo]() { OnTapEvent(place_page::BuildInfo(tapInfo)); }); });
   m_drapeEngine->SetUserPositionListener([this](m2::PointD const & position, bool hasPosition)
   {
-    GetPlatform().RunTask(Platform::Thread::Gui, [this, position, hasPosition]()
-    {
-      OnUserPositionChanged(position, hasPosition);
-    });
+    GetPlatform().RunTask(Platform::Thread::Gui,
+                          [this, position, hasPosition]() { OnUserPositionChanged(position, hasPosition); });
   });
 
   OnSize(params.m_surfaceWidth, params.m_surfaceHeight);
@@ -1712,7 +1667,7 @@ void Framework::SetTrackRecordingUpdateHandler(TrackRecordingUpdateHandler && tr
     m_trackRecordingUpdateHandler(GpsTracker::Instance().GetTrackStatistics());
 }
 
-const ElevationInfo & Framework::GetTrackRecordingElevationInfo()
+ElevationInfo const & Framework::GetTrackRecordingElevationInfo()
 {
   return GpsTracker::Instance().GetElevationInfo();
 }
@@ -1864,8 +1819,7 @@ url_scheme::InAppFeatureHighlightRequest Framework::GetInAppFeatureHighlightRequ
   return m_parsedMapApi.GetInAppFeatureHighlightRequest();
 }
 
-FeatureID Framework::GetFeatureAtPoint(m2::PointD const & mercator,
-                                       FeatureMatcher && matcher /* = nullptr */) const
+FeatureID Framework::GetFeatureAtPoint(m2::PointD const & mercator, FeatureMatcher && matcher /* = nullptr */) const
 {
   FeatureID fullMatch, poi, line, area;
   auto haveBuilding = false;
@@ -1885,9 +1839,7 @@ FeatureID Framework::GetFeatureAtPoint(m2::PointD const & mercator,
 
     switch (ft.GetGeomType())
     {
-    case feature::GeomType::Point:
-      poi = ft.GetID();
-      break;
+    case feature::GeomType::Point: poi = ft.GetID(); break;
     case feature::GeomType::Line:
       // Skip/ignore isolines.
       if (ftypes::IsIsolineChecker::Instance()(ft))
@@ -1916,9 +1868,7 @@ FeatureID Framework::GetFeatureAtPoint(m2::PointD const & mercator,
       closestDistanceToCenter = currentDistance;
       break;
     }
-    case feature::GeomType::Undefined:
-      ASSERT(false, ("case feature::Undefined"));
-      break;
+    case feature::GeomType::Undefined: ASSERT(false, ("case feature::Undefined")); break;
     }
   }, mercator);
 
@@ -1948,8 +1898,7 @@ BookmarkManager const & Framework::GetBookmarkManager() const
   return *m_bmManager.get();
 }
 
-void Framework::SetPlacePageListeners(PlacePageEvent::OnOpen onOpen,
-                                      PlacePageEvent::OnClose onClose,
+void Framework::SetPlacePageListeners(PlacePageEvent::OnOpen onOpen, PlacePageEvent::OnClose onClose,
                                       PlacePageEvent::OnUpdate onUpdate,
                                       PlacePageEvent::OnSwitchFullScreen onSwitchFullScreen)
 {
@@ -2004,12 +1953,12 @@ void Framework::ActivateMapSelection()
   if (m_drapeEngine)
   {
     auto const & bi = m_currentPlacePageInfo->GetBuildInfo();
-    m_drapeEngine->SelectObject(selObj, m_currentPlacePageInfo->GetMercator(), featureId,
-                                bi.m_needAnimationOnSelection, bi.m_isGeometrySelectionAllowed, true);
+    m_drapeEngine->SelectObject(selObj, m_currentPlacePageInfo->GetMercator(), featureId, bi.m_needAnimationOnSelection,
+                                bi.m_isGeometrySelectionAllowed, true);
   }
 
   /// @todo Current android logic is strange (see SetPlacePageListeners comments), so skip assert.
-  //ASSERT(m_onPlacePageOpen, ());
+  // ASSERT(m_onPlacePageOpen, ());
   if (m_onPlacePageOpen)
     m_onPlacePageOpen();
 }
@@ -2068,9 +2017,7 @@ void Framework::DeactivateHotelSearchMark()
     }
 
     if (!GetSearchAPI().IsViewportSearchActive())
-    {
       GetBookmarkManager().GetEditSession().ClearGroup(UserMark::Type::SEARCH);
-    }
   }
 }
 
@@ -2079,10 +2026,8 @@ void Framework::OnTapEvent(place_page::BuildInfo const & buildInfo)
   auto placePageInfo = BuildPlacePageInfo(buildInfo);
   bool isRoutePoint = placePageInfo.IsRoutePoint();
 
-  if (m_routingManager.IsRoutingActive()
-      && m_routingManager.GetCurrentRouterType() == routing::RouterType::Ruler
-      && !buildInfo.m_isLongTap
-      && !isRoutePoint)
+  if (m_routingManager.IsRoutingActive() && m_routingManager.GetCurrentRouterType() == routing::RouterType::Ruler &&
+      !buildInfo.m_isLongTap && !isRoutePoint)
   {
     DeactivateMapSelection();
 
@@ -2115,8 +2060,7 @@ void Framework::OnTapEvent(place_page::BuildInfo const & buildInfo)
   }
   else
   {
-    auto const prevTrackId = m_currentPlacePageInfo ? m_currentPlacePageInfo->GetTrackId()
-                                                    : kml::kInvalidTrackId;
+    auto const prevTrackId = m_currentPlacePageInfo ? m_currentPlacePageInfo->GetTrackId() : kml::kInvalidTrackId;
     DeactivateHotelSearchMark();
 
     m_currentPlacePageInfo = placePageInfo;
@@ -2128,9 +2072,8 @@ void Framework::OnTapEvent(place_page::BuildInfo const & buildInfo)
         if (m_drapeEngine)
         {
           m_drapeEngine->SelectObject(df::SelectionShape::ESelectedObject::OBJECT_TRACK,
-                                      m_currentPlacePageInfo->GetMercator(), FeatureID(),
-                                      false /* isAnim */, false /* isGeometrySelectionAllowed */,
-                                      true /* isSelectionShapeVisible */);
+                                      m_currentPlacePageInfo->GetMercator(), FeatureID(), false /* isAnim */,
+                                      false /* isGeometrySelectionAllowed */, true /* isSelectionShapeVisible */);
         }
         return;
       }
@@ -2150,8 +2093,7 @@ void Framework::InvalidateRendering()
 void Framework::UpdateMinBuildingsTapZoom()
 {
   constexpr int kMinTapZoom = 16;
-  m_minBuildingsTapZoom = max(kMinTapZoom,
-                              feature::GetDrawableScaleRange(classif().GetTypeByPath({"building"})).first);
+  m_minBuildingsTapZoom = max(kMinTapZoom, feature::GetDrawableScaleRange(classif().GetTypeByPath({"building"})).first);
 }
 
 FeatureID Framework::FindBuildingAtPoint(m2::PointD const & mercator) const
@@ -2161,14 +2103,11 @@ FeatureID Framework::FindBuildingAtPoint(m2::PointD const & mercator) const
   {
     constexpr int kScale = scales::GetUpperScale();
     constexpr double kSelectRectWidthInMeters = 1.1;
-    m2::RectD const rect =
-        mercator::RectByCenterXYAndSizeInMeters(mercator, kSelectRectWidthInMeters);
+    m2::RectD const rect = mercator::RectByCenterXYAndSizeInMeters(mercator, kSelectRectWidthInMeters);
     m_featuresFetcher.ForEachFeature(rect, [&](FeatureType & ft)
     {
-      if (!featureId.IsValid() &&
-          ft.GetGeomType() == feature::GeomType::Area &&
-          ftypes::IsBuildingChecker::Instance()(ft) &&
-          ft.GetLimitRect(kScale).IsPointInside(mercator) &&
+      if (!featureId.IsValid() && ft.GetGeomType() == feature::GeomType::Area &&
+          ftypes::IsBuildingChecker::Instance()(ft) && ft.GetLimitRect(kScale).IsPointInside(mercator) &&
           feature::GetMinDistanceMeters(ft, mercator) == 0.0)
       {
         featureId = ft.GetID();
@@ -2197,7 +2136,8 @@ place_page::Info Framework::BuildPlacePageInfo(place_page::BuildInfo const & bui
     if (buildInfo.m_userMarkId != kml::kInvalidMarkId)
     {
       auto const & bm = GetBookmarkManager();
-      mark = bm.IsBookmark(buildInfo.m_userMarkId) ? bm.GetBookmark(buildInfo.m_userMarkId) : bm.GetUserMark(buildInfo.m_userMarkId);
+      mark = bm.IsBookmark(buildInfo.m_userMarkId) ? bm.GetBookmark(buildInfo.m_userMarkId)
+                                                   : bm.GetUserMark(buildInfo.m_userMarkId);
       ASSERT(mark, ("There is no user mark with id", buildInfo.m_userMarkId));
     }
 
@@ -2232,13 +2172,13 @@ place_page::Info Framework::BuildPlacePageInfo(place_page::BuildInfo const & bui
   FeatureID selectedFeature = buildInfo.m_featureId;
   auto const isFeatureMatchingEnabled = buildInfo.IsFeatureMatchingEnabled();
 
-  // @TODO: (KK) Enable track selection.
-  // The isTrackSelectionEnabled should be removed to enable the track selection when the UI will be implemented.
-  #if defined(TARGET_OS_IPHONE)
-    bool constexpr isTrackSelectionEnabled = true;
-  #else
-    bool constexpr isTrackSelectionEnabled = false;
-  #endif
+// @TODO: (KK) Enable track selection.
+// The isTrackSelectionEnabled should be removed to enable the track selection when the UI will be implemented.
+#if defined(TARGET_OS_IPHONE)
+  bool constexpr isTrackSelectionEnabled = true;
+#else
+  bool constexpr isTrackSelectionEnabled = false;
+#endif
 
   // Using VisualParams inside FindTrackInTapPosition/GetDefaultTapRect requires drapeEngine.
   if (isTrackSelectionEnabled && m_drapeEngine != nullptr && buildInfo.IsTrackMatchingEnabled() &&
@@ -2278,9 +2218,8 @@ place_page::Info Framework::BuildPlacePageInfo(place_page::BuildInfo const & bui
       // Search for a user mark at POI position instead of tap position (an icon or text label was tapped).
       double constexpr kEps = 1e-7;
       auto const rect = df::TapInfo::GetPreciseTapRect(outInfo.GetMercator(), kEps);
-      UserMark const * mark = GetBookmarkManager().FindNearestUserMark(
-          [&rect](UserMark::Type) { return rect; },
-          [](UserMark::Type) { return true; });
+      UserMark const * mark = GetBookmarkManager().FindNearestUserMark([&rect](UserMark::Type) { return rect; },
+                                                                       [](UserMark::Type) { return true; });
       if (mark)
       {
         FillUserMarkInfo(mark, outInfo);
@@ -2304,14 +2243,13 @@ place_page::Info Framework::BuildPlacePageInfo(place_page::BuildInfo const & bui
   return outInfo;
 }
 
-void Framework::UpdatePlacePageInfoForCurrentSelection(
-    std::optional<place_page::BuildInfo> const & overrideInfo)
+void Framework::UpdatePlacePageInfoForCurrentSelection(std::optional<place_page::BuildInfo> const & overrideInfo)
 {
   if (!m_currentPlacePageInfo)
     return;
 
-  m_currentPlacePageInfo = BuildPlacePageInfo(overrideInfo.has_value() ? *overrideInfo :
-    m_currentPlacePageInfo->GetBuildInfo());
+  m_currentPlacePageInfo =
+      BuildPlacePageInfo(overrideInfo.has_value() ? *overrideInfo : m_currentPlacePageInfo->GetBuildInfo());
 
   if (m_onPlacePageUpdate)
     m_onPlacePageUpdate();
@@ -2328,37 +2266,31 @@ Track::TrackSelectionInfo Framework::FindTrackInTapPosition(place_page::BuildInf
     CHECK_NOT_EQUAL(selection.m_trackId, kml::kInvalidTrackId, ());
     return selection;
   }
-  auto const touchRect = df::TapInfo::GetDefaultTapRect(buildInfo.m_mercator,
-                                                           m_currentModelView).GetGlobalRect();
+  auto const touchRect = df::TapInfo::GetDefaultTapRect(buildInfo.m_mercator, m_currentModelView).GetGlobalRect();
   return bm.FindNearestTrack(touchRect);
 }
 
 UserMark const * Framework::FindUserMarkInTapPosition(place_page::BuildInfo const & buildInfo) const
 {
-  UserMark const * mark = GetBookmarkManager().FindNearestUserMark(
-    [this, &buildInfo](UserMark::Type type)
-    {
-      double constexpr kEps = 1e-7;
-      if (buildInfo.m_source != place_page::BuildInfo::Source::User)
-        return df::TapInfo::GetPreciseTapRect(buildInfo.m_mercator, kEps);
+  UserMark const * mark = GetBookmarkManager().FindNearestUserMark([this, &buildInfo](UserMark::Type type)
+  {
+    double constexpr kEps = 1e-7;
+    if (buildInfo.m_source != place_page::BuildInfo::Source::User)
+      return df::TapInfo::GetPreciseTapRect(buildInfo.m_mercator, kEps);
 
-      if (type == UserMark::Type::BOOKMARK || type == UserMark::Type::TRACK_INFO)
-        return df::TapInfo::GetBookmarkTapRect(buildInfo.m_mercator, m_currentModelView);
+    if (type == UserMark::Type::BOOKMARK || type == UserMark::Type::TRACK_INFO)
+      return df::TapInfo::GetBookmarkTapRect(buildInfo.m_mercator, m_currentModelView);
 
-      if (type == UserMark::Type::ROUTING || type == UserMark::Type::ROAD_WARNING)
-        return df::TapInfo::GetRoutingPointTapRect(buildInfo.m_mercator, m_currentModelView);
+    if (type == UserMark::Type::ROUTING || type == UserMark::Type::ROAD_WARNING)
+      return df::TapInfo::GetRoutingPointTapRect(buildInfo.m_mercator, m_currentModelView);
 
-      return df::TapInfo::GetDefaultTapRect(buildInfo.m_mercator, m_currentModelView);
-    },
-    [](UserMark::Type type)
-    {
-      return type == UserMark::Type::TRACK_INFO || type == UserMark::Type::TRACK_SELECTION;
-    });
+    return df::TapInfo::GetDefaultTapRect(buildInfo.m_mercator, m_currentModelView);
+  }, [](UserMark::Type type) { return type == UserMark::Type::TRACK_INFO || type == UserMark::Type::TRACK_SELECTION; });
   return mark;
 }
 
-void Framework::PredictLocation(double & lat, double & lon, double accuracy,
-                                double bearing, double speed, double elapsedSeconds)
+void Framework::PredictLocation(double & lat, double & lon, double accuracy, double bearing, double speed,
+                                double elapsedSeconds)
 {
   double offsetInM = speed * elapsedSeconds;
   double angle = math::DegToRad(90.0 - bearing);
@@ -2421,7 +2353,10 @@ void Framework::UpdateSavedDataVersion()
 }
 */
 
-int64_t Framework::GetCurrentDataVersion() const { return m_storage.GetCurrentDataVersion(); }
+int64_t Framework::GetCurrentDataVersion() const
+{
+  return m_storage.GetCurrentDataVersion();
+}
 
 dp::ApiVersion Framework::LoadPreferredGraphicsAPI()
 {
@@ -2438,8 +2373,7 @@ void Framework::SavePreferredGraphicsAPI(dp::ApiVersion apiVersion)
 
 void Framework::AllowTransliteration(bool allowTranslit)
 {
-  Transliteration::Instance().SetMode(allowTranslit ? Transliteration::Mode::Enabled
-                                                    : Transliteration::Mode::Disabled);
+  Transliteration::Instance().SetMode(allowTranslit ? Transliteration::Mode::Enabled : Transliteration::Mode::Disabled);
   InvalidateRect(GetCurrentViewport());
 }
 
@@ -2453,8 +2387,7 @@ bool Framework::LoadTransliteration()
 
 void Framework::SaveTransliteration(bool allowTranslit)
 {
-  settings::Set(kTranslitMode, allowTranslit ? Transliteration::Mode::Enabled
-                                             : Transliteration::Mode::Disabled);
+  settings::Set(kTranslitMode, allowTranslit ? Transliteration::Mode::Enabled : Transliteration::Mode::Disabled);
 }
 
 std::string Framework::GetMapLanguageCode()
@@ -2632,8 +2565,8 @@ void Framework::EnableChoosePositionMode(bool enable, bool enableBounds, m2::Poi
 {
   if (m_drapeEngine != nullptr)
   {
-    m_drapeEngine->EnableChoosePositionMode(enable,
-      enableBounds ? GetSelectedFeatureTriangles() : vector<m2::TriangleD>(), optionalPosition);
+    m_drapeEngine->EnableChoosePositionMode(
+        enable, enableBounds ? GetSelectedFeatureTriangles() : vector<m2::TriangleD>(), optionalPosition);
   }
 }
 
@@ -2652,9 +2585,7 @@ vector<m2::TriangleD> Framework::GetSelectedFeatureTriangles() const
   {
     triangles.reserve(10);
     ft->ForEachTriangle([&](m2::PointD const & p1, m2::PointD const & p2, m2::PointD const & p3)
-    {
-      triangles.emplace_back(p1, p2, p3);
-    }, scales::GetUpperScale());
+    { triangles.emplace_back(p1, p2, p3); }, scales::GetUpperScale());
   }
 
   return triangles;
@@ -2700,14 +2631,12 @@ bool Framework::ParseDrapeDebugCommand(string const & query)
 
   if (query == "?aa" || query == "effect:antialiasing")
   {
-    m_drapeEngine->SetPosteffectEnabled(df::PostprocessRenderer::Antialiasing,
-                                        true /* enabled */);
+    m_drapeEngine->SetPosteffectEnabled(df::PostprocessRenderer::Antialiasing, true /* enabled */);
     return true;
   }
   if (query == "?no-aa" || query == "effect:no-antialiasing")
   {
-    m_drapeEngine->SetPosteffectEnabled(df::PostprocessRenderer::Antialiasing,
-                                        false /* enabled */);
+    m_drapeEngine->SetPosteffectEnabled(df::PostprocessRenderer::Antialiasing, false /* enabled */);
     return true;
   }
   if (query == "?scheme")
@@ -2869,8 +2798,8 @@ bool LocalizeStreet(DataSource const & dataSource, FeatureID const & fid, osm::L
   return true;
 }
 
-vector<osm::LocalizedStreet> TakeSomeStreetsAndLocalize(
-    vector<search::ReverseGeocoder::Street> const & streets, DataSource const & dataSource)
+vector<osm::LocalizedStreet> TakeSomeStreetsAndLocalize(vector<search::ReverseGeocoder::Street> const & streets,
+                                                        DataSource const & dataSource)
 
 {
   vector<osm::LocalizedStreet> results;
@@ -2880,12 +2809,8 @@ vector<osm::LocalizedStreet> TakeSomeStreetsAndLocalize(
   constexpr size_t kMaxNumberOfNearbyStreetsToDisplay = 8;
   for (auto const & street : streets)
   {
-    auto const isDuplicate = find_if(begin(results), end(results),
-                                     [&street](osm::LocalizedStreet const & s)
-                                     {
-                                       return s.m_defaultName == street.m_name ||
-                                              s.m_localizedName == street.m_name;
-                                     }) != results.end();
+    auto const isDuplicate = find_if(begin(results), end(results), [&street](osm::LocalizedStreet const & s)
+    { return s.m_defaultName == street.m_name || s.m_localizedName == street.m_name; }) != results.end();
     if (isDuplicate)
       continue;
 
@@ -2900,8 +2825,8 @@ vector<osm::LocalizedStreet> TakeSomeStreetsAndLocalize(
   return results;
 }
 
-void SetStreet(search::ReverseGeocoder const & coder, DataSource const & dataSource,
-               FeatureType & ft, osm::EditableMapObject & emo)
+void SetStreet(search::ReverseGeocoder const & coder, DataSource const & dataSource, FeatureType & ft,
+               osm::EditableMapObject & emo)
 {
   // Get exact feature's street address (if any) from mwm,
   // together with all nearby streets.
@@ -2914,10 +2839,7 @@ void SetStreet(search::ReverseGeocoder const & coder, DataSource const & dataSou
   if (!street.empty())
   {
     auto it = find_if(begin(streets), end(streets),
-                      [&street](search::ReverseGeocoder::Street const & s)
-                      {
-                        return s.m_name == street;
-                      });
+                      [&street](search::ReverseGeocoder::Street const & s) { return s.m_name == street; });
 
     if (it != end(streets))
     {
@@ -2928,11 +2850,8 @@ void SetStreet(search::ReverseGeocoder const & coder, DataSource const & dataSou
       emo.SetStreet(ls);
 
       // A street that a feature belongs to should always be in the first place in the list.
-      auto it =
-          find_if(begin(localizedStreets), end(localizedStreets), [&ls](osm::LocalizedStreet const & rs)
-                  {
-                    return ls.m_defaultName == rs.m_defaultName;
-                  });
+      auto it = find_if(begin(localizedStreets), end(localizedStreets),
+                        [&ls](osm::LocalizedStreet const & rs) { return ls.m_defaultName == rs.m_defaultName; });
       if (it != end(localizedStreets))
         iter_swap(it, begin(localizedStreets));
       else
@@ -2985,8 +2904,8 @@ bool Framework::CreateMapObject(m2::PointD const & mercator, uint32_t const feat
 {
   emo = {};
   auto const & dataSource = m_featuresFetcher.GetDataSource();
-  MwmSet::MwmId const mwmId = dataSource.GetMwmIdByCountryFile(
-        platform::CountryFile(m_infoGetter->GetRegionCountryId(mercator)));
+  MwmSet::MwmId const mwmId =
+      dataSource.GetMwmIdByCountryFile(platform::CountryFile(m_infoGetter->GetRegionCountryId(mercator)));
   if (!mwmId.IsAlive())
     return false;
 
@@ -3089,13 +3008,9 @@ osm::Editor::SaveResult Framework::SaveEditedMapObject(osm::EditableMapObject em
 
     string originalFeatureStreet;
     if (!isCreatedFeature)
-    {
       originalFeatureStreet = coder.GetOriginalFeatureStreetName(originalFeature->GetID());
-    }
     else
-    {
       originalFeatureStreet = emo.GetStreet().m_defaultName;
-    }
 
     auto isStreetOverridden = false;
     if (!hostingBuildingAddress.GetStreetName().empty() &&
@@ -3127,7 +3042,7 @@ osm::Editor::SaveResult Framework::SaveEditedMapObject(osm::EditableMapObject em
 
     // Do not save street if it was taken from hosting building.
     if ((originalFeatureStreet.empty() || isCreatedFeature) && !isStreetOverridden)
-        emo.SetStreet({});
+      emo.SetStreet({});
     // Do not save house number if it was taken from hosting building.
     if ((originalFeature->GetHouseNumber().empty() || isCreatedFeature) && !isHouseNumberOverridden)
       emo.SetHouseNumber("");
@@ -3146,13 +3061,13 @@ osm::Editor::SaveResult Framework::SaveEditedMapObject(osm::EditableMapObject em
       // Such a notification have been already sent. I.e at least one of
       // street of house number should differ in emo and editor.
       shouldNotify =
-          !isCreatedFeature &&
-          ((editedFeature && !editedFeature->GetHouseNumber().empty() &&
-            editedFeature->GetHouseNumber() != emo.GetHouseNumber()) ||
-           (editor.GetEditedFeatureStreet(emo.GetID(), editedFeatureStreet) &&
-            !editedFeatureStreet.empty() && editedFeatureStreet != emo.GetStreet().m_defaultName));
+          !isCreatedFeature && ((editedFeature && !editedFeature->GetHouseNumber().empty() &&
+                                 editedFeature->GetHouseNumber() != emo.GetHouseNumber()) ||
+                                (editor.GetEditedFeatureStreet(emo.GetID(), editedFeatureStreet) &&
+                                 !editedFeatureStreet.empty() && editedFeatureStreet != emo.GetStreet().m_defaultName));
     }
-  } while (0);
+  }
+  while (0);
 
   if (shouldNotify)
   {
@@ -3208,8 +3123,8 @@ bool Framework::RollBackChanges(FeatureID const & fid)
   return rolledBack;
 }
 
-void Framework::CreateNote(osm::MapObject const & mapObject,
-                           osm::Editor::NoteProblemType const type, string const & note)
+void Framework::CreateNote(osm::MapObject const & mapObject, osm::Editor::NoteProblemType const type,
+                           string const & note)
 {
   osm::Editor::Instance().CreateNote(mapObject.GetLatLon(), mapObject.GetID(), mapObject.GetTypes(),
                                      mapObject.GetDefaultName(), type, note);
@@ -3280,8 +3195,7 @@ vector<MwmSet::MwmId> Framework::GetMwmsByRect(m2::RectD const & rect, bool roug
   return result;
 }
 
-void Framework::ReadFeatures(function<void(FeatureType &)> const & reader,
-                             vector<FeatureID> const & features)
+void Framework::ReadFeatures(function<void(FeatureType &)> const & reader, vector<FeatureID> const & features)
 {
   m_featuresFetcher.ReadFeatures(reader, features);
 }
@@ -3291,10 +3205,8 @@ void Framework::OnRouteFollow(routing::RouterType type)
 {
   bool const isPedestrianRoute = type == RouterType::Pedestrian;
   bool const enableAutoZoom = isPedestrianRoute ? false : LoadAutoZoom();
-  int const scale =
-      isPedestrianRoute ? scales::GetPedestrianNavigationScale() : scales::GetNavigationScale();
-  int scale3d =
-      isPedestrianRoute ? scales::GetPedestrianNavigation3dScale() : scales::GetNavigation3dScale();
+  int const scale = isPedestrianRoute ? scales::GetPedestrianNavigationScale() : scales::GetNavigationScale();
+  int scale3d = isPedestrianRoute ? scales::GetPedestrianNavigation3dScale() : scales::GetNavigation3dScale();
   if (enableAutoZoom)
     ++scale3d;
 
@@ -3313,10 +3225,7 @@ void Framework::OnRouteFollow(routing::RouterType type)
 // RoutingManager::Delegate
 void Framework::RegisterCountryFilesOnRoute(shared_ptr<routing::NumMwmIds> ptr) const
 {
-  m_storage.ForEachCountry([&ptr](storage::Country const & country)
-  {
-    ptr->RegisterFile(country.GetFile());
-  });
+  m_storage.ForEachCountry([&ptr](storage::Country const & country) { ptr->RegisterFile(country.GetFile()); });
 }
 
 void Framework::SetPlacePageLocation(place_page::Info & info)
@@ -3345,16 +3254,14 @@ void Framework::FillDescription(FeatureType & ft, place_page::Info & info) const
   if (!wikiDescription.empty())
   {
     info.SetWikiDescription(std::move(wikiDescription));
-    info.SetOpeningMode(m_routingManager.IsRoutingActive()
-                        ? place_page::OpeningMode::Preview
-                        : place_page::OpeningMode::PreviewPlus);
+    info.SetOpeningMode(m_routingManager.IsRoutingActive() ? place_page::OpeningMode::Preview
+                                                           : place_page::OpeningMode::PreviewPlus);
   }
 }
 
 void Framework::OnPowerFacilityChanged(power_management::Facility const facility, bool enabled)
 {
-  if (facility == power_management::Facility::PerspectiveView ||
-      facility == power_management::Facility::Buildings3d)
+  if (facility == power_management::Facility::PerspectiveView || facility == power_management::Facility::Buildings3d)
   {
     bool allow3d = true, allow3dBuildings = true;
     Load3dMode(allow3d, allow3dBuildings);
@@ -3389,13 +3296,13 @@ bool Framework::ShouldShowProducts() const
     return false;
 
   std::string donateUrl;
-  if (!settings::Get(settings::kDonateUrl, donateUrl)) // donation is disabled
+  if (!settings::Get(settings::kDonateUrl, donateUrl))  // donation is disabled
     return false;
 
   if (!m_usageStats.IsLoyalUser())
     return false;
 
-  if (!HasPlacePageInfo()) // happens after the POI is deleted via the editor
+  if (!HasPlacePageInfo())  // happens after the POI is deleted via the editor
     return false;
 
   if (!storage::IsPointCoveredByDownloadedMaps(GetCurrentPlacePageInfo().GetMercator(), m_storage, *m_infoGetter))
@@ -3405,7 +3312,7 @@ bool Framework::ShouldShowProducts() const
   std::string productCloseReason;
   if (!settings::Get(kPlacePageProductsPopupCloseTime, popupCloseTime) ||
       !settings::Get(kPlacePageProductsPopupCloseReason, productCloseReason))
-    return true; // The popup was never closed.
+    return true;  // The popup was never closed.
 
   auto const now = base::SecondsSinceEpoch();
   auto const timeout = GetTimeoutForReason(FromString(productCloseReason));
@@ -3436,21 +3343,21 @@ void Framework::DidSelectProduct(products::ProductsConfig::Product const & produ
 
 uint32_t Framework::GetTimeoutForReason(ProductsPopupCloseReason reason) const
 {
-  #ifdef DEBUG
+#ifdef DEBUG
   uint32_t constexpr kPopupCloseTimeout = 10;
   uint32_t constexpr kProductSelectTimeout = 20;
   uint32_t constexpr kRemindMeLaterTimeout = 5;
-  #else
-  uint32_t constexpr kPopupCloseTimeout = 60 * 60 * 24  * 30; // 30 days
-  uint32_t constexpr kProductSelectTimeout = 60 * 60 * 24 * 180; // 180 days
-  uint32_t constexpr kRemindMeLaterTimeout = 60 * 60 * 24 * 3; // 3 days
-  #endif
+#else
+  uint32_t constexpr kPopupCloseTimeout = 60 * 60 * 24 * 30;      // 30 days
+  uint32_t constexpr kProductSelectTimeout = 60 * 60 * 24 * 180;  // 180 days
+  uint32_t constexpr kRemindMeLaterTimeout = 60 * 60 * 24 * 3;    // 3 days
+#endif
   switch (reason)
   {
-    case ProductsPopupCloseReason::Close: return kPopupCloseTimeout;
-    case ProductsPopupCloseReason::RemindLater: return kRemindMeLaterTimeout;
-    case ProductsPopupCloseReason::AlreadyDonated: return kProductSelectTimeout;
-    case ProductsPopupCloseReason::SelectProduct: return kProductSelectTimeout;
+  case ProductsPopupCloseReason::Close: return kPopupCloseTimeout;
+  case ProductsPopupCloseReason::RemindLater: return kRemindMeLaterTimeout;
+  case ProductsPopupCloseReason::AlreadyDonated: return kProductSelectTimeout;
+  case ProductsPopupCloseReason::SelectProduct: return kProductSelectTimeout;
   }
   ASSERT(false, ("Unknown reason"));
   return kPopupCloseTimeout;
@@ -3460,10 +3367,10 @@ std::string_view Framework::ToString(ProductsPopupCloseReason reason) const
 {
   switch (reason)
   {
-    case ProductsPopupCloseReason::Close: return kProductsPopupCloseReasonCloseStr;
-    case ProductsPopupCloseReason::RemindLater: return kProductsPopupCloseReasonRemindLaterStr;
-    case ProductsPopupCloseReason::AlreadyDonated: return kProductsPopupCloseReasonAlreadyDonatedStr;
-    case ProductsPopupCloseReason::SelectProduct: return kProductsPopupCloseReasonSelectProductStr;
+  case ProductsPopupCloseReason::Close: return kProductsPopupCloseReasonCloseStr;
+  case ProductsPopupCloseReason::RemindLater: return kProductsPopupCloseReasonRemindLaterStr;
+  case ProductsPopupCloseReason::AlreadyDonated: return kProductsPopupCloseReasonAlreadyDonatedStr;
+  case ProductsPopupCloseReason::SelectProduct: return kProductsPopupCloseReasonSelectProductStr;
   }
   ASSERT(false, ("Unknown reason"));
   return kProductsPopupCloseReasonCloseStr;
@@ -3471,10 +3378,14 @@ std::string_view Framework::ToString(ProductsPopupCloseReason reason) const
 
 Framework::ProductsPopupCloseReason Framework::FromString(std::string const & str) const
 {
-  if (str == kProductsPopupCloseReasonCloseStr) return ProductsPopupCloseReason::Close;
-  if (str == kProductsPopupCloseReasonRemindLaterStr) return ProductsPopupCloseReason::RemindLater;
-  if (str == kProductsPopupCloseReasonAlreadyDonatedStr) return ProductsPopupCloseReason::AlreadyDonated;
-  if (str == kProductsPopupCloseReasonSelectProductStr) return ProductsPopupCloseReason::SelectProduct;
+  if (str == kProductsPopupCloseReasonCloseStr)
+    return ProductsPopupCloseReason::Close;
+  if (str == kProductsPopupCloseReasonRemindLaterStr)
+    return ProductsPopupCloseReason::RemindLater;
+  if (str == kProductsPopupCloseReasonAlreadyDonatedStr)
+    return ProductsPopupCloseReason::AlreadyDonated;
+  if (str == kProductsPopupCloseReasonSelectProductStr)
+    return ProductsPopupCloseReason::SelectProduct;
   ASSERT(false, ("Incorrect reason string:", str));
   return ProductsPopupCloseReason::Close;
 }
diff --git a/libs/map/framework.hpp b/libs/map/framework.hpp
index 5df56f8dc..71d78aa14 100644
--- a/libs/map/framework.hpp
+++ b/libs/map/framework.hpp
@@ -19,9 +19,9 @@
 #include "map/traffic_manager.hpp"
 #include "map/transit/transit_reader.hpp"
 
-#include "drape_frontend/gui/skin.hpp"
 #include "drape_frontend/drape_api.hpp"
 #include "drape_frontend/drape_engine.hpp"
+#include "drape_frontend/gui/skin.hpp"
 #include "drape_frontend/user_event_stream.hpp"
 
 #include "drape/drape_global.hpp"
@@ -45,9 +45,9 @@
 #include "storage/downloading_policy.hpp"
 #include "storage/storage.hpp"
 
+#include "platform/distance.hpp"
 #include "platform/location.hpp"
 #include "platform/platform.hpp"
-#include "platform/distance.hpp"
 #include "platform/products.hpp"
 
 #include "routing/router.hpp"
@@ -74,15 +74,21 @@ namespace search
 {
 struct EverywhereSearchParams;
 struct ViewportSearchParams;
-}
+}  // namespace search
 
 namespace storage
 {
 class CountryInfoGetter;
 struct DownloaderSearchParams;
-}
+}  // namespace storage
 
-namespace routing { namespace turns{ class Settings; } }
+namespace routing
+{
+namespace turns
+{
+class Settings;
+}
+}  // namespace routing
 
 namespace platform
 {
@@ -96,7 +102,7 @@ class Loader;
 
 /// Uncomment line to make fixed position settings and
 /// build version for screenshots.
-//#define FIXED_LOCATION
+// #define FIXED_LOCATION
 
 struct FrameworkParams
 {
@@ -104,15 +110,14 @@ struct FrameworkParams
   size_t m_numSearchAPIThreads = 1;
 
   FrameworkParams() = default;
-  FrameworkParams(bool enableDiffs)
-    : m_enableDiffs(enableDiffs)
-  {}
+  FrameworkParams(bool enableDiffs) : m_enableDiffs(enableDiffs) {}
 };
 
-class Framework : public PositionProvider,
-                  public SearchAPI::Delegate,
-                  public RoutingManager::Delegate,
-                  private power_management::PowerManager::Subscriber
+class Framework
+  : public PositionProvider
+  , public SearchAPI::Delegate
+  , public RoutingManager::Delegate
+  , private power_management::PowerManager::Subscriber
 {
   DISALLOW_COPY(Framework);
 
@@ -126,10 +131,22 @@ class Framework : public PositionProvider,
   public:
     FixedPosition();
 
-    void GetLat(double & l) const { if (m_fixedLatLon) l = m_latlon.first; }
-    void GetLon(double & l) const { if (m_fixedLatLon) l = m_latlon.second; }
+    void GetLat(double & l) const
+    {
+      if (m_fixedLatLon)
+        l = m_latlon.first;
+    }
+    void GetLon(double & l) const
+    {
+      if (m_fixedLatLon)
+        l = m_latlon.second;
+    }
 
-    void GetNorth(double & n) const { if (m_fixedDir) n = m_dirFromNorth; }
+    void GetNorth(double & n) const
+    {
+      if (m_fixedDir)
+        n = m_dirFromNorth;
+    }
     bool HasNorth() const { return m_fixedDir; }
 
   } m_fixedPos;
@@ -140,7 +157,7 @@ private:
   std::unique_ptr<Platform::ThreadRunner> m_threadRunner = std::make_unique<Platform::ThreadRunner>();
 
 protected:
-  using TDrapeFunction = std::function<void (df::DrapeEngine *)>;
+  using TDrapeFunction = std::function<void(df::DrapeEngine *)>;
 
   StringsBundle m_stringsBundle;
 
@@ -192,13 +209,11 @@ protected:
 
   /// This function will be called by m_storage when latest local files
   /// is downloaded.
-  void OnCountryFileDownloaded(storage::CountryId const & countryId,
-                               storage::LocalFilePtr const localFile);
+  void OnCountryFileDownloaded(storage::CountryId const & countryId, storage::LocalFilePtr const localFile);
 
   /// This function will be called by m_storage before latest local files
   /// is deleted.
-  bool OnCountryFileDelete(storage::CountryId const & countryId,
-                           storage::LocalFilePtr const localFile);
+  bool OnCountryFileDelete(storage::CountryId const & countryId, storage::LocalFilePtr const localFile);
 
   /// This function is called by m_featuresFetcher when the map file is deregistered.
   void OnMapDeregistered(platform::LocalCountryFile const & localFile);
@@ -229,8 +244,7 @@ public:
   void DeregisterAllMaps();
 
   /// Registers a local map file in internal indexes.
-  std::pair<MwmSet::MwmId, MwmSet::RegResult> RegisterMap(
-      platform::LocalCountryFile const & localFile);
+  std::pair<MwmSet::MwmId, MwmSet::RegResult> RegisterMap(platform::LocalCountryFile const & localFile);
 
   /// Shows group or leaf mwm on the map.
   void ShowNode(storage::CountryId const & countryId);
@@ -249,7 +263,7 @@ public:
     AskForUpdateMaps,
     Migrate
   };
-//  DoAfterUpdate ToDoAfterUpdate() const;
+  //  DoAfterUpdate ToDoAfterUpdate() const;
 
   storage::Storage & GetStorage() { return m_storage; }
   storage::Storage const & GetStorage() const { return m_storage; }
@@ -313,8 +327,7 @@ public:
   void DeactivateMapSelectionCircle(bool restoreViewport);
   void SwitchFullScreen();
   /// Used to "refresh" UI in some cases (e.g. feature editing).
-  void UpdatePlacePageInfoForCurrentSelection(
-      std::optional<place_page::BuildInfo> const & overrideInfo = {});
+  void UpdatePlacePageInfoForCurrentSelection(std::optional<place_page::BuildInfo> const & overrideInfo = {});
 
   struct PlacePageEvent
   {
@@ -327,17 +340,12 @@ public:
     using OnSwitchFullScreen = std::function<void()>;
   };
 
-  void SetPlacePageListeners(PlacePageEvent::OnOpen onOpen,
-                             PlacePageEvent::OnClose onClose,
-                             PlacePageEvent::OnUpdate onUpdate,
-                             PlacePageEvent::OnSwitchFullScreen onSwitchFullScreen);
+  void SetPlacePageListeners(PlacePageEvent::OnOpen onOpen, PlacePageEvent::OnClose onClose,
+                             PlacePageEvent::OnUpdate onUpdate, PlacePageEvent::OnSwitchFullScreen onSwitchFullScreen);
   bool HasPlacePageInfo() const { return m_currentPlacePageInfo.has_value(); }
   place_page::Info const & GetCurrentPlacePageInfo() const;
   place_page::Info & GetCurrentPlacePageInfo();
-  void BuildAndSetPlacePageInfo(place_page::BuildInfo const & buildInfo)
-  {
-    OnTapEvent(buildInfo);
-  }
+  void BuildAndSetPlacePageInfo(place_page::BuildInfo const & buildInfo) { OnTapEvent(buildInfo); }
 
   void InvalidateRendering();
   void EnableDebugRectRendering(bool enabled);
@@ -353,8 +361,7 @@ public:
   std::vector<std::string> GetRegionsCountryIdByRect(m2::RectD const & rect, bool rough) const;
   std::vector<MwmSet::MwmId> GetMwmsByRect(m2::RectD const & rect, bool rough) const;
 
-  void ReadFeatures(std::function<void(FeatureType &)> const & reader,
-                    std::vector<FeatureID> const & features);
+  void ReadFeatures(std::function<void(FeatureType &)> const & reader, std::vector<FeatureID> const & features);
 
 private:
   std::optional<place_page::Info> m_currentPlacePageInfo;
@@ -447,8 +454,9 @@ public:
 
   void SaveRoute();
   /// Returns the elevation profile data of the currently recorded track.
-  /// To get the data on the every track recording state update, this function should be called after receiving the callback from the `SetTrackRecordingUpdateHandler`.
-  static const ElevationInfo & GetTrackRecordingElevationInfo();
+  /// To get the data on the every track recording state update, this function should be called after receiving the
+  /// callback from the `SetTrackRecordingUpdateHandler`.
+  static ElevationInfo const & GetTrackRecordingElevationInfo();
 
   void SetMapStyle(MapStyle mapStyle);
   void MarkMapStyle(MapStyle mapStyle);
@@ -464,7 +472,7 @@ private:
   void InitCountryInfoGetter();
   void InitSearchAPI(size_t numThreads);
 
-  bool m_connectToGpsTrack; // need to connect to tracker when Drape is being constructed
+  bool m_connectToGpsTrack;  // need to connect to tracker when Drape is being constructed
 
   void OnUpdateCurrentCountry(m2::PointD const & pt, int zoomLevel);
 
@@ -500,8 +508,7 @@ public:
   /// @param[out] distance          Distance to point from (lat, lon);
   /// @param[out] azimut            Azimut to point from (lat, lon);
   /// @return true  If the POI is near the current position (distance < 25 km);
-  bool GetDistanceAndAzimut(m2::PointD const & point,
-                            double lat, double lon, double north,
+  bool GetDistanceAndAzimut(m2::PointD const & point, double lat, double lon, double north,
                             platform::Distance & distance, double & azimut);
 
   /// @name Manipulating with model view
@@ -523,8 +530,7 @@ public:
   void SetVisibleViewport(m2::RectD const & rect);
 
   /// - Check minimal visible scale according to downloaded countries.
-  void ShowRect(m2::RectD const & rect, int maxScale = -1, bool animation = true,
-                bool useVisibleViewport = false);
+  void ShowRect(m2::RectD const & rect, int maxScale = -1, bool animation = true, bool useVisibleViewport = false);
   void ShowRect(m2::AnyRectD const & rect, bool animation = true, bool useVisibleViewport = false);
 
   void GetTouchRect(m2::PointD const & center, uint32_t pxRadius, m2::AnyRectD & rect);
@@ -573,10 +579,7 @@ public:
   void RunFirstLaunchAnimation();
 
   /// Set correct viewport, parse API, show balloon.
-  void ExecuteMapApiRequest()
-  {
-    m_parsedMapApi.ExecuteMapApiRequest(*this);
-  }
+  void ExecuteMapApiRequest() { m_parsedMapApi.ExecuteMapApiRequest(*this); }
 
   url_scheme::ParsedMapApi::UrlType ParseAndSetApiURL(std::string const & url)
   {
@@ -586,9 +589,9 @@ public:
   struct ParsedRoutingData
   {
     ParsedRoutingData(std::vector<url_scheme::RoutePoint> const & points, routing::RouterType type)
-      : m_points(points), m_type(type)
-    {
-    }
+      : m_points(points)
+      , m_type(type)
+    {}
     std::vector<url_scheme::RoutePoint> m_points;
     routing::RouterType m_type;
   };
@@ -617,13 +620,11 @@ private:
 
   void FillFeatureInfo(FeatureID const & fid, place_page::Info & info) const;
   /// @param customTitle, if not empty, overrides any other calculated name.
-  void FillPointInfo(place_page::Info & info, m2::PointD const & mercator,
-                     std::string const & customTitle = {},
+  void FillPointInfo(place_page::Info & info, m2::PointD const & mercator, std::string const & customTitle = {},
                      FeatureMatcher && matcher = nullptr) const;
   void FillNotMatchedPlaceInfo(place_page::Info & info, m2::PointD const & mercator,
                                std::string const & customTitle = {}) const;
-  void FillPostcodeInfo(std::string const & postcode, m2::PointD const & mercator,
-                        place_page::Info & info) const;
+  void FillPostcodeInfo(std::string const & postcode, m2::PointD const & mercator, place_page::Info & info) const;
 
   void FillUserMarkInfo(UserMark const * mark, place_page::Info & outInfo);
 
@@ -637,8 +638,7 @@ private:
   void FillRoadTypeMarkInfo(RoadWarningMark const & roadTypeMark, place_page::Info & info) const;
   void FillPointInfoForBookmark(Bookmark const & bmk, place_page::Info & info) const;
   void FillBookmarkInfo(Bookmark const & bmk, place_page::Info & info) const;
-  void FillTrackInfo(Track const & track, m2::PointD const & trackPoint,
-                     place_page::Info & info) const;
+  void FillTrackInfo(Track const & track, m2::PointD const & trackPoint, place_page::Info & info) const;
   void SetPlacePageLocation(place_page::Info & info);
   void FillDescription(FeatureType & ft, place_page::Info & info) const;
 
@@ -648,8 +648,7 @@ public:
   /// Get "best for the user" feature at given point even if it's invisible on the screen.
   /// Ignores coastlines and prefers buildings over other area features.
   /// @returns invalid FeatureID if no feature was found at the given mercator point.
-  FeatureID GetFeatureAtPoint(m2::PointD const & mercator,
-                              FeatureMatcher && matcher = nullptr) const;
+  FeatureID GetFeatureAtPoint(m2::PointD const & mercator, FeatureMatcher && matcher = nullptr) const;
   template <typename TFn>
   void ForEachFeatureAtPoint(TFn && fn, m2::PointD const & mercator) const
   {
@@ -663,17 +662,14 @@ public:
   void EnterForeground();
 
   /// Set the localized strings bundle
-  void AddString(std::string const & name, std::string const & value)
-  {
-    m_stringsBundle.SetString(name, value);
-  }
+  void AddString(std::string const & name, std::string const & value) { m_stringsBundle.SetString(name, value); }
 
   StringsBundle const & GetStringsBundle();
 
   /// [in] lat, lon - last known location
   /// [out] lat, lon - predicted location
-  static void PredictLocation(double & lat, double & lon, double accuracy,
-                              double bearing, double speed, double elapsedSeconds);
+  static void PredictLocation(double & lat, double & lon, double accuracy, double bearing, double speed,
+                              double elapsedSeconds);
 
 public:
   static std::string CodeGe0url(Bookmark const * bmk, bool addName);
@@ -703,6 +699,7 @@ public:
 
 private:
   void ApplyMapLanguageCode(std::string const & langCode);
+
 public:
   static std::string GetMapLanguageCode();
   void SetMapLanguageCode(std::string const & langCode);
@@ -761,8 +758,7 @@ public:
   void DeleteFeature(FeatureID const & fid);
   osm::NewFeatureCategories GetEditorCategories() const;
   bool RollBackChanges(FeatureID const & fid);
-  void CreateNote(osm::MapObject const & mapObject, osm::Editor::NoteProblemType const type,
-                  std::string const & note);
+  void CreateNote(osm::MapObject const & mapObject, osm::Editor::NoteProblemType const type, std::string const & note);
 
 private:
   settings::UsageStats m_usageStats;
diff --git a/libs/map/framework_visualize.cpp b/libs/map/framework_visualize.cpp
index 73436d39d..b7c760a15 100644
--- a/libs/map/framework_visualize.cpp
+++ b/libs/map/framework_visualize.cpp
@@ -5,11 +5,9 @@
 
 namespace
 {
-dp::Color const colorList[] = {
-    {255, 0, 0, 255},   {0, 255, 0, 255},   {0, 0, 255, 255},
-    {255, 255, 0, 255}, {0, 255, 255, 255}, {255, 0, 255, 255},
-    {100, 0, 0, 255},   {0, 100, 0, 255},   {0, 0, 100, 255},
-    {100, 100, 0, 255}, {0, 100, 100, 255}, {100, 0, 100, 255}};
+dp::Color const colorList[] = {{255, 0, 0, 255},   {0, 255, 0, 255},   {0, 0, 255, 255},   {255, 255, 0, 255},
+                               {0, 255, 255, 255}, {255, 0, 255, 255}, {100, 0, 0, 255},   {0, 100, 0, 255},
+                               {0, 0, 100, 255},   {100, 100, 0, 255}, {0, 100, 100, 255}, {100, 0, 100, 255}};
 
 dp::Color const cityBoundaryBBColor{255, 0, 0, 255};
 dp::Color const cityBoundaryCBColor{0, 255, 0, 255};
@@ -22,11 +20,13 @@ void DrawLine(Box const & box, dp::Color const & color, df::DrapeApi & drapeApi,
   CHECK(!points.empty(), ());
   points.push_back(points.front());
 
-  points.erase(unique(points.begin(), points.end(), [](m2::PointD const & p1, m2::PointD const & p2)
+  points.erase(unique(points.begin(), points.end(),
+                      [](m2::PointD const & p1, m2::PointD const & p2)
   {
     m2::PointD const delta = p2 - p1;
     return delta.IsAlmostZero();
-  }), points.end());
+  }),
+               points.end());
 
   if (points.size() <= 1)
     return;
@@ -125,7 +125,6 @@ void Framework::VisualizeCityRoadsInRect(m2::RectD const & rect)
 
     if (cityRoads[mwmId]->IsCityRoad(ft.GetID().m_index))
       VisualizeFeatureInRect(rect, ft, m_drapeApi);
-
   }, rect, scales::GetUpperScale());
 }
 
@@ -182,6 +181,5 @@ void Framework::VisualizeCrossMwmTransitionsInRect(m2::RectD const & rect)
         ++segIdx;
       }, scales::GetUpperScale());
     }
-
   }, rect, scales::GetUpperScale());
 }
diff --git a/libs/map/gps_track.cpp b/libs/map/gps_track.cpp
index a1dbb26cd..1c13b724c 100644
--- a/libs/map/gps_track.cpp
+++ b/libs/map/gps_track.cpp
@@ -30,7 +30,7 @@ inline pair<size_t, size_t> UnionRanges(pair<size_t, size_t> const & a, pair<siz
 
 size_t constexpr kItemBlockSize = 1000;
 
-} // namespace gps_track
+}  // namespace gps_track
 
 size_t const GpsTrack::kInvalidId = GpsTrackCollection::kInvalidId;
 
@@ -84,7 +84,7 @@ TrackStatistics GpsTrack::GetTrackStatistics() const
   return m_collection ? m_collection->GetTrackStatistics() : TrackStatistics();
 }
 
-const ElevationInfo & GpsTrack::GetElevationInfo() const
+ElevationInfo const & GpsTrack::GetElevationInfo() const
 {
   return m_collection->UpdateAndGetElevationInfo();
 }
@@ -133,7 +133,7 @@ void GpsTrack::ScheduleTask()
       unique_lock<mutex> ul(m_threadGuard);
       while (true)
       {
-        m_cv.wait(ul, [this]()->bool{ return m_threadExit || m_threadWakeup; });
+        m_cv.wait(ul, [this]() -> bool { return m_threadExit || m_threadWakeup; });
         if (m_threadExit)
           break;
         m_threadWakeup = false;
@@ -181,7 +181,7 @@ void GpsTrack::InitCollection()
     vector<location::GpsInfo> originPoints;
     originPoints.reserve(gps_track::kItemBlockSize);
 
-    m_storage->ForEach([this, &originPoints](location::GpsInfo const & originPoint)->bool
+    m_storage->ForEach([this, &originPoints](location::GpsInfo const & originPoint) -> bool
     {
       originPoints.emplace_back(originPoint);
       if (originPoints.size() == originPoints.capacity())
@@ -277,7 +277,8 @@ void GpsTrack::UpdateCollection(bool needClear, vector<location::GpsInfo> const
 {
   // Apply Clear and Add points
   // Clear points from collection, if need.
-  evictedIds = needClear ? m_collection->Clear(false /* resetIds */) : make_pair(kInvalidId, kInvalidId);;
+  evictedIds = needClear ? m_collection->Clear(false /* resetIds */) : make_pair(kInvalidId, kInvalidId);
+  ;
 
   // Add points to the collection, if need
   if (!points.empty())
@@ -299,14 +300,14 @@ void GpsTrack::NotifyCallback(pair<size_t, size_t> const & addedIds, pair<size_t
 
     vector<pair<size_t, location::GpsInfo>> toAdd;
     toAdd.reserve(m_collection->GetSize());
-    m_collection->ForEach([&toAdd](location::GpsInfo const & point, size_t id)->bool
+    m_collection->ForEach([&toAdd](location::GpsInfo const & point, size_t id) -> bool
     {
       toAdd.emplace_back(id, point);
       return true;
     });
 
     if (toAdd.empty())
-      return; // nothing to send
+      return;  // nothing to send
 
     m_callback(std::move(toAdd), make_pair(kInvalidId, kInvalidId), m_collection->GetTrackStatistics());
   }
@@ -318,7 +319,7 @@ void GpsTrack::NotifyCallback(pair<size_t, size_t> const & addedIds, pair<size_t
       size_t const addedCount = addedIds.second - addedIds.first + 1;
       ASSERT_GREATER_OR_EQUAL(m_collection->GetSize(), addedCount, ());
       toAdd.reserve(addedCount);
-      m_collection->ForEach([&toAdd](location::GpsInfo const & point, size_t id)->bool
+      m_collection->ForEach([&toAdd](location::GpsInfo const & point, size_t id) -> bool
       {
         toAdd.emplace_back(id, point);
         return true;
@@ -327,7 +328,7 @@ void GpsTrack::NotifyCallback(pair<size_t, size_t> const & addedIds, pair<size_t
     }
 
     if (toAdd.empty() && evictedIds.first == kInvalidId)
-      return; // nothing to send
+      return;  // nothing to send
 
     m_callback(std::move(toAdd), evictedIds, m_collection->GetTrackStatistics());
   }
diff --git a/libs/map/gps_track.hpp b/libs/map/gps_track.hpp
index 0c0bf197c..fb29c4ae1 100644
--- a/libs/map/gps_track.hpp
+++ b/libs/map/gps_track.hpp
@@ -17,11 +17,12 @@
 class GpsTrack final
 {
 public:
-  static size_t const kInvalidId; // = numeric_limits<size_t>::max();
+  static size_t const kInvalidId;  // = numeric_limits<size_t>::max();
 
   /// @param filePath - path to the file on disk to persist track
   /// @param filter - filter object used for filtering points, GpsTrackNullFilter is created by default
-  GpsTrack(std::string const & filePath, std::unique_ptr<IGpsTrackFilter> && filter = std::unique_ptr<IGpsTrackFilter>());
+  GpsTrack(std::string const & filePath,
+           std::unique_ptr<IGpsTrackFilter> && filter = std::unique_ptr<IGpsTrackFilter>());
   ~GpsTrack();
 
   /// Adds point or collection of points to gps tracking
@@ -32,8 +33,8 @@ public:
 
   /// Returns track statistics
   TrackStatistics GetTrackStatistics() const;
-  const ElevationInfo & GetElevationInfo() const;
-  
+  ElevationInfo const & GetElevationInfo() const;
+
   /// Clears any previous tracking info
   /// @note Callback is called with 'toRemove' points, if some points were removed.
   void Clear();
@@ -47,8 +48,7 @@ public:
   /// @note Calling of a GpsTrack.SetCallback function from the callback causes deadlock.
   using TGpsTrackDiffCallback =
       std::function<void(std::vector<std::pair<size_t, location::GpsInfo>> && toAdd,
-                         std::pair<size_t, size_t> const & toRemove,
-                         TrackStatistics const & trackStatistics)>;
+                         std::pair<size_t, size_t> const & toRemove, TrackStatistics const & trackStatistics)>;
 
   /// Sets callback on change of gps track.
   /// @param callback - callback callable object
@@ -67,30 +67,27 @@ private:
   DISALLOW_COPY_AND_MOVE(GpsTrack);
 
   void ScheduleTask();
-  void ProcessPoints(); // called on the worker thread
+  void ProcessPoints();  // called on the worker thread
   bool HasCallback();
   void InitStorageIfNeed();
   void InitCollection();
   void UpdateStorage(bool needClear, std::vector<location::GpsInfo> const & points);
-  void UpdateCollection(bool needClear,
-                        std::vector<location::GpsInfo> const & points,
-                        std::pair<size_t, size_t> & addedIds,
-                        std::pair<size_t, size_t> & evictedIds);
-  void NotifyCallback(std::pair<size_t, size_t> const & addedIds,
-                      std::pair<size_t, size_t> const & evictedIds);
+  void UpdateCollection(bool needClear, std::vector<location::GpsInfo> const & points,
+                        std::pair<size_t, size_t> & addedIds, std::pair<size_t, size_t> & evictedIds);
+  void NotifyCallback(std::pair<size_t, size_t> const & addedIds, std::pair<size_t, size_t> const & evictedIds);
 
   std::string const m_filePath;
 
   mutable std::mutex m_dataGuard;           // protects data for stealing
   std::vector<location::GpsInfo> m_points;  // accumulated points for adding
-  bool m_needClear; // need clear file
+  bool m_needClear;                         // need clear file
 
   std::mutex m_callbackGuard;
   // Callback is protected by m_callbackGuard. It ensures that SetCallback and call callback
   // will not be interleaved and after SetCallback(null) callback is never called. The negative side
   // is that GpsTrack.SetCallback must be never called from the callback.
   TGpsTrackDiffCallback m_callback;
-  bool m_needSendSnapshop; // need send initial snapshot
+  bool m_needSendSnapshop;  // need send initial snapshot
 
   std::unique_ptr<GpsTrackStorage> m_storage;        // used in the worker thread
   std::unique_ptr<GpsTrackCollection> m_collection;  // used in the worker thread
@@ -98,7 +95,7 @@ private:
 
   std::mutex m_threadGuard;
   threads::SimpleThread m_thread;
-  bool m_threadExit; // need exit thread
-  bool m_threadWakeup; // need wakeup thread
+  bool m_threadExit;    // need exit thread
+  bool m_threadWakeup;  // need wakeup thread
   std::condition_variable m_cv;
 };
diff --git a/libs/map/gps_track_collection.cpp b/libs/map/gps_track_collection.cpp
index 147ad052b..9ed3c0b43 100644
--- a/libs/map/gps_track_collection.cpp
+++ b/libs/map/gps_track_collection.cpp
@@ -12,29 +12,24 @@ template <typename T>
 class Rollbacker
 {
 public:
-  Rollbacker(std::deque<T> & cont)
-    : m_cont(&cont)
-    , m_size(cont.size())
-  {}
+  Rollbacker(std::deque<T> & cont) : m_cont(&cont), m_size(cont.size()) {}
   ~Rollbacker()
   {
     if (m_cont && m_cont->size() > m_size)
       m_cont->erase(m_cont->begin() + m_size, m_cont->end());
   }
   void Reset() { m_cont = nullptr; }
+
 private:
   std::deque<T> * m_cont;
   size_t const m_size;
 };
 
-} // namespace
+}  // namespace
 
 size_t const GpsTrackCollection::kInvalidId = std::numeric_limits<size_t>::max();
 
-GpsTrackCollection::GpsTrackCollection()
-  : m_lastId(0)
-  , m_elevationInfoDirty(true)
-{}
+GpsTrackCollection::GpsTrackCollection() : m_lastId(0), m_elevationInfoDirty(true) {}
 
 std::pair<size_t, size_t> GpsTrackCollection::Add(std::vector<TItem> const & items)
 {
@@ -62,7 +57,7 @@ std::pair<size_t, size_t> GpsTrackCollection::Add(std::vector<TItem> const & ite
   if (0 == added)
   {
     // Invalid timestamp order
-    return std::make_pair(kInvalidId, kInvalidId); // Nothing was added
+    return std::make_pair(kInvalidId, kInvalidId);  // Nothing was added
   }
 
   m_lastId += added;
@@ -101,7 +96,7 @@ size_t GpsTrackCollection::GetSize() const
   return m_items.size();
 }
 
-const ElevationInfo & GpsTrackCollection::UpdateAndGetElevationInfo()
+ElevationInfo const & GpsTrackCollection::UpdateAndGetElevationInfo()
 {
   if (!m_elevationInfoDirty)
     return m_elevationInfo;
diff --git a/libs/map/gps_track_collection.hpp b/libs/map/gps_track_collection.hpp
index 49cfd1c54..7026a7d9d 100644
--- a/libs/map/gps_track_collection.hpp
+++ b/libs/map/gps_track_collection.hpp
@@ -2,8 +2,8 @@
 
 #include "platform/location.hpp"
 
-#include "map/track_statistics.hpp"
 #include "map/elevation_info.hpp"
+#include "map/track_statistics.hpp"
 
 #include <deque>
 #include <limits>
@@ -13,7 +13,7 @@
 class GpsTrackCollection final
 {
 public:
-  static size_t const kInvalidId; // = numeric_limits<size_t>::max();
+  static size_t const kInvalidId;  // = numeric_limits<size_t>::max();
 
   using TItem = location::GpsInfo;
 
@@ -40,9 +40,9 @@ public:
   size_t GetSize() const;
 
   /// Returns track statistics.
-  const TrackStatistics GetTrackStatistics() const { return m_statistics; }
+  TrackStatistics const GetTrackStatistics() const { return m_statistics; }
   /// Updates the elevation info with the missed points and returns a reference.
-  const ElevationInfo & UpdateAndGetElevationInfo();
+  ElevationInfo const & UpdateAndGetElevationInfo();
 
   /// Enumerates items in the collection.
   /// @param f - callable object, which is called with params - item and item id,
diff --git a/libs/map/gps_track_filter.cpp b/libs/map/gps_track_filter.cpp
index bb50fd38a..753329e7a 100644
--- a/libs/map/gps_track_filter.cpp
+++ b/libs/map/gps_track_filter.cpp
@@ -21,7 +21,7 @@ double constexpr kMinHorizontalAccuracyMeters = 250;
 double constexpr kClosePointDistanceMeters = 15;
 
 // Max acceptable acceleration to filter gps jumps
-double constexpr kMaxAcceptableAcceleration = 2; // m / sec ^ 2
+double constexpr kMaxAcceptableAcceleration = 2;  // m / sec ^ 2
 
 double constexpr kCosine45degrees = 0.70710678118;
 
@@ -37,7 +37,7 @@ double GetDistance(location::GpsInfo const & from, location::GpsInfo const & to)
 {
   return ms::DistanceOnEarth(from.m_latitude, from.m_longitude, to.m_latitude, to.m_longitude);
 }
-} // namespace
+}  // namespace
 
 void GpsTrackNullFilter::Process(std::vector<location::GpsInfo> const & inPoints,
                                  std::vector<location::GpsInfo> & outPoints)
@@ -89,8 +89,8 @@ void GpsTrackFilter::Process(std::vector<location::GpsInfo> const & inPoints,
 
     if (IsGoodPoint(currInfo))
     {
-      double const predictionDistance = GetDistance(m_lastInfo[1], m_lastInfo[0]); // meters
-      double const realDistance = GetDistance(m_lastInfo[0], currInfo); // meters
+      double const predictionDistance = GetDistance(m_lastInfo[1], m_lastInfo[0]);  // meters
+      double const realDistance = GetDistance(m_lastInfo[0], currInfo);             // meters
 
       m2::PointD const predictionDirection = GetDirection(m_lastInfo[1], m_lastInfo[0]);
       m2::PointD const realDirection = GetDirection(m_lastInfo[0], currInfo);
@@ -100,8 +100,7 @@ void GpsTrackFilter::Process(std::vector<location::GpsInfo> const & inPoints,
 
       // Acceptable angle must be from 0 to 45 or from 0 to -45.
       // Acceptable distance must be not great than 2x than predicted, otherwise it is jump.
-      if (cosine >= kCosine45degrees &&
-          realDistance <= std::max(kClosePointDistanceMeters, 2. * predictionDistance))
+      if (cosine >= kCosine45degrees && realDistance <= std::max(kClosePointDistanceMeters, 2. * predictionDistance))
       {
         outPoints.emplace_back(currInfo);
         AddLastAcceptedInfo(currInfo);
diff --git a/libs/map/gps_track_filter.hpp b/libs/map/gps_track_filter.hpp
index 7cee5054e..f31109943 100644
--- a/libs/map/gps_track_filter.hpp
+++ b/libs/map/gps_track_filter.hpp
@@ -12,16 +12,14 @@ class IGpsTrackFilter
 public:
   virtual ~IGpsTrackFilter() = default;
 
-  virtual void Process(std::vector<location::GpsInfo> const & inPoints,
-                       std::vector<location::GpsInfo> & outPoints) = 0;
+  virtual void Process(std::vector<location::GpsInfo> const & inPoints, std::vector<location::GpsInfo> & outPoints) = 0;
 };
 
 class GpsTrackNullFilter : public IGpsTrackFilter
 {
 public:
   // IGpsTrackFilter overrides
-  void Process(std::vector<location::GpsInfo> const & inPoints,
-               std::vector<location::GpsInfo> & outPoints) override;
+  void Process(std::vector<location::GpsInfo> const & inPoints, std::vector<location::GpsInfo> & outPoints) override;
 };
 
 class GpsTrackFilter : public IGpsTrackFilter
@@ -33,8 +31,7 @@ public:
   GpsTrackFilter();
 
   // IGpsTrackFilter overrides
-  void Process(std::vector<location::GpsInfo> const & inPoints,
-               std::vector<location::GpsInfo> & outPoints) override;
+  void Process(std::vector<location::GpsInfo> const & inPoints, std::vector<location::GpsInfo> & outPoints) override;
 
 private:
   bool IsGoodPoint(location::GpsInfo const & info) const;
diff --git a/libs/map/gps_track_storage.cpp b/libs/map/gps_track_storage.cpp
index 45c269d61..d547eebe1 100644
--- a/libs/map/gps_track_storage.cpp
+++ b/libs/map/gps_track_storage.cpp
@@ -102,11 +102,9 @@ inline bool ReadVersion(fstream & f, uint32_t & version)
   return f.good();
 }
 
-} // namespace
+}  // namespace
 
-GpsTrackStorage::GpsTrackStorage(string const & filePath)
-  : m_filePath(filePath)
-  , m_itemCount(0)
+GpsTrackStorage::GpsTrackStorage(string const & filePath) : m_filePath(filePath), m_itemCount(0)
 {
   auto const createNewFile = [this]
   {
@@ -121,7 +119,6 @@ GpsTrackStorage::GpsTrackStorage(string const & filePath)
     m_itemCount = 0;
   };
 
-
   // Open existing file
   m_stream.open(m_filePath, ios::in | ios::out | ios::binary);
 
@@ -175,8 +172,7 @@ void GpsTrackStorage::Append(vector<TItem> const & items)
     return;
 
   // Write position must be after last item position
-  ASSERT_EQUAL(m_stream.tellp(), static_cast<typename fstream::pos_type>(
-                   GetItemOffset(m_itemCount)), ());
+  ASSERT_EQUAL(m_stream.tellp(), static_cast<typename fstream::pos_type>(GetItemOffset(m_itemCount)), ());
 
   vector<char> buff(min(kItemBlockSize, items.size()) * kPointSize);
   for (size_t i = 0; i < items.size();)
@@ -217,8 +213,7 @@ void GpsTrackStorage::Clear()
     MYTHROW(WriteException, ("File:", m_filePath));
 
   // Write position is set to the first item in the file
-  ASSERT_EQUAL(m_stream.tellp(), static_cast<typename fstream::pos_type>(
-                   GetItemOffset(0)), ());
+  ASSERT_EQUAL(m_stream.tellp(), static_cast<typename fstream::pos_type>(GetItemOffset(0)), ());
 }
 
 void GpsTrackStorage::ForEach(std::function<bool(TItem const & item)> const & fn)
diff --git a/libs/map/gps_tracker.cpp b/libs/map/gps_tracker.cpp
index 583e65d9a..ca7a17fa8 100644
--- a/libs/map/gps_tracker.cpp
+++ b/libs/map/gps_tracker.cpp
@@ -34,7 +34,7 @@ inline void SetSettingsIsEnabled(bool enabled)
   settings::Set(kEnabledKey, enabled);
 }
 
-} // namespace
+}  // namespace
 
 GpsTracker & GpsTracker::Instance()
 {
@@ -42,14 +42,11 @@ GpsTracker & GpsTracker::Instance()
   return instance;
 }
 
-GpsTracker::GpsTracker()
-  : m_enabled(GetSettingsIsEnabled())
-  , m_track(GetFilePath(), std::make_unique<GpsTrackFilter>())
-{
-}
+GpsTracker::GpsTracker() : m_enabled(GetSettingsIsEnabled()), m_track(GetFilePath(), std::make_unique<GpsTrackFilter>())
+{}
 
 void GpsTracker::SetEnabled(bool enabled)
-{  
+{
   if (enabled == m_enabled)
     return;
 
@@ -85,7 +82,7 @@ TrackStatistics GpsTracker::GetTrackStatistics() const
   return m_track.GetTrackStatistics();
 }
 
-const ElevationInfo & GpsTracker::GetElevationInfo() const
+ElevationInfo const & GpsTracker::GetElevationInfo() const
 {
   return m_track.GetElevationInfo();
 }
diff --git a/libs/map/gps_tracker.hpp b/libs/map/gps_tracker.hpp
index 8ec07a684..05f98269f 100644
--- a/libs/map/gps_tracker.hpp
+++ b/libs/map/gps_tracker.hpp
@@ -19,12 +19,11 @@ public:
   bool IsEmpty() const;
   size_t GetTrackSize() const;
   TrackStatistics GetTrackStatistics() const;
-  const ElevationInfo & GetElevationInfo() const;
+  ElevationInfo const & GetElevationInfo() const;
 
   using TGpsTrackDiffCallback =
       std::function<void(std::vector<std::pair<size_t, location::GpsInfo>> && toAdd,
-                         std::pair<size_t, size_t> const & toRemove,
-                         TrackStatistics const & trackStatistics)>;
+                         std::pair<size_t, size_t> const & toRemove, TrackStatistics const & trackStatistics)>;
 
   void Connect(TGpsTrackDiffCallback const & fn);
   void Disconnect();
diff --git a/libs/map/isolines_manager.cpp b/libs/map/isolines_manager.cpp
index d6711e0d2..0711eecd7 100644
--- a/libs/map/isolines_manager.cpp
+++ b/libs/map/isolines_manager.cpp
@@ -43,8 +43,8 @@ IsolinesManager::Info const & IsolinesManager::LoadIsolinesInfo(MwmSet::MwmId co
   isolines::IsolinesInfo info;
   if (isolines::LoadIsolinesInfo(m_dataSource, id, info))
   {
-    LOG(LINFO, ("Isolines min altitude", info.m_minAltitude, "max altitude", info.m_maxAltitude,
-                "altitude step", info.m_altStep));
+    LOG(LINFO, ("Isolines min altitude", info.m_minAltitude, "max altitude", info.m_maxAltitude, "altitude step",
+                info.m_altStep));
     status = Availability::Available;
     quality = info.GetQuality();
   }
diff --git a/libs/map/isolines_manager.hpp b/libs/map/isolines_manager.hpp
index 18bf7e53b..9b94eda7b 100644
--- a/libs/map/isolines_manager.hpp
+++ b/libs/map/isolines_manager.hpp
@@ -62,10 +62,7 @@ private:
   struct Info
   {
     Info() = default;
-    Info(Availability availability, isolines::Quality quality)
-      : m_availability(availability), m_quality(quality)
-    {
-    }
+    Info(Availability availability, isolines::Quality quality) : m_availability(availability), m_quality(quality) {}
 
     Availability m_availability = Availability::NoData;
     isolines::Quality m_quality = isolines::Quality::None;
diff --git a/libs/map/map_integration_tests/interactive_search_test.cpp b/libs/map/map_integration_tests/interactive_search_test.cpp
index 9362446a8..bf7448f99 100644
--- a/libs/map/map_integration_tests/interactive_search_test.cpp
+++ b/libs/map/map_integration_tests/interactive_search_test.cpp
@@ -35,8 +35,7 @@ public:
 
   bool IsViewportSearchActive() const override { return true; }
 
-  void ShowViewportSearchResults(Results::ConstIter begin, Results::ConstIter end,
-                                 bool clear) override
+  void ShowViewportSearchResults(Results::ConstIter begin, Results::ConstIter end, bool clear) override
   {
     if (clear)
       m_stats.m_numShownResults = 0;
@@ -47,24 +46,22 @@ private:
   Stats & m_stats;
 };
 
-class InteractiveSearchRequest : public TestDelegate, public TestSearchRequest
+class InteractiveSearchRequest
+  : public TestDelegate
+  , public TestSearchRequest
 {
 public:
-  InteractiveSearchRequest(TestSearchEngine & engine, string const & query,
-                           m2::RectD const & viewport, Stats & stats)
+  InteractiveSearchRequest(TestSearchEngine & engine, string const & query, m2::RectD const & viewport, Stats & stats)
     : TestDelegate(stats)
     , TestSearchRequest(engine, query, "en" /* locale */, Mode::Viewport, viewport)
   {
-    SetCustomOnResults(
-        ViewportSearchCallback(viewport,
-                               static_cast<ViewportSearchCallback::Delegate &>(*this),
-                               bind(&InteractiveSearchRequest::OnResults, this, placeholders::_1)));
+    SetCustomOnResults(ViewportSearchCallback(viewport, static_cast<ViewportSearchCallback::Delegate &>(*this),
+                                              bind(&InteractiveSearchRequest::OnResults, this, placeholders::_1)));
   }
 };
 
 class InteractiveSearchTest : public SearchTest
-{
-};
+{};
 
 double const kDX[] = {-0.01, 0, 0, 0.01};
 double const kDY[] = {0, -0.01, 0.01, 0};
@@ -84,7 +81,8 @@ UNIT_CLASS_TEST(InteractiveSearchTest, Smoke)
   for (size_t i = 0; i < ARRAY_SIZE(kDX); ++i)
     hotels.emplace_back(m2::Shift(hotelsPivot, kDX[i], kDY[i]));
 
-  auto const id = BuildCountry("Wonderland", [&](TestMwmBuilder & builder) {
+  auto const id = BuildCountry("Wonderland", [&](TestMwmBuilder & builder)
+  {
     for (auto const & cafe : cafes)
       builder.Add(cafe);
     for (auto const & hotel : hotels)
@@ -93,12 +91,12 @@ UNIT_CLASS_TEST(InteractiveSearchTest, Smoke)
 
   {
     Stats stats;
-    InteractiveSearchRequest request(
-        m_engine, "cafe", m2::RectD(m2::PointD(-1.5, -1.5), m2::PointD(-0.5, -0.5)), stats);
+    InteractiveSearchRequest request(m_engine, "cafe", m2::RectD(m2::PointD(-1.5, -1.5), m2::PointD(-0.5, -0.5)),
+                                     stats);
     request.Run();
 
-    Rules const rules = {ExactMatch(id, cafes[0]), ExactMatch(id, cafes[1]),
-                         ExactMatch(id, cafes[2]), ExactMatch(id, cafes[3])};
+    Rules const rules = {ExactMatch(id, cafes[0]), ExactMatch(id, cafes[1]), ExactMatch(id, cafes[2]),
+                         ExactMatch(id, cafes[3])};
 
     TEST_EQUAL(stats.m_numShownResults, 4, ());
     TEST(MatchResults(m_dataSource, rules, request.Results()), ());
@@ -106,12 +104,11 @@ UNIT_CLASS_TEST(InteractiveSearchTest, Smoke)
 
   {
     Stats stats;
-    InteractiveSearchRequest request(m_engine, "hotel",
-                                     m2::RectD(m2::PointD(0.5, 0.5), m2::PointD(1.5, 1.5)), stats);
+    InteractiveSearchRequest request(m_engine, "hotel", m2::RectD(m2::PointD(0.5, 0.5), m2::PointD(1.5, 1.5)), stats);
     request.Run();
 
-    Rules const rules = {ExactMatch(id, hotels[0]), ExactMatch(id, hotels[1]),
-                         ExactMatch(id, hotels[2]), ExactMatch(id, hotels[3])};
+    Rules const rules = {ExactMatch(id, hotels[0]), ExactMatch(id, hotels[1]), ExactMatch(id, hotels[2]),
+                         ExactMatch(id, hotels[3])};
 
     TEST_EQUAL(stats.m_numShownResults, 4, ());
     TEST(MatchResults(m_dataSource, rules, request.Results()), ());
@@ -135,21 +132,21 @@ UNIT_CLASS_TEST(InteractiveSearchTest, NearbyFeaturesInViewport)
   SearchParams params;
   params.m_query = "cafe";
   params.m_inputLocale = "en";
-  params.m_viewport = { -0.5, -0.5, 0.5, 0.5 };
+  params.m_viewport = {-0.5, -0.5, 0.5, 0.5};
   params.m_mode = Mode::Viewport;
-  params.m_minDistanceOnMapBetweenResults = { kEps * 0.9, kEps * 0.9 };
+  params.m_minDistanceOnMapBetweenResults = {kEps * 0.9, kEps * 0.9};
   params.m_suggestsEnabled = false;
 
   {
     TestSearchRequest request(m_engine, params);
     request.Run();
 
-    TEST(MatchResults(m_dataSource,
-                      Rules{ExactMatch(id, cafe1), ExactMatch(id, cafe2), ExactMatch(id, cafe3)},
-                      request.Results()), ());
+    TEST(MatchResults(m_dataSource, Rules{ExactMatch(id, cafe1), ExactMatch(id, cafe2), ExactMatch(id, cafe3)},
+                      request.Results()),
+         ());
   }
 
-  params.m_minDistanceOnMapBetweenResults = { kEps * 1.1, kEps * 1.1 };
+  params.m_minDistanceOnMapBetweenResults = {kEps * 1.1, kEps * 1.1};
 
   {
     TestSearchRequest request(m_engine, params);
@@ -158,7 +155,8 @@ UNIT_CLASS_TEST(InteractiveSearchTest, NearbyFeaturesInViewport)
     auto const & results = request.Results();
 
     TEST(MatchResults(m_dataSource, Rules{ExactMatch(id, cafe1), ExactMatch(id, cafe3)}, results) ||
-         MatchResults(m_dataSource, Rules{ExactMatch(id, cafe2)}, results), ());
+             MatchResults(m_dataSource, Rules{ExactMatch(id, cafe2)}, results),
+         ());
   }
 }
-} // namespace interactive_search_test
+}  // namespace interactive_search_test
diff --git a/libs/map/map_tests/address_tests.cpp b/libs/map/map_tests/address_tests.cpp
index e21b4d850..fc08d438e 100644
--- a/libs/map/map_tests/address_tests.cpp
+++ b/libs/map/map_tests/address_tests.cpp
@@ -26,8 +26,7 @@ void TestAddress(ReverseGeocoder & coder, ms::LatLon const & ll, std::string_vie
   ReverseGeocoder::Address addr;
   coder.GetNearbyAddress(mercator::FromLatLon(ll), addr);
 
-  std::string const expectedKey =
-      strings::ToUtf8(GetStreetNameAsKey(street, false /* ignoreStreetSynonyms */));
+  std::string const expectedKey = strings::ToUtf8(GetStreetNameAsKey(street, false /* ignoreStreetSynonyms */));
   std::string const resultKey =
       strings::ToUtf8(GetStreetNameAsKey(addr.m_street.m_name, false /* ignoreStreetSynonyms */));
 
@@ -39,8 +38,8 @@ void TestAddress(ReverseGeocoder & coder, std::shared_ptr<MwmInfo> mwmInfo, ms::
                  StringUtf8Multilang const & streetNames, std::string const & houseNumber)
 {
   feature::NameParamsOut out;
-  feature::GetReadableName({ streetNames, mwmInfo->GetRegionData(), languages::GetCurrentMapLanguage(),
-                             false /* allowTranslit */ }, out);
+  feature::GetReadableName(
+      {streetNames, mwmInfo->GetRegionData(), languages::GetCurrentMapLanguage(), false /* allowTranslit */}, out);
 
   TestAddress(coder, ll, out.primary, houseNumber);
 }
@@ -104,4 +103,4 @@ UNIT_TEST(ReverseGeocoder_Smoke)
     TestAddress(coder, mwmInfo, {53.89745, 27.55835}, streetNames, "18А");
   }
 }
-} // namespace address_tests
+}  // namespace address_tests
diff --git a/libs/map/map_tests/bookmarks_test.cpp b/libs/map/map_tests/bookmarks_test.cpp
index 0156d48d7..61d44ed9d 100644
--- a/libs/map/map_tests/bookmarks_test.cpp
+++ b/libs/map/map_tests/bookmarks_test.cpp
@@ -38,115 +38,114 @@ char const * kmlString =
     "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
     "<kml xmlns=\"http://earth.google.com/kml/2.2\">"
     "<Document>"
-      "<name>MapName</name>"
-      "<description><![CDATA[MapDescription]]></description>"
-      "<visibility>0</visibility>"
-      "<Style id=\"placemark-blue\">"
-        "<IconStyle>"
-          "<Icon>"
-            "<href>https://comaps.at/placemarks/placemark-blue.png</href>"
-          "</Icon>"
-        "</IconStyle>"
-      "</Style>"
-      "<Style id=\"placemark-brown\">"
-        "<IconStyle>"
-          "<Icon>"
-            "<href>https://comaps.at/placemarks/placemark-brown.png</href>"
-          "</Icon>"
-        "</IconStyle>"
-      "</Style>"
-      "<Style id=\"placemark-green\">"
-        "<IconStyle>"
-          "<Icon>"
-            "<href>https://comaps.at/placemarks/placemark-green.png</href>"
-          "</Icon>"
-        "</IconStyle>"
-      "</Style>"
-      "<Style id=\"placemark-orange\">"
-        "<IconStyle>"
-          "<Icon>"
-            "<href>https://comaps.at/placemarks/placemark-orange.png</href>"
-          "</Icon>"
-        "</IconStyle>"
-      "</Style>"
-      "<Style id=\"placemark-pink\">"
-        "<IconStyle>"
-          "<Icon>"
-            "<href>https://comaps.at/placemarks/placemark-pink.png</href>"
-          "</Icon>"
-        "</IconStyle>"
-      "</Style>"
-      "<Style id=\"placemark-purple\">"
-        "<IconStyle>"
-          "<Icon>"
-            "<href>https://comaps.at/placemarks/placemark-purple.png</href>"
-          "</Icon>"
-        "</IconStyle>"
-      "</Style>"
-      "<Style id=\"placemark-red\">"
-        "<IconStyle>"
-          "<Icon>"
-            "<href>https://comaps.at/placemarks/placemark-red.png</href>"
-          "</Icon>"
-        "</IconStyle>"
-      "</Style>"
-      "<Placemark>"
-        "<name>Nebraska</name>"
-        "<description><![CDATA[]]></description>"
-        "<styleUrl>#placemark-red</styleUrl>"
-        "<Point>"
-          "<coordinates>-99.901810,41.492538,0.000000</coordinates>"
-        "</Point>"
-      "</Placemark>"
-      "<Placemark>"
-        "<name>Monongahela National Forest</name>"
-        "<description><![CDATA[Huttonsville, WV 26273<br>]]></description>"
-        "<styleUrl>#placemark-pink</styleUrl>"
-        "<TimeStamp>"
-          "<when>1986-08-12T07:10:43Z</when>"
-        "</TimeStamp>"
-        "<Point>"
-          "<coordinates>-79.829674,38.627785,0.000000</coordinates>"
-        "</Point>"
-      "</Placemark>"
-      "<Placemark>"
-        "<name>From: Минск, Минская область, Беларусь</name>"
-        "<description><![CDATA[]]></description>"
-        "<styleUrl>#placemark-blue</styleUrl>"
-        "<TimeStamp>"
-          "<when>1998-03-03T03:04:48+01:30</when>"
-        "</TimeStamp>"
-        "<Point>"
-          "<coordinates>27.566765,53.900047,0</coordinates>"
-        "</Point>"
-      "</Placemark>"
-      "<Placemark>"
-        "<name><![CDATA[<MWM & Sons>]]></name>"
-        "<description><![CDATA[Amps & <brackets>]]></description>"
-        "<styleUrl>#placemark-green</styleUrl>"
-        "<TimeStamp>"
-          "<when>2048 bytes in two kilobytes - some invalid timestamp</when>"
-        "</TimeStamp>"
-        "<Point>"
-          "<coordinates>27.551532,53.89306</coordinates>"
-        "</Point>"
-      "</Placemark>"
+    "<name>MapName</name>"
+    "<description><![CDATA[MapDescription]]></description>"
+    "<visibility>0</visibility>"
+    "<Style id=\"placemark-blue\">"
+    "<IconStyle>"
+    "<Icon>"
+    "<href>https://comaps.at/placemarks/placemark-blue.png</href>"
+    "</Icon>"
+    "</IconStyle>"
+    "</Style>"
+    "<Style id=\"placemark-brown\">"
+    "<IconStyle>"
+    "<Icon>"
+    "<href>https://comaps.at/placemarks/placemark-brown.png</href>"
+    "</Icon>"
+    "</IconStyle>"
+    "</Style>"
+    "<Style id=\"placemark-green\">"
+    "<IconStyle>"
+    "<Icon>"
+    "<href>https://comaps.at/placemarks/placemark-green.png</href>"
+    "</Icon>"
+    "</IconStyle>"
+    "</Style>"
+    "<Style id=\"placemark-orange\">"
+    "<IconStyle>"
+    "<Icon>"
+    "<href>https://comaps.at/placemarks/placemark-orange.png</href>"
+    "</Icon>"
+    "</IconStyle>"
+    "</Style>"
+    "<Style id=\"placemark-pink\">"
+    "<IconStyle>"
+    "<Icon>"
+    "<href>https://comaps.at/placemarks/placemark-pink.png</href>"
+    "</Icon>"
+    "</IconStyle>"
+    "</Style>"
+    "<Style id=\"placemark-purple\">"
+    "<IconStyle>"
+    "<Icon>"
+    "<href>https://comaps.at/placemarks/placemark-purple.png</href>"
+    "</Icon>"
+    "</IconStyle>"
+    "</Style>"
+    "<Style id=\"placemark-red\">"
+    "<IconStyle>"
+    "<Icon>"
+    "<href>https://comaps.at/placemarks/placemark-red.png</href>"
+    "</Icon>"
+    "</IconStyle>"
+    "</Style>"
+    "<Placemark>"
+    "<name>Nebraska</name>"
+    "<description><![CDATA[]]></description>"
+    "<styleUrl>#placemark-red</styleUrl>"
+    "<Point>"
+    "<coordinates>-99.901810,41.492538,0.000000</coordinates>"
+    "</Point>"
+    "</Placemark>"
+    "<Placemark>"
+    "<name>Monongahela National Forest</name>"
+    "<description><![CDATA[Huttonsville, WV 26273<br>]]></description>"
+    "<styleUrl>#placemark-pink</styleUrl>"
+    "<TimeStamp>"
+    "<when>1986-08-12T07:10:43Z</when>"
+    "</TimeStamp>"
+    "<Point>"
+    "<coordinates>-79.829674,38.627785,0.000000</coordinates>"
+    "</Point>"
+    "</Placemark>"
+    "<Placemark>"
+    "<name>From: Минск, Минская область, Беларусь</name>"
+    "<description><![CDATA[]]></description>"
+    "<styleUrl>#placemark-blue</styleUrl>"
+    "<TimeStamp>"
+    "<when>1998-03-03T03:04:48+01:30</when>"
+    "</TimeStamp>"
+    "<Point>"
+    "<coordinates>27.566765,53.900047,0</coordinates>"
+    "</Point>"
+    "</Placemark>"
+    "<Placemark>"
+    "<name><![CDATA[<MWM & Sons>]]></name>"
+    "<description><![CDATA[Amps & <brackets>]]></description>"
+    "<styleUrl>#placemark-green</styleUrl>"
+    "<TimeStamp>"
+    "<when>2048 bytes in two kilobytes - some invalid timestamp</when>"
+    "</TimeStamp>"
+    "<Point>"
+    "<coordinates>27.551532,53.89306</coordinates>"
+    "</Point>"
+    "</Placemark>"
     "</Document>"
     "</kml>";
 
-#define BM_CALLBACKS {                                                            \
-    []() -> StringsBundle const &                                                \
-    {                                                                            \
-      static StringsBundle const dummyBundle;                                    \
-      return dummyBundle;                                                        \
-    },                                                                           \
-    static_cast<BookmarkManager::Callbacks::GetSeacrhAPIFn>(nullptr),            \
-    static_cast<BookmarkManager::Callbacks::CreatedBookmarksCallback>(nullptr),  \
-    static_cast<BookmarkManager::Callbacks::UpdatedBookmarksCallback>(nullptr),  \
-    static_cast<BookmarkManager::Callbacks::DeletedBookmarksCallback>(nullptr),  \
-    static_cast<BookmarkManager::Callbacks::AttachedBookmarksCallback>(nullptr), \
-    static_cast<BookmarkManager::Callbacks::DetachedBookmarksCallback>(nullptr)  \
-  }
+#define BM_CALLBACKS                                                            \
+  {[]() -> StringsBundle const &                                                \
+  {                                                                             \
+    static StringsBundle const dummyBundle;                                     \
+    return dummyBundle;                                                         \
+  },                                                                            \
+   static_cast<BookmarkManager::Callbacks::GetSeacrhAPIFn>(nullptr),            \
+   static_cast<BookmarkManager::Callbacks::CreatedBookmarksCallback>(nullptr),  \
+   static_cast<BookmarkManager::Callbacks::UpdatedBookmarksCallback>(nullptr),  \
+   static_cast<BookmarkManager::Callbacks::DeletedBookmarksCallback>(nullptr),  \
+   static_cast<BookmarkManager::Callbacks::AttachedBookmarksCallback>(nullptr), \
+   static_cast<BookmarkManager::Callbacks::DetachedBookmarksCallback>(nullptr)}
 
 void CheckBookmarks(BookmarkManager const & bmManager, kml::MarkGroupId groupId)
 {
@@ -198,7 +197,7 @@ UNIT_CLASS_TEST(Runner, Bookmarks_ImportKML)
 
   BookmarkManager::KMLDataCollection kmlDataCollection;
 
-  kmlDataCollection.emplace_back(""/* filePath */,
+  kmlDataCollection.emplace_back("" /* filePath */,
                                  LoadKmlData(MemReader(kmlString, strlen(kmlString)), KmlFileType::Text));
   TEST(kmlDataCollection.back().second, ());
   bmManager.CreateCategories(std::move(kmlDataCollection));
@@ -216,17 +215,20 @@ UNIT_CLASS_TEST(Runner, Bookmarks_ExportKML)
 {
   string const dir = GetBookmarksDirectory();
   bool const delDirOnExit = Platform::MkDir(dir) == Platform::ERR_OK;
-  SCOPE_GUARD(dirDeleter, [&](){ if (delDirOnExit) (void)Platform::RmDir(dir); });
+  SCOPE_GUARD(dirDeleter, [&]()
+  {
+    if (delDirOnExit)
+      (void)Platform::RmDir(dir);
+  });
   string const ext = ".kmb";
   string const fileName = base::JoinPath(dir, "UnitTestBookmarks" + ext);
-  SCOPE_GUARD(fileDeleter, [&](){ (void)base::DeleteFileX(fileName); });
+  SCOPE_GUARD(fileDeleter, [&]() { (void)base::DeleteFileX(fileName); });
 
   BookmarkManager bmManager(BM_CALLBACKS);
   bmManager.EnableTestMode(true);
 
   BookmarkManager::KMLDataCollection kmlDataCollection1;
-  kmlDataCollection1.emplace_back("",
-                                  LoadKmlData(MemReader(kmlString, strlen(kmlString)), KmlFileType::Text));
+  kmlDataCollection1.emplace_back("", LoadKmlData(MemReader(kmlString, strlen(kmlString)), KmlFileType::Text));
   bmManager.CreateCategories(std::move(kmlDataCollection1));
   TEST_EQUAL(bmManager.GetBmGroupsCount(), 1, ());
 
@@ -283,40 +285,40 @@ UNIT_CLASS_TEST(Runner, Bookmarks_ExportKML)
 
 namespace
 {
-  void DeleteCategoryFiles(vector<string> const & arrFiles)
-  {
-    string const path = GetBookmarksDirectory();
-    string const extension = ".kmb";
-    for (auto const & fileName : arrFiles)
-      FileWriter::DeleteFileX(base::JoinPath(path, fileName + extension));
-  }
+void DeleteCategoryFiles(vector<string> const & arrFiles)
+{
+  string const path = GetBookmarksDirectory();
+  string const extension = ".kmb";
+  for (auto const & fileName : arrFiles)
+    FileWriter::DeleteFileX(base::JoinPath(path, fileName + extension));
+}
 
-  UserMark const * GetMark(Framework & fm, m2::PointD const & pt)
-  {
-    m2::AnyRectD rect;
-    fm.GetTouchRect(fm.GtoP(pt), 20, rect);
+UserMark const * GetMark(Framework & fm, m2::PointD const & pt)
+{
+  m2::AnyRectD rect;
+  fm.GetTouchRect(fm.GtoP(pt), 20, rect);
 
-    return fm.GetBookmarkManager().FindNearestUserMark(rect);
-  }
+  return fm.GetBookmarkManager().FindNearestUserMark(rect);
+}
 
-  Bookmark const * GetBookmark(Framework & fm, m2::PointD const & pt)
-  {
-    auto const * mark = GetMark(fm, pt);
-    ASSERT(mark, ());
-    ASSERT(mark->GetMarkType() == UserMark::BOOKMARK, ());
-    return dynamic_cast<Bookmark const *>(mark);
-  }
+Bookmark const * GetBookmark(Framework & fm, m2::PointD const & pt)
+{
+  auto const * mark = GetMark(fm, pt);
+  ASSERT(mark, ());
+  ASSERT(mark->GetMarkType() == UserMark::BOOKMARK, ());
+  return dynamic_cast<Bookmark const *>(mark);
+}
 
-  Bookmark const * GetBookmarkPxPoint(Framework & fm, m2::PointD const & pt)
-  {
-    return GetBookmark(fm, fm.PtoG(pt));
-  }
+Bookmark const * GetBookmarkPxPoint(Framework & fm, m2::PointD const & pt)
+{
+  return GetBookmark(fm, fm.PtoG(pt));
+}
 
-  bool IsValidBookmark(Framework & fm, m2::PointD const & pt)
-  {
-    auto const * mark = GetMark(fm, pt);
-    return (mark != nullptr) && (mark->GetMarkType() == UserMark::BOOKMARK);
-  }
+bool IsValidBookmark(Framework & fm, m2::PointD const & pt)
+{
+  auto const * mark = GetMark(fm, pt);
+  return (mark != nullptr) && (mark->GetMarkType() == UserMark::BOOKMARK);
+}
 }  // namespace
 
 UNIT_TEST(Bookmarks_Timestamp)
@@ -348,7 +350,7 @@ UNIT_TEST(Bookmarks_Timestamp)
   Bookmark const * pBm3 = bmManager.GetEditSession().CreateBookmark(std::move(b22), cat2);
 
   // Check bookmarks order here. First added should be in the bottom of the list.
-  auto const firstId = * bmManager.GetUserMarkIds(cat1).rbegin();
+  auto const firstId = *bmManager.GetUserMarkIds(cat1).rbegin();
   TEST_EQUAL(firstId, pBm1->GetId(), ());
 
   Bookmark const * pBm01 = bmManager.GetBookmark(pBm1->GetId());
@@ -377,7 +379,7 @@ UNIT_TEST(Bookmarks_Getting)
   fm.ShowRect(m2::RectD(0, 0, 80, 40));
 
   // This is not correct because Framework::OnSize doesn't work until SetRenderPolicy is called.
-  //TEST(AlmostEqualULPs(m2::PointD(400, 200), pixC), (pixC));
+  // TEST(AlmostEqualULPs(m2::PointD(400, 200), pixC), (pixC));
 
   BookmarkManager & bmManager = fm.GetBookmarkManager();
   bmManager.EnableTestMode(true);
@@ -450,8 +452,8 @@ void CheckPlace(Framework const & fm, std::shared_ptr<MwmInfo> const & mwmInfo,
   auto const info = fm.GetAddressAtPoint(mercator::FromLatLon(lat, lon));
 
   feature::NameParamsOut out;
-  feature::GetReadableName({ streetNames, mwmInfo->GetRegionData(), languages::GetCurrentMapLanguage(),
-                             false /* allowTranslit */ }, out);
+  feature::GetReadableName(
+      {streetNames, mwmInfo->GetRegionData(), languages::GetCurrentMapLanguage(), false /* allowTranslit */}, out);
 
   TEST_EQUAL(info.GetStreetName(), out.primary, ());
   TEST_EQUAL(info.GetHouseNumber(), houseNumber, ());
@@ -485,7 +487,7 @@ UNIT_TEST(Bookmarks_AddressInfo)
 UNIT_TEST(Bookmarks_IllegalFileName)
 {
   vector<string> const arrIllegal = {"?", "?|", "ч\"x", "|x:", "x<>y", "xy*地圖"};
-  vector<string> const arrLegal =   {"",  "",   "чx",   "x",   "xy",   "xy地圖"};
+  vector<string> const arrLegal = {"", "", "чx", "x", "xy", "xy地圖"};
 
   for (size_t i = 0; i < arrIllegal.size(); ++i)
     TEST_EQUAL(arrLegal[i], RemoveInvalidSymbols(arrIllegal[i]), ());
@@ -567,8 +569,7 @@ UNIT_TEST(Bookmarks_AddingMoving)
   TEST_EQUAL(bmManager.GetBmGroupsCount(), 2, ());
   mark = GetBookmarkPxPoint(fm, pixelPoint);
   TEST_EQUAL(bmManager.GetCategoryName(mark->GetGroupId()), "cat1", ());
-  TEST_EQUAL(bmManager.GetUserMarkIds(cat1).size(), 2,
-             ("Bookmark wasn't moved from one category to another"));
+  TEST_EQUAL(bmManager.GetUserMarkIds(cat1).size(), 2, ("Bookmark wasn't moved from one category to another"));
   TEST_EQUAL(kml::GetDefaultStr(mark->GetName()), "name2", ());
   TEST_EQUAL(mark->GetColor(), kml::PredefinedColor::Blue, ());
 
@@ -628,61 +629,50 @@ UNIT_TEST(Bookmarks_Sorting)
   double constexpr kNearR = 20 * 1000;
   m2::PointD const myPos = mercator::GetSmPoint(kMoscowCenter, -kNearR, 0.0);
 
-  std::vector<TestMarkData> const testMarksData =
-  {
-    {0, mercator::GetSmPoint(myPos, kNearR * 0.07, 0.0), kDay + std::chrono::hours(1), {"historic-ruins"}},
-    {1, mercator::GetSmPoint(myPos, kNearR * 0.06, 0.0), kUnknownTime, {"amenity-restaurant", "cuisine-sushi"}},
-    {2, mercator::GetSmPoint(myPos, kNearR * 0.05, 0.0), kUnknownTime, {"shop-music", "shop-gift"}},
-    {3, mercator::GetSmPoint(myPos, kNearR * 1.01, 0.0), kWeek + std::chrono::hours(2), {"historic-castle"}},
-    {4, mercator::GetSmPoint(myPos, kNearR * 0.04, 0.0), kWeek + std::chrono::hours(3), {"amenity-fast_food"}},
-    {5, mercator::GetSmPoint(myPos, kNearR * 1.02, 0.0), kMonth + std::chrono::hours(1), {"historic-memorial"}},
-    {6, mercator::GetSmPoint(myPos, kNearR * 0.03, 0.0), kMonth + std::chrono::hours(2), {"shop-music"}},
-    {7, mercator::GetSmPoint(myPos, kNearR * 1.05, 0.0), kUnknownTime, {"amenity-cinema"}},
-    {8, mercator::GetSmPoint(myPos, kNearR * 0.02, 0.0), std::chrono::hours(1), {"leisure-stadium"}},
-    {9, mercator::GetSmPoint(myPos, kNearR * 1.06, 0.0), kDay + std::chrono::hours(3), {"amenity-bar"}},
-    {10, mercator::GetSmPoint(myPos, kNearR * 1.03, 0.0), kYear + std::chrono::hours(3), {"historic-castle"}},
-    {11, m2::PointD(0.0, 0.0), kWeek + std::chrono::hours(1), {}},
-    {12, mercator::GetSmPoint(myPos, kNearR * 1.04, 0.0), kDay + std::chrono::hours(2), {"shop-music"}},
+  std::vector<TestMarkData> const testMarksData = {
+      {0, mercator::GetSmPoint(myPos, kNearR * 0.07, 0.0), kDay + std::chrono::hours(1), {"historic-ruins"}},
+      {1, mercator::GetSmPoint(myPos, kNearR * 0.06, 0.0), kUnknownTime, {"amenity-restaurant", "cuisine-sushi"}},
+      {2, mercator::GetSmPoint(myPos, kNearR * 0.05, 0.0), kUnknownTime, {"shop-music", "shop-gift"}},
+      {3, mercator::GetSmPoint(myPos, kNearR * 1.01, 0.0), kWeek + std::chrono::hours(2), {"historic-castle"}},
+      {4, mercator::GetSmPoint(myPos, kNearR * 0.04, 0.0), kWeek + std::chrono::hours(3), {"amenity-fast_food"}},
+      {5, mercator::GetSmPoint(myPos, kNearR * 1.02, 0.0), kMonth + std::chrono::hours(1), {"historic-memorial"}},
+      {6, mercator::GetSmPoint(myPos, kNearR * 0.03, 0.0), kMonth + std::chrono::hours(2), {"shop-music"}},
+      {7, mercator::GetSmPoint(myPos, kNearR * 1.05, 0.0), kUnknownTime, {"amenity-cinema"}},
+      {8, mercator::GetSmPoint(myPos, kNearR * 0.02, 0.0), std::chrono::hours(1), {"leisure-stadium"}},
+      {9, mercator::GetSmPoint(myPos, kNearR * 1.06, 0.0), kDay + std::chrono::hours(3), {"amenity-bar"}},
+      {10, mercator::GetSmPoint(myPos, kNearR * 1.03, 0.0), kYear + std::chrono::hours(3), {"historic-castle"}},
+      {11, m2::PointD(0.0, 0.0), kWeek + std::chrono::hours(1), {}},
+      {12, mercator::GetSmPoint(myPos, kNearR * 1.04, 0.0), kDay + std::chrono::hours(2), {"shop-music"}},
   };
 
-  std::vector<TestTrackData> const testTracksData =
-  {
-    {0, "Z Last Track", kDay + std::chrono::hours(1)},
-    {1, "Middle Track", kUnknownTime},
-    {2, "First Track", kMonth + std::chrono::hours(1)}
-  };
+  std::vector<TestTrackData> const testTracksData = {{0, "Z Last Track", kDay + std::chrono::hours(1)},
+                                                     {1, "Middle Track", kUnknownTime},
+                                                     {2, "First Track", kMonth + std::chrono::hours(1)}};
 
-  BookmarkManager::SortedBlocksCollection const expectedSortedByDistance =
-  {
-    {BookmarkManager::GetTracksSortedBlockName(), {}, {0, 1, 2}},
-    {BookmarkManager::GetNearMeSortedBlockName(), {8, 6, 4, 2, 1, 0}, {}},
-    {addrMoscow, {3, 5, 10, 12, 7, 9}, {}},
-    {BookmarkManager::GetOthersSortedBlockName(), {11}, {}}
-  };
+  BookmarkManager::SortedBlocksCollection const expectedSortedByDistance = {
+      {BookmarkManager::GetTracksSortedBlockName(), {}, {0, 1, 2}},
+      {BookmarkManager::GetNearMeSortedBlockName(), {8, 6, 4, 2, 1, 0}, {}},
+      {addrMoscow, {3, 5, 10, 12, 7, 9}, {}},
+      {BookmarkManager::GetOthersSortedBlockName(), {11}, {}}};
 
-  BookmarkManager::SortedBlocksCollection const expectedSortedByTime =
-  {
-    {BookmarkManager::GetTracksSortedBlockName(), {}, {0, 2, 1}},
-    {BookmarkManager::GetSortedByTimeBlockName(BookmarkManager::SortedByTimeBlockType::WeekAgo), {8, 0, 12, 9}, {}},
-    {BookmarkManager::GetSortedByTimeBlockName(BookmarkManager::SortedByTimeBlockType::MonthAgo), {11, 3, 4}, {}},
-    {BookmarkManager::GetSortedByTimeBlockName(BookmarkManager::SortedByTimeBlockType::MoreThanMonthAgo), {5, 6}, {}},
-    {BookmarkManager::GetSortedByTimeBlockName(BookmarkManager::SortedByTimeBlockType::MoreThanYearAgo), {10}, {}},
-    {BookmarkManager::GetSortedByTimeBlockName(BookmarkManager::SortedByTimeBlockType::Others), {7, 2, 1}, {}}
-  };
+  BookmarkManager::SortedBlocksCollection const expectedSortedByTime = {
+      {BookmarkManager::GetTracksSortedBlockName(), {}, {0, 2, 1}},
+      {BookmarkManager::GetSortedByTimeBlockName(BookmarkManager::SortedByTimeBlockType::WeekAgo), {8, 0, 12, 9}, {}},
+      {BookmarkManager::GetSortedByTimeBlockName(BookmarkManager::SortedByTimeBlockType::MonthAgo), {11, 3, 4}, {}},
+      {BookmarkManager::GetSortedByTimeBlockName(BookmarkManager::SortedByTimeBlockType::MoreThanMonthAgo), {5, 6}, {}},
+      {BookmarkManager::GetSortedByTimeBlockName(BookmarkManager::SortedByTimeBlockType::MoreThanYearAgo), {10}, {}},
+      {BookmarkManager::GetSortedByTimeBlockName(BookmarkManager::SortedByTimeBlockType::Others), {7, 2, 1}, {}}};
 
-  BookmarkManager::SortedBlocksCollection const expectedSortedByType =
-  {
-    {BookmarkManager::GetTracksSortedBlockName(), {}, {0, 1, 2}},
-    {GetLocalizedBookmarkBaseType(BookmarkBaseType::Sights), {0, 3, 5, 10}, {}},
-    {GetLocalizedBookmarkBaseType(BookmarkBaseType::Food), {9, 4, 1}, {}},
-    {GetLocalizedBookmarkBaseType(BookmarkBaseType::Shop), {12, 6, 2}, {}},
-    {BookmarkManager::GetOthersSortedBlockName(), {8, 11, 7}, {}}
-  };
+  BookmarkManager::SortedBlocksCollection const expectedSortedByType = {
+      {BookmarkManager::GetTracksSortedBlockName(), {}, {0, 1, 2}},
+      {GetLocalizedBookmarkBaseType(BookmarkBaseType::Sights), {0, 3, 5, 10}, {}},
+      {GetLocalizedBookmarkBaseType(BookmarkBaseType::Food), {9, 4, 1}, {}},
+      {GetLocalizedBookmarkBaseType(BookmarkBaseType::Shop), {12, 6, 2}, {}},
+      {BookmarkManager::GetOthersSortedBlockName(), {8, 11, 7}, {}}};
 
-  BookmarkManager::SortedBlocksCollection const expectedSortedByName =
-  {
-    {BookmarkManager::GetTracksSortedBlockName(), {}, {2, 1, 0}},
-    {BookmarkManager::GetBookmarksSortedBlockName(), {11, 9, 7, 4, 1, 10, 3, 5, 0, 8, 12, 6, 2}, {}},
+  BookmarkManager::SortedBlocksCollection const expectedSortedByName = {
+      {BookmarkManager::GetTracksSortedBlockName(), {}, {2, 1, 0}},
+      {BookmarkManager::GetBookmarksSortedBlockName(), {11, 9, 7, 4, 1, 10, 3, 5, 0, 8, 12, 6, 2}, {}},
   };
 
   auto const kBerlin1 = mercator::FromLatLon(52.5038994, 13.3982282);
@@ -699,21 +689,20 @@ UNIT_TEST(Bookmarks_Sorting)
   auto const kVladimir = mercator::FromLatLon(56.2102137, 40.5195297);
   auto const kBermuda = mercator::FromLatLon(32.2946391, -64.7820014);
 
-  std::vector<TestMarkData> const testMarksData2 =
-  {
-    {100,  kBerlin1, kUnknownTime, {"amenity", "building", "wheelchair-yes", "tourism-museum"}},
-    {101,  kGreenland, kUnknownTime, {}},
-    {102,  kVladimir, kUnknownTime, {"tourism-artwork"}},
-    {103,  kKathmandu, kUnknownTime, {"internet_access-wlan", "wheelchair-no", "amenity-cafe"}},
-    {104,  kMinsk1, kUnknownTime, {"amenity-place_of_worship"}},
-    {105,  kBerlin2, kUnknownTime, {"building", "amenity-place_of_worship-christian"}},
-    {106,  kMoscow2, kUnknownTime, {"tourism-museum"}},
-    {107,  kMinsk2, kUnknownTime, {"amenity-restaurant"}},
-    {108,  kMinsk3, kUnknownTime, {"amenity-place_of_worship-jewish"}},
-    {109,  kWashington, kUnknownTime, {"amenity-restaurant"}},
-    {110, kBerlin3, kUnknownTime, {"tourism-museum"}},
-    {111, kBermuda, kUnknownTime, {"amenity-cafe"}},
-    {112, kMoscow1, kUnknownTime, {"leisure-park"}},
+  std::vector<TestMarkData> const testMarksData2 = {
+      {100, kBerlin1, kUnknownTime, {"amenity", "building", "wheelchair-yes", "tourism-museum"}},
+      {101, kGreenland, kUnknownTime, {}},
+      {102, kVladimir, kUnknownTime, {"tourism-artwork"}},
+      {103, kKathmandu, kUnknownTime, {"internet_access-wlan", "wheelchair-no", "amenity-cafe"}},
+      {104, kMinsk1, kUnknownTime, {"amenity-place_of_worship"}},
+      {105, kBerlin2, kUnknownTime, {"building", "amenity-place_of_worship-christian"}},
+      {106, kMoscow2, kUnknownTime, {"tourism-museum"}},
+      {107, kMinsk2, kUnknownTime, {"amenity-restaurant"}},
+      {108, kMinsk3, kUnknownTime, {"amenity-place_of_worship-jewish"}},
+      {109, kWashington, kUnknownTime, {"amenity-restaurant"}},
+      {110, kBerlin3, kUnknownTime, {"tourism-museum"}},
+      {111, kBermuda, kUnknownTime, {"amenity-cafe"}},
+      {112, kMoscow1, kUnknownTime, {"leisure-park"}},
   };
 
   m2::PointD const myPos2 = mercator::GetSmPoint(kVladimir, 2.0 * kNearR, 2.0 * kNearR);
@@ -726,81 +715,57 @@ UNIT_TEST(Bookmarks_Sorting)
   auto const addrVladimir = fm.GetBookmarkManager().GetLocalizedRegionAddress(kVladimir);
   auto const addrBermuda = fm.GetBookmarkManager().GetLocalizedRegionAddress(kBermuda);
 
-  BookmarkManager::SortedBlocksCollection const expectedSortedByDistance2 =
-  {
-    {addrVladimir, {102}, {}},
-    {addrMoscow, {106, 112}, {}},
-    {addrMinsk, {107, 104, 108}, {}},
-    {addrBerlin, {100, 105, 110}, {}},
-    {addrGreenland, {101}, {}},
-    {addrKathmandu, {103}, {}},
-    {addrWashington, {109}, {}},
-    {addrBermuda, {111}, {}},
+  BookmarkManager::SortedBlocksCollection const expectedSortedByDistance2 = {
+      {addrVladimir, {102}, {}},         {addrMoscow, {106, 112}, {}}, {addrMinsk, {107, 104, 108}, {}},
+      {addrBerlin, {100, 105, 110}, {}}, {addrGreenland, {101}, {}},   {addrKathmandu, {103}, {}},
+      {addrWashington, {109}, {}},       {addrBermuda, {111}, {}},
   };
 
-  BookmarkManager::SortedBlocksCollection const expectedSortedByType2 =
-  {
-    {GetLocalizedBookmarkBaseType(BookmarkBaseType::Food), {111, 109, 107, 103}, {}},
-    {GetLocalizedBookmarkBaseType(BookmarkBaseType::Museum), {110, 106, 100}, {}},
-    {GetLocalizedBookmarkBaseType(BookmarkBaseType::ReligiousPlace), {108, 105, 104}, {}},
-    {BookmarkManager::GetOthersSortedBlockName(), {112, 102, 101}, {}}
+  BookmarkManager::SortedBlocksCollection const expectedSortedByType2 = {
+      {GetLocalizedBookmarkBaseType(BookmarkBaseType::Food), {111, 109, 107, 103}, {}},
+      {GetLocalizedBookmarkBaseType(BookmarkBaseType::Museum), {110, 106, 100}, {}},
+      {GetLocalizedBookmarkBaseType(BookmarkBaseType::ReligiousPlace), {108, 105, 104}, {}},
+      {BookmarkManager::GetOthersSortedBlockName(), {112, 102, 101}, {}}};
+
+  std::vector<TestMarkData> const testMarksData3 = {
+      {200, {0.0, 0.0}, kUnknownTime, {"tourism-museum"}},
+      {201, {0.0, 0.0}, kUnknownTime, {"leisure-park"}},
+      {202, {0.0, 0.0}, kUnknownTime, {"tourism-artwork"}},
+      {203, {0.0, 0.0}, kUnknownTime, {"amenity-cafe"}},
+      {204, {0.0, 0.0}, kUnknownTime, {"amenity-place_of_worship"}},
+      {205, {0.0, 0.0}, kUnknownTime, {"amenity-place_of_worship-christian"}},
   };
 
-  std::vector<TestMarkData> const testMarksData3 =
-  {
-    {200,  {0.0, 0.0}, kUnknownTime, {"tourism-museum"}},
-    {201,  {0.0, 0.0}, kUnknownTime, {"leisure-park"}},
-    {202,  {0.0, 0.0}, kUnknownTime, {"tourism-artwork"}},
-    {203,  {0.0, 0.0}, kUnknownTime, {"amenity-cafe"}},
-    {204,  {0.0, 0.0}, kUnknownTime, {"amenity-place_of_worship"}},
-    {205,  {0.0, 0.0}, kUnknownTime, {"amenity-place_of_worship-christian"}},
+  std::vector<TestMarkData> const testMarksData4 = {
+      {300, {0.0, 0.0}, kUnknownTime, {"tourism-museum"}},           {301, {0.0, 0.0}, kUnknownTime, {"leisure-park"}},
+      {302, {0.0, 0.0}, kUnknownTime, {"tourism-artwork"}},          {303, {0.0, 0.0}, kUnknownTime, {"amenity-cafe"}},
+      {304, {0.0, 0.0}, kUnknownTime, {"amenity-place_of_worship"}}, {305, {0.0, 0.0}, kUnknownTime, {"tourism-hotel"}},
   };
 
-  std::vector<TestMarkData> const testMarksData4 =
-  {
-    {300,  {0.0, 0.0}, kUnknownTime, {"tourism-museum"}},
-    {301,  {0.0, 0.0}, kUnknownTime, {"leisure-park"}},
-    {302,  {0.0, 0.0}, kUnknownTime, {"tourism-artwork"}},
-    {303,  {0.0, 0.0}, kUnknownTime, {"amenity-cafe"}},
-    {304,  {0.0, 0.0}, kUnknownTime, {"amenity-place_of_worship"}},
-    {305,  {0.0, 0.0}, kUnknownTime, {"tourism-hotel"}},
-  };
+  BookmarkManager::SortedBlocksCollection expectedSortedByType4 = {
+      {GetLocalizedBookmarkBaseType(BookmarkBaseType::Hotel), {305}, {}},
+      {BookmarkManager::GetOthersSortedBlockName(), {304, 303, 302, 301, 300}, {}}};
 
-  BookmarkManager::SortedBlocksCollection expectedSortedByType4 =
-  {
-    {GetLocalizedBookmarkBaseType(BookmarkBaseType::Hotel), {305}, {}},
-    {BookmarkManager::GetOthersSortedBlockName(), {304, 303, 302, 301, 300}, {}}
-  };
+  std::vector<TestTrackData> const testTracksData5 = {
+      {40, "t", kUnknownTime}, {41, "a", kUnknownTime}, {42, "u", std::chrono::hours(1)}, {43, "a", kUnknownTime}};
 
-  std::vector<TestTrackData> const testTracksData5 =
-  {
-    {40, "t", kUnknownTime},
-    {41, "a", kUnknownTime},
-    {42, "u", std::chrono::hours(1)},
-    {43, "a", kUnknownTime}
-  };
+  BookmarkManager::SortedBlocksCollection const expectedSortedByTime5 = {
+      {BookmarkManager::GetTracksSortedBlockName(), {}, {42, 40, 41, 43}}};
 
-  BookmarkManager::SortedBlocksCollection const expectedSortedByTime5 =
-  {
-    {BookmarkManager::GetTracksSortedBlockName(), {}, {42, 40, 41, 43}}
-  };
+  std::vector<TestTrackData> const testTracksData6 = {
+      {50, "-11", kUnknownTime}, {51, "41", kUnknownTime}, {52, "", kUnknownTime}};
 
-  std::vector<TestTrackData> const testTracksData6 =
-  {
-    {50, "-11", kUnknownTime},
-    {51, "41", kUnknownTime},
-    {52, "", kUnknownTime}
-  };
-
-  auto const fillCategory = [&](kml::MarkGroupId cat, std::vector<TestMarkData> const & marksData, std::vector<TestTrackData> const & tracksData)
+  auto const fillCategory = [&](kml::MarkGroupId cat, std::vector<TestMarkData> const & marksData,
+                                std::vector<TestTrackData> const & tracksData)
   {
     auto es = bmManager.GetEditSession();
     for (auto const & [id, position, hours, types] : marksData)
     {
       kml::BookmarkData bmData;
       bmData.m_id = id;
-      bmData.m_name = kml::LocalizableString{{kml::kDefaultLangCode,
-          std::reduce(types.begin(), types.end(), std::string{}, [](auto const & sum, auto const & type) { return sum + type + " "; })}};
+      bmData.m_name = kml::LocalizableString{
+          {kml::kDefaultLangCode, std::reduce(types.begin(), types.end(), std::string{},
+                                              [](auto const & sum, auto const & type) { return sum + type + " "; })}};
       bmData.m_point = position;
       if (hours != kUnknownTime)
         bmData.m_timestamp = currentTime - hours;
@@ -847,11 +812,9 @@ UNIT_TEST(Bookmarks_Sorting)
     params.m_sortingType = sortingType;
     params.m_hasMyPosition = hasMyPosition;
     params.m_myPosition = myPosition;
-    params.m_onResults = [&sortedBlocks](BookmarkManager::SortedBlocksCollection && results,
-                                         BookmarkManager::SortParams::Status status)
-    {
-      sortedBlocks = std::move(results);
-    };
+    params.m_onResults =
+        [&sortedBlocks](BookmarkManager::SortedBlocksCollection && results, BookmarkManager::SortParams::Status status)
+    { sortedBlocks = std::move(results); };
     bmManager.GetSortedCategory(params);
     return sortedBlocks;
   };
@@ -860,13 +823,9 @@ UNIT_TEST(Bookmarks_Sorting)
     kml::MarkGroupId catId = bmManager.CreateBookmarkCategory("test", false);
     fillCategory(catId, testMarksData, testTracksData);
 
-    std::vector<BookmarkManager::SortingType> const expectedSortingTypes =
-    {
-      BookmarkManager::SortingType::ByType,
-      BookmarkManager::SortingType::ByDistance,
-      BookmarkManager::SortingType::ByTime,
-      BookmarkManager::SortingType::ByName
-    };
+    std::vector<BookmarkManager::SortingType> const expectedSortingTypes = {
+        BookmarkManager::SortingType::ByType, BookmarkManager::SortingType::ByDistance,
+        BookmarkManager::SortingType::ByTime, BookmarkManager::SortingType::ByName};
 
     auto const sortingTypes = bmManager.GetAvailableSortingTypes(catId, true);
     TEST(sortingTypes == expectedSortingTypes, ());
@@ -892,20 +851,18 @@ UNIT_TEST(Bookmarks_Sorting)
     kml::MarkGroupId const catId2 = bmManager.CreateBookmarkCategory("test2", false);
     fillCategory(catId2, testMarksData2, {} /* tracksData */);
 
-    std::vector<BookmarkManager::SortingType> const expectedSortingTypes2 =
-    {
-      BookmarkManager::SortingType::ByType,
-      BookmarkManager::SortingType::ByDistance,
-      BookmarkManager::SortingType::ByName,
+    std::vector<BookmarkManager::SortingType> const expectedSortingTypes2 = {
+        BookmarkManager::SortingType::ByType,
+        BookmarkManager::SortingType::ByDistance,
+        BookmarkManager::SortingType::ByName,
     };
 
     auto const sortingTypes2 = bmManager.GetAvailableSortingTypes(catId2, true);
     TEST(sortingTypes2 == expectedSortingTypes2, ());
 
-    std::vector<BookmarkManager::SortingType> expectedSortingTypes2_2 =
-    {
-      BookmarkManager::SortingType::ByType,
-      BookmarkManager::SortingType::ByName,
+    std::vector<BookmarkManager::SortingType> expectedSortingTypes2_2 = {
+        BookmarkManager::SortingType::ByType,
+        BookmarkManager::SortingType::ByName,
     };
 
     auto const sortingTypes2_2 = bmManager.GetAvailableSortingTypes(catId2, false);
@@ -915,8 +872,7 @@ UNIT_TEST(Bookmarks_Sorting)
     printBlocks("Sorted by type 2", sortedByType2);
     TEST(sortedByType2 == expectedSortedByType2, ());
 
-    auto const sortedByDistance2 = getSortedBokmarks(catId2, BookmarkManager::SortingType::ByDistance,
-                                                                  true, myPos2);
+    auto const sortedByDistance2 = getSortedBokmarks(catId2, BookmarkManager::SortingType::ByDistance, true, myPos2);
     printBlocks("Sorted by distance 2", sortedByDistance2);
     TEST(sortedByDistance2 == expectedSortedByDistance2, ());
   }
@@ -934,7 +890,8 @@ UNIT_TEST(Bookmarks_Sorting)
     kml::MarkGroupId const catId4 = bmManager.CreateBookmarkCategory("test4", false);
     fillCategory(catId4, testMarksData4, {} /* tracksData */);
 
-    std::vector<BookmarkManager::SortingType> const expectedSortingTypes4 = { BookmarkManager::SortingType::ByType, BookmarkManager::SortingType::ByName };
+    std::vector<BookmarkManager::SortingType> const expectedSortingTypes4 = {BookmarkManager::SortingType::ByType,
+                                                                             BookmarkManager::SortingType::ByName};
     auto const sortingTypes4 = bmManager.GetAvailableSortingTypes(catId4, false);
     TEST(sortingTypes4 == expectedSortingTypes4, ());
 
@@ -946,7 +903,8 @@ UNIT_TEST(Bookmarks_Sorting)
   {
     kml::MarkGroupId const catId5 = bmManager.CreateBookmarkCategory("test5", false);
     fillCategory(catId5, {} /* marksData */, testTracksData5);
-    std::vector<BookmarkManager::SortingType> const expectedSortingTypes5 = { BookmarkManager::SortingType::ByTime, BookmarkManager::SortingType::ByName };
+    std::vector<BookmarkManager::SortingType> const expectedSortingTypes5 = {BookmarkManager::SortingType::ByTime,
+                                                                             BookmarkManager::SortingType::ByName};
 
     auto const sortingTypes5 = bmManager.GetAvailableSortingTypes(catId5, false);
     TEST(sortingTypes5 == expectedSortingTypes5, ());
@@ -972,27 +930,27 @@ char const * kmlString2 =
     "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
     "<kml xmlns=\"http://earth.google.com/kml/2.1\">"
     "<Document>"
-     "<name>busparkplatz</name>"
-     "<Folder>"
-      "<name>Waypoint</name>"
-      "<Style id=\"poiIcon37\">"
-       "<IconStyle>"
-       "<scale>1</scale>"
-       "<Icon><href>http://maps.google.com/mapfiles/kml/shapes/placemark_circle.png</href></Icon>"
-       "<hotSpot x=\"0.5\" y=\"0\" xunits=\"fraction\" yunits=\"fraction\"/>"
-       "</IconStyle>"
-      "</Style>"
-      "<Placemark>"
-       "<name>[P] Silvrettastrae[Bieler Hhe]</name>"
-       "<description></description>"
-       "<styleUrl>#poiIcon37</styleUrl>"
-       "<Point>"
-        "<coordinates>10.09237,46.91741,0</coordinates>"
-       "</Point>"
-      "</Placemark>"
+    "<name>busparkplatz</name>"
+    "<Folder>"
+    "<name>Waypoint</name>"
+    "<Style id=\"poiIcon37\">"
+    "<IconStyle>"
+    "<scale>1</scale>"
+    "<Icon><href>http://maps.google.com/mapfiles/kml/shapes/placemark_circle.png</href></Icon>"
+    "<hotSpot x=\"0.5\" y=\"0\" xunits=\"fraction\" yunits=\"fraction\"/>"
+    "</IconStyle>"
+    "</Style>"
+    "<Placemark>"
+    "<name>[P] Silvrettastrae[Bieler Hhe]</name>"
+    "<description></description>"
+    "<styleUrl>#poiIcon37</styleUrl>"
+    "<Point>"
+    "<coordinates>10.09237,46.91741,0</coordinates>"
+    "</Point>"
+    "</Placemark>"
     "</Folder>"
-   "</Document>"
-   "</kml>";
+    "</Document>"
+    "</kml>";
 }
 
 UNIT_CLASS_TEST(Runner, Bookmarks_InnerFolder)
@@ -1037,34 +995,34 @@ char const * kmlString3 =
     "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
     "<kml xmlns=\"http://earth.google.com/kml/2.1\">"
     "<Document>"
-     "<name>3663 and M <![CDATA[&]]> J Seafood Branches</name>"
-     "<visibility>1</visibility>"
-      "<Placemark>"
-       "<name>![X1]{X2}(X3)</name>"
-       "<Point>"
-        "<coordinates>50, 50</coordinates>"
-       "</Point>"
-      "</Placemark>"
-   "</Document>"
-   "</kml>";
+    "<name>3663 and M <![CDATA[&]]> J Seafood Branches</name>"
+    "<visibility>1</visibility>"
+    "<Placemark>"
+    "<name>![X1]{X2}(X3)</name>"
+    "<Point>"
+    "<coordinates>50, 50</coordinates>"
+    "</Point>"
+    "</Placemark>"
+    "</Document>"
+    "</kml>";
 
-  bool EqualBookmarks(Bookmark const & b1, Bookmark const & b2)
-  {
-    if (b1.GetName() != b2.GetName())
-      return false;
-    if (b1.GetDescription() != b2.GetDescription())
-      return false;
-    if (b1.GetColor() != b2.GetColor())
-      return false;
-    if (b1.GetScale() != b2.GetScale())
-      return false;
-    if (!AlmostEqualAbs(b1.GetPivot(), b2.GetPivot(), 1e-6 /* eps*/))
-      return false;
+bool EqualBookmarks(Bookmark const & b1, Bookmark const & b2)
+{
+  if (b1.GetName() != b2.GetName())
+    return false;
+  if (b1.GetDescription() != b2.GetDescription())
+    return false;
+  if (b1.GetColor() != b2.GetColor())
+    return false;
+  if (b1.GetScale() != b2.GetScale())
+    return false;
+  if (!AlmostEqualAbs(b1.GetPivot(), b2.GetPivot(), 1e-6 /* eps*/))
+    return false;
 
-    // do not check timestamp
-    return true;
-  }
+  // do not check timestamp
+  return true;
 }
+}  // namespace
 
 UNIT_CLASS_TEST(Runner, Bookmarks_SpecialXMLNames)
 {
@@ -1074,7 +1032,7 @@ UNIT_CLASS_TEST(Runner, Bookmarks_SpecialXMLNames)
   auto const file1Name = "file1";
   BookmarkManager::KMLDataCollection kmlDataCollection1;
   kmlDataCollection1.emplace_back(file1Name /* filePath */,
-                                 LoadKmlData(MemReader(kmlString3, strlen(kmlString3)), KmlFileType::Text));
+                                  LoadKmlData(MemReader(kmlString3, strlen(kmlString3)), KmlFileType::Text));
   bmManager.CreateCategories(std::move(kmlDataCollection1));
 
   auto const & groupIds = bmManager.GetSortedBmGroupIdList();
@@ -1145,10 +1103,8 @@ UNIT_CLASS_TEST(Runner, TrackParsingTest_1)
   TEST_EQUAL(bmManager.GetTrackIds(catId).size(), 4, ());
 
   array<string, 4> const names = {{"Option1", "Pakkred1", "Pakkred2", "Pakkred3"}};
-  array<dp::Color, 4> constexpr col = {{dp::Color(230, 0, 0, 255),
-                                    dp::Color(171, 230, 0, 255),
-                                    dp::Color(0, 230, 117, 255),
-                                    dp::Color(0, 59, 230, 255)}};
+  array<dp::Color, 4> constexpr col = {{dp::Color(230, 0, 0, 255), dp::Color(171, 230, 0, 255),
+                                        dp::Color(0, 230, 117, 255), dp::Color(0, 59, 230, 255)}};
   array<double, 4> constexpr length = {{3525.46839061, 27172.44338132, 27046.0456586, 23967.35765800}};
   array<geometry::Altitude, 4> constexpr altitudes = {{0, 27, -3, -2}};
   size_t i = 0;
@@ -1246,9 +1202,7 @@ UNIT_CLASS_TEST(Runner, Bookmarks_Listeners)
       resultChanges.m_updatedMarks.insert(mark.m_bookmarkId);
   };
   auto const onDelete = [&resultChanges](vector<kml::MarkId> const & marks)
-  {
-    resultChanges.m_deletedMarks.insert(marks.begin(), marks.end());
-  };
+  { resultChanges.m_deletedMarks.insert(marks.begin(), marks.end()); };
   auto const onAttach = [&resultChanges](vector<BookmarkGroupInfo> const & groupMarksCollection)
   {
     for (auto const & group : groupMarksCollection)
@@ -1261,13 +1215,12 @@ UNIT_CLASS_TEST(Runner, Bookmarks_Listeners)
   };
 
   BookmarkManager::Callbacks callbacks(
-    []() -> StringsBundle const &
-    {
-      static StringsBundle const dummyBundle;
-      return dummyBundle;
-    },
-    static_cast<BookmarkManager::Callbacks::GetSeacrhAPIFn>(nullptr),
-    onCreate, onUpdate, onDelete, onAttach, onDetach);
+      []() -> StringsBundle const &
+  {
+    static StringsBundle const dummyBundle;
+    return dummyBundle;
+  }, static_cast<BookmarkManager::Callbacks::GetSeacrhAPIFn>(nullptr), onCreate, onUpdate, onDelete, onAttach,
+      onDetach);
 
   BookmarkManager bmManager(std::move(callbacks));
   bmManager.SetBookmarksChangedCallback([&bookmarksChanged]() { bookmarksChanged = true; });
@@ -1434,11 +1387,10 @@ UNIT_CLASS_TEST(Runner, Bookmarks_AutoSave)
 
 UNIT_CLASS_TEST(Runner, ExportAll)
 {
-  std::string const gpxFiles[] = {
-    GetPlatform().TestsDataPathForFile("test_data/gpx/route.gpx"),
-    GetPlatform().TestsDataPathForFile("test_data/gpx/points.gpx"),
-    GetPlatform().TestsDataPathForFile("test_data/gpx/Üφήが1.gpx"),
-    GetPlatform().TestsDataPathForFile("test_data/gpx/Üφήが2.gpx")};
+  std::string const gpxFiles[] = {GetPlatform().TestsDataPathForFile("test_data/gpx/route.gpx"),
+                                  GetPlatform().TestsDataPathForFile("test_data/gpx/points.gpx"),
+                                  GetPlatform().TestsDataPathForFile("test_data/gpx/Üφήが1.gpx"),
+                                  GetPlatform().TestsDataPathForFile("test_data/gpx/Üφήが2.gpx")};
   BookmarkManager bmManager(BM_CALLBACKS);
   bmManager.EnableTestMode(true);
 
@@ -1458,7 +1410,7 @@ UNIT_CLASS_TEST(Runner, ExportAll)
     TEST_EQUAL(files.size(), 5, ("5 files are expected in kmz"));
     auto index = "doc.kml";
     std::vector<std::string> expectedFiles = {"doc.kml", "files/new.kml", "files/Some random route.kml",
-                                               "files/CoMaps_1.kml", "files/CoMaps_2.kml"};
+                                              "files/CoMaps_1.kml", "files/CoMaps_2.kml"};
     for (auto const & file : files)
       TEST(std::find(expectedFiles.begin(), expectedFiles.end(), file.first) != expectedFiles.end(), ());
     auto indexPath = base::JoinPath(GetPlatform().TmpDir(), index);
@@ -1466,8 +1418,7 @@ UNIT_CLASS_TEST(Runner, ExportAll)
     std::string indexContent;
     FileReader(indexPath).ReadAsString(indexContent);
     std::string expectedIndexContent;
-    FileReader(GetPlatform().TestsDataPathForFile("test_data/kml/kmz_index.kml"))
-        .ReadAsString(expectedIndexContent);
+    FileReader(GetPlatform().TestsDataPathForFile("test_data/kml/kmz_index.kml")).ReadAsString(expectedIndexContent);
     TEST_EQUAL(expectedIndexContent, indexContent, ("Index content doesnt match expected value"));
     auto tmpPath = base::JoinPath(GetPlatform().TmpDir(), "tmp.xml");
     for (auto const & file : files)
@@ -1479,7 +1430,8 @@ UNIT_CLASS_TEST(Runner, ExportAll)
     TEST(base::DeleteFileX(indexPath), ());
     TEST(base::DeleteFileX(tmpPath), ());
   };
-  // We use KmlFileType::Text for both single and all tracks export. File structure is determined based on categories size
+  // We use KmlFileType::Text for both single and all tracks export. File structure is determined based on categories
+  // size
   bmManager.PrepareFileForSharing(std::move(categories), checker, KmlFileType::Text);
 }
 
@@ -1537,9 +1489,7 @@ UNIT_CLASS_TEST(Runner, ExportSingleTrackKmz)
   {
     auto track = bmManager.GetTrack(trackId);
     if (track->GetName().find("Some random route") != std::string::npos)
-    {
       bmManager.PrepareTrackFileForSharing(track->GetId(), kmzChecker, KmlFileType::Text);
-    }
   }
 }
 
@@ -1567,9 +1517,7 @@ UNIT_CLASS_TEST(Runner, ExportSingleTrackGpx)
   {
     auto track = bmManager.GetTrack(trackId);
     if (track->GetName().find("Some random route") != std::string::npos)
-    {
       bmManager.PrepareTrackFileForSharing(track->GetId(), gpxChecker, KmlFileType::Gpx);
-    }
   }
 }
 
@@ -1604,11 +1552,16 @@ UNIT_CLASS_TEST(Runner, Bookmarks_RecentlyDeleted)
   bmManager.EnableTestMode(true);
   auto const dir = GetBookmarksDirectory();
   bool const delDirOnExit = Platform::MkDir(dir) == Platform::ERR_OK;
-  SCOPE_GUARD(dirDeleter, [&](){ if (delDirOnExit) (void)Platform::RmDir(dir); });
+  SCOPE_GUARD(dirDeleter, [&]()
+  {
+    if (delDirOnExit)
+      (void)Platform::RmDir(dir);
+  });
 
   std::string const filePath = base::JoinPath(dir, "file" + std::string{kKmlExtension});
   BookmarkManager::KMLDataCollection kmlDataCollection;
-  kmlDataCollection.emplace_back(filePath, LoadKmlData(MemReader(kmlString, std::strlen(kmlString)), KmlFileType::Text));
+  kmlDataCollection.emplace_back(filePath,
+                                 LoadKmlData(MemReader(kmlString, std::strlen(kmlString)), KmlFileType::Text));
 
   FileWriter w(filePath);
   w.Write(kmlDataCollection.data(), kmlDataCollection.size());
@@ -1631,7 +1584,7 @@ UNIT_CLASS_TEST(Runner, Bookmarks_RecentlyDeleted)
   auto const deletedFilePath = deletedCategory.first;
   TEST_EQUAL(base::FileNameFromFullPath(deletedCategory.first), base::FileNameFromFullPath(filePath), ());
 
-  bmManager.DeleteRecentlyDeletedCategoriesAtPaths({ deletedFilePath });
+  bmManager.DeleteRecentlyDeletedCategoriesAtPaths({deletedFilePath});
   TEST_EQUAL(bmManager.GetBmGroupsCount(), 0, ());
   TEST_EQUAL(bmManager.GetRecentlyDeletedCategoriesCount(), 0, ());
   TEST_EQUAL(bmManager.GetRecentlyDeletedCategories()->size(), 0, ());
@@ -1649,8 +1602,9 @@ UNIT_CLASS_TEST(Runner, Bookmarks_TestSaveRoute)
   auto const * track = bmManager.GetTrack(trackId);
   TEST_EQUAL(track->GetName(), "London - Paris", ());
   auto const line = track->GetData().m_geometry.m_lines[0];
-  std::vector const expectedLine = {{geometry::PointWithAltitude(m2::PointD(0.0, 0.0), 0.0), geometry::PointWithAltitude(m2::PointD(0.001, 0.001), 0)}};
+  std::vector const expectedLine = {{geometry::PointWithAltitude(m2::PointD(0.0, 0.0), 0.0),
+                                     geometry::PointWithAltitude(m2::PointD(0.001, 0.001), 0)}};
   TEST_EQUAL(line, expectedLine, ());
 }
 
-} // namespace bookmarks_test
+}  // namespace bookmarks_test
diff --git a/libs/map/map_tests/chart_generator_tests.cpp b/libs/map/map_tests/chart_generator_tests.cpp
index 88054ef34..569dbf85a 100644
--- a/libs/map/map_tests/chart_generator_tests.cpp
+++ b/libs/map/map_tests/chart_generator_tests.cpp
@@ -2,16 +2,16 @@
 
 #include "map/chart_generator.hpp"
 
-#include "geometry/point_with_altitude.hpp"
 #include "base/math.hpp"
+#include "geometry/point_with_altitude.hpp"
 
 #include <cstdint>
 #include <vector>
 
 namespace chart_generator_tests
 {
-using std::vector;
 using maps::kAltitudeChartBPP;
+using std::vector;
 
 namespace
 {
@@ -23,15 +23,13 @@ bool AlmostEqualAbs(vector<double> const & v1, vector<double> const & v2)
     return false;
 
   for (size_t i = 0; i < v1.size(); ++i)
-  {
     if (!::AlmostEqualAbs(v1[i], v2[i], kEpsilon))
       return false;
-  }
   return true;
 }
 
-bool IsColor(vector<uint8_t> const & frameBuffer, size_t startColorIdx, uint8_t expectedR,
-             uint8_t expectedG, uint8_t expectedB, uint8_t expectedA)
+bool IsColor(vector<uint8_t> const & frameBuffer, size_t startColorIdx, uint8_t expectedR, uint8_t expectedG,
+             uint8_t expectedB, uint8_t expectedA)
 {
   CHECK_LESS_OR_EQUAL(startColorIdx + kAltitudeChartBPP, frameBuffer.size(), ());
 
@@ -39,17 +37,20 @@ bool IsColor(vector<uint8_t> const & frameBuffer, size_t startColorIdx, uint8_t
          frameBuffer[startColorIdx + 2] == expectedB && frameBuffer[startColorIdx + 3] == expectedA;
 }
 
-void TestAngleColors(size_t width, size_t height, vector<uint8_t> const & frameBuffer,
-                     uint8_t expectedR, uint8_t expectedG, uint8_t expectedB, uint8_t expectedA)
+void TestAngleColors(size_t width, size_t height, vector<uint8_t> const & frameBuffer, uint8_t expectedR,
+                     uint8_t expectedG, uint8_t expectedB, uint8_t expectedA)
 {
   TEST_EQUAL(frameBuffer.size(), width * height * kAltitudeChartBPP, ());
   TEST(IsColor(frameBuffer, 0 /* startColorIdx */, expectedR, expectedG, expectedB, expectedA), ());
-  TEST(IsColor(frameBuffer, kAltitudeChartBPP * (width - 1) /* startColorIdx */, expectedR,
-               expectedG, expectedB, expectedA), ());
-  TEST(IsColor(frameBuffer, kAltitudeChartBPP * height * (width - 1) /* startColorIdx */,
-               expectedR, expectedG, expectedB, expectedA), ());
-  TEST(IsColor(frameBuffer, kAltitudeChartBPP * height * width - kAltitudeChartBPP /* startColorIdx */,
-               expectedR, expectedG, expectedB, expectedA), ());
+  TEST(IsColor(frameBuffer, kAltitudeChartBPP * (width - 1) /* startColorIdx */, expectedR, expectedG, expectedB,
+               expectedA),
+       ());
+  TEST(IsColor(frameBuffer, kAltitudeChartBPP * height * (width - 1) /* startColorIdx */, expectedR, expectedG,
+               expectedB, expectedA),
+       ());
+  TEST(IsColor(frameBuffer, kAltitudeChartBPP * height * width - kAltitudeChartBPP /* startColorIdx */, expectedR,
+               expectedG, expectedB, expectedA),
+       ());
 }
 }  // namespace
 
@@ -83,8 +84,7 @@ UNIT_TEST(NormalizeChartData_SmokeTest)
   geometry::Altitudes const altitudeDataM = {0, 0, 0};
 
   vector<double> uniformAltitudeDataM;
-  TEST(maps::NormalizeChartData(distanceDataM, altitudeDataM, 2 /* resultPointCount */, uniformAltitudeDataM),
-       ());
+  TEST(maps::NormalizeChartData(distanceDataM, altitudeDataM, 2 /* resultPointCount */, uniformAltitudeDataM), ());
 
   vector<double> const expectedUniformAltitudeDataM = {0.0, 0.0};
   TEST_EQUAL(expectedUniformAltitudeDataM, uniformAltitudeDataM, ());
@@ -96,8 +96,7 @@ UNIT_TEST(NormalizeChartData_NoResultPointTest)
   geometry::Altitudes const altitudeDataM = {0, 0, 0};
 
   vector<double> uniformAltitudeDataM;
-  TEST(maps::NormalizeChartData(distanceDataM, altitudeDataM, 0 /* resultPointCount */, uniformAltitudeDataM),
-       ());
+  TEST(maps::NormalizeChartData(distanceDataM, altitudeDataM, 0 /* resultPointCount */, uniformAltitudeDataM), ());
 
   TEST(uniformAltitudeDataM.empty(), ());
 }
@@ -108,8 +107,7 @@ UNIT_TEST(NormalizeChartData_NoPointTest)
   geometry::Altitudes const altitudeDataM = {};
 
   vector<double> uniformAltitudeDataM;
-  TEST(maps::NormalizeChartData(distanceDataM, altitudeDataM, 2 /* resultPointCount */, uniformAltitudeDataM),
-       ());
+  TEST(maps::NormalizeChartData(distanceDataM, altitudeDataM, 2 /* resultPointCount */, uniformAltitudeDataM), ());
 
   TEST(uniformAltitudeDataM.empty(), ());
 }
@@ -120,11 +118,9 @@ UNIT_TEST(NormalizeChartData_Test)
   geometry::Altitudes const altitudeDataM = {-9, 0, 9, 18};
 
   vector<double> uniformAltitudeDataM;
-  TEST(maps::NormalizeChartData(distanceDataM, altitudeDataM, 10 /* resultPointCount */, uniformAltitudeDataM),
-       ());
+  TEST(maps::NormalizeChartData(distanceDataM, altitudeDataM, 10 /* resultPointCount */, uniformAltitudeDataM), ());
 
-  vector<double> const expectedUniformAltitudeDataM = {-9.0, -6.0, -3.0, 0.0,  3.0,
-                                                       6.0,  9.0,  12.0, 15.0, 18.0};
+  vector<double> const expectedUniformAltitudeDataM = {-9.0, -6.0, -3.0, 0.0, 3.0, 6.0, 9.0, 12.0, 15.0, 18.0};
   TEST(AlmostEqualAbs(uniformAltitudeDataM, expectedUniformAltitudeDataM), ());
 }
 
@@ -165,8 +161,8 @@ UNIT_TEST(GenerateChartByPoints_NoGeometryTest)
   vector<uint8_t> frameBuffer;
 
   TEST(maps::GenerateChartByPoints(width, height, geometry, MapStyleDefaultLight /* mapStyle */, frameBuffer), ());
-  TestAngleColors(width, height, frameBuffer, 255 /* expectedR */, 255 /* expectedG */,
-                  255 /* expectedB */, 0 /* expectedA */);
+  TestAngleColors(width, height, frameBuffer, 255 /* expectedR */, 255 /* expectedG */, 255 /* expectedB */,
+                  0 /* expectedA */);
 }
 
 UNIT_TEST(GenerateChartByPoints_OnePointTest)
@@ -177,8 +173,8 @@ UNIT_TEST(GenerateChartByPoints_OnePointTest)
   vector<uint8_t> frameBuffer;
 
   TEST(maps::GenerateChartByPoints(width, height, geometry, MapStyleDefaultLight /* mapStyle */, frameBuffer), ());
-  TestAngleColors(width, height, frameBuffer, 255 /* expectedR */, 255 /* expectedG */,
-                  255 /* expectedB */, 0 /* expectedA */);
+  TestAngleColors(width, height, frameBuffer, 255 /* expectedR */, 255 /* expectedG */, 255 /* expectedB */,
+                  0 /* expectedA */);
 }
 
 UNIT_TEST(GenerateChartByPoints_Test)
@@ -192,8 +188,8 @@ UNIT_TEST(GenerateChartByPoints_Test)
   TEST(maps::GenerateChartByPoints(width, height, geometry, MapStyleDefaultLight /* mapStyle */, frameBuffer), ());
 
   TEST_EQUAL(frameBuffer.size(), width * height * kAltitudeChartBPP, ());
-  TEST(IsColor(frameBuffer, 0 /* startColorIdx */, 30 /* expectedR */, 150 /* expectedG */,
-               240 /* expectedB */, 255 /* expectedA */),
+  TEST(IsColor(frameBuffer, 0 /* startColorIdx */, 30 /* expectedR */, 150 /* expectedG */, 240 /* expectedB */,
+               255 /* expectedA */),
        ());
   TEST(IsColor(frameBuffer, kAltitudeChartBPP * (width - 1) /* startColorIdx */, 255 /* expectedR */,
                255 /* expectedG */, 255 /* expectedB */, 0 /* expectedA */),
@@ -210,8 +206,8 @@ UNIT_TEST(GenerateChart_NoPointsTest)
   TEST(maps::GenerateChart(width, 50 /* height */, distanceDataM, altitudeDataM, MapStyleDefaultDark /* mapStyle */,
                            frameBuffer),
        ());
-  TestAngleColors(width, 50 /* height */, frameBuffer, 255 /* expectedR */, 255 /* expectedG */,
-                  255 /* expectedB */, 0 /* expectedA */);
+  TestAngleColors(width, 50 /* height */, frameBuffer, 255 /* expectedR */, 255 /* expectedG */, 255 /* expectedB */,
+                  0 /* expectedA */);
 }
 
 UNIT_TEST(GenerateChart_OnePointTest)
@@ -222,14 +218,16 @@ UNIT_TEST(GenerateChart_OnePointTest)
   geometry::Altitudes const & altitudeDataM = {0};
   vector<uint8_t> frameBuffer;
 
-  TEST(maps::GenerateChart(width, height, distanceDataM, altitudeDataM, MapStyleDefaultDark /* mapStyle */,
-                           frameBuffer),
-       ());
+  TEST(
+      maps::GenerateChart(width, height, distanceDataM, altitudeDataM, MapStyleDefaultDark /* mapStyle */, frameBuffer),
+      ());
   TEST_EQUAL(frameBuffer.size(), width * height * kAltitudeChartBPP, ());
-  TEST(IsColor(frameBuffer, 0 /* startColorIdx */, 255 /* expectedR */, 255 /* expectedG */,
-               255 /* expectedB */, 0 /* expectedA */), ());
+  TEST(IsColor(frameBuffer, 0 /* startColorIdx */, 255 /* expectedR */, 255 /* expectedG */, 255 /* expectedB */,
+               0 /* expectedA */),
+       ());
   TEST(IsColor(frameBuffer, kAltitudeChartBPP * (width - 1) /* startColorIdx */, 255 /* expectedR */,
-               255 /* expectedG */, 255 /* expectedB */, 0 /* expectedA */), ());
+               255 /* expectedG */, 255 /* expectedB */, 0 /* expectedA */),
+       ());
 }
 
 UNIT_TEST(GenerateChart_EmptyRectTest)
@@ -255,11 +253,10 @@ UNIT_TEST(GenerateChart_Test)
   TEST(maps::GenerateChart(width, 50 /* height */, distanceDataM, altitudeDataM, MapStyleDefaultDark /* mapStyle */,
                            frameBuffer),
        ());
-  TEST(IsColor(frameBuffer, 0 /* startColorIdx */, 255 /* expectedR */, 255 /* expectedG */,
-               255 /* expectedB */, 0 /* expectedA */),
+  TEST(IsColor(frameBuffer, 0 /* startColorIdx */, 255 /* expectedR */, 255 /* expectedG */, 255 /* expectedB */,
+               0 /* expectedA */),
        ());
-  TEST(IsColor(frameBuffer, kAltitudeChartBPP * 3 * width -
-               kAltitudeChartBPP /* startColorIdx */, 255 /* expectedR */,
+  TEST(IsColor(frameBuffer, kAltitudeChartBPP * 3 * width - kAltitudeChartBPP /* startColorIdx */, 255 /* expectedR */,
                230 /* expectedG */, 140 /* expectedB */, 255 /* expectedA */),
        ());
 }
diff --git a/libs/map/map_tests/check_mwms.cpp b/libs/map/map_tests/check_mwms.cpp
index 43775fde9..2fb6dc63f 100644
--- a/libs/map/map_tests/check_mwms.cpp
+++ b/libs/map/map_tests/check_mwms.cpp
@@ -69,8 +69,8 @@ UNIT_TEST(CheckMWM_GeomIndex)
   vector<unique_ptr<IntervalIndex<ReaderT, uint32_t>>> scale2Index;
   for (size_t i = 0; i < treesReader.Size(); ++i)
   {
-    scale2Index.emplace_back(make_unique<IntervalIndex<ReaderT, uint32_t>>(
-        treesReader.SubReader(static_cast<uint32_t>(i))));
+    scale2Index.emplace_back(
+        make_unique<IntervalIndex<ReaderT, uint32_t>>(treesReader.SubReader(static_cast<uint32_t>(i))));
   }
 
   // Pass full coverage as input for test.
@@ -80,14 +80,9 @@ UNIT_TEST(CheckMWM_GeomIndex)
   // Count objects for each scale bucket.
   map<size_t, uint64_t> resCount;
   for (size_t i = 0; i < scale2Index.size(); ++i)
-  {
-    scale2Index[i]->ForEach([i, &resCount](uint64_t, uint32_t)
-    {
-      ++resCount[i];
-    }, beg, end);
-  }
+    scale2Index[i]->ForEach([i, &resCount](uint64_t, uint32_t) { ++resCount[i]; }, beg, end);
 
   // Print results.
   LOG(LINFO, (resCount));
 }
-} // namespace check_mwms
+}  // namespace check_mwms
diff --git a/libs/map/map_tests/countries_names_tests.cpp b/libs/map/map_tests/countries_names_tests.cpp
index 10ad62978..280d9197d 100644
--- a/libs/map/map_tests/countries_names_tests.cpp
+++ b/libs/map/map_tests/countries_names_tests.cpp
@@ -42,17 +42,17 @@ UNIT_TEST(CountriesNamesTest)
   base::Cancellable const cancellable;
   search::CategoriesCache cache(ftypes::IsLocalityChecker::Instance(), cancellable);
 
-  int8_t const langIndices[] = { StringUtf8Multilang::kEnglishCode,
-                                 StringUtf8Multilang::kDefaultCode,
-                                 StringUtf8Multilang::kInternationalCode };
+  int8_t const langIndices[] = {StringUtf8Multilang::kEnglishCode, StringUtf8Multilang::kDefaultCode,
+                                StringUtf8Multilang::kInternationalCode};
 
-  set<string> const kIgnoreList = {"Northern Cyprus",
-                                   "Transnistria",
-                                   "Nagorno-Karabakh Republic",
-                                   "Republic of Artsakh",
-                                   "Saint Helena, Ascension and Tristan da Cunha",
-                                   "Somaliland",
-                                   };
+  set<string> const kIgnoreList = {
+      "Northern Cyprus",
+      "Transnistria",
+      "Nagorno-Karabakh Republic",
+      "Republic of Artsakh",
+      "Saint Helena, Ascension and Tristan da Cunha",
+      "Somaliland",
+  };
 
   auto const features = cache.Get(mwmContext);
   features.ForEach([&](uint64_t fid)
diff --git a/libs/map/map_tests/elevation_info_tests.cpp b/libs/map/map_tests/elevation_info_tests.cpp
index fdd138bf6..8095a533a 100644
--- a/libs/map/map_tests/elevation_info_tests.cpp
+++ b/libs/map/map_tests/elevation_info_tests.cpp
@@ -2,8 +2,8 @@
 
 #include "map/elevation_info.hpp"
 
-#include "geometry/point_with_altitude.hpp"
 #include "geometry/mercator.hpp"
+#include "geometry/point_with_altitude.hpp"
 
 #include "kml/types.hpp"
 
@@ -33,11 +33,7 @@ UNIT_TEST(ElevationInfo_FromMultiGeometry)
   auto const point1 = PointWithAltitude({0.0, 0.0}, 100);
   auto const point2 = PointWithAltitude({1.0, 1.0}, 150);
   auto const point3 = PointWithAltitude({2.0, 2.0}, 50);
-  geometry.AddLine({
-    point1,
-    point2,
-    point3
-  });
+  geometry.AddLine({point1, point2, point3});
   ElevationInfo ei(geometry.m_lines);
 
   TEST_EQUAL(3, ei.GetSize(), ());
@@ -53,20 +49,11 @@ UNIT_TEST(ElevationInfo_FromMultiGeometry)
 UNIT_TEST(ElevationInfo_MultipleLines)
 {
   kml::MultiGeometry geometry;
-  geometry.AddLine({
-    PointWithAltitude({0.0, 0.0}, 100),
-    PointWithAltitude({1.0, 1.0}, 150),
-    PointWithAltitude({1.0, 1.0}, 140)
-  });
-  geometry.AddLine({
-    PointWithAltitude({2.0, 2.0}, 50),
-    PointWithAltitude({3.0, 3.0}, 75),
-    PointWithAltitude({3.0, 3.0}, 60)
-  });
-  geometry.AddLine({
-    PointWithAltitude({4.0, 4.0}, 200),
-    PointWithAltitude({5.0, 5.0}, 250)
-  });
+  geometry.AddLine(
+      {PointWithAltitude({0.0, 0.0}, 100), PointWithAltitude({1.0, 1.0}, 150), PointWithAltitude({1.0, 1.0}, 140)});
+  geometry.AddLine(
+      {PointWithAltitude({2.0, 2.0}, 50), PointWithAltitude({3.0, 3.0}, 75), PointWithAltitude({3.0, 3.0}, 60)});
+  geometry.AddLine({PointWithAltitude({4.0, 4.0}, 200), PointWithAltitude({5.0, 5.0}, 250)});
   ElevationInfo ei(geometry.m_lines);
 
   TEST_EQUAL(8, ei.GetSize(), ());
@@ -75,18 +62,9 @@ UNIT_TEST(ElevationInfo_MultipleLines)
 UNIT_TEST(ElevationInfo_SegmentDistances)
 {
   kml::MultiGeometry geometry;
-  geometry.AddLine({
-    PointWithAltitude({0.0, 0.0}),
-    PointWithAltitude({1.0, 0.0})
-  });
-  geometry.AddLine({
-    PointWithAltitude({2.0, 0.0}),
-    PointWithAltitude({3.0, 0.0})
-  });
-  geometry.AddLine({
-    PointWithAltitude({4.0, 0.0}),
-    PointWithAltitude({5.0, 0.0})
-  });
+  geometry.AddLine({PointWithAltitude({0.0, 0.0}), PointWithAltitude({1.0, 0.0})});
+  geometry.AddLine({PointWithAltitude({2.0, 0.0}), PointWithAltitude({3.0, 0.0})});
+  geometry.AddLine({PointWithAltitude({4.0, 0.0}), PointWithAltitude({5.0, 0.0})});
 
   ElevationInfo ei(geometry.m_lines);
   auto const & segmentDistances = ei.GetSegmentsDistances();
@@ -101,19 +79,15 @@ UNIT_TEST(ElevationInfo_BuildWithGpsPoints)
 {
   auto ei = ElevationInfo();
   ei.AddGpsPoints({
-    BuildGpsInfo(0.0, 0.0, 0),
-    BuildGpsInfo(1.0, 1.0, 50),
-    BuildGpsInfo(2.0, 2.0, 100),
-  });
-  ei.AddGpsPoints({
-    BuildGpsInfo(3.0, 3.0, -50)
-  });
-  ei.AddGpsPoints({
-    BuildGpsInfo(4.0, 4.0, 0)
+      BuildGpsInfo(0.0, 0.0, 0),
+      BuildGpsInfo(1.0, 1.0, 50),
+      BuildGpsInfo(2.0, 2.0, 100),
   });
+  ei.AddGpsPoints({BuildGpsInfo(3.0, 3.0, -50)});
+  ei.AddGpsPoints({BuildGpsInfo(4.0, 4.0, 0)});
   ei.AddGpsPoints({});
 
   TEST_EQUAL(5, ei.GetSize(), ());
   TEST_EQUAL(ei.GetSegmentsDistances().size(), 0, ());
 }
-} // namespace elevation_info_testa
+}  // namespace elevation_info_tests
diff --git a/libs/map/map_tests/extrapolator_tests.cpp b/libs/map/map_tests/extrapolator_tests.cpp
index 887d413a2..1d6ef354b 100644
--- a/libs/map/map_tests/extrapolator_tests.cpp
+++ b/libs/map/map_tests/extrapolator_tests.cpp
@@ -17,8 +17,7 @@ void TestGpsInfo(GpsInfo const & tested, GpsInfo const & expected)
   TEST_EQUAL(tested.m_source, expected.m_source, ());
   TEST(AlmostEqualAbs(tested.m_latitude, expected.m_latitude, kEpsilon), ());
   TEST(AlmostEqualAbs(tested.m_longitude, expected.m_longitude, kEpsilon), ());
-  TEST(AlmostEqualAbs(tested.m_horizontalAccuracy, expected.m_horizontalAccuracy, kEpsilon),
-       ());
+  TEST(AlmostEqualAbs(tested.m_horizontalAccuracy, expected.m_horizontalAccuracy, kEpsilon), ());
   TEST(AlmostEqualAbs(tested.m_altitude, expected.m_altitude, kEpsilon), ());
   TEST(AlmostEqualAbs(tested.m_verticalAccuracy, expected.m_verticalAccuracy, kEpsilon), ());
   TEST(AlmostEqualAbs(tested.m_bearing, expected.m_bearing, kEpsilon), ());
@@ -50,22 +49,22 @@ UNIT_TEST(LinearExtrapolation)
 
   // 100 ms after |point2|.
   {
-    GpsInfo const expected = GetGpsInfo(1.1 /* timestampS */, 1.011 /* m_latitude */,
-                                        1.011 /* m_longitude */, 2.1 /* m_altitude */, 12.2 /* m_speed */);
+    GpsInfo const expected = GetGpsInfo(1.1 /* timestampS */, 1.011 /* m_latitude */, 1.011 /* m_longitude */,
+                                        2.1 /* m_altitude */, 12.2 /* m_speed */);
     TestGpsInfo(LinearExtrapolation(loc1, loc2, 100 /* timeAfterPoint2Ms */), expected);
   }
 
   // 200 ms after |point2|.
   {
-    GpsInfo const expected = GetGpsInfo(1.2 /* timestampS */, 1.012 /* m_latitude */,
-                                        1.012 /* m_longitude */, 2.2 /* m_altitude */, 12.4 /* m_speed */);
+    GpsInfo const expected = GetGpsInfo(1.2 /* timestampS */, 1.012 /* m_latitude */, 1.012 /* m_longitude */,
+                                        2.2 /* m_altitude */, 12.4 /* m_speed */);
     TestGpsInfo(LinearExtrapolation(loc1, loc2, 200 /* timeAfterPoint2Ms */), expected);
   }
 
   // 1000 ms after |point2|.
   {
-    GpsInfo const expected = GetGpsInfo(2.0 /* timestampS */, 1.02 /* m_latitude */,
-                                        1.02 /* m_longitude */, 3.0 /* m_altitude */, 14.0 /* m_speed */);
+    GpsInfo const expected = GetGpsInfo(2.0 /* timestampS */, 1.02 /* m_latitude */, 1.02 /* m_longitude */,
+                                        3.0 /* m_altitude */, 14.0 /* m_speed */);
     TestGpsInfo(LinearExtrapolation(loc1, loc2, 1000 /* timeAfterPoint2Ms */), expected);
   }
 }
diff --git a/libs/map/map_tests/feature_getters_tests.cpp b/libs/map/map_tests/feature_getters_tests.cpp
index 62cf01afa..779cc1b36 100644
--- a/libs/map/map_tests/feature_getters_tests.cpp
+++ b/libs/map/map_tests/feature_getters_tests.cpp
@@ -14,7 +14,6 @@
 #include <cstdint>
 #include <vector>
 
-
 UNIT_TEST(Framework_ForEachFeatureAtPoint_And_Others)
 {
   using namespace std;
@@ -24,18 +23,14 @@ UNIT_TEST(Framework_ForEachFeatureAtPoint_And_Others)
   frm.RegisterMap(platform::LocalCountryFile::MakeForTesting("minsk-pass"));
 
   // May vary according to the new minsk-pass data.
-  vector<char const *> types =
-  {
-    "highway|footway|",
-    "hwtag|yesbicycle|",
-    "psurface|paved_good|",
+  vector<char const *> types = {
+      "highway|footway|",   "hwtag|yesbicycle|",    "psurface|paved_good|",
 
-    "highway|service|",
-    "psurface|paved_good|",
+      "highway|service|",   "psurface|paved_good|",
 
-    "amenity|parking|",
+      "amenity|parking|",
 
-    "barrier|lift_gate|",
+      "barrier|lift_gate|",
   };
   frm.ForEachFeatureAtPoint([&](FeatureType & ft)
   {
diff --git a/libs/map/map_tests/gps_track_collection_test.cpp b/libs/map/map_tests/gps_track_collection_test.cpp
index fd54c3b2b..0a903043f 100644
--- a/libs/map/map_tests/gps_track_collection_test.cpp
+++ b/libs/map/map_tests/gps_track_collection_test.cpp
@@ -45,7 +45,7 @@ UNIT_TEST(GpsTrackCollection_Simple)
 
   TEST_EQUAL(50, collection.GetSize(), ());
 
-  collection.ForEach([&data](location::GpsInfo const & info, size_t id)->bool
+  collection.ForEach([&data](location::GpsInfo const & info, size_t id) -> bool
   {
     TEST(data.end() != data.find(id), ());
     location::GpsInfo const & originInfo = data[id];
diff --git a/libs/map/map_tests/gps_track_storage_test.cpp b/libs/map/map_tests/gps_track_storage_test.cpp
index 90d7ae91b..5d3f73879 100644
--- a/libs/map/map_tests/gps_track_storage_test.cpp
+++ b/libs/map/map_tests/gps_track_storage_test.cpp
@@ -61,7 +61,7 @@ UNIT_TEST(GpsTrackStorage_WriteRead)
     stg.Append(points);
 
     size_t i = 0;
-    stg.ForEach([&](location::GpsInfo const & point)->bool
+    stg.ForEach([&](location::GpsInfo const & point) -> bool
     {
       TEST_EQUAL(point.m_latitude, points[i].m_latitude, ());
       TEST_EQUAL(point.m_longitude, points[i].m_longitude, ());
@@ -78,7 +78,7 @@ UNIT_TEST(GpsTrackStorage_WriteRead)
     GpsTrackStorage stg(filePath);
 
     size_t i = 0;
-    stg.ForEach([&](location::GpsInfo const & point)->bool
+    stg.ForEach([&](location::GpsInfo const & point) -> bool
     {
       TEST_EQUAL(point.m_latitude, points[i].m_latitude, ());
       TEST_EQUAL(point.m_longitude, points[i].m_longitude, ());
@@ -98,8 +98,12 @@ UNIT_TEST(GpsTrackStorage_WriteRead)
     GpsTrackStorage stg(filePath);
 
     size_t i = 0;
-    stg.ForEach([&](location::GpsInfo const & point)->bool{ ++i; return true; });
+    stg.ForEach([&](location::GpsInfo const & point) -> bool
+    {
+      ++i;
+      return true;
+    });
     TEST_EQUAL(i, 0, ());
   }
 }
-} // namespace gps_track_storage_test
+}  // namespace gps_track_storage_test
diff --git a/libs/map/map_tests/gps_track_test.cpp b/libs/map/map_tests/gps_track_test.cpp
index 78bf3cddf..9d2375742 100644
--- a/libs/map/map_tests/gps_track_test.cpp
+++ b/libs/map/map_tests/gps_track_test.cpp
@@ -42,13 +42,8 @@ inline string GetGpsTrackFilePath()
 class GpsTrackCallback
 {
 public:
-  GpsTrackCallback()
-    : m_toRemove(make_pair(GpsTrack::kInvalidId, GpsTrack::kInvalidId))
-    , m_gotCallback(false)
-  {
-  }
-  void OnUpdate(vector<pair<size_t, location::GpsInfo>> && toAdd,
-                pair<size_t, size_t> const & toRemove)
+  GpsTrackCallback() : m_toRemove(make_pair(GpsTrack::kInvalidId, GpsTrack::kInvalidId)), m_gotCallback(false) {}
+  void OnUpdate(vector<pair<size_t, location::GpsInfo>> && toAdd, pair<size_t, size_t> const & toRemove)
   {
     m_toAdd = std::move(toAdd);
     m_toRemove = toRemove;
@@ -68,7 +63,7 @@ public:
   bool WaitForCallback(seconds t)
   {
     unique_lock<mutex> ul(m_mutex);
-    return m_cv.wait_for(ul, t, [this]()->bool{ return m_gotCallback; });
+    return m_cv.wait_for(ul, t, [this]() -> bool { return m_gotCallback; });
   }
 
   vector<pair<size_t, location::GpsInfo>> m_toAdd;
@@ -107,8 +102,7 @@ UNIT_TEST(GpsTrack_Simple)
 
     GpsTrackCallback callback;
 
-    track.SetCallback(
-        bind(&GpsTrackCallback::OnUpdate, &callback, placeholders::_1, placeholders::_2));
+    track.SetCallback(bind(&GpsTrackCallback::OnUpdate, &callback, placeholders::_1, placeholders::_2));
 
     TEST(callback.WaitForCallback(kWaitForCallbackTimeout), ());
 
@@ -131,8 +125,7 @@ UNIT_TEST(GpsTrack_Simple)
 
     GpsTrackCallback callback;
 
-    track.SetCallback(
-        bind(&GpsTrackCallback::OnUpdate, &callback, placeholders::_1, placeholders::_2));
+    track.SetCallback(bind(&GpsTrackCallback::OnUpdate, &callback, placeholders::_1, placeholders::_2));
 
     TEST(callback.WaitForCallback(kWaitForCallbackTimeout), ());
 
@@ -149,4 +142,4 @@ UNIT_TEST(GpsTrack_Simple)
     }
   }
 }
-} // namespace gps_track_test
+}  // namespace gps_track_test
diff --git a/libs/map/map_tests/kmz_unarchive_test.cpp b/libs/map/map_tests/kmz_unarchive_test.cpp
index 27569fe03..cd14509f6 100644
--- a/libs/map/map_tests/kmz_unarchive_test.cpp
+++ b/libs/map/map_tests/kmz_unarchive_test.cpp
@@ -6,7 +6,6 @@
 
 #include "base/scope_guard.hpp"
 
-
 UNIT_TEST(KMZ_UnzipTest)
 {
   std::string const kmzFile = GetPlatform().TestsDataPathForFile("test_data/kml/test.kmz");
@@ -45,8 +44,7 @@ UNIT_TEST(Multi_KML_KMZ_UnzipTest)
 {
   std::string const kmzFile = GetPlatform().TestsDataPathForFile("test_data/kml/BACRNKMZ.kmz");
   auto const filePaths = GetKMLOrGPXFilesPathsToLoad(kmzFile);
-  std::vector<std::string> expectedFileNames =
-  {
+  std::vector<std::string> expectedFileNames = {
       "BACRNKMZfilesCampgrounds 26may2022 green and tree icon",
       "BACRNKMZfilesIndoor Accommodations 26may2022 placemark purple and bed icon",
       "BACRNKMZfilesRoute 1 Canada - West-East Daily Segments",
diff --git a/libs/map/map_tests/mwm_url_tests.cpp b/libs/map/map_tests/mwm_url_tests.cpp
index 241d34893..69af41c39 100644
--- a/libs/map/map_tests/mwm_url_tests.cpp
+++ b/libs/map/map_tests/mwm_url_tests.cpp
@@ -23,7 +23,9 @@ double const kEps = 1e-10;
 
 UNIT_TEST(MapApiSmoke)
 {
-  string urlString = "mapswithme://map?ll=38.970559,-9.419289&ignoreThisParam=Yes&z=17&n=Point%20Name&s=black&backurl=https%3A%2F%2Fcomaps.app";
+  string urlString =
+      "mapswithme://"
+      "map?ll=38.970559,-9.419289&ignoreThisParam=Yes&z=17&n=Point%20Name&s=black&backurl=https%3A%2F%2Fcomaps.app";
   TEST(url::Url(urlString).IsValid(), ());
 
   ParsedMapApi test(urlString);
@@ -41,8 +43,7 @@ UNIT_TEST(MapApiSmoke)
 
 UNIT_TEST(RouteApiSmoke)
 {
-  string const urlString =
-      "mapswithme://route?sll=1,1&saddr=name0&dll=2,2&daddr=name1&type=vehicle";
+  string const urlString = "mapswithme://route?sll=1,1&saddr=name0&dll=2,2&daddr=name1&type=vehicle";
   TEST(url::Url(urlString).IsValid(), ());
 
   ParsedMapApi test(urlString);
@@ -59,7 +60,8 @@ UNIT_TEST(RouteApiSmoke)
 
 UNIT_TEST(SearchApiSmoke)
 {
-  string const urlString = "mapsme://search?query=Saint%20Hilarion&cll=35.3166654,33.2833322&locale=ru&map&appname=CoMaps";
+  string const urlString =
+      "mapsme://search?query=Saint%20Hilarion&cll=35.3166654,33.2833322&locale=ru&map&appname=CoMaps";
   TEST(url::Url(urlString).IsValid(), ());
 
   ParsedMapApi test(urlString);
@@ -121,7 +123,8 @@ UNIT_TEST(SearchApiInvalidUrl)
   ParsedMapApi test;
   TEST_EQUAL(test.SetUrlAndParse("mapsme://search?"), UrlType::Incorrect, ("Empty query string"));
   TEST_EQUAL(test.SetUrlAndParse("mapsme://search?query"), UrlType::Incorrect, ("Search query can't be empty"));
-  TEST_EQUAL(test.SetUrlAndParse("mapsme://serch?cll=1,1&locale=ru&query=aaa"), UrlType::Incorrect, ("Incorrect url type"));
+  TEST_EQUAL(test.SetUrlAndParse("mapsme://serch?cll=1,1&locale=ru&query=aaa"), UrlType::Incorrect,
+             ("Incorrect url type"));
   TEST_EQUAL(test.SetUrlAndParse("mapsme://search?Query=fff"), UrlType::Incorrect, ("The parser is case sensitive"));
   TEST_EQUAL(test.SetUrlAndParse("incorrect://search?query=aaa"), UrlType::Incorrect, ("Wrong prefix"));
   TEST_EQUAL(test.SetUrlAndParse("http://search?query=aaa"), UrlType::Incorrect, ("Wrong prefix"));
@@ -131,7 +134,7 @@ UNIT_TEST(LeadApiSmoke)
 {
   ParsedMapApi test;
   TEST_EQUAL(test.SetUrlAndParse("mapsme://lead?utm_source=a&utm_medium=b&utm_campaign=c&utm_content=d&utm_term=e"),
-    UrlType::Incorrect, ("Lead API is not supported"));
+             UrlType::Incorrect, ("Lead API is not supported"));
 }
 
 UNIT_TEST(MapApiInvalidUrl)
@@ -149,17 +152,24 @@ UNIT_TEST(MapApiInvalidUrl)
 UNIT_TEST(RouteApiInvalidUrl)
 {
   ParsedMapApi test;
-  TEST_EQUAL(test.SetUrlAndParse("mapswithme://route?sll=1,1&saddr=name0&dll=2,2&daddr=name2"), UrlType::Incorrect, ("Route type doesn't exist"));
-  TEST_EQUAL(test.SetUrlAndParse("mapswithme://route?sll=1,1&saddr=name0"), UrlType::Incorrect, ("Destination doesn't exist"));
-  TEST_EQUAL(test.SetUrlAndParse("mapswithme://route?sll=1,1&dll=2,2&type=vehicle"), UrlType::Incorrect, ("Source or destination name doesn't exist"));
+  TEST_EQUAL(test.SetUrlAndParse("mapswithme://route?sll=1,1&saddr=name0&dll=2,2&daddr=name2"), UrlType::Incorrect,
+             ("Route type doesn't exist"));
+  TEST_EQUAL(test.SetUrlAndParse("mapswithme://route?sll=1,1&saddr=name0"), UrlType::Incorrect,
+             ("Destination doesn't exist"));
+  TEST_EQUAL(test.SetUrlAndParse("mapswithme://route?sll=1,1&dll=2,2&type=vehicle"), UrlType::Incorrect,
+             ("Source or destination name doesn't exist"));
   TEST_EQUAL(test.SetUrlAndParse("mapswithme://route?saddr=name0&daddr=name1&type=vehicle"), UrlType::Incorrect, ());
   TEST_EQUAL(test.SetUrlAndParse("mapswithme://route?sll=1,1&sll=2.2&type=vehicle"), UrlType::Incorrect, ());
   TEST_EQUAL(test.SetUrlAndParse("mapswithme://route?sll=1,1&dll=2.2&type=666"), UrlType::Incorrect, ());
-  TEST_EQUAL(test.SetUrlAndParse("mapswithme://route?sll=1,1&saddr=name0&sll=2,2&saddr=name1&type=vehicle"), UrlType::Incorrect, ());
+  TEST_EQUAL(test.SetUrlAndParse("mapswithme://route?sll=1,1&saddr=name0&sll=2,2&saddr=name1&type=vehicle"),
+             UrlType::Incorrect, ());
   TEST_EQUAL(test.SetUrlAndParse("mapswithme://route?sll=1,1&type=vehicle"), UrlType::Incorrect, ());
-  TEST_EQUAL(test.SetUrlAndParse("mapswithme://route?sll=1,1&saddr=name0&sll=2,2&saddr=name1&sll=1,1&saddr=name0&type=vehicle"), UrlType::Incorrect, ());
+  TEST_EQUAL(test.SetUrlAndParse(
+                 "mapswithme://route?sll=1,1&saddr=name0&sll=2,2&saddr=name1&sll=1,1&saddr=name0&type=vehicle"),
+             UrlType::Incorrect, ());
   TEST_EQUAL(test.SetUrlAndParse("mapswithme://route?type=vehicle"), UrlType::Incorrect, ());
-  TEST_EQUAL(test.SetUrlAndParse("mapswithme://rout?sll=1,1&saddr=name0&dll=2,2&daddr=name1&type=vehicle"), UrlType::Incorrect, ());
+  TEST_EQUAL(test.SetUrlAndParse("mapswithme://rout?sll=1,1&saddr=name0&dll=2,2&daddr=name1&type=vehicle"),
+             UrlType::Incorrect, ());
 }
 
 UNIT_TEST(MapApiLatLonLimits)
@@ -385,7 +395,6 @@ UNIT_TEST(CrosshairApi)
   }
 }
 
-
 UNIT_TEST(GlobalBackUrl)
 {
   {
@@ -409,19 +418,30 @@ UNIT_TEST(GlobalBackUrl)
     TEST_EQUAL(api.GetGlobalBackUrl(), "http://mapswithme.com", ());
   }
   {
-    ParsedMapApi api("mwm://map?ll=1,2&n=PointName&backurl=someapp://%D0%9C%D0%BE%D0%B1%D0%B8%D0%BB%D1%8C%D0%BD%D1%8B%D0%B5%20%D0%9A%D0%B0%D1%80%D1%82%D1%8B");
-    TEST_EQUAL(api.GetGlobalBackUrl(), "someapp://\xd0\x9c\xd0\xbe\xd0\xb1\xd0\xb8\xd0\xbb\xd1\x8c\xd0\xbd\xd1\x8b\xd0\xb5 \xd0\x9a\xd0\xb0\xd1\x80\xd1\x82\xd1\x8b", ());
+    ParsedMapApi api(
+        "mwm://map?ll=1,2&n=PointName&backurl=someapp://"
+        "%D0%9C%D0%BE%D0%B1%D0%B8%D0%BB%D1%8C%D0%BD%D1%8B%D0%B5%20%D0%9A%D0%B0%D1%80%D1%82%D1%8B");
+    TEST_EQUAL(api.GetGlobalBackUrl(),
+               "someapp://\xd0\x9c\xd0\xbe\xd0\xb1\xd0\xb8\xd0\xbb\xd1\x8c\xd0\xbd\xd1\x8b\xd0\xb5 "
+               "\xd0\x9a\xd0\xb0\xd1\x80\xd1\x82\xd1\x8b",
+               ());
   }
   {
     ParsedMapApi api("mwm://map?ll=1,2&n=PointName");
     TEST_EQUAL(api.GetGlobalBackUrl(), "", ());
   }
   {
-    ParsedMapApi api("mwm://map?ll=1,2&n=PointName&backurl=%D0%BF%D1%80%D0%B8%D0%BB%D0%BE%D0%B6%D0%B5%D0%BD%D0%B8%D0%B5%3A%2F%2F%D0%BE%D1%82%D0%BA%D1%80%D0%BE%D0%B9%D0%A1%D1%81%D1%8B%D0%BB%D0%BA%D1%83");
+    ParsedMapApi api(
+        "mwm://"
+        "map?ll=1,2&n=PointName&backurl=%D0%BF%D1%80%D0%B8%D0%BB%D0%BE%D0%B6%D0%B5%D0%BD%D0%B8%D0%B5%3A%2F%2F%D0%BE%D1%"
+        "82%D0%BA%D1%80%D0%BE%D0%B9%D0%A1%D1%81%D1%8B%D0%BB%D0%BA%D1%83");
     TEST_EQUAL(api.GetGlobalBackUrl(), "приложение://откройСсылку", ());
   }
   {
-    ParsedMapApi api("mwm://map?ll=1,2&n=PointName&backurl=%D0%BF%D1%80%D0%B8%D0%BB%D0%BE%D0%B6%D0%B5%D0%BD%D0%B8%D0%B5%3A%2F%2F%D0%BE%D1%82%D0%BA%D1%80%D0%BE%D0%B9%D0%A1%D1%81%D1%8B%D0%BB%D0%BA%D1%83");
+    ParsedMapApi api(
+        "mwm://"
+        "map?ll=1,2&n=PointName&backurl=%D0%BF%D1%80%D0%B8%D0%BB%D0%BE%D0%B6%D0%B5%D0%BD%D0%B8%D0%B5%3A%2F%2F%D0%BE%D1%"
+        "82%D0%BA%D1%80%D0%BE%D0%B9%D0%A1%D1%81%D1%8B%D0%BB%D0%BA%D1%83");
     TEST_EQUAL(api.GetGlobalBackUrl(), "приложение://откройСсылку", ());
   }
   {
@@ -496,8 +516,7 @@ namespace
 string generatePartOfUrl(url_scheme::MapPoint const & point)
 {
   stringstream stream;
-  stream << "&ll=" << std::to_string(point.m_lat)  << "," << std::to_string(point.m_lon)
-         << "&n=" << point.m_name
+  stream << "&ll=" << std::to_string(point.m_lat) << "," << std::to_string(point.m_lon) << "&n=" << point.m_name
          << "&id=" << point.m_id;
   return stream.str();
 }
@@ -513,7 +532,7 @@ string randomString(size_t size, uint32_t seed)
 
 void generateRandomTest(uint32_t numberOfPoints, size_t stringLength)
 {
-  vector <url_scheme::MapPoint> vect(numberOfPoints);
+  vector<url_scheme::MapPoint> vect(numberOfPoints);
   for (uint32_t i = 0; i < numberOfPoints; ++i)
   {
     url_scheme::MapPoint point;
@@ -543,7 +562,7 @@ void generateRandomTest(uint32_t numberOfPoints, size_t stringLength)
   }
 }
 
-}
+}  // namespace
 
 UNIT_TEST(100FullEnteriesRandomTest)
 {
diff --git a/libs/map/map_tests/power_manager_tests.cpp b/libs/map/map_tests/power_manager_tests.cpp
index 2bb3c60e3..367091912 100644
--- a/libs/map/map_tests/power_manager_tests.cpp
+++ b/libs/map/map_tests/power_manager_tests.cpp
@@ -1,7 +1,7 @@
 #include "testing/testing.hpp"
 
-#include "map/power_management/power_manager.hpp"
 #include "map/power_management/power_management_schemas.hpp"
+#include "map/power_management/power_manager.hpp"
 
 #include "platform//platform.hpp"
 
@@ -26,10 +26,7 @@ public:
     m_onFacilityEvents.push_back({facility, enabled});
   }
 
-  void OnPowerSchemeChanged(Scheme const actualConfig) override
-  {
-    m_onShemeEvents.push_back(actualConfig);
-  }
+  void OnPowerSchemeChanged(Scheme const actualConfig) override { m_onShemeEvents.push_back(actualConfig); }
 
   struct FacilityState
   {
@@ -45,13 +42,10 @@ void TestIsAllFacilitiesInState(PowerManager const & manager, bool state)
 {
   auto const count = static_cast<size_t>(Facility::Count);
   for (size_t i = 0; i < count; ++i)
-  {
     TEST_EQUAL(manager.IsFacilityEnabled(static_cast<Facility>(i)), state, ());
-  }
 }
 
-void TestAllFacilitiesEnabledExcept(PowerManager const & manager,
-                                    std::vector<Facility> const & disabledFacilities)
+void TestAllFacilitiesEnabledExcept(PowerManager const & manager, std::vector<Facility> const & disabledFacilities)
 {
   auto const count = static_cast<size_t>(Facility::Count);
   for (size_t i = 0; i < count; ++i)
@@ -109,14 +103,10 @@ UNIT_TEST(PowerManager_SetScheme)
   TEST_EQUAL(manager.GetScheme(), Scheme::Normal, ());
   manager.SetScheme(Scheme::EconomyMaximum);
   TEST_EQUAL(manager.GetScheme(), Scheme::EconomyMaximum, ());
-  TestAllFacilitiesEnabledExcept(manager, {Facility::Buildings3d,
-                                           Facility::PerspectiveView,
-                                           Facility::TrackRecording,
-                                           Facility::TrafficJams,
-                                           Facility::GpsTrackingForTraffic,
-                                           Facility::OsmEditsUploading,
-                                           Facility::UgcUploading,
-                                           Facility::BookmarkCloudUploading});
+  TestAllFacilitiesEnabledExcept(
+      manager, {Facility::Buildings3d, Facility::PerspectiveView, Facility::TrackRecording, Facility::TrafficJams,
+                Facility::GpsTrackingForTraffic, Facility::OsmEditsUploading, Facility::UgcUploading,
+                Facility::BookmarkCloudUploading});
 
   TEST_EQUAL(subscriber.m_onShemeEvents.size(), 1, ());
   TEST_EQUAL(subscriber.m_onShemeEvents[0], Scheme::EconomyMaximum, ());
@@ -144,8 +134,7 @@ UNIT_TEST(PowerManager_SetScheme)
   manager.SetScheme(Scheme::EconomyMedium);
   TEST_EQUAL(manager.GetScheme(), Scheme::EconomyMedium, ());
 
-  TestAllFacilitiesEnabledExcept(manager,
-                                 {Facility::PerspectiveView, Facility::BookmarkCloudUploading});
+  TestAllFacilitiesEnabledExcept(manager, {Facility::PerspectiveView, Facility::BookmarkCloudUploading});
 
   TEST_EQUAL(subscriber.m_onShemeEvents.size(), 1, ());
   TEST_EQUAL(subscriber.m_onShemeEvents[0], Scheme::EconomyMedium, ());
@@ -229,10 +218,8 @@ UNIT_TEST(PowerManager_OnBatteryLevelChanged)
 
   manager.OnBatteryLevelReceived(28);
 
-  TestAllFacilitiesEnabledExcept(manager, {Facility::PerspectiveView,
-                                           Facility::GpsTrackingForTraffic,
-                                           Facility::BookmarkCloudUploading,
-                                           Facility::MapDownloader});
+  TestAllFacilitiesEnabledExcept(manager, {Facility::PerspectiveView, Facility::GpsTrackingForTraffic,
+                                           Facility::BookmarkCloudUploading, Facility::MapDownloader});
   TEST_EQUAL(manager.GetScheme(), Scheme::Auto, ());
 
   TEST_EQUAL(subscriber.m_onShemeEvents.size(), 0, ());
diff --git a/libs/map/map_tests/search_api_tests.cpp b/libs/map/map_tests/search_api_tests.cpp
index 310cd6d98..4f78a7c25 100644
--- a/libs/map/map_tests/search_api_tests.cpp
+++ b/libs/map/map_tests/search_api_tests.cpp
@@ -39,8 +39,7 @@ using Rules = vector<shared_ptr<MatchingRule>>;
 struct TestCafe : public TestPOI
 {
 public:
-  TestCafe(m2::PointD const & center, string const & name, string const & lang)
-    : TestPOI(center, name, lang)
+  TestCafe(m2::PointD const & center, string const & name, string const & lang) : TestPOI(center, name, lang)
   {
     SetTypes({{"amenity", "cafe"}});
   }
@@ -63,8 +62,7 @@ public:
   SearchAPITest()
     : m_infoGetter(CountryInfoReader::CreateCountryInfoGetter(GetPlatform()))
     , m_api(m_dataSource, m_storage, *m_infoGetter, 1 /* numThreads */, m_delegate)
-  {
-  }
+  {}
 
 protected:
   Storage m_storage;
@@ -80,7 +78,8 @@ UNIT_CLASS_TEST(SearchAPITest, MultipleViewportsRequests)
   TestCafe cafe3(m2::PointD(10, 10), "cafe 3", "en");
   TestCafe cafe4(m2::PointD(10.5, 10.5), "cafe 4", "en");
 
-  auto const id = BuildCountry("Wonderland", [&](TestMwmBuilder & builder) {
+  auto const id = BuildCountry("Wonderland", [&](TestMwmBuilder & builder)
+  {
     builder.Add(cafe1);
     builder.Add(cafe2);
     builder.Add(cafe3);
@@ -99,7 +98,8 @@ UNIT_CLASS_TEST(SearchAPITest, MultipleViewportsRequests)
   params.m_query = "cafe ";
   params.m_inputLocale = "en";
 
-  params.m_onCompleted = [&](Results const & results) {
+  params.m_onCompleted = [&](Results const & results)
+  {
     TEST(!results.IsEndedCancelled(), ());
 
     if (!results.IsEndMarker())
@@ -147,7 +147,8 @@ UNIT_CLASS_TEST(SearchAPITest, Cancellation)
     promise<void> promise;
     auto future = promise.get_future();
 
-    params.m_onResults = [&](Results const & results, vector<ProductInfo> const &) {
+    params.m_onResults = [&](Results const & results, vector<ProductInfo> const &)
+    {
       TEST(!results.IsEndedCancelled(), ());
 
       if (!results.IsEndMarker())
@@ -172,7 +173,8 @@ UNIT_CLASS_TEST(SearchAPITest, Cancellation)
 
     params.m_timeout = chrono::seconds(-1);
 
-    params.m_onResults = [&](Results const & results, vector<ProductInfo> const &) {
+    params.m_onResults = [&](Results const & results, vector<ProductInfo> const &)
+    {
       // The deadline has fired but Search API does not expose it.
       TEST(!results.IsEndedCancelled(), ());
 
@@ -201,8 +203,7 @@ UNIT_CLASS_TEST(SearchAPITest, BookmarksSearch)
   kml::SetDefaultStr(data.m_description, "They've got a cherry pie there that'll kill ya!");
   marks.emplace_back(0, data);
   kml::SetDefaultStr(data.m_name, "Silver Mustang Casino");
-  kml::SetDefaultStr(data.m_description,
-                     "Joyful place, owners Bradley and Rodney are very friendly!");
+  kml::SetDefaultStr(data.m_description, "Joyful place, owners Bradley and Rodney are very friendly!");
   marks.emplace_back(1, data);
   kml::SetDefaultStr(data.m_name, "Great Northern Hotel");
   kml::SetDefaultStr(data.m_description, "Clean place with a reasonable price");
@@ -212,15 +213,15 @@ UNIT_CLASS_TEST(SearchAPITest, BookmarksSearch)
   m_api.OnBookmarksCreated(marks);
   m_api.OnViewportChanged(m2::RectD(-1, -1, 1, 1));
 
-  auto runTest = [&](string const & query, kml::MarkGroupId const & groupId,
-                     vector<kml::MarkId> const & expected) {
+  auto runTest = [&](string const & query, kml::MarkGroupId const & groupId, vector<kml::MarkId> const & expected)
+  {
     promise<vector<kml::MarkId>> idsPromise;
     auto idsFuture = idsPromise.get_future();
 
     BookmarksSearchParams params;
     params.m_query = query;
-    params.m_onResults = [&](vector<kml::MarkId> const & results,
-                             BookmarksSearchParams::Status status) {
+    params.m_onResults = [&](vector<kml::MarkId> const & results, BookmarksSearchParams::Status status)
+    {
       if (status != BookmarksSearchParams::Status::Completed)
         return;
       idsPromise.set_value(results);
diff --git a/libs/map/map_tests/track_statistics_tests.cpp b/libs/map/map_tests/track_statistics_tests.cpp
index 3842a9667..e4be2376a 100644
--- a/libs/map/map_tests/track_statistics_tests.cpp
+++ b/libs/map/map_tests/track_statistics_tests.cpp
@@ -2,8 +2,8 @@
 
 #include "map/track_statistics.hpp"
 
-#include "geometry/point_with_altitude.hpp"
 #include "geometry/mercator.hpp"
+#include "geometry/point_with_altitude.hpp"
 
 #include "kml/types.hpp"
 
@@ -37,21 +37,13 @@ UNIT_TEST(TrackStatistics_FromMultiGeometry)
   auto const point1 = PointWithAltitude({0.0, 0.0}, 100);
   auto const point2 = PointWithAltitude({1.0, 1.0}, 150);
   auto const point3 = PointWithAltitude({2.0, 2.0}, 50);
-  geometry.AddLine({
-    point1,
-    point2,
-    point3
-  });
-  geometry.AddTimestamps({
-    0,
-    1,
-    2
-  });
+  geometry.AddLine({point1, point2, point3});
+  geometry.AddTimestamps({0, 1, 2});
   auto const ts = TrackStatistics(geometry);
   TEST_EQUAL(ts.m_minElevation, 50, ());
   TEST_EQUAL(ts.m_maxElevation, 150, ());
-  TEST_EQUAL(ts.m_ascent, 50, ()); // Ascent from 100 -> 150
-  TEST_EQUAL(ts.m_descent, 100, ()); // Descent from 150 -> 50
+  TEST_EQUAL(ts.m_ascent, 50, ());    // Ascent from 100 -> 150
+  TEST_EQUAL(ts.m_descent, 100, ());  // Descent from 150 -> 50
   TEST_EQUAL(ts.m_duration, 2, ());
 
   double distance = 0;
@@ -63,11 +55,7 @@ UNIT_TEST(TrackStatistics_FromMultiGeometry)
 UNIT_TEST(TrackStatistics_NoAltitudeAndTimestampPoints)
 {
   kml::MultiGeometry geometry;
-  geometry.AddLine({
-    PointWithAltitude({0.0, 0.0}),
-    PointWithAltitude({1.0, 1.0}),
-    PointWithAltitude({2.0, 2.0})
-  });
+  geometry.AddLine({PointWithAltitude({0.0, 0.0}), PointWithAltitude({1.0, 1.0}), PointWithAltitude({2.0, 2.0})});
 
   auto const ts = TrackStatistics(geometry);
 
@@ -81,97 +69,58 @@ UNIT_TEST(TrackStatistics_NoAltitudeAndTimestampPoints)
 UNIT_TEST(TrackStatistics_MultipleLines)
 {
   kml::MultiGeometry geometry;
-  geometry.AddLine({
-    PointWithAltitude({0.0, 0.0}, 100),
-    PointWithAltitude({1.0, 1.0}, 150),
-    PointWithAltitude({1.0, 1.0}, 140)
-  });
-  geometry.AddTimestamps({
-    0,
-    1,
-    2
-  });
-  geometry.AddLine({
-    PointWithAltitude({2.0, 2.0}, 50),
-    PointWithAltitude({3.0, 3.0}, 75),
-    PointWithAltitude({3.0, 3.0}, 60)
-  });
-  geometry.AddTimestamps({
-    0,
-    0,
-    0
-  });
-  geometry.AddLine({
-    PointWithAltitude({4.0, 4.0}, 200),
-    PointWithAltitude({5.0, 5.0}, 250)
-  });
-  geometry.AddTimestamps({
-    4,
-    5
-  });
+  geometry.AddLine(
+      {PointWithAltitude({0.0, 0.0}, 100), PointWithAltitude({1.0, 1.0}, 150), PointWithAltitude({1.0, 1.0}, 140)});
+  geometry.AddTimestamps({0, 1, 2});
+  geometry.AddLine(
+      {PointWithAltitude({2.0, 2.0}, 50), PointWithAltitude({3.0, 3.0}, 75), PointWithAltitude({3.0, 3.0}, 60)});
+  geometry.AddTimestamps({0, 0, 0});
+  geometry.AddLine({PointWithAltitude({4.0, 4.0}, 200), PointWithAltitude({5.0, 5.0}, 250)});
+  geometry.AddTimestamps({4, 5});
   auto const ts = TrackStatistics(geometry);
 
   TEST_EQUAL(ts.m_minElevation, 50, ());
   TEST_EQUAL(ts.m_maxElevation, 250, ());
-  TEST_EQUAL(ts.m_ascent, 125, ()); // Ascent from 100 -> 150, 50 -> 75, 200 -> 250
-  TEST_EQUAL(ts.m_descent, 25, ()); // Descent from 150 -> 140, 75 -> 60
+  TEST_EQUAL(ts.m_ascent, 125, ());  // Ascent from 100 -> 150, 50 -> 75, 200 -> 250
+  TEST_EQUAL(ts.m_descent, 25, ());  // Descent from 150 -> 140, 75 -> 60
   TEST_EQUAL(ts.m_duration, 3, ());
 }
 
 UNIT_TEST(TrackStatistics_WithGpsPoints)
 {
-  const std::vector<std::vector<GpsInfo>> pointsData = {
-    { BuildGpsInfo(0.0, 0.0, 0, 0),
-      BuildGpsInfo(1.0, 1.0, 50, 1),
-      BuildGpsInfo(2.0, 2.0, 100, 2)
-    },
-    {
-      BuildGpsInfo(3.0, 3.0, -50, 5)
-    },
-    {
-      BuildGpsInfo(4.0, 4.0, 0, 10)
-    }
-  };
+  std::vector<std::vector<GpsInfo>> const pointsData = {
+      {BuildGpsInfo(0.0, 0.0, 0, 0), BuildGpsInfo(1.0, 1.0, 50, 1), BuildGpsInfo(2.0, 2.0, 100, 2)},
+      {BuildGpsInfo(3.0, 3.0, -50, 5)},
+      {BuildGpsInfo(4.0, 4.0, 0, 10)}};
   TrackStatistics ts;
   for (auto const & pointsList : pointsData)
-  {
     for (auto const & point : pointsList)
       ts.AddGpsInfoPoint(point);
-  }
   TEST_EQUAL(ts.m_minElevation, -50, ());
   TEST_EQUAL(ts.m_maxElevation, 100, ());
-  TEST_EQUAL(ts.m_ascent, 150, ()); // Ascent from 0 -> 50, 50 -> 100, -50 -> 0
-  TEST_EQUAL(ts.m_descent, 150, ()); // Descent from 100 -> -50
+  TEST_EQUAL(ts.m_ascent, 150, ());   // Ascent from 0 -> 50, 50 -> 100, -50 -> 0
+  TEST_EQUAL(ts.m_descent, 150, ());  // Descent from 100 -> -50
   TEST_EQUAL(ts.m_duration, 10, ());
 }
 
 UNIT_TEST(TrackStatistics_PositiveAndNegativeAltitudes)
 {
   kml::MultiGeometry geometry;
-  geometry.AddLine({
-    PointWithAltitude({0.0, 0.0}, -10),
-    PointWithAltitude({1.0, 1.0}, 20),
-    PointWithAltitude({2.0, 2.0}, -5),
-    PointWithAltitude({3.0, 3.0}, 15)
-  });
+  geometry.AddLine({PointWithAltitude({0.0, 0.0}, -10), PointWithAltitude({1.0, 1.0}, 20),
+                    PointWithAltitude({2.0, 2.0}, -5), PointWithAltitude({3.0, 3.0}, 15)});
   auto const ts = TrackStatistics(geometry);
 
   TEST_EQUAL(ts.m_minElevation, -10, ());
   TEST_EQUAL(ts.m_maxElevation, 20, ());
-  TEST_EQUAL(ts.m_ascent, 50, ()); // Ascent from -10 -> 20 and -5 -> 15
-  TEST_EQUAL(ts.m_descent, 25, ()); // Descent from 20 -> -5
+  TEST_EQUAL(ts.m_ascent, 50, ());   // Ascent from -10 -> 20 and -5 -> 15
+  TEST_EQUAL(ts.m_descent, 25, ());  // Descent from 20 -> -5
 }
 
 UNIT_TEST(TrackStatistics_SmallAltitudeDelta)
 {
-  const std::vector<GpsInfo> points = {
-    BuildGpsInfo(0.0, 0.0, 0),
-    BuildGpsInfo(1.0, 1.0, 0.2),
-    BuildGpsInfo(2.0, 2.0, 0.4),
-    BuildGpsInfo(3.0, 3.0, 0.6),
-    BuildGpsInfo(4.0, 4.0, 0.8),
-    BuildGpsInfo(5.0, 5.0, 1.0)
-  };
+  std::vector<GpsInfo> const points = {BuildGpsInfo(0.0, 0.0, 0),   BuildGpsInfo(1.0, 1.0, 0.2),
+                                       BuildGpsInfo(2.0, 2.0, 0.4), BuildGpsInfo(3.0, 3.0, 0.6),
+                                       BuildGpsInfo(4.0, 4.0, 0.8), BuildGpsInfo(5.0, 5.0, 1.0)};
 
   TrackStatistics ts;
   for (auto const & point : points)
@@ -189,32 +138,21 @@ UNIT_TEST(TrackStatistics_MixedMultiGeometryAndGpsPoints)
   auto const point1 = PointWithAltitude({0.0, 0.0}, 100);
   auto const point2 = PointWithAltitude({1.0, 1.0}, 150);
   auto const point3 = PointWithAltitude({2.0, 2.0}, 50);
-  geometry.AddLine({
-    point1,
-    point2,
-    point3
-  });
-  geometry.AddTimestamps({
-    5,
-    6,
-    7
-  });
+  geometry.AddLine({point1, point2, point3});
+  geometry.AddTimestamps({5, 6, 7});
 
   auto ts = TrackStatistics(geometry);
 
-  const std::vector<GpsInfo> points = {
-    BuildGpsInfo(3.0, 3.0, 60, 8),
-    BuildGpsInfo(4.0, 4.0, 160, 10),
-    BuildGpsInfo(4.0, 4.0, 20, 15)
-  };
+  std::vector<GpsInfo> const points = {BuildGpsInfo(3.0, 3.0, 60, 8), BuildGpsInfo(4.0, 4.0, 160, 10),
+                                       BuildGpsInfo(4.0, 4.0, 20, 15)};
 
   for (auto const & point : points)
     ts.AddGpsInfoPoint(point);
 
   TEST_EQUAL(ts.m_minElevation, 20, ());
   TEST_EQUAL(ts.m_maxElevation, 160, ());
-  TEST_EQUAL(ts.m_ascent, 160, ()); // 50 + 10 + 100
-  TEST_EQUAL(ts.m_descent, 240, ()); // 100 + 140
-  TEST_EQUAL(ts.m_duration, 10, ()); // 10
+  TEST_EQUAL(ts.m_ascent, 160, ());   // 50 + 10 + 100
+  TEST_EQUAL(ts.m_descent, 240, ());  // 100 + 140
+  TEST_EQUAL(ts.m_duration, 10, ());  // 10
 }
-} // namespace track_statistics_tests
+}  // namespace track_statistics_tests
diff --git a/libs/map/map_tests/transliteration_test.cpp b/libs/map/map_tests/transliteration_test.cpp
index b764af1aa..9cf908fed 100644
--- a/libs/map/map_tests/transliteration_test.cpp
+++ b/libs/map/map_tests/transliteration_test.cpp
@@ -7,8 +7,8 @@
 
 namespace
 {
-void TestTransliteration(Transliteration const & translit, std::string const & locale,
-                         std::string const & original, std::string const & expected)
+void TestTransliteration(Transliteration const & translit, std::string const & locale, std::string const & original,
+                         std::string const & expected)
 {
   std::string out;
   translit.Transliterate(original, StringUtf8Multilang::GetLangIndex(locale), out);
@@ -31,7 +31,7 @@ UNIT_TEST(Transliteration_CompareSamples)
   TestTransliteration(translit, "he", "עברית", "bryt");
   TestTransliteration(translit, "el", "Ελληνικά", "Ellenika");
   TestTransliteration(translit, "zh_pinyin", "拼音", "pin yin");
-  TestTransliteration(translit, "th", "ไทย", ""); // Thai-Latin transliteration is off.
+  TestTransliteration(translit, "th", "ไทย", "");  // Thai-Latin transliteration is off.
   TestTransliteration(translit, "sr", "Српски", "Srpski");
   TestTransliteration(translit, "uk", "Українська", "Ukrayinska");
   TestTransliteration(translit, "fa", "فارسی", "farsy");
diff --git a/libs/map/mwm_tests/multithread_mwm_test.cpp b/libs/map/mwm_tests/multithread_mwm_test.cpp
index 06fb18b30..3c441425b 100644
--- a/libs/map/mwm_tests/multithread_mwm_test.cpp
+++ b/libs/map/mwm_tests/multithread_mwm_test.cpp
@@ -9,7 +9,6 @@
 
 #include <algorithm>
 
-
 namespace multithread_mwm_test
 {
 using SourceT = FeaturesFetcher;
@@ -95,4 +94,4 @@ UNIT_TEST(Threading_ForEachFeature)
   RunTest("minsk-pass");
 }
 
-} // namespace multithread_mwm_test
+}  // namespace multithread_mwm_test
diff --git a/libs/map/mwm_tests/mwm_foreach_test.cpp b/libs/map/mwm_tests/mwm_foreach_test.cpp
index f9538c66c..149c42f99 100644
--- a/libs/map/mwm_tests/mwm_foreach_test.cpp
+++ b/libs/map/mwm_tests/mwm_foreach_test.cpp
@@ -70,16 +70,10 @@ protected:
     m_cont.push_back(f.GetID().m_index);
   }
 
-  void add(FeatureType const &, uint32_t index) const
-  {
-    m_cont.push_back(index);
-  }
+  void add(FeatureType const &, uint32_t index) const { m_cont.push_back(index); }
 
 public:
-  AccumulatorBase(int scale, Cont & cont)
-    : m_cont(cont), m_scale(scale)
-  {
-  }
+  AccumulatorBase(int scale, Cont & cont) : m_cont(cont), m_scale(scale) {}
 
   void operator()(FeatureType & f) const
   {
@@ -96,19 +90,14 @@ class IntersectCheck
   bool m_isPrev, m_intersect;
 
 public:
-  explicit IntersectCheck(m2::RectD const & r)
-    : m_rect(r), m_isPrev(false), m_intersect(false)
-  {
-  }
+  explicit IntersectCheck(m2::RectD const & r) : m_rect(r), m_isPrev(false), m_intersect(false) {}
 
-  void TestPoint(m2::PointD const & p)
-  {
-    m_intersect = m_rect.IsPointInside(p);
-  }
+  void TestPoint(m2::PointD const & p) { m_intersect = m_rect.IsPointInside(p); }
 
-  void operator() (m2::PointD const & pt)
+  void operator()(m2::PointD const & pt)
   {
-    if (m_intersect) return;
+    if (m_intersect)
+      return;
 
     if (m_isPrev)
     {
@@ -122,11 +111,12 @@ public:
     m_prev = pt;
   }
 
-  void operator() (m2::PointD const & p1, m2::PointD const & p2, m2::PointD const & p3)
+  void operator()(m2::PointD const & p1, m2::PointD const & p2, m2::PointD const & p3)
   {
-    if (m_intersect) return;
+    if (m_intersect)
+      return;
 
-    m2::PointD arrP[] = { p1, p2, p3 };
+    m2::PointD arrP[] = {p1, p2, p3};
 
     // make right-oriented triangle
     if (m2::robust::OrientedS(arrP[0], arrP[1], arrP[2]) < 0.0)
@@ -172,18 +162,14 @@ class AccumulatorEtalon : public AccumulatorBase
     case GeomType::Point: check.TestPoint(f.GetCenter()); break;
     case GeomType::Line: f.ForEachPoint(check, m_scale); break;
     case GeomType::Area: f.ForEachTriangle(check, m_scale); break;
-    default:
-      CHECK ( false, () );
+    default: CHECK(false, ());
     }
 
     return check.IsIntersect();
   }
 
 public:
-  AccumulatorEtalon(m2::RectD const & r, int scale, Cont & cont)
-    : base_type(scale, cont), m_rect(r)
-  {
-  }
+  AccumulatorEtalon(m2::RectD const & r, int scale, Cont & cont) : base_type(scale, cont), m_rect(r) {}
 
   void operator()(FeatureType & f, uint32_t index) const
   {
@@ -203,10 +189,7 @@ struct FeatureIDCmp
       return 1;
     return 0;
   }
-  bool operator() (uint32_t r1, uint32_t r2) const
-  {
-    return (compare(r1, r2) == -1);
-  }
+  bool operator()(uint32_t r1, uint32_t r2) const { return (compare(r1, r2) == -1); }
 };
 
 /// Check that "test" contains all elements from "etalon".
@@ -219,16 +202,16 @@ bool compare_sequence(TCont const & etalon, TCont const & test, TCompare comp, s
   {
     switch (comp.compare(*i1, *i2))
     {
-    case 0:   // equal
+    case 0:  // equal
       ++i1;
       ++i2;
       break;
     case -1:  // present in etalon, but missing in test - error
-      {
-        errInd = distance(etalon.begin(), i1);
-        return false;
-      }
-    case 1:   // present in test, but missing in etalon - actually it may be ok
+    {
+      errInd = distance(etalon.begin(), i1);
+      return false;
+    }
+    case 1:  // present in test, but missing in etalon - actually it may be ok
       ++i2;
       break;
     }
@@ -249,9 +232,7 @@ class FindOffset
   uint32_t m_index;
 
 public:
-  FindOffset(int level, uint32_t index)
-    : m_level(level), m_index(index)
-  {}
+  FindOffset(int level, uint32_t index) : m_level(level), m_index(index) {}
 
   void operator()(FeatureType & ft, uint32_t index)
   {
@@ -309,7 +290,8 @@ void RunTest(string const & countryFileName)
         feature::ForEachFeature(reader, doFind);
       }
 
-      TEST(false, ("Failed for rect:", r, "; Scale level:", scale, "; Etalon size:", v2.size(), "; Index size:", v1.size()));
+      TEST(false,
+           ("Failed for rect:", r, "; Scale level:", scale, "; Etalon size:", v2.size(), "; Index size:", v1.size()));
     }
 
     if (!v2.empty() && (scale < scales::GetUpperScale()))
@@ -324,10 +306,10 @@ void RunTest(string const & countryFileName)
 
 /// @todo The concept of this test became invalid after POI filtering when overlap in geometry index.
 /// Probably, will restore it with a new idea someday. Like build and check separate index without filtering.
-//UNIT_TEST(ForEach_QueryResults)
+// UNIT_TEST(ForEach_QueryResults)
 //{
-//  GetStyleReader().SetCurrentStyle(MapStyleMerged);
-//  RunTest("minsk-pass");
-//}
+//   GetStyleReader().SetCurrentStyle(MapStyleMerged);
+//   RunTest("minsk-pass");
+// }
 
-} // namespace mwm_for_each_test
+}  // namespace mwm_for_each_test
diff --git a/libs/map/mwm_tests/mwm_index_test.cpp b/libs/map/mwm_tests/mwm_index_test.cpp
index 5bc30f9e5..73f656a3f 100644
--- a/libs/map/mwm_tests/mwm_index_test.cpp
+++ b/libs/map/mwm_tests/mwm_index_test.cpp
@@ -2,8 +2,8 @@
 
 #include "map/features_fetcher.hpp"
 
-#include "indexer/scales.hpp"
 #include "indexer/classificator_loader.hpp"
+#include "indexer/scales.hpp"
 
 #include <string>
 #include <vector>
@@ -17,16 +17,13 @@ class CheckNonEmptyGeometry
 public:
   vector<FeatureID> m_ids;
 
-  void operator() (FeatureID const & id)
-  {
-    m_ids.push_back(id);
-  }
+  void operator()(FeatureID const & id) { m_ids.push_back(id); }
 
   void operator()(FeatureType & ft)
   {
     bool res = false;
-    ft.ForEachPoint([&res] (m2::PointD const &) { res = true; }, m_scale);
-    ft.ForEachTriangle([&res] (m2::PointD const &, m2::PointD const &, m2::PointD const &) { res = true; }, m_scale);
+    ft.ForEachPoint([&res](m2::PointD const &) { res = true; }, m_scale);
+    ft.ForEachTriangle([&res](m2::PointD const &, m2::PointD const &, m2::PointD const &) { res = true; }, m_scale);
 
     TEST(res, (ft.DebugString(), "Scale =", m_scale));
   }
diff --git a/libs/map/mwm_tests/world_map_test.cpp b/libs/map/mwm_tests/world_map_test.cpp
index 3139e857d..9307f695b 100644
--- a/libs/map/mwm_tests/world_map_test.cpp
+++ b/libs/map/mwm_tests/world_map_test.cpp
@@ -13,7 +13,7 @@ UNIT_TEST(World_Capitals)
 {
   classificator::Load();
   auto const capitalType = classif().GetTypeByPath({"place", "city", "capital", "2"});
-  std::set<std::string_view> testCapitals = { "Lisbon", "Warsaw", "Kyiv", "Roseau" };
+  std::set<std::string_view> testCapitals = {"Lisbon", "Warsaw", "Kyiv", "Roseau"};
 
   platform::LocalCountryFile localFile(platform::LocalCountryFile::MakeForTesting(WORLD_FILE_NAME));
 
diff --git a/libs/map/mwm_url.cpp b/libs/map/mwm_url.cpp
index f49e9c0cc..ee7e3f32c 100644
--- a/libs/map/mwm_url.cpp
+++ b/libs/map/mwm_url.cpp
@@ -4,11 +4,11 @@
 #include "map/bookmark_manager.hpp"
 #include "map/framework.hpp"
 
-#include "ge0/parser.hpp"
 #include "ge0/geo_url_parser.hpp"
+#include "ge0/parser.hpp"
 
-#include "geometry/mercator.hpp"
 #include "geometry/latlon.hpp"
+#include "geometry/mercator.hpp"
 #include "indexer/scales.hpp"
 
 #include "drape_frontend/visual_params.hpp"
@@ -62,12 +62,10 @@ std::string_view constexpr kSearchOnMap = "map";
 namespace highlight_feature
 {
 std::string_view constexpr kHighlight = "highlight";
-}  // namespace feature highlight
+}  // namespace highlight_feature
 
 // See also kGe0Prefixes in ge0/parser.hpp
-constexpr std::array<std::string_view, 3> kLegacyMwmPrefixes = {{
-  "mapsme://", "mwm://", "mapswithme://"
-}};
+constexpr std::array<std::string_view, 3> kLegacyMwmPrefixes = {{"mapsme://", "mwm://", "mapswithme://"}};
 
 bool ParseLatLon(std::string const & key, std::string const & value, double & lat, double & lon)
 {
@@ -78,8 +76,7 @@ bool ParseLatLon(std::string const & key, std::string const & value, double & la
     return false;
   }
 
-  if (!strings::to_double(value.substr(0, firstComma), lat) ||
-      !strings::to_double(value.substr(firstComma + 1), lon))
+  if (!strings::to_double(value.substr(0, firstComma), lat) || !strings::to_double(value.substr(firstComma + 1), lon))
   {
     LOG(LWARNING, ("Map API: can't parse lat,lon for key:", key, " value:", value));
     return false;
@@ -98,15 +95,11 @@ bool ParseLatLon(std::string const & key, std::string const & value, double & la
 std::tuple<size_t, bool> FindUrlPrefix(std::string const & url)
 {
   for (auto const prefix : ge0::Ge0Parser::kGe0Prefixes)
-  {
     if (url.starts_with(prefix))
       return {prefix.size(), true};
-  }
   for (auto const prefix : kLegacyMwmPrefixes)
-  {
     if (url.starts_with(prefix))
       return {prefix.size(), false};
-  }
   return {std::string::npos, false};
 }
 }  // namespace
@@ -122,7 +115,7 @@ ParsedMapApi::UrlType ParsedMapApi::SetUrlAndParse(std::string const & raw)
 
   if (auto const [prefix, checkForGe0Link] = FindUrlPrefix(raw); prefix != std::string::npos)
   {
-    url::Url const url {"cm://" + raw.substr(prefix)};
+    url::Url const url{"cm://" + raw.substr(prefix)};
     if (!url.IsValid())
       return m_requestType = UrlType::Incorrect;
 
@@ -133,9 +126,7 @@ ParsedMapApi::UrlType ParsedMapApi::SetUrlAndParse(std::string const & raw)
     {
       bool correctOrder = true;
       url.ForEachParam([&correctOrder, this](auto const & key, auto const & value)
-      {
-        ParseMapParam(key, value, correctOrder);
-      });
+      { ParseMapParam(key, value, correctOrder); });
 
       if (m_mapPoints.empty() || !correctOrder)
         return m_requestType = UrlType::Incorrect;
@@ -148,9 +139,7 @@ ParsedMapApi::UrlType ParsedMapApi::SetUrlAndParse(std::string const & raw)
       using namespace route;
       std::vector pattern{kSourceLatLon, kSourceName, kDestLatLon, kDestName, kRouteType};
       url.ForEachParam([&pattern, this](auto const & key, auto const & value)
-      {
-        ParseRouteParam(key, value, pattern);
-      });
+      { ParseRouteParam(key, value, pattern); });
 
       if (pattern.size() != 0)
         return m_requestType = UrlType::Incorrect;
@@ -162,10 +151,7 @@ ParsedMapApi::UrlType ParsedMapApi::SetUrlAndParse(std::string const & raw)
     }
     else if (type == "search")
     {
-      url.ForEachParam([this](auto const & key, auto const & value)
-      {
-        ParseSearchParam(key, value);
-      });
+      url.ForEachParam([this](auto const & key, auto const & value) { ParseSearchParam(key, value); });
       if (m_searchRequest.m_query.empty())
         return m_requestType = UrlType::Incorrect;
 
@@ -173,27 +159,18 @@ ParsedMapApi::UrlType ParsedMapApi::SetUrlAndParse(std::string const & raw)
     }
     else if (type == "crosshair")
     {
-      url.ForEachParam([this](auto const & key, auto const & value)
-      {
-         ParseCommonParam(key, value);
-      });
+      url.ForEachParam([this](auto const & key, auto const & value) { ParseCommonParam(key, value); });
 
       return m_requestType = UrlType::Crosshair;
     }
     else if (type == "menu")
     {
-      url.ForEachParam([this](auto const & key, auto const & value)
-      {
-        ParseInAppFeatureHighlightParam(key, value);
-      });
+      url.ForEachParam([this](auto const & key, auto const & value) { ParseInAppFeatureHighlightParam(key, value); });
       return m_requestType = UrlType::Menu;
     }
     else if (type == "settings")
     {
-      url.ForEachParam([this](auto const & key, auto const & value)
-      {
-        ParseInAppFeatureHighlightParam(key, value);
-      });
+      url.ForEachParam([this](auto const & key, auto const & value) { ParseInAppFeatureHighlightParam(key, value); });
       return m_requestType = UrlType::Settings;
     }
     else if (type == "oauth2")
@@ -250,7 +227,7 @@ ParsedMapApi::UrlType ParsedMapApi::SetUrlAndParse(std::string const & raw)
     }
     else
     {
-     // The URL doesn't have "q=" parameter => convert to a Map API request.
+      // The URL doesn't have "q=" parameter => convert to a Map API request.
       ASSERT(info.IsLatLonValid(), ());
       m_centerLatLon = {info.m_lat, info.m_lon};
       m_zoomLevel = info.m_zoom;
@@ -373,8 +350,8 @@ void ParsedMapApi::ParseRouteParam(std::string const & key, std::string const &
   else if (key == kRouteType)
   {
     std::string const lowerValue = strings::MakeLowerCase(value);
-    if (lowerValue == kRouteTypePedestrian || lowerValue == kRouteTypeVehicle ||
-        lowerValue == kRouteTypeBicycle || lowerValue == kRouteTypeTransit)
+    if (lowerValue == kRouteTypePedestrian || lowerValue == kRouteTypeVehicle || lowerValue == kRouteTypeBicycle ||
+        lowerValue == kRouteTypeTransit)
     {
       m_routingType = lowerValue;
     }
@@ -433,7 +410,6 @@ void ParsedMapApi::ParseInAppFeatureHighlightParam(std::string const & key, std:
     m_inAppFeatureHighlightRequest.m_feature = ParseInAppFeatureType(value);
 }
 
-
 void ParsedMapApi::Reset()
 {
   m_requestType = UrlType::Incorrect;
@@ -441,7 +417,7 @@ void ParsedMapApi::Reset()
   m_routePoints.clear();
   m_searchRequest = {};
   m_oauth2code = {};
-  m_globalBackUrl ={};
+  m_globalBackUrl = {};
   m_appName = {};
   m_centerLatLon = ms::LatLon::Invalid();
   m_routingType = {};
@@ -480,16 +456,12 @@ void ParsedMapApi::ExecuteMapApiRequest(Framework & fm) const
   // Calculate the best zoom.
   int zoomLevel;
   if (m_mapPoints.size() == 1)
-  {
     if (m_zoomLevel >= 1.0)  // 0 means uninitialized/not passed to the API.
       zoomLevel = std::min(scales::GetUpperComfortScale(), static_cast<int>(m_zoomLevel));
     else
       zoomLevel = scales::GetUpperComfortScale();
-  }
   else
-  {
     zoomLevel = df::GetDrawTileScale(viewport);
-  }
 
   // Always hide current map selection.
   fm.DeactivateMapSelection();
@@ -516,7 +488,7 @@ void ParsedMapApi::ExecuteMapApiRequest(Framework & fm) const
 
 std::string DebugPrint(ParsedMapApi::UrlType type)
 {
-  switch(type)
+  switch (type)
   {
   case ParsedMapApi::UrlType::Incorrect: return "Incorrect";
   case ParsedMapApi::UrlType::Map: return "Map";
diff --git a/libs/map/mwm_url.hpp b/libs/map/mwm_url.hpp
index 3c7c807a4..0941ca242 100644
--- a/libs/map/mwm_url.hpp
+++ b/libs/map/mwm_url.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "geometry/point2d.hpp"
 #include "geometry/latlon.hpp"
+#include "geometry/point2d.hpp"
 
 #include <string>
 #include <vector>
@@ -66,7 +66,7 @@ public:
   explicit ParsedMapApi(std::string const & url) { SetUrlAndParse(url); }
 
   UrlType SetUrlAndParse(std::string const & url);
-  UrlType GetRequestType() const { return m_requestType; };
+  UrlType GetRequestType() const { return m_requestType; }
   std::string const & GetGlobalBackUrl() const { return m_globalBackUrl; }
   std::string const & GetAppName() const { return m_appName; }
   ms::LatLon GetCenterLatLon() const { return m_centerLatLon; }
@@ -122,10 +122,8 @@ public:
   }
 
 private:
-  void ParseMapParam(std::string const & key, std::string const & value,
-                     bool & correctOrder);
-  void ParseRouteParam(std::string const & key, std::string const & value,
-                       std::vector<std::string_view> & pattern);
+  void ParseMapParam(std::string const & key, std::string const & value, bool & correctOrder);
+  void ParseRouteParam(std::string const & key, std::string const & value, std::vector<std::string_view> & pattern);
   void ParseSearchParam(std::string const & key, std::string const & value);
   void ParseInAppFeatureHighlightParam(std::string const & key, std::string const & value);
   void ParseCommonParam(std::string const & key, std::string const & value);
diff --git a/libs/map/place_page_info.cpp b/libs/map/place_page_info.cpp
index 52dc1c462..a315ea9ae 100644
--- a/libs/map/place_page_info.cpp
+++ b/libs/map/place_page_info.cpp
@@ -6,13 +6,13 @@
 #include "indexer/ftypes_matcher.hpp"
 #include "indexer/road_shields_parser.hpp"
 
+#include "platform/distance.hpp"
+#include "platform/duration.hpp"
 #include "platform/localization.hpp"
 #include "platform/measurement_utils.hpp"
 #include "platform/preferred_languages.hpp"
-#include "platform/utm_mgrs_utils.hpp"
-#include "platform/distance.hpp"
-#include "platform/duration.hpp"
 #include "platform/settings.hpp"
+#include "platform/utm_mgrs_utils.hpp"
 
 #include "geometry/mercator.hpp"
 
@@ -20,7 +20,6 @@
 
 #include "3party/open-location-code/openlocationcode.h"
 
-
 namespace place_page
 {
 
@@ -44,8 +43,8 @@ void Info::SetFromFeatureType(FeatureType & ft)
   auto const mwmInfo = GetID().m_mwmId.GetInfo();
   if (mwmInfo)
   {
-    feature::GetPreferredNames({ m_name, mwmInfo->GetRegionData(), languages::GetCurrentMapLanguage(),
-                               true /* allowTranslit */} , out);
+    feature::GetPreferredNames(
+        {m_name, mwmInfo->GetRegionData(), languages::GetCurrentMapLanguage(), true /* allowTranslit */}, out);
   }
 
   bool emptyTitle = false;
@@ -74,18 +73,15 @@ void Info::SetFromFeatureType(FeatureType & ft)
     m_uiTitle = m_primaryFeatureName;
     m_uiSecondaryTitle = out.secondary;
   }
-  else
+  else if (IsBuilding())
   {
-    if (IsBuilding())
-    {
-      emptyTitle = m_address.empty();
-      if (!emptyTitle)
-        m_uiTitle = m_address;
-      m_uiAddress.clear();    // already in main title
-    }
-    else
-      emptyTitle = true;
+    emptyTitle = m_address.empty();
+    if (!emptyTitle)
+      m_uiTitle = m_address;
+    m_uiAddress.clear();  // already in main title
   }
+  else
+    emptyTitle = true;
 
   // Assign Feature's type if main title is empty.
   if (emptyTitle)
@@ -121,11 +117,12 @@ std::string Info::FormatSubtitle(bool withTypes, bool withMainType) const
     result += sv;
   };
 
-  /// @todo(KK): Remove, when the category name will be displayed in the "Edit cell" on the Place Page on the specific platform.
-  #if !defined(TARGET_OS_IPHONE)
+/// @todo(KK): Remove, when the category name will be displayed in the "Edit cell" on the Place Page on the specific
+/// platform.
+#if !defined(TARGET_OS_IPHONE)
   if (IsBookmark())
     append(m_bookmarkCategoryName);
-  #endif
+#endif
 
   if (!withTypes)
     return result;
@@ -242,10 +239,11 @@ void Info::SetTitlesForBookmark()
   m_uiTitle = GetBookmarkName();
 
   std::vector<std::string> subtitle;
-  /// @todo(KK): Remove, when the category name will be displayed in the "edit" of the cell on the Place Page on the specific platform.
-  #if !defined(TARGET_OS_IPHONE)
+/// @todo(KK): Remove, when the category name will be displayed in the "edit" of the cell on the Place Page on the
+/// specific platform.
+#if !defined(TARGET_OS_IPHONE)
   subtitle.push_back(m_bookmarkCategoryName);
-  #endif
+#endif
   if (!m_bookmarkData.m_featureTypes.empty())
     subtitle.push_back(GetLocalizedFeatureType(m_bookmarkData.m_featureTypes));
   m_uiSubtitle = strings::JoinStrings(subtitle, feature::kFieldsSeparator);
@@ -264,10 +262,11 @@ void Info::SetCustomName(std::string const & name)
 void Info::SetTitlesForTrack(Track const & track)
 {
   m_uiTitle = track.GetName();
-  /// @todo(KK): Remove, when the category name will be displayed in the "Edit cell" on the Place Page on the specific platform.
-  #if !defined(TARGET_OS_IPHONE)
+/// @todo(KK): Remove, when the category name will be displayed in the "Edit cell" on the Place Page on the specific
+/// platform.
+#if !defined(TARGET_OS_IPHONE)
   m_uiSubtitle = m_bookmarkCategoryName;
-  #endif
+#endif
 
   std::vector<std::string> statistics;
   auto const length = track.GetLengthMeters();
@@ -294,8 +293,7 @@ void Info::SetCustomNameWithCoordinates(m2::PointD const & mercator, std::string
   else
   {
     m_uiTitle = name;
-    m_uiSubtitle = measurement_utils::FormatLatLon(
-        mercator::YToLat(mercator.y), mercator::XToLon(mercator.x),
+    m_uiSubtitle = measurement_utils::FormatLatLon(mercator::YToLat(mercator.y), mercator::XToLon(mercator.x),
                                                    true /* withComma */);
   }
   m_customName = name;
@@ -358,31 +356,31 @@ std::string Info::GetFormattedCoordinate(CoordinatesFormat coordsFormat) const
   auto const lon = ll.m_lon;
   switch (coordsFormat)
   {
-    default:
-    case CoordinatesFormat::LatLonDMS: // DMS, comma separated
-      return measurement_utils::FormatLatLonAsDMS(lat, lon, false /*withComma*/, 2);
-    case CoordinatesFormat::LatLonDecimal: // Decimal, comma separated
-      return measurement_utils::FormatLatLon(lat, lon, true /* withComma */);
-    case CoordinatesFormat::OLCFull: // Open location code, long format
-      return openlocationcode::Encode({lat, lon});
-    case CoordinatesFormat::OSMLink: // Link to osm.org
-      return measurement_utils::FormatOsmLink(lat, lon, 14);
-    case CoordinatesFormat::UTM:  // Universal Transverse Mercator
-    {
-      std::string utmCoords = utm_mgrs_utils::FormatUTM(lat, lon);
-      if (utmCoords.empty())
-        return "UTM: N/A";
-      else
-        return "UTM: " + utmCoords;
-    }
-    case CoordinatesFormat::MGRS: // Military Grid Reference System
-    {
-      std::string mgrsCoords = utm_mgrs_utils::FormatMGRS(lat, lon, 5);
-      if (mgrsCoords.empty())
-        return "MGRS: N/A";
-      else
-        return "MGRS: " + mgrsCoords;
-    }
+  default:
+  case CoordinatesFormat::LatLonDMS:  // DMS, comma separated
+    return measurement_utils::FormatLatLonAsDMS(lat, lon, false /*withComma*/, 2);
+  case CoordinatesFormat::LatLonDecimal:  // Decimal, comma separated
+    return measurement_utils::FormatLatLon(lat, lon, true /* withComma */);
+  case CoordinatesFormat::OLCFull:  // Open location code, long format
+    return openlocationcode::Encode({lat, lon});
+  case CoordinatesFormat::OSMLink:  // Link to osm.org
+    return measurement_utils::FormatOsmLink(lat, lon, 14);
+  case CoordinatesFormat::UTM:  // Universal Transverse Mercator
+  {
+    std::string utmCoords = utm_mgrs_utils::FormatUTM(lat, lon);
+    if (utmCoords.empty())
+      return "UTM: N/A";
+    else
+      return "UTM: " + utmCoords;
+  }
+  case CoordinatesFormat::MGRS:  // Military Grid Reference System
+  {
+    std::string mgrsCoords = utm_mgrs_utils::FormatMGRS(lat, lon, 5);
+    if (mgrsCoords.empty())
+      return "MGRS: N/A";
+    else
+      return "MGRS: " + mgrsCoords;
+  }
   }
 }
 
diff --git a/libs/map/place_page_info.hpp b/libs/map/place_page_info.hpp
index 649c68c6f..e36dfad5e 100644
--- a/libs/map/place_page_info.hpp
+++ b/libs/map/place_page_info.hpp
@@ -32,12 +32,12 @@ enum class OpeningMode
 
 enum class CoordinatesFormat
 {
-  LatLonDMS = 0, // DMS, comma separated
-  LatLonDecimal, // Decimal, comma separated
-  OLCFull, // Open location code, long format
-  OSMLink, // Link to osm.org
-  UTM, // Universal Transverse Mercator
-  MGRS // Military Grid Reference System
+  LatLonDMS = 0,  // DMS, comma separated
+  LatLonDecimal,  // Decimal, comma separated
+  OLCFull,        // Open location code, long format
+  OSMLink,        // Link to osm.org
+  UTM,            // Universal Transverse Mercator
+  MGRS            // Military Grid Reference System
 };
 
 struct BuildInfo
@@ -69,20 +69,11 @@ struct BuildInfo
     , m_userMarkId(info.m_markTapped)
   {}
 
-  bool IsFeatureMatchingEnabled() const
-  {
-    return m_match == Match::Everything || m_match == Match::FeatureOnly;
-  }
+  bool IsFeatureMatchingEnabled() const { return m_match == Match::Everything || m_match == Match::FeatureOnly; }
 
-  bool IsUserMarkMatchingEnabled() const
-  {
-    return m_match == Match::Everything || m_match == Match::UserMarkOnly;
-  }
+  bool IsUserMarkMatchingEnabled() const { return m_match == Match::Everything || m_match == Match::UserMarkOnly; }
 
-  bool IsTrackMatchingEnabled() const
-  {
-    return m_match == Match::Everything || m_match == Match::TrackOnly;
-  }
+  bool IsTrackMatchingEnabled() const { return m_match == Match::Everything || m_match == Match::TrackOnly; }
 
   Source m_source = Source::Other;
   m2::PointD m_mercator;
@@ -100,7 +91,6 @@ struct BuildInfo
 class Info : public osm::MapObject
 {
 public:
-
   void SetBuildInfo(place_page::BuildInfo const & info) { m_buildInfo = info; }
   place_page::BuildInfo const & GetBuildInfo() const { return m_buildInfo; }
 
@@ -118,8 +108,8 @@ public:
   bool ShouldShowAddBusiness() const { return IsBuilding(); }
   bool ShouldShowEditPlace() const;
 
-  bool ShouldEnableAddPlace() const { return m_canEditOrAdd; };
-  bool ShouldEnableEditPlace() const { return m_canEditOrAdd; };
+  bool ShouldEnableAddPlace() const { return m_canEditOrAdd; }
+  bool ShouldEnableEditPlace() const { return m_canEditOrAdd; }
 
   /// @returns true if Back API button should be displayed.
   bool HasApiUrl() const { return !m_apiUrl.empty(); }
@@ -130,12 +120,15 @@ public:
   kml::LocalizableString FormatNewBookmarkName() const;
 
   /// For showing in UI
-  std::string const & GetTitle() const { return m_uiTitle; };
+  std::string const & GetTitle() const { return m_uiTitle; }
   /// Convenient wrapper for secondary feature name.
-  std::string const & GetSecondaryTitle() const { return m_uiSecondaryTitle; };
+  std::string const & GetSecondaryTitle() const { return m_uiSecondaryTitle; }
   /// Convenient wrapper for type, cuisines, elevation, stars, wifi etc.
-  std::string const & GetSubtitle() const { return m_uiSubtitle; };
-  std::string const & GetSecondarySubtitle() const { return !m_uiTrackStatistics.empty() ? m_uiTrackStatistics : m_uiAddress; };
+  std::string const & GetSubtitle() const { return m_uiSubtitle; }
+  std::string const & GetSecondarySubtitle() const
+  {
+    return !m_uiTrackStatistics.empty() ? m_uiTrackStatistics : m_uiAddress;
+  }
   std::string const & GetWikiDescription() const { return m_description; }
   /// @returns coordinate in DMS format if isDMS is true
   std::string GetFormattedCoordinate(CoordinatesFormat format) const;
@@ -161,8 +154,8 @@ public:
   kml::BookmarkData const & GetBookmarkData() const { return m_bookmarkData; }
 
   /// Track
-  void SetTrackId(kml::TrackId trackId) { m_trackId = trackId; };
-  kml::TrackId GetTrackId() const { return m_trackId; };
+  void SetTrackId(kml::TrackId trackId) { m_trackId = trackId; }
+  kml::TrackId GetTrackId() const { return m_trackId; }
 
   /// Api
   void SetApiId(std::string const & apiId) { m_apiId = apiId; }
@@ -282,7 +275,7 @@ private:
 
   bool m_isHotel = false;
 
-  //uint8_t m_popularity = 0;
+  // uint8_t m_popularity = 0;
 
   std::string m_primaryFeatureName;
 
diff --git a/libs/map/power_management/power_management_schemas.cpp b/libs/map/power_management/power_management_schemas.cpp
index ae8ba65b6..b10c200da 100644
--- a/libs/map/power_management/power_management_schemas.cpp
+++ b/libs/map/power_management/power_management_schemas.cpp
@@ -8,60 +8,82 @@ using namespace power_management;
 
 namespace
 {
-std::unordered_map<Scheme, FacilitiesState> const kSchemeToState =
-{
-  {
-    Scheme::Normal,
-    {{
-       /* Buildings3d */ true, /* PerspectiveView */ true, /* TrackRecording */ true,
-       /* TrafficJams */ true, /* GpsTrackingForTraffic */ true, /* OsmEditsUploading */ true,
-       /* UgcUploading */ true, /* BookmarkCloudUploading */ true, /* MapDownloader */ true,
-     }}
-  },
-  {
-    Scheme::EconomyMedium,
-    {{
-       /* Buildings3d */ true, /* PerspectiveView */ false, /* TrackRecording */ true,
-       /* TrafficJams */ true, /* GpsTrackingForTraffic */ true, /* OsmEditsUploading */ true,
-       /* UgcUploading */ true, /* BookmarkCloudUploading */ false, /* MapDownloader */ true,
-     }}
-  },
-  {
-    Scheme::EconomyMaximum,
-    {{
-       /* Buildings3d */ false, /* PerspectiveView */ false, /* TrackRecording */ false,
-       /* TrafficJams */ false, /* GpsTrackingForTraffic */ false, /* OsmEditsUploading */ false,
-       /* UgcUploading */ false, /* BookmarkCloudUploading */ false, /* MapDownloader */ true,
-     }}
-  },
+std::unordered_map<Scheme, FacilitiesState> const kSchemeToState = {
+    {Scheme::Normal,
+     {{
+         /* Buildings3d */ true,
+         /* PerspectiveView */ true,
+         /* TrackRecording */ true,
+         /* TrafficJams */ true,
+         /* GpsTrackingForTraffic */ true,
+         /* OsmEditsUploading */ true,
+         /* UgcUploading */ true,
+         /* BookmarkCloudUploading */ true,
+         /* MapDownloader */ true,
+     }}},
+    {Scheme::EconomyMedium,
+     {{
+         /* Buildings3d */ true,
+         /* PerspectiveView */ false,
+         /* TrackRecording */ true,
+         /* TrafficJams */ true,
+         /* GpsTrackingForTraffic */ true,
+         /* OsmEditsUploading */ true,
+         /* UgcUploading */ true,
+         /* BookmarkCloudUploading */ false,
+         /* MapDownloader */ true,
+     }}},
+    {Scheme::EconomyMaximum,
+     {{
+         /* Buildings3d */ false,
+         /* PerspectiveView */ false,
+         /* TrackRecording */ false,
+         /* TrafficJams */ false,
+         /* GpsTrackingForTraffic */ false,
+         /* OsmEditsUploading */ false,
+         /* UgcUploading */ false,
+         /* BookmarkCloudUploading */ false,
+         /* MapDownloader */ true,
+     }}},
 };
 
-std::unordered_map<AutoScheme, FacilitiesState> const kAutoSchemeToState =
-{
-  {
-    AutoScheme::Normal,
-    {{
-       /* Buildings3d */ true, /* PerspectiveView */ true, /* TrackRecording */ true,
-       /* TrafficJams */ true, /* GpsTrackingForTraffic */ true, /* OsmEditsUploading */ true,
-       /* UgcUploading */ true, /* BookmarkCloudUploading */ true, /* MapDownloader */ true,
-     }}
-  },
-  {
-    AutoScheme::EconomyMedium,
-    {{
-       /* Buildings3d */ true, /* PerspectiveView */ false, /* TrackRecording */ true,
-       /* TrafficJams */ true, /* GpsTrackingForTraffic */ false, /* OsmEditsUploading */ true,
-       /* UgcUploading */ true, /* BookmarkCloudUploading */ false, /* MapDownloader */ false,
-     }}
-  },
-  {
-    AutoScheme::EconomyMaximum,
-    {{
-       /* Buildings3d */ false, /* PerspectiveView */ false, /* TrackRecording */ false,
-       /* TrafficJams */ false, /* GpsTrackingForTraffic */ false, /* OsmEditsUploading */ false,
-       /* UgcUploading */ false, /* BookmarkCloudUploading */ false, /* MapDownloader */ false,
-     }}
-  },
+std::unordered_map<AutoScheme, FacilitiesState> const kAutoSchemeToState = {
+    {AutoScheme::Normal,
+     {{
+         /* Buildings3d */ true,
+         /* PerspectiveView */ true,
+         /* TrackRecording */ true,
+         /* TrafficJams */ true,
+         /* GpsTrackingForTraffic */ true,
+         /* OsmEditsUploading */ true,
+         /* UgcUploading */ true,
+         /* BookmarkCloudUploading */ true,
+         /* MapDownloader */ true,
+     }}},
+    {AutoScheme::EconomyMedium,
+     {{
+         /* Buildings3d */ true,
+         /* PerspectiveView */ false,
+         /* TrackRecording */ true,
+         /* TrafficJams */ true,
+         /* GpsTrackingForTraffic */ false,
+         /* OsmEditsUploading */ true,
+         /* UgcUploading */ true,
+         /* BookmarkCloudUploading */ false,
+         /* MapDownloader */ false,
+     }}},
+    {AutoScheme::EconomyMaximum,
+     {{
+         /* Buildings3d */ false,
+         /* PerspectiveView */ false,
+         /* TrackRecording */ false,
+         /* TrafficJams */ false,
+         /* GpsTrackingForTraffic */ false,
+         /* OsmEditsUploading */ false,
+         /* UgcUploading */ false,
+         /* BookmarkCloudUploading */ false,
+         /* MapDownloader */ false,
+     }}},
 };
 }  // namespace
 
diff --git a/libs/map/power_management/power_manager.cpp b/libs/map/power_management/power_manager.cpp
index fc3f33cd1..249a5dda4 100644
--- a/libs/map/power_management/power_manager.cpp
+++ b/libs/map/power_management/power_manager.cpp
@@ -55,9 +55,7 @@ void PowerManager::Load()
       GetPlatform().GetBatteryTracker().Subscribe(this);
 
     for (size_t i = 0; i < m_config.m_facilities.size(); ++i)
-    {
       NotifySubscribers(m_subscribers, static_cast<Facility>(i), m_config.m_facilities[i]);
-    }
 
     NotifySubscribers(m_subscribers, m_config.m_scheme);
     return;
@@ -131,10 +129,8 @@ void PowerManager::SetScheme(Scheme const scheme)
   NotifySubscribers(m_subscribers, m_config.m_scheme);
 
   for (size_t i = 0; i < actualState.size(); ++i)
-  {
     if (m_config.m_facilities[i] != actualState[i])
       NotifySubscribers(m_subscribers, static_cast<Facility>(i), m_config.m_facilities[i]);
-  }
 }
 
 bool PowerManager::IsFacilityEnabled(Facility const facility) const
@@ -178,10 +174,8 @@ void PowerManager::OnBatteryLevelReceived(uint8_t level)
     return;
 
   for (size_t i = 0; i < actualState.size(); ++i)
-  {
     if (m_config.m_facilities[i] != actualState[i])
       NotifySubscribers(m_subscribers, static_cast<Facility>(i), m_config.m_facilities[i]);
-  }
 }
 
 void PowerManager::Subscribe(Subscriber * subscriber)
@@ -197,26 +191,26 @@ void PowerManager::UnsubscribeAll()
 
 bool PowerManager::Save()
 {
-  auto const result =
-      base::WriteToTempAndRenameToFile(GetConfigPath(), [this](std::string const & fileName) {
-        try
-        {
-          FileWriter writer(fileName);
-          coding::SerializerJson<FileWriter> ser(writer);
-          ser(m_config);
-          return true;
-        }
-        catch (base::Json::Exception & ex)
-        {
-          LOG(LERROR, ("Cannot serialize power manager data into file. Exception:", ex.Msg()));
-        }
-        catch (FileWriter::Exception const & ex)
-        {
-          LOG(LERROR, ("Cannot write power manager file. Exception:", ex.Msg()));
-        }
+  auto const result = base::WriteToTempAndRenameToFile(GetConfigPath(), [this](std::string const & fileName)
+  {
+    try
+    {
+      FileWriter writer(fileName);
+      coding::SerializerJson<FileWriter> ser(writer);
+      ser(m_config);
+      return true;
+    }
+    catch (base::Json::Exception & ex)
+    {
+      LOG(LERROR, ("Cannot serialize power manager data into file. Exception:", ex.Msg()));
+    }
+    catch (FileWriter::Exception const & ex)
+    {
+      LOG(LERROR, ("Cannot write power manager file. Exception:", ex.Msg()));
+    }
 
-        return false;
-      });
+    return false;
+  });
 
   if (result)
     return true;
diff --git a/libs/map/power_management/power_manager.hpp b/libs/map/power_management/power_manager.hpp
index 4d6935631..d6f437d7b 100644
--- a/libs/map/power_management/power_manager.hpp
+++ b/libs/map/power_management/power_manager.hpp
@@ -21,6 +21,7 @@ public:
   public:
     virtual void OnPowerFacilityChanged(Facility const facility, bool enabled) = 0;
     virtual void OnPowerSchemeChanged(Scheme const actualScheme) = 0;
+
   protected:
     virtual ~Subscriber() = default;
   };
diff --git a/libs/map/routing_manager.cpp b/libs/map/routing_manager.cpp
index 9bdf8f520..beb7bc562 100644
--- a/libs/map/routing_manager.cpp
+++ b/libs/map/routing_manager.cpp
@@ -52,8 +52,7 @@ string const kRoutePointsFile = "route_points.dat";
 
 uint32_t constexpr kInvalidTransactionId = 0;
 
-void FillTurnsDistancesForRendering(vector<RouteSegment> const & segments,
-                                    double baseDistance, vector<double> & turns)
+void FillTurnsDistancesForRendering(vector<RouteSegment> const & segments, double baseDistance, vector<double> & turns)
 {
   using namespace routing::turns;
   turns.clear();
@@ -72,8 +71,7 @@ void FillTurnsDistancesForRendering(vector<RouteSegment> const & segments,
   }
 }
 
-void FillTrafficForRendering(vector<RouteSegment> const & segments,
-                             vector<traffic::SpeedGroup> & traffic)
+void FillTrafficForRendering(vector<RouteSegment> const & segments, vector<traffic::SpeedGroup> & traffic)
 {
   traffic.clear();
   traffic.reserve(segments.size());
@@ -150,8 +148,7 @@ string SerializeRoutePoints(vector<RouteMarkData> const & points)
     SerializeRoutePoint(pointNode.get(), p);
     json_array_append_new(pointsNode.get(), pointNode.release());
   }
-  unique_ptr<char, JSONFreeDeleter> buffer(
-    json_dumps(pointsNode.get(), JSON_COMPACT));
+  unique_ptr<char, JSONFreeDeleter> buffer(json_dumps(pointsNode.get(), JSON_COMPACT));
   return string(buffer.get());
 }
 
@@ -312,31 +309,28 @@ drape_ptr<df::Subroute> CreateDrapeSubroute(vector<RouteSegment> const & segment
 RoutingManager::RoutingManager(Callbacks && callbacks, Delegate & delegate)
   : m_callbacks(std::move(callbacks))
   , m_delegate(delegate)
-  , m_extrapolator(
-        [this](location::GpsInfo const & gpsInfo) { this->OnExtrapolatedLocationUpdate(gpsInfo); })
+  , m_extrapolator([this](location::GpsInfo const & gpsInfo) { this->OnExtrapolatedLocationUpdate(gpsInfo); })
 {
-  m_extrapolator.Enable(true); // Keeps smooth arrow movement whether routing or not
+  m_extrapolator.Enable(true);  // Keeps smooth arrow movement whether routing or not
   m_routingSession.Init(
 #ifdef SHOW_ROUTE_DEBUG_MARKS
-                        [this](m2::PointD const & pt) {
-                          if (m_bmManager == nullptr)
-                            return;
-                          auto editSession = m_bmManager->GetEditSession();
-                          editSession.SetIsVisible(UserMark::Type::DEBUG_MARK, true);
-                          editSession.CreateUserMark<DebugMarkPoint>(pt);
-                        }
+      [this](m2::PointD const & pt)
+  {
+    if (m_bmManager == nullptr)
+      return;
+    auto editSession = m_bmManager->GetEditSession();
+    editSession.SetIsVisible(UserMark::Type::DEBUG_MARK, true);
+    editSession.CreateUserMark<DebugMarkPoint>(pt);
+  }
 #else
-                        nullptr
+      nullptr
 #endif
   );
 
-  m_routingSession.SetRoutingCallbacks(
-      [this](Route const & route, RouterResultCode code) { OnBuildRouteReady(route, code); },
-      [this](Route const & route, RouterResultCode code) { OnRebuildRouteReady(route, code); },
-      [this](uint64_t routeId, storage::CountriesSet const & absentCountries) {
-        OnNeedMoreMaps(routeId, absentCountries);
-      },
-      [this](RouterResultCode code) { OnRemoveRoute(code); });
+  m_routingSession.SetRoutingCallbacks([this](Route const & route, RouterResultCode code)
+  { OnBuildRouteReady(route, code); }, [this](Route const & route, RouterResultCode code)
+  { OnRebuildRouteReady(route, code); }, [this](uint64_t routeId, storage::CountriesSet const & absentCountries)
+  { OnNeedMoreMaps(routeId, absentCountries); }, [this](RouterResultCode code) { OnRemoveRoute(code); });
 
   m_routingSession.SetCheckpointCallback([this](size_t passedCheckpointIdx)
   {
@@ -347,7 +341,7 @@ RoutingManager::RoutingManager(Callbacks && callbacks, Delegate & delegate)
       // TODO(@bykoianko). Since routing system may invoke callbacks from different threads and here
       // we have to use gui thread, ASSERT is not correct. Uncomment it and delete condition after
       // refactoring of threads usage in routing system.
-      //ASSERT_LESS(passedCheckpointIdx, pointsCount, ());
+      // ASSERT_LESS(passedCheckpointIdx, pointsCount, ());
       if (passedCheckpointIdx >= pointsCount)
         return;
 
@@ -418,9 +412,8 @@ void RoutingManager::OnBuildRouteReady(Route const & route, RouterResultCode cod
   {
     m2::RectD routeRect = route.GetPoly().GetLimitRect();
     routeRect.Scale(kRouteScaleMultiplier);
-    m_drapeEngine.SafeCall(&df::DrapeEngine::SetModelViewRect, routeRect,
-                           true /* applyRotation */, -1 /* zoom */, true /* isAnim */,
-                           true /* useVisibleViewport */);
+    m_drapeEngine.SafeCall(&df::DrapeEngine::SetModelViewRect, routeRect, true /* applyRotation */, -1 /* zoom */,
+                           true /* isAnim */, true /* useVisibleViewport */);
   }
 
   CallRouteBuilded(hasWarnings ? RouterResultCode::HasWarnings : code, storage::CountriesSet());
@@ -473,8 +466,7 @@ void RoutingManager::OnLocationUpdate(location::GpsInfo const & info)
   m_extrapolator.OnLocationUpdate(info);
 }
 
-RouterType RoutingManager::GetBestRouter(m2::PointD const & startPoint,
-                                         m2::PointD const & finalPoint) const
+RouterType RoutingManager::GetBestRouter(m2::PointD const & startPoint, m2::PointD const & finalPoint) const
 {
   // todo Implement something more sophisticated here (or delete the method).
   return GetLastUsedRouter();
@@ -507,7 +499,8 @@ void RoutingManager::SetRouterImpl(RouterType type)
 
   m_loadAltitudes = vehicleType != VehicleType::Car;
 
-  auto const countryFileGetter = [this](m2::PointD const & p) -> string {
+  auto const countryFileGetter = [this](m2::PointD const & p) -> string
+  {
     // TODO (@gorshenin): fix CountryInfoGetter to return CountryFile
     // instances instead of plain strings.
     return m_callbacks.m_countryInfoGetter().GetRegionCountryId(p);
@@ -518,27 +511,25 @@ void RoutingManager::SetRouterImpl(RouterType type)
 
   auto & dataSource = m_callbacks.m_dataSourceGetter();
 
-  auto localFileChecker = [this](string const & countryFile) -> bool {
-    MwmSet::MwmId const mwmId = m_callbacks.m_dataSourceGetter().GetMwmIdByCountryFile(
-      platform::CountryFile(countryFile));
+  auto localFileChecker = [this](string const & countryFile) -> bool
+  {
+    MwmSet::MwmId const mwmId =
+        m_callbacks.m_dataSourceGetter().GetMwmIdByCountryFile(platform::CountryFile(countryFile));
     return mwmId.IsAlive();
   };
 
-  auto const getMwmRectByName = [this](string const & countryId) -> m2::RectD {
-    return m_callbacks.m_countryInfoGetter().GetLimitRectForLeaf(countryId);
-  };
+  auto const getMwmRectByName = [this](string const & countryId) -> m2::RectD
+  { return m_callbacks.m_countryInfoGetter().GetLimitRectForLeaf(countryId); };
 
-  auto regionsFinder =
-      make_unique<AbsentRegionsFinder>(countryFileGetter, localFileChecker, numMwmIds, dataSource);
+  auto regionsFinder = make_unique<AbsentRegionsFinder>(countryFileGetter, localFileChecker, numMwmIds, dataSource);
 
   std::unique_ptr<IRouter> router;
   if (type == RouterType::Ruler)
     router = make_unique<RulerRouter>();
   else
-    router = make_unique<IndexRouter>(vehicleType, m_loadAltitudes, m_callbacks.m_countryParentNameGetterFn,
-                                         countryFileGetter, getMwmRectByName, numMwmIds,
-                                         MakeNumMwmTree(*numMwmIds, m_callbacks.m_countryInfoGetter()),
-                                         m_routingSession, dataSource);
+    router = make_unique<IndexRouter>(
+        vehicleType, m_loadAltitudes, m_callbacks.m_countryParentNameGetterFn, countryFileGetter, getMwmRectByName,
+        numMwmIds, MakeNumMwmTree(*numMwmIds, m_callbacks.m_countryInfoGetter()), m_routingSession, dataSource);
 
   m_routingSession.SetRoutingSettings(GetRoutingSettings(vehicleType));
   m_routingSession.SetRouter(std::move(router), std::move(regionsFinder));
@@ -563,8 +554,7 @@ void RoutingManager::RemoveRoute(bool deactivateFollowing)
   {
     m_transitReadManager->BlockTransitSchemeMode(false /* isBlocked */);
     // Remove all subroutes.
-    m_drapeEngine.SafeCall(&df::DrapeEngine::RemoveSubroute,
-                           dp::DrapeID(), true /* deactivateFollowing */);
+    m_drapeEngine.SafeCall(&df::DrapeEngine::RemoveSubroute, dp::DrapeID(), true /* deactivateFollowing */);
   }
   else
   {
@@ -584,9 +574,9 @@ void RoutingManager::RemoveRoute(bool deactivateFollowing)
   }
 }
 
-void RoutingManager::CollectRoadWarnings(vector<routing::RouteSegment> const & segments,
-                                         m2::PointD const & startPt, double baseDistance,
-                                         GetMwmIdFn const & getMwmIdFn, RoadWarningsCollection & roadWarnings)
+void RoutingManager::CollectRoadWarnings(vector<routing::RouteSegment> const & segments, m2::PointD const & startPt,
+                                         double baseDistance, GetMwmIdFn const & getMwmIdFn,
+                                         RoadWarningsCollection & roadWarnings)
 {
   auto const isWarnedType = [](RoutingOptions::Road roadType)
   {
@@ -613,8 +603,8 @@ void RoutingManager::CollectRoadWarnings(vector<routing::RouteSegment> const & s
       if (isWarnedType(currentType))
       {
         startDistance = currentDistance;
-        auto const featureId = FeatureID(getMwmIdFn(segments[i].GetSegment().GetMwmId()),
-                                         segments[i].GetSegment().GetFeatureId());
+        auto const featureId =
+            FeatureID(getMwmIdFn(segments[i].GetSegment().GetMwmId()), segments[i].GetSegment().GetFeatureId());
         auto const markPoint = i == 0 ? startPt : segments[i - 1].GetJunction().GetPoint();
         roadWarnings[currentType].push_back(RoadInfo(markPoint, featureId));
       }
@@ -662,9 +652,7 @@ bool RoutingManager::InsertRoute(Route const & route)
   auto numMwmIds = make_shared<NumMwmIds>();
   m_delegate.RegisterCountryFilesOnRoute(numMwmIds);
   auto const getMwmId = [this, numMwmIds](routing::NumMwmId numMwmId)
-  {
-    return m_callbacks.m_dataSourceGetter().GetMwmIdByCountryFile(numMwmIds->GetFile(numMwmId));
-  };
+  { return m_callbacks.m_dataSourceGetter().GetMwmIdByCountryFile(numMwmIds->GetFile(numMwmId)); };
 
   RoadWarningsCollection roadWarnings;
 
@@ -672,9 +660,8 @@ bool RoutingManager::InsertRoute(Route const & route)
   shared_ptr<TransitRouteDisplay> transitRouteDisplay;
   if (isTransitRoute)
   {
-    transitRouteDisplay = make_shared<TransitRouteDisplay>(*m_transitReadManager, getMwmId,
-                                                           m_callbacks.m_stringsBundleGetter,
-                                                           m_bmManager, m_transitSymbolSizes);
+    transitRouteDisplay = make_shared<TransitRouteDisplay>(
+        *m_transitReadManager, getMwmId, m_callbacks.m_stringsBundleGetter, m_bmManager, m_transitSymbolSizes);
   }
 
   vector<RouteSegment> segments;
@@ -686,57 +673,56 @@ bool RoutingManager::InsertRoute(Route const & route)
 
     auto const startPt = route.GetSubrouteAttrs(subrouteIndex).GetStart().GetPoint();
     auto subroute = CreateDrapeSubroute(segments, startPt, distance,
-                                        static_cast<double>(subroutesCount - subrouteIndex - 1),
-                                        m_currentRouterType);
+                                        static_cast<double>(subroutesCount - subrouteIndex - 1), m_currentRouterType);
     if (!subroute)
       continue;
     distance = segments.back().GetDistFromBeginningMerc();
     switch (m_currentRouterType)
     {
-      case RouterType::Vehicle:
-        {
-          subroute->m_routeType = df::RouteType::Car;
-          subroute->AddStyle(df::SubrouteStyle(df::kRouteColor, df::kRouteOutlineColor));
-          FillTrafficForRendering(segments, subroute->m_traffic);
-          FillTurnsDistancesForRendering(segments, subroute->m_baseDistance, subroute->m_turns);
-          break;
-        }
-      case RouterType::Transit:
-        {
-          subroute->m_routeType = df::RouteType::Transit;
-          if (!transitRouteDisplay->ProcessSubroute(segments, *subroute.get()))
-            continue;
-          break;
-        }
-      case RouterType::Pedestrian:
-        {
-          subroute->m_routeType = df::RouteType::Pedestrian;
-          subroute->AddStyle(df::SubrouteStyle(df::kRoutePedestrian, df::RoutePattern(4.0, 2.0)));
-          break;
-        }
-      case RouterType::Bicycle:
-        {
-          subroute->m_routeType = df::RouteType::Bicycle;
-          subroute->AddStyle(df::SubrouteStyle(df::kRouteBicycle, df::RoutePattern(8.0, 2.0)));
-          FillTurnsDistancesForRendering(segments, subroute->m_baseDistance, subroute->m_turns);
-          break;
-        }
-      case RouterType::Ruler:
-        {
-          subroute->m_routeType = df::RouteType::Ruler;
-          subroute->AddStyle(df::SubrouteStyle(df::kRouteRuler, df::RoutePattern(16.0, 2.0)));
-          break;
-        }
-      default: CHECK(false, ("Unknown router type"));
+    case RouterType::Vehicle:
+    {
+      subroute->m_routeType = df::RouteType::Car;
+      subroute->AddStyle(df::SubrouteStyle(df::kRouteColor, df::kRouteOutlineColor));
+      FillTrafficForRendering(segments, subroute->m_traffic);
+      FillTurnsDistancesForRendering(segments, subroute->m_baseDistance, subroute->m_turns);
+      break;
+    }
+    case RouterType::Transit:
+    {
+      subroute->m_routeType = df::RouteType::Transit;
+      if (!transitRouteDisplay->ProcessSubroute(segments, *subroute.get()))
+        continue;
+      break;
+    }
+    case RouterType::Pedestrian:
+    {
+      subroute->m_routeType = df::RouteType::Pedestrian;
+      subroute->AddStyle(df::SubrouteStyle(df::kRoutePedestrian, df::RoutePattern(4.0, 2.0)));
+      break;
+    }
+    case RouterType::Bicycle:
+    {
+      subroute->m_routeType = df::RouteType::Bicycle;
+      subroute->AddStyle(df::SubrouteStyle(df::kRouteBicycle, df::RoutePattern(8.0, 2.0)));
+      FillTurnsDistancesForRendering(segments, subroute->m_baseDistance, subroute->m_turns);
+      break;
+    }
+    case RouterType::Ruler:
+    {
+      subroute->m_routeType = df::RouteType::Ruler;
+      subroute->AddStyle(df::SubrouteStyle(df::kRouteRuler, df::RoutePattern(16.0, 2.0)));
+      break;
+    }
+    default: CHECK(false, ("Unknown router type"));
     }
 
     CollectRoadWarnings(segments, startPt, subroute->m_baseDistance, getMwmId, roadWarnings);
 
-    auto const subrouteId = m_drapeEngine.SafeCallWithResult(&df::DrapeEngine::AddSubroute,
-                                                             df::SubrouteConstPtr(subroute.release()));
+    auto const subrouteId =
+        m_drapeEngine.SafeCallWithResult(&df::DrapeEngine::AddSubroute, df::SubrouteConstPtr(subroute.release()));
 
     // TODO: we will send subrouteId to routing subsystem when we can partly update route.
-    //route.SetSubrouteUid(subrouteIndex, static_cast<SubrouteUid>(subrouteId));
+    // route.SetSubrouteUid(subrouteIndex, static_cast<SubrouteUid>(subrouteId));
     lock_guard<mutex> lock(m_drapeSubroutesMutex);
     m_drapeSubroutes.push_back(subrouteId);
   }
@@ -749,9 +735,7 @@ bool RoutingManager::InsertRoute(Route const & route)
   if (isTransitRoute)
   {
     GetPlatform().RunTask(Platform::Thread::Gui, [transitRouteDisplay = std::move(transitRouteDisplay)]()
-    {
-      transitRouteDisplay->CreateTransitMarks();
-    });
+    { transitRouteDisplay->CreateTransitMarks(); });
   }
 
   bool const hasWarnings = !roadWarnings.empty();
@@ -834,8 +818,8 @@ bool RoutingManager::CouldAddIntermediatePoint() const
   if (!IsRoutingActive())
     return false;
 
-  return m_bmManager->GetUserMarkIds(UserMark::Type::ROUTING).size()
-    < RoutePointsLayout::kMaxIntermediatePointsCount + 2;
+  return m_bmManager->GetUserMarkIds(UserMark::Type::ROUTING).size() <
+         RoutePointsLayout::kMaxIntermediatePointsCount + 2;
 }
 
 void RoutingManager::AddRoutePoint(RouteMarkData && markData, bool reorderIntermediatePoints)
@@ -910,8 +894,7 @@ void RoutingManager::MoveRoutePoint(RouteMarkType currentType, size_t currentInt
 {
   ASSERT(m_bmManager != nullptr, ());
   RoutePointsLayout routePoints(*m_bmManager);
-  routePoints.MoveRoutePoint(currentType, currentIntermediateIndex,
-                             targetType, targetIntermediateIndex);
+  routePoints.MoveRoutePoint(currentType, currentIntermediateIndex, targetType, targetIntermediateIndex);
 }
 
 void RoutingManager::MoveRoutePoint(size_t currentIndex, size_t targetIndex)
@@ -920,7 +903,8 @@ void RoutingManager::MoveRoutePoint(size_t currentIndex, size_t targetIndex)
 
   RoutePointsLayout routePoints(*m_bmManager);
   size_t const sz = routePoints.GetRoutePointsCount();
-  auto const convertIndex = [sz](RouteMarkType & type, size_t & index) {
+  auto const convertIndex = [sz](RouteMarkType & type, size_t & index)
+  {
     if (index == 0)
     {
       type = RouteMarkType::Start;
@@ -1051,10 +1035,10 @@ void RoutingManager::BuildRoute(uint32_t timeoutSec)
   // Disabled preview zoom to fix https://github.com/organicmaps/organicmaps/issues/5409.
   // Uncomment next lines to enable back zoom on route point add/remove.
 
-  //m2::RectD rect = ShowPreviewSegments(routePoints);
-  //rect.Scale(kRouteScaleMultiplier);
-  //m_drapeEngine.SafeCall(&df::DrapeEngine::SetModelViewRect, rect, true /* applyRotation */,
-  //                       -1 /* zoom */, true /* isAnim */, true /* useVisibleViewport */);
+  // m2::RectD rect = ShowPreviewSegments(routePoints);
+  // rect.Scale(kRouteScaleMultiplier);
+  // m_drapeEngine.SafeCall(&df::DrapeEngine::SetModelViewRect, rect, true /* applyRotation */,
+  //                        -1 /* zoom */, true /* isAnim */, true /* useVisibleViewport */);
 
   m_routingSession.ClearPositionAccumulator();
   m_routingSession.SetUserCurrentPosition(routePoints.front().m_position);
@@ -1100,17 +1084,10 @@ kml::TrackId RoutingManager::SaveRoute()
   std::vector<geometry::PointWithAltitude> junctions;
   RoutingSession().GetRouteJunctionPoints(junctions);
 
-  junctions.erase(
-    std::unique(
-      junctions.begin(),
-      junctions.end(),
-      [](const geometry::PointWithAltitude & p1, const geometry::PointWithAltitude & p2)
-      {
-        return AlmostEqualAbs(p1, p2, kMwmPointAccuracy);
-      }
-    ),
-    junctions.end()
-  );
+  junctions.erase(std::unique(junctions.begin(), junctions.end(),
+                              [](geometry::PointWithAltitude const & p1, geometry::PointWithAltitude const & p2)
+  { return AlmostEqualAbs(p1, p2, kMwmPointAccuracy); }),
+                  junctions.end());
 
   auto const routePoints = GetRoutePoints();
   std::string const from = GetNameFromPoint(routePoints.front());
@@ -1139,21 +1116,18 @@ void RoutingManager::CheckLocationForRouting(location::GpsInfo const & info)
   if (state == SessionState::RouteNeedRebuild)
   {
     m_routingSession.RebuildRoute(
-        mercator::FromLatLon(info.m_latitude, info.m_longitude),
-        [this](Route const & route, RouterResultCode code) { OnRebuildRouteReady(route, code); },
-        nullptr /* needMoreMapsCallback */, nullptr /* removeRouteCallback */,
+        mercator::FromLatLon(info.m_latitude, info.m_longitude), [this](Route const & route, RouterResultCode code)
+    { OnRebuildRouteReady(route, code); }, nullptr /* needMoreMapsCallback */, nullptr /* removeRouteCallback */,
         RouterDelegate::kNoTimeout, SessionState::RouteRebuilding, true /* adjustToPrevRoute */);
   }
 }
 
-void RoutingManager::CallRouteBuilded(RouterResultCode code,
-                                      storage::CountriesSet const & absentCountries)
+void RoutingManager::CallRouteBuilded(RouterResultCode code, storage::CountriesSet const & absentCountries)
 {
   m_routingBuildingCallback(code, absentCountries);
 }
 
-void RoutingManager::MatchLocationToRoute(location::GpsInfo & location,
-                                          location::RouteMatchingInfo & routeMatchingInfo)
+void RoutingManager::MatchLocationToRoute(location::GpsInfo & location, location::RouteMatchingInfo & routeMatchingInfo)
 {
   if (!IsRoutingActive())
     return;
@@ -1183,8 +1157,8 @@ void RoutingManager::SetDrapeEngine(ref_ptr<df::DrapeEngine> engine, bool is3dAl
   if (m_gpsInfoCache != nullptr)
   {
     auto routeMatchingInfo = GetRouteMatchingInfo(*m_gpsInfoCache);
-    m_drapeEngine.SafeCall(&df::DrapeEngine::SetGpsInfo, *m_gpsInfoCache,
-                           m_routingSession.IsNavigable(), routeMatchingInfo);
+    m_drapeEngine.SafeCall(&df::DrapeEngine::SetGpsInfo, *m_gpsInfoCache, m_routingSession.IsNavigable(),
+                           routeMatchingInfo);
     m_gpsInfoCache.reset();
   }
 
@@ -1232,17 +1206,22 @@ void RoutingManager::DistanceAltitude::Simplify(double altitudeDeviation)
     size_t m_ind = 0;
 
   public:
-    IterT(DistanceAltitude const & da, bool isBeg) : m_da(da)
-    {
-      m_ind = isBeg ? 0 : m_da.GetSize();
-    }
+    IterT(DistanceAltitude const & da, bool isBeg) : m_da(da) { m_ind = isBeg ? 0 : m_da.GetSize(); }
 
     IterT(IterT const & rhs) = default;
-    IterT & operator=(IterT const & rhs) { m_ind = rhs.m_ind; return *this; }
+    IterT & operator=(IterT const & rhs)
+    {
+      m_ind = rhs.m_ind;
+      return *this;
+    }
 
     bool operator!=(IterT const & rhs) const { return m_ind != rhs.m_ind; }
 
-    IterT & operator++() { ++m_ind; return *this; }
+    IterT & operator++()
+    {
+      ++m_ind;
+      return *this;
+    }
     IterT operator+(size_t inc) const
     {
       IterT res = *this;
@@ -1251,25 +1230,25 @@ void RoutingManager::DistanceAltitude::Simplify(double altitudeDeviation)
     }
     int64_t operator-(IterT const & rhs) const { return int64_t(m_ind) - int64_t(rhs.m_ind); }
 
-    m2::PointD operator*() const { return { m_da.m_distances[m_ind], double(m_da.m_altitudes[m_ind]) }; }
+    m2::PointD operator*() const { return {m_da.m_distances[m_ind], double(m_da.m_altitudes[m_ind])}; }
   };
 
   std::vector<m2::PointD> out;
 
   // 1. Deviation from approximated altitude.
-//  double constexpr eps = 1.415; // ~sqrt(2)
-//  struct DeviationFromApproxY
-//  {
-//    double operator()(m2::PointD const & a, m2::PointD const & b, m2::PointD const & x) const
-//    {
-//      double f = (x.x - a.x) / (b.x - a.x);
-//      ASSERT(0 <= f && f <= 1, (f));  // distance is an icreasing function
-//      double const approxY = (1 - f) * a.y + f * b.y;
-//      return fabs(approxY - x.y);
-//    }
-//  } distFn;
-//  SimplifyNearOptimal(20 /* maxFalseLookAhead */, IterT(*this, true), IterT(*this, false),
-//                      eps, distFn, AccumulateSkipSmallTrg(distFn, out, eps));
+  //  double constexpr eps = 1.415; // ~sqrt(2)
+  //  struct DeviationFromApproxY
+  //  {
+  //    double operator()(m2::PointD const & a, m2::PointD const & b, m2::PointD const & x) const
+  //    {
+  //      double f = (x.x - a.x) / (b.x - a.x);
+  //      ASSERT(0 <= f && f <= 1, (f));  // distance is an icreasing function
+  //      double const approxY = (1 - f) * a.y + f * b.y;
+  //      return fabs(approxY - x.y);
+  //    }
+  //  } distFn;
+  //  SimplifyNearOptimal(20 /* maxFalseLookAhead */, IterT(*this, true), IterT(*this, false),
+  //                      eps, distFn, AccumulateSkipSmallTrg(distFn, out, eps));
 
   // 2. Default square distance from segment.
   SimplifyDefault(IterT(*this, true), IterT(*this, false), math::Pow2(altitudeDeviation), out);
@@ -1284,13 +1263,14 @@ void RoutingManager::DistanceAltitude::Simplify(double altitudeDeviation)
   }
 }
 
-bool RoutingManager::DistanceAltitude::GenerateRouteAltitudeChart(
-      uint32_t width, uint32_t height, vector<uint8_t> & imageRGBAData) const
+bool RoutingManager::DistanceAltitude::GenerateRouteAltitudeChart(uint32_t width, uint32_t height,
+                                                                  vector<uint8_t> & imageRGBAData) const
 {
   if (GetSize() == 0)
     return false;
 
-  return maps::GenerateChart(width, height, m_distances, m_altitudes, GetStyleReader().GetCurrentStyle(), imageRGBAData);
+  return maps::GenerateChart(width, height, m_distances, m_altitudes, GetStyleReader().GetCurrentStyle(),
+                             imageRGBAData);
 }
 
 void RoutingManager::DistanceAltitude::CalculateAscentDescent(uint32_t & totalAscentM, uint32_t & totalDescentM) const
@@ -1353,12 +1333,10 @@ void RoutingManager::ApplyRoutePointsTransaction(uint32_t transactionId)
   // If we apply a transaction we can remove all earlier transactions.
   // All older transactions must be kept since they can be applied or cancelled later.
   for (auto it = m_routePointsTransactions.begin(); it != m_routePointsTransactions.end();)
-  {
     if (it->first <= transactionId)
       it = m_routePointsTransactions.erase(it);
     else
       ++it;
-  }
 }
 
 void RoutingManager::CancelRoutePointsTransaction(uint32_t transactionId)
@@ -1370,12 +1348,10 @@ void RoutingManager::CancelRoutePointsTransaction(uint32_t transactionId)
 
   // If we cancel a transaction we must remove all later transactions.
   for (auto it = m_routePointsTransactions.begin(); it != m_routePointsTransactions.end();)
-  {
     if (it->first >= transactionId)
       it = m_routePointsTransactions.erase(it);
     else
       ++it;
-  }
 
   // Revert route points.
   ASSERT(m_bmManager != nullptr, ());
@@ -1427,8 +1403,7 @@ void RoutingManager::LoadRoutePoints(LoadRouteHandler const & handler)
       return;
     }
 
-    GetPlatform().RunTask(Platform::Thread::Gui,
-                          [this, handler, points = std::move(points)]() mutable
+    GetPlatform().RunTask(Platform::Thread::Gui, [this, handler, points = std::move(points)]() mutable
     {
       ASSERT(m_bmManager != nullptr, ());
       // If we have found my position and the saved route used the user's position, we use my position as start point.
@@ -1527,8 +1502,7 @@ void RoutingManager::OnExtrapolatedLocationUpdate(location::GpsInfo const & info
     m_gpsInfoCache = make_unique<location::GpsInfo>(gpsInfo);
 
   auto routeMatchingInfo = GetRouteMatchingInfo(gpsInfo);
-  m_drapeEngine.SafeCall(&df::DrapeEngine::SetGpsInfo, gpsInfo, m_routingSession.IsNavigable(),
-                         routeMatchingInfo);
+  m_drapeEngine.SafeCall(&df::DrapeEngine::SetGpsInfo, gpsInfo, m_routingSession.IsNavigable(), routeMatchingInfo);
 }
 
 void RoutingManager::DeleteSavedRoutePoints()
@@ -1567,8 +1541,7 @@ m2::RectD RoutingManager::ShowPreviewSegments(vector<RouteMarkData> const & rout
   {
     rect.Add(routePoints[pointIndex].m_position);
     rect.Add(routePoints[pointIndex + 1].m_position);
-    lock.Get()->AddRoutePreviewSegment(routePoints[pointIndex].m_position,
-                                       routePoints[pointIndex + 1].m_position);
+    lock.Get()->AddRoutePreviewSegment(routePoints[pointIndex].m_position, routePoints[pointIndex + 1].m_position);
   }
   return rect;
 }
diff --git a/libs/map/routing_manager.hpp b/libs/map/routing_manager.hpp
index 5e51dfee2..8e3261ac8 100644
--- a/libs/map/routing_manager.hpp
+++ b/libs/map/routing_manager.hpp
@@ -46,7 +46,7 @@ class DataSource;
 
 namespace power_management
 {
-  class PowerManager;
+class PowerManager;
 }
 
 struct RoutePointInfo
@@ -79,19 +79,17 @@ public:
     using GetStringsBundleFn = std::function<StringsBundle const &()>;
     using PowerManagerGetter = std::function<power_management::PowerManager const &()>;
 
-    template <typename DataSourceGetter, typename CountryInfoGetter,
-              typename CountryParentNameGetter, typename StringsBundleGetter,
-              typename PowerManagerGetter>
+    template <typename DataSourceGetter, typename CountryInfoGetter, typename CountryParentNameGetter,
+              typename StringsBundleGetter, typename PowerManagerGetter>
     Callbacks(DataSourceGetter && dataSourceGetter, CountryInfoGetter && countryInfoGetter,
-              CountryParentNameGetter && countryParentNameGetter,
-              StringsBundleGetter && stringsBundleGetter, PowerManagerGetter && powerManagerGetter)
+              CountryParentNameGetter && countryParentNameGetter, StringsBundleGetter && stringsBundleGetter,
+              PowerManagerGetter && powerManagerGetter)
       : m_dataSourceGetter(std::forward<DataSourceGetter>(dataSourceGetter))
       , m_countryInfoGetter(std::forward<CountryInfoGetter>(countryInfoGetter))
       , m_countryParentNameGetterFn(std::forward<CountryParentNameGetter>(countryParentNameGetter))
       , m_stringsBundleGetter(std::forward<StringsBundleGetter>(stringsBundleGetter))
       , m_powerManagerGetter(std::forward<PowerManagerGetter>(powerManagerGetter))
-    {
-    }
+    {}
 
     DataSourceGetterFn m_dataSourceGetter;
     CountryInfoGetterFn m_countryInfoGetter;
@@ -100,12 +98,9 @@ public:
     PowerManagerGetter m_powerManagerGetter;
   };
 
-  using RouteBuildingCallback =
-      std::function<void(routing::RouterResultCode, storage::CountriesSet const &)>;
-  using RouteSpeedCamShowCallback =
-      std::function<void(m2::PointD const &, double)>;
-  using RouteSpeedCamsClearCallback =
-      std::function<void()>;
+  using RouteBuildingCallback = std::function<void(routing::RouterResultCode, storage::CountriesSet const &)>;
+  using RouteSpeedCamShowCallback = std::function<void(m2::PointD const &, double)>;
+  using RouteSpeedCamsClearCallback = std::function<void()>;
 
   using RouteStartBuildCallback = std::function<void(std::vector<RouteMarkData> const & points)>;
 
@@ -170,40 +165,27 @@ public:
   }
   void FollowRoute();
   void CloseRouting(bool removeRoutePoints);
-  void GetRouteFollowingInfo(routing::FollowingInfo & info) const
-  {
-    m_routingSession.GetRouteFollowingInfo(info);
-  }
+  void GetRouteFollowingInfo(routing::FollowingInfo & info) const { m_routingSession.GetRouteFollowingInfo(info); }
 
   TransitRouteInfo GetTransitRouteInfo() const;
 
   m2::PointD GetRouteEndPoint() const { return m_routingSession.GetEndPoint(); }
   /// Returns the most situable router engine type.
-  routing::RouterType GetBestRouter(m2::PointD const & startPoint,
-                                    m2::PointD const & finalPoint) const;
+  routing::RouterType GetBestRouter(m2::PointD const & startPoint, m2::PointD const & finalPoint) const;
   routing::RouterType GetLastUsedRouter() const;
   void SetLastUsedRouter(routing::RouterType type);
   // Sound notifications for turn instructions.
   void EnableTurnNotifications(bool enable) { m_routingSession.EnableTurnNotifications(enable); }
-  bool AreTurnNotificationsEnabled() const
-  {
-    return m_routingSession.AreTurnNotificationsEnabled();
-  }
+  bool AreTurnNotificationsEnabled() const { return m_routingSession.AreTurnNotificationsEnabled(); }
   /// \brief Sets a locale for TTS.
   /// \param locale is a string with locale code. For example "en", "ru", "zh-Hant" and so on.
   /// \note See sound/tts/languages.txt for the full list of available locales.
-  void SetTurnNotificationsLocale(std::string const & locale)
-  {
-    m_routingSession.SetTurnNotificationsLocale(locale);
-  }
+  void SetTurnNotificationsLocale(std::string const & locale) { m_routingSession.SetTurnNotificationsLocale(locale); }
   /// @return current TTS locale. For example "en", "ru", "zh-Hant" and so on.
   /// In case of error returns an empty string.
   /// \note The method returns correct locale after SetTurnNotificationsLocale has been called.
   /// If not, it returns an empty string.
-  std::string GetTurnNotificationsLocale() const
-  {
-    return m_routingSession.GetTurnNotificationsLocale();
-  }
+  std::string GetTurnNotificationsLocale() const { return m_routingSession.GetTurnNotificationsLocale(); }
   // @return polyline of the route.
   routing::FollowedPolyline const & GetRoutePolyline() const
   {
@@ -235,8 +217,8 @@ public:
   void RemoveRoutePoints();
   void RemoveIntermediateRoutePoints();
   void MoveRoutePoint(size_t currentIndex, size_t targetIndex);
-  void MoveRoutePoint(RouteMarkType currentType, size_t currentIntermediateIndex,
-                      RouteMarkType targetType, size_t targetIntermediateIndex);
+  void MoveRoutePoint(RouteMarkType currentType, size_t currentIntermediateIndex, RouteMarkType targetType,
+                      size_t targetIntermediateIndex);
   void HideRoutePoint(RouteMarkType type, size_t intermediateIndex = 0);
   bool CouldAddIntermediatePoint() const;
   bool IsMyPosition(RouteMarkType type, size_t intermediateIndex = 0);
@@ -245,8 +227,7 @@ public:
   void RemoveRoute(bool deactivateFollowing);
 
   void CheckLocationForRouting(location::GpsInfo const & info);
-  void CallRouteBuilded(routing::RouterResultCode code,
-                        storage::CountriesSet const & absentCountries);
+  void CallRouteBuilded(routing::RouterResultCode code, storage::CountriesSet const & absentCountries);
   void OnBuildRouteReady(routing::Route const & route, routing::RouterResultCode code);
   void OnRebuildRouteReady(routing::Route const & route, routing::RouterResultCode code);
   void OnNeedMoreMaps(uint64_t routeId, storage::CountriesSet const & absentCountries);
@@ -330,10 +311,7 @@ private:
   {
     RoadInfo() = default;
 
-    explicit RoadInfo(m2::PointD const & pt, FeatureID const & featureId)
-      : m_startPoint(pt)
-      , m_featureId(featureId)
-    {}
+    explicit RoadInfo(m2::PointD const & pt, FeatureID const & featureId) : m_startPoint(pt), m_featureId(featureId) {}
 
     m2::PointD m_startPoint;
     FeatureID m_featureId;
@@ -341,15 +319,14 @@ private:
   };
   using RoadWarningsCollection = std::map<routing::RoutingOptions::Road, std::vector<RoadInfo>>;
 
-  using GetMwmIdFn = std::function<MwmSet::MwmId (routing::NumMwmId numMwmId)>;
+  using GetMwmIdFn = std::function<MwmSet::MwmId(routing::NumMwmId numMwmId)>;
   void CollectRoadWarnings(std::vector<routing::RouteSegment> const & segments, m2::PointD const & startPt,
                            double baseDistance, GetMwmIdFn const & getMwmIdFn, RoadWarningsCollection & roadWarnings);
   void CreateRoadWarningMarks(RoadWarningsCollection && roadWarnings);
 
   /// \returns false if the location could not be matched to the route and should be matched to the
   /// road graph. Otherwise returns true.
-  void MatchLocationToRoute(location::GpsInfo & info,
-                            location::RouteMatchingInfo & routeMatchingInfo);
+  void MatchLocationToRoute(location::GpsInfo & info, location::RouteMatchingInfo & routeMatchingInfo);
   location::RouteMatchingInfo GetRouteMatchingInfo(location::GpsInfo & info);
   uint32_t GenerateRoutePointsTransactionId() const;
 
diff --git a/libs/map/routing_mark.cpp b/libs/map/routing_mark.cpp
index 9c4b00d1b..eedd14b35 100644
--- a/libs/map/routing_mark.cpp
+++ b/libs/map/routing_mark.cpp
@@ -37,8 +37,7 @@ int constexpr kMinSpeedCameraZoom = 13;
 int constexpr kMinSpeedCameraTitleZoom = 13;
 }  // namespace
 
-RouteMarkPoint::RouteMarkPoint(m2::PointD const & ptOrg)
-  : UserMark(ptOrg, Type::ROUTING)
+RouteMarkPoint::RouteMarkPoint(m2::PointD const & ptOrg) : UserMark(ptOrg, Type::ROUTING)
 {
   m_titleDecl.m_anchor = dp::Top;
   m_titleDecl.m_primaryTextFont.m_color = df::GetColorConstant(kRouteMarkPrimaryText);
@@ -111,18 +110,18 @@ uint16_t RouteMarkPoint::GetPriority() const
 {
   switch (m_markData.m_pointType)
   {
-    case RouteMarkType::Start: return static_cast<uint16_t>(Priority::RouteStart);
-    case RouteMarkType::Finish: return static_cast<uint16_t>(Priority::RouteFinish);
-    case RouteMarkType::Intermediate:
+  case RouteMarkType::Start: return static_cast<uint16_t>(Priority::RouteStart);
+  case RouteMarkType::Finish: return static_cast<uint16_t>(Priority::RouteFinish);
+  case RouteMarkType::Intermediate:
+  {
+    switch (m_markData.m_intermediateIndex)
     {
-      switch (m_markData.m_intermediateIndex)
-      {
-        case 0: return static_cast<uint16_t>(Priority::RouteIntermediateA);
-        case 1: return static_cast<uint16_t>(Priority::RouteIntermediateB);
-        default: return static_cast<uint16_t>(Priority::RouteIntermediateC);
-      }
+    case 0: return static_cast<uint16_t>(Priority::RouteIntermediateA);
+    case 1: return static_cast<uint16_t>(Priority::RouteIntermediateB);
+    default: return static_cast<uint16_t>(Priority::RouteIntermediateC);
     }
   }
+  }
   UNREACHABLE();
 }
 
@@ -130,9 +129,9 @@ uint32_t RouteMarkPoint::GetIndex() const
 {
   switch (m_markData.m_pointType)
   {
-    case RouteMarkType::Start: return 0;
-    case RouteMarkType::Finish: return 1;
-    case RouteMarkType::Intermediate: return static_cast<uint32_t >(m_markData.m_intermediateIndex + 2);
+  case RouteMarkType::Start: return 0;
+  case RouteMarkType::Finish: return 1;
+  case RouteMarkType::Intermediate: return static_cast<uint32_t>(m_markData.m_intermediateIndex + 2);
   }
   UNREACHABLE();
 }
@@ -161,7 +160,6 @@ drape_ptr<df::UserPointMark::TitlesInfo> RouteMarkPoint::GetTitleDecl() const
   return titles;
 }
 
-
 drape_ptr<df::UserPointMark::ColoredSymbolZoomInfo> RouteMarkPoint::GetColoredSymbols() const
 {
   auto coloredSymbol = make_unique_dp<ColoredSymbolZoomInfo>();
@@ -183,16 +181,16 @@ drape_ptr<df::UserPointMark::SymbolNameZoomInfo> RouteMarkPoint::GetSymbolNames(
   std::string name;
   switch (m_markData.m_pointType)
   {
-    case RouteMarkType::Start: name = "route-point-start";  break;
-    case RouteMarkType::Finish: name = "route-point-finish"; break;
-    case RouteMarkType::Intermediate:
-    {
-      /// @todo Draw RouteMarkPoint icons dynamically like SpeedCameraMark.
-      if (m_markData.m_intermediateIndex < 19)
-        name = "route-point-" + std::to_string(m_markData.m_intermediateIndex + 1);
-      else
-        name = "route-point-20";
-    }
+  case RouteMarkType::Start: name = "route-point-start"; break;
+  case RouteMarkType::Finish: name = "route-point-finish"; break;
+  case RouteMarkType::Intermediate:
+  {
+    /// @todo Draw RouteMarkPoint icons dynamically like SpeedCameraMark.
+    if (m_markData.m_intermediateIndex < 19)
+      name = "route-point-" + std::to_string(m_markData.m_intermediateIndex + 1);
+    else
+      name = "route-point-20";
+  }
   }
   auto symbol = make_unique_dp<SymbolNameZoomInfo>();
   symbol->insert(std::make_pair(1 /* zoomLevel */, name));
@@ -313,12 +311,8 @@ void RoutePointsLayout::RemoveRoutePoints()
 
 void RoutePointsLayout::RemoveIntermediateRoutePoints()
 {
-  m_editSession.DeleteUserMarks<RouteMarkPoint>(
-    UserMark::Type::ROUTING,
-    [](RouteMarkPoint const * mark)
-    {
-      return mark->GetRoutePointType() == RouteMarkType::Intermediate;
-    });
+  m_editSession.DeleteUserMarks<RouteMarkPoint>(UserMark::Type::ROUTING, [](RouteMarkPoint const * mark)
+  { return mark->GetRoutePointType() == RouteMarkType::Intermediate; });
 }
 
 bool RoutePointsLayout::MoveRoutePoint(RouteMarkType currentType, size_t currentIntermediateIndex,
@@ -399,9 +393,7 @@ std::vector<RouteMarkPoint *> RoutePointsLayout::GetRoutePoints()
       points.push_back(p);
   }
   std::sort(points.begin(), points.end(), [](RouteMarkPoint const * p1, RouteMarkPoint const * p2)
-  {
-    return p1->GetIntermediateIndex() < p2->GetIntermediateIndex();
-  });
+  { return p1->GetIntermediateIndex() < p2->GetIntermediateIndex(); });
   if (startPoint != nullptr)
     points.insert(points.begin(), startPoint);
   if (finishPoint != nullptr)
@@ -424,9 +416,7 @@ void RoutePointsLayout::ForEachIntermediatePoint(TRoutePointCallback const & fn)
   }
 }
 
-TransitMark::TransitMark(m2::PointD const & ptOrg)
-    : UserMark(ptOrg, Type::TRANSIT)
-{}
+TransitMark::TransitMark(m2::PointD const & ptOrg) : UserMark(ptOrg, Type::TRANSIT) {}
 
 void TransitMark::SetFeatureId(FeatureID const & featureId)
 {
@@ -542,8 +532,7 @@ void TransitMark::GetDefaultTransitTitle(dp::TitleDecl & titleDecl)
   titleDecl.m_secondaryTextFont.m_size = kTransitMarkTextSize;
 }
 
-SpeedCameraMark::SpeedCameraMark(m2::PointD const & ptOrg)
-  : UserMark(ptOrg, Type::SPEED_CAM)
+SpeedCameraMark::SpeedCameraMark(m2::PointD const & ptOrg) : UserMark(ptOrg, Type::SPEED_CAM)
 {
   auto const vs = static_cast<float>(df::VisualParams::Instance().GetVisualScale());
 
@@ -620,9 +609,7 @@ dp::Anchor SpeedCameraMark::GetAnchor() const
   return dp::Center;
 }
 
-RoadWarningMark::RoadWarningMark(m2::PointD const & ptOrg)
-  : UserMark(ptOrg, Type::ROAD_WARNING)
-{}
+RoadWarningMark::RoadWarningMark(m2::PointD const & ptOrg) : UserMark(ptOrg, Type::ROAD_WARNING) {}
 
 uint16_t RoadWarningMark::GetPriority() const
 {
@@ -630,7 +617,7 @@ uint16_t RoadWarningMark::GetPriority() const
   {
     switch (m_type)
     {
-    using enum RoadWarningMarkType;
+      using enum RoadWarningMarkType;
     case Toll: return static_cast<uint16_t>(Priority::RoadWarningFirstToll);
     case Ferry: return static_cast<uint16_t>(Priority::RoadWarningFirstFerry);
     case Dirty: return static_cast<uint16_t>(Priority::RoadWarningFirstDirty);
@@ -669,7 +656,7 @@ drape_ptr<df::UserPointMark::SymbolNameZoomInfo> RoadWarningMark::GetSymbolNames
   std::string_view symbolName;
   switch (m_type)
   {
-  using enum RoadWarningMarkType;
+    using enum RoadWarningMarkType;
   case Toll: symbolName = "paid_road"; break;
   case Ferry: symbolName = "ferry"; break;
   case Dirty: symbolName = "unpaved_road"; break;
@@ -685,7 +672,7 @@ std::string RoadWarningMark::GetLocalizedRoadWarningType(RoadWarningMarkType typ
 {
   switch (type)
   {
-  using enum RoadWarningMarkType;
+    using enum RoadWarningMarkType;
   case Toll: return platform::GetLocalizedString("toll_road");
   case Ferry: return platform::GetLocalizedString("ferry_crossing");
   case Dirty: return platform::GetLocalizedString("unpaved_road");
@@ -698,7 +685,7 @@ std::string DebugPrint(RoadWarningMarkType type)
 {
   switch (type)
   {
-  using enum RoadWarningMarkType;
+    using enum RoadWarningMarkType;
   case Toll: return "Toll";
   case Ferry: return "Ferry";
   case Dirty: return "Dirty";
diff --git a/libs/map/routing_mark.hpp b/libs/map/routing_mark.hpp
index a77764fef..e722fa505 100644
--- a/libs/map/routing_mark.hpp
+++ b/libs/map/routing_mark.hpp
@@ -93,13 +93,13 @@ public:
   bool RemoveRoutePoint(RouteMarkType type, size_t intermediateIndex = 0);
   void RemoveRoutePoints();
   void RemoveIntermediateRoutePoints();
-  bool MoveRoutePoint(RouteMarkType currentType, size_t currentIntermediateIndex,
-                      RouteMarkType destType, size_t destIntermediateIndex);
+  bool MoveRoutePoint(RouteMarkType currentType, size_t currentIntermediateIndex, RouteMarkType destType,
+                      size_t destIntermediateIndex);
   void PassRoutePoint(RouteMarkType type, size_t intermediateIndex = 0);
   void SetFollowingMode(bool enabled);
 
 private:
-  using TRoutePointCallback = std::function<void (RouteMarkPoint * mark)>;
+  using TRoutePointCallback = std::function<void(RouteMarkPoint * mark)>;
   void ForEachIntermediatePoint(TRoutePointCallback const & fn);
 
   BookmarkManager & m_manager;
diff --git a/libs/map/search_api.cpp b/libs/map/search_api.cpp
index 9e905986b..4e1285581 100644
--- a/libs/map/search_api.cpp
+++ b/libs/map/search_api.cpp
@@ -68,7 +68,10 @@ bookmarks::GroupId KmlGroupIdToSearchGroupId(kml::MarkGroupId id)
   return base::asserted_cast<bookmarks::GroupId>(id);
 }
 
-kml::MarkId SearchBookmarkIdToKmlMarkId(bookmarks::Id id) { return static_cast<kml::MarkId>(id); }
+kml::MarkId SearchBookmarkIdToKmlMarkId(bookmarks::Id id)
+{
+  return static_cast<kml::MarkId>(id);
+}
 
 void AppendBookmarkIdDocs(vector<BookmarkInfo> const & marks, vector<BookmarkIdDoc> & result)
 {
@@ -76,10 +79,7 @@ void AppendBookmarkIdDocs(vector<BookmarkInfo> const & marks, vector<BookmarkIdD
 
   auto const locale = languages::GetCurrentOrig();
   for (auto const & mark : marks)
-  {
-    result.emplace_back(KmlMarkIdToSearchBookmarkId(mark.m_bookmarkId),
-                        bookmarks::Doc(mark.m_bookmarkData, locale));
-  }
+    result.emplace_back(KmlMarkIdToSearchBookmarkId(mark.m_bookmarkId), bookmarks::Doc(mark.m_bookmarkData, locale));
 }
 
 void AppendBookmarkIds(vector<kml::MarkId> const & marks, vector<bookmarks::Id> & result)
@@ -94,9 +94,9 @@ public:
   using OnResults = BookmarksSearchParams::OnResults;
 
   BookmarksSearchCallback(SearchAPI::Delegate & delegate, OnResults onResults)
-    : m_delegate(delegate), m_onResults(std::move(onResults))
-  {
-  }
+    : m_delegate(delegate)
+    , m_onResults(std::move(onResults))
+  {}
 
   void operator()(Results const & results)
   {
@@ -124,9 +124,7 @@ public:
       m_results.emplace_back(SearchBookmarkIdToKmlMarkId(rs[i].m_id));
 
     m_delegate.RunUITask([onResults = m_onResults, results = m_results, status = m_status]() mutable
-    {
-      onResults(std::move(results), status);
-    });
+    { onResults(std::move(results), status); });
   }
 
 private:
@@ -139,16 +137,14 @@ private:
 }  // namespace
 
 SearchAPI::SearchAPI(DataSource & dataSource, storage::Storage const & storage,
-                     storage::CountryInfoGetter const & infoGetter, size_t numThreads,
-                     Delegate & delegate)
+                     storage::CountryInfoGetter const & infoGetter, size_t numThreads, Delegate & delegate)
   : m_dataSource(dataSource)
   , m_storage(storage)
   , m_infoGetter(infoGetter)
   , m_delegate(delegate)
   , m_engine(m_dataSource, GetDefaultCategories(), m_infoGetter,
              Engine::Params(languages::GetCurrentMapTwine() /* locale */, numThreads))
-{
-}
+{}
 
 void SearchAPI::OnViewportChanged(m2::RectD const & viewport)
 {
@@ -217,9 +213,7 @@ bool SearchAPI::SearchInViewport(ViewportSearchParams params)
   if (params.m_onStarted)
   {
     p.m_onStarted = [this, onStarted = std::move(params.m_onStarted)]() mutable
-    {
-      RunUITask([onStarted = std::move(onStarted)]() { onStarted(); });
-    };
+    { RunUITask([onStarted = std::move(onStarted)]() { onStarted(); }); };
   }
 
   p.m_onResults = ViewportSearchCallback(m_viewport, *this, std::move(params.m_onCompleted));
@@ -281,9 +275,7 @@ void SearchAPI::CancelSearch(Mode mode)
   ASSERT_NOT_EQUAL(mode, Mode::Count, ());
 
   if (mode == Mode::Viewport)
-  {
     m_delegate.ClearViewportSearchResults();
-  }
 
   auto & intent = m_searchIntents[static_cast<size_t>(mode)];
   intent.m_params.Clear();
@@ -296,15 +288,17 @@ void SearchAPI::CancelAllSearches()
     CancelSearch(static_cast<Mode>(i));
 }
 
-void SearchAPI::RunUITask(function<void()> fn) { return m_delegate.RunUITask(std::move(fn)); }
+void SearchAPI::RunUITask(function<void()> fn)
+{
+  return m_delegate.RunUITask(std::move(fn));
+}
 
 bool SearchAPI::IsViewportSearchActive() const
 {
   return !m_searchIntents[static_cast<size_t>(Mode::Viewport)].m_params.m_query.empty();
 }
 
-void SearchAPI::ShowViewportSearchResults(Results::ConstIter begin, Results::ConstIter end,
-                                          bool clear)
+void SearchAPI::ShowViewportSearchResults(Results::ConstIter begin, Results::ConstIter end, bool clear)
 {
   return m_delegate.ShowViewportSearchResults(begin, end, clear);
 }
@@ -427,8 +421,7 @@ void SearchAPI::SetLocale(std::string const & locale)
   m_engine.SetLocale(locale);
 }
 
-bool SearchAPI::QueryMayBeSkipped(SearchParams const & prevParams,
-                                  SearchParams const & currParams) const
+bool SearchAPI::QueryMayBeSkipped(SearchParams const & prevParams, SearchParams const & currParams) const
 {
   auto const & prevViewport = prevParams.m_viewport;
   auto const & currViewport = currParams.m_viewport;
@@ -436,15 +429,11 @@ bool SearchAPI::QueryMayBeSkipped(SearchParams const & prevParams,
   if (!prevParams.IsEqualCommon(currParams))
     return false;
 
-  if (!prevViewport.IsValid() ||
-      !IsEqualMercator(prevViewport, currViewport, kDistEqualQueryMercator))
-  {
+  if (!prevViewport.IsValid() || !IsEqualMercator(prevViewport, currViewport, kDistEqualQueryMercator))
     return false;
-  }
 
   if (prevParams.m_position && currParams.m_position &&
-      mercator::DistanceOnEarth(*prevParams.m_position, *currParams.m_position) >
-          kDistEqualQueryMercator)
+      mercator::DistanceOnEarth(*prevParams.m_position, *currParams.m_position) > kDistEqualQueryMercator)
   {
     return false;
   }
diff --git a/libs/map/search_api.hpp b/libs/map/search_api.hpp
index 41d887f0c..029def5fa 100644
--- a/libs/map/search_api.hpp
+++ b/libs/map/search_api.hpp
@@ -19,9 +19,9 @@
 #include <functional>
 #include <memory>
 #include <optional>
+#include <string>
 #include <unordered_set>
 #include <vector>
-#include <string>
 
 class DataSource;
 
@@ -30,18 +30,19 @@ namespace search
 struct BookmarksSearchParams;
 struct EverywhereSearchParams;
 struct DiscoverySearchParams;
-}
+}  // namespace search
 
 namespace storage
 {
 class CountryInfoGetter;
 class Storage;
 struct DownloaderSearchParams;
-}
+}  // namespace storage
 
-class SearchAPI : public search::DownloaderSearchCallback::Delegate,
-                  public search::ViewportSearchCallback::Delegate,
-                  public search::EverywhereSearchCallback::Delegate
+class SearchAPI
+  : public search::DownloaderSearchCallback::Delegate
+  , public search::ViewportSearchCallback::Delegate
+  , public search::EverywhereSearchCallback::Delegate
 {
 public:
   struct Delegate
@@ -64,8 +65,8 @@ public:
     virtual search::ProductInfo GetProductInfo(search::Result const & result) const { return {}; }
   };
 
-  SearchAPI(DataSource & dataSource, storage::Storage const & storage,
-            storage::CountryInfoGetter const & infoGetter, size_t numThreads, Delegate & delegate);
+  SearchAPI(DataSource & dataSource, storage::Storage const & storage, storage::CountryInfoGetter const & infoGetter,
+            size_t numThreads, Delegate & delegate);
   virtual ~SearchAPI() = default;
 
   void OnViewportChanged(m2::RectD const & viewport);
@@ -104,8 +105,7 @@ public:
   // *SearchCallback::Delegate overrides:
   void RunUITask(std::function<void()> fn) override;
   bool IsViewportSearchActive() const override;
-  void ShowViewportSearchResults(search::Results::ConstIter begin,
-                                 search::Results::ConstIter end, bool clear) override;
+  void ShowViewportSearchResults(search::Results::ConstIter begin, search::Results::ConstIter end, bool clear) override;
   search::ProductInfo GetProductInfo(search::Result const & result) const override;
 
   std::list<search::QuerySaver::SearchRequest> const & GetLastSearchQueries() const { return m_searchQuerySaver.Get(); }
@@ -149,8 +149,7 @@ private:
 
   void SetViewportIfPossible(search::SearchParams & params);
 
-  bool QueryMayBeSkipped(search::SearchParams const & prevParams,
-                         search::SearchParams const & currParams) const;
+  bool QueryMayBeSkipped(search::SearchParams const & prevParams, search::SearchParams const & currParams) const;
 
   DataSource & m_dataSource;
   storage::Storage const & m_storage;
diff --git a/libs/map/search_mark.cpp b/libs/map/search_mark.cpp
index 688b518fd..7c34e107e 100644
--- a/libs/map/search_mark.cpp
+++ b/libs/map/search_mark.cpp
@@ -14,7 +14,6 @@
 #include <algorithm>
 #include <array>
 
-
 enum SearchMarkPoint::SearchMarkType : uint8_t
 {
   Default = 0,
@@ -90,66 +89,65 @@ float const kVisitedSymbolOpacity = 0.7f;
 float const kOutOfFiltersSymbolOpacity = 0.4f;
 
 std::array<std::string, SearchMarkType::Count> const kSymbols = {
-    "search-result",                        // Default.
-    "search-result-hotel",                  // Hotel.
-    "search-result-hostel",                 // Hostel.
-    "search-result-chalet",                 // Chalet.
-    "search-result-apartment",              // Apartment.
-    "search-result-campsite",               // Campsite.
-    "search-result-caravan-site",           // Caravan site.
-    "search-result-cafe",                   // Cafe.
-    "search-result-bakery",                 // Bakery.
-    "search-result-bar",                    // Bar.
-    "search-result-pub",                    // Pub.
-    "search-result-restaurant",             // Restaurant.
-    "search-result-fastfood",               // FastFood.
-    "search-result-casino",                 // Casino.
-    "search-result-lottery",                // Lottery.
-    "search-result-cinema",                 // Cinema.
-    "search-result-theatre",                // Theatre.
-    "search-result-stadium",                // Stadium.
-    "search-result-museum",                 // Museum.
-    "search-result-art",                    // Art.
-    "search-result-attraction",             // Attraction.
-    "search-result-viewpoint",              // Viewpoint.
-    "search-result-remains",                // Remains.
-    "search-result-archaeological-site",    // ArchaeologicalSite.
-    "search-result-information",            // Information.
-    "search-result-marketplace",            // Marketplace.
-    "search-result-nightclub",              // Nightclub.
-    "search-result-playground",             // Playground.
-    "search-result-bank",                   // Bank.
-    "search-result-fuel",                   // Fuel.
-    "search-result-charging_station",       // ChargingStation.
-    "search-result-shop-alcohol",           // ShopAlcohol.
-    "search-result-shop-butcher",           // ShopButcher.
-    "search-result-shop-clothes",           // ShopClothes.
-    "search-result-shop-confectionery",     // ShopConfectionery.
-    "search-result-shop-convenience",       // ShopConvenience.
-    "search-result-shop-beauty",            // ShopBeauty.
-    "search-result-shop-department_store",  // ShopDepartmentStore.
-    "search-result-shop-gift",              // ShopGift.
-    "search-result-shop-greengrocer",       // ShopGreengrocer.
-    "search-result-shop-jewelry",           // ShopJewelry.
-    "search-result-shop-seafood",           // ShopSeafood.
-    "search-result-shop-shoes",             // ShopShoes.
-    "search-result-shop-sports",            // ShopSports.
-    "search-result-shop-supermarket",       // ShopSupermarket.
-    "search-result-shop-toys",              // ShopToys.
-    "search-result-theme-park",             // ThemePark.
-    "search-result-zoo",                    // Zoo.
-    "search-result-pitch",                  // Pitch.
-    "search-result-swimming",               // Swimming.
-    "search-result-hospital",               // Hospital.
-    "search-result-clinic",                 // Clinic.
-    "search-result-pharmacy",               // Pharmacy.
-    "search-result-drinking-water",         // DrinkingWater.
-    "search-result-drinking-water-no",      // DrinkingWaterNo.
-    "search-result-bicycle_parking",        // BicycleParking.
-    "search-result-bicycle_parking-covered",// BicycleParkingCovered.
-    "search-result-bicycle_rental",         // BicycleRental.
+    "search-result",                          // Default.
+    "search-result-hotel",                    // Hotel.
+    "search-result-hostel",                   // Hostel.
+    "search-result-chalet",                   // Chalet.
+    "search-result-apartment",                // Apartment.
+    "search-result-campsite",                 // Campsite.
+    "search-result-caravan-site",             // Caravan site.
+    "search-result-cafe",                     // Cafe.
+    "search-result-bakery",                   // Bakery.
+    "search-result-bar",                      // Bar.
+    "search-result-pub",                      // Pub.
+    "search-result-restaurant",               // Restaurant.
+    "search-result-fastfood",                 // FastFood.
+    "search-result-casino",                   // Casino.
+    "search-result-lottery",                  // Lottery.
+    "search-result-cinema",                   // Cinema.
+    "search-result-theatre",                  // Theatre.
+    "search-result-stadium",                  // Stadium.
+    "search-result-museum",                   // Museum.
+    "search-result-art",                      // Art.
+    "search-result-attraction",               // Attraction.
+    "search-result-viewpoint",                // Viewpoint.
+    "search-result-remains",                  // Remains.
+    "search-result-archaeological-site",      // ArchaeologicalSite.
+    "search-result-information",              // Information.
+    "search-result-marketplace",              // Marketplace.
+    "search-result-nightclub",                // Nightclub.
+    "search-result-playground",               // Playground.
+    "search-result-bank",                     // Bank.
+    "search-result-fuel",                     // Fuel.
+    "search-result-charging_station",         // ChargingStation.
+    "search-result-shop-alcohol",             // ShopAlcohol.
+    "search-result-shop-butcher",             // ShopButcher.
+    "search-result-shop-clothes",             // ShopClothes.
+    "search-result-shop-confectionery",       // ShopConfectionery.
+    "search-result-shop-convenience",         // ShopConvenience.
+    "search-result-shop-beauty",              // ShopBeauty.
+    "search-result-shop-department_store",    // ShopDepartmentStore.
+    "search-result-shop-gift",                // ShopGift.
+    "search-result-shop-greengrocer",         // ShopGreengrocer.
+    "search-result-shop-jewelry",             // ShopJewelry.
+    "search-result-shop-seafood",             // ShopSeafood.
+    "search-result-shop-shoes",               // ShopShoes.
+    "search-result-shop-sports",              // ShopSports.
+    "search-result-shop-supermarket",         // ShopSupermarket.
+    "search-result-shop-toys",                // ShopToys.
+    "search-result-theme-park",               // ThemePark.
+    "search-result-zoo",                      // Zoo.
+    "search-result-pitch",                    // Pitch.
+    "search-result-swimming",                 // Swimming.
+    "search-result-hospital",                 // Hospital.
+    "search-result-clinic",                   // Clinic.
+    "search-result-pharmacy",                 // Pharmacy.
+    "search-result-drinking-water",           // DrinkingWater.
+    "search-result-drinking-water-no",        // DrinkingWaterNo.
+    "search-result-bicycle_parking",          // BicycleParking.
+    "search-result-bicycle_parking-covered",  // BicycleParkingCovered.
+    "search-result-bicycle_rental",           // BicycleRental.
 
-    
     "non-found-search-result",  // NotFound.
 };
 
@@ -185,114 +183,114 @@ private:
   {
     auto const & c = classif();
     std::pair<std::vector<std::string_view>, SearchMarkType> const table[] = {
-      {{"amenity", "cafe"},          SearchMarkType::Cafe},
-      {{"shop", "bakery"},           SearchMarkType::Bakery},
-      {{"shop", "pastry"},           SearchMarkType::Bakery},
-      {{"amenity", "bar"},           SearchMarkType::Bar},
-      {{"amenity", "pub"},           SearchMarkType::Pub},
-      {{"amenity", "biergarten"},    SearchMarkType::Pub},
-      {{"amenity", "restaurant"},    SearchMarkType::Restaurant},
-      {{"amenity", "food_court"},    SearchMarkType::Restaurant},
-      {{"amenity", "fast_food"},     SearchMarkType::FastFood},
-      {{"amenity", "casino"},        SearchMarkType::Casino},
-      {{"shop", "bookmaker"},        SearchMarkType::Lottery},
-      {{"shop", "lottery"},          SearchMarkType::Lottery},
-      {{"amenity", "cinema"},        SearchMarkType::Cinema},
-      {{"amenity", "theatre"},       SearchMarkType::Theatre},
-      {{"leisure", "stadium"},       SearchMarkType::Stadium},
-      {{"tourism", "museum"},        SearchMarkType::Museum},
-      {{"amenity", "arts_centre"},   SearchMarkType::Art},
-      {{"tourism", "gallery"},       SearchMarkType::Art},
-      {{"tourism", "attraction"},    SearchMarkType::Attraction},
-      {{"tourism", "viewpoint"},     SearchMarkType::Viewpoint},
-      {{"historic", "fort"},                        SearchMarkType::Remains},
-      {{"historic", "castle"},                      SearchMarkType::Remains},
-      {{"historic", "castle", "castrum"},           SearchMarkType::Remains},
-      {{"historic", "castle", "fortified_church"},  SearchMarkType::Remains},
-      {{"historic", "castle", "fortress"},          SearchMarkType::Remains},
-      {{"historic", "castle", "hillfort"},          SearchMarkType::Remains},
-      {{"historic", "castle", "kremlin"},           SearchMarkType::Remains},
-      {{"historic", "castle", "manor"},             SearchMarkType::Remains},
-      {{"historic", "castle", "palace"},            SearchMarkType::Remains},
-      {{"historic", "castle", "shiro"},             SearchMarkType::Remains},
-      {{"historic", "castle", "defensive"},         SearchMarkType::Remains},
-      {{"historic", "castle", "stately"},           SearchMarkType::Remains},
-      {{"historic", "ruins"},                       SearchMarkType::Remains},
-      {{"historic", "city_gate"},                   SearchMarkType::Remains},
-      {{"historic", "archaeological_site"},         SearchMarkType::ArchaeologicalSite},
-      {{"tourism", "information"},                      SearchMarkType::Information},
-      {{"tourism", "information", "office"},            SearchMarkType::Information},
-      {{"tourism", "information", "visitor_centre"},    SearchMarkType::Information},
-      {{"amenity", "marketplace"},   SearchMarkType::Marketplace},
-      {{"amenity", "nightclub"},     SearchMarkType::Nightclub},
-      {{"leisure", "playground"},    SearchMarkType::Playground},
-      {{"amenity", "bank"},          SearchMarkType::Bank},
-      {{"shop", "money_lender"},     SearchMarkType::Bank},
-      {{"amenity", "fuel"},          SearchMarkType::Fuel},
-      {{"amenity", "charging_station"},                 SearchMarkType::ChargingStation},
-      {{"amenity", "charging_station", "bicycle"},      SearchMarkType::ChargingStation},
-      {{"amenity", "charging_station", "motorcar"},     SearchMarkType::ChargingStation},
-      {{"shop", "alcohol"},          SearchMarkType::ShopAlcohol},
-      {{"shop", "beverages"},        SearchMarkType::ShopAlcohol},
-      {{"shop", "wine"},             SearchMarkType::ShopAlcohol},
-      {{"shop", "butcher"},          SearchMarkType::ShopButcher},
-      {{"shop", "clothes"},          SearchMarkType::ShopClothes},
-      {{"shop", "confectionery"},    SearchMarkType::ShopConfectionery},
-      {{"shop", "chocolate"},        SearchMarkType::ShopConfectionery},
-      {{"craft", "confectionery"},   SearchMarkType::ShopConfectionery},
-      {{"shop", "convenience"},      SearchMarkType::ShopConvenience},
-      {{"shop", "grocery"},          SearchMarkType::ShopConvenience},
-      {{"shop", "deli"},             SearchMarkType::ShopConvenience},
-      {{"shop", "farm"},             SearchMarkType::ShopConvenience},
-      {{"shop", "health_food"},      SearchMarkType::ShopConvenience},
-      {{"shop", "beauty"},           SearchMarkType::ShopBeauty},
-      {{"shop", "cosmetics"},        SearchMarkType::ShopBeauty},
-      {{"shop", "department_store"}, SearchMarkType::ShopDepartmentStore},
-      {{"shop", "gift"},             SearchMarkType::ShopGift},
-      {{"shop", "greengrocer"},      SearchMarkType::ShopGreengrocer},
-      {{"shop", "jewelry"},          SearchMarkType::ShopJewelry},
-      {{"shop", "seafood"},          SearchMarkType::ShopSeafood},
-      {{"shop", "shoes"},            SearchMarkType::ShopShoes},
-      {{"craft", "shoemaker"},       SearchMarkType::ShopShoes},
-      {{"shop", "sports"},           SearchMarkType::ShopSports},
-      {{"shop", "supermarket"},      SearchMarkType::ShopSupermarket},
-      {{"shop", "toys"},             SearchMarkType::ShopToys},
-      {{"tourism", "theme_park"},    SearchMarkType::ThemePark},
-      {{"tourism", "zoo"},           SearchMarkType::Zoo},
-      {{"tourism", "chalet"},        SearchMarkType::Chalet},
-      {{"tourism", "alpine_hut"},    SearchMarkType::Chalet},
-      {{"tourism", "wilderness_hut"},SearchMarkType::Chalet},
-      {{"tourism", "hotel"},         SearchMarkType::Hotel},
-      {{"tourism", "motel"},         SearchMarkType::Hotel},
-      {{"leisure", "resort"},        SearchMarkType::Hotel},
-      {{"tourism", "hostel"},        SearchMarkType::Hostel},
-      {{"tourism", "apartment"},     SearchMarkType::Apartment},
-      {{"tourism", "guest_house"},   SearchMarkType::Apartment},
-      {{"tourism", "camp_site"},     SearchMarkType::Campsite},
-      {{"tourism", "caravan_site"},  SearchMarkType::CaravanSite},
-      {{"amenity", "hospital"},      SearchMarkType::Hospital},
-      {{"amenity", "clinic"},        SearchMarkType::Clinic},
-      {{"amenity", "doctors"},       SearchMarkType::Clinic},
-      {{"amenity", "pharmacy"},      SearchMarkType::Pharmacy},
-      {{"leisure", "pitch"},         SearchMarkType::Pitch},
-      {{"leisure", "ice_rink"},      SearchMarkType::Pitch},
-      {{"leisure", "sports_centre"}, SearchMarkType::Pitch},
-      {{"leisure", "sports_hall"},   SearchMarkType::Pitch},
-      {{"leisure", "swimming_pool"}, SearchMarkType::Swimming},
-      {{"leisure", "water_park"},    SearchMarkType::Swimming},
-      {{"amenity", "drinking_water"},                       SearchMarkType::DrinkingWater},
-      {{"amenity", "water_point"},                          SearchMarkType::DrinkingWater},
-      {{"man_made", "water_tap"},                           SearchMarkType::DrinkingWater},
-      {{"man_made", "water_well"},                          SearchMarkType::DrinkingWater},
-      {{"natural", "spring"},                               SearchMarkType::DrinkingWater},
-      {{"natural", "hot_spring"},                           SearchMarkType::DrinkingWater},
-      {{"amenity", "water_point", "drinking_water_no"},     SearchMarkType::DrinkingWaterNo},
-      {{"man_made", "water_tap", "drinking_water_no"},      SearchMarkType::DrinkingWaterNo},
-      {{"man_made", "water_well", "drinking_water_no"},     SearchMarkType::DrinkingWaterNo},
-      {{"natural", "spring", "drinking_water_no"},          SearchMarkType::DrinkingWaterNo},
-      {{"amenity", "bicycle_parking"},                      SearchMarkType::BicycleParking},
-      {{"amenity", "bicycle_parking", "covered"},           SearchMarkType::BicycleParkingCovered},
-      {{"amenity", "bicycle_rental"},                       SearchMarkType::BicycleRental},
+        {{"amenity", "cafe"}, SearchMarkType::Cafe},
+        {{"shop", "bakery"}, SearchMarkType::Bakery},
+        {{"shop", "pastry"}, SearchMarkType::Bakery},
+        {{"amenity", "bar"}, SearchMarkType::Bar},
+        {{"amenity", "pub"}, SearchMarkType::Pub},
+        {{"amenity", "biergarten"}, SearchMarkType::Pub},
+        {{"amenity", "restaurant"}, SearchMarkType::Restaurant},
+        {{"amenity", "food_court"}, SearchMarkType::Restaurant},
+        {{"amenity", "fast_food"}, SearchMarkType::FastFood},
+        {{"amenity", "casino"}, SearchMarkType::Casino},
+        {{"shop", "bookmaker"}, SearchMarkType::Lottery},
+        {{"shop", "lottery"}, SearchMarkType::Lottery},
+        {{"amenity", "cinema"}, SearchMarkType::Cinema},
+        {{"amenity", "theatre"}, SearchMarkType::Theatre},
+        {{"leisure", "stadium"}, SearchMarkType::Stadium},
+        {{"tourism", "museum"}, SearchMarkType::Museum},
+        {{"amenity", "arts_centre"}, SearchMarkType::Art},
+        {{"tourism", "gallery"}, SearchMarkType::Art},
+        {{"tourism", "attraction"}, SearchMarkType::Attraction},
+        {{"tourism", "viewpoint"}, SearchMarkType::Viewpoint},
+        {{"historic", "fort"}, SearchMarkType::Remains},
+        {{"historic", "castle"}, SearchMarkType::Remains},
+        {{"historic", "castle", "castrum"}, SearchMarkType::Remains},
+        {{"historic", "castle", "fortified_church"}, SearchMarkType::Remains},
+        {{"historic", "castle", "fortress"}, SearchMarkType::Remains},
+        {{"historic", "castle", "hillfort"}, SearchMarkType::Remains},
+        {{"historic", "castle", "kremlin"}, SearchMarkType::Remains},
+        {{"historic", "castle", "manor"}, SearchMarkType::Remains},
+        {{"historic", "castle", "palace"}, SearchMarkType::Remains},
+        {{"historic", "castle", "shiro"}, SearchMarkType::Remains},
+        {{"historic", "castle", "defensive"}, SearchMarkType::Remains},
+        {{"historic", "castle", "stately"}, SearchMarkType::Remains},
+        {{"historic", "ruins"}, SearchMarkType::Remains},
+        {{"historic", "city_gate"}, SearchMarkType::Remains},
+        {{"historic", "archaeological_site"}, SearchMarkType::ArchaeologicalSite},
+        {{"tourism", "information"}, SearchMarkType::Information},
+        {{"tourism", "information", "office"}, SearchMarkType::Information},
+        {{"tourism", "information", "visitor_centre"}, SearchMarkType::Information},
+        {{"amenity", "marketplace"}, SearchMarkType::Marketplace},
+        {{"amenity", "nightclub"}, SearchMarkType::Nightclub},
+        {{"leisure", "playground"}, SearchMarkType::Playground},
+        {{"amenity", "bank"}, SearchMarkType::Bank},
+        {{"shop", "money_lender"}, SearchMarkType::Bank},
+        {{"amenity", "fuel"}, SearchMarkType::Fuel},
+        {{"amenity", "charging_station"}, SearchMarkType::ChargingStation},
+        {{"amenity", "charging_station", "bicycle"}, SearchMarkType::ChargingStation},
+        {{"amenity", "charging_station", "motorcar"}, SearchMarkType::ChargingStation},
+        {{"shop", "alcohol"}, SearchMarkType::ShopAlcohol},
+        {{"shop", "beverages"}, SearchMarkType::ShopAlcohol},
+        {{"shop", "wine"}, SearchMarkType::ShopAlcohol},
+        {{"shop", "butcher"}, SearchMarkType::ShopButcher},
+        {{"shop", "clothes"}, SearchMarkType::ShopClothes},
+        {{"shop", "confectionery"}, SearchMarkType::ShopConfectionery},
+        {{"shop", "chocolate"}, SearchMarkType::ShopConfectionery},
+        {{"craft", "confectionery"}, SearchMarkType::ShopConfectionery},
+        {{"shop", "convenience"}, SearchMarkType::ShopConvenience},
+        {{"shop", "grocery"}, SearchMarkType::ShopConvenience},
+        {{"shop", "deli"}, SearchMarkType::ShopConvenience},
+        {{"shop", "farm"}, SearchMarkType::ShopConvenience},
+        {{"shop", "health_food"}, SearchMarkType::ShopConvenience},
+        {{"shop", "beauty"}, SearchMarkType::ShopBeauty},
+        {{"shop", "cosmetics"}, SearchMarkType::ShopBeauty},
+        {{"shop", "department_store"}, SearchMarkType::ShopDepartmentStore},
+        {{"shop", "gift"}, SearchMarkType::ShopGift},
+        {{"shop", "greengrocer"}, SearchMarkType::ShopGreengrocer},
+        {{"shop", "jewelry"}, SearchMarkType::ShopJewelry},
+        {{"shop", "seafood"}, SearchMarkType::ShopSeafood},
+        {{"shop", "shoes"}, SearchMarkType::ShopShoes},
+        {{"craft", "shoemaker"}, SearchMarkType::ShopShoes},
+        {{"shop", "sports"}, SearchMarkType::ShopSports},
+        {{"shop", "supermarket"}, SearchMarkType::ShopSupermarket},
+        {{"shop", "toys"}, SearchMarkType::ShopToys},
+        {{"tourism", "theme_park"}, SearchMarkType::ThemePark},
+        {{"tourism", "zoo"}, SearchMarkType::Zoo},
+        {{"tourism", "chalet"}, SearchMarkType::Chalet},
+        {{"tourism", "alpine_hut"}, SearchMarkType::Chalet},
+        {{"tourism", "wilderness_hut"}, SearchMarkType::Chalet},
+        {{"tourism", "hotel"}, SearchMarkType::Hotel},
+        {{"tourism", "motel"}, SearchMarkType::Hotel},
+        {{"leisure", "resort"}, SearchMarkType::Hotel},
+        {{"tourism", "hostel"}, SearchMarkType::Hostel},
+        {{"tourism", "apartment"}, SearchMarkType::Apartment},
+        {{"tourism", "guest_house"}, SearchMarkType::Apartment},
+        {{"tourism", "camp_site"}, SearchMarkType::Campsite},
+        {{"tourism", "caravan_site"}, SearchMarkType::CaravanSite},
+        {{"amenity", "hospital"}, SearchMarkType::Hospital},
+        {{"amenity", "clinic"}, SearchMarkType::Clinic},
+        {{"amenity", "doctors"}, SearchMarkType::Clinic},
+        {{"amenity", "pharmacy"}, SearchMarkType::Pharmacy},
+        {{"leisure", "pitch"}, SearchMarkType::Pitch},
+        {{"leisure", "ice_rink"}, SearchMarkType::Pitch},
+        {{"leisure", "sports_centre"}, SearchMarkType::Pitch},
+        {{"leisure", "sports_hall"}, SearchMarkType::Pitch},
+        {{"leisure", "swimming_pool"}, SearchMarkType::Swimming},
+        {{"leisure", "water_park"}, SearchMarkType::Swimming},
+        {{"amenity", "drinking_water"}, SearchMarkType::DrinkingWater},
+        {{"amenity", "water_point"}, SearchMarkType::DrinkingWater},
+        {{"man_made", "water_tap"}, SearchMarkType::DrinkingWater},
+        {{"man_made", "water_well"}, SearchMarkType::DrinkingWater},
+        {{"natural", "spring"}, SearchMarkType::DrinkingWater},
+        {{"natural", "hot_spring"}, SearchMarkType::DrinkingWater},
+        {{"amenity", "water_point", "drinking_water_no"}, SearchMarkType::DrinkingWaterNo},
+        {{"man_made", "water_tap", "drinking_water_no"}, SearchMarkType::DrinkingWaterNo},
+        {{"man_made", "water_well", "drinking_water_no"}, SearchMarkType::DrinkingWaterNo},
+        {{"natural", "spring", "drinking_water_no"}, SearchMarkType::DrinkingWaterNo},
+        {{"amenity", "bicycle_parking"}, SearchMarkType::BicycleParking},
+        {{"amenity", "bicycle_parking", "covered"}, SearchMarkType::BicycleParkingCovered},
+        {{"amenity", "bicycle_rental"}, SearchMarkType::BicycleRental},
     };
 
     m_searchMarkTypes.reserve(std::size(table));
@@ -313,15 +311,14 @@ SearchMarkType GetSearchMarkType(uint32_t type)
 }  // namespace
 
 SearchMarkPoint::SearchMarkPoint(m2::PointD const & ptOrg)
-: UserMark(ptOrg, UserMark::Type::SEARCH)
-, m_type(SearchMarkType::Default)
-, m_isPreparing(false)
-, m_hasSale(false)
-, m_isSelected(false)
-, m_isVisited(false)
-, m_isAvailable(true)
-{
-}
+  : UserMark(ptOrg, UserMark::Type::SEARCH)
+  , m_type(SearchMarkType::Default)
+  , m_isPreparing(false)
+  , m_hasSale(false)
+  , m_isSelected(false)
+  , m_isVisited(false)
+  , m_isAvailable(true)
+{}
 
 m2::PointD SearchMarkPoint::GetPixelOffset() const
 {
@@ -397,7 +394,12 @@ void SearchMarkPoint::SetNotFoundType()
   SetAttributeValue(m_type, SearchMarkType::NotFound);
 }
 
-#define SET_BOOL_ATTRIBUTE(dest, src) if (dest != src) { dest = src; SetDirty(); }
+#define SET_BOOL_ATTRIBUTE(dest, src) \
+  if (dest != src)                    \
+  {                                   \
+    dest = src;                       \
+    SetDirty();                       \
+  }
 
 void SearchMarkPoint::SetPreparing(bool isPreparing)
 {
@@ -431,13 +433,25 @@ void SearchMarkPoint::SetReason(std::string const & reason)
   SetAttributeValue(m_reason, reason);
 }
 
-bool SearchMarkPoint::IsSelected() const { return m_isSelected; }
+bool SearchMarkPoint::IsSelected() const
+{
+  return m_isSelected;
+}
 
-bool SearchMarkPoint::IsAvailable() const { return m_isAvailable; }
+bool SearchMarkPoint::IsAvailable() const
+{
+  return m_isAvailable;
+}
 
-std::string const & SearchMarkPoint::GetReason() const { return m_reason; }
+std::string const & SearchMarkPoint::GetReason() const
+{
+  return m_reason;
+}
 
-bool SearchMarkPoint::HasReason() const { return !m_reason.empty(); }
+bool SearchMarkPoint::HasReason() const
+{
+  return !m_reason.empty();
+}
 
 std::string const * SearchMarkPoint::GetSymbolName() const
 {
@@ -468,9 +482,7 @@ std::string const * SearchMarkPoint::GetSymbolName() const
 // static
 std::map<std::string, m2::PointF> SearchMarks::s_markSizes;
 
-SearchMarks::SearchMarks()
-  : m_bmManager(nullptr)
-{}
+SearchMarks::SearchMarks() : m_bmManager(nullptr) {}
 
 void SearchMarks::SetDrapeEngine(ref_ptr<df::DrapeEngine> engine)
 {
@@ -545,10 +557,8 @@ void SearchMarks::SetSales(std::vector<FeatureID> const & features, bool hasSale
 bool SearchMarks::IsThereSearchMarkForFeature(FeatureID const & featureId) const
 {
   for (auto const markId : m_bmManager->GetUserMarkIds(UserMark::Type::SEARCH))
-  {
     if (m_bmManager->GetUserMark(markId)->GetFeatureID() == featureId)
       return true;
-  }
   return false;
 }
 
@@ -635,10 +645,10 @@ bool SearchMarks::IsSelected(FeatureID const & id) const
 
 void SearchMarks::ClearTrackedProperties()
 {
-//  {
-//    std::scoped_lock<std::mutex> lock(m_lock);
-//    m_unavailable.clear();
-//  }
+  //  {
+  //    std::scoped_lock<std::mutex> lock(m_lock);
+  //    m_unavailable.clear();
+  //  }
   m_selectedFeature = {};
 }
 
diff --git a/libs/map/search_mark.hpp b/libs/map/search_mark.hpp
index ce5477878..d8f3d92dd 100644
--- a/libs/map/search_mark.hpp
+++ b/libs/map/search_mark.hpp
@@ -13,11 +13,11 @@
 
 #include <functional>
 #include <map>
+#include <mutex>
 #include <optional>
 #include <set>
 #include <string>
 #include <vector>
-#include <mutex>
 
 class BookmarkManager;
 
@@ -110,9 +110,9 @@ public:
   void OnActivate(FeatureID const & featureId);
   void OnDeactivate(FeatureID const & featureId);
 
-//  void SetUnavailable(SearchMarkPoint & mark, std::string const & reasonKey);
-//  void SetUnavailable(std::vector<FeatureID> const & features, std::string const & reasonKey);
-//  bool IsUnavailable(FeatureID const & id) const;
+  //  void SetUnavailable(SearchMarkPoint & mark, std::string const & reasonKey);
+  //  void SetUnavailable(std::vector<FeatureID> const & features, std::string const & reasonKey);
+  //  bool IsUnavailable(FeatureID const & id) const;
 
   void SetVisited(FeatureID const & id);
   bool IsVisited(FeatureID const & id) const;
@@ -122,7 +122,7 @@ public:
 
   void ClearTrackedProperties();
 
-  static bool HaveSizes() { return !s_markSizes.empty(); };
+  static bool HaveSizes() { return !s_markSizes.empty(); }
   static std::optional<m2::PointD> GetSize(std::string const & symbolName);
 
 private:
@@ -139,6 +139,6 @@ private:
   std::set<FeatureID> m_visitedSearchMarks;
   FeatureID m_selectedFeature;
 
-//  mutable std::mutex m_lock;
-//  std::map<FeatureID, std::string /* SearchMarkPoint::m_reason */> m_unavailable;
+  //  mutable std::mutex m_lock;
+  //  std::map<FeatureID, std::string /* SearchMarkPoint::m_reason */> m_unavailable;
 };
diff --git a/libs/map/search_product_info.hpp b/libs/map/search_product_info.hpp
index ae5ef3766..b7c920dcc 100644
--- a/libs/map/search_product_info.hpp
+++ b/libs/map/search_product_info.hpp
@@ -4,6 +4,5 @@ namespace search
 {
 /// Here was an additional info like UGC, advertising stuff, etc.
 struct ProductInfo
-{
-};
-} // namespace search
+{};
+}  // namespace search
diff --git a/libs/map/style_tests/classificator_tests.cpp b/libs/map/style_tests/classificator_tests.cpp
index e410fc474..d9223452f 100644
--- a/libs/map/style_tests/classificator_tests.cpp
+++ b/libs/map/style_tests/classificator_tests.cpp
@@ -1,9 +1,9 @@
-#include "testing/testing.hpp"
 #include "helpers.hpp"
+#include "testing/testing.hpp"
 
 #include "indexer/classificator.hpp"
-#include "indexer/feature_visibility.hpp"
 #include "indexer/feature_data.hpp"
+#include "indexer/feature_visibility.hpp"
 
 #include "base/logging.hpp"
 #include "base/stl_helpers.hpp"
@@ -15,9 +15,10 @@ using namespace std;
 class DoCheckConsistency
 {
   Classificator const & m_c;
+
 public:
   explicit DoCheckConsistency(Classificator const & c) : m_c(c) {}
-  void operator() (ClassifObject const * p, uint32_t type) const
+  void operator()(ClassifObject const * p, uint32_t type) const
   {
     if (p->IsDrawableAny() && !m_c.IsTypeValid(type))
       TEST(false, ("Inconsistency type", type, m_c.GetFullObjectName(type)));
@@ -47,12 +48,9 @@ class DoCheckStyles
   int m_rules;
 
 public:
-  DoCheckStyles(Classificator const & c, GeomType geomType, int rules)
-    : m_c(c), m_geomType(geomType), m_rules(rules)
-  {
-  }
+  DoCheckStyles(Classificator const & c, GeomType geomType, int rules) : m_c(c), m_geomType(geomType), m_rules(rules) {}
 
-  void operator() (ClassifObject const * p, uint32_t type) const
+  void operator()(ClassifObject const * p, uint32_t type) const
   {
     // We can't put TEST here, should check output manually. Or rewrite test in more sophisticated way.
     // - place=county/region are non-drawable
@@ -127,7 +125,7 @@ UNIT_TEST(Classificator_DrawingRules)
     LOG(LINFO, ("--------------- Linear styles ---------------"));
     CheckLineStyles(c, "highway");
     CheckLineStyles(c, "waterway");
-    //CheckLineStyles(c, "railway");
+    // CheckLineStyles(c, "railway");
   });
 }
 
@@ -170,8 +168,8 @@ string CombineArrT(base::StringIL const & arrT)
 void CheckPriority(vector<base::StringIL> const & arrT, vector<size_t> const & arrI, drule::TypeT ruleType)
 {
   Classificator const & c = classif();
-  vector<vector<uint32_t> > types;
-  vector<vector<string> > typesInfo;
+  vector<vector<uint32_t>> types;
+  vector<vector<string>> typesInfo;
 
   styles::RunForEveryMapStyle([&](MapStyle)
   {
@@ -203,9 +201,9 @@ void CheckPriority(vector<base::StringIL> const & arrT, vector<size_t> const & a
       for (size_t i = 0; i < types.size(); ++i)
       {
         pair<int, int> const mm = GetMinMax(level, types[i], ruleType);
-        TEST_LESS(minmax.second, mm.first, ("Priority bug on zoom", level, "group", i, ":",
-                                            minmaxInfo, minmax.first, minmax.second, "vs",
-                                            typesInfo[i], mm.first, mm.second));
+        TEST_LESS(minmax.second, mm.first,
+                  ("Priority bug on zoom", level, "group", i, ":", minmaxInfo, minmax.first, minmax.second, "vs",
+                   typesInfo[i], mm.first, mm.second));
         minmax = mm;
         minmaxInfo = typesInfo[i];
       }
@@ -224,103 +222,129 @@ void CheckPriority(vector<base::StringIL> const & arrT, vector<size_t> const & a
 
 UNIT_TEST(Classificator_AreaPriority)
 {
-  CheckPriority({
-    // 0
-    {"natural", "coastline"},
-    // 1
-    {"place", "island"}, {"natural", "land"},
-    // 2
-    {"natural", "scrub"}, {"natural", "heath"}, {"natural", "grassland"},
-    {"landuse", "grass"}, {"landuse", "farmland"}, {"landuse", "forest"},
-    // ?
-    //{"leisure", "park"}, {"leisure", "garden"}, - maybe next time (too tricky to do it now)
-    // 3
-    {"natural", "water"}, {"natural", "water", "lake"}, {"landuse", "basin"}
-  }, {1, 2, 6, 3}, drule::area);
+  CheckPriority(
+      {// 0
+       {"natural", "coastline"},
+       // 1
+       {"place", "island"},
+       {"natural", "land"},
+       // 2
+       {"natural", "scrub"},
+       {"natural", "heath"},
+       {"natural", "grassland"},
+       {"landuse", "grass"},
+       {"landuse", "farmland"},
+       {"landuse", "forest"},
+       // ?
+       //{"leisure", "park"}, {"leisure", "garden"}, - maybe next time (too tricky to do it now)
+       // 3
+       {"natural", "water"},
+       {"natural", "water", "lake"},
+       {"landuse", "basin"}},
+      {1, 2, 6, 3}, drule::area);
 
-  CheckPriority({
-    // ? - linear waterways @todo: add ability to compare different drule types (areas vs lines)
-    //{"waterway", "river"}, {"waterway", "stream"}, {"natural", "strait"}, {"waterway", "ditch"},
-    // 0 - water areas
-    {"natural", "water"}, {"landuse", "reservoir"}, {"natural", "water", "river"}, {"waterway", "dock"},
-    // ? - hatching fills @todo: absent in vehicle style, need to test main style only
-    //{"leisure", "nature_reserve"}, {"boundary", "national_park"}, {"landuse", "military"},
-    // 1 - above-water features
-    {"man_made", "pier"}, {"man_made", "breakwater"}, {"waterway", "dam"},
-  }, {4, 3}, drule::area);
+  CheckPriority(
+      {
+          // ? - linear waterways @todo: add ability to compare different drule types (areas vs lines)
+          //{"waterway", "river"}, {"waterway", "stream"}, {"natural", "strait"}, {"waterway", "ditch"},
+          // 0 - water areas
+          {"natural", "water"},
+          {"landuse", "reservoir"},
+          {"natural", "water", "river"},
+          {"waterway", "dock"},
+          // ? - hatching fills @todo: absent in vehicle style, need to test main style only
+          //{"leisure", "nature_reserve"}, {"boundary", "national_park"}, {"landuse", "military"},
+          // 1 - above-water features
+          {"man_made", "pier"},
+          {"man_made", "breakwater"},
+          {"waterway", "dam"},
+      },
+      {4, 3}, drule::area);
 
-  CheckPriority({
-    // 0
-    {"leisure", "park"},
-    // 1
-    {"leisure", "pitch"}, {"leisure", "playground"}, {"sport", "multi"},
-  }, {1, 3}, drule::area);
+  CheckPriority(
+      {
+          // 0
+          {"leisure", "park"},
+          // 1
+          {"leisure", "pitch"},
+          {"leisure", "playground"},
+          {"sport", "multi"},
+      },
+      {1, 3}, drule::area);
 }
 
 UNIT_TEST(Classificator_PoiPriority)
 {
   {
-    CheckPriority({
-      // 1
-      {"amenity", "drinking_water"},
-      // 2
-      {"tourism", "camp_site"},
-      // 3
-      {"tourism", "wilderness_hut"},
-      // 4
-      {"tourism", "alpine_hut"},
-    }, {1, 1, 1, 1}, drule::symbol);
+    CheckPriority(
+        {
+            // 1
+            {"amenity", "drinking_water"},
+            // 2
+            {"tourism", "camp_site"},
+            // 3
+            {"tourism", "wilderness_hut"},
+            // 4
+            {"tourism", "alpine_hut"},
+        },
+        {1, 1, 1, 1}, drule::symbol);
   }
 }
 
 UNIT_TEST(Classificator_MultipleTypesPoiPriority)
 {
   {
-    CheckPriority({
-      // 1
-      {"amenity", "atm"},
-      // 2
-      {"amenity", "bank"}
-    }, {1, 1}, drule::symbol);
+    CheckPriority(
+        {// 1
+         {"amenity", "atm"},
+         // 2
+         {"amenity", "bank"}},
+        {1, 1}, drule::symbol);
   }
 
   {
-    CheckPriority({
-      // 1
-      {"amenity", "bench"}, {"amenity", "shelter"},
-      // 2
-      {"highway", "bus_stop"}, {"amenity", "bus_station"},
-      {"railway", "station"}, {"railway", "halt"}, {"railway", "tram_stop"},
-    }, {2, 5}, drule::symbol);
+    CheckPriority(
+        {
+            // 1
+            {"amenity", "bench"},
+            {"amenity", "shelter"},
+            // 2
+            {"highway", "bus_stop"},
+            {"amenity", "bus_station"},
+            {"railway", "station"},
+            {"railway", "halt"},
+            {"railway", "tram_stop"},
+        },
+        {2, 5}, drule::symbol);
   }
 
   /// @todo Check that all of sport=* icons priority is bigger than all of pitch, sports_center, recreation_ground.
 
   {
-    CheckPriority({
-      // 1
-      {"leisure", "pitch"},
-      // 2
-      {"sport", "yoga"}
-    }, {1, 1}, drule::symbol);
+    CheckPriority(
+        {// 1
+         {"leisure", "pitch"},
+         // 2
+         {"sport", "yoga"}},
+        {1, 1}, drule::symbol);
   }
 
   {
-    CheckPriority({
-      // 1
-      {"leisure", "sports_centre"},
-      // 2
-      {"sport", "shooting"}
-    }, {1, 1}, drule::symbol);
+    CheckPriority(
+        {// 1
+         {"leisure", "sports_centre"},
+         // 2
+         {"sport", "shooting"}},
+        {1, 1}, drule::symbol);
   }
 
   {
-    CheckPriority({
-      // 1
-      {"landuse", "recreation_ground"},
-      // 2
-      {"sport", "multi"}
-    }, {1, 1}, drule::symbol);
+    CheckPriority(
+        {// 1
+         {"landuse", "recreation_ground"},
+         // 2
+         {"sport", "multi"}},
+        {1, 1}, drule::symbol);
   }
 }
 
@@ -333,10 +357,7 @@ struct RangeEntry
 
   // From C++ 20.
   // auto operator<=>(RangeEntry const &) const = default;
-  bool operator!=(RangeEntry const & rhs) const
-  {
-    return m_type != rhs.m_type || m_range != rhs.m_range;
-  }
+  bool operator!=(RangeEntry const & rhs) const { return m_type != rhs.m_type || m_range != rhs.m_range; }
 
   friend std::string DebugPrint(RangeEntry const & e)
   {
@@ -345,7 +366,7 @@ struct RangeEntry
     return ss.str();
   }
 };
-} // namespace
+}  // namespace
 
 UNIT_TEST(Classificator_HighwayZoom_AcrossStyles)
 {
@@ -374,10 +395,8 @@ UNIT_TEST(Classificator_HighwayZoom_AcrossStyles)
     // for highways like: footway, path, steps, cycleway, bridleway, track, service.
     TEST_EQUAL(scales[0].size(), scales[iStyle].size(), (iStyle));
     for (size_t j = 0; j < scales[0].size(); ++j)
-    {
       if (scales[0][j] != scales[iStyle][j])
         LOG(LWARNING, (scales[0][j], scales[iStyle][j]));
-    }
   }
 }
 }  // namespace classificator_tests
diff --git a/libs/map/style_tests/dashes_test.cpp b/libs/map/style_tests/dashes_test.cpp
index 3c7aa812d..99e66df71 100644
--- a/libs/map/style_tests/dashes_test.cpp
+++ b/libs/map/style_tests/dashes_test.cpp
@@ -1,5 +1,5 @@
-#include "testing/testing.hpp"
 #include "helpers.hpp"
+#include "testing/testing.hpp"
 
 #include "drape/stipple_pen_resource.hpp"
 #include "drape_frontend/visual_params.hpp"
diff --git a/libs/map/style_tests/style_symbols_consistency_test.cpp b/libs/map/style_tests/style_symbols_consistency_test.cpp
index 3b606a9f6..4abc79018 100644
--- a/libs/map/style_tests/style_symbols_consistency_test.cpp
+++ b/libs/map/style_tests/style_symbols_consistency_test.cpp
@@ -26,9 +26,7 @@ typedef std::set<std::string> StringSet;
 class SdfParsingDispatcher
 {
 public:
-  explicit SdfParsingDispatcher(StringSet & symbols)
-      : m_symbols(symbols)
-  {}
+  explicit SdfParsingDispatcher(StringSet & symbols) : m_symbols(symbols) {}
 
   bool Push(char const *) { return true; }
   void Pop(char const *) {}
@@ -60,7 +58,7 @@ StringSet GetSymbolsSetFromResourcesFile(std::string_view density)
   StringSet symbols;
   SdfParsingDispatcher dispatcher(symbols);
   ReaderPtr<Reader> reader = GetStyleReader().GetResourceReader("symbols.sdf", density);
-  ReaderSource<ReaderPtr<Reader> > source(reader);
+  ReaderSource<ReaderPtr<Reader>> source(reader);
   ParseXML(source, dispatcher);
   return symbols;
 }
@@ -70,7 +68,7 @@ UNIT_TEST(Test_SymbolsConsistency)
 {
   bool res = true;
 
-  std::string_view constexpr densities[] = { "mdpi", "hdpi", "xhdpi", "xxhdpi", "xxxhdpi", "6plus" };
+  std::string_view constexpr densities[] = {"mdpi", "hdpi", "xhdpi", "xxhdpi", "xxxhdpi", "6plus"};
 
   styles::RunForEveryMapStyle([&](MapStyle mapStyle)
   {
@@ -81,9 +79,8 @@ UNIT_TEST(Test_SymbolsConsistency)
       StringSet const resourceStyles = GetSymbolsSetFromResourcesFile(density);
 
       std::vector<std::string> missed;
-      std::set_difference(drawingRuleSymbols.begin(), drawingRuleSymbols.end(),
-                     resourceStyles.begin(), resourceStyles.end(),
-                     back_inserter(missed));
+      std::set_difference(drawingRuleSymbols.begin(), drawingRuleSymbols.end(), resourceStyles.begin(),
+                          resourceStyles.end(), back_inserter(missed));
 
       if (!missed.empty())
       {
diff --git a/libs/map/track.cpp b/libs/map/track.cpp
index ecae28589..3c6188dc5 100644
--- a/libs/map/track.cpp
+++ b/libs/map/track.cpp
@@ -47,10 +47,8 @@ m2::RectD Track::GetLimitRectImpl() const
 {
   m2::RectD limitRect;
   for (auto const & line : m_data.m_geometry.m_lines)
-  {
     for (auto const & pt : line)
       limitRect.Add(pt.GetPoint());
-  }
   return limitRect;
 }
 
@@ -79,7 +77,7 @@ std::string Track::GetName() const
 
 void Track::SetName(std::string const & name)
 {
-    kml::SetDefaultStr(m_data.m_name, name);
+  kml::SetDefaultStr(m_data.m_name, name);
 }
 
 std::string Track::GetDescription() const
@@ -205,10 +203,8 @@ kml::MultiGeometry::LineT Track::GetGeometry() const
 {
   kml::MultiGeometry::LineT geometry;
   for (auto const & line : m_data.m_geometry.m_lines)
-  {
     for (size_t i = 0; i < line.size(); ++i)
       geometry.emplace_back(line[i]);
-  }
   return geometry;
 }
 
diff --git a/libs/map/track_mark.cpp b/libs/map/track_mark.cpp
index e960238b9..cc8a3fede 100644
--- a/libs/map/track_mark.cpp
+++ b/libs/map/track_mark.cpp
@@ -9,10 +9,7 @@ std::string const kInfoSignSymbolName = "infosign";
 int constexpr kMinInfoVisibleZoom = 1;
 }  // namespace
 
-TrackInfoMark::TrackInfoMark(m2::PointD const & ptOrg)
-  : UserMark(ptOrg, UserMark::TRACK_INFO)
-{
-}
+TrackInfoMark::TrackInfoMark(m2::PointD const & ptOrg) : UserMark(ptOrg, UserMark::TRACK_INFO) {}
 
 void TrackInfoMark::SetOffset(m2::PointF const & offset)
 {
@@ -50,10 +47,7 @@ drape_ptr<df::UserPointMark::SymbolOffsets> TrackInfoMark::GetSymbolOffsets() co
   return make_unique_dp<SymbolOffsets>(offsets);
 }
 
-TrackSelectionMark::TrackSelectionMark(m2::PointD const & ptOrg)
-  : UserMark(ptOrg, UserMark::TRACK_SELECTION)
-{
-}
+TrackSelectionMark::TrackSelectionMark(m2::PointD const & ptOrg) : UserMark(ptOrg, UserMark::TRACK_SELECTION) {}
 
 void TrackSelectionMark::SetPosition(m2::PointD const & ptOrg)
 {
diff --git a/libs/map/track_mark.hpp b/libs/map/track_mark.hpp
index a484d54d5..0b76d1f1b 100644
--- a/libs/map/track_mark.hpp
+++ b/libs/map/track_mark.hpp
@@ -21,10 +21,7 @@ public:
   bool IsVisible() const override { return m_isVisible; }
   bool SymbolIsPOI() const override { return true; }
 
-  df::SpecialDisplacement GetDisplacement() const override
-  {
-    return df::SpecialDisplacement::SpecialModeUserMark;
-  }
+  df::SpecialDisplacement GetDisplacement() const override { return df::SpecialDisplacement::SpecialModeUserMark; }
 
   df::DepthLayer GetDepthLayer() const override { return df::DepthLayer::RoutingMarkLayer; }
 
diff --git a/libs/map/track_statistics.cpp b/libs/map/track_statistics.cpp
index d25f6ef0a..4e9806134 100644
--- a/libs/map/track_statistics.cpp
+++ b/libs/map/track_statistics.cpp
@@ -1,30 +1,29 @@
 #include "map/track_statistics.hpp"
 
-#include "geometry/mercator.hpp"
 #include "base/logging.hpp"
+#include "geometry/mercator.hpp"
 
-#include "platform/duration.hpp"
 #include "platform/distance.hpp"
+#include "platform/duration.hpp"
 
 namespace
 {
 double constexpr kInvalidTimestamp = std::numeric_limits<double>::min();
 geometry::PointWithAltitude const kInvalidPoint = {m2::PointD::Zero(), geometry::kInvalidAltitude};
-} // namespace
+}  // namespace
 
 TrackStatistics::TrackStatistics()
-  : m_length(0),
-    m_duration(0),
-    m_ascent(0),
-    m_descent(0),
-    m_minElevation(geometry::kDefaultAltitudeMeters),
-    m_maxElevation(geometry::kDefaultAltitudeMeters),
-    m_previousPoint(kInvalidPoint),
-    m_previousTimestamp(kInvalidTimestamp)
+  : m_length(0)
+  , m_duration(0)
+  , m_ascent(0)
+  , m_descent(0)
+  , m_minElevation(geometry::kDefaultAltitudeMeters)
+  , m_maxElevation(geometry::kDefaultAltitudeMeters)
+  , m_previousPoint(kInvalidPoint)
+  , m_previousTimestamp(kInvalidTimestamp)
 {}
 
-TrackStatistics::TrackStatistics(kml::MultiGeometry const & geometry)
-  : TrackStatistics()
+TrackStatistics::TrackStatistics(kml::MultiGeometry const & geometry) : TrackStatistics()
 {
   for (auto const & line : geometry.m_lines)
     AddPoints(line);
@@ -40,7 +39,8 @@ TrackStatistics::TrackStatistics(kml::MultiGeometry const & geometry)
 
 void TrackStatistics::AddGpsInfoPoint(location::GpsInfo const & point)
 {
-  auto const pointWithAltitude = geometry::PointWithAltitude(mercator::FromLatLon(point.m_latitude, point.m_longitude), point.m_altitude);
+  auto const pointWithAltitude =
+      geometry::PointWithAltitude(mercator::FromLatLon(point.m_latitude, point.m_longitude), point.m_altitude);
   auto const altitude = geometry::Altitude(point.m_altitude);
   if (HasNoPoints())
   {
@@ -140,4 +140,3 @@ std::string TrackStatistics::GetFormattedMaxElevation() const
 {
   return platform::Distance::FormatAltitude(m_maxElevation);
 }
-
diff --git a/libs/map/track_statistics.hpp b/libs/map/track_statistics.hpp
index c76e26500..413faa333 100644
--- a/libs/map/track_statistics.hpp
+++ b/libs/map/track_statistics.hpp
@@ -27,6 +27,7 @@ struct TrackStatistics
   std::string GetFormattedMaxElevation() const;
 
   void AddGpsInfoPoint(location::GpsInfo const & point);
+
 private:
   void AddPoints(Points const & points);
   void AddTimestamps(Timestamps const & timestamps);
diff --git a/libs/map/traffic_manager.cpp b/libs/map/traffic_manager.cpp
index b3c434ddb..3986f7d32 100644
--- a/libs/map/traffic_manager.cpp
+++ b/libs/map/traffic_manager.cpp
@@ -21,7 +21,7 @@ auto constexpr kOutdatedDataTimeout = minutes(5) + kUpdateInterval;
 auto constexpr kNetworkErrorTimeout = minutes(20);
 
 auto constexpr kMaxRetriesCount = 5;
-} // namespace
+}  // namespace
 
 TrafficManager::CacheEntry::CacheEntry()
   : m_isLoaded(false)
@@ -92,7 +92,7 @@ void TrafficManager::SetEnabled(bool enabled)
   {
     std::lock_guard<std::mutex> lock(m_mutex);
     if (enabled == IsEnabled())
-       return;
+      return;
     Clear();
     ChangeState(enabled ? TrafficState::Enabled : TrafficState::Disabled);
   }
@@ -173,8 +173,7 @@ void TrafficManager::Invalidate()
     UpdateMyPosition(m_currentPosition.first);
 }
 
-void TrafficManager::UpdateActiveMwms(m2::RectD const & rect,
-                                      std::vector<MwmSet::MwmId> & lastMwmsByRect,
+void TrafficManager::UpdateActiveMwms(m2::RectD const & rect, std::vector<MwmSet::MwmId> & lastMwmsByRect,
                                       std::set<MwmSet::MwmId> & activeMwms)
 {
   auto mwms = m_getMwmsByRectFn(rect);
@@ -186,10 +185,8 @@ void TrafficManager::UpdateActiveMwms(m2::RectD const & rect,
     std::lock_guard<std::mutex> lock(m_mutex);
     activeMwms.clear();
     for (auto const & mwm : mwms)
-    {
       if (mwm.IsAlive())
         activeMwms.insert(mwm);
-    }
     RequestTrafficData();
   }
 }
@@ -204,8 +201,7 @@ void TrafficManager::UpdateMyPosition(MyPosition const & myPosition)
   if (!IsEnabled() || IsInvalidState() || m_isPaused)
     return;
 
-  m2::RectD const rect =
-      mercator::RectByCenterXYAndSizeInMeters(myPosition.m_position, kSquareSideM / 2.0);
+  m2::RectD const rect = mercator::RectByCenterXYAndSizeInMeters(myPosition.m_position, kSquareSideM / 2.0);
   // Request traffic.
   UpdateActiveMwms(rect, m_lastRoutingMwmsByRect, m_activeRoutingMwms);
 
@@ -267,10 +263,8 @@ bool TrafficManager::WaitForRequest(std::vector<MwmSet::MwmId> & mwms)
 {
   std::unique_lock<std::mutex> lock(m_mutex);
 
-  bool const timeout = !m_condition.wait_for(lock, kUpdateInterval, [this]
-  {
-    return !m_isRunning || !m_requestedMwms.empty();
-  });
+  bool const timeout =
+      !m_condition.wait_for(lock, kUpdateInterval, [this] { return !m_isRunning || !m_requestedMwms.empty(); });
 
   if (!m_isRunning)
     return false;
@@ -316,13 +310,11 @@ void TrafficManager::RequestTrafficData(MwmSet::MwmId const & mwmId, bool force)
 
 void TrafficManager::RequestTrafficData()
 {
-  if ((m_activeDrapeMwms.empty() && m_activeRoutingMwms.empty()) || !IsEnabled() ||
-      IsInvalidState() || m_isPaused)
-  {
+  if ((m_activeDrapeMwms.empty() && m_activeRoutingMwms.empty()) || !IsEnabled() || IsInvalidState() || m_isPaused)
     return;
-  }
 
-  ForEachActiveMwm([this](MwmSet::MwmId const & mwmId) {
+  ForEachActiveMwm([this](MwmSet::MwmId const & mwmId)
+  {
     ASSERT(mwmId.IsAlive(), ());
     RequestTrafficData(mwmId, false /* force */);
   });
@@ -340,8 +332,7 @@ void TrafficManager::OnTrafficRequestFailed(traffic::TrafficInfo && info)
   it->second.m_isWaitingForResponse = false;
   it->second.m_lastAvailability = info.GetAvailability();
 
-  if (info.GetAvailability() == traffic::TrafficInfo::Availability::Unknown &&
-      !it->second.m_isLoaded)
+  if (info.GetAvailability() == traffic::TrafficInfo::Availability::Unknown && !it->second.m_isLoaded)
   {
     if (m_activeDrapeMwms.find(info.GetMwmId()) != m_activeDrapeMwms.cend() ||
         m_activeRoutingMwms.find(info.GetMwmId()) != m_activeRoutingMwms.cend())
@@ -388,8 +379,7 @@ void TrafficManager::OnTrafficDataResponse(traffic::TrafficInfo && info)
 
   if (!info.GetColoring().empty())
   {
-    m_drapeEngine.SafeCall(&df::DrapeEngine::UpdateTraffic,
-                           static_cast<traffic::TrafficInfo const &>(info));
+    m_drapeEngine.SafeCall(&df::DrapeEngine::UpdateTraffic, static_cast<traffic::TrafficInfo const &>(info));
 
     // Update traffic colors for routing.
     m_observer.OnTrafficInfoAdded(std::move(info));
@@ -437,10 +427,7 @@ void TrafficManager::ClearCache(MwmSet::MwmId const & mwmId)
 
     m_drapeEngine.SafeCall(&df::DrapeEngine::ClearTrafficCache, mwmId);
 
-    GetPlatform().RunTask(Platform::Thread::Gui, [this, mwmId]()
-    {
-      m_observer.OnTrafficInfoRemoved(mwmId);
-    });
+    GetPlatform().RunTask(Platform::Thread::Gui, [this, mwmId]() { m_observer.OnTrafficInfoRemoved(mwmId); });
   }
   m_mwmCache.erase(it);
   m_trafficETags.erase(mwmId);
@@ -566,24 +553,15 @@ std::string DebugPrint(TrafficManager::TrafficState state)
 {
   switch (state)
   {
-  case TrafficManager::TrafficState::Disabled:
-    return "Disabled";
-  case TrafficManager::TrafficState::Enabled:
-    return "Enabled";
-  case TrafficManager::TrafficState::WaitingData:
-    return "WaitingData";
-  case TrafficManager::TrafficState::Outdated:
-    return "Outdated";
-  case TrafficManager::TrafficState::NoData:
-    return "NoData";
-  case TrafficManager::TrafficState::NetworkError:
-    return "NetworkError";
-  case TrafficManager::TrafficState::ExpiredData:
-    return "ExpiredData";
-  case TrafficManager::TrafficState::ExpiredApp:
-    return "ExpiredApp";
-  default:
-      ASSERT(false, ("Unknown state"));
+  case TrafficManager::TrafficState::Disabled: return "Disabled";
+  case TrafficManager::TrafficState::Enabled: return "Enabled";
+  case TrafficManager::TrafficState::WaitingData: return "WaitingData";
+  case TrafficManager::TrafficState::Outdated: return "Outdated";
+  case TrafficManager::TrafficState::NoData: return "NoData";
+  case TrafficManager::TrafficState::NetworkError: return "NetworkError";
+  case TrafficManager::TrafficState::ExpiredData: return "ExpiredData";
+  case TrafficManager::TrafficState::ExpiredApp: return "ExpiredApp";
+  default: ASSERT(false, ("Unknown state"));
   }
   return "Unknown";
 }
diff --git a/libs/map/traffic_manager.hpp b/libs/map/traffic_manager.hpp
index f2a2d28b1..e015b3dd1 100644
--- a/libs/map/traffic_manager.hpp
+++ b/libs/map/traffic_manager.hpp
@@ -49,10 +49,7 @@ public:
     bool m_knownPosition = false;
 
     MyPosition() = default;
-    MyPosition(m2::PointD const & position)
-      : m_position(position),
-        m_knownPosition(true)
-    {}
+    MyPosition(m2::PointD const & position) : m_position(position), m_knownPosition(true) {}
   };
 
   using TrafficStateChangedFn = std::function<void(TrafficState)>;
diff --git a/libs/map/transit/transit_display.cpp b/libs/map/transit/transit_display.cpp
index 799f4ef06..320c4edc1 100644
--- a/libs/map/transit/transit_display.cpp
+++ b/libs/map/transit/transit_display.cpp
@@ -9,39 +9,38 @@
 
 using namespace std;
 
-map<TransitType, string> const kTransitSymbols = {
-    {TransitType::Subway, "transit_subway"},
-    {TransitType::LightRail, "transit_light_rail"},
-    {TransitType::Monorail, "transit_monorail"},
-    {TransitType::Train, "transit_train"},
-    {TransitType::Tram, "transit_tram"},
-    {TransitType::Bus, "transit_bus"},
-    {TransitType::Ferry, "transit_ferry"},
-    {TransitType::CableTram, "transit_cable_tram"},
-    {TransitType::AerialLift, "transit_aerial_lift"},
-    {TransitType::Funicular, "transit_funicular"},
-    {TransitType::Trolleybus, "transit_trolleybus"},
-    {TransitType::AirService, "transit_air_service"},
-    {TransitType::WaterService, "transit_water_service"}};
+map<TransitType, string> const kTransitSymbols = {{TransitType::Subway, "transit_subway"},
+                                                  {TransitType::LightRail, "transit_light_rail"},
+                                                  {TransitType::Monorail, "transit_monorail"},
+                                                  {TransitType::Train, "transit_train"},
+                                                  {TransitType::Tram, "transit_tram"},
+                                                  {TransitType::Bus, "transit_bus"},
+                                                  {TransitType::Ferry, "transit_ferry"},
+                                                  {TransitType::CableTram, "transit_cable_tram"},
+                                                  {TransitType::AerialLift, "transit_aerial_lift"},
+                                                  {TransitType::Funicular, "transit_funicular"},
+                                                  {TransitType::Trolleybus, "transit_trolleybus"},
+                                                  {TransitType::AirService, "transit_air_service"},
+                                                  {TransitType::WaterService, "transit_water_service"}};
 
 namespace
 {
 float const kStopMarkerScale = 2.2f;
 float const kTransferMarkerScale = 4.0f;
-const float kGateBgScale = 1.2f;
+float const kGateBgScale = 1.2f;
 
-const int kSmallIconZoom = 1;
-const int kMediumIconZoom = 10;
+int const kSmallIconZoom = 1;
+int const kMediumIconZoom = 10;
 
-const int kMinStopTitleZoom = 13;
+int const kMinStopTitleZoom = 13;
 
-const int kTransferTitleOffset = 2;
-const int kStopTitleOffset = 0;
-const int kGateTitleOffset = 0;
+int const kTransferTitleOffset = 2;
+int const kStopTitleOffset = 0;
+int const kGateTitleOffset = 0;
 
 std::string const kZeroIcon = "zero-icon";
 
-TransitType GetTransitType(string const &type)
+TransitType GetTransitType(string const & type)
 {
   if (type == "subway")
     return TransitType::Subway;
@@ -95,8 +94,8 @@ vector<m2::PointF> GetTransitMarkerSizes(float markerScale, float maxRouteWidth)
 }
 }  // namespace
 
-TransitStepInfo::TransitStepInfo(TransitType type, double distance, int time, string const & number,
-                                 uint32_t color, int intermediateIndex)
+TransitStepInfo::TransitStepInfo(TransitType type, double distance, int time, string const & number, uint32_t color,
+                                 int intermediateIndex)
   : m_type(type)
   , m_distanceInMeters(distance)
   , m_timeInSec(time)
@@ -139,13 +138,9 @@ void TransitRouteInfo::UpdateDistanceStrings()
   if (m_steps.empty())
     return;
   for (auto & step : m_steps)
-  {
-    routing::FormatDistance(step.m_distanceInMeters, step.m_distanceStr,
-                            step.m_distanceUnitsSuffix);
-  }
+    routing::FormatDistance(step.m_distanceInMeters, step.m_distanceStr, step.m_distanceUnitsSuffix);
   routing::FormatDistance(m_totalDistInMeters, m_totalDistanceStr, m_totalDistanceUnitsSuffix);
-  routing::FormatDistance(m_totalPedestrianDistInMeters, m_totalPedestrianDistanceStr,
-                          m_totalPedestrianUnitsSuffix);
+  routing::FormatDistance(m_totalPedestrianDistInMeters, m_totalPedestrianDistanceStr, m_totalPedestrianUnitsSuffix);
 }
 
 void AddTransitGateSegment(m2::PointD const & destPoint, df::ColorConstant const & color, df::Subroute & subroute)
@@ -168,9 +163,8 @@ void AddTransitPedestrianSegment(m2::PointD const & destPoint, df::Subroute & su
   subroute.AddStyle(style);
 }
 
-void AddTransitShapes(vector<routing::transit::ShapeId> const & shapeIds,
-                      TransitShapesInfo const & shapes, df::ColorConstant const & color,
-                      bool isInverted, df::Subroute & subroute)
+void AddTransitShapes(vector<routing::transit::ShapeId> const & shapeIds, TransitShapesInfo const & shapes,
+                      df::ColorConstant const & color, bool isInverted, df::Subroute & subroute)
 {
   ASSERT_GREATER(subroute.m_polyline.GetSize(), 0, ());
   df::SubrouteStyle style(color);
@@ -204,8 +198,8 @@ void AddTransitShapes(::transit::ShapeLink shapeLink, TransitShapesInfoPT const
   size_t const startIdx = isInverted ? shapeLink.m_endIndex : shapeLink.m_startIndex;
   size_t const endIdx = isInverted ? shapeLink.m_startIndex : shapeLink.m_endIndex;
 
-  auto const & edgePolyline = vector<m2::PointD>(it->second.GetPolyline().begin() + startIdx,
-                                                 it->second.GetPolyline().begin() + endIdx + 1);
+  auto const & edgePolyline =
+      vector<m2::PointD>(it->second.GetPolyline().begin() + startIdx, it->second.GetPolyline().begin() + endIdx + 1);
 
   if (isInverted)
     subroute.m_polyline.Append(edgePolyline.crbegin(), edgePolyline.crend());
@@ -216,10 +210,8 @@ void AddTransitShapes(::transit::ShapeLink shapeLink, TransitShapesInfoPT const
   subroute.AddStyle(style);
 }
 
-TransitRouteDisplay::TransitRouteDisplay(TransitReadManager & transitReadManager,
-                                         GetMwmIdFn const & getMwmIdFn,
-                                         GetStringsBundleFn const & getStringsBundleFn,
-                                         BookmarkManager * bmManager,
+TransitRouteDisplay::TransitRouteDisplay(TransitReadManager & transitReadManager, GetMwmIdFn const & getMwmIdFn,
+                                         GetStringsBundleFn const & getStringsBundleFn, BookmarkManager * bmManager,
                                          map<string, m2::PointF> const & transitSymbolSizes)
   : m_transitReadManager(transitReadManager)
   , m_getMwmIdFn(getMwmIdFn)
@@ -244,9 +236,8 @@ TransitRouteInfo const & TransitRouteDisplay::GetRouteInfo()
   return m_routeInfo;
 }
 
-void TransitRouteDisplay::AddEdgeSubwayForSubroute(routing::RouteSegment const & segment,
-                                                   df::Subroute & subroute, SubrouteParams & sp,
-                                                   SubrouteSegmentParams & ssp)
+void TransitRouteDisplay::AddEdgeSubwayForSubroute(routing::RouteSegment const & segment, df::Subroute & subroute,
+                                                   SubrouteParams & sp, SubrouteSegmentParams & ssp)
 {
   CHECK_EQUAL(ssp.m_displayInfo.m_transitVersion, ::transit::TransitVersion::OnlySubway, ());
 
@@ -258,8 +249,8 @@ void TransitRouteDisplay::AddEdgeSubwayForSubroute(routing::RouteSegment const &
   auto const currentColor = df::GetTransitColorName(line.GetColor());
   sp.m_transitType = GetTransitType(line.GetType());
 
-  m_routeInfo.AddStep(TransitStepInfo(sp.m_transitType, ssp.m_distance, ssp.m_time,
-                                      line.GetNumber(), ColorToARGB(currentColor)));
+  m_routeInfo.AddStep(
+      TransitStepInfo(sp.m_transitType, ssp.m_distance, ssp.m_time, line.GetNumber(), ColorToARGB(currentColor)));
 
   auto const & stop1 = ssp.m_displayInfo.m_stopsSubway.at(edge.m_stop1Id);
   auto const & stop2 = ssp.m_displayInfo.m_stopsSubway.at(edge.m_stop2Id);
@@ -295,8 +286,7 @@ void TransitRouteDisplay::AddEdgeSubwayForSubroute(routing::RouteSegment const &
   if (id1 != id2)
   {
     bool const isInverted = id1 > id2;
-    AddTransitShapes(edge.m_shapeIds, ssp.m_displayInfo.m_shapesSubway, currentColor, isInverted,
-                     subroute);
+    AddTransitShapes(edge.m_shapeIds, ssp.m_displayInfo.m_shapesSubway, currentColor, isInverted, subroute);
   }
 
   CHECK_GREATER(subroute.m_polyline.GetSize(), 1, ());
@@ -361,14 +351,12 @@ void TransitRouteDisplay::AddEdgeSubwayForSubroute(routing::RouteSegment const &
     auto const fid = FeatureID(ssp.m_mwmId, stop2.GetFeatureId());
     sp.m_transitMarkInfo.m_featureId = fid;
     sp.m_transitMarkInfo.m_titles.push_back(
-        TransitTitle(ssp.m_displayInfo.m_features.at(fid).m_title,
-                     df::GetTransitTextColorName(line.GetColor())));
+        TransitTitle(ssp.m_displayInfo.m_features.at(fid).m_title, df::GetTransitTextColorName(line.GetColor())));
   }
 }
 
-void TransitRouteDisplay::AddEdgePTForSubroute(routing::RouteSegment const & segment,
-                                               df::Subroute & subroute, SubrouteParams & sp,
-                                               SubrouteSegmentParams & ssp)
+void TransitRouteDisplay::AddEdgePTForSubroute(routing::RouteSegment const & segment, df::Subroute & subroute,
+                                               SubrouteParams & sp, SubrouteSegmentParams & ssp)
 {
   CHECK_EQUAL(ssp.m_displayInfo.m_transitVersion, ::transit::TransitVersion::AllPublicTransport,
               (segment.GetSegment()));
@@ -385,8 +373,8 @@ void TransitRouteDisplay::AddEdgePTForSubroute(routing::RouteSegment const & seg
   auto const currentColor = df::GetTransitColorName(route.GetColor());
   sp.m_transitType = GetTransitType(route.GetType());
 
-  m_routeInfo.AddStep(TransitStepInfo(sp.m_transitType, ssp.m_distance, ssp.m_time,
-                                      route.GetTitle(), ColorToARGB(currentColor)));
+  m_routeInfo.AddStep(
+      TransitStepInfo(sp.m_transitType, ssp.m_distance, ssp.m_time, route.GetTitle(), ColorToARGB(currentColor)));
 
   auto const & stop1 = ssp.m_displayInfo.m_stopsPT.at(edge.m_stop1Id);
   auto const & stop2 = ssp.m_displayInfo.m_stopsPT.at(edge.m_stop2Id);
@@ -424,9 +412,7 @@ void TransitRouteDisplay::AddEdgePTForSubroute(routing::RouteSegment const & seg
   auto const id2 = isTransfer2 ? stop2.GetTransferIds().front() : stop2.GetId();
 
   if (id1 != id2)
-  {
     AddTransitShapes(edge.m_shapeLink, ssp.m_displayInfo.m_shapesPT, currentColor, subroute);
-  }
 
   CHECK_GREATER(subroute.m_polyline.GetSize(), 1, ());
   auto const & p1 = *(subroute.m_polyline.End() - 2);
@@ -495,9 +481,8 @@ void TransitRouteDisplay::AddEdgePTForSubroute(routing::RouteSegment const & seg
   }
 }
 
-void TransitRouteDisplay::AddGateSubwayForSubroute(routing::RouteSegment const & segment,
-                                                   df::Subroute & subroute, SubrouteParams & sp,
-                                                   SubrouteSegmentParams & ssp)
+void TransitRouteDisplay::AddGateSubwayForSubroute(routing::RouteSegment const & segment, df::Subroute & subroute,
+                                                   SubrouteParams & sp, SubrouteSegmentParams & ssp)
 {
   auto const & gate = ssp.m_transitInfo.GetGateSubway();
   if (sp.m_lastLineId != routing::transit::kInvalidLineId)
@@ -521,8 +506,7 @@ void TransitRouteDisplay::AddGateSubwayForSubroute(routing::RouteSegment const &
   }
 
   auto gateMarkInfo = TransitMarkInfo();
-  gateMarkInfo.m_point =
-      sp.m_pendingEntrance ? subroute.m_polyline.Back() : segment.GetJunction().GetPoint();
+  gateMarkInfo.m_point = sp.m_pendingEntrance ? subroute.m_polyline.Back() : segment.GetJunction().GetPoint();
   gateMarkInfo.m_type = TransitMarkInfo::Type::Gate;
   gateMarkInfo.m_symbolName = kZeroIcon;
   if (gate.m_featureId != kInvalidFeatureId)
@@ -530,26 +514,21 @@ void TransitRouteDisplay::AddGateSubwayForSubroute(routing::RouteSegment const &
     auto const fid = FeatureID(ssp.m_mwmId, gate.m_featureId);
     auto const & featureInfo = ssp.m_displayInfo.m_features.at(fid);
     auto symbolName = featureInfo.m_gateSymbolName;
-    if (symbolName.ends_with("-s") || symbolName.ends_with("-m") ||
-        symbolName.ends_with("-l"))
-    {
+    if (symbolName.ends_with("-s") || symbolName.ends_with("-m") || symbolName.ends_with("-l"))
       symbolName = symbolName.substr(0, symbolName.rfind('-'));
-    }
 
     gateMarkInfo.m_featureId = fid;
     if (!symbolName.empty())
       gateMarkInfo.m_symbolName = symbolName;
-    auto const title =
-        m_getStringsBundleFn().GetString(sp.m_pendingEntrance ? "core_entrance" : "core_exit");
+    auto const title = m_getStringsBundleFn().GetString(sp.m_pendingEntrance ? "core_entrance" : "core_exit");
     gateMarkInfo.m_titles.emplace_back(title, df::GetTransitTextColorName("default"));
   }
 
   m_transitMarks.push_back(gateMarkInfo);
 }
 
-void TransitRouteDisplay::AddGatePTForSubroute(routing::RouteSegment const & segment,
-                                               df::Subroute & subroute, SubrouteParams & sp,
-                                               SubrouteSegmentParams & ssp)
+void TransitRouteDisplay::AddGatePTForSubroute(routing::RouteSegment const & segment, df::Subroute & subroute,
+                                               SubrouteParams & sp, SubrouteSegmentParams & ssp)
 {
   auto const & gate = ssp.m_transitInfo.GetGatePT();
   if (sp.m_lastLineId != ::transit::kInvalidTransitId)
@@ -573,8 +552,7 @@ void TransitRouteDisplay::AddGatePTForSubroute(routing::RouteSegment const & seg
   }
 
   auto gateMarkInfo = TransitMarkInfo();
-  gateMarkInfo.m_point =
-      sp.m_pendingEntrance ? subroute.m_polyline.Back() : segment.GetJunction().GetPoint();
+  gateMarkInfo.m_point = sp.m_pendingEntrance ? subroute.m_polyline.Back() : segment.GetJunction().GetPoint();
   gateMarkInfo.m_type = TransitMarkInfo::Type::Gate;
   gateMarkInfo.m_symbolName = kZeroIcon;
   if (gate.m_featureId != kInvalidFeatureId)
@@ -582,25 +560,20 @@ void TransitRouteDisplay::AddGatePTForSubroute(routing::RouteSegment const & seg
     auto const fid = FeatureID(ssp.m_mwmId, gate.m_featureId);
     auto const & featureInfo = ssp.m_displayInfo.m_features.at(fid);
     auto symbolName = featureInfo.m_gateSymbolName;
-    if (symbolName.ends_with("-s") || symbolName.ends_with("-m") ||
-        symbolName.ends_with("-l"))
-    {
+    if (symbolName.ends_with("-s") || symbolName.ends_with("-m") || symbolName.ends_with("-l"))
       symbolName = symbolName.substr(0, symbolName.rfind('-'));
-    }
 
     gateMarkInfo.m_featureId = fid;
     if (!symbolName.empty())
       gateMarkInfo.m_symbolName = symbolName;
-    auto const title =
-        m_getStringsBundleFn().GetString(sp.m_pendingEntrance ? "core_entrance" : "core_exit");
+    auto const title = m_getStringsBundleFn().GetString(sp.m_pendingEntrance ? "core_entrance" : "core_exit");
     gateMarkInfo.m_titles.emplace_back(title, df::GetTransitTextColorName("default"));
   }
 
   m_transitMarks.push_back(gateMarkInfo);
 }
 
-bool TransitRouteDisplay::ProcessSubroute(vector<routing::RouteSegment> const & segments,
-                                          df::Subroute & subroute)
+bool TransitRouteDisplay::ProcessSubroute(vector<routing::RouteSegment> const & segments, df::Subroute & subroute)
 {
   if (m_subrouteIndex > 0)
   {
@@ -684,8 +657,8 @@ bool TransitRouteDisplay::ProcessSubroute(vector<routing::RouteSegment> const &
 }
 
 template <class T>
-void FillMwmTransitSubway(unique_ptr<TransitDisplayInfo> & mwmTransit,
-                          routing::TransitInfo const & transitInfo, T mwmId)
+void FillMwmTransitSubway(unique_ptr<TransitDisplayInfo> & mwmTransit, routing::TransitInfo const & transitInfo,
+                          T mwmId)
 {
   switch (transitInfo.GetType())
   {
@@ -723,8 +696,7 @@ void FillMwmTransitSubway(unique_ptr<TransitDisplayInfo> & mwmTransit,
 }
 
 template <class T>
-void FillMwmTransitPT(unique_ptr<TransitDisplayInfo> & mwmTransit,
-                      routing::TransitInfo const & transitInfo, T mwmId)
+void FillMwmTransitPT(unique_ptr<TransitDisplayInfo> & mwmTransit, routing::TransitInfo const & transitInfo, T mwmId)
 {
   switch (transitInfo.GetType())
   {
@@ -801,10 +773,8 @@ void TransitRouteDisplay::CreateTransitMarks()
   if (m_transitMarks.empty())
     return;
 
-  vector<m2::PointF> const transferMarkerSizes =
-      GetTransitMarkerSizes(kTransferMarkerScale, m_maxSubrouteWidth);
-  vector<m2::PointF> const stopMarkerSizes =
-      GetTransitMarkerSizes(kStopMarkerScale, m_maxSubrouteWidth);
+  vector<m2::PointF> const transferMarkerSizes = GetTransitMarkerSizes(kTransferMarkerScale, m_maxSubrouteWidth);
+  vector<m2::PointF> const stopMarkerSizes = GetTransitMarkerSizes(kStopMarkerScale, m_maxSubrouteWidth);
 
   vector<m2::PointF> transferArrowOffsets;
   transferArrowOffsets.reserve(transferMarkerSizes.size());
@@ -832,9 +802,7 @@ void TransitRouteDisplay::CreateTransitMarks()
       }
 
       auto const GetSymbolName = [](std::string const & name, char const * suffix)
-      {
-        return name != kZeroIcon ? name + suffix : name;
-      };
+      { return name != kZeroIcon ? name + suffix : name; };
       df::UserPointMark::SymbolNameZoomInfo symbolNames;
       symbolNames[kSmallIconZoom] = GetSymbolName(mark.m_symbolName, "-s");
       symbolNames[kMediumIconZoom] = GetSymbolName(mark.m_symbolName, "-m");
diff --git a/libs/map/transit/transit_display.hpp b/libs/map/transit/transit_display.hpp
index 41f42e2b3..37e7af45d 100644
--- a/libs/map/transit/transit_display.hpp
+++ b/libs/map/transit/transit_display.hpp
@@ -41,8 +41,7 @@ extern std::map<TransitType, std::string> const kTransitSymbols;
 struct TransitStepInfo
 {
   TransitStepInfo() = default;
-  TransitStepInfo(TransitType type, double distance, int time,
-                  std::string const & number = "", uint32_t color = 0,
+  TransitStepInfo(TransitType type, double distance, int time, std::string const & number = "", uint32_t color = 0,
                   int intermediateIndex = 0);
 
   bool IsEqualType(TransitStepInfo const & ts) const;
@@ -84,10 +83,7 @@ struct TransitRouteInfo
 struct TransitTitle
 {
   TransitTitle() = default;
-  TransitTitle(std::string const & text, df::ColorConstant const & color)
-    : m_text(text), m_color(color)
-  {
-  }
+  TransitTitle(std::string const & text, df::ColorConstant const & color) : m_text(text), m_color(color) {}
 
   std::string m_text;
   df::ColorConstant m_color;
@@ -136,8 +132,8 @@ struct SubrouteSegmentParams
 class TransitRouteDisplay
 {
 public:
-  using GetMwmIdFn = std::function<MwmSet::MwmId (routing::NumMwmId numMwmId)>;
-  using GetStringsBundleFn = std::function<StringsBundle const & ()>;
+  using GetMwmIdFn = std::function<MwmSet::MwmId(routing::NumMwmId numMwmId)>;
+  using GetStringsBundleFn = std::function<StringsBundle const &()>;
 
   TransitRouteDisplay(TransitReadManager & transitReadManager, GetMwmIdFn const & getMwmIdFn,
                       GetStringsBundleFn const & getStringsBundleFn, BookmarkManager * bmManager,
@@ -149,16 +145,16 @@ public:
   TransitRouteInfo const & GetRouteInfo();
 
 private:
-  void AddEdgeSubwayForSubroute(routing::RouteSegment const & segment, df::Subroute & subroute,
-                                SubrouteParams & sp, SubrouteSegmentParams & ssp);
-  void AddEdgePTForSubroute(routing::RouteSegment const & segment, df::Subroute & subroute,
-                            SubrouteParams & sp, SubrouteSegmentParams & ssp);
+  void AddEdgeSubwayForSubroute(routing::RouteSegment const & segment, df::Subroute & subroute, SubrouteParams & sp,
+                                SubrouteSegmentParams & ssp);
+  void AddEdgePTForSubroute(routing::RouteSegment const & segment, df::Subroute & subroute, SubrouteParams & sp,
+                            SubrouteSegmentParams & ssp);
 
-  void AddGateSubwayForSubroute(routing::RouteSegment const & segment, df::Subroute & subroute,
-                                SubrouteParams & sp, SubrouteSegmentParams & ssp);
+  void AddGateSubwayForSubroute(routing::RouteSegment const & segment, df::Subroute & subroute, SubrouteParams & sp,
+                                SubrouteSegmentParams & ssp);
 
-  void AddGatePTForSubroute(routing::RouteSegment const & segment, df::Subroute & subroute,
-                            SubrouteParams & sp, SubrouteSegmentParams & ssp);
+  void AddGatePTForSubroute(routing::RouteSegment const & segment, df::Subroute & subroute, SubrouteParams & sp,
+                            SubrouteSegmentParams & ssp);
 
   void CollectTransitDisplayInfo(std::vector<routing::RouteSegment> const & segments,
                                  TransitDisplayInfos & transitDisplayInfos);
diff --git a/libs/map/transit/transit_reader.cpp b/libs/map/transit/transit_reader.cpp
index 73b45bae5..49990749f 100644
--- a/libs/map/transit/transit_reader.cpp
+++ b/libs/map/transit/transit_reader.cpp
@@ -9,7 +9,7 @@
 
 #include "indexer/data_source.hpp"
 #include "indexer/drawing_rules.hpp"
-#include "indexer/drules_include.hpp"   // needed despite of IDE warning
+#include "indexer/drules_include.hpp"  // needed despite of IDE warning
 #include "indexer/feature_algo.hpp"
 
 #include "coding/reader.hpp"
@@ -37,8 +37,7 @@ size_t CalculateCacheSize(TransitDisplayInfo const & transitInfo)
 }  // namespace
 
 // ReadTransitTask --------------------------------------------------------------------------------
-void ReadTransitTask::Init(uint64_t id, MwmSet::MwmId const & mwmId,
-                           unique_ptr<TransitDisplayInfo> transitInfo)
+void ReadTransitTask::Init(uint64_t id, MwmSet::MwmId const & mwmId, unique_ptr<TransitDisplayInfo> transitInfo)
 {
   m_id = id;
   m_mwmId = mwmId;
@@ -137,10 +136,8 @@ void ReadTransitTask::Do()
       }
 
       if (m_loadSubset && !stop.second.GetTransferIds().empty())
-      {
         for (auto const transferId : stop.second.GetTransferIds())
           m_transitInfo->m_transfersPT[transferId] = {};
-      }
     }
 
     FillItemsByIdMap(transitData.GetTransfers(), m_transitInfo->m_transfersPT);
@@ -165,7 +162,7 @@ void ReadTransitTask::Do()
 
     if (featureInfo.m_isGate)
     {
-      //TODO(pastk): there should be a simpler way to just get a symbol name.
+      // TODO(pastk): there should be a simpler way to just get a symbol name.
       df::Stylist stylist(ft, 19, 0);
       if (stylist.m_symbolRule != nullptr)
         featureInfo.m_gateSymbolName = stylist.m_symbolRule->name();
@@ -221,8 +218,7 @@ void ReadTransitTask::FillLinesAndRoutes(::transit::experimental::TransitData co
   }
 }
 
-TransitReadManager::TransitReadManager(DataSource & dataSource,
-                                       TReadFeaturesFn const & readFeaturesFn,
+TransitReadManager::TransitReadManager(DataSource & dataSource, TReadFeaturesFn const & readFeaturesFn,
                                        GetMwmsByRectFn const & getMwmsByRectFn)
   : m_dataSource(dataSource)
   , m_readFeaturesFn(readFeaturesFn)
@@ -243,8 +239,7 @@ void TransitReadManager::Start()
 
   using namespace placeholders;
   uint8_t constexpr kThreadsCount = 1;
-  m_threadsPool = make_unique<base::ThreadPool>(
-      kThreadsCount, bind(&TransitReadManager::OnTaskCompleted, this, _1));
+  m_threadsPool = make_unique<base::ThreadPool>(kThreadsCount, bind(&TransitReadManager::OnTaskCompleted, this, _1));
 }
 
 void TransitReadManager::Stop()
@@ -353,8 +348,7 @@ void TransitReadManager::UpdateViewport(ScreenBase const & screen)
       if (!transitInfo)
         continue;
 
-      if (transitInfo->m_transitVersion == ::transit::TransitVersion::OnlySubway &&
-          transitInfo->m_linesSubway.empty())
+      if (transitInfo->m_transitVersion == ::transit::TransitVersion::OnlySubway && transitInfo->m_linesSubway.empty())
         continue;
 
       if (transitInfo->m_transitVersion == ::transit::TransitVersion::AllPublicTransport &&
@@ -432,10 +426,8 @@ void TransitReadManager::ShrinkCacheToAllowableSize()
   {
     std::multimap<time_point<steady_clock>, MwmSet::MwmId> seenTimings;
     for (auto const & entry : m_mwmCache)
-    {
       if (entry.second.m_isLoaded && m_lastActiveMwms.count(entry.first) == 0)
         seenTimings.insert(make_pair(entry.second.m_lastActiveTime, entry.first));
-    }
 
     while (m_cacheSize > kMaxTransitCacheSizeBytes && !seenTimings.empty())
     {
diff --git a/libs/map/transit/transit_reader.hpp b/libs/map/transit/transit_reader.hpp
index c7c04a5be..0dd76f2cb 100644
--- a/libs/map/transit/transit_reader.hpp
+++ b/libs/map/transit/transit_reader.hpp
@@ -27,17 +27,17 @@
 class DataSource;
 
 using FeatureCallback = std::function<void(FeatureType &)>;
-using TReadFeaturesFn = std::function<void (FeatureCallback const & , std::vector<FeatureID> const &)>;
+using TReadFeaturesFn = std::function<void(FeatureCallback const &, std::vector<FeatureID> const &)>;
 
-class ReadTransitTask: public threads::IRoutine
+class ReadTransitTask : public threads::IRoutine
 {
 public:
   ReadTransitTask(DataSource & dataSource, TReadFeaturesFn const & readFeaturesFn)
-    : m_dataSource(dataSource), m_readFeaturesFn(readFeaturesFn)
+    : m_dataSource(dataSource)
+    , m_readFeaturesFn(readFeaturesFn)
   {}
 
-  void Init(uint64_t id, MwmSet::MwmId const & mwmId,
-            std::unique_ptr<TransitDisplayInfo> transitInfo = nullptr);
+  void Init(uint64_t id, MwmSet::MwmId const & mwmId, std::unique_ptr<TransitDisplayInfo> transitInfo = nullptr);
   uint64_t GetId() const { return m_id; }
   bool GetSuccess() const { return m_success; }
 
@@ -137,9 +137,7 @@ private:
 
   struct CacheEntry
   {
-    CacheEntry(std::chrono::time_point<std::chrono::steady_clock> const & activeTime)
-      : m_lastActiveTime(activeTime)
-    {}
+    CacheEntry(std::chrono::time_point<std::chrono::steady_clock> const & activeTime) : m_lastActiveTime(activeTime) {}
 
     bool m_isLoaded = false;
     size_t m_dataSize = 0;
diff --git a/libs/map/user_mark.cpp b/libs/map/user_mark.cpp
index 23a0fe327..acf3575cf 100644
--- a/libs/map/user_mark.cpp
+++ b/libs/map/user_mark.cpp
@@ -35,9 +35,7 @@ ms::LatLon UserMark::GetLatLon() const
   return mercator::ToLatLon(m_ptOrg);
 }
 
-StaticMarkPoint::StaticMarkPoint(m2::PointD const & ptOrg)
-  : UserMark(ptOrg, UserMark::Type::STATIC)
-{}
+StaticMarkPoint::StaticMarkPoint(m2::PointD const & ptOrg) : UserMark(ptOrg, UserMark::Type::STATIC) {}
 
 void StaticMarkPoint::SetPtOrg(m2::PointD const & ptOrg)
 {
@@ -45,13 +43,9 @@ void StaticMarkPoint::SetPtOrg(m2::PointD const & ptOrg)
   m_ptOrg = ptOrg;
 }
 
-MyPositionMarkPoint::MyPositionMarkPoint(m2::PointD const & ptOrg)
-  : StaticMarkPoint(ptOrg)
-{}
+MyPositionMarkPoint::MyPositionMarkPoint(m2::PointD const & ptOrg) : StaticMarkPoint(ptOrg) {}
 
-DebugMarkPoint::DebugMarkPoint(const m2::PointD & ptOrg)
-  : UserMark(ptOrg, UserMark::Type::DEBUG_MARK)
-{}
+DebugMarkPoint::DebugMarkPoint(m2::PointD const & ptOrg) : UserMark(ptOrg, UserMark::Type::DEBUG_MARK) {}
 
 drape_ptr<df::UserPointMark::SymbolNameZoomInfo> DebugMarkPoint::GetSymbolNames() const
 {
@@ -60,8 +54,7 @@ drape_ptr<df::UserPointMark::SymbolNameZoomInfo> DebugMarkPoint::GetSymbolNames(
   return symbol;
 }
 
-ColoredMarkPoint::ColoredMarkPoint(m2::PointD const & ptOrg)
-  : UserMark(ptOrg, UserMark::Type::COLORED)
+ColoredMarkPoint::ColoredMarkPoint(m2::PointD const & ptOrg) : UserMark(ptOrg, UserMark::Type::COLORED)
 {
   auto const vs = static_cast<float>(df::VisualParams::Instance().GetVisualScale());
 
diff --git a/libs/map/user_mark.hpp b/libs/map/user_mark.hpp
index f74ec9d7e..a9ff23a9b 100644
--- a/libs/map/user_mark.hpp
+++ b/libs/map/user_mark.hpp
@@ -17,7 +17,7 @@
 class UserMark : public df::UserPointMark
 {
 public:
-  enum class Priority: uint16_t
+  enum class Priority : uint16_t
   {
     Default = 0,
     RouteStart,
@@ -77,7 +77,7 @@ public:
   drape_ptr<ColoredSymbolZoomInfo> GetColoredSymbols() const override { return nullptr; }
   drape_ptr<SymbolSizes> GetSymbolSizes() const override { return nullptr; }
   drape_ptr<SymbolOffsets> GetSymbolOffsets() const override { return nullptr; }
-  uint16_t GetPriority() const override { return static_cast<uint16_t >(Priority::Default); }
+  uint16_t GetPriority() const override { return static_cast<uint16_t>(Priority::Default); }
   df::SpecialDisplacement GetDisplacement() const override { return df::SpecialDisplacement::UserMark; }
   uint32_t GetIndex() const override { return 0; }
   bool SymbolIsPOI() const override { return false; }
diff --git a/libs/map/user_mark_id_storage.cpp b/libs/map/user_mark_id_storage.cpp
index 670ad6481..5143158b8 100644
--- a/libs/map/user_mark_id_storage.cpp
+++ b/libs/map/user_mark_id_storage.cpp
@@ -12,11 +12,9 @@ std::string const kLastTrackId = "LastTrackId";
 std::string const kLastBookmarkCategoryId = "LastBookmarkCategoryId";
 }  // namespace
 
-UserMarkIdStorage::UserMarkIdStorage()
-  : m_lastUserMarkId(0)
+UserMarkIdStorage::UserMarkIdStorage() : m_lastUserMarkId(0)
 {
-  m_isJustCreated = !(HasKey(kLastBookmarkCategoryId) && HasKey(kLastBookmarkId) &&
-                      HasKey(kLastTrackId));
+  m_isJustCreated = !(HasKey(kLastBookmarkCategoryId) && HasKey(kLastBookmarkId) && HasKey(kLastTrackId));
   if (m_isJustCreated)
   {
     ResetCategoryId();
@@ -81,22 +79,16 @@ bool UserMarkIdStorage::CheckIds(kml::FileData const & fileData) const
   }
 
   for (auto const & b : fileData.m_bookmarksData)
-  {
     if (b.m_id != kml::kInvalidMarkId && b.m_id > m_initialLastBookmarkId)
       return false;
-  }
 
   for (auto const & t : fileData.m_tracksData)
-  {
     if (t.m_id != kml::kInvalidTrackId && t.m_id > m_initialLastTrackId)
       return false;
-  }
 
   for (auto const & c : fileData.m_compilationsData)
-  {
     if (c.m_id != kml::kInvalidMarkGroupId && c.m_id > m_initialLastCategoryId)
       return false;
-  }
 
   // No one corner case. Check passed.
   return true;
diff --git a/libs/map/user_mark_layer.cpp b/libs/map/user_mark_layer.cpp
index a52b3bf9d..84a3c51b1 100644
--- a/libs/map/user_mark_layer.cpp
+++ b/libs/map/user_mark_layer.cpp
@@ -1,10 +1,6 @@
 #include "map/user_mark_layer.hpp"
 
-
-UserMarkLayer::UserMarkLayer(UserMark::Type type)
-  : m_type(type)
-{
-}
+UserMarkLayer::UserMarkLayer(UserMark::Type type) : m_type(type) {}
 
 bool UserMarkLayer::IsVisible() const
 {
diff --git a/libs/map/user_mark_layer.hpp b/libs/map/user_mark_layer.hpp
index b34d88f6b..4719d8c86 100644
--- a/libs/map/user_mark_layer.hpp
+++ b/libs/map/user_mark_layer.hpp
@@ -4,7 +4,6 @@
 
 #include <base/macros.hpp>
 
-
 class UserMarkLayer
 {
 public:
diff --git a/libs/map/viewport_search_callback.cpp b/libs/map/viewport_search_callback.cpp
index 3952a87c1..e4e4390b3 100644
--- a/libs/map/viewport_search_callback.cpp
+++ b/libs/map/viewport_search_callback.cpp
@@ -39,8 +39,8 @@ void ViewportSearchCallback::operator()(Results const & results)
   // clean up results.
 
   auto & delegate = m_delegate;
-  m_delegate.RunUITask([&delegate, results, onResults = m_onResults,
-                       firstCall = m_firstCall, lastResultsSize = m_lastResultsSize]() mutable
+  m_delegate.RunUITask([&delegate, results, onResults = m_onResults, firstCall = m_firstCall,
+                        lastResultsSize = m_lastResultsSize]() mutable
   {
     if (delegate.IsViewportSearchActive() &&
         (results.IsEndedNormal() || (!results.IsEndMarker() && results.GetCount() != 0)))
diff --git a/libs/mwm_diff/diff.cpp b/libs/mwm_diff/diff.cpp
index 32d7da9f6..095e8b714 100644
--- a/libs/mwm_diff/diff.cpp
+++ b/libs/mwm_diff/diff.cpp
@@ -54,9 +54,9 @@ bool MakeDiffVersion0(FileReader & oldReader, FileReader & newReader, FileWriter
   return true;
 }
 
-generator::mwm_diff::DiffApplicationResult ApplyDiffVersion0(
-    FileReader & oldReader, FileWriter & newWriter, ReaderSource<FileReader> & diffFileSource,
-    base::Cancellable const & cancellable)
+generator::mwm_diff::DiffApplicationResult ApplyDiffVersion0(FileReader & oldReader, FileWriter & newWriter,
+                                                             ReaderSource<FileReader> & diffFileSource,
+                                                             base::Cancellable const & cancellable)
 {
   using generator::mwm_diff::DiffApplicationResult;
 
@@ -108,9 +108,7 @@ bool MakeDiff(std::string const & oldMwmPath, std::string const & newMwmPath, st
     switch (VERSION_LATEST)
     {
     case VERSION_V0: return MakeDiffVersion0(oldReader, newReader, diffFileWriter);
-    default:
-      LOG(LERROR,
-          ("Making mwm diffs with diff format version", VERSION_LATEST, "is not implemented"));
+    default: LOG(LERROR, ("Making mwm diffs with diff format version", VERSION_LATEST, "is not implemented"));
     }
   }
   catch (Reader::Exception const & e)
@@ -141,11 +139,8 @@ DiffApplicationResult ApplyDiff(std::string const & oldMwmPath, std::string cons
 
     switch (version)
     {
-    case VERSION_V0:
-      return ApplyDiffVersion0(oldReader, newWriter, diffFileSource, cancellable);
-    default:
-      LOG(LERROR, ("Unknown version format of mwm diff:", version));
-      return DiffApplicationResult::Failed;
+    case VERSION_V0: return ApplyDiffVersion0(oldReader, newWriter, diffFileSource, cancellable);
+    default: LOG(LERROR, ("Unknown version format of mwm diff:", version)); return DiffApplicationResult::Failed;
     }
   }
   catch (Reader::Exception const & e)
@@ -157,8 +152,7 @@ DiffApplicationResult ApplyDiff(std::string const & oldMwmPath, std::string cons
     LOG(LERROR, ("Could not open file for writing when applying a patch:", e.Msg()));
   }
 
-  return cancellable.IsCancelled() ? DiffApplicationResult::Cancelled
-                                   : DiffApplicationResult::Failed;
+  return cancellable.IsCancelled() ? DiffApplicationResult::Cancelled : DiffApplicationResult::Failed;
 }
 
 std::string DebugPrint(DiffApplicationResult const & result)
diff --git a/libs/mwm_diff/diff.hpp b/libs/mwm_diff/diff.hpp
index 4a378d913..fc0492a69 100644
--- a/libs/mwm_diff/diff.hpp
+++ b/libs/mwm_diff/diff.hpp
@@ -22,8 +22,7 @@ enum class DiffApplicationResult
 // result in the mwm at |newMwmPath|. The diff is stored at |diffPath|.
 // It is assumed that the files at |oldMwmPath| and |newMwmPath| are valid mwms.
 // Returns true on success and false on failure.
-bool MakeDiff(std::string const & oldMwmPath, std::string const & newMwmPath,
-              std::string const & diffPath);
+bool MakeDiff(std::string const & oldMwmPath, std::string const & newMwmPath, std::string const & diffPath);
 
 // Applies the diff at |diffPath| to the mwm at |oldMwmPath|. The resulting
 // mwm is stored at |newMwmPath|.
@@ -32,8 +31,7 @@ bool MakeDiff(std::string const & oldMwmPath, std::string const & newMwmPath,
 // The application process can be stopped via |cancellable| in which case
 // it is up to the caller to clean the partially written file at |diffPath|.
 DiffApplicationResult ApplyDiff(std::string const & oldMwmPath, std::string const & newMwmPath,
-                                std::string const & diffPath,
-                                base::Cancellable const & cancellable);
+                                std::string const & diffPath, base::Cancellable const & cancellable);
 
 std::string DebugPrint(DiffApplicationResult const & result);
 }  // namespace mwm_diff
diff --git a/libs/mwm_diff/mwm_diff_tests/diff_tests.cpp b/libs/mwm_diff/mwm_diff_tests/diff_tests.cpp
index 01dbeabf7..a7dff824b 100644
--- a/libs/mwm_diff/mwm_diff_tests/diff_tests.cpp
+++ b/libs/mwm_diff/mwm_diff_tests/diff_tests.cpp
@@ -27,7 +27,8 @@ UNIT_TEST(IncrementalUpdates_Smoke)
   string const newMwmPath2 = base::JoinPath(GetPlatform().WritableDir(), "minsk-pass-new2.mwm");
   string const diffPath = base::JoinPath(GetPlatform().WritableDir(), "minsk-pass.mwmdiff");
 
-  SCOPE_GUARD(cleanup, [&] {
+  SCOPE_GUARD(cleanup, [&]
+  {
     FileWriter::DeleteFileX(newMwmPath1);
     FileWriter::DeleteFileX(newMwmPath2);
     FileWriter::DeleteFileX(diffPath);
@@ -40,8 +41,7 @@ UNIT_TEST(IncrementalUpdates_Smoke)
 
   base::Cancellable cancellable;
   TEST(MakeDiff(oldMwmPath, newMwmPath1, diffPath), ());
-  TEST_EQUAL(ApplyDiff(oldMwmPath, newMwmPath2, diffPath, cancellable), DiffApplicationResult::Ok,
-             ());
+  TEST_EQUAL(ApplyDiff(oldMwmPath, newMwmPath2, diffPath, cancellable), DiffApplicationResult::Ok, ());
 
   {
     // Alter the old mwm slightly.
@@ -55,14 +55,12 @@ UNIT_TEST(IncrementalUpdates_Smoke)
   }
 
   TEST(MakeDiff(oldMwmPath, newMwmPath1, diffPath), ());
-  TEST_EQUAL(ApplyDiff(oldMwmPath, newMwmPath2, diffPath, cancellable), DiffApplicationResult::Ok,
-             ());
+  TEST_EQUAL(ApplyDiff(oldMwmPath, newMwmPath2, diffPath, cancellable), DiffApplicationResult::Ok, ());
 
   TEST(base::IsEqualFiles(newMwmPath1, newMwmPath2), ());
 
   cancellable.Cancel();
-  TEST_EQUAL(ApplyDiff(oldMwmPath, newMwmPath2, diffPath, cancellable),
-             DiffApplicationResult::Cancelled, ());
+  TEST_EQUAL(ApplyDiff(oldMwmPath, newMwmPath2, diffPath, cancellable), DiffApplicationResult::Cancelled, ());
   cancellable.Reset();
 
   {
@@ -77,15 +75,13 @@ UNIT_TEST(IncrementalUpdates_Smoke)
     writer.Write(diffContents.data(), diffContents.size());
   }
 
-  TEST_EQUAL(ApplyDiff(oldMwmPath, newMwmPath2, diffPath, cancellable),
-             DiffApplicationResult::Failed, ());
+  TEST_EQUAL(ApplyDiff(oldMwmPath, newMwmPath2, diffPath, cancellable), DiffApplicationResult::Failed, ());
 
   {
     // Reset the diff file contents.
     FileWriter writer(diffPath);
   }
 
-  TEST_EQUAL(ApplyDiff(oldMwmPath, newMwmPath2, diffPath, cancellable),
-             DiffApplicationResult::Failed, ());
+  TEST_EQUAL(ApplyDiff(oldMwmPath, newMwmPath2, diffPath, cancellable), DiffApplicationResult::Failed, ());
 }
 }  // namespace generator::diff_tests
diff --git a/libs/mwm_diff/mwm_diff_tool/mwm_diff_tool.cpp b/libs/mwm_diff/mwm_diff_tool/mwm_diff_tool.cpp
index 507cc37bf..96cc8cae9 100644
--- a/libs/mwm_diff/mwm_diff_tool/mwm_diff_tool.cpp
+++ b/libs/mwm_diff/mwm_diff_tool/mwm_diff_tool.cpp
@@ -2,20 +2,20 @@
 
 #include "base/cancellable.hpp"
 
-#include <iostream>
 #include <cstring>
+#include <iostream>
 
 int main(int argc, char ** argv)
 {
   auto const ShowUsage = [argv]()
   {
-    std::cout <<
-        "Usage: " << argv[0] << " make|apply olderMWMPath newerMWMPath diffPath\n"
-        "make\n"
-        "  Creates the diff between newer and older MWMs at `diffPath`\n"
-        "apply\n"
-        "  Applies the diff at `diffPath` to the mwm at `olderMWMPath` and stores result at `newerMWMPath`.\n"
-        "WARNING: THERE IS NO MWM VALIDITY CHECK!\n";
+    std::cout << "Usage: " << argv[0]
+              << " make|apply olderMWMPath newerMWMPath diffPath\n"
+                 "make\n"
+                 "  Creates the diff between newer and older MWMs at `diffPath`\n"
+                 "apply\n"
+                 "  Applies the diff at `diffPath` to the mwm at `olderMWMPath` and stores result at `newerMWMPath`.\n"
+                 "WARNING: THERE IS NO MWM VALIDITY CHECK!\n";
   };
 
   if (argc < 5)
@@ -25,7 +25,7 @@ int main(int argc, char ** argv)
   }
 
   auto const IsEqualUsage = [argv](char const * s) { return 0 == std::strcmp(argv[1], s); };
-  char const * olderMWMPath{argv[2]}, * newerMWMPath{argv[3]}, * diffPath{argv[4]};
+  char const *olderMWMPath{argv[2]}, *newerMWMPath{argv[3]}, *diffPath{argv[4]};
 
   if (IsEqualUsage("make"))
   {
diff --git a/libs/platform/battery_tracker.cpp b/libs/platform/battery_tracker.cpp
index c77139f53..98fa6c558 100644
--- a/libs/platform/battery_tracker.cpp
+++ b/libs/platform/battery_tracker.cpp
@@ -30,8 +30,7 @@ void BatteryLevelTracker::Subscribe(Subscriber * subscriber)
 
 void BatteryLevelTracker::Unsubscribe(Subscriber * subscriber)
 {
-  m_subscribers.erase(std::remove(m_subscribers.begin(), m_subscribers.end(), subscriber),
-                      m_subscribers.end());
+  m_subscribers.erase(std::remove(m_subscribers.begin(), m_subscribers.end(), subscriber), m_subscribers.end());
 }
 
 void BatteryLevelTracker::UnsubscribeAll()
@@ -54,16 +53,9 @@ void BatteryLevelTracker::RequestBatteryLevel()
   }
 
   for (auto s : m_subscribers)
-  {
     s->OnBatteryLevelReceived(m_lastReceivedLevel);
-  }
 
   GetPlatform().RunDelayedTask(Platform::Thread::Background, kBatteryTrackingInterval, [this]
-  {
-    GetPlatform().RunTask(Platform::Thread::Gui, [this]
-    {
-      RequestBatteryLevel();
-    });
-  });
+  { GetPlatform().RunTask(Platform::Thread::Gui, [this] { RequestBatteryLevel(); }); });
 }
 }  // namespace platform
diff --git a/libs/platform/battery_tracker.hpp b/libs/platform/battery_tracker.hpp
index b2691d035..44fc15b4b 100644
--- a/libs/platform/battery_tracker.hpp
+++ b/libs/platform/battery_tracker.hpp
@@ -14,6 +14,7 @@ public:
   {
   public:
     virtual void OnBatteryLevelReceived(uint8_t level) = 0;
+
   protected:
     virtual ~Subscriber() = default;
   };
@@ -30,4 +31,4 @@ private:
   uint8_t m_lastReceivedLevel = 0;
   bool m_isTrackingInProgress = false;
 };
-}  // platform
+}  // namespace platform
diff --git a/libs/platform/chunks_download_strategy.cpp b/libs/platform/chunks_download_strategy.cpp
index 5f43ad353..a942c6fae 100644
--- a/libs/platform/chunks_download_strategy.cpp
+++ b/libs/platform/chunks_download_strategy.cpp
@@ -2,8 +2,8 @@
 
 #include "platform/platform.hpp"
 
-#include "coding/file_writer.hpp"
 #include "coding/file_reader.hpp"
+#include "coding/file_writer.hpp"
 #include "coding/varint.hpp"
 
 #include "base/assert.hpp"
@@ -21,14 +21,13 @@ ChunksDownloadStrategy::ChunksDownloadStrategy(vector<string> const & urls)
     m_servers.push_back(ServerT(urls[i], SERVER_READY));
 }
 
-pair<ChunksDownloadStrategy::ChunkT *, int>
-ChunksDownloadStrategy::GetChunk(RangeT const & range)
+pair<ChunksDownloadStrategy::ChunkT *, int> ChunksDownloadStrategy::GetChunk(RangeT const & range)
 {
   vector<ChunkT>::iterator i = lower_bound(m_chunks.begin(), m_chunks.end(), range.first, LessChunks());
 
   if (i != m_chunks.end() && i->m_pos == range.first)
   {
-    ASSERT_EQUAL ( (i+1)->m_pos, range.second + 1, () );
+    ASSERT_EQUAL((i + 1)->m_pos, range.second + 1, ());
     return pair<ChunkT *, int>(&(*i), distance(m_chunks.begin(), i));
   }
   else
@@ -73,15 +72,15 @@ void ChunksDownloadStrategy::InitChunks(int64_t fileSize, int64_t chunkSize, Chu
 
 void ChunksDownloadStrategy::AddChunk(RangeT const & range, ChunkStatusT status)
 {
-  ASSERT_LESS_OR_EQUAL ( range.first, range.second, () );
+  ASSERT_LESS_OR_EQUAL(range.first, range.second, ());
   if (m_chunks.empty())
   {
-    ASSERT_EQUAL ( range.first, 0, () );
+    ASSERT_EQUAL(range.first, 0, ());
     m_chunks.push_back(ChunkT(range.first, status));
   }
   else
   {
-    ASSERT_EQUAL ( m_chunks.back().m_pos, range.first, () );
+    ASSERT_EQUAL(m_chunks.back().m_pos, range.first, ());
     m_chunks.back().m_status = status;
   }
 
@@ -110,10 +109,9 @@ void ChunksDownloadStrategy::SaveChunks(int64_t fileSize, string const & fName)
   UNUSED_VALUE(Platform::RemoveFileIfExists(fName));
 }
 
-int64_t ChunksDownloadStrategy::LoadOrInitChunks(string const & fName, int64_t fileSize,
-                                                 int64_t chunkSize)
+int64_t ChunksDownloadStrategy::LoadOrInitChunks(string const & fName, int64_t fileSize, int64_t chunkSize)
 {
-  ASSERT ( fileSize > 0, () );
+  ASSERT(fileSize > 0, ());
 
   if (Platform::IsFileExistsByFullPath(fName))
   {
@@ -196,8 +194,7 @@ string ChunksDownloadStrategy::ChunkFinished(bool success, RangeT const & range)
   return url;
 }
 
-ChunksDownloadStrategy::ResultT
-ChunksDownloadStrategy::NextChunk(string & outUrl, RangeT & range)
+ChunksDownloadStrategy::ResultT ChunksDownloadStrategy::NextChunk(string & outUrl, RangeT & range)
 {
   // If no servers at all.
   if (m_servers.empty())
@@ -219,7 +216,7 @@ ChunksDownloadStrategy::NextChunk(string & outUrl, RangeT & range)
   bool allChunksDownloaded = true;
 
   // Find first free chunk.
-  for (size_t i = 0; i < m_chunks.size()-1; ++i)
+  for (size_t i = 0; i < m_chunks.size() - 1; ++i)
   {
     switch (m_chunks[i].m_status)
     {
@@ -228,18 +225,16 @@ ChunksDownloadStrategy::NextChunk(string & outUrl, RangeT & range)
       outUrl = server->m_url;
 
       range.first = m_chunks[i].m_pos;
-      range.second = m_chunks[i+1].m_pos - 1;
+      range.second = m_chunks[i + 1].m_pos - 1;
 
       m_chunks[i].m_status = CHUNK_DOWNLOADING;
       LOG(LDEBUG, ("Download chunk", server->m_chunkIndex, "via", outUrl));
       return ENextChunk;
 
-    case CHUNK_DOWNLOADING:
-      allChunksDownloaded = false;
-      break;
+    case CHUNK_DOWNLOADING: allChunksDownloaded = false; break;
     }
   }
 
   return (allChunksDownloaded ? EDownloadSucceeded : ENoFreeServers);
 }
-} // namespace downloader
+}  // namespace downloader
diff --git a/libs/platform/chunks_download_strategy.hpp b/libs/platform/chunks_download_strategy.hpp
index 9872f7c5b..c75535c10 100644
--- a/libs/platform/chunks_download_strategy.hpp
+++ b/libs/platform/chunks_download_strategy.hpp
@@ -11,7 +11,13 @@ namespace downloader
 class ChunksDownloadStrategy
 {
 public:
-  enum ChunkStatusT { CHUNK_FREE = 0, CHUNK_DOWNLOADING = 1, CHUNK_COMPLETE = 2, CHUNK_AUX = -1 };
+  enum ChunkStatusT
+  {
+    CHUNK_FREE = 0,
+    CHUNK_DOWNLOADING = 1,
+    CHUNK_COMPLETE = 2,
+    CHUNK_AUX = -1
+  };
 
 private:
 #pragma pack(push, 1)
@@ -32,14 +38,14 @@ private:
 
   struct LessChunks
   {
-    bool operator() (ChunkT const & r1, ChunkT const & r2) const { return r1.m_pos < r2.m_pos; }
-    bool operator() (ChunkT const & r1, int64_t const & r2) const { return r1.m_pos < r2; }
-    bool operator() (int64_t const & r1, ChunkT const & r2) const { return r1 < r2.m_pos; }
+    bool operator()(ChunkT const & r1, ChunkT const & r2) const { return r1.m_pos < r2.m_pos; }
+    bool operator()(ChunkT const & r1, int64_t const & r2) const { return r1.m_pos < r2; }
+    bool operator()(int64_t const & r1, ChunkT const & r2) const { return r1 < r2.m_pos; }
   };
 
   using RangeT = std::pair<int64_t, int64_t>;
 
-  static const int SERVER_READY = -1;
+  static int const SERVER_READY = -1;
   struct ServerT
   {
     std::string m_url;
@@ -85,4 +91,4 @@ public:
   /// Get next chunk url ready to download. Should be called until returns ENextChunk.
   ResultT NextChunk(std::string & outUrl, RangeT & range);
 };
-} // namespace downloader
+}  // namespace downloader
diff --git a/libs/platform/constants.hpp b/libs/platform/constants.hpp
index f78448770..29a00b3d5 100644
--- a/libs/platform/constants.hpp
+++ b/libs/platform/constants.hpp
@@ -2,5 +2,6 @@
 
 #include <cstdint>
 
-constexpr uint32_t READER_CHUNK_LOG_SIZE = 10; // 1024 bytes pages
-constexpr uint32_t READER_CHUNK_LOG_COUNT = 12; // 2^12 = 4096 pages count, hence 4M size cache overall (for data files only)
+constexpr uint32_t READER_CHUNK_LOG_SIZE = 10;  // 1024 bytes pages
+constexpr uint32_t READER_CHUNK_LOG_COUNT =
+    12;  // 2^12 = 4096 pages count, hence 4M size cache overall (for data files only)
diff --git a/libs/platform/country_file.cpp b/libs/platform/country_file.cpp
index 79300cbcf..07ddd72c0 100644
--- a/libs/platform/country_file.cpp
+++ b/libs/platform/country_file.cpp
@@ -26,15 +26,13 @@ string GetFileName(string const & countryName, MapFileType type)
 
 CountryFile::CountryFile() : m_mapSize(0) {}
 
-CountryFile::CountryFile(std::string name)
-: m_name(std::move(name)), m_mapSize(0)
-{
-}
+CountryFile::CountryFile(std::string name) : m_name(std::move(name)), m_mapSize(0) {}
 
 CountryFile::CountryFile(std::string name, MwmSize size, std::string sha1)
-  : m_name(std::move(name)), m_mapSize(size), m_sha1(std::move(sha1))
-{
-}
+  : m_name(std::move(name))
+  , m_mapSize(size)
+  , m_sha1(std::move(sha1))
+{}
 
 string DebugPrint(CountryFile const & file)
 {
diff --git a/libs/platform/country_file.hpp b/libs/platform/country_file.hpp
index e41504aad..74a5b8672 100644
--- a/libs/platform/country_file.hpp
+++ b/libs/platform/country_file.hpp
@@ -23,10 +23,7 @@ public:
   explicit CountryFile(std::string name);
   CountryFile(std::string name, MwmSize size, std::string sha1);
 
-  std::string GetFileName(MapFileType type) const
-  {
-    return platform::GetFileName(m_name, type);
-  }
+  std::string GetFileName(MapFileType type) const { return platform::GetFileName(m_name, type); }
 
   /// \returns Empty (invalid) CountryFile.
   bool IsEmpty() const { return m_name.empty(); }
@@ -35,9 +32,9 @@ public:
   MwmSize GetRemoteSize() const { return m_mapSize; }
   std::string const & GetSha1() const { return m_sha1; }
 
-  inline bool operator<(const CountryFile & rhs) const { return m_name < rhs.m_name; }
-  inline bool operator==(const CountryFile & rhs) const { return m_name == rhs.m_name; }
-  inline bool operator!=(const CountryFile & rhs) const { return !(*this == rhs); }
+  inline bool operator<(CountryFile const & rhs) const { return m_name < rhs.m_name; }
+  inline bool operator==(CountryFile const & rhs) const { return m_name == rhs.m_name; }
+  inline bool operator!=(CountryFile const & rhs) const { return !(*this == rhs); }
 
 private:
   friend std::string DebugPrint(CountryFile const & file);
diff --git a/libs/platform/distance.cpp b/libs/platform/distance.cpp
index 52707bb6d..9f8ed8ece 100644
--- a/libs/platform/distance.cpp
+++ b/libs/platform/distance.cpp
@@ -18,14 +18,10 @@ Distance MetersTo(double distance, Distance::Units units)
 {
   switch (units)
   {
-  case Distance::Units::Meters:
-    return Distance(distance);
-  case Distance::Units::Kilometers:
-    return {distance / 1000, Distance::Units::Kilometers};
-  case Distance::Units::Feet:
-    return {MetersToFeet(distance), Distance::Units::Feet};
-  case Distance::Units::Miles:
-    return {MetersToMiles(distance), Distance::Units::Miles};
+  case Distance::Units::Meters: return Distance(distance);
+  case Distance::Units::Kilometers: return {distance / 1000, Distance::Units::Kilometers};
+  case Distance::Units::Feet: return {MetersToFeet(distance), Distance::Units::Feet};
+  case Distance::Units::Miles: return {MetersToMiles(distance), Distance::Units::Miles};
   default: UNREACHABLE();
   }
 }
@@ -39,12 +35,9 @@ Distance FeetTo(double distance, Distance::Units units)
 {
   switch (units)
   {
-  case Distance::Units::Meters:
-    return {FeetToMeters(distance), Distance::Units::Meters};
-  case Distance::Units::Kilometers:
-    return {FeetToMeters(distance) / 1000, Distance::Units::Kilometers};
-  case Distance::Units::Miles:
-    return {FeetToMiles(distance), Distance::Units::Miles};
+  case Distance::Units::Meters: return {FeetToMeters(distance), Distance::Units::Meters};
+  case Distance::Units::Kilometers: return {FeetToMeters(distance) / 1000, Distance::Units::Kilometers};
+  case Distance::Units::Miles: return {FeetToMiles(distance), Distance::Units::Miles};
   default: UNREACHABLE();
   }
 }
@@ -53,12 +46,9 @@ Distance MilesTo(double distance, Distance::Units units)
 {
   switch (units)
   {
-  case Distance::Units::Meters:
-    return {MilesToMeters(distance), Distance::Units::Meters};
-  case Distance::Units::Kilometers:
-    return {MilesToMeters(distance) / 1000, Distance::Units::Kilometers};
-  case Distance::Units::Feet:
-    return {MilesToFeet(distance), Distance::Units::Feet};
+  case Distance::Units::Meters: return {MilesToMeters(distance), Distance::Units::Meters};
+  case Distance::Units::Kilometers: return {MilesToMeters(distance) / 1000, Distance::Units::Kilometers};
+  case Distance::Units::Feet: return {MilesToFeet(distance), Distance::Units::Feet};
   default: UNREACHABLE();
   }
 }
@@ -86,8 +76,8 @@ Distance Distance::CreateFormatted(double distanceInMeters)
 
 std::string Distance::FormatAltitude(double meters)
 {
-  Distance elevation = Distance(fabs(meters)).To(
-      GetMeasurementUnits() == measurement_utils::Units::Metric ? Units::Meters : Units::Feet);
+  Distance elevation = Distance(fabs(meters))
+                           .To(GetMeasurementUnits() == measurement_utils::Units::Metric ? Units::Meters : Units::Feet);
 
   ASSERT(elevation.IsLowUnits(), ());
   elevation.m_distance = WithPrecision(elevation.m_distance, 0);
@@ -96,11 +86,20 @@ std::string Distance::FormatAltitude(double meters)
   return meters < 0 ? "-" + res : res;
 }
 
-bool Distance::IsValid() const { return m_distance >= 0.0; }
+bool Distance::IsValid() const
+{
+  return m_distance >= 0.0;
+}
 
-bool Distance::IsLowUnits() const { return m_units == Units::Meters || m_units == Units::Feet; }
+bool Distance::IsLowUnits() const
+{
+  return m_units == Units::Meters || m_units == Units::Feet;
+}
 
-bool Distance::IsHighUnits() const { return !IsLowUnits(); }
+bool Distance::IsHighUnits() const
+{
+  return !IsLowUnits();
+}
 
 Distance Distance::To(Units units) const
 {
@@ -129,7 +128,10 @@ double Distance::GetDistance() const
   return m_distance;
 }
 
-Distance::Units Distance::GetUnits() const { return m_units; }
+Distance::Units Distance::GetUnits() const
+{
+  return m_units;
+}
 
 std::string Distance::GetDistanceString() const
 {
@@ -185,7 +187,7 @@ Distance Distance::GetFormattedDistance() const
 
     // For distances of 10.0 high units and over round to a whole number, e.g. 9.98 -> 10, 10.9 -> 11
     uint8_t const precision = (std::round(res.m_distance * 10) / 10 >= 10.0) ? 0 : 1;
-    return { WithPrecision(res.m_distance, precision), res.m_units };
+    return {WithPrecision(res.m_distance, precision), res.m_units};
   }
 
   res.m_distance = lowRound;
diff --git a/libs/platform/downloader_defines.hpp b/libs/platform/downloader_defines.hpp
index 01f3fbca7..130f1eec4 100644
--- a/libs/platform/downloader_defines.hpp
+++ b/libs/platform/downloader_defines.hpp
@@ -34,15 +34,9 @@ struct Progress
 {
   static int64_t constexpr kUnknownTotalSize = -1;
 
-  static Progress constexpr Unknown()
-  {
-    return {0, kUnknownTotalSize};
-  }
+  static Progress constexpr Unknown() { return {0, kUnknownTotalSize}; }
 
-  bool IsUnknown() const
-  {
-    return m_bytesTotal == kUnknownTotalSize;
-  }
+  bool IsUnknown() const { return m_bytesTotal == kUnknownTotalSize; }
 
   int64_t m_bytesDownloaded = 0;
   /// Total can be kUnknownTotalSize if size is unknown.
@@ -52,8 +46,7 @@ struct Progress
 inline std::string DebugPrint(Progress const & progress)
 {
   std::ostringstream out;
-  out << "(downloaded " << progress.m_bytesDownloaded << " bytes out of " << progress.m_bytesTotal
-      << " bytes)";
+  out << "(downloaded " << progress.m_bytesDownloaded << " bytes out of " << progress.m_bytesTotal << " bytes)";
   return out.str();
 }
 }  // namespace downloader
diff --git a/libs/platform/downloader_utils.cpp b/libs/platform/downloader_utils.cpp
index 972780a11..fd54666ac 100644
--- a/libs/platform/downloader_utils.cpp
+++ b/libs/platform/downloader_utils.cpp
@@ -55,10 +55,7 @@ bool IsUrlSupported(std::string const & url)
   }
 
   size_t count = 0;
-  strings::Tokenize(url::UrlDecode(urlComponents.back()), ".", [&count](std::string_view)
-  {
-    ++count;
-  });
+  strings::Tokenize(url::UrlDecode(urlComponents.back()), ".", [&count](std::string_view) { ++count; });
   return count == 2;
 }
 
diff --git a/libs/platform/downloader_utils.hpp b/libs/platform/downloader_utils.hpp
index d236fb00e..d33d9ea6f 100644
--- a/libs/platform/downloader_utils.hpp
+++ b/libs/platform/downloader_utils.hpp
@@ -9,4 +9,3 @@ std::string GetFileDownloadUrl(std::string const & fileName, int64_t dataVersion
 bool IsUrlSupported(std::string const & url);
 std::string GetFilePathByUrl(std::string const & url);
 }  // namespace downloader
-
diff --git a/libs/platform/duration.cpp b/libs/platform/duration.cpp
index 64606d7fd..63576a826 100644
--- a/libs/platform/duration.cpp
+++ b/libs/platform/duration.cpp
@@ -15,10 +15,10 @@ unsigned long SecondsToUnits(seconds duration, Duration::Units unit)
 {
   switch (unit)
   {
-    case Duration::Units::Days: return duration_cast<days>(duration).count();
-    case Duration::Units::Hours: return duration_cast<hours>(duration).count();
-    case Duration::Units::Minutes: return duration_cast<minutes>(duration).count();
-    default: UNREACHABLE();
+  case Duration::Units::Days: return duration_cast<days>(duration).count();
+  case Duration::Units::Hours: return duration_cast<hours>(duration).count();
+  case Duration::Units::Minutes: return duration_cast<minutes>(duration).count();
+  default: UNREACHABLE();
   }
 }
 
@@ -26,29 +26,24 @@ seconds UnitsToSeconds(long value, Duration::Units unit)
 {
   switch (unit)
   {
-    case Duration::Units::Days: return days(value);
-    case Duration::Units::Hours: return hours(value);
-    case Duration::Units::Minutes: return minutes(value);
-    default: UNREACHABLE();
+  case Duration::Units::Days: return days(value);
+  case Duration::Units::Hours: return hours(value);
+  case Duration::Units::Minutes: return minutes(value);
+  default: UNREACHABLE();
   }
 }
 
 std::string_view GetUnitSeparator(Locale const & locale)
 {
-  static constexpr auto kEmptyNumberUnitSeparatorLocales = std::array
-  {
-    "en", "de", "fr", "he", "fa", "ja", "ko", "mr", "th", "tr", "vi", "zh"
-  };
+  static constexpr auto kEmptyNumberUnitSeparatorLocales =
+      std::array{"en", "de", "fr", "he", "fa", "ja", "ko", "mr", "th", "tr", "vi", "zh"};
   bool const isEmptySeparator = base::IsExist(kEmptyNumberUnitSeparatorLocales, locale.m_language);
   return isEmptySeparator ? kNoSpace : kNarrowNonBreakingSpace;
 }
 
 std::string_view GetUnitsGroupingSeparator(Locale const & locale)
 {
-  static constexpr auto kEmptyGroupingSeparatorLocales = std::array
-  {
-    "ja", "zh"
-  };
+  static constexpr auto kEmptyGroupingSeparatorLocales = std::array{"ja", "zh"};
   bool const isEmptySeparator = base::IsExist(kEmptyGroupingSeparatorLocales, locale.m_language);
   return isEmptySeparator ? kNoSpace : kNonBreakingSpace;
 }
@@ -57,10 +52,9 @@ bool IsUnitsOrderValid(std::initializer_list<Duration::Units> units)
 {
   return base::IsSortedAndUnique(units.begin(), units.end());
 }
-} // namespace
+}  // namespace
 
-Duration::Duration(unsigned long seconds) : m_seconds(seconds)
-{}
+Duration::Duration(unsigned long seconds) : m_seconds(seconds) {}
 
 std::string Duration::GetLocalizedString(std::initializer_list<Units> units, Locale const & locale) const
 {
@@ -98,7 +92,7 @@ std::string Duration::GetString(std::initializer_list<Units> units, std::string_
 
   for (auto const unit : units)
   {
-    const unsigned long unitsCount = SecondsToUnits(remainingSeconds, unit);
+    unsigned long const unitsCount = SecondsToUnits(remainingSeconds, unit);
     if (unitsCount > 0)
     {
       if (!formattedTime.empty())
@@ -114,10 +108,10 @@ std::string Duration::GetUnitsString(Units unit)
 {
   switch (unit)
   {
-    case Units::Minutes: return platform::GetLocalizedString("minute");
-    case Units::Hours: return platform::GetLocalizedString("hour");
-    case Units::Days: return platform::GetLocalizedString("day");
-    default: UNREACHABLE();
+  case Units::Minutes: return platform::GetLocalizedString("minute");
+  case Units::Hours: return platform::GetLocalizedString("hour");
+  case Units::Days: return platform::GetLocalizedString("day");
+  default: UNREACHABLE();
   }
 }
 
@@ -125,10 +119,10 @@ std::string DebugPrint(Duration::Units units)
 {
   switch (units)
   {
-    case Duration::Units::Days: return "d";
-    case Duration::Units::Hours: return "h";
-    case Duration::Units::Minutes: return "m";
-    default: UNREACHABLE();
+  case Duration::Units::Days: return "d";
+  case Duration::Units::Hours: return "h";
+  case Duration::Units::Minutes: return "m";
+  default: UNREACHABLE();
   }
 }
 }  // namespace platform
diff --git a/libs/platform/duration.hpp b/libs/platform/duration.hpp
index 6ec353fd9..a0402ca66 100644
--- a/libs/platform/duration.hpp
+++ b/libs/platform/duration.hpp
@@ -2,9 +2,9 @@
 
 #include "platform/localization.hpp"
 
-#include <string>
-#include <set>
 #include <chrono>
+#include <set>
+#include <string>
 
 namespace platform
 {
@@ -27,9 +27,10 @@ public:
   std::string GetPlatformLocalizedString() const;
 
 private:
-  const std::chrono::seconds m_seconds;
+  std::chrono::seconds const m_seconds;
 
-  std::string GetString(std::initializer_list<Units> units, std::string_view unitSeparator, std::string_view groupingSeparator) const;
+  std::string GetString(std::initializer_list<Units> units, std::string_view unitSeparator,
+                        std::string_view groupingSeparator) const;
 };
 
 std::string DebugPrint(Duration::Units units);
diff --git a/libs/platform/get_text_by_id.cpp b/libs/platform/get_text_by_id.cpp
index f40909608..510ce6c5b 100644
--- a/libs/platform/get_text_by_id.cpp
+++ b/libs/platform/get_text_by_id.cpp
@@ -21,10 +21,8 @@ string GetTextSourceString(platform::TextSource textSource)
 {
   switch (textSource)
   {
-  case platform::TextSource::TtsSound:
-    return string("sound-strings");
-  case platform::TextSource::Countries:
-    return string("countries-strings");
+  case platform::TextSource::TtsSound: return string("sound-strings");
+  case platform::TextSource::Countries: return string("countries-strings");
   }
   ASSERT(false, ());
   return string();
@@ -77,8 +75,7 @@ TGetTextByIdPtr ForTestingGetTextByIdFactory(string const & jsonBuffer, string c
   return GetTextById::Create(jsonBuffer, localeName);
 }
 
-GetTextById::GetTextById(string const & jsonBuffer, string const & localeName)
-  : m_locale(localeName)
+GetTextById::GetTextById(string const & jsonBuffer, string const & localeName) : m_locale(localeName)
 {
   if (jsonBuffer.empty())
   {
diff --git a/libs/platform/get_text_by_id.hpp b/libs/platform/get_text_by_id.hpp
index 751e5e533..91ed51081 100644
--- a/libs/platform/get_text_by_id.hpp
+++ b/libs/platform/get_text_by_id.hpp
@@ -11,8 +11,8 @@ namespace platform
 // For the time being it's only strings for TTS.
 enum class TextSource
 {
-  TtsSound = 0, //!< Maneuvers text to speech strings.
-  Countries,    //!< Countries names strings.
+  TtsSound = 0,  //!< Maneuvers text to speech strings.
+  Countries,     //!< Countries names strings.
 };
 
 class GetTextById;
diff --git a/libs/platform/http_client.cpp b/libs/platform/http_client.cpp
index 4942f0654..3efb8f7e4 100644
--- a/libs/platform/http_client.cpp
+++ b/libs/platform/http_client.cpp
@@ -10,16 +10,11 @@ using namespace std;
 
 namespace platform
 {
-HttpClient::HttpClient(string const & url) : m_urlRequested(url)
-{
-}
+HttpClient::HttpClient(string const & url) : m_urlRequested(url) {}
 
 bool HttpClient::RunHttpRequest(string & response, SuccessChecker checker /* = nullptr */)
 {
-  static auto const simpleChecker = [](HttpClient const & request)
-  {
-    return request.ErrorCode() == 200;
-  };
+  static auto const simpleChecker = [](HttpClient const & request) { return request.ErrorCode() == 200; };
 
   if (checker == nullptr)
     checker = simpleChecker;
diff --git a/libs/platform/http_client.hpp b/libs/platform/http_client.hpp
index 2d58810af..dd3cd9312 100644
--- a/libs/platform/http_client.hpp
+++ b/libs/platform/http_client.hpp
@@ -63,15 +63,13 @@ public:
   HttpClient & SetHttpMethod(std::string const & method);
   // This method is mutually exclusive with set_body_data().
   HttpClient & SetBodyFile(std::string const & body_file, std::string const & content_type,
-                           std::string const & http_method = "POST",
-                           std::string const & content_encoding = "");
+                           std::string const & http_method = "POST", std::string const & content_encoding = "");
   // If set, stores server reply in file specified.
   HttpClient & SetReceivedFile(std::string const & received_file);
   // This method is mutually exclusive with set_body_file().
   template <typename StringT>
   HttpClient & SetBodyData(StringT && body_data, std::string const & content_type,
-                           std::string const & http_method  = "POST",
-                           std::string const & content_encoding = {})
+                           std::string const & http_method = "POST", std::string const & content_encoding = {})
   {
     m_bodyData = std::forward<StringT>(body_data);
     m_inputFile.clear();
@@ -128,7 +126,8 @@ private:
   // Cookies set by the client before request is run.
   std::string m_cookies;
   Headers m_headers;
-  bool m_followRedirects = false; // If true then in case of HTTP response 3XX make another request to follow redirected URL
+  bool m_followRedirects =
+      false;  // If true then in case of HTTP response 3XX make another request to follow redirected URL
   bool m_loadHeaders = false;
   // Use 30 seconds timeout by default.
   double m_timeoutSec = 30.0;
diff --git a/libs/platform/http_client_curl.cpp b/libs/platform/http_client_curl.cpp
index ce0b11ad3..48c041a8f 100644
--- a/libs/platform/http_client_curl.cpp
+++ b/libs/platform/http_client_curl.cpp
@@ -42,10 +42,10 @@
 #include <utility>
 #include <vector>
 
-#include <cstdio>    // popen, tmpnam
+#include <cstdio>  // popen, tmpnam
 
 #ifdef _MSC_VER
-#define popen _popen
+#define popen  _popen
 #define pclose _pclose
 #else
 #include <unistd.h>  // close
@@ -80,7 +80,6 @@ static std::string ReadFileAsString(std::string const & filePath)
   return {std::istreambuf_iterator<char>(ifs), std::istreambuf_iterator<char>()};
 }
 
-
 std::string RunCurl(std::string const & cmd)
 {
   FILE * pipe = ::popen(cmd.c_str(), "r");
@@ -92,10 +91,9 @@ std::string RunCurl(std::string const & cmd)
   {
     read = ::fread(arr.data(), 1, arr.size(), pipe);
     if (read > 0)
-    {
       result.append(arr.data(), read);
-    }
-  } while (read == arr.size());
+  }
+  while (read == arr.size());
 
   auto const err = ::pclose(pipe);
   // Exception will be cought in RunHTTPRequest
@@ -141,7 +139,7 @@ HeadersVector ParseHeaders(std::string const & raw)
 bool WriteToFile(std::string const & fileName, std::string const & data)
 {
   std::ofstream ofs(fileName);
-  if(!ofs.is_open())
+  if (!ofs.is_open())
   {
     LOG(LERROR, ("Failed to write into a temporary file."));
     return false;
@@ -199,9 +197,7 @@ bool HttpClient::RunHttpRequest()
     cmd += "-X " + m_httpMethod + " ";
 
   for (auto const & header : m_headers)
-  {
     cmd += "-H '" + header.first + ": " + header.second + "' ";
-  }
 
   if (!m_cookies.empty())
     cmd += "-b '" + m_cookies + "' ";
@@ -301,8 +297,7 @@ bool HttpClient::RunHttpRequest()
 
   for (auto const & header : headers)
   {
-    if (strings::EqualNoCase(header.first, "content-encoding") &&
-        !strings::EqualNoCase(header.second, "identity"))
+    if (strings::EqualNoCase(header.first, "content-encoding") && !strings::EqualNoCase(header.second, "identity"))
     {
       m_serverResponse = Decompress(m_serverResponse, header.second);
       LOG(LDEBUG, ("Response with", header.second, "is decompressed."));
diff --git a/libs/platform/http_request.cpp b/libs/platform/http_request.cpp
index 745883ffa..6b6a45117 100644
--- a/libs/platform/http_request.cpp
+++ b/libs/platform/http_request.cpp
@@ -8,8 +8,8 @@
 #include "base/thread.hpp"
 #endif
 
-#include "coding/internal/file_data.hpp"
 #include "coding/file_writer.hpp"
+#include "coding/internal/file_data.hpp"
 
 #include "base/logging.hpp"
 #include "base/string_utils.hpp"
@@ -19,7 +19,6 @@
 
 #include "defines.hpp"
 
-
 using namespace std;
 
 class HttpThread;
@@ -32,36 +31,28 @@ string DebugPrint(long errorCode)
 {
   switch (errorCode)
   {
-  case kIOException:
-    return "IO exception";
-  case kWriteException:
-    return "Write exception";
-  case kInconsistentFileSize:
-    return "Inconsistent file size";
-  case kNonHttpResponse:
-    return "Non-http response";
-  case kInvalidURL:
-    return "Invalid URL";
-  case kCancelled:
-    return "Cancelled";
-  default:
-    return to_string(errorCode);
+  case kIOException: return "IO exception";
+  case kWriteException: return "Write exception";
+  case kInconsistentFileSize: return "Inconsistent file size";
+  case kNonHttpResponse: return "Non-http response";
+  case kInvalidURL: return "Invalid URL";
+  case kCancelled: return "Cancelled";
+  default: return to_string(errorCode);
   }
 }
 }  // namespace non_http_error_code
 
 /// @return 0 if creation failed
-HttpThread * CreateNativeHttpThread(string const & url,
-                                    IHttpThreadCallback & callback,
-                                    int64_t begRange = 0,
-                                    int64_t endRange = -1,
-                                    int64_t expectedSize = -1,
+HttpThread * CreateNativeHttpThread(string const & url, IHttpThreadCallback & callback, int64_t begRange = 0,
+                                    int64_t endRange = -1, int64_t expectedSize = -1,
                                     string const & postBody = string());
 void DeleteNativeHttpThread(HttpThread * thread);
 
 //////////////////////////////////////////////////////////////////////////////////////////
 /// Stores server response into the memory
-class MemoryHttpRequest : public HttpRequest, public IHttpThreadCallback
+class MemoryHttpRequest
+  : public HttpRequest
+  , public IHttpThreadCallback
 {
   HttpThread * m_thread;
 
@@ -99,34 +90,31 @@ class MemoryHttpRequest : public HttpRequest, public IHttpThreadCallback
 
 public:
   MemoryHttpRequest(string const & url, Callback && onFinish, Callback && onProgress)
-    : HttpRequest(std::move(onFinish), std::move(onProgress)),
-      m_requestUrl(url), m_writer(m_downloadedData)
+    : HttpRequest(std::move(onFinish), std::move(onProgress))
+    , m_requestUrl(url)
+    , m_writer(m_downloadedData)
   {
     m_thread = CreateNativeHttpThread(url, *this);
-    ASSERT ( m_thread, () );
+    ASSERT(m_thread, ());
   }
 
-  MemoryHttpRequest(string const & url, string const & postData,
-                    Callback && onFinish, Callback && onProgress)
-    : HttpRequest(std::move(onFinish), std::move(onProgress)), m_writer(m_downloadedData)
+  MemoryHttpRequest(string const & url, string const & postData, Callback && onFinish, Callback && onProgress)
+    : HttpRequest(std::move(onFinish), std::move(onProgress))
+    , m_writer(m_downloadedData)
   {
     m_thread = CreateNativeHttpThread(url, *this, 0, -1, -1, postData);
-    ASSERT ( m_thread, () );
+    ASSERT(m_thread, ());
   }
 
-  virtual ~MemoryHttpRequest()
-  {
-    DeleteNativeHttpThread(m_thread);
-  }
+  virtual ~MemoryHttpRequest() { DeleteNativeHttpThread(m_thread); }
 
-  virtual string const & GetData() const
-  {
-    return m_downloadedData;
-  }
+  virtual string const & GetData() const { return m_downloadedData; }
 };
 
 ////////////////////////////////////////////////////////////////////////////////////////////////
-class FileHttpRequest : public HttpRequest, public IHttpThreadCallback
+class FileHttpRequest
+  : public HttpRequest
+  , public IHttpThreadCallback
 {
   ChunksDownloadStrategy m_strategy;
   typedef pair<HttpThread *, int64_t> ThreadHandleT;
@@ -147,7 +135,7 @@ class FileHttpRequest : public HttpRequest, public IHttpThreadCallback
     while ((result = m_strategy.NextChunk(url, range)) == ChunksDownloadStrategy::ENextChunk)
     {
       HttpThread * p = CreateNativeHttpThread(url, *this, range.first, range.second, m_progress.m_bytesTotal);
-      ASSERT ( p, () );
+      ASSERT(p, ());
       m_threads.push_back(make_pair(p, range.first));
     }
     return result;
@@ -156,18 +144,15 @@ class FileHttpRequest : public HttpRequest, public IHttpThreadCallback
   class ThreadByPos
   {
     int64_t m_pos;
+
   public:
     explicit ThreadByPos(int64_t pos) : m_pos(pos) {}
-    inline bool operator() (ThreadHandleT const & p) const
-    {
-      return (p.second == m_pos);
-    }
+    inline bool operator()(ThreadHandleT const & p) const { return (p.second == m_pos); }
   };
 
   void RemoveHttpThreadByKey(int64_t begRange)
   {
-    ThreadsContainerT::iterator it = find_if(m_threads.begin(), m_threads.end(),
-                                             ThreadByPos(begRange));
+    ThreadsContainerT::iterator it = find_if(m_threads.begin(), m_threads.end(), ThreadByPos(begRange));
     if (it != m_threads.end())
     {
       HttpThread * p = it->first;
@@ -290,18 +275,17 @@ class FileHttpRequest : public HttpRequest, public IHttpThreadCallback
   }
 
 public:
-  FileHttpRequest(vector<string> const & urls, string const & filePath, int64_t fileSize,
-                  Callback && onFinish, Callback && onProgress,
-                  int64_t chunkSize, bool doCleanProgressFiles)
-    : HttpRequest(std::move(onFinish), std::move(onProgress)),
-      m_strategy(urls), m_filePath(filePath),
-      m_doCleanProgressFiles(doCleanProgressFiles)
+  FileHttpRequest(vector<string> const & urls, string const & filePath, int64_t fileSize, Callback && onFinish,
+                  Callback && onProgress, int64_t chunkSize, bool doCleanProgressFiles)
+    : HttpRequest(std::move(onFinish), std::move(onProgress))
+    , m_strategy(urls)
+    , m_filePath(filePath)
+    , m_doCleanProgressFiles(doCleanProgressFiles)
   {
-    ASSERT ( !urls.empty(), () );
+    ASSERT(!urls.empty(), ());
 
     // Load resume downloading information.
-    m_progress.m_bytesDownloaded = m_strategy.LoadOrInitChunks(m_filePath + RESUME_FILE_EXTENSION,
-                                                   fileSize, chunkSize);
+    m_progress.m_bytesDownloaded = m_strategy.LoadOrInitChunks(m_filePath + RESUME_FILE_EXTENSION, fileSize, chunkSize);
     m_progress.m_bytesTotal = fileSize;
 
     FileWriter::Op openMode = FileWriter::OP_WRITE_TRUNCATE;
@@ -309,8 +293,7 @@ public:
     {
       // Check that resume information is correct with existing file.
       uint64_t size;
-      if (base::GetFileSize(filePath + DOWNLOADING_FILE_EXTENSION, size) &&
-              size <= static_cast<uint64_t>(fileSize))
+      if (base::GetFileSize(filePath + DOWNLOADING_FILE_EXTENSION, size) && size <= static_cast<uint64_t>(fileSize))
         openMode = FileWriter::OP_WRITE_EXISTING;
       else
       {
@@ -352,10 +335,7 @@ public:
     }
   }
 
-  virtual string const & GetData() const
-  {
-    return m_filePath;
-  }
+  virtual string const & GetData() const { return m_filePath; }
 };
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -364,33 +344,29 @@ HttpRequest::HttpRequest(Callback && onFinish, Callback && onProgress)
   , m_progress(Progress::Unknown())
   , m_onFinish(std::move(onFinish))
   , m_onProgress(std::move(onProgress))
-{
-}
+{}
 
-HttpRequest::~HttpRequest()
-{
-}
+HttpRequest::~HttpRequest() {}
 
 HttpRequest * HttpRequest::Get(string const & url, Callback && onFinish, Callback && onProgress)
 {
   return new MemoryHttpRequest(url, std::move(onFinish), std::move(onProgress));
 }
 
-HttpRequest * HttpRequest::PostJson(string const & url, string const & postData,
-                                    Callback && onFinish, Callback && onProgress)
+HttpRequest * HttpRequest::PostJson(string const & url, string const & postData, Callback && onFinish,
+                                    Callback && onProgress)
 {
   return new MemoryHttpRequest(url, postData, std::move(onFinish), std::move(onProgress));
 }
 
-HttpRequest * HttpRequest::GetFile(vector<string> const & urls,
-                                   string const & filePath, int64_t fileSize,
-                                   Callback && onFinish, Callback && onProgress,
-                                   int64_t chunkSize, bool doCleanOnCancel)
+HttpRequest * HttpRequest::GetFile(vector<string> const & urls, string const & filePath, int64_t fileSize,
+                                   Callback && onFinish, Callback && onProgress, int64_t chunkSize,
+                                   bool doCleanOnCancel)
 {
   try
   {
-    return new FileHttpRequest(urls, filePath, fileSize, std::move(onFinish), std::move(onProgress),
-                               chunkSize, doCleanOnCancel);
+    return new FileHttpRequest(urls, filePath, fileSize, std::move(onFinish), std::move(onProgress), chunkSize,
+                               doCleanOnCancel);
   }
   catch (FileWriter::Exception const & e)
   {
diff --git a/libs/platform/http_request.hpp b/libs/platform/http_request.hpp
index 04e5187df..3286d29ed 100644
--- a/libs/platform/http_request.hpp
+++ b/libs/platform/http_request.hpp
@@ -43,23 +43,18 @@ public:
   virtual std::string const & GetData() const = 0;
 
   /// Response saved to memory buffer and retrieved with Data()
-  static HttpRequest * Get(std::string const & url,
-                           Callback && onFinish,
-                           Callback && onProgress = Callback());
+  static HttpRequest * Get(std::string const & url, Callback && onFinish, Callback && onProgress = Callback());
 
   /// Content-type for request is always "application/json"
-  static HttpRequest * PostJson(std::string const & url, std::string const & postData,
-                                Callback && onFinish,
+  static HttpRequest * PostJson(std::string const & url, std::string const & postData, Callback && onFinish,
                                 Callback && onProgress = Callback());
 
   /// Download file to filePath.
   /// Pulls chunks simultaneously from all available servers, 1 thread per server.
   /// @param[in]  fileSize  Correct file size (needed for resuming and reserving).
-  static HttpRequest * GetFile(std::vector<std::string> const & urls,
-                               std::string const & filePath, int64_t fileSize,
-                               Callback && onFinish,
-                               Callback && onProgress = Callback(),
-                               int64_t chunkSize = 0, // 0 for auto
+  static HttpRequest * GetFile(std::vector<std::string> const & urls, std::string const & filePath, int64_t fileSize,
+                               Callback && onFinish, Callback && onProgress = Callback(),
+                               int64_t chunkSize = 0,  // 0 for auto
                                bool doCleanOnCancel = true);
 };
-} // namespace downloader
+}  // namespace downloader
diff --git a/libs/platform/http_thread_callback.hpp b/libs/platform/http_thread_callback.hpp
index d188ef189..012692d7f 100644
--- a/libs/platform/http_thread_callback.hpp
+++ b/libs/platform/http_thread_callback.hpp
@@ -13,4 +13,4 @@ public:
 protected:
   virtual ~IHttpThreadCallback() = default;
 };
-} // namespace downloader
+}  // namespace downloader
diff --git a/libs/platform/http_thread_qt.cpp b/libs/platform/http_thread_qt.cpp
index 2d2658fd3..cbe5cb4c6 100644
--- a/libs/platform/http_thread_qt.cpp
+++ b/libs/platform/http_thread_qt.cpp
@@ -13,13 +13,13 @@
 
 using namespace std;
 
-HttpThread::HttpThread(string const & url,
-                       downloader::IHttpThreadCallback & cb,
-                       int64_t beg,
-                       int64_t end,
-                       int64_t size,
+HttpThread::HttpThread(string const & url, downloader::IHttpThreadCallback & cb, int64_t beg, int64_t end, int64_t size,
                        string const & pb)
-  : m_callback(cb), m_begRange(beg), m_endRange(end), m_downloadedBytes(0), m_expectedSize(size)
+  : m_callback(cb)
+  , m_begRange(beg)
+  , m_endRange(end)
+  , m_downloadedBytes(0)
+  , m_expectedSize(size)
 {
   QUrl const qUrl(url.c_str());
   QNetworkRequest request(qUrl);
@@ -30,8 +30,7 @@ HttpThread::HttpThread(string const & url,
     if (end > 0)
     {
       LOG(LDEBUG, (url, "downloading range [", beg, ",", end, "]"));
-      QString const range = QString("bytes=") + QString::number(beg)
-                            + '-' + QString::number(end);
+      QString const range = QString("bytes=") + QString::number(beg) + '-' + QString::number(end);
       request.setRawHeader("Range", range.toUtf8());
     }
     else
@@ -83,7 +82,8 @@ void HttpThread::OnHeadersReceived()
   bool const isChunk = !(m_begRange == 0 && m_endRange < 0);
   if ((isChunk && httpStatusCode != 206) || (!isChunk && httpStatusCode != 200))
   {
-    LOG(LWARNING, ("Http request to", m_reply->url().toEncoded().constData(), "aborted with HTTP code", httpStatusCode));
+    LOG(LWARNING,
+        ("Http request to", m_reply->url().toEncoded().constData(), "aborted with HTTP code", httpStatusCode));
     m_reply->abort();
   }
   else if (m_expectedSize > 0)
@@ -96,7 +96,7 @@ void HttpThread::OnHeadersReceived()
       if (numElements && contentRange.at(numElements - 1).toLongLong() != m_expectedSize)
       {
         LOG(LWARNING, ("Http request to", m_reply->url().toEncoded().constData(),
-          "aborted - invalid Content-Range:", contentRange.at(numElements - 1).toLongLong()));
+                       "aborted - invalid Content-Range:", contentRange.at(numElements - 1).toLongLong()));
         m_reply->abort();
       }
     }
@@ -107,14 +107,14 @@ void HttpThread::OnHeadersReceived()
       if (expSize != m_expectedSize)
       {
         LOG(LWARNING, ("Http request to", m_reply->url().toEncoded().constData(),
-          "aborted - invalid Content-Length:", m_reply->rawHeader("Content-Length").toLongLong()));
+                       "aborted - invalid Content-Length:", m_reply->rawHeader("Content-Length").toLongLong()));
         m_reply->abort();
       }
     }
     else
     {
       LOG(LWARNING, ("Http request to", m_reply->url().toEncoded().constData(),
-          "aborted, server didn't send any valid file size"));
+                     "aborted, server didn't send any valid file size"));
       m_reply->abort();
     }
   }
@@ -132,10 +132,8 @@ void HttpThread::OnDownloadFinished()
 {
   if (m_reply->error() != QNetworkReply::NetworkError::NoError)
   {
-    auto const httpStatusCode =
-        m_reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
-    LOG(LWARNING, ("Download has finished with code:", httpStatusCode,
-                   "error:", m_reply->errorString().toStdString()));
+    auto const httpStatusCode = m_reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+    LOG(LWARNING, ("Download has finished with code:", httpStatusCode, "error:", m_reply->errorString().toStdString()));
     m_callback.OnFinish(httpStatusCode, m_begRange, m_endRange);
   }
   else
@@ -147,12 +145,8 @@ void HttpThread::OnDownloadFinished()
 namespace downloader
 {
 
-HttpThread * CreateNativeHttpThread(string const & url,
-                                    downloader::IHttpThreadCallback & cb,
-                                    int64_t beg,
-                                    int64_t end,
-                                    int64_t size,
-                                    string const & pb)
+HttpThread * CreateNativeHttpThread(string const & url, downloader::IHttpThreadCallback & cb, int64_t beg, int64_t end,
+                                    int64_t size, string const & pb)
 {
   return new HttpThread(url, cb, beg, end, size, pb);
 }
@@ -161,4 +155,4 @@ void DeleteNativeHttpThread(HttpThread * request)
 {
   delete request;
 }
-} // namespace downloader
+}  // namespace downloader
diff --git a/libs/platform/http_thread_qt.hpp b/libs/platform/http_thread_qt.hpp
index 0089dbf1c..f12c3ac43 100644
--- a/libs/platform/http_thread_qt.hpp
+++ b/libs/platform/http_thread_qt.hpp
@@ -3,21 +3,20 @@
 #include <cstdint>
 #include <string>
 
-#include <QObject>
 #include <QNetworkReply>
+#include <QObject>
 
-namespace downloader { class IHttpThreadCallback; }
+namespace downloader
+{
+class IHttpThreadCallback;
+}
 
 class HttpThread : public QObject
 {
   Q_OBJECT
 
 public:
-  HttpThread(std::string const & url,
-             downloader::IHttpThreadCallback & cb,
-             int64_t beg,
-             int64_t end,
-             int64_t size,
+  HttpThread(std::string const & url, downloader::IHttpThreadCallback & cb, int64_t beg, int64_t end, int64_t size,
              std::string const & pb);
   virtual ~HttpThread();
 
diff --git a/libs/platform/http_uploader_dummy.cpp b/libs/platform/http_uploader_dummy.cpp
index 1c31d08a2..09ba39b3f 100644
--- a/libs/platform/http_uploader_dummy.cpp
+++ b/libs/platform/http_uploader_dummy.cpp
@@ -9,4 +9,4 @@ HttpUploader::Result HttpUploader::Upload() const
   // Dummy implementation.
   return {};
 }
-} // namespace platform
+}  // namespace platform
diff --git a/libs/platform/languages.hpp b/libs/platform/languages.hpp
index 9f912dbfa..9fd106cb7 100644
--- a/libs/platform/languages.hpp
+++ b/libs/platform/languages.hpp
@@ -27,62 +27,58 @@ namespace routing::turns::sound
  * - All other variants default to `zh-Hans` (Simplified Chinese).
  *
  */
-std::array<std::pair<std::string_view, std::string_view>, 40> constexpr kLanguageList =
-{{
-  {"en", "English"},
-  {"id", "Bahasa Indonesia"},
-  {"ca", "Català"},
-  {"da", "Dansk"},
-  {"de", "Deutsch"},
+std::array<std::pair<std::string_view, std::string_view>, 40> constexpr kLanguageList = {{
+    {"en", "English"},
+    {"id", "Bahasa Indonesia"},
+    {"ca", "Català"},
+    {"da", "Dansk"},
+    {"de", "Deutsch"},
 #ifdef OMIM_OS_ANDROID
-  {"es-ES:es", "Español"},
-  {"es-MX:es-MX", "Español (México)"},
+    {"es-ES:es", "Español"},
+    {"es-MX:es-MX", "Español (México)"},
 #else
-  {"es", "Español"},
-  {"es-MX", "Español (México)"},
+    {"es", "Español"},       {"es-MX", "Español (México)"},
 #endif
-  {"eu", "Euskara"},
-  {"fr", "Français"},
-  {"hr", "Hrvatski"},
-  {"it", "Italiano"},
-  {"sw", "Kiswahili"},
-  {"hu", "Magyar"},
-  {"nl", "Nederlands"},
-  {"nb", "Norsk Bokmål"},
-  {"pl", "Polski"},
+    {"eu", "Euskara"},
+    {"fr", "Français"},
+    {"hr", "Hrvatski"},
+    {"it", "Italiano"},
+    {"sw", "Kiswahili"},
+    {"hu", "Magyar"},
+    {"nl", "Nederlands"},
+    {"nb", "Norsk Bokmål"},
+    {"pl", "Polski"},
 #ifdef OMIM_OS_ANDROID
-  {"pt-PT:pt", "Português"},
-  {"pt-BR:pt-BR", "Português (Brasil)"},
+    {"pt-PT:pt", "Português"},
+    {"pt-BR:pt-BR", "Português (Brasil)"},
 #else
-  {"pt", "Português"},
-  {"pt-BR", "Português (Brasil)"},
+    {"pt", "Português"},     {"pt-BR", "Português (Brasil)"},
 #endif
-  {"ro", "Română"},
-  {"sk", "Slovenčina"},
-  {"fi", "Suomi"},
-  {"sv", "Svenska"},
-  {"vi", "Tiếng Việt"},
-  {"tr", "Türkçe"},
-  {"cs", "Čeština"},
-  {"el", "Ελληνικά"},
-  {"be", "Беларуская"},
-  {"bg", "Български"},
-  {"ru", "Русский"},
-  {"sr", "Српски"},
-  {"uk", "Українська"},
-  {"ar", "العربية"},
-  {"fa", "فارسی"},
-  {"mr", "मराठी"},
-  {"hi", "हिंदी"},
-  {"th", "ไทย"},
+    {"ro", "Română"},
+    {"sk", "Slovenčina"},
+    {"fi", "Suomi"},
+    {"sv", "Svenska"},
+    {"vi", "Tiếng Việt"},
+    {"tr", "Türkçe"},
+    {"cs", "Čeština"},
+    {"el", "Ελληνικά"},
+    {"be", "Беларуская"},
+    {"bg", "Български"},
+    {"ru", "Русский"},
+    {"sr", "Српски"},
+    {"uk", "Українська"},
+    {"ar", "العربية"},
+    {"fa", "فارسی"},
+    {"mr", "मराठी"},
+    {"hi", "हिंदी"},
+    {"th", "ไทย"},
 #ifdef OMIM_OS_ANDROID
-  {"zh-CN:zh-Hans", "中文简体"},
-  {"zh-TW:zh-Hant", "中文繁體"},
+    {"zh-CN:zh-Hans", "中文简体"},
+    {"zh-TW:zh-Hant", "中文繁體"},
 #else
-  {"zh-Hans", "中文简体"},
-  {"zh-Hant", "中文繁體"},
+    {"zh-Hans", "中文简体"}, {"zh-Hant", "中文繁體"},
 #endif
-  {"ja", "日本語"},
-  {"ko", "한국어"},
+    {"ja", "日本語"},
+    {"ko", "한국어"},
 }};
 }  // namespace routing::turns::sound
diff --git a/libs/platform/local_country_file.cpp b/libs/platform/local_country_file.cpp
index b2ab5a133..222dac545 100644
--- a/libs/platform/local_country_file.cpp
+++ b/libs/platform/local_country_file.cpp
@@ -21,9 +21,10 @@ using namespace std;
 LocalCountryFile::LocalCountryFile() : m_version(0) {}
 
 LocalCountryFile::LocalCountryFile(string directory, CountryFile countryFile, int64_t version)
-: m_directory(std::move(directory)), m_countryFile(std::move(countryFile)), m_version(version)
-{
-}
+  : m_directory(std::move(directory))
+  , m_countryFile(std::move(countryFile))
+  , m_version(version)
+{}
 
 void LocalCountryFile::SyncWithDisk()
 {
@@ -76,8 +77,7 @@ uint64_t LocalCountryFile::GetSize(MapFileType type) const
 
 bool LocalCountryFile::HasFiles() const
 {
-  return std::any_of(m_files.cbegin(), m_files.cend(),
-                     [](auto const & value) { return value.has_value(); });
+  return std::any_of(m_files.cbegin(), m_files.cend(), [](auto const & value) { return value.has_value(); });
 }
 
 bool LocalCountryFile::OnDisk(MapFileType type) const
@@ -102,8 +102,8 @@ bool LocalCountryFile::operator<(LocalCountryFile const & rhs) const
 
 bool LocalCountryFile::operator==(LocalCountryFile const & rhs) const
 {
-  return m_directory == rhs.m_directory && m_countryFile == rhs.m_countryFile &&
-         m_version == rhs.m_version && m_files == rhs.m_files;
+  return m_directory == rhs.m_directory && m_countryFile == rhs.m_countryFile && m_version == rhs.m_version &&
+         m_files == rhs.m_files;
 }
 
 bool LocalCountryFile::ValidateIntegrity() const
@@ -134,8 +134,8 @@ LocalCountryFile LocalCountryFile::MakeTemporary(string const & fullPath)
 string DebugPrint(LocalCountryFile const & file)
 {
   ostringstream os;
-  os << "LocalCountryFile [" << file.m_directory << ", "
-     << DebugPrint(file.m_countryFile) << ", " << file.m_version << ", [";
+  os << "LocalCountryFile [" << file.m_directory << ", " << DebugPrint(file.m_countryFile) << ", " << file.m_version
+     << ", [";
 
   bool fileAdded = false;
   for (auto const & mapFile : file.m_files)
diff --git a/libs/platform/local_country_file.hpp b/libs/platform/local_country_file.hpp
index d384571c8..20a8495d3 100644
--- a/libs/platform/local_country_file.hpp
+++ b/libs/platform/local_country_file.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "platform/country_file.hpp"
 #include "platform/country_defines.hpp"
+#include "platform/country_file.hpp"
 
 #include "base/stl_helpers.hpp"
 
diff --git a/libs/platform/local_country_file_utils.cpp b/libs/platform/local_country_file_utils.cpp
index e068f2e93..e7a1b863d 100644
--- a/libs/platform/local_country_file_utils.cpp
+++ b/libs/platform/local_country_file_utils.cpp
@@ -120,13 +120,11 @@ void DeleteDownloaderFilesForCountry(int64_t version, CountryFile const & countr
   DeleteDownloaderFilesForCountry(version, string(), countryFile);
 }
 
-void DeleteDownloaderFilesForCountry(int64_t version, string const & dataDir,
-                                     CountryFile const & countryFile)
+void DeleteDownloaderFilesForCountry(int64_t version, string const & dataDir, CountryFile const & countryFile)
 {
   for (size_t type = 0; type < base::Underlying(MapFileType::Count); ++type)
   {
-    string const path = GetFileDownloadPath(version, dataDir, countryFile,
-                                            static_cast<MapFileType>(type));
+    string const path = GetFileDownloadPath(version, dataDir, countryFile, static_cast<MapFileType>(type));
     ASSERT(path.ends_with(READY_FILE_EXTENSION), ());
     Platform::RemoveFileIfExists(path);
     Platform::RemoveFileIfExists(path + RESUME_FILE_EXTENSION);
@@ -140,8 +138,7 @@ void DeleteDownloaderFilesForCountry(int64_t version, string const & dataDir,
   }
 }
 
-size_t FindAllLocalMapsInDirectoryAndCleanup(string const & directory, int64_t version,
-                                             int64_t latestVersion,
+size_t FindAllLocalMapsInDirectoryAndCleanup(string const & directory, int64_t version, int64_t latestVersion,
                                              vector<LocalCountryFile> & localFiles)
 {
   Platform & platform = GetPlatform();
@@ -212,13 +209,12 @@ void FindAllLocalMapsAndCleanup(int64_t latestVersion, vector<LocalCountryFile>
   FindAllLocalMapsAndCleanup(latestVersion, string(), localFiles);
 }
 
-void FindAllLocalMapsAndCleanup(int64_t latestVersion, string const & dataDir,
-                                vector<LocalCountryFile> & localFiles)
+void FindAllLocalMapsAndCleanup(int64_t latestVersion, string const & dataDir, vector<LocalCountryFile> & localFiles)
 {
   string const dir = GetDataDirFullPath(dataDir);
 
   // Do not search root folder! We have separate World processing in Storage::GetForceDownloadWorlds.
-  //FindAllLocalMapsInDirectoryAndCleanup(dir, 0 /* version */, latestVersion, localFiles);
+  // FindAllLocalMapsInDirectoryAndCleanup(dir, 0 /* version */, latestVersion, localFiles);
 
   Platform::TFilesWithType fwts;
   Platform::GetFilesByType(dir, Platform::EFileType::Directory, fwts);
@@ -246,10 +242,8 @@ void FindAllLocalMapsAndCleanup(int64_t latestVersion, string const & dataDir,
   {
     auto i = localFiles.begin();
     for (; i != localFiles.end(); ++i)
-    {
       if (i->GetCountryName() == file)
         break;
-    }
 
     try
     {
@@ -302,8 +296,7 @@ bool ParseVersion(string const & s, int64_t & version)
   return true;
 }
 
-shared_ptr<LocalCountryFile> PreparePlaceForCountryFiles(int64_t version,
-                                                         CountryFile const & countryFile)
+shared_ptr<LocalCountryFile> PreparePlaceForCountryFiles(int64_t version, CountryFile const & countryFile)
 {
   return PreparePlaceForCountryFiles(version, string(), countryFile);
 }
@@ -395,8 +388,7 @@ void CountryIndexes::GetIndexesExts(vector<string> & exts)
 // static
 bool CountryIndexes::IsIndexFile(string const & file)
 {
-  return file.ends_with(kBitsExt) || file.ends_with(kNodesExt) ||
-         file.ends_with(kOffsetsExt);
+  return file.ends_with(kBitsExt) || file.ends_with(kNodesExt) || file.ends_with(kOffsetsExt);
 }
 
 // static
diff --git a/libs/platform/local_country_file_utils.hpp b/libs/platform/local_country_file_utils.hpp
index ff8c7a970..0cf595e6b 100644
--- a/libs/platform/local_country_file_utils.hpp
+++ b/libs/platform/local_country_file_utils.hpp
@@ -15,14 +15,12 @@ namespace platform
 // Note. The the maps are deleted from writable dir/|dataDir|/|version| directory.
 // If |dataDir| is empty (or is not set) the function deletes maps from writable dir.
 void DeleteDownloaderFilesForCountry(int64_t version, CountryFile const & countryFile);
-void DeleteDownloaderFilesForCountry(int64_t version, std::string const & dataDir,
-                                     CountryFile const & countryFile);
+void DeleteDownloaderFilesForCountry(int64_t version, std::string const & dataDir, CountryFile const & countryFile);
 
 // Finds all local map files in |directory|. Version of these files is
 // passed as an argument. Also, performs cleanup described in comment
 // for FindAllLocalMapsAndCleanup().
-size_t FindAllLocalMapsInDirectoryAndCleanup(std::string const & directory, int64_t version,
-                                             int64_t latestVersion,
+size_t FindAllLocalMapsInDirectoryAndCleanup(std::string const & directory, int64_t version, int64_t latestVersion,
                                              std::vector<LocalCountryFile> & localFiles);
 
 // Finds all local map files in resources and writable directory. For
@@ -74,13 +72,13 @@ std::string PrepareDirToDownloadCountry(int64_t version, std::string const & dat
 /// If |dataDir| is empty (or is not set) the function assumes that maps are in writable dir.
 /// @{
 /// @param[in]  countryName Actually, same as storage::CountryId, like "Abkhazia".
-std::string GetFilePath(int64_t version, std::string const & dataDir,
-                        std::string const & countryName, MapFileType type);
-std::string GetFileDownloadPath(int64_t version, std::string const & dataDir,
-                                std::string const & countryName, MapFileType type);
+std::string GetFilePath(int64_t version, std::string const & dataDir, std::string const & countryName,
+                        MapFileType type);
+std::string GetFileDownloadPath(int64_t version, std::string const & dataDir, std::string const & countryName,
+                                MapFileType type);
 
-inline std::string GetFileDownloadPath(int64_t version, std::string const & dataDir,
-                                       CountryFile const & countryFile, MapFileType type)
+inline std::string GetFileDownloadPath(int64_t version, std::string const & dataDir, CountryFile const & countryFile,
+                                       MapFileType type)
 {
   return GetFileDownloadPath(version, dataDir, countryFile.GetName(), type);
 }
diff --git a/libs/platform/locale.hpp b/libs/platform/locale.hpp
index 987838b99..8e616d0c3 100644
--- a/libs/platform/locale.hpp
+++ b/libs/platform/locale.hpp
@@ -18,5 +18,5 @@ public:
 };
 
 Locale GetCurrentLocale();
-bool GetLocale(std::string localeName, Locale& result);
+bool GetLocale(std::string localeName, Locale & result);
 }  // namespace platform
diff --git a/libs/platform/locale_std.cpp b/libs/platform/locale_std.cpp
index bdc65383b..dcc2aad82 100644
--- a/libs/platform/locale_std.cpp
+++ b/libs/platform/locale_std.cpp
@@ -6,9 +6,7 @@ namespace platform
 {
 Locale StdLocale2Locale(std::locale loc)
 {
-  return {"",
-          "",
-          std::use_facet<std::moneypunct<char, true>>(loc).curr_symbol(),
+  return {"", "", std::use_facet<std::moneypunct<char, true>>(loc).curr_symbol(),
           std::string(1, std::use_facet<std::numpunct<char>>(loc).decimal_point()),
           std::string(1, std::use_facet<std::numpunct<char>>(loc).thousands_sep())};
 }
@@ -21,7 +19,7 @@ Locale GetCurrentLocale()
   return StdLocale2Locale(loc);
 }
 
-bool GetLocale(std::string const localeName, Locale& result)
+bool GetLocale(std::string const localeName, Locale & result)
 {
   try
   {
@@ -31,11 +29,10 @@ bool GetLocale(std::string const localeName, Locale& result)
 
     return true;
   }
-  catch(...)
+  catch (...)
   {
     return false;
   }
 }
 
 }  // namespace platform
-
diff --git a/libs/platform/localization.cpp b/libs/platform/localization.cpp
index 14f2e90cc..33bf7097a 100644
--- a/libs/platform/localization.cpp
+++ b/libs/platform/localization.cpp
@@ -54,7 +54,7 @@ LocalizedUnits const & GetLocalizedAltitudeUnits()
   return GetLocalizedUnits(measurement_utils::GetMeasurementUnits(), MeasurementType::Altitude);
 }
 
-const std::string & GetLocalizedSpeedUnits(measurement_utils::Units units)
+std::string const & GetLocalizedSpeedUnits(measurement_utils::Units units)
 {
   return GetLocalizedUnits(units, MeasurementType::Speed).m_high;
 }
diff --git a/libs/platform/localization_dummy.cpp b/libs/platform/localization_dummy.cpp
index 83525827b..f4e5211e3 100644
--- a/libs/platform/localization_dummy.cpp
+++ b/libs/platform/localization_dummy.cpp
@@ -1,15 +1,27 @@
-#include "platform/localization.hpp"
 #include <ctime>
+#include "platform/localization.hpp"
 
 namespace platform
 {
-std::string GetLocalizedTypeName(std::string const & type) { return type; }
+std::string GetLocalizedTypeName(std::string const & type)
+{
+  return type;
+}
 
-std::string GetLocalizedBrandName(std::string const & brand) { return brand; }
+std::string GetLocalizedBrandName(std::string const & brand)
+{
+  return brand;
+}
 
-std::string GetLocalizedString(std::string const & key) { return key; }
+std::string GetLocalizedString(std::string const & key)
+{
+  return key;
+}
 
-std::string GetCurrencySymbol(std::string const & currencyCode) { return currencyCode; }
+std::string GetCurrencySymbol(std::string const & currencyCode)
+{
+  return currencyCode;
+}
 
 std::string GetLocalizedMyPositionBookmarkName()
 {
diff --git a/libs/platform/location.hpp b/libs/platform/location.hpp
index afed47d4a..5bff9fbfd 100644
--- a/libs/platform/location.hpp
+++ b/libs/platform/location.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "geometry/point2d.hpp"
 #include "geometry/latlon.hpp"
+#include "geometry/point2d.hpp"
 
 #include "base/base.hpp"
 
@@ -12,137 +12,136 @@
 
 namespace location
 {
-  /// @note Do not change values of this constants.
-  enum TLocationError
-  {
-    ENoError = 0,
-    ENotSupported,
-    EDenied,
-    EGPSIsOff,
-    ETimeout, // Only used on Qt https://doc.qt.io/qt-6/qgeopositioninfosource.html#Error-enum
-    EUnknown
-  };
+/// @note Do not change values of this constants.
+enum TLocationError
+{
+  ENoError = 0,
+  ENotSupported,
+  EDenied,
+  EGPSIsOff,
+  ETimeout,  // Only used on Qt https://doc.qt.io/qt-6/qgeopositioninfosource.html#Error-enum
+  EUnknown
+};
 
-  enum TLocationSource
-  {
-    EUndefined,
-    EAppleNative,
-    EWindowsNative,
-    EAndroidNative,
-    EGoogle,
-    ETizen, // Deprecated but left here for backward compatibility.
-    EGeoClue2,
-    EPredictor,
-    EUser
-  };
+enum TLocationSource
+{
+  EUndefined,
+  EAppleNative,
+  EWindowsNative,
+  EAndroidNative,
+  EGoogle,
+  ETizen,  // Deprecated but left here for backward compatibility.
+  EGeoClue2,
+  EPredictor,
+  EUser
+};
 
-  /// Our structure ALWAYS has valid lat, lon and horizontal accuracy.
-  /// We filter out location events without lat/lon/acc in native code as we don't need them.
-  class GpsInfo
-  {
-  public:
-    TLocationSource m_source = EUndefined;
-    /// @TODO(bykoianko) |m_timestamp| is calculated based on platform methods which don't
-    /// guarantee that |m_timestamp| is monotonic. |m_monotonicTimeMs| should be added to
-    /// class |GpsInfo|. This time should be calculated based on Location::getElapsedRealtimeNanos()
-    /// method in case of Android. How to calculate such time in case of iOS should be
-    /// investigated.
-    /// \note For most cases |m_timestamp| is monotonic.
-    double m_timestamp = 0.0;             //!< seconds from 1st Jan 1970
-    double m_latitude = 0.0;              //!< degrees
-    double m_longitude = 0.0;             //!< degrees
-    double m_horizontalAccuracy = 100.0;  //!< metres
-    double m_altitude = 0.0;              //!< metres
-    double m_verticalAccuracy = -1.0;     //!< metres
-    double m_bearing = -1.0;              //!< positive degrees from the true North
-    double m_speed = -1.0;                //!< metres per second
+/// Our structure ALWAYS has valid lat, lon and horizontal accuracy.
+/// We filter out location events without lat/lon/acc in native code as we don't need them.
+class GpsInfo
+{
+public:
+  TLocationSource m_source = EUndefined;
+  /// @TODO(bykoianko) |m_timestamp| is calculated based on platform methods which don't
+  /// guarantee that |m_timestamp| is monotonic. |m_monotonicTimeMs| should be added to
+  /// class |GpsInfo|. This time should be calculated based on Location::getElapsedRealtimeNanos()
+  /// method in case of Android. How to calculate such time in case of iOS should be
+  /// investigated.
+  /// \note For most cases |m_timestamp| is monotonic.
+  double m_timestamp = 0.0;             //!< seconds from 1st Jan 1970
+  double m_latitude = 0.0;              //!< degrees
+  double m_longitude = 0.0;             //!< degrees
+  double m_horizontalAccuracy = 100.0;  //!< metres
+  double m_altitude = 0.0;              //!< metres
+  double m_verticalAccuracy = -1.0;     //!< metres
+  double m_bearing = -1.0;              //!< positive degrees from the true North
+  double m_speed = -1.0;                //!< metres per second
 
-    bool IsValid() const { return m_source != EUndefined; }
-    bool HasBearing() const { return m_bearing >= 0.0; }
-    bool HasSpeed() const { return m_speed >= 0.0; }
-    bool HasVerticalAccuracy() const { return m_verticalAccuracy >= 0.0; }
-    ms::LatLon GetLatLon() const { return {m_latitude, m_longitude}; }
-  };
+  bool IsValid() const { return m_source != EUndefined; }
+  bool HasBearing() const { return m_bearing >= 0.0; }
+  bool HasSpeed() const { return m_speed >= 0.0; }
+  bool HasVerticalAccuracy() const { return m_verticalAccuracy >= 0.0; }
+  ms::LatLon GetLatLon() const { return {m_latitude, m_longitude}; }
+};
 
-  class CompassInfo
-  {
-  public:
-    //double m_timestamp;           //!< seconds from 1st Jan 1970
-    //double m_magneticHeading;     //!< positive radians from the magnetic North
-    //double m_trueHeading;         //!< positive radians from the true North
-    //double m_accuracy;            //!< offset from the magnetic to the true North in radians
-    double m_bearing;             //!< positive radians from the true North
-  };
+class CompassInfo
+{
+public:
+  // double m_timestamp;           //!< seconds from 1st Jan 1970
+  // double m_magneticHeading;     //!< positive radians from the magnetic North
+  // double m_trueHeading;         //!< positive radians from the true North
+  // double m_accuracy;            //!< offset from the magnetic to the true North in radians
+  double m_bearing;  //!< positive radians from the true North
+};
 
-  static inline bool IsLatValid(double lat)
+static inline bool IsLatValid(double lat)
+{
+  return lat != 0. && lat < 90. && lat > -90.;
+}
+static inline bool IsLonValid(double lon)
+{
+  return lon != 0. && lon < 180. && lon > -180.;
+}
+
+// Convert angle (in degrees counterclockwise from X) to bearing ([0, 360) clockwise from the north)
+static inline double AngleToBearing(double a)
+{
+  double reverseAng = fmod(-a + 90, 360.);
+  if (reverseAng < 0)
+    reverseAng += 360.;
+  return reverseAng;
+}
+
+// Convert bearing (in degrees clockwise from the north) to angle ([0, 360) counterclockwise from X)
+static inline double BearingToAngle(double a)
+{
+  return AngleToBearing(a);
+}
+
+class RouteMatchingInfo
+{
+  m2::PointD m_matchedPosition;
+  size_t m_indexInRoute;
+  bool m_isPositionMatched;
+  bool m_hasDistanceFromBegin;
+  double m_distanceFromBegin;
+
+public:
+  RouteMatchingInfo()
+    : m_matchedPosition(0., 0.)
+    , m_indexInRoute(0)
+    , m_isPositionMatched(false)
+    , m_hasDistanceFromBegin(false)
+    , m_distanceFromBegin(0.0)
+  {}
+
+  void Set(m2::PointD const & matchedPosition, size_t indexInRoute, double distanceFromBegin)
   {
-    return lat != 0. && lat < 90. && lat > -90.;
-  }
-  static inline bool IsLonValid(double lon)
-  {
-    return lon != 0. && lon < 180. && lon > -180.;
+    m_matchedPosition = matchedPosition;
+    m_indexInRoute = indexInRoute;
+    m_isPositionMatched = true;
+
+    m_distanceFromBegin = distanceFromBegin;
+    m_hasDistanceFromBegin = true;
   }
 
+  void Reset() { m_isPositionMatched = false; }
+  bool IsMatched() const { return m_isPositionMatched; }
+  size_t GetIndexInRoute() const { return m_indexInRoute; }
+  m2::PointD GetPosition() const { return m_matchedPosition; }
+  bool HasDistanceFromBegin() const { return m_hasDistanceFromBegin; }
+  double GetDistanceFromBegin() const { return m_distanceFromBegin; }
+};
 
-  // Convert angle (in degrees counterclockwise from X) to bearing ([0, 360) clockwise from the north)
-  static inline double AngleToBearing(double a)
-  {
-    double reverseAng = fmod(-a + 90, 360.);
-    if (reverseAng < 0)
-      reverseAng += 360.;
-    return reverseAng;
-  }
+enum EMyPositionMode
+{
+  PendingPosition = 0,
+  NotFollowNoPosition,
+  NotFollow,
+  Follow,
+  FollowAndRotate
+};
 
-  // Convert bearing (in degrees clockwise from the north) to angle ([0, 360) counterclockwise from X)
-  static inline double BearingToAngle(double a)
-  {
-    return AngleToBearing(a);
-  }
+using TMyPositionModeChanged = std::function<void(location::EMyPositionMode, bool)>;
 
-  class RouteMatchingInfo
-  {
-    m2::PointD m_matchedPosition;
-    size_t m_indexInRoute;
-    bool m_isPositionMatched;
-    bool m_hasDistanceFromBegin;
-    double m_distanceFromBegin;
-
-  public:
-    RouteMatchingInfo()
-      : m_matchedPosition(0., 0.)
-      , m_indexInRoute(0)
-      , m_isPositionMatched(false)
-      , m_hasDistanceFromBegin(false)
-      , m_distanceFromBegin(0.0)
-    {}
-
-    void Set(m2::PointD const & matchedPosition, size_t indexInRoute, double distanceFromBegin)
-    {
-      m_matchedPosition = matchedPosition;
-      m_indexInRoute = indexInRoute;
-      m_isPositionMatched = true;
-
-      m_distanceFromBegin = distanceFromBegin;
-      m_hasDistanceFromBegin = true;
-    }
-
-    void Reset() { m_isPositionMatched = false; }
-    bool IsMatched() const { return m_isPositionMatched; }
-    size_t GetIndexInRoute() const { return m_indexInRoute; }
-    m2::PointD GetPosition() const { return m_matchedPosition; }
-    bool HasDistanceFromBegin() const { return m_hasDistanceFromBegin; }
-    double GetDistanceFromBegin() const { return m_distanceFromBegin; }
-  };
-
-  enum EMyPositionMode
-  {
-    PendingPosition = 0,
-    NotFollowNoPosition,
-    NotFollow,
-    Follow,
-    FollowAndRotate
-  };
-
-  using TMyPositionModeChanged = std::function<void(location::EMyPositionMode, bool)>;
-
-} // namespace location
+}  // namespace location
diff --git a/libs/platform/location_service/location_service.cpp b/libs/platform/location_service/location_service.cpp
index a84232121..1f9c15bf5 100644
--- a/libs/platform/location_service/location_service.cpp
+++ b/libs/platform/location_service/location_service.cpp
@@ -9,7 +9,8 @@
 #if defined(OMIM_OS_MAC)
 std::unique_ptr<location::LocationService> CreateAppleLocationService(location::LocationObserver &);
 #elif defined(QT_LOCATION_SERVICE)
-std::unique_ptr<location::LocationService> CreateQtLocationService(location::LocationObserver &, std::string const & sourceName);
+std::unique_ptr<location::LocationService> CreateQtLocationService(location::LocationObserver &,
+                                                                   std::string const & sourceName);
 #endif
 
 namespace location
@@ -25,6 +26,7 @@ static double ApproxDistanceSquareInMeters(double lat1, double lon1, double lat2
 class PositionFilter
 {
   std::optional<location::GpsInfo> m_prevLocation;
+
 public:
   /// @return true if location should be sent to observers
   bool Passes(location::GpsInfo const & newLocation)
@@ -37,13 +39,11 @@ public:
     {
       if (newLocation.m_timestamp < m_prevLocation->m_timestamp)
         passes = false;
-      else if (newLocation.m_source != m_prevLocation->m_source
-               && newLocation.m_horizontalAccuracy > m_prevLocation->m_horizontalAccuracy
-               && ApproxDistanceSquareInMeters(newLocation.m_latitude,
-                                               newLocation.m_longitude,
-                                               m_prevLocation->m_latitude,
-                                               m_prevLocation->m_longitude)
-               > newLocation.m_horizontalAccuracy * newLocation.m_horizontalAccuracy)
+      else if (newLocation.m_source != m_prevLocation->m_source &&
+               newLocation.m_horizontalAccuracy > m_prevLocation->m_horizontalAccuracy &&
+               ApproxDistanceSquareInMeters(newLocation.m_latitude, newLocation.m_longitude, m_prevLocation->m_latitude,
+                                            m_prevLocation->m_longitude) >
+                   newLocation.m_horizontalAccuracy * newLocation.m_horizontalAccuracy)
         passes = false;
     }
     else
@@ -52,49 +52,47 @@ public:
   }
 };
 
-  class DesktopLocationService : public LocationService, public LocationObserver
+class DesktopLocationService
+  : public LocationService
+  , public LocationObserver
+{
+  std::vector<std::unique_ptr<LocationService>> m_services;
+  PositionFilter m_filter;
+  bool m_reportFirstEvent;
+
+  virtual void OnLocationError(location::TLocationError errorCode) { m_observer.OnLocationError(errorCode); }
+
+  virtual void OnLocationUpdated(GpsInfo const & info)
   {
-    std::vector<std::unique_ptr<LocationService>> m_services;
-    PositionFilter m_filter;
-    bool m_reportFirstEvent;
+    if (m_filter.Passes(info))
+      m_observer.OnLocationUpdated(info);
+  }
 
-    virtual void OnLocationError(location::TLocationError errorCode)
-    {
-      m_observer.OnLocationError(errorCode);
-    }
-
-    virtual void OnLocationUpdated(GpsInfo const & info)
-    {
-      if (m_filter.Passes(info))
-        m_observer.OnLocationUpdated(info);
-    }
-
-  public:
-    explicit DesktopLocationService(LocationObserver & observer)
-      : LocationService(observer), m_reportFirstEvent(true)
-    {
+public:
+  explicit DesktopLocationService(LocationObserver & observer) : LocationService(observer), m_reportFirstEvent(true)
+  {
 #if defined(QT_LOCATION_SERVICE)
 #if defined(OMIM_OS_LINUX)
-      m_services.push_back(CreateQtLocationService(*this, "geoclue2"));
-#endif // OMIM_OS_LINUX
-#elif defined(APPLE_LOCATION_SERVICE) // No QT_LOCATION_SERVICE
-      m_services.push_back(CreateAppleLocationService(*this));
-#endif // QT_LOCATION_SERVICE
-    }
+    m_services.push_back(CreateQtLocationService(*this, "geoclue2"));
+#endif                                 // OMIM_OS_LINUX
+#elif defined(APPLE_LOCATION_SERVICE)  // No QT_LOCATION_SERVICE
+    m_services.push_back(CreateAppleLocationService(*this));
+#endif                                 // QT_LOCATION_SERVICE
+  }
 
-    virtual void Start()
-    {
-      for (auto & service : m_services)
-        service->Start();
-    }
+  virtual void Start()
+  {
+    for (auto & service : m_services)
+      service->Start();
+  }
 
-    virtual void Stop()
-    {
-      for (auto & service : m_services)
-        service->Stop();
-      m_reportFirstEvent = true;
-    }
-  };
+  virtual void Stop()
+  {
+    for (auto & service : m_services)
+      service->Stop();
+    m_reportFirstEvent = true;
+  }
+};
 }  // namespace location
 
 std::unique_ptr<location::LocationService> CreateDesktopLocationService(location::LocationObserver & observer)
diff --git a/libs/platform/location_service/location_service.hpp b/libs/platform/location_service/location_service.hpp
index f89333da0..95eeedbf8 100644
--- a/libs/platform/location_service/location_service.hpp
+++ b/libs/platform/location_service/location_service.hpp
@@ -10,6 +10,7 @@ class LocationObserver
 public:
   virtual void OnLocationError(TLocationError errorCode) = 0;
   virtual void OnLocationUpdated(GpsInfo const & info) = 0;
+
 protected:
   virtual ~LocationObserver() = default;
 };
@@ -27,6 +28,6 @@ public:
   virtual void Stop() = 0;
 };
 
-} // namespace location
+}  // namespace location
 
 std::unique_ptr<location::LocationService> CreateDesktopLocationService(location::LocationObserver & observer);
diff --git a/libs/platform/location_service/qt_location_service.cpp b/libs/platform/location_service/qt_location_service.cpp
index d794d29b5..ea77571d5 100644
--- a/libs/platform/location_service/qt_location_service.cpp
+++ b/libs/platform/location_service/qt_location_service.cpp
@@ -36,14 +36,14 @@ static location::GpsInfo gpsInfoFromQGeoPositionInfo(QGeoPositionInfo const & i,
 static location::TLocationError tLocationErrorFromQGeoPositionInfoError(QGeoPositionInfoSource::Error error)
 {
   location::TLocationError result = location::TLocationError::ENotSupported;
-  switch(error)
+  switch (error)
   {
-    case QGeoPositionInfoSource::AccessError: result = location::TLocationError::EDenied; break;
-    case QGeoPositionInfoSource::ClosedError: result = location::TLocationError::EGPSIsOff; break;
-    case QGeoPositionInfoSource::NoError: result = location::TLocationError::ENoError; break;
-    case QGeoPositionInfoSource::UpdateTimeoutError: result = location::TLocationError::ETimeout; break;
-    case QGeoPositionInfoSource::UnknownSourceError: result = location::TLocationError::EUnknown; break;
-    default: break;
+  case QGeoPositionInfoSource::AccessError: result = location::TLocationError::EDenied; break;
+  case QGeoPositionInfoSource::ClosedError: result = location::TLocationError::EGPSIsOff; break;
+  case QGeoPositionInfoSource::NoError: result = location::TLocationError::ENoError; break;
+  case QGeoPositionInfoSource::UpdateTimeoutError: result = location::TLocationError::ETimeout; break;
+  case QGeoPositionInfoSource::UnknownSourceError: result = location::TLocationError::EUnknown; break;
+  default: break;
   }
   return result;
 }
@@ -55,10 +55,10 @@ static location::TLocationSource qStringToTLocationSource(QString const & source
 
   return location::TLocationSource::EUndefined;
 }
-}
+}  // namespace
 
-
-QtLocationService::QtLocationService(location::LocationObserver & observer, std::string const & sourceName) : LocationService(observer)
+QtLocationService::QtLocationService(location::LocationObserver & observer, std::string const & sourceName)
+  : LocationService(observer)
 {
   QVariantMap params;
   params["desktopId"] = "app.comaps.comaps";
@@ -70,8 +70,7 @@ QtLocationService::QtLocationService(location::LocationObserver & observer, std:
     return;
   }
 
-  if (!connect(m_positionSource, &QGeoPositionInfoSource::positionUpdated,
-               this, &QtLocationService::OnLocationUpdate))
+  if (!connect(m_positionSource, &QGeoPositionInfoSource::positionUpdated, this, &QtLocationService::OnLocationUpdate))
   {
     LOG(LERROR, ("Failed to connect the signal:", "positionUpdated"));
     return;
@@ -79,17 +78,15 @@ QtLocationService::QtLocationService(location::LocationObserver & observer, std:
 
   LOG(LDEBUG, ("Signal successfully connected:", "positionUpdated"));
 
-  if (!connect(m_positionSource, &QGeoPositionInfoSource::errorOccurred,
-               this, &QtLocationService::OnErrorOccurred))
+  if (!connect(m_positionSource, &QGeoPositionInfoSource::errorOccurred, this, &QtLocationService::OnErrorOccurred))
   {
     LOG(LERROR, ("Failed to connect the signal:", "errorOccurred"));
     return;
   }
   LOG(LDEBUG, ("Signal successfully connected:", "errorOccurred"));
 
-
-  if (!connect(m_positionSource, &QGeoPositionInfoSource::supportedPositioningMethodsChanged,
-               this, &QtLocationService::OnSupportedPositioningMethodsChanged))
+  if (!connect(m_positionSource, &QGeoPositionInfoSource::supportedPositioningMethodsChanged, this,
+               &QtLocationService::OnSupportedPositioningMethodsChanged))
   {
     LOG(LERROR, ("Failed to connect the signal:", "supportedPositioningMethodsChanged"));
     return;
@@ -104,12 +101,14 @@ void QtLocationService::OnLocationUpdate(QGeoPositionInfo const & info)
 {
   if (!info.isValid())
   {
-    LOG(LWARNING, ("Location update with Invalid timestamp or coordinates from:", m_positionSource->sourceName().toStdString()));
+    LOG(LWARNING,
+        ("Location update with Invalid timestamp or coordinates from:", m_positionSource->sourceName().toStdString()));
     return;
   }
   auto const & coordinate = info.coordinate();
   LOG(LDEBUG, ("Location updated with valid coordinates:", coordinate.longitude(), coordinate.latitude()));
-  m_observer.OnLocationUpdated(gpsInfoFromQGeoPositionInfo(info, qStringToTLocationSource(m_positionSource->sourceName())));
+  m_observer.OnLocationUpdated(
+      gpsInfoFromQGeoPositionInfo(info, qStringToTLocationSource(m_positionSource->sourceName())));
   if (!m_clientIsActive)
   {
     m_clientIsActive = true;
@@ -128,7 +127,7 @@ void QtLocationService::OnSupportedPositioningMethodsChanged()
 {
   auto positioningMethods = m_positionSource->supportedPositioningMethods();
   LOG(LDEBUG, ("Supported Positioning Method changed for:", m_positionSource->sourceName().toStdString(),
-	       "to:", positioningMethods));
+               "to:", positioningMethods));
   if (positioningMethods == QGeoPositionInfoSource::NoPositioningMethods)
   {
     m_clientIsActive = false;
@@ -156,7 +155,8 @@ void QtLocationService::Stop()
   }
 }
 
-std::unique_ptr<location::LocationService> CreateQtLocationService(location::LocationObserver & observer, std::string const & sourceName)
+std::unique_ptr<location::LocationService> CreateQtLocationService(location::LocationObserver & observer,
+                                                                   std::string const & sourceName)
 {
   return std::make_unique<QtLocationService>(observer, sourceName);
 }
diff --git a/libs/platform/location_service/qt_location_service.hpp b/libs/platform/location_service/qt_location_service.hpp
index 6ef2f2d67..326736459 100644
--- a/libs/platform/location_service/qt_location_service.hpp
+++ b/libs/platform/location_service/qt_location_service.hpp
@@ -4,10 +4,12 @@
 
 #include <QGeoPositionInfoSource>
 
-class QtLocationService : public QObject, public location::LocationService
+class QtLocationService
+  : public QObject
+  , public location::LocationService
 {
   Q_OBJECT
-  QGeoPositionInfoSource *m_positionSource;
+  QGeoPositionInfoSource * m_positionSource;
   // Unfortunately when the source is `geoclue2`
   // we would need access to the `Active` D-Bus property
   // https://www.freedesktop.org/software/geoclue/docs
@@ -17,7 +19,7 @@ class QtLocationService : public QObject, public location::LocationService
 
 public:
   explicit QtLocationService(location::LocationObserver &, std::string const &);
-  virtual ~QtLocationService() {};
+  virtual ~QtLocationService() {}
   virtual void Start();
   virtual void Stop();
 
diff --git a/libs/platform/measurement_utils.cpp b/libs/platform/measurement_utils.cpp
index 40c0f029e..25f155259 100644
--- a/libs/platform/measurement_utils.cpp
+++ b/libs/platform/measurement_utils.cpp
@@ -1,5 +1,5 @@
-#include "platform/locale.hpp"
 #include "platform/measurement_utils.hpp"
+#include "platform/locale.hpp"
 #include "platform/settings.hpp"
 
 #include "geometry/mercator.hpp"
@@ -11,7 +11,7 @@
 #include "base/string_utils.hpp"
 
 #include <cmath>
-#include <cstring>    // strstr
+#include <cstring>  // strstr
 #include <iomanip>
 #include <sstream>
 
@@ -124,7 +124,7 @@ std::string FormatLatLonAsDMSImpl(double value, char positive, char negative, in
   sstream << "″";
 
   // This condition is too heavy for production purposes (but more correct).
-  //if (std::round(value * 3600.0 * pow(10, dac)) != 0)
+  // if (std::round(value * 3600.0 * pow(10, dac)) != 0)
   if (!AlmostEqualULPs(value, 0.0))
   {
     char postfix = positive;
@@ -221,7 +221,7 @@ std::string FormatOsmLink(double lat, double lon, int zoom)
 
   for (int i = 0; i < (zoom + 10) / 3; ++i)
   {
-    const uint64_t digit = (code >> (58 - 6 * i)) & 0x3f;
+    uint64_t const digit = (code >> (58 - 6 * i)) & 0x3f;
     ASSERT_LESS(digit, ARRAY_SIZE(chars), ());
     osmUrl += chars[digit];
   }
@@ -252,28 +252,28 @@ bool OSMDistanceToMeters(std::string const & osmRawValue, double & outMeters)
 
   // Feet and probably inches.
   case '\'':
-    {
-      outMeters = FeetToMeters(outMeters);
-      s = stop + 1;
-      double const inches = strtod(s, &stop);
-      if (s != stop && *stop == '"' && math::is_finite(inches))
-        outMeters += InchesToMeters(inches);
+  {
+    outMeters = FeetToMeters(outMeters);
+    s = stop + 1;
+    double const inches = strtod(s, &stop);
+    if (s != stop && *stop == '"' && math::is_finite(inches))
+      outMeters += InchesToMeters(inches);
 
-      return true;
-    }
+    return true;
+  }
 
   // Inches.
   case '"': outMeters = InchesToMeters(outMeters); return true;
 
   // It's probably a range. Use maximum value (if possible) for a range.
   case '-':
-    {
-      s = stop + 1;
-      double const newValue = strtod(s, &stop);
-      if (s != stop && math::is_finite(newValue))
-        outMeters = newValue;
-    }
-    break;
+  {
+    s = stop + 1;
+    double const newValue = strtod(s, &stop);
+    if (s != stop && math::is_finite(newValue))
+      outMeters = newValue;
+  }
+  break;
 
   // It's probably a list. We don't support them.
   case ';': return false;
@@ -299,8 +299,7 @@ bool OSMDistanceToMeters(std::string const & osmRawValue, double & outMeters)
   return true;
 }
 
-std::string OSMDistanceToMetersString(std::string const & osmRawValue,
-                                      bool supportZeroAndNegativeValues,
+std::string OSMDistanceToMetersString(std::string const & osmRawValue, bool supportZeroAndNegativeValues,
                                       int digitsAfterComma)
 {
   double meters;
diff --git a/libs/platform/measurement_utils.hpp b/libs/platform/measurement_utils.hpp
index 8f5d6db0d..6c512df46 100644
--- a/libs/platform/measurement_utils.hpp
+++ b/libs/platform/measurement_utils.hpp
@@ -17,18 +17,54 @@ std::string_view DebugPrint(Units units);
 
 Units GetMeasurementUnits();
 
-inline double MetersToMiles(double m) { return m * 0.000621371192; }
-inline double MilesToMeters(double mi) { return mi * 1609.344; }
-inline double MilesToFeet(double mi) { return mi * 5280.0; }
-inline double MiphToKmph(double miph) { return MilesToMeters(miph) / 1000.0; }
-inline double KmphToMiph(double kmph) { return MetersToMiles(kmph * 1000.0); }
-inline double MpsToKmph(double mps) { return mps * 3.6; }
-inline double MetersToFeet(double m) { return m * 3.2808399; }
-inline double FeetToMeters(double ft) { return ft * 0.3048; }
-inline double FeetToMiles(double ft) { return ft * 0.00018939; }
-inline double InchesToMeters(double in) { return in / 39.370; }
-inline double NauticalMilesToMeters(double nmi) { return nmi * 1852; }
-inline double constexpr KmphToMps(double kmph) { return kmph * 1000 / 3600; }
+inline double MetersToMiles(double m)
+{
+  return m * 0.000621371192;
+}
+inline double MilesToMeters(double mi)
+{
+  return mi * 1609.344;
+}
+inline double MilesToFeet(double mi)
+{
+  return mi * 5280.0;
+}
+inline double MiphToKmph(double miph)
+{
+  return MilesToMeters(miph) / 1000.0;
+}
+inline double KmphToMiph(double kmph)
+{
+  return MetersToMiles(kmph * 1000.0);
+}
+inline double MpsToKmph(double mps)
+{
+  return mps * 3.6;
+}
+inline double MetersToFeet(double m)
+{
+  return m * 3.2808399;
+}
+inline double FeetToMeters(double ft)
+{
+  return ft * 0.3048;
+}
+inline double FeetToMiles(double ft)
+{
+  return ft * 0.00018939;
+}
+inline double InchesToMeters(double in)
+{
+  return in / 39.370;
+}
+inline double NauticalMilesToMeters(double nmi)
+{
+  return nmi * 1852;
+}
+inline double constexpr KmphToMps(double kmph)
+{
+  return kmph * 1000 / 3600;
+}
 
 double ToSpeedKmPH(double speed, Units units);
 double MpsToUnits(double metersPerSecond, Units units);
@@ -41,17 +77,14 @@ std::string FormatSpeedNumeric(double metersPerSecond, Units units);
 /// @param[in] dac  Digits after comma in seconds.
 /// Use dac == 3 for our common conversions to DMS.
 std::string FormatLatLonAsDMS(double lat, double lon, bool withComma, int dac = 3);
-void FormatLatLonAsDMS(double lat, double lon, std::string & latText, std::string & lonText,
-                       int dac = 3);
+void FormatLatLonAsDMS(double lat, double lon, std::string & latText, std::string & lonText, int dac = 3);
 std::string FormatMercatorAsDMS(m2::PointD const & mercator, int dac = 3);
-void FormatMercatorAsDMS(m2::PointD const & mercator, std::string & lat, std::string & lon,
-                         int dac = 3);
+void FormatMercatorAsDMS(m2::PointD const & mercator, std::string & lat, std::string & lon, int dac = 3);
 
 /// Default dac == 6 for the simple decimal formatting.
 std::string FormatLatLon(double lat, double lon, int dac = 6);
 std::string FormatLatLon(double lat, double lon, bool withComma, int dac = 6);
-void FormatLatLon(double lat, double lon, std::string & latText, std::string & lonText,
-                  int dac = 6);
+void FormatLatLon(double lat, double lon, std::string & latText, std::string & lonText, int dac = 6);
 std::string FormatMercator(m2::PointD const & mercator, int dac = 6);
 void FormatMercator(m2::PointD const & mercator, std::string & lat, std::string & lon, int dac = 6);
 
@@ -62,8 +95,7 @@ std::string FormatOsmLink(double lat, double lon, int zoom);
 bool OSMDistanceToMeters(std::string const & osmRawValue, double & outMeters);
 /// Converts OSM distance (height, ele etc.) to meters std::string.
 /// @returns empty std::string on failure.
-std::string OSMDistanceToMetersString(std::string const & osmRawValue,
-                                      bool supportZeroAndNegativeValues = true,
+std::string OSMDistanceToMetersString(std::string const & osmRawValue, bool supportZeroAndNegativeValues = true,
                                       int digitsAfterComma = 2);
 std::string ToStringPrecision(double d, int pr);
 std::string ToStringPrecisionLocale(platform::Locale const & locale, double d, int pr);
diff --git a/libs/platform/mwm_traits.cpp b/libs/platform/mwm_traits.cpp
index 57e9ddcb4..a3797588f 100644
--- a/libs/platform/mwm_traits.cpp
+++ b/libs/platform/mwm_traits.cpp
@@ -23,12 +23,9 @@ std::string DebugPrint(MwmTraits::SearchIndexFormat format)
 {
   switch (format)
   {
-  case MwmTraits::SearchIndexFormat::FeaturesWithRankAndCenter:
-    return "FeaturesWithRankAndCenter";
-  case MwmTraits::SearchIndexFormat::CompressedBitVector:
-    return "CompressedBitVector";
-  case MwmTraits::SearchIndexFormat::CompressedBitVectorWithHeader:
-    return "CompressedBitVectorWithHeader";
+  case MwmTraits::SearchIndexFormat::FeaturesWithRankAndCenter: return "FeaturesWithRankAndCenter";
+  case MwmTraits::SearchIndexFormat::CompressedBitVector: return "CompressedBitVector";
+  case MwmTraits::SearchIndexFormat::CompressedBitVectorWithHeader: return "CompressedBitVectorWithHeader";
   }
   UNREACHABLE();
 }
@@ -37,10 +34,8 @@ std::string DebugPrint(MwmTraits::HouseToStreetTableFormat format)
 {
   switch (format)
   {
-  case MwmTraits::HouseToStreetTableFormat::HouseToStreetTableWithHeader:
-    return "HouseToStreetTableWithHeader";
-  case MwmTraits::HouseToStreetTableFormat::Unknown:
-    return "Unknown";
+  case MwmTraits::HouseToStreetTableFormat::HouseToStreetTableWithHeader: return "HouseToStreetTableWithHeader";
+  case MwmTraits::HouseToStreetTableFormat::Unknown: return "Unknown";
   }
   UNREACHABLE();
 }
diff --git a/libs/platform/mwm_version.cpp b/libs/platform/mwm_version.cpp
index 5431d6b50..85b87c7fd 100644
--- a/libs/platform/mwm_version.cpp
+++ b/libs/platform/mwm_version.cpp
@@ -53,8 +53,7 @@ std::string DebugPrint(MwmVersion const & mwmVersion)
   std::stringstream s;
   s << "MwmVersion "
     << "{ m_format: " << DebugPrint(mwmVersion.GetFormat())
-    << ", m_secondsSinceEpoch: " << mwmVersion.GetSecondsSinceEpoch()
-    << " }";
+    << ", m_secondsSinceEpoch: " << mwmVersion.GetSecondsSinceEpoch() << " }";
   return s.str();
 }
 
diff --git a/libs/platform/network_policy.hpp b/libs/platform/network_policy.hpp
index 9289fab46..263fb7b63 100644
--- a/libs/platform/network_policy.hpp
+++ b/libs/platform/network_policy.hpp
@@ -25,6 +25,6 @@ private:
 
   bool m_canUse = false;
 };
-  
+
 extern NetworkPolicy GetCurrentNetworkPolicy();
 }  // namespace platform
diff --git a/libs/platform/platform.cpp b/libs/platform/platform.cpp
index cdc4370d4..906758520 100644
--- a/libs/platform/platform.cpp
+++ b/libs/platform/platform.cpp
@@ -45,31 +45,22 @@ bool GetFileTypeChecked(std::string const & path, Platform::EFileType & type)
   }
   return true;
 }
-} // namespace
+}  // namespace
 
 // static
 Platform::EError Platform::ErrnoToError()
 {
   switch (errno)
   {
-  case ENOENT:
-    return ERR_FILE_DOES_NOT_EXIST;
-  case EACCES:
-    return ERR_ACCESS_FAILED;
-  case ENOTEMPTY:
-    return ERR_DIRECTORY_NOT_EMPTY;
-  case EEXIST:
-    return ERR_FILE_ALREADY_EXISTS;
-  case ENAMETOOLONG:
-    return ERR_NAME_TOO_LONG;
-  case ENOTDIR:
-    return ERR_NOT_A_DIRECTORY;
-  case ELOOP:
-    return ERR_SYMLINK_LOOP;
-  case EIO:
-    return ERR_IO_ERROR;
-  default:
-    return ERR_UNKNOWN;
+  case ENOENT: return ERR_FILE_DOES_NOT_EXIST;
+  case EACCES: return ERR_ACCESS_FAILED;
+  case ENOTEMPTY: return ERR_DIRECTORY_NOT_EMPTY;
+  case EEXIST: return ERR_FILE_ALREADY_EXISTS;
+  case ENAMETOOLONG: return ERR_NAME_TOO_LONG;
+  case ENOTDIR: return ERR_NOT_A_DIRECTORY;
+  case ELOOP: return ERR_SYMLINK_LOOP;
+  case EIO: return ERR_IO_ERROR;
+  default: return ERR_UNKNOWN;
   }
 }
 
@@ -146,19 +137,15 @@ std::string Platform::ReadPathForFile(std::string const & file, std::string sear
       ASSERT(!m_settingsDir.empty(), ());
       fullPath = base::JoinPath(m_settingsDir, file);
       break;
-    case 'f':
-      fullPath = file;
-      break;
-    default :
-      CHECK(false, ("Unsupported searchScope:", searchScope));
-      break;
+    case 'f': fullPath = file; break;
+    default: CHECK(false, ("Unsupported searchScope:", searchScope)); break;
     }
     if (IsFileExistsByFullPath(fullPath))
       return fullPath;
   }
 
-  MYTHROW(FileAbsentException, ("File", file, "doesn't exist in the scope", searchScope,
-      "\nw: ", m_writableDir, "\nr: ", m_resourcesDir, "\ns: ", m_settingsDir));
+  MYTHROW(FileAbsentException, ("File", file, "doesn't exist in the scope", searchScope, "\nw: ", m_writableDir,
+                                "\nr: ", m_resourcesDir, "\ns: ", m_settingsDir));
 }
 
 std::string Platform::MetaServerUrl() const
@@ -194,19 +181,19 @@ void Platform::GetFontNames(FilesList & res) const
 
   /// @todo Actually, this list should present once in all our code.
   char constexpr const * arrDef[] = {
-    "fonts/00_NotoNaskhArabic-Regular.ttf",
-    "fonts/00_NotoSansBengali-Regular.ttf",
-    "fonts/00_NotoSansHebrew-Regular.ttf",
-    "fonts/00_NotoSansMalayalam-Regular.ttf",
-    "fonts/00_NotoSansThai-Regular.ttf",
-    "fonts/00_NotoSerifDevanagari-Regular.ttf",
-    "fonts/01_dejavusans.ttf",
-    "fonts/02_droidsans-fallback.ttf",
-    "fonts/03_jomolhari-id-a3d.ttf",
-    "fonts/04_padauk.ttf",
-    "fonts/05_khmeros.ttf",
-    "fonts/06_code2000.ttf",
-    "fonts/07_roboto_medium.ttf",
+      "fonts/00_NotoNaskhArabic-Regular.ttf",
+      "fonts/00_NotoSansBengali-Regular.ttf",
+      "fonts/00_NotoSansHebrew-Regular.ttf",
+      "fonts/00_NotoSansMalayalam-Regular.ttf",
+      "fonts/00_NotoSansThai-Regular.ttf",
+      "fonts/00_NotoSerifDevanagari-Regular.ttf",
+      "fonts/01_dejavusans.ttf",
+      "fonts/02_droidsans-fallback.ttf",
+      "fonts/03_jomolhari-id-a3d.ttf",
+      "fonts/04_padauk.ttf",
+      "fonts/05_khmeros.ttf",
+      "fonts/06_code2000.ttf",
+      "fonts/07_roboto_medium.ttf",
   };
   res.insert(res.end(), arrDef, arrDef + ARRAY_SIZE(arrDef));
 
@@ -218,15 +205,14 @@ void Platform::GetFontNames(FilesList & res) const
 void Platform::GetFilesByExt(std::string const & directory, std::string_view ext, FilesList & outFiles)
 {
   // Transform extension mask to regexp (.mwm -> \.mwm$)
-  ASSERT ( !ext.empty(), () );
-  ASSERT_EQUAL ( ext[0], '.' , () );
+  ASSERT(!ext.empty(), ());
+  ASSERT_EQUAL(ext[0], '.', ());
   std::string regexp = "\\";
   GetFilesByRegExp(directory, regexp.append(ext).append("$"), outFiles);
 }
 
 // static
-void Platform::GetFilesByType(std::string const & directory, unsigned typeMask,
-                              TFilesWithType & outFiles)
+void Platform::GetFilesByType(std::string const & directory, unsigned typeMask, TFilesWithType & outFiles)
 {
   FilesList allFiles;
   GetFilesByRegExp(directory, ".*", allFiles);
@@ -313,7 +299,7 @@ bool Platform::MkDirRecursively(std::string const & dirName)
 {
   CHECK(!dirName.empty(), ());
 
-  std::string::value_type const sep[] = { base::GetNativeSeparator(), 0};
+  std::string::value_type const sep[] = {base::GetNativeSeparator(), 0};
   std::string path = dirName.starts_with(sep[0]) ? sep : ".";
   for (auto const & t : strings::Tokenize(dirName, sep))
   {
@@ -394,12 +380,9 @@ std::string DebugPrint(Platform::EError err)
   case Platform::ERR_ACCESS_FAILED: return "Access failed.";
   case Platform::ERR_DIRECTORY_NOT_EMPTY: return "Directory not empty.";
   case Platform::ERR_FILE_ALREADY_EXISTS: return "File already exists.";
-  case Platform::ERR_NAME_TOO_LONG:
-    return "The length of a component of path exceeds {NAME_MAX} characters.";
-  case Platform::ERR_NOT_A_DIRECTORY:
-    return "A component of the path prefix of Path is not a directory.";
-  case Platform::ERR_SYMLINK_LOOP:
-    return "Too many symbolic links were encountered in translating path.";
+  case Platform::ERR_NAME_TOO_LONG: return "The length of a component of path exceeds {NAME_MAX} characters.";
+  case Platform::ERR_NOT_A_DIRECTORY: return "A component of the path prefix of Path is not a directory.";
+  case Platform::ERR_SYMLINK_LOOP: return "Too many symbolic links were encountered in translating path.";
   case Platform::ERR_IO_ERROR: return "An I/O error occurred.";
   case Platform::ERR_UNKNOWN: return "Unknown";
   }
diff --git a/libs/platform/platform.hpp b/libs/platform/platform.hpp
index 457e08d9e..10bc76403 100644
--- a/libs/platform/platform.hpp
+++ b/libs/platform/platform.hpp
@@ -140,8 +140,7 @@ public:
   /// @return full path to file in user's writable directory
   std::string WritablePathForFile(std::string const & file) const;
   /// Uses m_writeableDir [w], m_resourcesDir [r], m_settingsDir [s].
-  std::string ReadPathForFile(std::string const & file,
-                              std::string searchScope = std::string()) const;
+  std::string ReadPathForFile(std::string const & file, std::string searchScope = std::string()) const;
 
   /// @return resource dir (on some platforms it's differ from Writable dir)
   std::string const & ResourcesDir() const
@@ -200,8 +199,7 @@ public:
   /// @param[in] file name or full path which we want to read
   /// @param[in] searchScope looks for file in dirs in given order: \n
   /// [w]ritable, [r]esources, [s]ettings, by [f]ull path, [e]xternal resources,
-  std::unique_ptr<ModelReader> GetReader(std::string const & file,
-                                         std::string searchScope = std::string()) const;
+  std::unique_ptr<ModelReader> GetReader(std::string const & file, std::string searchScope = std::string()) const;
 
   /// @name File operations
   //@{
@@ -210,14 +208,11 @@ public:
   /// @param directory directory path with slash at the end
   //@{
   /// @param ext files extension to find, like ".mwm".
-  static void GetFilesByExt(std::string const & directory, std::string_view ext,
-                            FilesList & outFiles);
-  static void GetFilesByRegExp(std::string const & directory, std::string const & regexp,
-                               FilesList & outFiles);
+  static void GetFilesByExt(std::string const & directory, std::string_view ext, FilesList & outFiles);
+  static void GetFilesByRegExp(std::string const & directory, std::string const & regexp, FilesList & outFiles);
   //@}
 
-  static void GetFilesByType(std::string const & directory, unsigned typeMask,
-                             TFilesWithType & outFiles);
+  static void GetFilesByType(std::string const & directory, unsigned typeMask, TFilesWithType & outFiles);
 
   static void GetFilesRecursively(std::string const & directory, FilesList & filesList);
 
@@ -251,7 +246,7 @@ public:
 
   // Please note, that number of active cores can vary at runtime.
   // DO NOT assume for the same return value between calls.
-  static unsigned CpuCores() ;
+  static unsigned CpuCores();
 
   void GetFontNames(FilesList & res) const;
 
@@ -315,19 +310,16 @@ public:
   }
 
   template <typename Task>
-  base::TaskLoop::PushResult RunDelayedTask(
-      Thread thread, base::DelayedThreadPool::Duration const & delay, Task && task)
+  base::TaskLoop::PushResult RunDelayedTask(Thread thread, base::DelayedThreadPool::Duration const & delay,
+                                            Task && task)
   {
     ASSERT(m_networkThread && m_fileThread && m_backgroundThread, ());
     switch (thread)
     {
     case Thread::File: return m_fileThread->PushDelayed(delay, std::forward<Task>(task));
     case Thread::Network: return m_networkThread->PushDelayed(delay, std::forward<Task>(task));
-    case Thread::Gui:
-      CHECK(false, ("Delayed tasks for gui thread are not supported yet"));
-      return {};
-    case Thread::Background:
-      return m_backgroundThread->PushDelayed(delay, std::forward<Task>(task));
+    case Thread::Gui: CHECK(false, ("Delayed tasks for gui thread are not supported yet")); return {};
+    case Thread::Background: return m_backgroundThread->PushDelayed(delay, std::forward<Task>(task));
     }
     UNREACHABLE();
   }
diff --git a/libs/platform/platform_android.cpp b/libs/platform/platform_android.cpp
index ff42450ea..6d66e0762 100644
--- a/libs/platform/platform_android.cpp
+++ b/libs/platform/platform_android.cpp
@@ -15,8 +15,8 @@
 #include <regex>
 #include <string>
 
-#include <unistd.h>     // for sysconf
 #include <sys/stat.h>
+#include <unistd.h>  // for sysconf
 
 using namespace std;
 
@@ -26,16 +26,14 @@ Platform::Platform()
 }
 
 #ifdef DEBUG
-namespace {
+namespace
+{
 class DbgLogger
 {
 public:
   explicit DbgLogger(string const & file) : m_file(file) {}
 
-  ~DbgLogger()
-  {
-    LOG(LDEBUG, ("Source for file", m_file, "is", m_src));
-  }
+  ~DbgLogger() { LOG(LDEBUG, ("Source for file", m_file, "is", m_src)); }
 
   void SetSource(char src) { m_src = src; }
 
@@ -46,7 +44,6 @@ private:
 }  // namespace
 #endif
 
-
 unique_ptr<ModelReader> Platform::GetReader(string const & file, string searchScope) const
 {
   string ext = base::GetFileExtension(file);
@@ -65,12 +62,10 @@ unique_ptr<ModelReader> Platform::GetReader(string const & file, string searchSc
       ASSERT(ext != ".kml" && ext != ".kmb" && ext != ".kmz", ("BookmarkManager is responsible for that"));
 
       if (ext == DATA_FILE_EXTENSION)
-      {
         if (file.starts_with(WORLD_COASTS_FILE_NAME) || file.starts_with(WORLD_FILE_NAME))
           searchScope = "wsr";
         else
           searchScope = "w";
-      }
       else if (file == SETTINGS_FILE_NAME)
         searchScope = "s";
       else
@@ -123,9 +118,7 @@ unique_ptr<ModelReader> Platform::GetReader(string const & file, string searchSc
       }
       break;
 
-    default:
-      CHECK(false, ("Unsupported source:", s));
-      break;
+    default: CHECK(false, ("Unsupported source:", s)); break;
     }
   }
 
@@ -163,9 +156,15 @@ void Platform::GetFilesByRegExp(string const & directory, string const & regexp,
     pl::EnumerateFilesByRegExp(directory, regexp, res);
 }
 
-int Platform::VideoMemoryLimit() const { return 10 * 1024 * 1024; }
+int Platform::VideoMemoryLimit() const
+{
+  return 10 * 1024 * 1024;
+}
 
-int Platform::PreCachingDepth() const { return 3; }
+int Platform::PreCachingDepth() const
+{
+  return 3;
+}
 
 bool Platform::GetFileSizeByName(string const & fileName, uint64_t & size) const
 {
diff --git a/libs/platform/platform_linux.cpp b/libs/platform/platform_linux.cpp
index 65cdfe74b..27208fa1e 100644
--- a/libs/platform/platform_linux.cpp
+++ b/libs/platform/platform_linux.cpp
@@ -1,5 +1,5 @@
-#include "private.h"
 #include "platform/platform.hpp"
+#include "private.h"
 
 #include "platform/socket.hpp"
 
@@ -71,8 +71,7 @@ std::unique_ptr<Socket> CreateSocket()
 {
   return std::unique_ptr<Socket>();
 }
-} // namespace platform
-
+}  // namespace platform
 
 Platform::Platform()
 {
@@ -85,9 +84,8 @@ Platform::Platform()
   CHECK(homeDir, ("Can't retrieve home directory"));
 
   // XDG config directory, usually ~/.config/CoMaps/
-  m_settingsDir = JoinPath(
-      QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation).toStdString(),
-      "CoMaps");
+  m_settingsDir =
+      JoinPath(QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation).toStdString(), "CoMaps");
   if (!IsFileExistsByFullPath(JoinPath(m_settingsDir, SETTINGS_FILE_NAME)) && !MkDirRecursively(m_settingsDir))
     MYTHROW(FileSystemException, ("Can't create directory", m_settingsDir));
   m_settingsDir += '/';
@@ -99,13 +97,13 @@ Platform::Platform()
   if (auto const dir = GetEnv("MWM_RESOURCES_DIR"))
     m_resourcesDir = *dir;
   else
-  { // Guess the existing resources directory.
+  {  // Guess the existing resources directory.
     std::string const dirsToScan[] = {
-        "./data",  // symlink in the current folder
-        "../data",  // 'build' folder inside the repo
-        JoinPath(*execDir, "..", "comaps", "data"),  // build-omim-{debug,release}
-        JoinPath(*execDir, "..", "share"),  // installed version with packages
-        JoinPath(*execDir, "..", "CoMaps"),  // installed version without packages
+        "./data",                                             // symlink in the current folder
+        "../data",                                            // 'build' folder inside the repo
+        JoinPath(*execDir, "..", "comaps", "data"),           // build-omim-{debug,release}
+        JoinPath(*execDir, "..", "share"),                    // installed version with packages
+        JoinPath(*execDir, "..", "CoMaps"),                   // installed version without packages
         JoinPath(*execDir, "..", "share", "comaps", "data"),  // flatpak-build
     };
     for (auto const & dir : dirsToScan)
@@ -125,8 +123,7 @@ Platform::Platform()
     // The writableLocation does the same for AppDataLocation, AppLocalDataLocation,
     // and GenericDataLocation. Provided, that test mode is not enabled, then
     // first it checks ${XDG_DATA_HOME}, if empty then it falls back to ${HOME}/.local/share
-    m_writableDir = JoinPath(QStandardPaths::writableLocation(
-        QStandardPaths::AppDataLocation).toStdString(), "CoMaps");
+    m_writableDir = JoinPath(QStandardPaths::writableLocation(QStandardPaths::AppDataLocation).toStdString(), "CoMaps");
 
     if (!MkDirRecursively(m_writableDir))
       MYTHROW(FileSystemException, ("Can't create writable directory:", m_writableDir));
@@ -140,7 +137,7 @@ Platform::Platform()
     m_resourcesDir = AddSlashIfNeeded(m_resourcesDir);
 
   // Select directory for temporary files.
-  for (auto const & dir : { GetEnv("TMPDIR"), GetEnv("TMP"), GetEnv("TEMP"), {"/tmp"}})
+  for (auto const & dir : {GetEnv("TMPDIR"), GetEnv("TMP"), GetEnv("TEMP"), {"/tmp"}})
   {
     if (dir && IsFileExistsByFullPath(*dir) && IsDirWritable(*dir))
     {
@@ -200,53 +197,53 @@ uint8_t Platform::GetBatteryLevel()
 void Platform::GetSystemFontNames(FilesList & res) const
 {
   char constexpr const * const fontsWhitelist[] = {
-    "Roboto-Medium.ttf",
-    "Roboto-Regular.ttf",
-    "DroidSansFallback.ttf",
-    "DroidSansFallbackFull.ttf",
-    "DroidSans.ttf",
-    "DroidSansArabic.ttf",
-    "DroidSansSemc.ttf",
-    "DroidSansSemcCJK.ttf",
-    "DroidNaskh-Regular.ttf",
-    "Lohit-Bengali.ttf",
-    "Lohit-Devanagari.ttf",
-    "Lohit-Tamil.ttf",
-    "PakType Naqsh.ttf",
-    "wqy-microhei.ttc",
-    "Jomolhari.ttf",
-    "Padauk.ttf",
-    "KhmerOS.ttf",
-    "Umpush.ttf",
-    "DroidSansThai.ttf",
-    "DroidSansArmenian.ttf",
-    "DroidSansEthiopic-Regular.ttf",
-    "DroidSansGeorgian.ttf",
-    "DroidSansHebrew-Regular.ttf",
-    "DroidSansHebrew.ttf",
-    "DroidSansJapanese.ttf",
-    "LTe50872.ttf",
-    "LTe50259.ttf",
-    "DevanagariOTS.ttf",
-    "FreeSans.ttf",
-    "DejaVuSans.ttf",
-    "arial.ttf",
-    "AbyssinicaSIL-R.ttf",
+      "Roboto-Medium.ttf",
+      "Roboto-Regular.ttf",
+      "DroidSansFallback.ttf",
+      "DroidSansFallbackFull.ttf",
+      "DroidSans.ttf",
+      "DroidSansArabic.ttf",
+      "DroidSansSemc.ttf",
+      "DroidSansSemcCJK.ttf",
+      "DroidNaskh-Regular.ttf",
+      "Lohit-Bengali.ttf",
+      "Lohit-Devanagari.ttf",
+      "Lohit-Tamil.ttf",
+      "PakType Naqsh.ttf",
+      "wqy-microhei.ttc",
+      "Jomolhari.ttf",
+      "Padauk.ttf",
+      "KhmerOS.ttf",
+      "Umpush.ttf",
+      "DroidSansThai.ttf",
+      "DroidSansArmenian.ttf",
+      "DroidSansEthiopic-Regular.ttf",
+      "DroidSansGeorgian.ttf",
+      "DroidSansHebrew-Regular.ttf",
+      "DroidSansHebrew.ttf",
+      "DroidSansJapanese.ttf",
+      "LTe50872.ttf",
+      "LTe50259.ttf",
+      "DevanagariOTS.ttf",
+      "FreeSans.ttf",
+      "DejaVuSans.ttf",
+      "arial.ttf",
+      "AbyssinicaSIL-R.ttf",
   };
 
   std::string const systemFontsPath[] = {
-    "/usr/share/fonts/truetype/roboto/",
-    "/usr/share/fonts/truetype/droid/",
-    "/usr/share/fonts/truetype/dejavu/",
-    "/usr/share/fonts/truetype/ttf-dejavu/",
-    "/usr/share/fonts/truetype/wqy/",
-    "/usr/share/fonts/truetype/freefont/",
-    "/usr/share/fonts/truetype/padauk/",
-    "/usr/share/fonts/truetype/dzongkha/",
-    "/usr/share/fonts/truetype/ttf-khmeros-core/",
-    "/usr/share/fonts/truetype/tlwg/",
-    "/usr/share/fonts/truetype/abyssinica/",
-    "/usr/share/fonts/truetype/paktype/",
+      "/usr/share/fonts/truetype/roboto/",
+      "/usr/share/fonts/truetype/droid/",
+      "/usr/share/fonts/truetype/dejavu/",
+      "/usr/share/fonts/truetype/ttf-dejavu/",
+      "/usr/share/fonts/truetype/wqy/",
+      "/usr/share/fonts/truetype/freefont/",
+      "/usr/share/fonts/truetype/padauk/",
+      "/usr/share/fonts/truetype/dzongkha/",
+      "/usr/share/fonts/truetype/ttf-khmeros-core/",
+      "/usr/share/fonts/truetype/tlwg/",
+      "/usr/share/fonts/truetype/abyssinica/",
+      "/usr/share/fonts/truetype/paktype/",
   };
 
   for (auto font : fontsWhitelist)
diff --git a/libs/platform/platform_qt.cpp b/libs/platform/platform_qt.cpp
index 413845951..fbd691251 100644
--- a/libs/platform/platform_qt.cpp
+++ b/libs/platform/platform_qt.cpp
@@ -17,8 +17,8 @@
 
 std::unique_ptr<ModelReader> Platform::GetReader(std::string const & file, std::string searchScope) const
 {
-  return std::make_unique<FileReader>(ReadPathForFile(file, std::move(searchScope)),
-                                 READER_CHUNK_LOG_SIZE, READER_CHUNK_LOG_COUNT);
+  return std::make_unique<FileReader>(ReadPathForFile(file, std::move(searchScope)), READER_CHUNK_LOG_SIZE,
+                                      READER_CHUNK_LOG_COUNT);
 }
 
 bool Platform::GetFileSizeByName(std::string const & fileName, uint64_t & size) const
@@ -48,16 +48,22 @@ void Platform::GetFilesByRegExp(std::string const & directory, std::string const
   }
 }
 
-int Platform::PreCachingDepth() const { return 3; }
+int Platform::PreCachingDepth() const
+{
+  return 3;
+}
 
-int Platform::VideoMemoryLimit() const { return 20 * 1024 * 1024; }
+int Platform::VideoMemoryLimit() const
+{
+  return 20 * 1024 * 1024;
+}
 
 // static
 Platform::EError Platform::MkDir(std::string const & dirName)
 {
   if (QDir().exists(dirName.c_str()))
     return Platform::ERR_FILE_ALREADY_EXISTS;
-  if(!QDir().mkdir(dirName.c_str()))
+  if (!QDir().mkdir(dirName.c_str()))
   {
     LOG(LWARNING, ("Can't create directory: ", dirName));
     return Platform::ERR_UNKNOWN;
diff --git a/libs/platform/platform_tests/country_file_tests.cpp b/libs/platform/platform_tests/country_file_tests.cpp
index c44a9d17d..b377bf325 100644
--- a/libs/platform/platform_tests/country_file_tests.cpp
+++ b/libs/platform/platform_tests/country_file_tests.cpp
@@ -2,8 +2,8 @@
 
 #include "defines.hpp"
 
-#include "platform/mwm_version.hpp"
 #include "platform/country_file.hpp"
+#include "platform/mwm_version.hpp"
 
 #include <string>
 
diff --git a/libs/platform/platform_tests/distance_tests.cpp b/libs/platform/platform_tests/distance_tests.cpp
index ad642f6f1..2c5673b9c 100644
--- a/libs/platform/platform_tests/distance_tests.cpp
+++ b/libs/platform/platform_tests/distance_tests.cpp
@@ -169,8 +169,7 @@ UNIT_TEST(Distance_To)
   // clang-format on
   for (TestData const & data : testData)
   {
-    Distance const formatted =
-        Distance(data.initialDistance, data.initialUnits).To(data.to).GetFormattedDistance();
+    Distance const formatted = Distance(data.initialDistance, data.initialUnits).To(data.to).GetFormattedDistance();
     TEST_ALMOST_EQUAL_ULPS(formatted.GetDistance(), data.newDistance, (data.initialDistance));
     TEST_EQUAL(formatted.GetUnits(), data.newUnits, ());
   }
diff --git a/libs/platform/platform_tests/downloader_tests/downloader_test.cpp b/libs/platform/platform_tests/downloader_tests/downloader_test.cpp
index 6800c6681..f4ea08a9b 100644
--- a/libs/platform/platform_tests/downloader_tests/downloader_test.cpp
+++ b/libs/platform/platform_tests/downloader_tests/downloader_test.cpp
@@ -1,7 +1,7 @@
 #include "testing/testing.hpp"
 
-#include "platform/http_request.hpp"
 #include "platform/chunks_download_strategy.hpp"
+#include "platform/http_request.hpp"
 #include "platform/platform.hpp"
 
 #include "coding/file_reader.hpp"
@@ -42,15 +42,9 @@ class DownloadObserver
   base::ScopedLogLevelChanger const m_debugLogLevel;
 
 public:
-  DownloadObserver() : m_chunksToFail(-1), m_debugLogLevel(LDEBUG)
-  {
-    Reset();
-  }
+  DownloadObserver() : m_chunksToFail(-1), m_debugLogLevel(LDEBUG) { Reset(); }
 
-  void CancelDownloadOnGivenChunk(int chunksToFail)
-  {
-    m_chunksToFail = chunksToFail;
-  }
+  void CancelDownloadOnGivenChunk(int chunksToFail) { m_chunksToFail = chunksToFail; }
 
   void Reset()
   {
@@ -115,18 +109,12 @@ struct CancelDownload
     delete &request;
     QCoreApplication::quit();
   }
-  void OnFinish(HttpRequest &)
-  {
-    TEST(false, ("Should be never called"));
-  }
+  void OnFinish(HttpRequest &) { TEST(false, ("Should be never called")); }
 };
 
 struct DeleteOnFinish
 {
-  void OnProgress(HttpRequest & request)
-  {
-    TEST_GREATER(request.GetData().size(), 0, ());
-  }
+  void OnProgress(HttpRequest & request) { TEST_GREATER(request.GetData().size(), 0, ()); }
   void OnFinish(HttpRequest & request)
   {
     delete &request;
@@ -139,14 +127,13 @@ UNIT_TEST(DownloaderSimpleGet)
   DownloadObserver observer;
   auto const MakeRequest = [&observer](std::string const & url)
   {
-    return HttpRequest::Get(url,
-                            bind(&DownloadObserver::OnDownloadFinish, &observer, _1),
+    return HttpRequest::Get(url, bind(&DownloadObserver::OnDownloadFinish, &observer, _1),
                             bind(&DownloadObserver::OnDownloadProgress, &observer, _1));
   };
 
   {
     // simple success case
-    unique_ptr<HttpRequest> const request {MakeRequest(kTestUrl1)};
+    unique_ptr<HttpRequest> const request{MakeRequest(kTestUrl1)};
     // wait until download is finished
     QCoreApplication::exec();
     observer.TestOk();
@@ -156,7 +143,7 @@ UNIT_TEST(DownloaderSimpleGet)
   observer.Reset();
   {
     // We DO NOT SUPPORT redirects to avoid data corruption when downloading mwm files
-    unique_ptr<HttpRequest> const request {MakeRequest("http://localhost:34568/unit_tests/permanent")};
+    unique_ptr<HttpRequest> const request{MakeRequest("http://localhost:34568/unit_tests/permanent")};
     QCoreApplication::exec();
     observer.TestFailed();
     TEST_EQUAL(request->GetData().size(), 0, (request->GetData()));
@@ -165,7 +152,7 @@ UNIT_TEST(DownloaderSimpleGet)
   observer.Reset();
   {
     // fail case 404
-    unique_ptr<HttpRequest> const request {MakeRequest(kTestUrl404)};
+    unique_ptr<HttpRequest> const request{MakeRequest(kTestUrl404)};
     QCoreApplication::exec();
     observer.TestFileNotFound();
     TEST_EQUAL(request->GetData().size(), 0, (request->GetData()));
@@ -174,7 +161,7 @@ UNIT_TEST(DownloaderSimpleGet)
   observer.Reset();
   {
     // fail case not existing host
-    unique_ptr<HttpRequest> const request {MakeRequest("http://not-valid-host123532.ath.cx")};
+    unique_ptr<HttpRequest> const request{MakeRequest("http://not-valid-host123532.ath.cx")};
     QCoreApplication::exec();
     observer.TestFailed();
     TEST_EQUAL(request->GetData().size(), 0, (request->GetData()));
@@ -184,16 +171,15 @@ UNIT_TEST(DownloaderSimpleGet)
     // cancel download in the middle of the progress
     CancelDownload canceler;
     // should be deleted in canceler
-    HttpRequest::Get(kTestUrlBigFile,
-        bind(&CancelDownload::OnFinish, &canceler, _1),
-        bind(&CancelDownload::OnProgress, &canceler, _1));
+    HttpRequest::Get(kTestUrlBigFile, bind(&CancelDownload::OnFinish, &canceler, _1),
+                     bind(&CancelDownload::OnProgress, &canceler, _1));
     QCoreApplication::exec();
   }
 
   observer.Reset();
   {
     // https success case
-    unique_ptr<HttpRequest> const request {MakeRequest("https://github.com")};
+    unique_ptr<HttpRequest> const request{MakeRequest("https://github.com")};
     // wait until download is finished
     QCoreApplication::exec();
     observer.TestOk();
@@ -204,9 +190,8 @@ UNIT_TEST(DownloaderSimpleGet)
     // Delete request at the end of successful download
     DeleteOnFinish deleter;
     // should be deleted in deleter on finish
-    HttpRequest::Get(kTestUrl1,
-        bind(&DeleteOnFinish::OnFinish, &deleter, _1),
-        bind(&DeleteOnFinish::OnProgress, &deleter, _1));
+    HttpRequest::Get(kTestUrl1, bind(&DeleteOnFinish::OnFinish, &deleter, _1),
+                     bind(&DeleteOnFinish::OnProgress, &deleter, _1));
     QCoreApplication::exec();
   }
 }
@@ -218,9 +203,9 @@ UNIT_TEST(DownloaderSimplePost)
   // simple success case
   string const postData = "{\"jsonKey\":\"jsonValue\"}";
   DownloadObserver observer;
-  unique_ptr<HttpRequest> const request {HttpRequest::PostJson("http://localhost:34568/unit_tests/post.php", postData,
-        bind(&DownloadObserver::OnDownloadFinish, &observer, _1),
-        bind(&DownloadObserver::OnDownloadProgress, &observer, _1))};
+  unique_ptr<HttpRequest> const request{HttpRequest::PostJson(
+      "http://localhost:34568/unit_tests/post.php", postData, bind(&DownloadObserver::OnDownloadFinish, &observer, _1),
+      bind(&DownloadObserver::OnDownloadProgress, &observer, _1))};
   // wait until download is finished
   QCoreApplication::exec();
   observer.TestOk();
@@ -419,7 +404,6 @@ void DeleteTempDownloadFiles()
 }
 }  // namespace
 
-
 UNIT_TEST(DownloadChunks)
 {
   string const kFileName = "some_downloader_test_file";
@@ -433,15 +417,13 @@ UNIT_TEST(DownloadChunks)
   DownloadObserver observer;
   auto const MakeRequest = [&](int64_t chunkSize)
   {
-    return HttpRequest::GetFile(urls, kFileName, fileSize,
-                                bind(&DownloadObserver::OnDownloadFinish, &observer, _1),
-                                bind(&DownloadObserver::OnDownloadProgress, &observer, _1),
-                                chunkSize);
+    return HttpRequest::GetFile(urls, kFileName, fileSize, bind(&DownloadObserver::OnDownloadFinish, &observer, _1),
+                                bind(&DownloadObserver::OnDownloadProgress, &observer, _1), chunkSize);
   };
 
   {
     // should use only one thread
-    unique_ptr<HttpRequest> const request {MakeRequest(512 * 1024)};
+    unique_ptr<HttpRequest> const request{MakeRequest(512 * 1024)};
     // wait until download is finished
     QCoreApplication::exec();
     observer.TestOk();
@@ -455,7 +437,7 @@ UNIT_TEST(DownloadChunks)
   fileSize = 5;
   {
     // 3 threads - fail, because of invalid size
-    [[maybe_unused]] unique_ptr<HttpRequest> const request {MakeRequest(2048)};
+    [[maybe_unused]] unique_ptr<HttpRequest> const request{MakeRequest(2048)};
     // wait until download is finished
     QCoreApplication::exec();
     observer.TestFailed();
@@ -467,7 +449,7 @@ UNIT_TEST(DownloadChunks)
   fileSize = kBigFileSize;
   {
     // 3 threads - succeeded
-    [[maybe_unused]] unique_ptr<HttpRequest> const request {MakeRequest(2048)};
+    [[maybe_unused]] unique_ptr<HttpRequest> const request{MakeRequest(2048)};
     // wait until download is finished
     QCoreApplication::exec();
     observer.TestOk();
@@ -479,7 +461,7 @@ UNIT_TEST(DownloadChunks)
   fileSize = kBigFileSize;
   {
     // 3 threads with only one valid url - succeeded
-    [[maybe_unused]] unique_ptr<HttpRequest> const request {MakeRequest(2048)};
+    [[maybe_unused]] unique_ptr<HttpRequest> const request{MakeRequest(2048)};
     // wait until download is finished
     QCoreApplication::exec();
     observer.TestOk();
@@ -491,7 +473,7 @@ UNIT_TEST(DownloadChunks)
   fileSize = 12345;
   {
     // 2 threads and all points to file with invalid size - fail
-    [[maybe_unused]] unique_ptr<HttpRequest> const request {MakeRequest(2048)};
+    [[maybe_unused]] unique_ptr<HttpRequest> const request{MakeRequest(2048)};
     // wait until download is finished
     QCoreApplication::exec();
     observer.TestFailed();
@@ -499,7 +481,6 @@ UNIT_TEST(DownloadChunks)
   }
 }
 
-
 namespace
 {
 int64_t constexpr beg1 = 123, end1 = 1230, beg2 = 44000, end2 = 47683;
@@ -536,7 +517,6 @@ struct ResumeChecker
 };
 }  // namespace
 
-
 UNIT_TEST(DownloadResumeChunks)
 {
   string const FILENAME = "some_test_filename_12345";
@@ -552,9 +532,9 @@ UNIT_TEST(DownloadResumeChunks)
   {
     DownloadObserver observer;
 
-    unique_ptr<HttpRequest> const request(HttpRequest::GetFile(urls, FILENAME, kBigFileSize,
-                            bind(&DownloadObserver::OnDownloadFinish, &observer, _1),
-                            bind(&DownloadObserver::OnDownloadProgress, &observer, _1)));
+    unique_ptr<HttpRequest> const request(
+        HttpRequest::GetFile(urls, FILENAME, kBigFileSize, bind(&DownloadObserver::OnDownloadFinish, &observer, _1),
+                             bind(&DownloadObserver::OnDownloadProgress, &observer, _1)));
 
     QCoreApplication::exec();
 
@@ -579,9 +559,9 @@ UNIT_TEST(DownloadResumeChunks)
     f.Write(b2, ARRAY_SIZE(b2));
 
     ChunksDownloadStrategy strategy((vector<string>()));
-    strategy.AddChunk(make_pair(int64_t(0), beg1-1), ChunksDownloadStrategy::CHUNK_COMPLETE);
+    strategy.AddChunk(make_pair(int64_t(0), beg1 - 1), ChunksDownloadStrategy::CHUNK_COMPLETE);
     strategy.AddChunk(make_pair(beg1, end1), ChunksDownloadStrategy::CHUNK_FREE);
-    strategy.AddChunk(make_pair(end1+1, beg2-1), ChunksDownloadStrategy::CHUNK_COMPLETE);
+    strategy.AddChunk(make_pair(end1 + 1, beg2 - 1), ChunksDownloadStrategy::CHUNK_COMPLETE);
     strategy.AddChunk(make_pair(beg2, end2), ChunksDownloadStrategy::CHUNK_FREE);
 
     strategy.SaveChunks(kBigFileSize, RESUME_FILENAME);
@@ -591,8 +571,8 @@ UNIT_TEST(DownloadResumeChunks)
   {
     ResumeChecker checker;
     unique_ptr<HttpRequest> const request(HttpRequest::GetFile(urls, FILENAME, kBigFileSize,
-                                                         bind(&ResumeChecker::OnFinish, &checker, _1),
-                                                         bind(&ResumeChecker::OnProgress, &checker, _1)));
+                                                               bind(&ResumeChecker::OnFinish, &checker, _1),
+                                                               bind(&ResumeChecker::OnProgress, &checker, _1)));
     QCoreApplication::exec();
 
     FinishDownloadSuccess(FILENAME);
@@ -611,17 +591,16 @@ UNIT_TEST(DownloadResumeChunksWithCancel)
 
   DownloadObserver observer;
 
-  int arrCancelChunks[] = { 1, 3, 10, 15, 20, 0 };
+  int arrCancelChunks[] = {1, 3, 10, 15, 20, 0};
 
   for (size_t i = 0; i < ARRAY_SIZE(arrCancelChunks); ++i)
   {
     if (arrCancelChunks[i] > 0)
       observer.CancelDownloadOnGivenChunk(arrCancelChunks[i]);
 
-    unique_ptr<HttpRequest> const request(HttpRequest::GetFile(urls, FILENAME, kBigFileSize,
-                            bind(&DownloadObserver::OnDownloadFinish, &observer, _1),
-                            bind(&DownloadObserver::OnDownloadProgress, &observer, _1),
-                            1024, false));
+    unique_ptr<HttpRequest> const request(
+        HttpRequest::GetFile(urls, FILENAME, kBigFileSize, bind(&DownloadObserver::OnDownloadFinish, &observer, _1),
+                             bind(&DownloadObserver::OnDownloadProgress, &observer, _1), 1024, false));
 
     QCoreApplication::exec();
   }
@@ -631,4 +610,4 @@ UNIT_TEST(DownloadResumeChunksWithCancel)
   FinishDownloadSuccess(FILENAME);
 }
 
-}  // namespace downloader_test
\ No newline at end of file
+}  // namespace downloader_test
diff --git a/libs/platform/platform_tests/downloader_utils_tests.cpp b/libs/platform/platform_tests/downloader_utils_tests.cpp
index f2e71b173..5df3f9b00 100644
--- a/libs/platform/platform_tests/downloader_utils_tests.cpp
+++ b/libs/platform/platform_tests/downloader_utils_tests.cpp
@@ -104,11 +104,12 @@ UNIT_TEST(Downloader_ParseMetaConfig)
         "key3": "value3"
       }
     }
-  )")), ());
+  )")),
+       ());
   TEST_EQUAL(cfg->m_serversList.size(), 2, ());
   TEST_EQUAL(cfg->m_serversList[0], "https://url1/", ());
   TEST_EQUAL(cfg->m_serversList[1], "https://url2/", ());
-  TEST_EQUAL(cfg->m_settings.size(), 2, ()); // "key3" is ignored
+  TEST_EQUAL(cfg->m_settings.size(), 2, ());  // "key3" is ignored
   TEST_EQUAL(cfg->m_settings["DonateUrl"], "value1", ());
   TEST_EQUAL(cfg->m_settings["NY"], "value2", ());
 
diff --git a/libs/platform/platform_tests/duration_tests.cpp b/libs/platform/platform_tests/duration_tests.cpp
index 0b7436af5..e02c7259c 100644
--- a/libs/platform/platform_tests/duration_tests.cpp
+++ b/libs/platform/platform_tests/duration_tests.cpp
@@ -19,24 +19,25 @@ struct TestData
     std::string result;
 
     Duration(long days, long hours, long minutes, long seconds, std::string const & result)
-    : m_days(days), m_hours(hours), m_minutes(minutes), m_seconds(seconds), result(result)
+      : m_days(days)
+      , m_hours(hours)
+      , m_minutes(minutes)
+      , m_seconds(seconds)
+      , result(result)
     {}
 
     long Seconds() const
     {
-      return (duration_cast<seconds>(m_days) +
-              duration_cast<seconds>(m_hours) +
-              duration_cast<seconds>(m_minutes) +
-              m_seconds).count();
+      return (duration_cast<seconds>(m_days) + duration_cast<seconds>(m_hours) + duration_cast<seconds>(m_minutes) +
+              m_seconds)
+          .count();
     }
   };
 
   Locale m_locale;
   std::vector<Duration> m_duration;
 
-  constexpr TestData(Locale locale, std::vector<Duration> duration)
-  : m_locale(locale), m_duration(duration)
-  {}
+  constexpr TestData(Locale locale, std::vector<Duration> duration) : m_locale(locale), m_duration(duration) {}
 };
 
 Locale GetLocale(std::string const & language)
@@ -58,26 +59,23 @@ auto const d = Duration::GetUnitsString(Duration::Units::Days);
 UNIT_TEST(Duration_AllUnits)
 {
   TestData const testData[] = {
-    {GetLocale("en"),
-      {
-        {0, 0, 0, 0,     "0" + m},
-        {0, 0, 0, 30,    "0" + m},
-        {0, 0, 0, 59,    "0" + m},
-        {0, 0, 1, 0,     "1" + m},
-        {0, 0, 1, 59,    "1" + m},
-        {0, 0, 60, 0,    "1" + h},
-        {0, 0, 123, 0,   "2" + h + kNonBreakingSpace + "3" + m},
-        {0, 3, 0, 0,     "3" + h},
-        {0, 24, 0, 0,    "1" + d},
-        {4, 0, 0, 0,     "4" + d},
-        {1, 2, 3, 0,     "1" + d + kNonBreakingSpace + "2" + h + kNonBreakingSpace + "3" + m},
-        {1, 0, 15, 0,    "1" + d + kNonBreakingSpace + "15" + m},
-        {0, 15, 1, 0,    "15" + h + kNonBreakingSpace + "1" + m},
-        {1, 15, 0, 0,    "1" + d + kNonBreakingSpace + "15" + h},
-        {15, 0, 10, 0,   "15" + d + kNonBreakingSpace + "10" + m},
-        {15, 15, 15, 0,  "15" + d + kNonBreakingSpace + "15" + h + kNonBreakingSpace + "15" + m}
-      }
-    },
+      {GetLocale("en"),
+       {{0, 0, 0, 0, "0" + m},
+        {0, 0, 0, 30, "0" + m},
+        {0, 0, 0, 59, "0" + m},
+        {0, 0, 1, 0, "1" + m},
+        {0, 0, 1, 59, "1" + m},
+        {0, 0, 60, 0, "1" + h},
+        {0, 0, 123, 0, "2" + h + kNonBreakingSpace + "3" + m},
+        {0, 3, 0, 0, "3" + h},
+        {0, 24, 0, 0, "1" + d},
+        {4, 0, 0, 0, "4" + d},
+        {1, 2, 3, 0, "1" + d + kNonBreakingSpace + "2" + h + kNonBreakingSpace + "3" + m},
+        {1, 0, 15, 0, "1" + d + kNonBreakingSpace + "15" + m},
+        {0, 15, 1, 0, "15" + h + kNonBreakingSpace + "1" + m},
+        {1, 15, 0, 0, "1" + d + kNonBreakingSpace + "15" + h},
+        {15, 0, 10, 0, "15" + d + kNonBreakingSpace + "10" + m},
+        {15, 15, 15, 0, "15" + d + kNonBreakingSpace + "15" + h + kNonBreakingSpace + "15" + m}}},
   };
 
   for (auto const & data : testData)
@@ -85,7 +83,8 @@ UNIT_TEST(Duration_AllUnits)
     for (auto const & dataDuration : data.m_duration)
     {
       auto const duration = Duration(dataDuration.Seconds());
-      auto durationStr = duration.GetLocalizedString({Duration::Units::Days, Duration::Units::Hours, Duration::Units::Minutes}, data.m_locale);
+      auto durationStr = duration.GetLocalizedString(
+          {Duration::Units::Days, Duration::Units::Hours, Duration::Units::Minutes}, data.m_locale);
       TEST_EQUAL(durationStr, dataDuration.result, ());
     }
   }
@@ -94,19 +93,24 @@ UNIT_TEST(Duration_AllUnits)
 UNIT_TEST(Duration_Localization)
 {
   TestData const testData[] = {
-    // en
-    {GetLocale("en"), {{1, 2, 3, 0,  "1" + d + kNonBreakingSpace + "2" + h + kNonBreakingSpace + "3" + m}}},
-    // ru (narrow spacing between number and unit)
-    {GetLocale("ru"), {{1, 2, 3, 0, "1" + kNarrowNonBreakingSpace + d + kNonBreakingSpace + "2" + kNarrowNonBreakingSpace + h + kNonBreakingSpace + "3" + kNarrowNonBreakingSpace + m}}},
-    // zh (no spacings)
-    {GetLocale("zh"), {{1, 2, 3, 0, "1" + d + "2" + h + "3" + m}}}
-  };
+      // en
+      {GetLocale("en"), {{1, 2, 3, 0, "1" + d + kNonBreakingSpace + "2" + h + kNonBreakingSpace + "3" + m}}},
+      // ru (narrow spacing between number and unit)
+      {GetLocale("ru"),
+       {{1, 2, 3, 0,
+         "1" + kNarrowNonBreakingSpace + d + kNonBreakingSpace + "2" + kNarrowNonBreakingSpace + h + kNonBreakingSpace +
+             "3" + kNarrowNonBreakingSpace + m}}},
+      // zh (no spacings)
+      {GetLocale("zh"), {{1, 2, 3, 0, "1" + d + "2" + h + "3" + m}}}};
 
   for (auto const & data : testData)
   {
     for (auto const & duration : data.m_duration)
     {
-      auto const durationStr = Duration(duration.Seconds()).GetLocalizedString({Duration::Units::Days, Duration::Units::Hours, Duration::Units::Minutes}, data.m_locale);
+      auto const durationStr =
+          Duration(duration.Seconds())
+              .GetLocalizedString({Duration::Units::Days, Duration::Units::Hours, Duration::Units::Minutes},
+                                  data.m_locale);
       TEST_EQUAL(durationStr, duration.result, ());
     }
   }
diff --git a/libs/platform/platform_tests/jansson_test.cpp b/libs/platform/platform_tests/jansson_test.cpp
index 6453fcc28..826d97a68 100644
--- a/libs/platform/platform_tests/jansson_test.cpp
+++ b/libs/platform/platform_tests/jansson_test.cpp
@@ -6,10 +6,11 @@ UNIT_TEST(Jansson_Smoke)
 {
   char * savedLocale = setlocale(LC_NUMERIC, "C");
 
-//  char const * str = "{\"location\":{\"latitude\":47.383333,\"longitude\":8.533333,"
-//      "\"accuracy\":18000.0},\"access_token\":\"2:6aOjM2IAoPMaweWN:txhu5LpkRkLVb3u3\"}";
+  //  char const * str = "{\"location\":{\"latitude\":47.383333,\"longitude\":8.533333,"
+  //      "\"accuracy\":18000.0},\"access_token\":\"2:6aOjM2IAoPMaweWN:txhu5LpkRkLVb3u3\"}";
 
-  char const * str = "{\"location\":{\"latitude\":47.3345141,\"longitude\":8.5312839,"
+  char const * str =
+      "{\"location\":{\"latitude\":47.3345141,\"longitude\":8.5312839,"
       "\"accuracy\":22.0},\"access_token\":\"2:vC65Xv0mxMtsNVf4:hY5YSIkuFfnAU77z\"}";
 
   base::Json root(str);
diff --git a/libs/platform/platform_tests/language_test.cpp b/libs/platform/platform_tests/language_test.cpp
index e176b7a5c..257901164 100644
--- a/libs/platform/platform_tests/language_test.cpp
+++ b/libs/platform/platform_tests/language_test.cpp
@@ -9,8 +9,8 @@
 
 UNIT_TEST(LangNormalize_Smoke)
 {
-  char const * arr1[] = { "en", "en-GB", "zh", "es-SP", "zh-penyn", "en-US", "ru_RU", "es" };
-  char const * arr2[] = { "en", "en", "zh", "es", "zh", "en", "ru", "es" };
+  char const * arr1[] = {"en", "en-GB", "zh", "es-SP", "zh-penyn", "en-US", "ru_RU", "es"};
+  char const * arr2[] = {"en", "en", "zh", "es", "zh", "en", "ru", "es"};
   static_assert(ARRAY_SIZE(arr1) == ARRAY_SIZE(arr2), "");
 
   for (size_t i = 0; i < ARRAY_SIZE(arr1); ++i)
diff --git a/libs/platform/platform_tests/local_country_file_tests.cpp b/libs/platform/platform_tests/local_country_file_tests.cpp
index 4a91de8d5..c77c9373f 100644
--- a/libs/platform/platform_tests/local_country_file_tests.cpp
+++ b/libs/platform/platform_tests/local_country_file_tests.cpp
@@ -141,8 +141,8 @@ UNIT_TEST(LocalCountryFile_CleanupMapFiles)
   TEST(dir4.Exists(), ());
 
   // Useless CountryIndexes::DeleteFromDisk calls are removed.
-  //TEST(!absentCountryIndexesDir.Exists(), ("Indexes for absent country weren't deleted."));
-  //absentCountryIndexesDir.Reset();
+  // TEST(!absentCountryIndexesDir.Exists(), ("Indexes for absent country weren't deleted."));
+  // absentCountryIndexesDir.Reset();
 
   TEST(irelandIndexesDir.Exists(), ());
 }
@@ -150,10 +150,7 @@ UNIT_TEST(LocalCountryFile_CleanupMapFiles)
 UNIT_TEST(LocalCountryFile_CleanupPartiallyDownloadedFiles)
 {
   ScopedDir dataDir("101008");
-  auto const DataFilePath = [&dataDir](char const * file)
-  {
-    return dataDir.GetRelativePath() + "/" + file;
-  };
+  auto const DataFilePath = [&dataDir](char const * file) { return dataDir.GetRelativePath() + "/" + file; };
 
   ScopedDir oldDir("101009");
   ScopedDir latestDir("101010");
@@ -163,15 +160,13 @@ UNIT_TEST(LocalCountryFile_CleanupPartiallyDownloadedFiles)
       {DataFilePath("Netherlands.mwm.routing.downloading2"), ScopedFile::Mode::Create},
       {DataFilePath("Germany.mwm.ready3"), ScopedFile::Mode::Create},
       {DataFilePath("UK_England.mwm.resume4"), ScopedFile::Mode::Create},
-      {base::JoinPath(oldDir.GetRelativePath(), "Russia_Central.mwm.downloading"),
-       ScopedFile::Mode::Create}};
+      {base::JoinPath(oldDir.GetRelativePath(), "Russia_Central.mwm.downloading"), ScopedFile::Mode::Create}};
 
   ScopedFile toBeKept[] = {
       {DataFilePath("Italy.mwm"), ScopedFile::Mode::Create},
       {DataFilePath("Spain.mwm"), ScopedFile::Mode::Create},
       {DataFilePath("Spain.mwm.routing"), ScopedFile::Mode::Create},
-      {base::JoinPath(latestDir.GetRelativePath(), "Russia_Southern.mwm.downloading"),
-       ScopedFile::Mode::Create}};
+      {base::JoinPath(latestDir.GetRelativePath(), "Russia_Southern.mwm.downloading"), ScopedFile::Mode::Create}};
 
   CleanupMapsDirectory(101010 /* latestVersion */);
 
@@ -208,8 +203,8 @@ UNIT_TEST(LocalCountryFile_DirectoryLookup)
   ScopedFile testNetherlandsMapFile(testDir, netherlandsFile, MapFileType::Map);
 
   vector<LocalCountryFile> localFiles;
-  FindAllLocalMapsInDirectoryAndCleanup(testDir.GetFullPath(), 150309 /* version */,
-                                        -1 /* latestVersion */, localFiles);
+  FindAllLocalMapsInDirectoryAndCleanup(testDir.GetFullPath(), 150309 /* version */, -1 /* latestVersion */,
+                                        localFiles);
   sort(localFiles.begin(), localFiles.end());
   for (LocalCountryFile & localFile : localFiles)
     localFile.SyncWithDisk();
@@ -272,8 +267,7 @@ UNIT_TEST(LocalCountryFile_PreparePlaceForCountryFiles)
 
   CountryFile italyFile("Italy");
   LocalCountryFile expectedItalyFile(platform.WritableDir(), italyFile, 0 /* version */);
-  shared_ptr<LocalCountryFile> italyLocalFile =
-      PreparePlaceForCountryFiles(0 /* version */, italyFile);
+  shared_ptr<LocalCountryFile> italyLocalFile = PreparePlaceForCountryFiles(0 /* version */, italyFile);
   TEST(italyLocalFile.get(), ());
   TEST_EQUAL(expectedItalyFile, *italyLocalFile, ());
 
@@ -281,15 +275,13 @@ UNIT_TEST(LocalCountryFile_PreparePlaceForCountryFiles)
 
   CountryFile germanyFile("Germany");
   LocalCountryFile expectedGermanyFile(directoryForV1.GetFullPath(), germanyFile, 1 /* version */);
-  shared_ptr<LocalCountryFile> germanyLocalFile =
-      PreparePlaceForCountryFiles(1 /* version */, germanyFile);
+  shared_ptr<LocalCountryFile> germanyLocalFile = PreparePlaceForCountryFiles(1 /* version */, germanyFile);
   TEST(germanyLocalFile.get(), ());
   TEST_EQUAL(expectedGermanyFile, *germanyLocalFile, ());
 
   CountryFile franceFile("France");
   LocalCountryFile expectedFranceFile(directoryForV1.GetFullPath(), franceFile, 1 /* version */);
-  shared_ptr<LocalCountryFile> franceLocalFile =
-      PreparePlaceForCountryFiles(1 /* version */, franceFile);
+  shared_ptr<LocalCountryFile> franceLocalFile = PreparePlaceForCountryFiles(1 /* version */, franceFile);
   TEST(franceLocalFile.get(), ());
   TEST_EQUAL(expectedFranceFile, *franceLocalFile, ());
 }
@@ -313,8 +305,7 @@ UNIT_TEST(LocalCountryFile_CountryIndexes)
   }
   TEST(Platform::IsFileExistsByFullPath(bitsPath), (bitsPath));
 
-  TEST(CountryIndexes::DeleteFromDisk(germanyLocalFile),
-       ("Can't delete indexes for:", germanyLocalFile));
+  TEST(CountryIndexes::DeleteFromDisk(germanyLocalFile), ("Can't delete indexes for:", germanyLocalFile));
 
   TEST(!Platform::IsFileExistsByFullPath(bitsPath), (bitsPath));
 }
@@ -329,19 +320,16 @@ UNIT_TEST(LocalCountryFile_DoNotDeleteUserFiles)
   LocalCountryFile germanyLocalFile(testDir.GetFullPath(), germanyFile, 101010 /* version */);
   CountryIndexes::PreparePlaceOnDisk(germanyLocalFile);
 
-  string const userFilePath =
-      base::JoinPath(CountryIndexes::IndexesDir(germanyLocalFile), "user-data.txt");
+  string const userFilePath = base::JoinPath(CountryIndexes::IndexesDir(germanyLocalFile), "user-data.txt");
   {
     FileWriter writer(userFilePath);
     string const data = "user data";
     writer.Write(data.data(), data.size());
   }
-  TEST(!CountryIndexes::DeleteFromDisk(germanyLocalFile),
-       ("Indexes dir should not be deleted for:", germanyLocalFile));
+  TEST(!CountryIndexes::DeleteFromDisk(germanyLocalFile), ("Indexes dir should not be deleted for:", germanyLocalFile));
 
   TEST(base::DeleteFileX(userFilePath), ("Can't delete test file:", userFilePath));
-  TEST(CountryIndexes::DeleteFromDisk(germanyLocalFile),
-       ("Can't delete indexes for:", germanyLocalFile));
+  TEST(CountryIndexes::DeleteFromDisk(germanyLocalFile), ("Can't delete indexes for:", germanyLocalFile));
 }
 
 UNIT_TEST(LocalCountryFile_MakeTemporary)
@@ -351,4 +339,4 @@ UNIT_TEST(LocalCountryFile_MakeTemporary)
   TEST_EQUAL(file.GetPath(MapFileType::Map), path, ());
 }
 
-} // local_country_file_tests
+}  // namespace local_country_file_tests
diff --git a/libs/platform/platform_tests/location_test.cpp b/libs/platform/platform_tests/location_test.cpp
index f2a1c3b53..ded07ac03 100644
--- a/libs/platform/platform_tests/location_test.cpp
+++ b/libs/platform/platform_tests/location_test.cpp
@@ -2,7 +2,6 @@
 
 #include "platform/location.hpp"
 
-
 UNIT_TEST(IsLatValid)
 {
   TEST(location::IsLatValid(35.), ());
diff --git a/libs/platform/platform_tests/measurement_tests.cpp b/libs/platform/platform_tests/measurement_tests.cpp
index 7f8a4783c..a1b1699fc 100644
--- a/libs/platform/platform_tests/measurement_tests.cpp
+++ b/libs/platform/platform_tests/measurement_tests.cpp
@@ -15,8 +15,8 @@ std::string AddGroupingSeparators(std::string const & valueString, std::string c
   std::string out(valueString);
 
   if (out.size() > 4 && !groupingSeparator.empty())
-      for (int pos = out.size() - 3; pos > 0; pos -= 3)
-        out.insert(pos, groupingSeparator);
+    for (int pos = out.size() - 3; pos > 0; pos -= 3)
+      out.insert(pos, groupingSeparator);
 
   return out;
 }
@@ -160,13 +160,11 @@ UNIT_TEST(ToStringPrecisionLocale)
     std::string d1String;
   };
 
-  TestData testData[] = {
-          // Locale name ,   Decimal
-          { "en_US.UTF-8",   "9.8"},
-          { "es_ES.UTF-8",   "9,8"},
-          { "fr_FR.UTF-8",   "9,8"},
-          { "ru_RU.UTF-8",   "9,8"}
-  };
+  TestData testData[] = {// Locale name ,   Decimal
+                         {"en_US.UTF-8", "9.8"},
+                         {"es_ES.UTF-8", "9,8"},
+                         {"fr_FR.UTF-8", "9,8"},
+                         {"ru_RU.UTF-8", "9,8"}};
 
   for (TestData const & data : testData)
   {
diff --git a/libs/platform/platform_tests/platform_test.cpp b/libs/platform/platform_tests/platform_test.cpp
index e9d4dd6ae..04d1dd9cc 100644
--- a/libs/platform/platform_tests/platform_test.cpp
+++ b/libs/platform/platform_tests/platform_test.cpp
@@ -67,11 +67,7 @@ UNIT_TEST(WritablePathForFile)
 UNIT_TEST(GetReader)
 {
   char const * NON_EXISTING_FILE = "mgbwuerhsnmbui45efhdbn34.tmp";
-  char const * arr[] = {
-    "symbols/mdpi/light/symbols.sdf",
-    "classificator.txt",
-    "minsk-pass.mwm"
-  };
+  char const * arr[] = {"symbols/mdpi/light/symbols.sdf", "classificator.txt", "minsk-pass.mwm"};
 
   Platform & p = GetPlatform();
   for (size_t i = 0; i < ARRAY_SIZE(arr); ++i)
@@ -155,26 +151,26 @@ UNIT_TEST(GetFilesByType)
   SCOPE_GUARD(removeTestFile, bind(FileWriter::DeleteFileX, testFile));
 
   CheckFilesPresence(baseDir, Platform::EFileType::Directory,
-  {{
-     kTestDirBaseName, 1 /* present */
-   },
-   {
-     kTestFileBaseName, 0 /* not present */
-   }});
+                     {{
+                          kTestDirBaseName, 1 /* present */
+                      },
+                      {
+                          kTestFileBaseName, 0 /* not present */
+                      }});
   CheckFilesPresence(baseDir, Platform::EFileType::Regular,
-  {{
-     kTestDirBaseName, 0 /* not present */
-   },
-   {
-     kTestFileBaseName, 1 /* present */
-   }});
+                     {{
+                          kTestDirBaseName, 0 /* not present */
+                      },
+                      {
+                          kTestFileBaseName, 1 /* present */
+                      }});
   CheckFilesPresence(baseDir, Platform::EFileType::Directory | Platform::EFileType::Regular,
-  {{
-     kTestDirBaseName, 1 /* present */
-   },
-   {
-     kTestFileBaseName, 1 /* present */
-   }});
+                     {{
+                          kTestDirBaseName, 1 /* present */
+                      },
+                      {
+                          kTestFileBaseName, 1 /* present */
+                      }});
 }
 
 UNIT_TEST(GetFileSize)
@@ -261,9 +257,10 @@ UNIT_TEST(MkDirRecursively)
   using namespace platform::tests_support;
   auto const writablePath = GetPlatform().WritableDir();
   auto const workPath = base::JoinPath(writablePath, "MkDirRecursively");
-  auto const resetDir =  [](std::string const & path) {
+  auto const resetDir = [](std::string const & path)
+  {
     if (Platform::IsFileExistsByFullPath(path) && !Platform::RmDirRecursively(path))
-       return false;
+      return false;
 
     return Platform::MkDirChecked(path);
   };
diff --git a/libs/platform/platform_tests/products_tests.cpp b/libs/platform/platform_tests/products_tests.cpp
index 25382932e..38bb2ee26 100644
--- a/libs/platform/platform_tests/products_tests.cpp
+++ b/libs/platform/platform_tests/products_tests.cpp
@@ -104,4 +104,3 @@ UNIT_TEST(ProductsConfig_MissedProductsField)
   auto const result = ProductsConfig::Parse(jsonStr);
   TEST(!result.has_value(), ());
 }
-
diff --git a/libs/platform/platform_tests/utm_mgrs_utils_tests.cpp b/libs/platform/platform_tests/utm_mgrs_utils_tests.cpp
index 0d892ec60..5f8508099 100644
--- a/libs/platform/platform_tests/utm_mgrs_utils_tests.cpp
+++ b/libs/platform/platform_tests/utm_mgrs_utils_tests.cpp
@@ -22,7 +22,7 @@ UNIT_TEST(FormatUTM)
   TEST_EQUAL(FormatUTM(56.79680, -5.00601), "30V 377486 6296562", ());
   TEST_EQUAL(FormatUTM(84, -5.00601), "30X 476594 9328501", ());
 
-  TEST_EQUAL(FormatUTM(84.644103, 3.000009), "", ()); // Latitude limit exceeded.
+  TEST_EQUAL(FormatUTM(84.644103, 3.000009), "", ());  // Latitude limit exceeded.
   TEST_EQUAL(FormatUTM(12.016469, 188.0), "", ());
 }
 
@@ -37,8 +37,8 @@ UNIT_TEST(FormatMGRS)
   TEST_EQUAL(FormatMGRS(36.2361322, -115.0820944, 2), "11S PA 72 11", ());
   TEST_EQUAL(FormatMGRS(36.2361322, -115.0820944, 1), "11S PA 7 1", ());
 
-  TEST_EQUAL(FormatMGRS(84.644103, 3.000009, 5), "", ()); // Some converters generate string "Z AB 31142 05767"
-  TEST_EQUAL(FormatMGRS(-81.016469, 8.745519, 5), "", ()); // Some converters generate string "B BX 51947 87732"
+  TEST_EQUAL(FormatMGRS(84.644103, 3.000009, 5), "", ());   // Some converters generate string "Z AB 31142 05767"
+  TEST_EQUAL(FormatMGRS(-81.016469, 8.745519, 5), "", ());  // Some converters generate string "B BX 51947 87732"
   TEST_EQUAL(FormatMGRS(12.016469, 188.0, 2), "", ());
 
   // Test data from https://s3.amazonaws.com/mgrs.io/mgrsToGeo_WE.txt
diff --git a/libs/platform/platform_tests_support/async_gui_thread.hpp b/libs/platform/platform_tests_support/async_gui_thread.hpp
index 0e94b3328..ab747db74 100644
--- a/libs/platform/platform_tests_support/async_gui_thread.hpp
+++ b/libs/platform/platform_tests_support/async_gui_thread.hpp
@@ -16,14 +16,11 @@ class AsyncGuiThread
 public:
   AsyncGuiThread()
   {
-    GetPlatform().SetGuiThread(std::make_unique<base::DelayedThreadPool>(
-        1 /* threadsCount */, base::DelayedThreadPool::Exit::ExecPending));
+    GetPlatform().SetGuiThread(
+        std::make_unique<base::DelayedThreadPool>(1 /* threadsCount */, base::DelayedThreadPool::Exit::ExecPending));
   }
 
-  virtual ~AsyncGuiThread()
-  {
-    GetPlatform().SetGuiThread(std::make_unique<platform::GuiThread>());
-  }
+  virtual ~AsyncGuiThread() { GetPlatform().SetGuiThread(std::make_unique<platform::GuiThread>()); }
 
 private:
   Platform::ThreadRunner m_runner;
diff --git a/libs/platform/platform_tests_support/scoped_dir.cpp b/libs/platform/platform_tests_support/scoped_dir.cpp
index 4ef5990a8..5538fbc93 100644
--- a/libs/platform/platform_tests_support/scoped_dir.cpp
+++ b/libs/platform/platform_tests_support/scoped_dir.cpp
@@ -19,23 +19,19 @@ ScopedDir::ScopedDir(std::string const & relativePath)
   Platform::EError ret = Platform::MkDir(GetFullPath());
   switch (ret)
   {
-    case Platform::ERR_OK:
-      break;
-    case Platform::ERR_FILE_ALREADY_EXISTS:
-      Platform::EFileType type;
-      TEST_EQUAL(Platform::ERR_OK, Platform::GetFileType(GetFullPath(), type), ());
-      TEST_EQUAL(Platform::EFileType::Directory, type, ());
-      break;
-    default:
-      TEST(false, ("Can't create directory:", GetFullPath(), "error:", ret));
-      break;
+  case Platform::ERR_OK: break;
+  case Platform::ERR_FILE_ALREADY_EXISTS:
+    Platform::EFileType type;
+    TEST_EQUAL(Platform::ERR_OK, Platform::GetFileType(GetFullPath(), type), ());
+    TEST_EQUAL(Platform::EFileType::Directory, type, ());
+    break;
+  default: TEST(false, ("Can't create directory:", GetFullPath(), "error:", ret)); break;
   }
 }
 
 ScopedDir::ScopedDir(ScopedDir const & parent, std::string const & name)
   : ScopedDir(base::JoinPath(parent.GetRelativePath(), name))
-{
-}
+{}
 
 ScopedDir::~ScopedDir()
 {
@@ -46,17 +42,12 @@ ScopedDir::~ScopedDir()
   Platform::EError ret = Platform::RmDir(fullPath);
   switch (ret)
   {
-    case Platform::ERR_OK:
-      break;
-    case Platform::ERR_FILE_DOES_NOT_EXIST:
-      LOG(LERROR, (fullPath, "was deleted before destruction of ScopedDir."));
-      break;
-    case Platform::ERR_DIRECTORY_NOT_EMPTY:
-      LOG(LERROR, ("There are files in", fullPath));
-      break;
-    default:
-      LOG(LERROR, ("Platform::RmDir() error for", fullPath, ":", ret));
-      break;
+  case Platform::ERR_OK: break;
+  case Platform::ERR_FILE_DOES_NOT_EXIST:
+    LOG(LERROR, (fullPath, "was deleted before destruction of ScopedDir."));
+    break;
+  case Platform::ERR_DIRECTORY_NOT_EMPTY: LOG(LERROR, ("There are files in", fullPath)); break;
+  default: LOG(LERROR, ("Platform::RmDir() error for", fullPath, ":", ret)); break;
   }
 }
 
diff --git a/libs/platform/platform_tests_support/scoped_file.cpp b/libs/platform/platform_tests_support/scoped_file.cpp
index 9249b11ac..358f7afba 100644
--- a/libs/platform/platform_tests_support/scoped_file.cpp
+++ b/libs/platform/platform_tests_support/scoped_file.cpp
@@ -20,20 +20,16 @@ namespace platform
 {
 namespace tests_support
 {
-ScopedFile::ScopedFile(std::string const & relativePath, Mode mode)
-  : ScopedFile(relativePath, {} /* contents */, mode)
-{
-}
+ScopedFile::ScopedFile(std::string const & relativePath, Mode mode) : ScopedFile(relativePath, {} /* contents */, mode)
+{}
 
 ScopedFile::ScopedFile(std::string const & relativePath, std::string const & contents)
   : ScopedFile(relativePath, contents, Mode::Create)
-{
-}
+{}
 
 ScopedFile::ScopedFile(ScopedDir const & dir, CountryFile const & countryFile, MapFileType type)
-: ScopedFile(base::JoinPath(dir.GetRelativePath(), countryFile.GetFileName(type)), Mode::Create)
-{
-}
+  : ScopedFile(base::JoinPath(dir.GetRelativePath(), countryFile.GetFileName(type)), Mode::Create)
+{}
 
 ScopedFile::ScopedFile(std::string const & relativePath, std::string const & contents, Mode mode)
   : m_fullPath(base::JoinPath(GetPlatform().WritableDir(), relativePath))
diff --git a/libs/platform/platform_tests_support/scoped_mwm.cpp b/libs/platform/platform_tests_support/scoped_mwm.cpp
index 2d4dde693..f4ab90991 100644
--- a/libs/platform/platform_tests_support/scoped_mwm.cpp
+++ b/libs/platform/platform_tests_support/scoped_mwm.cpp
@@ -37,4 +37,4 @@ ScopedMwm::ScopedMwm(std::string const & relativePath) : m_file(relativePath, Sc
   }
 }
 }  // namespace tests_support
-}  // namespace platfotm
+}  // namespace platform
diff --git a/libs/platform/platform_tests_support/test_socket.cpp b/libs/platform/platform_tests_support/test_socket.cpp
index 0996e7e16..e6f913c02 100644
--- a/libs/platform/platform_tests_support/test_socket.cpp
+++ b/libs/platform/platform_tests_support/test_socket.cpp
@@ -12,7 +12,10 @@ namespace platform
 {
 namespace tests_support
 {
-TestSocket::~TestSocket() { m_isConnected = false; }
+TestSocket::~TestSocket()
+{
+  m_isConnected = false;
+}
 
 bool TestSocket::Open(string const & host, uint16_t port)
 {
@@ -23,7 +26,10 @@ bool TestSocket::Open(string const & host, uint16_t port)
   return true;
 }
 
-void TestSocket::Close() { m_isConnected = false; }
+void TestSocket::Close()
+{
+  m_isConnected = false;
+}
 
 bool TestSocket::Read(uint8_t * data, uint32_t count)
 {
@@ -54,12 +60,14 @@ bool TestSocket::Write(uint8_t const * data, uint32_t count)
   return true;
 }
 
-void TestSocket::SetTimeout(uint32_t milliseconds) { m_timeoutMs = milliseconds; }
+void TestSocket::SetTimeout(uint32_t milliseconds)
+{
+  m_timeoutMs = milliseconds;
+}
 size_t TestSocket::ReadServer(vector<uint8_t> & destination)
 {
   unique_lock<mutex> lock(m_outputMutex);
-  m_outputCondition.wait_for(lock, milliseconds(m_timeoutMs),
-                             [this]() { return !m_output.empty(); });
+  m_outputCondition.wait_for(lock, milliseconds(m_timeoutMs), [this]() { return !m_output.empty(); });
 
   size_t const outputSize = m_output.size();
   destination.insert(destination.end(), m_output.begin(), m_output.end());
diff --git a/libs/platform/platform_tests_support/writable_dir_changer.hpp b/libs/platform/platform_tests_support/writable_dir_changer.hpp
index 654f88210..f13027f17 100644
--- a/libs/platform/platform_tests_support/writable_dir_changer.hpp
+++ b/libs/platform/platform_tests_support/writable_dir_changer.hpp
@@ -7,11 +7,11 @@ class WritableDirChanger
 public:
   enum class SettingsDirPolicy
   {
-    UseDefault, UseWritableDir
+    UseDefault,
+    UseWritableDir
   };
 
-  WritableDirChanger(std::string const & testDir,
-                     SettingsDirPolicy settingsDirPolicy = SettingsDirPolicy::UseDefault);
+  WritableDirChanger(std::string const & testDir, SettingsDirPolicy settingsDirPolicy = SettingsDirPolicy::UseDefault);
   ~WritableDirChanger();
 
 private:
diff --git a/libs/platform/platform_unix_impl.cpp b/libs/platform/platform_unix_impl.cpp
index c5ac6b584..3e49650dc 100644
--- a/libs/platform/platform_unix_impl.cpp
+++ b/libs/platform/platform_unix_impl.cpp
@@ -1,5 +1,5 @@
-#include "platform/platform.hpp"
 #include "platform/platform_unix_impl.hpp"
+#include "platform/platform.hpp"
 
 #include "base/file_name_utils.hpp"
 #include "base/logging.hpp"
@@ -11,14 +11,14 @@
 #include <regex>
 
 #include <dirent.h>
-#include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>
 
 #if defined(OMIM_OS_MAC) || defined(OMIM_OS_IPHONE)
-  #include <sys/mount.h>
+#include <sys/mount.h>
 #else
-  #include <sys/vfs.h>
+#include <sys/vfs.h>
 #endif
 
 using namespace std;
@@ -66,7 +66,7 @@ bool Platform::IsFileExistsByFullPath(string const & filePath)
 }
 
 #if !defined(OMIM_OS_IPHONE)
-//static
+// static
 void Platform::DisableBackupForFile(string const & /*filePath*/) {}
 #endif
 
@@ -106,7 +106,8 @@ bool Platform::GetFileSizeByFullPath(string const & filePath, uint64_t & size)
     size = s.st_size;
     return true;
   }
-  else return false;
+  else
+    return false;
 }
 
 Platform::TStorageStatus Platform::GetWritableStorageStatus(uint64_t neededSize) const
@@ -114,9 +115,7 @@ Platform::TStorageStatus Platform::GetWritableStorageStatus(uint64_t neededSize)
   struct statfs st;
   int const ret = statfs(m_writableDir.c_str(), &st);
 
-  LOG(LINFO, ("statfs return =", ret,
-               "; block size =", st.f_bsize,
-               "; blocks available =", st.f_bavail));
+  LOG(LINFO, ("statfs return =", ret, "; block size =", st.f_bsize, "; blocks available =", st.f_bavail));
 
   if (ret != 0)
   {
diff --git a/libs/platform/platform_unix_impl.hpp b/libs/platform/platform_unix_impl.hpp
index f3651a428..05703c7d8 100644
--- a/libs/platform/platform_unix_impl.hpp
+++ b/libs/platform/platform_unix_impl.hpp
@@ -8,6 +8,5 @@ namespace pl
 {
 void EnumerateFiles(std::string const & directory, std::function<void(char const *)> const & fn);
 
-void EnumerateFilesByRegExp(std::string const & directory, std::string const & regexp,
-                            std::vector<std::string> & res);
+void EnumerateFilesByRegExp(std::string const & directory, std::string const & regexp, std::vector<std::string> & res);
 }  // namespace pl
diff --git a/libs/platform/platform_win.cpp b/libs/platform/platform_win.cpp
index ee95d9109..e1fa2fcb9 100644
--- a/libs/platform/platform_win.cpp
+++ b/libs/platform/platform_win.cpp
@@ -2,8 +2,8 @@
 #include "platform/socket.hpp"
 
 #include "base/file_name_utils.hpp"
-#include "base/scope_guard.hpp"
 #include "base/logging.hpp"
+#include "base/scope_guard.hpp"
 
 #include "coding/file_writer.hpp"
 
@@ -52,7 +52,7 @@ std::unique_ptr<Socket> CreateSocket()
 {
   return std::unique_ptr<Socket>();
 }
-} // namespace platform
+}  // namespace platform
 
 Platform::Platform()
 {
@@ -111,7 +111,7 @@ bool Platform::IsFileExistsByFullPath(string const & filePath)
   return ::GetFileAttributesA(filePath.c_str()) != INVALID_FILE_ATTRIBUTES;
 }
 
-//static
+// static
 void Platform::DisableBackupForFile(string const & filePath) {}
 
 // static
@@ -196,7 +196,8 @@ bool Platform::IsDirectoryEmpty(string const & directory)
 
 bool Platform::GetFileSizeByFullPath(string const & filePath, uint64_t & size)
 {
-  HANDLE hFile = CreateFileA(filePath.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+  HANDLE hFile =
+      CreateFileA(filePath.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
   if (hFile != INVALID_HANDLE_VALUE)
   {
     SCOPE_GUARD(autoClose, bind(&CloseHandle, hFile));
@@ -212,7 +213,11 @@ bool Platform::GetFileSizeByFullPath(string const & filePath, uint64_t & size)
 
 namespace
 {
-enum class FileTimeType { Creation, Modification };
+enum class FileTimeType
+{
+  Creation,
+  Modification
+};
 time_t GetFileTime(std::string const & path, FileTimeType fileTimeType)
 {
   HANDLE hFile = CreateFileA(path.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
@@ -227,12 +232,8 @@ time_t GetFileTime(std::string const & path, FileTimeType fileTimeType)
 
   switch (fileTimeType)
   {
-  case FileTimeType::Creation:
-    ftCreate = &ft;
-    break;
-  case FileTimeType::Modification:
-    ftLastWrite = &ft;
-    break;
+  case FileTimeType::Creation: ftCreate = &ft; break;
+  case FileTimeType::Modification: ftLastWrite = &ft; break;
   }
 
   if (!GetFileTime(hFile, ftCreate, nullptr, ftLastWrite))
@@ -243,7 +244,7 @@ time_t GetFileTime(std::string const & path, FileTimeType fileTimeType)
   ull.HighPart = ft.dwHighDateTime;
   return static_cast<time_t>(ull.QuadPart / 10000000ULL - 11644473600ULL);
 }
-}
+}  // namespace
 
 // static
 time_t Platform::GetFileCreationTime(std::string const & path)
@@ -257,6 +258,4 @@ time_t Platform::GetFileModificationTime(std::string const & path)
   return GetFileTime(path, FileTimeType::Modification);
 }
 
-void Platform::GetSystemFontNames(FilesList & res) const
-{
-}
+void Platform::GetSystemFontNames(FilesList & res) const {}
diff --git a/libs/platform/preferred_languages.cpp b/libs/platform/preferred_languages.cpp
index b4fe417f0..a2c28d73b 100644
--- a/libs/platform/preferred_languages.cpp
+++ b/libs/platform/preferred_languages.cpp
@@ -14,19 +14,19 @@
 #include <string>
 
 #if defined(OMIM_OS_MAC) || defined(OMIM_OS_IPHONE)
-  #include <CoreFoundation/CFLocale.h>
-  #include <CoreFoundation/CFString.h>
+#include <CoreFoundation/CFLocale.h>
+#include <CoreFoundation/CFString.h>
 #elif defined(OMIM_OS_WINDOWS)
-  #include "std/windows.hpp"
-  // for XP it's not defined
-  #define MUI_LANGUAGE_NAME 0x8
+#include "std/windows.hpp"
+// for XP it's not defined
+#define MUI_LANGUAGE_NAME 0x8
 #elif defined(OMIM_OS_LINUX)
-  #include <cstdlib>
+#include <cstdlib>
 #elif defined(OMIM_OS_ANDROID)
-  /// Body for this function is inside android/sdk/src/main/cpp sources
-  std::string GetAndroidSystemLanguage();
+/// Body for this function is inside android/sdk/src/main/cpp sources
+std::string GetAndroidSystemLanguage();
 #else
-  #error "Define language preferences for your platform"
+#error "Define language preferences for your platform"
 #endif
 
 #ifdef OMIM_OS_WINDOWS
@@ -37,7 +37,399 @@ struct MSLocale
 };
 /// Used on Windows XP which lacks LCIDToLocaleName function
 /// Taken from MSDN: http://msdn.microsoft.com/en-us/library/cc233968(v=PROT.10).aspx
-static const MSLocale gLocales[] = {{0x1,"ar"},{0x2,"bg"},{0x3,"ca"},{0x4,"zh-Hans"},{0x5,"cs"},{0x6,"da"},{0x7,"de"},{0x8,"el"},{0x9,"en"},{0xa,"es"},{0xb,"fi"},{0xc,"fr"},{0xd,"he"},{0xe,"hu"},{0xf,"is"},{0x10,"it"},{0x11,"ja"},{0x12,"ko"},{0x13,"nl"},{0x14,"no"},{0x15,"pl"},{0x16,"pt"},{0x17,"rm"},{0x18,"ro"},{0x19,"ru"},{0x1a,"hr"},{0x1b,"sk"},{0x1c,"sq"},{0x1d,"sv"},{0x1e,"th"},{0x1f,"tr"},{0x20,"ur"},{0x21,"id"},{0x22,"uk"},{0x23,"be"},{0x24,"sl"},{0x25,"et"},{0x26,"lv"},{0x27,"lt"},{0x28,"tg"},{0x29,"fa"},{0x2a,"vi"},{0x2b,"hy"},{0x2c,"az"},{0x2d,"eu"},{0x2e,"hsb"},{0x2f,"mk"},{0x32,"tn"},{0x34,"xh"},{0x35,"zu"},{0x36,"af"},{0x37,"ka"},{0x38,"fo"},{0x39,"hi"},{0x3a,"mt"},{0x3b,"se"},{0x3c,"ga"},{0x3e,"ms"},{0x3f,"kk"},{0x40,"ky"},{0x41,"sw"},{0x42,"tk"},{0x43,"uz"},{0x44,"tt"},{0x45,"bn"},{0x46,"pa"},{0x47,"gu"},{0x48,"or"},{0x49,"ta"},{0x4a,"te"},{0x4b,"kn"},{0x4c,"ml"},{0x4d,"as"},{0x4e,"mr"},{0x4f,"sa"},{0x50,"mn"},{0x51,"bo"},{0x52,"cy"},{0x53,"km"},{0x54,"lo"},{0x56,"gl"},{0x57,"kok"},{0x5a,"syr"},{0x5b,"si"},{0x5d,"iu"},{0x5e,"am"},{0x5f,"tzm"},{0x61,"ne"},{0x62,"fy"},{0x63,"ps"},{0x64,"fil"},{0x65,"dv"},{0x68,"ha"},{0x6a,"yo"},{0x6b,"quz"},{0x6c,"nso"},{0x6d,"ba"},{0x6e,"lb"},{0x6f,"kl"},{0x70,"ig"},{0x78,"ii"},{0x7a,"arn"},{0x7c,"moh"},{0x7e,"br"},{0x80,"ug"},{0x81,"mi"},{0x82,"oc"},{0x83,"co"},{0x84,"gsw"},{0x85,"sah"},{0x86,"qut"},{0x87,"rw"},{0x88,"wo"},{0x8c,"prs"},{0x91,"gd"},{0x401,"ar-SA"},{0x402,"bg-BG"},{0x403,"ca-ES"},{0x404,"zh-TW"},{0x405,"cs-CZ"},{0x406,"da-DK"},{0x407,"de-DE"},{0x408,"el-GR"},{0x409,"en-US"},{0x40a,"es-ES_tradnl"},{0x40b,"fi-FI"},{0x40c,"fr-FR"},{0x40d,"he-IL"},{0x40e,"hu-HU"},{0x40f,"is-IS"},{0x410,"it-IT"},{0x411,"ja-JP"},{0x412,"ko-KR"},{0x413,"nl-NL"},{0x414,"nb-NO"},{0x415,"pl-PL"},{0x416,"pt-BR"},{0x417,"rm-CH"},{0x418,"ro-RO"},{0x419,"ru-RU"},{0x41a,"hr-HR"},{0x41b,"sk-SK"},{0x41c,"sq-AL"},{0x41d,"sv-SE"},{0x41e,"th-TH"},{0x41f,"tr-TR"},{0x420,"ur-PK"},{0x421,"id-ID"},{0x422,"uk-UA"},{0x423,"be-BY"},{0x424,"sl-SI"},{0x425,"et-EE"},{0x426,"lv-LV"},{0x427,"lt-LT"},{0x428,"tg-Cyrl-TJ"},{0x429,"fa-IR"},{0x42a,"vi-VN"},{0x42b,"hy-AM"},{0x42c,"az-Latn-AZ"},{0x42d,"eu-ES"},{0x42e,"wen-DE"},{0x42f,"mk-MK"},{0x430,"st-ZA"},{0x431,"ts-ZA"},{0x432,"tn-ZA"},{0x433,"ven-ZA"},{0x434,"xh-ZA"},{0x435,"zu-ZA"},{0x436,"af-ZA"},{0x437,"ka-GE"},{0x438,"fo-FO"},{0x439,"hi-IN"},{0x43a,"mt-MT"},{0x43b,"se-NO"},{0x43e,"ms-MY"},{0x43f,"kk-KZ"},{0x440,"ky-KG"},{0x441,"sw-KE"},{0x442,"tk-TM"},{0x443,"uz-Latn-UZ"},{0x444,"tt-RU"},{0x445,"bn-IN"},{0x446,"pa-IN"},{0x447,"gu-IN"},{0x448,"or-IN"},{0x449,"ta-IN"},{0x44a,"te-IN"},{0x44b,"kn-IN"},{0x44c,"ml-IN"},{0x44d,"as-IN"},{0x44e,"mr-IN"},{0x44f,"sa-IN"},{0x450,"mn-MN"},{0x451,"bo-CN"},{0x452,"cy-GB"},{0x453,"km-KH"},{0x454,"lo-LA"},{0x455,"my-MM"},{0x456,"gl-ES"},{0x457,"kok-IN"},{0x458,"mni"},{0x459,"sd-IN"},{0x45a,"syr-SY"},{0x45b,"si-LK"},{0x45c,"chr-US"},{0x45d,"iu-Cans-CA"},{0x45e,"am-ET"},{0x45f,"tmz"},{0x461,"ne-NP"},{0x462,"fy-NL"},{0x463,"ps-AF"},{0x464,"fil-PH"},{0x465,"dv-MV"},{0x466,"bin-NG"},{0x467,"fuv-NG"},{0x468,"ha-Latn-NG"},{0x469,"ibb-NG"},{0x46a,"yo-NG"},{0x46b,"quz-BO"},{0x46c,"nso-ZA"},{0x46d,"ba-RU"},{0x46e,"lb-LU"},{0x46f,"kl-GL"},{0x470,"ig-NG"},{0x471,"kr-NG"},{0x472,"gaz-ET"},{0x473,"ti-ER"},{0x474,"gn-PY"},{0x475,"haw-US"},{0x477,"so-SO"},{0x478,"ii-CN"},{0x479,"pap-AN"},{0x47a,"arn-CL"},{0x47c,"moh-CA"},{0x47e,"br-FR"},{0x480,"ug-CN"},{0x481,"mi-NZ"},{0x482,"oc-FR"},{0x483,"co-FR"},{0x484,"gsw-FR"},{0x485,"sah-RU"},{0x486,"qut-GT"},{0x487,"rw-RW"},{0x488,"wo-SN"},{0x48c,"prs-AF"},{0x48d,"plt-MG"},{0x491,"gd-GB"},{0x801,"ar-IQ"},{0x804,"zh-CN"},{0x807,"de-CH"},{0x809,"en-GB"},{0x80a,"es-MX"},{0x80c,"fr-BE"},{0x810,"it-CH"},{0x813,"nl-BE"},{0x814,"nn-NO"},{0x816,"pt-PT"},{0x818,"ro-MO"},{0x819,"ru-MO"},{0x81a,"sr-Latn-CS"},{0x81d,"sv-FI"},{0x820,"ur-IN"},{0x82c,"az-Cyrl-AZ"},{0x82e,"dsb-DE"},{0x83b,"se-SE"},{0x83c,"ga-IE"},{0x83e,"ms-BN"},{0x843,"uz-Cyrl-UZ"},{0x845,"bn-BD"},{0x846,"pa-PK"},{0x850,"mn-Mong-CN"},{0x851,"bo-BT"},{0x859,"sd-PK"},{0x85d,"iu-Latn-CA"},{0x85f,"tzm-Latn-DZ"},{0x861,"ne-IN"},{0x86b,"quz-EC"},{0x873,"ti-ET"},{0xc01,"ar-EG"},{0xc04,"zh-HK"},{0xc07,"de-AT"},{0xc09,"en-AU"},{0xc0a,"es-ES"},{0xc0c,"fr-CA"},{0xc1a,"sr-Cyrl-CS"},{0xc3b,"se-FI"},{0xc5f,"tmz-MA"},{0xc6b,"quz-PE"},{0x1001,"ar-LY"},{0x1004,"zh-SG"},{0x1007,"de-LU"},{0x1009,"en-CA"},{0x100a,"es-GT"},{0x100c,"fr-CH"},{0x101a,"hr-BA"},{0x103b,"smj-NO"},{0x1401,"ar-DZ"},{0x1404,"zh-MO"},{0x1407,"de-LI"},{0x1409,"en-NZ"},{0x140a,"es-CR"},{0x140c,"fr-LU"},{0x141a,"bs-Latn-BA"},{0x143b,"smj-SE"},{0x1801,"ar-MA"},{0x1809,"en-IE"},{0x180a,"es-PA"},{0x180c,"fr-MC"},{0x181a,"sr-Latn-BA"},{0x183b,"sma-NO"},{0x1c01,"ar-TN"},{0x1c09,"en-ZA"},{0x1c0a,"es-DO"},{0x1c0c,"fr-WestIndies"},{0x1c1a,"sr-Cyrl-BA"},{0x1c3b,"sma-SE"},{0x2001,"ar-OM"},{0x2009,"en-JM"},{0x200a,"es-VE"},{0x200c,"fr-RE"},{0x201a,"bs-Cyrl-BA"},{0x203b,"sms-FI"},{0x2401,"ar-YE"},{0x2409,"en-CB"},{0x240a,"es-CO"},{0x240c,"fr-CG"},{0x241a,"sr-Latn-RS"},{0x243b,"smn-FI"},{0x2801,"ar-SY"},{0x2809,"en-BZ"},{0x280a,"es-PE"},{0x280c,"fr-SN"},{0x281a,"sr-Cyrl-RS"},{0x2c01,"ar-JO"},{0x2c09,"en-TT"},{0x2c0a,"es-AR"},{0x2c0c,"fr-CM"},{0x2c1a,"sr-Latn-ME"},{0x3001,"ar-LB"},{0x3009,"en-ZW"},{0x300a,"es-EC"},{0x300c,"fr-CI"},{0x301a,"sr-Cyrl-ME"},{0x3401,"ar-KW"},{0x3409,"en-PH"},{0x340a,"es-CL"},{0x340c,"fr-ML"},{0x3801,"ar-AE"},{0x3809,"en-ID"},{0x380a,"es-UY"},{0x380c,"fr-MA"},{0x3c01,"ar-BH"},{0x3c09,"en-HK"},{0x3c0a,"es-PY"},{0x3c0c,"fr-HT"},{0x4001,"ar-QA"},{0x4009,"en-IN"},{0x400a,"es-BO"},{0x4409,"en-MY"},{0x440a,"es-SV"},{0x4809,"en-SG"},{0x480a,"es-HN"},{0x4c0a,"es-NI"},{0x500a,"es-PR"},{0x540a,"es-US"},{0x641a,"bs-Cyrl"},{0x681a,"bs-Latn"},{0x6c1a,"sr-Cyrl"},{0x701a,"sr-Latn"},{0x703b,"smn"},{0x742c,"az-Cyrl"},{0x743b,"sms"},{0x7804,"zh"},{0x7814,"nn"},{0x781a,"bs"},{0x782c,"az-Latn"},{0x783b,"sma"},{0x7843,"uz-Cyrl"},{0x7850,"mn-Cyrl"},{0x785d,"iu-Cans"},{0x7c04,"zh-Hant"},{0x7c14,"nb"},{0x7c1a,"sr"},{0x7c28,"tg-Cyrl"},{0x7c2e,"dsb"},{0x7c3b,"smj"},{0x7c43,"uz-Latn"},{0x7c50,"mn-Mong"},{0x7c5d,"iu-Latn"},{0x7c5f,"tzm-Latn"},{0x7c68,"ha-Latn"},};
+static MSLocale const gLocales[] = {
+    {0x1, "ar"},
+    {0x2, "bg"},
+    {0x3, "ca"},
+    {0x4, "zh-Hans"},
+    {0x5, "cs"},
+    {0x6, "da"},
+    {0x7, "de"},
+    {0x8, "el"},
+    {0x9, "en"},
+    {0xa, "es"},
+    {0xb, "fi"},
+    {0xc, "fr"},
+    {0xd, "he"},
+    {0xe, "hu"},
+    {0xf, "is"},
+    {0x10, "it"},
+    {0x11, "ja"},
+    {0x12, "ko"},
+    {0x13, "nl"},
+    {0x14, "no"},
+    {0x15, "pl"},
+    {0x16, "pt"},
+    {0x17, "rm"},
+    {0x18, "ro"},
+    {0x19, "ru"},
+    {0x1a, "hr"},
+    {0x1b, "sk"},
+    {0x1c, "sq"},
+    {0x1d, "sv"},
+    {0x1e, "th"},
+    {0x1f, "tr"},
+    {0x20, "ur"},
+    {0x21, "id"},
+    {0x22, "uk"},
+    {0x23, "be"},
+    {0x24, "sl"},
+    {0x25, "et"},
+    {0x26, "lv"},
+    {0x27, "lt"},
+    {0x28, "tg"},
+    {0x29, "fa"},
+    {0x2a, "vi"},
+    {0x2b, "hy"},
+    {0x2c, "az"},
+    {0x2d, "eu"},
+    {0x2e, "hsb"},
+    {0x2f, "mk"},
+    {0x32, "tn"},
+    {0x34, "xh"},
+    {0x35, "zu"},
+    {0x36, "af"},
+    {0x37, "ka"},
+    {0x38, "fo"},
+    {0x39, "hi"},
+    {0x3a, "mt"},
+    {0x3b, "se"},
+    {0x3c, "ga"},
+    {0x3e, "ms"},
+    {0x3f, "kk"},
+    {0x40, "ky"},
+    {0x41, "sw"},
+    {0x42, "tk"},
+    {0x43, "uz"},
+    {0x44, "tt"},
+    {0x45, "bn"},
+    {0x46, "pa"},
+    {0x47, "gu"},
+    {0x48, "or"},
+    {0x49, "ta"},
+    {0x4a, "te"},
+    {0x4b, "kn"},
+    {0x4c, "ml"},
+    {0x4d, "as"},
+    {0x4e, "mr"},
+    {0x4f, "sa"},
+    {0x50, "mn"},
+    {0x51, "bo"},
+    {0x52, "cy"},
+    {0x53, "km"},
+    {0x54, "lo"},
+    {0x56, "gl"},
+    {0x57, "kok"},
+    {0x5a, "syr"},
+    {0x5b, "si"},
+    {0x5d, "iu"},
+    {0x5e, "am"},
+    {0x5f, "tzm"},
+    {0x61, "ne"},
+    {0x62, "fy"},
+    {0x63, "ps"},
+    {0x64, "fil"},
+    {0x65, "dv"},
+    {0x68, "ha"},
+    {0x6a, "yo"},
+    {0x6b, "quz"},
+    {0x6c, "nso"},
+    {0x6d, "ba"},
+    {0x6e, "lb"},
+    {0x6f, "kl"},
+    {0x70, "ig"},
+    {0x78, "ii"},
+    {0x7a, "arn"},
+    {0x7c, "moh"},
+    {0x7e, "br"},
+    {0x80, "ug"},
+    {0x81, "mi"},
+    {0x82, "oc"},
+    {0x83, "co"},
+    {0x84, "gsw"},
+    {0x85, "sah"},
+    {0x86, "qut"},
+    {0x87, "rw"},
+    {0x88, "wo"},
+    {0x8c, "prs"},
+    {0x91, "gd"},
+    {0x401, "ar-SA"},
+    {0x402, "bg-BG"},
+    {0x403, "ca-ES"},
+    {0x404, "zh-TW"},
+    {0x405, "cs-CZ"},
+    {0x406, "da-DK"},
+    {0x407, "de-DE"},
+    {0x408, "el-GR"},
+    {0x409, "en-US"},
+    {0x40a, "es-ES_tradnl"},
+    {0x40b, "fi-FI"},
+    {0x40c, "fr-FR"},
+    {0x40d, "he-IL"},
+    {0x40e, "hu-HU"},
+    {0x40f, "is-IS"},
+    {0x410, "it-IT"},
+    {0x411, "ja-JP"},
+    {0x412, "ko-KR"},
+    {0x413, "nl-NL"},
+    {0x414, "nb-NO"},
+    {0x415, "pl-PL"},
+    {0x416, "pt-BR"},
+    {0x417, "rm-CH"},
+    {0x418, "ro-RO"},
+    {0x419, "ru-RU"},
+    {0x41a, "hr-HR"},
+    {0x41b, "sk-SK"},
+    {0x41c, "sq-AL"},
+    {0x41d, "sv-SE"},
+    {0x41e, "th-TH"},
+    {0x41f, "tr-TR"},
+    {0x420, "ur-PK"},
+    {0x421, "id-ID"},
+    {0x422, "uk-UA"},
+    {0x423, "be-BY"},
+    {0x424, "sl-SI"},
+    {0x425, "et-EE"},
+    {0x426, "lv-LV"},
+    {0x427, "lt-LT"},
+    {0x428, "tg-Cyrl-TJ"},
+    {0x429, "fa-IR"},
+    {0x42a, "vi-VN"},
+    {0x42b, "hy-AM"},
+    {0x42c, "az-Latn-AZ"},
+    {0x42d, "eu-ES"},
+    {0x42e, "wen-DE"},
+    {0x42f, "mk-MK"},
+    {0x430, "st-ZA"},
+    {0x431, "ts-ZA"},
+    {0x432, "tn-ZA"},
+    {0x433, "ven-ZA"},
+    {0x434, "xh-ZA"},
+    {0x435, "zu-ZA"},
+    {0x436, "af-ZA"},
+    {0x437, "ka-GE"},
+    {0x438, "fo-FO"},
+    {0x439, "hi-IN"},
+    {0x43a, "mt-MT"},
+    {0x43b, "se-NO"},
+    {0x43e, "ms-MY"},
+    {0x43f, "kk-KZ"},
+    {0x440, "ky-KG"},
+    {0x441, "sw-KE"},
+    {0x442, "tk-TM"},
+    {0x443, "uz-Latn-UZ"},
+    {0x444, "tt-RU"},
+    {0x445, "bn-IN"},
+    {0x446, "pa-IN"},
+    {0x447, "gu-IN"},
+    {0x448, "or-IN"},
+    {0x449, "ta-IN"},
+    {0x44a, "te-IN"},
+    {0x44b, "kn-IN"},
+    {0x44c, "ml-IN"},
+    {0x44d, "as-IN"},
+    {0x44e, "mr-IN"},
+    {0x44f, "sa-IN"},
+    {0x450, "mn-MN"},
+    {0x451, "bo-CN"},
+    {0x452, "cy-GB"},
+    {0x453, "km-KH"},
+    {0x454, "lo-LA"},
+    {0x455, "my-MM"},
+    {0x456, "gl-ES"},
+    {0x457, "kok-IN"},
+    {0x458, "mni"},
+    {0x459, "sd-IN"},
+    {0x45a, "syr-SY"},
+    {0x45b, "si-LK"},
+    {0x45c, "chr-US"},
+    {0x45d, "iu-Cans-CA"},
+    {0x45e, "am-ET"},
+    {0x45f, "tmz"},
+    {0x461, "ne-NP"},
+    {0x462, "fy-NL"},
+    {0x463, "ps-AF"},
+    {0x464, "fil-PH"},
+    {0x465, "dv-MV"},
+    {0x466, "bin-NG"},
+    {0x467, "fuv-NG"},
+    {0x468, "ha-Latn-NG"},
+    {0x469, "ibb-NG"},
+    {0x46a, "yo-NG"},
+    {0x46b, "quz-BO"},
+    {0x46c, "nso-ZA"},
+    {0x46d, "ba-RU"},
+    {0x46e, "lb-LU"},
+    {0x46f, "kl-GL"},
+    {0x470, "ig-NG"},
+    {0x471, "kr-NG"},
+    {0x472, "gaz-ET"},
+    {0x473, "ti-ER"},
+    {0x474, "gn-PY"},
+    {0x475, "haw-US"},
+    {0x477, "so-SO"},
+    {0x478, "ii-CN"},
+    {0x479, "pap-AN"},
+    {0x47a, "arn-CL"},
+    {0x47c, "moh-CA"},
+    {0x47e, "br-FR"},
+    {0x480, "ug-CN"},
+    {0x481, "mi-NZ"},
+    {0x482, "oc-FR"},
+    {0x483, "co-FR"},
+    {0x484, "gsw-FR"},
+    {0x485, "sah-RU"},
+    {0x486, "qut-GT"},
+    {0x487, "rw-RW"},
+    {0x488, "wo-SN"},
+    {0x48c, "prs-AF"},
+    {0x48d, "plt-MG"},
+    {0x491, "gd-GB"},
+    {0x801, "ar-IQ"},
+    {0x804, "zh-CN"},
+    {0x807, "de-CH"},
+    {0x809, "en-GB"},
+    {0x80a, "es-MX"},
+    {0x80c, "fr-BE"},
+    {0x810, "it-CH"},
+    {0x813, "nl-BE"},
+    {0x814, "nn-NO"},
+    {0x816, "pt-PT"},
+    {0x818, "ro-MO"},
+    {0x819, "ru-MO"},
+    {0x81a, "sr-Latn-CS"},
+    {0x81d, "sv-FI"},
+    {0x820, "ur-IN"},
+    {0x82c, "az-Cyrl-AZ"},
+    {0x82e, "dsb-DE"},
+    {0x83b, "se-SE"},
+    {0x83c, "ga-IE"},
+    {0x83e, "ms-BN"},
+    {0x843, "uz-Cyrl-UZ"},
+    {0x845, "bn-BD"},
+    {0x846, "pa-PK"},
+    {0x850, "mn-Mong-CN"},
+    {0x851, "bo-BT"},
+    {0x859, "sd-PK"},
+    {0x85d, "iu-Latn-CA"},
+    {0x85f, "tzm-Latn-DZ"},
+    {0x861, "ne-IN"},
+    {0x86b, "quz-EC"},
+    {0x873, "ti-ET"},
+    {0xc01, "ar-EG"},
+    {0xc04, "zh-HK"},
+    {0xc07, "de-AT"},
+    {0xc09, "en-AU"},
+    {0xc0a, "es-ES"},
+    {0xc0c, "fr-CA"},
+    {0xc1a, "sr-Cyrl-CS"},
+    {0xc3b, "se-FI"},
+    {0xc5f, "tmz-MA"},
+    {0xc6b, "quz-PE"},
+    {0x1001, "ar-LY"},
+    {0x1004, "zh-SG"},
+    {0x1007, "de-LU"},
+    {0x1009, "en-CA"},
+    {0x100a, "es-GT"},
+    {0x100c, "fr-CH"},
+    {0x101a, "hr-BA"},
+    {0x103b, "smj-NO"},
+    {0x1401, "ar-DZ"},
+    {0x1404, "zh-MO"},
+    {0x1407, "de-LI"},
+    {0x1409, "en-NZ"},
+    {0x140a, "es-CR"},
+    {0x140c, "fr-LU"},
+    {0x141a, "bs-Latn-BA"},
+    {0x143b, "smj-SE"},
+    {0x1801, "ar-MA"},
+    {0x1809, "en-IE"},
+    {0x180a, "es-PA"},
+    {0x180c, "fr-MC"},
+    {0x181a, "sr-Latn-BA"},
+    {0x183b, "sma-NO"},
+    {0x1c01, "ar-TN"},
+    {0x1c09, "en-ZA"},
+    {0x1c0a, "es-DO"},
+    {0x1c0c, "fr-WestIndies"},
+    {0x1c1a, "sr-Cyrl-BA"},
+    {0x1c3b, "sma-SE"},
+    {0x2001, "ar-OM"},
+    {0x2009, "en-JM"},
+    {0x200a, "es-VE"},
+    {0x200c, "fr-RE"},
+    {0x201a, "bs-Cyrl-BA"},
+    {0x203b, "sms-FI"},
+    {0x2401, "ar-YE"},
+    {0x2409, "en-CB"},
+    {0x240a, "es-CO"},
+    {0x240c, "fr-CG"},
+    {0x241a, "sr-Latn-RS"},
+    {0x243b, "smn-FI"},
+    {0x2801, "ar-SY"},
+    {0x2809, "en-BZ"},
+    {0x280a, "es-PE"},
+    {0x280c, "fr-SN"},
+    {0x281a, "sr-Cyrl-RS"},
+    {0x2c01, "ar-JO"},
+    {0x2c09, "en-TT"},
+    {0x2c0a, "es-AR"},
+    {0x2c0c, "fr-CM"},
+    {0x2c1a, "sr-Latn-ME"},
+    {0x3001, "ar-LB"},
+    {0x3009, "en-ZW"},
+    {0x300a, "es-EC"},
+    {0x300c, "fr-CI"},
+    {0x301a, "sr-Cyrl-ME"},
+    {0x3401, "ar-KW"},
+    {0x3409, "en-PH"},
+    {0x340a, "es-CL"},
+    {0x340c, "fr-ML"},
+    {0x3801, "ar-AE"},
+    {0x3809, "en-ID"},
+    {0x380a, "es-UY"},
+    {0x380c, "fr-MA"},
+    {0x3c01, "ar-BH"},
+    {0x3c09, "en-HK"},
+    {0x3c0a, "es-PY"},
+    {0x3c0c, "fr-HT"},
+    {0x4001, "ar-QA"},
+    {0x4009, "en-IN"},
+    {0x400a, "es-BO"},
+    {0x4409, "en-MY"},
+    {0x440a, "es-SV"},
+    {0x4809, "en-SG"},
+    {0x480a, "es-HN"},
+    {0x4c0a, "es-NI"},
+    {0x500a, "es-PR"},
+    {0x540a, "es-US"},
+    {0x641a, "bs-Cyrl"},
+    {0x681a, "bs-Latn"},
+    {0x6c1a, "sr-Cyrl"},
+    {0x701a, "sr-Latn"},
+    {0x703b, "smn"},
+    {0x742c, "az-Cyrl"},
+    {0x743b, "sms"},
+    {0x7804, "zh"},
+    {0x7814, "nn"},
+    {0x781a, "bs"},
+    {0x782c, "az-Latn"},
+    {0x783b, "sma"},
+    {0x7843, "uz-Cyrl"},
+    {0x7850, "mn-Cyrl"},
+    {0x785d, "iu-Cans"},
+    {0x7c04, "zh-Hant"},
+    {0x7c14, "nb"},
+    {0x7c1a, "sr"},
+    {0x7c28, "tg-Cyrl"},
+    {0x7c2e, "dsb"},
+    {0x7c3b, "smj"},
+    {0x7c43, "uz-Latn"},
+    {0x7c50, "mn-Mong"},
+    {0x7c5d, "iu-Latn"},
+    {0x7c5f, "tzm-Latn"},
+    {0x7c68, "ha-Latn"},
+};
 #endif
 
 namespace languages
@@ -50,8 +442,8 @@ struct SystemLanguages
   {
     /// @DebugNote
     // Hardcode draw text language.
-    //m_langs.push_back("hi");
-    //return;
+    // m_langs.push_back("hi");
+    // return;
 
 #if defined(OMIM_OS_MAC) || defined(OMIM_OS_IPHONE) || defined(OMIM_OS_LINUX)
     // check environment variables
@@ -65,7 +457,7 @@ struct SystemLanguages
     else if ((p = getenv("LANG")))
       m_langs.push_back(p);
 
-  #if defined(OMIM_OS_MAC) || defined(OMIM_OS_IPHONE)
+#if defined(OMIM_OS_MAC) || defined(OMIM_OS_IPHONE)
     else
     {
       // Mac and iOS implementation
@@ -79,14 +471,13 @@ struct SystemLanguages
       }
       CFRelease(langs);
     }
-  #endif
+#endif
 
 #elif defined(OMIM_OS_WINDOWS)
     // if we're on Vista or above, take list of preferred languages
-    typedef BOOL (WINAPI *PGETUSERPREFERREDUILANGUAGES)(DWORD, PULONG, PWCHAR, PULONG);
-    PGETUSERPREFERREDUILANGUAGES p =
-        reinterpret_cast<PGETUSERPREFERREDUILANGUAGES>(
-            GetProcAddress(GetModuleHandleA("Kernel32.dll"), "GetUserPreferredUILanguages"));
+    typedef BOOL(WINAPI * PGETUSERPREFERREDUILANGUAGES)(DWORD, PULONG, PWCHAR, PULONG);
+    PGETUSERPREFERREDUILANGUAGES p = reinterpret_cast<PGETUSERPREFERREDUILANGUAGES>(
+        GetProcAddress(GetModuleHandleA("Kernel32.dll"), "GetUserPreferredUILanguages"));
     if (p)
     {
       // Vista or above, get buffer size first
@@ -101,8 +492,8 @@ struct SystemLanguages
       WCHAR * pCurr = buf;
       while ((len = wcslen(pCurr)))
       {
-        char * utf8Buf = new char[len*2];
-        CHECK_NOT_EQUAL(WideCharToMultiByte(CP_UTF8, 0, pCurr, -1, utf8Buf, len*2, NULL, NULL), 0, ());
+        char * utf8Buf = new char[len * 2];
+        CHECK_NOT_EQUAL(WideCharToMultiByte(CP_UTF8, 0, pCurr, -1, utf8Buf, len * 2, NULL, NULL), 0, ());
         m_langs.push_back(utf8Buf);
         delete[] utf8Buf;
         pCurr += len + 1;
@@ -125,7 +516,7 @@ struct SystemLanguages
 #elif defined(OMIM_OS_ANDROID)
     m_langs.push_back(GetAndroidSystemLanguage());
 #else
-    #error "Define language preferences for your platform"
+#error "Define language preferences for your platform"
 #endif
   }
 };
@@ -191,20 +582,17 @@ std::string GetCurrentMapLanguage()
 std::vector<int8_t> GetPreferredLangIndexes()
 {
   std::vector<int8_t> langs = {};
-  
+
   auto const mapLang = StringUtf8Multilang::GetLangIndex(languages::GetCurrentMapLanguage());
   if (mapLang != StringUtf8Multilang::kUnsupportedLanguageCode)
     langs.push_back(mapLang);
-  
+
   for (auto const & systemLanguage : GetSystemPreferred())
   {
     auto normalizedLang = Normalize(systemLanguage);
     int8_t lang = StringUtf8Multilang::GetLangIndex(normalizedLang);
-    if (lang != StringUtf8Multilang::kUnsupportedLanguageCode
-           && find(langs.begin(), langs.end(), lang) == langs.end())
-    {
+    if (lang != StringUtf8Multilang::kUnsupportedLanguageCode && find(langs.begin(), langs.end(), lang) == langs.end())
       langs.push_back(lang);
-    }
   }
   return langs;
 }
@@ -219,10 +607,8 @@ std::string GetTwine(std::string const & lang)
 
     // Traditional Chinese.
     for (char const * s : {"hant", "tw", "hk", "mo"})
-    {
       if (lower.find(s) != std::string::npos)
         return "zh-Hant";
-    }
 
     // Simplified Chinese by default for all other cases.
     return "zh-Hans";
diff --git a/libs/platform/products.cpp b/libs/platform/products.cpp
index 7c651cbd2..e46f421dd 100644
--- a/libs/platform/products.cpp
+++ b/libs/platform/products.cpp
@@ -1,8 +1,8 @@
 #include "platform/products.hpp"
 #include "platform/platform.hpp"
 
-#include "base/logging.hpp"
 #include "base/assert.hpp"
+#include "base/logging.hpp"
 #include "base/string_utils.hpp"
 
 #include "defines.hpp"
@@ -11,7 +11,8 @@
 
 #include "cppjansson/cppjansson.hpp"
 
-namespace products {
+namespace products
+{
 
 char const kPlacePagePrompt[] = "placePagePrompt";
 char const kProducts[] = "products";
@@ -78,7 +79,7 @@ void ProductsSettings::Update(std::string const & jsonStr)
 
 std::optional<ProductsConfig> ProductsConfig::Parse(std::string const & jsonStr)
 {
-  const base::Json root(jsonStr.c_str());
+  base::Json const root(jsonStr.c_str());
   auto const json = root.get();
   auto const productsObj = json_object_get(json, kProducts);
   if (!json_is_object(json) || !productsObj || !json_is_array(productsObj))
@@ -115,4 +116,4 @@ std::optional<ProductsConfig> ProductsConfig::Parse(std::string const & jsonStr)
   return config;
 }
 
-} // namespace products
+}  // namespace products
diff --git a/libs/platform/products.hpp b/libs/platform/products.hpp
index f7829f25d..f4a890895 100644
--- a/libs/platform/products.hpp
+++ b/libs/platform/products.hpp
@@ -1,11 +1,12 @@
 #pragma once
 
+#include <mutex>
+#include <optional>
 #include <string>
 #include <vector>
-#include <optional>
-#include <mutex>
 
-namespace products {
+namespace products
+{
 
 struct ProductsConfig
 {
@@ -16,9 +17,7 @@ struct ProductsConfig
     std::string m_link;
 
   public:
-    Product(std::string const & title, std::string const & link)
-    : m_title(title), m_link(link)
-    {}
+    Product(std::string const & title, std::string const & link) : m_title(title), m_link(link) {}
 
     std::string const & GetTitle() const { return m_title; }
     std::string const & GetLink() const { return m_link; }
@@ -61,4 +60,4 @@ inline std::optional<ProductsConfig> GetProductsConfiguration()
   return ProductsSettings::Instance().Get();
 }
 
-} // namespace products
+}  // namespace products
diff --git a/libs/platform/remote_file.cpp b/libs/platform/remote_file.cpp
index 486ce4cae..b50d333f7 100644
--- a/libs/platform/remote_file.cpp
+++ b/libs/platform/remote_file.cpp
@@ -15,8 +15,7 @@ double constexpr kRequestTimeoutInSec = 5.0;
 }  // namespace
 
 RemoteFile::RemoteFile(std::string url, std::string accessToken /* = {} */,
-                       HttpClient::Headers const & defaultHeaders /* = {} */,
-                       bool allowRedirection /* = true */)
+                       HttpClient::Headers const & defaultHeaders /* = {} */, bool allowRedirection /* = true */)
   : m_url(std::move(url))
   , m_accessToken(std::move(accessToken))
   , m_defaultHeaders(defaultHeaders)
@@ -71,15 +70,13 @@ RemoteFile::Result RemoteFile::Download(std::string const & filePath) const
   return {m_url, Status::NetworkError, "Unspecified network error"};
 }
 
-void RemoteFile::DownloadAsync(std::string const & filePath,
-                               StartDownloadingHandler && startDownloadingHandler,
+void RemoteFile::DownloadAsync(std::string const & filePath, StartDownloadingHandler && startDownloadingHandler,
                                ResultHandler && resultHandler) const
 {
   RemoteFile remoteFile = *this;
-  GetPlatform().RunTask(Platform::Thread::Network,
-                        [filePath, remoteFile = std::move(remoteFile),
-                         startDownloadingHandler = std::move(startDownloadingHandler),
-                         resultHandler = std::move(resultHandler)]
+  GetPlatform().RunTask(Platform::Thread::Network, [filePath, remoteFile = std::move(remoteFile),
+                                                    startDownloadingHandler = std::move(startDownloadingHandler),
+                                                    resultHandler = std::move(resultHandler)]
   {
     if (startDownloadingHandler)
       startDownloadingHandler(filePath);
diff --git a/libs/platform/remote_file.hpp b/libs/platform/remote_file.hpp
index 21ce94a64..c9542ffc6 100644
--- a/libs/platform/remote_file.hpp
+++ b/libs/platform/remote_file.hpp
@@ -38,16 +38,14 @@ public:
     {}
   };
 
-  explicit RemoteFile(std::string url, std::string accessToken = {},
-                      HttpClient::Headers const & defaultHeaders = {},
+  explicit RemoteFile(std::string url, std::string accessToken = {}, HttpClient::Headers const & defaultHeaders = {},
                       bool allowRedirection = true);
 
   Result Download(std::string const & filePath) const;
 
   using StartDownloadingHandler = std::function<void(std::string const & filePath)>;
   using ResultHandler = std::function<void(Result &&, std::string const & filePath)>;
-  void DownloadAsync(std::string const & filePath,
-                     StartDownloadingHandler && startDownloadingHandler,
+  void DownloadAsync(std::string const & filePath, StartDownloadingHandler && startDownloadingHandler,
                      ResultHandler && resultHandler) const;
 
 private:
diff --git a/libs/platform/safe_callback.hpp b/libs/platform/safe_callback.hpp
index c2f48ae72..07542e418 100644
--- a/libs/platform/safe_callback.hpp
+++ b/libs/platform/safe_callback.hpp
@@ -2,8 +2,8 @@
 
 #include "platform/platform.hpp"
 
-#include <future>
 #include <functional>
+#include <future>
 #include <utility>
 
 namespace platform
@@ -14,22 +14,17 @@ class SafeCallback;
 // Calls callback on main thread, all params are copied.
 // If not initialized nothing will be done.
 // *NOTE* The class is not thread-safe.
-template <typename R, typename ...Args>
+template <typename R, typename... Args>
 class SafeCallback<R(Args...)>
 {
 public:
   SafeCallback() = default;
 
   template <typename Fn>
-  SafeCallback(Fn const & fn)
-    : m_fn(fn)
-  {
-  }
+  SafeCallback(Fn const & fn) : m_fn(fn)
+  {}
 
-  operator bool() const noexcept
-  {
-    return static_cast<bool>(m_fn);
-  }
+  operator bool() const noexcept { return static_cast<bool>(m_fn); }
 
   void operator()(Args... args) const
   {
diff --git a/libs/platform/servers_list.cpp b/libs/platform/servers_list.cpp
index 7650a8226..1a4622689 100644
--- a/libs/platform/servers_list.cpp
+++ b/libs/platform/servers_list.cpp
@@ -4,8 +4,8 @@
 #include "platform/platform.hpp"
 #include "platform/settings.hpp"
 
-#include "base/logging.hpp"
 #include "base/assert.hpp"
+#include "base/logging.hpp"
 
 #include "cppjansson/cppjansson.hpp"
 
@@ -21,8 +21,8 @@ std::optional<MetaConfig> ParseMetaConfig(std::string const & jsonStr)
   MetaConfig outMetaConfig;
   try
   {
-    const base::Json root(jsonStr.c_str());
-    const json_t * servers;
+    base::Json const root(jsonStr.c_str());
+    json_t const * servers;
     if (json_is_object(root.get()))
     {
       // New format:
@@ -35,13 +35,13 @@ std::optional<MetaConfig> ParseMetaConfig(std::string const & jsonStr)
       // }
 
       json_t * settings = json_object_get(root.get(), kSettings);
-      const char * key;
-      const json_t * value;
+      char const * key;
+      json_t const * value;
       json_object_foreach(settings, key, value)
       {
         if (key == settings::kDonateUrl || key == settings::kNY)
         {
-          const char * valueStr = json_string_value(value);
+          char const * valueStr = json_string_value(value);
           if (value)
             outMetaConfig.m_settings[key] = valueStr;
         }
@@ -79,4 +79,4 @@ std::optional<MetaConfig> ParseMetaConfig(std::string const & jsonStr)
 
   return outMetaConfig;
 }
-} // namespace downloader
+}  // namespace downloader
diff --git a/libs/platform/settings.cpp b/libs/platform/settings.cpp
index 5d02572a9..1fc8fbd33 100644
--- a/libs/platform/settings.cpp
+++ b/libs/platform/settings.cpp
@@ -52,7 +52,7 @@ bool FromString<string>(string const & strIn, string & strOut)
 namespace impl
 {
 template <class T, size_t N>
-bool FromStringArray(string const & s, T(&arr)[N])
+bool FromStringArray(string const & s, T (&arr)[N])
 {
   istringstream in(s);
   size_t count = 0;
@@ -406,7 +406,7 @@ void UsageStats::EnterBackground()
     return;
 
   // Safe check if uninitialized. Possible when entering background on DownloadResourcesLegacyActivity.
-  //ASSERT(m_enterForegroundTime > 0, ());
+  // ASSERT(m_enterForegroundTime > 0, ());
   if (m_enterForegroundTime == 0)
     return;
 
@@ -429,13 +429,13 @@ void UsageStats::EnterBackground()
 
 bool UsageStats::IsLoyalUser() const
 {
-  #ifdef DEBUG
+#ifdef DEBUG
   uint32_t constexpr kMinTotalForegroundTimeout = 30;
   uint32_t constexpr kMinSessionsCount = 3;
-  #else
-  uint32_t constexpr kMinTotalForegroundTimeout = 60 * 30; // 30 min
+#else
+  uint32_t constexpr kMinTotalForegroundTimeout = 60 * 30;  // 30 min
   uint32_t constexpr kMinSessionsCount = 5;
-  #endif
+#endif
   return m_sessionsCount >= kMinSessionsCount && m_totalForegroundTime >= kMinTotalForegroundTimeout;
 }
 
diff --git a/libs/platform/settings.hpp b/libs/platform/settings.hpp
index 6dec4fb33..28001e366 100644
--- a/libs/platform/settings.hpp
+++ b/libs/platform/settings.hpp
@@ -60,8 +60,14 @@ inline void Update(std::map<std::string, std::string> const & settings)
   StringStorage::Instance().Update(settings);
 }
 
-inline void Delete(std::string_view key) { StringStorage::Instance().DeleteKeyAndValue(key); }
-inline void Clear() { StringStorage::Instance().Clear(); }
+inline void Delete(std::string_view key)
+{
+  StringStorage::Instance().DeleteKeyAndValue(key);
+}
+inline void Clear()
+{
+  StringStorage::Instance().Clear();
+}
 
 class UsageStats
 {
@@ -83,4 +89,4 @@ public:
   bool IsLoyalUser() const;
 };
 
-} // namespace settings
+}  // namespace settings
diff --git a/libs/platform/string_storage_base.cpp b/libs/platform/string_storage_base.cpp
index b8951e9ba..8db427f5c 100644
--- a/libs/platform/string_storage_base.cpp
+++ b/libs/platform/string_storage_base.cpp
@@ -1,8 +1,8 @@
 #include "string_storage_base.hpp"
 
-#include "coding/reader_streambuf.hpp"
 #include "coding/file_reader.hpp"
 #include "coding/file_writer.hpp"
+#include "coding/reader_streambuf.hpp"
 
 #include "base/exception.hpp"
 #include "base/logging.hpp"
@@ -103,13 +103,11 @@ void StringStorageBase::Update(std::map<std::string, std::string> const & values
 {
   std::lock_guard guard(m_mutex);
 
-  for (const auto & pair : values)
-  {
+  for (auto const & pair : values)
     if (pair.second.empty())
       m_values.erase(pair.first);
     else
       m_values[pair.first] = pair.second;
-  }
 
   Save();
 }
diff --git a/libs/platform/trace.hpp b/libs/platform/trace.hpp
index a94d59a38..b02a23d1c 100644
--- a/libs/platform/trace.hpp
+++ b/libs/platform/trace.hpp
@@ -31,22 +31,16 @@ private:
 class TraceSection
 {
 public:
-  inline TraceSection(char const * section) noexcept
-  {
-    Trace::Instance().BeginSection(section);
-  }
+  inline TraceSection(char const * section) noexcept { Trace::Instance().BeginSection(section); }
 
-  inline ~TraceSection() noexcept
-  {
-    Trace::Instance().EndSection();
-  }
+  inline ~TraceSection() noexcept { Trace::Instance().EndSection(); }
 };
 }  // namespace platform
 
 #if defined(ENABLE_TRACE) && defined(OMIM_OS_ANDROID)
-#define TRACE_SECTION(section) platform::TraceSection ___section(section)
+#define TRACE_SECTION(section)     platform::TraceSection ___section(section)
 #define TRACE_COUNTER(name, value) platform::Trace::Instance().SetCounter(name, value)
 #else
-#define TRACE_SECTION(section) static_cast<void>(0)
+#define TRACE_SECTION(section)     static_cast<void>(0)
 #define TRACE_COUNTER(name, value) static_cast<void>(0)
 #endif
diff --git a/libs/platform/trace_android.cpp b/libs/platform/trace_android.cpp
index 6d1b9f6b1..36a1f60e8 100644
--- a/libs/platform/trace_android.cpp
+++ b/libs/platform/trace_android.cpp
@@ -6,9 +6,9 @@
 namespace platform
 {
 // Source: https://developer.android.com/topic/performance/tracing/custom-events-native
-typedef void *(*ATrace_beginSection) (char const *);
-typedef void *(*ATrace_endSection) (void);
-typedef void *(*ATrace_setCounter) (char const *, int64_t);
+typedef void * (*ATrace_beginSection)(char const *);
+typedef void * (*ATrace_endSection)(void);
+typedef void * (*ATrace_setCounter)(char const *, int64_t);
 
 class TraceImpl
 {
@@ -18,7 +18,7 @@ public:
     m_lib = dlopen("libandroid.so", RTLD_NOW | RTLD_LOCAL);
 
     // Access the native tracing functions.
-    if (m_lib != nullptr) 
+    if (m_lib != nullptr)
     {
       // Use dlsym() to prevent crashes on devices running Android 5.1
       // (API level 22) or lower.
@@ -59,24 +59,23 @@ private:
   ATrace_setCounter m_setCounter = nullptr;
 };
 
-// static 
-Trace & Trace::Instance() noexcept {
+// static
+Trace & Trace::Instance() noexcept
+{
   static Trace instance;
   return instance;
 }
 
-Trace::Trace() 
-  : m_impl(std::make_unique<TraceImpl>())
-{}
+Trace::Trace() : m_impl(std::make_unique<TraceImpl>()) {}
 
 Trace::~Trace() = default;
-  
-void Trace::BeginSection(char const * name) noexcept 
+
+void Trace::BeginSection(char const * name) noexcept
 {
   m_impl->BeginSection(name);
 }
 
-void Trace::EndSection() noexcept 
+void Trace::EndSection() noexcept
 {
   m_impl->EndSection();
 }
diff --git a/libs/platform/utm_mgrs_utils.cpp b/libs/platform/utm_mgrs_utils.cpp
index 77a3888ce..dd4a28bc3 100644
--- a/libs/platform/utm_mgrs_utils.cpp
+++ b/libs/platform/utm_mgrs_utils.cpp
@@ -1,10 +1,10 @@
 #include "platform/utm_mgrs_utils.hpp"
 
-#include "base/string_utils.hpp"
 #include "base/math.hpp"
+#include "base/string_utils.hpp"
 
-#include <string>
 #include <cmath>
+#include <string>
 
 namespace utm_mgrs_utils
 {
@@ -18,14 +18,14 @@ struct UTMPoint
   char zoneLetter;
 };
 
-double constexpr K0 = 0.9996; // The scale factor at the central meridian.
-double constexpr E = 0.00669438; // The square of the eccentricity for the WGS84 ellipsoid.
+double constexpr K0 = 0.9996;     // The scale factor at the central meridian.
+double constexpr E = 0.00669438;  // The square of the eccentricity for the WGS84 ellipsoid.
 double constexpr E2 = E * E;
 double constexpr E3 = E2 * E;
 double constexpr E_P2 = E / (1 - E);
-double constexpr R = 6378137.0; // The Earth equitorial radius for the WGS84 ellipsoid.
+double constexpr R = 6378137.0;  // The Earth equitorial radius for the WGS84 ellipsoid.
 
-double constexpr SQRT_E = 0.996647189; // sqrt(1 - E)
+double constexpr SQRT_E = 0.996647189;  // sqrt(1 - E)
 double constexpr _E = (1 - SQRT_E) / (1 + SQRT_E);
 double constexpr _E2 = _E * _E;
 double constexpr _E3 = _E2 * _E;
@@ -54,7 +54,7 @@ double NormalizeAngle(double value)
 {
   using math::pi;
   if (value < -pi)
-    value += - 2 * pi * (static_cast<int>(value - pi) / (2 * pi));
+    value += -2 * pi * (static_cast<int>(value - pi) / (2 * pi));
   else if (value > pi)
     value -= 2 * pi * (static_cast<int>(value + pi) / (2 * pi));
   return value;
@@ -127,18 +127,15 @@ UTMPoint LatLonToUtm(double lat, double lon)
   double const a5 = a4 * a;
   double const a6 = a5 * a;
 
-  double const m = R * (M1 * latRad -
-                   M2 * sin(2 * latRad) +
-                   M3 * sin(4 * latRad) -
-                   M4 * sin(6 * latRad));
+  double const m = R * (M1 * latRad - M2 * sin(2 * latRad) + M3 * sin(4 * latRad) - M4 * sin(6 * latRad));
 
-  double const easting = K0 * n * (a +
-                         a3 / 6 * (1 - latTan2 + c) +
-                         a5 / 120 * (5 - 18 * latTan2 + latTan4 + 72 * c - 58 * E_P2)) + 500000.0;
+  double const easting =
+      K0 * n * (a + a3 / 6 * (1 - latTan2 + c) + a5 / 120 * (5 - 18 * latTan2 + latTan4 + 72 * c - 58 * E_P2)) +
+      500000.0;
 
-  double northing = K0 * (m + n * latTan * (a2 / 2 +
-                    a4 / 24 * (5 - latTan2 + 9 * c + 4 * c * c) +
-                    a6 / 720 * (61 - 58 * latTan2 + latTan4 + 600 * c - 330 * E_P2)));
+  double northing = K0 * (m + n * latTan *
+                                  (a2 / 2 + a4 / 24 * (5 - latTan2 + 9 * c + 4 * c * c) +
+                                   a6 / 720 * (61 - 58 * latTan2 + latTan4 + 600 * c - 330 * E_P2)));
   if (lat < 0.0)
     northing += 10000000.0;
 
@@ -151,8 +148,7 @@ std::string UTMtoStr(UTMPoint const & point)
   // Easting and northing are rounded to nearest integer. Because of that in some cases
   // last 5 digits of UTM and MGRS coordinates could differ (inaccuracy is no more then 1 meter).
   // Some UTM converters truncate easting and northing instead of rounding. Consider this option.
-  return std::to_string(point.zoneNumber) + point.zoneLetter + ' ' +
-         std::to_string(std::lround(point.easting)) + ' ' +
+  return std::to_string(point.zoneNumber) + point.zoneLetter + ' ' + std::to_string(std::lround(point.easting)) + ' ' +
          std::to_string(std::lround(point.northing));
 }
 
@@ -196,9 +192,8 @@ std::string Get100kId(double easting, double northing, int zoneNumber)
   else
     rollover = false;
 
-  if (rowInt == 'I' || (rowOrigin < 'I' && rowInt > 'I') || ((rowInt > 'I' || rowOrigin < 'I') && rollover)) {
+  if (rowInt == 'I' || (rowOrigin < 'I' && rowInt > 'I') || ((rowInt > 'I' || rowOrigin < 'I') && rollover))
     rowInt++;
-  }
 
   if (rowInt == 'O' || (rowOrigin < 'O' && rowInt > 'O') || ((rowInt > 'O' || rowOrigin < 'O') && rollover))
   {
@@ -226,8 +221,7 @@ std::string UTMtoMgrsStr(UTMPoint const & point, int precision)
     northingStr = northingStr.substr(northingStr.size() - 6);
 
   return strings::to_string_width(point.zoneNumber, 2) + point.zoneLetter + ' ' +
-         Get100kId(point.easting, point.northing, point.zoneNumber) + ' ' +
-         eastingStr.substr(1, precision) + ' ' +
+         Get100kId(point.easting, point.northing, point.zoneNumber) + ' ' + eastingStr.substr(1, precision) + ' ' +
          northingStr.substr(1, precision);
 }
 }  // namespace
@@ -259,11 +253,7 @@ std::optional<ms::LatLon> UTMtoLatLon(int easting, int northing, int zoneNumber,
   double const m = y / K0;
   double const mu = m / (R * M1);
 
-  double const p_rad = (mu +
-                        P2 * sin(2.0 * mu) +
-                        P3 * sin(4.0 * mu) +
-                        P4 * sin(6.0 * mu) +
-                        P5 * sin(8.0 * mu));
+  double const p_rad = (mu + P2 * sin(2.0 * mu) + P3 * sin(4.0 * mu) + P4 * sin(6.0 * mu) + P5 * sin(8.0 * mu));
 
   double const p_sin = sin(p_rad);
   double const p_sin2 = p_sin * p_sin;
@@ -290,14 +280,13 @@ std::optional<ms::LatLon> UTMtoLatLon(int easting, int northing, int zoneNumber,
   double const d5 = d4 * d;
   double const d6 = d5 * d;
 
-  double const latitude = (p_rad - (p_tan / r) *
-                          (d2 / 2.0 -
-                           d4 / 24.0 * (5.0 + 3.0 * p_tan2 + 10.0 * c - 4.0 * c2 - 9.0 * E_P2)) +
-                           d6 / 720.0 * (61.0 + 90.0 * p_tan2 + 298.0 * c + 45.0 * p_tan4 - 252.0 * E_P2 - 3.0 * c2));
+  double const latitude =
+      (p_rad - (p_tan / r) * (d2 / 2.0 - d4 / 24.0 * (5.0 + 3.0 * p_tan2 + 10.0 * c - 4.0 * c2 - 9.0 * E_P2)) +
+       d6 / 720.0 * (61.0 + 90.0 * p_tan2 + 298.0 * c + 45.0 * p_tan4 - 252.0 * E_P2 - 3.0 * c2));
 
-  double longitude = (d -
-                      d3 / 6.0 * (1.0 + 2.0 * p_tan2 + c) +
-                      d5 / 120.0 * (5.0 - 2.0 * c + 28.0 * p_tan2 - 3.0 * c2 + 8.0 * E_P2 + 24.0 * p_tan4)) / p_cos;
+  double longitude = (d - d3 / 6.0 * (1.0 + 2.0 * p_tan2 + c) +
+                      d5 / 120.0 * (5.0 - 2.0 * c + 28.0 * p_tan2 - 3.0 * c2 + 8.0 * E_P2 + 24.0 * p_tan4)) /
+                     p_cos;
 
   longitude = NormalizeAngle(longitude + math::DegToRad(static_cast<double>(ZoneNumberToCentralLon(zoneNumber))));
 
@@ -336,7 +325,6 @@ int SquareCharToEasting(char e, size_t set)
   return eastingValue;
 }
 
-
 /* Given the second letter from a two-letter MGRS 100k zone, and given the
  * MGRS table set for the zone number, figure out the northing value that
  * should be added to the other, secondary northing value. You have to
@@ -363,7 +351,7 @@ int SquareCharToNorthing(char n, int set)
       curRow++;
     if (curRow > 'V')
     {
-      if (rewindMarker) // Making sure that this loop ends even if n has invalid value.
+      if (rewindMarker)  // Making sure that this loop ends even if n has invalid value.
         return kInvalidEastingNorthing;
       curRow = 'A';
       rewindMarker = true;
@@ -374,7 +362,6 @@ int SquareCharToNorthing(char n, int set)
   return northingValue;
 }
 
-
 // Get minimum northing value of a MGRS zone.
 int ZoneToMinNorthing(char zoneLetter)
 {
@@ -420,7 +407,8 @@ std::optional<ms::LatLon> MGRStoLatLon(int easting, int northing, int zoneCode,
   auto const char1 = squareCode[0];
   auto const char2 = squareCode[1];
 
-  if (char1 < 'A' || char2 < 'A' || char1 > 'Z' || char2 > 'Z' || char1 == 'I' || char2 == 'I' || char1 == 'O' || char2 == 'O')
+  if (char1 < 'A' || char2 < 'A' || char1 > 'Z' || char2 > 'Z' || char1 == 'I' || char2 == 'I' || char1 == 'O' ||
+      char2 == 'O')
     return {};
 
   int const east100k = SquareCharToEasting(char1, set);
@@ -438,7 +426,7 @@ std::optional<ms::LatLon> MGRStoLatLon(int easting, int northing, int zoneCode,
   while (north100k < minNorthing)
     north100k += 2000000;
 
-  easting  += east100k;
+  easting += east100k;
   northing += north100k;
 
   return UTMtoLatLon(easting, northing, zoneCode, zoneLetter);
@@ -453,9 +441,9 @@ std::string FormatMGRS(double lat, double lon, int precision)
     precision = 1;
 
   if (lat <= -80 || lat > 84)
-    return {}; // Latitude limit exceeded.
+    return {};  // Latitude limit exceeded.
   if (lon <= -180 || lon > 180)
-    return {}; // Longitude limit exceeded.
+    return {};  // Longitude limit exceeded.
 
   UTMPoint mgrsp = LatLonToUtm(lat, lon);
 
@@ -470,9 +458,9 @@ std::string FormatMGRS(double lat, double lon, int precision)
 std::string FormatUTM(double lat, double lon)
 {
   if (lat <= -80 || lat > 84)
-    return {}; // Latitude limit exceeded.
+    return {};  // Latitude limit exceeded.
   if (lon <= -180 || lon > 180)
-    return {}; // Longitude limit exceeded.
+    return {};  // Longitude limit exceeded.
 
   return UTMtoStr(LatLonToUtm(lat, lon));
 }
diff --git a/libs/pyhelpers/pair.hpp b/libs/pyhelpers/pair.hpp
index fd51e3a42..5db8ab61c 100644
--- a/libs/pyhelpers/pair.hpp
+++ b/libs/pyhelpers/pair.hpp
@@ -17,7 +17,7 @@ struct pair_to_tuple
   {
     return incref(boost::python::make_tuple(p.first, p.second).ptr());
   }
-  
+
   static PyTypeObject const * get_pytype() { return &PyTuple_Type; }
 };
 
diff --git a/libs/pyhelpers/vector_list_conversion.hpp b/libs/pyhelpers/vector_list_conversion.hpp
index d4a91deff..e31af0283 100644
--- a/libs/pyhelpers/vector_list_conversion.hpp
+++ b/libs/pyhelpers/vector_list_conversion.hpp
@@ -10,8 +10,7 @@ namespace pyhelpers
 template <typename T>
 std::vector<T> PythonListToStdVector(boost::python::object const & iterable)
 {
-  return std::vector<T>(boost::python::stl_input_iterator<T>(iterable),
-                        boost::python::stl_input_iterator<T>());
+  return std::vector<T>(boost::python::stl_input_iterator<T>(iterable), boost::python::stl_input_iterator<T>());
 }
 
 // For this to work one should define
diff --git a/libs/pyhelpers/vector_uint8.hpp b/libs/pyhelpers/vector_uint8.hpp
index d10a417c4..4a5be5f70 100644
--- a/libs/pyhelpers/vector_uint8.hpp
+++ b/libs/pyhelpers/vector_uint8.hpp
@@ -21,9 +21,7 @@ struct vector_uint8t_to_str
 {
   static PyObject * convert(std::vector<uint8_t> const & v)
   {
-    auto bytes = PyBytes_FromStringAndSize(
-        reinterpret_cast<char const *>(v.data()),
-        v.size());
+    auto bytes = PyBytes_FromStringAndSize(reinterpret_cast<char const *>(v.data()), v.size());
     Py_INCREF(bytes);
 
     return bytes;
@@ -47,11 +45,10 @@ struct vector_uint8t_from_python_str
 
   static void construct(PyObject * obj_ptr, converter::rvalue_from_python_stage1_data * data)
   {
-    const char * value = PyBytes_AsString(obj_ptr);
+    char const * value = PyBytes_AsString(obj_ptr);
     if (value == nullptr)
       throw_error_already_set();
-    void * storage =
-        ((converter::rvalue_from_python_storage<std::vector<uint8_t>> *)data)->storage.bytes;
+    void * storage = ((converter::rvalue_from_python_storage<std::vector<uint8_t>> *)data)->storage.bytes;
     new (storage) std::vector<uint8_t>(value, value + PyBytes_Size(obj_ptr));
     data->convertible = storage;
   }
diff --git a/libs/qt_tstfrm/test_main_loop.cpp b/libs/qt_tstfrm/test_main_loop.cpp
index ecd051886..2609bde87 100644
--- a/libs/qt_tstfrm/test_main_loop.cpp
+++ b/libs/qt_tstfrm/test_main_loop.cpp
@@ -1,10 +1,10 @@
 #include "qt_tstfrm/test_main_loop.hpp"
 
 #include <QtCore/QTimer>
-#include <QtWidgets/QApplication>
-#include <QtWidgets/QWidget>
 #include <QtGui/QOffscreenSurface>
 #include <QtGui/QOpenGLContext>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QWidget>
 
 #include "base/scope_guard.hpp"
 
@@ -17,15 +17,10 @@ namespace
 class MyWidget : public QWidget
 {
 public:
-  explicit MyWidget(testing::RenderFunction && fn)
-    : m_fn(std::move(fn))
-  {}
+  explicit MyWidget(testing::RenderFunction && fn) : m_fn(std::move(fn)) {}
 
 protected:
-  void paintEvent(QPaintEvent * e) override
-  {
-    m_fn(this);
-  }
+  void paintEvent(QPaintEvent * e) override { m_fn(this); }
 
 private:
   testing::RenderFunction m_fn;
diff --git a/libs/qt_tstfrm/test_main_loop.hpp b/libs/qt_tstfrm/test_main_loop.hpp
index 4796b99f7..bb2c4b095 100644
--- a/libs/qt_tstfrm/test_main_loop.hpp
+++ b/libs/qt_tstfrm/test_main_loop.hpp
@@ -5,8 +5,8 @@
 class QPaintDevice;
 namespace testing
 {
-using RenderFunction = std::function<void (QPaintDevice *)>;
-using TestFunction = std::function<void ()>;
+using RenderFunction = std::function<void(QPaintDevice *)>;
+using TestFunction = std::function<void()>;
 }  // namespace testing
 
 extern void RunTestLoop(char const * testName, testing::RenderFunction && fn, bool autoExit = true);
diff --git a/libs/routing/absent_regions_finder.cpp b/libs/routing/absent_regions_finder.cpp
index 24bdc1d50..d3267d6df 100644
--- a/libs/routing/absent_regions_finder.cpp
+++ b/libs/routing/absent_regions_finder.cpp
@@ -5,8 +5,7 @@ namespace routing
 {
 AbsentRegionsFinder::AbsentRegionsFinder(CountryFileGetterFn const & countryFileGetter,
                                          LocalFileCheckerFn const & localFileChecker,
-                                         std::shared_ptr<NumMwmIds> numMwmIds,
-                                         DataSource & dataSource)
+                                         std::shared_ptr<NumMwmIds> numMwmIds, DataSource & dataSource)
   : m_countryFileGetterFn(countryFileGetter)
   , m_localFileCheckerFn(localFileChecker)
   , m_numMwmIds(std::move(numMwmIds))
@@ -16,8 +15,7 @@ AbsentRegionsFinder::AbsentRegionsFinder(CountryFileGetterFn const & countryFile
   CHECK(m_localFileCheckerFn, ());
 }
 
-void AbsentRegionsFinder::GenerateAbsentRegions(Checkpoints const & checkpoints,
-                                                RouterDelegate const & delegate)
+void AbsentRegionsFinder::GenerateAbsentRegions(Checkpoints const & checkpoints, RouterDelegate const & delegate)
 {
   if (m_routerThread)
   {
@@ -28,8 +26,8 @@ void AbsentRegionsFinder::GenerateAbsentRegions(Checkpoints const & checkpoints,
   if (AreCheckpointsInSameMwm(checkpoints))
     return;
 
-  std::unique_ptr<RegionsRouter> router = std::make_unique<RegionsRouter>(
-      m_countryFileGetterFn, m_numMwmIds, m_dataSource, delegate, checkpoints);
+  std::unique_ptr<RegionsRouter> router =
+      std::make_unique<RegionsRouter>(m_countryFileGetterFn, m_numMwmIds, m_dataSource, delegate, checkpoints);
 
   // iOS can't reuse threads. So we need to recreate the thread.
   m_routerThread = std::make_unique<threads::Thread>();
@@ -42,12 +40,10 @@ void AbsentRegionsFinder::GetAbsentRegions(std::set<std::string> & regions)
   GetAllRegions(regions);
 
   for (auto i = regions.begin(); i != regions.end();)
-  {
     if (m_localFileCheckerFn(*i))
       i = regions.erase(i);
     else
       ++i;
-  }
 }
 
 void AbsentRegionsFinder::GetAllRegions(std::set<std::string> & countries)
@@ -60,10 +56,8 @@ void AbsentRegionsFinder::GetAllRegions(std::set<std::string> & countries)
   m_routerThread->Join();
 
   for (auto const & mwmName : m_routerThread->GetRoutineAs<RegionsRouter>()->GetMwmNames())
-  {
     if (!mwmName.empty())
       countries.emplace(mwmName);
-  }
 
   m_routerThread.reset();
 }
@@ -71,13 +65,8 @@ void AbsentRegionsFinder::GetAllRegions(std::set<std::string> & countries)
 bool AbsentRegionsFinder::AreCheckpointsInSameMwm(Checkpoints const & checkpoints) const
 {
   for (size_t i = 0; i < checkpoints.GetNumSubroutes(); ++i)
-  {
-    if (m_countryFileGetterFn(checkpoints.GetPoint(i)) !=
-        m_countryFileGetterFn(checkpoints.GetPoint(i + 1)))
-    {
+    if (m_countryFileGetterFn(checkpoints.GetPoint(i)) != m_countryFileGetterFn(checkpoints.GetPoint(i + 1)))
       return false;
-    }
-  }
 
   return true;
 }
diff --git a/libs/routing/absent_regions_finder.hpp b/libs/routing/absent_regions_finder.hpp
index 8028b6009..4a2d8734f 100644
--- a/libs/routing/absent_regions_finder.hpp
+++ b/libs/routing/absent_regions_finder.hpp
@@ -19,8 +19,7 @@ using LocalFileCheckerFn = std::function<bool(std::string const &)>;
 class AbsentRegionsFinder
 {
 public:
-  AbsentRegionsFinder(CountryFileGetterFn const & countryFileGetter,
-                      LocalFileCheckerFn const & localFileChecker,
+  AbsentRegionsFinder(CountryFileGetterFn const & countryFileGetter, LocalFileCheckerFn const & localFileChecker,
                       std::shared_ptr<NumMwmIds> numMwmIds, DataSource & dataSource);
 
   // Creates new thread |m_routerThread| and starts routing in it.
diff --git a/libs/routing/async_router.cpp b/libs/routing/async_router.cpp
index 161fc5102..cbd9036ea 100644
--- a/libs/routing/async_router.cpp
+++ b/libs/routing/async_router.cpp
@@ -19,8 +19,7 @@ AsyncRouter::RouterDelegateProxy::RouterDelegateProxy(ReadyCallbackOwnership con
                                                       NeedMoreMapsCallback const & onNeedMoreMaps,
                                                       RemoveRouteCallback const & onRemoveRoute,
                                                       PointCheckCallback const & onPointCheck,
-                                                      ProgressCallback const & onProgress,
-                                                      uint32_t timeoutSec)
+                                                      ProgressCallback const & onProgress, uint32_t timeoutSec)
   : m_onReadyOwnership(onReady)
   , m_onNeedMoreMaps(onNeedMoreMaps)
   , m_onRemoveRoute(onRemoveRoute)
@@ -45,8 +44,7 @@ void AsyncRouter::RouterDelegateProxy::OnReady(std::shared_ptr<Route> route, Rou
   m_onReadyOwnership(std::move(route), resultCode);
 }
 
-void AsyncRouter::RouterDelegateProxy::OnNeedMoreMaps(uint64_t routeId,
-                                                      std::set<std::string> const & absentCounties)
+void AsyncRouter::RouterDelegateProxy::OnNeedMoreMaps(uint64_t routeId, std::set<std::string> const & absentCounties)
 {
   if (!m_onNeedMoreMaps)
     return;
@@ -76,8 +74,7 @@ void AsyncRouter::RouterDelegateProxy::Cancel()
   m_delegate.Cancel();
 }
 
-bool AsyncRouter::FindClosestProjectionToRoad(m2::PointD const & point,
-                                              m2::PointD const & direction, double radius,
+bool AsyncRouter::FindClosestProjectionToRoad(m2::PointD const & point, m2::PointD const & direction, double radius,
                                               EdgeProj & proj)
 {
   return m_router->FindClosestProjectionToRoad(point, direction, radius, proj);
@@ -96,9 +93,7 @@ void AsyncRouter::RouterDelegateProxy::OnProgress(float progress)
       return;
 
     onProgress = m_onProgress;
-    GetPlatform().RunTask(Platform::Thread::Gui, [onProgress, progress]() {
-      onProgress(progress);
-    });
+    GetPlatform().RunTask(Platform::Thread::Gui, [onProgress, progress]() { onProgress(progress); });
   }
 }
 
@@ -149,8 +144,7 @@ AsyncRouter::~AsyncRouter()
   m_thread.join();
 }
 
-void AsyncRouter::SetRouter(std::unique_ptr<IRouter> && router,
-                            std::unique_ptr<AbsentRegionsFinder> && finder)
+void AsyncRouter::SetRouter(std::unique_ptr<IRouter> && router, std::unique_ptr<AbsentRegionsFinder> && finder)
 {
   unique_lock ul(m_guard);
 
@@ -160,8 +154,7 @@ void AsyncRouter::SetRouter(std::unique_ptr<IRouter> && router,
   m_absentRegionsFinder = std::move(finder);
 }
 
-void AsyncRouter::CalculateRoute(Checkpoints const & checkpoints, m2::PointD const & direction,
-                                 bool adjustToPrevRoute,
+void AsyncRouter::CalculateRoute(Checkpoints const & checkpoints, m2::PointD const & direction, bool adjustToPrevRoute,
                                  ReadyCallbackOwnership const & readyCallback,
                                  NeedMoreMapsCallback const & needMoreMapsCallback,
                                  RemoveRouteCallback const & removeRouteCallback,
@@ -175,9 +168,8 @@ void AsyncRouter::CalculateRoute(Checkpoints const & checkpoints, m2::PointD con
 
   ResetDelegate();
 
-  m_delegateProxy =
-      std::make_shared<RouterDelegateProxy>(readyCallback, needMoreMapsCallback, removeRouteCallback,
-                                       m_pointCheckCallback, progressCallback, timeoutSec);
+  m_delegateProxy = std::make_shared<RouterDelegateProxy>(readyCallback, needMoreMapsCallback, removeRouteCallback,
+                                                          m_pointCheckCallback, progressCallback, timeoutSec);
 
   m_hasRequest = true;
   m_threadCondVar.notify_one();
@@ -204,59 +196,32 @@ void AsyncRouter::LogCode(RouterResultCode code, double const elapsedSec)
 {
   switch (code)
   {
-    case RouterResultCode::StartPointNotFound:
-      LOG(LWARNING, ("Can't find start or end node"));
-      break;
-    case RouterResultCode::EndPointNotFound:
-      LOG(LWARNING, ("Can't find end point node"));
-      break;
-    case RouterResultCode::PointsInDifferentMWM:
-      LOG(LWARNING, ("Points are in different MWMs"));
-      break;
-    case RouterResultCode::RouteNotFound:
-      LOG(LWARNING, ("Route not found"));
-      break;
-    case RouterResultCode::RouteFileNotExist:
-      LOG(LWARNING, ("There is no routing file"));
-      break;
-    case RouterResultCode::NeedMoreMaps:
-      LOG(LINFO,
-          ("Routing can find a better way with additional maps, elapsed seconds:", elapsedSec));
-      break;
-    case RouterResultCode::Cancelled:
-      LOG(LINFO, ("Route calculation cancelled, elapsed seconds:", elapsedSec));
-      break;
-    case RouterResultCode::NoError:
-      LOG(LINFO, ("Route found, elapsed seconds:", elapsedSec));
-      break;
-    case RouterResultCode::NoCurrentPosition:
-      LOG(LINFO, ("No current position"));
-      break;
-    case RouterResultCode::InconsistentMWMandRoute:
-      LOG(LINFO, ("Inconsistent mwm and route"));
-      break;
-    case RouterResultCode::InternalError:
-      LOG(LINFO, ("Internal error"));
-      break;
-    case RouterResultCode::FileTooOld:
-      LOG(LINFO, ("File too old"));
-      break;
-    case RouterResultCode::IntermediatePointNotFound:
-      LOG(LWARNING, ("Can't find intermediate point node"));
-      break;
-    case RouterResultCode::TransitRouteNotFoundNoNetwork:
-      LOG(LWARNING, ("No transit route is found because there's no transit network in the mwm of "
-                     "the route point"));
-      break;
-    case RouterResultCode::TransitRouteNotFoundTooLongPedestrian:
-      LOG(LWARNING, ("No transit route is found because pedestrian way is too long"));
-      break;
-    case RouterResultCode::RouteNotFoundRedressRouteError:
-      LOG(LWARNING, ("Route not found because of a redress route error"));
-      break;
-  case RouterResultCode::HasWarnings:
-      LOG(LINFO, ("Route has warnings, elapsed seconds:", elapsedSec));
-      break;
+  case RouterResultCode::StartPointNotFound: LOG(LWARNING, ("Can't find start or end node")); break;
+  case RouterResultCode::EndPointNotFound: LOG(LWARNING, ("Can't find end point node")); break;
+  case RouterResultCode::PointsInDifferentMWM: LOG(LWARNING, ("Points are in different MWMs")); break;
+  case RouterResultCode::RouteNotFound: LOG(LWARNING, ("Route not found")); break;
+  case RouterResultCode::RouteFileNotExist: LOG(LWARNING, ("There is no routing file")); break;
+  case RouterResultCode::NeedMoreMaps:
+    LOG(LINFO, ("Routing can find a better way with additional maps, elapsed seconds:", elapsedSec));
+    break;
+  case RouterResultCode::Cancelled: LOG(LINFO, ("Route calculation cancelled, elapsed seconds:", elapsedSec)); break;
+  case RouterResultCode::NoError: LOG(LINFO, ("Route found, elapsed seconds:", elapsedSec)); break;
+  case RouterResultCode::NoCurrentPosition: LOG(LINFO, ("No current position")); break;
+  case RouterResultCode::InconsistentMWMandRoute: LOG(LINFO, ("Inconsistent mwm and route")); break;
+  case RouterResultCode::InternalError: LOG(LINFO, ("Internal error")); break;
+  case RouterResultCode::FileTooOld: LOG(LINFO, ("File too old")); break;
+  case RouterResultCode::IntermediatePointNotFound: LOG(LWARNING, ("Can't find intermediate point node")); break;
+  case RouterResultCode::TransitRouteNotFoundNoNetwork:
+    LOG(LWARNING, ("No transit route is found because there's no transit network in the mwm of "
+                   "the route point"));
+    break;
+  case RouterResultCode::TransitRouteNotFoundTooLongPedestrian:
+    LOG(LWARNING, ("No transit route is found because pedestrian way is too long"));
+    break;
+  case RouterResultCode::RouteNotFoundRedressRouteError:
+    LOG(LWARNING, ("Route not found because of a redress route error"));
+    break;
+  case RouterResultCode::HasWarnings: LOG(LINFO, ("Route has warnings, elapsed seconds:", elapsedSec)); break;
   }
 }
 
@@ -275,7 +240,7 @@ void AsyncRouter::ThreadFunc()
   {
     {
       unique_lock ul(m_guard);
-      m_threadCondVar.wait(ul, [this](){ return m_threadExit || m_hasRequest || m_clearState; });
+      m_threadCondVar.wait(ul, [this]() { return m_threadExit || m_hasRequest || m_clearState; });
 
       if (m_clearState && m_router)
       {
@@ -344,10 +309,9 @@ void AsyncRouter::CalculateRoute()
       absentRegionsFinder->GenerateAbsentRegions(checkpoints, delegateProxy->GetDelegate());
 
     // Run basic request.
-    code = router->CalculateRoute(checkpoints, startDirection, adjustToPrevRoute,
-                                  delegateProxy->GetDelegate(), *route);
+    code = router->CalculateRoute(checkpoints, startDirection, adjustToPrevRoute, delegateProxy->GetDelegate(), *route);
     router->SetGuides({});
-    elapsedSec = timer.ElapsedSeconds(); // routing time
+    elapsedSec = timer.ElapsedSeconds();  // routing time
     LogCode(code, elapsedSec);
     LOG(LINFO, ("ETA:", route->GetTotalTimeSec(), "sec."));
   }
@@ -371,8 +335,7 @@ void AsyncRouter::CalculateRoute()
                           [delegateProxy, route, code]() { delegateProxy->OnReady(route, code); });
   }
 
-  bool const needAbsentRegions = (code != RouterResultCode::Cancelled &&
-          route->GetRouterId() != "ruler-router");
+  bool const needAbsentRegions = (code != RouterResultCode::Cancelled && route->GetRouterId() != "ruler-router");
 
   std::set<std::string> absent;
   if (needAbsentRegions)
@@ -388,7 +351,7 @@ void AsyncRouter::CalculateRoute()
     }
   }
 
-  elapsedSec = timer.ElapsedSeconds(); // routing time + absents fetch time
+  elapsedSec = timer.ElapsedSeconds();  // routing time + absents fetch time
   LogCode(code, elapsedSec);
 
   // Call callback only if we have some new data.
@@ -396,14 +359,12 @@ void AsyncRouter::CalculateRoute()
   {
     if (code == RouterResultCode::NeedMoreMaps)
     {
-      GetPlatform().RunTask(Platform::Thread::Gui, [delegateProxy, routeId, absent]() {
-        delegateProxy->OnNeedMoreMaps(routeId, absent);
-      });
+      GetPlatform().RunTask(Platform::Thread::Gui,
+                            [delegateProxy, routeId, absent]() { delegateProxy->OnNeedMoreMaps(routeId, absent); });
     }
     else
     {
-      GetPlatform().RunTask(Platform::Thread::Gui,
-                            [delegateProxy, code]() { delegateProxy->OnRemoveRoute(code); });
+      GetPlatform().RunTask(Platform::Thread::Gui, [delegateProxy, code]() { delegateProxy->OnRemoveRoute(code); });
     }
   }
 }
diff --git a/libs/routing/async_router.hpp b/libs/routing/async_router.hpp
index d03e13987..20209914d 100644
--- a/libs/routing/async_router.hpp
+++ b/libs/routing/async_router.hpp
@@ -34,8 +34,7 @@ public:
   /// Sets a synchronous router, current route calculation will be cancelled
   /// @param router pointer to a router implementation
   /// @param finder pointer to a router for generated absent wmwms.
-  void SetRouter(std::unique_ptr<IRouter> && router,
-                 std::unique_ptr<AbsentRegionsFinder> && finder);
+  void SetRouter(std::unique_ptr<IRouter> && router, std::unique_ptr<AbsentRegionsFinder> && finder);
 
   /// Main method to calculate new route from startPt to finalPt with start direction
   /// Processed result will be passed to callback. Callback will be called at the GUI thread.
@@ -48,19 +47,17 @@ public:
   /// @param timeoutSec timeout to cancel routing. 0 is infinity.
   // @TODO(bykoianko) Gather |readyCallback|, |needMoreMapsCallback| and |removeRouteCallback|
   // to one delegate. No need to add |progressCallback| to the delegate.
-  void CalculateRoute(Checkpoints const & checkpoints, m2::PointD const & direction,
-                      bool adjustToPrevRoute, ReadyCallbackOwnership const & readyCallback,
-                      NeedMoreMapsCallback const & needMoreMapsCallback,
-                      RemoveRouteCallback const & removeRouteCallback,
-                      ProgressCallback const & progressCallback,
+  void CalculateRoute(Checkpoints const & checkpoints, m2::PointD const & direction, bool adjustToPrevRoute,
+                      ReadyCallbackOwnership const & readyCallback, NeedMoreMapsCallback const & needMoreMapsCallback,
+                      RemoveRouteCallback const & removeRouteCallback, ProgressCallback const & progressCallback,
                       uint32_t timeoutSec = RouterDelegate::kNoTimeout);
 
   void SetGuidesTracks(GuidesTracks && guides);
   /// Interrupt routing and clear buffers
   void ClearState();
 
-  bool FindClosestProjectionToRoad(m2::PointD const & point, m2::PointD const & direction,
-                                   double radius, EdgeProj & proj);
+  bool FindClosestProjectionToRoad(m2::PointD const & point, m2::PointD const & direction, double radius,
+                                   EdgeProj & proj);
 
 private:
   /// Worker thread function
@@ -75,12 +72,9 @@ private:
   class RouterDelegateProxy
   {
   public:
-    RouterDelegateProxy(ReadyCallbackOwnership const & onReady,
-                        NeedMoreMapsCallback const & onNeedMoreMaps,
-                        RemoveRouteCallback const & onRemoveRoute,
-                        PointCheckCallback const & onPointCheck,
-                        ProgressCallback const & onProgress,
-                        uint32_t timeoutSec);
+    RouterDelegateProxy(ReadyCallbackOwnership const & onReady, NeedMoreMapsCallback const & onNeedMoreMaps,
+                        RemoveRouteCallback const & onRemoveRoute, PointCheckCallback const & onPointCheck,
+                        ProgressCallback const & onProgress, uint32_t timeoutSec);
 
     void OnReady(std::shared_ptr<Route> route, RouterResultCode resultCode);
     void OnNeedMoreMaps(uint64_t routeId, std::set<std::string> const & absentCounties);
diff --git a/libs/routing/base/astar_algorithm.hpp b/libs/routing/base/astar_algorithm.hpp
index c87e92f42..f428e5d5c 100644
--- a/libs/routing/base/astar_algorithm.hpp
+++ b/libs/routing/base/astar_algorithm.hpp
@@ -28,12 +28,18 @@ namespace astar
 
 struct DefaultVisitor
 {
-  template <class State, class Vertex> void operator() (State const &, Vertex const &) const {}
+  template <class State, class Vertex>
+  void operator()(State const &, Vertex const &) const
+  {}
 };
 
 struct DefaultLengthChecker
 {
-  template <class Weight> bool operator()(Weight const &) const { return true; }
+  template <class Weight>
+  bool operator()(Weight const &) const
+  {
+    return true;
+  }
 };
 }  // namespace astar
 
@@ -41,7 +47,6 @@ template <typename Vertex, typename Edge, typename Weight>
 class AStarAlgorithm
 {
 public:
-
   using Graph = AStarGraph<Vertex, Edge, Weight>;
 
   enum class Result
@@ -55,15 +60,9 @@ public:
   {
     switch (result)
     {
-    case Result::OK:
-      os << "OK";
-      break;
-    case Result::NoPath:
-      os << "NoPath";
-      break;
-    case Result::Cancelled:
-      os << "Cancelled";
-      break;
+    case Result::OK: os << "OK"; break;
+    case Result::NoPath: os << "NoPath"; break;
+    case Result::Cancelled: os << "Cancelled"; break;
     }
     return os;
   }
@@ -72,12 +71,11 @@ public:
   {
     ParamsBase(Graph & graph, Vertex const & startVertex, Vertex const & finalVertex,
                base::Cancellable const & cancellable)
-        : m_graph(graph)
-        , m_startVertex(startVertex)
-        , m_finalVertex(finalVertex)
-        , m_cancellable(cancellable)
-    {
-    }
+      : m_graph(graph)
+      , m_startVertex(startVertex)
+      , m_finalVertex(finalVertex)
+      , m_cancellable(cancellable)
+    {}
 
     Graph & m_graph;
     Weight const m_weightEpsilon = m_graph.GetAStarWeightEpsilon();
@@ -92,19 +90,16 @@ public:
   // |LengthChecker| callback used to check path length from start/finish to the edge (including the
   // edge itself) before adding the edge to AStar queue. Can be used to clip some path which does
   // not meet restrictions.
-  template <typename Visitor = astar::DefaultVisitor,
-            typename LengthChecker = astar::DefaultLengthChecker>
+  template <typename Visitor = astar::DefaultVisitor, typename LengthChecker = astar::DefaultLengthChecker>
   struct Params : public ParamsBase
   {
-    Params(Graph & graph, Vertex const & startVertex, Vertex const & finalVertex,
-           base::Cancellable const & cancellable,
+    Params(Graph & graph, Vertex const & startVertex, Vertex const & finalVertex, base::Cancellable const & cancellable,
            Visitor && onVisitedVertexCallback = astar::DefaultVisitor(),
            LengthChecker && checkLengthCallback = astar::DefaultLengthChecker())
       : ParamsBase(graph, startVertex, finalVertex, cancellable)
       , m_onVisitedVertexCallback(std::forward<Visitor>(onVisitedVertexCallback))
       , m_checkLengthCallback(std::forward<LengthChecker>(checkLengthCallback))
-    {
-    }
+    {}
 
     Visitor m_onVisitedVertexCallback;
     LengthChecker const m_checkLengthCallback;
@@ -117,8 +112,7 @@ public:
                    LengthChecker && checkLengthCallback = astar::DefaultLengthChecker())
       : ParamsBase(graph, startVertex, finalVertex, m_dummy)
       , m_checkLengthCallback(std::forward<LengthChecker>(checkLengthCallback))
-    {
-    }
+    {}
 
     astar::DefaultVisitor const m_onVisitedVertexCallback{};
     LengthChecker const m_checkLengthCallback;
@@ -130,15 +124,9 @@ public:
   class Context final
   {
   public:
-    Context(Graph & graph) : m_graph(graph)
-    {
-      m_graph.SetAStarParents(true /* forward */, m_parents);
-    }
+    Context(Graph & graph) : m_graph(graph) { m_graph.SetAStarParents(true /* forward */, m_parents); }
 
-    ~Context()
-    {
-      m_graph.DropAStarParents();
-    }
+    ~Context() { m_graph.DropAStarParents(); }
 
     void Clear()
     {
@@ -146,10 +134,7 @@ public:
       m_parents.clear();
     }
 
-    bool HasDistance(Vertex const & vertex) const
-    {
-      return m_distanceMap.find(vertex) != m_distanceMap.cend();
-    }
+    bool HasDistance(Vertex const & vertex) const { return m_distanceMap.find(vertex) != m_distanceMap.cend(); }
 
     Weight GetDistance(Vertex const & vertex) const
     {
@@ -160,20 +145,11 @@ public:
       return it->second;
     }
 
-    void SetDistance(Vertex const & vertex, Weight const & distance)
-    {
-      m_distanceMap[vertex] = distance;
-    }
+    void SetDistance(Vertex const & vertex, Weight const & distance) { m_distanceMap[vertex] = distance; }
 
-    void SetParent(Vertex const & parent, Vertex const & child)
-    {
-      m_parents[parent] = child;
-    }
+    void SetParent(Vertex const & parent, Vertex const & child) { m_parents[parent] = child; }
 
-    bool HasParent(Vertex const & child) const
-    {
-      return m_parents.count(child) != 0;
-    }
+    bool HasParent(Vertex const & child) const { return m_parents.count(child) != 0; }
 
     Vertex const & GetParent(Vertex const & child) const
     {
@@ -194,15 +170,13 @@ public:
 
   // VisitVertex returns true: wave will continue
   // VisitVertex returns false: wave will stop
-  template <typename VisitVertex, typename AdjustEdgeWeight, typename FilterStates,
-            typename ReducedToRealLength>
+  template <typename VisitVertex, typename AdjustEdgeWeight, typename FilterStates, typename ReducedToRealLength>
   void PropagateWave(Graph & graph, Vertex const & startVertex, VisitVertex && visitVertex,
                      AdjustEdgeWeight && adjustEdgeWeight, FilterStates && filterStates,
                      ReducedToRealLength && reducedToRealLength, Context & context) const;
 
   template <typename VisitVertex>
-  void PropagateWave(Graph & graph, Vertex const & startVertex, VisitVertex && visitVertex,
-                     Context & context) const;
+  void PropagateWave(Graph & graph, Vertex const & startVertex, VisitVertex && visitVertex, Context & context) const;
 
   template <typename P>
   Result FindPath(P & params, RoutingResult<Vertex, Weight> & result) const;
@@ -225,8 +199,7 @@ public:
   // Adjust route to the previous one.
   // Expects |params.m_checkLengthCallback| to check wave propagation limit.
   template <typename P>
-  typename AStarAlgorithm<Vertex, Edge, Weight>::Result AdjustRoute(P & params,
-                                                                    std::vector<Edge> const & prevRoute,
+  typename AStarAlgorithm<Vertex, Edge, Weight>::Result AdjustRoute(P & params, std::vector<Edge> const & prevRoute,
                                                                     RoutingResult<Vertex, Weight> & result) const;
 
 private:
@@ -259,9 +232,10 @@ private:
   struct State
   {
     State(Vertex const & vertex, Weight const & distance, Weight const & heuristic)
-        : vertex(vertex), distance(distance), heuristic(heuristic)
-    {
-    }
+      : vertex(vertex)
+      , distance(distance)
+      , heuristic(heuristic)
+    {}
     State(Vertex const & vertex, Weight const & distance) : State(vertex, distance, Weight()) {}
 
     inline bool operator>(State const & rhs) const { return distance > rhs.distance; }
@@ -278,22 +252,18 @@ private:
   {
     using Parents = typename Graph::Parents;
 
-    BidirectionalStepContext(bool forward, Vertex const & startVertex, Vertex const & finalVertex,
-                             Graph & graph)
-        : forward(forward)
-        , startVertex(startVertex)
-        , finalVertex(finalVertex)
-        , graph(graph)
+    BidirectionalStepContext(bool forward, Vertex const & startVertex, Vertex const & finalVertex, Graph & graph)
+      : forward(forward)
+      , startVertex(startVertex)
+      , finalVertex(finalVertex)
+      , graph(graph)
     {
       bestVertex = forward ? startVertex : finalVertex;
       pS = ConsistentHeuristic(bestVertex);
       graph.SetAStarParents(forward, parent);
     }
 
-    ~BidirectionalStepContext()
-    {
-      graph.DropAStarParents();
-    }
+    ~BidirectionalStepContext() { graph.DropAStarParents(); }
 
     Weight TopDistance() const
     {
@@ -336,10 +306,7 @@ private:
       return it != bestDistance.end() && state.distance > it->second - eps;
     }
 
-    void UpdateDistance(State const & state)
-    {
-      bestDistance.insert_or_assign(state.vertex, state.distance);
-    }
+    void UpdateDistance(State const & state) { bestDistance.insert_or_assign(state.vertex, state.distance); }
 
     std::optional<Weight> GetDistance(Vertex const & vertex) const
     {
@@ -347,10 +314,7 @@ private:
       return it != bestDistance.cend() ? std::optional<Weight>(it->second) : std::nullopt;
     }
 
-    void UpdateParent(Vertex const & to, Vertex const & from)
-    {
-      parent.insert_or_assign(to, from);
-    }
+    void UpdateParent(Vertex const & to, Vertex const & from) { parent.insert_or_assign(to, from); }
 
     void GetAdjacencyList(State const & state, typename Graph::EdgeListT & adj)
     {
@@ -383,13 +347,12 @@ private:
     Weight pS;
   };
 
-  static void ReconstructPath(Vertex const & v,
-                              typename BidirectionalStepContext::Parents const & parent,
+  static void ReconstructPath(Vertex const & v, typename BidirectionalStepContext::Parents const & parent,
                               std::vector<Vertex> & path);
-  static void ReconstructPathBidirectional(
-      Vertex const & v, Vertex const & w,
-      typename BidirectionalStepContext::Parents const & parentV,
-      typename BidirectionalStepContext::Parents const & parentW, std::vector<Vertex> & path);
+  static void ReconstructPathBidirectional(Vertex const & v, Vertex const & w,
+                                           typename BidirectionalStepContext::Parents const & parentV,
+                                           typename BidirectionalStepContext::Parents const & parentW,
+                                           std::vector<Vertex> & path);
 };
 
 template <typename Vertex, typename Edge, typename Weight>
@@ -399,13 +362,12 @@ constexpr Weight AStarAlgorithm<Vertex, Edge, Weight>::kZeroDistance;
 
 template <typename Vertex, typename Edge, typename Weight>
 template <typename VisitVertex, typename AdjustEdgeWeight, typename FilterStates, typename ReducedToFullLength>
-void AStarAlgorithm<Vertex, Edge, Weight>::PropagateWave(
-    Graph & graph, Vertex const & startVertex,
-    VisitVertex && visitVertex,
-    AdjustEdgeWeight && adjustEdgeWeight,
-    FilterStates && filterStates,
-    ReducedToFullLength && reducedToFullLength,
-    AStarAlgorithm<Vertex, Edge, Weight>::Context & context) const
+void AStarAlgorithm<Vertex, Edge, Weight>::PropagateWave(Graph & graph, Vertex const & startVertex,
+                                                         VisitVertex && visitVertex,
+                                                         AdjustEdgeWeight && adjustEdgeWeight,
+                                                         FilterStates && filterStates,
+                                                         ReducedToFullLength && reducedToFullLength,
+                                                         AStarAlgorithm<Vertex, Edge, Weight>::Context & context) const
 {
   auto const epsilon = graph.GetAStarWeightEpsilon();
 
@@ -457,17 +419,14 @@ void AStarAlgorithm<Vertex, Edge, Weight>::PropagateWave(
 
 template <typename Vertex, typename Edge, typename Weight>
 template <typename VisitVertex>
-void AStarAlgorithm<Vertex, Edge, Weight>::PropagateWave(
-    Graph & graph, Vertex const & startVertex, VisitVertex && visitVertex,
-    AStarAlgorithm<Vertex, Edge, Weight>::Context & context) const
+void AStarAlgorithm<Vertex, Edge, Weight>::PropagateWave(Graph & graph, Vertex const & startVertex,
+                                                         VisitVertex && visitVertex,
+                                                         AStarAlgorithm<Vertex, Edge, Weight>::Context & context) const
 {
-  auto const adjustEdgeWeight = [](Vertex const & /* vertex */, Edge const & edge) {
-    return edge.GetWeight();
-  };
+  auto const adjustEdgeWeight = [](Vertex const & /* vertex */, Edge const & edge) { return edge.GetWeight(); };
   auto const filterStates = [](State const & /* state */) { return true; };
   auto const reducedToRealLength = [](State const & state) { return state.distance; };
-  PropagateWave(graph, startVertex, visitVertex, adjustEdgeWeight, filterStates,
-                reducedToRealLength, context);
+  PropagateWave(graph, startVertex, visitVertex, adjustEdgeWeight, filterStates, reducedToRealLength, context);
 }
 
 // This implementation is based on the view that the A* algorithm
@@ -488,8 +447,8 @@ void AStarAlgorithm<Vertex, Edge, Weight>::PropagateWave(
 
 template <typename Vertex, typename Edge, typename Weight>
 template <typename P>
-typename AStarAlgorithm<Vertex, Edge, Weight>::Result
-AStarAlgorithm<Vertex, Edge, Weight>::FindPath(P & params, RoutingResult<Vertex, Weight> & result) const
+typename AStarAlgorithm<Vertex, Edge, Weight>::Result AStarAlgorithm<Vertex, Edge, Weight>::FindPath(
+    P & params, RoutingResult<Vertex, Weight> & result) const
 {
   auto const epsilon = params.m_weightEpsilon;
 
@@ -503,22 +462,17 @@ AStarAlgorithm<Vertex, Edge, Weight>::FindPath(P & params, RoutingResult<Vertex,
   PeriodicPollCancellable periodicCancellable(params.m_cancellable);
   Result resultCode = Result::NoPath;
 
-  auto const heuristicDiff = [&](Vertex const & vertexFrom, Vertex const & vertexTo) {
-    return graph.HeuristicCostEstimate(vertexFrom, finalVertex) -
-           graph.HeuristicCostEstimate(vertexTo, finalVertex);
-  };
+  auto const heuristicDiff = [&](Vertex const & vertexFrom, Vertex const & vertexTo)
+  { return graph.HeuristicCostEstimate(vertexFrom, finalVertex) - graph.HeuristicCostEstimate(vertexTo, finalVertex); };
 
-  auto const fullToReducedLength = [&](Vertex const & vertexFrom, Vertex const & vertexTo,
-                                       Weight const length) {
-    return length - heuristicDiff(vertexFrom, vertexTo);
-  };
+  auto const fullToReducedLength = [&](Vertex const & vertexFrom, Vertex const & vertexTo, Weight const length)
+  { return length - heuristicDiff(vertexFrom, vertexTo); };
 
-  auto const reducedToFullLength = [&](Vertex const & vertexFrom, Vertex const & vertexTo,
-                                       Weight const reducedLength) {
-    return reducedLength + heuristicDiff(vertexFrom, vertexTo);
-  };
+  auto const reducedToFullLength = [&](Vertex const & vertexFrom, Vertex const & vertexTo, Weight const reducedLength)
+  { return reducedLength + heuristicDiff(vertexFrom, vertexTo); };
 
-  auto visitVertex = [&](Vertex const & vertex) {
+  auto visitVertex = [&](Vertex const & vertex)
+  {
     if (periodicCancellable.IsCancelled())
     {
       resultCode = Result::Cancelled;
@@ -536,7 +490,8 @@ AStarAlgorithm<Vertex, Edge, Weight>::FindPath(P & params, RoutingResult<Vertex,
     return true;
   };
 
-  auto const adjustEdgeWeight = [&](Vertex const & vertexV, Edge const & edge) {
+  auto const adjustEdgeWeight = [&](Vertex const & vertexV, Edge const & edge)
+  {
     auto const reducedWeight = fullToReducedLength(vertexV, edge.GetTarget(), edge.GetWeight());
 
     CHECK_GREATER_OR_EQUAL(reducedWeight, -epsilon, ("Invariant violated."));
@@ -544,22 +499,18 @@ AStarAlgorithm<Vertex, Edge, Weight>::FindPath(P & params, RoutingResult<Vertex,
     return std::max(reducedWeight, kZeroDistance);
   };
 
-  auto const reducedToRealLength = [&](State const & state) {
-    return reducedToFullLength(startVertex, state.vertex, state.distance);
-  };
+  auto const reducedToRealLength = [&](State const & state)
+  { return reducedToFullLength(startVertex, state.vertex, state.distance); };
 
-  auto const filterStates = [&](State const & state) {
-    return params.m_checkLengthCallback(reducedToRealLength(state));
-  };
+  auto const filterStates = [&](State const & state)
+  { return params.m_checkLengthCallback(reducedToRealLength(state)); };
 
-  PropagateWave(graph, startVertex, visitVertex, adjustEdgeWeight, filterStates,
-                reducedToRealLength, context);
+  PropagateWave(graph, startVertex, visitVertex, adjustEdgeWeight, filterStates, reducedToRealLength, context);
 
   if (resultCode == Result::OK)
   {
     context.ReconstructPath(finalVertex, result.m_path);
-    result.m_distance =
-        reducedToFullLength(startVertex, finalVertex, context.GetDistance(finalVertex));
+    result.m_distance = reducedToFullLength(startVertex, finalVertex, context.GetDistance(finalVertex));
 
     if (!params.m_checkLengthCallback(result.m_distance))
       resultCode = Result::NoPath;
@@ -570,8 +521,8 @@ AStarAlgorithm<Vertex, Edge, Weight>::FindPath(P & params, RoutingResult<Vertex,
 
 template <typename Vertex, typename Edge, typename Weight>
 template <class P, class Emitter>
-typename AStarAlgorithm<Vertex, Edge, Weight>::Result
-AStarAlgorithm<Vertex, Edge, Weight>::FindPathBidirectionalEx(P & params, Emitter && emitter) const
+typename AStarAlgorithm<Vertex, Edge, Weight>::Result AStarAlgorithm<Vertex, Edge, Weight>::FindPathBidirectionalEx(
+    P & params, Emitter && emitter) const
 {
   auto const epsilon = params.m_weightEpsilon;
   auto & graph = params.m_graph;
@@ -605,7 +556,7 @@ AStarAlgorithm<Vertex, Edge, Weight>::FindPathBidirectionalEx(P & params, Emitte
   {
     // No problem if length check fails, but we still emit the result.
     // Happens with "transit" route because of length, haven't seen with regular car route.
-    //ASSERT(params.m_checkLengthCallback(bestPathRealLength), ());
+    // ASSERT(params.m_checkLengthCallback(bestPathRealLength), ());
 
     RoutingResult<Vertex, Weight> result;
     ReconstructPathBidirectional(cur->bestVertex, nxt->bestVertex, cur->parent, nxt->parent, result.m_path);
@@ -684,8 +635,8 @@ AStarAlgorithm<Vertex, Edge, Weight>::FindPathBidirectionalEx(P & params, Emitte
       if (reducedWeight < -epsilon && params.m_badReducedWeight(reducedWeight, std::max(pW, pV)))
       {
         // Break in Debug, log in Release and safe continue: std::max(reducedWeight, kZeroDistance).
-        LOG(LERROR, ("Invariant violated for:", "v =", stateV.vertex, "w =", stateW.vertex,
-                     "reduced weight =", reducedWeight));
+        LOG(LERROR,
+            ("Invariant violated for:", "v =", stateV.vertex, "w =", stateW.vertex, "reduced weight =", reducedWeight));
       }
 
       stateW.distance = stateV.distance + std::max(reducedWeight, kZeroDistance);
@@ -739,10 +690,8 @@ AStarAlgorithm<Vertex, Edge, Weight>::FindPathBidirectionalEx(P & params, Emitte
 
 template <typename Vertex, typename Edge, typename Weight>
 template <typename P>
-typename AStarAlgorithm<Vertex, Edge, Weight>::Result
-AStarAlgorithm<Vertex, Edge, Weight>::AdjustRoute(P & params,
-                                                  std::vector<Edge> const & prevRoute,
-                                                  RoutingResult<Vertex, Weight> & result) const
+typename AStarAlgorithm<Vertex, Edge, Weight>::Result AStarAlgorithm<Vertex, Edge, Weight>::AdjustRoute(
+    P & params, std::vector<Edge> const & prevRoute, RoutingResult<Vertex, Weight> & result) const
 {
   auto & graph = params.m_graph;
   auto const & startVertex = params.m_startVertex;
@@ -766,8 +715,8 @@ AStarAlgorithm<Vertex, Edge, Weight>::AdjustRoute(P & params,
   Context context(graph);
   PeriodicPollCancellable periodicCancellable(params.m_cancellable);
 
-  auto visitVertex = [&](Vertex const & vertex) {
-
+  auto visitVertex = [&](Vertex const & vertex)
+  {
     if (periodicCancellable.IsCancelled())
     {
       wasCancelled = true;
@@ -790,18 +739,13 @@ AStarAlgorithm<Vertex, Edge, Weight>::AdjustRoute(P & params,
     return true;
   };
 
-  auto const adjustEdgeWeight = [](Vertex const & /* vertex */, Edge const & edge) {
-    return edge.GetWeight();
-  };
+  auto const adjustEdgeWeight = [](Vertex const & /* vertex */, Edge const & edge) { return edge.GetWeight(); };
 
-  auto const filterStates = [&](State const & state) {
-    return params.m_checkLengthCallback(state.distance);
-  };
+  auto const filterStates = [&](State const & state) { return params.m_checkLengthCallback(state.distance); };
 
   auto const reducedToRealLength = [&](State const & state) { return state.distance; };
 
-  PropagateWave(graph, startVertex, visitVertex, adjustEdgeWeight, filterStates,
-                reducedToRealLength, context);
+  PropagateWave(graph, startVertex, visitVertex, adjustEdgeWeight, filterStates, reducedToRealLength, context);
   if (wasCancelled)
     return Result::Cancelled;
 
@@ -824,8 +768,7 @@ AStarAlgorithm<Vertex, Edge, Weight>::AdjustRoute(P & params,
     }
   }
 
-  CHECK(found, ("Can't find", returnVertex, ", prev:", prevRoute.size(),
-                ", adjust:", result.m_path.size()));
+  CHECK(found, ("Can't find", returnVertex, ", prev:", prevRoute.size(), ", adjust:", result.m_path.size()));
 
   auto const & it = remainingDistances.find(returnVertex);
   CHECK(it != remainingDistances.end(), ());
@@ -835,9 +778,9 @@ AStarAlgorithm<Vertex, Edge, Weight>::AdjustRoute(P & params,
 
 // static
 template <typename Vertex, typename Edge, typename Weight>
-void AStarAlgorithm<Vertex, Edge, Weight>::ReconstructPath(
-    Vertex const & v, typename BidirectionalStepContext::Parents const & parent,
-    std::vector<Vertex> & path)
+void AStarAlgorithm<Vertex, Edge, Weight>::ReconstructPath(Vertex const & v,
+                                                           typename BidirectionalStepContext::Parents const & parent,
+                                                           std::vector<Vertex> & path)
 {
   path.clear();
   Vertex cur = v;
@@ -870,9 +813,7 @@ void AStarAlgorithm<Vertex, Edge, Weight>::ReconstructPathBidirectional(
 }
 
 template <typename Vertex, typename Edge, typename Weight>
-void
-AStarAlgorithm<Vertex, Edge, Weight>::Context::ReconstructPath(Vertex const & v,
-                                                               std::vector<Vertex> & path) const
+void AStarAlgorithm<Vertex, Edge, Weight>::Context::ReconstructPath(Vertex const & v, std::vector<Vertex> & path) const
 {
   AStarAlgorithm<Vertex, Edge, Weight>::ReconstructPath(v, m_parents, path);
 }
diff --git a/libs/routing/base/astar_graph.hpp b/libs/routing/base/astar_graph.hpp
index e7f52f4c8..1505703e6 100644
--- a/libs/routing/base/astar_graph.hpp
+++ b/libs/routing/base/astar_graph.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "routing/base/astar_weight.hpp"
 #include "routing/base/astar_vertex_data.hpp"
+#include "routing/base/astar_weight.hpp"
 #include "routing/base/small_list.hpp"
 
 #include "base/buffer_vector.hpp"
@@ -27,15 +27,12 @@ public:
 
   virtual Weight HeuristicCostEstimate(Vertex const & from, Vertex const & to) = 0;
 
-  virtual void GetOutgoingEdgesList(astar::VertexData<Vertex, Weight> const & vertexData,
-                                    EdgeListT & edges) = 0;
-  virtual void GetIngoingEdgesList(astar::VertexData<Vertex, Weight> const & vertexData,
-                                   EdgeListT & edges) = 0;
+  virtual void GetOutgoingEdgesList(astar::VertexData<Vertex, Weight> const & vertexData, EdgeListT & edges) = 0;
+  virtual void GetIngoingEdgesList(astar::VertexData<Vertex, Weight> const & vertexData, EdgeListT & edges) = 0;
 
   virtual void SetAStarParents(bool forward, Parents & parents);
   virtual void DropAStarParents();
-  virtual bool AreWavesConnectible(Parents & forwardParents, Vertex const & commonVertex,
-                                   Parents & backwardParents);
+  virtual bool AreWavesConnectible(Parents & forwardParents, Vertex const & commonVertex, Parents & backwardParents);
 
   virtual Weight GetAStarWeightEpsilon();
 
@@ -43,11 +40,12 @@ public:
 };
 
 template <typename VertexType, typename EdgeType, typename WeightType>
-void AStarGraph<VertexType, EdgeType, WeightType>::SetAStarParents(bool /* forward */,
-                                                                   Parents & /* parents */) {}
+void AStarGraph<VertexType, EdgeType, WeightType>::SetAStarParents(bool /* forward */, Parents & /* parents */)
+{}
 
 template <typename VertexType, typename EdgeType, typename WeightType>
-void AStarGraph<VertexType, EdgeType, WeightType>::DropAStarParents() {}
+void AStarGraph<VertexType, EdgeType, WeightType>::DropAStarParents()
+{}
 
 template <typename VertexType, typename EdgeType, typename WeightType>
 bool AStarGraph<VertexType, EdgeType, WeightType>::AreWavesConnectible(AStarGraph::Parents & /* forwardParents */,
diff --git a/libs/routing/base/astar_progress.cpp b/libs/routing/base/astar_progress.cpp
index 7778ab2a0..da3111b6e 100644
--- a/libs/routing/base/astar_progress.cpp
+++ b/libs/routing/base/astar_progress.cpp
@@ -19,9 +19,10 @@ double AStarSubProgress::CalcDistance(ms::LatLon const & from, ms::LatLon const
   return fabs(from.m_lon - to.m_lon) + fabs(from.m_lat - to.m_lat);
 }
 
-AStarSubProgress::AStarSubProgress(ms::LatLon const & start, ms::LatLon const & finish,
-                                   double contributionCoef)
-  : m_contributionCoef(contributionCoef), m_startPoint(start), m_finishPoint(finish)
+AStarSubProgress::AStarSubProgress(ms::LatLon const & start, ms::LatLon const & finish, double contributionCoef)
+  : m_contributionCoef(contributionCoef)
+  , m_startPoint(start)
+  , m_finishPoint(finish)
 {
   ASSERT_GREATER(m_contributionCoef, 0.0, ());
 
@@ -30,8 +31,7 @@ AStarSubProgress::AStarSubProgress(ms::LatLon const & start, ms::LatLon const &
   m_backwardDistance = m_fullDistance;
 }
 
-AStarSubProgress::AStarSubProgress(double contributionCoef)
-    : m_contributionCoef(contributionCoef)
+AStarSubProgress::AStarSubProgress(double contributionCoef) : m_contributionCoef(contributionCoef)
 {
   ASSERT_NOT_EQUAL(m_contributionCoef, 0.0, ());
 }
@@ -49,7 +49,7 @@ double AStarSubProgress::UpdateProgress(ms::LatLon const & current, ms::LatLon c
 
   double part = 2.0 - (m_forwardDistance + m_backwardDistance) / m_fullDistance;
   part = math::Clamp(part, 0.0, 1.0);
-  double const newProgress =  m_contributionCoef * part;
+  double const newProgress = m_contributionCoef * part;
 
   m_currentProgress = std::max(newProgress, m_currentProgress);
   return m_currentProgress;
@@ -65,7 +65,10 @@ void AStarSubProgress::Flush(double progress)
   m_currentProgress += m_contributionCoef * progress;
 }
 
-double AStarSubProgress::GetMaxContribution() const { return m_contributionCoef; }
+double AStarSubProgress::GetMaxContribution() const
+{
+  return m_contributionCoef;
+}
 
 // AStarProgress -------------------------------------------------------------------------
 
@@ -107,18 +110,19 @@ double AStarProgress::UpdateProgress(ms::LatLon const & current, ms::LatLon cons
   double const newProgress = UpdateProgressImpl(m_subProgresses.begin(), current, end) * 100.0;
   m_lastPercentValue = std::max(m_lastPercentValue, newProgress);
 
-  ASSERT(m_lastPercentValue < kMaxPercent ||
-             AlmostEqualAbs(m_lastPercentValue, kMaxPercent, 1e-5 /* eps */),
+  ASSERT(m_lastPercentValue < kMaxPercent || AlmostEqualAbs(m_lastPercentValue, kMaxPercent, 1e-5 /* eps */),
          (m_lastPercentValue, kMaxPercent));
 
   m_lastPercentValue = std::min(m_lastPercentValue, kMaxPercent);
   return m_lastPercentValue;
 }
 
-double AStarProgress::GetLastPercent() const { return m_lastPercentValue; }
+double AStarProgress::GetLastPercent() const
+{
+  return m_lastPercentValue;
+}
 
-double AStarProgress::UpdateProgressImpl(ListItem subProgress, ms::LatLon const & current,
-                                         ms::LatLon const & end)
+double AStarProgress::UpdateProgressImpl(ListItem subProgress, ms::LatLon const & current, ms::LatLon const & end)
 {
   if (std::next(subProgress) != m_subProgresses.end())
     return subProgress->UpdateProgress(UpdateProgressImpl(std::next(subProgress), current, end));
diff --git a/libs/routing/base/astar_progress.hpp b/libs/routing/base/astar_progress.hpp
index c37108769..0531771b4 100644
--- a/libs/routing/base/astar_progress.hpp
+++ b/libs/routing/base/astar_progress.hpp
@@ -53,8 +53,7 @@ public:
 private:
   using ListItem = std::list<AStarSubProgress>::iterator;
 
-  double UpdateProgressImpl(ListItem subProgress, ms::LatLon const & current,
-                            ms::LatLon const & end);
+  double UpdateProgressImpl(ListItem subProgress, ms::LatLon const & current, ms::LatLon const & end);
 
   // This value is in range: [0, 1].
   double m_lastPercentValue = 0.0;
diff --git a/libs/routing/base/astar_vertex_data.hpp b/libs/routing/base/astar_vertex_data.hpp
index 61c991001..07fe05fe8 100644
--- a/libs/routing/base/astar_vertex_data.hpp
+++ b/libs/routing/base/astar_vertex_data.hpp
@@ -7,12 +7,9 @@ struct VertexData
 {
   static VertexData Zero() { return VertexData(Vertex(), Weight()); }
 
-  VertexData(Vertex const & vertex, Weight const & realDistance)
-    : m_vertex(vertex), m_realDistance(realDistance)
-  {
-  }
+  VertexData(Vertex const & vertex, Weight const & realDistance) : m_vertex(vertex), m_realDistance(realDistance) {}
 
   Vertex m_vertex;
   Weight m_realDistance;
 };
-}  // namespace routing
+}  // namespace routing::astar
diff --git a/libs/routing/base/bfs.hpp b/libs/routing/base/bfs.hpp
index b8cd40f12..2a0b5f4d2 100644
--- a/libs/routing/base/bfs.hpp
+++ b/libs/routing/base/bfs.hpp
@@ -27,10 +27,9 @@ public:
     Vertex m_parent;
   };
 
-  explicit BFS(Graph & graph): m_graph(graph) {}
+  explicit BFS(Graph & graph) : m_graph(graph) {}
 
-  void Run(Vertex const & start, bool isOutgoing,
-           std::function<bool(State const &)> && onVisitCallback);
+  void Run(Vertex const & start, bool isOutgoing, std::function<bool(State const &)> && onVisitCallback);
 
   std::vector<Vertex> ReconstructPath(Vertex from, bool reverse);
 
@@ -40,15 +39,12 @@ private:
 };
 
 template <typename Graph>
-void BFS<Graph>::Run(Vertex const & start, bool isOutgoing,
-                     std::function<bool(State const &)> && onVisitCallback)
+void BFS<Graph>::Run(Vertex const & start, bool isOutgoing, std::function<bool(State const &)> && onVisitCallback)
 {
   m_parents.clear();
 
   m_parents.emplace(start, start);
-  SCOPE_GUARD(removeStart, [&]() {
-    m_parents.erase(start);
-  });
+  SCOPE_GUARD(removeStart, [&]() { m_parents.erase(start); });
 
   std::queue<Vertex> queue;
   queue.emplace(start);
diff --git a/libs/routing/base/followed_polyline.cpp b/libs/routing/base/followed_polyline.cpp
index 691fc5301..113ffb836 100644
--- a/libs/routing/base/followed_polyline.cpp
+++ b/libs/routing/base/followed_polyline.cpp
@@ -41,9 +41,8 @@ double FollowedPolyline::GetDistanceM(Iter const & it1, Iter const & it2) const
   if (it1.m_ind == it2.m_ind)
     return mercator::DistanceOnEarth(it1.m_pt, it2.m_pt);
 
-  return (mercator::DistanceOnEarth(it1.m_pt, m_poly.GetPoint(it1.m_ind + 1)) +
-          m_segDistance[it2.m_ind - 1] - m_segDistance[it1.m_ind] +
-          mercator::DistanceOnEarth(m_poly.GetPoint(it2.m_ind), it2.m_pt));
+  return (mercator::DistanceOnEarth(it1.m_pt, m_poly.GetPoint(it1.m_ind + 1)) + m_segDistance[it2.m_ind - 1] -
+          m_segDistance[it1.m_ind] + mercator::DistanceOnEarth(m_poly.GetPoint(it2.m_ind), it2.m_pt));
 }
 
 double FollowedPolyline::GetTotalDistanceMeters() const
@@ -115,16 +114,14 @@ bool FollowedPolyline::IsFakeSegment(size_t index) const
 }
 
 template <class DistanceFn>
-Iter FollowedPolyline::GetBestProjection(m2::RectD const & posRect,
-                                         DistanceFn const & distFn) const
+Iter FollowedPolyline::GetBestProjection(m2::RectD const & posRect, DistanceFn const & distFn) const
 {
   CHECK_EQUAL(m_segProj.size() + 1, m_poly.GetSize(), ());
   // At first trying to find a projection to two closest route segments of route which is close
   // enough to |posRect| center. If |m_current| is right before intermediate point we can get |closestIter|
   // right after intermediate point (in next subroute).
   size_t const hoppingBorderIdx = min(m_segProj.size(), m_current.m_ind + 2);
-  Iter const closestIter =
-      GetClosestProjectionInInterval(posRect, distFn, m_current.m_ind, hoppingBorderIdx);
+  Iter const closestIter = GetClosestProjectionInInterval(posRect, distFn, m_current.m_ind, hoppingBorderIdx);
   if (closestIter.IsValid())
     return closestIter;
 
@@ -139,8 +136,7 @@ Iter FollowedPolyline::GetBestMatchingProjection(m2::RectD const & posRect) cons
   // At first trying to find a projection to two closest route segments of route which is close
   // enough to |posRect| center. If |m_current| is right before intermediate point we can get |iter|
   // right after intermediate point (in next subroute).
-  size_t const hoppingBorderIdx =
-      min(m_nextCheckpointIndex, min(m_segProj.size(), m_current.m_ind + 3));
+  size_t const hoppingBorderIdx = min(m_nextCheckpointIndex, min(m_segProj.size(), m_current.m_ind + 3));
   auto const iter = GetClosestMatchingProjectionInInterval(posRect, m_current.m_ind, hoppingBorderIdx);
   if (iter.IsValid())
     return iter;
@@ -172,10 +168,7 @@ Iter FollowedPolyline::UpdateProjection(m2::RectD const & posRect)
 
   Iter res;
   m2::PointD const currPos = posRect.Center();
-  res = GetBestProjection(posRect, [&](Iter const & it)
-  {
-    return mercator::DistanceOnEarth(it.m_pt, currPos);
-  });
+  res = GetBestProjection(posRect, [&](Iter const & it) { return mercator::DistanceOnEarth(it.m_pt, currPos); });
 
   if (res.IsValid())
     m_current = res;
@@ -210,16 +203,14 @@ void FollowedPolyline::GetCurrentDirectionPoint(m2::PointD & pt, double toleranc
   size_t currentIndex = min(m_current.m_ind + 1, m_poly.GetSize() - 1);
   m2::PointD point = m_poly.GetPoint(currentIndex);
   for (; currentIndex < m_poly.GetSize() - 1; point = m_poly.GetPoint(++currentIndex))
-  {
     if (mercator::DistanceOnEarth(point, m_current.m_pt) > toleranceM)
       break;
-  }
 
   pt = point;
 }
 
-Iter FollowedPolyline::GetClosestMatchingProjectionInInterval(m2::RectD const & posRect,
-                                                              size_t startIdx, size_t endIdx) const
+Iter FollowedPolyline::GetClosestMatchingProjectionInInterval(m2::RectD const & posRect, size_t startIdx,
+                                                              size_t endIdx) const
 {
   CHECK_LESS_OR_EQUAL(endIdx, m_segProj.size(), ());
   CHECK_LESS_OR_EQUAL(startIdx, endIdx, ());
diff --git a/libs/routing/base/followed_polyline.hpp b/libs/routing/base/followed_polyline.hpp
index e89a9252b..efd8c1a50 100644
--- a/libs/routing/base/followed_polyline.hpp
+++ b/libs/routing/base/followed_polyline.hpp
@@ -93,8 +93,8 @@ public:
   /// \param endIdx The index after the last one in |m_segProj|.
   /// \returns iterator which contains projection point and projection segment index.
   template <typename DistanceFn>
-  Iter GetClosestProjectionInInterval(m2::RectD const & posRect, DistanceFn const & distFn,
-                                      size_t startIdx, size_t endIdx) const
+  Iter GetClosestProjectionInInterval(m2::RectD const & posRect, DistanceFn const & distFn, size_t startIdx,
+                                      size_t endIdx) const
   {
     CHECK_LESS_OR_EQUAL(endIdx, m_segProj.size(), ());
     CHECK_LESS_OR_EQUAL(startIdx, endIdx, ());
@@ -121,8 +121,7 @@ public:
     return res;
   }
 
-  Iter GetClosestMatchingProjectionInInterval(m2::RectD const & posRect, size_t startIdx,
-                                              size_t endIdx) const;
+  Iter GetClosestMatchingProjectionInInterval(m2::RectD const & posRect, size_t startIdx, size_t endIdx) const;
 
   bool IsFakeSegment(size_t index) const;
 
diff --git a/libs/routing/base/routing_result.hpp b/libs/routing/base/routing_result.hpp
index f8bb69795..db344c3ab 100644
--- a/libs/routing/base/routing_result.hpp
+++ b/libs/routing/base/routing_result.hpp
@@ -24,10 +24,7 @@ struct RoutingResult final
 
   struct LessWeight
   {
-    bool operator() (RoutingResult const & l, RoutingResult const & r) const
-    {
-      return l.m_distance < r.m_distance;
-    }
+    bool operator()(RoutingResult const & l, RoutingResult const & r) const { return l.m_distance < r.m_distance; }
   };
 };
 }  // namespace routing
diff --git a/libs/routing/base/small_list.cpp b/libs/routing/base/small_list.cpp
index e570e8d82..7ee465c17 100644
--- a/libs/routing/base/small_list.cpp
+++ b/libs/routing/base/small_list.cpp
@@ -20,8 +20,9 @@ void Statistics::Add(char const * name, size_t val)
 void Statistics::Dump()
 {
   for (auto const & e : s_map)
-    LOG(LINFO, (e.first, ": count = ", e.second.m_count, "; max = ", e.second.m_max, "; avg = ", e.second.m_sum / double(e.second.m_count)));
+    LOG(LINFO, (e.first, ": count = ", e.second.m_count, "; max = ", e.second.m_max,
+                "; avg = ", e.second.m_sum / double(e.second.m_count)));
 }
 
-} // namespace impl
-} // namesapce routing
+}  // namespace impl
+}  // namespace routing
diff --git a/libs/routing/base/small_list.hpp b/libs/routing/base/small_list.hpp
index b14198402..393a0f907 100644
--- a/libs/routing/base/small_list.hpp
+++ b/libs/routing/base/small_list.hpp
@@ -24,9 +24,10 @@ public:
   static void Dump();
 };
 
-} // namespace impl
+}  // namespace impl
 
-template <class T> class SmallList : public buffer_vector<T, 8>
+template <class T>
+class SmallList : public buffer_vector<T, 8>
 {
   using BaseT = buffer_vector<T, 8>;
 
@@ -54,4 +55,4 @@ inline std::string DebugPrint(SmallList<T> const & v)
   return DebugPrint(static_cast<buffer_vector<T, 8> const &>(v));
 }
 
-} // namesapce routing
+}  // namespace routing
diff --git a/libs/routing/car_directions.cpp b/libs/routing/car_directions.cpp
index 8e7009c3c..d8267a836 100644
--- a/libs/routing/car_directions.cpp
+++ b/libs/routing/car_directions.cpp
@@ -6,7 +6,6 @@
 
 #include "geometry/angles.hpp"
 
-
 namespace routing
 {
 using namespace std;
@@ -15,8 +14,7 @@ using namespace ftypes;
 
 CarDirectionsEngine::CarDirectionsEngine(MwmDataSource & dataSource, shared_ptr<NumMwmIds> numMwmIds)
   : DirectionsEngine(dataSource, std::move(numMwmIds))
-{
-}
+{}
 
 void CarDirectionsEngine::FixupTurns(vector<RouteSegment> & routeSegments)
 {
@@ -40,19 +38,21 @@ void FixupCarTurns(vector<RouteSegment> & routeSegments)
     if (t.IsTurnNone())
       continue;
 
-    if (enterRoundAbout != kInvalidEnter && t.m_turn != CarDirection::StayOnRoundAbout
-        && t.m_turn != CarDirection::LeaveRoundAbout && t.m_turn != CarDirection::ReachedYourDestination)
+    if (enterRoundAbout != kInvalidEnter && t.m_turn != CarDirection::StayOnRoundAbout &&
+        t.m_turn != CarDirection::LeaveRoundAbout && t.m_turn != CarDirection::ReachedYourDestination)
     {
-      ASSERT(false, ("Only StayOnRoundAbout, LeaveRoundAbout or ReachedYourDestination are expected after EnterRoundAbout."));
+      ASSERT(false,
+             ("Only StayOnRoundAbout, LeaveRoundAbout or ReachedYourDestination are expected after EnterRoundAbout."));
       exitNum = 0;
       enterRoundAbout = kInvalidEnter;
     }
     else if (t.m_turn == CarDirection::EnterRoundAbout)
     {
-      ASSERT(enterRoundAbout == kInvalidEnter, ("It's not expected to find new EnterRoundAbout until previous EnterRoundAbout was leaved."));
+      ASSERT(enterRoundAbout == kInvalidEnter,
+             ("It's not expected to find new EnterRoundAbout until previous EnterRoundAbout was leaved."));
       enterRoundAbout = idx;
       ASSERT(exitNum == 0, ("exitNum is reset at start and after LeaveRoundAbout."));
-      exitNum = t.m_exitNum; // Normally it is 0, but sometimes it can be 1.
+      exitNum = t.m_exitNum;  // Normally it is 0, but sometimes it can be 1.
     }
     else if (t.m_turn == CarDirection::StayOnRoundAbout)
     {
@@ -66,7 +66,7 @@ void FixupCarTurns(vector<RouteSegment> & routeSegments)
       // if route calculation started at roundabout (e.g. if user made full turn on roundabout).
       if (enterRoundAbout != kInvalidEnter)
         routeSegments[enterRoundAbout].SetTurnExits(exitNum + 1);
-      routeSegments[idx].SetTurnExits(exitNum + 1); // For LeaveRoundAbout turn.
+      routeSegments[idx].SetTurnExits(exitNum + 1);  // For LeaveRoundAbout turn.
       enterRoundAbout = kInvalidEnter;
       exitNum = 0;
     }
@@ -75,8 +75,7 @@ void FixupCarTurns(vector<RouteSegment> & routeSegments)
     // distance(turnsDir[idx - 1].m_index, turnsDir[idx].m_index) < kMergeDistMeters
     // means the distance in meters between the former turn (idx - 1)
     // and the current turn (idx).
-    if (idx > 0 && IsStayOnRoad(routeSegments[idx - 1].GetTurn().m_turn) &&
-        IsLeftOrRightTurn(t.m_turn))
+    if (idx > 0 && IsStayOnRoad(routeSegments[idx - 1].GetTurn().m_turn) && IsLeftOrRightTurn(t.m_turn))
     {
       auto const & junction = routeSegments[idx].GetJunction();
       auto const & prevJunction = routeSegments[idx - 1].GetJunction();
@@ -88,12 +87,11 @@ void FixupCarTurns(vector<RouteSegment> & routeSegments)
 }
 
 void GetTurnDirectionBasic(IRoutingResult const & result, size_t const outgoingSegmentIndex,
-                           NumMwmIds const & numMwmIds, RoutingSettings const & vehicleSettings,
-                           TurnItem & turn);
+                           NumMwmIds const & numMwmIds, RoutingSettings const & vehicleSettings, TurnItem & turn);
 
 size_t CarDirectionsEngine::GetTurnDirection(IRoutingResult const & result, size_t const outgoingSegmentIndex,
-                                             NumMwmIds const & numMwmIds,
-                                             RoutingSettings const & vehicleSettings, TurnItem & turnItem)
+                                             NumMwmIds const & numMwmIds, RoutingSettings const & vehicleSettings,
+                                             TurnItem & turnItem)
 {
   if (outgoingSegmentIndex == result.GetSegments().size())
   {
@@ -104,8 +102,9 @@ size_t CarDirectionsEngine::GetTurnDirection(IRoutingResult const & result, size
   // This is for jump from initial point to start of the route. No direction is given.
   /// @todo Sometimes results of GetPossibleTurns are empty, sometimes are invalid.
   /// The best will be to fix GetPossibleTurns(). It will allow us to use following approach.
-  /// E.g. Google Maps until you reach the destination will guide you to go to the left or to the right of the first road.
-  if (outgoingSegmentIndex == 2) // The same as turnItem.m_index == 2.
+  /// E.g. Google Maps until you reach the destination will guide you to go to the left or to the right of the first
+  /// road.
+  if (outgoingSegmentIndex == 2)  // The same as turnItem.m_index == 2.
     return 0;
 
   size_t skipTurnSegments = CheckUTurnOnRoute(result, outgoingSegmentIndex, numMwmIds, vehicleSettings, turnItem);
@@ -163,8 +162,8 @@ CarDirection GetRoundaboutDirectionBasic(bool isIngoingEdgeRoundabout, bool isOu
 /*!
  * \brief Returns false when other possible turns leads to service roads;
  */
-bool KeepRoundaboutTurnByHighwayClass(TurnCandidates const & possibleTurns,
-                                      TurnInfo const & turnInfo, NumMwmIds const & numMwmIds)
+bool KeepRoundaboutTurnByHighwayClass(TurnCandidates const & possibleTurns, TurnInfo const & turnInfo,
+                                      NumMwmIds const & numMwmIds)
 {
   Segment firstOutgoingSegment;
   turnInfo.m_outgoing->m_segmentRange.GetFirstSegment(numMwmIds, firstOutgoingSegment);
@@ -181,11 +180,12 @@ bool KeepRoundaboutTurnByHighwayClass(TurnCandidates const & possibleTurns,
   return false;
 }
 
-CarDirection GetRoundaboutDirection(TurnInfo const & turnInfo, TurnCandidates const & nodes, NumMwmIds const & numMwmIds)
+CarDirection GetRoundaboutDirection(TurnInfo const & turnInfo, TurnCandidates const & nodes,
+                                    NumMwmIds const & numMwmIds)
 {
   bool const keepTurnByHighwayClass = KeepRoundaboutTurnByHighwayClass(nodes, turnInfo, numMwmIds);
   return GetRoundaboutDirectionBasic(turnInfo.m_ingoing->m_onRoundabout, turnInfo.m_outgoing->m_onRoundabout,
-                                nodes.candidates.size() > 1, keepTurnByHighwayClass);
+                                     nodes.candidates.size() > 1, keepTurnByHighwayClass);
 }
 
 /// \brief Return |CarDirection::ExitHighwayToRight| or |CarDirection::ExitHighwayToLeft|
@@ -201,7 +201,8 @@ CarDirection TryToGetExitDirection(TurnCandidates const & possibleTurns, TurnInf
   if (!IsHighway(turnInfo.m_ingoing->m_highwayClass, turnInfo.m_ingoing->m_isLink))
     return CarDirection::None;
 
-  if (!turnInfo.m_outgoing->m_isLink && !(IsSmallRoad(turnInfo.m_outgoing->m_highwayClass) && IsGoStraightOrSlightTurn(intermediateDirection)))
+  if (!turnInfo.m_outgoing->m_isLink &&
+      !(IsSmallRoad(turnInfo.m_outgoing->m_highwayClass) && IsGoStraightOrSlightTurn(intermediateDirection)))
     return CarDirection::None;
 
   // At this point it is known that the route goes form a highway to a link road or to a small road
@@ -231,15 +232,12 @@ CarDirection TryToGetExitDirection(TurnCandidates const & possibleTurns, TurnInf
     {
       ++highwayCandidateNumber;
       if (highwayCandidateNumber >= 2)
-        return CarDirection::None; // There are two or more highway candidates from the junction.
+        return CarDirection::None;  // There are two or more highway candidates from the junction.
       isHighwayCandidateBeforeOutgoing = isCandidateBeforeOutgoing;
     }
   }
   if (highwayCandidateNumber == 1)
-  {
-    return isHighwayCandidateBeforeOutgoing ? CarDirection::ExitHighwayToRight
-                                            : CarDirection::ExitHighwayToLeft;
-  }
+    return isHighwayCandidateBeforeOutgoing ? CarDirection::ExitHighwayToRight : CarDirection::ExitHighwayToLeft;
   return CarDirection::None;
 }
 
@@ -263,10 +261,8 @@ double constexpr kMinAbsAngleDiffForSameOrSmallerRoad = 35.0;
 /// \param routeAngle is route angle.
 /// \param turnCandidates is all possible ways out from a junction except uturn.
 /// \param turnInfo is information about ingoing and outgoing segments of the route.
-bool CanDiscardTurnByHighwayClassOrAngles(CarDirection const routeDirection,
-                                          double const routeAngle,
-                                          vector<TurnCandidate> const & turnCandidates,
-                                          TurnInfo const & turnInfo,
+bool CanDiscardTurnByHighwayClassOrAngles(CarDirection const routeDirection, double const routeAngle,
+                                          vector<TurnCandidate> const & turnCandidates, TurnInfo const & turnInfo,
                                           NumMwmIds const & numMwmIds)
 {
   if (!IsGoStraightOrSlightTurn(routeDirection))
@@ -292,7 +288,8 @@ bool CanDiscardTurnByHighwayClassOrAngles(CarDirection const routeDirection,
     double constexpr kMinAbsAngleDiffForGoLink = 70.0;
 
     // If route goes from non-link to link and there is not too sharp candidate then turn can't be discarded.
-    if (!turnInfo.m_ingoing->m_isLink && turnInfo.m_outgoing->m_isLink && abs(t.m_angle) < abs(routeAngle) + kMinAbsAngleDiffForGoLink)
+    if (!turnInfo.m_ingoing->m_isLink && turnInfo.m_outgoing->m_isLink &&
+        abs(t.m_angle) < abs(routeAngle) + kMinAbsAngleDiffForGoLink)
       return false;
 
     HighwayClass candidateRoadClass = t.m_highwayClass;
@@ -310,8 +307,7 @@ bool CanDiscardTurnByHighwayClassOrAngles(CarDirection const routeDirection,
     // and outgoing route road is the same or large than ingoing
     // then candidate-link can be ignored.
     if (!turnInfo.m_ingoing->m_isLink && !turnInfo.m_outgoing->m_isLink &&
-        CalcDiffRoadClasses(outgoingRouteRoadClass, ingoingRouteRoadClass) <= 0 &&
-        t.m_isLink)
+        CalcDiffRoadClasses(outgoingRouteRoadClass, ingoingRouteRoadClass) <= 0 && t.m_isLink)
       continue;
 
     // If alternative cadidate's road size is the same or smaller
@@ -364,13 +360,13 @@ void CorrectGoStraight(TurnCandidate const & notRouteCandidate, double const rou
 // and there's another not sharp enough turn
 // GoStraight is corrected to TurnSlightRight/TurnSlightLeft
 // to avoid ambiguity for GoStraight direction: 2 or more almost straight turns.
-void CorrectRightmostAndLeftmost(vector<TurnCandidate> const & turnCandidates,
-                                 Segment const & firstOutgoingSeg, double const turnAngle,
-                                 TurnItem & turn)
+void CorrectRightmostAndLeftmost(vector<TurnCandidate> const & turnCandidates, Segment const & firstOutgoingSeg,
+                                 double const turnAngle, TurnItem & turn)
 {
   // turnCandidates are sorted by angle from leftmost to rightmost.
   // Normally no duplicates should be found. But if they are present we can't identify the leftmost/rightmost by order.
-  if (adjacent_find(turnCandidates.begin(), turnCandidates.end(), base::EqualsBy(&TurnCandidate::m_angle)) != turnCandidates.end())
+  if (adjacent_find(turnCandidates.begin(), turnCandidates.end(), base::EqualsBy(&TurnCandidate::m_angle)) !=
+      turnCandidates.end())
   {
     LOG(LWARNING, ("nodes.candidates are not expected to have same m_angle."));
     return;
@@ -419,8 +415,7 @@ void CorrectRightmostAndLeftmost(vector<TurnCandidate> const & turnCandidates,
 }
 
 void GetTurnDirectionBasic(IRoutingResult const & result, size_t const outgoingSegmentIndex,
-                           NumMwmIds const & numMwmIds, RoutingSettings const & vehicleSettings,
-                           TurnItem & turn)
+                           NumMwmIds const & numMwmIds, RoutingSettings const & vehicleSettings, TurnItem & turn)
 {
   TurnInfo turnInfo;
   if (!GetTurnInfo(result, outgoingSegmentIndex, vehicleSettings, turnInfo))
@@ -479,15 +474,16 @@ void GetTurnDirectionBasic(IRoutingResult const & result, size_t const outgoingS
 
   if (turnCandidates.size() == 1)
   {
-    //ASSERT_EQUAL(turnCandidates.front().m_segment, firstOutgoingSeg, ());
+    // ASSERT_EQUAL(turnCandidates.front().m_segment, firstOutgoingSeg, ());
 
     if (IsGoStraightOrSlightTurn(intermediateDirection))
       return;
     // IngoingCount includes ingoing segment and reversed outgoing (if it is not one-way).
-    // If any other one is present, turn (not straight or slight) is kept to prevent user from going to oneway alternative.
+    // If any other one is present, turn (not straight or slight) is kept to prevent user from going to oneway
+    // alternative.
 
-    /// @todo Min abs angle of ingoing ones should be considered. If it's much bigger than route angle - ignore ingoing ones.
-    /// Now this data is not available from IRoutingResult::GetPossibleTurns().
+    /// @todo Min abs angle of ingoing ones should be considered. If it's much bigger than route angle - ignore ingoing
+    /// ones. Now this data is not available from IRoutingResult::GetPossibleTurns().
     if (ingoingCount <= 1 + (turnInfo.m_outgoing->m_isOneWay ? 0 : 1))
       return;
   }
@@ -506,7 +502,8 @@ void GetTurnDirectionBasic(IRoutingResult const & result, size_t const outgoingS
   else if (abs(turnOneSegmentAngle) > 10)
     LOG(LWARNING, ("Significant angles are expected to have the same sign."));
 
-  if (CanDiscardTurnByHighwayClassOrAngles(intermediateDirection, turnAngleToCompare, turnCandidates, turnInfo, numMwmIds))
+  if (CanDiscardTurnByHighwayClassOrAngles(intermediateDirection, turnAngleToCompare, turnCandidates, turnInfo,
+                                           numMwmIds))
     return;
 
   turn.m_turn = intermediateDirection;
@@ -515,9 +512,8 @@ void GetTurnDirectionBasic(IRoutingResult const & result, size_t const outgoingS
     CorrectRightmostAndLeftmost(turnCandidates, firstOutgoingSeg, turnAngle, turn);
 }
 
-size_t CheckUTurnOnRoute(IRoutingResult const & result, size_t const outgoingSegmentIndex,
-                         NumMwmIds const & numMwmIds, RoutingSettings const & vehicleSettings,
-                         TurnItem & turn)
+size_t CheckUTurnOnRoute(IRoutingResult const & result, size_t const outgoingSegmentIndex, NumMwmIds const & numMwmIds,
+                         RoutingSettings const & vehicleSettings, TurnItem & turn)
 {
   size_t constexpr kUTurnLookAhead = 3;
   double constexpr kUTurnHeadingSensitivity = math::pi / 10.0;
@@ -583,12 +579,12 @@ size_t CheckUTurnOnRoute(IRoutingResult const & result, size_t const outgoingSeg
       // Determine turn direction.
       m2::PointD const junctionPoint = masterSegment.m_path.back().GetPoint();
 
-      m2::PointD const ingoingPoint = GetPointForTurn(
-          result, outgoingSegmentIndex, numMwmIds, vehicleSettings.m_maxIngoingPointsCount,
-          vehicleSettings.m_minIngoingDistMeters, false /* forward */);
-      m2::PointD const outgoingPoint = GetPointForTurn(
-          result, outgoingSegmentIndex, numMwmIds, vehicleSettings.m_maxOutgoingPointsCount,
-          vehicleSettings.m_minOutgoingDistMeters, true /* forward */);
+      m2::PointD const ingoingPoint =
+          GetPointForTurn(result, outgoingSegmentIndex, numMwmIds, vehicleSettings.m_maxIngoingPointsCount,
+                          vehicleSettings.m_minIngoingDistMeters, false /* forward */);
+      m2::PointD const outgoingPoint =
+          GetPointForTurn(result, outgoingSegmentIndex, numMwmIds, vehicleSettings.m_maxOutgoingPointsCount,
+                          vehicleSettings.m_minOutgoingDistMeters, true /* forward */);
 
       if (PiMinusTwoVectorsAngle(junctionPoint, ingoingPoint, outgoingPoint) < 0)
         turn.m_turn = CarDirection::UTurnLeft;
@@ -625,7 +621,7 @@ bool FixupLaneSet(CarDirection turn, vector<SingleLaneInfo> & lanes, bool (*chec
 template <typename It>
 bool SelectFirstUnrestrictedLane(LaneWay direction, It lanesBegin, It lanesEnd)
 {
-  const It firstUnrestricted = find_if(lanesBegin, lanesEnd, IsLaneUnrestricted);
+  It const firstUnrestricted = find_if(lanesBegin, lanesEnd, IsLaneUnrestricted);
   if (firstUnrestricted == lanesEnd)
     return false;
 
diff --git a/libs/routing/car_directions.hpp b/libs/routing/car_directions.hpp
index 46f29ec8a..444a7b3a3 100644
--- a/libs/routing/car_directions.hpp
+++ b/libs/routing/car_directions.hpp
@@ -2,8 +2,8 @@
 
 #include "routing/directions_engine.hpp"
 
-#include "routing_common/num_mwm_id.hpp"
 #include "routing/route.hpp"
+#include "routing_common/num_mwm_id.hpp"
 
 #include <map>
 #include <memory>
@@ -19,8 +19,8 @@ public:
 
 protected:
   virtual size_t GetTurnDirection(turns::IRoutingResult const & result, size_t const outgoingSegmentIndex,
-                                  NumMwmIds const & numMwmIds,
-                                  RoutingSettings const & vehicleSettings, turns::TurnItem & turn);
+                                  NumMwmIds const & numMwmIds, RoutingSettings const & vehicleSettings,
+                                  turns::TurnItem & turn);
   virtual void FixupTurns(std::vector<RouteSegment> & routeSegments);
 };
 
@@ -38,8 +38,7 @@ void FixupCarTurns(std::vector<RouteSegment> & routeSegments);
  * \warning |currentSegment| must be greater than 0.
  */
 size_t CheckUTurnOnRoute(turns::IRoutingResult const & result, size_t const outgoingSegmentIndex,
-                         NumMwmIds const & numMwmIds, RoutingSettings const & vehicleSettings,
-                         turns::TurnItem & turn);
+                         NumMwmIds const & numMwmIds, RoutingSettings const & vehicleSettings, turns::TurnItem & turn);
 
 /*!
  * \brief Calculates a turn instruction if the ingoing edge or (and) the outgoing edge belongs to a
diff --git a/libs/routing/checkpoint_predictor.cpp b/libs/routing/checkpoint_predictor.cpp
index 90220fc15..5c24b965b 100644
--- a/libs/routing/checkpoint_predictor.cpp
+++ b/libs/routing/checkpoint_predictor.cpp
@@ -15,13 +15,11 @@ double CheckpointPredictor::CalculateDeltaMeters(m2::PointD const & from, m2::Po
                                                  m2::PointD const & between)
 {
   double const directDist = mercator::DistanceOnEarth(from, to);
-  double const distThroughPoint =
-      mercator::DistanceOnEarth(from, between) + mercator::DistanceOnEarth(between, to);
+  double const distThroughPoint = mercator::DistanceOnEarth(from, between) + mercator::DistanceOnEarth(between, to);
   return distThroughPoint - directDist;
 }
 
-size_t CheckpointPredictor::PredictPosition(vector<m2::PointD> const & points,
-                                            m2::PointD const & point) const
+size_t CheckpointPredictor::PredictPosition(vector<m2::PointD> const & points, m2::PointD const & point) const
 {
   double constexpr kInvalidDistance = numeric_limits<double>::max();
   double minDeltaMeters = kInvalidDistance;
@@ -30,8 +28,7 @@ size_t CheckpointPredictor::PredictPosition(vector<m2::PointD> const & points,
   size_t const checkpointNum = points.size() + 2 /* for start and finish points */;
   for (size_t i = 0; i + 1 != checkpointNum; ++i)
   {
-    double const delta = CalculateDeltaMeters(GetCheckpoint(points, i),
-                                              GetCheckpoint(points, i + 1), point);
+    double const delta = CalculateDeltaMeters(GetCheckpoint(points, i), GetCheckpoint(points, i + 1), point);
     if (minDeltaMeters > delta)
     {
       minDeltaMeters = delta;
@@ -43,8 +40,7 @@ size_t CheckpointPredictor::PredictPosition(vector<m2::PointD> const & points,
   return minDeltaIdx;
 }
 
-m2::PointD const & CheckpointPredictor::GetCheckpoint(vector<m2::PointD> const & points,
-                                                      size_t index) const
+m2::PointD const & CheckpointPredictor::GetCheckpoint(vector<m2::PointD> const & points, size_t index) const
 {
   if (index == 0)
     return m_start;
diff --git a/libs/routing/checkpoint_predictor.hpp b/libs/routing/checkpoint_predictor.hpp
index 66e89e0a1..1faa20edb 100644
--- a/libs/routing/checkpoint_predictor.hpp
+++ b/libs/routing/checkpoint_predictor.hpp
@@ -18,10 +18,7 @@ class CheckpointPredictor final
   friend class CheckpointPredictorTest;
 
 public:
-  CheckpointPredictor(m2::PointD const & start, m2::PointD const & finish)
-    : m_start(start), m_finish(finish)
-  {
-  }
+  CheckpointPredictor(m2::PointD const & start, m2::PointD const & finish) : m_start(start), m_finish(finish) {}
 
   /// \returns difference between distance |from|->|between| + |between|->|to| and distance |from|->|to|.
   static double CalculateDeltaMeters(m2::PointD const & from, m2::PointD const & to, m2::PointD const & between);
diff --git a/libs/routing/checkpoints.cpp b/libs/routing/checkpoints.cpp
index d499f0df0..b889b9f2a 100644
--- a/libs/routing/checkpoints.cpp
+++ b/libs/routing/checkpoints.cpp
@@ -11,8 +11,7 @@ namespace routing
 {
 Checkpoints::Checkpoints(std::vector<m2::PointD> && points) : m_points(std::move(points))
 {
-  CHECK_GREATER_OR_EQUAL(m_points.size(), 2,
-                         ("Checkpoints should at least contain start and finish"));
+  CHECK_GREATER_OR_EQUAL(m_points.size(), 2, ("Checkpoints should at least contain start and finish"));
 }
 
 void Checkpoints::SetPointFrom(m2::PointD const & point)
diff --git a/libs/routing/city_roads.cpp b/libs/routing/city_roads.cpp
index 703510034..af6d9b535 100644
--- a/libs/routing/city_roads.cpp
+++ b/libs/routing/city_roads.cpp
@@ -37,8 +37,7 @@ std::unique_ptr<CityRoads> LoadCityRoads(MwmSet::MwmHandle const & handle)
   }
   catch (Reader::Exception const & e)
   {
-    LOG(LERROR, ("File", value->GetCountryFileName(), "Error while reading", CITY_ROADS_FILE_TAG,
-                 "section.", e.Msg()));
+    LOG(LERROR, ("File", value->GetCountryFileName(), "Error while reading", CITY_ROADS_FILE_TAG, "section.", e.Msg()));
     return std::make_unique<CityRoads>();
   }
 }
diff --git a/libs/routing/city_roads_serialization.hpp b/libs/routing/city_roads_serialization.hpp
index c321a92f4..7c81965f3 100644
--- a/libs/routing/city_roads_serialization.hpp
+++ b/libs/routing/city_roads_serialization.hpp
@@ -56,11 +56,9 @@ public:
     header.Serialize(sink);
 
     std::sort(cityRoadFeatureIds.begin(), cityRoadFeatureIds.end());
-    CHECK(adjacent_find(cityRoadFeatureIds.cbegin(), cityRoadFeatureIds.cend()) ==
-        cityRoadFeatureIds.cend(),
+    CHECK(adjacent_find(cityRoadFeatureIds.cbegin(), cityRoadFeatureIds.cend()) == cityRoadFeatureIds.cend(),
           ("City road feature ids should be unique."));
-    succinct::elias_fano::elias_fano_builder builder(cityRoadFeatureIds.back() + 1,
-                                                     cityRoadFeatureIds.size());
+    succinct::elias_fano::elias_fano_builder builder(cityRoadFeatureIds.back() + 1, cityRoadFeatureIds.size());
     for (auto fid : cityRoadFeatureIds)
       builder.push_back(fid);
 
@@ -74,8 +72,8 @@ public:
     header.Serialize(sink);
     sink.Seek(endOffset);
 
-    LOG(LINFO, ("Serialized", cityRoadFeatureIds.size(),
-        "road feature ids in cities. Size:", endOffset - startOffset, "bytes."));
+    LOG(LINFO, ("Serialized", cityRoadFeatureIds.size(), "road feature ids in cities. Size:", endOffset - startOffset,
+                "bytes."));
   }
 
   template <typename Source>
diff --git a/libs/routing/coding.hpp b/libs/routing/coding.hpp
index 0a915335a..c6dc0e571 100644
--- a/libs/routing/coding.hpp
+++ b/libs/routing/coding.hpp
@@ -21,10 +21,7 @@ T ReadDelta(BitReader<Source> & reader)
   static_assert(std::is_unsigned<T>::value, "T should be an unsigned type");
   uint64_t const decoded = coding::DeltaCoder::Decode(reader);
   if (decoded > std::numeric_limits<T>::max())
-  {
-    MYTHROW(CorruptedDataException,
-            ("Decoded value", decoded, "out of limit", std::numeric_limits<T>::max()));
-  }
+    MYTHROW(CorruptedDataException, ("Decoded value", decoded, "out of limit", std::numeric_limits<T>::max()));
 
   return static_cast<T>(decoded);
 }
@@ -46,10 +43,7 @@ T ReadGamma(BitReader<Source> & reader)
   static_assert(std::is_unsigned<T>::value, "T should be an unsigned type");
   uint64_t const decoded = coding::GammaCoder::Decode(reader);
   if (decoded > std::numeric_limits<T>::max())
-  {
-    MYTHROW(CorruptedDataException,
-            ("Decoded value", decoded, "out of limit", std::numeric_limits<T>::max()));
-  }
+    MYTHROW(CorruptedDataException, ("Decoded value", decoded, "out of limit", std::numeric_limits<T>::max()));
 
   return static_cast<T>(decoded);
 }
diff --git a/libs/routing/cross_border_graph.cpp b/libs/routing/cross_border_graph.cpp
index 54d6ebace..a895e6b8f 100644
--- a/libs/routing/cross_border_graph.cpp
+++ b/libs/routing/cross_border_graph.cpp
@@ -4,8 +4,7 @@
 
 namespace routing
 {
-void CrossBorderGraph::AddCrossBorderSegment(RegionSegmentId segId,
-                                             CrossBorderSegment const & segment)
+void CrossBorderGraph::AddCrossBorderSegment(RegionSegmentId segId, CrossBorderSegment const & segment)
 {
   m_segments.emplace(segId, segment);
 
@@ -21,21 +20,20 @@ void CrossBorderGraph::AddCrossBorderSegment(RegionSegmentId segId,
 }
 
 CrossBorderSegmentEnding::CrossBorderSegmentEnding(m2::PointD const & point, NumMwmId const & mwmId)
-  : m_point(mercator::ToLatLon(point), geometry::kDefaultAltitudeMeters), m_numMwmId(mwmId)
-{
-}
+  : m_point(mercator::ToLatLon(point), geometry::kDefaultAltitudeMeters)
+  , m_numMwmId(mwmId)
+{}
 
 CrossBorderSegmentEnding::CrossBorderSegmentEnding(ms::LatLon const & point, NumMwmId const & mwmId)
-  : m_point(point, 0), m_numMwmId(mwmId)
-{
-}
+  : m_point(point, 0)
+  , m_numMwmId(mwmId)
+{}
 
 CrossBorderGraphSerializer::Header::Header(CrossBorderGraph const & graph, uint32_t version)
   : m_numRegions(static_cast<uint32_t>(graph.m_mwms.size()))
   , m_numRoads(static_cast<uint32_t>(graph.m_segments.size()))
   , m_version(version)
-{
-}
+{}
 
 // static
 uint32_t CrossBorderGraphSerializer::Hash(std::string const & s)
diff --git a/libs/routing/cross_border_graph.hpp b/libs/routing/cross_border_graph.hpp
index 603369ffd..6b62c8821 100644
--- a/libs/routing/cross_border_graph.hpp
+++ b/libs/routing/cross_border_graph.hpp
@@ -63,12 +63,10 @@ public:
   CrossBorderGraphSerializer() = delete;
 
   template <class Sink>
-  static void Serialize(CrossBorderGraph const & graph, Sink & sink,
-                        std::shared_ptr<NumMwmIds> numMwmIds);
+  static void Serialize(CrossBorderGraph const & graph, Sink & sink, std::shared_ptr<NumMwmIds> numMwmIds);
 
   template <class Source>
-  static void Deserialize(CrossBorderGraph & graph, Source & src,
-                          std::shared_ptr<NumMwmIds> numMwmIds);
+  static void Deserialize(CrossBorderGraph & graph, Source & src, std::shared_ptr<NumMwmIds> numMwmIds);
 
 private:
   static uint32_t constexpr kVersion = 1;
@@ -77,8 +75,7 @@ private:
   struct Header
   {
     Header() = default;
-    explicit Header(CrossBorderGraph const & graph,
-                    uint32_t version = kVersion);
+    explicit Header(CrossBorderGraph const & graph, uint32_t version = kVersion);
 
     template <class Sink>
     void Serialize(Sink & sink) const;
@@ -181,10 +178,10 @@ void CrossBorderGraphSerializer::Deserialize(CrossBorderGraph & graph, Source &
 
   auto readSegEnding = [&](CrossBorderSegmentEnding & ending)
   {
-    double const lat = Uint32ToDouble(ReadPrimitiveFromSource<uint32_t>(src),
-                                      ms::LatLon::kMinLat, ms::LatLon::kMaxLat, kBitsForDouble);
-    double const lon = Uint32ToDouble(ReadPrimitiveFromSource<uint32_t>(src),
-                                      ms::LatLon::kMinLon, ms::LatLon::kMaxLon, kBitsForDouble);
+    double const lat = Uint32ToDouble(ReadPrimitiveFromSource<uint32_t>(src), ms::LatLon::kMinLat, ms::LatLon::kMaxLat,
+                                      kBitsForDouble);
+    double const lon = Uint32ToDouble(ReadPrimitiveFromSource<uint32_t>(src), ms::LatLon::kMinLon, ms::LatLon::kMaxLon,
+                                      kBitsForDouble);
     ending.m_point = LatLonWithAltitude(ms::LatLon(lat, lon), geometry::kDefaultAltitudeMeters);
 
     NumMwmId index = ReadPrimitiveFromSource<uint16_t>(src);
diff --git a/libs/routing/cross_mwm_connector.hpp b/libs/routing/cross_mwm_connector.hpp
index 6e1363db8..64312c238 100644
--- a/libs/routing/cross_mwm_connector.hpp
+++ b/libs/routing/cross_mwm_connector.hpp
@@ -38,13 +38,15 @@ std::string DebugPrint(WeightsLoadState state);
 }  // namespace connector
 
 /// @param CrossMwmId Encoded OSM feature (way) ID that should be equal and unique in all MWMs.
-template <typename CrossMwmId> class CrossMwmConnector final
+template <typename CrossMwmId>
+class CrossMwmConnector final
 {
 public:
   /// Should initialize with some valid mwm id here not to conflict with @see JointSegment::IsFake().
   explicit CrossMwmConnector(NumMwmId mwmId = kGeneratorMwmId) : m_mwmId(mwmId) {}
 
-  template <class FnT> void ForEachTransitSegmentId(uint32_t featureId, FnT && fn) const
+  template <class FnT>
+  void ForEachTransitSegmentId(uint32_t featureId, FnT && fn) const
   {
     auto it = std::lower_bound(m_transitions.begin(), m_transitions.end(), Key{featureId, 0}, LessKT());
     while (it != m_transitions.end() && it->first.m_featureId == featureId)
@@ -75,10 +77,7 @@ public:
     return isEnter != isOutgoing;
   }
 
-  CrossMwmId const & GetCrossMwmId(Segment const & segment) const
-  {
-    return GetTransition(segment).m_crossMwmId;
-  }
+  CrossMwmId const & GetCrossMwmId(Segment const & segment) const { return GetTransition(segment).m_crossMwmId; }
 
   /// @return {} if there is no transition for such cross mwm id.
   std::optional<Segment> GetTransition(CrossMwmId const & crossMwmId, uint32_t segmentIdx, bool isEnter) const
@@ -115,7 +114,8 @@ public:
 
   using EdgeListT = SmallList<SegmentEdge>;
 
-  template <class FnT> void ForEachEnter(FnT && fn) const
+  template <class FnT>
+  void ForEachEnter(FnT && fn) const
   {
     for (auto const & [key, transit] : m_transitions)
     {
@@ -127,7 +127,8 @@ public:
     }
   }
 
-  template <class FnT> void ForEachExit(FnT && fn) const
+  template <class FnT>
+  void ForEachExit(FnT && fn) const
   {
     for (auto const & [key, transit] : m_transitions)
     {
@@ -143,18 +144,14 @@ public:
   {
     auto const enterIdx = GetTransition(segment).m_enterIdx;
     ForEachExit([enterIdx, this, &edges](uint32_t exitIdx, Segment const & s)
-    {
-      AddEdge(s, enterIdx, exitIdx, edges);
-    });
+    { AddEdge(s, enterIdx, exitIdx, edges); });
   }
 
   void GetIngoingEdgeList(Segment const & segment, EdgeListT & edges) const
   {
     auto const exitIdx = GetTransition(segment).m_exitIdx;
     ForEachEnter([exitIdx, this, &edges](uint32_t enterIdx, Segment const & s)
-    {
-      AddEdge(s, enterIdx, exitIdx, edges);
-    });
+    { AddEdge(s, enterIdx, exitIdx, edges); });
   }
 
   RouteWeight GetWeightSure(Segment const & from, Segment const & to) const
@@ -204,13 +201,12 @@ public:
   }
 
 private:
-  template <class T> friend class CrossMwmConnectorBuilder;
+  template <class T>
+  friend class CrossMwmConnectorBuilder;
 
   struct Key
   {
-    Key(uint32_t featureId, uint32_t segmentIdx) : m_featureId(featureId), m_segmentIdx(segmentIdx)
-    {
-    }
+    Key(uint32_t featureId, uint32_t segmentIdx) : m_featureId(featureId), m_segmentIdx(segmentIdx) {}
 
     bool operator==(Key const & key) const
     {
@@ -236,8 +232,7 @@ private:
       , m_crossMwmId(crossMwmId)
       , m_oneWay(oneWay)
       , m_forwardIsEnter(forwardIsEnter)
-    {
-    }
+    {}
 
     uint32_t m_enterIdx;
     uint32_t m_exitIdx;
@@ -279,18 +274,9 @@ private:
   using KeyTransitionT = std::pair<Key, Transition>;
   struct LessKT
   {
-    bool operator()(KeyTransitionT const & l, KeyTransitionT const & r) const
-    {
-      return l.first < r.first;
-    }
-    bool operator()(KeyTransitionT const & l, Key const & r) const
-    {
-      return l.first < r;
-    }
-    bool operator()(Key const & l, KeyTransitionT const & r) const
-    {
-      return l < r.first;
-    }
+    bool operator()(KeyTransitionT const & l, KeyTransitionT const & r) const { return l.first < r.first; }
+    bool operator()(KeyTransitionT const & l, Key const & r) const { return l.first < r; }
+    bool operator()(Key const & l, KeyTransitionT const & r) const { return l < r.first; }
   };
   std::vector<KeyTransitionT> m_transitions;
 
@@ -321,7 +307,6 @@ private:
     bool Get(uint32_t idx, WeightT & weight) const
     {
       if (m_version < 2)
-      {
         if (m_v1.Has(idx))
         {
           weight = m_v1.Get(idx);
@@ -329,11 +314,8 @@ private:
         }
         else
           return false;
-      }
       else
-      {
         return m_v2->Get(idx, weight);
-      }
     }
 
   } m_weights;
diff --git a/libs/routing/cross_mwm_connector_serialization.hpp b/libs/routing/cross_mwm_connector_serialization.hpp
index 6438ebf4c..12116e23b 100644
--- a/libs/routing/cross_mwm_connector_serialization.hpp
+++ b/libs/routing/cross_mwm_connector_serialization.hpp
@@ -32,21 +32,28 @@ static uint8_t constexpr kOsmIdBits = 64;
 static uint8_t constexpr kStopIdBits = 64;
 static uint8_t constexpr kLineIdBits = 32;
 
-inline uint32_t constexpr CalcBitsPerTransitId() { return 2 * kStopIdBits + kLineIdBits; }
+inline uint32_t constexpr CalcBitsPerTransitId()
+{
+  return 2 * kStopIdBits + kLineIdBits;
+}
 
-template <typename CrossMwmId> uint32_t constexpr GetFeaturesOffset() noexcept;
-template <> uint32_t constexpr GetFeaturesOffset<base::GeoObjectId>() noexcept
+template <typename CrossMwmId>
+uint32_t constexpr GetFeaturesOffset() noexcept;
+template <>
+uint32_t constexpr GetFeaturesOffset<base::GeoObjectId>() noexcept
 {
   return 0;
 }
-template <> uint32_t constexpr GetFeaturesOffset<TransitId>() noexcept
+template <>
+uint32_t constexpr GetFeaturesOffset<TransitId>() noexcept
 {
   return FakeFeatureIds::kTransitGraphFeaturesStart;
 }
 }  // namespace connector
 
 /// Builder class for deserialization.
-template <typename CrossMwmId> class CrossMwmConnectorBuilder
+template <typename CrossMwmId>
+class CrossMwmConnectorBuilder
 {
 protected:
   using ConnectorT = CrossMwmConnector<CrossMwmId>;
@@ -61,18 +68,14 @@ public:
   explicit CrossMwmConnectorBuilder(ConnectorT & c) : m_c(c) {}
 
   /// Called only in cross-mwm-graph when deserialization connectors.
-  void ApplyNumerationOffset()
-  {
-    m_featureNumerationOffset = connector::GetFeaturesOffset<CrossMwmId>();
-  }
+  void ApplyNumerationOffset() { m_featureNumerationOffset = connector::GetFeaturesOffset<CrossMwmId>(); }
 
-  void AddTransition(CrossMwmId const & crossMwmId, uint32_t featureId, uint32_t segmentIdx,
-                     bool oneWay, bool forwardIsEnter)
+  void AddTransition(CrossMwmId const & crossMwmId, uint32_t featureId, uint32_t segmentIdx, bool oneWay,
+                     bool forwardIsEnter)
   {
     featureId += m_featureNumerationOffset;
 
-    typename ConnectorT::Transition transition(m_c.m_entersCount, m_c.m_exitsCount,
-                                               crossMwmId, oneWay, forwardIsEnter);
+    typename ConnectorT::Transition transition(m_c.m_entersCount, m_c.m_exitsCount, crossMwmId, oneWay, forwardIsEnter);
 
     if (forwardIsEnter)
       ++m_c.m_entersCount;
@@ -110,16 +113,15 @@ protected:
   public:
     Transition() = default;
 
-    Transition(CrossMwmId const & crossMwmId, uint32_t featureId, uint32_t segmentIdx,
-               VehicleMask roadMask, VehicleMask oneWayMask, bool forwardIsEnter)
+    Transition(CrossMwmId const & crossMwmId, uint32_t featureId, uint32_t segmentIdx, VehicleMask roadMask,
+               VehicleMask oneWayMask, bool forwardIsEnter)
       : m_crossMwmId(crossMwmId)
       , m_featureId(featureId)
       , m_segmentIdx(segmentIdx)
       , m_roadMask(roadMask)
       , m_oneWayMask(oneWayMask)
       , m_forwardIsEnter(forwardIsEnter)
-    {
-    }
+    {}
 
     template <class Sink>
     static void WriteCrossMwmId(base::GeoObjectId const & id, uint8_t bits, BitWriter<Sink> & w)
@@ -237,9 +239,8 @@ public:
 
     if (src.Pos() != weightsOffset)
     {
-      MYTHROW(CorruptedDataException,
-              ("Wrong position", src.Pos(), "after decoding transitions, expected:",
-               weightsOffset, "size:", header.GetSizeTransitions()));
+      MYTHROW(CorruptedDataException, ("Wrong position", src.Pos(), "after decoding transitions, expected:",
+                                       weightsOffset, "size:", header.GetSizeTransitions()));
     }
 
     for (Section const & section : header.GetSections())
@@ -255,14 +256,14 @@ public:
 
       if (base::checked_cast<size_t>(section.GetNumEnters()) != numEnters)
       {
-        MYTHROW(CorruptedDataException, ("Mismatch enters number, section:", section.GetNumEnters(),
-                                         ", connector:", numEnters));
+        MYTHROW(CorruptedDataException,
+                ("Mismatch enters number, section:", section.GetNumEnters(), ", connector:", numEnters));
       }
 
       if (base::checked_cast<size_t>(section.GetNumExits()) != numExits)
       {
-        MYTHROW(CorruptedDataException, ("Mismatch exits number, section:", section.GetNumExits(),
-                                         ", connector:", numExits));
+        MYTHROW(CorruptedDataException,
+                ("Mismatch exits number, section:", section.GetNumExits(), ", connector:", numExits));
       }
 
       m_c.m_weights.m_offset = weightsOffset;
@@ -275,10 +276,7 @@ public:
     m_c.m_weights.m_loadState = connector::WeightsLoadState::NotExists;
   }
 
-  void DeserializeWeights(FilesContainerR::TReader & reader)
-  {
-    DeserializeWeights(*(reader.GetPtr()));
-  }
+  void DeserializeWeights(FilesContainerR::TReader & reader) { DeserializeWeights(*(reader.GetPtr())); }
 
   /// @param[in]  reader  Initialized reader for the whole section (makes Skip inside).
   template <class Reader>
@@ -301,7 +299,6 @@ public:
 
       Weight prev = 1;
       for (size_t i = 0; i < amount; ++i)
-      {
         if (bitReader.Read(1) != kNoRouteBit)
         {
           Weight const delta = ReadDelta<Weight>(bitReader) - 1;
@@ -311,28 +308,28 @@ public:
         }
         else
           builder.PushEmpty();
-      }
 
       m_c.m_weights.m_v1 = builder.Build();
     }
     else
     {
       m_c.m_weights.m_reader = reader.CreateSubReader(m_c.m_weights.m_offset, reader.Size() - m_c.m_weights.m_offset);
-      m_c.m_weights.m_v2 = MapUint32ToValue<Weight>::Load(*(m_c.m_weights.m_reader),
-        [granularity = m_c.m_weights.m_granularity](NonOwningReaderSource & source, uint32_t blockSize,
-                                                    std::vector<Weight> & values)
+      m_c.m_weights.m_v2 = MapUint32ToValue<Weight>::Load(
+          *(m_c.m_weights.m_reader),
+          [granularity = m_c.m_weights.m_granularity](NonOwningReaderSource & source, uint32_t blockSize,
+                                                      std::vector<Weight> & values)
+      {
+        values.resize(blockSize);
+
+        uint32_t prev = ReadVarUint<uint32_t>(source);
+        values[0] = granularity * prev;
+
+        for (size_t i = 1; i < blockSize && source.Size() > 0; ++i)
         {
-          values.resize(blockSize);
-
-          uint32_t prev = ReadVarUint<uint32_t>(source);
-          values[0] = granularity * prev;
-
-          for (size_t i = 1; i < blockSize && source.Size() > 0; ++i)
-          {
-            prev += ReadVarInt<int32_t>(source);
-            values[i] = granularity * prev;
-          }
-        });
+          prev += ReadVarInt<int32_t>(source);
+          values[i] = granularity * prev;
+        }
+      });
     }
 
     m_c.m_weights.m_loadState = connector::WeightsLoadState::Loaded;
@@ -345,8 +342,8 @@ protected:
       return false;
 
     bool const isOneWay = (transition.GetOneWayMask() & requiredMask) != 0;
-    AddTransition(transition.GetCrossMwmId(), transition.GetFeatureId(),
-                  transition.GetSegmentIdx(), isOneWay, transition.ForwardIsEnter());
+    AddTransition(transition.GetCrossMwmId(), transition.GetFeatureId(), transition.GetSegmentIdx(), isOneWay,
+                  transition.ForwardIsEnter());
     return true;
   }
 
@@ -372,9 +369,11 @@ protected:
     Section() = default;
 
     Section(uint64_t size, uint32_t numEnters, uint32_t numExits, VehicleType vehicleType)
-      : m_size(size), m_numEnters(numEnters), m_numExits(numExits), m_vehicleType(vehicleType)
-    {
-    }
+      : m_size(size)
+      , m_numEnters(numEnters)
+      , m_numExits(numExits)
+      , m_vehicleType(vehicleType)
+    {}
 
     template <class Sink>
     void Serialize(Sink & sink) const
@@ -416,8 +415,7 @@ protected:
       , m_sizeTransitions(sizeTransitions)
       , m_bitsPerCrossMwmId(bitsPerCrossMwmId)
       , m_bitsPerMask(bitsPerMask)
-    {
-    }
+    {}
 
     template <class Sink>
     void Serialize(Sink & sink) const
@@ -440,8 +438,8 @@ protected:
       m_version = ReadPrimitiveFromSource<decltype(m_version)>(src);
       if (m_version > kLastVersion)
       {
-        MYTHROW(CorruptedDataException, ("Unknown cross mwm section version ", m_version,
-                                         ", current version ", kLastVersion));
+        MYTHROW(CorruptedDataException,
+                ("Unknown cross mwm section version ", m_version, ", current version ", kLastVersion));
       }
 
       m_numTransitions = ReadPrimitiveFromSource<decltype(m_numTransitions)>(src);
@@ -522,10 +520,7 @@ private:
     MemWriter writer(buffer);
     builder.Freeze(writer, [](auto & writer, auto beg, auto end)
     {
-      auto const NextStoredValue = [&beg]()
-      {
-        return (*beg++ + BaseT::kGranularity - 1) / BaseT::kGranularity;
-      };
+      auto const NextStoredValue = [&beg]() { return (*beg++ + BaseT::kGranularity - 1) / BaseT::kGranularity; };
 
       Weight prev = NextStoredValue();
       WriteVarUint(writer, prev);
@@ -541,8 +536,8 @@ private:
 public:
   CrossMwmConnectorBuilderEx() : BaseT(m_connector) {}
 
-  void AddTransition(CrossMwmId const & crossMwmId, uint32_t featureId, uint32_t segmentIdx,
-                     VehicleMask roadMask, VehicleMask oneWayMask, bool forwardIsEnter)
+  void AddTransition(CrossMwmId const & crossMwmId, uint32_t featureId, uint32_t segmentIdx, VehicleMask roadMask,
+                     VehicleMask oneWayMask, bool forwardIsEnter)
   {
     m_transitions.emplace_back(crossMwmId, featureId, segmentIdx, roadMask, oneWayMask, forwardIsEnter);
   }
@@ -558,8 +553,7 @@ public:
     WriteTransitions(bitsPerCrossMwmId, bitsPerMask, transitionsBuf);
 
     typename BaseT::Header header(base::checked_cast<uint32_t>(m_transitions.size()),
-                                  base::checked_cast<uint64_t>(transitionsBuf.size()),
-                                  bitsPerCrossMwmId, bitsPerMask);
+                                  base::checked_cast<uint64_t>(transitionsBuf.size()), bitsPerCrossMwmId, bitsPerMask);
 
     std::vector<uint8_t> weightsBuf;
     if (!m_weights.empty())
@@ -567,8 +561,8 @@ public:
       std::sort(m_weights.begin(), m_weights.end(), base::LessBy(&IdxWeightT::first));
       WriteWeights(weightsBuf);
 
-      header.AddSection(typename BaseT::Section(
-                        weightsBuf.size(), m_connector.GetNumEnters(), m_connector.GetNumExits(), m_vehicleType));
+      header.AddSection(typename BaseT::Section(weightsBuf.size(), m_connector.GetNumEnters(),
+                                                m_connector.GetNumExits(), m_vehicleType));
     }
 
     // Use buffer serialization above, because BaseT::Header is not plain (vector<Section>)
@@ -581,10 +575,7 @@ public:
   typename BaseT::ConnectorT const & PrepareConnector(VehicleType requiredVehicle)
   {
     m_vehicleType = requiredVehicle;
-    BaseT::FillTransitions(m_transitions.size(), m_vehicleType, [this](size_t i)
-    {
-      return m_transitions[i];
-    });
+    BaseT::FillTransitions(m_transitions.size(), m_vehicleType, [this](size_t i) { return m_transitions[i]; });
     return m_connector;
   }
 
diff --git a/libs/routing/cross_mwm_graph.cpp b/libs/routing/cross_mwm_graph.cpp
index a999ffb07..883c405f9 100644
--- a/libs/routing/cross_mwm_graph.cpp
+++ b/libs/routing/cross_mwm_graph.cpp
@@ -13,10 +13,8 @@ namespace routing
 {
 using namespace std;
 
-CrossMwmGraph::CrossMwmGraph(shared_ptr<NumMwmIds> numMwmIds,
-                             shared_ptr<m4::Tree<NumMwmId>> numMwmTree,
-                             VehicleType vehicleType, CountryRectFn const & countryRectFn,
-                             MwmDataSource & dataSource)
+CrossMwmGraph::CrossMwmGraph(shared_ptr<NumMwmIds> numMwmIds, shared_ptr<m4::Tree<NumMwmId>> numMwmTree,
+                             VehicleType vehicleType, CountryRectFn const & countryRectFn, MwmDataSource & dataSource)
   : m_dataSource(dataSource)
   , m_numMwmIds(numMwmIds)
   , m_numMwmTree(numMwmTree)
@@ -31,14 +29,9 @@ CrossMwmGraph::CrossMwmGraph(shared_ptr<NumMwmIds> numMwmIds,
 bool CrossMwmGraph::IsTransition(Segment const & s, bool isOutgoing)
 {
   if (TransitGraph::IsTransitSegment(s))
-  {
-    return TransitCrossMwmSectionExists(s.GetMwmId())
-               ? m_crossMwmTransitGraph.IsTransition(s, isOutgoing)
-               : false;
-  }
+    return TransitCrossMwmSectionExists(s.GetMwmId()) ? m_crossMwmTransitGraph.IsTransition(s, isOutgoing) : false;
 
-  return CrossMwmSectionExists(s.GetMwmId()) ? m_crossMwmIndexGraph.IsTransition(s, isOutgoing)
-                                             : false;
+  return CrossMwmSectionExists(s.GetMwmId()) ? m_crossMwmIndexGraph.IsTransition(s, isOutgoing) : false;
 }
 
 bool CrossMwmGraph::GetAllLoadedNeighbors(NumMwmId numMwmId, vector<NumMwmId> & neighbors)
@@ -130,9 +123,8 @@ void CrossMwmGraph::GetTwins(Segment const & s, bool isOutgoing, vector<Segment>
 
 void CrossMwmGraph::GetOutgoingEdgeList(Segment const & enter, EdgeListT & edges)
 {
-  ASSERT(
-      IsTransition(enter, false /* isEnter */),
-      ("The segment is not a transition segment. IsTransition(", enter, ", false) returns false."));
+  ASSERT(IsTransition(enter, false /* isEnter */),
+         ("The segment is not a transition segment. IsTransition(", enter, ", false) returns false."));
 
   // Is not supported yet.
   /*
@@ -150,9 +142,8 @@ void CrossMwmGraph::GetOutgoingEdgeList(Segment const & enter, EdgeListT & edges
 
 void CrossMwmGraph::GetIngoingEdgeList(Segment const & exit, EdgeListT & edges)
 {
-  ASSERT(
-    IsTransition(exit, true /* isEnter */),
-    ("The segment is not a transition segment. IsTransition(", exit, ", true) returns false."));
+  ASSERT(IsTransition(exit, true /* isEnter */),
+         ("The segment is not a transition segment. IsTransition(", exit, ", true) returns false."));
 
   // Is not supported yet.
   /*
@@ -175,11 +166,11 @@ RouteWeight CrossMwmGraph::GetWeightSure(Segment const & from, Segment const & t
   return m_crossMwmIndexGraph.GetWeightSure(from, to);
 }
 
-//void CrossMwmGraph::Clear()
+// void CrossMwmGraph::Clear()
 //{
-//  m_crossMwmIndexGraph.Clear();
-//  m_crossMwmTransitGraph.Clear();
-//}
+//   m_crossMwmIndexGraph.Clear();
+//   m_crossMwmTransitGraph.Clear();
+// }
 
 void CrossMwmGraph::Purge()
 {
diff --git a/libs/routing/cross_mwm_graph.hpp b/libs/routing/cross_mwm_graph.hpp
index 265160331..7bc7652fb 100644
--- a/libs/routing/cross_mwm_graph.hpp
+++ b/libs/routing/cross_mwm_graph.hpp
@@ -32,10 +32,8 @@ public:
     NoSection,
   };
 
-  CrossMwmGraph(std::shared_ptr<NumMwmIds> numMwmIds,
-                std::shared_ptr<m4::Tree<NumMwmId>> numMwmTree,
-                VehicleType vehicleType, CountryRectFn const & countryRectFn,
-                MwmDataSource & dataSource);
+  CrossMwmGraph(std::shared_ptr<NumMwmIds> numMwmIds, std::shared_ptr<m4::Tree<NumMwmId>> numMwmTree,
+                VehicleType vehicleType, CountryRectFn const & countryRectFn, MwmDataSource & dataSource);
 
   /// \brief Transition segment is a segment which is crossed by mwm border. That means
   /// start and finish of such segment have to lie in different mwms. If a segment is
@@ -90,10 +88,11 @@ public:
 
   RouteWeight GetWeightSure(Segment const & from, Segment const & to);
 
-  //void Clear();
+  // void Clear();
   void Purge();
 
-  template <class FnT> void ForEachTransition(NumMwmId numMwmId, bool isEnter, FnT && fn)
+  template <class FnT>
+  void ForEachTransition(NumMwmId numMwmId, bool isEnter, FnT && fn)
   {
     CHECK(CrossMwmSectionExists(numMwmId), ("Should be used in LeapsOnly mode only"));
     return m_crossMwmIndexGraph.ForEachTransition(numMwmId, isEnter, fn);
@@ -127,4 +126,4 @@ private:
 };
 
 std::string DebugPrint(CrossMwmGraph::MwmStatus status);
-}  // routing
+}  // namespace routing
diff --git a/libs/routing/cross_mwm_ids.hpp b/libs/routing/cross_mwm_ids.hpp
index 90dc966ec..95614c9c5 100644
--- a/libs/routing/cross_mwm_ids.hpp
+++ b/libs/routing/cross_mwm_ids.hpp
@@ -17,14 +17,15 @@ namespace connector
 // for transit routing.
 struct TransitId
 {
-  DECLARE_VISITOR_AND_DEBUG_PRINT(TransitId, visitor(m_stop1Id, "stop1_id"),
-                                  visitor(m_stop2Id, "stop2_id"), visitor(m_lineId, "line_id"))
+  DECLARE_VISITOR_AND_DEBUG_PRINT(TransitId, visitor(m_stop1Id, "stop1_id"), visitor(m_stop2Id, "stop2_id"),
+                                  visitor(m_lineId, "line_id"))
 
   TransitId() = default;
   TransitId(transit::StopId stop1Id, transit::StopId stop2Id, transit::LineId lineId)
-    : m_stop1Id(stop1Id), m_stop2Id(stop2Id), m_lineId(lineId)
-  {
-  }
+    : m_stop1Id(stop1Id)
+    , m_stop2Id(stop2Id)
+    , m_lineId(lineId)
+  {}
 
   bool operator==(TransitId const & rhs) const
   {
@@ -57,8 +58,7 @@ struct HashKey
 
   size_t operator()(TransitId const & key) const
   {
-    return std::hash<uint64_t>()(key.m_stop1Id ^ key.m_stop2Id ^
-                                 static_cast<uint64_t>(key.m_lineId));
+    return std::hash<uint64_t>()(key.m_stop1Id ^ key.m_stop2Id ^ static_cast<uint64_t>(key.m_lineId));
   }
 };
 }  // namespace connector
diff --git a/libs/routing/cross_mwm_index_graph.hpp b/libs/routing/cross_mwm_index_graph.hpp
index 8841ca6e2..30051a060 100644
--- a/libs/routing/cross_mwm_index_graph.hpp
+++ b/libs/routing/cross_mwm_index_graph.hpp
@@ -48,8 +48,7 @@ void AssertConnectorIsFound(NumMwmId neighbor, bool isConnectorFound)
 
 template <>
 inline void AssertConnectorIsFound<TransitId>(NumMwmId /* neighbor */, bool /* isConnectorFound */)
-{
-}
+{}
 }  // namespace connector
 
 template <typename CrossMwmId>
@@ -59,9 +58,9 @@ public:
   using ReaderSourceFile = ReaderSource<FilesContainerR::TReader>;
 
   CrossMwmIndexGraph(MwmDataSource & dataSource, VehicleType vehicleType)
-    : m_dataSource(dataSource), m_vehicleType(vehicleType)
-  {
-  }
+    : m_dataSource(dataSource)
+    , m_vehicleType(vehicleType)
+  {}
 
   bool IsTransition(Segment const & s, bool isOutgoing)
   {
@@ -69,7 +68,8 @@ public:
     return c.IsTransition(s, isOutgoing);
   }
 
-  template <class FnT> void ForEachTransitSegmentId(NumMwmId numMwmId, uint32_t featureId, FnT && fn)
+  template <class FnT>
+  void ForEachTransitSegmentId(NumMwmId numMwmId, uint32_t featureId, FnT && fn)
   {
     GetCrossMwmConnectorWithTransitions(numMwmId).ForEachTransitSegmentId(featureId, fn);
   }
@@ -144,10 +144,10 @@ public:
     return c.GetWeightSure(from, to);
   }
 
-//  void Clear()
-//  {
-//    m_connectors.clear();
-//  }
+  //  void Clear()
+  //  {
+  //    m_connectors.clear();
+  //  }
   void Purge()
   {
     ConnectersMapT tmp;
@@ -163,17 +163,13 @@ public:
       return it->second;
 
     return Deserialize(numMwmId, [this](CrossMwmConnectorBuilder<CrossMwmId> & builder, auto & src)
-    {
-      builder.DeserializeTransitions(m_vehicleType, src);
-    });
+    { builder.DeserializeTransitions(m_vehicleType, src); });
   }
 
-  void LoadCrossMwmConnectorWithTransitions(NumMwmId numMwmId)
-  {
-    GetCrossMwmConnectorWithTransitions(numMwmId);
-  }
+  void LoadCrossMwmConnectorWithTransitions(NumMwmId numMwmId) { GetCrossMwmConnectorWithTransitions(numMwmId); }
 
-  template <class FnT> void ForEachTransition(NumMwmId numMwmId, bool isEnter, FnT && fn)
+  template <class FnT>
+  void ForEachTransition(NumMwmId numMwmId, bool isEnter, FnT && fn)
   {
     auto const & connector = GetCrossMwmConnectorWithTransitions(numMwmId);
 
@@ -184,7 +180,7 @@ public:
 private:
   std::vector<m2::PointD> GetFeaturePointsBySegment(MwmSet::MwmId const & mwmId, Segment const & segment)
   {
-    auto ft = m_dataSource.GetFeature({ mwmId, segment.GetFeatureId() });
+    auto ft = m_dataSource.GetFeature({mwmId, segment.GetFeatureId()});
     ft->ParseGeometry(FeatureType::BEST_GEOMETRY);
 
     size_t const count = ft->GetPointsCount();
@@ -204,10 +200,10 @@ private:
     if (!s1.IsRealSegment() || !s2.IsRealSegment())
       return true;
 
-    static_assert(std::is_same<CrossMwmId, base::GeoObjectId>::value ||
-                  std::is_same<CrossMwmId, connector::TransitId>::value,
-                  "Be careful of usage other ids here. "
-                  "Make sure, there is not crash with your new CrossMwmId");
+    static_assert(
+        std::is_same<CrossMwmId, base::GeoObjectId>::value || std::is_same<CrossMwmId, connector::TransitId>::value,
+        "Be careful of usage other ids here. "
+        "Make sure, there is not crash with your new CrossMwmId");
 
     ASSERT_NOT_EQUAL(s1.GetMwmId(), s2.GetMwmId(), ());
 
@@ -226,10 +222,8 @@ private:
       return false;
 
     for (uint32_t i = 0; i < geo1.size(); ++i)
-    {
       if (!AlmostEqualAbs(geo1[i], geo2[i], kMwmPointAccuracy))
         return false;
-    }
 
     return true;
   }
@@ -240,10 +234,8 @@ private:
     if (c.WeightsWereLoaded())
       return c;
 
-    return Deserialize(numMwmId,  [](CrossMwmConnectorBuilder<CrossMwmId> & builder, auto & src)
-    {
-      builder.DeserializeWeights(src);
-    });
+    return Deserialize(
+        numMwmId, [](CrossMwmConnectorBuilder<CrossMwmId> & builder, auto & src) { builder.DeserializeWeights(src); });
   }
 
   /// \brief Deserializes connectors for an mwm with |numMwmId|.
diff --git a/libs/routing/data_source.hpp b/libs/routing/data_source.hpp
index b77cd772c..2f7024eae 100644
--- a/libs/routing/data_source.hpp
+++ b/libs/routing/data_source.hpp
@@ -45,7 +45,8 @@ class MwmDataSource
 public:
   /// @param[in]  numMwmIDs Can be null, if won't call NumMwmId functions.
   MwmDataSource(DataSource & dataSource, std::shared_ptr<NumMwmIds> numMwmIDs)
-    : m_dataSource(dataSource), m_numMwmIDs(std::move(numMwmIDs))
+    : m_dataSource(dataSource)
+    , m_numMwmIDs(std::move(numMwmIDs))
   {}
 
   void FreeHandles()
@@ -80,10 +81,7 @@ public:
     return it->second;
   }
 
-  MwmValue const & GetMwmValue(NumMwmId numMwmId)
-  {
-    return *GetHandle(numMwmId).GetValue();
-  }
+  MwmValue const & GetMwmValue(NumMwmId numMwmId) { return *GetHandle(numMwmId).GetValue(); }
 
   SectionStatus GetSectionStatus(NumMwmId numMwmId, std::string const & section)
   {
@@ -99,7 +97,8 @@ public:
     return m_dataSource.GetMwmIdByCountryFile(m_numMwmIDs->GetFile(numMwmId));
   }
 
-  template <class FnT> void ForEachStreet(FnT && fn, m2::RectD const & rect)
+  template <class FnT>
+  void ForEachStreet(FnT && fn, m2::RectD const & rect)
   {
     m_dataSource.ForEachInRect(fn, rect, scales::GetUpperScale());
   }
@@ -136,4 +135,4 @@ public:
     return ptr->GetOriginalFeature(id.m_index);
   }
 };
-} // namespace routing
+}  // namespace routing
diff --git a/libs/routing/directions_engine.cpp b/libs/routing/directions_engine.cpp
index 332516784..0a708bc1c 100644
--- a/libs/routing/directions_engine.cpp
+++ b/libs/routing/directions_engine.cpp
@@ -21,14 +21,13 @@ namespace
 {
 bool IsFakeFeature(uint32_t featureId)
 {
-  return routing::FakeFeatureIds::IsGuidesFeature(featureId) ||
-         routing::FakeFeatureIds::IsTransitFeature(featureId);
+  return routing::FakeFeatureIds::IsGuidesFeature(featureId) || routing::FakeFeatureIds::IsTransitFeature(featureId);
 }
 
 feature::Metadata::EType GetLanesMetadataTag(FeatureType & ft, bool isForward)
 {
-  auto directionTag = isForward ? feature::Metadata::FMD_TURN_LANES_FORWARD
-                                : feature::Metadata::FMD_TURN_LANES_BACKWARD;
+  auto directionTag =
+      isForward ? feature::Metadata::FMD_TURN_LANES_FORWARD : feature::Metadata::FMD_TURN_LANES_BACKWARD;
   if (ft.HasMetadata(directionTag))
     return directionTag;
   return feature::Metadata::FMD_TURN_LANES;
@@ -42,7 +41,8 @@ void LoadLanes(LoadedPathSegment & pathSegment, FeatureType & ft, bool isForward
 }  // namespace
 
 DirectionsEngine::DirectionsEngine(MwmDataSource & dataSource, std::shared_ptr<NumMwmIds> numMwmIds)
-  : m_dataSource(dataSource), m_numMwmIds(numMwmIds)
+  : m_dataSource(dataSource)
+  , m_numMwmIds(numMwmIds)
   , m_linkChecker(IsLinkChecker::Instance())
   , m_roundAboutChecker(IsRoundAboutChecker::Instance())
   , m_onewayChecker(IsOneWayChecker::Instance())
@@ -63,8 +63,7 @@ unique_ptr<FeatureType> DirectionsEngine::GetFeature(FeatureID const & featureId
   return m_dataSource.GetFeature(featureId);
 }
 
-void DirectionsEngine::LoadPathAttributes(FeatureID const & featureId,
-                                          LoadedPathSegment & pathSegment, bool isForward)
+void DirectionsEngine::LoadPathAttributes(FeatureID const & featureId, LoadedPathSegment & pathSegment, bool isForward)
 {
   if (!featureId.IsValid())
     return;
@@ -93,16 +92,14 @@ void DirectionsEngine::LoadPathAttributes(FeatureID const & featureId,
   pathSegment.m_roadNameInfo.m_name = ft->GetName(StringUtf8Multilang::kDefaultCode);
 }
 
-void DirectionsEngine::GetSegmentRangeAndAdjacentEdges(IRoadGraph::EdgeListT const & outgoingEdges,
-                                                       Edge const & inEdge, uint32_t startSegId,
-                                                       uint32_t endSegId,
-                                                       SegmentRange & segmentRange,
-                                                       TurnCandidates & outgoingTurns)
+void DirectionsEngine::GetSegmentRangeAndAdjacentEdges(IRoadGraph::EdgeListT const & outgoingEdges, Edge const & inEdge,
+                                                       uint32_t startSegId, uint32_t endSegId,
+                                                       SegmentRange & segmentRange, TurnCandidates & outgoingTurns)
 {
   outgoingTurns.isCandidatesAngleValid = true;
   outgoingTurns.candidates.reserve(outgoingEdges.size());
-  segmentRange = SegmentRange(inEdge.GetFeatureId(), startSegId, endSegId, inEdge.IsForward(),
-                              inEdge.GetStartPoint(), inEdge.GetEndPoint());
+  segmentRange = SegmentRange(inEdge.GetFeatureId(), startSegId, endSegId, inEdge.IsForward(), inEdge.GetStartPoint(),
+                              inEdge.GetEndPoint());
   CHECK(segmentRange.IsCorrect(), ());
   m2::PointD const & ingoingPoint = inEdge.GetStartJunction().GetPoint();
   m2::PointD const & junctionPoint = inEdge.GetEndJunction().GetPoint();
@@ -127,8 +124,8 @@ void DirectionsEngine::GetSegmentRangeAndAdjacentEdges(IRoadGraph::EdgeListT con
     {
       ASSERT_LESS(mercator::DistanceOnEarth(junctionPoint, edge.GetStartJunction().GetPoint()),
                   turns::kFeaturesNearTurnMeters, ());
-      angle = math::RadToDeg(turns::PiMinusTwoVectorsAngle(junctionPoint, ingoingPoint,
-                                                           edge.GetEndJunction().GetPoint()));
+      angle =
+          math::RadToDeg(turns::PiMinusTwoVectorsAngle(junctionPoint, ingoingPoint, edge.GetEndJunction().GetPoint()));
     }
     else
     {
@@ -140,20 +137,18 @@ void DirectionsEngine::GetSegmentRangeAndAdjacentEdges(IRoadGraph::EdgeListT con
       outgoingTurns.isCandidatesAngleValid = false;
     }
 
-    outgoingTurns.candidates.emplace_back(angle, ConvertEdgeToSegment(*m_numMwmIds, edge),
-                                          highwayClass, m_linkChecker(types));
+    outgoingTurns.candidates.emplace_back(angle, ConvertEdgeToSegment(*m_numMwmIds, edge), highwayClass,
+                                          m_linkChecker(types));
   }
 
   if (outgoingTurns.isCandidatesAngleValid)
-  {
-    sort(outgoingTurns.candidates.begin(), outgoingTurns.candidates.end(),
-         base::LessBy(&TurnCandidate::m_angle));
-  }
+    sort(outgoingTurns.candidates.begin(), outgoingTurns.candidates.end(), base::LessBy(&TurnCandidate::m_angle));
 }
 
-void DirectionsEngine::FillPathSegmentsAndAdjacentEdgesMap(
-    IndexRoadGraph const & graph, vector<geometry::PointWithAltitude> const & path,
-    IRoadGraph::EdgeVector const & routeEdges, base::Cancellable const & cancellable)
+void DirectionsEngine::FillPathSegmentsAndAdjacentEdgesMap(IndexRoadGraph const & graph,
+                                                           vector<geometry::PointWithAltitude> const & path,
+                                                           IRoadGraph::EdgeVector const & routeEdges,
+                                                           base::Cancellable const & cancellable)
 {
   size_t const pathSize = path.size();
   CHECK_GREATER(pathSize, 1, ());
@@ -219,8 +214,8 @@ void DirectionsEngine::FillPathSegmentsAndAdjacentEdgesMap(
       /// @todo By VNG: Here was mostly investigational CHECK.
       /// Entry already exists, when start-end points are on the same fake segments.
 
-      //bool const isEmpty = adjacentEdges.m_outgoingTurns.candidates.empty();
-      //CHECK(m_adjacentEdges.emplace(segmentRange, std::move(adjacentEdges)).second || isEmpty, ());
+      // bool const isEmpty = adjacentEdges.m_outgoingTurns.candidates.empty();
+      // CHECK(m_adjacentEdges.emplace(segmentRange, std::move(adjacentEdges)).second || isEmpty, ());
       m_adjacentEdges.emplace(segmentRange, std::move(adjacentEdges));
     }
 
@@ -232,10 +227,8 @@ void DirectionsEngine::FillPathSegmentsAndAdjacentEdgesMap(
   }
 }
 
-bool DirectionsEngine::Generate(IndexRoadGraph const & graph,
-                                vector<geometry::PointWithAltitude> const & path,
-                                base::Cancellable const & cancellable,
-                                vector<RouteSegment> & routeSegments)
+bool DirectionsEngine::Generate(IndexRoadGraph const & graph, vector<geometry::PointWithAltitude> const & path,
+                                base::Cancellable const & cancellable, vector<RouteSegment> & routeSegments)
 {
   CHECK(m_numMwmIds, ());
 
@@ -324,10 +317,10 @@ void DirectionsEngine::MakeTurnAnnotation(IndexRoadGraph::EdgeVector const & rou
 
   RoutingSettings const vehicleSettings = GetRoutingSettings(m_vehicleType);
 
-  auto const & loadedSegments = result.GetSegments(); // the same as m_pathSegments
+  auto const & loadedSegments = result.GetSegments();  // the same as m_pathSegments
 
   // First point of first loadedSegment is ignored. This is the reason for:
-  //ASSERT_EQUAL(loadedSegments.front().m_path.back(), loadedSegments.front().m_path.front(), ());
+  // ASSERT_EQUAL(loadedSegments.front().m_path.back(), loadedSegments.front().m_path.front(), ());
 
   size_t skipTurnSegments = 0;
   for (size_t idxLoadedSegment = 0; idxLoadedSegment < loadedSegments.size(); ++idxLoadedSegment)
@@ -345,7 +338,7 @@ void DirectionsEngine::MakeTurnAnnotation(IndexRoadGraph::EdgeVector const & rou
       auto const & junction = loadedSegment.m_path[i + 1];
       routeSegments.emplace_back(loadedSegment.m_segments[i], TurnItem(), junction, rni);
       if (i == 0)
-        rni = {"","","","", "", loadedSegment.m_isLink};
+        rni = {"", "", "", "", "", loadedSegment.m_isLink};
     }
 
     // For the last segment of current loadedSegment put info about turn
@@ -362,8 +355,8 @@ void DirectionsEngine::MakeTurnAnnotation(IndexRoadGraph::EdgeVector const & rou
     routeSegments.emplace_back(loadedSegment.m_segments.back(), turnItem, loadedSegment.m_path.back(), rni);
   }
 
-  //ASSERT_EQUAL(routeSegments.front().GetJunction(), result.GetStartPoint(), ());
-  //ASSERT_EQUAL(routeSegments.back().GetJunction(), result.GetEndPoint(), ());
+  // ASSERT_EQUAL(routeSegments.front().GetJunction(), result.GetStartPoint(), ());
+  // ASSERT_EQUAL(routeSegments.back().GetJunction(), result.GetEndPoint(), ());
 
   FixupTurns(routeSegments);
 }
diff --git a/libs/routing/directions_engine.hpp b/libs/routing/directions_engine.hpp
index 6bdddd918..c7dc61840 100644
--- a/libs/routing/directions_engine.hpp
+++ b/libs/routing/directions_engine.hpp
@@ -20,7 +20,7 @@ namespace turns
 {
 class IRoutingResult;
 struct TurnItem;
-}
+}  // namespace turns
 
 enum class RouterResultCode;
 class MwmDataSource;
@@ -36,29 +36,26 @@ public:
   /// \brief Generates all args which are passed by reference.
   /// \param path is points of the route. It should not be empty.
   /// \returns true if fields passed by reference are filled correctly and false otherwise.
-  bool Generate(IndexRoadGraph const & graph,
-                std::vector<geometry::PointWithAltitude> const & path,
-                base::Cancellable const & cancellable,
-                std::vector<RouteSegment> & routeSegments);
+  bool Generate(IndexRoadGraph const & graph, std::vector<geometry::PointWithAltitude> const & path,
+                base::Cancellable const & cancellable, std::vector<RouteSegment> & routeSegments);
   void Clear();
 
   void SetVehicleType(VehicleType const & vehicleType) { m_vehicleType = vehicleType; }
 
 protected:
   /*!
-  * \brief GetTurnDirection makes a primary decision about turns on the route.
-  * \param outgoingSegmentIndex index of an outgoing segments in vector result.GetSegments().
-  * \param turn is used for keeping the result of turn calculation.
-  */
+   * \brief GetTurnDirection makes a primary decision about turns on the route.
+   * \param outgoingSegmentIndex index of an outgoing segments in vector result.GetSegments().
+   * \param turn is used for keeping the result of turn calculation.
+   */
   virtual size_t GetTurnDirection(turns::IRoutingResult const & result, size_t const outgoingSegmentIndex,
-                                  NumMwmIds const & numMwmIds,
-                                  RoutingSettings const & vehicleSettings, turns::TurnItem & turn) = 0;
+                                  NumMwmIds const & numMwmIds, RoutingSettings const & vehicleSettings,
+                                  turns::TurnItem & turn) = 0;
   virtual void FixupTurns(std::vector<RouteSegment> & routeSegments) = 0;
   std::unique_ptr<FeatureType> GetFeature(FeatureID const & featureId);
   void LoadPathAttributes(FeatureID const & featureId, LoadedPathSegment & pathSegment, bool isForward);
-  void GetSegmentRangeAndAdjacentEdges(IRoadGraph::EdgeListT const & outgoingEdges,
-                                       Edge const & inEdge, uint32_t startSegId, uint32_t endSegId,
-                                       SegmentRange & segmentRange,
+  void GetSegmentRangeAndAdjacentEdges(IRoadGraph::EdgeListT const & outgoingEdges, Edge const & inEdge,
+                                       uint32_t startSegId, uint32_t endSegId, SegmentRange & segmentRange,
                                        turns::TurnCandidates & outgoingTurns);
   /// \brief The method gathers sequence of segments according to IsJoint() method
   /// and fills |m_adjacentEdges| and |m_pathSegments|.
@@ -75,8 +72,7 @@ protected:
   VehicleType m_vehicleType = VehicleType::Count;
 
 private:
-  void MakeTurnAnnotation(IndexRoadGraph::EdgeVector const & routeEdges,
-                          std::vector<RouteSegment> & routeSegments);
+  void MakeTurnAnnotation(IndexRoadGraph::EdgeVector const & routeEdges, std::vector<RouteSegment> & routeSegments);
 
   ftypes::IsLinkChecker const & m_linkChecker;
   ftypes::IsRoundAboutChecker const & m_roundAboutChecker;
diff --git a/libs/routing/directions_engine_helpers.cpp b/libs/routing/directions_engine_helpers.cpp
index 1b6a72564..703ebda58 100644
--- a/libs/routing/directions_engine_helpers.cpp
+++ b/libs/routing/directions_engine_helpers.cpp
@@ -6,8 +6,7 @@ namespace routing
 {
 bool AdjacentEdges::IsAlmostEqual(AdjacentEdges const & rhs) const
 {
-  return m_outgoingTurns.IsAlmostEqual(rhs.m_outgoingTurns) &&
-         m_ingoingTurnsCount == rhs.m_ingoingTurnsCount;
+  return m_outgoingTurns.IsAlmostEqual(rhs.m_outgoingTurns) && m_ingoingTurnsCount == rhs.m_ingoingTurnsCount;
 }
 
 RoutingEngineResult::RoutingEngineResult(IRoadGraph::EdgeVector const & routeEdges,
@@ -19,18 +18,14 @@ RoutingEngineResult::RoutingEngineResult(IRoadGraph::EdgeVector const & routeEdg
   , m_routeLength(0)
 {
   for (auto const & edge : routeEdges)
-  {
-    m_routeLength += mercator::DistanceOnEarth(edge.GetStartJunction().GetPoint(),
-                                               edge.GetEndJunction().GetPoint());
-  }
+    m_routeLength += mercator::DistanceOnEarth(edge.GetStartJunction().GetPoint(), edge.GetEndJunction().GetPoint());
 }
 
-void RoutingEngineResult::GetPossibleTurns(SegmentRange const & segmentRange,
-                                           m2::PointD const & junctionPoint, size_t & ingoingCount,
-                                           turns::TurnCandidates & outgoingTurns) const
+void RoutingEngineResult::GetPossibleTurns(SegmentRange const & segmentRange, m2::PointD const & junctionPoint,
+                                           size_t & ingoingCount, turns::TurnCandidates & outgoingTurns) const
 {
-  CHECK(!segmentRange.IsEmpty(), ("SegmentRange presents a fake feature.",
-                                  "junctionPoint:", mercator::ToLatLon(junctionPoint)));
+  CHECK(!segmentRange.IsEmpty(),
+        ("SegmentRange presents a fake feature.", "junctionPoint:", mercator::ToLatLon(junctionPoint)));
 
   ingoingCount = 0;
   outgoingTurns.candidates.clear();
@@ -58,9 +53,8 @@ geometry::PointWithAltitude RoutingEngineResult::GetEndPoint() const
   return m_routeEdges.back().GetEndJunction();
 }
 
-bool IsJoint(IRoadGraph::EdgeListT const & ingoingEdges,
-             IRoadGraph::EdgeListT const & outgoingEdges, Edge const & ingoingRouteEdge,
-             Edge const & outgoingRouteEdge)
+bool IsJoint(IRoadGraph::EdgeListT const & ingoingEdges, IRoadGraph::EdgeListT const & outgoingEdges,
+             Edge const & ingoingRouteEdge, Edge const & outgoingRouteEdge)
 {
   // When feature id is changed at a junction this junction should be considered as a joint.
   //
@@ -83,10 +77,8 @@ bool IsJoint(IRoadGraph::EdgeListT const & ingoingEdges,
   FeatureID const & featureId = ingoingRouteEdge.GetFeatureId();
   uint32_t const segOut = outgoingRouteEdge.GetSegId();
   for (Edge const & e : ingoingEdges)
-  {
     if (e.GetFeatureId() != featureId || abs(static_cast<int32_t>(segOut - e.GetSegId())) != 1)
       return true;
-  }
 
   uint32_t const segIn = ingoingRouteEdge.GetSegId();
   for (Edge const & e : outgoingEdges)
diff --git a/libs/routing/directions_engine_helpers.hpp b/libs/routing/directions_engine_helpers.hpp
index f7bc39ce1..f03c6aa02 100644
--- a/libs/routing/directions_engine_helpers.hpp
+++ b/libs/routing/directions_engine_helpers.hpp
@@ -24,15 +24,13 @@ using AdjacentEdgesMap = std::map<SegmentRange, AdjacentEdges>;
 class RoutingEngineResult : public turns::IRoutingResult
 {
 public:
-  RoutingEngineResult(IRoadGraph::EdgeVector const & routeEdges,
-                      AdjacentEdgesMap const & adjacentEdges,
+  RoutingEngineResult(IRoadGraph::EdgeVector const & routeEdges, AdjacentEdgesMap const & adjacentEdges,
                       TUnpackedPathSegments const & pathSegments);
 
   // turns::IRoutingResult overrides:
   TUnpackedPathSegments const & GetSegments() const override { return m_pathSegments; }
 
-  void GetPossibleTurns(SegmentRange const & segmentRange, m2::PointD const & junctionPoint,
-                        size_t & ingoingCount,
+  void GetPossibleTurns(SegmentRange const & segmentRange, m2::PointD const & junctionPoint, size_t & ingoingCount,
                         turns::TurnCandidates & outgoingTurns) const override;
 
   double GetPathLength() const override { return m_routeLength; }
@@ -51,7 +49,6 @@ private:
 /// \returns false if the junction is an internal point of feature segment and can be considered as
 /// a part of LoadedPathSegment and returns true if the junction should be considered as a beginning
 /// of a new LoadedPathSegment.
-bool IsJoint(IRoadGraph::EdgeListT const & ingoingEdges,
-             IRoadGraph::EdgeListT const & outgoingEdges, Edge const & ingoingRouteEdge,
-             Edge const & outgoingRouteEdge);
+bool IsJoint(IRoadGraph::EdgeListT const & ingoingEdges, IRoadGraph::EdgeListT const & outgoingEdges,
+             Edge const & ingoingRouteEdge, Edge const & outgoingRouteEdge);
 }  // namespace routing
diff --git a/libs/routing/dummy_world_graph.hpp b/libs/routing/dummy_world_graph.hpp
index b6c1e18d2..79c38e582 100644
--- a/libs/routing/dummy_world_graph.hpp
+++ b/libs/routing/dummy_world_graph.hpp
@@ -23,45 +23,28 @@ class DummyWorldGraph final : public WorldGraph
 public:
   using WorldGraph::GetEdgeList;
 
-  void GetEdgeList(astar::VertexData<Segment, RouteWeight> const & vertexData, bool isOutgoing,
-                   bool useRoutingOptions, bool useAccessConditional,
-                   SegmentEdgeListT & edges) override
+  void GetEdgeList(astar::VertexData<Segment, RouteWeight> const & vertexData, bool isOutgoing, bool useRoutingOptions,
+                   bool useAccessConditional, SegmentEdgeListT & edges) override
   {
     UNREACHABLE();
   }
 
-  void GetEdgeList(astar::VertexData<JointSegment, RouteWeight> const & vertexData,
-                   Segment const & segment, bool isOutgoing, bool useAccessConditional,
-                   JointEdgeListT & edges,
+  void GetEdgeList(astar::VertexData<JointSegment, RouteWeight> const & vertexData, Segment const & segment,
+                   bool isOutgoing, bool useAccessConditional, JointEdgeListT & edges,
                    WeightListT & parentWeights) override
   {
     UNREACHABLE();
   }
 
-  bool CheckLength(RouteWeight const & weight, double startToFinishDistanceM) const override
-  {
-    return true;
-  }
+  bool CheckLength(RouteWeight const & weight, double startToFinishDistanceM) const override { return true; }
 
-  LatLonWithAltitude const & GetJunction(Segment const & segment, bool front) override
-  {
-    UNREACHABLE();
-  }
+  LatLonWithAltitude const & GetJunction(Segment const & segment, bool front) override { UNREACHABLE(); }
 
-  ms::LatLon const & GetPoint(Segment const & segment, bool front) override
-  {
-    UNREACHABLE();
-  }
+  ms::LatLon const & GetPoint(Segment const & segment, bool front) override { UNREACHABLE(); }
 
-  bool IsOneWay(NumMwmId mwmId, uint32_t featureId) override
-  {
-    UNREACHABLE();
-  }
+  bool IsOneWay(NumMwmId mwmId, uint32_t featureId) override { UNREACHABLE(); }
 
-  bool IsPassThroughAllowed(NumMwmId mwmId, uint32_t featureId) override
-  {
-    UNREACHABLE();
-  }
+  bool IsPassThroughAllowed(NumMwmId mwmId, uint32_t featureId) override { UNREACHABLE(); }
 
   void ClearCachedGraphs() override { UNREACHABLE(); }
 
@@ -74,13 +57,9 @@ public:
     return RouteWeight(ms::DistanceOnEarth(from, to));
   }
 
-  RouteWeight CalcSegmentWeight(Segment const & segment, EdgeEstimator::Purpose purpose) override
-  {
-    UNREACHABLE();
-  }
+  RouteWeight CalcSegmentWeight(Segment const & segment, EdgeEstimator::Purpose purpose) override { UNREACHABLE(); }
 
-  RouteWeight CalcLeapWeight(ms::LatLon const & from, ms::LatLon const & to,
-                             NumMwmId mwmId) const override
+  RouteWeight CalcLeapWeight(ms::LatLon const & from, ms::LatLon const & to, NumMwmId mwmId) const override
   {
     UNREACHABLE();
   }
@@ -91,23 +70,13 @@ public:
     return RouteWeight(ms::DistanceOnEarth(from, to));
   }
 
-  double CalculateETA(Segment const & from, Segment const & to) override
-  {
-    UNREACHABLE();
-  }
+  double CalculateETA(Segment const & from, Segment const & to) override { UNREACHABLE(); }
 
-  double CalculateETAWithoutPenalty(Segment const & segment) override
-  {
-    UNREACHABLE();
-  }
+  double CalculateETAWithoutPenalty(Segment const & segment) override { UNREACHABLE(); }
 
-  IndexGraph & GetIndexGraph(NumMwmId numMwmId) override
-  {
-    UNREACHABLE();
-  }
+  IndexGraph & GetIndexGraph(NumMwmId numMwmId) override { UNREACHABLE(); }
 
-  void GetTwinsInner(Segment const & segment, bool isOutgoing,
-                     std::vector<Segment> & twins) override
+  void GetTwinsInner(Segment const & segment, bool isOutgoing, std::vector<Segment> & twins) override
   {
     CHECK(false, ());
   }
diff --git a/libs/routing/edge_estimator.cpp b/libs/routing/edge_estimator.cpp
index f70aeef12..628485cd2 100644
--- a/libs/routing/edge_estimator.cpp
+++ b/libs/routing/edge_estimator.cpp
@@ -60,13 +60,13 @@ bool IsTransit(std::optional<HighwayType> type)
 }
 
 template <class CalcSpeed>
-double CalcClimbSegment(EdgeEstimator::Purpose purpose, Segment const & segment,
-                        RoadGeometry const & road, CalcSpeed && calcSpeed)
+double CalcClimbSegment(EdgeEstimator::Purpose purpose, Segment const & segment, RoadGeometry const & road,
+                        CalcSpeed && calcSpeed)
 {
   double const distance = road.GetDistance(segment.GetSegmentIdx());
   double speedMpS = GetSpeedMpS(purpose, segment, road);
 
-  static double constexpr kSmallDistanceM = 1;   // we have altitude threshold is 0.5m
+  static double constexpr kSmallDistanceM = 1;  // we have altitude threshold is 0.5m
   if (distance > kSmallDistanceM && !IsTransit(road.GetHighwayType()))
   {
     LatLonWithAltitude const & from = road.GetJunction(segment.GetPointId(false /* front */));
@@ -103,14 +103,13 @@ double GetPedestrianClimbPenalty(EdgeEstimator::Purpose purpose, double tangent,
     tangent = fabs(tangent);
     // Some thoughts about gradient and foot walking: https://gre-kow.livejournal.com/26916.html
     // 3cm diff with avg foot length 60cm is imperceptible (see Hungary_UseFootways).
-    double constexpr kTangentThreshold = 3.0/60.0;
+    double constexpr kTangentThreshold = 3.0 / 60.0;
     if (tangent < kTangentThreshold)
       return kMinPenalty;
 
     // ETA coefficients are calculated in https://github.com/mapsme/omim-scripts/pull/21
-    auto const penalty = purpose == EdgeEstimator::Purpose::Weight
-                             ? 5.0 * tangent + 7.0 * tangent * tangent
-                             : 3.01 * tangent + 3.54 * tangent * tangent;
+    auto const penalty = purpose == EdgeEstimator::Purpose::Weight ? 5.0 * tangent + 7.0 * tangent * tangent
+                                                                   : 3.01 * tangent + 3.54 * tangent * tangent;
 
     return kMinPenalty + penalty * impact;
   }
@@ -171,8 +170,8 @@ EdgeEstimator::EdgeEstimator(double maxWeightSpeedKMpH, SpeedKMpH const & offroa
                              DataSource * /*dataSourcePtr*/, std::shared_ptr<NumMwmIds> /*numMwmIds*/)
   : m_maxWeightSpeedMpS(KmphToMps(maxWeightSpeedKMpH))
   , m_offroadSpeedKMpH(offroadSpeedKMpH)
-  //, m_dataSourcePtr(dataSourcePtr)
-  //, m_numMwmIds(numMwmIds)
+//, m_dataSourcePtr(dataSourcePtr)
+//, m_numMwmIds(numMwmIds)
 {
   CHECK_GREATER(m_offroadSpeedKMpH.m_weight, 0.0, ());
   CHECK_GREATER(m_offroadSpeedKMpH.m_eta, 0.0, ());
@@ -192,7 +191,7 @@ double EdgeEstimator::CalcHeuristic(ms::LatLon const & from, ms::LatLon const &
 double EdgeEstimator::ComputeDefaultLeapWeightSpeed() const
 {
   // 1.76 factor was computed as an average ratio of escape/enter speed to max MWM speed across all MWMs.
-  //return m_maxWeightSpeedMpS / 1.76;
+  // return m_maxWeightSpeedMpS / 1.76;
 
   // By VNG: Current m_maxWeightSpeedMpS is > 120 km/h, so estimating speed was > 60km/h
   // for start/end fake edges by straight line! I strongly believe that this is very! optimistic.
@@ -231,13 +230,13 @@ double EdgeEstimator::GetLeapWeightSpeed(NumMwmId /*mwmId*/)
 
   /// @todo By VNG: We don't have LEAP_SPEEDS_FILE to assign RegionData::SetLeapWeightSpeed
   /// unique for each MWM, so this is useless now. And what about possible races here?
-//  if (mwmId != kFakeNumMwmId)
-//  {
-//    auto [speedIt, inserted] = m_leapWeightSpeedMpS.emplace(mwmId, defaultSpeed);
-//    if (inserted)
-//      speedIt->second = LoadLeapWeightSpeed(mwmId);
-//    return speedIt->second;
-//  }
+  //  if (mwmId != kFakeNumMwmId)
+  //  {
+  //    auto [speedIt, inserted] = m_leapWeightSpeedMpS.emplace(mwmId, defaultSpeed);
+  //    if (inserted)
+  //      speedIt->second = LoadLeapWeightSpeed(mwmId);
+  //    return speedIt->second;
+  //  }
 
   return defaultSpeed;
 }
@@ -247,13 +246,14 @@ double EdgeEstimator::CalcLeapWeight(ms::LatLon const & from, ms::LatLon const &
   return TimeBetweenSec(from, to, GetLeapWeightSpeed(mwmId));
 }
 
-double EdgeEstimator::GetMaxWeightSpeedMpS() const { return m_maxWeightSpeedMpS; }
-
-double EdgeEstimator::CalcOffroad(ms::LatLon const & from, ms::LatLon const & to,
-                                  Purpose purpose) const
+double EdgeEstimator::GetMaxWeightSpeedMpS() const
 {
-  auto const offroadSpeedKMpH =
-      purpose == Purpose::Weight ? m_offroadSpeedKMpH.m_weight : m_offroadSpeedKMpH.m_eta;
+  return m_maxWeightSpeedMpS;
+}
+
+double EdgeEstimator::CalcOffroad(ms::LatLon const & from, ms::LatLon const & to, Purpose purpose) const
+{
+  auto const offroadSpeedKMpH = purpose == Purpose::Weight ? m_offroadSpeedKMpH.m_weight : m_offroadSpeedKMpH.m_eta;
   if (offroadSpeedKMpH == kNotUsed)
     return 0.0;
 
@@ -266,8 +266,7 @@ class PedestrianEstimator final : public EdgeEstimator
 public:
   PedestrianEstimator(double maxWeightSpeedKMpH, SpeedKMpH const & offroadSpeedKMpH)
     : EdgeEstimator(maxWeightSpeedKMpH, offroadSpeedKMpH)
-  {
-  }
+  {}
 
   // EdgeEstimator overrides:
   double GetUTurnPenalty(Purpose /* purpose */) const override { return 0.0 /* seconds */; }
@@ -275,8 +274,8 @@ public:
   {
     switch (purpose)
     {
-    case Purpose::Weight: return 10 * 60;   // seconds
-    case Purpose::ETA: return 8 * 60;       // seconds
+    case Purpose::Weight: return 10 * 60;  // seconds
+    case Purpose::ETA: return 8 * 60;      // seconds
     }
     UNREACHABLE();
   }
@@ -284,10 +283,8 @@ public:
   double CalcSegmentWeight(Segment const & segment, RoadGeometry const & road, Purpose purpose) const override
   {
     return CalcClimbSegment(purpose, segment, road,
-        [purpose](double speedMpS, double tangent, geometry::Altitude altitude)
-        {
-          return speedMpS / GetPedestrianClimbPenalty(purpose, tangent, altitude);
-        });
+                            [purpose](double speedMpS, double tangent, geometry::Altitude altitude)
+    { return speedMpS / GetPedestrianClimbPenalty(purpose, tangent, altitude); });
   }
 };
 
@@ -297,8 +294,7 @@ class BicycleEstimator final : public EdgeEstimator
 public:
   BicycleEstimator(double maxWeightSpeedKMpH, SpeedKMpH const & offroadSpeedKMpH)
     : EdgeEstimator(maxWeightSpeedKMpH, offroadSpeedKMpH)
-  {
-  }
+  {}
 
   // EdgeEstimator overrides:
   double GetUTurnPenalty(Purpose /* purpose */) const override { return 20.0 /* seconds */; }
@@ -306,8 +302,8 @@ public:
   {
     switch (purpose)
     {
-    case Purpose::Weight: return 10 * 60;   // seconds
-    case Purpose::ETA: return 8 * 60;       // seconds
+    case Purpose::Weight: return 10 * 60;  // seconds
+    case Purpose::ETA: return 8 * 60;      // seconds
     }
     UNREACHABLE();
   }
@@ -315,38 +311,35 @@ public:
   double CalcSegmentWeight(Segment const & segment, RoadGeometry const & road, Purpose purpose) const override
   {
     return CalcClimbSegment(purpose, segment, road,
-        [purpose, this](double speedMpS, double tangent, geometry::Altitude altitude)
+                            [purpose, this](double speedMpS, double tangent, geometry::Altitude altitude)
+    {
+      auto const factor = GetBicycleClimbPenalty(purpose, tangent, altitude);
+      ASSERT_GREATER(factor, 0.0, ());
+
+      /// @todo Take out "bad" bicycle road (path, track, footway, ...) check into BicycleModel?
+      static double constexpr badBicycleRoadSpeed = KmphToMps(9);
+      if (speedMpS <= badBicycleRoadSpeed)
+      {
+        if (factor > 1)
+          speedMpS /= factor;
+      }
+      else if (factor > 1)
+      {
+        // Calculate uphill speed according to the average bicycle speed, because "good-roads" like
+        // residential, secondary, cycleway are "equal-low-speed" uphill and road type doesn't matter.
+        static double constexpr avgBicycleSpeed = KmphToMps(20);
+        double const upperBound = avgBicycleSpeed / factor;
+        if (speedMpS > upperBound)
         {
-          auto const factor = GetBicycleClimbPenalty(purpose, tangent, altitude);
-          ASSERT_GREATER(factor, 0.0, ());
+          // Add small weight to distinguish roads by class (10 is a max factor value).
+          speedMpS = upperBound + (purpose == Purpose::Weight ? speedMpS / (10 * avgBicycleSpeed) : 0);
+        }
+      }
+      else
+        speedMpS /= factor;
 
-          /// @todo Take out "bad" bicycle road (path, track, footway, ...) check into BicycleModel?
-          static double constexpr badBicycleRoadSpeed = KmphToMps(9);
-          if (speedMpS <= badBicycleRoadSpeed)
-          {
-            if (factor > 1)
-              speedMpS /= factor;
-          }
-          else
-          {
-            if (factor > 1)
-            {
-              // Calculate uphill speed according to the average bicycle speed, because "good-roads" like
-              // residential, secondary, cycleway are "equal-low-speed" uphill and road type doesn't matter.
-              static double constexpr avgBicycleSpeed = KmphToMps(20);
-              double const upperBound = avgBicycleSpeed / factor;
-              if (speedMpS > upperBound)
-              {
-                // Add small weight to distinguish roads by class (10 is a max factor value).
-                speedMpS = upperBound + (purpose == Purpose::Weight ? speedMpS / (10 * avgBicycleSpeed) : 0);
-              }
-            }
-            else
-              speedMpS /= factor;
-          }
-
-          return std::min(speedMpS, GetMaxWeightSpeedMpS());
-        });
+      return std::min(speedMpS, GetMaxWeightSpeedMpS());
+    });
   }
 };
 
@@ -354,13 +347,11 @@ public:
 class CarEstimator final : public EdgeEstimator
 {
 public:
-  CarEstimator(DataSource * dataSourcePtr, std::shared_ptr<NumMwmIds> numMwmIds,
-               shared_ptr<TrafficStash> trafficStash, double maxWeightSpeedKMpH,
-               SpeedKMpH const & offroadSpeedKMpH)
+  CarEstimator(DataSource * dataSourcePtr, std::shared_ptr<NumMwmIds> numMwmIds, shared_ptr<TrafficStash> trafficStash,
+               double maxWeightSpeedKMpH, SpeedKMpH const & offroadSpeedKMpH)
     : EdgeEstimator(maxWeightSpeedKMpH, offroadSpeedKMpH, dataSourcePtr, numMwmIds)
     , m_trafficStash(std::move(trafficStash))
-  {
-  }
+  {}
 
   // EdgeEstimator overrides:
   double CalcSegmentWeight(Segment const & segment, RoadGeometry const & road, Purpose purpose) const override;
@@ -376,8 +367,8 @@ public:
   {
     switch (purpose)
     {
-    case Purpose::Weight: return 20 * 60;   // seconds
-    case Purpose::ETA: return 20 * 60;      // seconds
+    case Purpose::Weight: return 20 * 60;  // seconds
+    case Purpose::ETA: return 20 * 60;     // seconds
     }
     UNREACHABLE();
   }
@@ -413,35 +404,27 @@ double CarEstimator::CalcSegmentWeight(Segment const & segment, RoadGeometry con
 // static
 shared_ptr<EdgeEstimator> EdgeEstimator::Create(VehicleType vehicleType, double maxWeighSpeedKMpH,
                                                 SpeedKMpH const & offroadSpeedKMpH,
-                                                shared_ptr<TrafficStash> trafficStash,
-                                                DataSource * dataSourcePtr,
+                                                shared_ptr<TrafficStash> trafficStash, DataSource * dataSourcePtr,
                                                 std::shared_ptr<NumMwmIds> numMwmIds)
 {
   switch (vehicleType)
   {
   case VehicleType::Pedestrian:
-  case VehicleType::Transit:
-    return make_shared<PedestrianEstimator>(maxWeighSpeedKMpH, offroadSpeedKMpH);
-  case VehicleType::Bicycle:
-    return make_shared<BicycleEstimator>(maxWeighSpeedKMpH, offroadSpeedKMpH);
+  case VehicleType::Transit: return make_shared<PedestrianEstimator>(maxWeighSpeedKMpH, offroadSpeedKMpH);
+  case VehicleType::Bicycle: return make_shared<BicycleEstimator>(maxWeighSpeedKMpH, offroadSpeedKMpH);
   case VehicleType::Car:
-    return make_shared<CarEstimator>(dataSourcePtr, numMwmIds, trafficStash, maxWeighSpeedKMpH,
-                                     offroadSpeedKMpH);
-  case VehicleType::Count:
-    CHECK(false, ("Can't create EdgeEstimator for", vehicleType));
-    return nullptr;
+    return make_shared<CarEstimator>(dataSourcePtr, numMwmIds, trafficStash, maxWeighSpeedKMpH, offroadSpeedKMpH);
+  case VehicleType::Count: CHECK(false, ("Can't create EdgeEstimator for", vehicleType)); return nullptr;
   }
   UNREACHABLE();
 }
 
 // static
-shared_ptr<EdgeEstimator> EdgeEstimator::Create(VehicleType vehicleType,
-                                                VehicleModelInterface const & vehicleModel,
-                                                shared_ptr<TrafficStash> trafficStash,
-                                                DataSource * dataSourcePtr,
+shared_ptr<EdgeEstimator> EdgeEstimator::Create(VehicleType vehicleType, VehicleModelInterface const & vehicleModel,
+                                                shared_ptr<TrafficStash> trafficStash, DataSource * dataSourcePtr,
                                                 std::shared_ptr<NumMwmIds> numMwmIds)
 {
-  return Create(vehicleType, vehicleModel.GetMaxWeightSpeed(), vehicleModel.GetOffroadSpeed(),
-                trafficStash, dataSourcePtr, numMwmIds);
+  return Create(vehicleType, vehicleModel.GetMaxWeightSpeed(), vehicleModel.GetOffroadSpeed(), trafficStash,
+                dataSourcePtr, numMwmIds);
 }
 }  // namespace routing
diff --git a/libs/routing/edge_estimator.hpp b/libs/routing/edge_estimator.hpp
index 5edf81df8..4dedcd954 100644
--- a/libs/routing/edge_estimator.hpp
+++ b/libs/routing/edge_estimator.hpp
@@ -27,8 +27,8 @@ public:
     ETA
   };
 
-  EdgeEstimator(double maxWeightSpeedKMpH, SpeedKMpH const & offroadSpeedKMpH,
-                DataSource * dataSourcePtr = nullptr, std::shared_ptr<NumMwmIds> numMwmIds = nullptr);
+  EdgeEstimator(double maxWeightSpeedKMpH, SpeedKMpH const & offroadSpeedKMpH, DataSource * dataSourcePtr = nullptr,
+                std::shared_ptr<NumMwmIds> numMwmIds = nullptr);
   virtual ~EdgeEstimator() = default;
 
   double CalcHeuristic(ms::LatLon const & from, ms::LatLon const & to) const;
@@ -45,41 +45,34 @@ public:
   // Estimates time in seconds it takes to go from point |from| to point |to| along direct fake edge.
   double CalcOffroad(ms::LatLon const & from, ms::LatLon const & to, Purpose purpose) const;
 
-  virtual double CalcSegmentWeight(Segment const & segment, RoadGeometry const & road,
-                                   Purpose purpose) const = 0;
+  virtual double CalcSegmentWeight(Segment const & segment, RoadGeometry const & road, Purpose purpose) const = 0;
   virtual double GetUTurnPenalty(Purpose purpose) const = 0;
   virtual double GetFerryLandingPenalty(Purpose purpose) const = 0;
 
   static std::shared_ptr<EdgeEstimator> Create(VehicleType vehicleType, double maxWeighSpeedKMpH,
                                                SpeedKMpH const & offroadSpeedKMpH,
-                                               std::shared_ptr<TrafficStash> trafficStash,
-                                               DataSource * dataSourcePtr,
+                                               std::shared_ptr<TrafficStash> trafficStash, DataSource * dataSourcePtr,
                                                std::shared_ptr<NumMwmIds> numMwmIds);
 
-  static std::shared_ptr<EdgeEstimator> Create(VehicleType vehicleType,
-                                               VehicleModelInterface const & vehicleModel,
-                                               std::shared_ptr<TrafficStash> trafficStash,
-                                               DataSource * dataSourcePtr,
+  static std::shared_ptr<EdgeEstimator> Create(VehicleType vehicleType, VehicleModelInterface const & vehicleModel,
+                                               std::shared_ptr<TrafficStash> trafficStash, DataSource * dataSourcePtr,
                                                std::shared_ptr<NumMwmIds> numMwmIds);
 
 private:
   double const m_maxWeightSpeedMpS;
   SpeedKMpH const m_offroadSpeedKMpH;
 
-  //DataSource * m_dataSourcePtr;
-  //std::shared_ptr<NumMwmIds> m_numMwmIds;
-  //std::unordered_map<NumMwmId, double> m_leapWeightSpeedMpS;
+  // DataSource * m_dataSourcePtr;
+  // std::shared_ptr<NumMwmIds> m_numMwmIds;
+  // std::unordered_map<NumMwmId, double> m_leapWeightSpeedMpS;
 
   double ComputeDefaultLeapWeightSpeed() const;
   double GetLeapWeightSpeed(NumMwmId mwmId);
-  //double LoadLeapWeightSpeed(NumMwmId mwmId);
+  // double LoadLeapWeightSpeed(NumMwmId mwmId);
 };
 
-double GetPedestrianClimbPenalty(EdgeEstimator::Purpose purpose, double tangent,
-                                 geometry::Altitude altitudeM);
-double GetBicycleClimbPenalty(EdgeEstimator::Purpose purpose, double tangent,
-                              geometry::Altitude altitudeM);
-double GetCarClimbPenalty(EdgeEstimator::Purpose purpose, double tangent,
-                          geometry::Altitude altitudeM);
+double GetPedestrianClimbPenalty(EdgeEstimator::Purpose purpose, double tangent, geometry::Altitude altitudeM);
+double GetBicycleClimbPenalty(EdgeEstimator::Purpose purpose, double tangent, geometry::Altitude altitudeM);
+double GetCarClimbPenalty(EdgeEstimator::Purpose purpose, double tangent, geometry::Altitude altitudeM);
 
 }  // namespace routing
diff --git a/libs/routing/fake_edges_container.hpp b/libs/routing/fake_edges_container.hpp
index ae423174e..f8d5bb4a1 100644
--- a/libs/routing/fake_edges_container.hpp
+++ b/libs/routing/fake_edges_container.hpp
@@ -20,8 +20,7 @@ public:
   FakeEdgesContainer(IndexGraphStarter && starter)
     : m_finish(std::move(starter.m_finish))
     , m_fake(std::move(starter.m_fake))
-  {
-  }
+  {}
 
   uint32_t GetNumFakeEdges() const
   {
diff --git a/libs/routing/fake_ending.cpp b/libs/routing/fake_ending.cpp
index 55eb40643..683bad7e3 100644
--- a/libs/routing/fake_ending.cpp
+++ b/libs/routing/fake_ending.cpp
@@ -17,8 +17,7 @@ namespace routing
 using namespace routing;
 using namespace std;
 
-LatLonWithAltitude CalcProjectionToSegment(LatLonWithAltitude const & begin,
-                                           LatLonWithAltitude const & end,
+LatLonWithAltitude CalcProjectionToSegment(LatLonWithAltitude const & begin, LatLonWithAltitude const & end,
                                            m2::PointD const & point)
 {
   m2::ParametrizedSegment<m2::PointD> segment(mercator::FromLatLon(begin.GetLatLon()),
@@ -33,23 +32,20 @@ LatLonWithAltitude CalcProjectionToSegment(LatLonWithAltitude const & begin,
   if (AlmostEqualAbs(distBeginToEnd, 0.0, kEpsMeters))
     return LatLonWithAltitude(projectedLatLon, begin.GetAltitude());
 
-  auto const distBeginToProjection =
-      ms::DistanceOnEarth(begin.GetLatLon(), projectedLatLon);
+  auto const distBeginToProjection = ms::DistanceOnEarth(begin.GetLatLon(), projectedLatLon);
 
-  auto const altitude = begin.GetAltitude() + (end.GetAltitude() - begin.GetAltitude()) *
-                                                  distBeginToProjection / distBeginToEnd;
+  auto const altitude =
+      begin.GetAltitude() + (end.GetAltitude() - begin.GetAltitude()) * distBeginToProjection / distBeginToEnd;
   return LatLonWithAltitude(projectedLatLon, altitude);
 }
 
-bool Projection::operator==(const Projection & other) const
+bool Projection::operator==(Projection const & other) const
 {
   return tie(m_segment, m_isOneWay, m_segmentFront, m_segmentBack, m_junction) ==
-         tie(other.m_segment, other.m_isOneWay, other.m_segmentFront, other.m_segmentBack,
-             other.m_junction);
+         tie(other.m_segment, other.m_isOneWay, other.m_segmentFront, other.m_segmentBack, other.m_junction);
 }
 
-FakeEnding MakeFakeEnding(vector<Segment> const & segments, m2::PointD const & point,
-                          WorldGraph & graph)
+FakeEnding MakeFakeEnding(vector<Segment> const & segments, m2::PointD const & point, WorldGraph & graph)
 {
   FakeEnding ending;
   double averageAltitude = 0.0;
@@ -63,8 +59,7 @@ FakeEnding MakeFakeEnding(vector<Segment> const & segments, m2::PointD const & p
     auto const & backJunction = graph.GetJunction(segment, false /* front */);
     auto const & projectedJunction = CalcProjectionToSegment(backJunction, frontJunction, point);
 
-    ending.m_projections.emplace_back(segment, oneWay, frontJunction, backJunction,
-                                      projectedJunction);
+    ending.m_projections.emplace_back(segment, oneWay, frontJunction, backJunction, projectedJunction);
 
     averageAltitude = (i * averageAltitude + projectedJunction.GetAltitude()) / (i + 1);
   }
@@ -83,10 +78,8 @@ FakeEnding MakeFakeEnding(Segment const & segment, m2::PointD const & point, Ind
   auto const & projectedJunction = CalcProjectionToSegment(backJunction, frontJunction, point);
 
   FakeEnding ending;
-  ending.m_originJunction =
-      LatLonWithAltitude(mercator::ToLatLon(point), projectedJunction.GetAltitude());
-  ending.m_projections.emplace_back(segment, oneWay, frontJunction, backJunction,
-                                    projectedJunction);
+  ending.m_originJunction = LatLonWithAltitude(mercator::ToLatLon(point), projectedJunction.GetAltitude());
+  ending.m_projections.emplace_back(segment, oneWay, frontJunction, backJunction, projectedJunction);
   return ending;
 }
 }  // namespace routing
diff --git a/libs/routing/fake_ending.hpp b/libs/routing/fake_ending.hpp
index ff76fee49..f12215603 100644
--- a/libs/routing/fake_ending.hpp
+++ b/libs/routing/fake_ending.hpp
@@ -17,17 +17,14 @@ class WorldGraph;
 
 struct Projection final
 {
-  Projection(Segment const & segment, bool isOneWay,
-             LatLonWithAltitude const & segmentFront,
-             LatLonWithAltitude const & segmentBack,
-             LatLonWithAltitude const & junction)
+  Projection(Segment const & segment, bool isOneWay, LatLonWithAltitude const & segmentFront,
+             LatLonWithAltitude const & segmentBack, LatLonWithAltitude const & junction)
     : m_segment(segment)
     , m_isOneWay(isOneWay)
     , m_segmentFront(segmentFront)
     , m_segmentBack(segmentBack)
     , m_junction(junction)
-  {
-  }
+  {}
   bool operator==(Projection const & other) const;
 
   Segment m_segment;
@@ -43,11 +40,9 @@ struct FakeEnding final
   std::vector<Projection> m_projections;
 };
 
-FakeEnding MakeFakeEnding(std::vector<Segment> const & segments, m2::PointD const & point,
-                          WorldGraph & graph);
+FakeEnding MakeFakeEnding(std::vector<Segment> const & segments, m2::PointD const & point, WorldGraph & graph);
 FakeEnding MakeFakeEnding(Segment const & segment, m2::PointD const & point, IndexGraph & graph);
 
-LatLonWithAltitude CalcProjectionToSegment(LatLonWithAltitude const & begin,
-                                           LatLonWithAltitude const & end,
+LatLonWithAltitude CalcProjectionToSegment(LatLonWithAltitude const & begin, LatLonWithAltitude const & end,
                                            m2::PointD const & point);
 }  // namespace routing
diff --git a/libs/routing/fake_feature_ids.hpp b/libs/routing/fake_feature_ids.hpp
index 8e9b5b5d5..fdbd5e3bf 100644
--- a/libs/routing/fake_feature_ids.hpp
+++ b/libs/routing/fake_feature_ids.hpp
@@ -26,25 +26,21 @@ struct FakeFeatureIds
   // and editor feature ids.
   static uint32_t constexpr k28BitsOffset = 0xfffffff;
   static uint32_t constexpr k24BitsOffset = 0xffffff;
-  static uint32_t constexpr kTransitGraphFeaturesStart =
-      std::numeric_limits<uint32_t>::max() - k28BitsOffset;
+  static uint32_t constexpr kTransitGraphFeaturesStart = std::numeric_limits<uint32_t>::max() - k28BitsOffset;
   static uint32_t constexpr kGuidesGraphFeaturesStart = kTransitGraphFeaturesStart - k24BitsOffset;
 };
 
-static_assert(feature::FakeFeatureIds::kEditorCreatedFeaturesStart >
-                  FakeFeatureIds::kTransitGraphFeaturesStart,
+static_assert(feature::FakeFeatureIds::kEditorCreatedFeaturesStart > FakeFeatureIds::kTransitGraphFeaturesStart,
               "routing::FakeFeatureIds::kTransitGraphFeaturesStart or "
               "feature::FakeFeatureIds::kEditorCreatedFeaturesStart was changed. "
               "Interval for transit fake features may be too small.");
 
-static_assert(FakeFeatureIds::kTransitGraphFeaturesStart >
-                  FakeFeatureIds::kGuidesGraphFeaturesStart,
+static_assert(FakeFeatureIds::kTransitGraphFeaturesStart > FakeFeatureIds::kGuidesGraphFeaturesStart,
               "routing::FakeFeatureIds::kTransitGraphFeaturesStart or "
               "feature::FakeFeatureIds::kGuidesGraphFeaturesStart was changed. "
               "Interval for guides fake features may be too small.");
 
-static_assert(feature::FakeFeatureIds::kEditorCreatedFeaturesStart -
-                      FakeFeatureIds::kTransitGraphFeaturesStart >=
+static_assert(feature::FakeFeatureIds::kEditorCreatedFeaturesStart - FakeFeatureIds::kTransitGraphFeaturesStart >=
                   FakeFeatureIds::k24BitsOffset - feature::FakeFeatureIds::k20BitsOffset,
               "routing::FakeFeatureIds::kTransitGraphFeaturesStart or "
               "feature::FakeFeatureIds::kEditorCreatedFeaturesStart was changed. "
diff --git a/libs/routing/fake_graph.cpp b/libs/routing/fake_graph.cpp
index 379210ee7..73fe4757d 100644
--- a/libs/routing/fake_graph.cpp
+++ b/libs/routing/fake_graph.cpp
@@ -16,9 +16,8 @@ void FakeGraph::AddStandaloneVertex(Segment const & newSegment, FakeVertex const
   m_vertexToSegment[newVertex] = newSegment;
 }
 
-void FakeGraph::AddVertex(Segment const & existentSegment, Segment const & newSegment,
-                          FakeVertex const & newVertex, bool isOutgoing, bool isPartOfReal,
-                          Segment const & real)
+void FakeGraph::AddVertex(Segment const & existentSegment, Segment const & newSegment, FakeVertex const & newVertex,
+                          bool isOutgoing, bool isPartOfReal, Segment const & real)
 {
   AddStandaloneVertex(newSegment, newVertex);
   auto const & segmentFrom = isOutgoing ? existentSegment : newSegment;
@@ -34,10 +33,8 @@ void FakeGraph::AddVertex(Segment const & existentSegment, Segment const & newSe
 
 void FakeGraph::AddConnection(Segment const & from, Segment const & to)
 {
-  ASSERT(m_segmentToVertex.find(from) != m_segmentToVertex.end(),
-         ("Segment", from, "does not exist in fake graph."));
-  ASSERT(m_segmentToVertex.find(to) != m_segmentToVertex.end(),
-         ("Segment", to, "does not exist in fake graph."));
+  ASSERT(m_segmentToVertex.find(from) != m_segmentToVertex.end(), ("Segment", from, "does not exist in fake graph."));
+  ASSERT(m_segmentToVertex.find(to) != m_segmentToVertex.end(), ("Segment", to, "does not exist in fake graph."));
   m_outgoing[from].insert(to);
   m_ingoing[to].insert(from);
 }
@@ -47,9 +44,8 @@ void FakeGraph::Append(FakeGraph const & rhs)
   std::map<Segment, FakeVertex> intersection;
   typename std::map<Segment, FakeVertex>::iterator intersectionIt(intersection.begin());
 
-  std::set_intersection(m_segmentToVertex.begin(), m_segmentToVertex.end(),
-                        rhs.m_segmentToVertex.begin(), rhs.m_segmentToVertex.end(),
-                        std::inserter(intersection, intersectionIt),
+  std::set_intersection(m_segmentToVertex.begin(), m_segmentToVertex.end(), rhs.m_segmentToVertex.begin(),
+                        rhs.m_segmentToVertex.end(), std::inserter(intersection, intersectionIt),
                         base::LessBy(&std::pair<Segment, FakeVertex>::first));
 
   size_t countEqual = 0;
@@ -95,7 +91,10 @@ std::set<Segment> const & FakeGraph::GetEdges(Segment const & segment, bool isOu
   return kEmptySet;
 }
 
-size_t FakeGraph::GetSize() const { return m_segmentToVertex.size(); }
+size_t FakeGraph::GetSize() const
+{
+  return m_segmentToVertex.size();
+}
 
 std::set<Segment> const & FakeGraph::GetFake(Segment const & real) const
 {
@@ -126,10 +125,10 @@ bool FakeGraph::FindSegment(FakeVertex const & vertex, Segment & segment) const
   return true;
 }
 
-void FakeGraph::ConnectLoopToGuideSegments(
-    FakeVertex const & loop, Segment const & guidesSegment,
-    LatLonWithAltitude const & guidesSegmentFrom, LatLonWithAltitude const & guidesSegmentTo,
-    std::vector<std::pair<FakeVertex, Segment>> const & partsOfReal)
+void FakeGraph::ConnectLoopToGuideSegments(FakeVertex const & loop, Segment const & guidesSegment,
+                                           LatLonWithAltitude const & guidesSegmentFrom,
+                                           LatLonWithAltitude const & guidesSegmentTo,
+                                           std::vector<std::pair<FakeVertex, Segment>> const & partsOfReal)
 {
   auto itLoop = m_vertexToSegment.find(loop);
   CHECK(itLoop != m_vertexToSegment.end(), (loop));
@@ -149,8 +148,8 @@ void FakeGraph::ConnectLoopToGuideSegments(
 
     Segment const & directedReal = (newVertex.GetPointFrom() == guidesSegmentTo.GetLatLon() ||
                                     newVertex.GetPointTo() == guidesSegmentFrom.GetLatLon())
-                                       ? backwardReal
-                                       : guidesSegment;
+                                     ? backwardReal
+                                     : guidesSegment;
 
     m_realToFake[directedReal].insert(segment);
 
@@ -161,8 +160,7 @@ void FakeGraph::ConnectLoopToGuideSegments(
       m_vertexToSegment[newVertex] = segment;
     }
 
-    CHECK((newVertex.GetPointFrom() == loopPoint || newVertex.GetPointTo() == loopPoint),
-          (newVertex, loopPoint));
+    CHECK((newVertex.GetPointFrom() == loopPoint || newVertex.GetPointTo() == loopPoint), (newVertex, loopPoint));
 
     auto const & to = (newVertex.GetPointTo() == loopPoint) ? loopSegment : segment;
     auto const & from = (newVertex.GetPointFrom() == loopPoint) ? loopSegment : segment;
@@ -172,8 +170,7 @@ void FakeGraph::ConnectLoopToGuideSegments(
   }
 }
 
-void FakeGraph::ConnectLoopToExistentPartsOfReal(FakeVertex const & loop,
-                                                 Segment const & guidesSegment,
+void FakeGraph::ConnectLoopToExistentPartsOfReal(FakeVertex const & loop, Segment const & guidesSegment,
                                                  Segment const & directedGuidesSegment)
 {
   auto const & loopSegment = m_vertexToSegment[loop];
diff --git a/libs/routing/fake_graph.hpp b/libs/routing/fake_graph.hpp
index 6bb3380c9..d57d25503 100644
--- a/libs/routing/fake_graph.hpp
+++ b/libs/routing/fake_graph.hpp
@@ -18,9 +18,8 @@ public:
   // Adds vertex. Connects newSegment to existentSegment. Adds ingoing and
   // outgoing edges, fills segment to vertex mapping. Fills real to fake and fake to real
   // mapping if isPartOfReal is true.
-  void AddVertex(Segment const & existentSegment, Segment const & newSegment,
-                 FakeVertex const & newVertex, bool isOutgoing, bool isPartOfReal,
-                 Segment const & real);
+  void AddVertex(Segment const & existentSegment, Segment const & newSegment, FakeVertex const & newVertex,
+                 bool isOutgoing, bool isPartOfReal, Segment const & real);
   // Adds connection from existent fake segment |from| to existent fake segment |to|
   void AddConnection(Segment const & from, Segment const & to);
   // Merges |rhs| into this.
diff --git a/libs/routing/fake_vertex.hpp b/libs/routing/fake_vertex.hpp
index 72a1f65b7..a51467d4e 100644
--- a/libs/routing/fake_vertex.hpp
+++ b/libs/routing/fake_vertex.hpp
@@ -25,24 +25,23 @@ public:
     PartOfReal,
   };
 
-  FakeVertex(NumMwmId numMwmId, LatLonWithAltitude const & from,
-             LatLonWithAltitude const & to, Type type)
-    : m_numMwmId(numMwmId), m_from(from), m_to(to), m_type(type)
-  {
-  }
+  FakeVertex(NumMwmId numMwmId, LatLonWithAltitude const & from, LatLonWithAltitude const & to, Type type)
+    : m_numMwmId(numMwmId)
+    , m_from(from)
+    , m_to(to)
+    , m_type(type)
+  {}
 
   FakeVertex() = default;
 
   bool operator==(FakeVertex const & rhs) const
   {
-    return std::tie(m_numMwmId, m_from, m_to, m_type) ==
-           std::tie(rhs.m_numMwmId, rhs.m_from, rhs.m_to, rhs.m_type);
+    return std::tie(m_numMwmId, m_from, m_to, m_type) == std::tie(rhs.m_numMwmId, rhs.m_from, rhs.m_to, rhs.m_type);
   }
 
   bool operator<(FakeVertex const & rhs) const
   {
-    return std::tie(m_type, m_from, m_to, m_numMwmId) <
-           std::tie(rhs.m_type, rhs.m_from, rhs.m_to,rhs.m_numMwmId);
+    return std::tie(m_type, m_from, m_to, m_numMwmId) < std::tie(rhs.m_type, rhs.m_from, rhs.m_to, rhs.m_numMwmId);
   }
 
   LatLonWithAltitude const & GetJunctionFrom() const { return m_from; }
@@ -51,8 +50,8 @@ public:
   ms::LatLon const & GetPointTo() const { return m_to.GetLatLon(); }
   Type GetType() const { return m_type; }
 
-  DECLARE_VISITOR(visitor(m_numMwmId, "m_numMwmId"), visitor(m_from, "m_from"),
-                  visitor(m_to, "m_to"), visitor(m_type, "m_type"))
+  DECLARE_VISITOR(visitor(m_numMwmId, "m_numMwmId"), visitor(m_from, "m_from"), visitor(m_to, "m_to"),
+                  visitor(m_type, "m_type"))
   DECLARE_DEBUG_PRINT(FakeVertex)
 
 private:
diff --git a/libs/routing/features_road_graph.cpp b/libs/routing/features_road_graph.cpp
index e2881d599..13c894983 100644
--- a/libs/routing/features_road_graph.cpp
+++ b/libs/routing/features_road_graph.cpp
@@ -16,23 +16,26 @@ using namespace std;
 
 namespace
 {
-uint32_t constexpr kPowOfTwoForFeatureCacheSize = 10; // cache contains 2 ^ kPowOfTwoForFeatureCacheSize elements
+uint32_t constexpr kPowOfTwoForFeatureCacheSize = 10;  // cache contains 2 ^ kPowOfTwoForFeatureCacheSize elements
 
 double constexpr kMwmRoadCrossingRadiusMeters = 2.0;
 
 auto constexpr kInvalidSpeedKMPH = numeric_limits<double>::max();
 }  // namespace
 
-double GetRoadCrossingRadiusMeters() { return kMwmRoadCrossingRadiusMeters; }
+double GetRoadCrossingRadiusMeters()
+{
+  return kMwmRoadCrossingRadiusMeters;
+}
 
 FeaturesRoadGraphBase::CrossCountryVehicleModel::CrossCountryVehicleModel(VehicleModelFactoryPtrT modelFactory)
   : m_modelFactory(modelFactory)
   , m_maxSpeed(m_modelFactory->GetVehicleModel()->GetMaxWeightSpeed())
   , m_offroadSpeedKMpH(m_modelFactory->GetVehicleModel()->GetOffroadSpeed())
-{
-}
+{}
 
-SpeedKMpH FeaturesRoadGraphBase::CrossCountryVehicleModel::GetSpeed(FeatureType & f, SpeedParams const & speedParams) const
+SpeedKMpH FeaturesRoadGraphBase::CrossCountryVehicleModel::GetSpeed(FeatureType & f,
+                                                                    SpeedParams const & speedParams) const
 {
   return GetVehicleModel(f.GetID())->GetSpeed(FeatureTypes(f), speedParams);
 }
@@ -62,7 +65,8 @@ bool FeaturesRoadGraphBase::CrossCountryVehicleModel::IsPassThroughAllowed(Featu
   return GetVehicleModel(f.GetID())->IsPassThroughAllowed(FeatureTypes(f));
 }
 
-VehicleModelInterface * FeaturesRoadGraphBase::CrossCountryVehicleModel::GetVehicleModel(FeatureID const & featureId) const
+VehicleModelInterface * FeaturesRoadGraphBase::CrossCountryVehicleModel::GetVehicleModel(
+    FeatureID const & featureId) const
 {
   auto itr = m_cache.find(featureId.m_mwmId);
   if (itr != m_cache.end())
@@ -99,15 +103,17 @@ void FeaturesRoadGraph::RoadInfoCache::Clear()
 
 FeaturesRoadGraphBase::FeaturesRoadGraphBase(MwmDataSource & dataSource, IRoadGraph::Mode mode,
                                              shared_ptr<VehicleModelFactoryInterface> vehicleModelFactory)
-  : m_dataSource(dataSource), m_mode(mode), m_vehicleModel(vehicleModelFactory)
-{
-}
+  : m_dataSource(dataSource)
+  , m_mode(mode)
+  , m_vehicleModel(vehicleModelFactory)
+{}
 
 class CrossFeaturesLoader
 {
 public:
   CrossFeaturesLoader(FeaturesRoadGraphBase const & graph, IRoadGraph::ICrossEdgesLoader & edgesLoader)
-    : m_graph(graph), m_edgesLoader(edgesLoader)
+    : m_graph(graph)
+    , m_edgesLoader(edgesLoader)
   {}
 
   void operator()(FeatureType & ft)
@@ -128,8 +134,8 @@ private:
   IRoadGraph::ICrossEdgesLoader & m_edgesLoader;
 };
 
-void FeaturesRoadGraphBase::ForEachFeatureClosestToCross(
-      m2::PointD const & cross, ICrossEdgesLoader & edgesLoader) const
+void FeaturesRoadGraphBase::ForEachFeatureClosestToCross(m2::PointD const & cross,
+                                                         ICrossEdgesLoader & edgesLoader) const
 {
   CrossFeaturesLoader featuresLoader(*this, edgesLoader);
   m2::RectD const rect = mercator::RectByCenterXYAndSizeInMeters(cross, kMwmRoadCrossingRadiusMeters);
@@ -155,8 +161,8 @@ void FeaturesRoadGraphBase::FindClosestEdges(m2::RectD const & rect, uint32_t co
   finder.MakeResult(vicinities, count);
 }
 
-vector<IRoadGraph::FullRoadInfo>
-FeaturesRoadGraphBase::FindRoads(m2::RectD const & rect, IsGoodFeatureFn const & isGoodFeature) const
+vector<IRoadGraph::FullRoadInfo> FeaturesRoadGraphBase::FindRoads(m2::RectD const & rect,
+                                                                  IsGoodFeatureFn const & isGoodFeature) const
 {
   vector<IRoadGraph::FullRoadInfo> roads;
 
@@ -235,8 +241,8 @@ double FeaturesRoadGraphBase::GetSpeedKMpHFromFt(FeatureType & ft, SpeedParams c
   return m_vehicleModel.GetSpeed(ft, speedParams).m_weight;
 }
 
-void FeaturesRoadGraphBase::ExtractRoadInfo(FeatureID const & featureId, FeatureType & ft,
-                                            double speedKMpH, RoadInfo & ri) const
+void FeaturesRoadGraphBase::ExtractRoadInfo(FeatureID const & featureId, FeatureType & ft, double speedKMpH,
+                                            RoadInfo & ri) const
 {
   ri.m_speedKMPH = speedKMpH;
   ri.m_bidirectional = !IsOneWay(ft);
@@ -262,8 +268,8 @@ void FeaturesRoadGraphBase::ExtractRoadInfo(FeatureID const & featureId, Feature
   }
 }
 
-IRoadGraph::RoadInfo const & FeaturesRoadGraphBase::GetCachedRoadInfo(
-      FeatureID const & featureId, SpeedParams const & speedParams) const
+IRoadGraph::RoadInfo const & FeaturesRoadGraphBase::GetCachedRoadInfo(FeatureID const & featureId,
+                                                                      SpeedParams const & speedParams) const
 {
   bool found = false;
   RoadInfo & ri = m_cache.Find(featureId, found);
@@ -281,8 +287,8 @@ IRoadGraph::RoadInfo const & FeaturesRoadGraphBase::GetCachedRoadInfo(
   return ri;
 }
 
-IRoadGraph::RoadInfo const & FeaturesRoadGraphBase::GetCachedRoadInfo(
-      FeatureID const & featureId, FeatureType & ft, double speedKMPH) const
+IRoadGraph::RoadInfo const & FeaturesRoadGraphBase::GetCachedRoadInfo(FeatureID const & featureId, FeatureType & ft,
+                                                                      double speedKMPH) const
 {
   bool found = false;
   RoadInfo & ri = m_cache.Find(featureId, found);
diff --git a/libs/routing/features_road_graph.hpp b/libs/routing/features_road_graph.hpp
index bf1409212..712236bad 100644
--- a/libs/routing/features_road_graph.hpp
+++ b/libs/routing/features_road_graph.hpp
@@ -83,15 +83,13 @@ public:
 
   /// @name IRoadGraph overrides
   /// @{
-  void ForEachFeatureClosestToCross(m2::PointD const & cross,
-                                    ICrossEdgesLoader & edgesLoader) const override;
+  void ForEachFeatureClosestToCross(m2::PointD const & cross, ICrossEdgesLoader & edgesLoader) const override;
   void FindClosestEdges(m2::RectD const & rect, uint32_t count,
                         std::vector<std::pair<Edge, geometry::PointWithAltitude>> & vicinities) const override;
-  std::vector<IRoadGraph::FullRoadInfo> FindRoads(
-        m2::RectD const & rect, IsGoodFeatureFn const & isGoodFeature) const override;
+  std::vector<IRoadGraph::FullRoadInfo> FindRoads(m2::RectD const & rect,
+                                                  IsGoodFeatureFn const & isGoodFeature) const override;
   void GetFeatureTypes(FeatureID const & featureId, feature::TypesHolder & types) const override;
-  void GetJunctionTypes(geometry::PointWithAltitude const & junction,
-                        feature::TypesHolder & types) const override;
+  void GetJunctionTypes(geometry::PointWithAltitude const & junction, feature::TypesHolder & types) const override;
   IRoadGraph::Mode GetMode() const override;
   void ClearState() override;
   /// @}
@@ -134,8 +132,7 @@ class FeaturesRoadGraph : public FeaturesRoadGraphBase
 public:
   FeaturesRoadGraph(MwmDataSource & dataSource, IRoadGraph::Mode mode, VehicleModelFactoryPtrT modelFactory)
     : FeaturesRoadGraphBase(dataSource, mode, modelFactory)
-  {
-  }
+  {}
 
 protected:
   feature::AltitudeLoaderCached * GetAltitudesLoader(MwmSet::MwmId const & mwmId) const override;
diff --git a/libs/routing/following_info.hpp b/libs/routing/following_info.hpp
index f65dc64bb..56db759f6 100644
--- a/libs/routing/following_info.hpp
+++ b/libs/routing/following_info.hpp
@@ -24,25 +24,22 @@ public:
     , m_time(0)
     , m_completionPercent(0)
     , m_pedestrianTurn(turns::PedestrianDirection::None)
-  {
-  }
+  {}
 
   // SingleLaneInfoClient is used for passing information about a lane to client platforms such as
   // Android, iOS and so on.
   struct SingleLaneInfoClient
   {
     std::vector<int8_t> m_lane;  // Possible directions for the lane.
-    bool m_isRecommended;   // m_isRecommended is true if the lane is recommended for a user.
+    bool m_isRecommended;        // m_isRecommended is true if the lane is recommended for a user.
 
     explicit SingleLaneInfoClient(turns::SingleLaneInfo const & singleLaneInfo)
-        : m_isRecommended(singleLaneInfo.m_isRecommended)
+      : m_isRecommended(singleLaneInfo.m_isRecommended)
     {
       turns::TSingleLane const & lane = singleLaneInfo.m_lane;
       m_lane.resize(lane.size());
-      std::transform(lane.cbegin(), lane.cend(), m_lane.begin(), [](turns::LaneWay l)
-      {
-        return static_cast<int8_t>(l);
-      });
+      std::transform(lane.cbegin(), lane.cend(), m_lane.begin(),
+                     [](turns::LaneWay l) { return static_cast<int8_t>(l); });
     }
   };
 
diff --git a/libs/routing/geometry.cpp b/libs/routing/geometry.cpp
index 495f1bef8..03d23b989 100644
--- a/libs/routing/geometry.cpp
+++ b/libs/routing/geometry.cpp
@@ -94,7 +94,7 @@ public:
   SpeedInUnits GetSavedMaxspeed(uint32_t featureId, bool forward) override
   {
     auto const speed = m_attrsGetter.m_maxSpeeds.GetMaxspeed(featureId);
-    return { speed.GetSpeedInUnits(forward), speed.GetUnits() };
+    return {speed.GetSpeedInUnits(forward), speed.GetUnits()};
   }
 
 private:
@@ -132,13 +132,16 @@ private:
   RoadAttrsGetter m_attrsGetter;
   VehicleModelPtrT m_vehicleModel;
 };
-} // namespace
-
+}  // namespace
 
 // RoadGeometry ------------------------------------------------------------------------------------
 RoadGeometry::RoadGeometry(bool oneWay, double weightSpeedKMpH, double etaSpeedKMpH, Points const & points)
-  : m_forwardSpeed{weightSpeedKMpH, etaSpeedKMpH}, m_backwardSpeed(m_forwardSpeed)
-  , m_isOneWay(oneWay), m_valid(true), m_isPassThroughAllowed(false), m_inCity(false)
+  : m_forwardSpeed{weightSpeedKMpH, etaSpeedKMpH}
+  , m_backwardSpeed(m_forwardSpeed)
+  , m_isOneWay(oneWay)
+  , m_valid(true)
+  , m_isPassThroughAllowed(false)
+  , m_inCity(false)
 {
   ASSERT_GREATER(weightSpeedKMpH, 0.0, ());
   ASSERT_GREATER(etaSpeedKMpH, 0.0, ());
@@ -180,10 +183,8 @@ void RoadGeometry::Load(VehicleModelInterface const & vehicleModel, FeatureType
 
   auto const & optionsClassfier = RoutingOptionsClassifier::Instance();
   for (uint32_t type : types)
-  {
     if (auto const it = optionsClassfier.Get(type))
       m_routingOptions.Add(*it);
-  }
 
   m_junctions.clear();
   m_junctions.reserve(count);
@@ -199,13 +200,13 @@ void RoadGeometry::Load(VehicleModelInterface const & vehicleModel, FeatureType
       // Since we store integer altitudes, 1 is a possible error for 2 points.
       geometry::Altitude constexpr kError = 1;
 
-      auto const altDiff = (*altitudes)[i] - (*altitudes)[i-1];
+      auto const altDiff = (*altitudes)[i] - (*altitudes)[i - 1];
       auto const absDiff = abs(altDiff) - kError;
       if (absDiff > 0)
       {
-        double const dist = ms::DistanceOnEarth(m_junctions[i-1].GetLatLon(), m_junctions[i].GetLatLon());
+        double const dist = ms::DistanceOnEarth(m_junctions[i - 1].GetLatLon(), m_junctions[i].GetLatLon());
         if (absDiff / dist >= 1.0)
-          LOG(LWARNING, ("Altitudes jump:", altDiff, "/", dist, m_junctions[i-1], m_junctions[i]));
+          LOG(LWARNING, ("Altitudes jump:", altDiff, "/", dist, m_junctions[i - 1], m_junctions[i]));
       }
     }
 #endif
@@ -237,9 +238,7 @@ void RoadGeometry::Load(VehicleModelInterface const & vehicleModel, FeatureType
   }
 
   if (m_valid)
-  {
     ASSERT(m_forwardSpeed.IsValid() && m_backwardSpeed.IsValid(), (feature.DebugString()));
-  }
 }
 
 double RoadGeometry::GetDistance(uint32_t idx) const
@@ -260,24 +259,19 @@ double RoadGeometry::GetRoadLengthM() const
   double lenM = 0.0;
 
   if (count > 0)
-  {
     for (uint32_t i = 0; i < count - 1; ++i)
       lenM += GetDistance(i);
-  }
 
   return lenM;
 }
 
 // Geometry ----------------------------------------------------------------------------------------
-Geometry::Geometry(unique_ptr<GeometryLoader> loader, size_t roadsCacheSize)
-  : m_loader(std::move(loader))
+Geometry::Geometry(unique_ptr<GeometryLoader> loader, size_t roadsCacheSize) : m_loader(std::move(loader))
 {
   CHECK(m_loader, ());
 
-  m_featureIdToRoad = make_unique<RoutingCacheT>(roadsCacheSize, [this](uint32_t featureId, RoadGeometry & road)
-  {
-    m_loader->Load(featureId, road);
-  });
+  m_featureIdToRoad = make_unique<RoutingCacheT>(
+      roadsCacheSize, [this](uint32_t featureId, RoadGeometry & road) { m_loader->Load(featureId, road); });
 }
 
 RoadGeometry const & Geometry::GetRoad(uint32_t featureId)
@@ -295,8 +289,7 @@ SpeedInUnits GeometryLoader::GetSavedMaxspeed(uint32_t featureId, bool forward)
 
 // static
 unique_ptr<GeometryLoader> GeometryLoader::Create(MwmSet::MwmHandle const & handle,
-                                                  VehicleModelPtrT const & vehicleModel,
-                                                  bool loadAltitudes)
+                                                  VehicleModelPtrT const & vehicleModel, bool loadAltitudes)
 {
   CHECK(handle.IsAlive(), ());
   CHECK(vehicleModel, ());
@@ -304,8 +297,8 @@ unique_ptr<GeometryLoader> GeometryLoader::Create(MwmSet::MwmHandle const & hand
 }
 
 // static
-unique_ptr<GeometryLoader> GeometryLoader::CreateFromFile(
-    string const & fileName, VehicleModelPtrT const & vehicleModel)
+unique_ptr<GeometryLoader> GeometryLoader::CreateFromFile(string const & fileName,
+                                                          VehicleModelPtrT const & vehicleModel)
 {
   CHECK(vehicleModel, ());
   return make_unique<FileGeometryLoader>(fileName, vehicleModel);
diff --git a/libs/routing/geometry.hpp b/libs/routing/geometry.hpp
index 2f9bba1c1..2011bc344 100644
--- a/libs/routing/geometry.hpp
+++ b/libs/routing/geometry.hpp
@@ -38,8 +38,8 @@ public:
   RoadGeometry(bool oneWay, double weightSpeedKMpH, double etaSpeedKMpH, Points const & points);
 
   /// @param[in] altitudes May be nullptr.
-  void Load(VehicleModelInterface const & vehicleModel, FeatureType & feature,
-            geometry::Altitudes const * altitudes, RoadAttrsGetter & attrs);
+  void Load(VehicleModelInterface const & vehicleModel, FeatureType & feature, geometry::Altitudes const * altitudes,
+            RoadAttrsGetter & attrs);
 
   SpeedKMpH const & GetSpeed(bool forward) const;
   std::optional<HighwayType> GetHighwayType() const { return m_highwayType; }
@@ -72,10 +72,7 @@ public:
     return pointId == 0 || pointId + 1 == GetPointsCount();
   }
 
-  void SetPassThroughAllowedForTests(bool passThroughAllowed)
-  {
-    m_isPassThroughAllowed = passThroughAllowed;
-  }
+  void SetPassThroughAllowedForTests(bool passThroughAllowed) { m_isPassThroughAllowed = passThroughAllowed; }
 
   bool SuitableForOptions(RoutingOptions avoidRoutingOptions) const
   {
@@ -86,7 +83,7 @@ public:
 
 private:
   std::vector<LatLonWithAltitude> m_junctions;
-  mutable std::vector<double> m_distances;    ///< as cache, @see GetDistance()
+  mutable std::vector<double> m_distances;  ///< as cache, @see GetDistance()
 
   SpeedKMpH m_forwardSpeed;
   SpeedKMpH m_backwardSpeed;
@@ -111,14 +108,13 @@ public:
   using VehicleModelPtrT = std::shared_ptr<VehicleModelInterface>;
 
   /// @param[in] handle should be alive, its caller responsibility to check it.
-  static std::unique_ptr<GeometryLoader> Create(MwmSet::MwmHandle const & handle,
-                                                VehicleModelPtrT const & vehicleModel,
+  static std::unique_ptr<GeometryLoader> Create(MwmSet::MwmHandle const & handle, VehicleModelPtrT const & vehicleModel,
                                                 bool loadAltitudes);
 
   /// This is for stand-alone work.
   /// Use in generator_tool and unit tests.
-  static std::unique_ptr<GeometryLoader> CreateFromFile(
-      std::string const & filePath, VehicleModelPtrT const & vehicleModel);
+  static std::unique_ptr<GeometryLoader> CreateFromFile(std::string const & filePath,
+                                                        VehicleModelPtrT const & vehicleModel);
 };
 
 /// \brief This class supports loading geometry of roads for routing.
@@ -143,10 +139,7 @@ public:
 
   /// \note The reference returned by the method is valid until the next call of GetRoad()
   /// of GetPoint() methods.
-  ms::LatLon const & GetPoint(RoadPoint const & rp)
-  {
-    return GetRoad(rp.GetFeatureId()).GetPoint(rp.GetPointId());
-  }
+  ms::LatLon const & GetPoint(RoadPoint const & rp) { return GetRoad(rp.GetFeatureId()).GetPoint(rp.GetPointId()); }
 
   SpeedInUnits GetSavedMaxspeed(uint32_t featureId, bool forward)
   {
diff --git a/libs/routing/guides_connections.cpp b/libs/routing/guides_connections.cpp
index db1a5d802..cc37b377c 100644
--- a/libs/routing/guides_connections.cpp
+++ b/libs/routing/guides_connections.cpp
@@ -19,8 +19,7 @@ double constexpr kEqDistToTrackPointM = 20.0;
 double constexpr kMaxDistToTrackForSkippingM = 100'000.0;
 }  // namespace
 
-CheckpointTrackProj::CheckpointTrackProj(kml::MarkGroupId guideId, size_t trackIdx,
-                                         size_t trackPointIdx,
+CheckpointTrackProj::CheckpointTrackProj(kml::MarkGroupId guideId, size_t trackIdx, size_t trackPointIdx,
                                          geometry::PointWithAltitude const & projectedPoint,
                                          double distToProjectedPointM)
   : m_guideId(guideId)
@@ -28,21 +27,22 @@ CheckpointTrackProj::CheckpointTrackProj(kml::MarkGroupId guideId, size_t trackI
   , m_trackPointIdx(trackPointIdx)
   , m_projectedPoint(projectedPoint)
   , m_distToProjectedPointM(distToProjectedPointM)
-{
-}
+{}
 
 std::pair<geometry::PointWithAltitude, double> GetProjectionAndDistOnSegment(
     m2::PointD const & point, geometry::PointWithAltitude const & startPath,
     geometry::PointWithAltitude const & endPath)
 {
   m2::PointD const projection =
-      m2::ParametrizedSegment<m2::PointD>(startPath.GetPoint(), endPath.GetPoint())
-          .ClosestPointTo(point);
+      m2::ParametrizedSegment<m2::PointD>(startPath.GetPoint(), endPath.GetPoint()).ClosestPointTo(point);
   double const distM = mercator::DistanceOnEarth(projection, point);
   return std::make_pair(geometry::PointWithAltitude(projection, 0 /* altitude */), distM);
 }
 
-bool GuidesConnections::IsActive() const { return !m_allTracks.empty(); }
+bool GuidesConnections::IsActive() const
+{
+  return !m_allTracks.empty();
+}
 
 std::vector<ConnectionToOsm> GuidesConnections::GetOsmConnections(size_t checkpointIdx) const
 {
@@ -52,17 +52,14 @@ std::vector<ConnectionToOsm> GuidesConnections::GetOsmConnections(size_t checkpo
   return it->second;
 }
 
-void GuidesConnections::UpdateOsmConnections(size_t checkpointIdx,
-                                             std::vector<ConnectionToOsm> const & links)
+void GuidesConnections::UpdateOsmConnections(size_t checkpointIdx, std::vector<ConnectionToOsm> const & links)
 {
   auto const it = m_connectionsToOsm.find(checkpointIdx);
   CHECK(it != m_connectionsToOsm.cend(), (checkpointIdx));
   it->second.clear();
   for (auto const & link : links)
-  {
     if (!link.m_fakeEnding.m_projections.empty())
       it->second.push_back(link);
-  }
   if (it->second.empty())
     m_connectionsToOsm.erase(it);
 }
@@ -80,9 +77,8 @@ void GuidesConnections::PullCheckpointsToTracks(std::vector<m2::PointD> const &
         CHECK(!tracks[trackIdx].empty(), (trackIdx));
         for (size_t pointIdx = 0; pointIdx < tracks[trackIdx].size() - 1; ++pointIdx)
         {
-          auto const [checkpointProj, distM] =
-              GetProjectionAndDistOnSegment(checkpoints[checkpointIdx], tracks[trackIdx][pointIdx],
-                                            tracks[trackIdx][pointIdx + 1]);
+          auto const [checkpointProj, distM] = GetProjectionAndDistOnSegment(
+              checkpoints[checkpointIdx], tracks[trackIdx][pointIdx], tracks[trackIdx][pointIdx + 1]);
 
           // Skip too far track.
           if (distM > kMaxDistToTrackForSkippingM)
@@ -103,8 +99,7 @@ void GuidesConnections::PullCheckpointsToTracks(std::vector<m2::PointD> const &
   }
 }
 
-void GuidesConnections::AddTerminalGuidePoint(size_t checkpointIdx, size_t neighbourIdx,
-                                              m2::PointD const & curPoint)
+void GuidesConnections::AddTerminalGuidePoint(size_t checkpointIdx, size_t neighbourIdx, m2::PointD const & curPoint)
 {
   auto const it = m_checkpointsOnTracks.find(neighbourIdx);
   CHECK(it != m_checkpointsOnTracks.cend(), (neighbourIdx));
@@ -114,25 +109,23 @@ void GuidesConnections::AddTerminalGuidePoint(size_t checkpointIdx, size_t neigh
   auto const trackIdx = neighbour.m_trackIdx;
   auto const & track = m_allTracks[guideId][trackIdx];
 
-  CHECK_GREATER(
-      track.size(), 1,
-      ("checkpointIdx:", checkpointIdx, "neighbourIdx:", neighbourIdx, "trackIdx:", trackIdx));
+  CHECK_GREATER(track.size(), 1,
+                ("checkpointIdx:", checkpointIdx, "neighbourIdx:", neighbourIdx, "trackIdx:", trackIdx));
 
   // Connect start checkpoint to the starting point of the track.
   if (checkpointIdx == 0)
   {
     double const distToStartM = mercator::DistanceOnEarth(curPoint, track.front().GetPoint());
-    m_checkpointsOnTracks[checkpointIdx] = CheckpointTrackProj(
-        guideId, trackIdx, 0 /* trackPointIdx */, track.front() /* proj */, distToStartM);
+    m_checkpointsOnTracks[checkpointIdx] =
+        CheckpointTrackProj(guideId, trackIdx, 0 /* trackPointIdx */, track.front() /* proj */, distToStartM);
 
     return;
   }
 
   // Connect finish checkpoint to the finish point of the track.
   double const distToSFinishM = mercator::DistanceOnEarth(curPoint, track.back().GetPoint());
-  m_checkpointsOnTracks[checkpointIdx] =
-      CheckpointTrackProj(guideId, trackIdx, track.size() - 2 /* trackPointIdx */,
-                          track.back() /* proj */, distToSFinishM);
+  m_checkpointsOnTracks[checkpointIdx] = CheckpointTrackProj(guideId, trackIdx, track.size() - 2 /* trackPointIdx */,
+                                                             track.back() /* proj */, distToSFinishM);
 }
 
 bool GuidesConnections::IsCheckpointAttached(size_t checkpointIdx) const
@@ -153,8 +146,7 @@ std::vector<size_t> GetNeighbourIntermediatePoints(size_t checkpointIdx, size_t
   return neighbours;
 }
 
-bool GuidesConnections::FitsForDirectLinkToGuide(size_t checkpointIdx,
-                                                 size_t checkpointsCount) const
+bool GuidesConnections::FitsForDirectLinkToGuide(size_t checkpointIdx, size_t checkpointsCount) const
 {
   auto it = m_checkpointsOnTracks.find(checkpointIdx);
   CHECK(it != m_checkpointsOnTracks.end(), (checkpointIdx));
@@ -168,16 +160,13 @@ bool GuidesConnections::FitsForDirectLinkToGuide(size_t checkpointIdx,
     return true;
 
   for (auto const neighbourIdx : GetNeighbourIntermediatePoints(checkpointIdx, checkpointsCount))
-  {
     if (m_checkpointsOnTracks.find(neighbourIdx) == m_checkpointsOnTracks.end())
       return false;
-  }
 
   return true;
 }
 
-void GuidesConnections::PullAdditionalCheckpointsToTracks(
-    std::vector<m2::PointD> const & checkpoints)
+void GuidesConnections::PullAdditionalCheckpointsToTracks(std::vector<m2::PointD> const & checkpoints)
 {
   for (size_t i : {size_t(0), checkpoints.size() - 1})
   {
@@ -195,7 +184,10 @@ void GuidesConnections::PullAdditionalCheckpointsToTracks(
   }
 }
 
-bool GuidesConnections::IsAttached() const { return !m_checkpointsFakeEndings.empty(); }
+bool GuidesConnections::IsAttached() const
+{
+  return !m_checkpointsFakeEndings.empty();
+}
 
 FakeEnding GuidesConnections::GetFakeEnding(size_t checkpointIdx) const
 {
@@ -208,7 +200,10 @@ FakeEnding GuidesConnections::GetFakeEnding(size_t checkpointIdx) const
   return FakeEnding();
 }
 
-GuidesGraph const & GuidesConnections::GetGuidesGraph() const { return m_graph; }
+GuidesGraph const & GuidesConnections::GetGuidesGraph() const
+{
+  return m_graph;
+}
 
 void GuidesConnections::OverwriteFakeEnding(size_t checkpointIdx, FakeEnding const & newFakeEnding)
 {
@@ -216,19 +211,19 @@ void GuidesConnections::OverwriteFakeEnding(size_t checkpointIdx, FakeEnding con
 }
 
 // static
-void GuidesConnections::ExtendFakeEndingProjections(FakeEnding const & srcFakeEnding,
-                                                    FakeEnding & dstFakeEnding)
+void GuidesConnections::ExtendFakeEndingProjections(FakeEnding const & srcFakeEnding, FakeEnding & dstFakeEnding)
 {
   dstFakeEnding.m_originJunction = srcFakeEnding.m_originJunction;
 
   for (auto const & proj : srcFakeEnding.m_projections)
-  {
     if (!base::IsExist(dstFakeEnding.m_projections, proj))
       dstFakeEnding.m_projections.push_back(proj);
-  }
 }
 
-NumMwmId GuidesConnections::GetMwmId() const { return m_graph.GetMwmId(); }
+NumMwmId GuidesConnections::GetMwmId() const
+{
+  return m_graph.GetMwmId();
+}
 
 void GuidesConnections::SetGuidesGraphParams(NumMwmId mwmId, double maxSpeed)
 {
@@ -254,11 +249,9 @@ void GuidesConnections::ConnectToGuidesGraph(std::vector<m2::PointD> const & che
     if (insertedSegment)
     {
       CHECK(!m_allTracks[proj.m_guideId][proj.m_trackIdx].empty(),
-            ("checkpointIdx:", checkpointIdx, "guideId:", proj.m_guideId,
-             "trackIdx:", proj.m_trackIdx));
+            ("checkpointIdx:", checkpointIdx, "guideId:", proj.m_guideId, "trackIdx:", proj.m_trackIdx));
 
-      segmentOnTrack =
-          m_graph.AddTrack(m_allTracks[proj.m_guideId][proj.m_trackIdx], proj.m_trackPointIdx);
+      segmentOnTrack = m_graph.AddTrack(m_allTracks[proj.m_guideId][proj.m_trackIdx], proj.m_trackPointIdx);
       it->second = segmentOnTrack;
     }
     else
@@ -279,8 +272,7 @@ void GuidesConnections::ConnectToGuidesGraph(std::vector<m2::PointD> const & che
     if (!(fitsForOsmLink && firstPointOnTrack == checkpointProj))
     {
       auto const & firstSegmentOnTrack = m_graph.FindSegment(segmentOnTrack, 0);
-      AddConnectionToOsm(checkpointIdx, firstSegmentOnTrack, firstPointOnTrack,
-                         false /* fromCheckpoint */);
+      AddConnectionToOsm(checkpointIdx, firstSegmentOnTrack, firstPointOnTrack, false /* fromCheckpoint */);
     }
 
     auto const & lastPointIdx = m_allTracks[proj.m_guideId][proj.m_trackIdx].size() - 1;
@@ -288,15 +280,13 @@ void GuidesConnections::ConnectToGuidesGraph(std::vector<m2::PointD> const & che
     if (!(fitsForOsmLink && lastPointOnTrack == checkpointProj))
     {
       auto const & lastSegmentOnTrack = m_graph.FindSegment(segmentOnTrack, lastPointIdx - 1);
-      AddConnectionToOsm(checkpointIdx, lastSegmentOnTrack, lastPointOnTrack,
-                         false /* fromCheckpoint */);
+      AddConnectionToOsm(checkpointIdx, lastSegmentOnTrack, lastPointOnTrack, false /* fromCheckpoint */);
     }
   }
 }
 
 void GuidesConnections::AddConnectionToOsm(size_t checkpointIdx, Segment const & real,
-                                           geometry::PointWithAltitude const & loop,
-                                           bool fromCheckpoint)
+                                           geometry::PointWithAltitude const & loop, bool fromCheckpoint)
 {
   LatLonWithAltitude const loopPoint(mercator::ToLatLon(loop.GetPoint()), loop.GetAltitude());
 
diff --git a/libs/routing/guides_connections.hpp b/libs/routing/guides_connections.hpp
index f5598a86c..ef07da81b 100644
--- a/libs/routing/guides_connections.hpp
+++ b/libs/routing/guides_connections.hpp
@@ -43,8 +43,7 @@ struct CheckpointTrackProj
 {
   CheckpointTrackProj() = default;
   CheckpointTrackProj(kml::MarkGroupId guideId, size_t trackIdx, size_t trackPointIdx,
-                      geometry::PointWithAltitude const & projectedPoint,
-                      double distToProjectedPointM);
+                      geometry::PointWithAltitude const & projectedPoint, double distToProjectedPointM);
   // Guide id.
   kml::MarkGroupId m_guideId = 0;
   // Index of the track belonging to |m_guideId|.
@@ -80,8 +79,7 @@ public:
   void OverwriteFakeEnding(size_t checkpointIdx, FakeEnding const & newFakeEnding);
 
   // Merge existing |srcFakeEnding| with |dstFakeEnding|.
-  static void ExtendFakeEndingProjections(FakeEnding const & srcFakeEnding,
-                                          FakeEnding & dstFakeEnding);
+  static void ExtendFakeEndingProjections(FakeEnding const & srcFakeEnding, FakeEnding & dstFakeEnding);
 
   // Returns guides graph |m_graph| for index graph starter.
   GuidesGraph const & GetGuidesGraph() const;
@@ -109,16 +107,15 @@ public:
 
 private:
   // Fills |ConnectionToOsm| for checkpoints for its further attachment to the roads graph.
-  void AddConnectionToOsm(size_t checkpointIdx, Segment const & real,
-                          geometry::PointWithAltitude const & loop, bool fromCheckpoint);
+  void AddConnectionToOsm(size_t checkpointIdx, Segment const & real, geometry::PointWithAltitude const & loop,
+                          bool fromCheckpoint);
 
   // Attaches checkpoints to the nearest guides tracks if possible.
   void PullCheckpointsToTracks(std::vector<m2::PointD> const & checkpoints);
 
   // Attaches terminal point on the track to the terminal checkpoint: start to start;
   // finish - to finish.
-  void AddTerminalGuidePoint(size_t checkpointIdx, size_t neighbourIdx,
-                             m2::PointD const & curPoint);
+  void AddTerminalGuidePoint(size_t checkpointIdx, size_t neighbourIdx, m2::PointD const & curPoint);
 
   // Attaches neighbour terminal checkpoints for those which are already attached.
   void PullAdditionalCheckpointsToTracks(std::vector<m2::PointD> const & checkpoints);
diff --git a/libs/routing/guides_graph.cpp b/libs/routing/guides_graph.cpp
index 046d79edd..9f322e2b9 100644
--- a/libs/routing/guides_graph.cpp
+++ b/libs/routing/guides_graph.cpp
@@ -32,16 +32,14 @@ GuidesGraph::GuidesGraph(double maxSpeedMpS, NumMwmId mwmId)
   CHECK_NOT_EQUAL(m_maxSpeedMpS, 0.0, ());
 }
 
-double GuidesGraph::CalcSegmentTimeS(LatLonWithAltitude const & point1,
-                                     LatLonWithAltitude const & point2) const
+double GuidesGraph::CalcSegmentTimeS(LatLonWithAltitude const & point1, LatLonWithAltitude const & point2) const
 {
   double const distM = ms::DistanceOnEarth(point1.GetLatLon(), point2.GetLatLon());
   double const weight = distM / m_maxSpeedMpS;
   return weight;
 }
 
-void GuidesGraph::GetEdgeList(Segment const & segment, bool isOutgoing,
-                              EdgeListT & edges,
+void GuidesGraph::GetEdgeList(Segment const & segment, bool isOutgoing, EdgeListT & edges,
                               RouteWeight const & prevWeight) const
 {
   auto const it = m_segments.find(segment);
@@ -52,8 +50,8 @@ void GuidesGraph::GetEdgeList(Segment const & segment, bool isOutgoing,
 
   if (segment.IsForward() == isOutgoing)
   {
-    Segment nextSegment(segmentOnTrack.GetMwmId(), segmentOnTrack.GetFeatureId(),
-                        segmentOnTrack.GetSegmentIdx() + 1, segmentOnTrack.IsForward());
+    Segment nextSegment(segmentOnTrack.GetMwmId(), segmentOnTrack.GetFeatureId(), segmentOnTrack.GetSegmentIdx() + 1,
+                        segmentOnTrack.IsForward());
     itOnTrack = m_segments.find(nextSegment);
     if (itOnTrack == m_segments.end())
       return;
@@ -63,14 +61,14 @@ void GuidesGraph::GetEdgeList(Segment const & segment, bool isOutgoing,
     if (it->first.GetSegmentIdx() == 0)
       return;
 
-    Segment prevSegment(segmentOnTrack.GetMwmId(), segmentOnTrack.GetFeatureId(),
-                        segmentOnTrack.GetSegmentIdx() - 1, segmentOnTrack.IsForward());
+    Segment prevSegment(segmentOnTrack.GetMwmId(), segmentOnTrack.GetFeatureId(), segmentOnTrack.GetSegmentIdx() - 1,
+                        segmentOnTrack.IsForward());
     itOnTrack = m_segments.find(prevSegment);
     CHECK(itOnTrack != m_segments.end(), (segment));
   }
   auto const & neighbour = itOnTrack->first;
-  Segment const resSegment(neighbour.GetMwmId(), neighbour.GetFeatureId(),
-                           neighbour.GetSegmentIdx(), segment.IsForward());
+  Segment const resSegment(neighbour.GetMwmId(), neighbour.GetFeatureId(), neighbour.GetSegmentIdx(),
+                           segment.IsForward());
 
   auto const weight = isOutgoing ? RouteWeight(itOnTrack->second.m_weight) : prevWeight;
   edges.emplace_back(resSegment, weight);
@@ -83,10 +81,12 @@ LatLonWithAltitude const & GuidesGraph::GetJunction(Segment const & segment, boo
   return segment.IsForward() == front ? it->second.m_pointLast : it->second.m_pointFirst;
 }
 
-NumMwmId GuidesGraph::GetMwmId() const { return m_mwmId; }
+NumMwmId GuidesGraph::GetMwmId() const
+{
+  return m_mwmId;
+}
 
-Segment GuidesGraph::AddTrack(std::vector<geometry::PointWithAltitude> const & guideTrack,
-                              size_t requiredSegmentIdx)
+Segment GuidesGraph::AddTrack(std::vector<geometry::PointWithAltitude> const & guideTrack, size_t requiredSegmentIdx)
 {
   uint32_t segmentIdx = 0;
   Segment segment;
@@ -98,10 +98,9 @@ Segment GuidesGraph::AddTrack(std::vector<geometry::PointWithAltitude> const & g
     if (i == requiredSegmentIdx)
       segment = curSegment;
 
-    data.m_pointFirst = LatLonWithAltitude(mercator::ToLatLon(guideTrack[i].GetPoint()),
-                                           guideTrack[i].GetAltitude());
-    data.m_pointLast = LatLonWithAltitude(mercator::ToLatLon(guideTrack[i + 1].GetPoint()),
-                                          guideTrack[i + 1].GetAltitude());
+    data.m_pointFirst = LatLonWithAltitude(mercator::ToLatLon(guideTrack[i].GetPoint()), guideTrack[i].GetAltitude());
+    data.m_pointLast =
+        LatLonWithAltitude(mercator::ToLatLon(guideTrack[i + 1].GetPoint()), guideTrack[i + 1].GetAltitude());
 
     data.m_weight = CalcSegmentTimeS(data.m_pointFirst, data.m_pointLast);
 
@@ -116,8 +115,8 @@ Segment GuidesGraph::FindSegment(Segment const & segment, size_t segmentIdx) con
 {
   auto const it = m_segments.find(segment);
   CHECK(it != m_segments.end(), (segment, segmentIdx));
-  Segment segmentOnTrack(it->first.GetMwmId(), it->first.GetFeatureId(),
-                         static_cast<uint32_t>(segmentIdx), it->first.IsForward());
+  Segment segmentOnTrack(it->first.GetMwmId(), it->first.GetFeatureId(), static_cast<uint32_t>(segmentIdx),
+                         it->first.IsForward());
 
   auto const itByIndex = m_segments.find(segmentOnTrack);
   CHECK(itByIndex != m_segments.end(), (segment, segmentIdx));
@@ -139,17 +138,16 @@ FakeEnding GuidesGraph::MakeFakeEnding(Segment const & segment, m2::PointD const
   auto const & backJunction = GetJunction(segment, false /* front */);
 
   FakeEnding ending;
-  ending.m_projections.emplace_back(segment, false /* isOneWay */, frontJunction, backJunction,
-                                    LatLonWithAltitude(mercator::ToLatLon(projection.GetPoint()),
-                                                       projection.GetAltitude()) /* junction */);
+  ending.m_projections.emplace_back(
+      segment, false /* isOneWay */, frontJunction, backJunction,
+      LatLonWithAltitude(mercator::ToLatLon(projection.GetPoint()), projection.GetAltitude()) /* junction */);
 
   ending.m_originJunction =
       LatLonWithAltitude(mercator::ToLatLon(point), static_cast<geometry::Altitude>(kZeroAltitude));
   return ending;
 }
 
-std::pair<LatLonWithAltitude, LatLonWithAltitude> GuidesGraph::GetFromTo(
-    Segment const & segment) const
+std::pair<LatLonWithAltitude, LatLonWithAltitude> GuidesGraph::GetFromTo(Segment const & segment) const
 {
   auto const & from = GetJunction(segment, false /* front */);
   auto const & to = GetJunction(segment, true /* front */);
diff --git a/libs/routing/guides_graph.hpp b/libs/routing/guides_graph.hpp
index 005719734..583380539 100644
--- a/libs/routing/guides_graph.hpp
+++ b/libs/routing/guides_graph.hpp
@@ -42,15 +42,13 @@ public:
   GuidesGraph() = default;
   explicit GuidesGraph(double maxSpeedMpS, NumMwmId mwmId);
 
-  Segment AddTrack(std::vector<geometry::PointWithAltitude> const & guideTrack,
-                   size_t requiredSegmentIdx);
+  Segment AddTrack(std::vector<geometry::PointWithAltitude> const & guideTrack, size_t requiredSegmentIdx);
 
   FakeEnding MakeFakeEnding(Segment const & segment, m2::PointD const & point,
                             geometry::PointWithAltitude const & projection) const;
 
   using EdgeListT = SmallList<SegmentEdge>;
-  void GetEdgeList(Segment const & segment, bool isOutgoing, EdgeListT & edges,
-                   RouteWeight const & prevWeight) const;
+  void GetEdgeList(Segment const & segment, bool isOutgoing, EdgeListT & edges, RouteWeight const & prevWeight) const;
   routing::LatLonWithAltitude const & GetJunction(Segment const & segment, bool front) const;
   RouteWeight CalcSegmentWeight(Segment const & segment) const;
   Segment FindSegment(Segment const & segment, size_t segmentIdx) const;
@@ -61,8 +59,7 @@ public:
   NumMwmId GetMwmId() const;
 
 private:
-  double CalcSegmentTimeS(LatLonWithAltitude const & point1,
-                          LatLonWithAltitude const & point2) const;
+  double CalcSegmentTimeS(LatLonWithAltitude const & point1, LatLonWithAltitude const & point2) const;
 
   GuideSegments m_segments;
   double m_maxSpeedMpS = 0.0;
diff --git a/libs/routing/index_graph.cpp b/libs/routing/index_graph.cpp
index 22b27ea85..eff85d3ba 100644
--- a/libs/routing/index_graph.cpp
+++ b/libs/routing/index_graph.cpp
@@ -35,9 +35,9 @@ bool IsBoarding(bool prevIsFerry, bool nextIsFerry)
 
 IndexGraph::IndexGraph(shared_ptr<Geometry> geometry, shared_ptr<EdgeEstimator> estimator,
                        RoutingOptions routingOptions)
-  : m_geometry(std::move(geometry)),
-    m_estimator(std::move(estimator)),
-    m_avoidRoutingOptions(routingOptions)
+  : m_geometry(std::move(geometry))
+  , m_estimator(std::move(estimator))
+  , m_avoidRoutingOptions(routingOptions)
 {
   CHECK(m_geometry, ());
   CHECK(m_estimator, ());
@@ -63,25 +63,22 @@ bool IndexGraph::IsJointOrEnd(Segment const & segment, bool fromStart) const
   return pointId + 1 == pointsNumber;
 }
 
-void IndexGraph::GetEdgeList(astar::VertexData<Segment, RouteWeight> const & vertexData,
-                             bool isOutgoing, bool useRoutingOptions, SegmentEdgeListT & edges,
-                             Parents<Segment> const & parents) const
+void IndexGraph::GetEdgeList(astar::VertexData<Segment, RouteWeight> const & vertexData, bool isOutgoing,
+                             bool useRoutingOptions, SegmentEdgeListT & edges, Parents<Segment> const & parents) const
 {
-  GetEdgeListImpl(vertexData, isOutgoing, useRoutingOptions, true /* useAccessConditional */, edges,
-                  parents);
+  GetEdgeListImpl(vertexData, isOutgoing, useRoutingOptions, true /* useAccessConditional */, edges, parents);
 }
 
-void IndexGraph::GetEdgeList(Segment const & segment,
-                             bool isOutgoing, bool useRoutingOptions, SegmentEdgeListT & edges,
+void IndexGraph::GetEdgeList(Segment const & segment, bool isOutgoing, bool useRoutingOptions, SegmentEdgeListT & edges,
                              Parents<Segment> const & parents) const
 {
   GetEdgeListImpl({segment, Weight(0.0)} /* vertexData */, isOutgoing, useRoutingOptions,
                   false /* useAccessConditional */, edges, parents);
 }
 
-void IndexGraph::GetEdgeListImpl(astar::VertexData<Segment, RouteWeight> const & vertexData,
-                                 bool isOutgoing, bool useRoutingOptions, bool useAccessConditional,
-                                 SegmentEdgeListT & edges, Parents<Segment> const & parents) const
+void IndexGraph::GetEdgeListImpl(astar::VertexData<Segment, RouteWeight> const & vertexData, bool isOutgoing,
+                                 bool useRoutingOptions, bool useAccessConditional, SegmentEdgeListT & edges,
+                                 Parents<Segment> const & parents) const
 {
   auto const & segment = vertexData.m_vertex;
 
@@ -90,21 +87,16 @@ void IndexGraph::GetEdgeListImpl(astar::VertexData<Segment, RouteWeight> const &
 
   if (jointId != Joint::kInvalidId)
   {
-    m_jointIndex.ForEachPoint(jointId, [&](RoadPoint const & rp) {
-      GetNeighboringEdges(vertexData, rp, isOutgoing, useRoutingOptions, edges, parents,
-                          useAccessConditional);
-    });
+    m_jointIndex.ForEachPoint(jointId, [&](RoadPoint const & rp)
+    { GetNeighboringEdges(vertexData, rp, isOutgoing, useRoutingOptions, edges, parents, useAccessConditional); });
   }
   else
   {
-    GetNeighboringEdges(vertexData, roadPoint, isOutgoing, useRoutingOptions, edges, parents,
-                        useAccessConditional);
+    GetNeighboringEdges(vertexData, roadPoint, isOutgoing, useRoutingOptions, edges, parents, useAccessConditional);
   }
 }
 
-void IndexGraph::GetLastPointsForJoint(SegmentListT const & children,
-                                       bool isOutgoing,
-                                       PointIdListT & lastPoints) const
+void IndexGraph::GetLastPointsForJoint(SegmentListT const & children, bool isOutgoing, PointIdListT & lastPoints) const
 {
   ASSERT(lastPoints.empty(), ());
 
@@ -142,28 +134,24 @@ void IndexGraph::GetLastPointsForJoint(SegmentListT const & children,
 }
 
 void IndexGraph::GetEdgeList(astar::VertexData<JointSegment, RouteWeight> const & parentVertexData,
-                             Segment const & parent, bool isOutgoing,
-                             JointEdgeListT & edges,
-                             WeightListT & parentWeights,
-                             Parents<JointSegment> const & parents) const
+                             Segment const & parent, bool isOutgoing, JointEdgeListT & edges,
+                             WeightListT & parentWeights, Parents<JointSegment> const & parents) const
 {
-  GetEdgeListImpl(parentVertexData, parent, isOutgoing, true /* useAccessConditional */, edges,
-                  parentWeights, parents);
+  GetEdgeListImpl(parentVertexData, parent, isOutgoing, true /* useAccessConditional */, edges, parentWeights, parents);
 }
 
-void IndexGraph::GetEdgeList(JointSegment const & parentJoint, Segment const & parent,
-                             bool isOutgoing, JointEdgeListT & edges,
-                             WeightListT & parentWeights,
+void IndexGraph::GetEdgeList(JointSegment const & parentJoint, Segment const & parent, bool isOutgoing,
+                             JointEdgeListT & edges, WeightListT & parentWeights,
                              Parents<JointSegment> const & parents) const
 {
   GetEdgeListImpl({parentJoint, Weight(0.0)}, parent, isOutgoing, false /* useAccessConditional */, edges,
                   parentWeights, parents);
 }
 
-void IndexGraph::GetEdgeListImpl(
-    astar::VertexData<JointSegment, RouteWeight> const & parentVertexData, Segment const & parent,
-    bool isOutgoing, bool useAccessConditional, JointEdgeListT & edges,
-    WeightListT & parentWeights, Parents<JointSegment> const & parents) const
+void IndexGraph::GetEdgeListImpl(astar::VertexData<JointSegment, RouteWeight> const & parentVertexData,
+                                 Segment const & parent, bool isOutgoing, bool useAccessConditional,
+                                 JointEdgeListT & edges, WeightListT & parentWeights,
+                                 Parents<JointSegment> const & parents) const
 {
   SegmentListT possibleChildren;
   GetSegmentCandidateForJoint(parent, isOutgoing, possibleChildren);
@@ -171,13 +159,12 @@ void IndexGraph::GetEdgeListImpl(
   PointIdListT lastPoints;
   GetLastPointsForJoint(possibleChildren, isOutgoing, lastPoints);
 
-  ReconstructJointSegment(parentVertexData, parent, possibleChildren, lastPoints,
-                          isOutgoing, edges, parentWeights, parents);
+  ReconstructJointSegment(parentVertexData, parent, possibleChildren, lastPoints, isOutgoing, edges, parentWeights,
+                          parents);
 }
 
-optional<JointEdge> IndexGraph::GetJointEdgeByLastPoint(Segment const & parent,
-                                                        Segment const & firstChild, bool isOutgoing,
-                                                        uint32_t lastPoint) const
+optional<JointEdge> IndexGraph::GetJointEdgeByLastPoint(Segment const & parent, Segment const & firstChild,
+                                                        bool isOutgoing, uint32_t lastPoint) const
 {
   SegmentListT const possibleChildren = {firstChild};
   PointIdListT const lastPoints = {lastPoint};
@@ -230,12 +217,10 @@ void IndexGraph::SetRestrictions(RestrictionVec && restrictions)
 void IndexGraph::SetUTurnRestrictions(vector<RestrictionUTurn> && noUTurnRestrictions)
 {
   for (auto const & noUTurn : noUTurnRestrictions)
-  {
     if (noUTurn.m_viaIsFirstPoint)
       m_noUTurnRestrictions[noUTurn.m_featureId].m_atTheBegin = true;
     else
       m_noUTurnRestrictions[noUTurn.m_featureId].m_atTheEnd = true;
-  }
 }
 
 void IndexGraph::SetRoadAccess(RoadAccess && roadAccess)
@@ -261,22 +246,19 @@ void IndexGraph::GetNeighboringEdges(astar::VertexData<Segment, RouteWeight> con
   auto const & from = fromVertexData.m_vertex;
   if ((isOutgoing || bidirectional) && rp.GetPointId() + 1 < road.GetPointsCount())
   {
-    GetNeighboringEdge(fromVertexData,
-                       Segment(from.GetMwmId(), rp.GetFeatureId(), rp.GetPointId(), isOutgoing),
+    GetNeighboringEdge(fromVertexData, Segment(from.GetMwmId(), rp.GetFeatureId(), rp.GetPointId(), isOutgoing),
                        isOutgoing, edges, parents, useAccessConditional);
   }
 
   if ((!isOutgoing || bidirectional) && rp.GetPointId() > 0)
   {
-    GetNeighboringEdge(
-        fromVertexData,
-        Segment(from.GetMwmId(), rp.GetFeatureId(), rp.GetPointId() - 1, !isOutgoing), isOutgoing,
-        edges, parents, useAccessConditional);
+    GetNeighboringEdge(fromVertexData, Segment(from.GetMwmId(), rp.GetFeatureId(), rp.GetPointId() - 1, !isOutgoing),
+                       isOutgoing, edges, parents, useAccessConditional);
   }
 }
 
-void IndexGraph::GetSegmentCandidateForRoadPoint(RoadPoint const & rp, NumMwmId numMwmId,
-                                                 bool isOutgoing, SegmentListT & children) const
+void IndexGraph::GetSegmentCandidateForRoadPoint(RoadPoint const & rp, NumMwmId numMwmId, bool isOutgoing,
+                                                 SegmentListT & children) const
 {
   RoadGeometry const & road = GetRoadGeometry(rp.GetFeatureId());
   if (!road.IsValid())
@@ -295,8 +277,7 @@ void IndexGraph::GetSegmentCandidateForRoadPoint(RoadPoint const & rp, NumMwmId
     children.emplace_back(numMwmId, rp.GetFeatureId(), pointId - 1, !isOutgoing);
 }
 
-void IndexGraph::GetSegmentCandidateForJoint(Segment const & parent, bool isOutgoing,
-                                             SegmentListT & children) const
+void IndexGraph::GetSegmentCandidateForJoint(Segment const & parent, bool isOutgoing, SegmentListT & children) const
 {
   RoadPoint const roadPoint = parent.GetRoadPoint(isOutgoing);
   Joint::Id const jointId = m_roadIndex.GetJointId(roadPoint);
@@ -304,9 +285,8 @@ void IndexGraph::GetSegmentCandidateForJoint(Segment const & parent, bool isOutg
   if (jointId == Joint::kInvalidId)
     return;
 
-  m_jointIndex.ForEachPoint(jointId, [&](RoadPoint const & rp) {
-    GetSegmentCandidateForRoadPoint(rp, parent.GetMwmId(), isOutgoing, children);
-  });
+  m_jointIndex.ForEachPoint(jointId, [&](RoadPoint const & rp)
+  { GetSegmentCandidateForRoadPoint(rp, parent.GetMwmId(), isOutgoing, children); });
 }
 
 /// \brief Prolongs segments from |parent| to |firstChildren| directions in order to
@@ -318,12 +298,9 @@ void IndexGraph::GetSegmentCandidateForJoint(Segment const & parent, bool isOutg
 ///                          Shortly - in case of |isOutgoing| == false, method saves here the weights
 ///                                   from parent to firstChildren.
 void IndexGraph::ReconstructJointSegment(astar::VertexData<JointSegment, RouteWeight> const & parentVertexData,
-                                         Segment const & parent,
-                                         SegmentListT const & firstChildren,
-                                         PointIdListT const & lastPointIds,
-                                         bool isOutgoing,
-                                         JointEdgeListT & jointEdges,
-                                         WeightListT & parentWeights,
+                                         Segment const & parent, SegmentListT const & firstChildren,
+                                         PointIdListT const & lastPointIds, bool isOutgoing,
+                                         JointEdgeListT & jointEdges, WeightListT & parentWeights,
                                          Parents<JointSegment> const & parents) const
 {
   CHECK_EQUAL(firstChildren.size(), lastPointIds.size(), ());
@@ -340,30 +317,20 @@ void IndexGraph::ReconstructJointSegment(astar::VertexData<JointSegment, RouteWe
                     ("Invariant violated, can not build JointSegment,"
                      "started and ended in the same point."));
 
-    auto const increment = [currentPointId, lastPointId](uint32_t pointId) {
-      return currentPointId < lastPointId ? pointId + 1 : pointId - 1;
-    };
+    auto const increment = [currentPointId, lastPointId](uint32_t pointId)
+    { return currentPointId < lastPointId ? pointId + 1 : pointId - 1; };
 
-    if (IsAccessNoForSure(firstChild.GetFeatureId(), weightTimeToParent,
-                          true /* useAccessConditional */))
-    {
+    if (IsAccessNoForSure(firstChild.GetFeatureId(), weightTimeToParent, true /* useAccessConditional */))
       continue;
-    }
 
-    if (IsAccessNoForSure(parent.GetRoadPoint(isOutgoing), weightTimeToParent,
-                          true /* useAccessConditional */))
-    {
+    if (IsAccessNoForSure(parent.GetRoadPoint(isOutgoing), weightTimeToParent, true /* useAccessConditional */))
       continue;
-    }
 
     if (IsUTurn(parent, firstChild) && IsUTurnAndRestricted(parent, firstChild, isOutgoing))
       continue;
 
-    if (IsRestricted(parentJoint, parent.GetFeatureId(), firstChild.GetFeatureId(),
-                     isOutgoing, parents))
-    {
+    if (IsRestricted(parentJoint, parent.GetFeatureId(), firstChild.GetFeatureId(), isOutgoing, parents))
       continue;
-    }
 
     RouteWeight summaryWeight;
     // Check current JointSegment for bad road access between segments.
@@ -386,7 +353,8 @@ void IndexGraph::ReconstructJointSegment(astar::VertexData<JointSegment, RouteWe
 
       start = increment(start);
       rp.SetPointId(start);
-    } while (start != lastPointId);
+    }
+    while (start != lastPointId);
 
     if (noRoadAccess)
       continue;
@@ -397,8 +365,8 @@ void IndexGraph::ReconstructJointSegment(astar::VertexData<JointSegment, RouteWe
 
     do
     {
-      RouteWeight const weight = CalculateEdgeWeight(EdgeEstimator::Purpose::Weight, isOutgoing,
-                                                     prev, current, weightTimeToParent);
+      RouteWeight const weight =
+          CalculateEdgeWeight(EdgeEstimator::Purpose::Weight, isOutgoing, prev, current, weightTimeToParent);
 
       if (isOutgoing || prev != parent)
         summaryWeight += weight;
@@ -409,17 +377,16 @@ void IndexGraph::ReconstructJointSegment(astar::VertexData<JointSegment, RouteWe
       prev = current;
       current.Next(forward);
       currentPointId = increment(currentPointId);
-    } while (currentPointId != lastPointId);
+    }
+    while (currentPointId != lastPointId);
 
-    jointEdges.emplace_back(isOutgoing ? JointSegment(firstChild, prev) :
-                                         JointSegment(prev, firstChild),
+    jointEdges.emplace_back(isOutgoing ? JointSegment(firstChild, prev) : JointSegment(prev, firstChild),
                             summaryWeight);
   }
 }
 
-void IndexGraph::GetNeighboringEdge(astar::VertexData<Segment, RouteWeight> const & fromVertexData,
-                                    Segment const & to, bool isOutgoing,
-                                    SegmentEdgeListT & edges, Parents<Segment> const & parents,
+void IndexGraph::GetNeighboringEdge(astar::VertexData<Segment, RouteWeight> const & fromVertexData, Segment const & to,
+                                    bool isOutgoing, SegmentEdgeListT & edges, Parents<Segment> const & parents,
                                     bool useAccessConditional) const
 {
   auto const & from = fromVertexData.m_vertex;
@@ -438,8 +405,7 @@ void IndexGraph::GetNeighboringEdge(astar::VertexData<Segment, RouteWeight> cons
   if (IsAccessNoForSure(rp, weightToFrom, useAccessConditional))
     return;
 
-  auto const weight =
-      CalculateEdgeWeight(EdgeEstimator::Purpose::Weight, isOutgoing, from, to, weightToFrom);
+  auto const weight = CalculateEdgeWeight(EdgeEstimator::Purpose::Weight, isOutgoing, from, to, weightToFrom);
 
   edges.emplace_back(to, weight);
 }
@@ -447,18 +413,17 @@ void IndexGraph::GetNeighboringEdge(astar::VertexData<Segment, RouteWeight> cons
 IndexGraph::PenaltyData IndexGraph::GetRoadPenaltyData(Segment const & segment) const
 {
   auto const & road = GetRoadGeometry(segment.GetFeatureId());
-  return { road.IsPassThroughAllowed(), road.GetRoutingOptions().Has(RoutingOptions::Road::Ferry) };
+  return {road.IsPassThroughAllowed(), road.GetRoutingOptions().Has(RoutingOptions::Road::Ferry)};
 }
 
-RouteWeight IndexGraph::GetPenalties(EdgeEstimator::Purpose purpose, Segment const & u,
-                                     Segment const & v, optional<RouteWeight> const & prevWeight) const
+RouteWeight IndexGraph::GetPenalties(EdgeEstimator::Purpose purpose, Segment const & u, Segment const & v,
+                                     optional<RouteWeight> const & prevWeight) const
 {
   auto const & fromPenaltyData = GetRoadPenaltyData(u);
   auto const & toPenaltyData = GetRoadPenaltyData(v);
   // Route crosses border of pass-through/non-pass-through area if |u| and |v| have different
   // pass through restrictions.
-  int8_t const passThroughPenalty =
-      fromPenaltyData.m_passThroughAllowed == toPenaltyData.m_passThroughAllowed ? 0 : 1;
+  int8_t const passThroughPenalty = fromPenaltyData.m_passThroughAllowed == toPenaltyData.m_passThroughAllowed ? 0 : 1;
 
   int8_t accessPenalty = 0;
   int8_t accessConditionalPenalties = 0;
@@ -467,16 +432,13 @@ RouteWeight IndexGraph::GetPenalties(EdgeEstimator::Purpose purpose, Segment con
   {
     // We do not distinguish between RoadAccess::Type::Private and RoadAccess::Type::Destination for
     // now.
-    auto const [fromAccess, fromConfidence] =
-        prevWeight ? m_roadAccess.GetAccess(u.GetFeatureId(), *prevWeight)
-                   : m_roadAccess.GetAccessWithoutConditional(u.GetFeatureId());
+    auto const [fromAccess, fromConfidence] = prevWeight ? m_roadAccess.GetAccess(u.GetFeatureId(), *prevWeight)
+                                                         : m_roadAccess.GetAccessWithoutConditional(u.GetFeatureId());
 
-    auto const [toAccess, toConfidence] =
-        prevWeight ? m_roadAccess.GetAccess(v.GetFeatureId(), *prevWeight)
-                   : m_roadAccess.GetAccessWithoutConditional(v.GetFeatureId());
+    auto const [toAccess, toConfidence] = prevWeight ? m_roadAccess.GetAccess(v.GetFeatureId(), *prevWeight)
+                                                     : m_roadAccess.GetAccessWithoutConditional(v.GetFeatureId());
 
-    if (fromConfidence == RoadAccess::Confidence::Sure &&
-        toConfidence == RoadAccess::Confidence::Sure)
+    if (fromConfidence == RoadAccess::Confidence::Sure && toConfidence == RoadAccess::Confidence::Sure)
     {
       bool const fromAccessAllowed = fromAccess == RoadAccess::Type::Yes;
       bool const toAccessAllowed = toAccess == RoadAccess::Type::Yes;
@@ -492,9 +454,8 @@ RouteWeight IndexGraph::GetPenalties(EdgeEstimator::Purpose purpose, Segment con
 
   // RoadPoint between u and v is front of u.
   auto const rp = u.GetRoadPoint(true /* front */);
-  auto const [rpAccessType, rpConfidence] = prevWeight
-                                                ? m_roadAccess.GetAccess(rp, *prevWeight)
-                                                : m_roadAccess.GetAccessWithoutConditional(rp);
+  auto const [rpAccessType, rpConfidence] =
+      prevWeight ? m_roadAccess.GetAccess(rp, *prevWeight) : m_roadAccess.GetAccessWithoutConditional(rp);
   switch (rpConfidence)
   {
   case RoadAccess::Confidence::Sure:
@@ -521,10 +482,12 @@ RouteWeight IndexGraph::GetPenalties(EdgeEstimator::Purpose purpose, Segment con
           0.0 /* transitTime */};
 }
 
-WorldGraphMode IndexGraph::GetMode() const { return WorldGraphMode::Undefined; }
+WorldGraphMode IndexGraph::GetMode() const
+{
+  return WorldGraphMode::Undefined;
+}
 
-bool IndexGraph::IsUTurnAndRestricted(Segment const & parent, Segment const & child,
-                                      bool isOutgoing) const
+bool IndexGraph::IsUTurnAndRestricted(Segment const & parent, Segment const & child, bool isOutgoing) const
 {
   ASSERT(IsUTurn(parent, child), ());
 
@@ -549,8 +512,8 @@ bool IndexGraph::IsUTurnAndRestricted(Segment const & parent, Segment const & ch
   return uTurn.m_atTheEnd && turnPoint == n - 1;
 }
 
-RouteWeight IndexGraph::CalculateEdgeWeight(EdgeEstimator::Purpose purpose, bool isOutgoing,
-                                            Segment const & from, Segment const & to,
+RouteWeight IndexGraph::CalculateEdgeWeight(EdgeEstimator::Purpose purpose, bool isOutgoing, Segment const & from,
+                                            Segment const & to,
                                             std::optional<RouteWeight const> const & prevWeight) const
 {
   auto const & segment = isOutgoing ? to : from;
diff --git a/libs/routing/index_graph.hpp b/libs/routing/index_graph.hpp
index be7a1bab3..b065d9bcb 100644
--- a/libs/routing/index_graph.hpp
+++ b/libs/routing/index_graph.hpp
@@ -52,22 +52,18 @@ public:
              RoutingOptions routingOptions = RoutingOptions());
 
   // Put outgoing (or ingoing) egdes for segment to the 'edges' vector.
-  void GetEdgeList(astar::VertexData<Segment, RouteWeight> const & vertexData, bool isOutgoing,
-                   bool useRoutingOptions, SegmentEdgeListT & edges,
-                   Parents<Segment> const & parents = {}) const;
-  void GetEdgeList(Segment const & segment, bool isOutgoing, bool useRoutingOptions,
-                   SegmentEdgeListT & edges,
+  void GetEdgeList(astar::VertexData<Segment, RouteWeight> const & vertexData, bool isOutgoing, bool useRoutingOptions,
+                   SegmentEdgeListT & edges, Parents<Segment> const & parents = {}) const;
+  void GetEdgeList(Segment const & segment, bool isOutgoing, bool useRoutingOptions, SegmentEdgeListT & edges,
                    Parents<Segment> const & parents = {}) const;
 
-  void GetEdgeList(astar::VertexData<JointSegment, RouteWeight> const & parentVertexData,
-                   Segment const & parent, bool isOutgoing, JointEdgeListT & edges,
-                   WeightListT & parentWeights, Parents<JointSegment> const & parents) const;
-  void GetEdgeList(JointSegment const & parentJoint, Segment const & parent, bool isOutgoing,
-                   JointEdgeListT & edges, WeightListT & parentWeights,
+  void GetEdgeList(astar::VertexData<JointSegment, RouteWeight> const & parentVertexData, Segment const & parent,
+                   bool isOutgoing, JointEdgeListT & edges, WeightListT & parentWeights,
                    Parents<JointSegment> const & parents) const;
+  void GetEdgeList(JointSegment const & parentJoint, Segment const & parent, bool isOutgoing, JointEdgeListT & edges,
+                   WeightListT & parentWeights, Parents<JointSegment> const & parents) const;
 
-  std::optional<JointEdge> GetJointEdgeByLastPoint(Segment const & parent,
-                                                   Segment const & firstChild, bool isOutgoing,
+  std::optional<JointEdge> GetJointEdgeByLastPoint(Segment const & parent, Segment const & firstChild, bool isOutgoing,
                                                    uint32_t lastPoint) const;
 
   Joint::Id GetJointId(RoadPoint const & rp) const { return m_roadIndex.GetJointId(rp); }
@@ -94,10 +90,7 @@ public:
   void SetUTurnRestrictions(std::vector<RestrictionUTurn> && noUTurnRestrictions);
   void SetRoadAccess(RoadAccess && roadAccess);
 
-  void PushFromSerializer(Joint::Id jointId, RoadPoint const & rp)
-  {
-    m_roadIndex.PushFromSerializer(jointId, rp);
-  }
+  void PushFromSerializer(Joint::Id jointId, RoadPoint const & rp) { m_roadIndex.PushFromSerializer(jointId, rp); }
 
   template <typename F>
   void ForEachRoad(F && f) const
@@ -113,8 +106,7 @@ public:
 
   bool IsJoint(RoadPoint const & roadPoint) const;
   bool IsJointOrEnd(Segment const & segment, bool fromStart) const;
-  void GetLastPointsForJoint(SegmentListT const & children, bool isOutgoing,
-                             PointIdListT & lastPoints) const;
+  void GetLastPointsForJoint(SegmentListT const & children, bool isOutgoing, PointIdListT & lastPoints) const;
 
   WorldGraphMode GetMode() const;
   ms::LatLon const & GetPoint(Segment const & segment, bool front) const
@@ -126,9 +118,7 @@ public:
   /// We pass |parentFeatureId| and don't use |parent.GetFeatureId()| because
   /// |parent| can be fake sometimes but |parentFeatureId| is almost non-fake.
   template <typename ParentVertex>
-  bool IsRestricted(ParentVertex const & parent,
-                    uint32_t parentFeatureId,
-                    uint32_t currentFeatureId, bool isOutgoing,
+  bool IsRestricted(ParentVertex const & parent, uint32_t parentFeatureId, uint32_t currentFeatureId, bool isOutgoing,
                     Parents<ParentVertex> const & parents) const;
 
   bool IsUTurnAndRestricted(Segment const & parent, Segment const & child, bool isOutgoing) const;
@@ -137,36 +127,35 @@ public:
   /// @param[in]  prevWeight used for fetching access:conditional.
   /// I suppose :) its time when user will be at the end of |from| (|to| if \a isOutgoing == false) segment.
   /// @return Transition weight + |to| (|from| if \a isOutgoing == false) segment's weight.
-  RouteWeight CalculateEdgeWeight(EdgeEstimator::Purpose purpose, bool isOutgoing,
-                                  Segment const & from, Segment const & to,
+  RouteWeight CalculateEdgeWeight(EdgeEstimator::Purpose purpose, bool isOutgoing, Segment const & from,
+                                  Segment const & to,
                                   std::optional<RouteWeight const> const & prevWeight = std::nullopt) const;
 
   template <typename T>
-  void SetCurrentTimeGetter(T && t) { m_currentTimeGetter = std::forward<T>(t); }
+  void SetCurrentTimeGetter(T && t)
+  {
+    m_currentTimeGetter = std::forward<T>(t);
+  }
 
 private:
   void GetEdgeListImpl(astar::VertexData<Segment, RouteWeight> const & vertexData, bool isOutgoing,
-                       bool useRoutingOptions, bool useAccessConditional,
-                       SegmentEdgeListT & edges, Parents<Segment> const & parents) const;
+                       bool useRoutingOptions, bool useAccessConditional, SegmentEdgeListT & edges,
+                       Parents<Segment> const & parents) const;
 
-  void GetEdgeListImpl(astar::VertexData<JointSegment, RouteWeight> const & parentVertexData,
-                       Segment const & parent, bool isOutgoing, bool useAccessConditional,
-                       JointEdgeListT & edges, WeightListT & parentWeights,
+  void GetEdgeListImpl(astar::VertexData<JointSegment, RouteWeight> const & parentVertexData, Segment const & parent,
+                       bool isOutgoing, bool useAccessConditional, JointEdgeListT & edges, WeightListT & parentWeights,
                        Parents<JointSegment> const & parents) const;
 
-  void GetNeighboringEdges(astar::VertexData<Segment, RouteWeight> const & fromVertexData,
-                           RoadPoint const & rp, bool isOutgoing, bool useRoutingOptions,
-                           SegmentEdgeListT & edges, Parents<Segment> const & parents,
-                           bool useAccessConditional) const;
-  void GetNeighboringEdge(astar::VertexData<Segment, RouteWeight> const & fromVertexData,
-                          Segment const & to, bool isOutgoing, SegmentEdgeListT & edges,
-                          Parents<Segment> const & parents, bool useAccessConditional) const;
+  void GetNeighboringEdges(astar::VertexData<Segment, RouteWeight> const & fromVertexData, RoadPoint const & rp,
+                           bool isOutgoing, bool useRoutingOptions, SegmentEdgeListT & edges,
+                           Parents<Segment> const & parents, bool useAccessConditional) const;
+  void GetNeighboringEdge(astar::VertexData<Segment, RouteWeight> const & fromVertexData, Segment const & to,
+                          bool isOutgoing, SegmentEdgeListT & edges, Parents<Segment> const & parents,
+                          bool useAccessConditional) const;
 
   struct PenaltyData
   {
-    PenaltyData(bool passThroughAllowed, bool isFerry)
-      : m_passThroughAllowed(passThroughAllowed),
-        m_isFerry(isFerry) {}
+    PenaltyData(bool passThroughAllowed, bool isFerry) : m_passThroughAllowed(passThroughAllowed), m_isFerry(isFerry) {}
 
     bool m_passThroughAllowed;
     bool m_isFerry;
@@ -181,21 +170,17 @@ private:
   RouteWeight GetPenalties(EdgeEstimator::Purpose purpose, Segment const & u, Segment const & v,
                            std::optional<RouteWeight> const & prevWeight) const;
 
-  void GetSegmentCandidateForRoadPoint(RoadPoint const & rp, NumMwmId numMwmId,
-                                       bool isOutgoing, SegmentListT & children) const;
+  void GetSegmentCandidateForRoadPoint(RoadPoint const & rp, NumMwmId numMwmId, bool isOutgoing,
+                                       SegmentListT & children) const;
   void GetSegmentCandidateForJoint(Segment const & parent, bool isOutgoing, SegmentListT & children) const;
   void ReconstructJointSegment(astar::VertexData<JointSegment, RouteWeight> const & parentVertexData,
-                               Segment const & parent,
-                               SegmentListT const & firstChildren,
-                               PointIdListT const & lastPointIds,
-                               bool isOutgoing,
-                               JointEdgeListT & jointEdges,
-                               WeightListT & parentWeights,
-                               Parents<JointSegment> const & parents) const;
+                               Segment const & parent, SegmentListT const & firstChildren,
+                               PointIdListT const & lastPointIds, bool isOutgoing, JointEdgeListT & jointEdges,
+                               WeightListT & parentWeights, Parents<JointSegment> const & parents) const;
 
   template <typename AccessPositionType>
-  bool IsAccessNoForSure(AccessPositionType const & accessPositionType,
-                         RouteWeight const & weight, bool useAccessConditional) const;
+  bool IsAccessNoForSure(AccessPositionType const & accessPositionType, RouteWeight const & weight,
+                         bool useAccessConditional) const;
 
   std::shared_ptr<Geometry> m_geometry;
   std::shared_ptr<EdgeEstimator> m_estimator;
@@ -221,27 +206,22 @@ private:
   RoadAccess m_roadAccess;
   RoutingOptions m_avoidRoutingOptions;
 
-  std::function<time_t()> m_currentTimeGetter = []() {
-    return GetCurrentTimestamp();
-  };
+  std::function<time_t()> m_currentTimeGetter = []() { return GetCurrentTimestamp(); };
 };
 
 template <typename AccessPositionType>
-bool IndexGraph::IsAccessNoForSure(AccessPositionType const & accessPositionType,
-                                   RouteWeight const & weight, bool useAccessConditional) const
+bool IndexGraph::IsAccessNoForSure(AccessPositionType const & accessPositionType, RouteWeight const & weight,
+                                   bool useAccessConditional) const
 {
-  auto const [accessType, confidence] =
-      useAccessConditional ? m_roadAccess.GetAccess(accessPositionType, weight)
-                           : m_roadAccess.GetAccessWithoutConditional(accessPositionType);
+  auto const [accessType, confidence] = useAccessConditional
+                                          ? m_roadAccess.GetAccess(accessPositionType, weight)
+                                          : m_roadAccess.GetAccessWithoutConditional(accessPositionType);
   return accessType == RoadAccess::Type::No && confidence == RoadAccess::Confidence::Sure;
 }
 
 template <typename ParentVertex>
-bool IndexGraph::IsRestricted(ParentVertex const & parent,
-                              uint32_t parentFeatureId,
-                              uint32_t currentFeatureId,
-                              bool isOutgoing,
-                              Parents<ParentVertex> const & parents) const
+bool IndexGraph::IsRestricted(ParentVertex const & parent, uint32_t parentFeatureId, uint32_t currentFeatureId,
+                              bool isOutgoing, Parents<ParentVertex> const & parents) const
 {
   if (parentFeatureId == currentFeatureId)
     return false;
@@ -295,11 +275,8 @@ bool IndexGraph::IsRestricted(ParentVertex const & parent,
     for (size_t i = 1; i < restriction.size(); ++i)
     {
       ASSERT_GREATER_OR_EQUAL(i, 1, ("Unexpected overflow."));
-      if (i - 1 == parentsFromCurrent.size()
-          && !appendNextParent(parentsFromCurrent.back(), parentsFromCurrent))
-      {
+      if (i - 1 == parentsFromCurrent.size() && !appendNextParent(parentsFromCurrent.back(), parentsFromCurrent))
         break;
-      }
 
       if (parentsFromCurrent.back().GetFeatureId() != restriction[i])
         break;
diff --git a/libs/routing/index_graph_loader.cpp b/libs/routing/index_graph_loader.cpp
index d866a2141..87210cdf5 100644
--- a/libs/routing/index_graph_loader.cpp
+++ b/libs/routing/index_graph_loader.cpp
@@ -17,7 +17,6 @@
 #include <map>
 #include <unordered_map>
 
-
 namespace routing
 {
 namespace
@@ -72,9 +71,7 @@ private:
   SpeedCamerasMapT const & ReceiveSpeedCamsFromMwm(NumMwmId numMwmId);
 
   RoutingOptions m_avoidRoutingOptions;
-  std::function<time_t()> m_currentTimeGetter = [time = GetCurrentTimestamp()]() {
-    return time;
-  };
+  std::function<time_t()> m_currentTimeGetter = [time = GetCurrentTimestamp()]() { return time; };
 };
 
 IndexGraph & IndexGraphLoaderImpl::GetIndexGraph(NumMwmId numMwmId)
@@ -115,10 +112,8 @@ vector<RouteSegment::SpeedCamera> IndexGraphLoaderImpl::GetSpeedCameraInfo(Segme
     return {};
 
   auto cameras = it->second;
-  base::SortUnique(cameras, std::less<RouteSegment::SpeedCamera>(), [](auto const & l, auto const & r)
-  {
-    return l.EqualCoef(r);
-  });
+  base::SortUnique(cameras, std::less<RouteSegment::SpeedCamera>(),
+                   [](auto const & l, auto const & r) { return l.EqualCoef(r); });
 
   // Cameras stored from beginning to ending of segment. So if we go at segment in backward direction,
   // we should read cameras in reverse sequence too.
@@ -147,7 +142,8 @@ IndexGraphLoaderImpl::GraphPtrT IndexGraphLoaderImpl::CreateIndexGraph(NumMwmId
     graph->SetCurrentTimeGetter(m_currentTimeGetter);
     DeserializeIndexGraph(*value, m_vehicleType, *graph);
 
-    LOG(LINFO, (ROUTING_FILE_TAG, "section for", value->GetCountryFileName(), "loaded in", timer.ElapsedSeconds(), "seconds"));
+    LOG(LINFO,
+        (ROUTING_FILE_TAG, "section for", value->GetCountryFileName(), "loaded in", timer.ElapsedSeconds(), "seconds"));
     return graph;
   }
   catch (RootException const & ex)
@@ -166,9 +162,12 @@ IndexGraphLoaderImpl::GeometryPtrT IndexGraphLoaderImpl::CreateGeometry(NumMwmId
   return make_shared<Geometry>(GeometryLoader::Create(handle, std::move(vehicleModel), m_loadAltitudes));
 }
 
-void IndexGraphLoaderImpl::Clear() { m_graphs.clear(); }
+void IndexGraphLoaderImpl::Clear()
+{
+  m_graphs.clear();
+}
 
-} // namespace
+}  // namespace
 
 bool ReadSpeedCamsFromMwm(MwmValue const & mwmValue, SpeedCamerasMapT & camerasMap)
 {
@@ -211,14 +210,13 @@ bool ReadRoadAccessFromMwm(MwmValue const & mwmValue, VehicleType vehicleType, R
 }
 
 // static
-unique_ptr<IndexGraphLoader> IndexGraphLoader::Create(
-    VehicleType vehicleType, bool loadAltitudes,
-    shared_ptr<VehicleModelFactoryInterface> vehicleModelFactory,
-    shared_ptr<EdgeEstimator> estimator, MwmDataSource & dataSource,
-    RoutingOptions routingOptions)
+unique_ptr<IndexGraphLoader> IndexGraphLoader::Create(VehicleType vehicleType, bool loadAltitudes,
+                                                      shared_ptr<VehicleModelFactoryInterface> vehicleModelFactory,
+                                                      shared_ptr<EdgeEstimator> estimator, MwmDataSource & dataSource,
+                                                      RoutingOptions routingOptions)
 {
-  return make_unique<IndexGraphLoaderImpl>(vehicleType, loadAltitudes, vehicleModelFactory,
-                                           estimator, dataSource, routingOptions);
+  return make_unique<IndexGraphLoaderImpl>(vehicleType, loadAltitudes, vehicleModelFactory, estimator, dataSource,
+                                           routingOptions);
 }
 
 void DeserializeIndexGraph(MwmValue const & mwmValue, VehicleType vehicleType, IndexGraph & graph)
diff --git a/libs/routing/index_graph_loader.hpp b/libs/routing/index_graph_loader.hpp
index 2ff558812..549d19a63 100644
--- a/libs/routing/index_graph_loader.hpp
+++ b/libs/routing/index_graph_loader.hpp
@@ -30,11 +30,10 @@ public:
   virtual std::vector<RouteSegment::SpeedCamera> GetSpeedCameraInfo(Segment const & segment) = 0;
   virtual void Clear() = 0;
 
-  static std::unique_ptr<IndexGraphLoader> Create(
-      VehicleType vehicleType, bool loadAltitudes,
-      std::shared_ptr<VehicleModelFactoryInterface> vehicleModelFactory,
-      std::shared_ptr<EdgeEstimator> estimator, MwmDataSource & dataSource,
-      RoutingOptions routingOptions = RoutingOptions());
+  static std::unique_ptr<IndexGraphLoader> Create(VehicleType vehicleType, bool loadAltitudes,
+                                                  std::shared_ptr<VehicleModelFactoryInterface> vehicleModelFactory,
+                                                  std::shared_ptr<EdgeEstimator> estimator, MwmDataSource & dataSource,
+                                                  RoutingOptions routingOptions = RoutingOptions());
 };
 
 void DeserializeIndexGraph(MwmValue const & mwmValue, VehicleType vehicleType, IndexGraph & graph);
diff --git a/libs/routing/index_graph_serialization.cpp b/libs/routing/index_graph_serialization.cpp
index c55e31675..837552488 100644
--- a/libs/routing/index_graph_serialization.cpp
+++ b/libs/routing/index_graph_serialization.cpp
@@ -8,9 +8,9 @@ uint32_t constexpr IndexGraphSerializer::JointsFilter::kEmptyEntry;
 uint32_t constexpr IndexGraphSerializer::JointsFilter::kPushedEntry;
 
 // IndexGraphSerializer::SectionSerializer ---------------------------------------------------------
-void IndexGraphSerializer::SectionSerializer::PreSerialize(
-    IndexGraph const & graph, std::unordered_map<uint32_t, VehicleMask> const & masks,
-    JointIdEncoder & jointEncoder)
+void IndexGraphSerializer::SectionSerializer::PreSerialize(IndexGraph const & graph,
+                                                           std::unordered_map<uint32_t, VehicleMask> const & masks,
+                                                           JointIdEncoder & jointEncoder)
 {
   m_buffer.clear();
   MemWriter<std::vector<uint8_t>> memWriter(m_buffer);
@@ -28,7 +28,8 @@ void IndexGraphSerializer::SectionSerializer::PreSerialize(
     WriteGamma(writer, ConvertJointsNumber(road.GetJointsNumber()));
 
     uint32_t prevPointId = -1;
-    road.ForEachJoint([&](uint32_t pointId, Joint::Id jointId) {
+    road.ForEachJoint([&](uint32_t pointId, Joint::Id jointId)
+    {
       WriteGamma(writer, pointId - prevPointId);
       jointEncoder.Write(jointId, writer);
       prevPointId = pointId;
@@ -54,8 +55,7 @@ void IndexGraphSerializer::JointsFilter::Push(Joint::Id jointIdInFile, RoadPoint
     break;
   case kPushedEntry: m_graph.PushFromSerializer(entry.second.jointId, rp); break;
   default:
-    m_graph.PushFromSerializer(m_count,
-                               RoadPoint(entry.first /* featureId */, entry.second.pointId));
+    m_graph.PushFromSerializer(m_count, RoadPoint(entry.first /* featureId */, entry.second.pointId));
     m_graph.PushFromSerializer(m_count, rp);
     entry.first = kPushedEntry;
     entry.second.jointId = m_count;
@@ -89,9 +89,9 @@ uint32_t IndexGraphSerializer::ConvertJointsNumber(uint32_t jointsNumber)
 }
 
 // static
-void IndexGraphSerializer::PrepareSectionSerializers(
-    IndexGraph const & graph, std::unordered_map<uint32_t, VehicleMask> const & masks,
-    std::vector<SectionSerializer> & serializers)
+void IndexGraphSerializer::PrepareSectionSerializers(IndexGraph const & graph,
+                                                     std::unordered_map<uint32_t, VehicleMask> const & masks,
+                                                     std::vector<SectionSerializer> & serializers)
 {
   size_t maskToIndex[kNumVehicleMasks] = {};
   // Car routing is most used routing: put car sections first.
@@ -110,7 +110,8 @@ void IndexGraphSerializer::PrepareSectionSerializers(
     }
   }
 
-  graph.ForEachRoad([&](uint32_t featureId, RoadJointIds const & /* road */) {
+  graph.ForEachRoad([&](uint32_t featureId, RoadJointIds const & /* road */)
+  {
     VehicleMask const mask = GetRoadMask(masks, featureId);
     SectionSerializer & serializer = serializers[maskToIndex[mask]];
     CHECK_EQUAL(serializer.GetMask(), mask, ());
diff --git a/libs/routing/index_graph_serialization.hpp b/libs/routing/index_graph_serialization.hpp
index 04cc65f31..40c6e4d3a 100644
--- a/libs/routing/index_graph_serialization.hpp
+++ b/libs/routing/index_graph_serialization.hpp
@@ -25,8 +25,7 @@ public:
   IndexGraphSerializer() = delete;
 
   template <class Sink>
-  static void Serialize(IndexGraph const & graph,
-                        std::unordered_map<uint32_t, VehicleMask> const & masks, Sink & sink)
+  static void Serialize(IndexGraph const & graph, std::unordered_map<uint32_t, VehicleMask> const & masks, Sink & sink)
   {
     Header header(graph);
     JointIdEncoder jointEncoder;
@@ -39,8 +38,11 @@ public:
       Joint::Id const begin = jointEncoder.GetCount();
       serializer.PreSerialize(graph, masks, jointEncoder);
       header.AddSection({
-          serializer.GetBufferSize(), static_cast<uint32_t>(serializer.GetNumRoads()), begin,
-          jointEncoder.GetCount(), serializer.GetMask(),
+          serializer.GetBufferSize(),
+          static_cast<uint32_t>(serializer.GetNumRoads()),
+          begin,
+          jointEncoder.GetCount(),
+          serializer.GetMask(),
       });
     }
 
@@ -93,9 +95,8 @@ public:
           Joint::Id const jointId = jointIdDecoder.Read(reader);
           if (jointId >= section.GetEndJointId())
           {
-            MYTHROW(CorruptedDataException,
-                    ("Invalid jointId =", jointId, ", end =", section.GetEndJointId(), ", mask =",
-                     mask, ", pointId =", pointId, ", featureId =", featureId));
+            MYTHROW(CorruptedDataException, ("Invalid jointId =", jointId, ", end =", section.GetEndJointId(),
+                                             ", mask =", mask, ", pointId =", pointId, ", featureId =", featureId));
           }
 
           jointsFilter.Push(jointId, RoadPoint(featureId, pointId));
@@ -104,16 +105,14 @@ public:
 
       if (jointIdDecoder.GetCount() != section.GetEndJointId())
       {
-        MYTHROW(CorruptedDataException,
-                ("Invalid decoder count =", jointIdDecoder.GetCount(), ", expected =",
-                 section.GetEndJointId(), ", mask =", mask));
+        MYTHROW(CorruptedDataException, ("Invalid decoder count =", jointIdDecoder.GetCount(),
+                                         ", expected =", section.GetEndJointId(), ", mask =", mask));
       }
 
       if (src.Pos() != expectedEndPos)
       {
-        MYTHROW(CorruptedDataException,
-                ("Wrong position", src.Pos(), "after decoding section", mask, "expected",
-                 expectedEndPos, "section size =", section.GetSize()));
+        MYTHROW(CorruptedDataException, ("Wrong position", src.Pos(), "after decoding section", mask, "expected",
+                                         expectedEndPos, "section size =", section.GetSize()));
       }
     }
 
@@ -151,15 +150,13 @@ private:
   public:
     Section() = default;
 
-    Section(uint64_t size, uint32_t numRoads, Joint::Id beginJointId, Joint::Id endJointId,
-            VehicleMask mask)
+    Section(uint64_t size, uint32_t numRoads, Joint::Id beginJointId, Joint::Id endJointId, VehicleMask mask)
       : m_size(size)
       , m_numRoads(numRoads)
       , m_beginJointId(beginJointId)
       , m_endJointId(endJointId)
       , m_mask(mask)
-    {
-    }
+    {}
 
     template <class Sink>
     void Serialize(Sink & sink) const
@@ -200,10 +197,7 @@ private:
   public:
     Header() = default;
 
-    explicit Header(IndexGraph const & graph)
-      : m_numRoads(graph.GetNumRoads()), m_numJoints(graph.GetNumJoints())
-    {
-    }
+    explicit Header(IndexGraph const & graph) : m_numRoads(graph.GetNumRoads()), m_numJoints(graph.GetNumJoints()) {}
 
     template <class Sink>
     void Serialize(Sink & sink) const
@@ -266,8 +260,8 @@ private:
       {
         Joint::Id const convertedId = it->second;
         CHECK_LESS(convertedId, m_count,
-                   ("Duplicate joint id should be less than count, convertedId =", convertedId,
-                    ", count =", m_count, ", originalId =", originalId));
+                   ("Duplicate joint id should be less than count, convertedId =", convertedId, ", count =", m_count,
+                    ", originalId =", originalId));
         writer.Write(kRepeatJointIdBit, 1);
         // m_count - convertedId is less than convertedId in general.
         // So write this delta to save file space.
@@ -346,7 +340,8 @@ private:
 
     // Joints number is large.
     // Therefore point id and joint id are stored in same space to save some memory.
-    union Point {
+    union Point
+    {
       uint32_t pointId;
       Joint::Id jointId;
     };
@@ -385,8 +380,7 @@ private:
     std::vector<uint8_t> m_buffer;
   };
 
-  static VehicleMask GetRoadMask(std::unordered_map<uint32_t, VehicleMask> const & masks,
-                                 uint32_t featureId);
+  static VehicleMask GetRoadMask(std::unordered_map<uint32_t, VehicleMask> const & masks, uint32_t featureId);
   static uint32_t ConvertJointsNumber(uint32_t jointsNumber);
   static void PrepareSectionSerializers(IndexGraph const & graph,
                                         std::unordered_map<uint32_t, VehicleMask> const & masks,
diff --git a/libs/routing/index_graph_starter.cpp b/libs/routing/index_graph_starter.cpp
index d9974c33a..fa53ff5e8 100644
--- a/libs/routing/index_graph_starter.cpp
+++ b/libs/routing/index_graph_starter.cpp
@@ -12,7 +12,6 @@
 #include <algorithm>
 #include <map>
 
-
 namespace routing
 {
 using namespace std;
@@ -35,9 +34,8 @@ void IndexGraphStarter::CheckValidRoute(vector<Segment> const & segments)
   CHECK(IsFakeSegment(segments.back()), ());
 }
 
-IndexGraphStarter::IndexGraphStarter(FakeEnding const & startEnding,
-                                     FakeEnding const & finishEnding, uint32_t fakeNumerationStart,
-                                     bool strictForward, WorldGraph & graph)
+IndexGraphStarter::IndexGraphStarter(FakeEnding const & startEnding, FakeEnding const & finishEnding,
+                                     uint32_t fakeNumerationStart, bool strictForward, WorldGraph & graph)
   : m_graph(graph)
 {
   m_fakeNumerationStart = fakeNumerationStart;
@@ -68,7 +66,10 @@ void IndexGraphStarter::Append(FakeEdgesContainer const & container)
   m_fakeNumerationStart += container.m_fake.GetSize();
 }
 
-void IndexGraphStarter::SetGuides(GuidesGraph const & guides) { m_guides = guides; }
+void IndexGraphStarter::SetGuides(GuidesGraph const & guides)
+{
+  m_guides = guides;
+}
 
 void IndexGraphStarter::SetRegionsGraphMode(std::shared_ptr<RegionsSparseGraph> regionsSparseGraph)
 {
@@ -108,13 +109,12 @@ LatLonWithAltitude const & IndexGraphStarter::GetJunction(Segment const & segmen
   return front ? vertex.GetJunctionTo() : vertex.GetJunctionFrom();
 }
 
-LatLonWithAltitude const & IndexGraphStarter::GetRouteJunction(
-    vector<Segment> const & segments, size_t pointIndex) const
+LatLonWithAltitude const & IndexGraphStarter::GetRouteJunction(vector<Segment> const & segments,
+                                                               size_t pointIndex) const
 {
   CHECK(!segments.empty(), ());
-  CHECK_LESS_OR_EQUAL(
-      pointIndex, segments.size(),
-      ("Point with index", pointIndex, "does not exist in route with size", segments.size()));
+  CHECK_LESS_OR_EQUAL(pointIndex, segments.size(),
+                      ("Point with index", pointIndex, "does not exist in route with size", segments.size()));
   if (pointIndex == segments.size())
     return GetJunction(segments[pointIndex - 1], true /* front */);
   return GetJunction(segments[pointIndex], false);
@@ -165,15 +165,14 @@ bool IndexGraphStarter::CheckLength(RouteWeight const & weight)
   /// This additional penalty will be included in RouteWeight::GetIntegratedWeight().
   /// @see RussiaMoscowNotCrossingTollRoadTest
 
-  int8_t const changesAllowed = 2 + (HasNoPassThroughAllowed(m_start) ? 1 : 0) + (HasNoPassThroughAllowed(m_finish) ? 1 : 0);
+  int8_t const changesAllowed =
+      2 + (HasNoPassThroughAllowed(m_start) ? 1 : 0) + (HasNoPassThroughAllowed(m_finish) ? 1 : 0);
 
-  return weight.GetNumPassThroughChanges() <= changesAllowed &&
-         m_graph.CheckLength(weight, m_startToFinishDistanceM);
+  return weight.GetNumPassThroughChanges() <= changesAllowed && m_graph.CheckLength(weight, m_startToFinishDistanceM);
 }
 
-void IndexGraphStarter::GetEdgesList(astar::VertexData<Vertex, Weight> const & vertexData,
-                                     bool isOutgoing, bool useAccessConditional,
-                                     EdgeListT & edges) const
+void IndexGraphStarter::GetEdgesList(astar::VertexData<Vertex, Weight> const & vertexData, bool isOutgoing,
+                                     bool useAccessConditional, EdgeListT & edges) const
 {
   edges.clear();
   CHECK_NOT_EQUAL(m_graph.GetMode(), WorldGraphMode::LeapsOnly, ());
@@ -199,23 +198,19 @@ void IndexGraphStarter::GetEdgesList(astar::VertexData<Vertex, Weight> const & v
         }
         else if (IsRegionsGraphMode())
         {
-          m_regionsGraph->GetEdgeList(real, isOutgoing, edges,
-                                      GetJunction(segment, true /* front */).GetLatLon());
+          m_regionsGraph->GetEdgeList(real, isOutgoing, edges, GetJunction(segment, true /* front */).GetLatLon());
         }
         else
         {
           astar::VertexData const replacedFakeSegment(real, vertexData.m_realDistance);
-          m_graph.GetEdgeList(replacedFakeSegment, isOutgoing, true /* useRoutingOptions */,
-                              useAccessConditional, edges);
+          m_graph.GetEdgeList(replacedFakeSegment, isOutgoing, true /* useRoutingOptions */, useAccessConditional,
+                              edges);
         }
       }
     }
 
     for (auto const & s : m_fake.GetEdges(segment, isOutgoing))
-    {
-      edges.emplace_back(s, isOutgoing ? CalcSegmentWeight(s, EdgeEstimator::Purpose::Weight)
-                                       : ingoingSegmentWeight);
-    }
+      edges.emplace_back(s, isOutgoing ? CalcSegmentWeight(s, EdgeEstimator::Purpose::Weight) : ingoingSegmentWeight);
   }
   else if (IsGuidesSegment(segment))
   {
@@ -223,20 +218,17 @@ void IndexGraphStarter::GetEdgesList(astar::VertexData<Vertex, Weight> const & v
   }
   else if (IsRegionsGraphMode())
   {
-    m_regionsGraph->GetEdgeList(segment, isOutgoing, edges,
-                                GetJunction(segment, true /* front */).GetLatLon());
+    m_regionsGraph->GetEdgeList(segment, isOutgoing, edges, GetJunction(segment, true /* front */).GetLatLon());
   }
   else
   {
-    m_graph.GetEdgeList(vertexData, isOutgoing, true /* useRoutingOptions */, useAccessConditional,
-                        edges);
+    m_graph.GetEdgeList(vertexData, isOutgoing, true /* useRoutingOptions */, useAccessConditional, edges);
   }
 
   AddFakeEdges(segment, isOutgoing, edges);
 }
 
-RouteWeight IndexGraphStarter::CalcGuidesSegmentWeight(Segment const & segment,
-                                                       EdgeEstimator::Purpose purpose) const
+RouteWeight IndexGraphStarter::CalcGuidesSegmentWeight(Segment const & segment, EdgeEstimator::Purpose purpose) const
 {
   if (purpose == EdgeEstimator::Purpose::Weight)
     return m_guides.CalcSegmentWeight(segment);
@@ -245,8 +237,7 @@ RouteWeight IndexGraphStarter::CalcGuidesSegmentWeight(Segment const & segment,
   return m_graph.CalcOffroadWeight(from.GetLatLon(), to.GetLatLon(), purpose);
 }
 
-RouteWeight IndexGraphStarter::CalcSegmentWeight(Segment const & segment,
-                                                 EdgeEstimator::Purpose purpose) const
+RouteWeight IndexGraphStarter::CalcSegmentWeight(Segment const & segment, EdgeEstimator::Purpose purpose) const
 {
   if (IsGuidesSegment(segment))
     return CalcGuidesSegmentWeight(segment, purpose);
@@ -313,10 +304,7 @@ double IndexGraphStarter::CalculateETA(Segment const & from, Segment const & to)
   }
 
   if (IsRegionsGraphMode())
-  {
-    return m_regionsGraph->CalcSegmentWeight(from).GetWeight() +
-           m_regionsGraph->CalcSegmentWeight(to).GetWeight();
-  }
+    return m_regionsGraph->CalcSegmentWeight(from).GetWeight() + m_regionsGraph->CalcSegmentWeight(to).GetWeight();
 
   return m_graph.CalculateETA(from, to);
 }
@@ -362,10 +350,9 @@ void IndexGraphStarter::AddEnding(FakeEnding const & thisEnding)
     {
       // Add projection edges
       auto const projectionSegment = GetFakeSegmentAndIncr();
-      FakeVertex projectionVertex(projection.m_segment.GetMwmId(),
-                                  isStart ? thisEnding.m_originJunction : projection.m_junction,
-                                  isStart ? projection.m_junction : thisEnding.m_originJunction,
-                                  FakeVertex::Type::PureFake);
+      FakeVertex projectionVertex(
+          projection.m_segment.GetMwmId(), isStart ? thisEnding.m_originJunction : projection.m_junction,
+          isStart ? projection.m_junction : thisEnding.m_originJunction, FakeVertex::Type::PureFake);
       m_fake.AddVertex(fakeSegment, projectionSegment, projectionVertex, isStart /* isOutgoing */,
                        false /* isPartOfReal */, dummy /* realSegment */);
 
@@ -401,26 +388,24 @@ void IndexGraphStarter::AddEnding(FakeEnding const & thisEnding)
           frontJunction = backJunction = otherJunction;
       }
 
-      FakeVertex forwardPartOfReal(
-          projection.m_segment.GetMwmId(), isStart ? projection.m_junction : backJunction,
-          isStart ? frontJunction : projection.m_junction, FakeVertex::Type::PartOfReal);
+      FakeVertex forwardPartOfReal(projection.m_segment.GetMwmId(), isStart ? projection.m_junction : backJunction,
+                                   isStart ? frontJunction : projection.m_junction, FakeVertex::Type::PartOfReal);
       Segment fakeForwardSegment;
       if (!m_fake.FindSegment(forwardPartOfReal, fakeForwardSegment))
         fakeForwardSegment = GetFakeSegmentAndIncr();
-      m_fake.AddVertex(projectionSegment, fakeForwardSegment, forwardPartOfReal,
-                       isStart /* isOutgoing */, true /* isPartOfReal */, projection.m_segment);
+      m_fake.AddVertex(projectionSegment, fakeForwardSegment, forwardPartOfReal, isStart /* isOutgoing */,
+                       true /* isPartOfReal */, projection.m_segment);
 
       if (!projection.m_isOneWay)
       {
         auto const backwardSegment = projection.m_segment.GetReversed();
-        FakeVertex backwardPartOfReal(
-            backwardSegment.GetMwmId(), isStart ? projection.m_junction : frontJunction,
-            isStart ? backJunction : projection.m_junction, FakeVertex::Type::PartOfReal);
+        FakeVertex backwardPartOfReal(backwardSegment.GetMwmId(), isStart ? projection.m_junction : frontJunction,
+                                      isStart ? backJunction : projection.m_junction, FakeVertex::Type::PartOfReal);
         Segment fakeBackwardSegment;
         if (!m_fake.FindSegment(backwardPartOfReal, fakeBackwardSegment))
           fakeBackwardSegment = GetFakeSegmentAndIncr();
-        m_fake.AddVertex(projectionSegment, fakeBackwardSegment, backwardPartOfReal,
-                         isStart /* isOutgoing */, true /* isPartOfReal */, backwardSegment);
+        m_fake.AddVertex(projectionSegment, fakeBackwardSegment, backwardPartOfReal, isStart /* isOutgoing */,
+                         true /* isPartOfReal */, backwardSegment);
       }
     }
   }
@@ -428,8 +413,8 @@ void IndexGraphStarter::AddEnding(FakeEnding const & thisEnding)
   m_otherEndings.push_back(thisEnding);
 }
 
-void IndexGraphStarter::AddEnding(FakeEnding const & thisEnding, FakeEnding const & otherEnding,
-                                  bool isStart, bool strictForward)
+void IndexGraphStarter::AddEnding(FakeEnding const & thisEnding, FakeEnding const & otherEnding, bool isStart,
+                                  bool strictForward)
 {
   Segment const dummy = Segment();
 
@@ -456,10 +441,9 @@ void IndexGraphStarter::AddEnding(FakeEnding const & thisEnding, FakeEnding cons
 
     // Add projection edges
     auto const projectionSegment = GetFakeSegmentAndIncr();
-    FakeVertex projectionVertex(projection.m_segment.GetMwmId(),
-                                isStart ? thisEnding.m_originJunction : projection.m_junction,
-                                isStart ? projection.m_junction : thisEnding.m_originJunction,
-                                FakeVertex::Type::PureFake);
+    FakeVertex projectionVertex(
+        projection.m_segment.GetMwmId(), isStart ? thisEnding.m_originJunction : projection.m_junction,
+        isStart ? projection.m_junction : thisEnding.m_originJunction, FakeVertex::Type::PureFake);
     m_fake.AddVertex(fakeSegment, projectionSegment, projectionVertex, isStart /* isOutgoing */,
                      false /* isPartOfReal */, dummy /* realSegment */);
 
@@ -472,10 +456,8 @@ void IndexGraphStarter::AddEnding(FakeEnding const & thisEnding, FakeEnding cons
     if (it != otherSegments.end())
     {
       auto const & otherJunction = it->second;
-      auto const distBackToThis = ms::DistanceOnEarth(backJunction.GetLatLon(),
-                                                      projection.m_junction.GetLatLon());
-      auto const distBackToOther = ms::DistanceOnEarth(backJunction.GetLatLon(),
-                                                       otherJunction.GetLatLon());
+      auto const distBackToThis = ms::DistanceOnEarth(backJunction.GetLatLon(), projection.m_junction.GetLatLon());
+      auto const distBackToOther = ms::DistanceOnEarth(backJunction.GetLatLon(), otherJunction.GetLatLon());
       if (distBackToThis < distBackToOther)
         frontJunction = otherJunction;
       else if (distBackToOther < distBackToThis)
@@ -484,33 +466,31 @@ void IndexGraphStarter::AddEnding(FakeEnding const & thisEnding, FakeEnding cons
         frontJunction = backJunction = otherJunction;
     }
 
-    FakeVertex forwardPartOfReal(
-        projection.m_segment.GetMwmId(), isStart ? projection.m_junction : backJunction,
-        isStart ? frontJunction : projection.m_junction, FakeVertex::Type::PartOfReal);
+    FakeVertex forwardPartOfReal(projection.m_segment.GetMwmId(), isStart ? projection.m_junction : backJunction,
+                                 isStart ? frontJunction : projection.m_junction, FakeVertex::Type::PartOfReal);
     Segment fakeForwardSegment;
     if (!m_fake.FindSegment(forwardPartOfReal, fakeForwardSegment))
       fakeForwardSegment = GetFakeSegmentAndIncr();
-    m_fake.AddVertex(projectionSegment, fakeForwardSegment, forwardPartOfReal,
-                     isStart /* isOutgoing */, true /* isPartOfReal */, projection.m_segment);
+    m_fake.AddVertex(projectionSegment, fakeForwardSegment, forwardPartOfReal, isStart /* isOutgoing */,
+                     true /* isPartOfReal */, projection.m_segment);
 
     if (!strictForward && !projection.m_isOneWay)
     {
       auto const backwardSegment = projection.m_segment.GetReversed();
-      FakeVertex backwardPartOfReal(
-          backwardSegment.GetMwmId(), isStart ? projection.m_junction : frontJunction,
-          isStart ? backJunction : projection.m_junction, FakeVertex::Type::PartOfReal);
+      FakeVertex backwardPartOfReal(backwardSegment.GetMwmId(), isStart ? projection.m_junction : frontJunction,
+                                    isStart ? backJunction : projection.m_junction, FakeVertex::Type::PartOfReal);
       Segment fakeBackwardSegment;
       if (!m_fake.FindSegment(backwardPartOfReal, fakeBackwardSegment))
         fakeBackwardSegment = GetFakeSegmentAndIncr();
-      m_fake.AddVertex(projectionSegment, fakeBackwardSegment, backwardPartOfReal,
-                       isStart /* isOutgoing */, true /* isPartOfReal */, backwardSegment);
+      m_fake.AddVertex(projectionSegment, fakeBackwardSegment, backwardPartOfReal, isStart /* isOutgoing */,
+                       true /* isPartOfReal */, backwardSegment);
     }
   }
 }
 
-void IndexGraphStarter::ConnectLoopToGuideSegments(
-    FakeVertex const & loop, Segment const & realSegment, LatLonWithAltitude realFrom,
-    LatLonWithAltitude realTo, vector<pair<FakeVertex, Segment>> const & partsOfReal)
+void IndexGraphStarter::ConnectLoopToGuideSegments(FakeVertex const & loop, Segment const & realSegment,
+                                                   LatLonWithAltitude realFrom, LatLonWithAltitude realTo,
+                                                   vector<pair<FakeVertex, Segment>> const & partsOfReal)
 {
   m_fake.ConnectLoopToGuideSegments(loop, realSegment, realFrom, realTo, partsOfReal);
 }
@@ -532,23 +512,23 @@ HighwayCategory IndexGraphStarter::GetHighwayCategory(Segment seg) const
 
   switch (*hwType)
   {
-  case HighwayType::HighwayMotorway: case HighwayType::HighwayMotorwayLink:
-  case HighwayType::HighwayTrunk: case HighwayType::HighwayTrunkLink:
-    return HighwayCategory::Major;
-  case HighwayType::HighwayPrimary: case HighwayType::HighwayPrimaryLink:
-    return HighwayCategory::Primary;
-  case HighwayType::HighwaySecondary: case HighwayType::HighwaySecondaryLink:
-  case HighwayType::HighwayTertiary: case HighwayType::HighwayTertiaryLink:
-    return HighwayCategory::Usual;
-  case HighwayType::RouteFerry: case HighwayType::RouteShuttleTrain:
-    return HighwayCategory::Transit;
-  default:
-    return HighwayCategory::Minor;
+  case HighwayType::HighwayMotorway:
+  case HighwayType::HighwayMotorwayLink:
+  case HighwayType::HighwayTrunk:
+  case HighwayType::HighwayTrunkLink: return HighwayCategory::Major;
+  case HighwayType::HighwayPrimary:
+  case HighwayType::HighwayPrimaryLink: return HighwayCategory::Primary;
+  case HighwayType::HighwaySecondary:
+  case HighwayType::HighwaySecondaryLink:
+  case HighwayType::HighwayTertiary:
+  case HighwayType::HighwayTertiaryLink: return HighwayCategory::Usual;
+  case HighwayType::RouteFerry:
+  case HighwayType::RouteShuttleTrain: return HighwayCategory::Transit;
+  default: return HighwayCategory::Minor;
   }
 }
 
-void IndexGraphStarter::AddStart(FakeEnding const & startEnding, FakeEnding const & finishEnding,
-                                 bool strictForward)
+void IndexGraphStarter::AddStart(FakeEnding const & startEnding, FakeEnding const & finishEnding, bool strictForward)
 {
   AddEnding(startEnding, finishEnding, true /* isStart */, strictForward);
   m_start.FillMwmIds();
@@ -569,20 +549,17 @@ void IndexGraphStarter::AddFakeEdges(Segment const & segment, bool isOutgoing, E
     {
       //     |segment|       |s|
       //  *------------>*----------->
-      bool const sIsOutgoing =
-          GetJunction(segment, true /* front */) == GetJunction(s, false /* front */);
+      bool const sIsOutgoing = GetJunction(segment, true /* front */) == GetJunction(s, false /* front */);
 
       //        |s|       |segment|
       //  *------------>*----------->
-      bool const sIsIngoing =
-          GetJunction(s, true /* front */) == GetJunction(segment, false /* front */);
+      bool const sIsIngoing = GetJunction(s, true /* front */) == GetJunction(segment, false /* front */);
 
       if ((isOutgoing && sIsOutgoing) || (!isOutgoing && sIsIngoing))
       {
         // For ingoing edges we use source weight which is the same for |s| and for |edge| and is
         // already calculated.
-        fakeEdges.emplace_back(s, isOutgoing ? CalcSegmentWeight(s, EdgeEstimator::Purpose::Weight)
-                                             : edge.GetWeight());
+        fakeEdges.emplace_back(s, isOutgoing ? CalcSegmentWeight(s, EdgeEstimator::Purpose::Weight) : edge.GetWeight());
       }
     }
   }
@@ -616,7 +593,6 @@ RouteWeight IndexGraphStarter::GetAStarWeightEpsilon()
   // We store points with |kMwmPointAccuracy|. In case of cross mwm routing we couldn't
   // distinguish the point geometry changing in |kMwmPointAccuracy| radius of the same segments from
   // mwms with different versions. So let's use such epsilon to maintain the A* invariant.
-  return kEps +
-         m_graph.HeuristicCostEstimate(ms::LatLon(0.0, 0.0), ms::LatLon(0.0, kMwmPointAccuracy));
+  return kEps + m_graph.HeuristicCostEstimate(ms::LatLon(0.0, 0.0), ms::LatLon(0.0, kMwmPointAccuracy));
 }
 }  // namespace routing
diff --git a/libs/routing/index_graph_starter.hpp b/libs/routing/index_graph_starter.hpp
index 05af5d5ea..a6838c2c0 100644
--- a/libs/routing/index_graph_starter.hpp
+++ b/libs/routing/index_graph_starter.hpp
@@ -28,7 +28,12 @@ class RegionsSparseGraph;
 enum class HighwayCategory : uint8_t
 {
   // Do not change order!
-  Major, Primary, Usual, Minor, Transit, Unknown
+  Major,
+  Primary,
+  Usual,
+  Minor,
+  Transit,
+  Unknown
 };
 
 // IndexGraphStarter adds fake start and finish vertices for AStarAlgorithm.
@@ -45,10 +50,7 @@ public:
 
   static void CheckValidRoute(std::vector<Segment> const & segments);
 
-  static bool IsFakeSegment(Segment const & segment)
-  {
-    return segment.IsFakeCreated();
-  }
+  static bool IsFakeSegment(Segment const & segment) { return segment.IsFakeCreated(); }
 
   static bool IsGuidesSegment(Segment const & segment)
   {
@@ -58,8 +60,8 @@ public:
   // strictForward flag specifies which parts of real segment should be placed from the start
   // vertex. true: place exactly one fake edge to the m_segment indicated with m_forward. false:
   // place two fake edges to the m_segment with both directions.
-  IndexGraphStarter(FakeEnding const & startEnding, FakeEnding const & finishEnding,
-                    uint32_t fakeNumerationStart, bool strictForward, WorldGraph & graph);
+  IndexGraphStarter(FakeEnding const & startEnding, FakeEnding const & finishEnding, uint32_t fakeNumerationStart,
+                    bool strictForward, WorldGraph & graph);
 
   void Append(FakeEdgesContainer const & container);
 
@@ -79,17 +81,13 @@ public:
   // Otherwise returns false and does not modify segment.
   bool ConvertToReal(Segment & segment) const;
   LatLonWithAltitude const & GetJunction(Segment const & segment, bool front) const;
-  LatLonWithAltitude const & GetRouteJunction(std::vector<Segment> const & route,
-                                                       size_t pointIndex) const;
+  LatLonWithAltitude const & GetRouteJunction(std::vector<Segment> const & route, size_t pointIndex) const;
   ms::LatLon const & GetPoint(Segment const & segment, bool front) const;
 
   bool IsRoutingOptionsGood(Segment const & segment) const;
   RoutingOptions GetRoutingOptions(Segment const & segment) const;
 
-  uint32_t GetNumFakeSegments() const
-  {
-    return base::checked_cast<uint32_t>(m_fake.GetSize());
-  }
+  uint32_t GetNumFakeSegments() const { return base::checked_cast<uint32_t>(m_fake.GetSize()); }
 
   std::set<NumMwmId> GetMwms() const;
   std::set<NumMwmId> const & GetStartMwms() const { return m_start.m_mwmIds; }
@@ -99,43 +97,33 @@ public:
   // start and finish in pass-through/non-pass-through area and number of non-pass-through crosses.
   bool CheckLength(RouteWeight const & weight);
 
-  void GetEdgeList(astar::VertexData<JointSegment, Weight> const & parentVertexData,
-                   Segment const & segment, bool isOutgoing, JointEdgeListT & edges,
-                   WeightListT & parentWeights) const
+  void GetEdgeList(astar::VertexData<JointSegment, Weight> const & parentVertexData, Segment const & segment,
+                   bool isOutgoing, JointEdgeListT & edges, WeightListT & parentWeights) const
   {
-    return m_graph.GetEdgeList(parentVertexData, segment, isOutgoing,
-                               true /* useAccessConditional */, edges, parentWeights);
+    return m_graph.GetEdgeList(parentVertexData, segment, isOutgoing, true /* useAccessConditional */, edges,
+                               parentWeights);
   }
 
   // AStarGraph overridings:
   // @{
-  void GetOutgoingEdgesList(astar::VertexData<Vertex, Weight> const & vertexData,
-                            EdgeListT & edges) override
+  void GetOutgoingEdgesList(astar::VertexData<Vertex, Weight> const & vertexData, EdgeListT & edges) override
   {
     GetEdgesList(vertexData, true /* isOutgoing */, true /* useAccessConditional */, edges);
   }
 
-  void GetIngoingEdgesList(astar::VertexData<Vertex, Weight> const & vertexData,
-                           EdgeListT & edges) override
+  void GetIngoingEdgesList(astar::VertexData<Vertex, Weight> const & vertexData, EdgeListT & edges) override
   {
     GetEdgesList(vertexData, false /* isOutgoing */, true /* useAccessConditional */, edges);
   }
 
   RouteWeight HeuristicCostEstimate(Vertex const & from, Vertex const & to) override
   {
-    return m_graph.HeuristicCostEstimate(GetPoint(from, true /* front */),
-                                         GetPoint(to, true /* front */));
+    return m_graph.HeuristicCostEstimate(GetPoint(from, true /* front */), GetPoint(to, true /* front */));
   }
 
-  void SetAStarParents(bool forward, Parents<Segment> & parents) override
-  {
-    m_graph.SetAStarParents(forward, parents);
-  }
+  void SetAStarParents(bool forward, Parents<Segment> & parents) override { m_graph.SetAStarParents(forward, parents); }
 
-  void DropAStarParents() override
-  {
-    m_graph.DropAStarParents();
-  }
+  void DropAStarParents() override { m_graph.DropAStarParents(); }
 
   bool AreWavesConnectible(Parents<Segment> & forwardParents, Vertex const & commonVertex,
                            Parents<Segment> & backwardParents) override
@@ -157,17 +145,13 @@ public:
   }
 
   RouteWeight CalcSegmentWeight(Segment const & segment, EdgeEstimator::Purpose purpose) const;
-  RouteWeight CalcGuidesSegmentWeight(Segment const & segment,
-                                      EdgeEstimator::Purpose purpose) const;
+  RouteWeight CalcGuidesSegmentWeight(Segment const & segment, EdgeEstimator::Purpose purpose) const;
   double CalculateETA(Segment const & from, Segment const & to) const;
   double CalculateETAWithoutPenalty(Segment const & segment) const;
 
   /// @name For compatibility with IndexGraphStarterJoints.
   /// @{
-  void SetAStarParents(bool forward, Parents<JointSegment> & parents)
-  {
-    m_graph.SetAStarParents(forward, parents);
-  }
+  void SetAStarParents(bool forward, Parents<JointSegment> & parents) { m_graph.SetAStarParents(forward, parents); }
 
   bool AreWavesConnectible(Parents<JointSegment> & forwardParents, JointSegment const & commonVertex,
                            Parents<JointSegment> & backwardParents,
@@ -209,8 +193,8 @@ public:
   // Creates fake edges for guides fake ending and adds them to the fake graph.
   void AddEnding(FakeEnding const & thisEnding);
 
-  void ConnectLoopToGuideSegments(FakeVertex const & loop, Segment const & realSegment,
-                                  LatLonWithAltitude realFrom, LatLonWithAltitude realTo,
+  void ConnectLoopToGuideSegments(FakeVertex const & loop, Segment const & realSegment, LatLonWithAltitude realFrom,
+                                  LatLonWithAltitude realTo,
                                   std::vector<std::pair<FakeVertex, Segment>> const & partsOfReal);
 
   HighwayCategory GetHighwayCategory(Segment seg) const;
@@ -218,8 +202,7 @@ public:
 private:
   // Creates fake edges for fake ending and adds it to fake graph. |otherEnding| is used to
   // generate proper fake edges in case both endings have projections to the same segment.
-  void AddEnding(FakeEnding const & thisEnding, FakeEnding const & otherEnding, bool isStart,
-                 bool strictForward);
+  void AddEnding(FakeEnding const & thisEnding, FakeEnding const & otherEnding, bool isStart, bool strictForward);
 
   static Segment GetFakeSegment(uint32_t segmentIdx)
   {
@@ -231,11 +214,10 @@ private:
 
   Segment GetFakeSegmentAndIncr();
 
-  void GetEdgesList(astar::VertexData<Vertex, Weight> const & vertexData, bool isOutgoing,
-                    bool useAccessConditional, EdgeListT & edges) const;
+  void GetEdgesList(astar::VertexData<Vertex, Weight> const & vertexData, bool isOutgoing, bool useAccessConditional,
+                    EdgeListT & edges) const;
 
-  void AddStart(FakeEnding const & startEnding, FakeEnding const & finishEnding,
-                bool strictForward);
+  void AddStart(FakeEnding const & startEnding, FakeEnding const & finishEnding, bool strictForward);
   void AddFinish(FakeEnding const & finishEnding, FakeEnding const & startEnding);
 
   // Adds fake edges of type PartOfReal which correspond real edges from |edges| and are connected
diff --git a/libs/routing/index_graph_starter_joints.hpp b/libs/routing/index_graph_starter_joints.hpp
index 9101b4576..e6c260978 100644
--- a/libs/routing/index_graph_starter_joints.hpp
+++ b/libs/routing/index_graph_starter_joints.hpp
@@ -18,7 +18,6 @@
 #include <queue>
 #include <vector>
 
-
 namespace routing
 {
 enum class WorldGraphMode;
@@ -28,12 +27,9 @@ class IndexGraphStarterJoints : public AStarGraph<JointSegment, JointEdge, Route
 {
 public:
   explicit IndexGraphStarterJoints(Graph & graph) : m_graph(graph) {}
-  IndexGraphStarterJoints(Graph & graph,
-                          Segment const & startSegment,
-                          Segment const & endSegment);
+  IndexGraphStarterJoints(Graph & graph, Segment const & startSegment, Segment const & endSegment);
 
-  IndexGraphStarterJoints(Graph & graph,
-                          Segment const & startSegment);
+  IndexGraphStarterJoints(Graph & graph, Segment const & startSegment);
 
   void Init(Segment const & startSegment, Segment const & endSegment);
 
@@ -48,30 +44,21 @@ public:
   // @{
   RouteWeight HeuristicCostEstimate(Vertex const & from, Vertex const & to) override;
 
-  void GetOutgoingEdgesList(astar::VertexData<Vertex, Weight> const & vertexData,
-                            EdgeListT & edges) override
+  void GetOutgoingEdgesList(astar::VertexData<Vertex, Weight> const & vertexData, EdgeListT & edges) override
   {
     GetEdgeList(vertexData, true /* isOutgoing */, edges);
   }
 
-  void GetIngoingEdgesList(astar::VertexData<Vertex, Weight> const & vertexData,
-                           EdgeListT & edges) override
+  void GetIngoingEdgesList(astar::VertexData<Vertex, Weight> const & vertexData, EdgeListT & edges) override
   {
     GetEdgeList(vertexData, false /* isOutgoing */, edges);
   }
 
-  void SetAStarParents(bool forward, Parents & parents) override
-  {
-    m_graph.SetAStarParents(forward, parents);
-  }
+  void SetAStarParents(bool forward, Parents & parents) override { m_graph.SetAStarParents(forward, parents); }
 
-  void DropAStarParents() override
-  {
-    m_graph.DropAStarParents();
-  }
+  void DropAStarParents() override { m_graph.DropAStarParents(); }
 
-  bool AreWavesConnectible(Parents & forwardParents, Vertex const & commonVertex,
-                           Parents & backwardParents) override
+  bool AreWavesConnectible(Parents & forwardParents, Vertex const & commonVertex, Parents & backwardParents) override
   {
     auto const converter = [&](JointSegment & vertex)
     {
@@ -99,10 +86,7 @@ public:
 
   void Reset();
 
-  static bool IsRealSegment(Segment const & segment)
-  {
-    return !segment.IsFakeCreated();
-  }
+  static bool IsRealSegment(Segment const & segment) { return !segment.IsFakeCreated(); }
 
   Segment const & GetSegmentOfFakeJoint(JointSegment const & joint, bool start) const
   {
@@ -121,13 +105,9 @@ private:
   struct FakeJointSegment
   {
     FakeJointSegment() = default;
-    FakeJointSegment(Segment const & start, Segment const & end)
-      : m_start(start), m_end(end) {}
+    FakeJointSegment(Segment const & start, Segment const & end) : m_start(start), m_end(end) {}
 
-    Segment const & GetSegment(bool start) const
-    {
-      return start ? m_start : m_end;
-    }
+    Segment const & GetSegment(bool start) const { return start ? m_start : m_end; }
 
     Segment m_start;
     Segment m_end;
@@ -137,30 +117,19 @@ private:
 
   void AddFakeJoints(Segment const & segment, bool isOutgoing, EdgeListT & edges);
 
-  void GetEdgeList(astar::VertexData<Vertex, Weight> const & vertexData, bool isOutgoing,
-                   EdgeListT & edges);
+  void GetEdgeList(astar::VertexData<Vertex, Weight> const & vertexData, bool isOutgoing, EdgeListT & edges);
 
   JointSegment CreateFakeJoint(Segment const & from, Segment const & to, uint32_t featureId = kInvalidFeatureId);
 
-  bool IsJoint(Segment const & segment, bool fromStart) const
-  {
-    return m_graph.IsJoint(segment, fromStart);
-  }
+  bool IsJoint(Segment const & segment, bool fromStart) const { return m_graph.IsJoint(segment, fromStart); }
 
-  bool IsJointOrEnd(Segment const & segment, bool fromStart) const
-  {
-    return m_graph.IsJointOrEnd(segment, fromStart);
-  }
+  bool IsJointOrEnd(Segment const & segment, bool fromStart) const { return m_graph.IsJointOrEnd(segment, fromStart); }
 
   using WeightListT = typename Graph::WeightListT;
-  bool FillEdgesAndParentsWeights(astar::VertexData<Vertex, Weight> const & vertexData,
-                                  bool isOutgoing,
-                                  size_t & firstFakeId,
-                                  EdgeListT & edges,
-                                  WeightListT & parentWeights);
+  bool FillEdgesAndParentsWeights(astar::VertexData<Vertex, Weight> const & vertexData, bool isOutgoing,
+                                  size_t & firstFakeId, EdgeListT & edges, WeightListT & parentWeights);
 
-  std::optional<Segment> GetParentSegment(JointSegment const & vertex, bool isOutgoing,
-                                          EdgeListT & edges);
+  std::optional<Segment> GetParentSegment(JointSegment const & vertex, bool isOutgoing, EdgeListT & edges);
 
   /// \brief Makes BFS from |startSegment| in direction |fromStart| and find the closest segments
   /// which end RoadPoints are joints. Thus we build fake joint segments graph.
@@ -175,7 +144,7 @@ private:
 
     return jointSegment.GetStartSegmentId() == jointSegment.GetEndSegmentId() &&
            (jointSegment.GetStartSegmentId() == kInvisibleStartId ||
-           jointSegment.GetStartSegmentId() == kInvisibleEndId) &&
+            jointSegment.GetStartSegmentId() == kInvisibleEndId) &&
            jointSegment.GetStartSegmentId() != kInvalidId;
   }
 
@@ -210,8 +179,7 @@ private:
   struct ReconstructedPath
   {
     ReconstructedPath() = default;
-    ReconstructedPath(std::vector<Segment> && path, bool fromStart)
-      : m_fromStart(fromStart), m_path(std::move(path)) {}
+    ReconstructedPath(std::vector<Segment> && path, bool fromStart) : m_fromStart(fromStart), m_path(std::move(path)) {}
 
     bool m_fromStart = true;
     std::vector<Segment> m_path;
@@ -229,18 +197,19 @@ private:
 };
 
 template <typename Graph>
-IndexGraphStarterJoints<Graph>::IndexGraphStarterJoints(Graph & graph,
-                                                        Segment const & startSegment,
+IndexGraphStarterJoints<Graph>::IndexGraphStarterJoints(Graph & graph, Segment const & startSegment,
                                                         Segment const & endSegment)
-  : m_graph(graph), m_startSegment(startSegment), m_endSegment(endSegment)
+  : m_graph(graph)
+  , m_startSegment(startSegment)
+  , m_endSegment(endSegment)
 {
   Init(m_startSegment, m_endSegment);
 }
 
 template <typename Graph>
-IndexGraphStarterJoints<Graph>::IndexGraphStarterJoints(Graph & graph,
-                                                        Segment const & startSegment)
-  : m_graph(graph), m_startSegment(startSegment)
+IndexGraphStarterJoints<Graph>::IndexGraphStarterJoints(Graph & graph, Segment const & startSegment)
+  : m_graph(graph)
+  , m_startSegment(startSegment)
 {
   InitEnding(startSegment, true /* start */);
 
@@ -294,8 +263,7 @@ void IndexGraphStarterJoints<Graph>::InitEnding(Segment const & ending, bool sta
 }
 
 template <typename Graph>
-RouteWeight IndexGraphStarterJoints<Graph>::HeuristicCostEstimate(JointSegment const & from,
-                                                                  JointSegment const & to)
+RouteWeight IndexGraphStarterJoints<Graph>::HeuristicCostEstimate(JointSegment const & from, JointSegment const & to)
 {
   ASSERT(to == m_startJoint || to == m_endJoint, ("Invariant violated."));
 
@@ -355,8 +323,7 @@ std::vector<Segment> IndexGraphStarterJoints<Graph>::ReconstructJoint(JointSegme
 }
 
 template <typename Graph>
-void IndexGraphStarterJoints<Graph>::AddFakeJoints(Segment const & segment, bool isOutgoing,
-                                                   EdgeListT & edges)
+void IndexGraphStarterJoints<Graph>::AddFakeJoints(Segment const & segment, bool isOutgoing, EdgeListT & edges)
 {
   // If |isOutgoing| is true, we need real segments, that are real parts
   // of fake joints, entered to finish and vice versa.
@@ -381,8 +348,8 @@ void IndexGraphStarterJoints<Graph>::AddFakeJoints(Segment const & segment, bool
 }
 
 template <typename Graph>
-std::optional<Segment> IndexGraphStarterJoints<Graph>::GetParentSegment(
-    JointSegment const & vertex, bool isOutgoing, EdgeListT & edges)
+std::optional<Segment> IndexGraphStarterJoints<Graph>::GetParentSegment(JointSegment const & vertex, bool isOutgoing,
+                                                                        EdgeListT & edges)
 {
   std::optional<Segment> parentSegment;
   bool const opposite = !isOutgoing;
@@ -430,10 +397,9 @@ std::optional<Segment> IndexGraphStarterJoints<Graph>::GetParentSegment(
 }
 
 template <typename Graph>
-bool IndexGraphStarterJoints<Graph>::FillEdgesAndParentsWeights(
-    astar::VertexData<Vertex, Weight> const & vertexData,
-    bool isOutgoing, size_t & firstFakeId,
-    EdgeListT & edges, WeightListT & parentWeights)
+bool IndexGraphStarterJoints<Graph>::FillEdgesAndParentsWeights(astar::VertexData<Vertex, Weight> const & vertexData,
+                                                                bool isOutgoing, size_t & firstFakeId,
+                                                                EdgeListT & edges, WeightListT & parentWeights)
 {
   auto const & vertex = vertexData.m_vertex;
   // Case of fake start or finish joints.
@@ -480,9 +446,8 @@ bool IndexGraphStarterJoints<Graph>::FillEdgesAndParentsWeights(
 }
 
 template <typename Graph>
-void IndexGraphStarterJoints<Graph>::GetEdgeList(
-    astar::VertexData<Vertex, Weight> const & vertexData, bool isOutgoing,
-    EdgeListT & edges)
+void IndexGraphStarterJoints<Graph>::GetEdgeList(astar::VertexData<Vertex, Weight> const & vertexData, bool isOutgoing,
+                                                 EdgeListT & edges)
 {
   CHECK(m_init, ("IndexGraphStarterJoints was not initialized."));
 
@@ -515,7 +480,8 @@ void IndexGraphStarterJoints<Graph>::GetEdgeList(
       auto & w = edges[i].GetWeight();
       auto const & t = edges[i].GetTarget();
 
-      // By VNG: Revert to the MM original code, since Cross-MWM borders penalty is assigned in the end of this function.
+      // By VNG: Revert to the MM original code, since Cross-MWM borders penalty is assigned in the end of this
+      // function.
       /// @todo I still have doubts on how we "fetch" weight for ingoing edges with m_savedWeight.
       m_savedWeight[t] = w;
 
@@ -555,7 +521,7 @@ void IndexGraphStarterJoints<Graph>::GetEdgeList(
 
 template <typename Graph>
 JointSegment IndexGraphStarterJoints<Graph>::CreateFakeJoint(Segment const & from, Segment const & to,
-                                                             uint32_t featureId/* = kInvalidFeatureId*/)
+                                                             uint32_t featureId /* = kInvalidFeatureId*/)
 {
   JointSegment const result = JointSegment::MakeFake(m_fakeId++, featureId);
   m_fakeJointSegments.emplace(result, FakeJointSegment(from, to));
@@ -563,8 +529,8 @@ JointSegment IndexGraphStarterJoints<Graph>::CreateFakeJoint(Segment const & fro
 }
 
 template <typename Graph>
-typename IndexGraphStarterJoints<Graph>::EdgeListT
-IndexGraphStarterJoints<Graph>::FindFirstJoints(Segment const & startSegment, bool fromStart)
+typename IndexGraphStarterJoints<Graph>::EdgeListT IndexGraphStarterJoints<Graph>::FindFirstJoints(
+    Segment const & startSegment, bool fromStart)
 {
   Segment const & endSegment = fromStart ? m_endSegment : m_startSegment;
 
@@ -595,22 +561,19 @@ IndexGraphStarterJoints<Graph>::FindFirstJoints(Segment const & startSegment, bo
   auto const addFake = [&](Segment const & segment, Segment const & beforeConvert)
   {
     JointSegment fakeJoint;
-    fakeJoint = fromStart ? CreateFakeJoint(startSegment, segment, firstFeatureId) :
-                            CreateFakeJoint(segment, startSegment);
+    fakeJoint =
+        fromStart ? CreateFakeJoint(startSegment, segment, firstFeatureId) : CreateFakeJoint(segment, startSegment);
     result.emplace_back(fakeJoint, weight[beforeConvert]);
 
     std::vector<Segment> path = reconstructPath(beforeConvert, fromStart);
-    m_reconstructedFakeJoints.emplace(fakeJoint,
-                                      ReconstructedPath(std::move(path), fromStart));
+    m_reconstructedFakeJoints.emplace(fakeJoint, ReconstructedPath(std::move(path), fromStart));
   };
 
   auto const isEndOfSegment = [&](Segment const & fake, Segment const & segment, bool fromStart)
   {
-    bool const hasSameFront =
-        m_graph.GetPoint(fake, true /* front */) == m_graph.GetPoint(segment, true);
+    bool const hasSameFront = m_graph.GetPoint(fake, true /* front */) == m_graph.GetPoint(segment, true);
 
-    bool const hasSameBack =
-        m_graph.GetPoint(fake, false /* front */) == m_graph.GetPoint(segment, false);
+    bool const hasSameBack = m_graph.GetPoint(fake, false /* front */) == m_graph.GetPoint(segment, false);
 
     return (fromStart && hasSameFront) || (!fromStart && hasSameBack);
   };
@@ -621,8 +584,8 @@ IndexGraphStarterJoints<Graph>::FindFirstJoints(Segment const & startSegment, bo
     queue.pop();
     Segment beforeConvert = segment;
 
-    bool const isRealPart = !IsRealSegment(segment) && m_graph.ConvertToReal(segment) &&
-                            isEndOfSegment(beforeConvert, segment, fromStart);
+    bool const isRealPart =
+        !IsRealSegment(segment) && m_graph.ConvertToReal(segment) && isEndOfSegment(beforeConvert, segment, fromStart);
 
     // Get first real feature id and assign it below into future fake joint, that will pass over this feature.
     // Its important for IndexGraph::IsRestricted. See https://github.com/organicmaps/organicmaps/issues/1565.
diff --git a/libs/routing/index_road_graph.cpp b/libs/routing/index_road_graph.cpp
index f228d4f83..be8f04d52 100644
--- a/libs/routing/index_road_graph.cpp
+++ b/libs/routing/index_road_graph.cpp
@@ -13,9 +13,10 @@
 namespace routing
 {
 IndexRoadGraph::IndexRoadGraph(IndexGraphStarter & starter, std::vector<Segment> const & segments,
-                               std::vector<geometry::PointWithAltitude> const & junctions,
-                               MwmDataSource & dataSource)
-  : m_dataSource(dataSource), m_starter(starter), m_segments(segments)
+                               std::vector<geometry::PointWithAltitude> const & junctions, MwmDataSource & dataSource)
+  : m_dataSource(dataSource)
+  , m_starter(starter)
+  , m_segments(segments)
 {
   //    j0     j1     j2     j3
   //    *--s0--*--s1--*--s2--*
@@ -31,14 +32,12 @@ IndexRoadGraph::IndexRoadGraph(IndexGraphStarter & starter, std::vector<Segment>
   }
 }
 
-void IndexRoadGraph::GetOutgoingEdges(geometry::PointWithAltitude const & junction,
-                                      EdgeListT & edges) const
+void IndexRoadGraph::GetOutgoingEdges(geometry::PointWithAltitude const & junction, EdgeListT & edges) const
 {
   GetEdges(junction, true, edges);
 }
 
-void IndexRoadGraph::GetIngoingEdges(geometry::PointWithAltitude const & junction,
-                                     EdgeListT & edges) const
+void IndexRoadGraph::GetIngoingEdges(geometry::PointWithAltitude const & junction, EdgeListT & edges) const
 {
   GetEdges(junction, false, edges);
 }
@@ -69,8 +68,7 @@ void IndexRoadGraph::GetEdgeTypes(Edge const & edge, feature::TypesHolder & type
   types = feature::TypesHolder(*ft);
 }
 
-void IndexRoadGraph::GetJunctionTypes(geometry::PointWithAltitude const & junction,
-                                      feature::TypesHolder & types) const
+void IndexRoadGraph::GetJunctionTypes(geometry::PointWithAltitude const & junction, feature::TypesHolder & types) const
 {
   types = feature::TypesHolder();
 }
@@ -82,19 +80,16 @@ void IndexRoadGraph::GetRouteEdges(EdgeVector & edges) const
 
   for (Segment const & segment : m_segments)
   {
-    auto const & junctionFrom =
-        m_starter.GetJunction(segment, false /* front */).ToPointWithAltitude();
-    auto const & junctionTo =
-        m_starter.GetJunction(segment, true /* front */).ToPointWithAltitude();
+    auto const & junctionFrom = m_starter.GetJunction(segment, false /* front */).ToPointWithAltitude();
+    auto const & junctionTo = m_starter.GetJunction(segment, true /* front */).ToPointWithAltitude();
 
     if (IndexGraphStarter::IsFakeSegment(segment) || TransitGraph::IsTransitSegment(segment))
     {
       Segment real = segment;
       if (m_starter.ConvertToReal(real))
       {
-        edges.push_back(Edge::MakeFakeWithRealPart({ m_dataSource.GetMwmId(real.GetMwmId()), real.GetFeatureId() },
-                                                   segment.GetSegmentIdx(),
-                                                   real.IsForward(), real.GetSegmentIdx(),
+        edges.push_back(Edge::MakeFakeWithRealPart({m_dataSource.GetMwmId(real.GetMwmId()), real.GetFeatureId()},
+                                                   segment.GetSegmentIdx(), real.IsForward(), real.GetSegmentIdx(),
                                                    junctionFrom, junctionTo));
       }
       else
@@ -104,14 +99,13 @@ void IndexRoadGraph::GetRouteEdges(EdgeVector & edges) const
     }
     else
     {
-      edges.push_back(Edge::MakeReal({ m_dataSource.GetMwmId(segment.GetMwmId()), segment.GetFeatureId() },
+      edges.push_back(Edge::MakeReal({m_dataSource.GetMwmId(segment.GetMwmId()), segment.GetFeatureId()},
                                      segment.IsForward(), segment.GetSegmentIdx(), junctionFrom, junctionTo));
     }
   }
 }
 
-void IndexRoadGraph::GetEdges(geometry::PointWithAltitude const & junction, bool isOutgoing,
-                              EdgeListT & edges) const
+void IndexRoadGraph::GetEdges(geometry::PointWithAltitude const & junction, bool isOutgoing, EdgeListT & edges) const
 {
   edges.clear();
 
@@ -126,22 +120,21 @@ void IndexRoadGraph::GetEdges(geometry::PointWithAltitude const & junction, bool
       if (IndexGraphStarter::IsFakeSegment(segment))
         continue;
 
-      edges.push_back(Edge::MakeReal({ m_dataSource.GetMwmId(segment.GetMwmId()), segment.GetFeatureId() },
-          segment.IsForward(), segment.GetSegmentIdx(),
-          m_starter.GetJunction(segment, false /* front */).ToPointWithAltitude(),
-          m_starter.GetJunction(segment, true /* front */).ToPointWithAltitude()));
+      edges.push_back(Edge::MakeReal({m_dataSource.GetMwmId(segment.GetMwmId()), segment.GetFeatureId()},
+                                     segment.IsForward(), segment.GetSegmentIdx(),
+                                     m_starter.GetJunction(segment, false /* front */).ToPointWithAltitude(),
+                                     m_starter.GetJunction(segment, true /* front */).ToPointWithAltitude()));
     }
   }
 }
 
-IndexRoadGraph::SegmentListT const & IndexRoadGraph::GetSegments(
-    geometry::PointWithAltitude const & junction, bool isOutgoing) const
+IndexRoadGraph::SegmentListT const & IndexRoadGraph::GetSegments(geometry::PointWithAltitude const & junction,
+                                                                 bool isOutgoing) const
 {
   auto const & junctionToSegment = isOutgoing ? m_endToSegment : m_beginToSegment;
 
   auto const it = junctionToSegment.find(junction);
-  CHECK(it != junctionToSegment.cend(),
-        ("junctionToSegment doesn't contain", junction, ", isOutgoing =", isOutgoing));
+  CHECK(it != junctionToSegment.cend(), ("junctionToSegment doesn't contain", junction, ", isOutgoing =", isOutgoing));
   return it->second;
 }
 }  // namespace routing
diff --git a/libs/routing/index_road_graph.hpp b/libs/routing/index_road_graph.hpp
index 6067880b8..b1d84ae77 100644
--- a/libs/routing/index_road_graph.hpp
+++ b/libs/routing/index_road_graph.hpp
@@ -20,14 +20,11 @@ class IndexRoadGraph : public RoadGraphBase
 {
 public:
   IndexRoadGraph(IndexGraphStarter & starter, std::vector<Segment> const & segments,
-                 std::vector<geometry::PointWithAltitude> const & junctions,
-                 MwmDataSource & dataSource);
+                 std::vector<geometry::PointWithAltitude> const & junctions, MwmDataSource & dataSource);
 
   // IRoadGraphBase overrides:
-  virtual void GetOutgoingEdges(geometry::PointWithAltitude const & junction,
-                                EdgeListT & edges) const override;
-  virtual void GetIngoingEdges(geometry::PointWithAltitude const & junction,
-                               EdgeListT & edges) const override;
+  virtual void GetOutgoingEdges(geometry::PointWithAltitude const & junction, EdgeListT & edges) const override;
+  virtual void GetIngoingEdges(geometry::PointWithAltitude const & junction, EdgeListT & edges) const override;
   virtual void GetEdgeTypes(Edge const & edge, feature::TypesHolder & types) const override;
   virtual void GetJunctionTypes(geometry::PointWithAltitude const & junction,
                                 feature::TypesHolder & types) const override;
diff --git a/libs/routing/index_router.cpp b/libs/routing/index_router.cpp
index 6c8789e54..f8dce9d42 100644
--- a/libs/routing/index_router.cpp
+++ b/libs/routing/index_router.cpp
@@ -73,18 +73,17 @@ double constexpr kMinDistanceToFinishM = 10000;
 // Near MWMs criteria when choosing routing mode.
 double constexpr kCloseMwmPointsDistanceM = 300000;
 
-double CalcMaxSpeed(NumMwmIds const & numMwmIds,
-                    VehicleModelFactoryInterface const & vehicleModelFactory,
+double CalcMaxSpeed(NumMwmIds const & numMwmIds, VehicleModelFactoryInterface const & vehicleModelFactory,
                     VehicleType vehicleType)
 {
   if (vehicleType == VehicleType::Transit)
     return kTransitMaxSpeedKMpH;
 
   double maxSpeed = 0.0;
-  numMwmIds.ForEachId([&](NumMwmId id) {
+  numMwmIds.ForEachId([&](NumMwmId id)
+  {
     string const & country = numMwmIds.GetFile(id).GetName();
-    double const mwmMaxSpeed =
-        vehicleModelFactory.GetVehicleModelForCountry(country)->GetMaxWeightSpeed();
+    double const mwmMaxSpeed = vehicleModelFactory.GetVehicleModelForCountry(country)->GetMaxWeightSpeed();
     maxSpeed = max(maxSpeed, mwmMaxSpeed);
   });
   CHECK_GREATER(maxSpeed, 0.0, ("Most likely |numMwmIds| is empty."));
@@ -102,19 +101,15 @@ shared_ptr<VehicleModelFactoryInterface> CreateVehicleModelFactory(
   switch (vehicleType)
   {
   case VehicleType::Pedestrian:
-  case VehicleType::Transit:
-    return make_shared<PedestrianModelFactory>(countryParentNameGetterFn);
+  case VehicleType::Transit: return make_shared<PedestrianModelFactory>(countryParentNameGetterFn);
   case VehicleType::Bicycle: return make_shared<BicycleModelFactory>(countryParentNameGetterFn);
   case VehicleType::Car: return make_shared<CarModelFactory>(countryParentNameGetterFn);
-  case VehicleType::Count:
-    CHECK(false, ("Can't create VehicleModelFactoryInterface for", vehicleType));
-    return nullptr;
+  case VehicleType::Count: CHECK(false, ("Can't create VehicleModelFactoryInterface for", vehicleType)); return nullptr;
   }
   UNREACHABLE();
 }
 
-unique_ptr<DirectionsEngine> CreateDirectionsEngine(VehicleType vehicleType,
-                                                    shared_ptr<NumMwmIds> numMwmIds,
+unique_ptr<DirectionsEngine> CreateDirectionsEngine(VehicleType vehicleType, shared_ptr<NumMwmIds> numMwmIds,
                                                     MwmDataSource & dataSource)
 {
   switch (vehicleType)
@@ -123,9 +118,7 @@ unique_ptr<DirectionsEngine> CreateDirectionsEngine(VehicleType vehicleType,
   case VehicleType::Transit: return make_unique<PedestrianDirectionsEngine>(dataSource, numMwmIds);
   case VehicleType::Bicycle:
   case VehicleType::Car: return make_unique<CarDirectionsEngine>(dataSource, numMwmIds);
-  case VehicleType::Count:
-    CHECK(false, ("Can't create DirectionsEngine for", vehicleType));
-    return nullptr;
+  case VehicleType::Count: CHECK(false, ("Can't create DirectionsEngine for", vehicleType)); return nullptr;
   }
   UNREACHABLE();
 }
@@ -133,22 +126,20 @@ unique_ptr<DirectionsEngine> CreateDirectionsEngine(VehicleType vehicleType,
 shared_ptr<TrafficStash> CreateTrafficStash(VehicleType, shared_ptr<NumMwmIds>, traffic::TrafficCache const &)
 {
   return nullptr;
-  //return (vehicleType == VehicleType::Car ? make_shared<TrafficStash>(trafficCache, numMwmIds) : nullptr);
+  // return (vehicleType == VehicleType::Car ? make_shared<TrafficStash>(trafficCache, numMwmIds) : nullptr);
 }
 
 void PushPassedSubroutes(Checkpoints const & checkpoints, vector<Route::SubrouteAttrs> & subroutes)
 {
   for (size_t i = 0; i < checkpoints.GetPassedIdx(); ++i)
   {
-    subroutes.emplace_back(
-        geometry::PointWithAltitude(checkpoints.GetPoint(i), geometry::kDefaultAltitudeMeters),
-        geometry::PointWithAltitude(checkpoints.GetPoint(i + 1), geometry::kDefaultAltitudeMeters),
-        0 /* beginSegmentIdx */, 0 /* endSegmentIdx */);
+    subroutes.emplace_back(geometry::PointWithAltitude(checkpoints.GetPoint(i), geometry::kDefaultAltitudeMeters),
+                           geometry::PointWithAltitude(checkpoints.GetPoint(i + 1), geometry::kDefaultAltitudeMeters),
+                           0 /* beginSegmentIdx */, 0 /* endSegmentIdx */);
   }
 }
 
-bool GetLastRealOrPart(IndexGraphStarter const & starter, vector<Segment> const & route,
-                       Segment & real)
+bool GetLastRealOrPart(IndexGraphStarter const & starter, vector<Segment> const & route, Segment & real)
 {
   for (auto rit = route.rbegin(); rit != route.rend(); ++rit)
   {
@@ -160,24 +151,24 @@ bool GetLastRealOrPart(IndexGraphStarter const & starter, vector<Segment> const
 }
 
 // Returns true if seg1 and seg2 have the same geometry.
-bool IsTheSameSegments(m2::PointD const & seg1From, m2::PointD const & seg1To,
-                       m2::PointD const & seg2From, m2::PointD const & seg2To)
+bool IsTheSameSegments(m2::PointD const & seg1From, m2::PointD const & seg1To, m2::PointD const & seg2From,
+                       m2::PointD const & seg2To)
 {
   return (seg1From == seg2From && seg1To == seg2To) || (seg1From == seg2To && seg1To == seg2From);
 }
 
-bool IsDeadEnd(Segment const & segment, bool isOutgoing, bool useRoutingOptions,
-               WorldGraph & worldGraph, set<Segment> & visitedSegments)
+bool IsDeadEnd(Segment const & segment, bool isOutgoing, bool useRoutingOptions, WorldGraph & worldGraph,
+               set<Segment> & visitedSegments)
 {
   // Maximum size (in Segment) of an island in road graph which may be found by the method.
   size_t constexpr kDeadEndTestLimit = 250;
 
-  return !CheckGraphConnectivity(segment, isOutgoing, useRoutingOptions, kDeadEndTestLimit,
-                                 worldGraph, visitedSegments);
+  return !CheckGraphConnectivity(segment, isOutgoing, useRoutingOptions, kDeadEndTestLimit, worldGraph,
+                                 visitedSegments);
 }
 
-bool IsDeadEndCached(Segment const & segment, bool isOutgoing, bool useRoutingOptions,
-                     WorldGraph & worldGraph, set<Segment> & deadEnds)
+bool IsDeadEndCached(Segment const & segment, bool isOutgoing, bool useRoutingOptions, WorldGraph & worldGraph,
+                     set<Segment> & deadEnds)
 {
   if (deadEnds.count(segment) != 0)
     return true;
@@ -193,12 +184,11 @@ bool IsDeadEndCached(Segment const & segment, bool isOutgoing, bool useRoutingOp
 }
 }  // namespace
 
-
 // IndexRouter::BestEdgeComparator ----------------------------------------------------------------
 IndexRouter::BestEdgeComparator::BestEdgeComparator(m2::PointD const & point, m2::PointD const & direction)
-  : m_point(point), m_direction(direction)
-{
-}
+  : m_point(point)
+  , m_direction(direction)
+{}
 
 int IndexRouter::BestEdgeComparator::Compare(Edge const & edge1, Edge const & edge2) const
 {
@@ -259,10 +249,9 @@ IndexRouter::IndexRouter(VehicleType vehicleType, bool loadAltitudes,
                     ? IRoadGraph::Mode::IgnoreOnewayTag
                     : IRoadGraph::Mode::ObeyOnewayTag,
                 m_vehicleModelFactory)
-  , m_estimator(EdgeEstimator::Create(
-        m_vehicleType, CalcMaxSpeed(*m_numMwmIds, *m_vehicleModelFactory, m_vehicleType),
-        CalcOffroadSpeed(*m_vehicleModelFactory), m_trafficStash,
-        &dataSource, m_numMwmIds))
+  , m_estimator(EdgeEstimator::Create(m_vehicleType, CalcMaxSpeed(*m_numMwmIds, *m_vehicleModelFactory, m_vehicleType),
+                                      CalcOffroadSpeed(*m_vehicleModelFactory), m_trafficStash, &dataSource,
+                                      m_numMwmIds))
   , m_directionsEngine(CreateDirectionsEngine(m_vehicleType, m_numMwmIds, m_dataSource))
   , m_countryParentNameGetterFn(countryParentNameGetterFn)
 {
@@ -287,8 +276,7 @@ void IndexRouter::ClearState()
   m_dataSource.FreeHandles();
 }
 
-bool IndexRouter::FindClosestProjectionToRoad(m2::PointD const & point,
-                                              m2::PointD const & direction, double radius,
+bool IndexRouter::FindClosestProjectionToRoad(m2::PointD const & point, m2::PointD const & direction, double radius,
                                               EdgeProj & proj)
 {
   auto const rect = mercator::RectByCenterXYAndSizeInMeters(point, radius);
@@ -326,25 +314,22 @@ bool IndexRouter::FindClosestProjectionToRoad(m2::PointD const & point,
   return true;
 }
 
-void IndexRouter::SetGuides(GuidesTracks && guides) { m_guides = GuidesConnections(guides); }
+void IndexRouter::SetGuides(GuidesTracks && guides)
+{
+  m_guides = GuidesConnections(guides);
+}
 
-RouterResultCode IndexRouter::CalculateRoute(Checkpoints const & checkpoints,
-                                             m2::PointD const & startDirection,
-                                             bool adjustToPrevRoute,
-                                             RouterDelegate const & delegate, Route & route)
+RouterResultCode IndexRouter::CalculateRoute(Checkpoints const & checkpoints, m2::PointD const & startDirection,
+                                             bool adjustToPrevRoute, RouterDelegate const & delegate, Route & route)
 {
   auto const & startPoint = checkpoints.GetStart();
   auto const & finalPoint = checkpoints.GetFinish();
 
   try
   {
-    SCOPE_GUARD(featureRoadGraphClear, [this]
-    {
-      ClearState();
-    });
+    SCOPE_GUARD(featureRoadGraphClear, [this] { ClearState(); });
 
-    if (adjustToPrevRoute && m_lastRoute && m_lastFakeEdges &&
-        finalPoint == m_lastRoute->GetFinish())
+    if (adjustToPrevRoute && m_lastRoute && m_lastFakeEdges && finalPoint == m_lastRoute->GetFinish())
     {
       double const distanceToRoute = m_lastRoute->CalcDistance(startPoint);
       double const distanceToFinish = mercator::DistanceOnEarth(startPoint, finalPoint);
@@ -363,8 +348,8 @@ RouterResultCode IndexRouter::CalculateRoute(Checkpoints const & checkpoints,
   }
   catch (RootException const & e)
   {
-    LOG(LERROR, ("Can't find path from", mercator::ToLatLon(startPoint), "to",
-                 mercator::ToLatLon(finalPoint), ":\n ", e.what()));
+    LOG(LERROR, ("Can't find path from", mercator::ToLatLon(startPoint), "to", mercator::ToLatLon(finalPoint), ":\n ",
+                 e.what()));
     return RouterResultCode::InternalError;
   }
 }
@@ -375,7 +360,8 @@ std::vector<Segment> IndexRouter::GetBestOutgoingSegments(m2::PointD const & che
   std::vector<Segment> segments;
 
   PointsOnEdgesSnapping snapping(*this, graph);
-  snapping.FindBestSegments(checkpoint, m2::PointD::Zero() /* startDirection */, true /* isOutgoing */, segments, dummy);
+  snapping.FindBestSegments(checkpoint, m2::PointD::Zero() /* startDirection */, true /* isOutgoing */, segments,
+                            dummy);
 
   return segments;
 }
@@ -388,26 +374,21 @@ bool IndexRouter::GetBestOutgoingEdges(m2::PointD const & checkpoint, WorldGraph
                                 FeaturesRoadGraph::kClosestEdgesRadiusM, edges, dummy);
 }
 
-void IndexRouter::AppendPartsOfReal(LatLonWithAltitude const & point1,
-                                    LatLonWithAltitude const & point2, uint32_t & startIdx,
-                                    ConnectionToOsm & link)
+void IndexRouter::AppendPartsOfReal(LatLonWithAltitude const & point1, LatLonWithAltitude const & point2,
+                                    uint32_t & startIdx, ConnectionToOsm & link)
 {
   uint32_t const fakeFeatureId = FakeFeatureIds::kIndexGraphStarterId;
 
-  FakeVertex vertexForward(m_guides.GetMwmId(), point1 /* from */, point2 /* to */,
-                           FakeVertex::Type::PartOfReal);
+  FakeVertex vertexForward(m_guides.GetMwmId(), point1 /* from */, point2 /* to */, FakeVertex::Type::PartOfReal);
 
-  FakeVertex vertexBackward(m_guides.GetMwmId(), point2 /* from */, point1 /* to */,
-                            FakeVertex::Type::PartOfReal);
+  FakeVertex vertexBackward(m_guides.GetMwmId(), point2 /* from */, point1 /* to */, FakeVertex::Type::PartOfReal);
 
-  link.m_partsOfReal.emplace_back(
-      vertexForward, Segment(kFakeNumMwmId, fakeFeatureId, startIdx++, true /* forward */));
-  link.m_partsOfReal.emplace_back(
-      vertexBackward, Segment(kFakeNumMwmId, fakeFeatureId, startIdx++, true /* forward */));
+  link.m_partsOfReal.emplace_back(vertexForward, Segment(kFakeNumMwmId, fakeFeatureId, startIdx++, true /* forward */));
+  link.m_partsOfReal.emplace_back(vertexBackward,
+                                  Segment(kFakeNumMwmId, fakeFeatureId, startIdx++, true /* forward */));
 }
 
-void IndexRouter::ConnectCheckpointsOnGuidesToOsm(std::vector<m2::PointD> const & checkpoints,
-                                                  WorldGraph & graph)
+void IndexRouter::ConnectCheckpointsOnGuidesToOsm(std::vector<m2::PointD> const & checkpoints, WorldGraph & graph)
 {
   for (size_t checkpointIdx = 0; checkpointIdx < checkpoints.size(); ++checkpointIdx)
   {
@@ -430,8 +411,7 @@ void IndexRouter::ConnectCheckpointsOnGuidesToOsm(std::vector<m2::PointD> const
   }
 }
 
-uint32_t IndexRouter::ConnectTracksOnGuidesToOsm(std::vector<m2::PointD> const & checkpoints,
-                                                 WorldGraph & graph)
+uint32_t IndexRouter::ConnectTracksOnGuidesToOsm(std::vector<m2::PointD> const & checkpoints, WorldGraph & graph)
 {
   uint32_t segmentIdx = 0;
 
@@ -478,24 +458,22 @@ uint32_t IndexRouter::ConnectTracksOnGuidesToOsm(std::vector<m2::PointD> const &
   return segmentIdx;
 }
 
-void IndexRouter::AddGuidesOsmConnectionsToGraphStarter(size_t checkpointIdxFrom,
-                                                        size_t checkpointIdxTo,
+void IndexRouter::AddGuidesOsmConnectionsToGraphStarter(size_t checkpointIdxFrom, size_t checkpointIdxTo,
                                                         IndexGraphStarter & starter)
 {
   auto linksFrom = m_guides.GetOsmConnections(checkpointIdxFrom);
   auto linksTo = m_guides.GetOsmConnections(checkpointIdxTo);
   for (auto const & link : linksTo)
   {
-    auto it = find_if(linksFrom.begin(), linksFrom.end(), [&link](ConnectionToOsm const & cur) {
+    auto it = find_if(linksFrom.begin(), linksFrom.end(), [&link](ConnectionToOsm const & cur)
+    {
       return link.m_fakeEnding.m_originJunction == cur.m_fakeEnding.m_originJunction &&
              link.m_fakeEnding.m_projections == cur.m_fakeEnding.m_projections &&
              link.m_realSegment == cur.m_realSegment && link.m_realTo == cur.m_realTo;
     });
 
     if (it == linksFrom.end())
-    {
       linksFrom.push_back(link);
-    }
   }
 
   for (auto & connOsm : linksFrom)
@@ -505,13 +483,12 @@ void IndexRouter::AddGuidesOsmConnectionsToGraphStarter(size_t checkpointIdxFrom
 
     starter.AddEnding(connOsm.m_fakeEnding);
 
-    starter.ConnectLoopToGuideSegments(connOsm.m_loopVertex, connOsm.m_realSegment,
-                                       connOsm.m_realFrom, connOsm.m_realTo, connOsm.m_partsOfReal);
+    starter.ConnectLoopToGuideSegments(connOsm.m_loopVertex, connOsm.m_realSegment, connOsm.m_realFrom,
+                                       connOsm.m_realTo, connOsm.m_partsOfReal);
   }
 }
 
-RouterResultCode IndexRouter::DoCalculateRoute(Checkpoints const & checkpoints,
-                                               m2::PointD const & startDirection,
+RouterResultCode IndexRouter::DoCalculateRoute(Checkpoints const & checkpoints, m2::PointD const & startDirection,
                                                RouterDelegate const & delegate, Route & route)
 {
   m_lastRoute.reset();
@@ -528,19 +505,15 @@ RouterResultCode IndexRouter::DoCalculateRoute(Checkpoints const & checkpoints,
       /// "Please, try to move start/end point a bit .."
 
       LOG(LWARNING, ("For point", mercator::ToLatLon(checkpoint),
-                   "CountryInfoGetter returns an empty CountryFile(). It happens when checkpoint "
-                   "is put at gaps between mwm."));
+                     "CountryInfoGetter returns an empty CountryFile(). It happens when checkpoint "
+                     "is put at gaps between mwm."));
       return RouterResultCode::InternalError;
     }
 
     if (!m_dataSource.IsLoaded(country))
-    {
       route.AddAbsentCountry(country.GetName());
-    }
     else if (guidesMwmId == kFakeNumMwmId)
-    {
       guidesMwmId = m_numMwmIds->GetId(country);
-    }
   }
 
   if (!route.GetAbsentCountries().empty())
@@ -583,8 +556,8 @@ RouterResultCode IndexRouter::DoCalculateRoute(Checkpoints const & checkpoints,
       bool const isLastSubroute = (i == subroutesCount - 1);
 
       bool startIsCodirectional = false;
-      switch (snapping.Snap(startCheckpoint, finishCheckpoint, startDirection,
-                            startFakeEnding, finishFakeEnding, startIsCodirectional))
+      switch (snapping.Snap(startCheckpoint, finishCheckpoint, startDirection, startFakeEnding, finishFakeEnding,
+                            startIsCodirectional))
       {
       case 1: return RouterResultCode::StartPointNotFound;
       case 2: return isLastSubroute ? RouterResultCode::EndPointNotFound : RouterResultCode::IntermediatePointNotFound;
@@ -607,18 +580,15 @@ RouterResultCode IndexRouter::DoCalculateRoute(Checkpoints const & checkpoints,
     vector<Segment> subroute;
     double contributionCoef = kAlmostZeroContribution;
     if (!AlmostEqualAbs(checkpointsLength, 0.0, 1e-5))
-    {
-      contributionCoef =
-          mercator::DistanceOnEarth(startCheckpoint, finishCheckpoint) / checkpointsLength;
-    }
+      contributionCoef = mercator::DistanceOnEarth(startCheckpoint, finishCheckpoint) / checkpointsLength;
 
-    AStarSubProgress subProgress(mercator::ToLatLon(startCheckpoint),
-                                 mercator::ToLatLon(finishCheckpoint), contributionCoef);
+    AStarSubProgress subProgress(mercator::ToLatLon(startCheckpoint), mercator::ToLatLon(finishCheckpoint),
+                                 contributionCoef);
     progress->AppendSubProgress(subProgress);
     SCOPE_GUARD(eraseProgress, [&progress]() { progress->PushAndDropLastSubProgress(); });
 
-    auto const result = CalculateSubroute(checkpoints, i, delegate, progress, subrouteStarter,
-                                          subroute, m_guides.IsAttached());
+    auto const result =
+        CalculateSubroute(checkpoints, i, delegate, progress, subrouteStarter, subroute, m_guides.IsAttached());
 
     if (result != RouterResultCode::NoError)
       return result;
@@ -629,15 +599,14 @@ RouterResultCode IndexRouter::DoCalculateRoute(Checkpoints const & checkpoints,
 
     size_t subrouteSegmentsEnd = segments.size();
     subroutes.emplace_back(subrouteStarter.GetStartJunction().ToPointWithAltitude(),
-                           subrouteStarter.GetFinishJunction().ToPointWithAltitude(),
-                           subrouteSegmentsBegin, subrouteSegmentsEnd);
+                           subrouteStarter.GetFinishJunction().ToPointWithAltitude(), subrouteSegmentsBegin,
+                           subrouteSegmentsEnd);
     subrouteSegmentsBegin = subrouteSegmentsEnd;
 
     // For every subroute except for the first one the last real segment is used as a next start segment.
     // It's implemented this way to prevent jumping from one road to another one using a via point.
     Segment nextSegment;
-    CHECK(GetLastRealOrPart(subrouteStarter, subroute, nextSegment),
-          ("No real or part of real segments in route."));
+    CHECK(GetLastRealOrPart(subrouteStarter, subroute, nextSegment), ("No real or part of real segments in route."));
     snapping.SetNextStartSegment(nextSegment);
 
     if (!starter)
@@ -657,11 +626,9 @@ RouterResultCode IndexRouter::DoCalculateRoute(Checkpoints const & checkpoints,
   if (redressResult != RouterResultCode::NoError)
     return redressResult;
 
-  LOG(LINFO, ("Route length:", route.GetTotalDistanceMeters(), "meters. ETA:",
-      route.GetTotalTimeSec(), "seconds."));
+  LOG(LINFO, ("Route length:", route.GetTotalDistanceMeters(), "meters. ETA:", route.GetTotalTimeSec(), "seconds."));
 
-  m_lastRoute = make_unique<SegmentedRoute>(checkpoints.GetStart(), checkpoints.GetFinish(),
-                                            route.GetSubroutes());
+  m_lastRoute = make_unique<SegmentedRoute>(checkpoints.GetStart(), checkpoints.GetFinish(), route.GetSubroutes());
   for (Segment const & segment : segments)
     m_lastRoute->AddStep(segment, mercator::FromLatLon(starter->GetPoint(segment, true /* front */)));
 
@@ -699,10 +666,8 @@ vector<Segment> ProcessJoints(vector<JointSegment> const & jointsPath,
 
 RouterResultCode IndexRouter::CalculateSubroute(Checkpoints const & checkpoints, size_t subrouteIdx,
                                                 RouterDelegate const & delegate,
-                                                shared_ptr<AStarProgress> const & progress,
-                                                IndexGraphStarter & starter,
-                                                vector<Segment> & subroute,
-                                                bool guidesActive /* = false */)
+                                                shared_ptr<AStarProgress> const & progress, IndexGraphStarter & starter,
+                                                vector<Segment> & subroute, bool guidesActive /* = false */)
 {
   subroute.clear();
 
@@ -714,21 +679,18 @@ RouterResultCode IndexRouter::CalculateSubroute(Checkpoints const & checkpoints,
   base::ScopedTimerWithLog timer("Route build");
   switch (mode)
   {
-  case WorldGraphMode::Joints:
-    return CalculateSubrouteJointsMode(starter, delegate, progress, subroute);
-  case WorldGraphMode::NoLeaps:
-    return CalculateSubrouteNoLeapsMode(starter, delegate, progress, subroute);
+  case WorldGraphMode::Joints: return CalculateSubrouteJointsMode(starter, delegate, progress, subroute);
+  case WorldGraphMode::NoLeaps: return CalculateSubrouteNoLeapsMode(starter, delegate, progress, subroute);
   case WorldGraphMode::LeapsOnly:
-    return CalculateSubrouteLeapsOnlyMode(checkpoints, subrouteIdx, starter, delegate, progress,
-                                          subroute);
+    return CalculateSubrouteLeapsOnlyMode(checkpoints, subrouteIdx, starter, delegate, progress, subroute);
   default: CHECK(false, ("Wrong WorldGraphMode here:", mode));
   }
   UNREACHABLE();
 }
 
-RouterResultCode IndexRouter::CalculateSubrouteJointsMode(
-    IndexGraphStarter & starter, RouterDelegate const & delegate,
-    shared_ptr<AStarProgress> const & progress, vector<Segment> & subroute)
+RouterResultCode IndexRouter::CalculateSubrouteJointsMode(IndexGraphStarter & starter, RouterDelegate const & delegate,
+                                                          shared_ptr<AStarProgress> const & progress,
+                                                          vector<Segment> & subroute)
 {
   using JointsStarter = IndexGraphStarterJoints<IndexGraphStarter>;
   JointsStarter jointStarter(starter, starter.GetStartSegment(), starter.GetFinishSegment());
@@ -741,9 +703,8 @@ RouterResultCode IndexRouter::CalculateSubrouteJointsMode(
   using Weight = JointsStarter::Weight;
 
   AStarAlgorithm<Vertex, Edge, Weight>::Params<Visitor, AStarLengthChecker> params(
-      jointStarter, jointStarter.GetStartJoint(), jointStarter.GetFinishJoint(),
-      delegate.GetCancellable(), std::move(visitor),
-      AStarLengthChecker(starter));
+      jointStarter, jointStarter.GetStartJoint(), jointStarter.GetFinishJoint(), delegate.GetCancellable(),
+      std::move(visitor), AStarLengthChecker(starter));
 
   RoutingResult<Vertex, Weight> routingResult;
   RouterResultCode const result = FindPath<Vertex, Edge, Weight>(params, {} /* mwmIds */, routingResult);
@@ -756,9 +717,9 @@ RouterResultCode IndexRouter::CalculateSubrouteJointsMode(
   return result;
 }
 
-RouterResultCode IndexRouter::CalculateSubrouteNoLeapsMode(
-    IndexGraphStarter & starter, RouterDelegate const & delegate,
-    shared_ptr<AStarProgress> const & progress, vector<Segment> & subroute)
+RouterResultCode IndexRouter::CalculateSubrouteNoLeapsMode(IndexGraphStarter & starter, RouterDelegate const & delegate,
+                                                           shared_ptr<AStarProgress> const & progress,
+                                                           vector<Segment> & subroute)
 {
   using Vertex = IndexGraphStarter::Vertex;
   using Edge = IndexGraphStarter::Edge;
@@ -768,8 +729,8 @@ RouterResultCode IndexRouter::CalculateSubrouteNoLeapsMode(
   Visitor visitor(starter, delegate, kVisitPeriod, progress);
 
   AStarAlgorithm<Vertex, Edge, Weight>::Params<Visitor, AStarLengthChecker> params(
-      starter, starter.GetStartSegment(), starter.GetFinishSegment(),
-      delegate.GetCancellable(), std::move(visitor), AStarLengthChecker(starter));
+      starter, starter.GetStartSegment(), starter.GetFinishSegment(), delegate.GetCancellable(), std::move(visitor),
+      AStarLengthChecker(starter));
 
   RoutingResult<Vertex, Weight> routingResult;
   set<NumMwmId> const mwmIds = starter.GetMwms();
@@ -798,12 +759,13 @@ void CollapseForward_ReverseLoops(std::vector<Segment> & path)
       ++i;
   }
 }
-}
+}  // namespace
 
-RouterResultCode IndexRouter::CalculateSubrouteLeapsOnlyMode(
-    Checkpoints const & checkpoints, size_t subrouteIdx, IndexGraphStarter & starter,
-    RouterDelegate const & delegate, shared_ptr<AStarProgress> const & progress,
-    vector<Segment> & subroute)
+RouterResultCode IndexRouter::CalculateSubrouteLeapsOnlyMode(Checkpoints const & checkpoints, size_t subrouteIdx,
+                                                             IndexGraphStarter & starter,
+                                                             RouterDelegate const & delegate,
+                                                             shared_ptr<AStarProgress> const & progress,
+                                                             vector<Segment> & subroute)
 {
   using Vertex = LeapsGraph::Vertex;
   using Edge = LeapsGraph::Edge;
@@ -817,22 +779,20 @@ RouterResultCode IndexRouter::CalculateSubrouteLeapsOnlyMode(
     LeapsGraph leapsGraph(starter, MwmHierarchyHandler(m_numMwmIds, m_countryParentNameGetterFn));
 
     AStarSubProgress leapsProgress(mercator::ToLatLon(checkpoints.GetPoint(subrouteIdx)),
-                                   mercator::ToLatLon(checkpoints.GetPoint(subrouteIdx + 1)),
-                                   kLeapsStageContribution);
+                                   mercator::ToLatLon(checkpoints.GetPoint(subrouteIdx + 1)), kLeapsStageContribution);
     SCOPE_GUARD(progressGuard, [&progress]() { progress->PushAndDropLastSubProgress(); });
     progress->AppendSubProgress(leapsProgress);
 
     // No need to call CheckLength in cross-mwm routine, thus we avoid calling GetRoadGeometry().
     struct AlwaysTrue
     {
-      bool operator() (Weight const &) const { return true; }
+      bool operator()(Weight const &) const { return true; }
     };
 
     using Visitor = JunctionVisitor<LeapsGraph>;
     AStarAlgorithm<Vertex, Edge, Weight>::Params<Visitor, AlwaysTrue> params(
-        leapsGraph, leapsGraph.GetStartSegment(), leapsGraph.GetFinishSegment(),
-        delegate.GetCancellable(), Visitor(leapsGraph, delegate, kVisitPeriodForLeaps, progress),
-        AlwaysTrue());
+        leapsGraph, leapsGraph.GetStartSegment(), leapsGraph.GetFinishSegment(), delegate.GetCancellable(),
+        Visitor(leapsGraph, delegate, kVisitPeriodForLeaps, progress), AlwaysTrue());
 
     params.m_badReducedWeight = [](Weight const &, Weight const &)
     {
@@ -845,19 +805,19 @@ RouterResultCode IndexRouter::CalculateSubrouteLeapsOnlyMode(
     using EdgeKeyT = std::array<uint32_t, 2>;
     vector<RoutingResultT> routes;
     set<EdgeKeyT> edges;
-    set<uint32_t> keys[2];    // 0 - end vertex of the first edge; 1 - beg vertex of the last edge
+    set<uint32_t> keys[2];  // 0 - end vertex of the first edge; 1 - beg vertex of the last edge
 
     auto const getBegEnd = [](RoutingResultT const & r) -> EdgeKeyT
     {
       size_t const pathSize = r.m_path.size();
       ASSERT_GREATER(pathSize, 2, ());
-      return { r.m_path[1].GetFeatureId(), r.m_path[pathSize - 2].GetFeatureId() };
+      return {r.m_path[1].GetFeatureId(), r.m_path[pathSize - 2].GetFeatureId()};
     };
 
     /// @todo Looks like there is no big deal in this constant due to the bidirectional search.
     /// But still Zalau -> Tiburg lasts 2 minutes, so set some reasonable timeout.
     size_t constexpr kMaxVertices = 15;
-    uint64_t constexpr kTimeoutMilliS = 30*1000;
+    uint64_t constexpr kTimeoutMilliS = 30 * 1000;
     base::Timer timer;
 
     using AlgoT = AStarAlgorithm<Vertex, Edge, Weight>;
@@ -883,10 +843,8 @@ RouterResultCode IndexRouter::CalculateSubrouteLeapsOnlyMode(
     if (routes.empty() || result == AlgoT::Result::Cancelled)
       return ConvertResult<Vertex, Edge, Weight>(result);
 
-    sort(routes.begin(), routes.end(), [](RoutingResultT const & l, RoutingResultT const & r)
-    {
-      return l.m_distance < r.m_distance;
-    });
+    sort(routes.begin(), routes.end(),
+         [](RoutingResultT const & l, RoutingResultT const & r) { return l.m_distance < r.m_distance; });
 
     // Additional heuristic to reduce number of candidates.
     // Group candidates by category and accept no more than *2* routes of each.
@@ -924,11 +882,10 @@ RouterResultCode IndexRouter::CalculateSubrouteLeapsOnlyMode(
 
     for (auto & r : routes)
     {
-      Segment const * be[] = { &r.m_path[1], &r.m_path[r.m_path.size() - 2] };
-      for (uint8_t idx  = 0; idx < 2; ++idx)
+      Segment const * be[] = {&r.m_path[1], &r.m_path[r.m_path.size() - 2]};
+      for (uint8_t idx = 0; idx < 2; ++idx)
       {
-        if (keys[idx].insert(be[idx]->GetFeatureId()).second &&
-            checkers[idx](*be[idx]))
+        if (keys[idx].insert(be[idx]->GetFeatureId()).second && checkers[idx](*be[idx]))
         {
           uint8_t const nextIdx = (idx + 1) % 2;
           keys[nextIdx].insert(be[nextIdx]->GetFeatureId());
@@ -970,7 +927,7 @@ RouterResultCode IndexRouter::CalculateSubrouteLeapsOnlyMode(
 
       size_t const sz = c.m_path.size();
       auto const * r1 = calculator.Calc2Times(c.m_path[0], c.m_path[1], progress, candidateContribution);
-      auto const * r2 = calculator.Calc2Times(c.m_path[sz-2], c.m_path[sz-1], progress, candidateContribution);
+      auto const * r2 = calculator.Calc2Times(c.m_path[sz - 2], c.m_path[sz - 1], progress, candidateContribution);
 
       if (r1 && r2)
       {
@@ -1002,15 +959,14 @@ RouterResultCode IndexRouter::CalculateSubrouteLeapsOnlyMode(
   /// @todo This routine is buggy and should be revised, I'm not sure if it's still needed ...
   /// Russia_UseDonMotorway test coordinates makes valid route until this point, but LeapsPostProcessor
   /// adds highway=service detour in this coordinates (53.8782154, 38.0483006) instead of keeping "Дон" motorway.
-//  LeapsPostProcessor leapsPostProcessor(result.m_path, starter);
-//  subroute = leapsPostProcessor.GetProcessedPath();
+  //  LeapsPostProcessor leapsPostProcessor(result.m_path, starter);
+  //  subroute = leapsPostProcessor.GetProcessedPath();
   subroute = std::move(result.m_path);
 
   return RouterResultCode::NoError;
 }
 
-RouterResultCode IndexRouter::AdjustRoute(Checkpoints const & checkpoints,
-                                          m2::PointD const & startDirection,
+RouterResultCode IndexRouter::AdjustRoute(Checkpoints const & checkpoints, m2::PointD const & startDirection,
                                           RouterDelegate const & delegate, Route & route)
 {
   base::Timer timer;
@@ -1023,7 +979,7 @@ RouterResultCode IndexRouter::AdjustRoute(Checkpoints const & checkpoints,
   bool bestSegmentIsAlmostCodirectional = false;
   PointsOnEdgesSnapping snapping(*this, *graph);
   if (!snapping.FindBestSegments(pointFrom, startDirection, true /* isOutgoing */, startSegments,
-                        bestSegmentIsAlmostCodirectional))
+                                 bestSegmentIsAlmostCodirectional))
   {
     return RouterResultCode::StartPointNotFound;
   }
@@ -1036,9 +992,8 @@ RouterResultCode IndexRouter::AdjustRoute(Checkpoints const & checkpoints,
   CHECK(!steps.empty(), ());
 
   FakeEnding dummy{};
-  IndexGraphStarter starter(MakeFakeEnding(startSegments, pointFrom, *graph), dummy,
-                            m_lastFakeEdges->GetNumFakeEdges(), bestSegmentIsAlmostCodirectional,
-                            *graph);
+  IndexGraphStarter starter(MakeFakeEnding(startSegments, pointFrom, *graph), dummy, m_lastFakeEdges->GetNumFakeEdges(),
+                            bestSegmentIsAlmostCodirectional, *graph);
 
   starter.Append(*m_lastFakeEdges);
 
@@ -1047,8 +1002,8 @@ RouterResultCode IndexRouter::AdjustRoute(Checkpoints const & checkpoints,
   for (size_t i = lastSubroute.GetBeginSegmentIdx(); i < lastSubroute.GetEndSegmentIdx(); ++i)
   {
     auto const & step = steps[i];
-    prevEdges.emplace_back(step.GetSegment(), starter.CalcSegmentWeight(step.GetSegment(),
-                           EdgeEstimator::Purpose::Weight));
+    prevEdges.emplace_back(step.GetSegment(),
+                           starter.CalcSegmentWeight(step.GetSegment(), EdgeEstimator::Purpose::Weight));
   }
 
   using Visitor = JunctionVisitor<IndexGraphStarter>;
@@ -1060,12 +1015,11 @@ RouterResultCode IndexRouter::AdjustRoute(Checkpoints const & checkpoints,
 
   AStarAlgorithm<Vertex, Edge, Weight> algorithm;
   AStarAlgorithm<Vertex, Edge, Weight>::Params<Visitor, AdjustLengthChecker> params(
-      starter, starter.GetStartSegment(), {} /* finalVertex */,
-      delegate.GetCancellable(), std::move(visitor), AdjustLengthChecker(starter));
+      starter, starter.GetStartSegment(), {} /* finalVertex */, delegate.GetCancellable(), std::move(visitor),
+      AdjustLengthChecker(starter));
 
   RoutingResult<Segment, RouteWeight> result;
-  auto const resultCode =
-      ConvertResult<Vertex, Edge, Weight>(algorithm.AdjustRoute(params, prevEdges, result));
+  auto const resultCode = ConvertResult<Vertex, Edge, Weight>(algorithm.AdjustRoute(params, prevEdges, result));
   if (resultCode != RouterResultCode::NoError)
     return resultCode;
 
@@ -1078,8 +1032,7 @@ RouterResultCode IndexRouter::AdjustRoute(Checkpoints const & checkpoints,
 
   size_t subrouteOffset = result.m_path.size();
   subroutes.emplace_back(starter.GetStartJunction().ToPointWithAltitude(),
-                         starter.GetFinishJunction().ToPointWithAltitude(), 0 /* beginSegmentIdx */,
-                         subrouteOffset);
+                         starter.GetFinishJunction().ToPointWithAltitude(), 0 /* beginSegmentIdx */, subrouteOffset);
 
   for (size_t i = checkpoints.GetPassedIdx() + 1; i < lastSubroutes.size(); ++i)
   {
@@ -1113,23 +1066,22 @@ unique_ptr<WorldGraph> IndexRouter::MakeWorldGraph()
   RoutingOptions const routingOptions = RoutingOptions::LoadCarOptionsFromSettings();
   /// @DebugNote
   // Add avoid roads here for debug purpose.
-  //routingOptions.Add(RoutingOptions::Road::Motorway);
+  // routingOptions.Add(RoutingOptions::Road::Motorway);
   LOG(LINFO, ("Avoid next roads:", routingOptions));
 
   auto crossMwmGraph = make_unique<CrossMwmGraph>(
-      m_numMwmIds, m_numMwmTree,
-      m_vehicleType == VehicleType::Transit ? VehicleType::Pedestrian : m_vehicleType,
+      m_numMwmIds, m_numMwmTree, m_vehicleType == VehicleType::Transit ? VehicleType::Pedestrian : m_vehicleType,
       m_countryRectFn, m_dataSource);
 
-  auto indexGraphLoader = IndexGraphLoader::Create(
-      m_vehicleType == VehicleType::Transit ? VehicleType::Pedestrian : m_vehicleType,
-      m_loadAltitudes, m_vehicleModelFactory, m_estimator, m_dataSource, routingOptions);
+  auto indexGraphLoader =
+      IndexGraphLoader::Create(m_vehicleType == VehicleType::Transit ? VehicleType::Pedestrian : m_vehicleType,
+                               m_loadAltitudes, m_vehicleModelFactory, m_estimator, m_dataSource, routingOptions);
 
   if (m_vehicleType != VehicleType::Transit)
   {
-    auto graph = make_unique<SingleVehicleWorldGraph>(
-        std::move(crossMwmGraph), std::move(indexGraphLoader), m_estimator,
-        MwmHierarchyHandler(m_numMwmIds, m_countryParentNameGetterFn));
+    auto graph =
+        make_unique<SingleVehicleWorldGraph>(std::move(crossMwmGraph), std::move(indexGraphLoader), m_estimator,
+                                             MwmHierarchyHandler(m_numMwmIds, m_countryParentNameGetterFn));
     graph->SetRoutingOptions(routingOptions);
     return graph;
   }
@@ -1139,9 +1091,9 @@ unique_ptr<WorldGraph> IndexRouter::MakeWorldGraph()
                                         std::move(transitGraphLoader), m_estimator);
 }
 
-int IndexRouter::PointsOnEdgesSnapping::Snap(
-        m2::PointD const & start, m2::PointD const & finish, m2::PointD const & direction,
-        FakeEnding & startEnding, FakeEnding & finishEnding, bool & startIsCodirectional)
+int IndexRouter::PointsOnEdgesSnapping::Snap(m2::PointD const & start, m2::PointD const & finish,
+                                             m2::PointD const & direction, FakeEnding & startEnding,
+                                             FakeEnding & finishEnding, bool & startIsCodirectional)
 {
   if (m_startSegments.empty())  // A first call for the first starting point
   {
@@ -1187,8 +1139,8 @@ void IndexRouter::PointsOnEdgesSnapping::FillDeadEndsCache(m2::PointD const & po
   }, candidates);
 }
 
-void IndexRouter::PointsOnEdgesSnapping::EraseIfDeadEnd(
-        m2::PointD const & checkpoint, vector<RoadInfoT> & roads, std::set<Segment> & deadEnds) const
+void IndexRouter::PointsOnEdgesSnapping::EraseIfDeadEnd(m2::PointD const & checkpoint, vector<RoadInfoT> & roads,
+                                                        std::set<Segment> & deadEnds) const
 {
   // |deadEnds| cache is necessary to minimize number of calls a time consumption IsDeadEnd() method.
   base::EraseIf(roads, [&](RoadInfoT const & fullRoadInfo)
@@ -1209,8 +1161,8 @@ void IndexRouter::PointsOnEdgesSnapping::EraseIfDeadEnd(
 }
 
 // static
-bool IndexRouter::PointsOnEdgesSnapping::IsFencedOff(
-        m2::PointD const & point, EdgeProjectionT const & edgeProjection, vector<RoadInfoT> const & fences)
+bool IndexRouter::PointsOnEdgesSnapping::IsFencedOff(m2::PointD const & point, EdgeProjectionT const & edgeProjection,
+                                                     vector<RoadInfoT> const & fences)
 {
   auto const & edge = edgeProjection.first;
   auto const & projPoint = edgeProjection.second.GetPoint();
@@ -1222,8 +1174,8 @@ bool IndexRouter::PointsOnEdgesSnapping::IsFencedOff(
     {
       auto const & fencePointFrom = featureGeom[i - 1];
       auto const & fencePointTo = featureGeom[i];
-      if (IsTheSameSegments(fencePointFrom.GetPoint(), fencePointTo.GetPoint(),
-                            edge.GetStartPoint(), edge.GetEndPoint()))
+      if (IsTheSameSegments(fencePointFrom.GetPoint(), fencePointTo.GetPoint(), edge.GetStartPoint(),
+                            edge.GetEndPoint()))
       {
         continue;
       }
@@ -1233,10 +1185,8 @@ bool IndexRouter::PointsOnEdgesSnapping::IsFencedOff(
       // it's possible that |projPoint| is an end point of |edge| and |edge|
       // is connected with other edges. To prevent fencing off such edges with their
       // neighboring edges the condition !m2::IsPointOnSegment() is added.
-      if (m2::SegmentsIntersect(point, projPoint, fencePointFrom.GetPoint(),
-                                fencePointTo.GetPoint()) &&
-                                !m2::IsPointOnSegment(projPoint, fencePointFrom.GetPoint(),
-                                fencePointTo.GetPoint()))
+      if (m2::SegmentsIntersect(point, projPoint, fencePointFrom.GetPoint(), fencePointTo.GetPoint()) &&
+          !m2::IsPointOnSegment(projPoint, fencePointFrom.GetPoint(), fencePointTo.GetPoint()))
       {
         return true;
       }
@@ -1246,9 +1196,9 @@ bool IndexRouter::PointsOnEdgesSnapping::IsFencedOff(
 }
 
 // static
-void IndexRouter::PointsOnEdgesSnapping::RoadsToNearestEdges(
-        m2::PointD const & point, vector<RoadInfoT> const & roads,
-        IsEdgeProjGood const & isGood, vector<EdgeProjectionT> & edgeProj)
+void IndexRouter::PointsOnEdgesSnapping::RoadsToNearestEdges(m2::PointD const & point, vector<RoadInfoT> const & roads,
+                                                             IsEdgeProjGood const & isGood,
+                                                             vector<EdgeProjectionT> & edgeProj)
 {
   NearestEdgeFinder finder(point, isGood);
   for (auto const & road : roads)
@@ -1267,9 +1217,10 @@ Segment IndexRouter::PointsOnEdgesSnapping::GetSegmentByEdge(Edge const & edge)
 }
 
 // static
-bool IndexRouter::PointsOnEdgesSnapping::FindClosestCodirectionalEdge(
-        m2::PointD const & point, m2::PointD const & direction,
-        vector<EdgeProjectionT> const & candidates, Edge & closestCodirectionalEdge)
+bool IndexRouter::PointsOnEdgesSnapping::FindClosestCodirectionalEdge(m2::PointD const & point,
+                                                                      m2::PointD const & direction,
+                                                                      vector<EdgeProjectionT> const & candidates,
+                                                                      Edge & closestCodirectionalEdge)
 {
   double constexpr kInvalidDist = numeric_limits<double>::max();
   double squareDistToClosestCodirectionalEdgeM = kInvalidDist;
@@ -1295,20 +1246,20 @@ bool IndexRouter::PointsOnEdgesSnapping::FindClosestCodirectionalEdge(
   return squareDistToClosestCodirectionalEdgeM != kInvalidDist;
 }
 
-bool IndexRouter::PointsOnEdgesSnapping::FindBestSegments(
-        m2::PointD const & checkpoint, m2::PointD const & direction, bool isOutgoing,
-        vector<Segment> & bestSegments, bool & bestSegmentIsAlmostCodirectional)
+bool IndexRouter::PointsOnEdgesSnapping::FindBestSegments(m2::PointD const & checkpoint, m2::PointD const & direction,
+                                                          bool isOutgoing, vector<Segment> & bestSegments,
+                                                          bool & bestSegmentIsAlmostCodirectional)
 {
   vector<Edge> bestEdges;
-  if (!FindBestEdges(checkpoint, direction, isOutgoing, kFirstSearchDistanceM /* closestEdgesRadiusM */,
-                     bestEdges, bestSegmentIsAlmostCodirectional))
+  if (!FindBestEdges(checkpoint, direction, isOutgoing, kFirstSearchDistanceM /* closestEdgesRadiusM */, bestEdges,
+                     bestSegmentIsAlmostCodirectional))
   {
-    if (!FindBestEdges(checkpoint, direction, isOutgoing, 500.0 /* closestEdgesRadiusM */,
-                       bestEdges, bestSegmentIsAlmostCodirectional) &&
-                       bestEdges.size() < kMaxRoadCandidates)
+    if (!FindBestEdges(checkpoint, direction, isOutgoing, 500.0 /* closestEdgesRadiusM */, bestEdges,
+                       bestSegmentIsAlmostCodirectional) &&
+        bestEdges.size() < kMaxRoadCandidates)
     {
-      if (!FindBestEdges(checkpoint, direction, isOutgoing, 2000.0 /* closestEdgesRadiusM */,
-                         bestEdges, bestSegmentIsAlmostCodirectional))
+      if (!FindBestEdges(checkpoint, direction, isOutgoing, 2000.0 /* closestEdgesRadiusM */, bestEdges,
+                         bestSegmentIsAlmostCodirectional))
       {
         return false;
       }
@@ -1322,9 +1273,10 @@ bool IndexRouter::PointsOnEdgesSnapping::FindBestSegments(
   return true;
 }
 
-bool IndexRouter::PointsOnEdgesSnapping::FindBestEdges(
-        m2::PointD const & checkpoint, m2::PointD const & direction, bool isOutgoing, double closestEdgesRadiusM,
-        vector<Edge> & bestEdges, bool & bestSegmentIsAlmostCodirectional)
+bool IndexRouter::PointsOnEdgesSnapping::FindBestEdges(m2::PointD const & checkpoint, m2::PointD const & direction,
+                                                       bool isOutgoing, double closestEdgesRadiusM,
+                                                       vector<Edge> & bestEdges,
+                                                       bool & bestSegmentIsAlmostCodirectional)
 {
   auto const rect = mercator::RectByCenterXYAndSizeInMeters(checkpoint, closestEdgesRadiusM);
   auto closestRoads = m_router.m_roadGraph.FindRoads(rect, [this](FeatureID const & fid)
@@ -1404,8 +1356,9 @@ bool IndexRouter::PointsOnEdgesSnapping::FindBestEdges(
   return true;
 }
 
-IndexRouter::RoutingResultT const * IndexRouter::RoutesCalculator::Calc(
-    Segment const & beg, Segment const & end, ProgressPtrT const & progress, double progressCoef)
+IndexRouter::RoutingResultT const * IndexRouter::RoutesCalculator::Calc(Segment const & beg, Segment const & end,
+                                                                        ProgressPtrT const & progress,
+                                                                        double progressCoef)
 {
   auto itCache = m_cache.insert({{beg, end}, {}});
   auto * res = &itCache.first->second;
@@ -1427,9 +1380,8 @@ IndexRouter::RoutingResultT const * IndexRouter::RoutesCalculator::Calc(
 
     using Visitor = JunctionVisitor<JointsStarter>;
     AStarAlgorithm<Vertex, Edge, Weight>::Params<Visitor, AStarLengthChecker> params(
-        jointStarter, jointStarter.GetStartJoint(), jointStarter.GetFinishJoint(),
-        m_delegate.GetCancellable(), Visitor(jointStarter, m_delegate, kVisitPeriod, progress),
-        AStarLengthChecker(m_starter));
+        jointStarter, jointStarter.GetStartJoint(), jointStarter.GetFinishJoint(), m_delegate.GetCancellable(),
+        Visitor(jointStarter, m_delegate, kVisitPeriod, progress), AStarLengthChecker(m_starter));
 
     RoutingResult<JointSegment, RouteWeight> route;
     using AlgoT = AStarAlgorithm<Vertex, Edge, Weight>;
@@ -1456,8 +1408,9 @@ IndexRouter::RoutingResultT const * IndexRouter::RoutesCalculator::Calc(
   return res;
 }
 
-IndexRouter::RoutingResultT const * IndexRouter::RoutesCalculator::Calc2Times(
-    Segment const & beg, Segment const & end, ProgressPtrT const & progress, double progressCoef)
+IndexRouter::RoutingResultT const * IndexRouter::RoutesCalculator::Calc2Times(Segment const & beg, Segment const & end,
+                                                                              ProgressPtrT const & progress,
+                                                                              double progressCoef)
 {
   /// @see RussiaMoscow_ItalySienaCenter_SplittedMotorway
   /// Enter Tuscany motorway (43.5016115, 11.1872607) is splitted by MWM boundaries many times.
@@ -1472,11 +1425,9 @@ IndexRouter::RoutingResultT const * IndexRouter::RoutesCalculator::Calc2Times(
   return r;
 }
 
-RouterResultCode IndexRouter::ProcessLeapsJoints(vector<Segment> const & input,
-                                                 IndexGraphStarter & starter,
+RouterResultCode IndexRouter::ProcessLeapsJoints(vector<Segment> const & input, IndexGraphStarter & starter,
                                                  shared_ptr<AStarProgress> const & progress,
-                                                 RoutesCalculator & calculator,
-                                                 RoutingResultT & result)
+                                                 RoutesCalculator & calculator, RoutingResultT & result)
 {
   LOG(LDEBUG, ("Process input:", input));
 
@@ -1520,142 +1471,141 @@ RouterResultCode IndexRouter::ProcessLeapsJoints(vector<Segment> const & input,
   ASSERT(variantsCount > 0, ());
 
   for (size_t startLeapEnd : arrBeg)
-  for (size_t finishLeapStart : arrEnd)
-  {
-    size_t maxStart = 0;
-
-    auto const runAStarAlgorithm = [&](size_t start, size_t end, WorldGraphMode mode)
+    for (size_t finishLeapStart : arrEnd)
     {
-      ASSERT_LESS(start, input.size(), ());
-      ASSERT_LESS(end, input.size(), ());
+      size_t maxStart = 0;
 
-      maxStart = max(maxStart, start);
-      auto const contribCoef = static_cast<double>(end - maxStart + 1) / input.size() / variantsCount;
-
-      // VNG: I don't like this strategy with clearing previous caches, taking into account
-      // that all MWMs were quite likely already loaded before in calculating Leaps path.
-      // Clear previous loaded graphs to not spend too much memory at one time.
-      //worldGraph.ClearCachedGraphs();
-      worldGraph.SetMode(mode);
-
-      return calculator.Calc(input[start], input[end], progress, contribCoef);
-    };
-
-    vector<vector<Segment>> paths;
-    size_t prevStart = numeric_limits<size_t>::max();
-    auto const tryBuildRoute = [&](size_t start, size_t end, WorldGraphMode mode)
-    {
-      auto const * res = runAStarAlgorithm(start, end, mode);
-      if (res)
+      auto const runAStarAlgorithm = [&](size_t start, size_t end, WorldGraphMode mode)
       {
-        auto const & subroute = res->m_path;
-        CHECK(!subroute.empty(), ());
+        ASSERT_LESS(start, input.size(), ());
+        ASSERT_LESS(end, input.size(), ());
 
-        /// @todo How it's possible when prevStart == start ?
-        if (start == prevStart && !paths.empty())
-          paths.pop_back();
+        maxStart = max(maxStart, start);
+        auto const contribCoef = static_cast<double>(end - maxStart + 1) / input.size() / variantsCount;
 
-        auto begIter = subroute.cbegin();
-        if (dropFirstSegment)
-          ++begIter;
-        paths.emplace_back(begIter, subroute.cend());
+        // VNG: I don't like this strategy with clearing previous caches, taking into account
+        // that all MWMs were quite likely already loaded before in calculating Leaps path.
+        // Clear previous loaded graphs to not spend too much memory at one time.
+        // worldGraph.ClearCachedGraphs();
+        worldGraph.SetMode(mode);
 
-        dropFirstSegment = true;
-        prevStart = start;
-      }
-      else
+        return calculator.Calc(input[start], input[end], progress, contribCoef);
+      };
+
+      vector<vector<Segment>> paths;
+      size_t prevStart = numeric_limits<size_t>::max();
+      auto const tryBuildRoute = [&](size_t start, size_t end, WorldGraphMode mode)
       {
-        // This may happen when "Avoid roads option" is enabled.
-        // Cross-mwm LeapsGraph returns paths regardless of this option.
-        LOG(LINFO, ("Can not find path from:", starter.GetPoint(input[start], input[start].IsForward()),
-                                        "to:", starter.GetPoint(input[end], input[end].IsForward())));
-      }
-
-      return res;
-    };
-
-    size_t lastPrev = 0;
-    RouteWeight currentWeight = GetAStarWeightZero<RouteWeight>();
-    RouteWeight lastWeight = currentWeight;
-
-    for (size_t i = startLeapEnd; i <= finishLeapStart; ++i)
-    {
-      size_t prev, next;
-      if (i == startLeapEnd)
-      {
-        prev = 0;
-        next = i;
-      }
-      else if (i == finishLeapStart)
-      {
-        prev = i;
-        next = input.size() - 1;
-      }
-      else
-      {
-        prev = i;
-        next = i + 1;
-      }
-
-      RoutingResultT const * res = nullptr;
-      if (res = tryBuildRoute(prev, next, WorldGraphMode::JointSingleMwm); !res)
-      {
-        // As written above, it may happen when "Avoid option" is enabled.
-        // Possibile recover here is to shift |prev| and |next| to skip this "bad" MWM, and build a new
-        // (mode = Joints) route (via several MWMs).
-        // https://github.com/organicmaps/organicmaps/issues/5695
-
-        /// @todo Anyway, this _recovering_ is a crutch. Should compare result.m_distance on caller side
-        /// and call ProcessLeapsJoints for the next candidates (not for the "best" only).
-        /// "Cross MWMs" together with "Avoid options" doesn't guarantee a best route, because
-        /// cross-mwm graph keeps only _clean_ (no any avoids) weights.
-
-        if (prev > 0)
+        auto const * res = runAStarAlgorithm(start, end, mode);
+        if (res)
         {
-          prev = lastPrev;
-          currentWeight = lastWeight;
-          if (prev == 0)
-            dropFirstSegment = false;
+          auto const & subroute = res->m_path;
+          CHECK(!subroute.empty(), ());
+
+          /// @todo How it's possible when prevStart == start ?
+          if (start == prevStart && !paths.empty())
+            paths.pop_back();
+
+          auto begIter = subroute.cbegin();
+          if (dropFirstSegment)
+            ++begIter;
+          paths.emplace_back(begIter, subroute.cend());
+
+          dropFirstSegment = true;
+          prevStart = start;
+        }
+        else
+        {
+          // This may happen when "Avoid roads option" is enabled.
+          // Cross-mwm LeapsGraph returns paths regardless of this option.
+          LOG(LINFO, ("Can not find path from:", starter.GetPoint(input[start], input[start].IsForward()),
+                      "to:", starter.GetPoint(input[end], input[end].IsForward())));
         }
 
-        if (next + 2 > finishLeapStart)
-          next = input.size() - 1;
-        else
-          next += 2;
+        return res;
+      };
 
-        if (res = tryBuildRoute(prev, next, WorldGraphMode::Joints); !res)
-          return RouterResultCode::RouteNotFound;
-      }
+      size_t lastPrev = 0;
+      RouteWeight currentWeight = GetAStarWeightZero<RouteWeight>();
+      RouteWeight lastWeight = currentWeight;
 
-      lastPrev = prev;
-      lastWeight = currentWeight;
-      i = next;
-
-      currentWeight += res->m_distance;
-    }
-
-    // Update final result if new route is better.
-    LOG(LDEBUG, ("Got a route:", startLeapEnd, finishLeapStart, currentWeight));
-    if (result.Empty() || currentWeight < result.m_distance)
-    {
-      if (!result.Empty())
+      for (size_t i = startLeapEnd; i <= finishLeapStart; ++i)
       {
-        LOG(LDEBUG, ("Found better route, old weight =", result.m_distance, "new weight =", currentWeight));
-        result.Clear();
+        size_t prev, next;
+        if (i == startLeapEnd)
+        {
+          prev = 0;
+          next = i;
+        }
+        else if (i == finishLeapStart)
+        {
+          prev = i;
+          next = input.size() - 1;
+        }
+        else
+        {
+          prev = i;
+          next = i + 1;
+        }
+
+        RoutingResultT const * res = nullptr;
+        if (res = tryBuildRoute(prev, next, WorldGraphMode::JointSingleMwm); !res)
+        {
+          // As written above, it may happen when "Avoid option" is enabled.
+          // Possibile recover here is to shift |prev| and |next| to skip this "bad" MWM, and build a new
+          // (mode = Joints) route (via several MWMs).
+          // https://github.com/organicmaps/organicmaps/issues/5695
+
+          /// @todo Anyway, this _recovering_ is a crutch. Should compare result.m_distance on caller side
+          /// and call ProcessLeapsJoints for the next candidates (not for the "best" only).
+          /// "Cross MWMs" together with "Avoid options" doesn't guarantee a best route, because
+          /// cross-mwm graph keeps only _clean_ (no any avoids) weights.
+
+          if (prev > 0)
+          {
+            prev = lastPrev;
+            currentWeight = lastWeight;
+            if (prev == 0)
+              dropFirstSegment = false;
+          }
+
+          if (next + 2 > finishLeapStart)
+            next = input.size() - 1;
+          else
+            next += 2;
+
+          if (res = tryBuildRoute(prev, next, WorldGraphMode::Joints); !res)
+            return RouterResultCode::RouteNotFound;
+        }
+
+        lastPrev = prev;
+        lastWeight = currentWeight;
+        i = next;
+
+        currentWeight += res->m_distance;
       }
 
-      for (auto const & e : paths)
-        result.m_path.insert(result.m_path.end(), e.begin(), e.end());
+      // Update final result if new route is better.
+      LOG(LDEBUG, ("Got a route:", startLeapEnd, finishLeapStart, currentWeight));
+      if (result.Empty() || currentWeight < result.m_distance)
+      {
+        if (!result.Empty())
+        {
+          LOG(LDEBUG, ("Found better route, old weight =", result.m_distance, "new weight =", currentWeight));
+          result.Clear();
+        }
 
-      result.m_distance = currentWeight;
+        for (auto const & e : paths)
+          result.m_path.insert(result.m_path.end(), e.begin(), e.end());
+
+        result.m_distance = currentWeight;
+      }
     }
-  }
 
   return RouterResultCode::NoError;
 }
 
-RouterResultCode IndexRouter::RedressRoute(vector<Segment> const & segments,
-                                           base::Cancellable const & cancellable,
+RouterResultCode IndexRouter::RedressRoute(vector<Segment> const & segments, base::Cancellable const & cancellable,
                                            IndexGraphStarter & starter, Route & route)
 {
   CHECK(!segments.empty(), ());
@@ -1703,9 +1653,7 @@ RouterResultCode IndexRouter::RedressRoute(vector<Segment> const & segments,
 #ifdef DEBUG
   {
     auto const isPassThroughAllowed = [&worldGraph](Segment const & s)
-    {
-      return worldGraph.IsPassThroughAllowed(s.GetMwmId(), s.GetFeatureId());
-    };
+    { return worldGraph.IsPassThroughAllowed(s.GetMwmId(), s.GetFeatureId()); };
 
     auto const & rSegments = route.GetRouteSegments();
     ASSERT_EQUAL(segsCount, rSegments.size(), ());
@@ -1791,8 +1739,8 @@ bool IndexRouter::AreMwmsNear(IndexGraphStarter const & starter) const
       return true;
   }
 
-  return ms::DistanceOnEarth(starter.GetStartJunction().GetLatLon(),
-                             starter.GetFinishJunction().GetLatLon()) < kCloseMwmPointsDistanceM;
+  return ms::DistanceOnEarth(starter.GetStartJunction().GetLatLon(), starter.GetFinishJunction().GetLatLon()) <
+         kCloseMwmPointsDistanceM;
 }
 
 bool IndexRouter::DoesTransitSectionExist(NumMwmId numMwmId)
@@ -1800,8 +1748,7 @@ bool IndexRouter::DoesTransitSectionExist(NumMwmId numMwmId)
   return m_dataSource.GetSectionStatus(numMwmId, TRANSIT_FILE_TAG) == MwmDataSource::SectionExists;
 }
 
-RouterResultCode IndexRouter::ConvertTransitResult(set<NumMwmId> const & mwmIds,
-                                                   RouterResultCode resultCode)
+RouterResultCode IndexRouter::ConvertTransitResult(set<NumMwmId> const & mwmIds, RouterResultCode resultCode)
 {
   if (m_vehicleType != VehicleType::Transit || resultCode != RouterResultCode::RouteNotFound)
     return resultCode;
@@ -1850,19 +1797,12 @@ void IndexRouter::SetupAlgorithmMode(IndexGraphStarter & starter, bool guidesAct
   switch (m_vehicleType)
   {
   case VehicleType::Pedestrian:
-  case VehicleType::Bicycle:
-    starter.GetGraph().SetMode(WorldGraphMode::Joints);
-    break;
-  case VehicleType::Transit:
-    starter.GetGraph().SetMode(WorldGraphMode::NoLeaps);
-    break;
+  case VehicleType::Bicycle: starter.GetGraph().SetMode(WorldGraphMode::Joints); break;
+  case VehicleType::Transit: starter.GetGraph().SetMode(WorldGraphMode::NoLeaps); break;
   case VehicleType::Car:
-    starter.GetGraph().SetMode(AreMwmsNear(starter) ? WorldGraphMode::Joints
-                                                    : WorldGraphMode::LeapsOnly);
-    break;
-  case VehicleType::Count:
-    CHECK(false, ("Unknown vehicle type:", m_vehicleType));
+    starter.GetGraph().SetMode(AreMwmsNear(starter) ? WorldGraphMode::Joints : WorldGraphMode::LeapsOnly);
     break;
+  case VehicleType::Count: CHECK(false, ("Unknown vehicle type:", m_vehicleType)); break;
   }
 }
 }  // namespace routing
diff --git a/libs/routing/index_router.hpp b/libs/routing/index_router.hpp
index 6590854f9..500080492 100644
--- a/libs/routing/index_router.hpp
+++ b/libs/routing/index_router.hpp
@@ -31,7 +31,10 @@
 #include <string>
 #include <vector>
 
-namespace traffic { class TrafficCache; }
+namespace traffic
+{
+class TrafficCache;
+}
 
 namespace routing
 {
@@ -65,8 +68,7 @@ public:
     m2::PointD const m_direction;
   };
 
-  IndexRouter(VehicleType vehicleType, bool loadAltitudes,
-              CountryParentNameGetterFn const & countryParentNameGetterFn,
+  IndexRouter(VehicleType vehicleType, bool loadAltitudes, CountryParentNameGetterFn const & countryParentNameGetterFn,
               TCountryFileFn const & countryFileFn, CountryRectFn const & countryRectFn,
               std::shared_ptr<NumMwmIds> numMwmIds, std::unique_ptr<m4::Tree<NumMwmId>> numMwmTree,
               traffic::TrafficCache const & trafficCache, DataSource & dataSource);
@@ -78,43 +80,36 @@ public:
   void ClearState() override;
 
   void SetGuides(GuidesTracks && guides) override;
-  RouterResultCode CalculateRoute(Checkpoints const & checkpoints,
-                                  m2::PointD const & startDirection, bool adjustToPrevRoute,
-                                  RouterDelegate const & delegate, Route & route) override;
+  RouterResultCode CalculateRoute(Checkpoints const & checkpoints, m2::PointD const & startDirection,
+                                  bool adjustToPrevRoute, RouterDelegate const & delegate, Route & route) override;
 
-  bool FindClosestProjectionToRoad(m2::PointD const & point, m2::PointD const & direction,
-                                   double radius, EdgeProj & proj) override;
+  bool FindClosestProjectionToRoad(m2::PointD const & point, m2::PointD const & direction, double radius,
+                                   EdgeProj & proj) override;
 
   bool GetBestOutgoingEdges(m2::PointD const & checkpoint, WorldGraph & graph, std::vector<Edge> & edges);
 
   VehicleType GetVehicleType() const { return m_vehicleType; }
 
 private:
-  RouterResultCode CalculateSubrouteJointsMode(IndexGraphStarter & starter,
-                                               RouterDelegate const & delegate,
+  RouterResultCode CalculateSubrouteJointsMode(IndexGraphStarter & starter, RouterDelegate const & delegate,
                                                std::shared_ptr<AStarProgress> const & progress,
                                                std::vector<Segment> & subroute);
-  RouterResultCode CalculateSubrouteNoLeapsMode(IndexGraphStarter & starter,
-                                                RouterDelegate const & delegate,
+  RouterResultCode CalculateSubrouteNoLeapsMode(IndexGraphStarter & starter, RouterDelegate const & delegate,
                                                 std::shared_ptr<AStarProgress> const & progress,
                                                 std::vector<Segment> & subroute);
-  RouterResultCode CalculateSubrouteLeapsOnlyMode(Checkpoints const & checkpoints,
-                                                  size_t subrouteIdx, IndexGraphStarter & starter,
-                                                  RouterDelegate const & delegate,
+  RouterResultCode CalculateSubrouteLeapsOnlyMode(Checkpoints const & checkpoints, size_t subrouteIdx,
+                                                  IndexGraphStarter & starter, RouterDelegate const & delegate,
                                                   std::shared_ptr<AStarProgress> const & progress,
                                                   std::vector<Segment> & subroute);
 
-  RouterResultCode DoCalculateRoute(Checkpoints const & checkpoints,
-                                    m2::PointD const & startDirection,
+  RouterResultCode DoCalculateRoute(Checkpoints const & checkpoints, m2::PointD const & startDirection,
                                     RouterDelegate const & delegate, Route & route);
   RouterResultCode CalculateSubroute(Checkpoints const & checkpoints, size_t subrouteIdx,
-                                     RouterDelegate const & delegate,
-                                     std::shared_ptr<AStarProgress> const & progress,
+                                     RouterDelegate const & delegate, std::shared_ptr<AStarProgress> const & progress,
                                      IndexGraphStarter & graph, std::vector<Segment> & subroute,
                                      bool guidesActive = false);
 
-  RouterResultCode AdjustRoute(Checkpoints const & checkpoints,
-                               m2::PointD const & startDirection,
+  RouterResultCode AdjustRoute(Checkpoints const & checkpoints, m2::PointD const & startDirection,
                                RouterDelegate const & delegate, Route & route);
 
   std::unique_ptr<WorldGraph> MakeWorldGraph();
@@ -186,8 +181,8 @@ private:
                           std::vector<Segment> & bestSegments, bool & bestSegmentIsAlmostCodirectional);
 
     bool FindBestEdges(m2::PointD const & checkpoint, m2::PointD const & direction, bool isOutgoing,
-                       double closestEdgesRadiusM,
-                       std::vector<Edge> & bestEdges, bool & bestSegmentIsAlmostCodirectional);
+                       double closestEdgesRadiusM, std::vector<Edge> & bestEdges,
+                       bool & bestSegmentIsAlmostCodirectional);
   };
 
   using RoutingResultT = RoutingResult<Segment, RouteWeight>;
@@ -199,34 +194,32 @@ private:
 
   public:
     RoutesCalculator(IndexGraphStarter & starter, RouterDelegate const & delegate)
-      : m_starter(starter), m_delegate(delegate) {}
+      : m_starter(starter)
+      , m_delegate(delegate)
+    {}
 
     using ProgressPtrT = std::shared_ptr<AStarProgress>;
-    RoutingResultT const * Calc(Segment const & beg, Segment const & end,
-                                ProgressPtrT const & progress, double progressCoef);
+    RoutingResultT const * Calc(Segment const & beg, Segment const & end, ProgressPtrT const & progress,
+                                double progressCoef);
     // Makes JointSingleMwm first and Joints then, if first attempt was failed.
-    RoutingResultT const * Calc2Times(Segment const & beg, Segment const & end,
-                                      ProgressPtrT const & progress, double progressCoef);
+    RoutingResultT const * Calc2Times(Segment const & beg, Segment const & end, ProgressPtrT const & progress,
+                                      double progressCoef);
   };
 
   // Input route may contains 'leaps': shortcut edges from mwm border enter to exit.
   // ProcessLeaps replaces each leap with calculated route through mwm.
-  RouterResultCode ProcessLeapsJoints(std::vector<Segment> const & input,
-                                      IndexGraphStarter & starter,
-                                      std::shared_ptr<AStarProgress> const & progress,
-                                      RoutesCalculator & calculator,
+  RouterResultCode ProcessLeapsJoints(std::vector<Segment> const & input, IndexGraphStarter & starter,
+                                      std::shared_ptr<AStarProgress> const & progress, RoutesCalculator & calculator,
                                       RoutingResultT & result);
 
-  RouterResultCode RedressRoute(std::vector<Segment> const & segments,
-                                base::Cancellable const & cancellable, IndexGraphStarter & starter,
-                                Route & route);
+  RouterResultCode RedressRoute(std::vector<Segment> const & segments, base::Cancellable const & cancellable,
+                                IndexGraphStarter & starter, Route & route);
 
   bool AreSpeedCamerasProhibited(NumMwmId mwmID) const;
   bool AreMwmsNear(IndexGraphStarter const & starter) const;
   bool DoesTransitSectionExist(NumMwmId numMwmId);
 
-  RouterResultCode ConvertTransitResult(std::set<NumMwmId> const & mwmIds,
-                                        RouterResultCode resultCode);
+  RouterResultCode ConvertTransitResult(std::set<NumMwmId> const & mwmIds, RouterResultCode resultCode);
 
   /// \brief Fills |speedcamProhibitedMwms| with mwms which are crossed by |segments|
   /// where speed cameras are prohibited.
@@ -255,17 +248,15 @@ private:
   }
 
   void SetupAlgorithmMode(IndexGraphStarter & starter, bool guidesActive = false) const;
-  uint32_t ConnectTracksOnGuidesToOsm(std::vector<m2::PointD> const & checkpoints,
-                                      WorldGraph & graph);
+  uint32_t ConnectTracksOnGuidesToOsm(std::vector<m2::PointD> const & checkpoints, WorldGraph & graph);
 
-  void ConnectCheckpointsOnGuidesToOsm(std::vector<m2::PointD> const & checkpoints,
-                                       WorldGraph & graph);
+  void ConnectCheckpointsOnGuidesToOsm(std::vector<m2::PointD> const & checkpoints, WorldGraph & graph);
 
   void AddGuidesOsmConnectionsToGraphStarter(size_t checkpointIdxFrom, size_t checkpointIdxTo,
                                              IndexGraphStarter & starter);
 
-  void AppendPartsOfReal(LatLonWithAltitude const & point1, LatLonWithAltitude const & point2,
-                         uint32_t & startIdx, ConnectionToOsm & link);
+  void AppendPartsOfReal(LatLonWithAltitude const & point1, LatLonWithAltitude const & point2, uint32_t & startIdx,
+                         ConnectionToOsm & link);
 
   std::vector<Segment> GetBestOutgoingSegments(m2::PointD const & checkpoint, WorldGraph & graph);
 
diff --git a/libs/routing/joint_index.cpp b/libs/routing/joint_index.cpp
index 366315330..4683a95e9 100644
--- a/libs/routing/joint_index.cpp
+++ b/libs/routing/joint_index.cpp
@@ -15,8 +15,10 @@ void JointIndex::Build(RoadIndex const & roadIndex, uint32_t numJoints)
   // Calculate sizes.
   // Example for numJoints = 6:
   // 2, 5, 3, 4, 2, 3, 0
-  roadIndex.ForEachRoad([this, numJoints](uint32_t /* featureId */, RoadJointIds const & road) {
-    road.ForEachJoint([this, numJoints](uint32_t /* pointId */, Joint::Id jointId) {
+  roadIndex.ForEachRoad([this, numJoints](uint32_t /* featureId */, RoadJointIds const & road)
+  {
+    road.ForEachJoint([this, numJoints](uint32_t /* pointId */, Joint::Id jointId)
+    {
       UNUSED_VALUE(numJoints);
       ASSERT_LESS(jointId, numJoints, ());
       ++m_offsets[jointId];
@@ -33,8 +35,10 @@ void JointIndex::Build(RoadIndex const & roadIndex, uint32_t numJoints)
   // Now fill points.
   // Offsets after this operation are begin bounds:
   // 0, 2, 7, 10, 14, 16, 19
-  roadIndex.ForEachRoad([this](uint32_t featureId, RoadJointIds const & road) {
-    road.ForEachJoint([this, featureId](uint32_t pointId, Joint::Id jointId) {
+  roadIndex.ForEachRoad([this](uint32_t featureId, RoadJointIds const & road)
+  {
+    road.ForEachJoint([this, featureId](uint32_t pointId, Joint::Id jointId)
+    {
       uint32_t & offset = m_offsets[jointId];
       --offset;
       m_points[offset] = {featureId, pointId};
diff --git a/libs/routing/joint_segment.cpp b/libs/routing/joint_segment.cpp
index ab5076deb..195541fd4 100644
--- a/libs/routing/joint_segment.cpp
+++ b/libs/routing/joint_segment.cpp
@@ -40,7 +40,7 @@ void JointSegment::AssignID(JointSegment const & seg)
   m_featureId = seg.m_featureId;
 }
 
-JointSegment JointSegment::MakeFake(uint32_t fakeId, uint32_t featureId/* = kInvalidFeatureId*/)
+JointSegment JointSegment::MakeFake(uint32_t fakeId, uint32_t featureId /* = kInvalidFeatureId*/)
 {
   JointSegment res;
   res.m_featureId = featureId;
@@ -58,7 +58,7 @@ bool JointSegment::IsFake() const
   if (result)
   {
     // Try if m_featureId can be real in a fake JointSegment.
-    //ASSERT_EQUAL(m_featureId, kInvalidFeatureId, ());
+    // ASSERT_EQUAL(m_featureId, kInvalidFeatureId, ());
 
     ASSERT_EQUAL(m_startSegmentId, m_endSegmentId, ());
     ASSERT_EQUAL(m_forward, false, ());
@@ -91,9 +91,8 @@ bool JointSegment::operator<(JointSegment const & rhs) const
 
 bool JointSegment::operator==(JointSegment const & rhs) const
 {
-  return m_featureId == rhs.m_featureId && m_forward == rhs.m_forward &&
-         m_startSegmentId == rhs.m_startSegmentId && m_endSegmentId == rhs.m_endSegmentId &&
-         m_numMwmId == rhs.m_numMwmId;
+  return m_featureId == rhs.m_featureId && m_forward == rhs.m_forward && m_startSegmentId == rhs.m_startSegmentId &&
+         m_endSegmentId == rhs.m_endSegmentId && m_numMwmId == rhs.m_numMwmId;
 }
 
 std::string DebugPrint(JointSegment const & jointSegment)
@@ -102,8 +101,7 @@ std::string DebugPrint(JointSegment const & jointSegment)
   if (jointSegment.IsFake())
     out << "[FAKE]";
 
-  out << std::boolalpha
-      << "JointSegment(" << jointSegment.GetMwmId() << ", " << jointSegment.GetFeatureId() << ", "
+  out << std::boolalpha << "JointSegment(" << jointSegment.GetMwmId() << ", " << jointSegment.GetFeatureId() << ", "
       << "[" << jointSegment.GetStartSegmentId() << " => " << jointSegment.GetEndSegmentId() << "], "
       << jointSegment.IsForward() << ")";
   return out.str();
@@ -112,8 +110,7 @@ std::string DebugPrint(JointSegment const & jointSegment)
 
 namespace std
 {
-size_t
-std::hash<routing::JointSegment>::operator()(routing::JointSegment const & jointSegment) const
+size_t std::hash<routing::JointSegment>::operator()(routing::JointSegment const & jointSegment) const
 {
   size_t seed = 0;
   boost::hash_combine(seed, jointSegment.GetMwmId());
diff --git a/libs/routing/joint_segment.hpp b/libs/routing/joint_segment.hpp
index 2917b7b17..52b5c1fdf 100644
--- a/libs/routing/joint_segment.hpp
+++ b/libs/routing/joint_segment.hpp
@@ -35,10 +35,7 @@ public:
 
   bool operator<(JointSegment const & rhs) const;
   bool operator==(JointSegment const & rhs) const;
-  bool operator!=(JointSegment const & rhs) const
-  {
-    return !(*this == rhs);
-  }
+  bool operator!=(JointSegment const & rhs) const { return !(*this == rhs); }
 
 private:
   uint32_t m_featureId = kInvalidFeatureId;
@@ -53,9 +50,8 @@ private:
 class JointEdge
 {
 public:
-  JointEdge() = default;    // needed for buffer_vector only
-  JointEdge(JointSegment const & target, RouteWeight const & weight)
-    : m_target(target), m_weight(weight) {}
+  JointEdge() = default;  // needed for buffer_vector only
+  JointEdge(JointSegment const & target, RouteWeight const & weight) : m_target(target), m_weight(weight) {}
 
   JointSegment const & GetTarget() const { return m_target; }
   JointSegment & GetTarget() { return m_target; }
diff --git a/libs/routing/junction_visitor.cpp b/libs/routing/junction_visitor.cpp
index da5db3e60..8d6b1cafb 100644
--- a/libs/routing/junction_visitor.cpp
+++ b/libs/routing/junction_visitor.cpp
@@ -10,17 +10,17 @@ namespace routing
 
 #ifdef DEBUG
 // Leaps algorithm.
-void DebugRoutingState(Segment const & vertex, std::optional<Segment> const & parent,
-                       RouteWeight const & heuristic, RouteWeight const & distance)
+void DebugRoutingState(Segment const & vertex, std::optional<Segment> const & parent, RouteWeight const & heuristic,
+                       RouteWeight const & distance)
 {
   // 1. Dump current processing vertex.
-//  std::cout << DebugPrint(vertex);
-//  std::cout << std::setprecision(8) << "; H = " << heuristic << "; D = " << distance;
+  //  std::cout << DebugPrint(vertex);
+  //  std::cout << std::setprecision(8) << "; H = " << heuristic << "; D = " << distance;
 
   // 2. Dump parent vertex.
-//  std::cout << "; P = " << (parent ? DebugPrint(*parent) : std::string("NO"));
+  //  std::cout << "; P = " << (parent ? DebugPrint(*parent) : std::string("NO"));
 
-//  std::cout << std::endl;
+  //  std::cout << std::endl;
 }
 
 // Joints algorithm.
@@ -28,29 +28,29 @@ void DebugRoutingState(JointSegment const & vertex, std::optional<JointSegment>
                        RouteWeight const & heuristic, RouteWeight const & distance)
 {
   // 1. Dump current processing vertex.
-//  std::cout << DebugPrint(vertex);
-//  std::cout << std::setprecision(8) << "; H = " << heuristic << "; D = " << distance;
+  //  std::cout << DebugPrint(vertex);
+  //  std::cout << std::setprecision(8) << "; H = " << heuristic << "; D = " << distance;
 
   // 2. Dump parent vertex.
-//  std::cout << "; P = " << (parent ? DebugPrint(*parent) : std::string("NO"));
+  //  std::cout << "; P = " << (parent ? DebugPrint(*parent) : std::string("NO"));
 
-//  std::cout << std::endl;
+  //  std::cout << std::endl;
 
   // 3. Set breakpoint on a specific vertex.
-//  if (vertex.GetMwmId() == 400 && vertex.GetFeatureId() == 2412 &&
-//      vertex.GetEndSegmentId() == 0)
-//  {
-//    int noop = 0;
-//  }
+  //  if (vertex.GetMwmId() == 400 && vertex.GetFeatureId() == 2412 &&
+  //      vertex.GetEndSegmentId() == 0)
+  //  {
+  //    int noop = 0;
+  //  }
 
   // 4. Set breakpoint when MWM was changed.
-//  if (parent)
-//  {
-//    auto const & p = *parent;
-//    if (!p.IsFake() && !vertex.IsFake() && p.GetMwmId() != vertex.GetMwmId())
-//      int noop = 0;
-//  }
+  //  if (parent)
+  //  {
+  //    auto const & p = *parent;
+  //    if (!p.IsFake() && !vertex.IsFake() && p.GetMwmId() != vertex.GetMwmId())
+  //      int noop = 0;
+  //  }
 }
 #endif
 
-} // namespace routing
+}  // namespace routing
diff --git a/libs/routing/junction_visitor.hpp b/libs/routing/junction_visitor.hpp
index a410b5f04..d4f2a9837 100644
--- a/libs/routing/junction_visitor.hpp
+++ b/libs/routing/junction_visitor.hpp
@@ -19,8 +19,8 @@ inline void DebugRoutingState(...) {}
 class JointSegment;
 class RouteWeight;
 class Segment;
-void DebugRoutingState(Segment const & vertex, std::optional<Segment> const & parent,
-                       RouteWeight const & heuristic, RouteWeight const & distance);
+void DebugRoutingState(Segment const & vertex, std::optional<Segment> const & parent, RouteWeight const & heuristic,
+                       RouteWeight const & distance);
 void DebugRoutingState(JointSegment const & vertex, std::optional<JointSegment> const & parent,
                        RouteWeight const & heuristic, RouteWeight const & distance);
 #endif
@@ -33,7 +33,10 @@ public:
 
   JunctionVisitor(Graph & graph, RouterDelegate const & delegate, uint32_t visitPeriod,
                   std::shared_ptr<AStarProgress> const & progress = nullptr)
-    : m_graph(graph), m_delegate(delegate), m_visitPeriod(visitPeriod), m_progress(progress)
+    : m_graph(graph)
+    , m_delegate(delegate)
+    , m_visitPeriod(visitPeriod)
+    , m_progress(progress)
   {
     if (progress)
       m_lastProgressPercent = progress->GetLastPercent();
@@ -41,7 +44,8 @@ public:
 
   /// @param[in]  p   { Current state, Step context } pair.
   /// @param[in]  to  End vertex (final for forward and start for backward waves).
-  template <class StateContextPair> void operator()(StateContextPair const & p, Vertex const & to)
+  template <class StateContextPair>
+  void operator()(StateContextPair const & p, Vertex const & to)
   {
     auto const & state = p.first;
 #ifdef DEBUG
diff --git a/libs/routing/latlon_with_altitude.cpp b/libs/routing/latlon_with_altitude.cpp
index 6d5594cc1..1501a8414 100644
--- a/libs/routing/latlon_with_altitude.cpp
+++ b/libs/routing/latlon_with_altitude.cpp
@@ -10,8 +10,8 @@ namespace routing
 std::string DebugPrint(LatLonWithAltitude const & latLonWithAltitude)
 {
   std::stringstream ss;
-  ss << "LatLonWithAltitude(" << DebugPrint(latLonWithAltitude.GetLatLon()) << ", "
-     << latLonWithAltitude.GetAltitude() << ")";
+  ss << "LatLonWithAltitude(" << DebugPrint(latLonWithAltitude.GetLatLon()) << ", " << latLonWithAltitude.GetAltitude()
+     << ")";
   return ss.str();
 }
 
diff --git a/libs/routing/latlon_with_altitude.hpp b/libs/routing/latlon_with_altitude.hpp
index 2171246b8..6d574a89d 100644
--- a/libs/routing/latlon_with_altitude.hpp
+++ b/libs/routing/latlon_with_altitude.hpp
@@ -11,10 +11,7 @@ class LatLonWithAltitude
 {
 public:
   LatLonWithAltitude() = default;
-  LatLonWithAltitude(ms::LatLon const & latlon, geometry::Altitude altitude)
-    : m_latlon(latlon), m_altitude(altitude)
-  {
-  }
+  LatLonWithAltitude(ms::LatLon const & latlon, geometry::Altitude altitude) : m_latlon(latlon), m_altitude(altitude) {}
 
   bool operator==(LatLonWithAltitude const & rhs) const;
   bool operator<(LatLonWithAltitude const & rhs) const;
diff --git a/libs/routing/leaps_graph.cpp b/libs/routing/leaps_graph.cpp
index c2405f32a..37b7e1227 100644
--- a/libs/routing/leaps_graph.cpp
+++ b/libs/routing/leaps_graph.cpp
@@ -11,7 +11,8 @@
 namespace routing
 {
 LeapsGraph::LeapsGraph(IndexGraphStarter & starter, MwmHierarchyHandler && hierarchyHandler)
-  : m_starter(starter), m_hierarchyHandler(std::move(hierarchyHandler))
+  : m_starter(starter)
+  , m_hierarchyHandler(std::move(hierarchyHandler))
 {
   m_startPoint = m_starter.GetPoint(m_starter.GetStartSegment(), true /* front */);
   m_finishPoint = m_starter.GetPoint(m_starter.GetFinishSegment(), true /* front */);
@@ -19,14 +20,12 @@ LeapsGraph::LeapsGraph(IndexGraphStarter & starter, MwmHierarchyHandler && hiera
   m_finishSegment = m_starter.GetFinishSegment();
 }
 
-void LeapsGraph::GetOutgoingEdgesList(astar::VertexData<Vertex, Weight> const & vertexData,
-                                      EdgeListT & edges)
+void LeapsGraph::GetOutgoingEdgesList(astar::VertexData<Vertex, Weight> const & vertexData, EdgeListT & edges)
 {
   GetEdgesList(vertexData.m_vertex, true /* isOutgoing */, edges);
 }
 
-void LeapsGraph::GetIngoingEdgesList(astar::VertexData<Vertex, Weight> const & vertexData,
-                                     EdgeListT & edges)
+void LeapsGraph::GetIngoingEdgesList(astar::VertexData<Vertex, Weight> const & vertexData, EdgeListT & edges)
 {
   GetEdgesList(vertexData.m_vertex, false /* isOutgoing */, edges);
 }
diff --git a/libs/routing/leaps_graph.hpp b/libs/routing/leaps_graph.hpp
index 52f9879e2..7da6c2837 100644
--- a/libs/routing/leaps_graph.hpp
+++ b/libs/routing/leaps_graph.hpp
@@ -21,10 +21,8 @@ public:
 
   // AStarGraph overrides:
   // @{
-  void GetOutgoingEdgesList(astar::VertexData<Vertex, Weight> const & vertexData,
-                            EdgeListT & edges) override;
-  void GetIngoingEdgesList(astar::VertexData<Vertex, Weight> const & vertexData,
-                           EdgeListT & edges) override;
+  void GetOutgoingEdgesList(astar::VertexData<Vertex, Weight> const & vertexData, EdgeListT & edges) override;
+  void GetIngoingEdgesList(astar::VertexData<Vertex, Weight> const & vertexData, EdgeListT & edges) override;
   RouteWeight HeuristicCostEstimate(Segment const & from, Segment const & to) override;
   RouteWeight GetAStarWeightEpsilon() override;
   // @}
diff --git a/libs/routing/leaps_postprocessor.cpp b/libs/routing/leaps_postprocessor.cpp
index 2ff296613..cdaef57b3 100644
--- a/libs/routing/leaps_postprocessor.cpp
+++ b/libs/routing/leaps_postprocessor.cpp
@@ -25,10 +25,7 @@ public:
     m_intervals.emplace_back(pathInterval);
   }
 
-  std::vector<LeapsPostProcessor::PathInterval> && StealIntervals()
-  {
-    return std::move(m_intervals);
-  }
+  std::vector<LeapsPostProcessor::PathInterval> && StealIntervals() { return std::move(m_intervals); }
 
 private:
   base::NonIntersectingIntervals<size_t> m_nonIntersectingIntervals;
@@ -52,10 +49,9 @@ size_t const LeapsPostProcessor::kMaxStep = 5;
 /// Thus if we look at the first s1, we will find out that a jump to second s1 exists
 /// and we will skip all segments between first and second s1 and the result path will be:
 /// s1, s11, s12, ... , s100
-LeapsPostProcessor::LeapsPostProcessor(std::vector<Segment> const & path,
-                                       IndexGraphStarter & starter)
-  : m_starter(starter),
-    m_bfs(starter)
+LeapsPostProcessor::LeapsPostProcessor(std::vector<Segment> const & path, IndexGraphStarter & starter)
+  : m_starter(starter)
+  , m_bfs(starter)
 {
   std::map<size_t, size_t> jumps;
   std::map<Segment, size_t> segmentToIndex;
@@ -173,36 +169,36 @@ auto LeapsPostProcessor::CalculateIntervalsToRelax() -> std::set<PathInterval, P
   return result;
 }
 
-void LeapsPostProcessor::FillIngoingPaths(
-    Segment const & start, std::map<Segment, LeapsPostProcessor::SegmentData> & segmentsData)
+void LeapsPostProcessor::FillIngoingPaths(Segment const & start,
+                                          std::map<Segment, LeapsPostProcessor::SegmentData> & segmentsData)
 {
-  m_bfs.Run(start, false /* isOutgoing */,
-            [&segmentsData, this](BFS<IndexGraphStarter>::State const & state)
-            {
-              if (segmentsData.count(state.m_vertex) != 0)
-                return false;
+  m_bfs.Run(start, false /* isOutgoing */, [&segmentsData, this](BFS<IndexGraphStarter>::State const & state)
+  {
+    if (segmentsData.count(state.m_vertex) != 0)
+      return false;
 
-              auto const & parent = segmentsData[state.m_parent];
-              ASSERT_LESS_OR_EQUAL(parent.m_steps, kMaxStep, ());
-              if (parent.m_steps == kMaxStep)
-                return false;
+    auto const & parent = segmentsData[state.m_parent];
+    ASSERT_LESS_OR_EQUAL(parent.m_steps, kMaxStep, ());
+    if (parent.m_steps == kMaxStep)
+      return false;
 
-              auto & current = segmentsData[state.m_vertex];
-              current.m_summaryETA =
-                  parent.m_summaryETA + m_starter.CalculateETAWithoutPenalty(state.m_vertex);
+    auto & current = segmentsData[state.m_vertex];
+    current.m_summaryETA = parent.m_summaryETA + m_starter.CalculateETAWithoutPenalty(state.m_vertex);
 
-              current.m_steps = parent.m_steps + 1;
+    current.m_steps = parent.m_steps + 1;
 
-              return true;
-            });
+    return true;
+  });
 }
 
-LeapsPostProcessor::SegmentData::SegmentData(size_t steps, double eta)
-  : m_steps(steps), m_summaryETA(eta) {}
+LeapsPostProcessor::SegmentData::SegmentData(size_t steps, double eta) : m_steps(steps), m_summaryETA(eta) {}
 
-LeapsPostProcessor::PathInterval::PathInterval(double weight, size_t left, size_t right,
-                                               std::vector<Segment> && path)
-  : m_winWeight(weight), m_left(left), m_right(right), m_path(std::move(path)) {}
+LeapsPostProcessor::PathInterval::PathInterval(double weight, size_t left, size_t right, std::vector<Segment> && path)
+  : m_winWeight(weight)
+  , m_left(left)
+  , m_right(right)
+  , m_path(std::move(path))
+{}
 
 bool LeapsPostProcessor::PathInterval::GreaterByWeight::operator()(PathInterval const & lhs,
                                                                    PathInterval const & rhs) const
@@ -212,8 +208,7 @@ bool LeapsPostProcessor::PathInterval::GreaterByWeight::operator()(PathInterval
 
 bool LeapsPostProcessor::PathInterval::operator<(PathInterval const & rhs) const
 {
-  CHECK(m_left > rhs.m_right || m_right < rhs.m_left ||
-        (m_left == rhs.m_left && m_right == rhs.m_right),
+  CHECK(m_left > rhs.m_right || m_right < rhs.m_left || (m_left == rhs.m_left && m_right == rhs.m_right),
         ("Intervals shouldn't intersect.", *this, rhs));
 
   return m_right < rhs.m_left;
@@ -222,8 +217,7 @@ bool LeapsPostProcessor::PathInterval::operator<(PathInterval const & rhs) const
 std::string DebugPrint(LeapsPostProcessor::PathInterval const & interval)
 {
   std::stringstream ss;
-  ss << "[" << interval.m_left << ", " << interval.m_right << "], weight = "
-     << interval.m_winWeight;
+  ss << "[" << interval.m_left << ", " << interval.m_right << "], weight = " << interval.m_winWeight;
 
   return ss.str();
 }
diff --git a/libs/routing/loaded_path_segment.hpp b/libs/routing/loaded_path_segment.hpp
index b14bd1487..27e02483e 100644
--- a/libs/routing/loaded_path_segment.hpp
+++ b/libs/routing/loaded_path_segment.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "routing/road_point.hpp"
-#include "routing/turns.hpp"
-#include "routing/segment.hpp"
-#include "routing/route.hpp"
 #include "routing/maxspeeds.hpp"
+#include "routing/road_point.hpp"
+#include "routing/route.hpp"
+#include "routing/segment.hpp"
+#include "routing/turns.hpp"
 
 #include "indexer/ftypes_matcher.hpp"
 
@@ -25,7 +25,7 @@ struct LoadedPathSegment
   std::vector<geometry::PointWithAltitude> m_path;
   std::vector<turns::SingleLaneInfo> m_lanes;
   RouteSegment::RoadNameInfo m_roadNameInfo;
-  //double m_weight = 0.0; /*!< Time in seconds to pass the segment. */
+  // double m_weight = 0.0; /*!< Time in seconds to pass the segment. */
   SegmentRange m_segmentRange;
   std::vector<Segment> m_segments; /*!< Traffic segments for |m_path|. */
   ftypes::HighwayClass m_highwayClass = ftypes::HighwayClass::Undefined;
diff --git a/libs/routing/maxspeeds.cpp b/libs/routing/maxspeeds.cpp
index 3335af4a6..950df64e9 100644
--- a/libs/routing/maxspeeds.cpp
+++ b/libs/routing/maxspeeds.cpp
@@ -33,12 +33,11 @@ Maxspeed Maxspeeds::GetMaxspeed(uint32_t fid) const
   }
 
   // Bidirectional maxspeeds.
-  auto const range = std::equal_range(
-      m_bidirectionalMaxspeeds.cbegin(), m_bidirectionalMaxspeeds.cend(),
-      fid, FeatureMaxspeed::Less());
+  auto const range = std::equal_range(m_bidirectionalMaxspeeds.cbegin(), m_bidirectionalMaxspeeds.cend(), fid,
+                                      FeatureMaxspeed::Less());
 
   if (range.second == range.first)
-    return Maxspeed(); // No maxspeed for |fid| is set. Returns an invalid Maxspeed instance.
+    return Maxspeed();  // No maxspeed for |fid| is set. Returns an invalid Maxspeed instance.
 
   CHECK_EQUAL(range.second - range.first, 1, ());
   return range.first->GetMaxspeed();
@@ -76,8 +75,7 @@ std::unique_ptr<Maxspeeds> LoadMaxspeeds(MwmSet::MwmHandle const & handle)
   }
   catch (Reader::Exception const & e)
   {
-    LOG(LERROR, ("File", value->GetCountryFileName(), "Error while reading", MAXSPEEDS_FILE_TAG,
-                 "section.", e.Msg()));
+    LOG(LERROR, ("File", value->GetCountryFileName(), "Error while reading", MAXSPEEDS_FILE_TAG, "section.", e.Msg()));
     return std::make_unique<Maxspeeds>();
   }
 }
diff --git a/libs/routing/maxspeeds.hpp b/libs/routing/maxspeeds.hpp
index 8a742e326..cb82b2304 100644
--- a/libs/routing/maxspeeds.hpp
+++ b/libs/routing/maxspeeds.hpp
@@ -10,12 +10,11 @@
 #include "coding/simple_dense_coding.hpp"
 
 #include <memory>
-#include <vector>
 #include <unordered_map>
+#include <vector>
 
 #include "3party/succinct/elias_fano.hpp"
 
-
 namespace routing
 {
 class MaxspeedsSerializer;
diff --git a/libs/routing/maxspeeds_serialization.cpp b/libs/routing/maxspeeds_serialization.cpp
index 914c9fec1..d79742456 100644
--- a/libs/routing/maxspeeds_serialization.cpp
+++ b/libs/routing/maxspeeds_serialization.cpp
@@ -2,8 +2,8 @@
 
 namespace routing
 {
-std::vector<uint8_t> MaxspeedsSerializer::GetForwardMaxspeeds(
-    std::vector<FeatureSpeedMacro> const & speeds, uint32_t & maxFeatureID)
+std::vector<uint8_t> MaxspeedsSerializer::GetForwardMaxspeeds(std::vector<FeatureSpeedMacro> const & speeds,
+                                                              uint32_t & maxFeatureID)
 {
   std::vector<uint8_t> result;
   for (auto const & s : speeds)
diff --git a/libs/routing/maxspeeds_serialization.hpp b/libs/routing/maxspeeds_serialization.hpp
index e55f7b3be..1b56ae4c0 100644
--- a/libs/routing/maxspeeds_serialization.hpp
+++ b/libs/routing/maxspeeds_serialization.hpp
@@ -49,7 +49,9 @@ public:
   struct FeatureSpeedMacro
   {
     FeatureSpeedMacro(uint32_t featureID, SpeedMacro forward, SpeedMacro backward = SpeedMacro::Undefined)
-      : m_featureID(featureID), m_forward(forward), m_backward(backward)
+      : m_featureID(featureID)
+      , m_forward(forward)
+      , m_backward(backward)
     {
       // We store bidirectional speeds only if they are not equal,
       // see Maxspeed::IsBidirectional() comments.
@@ -69,14 +71,12 @@ public:
   static int constexpr DEFAULT_SPEEDS_COUNT = Maxspeeds::DEFAULT_SPEEDS_COUNT;
 
   template <class Sink>
-  static void Serialize(std::vector<FeatureSpeedMacro> const & featureSpeeds,
-                        HW2SpeedMap typeSpeeds[], Sink & sink)
+  static void Serialize(std::vector<FeatureSpeedMacro> const & featureSpeeds, HW2SpeedMap typeSpeeds[], Sink & sink)
   {
     CHECK(base::IsSortedAndUnique(featureSpeeds.cbegin(), featureSpeeds.cend(),
                                   [](FeatureSpeedMacro const & l, FeatureSpeedMacro const & r)
-                                  {
-                                    return l.m_featureID < r.m_featureID;
-                                  }), ());
+    { return l.m_featureID < r.m_featureID; }),
+          ());
 
     // Version
     auto const startOffset = sink.Pos();
@@ -98,10 +98,8 @@ public:
     {
       succinct::elias_fano::elias_fano_builder builder(maxFeatureID + 1, forwardCount);
       for (auto const & e : featureSpeeds)
-      {
         if (!e.IsBidirectional())
           builder.push_back(e.m_featureID);
-      }
 
       coding::FreezeVisitor<Writer> visitor(sink);
       succinct::elias_fano(&builder).map(visitor);
@@ -152,11 +150,10 @@ public:
     sink.Seek(endOffset);
 
     // Print statistics.
-    LOG(LINFO, ("Serialized", forwardCount, "forward maxspeeds and",
-                header.m_bidirectionalMaxspeedNumber,
+    LOG(LINFO, ("Serialized", forwardCount, "forward maxspeeds and", header.m_bidirectionalMaxspeedNumber,
                 "bidirectional maxspeeds. Section size:", endOffset - startOffset, "bytes."));
-    LOG(LINFO, ("Succinct EF compression ratio:",
-                forwardCount * (4 + 1) / double(header.m_bidirectionalMaxspeedOffset)));
+    LOG(LINFO,
+        ("Succinct EF compression ratio:", forwardCount * (4 + 1) / double(header.m_bidirectionalMaxspeedOffset)));
   }
 
   template <class Source>
@@ -180,8 +177,8 @@ public:
       std::vector<uint8_t> forwardTableData(header.m_forwardMaxspeedOffset);
       src.Read(forwardTableData.data(), forwardTableData.size());
       maxspeeds.m_forwardMaxspeedTableRegion = std::make_unique<CopiedMemoryRegion>(std::move(forwardTableData));
-      coding::Map(maxspeeds.m_forwardMaxspeedsTable,
-          maxspeeds.m_forwardMaxspeedTableRegion->ImmutableData(), "ForwardMaxspeedsTable");
+      coding::Map(maxspeeds.m_forwardMaxspeedsTable, maxspeeds.m_forwardMaxspeedTableRegion->ImmutableData(),
+                  "ForwardMaxspeedsTable");
 
       std::vector<uint8_t> forwardData(header.m_bidirectionalMaxspeedOffset - header.m_forwardMaxspeedOffset);
       src.Read(forwardData.data(), forwardData.size());
@@ -233,7 +230,7 @@ public:
           auto const type = static_cast<HighwayType>(ReadVarUint<uint32_t>(src));
           auto const speed = converter.MacroToSpeed(static_cast<SpeedMacro>(ReadPrimitiveFromSource<uint8_t>(src)));
           // Constraint should be met, but unit tests use different input Units. No problem here.
-          //ASSERT_EQUAL(speed.GetUnits(), measurement_utils::Units::Metric, ());
+          // ASSERT_EQUAL(speed.GetUnits(), measurement_utils::Units::Metric, ());
           maxspeeds.m_defaultSpeeds[ind][type] = speed.GetSpeed();
         }
       }
diff --git a/libs/routing/mwm_hierarchy_handler.cpp b/libs/routing/mwm_hierarchy_handler.cpp
index fd862d758..bd60b2fe9 100644
--- a/libs/routing/mwm_hierarchy_handler.cpp
+++ b/libs/routing/mwm_hierarchy_handler.cpp
@@ -14,18 +14,14 @@ inline size_t constexpr kCrossCountryPenaltyS = 60 * 60 * 2;
 using CountrySetT = std::unordered_set<std::string_view>;
 
 // The Eurasian Economic Union (EAEU) list of countries.
-CountrySetT kEAEU = {
-  "Armenia", "Belarus", "Kazakhstan", "Kyrgyzstan", "Russian Federation"
-};
+CountrySetT kEAEU = {"Armenia", "Belarus", "Kazakhstan", "Kyrgyzstan", "Russian Federation"};
 
 // The Schengen Area list of countries.
-CountrySetT kSchengenArea = {
-    "Austria", "Belgium",       "Czech Republic", "Denmark",    "Estonia",  "Finland",
-    "France",  "Germany",       "Greece",         "Hungary",    "Iceland",  "Italy",
-    "Latvia",  "Liechtenstein", "Lithuania",      "Luxembourg", "Malta",    "Netherlands",
-    "Norway",  "Poland",        "Portugal",       "Slovakia",   "Slovenia", "Spain",
-    "Sweden",  "Switzerland",   "Croatia"
-};
+CountrySetT kSchengenArea = {"Austria", "Belgium",       "Czech Republic", "Denmark",    "Estonia",  "Finland",
+                             "France",  "Germany",       "Greece",         "Hungary",    "Iceland",  "Italy",
+                             "Latvia",  "Liechtenstein", "Lithuania",      "Luxembourg", "Malta",    "Netherlands",
+                             "Norway",  "Poland",        "Portugal",       "Slovakia",   "Slovenia", "Spain",
+                             "Sweden",  "Switzerland",   "Croatia"};
 
 std::string_view kIreland = "Ireland";
 std::string_view kNorthernIrelandMwm = "UK_Northern Ireland";
@@ -33,15 +29,14 @@ std::string_view kNorthernIrelandMwm = "UK_Northern Ireland";
 // In fact, there is no _total_ border control on major roads between Israel and Palestine (UN boundary), except:
 // - Gaza, strict access/barrier restrictions should be mapped, no transit traffic.
 // - West bank wall (https://www.openstreetmap.org/relation/1410327), access/barrier restrictions should be mapped.
-CountrySetT kIsraelAndPalestine = { "Israel Region", "Palestine Region" };
+CountrySetT kIsraelAndPalestine = {"Israel Region", "Palestine Region"};
 std::string_view kJerusalemMwm = "Jerusalem";
 
 bool IsInSet(CountrySetT const & theSet, std::string const & country)
 {
   return theSet.find(country) != theSet.end();
 }
-} // namespace
-
+}  // namespace
 
 /// @return Top level hierarchy name for MWMs \a mwmName.
 /// @note May be empty for the disputed territories.
@@ -62,11 +57,10 @@ std::string GetCountryByMwmName(std::string const & mwmName, CountryParentNameGe
   return country;
 }
 
-MwmHierarchyHandler::MwmHierarchyHandler(std::shared_ptr<NumMwmIds> numMwmIds,
-                                         CountryParentNameGetterFn parentGetterFn)
-  : m_numMwmIds(std::move(numMwmIds)), m_countryParentNameGetterFn(std::move(parentGetterFn))
-{
-}
+MwmHierarchyHandler::MwmHierarchyHandler(std::shared_ptr<NumMwmIds> numMwmIds, CountryParentNameGetterFn parentGetterFn)
+  : m_numMwmIds(std::move(numMwmIds))
+  , m_countryParentNameGetterFn(std::move(parentGetterFn))
+{}
 
 std::string MwmHierarchyHandler::GetMwmName(NumMwmId mwmId) const
 {
@@ -112,11 +106,8 @@ bool MwmHierarchyHandler::HasCrossBorderPenalty(NumMwmId mwmId1, NumMwmId mwmId2
   if (country1 == country2)
     return false;
 
-  if ((country1 == kIreland && mwm2 == kNorthernIrelandMwm) ||
-      (country2 == kIreland && mwm1 == kNorthernIrelandMwm))
-  {
+  if ((country1 == kIreland && mwm2 == kNorthernIrelandMwm) || (country2 == kIreland && mwm1 == kNorthernIrelandMwm))
     return false;
-  }
 
   if (IsInSet(kIsraelAndPalestine, country1) && IsInSet(kIsraelAndPalestine, country2))
     return false;
diff --git a/libs/routing/mwm_hierarchy_handler.hpp b/libs/routing/mwm_hierarchy_handler.hpp
index 144c34611..4c647e7f4 100644
--- a/libs/routing/mwm_hierarchy_handler.hpp
+++ b/libs/routing/mwm_hierarchy_handler.hpp
@@ -19,8 +19,7 @@ public:
   // Used in tests only.
   MwmHierarchyHandler() = default;
   // Used in IndexRouter.
-  MwmHierarchyHandler(std::shared_ptr<NumMwmIds> numMwmIds,
-                      CountryParentNameGetterFn countryParentNameGetterFn);
+  MwmHierarchyHandler(std::shared_ptr<NumMwmIds> numMwmIds, CountryParentNameGetterFn countryParentNameGetterFn);
 
   bool HasCrossBorderPenalty(NumMwmId mwmId1, NumMwmId mwmId2);
   RouteWeight GetCrossBorderPenalty(NumMwmId mwmId1, NumMwmId mwmId2);
diff --git a/libs/routing/nearest_edge_finder.cpp b/libs/routing/nearest_edge_finder.cpp
index b409f1ed1..f7c0a41fa 100644
--- a/libs/routing/nearest_edge_finder.cpp
+++ b/libs/routing/nearest_edge_finder.cpp
@@ -10,9 +10,9 @@ namespace routing
 using namespace std;
 
 NearestEdgeFinder::NearestEdgeFinder(m2::PointD const & point, IsEdgeProjGood const & isEdgeProjGood)
-  : m_point(point), m_isEdgeProjGood(isEdgeProjGood)
-{
-}
+  : m_point(point)
+  , m_isEdgeProjGood(isEdgeProjGood)
+{}
 
 void NearestEdgeFinder::AddInformationSource(IRoadGraph::FullRoadInfo const & roadInfo)
 {
@@ -26,8 +26,7 @@ void NearestEdgeFinder::AddInformationSource(IRoadGraph::FullRoadInfo const & ro
   ASSERT_GREATER(count, 1, ());
   for (size_t i = 1; i < count; ++i)
   {
-    m2::ParametrizedSegment<m2::PointD> segment(junctions[i - 1].GetPoint(),
-                                                junctions[i].GetPoint());
+    m2::ParametrizedSegment<m2::PointD> segment(junctions[i - 1].GetPoint(), junctions[i].GetPoint());
 
     m2::PointD const closestPoint = segment.ClosestPointTo(m_point);
     double const squaredDist = m_point.SquaredLength(closestPoint);
@@ -48,8 +47,7 @@ void NearestEdgeFinder::AddInformationSource(IRoadGraph::FullRoadInfo const & ro
   geometry::PointWithAltitude const & segEnd = junctions[idx];
   geometry::Altitude const startAlt = segStart.GetAltitude();
   geometry::Altitude const endAlt = segEnd.GetAltitude();
-  m2::ParametrizedSegment<m2::PointD> segment(junctions[idx - 1].GetPoint(),
-                                              junctions[idx].GetPoint());
+  m2::ParametrizedSegment<m2::PointD> segment(junctions[idx - 1].GetPoint(), junctions[idx].GetPoint());
   m2::PointD const closestPoint = segment.ClosestPointTo(m_point);
 
   double const segLenM = mercator::DistanceOnEarth(segStart.GetPoint(), segEnd.GetPoint());
@@ -62,8 +60,7 @@ void NearestEdgeFinder::AddInformationSource(IRoadGraph::FullRoadInfo const & ro
   {
     double const distFromStartM = mercator::DistanceOnEarth(segStart.GetPoint(), closestPoint);
     ASSERT_LESS_OR_EQUAL(distFromStartM, segLenM, (roadInfo.m_featureId));
-    projPointAlt =
-        startAlt + static_cast<geometry::Altitude>((endAlt - startAlt) * distFromStartM / segLenM);
+    projPointAlt = startAlt + static_cast<geometry::Altitude>((endAlt - startAlt) * distFromStartM / segLenM);
   }
 
   res.m_fid = roadInfo.m_featureId;
@@ -80,10 +77,8 @@ void NearestEdgeFinder::AddInformationSource(IRoadGraph::FullRoadInfo const & ro
 
 void NearestEdgeFinder::MakeResult(vector<EdgeProjectionT> & res, size_t maxCountFeatures)
 {
-  sort(m_candidates.begin(), m_candidates.end(), [](Candidate const & r1, Candidate const & r2)
-  {
-    return r1.m_squaredDist < r2.m_squaredDist;
-  });
+  sort(m_candidates.begin(), m_candidates.end(),
+       [](Candidate const & r1, Candidate const & r2) { return r1.m_squaredDist < r2.m_squaredDist; });
 
   res.clear();
   res.reserve(maxCountFeatures);
@@ -114,7 +109,7 @@ void NearestEdgeFinder::AddResIf(Candidate const & candidate, bool forward, size
   geometry::PointWithAltitude const & start = forward ? candidate.m_segStart : candidate.m_segEnd;
   geometry::PointWithAltitude const & end = forward ? candidate.m_segEnd : candidate.m_segStart;
 
-  Edge const edge = Edge::MakeReal(candidate.m_fid, forward, candidate.m_segId, start,end);
+  Edge const edge = Edge::MakeReal(candidate.m_fid, forward, candidate.m_segId, start, end);
   EdgeProjectionT const edgeProj(edge, candidate.m_projPoint);
   if (m_isEdgeProjGood && !m_isEdgeProjGood(edgeProj))
     return;
diff --git a/libs/routing/nearest_edge_finder.hpp b/libs/routing/nearest_edge_finder.hpp
index 95f526989..bcdf428f2 100644
--- a/libs/routing/nearest_edge_finder.hpp
+++ b/libs/routing/nearest_edge_finder.hpp
@@ -11,8 +11,8 @@
 #include "geometry/point2d.hpp"
 #include "geometry/point_with_altitude.hpp"
 
-#include <functional>
 #include <cstdint>
+#include <functional>
 #include <limits>
 #include <memory>
 #include <utility>
diff --git a/libs/routing/opening_hours_serdes.cpp b/libs/routing/opening_hours_serdes.cpp
index 99c070cd4..2d05521e9 100644
--- a/libs/routing/opening_hours_serdes.cpp
+++ b/libs/routing/opening_hours_serdes.cpp
@@ -38,7 +38,7 @@ osmoh::RuleSequence GetTwentyFourHourRule()
 bool ShouldSkipYear(uint16_t startYear, uint16_t endYear, uint16_t currentYear)
 {
   if (startYear > endYear)
-    return true; // Wrong data. |startYear| is later than |endYear|.
+    return true;  // Wrong data. |startYear| is later than |endYear|.
 
   // returns true if |startYear| and |endYear| are too old and false otherwise.
   return endYear < currentYear;
@@ -131,16 +131,13 @@ OpeningHoursSerDes::Header OpeningHoursSerDes::CreateHeader(osmoh::RuleSequence
 bool OpeningHoursSerDes::NotSupported(osmoh::RuleSequence const & rule)
 {
   for (auto const unsupportedFeature : m_unsupportedFeatures)
-  {
     if (ExistsFeatureInOpeningHours(unsupportedFeature, rule))
       return true;
-  }
 
   return false;
 }
 
-bool OpeningHoursSerDes::ExistsFeatureInOpeningHours(Header::Bits feature,
-                                                     osmoh::RuleSequence const & rule) const
+bool OpeningHoursSerDes::ExistsFeatureInOpeningHours(Header::Bits feature, osmoh::RuleSequence const & rule) const
 {
   switch (feature)
   {
@@ -152,10 +149,8 @@ bool OpeningHoursSerDes::ExistsFeatureInOpeningHours(Header::Bits feature,
       return true;
 
     for (auto const & monthRange : rule.GetMonths())
-    {
       if (monthRange.GetStart().HasYear() && monthRange.GetEnd().HasYear())
         return true;
-    }
 
     return false;
   }
@@ -184,7 +179,8 @@ bool OpeningHoursSerDes::CheckSupportedFeatures() const
 
 std::vector<osmoh::RuleSequence> OpeningHoursSerDes::DecomposeOh(osmoh::OpeningHours const & oh)
 {
-  auto const apply = [&](auto & rules, auto const & ranges, auto const & rangeSetter) {
+  auto const apply = [&](auto & rules, auto const & ranges, auto const & rangeSetter)
+  {
     if (ranges.empty())
       return;
 
@@ -222,48 +218,45 @@ std::vector<osmoh::RuleSequence> OpeningHoursSerDes::DecomposeOh(osmoh::OpeningH
       continue;
 
     bool badRule = false;
-    apply(rules, rule.GetYears(),
-          [&](osmoh::YearRange const & range, osmoh::RuleSequence & item) {
-            if (ShouldSkipYear(range, m_currentYear))
-              badRule = true;
+    apply(rules, rule.GetYears(), [&](osmoh::YearRange const & range, osmoh::RuleSequence & item)
+    {
+      if (ShouldSkipYear(range, m_currentYear))
+        badRule = true;
 
-            item.SetYears({range});
-          });
+      item.SetYears({range});
+    });
 
-    apply(rules, rule.GetMonths(),
-          [&](osmoh::MonthdayRange const & range, osmoh::RuleSequence & item) {
-            if (ShouldSkipYear(range, m_currentYear))
-              badRule = true;
+    apply(rules, rule.GetMonths(), [&](osmoh::MonthdayRange const & range, osmoh::RuleSequence & item)
+    {
+      if (ShouldSkipYear(range, m_currentYear))
+        badRule = true;
 
-            item.SetMonths({range});
-          });
+      item.SetMonths({range});
+    });
 
     if (badRule)
       continue;
 
     apply(rules, rule.GetWeekdays().GetWeekdayRanges(),
-          [](osmoh::WeekdayRange const & range, osmoh::RuleSequence & item) {
-            osmoh::Weekdays weekdays;
-            weekdays.SetWeekdayRanges({range});
-            item.SetWeekdays(weekdays);
-          });
+          [](osmoh::WeekdayRange const & range, osmoh::RuleSequence & item)
+    {
+      osmoh::Weekdays weekdays;
+      weekdays.SetWeekdayRanges({range});
+      item.SetWeekdays(weekdays);
+    });
 
-    apply(rules, rule.GetWeekdays().GetHolidays(),
-          [](osmoh::Holiday const & holiday, osmoh::RuleSequence & item) {
-            auto weekdays = item.GetWeekdays();
-            weekdays.SetHolidays({holiday});
-            item.SetWeekdays(weekdays);
-          });
+    apply(rules, rule.GetWeekdays().GetHolidays(), [](osmoh::Holiday const & holiday, osmoh::RuleSequence & item)
+    {
+      auto weekdays = item.GetWeekdays();
+      weekdays.SetHolidays({holiday});
+      item.SetWeekdays(weekdays);
+    });
 
     apply(rules, rule.GetTimes(),
-          [](osmoh::Timespan const & range, osmoh::RuleSequence & item) {
-            item.SetTimes({range});
-          });
+          [](osmoh::Timespan const & range, osmoh::RuleSequence & item) { item.SetTimes({range}); });
 
     apply(rules, std::vector<osmoh::RuleSequence::Modifier>{rule.GetModifier()},
-          [](osmoh::RuleSequence::Modifier modifier, osmoh::RuleSequence & item) {
-            item.SetModifier(modifier);
-          });
+          [](osmoh::RuleSequence::Modifier modifier, osmoh::RuleSequence & item) { item.SetModifier(modifier); });
 
     finalRules.insert(finalRules.end(), rules.begin(), rules.end());
   }
@@ -280,16 +273,13 @@ std::vector<osmoh::RuleSequence> OpeningHoursSerDes::DecomposeOh(osmoh::OpeningH
   return filteredRules;
 }
 
-bool OpeningHoursSerDes::HaveSameHeaders(
-    std::vector<osmoh::RuleSequence> const & decomposedOhs) const
+bool OpeningHoursSerDes::HaveSameHeaders(std::vector<osmoh::RuleSequence> const & decomposedOhs) const
 {
   CHECK(!decomposedOhs.empty(), ());
   Header const header = CreateHeader(decomposedOhs.front());
   for (auto const & oh : decomposedOhs)
-  {
     if (header != CreateHeader(oh))
       return false;
-  }
 
   return true;
 }
@@ -311,8 +301,7 @@ uint8_t OpeningHoursSerDes::GetBitsNumber(Header::Bits type) const
   UNREACHABLE();
 }
 
-bool OpeningHoursSerDes::CheckYearRange(osmoh::MonthDay::TYear start,
-                                        osmoh::MonthDay::TYear end) const
+bool OpeningHoursSerDes::CheckYearRange(osmoh::MonthDay::TYear start, osmoh::MonthDay::TYear end) const
 {
   if (start < kYearBias || end < kYearBias)
     return false;
@@ -327,14 +316,12 @@ bool OpeningHoursSerDes::IsTwentyFourHourRule(osmoh::RuleSequence const & rule)
   static auto const kTwentyFourHourStart = osmoh::HourMinutes(osmoh::HourMinutes::THours(0));
   static auto const kTwentyFourHourEnd = osmoh::HourMinutes(osmoh::HourMinutes::THours(24));
 
-  return rule.GetModifier() != osmoh::RuleSequence::Modifier::Closed &&
-         rule.GetYears().empty() && rule.GetWeekdays().GetWeekdayRanges().empty() &&
-         rule.GetMonths().empty() && rule.GetTimes().size() == 1 &&
+  return rule.GetModifier() != osmoh::RuleSequence::Modifier::Closed && rule.GetYears().empty() &&
+         rule.GetWeekdays().GetWeekdayRanges().empty() && rule.GetMonths().empty() && rule.GetTimes().size() == 1 &&
          rule.GetTimes().back().GetStart() == kTwentyFourHourStart &&
          rule.GetTimes().back().GetEnd() == kTwentyFourHourEnd;
 }
 
-
 bool OpeningHoursSerDes::IsSerializable(osmoh::OpeningHours const & openingHours)
 {
   std::vector<uint8_t> buffer;
diff --git a/libs/routing/opening_hours_serdes.hpp b/libs/routing/opening_hours_serdes.hpp
index 523be7e1f..f6b04ff3c 100644
--- a/libs/routing/opening_hours_serdes.hpp
+++ b/libs/routing/opening_hours_serdes.hpp
@@ -54,24 +54,23 @@ public:
     using HeaderType = uint16_t;
     enum class Bits : HeaderType
     {
-      Year     = 1U << 0U,
-      Month    = 1U << 1U,
+      Year = 1U << 0U,
+      Month = 1U << 1U,
       MonthDay = 1U << 2U,
-      WeekDay  = 1U << 3U,
-      Hours    = 1U << 4U,
-      Minutes  = 1U << 5U,
-      Off      = 1U << 6U,
-      Holiday  = 1U << 7U,
+      WeekDay = 1U << 3U,
+      Hours = 1U << 4U,
+      Minutes = 1U << 5U,
+      Off = 1U << 6U,
+      Holiday = 1U << 7U,
 
-      Max      = 1U << 8U
+      Max = 1U << 8U
     };
 
     static inline uint8_t constexpr kBitsSize = 8;
     static_assert(base::Underlying(Bits::Max) == 1U << kBitsSize,
                   "It's seems header's size has been changed. Need to change |kBitsSize| member.");
 
-    static_assert(kBitsSize <= 8,
-                  "Header's size is more than 1 byte, be careful about section weight.");
+    static_assert(kBitsSize <= 8, "Header's size is more than 1 byte, be careful about section weight.");
 
     /// \brief Returns true if feature takes only two values (0 or 1).
     static bool IsBinaryFeature(Header::Bits feature);
@@ -155,8 +154,7 @@ private:
 
 // OpeningHoursSerDes::Header ----------------------------------------------------------------------
 template <typename Writer>
-void OpeningHoursSerDes::Header::Serialize(BitWriter<Writer> & writer,
-                                           OpeningHoursSerDes::Header header)
+void OpeningHoursSerDes::Header::Serialize(BitWriter<Writer> & writer, OpeningHoursSerDes::Header header)
 {
   writer.Write(header.GetValue(), Header::GetBitsSize());
 }
@@ -169,8 +167,7 @@ OpeningHoursSerDes::Header OpeningHoursSerDes::Header::Deserialize(BitReader<Rea
 
 // OpeningHoursSerDes ------------------------------------------------------------------------------
 template <typename Writer>
-bool OpeningHoursSerDes::Serialize(BitWriter<Writer> & writer,
-                                   osmoh::OpeningHours const & openingHours)
+bool OpeningHoursSerDes::Serialize(BitWriter<Writer> & writer, osmoh::OpeningHours const & openingHours)
 {
   if (!IsSerializable(openingHours))
     return false;
@@ -179,8 +176,7 @@ bool OpeningHoursSerDes::Serialize(BitWriter<Writer> & writer,
 }
 
 template <typename Writer>
-bool OpeningHoursSerDes::Serialize(BitWriter<Writer> & writer,
-                                   std::string const & openingHoursString)
+bool OpeningHoursSerDes::Serialize(BitWriter<Writer> & writer, std::string const & openingHoursString)
 {
   osmoh::OpeningHours const oh(openingHoursString);
   if (!oh.IsValid())
@@ -190,8 +186,7 @@ bool OpeningHoursSerDes::Serialize(BitWriter<Writer> & writer,
 }
 
 template <typename Writer>
-bool OpeningHoursSerDes::SerializeImpl(BitWriter<Writer> & writer,
-                                       osmoh::OpeningHours const & openingHours)
+bool OpeningHoursSerDes::SerializeImpl(BitWriter<Writer> & writer, osmoh::OpeningHours const & openingHours)
 {
   CheckSupportedFeatures();
 
@@ -248,10 +243,8 @@ osmoh::OpeningHours OpeningHoursSerDes::Deserialize(BitReader<Reader> & reader)
 
     osmoh::RuleSequence rule;
     for (auto const supportedFeature : m_supportedFeatures)
-    {
       if (header.IsSet(supportedFeature))
         Deserialize(reader, supportedFeature, rule);
-    }
 
     rules.emplace_back(std::move(rule));
   }
@@ -266,8 +259,7 @@ osmoh::OpeningHours OpeningHoursSerDes::Deserialize(BitReader<Reader> & reader)
 }
 
 template <typename Writer>
-bool OpeningHoursSerDes::Serialize(BitWriter<Writer> & writer, Header::Bits type,
-                                   osmoh::RuleSequence const & rule)
+bool OpeningHoursSerDes::Serialize(BitWriter<Writer> & writer, Header::Bits type, osmoh::RuleSequence const & rule)
 {
   uint8_t start = 0;
   uint8_t end = 0;
@@ -375,8 +367,7 @@ bool OpeningHoursSerDes::Serialize(BitWriter<Writer> & writer, Header::Bits type
 }
 
 template <typename Reader>
-void OpeningHoursSerDes::Deserialize(BitReader<Reader> & reader,
-                                     OpeningHoursSerDes::Header::Bits type,
+void OpeningHoursSerDes::Deserialize(BitReader<Reader> & reader, OpeningHoursSerDes::Header::Bits type,
                                      osmoh::RuleSequence & rule)
 {
   uint8_t const start = reader.Read(GetBitsNumber(type));
@@ -500,8 +491,7 @@ void OpeningHoursSerDes::Deserialize(BitReader<Reader> & reader,
 }
 
 template <typename Writer>
-bool OpeningHoursSerDes::SerializeValue(BitWriter<Writer> & writer, Header::Bits type,
-                                        uint8_t value)
+bool OpeningHoursSerDes::SerializeValue(BitWriter<Writer> & writer, Header::Bits type, uint8_t value)
 {
   uint8_t const bitsNumber = GetBitsNumber(type);
   if (value >= 1U << bitsNumber)
@@ -512,8 +502,7 @@ bool OpeningHoursSerDes::SerializeValue(BitWriter<Writer> & writer, Header::Bits
 }
 
 template <typename Writer>
-void OpeningHoursSerDes::SerializeRuleHeader(BitWriter<Writer> & writer,
-                                             osmoh::RuleSequence const & rule)
+void OpeningHoursSerDes::SerializeRuleHeader(BitWriter<Writer> & writer, osmoh::RuleSequence const & rule)
 {
   Header const header = CreateHeader(rule);
   Header::Serialize(writer, header);
diff --git a/libs/routing/pedestrian_directions.cpp b/libs/routing/pedestrian_directions.cpp
index 99257188f..23ff6e1b0 100644
--- a/libs/routing/pedestrian_directions.cpp
+++ b/libs/routing/pedestrian_directions.cpp
@@ -1,7 +1,7 @@
 #include "routing/pedestrian_directions.hpp"
 
-#include "routing/turns_generator.hpp"
 #include "routing/turns.hpp"
+#include "routing/turns_generator.hpp"
 #include "routing/turns_generator_utils.hpp"
 
 #include <utility>
@@ -13,16 +13,15 @@ using namespace turns;
 
 PedestrianDirectionsEngine::PedestrianDirectionsEngine(MwmDataSource & dataSource, shared_ptr<NumMwmIds> numMwmIds)
   : DirectionsEngine(dataSource, std::move(numMwmIds))
-{
-}
+{}
 
 // Angles in degrees for finding route segments with no actual forks.
 double constexpr kMaxForwardAngleCandidates = 95.0;
 double constexpr kMaxForwardAngleActual = 60.0;
 
 size_t PedestrianDirectionsEngine::GetTurnDirection(IRoutingResult const & result, size_t const outgoingSegmentIndex,
-                                   NumMwmIds const & numMwmIds,
-                                   RoutingSettings const & vehicleSettings, TurnItem & turn)
+                                                    NumMwmIds const & numMwmIds,
+                                                    RoutingSettings const & vehicleSettings, TurnItem & turn)
 {
   if (outgoingSegmentIndex == result.GetSegments().size())
   {
@@ -31,7 +30,7 @@ size_t PedestrianDirectionsEngine::GetTurnDirection(IRoutingResult const & resul
   }
 
   // See comment for the same in CarDirectionsEngine::GetTurnDirection().
-  if (outgoingSegmentIndex == 2) // The same as turnItem.m_index == 2.
+  if (outgoingSegmentIndex == 2)  // The same as turnItem.m_index == 2.
     return 0;
 
   TurnInfo turnInfo;
@@ -78,7 +77,8 @@ size_t PedestrianDirectionsEngine::GetTurnDirection(IRoutingResult const & resul
   // there is no possibility of leaving the route.
   if (nodes.candidates.size() <= 1)
     turn.m_pedestrianTurn = PedestrianDirection::None;
-  if (fabs(CalcOneSegmentTurnAngle(turnInfo)) < kMaxForwardAngleActual && HasSingleForwardTurn(nodes, kMaxForwardAngleCandidates))
+  if (fabs(CalcOneSegmentTurnAngle(turnInfo)) < kMaxForwardAngleActual &&
+      HasSingleForwardTurn(nodes, kMaxForwardAngleCandidates))
     turn.m_pedestrianTurn = PedestrianDirection::None;
 
   return 0;
diff --git a/libs/routing/pedestrian_directions.hpp b/libs/routing/pedestrian_directions.hpp
index b24acedd4..bc4ab04c7 100644
--- a/libs/routing/pedestrian_directions.hpp
+++ b/libs/routing/pedestrian_directions.hpp
@@ -16,8 +16,8 @@ public:
 
 protected:
   virtual size_t GetTurnDirection(turns::IRoutingResult const & result, size_t const outgoingSegmentIndex,
-                                  NumMwmIds const & numMwmIds,
-                                  RoutingSettings const & vehicleSettings, turns::TurnItem & turn);
+                                  NumMwmIds const & numMwmIds, RoutingSettings const & vehicleSettings,
+                                  turns::TurnItem & turn);
   virtual void FixupTurns(std::vector<RouteSegment> & routeSegments);
 };
 }  // namespace routing
diff --git a/libs/routing/position_accumulator.cpp b/libs/routing/position_accumulator.cpp
index cc0475d9c..afa4a1f2d 100644
--- a/libs/routing/position_accumulator.cpp
+++ b/libs/routing/position_accumulator.cpp
@@ -14,8 +14,7 @@ double constexpr PositionAccumulator::kMaxValidSegmentLengthM;
 
 void PositionAccumulator::PushNextPoint(m2::PointD const & point)
 {
-  double const lenM =
-      m_points.empty() ? 0.0 : mercator::DistanceOnEarth(point, m_points.back());
+  double const lenM = m_points.empty() ? 0.0 : mercator::DistanceOnEarth(point, m_points.back());
 
   // If the last segment is too long it tells nothing about an end user direction.
   // And the history is not actual.
@@ -77,4 +76,4 @@ m2::PointD PositionAccumulator::GetDirection() const
 
   return m_points.back() - m_points.front();
 }
-}  // routing
+}  // namespace routing
diff --git a/libs/routing/position_accumulator.hpp b/libs/routing/position_accumulator.hpp
index 9f4ca5076..de740f144 100644
--- a/libs/routing/position_accumulator.hpp
+++ b/libs/routing/position_accumulator.hpp
@@ -40,4 +40,4 @@ private:
   std::deque<m2::PointD> m_points;
   double m_trackLengthM = 0.0;
 };
-}  // routing
+}  // namespace routing
diff --git a/libs/routing/regions_decl.hpp b/libs/routing/regions_decl.hpp
index b2c80da0e..8aad398bf 100644
--- a/libs/routing/regions_decl.hpp
+++ b/libs/routing/regions_decl.hpp
@@ -14,4 +14,4 @@ using CountryRectFn = std::function<m2::RectD(std::string const & countryId)>;
 
 class Checkpoints;
 class NumMwmIds;
-} // namespace routing
+}  // namespace routing
diff --git a/libs/routing/regions_router.cpp b/libs/routing/regions_router.cpp
index 8c9868d43..f517370c9 100644
--- a/libs/routing/regions_router.cpp
+++ b/libs/routing/regions_router.cpp
@@ -1,8 +1,8 @@
 #include "routing/regions_router.hpp"
 
 #include "routing/dummy_world_graph.hpp"
-#include "routing/index_graph_starter.hpp"
 #include "routing/index_graph_loader.hpp"
+#include "routing/index_graph_starter.hpp"
 #include "routing/junction_visitor.hpp"
 #include "routing/regions_sparse_graph.hpp"
 #include "routing/routing_helpers.hpp"
@@ -11,9 +11,8 @@
 
 namespace routing
 {
-RegionsRouter::RegionsRouter(CountryFileGetterFn const & countryFileGetter,
-                             std::shared_ptr<NumMwmIds> numMwmIds, DataSource & dataSource,
-                             RouterDelegate const & delegate, Checkpoints const & checkpoints)
+RegionsRouter::RegionsRouter(CountryFileGetterFn const & countryFileGetter, std::shared_ptr<NumMwmIds> numMwmIds,
+                             DataSource & dataSource, RouterDelegate const & delegate, Checkpoints const & checkpoints)
   : m_countryFileGetterFn(countryFileGetter)
   , m_numMwmIds(std::move(numMwmIds))
   , m_dataSource(dataSource)
@@ -24,8 +23,7 @@ RegionsRouter::RegionsRouter(CountryFileGetterFn const & countryFileGetter,
 }
 
 template <typename Vertex, typename Edge, typename Weight>
-RouterResultCode RegionsRouter::ConvertResult(
-    typename AStarAlgorithm<Vertex, Edge, Weight>::Result result) const
+RouterResultCode RegionsRouter::ConvertResult(typename AStarAlgorithm<Vertex, Edge, Weight>::Result result) const
 {
   switch (result)
   {
@@ -47,8 +45,8 @@ RouterResultCode RegionsRouter::CalculateSubrouteNoLeapsMode(IndexGraphStarter &
 
   double constexpr almostZeroContribution = 1e-7;
   auto progress = std::make_shared<AStarProgress>();
-  AStarSubProgress subProgress(mercator::ToLatLon(startCheckpoint),
-                               mercator::ToLatLon(finishCheckpoint), almostZeroContribution);
+  AStarSubProgress subProgress(mercator::ToLatLon(startCheckpoint), mercator::ToLatLon(finishCheckpoint),
+                               almostZeroContribution);
 
   progress->AppendSubProgress(subProgress);
   SCOPE_GUARD(eraseProgress, [&progress]() { progress->PushAndDropLastSubProgress(); });
@@ -58,8 +56,8 @@ RouterResultCode RegionsRouter::CalculateSubrouteNoLeapsMode(IndexGraphStarter &
   Visitor visitor(starter, m_delegate, kVisitPeriod, progress);
 
   AStarAlgorithm<Vertex, Edge, Weight>::Params<Visitor, AStarLengthChecker> params(
-      starter, starter.GetStartSegment(), starter.GetFinishSegment(),
-      m_delegate.GetCancellable(), std::move(visitor), AStarLengthChecker(starter));
+      starter, starter.GetStartSegment(), starter.GetFinishSegment(), m_delegate.GetCancellable(), std::move(visitor),
+      AStarLengthChecker(starter));
 
   params.m_badReducedWeight = [](Weight const & reduced, Weight const & current)
   {
@@ -97,19 +95,16 @@ void RegionsRouter::Do()
     if (GetCheckpointRegion(i).second == GetCheckpointRegion(i + 1).second)
       continue;
 
-    std::optional<FakeEnding> const startFakeEnding =
-        sparseGraph->GetFakeEnding(m_checkpoints.GetPoint(i));
+    std::optional<FakeEnding> const startFakeEnding = sparseGraph->GetFakeEnding(m_checkpoints.GetPoint(i));
     if (!startFakeEnding)
       return;
 
-    std::optional<FakeEnding> const finishFakeEnding =
-        sparseGraph->GetFakeEnding(m_checkpoints.GetPoint(i + 1));
+    std::optional<FakeEnding> const finishFakeEnding = sparseGraph->GetFakeEnding(m_checkpoints.GetPoint(i + 1));
     if (!finishFakeEnding)
       return;
 
-    IndexGraphStarter subrouteStarter(*startFakeEnding, *finishFakeEnding,
-                                      0 /* fakeNumerationStart */, false /* isStartSegmentStrictForward */,
-                                      *graph);
+    IndexGraphStarter subrouteStarter(*startFakeEnding, *finishFakeEnding, 0 /* fakeNumerationStart */,
+                                      false /* isStartSegmentStrictForward */, *graph);
 
     subrouteStarter.GetGraph().SetMode(WorldGraphMode::NoLeaps);
 
@@ -117,8 +112,8 @@ void RegionsRouter::Do()
 
     std::vector<Segment> subroute;
 
-    auto const result = CalculateSubrouteNoLeapsMode(
-        subrouteStarter, subroute, m_checkpoints.GetPoint(i), m_checkpoints.GetPoint(i + 1));
+    auto const result = CalculateSubrouteNoLeapsMode(subrouteStarter, subroute, m_checkpoints.GetPoint(i),
+                                                     m_checkpoints.GetPoint(i + 1));
 
     if (result != RouterResultCode::NoError)
       return;
@@ -139,7 +134,10 @@ void RegionsRouter::Do()
   }
 }
 
-std::unordered_set<std::string> const & RegionsRouter::GetMwmNames() const { return m_mwmNames; }
+std::unordered_set<std::string> const & RegionsRouter::GetMwmNames() const
+{
+  return m_mwmNames;
+}
 
 std::pair<m2::PointD, std::string> RegionsRouter::GetCheckpointRegion(size_t index) const
 {
diff --git a/libs/routing/regions_router.hpp b/libs/routing/regions_router.hpp
index c6bb6af5c..742d69cda 100644
--- a/libs/routing/regions_router.hpp
+++ b/libs/routing/regions_router.hpp
@@ -21,8 +21,7 @@ class RegionsRouter : public threads::IRoutine
 {
 public:
   RegionsRouter(CountryFileGetterFn const & countryFileGetter, std::shared_ptr<NumMwmIds> numMwmIds,
-                DataSource & dataSource, RouterDelegate const & delegate,
-                Checkpoints const & checkpoints);
+                DataSource & dataSource, RouterDelegate const & delegate, Checkpoints const & checkpoints);
 
   void Do() override;
 
@@ -30,11 +29,9 @@ public:
 
 private:
   template <typename Vertex, typename Edge, typename Weight>
-  RouterResultCode ConvertResult(
-      typename AStarAlgorithm<Vertex, Edge, Weight>::Result result) const;
+  RouterResultCode ConvertResult(typename AStarAlgorithm<Vertex, Edge, Weight>::Result result) const;
 
-  RouterResultCode CalculateSubrouteNoLeapsMode(IndexGraphStarter & starter,
-                                                std::vector<Segment> & subroute,
+  RouterResultCode CalculateSubrouteNoLeapsMode(IndexGraphStarter & starter, std::vector<Segment> & subroute,
                                                 m2::PointD const & startCheckpoint,
                                                 m2::PointD const & finishCheckpoint);
 
diff --git a/libs/routing/regions_sparse_graph.cpp b/libs/routing/regions_sparse_graph.cpp
index 0e23857d6..e2c3f0005 100644
--- a/libs/routing/regions_sparse_graph.cpp
+++ b/libs/routing/regions_sparse_graph.cpp
@@ -15,11 +15,11 @@
 namespace routing
 {
 RegionsSparseGraph::RegionsSparseGraph(CountryFileGetterFn const & countryFileGetter,
-                                       std::shared_ptr<NumMwmIds> numMwmIds,
-                                       DataSource & dataSource)
-  : m_countryFileGetterFn(countryFileGetter), m_numMwmIds(numMwmIds), m_dataSource(dataSource)
-{
-}
+                                       std::shared_ptr<NumMwmIds> numMwmIds, DataSource & dataSource)
+  : m_countryFileGetterFn(countryFileGetter)
+  , m_numMwmIds(numMwmIds)
+  , m_dataSource(dataSource)
+{}
 
 void RegionsSparseGraph::LoadRegionsSparseGraph()
 {
@@ -66,65 +66,53 @@ std::optional<FakeEnding> RegionsSparseGraph::GetFakeEnding(m2::PointD const & p
 
     auto const & projectedJunction = CalcProjectionToSegment(backJunction, frontJunction, point);
 
-    Segment const segment(data.m_start.m_numMwmId, segmentId /* featureId */, 0 /* segmentIdx */,
-                          true /* isForward */);
+    Segment const segment(data.m_start.m_numMwmId, segmentId /* featureId */, 0 /* segmentIdx */, true /* isForward */);
 
-    ending.m_projections.emplace_back(segment, oneWay, frontJunction, backJunction,
-                                      projectedJunction);
+    ending.m_projections.emplace_back(segment, oneWay, frontJunction, backJunction, projectedJunction);
   }
 
   return ending;
 }
 
-double GetWeight(CrossBorderSegment const & toSeg, LatLonWithAltitude const & coordFrom,
-                 NumMwmId fromMwm)
+double GetWeight(CrossBorderSegment const & toSeg, LatLonWithAltitude const & coordFrom, NumMwmId fromMwm)
 {
-  auto const & coordTo =
-      toSeg.m_start.m_numMwmId == fromMwm ? toSeg.m_start.m_point : toSeg.m_end.m_point;
+  auto const & coordTo = toSeg.m_start.m_numMwmId == fromMwm ? toSeg.m_start.m_point : toSeg.m_end.m_point;
   CHECK(toSeg.m_start.m_numMwmId == fromMwm || toSeg.m_end.m_numMwmId == fromMwm,
         (fromMwm, toSeg.m_start.m_numMwmId, toSeg.m_end.m_numMwmId, coordTo));
   return toSeg.m_weight + ms::DistanceOnEarth(coordFrom.GetLatLon(), coordTo.GetLatLon());
 }
 
-void RegionsSparseGraph::GetEdgeList(Segment const & segment, bool isOutgoing,
-                                     EdgeListT & edges,
+void RegionsSparseGraph::GetEdgeList(Segment const & segment, bool isOutgoing, EdgeListT & edges,
                                      ms::LatLon const & prevSegFront) const
 {
   auto const & data = GetDataById(segment.GetFeatureId());
 
-  NumMwmId const targetMwm =
-      (segment.IsForward() == isOutgoing) ? data.m_end.m_numMwmId : data.m_start.m_numMwmId;
+  NumMwmId const targetMwm = (segment.IsForward() == isOutgoing) ? data.m_end.m_numMwmId : data.m_start.m_numMwmId;
 
   auto it = m_graph.m_mwms.find(targetMwm);
   if (it == m_graph.m_mwms.end())
     return;
 
-  LatLonWithAltitude const & segCoord =
-      (segment.IsForward() == isOutgoing) ? data.m_end.m_point : data.m_start.m_point;
+  LatLonWithAltitude const & segCoord = (segment.IsForward() == isOutgoing) ? data.m_end.m_point : data.m_start.m_point;
 
   for (auto const & id : it->second)
   {
     auto const outData = GetDataById(id);
     if (id == segment.GetFeatureId())
       continue;
-    LatLonWithAltitude const segFront =
-        segment.IsForward() ? outData.m_end.m_point : outData.m_start.m_point;
+    LatLonWithAltitude const segFront = segment.IsForward() ? outData.m_end.m_point : outData.m_start.m_point;
 
-    auto const weight = isOutgoing
-                            ? RouteWeight(GetWeight(outData, segCoord, targetMwm))
-                            : RouteWeight(ms::DistanceOnEarth(segFront.GetLatLon(), prevSegFront));
+    auto const weight = isOutgoing ? RouteWeight(GetWeight(outData, segCoord, targetMwm))
+                                   : RouteWeight(ms::DistanceOnEarth(segFront.GetLatLon(), prevSegFront));
 
-    auto const outMwm = targetMwm == outData.m_start.m_numMwmId ? outData.m_end.m_numMwmId
-                                                                : outData.m_start.m_numMwmId;
+    auto const outMwm = targetMwm == outData.m_start.m_numMwmId ? outData.m_end.m_numMwmId : outData.m_start.m_numMwmId;
 
-    Segment const edge(outMwm, id /* featureId */, 0 /* segmentIdx */,
-                       segment.IsForward() /* isForward */);
+    Segment const edge(outMwm, id /* featureId */, 0 /* segmentIdx */, segment.IsForward() /* isForward */);
     edges.emplace_back(edge, weight);
   }
 }
 
-routing::LatLonWithAltitude const & RegionsSparseGraph::GetJunction(Segment const & segment,
-                                                                    bool front) const
+routing::LatLonWithAltitude const & RegionsSparseGraph::GetJunction(Segment const & segment, bool front) const
 {
   auto const & data = GetDataById(segment.GetFeatureId());
   return segment.IsForward() == front ? data.m_end.m_point : data.m_start.m_point;
diff --git a/libs/routing/regions_sparse_graph.hpp b/libs/routing/regions_sparse_graph.hpp
index 50c3ddaaf..732496dc6 100644
--- a/libs/routing/regions_sparse_graph.hpp
+++ b/libs/routing/regions_sparse_graph.hpp
@@ -18,8 +18,8 @@ namespace routing
 class RegionsSparseGraph
 {
 public:
-  RegionsSparseGraph(CountryFileGetterFn const & countryFileGetter,
-                     std::shared_ptr<NumMwmIds> numMwmIds, DataSource & dataSource);
+  RegionsSparseGraph(CountryFileGetterFn const & countryFileGetter, std::shared_ptr<NumMwmIds> numMwmIds,
+                     DataSource & dataSource);
 
   // Loads data from mwm section.
   void LoadRegionsSparseGraph();
@@ -27,8 +27,7 @@ public:
   std::optional<FakeEnding> GetFakeEnding(m2::PointD const & point) const;
 
   using EdgeListT = SmallList<SegmentEdge>;
-  void GetEdgeList(Segment const & segment, bool isOutgoing, EdgeListT & edges,
-                   ms::LatLon const & prevSegFront) const;
+  void GetEdgeList(Segment const & segment, bool isOutgoing, EdgeListT & edges, ms::LatLon const & prevSegFront) const;
 
   routing::LatLonWithAltitude const & GetJunction(Segment const & segment, bool front) const;
 
diff --git a/libs/routing/restriction_loader.cpp b/libs/routing/restriction_loader.cpp
index 6701ca626..de285a1b4 100644
--- a/libs/routing/restriction_loader.cpp
+++ b/libs/routing/restriction_loader.cpp
@@ -50,19 +50,14 @@ RestrictionLoader::RestrictionLoader(MwmValue const & mwmValue, IndexGraph & gra
 
   try
   {
-    m_reader =
-        std::make_unique<FilesContainerR::TReader>(mwmValue.m_cont.GetReader(RESTRICTIONS_FILE_TAG));
+    m_reader = std::make_unique<FilesContainerR::TReader>(mwmValue.m_cont.GetReader(RESTRICTIONS_FILE_TAG));
     ReaderSource<FilesContainerR::TReader> src(*m_reader);
     m_header.Deserialize(src);
 
     RestrictionVec restrictionsOnly;
     std::vector<RestrictionUTurn> restrictionsOnlyUTurn;
-    RestrictionSerializer::Deserialize(m_header,
-                                       m_restrictions /* restriction No, without no_u_turn */,
-                                       restrictionsOnly,
-                                       m_noUTurnRestrictions,
-                                       restrictionsOnlyUTurn,
-                                       src);
+    RestrictionSerializer::Deserialize(m_header, m_restrictions /* restriction No, without no_u_turn */,
+                                       restrictionsOnly, m_noUTurnRestrictions, restrictionsOnlyUTurn, src);
 
     ConvertRestrictionsOnlyToNo(graph, restrictionsOnly, m_restrictions);
     ConvertRestrictionsOnlyUTurnToNo(graph, restrictionsOnlyUTurn, m_restrictions);
@@ -70,8 +65,7 @@ RestrictionLoader::RestrictionLoader(MwmValue const & mwmValue, IndexGraph & gra
   catch (Reader::OpenException const & e)
   {
     m_header.Reset();
-    LOG(LERROR,
-        ("File", m_countryFileName, "Error while reading", RESTRICTIONS_FILE_TAG, "section.", e.Msg()));
+    LOG(LERROR, ("File", m_countryFileName, "Error while reading", RESTRICTIONS_FILE_TAG, "section.", e.Msg()));
     throw;
   }
 }
@@ -94,10 +88,8 @@ std::vector<RestrictionUTurn> && RestrictionLoader::StealNoUTurnRestrictions()
 bool IsRestrictionFromRoads(IndexGraph const & graph, std::vector<uint32_t> const & restriction)
 {
   for (auto const & featureId : restriction)
-  {
     if (!graph.IsRoad(featureId))
       return false;
-  }
 
   return true;
 }
@@ -112,8 +104,7 @@ bool IsRestrictionFromRoads(IndexGraph const & graph, std::vector<uint32_t> cons
 /// We create restrictionNo from features:
 /// featureId_1, ... , featureId_(M - 1), featureId_K
 /// where featureId_K - has common joint with featureId_(M - 1) and featureId_M.
-void ConvertRestrictionsOnlyToNo(IndexGraph const & graph,
-                                 RestrictionVec const & restrictionsOnly,
+void ConvertRestrictionsOnlyToNo(IndexGraph const & graph, RestrictionVec const & restrictionsOnly,
                                  RestrictionVec & restrictionsNo)
 {
   for (std::vector<uint32_t> const & restriction : restrictionsOnly)
@@ -129,8 +120,7 @@ void ConvertRestrictionsOnlyToNo(IndexGraph const & graph,
       auto const prevFeatureId = restriction[i - 1];
 
       // Looking for a joint of an intersection of prev and cur features.
-      Joint::Id const common =
-          GetCommonEndJoint(graph.GetRoad(curFeatureId), graph.GetRoad(prevFeatureId));
+      Joint::Id const common = GetCommonEndJoint(graph.GetRoad(curFeatureId), graph.GetRoad(prevFeatureId));
 
       if (common == Joint::kInvalidId)
         break;
@@ -139,21 +129,19 @@ void ConvertRestrictionsOnlyToNo(IndexGraph const & graph,
       commonFeatures.resize(i + 1);
       std::copy(restriction.begin(), restriction.begin() + i, commonFeatures.begin());
 
-      graph.ForEachPoint(common,
-                         [&](RoadPoint const & rp)
-                         {
-                           if (rp.GetFeatureId() != curFeatureId)
-                           {
-                             commonFeatures.back() = rp.GetFeatureId();
-                             restrictionsNo.emplace_back(commonFeatures);
-                           }
-                         });
+      graph.ForEachPoint(common, [&](RoadPoint const & rp)
+      {
+        if (rp.GetFeatureId() != curFeatureId)
+        {
+          commonFeatures.back() = rp.GetFeatureId();
+          restrictionsNo.emplace_back(commonFeatures);
+        }
+      });
     }
   }
 }
 
-void ConvertRestrictionsOnlyUTurnToNo(IndexGraph & graph,
-                                      std::vector<RestrictionUTurn> const & restrictionsOnlyUTurn,
+void ConvertRestrictionsOnlyUTurnToNo(IndexGraph & graph, std::vector<RestrictionUTurn> const & restrictionsOnlyUTurn,
                                       RestrictionVec & restrictionsNo)
 {
   for (auto const & uTurnRestriction : restrictionsOnlyUTurn)
@@ -164,21 +152,19 @@ void ConvertRestrictionsOnlyUTurnToNo(IndexGraph & graph,
 
     uint32_t const n = graph.GetRoadGeometry(featureId).GetPointsCount();
     RoadJointIds const & joints = graph.GetRoad(uTurnRestriction.m_featureId);
-    Joint::Id const joint = uTurnRestriction.m_viaIsFirstPoint ? joints.GetJointId(0)
-                                                               : joints.GetJointId(n - 1);
+    Joint::Id const joint = uTurnRestriction.m_viaIsFirstPoint ? joints.GetJointId(0) : joints.GetJointId(n - 1);
 
     if (joint == Joint::kInvalidId)
       continue;
 
-    graph.ForEachPoint(joint,
-                       [&](RoadPoint const & rp)
-                       {
-                         if (rp.GetFeatureId() != featureId)
-                         {
-                           std::vector<uint32_t> fromToRestriction = {featureId, rp.GetFeatureId()};
-                           restrictionsNo.emplace_back(std::move(fromToRestriction));
-                         }
-                       });
+    graph.ForEachPoint(joint, [&](RoadPoint const & rp)
+    {
+      if (rp.GetFeatureId() != featureId)
+      {
+        std::vector<uint32_t> fromToRestriction = {featureId, rp.GetFeatureId()};
+        restrictionsNo.emplace_back(std::move(fromToRestriction));
+      }
+    });
   }
 }
 }  // namespace routing
diff --git a/libs/routing/restriction_loader.hpp b/libs/routing/restriction_loader.hpp
index 47efc8701..880a66ff3 100644
--- a/libs/routing/restriction_loader.hpp
+++ b/libs/routing/restriction_loader.hpp
@@ -29,11 +29,9 @@ private:
   std::string const m_countryFileName;
 };
 
-void ConvertRestrictionsOnlyToNo(IndexGraph const & graph,
-                                 RestrictionVec const & restrictionsOnly,
+void ConvertRestrictionsOnlyToNo(IndexGraph const & graph, RestrictionVec const & restrictionsOnly,
                                  RestrictionVec & restrictionsNo);
 
-void ConvertRestrictionsOnlyUTurnToNo(IndexGraph & graph,
-                                      std::vector<RestrictionUTurn> const & restrictionsOnlyUTurn,
+void ConvertRestrictionsOnlyUTurnToNo(IndexGraph & graph, std::vector<RestrictionUTurn> const & restrictionsOnlyUTurn,
                                       RestrictionVec & restrictionsNo);
 }  // namespace routing
diff --git a/libs/routing/restrictions_serialization.cpp b/libs/routing/restrictions_serialization.cpp
index 4c1374803..93c1f1eea 100644
--- a/libs/routing/restrictions_serialization.cpp
+++ b/libs/routing/restrictions_serialization.cpp
@@ -12,13 +12,9 @@ char constexpr kOnlyUTurn[] = "OnlyUTurn";
 
 namespace routing
 {
-//static
+// static
 std::vector<Restriction::Type> const RestrictionHeader::kRestrictionTypes = {
-    Restriction::Type::No,
-    Restriction::Type::Only,
-    Restriction::Type::NoUTurn,
-    Restriction::Type::OnlyUTurn
-};
+    Restriction::Type::No, Restriction::Type::Only, Restriction::Type::NoUTurn, Restriction::Type::OnlyUTurn};
 
 bool Restriction::operator==(Restriction const & restriction) const
 {
diff --git a/libs/routing/restrictions_serialization.hpp b/libs/routing/restrictions_serialization.hpp
index d0ffbda61..196e4b0be 100644
--- a/libs/routing/restrictions_serialization.hpp
+++ b/libs/routing/restrictions_serialization.hpp
@@ -33,8 +33,8 @@ struct Restriction
   /// * driving along the restriction is prohibited (No)
   enum class Type
   {
-    No,        // Going according such restriction is prohibited.
-    Only,      // Only going according such restriction is permitted.
+    No,    // Going according such restriction is prohibited.
+    Only,  // Only going according such restriction is permitted.
 
     NoUTurn,   // Making U-turn from a feature to the same one according
                // to such restriction is prohibited.
@@ -57,8 +57,10 @@ using RestrictionVec = std::vector<std::vector<uint32_t>>;
 
 struct RestrictionUTurn
 {
-  RestrictionUTurn(uint32_t featureId, bool viaIsFirstPoint) :
-    m_featureId(featureId), m_viaIsFirstPoint(viaIsFirstPoint) {}
+  RestrictionUTurn(uint32_t featureId, bool viaIsFirstPoint)
+    : m_featureId(featureId)
+    , m_viaIsFirstPoint(viaIsFirstPoint)
+  {}
 
   uint32_t m_featureId;
   bool m_viaIsFirstPoint;
@@ -110,8 +112,7 @@ struct RestrictionHeader
       m_restrictionCount[Restriction::Type::OnlyUTurn] = ReadPrimitiveFromSource<uint32_t>(src);
       break;
     }
-    default:
-      CHECK(false, ("Wrong restrictions version in header:", m_version));
+    default: CHECK(false, ("Wrong restrictions version in header:", m_version));
     }
   }
 
@@ -131,8 +132,7 @@ public:
   static uint32_t constexpr kUTurnAtTheBeginMask = 1U << 31;
 
   template <class Sink>
-  static void Serialize(RestrictionHeader const & header,
-                        std::vector<Restriction>::iterator begin,
+  static void Serialize(RestrictionHeader const & header, std::vector<Restriction>::iterator begin,
                         std::vector<Restriction>::iterator end, Sink & sink)
   {
     auto const firstOnlyIt = begin + header.GetNumberOf(Restriction::Type::No);
@@ -147,12 +147,9 @@ public:
   }
 
   template <class Source>
-  static void Deserialize(RestrictionHeader const & header,
-                          RestrictionVec & restrictionsNo,
-                          RestrictionVec & restrictionsOnly,
-                          std::vector<RestrictionUTurn> & restrictionsNoUTurn,
-                          std::vector<RestrictionUTurn> & restrictionsOnlyUTurn,
-                          Source & src)
+  static void Deserialize(RestrictionHeader const & header, RestrictionVec & restrictionsNo,
+                          RestrictionVec & restrictionsOnly, std::vector<RestrictionUTurn> & restrictionsNoUTurn,
+                          std::vector<RestrictionUTurn> & restrictionsOnlyUTurn, Source & src)
   {
     DeserializeNotUTurn(header, header.GetNumberOf(Restriction::Type::No), restrictionsNo, src);
     DeserializeNotUTurn(header, header.GetNumberOf(Restriction::Type::Only), restrictionsOnly, src);
@@ -187,20 +184,17 @@ private:
       CHECK_EQUAL(type, begin->m_type, ());
 
       Restriction const & restriction = *begin;
-      CHECK_GREATER_OR_EQUAL(restriction.m_featureIds.size(), 2,
-                             ("No sense in zero or one link restrictions."));
+      CHECK_GREATER_OR_EQUAL(restriction.m_featureIds.size(), 2, ("No sense in zero or one link restrictions."));
 
-      coding::DeltaCoder::Encode(
-          bits, restriction.m_featureIds.size() - 1 /* number of link is two or more */);
+      coding::DeltaCoder::Encode(bits, restriction.m_featureIds.size() - 1 /* number of link is two or more */);
 
       CHECK_LESS_OR_EQUAL(prevFirstLinkFeatureId, restriction.m_featureIds[0], ());
-      coding::DeltaCoder::Encode(bits, restriction.m_featureIds[0] - prevFirstLinkFeatureId +
-                                           1 /* making it greater than zero */);
+      coding::DeltaCoder::Encode(
+          bits, restriction.m_featureIds[0] - prevFirstLinkFeatureId + 1 /* making it greater than zero */);
       for (size_t i = 1; i < restriction.m_featureIds.size(); ++i)
       {
-        uint32_t const delta =
-            bits::ZigZagEncode(static_cast<int32_t>(restriction.m_featureIds[i]) -
-                               static_cast<int32_t>(restriction.m_featureIds[i - 1]));
+        uint32_t const delta = bits::ZigZagEncode(static_cast<int32_t>(restriction.m_featureIds[i]) -
+                                                  static_cast<int32_t>(restriction.m_featureIds[i - 1]));
         coding::DeltaCoder::Encode(bits, delta + 1 /* making it greater than zero */);
       }
       prevFirstLinkFeatureId = restriction.m_featureIds[0];
@@ -208,8 +202,8 @@ private:
   }
 
   template <class Source>
-  static bool DeserializeNotUTurn(RestrictionHeader const & header,
-                                  uint32_t count, RestrictionVec & result, Source & src)
+  static bool DeserializeNotUTurn(RestrictionHeader const & header, uint32_t count, RestrictionVec & result,
+                                  Source & src)
   {
     uint32_t prevFirstLinkFeatureId = 0;
     BitReader<Source> bits(src);
@@ -221,8 +215,7 @@ private:
         LOG(LERROR, ("Decoded link restriction number is zero."));
         return false;
       }
-      auto const numLinks =
-          static_cast<size_t>(biasedLinkNumber + 1 /* number of link is two or more */);
+      auto const numLinks = static_cast<size_t>(biasedLinkNumber + 1 /* number of link is two or more */);
 
       std::vector<uint32_t> restriction(numLinks);
       auto const biasedFirstFeatureId = coding::DeltaCoder::Decode(bits);
@@ -243,8 +236,7 @@ private:
         }
 
         uint32_t const delta = base::asserted_cast<uint32_t>(biasedDelta - 1);
-        restriction[j] =
-            static_cast<uint32_t>(bits::ZigZagDecode(delta) + restriction[j - 1]);
+        restriction[j] = static_cast<uint32_t>(bits::ZigZagDecode(delta) + restriction[j - 1]);
       }
 
       prevFirstLinkFeatureId = restriction[0];
@@ -267,8 +259,8 @@ private:
   /// \param end is an iterator to the element after the last element to serialize.
   /// \note All restrictions should have the same type.
   template <class Sink>
-  static void SerializeUTurn(std::vector<Restriction>::iterator begin,
-                             std::vector<Restriction>::iterator end, Sink & sink)
+  static void SerializeUTurn(std::vector<Restriction>::iterator begin, std::vector<Restriction>::iterator end,
+                             Sink & sink)
   {
     if (begin == end)
       return;
@@ -283,8 +275,7 @@ private:
     for (; begin != end; ++begin)
     {
       CHECK_EQUAL(type, begin->m_type, ());
-      CHECK_EQUAL(begin->m_featureIds.size(), 1,
-                  ("UTurn restrictions must consists of 1 feature."));
+      CHECK_EQUAL(begin->m_featureIds.size(), 1, ("UTurn restrictions must consists of 1 feature."));
 
       auto featureId = static_cast<int32_t>(begin->m_featureIds.back());
       featureId = bits::ZigZagEncode(featureId);
@@ -308,9 +299,7 @@ private:
   }
 
   template <class Source>
-  static bool DeserializeUTurn(uint32_t count,
-                               std::vector<RestrictionUTurn> & result,
-                               Source & src)
+  static bool DeserializeUTurn(uint32_t count, std::vector<RestrictionUTurn> & result, Source & src)
   {
     uint32_t prevFeatureId = 0;
     BitReader<Source> bits(src);
diff --git a/libs/routing/road_access.cpp b/libs/routing/road_access.cpp
index 3833585ce..439f7628c 100644
--- a/libs/routing/road_access.cpp
+++ b/libs/routing/road_access.cpp
@@ -33,20 +33,19 @@ std::string DebugPrintKV(KV const & kvs, size_t maxKVToShow)
  */
 RoadAccess::RoadAccess() : m_currentTimeGetter([]() { return GetCurrentTimestamp(); }) {}
 
-std::pair<RoadAccess::Type, RoadAccess::Confidence> RoadAccess::GetAccess(
-    uint32_t featureId, RouteWeight const & weightToFeature) const
+std::pair<RoadAccess::Type, RoadAccess::Confidence> RoadAccess::GetAccess(uint32_t featureId,
+                                                                          RouteWeight const & weightToFeature) const
 {
   return GetAccess(featureId, weightToFeature.GetWeight());
 }
 
-std::pair<RoadAccess::Type, RoadAccess::Confidence> RoadAccess::GetAccess(
-    RoadPoint const & point, RouteWeight const & weightToPoint) const
+std::pair<RoadAccess::Type, RoadAccess::Confidence> RoadAccess::GetAccess(RoadPoint const & point,
+                                                                          RouteWeight const & weightToPoint) const
 {
   return GetAccess(point, weightToPoint.GetWeight());
 }
 
-std::pair<RoadAccess::Type, RoadAccess::Confidence> RoadAccess::GetAccess(
-    uint32_t featureId, double weight) const
+std::pair<RoadAccess::Type, RoadAccess::Confidence> RoadAccess::GetAccess(uint32_t featureId, double weight) const
 {
   auto const itConditional = m_wayToAccessConditional.find(featureId);
   if (itConditional != m_wayToAccessConditional.cend())
@@ -64,8 +63,7 @@ std::pair<RoadAccess::Type, RoadAccess::Confidence> RoadAccess::GetAccess(
   return GetAccessWithoutConditional(featureId);
 }
 
-std::pair<RoadAccess::Type, RoadAccess::Confidence> RoadAccess::GetAccess(
-    RoadPoint const & point, double weight) const
+std::pair<RoadAccess::Type, RoadAccess::Confidence> RoadAccess::GetAccess(RoadPoint const & point, double weight) const
 {
   auto const itConditional = m_pointToAccessConditional.find(point);
   if (itConditional != m_pointToAccessConditional.cend())
@@ -83,8 +81,7 @@ std::pair<RoadAccess::Type, RoadAccess::Confidence> RoadAccess::GetAccess(
   return GetAccessWithoutConditional(point);
 }
 
-std::pair<RoadAccess::Type, RoadAccess::Confidence> RoadAccess::GetAccessWithoutConditional(
-    uint32_t featureId) const
+std::pair<RoadAccess::Type, RoadAccess::Confidence> RoadAccess::GetAccessWithoutConditional(uint32_t featureId) const
 {
   // todo(@m) This may or may not be too slow. Consider profiling this and using
   // a Bloom filter or anything else that is faster than ska::flat_hash_map
@@ -176,18 +173,20 @@ std::string DebugPrint(RoadAccess::Confidence confidence)
   UNREACHABLE();
 }
 
-std::string DebugPrint(RoadAccess::Type type) { return ToString(type); }
+std::string DebugPrint(RoadAccess::Type type)
+{
+  return ToString(type);
+}
 
 std::string DebugPrint(RoadAccess const & r)
 {
   size_t constexpr kMaxIdsToShow = 10;
 
   std::ostringstream oss;
-  oss << "RoadAccess { WayToAccess " << DebugPrintKV(r.GetWayToAccess(), kMaxIdsToShow)
-      << "; PointToAccess "<< DebugPrintKV(r.GetPointToAccess(), kMaxIdsToShow)
-      << "; WayToAccessConditional "<< DebugPrintKV(r.GetWayToAccessConditional(), kMaxIdsToShow)
-      << "; PointToAccessConditional " << DebugPrintKV(r.GetPointToAccessConditional(), kMaxIdsToShow)
-      << " }";
+  oss << "RoadAccess { WayToAccess " << DebugPrintKV(r.GetWayToAccess(), kMaxIdsToShow) << "; PointToAccess "
+      << DebugPrintKV(r.GetPointToAccess(), kMaxIdsToShow) << "; WayToAccessConditional "
+      << DebugPrintKV(r.GetWayToAccessConditional(), kMaxIdsToShow) << "; PointToAccessConditional "
+      << DebugPrintKV(r.GetPointToAccessConditional(), kMaxIdsToShow) << " }";
   return oss.str();
 }
 
diff --git a/libs/routing/road_access.hpp b/libs/routing/road_access.hpp
index c79b02ce3..26e407696 100644
--- a/libs/routing/road_access.hpp
+++ b/libs/routing/road_access.hpp
@@ -7,8 +7,8 @@
 #include <string>
 #include <vector>
 
-#include "3party/skarupke/flat_hash_map.hpp"
 #include "3party/opening_hours/opening_hours.hpp"
+#include "3party/skarupke/flat_hash_map.hpp"
 
 namespace routing
 {
@@ -62,14 +62,11 @@ public:
     struct Access
     {
       Access(RoadAccess::Type type, osmoh::OpeningHours && openingHours)
-          : m_type(type), m_openingHours(std::move(openingHours))
-      {
-      }
+        : m_type(type)
+        , m_openingHours(std::move(openingHours))
+      {}
 
-      bool operator==(Access const & rhs) const
-      {
-        return m_type == rhs.m_type && m_openingHours == rhs.m_openingHours;
-      }
+      bool operator==(Access const & rhs) const { return m_type == rhs.m_type && m_openingHours == rhs.m_openingHours; }
 
       RoadAccess::Type m_type = RoadAccess::Type::Count;
       osmoh::OpeningHours m_openingHours;
@@ -103,20 +100,12 @@ public:
   WayToAccess const & GetWayToAccess() const { return m_wayToAccess; }
   PointToAccess const & GetPointToAccess() const { return m_pointToAccess; }
 
-  WayToAccessConditional const & GetWayToAccessConditional() const
-  {
-    return m_wayToAccessConditional;
-  }
+  WayToAccessConditional const & GetWayToAccessConditional() const { return m_wayToAccessConditional; }
 
-  PointToAccessConditional const & GetPointToAccessConditional() const
-  {
-    return m_pointToAccessConditional;
-  }
+  PointToAccessConditional const & GetPointToAccessConditional() const { return m_pointToAccessConditional; }
 
-  std::pair<Type, Confidence> GetAccess(uint32_t featureId,
-                                        RouteWeight const & weightToFeature) const;
-  std::pair<Type, Confidence> GetAccess(RoadPoint const & point,
-                                        RouteWeight const & weightToPoint) const;
+  std::pair<Type, Confidence> GetAccess(uint32_t featureId, RouteWeight const & weightToFeature) const;
+  std::pair<Type, Confidence> GetAccess(RoadPoint const & point, RouteWeight const & weightToPoint) const;
 
   std::pair<Type, Confidence> GetAccessWithoutConditional(uint32_t featureId) const;
   std::pair<Type, Confidence> GetAccessWithoutConditional(RoadPoint const & point) const;
@@ -154,7 +143,10 @@ public:
   }
 
   template <typename T>
-  void SetCurrentTimeGetter(T && getter) { m_currentTimeGetter = std::forward<T>(getter); }
+  void SetCurrentTimeGetter(T && getter)
+  {
+    m_currentTimeGetter = std::forward<T>(getter);
+  }
 
 private:
   // When we check access:conditional, we check such interval in fact:
@@ -164,8 +156,8 @@ private:
   // if only one is open, we say access:conditional is maybe open.
   inline static time_t constexpr kConfidenceIntervalSeconds = 2 * 3600;  // 2 hours
 
-  static std::optional<Confidence> GetConfidenceForAccessConditional(
-      time_t momentInTime, osmoh::OpeningHours const & openingHours);
+  static std::optional<Confidence> GetConfidenceForAccessConditional(time_t momentInTime,
+                                                                     osmoh::OpeningHours const & openingHours);
 
   std::pair<Type, Confidence> GetAccess(uint32_t featureId, double weight) const;
   std::pair<Type, Confidence> GetAccess(RoadPoint const & point, double weight) const;
diff --git a/libs/routing/road_access_serialization.cpp b/libs/routing/road_access_serialization.cpp
index f37ff4221..7e7191587 100644
--- a/libs/routing/road_access_serialization.cpp
+++ b/libs/routing/road_access_serialization.cpp
@@ -15,4 +15,3 @@ std::string DebugPrint(RoadAccessSerializer::Header const & header)
   UNREACHABLE();
 }
 }  // namespace routing
-
diff --git a/libs/routing/road_access_serialization.hpp b/libs/routing/road_access_serialization.hpp
index 15606fafb..38c59b184 100644
--- a/libs/routing/road_access_serialization.hpp
+++ b/libs/routing/road_access_serialization.hpp
@@ -37,9 +37,9 @@ public:
 
   enum class Header : uint32_t
   {
-    TheFirstVersionRoadAccess = 0, // Version of section roadaccess in 2017.
-    WithoutAccessConditional = 1,  // Section roadaccess before conditional was implemented.
-    WithAccessConditional = 2      // Section roadaccess with conditional.
+    TheFirstVersionRoadAccess = 0,  // Version of section roadaccess in 2017.
+    WithoutAccessConditional = 1,   // Section roadaccess before conditional was implemented.
+    WithAccessConditional = 2       // Section roadaccess with conditional.
   };
 
   RoadAccessSerializer() = delete;
@@ -60,11 +60,8 @@ public:
 
     switch (header)
     {
-    case Header::TheFirstVersionRoadAccess:
-      break; // Version of 2017. Unsupported.
-    case Header::WithoutAccessConditional:
-      DeserializeAccess(src, vehicleType, roadAccess);
-      break;
+    case Header::TheFirstVersionRoadAccess: break;  // Version of 2017. Unsupported.
+    case Header::WithoutAccessConditional: DeserializeAccess(src, vehicleType, roadAccess); break;
     case Header::WithAccessConditional:
       DeserializeAccess(src, vehicleType, roadAccess);
 
@@ -89,16 +86,10 @@ private:
       return {featureId, 0 /* wildcard pointId for way access */};
     }
 
-    static AccessPosition MakePointAccess(uint32_t featureId, uint32_t pointId)
-    {
-      return {featureId, pointId + 1};
-    }
+    static AccessPosition MakePointAccess(uint32_t featureId, uint32_t pointId) { return {featureId, pointId + 1}; }
 
     AccessPosition() = default;
-    AccessPosition(uint32_t featureId, uint32_t pointId)
-      : m_featureId(featureId), m_pointId(pointId)
-    {
-    }
+    AccessPosition(uint32_t featureId, uint32_t pointId) : m_featureId(featureId), m_pointId(pointId) {}
 
     bool operator<(AccessPosition const & rhs) const
     {
@@ -134,8 +125,7 @@ private:
     for (size_t i = 0; i < static_cast<size_t>(VehicleType::Count); ++i)
     {
       auto const pos = sink.Pos();
-      SerializeOneVehicleType(sink, roadAccessByType[i].GetWayToAccess(),
-                              roadAccessByType[i].GetPointToAccess());
+      SerializeOneVehicleType(sink, roadAccessByType[i].GetWayToAccess(), roadAccessByType[i].GetPointToAccess());
       sectionSizes[i] = base::checked_cast<uint32_t>(sink.Pos() - pos);
     }
 
@@ -177,8 +167,7 @@ private:
   }
 
   template <class Sink>
-  static void SerializeAccessConditional(Sink & sink,
-                                         RoadAccessByVehicleType const & roadAccessByType)
+  static void SerializeAccessConditional(Sink & sink, RoadAccessByVehicleType const & roadAccessByType)
   {
     auto const sectionSizesPos = sink.Pos();
     std::array<uint32_t, static_cast<size_t>(VehicleType::Count)> sectionSizes;
@@ -205,8 +194,7 @@ private:
   }
 
   template <class Source>
-  static void DeserializeAccessConditional(Source & src, VehicleType vehicleType,
-                                           RoadAccess & roadAccess)
+  static void DeserializeAccessConditional(Source & src, VehicleType vehicleType, RoadAccess & roadAccess)
   {
     std::array<uint32_t, static_cast<size_t>(VehicleType::Count)> sectionSizes{};
     static_assert(static_cast<int>(VehicleType::Count) == 4,
@@ -230,17 +218,14 @@ private:
       PointToAccessConditional pointToAccessConditional;
       DeserializeConditionalOneVehicleType(src, wayToAccessConditional, pointToAccessConditional);
 
-      roadAccess.SetAccessConditional(std::move(wayToAccessConditional),
-                                      std::move(pointToAccessConditional));
+      roadAccess.SetAccessConditional(std::move(wayToAccessConditional), std::move(pointToAccessConditional));
     }
   }
 
   template <typename Sink>
-  static void SerializeOneVehicleType(Sink & sink, WayToAccess const & wayToAccess,
-                                      PointToAccess const & pointToAccess)
+  static void SerializeOneVehicleType(Sink & sink, WayToAccess const & wayToAccess, PointToAccess const & pointToAccess)
   {
-    std::array<std::vector<Segment>, static_cast<size_t>(RoadAccess::Type::Count)>
-        segmentsByRoadAccessType;
+    std::array<std::vector<Segment>, static_cast<size_t>(RoadAccess::Type::Count)> segmentsByRoadAccessType;
     for (auto const & kv : wayToAccess)
     {
       segmentsByRoadAccessType[static_cast<size_t>(kv.second)].push_back(
@@ -263,8 +248,7 @@ private:
   }
 
   template <typename Source>
-  static void DeserializeOneVehicleType(Source & src, WayToAccess & wayToAccess,
-                                        PointToAccess & pointToAccess)
+  static void DeserializeOneVehicleType(Source & src, WayToAccess & wayToAccess, PointToAccess & pointToAccess)
   {
     wayToAccess.clear();
     pointToAccess.clear();
@@ -287,8 +271,7 @@ private:
         else
         {
           // For nodes we store |pointId + 1| because 0 is reserved for wildcard segmentIdx.
-          pointToAccess[RoadPoint(seg.GetFeatureId(), seg.GetSegmentIdx() - 1)] =
-              static_cast<RoadAccess::Type>(i);
+          pointToAccess[RoadPoint(seg.GetFeatureId(), seg.GetSegmentIdx() - 1)] = static_cast<RoadAccess::Type>(i);
         }
       }
     }
@@ -297,9 +280,8 @@ private:
   using PositionToAccessConditional = std::pair<AccessPosition, RoadAccess::Conditional::Access>;
 
   template <typename Sink>
-  static void SerializeConditionalOneVehicleType(
-      Sink & sink, WayToAccessConditional const & wayToAccessConditional,
-      PointToAccessConditional const & pointToAccessConditional)
+  static void SerializeConditionalOneVehicleType(Sink & sink, WayToAccessConditional const & wayToAccessConditional,
+                                                 PointToAccessConditional const & pointToAccessConditional)
   {
     auto constexpr kAccessTypesCount = static_cast<size_t>(RoadAccess::Type::Count);
     std::array<std::vector<PositionToAccessConditional>, kAccessTypesCount> positionsByAccessType;
@@ -314,8 +296,7 @@ private:
     // For nodes we store |pointId + 1| because 0 is reserved for wildcard segmentIdx.
     for (auto const & [roadPoint, conditional] : pointToAccessConditional)
     {
-      auto const position =
-          AccessPosition::MakePointAccess(roadPoint.GetFeatureId(), roadPoint.GetPointId());
+      auto const position = AccessPosition::MakePointAccess(roadPoint.GetFeatureId(), roadPoint.GetPointId());
 
       for (auto const & access : conditional.GetAccesses())
         positionsByAccessType[static_cast<size_t>(access.m_type)].emplace_back(position, access);
@@ -323,21 +304,20 @@ private:
 
     for (auto & positionsConditional : positionsByAccessType)
     {
-      std::sort(positionsConditional.begin(), positionsConditional.end(),
-                [](auto const & lhs, auto const & rhs) {
-                  auto const & lhsAccessPosition = lhs.first;
-                  auto const & rhsAccessPosition = rhs.first;
-                  return lhsAccessPosition < rhsAccessPosition;
-                });
+      std::sort(positionsConditional.begin(), positionsConditional.end(), [](auto const & lhs, auto const & rhs)
+      {
+        auto const & lhsAccessPosition = lhs.first;
+        auto const & rhsAccessPosition = rhs.first;
+        return lhsAccessPosition < rhsAccessPosition;
+      });
 
       SerializePositionsAccessConditional(sink, positionsConditional);
     }
   }
 
   template <typename Source>
-  static void DeserializeConditionalOneVehicleType(
-      Source & src, WayToAccessConditional & wayToAccessConditional,
-      PointToAccessConditional & pointToAccessConditional)
+  static void DeserializeConditionalOneVehicleType(Source & src, WayToAccessConditional & wayToAccessConditional,
+                                                   PointToAccessConditional & pointToAccessConditional)
   {
     wayToAccessConditional.clear();
     pointToAccessConditional.clear();
@@ -379,8 +359,7 @@ private:
     for (size_t i = 0; i < segments.size(); ++i)
     {
       auto const & seg = segments[i];
-      CHECK_EQUAL(seg.GetMwmId(), kFakeNumMwmId,
-                  ("Numeric mwm ids are temporary and must not be serialized."));
+      CHECK_EQUAL(seg.GetMwmId(), kFakeNumMwmId, ("Numeric mwm ids are temporary and must not be serialized."));
       featureIds[i] = seg.GetFeatureId();
       segmentIndices[i] = seg.GetSegmentIdx();
       isForward[i] = seg.IsForward();
diff --git a/libs/routing/road_graph.cpp b/libs/routing/road_graph.cpp
index 76f1c20de..b78b6239b 100644
--- a/libs/routing/road_graph.cpp
+++ b/libs/routing/road_graph.cpp
@@ -39,32 +39,33 @@ void SplitEdge(Edge const & ab, geometry::PointWithAltitude const & p, vector<Ed
 
 // Edge ------------------------------------------------------------------------
 // static
-Edge Edge::MakeReal(FeatureID featureId, bool forward, uint32_t segId,
-                    JunctionPointT const & startJunction,
+Edge Edge::MakeReal(FeatureID featureId, bool forward, uint32_t segId, JunctionPointT const & startJunction,
                     JunctionPointT const & endJunction)
 {
   return {Type::Real, std::move(featureId), kInvalidFakeSegmentId, forward, segId, startJunction, endJunction};
 }
 
 // static
-Edge Edge::MakeFakeWithRealPart(FeatureID featureId, uint32_t fakeSegmentId, bool forward,
-                                uint32_t segId, JunctionPointT const & startJunction,
-                                JunctionPointT const & endJunction)
+Edge Edge::MakeFakeWithRealPart(FeatureID featureId, uint32_t fakeSegmentId, bool forward, uint32_t segId,
+                                JunctionPointT const & startJunction, JunctionPointT const & endJunction)
 {
   return {Type::FakeWithRealPart, std::move(featureId), fakeSegmentId, forward, segId, startJunction, endJunction};
 }
 
 // static
-Edge Edge::MakeFake(JunctionPointT const & startJunction,
-                    JunctionPointT const & endJunction)
+Edge Edge::MakeFake(JunctionPointT const & startJunction, JunctionPointT const & endJunction)
 {
-  return {Type::FakeWithoutRealPart, FeatureID(), kInvalidFakeSegmentId, true /* forward */,
-          0 /* segmentId */, startJunction, endJunction};
+  return {Type::FakeWithoutRealPart,
+          FeatureID(),
+          kInvalidFakeSegmentId,
+          true /* forward */,
+          0 /* segmentId */,
+          startJunction,
+          endJunction};
 }
 
 // static
-Edge Edge::MakeFake(JunctionPointT const & startJunction,
-                    JunctionPointT const & endJunction, Edge const & prototype)
+Edge Edge::MakeFake(JunctionPointT const & startJunction, JunctionPointT const & endJunction, Edge const & prototype)
 {
   auto e = prototype;
   e.m_startJunction = startJunction;
@@ -97,16 +98,13 @@ Edge Edge::GetReverseEdge() const
 
 bool Edge::SameRoadSegmentAndDirection(Edge const & r) const
 {
-  return m_featureId == r.m_featureId &&
-         m_forward == r.m_forward &&
-         m_segId == r.m_segId;
+  return m_featureId == r.m_featureId && m_forward == r.m_forward && m_segId == r.m_segId;
 }
 
 bool Edge::operator==(Edge const & r) const
 {
-  return m_type == r.m_type && m_featureId == r.m_featureId && m_forward == r.m_forward &&
-         m_segId == r.m_segId && m_startJunction == r.m_startJunction &&
-         m_endJunction == r.m_endJunction;
+  return m_type == r.m_type && m_featureId == r.m_featureId && m_forward == r.m_forward && m_segId == r.m_segId &&
+         m_startJunction == r.m_startJunction && m_endJunction == r.m_endJunction;
 }
 
 bool Edge::operator<(Edge const & r) const
@@ -130,106 +128,91 @@ string DebugPrint(Edge const & r)
 {
   ostringstream ss;
   ss << boolalpha << "Edge "
-     << "{ featureId: " << DebugPrint(r.GetFeatureId())
-     << ", isForward: " << r.IsForward()
-     << ", partOfReal: " << r.HasRealPart()
-     << ", segId: " << r.m_segId
-     << ", startJunction: " << DebugPrint(r.m_startJunction)
-     << ", endJunction: " << DebugPrint(r.m_endJunction)
+     << "{ featureId: " << DebugPrint(r.GetFeatureId()) << ", isForward: " << r.IsForward()
+     << ", partOfReal: " << r.HasRealPart() << ", segId: " << r.m_segId
+     << ", startJunction: " << DebugPrint(r.m_startJunction) << ", endJunction: " << DebugPrint(r.m_endJunction)
      << " }";
   return ss.str();
 }
 
 std::string Edge::PrintLatLon() const
 {
-  return "{ " + DebugPrint(mercator::ToLatLon(GetStartPoint())) + ", "
-              + DebugPrint(mercator::ToLatLon(GetEndPoint())) + " }";
+  return "{ " + DebugPrint(mercator::ToLatLon(GetStartPoint())) + ", " + DebugPrint(mercator::ToLatLon(GetEndPoint())) +
+         " }";
 }
 // IRoadGraph::RoadInfo --------------------------------------------------------
 
-IRoadGraph::RoadInfo::RoadInfo()
-  : m_speedKMPH(0.0), m_bidirectional(false)
-{}
+IRoadGraph::RoadInfo::RoadInfo() : m_speedKMPH(0.0), m_bidirectional(false) {}
 IRoadGraph::RoadInfo::RoadInfo(RoadInfo && ri)
   : m_junctions(std::move(ri.m_junctions))
   , m_speedKMPH(ri.m_speedKMPH)
   , m_bidirectional(ri.m_bidirectional)
 {}
 
-IRoadGraph::RoadInfo::RoadInfo(bool bidirectional, double speedKMPH,
-                               initializer_list<JunctionPointT> const & points)
-  : m_junctions(points), m_speedKMPH(speedKMPH), m_bidirectional(bidirectional)
+IRoadGraph::RoadInfo::RoadInfo(bool bidirectional, double speedKMPH, initializer_list<JunctionPointT> const & points)
+  : m_junctions(points)
+  , m_speedKMPH(speedKMPH)
+  , m_bidirectional(bidirectional)
 {}
 
 // IRoadGraph::CrossOutgoingLoader ---------------------------------------------
-void IRoadGraph::CrossOutgoingLoader::LoadEdges(FeatureID const & featureId,
-                                                PointWithAltitudeVec const & junctions,
+void IRoadGraph::CrossOutgoingLoader::LoadEdges(FeatureID const & featureId, PointWithAltitudeVec const & junctions,
                                                 bool bidirectional)
 {
   ForEachEdge(junctions, [&](size_t segId, JunctionPointT const & endJunction, bool forward)
   {
     if (forward || bidirectional || m_mode == IRoadGraph::Mode::IgnoreOnewayTag)
-    {
-      m_edges.push_back(Edge::MakeReal(featureId, forward, base::asserted_cast<uint32_t>(segId),
-                                       m_cross, endJunction));
-    }
+      m_edges.push_back(Edge::MakeReal(featureId, forward, base::asserted_cast<uint32_t>(segId), m_cross, endJunction));
   });
 }
 
 // IRoadGraph::CrossIngoingLoader ----------------------------------------------
-void IRoadGraph::CrossIngoingLoader::LoadEdges(FeatureID const & featureId,
-                                               PointWithAltitudeVec const & junctions,
+void IRoadGraph::CrossIngoingLoader::LoadEdges(FeatureID const & featureId, PointWithAltitudeVec const & junctions,
                                                bool bidirectional)
 {
   ForEachEdge(junctions, [&](size_t segId, JunctionPointT const & endJunction, bool forward)
   {
     if (!forward || bidirectional || m_mode == IRoadGraph::Mode::IgnoreOnewayTag)
     {
-      m_edges.push_back(Edge::MakeReal(featureId, !forward, base::asserted_cast<uint32_t>(segId),
-                                       endJunction, m_cross));
+      m_edges.push_back(
+          Edge::MakeReal(featureId, !forward, base::asserted_cast<uint32_t>(segId), endJunction, m_cross));
     }
   });
 }
 
 // IRoadGraph ------------------------------------------------------------------
-void IRoadGraph::GetOutgoingEdges(JunctionPointT const & junction,
-                                  EdgeListT & edges) const
+void IRoadGraph::GetOutgoingEdges(JunctionPointT const & junction, EdgeListT & edges) const
 {
   GetFakeOutgoingEdges(junction, edges);
   GetRegularOutgoingEdges(junction, edges);
 }
 
-void IRoadGraph::GetIngoingEdges(JunctionPointT const & junction,
-                                 EdgeListT & edges) const
+void IRoadGraph::GetIngoingEdges(JunctionPointT const & junction, EdgeListT & edges) const
 {
   GetFakeIngoingEdges(junction, edges);
   GetRegularIngoingEdges(junction, edges);
 }
 
-void IRoadGraph::GetRegularOutgoingEdges(JunctionPointT const & junction,
-                                         EdgeListT & edges) const
+void IRoadGraph::GetRegularOutgoingEdges(JunctionPointT const & junction, EdgeListT & edges) const
 {
   CrossOutgoingLoader loader(junction, GetMode(), edges);
   ForEachFeatureClosestToCross(junction.GetPoint(), loader);
 }
 
-void IRoadGraph::GetRegularIngoingEdges(JunctionPointT const & junction,
-                                        EdgeListT & edges) const
+void IRoadGraph::GetRegularIngoingEdges(JunctionPointT const & junction, EdgeListT & edges) const
 {
   CrossIngoingLoader loader(junction, GetMode(), edges);
   ForEachFeatureClosestToCross(junction.GetPoint(), loader);
 }
 
-void IRoadGraph::GetFakeOutgoingEdges(JunctionPointT const & junction,
-                                      EdgeListT & edges) const
+void IRoadGraph::GetFakeOutgoingEdges(JunctionPointT const & junction, EdgeListT & edges) const
 {
   auto const it = m_fakeOutgoingEdges.find(junction);
   if (it != m_fakeOutgoingEdges.cend())
     edges.append(it->second.cbegin(), it->second.cend());
 }
 
-void IRoadGraph::GetFakeIngoingEdges(JunctionPointT const & junction,
-                                     EdgeListT & edges) const
+void IRoadGraph::GetFakeIngoingEdges(JunctionPointT const & junction, EdgeListT & edges) const
 {
   auto const it = m_fakeIngoingEdges.find(junction);
   if (it != m_fakeIngoingEdges.cend())
@@ -267,10 +250,10 @@ void IRoadGraph::AddFakeEdges(JunctionPointT const & junction, vector<pair<Edge,
     edges.push_back(Edge::MakeFake(p, junction));
 
     ForEachFakeEdge([&](Edge const & uv)
-                    {
-                      if (OnEdge(p, uv))
-                        SplitEdge(uv, p, edges);
-                    });
+    {
+      if (OnEdge(p, uv))
+        SplitEdge(uv, p, edges);
+    });
 
     for (auto const & uv : edges)
     {
@@ -302,8 +285,8 @@ string DebugPrint(IRoadGraph::Mode mode)
 {
   switch (mode)
   {
-    case IRoadGraph::Mode::ObeyOnewayTag: return "ObeyOnewayTag";
-    case IRoadGraph::Mode::IgnoreOnewayTag: return "IgnoreOnewayTag";
+  case IRoadGraph::Mode::ObeyOnewayTag: return "ObeyOnewayTag";
+  case IRoadGraph::Mode::IgnoreOnewayTag: return "IgnoreOnewayTag";
   }
   UNREACHABLE();
 }
diff --git a/libs/routing/road_graph.hpp b/libs/routing/road_graph.hpp
index 5ec023fb5..4258d8ba8 100644
--- a/libs/routing/road_graph.hpp
+++ b/libs/routing/road_graph.hpp
@@ -23,8 +23,8 @@ class Edge
 {
   enum class Type
   {
-    Real,               // An edge that corresponds to some real segment.
-    FakeWithRealPart,   // A fake edge that is a part of some real segment.
+    Real,                // An edge that corresponds to some real segment.
+    FakeWithRealPart,    // A fake edge that is a part of some real segment.
     FakeWithoutRealPart  // A fake edge that is not part of any real segment.
   };
 
@@ -33,17 +33,13 @@ public:
 
   using JunctionPointT = geometry::PointWithAltitude;
 
-  static Edge MakeReal(FeatureID featureId, bool forward, uint32_t segId,
-                       JunctionPointT const & startJunction,
+  static Edge MakeReal(FeatureID featureId, bool forward, uint32_t segId, JunctionPointT const & startJunction,
                        JunctionPointT const & endJunction);
-  static Edge MakeFakeWithRealPart(FeatureID featureId, uint32_t fakeSegmentId,
-                                   bool forward, uint32_t segId,
-                                   JunctionPointT const & startJunction,
-                                   JunctionPointT const & endJunction);
-  static Edge MakeFake(JunctionPointT const & startJunction,
-                       JunctionPointT const & endJunction);
-  static Edge MakeFake(JunctionPointT const & startJunction,
-                       JunctionPointT const & endJunction, Edge const & prototype);
+  static Edge MakeFakeWithRealPart(FeatureID featureId, uint32_t fakeSegmentId, bool forward, uint32_t segId,
+                                   JunctionPointT const & startJunction, JunctionPointT const & endJunction);
+  static Edge MakeFake(JunctionPointT const & startJunction, JunctionPointT const & endJunction);
+  static Edge MakeFake(JunctionPointT const & startJunction, JunctionPointT const & endJunction,
+                       Edge const & prototype);
 
   inline FeatureID const & GetFeatureId() const { return m_featureId; }
   inline bool IsForward() const { return m_forward; }
@@ -56,13 +52,10 @@ public:
   inline m2::PointD const & GetStartPoint() const { return m_startJunction.GetPoint(); }
   inline m2::PointD const & GetEndPoint() const { return m_endJunction.GetPoint(); }
 
-  inline bool IsFake() const { return  m_type != Type::Real; }
+  inline bool IsFake() const { return m_type != Type::Real; }
   inline bool HasRealPart() const { return m_type != Type::FakeWithoutRealPart; }
 
-  inline m2::PointD GetDirection() const
-  {
-    return GetEndJunction().GetPoint() - GetStartJunction().GetPoint();
-  }
+  inline m2::PointD GetDirection() const { return GetEndJunction().GetPoint() - GetStartJunction().GetPoint(); }
 
   Type GetType() const { return m_type; }
 
@@ -119,19 +112,16 @@ public:
   using EdgeVector = std::vector<Edge>;
 
   /// Finds all nearest outgoing edges, that route to the junction.
-  virtual void GetOutgoingEdges(JunctionPointT const & junction,
-                                EdgeListT & edges) const = 0;
+  virtual void GetOutgoingEdges(JunctionPointT const & junction, EdgeListT & edges) const = 0;
 
   /// Finds all nearest ingoing edges, that route to the junction.
-  virtual void GetIngoingEdges(JunctionPointT const & junction,
-                               EdgeListT & edges) const = 0;
+  virtual void GetIngoingEdges(JunctionPointT const & junction, EdgeListT & edges) const = 0;
 
   /// @return Types for the specified edge
   virtual void GetEdgeTypes(Edge const & edge, feature::TypesHolder & types) const = 0;
 
   /// @return Types for specified junction
-  virtual void GetJunctionTypes(JunctionPointT const & junction,
-                                feature::TypesHolder & types) const = 0;
+  virtual void GetJunctionTypes(JunctionPointT const & junction, feature::TypesHolder & types) const = 0;
 
   virtual void GetRouteEdges(EdgeVector & routeEdges) const;
 
@@ -159,8 +149,7 @@ public:
   {
     RoadInfo();
     RoadInfo(RoadInfo && ri);
-    RoadInfo(bool bidirectional, double speedKMPH,
-             std::initializer_list<JunctionPointT> const & points);
+    RoadInfo(bool bidirectional, double speedKMPH, std::initializer_list<JunctionPointT> const & points);
     RoadInfo(RoadInfo const &) = default;
     RoadInfo & operator=(RoadInfo const &) = default;
 
@@ -171,11 +160,8 @@ public:
 
   struct FullRoadInfo
   {
-    FullRoadInfo(FeatureID const & featureId, RoadInfo const & roadInfo)
-      : m_featureId(featureId)
-      , m_roadInfo(roadInfo)
-    {
-    }
+    FullRoadInfo(FeatureID const & featureId, RoadInfo const & roadInfo) : m_featureId(featureId), m_roadInfo(roadInfo)
+    {}
 
     FeatureID m_featureId;
     RoadInfo m_roadInfo;
@@ -185,23 +171,21 @@ public:
   class ICrossEdgesLoader
   {
   public:
-    ICrossEdgesLoader(JunctionPointT const & cross, IRoadGraph::Mode mode,
-                      EdgeListT & edges)
-      : m_cross(cross), m_mode(mode), m_edges(edges)
-    {
-    }
+    ICrossEdgesLoader(JunctionPointT const & cross, IRoadGraph::Mode mode, EdgeListT & edges)
+      : m_cross(cross)
+      , m_mode(mode)
+      , m_edges(edges)
+    {}
 
     virtual ~ICrossEdgesLoader() = default;
 
-    void operator()(FeatureID const & featureId, PointWithAltitudeVec const & junctions,
-                    bool bidirectional)
+    void operator()(FeatureID const & featureId, PointWithAltitudeVec const & junctions, bool bidirectional)
     {
       LoadEdges(featureId, junctions, bidirectional);
     }
 
   private:
-    virtual void LoadEdges(FeatureID const & featureId, PointWithAltitudeVec const & junctions,
-                           bool bidirectional) = 0;
+    virtual void LoadEdges(FeatureID const & featureId, PointWithAltitudeVec const & junctions, bool bidirectional) = 0;
 
   protected:
     template <typename TFn>
@@ -237,65 +221,59 @@ public:
   class CrossOutgoingLoader : public ICrossEdgesLoader
   {
   public:
-    CrossOutgoingLoader(JunctionPointT const & cross, IRoadGraph::Mode mode,
-                        EdgeListT & edges)
+    CrossOutgoingLoader(JunctionPointT const & cross, IRoadGraph::Mode mode, EdgeListT & edges)
       : ICrossEdgesLoader(cross, mode, edges)
-    {
-    }
+    {}
 
   private:
     // ICrossEdgesLoader overrides:
-    void LoadEdges(FeatureID const & featureId, PointWithAltitudeVec const & junctions,
-                   bool bidirectional) override;
+    void LoadEdges(FeatureID const & featureId, PointWithAltitudeVec const & junctions, bool bidirectional) override;
   };
 
   class CrossIngoingLoader : public ICrossEdgesLoader
   {
   public:
-    CrossIngoingLoader(JunctionPointT const & cross, IRoadGraph::Mode mode,
-                       EdgeListT & edges)
+    CrossIngoingLoader(JunctionPointT const & cross, IRoadGraph::Mode mode, EdgeListT & edges)
       : ICrossEdgesLoader(cross, mode, edges)
-    {
-    }
+    {}
 
   private:
     // ICrossEdgesLoader overrides:
-    void LoadEdges(FeatureID const & featureId, PointWithAltitudeVec const & junctions,
-                   bool bidirectional) override;
+    void LoadEdges(FeatureID const & featureId, PointWithAltitudeVec const & junctions, bool bidirectional) override;
   };
 
-  void GetOutgoingEdges(JunctionPointT const & junction,
-                        EdgeListT & edges) const override;
+  void GetOutgoingEdges(JunctionPointT const & junction, EdgeListT & edges) const override;
 
-  void GetIngoingEdges(JunctionPointT const & junction,
-                       EdgeListT & edges) const override;
+  void GetIngoingEdges(JunctionPointT const & junction, EdgeListT & edges) const override;
 
   /// Removes all fake turns and vertices from the graph.
   void ResetFakes();
 
   /// Adds fake edges from fake position rp to real vicinity
   /// positions.
-  void AddFakeEdges(JunctionPointT const & junction,
-                    std::vector<std::pair<Edge, JunctionPointT>> const & vicinities);
+  void AddFakeEdges(JunctionPointT const & junction, std::vector<std::pair<Edge, JunctionPointT>> const & vicinities);
   void AddOutgoingFakeEdge(Edge const & e);
   void AddIngoingFakeEdge(Edge const & e);
 
   /// Calls edgesLoader on each feature which is close to cross.
-  virtual void ForEachFeatureClosestToCross(m2::PointD const & cross,
-                                            ICrossEdgesLoader & edgesLoader) const = 0;
+  virtual void ForEachFeatureClosestToCross(m2::PointD const & cross, ICrossEdgesLoader & edgesLoader) const = 0;
 
   /// Finds the closest edges to the center of |rect|.
   /// @return Array of pairs of Edge and projection point on the Edge. If there is no the closest edges
   /// then returns empty array.
   using EdgeProjectionT = std::pair<Edge, JunctionPointT>;
   virtual void FindClosestEdges(m2::RectD const & /*rect*/, uint32_t /*count*/,
-                                std::vector<EdgeProjectionT> & /*vicinities*/) const {};
+                                std::vector<EdgeProjectionT> & /*vicinities*/) const
+  {}
 
   /// \returns Vector of pairs FeatureID and corresponding RoadInfo for road features
   /// lying in |rect|.
   /// \note |RoadInfo::m_speedKMPH| is set to |kInvalidSpeedKMPH|.
-  virtual std::vector<FullRoadInfo> FindRoads(
-      m2::RectD const & /*rect*/, IsGoodFeatureFn const & /*isGoodFeature*/) const { return {}; }
+  virtual std::vector<FullRoadInfo> FindRoads(m2::RectD const & /*rect*/,
+                                              IsGoodFeatureFn const & /*isGoodFeature*/) const
+  {
+    return {};
+  }
 
   /// @return Types for the specified feature
   virtual void GetFeatureTypes(FeatureID const & featureId, feature::TypesHolder & types) const = 0;
@@ -309,11 +287,9 @@ public:
   virtual void ClearState() {}
 
   /// \brief Finds all outgoing regular (non-fake) edges for junction.
-  void GetRegularOutgoingEdges(JunctionPointT const & junction,
-                               EdgeListT & edges) const;
+  void GetRegularOutgoingEdges(JunctionPointT const & junction, EdgeListT & edges) const;
   /// \brief Finds all ingoing regular (non-fake) edges for junction.
-  void GetRegularIngoingEdges(JunctionPointT const & junction,
-                              EdgeListT & edges) const;
+  void GetRegularIngoingEdges(JunctionPointT const & junction, EdgeListT & edges) const;
   /// \brief Finds all outgoing fake edges for junction.
   void GetFakeOutgoingEdges(JunctionPointT const & junction, EdgeListT & edges) const;
   /// \brief Finds all ingoing fake edges for junction.
@@ -327,16 +303,12 @@ private:
   void ForEachFakeEdge(Fn && fn)
   {
     for (auto const & m : m_fakeIngoingEdges)
-    {
       for (auto const & e : m.second)
         fn(e);
-    }
 
     for (auto const & m : m_fakeOutgoingEdges)
-    {
       for (auto const & e : m.second)
         fn(e);
-    }
   }
 
   /// \note |m_fakeIngoingEdges| and |m_fakeOutgoingEdges| map junctions to sorted vectors.
diff --git a/libs/routing/road_index.hpp b/libs/routing/road_index.hpp
index b48b945e9..402c1b458 100644
--- a/libs/routing/road_index.hpp
+++ b/libs/routing/road_index.hpp
@@ -55,10 +55,8 @@ public:
     uint32_t count = 0;
 
     for (Joint::Id const jointId : m_jointIds)
-    {
       if (jointId != Joint::kInvalidId)
         ++count;
-    }
 
     return count;
   }
diff --git a/libs/routing/road_point.hpp b/libs/routing/road_point.hpp
index 346681a68..40c3c13e8 100644
--- a/libs/routing/road_point.hpp
+++ b/libs/routing/road_point.hpp
@@ -31,15 +31,9 @@ public:
     return m_pointId < rp.m_pointId;
   }
 
-  bool operator==(RoadPoint const & rp) const
-  {
-    return m_featureId == rp.m_featureId && m_pointId == rp.m_pointId;
-  }
+  bool operator==(RoadPoint const & rp) const { return m_featureId == rp.m_featureId && m_pointId == rp.m_pointId; }
 
-  bool operator!=(RoadPoint const & rp) const
-  {
-    return !(*this == rp);
-  }
+  bool operator!=(RoadPoint const & rp) const { return !(*this == rp); }
 
   struct Hash
   {
diff --git a/libs/routing/route.cpp b/libs/routing/route.cpp
index 237202e15..0b1bb9e61 100644
--- a/libs/routing/route.cpp
+++ b/libs/routing/route.cpp
@@ -26,13 +26,9 @@ std::string DebugPrint(RouteSegment::RoadNameInfo const & rni)
 {
   stringstream out;
   out << "RoadNameInfo "
-      << "{ m_name = " << rni.m_name
-      << ", m_ref = " << rni.m_ref
-      << ", m_junction_ref = " << rni.m_junction_ref
-      << ", m_destination_ref = " << rni.m_destination_ref
-      << ", m_destination = " << rni.m_destination
-      << ", m_isLink = " << rni.m_isLink
-      << " }";
+      << "{ m_name = " << rni.m_name << ", m_ref = " << rni.m_ref << ", m_junction_ref = " << rni.m_junction_ref
+      << ", m_destination_ref = " << rni.m_destination_ref << ", m_destination = " << rni.m_destination
+      << ", m_isLink = " << rni.m_isLink << " }";
   return out.str();
 }
 
@@ -41,16 +37,13 @@ std::string DebugPrint(RouteSegment::SpeedCamera const & rhs)
   return "SpeedCamera{ " + std::to_string(rhs.m_coef) + ", " + std::to_string(int(rhs.m_maxSpeedKmPH)) + " }";
 }
 
-
-Route::Route(string const & router, vector<m2::PointD> const & points, uint64_t routeId,
-             string const & name)
+Route::Route(string const & router, vector<m2::PointD> const & points, uint64_t routeId, string const & name)
   : m_router(router)
   , m_routingSettings(GetRoutingSettings(VehicleType::Car))
   , m_name(name)
   , m_poly(points.begin(), points.end())
   , m_routeId(routeId)
-{
-}
+{}
 
 void Route::AddAbsentCountry(string const & name)
 {
@@ -87,8 +80,7 @@ double Route::GetMercatorDistanceFromBegin() const
 
   CHECK_LESS(curIter.m_ind, m_routeSegments.size(), ());
 
-  double const distMerc =
-      curIter.m_ind == 0 ? 0.0 : m_routeSegments[curIter.m_ind - 1].GetDistFromBeginningMerc();
+  double const distMerc = curIter.m_ind == 0 ? 0.0 : m_routeSegments[curIter.m_ind - 1].GetDistFromBeginningMerc();
   return distMerc + m_poly.GetDistFromCurPointToRoutePointMerc();
 }
 
@@ -136,7 +128,8 @@ double Route::GetCurrentTimeFromBeginSec() const
   auto const & curIter = m_poly.GetCurrentIter();
   CHECK_LESS(curIter.m_ind, m_routeSegments.size(), ());
 
-  double const toLastPointSec = (curIter.m_ind == 0) ? 0.0 : m_routeSegments[curIter.m_ind - 1].GetTimeFromBeginningSec();
+  double const toLastPointSec =
+      (curIter.m_ind == 0) ? 0.0 : m_routeSegments[curIter.m_ind - 1].GetTimeFromBeginningSec();
   double const toNextPointSec = m_routeSegments[curIter.m_ind].GetTimeFromBeginningSec();
 
   double const curSegLenMeters = GetSegLenMeters(curIter.m_ind);
@@ -288,8 +281,7 @@ void Route::GetNearestTurn(double & distanceToTurnMeters, TurnItem & turn) const
   GetClosestTurnAfterIdx(m_poly.GetCurrentIter().m_ind, turn);
   CHECK_LESS(m_poly.GetCurrentIter().m_ind, turn.m_index, ());
 
-  distanceToTurnMeters = m_poly.GetDistanceM(m_poly.GetCurrentIter(),
-                                             m_poly.GetIterToIndex(turn.m_index));
+  distanceToTurnMeters = m_poly.GetDistanceM(m_poly.GetCurrentIter(), m_poly.GetIterToIndex(turn.m_index));
 }
 
 optional<turns::TurnItem> Route::GetCurrentIteratorTurn() const
@@ -326,8 +318,7 @@ bool Route::GetNextTurn(double & distanceToTurnMeters, TurnItem & nextTurn) cons
   CHECK_LESS(curTurn.m_index, m_routeSegments.size(), ());
   GetClosestTurnAfterIdx(curTurn.m_index, nextTurn);
   CHECK_LESS(curTurn.m_index, nextTurn.m_index, ());
-  distanceToTurnMeters = m_poly.GetDistanceM(m_poly.GetCurrentIter(),
-                                             m_poly.GetIterToIndex(nextTurn.m_index));
+  distanceToTurnMeters = m_poly.GetDistanceM(m_poly.GetCurrentIter(), m_poly.GetIterToIndex(nextTurn.m_index));
   return true;
 }
 
@@ -357,11 +348,8 @@ void Route::SetRouteSegments(vector<RouteSegment> && routeSegments)
   m_haveAltitudes = true;
   for (size_t i = 0; i < m_routeSegments.size(); ++i)
   {
-    if (m_haveAltitudes &&
-        m_routeSegments[i].GetJunction().GetAltitude() == geometry::kInvalidAltitude)
-    {
+    if (m_haveAltitudes && m_routeSegments[i].GetJunction().GetAltitude() == geometry::kInvalidAltitude)
       m_haveAltitudes = false;
-    }
 
     if (!m_routeSegments[i].GetSegment().IsRealSegment())
       fakeSegmentIndexes.push_back(i);
@@ -372,9 +360,8 @@ void Route::SetRouteSegments(vector<RouteSegment> && routeSegments)
 
 bool Route::MoveIterator(location::GpsInfo const & info)
 {
-  m2::RectD const rect = mercator::MetersToXY(
-      info.m_longitude, info.m_latitude,
-      max(m_routingSettings.m_matchingThresholdM, info.m_horizontalAccuracy));
+  m2::RectD const rect = mercator::MetersToXY(info.m_longitude, info.m_latitude,
+                                              max(m_routingSettings.m_matchingThresholdM, info.m_horizontalAccuracy));
 
   return m_poly.UpdateMatchingProjection(rect);
 }
@@ -400,8 +387,7 @@ double Route::GetPolySegAngle(size_t ind) const
   return (i == polySz) ? 0 : math::RadToDeg(ang::AngleTo(p1, p2));
 }
 
-bool Route::MatchLocationToRoute(location::GpsInfo & location,
-                                 location::RouteMatchingInfo & routeMatchingInfo) const
+bool Route::MatchLocationToRoute(location::GpsInfo & location, location::RouteMatchingInfo & routeMatchingInfo) const
 {
   if (!IsValid())
     return false;
@@ -426,7 +412,10 @@ bool Route::MatchLocationToRoute(location::GpsInfo & location,
   return false;
 }
 
-size_t Route::GetSubrouteCount() const { return m_subrouteAttrs.size(); }
+size_t Route::GetSubrouteCount() const
+{
+  return m_subrouteAttrs.size();
+}
 
 void Route::GetSubrouteInfo(size_t subrouteIdx, vector<RouteSegment> & segments) const
 {
@@ -463,9 +452,8 @@ bool Route::IsSubroutePassed(size_t subrouteIdx) const
   CHECK_LESS(segmentIdx, m_routeSegments.size(), ());
   double const lengthMeters = m_routeSegments[segmentIdx].GetDistFromBeginningMeters();
   double const passedDistanceMeters = m_poly.GetDistanceFromStartMeters();
-  double const finishToleranceM = segmentIdx == m_routeSegments.size() - 1
-                                      ? m_routingSettings.m_finishToleranceM
-                                      : kOnEndToleranceM;
+  double const finishToleranceM =
+      segmentIdx == m_routeSegments.size() - 1 ? m_routingSettings.m_finishToleranceM : kOnEndToleranceM;
   return lengthMeters - passedDistanceMeters < finishToleranceM;
 }
 
@@ -496,10 +484,8 @@ void Route::GetTurnsForTesting(vector<TurnItem> & turns) const
 {
   turns.clear();
   for (auto const & s : m_routeSegments)
-  {
     if (IsNormalTurn(s.GetTurn()))
       turns.push_back(s.GetTurn());
-  }
 }
 
 double Route::GetSegLenMeters(size_t segIdx) const
@@ -563,4 +549,4 @@ string DebugPrint(Route const & r)
 {
   return DebugPrint(r.m_poly.GetPolyline());
 }
-} // namespace routing
+}  // namespace routing
diff --git a/libs/routing/route.hpp b/libs/routing/route.hpp
index 78702f081..db7c601f9 100644
--- a/libs/routing/route.hpp
+++ b/libs/routing/route.hpp
@@ -29,9 +29,9 @@
 
 namespace location
 {
-  class GpsInfo;
-  class RouteMatchingInfo;
-}
+class GpsInfo;
+class RouteMatchingInfo;
+}  // namespace location
 
 namespace routing
 {
@@ -46,12 +46,9 @@ public:
   struct SpeedCamera
   {
     SpeedCamera() = default;
-    SpeedCamera(double coef, uint8_t maxSpeedKmPH): m_coef(coef), m_maxSpeedKmPH(maxSpeedKmPH) {}
+    SpeedCamera(double coef, uint8_t maxSpeedKmPH) : m_coef(coef), m_maxSpeedKmPH(maxSpeedKmPH) {}
 
-    bool EqualCoef(SpeedCamera const & rhs) const
-    {
-      return AlmostEqualAbs(m_coef, rhs.m_coef, 1.0E-5);
-    }
+    bool EqualCoef(SpeedCamera const & rhs) const { return AlmostEqualAbs(m_coef, rhs.m_coef, 1.0E-5); }
 
     bool operator<(SpeedCamera const & rhs) const
     {
@@ -78,21 +75,22 @@ public:
     std::string m_destination_ref;  // Number of next road, e.g. "CA 85", Sometimes "CA 85 South". Usually match |m_ref|
                                     // of next main road.
     // This is for 1st segment of link after junction. Exit |junction_ref| to |m_destination_ref| for |m_destination|.
-    std::string m_junction_ref;     // Number of junction e.g. "398B".
-    std::string m_destination;      // E.g. "Cupertino".
-    std::string m_ref;              // Number of street/road e.g. "CA 85".
+    std::string m_junction_ref;  // Number of junction e.g. "398B".
+    std::string m_destination;   // E.g. "Cupertino".
+    std::string m_ref;           // Number of street/road e.g. "CA 85".
     bool m_isLink = false;
 
     RoadNameInfo() = default;
     RoadNameInfo(std::string name) : m_name(std::move(name)) {}
     RoadNameInfo(std::string name, std::string destination_ref)
-      : m_name(std::move(name)), m_destination_ref(std::move(destination_ref))
-    {
-    }
+      : m_name(std::move(name))
+      , m_destination_ref(std::move(destination_ref))
+    {}
     RoadNameInfo(std::string name, std::string destination_ref, std::string junction_ref)
-      : m_name(std::move(name)), m_destination_ref(std::move(destination_ref)), m_junction_ref(std::move(junction_ref))
-    {
-    }
+      : m_name(std::move(name))
+      , m_destination_ref(std::move(destination_ref))
+      , m_junction_ref(std::move(junction_ref))
+    {}
     RoadNameInfo(std::string name, std::string ref, std::string junction_ref, std::string destination_ref,
                  std::string destination, bool isLink)
       : m_name(std::move(name))
@@ -101,8 +99,7 @@ public:
       , m_destination(std::move(destination))
       , m_ref(std::move(ref))
       , m_isLink(std::move(isLink))
-    {
-    }
+    {}
 
     bool HasBasicTextInfo() const { return !m_ref.empty() || !m_name.empty(); }
     bool HasExitInfo() const { return m_isLink || HasExitTextInfo(); }
@@ -125,15 +122,14 @@ public:
     friend std::string DebugPrint(RoadNameInfo const & rni);
   };
 
-  RouteSegment(Segment const & segment, turns::TurnItem const & turn,
-               geometry::PointWithAltitude const & junction, RoadNameInfo const & roadNameInfo)
+  RouteSegment(Segment const & segment, turns::TurnItem const & turn, geometry::PointWithAltitude const & junction,
+               RoadNameInfo const & roadNameInfo)
     : m_segment(segment)
     , m_turn(turn)
     , m_junction(junction)
     , m_roadNameInfo(roadNameInfo)
     , m_transitInfo(nullptr)
-  {
-  }
+  {}
 
   void ClearTurn()
   {
@@ -143,7 +139,7 @@ public:
 
   void SetTurnExits(uint32_t exitNum) { m_turn.m_exitNum = exitNum; }
 
-  std::vector<turns::SingleLaneInfo> & GetTurnLanes() { return m_turn.m_lanes; };
+  std::vector<turns::SingleLaneInfo> & GetTurnLanes() { return m_turn.m_lanes; }
 
   void SetDistancesAndTime(double distFromBeginningMeters, double distFromBeginningMerc, double timeFromBeginningS)
   {
@@ -152,10 +148,7 @@ public:
     m_timeFromBeginningS = timeFromBeginningS;
   }
 
-  void SetTransitInfo(std::unique_ptr<TransitInfo> transitInfo)
-  {
-    m_transitInfo.Set(std::move(transitInfo));
-  }
+  void SetTransitInfo(std::unique_ptr<TransitInfo> transitInfo) { m_transitInfo.Set(std::move(transitInfo)); }
 
   Segment const & GetSegment() const { return m_segment; }
   Segment & GetSegment() { return m_segment; }
@@ -231,9 +224,8 @@ public:
   public:
     SubrouteAttrs() = default;
 
-    SubrouteAttrs(geometry::PointWithAltitude const & start,
-                  geometry::PointWithAltitude const & finish, size_t beginSegmentIdx,
-                  size_t endSegmentIdx)
+    SubrouteAttrs(geometry::PointWithAltitude const & start, geometry::PointWithAltitude const & finish,
+                  size_t beginSegmentIdx, size_t endSegmentIdx)
       : m_start(start)
       , m_finish(finish)
       , m_beginSegmentIdx(beginSegmentIdx)
@@ -247,8 +239,7 @@ public:
       , m_finish(subroute.m_finish)
       , m_beginSegmentIdx(beginSegmentIdx)
       , m_endSegmentIdx(beginSegmentIdx + subroute.GetSize())
-    {
-    }
+    {}
 
     geometry::PointWithAltitude const & GetStart() const { return m_start; }
     geometry::PointWithAltitude const & GetFinish() const { return m_finish; }
@@ -272,11 +263,11 @@ public:
   /// \brief For every subroute some attributes are kept in the following structure.
   struct SubrouteSettings final
   {
-    SubrouteSettings(RoutingSettings const & routingSettings, std::string const & router,
-                     SubrouteUid id)
-      : m_routingSettings(routingSettings), m_router(router), m_id(id)
-    {
-    }
+    SubrouteSettings(RoutingSettings const & routingSettings, std::string const & router, SubrouteUid id)
+      : m_routingSettings(routingSettings)
+      , m_router(router)
+      , m_id(id)
+    {}
 
     RoutingSettings const m_routingSettings;
     std::string const m_router;
@@ -286,9 +277,10 @@ public:
   };
 
   Route(std::string const & router, uint64_t routeId)
-    : m_router(router), m_routingSettings(GetRoutingSettings(VehicleType::Car)), m_routeId(routeId)
-  {
-  }
+    : m_router(router)
+    , m_routingSettings(GetRoutingSettings(VehicleType::Car))
+    , m_routeId(routeId)
+  {}
 
   template <class TIter>
   Route(std::string const & router, TIter beg, TIter end, uint64_t routeId)
@@ -296,13 +288,13 @@ public:
     , m_routingSettings(GetRoutingSettings(VehicleType::Car))
     , m_poly(beg, end)
     , m_routeId(routeId)
-  {
-  }
+  {}
 
   Route(std::string const & router, std::vector<m2::PointD> const & points, uint64_t routeId,
         std::string const & name = std::string());
 
-  template <class TIter> void SetGeometry(TIter beg, TIter end)
+  template <class TIter>
+  void SetGeometry(TIter beg, TIter end)
   {
     if (beg == end)
     {
@@ -410,8 +402,7 @@ public:
 
   /// \brief Finds projection of |location| to the nearest route and sets |routeMatchingInfo|.
   /// fields accordingly.
-  bool MatchLocationToRoute(location::GpsInfo & location,
-                            location::RouteMatchingInfo & routeMatchingInfo) const;
+  bool MatchLocationToRoute(location::GpsInfo & location, location::RouteMatchingInfo & routeMatchingInfo) const;
 
   /// Add country name if we have no country filename to make route.
   void AddAbsentCountry(std::string const & name);
@@ -419,10 +410,7 @@ public:
   /// Get absent file list of a routing files for shortest path finding.
   std::set<std::string> const & GetAbsentCountries() const { return m_absentCountries; }
 
-  inline void SetRoutingSettings(RoutingSettings const & routingSettings)
-  {
-    m_routingSettings = routingSettings;
-  }
+  inline void SetRoutingSettings(RoutingSettings const & routingSettings) { m_routingSettings = routingSettings; }
 
   // Subroute interface.
   /// \returns Number of subroutes.
@@ -510,4 +498,4 @@ private:
 /// \returns true if |turn| is not equal to turns::CarDirection::None or
 /// |turns::PedestrianDirection::None|.
 bool IsNormalTurn(turns::TurnItem const & turn);
-} // namespace routing
+}  // namespace routing
diff --git a/libs/routing/route_point.hpp b/libs/routing/route_point.hpp
index 42c458537..ebb4274ec 100644
--- a/libs/routing/route_point.hpp
+++ b/libs/routing/route_point.hpp
@@ -11,7 +11,7 @@ class RoutePoint final
 public:
   RoutePoint() = default;
   RoutePoint(RoadPoint const & rp, double time) : m_roadPoint(rp), m_time(time) {}
-  RoutePoint(uint32_t featureId, uint32_t pointId, double time) : m_roadPoint(featureId,pointId), m_time(time) {}
+  RoutePoint(uint32_t featureId, uint32_t pointId, double time) : m_roadPoint(featureId, pointId), m_time(time) {}
 
   RoadPoint const & GetRoadPoint() const { return m_roadPoint; }
   double GetTime() const { return m_time; }
diff --git a/libs/routing/route_weight.cpp b/libs/routing/route_weight.cpp
index 507c18141..8c0f7cafe 100644
--- a/libs/routing/route_weight.cpp
+++ b/libs/routing/route_weight.cpp
@@ -20,8 +20,8 @@ bool SumWillOverflow(Number lhs, Number rhs)
 namespace routing
 {
 
-int RouteWeight::s_PassThroughPenaltyS = 30*60;   // 30 minutes
-int RouteWeight::s_AccessPenaltyS = 2*60*60;      // 2 hours
+int RouteWeight::s_PassThroughPenaltyS = 30 * 60;  // 30 minutes
+int RouteWeight::s_AccessPenaltyS = 2 * 60 * 60;   // 2 hours
 
 double RouteWeight::ToCrossMwmWeight() const
 {
@@ -38,8 +38,7 @@ RouteWeight RouteWeight::operator+(RouteWeight const & rhs) const
 {
   ASSERT(!SumWillOverflow(m_numPassThroughChanges, rhs.m_numPassThroughChanges),
          (m_numPassThroughChanges, rhs.m_numPassThroughChanges));
-  ASSERT(!SumWillOverflow(m_numAccessChanges, rhs.m_numAccessChanges),
-         (m_numAccessChanges, rhs.m_numAccessChanges));
+  ASSERT(!SumWillOverflow(m_numAccessChanges, rhs.m_numAccessChanges), (m_numAccessChanges, rhs.m_numAccessChanges));
   ASSERT(!SumWillOverflow(m_numAccessConditionalPenalties, rhs.m_numAccessConditionalPenalties),
          (m_numAccessConditionalPenalties, rhs.m_numAccessConditionalPenalties));
 
@@ -53,13 +52,11 @@ RouteWeight RouteWeight::operator-(RouteWeight const & rhs) const
 {
   ASSERT_NOT_EQUAL(m_numPassThroughChanges, std::numeric_limits<int8_t>::min(), ());
   ASSERT_NOT_EQUAL(m_numAccessChanges, std::numeric_limits<int8_t>::min(), ());
-  ASSERT(
-      !SumWillOverflow(m_numPassThroughChanges, static_cast<int8_t>(-rhs.m_numPassThroughChanges)),
-      (m_numPassThroughChanges, -rhs.m_numPassThroughChanges));
+  ASSERT(!SumWillOverflow(m_numPassThroughChanges, static_cast<int8_t>(-rhs.m_numPassThroughChanges)),
+         (m_numPassThroughChanges, -rhs.m_numPassThroughChanges));
   ASSERT(!SumWillOverflow(m_numAccessChanges, static_cast<int8_t>(-rhs.m_numAccessChanges)),
          (m_numAccessChanges, -rhs.m_numAccessChanges));
-  ASSERT(!SumWillOverflow(m_numAccessConditionalPenalties,
-                          static_cast<int8_t>(-rhs.m_numAccessConditionalPenalties)),
+  ASSERT(!SumWillOverflow(m_numAccessConditionalPenalties, static_cast<int8_t>(-rhs.m_numAccessConditionalPenalties)),
          (m_numAccessConditionalPenalties, -rhs.m_numAccessConditionalPenalties));
 
   return RouteWeight(m_weight - rhs.m_weight, m_numPassThroughChanges - rhs.m_numPassThroughChanges,
@@ -72,8 +69,7 @@ RouteWeight & RouteWeight::operator+=(RouteWeight const & rhs)
 {
   ASSERT(!SumWillOverflow(m_numPassThroughChanges, rhs.m_numPassThroughChanges),
          (m_numPassThroughChanges, rhs.m_numPassThroughChanges));
-  ASSERT(!SumWillOverflow(m_numAccessChanges, rhs.m_numAccessChanges),
-         (m_numAccessChanges, rhs.m_numAccessChanges));
+  ASSERT(!SumWillOverflow(m_numAccessChanges, rhs.m_numAccessChanges), (m_numAccessChanges, rhs.m_numAccessChanges));
   ASSERT(!SumWillOverflow(m_numAccessConditionalPenalties, rhs.m_numAccessConditionalPenalties),
          (m_numAccessConditionalPenalties, rhs.m_numAccessConditionalPenalties));
   m_weight += rhs.m_weight;
@@ -136,18 +132,16 @@ double RouteWeight::GetIntegratedWeight() const
 
 std::ostream & operator<<(std::ostream & os, RouteWeight const & routeWeight)
 {
-  os << "("
-     << static_cast<int32_t>(routeWeight.GetNumPassThroughChanges()) << ", "
+  os << "(" << static_cast<int32_t>(routeWeight.GetNumPassThroughChanges()) << ", "
      << static_cast<int32_t>(routeWeight.m_numAccessChanges) << ", "
-     << static_cast<int32_t>(routeWeight.m_numAccessConditionalPenalties) << ", "
-     << routeWeight.GetWeight() << ", " << routeWeight.GetTransitTime() << ")";
+     << static_cast<int32_t>(routeWeight.m_numAccessConditionalPenalties) << ", " << routeWeight.GetWeight() << ", "
+     << routeWeight.GetTransitTime() << ")";
   return os;
 }
 
 RouteWeight operator*(double lhs, RouteWeight const & rhs)
 {
-  return RouteWeight(lhs * rhs.GetWeight(), rhs.GetNumPassThroughChanges(),
-                     rhs.m_numAccessChanges, rhs.m_numAccessConditionalPenalties,
-                     lhs * rhs.GetTransitTime());
+  return RouteWeight(lhs * rhs.GetWeight(), rhs.GetNumPassThroughChanges(), rhs.m_numAccessChanges,
+                     rhs.m_numAccessConditionalPenalties, lhs * rhs.GetTransitTime());
 }
 }  // namespace routing
diff --git a/libs/routing/route_weight.hpp b/libs/routing/route_weight.hpp
index 3ae9a29bc..3b8a8718e 100644
--- a/libs/routing/route_weight.hpp
+++ b/libs/routing/route_weight.hpp
@@ -24,8 +24,7 @@ public:
     , m_numAccessChanges(numAccessChanges)
     , m_numAccessConditionalPenalties(numAccessConditionalPenalties)
     , m_transitTime(transitTime)
-  {
-  }
+  {}
 
   static RouteWeight FromCrossMwmWeight(double weight) { return RouteWeight(weight); }
 
@@ -58,17 +57,15 @@ public:
     ASSERT_NOT_EQUAL(m_numPassThroughChanges, std::numeric_limits<int8_t>::min(), ());
     ASSERT_NOT_EQUAL(m_numAccessChanges, std::numeric_limits<int8_t>::min(), ());
     ASSERT_NOT_EQUAL(m_numAccessConditionalPenalties, std::numeric_limits<int8_t>::min(), ());
-    return RouteWeight(-m_weight, -m_numPassThroughChanges, -m_numAccessChanges,
-                       -m_numAccessConditionalPenalties, -m_transitTime);
+    return RouteWeight(-m_weight, -m_numPassThroughChanges, -m_numAccessChanges, -m_numAccessConditionalPenalties,
+                       -m_transitTime);
   }
 
   bool IsAlmostEqualForTests(RouteWeight const & rhs, double epsilon) const
   {
-    return m_numPassThroughChanges == rhs.m_numPassThroughChanges &&
-           m_numAccessChanges == rhs.m_numAccessChanges &&
+    return m_numPassThroughChanges == rhs.m_numPassThroughChanges && m_numAccessChanges == rhs.m_numAccessChanges &&
            m_numAccessConditionalPenalties == rhs.m_numAccessConditionalPenalties &&
-           AlmostEqualAbs(m_weight, rhs.m_weight, epsilon) &&
-           AlmostEqualAbs(m_transitTime, rhs.m_transitTime, epsilon);
+           AlmostEqualAbs(m_weight, rhs.m_weight, epsilon) && AlmostEqualAbs(m_transitTime, rhs.m_transitTime, epsilon);
   }
 
   friend std::ostream & operator<<(std::ostream & os, RouteWeight const & routeWeight);
diff --git a/libs/routing/router.cpp b/libs/routing/router.cpp
index e4356d19f..0dbc032c9 100644
--- a/libs/routing/router.cpp
+++ b/libs/routing/router.cpp
@@ -4,7 +4,7 @@ namespace routing
 {
 std::string ToString(RouterType type)
 {
-  switch(type)
+  switch (type)
   {
   case RouterType::Vehicle: return "vehicle";
   case RouterType::Pedestrian: return "pedestrian";
@@ -34,5 +34,8 @@ RouterType FromString(std::string const & str)
   return RouterType::Vehicle;
 }
 
-std::string DebugPrint(RouterType type) { return ToString(type); }
-} //  namespace routing
+std::string DebugPrint(RouterType type)
+{
+  return ToString(type);
+}
+}  //  namespace routing
diff --git a/libs/routing/router.hpp b/libs/routing/router.hpp
index e6c0b8775..aad7d3c9f 100644
--- a/libs/routing/router.hpp
+++ b/libs/routing/router.hpp
@@ -24,8 +24,7 @@ using TCountryFileFn = std::function<std::string(m2::PointD const &)>;
 using CountryParentNameGetterFn = std::function<std::string(std::string const &)>;
 
 // Guides with integer ids containing multiple tracks. One track consists of its points.
-using GuidesTracks =
-    std::map<kml::MarkGroupId, std::vector<std::vector<geometry::PointWithAltitude>>>;
+using GuidesTracks = std::map<kml::MarkGroupId, std::vector<std::vector<geometry::PointWithAltitude>>>;
 
 class Route;
 
@@ -76,12 +75,11 @@ public:
   /// @param route result route
   /// @return ResultCode error code or NoError if route was initialised
   /// @see Cancellable
-  virtual RouterResultCode CalculateRoute(Checkpoints const & checkpoints,
-                                          m2::PointD const & startDirection, bool adjust,
-                                          RouterDelegate const & delegate, Route & route) = 0;
+  virtual RouterResultCode CalculateRoute(Checkpoints const & checkpoints, m2::PointD const & startDirection,
+                                          bool adjust, RouterDelegate const & delegate, Route & route) = 0;
 
-  virtual bool FindClosestProjectionToRoad(m2::PointD const & point, m2::PointD const & direction,
-                                           double radius, EdgeProj & proj) = 0;
+  virtual bool FindClosestProjectionToRoad(m2::PointD const & point, m2::PointD const & direction, double radius,
+                                           EdgeProj & proj) = 0;
 };
 
 }  // namespace routing
diff --git a/libs/routing/router_delegate.hpp b/libs/routing/router_delegate.hpp
index d4f4b04d1..2cc5acf65 100644
--- a/libs/routing/router_delegate.hpp
+++ b/libs/routing/router_delegate.hpp
@@ -38,4 +38,4 @@ private:
 
   base::Cancellable m_cancellable;
 };
-} //  namespace routing
+}  //  namespace routing
diff --git a/libs/routing/routes_builder/routes_builder.cpp b/libs/routing/routes_builder/routes_builder.cpp
index 323b28507..cd2dbc028 100644
--- a/libs/routing/routes_builder/routes_builder.cpp
+++ b/libs/routing/routes_builder/routes_builder.cpp
@@ -55,11 +55,12 @@ namespace routes_builder
 // RoutesBuilder::Params ---------------------------------------------------------------------------
 
 RoutesBuilder::Params::Params(VehicleType type, ms::LatLon const & start, ms::LatLon const & finish)
-    : Params(type, {mercator::FromLatLon(start), mercator::FromLatLon(finish)})
+  : Params(type, {mercator::FromLatLon(start), mercator::FromLatLon(finish)})
 {}
 
 RoutesBuilder::Params::Params(VehicleType type, std::vector<m2::PointD> && checkpoints)
-    : m_type(type), m_checkpoints(std::move(checkpoints))
+  : m_type(type)
+  , m_checkpoints(std::move(checkpoints))
 {}
 
 // static
@@ -139,10 +140,8 @@ RoutesBuilder::Result RoutesBuilder::ProcessTask(Params const & params)
 std::future<RoutesBuilder::Result> RoutesBuilder::ProcessTaskAsync(Params const & params)
 {
   // Should be copyable to workaround MSVC bug (https://developercommunity.visualstudio.com/t/108672)
-  auto task = [processor = std::make_shared<Processor>(m_numMwmIds, m_dataSourcesStorage, m_cpg, m_cig)](Params const & params) -> Result
-  {
-      return (*processor)(params);
-  };
+  auto task = [processor = std::make_shared<Processor>(m_numMwmIds, m_dataSourcesStorage, m_cpg, m_cig)](
+                  Params const & params) -> Result { return (*processor)(params); };
   return m_threadPool.Submit(std::move(task), params);
 }
 
@@ -229,19 +228,16 @@ std::vector<ms::LatLon> RoutesBuilder::Route::GetWaypoints() const
 
 // RoutesBuilder::Processor ------------------------------------------------------------------------
 
-RoutesBuilder::Processor::Processor(std::shared_ptr<NumMwmIds> numMwmIds,
-                                    DataSourceStorage & dataSourceStorage,
+RoutesBuilder::Processor::Processor(std::shared_ptr<NumMwmIds> numMwmIds, DataSourceStorage & dataSourceStorage,
                                     std::weak_ptr<storage::CountryParentGetter> cpg,
                                     std::weak_ptr<storage::CountryInfoGetter> cig)
-    : m_numMwmIds(std::move(numMwmIds))
-    , m_dataSourceStorage(dataSourceStorage)
-    , m_cpg(std::move(cpg))
-    , m_cig(std::move(cig))
-{
-}
+  : m_numMwmIds(std::move(numMwmIds))
+  , m_dataSourceStorage(dataSourceStorage)
+  , m_cpg(std::move(cpg))
+  , m_cig(std::move(cig))
+{}
 
-RoutesBuilder::Processor::Processor(Processor && rhs) noexcept
-    : m_dataSourceStorage(rhs.m_dataSourceStorage)
+RoutesBuilder::Processor::Processor(Processor && rhs) noexcept : m_dataSourceStorage(rhs.m_dataSourceStorage)
 {
   m_start = rhs.m_start;
   m_finish = rhs.m_finish;
@@ -261,12 +257,14 @@ void RoutesBuilder::Processor::InitRouter(VehicleType type)
     return;
 
   auto const & cig = m_cig;
-  auto const countryFileGetter = [cig](m2::PointD const & pt) {
+  auto const countryFileGetter = [cig](m2::PointD const & pt)
+  {
     auto const cigSharedPtr = cig.lock();
     return cigSharedPtr->GetRegionCountryId(pt);
   };
 
-  auto const getMwmRectByName = [cig](std::string const & countryId) {
+  auto const getMwmRectByName = [cig](std::string const & countryId)
+  {
     auto const cigSharedPtr = cig.lock();
     return cigSharedPtr->GetLimitRectForLeaf(countryId);
   };
@@ -275,24 +273,15 @@ void RoutesBuilder::Processor::InitRouter(VehicleType type)
   if (!m_dataSource)
     m_dataSource = m_dataSourceStorage.GetDataSource();
 
-  m_router = std::make_unique<IndexRouter>(type,
-                                           loadAltitudes,
-                                           *m_cpg.lock(),
-                                           countryFileGetter,
-                                           getMwmRectByName,
-                                           m_numMwmIds,
-                                           MakeNumMwmTree(*m_numMwmIds, *m_cig.lock()),
-                                           *m_trafficCache,
+  m_router = std::make_unique<IndexRouter>(type, loadAltitudes, *m_cpg.lock(), countryFileGetter, getMwmRectByName,
+                                           m_numMwmIds, MakeNumMwmTree(*m_numMwmIds, *m_cig.lock()), *m_trafficCache,
                                            *m_dataSource);
 }
 
-RoutesBuilder::Result
-RoutesBuilder::Processor::operator()(Params const & params)
+RoutesBuilder::Result RoutesBuilder::Processor::operator()(Params const & params)
 {
   InitRouter(params.m_type);
-  SCOPE_GUARD(returnDataSource, [&]() {
-    m_dataSourceStorage.PushDataSource(std::move(m_dataSource));
-  });
+  SCOPE_GUARD(returnDataSource, [&]() { m_dataSourceStorage.PushDataSource(std::move(m_dataSource)); });
 
   LOG(LINFO, ("Start building route, checkpoints:", params.m_checkpoints));
 
@@ -306,8 +295,8 @@ RoutesBuilder::Processor::operator()(Params const & params)
   {
     m_delegate->SetTimeout(params.m_timeoutSeconds);
     base::Timer timer;
-    resultCode = m_router->CalculateRoute(params.m_checkpoints, m2::PointD::Zero(),
-                                          false /* adjustToPrevRoute */, *m_delegate, route);
+    resultCode = m_router->CalculateRoute(params.m_checkpoints, m2::PointD::Zero(), false /* adjustToPrevRoute */,
+                                          *m_delegate, route);
 
     if (resultCode != RouterResultCode::NoError)
       break;
diff --git a/libs/routing/routes_builder/routes_builder.hpp b/libs/routing/routes_builder/routes_builder.hpp
index 1b05de6f9..007dcdf74 100644
--- a/libs/routing/routes_builder/routes_builder.hpp
+++ b/libs/routing/routes_builder/routes_builder.hpp
@@ -99,14 +99,11 @@ public:
   std::future<Result> ProcessTaskAsync(Params const & params);
 
 private:
-
   class Processor
   {
   public:
-    Processor(std::shared_ptr<NumMwmIds> numMwmIds,
-              DataSourceStorage & dataSourceStorage,
-              std::weak_ptr<storage::CountryParentGetter> cpg,
-              std::weak_ptr<storage::CountryInfoGetter> cig);
+    Processor(std::shared_ptr<NumMwmIds> numMwmIds, DataSourceStorage & dataSourceStorage,
+              std::weak_ptr<storage::CountryParentGetter> cpg, std::weak_ptr<storage::CountryInfoGetter> cig);
 
     Processor(Processor && rhs) noexcept;
 
@@ -131,8 +128,7 @@ private:
 
   base::ComputationalThreadPool m_threadPool;
 
-  std::shared_ptr<storage::CountryParentGetter> m_cpg =
-      std::make_shared<storage::CountryParentGetter>();
+  std::shared_ptr<storage::CountryParentGetter> m_cpg = std::make_shared<storage::CountryParentGetter>();
 
   std::shared_ptr<storage::CountryInfoGetter> m_cig =
       storage::CountryInfoReader::CreateCountryInfoGetter(GetPlatform());
diff --git a/libs/routing/routes_builder/routes_builder_tool/routes_builder_tool.cpp b/libs/routing/routes_builder/routes_builder_tool/routes_builder_tool.cpp
index f400f3c1c..51b6705ca 100644
--- a/libs/routing/routes_builder/routes_builder_tool/routes_builder_tool.cpp
+++ b/libs/routing/routes_builder/routes_builder_tool/routes_builder_tool.cpp
@@ -14,17 +14,18 @@
 
 #include <gflags/gflags.h>
 
-DEFINE_uint64(threads, 0,
-              "The number of threads. std::thread::hardware_concurrency() is used by default.");
+DEFINE_uint64(threads, 0, "The number of threads. std::thread::hardware_concurrency() is used by default.");
 
-DEFINE_string(routes_file, "", "Path to file with routes in format: \n\t"
-                               "first_start_lat first_start_lon first_finish_lat first_finish_lon\n\t"
-                               "second_start_lat second_start_lon second_finish_lat second_finish_lon\n\t"
-                               "...");
+DEFINE_string(routes_file, "",
+              "Path to file with routes in format: \n\t"
+              "first_start_lat first_start_lon first_finish_lat first_finish_lon\n\t"
+              "second_start_lat second_start_lon second_finish_lat second_finish_lon\n\t"
+              "...");
 
-DEFINE_string(dump_path, "", "Path where routes will be dumped after building."
-                             "Useful for intermediate results, because routes building "
-                             "is a long process.");
+DEFINE_string(dump_path, "",
+              "Path where routes will be dumped after building."
+              "Useful for intermediate results, because routes building "
+              "is a long process.");
 
 DEFINE_string(data_path, "", "Data path.");
 DEFINE_string(resources_path, "", "Resources path.");
@@ -34,8 +35,9 @@ DEFINE_string(api_token, "", "Token for chosen api.");
 
 DEFINE_uint64(start_from, 0, "The line number from which the tool should start reading.");
 
-DEFINE_int32(timeout, 10 * 60, "Timeout in seconds for each route building. "
-                               "0 means without timeout (default: 10 minutes).");
+DEFINE_int32(timeout, 10 * 60,
+             "Timeout in seconds for each route building. "
+             "0 means without timeout (default: 10 minutes).");
 
 DEFINE_bool(verbose, false, "Verbose logging (default: false)");
 
@@ -71,9 +73,7 @@ int Main(int argc, char ** argv)
 
   CHECK_GREATER_OR_EQUAL(FLAGS_timeout, 0, ("Timeout should be greater than zero."));
 
-  CHECK(!FLAGS_routes_file.empty(),
-        ("\n\n\t--routes_file is required.",
-         "\n\nType --help for usage."));
+  CHECK(!FLAGS_routes_file.empty(), ("\n\n\t--routes_file is required.", "\n\nType --help for usage."));
 
   if (!FLAGS_data_path.empty())
     GetPlatform().SetWritableDirForTests(FLAGS_data_path);
@@ -82,10 +82,8 @@ int Main(int argc, char ** argv)
     GetPlatform().SetResourceDir(FLAGS_resources_path);
 
   CHECK(IsLocalBuild() || IsApiBuild(),
-        ("\n\n\t--routes_file empty is:", FLAGS_routes_file.empty(),
-         "\n\t--api_name empty is:", FLAGS_api_name.empty(),
-         "\n\t--api_token empty is:", FLAGS_api_token.empty(),
-         "\n\nType --help for usage."));
+        ("\n\n\t--routes_file empty is:", FLAGS_routes_file.empty(), "\n\t--api_name empty is:", FLAGS_api_name.empty(),
+         "\n\t--api_token empty is:", FLAGS_api_token.empty(), "\n\nType --help for usage."));
 
   CHECK(!FLAGS_dump_path.empty(),
         ("\n\n\t--dump_path is empty. It makes no sense to run this tool. No result will be saved.",
@@ -96,19 +94,16 @@ int Main(int argc, char ** argv)
   if (Platform::IsFileExistsByFullPath(FLAGS_dump_path))
     CheckDirExistence(FLAGS_dump_path);
   else
-    CHECK_EQUAL(Platform::MkDir(FLAGS_dump_path), Platform::EError::ERR_OK,());
+    CHECK_EQUAL(Platform::MkDir(FLAGS_dump_path), Platform::EError::ERR_OK, ());
 
   if (IsLocalBuild())
   {
     auto const launchesNumber = static_cast<uint32_t>(FLAGS_launches_number);
     if (launchesNumber > 1)
-    {
-      LOG(LINFO,
-          ("Benchmark mode is activated. Each route will be built", launchesNumber, "times."));
-    }
+      LOG(LINFO, ("Benchmark mode is activated. Each route will be built", launchesNumber, "times."));
 
-    BuildRoutes(FLAGS_routes_file, FLAGS_dump_path, FLAGS_start_from, FLAGS_threads, FLAGS_timeout,
-                FLAGS_vehicle_type, FLAGS_verbose, launchesNumber);
+    BuildRoutes(FLAGS_routes_file, FLAGS_dump_path, FLAGS_start_from, FLAGS_threads, FLAGS_timeout, FLAGS_vehicle_type,
+                FLAGS_verbose, launchesNumber);
   }
 
   if (IsApiBuild())
diff --git a/libs/routing/routes_builder/routes_builder_tool/utils.cpp b/libs/routing/routes_builder/routes_builder_tool/utils.cpp
index bfe486675..cdb24d5e3 100644
--- a/libs/routing/routes_builder/routes_builder_tool/utils.cpp
+++ b/libs/routing/routes_builder/routes_builder_tool/utils.cpp
@@ -25,7 +25,6 @@
 #include <thread>
 #include <tuple>
 
-
 namespace routing
 {
 namespace routes_builder
@@ -63,14 +62,9 @@ routing::VehicleType ConvertVehicleTypeFromString(std::string const & str)
 }
 }  // namespace
 
-void BuildRoutes(std::string const & routesPath,
-                 std::string const & dumpPath,
-                 uint64_t startFrom,
-                 uint64_t threadsNumber,
-                 uint32_t timeoutPerRouteSeconds,
-                 std::string const & vehicleTypeStr,
-                 bool verbose,
-                 uint32_t launchesNumber)
+void BuildRoutes(std::string const & routesPath, std::string const & dumpPath, uint64_t startFrom,
+                 uint64_t threadsNumber, uint32_t timeoutPerRouteSeconds, std::string const & vehicleTypeStr,
+                 bool verbose, uint32_t launchesNumber)
 {
   CHECK(Platform::IsFileExistsByFullPath(routesPath), ("Can not find file:", routesPath));
   CHECK(!dumpPath.empty(), ("Empty dumpPath."));
@@ -132,8 +126,7 @@ void BuildRoutes(std::string const & routesPath,
 
       RoutesBuilder::Result::Dump(result, fullPath);
 
-      double const curPercent =
-          static_cast<double>(shiftIndex + 1) / (tasks.size() + startFrom) * 100.0;
+      double const curPercent = static_cast<double>(shiftIndex + 1) / (tasks.size() + startFrom) * 100.0;
 
       if (curPercent - lastPercent > 1.0 || shiftIndex + 1 == tasks.size())
       {
@@ -165,10 +158,8 @@ std::optional<std::tuple<ms::LatLon, ms::LatLon, int32_t>> ParseApiLine(std::ifs
   return {{start, finish, utcOffset}};
 }
 
-void BuildRoutesWithApi(std::unique_ptr<api::RoutingApi> routingApi,
-                        std::string const & routesPath,
-                        std::string const & dumpPath,
-                        int64_t startFrom)
+void BuildRoutesWithApi(std::unique_ptr<api::RoutingApi> routingApi, std::string const & routesPath,
+                        std::string const & dumpPath, int64_t startFrom)
 {
   std::ifstream input(routesPath);
   CHECK(input.good(), ("Error during opening:", routesPath));
@@ -188,7 +179,8 @@ void BuildRoutesWithApi(std::unique_ptr<api::RoutingApi> routingApi,
     return ms;
   };
 
-  auto const drop = [&]() {
+  auto const drop = [&]()
+  {
     rps = 0;
     timer.Reset();
   };
@@ -271,8 +263,7 @@ void BuildRoutesWithApi(std::unique_ptr<api::RoutingApi> routingApi,
   dump();
 }
 
-std::unique_ptr<routing_quality::api::RoutingApi> CreateRoutingApi(std::string const & name,
-                                                                   std::string const & token)
+std::unique_ptr<routing_quality::api::RoutingApi> CreateRoutingApi(std::string const & name, std::string const & token)
 {
   if (name == "mapbox")
     return std::make_unique<routing_quality::api::mapbox::MapboxApi>(token);
@@ -283,4 +274,4 @@ std::unique_ptr<routing_quality::api::RoutingApi> CreateRoutingApi(std::string c
   UNREACHABLE();
 }
 }  // namespace routes_builder
-}  // routing
+}  // namespace routing
diff --git a/libs/routing/routes_builder/routes_builder_tool/utils.hpp b/libs/routing/routes_builder/routes_builder_tool/utils.hpp
index 9d2de48fb..a51313903 100644
--- a/libs/routing/routes_builder/routes_builder_tool/utils.hpp
+++ b/libs/routing/routes_builder/routes_builder_tool/utils.hpp
@@ -13,21 +13,13 @@ namespace routing
 {
 namespace routes_builder
 {
-void BuildRoutes(std::string const & routesPath,
-                 std::string const & dumpPath,
-                 uint64_t startFrom,
-                 uint64_t threadsNumber,
-                 uint32_t timeoutPerRouteSeconds,
-                 std::string const & vehicleType,
-                 bool verbose,
+void BuildRoutes(std::string const & routesPath, std::string const & dumpPath, uint64_t startFrom,
+                 uint64_t threadsNumber, uint32_t timeoutPerRouteSeconds, std::string const & vehicleType, bool verbose,
                  uint32_t launchesNumber);
 
-void BuildRoutesWithApi(std::unique_ptr<routing_quality::api::RoutingApi> routingApi,
-                        std::string const & routesPath,
-                        std::string const & dumpPath,
-                        int64_t startFrom);
+void BuildRoutesWithApi(std::unique_ptr<routing_quality::api::RoutingApi> routingApi, std::string const & routesPath,
+                        std::string const & dumpPath, int64_t startFrom);
 
-std::unique_ptr<routing_quality::api::RoutingApi> CreateRoutingApi(std::string const & name,
-                                                                   std::string const & token);
+std::unique_ptr<routing_quality::api::RoutingApi> CreateRoutingApi(std::string const & name, std::string const & token);
 }  // namespace routes_builder
-}  // routing
+}  // namespace routing
diff --git a/libs/routing/routing_benchmarks/bicycle_routing_tests.cpp b/libs/routing/routing_benchmarks/bicycle_routing_tests.cpp
index 5d16ad218..a32998566 100644
--- a/libs/routing/routing_benchmarks/bicycle_routing_tests.cpp
+++ b/libs/routing/routing_benchmarks/bicycle_routing_tests.cpp
@@ -22,10 +22,8 @@ std::set<std::string> const kBicycleMapFiles = {"Russia_Moscow"};
 class BicycleTest : public RoutingTest
 {
 public:
-  BicycleTest()
-    : RoutingTest(routing::IRoadGraph::Mode::ObeyOnewayTag, routing::VehicleType::Bicycle, kBicycleMapFiles)
-  {
-  }
+  BicycleTest() : RoutingTest(routing::IRoadGraph::Mode::ObeyOnewayTag, routing::VehicleType::Bicycle, kBicycleMapFiles)
+  {}
 
 protected:
   std::unique_ptr<routing::VehicleModelFactoryInterface> CreateModelFactory() override
diff --git a/libs/routing/routing_benchmarks/car_routing_tests.cpp b/libs/routing/routing_benchmarks/car_routing_tests.cpp
index 6c246053f..8894901f8 100644
--- a/libs/routing/routing_benchmarks/car_routing_tests.cpp
+++ b/libs/routing/routing_benchmarks/car_routing_tests.cpp
@@ -21,10 +21,7 @@ std::set<std::string> const kCarMapFiles = {"Russia_Moscow"};
 class CarTest : public RoutingTest
 {
 public:
-  CarTest()
-    : RoutingTest(routing::IRoadGraph::Mode::ObeyOnewayTag, routing::VehicleType::Car, kCarMapFiles)
-  {
-  }
+  CarTest() : RoutingTest(routing::IRoadGraph::Mode::ObeyOnewayTag, routing::VehicleType::Car, kCarMapFiles) {}
 
   void TestCarRouter(ms::LatLon const & start, ms::LatLon const & final, size_t reiterations)
   {
diff --git a/libs/routing/routing_benchmarks/helpers.cpp b/libs/routing/routing_benchmarks/helpers.cpp
index 51f445055..12f365e6b 100644
--- a/libs/routing/routing_benchmarks/helpers.cpp
+++ b/libs/routing/routing_benchmarks/helpers.cpp
@@ -17,8 +17,8 @@
 #include "coding/point_coding.hpp"
 
 #include "geometry/mercator.hpp"
-#include "geometry/polyline2d.hpp"
 #include "geometry/point_with_altitude.hpp"
+#include "geometry/polyline2d.hpp"
 
 #include "base/logging.hpp"
 #include "base/math.hpp"
@@ -42,7 +42,10 @@ m2::PointD GetPointOnEdge(routing::Edge const & e, double posAlong)
 
 RoutingTest::RoutingTest(routing::IRoadGraph::Mode mode, routing::VehicleType type,
                          std::set<std::string> const & neededMaps)
-  : m_mode(mode), m_type(type), m_neededMaps(neededMaps), m_numMwmIds(std::make_unique<routing::NumMwmIds>())
+  : m_mode(mode)
+  , m_type(type)
+  , m_neededMaps(neededMaps)
+  , m_numMwmIds(std::make_unique<routing::NumMwmIds>())
 {
   classificator::Load();
 
@@ -73,10 +76,8 @@ RoutingTest::RoutingTest(routing::IRoadGraph::Mode mode, routing::VehicleType ty
   if (registeredMaps != m_neededMaps)
   {
     for (auto const & file : m_neededMaps)
-    {
       if (registeredMaps.count(file) == 0)
         LOG(LERROR, ("Can't find map:", file));
-    }
     TEST(false, ("Some maps can't be found. See error messages above."));
   }
 }
@@ -99,7 +100,7 @@ void RoutingTest::TestRouters(m2::PointD const & startPos, m2::PointD const & fi
 
   double constexpr kEpsilon = 1e-6;
   TEST(AlmostEqualAbs(routeFoundByAstar.GetTotalDistanceMeters(),
-                          routeFoundByAstarBidirectional.GetTotalDistanceMeters(), kEpsilon),
+                      routeFoundByAstarBidirectional.GetTotalDistanceMeters(), kEpsilon),
        ());
 }
 
@@ -115,8 +116,7 @@ void RoutingTest::TestTwoPointsOnFeature(m2::PointD const & startPos, m2::PointD
 
   m2::PointD const startPosOnFeature =
       GetPointOnEdge(startEdges.front().first, 0.0 /* the start point of the feature */);
-  m2::PointD const finalPosOnFeature =
-      GetPointOnEdge(finalEdges.front().first, 1.0 /* the end point of the feature */);
+  m2::PointD const finalPosOnFeature = GetPointOnEdge(finalEdges.front().first, 1.0 /* the end point of the feature */);
 
   TestRouters(startPosOnFeature, finalPosOnFeature);
 }
@@ -126,13 +126,11 @@ std::unique_ptr<routing::IRouter> RoutingTest::CreateRouter(std::string const &
   std::vector<platform::LocalCountryFile> neededLocalFiles;
   neededLocalFiles.reserve(m_neededMaps.size());
   for (auto const & file : m_localFiles)
-  {
     if (m_neededMaps.count(file.GetCountryName()) != 0)
       neededLocalFiles.push_back(file);
-  }
 
-  std::unique_ptr<routing::IRouter> router = integration::CreateVehicleRouter(
-      m_dataSource, *m_cig, m_trafficCache, neededLocalFiles, m_type);
+  std::unique_ptr<routing::IRouter> router =
+      integration::CreateVehicleRouter(m_dataSource, *m_cig, m_trafficCache, neededLocalFiles, m_type);
   return router;
 }
 
@@ -141,20 +139,19 @@ void RoutingTest::GetNearestEdges(m2::PointD const & pt,
 {
   routing::MwmDataSource dataSource(m_dataSource, nullptr /* numMwmIDs */);
   routing::FeaturesRoadGraph graph(dataSource, m_mode, CreateModelFactory());
-  graph.FindClosestEdges(mercator::RectByCenterXYAndSizeInMeters(
-                             pt, routing::FeaturesRoadGraph::kClosestEdgesRadiusM),
+  graph.FindClosestEdges(mercator::RectByCenterXYAndSizeInMeters(pt, routing::FeaturesRoadGraph::kClosestEdgesRadiusM),
                          1 /* count */, edges);
 }
 
-void TestRouter(routing::IRouter & router, m2::PointD const & startPos,
-                m2::PointD const & finalPos, routing::Route & route)
+void TestRouter(routing::IRouter & router, m2::PointD const & startPos, m2::PointD const & finalPos,
+                routing::Route & route)
 {
   routing::RouterDelegate delegate;
   LOG(LINFO, ("Calculating routing ...", router.GetName()));
   base::Timer timer;
-  auto const resultCode = router.CalculateRoute(routing::Checkpoints(startPos, finalPos),
-                                                m2::PointD::Zero() /* startDirection */,
-                                                false /* adjust */, delegate, route);
+  auto const resultCode =
+      router.CalculateRoute(routing::Checkpoints(startPos, finalPos), m2::PointD::Zero() /* startDirection */,
+                            false /* adjust */, delegate, route);
   double const elapsedSec = timer.ElapsedSeconds();
   TEST_EQUAL(routing::RouterResultCode::NoError, resultCode, ());
   TEST(route.IsValid(), ());
diff --git a/libs/routing/routing_benchmarks/helpers.hpp b/libs/routing/routing_benchmarks/helpers.hpp
index fe8b43248..cc64cd3aa 100644
--- a/libs/routing/routing_benchmarks/helpers.hpp
+++ b/libs/routing/routing_benchmarks/helpers.hpp
@@ -24,8 +24,7 @@
 class RoutingTest
 {
 public:
-  RoutingTest(routing::IRoadGraph::Mode mode, routing::VehicleType type,
-              std::set<std::string> const & neededMaps);
+  RoutingTest(routing::IRoadGraph::Mode mode, routing::VehicleType type, std::set<std::string> const & neededMaps);
 
   virtual ~RoutingTest() = default;
 
@@ -93,5 +92,5 @@ private:
   std::shared_ptr<SimplifiedModel> const m_model;
 };
 
-void TestRouter(routing::IRouter & router, m2::PointD const & startPos,
-                m2::PointD const & finalPos, routing::Route & route);
+void TestRouter(routing::IRouter & router, m2::PointD const & startPos, m2::PointD const & finalPos,
+                routing::Route & route);
diff --git a/libs/routing/routing_benchmarks/pedestrian_routing_tests.cpp b/libs/routing/routing_benchmarks/pedestrian_routing_tests.cpp
index 27ac05d9e..c22135b9d 100644
--- a/libs/routing/routing_benchmarks/pedestrian_routing_tests.cpp
+++ b/libs/routing/routing_benchmarks/pedestrian_routing_tests.cpp
@@ -18,37 +18,31 @@ using namespace std;
 
 // Test preconditions: files from the kPedestrianMapFiles set with '.mwm'
 // extension must be placed in omim/data folder.
-set<string> const kPedestrianMapFiles =
-{
-  "UK_England_East Midlands",
-  "UK_England_East of England_Essex",
-  "UK_England_East of England_Norfolk",
-  "UK_England_Greater London",
-  "UK_England_North East England",
-  "UK_England_North West England_Lancaster",
-  "UK_England_North West England_Manchester",
-  "UK_England_South East_Brighton",
-  "UK_England_South East_Oxford",
-  "UK_England_South West England_Bristol",
-  "UK_England_South West England_Cornwall",
-  "UK_England_West Midlands",
-  "UK_England_Yorkshire and the Humber"
-};
+set<string> const kPedestrianMapFiles = {"UK_England_East Midlands",
+                                         "UK_England_East of England_Essex",
+                                         "UK_England_East of England_Norfolk",
+                                         "UK_England_Greater London",
+                                         "UK_England_North East England",
+                                         "UK_England_North West England_Lancaster",
+                                         "UK_England_North West England_Manchester",
+                                         "UK_England_South East_Brighton",
+                                         "UK_England_South East_Oxford",
+                                         "UK_England_South West England_Bristol",
+                                         "UK_England_South West England_Cornwall",
+                                         "UK_England_West Midlands",
+                                         "UK_England_Yorkshire and the Humber"};
 
 class PedestrianTest : public RoutingTest
 {
 public:
   PedestrianTest()
-    : RoutingTest(routing::IRoadGraph::Mode::IgnoreOnewayTag, routing::VehicleType::Pedestrian,
-                  kPedestrianMapFiles)
-  {
-  }
+    : RoutingTest(routing::IRoadGraph::Mode::IgnoreOnewayTag, routing::VehicleType::Pedestrian, kPedestrianMapFiles)
+  {}
 
 protected:
   unique_ptr<routing::VehicleModelFactoryInterface> CreateModelFactory() override
   {
-    unique_ptr<routing::VehicleModelFactoryInterface> factory(
-        new SimplifiedModelFactory<routing::PedestrianModel>());
+    unique_ptr<routing::VehicleModelFactoryInterface> factory(new SimplifiedModelFactory<routing::PedestrianModel>());
     return factory;
   }
 };
diff --git a/libs/routing/routing_callbacks.hpp b/libs/routing/routing_callbacks.hpp
index 2d444e383..7314849e5 100644
--- a/libs/routing/routing_callbacks.hpp
+++ b/libs/routing/routing_callbacks.hpp
@@ -45,16 +45,16 @@ enum class RouterResultCode
 
 enum class SessionState
 {
-  NoValidRoute,       // No valid route: no route after application launching or the route was removed.
-  RouteBuilding,      // We requested a route and wait when it will be built. User may be following
-                      // the previous route.
-  RouteNotStarted,    // Route is built but the user isn't on it.
-  OnRoute,            // User follows the route.
-  RouteNeedRebuild,   // User left the route.
-  RouteFinished,      // Destination point is reached but the session isn't closed.
-  RouteNoFollowing,   // Route is built but following mode has been disabled.
-  RouteRebuilding,    // We requested a route rebuild and wait when it will be rebuilt.
-                      // User may following the previous route.
+  NoValidRoute,      // No valid route: no route after application launching or the route was removed.
+  RouteBuilding,     // We requested a route and wait when it will be built. User may be following
+                     // the previous route.
+  RouteNotStarted,   // Route is built but the user isn't on it.
+  OnRoute,           // User follows the route.
+  RouteNeedRebuild,  // User left the route.
+  RouteFinished,     // Destination point is reached but the session isn't closed.
+  RouteNoFollowing,  // Route is built but following mode has been disabled.
+  RouteRebuilding,   // We requested a route rebuild and wait when it will be rebuilt.
+                     // User may following the previous route.
 };
 
 /*
diff --git a/libs/routing/routing_consistency_tests/routing_consistency_tests.cpp b/libs/routing/routing_consistency_tests/routing_consistency_tests.cpp
index 27dfcb510..51eb38243 100644
--- a/libs/routing/routing_consistency_tests/routing_consistency_tests.cpp
+++ b/libs/routing/routing_consistency_tests/routing_consistency_tests.cpp
@@ -1,5 +1,5 @@
-#include "testing/testing.hpp"
 #include "routing/routing_integration_tests/routing_test_tools.hpp"
+#include "testing/testing.hpp"
 
 #include "generator/borders.hpp"
 
@@ -25,11 +25,14 @@ using namespace std;
 using storage::CountryInfo;
 
 double constexpr kMinimumRouteDistanceM = 10000.;
-double constexpr kRouteLengthAccuracy =  0.15;
+double constexpr kRouteLengthAccuracy = 0.15;
 
 // Testing stub to make routing test tools linkable.
 static CommandLineOptions g_options;
-CommandLineOptions const & GetTestingOptions() { return g_options; }
+CommandLineOptions const & GetTestingOptions()
+{
+  return g_options;
+}
 
 DEFINE_string(input_file, "", "File with statistics output.");
 DEFINE_string(data_path, "../../data/", "Working directory, 'path_to_exe/../../data' if empty.");
@@ -82,9 +85,7 @@ bool ParseUserString(string const & incomeString, UserRoutingRecord & result)
 class RouteTester
 {
 public:
-  RouteTester() : m_components(integration::GetVehicleComponents(VehicleType::Car))
-  {
-  }
+  RouteTester() : m_components(integration::GetVehicleComponents(VehicleType::Car)) {}
 
   bool BuildRoute(UserRoutingRecord const & record)
   {
@@ -139,13 +140,11 @@ public:
     LOG(LINFO, ("Checked", m_checkedCountries.size(), "countries."));
     LOG(LINFO, ("Found", m_errors.size(), "maps with errors."));
     for (auto const & record : m_errors)
-    {
       if (record.second == m_checkedCountries[record.first])
         LOG(LINFO, ("ERROR!", record.first, " seems to be broken!"));
       else
         LOG(LINFO, ("Warning! Country:", record.first, "has", record.second, "errors on",
                     m_checkedCountries[record.first], "checks"));
-    }
   }
 
 private:
@@ -194,6 +193,9 @@ int RunRoutingConsistencyTests(int argc, char ** argv)
 
   return 0;
 }
-}  // namespace testingmain routing_consistency_tests
+}  // namespace routing_consistency_tests
 
-int main(int argc, char ** argv) { return ::routing_consistency_tests::RunRoutingConsistencyTests(argc, argv); }
+int main(int argc, char ** argv)
+{
+  return ::routing_consistency_tests::RunRoutingConsistencyTests(argc, argv);
+}
diff --git a/libs/routing/routing_helpers.cpp b/libs/routing/routing_helpers.cpp
index 78dff21fe..92498e438 100644
--- a/libs/routing/routing_helpers.cpp
+++ b/libs/routing/routing_helpers.cpp
@@ -44,10 +44,8 @@ void FillSegmentInfo(vector<double> const & times, vector<RouteSegment> & routeS
   }
 }
 
-void ReconstructRoute(DirectionsEngine & engine, IndexRoadGraph const & graph,
-                      base::Cancellable const & cancellable,
-                      vector<geometry::PointWithAltitude> const & path, vector<double> const & times,
-                      Route & route)
+void ReconstructRoute(DirectionsEngine & engine, IndexRoadGraph const & graph, base::Cancellable const & cancellable,
+                      vector<geometry::PointWithAltitude> const & path, vector<double> const & times, Route & route)
 {
   if (path.empty())
   {
@@ -80,10 +78,7 @@ Segment ConvertEdgeToSegment(NumMwmIds const & numMwmIds, Edge const & edge)
   if (edge.IsFake())
   {
     if (edge.HasRealPart())
-    {
-      return Segment(kFakeNumMwmId, FakeFeatureIds::kIndexGraphStarterId, edge.GetFakeSegmentId(),
-                     true /* forward */);
-    }
+      return Segment(kFakeNumMwmId, FakeFeatureIds::kIndexGraphStarterId, edge.GetFakeSegmentId(), true /* forward */);
 
     return Segment();
   }
@@ -98,13 +93,13 @@ bool SegmentCrossesRect(m2::Segment2D const & segment, m2::RectD const & rect)
 {
   double constexpr kEps = 1e-6;
   bool isSideIntersected = false;
-  rect.ForEachSide([&segment, &isSideIntersected](m2::PointD const & a, m2::PointD const & b) {
+  rect.ForEachSide([&segment, &isSideIntersected](m2::PointD const & a, m2::PointD const & b)
+  {
     if (isSideIntersected)
       return;
 
     m2::Segment2D const rectSide(a, b);
-    isSideIntersected =
-        m2::Intersect(segment, rectSide, kEps).m_type != m2::IntersectionResult::Type::Zero;
+    isSideIntersected = m2::Intersect(segment, rectSide, kEps).m_type != m2::IntersectionResult::Type::Zero;
   });
 
   return isSideIntersected;
@@ -119,10 +114,8 @@ bool RectCoversPolyline(IRoadGraph::PointWithAltitudeVec const & junctions, m2::
     return rect.IsPointInside(junctions.front().GetPoint());
 
   for (auto const & junction : junctions)
-  {
     if (rect.IsPointInside(junction.GetPoint()))
       return true;
-  }
 
   // No point of polyline |junctions| lays inside |rect| but may be segments of the polyline
   // cross |rect| borders.
@@ -136,8 +129,8 @@ bool RectCoversPolyline(IRoadGraph::PointWithAltitudeVec const & junctions, m2::
   return false;
 }
 
-bool CheckGraphConnectivity(Segment const & start, bool isOutgoing, bool useRoutingOptions,
-                            size_t limit, WorldGraph & graph, set<Segment> & marked)
+bool CheckGraphConnectivity(Segment const & start, bool isOutgoing, bool useRoutingOptions, size_t limit,
+                            WorldGraph & graph, set<Segment> & marked)
 {
   queue<Segment> q;
   q.push(start);
diff --git a/libs/routing/routing_helpers.hpp b/libs/routing/routing_helpers.hpp
index 576660bae..154a1c7c7 100644
--- a/libs/routing/routing_helpers.hpp
+++ b/libs/routing/routing_helpers.hpp
@@ -61,8 +61,7 @@ bool IsRoad(Types const & types)
 
 void FillSegmentInfo(std::vector<double> const & times, std::vector<RouteSegment> & routeSegments);
 
-void ReconstructRoute(DirectionsEngine & engine, IndexRoadGraph const & graph,
-                      base::Cancellable const & cancellable,
+void ReconstructRoute(DirectionsEngine & engine, IndexRoadGraph const & graph, base::Cancellable const & cancellable,
                       std::vector<geometry::PointWithAltitude> const & path, std::vector<double> const & times,
                       Route & route);
 
@@ -80,9 +79,8 @@ bool RectCoversPolyline(IRoadGraph::PointWithAltitudeVec const & junctions, m2::
 /// of edges,
 /// if graph ends before this number is reached then junction is assumed as not connected to the
 /// world graph.
-bool CheckGraphConnectivity(Segment const & start, bool isOutgoing,
-                            bool useRoutingOptions, size_t limit, WorldGraph & graph,
-                            std::set<Segment> & marked);
+bool CheckGraphConnectivity(Segment const & start, bool isOutgoing, bool useRoutingOptions, size_t limit,
+                            WorldGraph & graph, std::set<Segment> & marked);
 
 struct AStarLengthChecker
 {
diff --git a/libs/routing/routing_integration_tests/absent_regions_finder_tests.cpp b/libs/routing/routing_integration_tests/absent_regions_finder_tests.cpp
index d3614a08d..987c9ef3d 100644
--- a/libs/routing/routing_integration_tests/absent_regions_finder_tests.cpp
+++ b/libs/routing/routing_integration_tests/absent_regions_finder_tests.cpp
@@ -44,19 +44,18 @@ TestAbsentRegionsFinder::TestAbsentRegionsFinder()
 {
   m_numMwmIds = CreateNumMwmIds(m_framework.GetStorage());
 
-  m_countryFileGetter = [this](m2::PointD const & p) -> std::string {
-    return m_callbacks.m_countryInfoGetter().GetRegionCountryId(p);
-  };
+  m_countryFileGetter = [this](m2::PointD const & p) -> std::string
+  { return m_callbacks.m_countryInfoGetter().GetRegionCountryId(p); };
 
-  m_localFileChecker = [&](std::string const & countryFile) {
+  m_localFileChecker = [&](std::string const & countryFile)
+  {
     MwmSet::MwmId const mwmId =
         m_callbacks.m_dataSourceGetter().GetMwmIdByCountryFile(platform::CountryFile(countryFile));
     return mwmId.IsAlive();
   };
 }
 
-void TestAbsentRegionsFinder::TestRegions(Checkpoints const & checkpoints,
-                                          std::set<std::string> const & planRegions)
+void TestAbsentRegionsFinder::TestRegions(Checkpoints const & checkpoints, std::set<std::string> const & planRegions)
 {
   std::set<std::string> const & factRegions = GetRegions(checkpoints);
   TEST_EQUAL(planRegions, factRegions, ());
@@ -64,8 +63,7 @@ void TestAbsentRegionsFinder::TestRegions(Checkpoints const & checkpoints,
 
 std::set<std::string> TestAbsentRegionsFinder::GetRegions(Checkpoints const & checkpoints)
 {
-  AbsentRegionsFinder finder(m_countryFileGetter, m_localFileChecker, m_numMwmIds,
-                             m_callbacks.m_dataSourceGetter());
+  AbsentRegionsFinder finder(m_countryFileGetter, m_localFileChecker, m_numMwmIds, m_callbacks.m_dataSourceGetter());
   RouterDelegate delegate;
 
   finder.GenerateAbsentRegions(checkpoints, delegate);
@@ -87,8 +85,7 @@ std::set<std::string> TestAbsentRegionsFinder::GetRegions(Checkpoints const & ch
  */
 UNIT_CLASS_TEST(TestAbsentRegionsFinder, Karelia_Krasnodar)
 {
-  Checkpoints const checkpoints{mercator::FromLatLon(61.76, 34.45),
-                                mercator::FromLatLon(45.07, 38.94)};
+  Checkpoints const checkpoints{mercator::FromLatLon(61.76, 34.45), mercator::FromLatLon(45.07, 38.94)};
 
   // Current test set.
   /*
@@ -107,13 +104,18 @@ UNIT_CLASS_TEST(TestAbsentRegionsFinder, Karelia_Krasnodar)
   */
 
   // Organic test set.
-  std::set<std::string> const planRegions{
-    "Russia_Krasnodar Krai", "Russia_Leningradskaya Oblast_Southeast", "Russia_Lipetsk Oblast",
-    "Russia_Moscow Oblast_East", "Russia_Republic of Karelia_South", "Russia_Rostov Oblast",
-    "Russia_Ryazan Oblast", "Russia_Tula Oblast", "Russia_Tver Oblast",
-    "Russia_Vologda Oblast", "Russia_Voronezh Oblast",
-    "Ukraine_Luhansk Oblast"
-  };
+  std::set<std::string> const planRegions{"Russia_Krasnodar Krai",
+                                          "Russia_Leningradskaya Oblast_Southeast",
+                                          "Russia_Lipetsk Oblast",
+                                          "Russia_Moscow Oblast_East",
+                                          "Russia_Republic of Karelia_South",
+                                          "Russia_Rostov Oblast",
+                                          "Russia_Ryazan Oblast",
+                                          "Russia_Tula Oblast",
+                                          "Russia_Tver Oblast",
+                                          "Russia_Vologda Oblast",
+                                          "Russia_Voronezh Oblast",
+                                          "Ukraine_Luhansk Oblast"};
 
   TestRegions(checkpoints, planRegions);
 }
@@ -121,12 +123,10 @@ UNIT_CLASS_TEST(TestAbsentRegionsFinder, Karelia_Krasnodar)
 // From "Canada_Ontario_Kingston" to "US_Maryland_and_DC".
 UNIT_CLASS_TEST(TestAbsentRegionsFinder, Kingston_DC)
 {
-  Checkpoints const checkpoints{mercator::FromLatLon(45.38, -75.69),
-                                mercator::FromLatLon(38.91, -77.031)};
+  Checkpoints const checkpoints{mercator::FromLatLon(45.38, -75.69), mercator::FromLatLon(38.91, -77.031)};
 
-  std::set<std::string> const planRegions{"Canada_Ontario_Kingston", "US_Maryland_Baltimore",
-                                          "US_Maryland_and_DC",      "US_New York_North",
-                                          "US_New York_West",        "US_Pennsylvania_Central",
+  std::set<std::string> const planRegions{"Canada_Ontario_Kingston", "US_Maryland_Baltimore", "US_Maryland_and_DC",
+                                          "US_New York_North",       "US_New York_West",      "US_Pennsylvania_Central",
                                           "US_Pennsylvania_Scranton"};
 
   TestRegions(checkpoints, planRegions);
@@ -136,11 +136,10 @@ UNIT_CLASS_TEST(TestAbsentRegionsFinder, Kingston_DC)
 // https://www.openstreetmap.org/directions?engine=fossgis_osrm_car&route=39.95763%2C-106.79994%3B49.92034%2C-106.99302
 UNIT_CLASS_TEST(TestAbsentRegionsFinder, Colorado_Saskatchewan)
 {
-  Checkpoints const checkpoints{mercator::FromLatLon(39.95763, -106.79994),
-                                mercator::FromLatLon(49.92034, -106.99302)};
+  Checkpoints const checkpoints{mercator::FromLatLon(39.95763, -106.79994), mercator::FromLatLon(49.92034, -106.99302)};
 
-  std::set<std::string> const planRegions{"Canada_Saskatchewan_Saskatoon",
-                                          "US_Colorado_Aspen", "US_Montana_East", "US_Wyoming"};
+  std::set<std::string> const planRegions{"Canada_Saskatchewan_Saskatoon", "US_Colorado_Aspen", "US_Montana_East",
+                                          "US_Wyoming"};
 
   TestRegions(checkpoints, planRegions);
 }
@@ -149,18 +148,20 @@ UNIT_CLASS_TEST(TestAbsentRegionsFinder, Colorado_Saskatchewan)
 // https://www.openstreetmap.org/directions?engine=fossgis_osrm_car&route=50.87763%2C4.44676%3B50.76935%2C6.42488
 UNIT_CLASS_TEST(TestAbsentRegionsFinder, Belgium_Germany)
 {
-  Checkpoints const checkpoints{mercator::FromLatLon(50.87763, 4.44676),
-                                mercator::FromLatLon(50.76935, 6.42488)};
+  Checkpoints const checkpoints{mercator::FromLatLon(50.87763, 4.44676), mercator::FromLatLon(50.76935, 6.42488)};
 
   // OSRM, Valhalla with E40.
   std::set<std::string> const expected1 = {
-    "Belgium_Flemish Brabant", "Belgium_Walloon Brabant", "Belgium_Liege",
-    "Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Aachen",
+      "Belgium_Flemish Brabant",
+      "Belgium_Walloon Brabant",
+      "Belgium_Liege",
+      "Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Aachen",
   };
 
   // GraphHopper with E314.
   std::set<std::string> const expected2 = {
-      "Belgium_Flemish Brabant", "Belgium_Limburg",
+      "Belgium_Flemish Brabant",
+      "Belgium_Limburg",
       "Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Aachen",
       "Netherlands_Limburg",
   };
@@ -173,18 +174,17 @@ UNIT_CLASS_TEST(TestAbsentRegionsFinder, Belgium_Germany)
 // https://www.openstreetmap.org/directions?engine=fossgis_osrm_car&route=50.76935%2C6.42488%3B50.78285%2C4.46508
 UNIT_CLASS_TEST(TestAbsentRegionsFinder, Germany_Belgium)
 {
-  Checkpoints const checkpoints{mercator::FromLatLon(50.76935, 6.42488),
-                                mercator::FromLatLon(50.78285, 4.46508)};
+  Checkpoints const checkpoints{mercator::FromLatLon(50.76935, 6.42488), mercator::FromLatLon(50.78285, 4.46508)};
 
   // Valhalla with E40.
-  std::set<std::string> const expected1 = {
-    "Belgium_Flemish Brabant", "Belgium_Walloon Brabant", "Belgium_Liege", "Belgium_Limburg",
-    "Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Aachen"
-  };
+  std::set<std::string> const expected1 = {"Belgium_Flemish Brabant", "Belgium_Walloon Brabant", "Belgium_Liege",
+                                           "Belgium_Limburg",
+                                           "Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Aachen"};
 
   // OSRM, GraphHopper with E314.
   std::set<std::string> const expected2 = {
-      "Belgium_Flemish Brabant", "Belgium_Limburg",
+      "Belgium_Flemish Brabant",
+      "Belgium_Limburg",
       "Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Aachen",
       "Netherlands_Limburg",
   };
@@ -196,8 +196,7 @@ UNIT_CLASS_TEST(TestAbsentRegionsFinder, Germany_Belgium)
 // From "Kazakhstan_South" to "Mongolia".
 UNIT_CLASS_TEST(TestAbsentRegionsFinder, Kazakhstan_Mongolia)
 {
-  Checkpoints const checkpoints{mercator::FromLatLon(46.12223, 79.28636),
-                                mercator::FromLatLon(47.04792, 97.74559)};
+  Checkpoints const checkpoints{mercator::FromLatLon(46.12223, 79.28636), mercator::FromLatLon(47.04792, 97.74559)};
 
   std::set<std::string> const planRegions{"Kazakhstan_South", "China_Xinjiang", "Mongolia"};
 
@@ -207,11 +206,9 @@ UNIT_CLASS_TEST(TestAbsentRegionsFinder, Kazakhstan_Mongolia)
 // From "Bolivia_North" to "Brazil_North Region_East".
 UNIT_CLASS_TEST(TestAbsentRegionsFinder, Bolivia_Brazil)
 {
-  Checkpoints const checkpoints{mercator::FromLatLon(-16.54128, -60.83588),
-                                mercator::FromLatLon(-7.38744, -51.29514)};
+  Checkpoints const checkpoints{mercator::FromLatLon(-16.54128, -60.83588), mercator::FromLatLon(-7.38744, -51.29514)};
 
-  std::set<std::string> const planRegions{"Bolivia_North", "Brazil_Mato Grosso",
-                                          "Brazil_North Region_East"};
+  std::set<std::string> const planRegions{"Bolivia_North", "Brazil_Mato Grosso", "Brazil_North Region_East"};
 
   TestRegions(checkpoints, planRegions);
 }
@@ -219,8 +216,7 @@ UNIT_CLASS_TEST(TestAbsentRegionsFinder, Bolivia_Brazil)
 // From "Egypt" to "Sudan_West".
 UNIT_CLASS_TEST(TestAbsentRegionsFinder, Egypt_Sudan)
 {
-  Checkpoints const checkpoints{mercator::FromLatLon(25.84571, 30.34731),
-                                mercator::FromLatLon(19.82398, 30.20142)};
+  Checkpoints const checkpoints{mercator::FromLatLon(25.84571, 30.34731), mercator::FromLatLon(19.82398, 30.20142)};
 
   std::set<std::string> const planRegions{"Egypt", "Sudan_West"};
 
@@ -230,8 +226,7 @@ UNIT_CLASS_TEST(TestAbsentRegionsFinder, Egypt_Sudan)
 // From "Sudan_West" to "Chad".
 UNIT_CLASS_TEST(TestAbsentRegionsFinder, Sudan_Chad)
 {
-  Checkpoints const checkpoints{mercator::FromLatLon(12.91113, 25.01158),
-                                mercator::FromLatLon(13.44014, 20.23824)};
+  Checkpoints const checkpoints{mercator::FromLatLon(12.91113, 25.01158), mercator::FromLatLon(13.44014, 20.23824)};
 
   std::set<std::string> const planRegions{"Sudan_West", "Chad"};
 
@@ -241,8 +236,7 @@ UNIT_CLASS_TEST(TestAbsentRegionsFinder, Sudan_Chad)
 // From "Australia_Sydney" to "Australia_Victoria".
 UNIT_CLASS_TEST(TestAbsentRegionsFinder, Sydney_Victoria)
 {
-  Checkpoints const checkpoints{mercator::FromLatLon(-35.08077, 148.45423),
-                                mercator::FromLatLon(-36.81267, 145.74843)};
+  Checkpoints const checkpoints{mercator::FromLatLon(-35.08077, 148.45423), mercator::FromLatLon(-36.81267, 145.74843)};
 
   std::set<std::string> const planRegions{"Australia_Sydney", "Australia_Victoria"};
 
@@ -252,8 +246,7 @@ UNIT_CLASS_TEST(TestAbsentRegionsFinder, Sydney_Victoria)
 // From "Thailand_South" to "Cambodia".
 UNIT_CLASS_TEST(TestAbsentRegionsFinder, Thailand_Cambodia)
 {
-  Checkpoints const checkpoints{mercator::FromLatLon(7.89, 98.30),
-                                mercator::FromLatLon(11.56, 104.86)};
+  Checkpoints const checkpoints{mercator::FromLatLon(7.89, 98.30), mercator::FromLatLon(11.56, 104.86)};
 
   std::set<std::string> const planRegions{"Thailand_South", "Cambodia"};
 
@@ -264,8 +257,7 @@ UNIT_CLASS_TEST(TestAbsentRegionsFinder, Thailand_Cambodia)
 // RegionsRouter.
 UNIT_CLASS_TEST(TestAbsentRegionsFinder, China)
 {
-  Checkpoints const checkpoints{mercator::FromLatLon(30.78611, 102.55829),
-                                mercator::FromLatLon(27.54127, 102.02502)};
+  Checkpoints const checkpoints{mercator::FromLatLon(30.78611, 102.55829), mercator::FromLatLon(27.54127, 102.02502)};
 
   TestRegions(checkpoints, {});
 }
@@ -273,8 +265,7 @@ UNIT_CLASS_TEST(TestAbsentRegionsFinder, China)
 // Inside "Finland_Eastern Finland_North".
 UNIT_CLASS_TEST(TestAbsentRegionsFinder, Finland)
 {
-  Checkpoints const checkpoints{mercator::FromLatLon(63.54162, 28.71141),
-                                mercator::FromLatLon(64.6790, 28.73029)};
+  Checkpoints const checkpoints{mercator::FromLatLon(63.54162, 28.71141), mercator::FromLatLon(64.6790, 28.73029)};
 
   TestRegions(checkpoints, {});
 }
@@ -294,8 +285,7 @@ UNIT_CLASS_TEST(TestAbsentRegionsFinder, BC_Alberta)
 // https://github.com/organicmaps/organicmaps/issues/1721
 UNIT_CLASS_TEST(TestAbsentRegionsFinder, Germany_Cologne_Croatia_Zagreb)
 {
-  Checkpoints const checkpoints{mercator::FromLatLon(50.924, 6.943),
-                                mercator::FromLatLon(45.806, 15.963)};
+  Checkpoints const checkpoints{mercator::FromLatLon(50.924, 6.943), mercator::FromLatLon(45.806, 15.963)};
 
   /// @todo Optimal route should include Graz-Maribor-Zagreb.
   auto const & rgns = GetRegions(checkpoints);
@@ -312,4 +302,4 @@ UNIT_CLASS_TEST(TestAbsentRegionsFinder, Russia_SPB_Pechory)
     TEST(!rgn.starts_with("Estonia"), ());
 }
 
-} // namespace absent_regions_finder_tests
+}  // namespace absent_regions_finder_tests
diff --git a/libs/routing/routing_integration_tests/bicycle_route_test.cpp b/libs/routing/routing_integration_tests/bicycle_route_test.cpp
index c174093d5..fd5d4c2b4 100644
--- a/libs/routing/routing_integration_tests/bicycle_route_test.cpp
+++ b/libs/routing/routing_integration_tests/bicycle_route_test.cpp
@@ -6,7 +6,6 @@
 
 #include "geometry/mercator.hpp"
 
-
 namespace bicycle_route_test
 {
 using namespace integration;
@@ -17,28 +16,23 @@ UNIT_TEST(RussiaMoscowSevTushinoParkPreferingBicycleWay)
 {
   // Prefer a good quality dedicated cycleway over bad quality path + footway.
   /// @todo: replace with a better case that prefers a longer cycleway to e.g. shorter track of same quality.
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(55.87445, 37.43711), {0., 0.},
-      mercator::FromLatLon(55.87203, 37.44274), 460.0);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle), mercator::FromLatLon(55.87445, 37.43711),
+                                   {0., 0.}, mercator::FromLatLon(55.87203, 37.44274), 460.0);
 }
 
 UNIT_TEST(RussiaMoscowNahimovskyLongRoute)
 {
   // Get onto a secondary and follow it. Same as GraphHopper.
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(55.66151, 37.63320), {0., 0.},
-      mercator::FromLatLon(55.67695, 37.56220), 5670.0);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle), mercator::FromLatLon(55.66151, 37.63320),
+                                   {0., 0.}, mercator::FromLatLon(55.67695, 37.56220), 5670.0);
 }
 
 UNIT_TEST(Russia_UseSteps)
 {
   // Use the steps as the detour is way too long.
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(55.4403114, 37.7740223), {0., 0.},
-      mercator::FromLatLon(55.439703, 37.7725059), 139.058);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle),
+                                   mercator::FromLatLon(55.4403114, 37.7740223), {0., 0.},
+                                   mercator::FromLatLon(55.439703, 37.7725059), 139.058);
 }
 
 UNIT_TEST(Italy_AvoidSteps)
@@ -46,57 +40,51 @@ UNIT_TEST(Italy_AvoidSteps)
   // 690m detour instead of taking a 120m shortcut via steps.
   // Same as Valhalla. But GraphHopper prefers steps.
   // https://github.com/organicmaps/organicmaps/issues/2253
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(42.4631, 14.21342), {0., 0.},
-      mercator::FromLatLon(42.46343, 14.2125), 687.788);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle), mercator::FromLatLon(42.4631, 14.21342),
+                                   {0., 0.}, mercator::FromLatLon(42.46343, 14.2125), 687.788);
 }
 
 UNIT_TEST(SwedenStockholmCyclewayPriority)
 {
-  /// @todo(pastk): DELETE: the cycleway is the shortest and the only obvious option here anyway, what's the value of this test?
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(59.33151, 18.09347), {0., 0.},
-      mercator::FromLatLon(59.33052, 18.09391), 113.0);
+  /// @todo(pastk): DELETE: the cycleway is the shortest and the only obvious option here anyway, what's the value of
+  /// this test?
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle), mercator::FromLatLon(59.33151, 18.09347),
+                                   {0., 0.}, mercator::FromLatLon(59.33052, 18.09391), 113.0);
 }
 
 UNIT_TEST(Poland_PreferCyclewayDetour)
 {
   // Prefer a longer cycleway route with a little uphill
   // rather than a 130m shorter route via a residential.
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(50.043813, 20.016456), {0., 0.},
-      mercator::FromLatLon(50.047522, 20.029986), 1354.04);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle),
+                                   mercator::FromLatLon(50.043813, 20.016456), {0., 0.},
+                                   mercator::FromLatLon(50.047522, 20.029986), 1354.04);
 }
 
 UNIT_TEST(Poland_PreferCycleway_AvoidPrimary)
 {
   // Prefer a 180m longer and a little uphill cycleway detour to avoid a straight primary road.
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(50.031478, 19.948912), {0., 0.},
-      mercator::FromLatLon(50.036289, 19.941198), 993.818);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle),
+                                   mercator::FromLatLon(50.031478, 19.948912), {0., 0.},
+                                   mercator::FromLatLon(50.036289, 19.941198), 993.818);
 }
 
 UNIT_TEST(NetherlandsAmsterdamBicycleNo)
 {
   // Snap start/finish point to the closest suitable road.
   // The closest road here has a bicycle=no tag so its ignored and the next closest cycleway is used.
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(52.32716, 5.05932), {0., 0.},
-      mercator::FromLatLon(52.32587, 5.06121), 338.0);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle), mercator::FromLatLon(52.32716, 5.05932),
+                                   {0., 0.}, mercator::FromLatLon(52.32587, 5.06121), 338.0);
 }
 
 UNIT_TEST(NetherlandsAmsterdamBicycleYes)
 {
   // Test that a highway=unclassified gets a significant boost due to presence of bicycle=yes tag.
-  /// @todo(pastk): it shouldn't as there is no cycling infra (cycleway:both=no https://www.openstreetmap.org/way/214196820)
-  /// and bicycle=yes means "its legal", not "its fast", see https://github.com/organicmaps/organicmaps/issues/9593
-  TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Bicycle),
-                     mercator::FromLatLon(52.32872, 5.07527), {0.0, 0.0},
+  /// @todo(pastk): it shouldn't as there is no cycling infra (cycleway:both=no
+  /// https://www.openstreetmap.org/way/214196820) and bicycle=yes means "its legal", not "its fast", see
+  /// https://github.com/organicmaps/organicmaps/issues/9593
+  TRouteResult const routeResult =
+      CalculateRoute(GetVehicleComponents(VehicleType::Bicycle), mercator::FromLatLon(52.32872, 5.07527), {0.0, 0.0},
                      mercator::FromLatLon(52.33853, 5.08941));
 
   TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ());
@@ -106,20 +94,16 @@ UNIT_TEST(NetherlandsAmsterdamBicycleYes)
 UNIT_TEST(Netherlands_Amsterdam_OnewaySt_CyclewayOpposite)
 {
   // Bicycles can go against the car traffic on oneway=yes roads if there is a cycleway=opposite tag.
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(52.37571, 4.88591), {0., 0.},
-      mercator::FromLatLon(52.37736, 4.88744), 212.8);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle), mercator::FromLatLon(52.37571, 4.88591),
+                                   {0., 0.}, mercator::FromLatLon(52.37736, 4.88744), 212.8);
 }
 
 UNIT_TEST(RussiaMoscowKashirskoe16ToCapLongRoute)
 {
   // There is no dedicated bicycle infra, except short end part. All OSM routers give different results,
   // OM yields a short and logical route shortcutting via some service roads and footways (allowed in Russia).
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(55.66230, 37.63214), {0., 0.},
-      mercator::FromLatLon(55.68927, 37.70356), 6968.64);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle), mercator::FromLatLon(55.66230, 37.63214),
+                                   {0., 0.}, mercator::FromLatLon(55.68927, 37.70356), 6968.64);
 }
 
 UNIT_TEST(Germany_UseServiceCountrysideRoads)
@@ -129,37 +113,33 @@ UNIT_TEST(Germany_UseServiceCountrysideRoads)
   // Goes by smaller roads, including service ones. Also avoids extra 60m uphill
   // of the secondary road route. Most similar to Valhalla, but 2km shorter.
   // https://github.com/organicmaps/organicmaps/issues/6027
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(49.1423, 10.068), {0., 0.},
-      mercator::FromLatLon(49.3023, 10.5738), 47769.2);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle), mercator::FromLatLon(49.1423, 10.068),
+                                   {0., 0.}, mercator::FromLatLon(49.3023, 10.5738), 47769.2);
 }
 
 UNIT_TEST(RussiaMoscowServicePassThrough)
 {
   // Passing through living_street and service is allowed in Russia.
-  TRouteResult route =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Bicycle),
-                                  mercator::FromLatLon(55.79649, 37.53738), {0., 0.},
-                                  mercator::FromLatLon(55.79618, 37.54071));
+  TRouteResult route = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Bicycle),
+                                                   mercator::FromLatLon(55.79649, 37.53738), {0., 0.},
+                                                   mercator::FromLatLon(55.79618, 37.54071));
   TEST_EQUAL(route.second, RouterResultCode::NoError, ());
 }
 
 UNIT_TEST(Russia_Moscow_UseAllowedFootways)
 {
   // Shortcut via footways if its allowed in the country.
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(55.6572884, 37.6142816), {0., 0.},
-      mercator::FromLatLon(55.6576455, 37.6164412), 182.766);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle),
+                                   mercator::FromLatLon(55.6572884, 37.6142816), {0., 0.},
+                                   mercator::FromLatLon(55.6576455, 37.6164412), 182.766);
 }
 
 UNIT_TEST(Spain_Barcelona_UsePedestrianAndLivingStreet)
 {
   // Don't make long detours to avoid pedestrian and living streets.
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(41.40080, 2.16026), {0.0, 0.0},
-      mercator::FromLatLon(41.39937, 2.15735), 516.14 /* expectedRouteMeters */);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle), mercator::FromLatLon(41.40080, 2.16026),
+                                   {0.0, 0.0}, mercator::FromLatLon(41.39937, 2.15735),
+                                   516.14 /* expectedRouteMeters */);
 }
 
 UNIT_TEST(Poland_UseLivingStreet)
@@ -167,8 +147,8 @@ UNIT_TEST(Poland_UseLivingStreet)
   // Don't make a long detour via an uphill residential to avoid a living street.
   // https://github.com/organicmaps/organicmaps/pull/9692#discussion_r1851446320
   CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(50.006085, 19.962158), {0.0, 0.0},
-      mercator::FromLatLon(50.006664, 19.957639), 335.978 /* expectedRouteMeters */);
+                                   mercator::FromLatLon(50.006085, 19.962158), {0.0, 0.0},
+                                   mercator::FromLatLon(50.006664, 19.957639), 335.978 /* expectedRouteMeters */);
 }
 
 UNIT_TEST(Poland_UseLivingStreet2)
@@ -176,35 +156,30 @@ UNIT_TEST(Poland_UseLivingStreet2)
   // Don't make a long detour via service and residential to avoid a living street.
   // (a more strict and longer test than above)
   CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(50.096027, 19.90433), {0.0, 0.0},
-      mercator::FromLatLon(50.099875, 19.889867), 1124.7 /* expectedRouteMeters */);
+                                   mercator::FromLatLon(50.096027, 19.90433), {0.0, 0.0},
+                                   mercator::FromLatLon(50.099875, 19.889867), 1124.7 /* expectedRouteMeters */);
 }
 
 UNIT_TEST(RussiaKerchStraitFerryRoute)
 {
   // Use a cross-mwm ferry.
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(45.4167, 36.7658), {0.0, 0.0},
-      mercator::FromLatLon(45.3653, 36.6161), 17151.4);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle), mercator::FromLatLon(45.4167, 36.7658),
+                                   {0.0, 0.0}, mercator::FromLatLon(45.3653, 36.6161), 17151.4);
 }
 
 UNIT_TEST(SwedenStockholmBicyclePastFerry)
 {
   // Several consecutive ferries.
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(59.4725, 18.51355), {0.0, 0.0},
-      mercator::FromLatLon(59.42533, 18.35991), 14338.0);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle), mercator::FromLatLon(59.4725, 18.51355),
+                                   {0.0, 0.0}, mercator::FromLatLon(59.42533, 18.35991), 14338.0);
 }
 
 UNIT_TEST(CrossMwmKaliningradRegionToLiepaja)
 {
   // A cross mwm route (3 regions). Includes a ferry.
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(54.63519, 21.80749), {0., 0.},
-      mercator::FromLatLon(56.51119, 21.01847), 266992);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Bicycle),
+                                                mercator::FromLatLon(54.63519, 21.80749), {0., 0.},
+                                                mercator::FromLatLon(56.51119, 21.01847), 266992);
 }
 
 UNIT_TEST(Lithuania_Avoid_Ferry_Long_Route)
@@ -218,19 +193,18 @@ UNIT_TEST(Lithuania_Avoid_Ferry_Long_Route)
   // OM uses a much shorter (56km vs 64km) route with bicycle=yes tracks and a short path section.
   /// @todo(pastk): the route goes through a landuse=military briefly and OM doesn't account for that.
   /// And too much preference is given to bicycle=yes track, see https://github.com/organicmaps/organicmaps/issues/9593
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(55.3405073, 21.4595925), {0., 0.},
-      mercator::FromLatLon(55.7140174, 21.1365445), 56243.2);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Bicycle),
+                                                mercator::FromLatLon(55.3405073, 21.4595925), {0., 0.},
+                                                mercator::FromLatLon(55.7140174, 21.1365445), 56243.2);
 }
 
 UNIT_TEST(SpainTenerifeAdejeVilaflor)
 {
   // Test on riding up from Adeje (sea level) to Vilaflor (altitude 1400 meters).
   // A long ETA due to going uphill.
-  TRouteResult const res = CalculateRoute(GetVehicleComponents(VehicleType::Bicycle),
-                              mercator::FromLatLon(28.11984, -16.72592), {0., 0.},
-                              mercator::FromLatLon(28.15865, -16.63704));
+  TRouteResult const res =
+      CalculateRoute(GetVehicleComponents(VehicleType::Bicycle), mercator::FromLatLon(28.11984, -16.72592), {0., 0.},
+                     mercator::FromLatLon(28.15865, -16.63704));
   TEST_EQUAL(res.second, RouterResultCode::NoError, ());
 
   TestRouteLength(*res.first, 26401);
@@ -241,9 +215,9 @@ UNIT_TEST(SpainTenerifeVilaflorAdeje)
 {
   // Test on riding down from Vilaflor (altitude 1400 meters) to Adeje (sea level).
   // A short ETA going downhill.
-  TRouteResult const res = CalculateRoute(GetVehicleComponents(VehicleType::Bicycle),
-                              mercator::FromLatLon(28.15865, -16.63704), {0., 0.},
-                              mercator::FromLatLon(28.11984, -16.72592));
+  TRouteResult const res =
+      CalculateRoute(GetVehicleComponents(VehicleType::Bicycle), mercator::FromLatLon(28.15865, -16.63704), {0., 0.},
+                     mercator::FromLatLon(28.11984, -16.72592));
   TEST_EQUAL(res.second, RouterResultCode::NoError, ());
 
   TestRouteLength(*res.first, 24582);
@@ -255,16 +229,15 @@ UNIT_TEST(Munich_OnewayBicycle1)
 {
   /// @todo Should combine TurnSlightLeft, TurnLeft, TurnLeft into UTurnLeft?
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(48.1601673, 11.5630245), {0.0, 0.0},
+      integration::GetVehicleComponents(VehicleType::Bicycle), mercator::FromLatLon(48.1601673, 11.5630245), {0.0, 0.0},
       mercator::FromLatLon(48.1606349, 11.5631699), 264.042 /* expectedRouteMeters */);
 }
 
 UNIT_TEST(Munich_OnewayBicycle2)
 {
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(48.17819, 11.57286), {0.0, 0.0},
-      mercator::FromLatLon(48.17867, 11.57303), 201.532 /* expectedRouteMeters */);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle), mercator::FromLatLon(48.17819, 11.57286),
+                                   {0.0, 0.0}, mercator::FromLatLon(48.17867, 11.57303),
+                                   201.532 /* expectedRouteMeters */);
 }
 
 UNIT_TEST(London_GreenwichTunnel)
@@ -274,24 +247,25 @@ UNIT_TEST(London_GreenwichTunnel)
   // https://github.com/organicmaps/organicmaps/issues/8028
 
   CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(51.4817397, -0.0100070258), {0.0, 0.0},
-      mercator::FromLatLon(51.4883739, -0.00809729298), 1183.12 /* expectedRouteMeters */);
+                                   mercator::FromLatLon(51.4817397, -0.0100070258), {0.0, 0.0},
+                                   mercator::FromLatLon(51.4883739, -0.00809729298), 1183.12 /* expectedRouteMeters */);
 }
 
 UNIT_TEST(Batumi_AvoidServiceDetour)
 {
   // Go straight via a residential without a short detour via service road.
   CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(41.6380014, 41.6269446), {0.0, 0.0},
-      mercator::FromLatLon(41.6392113, 41.6260084), 160.157 /* expectedRouteMeters */);
+                                   mercator::FromLatLon(41.6380014, 41.6269446), {0.0, 0.0},
+                                   mercator::FromLatLon(41.6392113, 41.6260084), 160.157 /* expectedRouteMeters */);
 }
 
 UNIT_TEST(Gdansk_AvoidLongCyclewayDetour)
 {
-  /// @todo(pastk): DELETE: the preferred route goes by a shared cycleway also - replace with a better case (the next one!)
+  /// @todo(pastk): DELETE: the preferred route goes by a shared cycleway also - replace with a better case (the next
+  /// one!)
   CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(54.2632738, 18.6771661), {0.0, 0.0},
-      mercator::FromLatLon(54.2698882, 18.6765837), 760.749 /* expectedRouteMeters */);
+                                   mercator::FromLatLon(54.2632738, 18.6771661), {0.0, 0.0},
+                                   mercator::FromLatLon(54.2698882, 18.6765837), 760.749 /* expectedRouteMeters */);
 }
 
 UNIT_TEST(Netherlands_AvoidLongCyclewayDetour)
@@ -299,8 +273,8 @@ UNIT_TEST(Netherlands_AvoidLongCyclewayDetour)
   // Same as GraphHopper.
   // The first sample from https://github.com/organicmaps/organicmaps/issues/1772
   CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(52.253405,6.182288), {0.0, 0.0},
-      mercator::FromLatLon(52.247599,6.197973), 1440.8 /* expectedRouteMeters */);
+                                   mercator::FromLatLon(52.253405, 6.182288), {0.0, 0.0},
+                                   mercator::FromLatLon(52.247599, 6.197973), 1440.8 /* expectedRouteMeters */);
 }
 
 UNIT_TEST(Poland_AvoidDetourAndExtraCrossings)
@@ -311,18 +285,18 @@ UNIT_TEST(Poland_AvoidDetourAndExtraCrossings)
   // for more aggressive ones depending on light phase to go through one traffic light only).
   // https://github.com/organicmaps/organicmaps/issues/7954
   // https://github.com/organicmaps/organicmaps/pull/9692#discussion_r1849627559
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(50.08227, 20.03348), {0.0, 0.0},
-      mercator::FromLatLon(50.08253, 20.03191), 157.7 /* expectedRouteMeters */);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle), mercator::FromLatLon(50.08227, 20.03348),
+                                   {0.0, 0.0}, mercator::FromLatLon(50.08253, 20.03191),
+                                   157.7 /* expectedRouteMeters */);
 }
 
 UNIT_TEST(Germany_DontAvoidNocyclewayResidential)
 {
   // No strange detours to avoid a nocycleway residential. Same as GraphHopper.
   // https://github.com/organicmaps/organicmaps/issues/4059#issuecomment-1399338757
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(51.33772, 12.41432), {0.0, 0.0},
-      mercator::FromLatLon(51.33837, 12.40958), 359.495 /* expectedRouteMeters */);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle), mercator::FromLatLon(51.33772, 12.41432),
+                                   {0.0, 0.0}, mercator::FromLatLon(51.33837, 12.40958),
+                                   359.495 /* expectedRouteMeters */);
 }
 
 UNIT_TEST(UK_UseNocyclewayTertiary)
@@ -330,8 +304,8 @@ UNIT_TEST(UK_UseNocyclewayTertiary)
   // A preferred route is through nocycleway tertiary roads. Same as all OSM routers.
   // The detour is via a shared cycleway and with 130m less alt gain, but is 4km longer.
   CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(51.3826906, -2.3481788), {0.0, 0.0},
-      mercator::FromLatLon(51.3615095, -2.3114138), 4468.83 /* expectedRouteMeters */);
+                                   mercator::FromLatLon(51.3826906, -2.3481788), {0.0, 0.0},
+                                   mercator::FromLatLon(51.3615095, -2.3114138), 4468.83 /* expectedRouteMeters */);
 }
 
 UNIT_TEST(Germany_UseResidential)
@@ -339,8 +313,8 @@ UNIT_TEST(Germany_UseResidential)
   // No long detour to avoid a short residential.
   // https://github.com/organicmaps/organicmaps/issues/9330
   CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(48.1464472, 11.5589919), {0.0, 0.0},
-      mercator::FromLatLon(48.1418297, 11.5602123), 614.963 /* expectedRouteMeters */);
+                                   mercator::FromLatLon(48.1464472, 11.5589919), {0.0, 0.0},
+                                   mercator::FromLatLon(48.1418297, 11.5602123), 614.963 /* expectedRouteMeters */);
 }
 
 UNIT_TEST(Belarus_StraightFootway)
@@ -348,16 +322,16 @@ UNIT_TEST(Belarus_StraightFootway)
   // Prefer footways over roads in Belarus due to local laws.
   // https://github.com/organicmaps/organicmaps/issues/4145
   CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(53.8670285, 30.3162749), {0.0, 0.0},
-      mercator::FromLatLon(53.876436, 30.3348084), 1613.34 /* expectedRouteMeters */);
+                                   mercator::FromLatLon(53.8670285, 30.3162749), {0.0, 0.0},
+                                   mercator::FromLatLon(53.876436, 30.3348084), 1613.34 /* expectedRouteMeters */);
 }
 
 UNIT_TEST(Spain_Madrid_DedicatedCycleway)
 {
   // Check that OM uses dedicated "Carril bici del Paseo de la Castellana".
   CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(40.459616, -3.690031), {0.0, 0.0},
-      mercator::FromLatLon(40.4403523, -3.69267444), 2283.89 /* expectedRouteMeters */);
+                                   mercator::FromLatLon(40.459616, -3.690031), {0.0, 0.0},
+                                   mercator::FromLatLon(40.4403523, -3.69267444), 2283.89 /* expectedRouteMeters */);
 }
 
 UNIT_TEST(Seoul_ElevationDetour)
@@ -367,8 +341,8 @@ UNIT_TEST(Seoul_ElevationDetour)
   // Valhalla and GraphHopper prefer a longer route also.
   // https://github.com/organicmaps/organicmaps/issues/7047
   CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(37.510519, 127.101251), {0.0, 0.0},
-      mercator::FromLatLon(37.513874, 127.099234), 663.547 /* expectedRouteMeters */);
+                                   mercator::FromLatLon(37.510519, 127.101251), {0.0, 0.0},
+                                   mercator::FromLatLon(37.513874, 127.099234), 663.547 /* expectedRouteMeters */);
 }
 
 UNIT_TEST(Spain_Zaragoza_Fancy_NoBicycle_Crossings)
@@ -376,8 +350,8 @@ UNIT_TEST(Spain_Zaragoza_Fancy_NoBicycle_Crossings)
   // A highway=crossing node https://www.openstreetmap.org/node/258776322 on the way
   // has bicycle=no, which doesn't prevent routing along this road.
   CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(41.6523561, -0.881151311), {0.0, 0.0},
-      mercator::FromLatLon(41.6476614, -0.885694674), 649.855 /* expectedRouteMeters */);
+                                   mercator::FromLatLon(41.6523561, -0.881151311), {0.0, 0.0},
+                                   mercator::FromLatLon(41.6476614, -0.885694674), 649.855 /* expectedRouteMeters */);
 }
 
 UNIT_TEST(Germany_Use_Bicycle_Track)
@@ -386,8 +360,8 @@ UNIT_TEST(Germany_Use_Bicycle_Track)
   /// @todo Still prefers a no-cycling-infra but bicycle=yes secondary rather than a paved track,
   /// see https://github.com/organicmaps/organicmaps/issues/1201#issuecomment-946042937
   CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(48.420723, 9.90350146), {0.0, 0.0},
-      mercator::FromLatLon(48.4080367, 9.86597073), 3778.41 /* expectedRouteMeters */);
+                                   mercator::FromLatLon(48.420723, 9.90350146), {0.0, 0.0},
+                                   mercator::FromLatLon(48.4080367, 9.86597073), 3778.41 /* expectedRouteMeters */);
 }
 
 UNIT_TEST(Finland_Use_Tertiary_LowTraffic)
@@ -396,8 +370,8 @@ UNIT_TEST(Finland_Use_Tertiary_LowTraffic)
   // https://github.com/orgs/organicmaps/discussions/5158#discussioncomment-5938807
   /// @todo(pastk): prefer roads with lower maxspeed.
   CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(61.5445696, 23.9394003), {0.0, 0.0},
-      mercator::FromLatLon(61.6153965, 23.876755), 9876.65 /* expectedRouteMeters */);
+                                   mercator::FromLatLon(61.5445696, 23.9394003), {0.0, 0.0},
+                                   mercator::FromLatLon(61.6153965, 23.876755), 9876.65 /* expectedRouteMeters */);
 }
 
 UNIT_TEST(Belarus_Stolbcy_Use_Unpaved)
@@ -406,18 +380,17 @@ UNIT_TEST(Belarus_Stolbcy_Use_Unpaved)
   // Closer as GraphHopper. Valhalla detours the unpaved street.
   // OSRM shortcuts through paths and a ford.
   CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(53.471389, 26.7422186), {0.0, 0.0},
-      mercator::FromLatLon(53.454082, 26.7560061), 4620.81 /* expectedRouteMeters */);
+                                   mercator::FromLatLon(53.471389, 26.7422186), {0.0, 0.0},
+                                   mercator::FromLatLon(53.454082, 26.7560061), 4620.81 /* expectedRouteMeters */);
 }
 
 UNIT_TEST(Russia_UseTrunk_Long)
 {
   // Prefer riding via a straight trunk road instead of taking a long +30% detour via smaller roads.
-  /// @todo(pastk): DELETE: This test is controversial as this route has sections with longer relative trunk-avoiding detours
-  /// e.g. from 67.9651692,32.8685132 to 68.022093,32.9654391 its +40% longer via a teriary and its OK?
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle),
-                                   mercator::FromLatLon(66.271, 33.048), {0.0, 0.0},
-                                   mercator::FromLatLon(68.95, 33.045), 404262 /* expectedRouteMeters */);
+  /// @todo(pastk): DELETE: This test is controversial as this route has sections with longer relative trunk-avoiding
+  /// detours e.g. from 67.9651692,32.8685132 to 68.022093,32.9654391 its +40% longer via a teriary and its OK?
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle), mercator::FromLatLon(66.271, 33.048),
+                                   {0.0, 0.0}, mercator::FromLatLon(68.95, 33.045), 404262 /* expectedRouteMeters */);
 }
 
 /// @todo(pastk): find a good "avoid trunk" test case where trunk allows cycling.
@@ -455,7 +428,8 @@ UNIT_TEST(UK_ForbidGates_WithoutAccess)
   // A barrier=gate without explicit access leads to a long detour.
   // https://www.openstreetmap.org/node/6993853766
   /// @todo OSRM/Valhalla/GraphHopper ignore such gates,
-  /// see https://www.openstreetmap.org/directions?engine=fossgis_valhalla_bicycle&route=51.3579329%2C-2.3137701%3B51.3574666%2C-2.3152644
+  /// see
+  /// https://www.openstreetmap.org/directions?engine=fossgis_valhalla_bicycle&route=51.3579329%2C-2.3137701%3B51.3574666%2C-2.3152644
   CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle),
                                    mercator::FromLatLon(51.3579329, -2.3137701), {0.0, 0.0},
                                    mercator::FromLatLon(51.3574666, -2.31526436), 1149.28);
@@ -472,4 +446,4 @@ UNIT_TEST(UK_Canterbury_AvoidDismount)
                                    mercator::FromLatLon(51.2818863, 1.05725286), 976);
 }
 
-} // namespace bicycle_route_test
+}  // namespace bicycle_route_test
diff --git a/libs/routing/routing_integration_tests/bicycle_turn_test.cpp b/libs/routing/routing_integration_tests/bicycle_turn_test.cpp
index 723b240bc..31c289ed7 100644
--- a/libs/routing/routing_integration_tests/bicycle_turn_test.cpp
+++ b/libs/routing/routing_integration_tests/bicycle_turn_test.cpp
@@ -13,9 +13,9 @@ using namespace routing::turns;
 
 UNIT_TEST(RussiaMoscowSevTushinoParkBicycleWayTurnTest)
 {
-  TRouteResult const routeResult = integration::CalculateRoute(
-      integration::GetVehicleComponents(VehicleType::Bicycle),
-      mercator::FromLatLon(55.87467, 37.43658), {0.0, 0.0}, mercator::FromLatLon(55.8719, 37.4464));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Bicycle),
+                                                               mercator::FromLatLon(55.87467, 37.43658), {0.0, 0.0},
+                                                               mercator::FromLatLon(55.8719, 37.4464));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -31,10 +31,9 @@ UNIT_TEST(RussiaMoscowSevTushinoParkBicycleWayTurnTest)
 
 UNIT_TEST(SpainTenerifeSlightTurnMain_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Bicycle),
-                                  mercator::FromLatLon(28.09214, -16.73121), {0.0, 0.0},
-                                  mercator::FromLatLon(28.09227, -16.7303));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Bicycle),
+                                                               mercator::FromLatLon(28.09214, -16.73121), {0.0, 0.0},
+                                                               mercator::FromLatLon(28.09227, -16.7303));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -48,10 +47,9 @@ UNIT_TEST(SpainTenerifeSlightTurnMain_TurnTest)
 
 UNIT_TEST(RussiaMoscowGerPanfilovtsev22BicycleWayTurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Bicycle),
-                                  mercator::FromLatLon(55.85630, 37.41004), {0.0, 0.0},
-                                  mercator::FromLatLon(55.85717, 37.41052));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Bicycle),
+                                                               mercator::FromLatLon(55.85630, 37.41004), {0.0, 0.0},
+                                                               mercator::FromLatLon(55.85717, 37.41052));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -67,9 +65,9 @@ UNIT_TEST(Russia_Moscow_SalameiNerisPossibleTurnCorrectionBicycleWay_TurnTest)
 {
   using namespace integration;
 
-  TRouteResult const routeResult = CalculateRoute(integration::GetVehicleComponents(VehicleType::Bicycle),
-                                  mercator::FromLatLon(55.85854, 37.36795), {0.0, 0.0},
-                                  mercator::FromLatLon(55.85364, 37.37318));
+  TRouteResult const routeResult =
+      CalculateRoute(integration::GetVehicleComponents(VehicleType::Bicycle), mercator::FromLatLon(55.85854, 37.36795),
+                     {0.0, 0.0}, mercator::FromLatLon(55.85364, 37.37318));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -88,9 +86,9 @@ UNIT_TEST(Russia_Moscow_SalameiNerisNoUTurnBicycleWay_TurnTest)
 {
   using namespace integration;
 
-  TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Bicycle),
-                                  mercator::FromLatLon(55.85854, 37.36795), {0.0, 0.0},
-                                  mercator::FromLatLon(55.85765, 37.36793));
+  TRouteResult const routeResult =
+      CalculateRoute(GetVehicleComponents(VehicleType::Bicycle), mercator::FromLatLon(55.85854, 37.36795), {0.0, 0.0},
+                     mercator::FromLatLon(55.85765, 37.36793));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -118,8 +116,8 @@ UNIT_TEST(Russia_Moscow_SalameiNerisNoUTurnBicycleWay_TurnTest)
 UNIT_TEST(RussiaMoscowSevTushinoParkBicycleOnePointOnewayRoadTurnTest)
 {
   m2::PointD const point = mercator::FromLatLon(55.8719, 37.4464);
-  TRouteResult const routeResult = integration::CalculateRoute(
-      integration::GetVehicleComponents(VehicleType::Bicycle), point, {0.0, 0.0}, point);
+  TRouteResult const routeResult =
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Bicycle), point, {0.0, 0.0}, point);
 
   RouterResultCode const result = routeResult.second;
   TEST_EQUAL(result, RouterResultCode::NoError, ());
@@ -128,8 +126,8 @@ UNIT_TEST(RussiaMoscowSevTushinoParkBicycleOnePointOnewayRoadTurnTest)
 UNIT_TEST(RussiaMoscowSevTushinoParkBicycleOnePointTwowayRoadTurnTest)
 {
   m2::PointD const point = mercator::FromLatLon(55.87102, 37.44222);
-  TRouteResult const routeResult = integration::CalculateRoute(
-      integration::GetVehicleComponents(VehicleType::Bicycle), point, {0.0, 0.0}, point);
+  TRouteResult const routeResult =
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Bicycle), point, {0.0, 0.0}, point);
 
   RouterResultCode const result = routeResult.second;
   TEST_EQUAL(result, RouterResultCode::NoError, ());
@@ -137,10 +135,9 @@ UNIT_TEST(RussiaMoscowSevTushinoParkBicycleOnePointTwowayRoadTurnTest)
 
 UNIT_TEST(Russia_Moscow_TatishchevaOnewayCarRoad_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Bicycle),
-                                  mercator::FromLatLon(55.71566, 37.61568), {0.0, 0.0},
-                                  mercator::FromLatLon(55.71519, 37.61566));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Bicycle),
+                                                               mercator::FromLatLon(55.71566, 37.61568), {0.0, 0.0},
+                                                               mercator::FromLatLon(55.71519, 37.61566));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -158,10 +155,9 @@ UNIT_TEST(Russia_Moscow_TatishchevaOnewayCarRoad_TurnTest)
 
 UNIT_TEST(Russia_Moscow_SvobodiOnewayBicycleWay_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Bicycle),
-                                  mercator::FromLatLon(55.87277, 37.44002), {0.0, 0.0},
-                                  mercator::FromLatLon(55.87362, 37.43853));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Bicycle),
+                                                               mercator::FromLatLon(55.87277, 37.44002), {0.0, 0.0},
+                                                               mercator::FromLatLon(55.87362, 37.43853));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -181,10 +177,9 @@ UNIT_TEST(Russia_Moscow_SvobodiOnewayBicycleWay_TurnTest)
 
 UNIT_TEST(TurnsNearAltufievskoeShosseLongFakeSegmentTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Bicycle),
-                                  mercator::FromLatLon(55.91569, 37.58972), {0.0, 0.0},
-                                  mercator::FromLatLon(55.9162315, 37.5861694));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Bicycle),
+                                                               mercator::FromLatLon(55.91569, 37.58972), {0.0, 0.0},
+                                                               mercator::FromLatLon(55.9162315, 37.5861694));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -208,10 +203,9 @@ UNIT_TEST(TurnsNearAltufievskoeShosseLongFakeSegmentTest)
 
 UNIT_TEST(TurnsNearMoscowRiverShortFakeSegmentTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Bicycle),
-                                  mercator::FromLatLon(55.71484, 37.54868), {0.0, 0.0},
-                                  mercator::FromLatLon(55.71586, 37.54594));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Bicycle),
+                                                               mercator::FromLatLon(55.71484, 37.54868), {0.0, 0.0},
+                                                               mercator::FromLatLon(55.71586, 37.54594));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -231,9 +225,9 @@ UNIT_TEST(TurnsNearMKAD85kmShortFakeSegmentTest)
 {
   using namespace integration;
 
-  TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Bicycle),
-                                  mercator::FromLatLon(55.91788, 37.58603), {0.0, 0.0},
-                                  mercator::FromLatLon(55.91684, 37.57884));
+  TRouteResult const routeResult =
+      CalculateRoute(GetVehicleComponents(VehicleType::Bicycle), mercator::FromLatLon(55.91788, 37.58603), {0.0, 0.0},
+                     mercator::FromLatLon(55.91684, 37.57884));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -261,10 +255,9 @@ UNIT_TEST(TurnsNearMKAD85kmShortFakeSegmentTest)
 
 UNIT_TEST(TurnsNearKhladkombinatTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Bicycle),
-                                  mercator::FromLatLon(55.86973, 37.45825), {0.0, 0.0},
-                                  mercator::FromLatLon(55.87020, 37.46011));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Bicycle),
+                                                               mercator::FromLatLon(55.86973, 37.45825), {0.0, 0.0},
+                                                               mercator::FromLatLon(55.87020, 37.46011));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -278,4 +271,4 @@ UNIT_TEST(TurnsNearKhladkombinatTest)
   integration::GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::TurnLeft);
   integration::GetNthTurn(route, 2).TestValid().TestDirection(CarDirection::TurnRight);
 }
-} // namespace bicycle_turn_test
+}  // namespace bicycle_turn_test
diff --git a/libs/routing/routing_integration_tests/concurrent_feature_parsing_test.cpp b/libs/routing/routing_integration_tests/concurrent_feature_parsing_test.cpp
index de712aa44..7ccde102e 100644
--- a/libs/routing/routing_integration_tests/concurrent_feature_parsing_test.cpp
+++ b/libs/routing/routing_integration_tests/concurrent_feature_parsing_test.cpp
@@ -47,8 +47,7 @@ void TestConcurrentAccessToFeatures(string const & mwm)
   // If hardware_concurrency() returns 1 it means that only one core is available.
   // In the both cases 2 threads should be used for this test.
   auto const threadNumber = max(thread::hardware_concurrency(), static_cast<unsigned int>(2));
-  LOG(LINFO, ("Parsing geometry of", featureNumber, "features in", threadNumber,
-              "threads simultaneously.", local));
+  LOG(LINFO, ("Parsing geometry of", featureNumber, "features in", threadNumber, "threads simultaneously.", local));
 
   mutex guardCtorMtx;
   auto parseGeometries = [&](vector<m2::PointD> & points)
@@ -96,8 +95,7 @@ UNIT_TEST(ConcurrentFeatureParsingTest)
 {
   classificator::Load();
 
-  vector<string> const mwms = {"Russia_Moscow", "Nepal_Kathmandu",
-                               "Netherlands_North Holland_Amsterdam"};
+  vector<string> const mwms = {"Russia_Moscow", "Nepal_Kathmandu", "Netherlands_North Holland_Amsterdam"};
 
   for (auto const & mwm : mwms)
     TestConcurrentAccessToFeatures(mwm);
diff --git a/libs/routing/routing_integration_tests/cross_country_routing_tests.cpp b/libs/routing/routing_integration_tests/cross_country_routing_tests.cpp
index 3c74cbec4..bca9de42a 100644
--- a/libs/routing/routing_integration_tests/cross_country_routing_tests.cpp
+++ b/libs/routing/routing_integration_tests/cross_country_routing_tests.cpp
@@ -23,23 +23,21 @@ UNIT_TEST(CrossCountry_EAEU_Borders_Russia_to_Russia_through_Belarus)
 {
   /// @todo Uses tertiary instead of longer (7km) primary. Can't say fo sure is it ok or not, but looks good.
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Car),
-      mercator::FromLatLon(53.83281, 32.47602) /* startPoint */, {0.0, 0.0} /* startDirection */,
-      mercator::FromLatLon(52.79681, 32.98167) /* finalPoint */, 188'085 /* expectedRouteMeters */);
+      integration::GetVehicleComponents(VehicleType::Car), mercator::FromLatLon(53.83281, 32.47602) /* startPoint */,
+      {0.0, 0.0} /* startDirection */, mercator::FromLatLon(52.79681, 32.98167) /* finalPoint */,
+      188'085 /* expectedRouteMeters */);
 }
 
 UNIT_TEST(Russia_UsePrimaryDetour_NotSecondaryTown)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Car),
-      mercator::FromLatLon(50.215143, 39.4498585), {0.0, 0.0},
-      mercator::FromLatLon(49.9025281, 40.5213712), 123949);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Car),
+                                                mercator::FromLatLon(50.215143, 39.4498585), {0.0, 0.0},
+                                                mercator::FromLatLon(49.9025281, 40.5213712), 123949);
 
   /// @todo Should prefer trunk detour with maxspeed=90 than secondary with maxspeed=60.
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Car),
-      mercator::FromLatLon(45.2849983, 38.2432247), {0.0, 0.0},
-      mercator::FromLatLon(45.237346, 38.0046459), 28534.8);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Car),
+                                                mercator::FromLatLon(45.2849983, 38.2432247), {0.0, 0.0},
+                                                mercator::FromLatLon(45.237346, 38.0046459), 28534.8);
 }
 
 // In this case the shortest way from Belgorod oblast to Crimea is through Ukraine. But we add
@@ -51,14 +49,12 @@ UNIT_TEST(CrossCountry_Russia_Belgorod_Oblast_to_Crimea)
   // This routes go via Russia only.
   // Some subroutes are checked in Russia_UsePrimaryDetour_NotSecondaryTown.
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Car),
-      mercator::FromLatLon(50.39589, 38.83377) /* startPoint */, {0.0, 0.0} /* startDirection */,
-      mercator::FromLatLon(45.06336, 34.48566) /* finalPoint */, 1'144'970);
+      integration::GetVehicleComponents(VehicleType::Car), mercator::FromLatLon(50.39589, 38.83377) /* startPoint */,
+      {0.0, 0.0} /* startDirection */, mercator::FromLatLon(45.06336, 34.48566) /* finalPoint */, 1'144'970);
 
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Car),
-      mercator::FromLatLon(50.39589, 38.83377) /* startPoint */, {0.0, 0.0} /* startDirection */,
-      mercator::FromLatLon(45.1048391, 35.1297058) /* finalPoint */, 1'096'360);
+      integration::GetVehicleComponents(VehicleType::Car), mercator::FromLatLon(50.39589, 38.83377) /* startPoint */,
+      {0.0, 0.0} /* startDirection */, mercator::FromLatLon(45.1048391, 35.1297058) /* finalPoint */, 1'096'360);
 }
 
 // In this case the shortest way from Lithuania to Poland is through Russia, Kaliningrad Oblast. But
@@ -67,9 +63,9 @@ UNIT_TEST(CrossCountry_Russia_Belgorod_Oblast_to_Crimea)
 UNIT_TEST(CrossCountry_Lithuania_to_Poland)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Car),
-      mercator::FromLatLon(55.10055, 22.30228) /* startPoint */, {0.0, 0.0} /* startDirection */,
-      mercator::FromLatLon(54.27745, 22.33767) /* finalPoint */, 191'963 /* expectedRouteMeters */);
+      integration::GetVehicleComponents(VehicleType::Car), mercator::FromLatLon(55.10055, 22.30228) /* startPoint */,
+      {0.0, 0.0} /* startDirection */, mercator::FromLatLon(54.27745, 22.33767) /* finalPoint */,
+      191'963 /* expectedRouteMeters */);
 }
 
 // In this case the shortest way from Hungary to Slovakia is through Ukraine. But we add penalty for
@@ -78,7 +74,7 @@ UNIT_TEST(CrossCountry_Lithuania_to_Poland)
 UNIT_TEST(CrossCountry_Hungary_to_Slovakia)
 {
   integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Car),
-      mercator::FromLatLon(48.39107, 22.18352) /* startPoint */, {0.0, 0.0} /* startDirection */,
-      mercator::FromLatLon(48.69826, 22.23454) /* finalPoint */, 100'015 /* expectedRouteMeters */);
+      integration::GetVehicleComponents(VehicleType::Car), mercator::FromLatLon(48.39107, 22.18352) /* startPoint */,
+      {0.0, 0.0} /* startDirection */, mercator::FromLatLon(48.69826, 22.23454) /* finalPoint */,
+      100'015 /* expectedRouteMeters */);
 }
diff --git a/libs/routing/routing_integration_tests/get_altitude_test.cpp b/libs/routing/routing_integration_tests/get_altitude_test.cpp
index b7e6df3e6..4c17cb43c 100644
--- a/libs/routing/routing_integration_tests/get_altitude_test.cpp
+++ b/libs/routing/routing_integration_tests/get_altitude_test.cpp
@@ -57,8 +57,7 @@ public:
   MwmValue const * GetValue() { return m_handle.GetValue(); }
 };
 
-void TestAltitudeOfAllMwmFeatures(string const & countryId,
-                                  Altitude const altitudeLowerBoundMeters,
+void TestAltitudeOfAllMwmFeatures(string const & countryId, Altitude const altitudeLowerBoundMeters,
                                   Altitude const altitudeUpperBoundMeters)
 {
   FeaturesGuard features(countryId);
@@ -89,8 +88,7 @@ UNIT_TEST(GetAltitude_AllMwmFeaturesTest)
 {
   classificator::Load();
 
-  TestAltitudeOfAllMwmFeatures("Russia_Moscow", 50 /* altitudeLowerBoundMeters */,
-                               300 /* altitudeUpperBoundMeters */);
+  TestAltitudeOfAllMwmFeatures("Russia_Moscow", 50 /* altitudeLowerBoundMeters */, 300 /* altitudeUpperBoundMeters */);
   TestAltitudeOfAllMwmFeatures("Nepal_Kathmandu", 250 /* altitudeLowerBoundMeters */,
                                6000 /* altitudeUpperBoundMeters */);
   TestAltitudeOfAllMwmFeatures("Netherlands_North Holland_Amsterdam", -25 /* altitudeLowerBoundMeters */,
diff --git a/libs/routing/routing_integration_tests/guides_tests.cpp b/libs/routing/routing_integration_tests/guides_tests.cpp
index 2a5556557..911ed7785 100644
--- a/libs/routing/routing_integration_tests/guides_tests.cpp
+++ b/libs/routing/routing_integration_tests/guides_tests.cpp
@@ -47,8 +47,7 @@ void ReverseCheckpoints(Checkpoints const & checkpoints)
 UNIT_TEST(Guides_TwoPointsOnTrack)
 {
   // Checkpoints lie on the track.
-  Checkpoints const checkpoints{mercator::FromLatLon(48.14367, 11.57257),
-                                mercator::FromLatLon(48.13999, 11.56873)};
+  Checkpoints const checkpoints{mercator::FromLatLon(48.14367, 11.57257), mercator::FromLatLon(48.13999, 11.56873)};
 
   double const expectedDistM = 600.8;
   double const expectedTimeS = 721.0;
@@ -64,8 +63,7 @@ UNIT_TEST(Guides_TwoPointsOnTrack)
 UNIT_TEST(Guides_TwoPointsOnTrackOneViaOsm)
 {
   // Start is further from track then |kEqDistToTrackPointM|, but finish is closer.
-  Checkpoints const checkpoints{mercator::FromLatLon(48.13998, 11.56982),
-                                mercator::FromLatLon(48.14448, 11.57259)};
+  Checkpoints const checkpoints{mercator::FromLatLon(48.13998, 11.56982), mercator::FromLatLon(48.14448, 11.57259)};
 
   double const expectedDistM = 788.681;
   double const expectedTimeS = 903.3;
@@ -91,8 +89,7 @@ UNIT_TEST(Guides_FinishPointOnTrack)
 // route through the track and the second part - through the OSM roads.
 UNIT_TEST(Guides_StartPointOnTrack)
 {
-  Checkpoints const checkpoints{mercator::FromLatLon(48.14168, 11.57244),
-                                mercator::FromLatLon(48.13741, 11.56095)};
+  Checkpoints const checkpoints{mercator::FromLatLon(48.14168, 11.57244), mercator::FromLatLon(48.13741, 11.56095)};
 
   TestGuideRoute(checkpoints, 1200.45 /* expectedDistM */, 1056.45 /* expectedTimeS */, 52 /* expectedPointsCount */);
 }
@@ -100,11 +97,10 @@ UNIT_TEST(Guides_StartPointOnTrack)
 // Start and finish lie on the track; 3 intermediate points are far away from the track.
 UNIT_TEST(Guides_MultipleIntermediatePoints)
 {
-  Checkpoints const checkpoints(
-      {mercator::FromLatLon(48.14403, 11.57259), mercator::FromLatLon(48.14439, 11.57480),
-       mercator::FromLatLon(48.14192, 11.57548), mercator::FromLatLon(48.14106, 11.57279),
-       mercator::FromLatLon(48.14044, 11.57061)});
+  Checkpoints const checkpoints({mercator::FromLatLon(48.14403, 11.57259), mercator::FromLatLon(48.14439, 11.57480),
+                                 mercator::FromLatLon(48.14192, 11.57548), mercator::FromLatLon(48.14106, 11.57279),
+                                 mercator::FromLatLon(48.14044, 11.57061)});
 
   TestGuideRoute(checkpoints, 1231.91 /* expectedDistM */, 1042.65 /* expectedTimeS */, 67 /* expectedPointsCount */);
 }
-} // namespace guides_tests
+}  // namespace guides_tests
diff --git a/libs/routing/routing_integration_tests/pedestrian_route_test.cpp b/libs/routing/routing_integration_tests/pedestrian_route_test.cpp
index 85fc2894c..785f628f7 100644
--- a/libs/routing/routing_integration_tests/pedestrian_route_test.cpp
+++ b/libs/routing/routing_integration_tests/pedestrian_route_test.cpp
@@ -6,7 +6,6 @@
 
 #include "geometry/mercator.hpp"
 
-
 namespace pedestrian_route_test
 {
 using namespace routing;
@@ -16,50 +15,44 @@ using mercator::FromLatLon;
 
 UNIT_TEST(GermanyBremenJunctionToCycleway)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(52.41947, 10.75148), {0., 0.},
-      mercator::FromLatLon(52.41868, 10.75274), 137.);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(52.41947, 10.75148), {0., 0.},
+                                                mercator::FromLatLon(52.41868, 10.75274), 137.);
 }
 
 UNIT_TEST(Zgrad424aTo1207)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(55.9963, 37.2036), {0., 0.},
-      mercator::FromLatLon(55.9955, 37.1948), 659.213);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(55.9963, 37.2036), {0., 0.},
+                                                mercator::FromLatLon(55.9955, 37.1948), 659.213);
 }
 
 UNIT_TEST(Zgrad924aTo418)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(55.9844, 37.1808), {0., 0.},
-      mercator::FromLatLon(55.9999, 37.2021), 2447.75);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(55.9844, 37.1808), {0., 0.},
+                                                mercator::FromLatLon(55.9999, 37.2021), 2447.75);
 }
 
 UNIT_TEST(Zgrad924aToFilaretovskyChurch)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(55.9844, 37.1808), {0., 0.},
-      mercator::FromLatLon(55.9915, 37.1808), 1194.84);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(55.9844, 37.1808), {0., 0.},
+                                                mercator::FromLatLon(55.9915, 37.1808), 1194.84);
 }
 
 UNIT_TEST(Zgrad924aTo1145)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(55.9844, 37.1808), {0., 0.},
-      mercator::FromLatLon(55.9924, 37.1853), 1162.74);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(55.9844, 37.1808), {0., 0.},
+                                                mercator::FromLatLon(55.9924, 37.1853), 1162.74);
 }
 
 UNIT_TEST(MoscowMuzeonToLebedinoeOzeroGorkyPark)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(55.7348, 37.606), {0., 0.},
-      mercator::FromLatLon(55.724, 37.5956), 1640.0);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(55.7348, 37.606), {0., 0.},
+                                                mercator::FromLatLon(55.724, 37.5956), 1640.0);
 }
 
 UNIT_TEST(Zgrad315parkingToMusicSchoolBus_BadRoute)
@@ -71,338 +64,297 @@ UNIT_TEST(Zgrad315parkingToMusicSchoolBus_BadRoute)
   //     mercator::FromLatLon(55.999963, 37.2179159), 164.);
 
   // A bit far end point and the route is ok.
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(55.9996, 37.2174), {0., 0.},
-      mercator::FromLatLon(55.9999757, 37.217925), 165.423);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(55.9996, 37.2174), {0., 0.},
+                                                mercator::FromLatLon(55.9999757, 37.217925), 165.423);
 }
 
 UNIT_TEST(Zgrad924aToKrukovo)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(55.9844, 37.1808), {0., 0.},
-      mercator::FromLatLon(55.9802, 37.1736), 1030);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(55.9844, 37.1808), {0., 0.},
+                                                mercator::FromLatLon(55.9802, 37.1736), 1030);
 }
 
 UNIT_TEST(MoscowMailRuStarbucksToPetrovskoRazumovskyAlley)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(55.7971, 37.5376), {0., 0.},
-      mercator::FromLatLon(55.7953, 37.5597), 1802.31);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(55.7971, 37.5376), {0., 0.},
+                                                mercator::FromLatLon(55.7953, 37.5597), 1802.31);
 }
 
 UNIT_TEST(AustraliaMelburn_AvoidMotorway)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(-37.7936, 144.985), {0., 0.},
-      mercator::FromLatLon(-37.7896, 145.025), 4659.5);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(-37.7936, 144.985), {0., 0.},
+                                                mercator::FromLatLon(-37.7896, 145.025), 4659.5);
 }
 
 UNIT_TEST(AustriaWein_AvoidTrunk)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(48.233, 16.3562), {0., 0.},
-      mercator::FromLatLon(48.2458, 16.3704), 2172.23);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(48.233, 16.3562), {0., 0.},
+                                                mercator::FromLatLon(48.2458, 16.3704), 2172.23);
 }
 
 UNIT_TEST(FranceParis_AvoidBridleway)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(48.859, 2.25452), {0., 0.},
-      mercator::FromLatLon(48.8634, 2.24315), 1049.);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(48.859, 2.25452), {0., 0.},
+                                                mercator::FromLatLon(48.8634, 2.24315), 1049.);
 }
 
 UNIT_TEST(HungaryBudapest_AvoidMotorway)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(47.56566, 19.14942), {0., 0.},
-      mercator::FromLatLon(47.593, 19.24018), 10179.6);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(47.56566, 19.14942), {0., 0.},
+                                                mercator::FromLatLon(47.593, 19.24018), 10179.6);
 }
 
 UNIT_TEST(PolandWarshaw_AvoidCycleway)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(52.2487, 21.0173), {0., 0.},
-      mercator::FromLatLon(52.25, 21.0164), 182.);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(52.2487, 21.0173), {0., 0.},
+                                                mercator::FromLatLon(52.25, 21.0164), 182.);
 }
 
 UNIT_TEST(SwedenStockholmSlussenHiltonToMaritimeMuseum)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(59.32046, 18.06924), {0.0, 0.0},
-      mercator::FromLatLon(59.32751, 18.09092), 3445.22);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(59.32046, 18.06924), {0.0, 0.0},
+                                                mercator::FromLatLon(59.32751, 18.09092), 3445.22);
 }
 
 UNIT_TEST(SwedenStockholmSlussenHiltonToAfChapmanHostel)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(59.32045, 18.06928), {0., 0.},
-      mercator::FromLatLon(59.3254, 18.08022), 2170.87);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(59.32045, 18.06928), {0., 0.},
+                                                mercator::FromLatLon(59.3254, 18.08022), 2170.87);
 }
 
 UNIT_TEST(EstoniaTallinnRadissonHiltonToCatherdalChurch)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(59.4362, 24.7682), {0., 0.},
-      mercator::FromLatLon(59.437, 24.7392), 1972.54);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(59.4362, 24.7682), {0., 0.},
+                                                mercator::FromLatLon(59.437, 24.7392), 1972.54);
 }
 
 UNIT_TEST(EstoniaTallinnRadissonHiltonToSkypeOffice)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(59.4362, 24.7682), {0., 0.},
-      mercator::FromLatLon(59.3971, 24.661), 8673.);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(59.4362, 24.7682), {0., 0.},
+                                                mercator::FromLatLon(59.3971, 24.661), 8673.);
 }
 
 UNIT_TEST(BelarusMinksHotelYubileyniToChurchSaintsSimonAndHelen)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(53.9112, 27.5466), {0., 0.},
-      mercator::FromLatLon(53.8965, 27.5476), 2151.28);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(53.9112, 27.5466), {0., 0.},
+                                                mercator::FromLatLon(53.8965, 27.5476), 2151.28);
 }
 
 UNIT_TEST(BelarusMinksBarURatushiToMoscowBusStation)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(53.9045, 27.5569), {0., 0.},
-      mercator::FromLatLon(53.889, 27.5466), 2395.3);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(53.9045, 27.5569), {0., 0.},
+                                                mercator::FromLatLon(53.889, 27.5466), 2395.3);
 }
 
 UNIT_TEST(BelarusBobruisk50LetVlksmToSanatoryShinnik)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(53.1638, 29.1804), {0., 0.},
-      mercator::FromLatLon(53.179, 29.1682), 2400.);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(53.1638, 29.1804), {0., 0.},
+                                                mercator::FromLatLon(53.179, 29.1682), 2400.);
 }
 
 UNIT_TEST(BelarusBobruisk50LetVlksmToArena)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(53.1638, 29.1804), {0., 0.},
-      mercator::FromLatLon(53.1424, 29.2467), 6123.0);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(53.1638, 29.1804), {0., 0.},
+                                                mercator::FromLatLon(53.1424, 29.2467), 6123.0);
 }
 
 UNIT_TEST(RussiaTaganrogSyzranov10k3ToSoftech)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(47.2183, 38.8634), {0., 0.},
-      mercator::FromLatLon(47.2, 38.8878), 3752.68);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(47.2183, 38.8634), {0., 0.},
+                                                mercator::FromLatLon(47.2, 38.8878), 3752.68);
 }
 
 UNIT_TEST(RussiaTaganrogSyzranov10k3ToTruseE)
 {
   // In the end prefers longer footway instead of secondary (no other tags).
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(47.2183, 38.8634), {0., 0.},
-      mercator::FromLatLon(47.2048, 38.9441), 7536.52);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(47.2183, 38.8634), {0., 0.},
+                                                mercator::FromLatLon(47.2048, 38.9441), 7536.52);
 }
 
 UNIT_TEST(RussiaTaganrogSyzranov10k3ToLazo5k2)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(47.2183, 38.8634), {0., 0.},
-      mercator::FromLatLon(47.2584, 38.9128), 7563.05);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(47.2183, 38.8634), {0., 0.},
+                                                mercator::FromLatLon(47.2584, 38.9128), 7563.05);
 }
 
 UNIT_TEST(RussiaTaganrogJukova2ToBolBulvarnaya8)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(47.2768, 38.9282), {0., 0.},
-      mercator::FromLatLon(47.2412, 38.8902), 6239.);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(47.2768, 38.9282), {0., 0.},
+                                                mercator::FromLatLon(47.2412, 38.8902), 6239.);
 }
 
 UNIT_TEST(RussiaTaganrogCheckhova267k2ToKotlostroy33)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(47.2200, 38.8906), {0., 0.},
-      mercator::FromLatLon(47.2459, 38.8937), 3485.);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(47.2200, 38.8906), {0., 0.},
+                                                mercator::FromLatLon(47.2459, 38.8937), 3485.);
 }
 
 UNIT_TEST(RussiaTaganrogCheckhova267k2ToBolBulvarnaya8)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(47.2200, 38.8906), {0., 0.},
-      mercator::FromLatLon(47.2412, 38.8902), 2834.47);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(47.2200, 38.8906), {0., 0.},
+                                                mercator::FromLatLon(47.2412, 38.8902), 2834.47);
 }
 
 UNIT_TEST(RussiaRostovOnDonPrKosmonavtovToDneprovsky120b)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(47.2811, 39.7178), {0., 0.},
-      mercator::FromLatLon(47.2875, 39.759), 4300.);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(47.2811, 39.7178), {0., 0.},
+                                                mercator::FromLatLon(47.2875, 39.759), 4300.);
 }
 
 UNIT_TEST(TurkeyKemerPalmetResortToYachtClub)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(36.6143, 30.5572), {0., 0.},
-      mercator::FromLatLon(36.6004, 30.576), 2992.);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(36.6143, 30.5572), {0., 0.},
+                                                mercator::FromLatLon(36.6004, 30.576), 2992.);
 }
 
 UNIT_TEST(CzechPragueNode5ToHilton)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(50.0653, 14.4031), {0., 0.},
-      mercator::FromLatLon(50.0933, 14.4397), 5106.);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(50.0653, 14.4031), {0., 0.},
+                                                mercator::FromLatLon(50.0933, 14.4397), 5106.);
 }
 
 /// @todo Here maybe some +-100m differencies. OM workd like OSRM here.
 /// @{
 UNIT_TEST(CzechPragueHiltonToKarlovMost)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(50.0933, 14.4397), {0., 0.},
-      mercator::FromLatLon(50.0864, 14.4124), 2483);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(50.0933, 14.4397), {0., 0.},
+                                                mercator::FromLatLon(50.0864, 14.4124), 2483);
 }
 
 UNIT_TEST(CzechPragueHiltonToNicholasChurch)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(50.0933, 14.4397), {0., 0.},
-      mercator::FromLatLon(50.088, 14.4032), 3196);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(50.0933, 14.4397), {0., 0.},
+                                                mercator::FromLatLon(50.088, 14.4032), 3196);
 }
 /// @}
 
 UNIT_TEST(CzechPragueHiltonToKvetniceViewpoint)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(50.0933, 14.4397), {0., 0.},
-      mercator::FromLatLon(50.0806, 14.3973), 4649.68);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(50.0933, 14.4397), {0., 0.},
+                                                mercator::FromLatLon(50.0806, 14.3973), 4649.68);
 }
 
 UNIT_TEST(RussiaSaintPetersburgMoyka93ToAlexanderColumn)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(59.9241, 30.323), {0., 0.},
-      mercator::FromLatLon(59.939, 30.3159), 2307.17);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(59.9241, 30.323), {0., 0.},
+                                                mercator::FromLatLon(59.939, 30.3159), 2307.17);
 }
 
 UNIT_TEST(RussiaSaintPetersburgMoyka93ToMarsovoPole)
 {
   // OM follows left bank of Griboedova, while can keep right bank and make a small detour around church.
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(59.9241, 30.323), {0., 0.},
-      mercator::FromLatLon(59.9436, 30.3318), 2755);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(59.9241, 30.323), {0., 0.},
+                                                mercator::FromLatLon(59.9436, 30.3318), 2755);
 }
 
 UNIT_TEST(RussiaSaintPetersburgMoyka93ToAvrora)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(59.9241, 30.323), {0., 0.},
-      mercator::FromLatLon(59.9554, 30.3378), 4614.66);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(59.9241, 30.323), {0., 0.},
+                                                mercator::FromLatLon(59.9554, 30.3378), 4614.66);
 }
 
 UNIT_TEST(RussiaSaintPetersburgPetrPaulChurchToDolphins)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(59.9502, 30.3165), {0., 0.},
-      mercator::FromLatLon(59.973, 30.2702), 4507.);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(59.9502, 30.3165), {0., 0.},
+                                                mercator::FromLatLon(59.973, 30.2702), 4507.);
 }
 
 UNIT_TEST(RussiaPetergofEntranceToErmitagePalace)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(59.8806, 29.904), {0., 0.},
-      mercator::FromLatLon(59.8889, 29.9034), 1073.);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(59.8806, 29.904), {0., 0.},
+                                                mercator::FromLatLon(59.8889, 29.9034), 1073.);
 }
 
 UNIT_TEST(RussiaPetergofMarlyPalaceToTrainStation)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(59.8887, 29.8963), {0., 0.},
-      mercator::FromLatLon(59.8648, 29.9251), 3885.);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(59.8887, 29.8963), {0., 0.},
+                                                mercator::FromLatLon(59.8648, 29.9251), 3885.);
 }
 
 UNIT_TEST(RussiaMoscowMailRuToTsarCannon)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(55.79703, 37.53761), {0., 0.},
-      mercator::FromLatLon(55.75146, 37.61792), 7989.);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(55.79703, 37.53761), {0., 0.},
+                                                mercator::FromLatLon(55.75146, 37.61792), 7989.);
 }
 
 UNIT_TEST(RussiaMoscowHovrinoStationToKasperskyLab)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(55.8701, 37.50833), {0., 0.},
-      mercator::FromLatLon(55.83715, 37.48132), 5162.);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(55.8701, 37.50833), {0., 0.},
+                                                mercator::FromLatLon(55.83715, 37.48132), 5162.);
 }
 
 UNIT_TEST(ItalyRome_WalkOverStreetWithSidewalkBoth)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(41.9052, 12.4106), {0., 0.},
-      mercator::FromLatLon(41.9226, 12.4216), 2413.);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(41.9052, 12.4106), {0., 0.},
+                                                mercator::FromLatLon(41.9226, 12.4216), 2413.);
 }
 
 UNIT_TEST(USARedlandsEsriHQToRedlandsCommunity)
 {
   // OM makes like OSRM with footway.
   // Valhalla uses shorter South San Mateo + West Olive.
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(34.0556, -117.19567), {0., 0.},
-      mercator::FromLatLon(34.03682, -117.20649), 3212.65);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(34.0556, -117.19567), {0., 0.},
+                                                mercator::FromLatLon(34.03682, -117.20649), 3212.65);
 }
 
 UNIT_TEST(USANewYorkEmpireStateBuildingToUnitedNations)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(40.74844, -73.98566), {0., 0.},
-      mercator::FromLatLon(40.75047, -73.96759), 2265.);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(40.74844, -73.98566), {0., 0.},
+                                                mercator::FromLatLon(40.75047, -73.96759), 2265.);
 }
 
 // Test on walking around a ford on an mwm border.
 UNIT_TEST(CrossMwmRussiaPStaiToBelarusDrazdy)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(55.014, 30.95552), {0., 0.},
-      mercator::FromLatLon(55.01437, 30.8858), 4835.76);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(55.014, 30.95552), {0., 0.},
+                                                mercator::FromLatLon(55.01437, 30.8858), 4835.76);
 }
 
 UNIT_TEST(Russia_ZgradPanfilovskyUndergroundCrossing_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Pedestrian),
-                                  mercator::FromLatLon(55.98401, 37.17979), {0., 0.},
-                                  mercator::FromLatLon(55.98419, 37.17938));
+  TRouteResult const routeResult = integration::CalculateRoute(
+      integration::GetVehicleComponents(VehicleType::Pedestrian), mercator::FromLatLon(55.98401, 37.17979), {0., 0.},
+      mercator::FromLatLon(55.98419, 37.17938));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -421,10 +373,9 @@ UNIT_TEST(Russia_ZgradPanfilovskyUndergroundCrossing_TurnTest)
 
 UNIT_TEST(Russia_Moscow_HydroprojectBridgeCrossing_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Pedestrian),
-                                  mercator::FromLatLon(55.80867, 37.50575), {0., 0.},
-                                  mercator::FromLatLon(55.80884, 37.50668));
+  TRouteResult const routeResult = integration::CalculateRoute(
+      integration::GetVehicleComponents(VehicleType::Pedestrian), mercator::FromLatLon(55.80867, 37.50575), {0., 0.},
+      mercator::FromLatLon(55.80884, 37.50668));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -446,10 +397,9 @@ UNIT_TEST(Russia_Moscow_HydroprojectBridgeCrossing_TurnTest)
 
 UNIT_TEST(Belarus_Minsk_RenaissanceHotelUndergroundCross_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Pedestrian),
-                                  mercator::FromLatLon(53.89296, 27.52775), {0., 0.},
-                                  mercator::FromLatLon(53.89262, 27.52838));
+  TRouteResult const routeResult = integration::CalculateRoute(
+      integration::GetVehicleComponents(VehicleType::Pedestrian), mercator::FromLatLon(53.89296, 27.52775), {0., 0.},
+      mercator::FromLatLon(53.89262, 27.52838));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -470,17 +420,16 @@ UNIT_TEST(Belarus_Minsk_RenaissanceHotelUndergroundCross_TurnTest)
 
 UNIT_TEST(MoscowVodnyStadiumHighwayPlatform)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(55.83955, 37.48692), {0., 0.},
-      mercator::FromLatLon(55.84061, 37.48636), 136.115);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(55.83955, 37.48692), {0., 0.},
+                                                mercator::FromLatLon(55.84061, 37.48636), 136.115);
 }
 
 UNIT_TEST(Russia_Moscow_SevTushinoParkPedestrianOnePoint_TurnTest)
 {
   m2::PointD const point = mercator::FromLatLon(55.8719, 37.4464);
-  TRouteResult const routeResult = integration::CalculateRoute(
-      integration::GetVehicleComponents(VehicleType::Pedestrian), point, {0.0, 0.0}, point);
+  TRouteResult const routeResult =
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Pedestrian), point, {0.0, 0.0}, point);
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -493,10 +442,9 @@ UNIT_TEST(Russia_Moscow_SevTushinoParkPedestrianOnePoint_TurnTest)
 
 UNIT_TEST(MoscowKashirskoe16ToVorobeviGori)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(55.66230, 37.63214), {0., 0.},
-      mercator::FromLatLon(55.70934, 37.54232), 9232.81);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(55.66230, 37.63214), {0., 0.},
+                                                mercator::FromLatLon(55.70934, 37.54232), 9232.81);
 }
 
 // Test on building pedestrian route past ferry.
@@ -506,36 +454,32 @@ UNIT_TEST(SwitzerlandSaintBlaisePedestrianPastFerry)
   // Check with intermediate point {47.0098, 6.9770}
 
   /// @todo After reducing GetFerryLandingPenalty, the app takes ferry here (1184 meters, 708 seconds).
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(47.010336, 6.982954), {0.0, 0.0},
-      mercator::FromLatLon(47.005817, 6.970227), 1662.43);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(47.010336, 6.982954), {0.0, 0.0},
+                                                mercator::FromLatLon(47.005817, 6.970227), 1662.43);
 }
 
 // Test on building pedestrian route past ferry.
 UNIT_TEST(NetherlandsAmsterdamPedestrianPastFerry)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(52.38075, 4.89938), {0.0, 0.0},
-      mercator::FromLatLon(52.40194, 4.89038), 2553.18);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(52.38075, 4.89938), {0.0, 0.0},
+                                                mercator::FromLatLon(52.40194, 4.89038), 2553.18);
 }
 
 // Test on building pedestrian route past ferry.
 UNIT_TEST(ItalyVenicePedestrianPastFerry)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(45.4375, 12.33549), {0.0, 0.0},
-      mercator::FromLatLon(45.44057, 12.33393), 725.4);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(45.4375, 12.33549), {0.0, 0.0},
+                                                mercator::FromLatLon(45.44057, 12.33393), 725.4);
 }
 
 // Test on climbing from Priut11 to Elbrus mountain.
 UNIT_TEST(RussiaPriut11Elbrus)
 {
   integration::CalculateRouteAndTestRouteTime(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(43.31475, 42.46035), {0., 0.},
+      integration::GetVehicleComponents(VehicleType::Pedestrian), mercator::FromLatLon(43.31475, 42.46035), {0., 0.},
       mercator::FromLatLon(43.35254, 42.43788), 37753.4 /* expectedTimeSeconds */);
 }
 
@@ -543,34 +487,31 @@ UNIT_TEST(RussiaPriut11Elbrus)
 UNIT_TEST(RussiaElbrusPriut11)
 {
   integration::CalculateRouteAndTestRouteTime(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(43.35254, 42.43788), {0., 0.},
+      integration::GetVehicleComponents(VehicleType::Pedestrian), mercator::FromLatLon(43.35254, 42.43788), {0., 0.},
       mercator::FromLatLon(43.31475, 42.46035), 15878.9 /* expectedTimeSeconds */);
 }
 
 // Test on going straight forward on primary road.
 UNIT_TEST(BudvaPrimaryRoad)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(42.2884527, 18.8456794), {0., 0.},
-      mercator::FromLatLon(42.2880575, 18.8492896), 412.66);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(42.2884527, 18.8456794), {0., 0.},
+                                                mercator::FromLatLon(42.2880575, 18.8492896), 412.66);
 }
 
 // Test on start and finish route which lies on a feature crossed by a mwm border and a ford.
 UNIT_TEST(RussiaSmolenskAriaFeatureCrossingBorderWithFord)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(55.01727, 30.91566), {0., 0.},
-      mercator::FromLatLon(55.01867, 30.91285), 298.6);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(55.01727, 30.91566), {0., 0.},
+                                                mercator::FromLatLon(55.01867, 30.91285), 298.6);
 }
 
 UNIT_TEST(NoTurnOnForkingRoad_TurnTest)
 {
   TRouteResult const routeResult = integration::CalculateRoute(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(55.67505, 37.51851), {0.0, 0.0}, mercator::FromLatLon(55.6748507, 37.5177359));
+      integration::GetVehicleComponents(VehicleType::Pedestrian), mercator::FromLatLon(55.67505, 37.51851), {0.0, 0.0},
+      mercator::FromLatLon(55.6748507, 37.5177359));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -588,8 +529,8 @@ UNIT_TEST(NoTurnOnForkingRoad_TurnTest)
 UNIT_TEST(NoTurnOnForkingRoad2_TurnTest)
 {
   TRouteResult const routeResult = integration::CalculateRoute(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(55.68336, 37.49492), {0.0, 0.0}, mercator::FromLatLon(55.68488, 37.49789));
+      integration::GetVehicleComponents(VehicleType::Pedestrian), mercator::FromLatLon(55.68336, 37.49492), {0.0, 0.0},
+      mercator::FromLatLon(55.68488, 37.49789));
 
   TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ());
   TEST(routeResult.first, ());
@@ -609,10 +550,9 @@ UNIT_TEST(NoTurnOnForkingRoad2_TurnTest)
 
 UNIT_TEST(Hungary_UseFootways)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(45.8587043, 18.2863972), {0., 0.},
-      mercator::FromLatLon(45.858625, 18.285348), 95.7657);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(45.8587043, 18.2863972), {0., 0.},
+                                                mercator::FromLatLon(45.858625, 18.285348), 95.7657);
 }
 
 UNIT_TEST(France_Uphill_Downlhill)
@@ -622,9 +562,9 @@ UNIT_TEST(France_Uphill_Downlhill)
 
   double timeDownhill, timeUphill;
   {
-    TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Pedestrian),
-        FromLatLon(45.32111, 3.69535), {0., 0.},
-        FromLatLon(45.235327, 3.857533));
+    TRouteResult const routeResult =
+        CalculateRoute(GetVehicleComponents(VehicleType::Pedestrian), FromLatLon(45.32111, 3.69535), {0., 0.},
+                       FromLatLon(45.235327, 3.857533));
 
     TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ());
     TEST(routeResult.first, ());
@@ -636,9 +576,9 @@ UNIT_TEST(France_Uphill_Downlhill)
   }
 
   {
-    TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Pedestrian),
-        FromLatLon(45.235327, 3.857533), {0., 0.},
-        FromLatLon(45.32111, 3.69535));
+    TRouteResult const routeResult =
+        CalculateRoute(GetVehicleComponents(VehicleType::Pedestrian), FromLatLon(45.235327, 3.857533), {0., 0.},
+                       FromLatLon(45.32111, 3.69535));
 
     TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ());
     TEST(routeResult.first, ());
@@ -655,26 +595,23 @@ UNIT_TEST(France_Uphill_Downlhill)
 // https://github.com/organicmaps/organicmaps/issues/1342
 UNIT_TEST(Crimea_Altitude_Mountains)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(44.7600296, 34.3247698), {0., 0.},
-      mercator::FromLatLon(44.7632754, 34.313077), 1303.43);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(44.7600296, 34.3247698), {0., 0.},
+                                                mercator::FromLatLon(44.7632754, 34.313077), 1303.43);
 }
 
 // https://github.com/organicmaps/organicmaps/issues/2803
 UNIT_TEST(Italy_Rome_Altitude_Footway)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(41.899384, 12.4980887), {0., 0.},
-      mercator::FromLatLon(41.9007759, 12.4994956), 203.861);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(41.899384, 12.4980887), {0., 0.},
+                                                mercator::FromLatLon(41.9007759, 12.4994956), 203.861);
 }
 
 UNIT_TEST(Romania_Mountains_ETA)
 {
   TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Pedestrian),
-      FromLatLon(45.5450, 25.2584), {0., 0.},
-      FromLatLon(45.5223, 25.2806));
+                                                  FromLatLon(45.5450, 25.2584), {0., 0.}, FromLatLon(45.5223, 25.2806));
 
   TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ());
   TEST(routeResult.first, ());
@@ -688,18 +625,17 @@ UNIT_TEST(Romania_Mountains_ETA)
 // Check piligrim routes here: www santiago.nl/downloads/
 UNIT_TEST(Spain_N634_Piligrim_Road)
 {
-  integration::CalculateRouteAndTestRouteLength(
-      integration::GetVehicleComponents(VehicleType::Pedestrian),
-      mercator::FromLatLon(43.5488528, -6.4696861), {0., 0.},
-      mercator::FromLatLon(43.5435194, -6.5340694), 7217.93);
+  integration::CalculateRouteAndTestRouteLength(integration::GetVehicleComponents(VehicleType::Pedestrian),
+                                                mercator::FromLatLon(43.5488528, -6.4696861), {0., 0.},
+                                                mercator::FromLatLon(43.5435194, -6.5340694), 7217.93);
 }
 
 // https://github.com/organicmaps/organicmaps/issues/5410
 UNIT_TEST(Australia_Mountains_Downlhill)
 {
-  TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Pedestrian),
-                                                  FromLatLon(-33.7374217, 150.283098), {0., 0.},
-                                                  FromLatLon(-33.7375399, 150.283358));
+  TRouteResult const routeResult =
+      CalculateRoute(GetVehicleComponents(VehicleType::Pedestrian), FromLatLon(-33.7374217, 150.283098), {0., 0.},
+                     FromLatLon(-33.7375399, 150.283358));
 
   TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ());
   TEST(routeResult.first, ());
@@ -713,20 +649,18 @@ UNIT_TEST(Australia_Mountains_Downlhill)
 
 UNIT_TEST(Turkey_UsePrimary)
 {
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Pedestrian),
-      FromLatLon(38.7352697, 35.516104), {0., 0.},
-      FromLatLon(38.7398797, 35.5170627), 679.702);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Pedestrian), FromLatLon(38.7352697, 35.516104),
+                                   {0., 0.}, FromLatLon(38.7398797, 35.5170627), 679.702);
 
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Pedestrian),
-      FromLatLon(38.7168708, 35.4903164), {0., 0.},
-      FromLatLon(38.7207386, 35.4811178), 1050.39);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Pedestrian), FromLatLon(38.7168708, 35.4903164),
+                                   {0., 0.}, FromLatLon(38.7207386, 35.4811178), 1050.39);
 }
 
 UNIT_TEST(Georgia_UsePrimary)
 {
-  TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Pedestrian),
-                                                  FromLatLon(42.7175722, 42.0496444), {0., 0.},
-                                                  FromLatLon(43.0451, 42.3742778));
+  TRouteResult const routeResult =
+      CalculateRoute(GetVehicleComponents(VehicleType::Pedestrian), FromLatLon(42.7175722, 42.0496444), {0., 0.},
+                     FromLatLon(43.0451, 42.3742778));
 
   TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ());
   TEST(routeResult.first, ());
@@ -737,4 +671,4 @@ UNIT_TEST(Georgia_UsePrimary)
   TEST(22 * 3600 < eta && eta < 24 * 3600, (eta));
 }
 
-} // namespace pedestrian_route_test
+}  // namespace pedestrian_route_test
diff --git a/libs/routing/routing_integration_tests/road_graph_tests.cpp b/libs/routing/routing_integration_tests/road_graph_tests.cpp
index a244f96e8..8a6966d35 100644
--- a/libs/routing/routing_integration_tests/road_graph_tests.cpp
+++ b/libs/routing/routing_integration_tests/road_graph_tests.cpp
@@ -10,9 +10,9 @@
 #include "indexer/feature_altitude.hpp"
 #include "indexer/mwm_set.hpp"
 
-#include "routing_common/car_model.hpp"
 #include "routing/features_road_graph.hpp"
 #include "routing/road_graph.hpp"
+#include "routing_common/car_model.hpp"
 
 #include "routing/routing_integration_tests/routing_test_tools.hpp"
 
@@ -46,8 +46,7 @@ UNIT_TEST(FakeEdgesCombinatorialExplosion)
   geometry::PointWithAltitude const j(m2::PointD(mercator::FromLatLon(50.73208, -1.21279)),
                                       geometry::kDefaultAltitudeMeters);
   std::vector<std::pair<routing::Edge, geometry::PointWithAltitude>> sourceVicinity;
-  graph.FindClosestEdges(mercator::RectByCenterXYAndSizeInMeters(
-                             j.GetPoint(), FeaturesRoadGraph::kClosestEdgesRadiusM),
+  graph.FindClosestEdges(mercator::RectByCenterXYAndSizeInMeters(j.GetPoint(), FeaturesRoadGraph::kClosestEdgesRadiusM),
                          20 /* count */, sourceVicinity);
   // In case of the combinatorial explosion mentioned above all the memory was consumed for
   // FeaturesRoadGraph::m_fakeIngoingEdges and FeaturesRoadGraph::m_fakeOutgoingEdges fields.
diff --git a/libs/routing/routing_integration_tests/roundabouts_tests.cpp b/libs/routing/routing_integration_tests/roundabouts_tests.cpp
index e3e52aa48..7614b1958 100644
--- a/libs/routing/routing_integration_tests/roundabouts_tests.cpp
+++ b/libs/routing/routing_integration_tests/roundabouts_tests.cpp
@@ -22,17 +22,16 @@ struct RouteData
 
 UNIT_TEST(MiniRoundabout_CalculateRoute)
 {
-  std::vector<RouteData> const routesWithMiniRoundabouts{
-      {{51.45609, 0.05974}, {51.45562, 0.06005}, 61.3},
-      {{51.49746, -0.40027}, {51.49746, -0.40111}, 65.64},
-      {{55.98700, -3.38256}, {55.98665, -3.38260}, 43.6},
-      {{52.22163, 21.09296}, {52.22189, 21.09286}, 41.5}};
+  std::vector<RouteData> const routesWithMiniRoundabouts{{{51.45609, 0.05974}, {51.45562, 0.06005}, 61.3},
+                                                         {{51.49746, -0.40027}, {51.49746, -0.40111}, 65.64},
+                                                         {{55.98700, -3.38256}, {55.98665, -3.38260}, 43.6},
+                                                         {{52.22163, 21.09296}, {52.22189, 21.09286}, 41.5}};
 
   for (auto const & route : routesWithMiniRoundabouts)
   {
-    TRouteResult const routeResult = integration::CalculateRoute(
-        integration::GetVehicleComponents(VehicleType::Car), mercator::FromLatLon(route.m_start),
-        {0.0, 0.0}, mercator::FromLatLon(route.m_finish));
+    TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                                 mercator::FromLatLon(route.m_start), {0.0, 0.0},
+                                                                 mercator::FromLatLon(route.m_finish));
 
     TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ());
 
diff --git a/libs/routing/routing_integration_tests/route_test.cpp b/libs/routing/routing_integration_tests/route_test.cpp
index 6e02b3a02..14aaf1d83 100644
--- a/libs/routing/routing_integration_tests/route_test.cpp
+++ b/libs/routing/routing_integration_tests/route_test.cpp
@@ -17,100 +17,79 @@ using mercator::FromLatLon;
 
 UNIT_TEST(StrangeCaseInAfrica)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(19.20789, 30.50663), {0., 0.},
-      FromLatLon(19.17289, 30.47315), 7645.0);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(19.20789, 30.50663), {0., 0.},
+                                   FromLatLon(19.17289, 30.47315), 7645.0);
 }
 
 UNIT_TEST(MoscowKashirskoeShosseCrossing)
 {
-  // OSRM agrees here: https://www.openstreetmap.org/directions?engine=fossgis_osrm_car&route=55.66216%2C37.63259%3B55.66237%2C37.63560
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(55.66216, 37.63259), {0., 0.},
-      FromLatLon(55.66237, 37.63560), 2877.81);
+  // OSRM agrees here:
+  // https://www.openstreetmap.org/directions?engine=fossgis_osrm_car&route=55.66216%2C37.63259%3B55.66237%2C37.63560
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(55.66216, 37.63259), {0., 0.},
+                                   FromLatLon(55.66237, 37.63560), 2877.81);
 }
 
 UNIT_TEST(MoscowToSVOAirport)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(55.75100, 37.61790), {0.0, 0.0},
-      FromLatLon(55.97310, 37.41460), 36070.1);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(55.75100, 37.61790), {0.0, 0.0},
+                                   FromLatLon(55.97310, 37.41460), 36070.1);
 
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(55.97310, 37.41460), {0.0, 0.0},
-      FromLatLon(55.75100, 37.61790), 39129.8);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(55.97310, 37.41460), {0.0, 0.0},
+                                   FromLatLon(55.75100, 37.61790), 39129.8);
 }
 
 // Restrictions tests. Check restrictions generation, if there are any errors.
 UNIT_TEST(RestrictionTestNeatBaumanAndTTK)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(55.77398, 37.68469), {0., 0.},
-      FromLatLon(55.77201, 37.68789), 1032.);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(55.77398, 37.68469), {0., 0.},
+                                   FromLatLon(55.77201, 37.68789), 1032.);
 }
 
 UNIT_TEST(RestrictionTestNearMetroShodnenskaya)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(55.85043, 37.43824), {0., 0.},
-      FromLatLon(55.85191, 37.43910), 525.601);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(55.85043, 37.43824), {0., 0.},
+                                   FromLatLon(55.85191, 37.43910), 525.601);
 }
 
 // Strange asserts near Cupertino test
 UNIT_TEST(CaliforniaCupertinoFindPhantomAssertTest)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(37.33409, -122.03458), {0., 0.},
-      FromLatLon(37.33498, -122.03575), 1471.96);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(37.33409, -122.03458), {0., 0.},
+                                   FromLatLon(37.33498, -122.03575), 1471.96);
 }
 
 // Path in the last map through the other map.
 UNIT_TEST(RussiaUfaToUstKatavTest)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(54.7304, 55.9554), {0., 0.},
-      FromLatLon(54.9228, 58.1469), 160565);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(54.7304, 55.9554), {0., 0.},
+                                   FromLatLon(54.9228, 58.1469), 160565);
 }
 
 UNIT_TEST(RussiaMoscowNoServiceCrossing)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(55.77787, 37.70405), {0., 0.},
-      FromLatLon(55.77682, 37.70391), 3140.);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(55.77787, 37.70405), {0., 0.},
+                                   FromLatLon(55.77682, 37.70391), 3140.);
 }
 
 UNIT_TEST(RussiaMoscowShortWayToService)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(55.77787, 37.70405), {0., 0.},
-      FromLatLon(55.77691, 37.70428), 171.);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(55.77787, 37.70405), {0., 0.},
+                                   FromLatLon(55.77691, 37.70428), 171.);
 }
 
 UNIT_TEST(PriceIslandLoadCrossGeometryTest)
 {
   size_t constexpr kExpectedPointsNumber = 56;
   // Forward
-  TRouteResult route = CalculateRoute(GetVehicleComponents(VehicleType::Car),
-                                  FromLatLon(46.16255, -63.81643), {0., 0.},
-                                  FromLatLon(46.25401, -63.70213));
+  TRouteResult route = CalculateRoute(GetVehicleComponents(VehicleType::Car), FromLatLon(46.16255, -63.81643), {0., 0.},
+                                      FromLatLon(46.25401, -63.70213));
   TEST_EQUAL(route.second, RouterResultCode::NoError, ());
   TEST(route.first, ());
   TestRoutePointsNumber(*route.first, kExpectedPointsNumber);
 
   // And backward case
-  route = CalculateRoute(GetVehicleComponents(VehicleType::Car),
-                                  FromLatLon(46.25401, -63.70213), {0., 0.},
-                                  FromLatLon(46.16255, -63.81643));
+  route = CalculateRoute(GetVehicleComponents(VehicleType::Car), FromLatLon(46.25401, -63.70213), {0., 0.},
+                         FromLatLon(46.16255, -63.81643));
   TEST_EQUAL(route.second, RouterResultCode::NoError, ());
   TEST(route.first, ());
   TestRoutePointsNumber(*route.first, kExpectedPointsNumber);
@@ -118,65 +97,52 @@ UNIT_TEST(PriceIslandLoadCrossGeometryTest)
 
 UNIT_TEST(NederlandLeeuwardenToDenOeverTest)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(53.2076, 5.7082), {0., 0.},
-      FromLatLon(52.9337, 5.0308), 59500.);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(53.2076, 5.7082), {0., 0.},
+                                   FromLatLon(52.9337, 5.0308), 59500.);
 }
 
 UNIT_TEST(RussiaMoscowGerPanfilovtsev22SolodchaPravdiRouteTest)
 {
   // OSRM agrees here to use motorways instead of city roads.
   // https://www.openstreetmap.org/directions?engine=fossgis_osrm_car&route=55.858%2C37.410%3B54.794%2C39.837
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(55.85792, 37.40992), {0., 0.},
-      FromLatLon(54.79390, 39.83656), 263920.);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(55.85792, 37.40992), {0., 0.},
+                                   FromLatLon(54.79390, 39.83656), 263920.);
 }
 
 UNIT_TEST(RussiaMoscowBelarusMinsk)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(55.750650, 37.617673), {0., 0.},
-      FromLatLon(53.902114, 27.562020), 712649.0);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(55.750650, 37.617673), {0., 0.},
+                                   FromLatLon(53.902114, 27.562020), 712649.0);
 }
 
 UNIT_TEST(UKRugbyStIvesRouteTest)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(52.37076, -1.26530), {0., 0.},
-      FromLatLon(50.21480, -5.47994), 455902.);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(52.37076, -1.26530), {0., 0.},
+                                   FromLatLon(50.21480, -5.47994), 455902.);
 }
 
 UNIT_TEST(RussiaMoscow_ItalySienaCenter_SplittedMotorway)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(55.79690, 37.53759), {0., 0.},
-      FromLatLon(43.32677, 11.32792), 2870710.);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(55.79690, 37.53759), {0., 0.},
+                                   FromLatLon(43.32677, 11.32792), 2870710.);
 }
 
 UNIT_TEST(PeruSingleRoadTest)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(-14.22061, -73.35969), {0., 0.},
-      FromLatLon(-14.22389, -73.44281), 15900.);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(-14.22061, -73.35969), {0., 0.},
+                                   FromLatLon(-14.22389, -73.44281), 15900.);
 }
 
 UNIT_TEST(RussiaMoscowFranceParisCenterRouteTest)
 {
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-      FromLatLon(55.75271, 37.62618), {0., 0.}, FromLatLon(48.86123, 2.34129), 2840940.);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(55.75271, 37.62618), {0., 0.},
+                                   FromLatLon(48.86123, 2.34129), 2840940.);
 }
 
 UNIT_TEST(EnglandToFranceRouteLeMansTest)
 {
-  TRouteResult const res = CalculateRoute(GetVehicleComponents(VehicleType::Car),
-                                          FromLatLon(51.09276, 1.11369), {0., 0.},
-                                          FromLatLon(50.93317, 1.82737));
+  TRouteResult const res = CalculateRoute(GetVehicleComponents(VehicleType::Car), FromLatLon(51.09276, 1.11369),
+                                          {0., 0.}, FromLatLon(50.93317, 1.82737));
 
   TestRouteLength(*res.first, 63877.4);
   // LeMans shuttle duration is 35 min.
@@ -185,18 +151,14 @@ UNIT_TEST(EnglandToFranceRouteLeMansTest)
 
 UNIT_TEST(RussiaMoscowRegionToBelarusBorder)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(55.464182, 35.943947), {0.0, 0.0},
-      FromLatLon(52.442467, 31.609642), 554000.);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(55.464182, 35.943947), {0.0, 0.0},
+                                   FromLatLon(52.442467, 31.609642), 554000.);
 }
 
 UNIT_TEST(GermanyToTallinCrossMwmRoute)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(48.397416, 16.515289), {0.0, 0.0},
-      FromLatLon(59.437214, 24.745355), 1650000.);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(48.397416, 16.515289), {0.0, 0.0},
+                                   FromLatLon(59.437214, 24.745355), 1650000.);
 }
 
 UNIT_TEST(Russia_Moscow_Leningradskiy39RepublicOfSouthAfricaCapeTownCenterRouteTest)
@@ -206,9 +168,8 @@ UNIT_TEST(Russia_Moscow_Leningradskiy39RepublicOfSouthAfricaCapeTownCenterRouteT
   /// - Google: 15289 km, 198 h (via Europe?!)
   /// - OM: 14486 km, 185 h
   /// - OSRM, Valhalla are failed
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-      FromLatLon(55.79721, 37.53786), {0., 0.},
-      FromLatLon(-33.9286, 18.41837), 14'493'000);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(55.79721, 37.53786), {0., 0.},
+                                   FromLatLon(-33.9286, 18.41837), 14'493'000);
 }
 
 UNIT_TEST(AlbaniaToMontenegroCrossTest)
@@ -216,53 +177,42 @@ UNIT_TEST(AlbaniaToMontenegroCrossTest)
   // Road from Albania to Montenegro. Test turnaround finding at border (when start/stop
   // points are inside borders and one of segments has outside points).
   // Forward
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(42.01535, 19.40044), {0., 0.},
-      FromLatLon(42.01201, 19.36286), 3749);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(42.01535, 19.40044), {0., 0.},
+                                   FromLatLon(42.01201, 19.36286), 3749);
 
   // And backward case
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(42.01201, 19.36286), {0., 0.},
-      FromLatLon(42.01535, 19.40044), 3753);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(42.01201, 19.36286), {0., 0.},
+                                   FromLatLon(42.01535, 19.40044), 3753);
 }
 
 UNIT_TEST(CanadaBridgeCrossToEdwardIsland)
 {
   // Forward
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(46.13418, -63.84656), {0., 0.},
-      FromLatLon(46.26739, -63.63907), 23000.);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(46.13418, -63.84656), {0., 0.},
+                                   FromLatLon(46.26739, -63.63907), 23000.);
 
   // And backward case
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(46.26739, -63.63907), {0., 0.},
-      FromLatLon(46.13418, -63.84656), 23000.);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(46.26739, -63.63907), {0., 0.},
+                                   FromLatLon(46.13418, -63.84656), 23000.);
 }
 
 UNIT_TEST(ParisCrossDestinationInForwardHeapCase)
 {
   // Forward.
   // Updated after fixing primary/trunk factors. Route looks good, but it differs from Valhalla.
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-      FromLatLon(49.85015, 2.24296), {0., 0.},
-      FromLatLon(48.85458, 2.36291), 132906);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(49.85015, 2.24296), {0., 0.},
+                                   FromLatLon(48.85458, 2.36291), 132906);
 
   // Backward.
   // OM makes the same as GraphHopper and Valhalla. OSRM makes a bit shorter route.
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-      FromLatLon(48.85458, 2.36291), {0., 0.},
-      FromLatLon(49.85027, 2.24283), 136653);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(48.85458, 2.36291), {0., 0.},
+                                   FromLatLon(49.85027, 2.24283), 136653);
 }
 
 UNIT_TEST(RussiaSmolenskRussiaMoscowTimeTest)
 {
-  TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car),
-                                  FromLatLon(54.7998, 32.05489), {0., 0.},
-                                  FromLatLon(55.753, 37.60169));
+  TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car), FromLatLon(54.7998, 32.05489),
+                                                  {0., 0.}, FromLatLon(55.753, 37.60169));
 
   RouterResultCode const result = routeResult.second;
   TEST_EQUAL(result, RouterResultCode::NoError, ());
@@ -278,9 +228,8 @@ UNIT_TEST(RussiaSmolenskRussiaMoscowTimeTest)
 
 UNIT_TEST(Russia_Moscow_Leningradskiy39GeroevPanfilovtsev22TimeTest)
 {
-  TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car),
-                                  FromLatLon(55.7971, 37.53804), {0., 0.},
-                                  FromLatLon(55.8579, 37.40990));
+  TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car), FromLatLon(55.7971, 37.53804),
+                                                  {0., 0.}, FromLatLon(55.8579, 37.40990));
   RouterResultCode const result = routeResult.second;
   TEST_EQUAL(result, RouterResultCode::NoError, ());
 
@@ -292,9 +241,8 @@ UNIT_TEST(Russia_Moscow_Leningradskiy39GeroevPanfilovtsev22TimeTest)
 
 UNIT_TEST(Russia_Moscow_Leningradskiy39GeroevPanfilovtsev22SubrouteTest)
 {
-  TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car),
-                                  FromLatLon(55.7971, 37.53804), {0., 0.},
-                                  FromLatLon(55.8579, 37.40990));
+  TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car), FromLatLon(55.7971, 37.53804),
+                                                  {0., 0.}, FromLatLon(55.8579, 37.40990));
 
   RouterResultCode const result = routeResult.second;
   TEST_EQUAL(result, RouterResultCode::NoError, ());
@@ -311,22 +259,22 @@ UNIT_TEST(Russia_Moscow_Leningradskiy39GeroevPanfilovtsev22SubrouteTest)
 
 UNIT_TEST(USALosAnglesAriaTwentyninePalmsHighwayTimeTest)
 {
-  TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car),
-                                  FromLatLon(34.0739, -115.3212), {0.0, 0.0},
-                                  FromLatLon(34.0928, -115.5930));
+  TRouteResult const routeResult =
+      CalculateRoute(GetVehicleComponents(VehicleType::Car), FromLatLon(34.0739, -115.3212), {0.0, 0.0},
+                     FromLatLon(34.0928, -115.5930));
   RouterResultCode const result = routeResult.second;
   TEST_EQUAL(result, RouterResultCode::NoError, ());
   TEST(routeResult.first, ());
   Route const & route = *routeResult.first;
-  TEST_LESS(route.GetTotalTimeSec(), std::numeric_limits<double >::max() / 2.0, ());
+  TEST_LESS(route.GetTotalTimeSec(), std::numeric_limits<double>::max() / 2.0, ());
 }
 
 // Test on routing along features with tag man_made:pier.
 UNIT_TEST(CanadaVictoriaVancouverTest)
 {
-  TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car),
-                                  FromLatLon(48.47831, -123.32749), {0.0, 0.0},
-                                  FromLatLon(49.26242, -123.11553));
+  TRouteResult const routeResult =
+      CalculateRoute(GetVehicleComponents(VehicleType::Car), FromLatLon(48.47831, -123.32749), {0.0, 0.0},
+                     FromLatLon(49.26242, -123.11553));
   RouterResultCode const result = routeResult.second;
   TEST_EQUAL(result, RouterResultCode::NoError, ());
 }
@@ -334,9 +282,9 @@ UNIT_TEST(CanadaVictoriaVancouverTest)
 // Test on the route with the finish near zero length edge.
 UNIT_TEST(BelarusSlonimFinishNearZeroEdgeTest)
 {
-  TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car),
-                                  FromLatLon(53.08279, 25.30036), {0.0, 0.0},
-                                  FromLatLon(53.09443, 25.34356));
+  TRouteResult const routeResult =
+      CalculateRoute(GetVehicleComponents(VehicleType::Car), FromLatLon(53.08279, 25.30036), {0.0, 0.0},
+                     FromLatLon(53.09443, 25.34356));
   RouterResultCode const result = routeResult.second;
   TEST_EQUAL(result, RouterResultCode::NoError, ());
 }
@@ -344,9 +292,9 @@ UNIT_TEST(BelarusSlonimFinishNearZeroEdgeTest)
 // Test on the route with the start near zero length edge.
 UNIT_TEST(BelarusSlonimStartNearZeroEdgeTest)
 {
-  TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car),
-                                  FromLatLon(53.09422, 25.34411), {0.0, 0.0},
-                                  FromLatLon(53.09271, 25.3467));
+  TRouteResult const routeResult =
+      CalculateRoute(GetVehicleComponents(VehicleType::Car), FromLatLon(53.09422, 25.34411), {0.0, 0.0},
+                     FromLatLon(53.09271, 25.3467));
   RouterResultCode const result = routeResult.second;
   TEST_EQUAL(result, RouterResultCode::NoError, ());
 }
@@ -354,9 +302,8 @@ UNIT_TEST(BelarusSlonimStartNearZeroEdgeTest)
 // Test on roads with tag maxspeed=none.
 UNIT_TEST(GermanyBerlinMunichTimeTest)
 {
-  TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car),
-                                  FromLatLon(52.51172, 13.39468), {0., 0.},
-                                  FromLatLon(48.13294, 11.60352));
+  TRouteResult const routeResult = CalculateRoute(
+      GetVehicleComponents(VehicleType::Car), FromLatLon(52.51172, 13.39468), {0., 0.}, FromLatLon(48.13294, 11.60352));
 
   RouterResultCode const result = routeResult.second;
   TEST_EQUAL(result, RouterResultCode::NoError, ());
@@ -373,9 +320,8 @@ UNIT_TEST(GermanyBerlinMunichTimeTest)
 // Test on roads with tag route=shuttle_train. This train has defined maxspeed=100.
 UNIT_TEST(GermanyShuttleTrainTest)
 {
-  TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car),
-                                  FromLatLon(54.78370, 8.83528), {0., 0.},
-                                  FromLatLon(54.91681, 8.31346));
+  TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car), FromLatLon(54.78370, 8.83528),
+                                                  {0., 0.}, FromLatLon(54.91681, 8.31346));
 
   RouterResultCode const result = routeResult.second;
   TEST_EQUAL(result, RouterResultCode::NoError, ());
@@ -388,9 +334,8 @@ UNIT_TEST(GermanyShuttleTrainTest)
 
 UNIT_TEST(TolyattiFeatureThatCrossSeveralMwmsTest)
 {
-  TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car),
-                                  FromLatLon(52.67316, 48.22478), {0., 0.},
-                                  FromLatLon(53.49143, 49.52386));
+  TRouteResult const routeResult = CalculateRoute(
+      GetVehicleComponents(VehicleType::Car), FromLatLon(52.67316, 48.22478), {0., 0.}, FromLatLon(53.49143, 49.52386));
 
   TEST(routeResult.first, ());
   Route const & route = *routeResult.first;
@@ -404,9 +349,8 @@ UNIT_TEST(TolyattiFeatureThatCrossSeveralMwmsTest)
 // and on the absence of speed cameras in maps for later maps for Switzerland.
 UNIT_TEST(SwitzerlandNoSpeedCamerasInRouteTest)
 {
-  TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car),
-                                  FromLatLon(47.5194, 8.73093), {0., 0.},
-                                  FromLatLon(46.80592, 7.13724));
+  TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car), FromLatLon(47.5194, 8.73093),
+                                                  {0., 0.}, FromLatLon(46.80592, 7.13724));
 
   RouterResultCode const result = routeResult.second;
   TEST_EQUAL(result, RouterResultCode::NoError, ());
@@ -421,9 +365,8 @@ UNIT_TEST(SwitzerlandNoSpeedCamerasInRouteTest)
 // Test on warning about speed cameras for countries where speed cameras partly prohibited.
 UNIT_TEST(GermanyWarningAboutSpeedCamerasTest)
 {
-  TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car),
-                                  FromLatLon(52.38465, 13.41906), {0., 0.},
-                                  FromLatLon(52.67564, 13.27453));
+  TRouteResult const routeResult = CalculateRoute(
+      GetVehicleComponents(VehicleType::Car), FromLatLon(52.38465, 13.41906), {0., 0.}, FromLatLon(52.67564, 13.27453));
 
   RouterResultCode const result = routeResult.second;
   TEST_EQUAL(result, RouterResultCode::NoError, ());
@@ -437,25 +380,22 @@ UNIT_TEST(Spain_RestirctionOnlyMany)
 {
   // This relation https://www.openstreetmap.org/relation/7610329
   // See also Valhalla engine.
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-      FromLatLon(43.38234, -5.67648), {0.0, 0.0},
-      FromLatLon(43.38222, -5.69083), 8289.15);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(43.38234, -5.67648), {0.0, 0.0},
+                                   FromLatLon(43.38222, -5.69083), 8289.15);
 }
 
 UNIT_TEST(Russia_Moscow_RestirctionOnlyMany)
 {
   // This relation https://www.openstreetmap.org/relation/581743
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-      FromLatLon(55.991986, 37.2131072), {0.0, 0.0},
-      FromLatLon(55.9918083, 37.215531), 894.853);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(55.991986, 37.2131072),
+                                   {0.0, 0.0}, FromLatLon(55.9918083, 37.215531), 894.853);
 }
 
 // Test that fake segments are not built from start to roads with hwtag=nocar for car routing.
 UNIT_TEST(SpainBilbaoAirportNoCarTest)
 {
-  TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car),
-                                  FromLatLon(43.29969, -2.91312), {0., 0.},
-                                  FromLatLon(43.29904, -2.9108));
+  TRouteResult const routeResult = CalculateRoute(
+      GetVehicleComponents(VehicleType::Car), FromLatLon(43.29969, -2.91312), {0., 0.}, FromLatLon(43.29904, -2.9108));
   TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ());
 
   TEST(routeResult.first, ());
@@ -477,10 +417,8 @@ UNIT_TEST(SpainBilbaoAirportNoCarTest)
 // be taken into account in |IndexGraphStarterJoints<Graph>::FindFirstJoints()|.
 UNIT_TEST(EnglandLondonStartNearMwmBorderTest)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(51.603582, 0.266995), {0., 0.},
-      FromLatLon(51.606785, 0.264055), 416.8);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(51.603582, 0.266995), {0., 0.},
+                                   FromLatLon(51.606785, 0.264055), 416.8);
 }
 
 // Test that toll road is not crossed by a fake edge if RouingOptions are set to Road::Toll.
@@ -490,7 +428,7 @@ UNIT_TEST(RussiaMoscowNotCrossingTollRoadTest)
   auto & vehicleComponents = GetVehicleComponents(VehicleType::Car);
 
   auto const start = FromLatLon(55.93934, 37.406);
-  m2::PointD finish[] = { FromLatLon(55.9414245, 37.4489627), FromLatLon(55.9421391, 37.4484832) };
+  m2::PointD finish[] = {FromLatLon(55.9414245, 37.4489627), FromLatLon(55.9421391, 37.4484832)};
 
   {
     // Avoid motorway toll road and build route through minor residential roads (short but slow).
@@ -515,18 +453,16 @@ UNIT_TEST(RussiaMoscowNotCrossingTollRoadTest)
 
 UNIT_TEST(NoCrash_RioGrandeCosmopolis)
 {
-  TRouteResult const route = CalculateRoute(GetVehicleComponents(VehicleType::Car),
-                                  FromLatLon(-32.17641, -52.16350), {0., 0.},
-                                  FromLatLon(-22.64374, -47.19720));
+  TRouteResult const route = CalculateRoute(GetVehicleComponents(VehicleType::Car), FromLatLon(-32.17641, -52.16350),
+                                            {0., 0.}, FromLatLon(-22.64374, -47.19720));
 
   TEST_EQUAL(route.second, RouterResultCode::NoError, ());
 }
 
 UNIT_TEST(AreMwmsNear_HelsinkiPiter)
 {
-  TRouteResult const route = CalculateRoute(GetVehicleComponents(VehicleType::Car),
-                                  FromLatLon(60.87083, 26.53612), {0., 0.},
-                                  FromLatLon(60.95360, 28.53979));
+  TRouteResult const route = CalculateRoute(GetVehicleComponents(VehicleType::Car), FromLatLon(60.87083, 26.53612),
+                                            {0., 0.}, FromLatLon(60.95360, 28.53979));
 
   TEST_EQUAL(route.second, RouterResultCode::NoError, ());
 }
@@ -536,178 +472,137 @@ UNIT_TEST(AreMwmsNear_HelsinkiPiter)
 // fake edges shorter that prevent crossing lakes, forests and so on.
 UNIT_TEST(RussiaBlackLakeShorterFakeEdges1)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(55.62466, 39.71385), {0., 0.},
-      FromLatLon(55.63114, 39.70979), 1469.54);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(55.62466, 39.71385), {0., 0.},
+                                   FromLatLon(55.63114, 39.70979), 1469.54);
 }
 
 UNIT_TEST(RussiaShorterFakeEdges2)
 {
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-      FromLatLon(55.31103, 38.80954), {0., 0.},
-      FromLatLon(55.31155, 38.8217), 2489.8);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(55.31103, 38.80954), {0., 0.},
+                                   FromLatLon(55.31155, 38.8217), 2489.8);
 }
 
 // https://github.com/organicmaps/organicmaps/issues/1788
 UNIT_TEST(Germany_ShortRouteWithPassThroughChanges)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(49.512076, 8.284476), {0., 0.},
-      FromLatLon(49.523783, 8.288701), 2014.);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(49.512076, 8.284476), {0., 0.},
+                                   FromLatLon(49.523783, 8.288701), 2014.);
 }
 
 // https://github.com/organicmaps/organicmaps/issues/821
 UNIT_TEST(Ukraine_UmanOdessa)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(48.7498, 30.2203), {0., 0.},
-      FromLatLon(46.4859, 30.6837), 265163.);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(48.7498, 30.2203), {0., 0.},
+                                   FromLatLon(46.4859, 30.6837), 265163.);
 }
 
 // https://github.com/organicmaps/organicmaps/issues/1736
 UNIT_TEST(Belgium_LiegeBrugge)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(50.645205, 5.573507), {0., 0.},
-      FromLatLon(51.208479, 3.225558), 193436.);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(50.645205, 5.573507), {0., 0.},
+                                   FromLatLon(51.208479, 3.225558), 193436.);
 }
 
 // https://github.com/organicmaps/organicmaps/issues/1627
 UNIT_TEST(Spain_MadridSevilla)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(40.415322, -3.703517), {0., 0.},
-      FromLatLon(37.388667, -5.995355), 528667.);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(40.415322, -3.703517), {0., 0.},
+                                   FromLatLon(37.388667, -5.995355), 528667.);
 }
 
 UNIT_TEST(Belarus_Lithuania_MinskVilnius)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(53.902837, 27.562144), {0., 0.},
-      FromLatLon(54.686821, 25.283189), 183231.);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(53.902837, 27.562144), {0., 0.},
+                                   FromLatLon(54.686821, 25.283189), 183231.);
 }
 
 // https://github.com/organicmaps/organicmaps/issues/338
 UNIT_TEST(Russia_MendeleevoReutov)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(56.036866, 37.232630), {0., 0.},
-      FromLatLon(55.762128, 37.856665), 66261.9);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(56.036866, 37.232630), {0., 0.},
+                                   FromLatLon(55.762128, 37.856665), 66261.9);
 }
 
 // https://github.com/organicmaps/organicmaps/issues/1721
 UNIT_TEST(Austria_Croatia_SalzburgZagreb)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(47.795928, 13.047597), {0., 0.},
-      FromLatLon(45.812822, 15.977049), 414275);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(47.795928, 13.047597), {0., 0.},
+                                   FromLatLon(45.812822, 15.977049), 414275);
 }
 
 // https://github.com/organicmaps/organicmaps/issues/1071
 UNIT_TEST(Russia_MoscowDesnogorsk)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(55.715208, 37.396528), {0., 0.},
-      FromLatLon(54.151853, 33.287128), 355887);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(55.715208, 37.396528), {0., 0.},
+                                   FromLatLon(54.151853, 33.287128), 355887);
 }
 
 // https://github.com/organicmaps/organicmaps/issues/1271
 UNIT_TEST(USA_DontLeaveHighway)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(34.1801345, -118.885005), {0., 0.},
-      FromLatLon(34.1767471, -118.869327), 1523);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(34.1801345, -118.885005),
+                                   {0., 0.}, FromLatLon(34.1767471, -118.869327), 1523);
 }
 
 // https://github.com/organicmaps/organicmaps/issues/2085
 UNIT_TEST(USA_NorthCarolina_CrossMWMs)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(35.6233244, -78.3917262), {0., 0.},
-      FromLatLon(36.0081839, -81.5245347), 333425);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(35.6233244, -78.3917262),
+                                   {0., 0.}, FromLatLon(36.0081839, -81.5245347), 333425);
 }
 
 // https://github.com/organicmaps/organicmaps/issues/1565
 UNIT_TEST(Cyprus_NoUTurnFromFake)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(34.70639, 33.1184951), {0., 0.},
-      FromLatLon(34.7065239, 33.1184222), 384.238);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(34.70639, 33.1184951), {0., 0.},
+                                   FromLatLon(34.7065239, 33.1184222), 384.238);
 
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(34.7068976, 33.1199084), {0., 0.},
-      FromLatLon(34.7070505, 33.1198391), 670.077);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(34.7068976, 33.1199084), {0., 0.},
+                                   FromLatLon(34.7070505, 33.1198391), 670.077);
 }
 
 UNIT_TEST(Crimea_UseGravelTertiary)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(45.362591, 36.471533), {0., 0.},
-      FromLatLon(45.475055, 36.341766), 18815.6);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(45.362591, 36.471533), {0., 0.},
+                                   FromLatLon(45.475055, 36.341766), 18815.6);
 
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(45.470764, 36.331289), {0., 0.},
-      FromLatLon(45.424964, 36.080336), 55220.2);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(45.470764, 36.331289), {0., 0.},
+                                   FromLatLon(45.424964, 36.080336), 55220.2);
 }
 
 // https://github.com/organicmaps/organicmaps/issues/2475
 UNIT_TEST(Spain_LinksJunction)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(38.8031, 0.0383), {0., 0.},
-      FromLatLon(38.8228, 0.0357), 3479.63);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(38.8031, 0.0383), {0., 0.},
+                                   FromLatLon(38.8228, 0.0357), 3479.63);
 }
 
 // https://github.com/organicmaps/organicmaps/issues/1773
 UNIT_TEST(Netherlands_CrossMwm_A15)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(51.847656, 4.089189), {0., 0.},
-      FromLatLon(51.651632, 4.725924), 70596.3);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(51.847656, 4.089189), {0., 0.},
+                                   FromLatLon(51.651632, 4.725924), 70596.3);
 }
 
 // https://github.com/organicmaps/organicmaps/issues/2494
 UNIT_TEST(Netherlands_CrossMwm_GoudaToApenheul)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(52.0181, 4.7111), {0., 0.},
-      FromLatLon(52.2153, 5.9187), 103576);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(52.0181, 4.7111), {0., 0.},
+                                   FromLatLon(52.2153, 5.9187), 103576);
 }
 
 // https://github.com/organicmaps/organicmaps/issues/2285
 UNIT_TEST(Hawaii_KeepH1)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(21.277841, -157.779314), {0., 0.},
-      FromLatLon(21.296098, -157.823823), 5289.31);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(21.277841, -157.779314), {0., 0.},
+                                   FromLatLon(21.296098, -157.823823), 5289.31);
 }
 
 // https://github.com/organicmaps/organicmaps/issues/1668
 UNIT_TEST(Russia_Moscow_KeepPrimary)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(55.7083688, 37.6213856), {0., 0.},
-      FromLatLon(55.724623, 37.62588), 1921.88);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(55.7083688, 37.6213856), {0., 0.},
+                                   FromLatLon(55.724623, 37.62588), 1921.88);
 }
 
 // https://github.com/organicmaps/organicmaps/issues/1727
@@ -715,64 +610,47 @@ UNIT_TEST(Russia_Moscow_KeepPrimary)
 // https://github.com/organicmaps/organicmaps/issues/2057
 UNIT_TEST(DontUseLinksWhenRidingOnMotorway)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(32.16881, 34.90656), {0., 0.},
-      FromLatLon(32.1588823, 34.9330855), 2847.33);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(32.16881, 34.90656), {0., 0.},
+                                   FromLatLon(32.1588823, 34.9330855), 2847.33);
 
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(43.587808, 1.495385), {0., 0.},
-      FromLatLon(43.600145, 1.490489), 1457.16);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(43.587808, 1.495385), {0., 0.},
+                                   FromLatLon(43.600145, 1.490489), 1457.16);
 
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(34.0175371, -84.3272339), {0., 0.},
-      FromLatLon(34.0298011, -84.3182477), 1609.76);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(34.0175371, -84.3272339),
+                                   {0., 0.}, FromLatLon(34.0298011, -84.3182477), 1609.76);
 }
 
 UNIT_TEST(Russia_UseDonMotorway)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(54.5775321, 38.2206224), {0., 0.},
-      FromLatLon(49.9315563, 40.5529881), 608031);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(54.5775321, 38.2206224), {0., 0.},
+                                   FromLatLon(49.9315563, 40.5529881), 608031);
 }
 
 UNIT_TEST(Germany_Italy_Malcesine)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(48.4101446, 11.5892265), {0., 0.},
-      FromLatLon(45.7662964, 10.8111554), 427135);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(48.4101446, 11.5892265), {0., 0.},
+                                   FromLatLon(45.7662964, 10.8111554), 427135);
 
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(45.7662964, 10.8111554), {0., 0.},
-      FromLatLon(48.4101446, 11.5892265), 431341);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(45.7662964, 10.8111554), {0., 0.},
+                                   FromLatLon(48.4101446, 11.5892265), 431341);
 
   /// @todo Again strange detour (near finish) on a long route.
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(50.8499365, 12.4662169), {0., 0.},
-      FromLatLon(45.7662964, 10.8111554), 776000);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(50.8499365, 12.4662169), {0., 0.},
+                                   FromLatLon(45.7662964, 10.8111554), 776000);
 }
 
 // https://github.com/organicmaps/organicmaps/issues/3363
 UNIT_TEST(Belarus_UseP27_PastawyBraslaw)
 {
-  CalculateRouteAndTestRouteLength(
-      GetVehicleComponents(VehicleType::Car),
-      FromLatLon(55.1187744, 26.8460319), {0., 0.},
-      FromLatLon(55.6190911, 27.0938092), 86239.8);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(55.1187744, 26.8460319), {0., 0.},
+                                   FromLatLon(55.6190911, 27.0938092), 86239.8);
 }
 
 // https://github.com/organicmaps/organicmaps/issues/3257
 UNIT_TEST(Turkey_AvoidMountainsSecondary)
 {
-  TRouteResult const res = CalculateRoute(GetVehicleComponents(VehicleType::Car),
-                              FromLatLon(41.0027, 27.6752), {0., 0.},
-                              FromLatLon(40.6119, 27.1136));
+  TRouteResult const res = CalculateRoute(GetVehicleComponents(VehicleType::Car), FromLatLon(41.0027, 27.6752),
+                                          {0., 0.}, FromLatLon(40.6119, 27.1136));
 
   // GraphHopper and OSRM make a short route via the mountain secondary.
   // Valhalla makes a long route. I think it is correct.
@@ -784,35 +662,31 @@ UNIT_TEST(Turkey_AvoidMountainsSecondary)
 // https://github.com/organicmaps/organicmaps/issues/4110
 UNIT_TEST(Slovenia_Croatia_CrossBorderPenalty)
 {
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-      FromLatLon(46.038579, 14.469414), {0., 0.},
-      FromLatLon(45.22718, 13.596334), 156285);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(46.038579, 14.469414), {0., 0.},
+                                   FromLatLon(45.22718, 13.596334), 156285);
 }
 
 UNIT_TEST(USA_Birmingham_AL_KeyWest_FL_NoMotorway)
 {
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-      FromLatLon(28.9666499, -82.127271), {0., 0.},
-      FromLatLon(25.8633542, -80.3878891), 457734);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(28.9666499, -82.127271), {0., 0.},
+                                   FromLatLon(25.8633542, -80.3878891), 457734);
 
   /// @note These tests works good on release server, my desktop release skips MWM Florida_Orlando ...
   /// 15 vs 8 cross-mwm candidates.
 
   auto const start = FromLatLon(33.5209837, -86.807945);
   auto const finish = FromLatLon(24.5534713, -81.7932587);
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-      start, {0., 0.}, finish, 1'471'410);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), start, {0., 0.}, finish, 1'471'410);
 
   RoutingOptionSetter optionsGuard(RoutingOptions::Motorway);
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-      start, {0., 0.}, finish, 1'495'860);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), start, {0., 0.}, finish, 1'495'860);
 }
 
 UNIT_TEST(Turkey_Salarialaca_Sanliurfa)
 {
-  TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car),
-                                  FromLatLon(38.8244409, 34.0979749), {0., 0.},
-                                  FromLatLon(37.159585, 38.7919353));
+  TRouteResult const routeResult =
+      CalculateRoute(GetVehicleComponents(VehicleType::Car), FromLatLon(38.8244409, 34.0979749), {0., 0.},
+                     FromLatLon(37.159585, 38.7919353));
 
   RouterResultCode const result = routeResult.second;
   TEST_EQUAL(result, RouterResultCode::NoError, ());
@@ -828,18 +702,15 @@ UNIT_TEST(Turkey_Salarialaca_Sanliurfa)
 // https://github.com/organicmaps/organicmaps/issues/4996
 UNIT_TEST(UK_MiniRoundabout)
 {
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-                FromLatLon(50.4155631, -4.17201038), {0., 0.},
-                FromLatLon(50.4161337, -4.17226314), 114.957);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(50.4155631, -4.17201038),
+                                   {0., 0.}, FromLatLon(50.4161337, -4.17226314), 114.957);
 
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-                FromLatLon(50.4173675, -4.14913092), {0., 0.},
-                FromLatLon(50.4170013, -4.1471226), 153.223);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(50.4173675, -4.14913092),
+                                   {0., 0.}, FromLatLon(50.4170013, -4.1471226), 153.223);
 
   /// @todo Fancy case, changing start/end point a little and the route is OK. Also check m_exitNum.
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-                FromLatLon(51.5686491, -0.00590868183), {0., 0.},
-                FromLatLon(51.5684408, -0.00596725822), 40);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(51.5686491, -0.00590868183),
+                                   {0., 0.}, FromLatLon(51.5684408, -0.00596725822), 40);
 }
 
 // https://github.com/organicmaps/organicmaps/issues/5069
@@ -847,9 +718,9 @@ UNIT_TEST(Germany_Netherlands_AvoidLoops)
 {
   // https://www.openstreetmap.org/directions?engine=fossgis_osrm_car&route=51.682%2C10.220%3B51.919%2C5.845
 
-  TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car),
-                                                  FromLatLon(51.6823791, 10.2197113), {0., 0.},
-                                                  FromLatLon(51.9187916, 5.8452563));
+  TRouteResult const routeResult =
+      CalculateRoute(GetVehicleComponents(VehicleType::Car), FromLatLon(51.6823791, 10.2197113), {0., 0.},
+                     FromLatLon(51.9187916, 5.8452563));
 
   RouterResultCode const result = routeResult.second;
   TEST_EQUAL(result, RouterResultCode::NoError, ());
@@ -862,30 +733,26 @@ UNIT_TEST(Germany_Netherlands_AvoidLoops)
 
 UNIT_TEST(Germany_Cologne_Croatia_Zagreb)
 {
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-                                   FromLatLon(50.924, 6.943), {0., 0.},
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(50.924, 6.943), {0., 0.},
                                    FromLatLon(45.806, 15.963), 1074730);
 }
 
 UNIT_TEST(Finland_Avoid_CompactedUnclassified)
 {
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-                                   FromLatLon(61.4677, 24.0025), {0., 0.},
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(61.4677, 24.0025), {0., 0.},
                                    FromLatLon(61.4577, 24.035), 3128.31);
 }
 
 // https://github.com/orgs/organicmaps/discussions/5158#discussioncomment-5938807
 UNIT_TEST(Greece_Crete_Use_EO94)
 {
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-                                   FromLatLon(35.5170594, 24.0938699), {0., 0.},
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(35.5170594, 24.0938699), {0., 0.},
                                    FromLatLon(35.5446109, 24.1312439), 6333.82);
 }
 
 UNIT_TEST(Bulgaria_Rosenovo_Dobrich)
 {
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-                                   FromLatLon(43.6650649, 27.7826578), {0., 0.},
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(43.6650649, 27.7826578), {0., 0.},
                                    FromLatLon(43.5690961, 27.8307318), 16556.3);
 }
 
@@ -895,8 +762,7 @@ UNIT_TEST(Russia_UseGravelPrimary_Not_DefaultTertiary)
   /// There is an idea to detect and update route if we have leave-enter for the same ref (named) >= primary road:
   /// {80K-004, some tertiary, 80K-004} in a reasonable distance. This is a signal that "some tertiary"
   /// in a middle is an error.
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-                                   FromLatLon(55.8466967, 57.303653), {0., 0.},
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(55.8466967, 57.303653), {0., 0.},
                                    FromLatLon(55.8260004, 57.0367732), 19910);
 }
 
@@ -913,33 +779,28 @@ UNIT_TEST(Russia_Yekaterinburg_NChelny)
   {
     RoutingOptionSetter optionsGuard(RoutingOptions::Dirty | RoutingOptions::Ferry);
     // forward
-    CalculateRouteAndTestRouteLength(*components,
-                                     start, {0., 0.}, finish, 767702);
+    CalculateRouteAndTestRouteLength(*components, start, {0., 0.}, finish, 767702);
     // backward
-    CalculateRouteAndTestRouteLength(*components,
-                                     finish, {0., 0.}, start, 766226);
+    CalculateRouteAndTestRouteLength(*components, finish, {0., 0.}, start, 766226);
   }
 
   // OSRM, GraphHopper uses gravel, Valhalla makes a route like above.
 
   /// @todo Should use tertiary + gravel + villages (46km) here and below instead of primary (86km)?
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-                                   FromLatLon(55.9315, 58.202), {0., 0.},
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(55.9315, 58.202), {0., 0.},
                                    FromLatLon(55.7555, 57.8348), 45788);
   // forward
-  CalculateRouteAndTestRouteLength(*components,
-                                   start, {0., 0.}, finish, 757109);
+  CalculateRouteAndTestRouteLength(*components, start, {0., 0.}, finish, 757109);
   // backward
-  CalculateRouteAndTestRouteLength(*components,
-                                   finish, {0., 0.}, start, 755851);
+  CalculateRouteAndTestRouteLength(*components, finish, {0., 0.}, start, 755851);
 }
 
 // https://github.com/organicmaps/organicmaps/issues/5695
 UNIT_TEST(Russia_CrossMwm_Ferry)
 {
-  TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car),
-                                                  FromLatLon(55.7840398, 54.0815156), {0., 0.},
-                                                  FromLatLon(55.7726245, 54.0752932));
+  TRouteResult const routeResult =
+      CalculateRoute(GetVehicleComponents(VehicleType::Car), FromLatLon(55.7840398, 54.0815156), {0., 0.},
+                     FromLatLon(55.7726245, 54.0752932));
 
   RouterResultCode const result = routeResult.second;
   TEST_EQUAL(result, RouterResultCode::NoError, ());
@@ -957,8 +818,7 @@ UNIT_TEST(Netherlands_CrossMwm_Ferry)
 {
   /// @todo Should work after reducing ferry landing penalty, but nope ..
   /// Can't realize what is going on here, maybe penalty is aggregated 2 times?
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-                                   FromLatLon(52.3855418, 6.12969591), {0., 0.},
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(52.3855418, 6.12969591), {0., 0.},
                                    FromLatLon(52.3924362, 6.12166998), 1322);
 }
 
@@ -966,47 +826,41 @@ UNIT_TEST(Netherlands_CrossMwm_Ferry)
 UNIT_TEST(Turkey_PreferSecondary_NotResidential)
 {
   /// @todo Now the app wrongly takes tertiary (no limits) vs primary/secondary (with maxspeed = 30).
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-                                   FromLatLon(41.0529, 28.9201), {0., 0.},
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(41.0529, 28.9201), {0., 0.},
                                    FromLatLon(41.0731, 28.9407), 4783.85);
 }
 
 UNIT_TEST(Ireland_NorthernIreland_NoBorderPenalty)
 {
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-                                   FromLatLon(53.9909441, -7.36035861), {0., 0.},
-                                   FromLatLon(54.9517424, -7.73625795), 138655);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(53.9909441, -7.36035861),
+                                   {0., 0.}, FromLatLon(54.9517424, -7.73625795), 138655);
 }
 
 UNIT_TEST(Israel_Jerusalem_Palestine_NoBorderPenalty)
 {
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-                                   FromLatLon(31.4694833, 35.394899), {0., 0.},
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(31.4694833, 35.394899), {0., 0.},
                                    FromLatLon(31.7776832, 35.2236876), 76133);
 }
 
 // https://github.com/organicmaps/organicmaps/issues/6510
 UNIT_TEST(EqualMaxSpeeds_PreferPrimary_NotResidential)
 {
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-                                   FromLatLon(46.5239, 5.6187), {0., 0.},
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(46.5239, 5.6187), {0., 0.},
                                    FromLatLon(46.5240, 5.6096), 1123);
 }
 
 // https://github.com/organicmaps/organicmaps/issues/3033#issuecomment-1798343531
 UNIT_TEST(Spain_NoMaxSpeeds_KeepTrunk_NotTrunkLink)
 {
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-                                   FromLatLon(43.3773971, -3.43177355), {0., 0.},
-                                   FromLatLon(43.3685773, -3.42580007), 1116.79);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(43.3773971, -3.43177355),
+                                   {0., 0.}, FromLatLon(43.3685773, -3.42580007), 1116.79);
 }
 
 // https://github.com/organicmaps/organicmaps/issues/8823
 UNIT_TEST(LATAM_UsePrimary_NotTrunkDetour)
 {
   // 10247 or less should be here.
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-                                   FromLatLon(4.737768, -74.077599), {0., 0.},
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(4.737768, -74.077599), {0., 0.},
                                    FromLatLon(4.684999, -74.046393), 10247.3);
 
   /// @todo Still have the strange detour at the end. Due to the 20/30 km/h assignment for the primary_link.
@@ -1017,28 +871,23 @@ UNIT_TEST(LATAM_UsePrimary_NotTrunkDetour)
 // https://github.com/organicmaps/organicmaps/issues/8541
 UNIT_TEST(USA_UseDirt_WithMaxspeed)
 {
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-                                   FromLatLon(46.5361985, -111.943183), {0., 0.},
-                                   FromLatLon(46.4925409, -112.105446), 20906.5);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(46.5361985, -111.943183),
+                                   {0., 0.}, FromLatLon(46.4925409, -112.105446), 20906.5);
 
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-                                   FromLatLon(46.7336967, -111.926), {0., 0.},
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(46.7336967, -111.926), {0., 0.},
                                    FromLatLon(46.7467037, -111.917147), 3527.79);
 
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-                                   FromLatLon(42.3889581, 19.7812567), {0., 0.},
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(42.3889581, 19.7812567), {0., 0.},
                                    FromLatLon(42.3878106, 19.7831402), 247.139);
 }
 
 // https://codeberg.org/comaps/comaps/issues/304
 UNIT_TEST(Norway_FauxOneway_MotorVehicleBackward_No)
 {
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car),
-                                   FromLatLon(59.919189, 10.759355), {0., 0.},
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(59.919189, 10.759355), {0., 0.},
                                    FromLatLon(59.921042, 10.759302), 410);
-  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle),
-                                   FromLatLon(59.919189, 10.759355), {0., 0.},
-                                   FromLatLon(59.921042, 10.759302), 210);
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Bicycle), FromLatLon(59.919189, 10.759355),
+                                   {0., 0.}, FromLatLon(59.921042, 10.759302), 210);
 }
 
-} // namespace route_test
+}  // namespace route_test
diff --git a/libs/routing/routing_integration_tests/routing_test_tools.cpp b/libs/routing/routing_integration_tests/routing_test_tools.cpp
index d4c2639ba..bb88bb188 100644
--- a/libs/routing/routing_integration_tests/routing_test_tools.cpp
+++ b/libs/routing/routing_integration_tests/routing_test_tools.cpp
@@ -27,7 +27,6 @@
 #include "base/math.hpp"
 #include "base/stl_helpers.hpp"
 
-
 namespace integration
 {
 using namespace routing;
@@ -59,19 +58,14 @@ unique_ptr<storage::CountryInfoGetter> CreateCountryInfoGetter()
   return storage::CountryInfoReader::CreateCountryInfoGetter(platform);
 }
 
-unique_ptr<IndexRouter> CreateVehicleRouter(DataSource & dataSource,
-                                            storage::CountryInfoGetter const & infoGetter,
+unique_ptr<IndexRouter> CreateVehicleRouter(DataSource & dataSource, storage::CountryInfoGetter const & infoGetter,
                                             traffic::TrafficCache const & trafficCache,
-                                            vector<LocalCountryFile> const & localFiles,
-                                            VehicleType vehicleType)
+                                            vector<LocalCountryFile> const & localFiles, VehicleType vehicleType)
 {
-  auto const countryFileGetter = [&infoGetter](m2::PointD const & pt) {
-    return infoGetter.GetRegionCountryId(pt);
-  };
+  auto const countryFileGetter = [&infoGetter](m2::PointD const & pt) { return infoGetter.GetRegionCountryId(pt); };
 
-  auto const getMwmRectByName = [&infoGetter](string const & countryId) -> m2::RectD {
-    return infoGetter.GetLimitRectForLeaf(countryId);
-  };
+  auto const getMwmRectByName = [&infoGetter](string const & countryId) -> m2::RectD
+  { return infoGetter.GetLimitRectForLeaf(countryId); };
 
   auto countryParentGetter = std::make_unique<storage::CountryParentGetter>();
   CHECK(countryParentGetter, ());
@@ -93,10 +87,9 @@ unique_ptr<IndexRouter> CreateVehicleRouter(DataSource & dataSource,
   TEST(!numMwmIds->IsEmpty(), ());
 
   bool const loadAltitudes = vehicleType != VehicleType::Car;
-  auto indexRouter = make_unique<IndexRouter>(vehicleType, loadAltitudes,
-                                              *countryParentGetter, countryFileGetter,
-                                              getMwmRectByName, numMwmIds,
-                                              MakeNumMwmTree(*numMwmIds, infoGetter), trafficCache, dataSource);
+  auto indexRouter =
+      make_unique<IndexRouter>(vehicleType, loadAltitudes, *countryParentGetter, countryFileGetter, getMwmRectByName,
+                               numMwmIds, MakeNumMwmTree(*numMwmIds, infoGetter), trafficCache, dataSource);
 
   return indexRouter;
 }
@@ -106,25 +99,25 @@ void GetAllLocalFiles(vector<LocalCountryFile> & localFiles)
   platform::FindAllLocalMapsAndCleanup(numeric_limits<int64_t>::max() /* latestVersion */, localFiles);
 
   // Leave only real country files for routing test.
-  localFiles.erase(std::remove_if(localFiles.begin(), localFiles.end(), [](LocalCountryFile const & file)
+  localFiles.erase(std::remove_if(localFiles.begin(), localFiles.end(),
+                                  [](LocalCountryFile const & file)
   {
     auto const & name = file.GetCountryName();
     return name == WORLD_FILE_NAME || name == WORLD_COASTS_FILE_NAME;
-  }), localFiles.end());
+  }),
+                   localFiles.end());
 
   for (auto & file : localFiles)
     file.SyncWithDisk();
 }
 
-shared_ptr<VehicleRouterComponents>
-CreateAllMapsComponents(VehicleType vehicleType, std::set<std::string> const & skipMaps)
+shared_ptr<VehicleRouterComponents> CreateAllMapsComponents(VehicleType vehicleType,
+                                                            std::set<std::string> const & skipMaps)
 {
   vector<LocalCountryFile> localFiles;
   GetAllLocalFiles(localFiles);
-  base::EraseIf(localFiles, [&skipMaps](LocalCountryFile const & cf)
-  {
-    return skipMaps.count(cf.GetCountryName()) > 0;
-  });
+  base::EraseIf(localFiles,
+                [&skipMaps](LocalCountryFile const & cf) { return skipMaps.count(cf.GetCountryName()) > 0; });
   TEST(!localFiles.empty(), ());
 
   return make_shared<VehicleRouterComponents>(localFiles, vehicleType);
@@ -142,9 +135,8 @@ IRouterComponents & GetVehicleComponents(VehicleType vehicleType)
   return *(it->second);
 }
 
-TRouteResult CalculateRoute(IRouterComponents const & routerComponents,
-                            m2::PointD const & startPoint, m2::PointD const & startDirection,
-                            m2::PointD const & finalPoint)
+TRouteResult CalculateRoute(IRouterComponents const & routerComponents, m2::PointD const & startPoint,
+                            m2::PointD const & startDirection, m2::PointD const & finalPoint)
 {
   RouterDelegate delegate;
   shared_ptr<Route> route = make_shared<Route>("mapsme", 0 /* route id */);
@@ -155,8 +147,8 @@ TRouteResult CalculateRoute(IRouterComponents const & routerComponents,
   return TRouteResult(route, result);
 }
 
-TRouteResult CalculateRoute(IRouterComponents const & routerComponents,
-                            Checkpoints const & checkpoints, GuidesTracks && guides)
+TRouteResult CalculateRoute(IRouterComponents const & routerComponents, Checkpoints const & checkpoints,
+                            GuidesTracks && guides)
 {
   RouterDelegate delegate;
   shared_ptr<Route> route = make_shared<Route>("mapsme", 0 /* route id */);
@@ -205,8 +197,7 @@ void TestRouteLength(Route const & route, double expectedRouteMeters, double rel
   double const delta = max(expectedRouteMeters * relativeError, kErrorMeters);
   double const routeMeters = route.GetTotalDistanceMeters();
   TEST(AlmostEqualAbs(routeMeters, expectedRouteMeters, delta),
-       ("Route length test failed. Expected:", expectedRouteMeters, "have:", routeMeters,
-        "delta:", delta));
+       ("Route length test failed. Expected:", expectedRouteMeters, "have:", routeMeters, "delta:", delta));
 }
 
 void TestRouteTime(Route const & route, double expectedRouteSeconds, double relativeError)
@@ -214,81 +205,72 @@ void TestRouteTime(Route const & route, double expectedRouteSeconds, double rela
   double const delta = max(expectedRouteSeconds * relativeError, kErrorSeconds);
   double const routeSeconds = route.GetTotalTimeSec();
   TEST(AlmostEqualAbs(routeSeconds, expectedRouteSeconds, delta),
-       ("Route time test failed. Expected:", expectedRouteSeconds, "have:", routeSeconds,
-        "delta:", delta));
+       ("Route time test failed. Expected:", expectedRouteSeconds, "have:", routeSeconds, "delta:", delta));
 }
 
 void TestRoutePointsNumber(Route const & route, size_t expectedPointsNumber, double relativeError)
 {
   CHECK_GREATER_OR_EQUAL(relativeError, 0.0, ());
   size_t const routePoints = route.GetPoly().GetSize();
-  TEST(AlmostEqualRel(static_cast<double>(routePoints),
-                            static_cast<double>(expectedPointsNumber), relativeError),
+  TEST(AlmostEqualRel(static_cast<double>(routePoints), static_cast<double>(expectedPointsNumber), relativeError),
        ("Route points test failed. Expected:", expectedPointsNumber, "have:", routePoints,
         "relative error:", relativeError));
 }
 
-void CalculateRouteAndTestRouteLength(IRouterComponents const & routerComponents,
-                                      m2::PointD const & startPoint,
-                                      m2::PointD const & startDirection,
-                                      m2::PointD const & finalPoint, double expectedRouteMeters,
-                                      double relativeError /* = 0.02 */)
+void CalculateRouteAndTestRouteLength(IRouterComponents const & routerComponents, m2::PointD const & startPoint,
+                                      m2::PointD const & startDirection, m2::PointD const & finalPoint,
+                                      double expectedRouteMeters, double relativeError /* = 0.02 */)
 {
-  TRouteResult routeResult =
-      CalculateRoute(routerComponents, startPoint, startDirection, finalPoint);
+  TRouteResult routeResult = CalculateRoute(routerComponents, startPoint, startDirection, finalPoint);
   RouterResultCode const result = routeResult.second;
   TEST_EQUAL(result, RouterResultCode::NoError, ());
   CHECK(routeResult.first, ());
   TestRouteLength(*routeResult.first, expectedRouteMeters, relativeError);
 }
 
-void CalculateRouteAndTestRouteTime(IRouterComponents const & routerComponents,
-                                    m2::PointD const & startPoint,
-                                    m2::PointD const & startDirection,
-                                    m2::PointD const & finalPoint, double expectedTimeSeconds,
-                                    double relativeError /* = 0.07 */)
+void CalculateRouteAndTestRouteTime(IRouterComponents const & routerComponents, m2::PointD const & startPoint,
+                                    m2::PointD const & startDirection, m2::PointD const & finalPoint,
+                                    double expectedTimeSeconds, double relativeError /* = 0.07 */)
 {
-  TRouteResult routeResult =
-      CalculateRoute(routerComponents, startPoint, startDirection, finalPoint);
+  TRouteResult routeResult = CalculateRoute(routerComponents, startPoint, startDirection, finalPoint);
   RouterResultCode const result = routeResult.second;
   TEST_EQUAL(result, RouterResultCode::NoError, ());
   CHECK(routeResult.first, ());
   TestRouteTime(*routeResult.first, expectedTimeSeconds, relativeError);
 }
 
-const TestTurn & TestTurn::TestValid() const
+TestTurn const & TestTurn::TestValid() const
 {
   TEST(m_isValid, ());
   return *this;
 }
 
-const TestTurn & TestTurn::TestNotValid() const
+TestTurn const & TestTurn::TestNotValid() const
 {
   TEST(!m_isValid, ());
   return *this;
 }
 
-const TestTurn & TestTurn::TestPoint(m2::PointD const & expectedPoint, double inaccuracyMeters) const
+TestTurn const & TestTurn::TestPoint(m2::PointD const & expectedPoint, double inaccuracyMeters) const
 {
   double const distanceMeters = ms::DistanceOnEarth(expectedPoint.y, expectedPoint.x, m_point.y, m_point.x);
   TEST_LESS(distanceMeters, inaccuracyMeters, ());
   return *this;
 }
 
-const TestTurn & TestTurn::TestDirection(routing::turns::CarDirection expectedDirection) const
+TestTurn const & TestTurn::TestDirection(routing::turns::CarDirection expectedDirection) const
 {
   TEST_EQUAL(m_direction, expectedDirection, ());
   return *this;
 }
 
-const TestTurn & TestTurn::TestOneOfDirections(
-    set<routing::turns::CarDirection> const & expectedDirections) const
+TestTurn const & TestTurn::TestOneOfDirections(set<routing::turns::CarDirection> const & expectedDirections) const
 {
   TEST(expectedDirections.find(m_direction) != expectedDirections.cend(), (m_direction));
   return *this;
 }
 
-const TestTurn & TestTurn::TestRoundAboutExitNum(uint32_t expectedRoundAboutExitNum) const
+TestTurn const & TestTurn::TestRoundAboutExitNum(uint32_t expectedRoundAboutExitNum) const
 {
   TEST_EQUAL(m_roundAboutExitNum, expectedRoundAboutExitNum, ());
   return *this;
@@ -351,10 +333,8 @@ LocalCountryFile GetLocalCountryFileByCountryId(platform::CountryFile const & co
   GetAllLocalFiles(localFiles);
 
   for (auto const & lf : localFiles)
-  {
     if (lf.GetCountryFile() == country)
       return lf;
-  }
   return {};
 }
 }  // namespace integration
diff --git a/libs/routing/routing_integration_tests/routing_test_tools.hpp b/libs/routing/routing_integration_tests/routing_test_tools.hpp
index 33eec788d..ec09a65ee 100644
--- a/libs/routing/routing_integration_tests/routing_test_tools.hpp
+++ b/libs/routing/routing_integration_tests/routing_test_tools.hpp
@@ -51,13 +51,11 @@ using namespace routing;
 using namespace turns;
 using platform::LocalCountryFile;
 
-std::shared_ptr<FeaturesFetcher> CreateFeaturesFetcher(
-    std::vector<LocalCountryFile> const & localFiles);
+std::shared_ptr<FeaturesFetcher> CreateFeaturesFetcher(std::vector<LocalCountryFile> const & localFiles);
 
 std::unique_ptr<storage::CountryInfoGetter> CreateCountryInfoGetter();
 
-std::unique_ptr<IndexRouter> CreateVehicleRouter(DataSource & dataSource,
-                                                 storage::CountryInfoGetter const & infoGetter,
+std::unique_ptr<IndexRouter> CreateVehicleRouter(DataSource & dataSource, storage::CountryInfoGetter const & infoGetter,
                                                  traffic::TrafficCache const & trafficCache,
                                                  std::vector<LocalCountryFile> const & localFiles,
                                                  VehicleType vehicleType);
@@ -66,9 +64,9 @@ class IRouterComponents
 {
 public:
   IRouterComponents(std::vector<LocalCountryFile> const & localFiles)
-    : m_featuresFetcher(CreateFeaturesFetcher(localFiles)), m_infoGetter(CreateCountryInfoGetter())
-  {
-  }
+    : m_featuresFetcher(CreateFeaturesFetcher(localFiles))
+    , m_infoGetter(CreateCountryInfoGetter())
+  {}
 
   virtual ~IRouterComponents() = default;
 
@@ -86,10 +84,9 @@ class VehicleRouterComponents : public IRouterComponents
 public:
   VehicleRouterComponents(std::vector<LocalCountryFile> const & localFiles, VehicleType vehicleType)
     : IRouterComponents(localFiles)
-    , m_indexRouter(CreateVehicleRouter(m_featuresFetcher->GetDataSource(), *m_infoGetter,
-                                        m_trafficCache, localFiles, vehicleType))
-  {
-  }
+    , m_indexRouter(CreateVehicleRouter(m_featuresFetcher->GetDataSource(), *m_infoGetter, m_trafficCache, localFiles,
+                                        vehicleType))
+  {}
 
   IRouter & GetRouter() const override { return *m_indexRouter; }
 
@@ -100,23 +97,20 @@ private:
 
 void GetAllLocalFiles(std::vector<LocalCountryFile> & localFiles);
 void TestOnlineCrosses(ms::LatLon const & startPoint, ms::LatLon const & finalPoint,
-                       std::vector<std::string> const & expected,
-                       IRouterComponents & routerComponents);
+                       std::vector<std::string> const & expected, IRouterComponents & routerComponents);
 void TestOnlineFetcher(ms::LatLon const & startPoint, ms::LatLon const & finalPoint,
-                       std::vector<std::string> const & expected,
-                       IRouterComponents & routerComponents);
+                       std::vector<std::string> const & expected, IRouterComponents & routerComponents);
 
-std::shared_ptr<VehicleRouterComponents>
-CreateAllMapsComponents(VehicleType vehicleType, std::set<std::string> const & skipMaps);
+std::shared_ptr<VehicleRouterComponents> CreateAllMapsComponents(VehicleType vehicleType,
+                                                                 std::set<std::string> const & skipMaps);
 
 IRouterComponents & GetVehicleComponents(VehicleType vehicleType);
 
-TRouteResult CalculateRoute(IRouterComponents const & routerComponents,
-                            m2::PointD const & startPoint, m2::PointD const & startDirection,
-                            m2::PointD const & finalPoint);
+TRouteResult CalculateRoute(IRouterComponents const & routerComponents, m2::PointD const & startPoint,
+                            m2::PointD const & startDirection, m2::PointD const & finalPoint);
 
-TRouteResult CalculateRoute(IRouterComponents const & routerComponents,
-                            Checkpoints const & checkpoints, GuidesTracks && guides);
+TRouteResult CalculateRoute(IRouterComponents const & routerComponents, Checkpoints const & checkpoints,
+                            GuidesTracks && guides);
 
 void TestTurnCount(Route const & route, uint32_t expectedTurnCount);
 void TestTurns(Route const & route, std::vector<CarDirection> const & expectedTurns);
@@ -128,20 +122,15 @@ void TestTurns(Route const & route, std::vector<CarDirection> const & expectedTu
 /// && expectedRouteMeters + expectedRouteMeters * relativeError >= route->GetDistance()
 void TestRouteLength(Route const & route, double expectedRouteMeters, double relativeError = 0.01);
 void TestRouteTime(Route const & route, double expectedRouteSeconds, double relativeError = 0.01);
-void TestRoutePointsNumber(Route const & route, size_t expectedPointsNumber,
-                           double relativeError = 0.1);
+void TestRoutePointsNumber(Route const & route, size_t expectedPointsNumber, double relativeError = 0.1);
 
-void CalculateRouteAndTestRouteLength(IRouterComponents const & routerComponents,
-                                      m2::PointD const & startPoint,
-                                      m2::PointD const & startDirection,
-                                      m2::PointD const & finalPoint, double expectedRouteMeters,
-                                      double relativeError = 0.02);
+void CalculateRouteAndTestRouteLength(IRouterComponents const & routerComponents, m2::PointD const & startPoint,
+                                      m2::PointD const & startDirection, m2::PointD const & finalPoint,
+                                      double expectedRouteMeters, double relativeError = 0.02);
 
-void CalculateRouteAndTestRouteTime(IRouterComponents const & routerComponents,
-                                    m2::PointD const & startPoint,
-                                    m2::PointD const & startDirection,
-                                    m2::PointD const & finalPoint, double expectedTimeSeconds,
-                                    double relativeError = 0.07);
+void CalculateRouteAndTestRouteTime(IRouterComponents const & routerComponents, m2::PointD const & startPoint,
+                                    m2::PointD const & startDirection, m2::PointD const & finalPoint,
+                                    double expectedTimeSeconds, double relativeError = 0.07);
 
 void CheckSubwayExistence(Route const & route);
 void CheckSubwayAbsent(Route const & route);
@@ -155,25 +144,21 @@ class TestTurn
   uint32_t const m_roundAboutExitNum;
   bool const m_isValid;
 
-  TestTurn()
-    : m_point({0.0, 0.0})
-    , m_direction(CarDirection::None)
-    , m_roundAboutExitNum(0)
-    , m_isValid(false)
-  {
-  }
+  TestTurn() : m_point({0.0, 0.0}), m_direction(CarDirection::None), m_roundAboutExitNum(0), m_isValid(false) {}
   TestTurn(m2::PointD const & pnt, CarDirection direction, uint32_t roundAboutExitNum)
-    : m_point(pnt), m_direction(direction), m_roundAboutExitNum(roundAboutExitNum), m_isValid(true)
-  {
-  }
+    : m_point(pnt)
+    , m_direction(direction)
+    , m_roundAboutExitNum(roundAboutExitNum)
+    , m_isValid(true)
+  {}
 
 public:
-  const TestTurn & TestValid() const;
-  const TestTurn & TestNotValid() const;
-  const TestTurn & TestPoint(m2::PointD const & expectedPoint, double inaccuracyMeters = 3.) const;
-  const TestTurn & TestDirection(CarDirection expectedDirection) const;
-  const TestTurn & TestOneOfDirections(std::set<CarDirection> const & expectedDirections) const;
-  const TestTurn & TestRoundAboutExitNum(uint32_t expectedRoundAboutExitNum) const;
+  TestTurn const & TestValid() const;
+  TestTurn const & TestNotValid() const;
+  TestTurn const & TestPoint(m2::PointD const & expectedPoint, double inaccuracyMeters = 3.) const;
+  TestTurn const & TestDirection(CarDirection expectedDirection) const;
+  TestTurn const & TestOneOfDirections(std::set<CarDirection> const & expectedDirections) const;
+  TestTurn const & TestRoundAboutExitNum(uint32_t expectedRoundAboutExitNum) const;
 };
 
 /// Extracting appropriate TestTurn if any. If not TestTurn::isValid() returns false.
diff --git a/libs/routing/routing_integration_tests/small_routes.cpp b/libs/routing/routing_integration_tests/small_routes.cpp
index d6f9f0c46..f11d286ae 100644
--- a/libs/routing/routing_integration_tests/small_routes.cpp
+++ b/libs/routing/routing_integration_tests/small_routes.cpp
@@ -120,8 +120,10 @@ UNIT_TEST(SmallRoutes_JustNoError)
   };
 
   std::vector<std::tuple<ms::LatLon, ms::LatLon, m2::PointD, VehicleType>> routesWithDir = {
-      {{-45.433213, -72.739150}, {-45.434484, -72.738892},
-       {-1.3387623880589671899e-06, -4.2558102819612031453e-07}, VehicleType::Car}, // 1
+      {{-45.433213, -72.739150},
+       {-45.434484, -72.738892},
+       {-1.3387623880589671899e-06, -4.2558102819612031453e-07},
+       VehicleType::Car},  // 1
   };
 
   size_t number = 0;
@@ -134,12 +136,9 @@ UNIT_TEST(SmallRoutes_JustNoError)
     std::tie(start, finish, type) = route;
 
     LOG(LINFO, ("Start test without direction, number:", number));
-    TRouteResult result =
-        integration::CalculateRoute(integration::GetVehicleComponents(type),
-                                    mercator::FromLatLon(start), {0., 0.},
-                                    mercator::FromLatLon(finish));
-    TEST_EQUAL(result.second, RouterResultCode::NoError,
-               (std::get<0>(route), std::get<1>(route), std::get<2>(route)));
+    TRouteResult result = integration::CalculateRoute(
+        integration::GetVehicleComponents(type), mercator::FromLatLon(start), {0., 0.}, mercator::FromLatLon(finish));
+    TEST_EQUAL(result.second, RouterResultCode::NoError, (std::get<0>(route), std::get<1>(route), std::get<2>(route)));
   }
 
   number = 0;
@@ -153,10 +152,8 @@ UNIT_TEST(SmallRoutes_JustNoError)
     std::tie(start, finish, direction, type) = route;
 
     LOG(LINFO, ("Start test with direction, number:", number));
-    TRouteResult result =
-        integration::CalculateRoute(integration::GetVehicleComponents(type),
-                                    mercator::FromLatLon(start), direction,
-                                    mercator::FromLatLon(finish));
+    TRouteResult result = integration::CalculateRoute(
+        integration::GetVehicleComponents(type), mercator::FromLatLon(start), direction, mercator::FromLatLon(finish));
     TEST_EQUAL(result.second, RouterResultCode::NoError, ());
   }
 }
diff --git a/libs/routing/routing_integration_tests/speed_camera_notifications_tests.cpp b/libs/routing/routing_integration_tests/speed_camera_notifications_tests.cpp
index d87cd960f..e3a15a7a4 100644
--- a/libs/routing/routing_integration_tests/speed_camera_notifications_tests.cpp
+++ b/libs/routing/routing_integration_tests/speed_camera_notifications_tests.cpp
@@ -45,16 +45,16 @@ location::GpsInfo MoveTo(ms::LatLon const & coords, double speed = -1)
 
 void ChangePosition(ms::LatLon const & coords, double speedKmPH, RoutingSession & routingSession)
 {
-  routingSession.OnLocationPositionChanged(MoveTo({coords.m_lat, coords.m_lon}, measurement_utils::KmphToMps(speedKmPH)));
+  routingSession.OnLocationPositionChanged(
+      MoveTo({coords.m_lat, coords.m_lon}, measurement_utils::KmphToMps(speedKmPH)));
 }
 
 void InitRoutingSession(ms::LatLon const & from, ms::LatLon const & to, RoutingSession & routingSession,
                         SpeedCameraManagerMode mode = SpeedCameraManagerMode::Auto)
 {
   TRouteResult const routeResult =
-    integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                mercator::FromLatLon(from), m2::PointD::Zero(),
-                                mercator::FromLatLon(to));
+      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car), mercator::FromLatLon(from),
+                                  m2::PointD::Zero(), mercator::FromLatLon(to));
 
   Route & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -67,7 +67,8 @@ void InitRoutingSession(ms::LatLon const & from, ms::LatLon const & to, RoutingS
   routingSession.GetSpeedCamManager().SetMode(mode);
   string const engShortJson = R"(
     {
-      "unknown_camera": ")" + kCameraOnTheWay + R"("
+      "unknown_camera": ")" + kCameraOnTheWay +
+                              R"("
     }
   )";
   routingSession.SetLocaleWithJsonForTesting(engShortJson, "en");
@@ -77,9 +78,7 @@ bool CheckVoiceNotification(RoutingSession & routingSession)
 {
   vector<string> notifications;
   routingSession.GenerateNotifications(notifications, false);
-  return any_of(notifications.begin(), notifications.end(), [](auto const & item) {
-    return item == kCameraOnTheWay;
-  });
+  return any_of(notifications.begin(), notifications.end(), [](auto const & item) { return item == kCameraOnTheWay; });
 }
 
 bool CheckBeepSignal(RoutingSession & routingSession)
@@ -138,10 +137,7 @@ UNIT_TEST(SpeedCameraNotification_AutoAlwaysMode_2)
   for (auto const mode : modes)
   {
     RoutingSession routingSession;
-    InitRoutingSession({55.74070, 37.61681} /* from */,
-                       {55.74885, 37.61036} /* to   */,
-                       routingSession,
-                       mode);
+    InitRoutingSession({55.74070, 37.61681} /* from */, {55.74885, 37.61036} /* to   */, routingSession, mode);
 
     {
       double const speedKmPH = 100.0;
@@ -162,10 +158,7 @@ UNIT_TEST(SpeedCameraNotification_AutoAlwaysMode_3)
   for (auto const mode : modes)
   {
     RoutingSession routingSession;
-    InitRoutingSession({55.76801, 37.59363} /* from */,
-                       {55.75947, 37.58484} /* to   */,
-                       routingSession,
-                       mode);
+    InitRoutingSession({55.76801, 37.59363} /* from */, {55.75947, 37.58484} /* to   */, routingSession, mode);
 
     // No danger here.
     {
@@ -198,10 +191,7 @@ UNIT_TEST(SpeedCameraNotification_AutoAlwaysMode_4)
   for (auto const mode : modes)
   {
     RoutingSession routingSession;
-    InitRoutingSession({55.65601, 37.53822} /* from */,
-                       {55.65760, 37.52312} /* to   */,
-                       routingSession,
-                       mode);
+    InitRoutingSession({55.65601, 37.53822} /* from */, {55.65760, 37.52312} /* to   */, routingSession, mode);
 
     {
       double const speedKmPH = 100.0;
@@ -228,10 +218,7 @@ UNIT_TEST(SpeedCameraNotification_AutoAlwaysMode_5)
   for (auto const mode : modes)
   {
     RoutingSession routingSession;
-    InitRoutingSession({55.76801, 37.59363} /* from */,
-                       {55.75947, 37.58484} /* to   */,
-                       routingSession,
-                       mode);
+    InitRoutingSession({55.76801, 37.59363} /* from */, {55.75947, 37.58484} /* to   */, routingSession, mode);
 
     // No danger here.
     {
@@ -261,10 +248,7 @@ UNIT_TEST(SpeedCameraNotification_AutoAlwaysMode_6)
   for (auto const mode : modes)
   {
     RoutingSession routingSession;
-    InitRoutingSession({55.76801, 37.59363} /* from */,
-                       {55.75947, 37.58484} /* to   */,
-                       routingSession,
-                       mode);
+    InitRoutingSession({55.76801, 37.59363} /* from */, {55.75947, 37.58484} /* to   */, routingSession, mode);
 
     // Exceed speed limit before beep zone.
     {
@@ -296,10 +280,7 @@ UNIT_TEST(SpeedCameraNotification_AutoAlwaysMode_7)
   for (auto const mode : modes)
   {
     RoutingSession routingSession;
-    InitRoutingSession({55.76801, 37.59363} /* from */,
-                       {55.75947, 37.58484} /* to   */,
-                       routingSession,
-                       mode);
+    InitRoutingSession({55.76801, 37.59363} /* from */, {55.75947, 37.58484} /* to   */, routingSession, mode);
 
     // Exceed speed limit before beep zone.
     {
@@ -356,8 +337,7 @@ UNIT_TEST(SpeedCameraNotification_AutoAlwaysMode_8)
     RoutingSession routingSession;
     InitRoutingSession({55.6755737, 37.5264126},  // from
                        {55.67052, 37.51893},      // to
-                       routingSession,
-                       mode);
+                       routingSession, mode);
 
     {
       double const speedKmPH = 180.0;
@@ -398,9 +378,7 @@ UNIT_TEST(SpeedCameraNotification_AlwaysMode_1)
 {
   {
     RoutingSession routingSession;
-    InitRoutingSession({55.76801, 37.59363} /* from */,
-                       {55.75947, 37.58484} /* to   */,
-                       routingSession,
+    InitRoutingSession({55.76801, 37.59363} /* from */, {55.75947, 37.58484} /* to   */, routingSession,
                        SpeedCameraManagerMode::Always);
 
     {
@@ -422,9 +400,7 @@ UNIT_TEST(SpeedCameraNotification_AutoMode_1)
 {
   {
     RoutingSession routingSession;
-    InitRoutingSession({55.76801, 37.59363} /* from */,
-                       {55.75947, 37.58484} /* to   */,
-                       routingSession,
+    InitRoutingSession({55.76801, 37.59363} /* from */, {55.75947, 37.58484} /* to   */, routingSession,
                        SpeedCameraManagerMode::Auto);
 
     {
@@ -440,9 +416,7 @@ UNIT_TEST(SpeedCameraNotification_NeverMode_1)
 {
   {
     RoutingSession routingSession;
-    InitRoutingSession({55.76801, 37.59363} /* from */,
-                       {55.75947, 37.58484} /* to   */,
-                       routingSession,
+    InitRoutingSession({55.76801, 37.59363} /* from */, {55.75947, 37.58484} /* to   */, routingSession,
                        SpeedCameraManagerMode::Never);
 
     {
@@ -477,8 +451,8 @@ UNIT_TEST(SpeedCameraNotification_NeverMode_1)
 UNIT_TEST(SpeedCameraNotification_CameraOnMiniRoundabout)
 {
   RoutingSession routingSession;
-  InitRoutingSession({41.201998, 69.109587} /* from */, {41.200358, 69.107051} /* to   */,
-                     routingSession, SpeedCameraManagerMode::Never);
+  InitRoutingSession({41.201998, 69.109587} /* from */, {41.200358, 69.107051} /* to   */, routingSession,
+                     SpeedCameraManagerMode::Never);
   double const speedKmPH = 100.0;
   ChangePosition({41.201998, 69.109587}, speedKmPH, routingSession);
   TEST(!NoCameraFound(routingSession), ());
diff --git a/libs/routing/routing_integration_tests/street_names_test.cpp b/libs/routing/routing_integration_tests/street_names_test.cpp
index 8de66caf7..1cbd2445f 100644
--- a/libs/routing/routing_integration_tests/street_names_test.cpp
+++ b/libs/routing/routing_integration_tests/street_names_test.cpp
@@ -22,10 +22,9 @@ void MoveRoute(Route & route, ms::LatLon const & coords)
 
 UNIT_TEST(RussiaTulskayaToPaveletskayaStreetNamesTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.70839, 37.62145), {0., 0.},
-                                  mercator::FromLatLon(55.73198, 37.63945));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.70839, 37.62145), {0., 0.},
+                                                               mercator::FromLatLon(55.73198, 37.63945));
 
   Route & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -54,7 +53,7 @@ UNIT_TEST(RussiaTulskayaToPaveletskayaStreetNamesTest)
 
   // No more extra last turn, so TestNextStreetName returns "".
   integration::TestCurrentStreetName(route, "Валовая улица");
-  //integration::TestNextStreetName(route, "улица Зацепский Вал");
+  // integration::TestNextStreetName(route, "улица Зацепский Вал");
 
   MoveRoute(route, ms::LatLon(55.730912, 37.636191));
 
diff --git a/libs/routing/routing_integration_tests/transit_route_test.cpp b/libs/routing/routing_integration_tests/transit_route_test.cpp
index 2961640e9..9f1e4a0a3 100644
--- a/libs/routing/routing_integration_tests/transit_route_test.cpp
+++ b/libs/routing/routing_integration_tests/transit_route_test.cpp
@@ -10,10 +10,9 @@ using namespace routing;
 
 UNIT_TEST(Transit_Moscow_CenterToKotelniki_CrossMwm)
 {
-  TRouteResult routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit),
-                                  mercator::FromLatLon(55.75018, 37.60971), {0.0, 0.0},
-                                  mercator::FromLatLon(55.67245, 37.86130));
+  TRouteResult routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit),
+                                                         mercator::FromLatLon(55.75018, 37.60971), {0.0, 0.0},
+                                                         mercator::FromLatLon(55.67245, 37.86130));
   TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ());
 
   integration::TestRouteLength(*routeResult.first, 22968.6);
@@ -24,10 +23,9 @@ UNIT_TEST(Transit_Moscow_CenterToKotelniki_CrossMwm)
 
 UNIT_TEST(Transit_Moscow_DubrovkaToTrtykovskya)
 {
-  TRouteResult routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit),
-                                  mercator::FromLatLon(55.71813, 37.67756), {0.0, 0.0},
-                                  mercator::FromLatLon(55.74089, 37.62831));
+  TRouteResult routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit),
+                                                         mercator::FromLatLon(55.71813, 37.67756), {0.0, 0.0},
+                                                         mercator::FromLatLon(55.74089, 37.62831));
   TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ());
 
   integration::TestRouteLength(*routeResult.first, 7622.19);
@@ -38,10 +36,9 @@ UNIT_TEST(Transit_Moscow_DubrovkaToTrtykovskya)
 
 UNIT_TEST(Transit_Moscow_NoSubwayTest)
 {
-  TRouteResult routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit),
-                                  mercator::FromLatLon(55.73893, 37.62438), {0.0, 0.0},
-                                  mercator::FromLatLon(55.73470, 37.62617));
+  TRouteResult routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit),
+                                                         mercator::FromLatLon(55.73893, 37.62438), {0.0, 0.0},
+                                                         mercator::FromLatLon(55.73470, 37.62617));
   TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ());
 
   integration::TestRouteLength(*routeResult.first, 604.86);
@@ -52,10 +49,9 @@ UNIT_TEST(Transit_Moscow_NoSubwayTest)
 
 UNIT_TEST(Transit_Piter_FrunzenskyaToPlochadVosstaniya)
 {
-  TRouteResult routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit),
-                                  mercator::FromLatLon(59.90511, 30.31425), {0.0, 0.0},
-                                  mercator::FromLatLon(59.93096, 30.35872));
+  TRouteResult routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit),
+                                                         mercator::FromLatLon(59.90511, 30.31425), {0.0, 0.0},
+                                                         mercator::FromLatLon(59.93096, 30.35872));
   TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ());
 
   /// @todo Check https://github.com/organicmaps/organicmaps/issues/1669 for details.
@@ -67,10 +63,9 @@ UNIT_TEST(Transit_Piter_FrunzenskyaToPlochadVosstaniya)
 
 UNIT_TEST(Transit_Piter_TooLongPedestrian)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit),
-                                  mercator::FromLatLon(59.90511, 30.31425), {0.0, 0.0},
-                                  mercator::FromLatLon(59.78014, 30.50036));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit),
+                                                               mercator::FromLatLon(59.90511, 30.31425), {0.0, 0.0},
+                                                               mercator::FromLatLon(59.78014, 30.50036));
 
   /// @todo Returns valid route now with long pedestrian part in the end, I don't see problems here.
   TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ());
@@ -85,10 +80,9 @@ UNIT_TEST(Transit_Piter_TooLongPedestrian)
 
 UNIT_TEST(Transit_Vatikan_NotEnoughGraphDataAtThenEnd)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit),
-                                  mercator::FromLatLon(41.89543, 12.41481), {0.0, 0.0},
-                                  mercator::FromLatLon(41.89203, 12.46263));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit),
+                                                               mercator::FromLatLon(41.89543, 12.41481), {0.0, 0.0},
+                                                               mercator::FromLatLon(41.89203, 12.46263));
 
   /// @todo Returns valid route now with long pedestrian part in the end, I don't see problems here.
   TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ());
@@ -103,10 +97,9 @@ UNIT_TEST(Transit_Vatikan_NotEnoughGraphDataAtThenEnd)
 
 UNIT_TEST(Transit_Vatikan_CorneliaToOttaviano)
 {
-  TRouteResult routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit),
-                                  mercator::FromLatLon(41.90052, 12.42642), {0.0, 0.0},
-                                  mercator::FromLatLon(41.90414, 12.45640));
+  TRouteResult routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit),
+                                                         mercator::FromLatLon(41.90052, 12.42642), {0.0, 0.0},
+                                                         mercator::FromLatLon(41.90414, 12.45640));
 
   TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ());
 
@@ -119,10 +112,9 @@ UNIT_TEST(Transit_Vatikan_CorneliaToOttaviano)
 
 UNIT_TEST(Transit_London_PoplarToOval)
 {
-  TRouteResult routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit),
-                                  mercator::FromLatLon(51.50818, -0.01634), {0.0, 0.0},
-                                  mercator::FromLatLon(51.48041, -0.10843));
+  TRouteResult routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit),
+                                                         mercator::FromLatLon(51.50818, -0.01634), {0.0, 0.0},
+                                                         mercator::FromLatLon(51.48041, -0.10843));
 
   TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ());
 
@@ -134,10 +126,9 @@ UNIT_TEST(Transit_London_PoplarToOval)
 
 UNIT_TEST(Transit_London_DeptfordBridgeToCyprus)
 {
-  TRouteResult routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit),
-                                  mercator::FromLatLon(51.47149, -0.030558), {0.0, 0.0},
-                                  mercator::FromLatLon(51.51242, 0.07101));
+  TRouteResult routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit),
+                                                         mercator::FromLatLon(51.47149, -0.030558), {0.0, 0.0},
+                                                         mercator::FromLatLon(51.51242, 0.07101));
 
   TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ());
 
@@ -150,10 +141,9 @@ UNIT_TEST(Transit_London_DeptfordBridgeToCyprus)
 
 UNIT_TEST(Transit_Washington_FoggyToShaw)
 {
-  TRouteResult routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit),
-                                  mercator::FromLatLon(38.89582, -77.04934), {0.0, 0.0},
-                                  mercator::FromLatLon(38.91516, -77.01513));
+  TRouteResult routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit),
+                                                         mercator::FromLatLon(38.89582, -77.04934), {0.0, 0.0},
+                                                         mercator::FromLatLon(38.91516, -77.01513));
 
   TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ());
 
@@ -166,10 +156,9 @@ UNIT_TEST(Transit_Washington_FoggyToShaw)
 
 UNIT_TEST(Transit_NewYork_GrassmereToPleasantPlains)
 {
-  TRouteResult routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit),
-                                  mercator::FromLatLon(40.60536, -74.07736), {0.0, 0.0},
-                                  mercator::FromLatLon(40.53015, -74.21559));
+  TRouteResult routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Transit),
+                                                         mercator::FromLatLon(40.60536, -74.07736), {0.0, 0.0},
+                                                         mercator::FromLatLon(40.53015, -74.21559));
 
   TEST_EQUAL(routeResult.second, RouterResultCode::NoError, ());
 
@@ -179,4 +168,4 @@ UNIT_TEST(Transit_NewYork_GrassmereToPleasantPlains)
   CHECK(routeResult.first, ());
   integration::CheckSubwayExistence(*routeResult.first);
 }
-} // namespace transit_route_test
+}  // namespace transit_route_test
diff --git a/libs/routing/routing_integration_tests/turn_test.cpp b/libs/routing/routing_integration_tests/turn_test.cpp
index 4b1a4c230..b5715816d 100644
--- a/libs/routing/routing_integration_tests/turn_test.cpp
+++ b/libs/routing/routing_integration_tests/turn_test.cpp
@@ -17,10 +17,9 @@ using namespace routing::turns;
 // Secondary should be preferred against residential.
 UNIT_TEST(StPetersburg_SideRoadPenalty_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(59.85157, 30.28033), {0., 0.},
-                                  mercator::FromLatLon(59.84268, 30.27589));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(59.85157, 30.28033), {0., 0.},
+                                                               mercator::FromLatLon(59.84268, 30.27589));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -31,10 +30,9 @@ UNIT_TEST(StPetersburg_SideRoadPenalty_TurnTest)
 
 UNIT_TEST(Russia_Moscow_Lenigradskiy39Uturn_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.79683, 37.5379), {0., 0.},
-                                  mercator::FromLatLon(55.80212, 37.5389));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.79683, 37.5379), {0., 0.},
+                                                               mercator::FromLatLon(55.80212, 37.5389));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -52,10 +50,9 @@ UNIT_TEST(Russia_Moscow_Lenigradskiy39Uturn_TurnTest)
 
 UNIT_TEST(Russia_Moscow_SalameiNerisUturn_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.85182, 37.39533), {0., 0.},
-                                  mercator::FromLatLon(55.84386, 37.39250));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.85182, 37.39533), {0., 0.},
+                                                               mercator::FromLatLon(55.84386, 37.39250));
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
 
@@ -73,8 +70,7 @@ UNIT_TEST(Russia_Moscow_SalameiNerisUturn_TurnTest)
       .TestValid()
       .TestPoint({37.38738, 67.63278}, 20.)
       .TestDirection(CarDirection::TurnLeft);
-  integration::GetNthTurn(route, 3)
-      .TestValid().TestDirection(CarDirection::TurnSlightRight);
+  integration::GetNthTurn(route, 3).TestValid().TestDirection(CarDirection::TurnSlightRight);
   integration::GetNthTurn(route, 4)
       .TestValid()
       .TestPoint({37.39052, 67.63310}, 20.)
@@ -86,10 +82,9 @@ UNIT_TEST(Russia_Moscow_SalameiNerisUturn_TurnTest)
 // Fails because consider service roads are roundabout exits.
 UNIT_TEST(Russia_Moscow_TrikotagniAndPohodniRoundabout_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.83118, 37.40515), {0., 0.},
-                                  mercator::FromLatLon(55.83384, 37.40521));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.83118, 37.40515), {0., 0.},
+                                                               mercator::FromLatLon(55.83384, 37.40521));
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
 
@@ -98,10 +93,7 @@ UNIT_TEST(Russia_Moscow_TrikotagniAndPohodniRoundabout_TurnTest)
   TEST_EQUAL(result, RouterResultCode::NoError, ());
   integration::TestTurnCount(route, 2 /* expectedTurnCount */);
 
-  integration::GetNthTurn(route, 0)
-      .TestValid()
-      .TestDirection(CarDirection::EnterRoundAbout)
-      .TestRoundAboutExitNum(2);
+  integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::EnterRoundAbout).TestRoundAboutExitNum(2);
   integration::GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::LeaveRoundAbout);
 
   integration::TestRouteLength(route, 387.);
@@ -109,20 +101,16 @@ UNIT_TEST(Russia_Moscow_TrikotagniAndPohodniRoundabout_TurnTest)
 
 UNIT_TEST(Sweden_BarlangeRoundabout_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(60.48278, 15.42356), {0., 0.},
-                                  mercator::FromLatLon(60.48462, 15.42120));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(60.48278, 15.42356), {0., 0.},
+                                                               mercator::FromLatLon(60.48462, 15.42120));
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
 
   TEST_EQUAL(result, RouterResultCode::NoError, ());
   integration::TestTurnCount(route, 2 /* expectedTurnCount */);
 
-  integration::GetNthTurn(route, 0)
-      .TestValid()
-      .TestDirection(CarDirection::EnterRoundAbout)
-      .TestRoundAboutExitNum(2);
+  integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::EnterRoundAbout).TestRoundAboutExitNum(2);
   integration::GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::LeaveRoundAbout);
 
   integration::TestRouteLength(route, 255.);
@@ -130,10 +118,9 @@ UNIT_TEST(Sweden_BarlangeRoundabout_TurnTest)
 
 UNIT_TEST(Russia_Moscow_PlanetnayaOnlyStraight_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.80215, 37.54663), {0., 0.},
-                                  mercator::FromLatLon(55.80186, 37.5496));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.80215, 37.54663), {0., 0.},
+                                                               mercator::FromLatLon(55.80186, 37.5496));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -150,10 +137,9 @@ UNIT_TEST(Russia_Moscow_PlanetnayaOnlyStraight_TurnTest)
 
 UNIT_TEST(Russia_Moscow_NoTurnsOnMKAD_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.84656, 37.39163), {0., 0.},
-                                  mercator::FromLatLon(55.56661, 37.69254));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.84656, 37.39163), {0., 0.},
+                                                               mercator::FromLatLon(55.56661, 37.69254));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -165,19 +151,16 @@ UNIT_TEST(Russia_Moscow_NoTurnsOnMKAD_TurnTest)
       .TestValid()
       .TestPoint(mercator::FromLatLon(55.5730008, 37.6792393))
       .TestDirection(CarDirection::ExitHighwayToRight);
-  integration::GetNthTurn(route, 2)
-      .TestValid()
-      .TestDirection(CarDirection::TurnSlightRight);
+  integration::GetNthTurn(route, 2).TestValid().TestDirection(CarDirection::TurnSlightRight);
 
   integration::TestRouteLength(route, 43228);
 }
 
 UNIT_TEST(Russia_Moscow_TTKVarshavskoeShosseOut_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.70160, 37.60632), {0., 0.},
-                                  mercator::FromLatLon(55.69349, 37.62122));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.70160, 37.60632), {0., 0.},
+                                                               mercator::FromLatLon(55.69349, 37.62122));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -189,10 +172,9 @@ UNIT_TEST(Russia_Moscow_TTKVarshavskoeShosseOut_TurnTest)
 
 UNIT_TEST(Russia_Moscow_TTKU_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.792848, 37.624424), {0., 0.},
-                                  mercator::FromLatLon(55.792544, 37.624914));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.792848, 37.624424), {0., 0.},
+                                                               mercator::FromLatLon(55.792544, 37.624914));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -207,10 +189,9 @@ UNIT_TEST(Russia_Moscow_TTKU_TurnTest)
 
 UNIT_TEST(Russia_Moscow_ParallelResidentalUTurnAvoiding_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.66192, 37.62852), {0., 0.},
-                                  mercator::FromLatLon(55.66189, 37.63254));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.66192, 37.62852), {0., 0.},
+                                                               mercator::FromLatLon(55.66189, 37.63254));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -224,10 +205,9 @@ UNIT_TEST(Russia_Moscow_ParallelResidentalUTurnAvoiding_TurnTest)
 
 UNIT_TEST(Russia_Moscow_PankratevskiPerBolshaySuharedskazPloschad_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.77177, 37.63556), {0., 0.},
-                                  mercator::FromLatLon(55.77224, 37.63748));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.77177, 37.63556), {0., 0.},
+                                                               mercator::FromLatLon(55.77224, 37.63748));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -246,10 +226,9 @@ UNIT_TEST(Russia_Moscow_PankratevskiPerBolshaySuharedskazPloschad_TurnTest)
 
 UNIT_TEST(Russia_Moscow_MKADPutilkovskeShosse_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.85305, 37.39414), {0., 0.},
-                                  mercator::FromLatLon(55.85099, 37.39105));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.85305, 37.39414), {0., 0.},
+                                                               mercator::FromLatLon(55.85099, 37.39105));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -261,10 +240,9 @@ UNIT_TEST(Russia_Moscow_MKADPutilkovskeShosse_TurnTest)
 
 UNIT_TEST(Russia_Moscow_PetushkovaShodniaRever_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.84104, 37.40591), {0., 0.},
-                                  mercator::FromLatLon(55.83929, 37.40855));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.84104, 37.40591), {0., 0.},
+                                                               mercator::FromLatLon(55.83929, 37.40855));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -275,32 +253,24 @@ UNIT_TEST(Russia_Moscow_PetushkovaShodniaRever_TurnTest)
 
 UNIT_TEST(Russia_HugeRoundabout_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.80141, 37.32581), {0., 0.},
-                                  mercator::FromLatLon(55.80075, 37.32536));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.80141, 37.32581), {0., 0.},
+                                                               mercator::FromLatLon(55.80075, 37.32536));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
 
   TEST_EQUAL(result, RouterResultCode::NoError, ());
   integration::TestTurnCount(route, 2 /* expectedTurnCount */);
-  integration::GetNthTurn(route, 0)
-      .TestValid()
-      .TestDirection(CarDirection::EnterRoundAbout)
-      .TestRoundAboutExitNum(7);
-  integration::GetNthTurn(route, 1)
-      .TestValid()
-      .TestDirection(CarDirection::LeaveRoundAbout)
-      .TestRoundAboutExitNum(7);
+  integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::EnterRoundAbout).TestRoundAboutExitNum(7);
+  integration::GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::LeaveRoundAbout).TestRoundAboutExitNum(7);
 }
 
 UNIT_TEST(Belarus_Misk_ProspNezavisimostiMKAD_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(53.93642, 27.65857), {0., 0.},
-                                  mercator::FromLatLon(53.93933, 27.67046));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(53.93642, 27.65857), {0., 0.},
+                                                               mercator::FromLatLon(53.93933, 27.67046));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -314,10 +284,9 @@ UNIT_TEST(Belarus_Misk_ProspNezavisimostiMKAD_TurnTest)
 // An end user shall be informed about this manoeuvre.
 UNIT_TEST(Russia_Moscow_PetushkovaPetushkova_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.83636, 37.40555), {0., 0.},
-                                  mercator::FromLatLon(55.83707, 37.40489));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.83636, 37.40555), {0., 0.},
+                                                               mercator::FromLatLon(55.83707, 37.40489));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -331,10 +300,9 @@ UNIT_TEST(Russia_Moscow_PetushkovaPetushkova_TurnTest)
 // An end user shall not be informed about such manoeuvres.
 UNIT_TEST(Russia_Moscow_MKADLeningradka_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.87961, 37.43838), {0.0, 0.0},
-                                  mercator::FromLatLon(55.87854, 37.44865));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.87961, 37.43838), {0.0, 0.0},
+                                                               mercator::FromLatLon(55.87854, 37.44865));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -346,10 +314,9 @@ UNIT_TEST(Russia_Moscow_MKADLeningradka_TurnTest)
 
 UNIT_TEST(Belarus_Vitebsk_Shosseinai_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.31541, 29.43123), {0., 0.},
-                                  mercator::FromLatLon(55.31656, 29.42626));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.31541, 29.43123), {0., 0.},
+                                                               mercator::FromLatLon(55.31656, 29.42626));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -361,10 +328,9 @@ UNIT_TEST(Belarus_Vitebsk_Shosseinai_TurnTest)
 // A route goes straight along a big road ignoring joined small roads.
 UNIT_TEST(Thailand_Phuket_NearPrabarameeRoad_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(7.91797, 98.36937), {0., 0.},
-                                  mercator::FromLatLon(7.90724, 98.3679));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(7.91797, 98.36937), {0., 0.},
+                                                               mercator::FromLatLon(7.90724, 98.3679));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -376,10 +342,9 @@ UNIT_TEST(Thailand_Phuket_NearPrabarameeRoad_TurnTest)
 
 UNIT_TEST(Russia_Moscow_VarshavskoeShosseMKAD_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.58210, 37.59695), {0., 0.},
-                                  mercator::FromLatLon(55.57514, 37.61020));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.58210, 37.59695), {0., 0.},
+                                                               mercator::FromLatLon(55.57514, 37.61020));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -392,10 +357,9 @@ UNIT_TEST(Russia_Moscow_VarshavskoeShosseMKAD_TurnTest)
 
 UNIT_TEST(Russia_Moscow_BolshayaNikitskayaOkhotnyRyad_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.75509, 37.61067), {0., 0.},
-                                  mercator::FromLatLon(55.75737, 37.61601));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.75509, 37.61067), {0., 0.},
+                                                               mercator::FromLatLon(55.75737, 37.61601));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -408,10 +372,9 @@ UNIT_TEST(Russia_Moscow_BolshayaNikitskayaOkhotnyRyad_TurnTest)
 
 UNIT_TEST(Russia_Moscow_TverskajaOkhotnyRyad_Test)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.75765, 37.61355), {0., 0.},
-                                  mercator::FromLatLon(55.75737, 37.61601));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.75765, 37.61355), {0., 0.},
+                                                               mercator::FromLatLon(55.75737, 37.61601));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -423,17 +386,16 @@ UNIT_TEST(Russia_Moscow_TverskajaOkhotnyRyad_Test)
 
 UNIT_TEST(Russia_Moscow_BolshoyKislovskiyPerBolshayaNikitinskayaUl_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.75574, 37.60702), {0., 0.},
-                                  mercator::FromLatLon(55.75586, 37.60819));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.75574, 37.60702), {0., 0.},
+                                                               mercator::FromLatLon(55.75586, 37.60819));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
 
   /// @todo Problem with outgoingTurns from RoutingEngineResult::GetPossibleTurns at (turn_m_index == 4).
-  /// For some reason it contains only one possible turn (+90), but it is expected that it will be two of them (-90 and +90).
-  /// This is the reason why the RightTurn is discarded.
+  /// For some reason it contains only one possible turn (+90), but it is expected that it will be two of them (-90 and
+  /// +90). This is the reason why the RightTurn is discarded.
   TEST_EQUAL(result, RouterResultCode::NoError, ());
   integration::TestTurnCount(route, 1 /* expectedTurnCount */);
   integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::TurnRight);
@@ -442,10 +404,9 @@ UNIT_TEST(Russia_Moscow_BolshoyKislovskiyPerBolshayaNikitinskayaUl_TurnTest)
 // Test case: a route goes in Moscow along Leningradskiy Prpt (towards city center).
 UNIT_TEST(Russia_Moscow_LeningradskiyPrptToTheCenterUTurn_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.79368, 37.54833), {0., 0.},
-                                  mercator::FromLatLon(55.79325, 37.54734));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.79368, 37.54833), {0., 0.},
+                                                               mercator::FromLatLon(55.79325, 37.54734));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -457,10 +418,9 @@ UNIT_TEST(Russia_Moscow_LeningradskiyPrptToTheCenterUTurn_TurnTest)
 
 UNIT_TEST(Switzerland_SamstagernBergstrasse_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(47.19307, 8.67594), {0., 0.},
-                                  mercator::FromLatLon(47.19162, 8.67590));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(47.19307, 8.67594), {0., 0.},
+                                                               mercator::FromLatLon(47.19162, 8.67590));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -471,10 +431,9 @@ UNIT_TEST(Switzerland_SamstagernBergstrasse_TurnTest)
 
 UNIT_TEST(Russia_Moscow_MikoiankNoUTurn_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.79041, 37.53770), {0., 0.},
-                                  mercator::FromLatLon(55.79182, 37.53008));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.79041, 37.53770), {0., 0.},
+                                                               mercator::FromLatLon(55.79182, 37.53008));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -485,10 +444,9 @@ UNIT_TEST(Russia_Moscow_MikoiankNoUTurn_TurnTest)
 
 UNIT_TEST(Russia_Moscow_LeningradskiyPrptToTTK_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.78926, 37.55706), {0., 0.},
-                                  mercator::FromLatLon(55.78925, 37.57110));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.78926, 37.55706), {0., 0.},
+                                                               mercator::FromLatLon(55.78925, 37.57110));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -501,10 +459,9 @@ UNIT_TEST(Russia_Moscow_LeningradskiyPrptToTTK_TurnTest)
 
 UNIT_TEST(Russia_Moscow_LeningradskiyPrptDublToTTK_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.79054, 37.55335), {0., 0.},
-                                  mercator::FromLatLon(55.78925, 37.57110));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.79054, 37.55335), {0., 0.},
+                                                               mercator::FromLatLon(55.78925, 37.57110));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -517,10 +474,9 @@ UNIT_TEST(Russia_Moscow_LeningradskiyPrptDublToTTK_TurnTest)
 
 UNIT_TEST(Russia_Moscow_SvobodaSt_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.82484, 37.45151), {0., 0.},
-                                  mercator::FromLatLon(55.81941, 37.45073));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.82484, 37.45151), {0., 0.},
+                                                               mercator::FromLatLon(55.81941, 37.45073));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -532,10 +488,9 @@ UNIT_TEST(Russia_Moscow_SvobodaSt_TurnTest)
 
 UNIT_TEST(Russia_Tiinsk_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(54.37738, 49.63878), {0., 0.},
-                                  mercator::FromLatLon(54.3967, 49.64924));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(54.37738, 49.63878), {0., 0.},
+                                                               mercator::FromLatLon(54.3967, 49.64924));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -548,10 +503,9 @@ UNIT_TEST(Russia_Tiinsk_TurnTest)
 
 UNIT_TEST(Netherlands_GorinchemBridge_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(51.84131, 4.94825), {0., 0.},
-                                  mercator::FromLatLon(51.81518, 4.93773));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(51.84131, 4.94825), {0., 0.},
+                                                               mercator::FromLatLon(51.81518, 4.93773));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -562,10 +516,9 @@ UNIT_TEST(Netherlands_GorinchemBridge_TurnTest)
 
 UNIT_TEST(Russia_Voronezh_ProspTruda_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(51.67205, 39.16334), {0., 0.},
-                                  mercator::FromLatLon(51.67193, 39.15636));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(51.67205, 39.16334), {0., 0.},
+                                                               mercator::FromLatLon(51.67193, 39.15636));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -578,10 +531,9 @@ UNIT_TEST(Russia_Voronezh_ProspTruda_TurnTest)
 
 UNIT_TEST(Germany_FrankfurtAirport_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(50.07094, 8.61299), {0., 0.},
-                                  mercator::FromLatLon(50.05807, 8.59542));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(50.07094, 8.61299), {0., 0.},
+                                                               mercator::FromLatLon(50.05807, 8.59542));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -595,10 +547,9 @@ UNIT_TEST(Germany_FrankfurtAirport_TurnTest)
 
 UNIT_TEST(Germany_FrankfurtAirport2_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(50.03249, 8.50814), {0., 0.},
-                                  mercator::FromLatLon(50.01504, 8.49585));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(50.03249, 8.50814), {0., 0.},
+                                                               mercator::FromLatLon(50.01504, 8.49585));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -612,10 +563,9 @@ UNIT_TEST(Germany_FrankfurtAirport2_TurnTest)
 // Test on absence of unnecessary turn which may appear between two turns in the test.
 UNIT_TEST(Russia_Kubinka_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.58533, 36.83779), {0., 0.},
-                                  mercator::FromLatLon(55.58365, 36.8333));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.58533, 36.83779), {0., 0.},
+                                                               mercator::FromLatLon(55.58365, 36.8333));
 
   RouterResultCode const result = routeResult.second;
 
@@ -623,17 +573,16 @@ UNIT_TEST(Russia_Kubinka_TurnTest)
 
   /// @todo Even if there is no way forward (only left), I think we should make left-turn instruction here:
   /// https://www.openstreetmap.org/#map=19/55.5897942/36.8821785
-  integration::TestTurns(*routeResult.first, { CarDirection::TurnLeft, CarDirection::TurnLeft,
-                                               CarDirection::TurnLeft, CarDirection::TurnLeft });
+  integration::TestTurns(*routeResult.first, {CarDirection::TurnLeft, CarDirection::TurnLeft, CarDirection::TurnLeft,
+                                              CarDirection::TurnLeft});
 }
 
 // Test on absence of unnecessary turn.
 UNIT_TEST(Austria_Kitzbuhel_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(47.46894, 12.3841), {0., 0.},
-                                  mercator::FromLatLon(47.46543, 12.38599));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(47.46894, 12.3841), {0., 0.},
+                                                               mercator::FromLatLon(47.46543, 12.38599));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -645,10 +594,9 @@ UNIT_TEST(Austria_Kitzbuhel_TurnTest)
 // Test on absence of unnecessary turn.
 UNIT_TEST(Austria_Kitzbuhel2_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(47.45119, 12.3841), {0., 0.},
-                                  mercator::FromLatLon(47.45021, 12.382));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(47.45119, 12.3841), {0., 0.},
+                                                               mercator::FromLatLon(47.45021, 12.382));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -660,10 +608,9 @@ UNIT_TEST(Austria_Kitzbuhel2_TurnTest)
 // Test on absence of unnecessary turn in case of fake ingoing segment.
 UNIT_TEST(Austria_Kitzbuhel3_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(47.45362, 12.38709), {0., 0.},
-                                  mercator::FromLatLon(47.45255, 12.38498));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(47.45362, 12.38709), {0., 0.},
+                                                               mercator::FromLatLon(47.45255, 12.38498));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -675,10 +622,9 @@ UNIT_TEST(Austria_Kitzbuhel3_TurnTest)
 // Test on absence of unnecessary turn.
 UNIT_TEST(Austria_BrixentalStrasse_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(47.45091, 12.33453), {0., 0.},
-                                  mercator::FromLatLon(47.45038, 12.32592));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(47.45091, 12.33453), {0., 0.},
+                                                               mercator::FromLatLon(47.45038, 12.32592));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -689,10 +635,9 @@ UNIT_TEST(Austria_BrixentalStrasse_TurnTest)
 
 UNIT_TEST(Russia_Moscow_LeningradkaToMKAD_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.87192, 37.45772), {0., 0.},
-                                  mercator::FromLatLon(55.87594, 37.45266));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.87192, 37.45772), {0., 0.},
+                                                               mercator::FromLatLon(55.87594, 37.45266));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -704,10 +649,9 @@ UNIT_TEST(Russia_Moscow_LeningradkaToMKAD_TurnTest)
 
 UNIT_TEST(Russia_Moscow_MKADToSvoboda_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.8801, 37.43862), {0., 0.},
-                                  mercator::FromLatLon(55.87583, 37.43046));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.8801, 37.43862), {0., 0.},
+                                                               mercator::FromLatLon(55.87583, 37.43046));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -720,10 +664,9 @@ UNIT_TEST(Russia_Moscow_MKADToSvoboda_TurnTest)
 // Test that there's no turns if to follow MKAD.
 UNIT_TEST(Netherlands_Barneveld_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(52.15866, 5.56538), {0., 0.},
-                                  mercator::FromLatLon(52.17042, 5.55834));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(52.15866, 5.56538), {0., 0.},
+                                                               mercator::FromLatLon(52.17042, 5.55834));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -731,7 +674,8 @@ UNIT_TEST(Netherlands_Barneveld_TurnTest)
   TEST_EQUAL(result, RouterResultCode::NoError, ());
   /// @todo Probably, reasonable solution from GraphHopper with NO turns:
   // https://www.openstreetmap.org/directions?engine=graphhopper_car&route=52.15866%2C5.56538%3B52.17042%2C5.55834
-  // Even if there is no other options, I think that we should show left-turn here https://www.openstreetmap.org/node/286040021
+  // Even if there is no other options, I think that we should show left-turn here
+  // https://www.openstreetmap.org/node/286040021
 
   integration::TestTurnCount(route, 1);
   integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::GoStraight);
@@ -739,10 +683,9 @@ UNIT_TEST(Netherlands_Barneveld_TurnTest)
 
 UNIT_TEST(Belarus_Minsk_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(53.90991, 27.57946), {0., 0.},
-                                  mercator::FromLatLon(53.91552, 27.58211));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(53.90991, 27.57946), {0., 0.},
+                                                               mercator::FromLatLon(53.91552, 27.58211));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -755,10 +698,9 @@ UNIT_TEST(Belarus_Minsk_TurnTest)
 // Test on building route from a point close to mwm border to a point close to a mwm border.
 UNIT_TEST(England_London_ExitToLeft_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(51.603582, 0.266995), {0.0, 0.0},
-                                  mercator::FromLatLon(51.606785, 0.264055));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(51.603582, 0.266995), {0.0, 0.0},
+                                                               mercator::FromLatLon(51.606785, 0.264055));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -771,10 +713,9 @@ UNIT_TEST(England_London_ExitToLeft_TurnTest)
 // Test on the route from Leninsky prospect to its frontage road and turns generated on the route.
 UNIT_TEST(Russia_Moscow_LeninskyProsp_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.69035, 37.54948), {0., 0.},
-                                  mercator::FromLatLon(55.69188, 37.55293));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.69035, 37.54948), {0., 0.},
+                                                               mercator::FromLatLon(55.69188, 37.55293));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -787,10 +728,9 @@ UNIT_TEST(Russia_Moscow_LeninskyProsp_TurnTest)
 // Test on the route from TTK (primary) to a link.
 UNIT_TEST(Russia_Moscow_TTKToLink_TurnTest)
 {
-TRouteResult const routeResult =
-    integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                mercator::FromLatLon(55.78594, 37.56656), {0., 0.},
-                                mercator::FromLatLon(55.78598, 37.56737));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.78594, 37.56656), {0., 0.},
+                                                               mercator::FromLatLon(55.78598, 37.56737));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -803,10 +743,9 @@ TRouteResult const routeResult =
 // Test on the turn from TTK (primary) to a secondary road.
 UNIT_TEST(Russia_Moscow_TTKToBegovayAlleya_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.77946, 37.55779), {0., 0.},
-                                  mercator::FromLatLon(55.77956, 37.55891));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.77946, 37.55779), {0., 0.},
+                                                               mercator::FromLatLon(55.77956, 37.55891));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -819,10 +758,9 @@ UNIT_TEST(Russia_Moscow_TTKToBegovayAlleya_TurnTest)
 // Test on the turn from TTK (primary) to a service road. The angle of the turn is not slight.
 UNIT_TEST(Russia_Moscow_TTKToService_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.78856, 37.57017), {0., 0.},
-                                  mercator::FromLatLon(55.78869, 37.57133));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.78856, 37.57017), {0., 0.},
+                                                               mercator::FromLatLon(55.78869, 37.57133));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -835,10 +773,9 @@ UNIT_TEST(Russia_Moscow_TTKToService_TurnTest)
 // Test on a turn from TTK (primary) to an unclassified road. The angle of the turn is slight.
 UNIT_TEST(Russia_Moscow_TTKToNMaslovka_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.79057, 37.57292), {0., 0.},
-                                  mercator::FromLatLon(55.79132, 37.57481));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.79057, 37.57292), {0., 0.},
+                                                               mercator::FromLatLon(55.79132, 37.57481));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -850,10 +787,9 @@ UNIT_TEST(Russia_Moscow_TTKToNMaslovka_TurnTest)
 
 UNIT_TEST(Russia_Moscow_Complicated_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.68412, 37.60166), {0., 0.},
-                                  mercator::FromLatLon(55.68426, 37.59854));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.68412, 37.60166), {0., 0.},
+                                                               mercator::FromLatLon(55.68426, 37.59854));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -867,10 +803,9 @@ UNIT_TEST(Russia_Moscow_Complicated_TurnTest)
 
 UNIT_TEST(USA_Tampa_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(28.04875, -82.58292), {0., 0.},
-                                  mercator::FromLatLon(28.04459, -82.58448));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(28.04875, -82.58292), {0., 0.},
+                                                               mercator::FromLatLon(28.04459, -82.58448));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -884,10 +819,9 @@ UNIT_TEST(USA_Tampa_TurnTest)
 // Test on go straight direction if it's possible to go through a roundabout.
 UNIT_TEST(Russia_Moscow_Minskia1_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.7355, 37.48717), {0., 0.},
-                                  mercator::FromLatLon(55.73694, 37.48587));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.7355, 37.48717), {0., 0.},
+                                                               mercator::FromLatLon(55.73694, 37.48587));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -898,10 +832,9 @@ UNIT_TEST(Russia_Moscow_Minskia1_TurnTest)
 
 UNIT_TEST(Russia_Moscow_Minskia2_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.74244, 37.4808), {0., 0.},
-                                  mercator::FromLatLon(55.74336, 37.48124));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.74244, 37.4808), {0., 0.},
+                                                               mercator::FromLatLon(55.74336, 37.48124));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -915,10 +848,9 @@ UNIT_TEST(Russia_Moscow_Minskia2_TurnTest)
 // despite the fact that a small road adjoins immediately after the turn point.
 UNIT_TEST(Russia_Moscow_Barikadnai_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.75979, 37.58502), {0., 0.},
-                                  mercator::FromLatLon(55.75936, 37.58286));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.75979, 37.58502), {0., 0.},
+                                                               mercator::FromLatLon(55.75936, 37.58286));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -931,10 +863,9 @@ UNIT_TEST(Russia_Moscow_Barikadnai_TurnTest)
 // This test on getting correct (far enough) outgoing turn point (result of method GetPointForTurn()).
 UNIT_TEST(Russia_Moscow_Komsomolsky_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.73442, 37.59391), {0., 0.},
-                                  mercator::FromLatLon(55.73485, 37.59543));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.73442, 37.59391), {0., 0.},
+                                                               mercator::FromLatLon(55.73485, 37.59543));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -947,10 +878,9 @@ UNIT_TEST(Russia_Moscow_Komsomolsky_TurnTest)
 // Test on no go straight direction in case of a route along a big road and pass smaller ones.
 UNIT_TEST(Russia_Moscow_TTKNoGoStraight_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.78949, 37.5711), {0., 0.},
-                                  mercator::FromLatLon(55.78673, 37.56726));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.78949, 37.5711), {0., 0.},
+                                                               mercator::FromLatLon(55.78673, 37.56726));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -961,10 +891,9 @@ UNIT_TEST(Russia_Moscow_TTKNoGoStraight_TurnTest)
 
 UNIT_TEST(Russia_MoscowLeninskyProsp2_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.80376, 37.52048), {0., 0.},
-                                  mercator::FromLatLon(55.80442, 37.51802));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.80376, 37.52048), {0., 0.},
+                                                               mercator::FromLatLon(55.80442, 37.51802));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -976,10 +905,9 @@ UNIT_TEST(Russia_MoscowLeninskyProsp2_TurnTest)
 
 UNIT_TEST(Germany_ShuttleTrain_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(54.78152, 8.83952), {0., 0.},
-                                  mercator::FromLatLon(54.79281, 8.83466));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(54.78152, 8.83952), {0., 0.},
+                                                               mercator::FromLatLon(54.79281, 8.83466));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -995,10 +923,9 @@ UNIT_TEST(Germany_ShuttleTrain_TurnTest)
 
 UNIT_TEST(Germany_ShuttleTrain2_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(54.90181, 8.32472), {0., 0.},
-                                  mercator::FromLatLon(54.91681, 8.31346));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(54.90181, 8.32472), {0., 0.},
+                                                               mercator::FromLatLon(54.91681, 8.31346));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -1014,10 +941,9 @@ UNIT_TEST(Germany_ShuttleTrain2_TurnTest)
 
 UNIT_TEST(Cyprus_Nicosia_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(35.12459, 33.34449), {0., 0.},
-                                  mercator::FromLatLon(35.13832, 33.34741));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(35.12459, 33.34449), {0., 0.},
+                                                               mercator::FromLatLon(35.13832, 33.34741));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -1031,10 +957,9 @@ UNIT_TEST(Cyprus_Nicosia_TurnTest)
 
 UNIT_TEST(Cyprus_Nicosia2_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(35.14528, 33.34014), {0., 0.},
-                                  mercator::FromLatLon(35.13930, 33.34171));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(35.14528, 33.34014), {0., 0.},
+                                                               mercator::FromLatLon(35.13930, 33.34171));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -1048,10 +973,9 @@ UNIT_TEST(Cyprus_Nicosia2_TurnTest)
 
 UNIT_TEST(Cyprus_NicosiaPresidentialPark_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(35.15992, 33.34625), {0., 0.},
-                                  mercator::FromLatLon(35.15837, 33.35058));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(35.15992, 33.34625), {0., 0.},
+                                                               mercator::FromLatLon(35.15837, 33.35058));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -1064,10 +988,9 @@ UNIT_TEST(Cyprus_NicosiaPresidentialPark_TurnTest)
 
 UNIT_TEST(Cyprus_NicosiaSchoolParking_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(35.15395, 33.35000), {0., 0.},
-                                  mercator::FromLatLon(35.15159, 33.34961));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(35.15395, 33.35000), {0., 0.},
+                                                               mercator::FromLatLon(35.15159, 33.34961));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -1081,10 +1004,9 @@ UNIT_TEST(Cyprus_NicosiaSchoolParking_TurnTest)
 UNIT_TEST(Cyprus_NicosiaStartRoundabout_TurnTest)
 {
   // Start movement at roundabout.
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(35.12788, 33.36568), {0., 0.},
-                                  mercator::FromLatLon(35.12302, 33.37632));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(35.12788, 33.36568), {0., 0.},
+                                                               mercator::FromLatLon(35.12302, 33.37632));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -1102,10 +1024,9 @@ UNIT_TEST(Cyprus_NicosiaStartRoundabout_TurnTest)
 
 UNIT_TEST(Cyprus_NicosiaSmallRoundabout_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(35.13103, 33.37222), {0., 0.},
-                                  mercator::FromLatLon(35.13099, 33.37089));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(35.13103, 33.37222), {0., 0.},
+                                                               mercator::FromLatLon(35.13099, 33.37089));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -1122,10 +1043,9 @@ UNIT_TEST(Cyprus_NicosiaSmallRoundabout_TurnTest)
 
 UNIT_TEST(Cyprus_A1AlphaMega_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(34.81834, 33.35914), {0., 0.},
-                                  mercator::FromLatLon(34.81881, 33.36561));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(34.81834, 33.35914), {0., 0.},
+                                                               mercator::FromLatLon(34.81881, 33.36561));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -1139,10 +1059,9 @@ UNIT_TEST(Cyprus_A1AlphaMega_TurnTest)
 
 UNIT_TEST(Crimea_Roundabout_test)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(45.20895, 33.32677), {0., 0.},
-                                  mercator::FromLatLon(45.20899, 33.32840));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(45.20895, 33.32677), {0., 0.},
+                                                               mercator::FromLatLon(45.20899, 33.32840));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -1156,13 +1075,11 @@ UNIT_TEST(Crimea_Roundabout_test)
   integration::GetNthTurn(route, 1).TestValid().TestRoundAboutExitNum(3);
 }
 
-
 UNIT_TEST(Russia_Moscow_OnlyUTurnTest1_TurnTest)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(55.90382, 37.40219), {0.0, 0.0},
-                                  mercator::FromLatLon(55.90278, 37.40354));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(55.90382, 37.40219), {0.0, 0.0},
+                                                               mercator::FromLatLon(55.90278, 37.40354));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -1200,10 +1117,9 @@ UNIT_TEST(Russia_Moscow_OnlyUTurnTest1WithDirection_TurnTest)
 // Slight turn to the long link which is followed by another link.
 UNIT_TEST(USA_California_Cupertino_TurnTestNextRoad)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(37.5018242, -122.3294851), {0., 0.},
-                                  mercator::FromLatLon(37.5110368, -122.3317238));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(37.5018242, -122.3294851), {0., 0.},
+                                                               mercator::FromLatLon(37.5110368, -122.3317238));
 
   Route & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -1236,10 +1152,9 @@ UNIT_TEST(USA_California_Cupertino_TurnTestNextRoad)
 // Take destination from link and destination_ref from the next road.
 UNIT_TEST(Cyprus_Governors_Beach_TurnTestNextRoad)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(34.7247792, 33.2719482), {0., 0.},
-                                  mercator::FromLatLon(34.7230031, 33.2727327));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(34.7247792, 33.2719482), {0., 0.},
+                                                               mercator::FromLatLon(34.7230031, 33.2727327));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -1261,10 +1176,9 @@ UNIT_TEST(Cyprus_Governors_Beach_TurnTestNextRoad)
 // Exit which is marked as non-link, but has link tags m_destination_ref and m_destination.
 UNIT_TEST(Cyprus_A1_A5_TurnTestNextRoad)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(34.83254, 33.3835), {0., 0.},
-                                  mercator::FromLatLon(34.83793, 33.3926));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(34.83254, 33.3835), {0., 0.},
+                                                               mercator::FromLatLon(34.83793, 33.3926));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -1283,10 +1197,9 @@ UNIT_TEST(Cyprus_A1_A5_TurnTestNextRoad)
 
 UNIT_TEST(Zurich_UseMainTurn)
 {
-  TRouteResult const routeResult =
-      integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                  mercator::FromLatLon(47.364832, 8.5656975), {0., 0.},
-                                  mercator::FromLatLon(47.3640678, 8.56567312));
+  TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                               mercator::FromLatLon(47.364832, 8.5656975), {0., 0.},
+                                                               mercator::FromLatLon(47.3640678, 8.56567312));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -1297,15 +1210,15 @@ UNIT_TEST(Zurich_UseMainTurn)
 
 namespace
 {
-template <class ContT> void TestNoTurns(ContT const & cont)
+template <class ContT>
+void TestNoTurns(ContT const & cont)
 {
   double constexpr kLengthEps = 0.07;
   for (auto const & e : cont)
   {
-    TRouteResult const routeResult =
-        integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
-                                    mercator::FromLatLon(std::get<0>(e)), {0., 0.},
-                                    mercator::FromLatLon(std::get<1>(e)));
+    TRouteResult const routeResult = integration::CalculateRoute(integration::GetVehicleComponents(VehicleType::Car),
+                                                                 mercator::FromLatLon(std::get<0>(e)), {0., 0.},
+                                                                 mercator::FromLatLon(std::get<1>(e)));
 
     Route const & route = *routeResult.first;
 
@@ -1314,7 +1227,7 @@ template <class ContT> void TestNoTurns(ContT const & cont)
     integration::TestRouteLength(route, std::get<2>(e), kLengthEps);
   }
 }
-} // namespace
+}  // namespace
 
 // https://github.com/organicmaps/organicmaps/issues/3502
 // https://github.com/organicmaps/organicmaps/issues/3033
@@ -1322,9 +1235,9 @@ template <class ContT> void TestNoTurns(ContT const & cont)
 UNIT_TEST(Germany_KeepAutobahn)
 {
   std::tuple<ms::LatLon, ms::LatLon, double> const arr[] = {
-    {{49.5420136, 8.629177}, {49.5576215, 8.62859822}, 1751.17},
-    {{53.5199679, 9.92345253}, {53.5096004, 9.91256825}, 1372.76},
-    {{51.4975424, 7.37520535}, {51.4962435, 7.39677738}, 1515.98},
+      {{49.5420136, 8.629177}, {49.5576215, 8.62859822}, 1751.17},
+      {{53.5199679, 9.92345253}, {53.5096004, 9.91256825}, 1372.76},
+      {{51.4975424, 7.37520535}, {51.4962435, 7.39677738}, 1515.98},
   };
 
   TestNoTurns(arr);
@@ -1333,11 +1246,11 @@ UNIT_TEST(Germany_KeepAutobahn)
 UNIT_TEST(Netherlands_KeepMotorway)
 {
   std::tuple<ms::LatLon, ms::LatLon, double> const arr[] = {
-    {{51.8931315, 4.97688292}, {51.9036608, 4.98102951}, 1207.2},
-    {{51.9520042, 5.01800176}, {51.9554951, 5.04231452}, 1756.01},
-    {{53.1681112, 6.32039999}, {53.1742275, 6.34811597}, 1974.06},
-    {{50.8212427, 5.71921469}, {50.8095839, 5.72344881}, 1335.63},
-    {{50.8102145, 5.72357486}, {50.8188569, 5.72027848}, 990.868},
+      {{51.8931315, 4.97688292}, {51.9036608, 4.98102951}, 1207.2},
+      {{51.9520042, 5.01800176}, {51.9554951, 5.04231452}, 1756.01},
+      {{53.1681112, 6.32039999}, {53.1742275, 6.34811597}, 1974.06},
+      {{50.8212427, 5.71921469}, {50.8095839, 5.72344881}, 1335.63},
+      {{50.8102145, 5.72357486}, {50.8188569, 5.72027848}, 990.868},
   };
 
   TestNoTurns(arr);
@@ -1346,7 +1259,7 @@ UNIT_TEST(Netherlands_KeepMotorway)
 UNIT_TEST(Denmark_KeepMotorway)
 {
   std::tuple<ms::LatLon, ms::LatLon, double> const arr[] = {
-    {{55.4104141, 10.0680896}, {55.4131084, 10.042873}, 1644.25},
+      {{55.4104141, 10.0680896}, {55.4131084, 10.042873}, 1644.25},
   };
 
   TestNoTurns(arr);
@@ -1355,7 +1268,7 @@ UNIT_TEST(Denmark_KeepMotorway)
 UNIT_TEST(Russia_KeepMotorway)
 {
   std::tuple<ms::LatLon, ms::LatLon, double> const arr[] = {
-    {{55.812527, 49.133837}, {55.830214, 49.13403}, 1971},
+      {{55.812527, 49.133837}, {55.830214, 49.13403}, 1971},
   };
 
   TestNoTurns(arr);
@@ -1364,7 +1277,7 @@ UNIT_TEST(Russia_KeepMotorway)
 UNIT_TEST(Israel_KeepMotorway)
 {
   std::tuple<ms::LatLon, ms::LatLon, double> const arr[] = {
-    {{32.1980276, 34.8190575}, {32.2047149, 34.8216021}, 804.572},
+      {{32.1980276, 34.8190575}, {32.2047149, 34.8216021}, 804.572},
   };
 
   TestNoTurns(arr);
@@ -1375,9 +1288,9 @@ UNIT_TEST(Israel_KeepMotorway)
 UNIT_TEST(UK_Junction_Circular)
 {
   using namespace integration;
-  TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car),
-                                                  mercator::FromLatLon(53.53692, -2.28832), {0., 0.},
-                                                  mercator::FromLatLon(53.54025, -2.28701));
+  TRouteResult const routeResult =
+      CalculateRoute(GetVehicleComponents(VehicleType::Car), mercator::FromLatLon(53.53692, -2.28832), {0., 0.},
+                     mercator::FromLatLon(53.54025, -2.28701));
 
   Route const & route = *routeResult.first;
   RouterResultCode const result = routeResult.second;
@@ -1397,31 +1310,31 @@ UNIT_TEST(Integrated_TurnTest_IncludeServiceRoads)
     int expectedTurns;
   };
   Sample arr[] = {
-    // https://github.com/organicmaps/organicmaps/issues/8892
-    {{50.128011, 14.7100098}, {50.1283017, 14.7119639}, 3},
-    {{50.1283462, 14.7122953}, {50.1280032, 14.7099638}, 3},
-    // https://github.com/organicmaps/organicmaps/issues/5888
-    {{58.8428062, 5.71619759}, {58.8422583, 5.71672851}, 3},
-    // https://github.com/organicmaps/organicmaps/issues/3596
-    {{38.7114203, 0.0365096768}, {38.7103102, 0.0349380496}, 2},
+      // https://github.com/organicmaps/organicmaps/issues/8892
+      {{50.128011, 14.7100098}, {50.1283017, 14.7119639}, 3},
+      {{50.1283462, 14.7122953}, {50.1280032, 14.7099638}, 3},
+      // https://github.com/organicmaps/organicmaps/issues/5888
+      {{58.8428062, 5.71619759}, {58.8422583, 5.71672851}, 3},
+      // https://github.com/organicmaps/organicmaps/issues/3596
+      {{38.7114203, 0.0365096768}, {38.7103102, 0.0349380496}, 2},
   };
 
   for (auto const & s : arr)
   {
     using namespace integration;
-    TRouteResult const routeResult = CalculateRoute(GetVehicleComponents(VehicleType::Car),
-                                                    mercator::FromLatLon(s.start), {0., 0.},
-                                                    mercator::FromLatLon(s.finish));
+    TRouteResult const routeResult =
+        CalculateRoute(GetVehicleComponents(VehicleType::Car), mercator::FromLatLon(s.start), {0., 0.},
+                       mercator::FromLatLon(s.finish));
 
     Route const & route = *routeResult.first;
     RouterResultCode const result = routeResult.second;
     TEST_EQUAL(result, RouterResultCode::NoError, ());
 
     GetNthTurn(route, 0)
-      .TestValid()
-      .TestDirection(CarDirection::EnterRoundAbout)
-      .TestRoundAboutExitNum(s.expectedTurns);
+        .TestValid()
+        .TestDirection(CarDirection::EnterRoundAbout)
+        .TestRoundAboutExitNum(s.expectedTurns);
   }
 }
 
-} // namespace turn_test
+}  // namespace turn_test
diff --git a/libs/routing/routing_options.cpp b/libs/routing/routing_options.cpp
index 11c6e292b..69832371e 100644
--- a/libs/routing/routing_options.cpp
+++ b/libs/routing/routing_options.cpp
@@ -31,8 +31,7 @@ RoutingOptions RoutingOptions::LoadCarOptionsFromSettings()
 // static
 void RoutingOptions::SaveCarOptionsToSettings(RoutingOptions options)
 {
-  settings::Set(kAvoidRoutingOptionSettingsForCar,
-                strings::to_string(static_cast<int32_t>(options.GetOptions())));
+  settings::Set(kAvoidRoutingOptionSettingsForCar, strings::to_string(static_cast<int32_t>(options.GetOptions())));
 }
 
 void RoutingOptions::Add(RoutingOptions::Road type)
@@ -57,17 +56,16 @@ RoutingOptionsClassifier::RoutingOptionsClassifier()
   Classificator const & c = classif();
 
   pair<vector<string>, RoutingOptions::Road> const types[] = {
-    {{"highway", "motorway"},             RoutingOptions::Road::Motorway},
+      {{"highway", "motorway"}, RoutingOptions::Road::Motorway},
 
-    {{"hwtag", "toll"},                   RoutingOptions::Road::Toll},
+      {{"hwtag", "toll"}, RoutingOptions::Road::Toll},
 
-    {{"route", "ferry"},                  RoutingOptions::Road::Ferry},
+      {{"route", "ferry"}, RoutingOptions::Road::Ferry},
 
-    {{"highway", "track"},                RoutingOptions::Road::Dirty},
-    {{"highway", "road"},                 RoutingOptions::Road::Dirty},
-    {{"psurface", "unpaved_bad"},         RoutingOptions::Road::Dirty},
-    {{"psurface", "unpaved_good"},        RoutingOptions::Road::Dirty}
-  };
+      {{"highway", "track"}, RoutingOptions::Road::Dirty},
+      {{"highway", "road"}, RoutingOptions::Road::Dirty},
+      {{"psurface", "unpaved_bad"}, RoutingOptions::Road::Dirty},
+      {{"psurface", "unpaved_good"}, RoutingOptions::Road::Dirty}};
 
   m_data.Reserve(std::size(types));
   for (auto const & data : types)
@@ -77,7 +75,7 @@ RoutingOptionsClassifier::RoutingOptionsClassifier()
 
 optional<RoutingOptions::Road> RoutingOptionsClassifier::Get(uint32_t type) const
 {
-  ftype::TruncValue(type, 2); // in case of highway-motorway-bridge
+  ftype::TruncValue(type, 2);  // in case of highway-motorway-bridge
 
   auto const * res = m_data.Find(type);
   if (res)
@@ -114,7 +112,8 @@ string DebugPrint(RoutingOptions const & routingOptions)
   ss << "RoutingOptions: {";
 
   bool wasAppended = false;
-  auto const append = [&](RoutingOptions::Road road) {
+  auto const append = [&](RoutingOptions::Road road)
+  {
     if (routingOptions.Has(road))
     {
       wasAppended = true;
@@ -140,12 +139,12 @@ string DebugPrint(RoutingOptions::Road type)
 {
   switch (type)
   {
-    case RoutingOptions::Road::Toll: return "toll";
-    case RoutingOptions::Road::Motorway: return "motorway";
-    case RoutingOptions::Road::Ferry: return "ferry";
-    case RoutingOptions::Road::Dirty: return "dirty";
-    case RoutingOptions::Road::Usual: return "usual";
-    case RoutingOptions::Road::Max: return "max";
+  case RoutingOptions::Road::Toll: return "toll";
+  case RoutingOptions::Road::Motorway: return "motorway";
+  case RoutingOptions::Road::Ferry: return "ferry";
+  case RoutingOptions::Road::Dirty: return "dirty";
+  case RoutingOptions::Road::Usual: return "usual";
+  case RoutingOptions::Road::Max: return "max";
   }
 
   UNREACHABLE();
diff --git a/libs/routing/routing_options.hpp b/libs/routing/routing_options.hpp
index 7ae36b522..06d6f30a7 100644
--- a/libs/routing/routing_options.hpp
+++ b/libs/routing/routing_options.hpp
@@ -13,13 +13,13 @@ class RoutingOptions
 public:
   enum Road : uint8_t
   {
-    Usual    = 1u << 0,
-    Toll     = 1u << 1,
+    Usual = 1u << 0,
+    Toll = 1u << 1,
     Motorway = 1u << 2,
-    Ferry    = 1u << 3,
-    Dirty    = 1u << 4,
+    Ferry = 1u << 3,
+    Dirty = 1u << 4,
 
-    Max      = (1u << 4) + 1
+    Max = (1u << 4) + 1
   };
 
   using RoadType = std::underlying_type_t<Road>;
diff --git a/libs/routing/routing_quality/api/api.cpp b/libs/routing/routing_quality/api/api.cpp
index c21a38165..eb7763f00 100644
--- a/libs/routing/routing_quality/api/api.cpp
+++ b/libs/routing/routing_quality/api/api.cpp
@@ -127,11 +127,11 @@ routing::VehicleType Response::GetVehicleType() const
   UNREACHABLE();
 }
 
-
 RoutingApi::RoutingApi(std::string name, std::string token, uint32_t maxRPS)
   : m_apiName(std::move(name))
   , m_accessToken(std::move(token))
-  , m_maxRPS(maxRPS) {}
+  , m_maxRPS(maxRPS)
+{}
 
 Response RoutingApi::CalculateRoute(Params const & params, int32_t startTimeZoneUTC) const
 {
diff --git a/libs/routing/routing_quality/api/google/google_api.cpp b/libs/routing/routing_quality/api/google/google_api.cpp
index f86dea98b..b37dc34be 100644
--- a/libs/routing/routing_quality/api/google/google_api.cpp
+++ b/libs/routing/routing_quality/api/google/google_api.cpp
@@ -58,9 +58,7 @@ namespace google
 // static
 std::string const GoogleApi::kApiName = "google";
 
-GoogleApi::GoogleApi(std::string const & token)
-    : RoutingApi(kApiName, token, kMaxRPS)
-{}
+GoogleApi::GoogleApi(std::string const & token) : RoutingApi(kApiName, token, kMaxRPS) {}
 
 Response GoogleApi::CalculateRoute(Params const & params, int32_t startTimeZoneUTC) const
 {
@@ -80,7 +78,7 @@ Response GoogleApi::CalculateRoute(Params const & params, int32_t startTimeZoneU
 
     auto const startLatLon = leg.m_steps.front().m_startLocation;
     apiRoute.m_waypoints.emplace_back(startLatLon.m_lat, startLatLon.m_lon);
-    for (const auto & step : leg.m_steps)
+    for (auto const & step : leg.m_steps)
     {
       auto const & prev = step.m_startLocation;
       auto const & next = step.m_endLocation;
@@ -135,11 +133,9 @@ std::string GoogleApi::GetDirectionsURL(Params const & params, int32_t startTime
   LOG(LDEBUG, ("&departure_time =", secondFromEpoch));
 
   std::stringstream ss;
-  ss << kBaseUrl
-     << "&origin=" << std::to_string(start.m_lat) << "," << std::to_string(start.m_lon)
+  ss << kBaseUrl << "&origin=" << std::to_string(start.m_lat) << "," << std::to_string(start.m_lon)
      << "&destination=" << std::to_string(finish.m_lat) << "," << std::to_string(finish.m_lon)
-     << "&key=" << GetAccessToken()
-     << "&alternatives=true"
+     << "&key=" << GetAccessToken() << "&alternatives=true"
      << "&departure_time=" << secondFromEpoch;
 
   return ss.str();
diff --git a/libs/routing/routing_quality/api/google/google_api.hpp b/libs/routing/routing_quality/api/google/google_api.hpp
index 5f5f8cbcc..9bd0ab39b 100644
--- a/libs/routing/routing_quality/api/google/google_api.hpp
+++ b/libs/routing/routing_quality/api/google/google_api.hpp
@@ -32,6 +32,6 @@ private:
   GoogleResponse MakeRequest(Params const & params, int32_t startTimeZoneUTC) const;
   std::string GetDirectionsURL(Params const & params, int32_t startTimeZoneUTC) const;
 };
-}  // namespace mapbox
+}  // namespace google
 }  // namespace api
 }  // namespace routing_quality
diff --git a/libs/routing/routing_quality/api/google/types.cpp b/libs/routing/routing_quality/api/google/types.cpp
index b75d44e26..4c660a830 100644
--- a/libs/routing/routing_quality/api/google/types.cpp
+++ b/libs/routing/routing_quality/api/google/types.cpp
@@ -27,6 +27,6 @@ std::string DebugPrint(LatLon const & latlon)
   ss << "google::LatLon(" << latlon.m_lat << ", " << latlon.m_lon << ")";
   return ss.str();
 }
-}  // namespace mapbox
+}  // namespace google
 }  // namespace api
 }  // namespace routing_quality
diff --git a/libs/routing/routing_quality/api/google/types.hpp b/libs/routing/routing_quality/api/google/types.hpp
index 7952ef24b..b472437e9 100644
--- a/libs/routing/routing_quality/api/google/types.hpp
+++ b/libs/routing/routing_quality/api/google/types.hpp
@@ -15,8 +15,7 @@ namespace google
 {
 struct LatLon
 {
-  DECLARE_VISITOR(visitor(m_lat, "lat"),
-                  visitor(m_lon, "lng"))
+  DECLARE_VISITOR(visitor(m_lat, "lat"), visitor(m_lon, "lng"))
 
   bool operator==(LatLon const & rhs) const;
 
@@ -26,8 +25,7 @@ struct LatLon
 
 struct Step
 {
-  DECLARE_VISITOR(visitor(m_startLocation, "start_location"),
-                  visitor(m_endLocation, "end_location"))
+  DECLARE_VISITOR(visitor(m_startLocation, "start_location"), visitor(m_endLocation, "end_location"))
 
   bool operator==(Step const & rhs) const;
 
@@ -51,9 +49,7 @@ struct Distance
 
 struct Leg
 {
-  DECLARE_VISITOR(visitor(m_distance, "distance"),
-                  visitor(m_duration, "duration"),
-                  visitor(m_steps, "steps"))
+  DECLARE_VISITOR(visitor(m_distance, "distance"), visitor(m_duration, "duration"), visitor(m_steps, "steps"))
 
   Distance m_distance;
   Duration m_duration;
@@ -76,6 +72,6 @@ struct GoogleResponse
 };
 
 std::string DebugPrint(LatLon const & latlon);
-}  // namespace mapbox
+}  // namespace google
 }  // namespace api
 }  // namespace routing_quality
diff --git a/libs/routing/routing_quality/api/mapbox/mapbox_api.cpp b/libs/routing/routing_quality/api/mapbox/mapbox_api.cpp
index edaf8509a..ef7c3e29f 100644
--- a/libs/routing/routing_quality/api/mapbox/mapbox_api.cpp
+++ b/libs/routing/routing_quality/api/mapbox/mapbox_api.cpp
@@ -55,9 +55,7 @@ namespace routing_quality::api::mapbox
 // static
 std::string const MapboxApi::kApiName = "mapbox";
 
-MapboxApi::MapboxApi(std::string const & token)
-  : RoutingApi(kApiName, token, kMaxRPS)
-{}
+MapboxApi::MapboxApi(std::string const & token) : RoutingApi(kApiName, token, kMaxRPS) {}
 
 Response MapboxApi::CalculateRoute(Params const & params, int32_t /* startTimeZoneUTC */) const
 {
@@ -120,8 +118,7 @@ std::string MapboxApi::GetDirectionsURL(Params const & params) const
     coords.emplace_back(mercator::ToLatLon(point));
 
   std::ostringstream oss;
-  oss << kBaseURL << "directions/" << kDirectionsApiVersion << "/"
-      << VehicleTypeToMapboxType(params.m_type) << "/";
+  oss << kBaseURL << "directions/" << kDirectionsApiVersion << "/" << VehicleTypeToMapboxType(params.m_type) << "/";
   oss << LatLonsToString(coords) << "?";
   oss << "access_token=" << GetAccessToken() << "&";
   oss << "overview=simplified&"
@@ -130,4 +127,4 @@ std::string MapboxApi::GetDirectionsURL(Params const & params) const
 
   return oss.str();
 }
-}  // namespace mapbox::api::routing_quality
+}  // namespace routing_quality::api::mapbox
diff --git a/libs/routing/routing_quality/api/mapbox/mapbox_api.hpp b/libs/routing/routing_quality/api/mapbox/mapbox_api.hpp
index 53537a06a..4bb798cf6 100644
--- a/libs/routing/routing_quality/api/mapbox/mapbox_api.hpp
+++ b/libs/routing/routing_quality/api/mapbox/mapbox_api.hpp
@@ -4,7 +4,6 @@
 
 #include "routing/routing_quality/api/mapbox/types.hpp"
 
-
 #include <cstdint>
 #include <string>
 #include <utility>
diff --git a/libs/routing/routing_quality/api/mapbox/types.hpp b/libs/routing/routing_quality/api/mapbox/types.hpp
index 806534e55..1b4c4a2e2 100644
--- a/libs/routing/routing_quality/api/mapbox/types.hpp
+++ b/libs/routing/routing_quality/api/mapbox/types.hpp
@@ -27,9 +27,7 @@ struct Geometry
 
 struct Route
 {
-  DECLARE_VISITOR(visitor(m_geometry, "geometry"),
-                  visitor(m_duration, "duration"),
-                  visitor(m_distance, "distance"))
+  DECLARE_VISITOR(visitor(m_geometry, "geometry"), visitor(m_duration, "duration"), visitor(m_distance, "distance"))
 
   Geometry m_geometry;
   double m_duration = 0.0;
diff --git a/libs/routing/routing_quality/routing_quality_tests/barriers_tests.cpp b/libs/routing/routing_quality/routing_quality_tests/barriers_tests.cpp
index 50f913d21..07ddcc278 100644
--- a/libs/routing/routing_quality/routing_quality_tests/barriers_tests.cpp
+++ b/libs/routing/routing_quality/routing_quality_tests/barriers_tests.cpp
@@ -15,14 +15,14 @@ UNIT_TEST(RoutingQuality_Broad_Node_Jamaica)
 {
   TEST(CheckCarRoute({17.94727, -76.25429} /* start */, {17.94499, -76.25459} /* finish */,
                      {{{17.945150, -76.25442}}} /* reference point */),
-      ());
+       ());
 }
 
 UNIT_TEST(RoutingQuality_Broad_Way_Jamaica)
 {
   TEST(CheckCarRoute({18.10260, -76.98374} /* start */, {18.10031, -76.98374} /* finish */,
                      {{{18.10078, -76.98412}}} /* reference point */),
-      ());
+       ());
 }
 
 UNIT_TEST(RoutingQuality_Broad_Node_Spain)
diff --git a/libs/routing/routing_quality/routing_quality_tests/bigger_roads_tests.cpp b/libs/routing/routing_quality/routing_quality_tests/bigger_roads_tests.cpp
index b42c183de..0669907aa 100644
--- a/libs/routing/routing_quality/routing_quality_tests/bigger_roads_tests.cpp
+++ b/libs/routing/routing_quality/routing_quality_tests/bigger_roads_tests.cpp
@@ -25,7 +25,7 @@ UNIT_TEST(RoutingQuality_TurkeyIzmirArea)
 UNIT_TEST(RoutingQuality_BosniaAndHerzegovina)
 {
   TEST(CheckCarRoute({42.71401, 18.30412} /* start */, {42.95101, 18.08966} /* finish */,
-                     {{{42.88222,17.9919}}} /* reference track */),
+                     {{{42.88222, 17.9919}}} /* reference track */),
        ());
 }
 
@@ -96,17 +96,22 @@ UNIT_TEST(RoutingQuality_KrasnoyarskBratsk)
 UNIT_TEST(RoutingQuality_VoronezhSochi)
 {
   TEST(CheckCarRoute({51.65487, 39.21293} /* start */, {43.58547, 39.72311} /* finish */,
-                     {{{46.14169, 39.85306}, {45.17069, 39.10869},
-                       {45.02157, 39.12510}, {44.54344, 38.95853}}} /* reference track */),
+                     {{{46.14169, 39.85306},
+                       {45.17069, 39.10869},
+                       {45.02157, 39.12510},
+                       {44.54344, 38.95853}}} /* reference track */),
        ());
 }
 
 UNIT_TEST(RoutingQuality_BerlinkaWarsawPoland)
 {
   TEST(CheckCarRoute({54.41616, 20.05675} /* start */, {52.18937, 20.94026} /* finish */,
-                     {{{54.24278, 19.66106}, {54.13679, 19.45166},
-                       {54.06452, 19.62416}, {53.69769, 19.98204},
-                       {53.11194, 20.40002}, {52.62966, 20.38488}}} /* reference track */),
+                     {{{54.24278, 19.66106},
+                       {54.13679, 19.45166},
+                       {54.06452, 19.62416},
+                       {53.69769, 19.98204},
+                       {53.11194, 20.40002},
+                       {52.62966, 20.38488}}} /* reference track */),
        ());
 }
 
diff --git a/libs/routing/routing_quality/routing_quality_tests/ferry_tests.cpp b/libs/routing/routing_quality/routing_quality_tests/ferry_tests.cpp
index 5277b3688..767419464 100644
--- a/libs/routing/routing_quality/routing_quality_tests/ferry_tests.cpp
+++ b/libs/routing/routing_quality/routing_quality_tests/ferry_tests.cpp
@@ -15,7 +15,7 @@ UNIT_TEST(Ferry_RoutingQuality_FinlandBridgeInsteadOfFerry)
 // TODO: This test doesn't pass because routing::RouteWeight::operator<
 // prefer roads with less number of barriers. It will be more useful to consider
 // barriers only with access=no/private/etc tag.
-//UNIT_TEST(Ferry_RoutingQuality_RussiaToCrimeaFerry)
+// UNIT_TEST(Ferry_RoutingQuality_RussiaToCrimeaFerry)
 //{
 //  // From Russia to Crimea
 //  TEST(CheckCarRoute({45.34123, 36.67679} /* start */, {45.36479, 36.62194} /* finish */,
diff --git a/libs/routing/routing_quality/routing_quality_tests/passby_roads_tests.cpp b/libs/routing/routing_quality/routing_quality_tests/passby_roads_tests.cpp
index 0d47f167f..7727ecb02 100644
--- a/libs/routing/routing_quality/routing_quality_tests/passby_roads_tests.cpp
+++ b/libs/routing/routing_quality/routing_quality_tests/passby_roads_tests.cpp
@@ -12,11 +12,11 @@ UNIT_TEST(RoutingQuality_RussiaZelegonrad2Domodedovo)
 {
   // From Zelenograd to Domodedovo. MKAD should be preferred.
   TEST(CheckCarRoute({55.98301, 37.21141} /* start */, {55.42081, 37.89361} /* finish */,
-                     {{{55.99751, 37.23804}, // Through M-11 and MKAD.
+                     {{{55.99751, 37.23804},  // Through M-11 and MKAD.
                        {56.00719, 37.28533},
                        {55.88759, 37.48068},
                        {55.83513, 37.39569}},
-                      {{55.99775, 37.24941}, // Through M-10 and MKAD.
+                      {{55.99775, 37.24941},  // Through M-10 and MKAD.
                        {55.88627, 37.43915},
                        {55.86882, 37.40784},
                        {55.58645, 37.71672},
@@ -69,7 +69,7 @@ UNIT_TEST(RoutingQuality_EnglandLondon)
 
 // After map update to 190719 the route starts go throw Chernigov instead of using
 // passby way. It should be fix and the test should be uncommented.
-//UNIT_TEST(RoutingQuality_UkraineChernigov)
+// UNIT_TEST(RoutingQuality_UkraineChernigov)
 //{
 //  TEST(CheckCarRoute({51.29419, 31.25718} /* start */, {51.62678, 31.21787} /* finish */,
 //                     {{{51.48362, 31.18757}}} /* reference point */),
@@ -111,9 +111,8 @@ UNIT_TEST(RoutingQuality_SlovenijaLjubljana)
        ());
 }
 
-
 // TODO: Uncomment this test when correct city boundaries or crossroads will be ready.
-//UNIT_TEST(RoutingQuality_FrancePoitiers)
+// UNIT_TEST(RoutingQuality_FrancePoitiers)
 //{
 //  TEST(CheckCarRoute({46.63612, 0.35762} /* start */, {46.49, 0.36787} /* finish */,
 //                     {{{46.58706, 0.39232}}} /* reference point */),
@@ -146,6 +145,5 @@ UNIT_TEST(RoutingQuality_SouthernDenmarkPastUnclassified)
   TEST(CheckCarRoute({55.44681, 10.29} /* start */, {55.45877, 10.26456} /* finish */,
                      {{{55.45505, 10.26972}}} /* reference point */),
        ());
-
 }
 }  // namespace
diff --git a/libs/routing/routing_quality/routing_quality_tests/waypoints_tests.cpp b/libs/routing/routing_quality/routing_quality_tests/waypoints_tests.cpp
index 7545dcfda..c2594e2ec 100644
--- a/libs/routing/routing_quality/routing_quality_tests/waypoints_tests.cpp
+++ b/libs/routing/routing_quality/routing_quality_tests/waypoints_tests.cpp
@@ -30,9 +30,7 @@ UNIT_TEST(RoutingQuality_Sokol2Mayakovskaya)
   Params params(VehicleType::Car, {55.80432, 37.51603} /* start */, {55.77019, 37.59558} /* finish */);
 
   // All points lie on the alternate so the result should be 0.
-  ReferenceRoutes waypoints = {{
-    {55.79599, 37.54114}, {55.78142, 37.57364}, {55.77863, 37.57989}
-  }};
+  ReferenceRoutes waypoints = {{{55.79599, 37.54114}, {55.78142, 37.57364}, {55.77863, 37.57989}}};
 
   TEST_EQUAL(CheckWaypoints(params, std::move(waypoints)), 0.0, ());
 }
diff --git a/libs/routing/routing_quality/routing_quality_tool/benchmark_stat.cpp b/libs/routing/routing_quality/routing_quality_tool/benchmark_stat.cpp
index 4650b1eb8..6dc7d962e 100644
--- a/libs/routing/routing_quality/routing_quality_tool/benchmark_stat.cpp
+++ b/libs/routing/routing_quality/routing_quality_tool/benchmark_stat.cpp
@@ -39,8 +39,8 @@ void LogIfNotConsistent(RoutesBuilder::Result const & oldRes, RoutesBuilder::Res
   bool const sameDistance = AlmostEqualAbs(oldRoute.m_distance, newRoute.m_distance, 1.0);
   if (!sameETA || !sameDistance)
   {
-    LOG(LINFO, ("old ETA:", oldRoute.m_eta, "old distance:", oldRoute.m_distance, "new ETA:",
-                newRoute.m_eta, "new distance:", newRoute.m_distance, start, finish));
+    LOG(LINFO, ("old ETA:", oldRoute.m_eta, "old distance:", oldRoute.m_distance, "new ETA:", newRoute.m_eta,
+                "new distance:", newRoute.m_distance, start, finish));
   }
 }
 
@@ -52,9 +52,7 @@ void FillInfoAboutBuildTimeGroupByPreviousResults(std::vector<std::string> & lab
   bars.clear();
   labels.clear();
 
-  std::sort(times.begin(), times.end(), [](auto const & a, auto const & b) {
-    return a.m_oldTime < b.m_oldTime;
-  });
+  std::sort(times.begin(), times.end(), [](auto const & a, auto const & b) { return a.m_oldTime < b.m_oldTime; });
 
   size_t constexpr kSteps = 10;
   size_t const step = times.size() / kSteps;
@@ -78,8 +76,8 @@ void FillInfoAboutBuildTimeGroupByPreviousResults(std::vector<std::string> & lab
     startFrom = i + 1;
     double const curRight = times[i].m_oldTime;
     labels.emplace_back("[" + strings::to_string_dac(curLeft, 2 /* dac */) + "s, " +
-                        strings::to_string_dac(curRight, 2 /* dac */) + "s]\\n" +
-                        "Routes count:\\n" + std::to_string(curCount));
+                        strings::to_string_dac(curRight, 2 /* dac */) + "s]\\n" + "Routes count:\\n" +
+                        std::to_string(curCount));
     if (curCount != 0)
     {
       curSumOld /= curCount;
@@ -92,8 +90,7 @@ void FillInfoAboutBuildTimeGroupByPreviousResults(std::vector<std::string> & lab
   }
 }
 
-std::vector<double> GetBoostPercents(BenchmarkResults const & oldResults,
-                                     BenchmarkResults const & newResults)
+std::vector<double> GetBoostPercents(BenchmarkResults const & oldResults, BenchmarkResults const & newResults)
 {
   std::vector<double> boostPercents;
   for (size_t i = 0; i < oldResults.GetBuildTimes().size(); ++i)
@@ -135,9 +132,8 @@ static std::string const kPythonEtaDiffPercent = "eta_diff_percent.py";
 // see here: https://github.com/mapsme/omim/pull/12401
 static std::string const kPythonSmartDistr = "show_smart_boost_distr.py";
 
-void RunBenchmarkStat(
-    std::vector<std::pair<RoutesBuilder::Result, std::string>> const & mapsmeResults,
-    std::string const & dirForResults)
+void RunBenchmarkStat(std::vector<std::pair<RoutesBuilder::Result, std::string>> const & mapsmeResults,
+                      std::string const & dirForResults)
 {
   BenchmarkResults benchmarkResults;
   ErrorTypeCounter errorTypeCounter;
@@ -153,8 +149,7 @@ void RunBenchmarkStat(
   }
 
   auto pythonScriptPath = base::JoinPath(dirForResults, kPythonDistTimeBuilding);
-  CreatePythonScriptForDistribution(pythonScriptPath, "Route building time, seconds",
-                                    benchmarkResults.GetBuildTimes());
+  CreatePythonScriptForDistribution(pythonScriptPath, "Route building time, seconds", benchmarkResults.GetBuildTimes());
 
   LOG(LINFO, ("Average route time building:", benchmarkResults.GetAverageBuildTime(), "seconds."));
 
@@ -168,10 +163,9 @@ void RunBenchmarkStat(
   }
 
   pythonScriptPath = base::JoinPath(dirForResults, kPythonGraphTimeAndCount);
-  CreatePythonGraphByPointsXY(pythonScriptPath,
-                              "Building time, seconds" /* xlabel */,
-                              "Percent of routes built less than" /* ylabel */,
-                              {countToTimes}, {"mapsme"} /* legends */);
+  CreatePythonGraphByPointsXY(pythonScriptPath, "Building time, seconds" /* xlabel */,
+                              "Percent of routes built less than" /* ylabel */, {countToTimes},
+                              {"mapsme"} /* legends */);
 
   pythonScriptPath = base::JoinPath(dirForResults, kPythonBarError);
 
@@ -179,14 +173,13 @@ void RunBenchmarkStat(
   std::vector<double> heights;
   FillLabelsAndErrorTypeDistribution(labels, heights, errorTypeCounter);
 
-  CreatePythonBarByMap(pythonScriptPath, labels, {heights}, {"mapsme"} /* legends */,
-                       "Type of errors" /* xlabel */, "Number of errors" /* ylabel */);
+  CreatePythonBarByMap(pythonScriptPath, labels, {heights}, {"mapsme"} /* legends */, "Type of errors" /* xlabel */,
+                       "Number of errors" /* ylabel */);
 }
 
-void RunBenchmarkComparison(
-    std::vector<std::pair<RoutesBuilder::Result, std::string>> && mapsmeResults,
-    std::vector<std::pair<RoutesBuilder::Result, std::string>> && mapsmeOldResults,
-    std::string const & dirForResults)
+void RunBenchmarkComparison(std::vector<std::pair<RoutesBuilder::Result, std::string>> && mapsmeResults,
+                            std::vector<std::pair<RoutesBuilder::Result, std::string>> && mapsmeOldResults,
+                            std::string const & dirForResults)
 {
   BenchmarkResults benchmarkResults;
   BenchmarkResults benchmarkOldResults;
@@ -227,8 +220,7 @@ void RunBenchmarkComparison(
     LogIfNotConsistent(mapsmeOldResult, mapsmeResult);
 
     CHECK(!mapsmeOldResult.m_routes.empty() && !mapsmeResult.m_routes.empty(), ());
-    auto const etaDiff =
-        (mapsmeOldResult.m_routes.back().m_eta - mapsmeResult.m_routes.back().m_eta);
+    auto const etaDiff = (mapsmeOldResult.m_routes.back().m_eta - mapsmeResult.m_routes.back().m_eta);
     auto const etaDiffPercent = etaDiff / mapsmeOldResult.m_routes.back().m_eta * 100.0;
 
     etaDiffs.emplace_back(etaDiff);
@@ -258,9 +250,8 @@ void RunBenchmarkComparison(
   auto const newAverage = benchmarkResults.GetAverageBuildTime();
   auto const averageTimeDiff = (oldAverage - newAverage) / oldAverage * 100.0;
   LOG(LINFO, ("Average route time building. "
-              "Old version:", oldAverage,
-              "New version:", newAverage,
-              "(", -averageTimeDiff, "% )"));
+              "Old version:",
+              oldAverage, "New version:", newAverage, "(", -averageTimeDiff, "% )"));
 
   std::vector<std::vector<m2::PointD>> graphics;
   for (auto const & results : {benchmarkOldResults, benchmarkResults})
@@ -287,30 +278,26 @@ void RunBenchmarkComparison(
   FillLabelsAndErrorTypeDistribution(labels, errorsCount, errorTypeCounter, errorTypeCounterOld);
 
   pythonScriptPath = base::JoinPath(dirForResults, kPythonBarError);
-  CreatePythonBarByMap(pythonScriptPath, labels, errorsCount,
-                       {"old mapsme", "new mapsme"} /* legends */, "Type of errors" /* xlabel */,
-                       "Number of errors" /* ylabel */);
+  CreatePythonBarByMap(pythonScriptPath, labels, errorsCount, {"old mapsme", "new mapsme"} /* legends */,
+                       "Type of errors" /* xlabel */, "Number of errors" /* ylabel */);
 
   auto const boostPercents = GetBoostPercents(benchmarkOldResults, benchmarkResults);
   pythonScriptPath = base::JoinPath(dirForResults, kPythonBarBoostPercentDistr);
   CreatePythonScriptForDistribution(pythonScriptPath, "Boost percent" /* title */, boostPercents);
 
   pythonScriptPath = base::JoinPath(dirForResults, kPythonEtaDiff);
-  CreatePythonScriptForDistribution(pythonScriptPath, "ETA diff distribution" /* title */,
-                                    etaDiffs);
+  CreatePythonScriptForDistribution(pythonScriptPath, "ETA diff distribution" /* title */, etaDiffs);
 
   pythonScriptPath = base::JoinPath(dirForResults, kPythonEtaDiffPercent);
-  CreatePythonScriptForDistribution(pythonScriptPath, "ETA diff percent distribution" /* title */,
-                                    etaDiffsPercent);
+  CreatePythonScriptForDistribution(pythonScriptPath, "ETA diff percent distribution" /* title */, etaDiffsPercent);
 
   std::vector<std::vector<double>> bars;
   FillInfoAboutBuildTimeGroupByPreviousResults(labels, bars, std::move(times));
   pythonScriptPath = base::JoinPath(dirForResults, kPythonSmartDistr);
-  CreatePythonBarByMap(
-      pythonScriptPath, labels, bars, {"old mapsme", "new mapsme"} /* legends */,
-      "Intervals of groups (build time in old mapsme)" /* xlabel */,
-      "Boost\\nRight column is so lower/higher than the left\\n how much the average build time "
-      "has decreased in each group)" /* ylabel */,
-      false /* drawPercents */);
+  CreatePythonBarByMap(pythonScriptPath, labels, bars, {"old mapsme", "new mapsme"} /* legends */,
+                       "Intervals of groups (build time in old mapsme)" /* xlabel */,
+                       "Boost\\nRight column is so lower/higher than the left\\n how much the average build time "
+                       "has decreased in each group)" /* ylabel */,
+                       false /* drawPercents */);
 }
 }  // namespace routing_quality::routing_quality_tool
diff --git a/libs/routing/routing_quality/routing_quality_tool/benchmark_stat.hpp b/libs/routing/routing_quality/routing_quality_tool/benchmark_stat.hpp
index 272150f9f..fac0a5906 100644
--- a/libs/routing/routing_quality/routing_quality_tool/benchmark_stat.hpp
+++ b/libs/routing/routing_quality/routing_quality_tool/benchmark_stat.hpp
@@ -12,8 +12,7 @@ using RouteResult = routing::routes_builder::RoutesBuilder::Result;
 void RunBenchmarkStat(std::vector<std::pair<RouteResult, std::string>> const & mapsmeResults,
                       std::string const & dirForResults);
 
-void RunBenchmarkComparison(
-    std::vector<std::pair<RouteResult, std::string>> && mapsmeResults,
-    std::vector<std::pair<RouteResult, std::string>> && mapsmeOldResults,
-    std::string const & dirForResults);
+void RunBenchmarkComparison(std::vector<std::pair<RouteResult, std::string>> && mapsmeResults,
+                            std::vector<std::pair<RouteResult, std::string>> && mapsmeOldResults,
+                            std::string const & dirForResults);
 }  // namespace routing_quality::routing_quality_tool
diff --git a/libs/routing/routing_quality/routing_quality_tool/error_type_counter.cpp b/libs/routing/routing_quality/routing_quality_tool/error_type_counter.cpp
index 30b555922..36d60c638 100644
--- a/libs/routing/routing_quality/routing_quality_tool/error_type_counter.cpp
+++ b/libs/routing/routing_quality/routing_quality_tool/error_type_counter.cpp
@@ -22,8 +22,7 @@ void ErrorTypeCounter::PushError(api::ResultCode code)
   PushError(routingCode);
 }
 
-void FillLabelsAndErrorTypeDistribution(std::vector<std::string> & labels,
-                                        std::vector<double> & errorsTypeDistribution,
+void FillLabelsAndErrorTypeDistribution(std::vector<std::string> & labels, std::vector<double> & errorsTypeDistribution,
                                         ErrorTypeCounter const & counter)
 {
   errorsTypeDistribution.clear();
@@ -37,8 +36,7 @@ void FillLabelsAndErrorTypeDistribution(std::vector<std::string> & labels,
 
 void FillLabelsAndErrorTypeDistribution(std::vector<std::string> & labels,
                                         std::vector<std::vector<double>> & errorsTypeDistribution,
-                                        ErrorTypeCounter const & counter,
-                                        ErrorTypeCounter const & counterOld)
+                                        ErrorTypeCounter const & counter, ErrorTypeCounter const & counterOld)
 {
   errorsTypeDistribution.clear();
   errorsTypeDistribution.resize(2);
diff --git a/libs/routing/routing_quality/routing_quality_tool/error_type_counter.hpp b/libs/routing/routing_quality/routing_quality_tool/error_type_counter.hpp
index 46d738e78..7bebe65ae 100644
--- a/libs/routing/routing_quality/routing_quality_tool/error_type_counter.hpp
+++ b/libs/routing/routing_quality/routing_quality_tool/error_type_counter.hpp
@@ -22,12 +22,10 @@ private:
   std::map<std::string, size_t> m_errorCounter;
 };
 
-void FillLabelsAndErrorTypeDistribution(std::vector<std::string> & labels,
-                                        std::vector<double> & errorsTypeDistribution,
+void FillLabelsAndErrorTypeDistribution(std::vector<std::string> & labels, std::vector<double> & errorsTypeDistribution,
                                         ErrorTypeCounter const & counter);
 
 void FillLabelsAndErrorTypeDistribution(std::vector<std::string> & labels,
                                         std::vector<std::vector<double>> & errorsTypeDistribution,
-                                        ErrorTypeCounter const & counter,
-                                        ErrorTypeCounter const & counterOld);
+                                        ErrorTypeCounter const & counter, ErrorTypeCounter const & counterOld);
 }  // namespace routing_quality::routing_quality_tool
diff --git a/libs/routing/routing_quality/routing_quality_tool/routing_quality_tool.cpp b/libs/routing/routing_quality/routing_quality_tool/routing_quality_tool.cpp
index 9198576f4..12edcc7f4 100644
--- a/libs/routing/routing_quality/routing_quality_tool/routing_quality_tool.cpp
+++ b/libs/routing/routing_quality/routing_quality_tool/routing_quality_tool.cpp
@@ -1,6 +1,6 @@
-#include "routing/routing_quality/routing_quality_tool/utils.hpp"
 #include "routing/routing_quality/routing_quality_tool/benchmark_stat.hpp"
 #include "routing/routing_quality/routing_quality_tool/error_type_counter.hpp"
+#include "routing/routing_quality/routing_quality_tool/utils.hpp"
 
 #include "routing/routing_quality/api/api.hpp"
 
@@ -28,8 +28,9 @@ DEFINE_string(api_results, "", "Path to directory with api router results.");
 
 DEFINE_string(save_results, "", "The directory where results of tool will be saved.");
 
-DEFINE_double(kml_percent, 0.0, "The percent of routes for which kml file will be generated."
-                                "With kml files you can make screenshots with a desktop app");
+DEFINE_double(kml_percent, 0.0,
+              "The percent of routes for which kml file will be generated."
+              "With kml files you can make screenshots with a desktop app");
 
 DEFINE_bool(benchmark_stat, false, "Dump statistics about route time building.");
 
@@ -60,7 +61,8 @@ This tool takes two paths to directory with routes, that were dumped by routes_b
     --kml_percent may be used in non-benchamrk mode for dumping kmls and visual comparison different routes.
 )";
 
-  auto const addStringInfo = [&usage](auto const & arg, auto const & argValue) {
+  auto const addStringInfo = [&usage](auto const & arg, auto const & argValue)
+  {
     using T = decltype(argValue);
     usage << "\n\t" << arg << " is";
     if (argValue == T{})
@@ -91,7 +93,7 @@ bool HasHelpFlags(int argc, char ** argv)
   }
   return false;
 }
-} // namespace
+}  // namespace
 
 using namespace routing;
 using namespace routes_builder;
@@ -166,8 +168,7 @@ void RunComparison(std::vector<std::pair<RoutesBuilder::Result, std::string>> &&
 {
   ErrorTypeCounter mapsmeErrorCounter;
   ErrorTypeCounter anotherErrorCounter;
-  ComparisonType type = IsMapsmeVsApi() ? ComparisonType::MapsmeVsApi
-                                        : ComparisonType::MapsmeVsMapsme;
+  ComparisonType type = IsMapsmeVsApi() ? ComparisonType::MapsmeVsApi : ComparisonType::MapsmeVsMapsme;
   RoutesSaver routesSaver(FLAGS_save_results, type);
   std::vector<Result> results;
   size_t apiErrors = 0;
@@ -212,16 +213,15 @@ void RunComparison(std::vector<std::pair<RoutesBuilder::Result, std::string>> &&
     for (auto const & route : anotherResult.GetRoutes())
     {
       auto const similarity =
-          metrics::CompareByNumberOfMatchedWaypoints(mapsmeRoute.m_followedPolyline,
-                                                     route.GetWaypoints());
+          metrics::CompareByNumberOfMatchedWaypoints(mapsmeRoute.m_followedPolyline, route.GetWaypoints());
 
       if (maxSimilarity < similarity)
       {
         maxSimilarity = similarity;
         if (maxSimilarity == 1.0)
         {
-          etaDiff = 100.0 * std::abs(route.GetETA() - mapsmeRoute.GetETA()) /
-                    std::max(route.GetETA(), mapsmeRoute.GetETA());
+          etaDiff =
+              100.0 * std::abs(route.GetETA() - mapsmeRoute.GetETA()) / std::max(route.GetETA(), mapsmeRoute.GetETA());
         }
       }
     }
@@ -236,8 +236,7 @@ void RunComparison(std::vector<std::pair<RoutesBuilder::Result, std::string>> &&
 
   std::vector<std::string> errorLabels;
   std::vector<std::vector<double>> errorsCount;
-  FillLabelsAndErrorTypeDistribution(errorLabels, errorsCount, mapsmeErrorCounter,
-                                     anotherErrorCounter);
+  FillLabelsAndErrorTypeDistribution(errorLabels, errorsCount, mapsmeErrorCounter, anotherErrorCounter);
 
   auto const pythonScriptPath = base::JoinPath(FLAGS_save_results, kPythonBarDistributionError);
   CreatePythonBarByMap(pythonScriptPath, errorLabels, errorsCount,
@@ -247,14 +246,13 @@ void RunComparison(std::vector<std::pair<RoutesBuilder::Result, std::string>> &&
 
 void CheckArgs()
 {
-  bool const modeIsChosen = IsMapsmeVsApi() || IsMapsmeVsMapsme() || IsMapsmeBenchmarkStat() ||
-                            IsMapsmeVsMapsmeBenchmarkStat();
+  bool const modeIsChosen =
+      IsMapsmeVsApi() || IsMapsmeVsMapsme() || IsMapsmeBenchmarkStat() || IsMapsmeVsMapsmeBenchmarkStat();
   if (!modeIsChosen)
     PrintHelpAndExit();
 
   CHECK(!FLAGS_save_results.empty(),
-        ("\n\n\t--save_results is required. Tool will save results there.",
-         "\n\nType --help for usage."));
+        ("\n\n\t--save_results is required. Tool will save results there.", "\n\nType --help for usage."));
 }
 
 int Main(int argc, char ** argv)
@@ -269,12 +267,11 @@ int Main(int argc, char ** argv)
   if (Platform::IsFileExistsByFullPath(FLAGS_save_results))
     CheckDirExistence(FLAGS_save_results);
   else
-    CHECK_EQUAL(Platform::MkDir(FLAGS_save_results), Platform::EError::ERR_OK,());
+    CHECK_EQUAL(Platform::MkDir(FLAGS_save_results), Platform::EError::ERR_OK, ());
 
   CheckDirExistence(FLAGS_mapsme_results);
 
-  CHECK(0.0 <= FLAGS_kml_percent && FLAGS_kml_percent <= 100.0,
-        ("--kml_percent should be in interval: [0.0, 100.0]."));
+  CHECK(0.0 <= FLAGS_kml_percent && FLAGS_kml_percent <= 100.0, ("--kml_percent should be in interval: [0.0, 100.0]."));
 
   LOG(LINFO, ("Start loading mapsme results."));
   auto mapsmeResults = LoadResults<RoutesBuilder::Result>(FLAGS_mapsme_results);
@@ -292,8 +289,7 @@ int Main(int argc, char ** argv)
     LOG(LINFO, ("Benchmark different mapsme versions. Start loading old mapsme results."));
     auto oldMapsmeResults = LoadResults<RoutesBuilder::Result>(FLAGS_mapsme_old_results);
     LOG(LINFO, ("Receive:", oldMapsmeResults.size(), "routes from --mapsme_old_results."));
-    RunBenchmarkComparison(std::move(mapsmeResults), std::move(oldMapsmeResults),
-                           FLAGS_save_results);
+    RunBenchmarkComparison(std::move(mapsmeResults), std::move(oldMapsmeResults), FLAGS_save_results);
   }
   else if (IsMapsmeVsMapsme())
   {
diff --git a/libs/routing/routing_quality/routing_quality_tool/utils.cpp b/libs/routing/routing_quality/routing_quality_tool/utils.cpp
index c784923de..c49a5c0da 100644
--- a/libs/routing/routing_quality/routing_quality_tool/utils.cpp
+++ b/libs/routing/routing_quality/routing_quality_tool/utils.cpp
@@ -30,8 +30,7 @@ void PrintWithSpaces(std::string const & str, size_t maxN)
     std::cout << " ";
 }
 
-std::vector<geometry::PointWithAltitude> ConvertToPointsWithAltitudes(
-    std::vector<ms::LatLon> const & latlons)
+std::vector<geometry::PointWithAltitude> ConvertToPointsWithAltitudes(std::vector<ms::LatLon> const & latlons)
 {
   std::vector<geometry::PointWithAltitude> result;
   result.reserve(latlons.size());
@@ -63,8 +62,7 @@ kml::BookmarkData CreateBookmark(m2::PointD const & point, bool isStart)
 }
 
 template <typename AnotherResult>
-void SaveKmlFileDataTo(RoutesBuilder::Result const & mapsmeResult,
-                       AnotherResult const & apiResult,
+void SaveKmlFileDataTo(RoutesBuilder::Result const & mapsmeResult, AnotherResult const & apiResult,
                        std::string const & kmlFile)
 {
   static std::array<uint32_t, 5> const kColors = {
@@ -140,15 +138,15 @@ namespace routing_quality
 {
 namespace routing_quality_tool
 {
-Result::Result(std::string mapsmeDumpPath, std::string anotherDumpPath,
-               ms::LatLon const & start, ms::LatLon const & finish, double similarity,
-               double etaDiffPercent)
+Result::Result(std::string mapsmeDumpPath, std::string anotherDumpPath, ms::LatLon const & start,
+               ms::LatLon const & finish, double similarity, double etaDiffPercent)
   : m_mapsmeDumpPath(std::move(mapsmeDumpPath))
   , m_anotherDumpPath(std::move(anotherDumpPath))
   , m_start(start)
   , m_finish(finish)
   , m_similarity(similarity)
-  , m_etaDiffPercent(etaDiffPercent) {}
+  , m_etaDiffPercent(etaDiffPercent)
+{}
 
 bool Result::operator<(Result const & rhs) const
 {
@@ -168,17 +166,14 @@ void RoutesSaver::PushRoute(Result const & result)
   m_output << result.m_mapsmeDumpPath << " " << result.m_anotherDumpPath << std::endl;
 }
 
-void RoutesSaver::PushError(routing::RouterResultCode code,
-                            ms::LatLon const & start,
-                            ms::LatLon const & finish)
+void RoutesSaver::PushError(routing::RouterResultCode code, ms::LatLon const & start, ms::LatLon const & finish)
 {
   CHECK_NOT_EQUAL(code, routing::RouterResultCode::NoError, ("Only errors codes."));
 
   auto & ofstream = m_errorRoutes[code];
   if (!ofstream.is_open())
   {
-    std::string const fullpath =
-        base::JoinPath(m_targetDir, DebugPrint(code) + ".routes");
+    std::string const fullpath = base::JoinPath(m_targetDir, DebugPrint(code) + ".routes");
 
     ofstream.open(fullpath);
     CHECK(ofstream.good(), ("Can not open:", fullpath, "for writing."));
@@ -217,8 +212,7 @@ void RoutesSaver::TurnToNextFile()
 
 std::string RoutesSaver::GetCurrentPath() const
 {
-  std::string const fullpath =
-      base::JoinPath(m_targetDir, std::to_string(m_fileNumber) + ".routes");
+  std::string const fullpath = base::JoinPath(m_targetDir, std::to_string(m_fileNumber) + ".routes");
 
   return fullpath;
 }
@@ -241,18 +235,13 @@ void RoutesSaver::OpenOutputStream()
   m_output << std::setprecision(20);
 }
 
-void RoutesSaver::WriteStartAndFinish(std::ofstream & output,
-                                      ms::LatLon const & start,
-                                      ms::LatLon const & finish)
+void RoutesSaver::WriteStartAndFinish(std::ofstream & output, ms::LatLon const & start, ms::LatLon const & finish)
 {
-  output << start.m_lat << " " << start.m_lon << " "
-         << finish.m_lat << " " << finish.m_lon
-         << std::endl;
+  output << start.m_lat << " " << start.m_lon << " " << finish.m_lat << " " << finish.m_lon << std::endl;
 }
 
 // This function creates python script that shows the distribution error.
-void CreatePythonScriptForDistribution(std::string const & pythonScriptPath,
-                                       std::string const & title,
+void CreatePythonScriptForDistribution(std::string const & pythonScriptPath, std::string const & title,
                                        std::vector<double> const & values)
 {
   std::ofstream python(pythonScriptPath);
@@ -271,19 +260,19 @@ void CreatePythonScriptForDistribution(std::string const & pythonScriptPath,
 import numpy as np
 import matplotlib.pyplot as plt
 
-a = np.hstack()" + pythonArray + R"()
+a = np.hstack()" +
+                pythonArray + R"()
 plt.hist(a, bins='auto')  # arguments are passed to np.histogram
-plt.title(")" + title + R"(")
+plt.title(")" + title +
+                R"(")
 plt.show()
 )";
 
   LOG(LINFO, ("Run: python", pythonScriptPath, "to look at:", title));
 }
 
-void CreatePythonGraphByPointsXY(std::string const & pythonScriptPath,
-                                 std::string const & xlabel,
-                                 std::string const & ylabel,
-                                 std::vector<std::vector<m2::PointD>> const & graphics,
+void CreatePythonGraphByPointsXY(std::string const & pythonScriptPath, std::string const & xlabel,
+                                 std::string const & ylabel, std::vector<std::vector<m2::PointD>> const & graphics,
                                  std::vector<std::string> const & legends)
 {
   CHECK_EQUAL(legends.size(), graphics.size(), ());
@@ -316,14 +305,19 @@ void CreatePythonGraphByPointsXY(std::string const & pythonScriptPath,
   python << R"(
 import pylab
 
-legends = )" + legendsArray + R"(
-xlist = )" + pythonArrayX + R"(
-ylist = )" + pythonArrayY + R"(
+legends = )" + legendsArray +
+                R"(
+xlist = )" + pythonArrayX +
+                R"(
+ylist = )" + pythonArrayY +
+                R"(
 for (x, y, l) in zip(xlist, ylist, legends):
   pylab.plot(x, y, label=l)
 
-pylab.xlabel(")" + xlabel + R"(")
-pylab.ylabel(")" + ylabel + R"(")
+pylab.xlabel(")" +
+                xlabel + R"(")
+pylab.ylabel(")" +
+                ylabel + R"(")
 pylab.legend()
 pylab.tight_layout()
 pylab.show()
@@ -332,13 +326,9 @@ pylab.show()
   LOG(LINFO, ("Run: python", pythonScriptPath, "to look at:", ylabel, "versus", xlabel));
 }
 
-void CreatePythonBarByMap(std::string const & pythonScriptPath,
-                          std::vector<std::string> const & barLabels,
-                          std::vector<std::vector<double>> const & barHeights,
-                          std::vector<std::string> const & legends,
-                          std::string const & xlabel,
-                          std::string const & ylabel,
-                          bool drawPercents)
+void CreatePythonBarByMap(std::string const & pythonScriptPath, std::vector<std::string> const & barLabels,
+                          std::vector<std::vector<double>> const & barHeights, std::vector<std::string> const & legends,
+                          std::string const & xlabel, std::string const & ylabel, bool drawPercents)
 {
   std::ofstream python(pythonScriptPath);
   CHECK(python.good(), ("Can not open:", pythonScriptPath, "for writing."));
@@ -354,9 +344,8 @@ void CreatePythonBarByMap(std::string const & pythonScriptPath,
   else
     counts.back() = ']';
 
-  std::string const formatString = drawPercents
-                                       ? "f'{round(height, 2)}({round(height / summ * 100, 2)}%)'"
-                                       : "f'{round(height, 2)}'";
+  std::string const formatString =
+      drawPercents ? "f'{round(height, 2)}({round(height / summ * 100, 2)}%)'" : "f'{round(height, 2)}'";
 
   python << R"(
 import matplotlib
@@ -364,9 +353,12 @@ import matplotlib.pyplot as plt
 import numpy as np
 
 bar_width = 0.35
-labels = )" + labelsArray + R"(
-legends = )" + legendsArray + R"(
-counts = )" + counts + R"(
+labels = )" + labelsArray +
+                R"(
+legends = )" + legendsArray +
+                R"(
+counts = )" + counts +
+                R"(
 
 x = np.arange(len(labels))  # the label locations
 width = 0.35  # the width of the bars
@@ -377,8 +369,10 @@ for i in range(len(counts)):
     bar = ax.bar(x + i * bar_width, counts[i], bar_width, label=legends[i])
     bars.append(bar)
 
-ax.set_ylabel(')" + ylabel + R"(')
-ax.set_title(')" + xlabel + R"(')
+ax.set_ylabel(')" +
+                ylabel + R"(')
+ax.set_title(')" +
+                xlabel + R"(')
 pos = (bar_width * (len(counts) - 1)) / 2
 ax.set_xticks(x + pos)
 ax.set_xticklabels(labels)
@@ -391,7 +385,8 @@ def autolabel(rects, counts_ith):
 
     for rect in rects:
         height = rect.get_height()
-        ax.annotate()" + formatString + R"(,
+        ax.annotate()" +
+                formatString + R"(,
                     xy=(rect.get_x() + rect.get_width() / 2, height),
                     xytext=(0, 3),  # 3 points vertical offset
                     textcoords="offset points",
@@ -408,19 +403,12 @@ plt.show()
 
 /// \brief |SimilarityCounter| groups routes that we compare by similarity, here we tune these groups.
 // static
-std::vector<SimilarityCounter::Interval> const SimilarityCounter::kIntervals  = {
-    {"[0.0, 0.0]", 0, 0 + 1e-5},
-    {"[0.0, 0.1)", 0, 0.1},
-    {"[0.1, 0.2)", 0.1, 0.2},
-    {"[0.2, 0.3)", 0.2, 0.3},
-    {"[0.3, 0.6)", 0.3, 0.6},
-    {"[0.6, 0.8)", 0.6, 0.8},
-    {"[0.8, 1.0)", 0.8, 1.0},
-    {"[1.0, 1.0]", 1.0, 1.0 + 1e-5},
+std::vector<SimilarityCounter::Interval> const SimilarityCounter::kIntervals = {
+    {"[0.0, 0.0]", 0, 0 + 1e-5}, {"[0.0, 0.1)", 0, 0.1},   {"[0.1, 0.2)", 0.1, 0.2}, {"[0.2, 0.3)", 0.2, 0.3},
+    {"[0.3, 0.6)", 0.3, 0.6},    {"[0.6, 0.8)", 0.6, 0.8}, {"[0.8, 1.0)", 0.8, 1.0}, {"[1.0, 1.0]", 1.0, 1.0 + 1e-5},
 };
 
-SimilarityCounter::SimilarityCounter(RoutesSaver & routesSaver)
-  : m_routesSaver(routesSaver)
+SimilarityCounter::SimilarityCounter(RoutesSaver & routesSaver) : m_routesSaver(routesSaver)
 {
   for (auto const & interval : kIntervals)
     m_routesCounter.emplace_back(interval.m_name, 0);
@@ -466,9 +454,8 @@ void SimilarityCounter::Push(Result const & result)
   CHECK_LESS(m_currentInterval, m_routesCounter.size(), ());
   if (m_routesCounter[m_currentInterval].m_routesNumber == 0)
   {
-    LOG(LINFO,
-        ("Save routes with:", m_routesCounter[m_currentInterval].m_intervalName,
-         "similarity to:", m_routesSaver.GetCurrentPath()));
+    LOG(LINFO, ("Save routes with:", m_routesCounter[m_currentInterval].m_intervalName,
+                "similarity to:", m_routesSaver.GetCurrentPath()));
   }
 
   CHECK_LESS(m_currentInterval, m_routesCounter.size(), ());
@@ -481,8 +468,7 @@ void SimilarityCounter::CreateKmlFiles(double percent, std::vector<Result> const
   size_t realResultIndex = 0;
   for (size_t intervalId = 0; intervalId < m_routesCounter.size(); ++intervalId)
   {
-    std::string savePath =
-        base::JoinPath(m_routesSaver.GetTargetDir(), std::to_string(intervalId));
+    std::string savePath = base::JoinPath(m_routesSaver.GetTargetDir(), std::to_string(intervalId));
 
     auto const currentSize = m_routesCounter[intervalId].m_routesNumber;
     auto const resultSize = static_cast<size_t>(currentSize * percent / 100.0);
@@ -490,13 +476,10 @@ void SimilarityCounter::CreateKmlFiles(double percent, std::vector<Result> const
       continue;
 
     auto const mkdirRes = Platform::MkDir(savePath);
-    CHECK(mkdirRes == Platform::EError::ERR_OK ||
-          mkdirRes == Platform::EError::ERR_FILE_ALREADY_EXISTS,
+    CHECK(mkdirRes == Platform::EError::ERR_OK || mkdirRes == Platform::EError::ERR_FILE_ALREADY_EXISTS,
           ("Cannot create dir:", savePath));
 
-    LOG(LINFO, ("Saving", resultSize,
-                "kmls for:", m_routesCounter[intervalId].m_intervalName,
-                "to:", savePath));
+    LOG(LINFO, ("Saving", resultSize, "kmls for:", m_routesCounter[intervalId].m_intervalName, "to:", savePath));
 
     auto const step = static_cast<size_t>(currentSize / resultSize);
 
diff --git a/libs/routing/routing_quality/routing_quality_tool/utils.hpp b/libs/routing/routing_quality/routing_quality_tool/utils.hpp
index ff7f127b9..7868709d9 100644
--- a/libs/routing/routing_quality/routing_quality_tool/utils.hpp
+++ b/libs/routing/routing_quality/routing_quality_tool/utils.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "routing/routing_quality/api/api.hpp"
 #include "routing/routes_builder/routes_builder.hpp"
+#include "routing/routing_quality/api/api.hpp"
 
 #include "routing/routing_callbacks.hpp"
 
@@ -72,8 +72,7 @@ bool AreRoutesWithSameEnds(routing::routes_builder::RoutesBuilder::Result const
   auto const & anotherFinish = anotherResult.GetFinishPoint();
 
   double constexpr kEps = 1e-10;
-  return AlmostEqualAbs(start, anotherStart, kEps) &&
-         AlmostEqualAbs(finish, anotherFinish, kEps);
+  return AlmostEqualAbs(start, anotherStart, kEps) && AlmostEqualAbs(finish, anotherFinish, kEps);
 }
 
 template <typename AnotherResult>
@@ -95,8 +94,7 @@ bool FindAnotherResponse(routing::routes_builder::RoutesBuilder::Result const &
 
 struct Result
 {
-  Result(std::string mapsmeDumpPath, std::string anotherDumpPath,
-         ms::LatLon const & start, ms::LatLon const & finish,
+  Result(std::string mapsmeDumpPath, std::string anotherDumpPath, ms::LatLon const & start, ms::LatLon const & finish,
          double similarity, double etaDiffPercent);
 
   bool operator<(Result const & rhs) const;
@@ -170,24 +168,17 @@ private:
   std::vector<Item> m_routesCounter;
 };
 
-void CreatePythonScriptForDistribution(std::string const & pythonScriptPath,
-                                       std::string const & title,
+void CreatePythonScriptForDistribution(std::string const & pythonScriptPath, std::string const & title,
                                        std::vector<double> const & values);
 
-void CreatePythonGraphByPointsXY(std::string const & pythonScriptPath,
-                                 std::string const & xlabel,
-                                 std::string const & ylabel,
-                                 std::vector<std::vector<m2::PointD>> const & graphics,
+void CreatePythonGraphByPointsXY(std::string const & pythonScriptPath, std::string const & xlabel,
+                                 std::string const & ylabel, std::vector<std::vector<m2::PointD>> const & graphics,
                                  std::vector<std::string> const & legends);
 
 /// \brief Create python file, that show bar graph, where labels of bars are keys of |stat| and
 /// heights area values of |stat|.
-void CreatePythonBarByMap(std::string const & pythonScriptPath,
-                          std::vector<std::string> const & barLabels,
-                          std::vector<std::vector<double>> const & barHeights,
-                          std::vector<std::string> const & legends,
-                          std::string const & xlabel,
-                          std::string const & ylabel,
-                          bool drawPercents = true);
+void CreatePythonBarByMap(std::string const & pythonScriptPath, std::vector<std::string> const & barLabels,
+                          std::vector<std::vector<double>> const & barHeights, std::vector<std::string> const & legends,
+                          std::string const & xlabel, std::string const & ylabel, bool drawPercents = true);
 }  // namespace routing_quality_tool
 }  // namespace routing_quality
diff --git a/libs/routing/routing_quality/waypoints.cpp b/libs/routing/routing_quality/waypoints.cpp
index 02539954f..4ad149a45 100644
--- a/libs/routing/routing_quality/waypoints.cpp
+++ b/libs/routing/routing_quality/waypoints.cpp
@@ -15,8 +15,7 @@ namespace routing_quality
 {
 namespace metrics
 {
-Similarity CompareByNumberOfMatchedWaypoints(routing::FollowedPolyline polyline,
-                                             Waypoints const & waypoints)
+Similarity CompareByNumberOfMatchedWaypoints(routing::FollowedPolyline polyline, Waypoints const & waypoints)
 {
   double constexpr kMaxDistanceFromRouteM = 15.0;
 
@@ -26,8 +25,7 @@ Similarity CompareByNumberOfMatchedWaypoints(routing::FollowedPolyline polyline,
   for (size_t i = 0; i < size; ++i)
   {
     auto const & ll = waypoints[i];
-    m2::RectD const rect =
-        mercator::MetersToXY(ll.m_lon, ll.m_lat, kMaxDistanceFromRouteM /* metresR */);
+    m2::RectD const rect = mercator::MetersToXY(ll.m_lon, ll.m_lat, kMaxDistanceFromRouteM /* metresR */);
     auto const iter = polyline.UpdateProjection(rect);
     if (iter.IsValid())
     {
@@ -45,8 +43,7 @@ Similarity CompareByNumberOfMatchedWaypoints(routing::FollowedPolyline polyline,
   return result;
 }
 
-Similarity CompareByNumberOfMatchedWaypoints(routing::FollowedPolyline const & polyline,
-                                             ReferenceRoutes && candidates)
+Similarity CompareByNumberOfMatchedWaypoints(routing::FollowedPolyline const & polyline, ReferenceRoutes && candidates)
 {
   Similarity bestResult = 0.0;
   for (size_t j = 0; j < candidates.size(); ++j)
@@ -74,8 +71,7 @@ bool CheckRoute(Params const & params, ReferenceRoutes && referenceRoutes)
   return CheckWaypoints(params, std::move(referenceRoutes)) == 1.0;
 }
 
-bool CheckCarRoute(ms::LatLon const & start, ms::LatLon const & finish,
-                   ReferenceRoutes && referenceTracks)
+bool CheckCarRoute(ms::LatLon const & start, ms::LatLon const & finish, ReferenceRoutes && referenceTracks)
 {
   Params const params(routing::VehicleType::Car, start, finish);
   return CheckRoute(params, std::move(referenceTracks));
diff --git a/libs/routing/routing_quality/waypoints.hpp b/libs/routing/routing_quality/waypoints.hpp
index 7a61ade1c..dc6d0c1e7 100644
--- a/libs/routing/routing_quality/waypoints.hpp
+++ b/libs/routing/routing_quality/waypoints.hpp
@@ -24,10 +24,8 @@ using Similarity = double;
 
 namespace metrics
 {
-Similarity CompareByNumberOfMatchedWaypoints(routing::FollowedPolyline polyline,
-                                             Waypoints const & waypoints);
-Similarity CompareByNumberOfMatchedWaypoints(routing::FollowedPolyline const & polyline,
-                                             ReferenceRoutes && candidates);
+Similarity CompareByNumberOfMatchedWaypoints(routing::FollowedPolyline polyline, Waypoints const & waypoints);
+Similarity CompareByNumberOfMatchedWaypoints(routing::FollowedPolyline const & polyline, ReferenceRoutes && candidates);
 }  // namespace metrics
 
 /// \brief Checks how many reference waypoints the route contains.
@@ -37,6 +35,5 @@ Similarity CheckWaypoints(Params const & params, ReferenceRoutes && referenceRou
 /// \returns true if route from |start| to |finish| fully conforms one of |candidates|
 /// and false otherwise.
 bool CheckRoute(Params const & params, ReferenceRoutes && referenceRoutes);
-bool CheckCarRoute(ms::LatLon const & start, ms::LatLon const & finish,
-                   ReferenceRoutes && referenceRoutes);
+bool CheckCarRoute(ms::LatLon const & start, ms::LatLon const & finish, ReferenceRoutes && referenceRoutes);
 }  // namespace routing_quality
diff --git a/libs/routing/routing_result_graph.hpp b/libs/routing/routing_result_graph.hpp
index c9380a52a..b9af7246b 100644
--- a/libs/routing/routing_result_graph.hpp
+++ b/libs/routing/routing_result_graph.hpp
@@ -30,5 +30,5 @@ public:
 
   virtual ~IRoutingResult() = default;
 };
-}  // namespace routing
 }  // namespace turns
+}  // namespace routing
diff --git a/libs/routing/routing_session.cpp b/libs/routing/routing_session.cpp
index 1002fe516..2014ccc58 100644
--- a/libs/routing/routing_session.cpp
+++ b/libs/routing/routing_session.cpp
@@ -3,10 +3,10 @@
 #include "routing/routing_helpers.hpp"
 #include "routing/speed_camera.hpp"
 
+#include "platform/distance.hpp"
 #include "platform/location.hpp"
 #include "platform/measurement_utils.hpp"
 #include "platform/platform.hpp"
-#include "platform/distance.hpp"
 
 #include "geometry/angles.hpp"
 #include "geometry/mercator.hpp"
@@ -73,36 +73,32 @@ void RoutingSession::BuildRoute(Checkpoints const & checkpoints, uint32_t timeou
   m_router->ClearState();
 
   m_isFollowing = false;
-  m_routingRebuildCount = -1; // -1 for the first rebuild.
+  m_routingRebuildCount = -1;  // -1 for the first rebuild.
   m_routingRebuildAnnounceCount = 0;
 
-  RebuildRoute(checkpoints.GetStart(), m_buildReadyCallback, m_needMoreMapsCallback,
-               m_removeRouteCallback, timeoutSec, SessionState::RouteBuilding, false /* adjust */);
+  RebuildRoute(checkpoints.GetStart(), m_buildReadyCallback, m_needMoreMapsCallback, m_removeRouteCallback, timeoutSec,
+               SessionState::RouteBuilding, false /* adjust */);
 }
 
-void RoutingSession::RebuildRoute(m2::PointD const & startPoint,
-                                  ReadyCallback const & readyCallback,
+void RoutingSession::RebuildRoute(m2::PointD const & startPoint, ReadyCallback const & readyCallback,
                                   NeedMoreMapsCallback const & needMoreMapsCallback,
-                                  RemoveRouteCallback const & removeRouteCallback,
-                                  uint32_t timeoutSec, SessionState routeRebuildingState,
-                                  bool adjustToPrevRoute)
+                                  RemoveRouteCallback const & removeRouteCallback, uint32_t timeoutSec,
+                                  SessionState routeRebuildingState, bool adjustToPrevRoute)
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
   CHECK(m_router, ());
   SetState(routeRebuildingState);
 
   ++m_routingRebuildCount;
-  auto const & direction = m_routingSettings.m_useDirectionForRouteBuilding
-                               ? m_positionAccumulator.GetDirection()
-                               : m2::PointD::Zero();
+  auto const & direction =
+      m_routingSettings.m_useDirectionForRouteBuilding ? m_positionAccumulator.GetDirection() : m2::PointD::Zero();
 
   Checkpoints checkpoints(m_checkpoints);
   checkpoints.SetPointFrom(startPoint);
   // Use old-style callback construction, because lambda constructs buggy function on Android
   // (callback param isn't captured by value).
-  m_router->CalculateRoute(checkpoints, direction, adjustToPrevRoute,
-                           DoReadyCallback(*this, readyCallback), needMoreMapsCallback,
-                           removeRouteCallback, m_progressCallback, timeoutSec);
+  m_router->CalculateRoute(checkpoints, direction, adjustToPrevRoute, DoReadyCallback(*this, readyCallback),
+                           needMoreMapsCallback, removeRouteCallback, m_progressCallback, timeoutSec);
 }
 
 m2::PointD RoutingSession::GetStartPoint() const
@@ -153,9 +149,7 @@ void RoutingSession::RebuildRouteOnTrafficUpdate()
     case SessionState::RouteBuilding:
     case SessionState::RouteNotStarted:
     case SessionState::RouteNoFollowing:
-    case SessionState::RouteRebuilding:
-      startPoint = m_checkpoints.GetPointFrom();
-      break;
+    case SessionState::RouteRebuilding: startPoint = m_checkpoints.GetPointFrom(); break;
 
     case SessionState::OnRoute:
     case SessionState::RouteNeedRebuild: break;
@@ -166,8 +160,8 @@ void RoutingSession::RebuildRouteOnTrafficUpdate()
   }
 
   RebuildRoute(startPoint, m_rebuildReadyCallback, nullptr /* needMoreMapsCallback */,
-               nullptr /* removeRouteCallback */, RouterDelegate::kNoTimeout,
-               SessionState::RouteRebuilding, false /* adjustToPrevRoute */);
+               nullptr /* removeRouteCallback */, RouterDelegate::kNoTimeout, SessionState::RouteRebuilding,
+               false /* adjustToPrevRoute */);
 }
 
 bool RoutingSession::IsActive() const
@@ -304,11 +298,8 @@ SessionState RoutingSession::OnLocationPositionChanged(GpsInfo const & info)
     auto const curIter = m_route->GetCurrentIteratorTurn();
     // If we are moving to the next segment after passing the turn
     // it means the turn is changed. So the |m_onNewTurn| should be called.
-    if (formerIter && curIter && IsNormalTurn(*formerIter) &&
-        formerIter->m_index < curIter->m_index && m_onNewTurn)
-    {
+    if (formerIter && curIter && IsNormalTurn(*formerIter) && formerIter->m_index < curIter->m_index && m_onNewTurn)
       m_onNewTurn();
-    }
 
     return m_state;
   }
@@ -318,8 +309,8 @@ SessionState RoutingSession::OnLocationPositionChanged(GpsInfo const & info)
     // Distance from the last known projection on route
     // (check if we are moving far from the last known projection).
     auto const & lastGoodPoint = m_route->GetFollowedPolyline().GetCurrentIter().m_pt;
-    double const dist = mercator::DistanceOnEarth(lastGoodPoint,
-                                                  mercator::FromLatLon(info.m_latitude, info.m_longitude));
+    double const dist =
+        mercator::DistanceOnEarth(lastGoodPoint, mercator::FromLatLon(info.m_latitude, info.m_longitude));
     if (AlmostEqualAbs(dist, m_lastDistance, kRunawayDistanceSensitivityMeters))
       return m_state;
 
@@ -396,8 +387,7 @@ void RoutingSession::GetRouteFollowingInfo(FollowingInfo & info) const
     return;
   }
 
-  info.m_distToTarget =
-      platform::Distance::CreateFormatted(m_route->GetCurrentDistanceToEndMeters());
+  info.m_distToTarget = platform::Distance::CreateFormatted(m_route->GetCurrentDistanceToEndMeters());
 
   double distanceToTurnMeters = 0.;
   turns::TurnItem turn;
@@ -446,9 +436,8 @@ void RoutingSession::GetRouteFollowingInfo(FollowingInfo & info) const
   }
 
   // Pedestrian info.
-  info.m_pedestrianTurn = (distanceToTurnMeters < kShowPedestrianTurnInMeters)
-                              ? turn.m_pedestrianTurn
-                              : turns::PedestrianDirection::None;
+  info.m_pedestrianTurn =
+      (distanceToTurnMeters < kShowPedestrianTurnInMeters) ? turn.m_pedestrianTurn : turns::PedestrianDirection::None;
 }
 
 double RoutingSession::GetCompletionPercent() const
@@ -461,12 +450,9 @@ double RoutingSession::GetCompletionPercent() const
     return 0;
 
   double const percent =
-      100.0 * (m_passedDistanceOnRouteMeters + m_route->GetCurrentDistanceFromBeginMeters()) /
-      denominator;
+      100.0 * (m_passedDistanceOnRouteMeters + m_route->GetCurrentDistanceFromBeginMeters()) / denominator;
   if (percent - m_lastCompletionPercent > kCompletionPercentAccuracy)
-  {
     m_lastCompletionPercent = percent;
-  }
   return percent;
 }
 
@@ -546,8 +532,7 @@ void RoutingSession::AssignRoute(std::shared_ptr<Route> const & route, RouterRes
   m_speedCameraManager.SetRoute(m_route);
 }
 
-void RoutingSession::SetRouter(std::unique_ptr<IRouter> && router,
-                               std::unique_ptr<AbsentRegionsFinder> && finder)
+void RoutingSession::SetRouter(std::unique_ptr<IRouter> && router, std::unique_ptr<AbsentRegionsFinder> && finder)
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
   ASSERT(m_router != nullptr, ());
@@ -586,10 +571,7 @@ void RoutingSession::MatchLocationToRoadGraph(location::GpsInfo & location)
     if (m_route->GetCurrentRoutingSettings().m_matchRoute)
     {
       if (!AlmostEqualAbs(m_proj.m_point, proj.m_point, kEps))
-      {
-        location.m_bearing =
-            location::AngleToBearing(math::RadToDeg(ang::AngleTo(m_proj.m_point, proj.m_point)));
-      }
+        location.m_bearing = location::AngleToBearing(math::RadToDeg(ang::AngleTo(m_proj.m_point, proj.m_point)));
     }
 
     location.m_latitude = mercator::YToLat(proj.m_point.y);
@@ -603,8 +585,7 @@ void RoutingSession::MatchLocationToRoadGraph(location::GpsInfo & location)
   m_proj = proj;
 }
 
-bool RoutingSession::MatchLocationToRoute(location::GpsInfo & location,
-                                          location::RouteMatchingInfo & routeMatchingInfo)
+bool RoutingSession::MatchLocationToRoute(location::GpsInfo & location, location::RouteMatchingInfo & routeMatchingInfo)
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
   if (!IsOnRoute())
@@ -619,8 +600,7 @@ bool RoutingSession::MatchLocationToRoute(location::GpsInfo & location,
   return matchedToRoute;
 }
 
-traffic::SpeedGroup RoutingSession::MatchTraffic(
-    location::RouteMatchingInfo const & routeMatchingInfo) const
+traffic::SpeedGroup RoutingSession::MatchTraffic(location::RouteMatchingInfo const & routeMatchingInfo) const
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
   if (!routeMatchingInfo.IsMatched())
@@ -698,8 +678,7 @@ void RoutingSession::SetCheckpointCallback(CheckpointCallback const & checkpoint
   m_checkpointCallback = checkpointCallback;
 }
 
-void RoutingSession::SetChangeSessionStateCallback(
-    ChangeSessionStateCallback const & changeSessionStateCallback)
+void RoutingSession::SetChangeSessionStateCallback(ChangeSessionStateCallback const & changeSessionStateCallback)
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
   m_changeSessionStateCallback = changeSessionStateCallback;
@@ -861,7 +840,8 @@ void RoutingSession::OnTrafficInfoAdded(TrafficInfo && info)
 
   // Note. |coloring| should not be used after this call on gui thread.
   auto const mwmId = info.GetMwmId();
-  GetPlatform().RunTask(Platform::Thread::Gui, [this, mwmId, coloring]() {
+  GetPlatform().RunTask(Platform::Thread::Gui, [this, mwmId, coloring]()
+  {
     Set(mwmId, coloring);
     RebuildRouteOnTrafficUpdate();
   });
@@ -869,7 +849,8 @@ void RoutingSession::OnTrafficInfoAdded(TrafficInfo && info)
 
 void RoutingSession::OnTrafficInfoRemoved(MwmSet::MwmId const & mwmId)
 {
-  GetPlatform().RunTask(Platform::Thread::Gui, [this, mwmId]() {
+  GetPlatform().RunTask(Platform::Thread::Gui, [this, mwmId]()
+  {
     CHECK_THREAD_CHECKER(m_threadChecker, ());
     Remove(mwmId);
     RebuildRouteOnTrafficUpdate();
diff --git a/libs/routing/routing_session.hpp b/libs/routing/routing_session.hpp
index a186e3e77..555c717cd 100644
--- a/libs/routing/routing_session.hpp
+++ b/libs/routing/routing_session.hpp
@@ -43,7 +43,9 @@ namespace routing
 /// \breaf This class is responsible for the route built in the program.
 /// \note All method of this class should be called from ui thread if there's no
 /// a special note near a method.
-class RoutingSession : public traffic::TrafficObserver, public traffic::TrafficCache
+class RoutingSession
+  : public traffic::TrafficObserver
+  , public traffic::TrafficCache
 {
   friend struct UnitClass_AsyncGuiThreadTestWithRoutingSession_TestFollowRoutePercentTest;
 
@@ -52,16 +54,14 @@ public:
 
   void Init(PointCheckCallback const & pointCheckCallback);
 
-  void SetRouter(std::unique_ptr<IRouter> && router,
-                 std::unique_ptr<AbsentRegionsFinder> && finder);
+  void SetRouter(std::unique_ptr<IRouter> && router, std::unique_ptr<AbsentRegionsFinder> && finder);
 
   /// @param[in] checkpoints in mercator
   /// @param[in] timeoutSec timeout in seconds, if zero then there is no timeout
   void BuildRoute(Checkpoints const & checkpoints, uint32_t timeoutSec);
   void RebuildRoute(m2::PointD const & startPoint, ReadyCallback const & readyCallback,
-                    NeedMoreMapsCallback const & needMoreMapsCallback,
-                    RemoveRouteCallback const & removeRouteCallback, uint32_t timeoutSec,
-                    SessionState routeRebuildingState, bool adjustToPrevRoute);
+                    NeedMoreMapsCallback const & needMoreMapsCallback, RemoveRouteCallback const & removeRouteCallback,
+                    uint32_t timeoutSec, SessionState routeRebuildingState, bool adjustToPrevRoute);
 
   m2::PointD GetStartPoint() const;
   m2::PointD GetEndPoint() const;
@@ -101,8 +101,7 @@ public:
   SessionState OnLocationPositionChanged(location::GpsInfo const & info);
   void GetRouteFollowingInfo(FollowingInfo & info) const;
 
-  bool MatchLocationToRoute(location::GpsInfo & location,
-                            location::RouteMatchingInfo & routeMatchingInfo);
+  bool MatchLocationToRoute(location::GpsInfo & location, location::RouteMatchingInfo & routeMatchingInfo);
   void MatchLocationToRoadGraph(location::GpsInfo & location);
   // Get traffic speed for the current route position.
   // Returns SpeedGroup::Unknown if any trouble happens: position doesn't match with route or something else.
@@ -125,8 +124,7 @@ public:
   bool EnableFollowMode();
 
   void SetRoutingSettings(RoutingSettings const & routingSettings);
-  void SetRoutingCallbacks(ReadyCallback const & buildReadyCallback,
-                           ReadyCallback const & rebuildReadyCallback,
+  void SetRoutingCallbacks(ReadyCallback const & buildReadyCallback, ReadyCallback const & rebuildReadyCallback,
                            NeedMoreMapsCallback const & needMoreMapsCallback,
                            RemoveRouteCallback const & removeRouteCallback);
   void SetProgressCallback(ProgressCallback const & progressCallback);
@@ -180,9 +178,7 @@ private:
     RoutingSession & m_rs;
     ReadyCallback m_callback;
 
-    DoReadyCallback(RoutingSession & rs, ReadyCallback const & cb)
-        : m_rs(rs), m_callback(cb)
-    {}
+    DoReadyCallback(RoutingSession & rs, ReadyCallback const & cb) : m_rs(rs), m_callback(cb) {}
 
     void operator()(std::shared_ptr<Route> const & route, RouterResultCode e);
   };
@@ -233,8 +229,8 @@ private:
   // Passed distance on route including reroutes
   double m_passedDistanceOnRouteMeters = 0.0;
   // Rerouting count
-  int m_routingRebuildCount = -1; // -1 for the first rebuild called in BuildRoute().
-  int m_routingRebuildAnnounceCount = 0; // track TTS announcement state (ignore the first build)
+  int m_routingRebuildCount = -1;         // -1 for the first rebuild called in BuildRoute().
+  int m_routingRebuildAnnounceCount = 0;  // track TTS announcement state (ignore the first build)
   mutable double m_lastCompletionPercent = 0.0;
 
   DECLARE_THREAD_CHECKER(m_threadChecker);
diff --git a/libs/routing/routing_settings.cpp b/libs/routing/routing_settings.cpp
index 75939ab0c..258949c1c 100644
--- a/libs/routing/routing_settings.cpp
+++ b/libs/routing/routing_settings.cpp
@@ -7,13 +7,11 @@
 namespace routing
 {
 // RoutingSettings ---------------------------------------------------------------------------------
-RoutingSettings::RoutingSettings(bool useDirectionForRouteBuilding, bool matchRoute,
-                                 bool soundDirection, double matchingThresholdM,
-                                 bool showTurnAfterNext, double minSpeedForRouteRebuildMpS,
-                                 double finishToleranceM, size_t maxOutgoingPointsCount,
-                                 double minOutgoingDistMeters, size_t maxIngoingPointsCount,
-                                 double minIngoingDistMeters, size_t notSoCloseMaxPointsCount,
-                                 double notSoCloseMaxDistMeters)
+RoutingSettings::RoutingSettings(bool useDirectionForRouteBuilding, bool matchRoute, bool soundDirection,
+                                 double matchingThresholdM, bool showTurnAfterNext, double minSpeedForRouteRebuildMpS,
+                                 double finishToleranceM, size_t maxOutgoingPointsCount, double minOutgoingDistMeters,
+                                 size_t maxIngoingPointsCount, double minIngoingDistMeters,
+                                 size_t notSoCloseMaxPointsCount, double notSoCloseMaxDistMeters)
 
   : m_useDirectionForRouteBuilding(useDirectionForRouteBuilding)
   , m_matchRoute(matchRoute)
@@ -28,8 +26,7 @@ RoutingSettings::RoutingSettings(bool useDirectionForRouteBuilding, bool matchRo
   , m_minIngoingDistMeters(minIngoingDistMeters)
   , m_notSoCloseMaxPointsCount(notSoCloseMaxPointsCount)
   , m_notSoCloseMaxDistMeters(notSoCloseMaxDistMeters)
-{
-}
+{}
 
 RoutingSettings GetRoutingSettings(VehicleType vehicleType)
 {
@@ -91,10 +88,8 @@ RoutingSettings GetRoutingSettings(VehicleType vehicleType)
             100.0 /* m_minIngoingDistMeters */,
             3 /* m_notSoCloseMaxPointsCount */,
             30.0 /* m_notSoCloseMaxDistMeters */};
-  case VehicleType::Count:
-    CHECK(false, ("Can't create GetRoutingSettings for", vehicleType));
+  case VehicleType::Count: CHECK(false, ("Can't create GetRoutingSettings for", vehicleType));
   }
   UNREACHABLE();
 }
 }  // namespace routing
-
diff --git a/libs/routing/routing_settings.hpp b/libs/routing/routing_settings.hpp
index b63f75b3f..297451dfa 100644
--- a/libs/routing/routing_settings.hpp
+++ b/libs/routing/routing_settings.hpp
@@ -12,12 +12,10 @@ struct RoutingSettings
   friend RoutingSettings GetRoutingSettings(VehicleType vehicleType);
 
 private:
-  RoutingSettings(bool useDirectionForRouteBuilding, bool matchRoute, bool soundDirection,
-                  double matchingThresholdM, bool showTurnAfterNext,
-                  double minSpeedForRouteRebuildMpS, double finishToleranceM,
-                  size_t maxOutgoingPointsCount, double minOutgoingDistMeters,
-                  size_t maxIngoingPointsCount, double minIngoingDistMeters,
-                  size_t notSoCloseMaxPointsCount, double notSoCloseMaxDistMeters);
+  RoutingSettings(bool useDirectionForRouteBuilding, bool matchRoute, bool soundDirection, double matchingThresholdM,
+                  bool showTurnAfterNext, double minSpeedForRouteRebuildMpS, double finishToleranceM,
+                  size_t maxOutgoingPointsCount, double minOutgoingDistMeters, size_t maxIngoingPointsCount,
+                  double minIngoingDistMeters, size_t notSoCloseMaxPointsCount, double notSoCloseMaxDistMeters);
 
 public:
   /// \brief We accumulate several positions to calculate current direction.
diff --git a/libs/routing/routing_tests/applying_traffic_test.cpp b/libs/routing/routing_tests/applying_traffic_test.cpp
index c29f56318..10c4239b0 100644
--- a/libs/routing/routing_tests/applying_traffic_test.cpp
+++ b/libs/routing/routing_tests/applying_traffic_test.cpp
@@ -128,8 +128,7 @@ UNIT_CLASS_TEST(ApplyingTrafficTest, XXGraph_EmptyTrafficColoring)
   TEST(!GetTrafficStash()->Has(kTestNumMwmId), ());
 
   unique_ptr<WorldGraph> graph = BuildXXGraph(GetEstimator());
-  auto const start =
-      MakeFakeEnding(9 /* featureId */, 0 /* segmentIdx */, m2::PointD(2.0, -1.0), *graph);
+  auto const start = MakeFakeEnding(9 /* featureId */, 0 /* segmentIdx */, m2::PointD(2.0, -1.0), *graph);
   auto const finish = MakeFakeEnding(6, 0, m2::PointD(3.0, 3.0), *graph);
   auto starter = MakeStarter(start, finish, *graph);
   vector<m2::PointD> const expectedGeom = {{2 /* x */, -1 /* y */}, {2, 0}, {1, 1}, {2, 2}, {3, 3}};
@@ -140,13 +139,11 @@ UNIT_CLASS_TEST(ApplyingTrafficTest, XXGraph_EmptyTrafficColoring)
 UNIT_CLASS_TEST(ApplyingTrafficTest, XXGraph_G0onF3)
 {
   TrafficInfo::Coloring const coloring = {
-      {{3 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection},
-       SpeedGroup::G0}};
+      {{3 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection}, SpeedGroup::G0}};
   SetTrafficColoring(make_shared<TrafficInfo::Coloring const>(coloring));
 
   unique_ptr<WorldGraph> graph = BuildXXGraph(GetEstimator());
-  auto const start =
-      MakeFakeEnding(9 /* featureId */, 0 /* segmentIdx */, m2::PointD(2.0, -1.0), *graph);
+  auto const start = MakeFakeEnding(9 /* featureId */, 0 /* segmentIdx */, m2::PointD(2.0, -1.0), *graph);
   auto const finish = MakeFakeEnding(6, 0, m2::PointD(3.0, 3.0), *graph);
   auto starter = MakeStarter(start, finish, *graph);
   vector<m2::PointD> const expectedGeom = {{2 /* x */, -1 /* y */}, {2, 0}, {3, 0}, {3, 1}, {2, 2}, {3, 3}};
@@ -157,13 +154,11 @@ UNIT_CLASS_TEST(ApplyingTrafficTest, XXGraph_G0onF3)
 UNIT_CLASS_TEST(ApplyingTrafficTest, XXGraph_TempBlockonF3)
 {
   TrafficInfo::Coloring const coloring = {
-      {{3 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection},
-       SpeedGroup::TempBlock}};
+      {{3 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection}, SpeedGroup::TempBlock}};
   SetTrafficColoring(make_shared<TrafficInfo::Coloring const>(coloring));
 
   unique_ptr<WorldGraph> graph = BuildXXGraph(GetEstimator());
-  auto const start =
-      MakeFakeEnding(9 /* featureId */, 0 /* segmentIdx */, m2::PointD(2.0, -1.0), *graph);
+  auto const start = MakeFakeEnding(9 /* featureId */, 0 /* segmentIdx */, m2::PointD(2.0, -1.0), *graph);
   auto const finish = MakeFakeEnding(6, 0, m2::PointD(3.0, 3.0), *graph);
   auto starter = MakeStarter(start, finish, *graph);
   vector<m2::PointD> const expectedGeom = {{2 /* x */, -1 /* y */}, {2, 0}, {3, 0}, {3, 1}, {2, 2}, {3, 3}};
@@ -174,13 +169,11 @@ UNIT_CLASS_TEST(ApplyingTrafficTest, XXGraph_TempBlockonF3)
 UNIT_CLASS_TEST(ApplyingTrafficTest, XXGraph_G0onF3ReverseDir)
 {
   TrafficInfo::Coloring const coloring = {
-      {{3 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kReverseDirection},
-       SpeedGroup::G0}};
+      {{3 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kReverseDirection}, SpeedGroup::G0}};
   SetTrafficColoring(make_shared<TrafficInfo::Coloring const>(coloring));
 
   unique_ptr<WorldGraph> graph = BuildXXGraph(GetEstimator());
-  auto const start =
-      MakeFakeEnding(9 /* featureId */, 0 /* segmentIdx */, m2::PointD(2.0, -1.0), *graph);
+  auto const start = MakeFakeEnding(9 /* featureId */, 0 /* segmentIdx */, m2::PointD(2.0, -1.0), *graph);
   auto const finish = MakeFakeEnding(6, 0, m2::PointD(3.0, 3.0), *graph);
   auto starter = MakeStarter(start, finish, *graph);
   vector<m2::PointD> const expectedGeom = {{2 /* x */, -1 /* y */}, {2, 0}, {1, 1}, {2, 2}, {3, 3}};
@@ -191,19 +184,14 @@ UNIT_CLASS_TEST(ApplyingTrafficTest, XXGraph_G0onF3ReverseDir)
 UNIT_CLASS_TEST(ApplyingTrafficTest, XXGraph_G0onF3andF6andG4onF8andF4)
 {
   TrafficInfo::Coloring const coloring = {
-      {{3 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection},
-       SpeedGroup::G0},
-      {{6 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection},
-       SpeedGroup::G0},
-      {{8 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection},
-       SpeedGroup::G4},
-      {{7 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection},
-       SpeedGroup::G4}};
+      {{3 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection}, SpeedGroup::G0},
+      {{6 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection}, SpeedGroup::G0},
+      {{8 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection}, SpeedGroup::G4},
+      {{7 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection}, SpeedGroup::G4}};
   SetTrafficColoring(make_shared<TrafficInfo::Coloring const>(coloring));
 
   unique_ptr<WorldGraph> graph = BuildXXGraph(GetEstimator());
-  auto const start =
-      MakeFakeEnding(9 /* featureId */, 0 /* segmentIdx */, m2::PointD(2.0, -1.0), *graph);
+  auto const start = MakeFakeEnding(9 /* featureId */, 0 /* segmentIdx */, m2::PointD(2.0, -1.0), *graph);
   auto const finish = MakeFakeEnding(6, 0, m2::PointD(3.0, 3.0), *graph);
   auto starter = MakeStarter(start, finish, *graph);
   vector<m2::PointD> const expectedGeom = {{2 /* x */, -1 /* y */}, {2, 0}, {3, 0}, {3, 1}, {2, 2}, {3, 3}};
@@ -217,8 +205,7 @@ UNIT_CLASS_TEST(ApplyingTrafficTest, XXGraph_ChangingTraffic)
   TEST(!GetTrafficStash()->Has(kTestNumMwmId), ());
 
   unique_ptr<WorldGraph> graph = BuildXXGraph(GetEstimator());
-  auto const start =
-      MakeFakeEnding(9 /* featureId */, 0 /* segmentIdx */, m2::PointD(2.0, -1.0), *graph);
+  auto const start = MakeFakeEnding(9 /* featureId */, 0 /* segmentIdx */, m2::PointD(2.0, -1.0), *graph);
   auto const finish = MakeFakeEnding(6, 0, m2::PointD(3.0, 3.0), *graph);
   auto starter = MakeStarter(start, finish, *graph);
   vector<m2::PointD> const noTrafficGeom = {{2 /* x */, -1 /* y */}, {2, 0}, {1, 1}, {2, 2}, {3, 3}};
@@ -228,8 +215,7 @@ UNIT_CLASS_TEST(ApplyingTrafficTest, XXGraph_ChangingTraffic)
 
   // Heavy traffic (SpeedGroup::G0) on F3.
   TrafficInfo::Coloring const coloringHeavyF3 = {
-      {{3 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection},
-       SpeedGroup::G0}};
+      {{3 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection}, SpeedGroup::G0}};
   SetTrafficColoring(make_shared<TrafficInfo::Coloring const>(coloringHeavyF3));
   {
     vector<m2::PointD> const heavyF3Geom = {{2 /* x */, -1 /* y */}, {2, 0}, {3, 0}, {3, 1}, {2, 2}, {3, 3}};
@@ -238,16 +224,11 @@ UNIT_CLASS_TEST(ApplyingTrafficTest, XXGraph_ChangingTraffic)
 
   // Overloading traffic jam on F3. Middle traffic (SpeedGroup::G3) on F1, F3, F4, F7 and F8.
   TrafficInfo::Coloring const coloringMiddleF1F3F4F7F8 = {
-      {{1 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection},
-       SpeedGroup::G3},
-      {{3 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection},
-       SpeedGroup::G3},
-      {{4 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection},
-       SpeedGroup::G3},
-      {{7 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection},
-       SpeedGroup::G3},
-      {{8 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection},
-       SpeedGroup::G3}};
+      {{1 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection}, SpeedGroup::G3},
+      {{3 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection}, SpeedGroup::G3},
+      {{4 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection}, SpeedGroup::G3},
+      {{7 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection}, SpeedGroup::G3},
+      {{8 /* feature id */, 0 /* segment id */, TrafficInfo::RoadSegmentId::kForwardDirection}, SpeedGroup::G3}};
   SetTrafficColoring(make_shared<TrafficInfo::Coloring const>(coloringMiddleF1F3F4F7F8));
   {
     TestRouteGeometry(*starter, Algorithm::Result::OK, noTrafficGeom);
diff --git a/libs/routing/routing_tests/astar_algorithm_test.cpp b/libs/routing/routing_tests/astar_algorithm_test.cpp
index 9056f3404..98343eca8 100644
--- a/libs/routing/routing_tests/astar_algorithm_test.cpp
+++ b/libs/routing/routing_tests/astar_algorithm_test.cpp
@@ -65,9 +65,8 @@ UNIT_TEST(AStarAlgorithm_CheckLength)
 
   auto checkLength = [](double weight) { return weight < 23; };
   Algorithm algo;
-  Algorithm::ParamsForTests<decltype(checkLength)> params(
-      graph, 0u /* startVertex */, 4u /* finishVertex */,
-      std::move(checkLength));
+  Algorithm::ParamsForTests<decltype(checkLength)> params(graph, 0u /* startVertex */, 4u /* finishVertex */,
+                                                          std::move(checkLength));
 
   RoutingResult<unsigned /* Vertex */, double /* Weight */> routingResult;
   Algorithm::Result result = algo.FindPath(params, routingResult);
@@ -96,8 +95,8 @@ UNIT_TEST(AdjustRoute)
 
   auto checkLength = [](double weight) { return weight <= 1.0; };
   Algorithm algo;
-  Algorithm::ParamsForTests<decltype(checkLength)> params(
-      graph, 6 /* startVertex */, {} /* finishVertex */, std::move(checkLength));
+  Algorithm::ParamsForTests<decltype(checkLength)> params(graph, 6 /* startVertex */, {} /* finishVertex */,
+                                                          std::move(checkLength));
 
   RoutingResult<unsigned /* Vertex */, double /* Weight */> result;
   auto const code = algo.AdjustRoute(params, prevRoute, result);
@@ -120,8 +119,8 @@ UNIT_TEST(AdjustRouteNoPath)
 
   auto checkLength = [](double weight) { return weight <= 1.0; };
   Algorithm algo;
-  Algorithm::ParamsForTests<decltype(checkLength)> params(
-        graph, 6 /* startVertex */, {} /* finishVertex */, std::move(checkLength));
+  Algorithm::ParamsForTests<decltype(checkLength)> params(graph, 6 /* startVertex */, {} /* finishVertex */,
+                                                          std::move(checkLength));
   RoutingResult<unsigned /* Vertex */, double /* Weight */> result;
   auto const code = algo.AdjustRoute(params, prevRoute, result);
 
@@ -143,8 +142,8 @@ UNIT_TEST(AdjustRouteOutOfLimit)
 
   auto checkLength = [](double weight) { return weight <= 1.0; };
   Algorithm algo;
-  Algorithm::ParamsForTests<decltype(checkLength)> params(
-      graph, 6 /* startVertex */, {} /* finishVertex */, std::move(checkLength));
+  Algorithm::ParamsForTests<decltype(checkLength)> params(graph, 6 /* startVertex */, {} /* finishVertex */,
+                                                          std::move(checkLength));
 
   RoutingResult<unsigned /* Vertex */, double /* Weight */> result;
   auto const code = algo.AdjustRoute(params, prevRoute, result);
diff --git a/libs/routing/routing_tests/astar_progress_test.cpp b/libs/routing/routing_tests/astar_progress_test.cpp
index 68a0bfd35..50f79bede 100644
--- a/libs/routing/routing_tests/astar_progress_test.cpp
+++ b/libs/routing/routing_tests/astar_progress_test.cpp
@@ -19,9 +19,7 @@ UNIT_TEST(DirectedAStarProgressCheck)
   TEST_GREATER(progress.UpdateProgress(middle, finish), 49.0, ());
 
   static auto constexpr kEps = 0.001;
-  TEST_GREATER(progress.UpdateProgress(finish, finish),
-               AStarProgress::kMaxPercent - kEps,
-               ());
+  TEST_GREATER(progress.UpdateProgress(finish, finish), AStarProgress::kMaxPercent - kEps, ());
 
   progress.PushAndDropLastSubProgress();
 }
@@ -79,4 +77,4 @@ UNIT_TEST(BidirectedAStarProgressCheck)
 
   progress.PushAndDropLastSubProgress();
 }
-} //  namespace routing_test
+}  //  namespace routing_test
diff --git a/libs/routing/routing_tests/astar_router_test.cpp b/libs/routing/routing_tests/astar_router_test.cpp
index 44a09fbc4..cbce48294 100644
--- a/libs/routing/routing_tests/astar_router_test.cpp
+++ b/libs/routing/routing_tests/astar_router_test.cpp
@@ -4,8 +4,8 @@
 #include "routing/routing_tests/routing_algorithm.hpp"
 
 #include "routing/features_road_graph.hpp"
-#include "routing/route.hpp"
 #include "routing/road_graph.hpp"
+#include "routing/route.hpp"
 #include "routing/router_delegate.hpp"
 
 #include "indexer/classificator_loader.hpp"
@@ -25,8 +25,7 @@ using namespace routing;
 using namespace routing_test;
 using namespace std;
 
-void TestAStarRouterMock(geometry::PointWithAltitude const & startPos,
-                         geometry::PointWithAltitude const & finalPos,
+void TestAStarRouterMock(geometry::PointWithAltitude const & startPos, geometry::PointWithAltitude const & finalPos,
                          vector<geometry::PointWithAltitude> const & expected)
 {
   classificator::Load();
@@ -36,8 +35,7 @@ void TestAStarRouterMock(geometry::PointWithAltitude const & startPos,
 
   RoutingResult<geometry::PointWithAltitude, double /* Weight */> result;
   TestAStarBidirectionalAlgo algorithm;
-  TEST_EQUAL(TestAStarBidirectionalAlgo::Result::OK,
-             algorithm.CalculateRoute(graph, startPos, finalPos, result), ());
+  TEST_EQUAL(TestAStarBidirectionalAlgo::Result::OK, algorithm.CalculateRoute(graph, startPos, finalPos, result), ());
 
   TEST_EQUAL(expected, result.m_path, ());
 }
@@ -55,37 +53,31 @@ void AddRoad(RoadGraphMockSource & graph, initializer_list<m2::PointD> const & p
 
 UNIT_TEST(AStarRouter_Graph2_Simple1)
 {
-  geometry::PointWithAltitude const startPos =
-      geometry::MakePointWithAltitudeForTesting(m2::PointD(0, 0));
-  geometry::PointWithAltitude const finalPos =
-      geometry::MakePointWithAltitudeForTesting(m2::PointD(80, 55));
+  geometry::PointWithAltitude const startPos = geometry::MakePointWithAltitudeForTesting(m2::PointD(0, 0));
+  geometry::PointWithAltitude const finalPos = geometry::MakePointWithAltitudeForTesting(m2::PointD(80, 55));
 
-  vector<geometry::PointWithAltitude> const expected = {
-      geometry::MakePointWithAltitudeForTesting(m2::PointD(0, 0)),
-      geometry::MakePointWithAltitudeForTesting(m2::PointD(5, 10)),
-      geometry::MakePointWithAltitudeForTesting(m2::PointD(5, 40)),
-      geometry::MakePointWithAltitudeForTesting(m2::PointD(18, 55)),
-      geometry::MakePointWithAltitudeForTesting(m2::PointD(39, 55)),
-      geometry::MakePointWithAltitudeForTesting(m2::PointD(80, 55))};
+  vector<geometry::PointWithAltitude> const expected = {geometry::MakePointWithAltitudeForTesting(m2::PointD(0, 0)),
+                                                        geometry::MakePointWithAltitudeForTesting(m2::PointD(5, 10)),
+                                                        geometry::MakePointWithAltitudeForTesting(m2::PointD(5, 40)),
+                                                        geometry::MakePointWithAltitudeForTesting(m2::PointD(18, 55)),
+                                                        geometry::MakePointWithAltitudeForTesting(m2::PointD(39, 55)),
+                                                        geometry::MakePointWithAltitudeForTesting(m2::PointD(80, 55))};
 
   TestAStarRouterMock(startPos, finalPos, expected);
 }
 
 UNIT_TEST(AStarRouter_Graph2_Simple2)
 {
-  geometry::PointWithAltitude const startPos =
-      geometry::MakePointWithAltitudeForTesting(m2::PointD(80, 55));
-  geometry::PointWithAltitude const finalPos =
-      geometry::MakePointWithAltitudeForTesting(m2::PointD(80, 0));
+  geometry::PointWithAltitude const startPos = geometry::MakePointWithAltitudeForTesting(m2::PointD(80, 55));
+  geometry::PointWithAltitude const finalPos = geometry::MakePointWithAltitudeForTesting(m2::PointD(80, 0));
 
-  vector<geometry::PointWithAltitude> const expected = {
-      geometry::MakePointWithAltitudeForTesting(m2::PointD(80, 55)),
-      geometry::MakePointWithAltitudeForTesting(m2::PointD(39, 55)),
-      geometry::MakePointWithAltitudeForTesting(m2::PointD(37, 30)),
-      geometry::MakePointWithAltitudeForTesting(m2::PointD(70, 30)),
-      geometry::MakePointWithAltitudeForTesting(m2::PointD(70, 10)),
-      geometry::MakePointWithAltitudeForTesting(m2::PointD(70, 0)),
-      geometry::MakePointWithAltitudeForTesting(m2::PointD(80, 0))};
+  vector<geometry::PointWithAltitude> const expected = {geometry::MakePointWithAltitudeForTesting(m2::PointD(80, 55)),
+                                                        geometry::MakePointWithAltitudeForTesting(m2::PointD(39, 55)),
+                                                        geometry::MakePointWithAltitudeForTesting(m2::PointD(37, 30)),
+                                                        geometry::MakePointWithAltitudeForTesting(m2::PointD(70, 30)),
+                                                        geometry::MakePointWithAltitudeForTesting(m2::PointD(70, 10)),
+                                                        geometry::MakePointWithAltitudeForTesting(m2::PointD(70, 0)),
+                                                        geometry::MakePointWithAltitudeForTesting(m2::PointD(80, 0))};
 
   TestAStarRouterMock(startPos, finalPos, expected);
 }
@@ -95,28 +87,24 @@ UNIT_TEST(AStarRouter_SimpleGraph_RouteIsFound)
   classificator::Load();
 
   RoadGraphMockSource graph;
-  AddRoad(graph, {m2::PointD(0, 0), m2::PointD(40, 0)}); // feature 0
-  AddRoad(graph, {m2::PointD(40, 0), m2::PointD(40, 30)}); // feature 1
-  AddRoad(graph, {m2::PointD(40, 30), m2::PointD(40, 100)}); // feature 2
-  AddRoad(graph, {m2::PointD(40, 100), m2::PointD(0, 60)}); // feature 3
-  AddRoad(graph, {m2::PointD(0, 60), m2::PointD(0, 30)}); // feature 4
-  AddRoad(graph, {m2::PointD(0, 30), m2::PointD(0, 0)}); // feature 5
+  AddRoad(graph, {m2::PointD(0, 0), m2::PointD(40, 0)});      // feature 0
+  AddRoad(graph, {m2::PointD(40, 0), m2::PointD(40, 30)});    // feature 1
+  AddRoad(graph, {m2::PointD(40, 30), m2::PointD(40, 100)});  // feature 2
+  AddRoad(graph, {m2::PointD(40, 100), m2::PointD(0, 60)});   // feature 3
+  AddRoad(graph, {m2::PointD(0, 60), m2::PointD(0, 30)});     // feature 4
+  AddRoad(graph, {m2::PointD(0, 30), m2::PointD(0, 0)});      // feature 5
 
-  geometry::PointWithAltitude const startPos =
-      geometry::MakePointWithAltitudeForTesting(m2::PointD(0, 0));
-  geometry::PointWithAltitude const finalPos =
-      geometry::MakePointWithAltitudeForTesting(m2::PointD(40, 100));
+  geometry::PointWithAltitude const startPos = geometry::MakePointWithAltitudeForTesting(m2::PointD(0, 0));
+  geometry::PointWithAltitude const finalPos = geometry::MakePointWithAltitudeForTesting(m2::PointD(40, 100));
 
-  vector<geometry::PointWithAltitude> const expected = {
-      geometry::MakePointWithAltitudeForTesting(m2::PointD(0, 0)),
-      geometry::MakePointWithAltitudeForTesting(m2::PointD(0, 30)),
-      geometry::MakePointWithAltitudeForTesting(m2::PointD(0, 60)),
-      geometry::MakePointWithAltitudeForTesting(m2::PointD(40, 100))};
+  vector<geometry::PointWithAltitude> const expected = {geometry::MakePointWithAltitudeForTesting(m2::PointD(0, 0)),
+                                                        geometry::MakePointWithAltitudeForTesting(m2::PointD(0, 30)),
+                                                        geometry::MakePointWithAltitudeForTesting(m2::PointD(0, 60)),
+                                                        geometry::MakePointWithAltitudeForTesting(m2::PointD(40, 100))};
 
   RoutingResult<geometry::PointWithAltitude, double /* Weight */> result;
   TestAStarBidirectionalAlgo algorithm;
-  TEST_EQUAL(TestAStarBidirectionalAlgo::Result::OK,
-             algorithm.CalculateRoute(graph, startPos, finalPos, result), ());
+  TEST_EQUAL(TestAStarBidirectionalAlgo::Result::OK, algorithm.CalculateRoute(graph, startPos, finalPos, result), ());
 
   TEST_EQUAL(expected, result.m_path, ());
 }
@@ -131,42 +119,34 @@ UNIT_TEST(AStarRouter_SimpleGraph_RoutesInConnectedComponents)
 
   // Roads in the first connected component.
   vector<IRoadGraph::RoadInfo> const roadInfo_1 = {
-      IRoadGraph::RoadInfo(
-          true /* bidir */, speedKMpH,
-          {geometry::MakePointWithAltitudeForTesting(m2::PointD(10, 10)),
-           geometry::MakePointWithAltitudeForTesting(m2::PointD(90, 10))}),  // feature 0
-      IRoadGraph::RoadInfo(
-          true /* bidir */, speedKMpH,
-          {geometry::MakePointWithAltitudeForTesting(m2::PointD(90, 10)),
-           geometry::MakePointWithAltitudeForTesting(m2::PointD(90, 90))}),  // feature 1
-      IRoadGraph::RoadInfo(
-          true /* bidir */, speedKMpH,
-          {geometry::MakePointWithAltitudeForTesting(m2::PointD(90, 90)),
-           geometry::MakePointWithAltitudeForTesting(m2::PointD(10, 90))}),  // feature 2
-      IRoadGraph::RoadInfo(
-          true /* bidir */, speedKMpH,
-          {geometry::MakePointWithAltitudeForTesting(m2::PointD(10, 90)),
-           geometry::MakePointWithAltitudeForTesting(m2::PointD(10, 10))}),  // feature 3
+      IRoadGraph::RoadInfo(true /* bidir */, speedKMpH,
+                           {geometry::MakePointWithAltitudeForTesting(m2::PointD(10, 10)),
+                            geometry::MakePointWithAltitudeForTesting(m2::PointD(90, 10))}),  // feature 0
+      IRoadGraph::RoadInfo(true /* bidir */, speedKMpH,
+                           {geometry::MakePointWithAltitudeForTesting(m2::PointD(90, 10)),
+                            geometry::MakePointWithAltitudeForTesting(m2::PointD(90, 90))}),  // feature 1
+      IRoadGraph::RoadInfo(true /* bidir */, speedKMpH,
+                           {geometry::MakePointWithAltitudeForTesting(m2::PointD(90, 90)),
+                            geometry::MakePointWithAltitudeForTesting(m2::PointD(10, 90))}),  // feature 2
+      IRoadGraph::RoadInfo(true /* bidir */, speedKMpH,
+                           {geometry::MakePointWithAltitudeForTesting(m2::PointD(10, 90)),
+                            geometry::MakePointWithAltitudeForTesting(m2::PointD(10, 10))}),  // feature 3
   };
 
   // Roads in the second connected component.
   vector<IRoadGraph::RoadInfo> const roadInfo_2 = {
-      IRoadGraph::RoadInfo(
-          true /* bidir */, speedKMpH,
-          {geometry::MakePointWithAltitudeForTesting(m2::PointD(30, 30)),
-           geometry::MakePointWithAltitudeForTesting(m2::PointD(70, 30))}),  // feature 4
-      IRoadGraph::RoadInfo(
-          true /* bidir */, speedKMpH,
-          {geometry::MakePointWithAltitudeForTesting(m2::PointD(70, 30)),
-           geometry::MakePointWithAltitudeForTesting(m2::PointD(70, 70))}),  // feature 5
-      IRoadGraph::RoadInfo(
-          true /* bidir */, speedKMpH,
-          {geometry::MakePointWithAltitudeForTesting(m2::PointD(70, 70)),
-           geometry::MakePointWithAltitudeForTesting(m2::PointD(30, 70))}),  // feature 6
-      IRoadGraph::RoadInfo(
-          true /* bidir */, speedKMpH,
-          {geometry::MakePointWithAltitudeForTesting(m2::PointD(30, 70)),
-           geometry::MakePointWithAltitudeForTesting(m2::PointD(30, 30))}),  // feature 7
+      IRoadGraph::RoadInfo(true /* bidir */, speedKMpH,
+                           {geometry::MakePointWithAltitudeForTesting(m2::PointD(30, 30)),
+                            geometry::MakePointWithAltitudeForTesting(m2::PointD(70, 30))}),  // feature 4
+      IRoadGraph::RoadInfo(true /* bidir */, speedKMpH,
+                           {geometry::MakePointWithAltitudeForTesting(m2::PointD(70, 30)),
+                            geometry::MakePointWithAltitudeForTesting(m2::PointD(70, 70))}),  // feature 5
+      IRoadGraph::RoadInfo(true /* bidir */, speedKMpH,
+                           {geometry::MakePointWithAltitudeForTesting(m2::PointD(70, 70)),
+                            geometry::MakePointWithAltitudeForTesting(m2::PointD(30, 70))}),  // feature 6
+      IRoadGraph::RoadInfo(true /* bidir */, speedKMpH,
+                           {geometry::MakePointWithAltitudeForTesting(m2::PointD(30, 70)),
+                            geometry::MakePointWithAltitudeForTesting(m2::PointD(30, 30))}),  // feature 7
   };
 
   for (auto const & ri : roadInfo_1)
@@ -203,10 +183,10 @@ UNIT_TEST(AStarRouter_SimpleGraph_RoutesInConnectedComponents)
     {
       geometry::PointWithAltitude const finalPos = roadInfo_1[j].m_junctions[0];
       RoutingResult<geometry::PointWithAltitude, double /* Weight */> result;
-      TEST_EQUAL(TestAStarBidirectionalAlgo::Result::OK,
-                 algorithm.CalculateRoute(graph, startPos, finalPos, result), ());
-      TEST_EQUAL(TestAStarBidirectionalAlgo::Result::OK,
-                 algorithm.CalculateRoute(graph, finalPos, startPos, result), ());
+      TEST_EQUAL(TestAStarBidirectionalAlgo::Result::OK, algorithm.CalculateRoute(graph, startPos, finalPos, result),
+                 ());
+      TEST_EQUAL(TestAStarBidirectionalAlgo::Result::OK, algorithm.CalculateRoute(graph, finalPos, startPos, result),
+                 ());
     }
   }
 
@@ -218,10 +198,10 @@ UNIT_TEST(AStarRouter_SimpleGraph_RoutesInConnectedComponents)
     {
       geometry::PointWithAltitude const finalPos = roadInfo_2[j].m_junctions[0];
       RoutingResult<geometry::PointWithAltitude, double /* Weight */> result;
-      TEST_EQUAL(TestAStarBidirectionalAlgo::Result::OK,
-                 algorithm.CalculateRoute(graph, startPos, finalPos, result), ());
-      TEST_EQUAL(TestAStarBidirectionalAlgo::Result::OK,
-                 algorithm.CalculateRoute(graph, finalPos, startPos, result), ());
+      TEST_EQUAL(TestAStarBidirectionalAlgo::Result::OK, algorithm.CalculateRoute(graph, startPos, finalPos, result),
+                 ());
+      TEST_EQUAL(TestAStarBidirectionalAlgo::Result::OK, algorithm.CalculateRoute(graph, finalPos, startPos, result),
+                 ());
     }
   }
 }
@@ -232,13 +212,12 @@ UNIT_TEST(AStarRouter_SimpleGraph_PickTheFasterRoad1)
 
   RoadGraphMockSource graph;
 
-  AddRoad(graph, 5.0, {m2::PointD(2,1), m2::PointD(2,2), m2::PointD(2,3)});
-  AddRoad(graph, 5.0, {m2::PointD(10,1), m2::PointD(10,2), m2::PointD(10,3)});
-
-  AddRoad(graph, 5.0, {m2::PointD(2,3), m2::PointD(4,3), m2::PointD(6,3), m2::PointD(8,3), m2::PointD(10,3)});
-  AddRoad(graph, 3.0, {m2::PointD(2,2), m2::PointD(6,2), m2::PointD(10,2)});
-  AddRoad(graph, 4.0, {m2::PointD(2,1), m2::PointD(10,1)});
+  AddRoad(graph, 5.0, {m2::PointD(2, 1), m2::PointD(2, 2), m2::PointD(2, 3)});
+  AddRoad(graph, 5.0, {m2::PointD(10, 1), m2::PointD(10, 2), m2::PointD(10, 3)});
 
+  AddRoad(graph, 5.0, {m2::PointD(2, 3), m2::PointD(4, 3), m2::PointD(6, 3), m2::PointD(8, 3), m2::PointD(10, 3)});
+  AddRoad(graph, 3.0, {m2::PointD(2, 2), m2::PointD(6, 2), m2::PointD(10, 2)});
+  AddRoad(graph, 4.0, {m2::PointD(2, 1), m2::PointD(10, 1)});
 
   // path1 = 1/5 + 8/5 + 1/5 = 2
   // path2 = 8/3 = 2.666(6)
@@ -247,19 +226,17 @@ UNIT_TEST(AStarRouter_SimpleGraph_PickTheFasterRoad1)
   RoutingResult<geometry::PointWithAltitude, double /* Weight */> result;
   TestAStarBidirectionalAlgo algorithm;
   TEST_EQUAL(TestAStarBidirectionalAlgo::Result::OK,
-             algorithm.CalculateRoute(
-                 graph, geometry::MakePointWithAltitudeForTesting(m2::PointD(2, 2)),
-                 geometry::MakePointWithAltitudeForTesting(m2::PointD(10, 2)), result),
+             algorithm.CalculateRoute(graph, geometry::MakePointWithAltitudeForTesting(m2::PointD(2, 2)),
+                                      geometry::MakePointWithAltitudeForTesting(m2::PointD(10, 2)), result),
              ());
   TEST_EQUAL(result.m_path,
-             vector<geometry::PointWithAltitude>(
-                 {geometry::MakePointWithAltitudeForTesting(m2::PointD(2, 2)),
-                  geometry::MakePointWithAltitudeForTesting(m2::PointD(2, 3)),
-                  geometry::MakePointWithAltitudeForTesting(m2::PointD(4, 3)),
-                  geometry::MakePointWithAltitudeForTesting(m2::PointD(6, 3)),
-                  geometry::MakePointWithAltitudeForTesting(m2::PointD(8, 3)),
-                  geometry::MakePointWithAltitudeForTesting(m2::PointD(10, 3)),
-                  geometry::MakePointWithAltitudeForTesting(m2::PointD(10, 2))}),
+             vector<geometry::PointWithAltitude>({geometry::MakePointWithAltitudeForTesting(m2::PointD(2, 2)),
+                                                  geometry::MakePointWithAltitudeForTesting(m2::PointD(2, 3)),
+                                                  geometry::MakePointWithAltitudeForTesting(m2::PointD(4, 3)),
+                                                  geometry::MakePointWithAltitudeForTesting(m2::PointD(6, 3)),
+                                                  geometry::MakePointWithAltitudeForTesting(m2::PointD(8, 3)),
+                                                  geometry::MakePointWithAltitudeForTesting(m2::PointD(10, 3)),
+                                                  geometry::MakePointWithAltitudeForTesting(m2::PointD(10, 2))}),
              ());
   TEST(AlmostEqualAbs(result.m_distance, 800451., 1.), ("Distance error:", result.m_distance));
 }
@@ -270,12 +247,12 @@ UNIT_TEST(AStarRouter_SimpleGraph_PickTheFasterRoad2)
 
   RoadGraphMockSource graph;
 
-  AddRoad(graph, 5.0, {m2::PointD(2,1), m2::PointD(2,2), m2::PointD(2,3)});
-  AddRoad(graph, 5.0, {m2::PointD(10,1), m2::PointD(10,2), m2::PointD(10,3)});
+  AddRoad(graph, 5.0, {m2::PointD(2, 1), m2::PointD(2, 2), m2::PointD(2, 3)});
+  AddRoad(graph, 5.0, {m2::PointD(10, 1), m2::PointD(10, 2), m2::PointD(10, 3)});
 
-  AddRoad(graph, 5.0, {m2::PointD(2,3), m2::PointD(4,3), m2::PointD(6,3), m2::PointD(8,3), m2::PointD(10,3)});
-  AddRoad(graph, 4.1, {m2::PointD(2,2), m2::PointD(6,2), m2::PointD(10,2)});
-  AddRoad(graph, 4.4, {m2::PointD(2,1), m2::PointD(10,1)});
+  AddRoad(graph, 5.0, {m2::PointD(2, 3), m2::PointD(4, 3), m2::PointD(6, 3), m2::PointD(8, 3), m2::PointD(10, 3)});
+  AddRoad(graph, 4.1, {m2::PointD(2, 2), m2::PointD(6, 2), m2::PointD(10, 2)});
+  AddRoad(graph, 4.4, {m2::PointD(2, 1), m2::PointD(10, 1)});
 
   // path1 = 1/5 + 8/5 + 1/5 = 2
   // path2 = 8/4.1 = 1.95
@@ -284,15 +261,13 @@ UNIT_TEST(AStarRouter_SimpleGraph_PickTheFasterRoad2)
   RoutingResult<geometry::PointWithAltitude, double /* Weight */> result;
   TestAStarBidirectionalAlgo algorithm;
   TEST_EQUAL(TestAStarBidirectionalAlgo::Result::OK,
-             algorithm.CalculateRoute(
-                 graph, geometry::MakePointWithAltitudeForTesting(m2::PointD(2, 2)),
-                 geometry::MakePointWithAltitudeForTesting(m2::PointD(10, 2)), result),
+             algorithm.CalculateRoute(graph, geometry::MakePointWithAltitudeForTesting(m2::PointD(2, 2)),
+                                      geometry::MakePointWithAltitudeForTesting(m2::PointD(10, 2)), result),
              ());
   TEST_EQUAL(result.m_path,
-             vector<geometry::PointWithAltitude>(
-                 {geometry::MakePointWithAltitudeForTesting(m2::PointD(2, 2)),
-                  geometry::MakePointWithAltitudeForTesting(m2::PointD(6, 2)),
-                  geometry::MakePointWithAltitudeForTesting(m2::PointD(10, 2))}),
+             vector<geometry::PointWithAltitude>({geometry::MakePointWithAltitudeForTesting(m2::PointD(2, 2)),
+                                                  geometry::MakePointWithAltitudeForTesting(m2::PointD(6, 2)),
+                                                  geometry::MakePointWithAltitudeForTesting(m2::PointD(10, 2))}),
              ());
   TEST(AlmostEqualAbs(result.m_distance, 781458., 1.), ("Distance error:", result.m_distance));
 }
@@ -303,12 +278,12 @@ UNIT_TEST(AStarRouter_SimpleGraph_PickTheFasterRoad3)
 
   RoadGraphMockSource graph;
 
-  AddRoad(graph, 5.0, {m2::PointD(2,1), m2::PointD(2,2), m2::PointD(2,3)});
-  AddRoad(graph, 5.0, {m2::PointD(10,1), m2::PointD(10,2), m2::PointD(10,3)});
+  AddRoad(graph, 5.0, {m2::PointD(2, 1), m2::PointD(2, 2), m2::PointD(2, 3)});
+  AddRoad(graph, 5.0, {m2::PointD(10, 1), m2::PointD(10, 2), m2::PointD(10, 3)});
 
-  AddRoad(graph, 4.8, {m2::PointD(2,3), m2::PointD(4,3), m2::PointD(6,3), m2::PointD(8,3), m2::PointD(10,3)});
-  AddRoad(graph, 3.9, {m2::PointD(2,2), m2::PointD(6,2), m2::PointD(10,2)});
-  AddRoad(graph, 4.9, {m2::PointD(2,1), m2::PointD(10,1)});
+  AddRoad(graph, 4.8, {m2::PointD(2, 3), m2::PointD(4, 3), m2::PointD(6, 3), m2::PointD(8, 3), m2::PointD(10, 3)});
+  AddRoad(graph, 3.9, {m2::PointD(2, 2), m2::PointD(6, 2), m2::PointD(10, 2)});
+  AddRoad(graph, 4.9, {m2::PointD(2, 1), m2::PointD(10, 1)});
 
   // path1 = 1/5 + 8/4.8 + 1/5 = 2.04
   // path2 = 8/3.9 = 2.05
@@ -317,17 +292,15 @@ UNIT_TEST(AStarRouter_SimpleGraph_PickTheFasterRoad3)
   RoutingResult<geometry::PointWithAltitude, double /* Weight */> result;
   TestAStarBidirectionalAlgo algorithm;
   TEST_EQUAL(TestAStarBidirectionalAlgo::Result::OK,
-             algorithm.CalculateRoute(
-                 graph, geometry::MakePointWithAltitudeForTesting(m2::PointD(2, 2)),
-                 geometry::MakePointWithAltitudeForTesting(m2::PointD(10, 2)), result),
+             algorithm.CalculateRoute(graph, geometry::MakePointWithAltitudeForTesting(m2::PointD(2, 2)),
+                                      geometry::MakePointWithAltitudeForTesting(m2::PointD(10, 2)), result),
              ());
   TEST_EQUAL(result.m_path,
-             vector<geometry::PointWithAltitude>(
-                 {geometry::MakePointWithAltitudeForTesting(m2::PointD(2, 2)),
-                  geometry::MakePointWithAltitudeForTesting(m2::PointD(2, 1)),
-                  geometry::MakePointWithAltitudeForTesting(m2::PointD(10, 1)),
-                  geometry::MakePointWithAltitudeForTesting(m2::PointD(10, 2))}),
+             vector<geometry::PointWithAltitude>({geometry::MakePointWithAltitudeForTesting(m2::PointD(2, 2)),
+                                                  geometry::MakePointWithAltitudeForTesting(m2::PointD(2, 1)),
+                                                  geometry::MakePointWithAltitudeForTesting(m2::PointD(10, 1)),
+                                                  geometry::MakePointWithAltitudeForTesting(m2::PointD(10, 2))}),
              ());
   TEST(AlmostEqualAbs(result.m_distance, 814412., 1.), ("Distance error:", result.m_distance));
 }
-} // namespace astar_router_test
+}  // namespace astar_router_test
diff --git a/libs/routing/routing_tests/async_router_test.cpp b/libs/routing/routing_tests/async_router_test.cpp
index 7704f1090..270ca3dab 100644
--- a/libs/routing/routing_tests/async_router_test.cpp
+++ b/libs/routing/routing_tests/async_router_test.cpp
@@ -37,11 +37,9 @@ public:
   string GetName() const override { return "Dummy"; }
   void SetGuides(GuidesTracks && /* guides */) override {}
   RouterResultCode CalculateRoute(Checkpoints const & checkpoints, m2::PointD const & startDirection,
-                            bool adjustToPrevRoute, RouterDelegate const & delegate,
-                            Route & route) override
+                                  bool adjustToPrevRoute, RouterDelegate const & delegate, Route & route) override
   {
-    route = Route("dummy", checkpoints.GetPoints().cbegin(), checkpoints.GetPoints().cend(),
-                  0 /* route id */);
+    route = Route("dummy", checkpoints.GetPoints().cbegin(), checkpoints.GetPoints().cend(), 0 /* route id */);
 
     for (auto const & absent : m_absent)
       route.AddAbsentCountry(absent);
@@ -49,8 +47,8 @@ public:
     return m_result;
   }
 
-  bool FindClosestProjectionToRoad(m2::PointD const & point, m2::PointD const & direction,
-                                   double radius, EdgeProj & proj) override
+  bool FindClosestProjectionToRoad(m2::PointD const & point, m2::PointD const & direction, double radius,
+                                   EdgeProj & proj) override
   {
     return false;
   }
@@ -95,8 +93,7 @@ struct DummyRoutingCallbacks
     {
       lock_guard<mutex> calledLock(m_lock);
       ++m_called;
-      TEST_LESS_OR_EQUAL(m_called, m_expected,
-                         ("The result callback called more times than expected."));
+      TEST_LESS_OR_EQUAL(m_called, m_expected, ("The result callback called more times than expected."));
     }
     m_cv.notify_all();
   }
diff --git a/libs/routing/routing_tests/bfs_tests.cpp b/libs/routing/routing_tests/bfs_tests.cpp
index 712cf1460..9f42bddc1 100644
--- a/libs/routing/routing_tests/bfs_tests.cpp
+++ b/libs/routing/routing_tests/bfs_tests.cpp
@@ -90,14 +90,13 @@ UNIT_TEST(BFS_AllVisit_Undirected)
   std::set<uint32_t> visited;
 
   BFS<UndirectedGraph> bfs(graph);
-  bfs.Run(0 /* start */, true /* isOutgoing */,
-      [&](BFS<UndirectedGraph>::State const & state)
-      {
-        visited.emplace(state.m_vertex);
-        return true;
-      });
+  bfs.Run(0 /* start */, true /* isOutgoing */, [&](BFS<UndirectedGraph>::State const & state)
+  {
+    visited.emplace(state.m_vertex);
+    return true;
+  });
 
-  std::vector<uint32_t> const expectedInVisited = {1, 2, 3, 4 ,5, 6, 7, 8, 9, 10};
+  std::vector<uint32_t> const expectedInVisited = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
   for (auto const v : expectedInVisited)
     TEST_NOT_EQUAL(visited.count(v), 0, ("vertex =", v, "was not visited."));
 }
@@ -109,12 +108,11 @@ UNIT_TEST(BFS_AllVisit_Directed_Forward)
   std::set<uint32_t> visited;
 
   BFS<DirectedGraph> bfs(graph);
-  bfs.Run(0 /* start */, true /* isOutgoing */,
-          [&](BFS<DirectedGraph>::State const & state)
-          {
-            visited.emplace(state.m_vertex);
-            return true;
-          });
+  bfs.Run(0 /* start */, true /* isOutgoing */, [&](BFS<DirectedGraph>::State const & state)
+  {
+    visited.emplace(state.m_vertex);
+    return true;
+  });
 
   std::vector<uint32_t> const expectedInVisited = {1, 2, 3, 4};
   for (auto const v : expectedInVisited)
@@ -128,12 +126,11 @@ UNIT_TEST(BFS_AllVisit_Directed_Backward)
   std::set<uint32_t> visited;
 
   BFS<DirectedGraph> bfs(graph);
-  bfs.Run(2 /* start */, false /* isOutgoing */,
-          [&](BFS<DirectedGraph>::State const & state)
-          {
-            visited.emplace(state.m_vertex);
-            return true;
-          });
+  bfs.Run(2 /* start */, false /* isOutgoing */, [&](BFS<DirectedGraph>::State const & state)
+  {
+    visited.emplace(state.m_vertex);
+    return true;
+  });
 
   std::vector<uint32_t> expectedInVisited = {0, 3, 4, 5, 7};
   for (auto const v : expectedInVisited)
@@ -147,12 +144,11 @@ UNIT_TEST(BFS_AllVisit_DirectedCyclic)
   std::set<uint32_t> visited;
 
   BFS<DirectedGraph> bfs(graph);
-  bfs.Run(0 /* start */, true /* isOutgoing */,
-          [&](BFS<DirectedGraph>::State const & state)
-          {
-            visited.emplace(state.m_vertex);
-            return true;
-          });
+  bfs.Run(0 /* start */, true /* isOutgoing */, [&](BFS<DirectedGraph>::State const & state)
+  {
+    visited.emplace(state.m_vertex);
+    return true;
+  });
 
   std::vector<uint32_t> expectedInVisited = {1, 2, 3, 4};
   for (auto const v : expectedInVisited)
@@ -174,4 +170,4 @@ UNIT_TEST(BFS_ReconstructPathTest)
   expected = {2, 1, 0};
   TEST_EQUAL(path, expected, ());
 }
-} //  namespace routing_test
+}  //  namespace routing_test
diff --git a/libs/routing/routing_tests/checkpoint_predictor_test.cpp b/libs/routing/routing_tests/checkpoint_predictor_test.cpp
index dec4c7608..f7ca6cf7c 100644
--- a/libs/routing/routing_tests/checkpoint_predictor_test.cpp
+++ b/libs/routing/routing_tests/checkpoint_predictor_test.cpp
@@ -33,12 +33,15 @@ public:
 
 UNIT_CLASS_TEST(CheckpointPredictorTest, CalculateDeltaMetersTest)
 {
-  TestAlmostEqual(CheckpointPredictor::CalculateDeltaMeters(
-                      {0.0, 0.0} /* from */, {2.0, 0.0} /* to */, {1.0, 0.0} /* between */), 0.0);
-  TestAlmostEqual(CheckpointPredictor::CalculateDeltaMeters(
-                      {0.0, 0.0} /* from */, {2.0, 0.0} /* to */, {3.0, 0.0} /* between */), 222634.0);
-  TestAlmostEqual(CheckpointPredictor::CalculateDeltaMeters(
-                      {0.0, 0.0} /* from */, {2.0, 0.0} /* to */, {-1.0, 0.0} /* between */), 222634.0);
+  TestAlmostEqual(
+      CheckpointPredictor::CalculateDeltaMeters({0.0, 0.0} /* from */, {2.0, 0.0} /* to */, {1.0, 0.0} /* between */),
+      0.0);
+  TestAlmostEqual(
+      CheckpointPredictor::CalculateDeltaMeters({0.0, 0.0} /* from */, {2.0, 0.0} /* to */, {3.0, 0.0} /* between */),
+      222634.0);
+  TestAlmostEqual(
+      CheckpointPredictor::CalculateDeltaMeters({0.0, 0.0} /* from */, {2.0, 0.0} /* to */, {-1.0, 0.0} /* between */),
+      222634.0);
 }
 
 // Zero intermediate point test.
@@ -52,7 +55,6 @@ UNIT_CLASS_TEST(CheckpointPredictorTest, PredictPositionTest1)
   TEST_EQUAL(PredictPosition(intermediatePoints, m2::PointD(5.0, 0.0)), 0, ());
 }
 
-
 // One intermediate point test.
 UNIT_CLASS_TEST(CheckpointPredictorTest, PredictPositionTest2)
 {
diff --git a/libs/routing/routing_tests/coding_test.cpp b/libs/routing/routing_tests/coding_test.cpp
index 0702a8667..ea057fc20 100644
--- a/libs/routing/routing_tests/coding_test.cpp
+++ b/libs/routing/routing_tests/coding_test.cpp
@@ -38,10 +38,8 @@ void TestZigZagUnsigned()
   constexpr auto max = std::numeric_limits<T>::max();
   constexpr T values[] = {0, 1, 7, max / 2, max - 1, max};
   for (T prev : values)
-  {
     for (T current : values)
       TestZigZag(prev, current);
-  }
 }
 
 template <typename T>
@@ -53,10 +51,8 @@ void TestZigZagSigned()
   constexpr auto max = std::numeric_limits<T>::max();
   constexpr T values[] = {min, min + 1, min / 2, -7, -1, 0, 1, 7, max / 2, max - 1, max};
   for (T prev : values)
-  {
     for (T current : values)
       TestZigZag(prev, current);
-  }
 }
 }  // namespace
 
@@ -64,7 +60,8 @@ namespace routing_test
 {
 UNIT_TEST(ModuleCastTest)
 {
-  ForEachNumber<uint8_t>([](uint8_t number) {
+  ForEachNumber<uint8_t>([](uint8_t number)
+  {
     auto signedNumber = ModularCast(number);
     static_assert(std::is_same<decltype(signedNumber), int8_t>::value, "int8_t expected");
     TEST_EQUAL(static_cast<uint8_t>(signedNumber), number, ("signedNumber:", signedNumber));
@@ -73,22 +70,37 @@ UNIT_TEST(ModuleCastTest)
 
 UNIT_TEST(ZigZagUint8)
 {
-  ForEachNumber<uint8_t>([](uint8_t prev) {
-    ForEachNumber<uint8_t>([&](uint8_t current) { TestZigZag(prev, current); });
-  });
+  ForEachNumber<uint8_t>([](uint8_t prev)
+  { ForEachNumber<uint8_t>([&](uint8_t current) { TestZigZag(prev, current); }); });
 }
 
 UNIT_TEST(ZigZagInt8)
 {
-  ForEachNumber<int8_t>([](int8_t prev) {
-    ForEachNumber<int8_t>([&](int8_t current) { TestZigZag(prev, current); });
-  });
+  ForEachNumber<int8_t>([](int8_t prev) { ForEachNumber<int8_t>([&](int8_t current) { TestZigZag(prev, current); }); });
 }
 
-UNIT_TEST(ZigZagUint16) { TestZigZagUnsigned<uint16_t>(); }
-UNIT_TEST(ZigZagInt16) { TestZigZagSigned<int16_t>(); }
-UNIT_TEST(ZigZagUint32) { TestZigZagUnsigned<uint32_t>(); }
-UNIT_TEST(ZigZagInt32) { TestZigZagSigned<int32_t>(); }
-UNIT_TEST(ZigZagUint64) { TestZigZagUnsigned<uint64_t>(); }
-UNIT_TEST(ZigZagInt64) { TestZigZagSigned<int64_t>(); }
+UNIT_TEST(ZigZagUint16)
+{
+  TestZigZagUnsigned<uint16_t>();
+}
+UNIT_TEST(ZigZagInt16)
+{
+  TestZigZagSigned<int16_t>();
+}
+UNIT_TEST(ZigZagUint32)
+{
+  TestZigZagUnsigned<uint32_t>();
+}
+UNIT_TEST(ZigZagInt32)
+{
+  TestZigZagSigned<int32_t>();
+}
+UNIT_TEST(ZigZagUint64)
+{
+  TestZigZagUnsigned<uint64_t>();
+}
+UNIT_TEST(ZigZagInt64)
+{
+  TestZigZagSigned<int64_t>();
+}
 }  // namespace routing_test
diff --git a/libs/routing/routing_tests/cross_border_graph_tests.cpp b/libs/routing/routing_tests/cross_border_graph_tests.cpp
index 864fd543f..65f463913 100644
--- a/libs/routing/routing_tests/cross_border_graph_tests.cpp
+++ b/libs/routing/routing_tests/cross_border_graph_tests.cpp
@@ -38,8 +38,8 @@ void FillGraphWithTestInfo(CrossBorderGraph & gaph, std::shared_ptr<NumMwmIds> n
   auto const [p1, id1] = GetCoordInRegion(50.88010, 4.41923, "Belgium_Flemish Brabant", numMwmIds);
   auto const [p2, id2] = GetCoordInRegion(50.99043, 5.48125, "Belgium_Limburg", numMwmIds);
   auto const [p3, id3] = GetCoordInRegion(50.88751, 5.92378, "Netherlands_Limburg", numMwmIds);
-  auto const [p4, id4] = GetCoordInRegion(
-      50.8734, 6.27417, "Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Aachen", numMwmIds);
+  auto const [p4, id4] =
+      GetCoordInRegion(50.8734, 6.27417, "Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Aachen", numMwmIds);
 
   double constexpr avgSpeedMpS = 14.0;
 
@@ -100,14 +100,9 @@ void TestEqualSegments(CrossBorderSegments const & s1, CrossBorderSegments const
 
     static double constexpr epsCoord = 1e-5;
 
-    TEST(AlmostEqualAbs(data1.m_start.m_point.GetLatLon(), data2.m_start.m_point.GetLatLon(),
-                              epsCoord),
-         ());
-    TEST(AlmostEqualAbs(data1.m_end.m_point.GetLatLon(), data2.m_end.m_point.GetLatLon(),
-                              epsCoord),
-         ());
-    TEST_EQUAL(static_cast<uint32_t>(std::ceil(data1.m_weight)),
-               static_cast<uint32_t>(std::ceil(data2.m_weight)), ());
+    TEST(AlmostEqualAbs(data1.m_start.m_point.GetLatLon(), data2.m_start.m_point.GetLatLon(), epsCoord), ());
+    TEST(AlmostEqualAbs(data1.m_end.m_point.GetLatLon(), data2.m_end.m_point.GetLatLon(), epsCoord), ());
+    TEST_EQUAL(static_cast<uint32_t>(std::ceil(data1.m_weight)), static_cast<uint32_t>(std::ceil(data2.m_weight)), ());
   }
 }
 
diff --git a/libs/routing/routing_tests/cross_mwm_connector_test.cpp b/libs/routing/routing_tests/cross_mwm_connector_test.cpp
index 38c9c183b..141cea292 100644
--- a/libs/routing/routing_tests/cross_mwm_connector_test.cpp
+++ b/libs/routing/routing_tests/cross_mwm_connector_test.cpp
@@ -17,15 +17,13 @@ namespace
 {
 NumMwmId constexpr kTestMwmId = 777;
 
-template <typename CrossMwmId> struct CrossMwmBuilderTestFixture
+template <typename CrossMwmId>
+struct CrossMwmBuilderTestFixture
 {
   CrossMwmConnector<CrossMwmId> connector;
   CrossMwmConnectorBuilder<CrossMwmId> builder;
 
-  explicit CrossMwmBuilderTestFixture(NumMwmId numMwmId = kTestMwmId)
-    : connector(numMwmId), builder(connector)
-  {
-  }
+  explicit CrossMwmBuilderTestFixture(NumMwmId numMwmId = kTestMwmId) : connector(numMwmId), builder(connector) {}
 };
 
 template <typename CrossMwmId>
@@ -69,13 +67,17 @@ void TestOneWayEnter(CrossMwmId const & crossMwmId)
   TEST_EQUAL(test.connector.GetNumEnters(), 1, ());
   TEST_EQUAL(test.connector.GetNumExits(), 0, ());
   TEST(!test.connector.IsTransition(Segment(kTestMwmId, featureId, segmentIdx, true /* forward */),
-                                    true /* isOutgoing */), ());
+                                    true /* isOutgoing */),
+       ());
   TEST(test.connector.IsTransition(Segment(kTestMwmId, featureId, segmentIdx, true /* forward */),
-                                   false /* isOutgoing */), ());
+                                   false /* isOutgoing */),
+       ());
   TEST(!test.connector.IsTransition(Segment(kTestMwmId, featureId, segmentIdx, false /* forward */),
-                                    true /* isOutgoing */), ());
+                                    true /* isOutgoing */),
+       ());
   TEST(!test.connector.IsTransition(Segment(kTestMwmId, featureId, segmentIdx, false /* forward */),
-                                    false /* isOutgoing */), ());
+                                    false /* isOutgoing */),
+       ());
 }
 
 template <typename CrossMwmId>
@@ -91,13 +93,17 @@ void TestOneWayExit(CrossMwmId const & crossMwmId)
   TEST_EQUAL(test.connector.GetNumEnters(), 0, ());
   TEST_EQUAL(test.connector.GetNumExits(), 1, ());
   TEST(test.connector.IsTransition(Segment(kTestMwmId, featureId, segmentIdx, true /* forward */),
-                                   true /* isOutgoing */), ());
+                                   true /* isOutgoing */),
+       ());
   TEST(!test.connector.IsTransition(Segment(kTestMwmId, featureId, segmentIdx, true /* forward */),
-                                    false /* isOutgoing */), ());
+                                    false /* isOutgoing */),
+       ());
   TEST(!test.connector.IsTransition(Segment(kTestMwmId, featureId, segmentIdx, false /* forward */),
-                                    true /* isOutgoing */), ());
+                                    true /* isOutgoing */),
+       ());
   TEST(!test.connector.IsTransition(Segment(kTestMwmId, featureId, segmentIdx, false /* forward */),
-                                    false /* isOutgoing */), ());
+                                    false /* isOutgoing */),
+       ());
 }
 
 template <typename CrossMwmId>
@@ -113,13 +119,17 @@ void TestTwoWayEnter(CrossMwmId const & crossMwmId)
   TEST_EQUAL(test.connector.GetNumEnters(), 1, ());
   TEST_EQUAL(test.connector.GetNumExits(), 1, ());
   TEST(!test.connector.IsTransition(Segment(kTestMwmId, featureId, segmentIdx, true /* forward */),
-                                    true /* isOutgoing */), ());
+                                    true /* isOutgoing */),
+       ());
   TEST(test.connector.IsTransition(Segment(kTestMwmId, featureId, segmentIdx, true /* forward */),
-                                   false /* isOutgoing */), ());
+                                   false /* isOutgoing */),
+       ());
   TEST(test.connector.IsTransition(Segment(kTestMwmId, featureId, segmentIdx, false /* forward */),
-                                   true /* isOutgoing */), ());
+                                   true /* isOutgoing */),
+       ());
   TEST(!test.connector.IsTransition(Segment(kTestMwmId, featureId, segmentIdx, false /* forward */),
-                                    false /* isOutgoing */), ());
+                                    false /* isOutgoing */),
+       ());
 }
 
 template <typename CrossMwmId>
@@ -135,13 +145,17 @@ void TestTwoWayExit(CrossMwmId const & crossMwmId)
   TEST_EQUAL(test.connector.GetNumEnters(), 1, ());
   TEST_EQUAL(test.connector.GetNumExits(), 1, ());
   TEST(test.connector.IsTransition(Segment(kTestMwmId, featureId, segmentIdx, true /* forward */),
-                                   true /* isOutgoing */), ());
+                                   true /* isOutgoing */),
+       ());
   TEST(!test.connector.IsTransition(Segment(kTestMwmId, featureId, segmentIdx, true /* forward */),
-                                    false /* isOutgoing */), ());
+                                    false /* isOutgoing */),
+       ());
   TEST(!test.connector.IsTransition(Segment(kTestMwmId, featureId, segmentIdx, false /* forward */),
-                                    true /* isOutgoing */), ());
+                                    true /* isOutgoing */),
+       ());
   TEST(test.connector.IsTransition(Segment(kTestMwmId, featureId, segmentIdx, false /* forward */),
-                                   false /* isOutgoing */), ());
+                                   false /* isOutgoing */),
+       ());
 }
 
 template <typename CrossMwmId>
@@ -190,12 +204,10 @@ void TestSerialization(CrossMwmConnectorBuilderEx<CrossMwmId> & builder)
   TEST(test.connector.HasWeights(), ());
 
   TestOutgoingEdges(test.connector, Segment(kTestMwmId, 10, 1, true /* forward */),
-                    {{Segment(kTestMwmId, 20, 2, false /* forward */),
-                      RouteWeight::FromCrossMwmWeight(kEdgesWeight)}});
+                    {{Segment(kTestMwmId, 20, 2, false /* forward */), RouteWeight::FromCrossMwmWeight(kEdgesWeight)}});
 
   TestOutgoingEdges(test.connector, Segment(kTestMwmId, 20, 2, true /* forward */),
-                    {{Segment(kTestMwmId, 20, 2, false /* forward */),
-                      RouteWeight::FromCrossMwmWeight(kEdgesWeight)}});
+                    {{Segment(kTestMwmId, 20, 2, false /* forward */), RouteWeight::FromCrossMwmWeight(kEdgesWeight)}});
 }
 
 void GetCrossMwmId(uint32_t i, base::GeoObjectId & id)
@@ -213,7 +225,7 @@ void TestWeightsSerialization()
 {
   size_t constexpr kNumTransitions = 3;
   uint32_t constexpr segmentIdx = 1;
-  double const weights[] = { 4.0, 20.0, connector::kNoRoute, 12.0, connector::kNoRoute, 40.0, 48.0, 24.0, 12.0 };
+  double const weights[] = {4.0, 20.0, connector::kNoRoute, 12.0, connector::kNoRoute, 40.0, 48.0, 24.0, 12.0};
   TEST_EQUAL(std::size(weights), kNumTransitions * kNumTransitions, ());
 
   std::map<std::pair<Segment, Segment>, double> expectedWeights;
@@ -221,7 +233,7 @@ void TestWeightsSerialization()
   vector<uint8_t> buffer;
   {
     CrossMwmConnectorBuilderEx<CrossMwmId> builder;
-    for (uint32_t featureId : { 2, 0, 1 })  // reshuffled
+    for (uint32_t featureId : {2, 0, 1})  // reshuffled
     {
       CrossMwmId id;
       GetCrossMwmId(featureId, id);
@@ -320,8 +332,8 @@ UNIT_TEST(CMWMC_Serialization)
   {
     CrossMwmConnectorBuilderEx<TransitId> builder;
     // osmId featureId, segmentIdx, roadMask, oneWayMask, forwardIsEnter
-    builder.AddTransition(TransitId(1ULL /* stop 1 id */, 2ULL /* stop 2 id */, 1ULL /* line id */),
-                          10, 1, kCarMask, kCarMask, true);
+    builder.AddTransition(TransitId(1ULL /* stop 1 id */, 2ULL /* stop 2 id */, 1ULL /* line id */), 10, 1, kCarMask,
+                          kCarMask, true);
     builder.AddTransition(TransitId(1ULL, 3ULL, 1ULL), 20, 2, kCarMask, 0, true);
     builder.AddTransition(TransitId(1ULL, 3ULL, 2ULL), 30, 3, kPedestrianMask, kCarMask, true);
     TestSerialization(builder);
@@ -333,4 +345,4 @@ UNIT_TEST(CMWMC_WeightsSerialization)
   TestWeightsSerialization<base::GeoObjectId>();
   TestWeightsSerialization<TransitId>();
 }
-} // namespace cross_mwm_connector_test
+}  // namespace cross_mwm_connector_test
diff --git a/libs/routing/routing_tests/cumulative_restriction_test.cpp b/libs/routing/routing_tests/cumulative_restriction_test.cpp
index fec7d8d5d..a08dea123 100644
--- a/libs/routing/routing_tests/cumulative_restriction_test.cpp
+++ b/libs/routing/routing_tests/cumulative_restriction_test.cpp
@@ -78,8 +78,7 @@ using Algorithm = AStarAlgorithm<Segment, SegmentEdge, RouteWeight>;
 UNIT_TEST(XYGraph)
 {
   unique_ptr<WorldGraph> graph = BuildXYGraph();
-  auto const start =
-      MakeFakeEnding(1 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *graph);
+  auto const start = MakeFakeEnding(1 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *graph);
   auto const finish = MakeFakeEnding(5, 0, m2::PointD(2, 3), *graph);
   auto starter = MakeStarter(start, finish, *graph);
   vector<m2::PointD> const expectedGeom = {{2 /* x */, 0 /* y */}, {1, 1}, {2, 2}, {2, 3}};
@@ -90,36 +89,28 @@ UNIT_TEST(XYGraph)
 UNIT_CLASS_TEST(RestrictionTest, XYGraph_RestrictionF1F3Only)
 {
   Init(BuildXYGraph());
-  RestrictionVec restrictionsOnly = {
-    {1 /* feature from */, 3 /* feature to */}
-  };
+  RestrictionVec restrictionsOnly = {{1 /* feature from */, 3 /* feature to */}};
   RestrictionVec restrictionsNo;
-  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly,
-                              restrictionsNo);
+  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly, restrictionsNo);
 
   vector<m2::PointD> const expectedGeom = {{2 /* x */, 0 /* y */}, {1, 1}, {2, 2}, {2, 3}};
-  TestRestrictions(
-      expectedGeom, Algorithm::Result::OK,
-      MakeFakeEnding(1 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *m_graph),
-      MakeFakeEnding(5, 0, m2::PointD(2, 3), *m_graph), std::move(restrictionsNo), *this);
+  TestRestrictions(expectedGeom, Algorithm::Result::OK,
+                   MakeFakeEnding(1 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *m_graph),
+                   MakeFakeEnding(5, 0, m2::PointD(2, 3), *m_graph), std::move(restrictionsNo), *this);
 }
 
 // Route through XY graph with one restriction (type only) from F3 to F5.
 UNIT_CLASS_TEST(RestrictionTest, XYGraph_RestrictionF3F5Only)
 {
   Init(BuildXYGraph());
-  RestrictionVec restrictionsOnly = {
-    {3 /* feature from */, 5 /* feature to */}
-  };
+  RestrictionVec restrictionsOnly = {{3 /* feature from */, 5 /* feature to */}};
   RestrictionVec restrictionsNo;
-  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly,
-                              restrictionsNo);
+  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly, restrictionsNo);
 
   vector<m2::PointD> const expectedGeom = {{2 /* x */, 0 /* y */}, {1, 1}, {2, 2}, {2, 3}};
-  TestRestrictions(
-      expectedGeom, Algorithm::Result::OK,
-      MakeFakeEnding(1 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *m_graph),
-      MakeFakeEnding(5, 0, m2::PointD(2, 3), *m_graph), std::move(restrictionsNo), *this);
+  TestRestrictions(expectedGeom, Algorithm::Result::OK,
+                   MakeFakeEnding(1 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *m_graph),
+                   MakeFakeEnding(5, 0, m2::PointD(2, 3), *m_graph), std::move(restrictionsNo), *this);
 }
 
 // Cumulative case. Route through XY graph with two restricitons (type only) applying
@@ -127,19 +118,15 @@ UNIT_CLASS_TEST(RestrictionTest, XYGraph_RestrictionF3F5Only)
 UNIT_CLASS_TEST(RestrictionTest, XYGraph_PermutationsF3F5OnlyF1F3Only)
 {
   Init(BuildXYGraph());
-  RestrictionVec restrictionsOnly = {
-    {1 /* feature from */, 3 /* feature to */},
-    {3 /* feature from */, 5 /* feature to */}
-  };
+  RestrictionVec restrictionsOnly = {{1 /* feature from */, 3 /* feature to */},
+                                     {3 /* feature from */, 5 /* feature to */}};
   RestrictionVec restrictionsNo;
-  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly,
-                              restrictionsNo);
+  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly, restrictionsNo);
 
   vector<m2::PointD> const expectedGeom = {{2 /* x */, 0 /* y */}, {1, 1}, {2, 2}, {2, 3}};
-  TestRestrictions(
-      expectedGeom, Algorithm::Result::OK,
-      MakeFakeEnding(1 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *m_graph),
-      MakeFakeEnding(5, 0, m2::PointD(2, 3), *m_graph), std::move(restrictionsNo), *this);
+  TestRestrictions(expectedGeom, Algorithm::Result::OK,
+                   MakeFakeEnding(1 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *m_graph),
+                   MakeFakeEnding(5, 0, m2::PointD(2, 3), *m_graph), std::move(restrictionsNo), *this);
 }
 
 // Cumulative case. Route through XY graph with two restricitons (type only and type no) applying
@@ -148,21 +135,15 @@ UNIT_CLASS_TEST(RestrictionTest, XYGraph_PermutationsF3F5OnlyAndF0F2No)
 {
   Init(BuildXYGraph());
 
-  RestrictionVec restrictionsNo = {
-    {1 /* feature from */, 2 /* feature to */}
-  };
+  RestrictionVec restrictionsNo = {{1 /* feature from */, 2 /* feature to */}};
 
-  RestrictionVec restrictionsOnly = {
-    {3 /* feature from */, 5 /* feature to */}
-  };
-  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly,
-                              restrictionsNo);
+  RestrictionVec restrictionsOnly = {{3 /* feature from */, 5 /* feature to */}};
+  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly, restrictionsNo);
 
   vector<m2::PointD> const expectedGeom = {{2 /* x */, 0 /* y */}, {1, 1}, {2, 2}, {2, 3}};
-  TestRestrictions(
-      expectedGeom, Algorithm::Result::OK,
-      MakeFakeEnding(1 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *m_graph),
-      MakeFakeEnding(5, 0, m2::PointD(2, 3), *m_graph), std::move(restrictionsNo), *this);
+  TestRestrictions(expectedGeom, Algorithm::Result::OK,
+                   MakeFakeEnding(1 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *m_graph),
+                   MakeFakeEnding(5, 0, m2::PointD(2, 3), *m_graph), std::move(restrictionsNo), *this);
 }
 
 // Cumulative case. Trying to build route through XY graph with two restricitons applying
@@ -171,19 +152,13 @@ UNIT_CLASS_TEST(RestrictionTest, XYGraph_PermutationsF3F5OnlyAndF0F2No)
 UNIT_CLASS_TEST(RestrictionTest, XYGraph_RestrictionF3F5OnlyAndF1F3No)
 {
   Init(BuildXYGraph());
-  RestrictionVec restrictionsNo = {
-    {1 /* feature from */, 3 /* feature to */}
-  };
-  RestrictionVec restrictionsOnly = {
-    {3 /* feature from */, 5 /* feature to */}
-  };
-  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly,
-                              restrictionsNo);
+  RestrictionVec restrictionsNo = {{1 /* feature from */, 3 /* feature to */}};
+  RestrictionVec restrictionsOnly = {{3 /* feature from */, 5 /* feature to */}};
+  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly, restrictionsNo);
 
-  TestRestrictions(
-      {} /* expectedGeom */, Algorithm::Result::NoPath,
-      MakeFakeEnding(1 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *m_graph),
-      MakeFakeEnding(5, 0, m2::PointD(2, 3), *m_graph), std::move(restrictionsNo), *this);
+  TestRestrictions({} /* expectedGeom */, Algorithm::Result::NoPath,
+                   MakeFakeEnding(1 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *m_graph),
+                   MakeFakeEnding(5, 0, m2::PointD(2, 3), *m_graph), std::move(restrictionsNo), *this);
 }
 
 //                        Finish
@@ -249,7 +224,6 @@ unique_ptr<SingleVehicleWorldGraph> BuildXXGraph()
   return BuildWorldGraph(std::move(loader), estimator, joints);
 }
 
-
 // 2 *              *
 //               ↗    ↘
 //             F4       F5
@@ -283,12 +257,12 @@ unique_ptr<SingleVehicleWorldGraph> BuildCubeGraph()
                   RoadGeometry::Points({{2.0, 2.0}, {3.0, 1.0}}));
 
   vector<Joint> const joints = {
-    MakeJoint({{0 /* feature id */, 0 /* point id */}}), /* joint at point (2, -1) */
-    MakeJoint({{0, 1}, {1, 0}, {2, 0}}),                 /* joint at point (2, 0) */
-    MakeJoint({{2, 1}, {4, 0}}),                         /* joint at point (1, 1) */
-    MakeJoint({{4, 1}, {5, 0}}),                         /* joint at point (2, 2) */
-    MakeJoint({{5, 1}, {3, 0}}),                         /* joint at point (3, 1) */
-    MakeJoint({{1, 1}, {3, 1}}),                         /* joint at point (3, 0) */
+      MakeJoint({{0 /* feature id */, 0 /* point id */}}), /* joint at point (2, -1) */
+      MakeJoint({{0, 1}, {1, 0}, {2, 0}}),                 /* joint at point (2, 0) */
+      MakeJoint({{2, 1}, {4, 0}}),                         /* joint at point (1, 1) */
+      MakeJoint({{4, 1}, {5, 0}}),                         /* joint at point (2, 2) */
+      MakeJoint({{5, 1}, {3, 0}}),                         /* joint at point (3, 1) */
+      MakeJoint({{1, 1}, {3, 1}}),                         /* joint at point (3, 0) */
   };
 
   traffic::TrafficCache const trafficCache;
@@ -302,10 +276,9 @@ UNIT_CLASS_TEST(RestrictionTest, XXGraph)
   Init(BuildXXGraph());
   RestrictionVec restrictions = {};
   vector<m2::PointD> const expectedGeom = {{2 /* x */, -1 /* y */}, {2, 0}, {1, 1}, {2, 2}, {3, 3}};
-  TestRestrictions(
-      expectedGeom, Algorithm::Result::OK,
-      MakeFakeEnding(9 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, -1), *m_graph),
-      MakeFakeEnding(6, 0, m2::PointD(3, 3), *m_graph), std::move(restrictions), *this);
+  TestRestrictions(expectedGeom, Algorithm::Result::OK,
+                   MakeFakeEnding(9 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, -1), *m_graph),
+                   MakeFakeEnding(6, 0, m2::PointD(3, 3), *m_graph), std::move(restrictions), *this);
 }
 
 // Cumulative case. Route through XX graph with two restricitons (type only) applying
@@ -314,34 +287,26 @@ UNIT_CLASS_TEST(RestrictionTest, XXGraph_PermutationsF1F3OnlyAndF3F6Only)
 {
   Init(BuildXXGraph());
   RestrictionVec restrictionsNo;
-  RestrictionVec restrictionsOnly = {
-    {1 /* feature from */, 3 /* feature to */},
-    {3 /* feature from */, 6 /* feature to */}
-  };
-  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly,
-                              restrictionsNo);
+  RestrictionVec restrictionsOnly = {{1 /* feature from */, 3 /* feature to */},
+                                     {3 /* feature from */, 6 /* feature to */}};
+  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly, restrictionsNo);
 
   vector<m2::PointD> const expectedGeom = {{2 /* x */, -1 /* y */}, {2, 0}, {1, 1}, {2, 2}, {3, 3}};
-  TestRestrictions(
-      expectedGeom, Algorithm::Result::OK,
-      MakeFakeEnding(9 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, -1), *m_graph),
-      MakeFakeEnding(6, 0, m2::PointD(3, 3), *m_graph), std::move(restrictionsNo), *this);
+  TestRestrictions(expectedGeom, Algorithm::Result::OK,
+                   MakeFakeEnding(9 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, -1), *m_graph),
+                   MakeFakeEnding(6, 0, m2::PointD(3, 3), *m_graph), std::move(restrictionsNo), *this);
 }
 
 // Route through XX graph with one restriciton (type no) from F1 to F3.
 UNIT_CLASS_TEST(RestrictionTest, XXGraph_RestrictionF1F3No)
 {
   Init(BuildXXGraph());
-  RestrictionVec restrictionsNo = {
-    {1 /* feature from */, 3 /* feature to */}
-  };
-  vector<m2::PointD> const expectedGeom = {
-      {2 /* x */, -1 /* y */}, {2, 0}, {3, 0}, {3, 1}, {2, 2}, {3, 3}};
+  RestrictionVec restrictionsNo = {{1 /* feature from */, 3 /* feature to */}};
+  vector<m2::PointD> const expectedGeom = {{2 /* x */, -1 /* y */}, {2, 0}, {3, 0}, {3, 1}, {2, 2}, {3, 3}};
 
-  TestRestrictions(
-      expectedGeom, Algorithm::Result::OK,
-      MakeFakeEnding(9 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, -1), *m_graph),
-      MakeFakeEnding(6, 0, m2::PointD(3, 3), *m_graph), std::move(restrictionsNo), *this);
+  TestRestrictions(expectedGeom, Algorithm::Result::OK,
+                   MakeFakeEnding(9 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, -1), *m_graph),
+                   MakeFakeEnding(6, 0, m2::PointD(3, 3), *m_graph), std::move(restrictionsNo), *this);
 }
 
 // Cumulative case. Route through XX graph with four restricitons of different types applying
@@ -349,24 +314,17 @@ UNIT_CLASS_TEST(RestrictionTest, XXGraph_RestrictionF1F3No)
 UNIT_CLASS_TEST(RestrictionTest, XXGraph_PermutationsF1F3NoF7F8OnlyF8F4OnlyF4F6Only)
 {
   Init(BuildXXGraph());
-  RestrictionVec restrictionsNo = {
-    {1 /* feature from */, 3 /* feature to */}
-  };
+  RestrictionVec restrictionsNo = {{1 /* feature from */, 3 /* feature to */}};
 
-  RestrictionVec restrictionsOnly = {
-    {4 /* feature from */, 6 /* feature to */},
-    {7 /* feature from */, 8 /* feature to */},
-    {8 /* feature from */, 4 /* feature to */}
-  };
+  RestrictionVec restrictionsOnly = {{4 /* feature from */, 6 /* feature to */},
+                                     {7 /* feature from */, 8 /* feature to */},
+                                     {8 /* feature from */, 4 /* feature to */}};
 
-  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly,
-                              restrictionsNo);
-  vector<m2::PointD> const expectedGeom = {
-      {2 /* x */, -1 /* y */}, {2, 0}, {3, 0}, {3, 1}, {2, 2}, {3, 3}};
-  TestRestrictions(
-      expectedGeom, Algorithm::Result::OK,
-      MakeFakeEnding(9 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, -1), *m_graph),
-      MakeFakeEnding(6, 0, m2::PointD(3, 3), *m_graph), std::move(restrictionsNo), *this);
+  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly, restrictionsNo);
+  vector<m2::PointD> const expectedGeom = {{2 /* x */, -1 /* y */}, {2, 0}, {3, 0}, {3, 1}, {2, 2}, {3, 3}};
+  TestRestrictions(expectedGeom, Algorithm::Result::OK,
+                   MakeFakeEnding(9 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, -1), *m_graph),
+                   MakeFakeEnding(6, 0, m2::PointD(3, 3), *m_graph), std::move(restrictionsNo), *this);
 }
 
 UNIT_CLASS_TEST(RestrictionTest, XXGraph_CheckOnlyRestriction)
@@ -375,20 +333,18 @@ UNIT_CLASS_TEST(RestrictionTest, XXGraph_CheckOnlyRestriction)
 
   m2::PointD const start(2.0, -1.0);
   m2::PointD const finish(3.0, 0.2);
-  auto const test = [&](vector<m2::PointD> const & expectedGeom, RestrictionVec && restrictionsNo) {
+  auto const test = [&](vector<m2::PointD> const & expectedGeom, RestrictionVec && restrictionsNo)
+  {
     TestRestrictions(
-      expectedGeom, Algorithm::Result::OK,
-      MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, start, *m_graph),
-      MakeFakeEnding(3 /* featureId */, 0 /* segmentIdx */, finish, *m_graph),
-      std::move(restrictionsNo), *this);
+        expectedGeom, Algorithm::Result::OK, MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, start, *m_graph),
+        MakeFakeEnding(3 /* featureId */, 0 /* segmentIdx */, finish, *m_graph), std::move(restrictionsNo), *this);
   };
 
   RestrictionVec restrictionsOnly = {
-    {0 /* feature from */, 2 /* feature to */},
+      {0 /* feature from */, 2 /* feature to */},
   };
   RestrictionVec restrictionsNo;
-  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly,
-                              restrictionsNo);
+  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly, restrictionsNo);
 
   // Check that without restrictions we can find path better.
   test({start, {2, 0}, {1, 1}, {2, 2}, {3, 1}, finish}, std::move(restrictionsNo));
diff --git a/libs/routing/routing_tests/fake_graph_test.cpp b/libs/routing/routing_tests/fake_graph_test.cpp
index 921ab26ff..791eee62d 100644
--- a/libs/routing/routing_tests/fake_graph_test.cpp
+++ b/libs/routing/routing_tests/fake_graph_test.cpp
@@ -43,8 +43,7 @@ FakeGraph ConstructFakeGraph(uint32_t numerationStart, uint32_t numFake, uint32_
   TEST_EQUAL(fakeGraph.GetSize(), 0, ("Constructed fake graph not empty"));
   if (numFake < 1)
   {
-    CHECK_EQUAL(numReal, 0,
-                ("Construction of non-empty fake graph without pure fake vertices not supported."));
+    CHECK_EQUAL(numReal, 0, ("Construction of non-empty fake graph without pure fake vertices not supported."));
     return fakeGraph;
   }
 
@@ -53,8 +52,7 @@ FakeGraph ConstructFakeGraph(uint32_t numerationStart, uint32_t numFake, uint32_
   fakeGraph.AddStandaloneVertex(startSegment, startVertex);
 
   // Add pure fake.
-  for (uint32_t prevNumber = numerationStart; prevNumber + 1 < numerationStart + numFake + numReal;
-       ++prevNumber)
+  for (uint32_t prevNumber = numerationStart; prevNumber + 1 < numerationStart + numFake + numReal; ++prevNumber)
   {
     bool const newIsReal = prevNumber + 1 >= numerationStart + numFake;
     auto const prevSegment = GetSegment(prevNumber);
@@ -62,8 +60,8 @@ FakeGraph ConstructFakeGraph(uint32_t numerationStart, uint32_t numFake, uint32_
     auto const newVertex = GetFakeVertex(prevNumber + 1);
     auto const realSegment = GetSegment(prevNumber + 1, true /* isReal */);
 
-    fakeGraph.AddVertex(prevSegment, newSegment, newVertex, true /* isOutgoing */,
-                        newIsReal /* isPartOfReal */, realSegment);
+    fakeGraph.AddVertex(prevSegment, newSegment, newVertex, true /* isOutgoing */, newIsReal /* isPartOfReal */,
+                        realSegment);
 
     // Test segment to vertex mapping.
     TEST_EQUAL(fakeGraph.GetVertex(newSegment), newVertex, ("Wrong segment to vertex mapping."));
@@ -79,16 +77,13 @@ FakeGraph ConstructFakeGraph(uint32_t numerationStart, uint32_t numFake, uint32_
     Segment realFound;
     if (newIsReal)
     {
-      TEST_EQUAL(fakeGraph.FindReal(newSegment, realFound), true,
-                 ("Unexpected real segment found."));
+      TEST_EQUAL(fakeGraph.FindReal(newSegment, realFound), true, ("Unexpected real segment found."));
       TEST_EQUAL(realSegment, realFound, ("Wrong fake to real mapping."));
-      TEST_EQUAL(fakeGraph.GetFake(realSegment), set<Segment>{newSegment},
-                 ("Unexpected fake segment found."));
+      TEST_EQUAL(fakeGraph.GetFake(realSegment), set<Segment>{newSegment}, ("Unexpected fake segment found."));
     }
     else
     {
-      TEST_EQUAL(fakeGraph.FindReal(newSegment, realFound), false,
-                 ("Unexpected real segment found."));
+      TEST_EQUAL(fakeGraph.FindReal(newSegment, realFound), false, ("Unexpected real segment found."));
       TEST(fakeGraph.GetFake(realSegment).empty(), ("Unexpected fake segment found."));
     }
   }
@@ -106,8 +101,7 @@ UNIT_TEST(FakeGraphTest)
   auto fakeGraph0 = ConstructFakeGraph(0, fake0, real0);
   TEST_EQUAL(fakeGraph0.GetSize(), fake0 + real0, ("Wrong fake graph size"));
 
-  auto const fakeGraph1 =
-      ConstructFakeGraph(static_cast<uint32_t>(fakeGraph0.GetSize()), fake1, real1);
+  auto const fakeGraph1 = ConstructFakeGraph(static_cast<uint32_t>(fakeGraph0.GetSize()), fake1, real1);
   TEST_EQUAL(fakeGraph1.GetSize(), fake1 + real1, ("Wrong fake graph size"));
 
   fakeGraph0.Append(fakeGraph1);
@@ -119,24 +113,20 @@ UNIT_TEST(FakeGraphTest)
     auto const segmentFrom = GetSegment(i);
     auto const segmentTo = GetSegment(i + 1);
 
-    TEST_EQUAL(fakeGraph0.GetVertex(segmentFrom), GetFakeVertex(i),
-               ("Wrong segment to vertex mapping."));
-    TEST_EQUAL(fakeGraph0.GetVertex(segmentTo), GetFakeVertex(i + 1),
-               ("Wrong segment to vertex mapping."));
+    TEST_EQUAL(fakeGraph0.GetVertex(segmentFrom), GetFakeVertex(i), ("Wrong segment to vertex mapping."));
+    TEST_EQUAL(fakeGraph0.GetVertex(segmentTo), GetFakeVertex(i + 1), ("Wrong segment to vertex mapping."));
     // No connection to next fake segment; next segment was in separate fake graph before Append.
     if (i + 1 == fake0 + real0)
     {
-      TEST(fakeGraph0.GetEdges(segmentFrom, true /* isOutgoing */).empty(),
-           ("Wrong ingoing edges set."));
-      TEST(fakeGraph0.GetEdges(segmentTo, false /* isOutgoing */).empty(),
-           ("Wrong ingoing edges set."));
+      TEST(fakeGraph0.GetEdges(segmentFrom, true /* isOutgoing */).empty(), ("Wrong ingoing edges set."));
+      TEST(fakeGraph0.GetEdges(segmentTo, false /* isOutgoing */).empty(), ("Wrong ingoing edges set."));
     }
     else
     {
       TEST_EQUAL(fakeGraph0.GetEdges(segmentFrom, true /* isOutgoing */), set<Segment>{segmentTo},
                  ("Wrong ingoing edges set."));
-      TEST_EQUAL(fakeGraph0.GetEdges(segmentTo, false /* isOutgoing */),
-                 set<Segment>{segmentFrom}, ("Wrong ingoing edges set."));
+      TEST_EQUAL(fakeGraph0.GetEdges(segmentTo, false /* isOutgoing */), set<Segment>{segmentFrom},
+                 ("Wrong ingoing edges set."));
     }
   }
 }
diff --git a/libs/routing/routing_tests/followed_polyline_test.cpp b/libs/routing/routing_tests/followed_polyline_test.cpp
index 77225ca0e..4cd92fed5 100644
--- a/libs/routing/routing_tests/followed_polyline_test.cpp
+++ b/libs/routing/routing_tests/followed_polyline_test.cpp
@@ -10,8 +10,8 @@ using namespace routing;
 
 namespace
 {
-  static const m2::PolylineD kTestDirectedPolyline1(std::vector<m2::PointD>{{0.0, 0.0}, {3.0, 0.0}, {5.0, 0.0}});
-  static const m2::PolylineD kTestDirectedPolyline2(std::vector<m2::PointD>{{6.0, 0.0}, {7.0, 0.0}});
+static m2::PolylineD const kTestDirectedPolyline1(std::vector<m2::PointD>{{0.0, 0.0}, {3.0, 0.0}, {5.0, 0.0}});
+static m2::PolylineD const kTestDirectedPolyline2(std::vector<m2::PointD>{{6.0, 0.0}, {7.0, 0.0}});
 }  // namespace
 
 UNIT_TEST(FollowedPolylineAppend)
@@ -73,8 +73,7 @@ UNIT_TEST(FollowedPolylineDistanceCalculationTest)
   // Test full length case.
   FollowedPolyline polyline(kTestDirectedPolyline1.Begin(), kTestDirectedPolyline1.End());
   double distance = polyline.GetDistanceM(polyline.Begin(), polyline.End());
-  double masterDistance = mercator::DistanceOnEarth(kTestDirectedPolyline1.Front(),
-                                                          kTestDirectedPolyline1.Back());
+  double masterDistance = mercator::DistanceOnEarth(kTestDirectedPolyline1.Front(), kTestDirectedPolyline1.Back());
   TEST_ALMOST_EQUAL_ULPS(distance, masterDistance, ());
   distance = polyline.GetTotalDistanceMeters();
   TEST_ALMOST_EQUAL_ULPS(distance, masterDistance, ());
@@ -82,8 +81,7 @@ UNIT_TEST(FollowedPolylineDistanceCalculationTest)
   // Test partial length case.
   polyline.UpdateProjection(mercator::RectByCenterXYAndSizeInMeters({3, 0}, 2));
   distance = polyline.GetDistanceM(polyline.GetCurrentIter(), polyline.End());
-  masterDistance = mercator::DistanceOnEarth(kTestDirectedPolyline1.GetPoint(1),
-                                                   kTestDirectedPolyline1.Back());
+  masterDistance = mercator::DistanceOnEarth(kTestDirectedPolyline1.GetPoint(1), kTestDirectedPolyline1.Back());
   TEST_ALMOST_EQUAL_ULPS(distance, masterDistance, ());
   distance = polyline.GetDistanceToEndMeters();
   TEST_ALMOST_EQUAL_ULPS(distance, masterDistance, ());
@@ -91,8 +89,7 @@ UNIT_TEST(FollowedPolylineDistanceCalculationTest)
   // Test point in the middle case.
   polyline.UpdateProjection(mercator::RectByCenterXYAndSizeInMeters({4, 0}, 2));
   distance = polyline.GetDistanceM(polyline.GetCurrentIter(), polyline.End());
-  masterDistance = mercator::DistanceOnEarth(m2::PointD(4, 0),
-                                                   kTestDirectedPolyline1.Back());
+  masterDistance = mercator::DistanceOnEarth(m2::PointD(4, 0), kTestDirectedPolyline1.Back());
   TEST_ALMOST_EQUAL_ULPS(distance, masterDistance, ());
   distance = polyline.GetDistanceToEndMeters();
   TEST_ALMOST_EQUAL_ULPS(distance, masterDistance, ());
@@ -121,8 +118,7 @@ UNIT_TEST(FollowedPolylineGetDistanceFromBeginM)
   polyline.UpdateProjection(mercator::RectByCenterXYAndSizeInMeters(point, 2));
 
   double const distance = polyline.GetDistanceFromStartMeters();
-  double const masterDistance =
-      mercator::DistanceOnEarth(kTestDirectedPolyline1.Front(), point);
+  double const masterDistance = mercator::DistanceOnEarth(kTestDirectedPolyline1.Front(), point);
   TEST_ALMOST_EQUAL_ULPS(distance, masterDistance, ());
 }
 }  // namespace routing_test
diff --git a/libs/routing/routing_tests/guides_tests.cpp b/libs/routing/routing_tests/guides_tests.cpp
index 5b9786d21..915295794 100644
--- a/libs/routing/routing_tests/guides_tests.cpp
+++ b/libs/routing/routing_tests/guides_tests.cpp
@@ -95,8 +95,7 @@ UNIT_TEST(Guides_FinishAndStartAttached)
     auto const links = guides.GetOsmConnections(checkpointIdx);
     TEST(!links.empty(), ());
 
-    bool const isCheckpointNear =
-        guides.FitsForDirectLinkToGuide(checkpointIdx, checkpoints.size());
+    bool const isCheckpointNear = guides.FitsForDirectLinkToGuide(checkpointIdx, checkpoints.size());
     auto const ending = guides.GetFakeEnding(checkpointIdx);
 
     // Initial projection to guides track.
diff --git a/libs/routing/routing_tests/index_graph_test.cpp b/libs/routing/routing_tests/index_graph_test.cpp
index 0f66575ca..2b404fbfc 100644
--- a/libs/routing/routing_tests/index_graph_test.cpp
+++ b/libs/routing/routing_tests/index_graph_test.cpp
@@ -71,16 +71,14 @@ void TestRoute(FakeEnding const & start, FakeEnding const & finish, size_t expec
   if (expectedWeight != kUnknownWeight)
   {
     double constexpr kEpsilon = 0.01;
-    TEST(AlmostEqualRel(timeSec, expectedWeight, kEpsilon),
-         ("Expected weight:", expectedWeight, "got:", timeSec));
+    TEST(AlmostEqualRel(timeSec, expectedWeight, kEpsilon), ("Expected weight:", expectedWeight, "got:", timeSec));
   }
 
   if (expectedRoute)
     TEST_EQUAL(noFakeRoute, *expectedRoute, ());
 }
 
-void TestEdges(IndexGraph & graph, Segment const & segment, vector<Segment> const & expectedTargets,
-               bool isOutgoing)
+void TestEdges(IndexGraph & graph, Segment const & segment, vector<Segment> const & expectedTargets, bool isOutgoing)
 {
   ASSERT(segment.IsForward() || !graph.GetRoadGeometry(segment.GetFeatureId()).IsOneWay(), ());
 
@@ -99,19 +97,20 @@ void TestEdges(IndexGraph & graph, Segment const & segment, vector<Segment> cons
   TEST_EQUAL(targets, sortedExpectedTargets, ());
 }
 
-void TestOutgoingEdges(IndexGraph & graph, Segment const & segment,
-                       vector<Segment> const & expectedTargets)
+void TestOutgoingEdges(IndexGraph & graph, Segment const & segment, vector<Segment> const & expectedTargets)
 {
   TestEdges(graph, segment, expectedTargets, true /* isOutgoing */);
 }
 
-void TestIngoingEdges(IndexGraph & graph, Segment const & segment,
-                      vector<Segment> const & expectedTargets)
+void TestIngoingEdges(IndexGraph & graph, Segment const & segment, vector<Segment> const & expectedTargets)
 {
   TestEdges(graph, segment, expectedTargets, false /* isOutgoing */);
 }
 
-uint32_t AbsDelta(uint32_t v0, uint32_t v1) { return v0 > v1 ? v0 - v1 : v1 - v0; }
+uint32_t AbsDelta(uint32_t v0, uint32_t v1)
+{
+  return v0 > v1 ? v0 - v1 : v1 - v0;
+}
 
 //                   R4 (one way down)
 //
@@ -130,13 +129,10 @@ uint32_t AbsDelta(uint32_t v0, uint32_t v1) { return v0 > v1 ? v0 - v1 : v1 - v0
 UNIT_TEST(EdgesTest)
 {
   unique_ptr<TestGeometryLoader> loader = make_unique<TestGeometryLoader>();
-  loader->AddRoad(
-      0 /* featureId */, false, 1.0 /* speed */,
-      RoadGeometry::Points({{0.0, 0.0}, {1.0, 0.0}, {2.0, 0.0}, {3.0, 0.0}, {4.0, 0.0}}));
-  loader->AddRoad(1 /* featureId */, false, 1.0 /* speed */,
-                  RoadGeometry::Points({{1.0, -1.0}, {3.0, -1.0}}));
-  loader->AddRoad(2 /* featureId */, false, 1.0 /* speed */,
-                  RoadGeometry::Points({{1.0, -1.0}, {3.0, -1.0}}));
+  loader->AddRoad(0 /* featureId */, false, 1.0 /* speed */,
+                  RoadGeometry::Points({{0.0, 0.0}, {1.0, 0.0}, {2.0, 0.0}, {3.0, 0.0}, {4.0, 0.0}}));
+  loader->AddRoad(1 /* featureId */, false, 1.0 /* speed */, RoadGeometry::Points({{1.0, -1.0}, {3.0, -1.0}}));
+  loader->AddRoad(2 /* featureId */, false, 1.0 /* speed */, RoadGeometry::Points({{1.0, -1.0}, {3.0, -1.0}}));
   loader->AddRoad(3 /* featureId */, true, 1.0 /* speed */,
                   RoadGeometry::Points({{1.0, 1.0}, {1.0, 0.0}, {1.0, -1.0}}));
   loader->AddRoad(4 /* featureId */, true, 1.0 /* speed */,
@@ -154,33 +150,27 @@ UNIT_TEST(EdgesTest)
   joints.emplace_back(MakeJoint({{2, 1}, {4, 2}}));  // J5
   graph.Import(joints);
 
-  TestOutgoingEdges(
-      graph, {kTestNumMwmId, 0 /* featureId */, 0 /* segmentIdx */, true /* forward */},
-      {{kTestNumMwmId, 0, 0, false}, {kTestNumMwmId, 0, 1, true}, {kTestNumMwmId, 3, 1, true}});
+  TestOutgoingEdges(graph, {kTestNumMwmId, 0 /* featureId */, 0 /* segmentIdx */, true /* forward */},
+                    {{kTestNumMwmId, 0, 0, false}, {kTestNumMwmId, 0, 1, true}, {kTestNumMwmId, 3, 1, true}});
   TestIngoingEdges(graph, {kTestNumMwmId, 0, 0, true}, {{kTestNumMwmId, 0, 0, false}});
   TestOutgoingEdges(graph, {kTestNumMwmId, 0, 0, false}, {{kTestNumMwmId, 0, 0, true}});
-  TestIngoingEdges(
-      graph, {kTestNumMwmId, 0, 0, false},
-      {{kTestNumMwmId, 0, 0, true}, {kTestNumMwmId, 0, 1, false}, {kTestNumMwmId, 3, 0, true}});
+  TestIngoingEdges(graph, {kTestNumMwmId, 0, 0, false},
+                   {{kTestNumMwmId, 0, 0, true}, {kTestNumMwmId, 0, 1, false}, {kTestNumMwmId, 3, 0, true}});
 
-  TestOutgoingEdges(
-      graph, {kTestNumMwmId, 0, 2, true},
-      {{kTestNumMwmId, 0, 2, false}, {kTestNumMwmId, 0, 3, true}, {kTestNumMwmId, 4, 1, true}});
+  TestOutgoingEdges(graph, {kTestNumMwmId, 0, 2, true},
+                    {{kTestNumMwmId, 0, 2, false}, {kTestNumMwmId, 0, 3, true}, {kTestNumMwmId, 4, 1, true}});
   TestIngoingEdges(graph, {kTestNumMwmId, 0, 2, true}, {{kTestNumMwmId, 0, 1, true}});
   TestOutgoingEdges(graph, {kTestNumMwmId, 0, 2, false}, {{kTestNumMwmId, 0, 1, false}});
-  TestIngoingEdges(
-      graph, {kTestNumMwmId, 0, 2, false},
-      {{kTestNumMwmId, 0, 2, true}, {kTestNumMwmId, 0, 3, false}, {kTestNumMwmId, 4, 0, true}});
+  TestIngoingEdges(graph, {kTestNumMwmId, 0, 2, false},
+                   {{kTestNumMwmId, 0, 2, true}, {kTestNumMwmId, 0, 3, false}, {kTestNumMwmId, 4, 0, true}});
 
-  TestOutgoingEdges(
-      graph, {kTestNumMwmId, 3, 0, true},
-      {{kTestNumMwmId, 3, 1, true}, {kTestNumMwmId, 0, 0, false}, {kTestNumMwmId, 0, 1, true}});
+  TestOutgoingEdges(graph, {kTestNumMwmId, 3, 0, true},
+                    {{kTestNumMwmId, 3, 1, true}, {kTestNumMwmId, 0, 0, false}, {kTestNumMwmId, 0, 1, true}});
   TestIngoingEdges(graph, {kTestNumMwmId, 3, 0, true}, {{kTestNumMwmId, 2, 0, false}});
 
   TestOutgoingEdges(graph, {kTestNumMwmId, 4, 1, true}, {{kTestNumMwmId, 2, 0, false}});
-  TestIngoingEdges(
-      graph, {kTestNumMwmId, 4, 1, true},
-      {{kTestNumMwmId, 4, 0, true}, {kTestNumMwmId, 0, 2, true}, {kTestNumMwmId, 0, 3, false}});
+  TestIngoingEdges(graph, {kTestNumMwmId, 4, 1, true},
+                   {{kTestNumMwmId, 4, 0, true}, {kTestNumMwmId, 0, 2, true}, {kTestNumMwmId, 0, 3, false}});
 }
 
 //  Roads     R1:
@@ -194,23 +184,19 @@ UNIT_TEST(EdgesTest)
 UNIT_TEST(FindPathCross)
 {
   unique_ptr<TestGeometryLoader> loader = make_unique<TestGeometryLoader>();
-  loader->AddRoad(
-      0 /* featureId */, false, 1.0 /* speed */,
-      RoadGeometry::Points({{-2.0, 0.0}, {-1.0, 0.0}, {0.0, 0.0}, {1.0, 0.0}, {2.0, 0.0}}));
-  loader->AddRoad(
-      1 /* featureId */, false, 1.0 /* speed */,
-      RoadGeometry::Points({{0.0, -2.0}, {0.0, -1.0}, {0.0, 0.0}, {0.0, 1.0}, {0.0, 2.0}}));
+  loader->AddRoad(0 /* featureId */, false, 1.0 /* speed */,
+                  RoadGeometry::Points({{-2.0, 0.0}, {-1.0, 0.0}, {0.0, 0.0}, {1.0, 0.0}, {2.0, 0.0}}));
+  loader->AddRoad(1 /* featureId */, false, 1.0 /* speed */,
+                  RoadGeometry::Points({{0.0, -2.0}, {0.0, -1.0}, {0.0, 0.0}, {0.0, 1.0}, {0.0, 2.0}}));
 
   traffic::TrafficCache const trafficCache;
   shared_ptr<EdgeEstimator> estimator = CreateEstimatorForCar(trafficCache);
-  unique_ptr<WorldGraph> worldGraph =
-      BuildWorldGraph(std::move(loader), estimator, {MakeJoint({{0, 2}, {1, 2}})});
+  unique_ptr<WorldGraph> worldGraph = BuildWorldGraph(std::move(loader), estimator, {MakeJoint({{0, 2}, {1, 2}})});
 
   vector<FakeEnding> endPoints;
   for (uint32_t i = 0; i < 4; ++i)
   {
-    endPoints.push_back(MakeFakeEnding(0 /* featureId */, i /* segmentIdx */,
-                                       m2::PointD(-1.5 + i, 0.0), *worldGraph));
+    endPoints.push_back(MakeFakeEnding(0 /* featureId */, i /* segmentIdx */, m2::PointD(-1.5 + i, 0.0), *worldGraph));
     endPoints.push_back(MakeFakeEnding(1, i, m2::PointD(0.0, -1.5 + i), *worldGraph));
   }
 
@@ -219,8 +205,7 @@ UNIT_TEST(FindPathCross)
     for (auto const & finish : endPoints)
     {
       uint32_t expectedLength = 0;
-      if (start.m_projections[0].m_segment.GetFeatureId() ==
-          finish.m_projections[0].m_segment.GetFeatureId())
+      if (start.m_projections[0].m_segment.GetFeatureId() == finish.m_projections[0].m_segment.GetFeatureId())
       {
         expectedLength = AbsDelta(start.m_projections[0].m_segment.GetSegmentIdx(),
                                   finish.m_projections[0].m_segment.GetSegmentIdx()) +
@@ -238,8 +223,7 @@ UNIT_TEST(FindPathCross)
         else
           expectedLength += finish.m_projections[0].m_segment.GetSegmentIdx() - 1;
       }
-      TestRoute(start, finish, expectedLength, nullptr /* expectedRoute */, kUnknownWeight,
-                *worldGraph);
+      TestRoute(start, finish, expectedLength, nullptr /* expectedRoute */, kUnknownWeight, *worldGraph);
     }
   }
 }
@@ -276,10 +260,8 @@ UNIT_TEST(FindPathManhattan)
 
   vector<Joint> joints;
   for (uint32_t i = 0; i < kCitySize; ++i)
-  {
     for (uint32_t j = 0; j < kCitySize; ++j)
       joints.emplace_back(MakeJoint({{i, j}, {j + kCitySize, i}}));
-  }
 
   unique_ptr<WorldGraph> worldGraph = BuildWorldGraph(std::move(loader), estimator, joints);
 
@@ -288,10 +270,9 @@ UNIT_TEST(FindPathManhattan)
   {
     for (uint32_t segmentId = 0; segmentId < kCitySize - 1; ++segmentId)
     {
-      endPoints.push_back(MakeFakeEnding(featureId, segmentId,
-                                         m2::PointD(0.5 + segmentId, featureId), *worldGraph));
-      endPoints.push_back(MakeFakeEnding(featureId + kCitySize, segmentId,
-                                         m2::PointD(featureId, 0.5 + segmentId), *worldGraph));
+      endPoints.push_back(MakeFakeEnding(featureId, segmentId, m2::PointD(0.5 + segmentId, featureId), *worldGraph));
+      endPoints.push_back(
+          MakeFakeEnding(featureId + kCitySize, segmentId, m2::PointD(featureId, 0.5 + segmentId), *worldGraph));
     }
   }
 
@@ -301,22 +282,20 @@ UNIT_TEST(FindPathManhattan)
     {
       uint32_t expectedLength = 0;
 
-      auto const startFeatureOffset =
-          start.m_projections[0].m_segment.GetFeatureId() < kCitySize
-              ? start.m_projections[0].m_segment.GetFeatureId()
-              : start.m_projections[0].m_segment.GetFeatureId() - kCitySize;
-      auto const finishFeatureOffset =
-          finish.m_projections[0].m_segment.GetFeatureId() < kCitySize
-              ? finish.m_projections[0].m_segment.GetFeatureId()
-              : finish.m_projections[0].m_segment.GetFeatureId() - kCitySize;
+      auto const startFeatureOffset = start.m_projections[0].m_segment.GetFeatureId() < kCitySize
+                                        ? start.m_projections[0].m_segment.GetFeatureId()
+                                        : start.m_projections[0].m_segment.GetFeatureId() - kCitySize;
+      auto const finishFeatureOffset = finish.m_projections[0].m_segment.GetFeatureId() < kCitySize
+                                         ? finish.m_projections[0].m_segment.GetFeatureId()
+                                         : finish.m_projections[0].m_segment.GetFeatureId() - kCitySize;
 
       if ((start.m_projections[0].m_segment.GetFeatureId() < kCitySize) ==
           (finish.m_projections[0].m_segment.GetFeatureId() < kCitySize))
       {
         uint32_t segDelta = AbsDelta(start.m_projections[0].m_segment.GetSegmentIdx(),
                                      finish.m_projections[0].m_segment.GetSegmentIdx());
-        if (segDelta == 0 && start.m_projections[0].m_segment.GetFeatureId() !=
-                                 finish.m_projections[0].m_segment.GetFeatureId())
+        if (segDelta == 0 &&
+            start.m_projections[0].m_segment.GetFeatureId() != finish.m_projections[0].m_segment.GetFeatureId())
           segDelta = 1;
         expectedLength += segDelta;
         expectedLength += AbsDelta(startFeatureOffset, finishFeatureOffset) + 1;
@@ -324,28 +303,17 @@ UNIT_TEST(FindPathManhattan)
       else
       {
         if (start.m_projections[0].m_segment.GetSegmentIdx() < finishFeatureOffset)
-        {
           expectedLength += finishFeatureOffset - start.m_projections[0].m_segment.GetSegmentIdx();
-        }
         else
-        {
-          expectedLength +=
-              start.m_projections[0].m_segment.GetSegmentIdx() - finishFeatureOffset + 1;
-        }
+          expectedLength += start.m_projections[0].m_segment.GetSegmentIdx() - finishFeatureOffset + 1;
 
         if (finish.m_projections[0].m_segment.GetSegmentIdx() < startFeatureOffset)
-        {
           expectedLength += startFeatureOffset - finish.m_projections[0].m_segment.GetSegmentIdx();
-        }
         else
-        {
-          expectedLength +=
-              finish.m_projections[0].m_segment.GetSegmentIdx() - startFeatureOffset + 1;
-        }
+          expectedLength += finish.m_projections[0].m_segment.GetSegmentIdx() - startFeatureOffset + 1;
       }
 
-      TestRoute(start, finish, expectedLength, nullptr /* expectedRoute */, kUnknownWeight,
-                *worldGraph);
+      TestRoute(start, finish, expectedLength, nullptr /* expectedRoute */, kUnknownWeight, *worldGraph);
     }
   }
 }
@@ -363,13 +331,11 @@ UNIT_TEST(RoadSpeed)
 {
   unique_ptr<TestGeometryLoader> loader = make_unique<TestGeometryLoader>();
 
-  loader->AddRoad(
-      0 /* featureId */, false, 10.0 /* speed */,
-      RoadGeometry::Points({{1.0, 0.0}, {2.0, -1.0}, {3.0, -1.0}, {4.0, -1.0}, {5.0, 0.0}}));
+  loader->AddRoad(0 /* featureId */, false, 10.0 /* speed */,
+                  RoadGeometry::Points({{1.0, 0.0}, {2.0, -1.0}, {3.0, -1.0}, {4.0, -1.0}, {5.0, 0.0}}));
 
-  loader->AddRoad(
-      1 /* featureId */, false, 1.0 /* speed */,
-      RoadGeometry::Points({{0.0, 0.0}, {1.0, 0.0}, {3.0, 0.0}, {5.0, 0.0}, {6.0, 0.0}}));
+  loader->AddRoad(1 /* featureId */, false, 1.0 /* speed */,
+                  RoadGeometry::Points({{0.0, 0.0}, {1.0, 0.0}, {3.0, 0.0}, {5.0, 0.0}, {6.0, 0.0}}));
 
   traffic::TrafficCache const trafficCache;
   shared_ptr<EdgeEstimator> estimator = CreateEstimatorForCar(trafficCache);
@@ -380,8 +346,7 @@ UNIT_TEST(RoadSpeed)
 
   unique_ptr<WorldGraph> worldGraph = BuildWorldGraph(std::move(loader), estimator, joints);
 
-  auto const start =
-      MakeFakeEnding(1 /* featureId */, 0 /* segmentIdx */, m2::PointD(0.5, 0), *worldGraph);
+  auto const start = MakeFakeEnding(1 /* featureId */, 0 /* segmentIdx */, m2::PointD(0.5, 0), *worldGraph);
   auto const finish = MakeFakeEnding(1, 3, m2::PointD(5.5, 0), *worldGraph);
 
   vector<Segment> const expectedRoute({{kTestNumMwmId, 1, 0, true},
@@ -390,12 +355,11 @@ UNIT_TEST(RoadSpeed)
                                        {kTestNumMwmId, 0, 2, true},
                                        {kTestNumMwmId, 0, 3, true},
                                        {kTestNumMwmId, 1, 3, true}});
-  double const expectedWeight =
-      mercator::DistanceOnEarth({0.5, 0.0}, {1.0, 0.0}) / KmphToMps(1.0) +
-      mercator::DistanceOnEarth({1.0, 0.0}, {2.0, -1.0}) / KmphToMps(10.0) +
-      mercator::DistanceOnEarth({2.0, -1.0}, {4.0, -1.0}) / KmphToMps(10.0) +
-      mercator::DistanceOnEarth({4.0, -1.0}, {5.0, 0.0}) / KmphToMps(10.0) +
-      mercator::DistanceOnEarth({5.0, 0.0}, {5.5, 0.0}) / KmphToMps(1.0);
+  double const expectedWeight = mercator::DistanceOnEarth({0.5, 0.0}, {1.0, 0.0}) / KmphToMps(1.0) +
+                                mercator::DistanceOnEarth({1.0, 0.0}, {2.0, -1.0}) / KmphToMps(10.0) +
+                                mercator::DistanceOnEarth({2.0, -1.0}, {4.0, -1.0}) / KmphToMps(10.0) +
+                                mercator::DistanceOnEarth({4.0, -1.0}, {5.0, 0.0}) / KmphToMps(10.0) +
+                                mercator::DistanceOnEarth({5.0, 0.0}, {5.5, 0.0}) / KmphToMps(1.0);
   TestRoute(start, finish, expectedRoute.size(), &expectedRoute, expectedWeight, *worldGraph);
 }
 
@@ -411,14 +375,12 @@ UNIT_TEST(OneSegmentWay)
 {
   unique_ptr<TestGeometryLoader> loader = make_unique<TestGeometryLoader>();
 
-  loader->AddRoad(0 /* featureId */, false, 1.0 /* speed */,
-                  RoadGeometry::Points({{0.0, 0.0}, {3.0, 0.0}}));
+  loader->AddRoad(0 /* featureId */, false, 1.0 /* speed */, RoadGeometry::Points({{0.0, 0.0}, {3.0, 0.0}}));
 
   traffic::TrafficCache const trafficCache;
   shared_ptr<EdgeEstimator> estimator = CreateEstimatorForCar(trafficCache);
   unique_ptr<WorldGraph> worldGraph = BuildWorldGraph(std::move(loader), estimator, vector<Joint>());
-  vector<Segment> const expectedRoute(
-      {{kTestNumMwmId, 0 /* featureId */, 0 /* seg id */, true /* forward */}});
+  vector<Segment> const expectedRoute({{kTestNumMwmId, 0 /* featureId */, 0 /* seg id */, true /* forward */}});
 
   // Starter must match any combination of start and finish directions.
   vector<bool> const tf = {{true, false}};
@@ -426,10 +388,10 @@ UNIT_TEST(OneSegmentWay)
   {
     for (auto const finishIsForward : tf)
     {
-      auto const start = MakeFakeEnding({Segment(kTestNumMwmId, 0, 0, startIsForward)},
-                                        m2::PointD(1.0, 0.0), *worldGraph);
-      auto const finish = MakeFakeEnding({Segment(kTestNumMwmId, 0, 0, finishIsForward)},
-                                         m2::PointD(2.0, 0.0), *worldGraph);
+      auto const start =
+          MakeFakeEnding({Segment(kTestNumMwmId, 0, 0, startIsForward)}, m2::PointD(1.0, 0.0), *worldGraph);
+      auto const finish =
+          MakeFakeEnding({Segment(kTestNumMwmId, 0, 0, finishIsForward)}, m2::PointD(2.0, 0.0), *worldGraph);
 
       auto const expectedWeight = mercator::DistanceOnEarth({1.0, 0.0}, {2.0, 0.0}) / KmphToMps(1.0);
       TestRoute(start, finish, expectedRoute.size(), &expectedRoute, expectedWeight, *worldGraph);
@@ -457,8 +419,7 @@ UNIT_TEST(OneSegmentWayBackward)
   shared_ptr<EdgeEstimator> estimator = CreateEstimatorForCar(trafficCache);
   unique_ptr<WorldGraph> worldGraph = BuildWorldGraph(std::move(loader), estimator, vector<Joint>());
 
-  auto const start =
-      MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *worldGraph);
+  auto const start = MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *worldGraph);
   auto const finish = MakeFakeEnding(0, 0, m2::PointD(1, 0), *worldGraph);
 
   auto starter = MakeStarter(start, finish, *worldGraph);
@@ -480,10 +441,8 @@ UNIT_TEST(FakeSegmentCoordinates)
 {
   unique_ptr<TestGeometryLoader> loader = make_unique<TestGeometryLoader>();
 
-  loader->AddRoad(0 /* featureId */, false, 1.0 /* speed */,
-                  RoadGeometry::Points({{0.0, 0.0}, {2.0, 0.0}}));
-  loader->AddRoad(1 /* featureId */, false, 1.0 /* speed */,
-                  RoadGeometry::Points({{2.0, 0.0}, {4.0, 0.0}}));
+  loader->AddRoad(0 /* featureId */, false, 1.0 /* speed */, RoadGeometry::Points({{0.0, 0.0}, {2.0, 0.0}}));
+  loader->AddRoad(1 /* featureId */, false, 1.0 /* speed */, RoadGeometry::Points({{2.0, 0.0}, {4.0, 0.0}}));
 
   vector<Joint> joints;
   joints.emplace_back(MakeJoint({{0 /* featureId */, 1 /* pointId */}, {1, 0}}));
@@ -499,10 +458,9 @@ UNIT_TEST(FakeSegmentCoordinates)
   {
     for (auto const finishIsForward : tf)
     {
-      auto const start = MakeFakeEnding({Segment(kTestNumMwmId, 0, 0, startIsForward)},
-                                        m2::PointD(1, 0), *worldGraph);
-      auto const finish = MakeFakeEnding({Segment(kTestNumMwmId, 1, 0, finishIsForward)},
-                                         m2::PointD(3, 0), *worldGraph);
+      auto const start = MakeFakeEnding({Segment(kTestNumMwmId, 0, 0, startIsForward)}, m2::PointD(1, 0), *worldGraph);
+      auto const finish =
+          MakeFakeEnding({Segment(kTestNumMwmId, 1, 0, finishIsForward)}, m2::PointD(3, 0), *worldGraph);
 
       auto starter = MakeStarter(start, finish, *worldGraph);
       TestRouteGeometry(*starter, AlgorithmForIndexGraphStarter::Result::OK, expectedGeom);
@@ -523,10 +481,8 @@ UNIT_TEST(FakeEndingAStarInvariant)
 {
   unique_ptr<TestGeometryLoader> loader = make_unique<TestGeometryLoader>();
 
-  loader->AddRoad(0 /* featureId */, false, 1.0 /* speed */,
-                  RoadGeometry::Points({{0.0, 0.0}, {8.0, 0.0}}));
-  loader->AddRoad(1 /* featureId */, false, 1.0 /* speed */,
-                  RoadGeometry::Points({{8.0, 0.0}, {8.0, 1.0 / 1000.0}}));
+  loader->AddRoad(0 /* featureId */, false, 1.0 /* speed */, RoadGeometry::Points({{0.0, 0.0}, {8.0, 0.0}}));
+  loader->AddRoad(1 /* featureId */, false, 1.0 /* speed */, RoadGeometry::Points({{8.0, 0.0}, {8.0, 1.0 / 1000.0}}));
 
   vector<Joint> joints;
   joints.emplace_back(MakeJoint({{0 /* featureId */, 1 /* pointId */}, {1, 0}}));
@@ -534,17 +490,14 @@ UNIT_TEST(FakeEndingAStarInvariant)
   traffic::TrafficCache const trafficCache;
   shared_ptr<EdgeEstimator> estimator = CreateEstimatorForCar(trafficCache);
   unique_ptr<WorldGraph> worldGraph = BuildWorldGraph(std::move(loader), estimator, joints);
-  vector<Segment> const expectedRoute(
-      {{kTestNumMwmId, 0 /* featureId */, 0 /* seg id */, true /* forward */}});
+  vector<Segment> const expectedRoute({{kTestNumMwmId, 0 /* featureId */, 0 /* seg id */, true /* forward */}});
 
-  auto const start =
-      MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, m2::PointD(1.0, 1.0), *worldGraph);
+  auto const start = MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, m2::PointD(1.0, 1.0), *worldGraph);
   auto const finish = MakeFakeEnding(0, 0, m2::PointD(2.0, 1.0), *worldGraph);
 
-  auto const expectedWeight =
-      estimator->CalcOffroad({1.0, 1.0}, {1.0, 0.0}, EdgeEstimator::Purpose::Weight) +
-      mercator::DistanceOnEarth({1.0, 0.0}, {2.0, 0.0}) / KmphToMps(1.0) +
-          estimator->CalcOffroad({2.0, 0.0}, {2.0, 1.0}, EdgeEstimator::Purpose::Weight);
+  auto const expectedWeight = estimator->CalcOffroad({1.0, 1.0}, {1.0, 0.0}, EdgeEstimator::Purpose::Weight) +
+                              mercator::DistanceOnEarth({1.0, 0.0}, {2.0, 0.0}) / KmphToMps(1.0) +
+                              estimator->CalcOffroad({2.0, 0.0}, {2.0, 1.0}, EdgeEstimator::Purpose::Weight);
   TestRoute(start, finish, expectedRoute.size(), &expectedRoute, expectedWeight, *worldGraph);
 }
 
@@ -559,7 +512,8 @@ UNIT_TEST(SerializeSimpleGraph)
   {
     IndexGraph graph;
     vector<Joint> joints = {
-        MakeJoint({{0, 1}, {1, 0}}), MakeJoint({{1, 1}, {2, 0}}),
+        MakeJoint({{0, 1}, {1, 0}}),
+        MakeJoint({{1, 1}, {2, 0}}),
     };
     graph.Import(joints);
     unordered_map<uint32_t, VehicleMask> masks;
@@ -657,9 +611,9 @@ unique_ptr<SingleVehicleWorldGraph> BuildLoopGraph()
 
   vector<Joint> const joints = {
       MakeJoint({{0 /* feature id */, 2 /* point id */}, {0, 9}}), /* joint at point (0.0002, 0) */
-      MakeJoint({{1, 1}, {0, 0}}), /* joint at point (0.0002, 0.0001) */
-      MakeJoint({{0, 6}, {2, 0}}), /* joint at point (0.00005, 0.0003) */
-      MakeJoint({{2, 1}}),         /* joint at point (0.00005, 0.0004) */
+      MakeJoint({{1, 1}, {0, 0}}),                                 /* joint at point (0.0002, 0.0001) */
+      MakeJoint({{0, 6}, {2, 0}}),                                 /* joint at point (0.00005, 0.0003) */
+      MakeJoint({{2, 1}}),                                         /* joint at point (0.00005, 0.0004) */
   };
 
   traffic::TrafficCache const trafficCache;
@@ -672,8 +626,7 @@ unique_ptr<SingleVehicleWorldGraph> BuildLoopGraph()
 UNIT_CLASS_TEST(RestrictionTest, LoopGraph)
 {
   Init(BuildLoopGraph());
-  auto start =
-      MakeFakeEnding(1 /* featureId */, 0 /* segmentIdx */, m2::PointD(0.0002, 0), *m_graph);
+  auto start = MakeFakeEnding(1 /* featureId */, 0 /* segmentIdx */, m2::PointD(0.0002, 0), *m_graph);
   auto finish = MakeFakeEnding(2, 0, m2::PointD(0.00005, 0.0004), *m_graph);
 
   vector<Segment> const expectedRoute = {{kTestNumMwmId, 1, 0, true},  {kTestNumMwmId, 0, 0, true},
@@ -681,14 +634,13 @@ UNIT_CLASS_TEST(RestrictionTest, LoopGraph)
                                          {kTestNumMwmId, 0, 7, false}, {kTestNumMwmId, 0, 6, false},
                                          {kTestNumMwmId, 2, 0, true}};
 
-  auto const expectedWeight =
-      mercator::DistanceOnEarth({0.0002, 0.0}, {0.0002, 0.0001}) / KmphToMps(100.0) +
-      mercator::DistanceOnEarth({0.0002, 0.0001}, {0.00015, 0.0001}) / KmphToMps(100.0) +
-      mercator::DistanceOnEarth({0.00015, 0.0001}, {0.0001, 0.0001}) / KmphToMps(100.0) +
-      mercator::DistanceOnEarth({0.0001, 0.0001}, {0.00005, 0.00015}) / KmphToMps(100.0) +
-      mercator::DistanceOnEarth({0.00005, 0.00015}, {0.00005, 0.0002}) / KmphToMps(100.0) +
-      mercator::DistanceOnEarth({0.00005, 0.0002}, {0.00005, 0.0003}) / KmphToMps(100.0) +
-      mercator::DistanceOnEarth({0.00005, 0.0003}, {0.00005, 0.0004}) / KmphToMps(100.0);
+  auto const expectedWeight = mercator::DistanceOnEarth({0.0002, 0.0}, {0.0002, 0.0001}) / KmphToMps(100.0) +
+                              mercator::DistanceOnEarth({0.0002, 0.0001}, {0.00015, 0.0001}) / KmphToMps(100.0) +
+                              mercator::DistanceOnEarth({0.00015, 0.0001}, {0.0001, 0.0001}) / KmphToMps(100.0) +
+                              mercator::DistanceOnEarth({0.0001, 0.0001}, {0.00005, 0.00015}) / KmphToMps(100.0) +
+                              mercator::DistanceOnEarth({0.00005, 0.00015}, {0.00005, 0.0002}) / KmphToMps(100.0) +
+                              mercator::DistanceOnEarth({0.00005, 0.0002}, {0.00005, 0.0003}) / KmphToMps(100.0) +
+                              mercator::DistanceOnEarth({0.00005, 0.0003}, {0.00005, 0.0004}) / KmphToMps(100.0);
   TestRoute(start, finish, expectedRoute.size(), &expectedRoute, expectedWeight, *m_graph);
 }
 
@@ -829,10 +781,8 @@ UNIT_TEST(FinishNearZeroEdge)
 {
   unique_ptr<TestGeometryLoader> loader = make_unique<TestGeometryLoader>();
 
-  loader->AddRoad(0 /* featureId */, false, 1.0 /* speed */,
-                  RoadGeometry::Points({{2.0, 0.0}, {4.0, 0.0}}));
-  loader->AddRoad(1 /* featureId */, false, 1.0 /* speed */,
-                  RoadGeometry::Points({{4.0, 0.0}, {4.0, 0.0}}));
+  loader->AddRoad(0 /* featureId */, false, 1.0 /* speed */, RoadGeometry::Points({{2.0, 0.0}, {4.0, 0.0}}));
+  loader->AddRoad(1 /* featureId */, false, 1.0 /* speed */, RoadGeometry::Points({{4.0, 0.0}, {4.0, 0.0}}));
 
   vector<Joint> joints;
   joints.emplace_back(MakeJoint({{0 /* featureId */, 1 /* pointId */}, {1, 0}}));
@@ -840,14 +790,13 @@ UNIT_TEST(FinishNearZeroEdge)
   traffic::TrafficCache const trafficCache;
   shared_ptr<EdgeEstimator> estimator = CreateEstimatorForCar(trafficCache);
   unique_ptr<WorldGraph> worldGraph = BuildWorldGraph(std::move(loader), estimator, joints);
-  auto const start = MakeFakeEnding({Segment(kTestNumMwmId, 0, 0, true /* forward */)},
-                                    m2::PointD(1.0, 0.0), *worldGraph);
-  auto const finish = MakeFakeEnding({Segment(kTestNumMwmId, 1, 0, false /* forward */)},
-                                     m2::PointD(5.0, 0.0), *worldGraph);
+  auto const start =
+      MakeFakeEnding({Segment(kTestNumMwmId, 0, 0, true /* forward */)}, m2::PointD(1.0, 0.0), *worldGraph);
+  auto const finish =
+      MakeFakeEnding({Segment(kTestNumMwmId, 1, 0, false /* forward */)}, m2::PointD(5.0, 0.0), *worldGraph);
   auto starter = MakeStarter(start, finish, *worldGraph);
 
-  vector<m2::PointD> const expectedGeom = {
-      {1.0 /* x */, 0.0 /* y */}, {2.0, 0.0}, {4.0, 0.0}, {5.0, 0.0}};
+  vector<m2::PointD> const expectedGeom = {{1.0 /* x */, 0.0 /* y */}, {2.0, 0.0}, {4.0, 0.0}, {5.0, 0.0}};
   TestRouteGeometry(*starter, AlgorithmForIndexGraphStarter::Result::OK, expectedGeom);
 }
 }  // namespace index_graph_test
diff --git a/libs/routing/routing_tests/index_graph_tools.cpp b/libs/routing/routing_tests/index_graph_tools.cpp
index bb81a8f9c..0a75cd98e 100644
--- a/libs/routing/routing_tests/index_graph_tools.cpp
+++ b/libs/routing/routing_tests/index_graph_tools.cpp
@@ -30,8 +30,7 @@ Graph & GetGraph(unordered_map<NumMwmId, unique_ptr<Graph>> const & graphs, NumM
 }
 
 template <typename Graph>
-void AddGraph(unordered_map<NumMwmId, unique_ptr<Graph>> & graphs, NumMwmId mwmId,
-              unique_ptr<Graph> graph)
+void AddGraph(unordered_map<NumMwmId, unique_ptr<Graph>> & graphs, NumMwmId mwmId, unique_ptr<Graph> graph)
 {
   auto it = graphs.find(mwmId);
   CHECK(it == graphs.end(), ("Already contains graph for mwm", mwmId));
@@ -89,10 +88,7 @@ void NoUTurnRestrictionTest::TestRouteGeom(Segment const & start, Segment const
     static auto constexpr kEps = 1e-3;
     auto const point = m_graph->GetWorldGraph().GetPoint(routingResult.m_path[i], true /* forward */);
     if (!AlmostEqualAbs(mercator::FromLatLon(point), expectedRouteGeom[i], kEps))
-    {
-      TEST(false, ("Coords missmated at index:", i, "expected:", expectedRouteGeom[i],
-                   "received:", point));
-    }
+      TEST(false, ("Coords missmated at index:", i, "expected:", expectedRouteGeom[i], "received:", point));
   }
 }
 
@@ -115,7 +111,10 @@ Geometry & TestIndexGraphLoader::GetGeometry(NumMwmId mwmId)
   return GetIndexGraph(mwmId).GetGeometry();
 }
 
-void TestIndexGraphLoader::Clear() { m_graphs.clear(); }
+void TestIndexGraphLoader::Clear()
+{
+  m_graphs.clear();
+}
 
 void TestIndexGraphLoader::AddGraph(NumMwmId mwmId, unique_ptr<IndexGraph> graph)
 {
@@ -128,7 +127,10 @@ TransitGraph & TestTransitGraphLoader::GetTransitGraph(NumMwmId mwmId, IndexGrap
   return GetGraph(m_graphs, mwmId);
 }
 
-void TestTransitGraphLoader::Clear() { m_graphs.clear(); }
+void TestTransitGraphLoader::Clear()
+{
+  m_graphs.clear();
+}
 
 void TestTransitGraphLoader::AddGraph(NumMwmId mwmId, unique_ptr<TransitGraph> graph)
 {
@@ -136,8 +138,7 @@ void TestTransitGraphLoader::AddGraph(NumMwmId mwmId, unique_ptr<TransitGraph> g
 }
 
 // WeightedEdgeEstimator --------------------------------------------------------------
-double WeightedEdgeEstimator::CalcSegmentWeight(Segment const & segment,
-                                                RoadGeometry const & /* road */,
+double WeightedEdgeEstimator::CalcSegmentWeight(Segment const & segment, RoadGeometry const & /* road */,
                                                 EdgeEstimator::Purpose /* purpose */) const
 {
   auto const it = m_segmentWeights.find(segment);
@@ -145,8 +146,14 @@ double WeightedEdgeEstimator::CalcSegmentWeight(Segment const & segment,
   return it->second;
 }
 
-double WeightedEdgeEstimator::GetUTurnPenalty(Purpose purpose) const { return 0.0; }
-double WeightedEdgeEstimator::GetFerryLandingPenalty(Purpose purpose) const { return 0.0; }
+double WeightedEdgeEstimator::GetUTurnPenalty(Purpose purpose) const
+{
+  return 0.0;
+}
+double WeightedEdgeEstimator::GetFerryLandingPenalty(Purpose purpose) const
+{
+  return 0.0;
+}
 
 // TestIndexGraphTopology --------------------------------------------------------------------------
 TestIndexGraphTopology::TestIndexGraphTopology(uint32_t numVertices) : m_numVertices(numVertices) {}
@@ -207,8 +214,7 @@ void TestIndexGraphTopology::SetVertexAccess(Vertex v, RoadAccess::Type type)
   CHECK(found, ("Cannot set access for vertex that is not in the graph", v));
 }
 
-void TestIndexGraphTopology::SetVertexAccessConditional(Vertex v, RoadAccess::Type type,
-                                                        string const & condition)
+void TestIndexGraphTopology::SetVertexAccessConditional(Vertex v, RoadAccess::Type type, string const & condition)
 {
   osmoh::OpeningHours openingHours(condition);
   CHECK(openingHours.IsValid(), (condition));
@@ -233,8 +239,7 @@ void TestIndexGraphTopology::SetVertexAccessConditional(Vertex v, RoadAccess::Ty
   CHECK(found, ("Cannot set access for vertex that is not in the graph", v));
 }
 
-bool TestIndexGraphTopology::FindPath(Vertex start, Vertex finish, double & pathWeight,
-                                      vector<Edge> & pathEdges) const
+bool TestIndexGraphTopology::FindPath(Vertex start, Vertex finish, double & pathWeight, vector<Edge> & pathEdges) const
 {
   CHECK_LESS(start, m_numVertices, ());
   CHECK_LESS(finish, m_numVertices, ());
@@ -253,15 +258,13 @@ bool TestIndexGraphTopology::FindPath(Vertex start, Vertex finish, double & path
   AddDirectedEdge(edgeRequests, start, start, 0.0);
   // |startSegment| corresponds to edge from |start| to |start| which has featureId |startFeatureId|
   // and the only segment with segmentIdx |0|. It is a loop so direction does not matter.
-  auto const startSegment = Segment(kTestNumMwmId, startFeatureId, 0 /* segmentIdx */,
-                                    true /* forward */);
+  auto const startSegment = Segment(kTestNumMwmId, startFeatureId, 0 /* segmentIdx */, true /* forward */);
 
   auto const finishFeatureId = static_cast<uint32_t>(edgeRequests.size());
   AddDirectedEdge(edgeRequests, finish, finish, 0.0);
   // |finishSegment| corresponds to edge from |finish| to |finish| which has featureId |finishFeatureId|
   // and the only segment with segmentIdx |0|. It is a loop so direction does not matter.
-  auto const finishSegment = Segment(kTestNumMwmId, finishFeatureId, 0 /* segmentIdx */,
-                                     true /* forward */);
+  auto const finishSegment = Segment(kTestNumMwmId, finishFeatureId, 0 /* segmentIdx */, true /* forward */);
 
   Builder builder(m_numVertices);
   builder.SetCurrentTimeGetter(m_currentTimeGetter);
@@ -282,8 +285,7 @@ bool TestIndexGraphTopology::FindPath(Vertex start, Vertex finish, double & path
     RoutingResult<Segment, RouteWeight> unidirectionalRoutingResult;
     auto const unidirectionalResultCode = algorithm.FindPath(params, unidirectionalRoutingResult);
     CHECK_EQUAL(resultCode, unidirectionalResultCode, ());
-    CHECK(routingResult.m_distance.IsAlmostEqualForTests(unidirectionalRoutingResult.m_distance,
-                                                         kEpsilon),
+    CHECK(routingResult.m_distance.IsAlmostEqualForTests(unidirectionalRoutingResult.m_distance, kEpsilon),
           ("Distances differ:", routingResult.m_distance, unidirectionalRoutingResult.m_distance));
   }
 
@@ -316,8 +318,8 @@ bool TestIndexGraphTopology::FindPath(Vertex start, Vertex finish, double & path
   return true;
 }
 
-void TestIndexGraphTopology::AddDirectedEdge(vector<EdgeRequest> & edgeRequests, Vertex from,
-                                             Vertex to, double weight) const
+void TestIndexGraphTopology::AddDirectedEdge(vector<EdgeRequest> & edgeRequests, Vertex from, Vertex to,
+                                             double weight) const
 {
   uint32_t const id = static_cast<uint32_t>(edgeRequests.size());
   edgeRequests.emplace_back(id, from, to, weight);
@@ -374,19 +376,13 @@ void TestIndexGraphTopology::Builder::BuildGraphFromRequests(vector<EdgeRequest>
       pointToAccess[RoadPoint(request.m_id, 0 /* pointId */)] = request.m_fromAccessType;
 
     if (!request.m_fromAccessConditionalType.IsEmpty())
-    {
-      pointToAccessConditional[RoadPoint(request.m_id, 0 /* pointId */)] =
-          request.m_fromAccessConditionalType;
-    }
+      pointToAccessConditional[RoadPoint(request.m_id, 0 /* pointId */)] = request.m_fromAccessConditionalType;
 
     if (request.m_toAccessType != RoadAccess::Type::Yes)
       pointToAccess[RoadPoint(request.m_id, 1 /* pointId */)] = request.m_toAccessType;
 
     if (!request.m_toAccessConditionalType.IsEmpty())
-    {
-      pointToAccessConditional[RoadPoint(request.m_id, 1 /* pointId */)] =
-          request.m_toAccessConditionalType;
-    }
+      pointToAccessConditional[RoadPoint(request.m_id, 1 /* pointId */)] = request.m_toAccessConditionalType;
   }
 
   m_roadAccess.SetAccess(std::move(wayToAccess), std::move(pointToAccess));
@@ -412,20 +408,18 @@ void TestIndexGraphTopology::Builder::BuildSegmentFromEdge(EdgeRequest const & r
 
 // Functions ---------------------------------------------------------------------------------------
 unique_ptr<SingleVehicleWorldGraph> BuildWorldGraph(unique_ptr<TestGeometryLoader> geometryLoader,
-                                                    shared_ptr<EdgeEstimator> estimator,
-                                                    vector<Joint> const & joints)
+                                                    shared_ptr<EdgeEstimator> estimator, vector<Joint> const & joints)
 {
   auto graph = make_unique<IndexGraph>(make_shared<Geometry>(std::move(geometryLoader)), estimator);
   graph->Import(joints);
   auto indexLoader = make_unique<TestIndexGraphLoader>();
   indexLoader->AddGraph(kTestNumMwmId, std::move(graph));
-  return make_unique<SingleVehicleWorldGraph>(nullptr /* crossMwmGraph */, std::move(indexLoader),
-                                              estimator, MwmHierarchyHandler());
+  return make_unique<SingleVehicleWorldGraph>(nullptr /* crossMwmGraph */, std::move(indexLoader), estimator,
+                                              MwmHierarchyHandler());
 }
 
 unique_ptr<IndexGraph> BuildIndexGraph(unique_ptr<TestGeometryLoader> geometryLoader,
-                                       shared_ptr<EdgeEstimator> estimator,
-                                       vector<Joint> const & joints)
+                                       shared_ptr<EdgeEstimator> estimator, vector<Joint> const & joints)
 {
   auto graph = make_unique<IndexGraph>(make_shared<Geometry>(std::move(geometryLoader)), estimator);
   graph->Import(joints);
@@ -433,28 +427,25 @@ unique_ptr<IndexGraph> BuildIndexGraph(unique_ptr<TestGeometryLoader> geometryLo
 }
 
 unique_ptr<SingleVehicleWorldGraph> BuildWorldGraph(unique_ptr<ZeroGeometryLoader> geometryLoader,
-                                                    shared_ptr<EdgeEstimator> estimator,
-                                                    vector<Joint> const & joints)
+                                                    shared_ptr<EdgeEstimator> estimator, vector<Joint> const & joints)
 {
   auto graph = make_unique<IndexGraph>(make_shared<Geometry>(std::move(geometryLoader)), estimator);
 
   graph->Import(joints);
   auto indexLoader = make_unique<TestIndexGraphLoader>();
   indexLoader->AddGraph(kTestNumMwmId, std::move(graph));
-  return make_unique<SingleVehicleWorldGraph>(nullptr /* crossMwmGraph */, std::move(indexLoader),
-                                              estimator, MwmHierarchyHandler());
+  return make_unique<SingleVehicleWorldGraph>(nullptr /* crossMwmGraph */, std::move(indexLoader), estimator,
+                                              MwmHierarchyHandler());
 }
 
 unique_ptr<TransitWorldGraph> BuildWorldGraph(unique_ptr<TestGeometryLoader> geometryLoader,
-                                              shared_ptr<EdgeEstimator> estimator,
-                                              vector<Joint> const & joints,
+                                              shared_ptr<EdgeEstimator> estimator, vector<Joint> const & joints,
                                               routing::transit::GraphData const & transitData)
 {
   auto indexGraph = make_unique<IndexGraph>(make_shared<Geometry>(std::move(geometryLoader)), estimator);
   indexGraph->Import(joints);
 
-  auto transitGraph =
-      make_unique<TransitGraph>(::transit::TransitVersion::OnlySubway, kTestNumMwmId, estimator);
+  auto transitGraph = make_unique<TransitGraph>(::transit::TransitVersion::OnlySubway, kTestNumMwmId, estimator);
   TransitGraph::Endings gateEndings;
   MakeGateEndings(transitData.GetGates(), kTestNumMwmId, *indexGraph, gateEndings);
   transitGraph->Fill(transitData, gateEndings);
@@ -465,8 +456,8 @@ unique_ptr<TransitWorldGraph> BuildWorldGraph(unique_ptr<TestGeometryLoader> geo
   auto transitLoader = make_unique<TestTransitGraphLoader>();
   transitLoader->AddGraph(kTestNumMwmId, std::move(transitGraph));
 
-  return make_unique<TransitWorldGraph>(nullptr /* crossMwmGraph */, std::move(indexLoader),
-                                        std::move(transitLoader), estimator);
+  return make_unique<TransitWorldGraph>(nullptr /* crossMwmGraph */, std::move(indexLoader), std::move(transitLoader),
+                                        estimator);
 }
 
 AlgorithmForWorldGraph::Result CalculateRoute(IndexGraphStarter & starter, vector<Segment> & roadPoints,
@@ -485,8 +476,7 @@ AlgorithmForWorldGraph::Result CalculateRoute(IndexGraphStarter & starter, vecto
   return resultCode;
 }
 
-void TestRouteGeometry(IndexGraphStarter & starter,
-                       AlgorithmForWorldGraph::Result expectedRouteResult,
+void TestRouteGeometry(IndexGraphStarter & starter, AlgorithmForWorldGraph::Result expectedRouteResult,
                        vector<m2::PointD> const & expectedRouteGeom)
 {
   vector<Segment> routeSegs;
@@ -495,8 +485,7 @@ void TestRouteGeometry(IndexGraphStarter & starter,
 
   TEST_EQUAL(resultCode, expectedRouteResult, ());
 
-  if (AlgorithmForWorldGraph::Result::NoPath == expectedRouteResult &&
-      expectedRouteGeom.empty())
+  if (AlgorithmForWorldGraph::Result::NoPath == expectedRouteResult && expectedRouteGeom.empty())
   {
     // The route goes through a restriction. So there's no choice for building route
     // except for going through restriction. So no path.
@@ -509,7 +498,8 @@ void TestRouteGeometry(IndexGraphStarter & starter,
   CHECK(!routeSegs.empty(), ());
   vector<m2::PointD> geom;
 
-  auto const pushPoint = [&geom](ms::LatLon const & ll) {
+  auto const pushPoint = [&geom](ms::LatLon const & ll)
+  {
     auto const point = mercator::FromLatLon(ll);
     if (geom.empty() || geom.back() != point)
       geom.push_back(point);
@@ -538,10 +528,8 @@ void TestRouteGeometry(IndexGraphStarter & starter,
   }
 }
 
-void TestRestrictions(vector<m2::PointD> const & expectedRouteGeom,
-                      AlgorithmForWorldGraph::Result expectedRouteResult,
-                      FakeEnding const & start, FakeEnding const & finish,
-                      RestrictionVec && restrictions,
+void TestRestrictions(vector<m2::PointD> const & expectedRouteGeom, AlgorithmForWorldGraph::Result expectedRouteResult,
+                      FakeEnding const & start, FakeEnding const & finish, RestrictionVec && restrictions,
                       RestrictionTest & restrictionTest)
 {
   restrictionTest.SetRestrictions(std::move(restrictions));
@@ -550,12 +538,9 @@ void TestRestrictions(vector<m2::PointD> const & expectedRouteGeom,
   TestRouteGeometry(*restrictionTest.m_starter, expectedRouteResult, expectedRouteGeom);
 }
 
-void TestRestrictions(vector<m2::PointD> const & expectedRouteGeom,
-                      AlgorithmForWorldGraph::Result expectedRouteResult,
-                      FakeEnding const & start, FakeEnding const & finish,
-                      RestrictionVec && restrictions,
-                      vector<RestrictionUTurn> && restrictionsNoUTurn,
-                      RestrictionTest & restrictionTest)
+void TestRestrictions(vector<m2::PointD> const & expectedRouteGeom, AlgorithmForWorldGraph::Result expectedRouteResult,
+                      FakeEnding const & start, FakeEnding const & finish, RestrictionVec && restrictions,
+                      vector<RestrictionUTurn> && restrictionsNoUTurn, RestrictionTest & restrictionTest)
 {
   restrictionTest.SetRestrictions(std::move(restrictions));
   restrictionTest.SetUTurnRestrictions(std::move(restrictionsNoUTurn));
@@ -564,8 +549,7 @@ void TestRestrictions(vector<m2::PointD> const & expectedRouteGeom,
   TestRouteGeometry(*restrictionTest.m_starter, expectedRouteResult, expectedRouteGeom);
 }
 
-void TestRestrictions(double expectedLength,
-                      FakeEnding const & start, FakeEnding const & finish,
+void TestRestrictions(double expectedLength, FakeEnding const & start, FakeEnding const & finish,
                       RestrictionVec && restrictions, RestrictionTest & restrictionTest)
 {
   restrictionTest.SetRestrictions(std::move(restrictions));
@@ -588,13 +572,11 @@ void TestRestrictions(double expectedLength,
   }
 
   static auto constexpr kEps = 1e-3;
-  TEST(AlmostEqualAbs(expectedLength, length, kEps),
-       ("Length expected:", expectedLength, "has:", length));
+  TEST(AlmostEqualAbs(expectedLength, length, kEps), ("Length expected:", expectedLength, "has:", length));
 }
 
 void TestTopologyGraph(TestIndexGraphTopology const & graph, TestIndexGraphTopology::Vertex from,
-                       TestIndexGraphTopology::Vertex to, bool expectedPathFound,
-                       double const expectedWeight,
+                       TestIndexGraphTopology::Vertex to, bool expectedPathFound, double const expectedWeight,
                        vector<TestIndexGraphTopology::Edge> const & expectedEdges)
 {
   double pathWeight = 0.0;
@@ -604,26 +586,20 @@ void TestTopologyGraph(TestIndexGraphTopology const & graph, TestIndexGraphTopol
   if (!pathFound)
     return;
 
-  TEST(AlmostEqualAbs(pathWeight, expectedWeight, kEpsilon),
-       (pathWeight, expectedWeight, pathEdges));
+  TEST(AlmostEqualAbs(pathWeight, expectedWeight, kEpsilon), (pathWeight, expectedWeight, pathEdges));
   TEST_EQUAL(pathEdges, expectedEdges, ());
 }
 
-FakeEnding MakeFakeEnding(uint32_t featureId, uint32_t segmentIdx, m2::PointD const & point,
-                          WorldGraph & graph)
+FakeEnding MakeFakeEnding(uint32_t featureId, uint32_t segmentIdx, m2::PointD const & point, WorldGraph & graph)
 {
-  return MakeFakeEnding({Segment(kTestNumMwmId, featureId, segmentIdx, true /* forward */)}, point,
-                        graph);
+  return MakeFakeEnding({Segment(kTestNumMwmId, featureId, segmentIdx, true /* forward */)}, point, graph);
 }
-unique_ptr<IndexGraphStarter> MakeStarter(FakeEnding const & start, FakeEnding const & finish,
-                                          WorldGraph & graph)
+unique_ptr<IndexGraphStarter> MakeStarter(FakeEnding const & start, FakeEnding const & finish, WorldGraph & graph)
 {
-  return make_unique<IndexGraphStarter>(start, finish, 0 /* fakeNumerationStart */,
-                                        false /* strictForward */, graph);
+  return make_unique<IndexGraphStarter>(start, finish, 0 /* fakeNumerationStart */, false /* strictForward */, graph);
 }
 
-time_t GetUnixtimeByDate(uint16_t year, Month month, uint8_t monthDay, uint8_t hours,
-                         uint8_t minutes)
+time_t GetUnixtimeByDate(uint16_t year, Month month, uint8_t monthDay, uint8_t hours, uint8_t minutes)
 {
   std::tm t{};
   t.tm_year = year - 1900;
@@ -636,11 +612,11 @@ time_t GetUnixtimeByDate(uint16_t year, Month month, uint8_t monthDay, uint8_t h
   return moment;
 }
 
-time_t GetUnixtimeByDate(uint16_t year, Month month, Weekday weekday, uint8_t hours,
-                         uint8_t minutes)
+time_t GetUnixtimeByDate(uint16_t year, Month month, Weekday weekday, uint8_t hours, uint8_t minutes)
 {
   int monthDay = 1;
-  auto createUnixtime = [&]() {
+  auto createUnixtime = [&]()
+  {
     std::tm t{};
     t.tm_year = year - 1900;
     t.tm_mon = static_cast<int>(month) - 1;
diff --git a/libs/routing/routing_tests/index_graph_tools.hpp b/libs/routing/routing_tests/index_graph_tools.hpp
index 4587a1388..e2b883d71 100644
--- a/libs/routing/routing_tests/index_graph_tools.hpp
+++ b/libs/routing/routing_tests/index_graph_tools.hpp
@@ -61,16 +61,14 @@ public:
                                           m_graph->GetPoint(to, true /* front */));
   }
 
-  void GetOutgoingEdgesList(astar::VertexData<Vertex, RouteWeight> const & vertexData,
-                            EdgeListT & edges) override
+  void GetOutgoingEdgesList(astar::VertexData<Vertex, RouteWeight> const & vertexData, EdgeListT & edges) override
   {
     edges.clear();
     m_graph->GetEdgeList(vertexData, true /* isOutgoing */, true /* useRoutingOptions */,
                          true /* useAccessConditional */, edges);
   }
 
-  void GetIngoingEdgesList(astar::VertexData<Vertex, RouteWeight> const & vertexData,
-                           EdgeListT & edges) override
+  void GetIngoingEdgesList(astar::VertexData<Vertex, RouteWeight> const & vertexData, EdgeListT & edges) override
   {
     edges.clear();
     m_graph->GetEdgeList(vertexData, false /* isOutgoing */, true /* useRoutingOptions */,
@@ -106,8 +104,7 @@ struct NoUTurnRestrictionTest
   void SetRestrictions(RestrictionVec && restrictions);
   void SetNoUTurnRestrictions(std::vector<RestrictionUTurn> && restrictions);
 
-  void TestRouteGeom(Segment const & start, Segment const & finish,
-                     AlgorithmForWorldGraph::Result expectedRouteResult,
+  void TestRouteGeom(Segment const & start, Segment const & finish, AlgorithmForWorldGraph::Result expectedRouteResult,
                      std::vector<m2::PointD> const & expectedRouteGeom);
 
   std::unique_ptr<WorldGraphForAStar> m_graph;
@@ -131,10 +128,7 @@ public:
   IndexGraph & GetIndexGraph(NumMwmId mwmId) override;
   Geometry & GetGeometry(NumMwmId mwmId) override;
 
-  std::vector<RouteSegment::SpeedCamera> GetSpeedCameraInfo(Segment const & segment) override
-  {
-    return {};
-  }
+  std::vector<RouteSegment::SpeedCamera> GetSpeedCameraInfo(Segment const & segment) override { return {}; }
 
   void Clear() override;
 
@@ -171,8 +165,7 @@ public:
   explicit WeightedEdgeEstimator(std::map<Segment, double> const & segmentWeights)
     : EdgeEstimator(1e10 /* maxSpeedKMpH */, 1.0 /* offroadSpeedKMpH */)
     , m_segmentWeights(segmentWeights)
-  {
-  }
+  {}
 
   // EdgeEstimator overrides:
   ~WeightedEdgeEstimator() override = default;
@@ -207,8 +200,7 @@ public:
   // Sets access for previously added edge.
   void SetEdgeAccess(Vertex from, Vertex to, RoadAccess::Type type);
   /// \param |condition| in osm opening hours format.
-  void SetEdgeAccessConditional(Vertex from, Vertex to, RoadAccess::Type type,
-                                std::string const & condition);
+  void SetEdgeAccessConditional(Vertex from, Vertex to, RoadAccess::Type type, std::string const & condition);
 
   // Sets access type for previously added point.
   void SetVertexAccess(Vertex v, RoadAccess::Type type);
@@ -216,11 +208,13 @@ public:
   void SetVertexAccessConditional(Vertex v, RoadAccess::Type type, std::string const & condition);
 
   // Finds a path between the start and finish vertices. Returns true iff a path exists.
-  bool FindPath(Vertex start, Vertex finish, double & pathWeight,
-                std::vector<Edge> & pathEdges) const;
+  bool FindPath(Vertex start, Vertex finish, double & pathWeight, std::vector<Edge> & pathEdges) const;
 
   template <typename T>
-  void SetCurrentTimeGetter(T && getter) { m_currentTimeGetter = std::forward<T>(getter); }
+  void SetCurrentTimeGetter(T && getter)
+  {
+    m_currentTimeGetter = std::forward<T>(getter);
+  }
 
 private:
   struct EdgeRequest
@@ -239,10 +233,8 @@ private:
     RoadAccess::Type m_toAccessType = RoadAccess::Type::Yes;
     RoadAccess::Conditional m_toAccessConditionalType;
 
-    EdgeRequest(uint32_t id, Vertex from, Vertex to, double weight)
-      : m_id(id), m_from(from), m_to(to), m_weight(weight)
-    {
-    }
+    EdgeRequest(uint32_t id, Vertex from, Vertex to, double weight) : m_id(id), m_from(from), m_to(to), m_weight(weight)
+    {}
   };
 
   // Builder builds a graph from edge requests.
@@ -266,8 +258,7 @@ private:
     std::function<time_t()> m_currentTimeGetter;
   };
 
-  void AddDirectedEdge(std::vector<EdgeRequest> & edgeRequests, Vertex from, Vertex to,
-                       double weight) const;
+  void AddDirectedEdge(std::vector<EdgeRequest> & edgeRequests, Vertex from, Vertex to, double weight) const;
 
   std::function<time_t()> m_currentTimeGetter;
   uint32_t const m_numVertices;
@@ -281,31 +272,28 @@ std::unique_ptr<SingleVehicleWorldGraph> BuildWorldGraph(std::unique_ptr<ZeroGeo
                                                          std::shared_ptr<EdgeEstimator> estimator,
                                                          std::vector<Joint> const & joints);
 
-AStarAlgorithm<Segment, SegmentEdge, RouteWeight>::Result CalculateRoute(
-    IndexGraphStarter & starter, std::vector<Segment> & roadPoints, double & timeSec);
+AStarAlgorithm<Segment, SegmentEdge, RouteWeight>::Result CalculateRoute(IndexGraphStarter & starter,
+                                                                         std::vector<Segment> & roadPoints,
+                                                                         double & timeSec);
 
-void TestRouteGeometry(
-    IndexGraphStarter & starter,
-    AStarAlgorithm<Segment, SegmentEdge, RouteWeight>::Result expectedRouteResult,
-    std::vector<m2::PointD> const & expectedRouteGeom);
+void TestRouteGeometry(IndexGraphStarter & starter,
+                       AStarAlgorithm<Segment, SegmentEdge, RouteWeight>::Result expectedRouteResult,
+                       std::vector<m2::PointD> const & expectedRouteGeom);
 
 /// \brief Applies |restrictions| to graph in |restrictionTest| and
 /// tests the resulting route.
 /// \note restrictionTest should have a valid |restrictionTest.m_graph|.
 void TestRestrictions(std::vector<m2::PointD> const & expectedRouteGeom,
                       AStarAlgorithm<Segment, SegmentEdge, RouteWeight>::Result expectedRouteResult,
-                      FakeEnding const & start, FakeEnding const & finish,
-                      RestrictionVec && restrictions, RestrictionTest & restrictionTest);
+                      FakeEnding const & start, FakeEnding const & finish, RestrictionVec && restrictions,
+                      RestrictionTest & restrictionTest);
 
 void TestRestrictions(std::vector<m2::PointD> const & expectedRouteGeom,
                       AStarAlgorithm<Segment, SegmentEdge, RouteWeight>::Result expectedRouteResult,
-                      FakeEnding const & start, FakeEnding const & finish,
-                      RestrictionVec && restrictions,
-                      std::vector<RestrictionUTurn> && restrictionsNoUTurn,
-                      RestrictionTest & restrictionTest);
+                      FakeEnding const & start, FakeEnding const & finish, RestrictionVec && restrictions,
+                      std::vector<RestrictionUTurn> && restrictionsNoUTurn, RestrictionTest & restrictionTest);
 
-void TestRestrictions(double timeExpected,
-                      FakeEnding const & start, FakeEnding const & finish,
+void TestRestrictions(double timeExpected, FakeEnding const & start, FakeEnding const & finish,
                       RestrictionVec && restrictions, RestrictionTest & restrictionTest);
 
 // Tries to find a unique path from |from| to |to| in |graph|.
@@ -314,23 +302,18 @@ void TestRestrictions(double timeExpected,
 // If |expectedPathFound| is false, |expectedWeight| and |expectedEdges| may
 // take arbitrary values.
 void TestTopologyGraph(TestIndexGraphTopology const & graph, TestIndexGraphTopology::Vertex from,
-                       TestIndexGraphTopology::Vertex to, bool expectedPathFound,
-                       double expectedWeight,
+                       TestIndexGraphTopology::Vertex to, bool expectedPathFound, double expectedWeight,
                        std::vector<TestIndexGraphTopology::Edge> const & expectedEdges);
 
 // Creates FakeEnding projected to |Segment(kTestNumMwmId, featureId, segmentIdx, true /* forward
 // */)|.
-FakeEnding MakeFakeEnding(uint32_t featureId, uint32_t segmentIdx, m2::PointD const & point,
-                          WorldGraph & graph);
+FakeEnding MakeFakeEnding(uint32_t featureId, uint32_t segmentIdx, m2::PointD const & point, WorldGraph & graph);
 
-std::unique_ptr<IndexGraphStarter> MakeStarter(FakeEnding const & start, FakeEnding const & finish,
-                                               WorldGraph & graph);
+std::unique_ptr<IndexGraphStarter> MakeStarter(FakeEnding const & start, FakeEnding const & finish, WorldGraph & graph);
 
 using Month = osmoh::MonthDay::Month;
 using Weekday = osmoh::Weekday;
 
-time_t GetUnixtimeByDate(uint16_t year, Month month, uint8_t monthDay, uint8_t hours,
-                         uint8_t minutes);
-time_t GetUnixtimeByDate(uint16_t year, Month month, Weekday weekday, uint8_t hours,
-                         uint8_t minutes);
+time_t GetUnixtimeByDate(uint16_t year, Month month, uint8_t monthDay, uint8_t hours, uint8_t minutes);
+time_t GetUnixtimeByDate(uint16_t year, Month month, Weekday weekday, uint8_t hours, uint8_t minutes);
 }  // namespace routing_test
diff --git a/libs/routing/routing_tests/maxspeeds_tests.cpp b/libs/routing/routing_tests/maxspeeds_tests.cpp
index e8448c271..1923be1ce 100644
--- a/libs/routing/routing_tests/maxspeeds_tests.cpp
+++ b/libs/routing/routing_tests/maxspeeds_tests.cpp
@@ -1,7 +1,7 @@
 #include "testing/testing.hpp"
 
-#include "routing/maxspeeds_serialization.hpp"
 #include "routing/maxspeeds.hpp"
+#include "routing/maxspeeds_serialization.hpp"
 
 #include "routing_common/maxspeed_conversion.hpp"
 
@@ -32,9 +32,8 @@ void TestMaxspeedsSerialization(vector<FeatureMaxspeed> const & speeds)
   MaxspeedConverter const & converter = GetMaxspeedConverter();
   for (auto const & s : speeds)
   {
-    inputSpeeds.push_back({ s.GetFeatureId(),
-                            converter.SpeedToMacro(s.GetForwardSpeedInUnits()),
-                            converter.SpeedToMacro(s.GetBackwardSpeedInUnits()) });
+    inputSpeeds.push_back({s.GetFeatureId(), converter.SpeedToMacro(s.GetForwardSpeedInUnits()),
+                           converter.SpeedToMacro(s.GetBackwardSpeedInUnits())});
   }
 
   int constexpr SPEEDS_COUNT = MaxspeedsSerializer::DEFAULT_SPEEDS_COUNT;
@@ -136,38 +135,32 @@ UNIT_TEST(MaxspeedsSerializer_Smoke)
 
 UNIT_TEST(MaxspeedsSerializer_OneForwardMetric)
 {
-  TestMaxspeedsSerialization(
-      {FeatureMaxspeed(0 /* feature id */, Units::Metric, 20 /* speed */)});
+  TestMaxspeedsSerialization({FeatureMaxspeed(0 /* feature id */, Units::Metric, 20 /* speed */)});
 }
 
 UNIT_TEST(MaxspeedsSerializer_OneNone)
 {
-  TestMaxspeedsSerialization(
-      {FeatureMaxspeed(0 /* feature id */, Units::Metric, kNoneMaxSpeed)});
+  TestMaxspeedsSerialization({FeatureMaxspeed(0 /* feature id */, Units::Metric, kNoneMaxSpeed)});
 }
 
 UNIT_TEST(MaxspeedsSerializer_OneWalk)
 {
-  TestMaxspeedsSerialization(
-      {FeatureMaxspeed(0 /* feature id */, Units::Metric, kWalkMaxSpeed)});
+  TestMaxspeedsSerialization({FeatureMaxspeed(0 /* feature id */, Units::Metric, kWalkMaxSpeed)});
 }
 
 UNIT_TEST(MaxspeedsSerializer_OneBidirectionalMetric_1)
 {
-  TestMaxspeedsSerialization(
-      {FeatureMaxspeed(0 /* feature id */, Units::Metric, 20 /* speed */, 40 /* speed */)});
+  TestMaxspeedsSerialization({FeatureMaxspeed(0 /* feature id */, Units::Metric, 20 /* speed */, 40 /* speed */)});
 }
 
 UNIT_TEST(MaxspeedsSerializer_OneBidirectionalMetric_2)
 {
-  TestMaxspeedsSerialization(
-      {FeatureMaxspeed(0 /* feature id */, Units::Metric, 10 /* speed */, kWalkMaxSpeed)});
+  TestMaxspeedsSerialization({FeatureMaxspeed(0 /* feature id */, Units::Metric, 10 /* speed */, kWalkMaxSpeed)});
 }
 
 UNIT_TEST(MaxspeedsSerializer_OneBidirectionalImperial)
 {
-  TestMaxspeedsSerialization(
-      {FeatureMaxspeed(0 /* feature id */, Units::Imperial, 30 /* speed */, 50 /* speed */)});
+  TestMaxspeedsSerialization({FeatureMaxspeed(0 /* feature id */, Units::Imperial, 30 /* speed */, 50 /* speed */)});
 }
 
 UNIT_TEST(MaxspeedsSerializer_BigMetric)
diff --git a/libs/routing/routing_tests/mwm_hierarchy_test.cpp b/libs/routing/routing_tests/mwm_hierarchy_test.cpp
index c0067a79e..6169dfffc 100644
--- a/libs/routing/routing_tests/mwm_hierarchy_test.cpp
+++ b/libs/routing/routing_tests/mwm_hierarchy_test.cpp
@@ -35,29 +35,36 @@ UNIT_TEST(MwmHierarchyHandler_Smoke)
   routing::MwmHierarchyHandler handler(mwmIDs, getter);
 
   TEST(!handler.HasCrossBorderPenalty(GetCountryID(mwmIDs, "Belarus_Maglieu Region"),
-                                      GetCountryID(mwmIDs, "Belarus_Vitebsk Region")), ());
+                                      GetCountryID(mwmIDs, "Belarus_Vitebsk Region")),
+       ());
   TEST(handler.HasCrossBorderPenalty(GetCountryID(mwmIDs, "Belarus_Hrodna Region"),
-                                     GetCountryID(mwmIDs, "Lithuania_East")), ());
+                                     GetCountryID(mwmIDs, "Lithuania_East")),
+       ());
   TEST(!handler.HasCrossBorderPenalty(GetCountryID(mwmIDs, "Belarus_Maglieu Region"),
-                                      GetCountryID(mwmIDs, "Russia_Smolensk Oblast")), ());
-  TEST(handler.HasCrossBorderPenalty(GetCountryID(mwmIDs, "Ukraine_Kherson Oblast"),
-                                     GetCountryID(mwmIDs, "Crimea")), ());
-  TEST(handler.HasCrossBorderPenalty(GetCountryID(mwmIDs, "Russia_Krasnodar Krai"),
-                                     GetCountryID(mwmIDs, "Crimea")), ());
+                                      GetCountryID(mwmIDs, "Russia_Smolensk Oblast")),
+       ());
+  TEST(handler.HasCrossBorderPenalty(GetCountryID(mwmIDs, "Ukraine_Kherson Oblast"), GetCountryID(mwmIDs, "Crimea")),
+       ());
+  TEST(handler.HasCrossBorderPenalty(GetCountryID(mwmIDs, "Russia_Krasnodar Krai"), GetCountryID(mwmIDs, "Crimea")),
+       ());
   TEST(!handler.HasCrossBorderPenalty(GetCountryID(mwmIDs, "Denmark_Region Zealand"),
-                                      GetCountryID(mwmIDs, "Denmark_Region of Southern Denmark")), ());
+                                      GetCountryID(mwmIDs, "Denmark_Region of Southern Denmark")),
+       ());
 
   TEST(handler.HasCrossBorderPenalty(GetCountryID(mwmIDs, "Ukraine_Zakarpattia Oblast"),
-                                     GetCountryID(mwmIDs, "Slovakia_Region of Kosice")), ());
+                                     GetCountryID(mwmIDs, "Slovakia_Region of Kosice")),
+       ());
   TEST(handler.HasCrossBorderPenalty(GetCountryID(mwmIDs, "Ukraine_Zakarpattia Oblast"),
-                                     GetCountryID(mwmIDs, "Hungary_Northern Great Plain")), ());
+                                     GetCountryID(mwmIDs, "Hungary_Northern Great Plain")),
+       ());
   TEST(!handler.HasCrossBorderPenalty(GetCountryID(mwmIDs, "Hungary_Northern Great Plain"),
-                                      GetCountryID(mwmIDs, "Slovakia_Region of Kosice")), ());
+                                      GetCountryID(mwmIDs, "Slovakia_Region of Kosice")),
+       ());
 
   TEST(!handler.HasCrossBorderPenalty(GetCountryID(mwmIDs, "Ireland_Connacht"),
-                                      GetCountryID(mwmIDs, "UK_Northern Ireland")), ());
-  TEST(handler.HasCrossBorderPenalty(GetCountryID(mwmIDs, "Ireland_Leinster"),
-                                     GetCountryID(mwmIDs, "UK_Wales")), ());
+                                      GetCountryID(mwmIDs, "UK_Northern Ireland")),
+       ());
+  TEST(handler.HasCrossBorderPenalty(GetCountryID(mwmIDs, "Ireland_Leinster"), GetCountryID(mwmIDs, "UK_Wales")), ());
 
   char const * ip[] = {"Israel", "Jerusalem", "Palestine"};
   for (auto s1 : ip)
@@ -65,4 +72,4 @@ UNIT_TEST(MwmHierarchyHandler_Smoke)
       TEST(!handler.HasCrossBorderPenalty(GetCountryID(mwmIDs, s1), GetCountryID(mwmIDs, s2)), (s1, s2));
 }
 
-} // namespace mwm_hierarchy_test
+}  // namespace mwm_hierarchy_test
diff --git a/libs/routing/routing_tests/nearest_edge_finder_tests.cpp b/libs/routing/routing_tests/nearest_edge_finder_tests.cpp
index 2936d81a4..e1acab80d 100644
--- a/libs/routing/routing_tests/nearest_edge_finder_tests.cpp
+++ b/libs/routing/routing_tests/nearest_edge_finder_tests.cpp
@@ -2,8 +2,8 @@
 
 #include "routing/routing_tests/road_graph_builder.hpp"
 
-#include "routing/road_graph.hpp"
 #include "routing/nearest_edge_finder.hpp"
+#include "routing/road_graph.hpp"
 
 #include "routing_common/maxspeed_conversion.hpp"
 
@@ -27,8 +27,7 @@ void TestNearestOnMock1(m2::PointD const & point, size_t const candidatesCount,
   for (size_t i = 0; i < graph->GetRoadCount(); ++i)
   {
     FeatureID const featureId = MakeTestFeatureID(base::checked_cast<uint32_t>(i));
-    auto const & roadInfo =
-        graph->GetRoadInfo(featureId, {true /* forward */, false /* in city */, Maxspeed()});
+    auto const & roadInfo = graph->GetRoadInfo(featureId, {true /* forward */, false /* in city */, Maxspeed()});
     finder.AddInformationSource(IRoadGraph::FullRoadInfo(featureId, roadInfo));
   }
 
@@ -72,4 +71,4 @@ UNIT_TEST(MiddleSegmentTest_Mock1Graph)
                 geometry::MakePointWithAltitudeForTesting(m2::PointD(12.5, 0)))};
   TestNearestOnMock1(m2::PointD(12.5, 2.5), 2, expected);
 }
-}  // namespace nearest_edge_finder_tests
\ No newline at end of file
+}  // namespace nearest_edge_finder_tests
diff --git a/libs/routing/routing_tests/opening_hours_serdes_tests.cpp b/libs/routing/routing_tests/opening_hours_serdes_tests.cpp
index 61e7fbc2f..08cd639cd 100644
--- a/libs/routing/routing_tests/opening_hours_serdes_tests.cpp
+++ b/libs/routing/routing_tests/opening_hours_serdes_tests.cpp
@@ -26,8 +26,7 @@ struct OHSerDesTestFixture
   OHSerDesTestFixture()
     : m_memWriter(m_buffer)
     , m_bitWriter(std::make_unique<BitWriter<MemWriter<Buffer>>>(m_memWriter))
-  {
-  }
+  {}
 
   BitWriter<MemWriter<Buffer>> & GetWriter() { return *m_bitWriter; }
   BitReader<ReaderSource<MemReader>> & GetReader()
@@ -110,8 +109,7 @@ void TestModifier(osmoh::RuleSequence const & rule, osmoh::RuleSequence::Modifie
   TEST_EQUAL(rule.GetModifier(), modifier, ());
 }
 
-void TestTime(osmoh::RuleSequence const & rule, uint32_t startH, uint32_t startM, uint32_t endH,
-              uint32_t endM)
+void TestTime(osmoh::RuleSequence const & rule, uint32_t startH, uint32_t startM, uint32_t endH, uint32_t endM)
 {
   TEST_EQUAL(rule.GetTimes().size(), 1, ());
   auto const & time = rule.GetTimes()[0];
@@ -123,9 +121,8 @@ void TestTime(osmoh::RuleSequence const & rule, uint32_t startH, uint32_t startM
   TEST_EQUAL(time.GetEnd().GetMinutesCount(), endM, ());
 }
 
-void TestMonth(osmoh::RuleSequence const & rule, uint32_t startYear,
-               Month startMonth, osmoh::MonthDay::TDayNum startDay,
-               uint32_t endYear, Month endMonth, osmoh::MonthDay::TDayNum endDay)
+void TestMonth(osmoh::RuleSequence const & rule, uint32_t startYear, Month startMonth,
+               osmoh::MonthDay::TDayNum startDay, uint32_t endYear, Month endMonth, osmoh::MonthDay::TDayNum endDay)
 {
   TEST_EQUAL(rule.GetMonths().size(), 1, ());
   auto const & range = rule.GetMonths().back();
@@ -139,16 +136,15 @@ void TestMonth(osmoh::RuleSequence const & rule, uint32_t startYear,
   TEST_EQUAL(range.GetEnd().GetDayNum(), endDay, ());
 }
 
-void TestMonth(osmoh::RuleSequence const & rule, Month startMonth,
-               osmoh::MonthDay::TDayNum startDay, Month endMonth, osmoh::MonthDay::TDayNum endDay)
+void TestMonth(osmoh::RuleSequence const & rule, Month startMonth, osmoh::MonthDay::TDayNum startDay, Month endMonth,
+               osmoh::MonthDay::TDayNum endDay)
 {
   TestMonth(rule, 0 /* startYear */, startMonth, startDay, 0 /* endYear */, endMonth, endDay);
 }
 
 void TestMonth(osmoh::RuleSequence const & rule, Month startMonth, Month endMonth)
 {
-  TestMonth(rule, 0 /* startYear */, startMonth, 0 /* startDay */, 0 /* endYear*/, endMonth,
-            0 /* endDay */);
+  TestMonth(rule, 0 /* startYear */, startMonth, 0 /* startDay */, 0 /* endYear*/, endMonth, 0 /* endDay */);
 }
 
 UNIT_CLASS_TEST(OHSerDesTestFixture, OpeningHoursSerDes_EnableTests_1)
@@ -859,4 +855,4 @@ UNIT_CLASS_TEST(OHSerDesTestFixture, OpeningHoursSerDes_InverseMonths_Usage_2)
   TEST(!oh.IsOpen(GetUnixtimeByDate(2020, Month::Apr, 20, 20 /* hh */, 00 /* mm */)), ());
   TEST(!oh.IsOpen(GetUnixtimeByDate(2020, Month::May, 20, 20 /* hh */, 00 /* mm */)), ());
 }
-} // namespace opening_hours_serdes_tests
+}  // namespace opening_hours_serdes_tests
diff --git a/libs/routing/routing_tests/position_accumulator_tests.cpp b/libs/routing/routing_tests/position_accumulator_tests.cpp
index da3c5c05e..ebefc4daf 100644
--- a/libs/routing/routing_tests/position_accumulator_tests.cpp
+++ b/libs/routing/routing_tests/position_accumulator_tests.cpp
@@ -21,8 +21,7 @@ UNIT_CLASS_TEST(PositionAccumulator, Smoke)
   PushNextPoint({0.0001, 0.0});
   TEST_EQUAL(GetPointsForTesting().size(), 2, ());
   TEST(AlmostEqualAbs(GetDirection(), m2::PointD(0.0001, 0.0), kEps), (GetDirection()));
-  TEST(AlmostEqualAbs(GetTrackLengthMForTesting(), 11.13, kEpsMeters),
-       (GetTrackLengthMForTesting()));
+  TEST(AlmostEqualAbs(GetTrackLengthMForTesting(), 11.13, kEpsMeters), (GetTrackLengthMForTesting()));
 }
 
 UNIT_CLASS_TEST(PositionAccumulator, GoodSegment)
@@ -36,10 +35,8 @@ UNIT_CLASS_TEST(PositionAccumulator, GoodSegment)
   for (signed i = -15; i <= 0; ++i)
     PushNextPoint({kStepShortButValid * i, 0.0});
   TEST_EQUAL(GetPointsForTesting().size(), 2, ());
-  TEST(AlmostEqualAbs(GetDirection(), m2::PointD(9 * kStepShortButValid, 0.0), kEps),
-       (GetDirection()));
-  TEST(AlmostEqualAbs(GetTrackLengthMForTesting(), 10.02, kEpsMeters),
-       (GetTrackLengthMForTesting()));
+  TEST(AlmostEqualAbs(GetDirection(), m2::PointD(9 * kStepShortButValid, 0.0), kEps), (GetDirection()));
+  TEST(AlmostEqualAbs(GetTrackLengthMForTesting(), 10.02, kEpsMeters), (GetTrackLengthMForTesting()));
 
   double constexpr kStepGood = 0.0001;
   for (size_t i = 0; i < 10; ++i)
@@ -47,8 +44,7 @@ UNIT_CLASS_TEST(PositionAccumulator, GoodSegment)
 
   TEST_EQUAL(GetPointsForTesting().size(), 8, ());
   TEST(AlmostEqualAbs(GetDirection(), m2::PointD(0.0007, 0.0), kEps), (GetDirection()));
-  TEST(AlmostEqualAbs(GetTrackLengthMForTesting(), 77.92, kEpsMeters),
-       (GetTrackLengthMForTesting()));
+  TEST(AlmostEqualAbs(GetTrackLengthMForTesting(), 77.92, kEpsMeters), (GetTrackLengthMForTesting()));
 }
 
 // Test on removing too outdated elements from the position accumulator.
@@ -68,9 +64,9 @@ UNIT_CLASS_TEST(PositionAccumulator, RemovingOutdated)
 UNIT_CLASS_TEST(PositionAccumulator, LongSegment)
 {
   PushNextPoint({0.0, 0.0});
-  PushNextPoint({0.001, 0.0}); // Longer than |MaxValidSegmentLengthM|.
+  PushNextPoint({0.001, 0.0});  // Longer than |MaxValidSegmentLengthM|.
   TEST_EQUAL(GetPointsForTesting().size(), 1, ());
-  PushNextPoint({0.001001, 0.0}); // Shorter than |kMinValidSegmentLengthM|, so it's ignored.
+  PushNextPoint({0.001001, 0.0});  // Shorter than |kMinValidSegmentLengthM|, so it's ignored.
   PushNextPoint({0.00102, 0.0});
   PushNextPoint({0.00104, 0.0});
   // The distance from point {0.001, 0.0} to this one is greater then
@@ -78,7 +74,7 @@ UNIT_CLASS_TEST(PositionAccumulator, LongSegment)
   PushNextPoint({0.0012, 0.0});
   TEST_EQUAL(GetPointsForTesting().size(), 2, ());
   TEST(AlmostEqualAbs(GetDirection(), m2::PointD(0.0002, 0.0), kEps), (GetDirection()));
-  PushNextPoint({0.00201, 0.0}); // Longer than |PositionAccumulator::kMaxValidSegmentLengthM|.
+  PushNextPoint({0.00201, 0.0});  // Longer than |PositionAccumulator::kMaxValidSegmentLengthM|.
   TEST_EQUAL(GetPointsForTesting().size(), 1, ());
   TEST(AlmostEqualAbs(GetDirection(), m2::PointD(0.0, 0.0), kEps), (GetDirection()));
 }
diff --git a/libs/routing/routing_tests/restriction_test.cpp b/libs/routing/routing_tests/restriction_test.cpp
index a391e72c4..3bce2b249 100644
--- a/libs/routing/routing_tests/restriction_test.cpp
+++ b/libs/routing/routing_tests/restriction_test.cpp
@@ -29,8 +29,7 @@ UNIT_CLASS_TEST(RestrictionTest, CrossGraph_NoUTurn)
   SetStarter(MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, m2::PointD(-1, 0), *m_graph),
              MakeFakeEnding(7, 0, m2::PointD(1, 2), *m_graph));
 
-  vector<m2::PointD> const expectedGeom = {
-      {-1.0 /* x */, 0.0 /* y */}, {0.0, 0.0}, {1.0, 0.0}, {1.0, 1.0}, {1.0, 2.0}};
+  vector<m2::PointD> const expectedGeom = {{-1.0 /* x */, 0.0 /* y */}, {0.0, 0.0}, {1.0, 0.0}, {1.0, 1.0}, {1.0, 2.0}};
   TestRouteGeometry(*m_starter, Algorithm::Result::OK, expectedGeom);
 }
 
@@ -40,16 +39,13 @@ UNIT_CLASS_TEST(RestrictionTest, CrossGraph_UTurn)
   SetStarter(MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, m2::PointD(-1, 0), *m_graph),
              MakeFakeEnding(7, 0, m2::PointD(1, 2), *m_graph));
 
-  RestrictionVec restrictionsNo = {
-    {1 /* feature from */, 6 /* feature to */}
-  };
+  RestrictionVec restrictionsNo = {{1 /* feature from */, 6 /* feature to */}};
   vector<m2::PointD> const expectedGeom = {{-1.0, 0.0}, {0.0, 0.0}, {1.0, 0.0}, {1.0, -1.0},
                                            {1.0, 0.0},  {1.0, 1.0}, {1.0, 2.0}};
 
-  TestRestrictions(
-      6.0 /* expectedTime */,
-      MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, m2::PointD(-1, 0), *m_graph),
-      MakeFakeEnding(7, 0, m2::PointD(1, 2), *m_graph), std::move(restrictionsNo), *this);
+  TestRestrictions(6.0 /* expectedTime */,
+                   MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, m2::PointD(-1, 0), *m_graph),
+                   MakeFakeEnding(7, 0, m2::PointD(1, 2), *m_graph), std::move(restrictionsNo), *this);
 }
 
 // Finish
@@ -106,78 +102,60 @@ UNIT_CLASS_TEST(RestrictionTest, TriangularGraph)
 
   vector<m2::PointD> const expectedGeom = {{3 /* x */, 0 /* y */}, {2, 0}, {1, 1}, {0, 2}, {0, 3}};
 
-  TestRestrictions(
-      expectedGeom, Algorithm::Result::OK,
-      MakeFakeEnding(5 /* featureId */, 0 /* segmentIdx */, m2::PointD(3, 0), *m_graph),
-      MakeFakeEnding(4, 0, m2::PointD(0, 3), *m_graph), {}, *this);
+  TestRestrictions(expectedGeom, Algorithm::Result::OK,
+                   MakeFakeEnding(5 /* featureId */, 0 /* segmentIdx */, m2::PointD(3, 0), *m_graph),
+                   MakeFakeEnding(4, 0, m2::PointD(0, 3), *m_graph), {}, *this);
 }
 
 // Route through triangular graph with restriction type no from feature 2 to feature 1.
 UNIT_CLASS_TEST(RestrictionTest, TriangularGraph_RestrictionNoF2F1)
 {
   Init(BuildTriangularGraph());
-  RestrictionVec restrictionsNo = {
-    {2 /* feature from */, 1 /* feature to */}};
-  vector<m2::PointD> const expectedGeom = {
-      {3 /* x */, 0 /* y */}, {2, 0}, {1, 0}, {0, 0}, {0, 2}, {0, 3}};
+  RestrictionVec restrictionsNo = {{2 /* feature from */, 1 /* feature to */}};
+  vector<m2::PointD> const expectedGeom = {{3 /* x */, 0 /* y */}, {2, 0}, {1, 0}, {0, 0}, {0, 2}, {0, 3}};
 
-  TestRestrictions(
-      expectedGeom, Algorithm::Result::OK,
-      MakeFakeEnding(5 /* featureId */, 0 /* senmentIdx */, m2::PointD(3, 0), *m_graph),
-      MakeFakeEnding(4, 0, m2::PointD(0, 3), *m_graph), std::move(restrictionsNo), *this);
+  TestRestrictions(expectedGeom, Algorithm::Result::OK,
+                   MakeFakeEnding(5 /* featureId */, 0 /* senmentIdx */, m2::PointD(3, 0), *m_graph),
+                   MakeFakeEnding(4, 0, m2::PointD(0, 3), *m_graph), std::move(restrictionsNo), *this);
 }
 
 UNIT_CLASS_TEST(RestrictionTest, TriangularGraph_RestrictionNoF5F2)
 {
   Init(BuildTriangularGraph());
-  RestrictionVec restrictionsNo = {
-    {5 /* feature from */, 2 /* feature to */}};
-  vector<m2::PointD> const expectedGeom = {
-      {3 /* x */, 0 /* y */}, {2, 0}, {1, 0}, {0, 0}, {0, 2}, {0, 3}};
+  RestrictionVec restrictionsNo = {{5 /* feature from */, 2 /* feature to */}};
+  vector<m2::PointD> const expectedGeom = {{3 /* x */, 0 /* y */}, {2, 0}, {1, 0}, {0, 0}, {0, 2}, {0, 3}};
 
-  TestRestrictions(
-      expectedGeom, Algorithm::Result::OK,
-      MakeFakeEnding(5 /* featureId */, 0 /* segmentIdx */, m2::PointD(3, 0), *m_graph),
-      MakeFakeEnding(4, 0, m2::PointD(0, 3), *m_graph), std::move(restrictionsNo), *this);
+  TestRestrictions(expectedGeom, Algorithm::Result::OK,
+                   MakeFakeEnding(5 /* featureId */, 0 /* segmentIdx */, m2::PointD(3, 0), *m_graph),
+                   MakeFakeEnding(4, 0, m2::PointD(0, 3), *m_graph), std::move(restrictionsNo), *this);
 }
 
 UNIT_CLASS_TEST(RestrictionTest, TriangularGraph_RestrictionOnlyF5F3)
 {
   Init(BuildTriangularGraph());
-  RestrictionVec restrictionsOnly = {
-      {{5 /* feature from */, 3 /* feature to */}}};
+  RestrictionVec restrictionsOnly = {{{5 /* feature from */, 3 /* feature to */}}};
   RestrictionVec restrictionsNo;
-  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly,
-                              restrictionsNo);
-  vector<m2::PointD> const expectedGeom = {
-      {3 /* x */, 0 /* y */}, {2, 0}, {1, 0}, {0, 0}, {0, 2}, {0, 3}};
+  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly, restrictionsNo);
+  vector<m2::PointD> const expectedGeom = {{3 /* x */, 0 /* y */}, {2, 0}, {1, 0}, {0, 0}, {0, 2}, {0, 3}};
 
-  TestRestrictions(
-      expectedGeom, Algorithm::Result::OK,
-      MakeFakeEnding(5 /* featureId */, 0 /* segmentIdx */, m2::PointD(3, 0), *m_graph),
-      MakeFakeEnding(4, 0, m2::PointD(0, 3), *m_graph), std::move(restrictionsNo), *this);
+  TestRestrictions(expectedGeom, Algorithm::Result::OK,
+                   MakeFakeEnding(5 /* featureId */, 0 /* segmentIdx */, m2::PointD(3, 0), *m_graph),
+                   MakeFakeEnding(4, 0, m2::PointD(0, 3), *m_graph), std::move(restrictionsNo), *this);
 }
 
 UNIT_CLASS_TEST(RestrictionTest, TriangularGraph_RestrictionNoF5F2RestrictionOnlyF5F3)
 {
   Init(BuildTriangularGraph());
-  RestrictionVec restrictionsNo = {
-    {5 /* feature from */, 2 /* feature to */}
-  };
+  RestrictionVec restrictionsNo = {{5 /* feature from */, 2 /* feature to */}};
 
-  RestrictionVec restrictionsOnly = {
-    {5 /* feature from */, 3 /* feature to */}
-  };
-  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly,
-                              restrictionsNo);
+  RestrictionVec restrictionsOnly = {{5 /* feature from */, 3 /* feature to */}};
+  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly, restrictionsNo);
 
-  vector<m2::PointD> const expectedGeom = {
-      {3 /* x */, 0 /* y */}, {2, 0}, {1, 0}, {0, 0}, {0, 2}, {0, 3}};
+  vector<m2::PointD> const expectedGeom = {{3 /* x */, 0 /* y */}, {2, 0}, {1, 0}, {0, 0}, {0, 2}, {0, 3}};
 
-  TestRestrictions(
-      expectedGeom, Algorithm::Result::OK,
-      MakeFakeEnding(5 /* featureId */, 0 /* segmentIdx */, m2::PointD(3, 0), *m_graph),
-      MakeFakeEnding(4, 0, m2::PointD(0, 3), *m_graph), std::move(restrictionsNo), *this);
+  TestRestrictions(expectedGeom, Algorithm::Result::OK,
+                   MakeFakeEnding(5 /* featureId */, 0 /* segmentIdx */, m2::PointD(3, 0), *m_graph),
+                   MakeFakeEnding(4, 0, m2::PointD(0, 3), *m_graph), std::move(restrictionsNo), *this);
 }
 
 // Finish
@@ -228,43 +206,33 @@ UNIT_CLASS_TEST(RestrictionTest, TwowayCornerGraph)
   Init(BuildTwowayCornerGraph());
   vector<m2::PointD> const expectedGeom = {{3 /* x */, 0 /* y */}, {2, 0}, {1, 1}, {0, 2}, {0, 3}};
 
-  TestRestrictions(
-      expectedGeom, Algorithm::Result::OK,
-      MakeFakeEnding(3 /* featureId */, 0 /* segmentIdx */, m2::PointD(3, 0), *m_graph),
-      MakeFakeEnding(4, 0, m2::PointD(0, 3), *m_graph), {}, *this);
+  TestRestrictions(expectedGeom, Algorithm::Result::OK,
+                   MakeFakeEnding(3 /* featureId */, 0 /* segmentIdx */, m2::PointD(3, 0), *m_graph),
+                   MakeFakeEnding(4, 0, m2::PointD(0, 3), *m_graph), {}, *this);
 }
 
 UNIT_CLASS_TEST(RestrictionTest, TwowayCornerGraph_RestrictionF3F2No)
 {
   Init(BuildTwowayCornerGraph());
-  RestrictionVec restrictionsNo = {
-    {3 /* feature from */, 2 /* feature to */}
-  };
-  vector<m2::PointD> const expectedGeom = {
-      {3 /* x */, 0 /* y */}, {2, 0}, {1, 0}, {0, 0}, {0, 1}, {0, 2}, {0, 3}};
+  RestrictionVec restrictionsNo = {{3 /* feature from */, 2 /* feature to */}};
+  vector<m2::PointD> const expectedGeom = {{3 /* x */, 0 /* y */}, {2, 0}, {1, 0}, {0, 0}, {0, 1}, {0, 2}, {0, 3}};
 
-  TestRestrictions(
-      expectedGeom, Algorithm::Result::OK,
-      MakeFakeEnding(3 /* featureId */, 0 /* segmentIdx */, m2::PointD(3, 0), *m_graph),
-      MakeFakeEnding(4, 0, m2::PointD(0, 3), *m_graph), std::move(restrictionsNo), *this);
+  TestRestrictions(expectedGeom, Algorithm::Result::OK,
+                   MakeFakeEnding(3 /* featureId */, 0 /* segmentIdx */, m2::PointD(3, 0), *m_graph),
+                   MakeFakeEnding(4, 0, m2::PointD(0, 3), *m_graph), std::move(restrictionsNo), *this);
 }
 
 UNIT_CLASS_TEST(RestrictionTest, TwowayCornerGraph_RestrictionF3F1Only)
 {
   Init(BuildTwowayCornerGraph());
-  RestrictionVec restrictionsOnly = {
-    {3 /* feature from */, 1 /* feature to */}
-  };
+  RestrictionVec restrictionsOnly = {{3 /* feature from */, 1 /* feature to */}};
   RestrictionVec restrictionsNo;
-  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly,
-                              restrictionsNo);
-  vector<m2::PointD> const expectedGeom = {
-      {3 /* x */, 0 /* y */}, {2, 0}, {1, 0}, {0, 0}, {0, 1}, {0, 2}, {0, 3}};
+  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly, restrictionsNo);
+  vector<m2::PointD> const expectedGeom = {{3 /* x */, 0 /* y */}, {2, 0}, {1, 0}, {0, 0}, {0, 1}, {0, 2}, {0, 3}};
 
-  TestRestrictions(
-      expectedGeom, Algorithm::Result::OK,
-      MakeFakeEnding(3 /* featureId */, 0 /* segmentIdx */, m2::PointD(3, 0), *m_graph),
-      MakeFakeEnding(4, 0, m2::PointD(0, 3), *m_graph), std::move(restrictionsNo), *this);
+  TestRestrictions(expectedGeom, Algorithm::Result::OK,
+                   MakeFakeEnding(3 /* featureId */, 0 /* segmentIdx */, m2::PointD(3, 0), *m_graph),
+                   MakeFakeEnding(4, 0, m2::PointD(0, 3), *m_graph), std::move(restrictionsNo), *this);
 }
 
 // Finish
@@ -336,69 +304,52 @@ UNIT_CLASS_TEST(RestrictionTest, TwoSquaresGraph)
   Init(BuildTwoSquaresGraph());
   vector<m2::PointD> const expectedGeom = {{3 /* x */, 0 /* y */}, {2, 0}, {1, 1}, {0, 2}, {0, 3}};
 
-  TestRestrictions(
-      expectedGeom, Algorithm::Result::OK,
-      MakeFakeEnding(10 /* featureId */, 0 /* segmentIdx */, m2::PointD(3, 0), *m_graph),
-      MakeFakeEnding(11, 0, m2::PointD(0, 3), *m_graph), {}, *this);
+  TestRestrictions(expectedGeom, Algorithm::Result::OK,
+                   MakeFakeEnding(10 /* featureId */, 0 /* segmentIdx */, m2::PointD(3, 0), *m_graph),
+                   MakeFakeEnding(11, 0, m2::PointD(0, 3), *m_graph), {}, *this);
 }
 
 UNIT_CLASS_TEST(RestrictionTest, TwoSquaresGraph_RestrictionF10F3Only)
 {
   Init(BuildTwoSquaresGraph());
-  RestrictionVec restrictionsOnly = {
-    {10 /* feature from */, 3 /* feature to */}
-  };
+  RestrictionVec restrictionsOnly = {{10 /* feature from */, 3 /* feature to */}};
   RestrictionVec restrictionsNo;
-  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly,
-                              restrictionsNo);
+  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly, restrictionsNo);
 
-  vector<m2::PointD> const expectedGeom = {
-      {3 /* x */, 0 /* y */}, {2, 0}, {1, 0}, {1, 1}, {0, 2}, {0, 3}};
+  vector<m2::PointD> const expectedGeom = {{3 /* x */, 0 /* y */}, {2, 0}, {1, 0}, {1, 1}, {0, 2}, {0, 3}};
 
-  TestRestrictions(
-      expectedGeom, Algorithm::Result::OK,
-      MakeFakeEnding(10 /* featureId */, 0 /* segmentIdx */, m2::PointD(3, 0), *m_graph),
-      MakeFakeEnding(11, 0, m2::PointD(0, 3), *m_graph), std::move(restrictionsNo), *this);
+  TestRestrictions(expectedGeom, Algorithm::Result::OK,
+                   MakeFakeEnding(10 /* featureId */, 0 /* segmentIdx */, m2::PointD(3, 0), *m_graph),
+                   MakeFakeEnding(11, 0, m2::PointD(0, 3), *m_graph), std::move(restrictionsNo), *this);
 }
 
 UNIT_CLASS_TEST(RestrictionTest, TwoSquaresGraph_RestrictionF10F3OnlyF3F4Only)
 {
   Init(BuildTwoSquaresGraph());
-  RestrictionVec restrictionsOnly = {
-    {3 /* feature from */, 4 /* feature to */},
-    {10 /* feature from */, 3 /* feature to */}
-  };
+  RestrictionVec restrictionsOnly = {{3 /* feature from */, 4 /* feature to */},
+                                     {10 /* feature from */, 3 /* feature to */}};
   RestrictionVec restrictionsNo;
-  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly,
-                              restrictionsNo);
+  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly, restrictionsNo);
 
-  vector<m2::PointD> const expectedGeom = {
-      {3 /* x */, 0 /* y */}, {2, 0}, {1, 0}, {0, 0}, {0, 2}, {0, 3}};
+  vector<m2::PointD> const expectedGeom = {{3 /* x */, 0 /* y */}, {2, 0}, {1, 0}, {0, 0}, {0, 2}, {0, 3}};
 
-  TestRestrictions(
-      expectedGeom, Algorithm::Result::OK,
-      MakeFakeEnding(10 /* featureId */, 0 /* segmentIdx */, m2::PointD(3, 0), *m_graph),
-      MakeFakeEnding(11, 0, m2::PointD(0, 3), *m_graph), std::move(restrictionsNo), *this);
+  TestRestrictions(expectedGeom, Algorithm::Result::OK,
+                   MakeFakeEnding(10 /* featureId */, 0 /* segmentIdx */, m2::PointD(3, 0), *m_graph),
+                   MakeFakeEnding(11, 0, m2::PointD(0, 3), *m_graph), std::move(restrictionsNo), *this);
 }
 
 UNIT_CLASS_TEST(RestrictionTest, TwoSquaresGraph_RestrictionF2F8NoRestrictionF9F1Only)
 {
   Init(BuildTwoSquaresGraph());
-  RestrictionVec restrictionsNo = {
-    {2 /* feature from */, 8 /* feature to */}
-  };  // Invalid restriction.
-  RestrictionVec restrictionsOnly = {
-    {9 /* feature from */, 1 /* feature to */}
-  };  // Invalid restriction.
-  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly,
-                              restrictionsNo);
+  RestrictionVec restrictionsNo = {{2 /* feature from */, 8 /* feature to */}};    // Invalid restriction.
+  RestrictionVec restrictionsOnly = {{9 /* feature from */, 1 /* feature to */}};  // Invalid restriction.
+  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly, restrictionsNo);
 
   vector<m2::PointD> const expectedGeom = {{3 /* x */, 0 /* y */}, {2, 0}, {1, 1}, {0, 2}, {0, 3}};
 
-  TestRestrictions(
-      expectedGeom, Algorithm::Result::OK,
-      MakeFakeEnding(10 /* featureId */, 0 /* segmentIdx */, m2::PointD(3, 0), *m_graph),
-      MakeFakeEnding(11, 0, m2::PointD(0, 3), *m_graph), std::move(restrictionsNo), *this);
+  TestRestrictions(expectedGeom, Algorithm::Result::OK,
+                   MakeFakeEnding(10 /* featureId */, 0 /* segmentIdx */, m2::PointD(3, 0), *m_graph),
+                   MakeFakeEnding(11, 0, m2::PointD(0, 3), *m_graph), std::move(restrictionsNo), *this);
 }
 
 // 2      *
@@ -450,9 +401,8 @@ unique_ptr<SingleVehicleWorldGraph> BuildFlagGraph()
 UNIT_TEST(FlagGraph)
 {
   unique_ptr<WorldGraph> graph = BuildFlagGraph();
-  auto starter =
-      MakeStarter(MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *graph),
-                  MakeFakeEnding(6, 0, m2::PointD(0.5, 1), *graph), *graph);
+  auto starter = MakeStarter(MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *graph),
+                             MakeFakeEnding(6, 0, m2::PointD(0.5, 1), *graph), *graph);
   vector<m2::PointD> const expectedGeom = {{2 /* x */, 0 /* y */}, {1, 0}, {1, 1}, {0.5, 1}};
   TestRouteGeometry(*starter, Algorithm::Result::OK, expectedGeom);
 }
@@ -461,54 +411,40 @@ UNIT_TEST(FlagGraph)
 UNIT_CLASS_TEST(RestrictionTest, FlagGraph_RestrictionF0F3No)
 {
   Init(BuildFlagGraph());
-  RestrictionVec restrictionsNo = {
-    {0 /* feature from */, 3 /* feature to */}
-  };
-  vector<m2::PointD> const expectedGeom = {
-      {2 /* x */, 0 /* y */}, {1, 0}, {0, 0}, {0, 1}, {0.5, 1}};
+  RestrictionVec restrictionsNo = {{0 /* feature from */, 3 /* feature to */}};
+  vector<m2::PointD> const expectedGeom = {{2 /* x */, 0 /* y */}, {1, 0}, {0, 0}, {0, 1}, {0.5, 1}};
 
-  TestRestrictions(
-      expectedGeom, Algorithm::Result::OK,
-      MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *m_graph),
-      MakeFakeEnding(6, 0, m2::PointD(0.5, 1), *m_graph), std::move(restrictionsNo), *this);
+  TestRestrictions(expectedGeom, Algorithm::Result::OK,
+                   MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *m_graph),
+                   MakeFakeEnding(6, 0, m2::PointD(0.5, 1), *m_graph), std::move(restrictionsNo), *this);
 }
 
 // Route through flag graph with one restriciton (type only) from F0 to F1.
 UNIT_CLASS_TEST(RestrictionTest, FlagGraph_RestrictionF0F1Only)
 {
   Init(BuildFlagGraph());
-  RestrictionVec restrictionsNo = {
-    {0 /* feature from */, 1 /* feature to */}
-  };
+  RestrictionVec restrictionsNo = {{0 /* feature from */, 1 /* feature to */}};
   vector<m2::PointD> const expectedGeom = {{2 /* x */, 0 /* y */}, {1, 0}, {1, 1}, {0.5, 1}};
 
-  TestRestrictions(
-      expectedGeom, Algorithm::Result::OK,
-      MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *m_graph),
-      MakeFakeEnding(6, 0, m2::PointD(0.5, 1), *m_graph), std::move(restrictionsNo), *this);
+  TestRestrictions(expectedGeom, Algorithm::Result::OK,
+                   MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *m_graph),
+                   MakeFakeEnding(6, 0, m2::PointD(0.5, 1), *m_graph), std::move(restrictionsNo), *this);
 }
 
 UNIT_CLASS_TEST(RestrictionTest, FlagGraph_PermutationsF1F3NoF7F8OnlyF8F4OnlyF4F6Only)
 {
   Init(BuildFlagGraph());
-  RestrictionVec restrictionsNo = {
-    {0 /* feature from */, 3 /* feature to */}
-  };
+  RestrictionVec restrictionsNo = {{0 /* feature from */, 3 /* feature to */}};
 
-  RestrictionVec restrictionsOnly = {
-    {0 /* feature from */, 1 /* feature to */},
-    {1 /* feature from */, 2 /* feature to */}
-  };
+  RestrictionVec restrictionsOnly = {{0 /* feature from */, 1 /* feature to */},
+                                     {1 /* feature from */, 2 /* feature to */}};
 
-  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly,
-                              restrictionsNo);
+  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly, restrictionsNo);
 
-  vector<m2::PointD> const expectedGeom = {
-      {2 /* x */, 0 /* y */}, {1, 0}, {0, 0}, {0, 1}, {0.5, 1}};
-  TestRestrictions(
-      expectedGeom, Algorithm::Result::OK,
-      MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *m_graph),
-      MakeFakeEnding(6, 0, m2::PointD(0.5, 1), *m_graph), std::move(restrictionsNo), *this);
+  vector<m2::PointD> const expectedGeom = {{2 /* x */, 0 /* y */}, {1, 0}, {0, 0}, {0, 1}, {0.5, 1}};
+  TestRestrictions(expectedGeom, Algorithm::Result::OK,
+                   MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *m_graph),
+                   MakeFakeEnding(6, 0, m2::PointD(0.5, 1), *m_graph), std::move(restrictionsNo), *this);
 }
 
 // 1 *-F4-*-F5-*---F6---* Finish
@@ -556,9 +492,8 @@ unique_ptr<SingleVehicleWorldGraph> BuildPosterGraph()
 UNIT_TEST(PosterGraph)
 {
   unique_ptr<WorldGraph> graph = BuildPosterGraph();
-  auto starter =
-      MakeStarter(MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *graph),
-                  MakeFakeEnding(6, 0, m2::PointD(2, 1), *graph), *graph);
+  auto starter = MakeStarter(MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *graph),
+                             MakeFakeEnding(6, 0, m2::PointD(2, 1), *graph), *graph);
   vector<m2::PointD> const expectedGeom = {{2 /* x */, 0 /* y */}, {1, 0}, {1, 1}, {2, 1}};
 
   TestRouteGeometry(*starter, Algorithm::Result::OK, expectedGeom);
@@ -568,16 +503,12 @@ UNIT_TEST(PosterGraph)
 UNIT_CLASS_TEST(RestrictionTest, PosterGraph_RestrictionF0F3No)
 {
   Init(BuildPosterGraph());
-  RestrictionVec restrictionsNo = {
-    {0 /* feature from */, 3 /* feature to */}
-  };
-  vector<m2::PointD> const expectedGeom = {
-      {2 /* x */, 0 /* y */}, {1, 0}, {0, 0}, {0, 1}, {0.5, 1}, {1, 1}, {2, 1}};
+  RestrictionVec restrictionsNo = {{0 /* feature from */, 3 /* feature to */}};
+  vector<m2::PointD> const expectedGeom = {{2 /* x */, 0 /* y */}, {1, 0}, {0, 0}, {0, 1}, {0.5, 1}, {1, 1}, {2, 1}};
 
-  TestRestrictions(
-      expectedGeom, Algorithm::Result::OK,
-      MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *m_graph),
-      MakeFakeEnding(6, 0, m2::PointD(2, 1), *m_graph), std::move(restrictionsNo), *this);
+  TestRestrictions(expectedGeom, Algorithm::Result::OK,
+                   MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *m_graph),
+                   MakeFakeEnding(6, 0, m2::PointD(2, 1), *m_graph), std::move(restrictionsNo), *this);
 }
 
 // Route through poster graph with restrictions F0-F1 (type only).
@@ -585,19 +516,14 @@ UNIT_CLASS_TEST(RestrictionTest, PosterGraph_RestrictionF0F1Only)
 {
   Init(BuildPosterGraph());
 
-  RestrictionVec restrictionsOnly = {
-    {0 /* feature from */, 1 /* feature to */}
-  };
+  RestrictionVec restrictionsOnly = {{0 /* feature from */, 1 /* feature to */}};
   RestrictionVec restrictionsNo;
-  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly,
-                              restrictionsNo);
+  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly, restrictionsNo);
 
-  vector<m2::PointD> const expectedGeom = {
-      {2 /* x */, 0 /* y */}, {1, 0}, {0, 0}, {0, 1}, {0.5, 1}, {1, 1}, {2, 1}};
-  TestRestrictions(
-      expectedGeom, Algorithm::Result::OK,
-      MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *m_graph),
-      MakeFakeEnding(6, 0, m2::PointD(2, 1), *m_graph), std::move(restrictionsNo), *this);
+  vector<m2::PointD> const expectedGeom = {{2 /* x */, 0 /* y */}, {1, 0}, {0, 0}, {0, 1}, {0.5, 1}, {1, 1}, {2, 1}};
+  TestRestrictions(expectedGeom, Algorithm::Result::OK,
+                   MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, m2::PointD(2, 0), *m_graph),
+                   MakeFakeEnding(6, 0, m2::PointD(2, 1), *m_graph), std::move(restrictionsNo), *this);
 }
 
 // 1                        *--F1-->*
@@ -621,12 +547,10 @@ unique_ptr<WorldGraph> BuildTwoWayGraph()
                   RoadGeometry::Points({{-1.0, 0.0}, {0.0, 0.0}}));
 
   vector<Joint> const joints = {
-      MakeJoint(
-          {{0 /* feature id */, 0 /* point id */}, {1, 0}, {3, 1}}), /* joint at point (0, 0) */
-      MakeJoint(
-          {{0 /* feature id */, 2 /* point id */}, {1, 3}, {2, 0}}), /* joint at point (3, 0) */
-      MakeJoint({{3 /* feature id */, 0 /* point id */}}),           /* joint at point (-1, 0) */
-      MakeJoint({{2 /* feature id */, 1 /* point id */}}),           /* joint at point (4, 0) */
+      MakeJoint({{0 /* feature id */, 0 /* point id */}, {1, 0}, {3, 1}}), /* joint at point (0, 0) */
+      MakeJoint({{0 /* feature id */, 2 /* point id */}, {1, 3}, {2, 0}}), /* joint at point (3, 0) */
+      MakeJoint({{3 /* feature id */, 0 /* point id */}}),                 /* joint at point (-1, 0) */
+      MakeJoint({{2 /* feature id */, 1 /* point id */}}),                 /* joint at point (4, 0) */
   };
 
   traffic::TrafficCache const trafficCache;
@@ -637,9 +561,8 @@ unique_ptr<WorldGraph> BuildTwoWayGraph()
 UNIT_TEST(TwoWayGraph)
 {
   unique_ptr<WorldGraph> graph = BuildTwoWayGraph();
-  auto starter =
-      MakeStarter(MakeFakeEnding(3 /* featureId */, 0 /* segmentIdx */, m2::PointD(-1, 0), *graph),
-                  MakeFakeEnding(2, 0, m2::PointD(4, 0), *graph), *graph);
+  auto starter = MakeStarter(MakeFakeEnding(3 /* featureId */, 0 /* segmentIdx */, m2::PointD(-1, 0), *graph),
+                             MakeFakeEnding(2, 0, m2::PointD(4, 0), *graph), *graph);
   vector<m2::PointD> const expectedGeom = {{-1 /* x */, 0 /* y */}, {0, 0}, {1, 0}, {3, 0}, {4, 0}};
 
   TestRouteGeometry(*starter, Algorithm::Result::OK, expectedGeom);
@@ -687,9 +610,8 @@ unique_ptr<SingleVehicleWorldGraph> BuildSquaresGraph()
 UNIT_TEST(SquaresGraph)
 {
   unique_ptr<WorldGraph> graph = BuildSquaresGraph();
-  auto starter =
-      MakeStarter(MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, m2::PointD(3, 0), *graph),
-                  MakeFakeEnding(5, 0, m2::PointD(0, 0), *graph), *graph);
+  auto starter = MakeStarter(MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, m2::PointD(3, 0), *graph),
+                             MakeFakeEnding(5, 0, m2::PointD(0, 0), *graph), *graph);
   vector<m2::PointD> const expectedGeom = {{3 /* x */, 0 /* y */}, {2, 0}, {1, 0}, {0, 0}};
   TestRouteGeometry(*starter, Algorithm::Result::OK, expectedGeom);
 }
@@ -698,21 +620,15 @@ UNIT_CLASS_TEST(RestrictionTest, SquaresGraph_RestrictionF0F1OnlyF1F5Only)
 {
   Init(BuildSquaresGraph());
   RestrictionVec restrictionsNo;
-  RestrictionVec restrictionsOnly = {
-    {0 /* feature from */, 3 /* feature to */}
-  };
+  RestrictionVec restrictionsOnly = {{0 /* feature from */, 3 /* feature to */}};
 
-  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly,
-                              restrictionsNo);
+  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly, restrictionsNo);
 
-  vector<m2::PointD> const expectedGeom = {
-    {3.0, 0.0}, {2.0, 0.0}, {2.0, 1.0}, {1.0, 1.0}, {1.0, 0.0}, {0.0, 0.0}
-  };
+  vector<m2::PointD> const expectedGeom = {{3.0, 0.0}, {2.0, 0.0}, {2.0, 1.0}, {1.0, 1.0}, {1.0, 0.0}, {0.0, 0.0}};
 
-  TestRestrictions(
-      expectedGeom, Algorithm::Result::OK,
-      MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, m2::PointD(3, 0), *m_graph),
-      MakeFakeEnding(5, 0, m2::PointD(0, 0), *m_graph), std::move(restrictionsNo), *this);
+  TestRestrictions(expectedGeom, Algorithm::Result::OK,
+                   MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, m2::PointD(3, 0), *m_graph),
+                   MakeFakeEnding(5, 0, m2::PointD(0, 0), *m_graph), std::move(restrictionsNo), *this);
 }
 
 // 0 Start *--F0--->*<--F1---*---F1---*---F1--->*---F2-->* Finish
@@ -746,16 +662,12 @@ unique_ptr<SingleVehicleWorldGraph> BuildLineGraph()
 UNIT_CLASS_TEST(RestrictionTest, LineGraph_RestrictionF1F1No)
 {
   Init(BuildLineGraph());
-  RestrictionVec restrictionsNo = {
-    {1 /* feature from */, 1 /* feature to */}
-  };
-  vector<m2::PointD> const expectedGeom = {
-      {0 /* x */, 0 /* y */}, {1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0}};
+  RestrictionVec restrictionsNo = {{1 /* feature from */, 1 /* feature to */}};
+  vector<m2::PointD> const expectedGeom = {{0 /* x */, 0 /* y */}, {1, 0}, {2, 0}, {3, 0}, {4, 0}, {5, 0}};
 
-  TestRestrictions(
-      expectedGeom, Algorithm::Result::OK,
-      MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, m2::PointD(0, 0), *m_graph),
-      MakeFakeEnding(2, 0, m2::PointD(5, 0), *m_graph), std::move(restrictionsNo), *this);
+  TestRestrictions(expectedGeom, Algorithm::Result::OK,
+                   MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, m2::PointD(0, 0), *m_graph),
+                   MakeFakeEnding(2, 0, m2::PointD(5, 0), *m_graph), std::move(restrictionsNo), *this);
 }
 
 // 2 *---F2-->*
@@ -798,18 +710,14 @@ UNIT_CLASS_TEST(RestrictionTest, FGraph_RestrictionF0F2Only)
 {
   Init(BuildFGraph());
   RestrictionVec restrictionsNo;
-  RestrictionVec restrictionsOnly = {
-    {0 /* feature from */, 2 /* feature to */}
-  };
-  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly,
-                              restrictionsNo);
+  RestrictionVec restrictionsOnly = {{0 /* feature from */, 2 /* feature to */}};
+  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly, restrictionsNo);
 
   vector<m2::PointD> const expectedGeom = {{0 /* x */, 0 /* y */}, {0, 1}, {1, 1}};
 
-  TestRestrictions(
-      expectedGeom, Algorithm::Result::OK,
-      MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, m2::PointD(0, 0), *m_graph),
-      MakeFakeEnding(1, 0, m2::PointD(1, 1), *m_graph), std::move(restrictionsNo), *this);
+  TestRestrictions(expectedGeom, Algorithm::Result::OK,
+                   MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, m2::PointD(0, 0), *m_graph),
+                   MakeFakeEnding(1, 0, m2::PointD(1, 1), *m_graph), std::move(restrictionsNo), *this);
 }
 
 /// @todo By VNG: no-pass-through behaviour was changed.
@@ -820,8 +728,7 @@ UNIT_CLASS_TEST(RestrictionTest, FGraph_RestrictionF0F2Only)
 //                  |        |
 // 0 Start *---F0---*---F1---*---F2---* Finish
 //         0        1        2        3
-unique_ptr<SingleVehicleWorldGraph> BuildNonPassThroughGraph(bool passThroughStart,
-                                                             bool passThroughShortWay,
+unique_ptr<SingleVehicleWorldGraph> BuildNonPassThroughGraph(bool passThroughStart, bool passThroughShortWay,
                                                              bool passThroughLongWay)
 {
   unique_ptr<TestGeometryLoader> loader = make_unique<TestGeometryLoader>();
@@ -875,7 +782,7 @@ UNIT_CLASS_TEST(RestrictionTest, NonPassThroughShortWay)
   SetStarter(MakeFakeEnding(0 /* featureId */, 0 /* segmentIdx */, m2::PointD(0, 0), *m_graph),
              MakeFakeEnding(2, 0, m2::PointD(3, 0), *m_graph));
 
-  //vector<m2::PointD> const expectedGeom = {{0 /* x */, 0 /* y */}, {1, 0}, {1, 1}, {2, 1}, {2, 0}, {3, 0}};
+  // vector<m2::PointD> const expectedGeom = {{0 /* x */, 0 /* y */}, {1, 0}, {1, 1}, {2, 1}, {2, 0}, {3, 0}};
   vector<m2::PointD> const expectedGeom = {{0 /* x */, 0 /* y */}, {1, 0}, {2, 0}, {3, 0}};
   TestRouteGeometry(*m_starter, Algorithm::Result::OK, expectedGeom);
 }
@@ -938,16 +845,16 @@ unique_ptr<SingleVehicleWorldGraph> BuildTwoCubeGraph1()
                   RoadGeometry::Points({{2.0, 1.0}, {3.0, 1.0}}));
 
   vector<Joint> const joints = {
-    // {{/* feature id */, /* point id */}, ... }
-    MakeJoint({{7, 0}}),                 /* joint at point (-1, 0) */
-    MakeJoint({{0, 0}, {6, 0}, {7, 1}}), /* joint at point (0, 0) */
-    MakeJoint({{0, 1}, {1, 0}}),         /* joint at point (1, 0) */
-    MakeJoint({{1, 1}, {2, 0}}),         /* joint at point (2, 0) */
-    MakeJoint({{2, 1}, {3, 1}, {8, 0}}), /* joint at point (2, 1) */
-    MakeJoint({{3, 0}, {4, 1}}),         /* joint at point (1, 1) */
-    MakeJoint({{5, 1}, {4, 0}}),         /* joint at point (0, 2) */
-    MakeJoint({{6, 1}, {5, 0}}),         /* joint at point (-1, 1) */
-    MakeJoint({{8, 1}}),                 /* joint at point (3, 1) */
+      // {{/* feature id */, /* point id */}, ... }
+      MakeJoint({{7, 0}}),                 /* joint at point (-1, 0) */
+      MakeJoint({{0, 0}, {6, 0}, {7, 1}}), /* joint at point (0, 0) */
+      MakeJoint({{0, 1}, {1, 0}}),         /* joint at point (1, 0) */
+      MakeJoint({{1, 1}, {2, 0}}),         /* joint at point (2, 0) */
+      MakeJoint({{2, 1}, {3, 1}, {8, 0}}), /* joint at point (2, 1) */
+      MakeJoint({{3, 0}, {4, 1}}),         /* joint at point (1, 1) */
+      MakeJoint({{5, 1}, {4, 0}}),         /* joint at point (0, 2) */
+      MakeJoint({{6, 1}, {5, 0}}),         /* joint at point (-1, 1) */
+      MakeJoint({{8, 1}}),                 /* joint at point (3, 1) */
   };
 
   traffic::TrafficCache const trafficCache;
@@ -993,17 +900,17 @@ unique_ptr<SingleVehicleWorldGraph> BuildTwoCubeGraph2()
                   RoadGeometry::Points({{3.0, 1.0}, {4.0, 1.0}}));
 
   vector<Joint> const joints = {
-    // {{/* feature id */, /* point id */}, ... }
-    MakeJoint({{7, 0}}),                 /* joint at point (-1, 0) */
-    MakeJoint({{0, 0}, {6, 0}, {7, 1}}), /* joint at point (0, 0) */
-    MakeJoint({{0, 1}, {1, 0}}),          /* joint at point (1, 0) */
-    MakeJoint({{1, 1}, {2, 0}, {9, 0}}),  /* joint at point (2, 0) */
-    MakeJoint({{2, 1}, {3, 1}, {8, 0}}),  /* joint at point (2, 1) */
-    MakeJoint({{3, 0}, {4, 1}}),          /* joint at point (1, 1) */
-    MakeJoint({{5, 1}, {4, 0}}),          /* joint at point (0, 2) */
-    MakeJoint({{6, 1}, {5, 0}}),          /* joint at point (-1, 1) */
-    MakeJoint({{8, 1}, {9, 1}, {10, 0}}), /* joint at point (3, 1) */
-    MakeJoint({{10, 1}})                  /* joint at point (4, 1) */
+      // {{/* feature id */, /* point id */}, ... }
+      MakeJoint({{7, 0}}),                  /* joint at point (-1, 0) */
+      MakeJoint({{0, 0}, {6, 0}, {7, 1}}),  /* joint at point (0, 0) */
+      MakeJoint({{0, 1}, {1, 0}}),          /* joint at point (1, 0) */
+      MakeJoint({{1, 1}, {2, 0}, {9, 0}}),  /* joint at point (2, 0) */
+      MakeJoint({{2, 1}, {3, 1}, {8, 0}}),  /* joint at point (2, 1) */
+      MakeJoint({{3, 0}, {4, 1}}),          /* joint at point (1, 1) */
+      MakeJoint({{5, 1}, {4, 0}}),          /* joint at point (0, 2) */
+      MakeJoint({{6, 1}, {5, 0}}),          /* joint at point (-1, 1) */
+      MakeJoint({{8, 1}, {9, 1}, {10, 0}}), /* joint at point (3, 1) */
+      MakeJoint({{10, 1}})                  /* joint at point (4, 1) */
   };
 
   traffic::TrafficCache const trafficCache;
@@ -1017,25 +924,20 @@ UNIT_CLASS_TEST(RestrictionTest, RestrictionNoWithWayAsVia_1)
 
   m2::PointD const start(-1.0, 0.0);
   m2::PointD const finish(3.0, 1.0);
-  auto const test = [&](vector<m2::PointD> const & expectedGeom, RestrictionVec && restrictionsNo) {
+  auto const test = [&](vector<m2::PointD> const & expectedGeom, RestrictionVec && restrictionsNo)
+  {
     TestRestrictions(
-      expectedGeom, Algorithm::Result::OK,
-      MakeFakeEnding(7 /* featureId */, 0 /* segmentIdx */, start, *m_graph),
-      MakeFakeEnding(8 /* featureId */, 0 /* segmentIdx */, finish, *m_graph),
-      std::move(restrictionsNo), *this);
+        expectedGeom, Algorithm::Result::OK, MakeFakeEnding(7 /* featureId */, 0 /* segmentIdx */, start, *m_graph),
+        MakeFakeEnding(8 /* featureId */, 0 /* segmentIdx */, finish, *m_graph), std::move(restrictionsNo), *this);
   };
 
   // Can not go from |0| to |2| via |1|
-  RestrictionVec restrictionsNo = {
-    {0 /* feature 0 */, 1 /* feature 1 */, 2 /* feature 2 */}
-  };
+  RestrictionVec restrictionsNo = {{0 /* feature 0 */, 1 /* feature 1 */, 2 /* feature 2 */}};
 
   // Check that without restrictions we can find path better.
-  test({start, {0.0, 0.0}, {-1.0, 1.0}, {0.0, 2.0}, {1.0, 1.0}, {2.0, 1.0}, finish},
-       std::move(restrictionsNo));
+  test({start, {0.0, 0.0}, {-1.0, 1.0}, {0.0, 2.0}, {1.0, 1.0}, {2.0, 1.0}, finish}, std::move(restrictionsNo));
 
-  test({start, {0.0, 0.0}, {1.0, 0.0}, {2.0, 0.0}, {2.0, 1.0}, finish},
-       RestrictionVec());
+  test({start, {0.0, 0.0}, {1.0, 0.0}, {2.0, 0.0}, {2.0, 1.0}, finish}, RestrictionVec());
 }
 
 UNIT_CLASS_TEST(RestrictionTest, RestrictionNoWithWayAsVia_2)
@@ -1044,25 +946,20 @@ UNIT_CLASS_TEST(RestrictionTest, RestrictionNoWithWayAsVia_2)
 
   m2::PointD const start(-1.0, 0.0);
   m2::PointD const finish(4.0, 1.0);
-  auto const test = [&](vector<m2::PointD> const & expectedGeom, RestrictionVec && restrictionsNo) {
+  auto const test = [&](vector<m2::PointD> const & expectedGeom, RestrictionVec && restrictionsNo)
+  {
     TestRestrictions(
-      expectedGeom, Algorithm::Result::OK,
-      MakeFakeEnding(7 /* featureId */, 0 /* segmentIdx */, start, *m_graph),
-      MakeFakeEnding(10 /* featureId */, 0 /* segmentIdx */, finish, *m_graph),
-      std::move(restrictionsNo), *this);
+        expectedGeom, Algorithm::Result::OK, MakeFakeEnding(7 /* featureId */, 0 /* segmentIdx */, start, *m_graph),
+        MakeFakeEnding(10 /* featureId */, 0 /* segmentIdx */, finish, *m_graph), std::move(restrictionsNo), *this);
   };
 
   // Can go from |0| to |9| only via |1|
-  RestrictionVec restrictionsNo = {
-    {0 /* feature 0 */, 1 /* feature 1 */, 9 /* feature 2 */}
-  };
+  RestrictionVec restrictionsNo = {{0 /* feature 0 */, 1 /* feature 1 */, 9 /* feature 2 */}};
 
   // Check that without restrictions we can find path better.
-  test({start, {0.0, 0.0}, {1.0, 0.0}, {2.0, 0.0}, {2.0, 1.0}, {3.0, 1.0}, finish},
-       std::move(restrictionsNo));
+  test({start, {0.0, 0.0}, {1.0, 0.0}, {2.0, 0.0}, {2.0, 1.0}, {3.0, 1.0}, finish}, std::move(restrictionsNo));
 
-  test({start, {0.0, 0.0}, {1.0, 0.0}, {2.0, 0.0}, {3.0, 1.0}, finish},
-       RestrictionVec());
+  test({start, {0.0, 0.0}, {1.0, 0.0}, {2.0, 0.0}, {3.0, 1.0}, finish}, RestrictionVec());
 }
 
 UNIT_CLASS_TEST(RestrictionTest, RestrictionOnlyWithWayAsVia_1)
@@ -1071,21 +968,17 @@ UNIT_CLASS_TEST(RestrictionTest, RestrictionOnlyWithWayAsVia_1)
 
   m2::PointD const start(-1.0, 0.0);
   m2::PointD const finish(4.0, 1.0);
-  auto const test = [&](vector<m2::PointD> const & expectedGeom, RestrictionVec && restrictionsNo) {
+  auto const test = [&](vector<m2::PointD> const & expectedGeom, RestrictionVec && restrictionsNo)
+  {
     TestRestrictions(
-      expectedGeom, Algorithm::Result::OK,
-      MakeFakeEnding(7 /* featureId */, 0 /* segmentIdx */, start, *m_graph),
-      MakeFakeEnding(10 /* featureId */, 0 /* segmentIdx */, finish, *m_graph),
-      std::move(restrictionsNo), *this);
+        expectedGeom, Algorithm::Result::OK, MakeFakeEnding(7 /* featureId */, 0 /* segmentIdx */, start, *m_graph),
+        MakeFakeEnding(10 /* featureId */, 0 /* segmentIdx */, finish, *m_graph), std::move(restrictionsNo), *this);
   };
 
   RestrictionVec restrictionsNo;
   // Can go from |0| to |2| only via |1|
-  RestrictionVec restrictionsOnly = {
-    {0 /* feature 0 */, 1 /* feature 1 */, 2 /* feature 2 */}
-  };
-  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly,
-                              restrictionsNo);
+  RestrictionVec restrictionsOnly = {{0 /* feature 0 */, 1 /* feature 1 */, 2 /* feature 2 */}};
+  ConvertRestrictionsOnlyToNo(m_graph->GetIndexGraphForTests(kTestNumMwmId), restrictionsOnly, restrictionsNo);
 
   // Check that without restrictions we can find path better.
   test({start, {0, 0}, {1, 0}, {2, 0}, {2, 1}, {3, 1}, finish}, std::move(restrictionsNo));
diff --git a/libs/routing/routing_tests/road_access_test.cpp b/libs/routing/routing_tests/road_access_test.cpp
index 790efbb2b..629f8334f 100644
--- a/libs/routing/routing_tests/road_access_test.cpp
+++ b/libs/routing/routing_tests/road_access_test.cpp
@@ -53,77 +53,77 @@ void FillRoadAccessBySample_2(RoadAccess & roadAccess)
   roadAccess.SetAccess(std::move(wayToAccess), std::move(pointToAccess));
 }
 
-//void FillRoadAccessBySampleConditional_1(RoadAccess & roadAccess)
+// void FillRoadAccessBySampleConditional_1(RoadAccess & roadAccess)
 //{
-//  std::vector<std::string> const openingHoursStrings = {
-//      "Mo-Su", "10:00-18:00", "Mo-Fr 10:00-14:00", "09:00-13:00", "Apr - May", "2010 - 2100"};
+//   std::vector<std::string> const openingHoursStrings = {
+//       "Mo-Su", "10:00-18:00", "Mo-Fr 10:00-14:00", "09:00-13:00", "Apr - May", "2010 - 2100"};
 //
-//  std::vector<osmoh::OpeningHours> openingHours;
-//  for (auto const & oh : openingHoursStrings)
-//  {
-//    openingHours.emplace_back(oh);
-//    TEST(openingHours.back().IsValid(), ());
-//  }
+//   std::vector<osmoh::OpeningHours> openingHours;
+//   for (auto const & oh : openingHoursStrings)
+//   {
+//     openingHours.emplace_back(oh);
+//     TEST(openingHours.back().IsValid(), ());
+//   }
 //
-//  RoadAccess::Conditional conditional_1;
-//  conditional_1.Insert(RoadAccess::Type::No, std::move(openingHours[0]));
-//  conditional_1.Insert(RoadAccess::Type::Private, std::move(openingHours[1]));
+//   RoadAccess::Conditional conditional_1;
+//   conditional_1.Insert(RoadAccess::Type::No, std::move(openingHours[0]));
+//   conditional_1.Insert(RoadAccess::Type::Private, std::move(openingHours[1]));
 //
-//  RoadAccess::Conditional conditional_2;
-//  conditional_2.Insert(RoadAccess::Type::Destination, std::move(openingHours[2]));
+//   RoadAccess::Conditional conditional_2;
+//   conditional_2.Insert(RoadAccess::Type::Destination, std::move(openingHours[2]));
 //
-//  RoadAccess::Conditional conditional_3;
-//  conditional_3.Insert(RoadAccess::Type::No, std::move(openingHours[4]));
-//  conditional_3.Insert(RoadAccess::Type::Destination, std::move(openingHours[3]));
+//   RoadAccess::Conditional conditional_3;
+//   conditional_3.Insert(RoadAccess::Type::No, std::move(openingHours[4]));
+//   conditional_3.Insert(RoadAccess::Type::Destination, std::move(openingHours[3]));
 //
-//  RoadAccess::Conditional conditional_4;
-//  conditional_4.Insert(RoadAccess::Type::Destination, std::move(openingHours[5]));
+//   RoadAccess::Conditional conditional_4;
+//   conditional_4.Insert(RoadAccess::Type::Destination, std::move(openingHours[5]));
 //
-//  RoadAccess::WayToAccessConditional wayToAccessConditional = {{1 /* featureId */, conditional_1},
-//                                                               {2 /* featureId */, conditional_2}};
+//   RoadAccess::WayToAccessConditional wayToAccessConditional = {{1 /* featureId */, conditional_1},
+//                                                                {2 /* featureId */, conditional_2}};
 //
-//  RoadAccess::PointToAccessConditional pointToAccessConditional = {
-//      {RoadPoint(3 /* featureId */, 0 /* pointId */), conditional_3},
-//      {RoadPoint(4 /* featureId */, 7 /* pointId */), conditional_4}};
+//   RoadAccess::PointToAccessConditional pointToAccessConditional = {
+//       {RoadPoint(3 /* featureId */, 0 /* pointId */), conditional_3},
+//       {RoadPoint(4 /* featureId */, 7 /* pointId */), conditional_4}};
 //
-//  roadAccess.SetAccessConditional(std::move(wayToAccessConditional), std::move(pointToAccessConditional));
-//}
+//   roadAccess.SetAccessConditional(std::move(wayToAccessConditional), std::move(pointToAccessConditional));
+// }
 //
-//void FillRoadAccessBySampleConditional_2(RoadAccess & roadAccess)
+// void FillRoadAccessBySampleConditional_2(RoadAccess & roadAccess)
 //{
-//  std::vector<std::string> const openingHoursStrings = {
-//      "Mo", "Apr-May 03:00-04:25", "Mo-Sa 12:00-13:00", "2010-2098", "Nov-Apr", "19:00-21:00"};
+//   std::vector<std::string> const openingHoursStrings = {
+//       "Mo", "Apr-May 03:00-04:25", "Mo-Sa 12:00-13:00", "2010-2098", "Nov-Apr", "19:00-21:00"};
 //
-//  std::vector<osmoh::OpeningHours> openingHours;
-//  for (auto const & oh : openingHoursStrings)
-//  {
-//    openingHours.emplace_back(oh);
-//    TEST(openingHours.back().IsValid(), (oh));
-//  }
+//   std::vector<osmoh::OpeningHours> openingHours;
+//   for (auto const & oh : openingHoursStrings)
+//   {
+//     openingHours.emplace_back(oh);
+//     TEST(openingHours.back().IsValid(), (oh));
+//   }
 //
-//  RoadAccess::Conditional conditional_1;
-//  conditional_1.Insert(RoadAccess::Type::Private, std::move(openingHours[0]));
+//   RoadAccess::Conditional conditional_1;
+//   conditional_1.Insert(RoadAccess::Type::Private, std::move(openingHours[0]));
 //
-//  RoadAccess::Conditional conditional_2;
-//  conditional_2.Insert(RoadAccess::Type::No, std::move(openingHours[1]));
-//  conditional_2.Insert(RoadAccess::Type::Private, std::move(openingHours[2]));
+//   RoadAccess::Conditional conditional_2;
+//   conditional_2.Insert(RoadAccess::Type::No, std::move(openingHours[1]));
+//   conditional_2.Insert(RoadAccess::Type::Private, std::move(openingHours[2]));
 //
-//  RoadAccess::Conditional conditional_3;
-//  conditional_3.Insert(RoadAccess::Type::Destination, std::move(openingHours[3]));
+//   RoadAccess::Conditional conditional_3;
+//   conditional_3.Insert(RoadAccess::Type::Destination, std::move(openingHours[3]));
 //
-//  RoadAccess::Conditional conditional_4;
-//  conditional_4.Insert(RoadAccess::Type::No, std::move(openingHours[4]));
-//  conditional_4.Insert(RoadAccess::Type::No, std::move(openingHours[5]));
+//   RoadAccess::Conditional conditional_4;
+//   conditional_4.Insert(RoadAccess::Type::No, std::move(openingHours[4]));
+//   conditional_4.Insert(RoadAccess::Type::No, std::move(openingHours[5]));
 //
-//  RoadAccess::WayToAccessConditional wayToAccessConditional = {{1 /* featureId */, conditional_1},
-//                                                               {2 /* featureId */, conditional_2}};
+//   RoadAccess::WayToAccessConditional wayToAccessConditional = {{1 /* featureId */, conditional_1},
+//                                                                {2 /* featureId */, conditional_2}};
 //
-//  RoadAccess::PointToAccessConditional pointToAccessConditional = {
-//      {RoadPoint(3 /* featureId */, 10 /* pointId */), conditional_3},
-//      {RoadPoint(4 /* featureId */, 2 /* pointId */), conditional_4}};
+//   RoadAccess::PointToAccessConditional pointToAccessConditional = {
+//       {RoadPoint(3 /* featureId */, 10 /* pointId */), conditional_3},
+//       {RoadPoint(4 /* featureId */, 2 /* pointId */), conditional_4}};
 //
-//  roadAccess.SetAccessConditional(std::move(wayToAccessConditional), std::move(pointToAccessConditional));
-//}
+//   roadAccess.SetAccessConditional(std::move(wayToAccessConditional), std::move(pointToAccessConditional));
+// }
 
 class RoadAccessSerDesTest
 {
@@ -170,7 +170,7 @@ UNIT_CLASS_TEST(RoadAccessSerDesTest, RoadAccess_Serdes)
 // @TODO Tests below and functions FillRoadAccessBySampleConditional_1 and
 // FillRoadAccessBySampleConditional_2 should be uncommented when access:conditional is
 // switched on.
-//UNIT_CLASS_TEST(RoadAccessSerDesTest, RoadAccess_Serdes_Conditional_One_Vehicle)
+// UNIT_CLASS_TEST(RoadAccessSerDesTest, RoadAccess_Serdes_Conditional_One_Vehicle)
 //{
 //  auto constexpr kVehicleTypeCount = static_cast<size_t>(VehicleType::Count);
 //  for (size_t vehicleTypeId = 0; vehicleTypeId < kVehicleTypeCount; ++vehicleTypeId)
@@ -187,7 +187,7 @@ UNIT_CLASS_TEST(RoadAccessSerDesTest, RoadAccess_Serdes)
 //  }
 //}
 //
-//UNIT_CLASS_TEST(RoadAccessSerDesTest, RoadAccess_Serdes_Conditional_Several_Vehicles)
+// UNIT_CLASS_TEST(RoadAccessSerDesTest, RoadAccess_Serdes_Conditional_Several_Vehicles)
 //{
 //  RoadAccess roadAccessCar;
 //  FillRoadAccessBySampleConditional_1(roadAccessCar);
@@ -204,7 +204,7 @@ UNIT_CLASS_TEST(RoadAccessSerDesTest, RoadAccess_Serdes)
 //  TestDeserialize(VehicleType::Pedestrian, roadAccessPedestrian);
 //}
 //
-//UNIT_CLASS_TEST(RoadAccessSerDesTest, RoadAccess_Serdes_Conditional_Mixed_Several_Vehicles)
+// UNIT_CLASS_TEST(RoadAccessSerDesTest, RoadAccess_Serdes_Conditional_Mixed_Several_Vehicles)
 //{
 //  RoadAccess roadAccessCar;
 //  FillRoadAccessBySampleConditional_1(roadAccessCar);
@@ -350,68 +350,61 @@ UNIT_TEST(RoadAccess_WayBlockedConditional)
 
   double expectedWeight = 3.0;
   vector<TestEdge> expectedEdges = {{0, 1}, {1, 2}, {2, 3}};
-  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
-                    expectedEdges);
+  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight, expectedEdges);
 
   graph.SetEdgeAccessConditional(1, 2, RoadAccess::Type::No, "Jan - Jul");
 
-  auto const april = []() {
-    return GetUnixtimeByDate(2020, Month::Apr, 1, 12 /* hh */, 00 /* mm */);
-  };
+  auto const april = []() { return GetUnixtimeByDate(2020, Month::Apr, 1, 12 /* hh */, 00 /* mm */); };
 
   graph.SetCurrentTimeGetter(april);
   expectedWeight = 0;
   expectedEdges = {};
-  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, false /* pathFound */, expectedWeight,
-                    expectedEdges);
+  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, false /* pathFound */, expectedWeight, expectedEdges);
 
-  auto const november = []() {
-    return GetUnixtimeByDate(2020, Month::Nov, 1, 12 /* hh */, 00 /* mm */);
-  };
+  auto const november = []() { return GetUnixtimeByDate(2020, Month::Nov, 1, 12 /* hh */, 00 /* mm */); };
 
   graph.SetCurrentTimeGetter(november);
   expectedWeight = 3.0;
   expectedEdges = {{0, 1}, {1, 2}, {2, 3}};
-  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
-                    expectedEdges);
+  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight, expectedEdges);
 }
 
-//UNIT_TEST(RoadAccess_PointBlockedConditional)
+// UNIT_TEST(RoadAccess_PointBlockedConditional)
 //{
-//  uint32_t const numVertices = 4;
-//  TestIndexGraphTopology graph(numVertices);
+//   uint32_t const numVertices = 4;
+//   TestIndexGraphTopology graph(numVertices);
 //
-//  graph.AddDirectedEdge(0, 1, 1.0);
-//  graph.AddDirectedEdge(1, 2, 1.0);
-//  graph.AddDirectedEdge(2, 3, 1.0);
+//   graph.AddDirectedEdge(0, 1, 1.0);
+//   graph.AddDirectedEdge(1, 2, 1.0);
+//   graph.AddDirectedEdge(2, 3, 1.0);
 //
-//  double expectedWeight = 3.0;
-//  vector<TestEdge> expectedEdges = {{0, 1}, {1, 2}, {2, 3}};
-//  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
-//                    expectedEdges);
+//   double expectedWeight = 3.0;
+//   vector<TestEdge> expectedEdges = {{0, 1}, {1, 2}, {2, 3}};
+//   TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
+//                     expectedEdges);
 //
-//  graph.SetVertexAccessConditional(1, RoadAccess::Type::No, "Jan - Jul");
+//   graph.SetVertexAccessConditional(1, RoadAccess::Type::No, "Jan - Jul");
 //
-//  auto const april = []() {
-//    return GetUnixtimeByDate(2020, Month::Apr, 1, 12 /* hh */, 00 /* mm */);
-//  };
+//   auto const april = []() {
+//     return GetUnixtimeByDate(2020, Month::Apr, 1, 12 /* hh */, 00 /* mm */);
+//   };
 //
-//  graph.SetCurrentTimeGetter(april);
-//  expectedWeight = 0;
-//  expectedEdges = {};
-//  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, false /* pathFound */, expectedWeight,
-//                    expectedEdges);
+//   graph.SetCurrentTimeGetter(april);
+//   expectedWeight = 0;
+//   expectedEdges = {};
+//   TestTopologyGraph(graph, 0 /* from */, 3 /* to */, false /* pathFound */, expectedWeight,
+//                     expectedEdges);
 //
-//  auto const november = []() {
-//    return GetUnixtimeByDate(2020, Month::Nov, 1, 12 /* hh */, 00 /* mm */);
-//  };
+//   auto const november = []() {
+//     return GetUnixtimeByDate(2020, Month::Nov, 1, 12 /* hh */, 00 /* mm */);
+//   };
 //
-//  graph.SetCurrentTimeGetter(november);
-//  expectedWeight = 3.0;
-//  expectedEdges = {{0, 1}, {1, 2}, {2, 3}};
-//  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
-//                    expectedEdges);
-//}
+//   graph.SetCurrentTimeGetter(november);
+//   expectedWeight = 3.0;
+//   expectedEdges = {{0, 1}, {1, 2}, {2, 3}};
+//   TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
+//                     expectedEdges);
+// }
 
 UNIT_TEST(RoadAccess_WayBlockedAvoidConditional)
 {
@@ -425,22 +418,19 @@ UNIT_TEST(RoadAccess_WayBlockedAvoidConditional)
 
   double expectedWeight = 2.0;
   vector<TestEdge> expectedEdges = {{0, 1}, {1, 3}};
-  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
-                    expectedEdges);
+  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight, expectedEdges);
 
   graph.SetEdgeAccessConditional(0, 1, RoadAccess::Type::No, "Mo-Fr 10:00 - 19:00");
 
-  auto const mondayAlmostTenHours = []() {
-    return GetUnixtimeByDate(2020, Month::Apr, Weekday::Monday, 9 /* hh */, 50 /* mm */);
-  };
+  auto const mondayAlmostTenHours = []()
+  { return GetUnixtimeByDate(2020, Month::Apr, Weekday::Monday, 9 /* hh */, 50 /* mm */); };
 
   // In this time we probably will able to pass 0->1 edge, but we are not sure, so we should avoid
   // such edges.
   graph.SetCurrentTimeGetter(mondayAlmostTenHours);
   expectedWeight = 20.0;
   expectedEdges = {{0, 2}, {2, 3}};
-  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
-                    expectedEdges);
+  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight, expectedEdges);
 
   graph.SetEdgeAccess(0, 2, RoadAccess::Type::No);
 
@@ -448,72 +438,69 @@ UNIT_TEST(RoadAccess_WayBlockedAvoidConditional)
   graph.SetCurrentTimeGetter(mondayAlmostTenHours);
   expectedWeight = 2.0;
   expectedEdges = {{0, 1}, {1, 3}};
-  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
-                    expectedEdges);
+  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight, expectedEdges);
 
-  auto const mondayTwelveHours = []() {
-    return GetUnixtimeByDate(2020, Month::Apr, Weekday::Monday, 12 /* hh */, 00 /* mm */);
-  };
+  auto const mondayTwelveHours = []()
+  { return GetUnixtimeByDate(2020, Month::Apr, Weekday::Monday, 12 /* hh */, 00 /* mm */); };
 
   // But if we sure that in this time edge: 0->1 will be blocked, we definitely should not pass
   // 0->1. In this case no way will be found.
   graph.SetCurrentTimeGetter(mondayTwelveHours);
   expectedWeight = 0.0;
   expectedEdges = {};
-  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, false /* pathFound */, expectedWeight,
-                    expectedEdges);
+  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, false /* pathFound */, expectedWeight, expectedEdges);
 }
 
-//UNIT_TEST(RoadAccess_PointBlockedAvoidConditional)
+// UNIT_TEST(RoadAccess_PointBlockedAvoidConditional)
 //{
-//  uint32_t const numVertices = 4;
-//  TestIndexGraphTopology graph(numVertices);
+//   uint32_t const numVertices = 4;
+//   TestIndexGraphTopology graph(numVertices);
 //
-//  graph.AddDirectedEdge(0, 1, 1.0);
-//  graph.AddDirectedEdge(0, 2, 10.0);
-//  graph.AddDirectedEdge(1, 3, 1.0);
-//  graph.AddDirectedEdge(2, 3, 10.0);
+//   graph.AddDirectedEdge(0, 1, 1.0);
+//   graph.AddDirectedEdge(0, 2, 10.0);
+//   graph.AddDirectedEdge(1, 3, 1.0);
+//   graph.AddDirectedEdge(2, 3, 10.0);
 //
-//  double expectedWeight = 2.0;
-//  vector<TestEdge> expectedEdges = {{0, 1}, {1, 3}};
-//  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
-//                    expectedEdges);
+//   double expectedWeight = 2.0;
+//   vector<TestEdge> expectedEdges = {{0, 1}, {1, 3}};
+//   TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
+//                     expectedEdges);
 //
-//  graph.SetVertexAccessConditional(1, RoadAccess::Type::No, "Mo-Fr 10:00 - 19:00");
+//   graph.SetVertexAccessConditional(1, RoadAccess::Type::No, "Mo-Fr 10:00 - 19:00");
 //
-//  auto const mondayAlmostTenHours = []() {
-//    return GetUnixtimeByDate(2020, Month::Apr, Weekday::Monday, 9 /* hh */, 50 /* mm */);
-//  };
+//   auto const mondayAlmostTenHours = []() {
+//     return GetUnixtimeByDate(2020, Month::Apr, Weekday::Monday, 9 /* hh */, 50 /* mm */);
+//   };
 //
-//  // In this time we probably will able to pass vertex: 1, but we are not sure, so we should avoid
-//  // such edges.
-//  graph.SetCurrentTimeGetter(mondayAlmostTenHours);
-//  expectedWeight = 20.0;
-//  expectedEdges = {{0, 2}, {2, 3}};
-//  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
-//                    expectedEdges);
+//   // In this time we probably will able to pass vertex: 1, but we are not sure, so we should avoid
+//   // such edges.
+//   graph.SetCurrentTimeGetter(mondayAlmostTenHours);
+//   expectedWeight = 20.0;
+//   expectedEdges = {{0, 2}, {2, 3}};
+//   TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
+//                     expectedEdges);
 //
-//  graph.SetEdgeAccess(0, 2, RoadAccess::Type::No);
+//   graph.SetEdgeAccess(0, 2, RoadAccess::Type::No);
 //
-//  // But if this is the only path (we blocked 0->2 above), we should pass through vertex: 1 anyway.
-//  graph.SetCurrentTimeGetter(mondayAlmostTenHours);
-//  expectedWeight = 2.0;
-//  expectedEdges = {{0, 1}, {1, 3}};
-//  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
-//                    expectedEdges);
+//   // But if this is the only path (we blocked 0->2 above), we should pass through vertex: 1 anyway.
+//   graph.SetCurrentTimeGetter(mondayAlmostTenHours);
+//   expectedWeight = 2.0;
+//   expectedEdges = {{0, 1}, {1, 3}};
+//   TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
+//                     expectedEdges);
 //
-//  auto const mondayTwelveHours = []() {
-//    return GetUnixtimeByDate(2020, Month::Apr, Weekday::Monday, 12 /* hh */, 00 /* mm */);
-//  };
+//   auto const mondayTwelveHours = []() {
+//     return GetUnixtimeByDate(2020, Month::Apr, Weekday::Monday, 12 /* hh */, 00 /* mm */);
+//   };
 //
-//  // But if we sure that in this time vertex: 1 will be blocked, we definitely should not pass
-//  // through vertex: 1. In this case no way will be found.
-//  graph.SetCurrentTimeGetter(mondayTwelveHours);
-//  expectedWeight = 0.0;
-//  expectedEdges = {};
-//  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, false /* pathFound */, expectedWeight,
-//                    expectedEdges);
-//}
+//   // But if we sure that in this time vertex: 1 will be blocked, we definitely should not pass
+//   // through vertex: 1. In this case no way will be found.
+//   graph.SetCurrentTimeGetter(mondayTwelveHours);
+//   expectedWeight = 0.0;
+//   expectedEdges = {};
+//   TestTopologyGraph(graph, 0 /* from */, 3 /* to */, false /* pathFound */, expectedWeight,
+//                     expectedEdges);
+// }
 
 UNIT_TEST(RoadAccess_WayBlockedConditional_Yes_No)
 {
@@ -526,74 +513,68 @@ UNIT_TEST(RoadAccess_WayBlockedConditional_Yes_No)
 
   double expectedWeight = 3.0;
   vector<TestEdge> expectedEdges = {{0, 1}, {1, 2}, {2, 3}};
-  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
-                    expectedEdges);
+  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight, expectedEdges);
 
   graph.SetEdgeAccessConditional(1, 2, RoadAccess::Type::No, "Mo-Fr");
   graph.SetEdgeAccessConditional(1, 2, RoadAccess::Type::Yes, "Sa-Su");
 
-  auto const tuesday = []() {
-    return GetUnixtimeByDate(2020, Month::Apr, Weekday::Tuesday, 10 /* hh */, 00 /* mm */);
-  };
+  auto const tuesday = []() { return GetUnixtimeByDate(2020, Month::Apr, Weekday::Tuesday, 10 /* hh */, 00 /* mm */); };
 
   // Way is blocked from Monday to Friday
   graph.SetCurrentTimeGetter(tuesday);
   expectedWeight = 0;
   expectedEdges = {};
-  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, false /* pathFound */, expectedWeight,
-                    expectedEdges);
+  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, false /* pathFound */, expectedWeight, expectedEdges);
 
-  auto const saturday = []() {
-    return GetUnixtimeByDate(2020, Month::Nov, Weekday::Saturday, 10 /* hh */, 00 /* mm */);
-  };
+  auto const saturday = []()
+  { return GetUnixtimeByDate(2020, Month::Nov, Weekday::Saturday, 10 /* hh */, 00 /* mm */); };
 
   // And open from Saturday to Sunday
   graph.SetCurrentTimeGetter(saturday);
   expectedWeight = 3.0;
   expectedEdges = {{0, 1}, {1, 2}, {2, 3}};
-  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
-                    expectedEdges);
+  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight, expectedEdges);
 }
 
-//UNIT_TEST(RoadAccess_PointBlockedConditional_Yes_No)
+// UNIT_TEST(RoadAccess_PointBlockedConditional_Yes_No)
 //{
-//  uint32_t const numVertices = 4;
-//  TestIndexGraphTopology graph(numVertices);
+//   uint32_t const numVertices = 4;
+//   TestIndexGraphTopology graph(numVertices);
 //
-//  graph.AddDirectedEdge(0, 1, 1.0);
-//  graph.AddDirectedEdge(1, 2, 1.0);
-//  graph.AddDirectedEdge(2, 3, 1.0);
+//   graph.AddDirectedEdge(0, 1, 1.0);
+//   graph.AddDirectedEdge(1, 2, 1.0);
+//   graph.AddDirectedEdge(2, 3, 1.0);
 //
-//  double expectedWeight = 3.0;
-//  vector<TestEdge> expectedEdges = {{0, 1}, {1, 2}, {2, 3}};
-//  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
-//                    expectedEdges);
+//   double expectedWeight = 3.0;
+//   vector<TestEdge> expectedEdges = {{0, 1}, {1, 2}, {2, 3}};
+//   TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
+//                     expectedEdges);
 //
-//  graph.SetVertexAccessConditional(1, RoadAccess::Type::No, "Mo-Fr");
-//  graph.SetVertexAccessConditional(1, RoadAccess::Type::Yes, "Sa-Su");
+//   graph.SetVertexAccessConditional(1, RoadAccess::Type::No, "Mo-Fr");
+//   graph.SetVertexAccessConditional(1, RoadAccess::Type::Yes, "Sa-Su");
 //
-//  auto const tuesday = []() {
-//    return GetUnixtimeByDate(2020, Month::Apr, Weekday::Tuesday, 10 /* hh */, 00 /* mm */);
-//  };
+//   auto const tuesday = []() {
+//     return GetUnixtimeByDate(2020, Month::Apr, Weekday::Tuesday, 10 /* hh */, 00 /* mm */);
+//   };
 //
-//  // Way is blocked from Monday to Friday
-//  graph.SetCurrentTimeGetter(tuesday);
-//  expectedWeight = 0;
-//  expectedEdges = {};
-//  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, false /* pathFound */, expectedWeight,
-//                    expectedEdges);
+//   // Way is blocked from Monday to Friday
+//   graph.SetCurrentTimeGetter(tuesday);
+//   expectedWeight = 0;
+//   expectedEdges = {};
+//   TestTopologyGraph(graph, 0 /* from */, 3 /* to */, false /* pathFound */, expectedWeight,
+//                     expectedEdges);
 //
-//  auto const saturday = []() {
-//    return GetUnixtimeByDate(2020, Month::Nov, Weekday::Saturday, 10 /* hh */, 00 /* mm */);
-//  };
+//   auto const saturday = []() {
+//     return GetUnixtimeByDate(2020, Month::Nov, Weekday::Saturday, 10 /* hh */, 00 /* mm */);
+//   };
 //
-//  // And open from Saturday to Sunday
-//  graph.SetCurrentTimeGetter(saturday);
-//  expectedWeight = 3.0;
-//  expectedEdges = {{0, 1}, {1, 2}, {2, 3}};
-//  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
-//                    expectedEdges);
-//}
+//   // And open from Saturday to Sunday
+//   graph.SetCurrentTimeGetter(saturday);
+//   expectedWeight = 3.0;
+//   expectedEdges = {{0, 1}, {1, 2}, {2, 3}};
+//   TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
+//                     expectedEdges);
+// }
 
 UNIT_TEST(RoadAccess_WayBlockedAvoidPrivateConditional)
 {
@@ -607,22 +588,19 @@ UNIT_TEST(RoadAccess_WayBlockedAvoidPrivateConditional)
 
   double expectedWeight = 2.0;
   vector<TestEdge> expectedEdges = {{0, 1}, {1, 3}};
-  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
-                    expectedEdges);
+  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight, expectedEdges);
 
   graph.SetEdgeAccessConditional(0, 1, RoadAccess::Type::Private, "Mo-Fr 19:00 - 23:00");
 
-  auto const mondayAlmostTwentyHalfHours = []() {
-    return GetUnixtimeByDate(2020, Month::Apr, Weekday::Monday, 20 /* hh */, 30 /* mm */);
-  };
+  auto const mondayAlmostTwentyHalfHours = []()
+  { return GetUnixtimeByDate(2020, Month::Apr, Weekday::Monday, 20 /* hh */, 30 /* mm */); };
 
   // We should avoid ways with private accesses. At 20:30 edge: 0->1 definitely has private access,
   // thus the answer is: 0->2->3.
   graph.SetCurrentTimeGetter(mondayAlmostTwentyHalfHours);
   expectedWeight = 20.0;
   expectedEdges = {{0, 2}, {2, 3}};
-  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
-                    expectedEdges);
+  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight, expectedEdges);
 
   graph.SetEdgeAccess(0, 2, RoadAccess::Type::No);
 
@@ -630,8 +608,7 @@ UNIT_TEST(RoadAccess_WayBlockedAvoidPrivateConditional)
   graph.SetCurrentTimeGetter(mondayAlmostTwentyHalfHours);
   expectedWeight = 2.0;
   expectedEdges = {{0, 1}, {1, 3}};
-  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
-                    expectedEdges);
+  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight, expectedEdges);
 }
 
 UNIT_TEST(RoadAccess_WayBlockedAlwaysNoExceptMonday)
@@ -645,28 +622,23 @@ UNIT_TEST(RoadAccess_WayBlockedAlwaysNoExceptMonday)
 
   double expectedWeight = 3.0;
   vector<TestEdge> expectedEdges = {{0, 1}, {1, 2}, {2, 3}};
-  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
-                    expectedEdges);
+  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight, expectedEdges);
 
   // Always access no for edge: 1->2.
   graph.SetEdgeAccess(1, 2, RoadAccess::Type::No);
   expectedWeight = 0;
   expectedEdges = {};
-  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, false /* pathFound */, expectedWeight,
-                    expectedEdges);
+  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, false /* pathFound */, expectedWeight, expectedEdges);
 
   // Except Monday, access yes in this day.
   graph.SetEdgeAccessConditional(1, 2, RoadAccess::Type::Yes, "Mo");
 
-  auto const monday = []() {
-    return GetUnixtimeByDate(2020, Month::Apr, Weekday::Monday, 10 /* hh */, 00 /* mm */);
-  };
+  auto const monday = []() { return GetUnixtimeByDate(2020, Month::Apr, Weekday::Monday, 10 /* hh */, 00 /* mm */); };
 
   graph.SetCurrentTimeGetter(monday);
   expectedWeight = 3.0;
   expectedEdges = {{0, 1}, {1, 2}, {2, 3}};
-  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
-                    expectedEdges);
+  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight, expectedEdges);
 }
 
 UNIT_TEST(RoadAccess_WayBlockedWhenStartButOpenWhenReach)
@@ -686,12 +658,10 @@ UNIT_TEST(RoadAccess_WayBlockedWhenStartButOpenWhenReach)
 
   double expectedWeight = 10804.0;
   vector<TestEdge> expectedEdges = {{0, 1}, {1, 2}, {2, 3}, {3, 4}, {4, 5}};
-  TestTopologyGraph(graph, 0 /* from */, 5 /* to */, true /* pathFound */, expectedWeight,
-                    expectedEdges);
+  TestTopologyGraph(graph, 0 /* from */, 5 /* to */, true /* pathFound */, expectedWeight, expectedEdges);
 
-  auto const startAt_11_50 = []() {
-    return GetUnixtimeByDate(2020, Month::Apr, Weekday::Monday, 11 /* hh */, 50 /* mm */);
-  };
+  auto const startAt_11_50 = []()
+  { return GetUnixtimeByDate(2020, Month::Apr, Weekday::Monday, 11 /* hh */, 50 /* mm */); };
 
   graph.SetCurrentTimeGetter(startAt_11_50);
   // When we will be at |3|, current time should be:
@@ -700,12 +670,10 @@ UNIT_TEST(RoadAccess_WayBlockedWhenStartButOpenWhenReach)
   graph.SetEdgeAccessConditional(3, 4, RoadAccess::Type::No, "10:00 - 13:00");
   expectedWeight = 10804.0;
   expectedEdges = {{0, 1}, {1, 2}, {2, 3}, {3, 4}, {4, 5}};
-  TestTopologyGraph(graph, 0 /* from */, 5 /* to */, true /* pathFound */, expectedWeight,
-                    expectedEdges);
+  TestTopologyGraph(graph, 0 /* from */, 5 /* to */, true /* pathFound */, expectedWeight, expectedEdges);
 
-  auto const startAt_10_50 = []() {
-    return GetUnixtimeByDate(2020, Month::Apr, Weekday::Monday, 10 /* hh */, 50 /* mm */);
-  };
+  auto const startAt_10_50 = []()
+  { return GetUnixtimeByDate(2020, Month::Apr, Weekday::Monday, 10 /* hh */, 50 /* mm */); };
 
   graph.SetCurrentTimeGetter(startAt_10_50);
   // When we will be at |3|, current time should be:
@@ -713,8 +681,7 @@ UNIT_TEST(RoadAccess_WayBlockedWhenStartButOpenWhenReach)
   // dangerous zone, but we are not sure, so we should chose alternative way.
   expectedWeight = 12802.0;
   expectedEdges = {{0, 1}, {1, 2}, {2, 3}, {3, 6}, {6, 5}};
-  TestTopologyGraph(graph, 0 /* from */, 5 /* to */, true /* pathFound */, expectedWeight,
-                    expectedEdges);
+  TestTopologyGraph(graph, 0 /* from */, 5 /* to */, true /* pathFound */, expectedWeight, expectedEdges);
 
   // Block alternative way.
   graph.SetEdgeAccess(3, 6, RoadAccess::Type::No);
@@ -722,12 +689,10 @@ UNIT_TEST(RoadAccess_WayBlockedWhenStartButOpenWhenReach)
   // way.
   expectedWeight = 10804.0;
   expectedEdges = {{0, 1}, {1, 2}, {2, 3}, {3, 4}, {4, 5}};
-  TestTopologyGraph(graph, 0 /* from */, 5 /* to */, true /* pathFound */, expectedWeight,
-                    expectedEdges);
+  TestTopologyGraph(graph, 0 /* from */, 5 /* to */, true /* pathFound */, expectedWeight, expectedEdges);
 
-  auto const startAt_9_00 = []() {
-    return GetUnixtimeByDate(2020, Month::Apr, Weekday::Monday, 9 /* hh */, 00 /* mm */);
-  };
+  auto const startAt_9_00 = []()
+  { return GetUnixtimeByDate(2020, Month::Apr, Weekday::Monday, 9 /* hh */, 00 /* mm */); };
 
   graph.SetCurrentTimeGetter(startAt_9_00);
   // If we start at 9:00:00 we will arrive at |3| at:
@@ -736,7 +701,6 @@ UNIT_TEST(RoadAccess_WayBlockedWhenStartButOpenWhenReach)
   // way) no way should be found.
   expectedWeight = 0.0;
   expectedEdges = {};
-  TestTopologyGraph(graph, 0 /* from */, 5 /* to */, false /* pathFound */, expectedWeight,
-                    expectedEdges);
+  TestTopologyGraph(graph, 0 /* from */, 5 /* to */, false /* pathFound */, expectedWeight, expectedEdges);
 }
-}  // namespace namespace road_access_test
+}  // namespace road_access_test
diff --git a/libs/routing/routing_tests/road_graph_builder.cpp b/libs/routing/routing_tests/road_graph_builder.cpp
index 0113d7327..d3174cc34 100644
--- a/libs/routing/routing_tests/road_graph_builder.cpp
+++ b/libs/routing/routing_tests/road_graph_builder.cpp
@@ -33,10 +33,7 @@ public:
     m_mwmInfo = mwmsInfoList[0];
   }
 
-  FeatureID MakeFeatureID(uint32_t offset) const
-  {
-    return FeatureID(MwmSet::MwmId(m_mwmInfo), offset);
-  }
+  FeatureID MakeFeatureID(uint32_t offset) const { return FeatureID(MwmSet::MwmId(m_mwmInfo), offset); }
 
 private:
   /// @name MwmSet overrides
@@ -71,22 +68,24 @@ IRoadGraph::RoadInfo RoadGraphMockSource::GetRoadInfo(FeatureID const & featureI
   return m_roads[featureId.m_index];
 }
 
-double RoadGraphMockSource::GetSpeedKMpH(FeatureID const & featureId,
-                                         SpeedParams const & /* speedParams */) const
+double RoadGraphMockSource::GetSpeedKMpH(FeatureID const & featureId, SpeedParams const & /* speedParams */) const
 {
   CHECK_LESS(featureId.m_index, m_roads.size(), ("Invalid feature id."));
   return m_roads[featureId.m_index].m_speedKMPH;
 }
 
-double RoadGraphMockSource::GetMaxSpeedKMpH() const { return kMaxSpeedKMpH; }
+double RoadGraphMockSource::GetMaxSpeedKMpH() const
+{
+  return kMaxSpeedKMpH;
+}
 
 void RoadGraphMockSource::ForEachFeatureClosestToCross(m2::PointD const & /* cross */,
                                                        ICrossEdgesLoader & edgesLoader) const
 {
   for (size_t roadId = 0; roadId < m_roads.size(); ++roadId)
   {
-    edgesLoader(MakeTestFeatureID(base::checked_cast<uint32_t>(roadId)), m_roads[roadId]
-        .m_junctions, m_roads[roadId].m_bidirectional);
+    edgesLoader(MakeTestFeatureID(base::checked_cast<uint32_t>(roadId)), m_roads[roadId].m_junctions,
+                m_roads[roadId].m_bidirectional);
   }
 }
 
diff --git a/libs/routing/routing_tests/road_graph_builder.hpp b/libs/routing/routing_tests/road_graph_builder.hpp
index 99bf8cb07..36dd97d76 100644
--- a/libs/routing/routing_tests/road_graph_builder.hpp
+++ b/libs/routing/routing_tests/road_graph_builder.hpp
@@ -26,11 +26,9 @@ public:
   double GetMaxSpeedKMpH() const override;
   /// @}
 
-  void ForEachFeatureClosestToCross(m2::PointD const & cross,
-                                    ICrossEdgesLoader & edgeLoader) const override;
+  void ForEachFeatureClosestToCross(m2::PointD const & cross, ICrossEdgesLoader & edgeLoader) const override;
   void GetFeatureTypes(FeatureID const & featureId, feature::TypesHolder & types) const override;
-  void GetJunctionTypes(geometry::PointWithAltitude const & junction,
-                        feature::TypesHolder & types) const override;
+  void GetJunctionTypes(geometry::PointWithAltitude const & junction, feature::TypesHolder & types) const override;
   routing::IRoadGraph::Mode GetMode() const override;
 
 private:
diff --git a/libs/routing/routing_tests/road_graph_nearest_edges_test.cpp b/libs/routing/routing_tests/road_graph_nearest_edges_test.cpp
index 30b3df0fa..579d85ba6 100644
--- a/libs/routing/routing_tests/road_graph_nearest_edges_test.cpp
+++ b/libs/routing/routing_tests/road_graph_nearest_edges_test.cpp
@@ -57,8 +57,7 @@ UNIT_TEST(RoadGraph_NearestEdges)
   }
 
   // We are standing at x junction.
-  geometry::PointWithAltitude const crossPos =
-      geometry::MakePointWithAltitudeForTesting(m2::PointD(0, 0));
+  geometry::PointWithAltitude const crossPos = geometry::MakePointWithAltitudeForTesting(m2::PointD(0, 0));
 
   // Expected outgoing edges.
   IRoadGraph::EdgeListT expectedOutgoing = {
diff --git a/libs/routing/routing_tests/route_tests.cpp b/libs/routing/routing_tests/route_tests.cpp
index d9169089a..b8dcbd650 100644
--- a/libs/routing/routing_tests/route_tests.cpp
+++ b/libs/routing/routing_tests/route_tests.cpp
@@ -25,28 +25,20 @@ using namespace routing::turns;
 using namespace std;
 
 // For all test geometry: geometry[0] == geometry[1], since info about 1st point will be lost.
-static vector<m2::PointD> const kTestGeometry =
-    {{0,0}, {0,0}, {1,1}, {1,2}, {1,3}, {1,4}};
-static vector<Segment> const kTestSegments =
-    {{0, 0, 0, true},
-     {0, 0, 1, true},
-     {0, 0, 2, true},
-     {0, 0, 3, true},
-     {0, 0, 4, true}};
-static vector<turns::TurnItem> const kTestTurns(
-    {turns::TurnItem(1, turns::CarDirection::None),
-     turns::TurnItem(2, turns::CarDirection::TurnLeft),
-     turns::TurnItem(3, turns::CarDirection::TurnRight),
-     turns::TurnItem(4, turns::CarDirection::None),
-     turns::TurnItem(5, turns::CarDirection::ReachedYourDestination)});
-static vector<double> const kTestTimes =
-    {0.0, 7.0, 10.0, 19.0, 20.0};
-static vector<RouteSegment::RoadNameInfo> const kTestNames =
-    {{"Street0", "", "", "", "", false},
-     {"Street1", "", "", "", "", false},
-     {"Street2", "", "", "", "", false},
-     {"", "", "", "", "", false},
-     {"Street3", "", "", "", "", false}};
+static vector<m2::PointD> const kTestGeometry = {{0, 0}, {0, 0}, {1, 1}, {1, 2}, {1, 3}, {1, 4}};
+static vector<Segment> const kTestSegments = {
+    {0, 0, 0, true}, {0, 0, 1, true}, {0, 0, 2, true}, {0, 0, 3, true}, {0, 0, 4, true}};
+static vector<turns::TurnItem> const kTestTurns({turns::TurnItem(1, turns::CarDirection::None),
+                                                 turns::TurnItem(2, turns::CarDirection::TurnLeft),
+                                                 turns::TurnItem(3, turns::CarDirection::TurnRight),
+                                                 turns::TurnItem(4, turns::CarDirection::None),
+                                                 turns::TurnItem(5, turns::CarDirection::ReachedYourDestination)});
+static vector<double> const kTestTimes = {0.0, 7.0, 10.0, 19.0, 20.0};
+static vector<RouteSegment::RoadNameInfo> const kTestNames = {{"Street0", "", "", "", "", false},
+                                                              {"Street1", "", "", "", "", false},
+                                                              {"Street2", "", "", "", "", false},
+                                                              {"", "", "", "", "", false},
+                                                              {"Street3", "", "", "", "", false}};
 
 void GetTestRouteSegments(vector<m2::PointD> const & routePoints, vector<turns::TurnItem> const & turns,
                           vector<RouteSegment::RoadNameInfo> const & streets, vector<double> const & times,
@@ -68,18 +60,13 @@ location::GpsInfo GetGps(double x, double y)
 vector<vector<Segment>> const GetSegments()
 {
   auto const segmentsAllReal = kTestSegments;
-  vector<Segment> const segmentsAllFake =
-      {{kFakeNumMwmId, 0, 0, true},
-       {kFakeNumMwmId, 0, 1, true},
-       {kFakeNumMwmId, 0, 2, true},
-       {kFakeNumMwmId, 0, 3, true},
-       {kFakeNumMwmId, 0, 4, true}};
-  vector<Segment> const segmentsFakeHeadAndTail =
-      {{kFakeNumMwmId, 0, 0, true},
-       {0, 0, 1, true},
-       {0, 0, 2, true},
-       {0, 0, 3, true},
-       {kFakeNumMwmId, 0, 4, true}};
+  vector<Segment> const segmentsAllFake = {{kFakeNumMwmId, 0, 0, true},
+                                           {kFakeNumMwmId, 0, 1, true},
+                                           {kFakeNumMwmId, 0, 2, true},
+                                           {kFakeNumMwmId, 0, 3, true},
+                                           {kFakeNumMwmId, 0, 4, true}};
+  vector<Segment> const segmentsFakeHeadAndTail = {
+      {kFakeNumMwmId, 0, 0, true}, {0, 0, 1, true}, {0, 0, 2, true}, {0, 0, 3, true}, {kFakeNumMwmId, 0, 4, true}};
   return {segmentsAllReal, segmentsFakeHeadAndTail, segmentsAllFake};
 }
 
@@ -99,8 +86,7 @@ UNIT_TEST(AddAbsentCountryToRouteTest)
 
 UNIT_TEST(FinshRouteOnSomeDistanceToTheFinishPointTest)
 {
-  for (auto const vehicleType :
-       {VehicleType::Car, VehicleType::Bicycle, VehicleType::Pedestrian, VehicleType::Transit})
+  for (auto const vehicleType : {VehicleType::Car, VehicleType::Bicycle, VehicleType::Pedestrian, VehicleType::Transit})
   {
     auto const settings = GetRoutingSettings(vehicleType);
     for (auto const & segments : GetSegments())
@@ -116,8 +102,8 @@ UNIT_TEST(FinshRouteOnSomeDistanceToTheFinishPointTest)
       route.SetGeometry(kTestGeometry.begin(), kTestGeometry.end());
       route.SetSubroteAttrs(vector<Route::SubrouteAttrs>(
           {Route::SubrouteAttrs(geometry::PointWithAltitude(kTestGeometry.front(), geometry::kDefaultAltitudeMeters),
-                                geometry::PointWithAltitude(kTestGeometry.back(), geometry::kDefaultAltitudeMeters),
-                                0, kTestSegments.size())}));
+                                geometry::PointWithAltitude(kTestGeometry.back(), geometry::kDefaultAltitudeMeters), 0,
+                                kTestSegments.size())}));
 
       // The route should be finished at some distance to the finish point.
       double const distToFinish = settings.m_finishToleranceM;
@@ -163,7 +149,7 @@ UNIT_TEST(DistanceAndTimeToCurrentTurnTest)
     auto pos = kTestGeometry[0];
 
     route.GetNearestTurn(distance, turn);
-    size_t currentTurnIndex = 2; // Turn with m_index == 1 is None.
+    size_t currentTurnIndex = 2;  // Turn with m_index == 1 is None.
     TEST_ALMOST_EQUAL_ABS(distance, mercator::DistanceOnEarth(pos, kTestGeometry[currentTurnIndex]), 0.1, ());
     TEST_EQUAL(turn, kTestTurns[currentTurnIndex - 1], ());
 
@@ -217,7 +203,7 @@ UNIT_TEST(DistanceAndTimeToCurrentTurnTest)
     route.MoveIterator(GetGps(pos.x, pos.y));
 
     route.GetNearestTurn(distance, turn);
-    size_t const currentTurnIndex = 5; // Turn with m_index == 4 is None.
+    size_t const currentTurnIndex = 5;  // Turn with m_index == 4 is None.
     TEST_ALMOST_EQUAL_ABS(distance, mercator::DistanceOnEarth(pos, kTestGeometry[currentTurnIndex]), 0.1, ());
     TEST_EQUAL(turn, kTestTurns[currentTurnIndex - 1], ());
 
@@ -244,7 +230,7 @@ UNIT_TEST(NextTurnTest)
 
   {
     // Initial point.
-    size_t const currentTurnIndex = 2; // Turn with m_index == 1 is None.
+    size_t const currentTurnIndex = 2;  // Turn with m_index == 1 is None.
     route.GetNearestTurn(distance, turn);
     TEST_EQUAL(turn, kTestTurns[currentTurnIndex - 1], ());
 
@@ -270,7 +256,7 @@ UNIT_TEST(NextTurnTest)
     auto const pos = (kTestGeometry[3] + kTestGeometry[4]) / 2;
     route.MoveIterator(GetGps(pos.x, pos.y));
 
-    size_t const currentTurnIndex = 5; // Turn with m_index == 4 is None.
+    size_t const currentTurnIndex = 5;  // Turn with m_index == 4 is None.
     route.GetNearestTurn(distance, turn);
     TEST_EQUAL(turn, kTestTurns[currentTurnIndex - 1], ());
 
@@ -295,17 +281,17 @@ UNIT_TEST(NextTurnsTest)
     // Initial point.
     auto const pos = kTestGeometry[0];
 
-    size_t const currentTurnIndex = 2; // Turn with m_index == 1 is None.
+    size_t const currentTurnIndex = 2;  // Turn with m_index == 1 is None.
     size_t const nextTurnIndex = 3;
     TEST(route.GetNextTurns(turnsDist), ());
     TEST_EQUAL(turnsDist.size(), 2, ());
     double const firstSegLenM = mercator::DistanceOnEarth(pos, kTestGeometry[currentTurnIndex]);
-    double const secondSegLenM = mercator::DistanceOnEarth(kTestGeometry[currentTurnIndex], kTestGeometry[nextTurnIndex]);
+    double const secondSegLenM =
+        mercator::DistanceOnEarth(kTestGeometry[currentTurnIndex], kTestGeometry[nextTurnIndex]);
     TEST_EQUAL(turnsDist[0].m_turnItem, kTestTurns[currentTurnIndex - 1], ());
     TEST_EQUAL(turnsDist[1].m_turnItem, kTestTurns[nextTurnIndex - 1], ());
     TEST_ALMOST_EQUAL_ABS(turnsDist[0].m_distMeters, firstSegLenM, 0.1, ());
     TEST_ALMOST_EQUAL_ABS(turnsDist[1].m_distMeters, firstSegLenM + secondSegLenM, 0.1, ());
-
   }
   {
     // Move between points 1 and 2.
@@ -317,7 +303,8 @@ UNIT_TEST(NextTurnsTest)
     TEST(route.GetNextTurns(turnsDist), ());
     TEST_EQUAL(turnsDist.size(), 2, ());
     double const firstSegLenM = mercator::DistanceOnEarth(pos, kTestGeometry[currentTurnIndex]);
-    double const secondSegLenM = mercator::DistanceOnEarth(kTestGeometry[currentTurnIndex], kTestGeometry[nextTurnIndex]);
+    double const secondSegLenM =
+        mercator::DistanceOnEarth(kTestGeometry[currentTurnIndex], kTestGeometry[nextTurnIndex]);
     TEST_EQUAL(turnsDist[0].m_turnItem, kTestTurns[currentTurnIndex - 1], ());
     TEST_EQUAL(turnsDist[1].m_turnItem, kTestTurns[nextTurnIndex - 1], ());
     TEST_ALMOST_EQUAL_ABS(turnsDist[0].m_distMeters, firstSegLenM, 0.1, ());
@@ -329,11 +316,12 @@ UNIT_TEST(NextTurnsTest)
     route.MoveIterator(GetGps(pos.x, pos.y));
 
     size_t const currentTurnIndex = 3;
-    size_t const nextTurnIndex = 5; // Turn with m_index == 4 is None.
+    size_t const nextTurnIndex = 5;  // Turn with m_index == 4 is None.
     TEST(route.GetNextTurns(turnsDist), ());
     TEST_EQUAL(turnsDist.size(), 2, ());
     double const firstSegLenM = mercator::DistanceOnEarth(pos, kTestGeometry[currentTurnIndex]);
-    double const secondSegLenM = mercator::DistanceOnEarth(kTestGeometry[currentTurnIndex], kTestGeometry[nextTurnIndex]);
+    double const secondSegLenM =
+        mercator::DistanceOnEarth(kTestGeometry[currentTurnIndex], kTestGeometry[nextTurnIndex]);
     TEST_EQUAL(turnsDist[0].m_turnItem, kTestTurns[currentTurnIndex - 1], ());
     TEST_EQUAL(turnsDist[1].m_turnItem, kTestTurns[nextTurnIndex - 1], ());
     TEST_ALMOST_EQUAL_ABS(turnsDist[0].m_distMeters, firstSegLenM, 0.1, ());
@@ -344,7 +332,7 @@ UNIT_TEST(NextTurnsTest)
     auto const pos = (kTestGeometry[3] + kTestGeometry[4]) / 2;
     route.MoveIterator(GetGps(pos.x, pos.y));
 
-    size_t const currentTurnIndex = 5; // Turn with m_index == 4 is None.
+    size_t const currentTurnIndex = 5;  // Turn with m_index == 4 is None.
     // nextTurn is absent.
     TEST(route.GetNextTurns(turnsDist), ());
     double const firstSegLenM = mercator::DistanceOnEarth(pos, kTestGeometry[currentTurnIndex]);
@@ -366,13 +354,8 @@ UNIT_TEST(NextTurnsTest)
 //
 UNIT_TEST(SelfIntersectedRouteMatchingTest)
 {
-  vector<m2::PointD> const kRouteGeometry =
-      {{0.0001, 0.0},
-       {0.0001, 0.0},
-       {0.0001, 0.0002},
-       {0.0002, 0.0002},
-       {0.0002, 0.0001},
-       {0.0, 0.0001}};
+  vector<m2::PointD> const kRouteGeometry = {{0.0001, 0.0},    {0.0001, 0.0},    {0.0001, 0.0002},
+                                             {0.0002, 0.0002}, {0.0002, 0.0001}, {0.0, 0.0001}};
   double constexpr kRoundingErrorMeters = 0.001;
 
   Route route("TestRouter", 0 /* route id */);
@@ -382,16 +365,15 @@ UNIT_TEST(SelfIntersectedRouteMatchingTest)
   GetTestRouteSegments(kRouteGeometry, {}, {}, {}, routeSegments);
   route.SetRouteSegments(std::move(routeSegments));
 
-  auto const testMachedPos = [&](location::GpsInfo const & pos,
-                                 location::GpsInfo const & expectedMatchingPos,
-                                 size_t expectedIndexInRoute) {
+  auto const testMachedPos =
+      [&](location::GpsInfo const & pos, location::GpsInfo const & expectedMatchingPos, size_t expectedIndexInRoute)
+  {
     location::RouteMatchingInfo routeMatchingInfo;
     route.MoveIterator(pos);
     location::GpsInfo matchedPos = pos;
     route.MatchLocationToRoute(matchedPos, routeMatchingInfo);
-    TEST_LESS(mercator::DistanceOnEarth(
-                  m2::PointD(matchedPos.m_latitude, matchedPos.m_longitude),
-                  m2::PointD(expectedMatchingPos.m_latitude, expectedMatchingPos.m_longitude)),
+    TEST_LESS(mercator::DistanceOnEarth(m2::PointD(matchedPos.m_latitude, matchedPos.m_longitude),
+                                        m2::PointD(expectedMatchingPos.m_latitude, expectedMatchingPos.m_longitude)),
               kRoundingErrorMeters, ());
     TEST_EQUAL(max(size_t(1), routeMatchingInfo.GetIndexInRoute()), expectedIndexInRoute, ());
   };
diff --git a/libs/routing/routing_tests/routing_algorithm.cpp b/libs/routing/routing_tests/routing_algorithm.cpp
index 12fcf2229..8088ec419 100644
--- a/libs/routing/routing_tests/routing_algorithm.cpp
+++ b/libs/routing/routing_tests/routing_algorithm.cpp
@@ -27,20 +27,17 @@ size_t UndirectedGraph::GetNodesNumber() const
   return m_adjs.size();
 }
 
-void UndirectedGraph::GetEdgesList(Vertex const & vertex, bool /* isOutgoing */,
-                                   EdgeListT & adj)
+void UndirectedGraph::GetEdgesList(Vertex const & vertex, bool /* isOutgoing */, EdgeListT & adj)
 {
   GetAdjacencyList(vertex, adj);
 }
 
-void UndirectedGraph::GetIngoingEdgesList(astar::VertexData<Vertex, Weight> const & vertexData,
-                                          EdgeListT & adj)
+void UndirectedGraph::GetIngoingEdgesList(astar::VertexData<Vertex, Weight> const & vertexData, EdgeListT & adj)
 {
   GetEdgesList(vertexData.m_vertex, false /* isOutgoing */, adj);
 }
 
-void UndirectedGraph::GetOutgoingEdgesList(astar::VertexData<Vertex, Weight> const & vertexData,
-                                           EdgeListT & adj)
+void UndirectedGraph::GetOutgoingEdgesList(astar::VertexData<Vertex, Weight> const & vertexData, EdgeListT & adj)
 {
   GetEdgesList(vertexData.m_vertex, true /* isOutgoing */, adj);
 }
@@ -71,16 +68,15 @@ void DirectedGraph::GetEdgesList(Vertex const & v, bool isOutgoing, EdgeListT &
 
 namespace
 {
-inline double TimeBetweenSec(geometry::PointWithAltitude const & j1,
-                             geometry::PointWithAltitude const & j2, double speedMPS)
+inline double TimeBetweenSec(geometry::PointWithAltitude const & j1, geometry::PointWithAltitude const & j2,
+                             double speedMPS)
 {
   ASSERT(speedMPS > 0.0, ());
   ASSERT_NOT_EQUAL(j1.GetAltitude(), geometry::kInvalidAltitude, ());
   ASSERT_NOT_EQUAL(j2.GetAltitude(), geometry::kInvalidAltitude, ());
 
   double const distanceM = mercator::DistanceOnEarth(j1.GetPoint(), j2.GetPoint());
-  double const altitudeDiffM =
-      static_cast<double>(j2.GetAltitude()) - static_cast<double>(j1.GetAltitude());
+  double const altitudeDiffM = static_cast<double>(j2.GetAltitude()) - static_cast<double>(j1.GetAltitude());
   return std::sqrt(distanceM * distanceM + altitudeDiffM * altitudeDiffM) / speedMPS;
 }
 
@@ -88,11 +84,8 @@ inline double TimeBetweenSec(geometry::PointWithAltitude const & j1,
 class WeightedEdge
 {
 public:
-  WeightedEdge() = default;   // needed for buffer_vector only
-  WeightedEdge(geometry::PointWithAltitude const & target, double weight)
-    : target(target), weight(weight)
-  {
-  }
+  WeightedEdge() = default;  // needed for buffer_vector only
+  WeightedEdge(geometry::PointWithAltitude const & target, double weight) : target(target), weight(weight) {}
 
   inline geometry::PointWithAltitude const & GetTarget() const { return target; }
   inline double GetWeight() const { return weight; }
@@ -108,13 +101,12 @@ using Algorithm = AStarAlgorithm<geometry::PointWithAltitude, WeightedEdge, doub
 class RoadGraph : public Algorithm::Graph
 {
 public:
-
   explicit RoadGraph(RoadGraphIFace const & roadGraph)
-    : m_roadGraph(roadGraph), m_maxSpeedMPS(measurement_utils::KmphToMps(roadGraph.GetMaxSpeedKMpH()))
+    : m_roadGraph(roadGraph)
+    , m_maxSpeedMPS(measurement_utils::KmphToMps(roadGraph.GetMaxSpeedKMpH()))
   {}
 
-  void GetOutgoingEdgesList(astar::VertexData<Vertex, Weight> const & vertexData,
-                            EdgeListT & adj) override
+  void GetOutgoingEdgesList(astar::VertexData<Vertex, Weight> const & vertexData, EdgeListT & adj) override
   {
     auto const & v = vertexData.m_vertex;
     IRoadGraph::EdgeListT edges;
@@ -133,8 +125,7 @@ public:
     }
   }
 
-  void GetIngoingEdgesList(astar::VertexData<Vertex, Weight> const & vertexData,
-                           EdgeListT & adj) override
+  void GetIngoingEdgesList(astar::VertexData<Vertex, Weight> const & vertexData, EdgeListT & adj) override
   {
     auto const & v = vertexData.m_vertex;
     IRoadGraph::EdgeListT edges;
@@ -181,12 +172,9 @@ std::string DebugPrint(TestAStarBidirectionalAlgo::Result const & value)
 {
   switch (value)
   {
-  case TestAStarBidirectionalAlgo::Result::OK:
-    return "OK";
-  case TestAStarBidirectionalAlgo::Result::NoPath:
-    return "NoPath";
-  case TestAStarBidirectionalAlgo::Result::Cancelled:
-    return "Cancelled";
+  case TestAStarBidirectionalAlgo::Result::OK: return "OK";
+  case TestAStarBidirectionalAlgo::Result::NoPath: return "NoPath";
+  case TestAStarBidirectionalAlgo::Result::Cancelled: return "Cancelled";
   }
 
   UNREACHABLE();
@@ -196,8 +184,7 @@ std::string DebugPrint(TestAStarBidirectionalAlgo::Result const & value)
 // *************************** AStar-bidirectional routing algorithm implementation ***********************
 TestAStarBidirectionalAlgo::Result TestAStarBidirectionalAlgo::CalculateRoute(
     RoadGraphIFace const & graph, geometry::PointWithAltitude const & startPos,
-    geometry::PointWithAltitude const & finalPos,
-    RoutingResult<IRoadGraph::Vertex, IRoadGraph::Weight> & path)
+    geometry::PointWithAltitude const & finalPos, RoutingResult<IRoadGraph::Vertex, IRoadGraph::Weight> & path)
 {
   RoadGraph roadGraph(graph);
   base::Cancellable cancellable;
@@ -206,4 +193,4 @@ TestAStarBidirectionalAlgo::Result TestAStarBidirectionalAlgo::CalculateRoute(
   Algorithm::Result const res = Algorithm().FindPathBidirectional(params, path);
   return Convert(res);
 }
-}  // namespace routing_tests
+}  // namespace routing_test
diff --git a/libs/routing/routing_tests/routing_algorithm.hpp b/libs/routing/routing_tests/routing_algorithm.hpp
index 5cd90d257..ce4c35182 100644
--- a/libs/routing/routing_tests/routing_algorithm.hpp
+++ b/libs/routing/routing_tests/routing_algorithm.hpp
@@ -18,7 +18,7 @@ using namespace routing;
 
 struct SimpleEdge
 {
-  SimpleEdge() = default;   // needed for buffer_vector only
+  SimpleEdge() = default;  // needed for buffer_vector only
   SimpleEdge(uint32_t to, double weight) : m_to(to), m_weight(weight) {}
 
   uint32_t GetTarget() const { return m_to; }
@@ -37,9 +37,7 @@ public:
 
   double GetSpeedKMpH(Edge const & edge, SpeedParams const & speedParams) const
   {
-    double const speedKMpH =
-        (edge.IsFake() ? GetMaxSpeedKMpH()
-                       : GetSpeedKMpH(edge.GetFeatureId(), speedParams));
+    double const speedKMpH = (edge.IsFake() ? GetMaxSpeedKMpH() : GetSpeedKMpH(edge.GetFeatureId(), speedParams));
     ASSERT_LESS_OR_EQUAL(speedKMpH, GetMaxSpeedKMpH(), ());
     return speedKMpH;
   }
@@ -53,10 +51,8 @@ public:
 
   // AStarGraph overrides
   // @{
-  void GetIngoingEdgesList(astar::VertexData<Vertex, Weight> const & vertexData,
-                           EdgeListT & adj) override;
-  void GetOutgoingEdgesList(astar::VertexData<Vertex, Weight> const & vertexData,
-                            EdgeListT & adj) override;
+  void GetIngoingEdgesList(astar::VertexData<Vertex, Weight> const & vertexData, EdgeListT & adj) override;
+  void GetOutgoingEdgesList(astar::VertexData<Vertex, Weight> const & vertexData, EdgeListT & adj) override;
   double HeuristicCostEstimate(Vertex const & v, Vertex const & w) override;
   // @}
 
@@ -102,4 +98,4 @@ public:
 };
 
 std::string DebugPrint(TestAStarBidirectionalAlgo::Result const & result);
-}  // namespace routing_tests
+}  // namespace routing_test
diff --git a/libs/routing/routing_tests/routing_helpers_tests.cpp b/libs/routing/routing_tests/routing_helpers_tests.cpp
index 3b55f14b0..316243285 100644
--- a/libs/routing/routing_tests/routing_helpers_tests.cpp
+++ b/libs/routing/routing_tests/routing_helpers_tests.cpp
@@ -2,7 +2,6 @@
 
 #include "routing/road_graph.hpp"
 #include "routing/route.hpp"
-#include "routing/road_graph.hpp"
 #include "routing/routing_helpers.hpp"
 #include "routing/segment.hpp"
 #include "routing/turns.hpp"
@@ -25,11 +24,8 @@ using namespace std;
 
 UNIT_TEST(FillSegmentInfoSmokeTest)
 {
-  vector<Segment> const segments = {
-      {0 /* mwmId */, 1 /* featureId */, 0 /* segmentIdx */, true /* forward */}};
-  vector<m2::PointD> const junctions = {
-      m2::PointD(0.0 /* x */, 0.0 /* y */),
-      m2::PointD(0.0 /* x */, 0.0 /* y */)};
+  vector<Segment> const segments = {{0 /* mwmId */, 1 /* featureId */, 0 /* segmentIdx */, true /* forward */}};
+  vector<m2::PointD> const junctions = {m2::PointD(0.0 /* x */, 0.0 /* y */), m2::PointD(0.0 /* x */, 0.0 /* y */)};
   vector<turns::TurnItem> const & turnDirs = {{1 /* point index */, CarDirection::ReachedYourDestination}};
   vector<double> const times = {1.0};
 
@@ -44,23 +40,15 @@ UNIT_TEST(FillSegmentInfoSmokeTest)
 
 UNIT_TEST(FillSegmentInfoTest)
 {
-  vector<Segment> const segments =
-      {{0 /* mwmId */, 1 /* featureId */, 0 /* segmentIdx */, true /* forward */},
-       {0, 2, 0, true},
-       {0, 3, 0, true}};
-  vector<m2::PointD> const junctions =
-      {m2::PointD(0.0 /* x */, 0.0 /* y */),
-       m2::PointD(0.0 /* x */, 0.0 /* y */),
-       m2::PointD(0.1 /* x */, 0.0 /* y */),
-       m2::PointD(0.2 /* x */, 0.0 /* y */)};
-  vector<turns::TurnItem> const & turnDirs =
-      {{1 /* point index */, CarDirection::None},
-       {2 /* point index */, CarDirection::TurnRight},
-       {3 /* point index */, CarDirection::ReachedYourDestination}};
-  vector<RouteSegment::RoadNameInfo> const streets =
-      {{"zero", "", "", "", "", false},
-       {"first", "", "", "", "", false},
-       {"second", "", "", "", "", false}};
+  vector<Segment> const segments = {
+      {0 /* mwmId */, 1 /* featureId */, 0 /* segmentIdx */, true /* forward */}, {0, 2, 0, true}, {0, 3, 0, true}};
+  vector<m2::PointD> const junctions = {m2::PointD(0.0 /* x */, 0.0 /* y */), m2::PointD(0.0 /* x */, 0.0 /* y */),
+                                        m2::PointD(0.1 /* x */, 0.0 /* y */), m2::PointD(0.2 /* x */, 0.0 /* y */)};
+  vector<turns::TurnItem> const & turnDirs = {{1 /* point index */, CarDirection::None},
+                                              {2 /* point index */, CarDirection::TurnRight},
+                                              {3 /* point index */, CarDirection::ReachedYourDestination}};
+  vector<RouteSegment::RoadNameInfo> const streets = {
+      {"zero", "", "", "", "", false}, {"first", "", "", "", "", false}, {"second", "", "", "", "", false}};
   vector<double> const times = {1.0, 2.0, 3.0};
 
   vector<RouteSegment> segmentInfo;
@@ -85,22 +73,19 @@ UNIT_TEST(PolylineInRectTest)
 
   // One point polyline outside the rect.
   {
-    auto const junctions =
-        IRoadGraph::PointWithAltitudeVec({{m2::PointD(3.0, 3.0), 0 /* altitude */}});
+    auto const junctions = IRoadGraph::PointWithAltitudeVec({{m2::PointD(3.0, 3.0), 0 /* altitude */}});
     TEST(!RectCoversPolyline(junctions, m2::RectD(0.0, 0.0, 2.0, 2.0)), ());
   }
 
   // One point polyline inside the rect.
   {
-    auto const junctions =
-        IRoadGraph::PointWithAltitudeVec({{m2::PointD(1.0, 1.0), 0 /* altitude */}});
+    auto const junctions = IRoadGraph::PointWithAltitudeVec({{m2::PointD(1.0, 1.0), 0 /* altitude */}});
     TEST(RectCoversPolyline(junctions, m2::RectD(0.0, 0.0, 2.0, 2.0)), ());
   }
 
   // One point polyline on the rect border.
   {
-    auto const junctions =
-        IRoadGraph::PointWithAltitudeVec({{m2::PointD(0.0, 0.0), 0 /* altitude */}});
+    auto const junctions = IRoadGraph::PointWithAltitudeVec({{m2::PointD(0.0, 0.0), 0 /* altitude */}});
     TEST(RectCoversPolyline(junctions, m2::RectD(0.0, 0.0, 2.0, 2.0)), ());
   }
 
diff --git a/libs/routing/routing_tests/routing_options_tests.cpp b/libs/routing/routing_tests/routing_options_tests.cpp
index f07443798..0a364a017 100644
--- a/libs/routing/routing_tests/routing_options_tests.cpp
+++ b/libs/routing/routing_tests/routing_options_tests.cpp
@@ -14,15 +14,9 @@ using RoadType = RoutingOptions::RoadType;
 class RoutingOptionsTests
 {
 public:
-  RoutingOptionsTests()
-  {
-    m_savedOptions = RoutingOptions::LoadCarOptionsFromSettings();
-  }
+  RoutingOptionsTests() { m_savedOptions = RoutingOptions::LoadCarOptionsFromSettings(); }
 
-  ~RoutingOptionsTests()
-  {
-    RoutingOptions::SaveCarOptionsToSettings(m_savedOptions);
-  }
+  ~RoutingOptionsTests() { RoutingOptions::SaveCarOptionsToSettings(m_savedOptions); }
 
 private:
   RoutingOptions m_savedOptions;
@@ -60,12 +54,10 @@ void Checker(std::vector<RoutingOptions::Road> const & include)
 
 UNIT_TEST(RoutingOptionTest)
 {
-  Checker({RoutingOptions::Road::Toll, RoutingOptions::Road::Motorway,
-           RoutingOptions::Road::Dirty});
+  Checker({RoutingOptions::Road::Toll, RoutingOptions::Road::Motorway, RoutingOptions::Road::Dirty});
   Checker({RoutingOptions::Road::Toll, RoutingOptions::Road::Dirty});
 
-  Checker({RoutingOptions::Road::Toll, RoutingOptions::Road::Ferry,
-           RoutingOptions::Road::Dirty});
+  Checker({RoutingOptions::Road::Toll, RoutingOptions::Road::Ferry, RoutingOptions::Road::Dirty});
 
   Checker({RoutingOptions::Road::Dirty});
   Checker({RoutingOptions::Road::Toll});
@@ -75,9 +67,8 @@ UNIT_TEST(RoutingOptionTest)
 
 UNIT_CLASS_TEST(RoutingOptionsTests, GetSetTest)
 {
-  RoutingOptions options = CreateOptions({RoutingOptions::Road::Toll,
-                                          RoutingOptions::Road::Motorway,
-                                          RoutingOptions::Road::Dirty});
+  RoutingOptions options =
+      CreateOptions({RoutingOptions::Road::Toll, RoutingOptions::Road::Motorway, RoutingOptions::Road::Dirty});
 
   RoutingOptions::SaveCarOptionsToSettings(options);
   RoutingOptions fromSettings = RoutingOptions::LoadCarOptionsFromSettings();
diff --git a/libs/routing/routing_tests/routing_session_test.cpp b/libs/routing/routing_tests/routing_session_test.cpp
index 153316d2e..7b5d9f63c 100644
--- a/libs/routing/routing_tests/routing_session_test.cpp
+++ b/libs/routing/routing_tests/routing_session_test.cpp
@@ -30,14 +30,12 @@ using chrono::steady_clock;
 
 vector<m2::PointD> kTestRoute = {{0., 1.}, {0., 1.}, {0., 3.}, {0., 4.}};
 vector<Segment> const kTestSegments = {{0, 0, 0, true}, {0, 0, 1, true}, {0, 0, 2, true}};
-vector<turns::TurnItem> const kTestTurnsReachOnly =
-                                 {turns::TurnItem(1, turns::CarDirection::None),
-                                  turns::TurnItem(2, turns::CarDirection::None),
-                                  turns::TurnItem(3, turns::CarDirection::ReachedYourDestination)};
-vector<turns::TurnItem> const kTestTurns =
-                                 {turns::TurnItem(1, turns::CarDirection::None),
-                                  turns::TurnItem(2, turns::CarDirection::TurnLeft),
-                                  turns::TurnItem(3, turns::CarDirection::ReachedYourDestination)};
+vector<turns::TurnItem> const kTestTurnsReachOnly = {turns::TurnItem(1, turns::CarDirection::None),
+                                                     turns::TurnItem(2, turns::CarDirection::None),
+                                                     turns::TurnItem(3, turns::CarDirection::ReachedYourDestination)};
+vector<turns::TurnItem> const kTestTurns = {turns::TurnItem(1, turns::CarDirection::None),
+                                            turns::TurnItem(2, turns::CarDirection::TurnLeft),
+                                            turns::TurnItem(3, turns::CarDirection::ReachedYourDestination)};
 vector<double> const kTestTimes = {5.0, 10.0, 15.0};
 auto const kRouteBuildingMaxDuration = seconds(30);
 
@@ -53,25 +51,25 @@ private:
 
 public:
   DummyRouter(Route & route, RouterResultCode code, size_t & buildCounter)
-    : m_route(route), m_code(code), m_buildCount(buildCounter)
-  {
-  }
+    : m_route(route)
+    , m_code(code)
+    , m_buildCount(buildCounter)
+  {}
 
   string GetName() const override { return "dummy"; }
   void ClearState() override {}
   void SetGuides(GuidesTracks && /* guides */) override {}
 
-  RouterResultCode CalculateRoute(Checkpoints const & /* checkpoints */,
-                                  m2::PointD const & /* startDirection */, bool /* adjust */,
-                                  RouterDelegate const & /* delegate */, Route & route) override
+  RouterResultCode CalculateRoute(Checkpoints const & /* checkpoints */, m2::PointD const & /* startDirection */,
+                                  bool /* adjust */, RouterDelegate const & /* delegate */, Route & route) override
   {
     ++m_buildCount;
     route = m_route;
     return m_code;
   }
 
-  bool FindClosestProjectionToRoad(m2::PointD const & point, m2::PointD const & direction,
-                                   double radius, EdgeProj & proj) override
+  bool FindClosestProjectionToRoad(m2::PointD const & point, m2::PointD const & direction, double radius,
+                                   EdgeProj & proj) override
   {
     return false;
   }
@@ -81,20 +79,18 @@ public:
 class ReturnCodesRouter : public IRouter
 {
 public:
-  ReturnCodesRouter(initializer_list<RouterResultCode> const & returnCodes,
-                    vector<m2::PointD> const & route)
-    : m_returnCodes(returnCodes), m_route(route)
-  {
-  }
+  ReturnCodesRouter(initializer_list<RouterResultCode> const & returnCodes, vector<m2::PointD> const & route)
+    : m_returnCodes(returnCodes)
+    , m_route(route)
+  {}
 
   // IRouter overrides:
   string GetName() const override { return "return codes router"; }
   void ClearState() override {}
   void SetGuides(GuidesTracks && /* guides */) override {}
 
-  RouterResultCode CalculateRoute(Checkpoints const & /* checkpoints */,
-                                  m2::PointD const & /* startDirection */, bool /* adjust */,
-                                  RouterDelegate const & /* delegate */, Route & route) override
+  RouterResultCode CalculateRoute(Checkpoints const & /* checkpoints */, m2::PointD const & /* startDirection */,
+                                  bool /* adjust */, RouterDelegate const & /* delegate */, Route & route) override
   {
     TEST_LESS(m_returnCodesIdx, m_returnCodes.size(), ());
     route = Route(GetName(), m_route.begin(), m_route.end(), 0 /* route id */);
@@ -102,8 +98,8 @@ public:
     return m_returnCodes[m_returnCodesIdx++];
   }
 
-  bool FindClosestProjectionToRoad(m2::PointD const & point, m2::PointD const & direction,
-                                   double radius, EdgeProj & proj) override
+  bool FindClosestProjectionToRoad(m2::PointD const & point, m2::PointD const & direction, double radius,
+                                   EdgeProj & proj) override
   {
     return false;
   }
@@ -128,10 +124,7 @@ public:
   bool WaitUntil(steady_clock::time_point const & time)
   {
     unique_lock<mutex> lock(m_waitingMutex);
-    m_cv.wait_until(lock, time, [this, &time]
-                    {
-                      return m_flag || steady_clock::now() > time;
-                    });
+    m_cv.wait_until(lock, time, [this, &time] { return m_flag || steady_clock::now() > time; });
     return m_flag;
   }
 
@@ -147,7 +140,8 @@ class SessionStateTest
 {
 public:
   SessionStateTest(initializer_list<SessionState> expectedStates, RoutingSession & routingSession)
-    : m_expectedStates(expectedStates), m_session(routingSession)
+    : m_expectedStates(expectedStates)
+    , m_session(routingSession)
   {
     for (size_t i = 1; i < expectedStates.size(); ++i)
     {
@@ -157,10 +151,10 @@ public:
     }
 
     TimedSignal timedSignal;
-    GetPlatform().RunTask(Platform::Thread::Gui, [this, &timedSignal]() {
-      m_session.SetChangeSessionStateCallback([this](SessionState previous, SessionState current) {
-        TestChangeSessionStateCallbackCall(previous, current);
-      });
+    GetPlatform().RunTask(Platform::Thread::Gui, [this, &timedSignal]()
+    {
+      m_session.SetChangeSessionStateCallback([this](SessionState previous, SessionState current)
+      { TestChangeSessionStateCallbackCall(previous, current); });
       timedSignal.Signal();
     });
     TEST(timedSignal.WaitUntil(steady_clock::now() + kRouteBuildingMaxDuration), ("Callback is not set."));
@@ -171,7 +165,8 @@ public:
     TEST_EQUAL(m_numberOfTestCalls, m_expectedNumberOfStateChanging,
                ("Wrong number of calls of SetState() callback.", m_expectedStates));
     TimedSignal timedSignal;
-    GetPlatform().RunTask(Platform::Thread::Gui, [this, &timedSignal]() {
+    GetPlatform().RunTask(Platform::Thread::Gui, [this, &timedSignal]()
+    {
       m_session.SetChangeSessionStateCallback(nullptr);
       timedSignal.Signal();
     });
@@ -214,7 +209,8 @@ void TestMovingByUpdatingLat(SessionStateTest const & sessionState, vector<doubl
 {
   location::GpsInfo uptInfo(info);
   TimedSignal signal;
-  GetPlatform().RunTask(Platform::Thread::Gui, [&session, &signal, &lats, &uptInfo]() {
+  GetPlatform().RunTask(Platform::Thread::Gui, [&session, &signal, &lats, &uptInfo]()
+  {
     for (auto const lat : lats)
     {
       uptInfo.m_latitude = lat;
@@ -223,16 +219,14 @@ void TestMovingByUpdatingLat(SessionStateTest const & sessionState, vector<doubl
 
     signal.Signal();
   });
-  TEST(signal.WaitUntil(steady_clock::now() + kRouteBuildingMaxDuration),
-       ("Along route moving timeout."));
+  TEST(signal.WaitUntil(steady_clock::now() + kRouteBuildingMaxDuration), ("Along route moving timeout."));
 }
 
 void TestLeavingRoute(RoutingSession & session, location::GpsInfo const & info)
 {
   vector<double> const latitudes = {0.0,    -0.001, -0.002, -0.003, -0.004, -0.005,
                                     -0.006, -0.007, -0.008, -0.009, -0.01,  -0.011};
-  SessionStateTest sessionStateTest({SessionState::OnRoute, SessionState::RouteNeedRebuild},
-                                    session);
+  SessionStateTest sessionStateTest({SessionState::OnRoute, SessionState::RouteNeedRebuild}, session);
   TestMovingByUpdatingLat(sessionStateTest, latitudes, info, session);
 }
 
@@ -244,22 +238,19 @@ UNIT_CLASS_TEST(AsyncGuiThreadTestWithRoutingSession, TestRouteBuilding)
   TimedSignal timedSignal;
   size_t counter = 0;
 
-  GetPlatform().RunTask(Platform::Thread::Gui, [&timedSignal, &counter, this]() {
+  GetPlatform().RunTask(Platform::Thread::Gui, [&timedSignal, &counter, this]()
+  {
     InitRoutingSession();
     Route masterRoute("dummy", kTestRoute.begin(), kTestRoute.end(), 0 /* route id */);
 
-    unique_ptr<DummyRouter> router =
-        make_unique<DummyRouter>(masterRoute, RouterResultCode::NoError, counter);
+    unique_ptr<DummyRouter> router = make_unique<DummyRouter>(masterRoute, RouterResultCode::NoError, counter);
     m_session->SetRouter(std::move(router), nullptr);
-    m_session->SetRoutingCallbacks(
-        [&timedSignal](Route const &, RouterResultCode) {
-          LOG(LINFO, ("Ready"));
-          timedSignal.Signal();
-        },
-        nullptr /* rebuildReadyCallback */, nullptr /* needMoreMapsCallback */,
-        nullptr /* removeRouteCallback */);
-    m_session->BuildRoute(Checkpoints(kTestRoute.front(), kTestRoute.back()),
-                          RouterDelegate::kNoTimeout);
+    m_session->SetRoutingCallbacks([&timedSignal](Route const &, RouterResultCode)
+    {
+      LOG(LINFO, ("Ready"));
+      timedSignal.Signal();
+    }, nullptr /* rebuildReadyCallback */, nullptr /* needMoreMapsCallback */, nullptr /* removeRouteCallback */);
+    m_session->BuildRoute(Checkpoints(kTestRoute.front(), kTestRoute.back()), RouterDelegate::kNoTimeout);
   });
 
   // Manual check of the routeBuilding mutex to avoid spurious results.
@@ -275,20 +266,19 @@ UNIT_CLASS_TEST(AsyncGuiThreadTestWithRoutingSession, TestRouteRebuildingMovingA
   size_t counter = 0;
 
   TimedSignal alongTimedSignal;
-  GetPlatform().RunTask(Platform::Thread::Gui, [&alongTimedSignal, this, &counter]() {
+  GetPlatform().RunTask(Platform::Thread::Gui, [&alongTimedSignal, this, &counter]()
+  {
     InitRoutingSession();
     Route masterRoute("dummy", kTestRoute.begin(), kTestRoute.end(), 0 /* route id */);
     FillSubroutesInfo(masterRoute);
 
-    unique_ptr<DummyRouter> router =
-        make_unique<DummyRouter>(masterRoute, RouterResultCode::NoError, counter);
+    unique_ptr<DummyRouter> router = make_unique<DummyRouter>(masterRoute, RouterResultCode::NoError, counter);
     m_session->SetRouter(std::move(router), nullptr);
 
     // Go along the route.
-    m_session->SetRoutingCallbacks(
-        [&alongTimedSignal](Route const &, RouterResultCode) { alongTimedSignal.Signal(); },
-        nullptr /* rebuildReadyCallback */, nullptr /* needMoreMapsCallback */,
-        nullptr /* removeRouteCallback */);
+    m_session->SetRoutingCallbacks([&alongTimedSignal](Route const &, RouterResultCode) { alongTimedSignal.Signal(); },
+                                   nullptr /* rebuildReadyCallback */, nullptr /* needMoreMapsCallback */,
+                                   nullptr /* removeRouteCallback */);
     m_session->BuildRoute(Checkpoints(kTestRoute.front(), kTestRoute.back()),
                           RouterDelegate::RouterDelegate::kNoTimeout);
   });
@@ -296,12 +286,12 @@ UNIT_CLASS_TEST(AsyncGuiThreadTestWithRoutingSession, TestRouteRebuildingMovingA
   TEST_EQUAL(counter, 1, ());
 
   {
-    SessionStateTest sessionStateTest(
-        {SessionState::RouteNotStarted, SessionState::OnRoute, SessionState::RouteBuilding,
-         SessionState::RouteNotStarted},
-        *m_session);
+    SessionStateTest sessionStateTest({SessionState::RouteNotStarted, SessionState::OnRoute,
+                                       SessionState::RouteBuilding, SessionState::RouteNotStarted},
+                                      *m_session);
     TimedSignal oppositeTimedSignal;
-    GetPlatform().RunTask(Platform::Thread::Gui, [&oppositeTimedSignal, &info, this]() {
+    GetPlatform().RunTask(Platform::Thread::Gui, [&oppositeTimedSignal, &info, this]()
+    {
       info.m_horizontalAccuracy = 0.01;
       info.m_verticalAccuracy = 0.01;
       info.m_longitude = 0.;
@@ -318,13 +308,11 @@ UNIT_CLASS_TEST(AsyncGuiThreadTestWithRoutingSession, TestRouteRebuildingMovingA
       }
 
       // Rebuild route and go in opposite direction. So initiate a route rebuilding flag.
-      m_session->SetRoutingCallbacks(
-          [&oppositeTimedSignal](Route const &, RouterResultCode) { oppositeTimedSignal.Signal(); },
-          nullptr /* rebuildReadyCallback */, nullptr /* needMoreMapsCallback */,
-          nullptr /* removeRouteCallback */);
+      m_session->SetRoutingCallbacks([&oppositeTimedSignal](Route const &, RouterResultCode)
+      { oppositeTimedSignal.Signal(); }, nullptr /* rebuildReadyCallback */, nullptr /* needMoreMapsCallback */,
+                                     nullptr /* removeRouteCallback */);
       {
-        m_session->BuildRoute(Checkpoints(kTestRoute.front(), kTestRoute.back()),
-                              RouterDelegate::kNoTimeout);
+        m_session->BuildRoute(Checkpoints(kTestRoute.front(), kTestRoute.back()), RouterDelegate::kNoTimeout);
       }
     });
     TEST(oppositeTimedSignal.WaitUntil(steady_clock::now() + kRouteBuildingMaxDuration), ("Route was not built."));
@@ -332,7 +320,8 @@ UNIT_CLASS_TEST(AsyncGuiThreadTestWithRoutingSession, TestRouteRebuildingMovingA
 
   // Going away from route to set rebuilding flag.
   TimedSignal checkTimedSignal;
-  GetPlatform().RunTask(Platform::Thread::Gui, [&checkTimedSignal, &info, this]() {
+  GetPlatform().RunTask(Platform::Thread::Gui, [&checkTimedSignal, &info, this]()
+  {
     info.m_longitude = 0.;
     info.m_latitude = 1.;
     info.m_speed = measurement_utils::KmphToMps(60);
@@ -345,8 +334,7 @@ UNIT_CLASS_TEST(AsyncGuiThreadTestWithRoutingSession, TestRouteRebuildingMovingA
     TEST_EQUAL(code, SessionState::RouteNeedRebuild, ());
     checkTimedSignal.Signal();
   });
-  TEST(checkTimedSignal.WaitUntil(steady_clock::now() + kRouteBuildingMaxDuration),
-       ("Route was not rebuilt."));
+  TEST(checkTimedSignal.WaitUntil(steady_clock::now() + kRouteBuildingMaxDuration), ("Route was not rebuilt."));
 }
 
 // Test on route rebuilding when current position moving to the route starting far from the route.
@@ -357,32 +345,29 @@ UNIT_CLASS_TEST(AsyncGuiThreadTestWithRoutingSession, TestRouteRebuildingMovingT
   size_t counter = 0;
 
   TimedSignal alongTimedSignal;
-  GetPlatform().RunTask(Platform::Thread::Gui, [&alongTimedSignal, this, &counter]() {
+  GetPlatform().RunTask(Platform::Thread::Gui, [&alongTimedSignal, this, &counter]()
+  {
     InitRoutingSession();
     Route masterRoute("dummy", kTestRoute.begin(), kTestRoute.end(), 0 /* route id */);
     FillSubroutesInfo(masterRoute);
 
-    unique_ptr<DummyRouter> router =
-        make_unique<DummyRouter>(masterRoute, RouterResultCode::NoError, counter);
+    unique_ptr<DummyRouter> router = make_unique<DummyRouter>(masterRoute, RouterResultCode::NoError, counter);
     m_session->SetRouter(std::move(router), nullptr);
 
-    m_session->SetRoutingCallbacks(
-        [&alongTimedSignal](Route const &, RouterResultCode) { alongTimedSignal.Signal(); },
-        nullptr /* rebuildReadyCallback */, nullptr /* needMoreMapsCallback */,
-        nullptr /* removeRouteCallback */);
-    m_session->BuildRoute(Checkpoints(kTestRoute.front(), kTestRoute.back()),
-                          RouterDelegate::kNoTimeout);
+    m_session->SetRoutingCallbacks([&alongTimedSignal](Route const &, RouterResultCode) { alongTimedSignal.Signal(); },
+                                   nullptr /* rebuildReadyCallback */, nullptr /* needMoreMapsCallback */,
+                                   nullptr /* removeRouteCallback */);
+    m_session->BuildRoute(Checkpoints(kTestRoute.front(), kTestRoute.back()), RouterDelegate::kNoTimeout);
   });
   TEST(alongTimedSignal.WaitUntil(steady_clock::now() + kRouteBuildingMaxDuration), ("Route was not built."));
   TEST_EQUAL(counter, 1, ());
 
   // Going starting far from the route and moving to the route but rebuild flag still is set.
   {
-    SessionStateTest sessionStateTest(
-        {SessionState::RouteNotStarted, SessionState::RouteNeedRebuild},
-        *m_session);
+    SessionStateTest sessionStateTest({SessionState::RouteNotStarted, SessionState::RouteNeedRebuild}, *m_session);
     TimedSignal checkTimedSignalAway;
-    GetPlatform().RunTask(Platform::Thread::Gui, [&checkTimedSignalAway, &info, this]() {
+    GetPlatform().RunTask(Platform::Thread::Gui, [&checkTimedSignalAway, &info, this]()
+    {
       info.m_longitude = 0.0;
       info.m_latitude = 0.0;
       info.m_speed = measurement_utils::KmphToMps(60);
@@ -397,8 +382,7 @@ UNIT_CLASS_TEST(AsyncGuiThreadTestWithRoutingSession, TestRouteRebuildingMovingT
       TEST_EQUAL(code, SessionState::RouteNeedRebuild, ());
       checkTimedSignalAway.Signal();
     });
-    TEST(checkTimedSignalAway.WaitUntil(steady_clock::now() + kRouteBuildingMaxDuration),
-         ("Route was not rebuilt."));
+    TEST(checkTimedSignalAway.WaitUntil(steady_clock::now() + kRouteBuildingMaxDuration), ("Route was not rebuilt."));
   }
 }
 
@@ -408,27 +392,26 @@ UNIT_CLASS_TEST(AsyncGuiThreadTestWithRoutingSession, TestFollowRouteFlagPersist
   size_t counter = 0;
 
   TimedSignal alongTimedSignal;
-  GetPlatform().RunTask(Platform::Thread::Gui, [&alongTimedSignal, this, &counter]() {
+  GetPlatform().RunTask(Platform::Thread::Gui, [&alongTimedSignal, this, &counter]()
+  {
     InitRoutingSession();
     Route masterRoute("dummy", kTestRoute.begin(), kTestRoute.end(), 0 /* route id */);
     FillSubroutesInfo(masterRoute, kTestTurns);
-    unique_ptr<DummyRouter> router =
-        make_unique<DummyRouter>(masterRoute, RouterResultCode::NoError, counter);
+    unique_ptr<DummyRouter> router = make_unique<DummyRouter>(masterRoute, RouterResultCode::NoError, counter);
     m_session->SetRouter(std::move(router), nullptr);
 
     // Go along the route.
-    m_session->SetRoutingCallbacks(
-        [&alongTimedSignal](Route const &, RouterResultCode) { alongTimedSignal.Signal(); },
-        nullptr /* rebuildReadyCallback */, nullptr /* needMoreMapsCallback */,
-        nullptr /* removeRouteCallback */);
-    m_session->BuildRoute(Checkpoints(kTestRoute.front(), kTestRoute.back()),
-                          RouterDelegate::kNoTimeout);
+    m_session->SetRoutingCallbacks([&alongTimedSignal](Route const &, RouterResultCode) { alongTimedSignal.Signal(); },
+                                   nullptr /* rebuildReadyCallback */, nullptr /* needMoreMapsCallback */,
+                                   nullptr /* removeRouteCallback */);
+    m_session->BuildRoute(Checkpoints(kTestRoute.front(), kTestRoute.back()), RouterDelegate::kNoTimeout);
   });
   TEST(alongTimedSignal.WaitUntil(steady_clock::now() + kRouteBuildingMaxDuration), ("Route was not built."));
   TEST_EQUAL(m_onNewTurnCallbackCounter, 0, ());
 
   TimedSignal oppositeTimedSignal;
-  GetPlatform().RunTask(Platform::Thread::Gui, [&oppositeTimedSignal, &info, this, &counter]() {
+  GetPlatform().RunTask(Platform::Thread::Gui, [&oppositeTimedSignal, &info, this, &counter]()
+  {
     TEST(!m_session->IsFollowing(), ());
     m_session->EnableFollowMode();
     TEST(m_session->IsFollowing(), ());
@@ -447,18 +430,17 @@ UNIT_CLASS_TEST(AsyncGuiThreadTestWithRoutingSession, TestFollowRouteFlagPersist
     TEST_EQUAL(counter, 1, ());
 
     // Rebuild route and go in opposite direction. So initiate a route rebuilding flag.
-    m_session->SetRoutingCallbacks(
-        [&oppositeTimedSignal](Route const &, RouterResultCode) { oppositeTimedSignal.Signal(); },
-        nullptr /* rebuildReadyCallback */, nullptr /* needMoreMapsCallback */,
-        nullptr /* removeRouteCallback */);
-    m_session->BuildRoute(Checkpoints(kTestRoute.front(), kTestRoute.back()),
-                          RouterDelegate::kNoTimeout);
+    m_session->SetRoutingCallbacks([&oppositeTimedSignal](Route const &, RouterResultCode)
+    { oppositeTimedSignal.Signal(); }, nullptr /* rebuildReadyCallback */, nullptr /* needMoreMapsCallback */,
+                                   nullptr /* removeRouteCallback */);
+    m_session->BuildRoute(Checkpoints(kTestRoute.front(), kTestRoute.back()), RouterDelegate::kNoTimeout);
   });
   TEST(oppositeTimedSignal.WaitUntil(steady_clock::now() + kRouteBuildingMaxDuration), ("Route was not built."));
   TEST_EQUAL(m_onNewTurnCallbackCounter, 1, ());
 
   TimedSignal rebuildTimedSignal;
-  GetPlatform().RunTask(Platform::Thread::Gui, [&rebuildTimedSignal, &info, this] {
+  GetPlatform().RunTask(Platform::Thread::Gui, [&rebuildTimedSignal, &info, this]
+  {
     // Manual route building resets the following flag.
     TEST(!m_session->IsFollowing(), ());
     m_session->EnableFollowMode();
@@ -475,17 +457,16 @@ UNIT_CLASS_TEST(AsyncGuiThreadTestWithRoutingSession, TestFollowRouteFlagPersist
     TEST_EQUAL(code, SessionState::RouteNeedRebuild, ());
     TEST(m_session->IsFollowing(), ());
 
-    m_session->RebuildRoute(
-        kTestRoute.front(),
-        [&rebuildTimedSignal](Route const &, RouterResultCode) { rebuildTimedSignal.Signal(); },
-        nullptr /* needMoreMapsCallback */, nullptr /* removeRouteCallback */, RouterDelegate::kNoTimeout,
-        SessionState::RouteBuilding, false /* adjust */);
+    m_session->RebuildRoute(kTestRoute.front(), [&rebuildTimedSignal](Route const &, RouterResultCode)
+    { rebuildTimedSignal.Signal(); }, nullptr /* needMoreMapsCallback */, nullptr /* removeRouteCallback */,
+                            RouterDelegate::kNoTimeout, SessionState::RouteBuilding, false /* adjust */);
   });
   TEST(rebuildTimedSignal.WaitUntil(steady_clock::now() + kRouteBuildingMaxDuration), ("Route was not built."));
   TEST_EQUAL(m_onNewTurnCallbackCounter, 1, ());
 
   TimedSignal checkTimedSignal;
-  GetPlatform().RunTask(Platform::Thread::Gui, [&checkTimedSignal, this] {
+  GetPlatform().RunTask(Platform::Thread::Gui, [&checkTimedSignal, this]
+  {
     TEST(m_session->IsFollowing(), ());
     checkTimedSignal.Signal();
   });
@@ -496,30 +477,29 @@ UNIT_CLASS_TEST(AsyncGuiThreadTestWithRoutingSession, TestFollowRouteFlagPersist
 UNIT_CLASS_TEST(AsyncGuiThreadTestWithRoutingSession, TestFollowRoutePercentTest)
 {
   TimedSignal alongTimedSignal;
-  GetPlatform().RunTask(Platform::Thread::Gui, [&alongTimedSignal, this]() {
+  GetPlatform().RunTask(Platform::Thread::Gui, [&alongTimedSignal, this]()
+  {
     InitRoutingSession();
     Route masterRoute("dummy", kTestRoute.begin(), kTestRoute.end(), 0 /* route id */);
     FillSubroutesInfo(masterRoute);
 
     size_t counter = 0;
-    unique_ptr<DummyRouter> router =
-        make_unique<DummyRouter>(masterRoute, RouterResultCode::NoError, counter);
+    unique_ptr<DummyRouter> router = make_unique<DummyRouter>(masterRoute, RouterResultCode::NoError, counter);
     m_session->SetRouter(std::move(router), nullptr);
 
     // Get completion percent of unexisted route.
     TEST_EQUAL(m_session->GetCompletionPercent(), 0, (m_session->GetCompletionPercent()));
     // Go along the route.
-    m_session->SetRoutingCallbacks(
-        [&alongTimedSignal](Route const &, RouterResultCode) { alongTimedSignal.Signal(); },
-        nullptr /* rebuildReadyCallback */, nullptr /* needMoreMapsCallback */,
-        nullptr /* removeRouteCallback */);
-    m_session->BuildRoute(Checkpoints(kTestRoute.front(), kTestRoute.back()),
-                          RouterDelegate::kNoTimeout);
+    m_session->SetRoutingCallbacks([&alongTimedSignal](Route const &, RouterResultCode) { alongTimedSignal.Signal(); },
+                                   nullptr /* rebuildReadyCallback */, nullptr /* needMoreMapsCallback */,
+                                   nullptr /* removeRouteCallback */);
+    m_session->BuildRoute(Checkpoints(kTestRoute.front(), kTestRoute.back()), RouterDelegate::kNoTimeout);
   });
   TEST(alongTimedSignal.WaitUntil(steady_clock::now() + kRouteBuildingMaxDuration), ("Route was not built."));
 
   TimedSignal checkTimedSignal;
-  GetPlatform().RunTask(Platform::Thread::Gui, [&checkTimedSignal, this] {
+  GetPlatform().RunTask(Platform::Thread::Gui, [&checkTimedSignal, this]
+  {
     // Get completion percent of unstarted route.
     TEST_EQUAL(m_session->GetCompletionPercent(), 0, (m_session->GetCompletionPercent()));
 
@@ -531,30 +511,25 @@ UNIT_CLASS_TEST(AsyncGuiThreadTestWithRoutingSession, TestFollowRoutePercentTest
     info.m_longitude = 0.;
     info.m_latitude = 1.;
     m_session->OnLocationPositionChanged(info);
-    TEST(AlmostEqualAbs(m_session->GetCompletionPercent(), 0., 0.5),
-         (m_session->GetCompletionPercent()));
+    TEST(AlmostEqualAbs(m_session->GetCompletionPercent(), 0., 0.5), (m_session->GetCompletionPercent()));
 
     info.m_longitude = 0.;
     info.m_latitude = 2.;
     m_session->OnLocationPositionChanged(info);
-    TEST(AlmostEqualAbs(m_session->GetCompletionPercent(), 33.3, 0.5),
-         (m_session->GetCompletionPercent()));
+    TEST(AlmostEqualAbs(m_session->GetCompletionPercent(), 33.3, 0.5), (m_session->GetCompletionPercent()));
 
     info.m_longitude = 0.;
     info.m_latitude = 3.;
     m_session->OnLocationPositionChanged(info);
-    TEST(AlmostEqualAbs(m_session->GetCompletionPercent(), 66.6, 0.5),
-         (m_session->GetCompletionPercent()));
+    TEST(AlmostEqualAbs(m_session->GetCompletionPercent(), 66.6, 0.5), (m_session->GetCompletionPercent()));
 
     info.m_longitude = 0.;
     info.m_latitude = 3.99;
     m_session->OnLocationPositionChanged(info);
-    TEST(AlmostEqualAbs(m_session->GetCompletionPercent(), 100., 0.5),
-         (m_session->GetCompletionPercent()));
+    TEST(AlmostEqualAbs(m_session->GetCompletionPercent(), 100., 0.5), (m_session->GetCompletionPercent()));
     checkTimedSignal.Signal();
   });
-  TEST(checkTimedSignal.WaitUntil(steady_clock::now() + kRouteBuildingMaxDuration),
-       ("Route checking timeout."));
+  TEST(checkTimedSignal.WaitUntil(steady_clock::now() + kRouteBuildingMaxDuration), ("Route checking timeout."));
 }
 
 UNIT_CLASS_TEST(AsyncGuiThreadTestWithRoutingSession, TestRouteRebuildingError)
@@ -562,44 +537,40 @@ UNIT_CLASS_TEST(AsyncGuiThreadTestWithRoutingSession, TestRouteRebuildingError)
   vector<m2::PointD> const kRoute = {{0.0, 0.001}, {0.0, 0.002}, {0.0, 0.003}, {0.0, 0.004}};
   // Creation RoutingSession.
   TimedSignal createTimedSignal;
-  GetPlatform().RunTask(Platform::Thread::Gui, [this, &kRoute, &createTimedSignal]() {
+  GetPlatform().RunTask(Platform::Thread::Gui, [this, &kRoute, &createTimedSignal]()
+  {
     InitRoutingSession();
-    unique_ptr<ReturnCodesRouter> router = make_unique<ReturnCodesRouter>(initializer_list<
-        RouterResultCode>{RouterResultCode::NoError, RouterResultCode::InternalError}, kRoute);
+    unique_ptr<ReturnCodesRouter> router = make_unique<ReturnCodesRouter>(
+        initializer_list<RouterResultCode>{RouterResultCode::NoError, RouterResultCode::InternalError}, kRoute);
     m_session->SetRouter(std::move(router), nullptr);
     createTimedSignal.Signal();
   });
-  TEST(createTimedSignal.WaitUntil(steady_clock::now() + kRouteBuildingMaxDuration),
-       ("RouteSession was not created."));
+  TEST(createTimedSignal.WaitUntil(steady_clock::now() + kRouteBuildingMaxDuration), ("RouteSession was not created."));
 
   // Building a route.
   {
     SessionStateTest sessionStateTest(
-        {SessionState::NoValidRoute, SessionState::RouteBuilding, SessionState::RouteNotStarted},
-        *m_session);
+        {SessionState::NoValidRoute, SessionState::RouteBuilding, SessionState::RouteNotStarted}, *m_session);
     TimedSignal buildTimedSignal;
-    GetPlatform().RunTask(Platform::Thread::Gui, [this, &kRoute, &buildTimedSignal]() {
-      m_session->SetRoutingCallbacks(
-          [&buildTimedSignal](Route const &, RouterResultCode) { buildTimedSignal.Signal(); },
-          nullptr /* rebuildReadyCallback */, nullptr /* needMoreMapsCallback */,
-          nullptr /* removeRouteCallback */);
+    GetPlatform().RunTask(Platform::Thread::Gui, [this, &kRoute, &buildTimedSignal]()
+    {
+      m_session->SetRoutingCallbacks([&buildTimedSignal](Route const &, RouterResultCode)
+      { buildTimedSignal.Signal(); }, nullptr /* rebuildReadyCallback */, nullptr /* needMoreMapsCallback */,
+                                     nullptr /* removeRouteCallback */);
 
-      m_session->BuildRoute(Checkpoints(kRoute.front(), kRoute.back()),
-                            RouterDelegate::kNoTimeout);
+      m_session->BuildRoute(Checkpoints(kRoute.front(), kRoute.back()), RouterDelegate::kNoTimeout);
     });
-    TEST(buildTimedSignal
-             .WaitUntil(steady_clock::now() + kRouteBuildingMaxDuration), ("Route was not built."));
+    TEST(buildTimedSignal.WaitUntil(steady_clock::now() + kRouteBuildingMaxDuration), ("Route was not built."));
   }
 
   location::GpsInfo info;
-  info.m_horizontalAccuracy = 5.0; // meters
-  info.m_verticalAccuracy = 5.0; // meters
+  info.m_horizontalAccuracy = 5.0;  // meters
+  info.m_verticalAccuracy = 5.0;    // meters
   info.m_longitude = 0.0;
 
   // Moving along route.
   {
-    SessionStateTest sessionStateTest({SessionState::RouteNotStarted, SessionState::OnRoute},
-                                      *m_session);
+    SessionStateTest sessionStateTest({SessionState::RouteNotStarted, SessionState::OnRoute}, *m_session);
     vector<double> const latitudes = {0.001, 0.0015, 0.002};
     TestMovingByUpdatingLat(sessionStateTest, latitudes, info, *m_session);
   }
@@ -609,8 +580,7 @@ UNIT_CLASS_TEST(AsyncGuiThreadTestWithRoutingSession, TestRouteRebuildingError)
 
   // Continue moving along the route.
   {
-    SessionStateTest sessionStateTest({SessionState::RouteNeedRebuild, SessionState::OnRoute},
-                                      *m_session);
+    SessionStateTest sessionStateTest({SessionState::RouteNeedRebuild, SessionState::OnRoute}, *m_session);
     vector<double> const latitudes = {0.002, 0.0025, 0.003};
     TestMovingByUpdatingLat(sessionStateTest, latitudes, info, *m_session);
   }
@@ -620,22 +590,20 @@ UNIT_CLASS_TEST(AsyncGuiThreadTestWithRoutingSession, TestRouteRebuildingError)
   // In this case the navigation is continued based on the former route.
   TestLeavingRoute(*m_session, info);
   {
-    SessionStateTest sessionStateTest(
-        {SessionState::RouteNeedRebuild, SessionState::RouteRebuilding}, *m_session);
+    SessionStateTest sessionStateTest({SessionState::RouteNeedRebuild, SessionState::RouteRebuilding}, *m_session);
     TimedSignal signal;
-    GetPlatform().RunTask(Platform::Thread::Gui, [this, &signal]() {
+    GetPlatform().RunTask(Platform::Thread::Gui, [this, &signal]()
+    {
       m_session->SetState(SessionState::RouteRebuilding);
       signal.Signal();
     });
-    TEST(signal.WaitUntil(steady_clock::now() + kRouteBuildingMaxDuration),
-         ("State was not set."));
+    TEST(signal.WaitUntil(steady_clock::now() + kRouteBuildingMaxDuration), ("State was not set."));
   }
 
   // Continue moving along the route again.
   {
     // Test on state is not changed.
-    SessionStateTest sessionStateTest({SessionState::RouteRebuilding, SessionState::OnRoute},
-                                      *m_session);
+    SessionStateTest sessionStateTest({SessionState::RouteRebuilding, SessionState::OnRoute}, *m_session);
     vector<double> const latitudes = {0.003, 0.0035, 0.004};
     TestMovingByUpdatingLat(sessionStateTest, latitudes, info, *m_session);
   }
diff --git a/libs/routing/routing_tests/speed_cameras_tests.cpp b/libs/routing/routing_tests/speed_cameras_tests.cpp
index c4c8306b0..593dde79d 100644
--- a/libs/routing/routing_tests/speed_cameras_tests.cpp
+++ b/libs/routing/routing_tests/speed_cameras_tests.cpp
@@ -2,12 +2,12 @@
 
 #include "routing/speed_camera_ser_des.hpp"
 
-#include "platform/platform_tests_support/scoped_file.hpp"
 #include "platform/platform_tests_support/scoped_dir.hpp"
+#include "platform/platform_tests_support/scoped_file.hpp"
 
-#include "coding/files_container.hpp"
 #include "coding/file_reader.hpp"
 #include "coding/file_writer.hpp"
+#include "coding/files_container.hpp"
 
 #include "base/assert.hpp"
 #include "base/file_name_utils.hpp"
diff --git a/libs/routing/routing_tests/tools.cpp b/libs/routing/routing_tests/tools.cpp
index b1b966a49..2a71507c4 100644
--- a/libs/routing/routing_tests/tools.cpp
+++ b/libs/routing/routing_tests/tools.cpp
@@ -11,8 +11,8 @@ void AsyncGuiThreadTestWithRoutingSession::InitRoutingSession()
 }
 
 void RouteSegmentsFrom(std::vector<Segment> const & segments, std::vector<m2::PointD> const & path,
-                       std::vector<turns::TurnItem> const & turns, std::vector<RouteSegment::RoadNameInfo> const & names,
-                       std::vector<RouteSegment> & routeSegments)
+                       std::vector<turns::TurnItem> const & turns,
+                       std::vector<RouteSegment::RoadNameInfo> const & names, std::vector<RouteSegment> & routeSegments)
 {
   size_t size = segments.size();
   if (size == 0)
@@ -31,7 +31,7 @@ void RouteSegmentsFrom(std::vector<Segment> const & segments, std::vector<m2::Po
   {
     geometry::PointWithAltitude point;
     if (path.size() > 0)
-      point = geometry::PointWithAltitude(path[i+1], geometry::kDefaultAltitudeMeters);
+      point = geometry::PointWithAltitude(path[i + 1], geometry::kDefaultAltitudeMeters);
     Segment segment({0, 0, 0, true});
     if (segments.size() > 0)
       segment = segments[i];
diff --git a/libs/routing/routing_tests/tools.hpp b/libs/routing/routing_tests/tools.hpp
index 7ed045b11..793524711 100644
--- a/libs/routing/routing_tests/tools.hpp
+++ b/libs/routing/routing_tests/tools.hpp
@@ -23,6 +23,7 @@ public:
 };
 
 void RouteSegmentsFrom(std::vector<Segment> const & segments, std::vector<m2::PointD> const & path,
-                       std::vector<turns::TurnItem> const & turns, std::vector<RouteSegment::RoadNameInfo> const & names,
+                       std::vector<turns::TurnItem> const & turns,
+                       std::vector<RouteSegment::RoadNameInfo> const & names,
                        std::vector<RouteSegment> & routeSegments);
 }  // namespace routing
diff --git a/libs/routing/routing_tests/turns_generator_test.cpp b/libs/routing/routing_tests/turns_generator_test.cpp
index 9573da75c..41cde9746 100644
--- a/libs/routing/routing_tests/turns_generator_test.cpp
+++ b/libs/routing/routing_tests/turns_generator_test.cpp
@@ -2,13 +2,13 @@
 
 #include "routing/routing_tests/tools.hpp"
 
+#include "routing/car_directions.hpp"
 #include "routing/loaded_path_segment.hpp"
 #include "routing/route.hpp"
 #include "routing/routing_result_graph.hpp"
 #include "routing/turns.hpp"
-#include "routing/turns_generator_utils.hpp"
 #include "routing/turns_generator.hpp"
-#include "routing/car_directions.hpp"
+#include "routing/turns_generator_utils.hpp"
 
 #include "indexer/ftypes_matcher.hpp"
 
@@ -36,8 +36,8 @@ public:
 
   TUnpackedPathSegments const & GetSegments() const override { return m_segments; }
 
-  void GetPossibleTurns(SegmentRange const & segmentRange, m2::PointD const & junctionPoint,
-                        size_t & ingoingCount, TurnCandidates & outgoingTurns) const override
+  void GetPossibleTurns(SegmentRange const & segmentRange, m2::PointD const & junctionPoint, size_t & ingoingCount,
+                        TurnCandidates & outgoingTurns) const override
   {
     outgoingTurns.candidates.emplace_back(0.0, Segment(), ftypes::HighwayClass::Tertiary, false);
     outgoingTurns.isCandidatesAngleValid = false;
@@ -126,10 +126,8 @@ UNIT_TEST(TestParseLanes)
 {
   vector<SingleLaneInfo> result;
   TEST(ParseLanes("through|through|through|through;right", result), ());
-  vector<SingleLaneInfo> const expected1 = {{LaneWay::Through},
-                                            {LaneWay::Through},
-                                            {LaneWay::Through},
-                                            {LaneWay::Through, LaneWay::Right}};
+  vector<SingleLaneInfo> const expected1 = {
+      {LaneWay::Through}, {LaneWay::Through}, {LaneWay::Through}, {LaneWay::Through, LaneWay::Right}};
   TEST_EQUAL(result, expected1, ());
 
   TEST(ParseLanes("left|left;through|through|through", result), ());
@@ -138,8 +136,7 @@ UNIT_TEST(TestParseLanes)
   TEST_EQUAL(result, expected2, ());
 
   TEST(ParseLanes("left|through|through", result), ());
-  vector<SingleLaneInfo> const expected3 = {
-      {LaneWay::Left}, {LaneWay::Through}, {LaneWay::Through}};
+  vector<SingleLaneInfo> const expected3 = {{LaneWay::Left}, {LaneWay::Through}, {LaneWay::Through}};
   TEST_EQUAL(result, expected3, ());
 
   TEST(ParseLanes("left|le  ft|   through|through   |  right", result), ());
@@ -153,12 +150,11 @@ UNIT_TEST(TestParseLanes)
   TEST_EQUAL(result, expected5, ());
 
   TEST(ParseLanes("left|Left|through|througH|through;right;sharp_rIght", result), ());
-  vector<SingleLaneInfo> const expected6 = {
-      {LaneWay::Left},
-      {LaneWay::Left},
-      {LaneWay::Through},
-      {LaneWay::Through},
-      {LaneWay::Through, LaneWay::Right, LaneWay::SharpRight}};
+  vector<SingleLaneInfo> const expected6 = {{LaneWay::Left},
+                                            {LaneWay::Left},
+                                            {LaneWay::Through},
+                                            {LaneWay::Through},
+                                            {LaneWay::Through, LaneWay::Right, LaneWay::SharpRight}};
   TEST_EQUAL(result, expected6, ());
 
   TEST(!ParseLanes("left|Leftt|through|througH|right", result), ());
@@ -176,14 +172,8 @@ UNIT_TEST(TestParseLanes)
   TEST_EQUAL(result, expected7, ());
 
   TEST(ParseLanes("|||||slight_right", result), ());
-  vector<SingleLaneInfo> const expected8 = {
-    {LaneWay::None},
-    {LaneWay::None},
-    {LaneWay::None},
-    {LaneWay::None},
-    {LaneWay::None},
-    {LaneWay::SlightRight}
-  };
+  vector<SingleLaneInfo> const expected8 = {{LaneWay::None}, {LaneWay::None}, {LaneWay::None},
+                                            {LaneWay::None}, {LaneWay::None}, {LaneWay::SlightRight}};
   TEST_EQUAL(result, expected8, ());
 }
 
@@ -195,46 +185,36 @@ UNIT_TEST(TestFixupTurns)
       mercator::MetersToXY(kSquareCenterLonLat.x, kSquareCenterLonLat.y, kHalfSquareSideMeters);
   {
     // Removing a turn in case staying on a roundabout.
-    vector<m2::PointD> const pointsMerc1 =
-        {{kSquareNearZero.minX(), kSquareNearZero.minY()},
-        {kSquareNearZero.minX(), kSquareNearZero.minY()},
-        {kSquareNearZero.maxX(), kSquareNearZero.maxY()},
-        {kSquareNearZero.maxX(), kSquareNearZero.minY()}};
+    vector<m2::PointD> const pointsMerc1 = {{kSquareNearZero.minX(), kSquareNearZero.minY()},
+                                            {kSquareNearZero.minX(), kSquareNearZero.minY()},
+                                            {kSquareNearZero.maxX(), kSquareNearZero.maxY()},
+                                            {kSquareNearZero.maxX(), kSquareNearZero.minY()}};
     // The constructor TurnItem(uint32_t idx, CarDirection t, uint32_t exitNum = 0)
     // is used for initialization of vector<TurnItem> below.
-    vector<turns::TurnItem> turnsDir1 =
-        {{1, CarDirection::EnterRoundAbout},
-        {2, CarDirection::StayOnRoundAbout},
-        {3, CarDirection::LeaveRoundAbout}};
+    vector<turns::TurnItem> turnsDir1 = {
+        {1, CarDirection::EnterRoundAbout}, {2, CarDirection::StayOnRoundAbout}, {3, CarDirection::LeaveRoundAbout}};
     vector<RouteSegment> routeSegments;
     RouteSegmentsFrom({}, pointsMerc1, turnsDir1, {}, routeSegments);
     FixupCarTurns(routeSegments);
-    vector<turns::TurnItem> const expectedTurnDir1 =
-        {{1, CarDirection::EnterRoundAbout, 2},
-        {2, CarDirection::None, 0},
-        {3, CarDirection::LeaveRoundAbout, 2}};
+    vector<turns::TurnItem> const expectedTurnDir1 = {
+        {1, CarDirection::EnterRoundAbout, 2}, {2, CarDirection::None, 0}, {3, CarDirection::LeaveRoundAbout, 2}};
     TEST_EQUAL(routeSegments[0].GetTurn(), expectedTurnDir1[0], ());
     TEST_EQUAL(routeSegments[1].GetTurn(), expectedTurnDir1[1], ());
     TEST_EQUAL(routeSegments[2].GetTurn(), expectedTurnDir1[2], ());
   }
   {
     // Merging turns which are close to each other.
-    vector<m2::PointD> const pointsMerc2 =
-        {{kSquareNearZero.minX(), kSquareNearZero.minY()},
-        {kSquareNearZero.minX(), kSquareNearZero.minY()},
-        {kSquareCenterLonLat.x, kSquareCenterLonLat.y},
-        {kSquareNearZero.maxX(), kSquareNearZero.maxY()}};
-    vector<turns::TurnItem> turnsDir2 =
-        {{1, CarDirection::None},
-        {2, CarDirection::GoStraight},
-        {3, CarDirection::TurnLeft}};
+    vector<m2::PointD> const pointsMerc2 = {{kSquareNearZero.minX(), kSquareNearZero.minY()},
+                                            {kSquareNearZero.minX(), kSquareNearZero.minY()},
+                                            {kSquareCenterLonLat.x, kSquareCenterLonLat.y},
+                                            {kSquareNearZero.maxX(), kSquareNearZero.maxY()}};
+    vector<turns::TurnItem> turnsDir2 = {
+        {1, CarDirection::None}, {2, CarDirection::GoStraight}, {3, CarDirection::TurnLeft}};
     vector<RouteSegment> routeSegments2;
     RouteSegmentsFrom({}, pointsMerc2, turnsDir2, {}, routeSegments2);
     FixupCarTurns(routeSegments2);
-    vector<turns::TurnItem> const expectedTurnDir2 =
-        {{1, CarDirection::None},
-        {2, CarDirection::None},
-        {3, CarDirection::TurnLeft}};
+    vector<turns::TurnItem> const expectedTurnDir2 = {
+        {1, CarDirection::None}, {2, CarDirection::None}, {3, CarDirection::TurnLeft}};
     TEST_EQUAL(routeSegments2[0].GetTurn(), expectedTurnDir2[0], ());
     TEST_EQUAL(routeSegments2[1].GetTurn(), expectedTurnDir2[1], ());
     TEST_EQUAL(routeSegments2[2].GetTurn(), expectedTurnDir2[2], ());
@@ -246,14 +226,12 @@ UNIT_TEST(TestFixupTurns)
         {kSquareNearZero.minX(), kSquareNearZero.maxY()},
         {kSquareNearZero.maxX(), kSquareNearZero.maxY()},
     };
-    vector<turns::TurnItem> turnsDir3 = {{1, CarDirection::None},
-                                        {2, CarDirection::TurnRight}};
+    vector<turns::TurnItem> turnsDir3 = {{1, CarDirection::None}, {2, CarDirection::TurnRight}};
 
     vector<RouteSegment> routeSegments3;
     RouteSegmentsFrom({}, {}, turnsDir3, {}, routeSegments3);
     FixupCarTurns(routeSegments3);
-    vector<turns::TurnItem> const expectedTurnDir3 = {{1, CarDirection::None},
-                                                      {2, CarDirection::TurnRight}};
+    vector<turns::TurnItem> const expectedTurnDir3 = {{1, CarDirection::None}, {2, CarDirection::TurnRight}};
 
     TEST_EQUAL(routeSegments3[0].GetTurn(), expectedTurnDir3[0], ());
     TEST_EQUAL(routeSegments3[1].GetTurn(), expectedTurnDir3[1], ());
@@ -295,17 +273,15 @@ UNIT_TEST(TestIsLaneWayConformedTurnDirectionApproximately)
   TEST(!IsLaneWayConformedTurnDirectionApproximately(LaneWay::SharpRight, CarDirection::UTurnRight), ());
   TEST(!IsLaneWayConformedTurnDirection(LaneWay::Through, CarDirection::ReachedYourDestination), ());
   TEST(!IsLaneWayConformedTurnDirectionApproximately(LaneWay::Through, CarDirection::TurnRight), ());
-  TEST(!IsLaneWayConformedTurnDirectionApproximately(LaneWay::SlightRight,
-                                                     CarDirection::TurnSharpLeft), ());
+  TEST(!IsLaneWayConformedTurnDirectionApproximately(LaneWay::SlightRight, CarDirection::TurnSharpLeft), ());
 }
 
 UNIT_TEST(TestAddingActiveLaneInformation)
 {
-  vector<turns::TurnItem> turns =
-      {{1, CarDirection::GoStraight},
-       {2, CarDirection::TurnLeft},
-       {3, CarDirection::TurnRight},
-       {4, CarDirection::ReachedYourDestination}};
+  vector<turns::TurnItem> turns = {{1, CarDirection::GoStraight},
+                                   {2, CarDirection::TurnLeft},
+                                   {3, CarDirection::TurnRight},
+                                   {4, CarDirection::ReachedYourDestination}};
 
   turns[0].m_lanes.push_back({LaneWay::Left, LaneWay::Through});
   turns[0].m_lanes.push_back({LaneWay::Right});
@@ -400,51 +376,41 @@ UNIT_TEST(TestCheckUTurnOnRoute)
   pathSegments[0].m_onRoundabout = false;
   pathSegments[0].m_isLink = false;
   pathSegments[0].m_path = {{{0, 0}, 0}, {{0, 1}, 0}};
-  pathSegments[0].m_segmentRange = SegmentRange(FeatureID(), 0 /* start seg id */, 1 /* end seg id */,
-                                                true /* forward */,
-                                                pathSegments[0].m_path.front().GetPoint(),
-                                                pathSegments[0].m_path.back().GetPoint());
+  pathSegments[0].m_segmentRange =
+      SegmentRange(FeatureID(), 0 /* start seg id */, 1 /* end seg id */, true /* forward */,
+                   pathSegments[0].m_path.front().GetPoint(), pathSegments[0].m_path.back().GetPoint());
 
   pathSegments[1] = pathSegments[0];
-  pathSegments[1].m_segmentRange = SegmentRange(FeatureID(), 1 /* start seg id */, 2 /* end seg id */,
-                                     true /* forward */,
-                                     pathSegments[1].m_path.front().GetPoint(),
-                                     pathSegments[1].m_path.back().GetPoint());
+  pathSegments[1].m_segmentRange =
+      SegmentRange(FeatureID(), 1 /* start seg id */, 2 /* end seg id */, true /* forward */,
+                   pathSegments[1].m_path.front().GetPoint(), pathSegments[1].m_path.back().GetPoint());
   pathSegments[1].m_path = {{{0, 1}, 0}, {{0, 0}, 0}};
 
   pathSegments[2] = pathSegments[0];
-  pathSegments[2].m_segmentRange = SegmentRange(FeatureID(), 2 /* start seg id */, 3 /* end seg id */,
-                                       true /* forward */,
-                                       pathSegments[2].m_path.front().GetPoint(),
-                                       pathSegments[2].m_path.back().GetPoint());
+  pathSegments[2].m_segmentRange =
+      SegmentRange(FeatureID(), 2 /* start seg id */, 3 /* end seg id */, true /* forward */,
+                   pathSegments[2].m_path.front().GetPoint(), pathSegments[2].m_path.back().GetPoint());
   pathSegments[2].m_path = {{{0, 0}, 0}, {{0, 1}, 0}};
 
   pathSegments[3] = pathSegments[0];
-  pathSegments[3].m_segmentRange = SegmentRange(FeatureID(), 3 /* start seg id */, 4 /* end seg id */,
-                                       true /* forward */,
-                                       pathSegments[3].m_path.front().GetPoint(),
-                                       pathSegments[3].m_path.back().GetPoint());
+  pathSegments[3].m_segmentRange =
+      SegmentRange(FeatureID(), 3 /* start seg id */, 4 /* end seg id */, true /* forward */,
+                   pathSegments[3].m_path.front().GetPoint(), pathSegments[3].m_path.back().GetPoint());
   pathSegments[3].m_path.clear();
 
   RoutingResultTest resultTest(pathSegments);
   RoutingSettings const vehicleSettings = GetRoutingSettings(VehicleType::Car);
   // Zigzag test.
   TurnItem turn1;
-  TEST_EQUAL(CheckUTurnOnRoute(resultTest, 1 /* outgoingSegmentIndex */, NumMwmIds(),
-                               vehicleSettings, turn1),
-             1, ());
+  TEST_EQUAL(CheckUTurnOnRoute(resultTest, 1 /* outgoingSegmentIndex */, NumMwmIds(), vehicleSettings, turn1), 1, ());
   TEST_EQUAL(turn1.m_turn, CarDirection::UTurnLeft, ());
   TurnItem turn2;
-  TEST_EQUAL(CheckUTurnOnRoute(resultTest, 2 /* outgoingSegmentIndex */, NumMwmIds(),
-                               vehicleSettings, turn2),
-             1, ());
+  TEST_EQUAL(CheckUTurnOnRoute(resultTest, 2 /* outgoingSegmentIndex */, NumMwmIds(), vehicleSettings, turn2), 1, ());
   TEST_EQUAL(turn2.m_turn, CarDirection::UTurnLeft, ());
 
   // Empty path test.
   TurnItem turn3;
-  TEST_EQUAL(CheckUTurnOnRoute(resultTest, 3 /* outgoingSegmentIndex */, NumMwmIds(),
-                               vehicleSettings, turn3),
-             0, ());
+  TEST_EQUAL(CheckUTurnOnRoute(resultTest, 3 /* outgoingSegmentIndex */, NumMwmIds(), vehicleSettings, turn3), 0, ());
 }
 
 UNIT_TEST(GetNextRoutePointIndex)
@@ -457,47 +423,47 @@ UNIT_TEST(GetNextRoutePointIndex)
   RoutePointIndex nextIndex;
 
   // Forward direction.
-  TEST(GetNextRoutePointIndex(resultTest,
-                              RoutePointIndex({0 /* m_segmentIndex */, 0 /* m_pathIndex */}),
-                              NumMwmIds(), true /* forward */, nextIndex), ());
+  TEST(GetNextRoutePointIndex(resultTest, RoutePointIndex({0 /* m_segmentIndex */, 0 /* m_pathIndex */}), NumMwmIds(),
+                              true /* forward */, nextIndex),
+       ());
   TEST_EQUAL(nextIndex, RoutePointIndex({0 /* m_segmentIndex */, 1 /* m_pathIndex */}), ());
 
-  TEST(GetNextRoutePointIndex(resultTest,
-                              RoutePointIndex({0 /* m_segmentIndex */, 1 /* m_pathIndex */}),
-                              NumMwmIds(), true /* forward */, nextIndex), ());
+  TEST(GetNextRoutePointIndex(resultTest, RoutePointIndex({0 /* m_segmentIndex */, 1 /* m_pathIndex */}), NumMwmIds(),
+                              true /* forward */, nextIndex),
+       ());
   TEST_EQUAL(nextIndex, RoutePointIndex({0 /* m_segmentIndex */, 2 /* m_pathIndex */}), ());
 
   // Trying to get next item after the last item of the first segment.
   // False because of too sharp turn angle.
-  TEST(!GetNextRoutePointIndex(resultTest,
-                               RoutePointIndex({0 /* m_segmentIndex */, 2 /* m_pathIndex */}),
-                               NumMwmIds(), true /* forward */, nextIndex), ());
+  TEST(!GetNextRoutePointIndex(resultTest, RoutePointIndex({0 /* m_segmentIndex */, 2 /* m_pathIndex */}), NumMwmIds(),
+                               true /* forward */, nextIndex),
+       ());
 
   // Trying to get point about the end of the route.
-  TEST(!GetNextRoutePointIndex(resultTest,
-                               RoutePointIndex({1 /* m_segmentIndex */, 1 /* m_pathIndex */}),
-                               NumMwmIds(), true /* forward */, nextIndex), ());
+  TEST(!GetNextRoutePointIndex(resultTest, RoutePointIndex({1 /* m_segmentIndex */, 1 /* m_pathIndex */}), NumMwmIds(),
+                               true /* forward */, nextIndex),
+       ());
 
   // Backward direction.
   // Moving in backward direction it's possible to get index of the first item of a segment.
-  TEST(GetNextRoutePointIndex(resultTest,
-                              RoutePointIndex({1 /* m_segmentIndex */, 1 /* m_pathIndex */}),
-                              NumMwmIds(), false /* forward */, nextIndex), ());
+  TEST(GetNextRoutePointIndex(resultTest, RoutePointIndex({1 /* m_segmentIndex */, 1 /* m_pathIndex */}), NumMwmIds(),
+                              false /* forward */, nextIndex),
+       ());
   TEST_EQUAL(nextIndex, RoutePointIndex({1 /* m_segmentIndex */, 0 /* m_pathIndex */}), ());
 
-  TEST(GetNextRoutePointIndex(resultTest,
-                              RoutePointIndex({0 /* m_segmentIndex */, 2 /* m_pathIndex */}),
-                              NumMwmIds(), false /* forward */, nextIndex), ());
+  TEST(GetNextRoutePointIndex(resultTest, RoutePointIndex({0 /* m_segmentIndex */, 2 /* m_pathIndex */}), NumMwmIds(),
+                              false /* forward */, nextIndex),
+       ());
   TEST_EQUAL(nextIndex, RoutePointIndex({0 /* m_segmentIndex */, 1 /* m_pathIndex */}), ());
 
-  TEST(GetNextRoutePointIndex(resultTest,
-                              RoutePointIndex({0 /* m_segmentIndex */, 1 /* m_pathIndex */}),
-                              NumMwmIds(), false /* forward */, nextIndex), ());
+  TEST(GetNextRoutePointIndex(resultTest, RoutePointIndex({0 /* m_segmentIndex */, 1 /* m_pathIndex */}), NumMwmIds(),
+                              false /* forward */, nextIndex),
+       ());
   TEST_EQUAL(nextIndex, RoutePointIndex({0 /* m_segmentIndex */, 0 /* m_pathIndex */}), ());
 
   // Trying to get point before the beginning.
-  TEST(!GetNextRoutePointIndex(resultTest,
-                               RoutePointIndex({0 /* m_segmentIndex */, 0 /* m_pathIndex */}),
-                               NumMwmIds(), false /* forward */, nextIndex), ());
+  TEST(!GetNextRoutePointIndex(resultTest, RoutePointIndex({0 /* m_segmentIndex */, 0 /* m_pathIndex */}), NumMwmIds(),
+                               false /* forward */, nextIndex),
+       ());
 }
-} // namespace turn_generator_test
+}  // namespace turn_generator_test
diff --git a/libs/routing/routing_tests/turns_sound_test.cpp b/libs/routing/routing_tests/turns_sound_test.cpp
index efc84310e..7c80ad212 100644
--- a/libs/routing/routing_tests/turns_sound_test.cpp
+++ b/libs/routing/routing_tests/turns_sound_test.cpp
@@ -18,18 +18,15 @@ double const kEps = 1.;
 
 UNIT_TEST(TurnNotificationSettings_MetersTest)
 {
-  Settings const settings(20 /* notificationTimeSeconds */, 200 /* minNotificationDistanceUnits */,
-                          700 /* maxNotificationDistanceUnits */, 5 /* m_startBeforeSeconds */,
-                          25 /* m_minStartBeforeMeters */, 150 /* m_maxStartBeforeMeters */,
-                          170 /* m_minDistToSayNotificationMeters */,
-                          {100, 200, 300, 400, 500, 600, 700} /* soundedDistancesUnits */,
-                          measurement_utils::Units::Metric /* lengthUnits */);
+  Settings const settings(
+      20 /* notificationTimeSeconds */, 200 /* minNotificationDistanceUnits */, 700 /* maxNotificationDistanceUnits */,
+      5 /* m_startBeforeSeconds */, 25 /* m_minStartBeforeMeters */, 150 /* m_maxStartBeforeMeters */,
+      170 /* m_minDistToSayNotificationMeters */, {100, 200, 300, 400, 500, 600, 700} /* soundedDistancesUnits */,
+      measurement_utils::Units::Metric /* lengthUnits */);
 
   TEST(settings.IsValid(), ());
-  TEST(AlmostEqualAbs(
-      settings.ConvertMetersPerSecondToUnitsPerSecond(20.), 20., kEps), ());
-  TEST(AlmostEqualAbs(
-      settings.ConvertMetersPerSecondToUnitsPerSecond(0.), 0., kEps), ());
+  TEST(AlmostEqualAbs(settings.ConvertMetersPerSecondToUnitsPerSecond(20.), 20., kEps), ());
+  TEST(AlmostEqualAbs(settings.ConvertMetersPerSecondToUnitsPerSecond(0.), 0., kEps), ());
   TEST(AlmostEqualAbs(settings.ConvertUnitsToMeters(300. /* distanceInUnits */), 300., kEps), ());
   TEST_EQUAL(settings.RoundByPresetSoundedDistancesUnits(300 /* distanceInUnits */), 300, ());
   TEST_EQUAL(settings.RoundByPresetSoundedDistancesUnits(0 /* distanceInUnits */), 100, ());
@@ -49,18 +46,15 @@ UNIT_TEST(TurnNotificationSettings_MetersTest)
 
 UNIT_TEST(TurnNotificationSettings_FeetTest)
 {
-  Settings const settings(20 /* notificationTimeSeconds */, 500 /* minNotificationDistanceUnits */,
-                          2000 /* maxNotificationDistanceUnits */, 5 /* m_startBeforeSeconds */,
-                          25 /* m_minStartBeforeMeters */, 150 /* m_maxStartBeforeMeters */,
-                          170 /* m_minDistToSayNotificationMeters */,
-                          {200, 400, 600, 800, 1000, 1500, 2000} /* soundedDistancesUnits */,
-                          measurement_utils::Units::Imperial /* lengthUnits */);
+  Settings const settings(
+      20 /* notificationTimeSeconds */, 500 /* minNotificationDistanceUnits */, 2000 /* maxNotificationDistanceUnits */,
+      5 /* m_startBeforeSeconds */, 25 /* m_minStartBeforeMeters */, 150 /* m_maxStartBeforeMeters */,
+      170 /* m_minDistToSayNotificationMeters */, {200, 400, 600, 800, 1000, 1500, 2000} /* soundedDistancesUnits */,
+      measurement_utils::Units::Imperial /* lengthUnits */);
 
   TEST(settings.IsValid(), ());
-  TEST(AlmostEqualAbs(
-      settings.ConvertMetersPerSecondToUnitsPerSecond(20.), 65., kEps), ());
-  TEST(AlmostEqualAbs(
-      settings.ConvertMetersPerSecondToUnitsPerSecond(0.), 0., kEps), ());
+  TEST(AlmostEqualAbs(settings.ConvertMetersPerSecondToUnitsPerSecond(20.), 65., kEps), ());
+  TEST(AlmostEqualAbs(settings.ConvertMetersPerSecondToUnitsPerSecond(0.), 0., kEps), ());
   TEST(AlmostEqualAbs(settings.ConvertUnitsToMeters(300. /* distanceInUnits */), 91., kEps), ());
   TEST_EQUAL(settings.RoundByPresetSoundedDistancesUnits(500 /* distanceInUnits */), 600, ());
   TEST_EQUAL(settings.RoundByPresetSoundedDistancesUnits(0 /* distanceInUnits */), 200, ());
@@ -68,12 +62,11 @@ UNIT_TEST(TurnNotificationSettings_FeetTest)
 
 UNIT_TEST(TurnNotificationSettings_NotValidTest)
 {
-  Settings settings1(20 /* notificationTimeSeconds */, 500 /* minNotificationDistanceUnits */,
-                     2000 /* maxNotificationDistanceUnits */, 5 /* m_startBeforeSeconds */,
-                     25 /* m_minStartBeforeMeters */, 150 /* m_maxStartBeforeMeters */,
-                     170 /* m_minDistToSayNotificationMeters */,
-                     {200, 400, 800, 600, 1000, 1500, 2000} /* soundedDistancesUnits */,
-                     measurement_utils::Units::Imperial /* lengthUnits */);
+  Settings settings1(
+      20 /* notificationTimeSeconds */, 500 /* minNotificationDistanceUnits */, 2000 /* maxNotificationDistanceUnits */,
+      5 /* m_startBeforeSeconds */, 25 /* m_minStartBeforeMeters */, 150 /* m_maxStartBeforeMeters */,
+      170 /* m_minDistToSayNotificationMeters */, {200, 400, 800, 600, 1000, 1500, 2000} /* soundedDistancesUnits */,
+      measurement_utils::Units::Imperial /* lengthUnits */);
   TEST(!settings1.IsValid(), ());
 
   Settings settings2(20 /* notificationTimeSeconds */, 5000 /* minNotificationDistanceUnits */,
@@ -231,8 +224,7 @@ UNIT_TEST(TurnsSound_MetersTwoTurnsTest)
   notificationManager.GenerateTurnNotifications(turns, turnNotifications);
   TEST(turnNotifications.empty(), ());
 
-  vector<TurnItemDist> turns2 = {{{11 /* idx */, CarDirection::EnterRoundAbout,
-                                         2 /* exitNum */}, 60.}};
+  vector<TurnItemDist> turns2 = {{{11 /* idx */, CarDirection::EnterRoundAbout, 2 /* exitNum */}, 60.}};
 
   // Starting nearing the second turn.
   notificationManager.GenerateTurnNotifications(turns2, turnNotifications);
@@ -261,8 +253,7 @@ UNIT_TEST(TurnsSound_FeetTest)
       100 /* minDistToSayNotificationMeters */, measurement_utils::Units::Imperial, engShortJson,
       20 /* notificationTimeSecond */, 30.0 /* speedMeterPerSecond */);
 
-  vector<TurnItemDist> turns = {{{7 /* idx */, CarDirection::EnterRoundAbout,
-                                  3 /* exitNum */}, 1000.}};
+  vector<TurnItemDist> turns = {{{7 /* idx */, CarDirection::EnterRoundAbout, 3 /* exitNum */}, 1000.}};
   vector<string> turnNotifications;
 
   // Starting nearing the turnItem.
@@ -356,8 +347,7 @@ UNIT_TEST(TurnsSound_ComposedTurnTest)
   turnNotifications.clear();
   vector<TurnItemDist> const turns2 = {{{5 /* idx */, CarDirection::TurnRight}, 620. /* m_distMeters */},
                                        {{10 /* idx */, CarDirection::EnterRoundAbout}, 665. /* m_distMeters */}};
-  vector<string> const expectedNotification2 = {{"In 600 meters. Turn right."},
-                                                {"Then. Enter the roundabout."}};
+  vector<string> const expectedNotification2 = {{"In 600 meters. Turn right."}, {"Then. Enter the roundabout."}};
   notificationManager.GenerateTurnNotifications(turns2, turnNotifications);
   TEST_EQUAL(turnNotifications, expectedNotification2, ());
   TEST_EQUAL(notificationManager.GetSecondTurnNotification(), CarDirection::EnterRoundAbout, ());
@@ -374,24 +364,25 @@ UNIT_TEST(TurnsSound_ComposedTurnTest)
   turnNotifications.clear();
   vector<TurnItemDist> const turns4 = {{{5 /* idx */, CarDirection::TurnRight}, 20. /* m_distMeters */},
                                        {{10 /* idx */, CarDirection::EnterRoundAbout}, 220. /* m_distMeters */}};
-  vector<string> const expectedNotification4 = {{"Turn right."},
-                                                {"Then. In 200 meters. Enter the roundabout."}};
+  vector<string> const expectedNotification4 = {{"Turn right."}, {"Then. In 200 meters. Enter the roundabout."}};
   notificationManager.GenerateTurnNotifications(turns4, turnNotifications);
   TEST_EQUAL(turnNotifications, expectedNotification4, ());
   TEST_EQUAL(notificationManager.GetSecondTurnNotification(), CarDirection::EnterRoundAbout, ());
 
   // After the first turn.
   turnNotifications.clear();
-  vector<TurnItemDist> const turns5 = {{{10 /* idx */, CarDirection::EnterRoundAbout}, 180. /* m_distMeters */},
-                                       {{15 /* idx */, CarDirection::ReachedYourDestination}, 1180. /* m_distMeters */}};
+  vector<TurnItemDist> const turns5 = {
+      {{10 /* idx */, CarDirection::EnterRoundAbout}, 180. /* m_distMeters */},
+      {{15 /* idx */, CarDirection::ReachedYourDestination}, 1180. /* m_distMeters */}};
   notificationManager.GenerateTurnNotifications(turns5, turnNotifications);
   TEST(turnNotifications.empty(), ());
   TEST_EQUAL(notificationManager.GetSecondTurnNotification(), CarDirection::None, ());
 
   // Just before the second turn.
   turnNotifications.clear();
-  vector<TurnItemDist> const turns6 = {{{10 /* idx */, CarDirection::EnterRoundAbout}, 10. /* m_distMeters */},
-                                       {{15 /* idx */, CarDirection::ReachedYourDestination}, 1010. /* m_distMeters */}};
+  vector<TurnItemDist> const turns6 = {
+      {{10 /* idx */, CarDirection::EnterRoundAbout}, 10. /* m_distMeters */},
+      {{15 /* idx */, CarDirection::ReachedYourDestination}, 1010. /* m_distMeters */}};
   vector<string> const expectedNotification6 = {{"Enter the roundabout."}};
   notificationManager.GenerateTurnNotifications(turns6, turnNotifications);
   TEST_EQUAL(turnNotifications, expectedNotification6, ());
@@ -421,19 +412,17 @@ UNIT_TEST(TurnsSound_RoundaboutTurnTest)
 
   // Starting nearing the first turn.
   // 1000 meters till the first turn.
-  vector<TurnItemDist> const turns1 = {{{5 /* idx */, CarDirection::EnterRoundAbout, 2 /* m_exitNum */},
-                                        1000. /* m_distMeters */},
-                                       {{10 /* idx */, CarDirection::LeaveRoundAbout, 2 /* m_exitNum */},
-                                        2000. /* m_distMeters */}};
+  vector<TurnItemDist> const turns1 = {
+      {{5 /* idx */, CarDirection::EnterRoundAbout, 2 /* m_exitNum */}, 1000. /* m_distMeters */},
+      {{10 /* idx */, CarDirection::LeaveRoundAbout, 2 /* m_exitNum */}, 2000. /* m_distMeters */}};
   notificationManager.GenerateTurnNotifications(turns1, turnNotifications);
   TEST(turnNotifications.empty(), ());
   TEST_EQUAL(notificationManager.GetSecondTurnNotification(), CarDirection::None, ());
 
   // 620 meters till the first turn.
-  vector<TurnItemDist> const turns2 = {{{5 /* idx */, CarDirection::EnterRoundAbout, 2 /* m_exitNum */},
-                                        620. /* m_distMeters */},
-                                       {{10 /* idx */, CarDirection::LeaveRoundAbout, 2 /* m_exitNum */},
-                                        1620. /* m_distMeters */}};
+  vector<TurnItemDist> const turns2 = {
+      {{5 /* idx */, CarDirection::EnterRoundAbout, 2 /* m_exitNum */}, 620. /* m_distMeters */},
+      {{10 /* idx */, CarDirection::LeaveRoundAbout, 2 /* m_exitNum */}, 1620. /* m_distMeters */}};
   vector<string> const expectedNotification2 = {{"In 600 meters. Enter the roundabout."},
                                                 {"Then. In 1 kilometer. Take the second exit."}};
   notificationManager.GenerateTurnNotifications(turns2, turnNotifications);
@@ -441,10 +430,9 @@ UNIT_TEST(TurnsSound_RoundaboutTurnTest)
   TEST_EQUAL(notificationManager.GetSecondTurnNotification(), CarDirection::None, ());
 
   // 3 meters till the first turn.
-  vector<TurnItemDist> const turns3 = {{{5 /* idx */, CarDirection::EnterRoundAbout, 2 /* m_exitNum */},
-                                        3. /* m_distMeters */},
-                                       {{10 /* idx */, CarDirection::LeaveRoundAbout, 2 /* m_exitNum */},
-                                        1003. /* m_distMeters */}};
+  vector<TurnItemDist> const turns3 = {
+      {{5 /* idx */, CarDirection::EnterRoundAbout, 2 /* m_exitNum */}, 3. /* m_distMeters */},
+      {{10 /* idx */, CarDirection::LeaveRoundAbout, 2 /* m_exitNum */}, 1003. /* m_distMeters */}};
   vector<string> const expectedNotification3 = {{"Enter the roundabout."},
                                                 {"Then. In 1 kilometer. Take the second exit."}};
   notificationManager.GenerateTurnNotifications(turns3, turnNotifications);
@@ -452,61 +440,54 @@ UNIT_TEST(TurnsSound_RoundaboutTurnTest)
   TEST_EQUAL(notificationManager.GetSecondTurnNotification(), CarDirection::None, ());
 
   // 900 meters till the second turn.
-  vector<TurnItemDist> const turns4 = {{{10 /* idx */, CarDirection::LeaveRoundAbout, 2 /* m_exitNum */},
-                                        900. /* m_distMeters */},
-                                       {{15 /* idx */, CarDirection::EnterRoundAbout, 1 /* m_exitNum */},
-                                        1900. /* m_distMeters */}};
+  vector<TurnItemDist> const turns4 = {
+      {{10 /* idx */, CarDirection::LeaveRoundAbout, 2 /* m_exitNum */}, 900. /* m_distMeters */},
+      {{15 /* idx */, CarDirection::EnterRoundAbout, 1 /* m_exitNum */}, 1900. /* m_distMeters */}};
   notificationManager.GenerateTurnNotifications(turns4, turnNotifications);
   TEST(turnNotifications.empty(), ());
   TEST_EQUAL(notificationManager.GetSecondTurnNotification(), CarDirection::None, ());
 
   // 300 meters till the second turn.
-  vector<TurnItemDist> const turns5 = {{{10 /* idx */, CarDirection::LeaveRoundAbout, 2 /* m_exitNum */},
-                                        300. /* m_distMeters */},
-                                       {{15 /* idx */, CarDirection::EnterRoundAbout, 1 /* m_exitNum */},
-                                        1300. /* m_distMeters */}};
+  vector<TurnItemDist> const turns5 = {
+      {{10 /* idx */, CarDirection::LeaveRoundAbout, 2 /* m_exitNum */}, 300. /* m_distMeters */},
+      {{15 /* idx */, CarDirection::EnterRoundAbout, 1 /* m_exitNum */}, 1300. /* m_distMeters */}};
   notificationManager.GenerateTurnNotifications(turns5, turnNotifications);
   TEST(turnNotifications.empty(), ());
   TEST_EQUAL(notificationManager.GetSecondTurnNotification(), CarDirection::None, ());
 
   // 3 meters till the second turn.
-  vector<TurnItemDist> const turns6 = {{{10 /* idx */, CarDirection::LeaveRoundAbout, 2 /* m_exitNum */},
-                                        3. /* m_distMeters */},
-                                       {{15 /* idx */, CarDirection::EnterRoundAbout, 1 /* m_exitNum */},
-                                        1003. /* m_distMeters */}};
+  vector<TurnItemDist> const turns6 = {
+      {{10 /* idx */, CarDirection::LeaveRoundAbout, 2 /* m_exitNum */}, 3. /* m_distMeters */},
+      {{15 /* idx */, CarDirection::EnterRoundAbout, 1 /* m_exitNum */}, 1003. /* m_distMeters */}};
   vector<string> const expectedNotification6 = {{"Leave the roundabout."}};
   notificationManager.GenerateTurnNotifications(turns6, turnNotifications);
   TEST_EQUAL(turnNotifications, expectedNotification6, ());
   TEST_EQUAL(notificationManager.GetSecondTurnNotification(), CarDirection::None, ());
 
   // 5 meters till the third turn.
-  vector<TurnItemDist> const turns7 = {{{15 /* idx */, CarDirection::EnterRoundAbout, 1 /* m_exitNum */},
-                                        5. /* m_distMeters */},
-                                       {{20 /* idx */, CarDirection::LeaveRoundAbout, 1 /* m_exitNum */},
-                                        1005. /* m_distMeters */}};
+  vector<TurnItemDist> const turns7 = {
+      {{15 /* idx */, CarDirection::EnterRoundAbout, 1 /* m_exitNum */}, 5. /* m_distMeters */},
+      {{20 /* idx */, CarDirection::LeaveRoundAbout, 1 /* m_exitNum */}, 1005. /* m_distMeters */}};
   vector<string> const expectedNotification7 = {{"Enter the roundabout."},
                                                 {"Then. In 1 kilometer. Take the first exit."}};
-  notificationManager.GenerateTurnNotifications(
-      turns7, turnNotifications);  // The first notification fast forwarding.
+  notificationManager.GenerateTurnNotifications(turns7, turnNotifications);  // The first notification fast forwarding.
   notificationManager.GenerateTurnNotifications(turns7, turnNotifications);
   TEST_EQUAL(turnNotifications, expectedNotification7, ());
   TEST_EQUAL(notificationManager.GetSecondTurnNotification(), CarDirection::None, ());
 
   // 900 meters till the 4th turn.
   notificationManager.Reset();
-  vector<TurnItemDist> const turns8 = {{{25 /* idx */, CarDirection::EnterRoundAbout, 4 /* m_exitNum */},
-                                        900. /* m_distMeters */},
-                                       {{30 /* idx */, CarDirection::LeaveRoundAbout, 4 /* m_exitNum */},
-                                        1200. /* m_distMeters */}};
+  vector<TurnItemDist> const turns8 = {
+      {{25 /* idx */, CarDirection::EnterRoundAbout, 4 /* m_exitNum */}, 900. /* m_distMeters */},
+      {{30 /* idx */, CarDirection::LeaveRoundAbout, 4 /* m_exitNum */}, 1200. /* m_distMeters */}};
   notificationManager.GenerateTurnNotifications(turns8, turnNotifications);
   TEST(turnNotifications.empty(), ());
   TEST_EQUAL(notificationManager.GetSecondTurnNotification(), CarDirection::None, ());
 
   // 620 meters till the 4th turn.
-  vector<TurnItemDist> const turns9 = {{{25 /* idx */, CarDirection::EnterRoundAbout, 4 /* m_exitNum */},
-                                        620. /* m_distMeters */},
-                                       {{30 /* idx */, CarDirection::LeaveRoundAbout, 4 /* m_exitNum */},
-                                        665. /* m_distMeters */}};
+  vector<TurnItemDist> const turns9 = {
+      {{25 /* idx */, CarDirection::EnterRoundAbout, 4 /* m_exitNum */}, 620. /* m_distMeters */},
+      {{30 /* idx */, CarDirection::LeaveRoundAbout, 4 /* m_exitNum */}, 665. /* m_distMeters */}};
   vector<string> const expectedNotification9 = {{"In 600 meters. Enter the roundabout."},
                                                 {"Then. Take the fourth exit."}};
   notificationManager.GenerateTurnNotifications(turns9, turnNotifications);
diff --git a/libs/routing/routing_tests/turns_tts_text_tests.cpp b/libs/routing/routing_tests/turns_tts_text_tests.cpp
index b9b24c466..230ffcc7f 100644
--- a/libs/routing/routing_tests/turns_tts_text_tests.cpp
+++ b/libs/routing/routing_tests/turns_tts_text_tests.cpp
@@ -28,8 +28,8 @@ UNIT_TEST(GetDistanceTextIdMetersTest)
 {
   TEST_EQUAL(GetDistanceTextId({500, 0, false, CarDirection::TurnRight, Units::Metric}), "in_500_meters", ());
 
-//  Notification const notification2(500, 0, true, CarDirection::TurnRight, Units::Metric);
-//  TEST_EQUAL(GetDistanceTextId(notification2), "then", ());
+  //  Notification const notification2(500, 0, true, CarDirection::TurnRight, Units::Metric);
+  //  TEST_EQUAL(GetDistanceTextId(notification2), "then", ());
 
   TEST_EQUAL(GetDistanceTextId({200, 0, false, CarDirection::TurnRight, Units::Metric}), "in_200_meters", ());
   TEST_EQUAL(GetDistanceTextId({2000, 0, false, CarDirection::TurnRight, Units::Metric}), "in_2_kilometers", ());
@@ -43,8 +43,8 @@ UNIT_TEST(GetDistanceTextIdFeetTest)
 {
   TEST_EQUAL(GetDistanceTextId({500, 0, false, CarDirection::TurnRight, Units::Imperial}), "in_500_feet", ());
 
-//  Notification const notification2(500, 0, true, CarDirection::TurnRight, Units::Imperial);
-//  TEST_EQUAL(GetDistanceTextId(notification2), "then", ());
+  //  Notification const notification2(500, 0, true, CarDirection::TurnRight, Units::Imperial);
+  //  TEST_EQUAL(GetDistanceTextId(notification2), "then", ());
 
   TEST_EQUAL(GetDistanceTextId({800, 0, false, CarDirection::TurnRight, Units::Imperial}), "in_800_feet", ());
   TEST_EQUAL(GetDistanceTextId({5000, 0, false, CarDirection::TurnRight, Units::Imperial}), "in_5000_feet", ());
@@ -54,17 +54,13 @@ UNIT_TEST(GetRoundaboutTextIdTest)
 {
   // Notification(uint32_t distanceUnits, uint8_t exitNum, bool useThenInsteadOfDistance,
   //    CarDirection turnDir, ::Settings::Units lengthUnits)
-  Notification const notification1(500, 0, false, CarDirection::LeaveRoundAbout,
-                                   Units::Imperial);
+  Notification const notification1(500, 0, false, CarDirection::LeaveRoundAbout, Units::Imperial);
   TEST_EQUAL(GetRoundaboutTextId(notification1), "leave_the_roundabout", ());
-  Notification const notification2(0, 3, true, CarDirection::LeaveRoundAbout,
-                                   Units::Imperial);
+  Notification const notification2(0, 3, true, CarDirection::LeaveRoundAbout, Units::Imperial);
   TEST_EQUAL(GetRoundaboutTextId(notification2), "take_the_3_exit", ());
-  Notification const notification3(0, 7, true, CarDirection::LeaveRoundAbout,
-                                   Units::Metric);
+  Notification const notification3(0, 7, true, CarDirection::LeaveRoundAbout, Units::Metric);
   TEST_EQUAL(GetRoundaboutTextId(notification3), "take_the_7_exit", ());
-  Notification const notification4(0, 15, true, CarDirection::LeaveRoundAbout,
-                                   Units::Metric);
+  Notification const notification4(0, 15, true, CarDirection::LeaveRoundAbout, Units::Metric);
   TEST_EQUAL(GetRoundaboutTextId(notification4), "leave_the_roundabout", ());
 }
 
@@ -72,14 +68,11 @@ UNIT_TEST(GetYouArriveTextIdTest)
 {
   // Notification(uint32_t distanceUnits, uint8_t exitNum, bool useThenInsteadOfDistance,
   //    CarDirection turnDir, ::Settings::Units lengthUnits)
-  Notification const notification1(500, 0, false, CarDirection::ReachedYourDestination,
-                                   Units::Imperial);
+  Notification const notification1(500, 0, false, CarDirection::ReachedYourDestination, Units::Imperial);
   TEST_EQUAL(GetYouArriveTextId(notification1), "destination", ());
-  Notification const notification2(0, 0, false, CarDirection::ReachedYourDestination,
-                                   Units::Metric);
+  Notification const notification2(0, 0, false, CarDirection::ReachedYourDestination, Units::Metric);
   TEST_EQUAL(GetYouArriveTextId(notification2), "you_have_reached_the_destination", ());
-  Notification const notification3(0, 0, true, CarDirection::ReachedYourDestination,
-                                   Units::Metric);
+  Notification const notification3(0, 0, true, CarDirection::ReachedYourDestination, Units::Metric);
   TEST_EQUAL(GetYouArriveTextId(notification3), "destination", ());
 }
 
@@ -87,20 +80,15 @@ UNIT_TEST(GetDirectionTextIdTest)
 {
   // Notification(uint32_t distanceUnits, uint8_t exitNum, bool useThenInsteadOfDistance,
   //    CarDirection turnDir, ::Settings::Units lengthUnits)
-  Notification const notification1(500, 0, false, CarDirection::TurnRight,
-                                   Units::Imperial);
+  Notification const notification1(500, 0, false, CarDirection::TurnRight, Units::Imperial);
   TEST_EQUAL(GetDirectionTextId(notification1), "make_a_right_turn", ());
-  Notification const notification2(1000, 0, false, CarDirection::GoStraight,
-                                   Units::Metric);
+  Notification const notification2(1000, 0, false, CarDirection::GoStraight, Units::Metric);
   TEST_EQUAL(GetDirectionTextId(notification2), "go_straight", ());
-  Notification const notification3(700, 0, false, CarDirection::UTurnLeft,
-                                   Units::Metric);
+  Notification const notification3(700, 0, false, CarDirection::UTurnLeft, Units::Metric);
   TEST_EQUAL(GetDirectionTextId(notification3), "make_a_u_turn", ());
-  Notification const notification4(200, 0, false, CarDirection::ReachedYourDestination,
-                                   Units::Metric);
+  Notification const notification4(200, 0, false, CarDirection::ReachedYourDestination, Units::Metric);
   TEST_EQUAL(GetDirectionTextId(notification4), "destination", ());
-  Notification const notification5(0, 0, false, CarDirection::ReachedYourDestination,
-                                   Units::Metric);
+  Notification const notification5(0, 0, false, CarDirection::ReachedYourDestination, Units::Metric);
   TEST_EQUAL(GetDirectionTextId(notification5), "you_have_reached_the_destination", ());
 }
 
@@ -129,14 +117,10 @@ UNIT_TEST(GetTtsTextTest)
   GetTtsText getTtsText;
   // Notification(uint32_t distanceUnits, uint8_t exitNum, bool useThenInsteadOfDistance,
   //    CarDirection turnDir, Settings::Units lengthUnits)
-  Notification const notification1(500, 0, false, CarDirection::TurnRight,
-                                   Units::Metric);
-  Notification const notification2(300, 0, false, CarDirection::TurnLeft,
-                                   Units::Metric);
-  Notification const notification3(0, 0, false, CarDirection::ReachedYourDestination,
-                                   Units::Metric);
-  Notification const notification4(0, 0, true, CarDirection::TurnLeft,
-                                   Units::Metric);
+  Notification const notification1(500, 0, false, CarDirection::TurnRight, Units::Metric);
+  Notification const notification2(300, 0, false, CarDirection::TurnLeft, Units::Metric);
+  Notification const notification3(0, 0, false, CarDirection::ReachedYourDestination, Units::Metric);
+  Notification const notification4(0, 0, true, CarDirection::TurnLeft, Units::Metric);
 
   getTtsText.ForTestingSetLocaleWithJson(engShortJson, "en");
   TEST_EQUAL(getTtsText.GetTurnNotification(notification1), "In 500 meters. Make a right turn.", ());
@@ -416,10 +400,8 @@ UNIT_TEST(GetAllSoundedDistMetersTest)
   VecPairDist const & allSoundedDistMeters = GetAllSoundedDistMeters();
 
   TEST(is_sorted(allSoundedDistMeters.cbegin(), allSoundedDistMeters.cend(),
-                 [](PairDist const & p1, PairDist const & p2)
-       {
-         return p1.first < p2.first;
-       }), ());
+                 [](PairDist const & p1, PairDist const & p2) { return p1.first < p2.first; }),
+       ());
 
   TEST_EQUAL(allSoundedDistMeters.size(), 17, ());
   PairDist const expected1 = {50, "in_50_meters"};
@@ -435,10 +417,8 @@ UNIT_TEST(GetAllSoundedDistFeet)
   VecPairDist const & allSoundedDistFeet = GetAllSoundedDistFeet();
 
   TEST(is_sorted(allSoundedDistFeet.cbegin(), allSoundedDistFeet.cend(),
-                 [](PairDist const & p1, PairDist const & p2)
-       {
-         return p1.first < p2.first;
-       }), ());
+                 [](PairDist const & p1, PairDist const & p2) { return p1.first < p2.first; }),
+       ());
 
   TEST_EQUAL(allSoundedDistFeet.size(), 22, ());
   PairDist const expected1 = {50, "in_50_feet"};
@@ -456,12 +436,10 @@ UNIT_TEST(GetSoundedDistMeters)
 
   TEST(is_sorted(soundedDistMeters.cbegin(), soundedDistMeters.cend()), ());
   // Checking that allSounded contains any element of inst.
-  TEST(find_first_of(soundedDistMeters.cbegin(), soundedDistMeters.cend(),
-                     allSoundedDistMeters.cbegin(), allSoundedDistMeters.cend(),
-                     [](uint32_t p1, PairDist const & p2)
-       {
-         return p1 == p2.first;
-       }) != soundedDistMeters.cend(), ());
+  TEST(find_first_of(soundedDistMeters.cbegin(), soundedDistMeters.cend(), allSoundedDistMeters.cbegin(),
+                     allSoundedDistMeters.cend(),
+                     [](uint32_t p1, PairDist const & p2) { return p1 == p2.first; }) != soundedDistMeters.cend(),
+       ());
 
   TEST_EQUAL(soundedDistMeters.size(), 11, ());
   TEST_EQUAL(soundedDistMeters[0], 200, ());
@@ -477,10 +455,9 @@ UNIT_TEST(GetSoundedDistFeet)
   TEST(is_sorted(soundedDistFeet.cbegin(), soundedDistFeet.cend()), ());
   // Checking that allSounded contains any element of inst.
   TEST(find_first_of(soundedDistFeet.cbegin(), soundedDistFeet.cend(), allSoundedDistFeet.cbegin(),
-                     allSoundedDistFeet.cend(), [](uint32_t p1, PairDist const & p2)
-       {
-         return p1 == p2.first;
-       }) != soundedDistFeet.cend(), ());
+                     allSoundedDistFeet.cend(),
+                     [](uint32_t p1, PairDist const & p2) { return p1 == p2.first; }) != soundedDistFeet.cend(),
+       ());
 
   TEST_EQUAL(soundedDistFeet.size(), 11, ());
   TEST_EQUAL(soundedDistFeet[0], 500, ());
diff --git a/libs/routing/routing_tests/uturn_restriction_tests.cpp b/libs/routing/routing_tests/uturn_restriction_tests.cpp
index fd6132ebf..f5920dbef 100644
--- a/libs/routing/routing_tests/uturn_restriction_tests.cpp
+++ b/libs/routing/routing_tests/uturn_restriction_tests.cpp
@@ -19,15 +19,11 @@ UNIT_CLASS_TEST(NoUTurnRestrictionTest, CheckNoUTurn_1)
   Segment const start(kTestNumMwmId, 3 /* fId */, 0 /* segId */, true /* forward */);
   Segment const finish(kTestNumMwmId, 7 /* fId */, 0 /* segId */, true /* forward */);
 
-  std::vector<m2::PointD> const expectedGeom = {
-      {3.0, 0.0}, {2.0, 0.0}, {1.0, 0.0}, {1.0, 1.0}, {1.0, 2.0}
-  };
+  std::vector<m2::PointD> const expectedGeom = {{3.0, 0.0}, {2.0, 0.0}, {1.0, 0.0}, {1.0, 1.0}, {1.0, 2.0}};
 
   TestRouteGeom(start, finish, Algorithm::Result::OK, expectedGeom);
 
-  std::vector<RestrictionUTurn> noUTurnRestrictions = {
-      {3 /* featureId */, false /* viaIsFirstPoint */}
-  };
+  std::vector<RestrictionUTurn> noUTurnRestrictions = {{3 /* featureId */, false /* viaIsFirstPoint */}};
 
   SetNoUTurnRestrictions(std::move(noUTurnRestrictions));
   TestRouteGeom(start, finish, Algorithm::Result::NoPath, {} /* expectedGeom */);
@@ -40,19 +36,14 @@ UNIT_CLASS_TEST(NoUTurnRestrictionTest, CheckNoUTurn_2)
   Segment const start(kTestNumMwmId, 2 /* fId */, 0 /* segId */, true /* forward */);
   Segment const finish(kTestNumMwmId, 7 /* fId */, 0 /* segId */, true /* forward */);
 
-  std::vector<m2::PointD> const expectedGeom = {
-      {2.0, 0.0}, {1.0, 0.0}, {1.0, 1.0}, {1.0, 2.0}
-  };
+  std::vector<m2::PointD> const expectedGeom = {{2.0, 0.0}, {1.0, 0.0}, {1.0, 1.0}, {1.0, 2.0}};
 
   TestRouteGeom(start, finish, Algorithm::Result::OK, expectedGeom);
 
-  std::vector<RestrictionUTurn> noUTurnRestrictions = {
-      {2 /* featureId */, false /* viaIsFirstPoint */}
-  };
+  std::vector<RestrictionUTurn> noUTurnRestrictions = {{2 /* featureId */, false /* viaIsFirstPoint */}};
 
-  std::vector<m2::PointD> const expectedGeomAfterRestriction = {
-      {2.0, 0.0}, {3.0, 0.0}, {2.0, 0.0}, {1.0, 0.0}, {1.0, 1.0}, {1.0, 2.0}
-  };
+  std::vector<m2::PointD> const expectedGeomAfterRestriction = {{2.0, 0.0}, {3.0, 0.0}, {2.0, 0.0},
+                                                                {1.0, 0.0}, {1.0, 1.0}, {1.0, 2.0}};
 
   SetNoUTurnRestrictions(std::move(noUTurnRestrictions));
   TestRouteGeom(start, finish, Algorithm::Result::OK, expectedGeomAfterRestriction);
@@ -65,19 +56,14 @@ UNIT_CLASS_TEST(NoUTurnRestrictionTest, CheckNoUTurn_3)
   Segment const start(kTestNumMwmId, 2 /* fId */, 0 /* segId */, false /* forward */);
   Segment const finish(kTestNumMwmId, 3 /* fId */, 0 /* segId */, true /* forward */);
 
-  std::vector<m2::PointD> const expectedGeom = {
-      {1.0, 0.0}, {2.0, 0.0}, {3.0, 0.0}
-  };
+  std::vector<m2::PointD> const expectedGeom = {{1.0, 0.0}, {2.0, 0.0}, {3.0, 0.0}};
 
   TestRouteGeom(start, finish, Algorithm::Result::OK, expectedGeom);
 
-  std::vector<RestrictionUTurn> noUTurnRestrictions = {
-      {2 /* featureId */, true /* viaIsFirstPoint */}
-  };
+  std::vector<RestrictionUTurn> noUTurnRestrictions = {{2 /* featureId */, true /* viaIsFirstPoint */}};
 
   std::vector<m2::PointD> const expectedGeomAfterRestriction = {
-      {1.0, 0.0}, {1.0, -1.0}, {1.0, 0.0}, {2.0, 0.0}, {3.0, 0.0}
-  };
+      {1.0, 0.0}, {1.0, -1.0}, {1.0, 0.0}, {2.0, 0.0}, {3.0, 0.0}};
 
   SetNoUTurnRestrictions(std::move(noUTurnRestrictions));
   TestRouteGeom(start, finish, Algorithm::Result::OK, expectedGeomAfterRestriction);
@@ -90,15 +76,11 @@ UNIT_CLASS_TEST(NoUTurnRestrictionTest, CheckOnlyUTurn_1)
   Segment const start(kTestNumMwmId, 2 /* fId */, 0 /* segId */, true /* forward */);
   Segment const finish(kTestNumMwmId, 3 /* fId */, 0 /* segId */, true /* forward */);
 
-  std::vector<m2::PointD> const expectedGeom = {
-      {2.0, 0.0}, {3.0, 0.0}
-  };
+  std::vector<m2::PointD> const expectedGeom = {{2.0, 0.0}, {3.0, 0.0}};
 
   TestRouteGeom(start, finish, Algorithm::Result::OK, expectedGeom);
 
-  std::vector<RestrictionUTurn> onlyUTurnRestrictions = {
-      {2 /* featureId */, false /* viaIsFirstPoint */}
-  };
+  std::vector<RestrictionUTurn> onlyUTurnRestrictions = {{2 /* featureId */, false /* viaIsFirstPoint */}};
 
   RestrictionVec restrictionsNo;
 
@@ -116,15 +98,11 @@ UNIT_CLASS_TEST(NoUTurnRestrictionTest, CheckOnlyUTurn_2)
   Segment const start(kTestNumMwmId, 0 /* fId */, 0 /* segId */, false /* forward */);
   Segment const finish(kTestNumMwmId, 5 /* fId */, 0 /* segId */, true /* forward */);
 
-  std::vector<m2::PointD> const expectedGeom = {
-      {0.0, 1.0}, {1.0, 1.0}, {2.0, 2.0}, {3.0, 2.0}
-  };
+  std::vector<m2::PointD> const expectedGeom = {{0.0, 1.0}, {1.0, 1.0}, {2.0, 2.0}, {3.0, 2.0}};
 
   TestRouteGeom(start, finish, Algorithm::Result::OK, expectedGeom);
 
-  std::vector<RestrictionUTurn> onlyUTurnRestrictions = {
-      {1 /* featureId */, false /* viaIsFirstPoint */}
-  };
+  std::vector<RestrictionUTurn> onlyUTurnRestrictions = {{1 /* featureId */, false /* viaIsFirstPoint */}};
 
   RestrictionVec restrictionsNo;
 
@@ -132,9 +110,8 @@ UNIT_CLASS_TEST(NoUTurnRestrictionTest, CheckOnlyUTurn_2)
   ConvertRestrictionsOnlyUTurnToNo(indexGraph, onlyUTurnRestrictions, restrictionsNo);
   SetRestrictions(std::move(restrictionsNo));
 
-  std::vector<m2::PointD> const expectedGeomAfterRestriction = {
-      {0.0, 1.0}, {-1.0, 1.0}, {-1.0, 2.0}, {0.0, 2.0}, {1.0, 2.0}, {2.0, 2.0}, {3.0, 2.0}
-  };
+  std::vector<m2::PointD> const expectedGeomAfterRestriction = {{0.0, 1.0}, {-1.0, 1.0}, {-1.0, 2.0}, {0.0, 2.0},
+                                                                {1.0, 2.0}, {2.0, 2.0},  {3.0, 2.0}};
 
   TestRouteGeom(start, finish, Algorithm::Result::OK, expectedGeomAfterRestriction);
 }
diff --git a/libs/routing/routing_tests/world_graph_builder.cpp b/libs/routing/routing_tests/world_graph_builder.cpp
index 8c9abda98..cb54e89a1 100644
--- a/libs/routing/routing_tests/world_graph_builder.cpp
+++ b/libs/routing/routing_tests/world_graph_builder.cpp
@@ -11,8 +11,8 @@
 
 #include "traffic/traffic_cache.hpp"
 
-#include <vector>
 #include <utility>
+#include <vector>
 
 namespace routing_test
 {
@@ -56,9 +56,9 @@ std::unique_ptr<SingleVehicleWorldGraph> BuildCrossGraph()
   loader->AddRoad(7 /* featureId */, true /* oneWay */, 1.0 /* speed */,
                   RoadGeometry::Points({{1.0, 1.0}, {1.0, 2.0}}));
 
-  std::vector<Joint> const joints = {
-    MakeJoint({{0, 1}, {1, 0}}), MakeJoint({{1, 1}, {2, 0}, {4, 0}, {5, 1}, {6, 0}}),
-    MakeJoint({{2, 1}, {3, 0}}), MakeJoint({{4, 1}, {5, 0}}), MakeJoint({{6, 1}, {7, 0}})};
+  std::vector<Joint> const joints = {MakeJoint({{0, 1}, {1, 0}}), MakeJoint({{1, 1}, {2, 0}, {4, 0}, {5, 1}, {6, 0}}),
+                                     MakeJoint({{2, 1}, {3, 0}}), MakeJoint({{4, 1}, {5, 0}}),
+                                     MakeJoint({{6, 1}, {7, 0}})};
 
   traffic::TrafficCache const trafficCache;
   std::shared_ptr<EdgeEstimator> estimator = CreateEstimatorForCar(trafficCache);
@@ -95,11 +95,10 @@ std::unique_ptr<SingleVehicleWorldGraph> BuildTestGraph()
   loader->AddRoad(5 /* featureId */, true /* oneWay */, 1.0 /* speed */,
                   RoadGeometry::Points({{2.0, 2.0}, {3.0, 2.0}}));
 
-  std::vector<Joint> const joints = {
-      MakeJoint({{1, 0}, {0, 0}}),           // (0, 1)
-      MakeJoint({{0, 1}, {2, 0}}),           // (-1, 1)
-      MakeJoint({{3, 1}, {2, 4}, {5, 0}}),   // (2, 2)
-      MakeJoint({{1, 1}, {3, 0}, {4, 0}})};  // (1, 1)
+  std::vector<Joint> const joints = {MakeJoint({{1, 0}, {0, 0}}),           // (0, 1)
+                                     MakeJoint({{0, 1}, {2, 0}}),           // (-1, 1)
+                                     MakeJoint({{3, 1}, {2, 4}, {5, 0}}),   // (2, 2)
+                                     MakeJoint({{1, 1}, {3, 0}, {4, 0}})};  // (1, 1)
 
   traffic::TrafficCache const trafficCache;
   std::shared_ptr<EdgeEstimator> estimator = CreateEstimatorForCar(trafficCache);
@@ -107,4 +106,3 @@ std::unique_ptr<SingleVehicleWorldGraph> BuildTestGraph()
   return BuildWorldGraph(std::move(loader), estimator, joints);
 }
 }  // namespace routing_test
-
diff --git a/libs/routing/routing_tests/world_graph_builder.hpp b/libs/routing/routing_tests/world_graph_builder.hpp
index 694a44ba1..fc595ebdc 100644
--- a/libs/routing/routing_tests/world_graph_builder.hpp
+++ b/libs/routing/routing_tests/world_graph_builder.hpp
@@ -9,4 +9,3 @@ namespace routing_test
 std::unique_ptr<routing::SingleVehicleWorldGraph> BuildCrossGraph();
 std::unique_ptr<routing::SingleVehicleWorldGraph> BuildTestGraph();
 }  // namespace routing_test
-
diff --git a/libs/routing/ruler_router.cpp b/libs/routing/ruler_router.cpp
index 73738e525..e29889c2a 100644
--- a/libs/routing/ruler_router.cpp
+++ b/libs/routing/ruler_router.cpp
@@ -6,13 +6,12 @@ namespace routing
 {
 using namespace std;
 
-void RulerRouter::ClearState()
-{
+void RulerRouter::ClearState() {}
+
+void RulerRouter::SetGuides(GuidesTracks && guides)
+{ /*m_guides = GuidesConnections(guides);*/
 }
 
-void RulerRouter::SetGuides(GuidesTracks && guides) { /*m_guides = GuidesConnections(guides);*/ }
-
-
 /* Ruler router doesn't read roads graph and uses only checkpoints to build a route.
 
       1-----------2
@@ -45,10 +44,8 @@ void RulerRouter::SetGuides(GuidesTracks && guides) { /*m_guides = GuidesConnect
   *  m_subroutes.size() == m_routeSegments.size()-1
 
  */
-RouterResultCode RulerRouter::CalculateRoute(Checkpoints const & checkpoints,
-                                             m2::PointD const & startDirection,
-                                             bool adjustToPrevRoute,
-                                             RouterDelegate const & delegate, Route & route)
+RouterResultCode RulerRouter::CalculateRoute(Checkpoints const & checkpoints, m2::PointD const & startDirection,
+                                             bool adjustToPrevRoute, RouterDelegate const & delegate, Route & route)
 {
   vector<m2::PointD> const & points = checkpoints.GetPoints();
   size_t const count = points.size();
@@ -61,10 +58,7 @@ RouterResultCode RulerRouter::CalculateRoute(Checkpoints const & checkpoints,
 
   Segment const segment(kFakeNumMwmId, 0, 0, false);
 
-  auto const ToPointWA = [](m2::PointD const & p)
-  {
-    return geometry::PointWithAltitude(p, 0 /* altitude */);
-  };
+  auto const ToPointWA = [](m2::PointD const & p) { return geometry::PointWithAltitude(p, 0 /* altitude */); };
 
   for (uint32_t i = 0; i < count; ++i)
   {
@@ -89,17 +83,17 @@ RouterResultCode RulerRouter::CalculateRoute(Checkpoints const & checkpoints,
   route.SetRouteSegments(std::move(routeSegments));
 
   vector<Route::SubrouteAttrs> subroutes;
-  for(size_t i = 1; i < count; ++i)
+  for (size_t i = 1; i < count; ++i)
   {
-    subroutes.emplace_back(ToPointWA(points[i-1]), ToPointWA(points[i]), i*2-2, i*2);
-    subroutes.emplace_back(ToPointWA(points[i-1]), ToPointWA(points[i]), i*2-1, i*2);
+    subroutes.emplace_back(ToPointWA(points[i - 1]), ToPointWA(points[i]), i * 2 - 2, i * 2);
+    subroutes.emplace_back(ToPointWA(points[i - 1]), ToPointWA(points[i]), i * 2 - 1, i * 2);
   }
 
   route.SetCurrentSubrouteIdx(checkpoints.GetPassedIdx());
   route.SetSubroteAttrs(std::move(subroutes));
 
   vector<m2::PointD> routeGeometry;
-  for (auto p: points)
+  for (auto p : points)
   {
     routeGeometry.push_back(p);
     routeGeometry.push_back(p);
@@ -110,8 +104,7 @@ RouterResultCode RulerRouter::CalculateRoute(Checkpoints const & checkpoints,
   return RouterResultCode::NoError;
 }
 
-bool RulerRouter::FindClosestProjectionToRoad(m2::PointD const & point,
-                                              m2::PointD const & direction, double radius,
+bool RulerRouter::FindClosestProjectionToRoad(m2::PointD const & point, m2::PointD const & direction, double radius,
                                               EdgeProj & proj)
 {
   // Ruler router has no connection to road graph.
diff --git a/libs/routing/ruler_router.hpp b/libs/routing/ruler_router.hpp
index 5355b2d51..a5a07c4e8 100644
--- a/libs/routing/ruler_router.hpp
+++ b/libs/routing/ruler_router.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "routing/router.hpp"
 #include <string>
+#include "routing/router.hpp"
 
 namespace routing
 {
@@ -11,13 +11,12 @@ class RulerRouter : public IRouter
   std::string GetName() const override { return {"ruler-router"}; }
   void ClearState() override;
   void SetGuides(GuidesTracks && guides) override;
-  RouterResultCode CalculateRoute(Checkpoints const & checkpoints,
-                                  m2::PointD const & startDirection, bool adjustToPrevRoute,
-                                  RouterDelegate const & delegate, Route & route) override;
-  bool FindClosestProjectionToRoad(m2::PointD const & point, m2::PointD const & direction,
-                                   double radius, EdgeProj & proj) override;
+  RouterResultCode CalculateRoute(Checkpoints const & checkpoints, m2::PointD const & startDirection,
+                                  bool adjustToPrevRoute, RouterDelegate const & delegate, Route & route) override;
+  bool FindClosestProjectionToRoad(m2::PointD const & point, m2::PointD const & direction, double radius,
+                                   EdgeProj & proj) override;
 
   // Do we need guides in this router?
-  //GuidesConnections m_guides;
+  // GuidesConnections m_guides;
 };
 }  // namespace routing
diff --git a/libs/routing/segment.cpp b/libs/routing/segment.cpp
index 204c75db0..89e0726a1 100644
--- a/libs/routing/segment.cpp
+++ b/libs/routing/segment.cpp
@@ -2,7 +2,7 @@
 
 #include "routing/fake_feature_ids.hpp"
 
-#include "std/boost_container_hash.hpp"     // needed despite of IDE warning
+#include "std/boost_container_hash.hpp"  // needed despite of IDE warning
 
 #include <sstream>
 
@@ -30,14 +30,14 @@ bool Segment::operator<(Segment const & seg) const
 
 bool Segment::operator==(Segment const & seg) const
 {
-  return m_featureId == seg.m_featureId && m_segmentIdx == seg.m_segmentIdx &&
-         m_mwmId == seg.m_mwmId && m_forward == seg.m_forward;
+  return m_featureId == seg.m_featureId && m_segmentIdx == seg.m_segmentIdx && m_mwmId == seg.m_mwmId &&
+         m_forward == seg.m_forward;
 }
 
 bool Segment::IsInverse(Segment const & seg) const
 {
-  return m_featureId == seg.m_featureId && m_segmentIdx == seg.m_segmentIdx &&
-         m_mwmId == seg.m_mwmId && m_forward != seg.m_forward;
+  return m_featureId == seg.m_featureId && m_segmentIdx == seg.m_segmentIdx && m_mwmId == seg.m_mwmId &&
+         m_forward != seg.m_forward;
 }
 
 bool Segment::IsFakeCreated() const
diff --git a/libs/routing/segment.hpp b/libs/routing/segment.hpp
index b10e25b92..c7db67989 100644
--- a/libs/routing/segment.hpp
+++ b/libs/routing/segment.hpp
@@ -23,9 +23,11 @@ public:
   Segment() = default;
 
   constexpr Segment(NumMwmId mwmId, uint32_t featureId, uint32_t segmentIdx, bool forward)
-    : m_featureId(featureId), m_segmentIdx(segmentIdx), m_mwmId(mwmId), m_forward(forward)
-  {
-  }
+    : m_featureId(featureId)
+    , m_segmentIdx(segmentIdx)
+    , m_mwmId(mwmId)
+    , m_forward(forward)
+  {}
 
   Segment const & GetSegment(bool /* start */) const { return *this; }
   NumMwmId GetMwmId() const { return m_mwmId; }
@@ -42,13 +44,10 @@ public:
 
   bool operator<(Segment const & seg) const;
   bool operator==(Segment const & seg) const;
-  bool operator!=(Segment const & seg) const
-  {
-    return !(*this == seg);
-  }
+  bool operator!=(Segment const & seg) const { return !(*this == seg); }
 
   bool IsInverse(Segment const & seg) const;
-  Segment GetReversed() const { return { m_mwmId, m_featureId, m_segmentIdx, !m_forward }; }
+  Segment GetReversed() const { return {m_mwmId, m_featureId, m_segmentIdx, !m_forward}; }
 
   /// @todo Logically, these functions should be equal, but keep existing logic,
   /// and investigate possible enhancements in future.
@@ -70,10 +69,7 @@ class SegmentEdge final
 {
 public:
   SegmentEdge() = default;
-  SegmentEdge(Segment const & target, RouteWeight const & weight)
-    : m_target(target), m_weight(weight)
-  {
-  }
+  SegmentEdge(Segment const & target, RouteWeight const & weight) : m_target(target), m_weight(weight) {}
 
   Segment const & GetTarget() const { return m_target; }
   RouteWeight const & GetWeight() const { return m_weight; }
diff --git a/libs/routing/segmented_route.cpp b/libs/routing/segmented_route.cpp
index 59a358034..8941a6959 100644
--- a/libs/routing/segmented_route.cpp
+++ b/libs/routing/segmented_route.cpp
@@ -13,9 +13,10 @@ namespace routing
 {
 SegmentedRoute::SegmentedRoute(m2::PointD const & start, m2::PointD const & finish,
                                std::vector<Route::SubrouteAttrs> const & subroutes)
-  : m_start(start), m_finish(finish), m_subroutes(subroutes)
-{
-}
+  : m_start(start)
+  , m_finish(finish)
+  , m_subroutes(subroutes)
+{}
 
 double SegmentedRoute::CalcDistance(m2::PointD const & point) const
 {
diff --git a/libs/routing/segmented_route.hpp b/libs/routing/segmented_route.hpp
index b7b9ba7e2..708942187 100644
--- a/libs/routing/segmented_route.hpp
+++ b/libs/routing/segmented_route.hpp
@@ -30,10 +30,7 @@ public:
   SegmentedRoute(m2::PointD const & start, m2::PointD const & finish,
                  std::vector<Route::SubrouteAttrs> const & subroutes);
 
-  void AddStep(Segment const & segment, m2::PointD const & point)
-  {
-    m_steps.emplace_back(segment, point);
-  }
+  void AddStep(Segment const & segment, m2::PointD const & point) { m_steps.emplace_back(segment, point); }
 
   double CalcDistance(m2::PointD const & point) const;
 
diff --git a/libs/routing/single_vehicle_world_graph.cpp b/libs/routing/single_vehicle_world_graph.cpp
index 1265d523b..7f1ff2d0b 100644
--- a/libs/routing/single_vehicle_world_graph.cpp
+++ b/libs/routing/single_vehicle_world_graph.cpp
@@ -9,12 +9,11 @@ namespace routing
 using namespace std;
 
 template <>
-SingleVehicleWorldGraph::AStarParents<Segment>::ParentType
-SingleVehicleWorldGraph::AStarParents<Segment>::kEmpty = {};
+SingleVehicleWorldGraph::AStarParents<Segment>::ParentType SingleVehicleWorldGraph::AStarParents<Segment>::kEmpty = {};
 
 template <>
 SingleVehicleWorldGraph::AStarParents<JointSegment>::ParentType
-SingleVehicleWorldGraph::AStarParents<JointSegment>::kEmpty = {};
+    SingleVehicleWorldGraph::AStarParents<JointSegment>::kEmpty = {};
 
 SingleVehicleWorldGraph::SingleVehicleWorldGraph(unique_ptr<CrossMwmGraph> crossMwmGraph,
                                                  unique_ptr<IndexGraphLoader> loader,
@@ -29,10 +28,8 @@ SingleVehicleWorldGraph::SingleVehicleWorldGraph(unique_ptr<CrossMwmGraph> cross
   CHECK(m_estimator, ());
 }
 
-void SingleVehicleWorldGraph::CheckAndProcessTransitFeatures(Segment const & parent,
-                                                             JointEdgeListT & jointEdges,
-                                                             WeightListT & parentWeights,
-                                                             bool isOutgoing)
+void SingleVehicleWorldGraph::CheckAndProcessTransitFeatures(Segment const & parent, JointEdgeListT & jointEdges,
+                                                             WeightListT & parentWeights, bool isOutgoing)
 {
   JointEdgeListT newCrossMwmEdges;
 
@@ -62,9 +59,8 @@ void SingleVehicleWorldGraph::CheckAndProcessTransitFeatures(Segment const & par
       twinIndexGraph.GetLastPointsForJoint({start}, isOutgoing, lastPoints);
       ASSERT_EQUAL(lastPoints.size(), 1, ());
 
-      if (auto edge = currentIndexGraph.GetJointEdgeByLastPoint(parent,
-                                                                target.GetSegment(isOutgoing),
-                                                                isOutgoing, lastPoints.back()))
+      if (auto edge = currentIndexGraph.GetJointEdgeByLastPoint(parent, target.GetSegment(isOutgoing), isOutgoing,
+                                                                lastPoints.back()))
       {
         newCrossMwmEdges.emplace_back(*edge);
         newCrossMwmEdges.back().GetTarget().AssignID(twin);
@@ -77,9 +73,8 @@ void SingleVehicleWorldGraph::CheckAndProcessTransitFeatures(Segment const & par
   jointEdges.insert(jointEdges.end(), newCrossMwmEdges.begin(), newCrossMwmEdges.end());
 }
 
-void SingleVehicleWorldGraph::GetEdgeList(
-    astar::VertexData<Segment, RouteWeight> const & vertexData, bool isOutgoing,
-    bool useRoutingOptions, bool useAccessConditional, SegmentEdgeListT & edges)
+void SingleVehicleWorldGraph::GetEdgeList(astar::VertexData<Segment, RouteWeight> const & vertexData, bool isOutgoing,
+                                          bool useRoutingOptions, bool useAccessConditional, SegmentEdgeListT & edges)
 {
   CHECK_NOT_EQUAL(m_mode, WorldGraphMode::LeapsOnly, ());
 
@@ -94,10 +89,9 @@ void SingleVehicleWorldGraph::GetEdgeList(
     GetTwins(segment, isOutgoing, useRoutingOptions, edges);
 }
 
-void SingleVehicleWorldGraph::GetEdgeList(
-    astar::VertexData<JointSegment, RouteWeight> const & parentVertexData, Segment const & parent,
-    bool isOutgoing, bool useAccessConditional, JointEdgeListT & jointEdges,
-    WeightListT & parentWeights)
+void SingleVehicleWorldGraph::GetEdgeList(astar::VertexData<JointSegment, RouteWeight> const & parentVertexData,
+                                          Segment const & parent, bool isOutgoing, bool useAccessConditional,
+                                          JointEdgeListT & jointEdges, WeightListT & parentWeights)
 {
   // Fake segments aren't processed here. All work must be done
   // on the IndexGraphStarterJoints abstraction-level.
@@ -117,11 +111,9 @@ void SingleVehicleWorldGraph::GetEdgeList(
   ASSERT_EQUAL(jointEdges.size(), parentWeights.size(), ());
 }
 
-LatLonWithAltitude const & SingleVehicleWorldGraph::GetJunction(Segment const & segment,
-                                                                         bool front)
+LatLonWithAltitude const & SingleVehicleWorldGraph::GetJunction(Segment const & segment, bool front)
 {
-  return GetRoadGeometry(segment.GetMwmId(), segment.GetFeatureId())
-         .GetJunction(segment.GetPointId(front));
+  return GetRoadGeometry(segment.GetMwmId(), segment.GetFeatureId()).GetJunction(segment.GetPointId(front));
 }
 
 ms::LatLon const & SingleVehicleWorldGraph::GetPoint(Segment const & segment, bool front)
@@ -139,29 +131,24 @@ bool SingleVehicleWorldGraph::IsPassThroughAllowed(NumMwmId mwmId, uint32_t feat
   return GetRoadGeometry(mwmId, featureId).IsPassThroughAllowed();
 }
 
-RouteWeight SingleVehicleWorldGraph::HeuristicCostEstimate(ms::LatLon const & from,
-                                                           ms::LatLon const & to)
+RouteWeight SingleVehicleWorldGraph::HeuristicCostEstimate(ms::LatLon const & from, ms::LatLon const & to)
 {
   return RouteWeight(m_estimator->CalcHeuristic(from, to));
 }
 
-
-RouteWeight SingleVehicleWorldGraph::CalcSegmentWeight(Segment const & segment,
-                                                       EdgeEstimator::Purpose purpose)
+RouteWeight SingleVehicleWorldGraph::CalcSegmentWeight(Segment const & segment, EdgeEstimator::Purpose purpose)
 {
-  return RouteWeight(m_estimator->CalcSegmentWeight(
-      segment, GetRoadGeometry(segment.GetMwmId(), segment.GetFeatureId()), purpose));
+  return RouteWeight(
+      m_estimator->CalcSegmentWeight(segment, GetRoadGeometry(segment.GetMwmId(), segment.GetFeatureId()), purpose));
 }
 
-RouteWeight SingleVehicleWorldGraph::CalcLeapWeight(ms::LatLon const & from,
-                                                    ms::LatLon const & to,
+RouteWeight SingleVehicleWorldGraph::CalcLeapWeight(ms::LatLon const & from, ms::LatLon const & to,
                                                     NumMwmId mwmId) const
 {
   return RouteWeight(m_estimator->CalcLeapWeight(from, to, mwmId));
 }
 
-RouteWeight SingleVehicleWorldGraph::CalcOffroadWeight(ms::LatLon const & from,
-                                                       ms::LatLon const & to,
+RouteWeight SingleVehicleWorldGraph::CalcOffroadWeight(ms::LatLon const & from, ms::LatLon const & to,
                                                        EdgeEstimator::Purpose purpose) const
 {
   return RouteWeight(m_estimator->CalcOffroad(from, to, purpose));
@@ -179,8 +166,7 @@ double SingleVehicleWorldGraph::CalculateETA(Segment const & from, Segment const
 
 double SingleVehicleWorldGraph::CalculateETAWithoutPenalty(Segment const & segment)
 {
-  return m_estimator->CalcSegmentWeight(segment,
-                                        GetRoadGeometry(segment.GetMwmId(), segment.GetFeatureId()),
+  return m_estimator->CalcSegmentWeight(segment, GetRoadGeometry(segment.GetMwmId(), segment.GetFeatureId()),
                                         EdgeEstimator::Purpose::ETA);
 }
 
@@ -206,8 +192,7 @@ RoadGeometry const & SingleVehicleWorldGraph::GetRoadGeometry(NumMwmId mwmId, ui
   return m_loader->GetGeometry(mwmId).GetRoad(featureId);
 }
 
-void SingleVehicleWorldGraph::GetTwinsInner(Segment const & segment, bool isOutgoing,
-                                            vector<Segment> & twins)
+void SingleVehicleWorldGraph::GetTwinsInner(Segment const & segment, bool isOutgoing, vector<Segment> & twins)
 {
   m_crossMwmGraph->GetTwins(segment, isOutgoing, twins);
 }
@@ -274,11 +259,11 @@ NumMwmId GetCommonMwmInChain(vector<VertexType> const & chain)
   return mwmId;
 }
 
-template <typename VertexType, class ConverterT> bool
-SingleVehicleWorldGraph::AreWavesConnectibleImpl(Parents<VertexType> const & forwardParents,
-                                                 VertexType const & commonVertex,
-                                                 Parents<VertexType> const & backwardParents,
-                                                 ConverterT const & fakeConverter)
+template <typename VertexType, class ConverterT>
+bool SingleVehicleWorldGraph::AreWavesConnectibleImpl(Parents<VertexType> const & forwardParents,
+                                                      VertexType const & commonVertex,
+                                                      Parents<VertexType> const & backwardParents,
+                                                      ConverterT const & fakeConverter)
 {
   if (IsRegionsGraphMode())
     return true;
@@ -340,8 +325,7 @@ SingleVehicleWorldGraph::AreWavesConnectibleImpl(Parents<VertexType> const & for
     uint32_t const currentFeatureId = chain[i].GetFeatureId();
 
     if (parentFeatureId != currentFeatureId &&
-        currentIndexGraph.IsRestricted(parent, parentFeatureId, currentFeatureId,
-                                       true /* isOutgoing */, parents))
+        currentIndexGraph.IsRestricted(parent, parentFeatureId, currentFeatureId, true /* isOutgoing */, parents))
     {
       return false;
     }
@@ -350,12 +334,10 @@ SingleVehicleWorldGraph::AreWavesConnectibleImpl(Parents<VertexType> const & for
   return true;
 }
 
-bool SingleVehicleWorldGraph::AreWavesConnectible(Parents<Segment> & forwardParents,
-                                                  Segment const & commonVertex,
+bool SingleVehicleWorldGraph::AreWavesConnectible(Parents<Segment> & forwardParents, Segment const & commonVertex,
                                                   Parents<Segment> & backwardParents)
 {
-  return AreWavesConnectibleImpl(forwardParents, commonVertex, backwardParents,
-                                 [](vector<Segment> &) {});
+  return AreWavesConnectibleImpl(forwardParents, commonVertex, backwardParents, [](vector<Segment> &) {});
 }
 
 bool SingleVehicleWorldGraph::AreWavesConnectible(Parents<JointSegment> & forwardParents,
diff --git a/libs/routing/single_vehicle_world_graph.hpp b/libs/routing/single_vehicle_world_graph.hpp
index 157ef9650..251bdf902 100644
--- a/libs/routing/single_vehicle_world_graph.hpp
+++ b/libs/routing/single_vehicle_world_graph.hpp
@@ -22,10 +22,8 @@ namespace routing
 class SingleVehicleWorldGraph final : public WorldGraph
 {
 public:
-  SingleVehicleWorldGraph(std::unique_ptr<CrossMwmGraph> crossMwmGraph,
-                          std::unique_ptr<IndexGraphLoader> loader,
-                          std::shared_ptr<EdgeEstimator> estimator,
-                          MwmHierarchyHandler && hierarchyHandler);
+  SingleVehicleWorldGraph(std::unique_ptr<CrossMwmGraph> crossMwmGraph, std::unique_ptr<IndexGraphLoader> loader,
+                          std::shared_ptr<EdgeEstimator> estimator, MwmHierarchyHandler && hierarchyHandler);
 
   // WorldGraph overrides:
   // @{
@@ -33,13 +31,11 @@ public:
 
   using WorldGraph::GetEdgeList;
 
-  void GetEdgeList(astar::VertexData<Segment, RouteWeight> const & vertexData, bool isOutgoing,
-                   bool useRoutingOptions, bool useAccessConditional,
-                   SegmentEdgeListT & edges) override;
+  void GetEdgeList(astar::VertexData<Segment, RouteWeight> const & vertexData, bool isOutgoing, bool useRoutingOptions,
+                   bool useAccessConditional, SegmentEdgeListT & edges) override;
 
-  void GetEdgeList(astar::VertexData<JointSegment, RouteWeight> const & parentVertexData,
-                   Segment const & parent, bool isOutgoing, bool useAccessConditional,
-                   JointEdgeListT & jointEdges,
+  void GetEdgeList(astar::VertexData<JointSegment, RouteWeight> const & parentVertexData, Segment const & parent,
+                   bool isOutgoing, bool useAccessConditional, JointEdgeListT & jointEdges,
                    WeightListT & parentWeights) override;
 
   bool CheckLength(RouteWeight const &, double) const override { return true; }
@@ -73,10 +69,7 @@ public:
   std::vector<RouteSegment::SpeedCamera> GetSpeedCamInfo(Segment const & segment) override;
   SpeedInUnits GetSpeedLimit(Segment const & segment) override;
 
-  IndexGraph & GetIndexGraph(NumMwmId numMwmId) override
-  {
-    return m_loader->GetIndexGraph(numMwmId);
-  }
+  IndexGraph & GetIndexGraph(NumMwmId numMwmId) override { return m_loader->GetIndexGraph(numMwmId); }
 
   void SetAStarParents(bool forward, Parents<Segment> & parents) override;
   void SetAStarParents(bool forward, Parents<JointSegment> & parents) override;
@@ -90,10 +83,7 @@ public:
   // @}
 
   // This method should be used for tests only
-  IndexGraph & GetIndexGraphForTests(NumMwmId numMwmId)
-  {
-    return m_loader->GetIndexGraph(numMwmId);
-  }
+  IndexGraph & GetIndexGraphForTests(NumMwmId numMwmId) { return m_loader->GetIndexGraph(numMwmId); }
 
   CrossMwmGraph & GetCrossMwmGraph() override { return *m_crossMwmGraph; }
 
@@ -103,16 +93,12 @@ private:
   /// \return The result chain of fetureIds are used to find restrictions on it and understand whether
   ///         waves are connectable or not.
   template <typename VertexType, class ConverterT>
-  bool AreWavesConnectibleImpl(Parents<VertexType> const & forwardParents,
-                               VertexType const & commonVertex,
-                               Parents<VertexType> const & backwardParents,
-                               ConverterT const & fakeConverter);
+  bool AreWavesConnectibleImpl(Parents<VertexType> const & forwardParents, VertexType const & commonVertex,
+                               Parents<VertexType> const & backwardParents, ConverterT const & fakeConverter);
 
   // Retrieves the same |jointEdges|, but into others mwms.
   // If they are cross mwm edges, of course.
-  void CheckAndProcessTransitFeatures(Segment const & parent,
-                                      JointEdgeListT & jointEdges,
-                                      WeightListT & parentWeights,
+  void CheckAndProcessTransitFeatures(Segment const & parent, JointEdgeListT & jointEdges, WeightListT & parentWeights,
                                       bool isOutgoing);
   /// @name WorldGraph overrides.
   /// @{
diff --git a/libs/routing/speed_camera.hpp b/libs/routing/speed_camera.hpp
index 963867938..5f8f009dc 100644
--- a/libs/routing/speed_camera.hpp
+++ b/libs/routing/speed_camera.hpp
@@ -13,7 +13,9 @@ struct SpeedCameraOnRoute
 {
   SpeedCameraOnRoute() = default;
   SpeedCameraOnRoute(double distFromBegin, uint8_t maxSpeedKmH, m2::PointD const & position)
-    : m_distFromBeginMeters(distFromBegin), m_maxSpeedKmH(maxSpeedKmH), m_position(position)
+    : m_distFromBeginMeters(distFromBegin)
+    , m_maxSpeedKmH(maxSpeedKmH)
+    , m_position(position)
   {}
 
   static uint8_t constexpr kNoSpeedInfo = std::numeric_limits<uint8_t>::max();
diff --git a/libs/routing/speed_camera_manager.cpp b/libs/routing/speed_camera_manager.cpp
index 9d772da3a..feb8ff5ce 100644
--- a/libs/routing/speed_camera_manager.cpp
+++ b/libs/routing/speed_camera_manager.cpp
@@ -21,9 +21,8 @@ SpeedCameraManager::SpeedCameraManager(turns::sound::NotificationManager & notif
   }
 }
 
-//static
-SpeedCameraManager::Interval
-SpeedCameraManager::GetIntervalByDistToCam(double distanceToCameraMeters, double speedMpS)
+// static
+SpeedCameraManager::Interval SpeedCameraManager::GetIntervalByDistToCam(double distanceToCameraMeters, double speedMpS)
 {
   if (distanceToCameraMeters < kInfluenceZoneMeters)
     return Interval::ImpactZone;
@@ -77,8 +76,7 @@ void SpeedCameraManager::OnLocationPositionChanged(location::GpsInfo const & inf
     }
   }
 
-  if (m_closestCamera.IsValid() &&
-      SetNotificationFlags(passedDistanceMeters, info.m_speed, m_closestCamera))
+  if (m_closestCamera.IsValid() && SetNotificationFlags(passedDistanceMeters, info.m_speed, m_closestCamera))
   {
     // If some notifications available now.
     SendNotificationStat(passedDistanceMeters, info.m_speed, m_closestCamera);
@@ -155,7 +153,7 @@ std::string SpeedCameraManagerModeForStat(SpeedCameraManagerMode mode)
 {
   CHECK_NOT_EQUAL(mode, SpeedCameraManagerMode::MaxValue, ());
 
-  switch(mode)
+  switch (mode)
   {
   case SpeedCameraManagerMode::Always: return "1";
   case SpeedCameraManagerMode::Auto: return "0";
@@ -180,8 +178,7 @@ void SpeedCameraManager::FindCamerasOnRouteAndCache(double passedDistanceMeters)
   double distToPrevSegment = segments[firstNotChecked].GetDistFromBeginningMeters();
   double distFromCurPosToLatestCheckedSegmentM = distToPrevSegment - passedDistanceMeters;
 
-  while (firstNotChecked < segments.size() &&
-         distFromCurPosToLatestCheckedSegmentM < kLookAheadDistanceMeters)
+  while (firstNotChecked < segments.size() && distFromCurPosToLatestCheckedSegmentM < kLookAheadDistanceMeters)
   {
     CHECK_GREATER(firstNotChecked, 0, ());
 
@@ -240,14 +237,14 @@ bool SpeedCameraManager::IsSpeedHigh(double distanceToCameraMeters, double speed
     return false;
 
   double timeToSlowSpeed =
-    (measurement_utils::KmphToMps(camera.m_maxSpeedKmH) - speedMpS) / kAverageAccelerationOfBraking;
+      (measurement_utils::KmphToMps(camera.m_maxSpeedKmH) - speedMpS) / kAverageAccelerationOfBraking;
 
   // Look to: https://en.wikipedia.org/wiki/Acceleration#Uniform_acceleration
   // S = V_0 * t + at^2 / 2, where
   //   V_0 - current speed
   //   a - kAverageAccelerationOfBraking
-  double distanceNeedsToSlowDown = timeToSlowSpeed * speedMpS +
-                                   (kAverageAccelerationOfBraking * timeToSlowSpeed * timeToSlowSpeed) / 2;
+  double distanceNeedsToSlowDown =
+      timeToSlowSpeed * speedMpS + (kAverageAccelerationOfBraking * timeToSlowSpeed * timeToSlowSpeed) / 2;
   distanceNeedsToSlowDown += kTimeForDecision * speedMpS;
 
   return distToDangerousZone < distanceNeedsToSlowDown + kDistanceEpsilonMeters;
@@ -279,8 +276,7 @@ bool SpeedCameraManager::SetNotificationFlags(double passedDistanceMeters, doubl
 
     // If we did voice notification, and didn't beep signal in |BeepSignalZone|, let's do it now.
     // Only for Auto mode.
-    if (m_voiceSignalCounter > 0 && m_beepSignalCounter == 0 &&
-        m_mode == SpeedCameraManagerMode::Auto)
+    if (m_voiceSignalCounter > 0 && m_beepSignalCounter == 0 && m_mode == SpeedCameraManagerMode::Auto)
     {
       m_makeBeepSignal = true;
       return true;
@@ -363,12 +359,10 @@ void SpeedCameraManager::SendNotificationStat(double passedDistanceMeters, doubl
 
   auto const distToCameraMeters = camera.m_distFromBeginMeters - passedDistanceMeters;
 
-  CHECK(
-      m_makeBeepSignal != m_makeVoiceSignal,
-      ("In each moment of time only one flag should be up.", m_makeVoiceSignal, distToCameraMeters,
-       measurement_utils::MpsToKmph(speedMpS), m_beepSignalCounter, m_voiceSignalCounter,
-       m_hasEnteredTheZone, m_speedLimitExceeded, m_firstNotCheckedSpeedCameraIndex,
-       mercator::ToLatLon(camera.m_position)));
+  CHECK(m_makeBeepSignal != m_makeVoiceSignal,
+        ("In each moment of time only one flag should be up.", m_makeVoiceSignal, distToCameraMeters,
+         measurement_utils::MpsToKmph(speedMpS), m_beepSignalCounter, m_voiceSignalCounter, m_hasEnteredTheZone,
+         m_speedLimitExceeded, m_firstNotCheckedSpeedCameraIndex, mercator::ToLatLon(camera.m_position)));
 }
 
 void SpeedCameraManager::SendEnterZoneStat(double distToCameraMeters, double speedMpS,
@@ -403,14 +397,10 @@ std::string DebugPrint(SpeedCameraManagerMode mode)
 {
   switch (mode)
   {
-  case SpeedCameraManagerMode::Auto:
-    return "auto";
-  case SpeedCameraManagerMode::Always:
-    return "always";
-  case SpeedCameraManagerMode::Never:
-    return "never";
-  case SpeedCameraManagerMode::MaxValue:
-    return "max_value";
+  case SpeedCameraManagerMode::Auto: return "auto";
+  case SpeedCameraManagerMode::Always: return "always";
+  case SpeedCameraManagerMode::Never: return "never";
+  case SpeedCameraManagerMode::MaxValue: return "max_value";
   }
 
   UNREACHABLE();
diff --git a/libs/routing/speed_camera_manager.hpp b/libs/routing/speed_camera_manager.hpp
index bc1a7b611..d26551c67 100644
--- a/libs/routing/speed_camera_manager.hpp
+++ b/libs/routing/speed_camera_manager.hpp
@@ -63,15 +63,9 @@ public:
   static Interval GetIntervalByDistToCam(double distanceToCameraMeters, double speedMpS);
 
   void SetRoute(std::weak_ptr<Route> route) { m_route = std::move(route); }
-  void SetSpeedCamShowCallback(SpeedCameraShowCallback && callback)
-  {
-    m_speedCamShowCallback = std::move(callback);
-  }
+  void SetSpeedCamShowCallback(SpeedCameraShowCallback && callback) { m_speedCamShowCallback = std::move(callback); }
 
-  void SetSpeedCamClearCallback(SpeedCameraClearCallback && callback)
-  {
-    m_speedCamClearCallback = std::move(callback);
-  }
+  void SetSpeedCamClearCallback(SpeedCameraClearCallback && callback) { m_speedCamClearCallback = std::move(callback); }
 
   bool Enable() const { return m_mode != SpeedCameraManagerMode::Never; }
   void OnLocationPositionChanged(location::GpsInfo const & info);
@@ -101,7 +95,7 @@ private:
 
   // Used for calculating distance needed to slow down before a speed camera.
   static double constexpr kAverageAccelerationOfBraking =
-    -kAverageFrictionOfRubberOnAspalt * kGravitationalAcceleration; // Meters per second squared.
+      -kAverageFrictionOfRubberOnAspalt * kGravitationalAcceleration;  // Meters per second squared.
 
   static_assert(kAverageAccelerationOfBraking != 0, "");
   static_assert(kAverageAccelerationOfBraking < 0, "AverageAccelerationOfBraking must be negative");
@@ -172,8 +166,7 @@ private:
   std::weak_ptr<Route> m_route;
   turns::sound::NotificationManager & m_notificationManager;
 
-  SpeedCameraShowCallback m_speedCamShowCallback = [](m2::PointD const & /* point */,
-                                                      double /* cameraSpeedKmPH */) {};
+  SpeedCameraShowCallback m_speedCamShowCallback = [](m2::PointD const & /* point */, double /* cameraSpeedKmPH */) {};
   SpeedCameraClearCallback m_speedCamClearCallback = []() {};
 
   SpeedCameraManagerMode m_mode = SpeedCameraManagerMode::Auto;
diff --git a/libs/routing/speed_camera_prohibition.cpp b/libs/routing/speed_camera_prohibition.cpp
index a49b8d09c..b5c8f7465 100644
--- a/libs/routing/speed_camera_prohibition.cpp
+++ b/libs/routing/speed_camera_prohibition.cpp
@@ -9,19 +9,21 @@ namespace
 {
 // List of country names where mwm should be generated without speed cameras.
 std::vector<std::string> kSpeedCamerasProhibitedCountries = {
-    "Macedonia", "Switzerland", "Turkey",
+    "Macedonia",
+    "Switzerland",
+    "Turkey",
 };
 
 // List of country names where an end user should be warned about speed cameras.
 std::vector<std::string> kSpeedCamerasPartlyProhibitedCountries = {
-    "France", "Germany",
+    "France",
+    "Germany",
 };
 
 bool IsMwmContained(platform::CountryFile const & mwm, std::vector<std::string> const & countryList)
 {
-  return std::any_of(countryList.cbegin(), countryList.cend(), [&mwm](auto const & country) {
-    return mwm.GetName().starts_with(country);
-  });
+  return std::any_of(countryList.cbegin(), countryList.cend(),
+                     [&mwm](auto const & country) { return mwm.GetName().starts_with(country); });
 }
 }  // namespace
 
@@ -36,4 +38,4 @@ bool AreSpeedCamerasPartlyProhibited(platform::CountryFile const & mwm)
 {
   return IsMwmContained(mwm, kSpeedCamerasPartlyProhibitedCountries);
 }
-} // namespace routing
+}  // namespace routing
diff --git a/libs/routing/speed_camera_prohibition.hpp b/libs/routing/speed_camera_prohibition.hpp
index 16ac741ea..92a208907 100644
--- a/libs/routing/speed_camera_prohibition.hpp
+++ b/libs/routing/speed_camera_prohibition.hpp
@@ -11,4 +11,4 @@ bool AreSpeedCamerasProhibited(platform::CountryFile const & mwm);
 
 /// \returns true if any information about speed cameras is prohibited or partly prohibited in |mwm|.
 bool AreSpeedCamerasPartlyProhibited(platform::CountryFile const & mwm);
-} // namespace routing
+}  // namespace routing
diff --git a/libs/routing/speed_camera_ser_des.cpp b/libs/routing/speed_camera_ser_des.cpp
index 69c5d1ead..8d39ed4f0 100644
--- a/libs/routing/speed_camera_ser_des.cpp
+++ b/libs/routing/speed_camera_ser_des.cpp
@@ -9,8 +9,7 @@ namespace routing
 {
 uint32_t constexpr SpeedCameraMwmHeader::kLatestVersion;
 
-void SerializeSpeedCamera(FileWriter & writer, routing::SpeedCameraMetadata const & data,
-                          uint32_t & prevFeatureId)
+void SerializeSpeedCamera(FileWriter & writer, routing::SpeedCameraMetadata const & data, uint32_t & prevFeatureId)
 {
   CHECK_EQUAL(data.m_ways.size(), 1, ());
 
diff --git a/libs/routing/speed_camera_ser_des.hpp b/libs/routing/speed_camera_ser_des.hpp
index c0bf5cf05..d8024377c 100644
--- a/libs/routing/speed_camera_ser_des.hpp
+++ b/libs/routing/speed_camera_ser_des.hpp
@@ -5,8 +5,8 @@
 #include "routing/segment.hpp"
 #include "routing/speed_camera.hpp"
 
-#include "coding/files_container.hpp"
 #include "coding/file_writer.hpp"
+#include "coding/files_container.hpp"
 #include "coding/point_coding.hpp"
 #include "coding/reader.hpp"
 #include "coding/varint.hpp"
@@ -34,8 +34,7 @@ static_assert(kMaxCameraSpeedKmpH == routing::SpeedCameraOnRoute::kNoSpeedInfo);
 struct SpeedCameraMwmPosition
 {
   SpeedCameraMwmPosition() = default;
-  SpeedCameraMwmPosition(uint32_t fId, uint32_t sId, double k)
-    : m_featureId(fId), m_segmentId(sId), m_coef(k) {}
+  SpeedCameraMwmPosition(uint32_t fId, uint32_t sId, double k) : m_featureId(fId), m_segmentId(sId), m_coef(k) {}
 
   uint32_t m_featureId = 0;
   uint32_t m_segmentId = 0;
@@ -54,9 +53,11 @@ enum class SpeedCameraDirection
 struct SpeedCameraMetadata
 {
   SpeedCameraMetadata() = default;
-  SpeedCameraMetadata(m2::PointD const & center, uint8_t maxSpeed,
-                      std::vector<routing::SpeedCameraMwmPosition> && ways)
-    : m_center(center), m_maxSpeedKmPH(maxSpeed), m_ways(std::move(ways)) {}
+  SpeedCameraMetadata(m2::PointD const & center, uint8_t maxSpeed, std::vector<routing::SpeedCameraMwmPosition> && ways)
+    : m_center(center)
+    , m_maxSpeedKmPH(maxSpeed)
+    , m_ways(std::move(ways))
+  {}
 
   m2::PointD m_center;
   uint8_t m_maxSpeedKmPH = 0;
@@ -98,12 +99,11 @@ static_assert(sizeof(SpeedCameraMwmHeader) == 8, "Strange size of speed camera s
 
 using SegmentCoord = RoadPoint;
 
-void SerializeSpeedCamera(FileWriter & writer, SpeedCameraMetadata const & data,
-                          uint32_t & prevFeatureId);
+void SerializeSpeedCamera(FileWriter & writer, SpeedCameraMetadata const & data, uint32_t & prevFeatureId);
 
 template <typename Reader>
-std::pair<SegmentCoord, RouteSegment::SpeedCamera> DeserializeSpeedCamera(
-  ReaderSource<Reader> & src, uint32_t & prevFeatureId)
+std::pair<SegmentCoord, RouteSegment::SpeedCamera> DeserializeSpeedCamera(ReaderSource<Reader> & src,
+                                                                          uint32_t & prevFeatureId)
 {
   auto featureId = ReadVarUint<uint32_t>(src);
   featureId += prevFeatureId;  // delta coding
@@ -126,15 +126,14 @@ std::pair<SegmentCoord, RouteSegment::SpeedCamera> DeserializeSpeedCamera(
 
   // Number of time conditions of camera.
   auto const conditionsNumber = ReadVarUint<uint32_t>(src);
-  CHECK_EQUAL(conditionsNumber, 0,
-              ("Number of conditions should be 0, non zero number is not implemented now"));
+  CHECK_EQUAL(conditionsNumber, 0, ("Number of conditions should be 0, non zero number is not implemented now"));
 
-  return {{featureId, segmentId} /* SegmentCoord */,
-          {coef, speed}          /* RouteSegment::SpeedCamera */};
+  return {{featureId, segmentId} /* SegmentCoord */, {coef, speed} /* RouteSegment::SpeedCamera */};
 }
 
 using SpeedCamerasMapT = std::map<SegmentCoord, std::vector<RouteSegment::SpeedCamera>>;
-template <typename Reader> void DeserializeSpeedCamsFromMwm(ReaderSource<Reader> & src, SpeedCamerasMapT & map)
+template <typename Reader>
+void DeserializeSpeedCamsFromMwm(ReaderSource<Reader> & src, SpeedCamerasMapT & map)
 {
   SpeedCameraMwmHeader header;
   header.Deserialize(src);
diff --git a/libs/routing/traffic_stash.cpp b/libs/routing/traffic_stash.cpp
index b00d4f5bf..c9b4b262c 100644
--- a/libs/routing/traffic_stash.cpp
+++ b/libs/routing/traffic_stash.cpp
@@ -9,7 +9,8 @@ namespace routing
 using namespace std;
 
 TrafficStash::TrafficStash(traffic::TrafficCache const & source, shared_ptr<NumMwmIds> numMwmIds)
-  : m_source(source), m_numMwmIds(std::move(numMwmIds))
+  : m_source(source)
+  , m_numMwmIds(std::move(numMwmIds))
 {
   CHECK(m_numMwmIds, ());
 }
@@ -32,8 +33,7 @@ traffic::SpeedGroup TrafficStash::GetSpeedGroup(Segment const & segment) const
   return itSeg->second;
 }
 
-void TrafficStash::SetColoring(NumMwmId numMwmId,
-                               shared_ptr<const traffic::TrafficInfo::Coloring> coloring)
+void TrafficStash::SetColoring(NumMwmId numMwmId, shared_ptr<traffic::TrafficInfo::Coloring const> coloring)
 {
   m_mwmToTraffic[numMwmId] = coloring;
 }
diff --git a/libs/routing/traffic_stash.hpp b/libs/routing/traffic_stash.hpp
index 6cb4157c1..36d4fe556 100644
--- a/libs/routing/traffic_stash.hpp
+++ b/libs/routing/traffic_stash.hpp
@@ -42,7 +42,7 @@ public:
   TrafficStash(traffic::TrafficCache const & source, std::shared_ptr<NumMwmIds> numMwmIds);
 
   traffic::SpeedGroup GetSpeedGroup(Segment const & segment) const;
-  void SetColoring(NumMwmId numMwmId, std::shared_ptr<const traffic::TrafficInfo::Coloring> coloring);
+  void SetColoring(NumMwmId numMwmId, std::shared_ptr<traffic::TrafficInfo::Coloring const> coloring);
   bool Has(NumMwmId numMwmId) const;
 
 private:
@@ -52,6 +52,6 @@ private:
 
   traffic::TrafficCache const & m_source;
   std::shared_ptr<NumMwmIds> m_numMwmIds;
-  std::unordered_map<NumMwmId, std::shared_ptr<const traffic::TrafficInfo::Coloring>> m_mwmToTraffic;
+  std::unordered_map<NumMwmId, std::shared_ptr<traffic::TrafficInfo::Coloring const>> m_mwmToTraffic;
 };
 }  // namespace routing
diff --git a/libs/routing/transit_graph.cpp b/libs/routing/transit_graph.cpp
index 24ed34955..23419cae4 100644
--- a/libs/routing/transit_graph.cpp
+++ b/libs/routing/transit_graph.cpp
@@ -5,7 +5,6 @@
 
 #include "geometry/mercator.hpp"
 
-
 namespace routing
 {
 namespace
@@ -15,8 +14,8 @@ using namespace std;
 // gtfs converter step.
 size_t constexpr kDefaultIntervalS = 60 * 60;  // 1 hour.
 
-LatLonWithAltitude const & GetStopJunction(
-    map<transit::StopId, LatLonWithAltitude> const & stopCoords, transit::StopId stopId)
+LatLonWithAltitude const & GetStopJunction(map<transit::StopId, LatLonWithAltitude> const & stopCoords,
+                                           transit::StopId stopId)
 {
   auto const it = stopCoords.find(stopId);
   CHECK(it != stopCoords.cend(), ("Stop", stopId, "does not exist."));
@@ -38,22 +37,24 @@ bool TransitGraph::IsTransitSegment(Segment const & segment)
 
 TransitGraph::TransitGraph(::transit::TransitVersion transitVersion, NumMwmId numMwmId,
                            shared_ptr<EdgeEstimator> estimator)
-  : m_transitVersion(transitVersion), m_mwmId(numMwmId), m_estimator(estimator)
+  : m_transitVersion(transitVersion)
+  , m_mwmId(numMwmId)
+  , m_estimator(estimator)
+{}
+
+::transit::TransitVersion TransitGraph::GetTransitVersion() const
 {
+  return m_transitVersion;
 }
 
-::transit::TransitVersion TransitGraph::GetTransitVersion() const { return m_transitVersion; }
-
-LatLonWithAltitude const & TransitGraph::GetJunction(Segment const & segment,
-                                                              bool front) const
+LatLonWithAltitude const & TransitGraph::GetJunction(Segment const & segment, bool front) const
 {
   CHECK(IsTransitSegment(segment), ("Nontransit segment passed to TransitGraph."));
   auto const & vertex = m_fake.GetVertex(segment);
   return front ? vertex.GetJunctionTo() : vertex.GetJunctionFrom();
 }
 
-RouteWeight TransitGraph::CalcSegmentWeight(Segment const & segment,
-                                            EdgeEstimator::Purpose purpose) const
+RouteWeight TransitGraph::CalcSegmentWeight(Segment const & segment, EdgeEstimator::Purpose purpose) const
 {
   CHECK(IsTransitSegment(segment), ("Nontransit segment passed to TransitGraph."));
 
@@ -79,18 +80,16 @@ RouteWeight TransitGraph::CalcSegmentWeight(Segment const & segment,
     {
       // TODO (o.khlopkova) Manage different weights for different stops linked to the gate.
       auto const weight = kDefaultIntervalS;
-      return RouteWeight(weight /* weight */, 0 /* numPassThroughChanges */,
-                         0 /* numAccessChanges */, 0 /* numAccessConditionalPenalties */,
-                         weight /* transitTime */);
+      return RouteWeight(weight /* weight */, 0 /* numPassThroughChanges */, 0 /* numAccessChanges */,
+                         0 /* numAccessConditionalPenalties */, weight /* transitTime */);
     }
 
     if (IsEdge(segment))
     {
       auto const weight = GetEdgePT(segment).GetWeight();
       CHECK_NOT_EQUAL(weight, 0, (segment));
-      return RouteWeight(weight /* weight */, 0 /* numPassThroughChanges */,
-                         0 /* numAccessChanges */, 0 /* numAccessConditionalPenalties */,
-                         weight /* transitTime */);
+      return RouteWeight(weight /* weight */, 0 /* numPassThroughChanges */, 0 /* numAccessChanges */,
+                         0 /* numAccessConditionalPenalties */, weight /* transitTime */);
     }
   }
   else
@@ -99,9 +98,8 @@ RouteWeight TransitGraph::CalcSegmentWeight(Segment const & segment,
     UNREACHABLE();
   }
 
-  return RouteWeight(
-      m_estimator->CalcOffroad(GetJunction(segment, false /* front */).GetLatLon(),
-                               GetJunction(segment, true /* front */).GetLatLon(), purpose));
+  return RouteWeight(m_estimator->CalcOffroad(GetJunction(segment, false /* front */).GetLatLon(),
+                                              GetJunction(segment, true /* front */).GetLatLon(), purpose));
 }
 
 RouteWeight TransitGraph::GetTransferPenalty(Segment const & from, Segment const & to) const
@@ -129,11 +127,9 @@ RouteWeight TransitGraph::GetTransferPenalty(Segment const & from, Segment const
     // 2. |from| is transfer, |to| is edge
     // 3. |from| is edge, |to| is edge from another line directly connected to |from|.
     auto const it = m_transferPenaltiesSubway.find(lineIdTo);
-    CHECK(it != m_transferPenaltiesSubway.cend(),
-          ("Segment", to, "belongs to unknown line:", lineIdTo));
-    return RouteWeight(it->second /* weight */, 0 /* nonPassThrougCross */,
-                       0 /* numAccessChanges */, 0 /* numAccessConditionalPenalties */,
-                       it->second /* transitTime */);
+    CHECK(it != m_transferPenaltiesSubway.cend(), ("Segment", to, "belongs to unknown line:", lineIdTo));
+    return RouteWeight(it->second /* weight */, 0 /* nonPassThrougCross */, 0 /* numAccessChanges */,
+                       0 /* numAccessConditionalPenalties */, it->second /* transitTime */);
   }
   else if (m_transitVersion == ::transit::TransitVersion::AllPublicTransport)
   {
@@ -164,24 +160,21 @@ RouteWeight TransitGraph::GetTransferPenalty(Segment const & from, Segment const
     size_t const headwayS = it->second.GetFrequency() / 2;
 
     return RouteWeight(static_cast<double>(headwayS) /* weight */, 0 /* nonPassThroughCross */,
-                       0 /* numAccessChanges */, 0 /* numAccessConditionalPenalties */,
-                       headwayS /* transitTime */);
+                       0 /* numAccessChanges */, 0 /* numAccessConditionalPenalties */, headwayS /* transitTime */);
   }
 
   CHECK(false, (m_transitVersion));
   UNREACHABLE();
 }
 
-void TransitGraph::GetTransitEdges(Segment const & segment, bool isOutgoing,
-                                   EdgeListT & edges) const
+void TransitGraph::GetTransitEdges(Segment const & segment, bool isOutgoing, EdgeListT & edges) const
 {
   CHECK(IsTransitSegment(segment), ("Nontransit segment passed to TransitGraph."));
   for (auto const & s : m_fake.GetEdges(segment, isOutgoing))
   {
     auto const & from = isOutgoing ? segment : s;
     auto const & to = isOutgoing ? s : segment;
-    edges.emplace_back(
-        s, CalcSegmentWeight(to, EdgeEstimator::Purpose::Weight) + GetTransferPenalty(from, to));
+    edges.emplace_back(s, CalcSegmentWeight(to, EdgeEstimator::Purpose::Weight) + GetTransferPenalty(from, to));
   }
 }
 
@@ -195,8 +188,8 @@ bool TransitGraph::FindReal(Segment const & fake, Segment & real) const
   return m_fake.FindReal(fake, real);
 }
 
-void TransitGraph::Fill(::transit::experimental::TransitData const & transitData,
-                        Endings const & stopEndings, Endings const & gateEndings)
+void TransitGraph::Fill(::transit::experimental::TransitData const & transitData, Endings const & stopEndings,
+                        Endings const & gateEndings)
 {
   CHECK_EQUAL(m_transitVersion, ::transit::TransitVersion::AllPublicTransport, ());
 
@@ -253,9 +246,7 @@ void TransitGraph::Fill(::transit::experimental::TransitData const & transitData
     // Stop ending may have empty projections vector. It means stop is not connected to roads.
     auto const it = stopEndings.find(stop.GetId());
     if (it != stopEndings.end())
-    {
       AddStop(stop, it->second, stopCoords, stopToBack, stopToFront);
-    }
   }
 
   AddConnections(outgoing, stopToBack, stopToFront, true /* isOutgoing */);
@@ -293,8 +284,7 @@ void TransitGraph::Fill(transit::GraphData const & transitData, Endings const &
     auto const edgeSegment = AddEdge(edge, stopCoords, stopToBack, stopToFront);
     // Checks fake feature ids have consecutive numeration starting from
     // FakeFeatureIds::kTransitGraphFeaturesStart.
-    CHECK_EQUAL(edgeSegment.GetFeatureId(), i + FakeFeatureIds::kTransitGraphFeaturesStart,
-                (i, edge));
+    CHECK_EQUAL(edgeSegment.GetFeatureId(), i + FakeFeatureIds::kTransitGraphFeaturesStart, (i, edge));
     outgoing[edge.GetStop1Id()].insert(edgeSegment);
     ingoing[edge.GetStop2Id()].insert(edgeSegment);
   }
@@ -389,9 +379,8 @@ Segment TransitGraph::GetNewTransitSegment() const
 }
 
 void TransitGraph::AddGate(transit::Gate const & gate, FakeEnding const & ending,
-                           map<transit::StopId, LatLonWithAltitude> const & stopCoords,
-                           bool isEnter, StopToSegmentsMap & stopToBack,
-                           StopToSegmentsMap & stopToFront)
+                           map<transit::StopId, LatLonWithAltitude> const & stopCoords, bool isEnter,
+                           StopToSegmentsMap & stopToBack, StopToSegmentsMap & stopToFront)
 {
   CHECK_EQUAL(m_transitVersion, ::transit::TransitVersion::OnlySubway, (gate));
 
@@ -400,9 +389,9 @@ void TransitGraph::AddGate(transit::Gate const & gate, FakeEnding const & ending
   {
     // Add projection edges
     auto const projectionSegment = GetNewTransitSegment();
-    FakeVertex projectionVertex(
-        projection.m_segment.GetMwmId(), isEnter ? projection.m_junction : ending.m_originJunction,
-        isEnter ? ending.m_originJunction : projection.m_junction, FakeVertex::Type::PureFake);
+    FakeVertex projectionVertex(projection.m_segment.GetMwmId(),
+                                isEnter ? projection.m_junction : ending.m_originJunction,
+                                isEnter ? ending.m_originJunction : projection.m_junction, FakeVertex::Type::PureFake);
     m_fake.AddStandaloneVertex(projectionSegment, projectionVertex);
 
     // Add fake parts of real
@@ -410,19 +399,17 @@ void TransitGraph::AddGate(transit::Gate const & gate, FakeEnding const & ending
         projection.m_segment.GetMwmId(), isEnter ? projection.m_segmentBack : projection.m_junction,
         isEnter ? projection.m_junction : projection.m_segmentFront, FakeVertex::Type::PartOfReal);
     auto const fakeForwardSegment = GetNewTransitSegment();
-    m_fake.AddVertex(projectionSegment, fakeForwardSegment, forwardPartOfReal,
-                     !isEnter /* isOutgoing */, true /* isPartOfReal */, projection.m_segment);
+    m_fake.AddVertex(projectionSegment, fakeForwardSegment, forwardPartOfReal, !isEnter /* isOutgoing */,
+                     true /* isPartOfReal */, projection.m_segment);
 
     if (!projection.m_isOneWay)
     {
-      FakeVertex backwardPartOfReal(projection.m_segment.GetMwmId(),
-                                    isEnter ? projection.m_segmentFront : projection.m_junction,
-                                    isEnter ? projection.m_junction : projection.m_segmentBack,
-                                    FakeVertex::Type::PartOfReal);
+      FakeVertex backwardPartOfReal(
+          projection.m_segment.GetMwmId(), isEnter ? projection.m_segmentFront : projection.m_junction,
+          isEnter ? projection.m_junction : projection.m_segmentBack, FakeVertex::Type::PartOfReal);
       auto const fakeBackwardSegment = GetNewTransitSegment();
-      m_fake.AddVertex(projectionSegment, fakeBackwardSegment, backwardPartOfReal,
-                       !isEnter /* isOutgoing */, true /* isPartOfReal */,
-                       projection.m_segment.GetReversed());
+      m_fake.AddVertex(projectionSegment, fakeBackwardSegment, backwardPartOfReal, !isEnter /* isOutgoing */,
+                       true /* isPartOfReal */, projection.m_segment.GetReversed());
     }
 
     // Connect gate to stops
@@ -431,11 +418,10 @@ void TransitGraph::AddGate(transit::Gate const & gate, FakeEnding const & ending
       auto const gateSegment = GetNewTransitSegment();
       auto const stopIt = stopCoords.find(stopId);
       CHECK(stopIt != stopCoords.end(), ("Stop", stopId, "does not exist."));
-      FakeVertex gateVertex(
-          projection.m_segment.GetMwmId(), isEnter ? ending.m_originJunction : stopIt->second,
-          isEnter ? stopIt->second : ending.m_originJunction, FakeVertex::Type::PureFake);
-      m_fake.AddVertex(projectionSegment, gateSegment, gateVertex, isEnter /* isOutgoing */,
-                       false /* isPartOfReal */, dummy /* realSegment */);
+      FakeVertex gateVertex(projection.m_segment.GetMwmId(), isEnter ? ending.m_originJunction : stopIt->second,
+                            isEnter ? stopIt->second : ending.m_originJunction, FakeVertex::Type::PureFake);
+      m_fake.AddVertex(projectionSegment, gateSegment, gateVertex, isEnter /* isOutgoing */, false /* isPartOfReal */,
+                       dummy /* realSegment */);
       m_segmentToGateSubway[gateSegment] = gate;
       if (isEnter)
         stopToFront[stopId].insert(gateSegment);
@@ -446,9 +432,8 @@ void TransitGraph::AddGate(transit::Gate const & gate, FakeEnding const & ending
 }
 
 void TransitGraph::AddGate(::transit::experimental::Gate const & gate, FakeEnding const & ending,
-                           std::map<transit::StopId, LatLonWithAltitude> const & stopCoords,
-                           bool isEnter, StopToSegmentsMap & stopToBack,
-                           StopToSegmentsMap & stopToFront)
+                           std::map<transit::StopId, LatLonWithAltitude> const & stopCoords, bool isEnter,
+                           StopToSegmentsMap & stopToBack, StopToSegmentsMap & stopToFront)
 {
   CHECK_EQUAL(m_transitVersion, ::transit::TransitVersion::AllPublicTransport, (gate));
 
@@ -457,9 +442,9 @@ void TransitGraph::AddGate(::transit::experimental::Gate const & gate, FakeEndin
   {
     // Add projection edges
     auto const projectionSegment = GetNewTransitSegment();
-    FakeVertex projectionVertex(
-        projection.m_segment.GetMwmId(), isEnter ? projection.m_junction : ending.m_originJunction,
-        isEnter ? ending.m_originJunction : projection.m_junction, FakeVertex::Type::PureFake);
+    FakeVertex projectionVertex(projection.m_segment.GetMwmId(),
+                                isEnter ? projection.m_junction : ending.m_originJunction,
+                                isEnter ? ending.m_originJunction : projection.m_junction, FakeVertex::Type::PureFake);
     m_fake.AddStandaloneVertex(projectionSegment, projectionVertex);
 
     // Add fake parts of real
@@ -467,19 +452,17 @@ void TransitGraph::AddGate(::transit::experimental::Gate const & gate, FakeEndin
         projection.m_segment.GetMwmId(), isEnter ? projection.m_segmentBack : projection.m_junction,
         isEnter ? projection.m_junction : projection.m_segmentFront, FakeVertex::Type::PartOfReal);
     auto const fakeForwardSegment = GetNewTransitSegment();
-    m_fake.AddVertex(projectionSegment, fakeForwardSegment, forwardPartOfReal,
-                     !isEnter /* isOutgoing */, true /* isPartOfReal */, projection.m_segment);
+    m_fake.AddVertex(projectionSegment, fakeForwardSegment, forwardPartOfReal, !isEnter /* isOutgoing */,
+                     true /* isPartOfReal */, projection.m_segment);
 
     if (!projection.m_isOneWay)
     {
-      FakeVertex backwardPartOfReal(projection.m_segment.GetMwmId(),
-                                    isEnter ? projection.m_segmentFront : projection.m_junction,
-                                    isEnter ? projection.m_junction : projection.m_segmentBack,
-                                    FakeVertex::Type::PartOfReal);
+      FakeVertex backwardPartOfReal(
+          projection.m_segment.GetMwmId(), isEnter ? projection.m_segmentFront : projection.m_junction,
+          isEnter ? projection.m_junction : projection.m_segmentBack, FakeVertex::Type::PartOfReal);
       auto const fakeBackwardSegment = GetNewTransitSegment();
-      m_fake.AddVertex(projectionSegment, fakeBackwardSegment, backwardPartOfReal,
-                       !isEnter /* isOutgoing */, true /* isPartOfReal */,
-                       projection.m_segment.GetReversed());
+      m_fake.AddVertex(projectionSegment, fakeBackwardSegment, backwardPartOfReal, !isEnter /* isOutgoing */,
+                       true /* isPartOfReal */, projection.m_segment.GetReversed());
     }
 
     // Connect gate to stops
@@ -489,11 +472,10 @@ void TransitGraph::AddGate(::transit::experimental::Gate const & gate, FakeEndin
       auto const gateSegment = GetNewTransitSegment();
       auto const stopIt = stopCoords.find(stopId);
       CHECK(stopIt != stopCoords.end(), ("Stop", stopId, "does not exist."));
-      FakeVertex gateVertex(
-          projection.m_segment.GetMwmId(), isEnter ? ending.m_originJunction : stopIt->second,
-          isEnter ? stopIt->second : ending.m_originJunction, FakeVertex::Type::PureFake);
-      m_fake.AddVertex(projectionSegment, gateSegment, gateVertex, isEnter /* isOutgoing */,
-                       false /* isPartOfReal */, dummy /* realSegment */);
+      FakeVertex gateVertex(projection.m_segment.GetMwmId(), isEnter ? ending.m_originJunction : stopIt->second,
+                            isEnter ? stopIt->second : ending.m_originJunction, FakeVertex::Type::PureFake);
+      m_fake.AddVertex(projectionSegment, gateSegment, gateVertex, isEnter /* isOutgoing */, false /* isPartOfReal */,
+                       dummy /* realSegment */);
       m_segmentToGatePT[gateSegment] = gate;
       if (isEnter)
         stopToFront[stopId].insert(gateSegment);
@@ -516,31 +498,27 @@ void TransitGraph::AddStop(::transit::experimental::Stop const & stop, FakeEndin
     {
       // Add projection edges
       auto const projectionSegment = GetNewTransitSegment();
-      FakeVertex projectionVertex(projection.m_segment.GetMwmId(),
-                                  isEnter ? projection.m_junction : ending.m_originJunction,
-                                  isEnter ? ending.m_originJunction : projection.m_junction,
-                                  FakeVertex::Type::PureFake);
+      FakeVertex projectionVertex(
+          projection.m_segment.GetMwmId(), isEnter ? projection.m_junction : ending.m_originJunction,
+          isEnter ? ending.m_originJunction : projection.m_junction, FakeVertex::Type::PureFake);
       m_fake.AddStandaloneVertex(projectionSegment, projectionVertex);
 
       // Add fake parts of real
-      FakeVertex forwardPartOfReal(projection.m_segment.GetMwmId(),
-                                   isEnter ? projection.m_segmentBack : projection.m_junction,
-                                   isEnter ? projection.m_junction : projection.m_segmentFront,
-                                   FakeVertex::Type::PartOfReal);
+      FakeVertex forwardPartOfReal(
+          projection.m_segment.GetMwmId(), isEnter ? projection.m_segmentBack : projection.m_junction,
+          isEnter ? projection.m_junction : projection.m_segmentFront, FakeVertex::Type::PartOfReal);
       auto const fakeForwardSegment = GetNewTransitSegment();
-      m_fake.AddVertex(projectionSegment, fakeForwardSegment, forwardPartOfReal,
-                       !isEnter /* isOutgoing */, true /* isPartOfReal */, projection.m_segment);
+      m_fake.AddVertex(projectionSegment, fakeForwardSegment, forwardPartOfReal, !isEnter /* isOutgoing */,
+                       true /* isPartOfReal */, projection.m_segment);
 
       if (!projection.m_isOneWay)
       {
-        FakeVertex backwardPartOfReal(projection.m_segment.GetMwmId(),
-                                      isEnter ? projection.m_segmentFront : projection.m_junction,
-                                      isEnter ? projection.m_junction : projection.m_segmentBack,
-                                      FakeVertex::Type::PartOfReal);
+        FakeVertex backwardPartOfReal(
+            projection.m_segment.GetMwmId(), isEnter ? projection.m_segmentFront : projection.m_junction,
+            isEnter ? projection.m_junction : projection.m_segmentBack, FakeVertex::Type::PartOfReal);
         auto const fakeBackwardSegment = GetNewTransitSegment();
-        m_fake.AddVertex(projectionSegment, fakeBackwardSegment, backwardPartOfReal,
-                         !isEnter /* isOutgoing */, true /* isPartOfReal */,
-                         projection.m_segment.GetReversed());
+        m_fake.AddVertex(projectionSegment, fakeBackwardSegment, backwardPartOfReal, !isEnter /* isOutgoing */,
+                         true /* isPartOfReal */, projection.m_segment.GetReversed());
       }
 
       // Connect stop to graph.
@@ -548,11 +526,10 @@ void TransitGraph::AddStop(::transit::experimental::Stop const & stop, FakeEndin
       auto const stopSegment = GetNewTransitSegment();
       auto const stopIt = stopCoords.find(stopId);
       CHECK(stopIt != stopCoords.end(), ("Stop", stopId, "does not exist."));
-      FakeVertex stopVertex(
-          projection.m_segment.GetMwmId(), isEnter ? ending.m_originJunction : stopIt->second,
-          isEnter ? stopIt->second : ending.m_originJunction, FakeVertex::Type::PureFake);
-      m_fake.AddVertex(projectionSegment, stopSegment, stopVertex, isEnter /* isOutgoing */,
-                       false /* isPartOfReal */, dummy /* realSegment */);
+      FakeVertex stopVertex(projection.m_segment.GetMwmId(), isEnter ? ending.m_originJunction : stopIt->second,
+                            isEnter ? stopIt->second : ending.m_originJunction, FakeVertex::Type::PureFake);
+      m_fake.AddVertex(projectionSegment, stopSegment, stopVertex, isEnter /* isOutgoing */, false /* isPartOfReal */,
+                       dummy /* realSegment */);
       m_segmentToStopPT[stopSegment] = stop;
       if (isEnter)
         stopToFront[stopId].insert(stopSegment);
@@ -562,8 +539,7 @@ void TransitGraph::AddStop(::transit::experimental::Stop const & stop, FakeEndin
   }
 }
 
-Segment TransitGraph::AddEdge(transit::Edge const & edge,
-                              map<transit::StopId, LatLonWithAltitude> const & stopCoords,
+Segment TransitGraph::AddEdge(transit::Edge const & edge, map<transit::StopId, LatLonWithAltitude> const & stopCoords,
                               StopToSegmentsMap & stopToBack, StopToSegmentsMap & stopToFront)
 {
   CHECK_EQUAL(m_transitVersion, ::transit::TransitVersion::OnlySubway, (edge));
@@ -571,8 +547,8 @@ Segment TransitGraph::AddEdge(transit::Edge const & edge,
   auto const edgeSegment = GetNewTransitSegment();
   auto const stopFromId = edge.GetStop1Id();
   auto const stopToId = edge.GetStop2Id();
-  FakeVertex edgeVertex(m_mwmId, GetStopJunction(stopCoords, stopFromId),
-                        GetStopJunction(stopCoords, stopToId), FakeVertex::Type::PureFake);
+  FakeVertex edgeVertex(m_mwmId, GetStopJunction(stopCoords, stopFromId), GetStopJunction(stopCoords, stopToId),
+                        FakeVertex::Type::PureFake);
   m_fake.AddStandaloneVertex(edgeSegment, edgeVertex);
   m_segmentToEdgeSubway[edgeSegment] = edge;
   stopToBack[stopFromId].insert(edgeSegment);
@@ -589,8 +565,8 @@ Segment TransitGraph::AddEdge(::transit::experimental::Edge const & edge,
   auto const edgeSegment = GetNewTransitSegment();
   auto const stopFromId = edge.GetStop1Id();
   auto const stopToId = edge.GetStop2Id();
-  FakeVertex edgeVertex(m_mwmId, GetStopJunction(stopCoords, stopFromId),
-                        GetStopJunction(stopCoords, stopToId), FakeVertex::Type::PureFake);
+  FakeVertex edgeVertex(m_mwmId, GetStopJunction(stopCoords, stopFromId), GetStopJunction(stopCoords, stopToId),
+                        FakeVertex::Type::PureFake);
   m_fake.AddStandaloneVertex(edgeSegment, edgeVertex);
   m_segmentToEdgePT[edgeSegment] = edge;
   stopToBack[stopFromId].insert(edgeSegment);
@@ -598,8 +574,7 @@ Segment TransitGraph::AddEdge(::transit::experimental::Edge const & edge,
   return edgeSegment;
 }
 
-void TransitGraph::AddConnections(StopToSegmentsMap const & connections,
-                                  StopToSegmentsMap const & stopToBack,
+void TransitGraph::AddConnections(StopToSegmentsMap const & connections, StopToSegmentsMap const & stopToBack,
                                   StopToSegmentsMap const & stopToFront, bool isOutgoing)
 {
   for (auto const & connection : connections)
@@ -611,10 +586,7 @@ void TransitGraph::AddConnections(StopToSegmentsMap const & connections,
       if (segmentsIt == adjacentSegments.cend())
         continue;
       for (auto const & segment : segmentsIt->second)
-      {
-        m_fake.AddConnection(isOutgoing ? segment : connectedSegment,
-                             isOutgoing ? connectedSegment : segment);
-      }
+        m_fake.AddConnection(isOutgoing ? segment : connectedSegment, isOutgoing ? connectedSegment : segment);
     }
   }
 }
@@ -628,35 +600,32 @@ void MakeGateEndings(vector<transit::Gate> const & gates, NumMwmId mwmId, IndexG
     if (!gateSegment.IsValid())
       continue;
 
-    Segment const real(mwmId, gateSegment.GetFeatureId(), gateSegment.GetSegmentIdx(),
-                       gateSegment.GetForward());
+    Segment const real(mwmId, gateSegment.GetFeatureId(), gateSegment.GetSegmentIdx(), gateSegment.GetForward());
     gateEndings.emplace(gate.GetOsmId(), MakeFakeEnding({real}, gate.GetPoint(), indexGraph));
   }
 }
 
-void MakeGateEndings(std::vector<::transit::experimental::Gate> const & gates, NumMwmId mwmId,
-                     IndexGraph & indexGraph, TransitGraph::Endings & gateEndings)
+void MakeGateEndings(std::vector<::transit::experimental::Gate> const & gates, NumMwmId mwmId, IndexGraph & indexGraph,
+                     TransitGraph::Endings & gateEndings)
 {
   for (auto const & gate : gates)
   {
     for (auto const & gateSegment : gate.GetBestPedestrianSegments())
     {
-      Segment const real(mwmId, gateSegment.GetFeatureId(), gateSegment.GetSegmentIdx(),
-                         gateSegment.IsForward());
+      Segment const real(mwmId, gateSegment.GetFeatureId(), gateSegment.GetSegmentIdx(), gateSegment.IsForward());
       gateEndings.emplace(gate.GetOsmId(), MakeFakeEnding(real, gate.GetPoint(), indexGraph));
     }
   }
 }
 
-void MakeStopEndings(std::vector<::transit::experimental::Stop> const & stops, NumMwmId mwmId,
-                     IndexGraph & indexGraph, TransitGraph::Endings & stopEndings)
+void MakeStopEndings(std::vector<::transit::experimental::Stop> const & stops, NumMwmId mwmId, IndexGraph & indexGraph,
+                     TransitGraph::Endings & stopEndings)
 {
   for (auto const & stop : stops)
   {
     for (auto const & stopSegment : stop.GetBestPedestrianSegments())
     {
-      Segment const real(mwmId, stopSegment.GetFeatureId(), stopSegment.GetSegmentIdx(),
-                         stopSegment.IsForward());
+      Segment const real(mwmId, stopSegment.GetFeatureId(), stopSegment.GetSegmentIdx(), stopSegment.IsForward());
       stopEndings.emplace(stop.GetId(), MakeFakeEnding(real, stop.GetPoint(), indexGraph));
     }
   }
diff --git a/libs/routing/transit_graph.hpp b/libs/routing/transit_graph.hpp
index 37d4c44fc..c1b50925c 100644
--- a/libs/routing/transit_graph.hpp
+++ b/libs/routing/transit_graph.hpp
@@ -37,8 +37,7 @@ public:
   static bool IsTransitFeature(uint32_t featureId);
   static bool IsTransitSegment(Segment const & segment);
 
-  TransitGraph(::transit::TransitVersion transitVersion, NumMwmId numMwmId,
-               std::shared_ptr<EdgeEstimator> estimator);
+  TransitGraph(::transit::TransitVersion transitVersion, NumMwmId numMwmId, std::shared_ptr<EdgeEstimator> estimator);
 
   ::transit::TransitVersion GetTransitVersion() const;
 
@@ -47,8 +46,7 @@ public:
   RouteWeight GetTransferPenalty(Segment const & from, Segment const & to) const;
 
   using EdgeListT = SmallList<SegmentEdge>;
-  void GetTransitEdges(Segment const & segment, bool isOutgoing,
-                       EdgeListT & edges) const;
+  void GetTransitEdges(Segment const & segment, bool isOutgoing, EdgeListT & edges) const;
   std::set<Segment> const & GetFake(Segment const & real) const;
   bool FindReal(Segment const & fake, Segment & real) const;
 
@@ -72,26 +70,25 @@ private:
   // Adds gate to fake graph. Also adds gate to temporary stopToBack, stopToFront maps used while
   // TransitGraph::Fill.
   void AddGate(transit::Gate const & gate, FakeEnding const & ending,
-               std::map<transit::StopId, LatLonWithAltitude> const & stopCoords,
-               bool isEnter, StopToSegmentsMap & stopToBack, StopToSegmentsMap & stopToFront);
+               std::map<transit::StopId, LatLonWithAltitude> const & stopCoords, bool isEnter,
+               StopToSegmentsMap & stopToBack, StopToSegmentsMap & stopToFront);
 
   void AddGate(::transit::experimental::Gate const & gate, FakeEnding const & ending,
                std::map<transit::StopId, LatLonWithAltitude> const & stopCoords, bool isEnter,
                StopToSegmentsMap & stopToBack, StopToSegmentsMap & stopToFront);
 
   void AddStop(::transit::experimental::Stop const & stop, FakeEnding const & ending,
-               std::map<transit::StopId, LatLonWithAltitude> const & stopCoords,
-               StopToSegmentsMap & stopToBack, StopToSegmentsMap & stopToFront);
+               std::map<transit::StopId, LatLonWithAltitude> const & stopCoords, StopToSegmentsMap & stopToBack,
+               StopToSegmentsMap & stopToFront);
 
   // Adds transit edge to fake graph, returns corresponding transit segment. Also adds gate to
   // temporary stopToBack, stopToFront maps used while TransitGraph::Fill.
-  Segment AddEdge(transit::Edge const & edge,
-                  std::map<transit::StopId, LatLonWithAltitude> const & stopCoords,
+  Segment AddEdge(transit::Edge const & edge, std::map<transit::StopId, LatLonWithAltitude> const & stopCoords,
                   StopToSegmentsMap & stopToBack, StopToSegmentsMap & stopToFront);
 
   Segment AddEdge(::transit::experimental::Edge const & edge,
-                  std::map<transit::StopId, LatLonWithAltitude> const & stopCoords,
-                  StopToSegmentsMap & stopToBack, StopToSegmentsMap & stopToFront);
+                  std::map<transit::StopId, LatLonWithAltitude> const & stopCoords, StopToSegmentsMap & stopToBack,
+                  StopToSegmentsMap & stopToFront);
 
   // Adds connections to fake graph.
   void AddConnections(StopToSegmentsMap const & connections, StopToSegmentsMap const & stopToBack,
@@ -114,12 +111,12 @@ private:
   std::map<::transit::TransitId, ::transit::Schedule> m_transferPenaltiesPT;
 };
 
-void MakeGateEndings(std::vector<transit::Gate> const & gates, NumMwmId mwmId,
-                     IndexGraph & indexGraph, TransitGraph::Endings & gateEndings);
+void MakeGateEndings(std::vector<transit::Gate> const & gates, NumMwmId mwmId, IndexGraph & indexGraph,
+                     TransitGraph::Endings & gateEndings);
 
-void MakeGateEndings(std::vector<::transit::experimental::Gate> const & gates, NumMwmId mwmId,
-                     IndexGraph & indexGraph, TransitGraph::Endings & gateEndings);
+void MakeGateEndings(std::vector<::transit::experimental::Gate> const & gates, NumMwmId mwmId, IndexGraph & indexGraph,
+                     TransitGraph::Endings & gateEndings);
 
-void MakeStopEndings(std::vector<::transit::experimental::Stop> const & stops, NumMwmId mwmId,
-                     IndexGraph & indexGraph, TransitGraph::Endings & gateEndings);
+void MakeStopEndings(std::vector<::transit::experimental::Stop> const & stops, NumMwmId mwmId, IndexGraph & indexGraph,
+                     TransitGraph::Endings & gateEndings);
 }  // namespace routing
diff --git a/libs/routing/transit_graph_loader.cpp b/libs/routing/transit_graph_loader.cpp
index 7a6e05700..1726947d5 100644
--- a/libs/routing/transit_graph_loader.cpp
+++ b/libs/routing/transit_graph_loader.cpp
@@ -26,9 +26,9 @@ class TransitGraphLoaderImpl : public TransitGraphLoader
 {
 public:
   TransitGraphLoaderImpl(MwmDataSource & dataSource, std::shared_ptr<EdgeEstimator> estimator)
-    : m_dataSource(dataSource), m_estimator(estimator)
-  {
-  }
+    : m_dataSource(dataSource)
+    , m_estimator(estimator)
+  {}
 
   TransitGraph & GetTransitGraph(NumMwmId numMwmId, IndexGraph & indexGraph) override
   {
@@ -110,7 +110,8 @@ private:
 };
 
 // static
-std::unique_ptr<TransitGraphLoader> TransitGraphLoader::Create(MwmDataSource & dataSource, std::shared_ptr<EdgeEstimator> estimator)
+std::unique_ptr<TransitGraphLoader> TransitGraphLoader::Create(MwmDataSource & dataSource,
+                                                               std::shared_ptr<EdgeEstimator> estimator)
 {
   return std::make_unique<TransitGraphLoaderImpl>(dataSource, estimator);
 }
diff --git a/libs/routing/transit_graph_loader.hpp b/libs/routing/transit_graph_loader.hpp
index 21fc9f385..5984b232c 100644
--- a/libs/routing/transit_graph_loader.hpp
+++ b/libs/routing/transit_graph_loader.hpp
@@ -20,6 +20,7 @@ public:
   virtual TransitGraph & GetTransitGraph(NumMwmId mwmId, IndexGraph & indexGraph) = 0;
   virtual void Clear() = 0;
 
-  static std::unique_ptr<TransitGraphLoader> Create(MwmDataSource & dataSource, std::shared_ptr<EdgeEstimator> estimator);
+  static std::unique_ptr<TransitGraphLoader> Create(MwmDataSource & dataSource,
+                                                    std::shared_ptr<EdgeEstimator> estimator);
 };
 }  // namespace routing
diff --git a/libs/routing/transit_info.hpp b/libs/routing/transit_info.hpp
index 861f89376..a516d0678 100644
--- a/libs/routing/transit_info.hpp
+++ b/libs/routing/transit_info.hpp
@@ -72,9 +72,7 @@ public:
   struct GatePT
   {
     GatePT() = default;
-    explicit GatePT(::transit::experimental::Gate const & gate) : m_featureId(gate.GetFeatureId())
-    {
-    }
+    explicit GatePT(::transit::experimental::Gate const & gate) : m_featureId(gate.GetFeatureId()) {}
 
     ::transit::experimental::FeatureId m_featureId = kInvalidFeatureId;
   };
@@ -82,8 +80,7 @@ public:
   struct TransferSubway
   {
     TransferSubway() = default;
-    explicit TransferSubway(transit::Edge const & edge)
-      : m_stop1Id(edge.GetStop1Id()), m_stop2Id(edge.GetStop2Id())
+    explicit TransferSubway(transit::Edge const & edge) : m_stop1Id(edge.GetStop1Id()), m_stop2Id(edge.GetStop2Id())
     {
       ASSERT(edge.GetTransfer(), ());
     }
@@ -96,7 +93,8 @@ public:
   {
     TransferPT() = default;
     explicit TransferPT(::transit::experimental::Edge const & edge)
-      : m_stop1Id(edge.GetStop1Id()), m_stop2Id(edge.GetStop2Id())
+      : m_stop1Id(edge.GetStop1Id())
+      , m_stop2Id(edge.GetStop2Id())
     {
       ASSERT(edge.IsTransfer(), ());
     }
@@ -109,31 +107,27 @@ public:
     : m_transitVersion(::transit::TransitVersion::OnlySubway)
     , m_type(Type::Gate)
     , m_gateSubway(gate)
-  {
-  }
+  {}
 
   explicit TransitInfo(::transit::experimental::Gate const & gate)
     : m_transitVersion(::transit::TransitVersion::AllPublicTransport)
     , m_type(Type::Gate)
     , m_gatePT(gate)
-  {
-  }
+  {}
 
   explicit TransitInfo(transit::Edge const & edge)
     : m_transitVersion(::transit::TransitVersion::OnlySubway)
     , m_type(edge.GetTransfer() ? Type::Transfer : Type::Edge)
     , m_edgeSubway(edge.GetTransfer() ? EdgeSubway() : EdgeSubway(edge))
     , m_transferSubway(edge.GetTransfer() ? TransferSubway(edge) : TransferSubway())
-  {
-  }
+  {}
 
   explicit TransitInfo(::transit::experimental::Edge const & edge)
     : m_transitVersion(::transit::TransitVersion::AllPublicTransport)
     , m_type(edge.IsTransfer() ? Type::Transfer : Type::Edge)
     , m_edgePT(edge.IsTransfer() ? EdgePT() : EdgePT(edge))
     , m_transferPT(edge.IsTransfer() ? TransferPT(edge) : TransferPT())
-  {
-  }
+  {}
 
   Type GetType() const { return m_type; }
 
diff --git a/libs/routing/transit_world_graph.cpp b/libs/routing/transit_world_graph.cpp
index f734ce954..14dc6983b 100644
--- a/libs/routing/transit_world_graph.cpp
+++ b/libs/routing/transit_world_graph.cpp
@@ -10,10 +10,8 @@ namespace routing
 {
 using namespace std;
 
-TransitWorldGraph::TransitWorldGraph(unique_ptr<CrossMwmGraph> crossMwmGraph,
-                                     unique_ptr<IndexGraphLoader> indexLoader,
-                                     unique_ptr<TransitGraphLoader> transitLoader,
-                                     shared_ptr<EdgeEstimator> estimator)
+TransitWorldGraph::TransitWorldGraph(unique_ptr<CrossMwmGraph> crossMwmGraph, unique_ptr<IndexGraphLoader> indexLoader,
+                                     unique_ptr<TransitGraphLoader> transitLoader, shared_ptr<EdgeEstimator> estimator)
   : m_crossMwmGraph(std::move(crossMwmGraph))
   , m_indexLoader(std::move(indexLoader))
   , m_transitLoader(std::move(transitLoader))
@@ -24,9 +22,8 @@ TransitWorldGraph::TransitWorldGraph(unique_ptr<CrossMwmGraph> crossMwmGraph,
   CHECK(m_estimator, ());
 }
 
-void TransitWorldGraph::GetEdgeList(astar::VertexData<Segment, RouteWeight> const & vertexData,
-                                    bool isOutgoing, bool useRoutingOptions,
-                                    bool useAccessConditional, SegmentEdgeListT & edges)
+void TransitWorldGraph::GetEdgeList(astar::VertexData<Segment, RouteWeight> const & vertexData, bool isOutgoing,
+                                    bool useRoutingOptions, bool useAccessConditional, SegmentEdgeListT & edges)
 {
   auto const & segment = vertexData.m_vertex;
   auto & transitGraph = GetTransitGraph(segment.GetMwmId());
@@ -69,10 +66,9 @@ void TransitWorldGraph::GetEdgeList(astar::VertexData<Segment, RouteWeight> cons
   edges.append(fakeFromReal.begin(), fakeFromReal.end());
 }
 
-void TransitWorldGraph::GetEdgeList(
-    astar::VertexData<JointSegment, RouteWeight> const & parentVertexData, Segment const & segment,
-    bool isOutgoing, bool useAccessConditional, JointEdgeListT & edges,
-    WeightListT & parentWeights)
+void TransitWorldGraph::GetEdgeList(astar::VertexData<JointSegment, RouteWeight> const & parentVertexData,
+                                    Segment const & segment, bool isOutgoing, bool useAccessConditional,
+                                    JointEdgeListT & edges, WeightListT & parentWeights)
 {
   CHECK(false, ("TransitWorldGraph does not support Joints mode."));
 }
@@ -82,8 +78,7 @@ LatLonWithAltitude const & TransitWorldGraph::GetJunction(Segment const & segmen
   if (TransitGraph::IsTransitSegment(segment))
     return GetTransitGraph(segment.GetMwmId()).GetJunction(segment, front);
 
-  return GetRealRoadGeometry(segment.GetMwmId(), segment.GetFeatureId())
-      .GetJunction(segment.GetPointId(front));
+  return GetRealRoadGeometry(segment.GetMwmId(), segment.GetFeatureId()).GetJunction(segment.GetPointId(front));
 }
 
 ms::LatLon const & TransitWorldGraph::GetPoint(Segment const & segment, bool front)
@@ -116,8 +111,7 @@ RouteWeight TransitWorldGraph::HeuristicCostEstimate(ms::LatLon const & from, ms
   return RouteWeight(m_estimator->CalcHeuristic(from, to));
 }
 
-RouteWeight TransitWorldGraph::CalcSegmentWeight(Segment const & segment,
-                                                 EdgeEstimator::Purpose purpose)
+RouteWeight TransitWorldGraph::CalcSegmentWeight(Segment const & segment, EdgeEstimator::Purpose purpose)
 {
   if (TransitGraph::IsTransitSegment(segment))
   {
@@ -134,8 +128,7 @@ RouteWeight TransitWorldGraph::CalcLeapWeight(ms::LatLon const & from, ms::LatLo
   return RouteWeight(m_estimator->CalcLeapWeight(from, to, mwmId));
 }
 
-RouteWeight TransitWorldGraph::CalcOffroadWeight(ms::LatLon const & from,
-                                                 ms::LatLon const & to,
+RouteWeight TransitWorldGraph::CalcOffroadWeight(ms::LatLon const & from, ms::LatLon const & to,
                                                  EdgeEstimator::Purpose purpose) const
 {
   return RouteWeight(m_estimator->CalcOffroad(from, to, purpose));
@@ -151,14 +144,12 @@ double TransitWorldGraph::CalculateETA(Segment const & from, Segment const & to)
 
   if (from.GetMwmId() != to.GetMwmId())
   {
-    return m_estimator->CalcSegmentWeight(to, GetRealRoadGeometry(to.GetMwmId(), to
-        .GetFeatureId()), EdgeEstimator::Purpose::ETA);
+    return m_estimator->CalcSegmentWeight(to, GetRealRoadGeometry(to.GetMwmId(), to.GetFeatureId()),
+                                          EdgeEstimator::Purpose::ETA);
   }
 
   auto & indexGraph = m_indexLoader->GetIndexGraph(from.GetMwmId());
-  return indexGraph
-      .CalculateEdgeWeight(EdgeEstimator::Purpose::ETA, true /* isOutgoing */, from, to)
-      .GetWeight();
+  return indexGraph.CalculateEdgeWeight(EdgeEstimator::Purpose::ETA, true /* isOutgoing */, from, to).GetWeight();
 }
 
 double TransitWorldGraph::CalculateETAWithoutPenalty(Segment const & segment)
@@ -166,9 +157,8 @@ double TransitWorldGraph::CalculateETAWithoutPenalty(Segment const & segment)
   if (TransitGraph::IsTransitSegment(segment))
     return CalcSegmentWeight(segment, EdgeEstimator::Purpose::ETA).GetWeight();
 
-  return m_estimator->CalcSegmentWeight(
-      segment, GetRealRoadGeometry(segment.GetMwmId(), segment.GetFeatureId()),
-      EdgeEstimator::Purpose::ETA);
+  return m_estimator->CalcSegmentWeight(segment, GetRealRoadGeometry(segment.GetMwmId(), segment.GetFeatureId()),
+                                        EdgeEstimator::Purpose::ETA);
 }
 
 unique_ptr<TransitInfo> TransitWorldGraph::GetTransitInfo(Segment const & segment)
@@ -203,14 +193,10 @@ unique_ptr<TransitInfo> TransitWorldGraph::GetTransitInfo(Segment const & segmen
   return {};
 }
 
-void TransitWorldGraph::GetTwinsInner(Segment const & segment, bool isOutgoing,
-                                      vector<Segment> & twins)
+void TransitWorldGraph::GetTwinsInner(Segment const & segment, bool isOutgoing, vector<Segment> & twins)
 {
-  if (m_mode == WorldGraphMode::SingleMwm || !m_crossMwmGraph ||
-      !m_crossMwmGraph->IsTransition(segment, isOutgoing))
-  {
+  if (m_mode == WorldGraphMode::SingleMwm || !m_crossMwmGraph || !m_crossMwmGraph->IsTransition(segment, isOutgoing))
     return;
-  }
   m_crossMwmGraph->GetTwins(segment, isOutgoing, twins);
 }
 
@@ -220,9 +206,8 @@ RoadGeometry const & TransitWorldGraph::GetRealRoadGeometry(NumMwmId mwmId, uint
   return m_indexLoader->GetIndexGraph(mwmId).GetRoadGeometry(featureId);
 }
 
-void TransitWorldGraph::AddRealEdges(astar::VertexData<Segment, RouteWeight> const & vertexData,
-                                     bool isOutgoing, bool useRoutingOptions,
-                                     SegmentEdgeListT & edges)
+void TransitWorldGraph::AddRealEdges(astar::VertexData<Segment, RouteWeight> const & vertexData, bool isOutgoing,
+                                     bool useRoutingOptions, SegmentEdgeListT & edges)
 {
   auto const & segment = vertexData.m_vertex;
   auto & indexGraph = GetIndexGraph(segment.GetMwmId());
diff --git a/libs/routing/transit_world_graph.hpp b/libs/routing/transit_world_graph.hpp
index 7366a5156..176261543 100644
--- a/libs/routing/transit_world_graph.hpp
+++ b/libs/routing/transit_world_graph.hpp
@@ -26,29 +26,24 @@ namespace routing
 class TransitWorldGraph final : public WorldGraph
 {
 public:
-  TransitWorldGraph(std::unique_ptr<CrossMwmGraph> crossMwmGraph,
-                    std::unique_ptr<IndexGraphLoader> indexLoader,
-                    std::unique_ptr<TransitGraphLoader> transitLoader,
-                    std::shared_ptr<EdgeEstimator> estimator);
+  TransitWorldGraph(std::unique_ptr<CrossMwmGraph> crossMwmGraph, std::unique_ptr<IndexGraphLoader> indexLoader,
+                    std::unique_ptr<TransitGraphLoader> transitLoader, std::shared_ptr<EdgeEstimator> estimator);
 
   // WorldGraph overrides:
   ~TransitWorldGraph() override = default;
 
   using WorldGraph::GetEdgeList;
 
-  void GetEdgeList(astar::VertexData<Segment, RouteWeight> const & vertexData, bool isOutgoing,
-                   bool useRoutingOptions, bool useAccessConditional,
-                   SegmentEdgeListT & edges) override;
+  void GetEdgeList(astar::VertexData<Segment, RouteWeight> const & vertexData, bool isOutgoing, bool useRoutingOptions,
+                   bool useAccessConditional, SegmentEdgeListT & edges) override;
   // Dummy method which shouldn't be called.
-  void GetEdgeList(astar::VertexData<JointSegment, RouteWeight> const & parentVertexData,
-                   Segment const & segment, bool isOutgoing, bool useAccessConditional,
-                   JointEdgeListT & edges,
+  void GetEdgeList(astar::VertexData<JointSegment, RouteWeight> const & parentVertexData, Segment const & segment,
+                   bool isOutgoing, bool useAccessConditional, JointEdgeListT & edges,
                    WeightListT & parentWeights) override;
 
   bool CheckLength(RouteWeight const & weight, double startToFinishDistanceM) const override
   {
-    return weight.GetWeight() - weight.GetTransitTime() <=
-           MaxPedestrianTimeSec(startToFinishDistanceM);
+    return weight.GetWeight() - weight.GetTransitTime() <= MaxPedestrianTimeSec(startToFinishDistanceM);
   }
   LatLonWithAltitude const & GetJunction(Segment const & segment, bool front) override;
   ms::LatLon const & GetPoint(Segment const & segment, bool front) override;
@@ -71,10 +66,7 @@ public:
 
   std::unique_ptr<TransitInfo> GetTransitInfo(Segment const & segment) override;
 
-  IndexGraph & GetIndexGraph(NumMwmId numMwmId) override
-  {
-    return m_indexLoader->GetIndexGraph(numMwmId);
-  }
+  IndexGraph & GetIndexGraph(NumMwmId numMwmId) override { return m_indexLoader->GetIndexGraph(numMwmId); }
 
 private:
   // WorldGraph overrides:
@@ -88,8 +80,8 @@ private:
   }
 
   RoadGeometry const & GetRealRoadGeometry(NumMwmId mwmId, uint32_t featureId);
-  void AddRealEdges(astar::VertexData<Segment, RouteWeight> const & vertexData, bool isOutgoing,
-                    bool useRoutingOptions, SegmentEdgeListT & edges);
+  void AddRealEdges(astar::VertexData<Segment, RouteWeight> const & vertexData, bool isOutgoing, bool useRoutingOptions,
+                    SegmentEdgeListT & edges);
   TransitGraph & GetTransitGraph(NumMwmId mwmId);
 
   std::unique_ptr<CrossMwmGraph> m_crossMwmGraph;
diff --git a/libs/routing/turn_candidate.hpp b/libs/routing/turn_candidate.hpp
index 57dd2131b..6025b580a 100644
--- a/libs/routing/turn_candidate.hpp
+++ b/libs/routing/turn_candidate.hpp
@@ -19,7 +19,6 @@ namespace turns
 /// \brief The TurnCandidate struct contains information about possible ways from a junction.
 struct TurnCandidate
 {
-
   /// |m_angle| is the angle of the turn in degrees. It means the angle is 180 minus
   /// the angle between the current edge and the edge of the candidate. A counterclockwise rotation.
   /// The current edge is an edge which belongs to the route and is located before the junction.
@@ -37,9 +36,11 @@ struct TurnCandidate
   bool m_isLink;
 
   TurnCandidate(double angle, Segment const & segment, ftypes::HighwayClass c, bool isLink)
-    : m_angle(angle), m_segment(segment), m_highwayClass(c), m_isLink(isLink)
-  {
-  }
+    : m_angle(angle)
+    , m_segment(segment)
+    , m_highwayClass(c)
+    , m_isLink(isLink)
+  {}
 
   bool IsAlmostEqual(TurnCandidate const & rhs) const
   {
@@ -55,10 +56,8 @@ inline bool IsAlmostEqual(std::vector<TurnCandidate> const & lhs, std::vector<Tu
     return false;
 
   for (size_t i = 0; i < lhs.size(); ++i)
-  {
     if (!lhs[i].IsAlmostEqual(rhs[i]))
       return false;
-  }
   return true;
 }
 
@@ -71,9 +70,8 @@ struct TurnCandidates
 
   bool IsAlmostEqual(TurnCandidates const & rhs) const
   {
-    return turns::IsAlmostEqual(candidates, rhs.candidates) &&
-           isCandidatesAngleValid == rhs.isCandidatesAngleValid;
+    return turns::IsAlmostEqual(candidates, rhs.candidates) && isCandidatesAngleValid == rhs.isCandidatesAngleValid;
   }
 };
-}  // namespace routing
 }  // namespace turns
+}  // namespace routing
diff --git a/libs/routing/turns.cpp b/libs/routing/turns.cpp
index bd495c9a2..012512555 100644
--- a/libs/routing/turns.cpp
+++ b/libs/routing/turns.cpp
@@ -40,36 +40,38 @@ array<pair<LaneWay, char const *>, static_cast<size_t>(LaneWay::Count) + 1> cons
      {LaneWay::SlightRight, "slight_right"},
      {LaneWay::SharpRight, "sharp_right"},
      {LaneWay::Reverse, "reverse"}}};
-static_assert(g_laneWayNames.size() == static_cast<size_t>(LaneWay::Count) + 1,
-              "Check the size of g_laneWayNames");
+static_assert(g_laneWayNames.size() == static_cast<size_t>(LaneWay::Count) + 1, "Check the size of g_laneWayNames");
 
-array<pair<CarDirection, char const *>, static_cast<size_t>(CarDirection::Count)> const
-    g_turnNames = {{{CarDirection::None, "None"},
-                    {CarDirection::GoStraight, "GoStraight"},
-                    {CarDirection::TurnRight, "TurnRight"},
-                    {CarDirection::TurnSharpRight, "TurnSharpRight"},
-                    {CarDirection::TurnSlightRight, "TurnSlightRight"},
-                    {CarDirection::TurnLeft, "TurnLeft"},
-                    {CarDirection::TurnSharpLeft, "TurnSharpLeft"},
-                    {CarDirection::TurnSlightLeft, "TurnSlightLeft"},
-                    {CarDirection::UTurnLeft, "UTurnLeft"},
-                    {CarDirection::UTurnRight, "UTurnRight"},
-                    {CarDirection::EnterRoundAbout, "EnterRoundAbout"},
-                    {CarDirection::LeaveRoundAbout, "LeaveRoundAbout"},
-                    {CarDirection::StayOnRoundAbout, "StayOnRoundAbout"},
-                    {CarDirection::StartAtEndOfStreet, "StartAtEndOfStreet"},
-                    {CarDirection::ReachedYourDestination, "ReachedYourDestination"},
-                    {CarDirection::ExitHighwayToLeft, "ExitHighwayToLeft"},
-                    {CarDirection::ExitHighwayToRight, "ExitHighwayToRight"}}};
-static_assert(g_turnNames.size() == static_cast<size_t>(CarDirection::Count),
-              "Check the size of g_turnNames");
+array<pair<CarDirection, char const *>, static_cast<size_t>(CarDirection::Count)> const g_turnNames = {
+    {{CarDirection::None, "None"},
+     {CarDirection::GoStraight, "GoStraight"},
+     {CarDirection::TurnRight, "TurnRight"},
+     {CarDirection::TurnSharpRight, "TurnSharpRight"},
+     {CarDirection::TurnSlightRight, "TurnSlightRight"},
+     {CarDirection::TurnLeft, "TurnLeft"},
+     {CarDirection::TurnSharpLeft, "TurnSharpLeft"},
+     {CarDirection::TurnSlightLeft, "TurnSlightLeft"},
+     {CarDirection::UTurnLeft, "UTurnLeft"},
+     {CarDirection::UTurnRight, "UTurnRight"},
+     {CarDirection::EnterRoundAbout, "EnterRoundAbout"},
+     {CarDirection::LeaveRoundAbout, "LeaveRoundAbout"},
+     {CarDirection::StayOnRoundAbout, "StayOnRoundAbout"},
+     {CarDirection::StartAtEndOfStreet, "StartAtEndOfStreet"},
+     {CarDirection::ReachedYourDestination, "ReachedYourDestination"},
+     {CarDirection::ExitHighwayToLeft, "ExitHighwayToLeft"},
+     {CarDirection::ExitHighwayToRight, "ExitHighwayToRight"}}};
+static_assert(g_turnNames.size() == static_cast<size_t>(CarDirection::Count), "Check the size of g_turnNames");
 }  // namespace
 
 // SegmentRange -----------------------------------------------------------------------------------
-SegmentRange::SegmentRange(FeatureID const & featureId, uint32_t startSegId, uint32_t endSegId,
-                           bool forward, m2::PointD const & start, m2::PointD const & end)
-  : m_featureId(featureId), m_startSegId(startSegId), m_endSegId(endSegId), m_forward(forward),
-    m_start(start), m_end(end)
+SegmentRange::SegmentRange(FeatureID const & featureId, uint32_t startSegId, uint32_t endSegId, bool forward,
+                           m2::PointD const & start, m2::PointD const & end)
+  : m_featureId(featureId)
+  , m_startSegId(startSegId)
+  , m_endSegId(endSegId)
+  , m_forward(forward)
+  , m_start(start)
+  , m_end(end)
 {
   if (m_startSegId != m_endSegId)
     CHECK_EQUAL(m_forward, m_startSegId < m_endSegId, (*this));
@@ -77,9 +79,8 @@ SegmentRange::SegmentRange(FeatureID const & featureId, uint32_t startSegId, uin
 
 bool SegmentRange::operator==(SegmentRange const & rhs) const
 {
-  return m_featureId == rhs.m_featureId && m_startSegId == rhs.m_startSegId &&
-         m_endSegId == rhs.m_endSegId && m_forward == rhs.m_forward && m_start == rhs.m_start &&
-         m_end == rhs.m_end;
+  return m_featureId == rhs.m_featureId && m_startSegId == rhs.m_startSegId && m_endSegId == rhs.m_endSegId &&
+         m_forward == rhs.m_forward && m_start == rhs.m_start && m_end == rhs.m_end;
 }
 
 bool SegmentRange::operator<(SegmentRange const & rhs) const
@@ -114,8 +115,8 @@ void SegmentRange::Clear()
 
 bool SegmentRange::IsEmpty() const
 {
-  return !m_featureId.IsValid() && m_startSegId == 0 && m_endSegId == 0 && m_forward &&
-         m_start == m2::PointD::Zero() && m_end == m2::PointD::Zero();
+  return !m_featureId.IsValid() && m_startSegId == 0 && m_endSegId == 0 && m_forward && m_start == m2::PointD::Zero() &&
+         m_end == m2::PointD::Zero();
 }
 
 FeatureID const & SegmentRange::GetFeature() const
@@ -138,14 +139,13 @@ bool SegmentRange::GetLastSegment(NumMwmIds const & numMwmIds, Segment & segment
   return GetSegmentBySegId(m_endSegId, numMwmIds, segment);
 }
 
-bool SegmentRange::GetSegmentBySegId(uint32_t segId, NumMwmIds const & numMwmIds,
-                                     Segment & segment) const
+bool SegmentRange::GetSegmentBySegId(uint32_t segId, NumMwmIds const & numMwmIds, Segment & segment) const
 {
   if (!m_featureId.IsValid())
     return false;
 
-  segment = Segment(numMwmIds.GetId(platform::CountryFile(m_featureId.GetMwmName())),
-                    m_featureId.m_index, segId, m_forward);
+  segment =
+      Segment(numMwmIds.GetId(platform::CountryFile(m_featureId.GetMwmName())), m_featureId.m_index, segId, m_forward);
   return true;
 }
 
@@ -153,13 +153,9 @@ string DebugPrint(SegmentRange const & segmentRange)
 {
   stringstream out;
   out << "SegmentRange "
-      << "{ m_featureId = " << DebugPrint(segmentRange.m_featureId)
-      << ", m_startSegId = " << segmentRange.m_startSegId
-      << ", m_endSegId = " << segmentRange.m_endSegId
-      << ", m_forward = " << segmentRange.m_forward
-      << ", m_start = " << DebugPrint(segmentRange.m_start)
-      << ", m_end = " << DebugPrint(segmentRange.m_end)
-      << " }";
+      << "{ m_featureId = " << DebugPrint(segmentRange.m_featureId) << ", m_startSegId = " << segmentRange.m_startSegId
+      << ", m_endSegId = " << segmentRange.m_endSegId << ", m_forward = " << segmentRange.m_forward
+      << ", m_start = " << DebugPrint(segmentRange.m_start) << ", m_end = " << DebugPrint(segmentRange.m_end) << " }";
   return out.str();
 }
 
@@ -175,12 +171,9 @@ string DebugPrint(TurnItem const & turnItem)
 {
   stringstream out;
   out << "TurnItem "
-      << "{ m_index = " << turnItem.m_index
-      << ", m_turn = " << DebugPrint(turnItem.m_turn)
-      << ", m_lanes = " << ::DebugPrint(turnItem.m_lanes)
-      << ", m_exitNum = " << turnItem.m_exitNum
-      << ", m_pedestrianDir = " << DebugPrint(turnItem.m_pedestrianTurn)
-      << " }";
+      << "{ m_index = " << turnItem.m_index << ", m_turn = " << DebugPrint(turnItem.m_turn)
+      << ", m_lanes = " << ::DebugPrint(turnItem.m_lanes) << ", m_exitNum = " << turnItem.m_exitNum
+      << ", m_pedestrianDir = " << DebugPrint(turnItem.m_pedestrianTurn) << " }";
   return out.str();
 }
 
@@ -188,8 +181,7 @@ string DebugPrint(TurnItemDist const & turnItemDist)
 {
   stringstream out;
   out << "TurnItemDist "
-      << "{ m_turnItem = " << DebugPrint(turnItemDist.m_turnItem)
-      << ", m_distMeters = " << turnItemDist.m_distMeters
+      << "{ m_turnItem = " << DebugPrint(turnItemDist.m_turnItem) << ", m_distMeters = " << turnItemDist.m_distMeters
       << " }";
   return out.str();
 }
@@ -197,10 +189,8 @@ string DebugPrint(TurnItemDist const & turnItemDist)
 string GetTurnString(CarDirection turn)
 {
   for (auto const & p : g_turnNames)
-  {
     if (p.first == turn)
       return p.second;
-  }
 
   ASSERT(false, (static_cast<int>(turn)));
   return "unknown CarDirection";
@@ -238,35 +228,25 @@ bool IsStayOnRoad(CarDirection t)
 
 bool IsGoStraightOrSlightTurn(CarDirection t)
 {
-  return (t == CarDirection::GoStraight || t == CarDirection::TurnSlightLeft ||
-          t == CarDirection::TurnSlightRight);
+  return (t == CarDirection::GoStraight || t == CarDirection::TurnSlightLeft || t == CarDirection::TurnSlightRight);
 }
 
 bool IsLaneWayConformedTurnDirection(LaneWay l, CarDirection t)
 {
   switch (t)
   {
-    default:
-      return false;
-    case CarDirection::GoStraight:
-      return l == LaneWay::Through;
-    case CarDirection::TurnRight:
-      return l == LaneWay::Right;
-    case CarDirection::TurnSharpRight:
-      return l == LaneWay::SharpRight;
-    case CarDirection::TurnSlightRight:
-    case CarDirection::ExitHighwayToRight:
-      return l == LaneWay::SlightRight;
-    case CarDirection::TurnLeft:
-      return l == LaneWay::Left;
-    case CarDirection::TurnSharpLeft:
-      return l == LaneWay::SharpLeft;
-    case CarDirection::TurnSlightLeft:
-    case CarDirection::ExitHighwayToLeft:
-      return l == LaneWay::SlightLeft;
-    case CarDirection::UTurnLeft:
-    case CarDirection::UTurnRight:
-      return l == LaneWay::Reverse;
+  default: return false;
+  case CarDirection::GoStraight: return l == LaneWay::Through;
+  case CarDirection::TurnRight: return l == LaneWay::Right;
+  case CarDirection::TurnSharpRight: return l == LaneWay::SharpRight;
+  case CarDirection::TurnSlightRight:
+  case CarDirection::ExitHighwayToRight: return l == LaneWay::SlightRight;
+  case CarDirection::TurnLeft: return l == LaneWay::Left;
+  case CarDirection::TurnSharpLeft: return l == LaneWay::SharpLeft;
+  case CarDirection::TurnSlightLeft:
+  case CarDirection::ExitHighwayToLeft: return l == LaneWay::SlightLeft;
+  case CarDirection::UTurnLeft:
+  case CarDirection::UTurnRight: return l == LaneWay::Reverse;
   }
 }
 
@@ -274,33 +254,22 @@ bool IsLaneWayConformedTurnDirectionApproximately(LaneWay l, CarDirection t)
 {
   switch (t)
   {
-    default:
-      return false;
-    case CarDirection::GoStraight:
-      return l == LaneWay::Through || l == LaneWay::SlightRight || l == LaneWay::SlightLeft;
-    case CarDirection::TurnRight:
-      return l == LaneWay::Right || l == LaneWay::SharpRight || l == LaneWay::SlightRight;
-    case CarDirection::TurnSharpRight:
-      return l == LaneWay::SharpRight || l == LaneWay::Right;
-    case CarDirection::TurnSlightRight:
-      return l == LaneWay::SlightRight || l == LaneWay::Through || l == LaneWay::Right;
-    case CarDirection::TurnLeft:
-      return l == LaneWay::Left || l == LaneWay::SlightLeft || l == LaneWay::SharpLeft;
-    case CarDirection::TurnSharpLeft:
-      return l == LaneWay::SharpLeft || l == LaneWay::Left;
-    case CarDirection::TurnSlightLeft:
-      return l == LaneWay::SlightLeft || l == LaneWay::Through || l == LaneWay::Left;
-    case CarDirection::UTurnLeft:
-    case CarDirection::UTurnRight:
-      return l == LaneWay::Reverse;
-    case CarDirection::ExitHighwayToLeft:
-      return l == LaneWay::SlightLeft || l == LaneWay::Left;
-    case CarDirection::ExitHighwayToRight:
-      return l == LaneWay::SlightRight || l == LaneWay::Right;
+  default: return false;
+  case CarDirection::GoStraight: return l == LaneWay::Through || l == LaneWay::SlightRight || l == LaneWay::SlightLeft;
+  case CarDirection::TurnRight: return l == LaneWay::Right || l == LaneWay::SharpRight || l == LaneWay::SlightRight;
+  case CarDirection::TurnSharpRight: return l == LaneWay::SharpRight || l == LaneWay::Right;
+  case CarDirection::TurnSlightRight: return l == LaneWay::SlightRight || l == LaneWay::Through || l == LaneWay::Right;
+  case CarDirection::TurnLeft: return l == LaneWay::Left || l == LaneWay::SlightLeft || l == LaneWay::SharpLeft;
+  case CarDirection::TurnSharpLeft: return l == LaneWay::SharpLeft || l == LaneWay::Left;
+  case CarDirection::TurnSlightLeft: return l == LaneWay::SlightLeft || l == LaneWay::Through || l == LaneWay::Left;
+  case CarDirection::UTurnLeft:
+  case CarDirection::UTurnRight: return l == LaneWay::Reverse;
+  case CarDirection::ExitHighwayToLeft: return l == LaneWay::SlightLeft || l == LaneWay::Left;
+  case CarDirection::ExitHighwayToRight: return l == LaneWay::SlightRight || l == LaneWay::Right;
   }
 }
 
-bool IsLaneUnrestricted(const SingleLaneInfo & lane)
+bool IsLaneUnrestricted(SingleLaneInfo const & lane)
 {
   /// @todo Is there any reason to store None single lane?
   return lane.m_lane.size() == 1 && lane.m_lane[0] == LaneWay::None;
@@ -312,9 +281,7 @@ void SplitLanes(string const & lanesString, char delimiter, vector<string> & lan
   istringstream lanesStream(lanesString);
   string token;
   while (getline(lanesStream, token, delimiter))
-  {
     lanes.push_back(token);
-  }
 }
 
 bool ParseSingleLane(string const & laneString, char delimiter, TSingleLane & lane)
@@ -331,10 +298,7 @@ bool ParseSingleLane(string const & laneString, char delimiter, TSingleLane & la
   while (getline(laneStream, token, delimiter))
   {
     auto const it = find_if(g_laneWayNames.begin(), g_laneWayNames.end(),
-                            [&token](pair<LaneWay, string> const & p)
-    {
-        return p.second == token;
-    });
+                            [&token](pair<LaneWay, string> const & p) { return p.second == token; });
     if (it == g_laneWayNames.end())
       return false;
     lane.push_back(it->first);
@@ -368,10 +332,7 @@ bool ParseLanes(string lanesString, vector<SingleLaneInfo> & lanes)
 string DebugPrint(LaneWay const l)
 {
   auto const it = find_if(g_laneWayNames.begin(), g_laneWayNames.end(),
-                          [&l](pair<LaneWay, string> const & p)
-  {
-    return p.first == l;
-  });
+                          [&l](pair<LaneWay, string> const & p) { return p.first == l; });
 
   if (it == g_laneWayNames.end())
   {
diff --git a/libs/routing/turns.hpp b/libs/routing/turns.hpp
index 2ec1590d2..63790f983 100644
--- a/libs/routing/turns.hpp
+++ b/libs/routing/turns.hpp
@@ -43,9 +43,9 @@ private:
   FeatureID m_featureId;
   // Note. If SegmentRange represents two directional feature |m_endSegId| is greater
   // than |m_startSegId| if |m_forward| == true.
-  uint32_t m_startSegId = 0;   // The first segment index of SegmentRange.
-  uint32_t m_endSegId = 0;     // The last segment index of SegmentRange.
-  bool m_forward = true;       // Segment direction in |m_featureId|.
+  uint32_t m_startSegId = 0;  // The first segment index of SegmentRange.
+  uint32_t m_endSegId = 0;    // The last segment index of SegmentRange.
+  bool m_forward = true;      // Segment direction in |m_featureId|.
   // Note. According to current implementation SegmentRange is filled based on instances of
   // Edge class in DirectionsEngine::GetSegmentRangeAndAdjacentEdges() method. In Edge class
   // to identify fake edges (part of real and completely fake) is used coordinates of beginning
@@ -57,8 +57,8 @@ private:
   // number mwm id field and feature id (uint32_t) should be used and |m_start| and |m_end|
   // should be removed. To do that classes IndexRoadGraph, CarDirectionsEngine,
   // PedestrianDirectionsEngine and other should be significant refactored.
-  m2::PointD m_start;          // Coordinates of start of last Edge in SegmentRange.
-  m2::PointD m_end;            // Coordinates of end of SegmentRange.
+  m2::PointD m_start;  // Coordinates of start of last Edge in SegmentRange.
+  m2::PointD m_end;    // Coordinates of end of SegmentRange.
 };
 
 namespace turns
@@ -98,7 +98,7 @@ enum class CarDirection
   ExitHighwayToLeft,
   ExitHighwayToRight,
 
-  Count  /**< This value is used for internals only. */
+  Count /**< This value is used for internals only. */
 };
 
 std::string DebugPrint(CarDirection const l);
@@ -134,7 +134,7 @@ enum class LaneWay
   SlightRight,
   Right,
   SharpRight,
-  Count  /**< This value is used for internals only. */
+  Count /**< This value is used for internals only. */
 };
 
 std::string DebugPrint(LaneWay const l);
@@ -156,29 +156,30 @@ std::string DebugPrint(SingleLaneInfo const & singleLaneInfo);
 struct TurnItem
 {
   TurnItem()
-      : m_index(std::numeric_limits<uint32_t>::max()),
-        m_turn(CarDirection::None),
-        m_exitNum(0),
-        m_pedestrianTurn(PedestrianDirection::None)
-  {
-  }
+    : m_index(std::numeric_limits<uint32_t>::max())
+    , m_turn(CarDirection::None)
+    , m_exitNum(0)
+    , m_pedestrianTurn(PedestrianDirection::None)
+  {}
 
   TurnItem(uint32_t idx, CarDirection t, uint32_t exitNum = 0)
-      : m_index(idx), m_turn(t), m_exitNum(exitNum)
-      , m_pedestrianTurn(PedestrianDirection::None)
-  {
-  }
+    : m_index(idx)
+    , m_turn(t)
+    , m_exitNum(exitNum)
+    , m_pedestrianTurn(PedestrianDirection::None)
+  {}
 
   TurnItem(uint32_t idx, PedestrianDirection p)
-      : m_index(idx), m_turn(CarDirection::None), m_exitNum(0)
-      , m_pedestrianTurn(p)
-  {
-  }
+    : m_index(idx)
+    , m_turn(CarDirection::None)
+    , m_exitNum(0)
+    , m_pedestrianTurn(p)
+  {}
 
   bool operator==(TurnItem const & rhs) const
   {
-    return m_index == rhs.m_index && m_turn == rhs.m_turn && m_lanes == rhs.m_lanes &&
-           m_exitNum == rhs.m_exitNum && m_pedestrianTurn == rhs.m_pedestrianTurn;
+    return m_index == rhs.m_index && m_turn == rhs.m_turn && m_lanes == rhs.m_lanes && m_exitNum == rhs.m_exitNum &&
+           m_pedestrianTurn == rhs.m_pedestrianTurn;
   }
 
   bool IsTurnReachedYourDestination() const
@@ -187,15 +188,12 @@ struct TurnItem
            m_pedestrianTurn == PedestrianDirection::ReachedYourDestination;
   }
 
-  bool IsTurnNone() const
-  {
-    return m_turn == CarDirection::None && m_pedestrianTurn == PedestrianDirection::None;
-  }
+  bool IsTurnNone() const { return m_turn == CarDirection::None && m_pedestrianTurn == PedestrianDirection::None; }
 
-  uint32_t m_index;                    /*!< Index of point on route polyline (Index of segment + 1). */
+  uint32_t m_index;                         /*!< Index of point on route polyline (Index of segment + 1). */
   CarDirection m_turn = CarDirection::None; /*!< The turn instruction of the TurnItem */
-  std::vector<SingleLaneInfo> m_lanes; /*!< Lane information on the edge before the turn. */
-  uint32_t m_exitNum;                  /*!< Number of exit on roundabout. */
+  std::vector<SingleLaneInfo> m_lanes;      /*!< Lane information on the edge before the turn. */
+  uint32_t m_exitNum;                       /*!< Number of exit on roundabout. */
   /*!
    * \brief m_pedestrianTurn is type of corresponding direction for a pedestrian, or None
    * if there is no pedestrian specific direction
@@ -207,10 +205,7 @@ std::string DebugPrint(TurnItem const & turnItem);
 
 struct TurnItemDist
 {
-  TurnItemDist(TurnItem const & turnItem, double distMeters)
-    : m_turnItem(turnItem), m_distMeters(distMeters)
-  {
-  }
+  TurnItemDist(TurnItem const & turnItem, double distMeters) : m_turnItem(turnItem), m_distMeters(distMeters) {}
   TurnItemDist() = default;
 
   TurnItem m_turnItem;
@@ -247,7 +242,7 @@ bool IsLaneWayConformedTurnDirection(LaneWay l, CarDirection t);
  */
 bool IsLaneWayConformedTurnDirectionApproximately(LaneWay l, CarDirection t);
 
-bool IsLaneUnrestricted(const SingleLaneInfo & lane);
+bool IsLaneUnrestricted(SingleLaneInfo const & lane);
 
 /*!
  * \brief Parse lane information which comes from @lanesString
@@ -265,7 +260,7 @@ bool ParseSingleLane(std::string const & laneString, char delimiter, TSingleLane
  * \returns pi minus angle from vector [junctionPoint, ingoingPoint]
  * to vector [junctionPoint, outgoingPoint]. A counterclockwise rotation.
  * Angle is in range [-pi, pi].
-*/
+ */
 double PiMinusTwoVectorsAngle(m2::PointD const & junctionPoint, m2::PointD const & ingoingPoint,
                               m2::PointD const & outgoingPoint);
 }  // namespace turns
diff --git a/libs/routing/turns_generator.cpp b/libs/routing/turns_generator.cpp
index 4dabed06a..fb0f5273a 100644
--- a/libs/routing/turns_generator.cpp
+++ b/libs/routing/turns_generator.cpp
@@ -4,7 +4,6 @@
 
 #include "indexer/ftypes_matcher.hpp"
 
-
 namespace routing
 {
 namespace turns
@@ -18,14 +17,14 @@ using namespace ftypes;
 /// * Returns false otherwise.
 /// \param turnCandidates is all possible ways out from a junction.
 /// \param turnInfo is information about ingoing and outgoing segments of the route.
-bool CanDiscardTurnByHighwayClass(std::vector<TurnCandidate> const & turnCandidates,
-                                  TurnInfo const & turnInfo,
+bool CanDiscardTurnByHighwayClass(std::vector<TurnCandidate> const & turnCandidates, TurnInfo const & turnInfo,
                                   NumMwmIds const & numMwmIds)
 {
   HighwayClass outgoingRouteRoadClass = turnInfo.m_outgoing->m_highwayClass;
   HighwayClass ingoingRouteRoadClass = turnInfo.m_ingoing->m_highwayClass;
 
-  HighwayClass maxRouteRoadClass = static_cast<HighwayClass>(max(static_cast<int>(ingoingRouteRoadClass), static_cast<int>(outgoingRouteRoadClass)));
+  HighwayClass maxRouteRoadClass =
+      static_cast<HighwayClass>(max(static_cast<int>(ingoingRouteRoadClass), static_cast<int>(outgoingRouteRoadClass)));
 
   // The turn should be kept if there's no any information about feature id of outgoing segment
   // just to be on the safe side. It may happen in case of outgoing segment is a finish segment.
@@ -56,9 +55,8 @@ bool CanDiscardTurnByHighwayClass(std::vector<TurnCandidate> const & turnCandida
   return true;
 }
 
-m2::PointD GetPointForTurn(IRoutingResult const & result, size_t outgoingSegmentIndex,
-                           NumMwmIds const & numMwmIds, size_t const maxPointsCount,
-                           double const maxDistMeters, bool const forward)
+m2::PointD GetPointForTurn(IRoutingResult const & result, size_t outgoingSegmentIndex, NumMwmIds const & numMwmIds,
+                           size_t const maxPointsCount, double const maxDistMeters, bool const forward)
 {
   auto const & segments = result.GetSegments();
   ASSERT_LESS(outgoingSegmentIndex, segments.size(), ());
@@ -138,19 +136,19 @@ bool GetNextCrossSegmentRoutePoint(IRoutingResult const & result, RoutePointInde
   // Case when the last point of the current segment is reached.
   // So probably it's necessary to cross a segment border.
   if (index.m_segmentIndex + 1 == segments.size())
-    return false; // The end of the route is reached.
+    return false;  // The end of the route is reached.
 
   TurnInfo const turnInfo(&segments[index.m_segmentIndex], &segments[index.m_segmentIndex + 1]);
 
   double const oneSegmentTurnAngle = CalcOneSegmentTurnAngle(turnInfo);
   CarDirection const oneSegmentDirection = IntermediateDirection(oneSegmentTurnAngle);
   if (!IsGoStraightOrSlightTurn(oneSegmentDirection))
-    return false; // Too sharp turn angle.
+    return false;  // Too sharp turn angle.
 
   size_t ingoingCount = 0;
   TurnCandidates possibleTurns;
-  result.GetPossibleTurns(turnInfo.m_ingoing->m_segmentRange, GetPointByIndex(segments, index),
-                          ingoingCount, possibleTurns);
+  result.GetPossibleTurns(turnInfo.m_ingoing->m_segmentRange, GetPointByIndex(segments, index), ingoingCount,
+                          possibleTurns);
 
   if (possibleTurns.candidates.empty())
     return false;
@@ -178,27 +176,28 @@ bool GetNextCrossSegmentRoutePoint(IRoutingResult const & result, RoutePointInde
   return false;
 }
 
-bool GetPrevInSegmentRoutePoint(IRoutingResult const & result, RoutePointIndex const & index, RoutePointIndex & nextIndex)
+bool GetPrevInSegmentRoutePoint(IRoutingResult const & result, RoutePointIndex const & index,
+                                RoutePointIndex & nextIndex)
 {
   if (index.m_pathIndex == 0)
     return false;
 
   auto const & segments = result.GetSegments();
-  if (segments[index.m_segmentIndex].m_path.size() >= 3 && index.m_pathIndex < segments[index.m_segmentIndex].m_path.size() - 1)
+  if (segments[index.m_segmentIndex].m_path.size() >= 3 &&
+      index.m_pathIndex < segments[index.m_segmentIndex].m_path.size() - 1)
   {
     double const oneSegmentTurnAngle = CalcPathTurnAngle(segments[index.m_segmentIndex], index.m_pathIndex);
     CarDirection const oneSegmentDirection = IntermediateDirection(oneSegmentTurnAngle);
     if (!IsGoStraightOrSlightTurn(oneSegmentDirection))
-      return false; // Too sharp turn angle.
+      return false;  // Too sharp turn angle.
   }
 
   nextIndex = {index.m_segmentIndex, index.m_pathIndex - 1};
   return true;
 }
 
-bool GetNextRoutePointIndex(IRoutingResult const & result, RoutePointIndex const & index,
-                            NumMwmIds const & numMwmIds, bool const forward,
-                            RoutePointIndex & nextIndex)
+bool GetNextRoutePointIndex(IRoutingResult const & result, RoutePointIndex const & index, NumMwmIds const & numMwmIds,
+                            bool const forward, RoutePointIndex & nextIndex)
 {
   if (forward)
   {
@@ -216,7 +215,8 @@ bool GetNextRoutePointIndex(IRoutingResult const & result, RoutePointIndex const
   return true;
 }
 
-void RemoveUTurnCandidate(TurnInfo const & turnInfo, NumMwmIds const & numMwmIds, std::vector<TurnCandidate> & turnCandidates)
+void RemoveUTurnCandidate(TurnInfo const & turnInfo, NumMwmIds const & numMwmIds,
+                          std::vector<TurnCandidate> & turnCandidates)
 {
   Segment lastIngoingSegment;
   if (turnInfo.m_ingoing->m_segmentRange.GetLastSegment(numMwmIds, lastIngoingSegment))
@@ -248,20 +248,18 @@ bool HasSingleForwardTurn(TurnCandidates const & turnCandidates, float maxForwar
   return foundForwardTurn;
 }
 
-double CalcTurnAngle(IRoutingResult const & result,
-                     size_t const outgoingSegmentIndex,
-                     NumMwmIds const & numMwmIds,
+double CalcTurnAngle(IRoutingResult const & result, size_t const outgoingSegmentIndex, NumMwmIds const & numMwmIds,
                      RoutingSettings const & vehicleSettings)
 {
   bool const isStartFakeLoop = PathIsFakeLoop(result.GetSegments()[outgoingSegmentIndex - 1].m_path);
   size_t const segmentIndexForIngoingPoint = isStartFakeLoop ? outgoingSegmentIndex - 1 : outgoingSegmentIndex;
 
-  m2::PointD const ingoingPoint = GetPointForTurn(
-      result, segmentIndexForIngoingPoint, numMwmIds, vehicleSettings.m_maxIngoingPointsCount,
-      vehicleSettings.m_minIngoingDistMeters, false /* forward */);
-  m2::PointD const outgoingPoint = GetPointForTurn(
-      result, outgoingSegmentIndex, numMwmIds, vehicleSettings.m_maxOutgoingPointsCount,
-      vehicleSettings.m_minOutgoingDistMeters, true /* forward */);
+  m2::PointD const ingoingPoint =
+      GetPointForTurn(result, segmentIndexForIngoingPoint, numMwmIds, vehicleSettings.m_maxIngoingPointsCount,
+                      vehicleSettings.m_minIngoingDistMeters, false /* forward */);
+  m2::PointD const outgoingPoint =
+      GetPointForTurn(result, outgoingSegmentIndex, numMwmIds, vehicleSettings.m_maxOutgoingPointsCount,
+                      vehicleSettings.m_minOutgoingDistMeters, true /* forward */);
 
   m2::PointD const junctionPoint = result.GetSegments()[outgoingSegmentIndex].m_path.front().GetPoint();
   return math::RadToDeg(PiMinusTwoVectorsAngle(junctionPoint, ingoingPoint, outgoingPoint));
@@ -272,9 +270,7 @@ void CorrectCandidatesSegmentByOutgoing(TurnInfo const & turnInfo, Segment const
 {
   double const turnAngle = CalcOneSegmentTurnAngle(turnInfo);
   auto const IsFirstOutgoingSeg = [&firstOutgoingSeg](TurnCandidate const & turnCandidate)
-  {
-    return turnCandidate.m_segment == firstOutgoingSeg;
-  };
+  { return turnCandidate.m_segment == firstOutgoingSeg; };
   auto & candidates = nodes.candidates;
   auto it = find_if(candidates.begin(), candidates.end(), IsFirstOutgoingSeg);
   if (it == candidates.end())
@@ -317,8 +313,7 @@ void CorrectCandidatesSegmentByOutgoing(TurnInfo const & turnInfo, Segment const
         LOG(LWARNING, ("and since candidates.size() > 1, this can't be fixed."));
     }
   }
-  else // firstOutgoingSeg is found.
-  {
+  else  // firstOutgoingSeg is found.
     if (nodes.isCandidatesAngleValid)
     {
 #ifdef DEBUG
@@ -335,12 +330,10 @@ void CorrectCandidatesSegmentByOutgoing(TurnInfo const & turnInfo, Segment const
       else
         LOG(LWARNING, ("isCandidatesAngleValid == false, and this can't be fixed."));
     }
-  }
 }
 
 bool GetTurnInfo(IRoutingResult const & result, size_t const outgoingSegmentIndex,
-                 RoutingSettings const & vehicleSettings,
-                 TurnInfo & turnInfo)
+                 RoutingSettings const & vehicleSettings, TurnInfo & turnInfo)
 {
   auto const & segments = result.GetSegments();
   CHECK_LESS(outgoingSegmentIndex, segments.size(), ());
@@ -363,9 +356,11 @@ bool GetTurnInfo(IRoutingResult const & result, size_t const outgoingSegmentInde
   if (isStartFakeLoop)
   {
     if (mercator::DistanceOnEarth(turnInfo.m_ingoing->m_path.front().GetPoint(),
-                                  turnInfo.m_ingoing->m_path.back().GetPoint()) < vehicleSettings.m_minIngoingDistMeters ||
+                                  turnInfo.m_ingoing->m_path.back().GetPoint()) <
+            vehicleSettings.m_minIngoingDistMeters ||
         mercator::DistanceOnEarth(turnInfo.m_outgoing->m_path.front().GetPoint(),
-                                  turnInfo.m_outgoing->m_path.back().GetPoint()) < vehicleSettings.m_minOutgoingDistMeters)
+                                  turnInfo.m_outgoing->m_path.back().GetPoint()) <
+            vehicleSettings.m_minOutgoingDistMeters)
     {
       return false;
     }
diff --git a/libs/routing/turns_generator.hpp b/libs/routing/turns_generator.hpp
index 8cc5c234b..692650f16 100644
--- a/libs/routing/turns_generator.hpp
+++ b/libs/routing/turns_generator.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "routing/routing_settings.hpp"
 #include "routing/routing_result_graph.hpp"
+#include "routing/routing_settings.hpp"
 #include "routing/turn_candidate.hpp"
 #include "routing/turns.hpp"
 
@@ -50,23 +50,24 @@ struct TurnInfo;
  * As a consequence moving in backward direction it's possible to get index of the first item
  * of a segment. But it's impossible moving in forward direction.
  */
-bool GetNextRoutePointIndex(IRoutingResult const & result, RoutePointIndex const & index,
-                            NumMwmIds const & numMwmIds, bool const forward, RoutePointIndex & nextIndex);
+bool GetNextRoutePointIndex(IRoutingResult const & result, RoutePointIndex const & index, NumMwmIds const & numMwmIds,
+                            bool const forward, RoutePointIndex & nextIndex);
 
-inline size_t GetFirstSegmentPointIndex(std::pair<size_t, size_t> const & p) { return p.first; }
+inline size_t GetFirstSegmentPointIndex(std::pair<size_t, size_t> const & p)
+{
+  return p.first;
+}
 
 bool GetTurnInfo(IRoutingResult const & result, size_t const outgoingSegmentIndex,
-                 RoutingSettings const & vehicleSettings,
-                 TurnInfo & turnInfo);
+                 RoutingSettings const & vehicleSettings, TurnInfo & turnInfo);
 
 /// \returns angle, wchis is calculated using several backward and forward segments
 /// from junction to consider smooth turns and remove noise.
-double CalcTurnAngle(IRoutingResult const & result,
-                     size_t const outgoingSegmentIndex,
-                     NumMwmIds const & numMwmIds,
+double CalcTurnAngle(IRoutingResult const & result, size_t const outgoingSegmentIndex, NumMwmIds const & numMwmIds,
                      RoutingSettings const & vehicleSettings);
 
-void RemoveUTurnCandidate(TurnInfo const & turnInfo, NumMwmIds const & numMwmIds, std::vector<TurnCandidate> & turnCandidates);
+void RemoveUTurnCandidate(TurnInfo const & turnInfo, NumMwmIds const & numMwmIds,
+                          std::vector<TurnCandidate> & turnCandidates);
 
 /// \returns true if there is exactly 1 turn in |turnCandidates| with angle less then
 /// |kMaxForwardAngleCandidates|.
@@ -99,9 +100,8 @@ void CorrectCandidatesSegmentByOutgoing(TurnInfo const & turnInfo, Segment const
  * If forward == true the direction is to route finish. If forward == false the direction is to route start.
  * \return an ingoing or outgoing point for a turn calculation.
  */
-m2::PointD GetPointForTurn(IRoutingResult const & result, size_t outgoingSegmentIndex,
-                           NumMwmIds const & numMwmIds, size_t const maxPointsCount,
-                           double const maxDistMeters, bool const forward);
+m2::PointD GetPointForTurn(IRoutingResult const & result, size_t outgoingSegmentIndex, NumMwmIds const & numMwmIds,
+                           size_t const maxPointsCount, double const maxDistMeters, bool const forward);
 
-}  // namespace routing
 }  // namespace turns
+}  // namespace routing
diff --git a/libs/routing/turns_generator_utils.cpp b/libs/routing/turns_generator_utils.cpp
index b5bd97c02..d2bfee835 100644
--- a/libs/routing/turns_generator_utils.cpp
+++ b/libs/routing/turns_generator_utils.cpp
@@ -5,7 +5,6 @@
 
 #include "geometry/mercator.hpp"
 
-
 namespace routing
 {
 namespace turns
@@ -15,16 +14,13 @@ using namespace ftypes;
 
 bool IsHighway(HighwayClass hwClass, bool isLink)
 {
-  return (hwClass == HighwayClass::Trunk || hwClass == HighwayClass::Primary) &&
-         !isLink;
+  return (hwClass == HighwayClass::Trunk || hwClass == HighwayClass::Primary) && !isLink;
 }
 
 bool IsSmallRoad(HighwayClass hwClass)
 {
-  return hwClass == HighwayClass::LivingStreet ||
-         hwClass == HighwayClass::Service ||
-         hwClass == HighwayClass::ServiceMinor ||
-         hwClass == HighwayClass::Pedestrian;
+  return hwClass == HighwayClass::LivingStreet || hwClass == HighwayClass::Service ||
+         hwClass == HighwayClass::ServiceMinor || hwClass == HighwayClass::Pedestrian;
 }
 
 int CalcDiffRoadClasses(HighwayClass const left, HighwayClass const right)
@@ -38,14 +34,11 @@ T FindDirectionByAngle(std::vector<std::pair<double, T>> const & lowerBounds, do
   ASSERT_GREATER_OR_EQUAL(angle, -180., (angle));
   ASSERT_LESS_OR_EQUAL(angle, 180., (angle));
   ASSERT(!lowerBounds.empty(), ());
-  ASSERT(is_sorted(lowerBounds.rbegin(), lowerBounds.rend(), base::LessBy(&std::pair<double, T>::first)),
-         ());
+  ASSERT(is_sorted(lowerBounds.rbegin(), lowerBounds.rend(), base::LessBy(&std::pair<double, T>::first)), ());
 
   for (auto const & lower : lowerBounds)
-  {
     if (angle >= lower.first)
       return lower.second;
-  }
 
   ASSERT(false, ("The angle is not covered by the table. angle = ", angle));
   return T::None;
@@ -55,20 +48,13 @@ CarDirection InvertDirection(CarDirection const dir)
 {
   switch (dir)
   {
-    case CarDirection::TurnSlightRight:
-      return CarDirection::TurnSlightLeft;
-    case CarDirection::TurnRight:
-      return CarDirection::TurnLeft;
-    case CarDirection::TurnSharpRight:
-      return CarDirection::TurnSharpLeft;
-    case CarDirection::TurnSlightLeft:
-      return CarDirection::TurnSlightRight;
-    case CarDirection::TurnLeft:
-      return CarDirection::TurnRight;
-    case CarDirection::TurnSharpLeft:
-      return CarDirection::TurnSharpRight;
-    default:
-      return dir;
+  case CarDirection::TurnSlightRight: return CarDirection::TurnSlightLeft;
+  case CarDirection::TurnRight: return CarDirection::TurnLeft;
+  case CarDirection::TurnSharpRight: return CarDirection::TurnSharpLeft;
+  case CarDirection::TurnSlightLeft: return CarDirection::TurnSlightRight;
+  case CarDirection::TurnLeft: return CarDirection::TurnRight;
+  case CarDirection::TurnSharpLeft: return CarDirection::TurnSharpRight;
+  default: return dir;
   };
 }
 
@@ -79,8 +65,8 @@ CarDirection RightmostDirection(double const angle)
       {50., CarDirection::TurnRight},
       {10., CarDirection::TurnSlightRight},
       // For sure it's incorrect to give directions TurnLeft or TurnSlighLeft if we need the rightmost turn.
-      // So GoStraight direction is given even for needed sharp left turn when other turns on the left and are more sharp.
-      // The reason: the rightmost turn is the most straight one here.
+      // So GoStraight direction is given even for needed sharp left turn when other turns on the left and are more
+      // sharp. The reason: the rightmost turn is the most straight one here.
       {-180., CarDirection::GoStraight}};
 
   return FindDirectionByAngle(kLowerBounds, angle);
@@ -94,12 +80,8 @@ CarDirection LeftmostDirection(double const angle)
 CarDirection IntermediateDirection(double const angle)
 {
   static std::vector<std::pair<double, CarDirection>> const kLowerBounds = {
-      {145., CarDirection::TurnSharpRight},
-      {50., CarDirection::TurnRight},
-      {10., CarDirection::TurnSlightRight},
-      {-10., CarDirection::GoStraight},
-      {-50., CarDirection::TurnSlightLeft},
-      {-145., CarDirection::TurnLeft},
+      {145., CarDirection::TurnSharpRight}, {50., CarDirection::TurnRight},       {10., CarDirection::TurnSlightRight},
+      {-10., CarDirection::GoStraight},     {-50., CarDirection::TurnSlightLeft}, {-145., CarDirection::TurnLeft},
       {-180., CarDirection::TurnSharpLeft}};
 
   return FindDirectionByAngle(kLowerBounds, angle);
@@ -120,15 +102,15 @@ double CalcEstimatedTimeToPass(double const distanceMeters, HighwayClass const h
   double speedKmph = 0;
   switch (highwayClass)
   {
-    case HighwayClass::Trunk:         speedKmph = 100.0; break;
-    case HighwayClass::Primary:       speedKmph = 70.0; break;
-    case HighwayClass::Secondary:     speedKmph = 70.0; break;
-    case HighwayClass::Tertiary:      speedKmph = 50.0; break;
-    case HighwayClass::LivingStreet:  speedKmph = 20.0; break;
-    case HighwayClass::Service:
-    case HighwayClass::ServiceMinor:  speedKmph = 10.0; break;
-    case HighwayClass::Pedestrian:    speedKmph = 5.0; break;
-    default:                          speedKmph = 50.0; break;
+  case HighwayClass::Trunk: speedKmph = 100.0; break;
+  case HighwayClass::Primary: speedKmph = 70.0; break;
+  case HighwayClass::Secondary: speedKmph = 70.0; break;
+  case HighwayClass::Tertiary: speedKmph = 50.0; break;
+  case HighwayClass::LivingStreet: speedKmph = 20.0; break;
+  case HighwayClass::Service:
+  case HighwayClass::ServiceMinor: speedKmph = 10.0; break;
+  case HighwayClass::Pedestrian: speedKmph = 5.0; break;
+  default: speedKmph = 50.0; break;
   }
   return distanceMeters / measurement_utils::KmphToMps(speedKmph);
 }
@@ -138,8 +120,7 @@ bool PathIsFakeLoop(std::vector<geometry::PointWithAltitude> const & path)
   return path.size() == 2 && path[0] == path[1];
 }
 
-double CalcRouteDistanceM(std::vector<geometry::PointWithAltitude> const & junctions, uint32_t start,
-                          uint32_t end)
+double CalcRouteDistanceM(std::vector<geometry::PointWithAltitude> const & junctions, uint32_t start, uint32_t end)
 {
   double res = 0.0;
 
@@ -169,8 +150,8 @@ bool RoutePointIndex::operator==(RoutePointIndex const & index) const
 std::string DebugPrint(RoutePointIndex const & index)
 {
   std::stringstream out;
-  out << "RoutePointIndex [ m_segmentIndex == " << index.m_segmentIndex
-      << ", m_pathIndex == " << index.m_pathIndex << " ]" << std::endl;
+  out << "RoutePointIndex [ m_segmentIndex == " << index.m_segmentIndex << ", m_pathIndex == " << index.m_pathIndex
+      << " ]" << std::endl;
   return out.str();
 }
 
@@ -179,13 +160,12 @@ RoutePointIndex GetFirstOutgoingPointIndex(size_t outgoingSegmentIndex)
   return RoutePointIndex({outgoingSegmentIndex, 0 /* m_pathIndex */});
 }
 
-RoutePointIndex GetLastIngoingPointIndex(TUnpackedPathSegments const & segments,
-                                         size_t const outgoingSegmentIndex)
+RoutePointIndex GetLastIngoingPointIndex(TUnpackedPathSegments const & segments, size_t const outgoingSegmentIndex)
 {
   ASSERT_GREATER(outgoingSegmentIndex, 0, ());
   ASSERT(segments[outgoingSegmentIndex - 1].IsValid(), ());
-  return RoutePointIndex({outgoingSegmentIndex - 1,
-                          segments[outgoingSegmentIndex - 1].m_path.size() - 1 /* m_pathIndex */});
+  return RoutePointIndex(
+      {outgoingSegmentIndex - 1, segments[outgoingSegmentIndex - 1].m_path.size() - 1 /* m_pathIndex */});
 }
 
 m2::PointD GetPointByIndex(TUnpackedPathSegments const & segments, RoutePointIndex const & index)
@@ -198,9 +178,10 @@ double CalcOneSegmentTurnAngle(TurnInfo const & turnInfo)
   ASSERT_GREATER_OR_EQUAL(turnInfo.m_ingoing->m_path.size(), 2, ());
   ASSERT_GREATER_OR_EQUAL(turnInfo.m_outgoing->m_path.size(), 2, ());
 
-  return math::RadToDeg(PiMinusTwoVectorsAngle(turnInfo.m_ingoing->m_path.back().GetPoint(),
-                                               turnInfo.m_ingoing->m_path[turnInfo.m_ingoing->m_path.size() - 2].GetPoint(),
-                                               turnInfo.m_outgoing->m_path[1].GetPoint()));
+  return math::RadToDeg(
+      PiMinusTwoVectorsAngle(turnInfo.m_ingoing->m_path.back().GetPoint(),
+                             turnInfo.m_ingoing->m_path[turnInfo.m_ingoing->m_path.size() - 2].GetPoint(),
+                             turnInfo.m_outgoing->m_path[1].GetPoint()));
 }
 
 double CalcPathTurnAngle(LoadedPathSegment const & segment, size_t const pathIndex)
diff --git a/libs/routing/turns_generator_utils.hpp b/libs/routing/turns_generator_utils.hpp
index 15a8bcb13..ad0c4c0de 100644
--- a/libs/routing/turns_generator_utils.hpp
+++ b/libs/routing/turns_generator_utils.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "indexer/ftypes_matcher.hpp"
 #include "geometry/point_with_altitude.hpp"
+#include "indexer/ftypes_matcher.hpp"
 #include "routing/loaded_path_segment.hpp"
 
 namespace routing
@@ -19,14 +19,12 @@ struct TurnInfo
   LoadedPathSegment const * m_ingoing;
   LoadedPathSegment const * m_outgoing;
 
-  TurnInfo() : m_ingoing(nullptr), m_outgoing(nullptr)
-  {
-  }
+  TurnInfo() : m_ingoing(nullptr), m_outgoing(nullptr) {}
 
   TurnInfo(LoadedPathSegment const * ingoingSegment, LoadedPathSegment const * outgoingSegment)
-      : m_ingoing(ingoingSegment), m_outgoing(outgoingSegment)
-  {
-  }
+    : m_ingoing(ingoingSegment)
+    , m_outgoing(outgoingSegment)
+  {}
 
   bool IsSegmentsValid() const;
 };
@@ -105,6 +103,5 @@ double CalcPathTurnAngle(LoadedPathSegment const & segment, size_t const pathInd
 
 m2::PointD GetPointByIndex(TUnpackedPathSegments const & segments, RoutePointIndex const & index);
 
-
 }  // namespace turns
 }  // namespace routing
diff --git a/libs/routing/turns_notification_manager.cpp b/libs/routing/turns_notification_manager.cpp
index d2a33d012..97a8e7234 100644
--- a/libs/routing/turns_notification_manager.cpp
+++ b/libs/routing/turns_notification_manager.cpp
@@ -47,20 +47,18 @@ NotificationManager::NotificationManager()
   , m_nextTurnIndex(0)
   , m_secondTurnNotification(CarDirection::None)
   , m_secondTurnNotificationIndex(0)
-{
-}
+{}
 
 // static
 NotificationManager NotificationManager::CreateNotificationManagerForTesting(
     uint32_t startBeforeSeconds, uint32_t minStartBeforeMeters, uint32_t maxStartBeforeMeters,
-    uint32_t minDistToSayNotificationMeters, measurement_utils::Units lengthUnits,
-    std::string const & engShortJson, uint32_t notificationTimeSecond, double speedMeterPerSecond)
+    uint32_t minDistToSayNotificationMeters, measurement_utils::Units lengthUnits, std::string const & engShortJson,
+    uint32_t notificationTimeSecond, double speedMeterPerSecond)
 {
   NotificationManager notificationManager;
-  notificationManager.m_settings = Settings(startBeforeSeconds, minStartBeforeMeters,
-                                            maxStartBeforeMeters, minDistToSayNotificationMeters,
-                                            startBeforeSeconds, minStartBeforeMeters,
-                                            maxStartBeforeMeters);
+  notificationManager.m_settings =
+      Settings(startBeforeSeconds, minStartBeforeMeters, maxStartBeforeMeters, minDistToSayNotificationMeters,
+               startBeforeSeconds, minStartBeforeMeters, maxStartBeforeMeters);
   notificationManager.Enable(true);
   notificationManager.SetLengthUnits(lengthUnits);
   notificationManager.m_getTtsText.ForTestingSetLocaleWithJson(engShortJson, "en");
@@ -80,11 +78,12 @@ std::string NotificationManager::GenerateTurnText(uint32_t distanceUnits, uint8_
   if (turn.m_turn != CarDirection::None && turn.m_turn != CarDirection::EnterRoundAbout)
     return m_getTtsText.GetTurnNotification(
         {distanceUnits, exitNum, useThenInsteadOfDistance, turn.m_turn, lengthUnits, nextStreetInfo});
-  else if (turn.m_turn == CarDirection::EnterRoundAbout) // Don't include roundabout street name in TTS
+  else if (turn.m_turn == CarDirection::EnterRoundAbout)  // Don't include roundabout street name in TTS
     return m_getTtsText.GetTurnNotification(
         {distanceUnits, exitNum, useThenInsteadOfDistance, turn.m_turn, lengthUnits});
 
-  return m_getTtsText.GetTurnNotification({distanceUnits, exitNum, useThenInsteadOfDistance, turn.m_pedestrianTurn, lengthUnits, nextStreetInfo});
+  return m_getTtsText.GetTurnNotification(
+      {distanceUnits, exitNum, useThenInsteadOfDistance, turn.m_pedestrianTurn, lengthUnits, nextStreetInfo});
 }
 
 std::string NotificationManager::GenerateRecalculatingText() const
@@ -130,11 +129,8 @@ void NotificationManager::GenerateTurnNotifications(std::vector<TurnItemDist> co
 
   double distBetweenTurnsMeters = secondTurn.m_distMeters - firstTurn.m_distMeters;
   ASSERT_GREATER_OR_EQUAL(distBetweenTurnsMeters, 0, ());
-  if (distBetweenTurnsMeters > kSecondTurnThresholdDistM &&
-      !IsClassicEntranceToRoundabout(firstTurn, secondTurn))
-  {
+  if (distBetweenTurnsMeters > kSecondTurnThresholdDistM && !IsClassicEntranceToRoundabout(firstTurn, secondTurn))
     return;
-  }
 
   if ((distBetweenTurnsMeters < kDistanceNotifyThresholdM) || IsClassicEntranceToRoundabout(firstTurn, secondTurn))
   {
@@ -174,8 +170,7 @@ std::string NotificationManager::GenerateFirstTurnSound(TurnItem const & turn, d
     if (!m_settings.TooCloseForFisrtNotification(distanceToTurnMeters))
     {
       uint32_t const startPronounceDistMeters =
-          m_settings.ComputeTurnDistanceM(m_speedMetersPerSecond) +
-          distanceToPronounceNotificationM;
+          m_settings.ComputeTurnDistanceM(m_speedMetersPerSecond) + distanceToPronounceNotificationM;
       if (distanceToTurnMeters < startPronounceDistMeters)
       {
         if (m_turnNotificationWithThen)
@@ -192,13 +187,14 @@ std::string NotificationManager::GenerateFirstTurnSound(TurnItem const & turn, d
           }
 
           // Pronouncing first turn sound notification.
-          double const distToPronounceUnits =
-              m_settings.ConvertMetersToUnits(distToPronounceMeters);
+          double const distToPronounceUnits = m_settings.ConvertMetersToUnits(distToPronounceMeters);
           uint32_t const roundedDistToPronounceUnits =
               m_settings.RoundByPresetSoundedDistancesUnits(distToPronounceUnits);
           m_nextTurnNotificationProgress = PronouncedNotification::First;
 
-          LOG(LINFO, ("TTS meters to pronounce", distanceToPronounceNotificationM, "meters to turn", distanceToTurnMeters, "meters to start pronounce", startPronounceDistMeters, "speed m/s", m_speedMetersPerSecond));
+          LOG(LINFO,
+              ("TTS meters to pronounce", distanceToPronounceNotificationM, "meters to turn", distanceToTurnMeters,
+               "meters to start pronounce", startPronounceDistMeters, "speed m/s", m_speedMetersPerSecond));
           return GenerateTurnText(roundedDistToPronounceUnits, turn.m_exitNum, false /* useThenInsteadOfDistance */,
                                   turn, nextStreetInfo);
         }
@@ -220,7 +216,8 @@ std::string NotificationManager::GenerateFirstTurnSound(TurnItem const & turn, d
     m_nextTurnNotificationProgress = PronouncedNotification::Second;
     FastForwardFirstTurnNotification();
 
-    LOG(LINFO,("TTS meters to pronounce", distanceToPronounceNotificationM, "meters to turn", distanceToTurnMeters, "speed m/s", m_speedMetersPerSecond));
+    LOG(LINFO, ("TTS meters to pronounce", distanceToPronounceNotificationM, "meters to turn", distanceToTurnMeters,
+                "speed m/s", m_speedMetersPerSecond));
     return GenerateTurnText(0 /* distMeters */, turn.m_exitNum, false /* useThenInsteadOfDistance */, turn,
                             nextStreetInfo);
   }
@@ -241,14 +238,12 @@ void NotificationManager::SetLengthUnits(measurement_utils::Units units)
   {
   case measurement_utils::Units::Metric:
     m_settings.SetState(30 /* notificationTimeSeconds */, 200 /* minNotificationDistanceUnits */,
-                        2000 /* maxNotificationDistanceUnits */,
-                        GetSoundedDistMeters() /* soundedDistancesUnits */,
+                        2000 /* maxNotificationDistanceUnits */, GetSoundedDistMeters() /* soundedDistancesUnits */,
                         measurement_utils::Units::Metric /* lengthUnits */);
     return;
   case measurement_utils::Units::Imperial:
     m_settings.SetState(30 /* notificationTimeSeconds */, 500 /* minNotificationDistanceUnits */,
-                        5000 /* maxNotificationDistanceUnits */,
-                        GetSoundedDistFeet() /* soundedDistancesUnits */,
+                        5000 /* maxNotificationDistanceUnits */, GetSoundedDistFeet() /* soundedDistancesUnits */,
                         measurement_utils::Units::Imperial /* lengthUnits */);
     return;
   }
@@ -300,9 +295,8 @@ CarDirection NotificationManager::GenerateSecondTurnNotification(std::vector<Tur
   if (distBetweenTurnsMeters > kSecondTurnThresholdDistM)
     return CarDirection::None;
 
-  uint32_t const startPronounceDistMeters =
-      m_settings.ComputeTurnDistanceM(m_speedMetersPerSecond) +
-      m_settings.ComputeDistToPronounceDistM(m_speedMetersPerSecond);
+  uint32_t const startPronounceDistMeters = m_settings.ComputeTurnDistanceM(m_speedMetersPerSecond) +
+                                            m_settings.ComputeDistToPronounceDistM(m_speedMetersPerSecond);
 
   if (firstTurn.m_distMeters <= startPronounceDistMeters)
   {
@@ -322,12 +316,9 @@ std::string DebugPrint(PronouncedNotification notificationProgress)
 {
   switch (notificationProgress)
   {
-  case PronouncedNotification::Nothing:
-    return "Nothing";
-  case PronouncedNotification::First:
-    return "First";
-  case PronouncedNotification::Second:
-    return "Second";
+  case PronouncedNotification::Nothing: return "Nothing";
+  case PronouncedNotification::First: return "First";
+  case PronouncedNotification::Second: return "Second";
   }
 
   ASSERT(false, ());
diff --git a/libs/routing/turns_notification_manager.hpp b/libs/routing/turns_notification_manager.hpp
index 437aacb3b..f7831fbe4 100644
--- a/libs/routing/turns_notification_manager.hpp
+++ b/libs/routing/turns_notification_manager.hpp
@@ -37,8 +37,8 @@ public:
 
   static NotificationManager CreateNotificationManagerForTesting(
       uint32_t startBeforeSeconds, uint32_t minStartBeforeMeters, uint32_t maxStartBeforeMeters,
-      uint32_t minDistToSayNotificationMeters, measurement_utils::Units lengthUnits,
-      std::string const & engShortJson, uint32_t notificationTimeSecond, double speedMeterPerSecond);
+      uint32_t minDistToSayNotificationMeters, measurement_utils::Units lengthUnits, std::string const & engShortJson,
+      uint32_t notificationTimeSecond, double speedMeterPerSecond);
 
   bool IsEnabled() const { return m_enabled; }
   void Enable(bool enable);
@@ -75,8 +75,7 @@ public:
   /// \param distanceToTurnMeters is distance to the next turn in meters.
   /// \param turnNotifications is a parameter to fill it if it's necessary.
   /// \note The client implies turnNotifications does not contain empty strings.
-  void GenerateTurnNotifications(std::vector<TurnItemDist> const & turns,
-                                 std::vector<std::string> & turnNotifications);
+  void GenerateTurnNotifications(std::vector<TurnItemDist> const & turns, std::vector<std::string> & turnNotifications);
 
   /// Reset states which reflects current route position.
   /// The method shall be called after creating a new route or after rerouting.
diff --git a/libs/routing/turns_sound_settings.cpp b/libs/routing/turns_sound_settings.cpp
index ab2a8bff4..28046b7b3 100644
--- a/libs/routing/turns_sound_settings.cpp
+++ b/libs/routing/turns_sound_settings.cpp
@@ -14,8 +14,7 @@ using namespace std;
 using namespace measurement_utils;
 
 void Settings::SetState(uint32_t notificationTimeSeconds, uint32_t minNotificationDistanceUnits,
-                        uint32_t maxNotificationDistanceUnits,
-                        vector<uint32_t> const & soundedDistancesUnits,
+                        uint32_t maxNotificationDistanceUnits, vector<uint32_t> const & soundedDistancesUnits,
                         measurement_utils::Units lengthUnits)
 {
   m_timeSeconds = notificationTimeSeconds;
@@ -36,8 +35,7 @@ uint32_t Settings::ComputeTurnDistanceM(double speedMetersPerSecond) const
   ASSERT(IsValid(), ());
 
   double const turnNotificationDistanceM = m_timeSeconds * speedMetersPerSecond;
-  return static_cast<uint32_t>(math::Clamp(turnNotificationDistanceM,
-                                           ConvertUnitsToMeters(m_minDistanceUnits),
+  return static_cast<uint32_t>(math::Clamp(turnNotificationDistanceM, ConvertUnitsToMeters(m_minDistanceUnits),
                                            ConvertUnitsToMeters(m_maxDistanceUnits)));
 }
 
@@ -50,8 +48,8 @@ uint32_t Settings::RoundByPresetSoundedDistancesUnits(uint32_t turnNotificationU
 {
   ASSERT(IsValid(), ());
 
-  auto it = upper_bound(m_soundedDistancesUnits.cbegin(), m_soundedDistancesUnits.cend(),
-                        turnNotificationUnits, less_equal<uint32_t>());
+  auto it = upper_bound(m_soundedDistancesUnits.cbegin(), m_soundedDistancesUnits.cend(), turnNotificationUnits,
+                        less_equal<uint32_t>());
   // Rounding up the result.
   if (it != m_soundedDistancesUnits.cend())
     return *it;
@@ -104,8 +102,7 @@ uint32_t Settings::ComputeDistToPronounceDistM(double speedMetersPerSecond, bool
   auto const minStartBeforeMeters = pedestrian ? m_minStartBeforeMetersPedestrian : m_minStartBeforeMetersVehicle;
   auto const maxStartBeforeMeters = pedestrian ? m_maxStartBeforeMetersPedestrian : m_maxStartBeforeMetersVehicle;
 
-  uint32_t const startBeforeMeters =
-      static_cast<uint32_t>(speedMetersPerSecond * startBeforeSeconds);
+  uint32_t const startBeforeMeters = static_cast<uint32_t>(speedMetersPerSecond * startBeforeSeconds);
 
   return math::Clamp(startBeforeMeters, minStartBeforeMeters, maxStartBeforeMeters);
 }
@@ -125,51 +122,25 @@ string DebugPrint(Notification const & notification)
 VecPairDist const & GetAllSoundedDistMeters()
 {
   // The vector below has to be sorted. It is checked in unit test GetAllSoundedDistMetersTest
-  static VecPairDist const inst = {{50, "in_50_meters"},
-                                   {100, "in_100_meters"},
-                                   {200, "in_200_meters"},
-                                   {250, "in_250_meters"},
-                                   {300, "in_300_meters"},
-                                   {400, "in_400_meters"},
-                                   {500, "in_500_meters"},
-                                   {600, "in_600_meters"},
-                                   {700, "in_700_meters"},
-                                   {750, "in_750_meters"},    // Hm :)
-                                   {800, "in_800_meters"},
-                                   {900, "in_900_meters"},
-                                   {1000, "in_1_kilometer"},
-                                   {1500, "in_1_5_kilometers"},
-                                   {2000, "in_2_kilometers"},
-                                   {2500, "in_2_5_kilometers"},
-                                   {3000, "in_3_kilometers"}};
+  static VecPairDist const inst = {
+      {50, "in_50_meters"},      {100, "in_100_meters"},      {200, "in_200_meters"},   {250, "in_250_meters"},
+      {300, "in_300_meters"},    {400, "in_400_meters"},      {500, "in_500_meters"},   {600, "in_600_meters"},
+      {700, "in_700_meters"},    {750, "in_750_meters"},  // Hm :)
+      {800, "in_800_meters"},    {900, "in_900_meters"},      {1000, "in_1_kilometer"}, {1500, "in_1_5_kilometers"},
+      {2000, "in_2_kilometers"}, {2500, "in_2_5_kilometers"}, {3000, "in_3_kilometers"}};
   return inst;
 }
 
 VecPairDist const & GetAllSoundedDistFeet()
 {
   // The vector below has to be sorted. It is checked in unit test GetAllSoundedDistFeet
-  static VecPairDist const inst = {{50, "in_50_feet"},
-                                   {100, "in_100_feet"},
-                                   {200, "in_200_feet"},
-                                   {300, "in_300_feet"},
-                                   {400, "in_400_feet"},
-                                   {500, "in_500_feet"},
-                                   {600, "in_600_feet"},
-                                   {700, "in_700_feet"},
-                                   {800, "in_800_feet"},
-                                   {900, "in_900_feet"},
-                                   {1000, "in_1000_feet"},
-                                   {1500, "in_1500_feet"},
-                                   {2000, "in_2000_feet"},
-                                   {2500, "in_2500_feet"},
-                                   {3000, "in_3000_feet"},
-                                   {3500, "in_3500_feet"},
-                                   {4000, "in_4000_feet"},
-                                   {4500, "in_4500_feet"},
-                                   {5000, "in_5000_feet"},
-                                   {5280, "in_1_mile"},
-                                   {7920, "in_1_5_miles"},
-                                   {10560, "in_2_miles"}};
+  static VecPairDist const inst = {
+      {50, "in_50_feet"},     {100, "in_100_feet"},   {200, "in_200_feet"},   {300, "in_300_feet"},
+      {400, "in_400_feet"},   {500, "in_500_feet"},   {600, "in_600_feet"},   {700, "in_700_feet"},
+      {800, "in_800_feet"},   {900, "in_900_feet"},   {1000, "in_1000_feet"}, {1500, "in_1500_feet"},
+      {2000, "in_2000_feet"}, {2500, "in_2500_feet"}, {3000, "in_3000_feet"}, {3500, "in_3500_feet"},
+      {4000, "in_4000_feet"}, {4500, "in_4500_feet"}, {5000, "in_5000_feet"}, {5280, "in_1_mile"},
+      {7920, "in_1_5_miles"}, {10560, "in_2_miles"}};
   return inst;
 }
 
@@ -187,8 +158,7 @@ vector<uint32_t> const & GetSoundedDistFeet()
   // The vector has to be sorted. Besides that any of its elements has to be contained in
   // the vector which GetAllSoundedDistFeet() returns.
   // It is checked in the unit test GetSoundedDistFeet.
-  static vector<uint32_t> const inst = {500,  600,  700,  800,  900, 1000,
-                                        1500, 2000, 3000, 4000, 5000};
+  static vector<uint32_t> const inst = {500, 600, 700, 800, 900, 1000, 1500, 2000, 3000, 4000, 5000};
   return inst;
 }
 }  // namespace sound
diff --git a/libs/routing/turns_sound_settings.hpp b/libs/routing/turns_sound_settings.hpp
index 667b1a574..b08d7ec53 100644
--- a/libs/routing/turns_sound_settings.hpp
+++ b/libs/routing/turns_sound_settings.hpp
@@ -60,11 +60,9 @@ public:
   // This constructor is for testing only.
   // TODO: Do not compile it for production. Either use a static method or derive it in tests.
   Settings(uint32_t notificationTimeSeconds, uint32_t minNotificationDistanceUnits,
-           uint32_t maxNotificationDistanceUnits, uint32_t startBeforeSeconds,
-           uint32_t minStartBeforeMeters, uint32_t maxStartBeforeMeters,
-           uint32_t minDistToSayNotificationMeters,
-           std::vector<uint32_t> const & soundedDistancesUnits,
-           measurement_utils::Units lengthUnits)
+           uint32_t maxNotificationDistanceUnits, uint32_t startBeforeSeconds, uint32_t minStartBeforeMeters,
+           uint32_t maxStartBeforeMeters, uint32_t minDistToSayNotificationMeters,
+           std::vector<uint32_t> const & soundedDistancesUnits, measurement_utils::Units lengthUnits)
     : m_timeSeconds(notificationTimeSeconds)
     , m_minDistanceUnits(minNotificationDistanceUnits)
     , m_maxDistanceUnits(maxNotificationDistanceUnits)
@@ -93,12 +91,10 @@ public:
     , m_maxStartBeforeMetersPedestrian(maxStartBeforeMetersPedestrian)
     , m_minDistToSayNotificationMeters(minDistToSayNotificationMeters)
     , m_lengthUnits(measurement_utils::Units::Metric)
-  {
-  }
+  {}
 
   void SetState(uint32_t notificationTimeSeconds, uint32_t minNotificationDistanceUnits,
-                uint32_t maxNotificationDistanceUnits,
-                std::vector<uint32_t> const & soundedDistancesUnits,
+                uint32_t maxNotificationDistanceUnits, std::vector<uint32_t> const & soundedDistancesUnits,
                 measurement_utils::Units lengthUnits);
 
   /// \brief IsValid checks if Settings data is consistent.
@@ -160,8 +156,7 @@ struct Notification
     , m_turnDir(turnDir)
     , m_lengthUnits(lengthUnits)
     , m_nextStreetInfo(nextStreetInfo)
-  {
-  }
+  {}
 
   Notification(uint32_t distanceUnits, uint8_t exitNum, bool useThenInsteadOfDistance, CarDirection turnDir,
                measurement_utils::Units lengthUnits)
@@ -170,20 +165,18 @@ struct Notification
     , m_useThenInsteadOfDistance(useThenInsteadOfDistance)
     , m_turnDir(turnDir)
     , m_lengthUnits(lengthUnits)
-  {
-  }
+  {}
 
   Notification(uint32_t distanceUnits, uint8_t exitNum, bool useThenInsteadOfDistance,
-               PedestrianDirection turnDirPedestrian, measurement_utils::Units lengthUnits
-    , RouteSegment::RoadNameInfo const & nextStreetInfo)
+               PedestrianDirection turnDirPedestrian, measurement_utils::Units lengthUnits,
+               RouteSegment::RoadNameInfo const & nextStreetInfo)
     : m_distanceUnits(distanceUnits)
     , m_exitNum(exitNum)
     , m_useThenInsteadOfDistance(useThenInsteadOfDistance)
     , m_turnDirPedestrian(turnDirPedestrian)
     , m_lengthUnits(lengthUnits)
     , m_nextStreetInfo(nextStreetInfo)
-  {
-  }
+  {}
 
   Notification(uint32_t distanceUnits, uint8_t exitNum, bool useThenInsteadOfDistance,
                PedestrianDirection turnDirPedestrian, measurement_utils::Units lengthUnits)
@@ -192,8 +185,7 @@ struct Notification
     , m_useThenInsteadOfDistance(useThenInsteadOfDistance)
     , m_turnDirPedestrian(turnDirPedestrian)
     , m_lengthUnits(lengthUnits)
-  {
-  }
+  {}
 
   bool operator==(Notification const & rhv) const
   {
@@ -203,10 +195,7 @@ struct Notification
            m_nextStreetInfo == rhv.m_nextStreetInfo;
   }
 
-  bool IsPedestrianNotification() const
-  {
-    return m_turnDirPedestrian != PedestrianDirection::None;
-  }
+  bool IsPedestrianNotification() const { return m_turnDirPedestrian != PedestrianDirection::None; }
 };
 
 std::string DebugPrint(Notification const & turnGeom);
diff --git a/libs/routing/turns_tts_text.cpp b/libs/routing/turns_tts_text.cpp
index 27b213ac6..04f05509b 100644
--- a/libs/routing/turns_tts_text.cpp
+++ b/libs/routing/turns_tts_text.cpp
@@ -16,7 +16,8 @@ namespace routing::turns::sound
 namespace
 {
 
-template <class TIter> std::string DistToTextId(TIter begin, TIter end, uint32_t dist)
+template <class TIter>
+std::string DistToTextId(TIter begin, TIter end, uint32_t dist)
 {
   TIter const it = std::lower_bound(begin, end, dist, [](auto const & p1, uint32_t p2) { return p1.first < p2; });
   if (it == end)
@@ -98,8 +99,8 @@ void FormatFullRoadName(RouteSegment::RoadNameInfo & road, std::string & name)
 
 std::string GetTtsText::GetTurnNotification(Notification const & notification) const
 {
-  const std::string localeKey = GetLocale();
-  const std::string dirKey = GetDirectionTextId(notification);
+  std::string const localeKey = GetLocale();
+  std::string const dirKey = GetDirectionTextId(notification);
   std::string dirStr = GetTextByIdTrimmed(dirKey);
 
   if (notification.m_distanceUnits == 0 && !notification.m_useThenInsteadOfDistance &&
@@ -108,8 +109,7 @@ std::string GetTtsText::GetTurnNotification(Notification const & notification) c
 
   if (notification.IsPedestrianNotification())
   {
-    if (notification.m_useThenInsteadOfDistance &&
-        notification.m_turnDirPedestrian == PedestrianDirection::None)
+    if (notification.m_useThenInsteadOfDistance && notification.m_turnDirPedestrian == PedestrianDirection::None)
       return {};
   }
 
@@ -198,8 +198,9 @@ std::string GetTtsText::GetTurnNotification(Notification const & notification) c
         strings::ReplaceLast(distDirOntoStreetStr, "-re", "");  // clear it
 
       // if the first pronounceable character of the street is a vowel, use "az" instead of "a"
-      // 1, 5, and 1000 start with vowels but not 10 or 100 (numbers are combined as in English: 5*, 5**, 1*, 1**, 1***, etc)
-      static const std::regex rHun("^[5aeiouyáéíóúöüőű]|^1$|^1[^\\d]|^1\\d\\d\\d[^\\d]", std::regex_constants::icase);
+      // 1, 5, and 1000 start with vowels but not 10 or 100 (numbers are combined as in English: 5*, 5**, 1*, 1**, 1***,
+      // etc)
+      static std::regex const rHun("^[5aeiouyáéíóúöüőű]|^1$|^1[^\\d]|^1\\d\\d\\d[^\\d]", std::regex_constants::icase);
       std::smatch ma;
       if (std::regex_search(streetOut, ma, rHun) && ma.size() > 0)
       {
@@ -220,10 +221,10 @@ std::string GetTtsText::GetTurnNotification(Notification const & notification) c
     );
 
     // remove floating punctuation
-    static const std::regex rP(" [,\\.:;]+ ");
+    static std::regex const rP(" [,\\.:;]+ ");
     std::string cleanOut = std::regex_replace(ttsOut, rP, " ");
     // remove repetitious spaces or colons
-    static const std::regex rS("[ :]{2,99}");
+    static std::regex const rS("[ :]{2,99}");
     cleanOut = std::regex_replace(cleanOut, rS, " ");
     // trim leading spaces
     strings::Trim(cleanOut);
@@ -291,8 +292,8 @@ std::string GetTtsText::GetTextById(std::string const & textId) const
 
 std::string GetDistanceTextId(Notification const & notification)
 {
-//  if (notification.m_useThenInsteadOfDistance)
-//    return "then";
+  //  if (notification.m_useThenInsteadOfDistance)
+  //    return "then";
 
   switch (notification.m_lengthUnits)
   {
@@ -300,8 +301,7 @@ std::string GetDistanceTextId(Notification const & notification)
     return DistToTextId(GetAllSoundedDistMeters().cbegin(), GetAllSoundedDistMeters().cend(),
                         notification.m_distanceUnits);
   case measurement_utils::Units::Imperial:
-    return DistToTextId(GetAllSoundedDistFeet().cbegin(), GetAllSoundedDistFeet().cend(),
-                        notification.m_distanceUnits);
+    return DistToTextId(GetAllSoundedDistFeet().cbegin(), GetAllSoundedDistFeet().cend(), notification.m_distanceUnits);
   }
   ASSERT(false, ());
   return {};
@@ -315,7 +315,7 @@ std::string GetRoundaboutTextId(Notification const & notification)
     return {};
   }
   if (!notification.m_useThenInsteadOfDistance)
-    return "leave_the_roundabout"; // Notification just before leaving a roundabout.
+    return "leave_the_roundabout";  // Notification just before leaving a roundabout.
 
   static constexpr uint8_t kMaxSoundedExit = 11;
   if (notification.m_exitNum == 0 || notification.m_exitNum > kMaxSoundedExit)
@@ -326,8 +326,7 @@ std::string GetRoundaboutTextId(Notification const & notification)
 
 std::string GetYouArriveTextId(Notification const & notification)
 {
-  if (!notification.IsPedestrianNotification() &&
-      notification.m_turnDir != CarDirection::ReachedYourDestination)
+  if (!notification.IsPedestrianNotification() && notification.m_turnDir != CarDirection::ReachedYourDestination)
   {
     ASSERT(false, ());
     return {};
@@ -362,38 +361,24 @@ std::string GetDirectionTextId(Notification const & notification)
 
   switch (notification.m_turnDir)
   {
-    case CarDirection::GoStraight:
-      return "go_straight";
-    case CarDirection::TurnRight:
-      return "make_a_right_turn";
-    case CarDirection::TurnSharpRight:
-      return "make_a_sharp_right_turn";
-    case CarDirection::TurnSlightRight:
-      return "make_a_slight_right_turn";
-    case CarDirection::TurnLeft:
-      return "make_a_left_turn";
-    case CarDirection::TurnSharpLeft:
-      return "make_a_sharp_left_turn";
-    case CarDirection::TurnSlightLeft:
-      return "make_a_slight_left_turn";
-    case CarDirection::UTurnLeft:
-    case CarDirection::UTurnRight:
-      return "make_a_u_turn";
-    case CarDirection::EnterRoundAbout:
-      return "enter_the_roundabout";
-    case CarDirection::LeaveRoundAbout:
-      return GetRoundaboutTextId(notification);
-    case CarDirection::ReachedYourDestination:
-      return GetYouArriveTextId(notification);
-    case CarDirection::ExitHighwayToLeft:
-    case CarDirection::ExitHighwayToRight:
-      return "exit";
-    case CarDirection::StayOnRoundAbout:
-    case CarDirection::StartAtEndOfStreet:
-    case CarDirection::None:
-    case CarDirection::Count:
-      ASSERT(false, ());
-      return {};
+  case CarDirection::GoStraight: return "go_straight";
+  case CarDirection::TurnRight: return "make_a_right_turn";
+  case CarDirection::TurnSharpRight: return "make_a_sharp_right_turn";
+  case CarDirection::TurnSlightRight: return "make_a_slight_right_turn";
+  case CarDirection::TurnLeft: return "make_a_left_turn";
+  case CarDirection::TurnSharpLeft: return "make_a_sharp_left_turn";
+  case CarDirection::TurnSlightLeft: return "make_a_slight_left_turn";
+  case CarDirection::UTurnLeft:
+  case CarDirection::UTurnRight: return "make_a_u_turn";
+  case CarDirection::EnterRoundAbout: return "enter_the_roundabout";
+  case CarDirection::LeaveRoundAbout: return GetRoundaboutTextId(notification);
+  case CarDirection::ReachedYourDestination: return GetYouArriveTextId(notification);
+  case CarDirection::ExitHighwayToLeft:
+  case CarDirection::ExitHighwayToRight: return "exit";
+  case CarDirection::StayOnRoundAbout:
+  case CarDirection::StartAtEndOfStreet:
+  case CarDirection::None:
+  case CarDirection::Count: ASSERT(false, ()); return {};
   }
   ASSERT(false, ());
   return {};
diff --git a/libs/routing/turns_tts_text.hpp b/libs/routing/turns_tts_text.hpp
index 2b9ba97bc..ab9e2fe7c 100644
--- a/libs/routing/turns_tts_text.hpp
+++ b/libs/routing/turns_tts_text.hpp
@@ -22,7 +22,6 @@ struct Notification;
 class GetTtsText
 {
 public:
-
   std::string GetTurnNotification(Notification const & notification) const;
 
   std::string GetRecalculatingNotification() const;
diff --git a/libs/routing/turns_tts_text_i18n.cpp b/libs/routing/turns_tts_text_i18n.cpp
index e1157c37c..cf4966e16 100644
--- a/libs/routing/turns_tts_text_i18n.cpp
+++ b/libs/routing/turns_tts_text_i18n.cpp
@@ -15,8 +15,7 @@ void HungarianBaseWordTransform(std::string & hungarianString)
 
   strings::UniString myUniStr = strings::MakeUniString(hungarianString);
 
-  std::pair<char32_t, char32_t> constexpr kToReplace[] = {
-      {U'e', U'é'}, {U'a', U'á'}, {U'ö', U'ő'}, {U'ü', U'ű'}};
+  std::pair<char32_t, char32_t> constexpr kToReplace[] = {{U'e', U'é'}, {U'a', U'á'}, {U'ö', U'ő'}, {U'ü', U'ű'}};
   auto & lastChar = myUniStr.back();
   for (auto [base, harmonized] : kToReplace)
   {
diff --git a/libs/routing/vehicle_mask.cpp b/libs/routing/vehicle_mask.cpp
index dfadb30fe..11c4395ec 100644
--- a/libs/routing/vehicle_mask.cpp
+++ b/libs/routing/vehicle_mask.cpp
@@ -20,7 +20,10 @@ std::string DebugPrint(VehicleType vehicleType)
   UNREACHABLE();
 }
 
-std::string ToString(VehicleType vehicleType) { return DebugPrint(vehicleType); }
+std::string ToString(VehicleType vehicleType)
+{
+  return DebugPrint(vehicleType);
+}
 
 void FromString(std::string_view s, VehicleType & vehicleType)
 {
diff --git a/libs/routing/world_graph.cpp b/libs/routing/world_graph.cpp
index bfa741b51..6c9d37f11 100644
--- a/libs/routing/world_graph.cpp
+++ b/libs/routing/world_graph.cpp
@@ -1,17 +1,13 @@
 #include "routing/world_graph.hpp"
 
-
 namespace routing
 {
-void WorldGraph::GetEdgeList(Segment const & vertex, bool isOutgoing, bool useRoutingOptions,
-                             SegmentEdgeListT & edges)
+void WorldGraph::GetEdgeList(Segment const & vertex, bool isOutgoing, bool useRoutingOptions, SegmentEdgeListT & edges)
 {
-  GetEdgeList({vertex, RouteWeight(0.0)}, isOutgoing, useRoutingOptions,
-              false /* useAccessConditional */, edges);
+  GetEdgeList({vertex, RouteWeight(0.0)}, isOutgoing, useRoutingOptions, false /* useAccessConditional */, edges);
 }
 
-void WorldGraph::GetTwins(Segment const & segment, bool isOutgoing, bool useRoutingOptions,
-                          SegmentEdgeListT & edges)
+void WorldGraph::GetTwins(Segment const & segment, bool isOutgoing, bool useRoutingOptions, SegmentEdgeListT & edges)
 {
   std::vector<Segment> twins;
   GetTwinsInner(segment, isOutgoing, twins);
@@ -71,9 +67,7 @@ bool WorldGraph::AreWavesConnectible(Parents<JointSegment> & forwardParents, Joi
 
 void WorldGraph::SetRoutingOptions(RoutingOptions /* routingOption */) {}
 
-void WorldGraph::ForEachTransition(NumMwmId numMwmId, bool isEnter, TransitionFnT const & fn)
-{
-}
+void WorldGraph::ForEachTransition(NumMwmId numMwmId, bool isEnter, TransitionFnT const & fn) {}
 
 CrossMwmGraph & WorldGraph::GetCrossMwmGraph()
 {
diff --git a/libs/routing/world_graph.hpp b/libs/routing/world_graph.hpp
index 98604e66d..158ab29e0 100644
--- a/libs/routing/world_graph.hpp
+++ b/libs/routing/world_graph.hpp
@@ -33,7 +33,7 @@ enum class WorldGraphMode
   Joints,          // Mode for building route with jumps between Joints.
   JointSingleMwm,  // Like |SingleMwm|, but in |Joints| mode.
 
-  Undefined        // Default mode, until initialization.
+  Undefined  // Default mode, until initialization.
 };
 
 class WorldGraph
@@ -48,20 +48,17 @@ public:
 
   virtual ~WorldGraph() = default;
 
-  virtual void GetEdgeList(astar::VertexData<Segment, RouteWeight> const & vertexData,
-                           bool isOutgoing, bool useRoutingOptions, bool useAccessConditional,
-                           SegmentEdgeListT & edges) = 0;
-  virtual void GetEdgeList(astar::VertexData<JointSegment, RouteWeight> const & vertexData,
-                           Segment const & segment, bool isOutgoing, bool useAccessConditional,
-                           JointEdgeListT & edges,
+  virtual void GetEdgeList(astar::VertexData<Segment, RouteWeight> const & vertexData, bool isOutgoing,
+                           bool useRoutingOptions, bool useAccessConditional, SegmentEdgeListT & edges) = 0;
+  virtual void GetEdgeList(astar::VertexData<JointSegment, RouteWeight> const & vertexData, Segment const & segment,
+                           bool isOutgoing, bool useAccessConditional, JointEdgeListT & edges,
                            WeightListT & parentWeights) = 0;
 
   bool IsRegionsGraphMode() const { return m_isRegionsGraphMode; }
 
   void SetRegionsGraphMode(bool isRegionsGraphMode) { m_isRegionsGraphMode = isRegionsGraphMode; }
 
-  void GetEdgeList(Segment const & vertex, bool isOutgoing, bool useRoutingOptions,
-                   SegmentEdgeListT & edges);
+  void GetEdgeList(Segment const & vertex, bool isOutgoing, bool useRoutingOptions, SegmentEdgeListT & edges);
 
   // Checks whether path length meets restrictions. Restrictions may depend on the distance from
   // start to finish of the route.
@@ -81,8 +78,7 @@ public:
 
   virtual RouteWeight HeuristicCostEstimate(ms::LatLon const & from, ms::LatLon const & to) = 0;
 
-  virtual RouteWeight CalcSegmentWeight(Segment const & segment,
-                                        EdgeEstimator::Purpose purpose) = 0;
+  virtual RouteWeight CalcSegmentWeight(Segment const & segment, EdgeEstimator::Purpose purpose) = 0;
 
   virtual RouteWeight CalcLeapWeight(ms::LatLon const & from, ms::LatLon const & to, NumMwmId mwmId) const = 0;
 
@@ -106,7 +102,7 @@ public:
   virtual bool AreWavesConnectible(Parents<Segment> & forwardParents, Segment const & commonVertex,
                                    Parents<Segment> & backwardParents);
 
-  using FakeConverterT = std::function<void (JointSegment &)>;
+  using FakeConverterT = std::function<void(JointSegment &)>;
   virtual bool AreWavesConnectible(Parents<JointSegment> & forwardParents, JointSegment const & commonVertex,
                                    Parents<JointSegment> & backwardParents,
                                    FakeConverterT const & fakeFeatureConverter);
@@ -119,14 +115,12 @@ public:
 
   virtual IndexGraph & GetIndexGraph(NumMwmId numMwmId) = 0;
   virtual CrossMwmGraph & GetCrossMwmGraph();
-  virtual void GetTwinsInner(Segment const & segment, bool isOutgoing,
-                             std::vector<Segment> & twins) = 0;
+  virtual void GetTwinsInner(Segment const & segment, bool isOutgoing, std::vector<Segment> & twins) = 0;
 
   virtual RouteWeight GetCrossBorderPenalty(NumMwmId mwmId1, NumMwmId mwmId2);
 
 protected:
-  void GetTwins(Segment const & segment, bool isOutgoing, bool useRoutingOptions,
-                SegmentEdgeListT & edges);
+  void GetTwins(Segment const & segment, bool isOutgoing, bool useRoutingOptions, SegmentEdgeListT & edges);
 
   bool m_isRegionsGraphMode = false;
 };
diff --git a/libs/routing_common/bicycle_model.cpp b/libs/routing_common/bicycle_model.cpp
index 155b1bd2d..063026be9 100644
--- a/libs/routing_common/bicycle_model.cpp
+++ b/libs/routing_common/bicycle_model.cpp
@@ -90,8 +90,7 @@ VehicleModel::LimitsInitList const kDefaultOptions = {
     {HighwayType::HighwayPedestrian, true},
     {HighwayType::HighwayFootway, true},
     {HighwayType::ManMadePier, true},
-    {HighwayType::RouteFerry, true}
-};
+    {HighwayType::RouteFerry, true}};
 
 // Same as defaults except trunk and trunk_link are not allowed
 VehicleModel::LimitsInitList NoTrunk()
@@ -99,10 +98,8 @@ VehicleModel::LimitsInitList NoTrunk()
   VehicleModel::LimitsInitList res;
   res.reserve(kDefaultOptions.size() - 2);
   for (auto const & e : kDefaultOptions)
-  {
     if (e.m_type != HighwayType::HighwayTrunk && e.m_type != HighwayType::HighwayTrunkLink)
       res.push_back(e);
-  }
   return res;
 }
 
@@ -163,38 +160,32 @@ VehicleModel::LimitsInitList UkraineOptions()
 {
   auto res = NoTrunk();
   for (auto & e : res)
-  {
     if (e.m_type == HighwayType::HighwayLivingStreet || e.m_type == HighwayType::HighwayService)
       e.m_isPassThroughAllowed = false;
-  }
   return res;
 }
 
 VehicleModel::SurfaceInitList const kBicycleSurface = {
-  // {{surfaceType}, {weightFactor, etaFactor}}
-  {{"psurface", "paved_good"}, {1.0, 1.0}},
-  {{"psurface", "paved_bad"}, {0.8, 0.8}},
-  {{"psurface", "unpaved_good"}, {0.9, 0.9}},
-  {{"psurface", "unpaved_bad"}, {0.3, 0.3}},
-  // No dedicated cycleway doesn't mean that bicycle is not allowed, just lower weight.
-  // If nocycleway is tagged explicitly then there is no cycling infra for sure.
-  // Otherwise there is a small chance cycling infra is present though not mapped?
-  /// @todo(pastk): this heuristic is controversial, maybe remove completely?
-  {{"hwtag", "nocycleway"}, {0.95, 0.95}},
+    // {{surfaceType}, {weightFactor, etaFactor}}
+    {{"psurface", "paved_good"}, {1.0, 1.0}},
+    {{"psurface", "paved_bad"}, {0.8, 0.8}},
+    {{"psurface", "unpaved_good"}, {0.9, 0.9}},
+    {{"psurface", "unpaved_bad"}, {0.3, 0.3}},
+    // No dedicated cycleway doesn't mean that bicycle is not allowed, just lower weight.
+    // If nocycleway is tagged explicitly then there is no cycling infra for sure.
+    // Otherwise there is a small chance cycling infra is present though not mapped?
+    /// @todo(pastk): this heuristic is controversial, maybe remove completely?
+    {{"hwtag", "nocycleway"}, {0.95, 0.95}},
 };
 }  // namespace bicycle_model
 
 namespace routing
 {
-BicycleModel::BicycleModel()
-  : BicycleModel(bicycle_model::kDefaultOptions)
-{
-}
+BicycleModel::BicycleModel() : BicycleModel(bicycle_model::kDefaultOptions) {}
 
 BicycleModel::BicycleModel(VehicleModel::LimitsInitList const & limits)
   : BicycleModel(limits, bicycle_model::kDefaultSpeeds)
-{
-}
+{}
 
 BicycleModel::BicycleModel(VehicleModel::LimitsInitList const & limits, HighwayBasedSpeeds const & speeds)
   : VehicleModel(classif(), limits, bicycle_model::kBicycleSurface, {speeds, bicycle_model::kDefaultFactors})
@@ -214,7 +205,7 @@ BicycleModel::BicycleModel(VehicleModel::LimitsInitList const & limits, HighwayB
 
   // Assign 90% of max cycleway speed for bicycle=yes to keep choosing most preferred cycleway.
   auto const yesSpeed = kDefaultSpeeds.Get(HighwayType::HighwayCycleway).m_inCity * 0.9;
-  AddAdditionalRoadTypes(cl, {{ std::move(hwtagYesBicycle), InOutCitySpeedKMpH(yesSpeed) }});
+  AddAdditionalRoadTypes(cl, {{std::move(hwtagYesBicycle), InOutCitySpeedKMpH(yesSpeed)}});
 
   // Update max speed with possible ferry transfer and bicycle speed downhill.
   // See EdgeEstimator::CalcHeuristic, GetBicycleClimbPenalty.
@@ -249,7 +240,10 @@ bool BicycleModel::IsOneWay(FeatureTypes const & types) const
   return VehicleModel::IsOneWay(types);
 }
 
-SpeedKMpH const & BicycleModel::GetOffroadSpeed() const { return bicycle_model::kSpeedOffroadKMpH; }
+SpeedKMpH const & BicycleModel::GetOffroadSpeed() const
+{
+  return bicycle_model::kSpeedOffroadKMpH;
+}
 
 // If one of feature types will be disabled for bicycles, features of this type will be simplified
 // in generator. Look FeatureBuilder1::IsRoad() for more details.
@@ -266,8 +260,7 @@ SpeedKMpH BicycleModel::DismountSpeed()
   return bicycle_model::kSpeedDismountKMpH;
 }
 
-BicycleModelFactory::BicycleModelFactory(
-    CountryParentNameGetterFn const & countryParentNameGetterFn)
+BicycleModelFactory::BicycleModelFactory(CountryParentNameGetterFn const & countryParentNameGetterFn)
   : VehicleModelFactory(countryParentNameGetterFn)
 {
   using namespace bicycle_model;
@@ -295,8 +288,9 @@ BicycleModelFactory::BicycleModelFactory(
   m_models["Philippines"] = make_shared<BicycleModel>(AllAllowed(), NormalPedestrianSpeed());
   m_models["Poland"] = make_shared<BicycleModel>(NoTrunk());
   m_models["Romania"] = make_shared<BicycleModel>(AllAllowed());
-  // Note. Despite the fact that according to https://wiki.openstreetmap.org/wiki/OSM_tags_for_routing/Access-Restrictions
-  // passing through service and living_street with a bicycle is prohibited it's allowed according to Russian traffic rules.
+  // Note. Despite the fact that according to
+  // https://wiki.openstreetmap.org/wiki/OSM_tags_for_routing/Access-Restrictions passing through service and
+  // living_street with a bicycle is prohibited it's allowed according to Russian traffic rules.
   m_models["Russian Federation"] = make_shared<BicycleModel>(kDefaultOptions, NormalPedestrianAndFootwaySpeed());
   m_models["Slovakia"] = make_shared<BicycleModel>(NoTrunk());
   m_models["Spain"] = make_shared<BicycleModel>(NoTrunk(), NormalPedestrianSpeed());
@@ -306,4 +300,4 @@ BicycleModelFactory::BicycleModelFactory(
   m_models["United Kingdom"] = make_shared<BicycleModel>(AllAllowed());
   m_models["United States of America"] = make_shared<BicycleModel>(AllAllowed(), NormalPedestrianSpeed());
 }
-}  // routing
+}  // namespace routing
diff --git a/libs/routing_common/car_model.cpp b/libs/routing_common/car_model.cpp
index db9d0fd68..1f7e17c16 100644
--- a/libs/routing_common/car_model.cpp
+++ b/libs/routing_common/car_model.cpp
@@ -23,45 +23,31 @@ SpeedKMpH constexpr kSpeedOffroadKMpH = {0.01 /* weight */, kNotUsed /* eta */};
 
 VehicleModel::LimitsInitList const kDefaultOptions = {
     // {HighwayType, passThroughAllowed}
-    {HighwayType::HighwayMotorway, true},
-    {HighwayType::HighwayMotorwayLink, true},
-    {HighwayType::HighwayTrunk, true},
-    {HighwayType::HighwayTrunkLink, true},
-    {HighwayType::HighwayPrimary, true},
-    {HighwayType::HighwayPrimaryLink, true},
-    {HighwayType::HighwaySecondary, true},
-    {HighwayType::HighwaySecondaryLink, true},
-    {HighwayType::HighwayTertiary, true},
-    {HighwayType::HighwayTertiaryLink, true},
-    {HighwayType::HighwayResidential, true},
-    {HighwayType::HighwayUnclassified, true},
-    {HighwayType::HighwayService, true},
-    {HighwayType::HighwayLivingStreet, true},
-    {HighwayType::HighwayRoad, true},
-    {HighwayType::HighwayTrack, true},
-    {HighwayType::RouteShuttleTrain, true},
-    {HighwayType::RouteFerry, true},
-    {HighwayType::ManMadePier, true}
-};
+    {HighwayType::HighwayMotorway, true},    {HighwayType::HighwayMotorwayLink, true},
+    {HighwayType::HighwayTrunk, true},       {HighwayType::HighwayTrunkLink, true},
+    {HighwayType::HighwayPrimary, true},     {HighwayType::HighwayPrimaryLink, true},
+    {HighwayType::HighwaySecondary, true},   {HighwayType::HighwaySecondaryLink, true},
+    {HighwayType::HighwayTertiary, true},    {HighwayType::HighwayTertiaryLink, true},
+    {HighwayType::HighwayResidential, true}, {HighwayType::HighwayUnclassified, true},
+    {HighwayType::HighwayService, true},     {HighwayType::HighwayLivingStreet, true},
+    {HighwayType::HighwayRoad, true},        {HighwayType::HighwayTrack, true},
+    {HighwayType::RouteShuttleTrain, true},  {HighwayType::RouteFerry, true},
+    {HighwayType::ManMadePier, true}};
 
 VehicleModel::LimitsInitList NoPassThroughLivingStreet()
 {
   auto res = kDefaultOptions;
   for (auto & e : res)
-  {
     if (e.m_type == HighwayType::HighwayLivingStreet)
       e.m_isPassThroughAllowed = false;
-  }
   return res;
 }
 
 VehicleModel::LimitsInitList NoPassThroughService(VehicleModel::LimitsInitList res = kDefaultOptions)
 {
   for (auto & e : res)
-  {
     if (e.m_type == HighwayType::HighwayService)
       e.m_isPassThroughAllowed = false;
-  }
   return res;
 }
 
@@ -70,10 +56,8 @@ VehicleModel::LimitsInitList NoTrack()
   VehicleModel::LimitsInitList res;
   res.reserve(kDefaultOptions.size() - 1);
   for (auto const & e : kDefaultOptions)
-  {
     if (e.m_type != HighwayType::HighwayTrack)
       res.push_back(e);
-  }
   return res;
 }
 
@@ -81,29 +65,24 @@ VehicleModel::LimitsInitList NoPassThroughTrack()
 {
   auto res = kDefaultOptions;
   for (auto & e : res)
-  {
     if (e.m_type == HighwayType::HighwayTrack)
       e.m_isPassThroughAllowed = false;
-  }
   return res;
 }
 
 /// @todo Should make some compare constrains (like in CarModel_TrackVsGravelTertiary test)
 /// to better fit these factors with reality. I have no idea, how they were set.
 VehicleModel::SurfaceInitList const kCarSurface = {
-  // {{surfaceType, surfaceType}, {weightFactor, etaFactor}}
-  {{"psurface", "paved_good"}, {1.0, 1.0}},
-  {{"psurface", "paved_bad"}, {0.6, 0.7}},
-  {{"psurface", "unpaved_good"}, {0.4, 0.7}},
-  {{"psurface", "unpaved_bad"}, {0.2, 0.3}}
-};
+    // {{surfaceType, surfaceType}, {weightFactor, etaFactor}}
+    {{"psurface", "paved_good"}, {1.0, 1.0}},
+    {{"psurface", "paved_bad"}, {0.6, 0.7}},
+    {{"psurface", "unpaved_good"}, {0.4, 0.7}},
+    {{"psurface", "unpaved_bad"}, {0.2, 0.3}}};
 }  // namespace car_model
 
 namespace routing
 {
-CarModel::CarModel() : CarModel(car_model::kDefaultOptions)
-{
-}
+CarModel::CarModel() : CarModel(car_model::kDefaultOptions) {}
 
 CarModel::CarModel(VehicleModel::LimitsInitList const & roadLimits)
   : VehicleModel(classif(), roadLimits, car_model::kCarSurface, {kHighwayBasedSpeeds, kHighwayBasedFactors})
@@ -118,7 +97,7 @@ CarModel::CarModel(VehicleModel::LimitsInitList const & roadLimits)
   m_yesType = cl.GetTypeByPath(hwtagYesCar);
 
   // Set small track speed if highway is not in kHighwayBasedSpeeds (path, pedestrian), but marked as yescar.
-  AddAdditionalRoadTypes(cl, {{ std::move(hwtagYesCar), kHighwayBasedSpeeds.Get(HighwayType::HighwayTrack) }});
+  AddAdditionalRoadTypes(cl, {{std::move(hwtagYesCar), kHighwayBasedSpeeds.Get(HighwayType::HighwayTrack)}});
 
   // Set max possible (reasonable) car speed. See EdgeEstimator::CalcHeuristic.
   SpeedKMpH constexpr kMaxCarSpeedKMpH(200.0);
@@ -131,7 +110,10 @@ SpeedKMpH CarModel::GetSpeed(FeatureTypes const & types, SpeedParams const & spe
   return GetTypeSpeedImpl(types, speedParams, true /* isCar */);
 }
 
-SpeedKMpH const & CarModel::GetOffroadSpeed() const { return car_model::kSpeedOffroadKMpH; }
+SpeedKMpH const & CarModel::GetOffroadSpeed() const
+{
+  return car_model::kSpeedOffroadKMpH;
+}
 
 // static
 CarModel const & CarModel::AllLimitsInstance()
@@ -141,10 +123,16 @@ CarModel const & CarModel::AllLimitsInstance()
 }
 
 // static
-VehicleModel::LimitsInitList const & CarModel::GetOptions() { return car_model::kDefaultOptions; }
+VehicleModel::LimitsInitList const & CarModel::GetOptions()
+{
+  return car_model::kDefaultOptions;
+}
 
 // static
-VehicleModel::SurfaceInitList const & CarModel::GetSurfaces() { return car_model::kCarSurface; }
+VehicleModel::SurfaceInitList const & CarModel::GetSurfaces()
+{
+  return car_model::kCarSurface;
+}
 
 CarModelFactory::CarModelFactory(CountryParentNameGetterFn const & countryParentNameGetterFn)
   : VehicleModelFactory(countryParentNameGetterFn)
diff --git a/libs/routing_common/car_model_coefs.hpp b/libs/routing_common/car_model_coefs.hpp
index d14ad14ab..123ff71bd 100644
--- a/libs/routing_common/car_model_coefs.hpp
+++ b/libs/routing_common/car_model_coefs.hpp
@@ -14,16 +14,18 @@ HighwayBasedFactors const kHighwayBasedFactors = {
     // See XXX_KeepMotorway integration tests.
     {HighwayType::HighwayMotorwayLink, InOutCityFactor(0.75)},  // 0.20 less
     {HighwayType::HighwayTrunk, InOutCityFactor(0.90)},
-    {HighwayType::HighwayTrunkLink, InOutCityFactor(0.80)},     // 0.15 less
+    {HighwayType::HighwayTrunkLink, InOutCityFactor(0.80)},  // 0.15 less
 
     // Tier 2:
-    {HighwayType::HighwayPrimary, InOutCityFactor(SpeedFactor{0.85 /* weight */, 0.80 /* eta */} /* in city */, 0.85 /* out city */)},
-    {HighwayType::HighwayPrimaryLink, InOutCityFactor(0.70 /* in city */, 0.75 /* out city */)},   // 0.10 less
+    {HighwayType::HighwayPrimary,
+     InOutCityFactor(SpeedFactor{0.85 /* weight */, 0.80 /* eta */} /* in city */, 0.85 /* out city */)},
+    {HighwayType::HighwayPrimaryLink, InOutCityFactor(0.70 /* in city */, 0.75 /* out city */)},  // 0.10 less
     {HighwayType::HighwaySecondary, InOutCityFactor(0.80 /* in city */, 0.85 /* out city */)},
-    {HighwayType::HighwaySecondaryLink, InOutCityFactor(0.70 /* in city */, 0.75 /* out city */)}, // 0.10 less
+    {HighwayType::HighwaySecondaryLink, InOutCityFactor(0.70 /* in city */, 0.75 /* out city */)},  // 0.10 less
 
     // Tier 3:
-    {HighwayType::HighwayTertiary, InOutCityFactor(0.70 /* in city */, 0.75 /* out city */)},      // 0.10 less than Secondary
+    {HighwayType::HighwayTertiary,
+     InOutCityFactor(0.70 /* in city */, 0.75 /* out city */)},  // 0.10 less than Secondary
     {HighwayType::HighwayTertiaryLink, InOutCityFactor(0.60 /* in city */, 0.65 /* out city */)},  // 0.10 less
     {HighwayType::HighwayUnclassified, InOutCityFactor(0.70 /* in city */, 0.75 /* out city */)},
 
diff --git a/libs/routing_common/maxspeed_conversion.cpp b/libs/routing_common/maxspeed_conversion.cpp
index f70a60308..852841d57 100644
--- a/libs/routing_common/maxspeed_conversion.cpp
+++ b/libs/routing_common/maxspeed_conversion.cpp
@@ -30,9 +30,10 @@ MaxspeedType SpeedInUnits::GetSpeedKmPH() const
 
 // Maxspeed ----------------------------------------------------------------------------------------
 Maxspeed::Maxspeed(Units units, MaxspeedType forward, MaxspeedType backward)
-  : m_units(units), m_forward(forward), m_backward(backward)
-{
-}
+  : m_units(units)
+  , m_forward(forward)
+  , m_backward(backward)
+{}
 
 bool Maxspeed::operator==(Maxspeed const & rhs) const
 {
@@ -49,7 +50,8 @@ MaxspeedType Maxspeed::GetSpeedKmPH(bool forward) const
   auto const speedInUnits = GetSpeedInUnits(forward);
   switch (speedInUnits)
   {
-  case kInvalidSpeed: return kInvalidSpeed; // That means IsValid() returns false.
+  case kInvalidSpeed:
+    return kInvalidSpeed;  // That means IsValid() returns false.
 
   // A feature is marked as a feature without any speed limits (maxspeed=="none").
   // Should be less than CarModel::kMaxCarSpeedKMpH.
@@ -66,9 +68,9 @@ MaxspeedType Maxspeed::GetSpeedKmPH(bool forward) const
 // FeatureMaxspeed ---------------------------------------------------------------------------------
 FeatureMaxspeed::FeatureMaxspeed(uint32_t fid, measurement_utils::Units units, MaxspeedType forward,
                                  MaxspeedType backward /* = kInvalidSpeed */) noexcept
-  : m_featureId(fid), m_maxspeed(units, forward, backward)
-{
-}
+  : m_featureId(fid)
+  , m_maxspeed(units, forward, backward)
+{}
 
 bool FeatureMaxspeed::operator==(FeatureMaxspeed const & rhs) const
 {
@@ -302,7 +304,7 @@ SpeedInUnits MaxspeedConverter::ClosestValidMacro(SpeedInUnits const & speed) co
 // static
 MaxspeedConverter const & MaxspeedConverter::Instance()
 {
-  static const MaxspeedConverter inst;
+  static MaxspeedConverter const inst;
   return inst;
 }
 
@@ -318,8 +320,7 @@ bool HaveSameUnits(SpeedInUnits const & lhs, SpeedInUnits const & rhs)
 
 bool IsNumeric(MaxspeedType speed)
 {
-  return (speed != kInvalidSpeed && speed != kNoneMaxSpeed &&
-          speed != kWalkMaxSpeed && speed != kCommonMaxSpeedValue);
+  return (speed != kInvalidSpeed && speed != kNoneMaxSpeed && speed != kWalkMaxSpeed && speed != kCommonMaxSpeedValue);
 }
 
 namespace
@@ -335,7 +336,7 @@ std::string PrintMaxspeedType(MaxspeedType s)
   }
   return std::to_string(int(s));
 }
-} // namespace
+}  // namespace
 
 string DebugPrint(Maxspeed maxspeed)
 {
@@ -349,8 +350,8 @@ string DebugPrint(Maxspeed maxspeed)
 string DebugPrint(SpeedMacro maxspeed)
 {
   ostringstream oss;
-  oss << "SpeedMacro { " << static_cast<int>(maxspeed) << ", decoded: "
-      << DebugPrint(GetMaxspeedConverter().MacroToSpeed(maxspeed)) << " }";
+  oss << "SpeedMacro { " << static_cast<int>(maxspeed)
+      << ", decoded: " << DebugPrint(GetMaxspeedConverter().MacroToSpeed(maxspeed)) << " }";
   return oss.str();
 }
 
diff --git a/libs/routing_common/maxspeed_conversion.hpp b/libs/routing_common/maxspeed_conversion.hpp
index 7f5fe1dff..939e966c9 100644
--- a/libs/routing_common/maxspeed_conversion.hpp
+++ b/libs/routing_common/maxspeed_conversion.hpp
@@ -18,8 +18,8 @@ enum class SpeedMacro : uint8_t
 {
   // Special values.
   Undefined,
-  None,       // No maxspeed restriction (E.g. a motorway in Germany).
-  Walk,       // Driver should move as a walking person.
+  None,  // No maxspeed restriction (E.g. a motorway in Germany).
+  Walk,  // Driver should move as a walking person.
 
   // Km per hour.
   Speed1KmPH = 10,
@@ -257,18 +257,12 @@ public:
 
   struct Less
   {
-    bool operator() (FeatureMaxspeed const & l, FeatureMaxspeed const & r) const
+    bool operator()(FeatureMaxspeed const & l, FeatureMaxspeed const & r) const
     {
       return l.m_featureId < r.m_featureId;
     }
-    bool operator() (uint32_t l, FeatureMaxspeed const & r) const
-    {
-      return l < r.m_featureId;
-    }
-    bool operator() (FeatureMaxspeed const & l, uint32_t r) const
-    {
-      return l.m_featureId < r;
-    }
+    bool operator()(uint32_t l, FeatureMaxspeed const & r) const { return l < r.m_featureId; }
+    bool operator()(FeatureMaxspeed const & l, uint32_t r) const { return l.m_featureId < r; }
   };
 
   bool IsValid() const { return m_maxspeed.IsValid(); }
diff --git a/libs/routing_common/num_mwm_id.hpp b/libs/routing_common/num_mwm_id.hpp
index 3852be217..c5293930b 100644
--- a/libs/routing_common/num_mwm_id.hpp
+++ b/libs/routing_common/num_mwm_id.hpp
@@ -31,18 +31,12 @@ public:
     m_idToFile.push_back(file);
     m_fileToId[file] = id;
 
-    //LOG(LDEBUG, ("MWM:", file.GetName(), "=", id));
+    // LOG(LDEBUG, ("MWM:", file.GetName(), "=", id));
   }
 
-  bool ContainsFile(platform::CountryFile const & file) const
-  {
-    return m_fileToId.find(file) != m_fileToId.cend();
-  }
+  bool ContainsFile(platform::CountryFile const & file) const { return m_fileToId.find(file) != m_fileToId.cend(); }
 
-  bool ContainsFileForMwm(NumMwmId mwmId) const
-  {
-    return mwmId < m_idToFile.size();
-  }
+  bool ContainsFileForMwm(NumMwmId mwmId) const { return mwmId < m_idToFile.size(); }
 
   platform::CountryFile const & GetFile(NumMwmId mwmId) const
   {
diff --git a/libs/routing_common/pedestrian_model.cpp b/libs/routing_common/pedestrian_model.cpp
index fc5474c65..656332a3d 100644
--- a/libs/routing_common/pedestrian_model.cpp
+++ b/libs/routing_common/pedestrian_model.cpp
@@ -2,16 +2,15 @@
 
 #include "indexer/classificator.hpp"
 
-
 namespace pedestrian_model
 {
 using namespace routing;
 
 // See model specifics in different countries here:
 //   https://wiki.openstreetmap.org/wiki/OSM_tags_for_routing/Access-Restrictions
-// Document contains proposals for some countries, but we assume that some kinds of roads are ready for pedestrian routing,
-// but not listed in tables in the document. For example, steps are not listed, paths, roads and services features also
-// can be treated as ready for pedestrian routing. These road types were added to lists below.
+// Document contains proposals for some countries, but we assume that some kinds of roads are ready for pedestrian
+// routing, but not listed in tables in the document. For example, steps are not listed, paths, roads and services
+// features also can be treated as ready for pedestrian routing. These road types were added to lists below.
 
 // See road types here:
 //   https://wiki.openstreetmap.org/wiki/Key:highway
@@ -85,8 +84,7 @@ VehicleModel::LimitsInitList const kDefaultOptions = {
     {HighwayType::HighwayPedestrian, true},
     {HighwayType::HighwayFootway, true},
     {HighwayType::ManMadePier, true},
-    {HighwayType::RouteFerry, true}
-};
+    {HighwayType::RouteFerry, true}};
 
 // Same as defaults except bridleway and cycleway are allowed.
 VehicleModel::LimitsInitList AllAllowed()
@@ -103,10 +101,8 @@ VehicleModel::LimitsInitList NoTrunk()
   VehicleModel::LimitsInitList res;
   res.reserve(kDefaultOptions.size() - 2);
   for (auto const & e : kDefaultOptions)
-  {
     if (e.m_type != HighwayType::HighwayTrunk && e.m_type != HighwayType::HighwayTrunkLink)
       res.push_back(e);
-  }
   return res;
 }
 
@@ -133,31 +129,26 @@ HighwayBasedSpeeds IncreasePrimary()
 }
 
 VehicleModel::SurfaceInitList const kPedestrianSurface = {
-  // {{surfaceType}, {weightFactor, etaFactor}}
-  {{"psurface", "paved_good"}, {1.0, 1.0}},
-  {{"psurface", "paved_bad"}, {1.0, 1.0}},
-  {{"psurface", "unpaved_good"}, {1.0, 1.0}},
-  {{"psurface", "unpaved_bad"}, {0.8, 0.8}},
-  // no dedicated sidewalk, doesn't mean that foot is not allowed, just lower weight
-  {{"hwtag", "nosidewalk"}, {0.8, 0.8}},
+    // {{surfaceType}, {weightFactor, etaFactor}}
+    {{"psurface", "paved_good"}, {1.0, 1.0}},
+    {{"psurface", "paved_bad"}, {1.0, 1.0}},
+    {{"psurface", "unpaved_good"}, {1.0, 1.0}},
+    {{"psurface", "unpaved_bad"}, {0.8, 0.8}},
+    // no dedicated sidewalk, doesn't mean that foot is not allowed, just lower weight
+    {{"hwtag", "nosidewalk"}, {0.8, 0.8}},
 };
 }  // namespace pedestrian_model
 
 namespace routing
 {
-PedestrianModel::PedestrianModel() : PedestrianModel(pedestrian_model::kDefaultOptions)
-{
-}
+PedestrianModel::PedestrianModel() : PedestrianModel(pedestrian_model::kDefaultOptions) {}
 
 PedestrianModel::PedestrianModel(VehicleModel::LimitsInitList const & limits)
-: PedestrianModel(limits, pedestrian_model::kDefaultSpeeds)
-{
-}
+  : PedestrianModel(limits, pedestrian_model::kDefaultSpeeds)
+{}
 
-PedestrianModel::PedestrianModel(VehicleModel::LimitsInitList const & limits,
-                                 HighwayBasedSpeeds const & speeds)
-  : VehicleModel(classif(), limits, pedestrian_model::kPedestrianSurface,
-                {speeds, pedestrian_model::kDefaultFactors})
+PedestrianModel::PedestrianModel(VehicleModel::LimitsInitList const & limits, HighwayBasedSpeeds const & speeds)
+  : VehicleModel(classif(), limits, pedestrian_model::kPedestrianSurface, {speeds, pedestrian_model::kDefaultFactors})
 {
   using namespace pedestrian_model;
 
@@ -167,10 +158,10 @@ PedestrianModel::PedestrianModel(VehicleModel::LimitsInitList const & limits,
   std::vector<std::string> hwtagYesFoot = {"hwtag", "yesfoot"};
   auto const & cl = classif();
 
-  m_noType = cl.GetTypeByPath({ "hwtag", "nofoot" });
+  m_noType = cl.GetTypeByPath({"hwtag", "nofoot"});
   m_yesType = cl.GetTypeByPath(hwtagYesFoot);
 
-  AddAdditionalRoadTypes(cl, {{ std::move(hwtagYesFoot), kDefaultSpeeds.Get(HighwayType::HighwayLivingStreet) }});
+  AddAdditionalRoadTypes(cl, {{std::move(hwtagYesFoot), kDefaultSpeeds.Get(HighwayType::HighwayLivingStreet)}});
 
   // Update max pedestrian speed with possible ferry transfer. See EdgeEstimator::CalcHeuristic.
   SpeedKMpH constexpr kMaxPedestrianSpeedKMpH(60.0);
@@ -183,7 +174,10 @@ SpeedKMpH PedestrianModel::GetSpeed(FeatureTypes const & types, SpeedParams cons
   return GetTypeSpeedImpl(types, speedParams, false /* isCar */);
 }
 
-SpeedKMpH const & PedestrianModel::GetOffroadSpeed() const { return pedestrian_model::kSpeedOffroadKMpH; }
+SpeedKMpH const & PedestrianModel::GetOffroadSpeed() const
+{
+  return pedestrian_model::kSpeedOffroadKMpH;
+}
 
 // If one of feature types will be disabled for pedestrian, features of this type will be simplyfied
 // in generator. Look FeatureBuilder1::IsRoad() for more details.
@@ -194,8 +188,7 @@ PedestrianModel const & PedestrianModel::AllLimitsInstance()
   return instance;
 }
 
-PedestrianModelFactory::PedestrianModelFactory(
-    CountryParentNameGetterFn const & countryParentNameGetterFn)
+PedestrianModelFactory::PedestrianModelFactory(CountryParentNameGetterFn const & countryParentNameGetterFn)
   : VehicleModelFactory(countryParentNameGetterFn)
 {
   using namespace pedestrian_model;
@@ -233,4 +226,4 @@ PedestrianModelFactory::PedestrianModelFactory(
   m_models["United Kingdom"] = make_shared<PedestrianModel>(AllAllowed());
   m_models["United States of America"] = make_shared<PedestrianModel>(AllAllowed());
 }
-}  // routing
+}  // namespace routing
diff --git a/libs/routing_common/pedestrian_model.hpp b/libs/routing_common/pedestrian_model.hpp
index ab53eabbd..03af05f71 100644
--- a/libs/routing_common/pedestrian_model.hpp
+++ b/libs/routing_common/pedestrian_model.hpp
@@ -10,8 +10,7 @@ class PedestrianModel : public VehicleModel
 public:
   PedestrianModel();
   explicit PedestrianModel(VehicleModel::LimitsInitList const & speedLimits);
-  PedestrianModel(VehicleModel::LimitsInitList const & limits,
-                  HighwayBasedSpeeds const & speeds);
+  PedestrianModel(VehicleModel::LimitsInitList const & limits, HighwayBasedSpeeds const & speeds);
 
   /// VehicleModelInterface overrides:
   SpeedKMpH GetSpeed(FeatureTypes const & types, SpeedParams const & speedParams) const override;
diff --git a/libs/routing_common/routing_common_tests/bicycle_model_test.cpp b/libs/routing_common/routing_common_tests/bicycle_model_test.cpp
index 89f714984..2029f2ae8 100644
--- a/libs/routing_common/routing_common_tests/bicycle_model_test.cpp
+++ b/libs/routing_common/routing_common_tests/bicycle_model_test.cpp
@@ -20,10 +20,7 @@ public:
     return std::dynamic_pointer_cast<VehicleModel>(BicycleModelFactory().GetVehicleModelForCountry(country));
   }
 
-  SpeedParams DefaultSpeedParams()
-  {
-    return {true /* forward */, true /* isCity */, Maxspeed()};
-  }
+  SpeedParams DefaultSpeedParams() { return {true /* forward */, true /* isCity */, Maxspeed()}; }
 };
 
 UNIT_CLASS_TEST(BicycleModelTest, Turkey)
@@ -39,4 +36,4 @@ UNIT_CLASS_TEST(BicycleModelTest, Turkey)
   TEST_EQUAL(model->GetSpeed(holder, DefaultSpeedParams()), BicycleModel::DismountSpeed(), ());
 }
 
-} // namespace bicycle_model_test
+}  // namespace bicycle_model_test
diff --git a/libs/routing_common/routing_common_tests/vehicle_model_for_country_test.cpp b/libs/routing_common/routing_common_tests/vehicle_model_for_country_test.cpp
index d20b12835..73570fd7a 100644
--- a/libs/routing_common/routing_common_tests/vehicle_model_for_country_test.cpp
+++ b/libs/routing_common/routing_common_tests/vehicle_model_for_country_test.cpp
@@ -43,8 +43,8 @@ void TestVehicleModelDefault()
   VehicleModelFactoryType vehicleModelFactory = VehicleModelFactoryType(GetRegionParent);
 
   // Use static_pointer_cast here because VehicleModelInterface do not have EqualsForTests method
-  shared_ptr<VehicleModelType> defaultVehicleModelForCountry = static_pointer_cast<VehicleModelType>(
-      vehicleModelFactory.GetVehicleModelForCountry("Nonexistent Country Name"));
+  shared_ptr<VehicleModelType> defaultVehicleModelForCountry =
+      static_pointer_cast<VehicleModelType>(vehicleModelFactory.GetVehicleModelForCountry("Nonexistent Country Name"));
   TEST(defaultVehicleModel->EqualsForTests(*defaultVehicleModelForCountry),
        ("Vehicle model for nonexistent counry is not equal to default."));
 }
@@ -77,8 +77,7 @@ void ParentTest(string child, string parent)
   shared_ptr<VehicleModelType> vehicleModelParent =
       static_pointer_cast<VehicleModelType>(vehicleModelFactory.GetVehicleModelForCountry(parent));
 
-  TEST(vehicleModelChild->EqualsForTests(*vehicleModelParent),
-       ("Can not expand car model for", child, "to", parent));
+  TEST(vehicleModelChild->EqualsForTests(*vehicleModelParent), ("Can not expand car model for", child, "to", parent));
 }
 
 // Test we have default vehicle models for nonexistent(unknown) country
@@ -112,7 +111,7 @@ UNIT_CLASS_TEST(VehicleModelForCountryTest, CarModel_DirectParent)
 UNIT_CLASS_TEST(VehicleModelForCountryTest, BicycleModel_DirectParent)
 {
   // Road types for RF are equal with defaults (speeds are not compared).
-//  TestHaveNondefaultRestrictionForSelectedCountry<BicycleModel, BicycleModelFactory>("Russian Federation");
+  //  TestHaveNondefaultRestrictionForSelectedCountry<BicycleModel, BicycleModelFactory>("Russian Federation");
   ParentTest<BicycleModel, BicycleModelFactory>("Moscow", "Russian Federation");
 }
 
@@ -121,8 +120,7 @@ UNIT_CLASS_TEST(VehicleModelForCountryTest, BicycleModel_DirectParent)
 //    Moscow equals pedestrian model for Russia and it's not default model.
 UNIT_CLASS_TEST(VehicleModelForCountryTest, PedestrianModel_DirectParent)
 {
-  TestHaveNondefaultRestrictionForSelectedCountry<PedestrianModel, PedestrianModelFactory>(
-      "Russian Federation");
+  TestHaveNondefaultRestrictionForSelectedCountry<PedestrianModel, PedestrianModelFactory>("Russian Federation");
   ParentTest<PedestrianModel, PedestrianModelFactory>("Moscow", "Russian Federation");
 }
 
@@ -138,8 +136,7 @@ UNIT_CLASS_TEST(VehicleModelForCountryTest, CarModel_InirectParent)
 // San Francisco in GetRegionParent function: San Francisco -> California -> United States of America
 UNIT_CLASS_TEST(VehicleModelForCountryTest, BicycleModel_IndirectParent)
 {
-  TestHaveNondefaultRestrictionForSelectedCountry<BicycleModel, BicycleModelFactory>(
-      "United States of America");
+  TestHaveNondefaultRestrictionForSelectedCountry<BicycleModel, BicycleModelFactory>("United States of America");
   ParentTest<BicycleModel, BicycleModelFactory>("San Francisco", "United States of America");
 }
 
@@ -147,8 +144,7 @@ UNIT_CLASS_TEST(VehicleModelForCountryTest, BicycleModel_IndirectParent)
 // San Francisco in GetRegionParent function: San Francisco -> California -> United States of America
 UNIT_CLASS_TEST(VehicleModelForCountryTest, PedestrianModel_IndirectParent)
 {
-  TestHaveNondefaultRestrictionForSelectedCountry<PedestrianModel, PedestrianModelFactory>(
-      "United States of America");
+  TestHaveNondefaultRestrictionForSelectedCountry<PedestrianModel, PedestrianModelFactory>("United States of America");
   ParentTest<PedestrianModel, PedestrianModelFactory>("San Francisco", "United States of America");
 }
 }  // namespace vehicle_model_for_country_test
diff --git a/libs/routing_common/routing_common_tests/vehicle_model_test.cpp b/libs/routing_common/routing_common_tests/vehicle_model_test.cpp
index a2e8d8ff2..66462fda4 100644
--- a/libs/routing_common/routing_common_tests/vehicle_model_test.cpp
+++ b/libs/routing_common/routing_common_tests/vehicle_model_test.cpp
@@ -15,7 +15,6 @@
 
 #include "base/math.hpp"
 
-
 namespace vehicle_model_test
 {
 using namespace routing;
@@ -26,35 +25,27 @@ HighwayBasedSpeeds const kDefaultSpeeds = {
     {HighwayType::HighwayPrimary, InOutCitySpeedKMpH(90.0 /* in city */, 120.0 /* out city */)},
     {HighwayType::HighwaySecondary,
      InOutCitySpeedKMpH(SpeedKMpH(80.0 /* weight */, 70.0 /* eta */) /* in and out city*/)},
-    {HighwayType::HighwayResidential,
-     InOutCitySpeedKMpH(SpeedKMpH(45.0 /* weight */, 55.0 /* eta */) /* in city */,
-                        SpeedKMpH(50.0 /* weight */, 60.0 /* eta */) /* out city */)},
-    {HighwayType::HighwayService,
-     InOutCitySpeedKMpH(SpeedKMpH(47.0 /* weight */, 36.0 /* eta */) /* in city */,
-                        SpeedKMpH(50.0 /* weight */, 40.0 /* eta */) /* out city */)}
-};
+    {HighwayType::HighwayResidential, InOutCitySpeedKMpH(SpeedKMpH(45.0 /* weight */, 55.0 /* eta */) /* in city */,
+                                                         SpeedKMpH(50.0 /* weight */, 60.0 /* eta */) /* out city */)},
+    {HighwayType::HighwayService, InOutCitySpeedKMpH(SpeedKMpH(47.0 /* weight */, 36.0 /* eta */) /* in city */,
+                                                     SpeedKMpH(50.0 /* weight */, 40.0 /* eta */) /* out city */)}};
 
-HighwayBasedFactors const kDefaultFactors = {
-    {HighwayType::HighwayTrunk, InOutCityFactor(1.0)},
-    {HighwayType::HighwayPrimary, InOutCityFactor(1.0)},
-    {HighwayType::HighwaySecondary, InOutCityFactor(1.0)},
-    {HighwayType::HighwayResidential, InOutCityFactor(0.5)}
-};
+HighwayBasedFactors const kDefaultFactors = {{HighwayType::HighwayTrunk, InOutCityFactor(1.0)},
+                                             {HighwayType::HighwayPrimary, InOutCityFactor(1.0)},
+                                             {HighwayType::HighwaySecondary, InOutCityFactor(1.0)},
+                                             {HighwayType::HighwayResidential, InOutCityFactor(0.5)}};
 
-VehicleModel::LimitsInitList const kTestLimits = {
-  {HighwayType::HighwayTrunk, true},
-  {HighwayType::HighwayPrimary, true},
-  {HighwayType::HighwaySecondary, true},
-  {HighwayType::HighwayResidential, true},
-  {HighwayType::HighwayService, false}
-};
+VehicleModel::LimitsInitList const kTestLimits = {{HighwayType::HighwayTrunk, true},
+                                                  {HighwayType::HighwayPrimary, true},
+                                                  {HighwayType::HighwaySecondary, true},
+                                                  {HighwayType::HighwayResidential, true},
+                                                  {HighwayType::HighwayService, false}};
 
 VehicleModel::SurfaceInitList const kCarSurface = {
     {{"psurface", "paved_good"}, {0.8 /* weightFactor */, 0.9 /* etaFactor */}},
     {{"psurface", "paved_bad"}, {0.4, 0.5}},
     {{"psurface", "unpaved_good"}, {0.6, 0.8}},
-    {{"psurface", "unpaved_bad"}, {0.2, 0.2}}
-};
+    {{"psurface", "unpaved_bad"}, {0.2, 0.2}}};
 
 class VehicleModelTest
 {
@@ -93,10 +84,7 @@ public:
 class VehicleModelStub : public VehicleModel
 {
 public:
-  VehicleModelStub()
-    : VehicleModel(classif(), kTestLimits, kCarSurface, {kDefaultSpeeds, kDefaultFactors})
-  {
-  }
+  VehicleModelStub() : VehicleModel(classif(), kTestLimits, kCarSurface, {kDefaultSpeeds, kDefaultFactors}) {}
 
   SpeedKMpH GetSpeed(feature::TypesHolder const & types, SpeedParams const & params) const override
   {
@@ -150,7 +138,6 @@ void CheckPassThroughAllowed(initializer_list<uint32_t> const & types, bool expe
   TEST_EQUAL(model.IsPassThroughAllowed(h), expectedValue, ());
 }
 
-
 UNIT_CLASS_TEST(VehicleModelStub, MaxSpeed)
 {
   TEST_EQUAL(GetMaxWeightSpeed(), 150.0, ());
@@ -207,9 +194,8 @@ UNIT_CLASS_TEST(VehicleModelTest, PassThroughAllowed)
 
 UNIT_CLASS_TEST(VehicleModelTest, SpeedFactor)
 {
-  CheckSpeed({secondary, pavedGood},
-             {SpeedKMpH(64.0 /* weight */, 63.0 /* eta */) /* in city */,
-              SpeedKMpH(64.0 /* weight */, 63.0 /* eta */) /* out of city */});
+  CheckSpeed({secondary, pavedGood}, {SpeedKMpH(64.0 /* weight */, 63.0 /* eta */) /* in city */,
+                                      SpeedKMpH(64.0 /* weight */, 63.0 /* eta */) /* out of city */});
   CheckSpeed({secondary, pavedBad}, {SpeedKMpH(32.0, 35.0), SpeedKMpH(32.0, 35.0)});
   CheckSpeed({secondary, unpavedGood}, {SpeedKMpH(48.0, 56.0), SpeedKMpH(48.0, 56.0)});
   CheckSpeed({secondary, unpavedBad}, {SpeedKMpH(16.0, 14.0), SpeedKMpH(16.0, 14.0)});
@@ -227,28 +213,22 @@ UNIT_CLASS_TEST(VehicleModelTest, MaxspeedFactor)
   Maxspeed const maxspeed90 = Maxspeed(units, 90, kInvalidSpeed);
 
   // pavedBad == unpavedBad for the roads with explicitly defined speeds.
-  CheckSpeedWithParams({secondary, unpavedBad},
-                       SpeedParams(true /* forward */, false /* in city */, maxspeed90),
+  CheckSpeedWithParams({secondary, unpavedBad}, SpeedParams(true /* forward */, false /* in city */, maxspeed90),
                        SpeedKMpH(36.0, 45.0));
-  CheckSpeedWithParams({secondary, pavedBad},
-                       SpeedParams(true /* forward */, false /* in city */, maxspeed90),
+  CheckSpeedWithParams({secondary, pavedBad}, SpeedParams(true /* forward */, false /* in city */, maxspeed90),
                        SpeedKMpH(36.0, 45.0));
 
-  CheckSpeedWithParams({primary, pavedGood},
-                       SpeedParams(true /* forward */, false /* in city */, maxspeed90),
+  CheckSpeedWithParams({primary, pavedGood}, SpeedParams(true /* forward */, false /* in city */, maxspeed90),
                        SpeedKMpH(72.0, 81.0));
 
   Maxspeed const maxspeed9070 = Maxspeed(units, 90, 70);
-  CheckSpeedWithParams({primary, pavedGood},
-                       SpeedParams(true /* forward */, false /* in city */, maxspeed9070),
+  CheckSpeedWithParams({primary, pavedGood}, SpeedParams(true /* forward */, false /* in city */, maxspeed9070),
                        SpeedKMpH(72.0, 81.0));
-  CheckSpeedWithParams({primary, pavedGood},
-                       SpeedParams(false /* forward */, false /* in city */, maxspeed9070),
+  CheckSpeedWithParams({primary, pavedGood}, SpeedParams(false /* forward */, false /* in city */, maxspeed9070),
                        SpeedKMpH(56.0, 63.0));
 
   Maxspeed const maxspeed60 = Maxspeed(units, 60, kInvalidSpeed);
-  CheckSpeedWithParams({residential, pavedGood},
-                       SpeedParams(true /* forward */, false /* in city */, maxspeed60),
+  CheckSpeedWithParams({residential, pavedGood}, SpeedParams(true /* forward */, false /* in city */, maxspeed60),
                        SpeedKMpH(24.0, 27.0));
 }
 
@@ -270,7 +250,7 @@ bool LessOrEqualSpeed(SpeedKMpH const & l, SpeedKMpH const & r)
 }
 
 #define TEST_LESS_OR_EQUAL_SPEED(l, r) TEST(LessOrEqualSpeed(l, r), (l, r))
-} // namespace
+}  // namespace
 
 UNIT_CLASS_TEST(VehicleModelTest, CarModel_TrackVsGravelTertiary)
 {
@@ -283,7 +263,7 @@ UNIT_CLASS_TEST(VehicleModelTest, CarModel_TrackVsGravelTertiary)
 
   feature::TypesHolder h2;
   h2.Add(c.GetTypeByPath({"highway", "tertiary"}));
-  h2.Add(unpavedBad);   // from OSM surface=gravel
+  h2.Add(unpavedBad);  // from OSM surface=gravel
 
   // https://www.openstreetmap.org/#map=19/45.43640/36.39689
   // Obvious that gravel tertiary (moreover with maxspeed=60kmh) should be better than track.
@@ -354,23 +334,25 @@ UNIT_CLASS_TEST(VehicleModelTest, BicycleModel_Speeds)
   auto const p = DefaultParams();
 
   std::vector<std::vector<uint32_t>> const highways = {
-    {cycleway, pavedGood}, // TODO: should be higher than next, but is equal
-    {cycleway},
-    {cycleway, unpavedGood}, // TODO: should be lower than previous, but is equal
-    {footway, yesBicycle, pavedGood}, // TODO: should be higher than next, but is equal
-    {footway, yesBicycle},
-    {path, yesBicycle}, // TODO: unpaved by default, so should be lower than shared footways or cycleways, but is equal
-    {cycleway, pavedBad},
-    {footway, yesBicycle, pavedBad},
-    {footway}, // If allowed in the region.
-    {cycleway, unpavedBad},
-    {path, unpavedGood}, // Its controversial what is preferrable: a good path or a bad cycleway
-    {path, yesBicycle, unpavedBad},
-    /// @todo(pastk): "nobicycle" is ignored in speed calculation atm, the routing is just forbidden there.
-    /// But "nobicycle" should result in a dismount speed instead, see https://github.com/organicmaps/organicmaps/issues/9784
-    // {footway, c.GetTypeByPath({"hwtag", "nobicycle"})},
-    // {path, c.GetTypeByPath({"hwtag", "nobicycle"})},
-    {path, unpavedBad},
+      {cycleway, pavedGood},  // TODO: should be higher than next, but is equal
+      {cycleway},
+      {cycleway, unpavedGood},           // TODO: should be lower than previous, but is equal
+      {footway, yesBicycle, pavedGood},  // TODO: should be higher than next, but is equal
+      {footway, yesBicycle},
+      {path,
+       yesBicycle},  // TODO: unpaved by default, so should be lower than shared footways or cycleways, but is equal
+      {cycleway, pavedBad},
+      {footway, yesBicycle, pavedBad},
+      {footway},  // If allowed in the region.
+      {cycleway, unpavedBad},
+      {path, unpavedGood},  // Its controversial what is preferrable: a good path or a bad cycleway
+      {path, yesBicycle, unpavedBad},
+      /// @todo(pastk): "nobicycle" is ignored in speed calculation atm, the routing is just forbidden there.
+      /// But "nobicycle" should result in a dismount speed instead, see
+      /// https://github.com/organicmaps/organicmaps/issues/9784
+      // {footway, c.GetTypeByPath({"hwtag", "nobicycle"})},
+      // {path, c.GetTypeByPath({"hwtag", "nobicycle"})},
+      {path, unpavedBad},
   };
 
   feature::TypesHolder hprev;
@@ -415,18 +397,18 @@ UNIT_CLASS_TEST(VehicleModelTest, PedestrianModel_Speeds)
   auto const p = DefaultParams();
 
   std::vector<std::vector<uint32_t>> const highways = {
-    {footway, pavedGood}, // TODO: should be higher than next, but is equal
-    {footway},
-    {footway, pavedBad}, // TODO: should be lower than previous, but is equal
-    {footway, yesBicycle}, // TODO: should be lower than previous, but is equal
-    {path, yesFoot}, // TODO: should be higher than previous, but is equal
-    {path, unpavedGood}, // TODO: should be lower than previous, but is equal
-    {path, yesBicycle}, // TODO: should be lower than previous, but is equal
-    {cycleway},
-    {path, unpavedBad},
-    {cycleway, unpavedBad},
-    // {path, c.GetTypeByPath({"hwtag", "nofoot"})}, // TODO: should be forbidden, but has no effect ATM
-    // {cycleway, c.GetTypeByPath({"hwtag", "nofoot"})}, // TODO: should be forbidden, but has no effect ATM
+      {footway, pavedGood},  // TODO: should be higher than next, but is equal
+      {footway},
+      {footway, pavedBad},    // TODO: should be lower than previous, but is equal
+      {footway, yesBicycle},  // TODO: should be lower than previous, but is equal
+      {path, yesFoot},        // TODO: should be higher than previous, but is equal
+      {path, unpavedGood},    // TODO: should be lower than previous, but is equal
+      {path, yesBicycle},     // TODO: should be lower than previous, but is equal
+      {cycleway},
+      {path, unpavedBad},
+      {cycleway, unpavedBad},
+      // {path, c.GetTypeByPath({"hwtag", "nofoot"})}, // TODO: should be forbidden, but has no effect ATM
+      // {cycleway, c.GetTypeByPath({"hwtag", "nofoot"})}, // TODO: should be forbidden, but has no effect ATM
   };
 
   feature::TypesHolder hprev;
@@ -460,15 +442,12 @@ UNIT_TEST(VehicleModel_MultiplicationOperatorTest)
 UNIT_TEST(VehicleModel_CarModelValidation)
 {
   HighwayType const carRoadTypes[] = {
-      HighwayType::HighwayLivingStreet,  HighwayType::HighwayMotorway,
-      HighwayType::HighwayMotorwayLink,  HighwayType::HighwayPrimary,
-      HighwayType::HighwayPrimaryLink,   HighwayType::HighwayResidential,
-      HighwayType::HighwayRoad,          HighwayType::HighwaySecondary,
-      HighwayType::HighwaySecondaryLink, HighwayType::HighwayService,
-      HighwayType::HighwayTertiary,      HighwayType::HighwayTertiaryLink,
-      HighwayType::HighwayTrack,         HighwayType::HighwayTrunk,
-      HighwayType::HighwayTrunkLink,     HighwayType::HighwayUnclassified,
-      HighwayType::ManMadePier,          HighwayType::RouteShuttleTrain,
+      HighwayType::HighwayLivingStreet, HighwayType::HighwayMotorway,    HighwayType::HighwayMotorwayLink,
+      HighwayType::HighwayPrimary,      HighwayType::HighwayPrimaryLink, HighwayType::HighwayResidential,
+      HighwayType::HighwayRoad,         HighwayType::HighwaySecondary,   HighwayType::HighwaySecondaryLink,
+      HighwayType::HighwayService,      HighwayType::HighwayTertiary,    HighwayType::HighwayTertiaryLink,
+      HighwayType::HighwayTrack,        HighwayType::HighwayTrunk,       HighwayType::HighwayTrunkLink,
+      HighwayType::HighwayUnclassified, HighwayType::ManMadePier,        HighwayType::RouteShuttleTrain,
       HighwayType::RouteFerry,
   };
 
@@ -490,9 +469,7 @@ UNIT_TEST(VehicleModel_HighwayType_Values)
   auto const & cl = classif();
 
   auto const check = [&cl](HighwayType hwType, base::StringIL clType)
-  {
-    return static_cast<uint16_t>(hwType) == cl.GetIndexForType(cl.GetTypeByPath(clType));
-  };
+  { return static_cast<uint16_t>(hwType) == cl.GetIndexForType(cl.GetTypeByPath(clType)); };
 
   TEST(check(HighwayType::HighwayResidential, {"highway", "residential"}), ());
   TEST(check(HighwayType::HighwayService, {"highway", "service"}), ());
diff --git a/libs/routing_common/vehicle_model.cpp b/libs/routing_common/vehicle_model.cpp
index 80aaeeabb..af7966fd3 100644
--- a/libs/routing_common/vehicle_model.cpp
+++ b/libs/routing_common/vehicle_model.cpp
@@ -28,8 +28,8 @@ SpeedKMpH Max(SpeedKMpH const & lhs, InOutCitySpeedKMpH const & rhs)
 
 VehicleModel::VehicleModel(Classificator const & classif, LimitsInitList const & featureTypeLimits,
                            SurfaceInitList const & featureTypeSurface, HighwayBasedInfo const & info)
-: m_highwayBasedInfo(info)
-, m_onewayType(ftypes::IsOneWayChecker::Instance().GetType())
+  : m_highwayBasedInfo(info)
+  , m_onewayType(ftypes::IsOneWayChecker::Instance().GetType())
 {
   m_roadTypes.Reserve(featureTypeLimits.size());
   for (auto const & v : featureTypeLimits)
@@ -111,8 +111,7 @@ void VehicleModel::GetSurfaceFactor(uint32_t type, SpeedFactor & factor) const
   ASSERT_GREATER(factor.m_eta, 0.0, ());
 }
 
-void VehicleModel::GetAdditionalRoadSpeed(uint32_t type, bool isCityRoad,
-                                          optional<SpeedKMpH> & speed) const
+void VehicleModel::GetAdditionalRoadSpeed(uint32_t type, bool isCityRoad, optional<SpeedKMpH> & speed) const
 {
   auto const * s = m_addRoadTypes.Find(type);
   if (s)
@@ -162,8 +161,8 @@ SpeedKMpH VehicleModel::GetTypeSpeedImpl(FeatureTypes const & types, SpeedParams
 
       if (isCar)
       {
-        // Override the global default speed with the MWM's saved default speed if they are not significantly differ (2x),
-        // to avoid anomaly peaks (especially for tracks).
+        // Override the global default speed with the MWM's saved default speed if they are not significantly differ
+        // (2x), to avoid anomaly peaks (especially for tracks).
         /// @todo MWM saved speeds should be validated in generator.
         if (params.m_defSpeedKmPH != kInvalidSpeed &&
             fabs(speed.m_weight - params.m_defSpeedKmPH) / speed.m_weight < 1.0)
@@ -248,11 +247,9 @@ bool VehicleModel::IsRoadImpl(FeatureTypes const & types) const
   return HasRoadType(types);
 }
 
-VehicleModelFactory::VehicleModelFactory(
-    CountryParentNameGetterFn const & countryParentNameGetterFn)
+VehicleModelFactory::VehicleModelFactory(CountryParentNameGetterFn const & countryParentNameGetterFn)
   : m_countryParentNameGetterFn(countryParentNameGetterFn)
-{
-}
+{}
 
 shared_ptr<VehicleModelInterface> VehicleModelFactory::GetVehicleModel() const
 {
@@ -261,8 +258,7 @@ shared_ptr<VehicleModelInterface> VehicleModelFactory::GetVehicleModel() const
   return itr->second;
 }
 
-shared_ptr<VehicleModelInterface> VehicleModelFactory::GetVehicleModelForCountry(
-    string const & country) const
+shared_ptr<VehicleModelInterface> VehicleModelFactory::GetVehicleModelForCountry(string const & country) const
 {
   string parent = country;
   while (!parent.empty())
diff --git a/libs/routing_common/vehicle_model.hpp b/libs/routing_common/vehicle_model.hpp
index 439478802..c60032344 100644
--- a/libs/routing_common/vehicle_model.hpp
+++ b/libs/routing_common/vehicle_model.hpp
@@ -54,7 +54,7 @@ enum class HighwayType : uint16_t
   HighwaySecondaryLink = 176,
   RouteFerry = 259,
   HighwayTertiaryLink = 272,
-  HighwayBusway = 857,    // reserve type here, but this type is not used for any routing by default
+  HighwayBusway = 857,  // reserve type here, but this type is not used for any routing by default
   RouteShuttleTrain = 1054,
 };
 
@@ -66,14 +66,17 @@ struct SpeedParams
 {
   /// @deprecated For unit tests compatibility.
   SpeedParams(bool forward, bool inCity, Maxspeed const & maxspeed)
-    : m_maxspeed(maxspeed), m_defSpeedKmPH(kInvalidSpeed), m_inCity(inCity), m_forward(forward)
-  {
-  }
+    : m_maxspeed(maxspeed)
+    , m_defSpeedKmPH(kInvalidSpeed)
+    , m_inCity(inCity)
+    , m_forward(forward)
+  {}
 
   SpeedParams(Maxspeed const & maxspeed, MaxspeedType defSpeedKmPH, bool inCity)
-    : m_maxspeed(maxspeed), m_defSpeedKmPH(defSpeedKmPH), m_inCity(inCity)
-  {
-  }
+    : m_maxspeed(maxspeed)
+    , m_defSpeedKmPH(defSpeedKmPH)
+    , m_inCity(inCity)
+  {}
 
   // Maxspeed stored for feature, if any.
   Maxspeed m_maxspeed;
@@ -92,22 +95,17 @@ struct SpeedKMpH
   constexpr SpeedKMpH(double weight) noexcept : m_weight(weight), m_eta(weight) {}
   constexpr SpeedKMpH(double weight, double eta) noexcept : m_weight(weight), m_eta(eta) {}
 
-  bool operator==(SpeedKMpH const & rhs) const
-  {
-    return m_weight == rhs.m_weight && m_eta == rhs.m_eta;
-  }
+  bool operator==(SpeedKMpH const & rhs) const { return m_weight == rhs.m_weight && m_eta == rhs.m_eta; }
   bool operator!=(SpeedKMpH const & rhs) const { return !(*this == rhs); }
 
-  bool operator<(SpeedKMpH const & rhs) const
-  {
-    return m_weight < rhs.m_weight && m_eta < rhs.m_eta;
-  }
+  bool operator<(SpeedKMpH const & rhs) const { return m_weight < rhs.m_weight && m_eta < rhs.m_eta; }
 
   bool IsValid() const { return m_weight > 0 && m_eta > 0; }
 
-  double m_weight = 0.0;  // KMpH - speed in km/h adjusted for desirability
-                          // cycling on very large road may be fast but speed used for route finding will be treated as much lower
-  double m_eta = 0.0;     // KMpH - actual expected speed in km/h, used to display expected arrival time
+  double m_weight =
+      0.0;  // KMpH - speed in km/h adjusted for desirability
+            // cycling on very large road may be fast but speed used for route finding will be treated as much lower
+  double m_eta = 0.0;  // KMpH - actual expected speed in km/h, used to display expected arrival time
 };
 
 /// \brief Factors which modify weight and ETA speed on feature in case of bad pavement (reduce)
@@ -127,10 +125,7 @@ struct SpeedFactor
     m_eta = std::max(f.m_eta, m_eta);
   }
 
-  bool operator==(SpeedFactor const & rhs) const
-  {
-    return m_weight == rhs.m_weight && m_eta == rhs.m_eta;
-  }
+  bool operator==(SpeedFactor const & rhs) const { return m_weight == rhs.m_weight && m_eta == rhs.m_eta; }
   bool operator!=(SpeedFactor const & rhs) const { return !(*this == rhs); }
 
   double m_weight = 1.0;
@@ -150,14 +145,11 @@ inline SpeedKMpH operator*(SpeedKMpH const & speed, SpeedFactor const & factor)
 struct InOutCitySpeedKMpH
 {
   constexpr InOutCitySpeedKMpH() = default;
-  constexpr explicit InOutCitySpeedKMpH(SpeedKMpH const & speed) noexcept
-    : m_inCity(speed), m_outCity(speed)
-  {
-  }
+  constexpr explicit InOutCitySpeedKMpH(SpeedKMpH const & speed) noexcept : m_inCity(speed), m_outCity(speed) {}
   constexpr InOutCitySpeedKMpH(SpeedKMpH const & inCity, SpeedKMpH const & outCity) noexcept
-    : m_inCity(inCity), m_outCity(outCity)
-  {
-  }
+    : m_inCity(inCity)
+    , m_outCity(outCity)
+  {}
 
   bool operator==(InOutCitySpeedKMpH const & rhs) const
   {
@@ -173,19 +165,13 @@ struct InOutCitySpeedKMpH
 
 struct InOutCityFactor
 {
-  constexpr explicit InOutCityFactor(SpeedFactor const & factor) noexcept
-    : m_inCity(factor), m_outCity(factor)
-  {
-  }
+  constexpr explicit InOutCityFactor(SpeedFactor const & factor) noexcept : m_inCity(factor), m_outCity(factor) {}
   constexpr InOutCityFactor(SpeedFactor const & inCity, SpeedFactor const & outCity) noexcept
-    : m_inCity(inCity), m_outCity(outCity)
-  {
-  }
+    : m_inCity(inCity)
+    , m_outCity(outCity)
+  {}
 
-  bool operator==(InOutCityFactor const & rhs) const
-  {
-    return m_inCity == rhs.m_inCity && m_outCity == rhs.m_outCity;
-  }
+  bool operator==(InOutCityFactor const & rhs) const { return m_inCity == rhs.m_inCity && m_outCity == rhs.m_outCity; }
 
   SpeedFactor const & GetFactor(bool isCity) const { return isCity ? m_inCity : m_outCity; }
   bool IsValid() const { return m_inCity.IsValid() && m_outCity.IsValid(); }
@@ -199,8 +185,7 @@ struct HighwayBasedInfo
   HighwayBasedInfo(HighwayBasedSpeeds const & speeds, HighwayBasedFactors const & factors)
     : m_speeds(speeds)
     , m_factors(factors)
-  {
-  }
+  {}
 
   HighwayBasedSpeeds m_speeds;
   HighwayBasedFactors const & m_factors;
@@ -253,8 +238,7 @@ public:
   virtual std::shared_ptr<VehicleModelInterface> GetVehicleModel() const = 0;
 
   /// @return The most optimal vehicle model for specified country
-  virtual std::shared_ptr<VehicleModelInterface> GetVehicleModelForCountry(
-      std::string const & country) const = 0;
+  virtual std::shared_ptr<VehicleModelInterface> GetVehicleModelForCountry(std::string const & country) const = 0;
 };
 
 class VehicleModel : public VehicleModelInterface
@@ -263,7 +247,7 @@ public:
   struct FeatureTypeLimits
   {
     HighwayType m_type;
-    bool m_isPassThroughAllowed;      // pass through this road type is allowed
+    bool m_isPassThroughAllowed;  // pass through this road type is allowed
   };
 
   struct FeatureTypeSurface
@@ -301,16 +285,16 @@ public:
   /// @}
 
   // Made public to have simple access from unit tests.
+
 public:
   /// @returns true if |m_highwayTypes| or |m_addRoadTypes| contains |type| and false otherwise.
   bool IsRoadType(uint32_t type) const;
-  template <class TList> bool HasRoadType(TList const & types) const
+  template <class TList>
+  bool HasRoadType(TList const & types) const
   {
     for (uint32_t t : types)
-    {
       if (IsRoadType(t))
         return true;
-    }
     return false;
   }
 
@@ -337,8 +321,7 @@ protected:
 private:
   std::optional<HighwayType> GetHighwayType(uint32_t type) const;
   void GetSurfaceFactor(uint32_t type, SpeedFactor & factor) const;
-  void GetAdditionalRoadSpeed(uint32_t type, bool isCityRoad,
-                              std::optional<SpeedKMpH> & speed) const;
+  void GetAdditionalRoadSpeed(uint32_t type, bool isCityRoad, std::optional<SpeedKMpH> & speed) const;
 
   // HW type -> speed and factor.
   HighwayBasedInfo m_highwayBasedInfo;
@@ -366,8 +349,7 @@ public:
 
   std::shared_ptr<VehicleModelInterface> GetVehicleModel() const override;
 
-  std::shared_ptr<VehicleModelInterface> GetVehicleModelForCountry(
-      std::string const & country) const override;
+  std::shared_ptr<VehicleModelInterface> GetVehicleModelForCountry(std::string const & country) const override;
 
 protected:
   explicit VehicleModelFactory(CountryParentNameGetterFn const & countryParentNameGetterFn);
diff --git a/libs/search/algos.hpp b/libs/search/algos.hpp
index a4cb535d3..d179fd2d0 100644
--- a/libs/search/algos.hpp
+++ b/libs/search/algos.hpp
@@ -10,71 +10,71 @@ namespace search
 {
 namespace impl
 {
-  struct LS
+struct LS
+{
+  size_t prevDecreasePos, decreaseValue;
+  size_t prevIncreasePos, increaseValue;
+
+  LS(size_t i)
   {
-    size_t prevDecreasePos, decreaseValue;
-    size_t prevIncreasePos, increaseValue;
+    prevDecreasePos = i;
+    decreaseValue = 1;
+    prevIncreasePos = i;
+    increaseValue = 1;
+  }
+};
+}  // namespace impl
 
-    LS(size_t i)
-    {
-      prevDecreasePos = i;
-      decreaseValue = 1;
-      prevIncreasePos = i;
-      increaseValue = 1;
-    }
-  };
-  }  // namespace impl
+template <typename T, typename OutIter, typename Comp>
+void LongestSubsequence(std::vector<T> const & in, OutIter out, Comp cmp)
+{
+  if (in.empty())
+    return;
 
-  template <typename T, typename OutIter, typename Comp>
-  void LongestSubsequence(std::vector<T> const & in, OutIter out, Comp cmp)
+  std::vector<impl::LS> v;
+  v.reserve(in.size());
+  for (size_t i = 0; i < in.size(); ++i)
+    v.push_back(impl::LS(i));
+
+  size_t res = 1;
+  size_t pos = 0;
+  for (size_t i = 0; i < v.size(); ++i)
   {
-    if (in.empty())
-      return;
-
-    std::vector<impl::LS> v;
-    v.reserve(in.size());
-    for (size_t i = 0; i < in.size(); ++i)
-      v.push_back(impl::LS(i));
-
-    size_t res = 1;
-    size_t pos = 0;
-    for (size_t i = 0; i < v.size(); ++i)
+    for (size_t j = i + 1; j < v.size(); ++j)
     {
-      for (size_t j = i + 1; j < v.size(); ++j)
+      if (cmp.Less(in[i], in[j]) && v[i].increaseValue + 1 >= v[j].increaseValue)
       {
-        if (cmp.Less(in[i], in[j]) && v[i].increaseValue + 1 >= v[j].increaseValue)
-        {
-          v[j].increaseValue = v[i].increaseValue + 1;
-          v[j].prevIncreasePos = i;
-        }
+        v[j].increaseValue = v[i].increaseValue + 1;
+        v[j].prevIncreasePos = i;
+      }
 
-        if (cmp.Greater(in[i], in[j]) && v[i].decreaseValue + 1 >= v[j].decreaseValue)
-        {
-          v[j].decreaseValue = v[i].decreaseValue + 1;
-          v[j].prevDecreasePos = i;
-        }
+      if (cmp.Greater(in[i], in[j]) && v[i].decreaseValue + 1 >= v[j].decreaseValue)
+      {
+        v[j].decreaseValue = v[i].decreaseValue + 1;
+        v[j].prevDecreasePos = i;
+      }
 
-        size_t const m = std::max(v[j].increaseValue, v[j].decreaseValue);
-        if (m > res)
-        {
-          res = m;
-          pos = j;
-        }
+      size_t const m = std::max(v[j].increaseValue, v[j].decreaseValue);
+      if (m > res)
+      {
+        res = m;
+        pos = j;
       }
     }
+  }
 
-    bool increasing = true;
-    if (v[pos].increaseValue < v[pos].decreaseValue)
-      increasing = false;
+  bool increasing = true;
+  if (v[pos].increaseValue < v[pos].decreaseValue)
+    increasing = false;
 
-    while (res-- > 0)
-    {
-      *out++ = in[pos];
+  while (res-- > 0)
+  {
+    *out++ = in[pos];
 
-      if (increasing)
-        pos = v[pos].prevIncreasePos;
-      else
-        pos = v[pos].prevDecreasePos;
-    }
+    if (increasing)
+      pos = v[pos].prevIncreasePos;
+    else
+      pos = v[pos].prevDecreasePos;
+  }
 }
 }  // namespace search
diff --git a/libs/search/approximate_string_match.hpp b/libs/search/approximate_string_match.hpp
index 6f9d46c4a..fafb10bea 100644
--- a/libs/search/approximate_string_match.hpp
+++ b/libs/search/approximate_string_match.hpp
@@ -20,10 +20,7 @@ struct MatchCostData
   MatchCostData() : m_A(0), m_B(0), m_Cost(0) {}
   MatchCostData(uint32_t a, uint32_t b, uint32_t cost) : m_A(a), m_B(b), m_Cost(cost) {}
 
-  bool operator < (MatchCostData const & o) const
-  {
-    return m_Cost > o.m_Cost;
-  }
+  bool operator<(MatchCostData const & o) const { return m_Cost > o.m_Cost; }
 };
 
 template <typename PriorityQueue>
@@ -47,8 +44,8 @@ public:
 };
 
 template <typename Char, typename CostFn>
-uint32_t StringMatchCost(Char const * sA, size_t sizeA, Char const * sB, size_t sizeB,
-                         CostFn const & costF, uint32_t maxCost, bool bPrefixMatch = false)
+uint32_t StringMatchCost(Char const * sA, size_t sizeA, Char const * sB, size_t sizeB, CostFn const & costF,
+                         uint32_t maxCost, bool bPrefixMatch = false)
 {
   std::priority_queue<impl::MatchCostData, buffer_vector<impl::MatchCostData, 256>> q;
   q.push(impl::MatchCostData(0, 0, 0));
diff --git a/libs/search/base/mem_search_index.hpp b/libs/search/base/mem_search_index.hpp
index 6815c8de3..481a57703 100644
--- a/libs/search/base/mem_search_index.hpp
+++ b/libs/search/base/mem_search_index.hpp
@@ -43,9 +43,8 @@ public:
 
   std::vector<Id> GetAllIds() const
   {
-    return WithIds([&](std::vector<Id> & ids) {
-      m_trie.ForEachInTrie([&](Token const & /* token */, Id const & id) { ids.push_back(id); });
-    });
+    return WithIds([&](std::vector<Id> & ids)
+    { m_trie.ForEachInTrie([&](Token const & /* token */, Id const & id) { ids.push_back(id); }); });
   }
 
   size_t GetNumDocs(int8_t lang, strings::UniString const & token, bool prefix) const
@@ -59,11 +58,10 @@ public:
       return numDocs;
     }
 
-    return WithIds([&](std::vector<Id> & ids) {
-             m_trie.ForEachInSubtree(
-                 key, [&](Token const & /* token */, Id const & id) { ids.push_back(id); });
-           })
-        .size();
+    return WithIds([&](std::vector<Id> & ids)
+    {
+      m_trie.ForEachInSubtree(key, [&](Token const & /* token */, Id const & id) { ids.push_back(id); });
+    }).size();
   }
 
 private:
@@ -78,7 +76,8 @@ private:
   template <typename Doc, typename Fn>
   void ForEachToken(Id const & /*id*/, Doc const & doc, Fn && fn)
   {
-    doc.ForEachToken([&](int8_t lang, Token const & token) {
+    doc.ForEachToken([&](int8_t lang, Token const & token)
+    {
       if (lang >= 0)
         fn(AddLang(lang, token));
     });
diff --git a/libs/search/base/text_index/mem.hpp b/libs/search/base/text_index/mem.hpp
index 0ea0e4153..4afe00409 100644
--- a/libs/search/base/text_index/mem.hpp
+++ b/libs/search/base/text_index/mem.hpp
@@ -85,9 +85,9 @@ private:
   {
   public:
     explicit MemPostingsFetcher(std::map<Token, std::vector<Posting>> const & postingsByToken)
-      : m_postingsByToken(postingsByToken), m_it(m_postingsByToken.begin())
-    {
-    }
+      : m_postingsByToken(postingsByToken)
+      , m_it(m_postingsByToken.begin())
+    {}
 
     // PostingsFetcher overrides:
     bool IsValid() const override { return m_it != m_postingsByToken.end(); }
diff --git a/libs/search/base/text_index/merger.cpp b/libs/search/base/text_index/merger.cpp
index b2e26b4d3..0b6fbf048 100644
--- a/libs/search/base/text_index/merger.cpp
+++ b/libs/search/base/text_index/merger.cpp
@@ -29,7 +29,9 @@ class MergedPostingsListFetcher : public PostingsFetcher
 public:
   MergedPostingsListFetcher(TextIndexDictionary const & dict, TextIndexReader const & index1,
                             TextIndexReader const & index2)
-    : m_dict(dict), m_index1(index1), m_index2(index2)
+    : m_dict(dict)
+    , m_index1(index1)
+    , m_index2(index2)
   {
     ReadPostings();
   }
@@ -82,8 +84,7 @@ private:
   vector<uint32_t> m_postings;
 };
 
-TextIndexDictionary MergeDictionaries(TextIndexDictionary const & dict1,
-                                      TextIndexDictionary const & dict2)
+TextIndexDictionary MergeDictionaries(TextIndexDictionary const & dict1, TextIndexDictionary const & dict2)
 {
   vector<Token> commonTokens;
   auto const & ts1 = dict1.GetTokens();
@@ -101,11 +102,9 @@ TextIndexDictionary MergeDictionaries(TextIndexDictionary const & dict1,
 namespace search_base
 {
 // static
-void TextIndexMerger::Merge(TextIndexReader const & index1, TextIndexReader const & index2,
-                            FileWriter & sink)
+void TextIndexMerger::Merge(TextIndexReader const & index1, TextIndexReader const & index2, FileWriter & sink)
 {
-  TextIndexDictionary const dict =
-      MergeDictionaries(index1.GetDictionary(), index2.GetDictionary());
+  TextIndexDictionary const dict = MergeDictionaries(index1.GetDictionary(), index2.GetDictionary());
 
   TextIndexHeader header;
 
diff --git a/libs/search/base/text_index/merger.hpp b/libs/search/base/text_index/merger.hpp
index 1db47743d..50153c902 100644
--- a/libs/search/base/text_index/merger.hpp
+++ b/libs/search/base/text_index/merger.hpp
@@ -21,7 +21,6 @@ public:
   //
   // Note that the dictionary and offsets are kept in memory during the whole
   // merging process.
-  static void Merge(TextIndexReader const & index1, TextIndexReader const & index2,
-                    FileWriter & sink);
+  static void Merge(TextIndexReader const & index1, TextIndexReader const & index2, FileWriter & sink);
 };
 }  // namespace search_base
diff --git a/libs/search/base/text_index/postings.hpp b/libs/search/base/text_index/postings.hpp
index 4fd06d655..43e746cf3 100644
--- a/libs/search/base/text_index/postings.hpp
+++ b/libs/search/base/text_index/postings.hpp
@@ -44,8 +44,7 @@ public:
 // |startPos| marks the start of the entire text index and is needed to compute
 // the offsets that are stored in |header|.
 template <typename Sink>
-void WritePostings(Sink & sink, uint64_t startPos, TextIndexHeader & header,
-                   PostingsFetcher & fetcher)
+void WritePostings(Sink & sink, uint64_t startPos, TextIndexHeader & header, PostingsFetcher & fetcher)
 {
   header.m_postingsStartsOffset = RelativePos(sink, startPos);
   // An uint32_t for each 32-bit offset and an uint32_t for the dummy entry at the end.
@@ -58,7 +57,8 @@ void WritePostings(Sink & sink, uint64_t startPos, TextIndexHeader & header,
   {
     uint32_t last;
     // todo(@m) s/uint32_t/Posting/ ?
-    auto writePostings = [&](uint32_t p) {
+    auto writePostings = [&](uint32_t p)
+    {
       CHECK(last == 0 || last < p, (last, p));
       uint32_t const delta = p - last;
       WriteVarUint(sink, delta);
diff --git a/libs/search/base/text_index/reader.hpp b/libs/search/base/text_index/reader.hpp
index f6e1d65e8..d0e5d6870 100644
--- a/libs/search/base/text_index/reader.hpp
+++ b/libs/search/base/text_index/reader.hpp
@@ -50,8 +50,8 @@ public:
       return;
     CHECK_LESS(tokenId + 1, m_postingsStarts.size(), ());
 
-    ReaderSource<FileReader> source(m_fileReader.SubReader(
-        m_postingsStarts[tokenId], m_postingsStarts[tokenId + 1] - m_postingsStarts[tokenId]));
+    ReaderSource<FileReader> source(
+        m_fileReader.SubReader(m_postingsStarts[tokenId], m_postingsStarts[tokenId + 1] - m_postingsStarts[tokenId]));
 
     uint32_t last = 0;
     while (source.Size() > 0)
diff --git a/libs/search/base/text_index/text_index.cpp b/libs/search/base/text_index/text_index.cpp
index de8d307d9..d42e66f1c 100644
--- a/libs/search/base/text_index/text_index.cpp
+++ b/libs/search/base/text_index/text_index.cpp
@@ -13,9 +13,8 @@ string DebugPrint(TextIndexVersion const & version)
   {
   case TextIndexVersion::V0: return "V0";
   }
-  string ret =
-      "Unknown TextIndexHeader version: " + strings::to_string(static_cast<uint8_t>(version));
+  string ret = "Unknown TextIndexHeader version: " + strings::to_string(static_cast<uint8_t>(version));
   ASSERT(false, (ret));
   return ret;
 }
-}  // namespace search
+}  // namespace search_base
diff --git a/libs/search/bookmarks/data.hpp b/libs/search/bookmarks/data.hpp
index 5cbc2cd0a..b109975e3 100644
--- a/libs/search/bookmarks/data.hpp
+++ b/libs/search/bookmarks/data.hpp
@@ -25,13 +25,13 @@ public:
   Data(kml::BookmarkData const & bookmarkData, std::string const & locale)
     : m_names(ExtractIndexableNames(bookmarkData, locale))
     , m_description(kml::GetDefaultStr(bookmarkData.m_description))
-  {
-  }
+  {}
 
   template <typename Fn>
   void ForEachNameToken(Fn && fn) const
   {
-    auto withDefaultLang = [&](strings::UniString const & token) {
+    auto withDefaultLang = [&](strings::UniString const & token)
+    {
       // Note that the Default Language here is not the same as in the kml library.
       // Bookmark search by locale is not supported so every name is stored
       // in the default branch of the search trie.
@@ -45,9 +45,7 @@ public:
   template <typename Fn>
   void ForEachDescriptionToken(Fn && fn) const
   {
-    auto withDefaultLang = [&](strings::UniString const & token) {
-      fn(StringUtf8Multilang::kDefaultCode, token);
-    };
+    auto withDefaultLang = [&](strings::UniString const & token) { fn(StringUtf8Multilang::kDefaultCode, token); };
 
     ForEachNormalizedToken(m_description, withDefaultLang);
   }
@@ -56,8 +54,7 @@ public:
   std::string const & GetDescription() const { return m_description; }
 
 private:
-  std::vector<std::string> ExtractIndexableNames(kml::BookmarkData const & bookmarkData,
-                                                 std::string const & locale)
+  std::vector<std::string> ExtractIndexableNames(kml::BookmarkData const & bookmarkData, std::string const & locale)
   {
     std::vector<std::string> names;
 
diff --git a/libs/search/bookmarks/processor.cpp b/libs/search/bookmarks/processor.cpp
index 601f1d239..1f996a79d 100644
--- a/libs/search/bookmarks/processor.cpp
+++ b/libs/search/bookmarks/processor.cpp
@@ -11,7 +11,6 @@
 
 #include <algorithm>
 
-
 namespace search
 {
 namespace bookmarks
@@ -34,10 +33,7 @@ struct DocVecWrapper
 
 struct RankingInfo
 {
-  bool operator<(RankingInfo const & rhs) const
-  {
-    return m_cosineSimilarity > rhs.m_cosineSimilarity;
-  }
+  bool operator<(RankingInfo const & rhs) const { return m_cosineSimilarity > rhs.m_cosineSimilarity; }
 
   bool operator>(RankingInfo const & rhs) const { return rhs < *this; }
 
@@ -69,9 +65,9 @@ void FillRankingInfo(QueryVec & qv, IdfMap & idfs, DocVec const & dv, RankingInf
 }  // namespace
 
 Processor::Processor(Emitter & emitter, base::Cancellable const & cancellable)
-  : m_emitter(emitter), m_cancellable(cancellable)
-{
-}
+  : m_emitter(emitter)
+  , m_cancellable(cancellable)
+{}
 
 void Processor::Reset()
 {
@@ -83,7 +79,10 @@ void Processor::Reset()
   m_bookmarksInGroup.clear();
 }
 
-void Processor::EnableIndexingOfDescriptions(bool enable) { m_indexDescriptions = enable; }
+void Processor::EnableIndexingOfDescriptions(bool enable)
+{
+  m_indexDescriptions = enable;
+}
 
 void Processor::EnableIndexingOfBookmarkGroup(GroupId const & groupId, bool enable)
 {
@@ -98,12 +97,10 @@ void Processor::EnableIndexingOfBookmarkGroup(GroupId const & groupId, bool enab
     return;
 
   for (auto const & id : m_bookmarksInGroup[groupId])
-  {
     if (nowIndexable)
       AddToIndex(id);
     else
       EraseFromIndex(id);
-  }
 }
 
 void Processor::Add(Id const & id, Doc const & doc)
@@ -111,14 +108,10 @@ void Processor::Add(Id const & id, Doc const & doc)
   ASSERT_EQUAL(m_docs.count(id), 0, ());
 
   DocVec::Builder builder;
-  doc.ForEachNameToken(
-      [&](int8_t /* lang */, strings::UniString const & token) { builder.Add(token); });
+  doc.ForEachNameToken([&](int8_t /* lang */, strings::UniString const & token) { builder.Add(token); });
 
   if (m_indexDescriptions)
-  {
-    doc.ForEachDescriptionToken(
-        [&](int8_t /* lang */, strings::UniString const & token) { builder.Add(token); });
-  }
+    doc.ForEachDescriptionToken([&](int8_t /* lang */, strings::UniString const & token) { builder.Add(token); });
 
   DocVec const docVec(builder);
 
@@ -172,10 +165,7 @@ void Processor::AttachToGroup(Id const & id, GroupId const & group)
 {
   auto const it = m_idToGroup.find(id);
   if (it != m_idToGroup.end())
-  {
-    LOG(LWARNING, ("Tried to attach bookmark", id, "to group", group,
-                   "but it already belongs to group", it->second));
-  }
+    LOG(LWARNING, ("Tried to attach bookmark", id, "to group", group, "but it already belongs to group", it->second));
 
   m_idToGroup[id] = group;
   m_bookmarksInGroup[group].insert(id);
@@ -188,15 +178,13 @@ void Processor::DetachFromGroup(Id const & id, GroupId const & group)
   auto const it = m_idToGroup.find(id);
   if (it == m_idToGroup.end())
   {
-    LOG(LWARNING, ("Tried to detach bookmark", id, "from group", group,
-                   "but it does not belong to any group"));
+    LOG(LWARNING, ("Tried to detach bookmark", id, "from group", group, "but it does not belong to any group"));
     return;
   }
 
   if (it->second != group)
   {
-    LOG(LWARNING, ("Tried to detach bookmark", id, "from group", group,
-                   "but it only belongs to group", it->second));
+    LOG(LWARNING, ("Tried to detach bookmark", id, "from group", group, "but it only belongs to group", it->second));
     return;
   }
 
@@ -266,12 +254,14 @@ void Processor::Search(Params const & params) const
   }
 }
 
-void Processor::Finish(bool cancelled) { m_emitter.Finish(cancelled); }
+void Processor::Finish(bool cancelled)
+{
+  m_emitter.Finish(cancelled);
+}
 
 uint64_t Processor::GetNumDocs(strings::UniString const & token, bool isPrefix) const
 {
-  return base::asserted_cast<uint64_t>(
-      m_index.GetNumDocs(StringUtf8Multilang::kDefaultCode, token, isPrefix));
+  return base::asserted_cast<uint64_t>(m_index.GetNumDocs(StringUtf8Multilang::kDefaultCode, token, isPrefix));
 }
 
 QueryVec Processor::GetQueryVec(IdfMap & idfs, QueryParams const & params) const
diff --git a/libs/search/bookmarks/processor.hpp b/libs/search/bookmarks/processor.hpp
index 828dc2e33..940182a49 100644
--- a/libs/search/bookmarks/processor.hpp
+++ b/libs/search/bookmarks/processor.hpp
@@ -13,7 +13,6 @@
 #include <unordered_map>
 #include <unordered_set>
 
-
 namespace base
 {
 class Cancellable;
@@ -81,9 +80,8 @@ private:
     FillRequestFromToken(token, request);
     request.m_langs.insert(StringUtf8Multilang::kDefaultCode);
 
-    MatchFeaturesInTrie(
-        request, m_index.GetRootIterator(), [](Id const & /* id */) { return true; } /* filter */,
-        std::forward<Fn>(fn));
+    MatchFeaturesInTrie(request, m_index.GetRootIterator(), [](Id const & /* id */) { return true; } /* filter */,
+                        std::forward<Fn>(fn));
   }
 
   QueryVec GetQueryVec(IdfMap & idfs, QueryParams const & params) const;
diff --git a/libs/search/categories_cache.cpp b/libs/search/categories_cache.cpp
index 9815bd3c2..a2cd45f56 100644
--- a/libs/search/categories_cache.cpp
+++ b/libs/search/categories_cache.cpp
@@ -7,7 +7,6 @@
 #include "indexer/ftypes_matcher.hpp"
 #include "indexer/search_string_utils.hpp"
 
-
 namespace search
 {
 using namespace std;
@@ -37,9 +36,7 @@ CBV CategoriesCache::Load(MwmContext const & context) const
   m_categories.ForEach([&request, &c](uint32_t const type)
   {
     c.ForEachInSubtree([&](uint32_t descendantType)
-    {
-      request.m_categories.emplace_back(FeatureTypeToString(c.GetIndexForType(descendantType)));
-    }, type);
+    { request.m_categories.emplace_back(FeatureTypeToString(c.GetIndexForType(descendantType))); }, type);
   });
 
   Retrieval retrieval(context, m_cancellable);
@@ -49,47 +46,39 @@ CBV CategoriesCache::Load(MwmContext const & context) const
 // StreetsCache ------------------------------------------------------------------------------------
 StreetsCache::StreetsCache(base::Cancellable const & cancellable)
   : CategoriesCache(ftypes::IsStreetOrSquareChecker::Instance(), cancellable)
-{
-}
+{}
 
 // SuburbsCache ------------------------------------------------------------------------------------
 SuburbsCache::SuburbsCache(base::Cancellable const & cancellable)
   : CategoriesCache(ftypes::IsSuburbChecker::Instance(), cancellable)
-{
-}
+{}
 // VillagesCache -----------------------------------------------------------------------------------
 VillagesCache::VillagesCache(base::Cancellable const & cancellable)
   : CategoriesCache(ftypes::IsVillageChecker::Instance(), cancellable)
-{
-}
+{}
 
 // CountriesCache ----------------------------------------------------------------------------------
 CountriesCache::CountriesCache(base::Cancellable const & cancellable)
   : CategoriesCache(ftypes::IsCountryChecker::Instance(), cancellable)
-{
-}
+{}
 
 // StatesCache -------------------------------------------------------------------------------------
 StatesCache::StatesCache(base::Cancellable const & cancellable)
   : CategoriesCache(ftypes::IsStateChecker::Instance(), cancellable)
-{
-}
+{}
 
 // CitiesTownsOrVillagesCache ----------------------------------------------------------------------
 CitiesTownsOrVillagesCache::CitiesTownsOrVillagesCache(base::Cancellable const & cancellable)
   : CategoriesCache(ftypes::IsCityTownOrVillageChecker::Instance(), cancellable)
-{
-}
+{}
 
 // HotelsCache -------------------------------------------------------------------------------------
 HotelsCache::HotelsCache(base::Cancellable const & cancellable)
   : CategoriesCache(ftypes::IsHotelChecker::Instance(), cancellable)
-{
-}
+{}
 
 // FoodCache ---------------------------------------------------------------------------------------
 FoodCache::FoodCache(base::Cancellable const & cancellable)
   : CategoriesCache(ftypes::IsEatChecker::Instance(), cancellable)
-{
-}
+{}
 }  // namespace search
diff --git a/libs/search/categories_cache.hpp b/libs/search/categories_cache.hpp
index fa2b5745f..633a94dfb 100644
--- a/libs/search/categories_cache.hpp
+++ b/libs/search/categories_cache.hpp
@@ -18,8 +18,7 @@ class CategoriesCache
 {
 public:
   template <typename TypesSource>
-  CategoriesCache(TypesSource const & source, base::Cancellable const & cancellable)
-    : m_cancellable(cancellable)
+  CategoriesCache(TypesSource const & source, base::Cancellable const & cancellable) : m_cancellable(cancellable)
   {
     source.ForEachType([this](uint32_t type) { m_categories.Add(type); });
   }
diff --git a/libs/search/cbv.cpp b/libs/search/cbv.cpp
index ccd394bbc..8a36c0c0b 100644
--- a/libs/search/cbv.cpp
+++ b/libs/search/cbv.cpp
@@ -21,7 +21,10 @@ CBV const & CBV::GetFull()
 
 CBV::CBV(unique_ptr<coding::CompressedBitVector> p) : m_p(std::move(p)) {}
 
-CBV::CBV(CBV && cbv) : m_p(std::move(cbv.m_p)), m_isFull(cbv.m_isFull) { cbv.m_isFull = false; }
+CBV::CBV(CBV && cbv) : m_p(std::move(cbv.m_p)), m_isFull(cbv.m_isFull)
+{
+  cbv.m_isFull = false;
+}
 
 CBV::CBV(bool full) : m_isFull(full) {}
 
diff --git a/libs/search/cities_boundaries_table.cpp b/libs/search/cities_boundaries_table.cpp
index 1351e75f4..8102e3496 100644
--- a/libs/search/cities_boundaries_table.cpp
+++ b/libs/search/cities_boundaries_table.cpp
@@ -26,8 +26,7 @@ using namespace std;
 // CitiesBoundariesTable::Boundaries ---------------------------------------------------------------
 bool CitiesBoundariesTable::Boundaries::HasPoint(m2::PointD const & p) const
 {
-  return any_of(m_boundaries.begin(), m_boundaries.end(),
-                [&](CityBoundary const & b) { return b.HasPoint(p, m_eps); });
+  return any_of(m_boundaries.begin(), m_boundaries.end(), [&](CityBoundary const & b) { return b.HasPoint(p, m_eps); });
 }
 
 std::string DebugPrint(CitiesBoundariesTable::Boundaries const & boundaries)
diff --git a/libs/search/cities_boundaries_table.hpp b/libs/search/cities_boundaries_table.hpp
index bd8d0f370..9ac9f441b 100644
--- a/libs/search/cities_boundaries_table.hpp
+++ b/libs/search/cities_boundaries_table.hpp
@@ -16,8 +16,7 @@ namespace search
 {
 class CitiesBoundariesTable
 {
-  friend void GetCityBoundariesInRectForTesting(CitiesBoundariesTable const &,
-                                                m2::RectD const & rect,
+  friend void GetCityBoundariesInRectForTesting(CitiesBoundariesTable const &, m2::RectD const & rect,
                                                 std::vector<uint32_t> & featureIds);
 
 public:
@@ -26,10 +25,8 @@ public:
   public:
     Boundaries() = default;
 
-    Boundaries(std::vector<indexer::CityBoundary> const & boundaries, double eps)
-      : m_boundaries(boundaries), m_eps(eps)
-    {
-    }
+    Boundaries(std::vector<indexer::CityBoundary> const & boundaries, double eps) : m_boundaries(boundaries), m_eps(eps)
+    {}
 
     // Returns true iff |p| is inside any of the regions bounded by
     // |*this|.
@@ -48,7 +45,8 @@ public:
 
     size_t GetCount() const { return m_boundaries.size(); }
 
-    template <class FnT> void ForEachBoundary(FnT && fn) const
+    template <class FnT>
+    void ForEachBoundary(FnT && fn) const
     {
       for (size_t i = 0; i < m_boundaries.size(); ++i)
         fn(m_boundaries[i], i);
diff --git a/libs/search/city_finder.cpp b/libs/search/city_finder.cpp
index aa26cac34..4610221a8 100644
--- a/libs/search/city_finder.cpp
+++ b/libs/search/city_finder.cpp
@@ -10,16 +10,12 @@ CityFinder::CityFinder(DataSource const & dataSource)
   : m_unusedBoundaries(dataSource)
   , m_unusedCache(m_cancellable)
   , m_finder(dataSource, m_unusedBoundaries, m_unusedCache)
-{
-}
+{}
 
 string CityFinder::GetCityName(m2::PointD const & p, int8_t lang)
 {
   string_view city;
-  m_finder.GetLocality(p, [&](LocalityItem const & item)
-  {
-    item.GetSpecifiedOrDefaultName(lang, city);
-  });
+  m_finder.GetLocality(p, [&](LocalityItem const & item) { item.GetSpecifiedOrDefaultName(lang, city); });
 
   // Return string, because m_finder.GetLocality() is not persistent.
   return std::string(city);
diff --git a/libs/search/cuisine_filter.cpp b/libs/search/cuisine_filter.cpp
index dbcfe0e27..ad529732f 100644
--- a/libs/search/cuisine_filter.cpp
+++ b/libs/search/cuisine_filter.cpp
@@ -22,16 +22,18 @@ namespace cuisine_filter
 Description::Description(FeatureType & ft)
 {
   m_types.clear();
-  ft.ForEachType([this](uint32_t t) {
+  ft.ForEachType([this](uint32_t t)
+  {
     if (ftypes::IsCuisineChecker::Instance()(t))
       m_types.push_back(t);
   });
 }
 
-CuisineFilter::ScopedFilter::ScopedFilter(MwmSet::MwmId const & mwmId,
-                                          Descriptions const & descriptions,
+CuisineFilter::ScopedFilter::ScopedFilter(MwmSet::MwmId const & mwmId, Descriptions const & descriptions,
                                           vector<uint32_t> const & types)
-  : m_mwmId(mwmId), m_descriptions(descriptions), m_types(types)
+  : m_mwmId(mwmId)
+  , m_descriptions(descriptions)
+  , m_types(types)
 {
   sort(m_types.begin(), m_types.end());
 }
@@ -41,34 +43,33 @@ bool CuisineFilter::ScopedFilter::Matches(FeatureID const & fid) const
   if (fid.m_mwmId != m_mwmId)
     return false;
 
-  auto it = lower_bound(
-      m_descriptions.begin(), m_descriptions.end(), make_pair(fid.m_index, Description{}),
-      [](pair<uint32_t, Description> const & lhs, pair<uint32_t, Description> const & rhs) {
-        return lhs.first < rhs.first;
-      });
+  auto it = lower_bound(m_descriptions.begin(), m_descriptions.end(), make_pair(fid.m_index, Description{}),
+                        [](pair<uint32_t, Description> const & lhs, pair<uint32_t, Description> const & rhs)
+  { return lhs.first < rhs.first; });
   if (it == m_descriptions.end() || it->first != fid.m_index)
     return false;
 
   for (auto const t : it->second.m_types)
-  {
     if (binary_search(m_types.begin(), m_types.end(), t))
       return true;
-  }
   return false;
 }
 
 // CuisineFilter ------------------------------------------------------------------------------------
 CuisineFilter::CuisineFilter(FoodCache & food) : m_food(food) {}
 
-unique_ptr<CuisineFilter::ScopedFilter> CuisineFilter::MakeScopedFilter(
-    MwmContext const & context, vector<uint32_t> const & types)
+unique_ptr<CuisineFilter::ScopedFilter> CuisineFilter::MakeScopedFilter(MwmContext const & context,
+                                                                        vector<uint32_t> const & types)
 {
   if (types.empty())
     return {};
   return make_unique<ScopedFilter>(context.GetId(), GetDescriptions(context), types);
 }
 
-void CuisineFilter::ClearCaches() { m_descriptions.clear(); }
+void CuisineFilter::ClearCaches()
+{
+  m_descriptions.clear();
+}
 
 CuisineFilter::Descriptions const & CuisineFilter::GetDescriptions(MwmContext const & context)
 {
@@ -82,7 +83,8 @@ CuisineFilter::Descriptions const & CuisineFilter::GetDescriptions(MwmContext co
 
   auto const food = m_food.Get(context);
   auto & descriptions = m_descriptions[mwmId];
-  food.ForEach([&descriptions, &context](uint64_t bit) {
+  food.ForEach([&descriptions, &context](uint64_t bit)
+  {
     auto const id = base::asserted_cast<uint32_t>(bit);
     auto ft = context.GetFeature(id);
     if (ft)
diff --git a/libs/search/cuisine_filter.hpp b/libs/search/cuisine_filter.hpp
index c0a6ca04e..937f19315 100644
--- a/libs/search/cuisine_filter.hpp
+++ b/libs/search/cuisine_filter.hpp
@@ -32,8 +32,7 @@ public:
   class ScopedFilter
   {
   public:
-    ScopedFilter(MwmSet::MwmId const & mwmId, Descriptions const & descriptions,
-                 std::vector<uint32_t> const & types);
+    ScopedFilter(MwmSet::MwmId const & mwmId, Descriptions const & descriptions, std::vector<uint32_t> const & types);
 
     bool Matches(FeatureID const & fid) const;
 
@@ -45,8 +44,7 @@ public:
 
   CuisineFilter(FoodCache & food);
 
-  std::unique_ptr<ScopedFilter> MakeScopedFilter(MwmContext const & context,
-                                                 std::vector<uint32_t> const & types);
+  std::unique_ptr<ScopedFilter> MakeScopedFilter(MwmContext const & context, std::vector<uint32_t> const & types);
 
   void ClearCaches();
 
diff --git a/libs/search/displayed_categories.cpp b/libs/search/displayed_categories.cpp
index a03c1f10b..70f20317d 100644
--- a/libs/search/displayed_categories.cpp
+++ b/libs/search/displayed_categories.cpp
@@ -8,29 +8,12 @@ namespace search
 {
 DisplayedCategories::DisplayedCategories(CategoriesHolder const & holder) : m_holder(holder)
 {
-  m_keys = {"category_eat",
-            "category_hotel",
-            "category_food",
-            "category_tourism",
-            "category_wifi",
-            "category_transport",
-            "category_fuel",
-            "category_parking",
-            "category_shopping",
-            "category_secondhand",
-            "category_atm",
-            "category_nightlife",
-            "category_children",
-            "category_bank",
-            "category_entertainment",
-            "category_water",
-            "category_hospital",
-            "category_pharmacy",
-            "category_recycling",
-            "category_rv",
-            "category_police",
-            "category_toilet",
-            "category_post"};
+  m_keys = {"category_eat",      "category_hotel",      "category_food",          "category_tourism",
+            "category_wifi",     "category_transport",  "category_fuel",          "category_parking",
+            "category_shopping", "category_secondhand", "category_atm",           "category_nightlife",
+            "category_children", "category_bank",       "category_entertainment", "category_water",
+            "category_hospital", "category_pharmacy",   "category_recycling",     "category_rv",
+            "category_police",   "category_toilet",     "category_post"};
 }
 
 void DisplayedCategories::Modify(CategoriesModifier & modifier)
@@ -38,5 +21,8 @@ void DisplayedCategories::Modify(CategoriesModifier & modifier)
   modifier.Modify(m_keys);
 }
 
-std::vector<std::string> const & DisplayedCategories::GetKeys() const { return m_keys; }
+std::vector<std::string> const & DisplayedCategories::GetKeys() const
+{
+  return m_keys;
+}
 }  // namespace search
diff --git a/libs/search/displayed_categories.hpp b/libs/search/displayed_categories.hpp
index 7fd55ad92..c6a3f46c5 100644
--- a/libs/search/displayed_categories.hpp
+++ b/libs/search/displayed_categories.hpp
@@ -42,7 +42,7 @@ public:
     return CategoriesHolder::MapLocaleToInteger(locale) != CategoriesHolder::kUnsupportedLocaleCode;
   }
 
- private:
+private:
   CategoriesHolder const & m_holder;
   Keys m_keys;
 };
diff --git a/libs/search/doc_vec.cpp b/libs/search/doc_vec.cpp
index 96ba289a8..49f1bfeb0 100644
--- a/libs/search/doc_vec.cpp
+++ b/libs/search/doc_vec.cpp
@@ -15,15 +15,16 @@ void SortAndMerge(vector<strings::UniString> tokens, vector<TokenFrequencyPair>
   ASSERT(tfs.empty(), ());
   sort(tokens.begin(), tokens.end());
   for (size_t i = 0; i < tokens.size(); ++i)
-  {
     if (tfs.empty() || tfs.back().m_token != tokens[i])
       tfs.emplace_back(tokens[i], 1 /* frequency */);
     else
       ++tfs.back().m_frequency;
-  }
 }
 
-double GetTfIdf(double tf, double idf) { return tf * idf; }
+double GetTfIdf(double tf, double idf)
+{
+  return tf * idf;
+}
 
 double GetWeightImpl(IdfMap & idfs, TokenFrequencyPair const & tf, bool isPrefix)
 {
@@ -46,15 +47,11 @@ double SqrL2(IdfMap & idfs, vector<TokenFrequencyPair> const & tfs)
 }
 
 // Computes squared L2 norm of vector of tokens + prefix token.
-double SqrL2(IdfMap & idfs, vector<TokenFrequencyPair> const & tfs,
-             optional<strings::UniString> const & prefix)
+double SqrL2(IdfMap & idfs, vector<TokenFrequencyPair> const & tfs, optional<strings::UniString> const & prefix)
 {
   auto result = SqrL2(idfs, tfs);
   if (prefix)
-  {
-    result +=
-        GetSqrWeightImpl(idfs, TokenFrequencyPair(*prefix, 1 /* frequency */), true /* isPrefix */);
-  }
+    result += GetSqrWeightImpl(idfs, TokenFrequencyPair(*prefix, 1 /* frequency */), true /* isPrefix */);
   return result;
 }
 }  // namespace
@@ -81,9 +78,15 @@ string DebugPrint(TokenFrequencyPair const & tf)
 }
 
 // DocVec ------------------------------------------------------------------------------------------
-DocVec::DocVec(Builder const & builder) { SortAndMerge(builder.m_tokens, m_tfs); }
+DocVec::DocVec(Builder const & builder)
+{
+  SortAndMerge(builder.m_tokens, m_tfs);
+}
 
-double DocVec::Norm(IdfMap & idfs) const { return SqrL2(idfs, m_tfs); }
+double DocVec::Norm(IdfMap & idfs) const
+{
+  return SqrL2(idfs, m_tfs);
+}
 
 strings::UniString const & DocVec::GetToken(size_t i) const
 {
@@ -104,8 +107,7 @@ double DocVec::GetWeight(IdfMap & idfs, size_t i) const
 }
 
 // QueryVec ----------------------------------------------------------------------------------------
-QueryVec::QueryVec(IdfMap & idfs, Builder const & builder)
-  : m_idfs(&idfs), m_prefix(builder.m_prefix)
+QueryVec::QueryVec(IdfMap & idfs, Builder const & builder) : m_idfs(&idfs), m_prefix(builder.m_prefix)
 {
   SortAndMerge(builder.m_tokens, m_tfs);
 }
@@ -212,7 +214,10 @@ double QueryVec::Similarity(IdfMap & docIdfs, DocVec const & rhs)
   return max(similarityWithPrefix, similarityNoPrefix);
 }
 
-double QueryVec::Norm() { return SqrL2(*m_idfs, m_tfs, m_prefix); }
+double QueryVec::Norm()
+{
+  return SqrL2(*m_idfs, m_tfs, m_prefix);
+}
 
 double QueryVec::GetFullTokenWeight(size_t i)
 {
@@ -223,7 +228,6 @@ double QueryVec::GetFullTokenWeight(size_t i)
 double QueryVec::GetPrefixTokenWeight()
 {
   ASSERT(m_prefix, ());
-  return GetWeightImpl(*m_idfs, TokenFrequencyPair(*m_prefix, 1 /* frequency */),
-                       true /* isPrefix */);
+  return GetWeightImpl(*m_idfs, TokenFrequencyPair(*m_prefix, 1 /* frequency */), true /* isPrefix */);
 }
 }  // namespace search
diff --git a/libs/search/doc_vec.hpp b/libs/search/doc_vec.hpp
index 85574a40a..541b187de 100644
--- a/libs/search/doc_vec.hpp
+++ b/libs/search/doc_vec.hpp
@@ -23,10 +23,9 @@ struct TokenFrequencyPair
   TokenFrequencyPair() = default;
 
   template <typename Token>
-  TokenFrequencyPair(Token && token, uint64_t frequency)
-    : m_token(std::forward<Token>(token)), m_frequency(frequency)
-  {
-  }
+  TokenFrequencyPair(Token && token, uint64_t frequency) : m_token(std::forward<Token>(token))
+                                                         , m_frequency(frequency)
+  {}
 
   bool operator<(TokenFrequencyPair const & rhs) const;
 
@@ -72,10 +71,7 @@ public:
   bool Empty() const { return m_tfs.empty(); }
 
 private:
-  friend std::string DebugPrint(DocVec const & dv)
-  {
-    return "DocVec " + ::DebugPrint(dv.m_tfs);
-  }
+  friend std::string DebugPrint(DocVec const & dv) { return "DocVec " + ::DebugPrint(dv.m_tfs); }
 
   std::vector<TokenFrequencyPair> m_tfs;
 };
diff --git a/libs/search/downloader_search_callback.cpp b/libs/search/downloader_search_callback.cpp
index 1903a484b..e11847fef 100644
--- a/libs/search/downloader_search_callback.cpp
+++ b/libs/search/downloader_search_callback.cpp
@@ -19,12 +19,10 @@
 namespace
 {
 /// @todo Can't change on string_view now, because of unordered_map<string> synonyms.
-bool GetGroupCountryIdFromFeature(storage::Storage const & storage, FeatureType & ft,
-                                  std::string & name)
+bool GetGroupCountryIdFromFeature(storage::Storage const & storage, FeatureType & ft, std::string & name)
 {
   auto const & synonyms = storage.GetCountryNameSynonyms();
-  int8_t const langIndices[] = {StringUtf8Multilang::kEnglishCode,
-                                StringUtf8Multilang::kDefaultCode,
+  int8_t const langIndices[] = {StringUtf8Multilang::kEnglishCode, StringUtf8Multilang::kDefaultCode,
                                 StringUtf8Multilang::kInternationalCode};
 
   for (auto const langIndex : langIndices)
@@ -49,8 +47,7 @@ bool GetGroupCountryIdFromFeature(storage::Storage const & storage, FeatureType
 
 namespace search
 {
-DownloaderSearchCallback::DownloaderSearchCallback(Delegate & delegate,
-                                                   DataSource const & dataSource,
+DownloaderSearchCallback::DownloaderSearchCallback(Delegate & delegate, DataSource const & dataSource,
                                                    storage::CountryInfoGetter const & infoGetter,
                                                    storage::Storage const & storage,
                                                    storage::DownloaderSearchParams params)
@@ -59,8 +56,7 @@ DownloaderSearchCallback::DownloaderSearchCallback(Delegate & delegate,
   , m_infoGetter(infoGetter)
   , m_storage(storage)
   , m_params(std::move(params))
-{
-}
+{}
 
 void DownloaderSearchCallback::operator()(search::Results const & results)
 {
@@ -90,8 +86,7 @@ void DownloaderSearchCallback::operator()(search::Results const & results)
         std::string groupFeatureName;
         if (GetGroupCountryIdFromFeature(m_storage, *ft, groupFeatureName))
         {
-          storage::DownloaderSearchResult downloaderResult(groupFeatureName,
-                                                           result.GetString() /* m_matchedName */);
+          storage::DownloaderSearchResult downloaderResult(groupFeatureName, result.GetString() /* m_matchedName */);
           if (uniqueResults.find(downloaderResult) == uniqueResults.end())
           {
             uniqueResults.insert(downloaderResult);
@@ -106,8 +101,7 @@ void DownloaderSearchCallback::operator()(search::Results const & results)
     if (countryId == storage::kInvalidCountryId)
       continue;
 
-    storage::DownloaderSearchResult downloaderResult(countryId,
-                                                     result.GetString() /* m_matchedName */);
+    storage::DownloaderSearchResult downloaderResult(countryId, result.GetString() /* m_matchedName */);
     if (uniqueResults.find(downloaderResult) == uniqueResults.end())
     {
       uniqueResults.insert(downloaderResult);
@@ -119,8 +113,6 @@ void DownloaderSearchCallback::operator()(search::Results const & results)
   downloaderSearchResults.m_endMarker = results.IsEndMarker();
 
   m_delegate.RunUITask([onResults = m_params.m_onResults, results = std::move(downloaderSearchResults)]() mutable
-  {
-    onResults(std::move(results));
-  });
+  { onResults(std::move(results)); });
 }
 }  // namespace search
diff --git a/libs/search/downloader_search_callback.hpp b/libs/search/downloader_search_callback.hpp
index 066957849..7446ea463 100644
--- a/libs/search/downloader_search_callback.hpp
+++ b/libs/search/downloader_search_callback.hpp
@@ -31,8 +31,7 @@ public:
   };
 
   DownloaderSearchCallback(Delegate & delegate, DataSource const & dataSource,
-                           storage::CountryInfoGetter const & infoGetter,
-                           storage::Storage const & storage,
+                           storage::CountryInfoGetter const & infoGetter, storage::Storage const & storage,
                            storage::DownloaderSearchParams params);
 
   void operator()(search::Results const & results);
diff --git a/libs/search/dummy_rank_table.cpp b/libs/search/dummy_rank_table.cpp
index 9209df810..820163d49 100644
--- a/libs/search/dummy_rank_table.cpp
+++ b/libs/search/dummy_rank_table.cpp
@@ -4,7 +4,10 @@
 
 namespace search
 {
-uint8_t DummyRankTable::Get(uint64_t /* i */) const { return kNoRank; }
+uint8_t DummyRankTable::Get(uint64_t /* i */) const
+{
+  return kNoRank;
+}
 
 uint64_t DummyRankTable::Size() const
 {
diff --git a/libs/search/editor_delegate.cpp b/libs/search/editor_delegate.cpp
index dc59a8063..fb86969a1 100644
--- a/libs/search/editor_delegate.cpp
+++ b/libs/search/editor_delegate.cpp
@@ -36,8 +36,7 @@ string EditorDelegate::GetOriginalFeatureStreet(FeatureID const & fid) const
   return coder.GetOriginalFeatureStreetName(fid);
 }
 
-void EditorDelegate::ForEachFeatureAtPoint(osm::Editor::FeatureTypeFn && fn,
-                                           m2::PointD const & point) const
+void EditorDelegate::ForEachFeatureAtPoint(osm::Editor::FeatureTypeFn && fn, m2::PointD const & point) const
 {
   auto const kToleranceMeters = 1e-2;
   indexer::ForEachFeatureAtPoint(m_dataSource, std::move(fn), point, kToleranceMeters);
diff --git a/libs/search/editor_delegate.hpp b/libs/search/editor_delegate.hpp
index db832ea22..6596dff3f 100644
--- a/libs/search/editor_delegate.hpp
+++ b/libs/search/editor_delegate.hpp
@@ -18,11 +18,9 @@ public:
 
   // osm::Editor::Delegate overrides:
   MwmSet::MwmId GetMwmIdByMapName(std::string const & name) const override;
-  std::unique_ptr<osm::EditableMapObject> GetOriginalMapObject(
-      FeatureID const & fid) const override;
+  std::unique_ptr<osm::EditableMapObject> GetOriginalMapObject(FeatureID const & fid) const override;
   std::string GetOriginalFeatureStreet(FeatureID const & fid) const override;
-  void ForEachFeatureAtPoint(osm::Editor::FeatureTypeFn && fn,
-                             m2::PointD const & point) const override;
+  void ForEachFeatureAtPoint(osm::Editor::FeatureTypeFn && fn, m2::PointD const & point) const override;
 
 private:
   DataSource const & m_dataSource;
diff --git a/libs/search/emitter.hpp b/libs/search/emitter.hpp
index f22e0841d..709028b4a 100644
--- a/libs/search/emitter.hpp
+++ b/libs/search/emitter.hpp
@@ -37,8 +37,8 @@ public:
     if (m_prevEmitSize == newCount && !force)
       return;
 
-    LOG(LINFO, ("Emitting a new batch of results:", newCount - m_prevEmitSize, ",",
-        m_timer.ElapsedMilliseconds(), "ms since the search has started."));
+    LOG(LINFO, ("Emitting a new batch of results:", newCount - m_prevEmitSize, ",", m_timer.ElapsedMilliseconds(),
+                "ms since the search has started."));
     m_prevEmitSize = m_results.GetCount();
 
     m_onResults(m_results);
diff --git a/libs/search/engine.cpp b/libs/search/engine.cpp
index 6bfcfaa3d..3f5a4f244 100644
--- a/libs/search/engine.cpp
+++ b/libs/search/engine.cpp
@@ -74,10 +74,7 @@ void ProcessorHandle::Detach()
 // Engine::Params ----------------------------------------------------------------------------------
 Engine::Params::Params() : m_locale("en"), m_numThreads(1) {}
 
-Engine::Params::Params(string const & locale, size_t numThreads)
-  : m_locale(locale), m_numThreads(numThreads)
-{
-}
+Engine::Params::Params(string const & locale, size_t numThreads) : m_locale(locale), m_numThreads(numThreads) {}
 
 // Engine ------------------------------------------------------------------------------------------
 Engine::Engine(DataSource & dataSource, CategoriesHolder const & categories,
@@ -121,19 +118,19 @@ weak_ptr<ProcessorHandle> Engine::Search(SearchParams params)
 {
   shared_ptr<ProcessorHandle> handle(new ProcessorHandle());
   PostMessage(Message::TYPE_TASK, [this, params = std::move(params), handle](Processor & processor)
-              {
-                DoSearch(std::move(params), handle, processor);
-              });
+  { DoSearch(std::move(params), handle, processor); });
   return handle;
 }
 
 void Engine::SetLocale(string const & locale)
 {
-  PostMessage(Message::TYPE_BROADCAST,
-              [locale](Processor & processor) { processor.SetPreferredLocale(locale); });
+  PostMessage(Message::TYPE_BROADCAST, [locale](Processor & processor) { processor.SetPreferredLocale(locale); });
 }
 
-size_t Engine::GetNumThreads() const { return m_threads.size(); }
+size_t Engine::GetNumThreads() const
+{
+  return m_threads.size();
+}
 
 void Engine::ClearCaches()
 {
@@ -142,75 +139,61 @@ void Engine::ClearCaches()
 
 void Engine::CacheWorldLocalities()
 {
-  PostMessage(Message::TYPE_BROADCAST,
-              [](Processor & processor) { processor.CacheWorldLocalities(); });
+  PostMessage(Message::TYPE_BROADCAST, [](Processor & processor) { processor.CacheWorldLocalities(); });
 }
 
 void Engine::LoadCitiesBoundaries()
 {
-  PostMessage(Message::TYPE_BROADCAST,
-              [](Processor & processor) { processor.LoadCitiesBoundaries(); });
+  PostMessage(Message::TYPE_BROADCAST, [](Processor & processor) { processor.LoadCitiesBoundaries(); });
 }
 
 void Engine::LoadCountriesTree()
 {
-  PostMessage(Message::TYPE_BROADCAST,
-              [](Processor & processor) { processor.LoadCountriesTree(); });
+  PostMessage(Message::TYPE_BROADCAST, [](Processor & processor) { processor.LoadCountriesTree(); });
 }
 
 void Engine::EnableIndexingOfBookmarksDescriptions(bool enable)
 {
-  PostMessage(Message::TYPE_BROADCAST, [enable](Processor & processor) {
-    processor.EnableIndexingOfBookmarksDescriptions(enable);
-  });
+  PostMessage(Message::TYPE_BROADCAST,
+              [enable](Processor & processor) { processor.EnableIndexingOfBookmarksDescriptions(enable); });
 }
 
 void Engine::EnableIndexingOfBookmarkGroup(bookmarks::GroupId const & groupId, bool enable)
 {
-  PostMessage(Message::TYPE_BROADCAST, [=](Processor & processor) {
-    processor.EnableIndexingOfBookmarkGroup(groupId, enable);
-  });
+  PostMessage(Message::TYPE_BROADCAST,
+              [=](Processor & processor) { processor.EnableIndexingOfBookmarkGroup(groupId, enable); });
 }
 
 void Engine::ResetBookmarks()
 {
-  PostMessage(Message::TYPE_BROADCAST, [](Processor & processor) {
-    processor.ResetBookmarks();
-  });
+  PostMessage(Message::TYPE_BROADCAST, [](Processor & processor) { processor.ResetBookmarks(); });
 }
 
 void Engine::OnBookmarksCreated(vector<pair<bookmarks::Id, bookmarks::Doc>> const & marks)
 {
-  PostMessage(Message::TYPE_BROADCAST,
-              [marks](Processor & processor) { processor.OnBookmarksCreated(marks); });
+  PostMessage(Message::TYPE_BROADCAST, [marks](Processor & processor) { processor.OnBookmarksCreated(marks); });
 }
 
 void Engine::OnBookmarksUpdated(vector<pair<bookmarks::Id, bookmarks::Doc>> const & marks)
 {
-  PostMessage(Message::TYPE_BROADCAST,
-              [marks](Processor & processor) { processor.OnBookmarksUpdated(marks); });
+  PostMessage(Message::TYPE_BROADCAST, [marks](Processor & processor) { processor.OnBookmarksUpdated(marks); });
 }
 
 void Engine::OnBookmarksDeleted(vector<bookmarks::Id> const & marks)
+{
+  PostMessage(Message::TYPE_BROADCAST, [marks](Processor & processor) { processor.OnBookmarksDeleted(marks); });
+}
+
+void Engine::OnBookmarksAttachedToGroup(bookmarks::GroupId const & groupId, vector<bookmarks::Id> const & marks)
 {
   PostMessage(Message::TYPE_BROADCAST,
-              [marks](Processor & processor) { processor.OnBookmarksDeleted(marks); });
+              [groupId, marks](Processor & processor) { processor.OnBookmarksAttachedToGroup(groupId, marks); });
 }
 
-void Engine::OnBookmarksAttachedToGroup(bookmarks::GroupId const & groupId,
-                                        vector<bookmarks::Id> const & marks)
+void Engine::OnBookmarksDetachedFromGroup(bookmarks::GroupId const & groupId, vector<bookmarks::Id> const & marks)
 {
-  PostMessage(Message::TYPE_BROADCAST, [groupId, marks](Processor & processor) {
-    processor.OnBookmarksAttachedToGroup(groupId, marks);
-  });
-}
-
-void Engine::OnBookmarksDetachedFromGroup(bookmarks::GroupId const & groupId,
-                                          vector<bookmarks::Id> const & marks)
-{
-  PostMessage(Message::TYPE_BROADCAST, [groupId, marks](Processor & processor) {
-    processor.OnBookmarksDetachedFromGroup(groupId, marks);
-  });
+  PostMessage(Message::TYPE_BROADCAST,
+              [groupId, marks](Processor & processor) { processor.OnBookmarksDetachedFromGroup(groupId, marks); });
 }
 
 void Engine::MainLoop(Context & context)
@@ -222,10 +205,7 @@ void Engine::MainLoop(Context & context)
 
     {
       unique_lock<mutex> lock(m_mu);
-      m_cv.wait(lock, [&]()
-                {
-                  return m_shutdown || !m_messages.empty() || !context.m_messages.empty();
-                });
+      m_cv.wait(lock, [&]() { return m_shutdown || !m_messages.empty() || !context.m_messages.empty(); });
 
       if (m_shutdown)
         break;
@@ -283,10 +263,7 @@ void Engine::DoSearch(SearchParams params, shared_ptr<ProcessorHandle> handle, P
 {
   LOG(LINFO, ("Search started:", params.m_mode, params.m_viewport));
   base::Timer timer;
-  SCOPE_GUARD(printDuration, [&timer]()
-  {
-    LOG(LINFO, ("Search ended in", timer.ElapsedMilliseconds(), "ms."));
-  });
+  SCOPE_GUARD(printDuration, [&timer]() { LOG(LINFO, ("Search ended in", timer.ElapsedMilliseconds(), "ms.")); });
 
   processor.Reset();
   handle->Attach(processor);
diff --git a/libs/search/engine.hpp b/libs/search/engine.hpp
index 8375b3c32..43bcdd7df 100644
--- a/libs/search/engine.hpp
+++ b/libs/search/engine.hpp
@@ -83,8 +83,8 @@ public:
   };
 
   // Doesn't take ownership of dataSource and categories.
-  Engine(DataSource & dataSource, CategoriesHolder const & categories,
-         storage::CountryInfoGetter const & infoGetter, Params const & params);
+  Engine(DataSource & dataSource, CategoriesHolder const & categories, storage::CountryInfoGetter const & infoGetter,
+         Params const & params);
   ~Engine();
 
   // Posts search request to the queue and returns its handle.
@@ -117,10 +117,8 @@ public:
   void OnBookmarksCreated(std::vector<std::pair<bookmarks::Id, bookmarks::Doc>> const & marks);
   void OnBookmarksUpdated(std::vector<std::pair<bookmarks::Id, bookmarks::Doc>> const & marks);
   void OnBookmarksDeleted(std::vector<bookmarks::Id> const & marks);
-  void OnBookmarksAttachedToGroup(bookmarks::GroupId const & groupId,
-                                  std::vector<bookmarks::Id> const & marks);
-  void OnBookmarksDetachedFromGroup(bookmarks::GroupId const & groupId,
-                                    std::vector<bookmarks::Id> const & marks);
+  void OnBookmarksAttachedToGroup(bookmarks::GroupId const & groupId, std::vector<bookmarks::Id> const & marks);
+  void OnBookmarksDetachedFromGroup(bookmarks::GroupId const & groupId, std::vector<bookmarks::Id> const & marks);
 
 private:
   struct Message
@@ -134,7 +132,9 @@ private:
     };
 
     template <typename Gn>
-    Message(Type type, Gn && gn) : m_type(type), m_fn(std::forward<Gn>(gn)) {}
+    Message(Type type, Gn && gn) : m_type(type)
+                                 , m_fn(std::forward<Gn>(gn))
+    {}
 
     void operator()(Processor & processor) { m_fn(processor); }
 
diff --git a/libs/search/feature_offset_match.hpp b/libs/search/feature_offset_match.hpp
index a492a5eae..89ac1c3aa 100644
--- a/libs/search/feature_offset_match.hpp
+++ b/libs/search/feature_offset_match.hpp
@@ -43,8 +43,8 @@ bool FindLangIndex(trie::Iterator<ValueList> const & trieRoot, uint8_t lang, uin
 }
 
 template <typename ValueList, typename DFA, typename ToDo>
-bool MatchInTrie(trie::Iterator<ValueList> const & trieRoot, strings::UniChar const * rootPrefix,
-                 size_t rootPrefixSize, DFA const & dfa, ToDo && toDo)
+bool MatchInTrie(trie::Iterator<ValueList> const & trieRoot, strings::UniChar const * rootPrefix, size_t rootPrefixSize,
+                 DFA const & dfa, ToDo && toDo)
 {
   using TrieDFAIt = std::shared_ptr<trie::Iterator<ValueList>>;
   using DFAIt = typename DFA::Iterator;
@@ -72,8 +72,7 @@ bool MatchInTrie(trie::Iterator<ValueList> const & trieRoot, strings::UniChar co
 
     if (dfaIt.Accepts())
     {
-      trieIt->m_values.ForEach(
-          [&dfaIt, &toDo](auto const & v) { toDo(v, dfaIt.ErrorsMade() == 0); });
+      trieIt->m_values.ForEach([&dfaIt, &toDo](auto const & v) { toDo(v, dfaIt.ErrorsMade() == 0); });
       found = true;
     }
 
@@ -102,10 +101,7 @@ class OffsetIntersector
   std::unique_ptr<Values> m_values;
 
 public:
-  explicit OffsetIntersector(Filter const & filter)
-    : m_filter(filter), m_values(std::make_unique<Values>())
-  {
-  }
+  explicit OffsetIntersector(Filter const & filter) : m_filter(filter), m_values(std::make_unique<Values>()) {}
 
   void operator()(Value const & v, bool exactMatch)
   {
@@ -150,8 +146,7 @@ struct TrieRootPrefix
   strings::UniChar const * m_prefix;
   size_t m_prefixSize;
 
-  TrieRootPrefix(Iterator const & root, typename Iterator::Edge::EdgeLabel const & edge)
-    : m_root(root)
+  TrieRootPrefix(Iterator const & root, typename Iterator::Edge::EdgeLabel const & edge) : m_root(root)
   {
     if (edge.size() == 1)
     {
@@ -203,10 +198,8 @@ struct SearchTrieRequest
   {
     m_langs.clear();
     for (auto const lang : langs)
-    {
       if (lang >= 0 && lang <= std::numeric_limits<int8_t>::max())
         m_langs.insert(static_cast<int8_t>(lang));
-    }
   }
 
   bool HasLang(int8_t lang) const { return m_langs.find(lang) != m_langs.cend(); }
@@ -232,8 +225,7 @@ struct SearchTrieRequest
 //
 // *NOTE* |toDo| may be called several times for the same feature.
 template <typename DFA, typename ValueList, typename ToDo>
-void MatchInTrie(std::vector<DFA> const & dfas, TrieRootPrefix<ValueList> const & trieRoot,
-                 ToDo && toDo)
+void MatchInTrie(std::vector<DFA> const & dfas, TrieRootPrefix<ValueList> const & trieRoot, ToDo && toDo)
 {
   for (auto const & dfa : dfas)
     impl::MatchInTrie(trieRoot.m_root, trieRoot.m_prefix, trieRoot.m_prefixSize, dfa, toDo);
@@ -243,8 +235,8 @@ void MatchInTrie(std::vector<DFA> const & dfas, TrieRootPrefix<ValueList> const
 //
 // *NOTE* |toDo| may be called several times for the same feature.
 template <typename DFA, typename ValueList, typename ToDo>
-bool MatchCategoriesInTrie(SearchTrieRequest<DFA> const & request,
-                           trie::Iterator<ValueList> const & trieRoot, ToDo && toDo)
+bool MatchCategoriesInTrie(SearchTrieRequest<DFA> const & request, trie::Iterator<ValueList> const & trieRoot,
+                           ToDo && toDo)
 {
   uint32_t langIx = 0;
   if (!impl::FindLangIndex(trieRoot, search::kCategoriesLang, langIx))
@@ -262,8 +254,7 @@ bool MatchCategoriesInTrie(SearchTrieRequest<DFA> const & request,
 // Calls |toDo| with trie root prefix and language code on each
 // language allowed by |request|.
 template <typename DFA, typename ValueList, typename ToDo>
-void ForEachLangPrefix(SearchTrieRequest<DFA> const & request,
-                       trie::Iterator<ValueList> const & trieRoot, ToDo && toDo)
+void ForEachLangPrefix(SearchTrieRequest<DFA> const & request, trie::Iterator<ValueList> const & trieRoot, ToDo && toDo)
 {
   ASSERT_LESS(trieRoot.m_edges.size(), std::numeric_limits<uint32_t>::max(), ());
 
@@ -285,9 +276,8 @@ void ForEachLangPrefix(SearchTrieRequest<DFA> const & request,
 // Calls |toDo| for each feature whose description matches to
 // |request|.  Each feature will be passed to |toDo| only once.
 template <typename DFA, typename ValueList, typename Filter, typename ToDo>
-void MatchFeaturesInTrie(SearchTrieRequest<DFA> const & request,
-                         trie::Iterator<ValueList> const & trieRoot, Filter const & filter,
-                         ToDo && toDo)
+void MatchFeaturesInTrie(SearchTrieRequest<DFA> const & request, trie::Iterator<ValueList> const & trieRoot,
+                         Filter const & filter, ToDo && toDo)
 {
   using Value = typename ValueList::Value;
 
@@ -297,13 +287,11 @@ void MatchFeaturesInTrie(SearchTrieRequest<DFA> const & request,
   /// @todo Not sure why do we have OffsetIntersector here? We are doing aggregation only.
   impl::OffsetIntersector<Filter, Value> intersector(filter);
 
-  ForEachLangPrefix(
-      request, trieRoot,
-      [&request, &intersector](TrieRootPrefix<ValueList> & langRoot, int8_t /* lang */)
-      {
-        // Aggregate for all languages.
-        MatchInTrie(request.m_names, langRoot, intersector);
-      });
+  ForEachLangPrefix(request, trieRoot, [&request, &intersector](TrieRootPrefix<ValueList> & langRoot, int8_t /* lang */)
+  {
+    // Aggregate for all languages.
+    MatchInTrie(request.m_names, langRoot, intersector);
+  });
 
   if (categoriesExist)
   {
@@ -316,8 +304,8 @@ void MatchFeaturesInTrie(SearchTrieRequest<DFA> const & request,
 }
 
 template <typename ValueList, typename Filter, typename ToDo>
-void MatchPostcodesInTrie(TokenSlice const & slice, trie::Iterator<ValueList> const & trieRoot,
-                          Filter const & filter, ToDo && toDo)
+void MatchPostcodesInTrie(TokenSlice const & slice, trie::Iterator<ValueList> const & trieRoot, Filter const & filter,
+                          ToDo && toDo)
 {
   using namespace strings;
   using Value = typename ValueList::Value;
diff --git a/libs/search/features_filter.cpp b/libs/search/features_filter.cpp
index b5444db6d..d81dfbcf6 100644
--- a/libs/search/features_filter.cpp
+++ b/libs/search/features_filter.cpp
@@ -5,10 +5,7 @@
 namespace search
 {
 // FeaturesFilter ----------------------------------------------------------------------------------
-FeaturesFilter::FeaturesFilter(CBV const & filter, uint64_t threshold)
-  : m_filter(filter), m_threshold(threshold)
-{
-}
+FeaturesFilter::FeaturesFilter(CBV const & filter, uint64_t threshold) : m_filter(filter), m_threshold(threshold) {}
 
 bool FeaturesFilter::NeedToFilter(CBV const & cbv) const
 {
@@ -18,10 +15,7 @@ bool FeaturesFilter::NeedToFilter(CBV const & cbv) const
 }
 
 // LocalityFilter ----------------------------------------------------------------------------------
-LocalityFilter::LocalityFilter(CBV const & filter)
-  : FeaturesFilter(filter, 0 /* threshold */)
-{
-}
+LocalityFilter::LocalityFilter(CBV const & filter) : FeaturesFilter(filter, 0 /* threshold */) {}
 
 CBV LocalityFilter::Filter(CBV const & cbv) const
 {
@@ -29,10 +23,7 @@ CBV LocalityFilter::Filter(CBV const & cbv) const
 }
 
 // ViewportFilter ----------------------------------------------------------------------------------
-ViewportFilter::ViewportFilter(CBV const & filter, uint64_t threshold)
-  : FeaturesFilter(filter, threshold)
-{
-}
+ViewportFilter::ViewportFilter(CBV const & filter, uint64_t threshold) : FeaturesFilter(filter, threshold) {}
 
 CBV ViewportFilter::Filter(CBV const & cbv) const
 {
diff --git a/libs/search/features_layer.cpp b/libs/search/features_layer.cpp
index d322506c9..2d4c62f46 100644
--- a/libs/search/features_layer.cpp
+++ b/libs/search/features_layer.cpp
@@ -9,7 +9,10 @@ using namespace std;
 
 namespace search
 {
-FeaturesLayer::FeaturesLayer() { Clear(); }
+FeaturesLayer::FeaturesLayer()
+{
+  Clear();
+}
 
 void FeaturesLayer::Clear()
 {
@@ -24,13 +27,9 @@ void FeaturesLayer::Clear()
 string DebugPrint(FeaturesLayer const & layer)
 {
   ostringstream os;
-  os << "FeaturesLayer [size of m_sortedFeatures: "
-     << (layer.m_sortedFeatures ? layer.m_sortedFeatures->size() : 0)
-     << ", subquery: " << DebugPrint(layer.m_subQuery)
-     << ", tokenRange: " << DebugPrint(layer.m_tokenRange)
-     << ", type: " << DebugPrint(layer.m_type)
-     << ", lastTokenIsPrefix: " << layer.m_lastTokenIsPrefix
-     << "]";
+  os << "FeaturesLayer [size of m_sortedFeatures: " << (layer.m_sortedFeatures ? layer.m_sortedFeatures->size() : 0)
+     << ", subquery: " << DebugPrint(layer.m_subQuery) << ", tokenRange: " << DebugPrint(layer.m_tokenRange)
+     << ", type: " << DebugPrint(layer.m_type) << ", lastTokenIsPrefix: " << layer.m_lastTokenIsPrefix << "]";
   return os.str();
 }
 }  // namespace search
diff --git a/libs/search/features_layer.hpp b/libs/search/features_layer.hpp
index 4e720adce..a798a94ed 100644
--- a/libs/search/features_layer.hpp
+++ b/libs/search/features_layer.hpp
@@ -24,7 +24,7 @@ struct FeaturesLayer
   // Non-owning ptr to a sorted vector of features.
   std::vector<uint32_t> const * m_sortedFeatures = nullptr;
   // Fetch vector of Features, described by this layer (used for CITY, SUBURB).
-  std::function<CBV ()> m_getFeatures;
+  std::function<CBV()> m_getFeatures;
 
   strings::UniString m_subQuery;
   TokenRange m_tokenRange;
diff --git a/libs/search/features_layer_matcher.cpp b/libs/search/features_layer_matcher.cpp
index 54d9293ef..68e0729b5 100644
--- a/libs/search/features_layer_matcher.cpp
+++ b/libs/search/features_layer_matcher.cpp
@@ -11,7 +11,6 @@
 
 #include <string>
 
-
 namespace search
 {
 using namespace std;
@@ -20,8 +19,7 @@ using namespace std;
 /// even if there is no exact street written for this house.
 int constexpr kMaxApproxStreetDistanceM = 100;
 
-FeaturesLayerMatcher::FeaturesLayerMatcher(DataSource const & dataSource,
-                                           base::Cancellable const & cancellable)
+FeaturesLayerMatcher::FeaturesLayerMatcher(DataSource const & dataSource, base::Cancellable const & cancellable)
   : m_context(nullptr)
   , m_postcodes(nullptr)
   , m_reverseGeocoder(dataSource)
@@ -30,8 +28,7 @@ FeaturesLayerMatcher::FeaturesLayerMatcher(DataSource const & dataSource,
   , m_place2address("PlaceToAddresses")
   , m_loader(scales::GetUpperScale(), ReverseGeocoder::kLookupRadiusM)
   , m_cancellable(cancellable)
-{
-}
+{}
 
 void FeaturesLayerMatcher::SetContext(MwmContext * context)
 {
@@ -57,8 +54,8 @@ void FeaturesLayerMatcher::OnQueryFinished()
   m_loader.OnQueryFinished();
 }
 
-std::vector<uint32_t> const & FeaturesLayerMatcher::GetPlaceAddrFeatures(
-    uint32_t placeId, std::function<CBV ()> const & fn)
+std::vector<uint32_t> const & FeaturesLayerMatcher::GetPlaceAddrFeatures(uint32_t placeId,
+                                                                         std::function<CBV()> const & fn)
 {
   ASSERT(fn, ());
 
@@ -93,10 +90,7 @@ uint32_t FeaturesLayerMatcher::GetMatchingStreet(FeatureID const & houseId)
 
 uint32_t FeaturesLayerMatcher::GetMatchingStreet(FeatureType & feature)
 {
-  return GetMatchingStreetImpl(feature.GetID(), [&]()
-  {
-    return &feature;
-  });
+  return GetMatchingStreetImpl(feature.GetID(), [&]() { return &feature; });
 }
 
 FeaturesLayerMatcher::Streets const & FeaturesLayerMatcher::GetNearbyStreets(FeatureType & feature)
@@ -140,8 +134,8 @@ uint32_t FeaturesLayerMatcher::GetMatchingStreetImpl(FeatureID const & id, Featu
 
   if (edited)
   {
-    auto const ret = find_if(streets.begin(), streets.end(),
-                             [&streetName](Street const & st) { return st.m_name == streetName; });
+    auto const ret =
+        find_if(streets.begin(), streets.end(), [&streetName](Street const & st) { return st.m_name == streetName; });
     if (ret != streets.end())
     {
       result = ret->m_id.m_index;
diff --git a/libs/search/features_layer_matcher.hpp b/libs/search/features_layer_matcher.hpp
index 2096e783d..ffe01c9f4 100644
--- a/libs/search/features_layer_matcher.hpp
+++ b/libs/search/features_layer_matcher.hpp
@@ -74,9 +74,7 @@ public:
     case Model::TYPE_STATE:
     case Model::TYPE_COUNTRY:
     case Model::TYPE_UNCLASSIFIED:
-    case Model::TYPE_COUNT:
-      ASSERT(false, ("Invalid parent layer type:", parent.m_type));
-      break;
+    case Model::TYPE_COUNT: ASSERT(false, ("Invalid parent layer type:", parent.m_type)); break;
     case Model::TYPE_CITY:
       ASSERT_EQUAL(child.m_type, Model::TYPE_BUILDING, ());
       MatchBuildingsWithPlace(child, parent, fn);
@@ -97,8 +95,8 @@ public:
         MatchBuildingsWithStreets(child, parent, fn);
       break;
     case Model::TYPE_SUBURB:
-      ASSERT(child.m_type == Model::TYPE_STREET || child.m_type == Model::TYPE_BUILDING ||
-             Model::IsPoi(child.m_type), ());
+      ASSERT(child.m_type == Model::TYPE_STREET || child.m_type == Model::TYPE_BUILDING || Model::IsPoi(child.m_type),
+             ());
       // Avoid matching buildings to suburb without street.
       if (child.m_type == Model::TYPE_BUILDING)
         MatchBuildingsWithPlace(child, parent, fn);
@@ -111,7 +109,7 @@ public:
   void OnQueryFinished();
 
 private:
-  std::vector<uint32_t> const & GetPlaceAddrFeatures(uint32_t placeId, std::function<CBV ()> const & fn);
+  std::vector<uint32_t> const & GetPlaceAddrFeatures(uint32_t placeId, std::function<CBV()> const & fn);
 
   void BailIfCancelled() { ::search::BailIfCancelled(m_cancellable); }
 
@@ -157,13 +155,8 @@ private:
     poiCenters.reserve(pois.size());
 
     for (size_t i = 0; i < pois.size(); ++i)
-    {
       if (auto poiFt = GetByIndex(pois[i]))
-      {
-        poiCenters.emplace_back(feature::GetCenter(*poiFt, FeatureType::WORST_GEOMETRY),
-                                i /* id */);
-      }
-    }
+        poiCenters.emplace_back(feature::GetCenter(*poiFt, FeatureType::WORST_GEOMETRY), i /* id */);
 
     std::vector<PointRectMatcher::RectIdPair> buildingRects;
     buildingRects.reserve(buildings.size());
@@ -179,25 +172,23 @@ private:
       if (buildingFt->GetGeomType() == feature::GeomType::Point)
       {
         auto const center = feature::GetCenter(*buildingFt, FeatureType::WORST_GEOMETRY);
-        buildingRects.emplace_back(mercator::RectByCenterXYAndSizeInMeters(center, parentRadius),
-                                   i /* id */);
+        buildingRects.emplace_back(mercator::RectByCenterXYAndSizeInMeters(center, parentRadius), i /* id */);
       }
       else
       {
-        buildingRects.emplace_back(buildingFt->GetLimitRect(FeatureType::WORST_GEOMETRY),
-                                   i /* id */);
-        double const rectSize =
-            std::max(buildingRects.back().m_rect.SizeX(), buildingRects.back().m_rect.SizeY());
+        buildingRects.emplace_back(buildingFt->GetLimitRect(FeatureType::WORST_GEOMETRY), i /* id */);
+        double const rectSize = std::max(buildingRects.back().m_rect.SizeX(), buildingRects.back().m_rect.SizeY());
         maxRadius = std::max(maxRadius, rectSize / 2);
       }
     }
 
     PointRectMatcher::Match(poiCenters, buildingRects, PointRectMatcher::RequestType::Any,
-                            [&](size_t poiId, size_t buildingId) {
-                              ASSERT_LESS(poiId, pois.size(), ());
-                              ASSERT_LESS(buildingId, buildings.size(), ());
-                              fn(pois[poiId], buildings[buildingId]);
-                            });
+                            [&](size_t poiId, size_t buildingId)
+    {
+      ASSERT_LESS(poiId, pois.size(), ());
+      ASSERT_LESS(buildingId, buildings.size(), ());
+      fn(pois[poiId], buildings[buildingId]);
+    });
 
     if (!parent.m_hasDelayedFeatures)
       return;
@@ -214,25 +205,20 @@ private:
     {
       BailIfCancelled();
 
-      m_context->ForEachFeature(
-          mercator::RectByCenterXYAndSizeInMeters(poiCenters[i].m_point, maxRadius),
-          [&](FeatureType & ft)
-          {
-            BailIfCancelled();
+      m_context->ForEachFeature(mercator::RectByCenterXYAndSizeInMeters(poiCenters[i].m_point, maxRadius),
+                                [&](FeatureType & ft)
+      {
+        BailIfCancelled();
 
-            if (m_postcodes && !m_postcodes->HasBit(ft.GetID().m_index) &&
-                !m_postcodes->HasBit(GetMatchingStreet(ft)))
-            {
-              return;
-            }
-            if (HouseNumbersMatch(ft, queryParse))
-            {
-              double const distanceM =
-                  mercator::DistanceOnEarth(feature::GetCenter(ft), poiCenters[i].m_point);
-              if (distanceM < maxRadius)
-                fn(pois[i], ft.GetID().m_index);
-            }
-          });
+        if (m_postcodes && !m_postcodes->HasBit(ft.GetID().m_index) && !m_postcodes->HasBit(GetMatchingStreet(ft)))
+          return;
+        if (HouseNumbersMatch(ft, queryParse))
+        {
+          double const distanceM = mercator::DistanceOnEarth(feature::GetCenter(ft), poiCenters[i].m_point);
+          if (distanceM < maxRadius)
+            fn(pois[i], ft.GetID().m_index);
+        }
+      });
     }
   }
 
@@ -251,13 +237,8 @@ private:
     poiCenters.reserve(pois.size());
 
     for (size_t i = 0; i < pois.size(); ++i)
-    {
       if (auto poiFt = GetByIndex(pois[i]))
-      {
-        poiCenters.emplace_back(feature::GetCenter(*poiFt, FeatureType::WORST_GEOMETRY),
-                                i /* id */);
-      }
-    }
+        poiCenters.emplace_back(feature::GetCenter(*poiFt, FeatureType::WORST_GEOMETRY), i /* id */);
 
     std::vector<PointRectMatcher::RectIdPair> streetRects;
     streetRects.reserve(streets.size());
@@ -276,10 +257,7 @@ private:
       m2::RectD inflationRect;
       // Any point is good enough here, and feature::GetCenter would re-read the geometry.
       if (streetFt->GetPointsCount() > 0)
-      {
-        inflationRect = mercator::RectByCenterXYAndSizeInMeters(streetFt->GetPoint(0),
-                                                                0.5 * kStreetRadiusMeters);
-      }
+        inflationRect = mercator::RectByCenterXYAndSizeInMeters(streetFt->GetPoint(0), 0.5 * kStreetRadiusMeters);
 
       for (size_t j = 0; j + 1 < streetFt->GetPointsCount(); ++j)
       {
@@ -299,17 +277,15 @@ private:
 
     BailIfCancelled();
     PointRectMatcher::Match(poiCenters, streetRects, PointRectMatcher::RequestType::All,
-                            [&](size_t poiId, size_t streetId) {
-                              ASSERT_LESS(poiId, pois.size(), ());
-                              ASSERT_LESS(streetId, streets.size(), ());
-                              auto const & poiCenter = poiCenters[poiId].m_point;
-                              ProjectionOnStreet proj;
-                              if (streetProjectors[streetId].GetProjection(poiCenter, proj) &&
-                                  proj.m_distMeters < kStreetRadiusMeters)
-                              {
-                                fn(pois[poiId], streets[streetId]);
-                              }
-                            });
+                            [&](size_t poiId, size_t streetId)
+    {
+      ASSERT_LESS(poiId, pois.size(), ());
+      ASSERT_LESS(streetId, streets.size(), ());
+      auto const & poiCenter = poiCenters[poiId].m_point;
+      ProjectionOnStreet proj;
+      if (streetProjectors[streetId].GetProjection(poiCenter, proj) && proj.m_distMeters < kStreetRadiusMeters)
+        fn(pois[poiId], streets[streetId]);
+    });
   }
 
   template <typename Fn>
@@ -365,14 +341,14 @@ private:
     };
 
     // Cache is not needed since we process unique and mapped-only house->street.
-//    std::unordered_map<uint32_t, bool> cache;
-//    auto const cachingHouseNumberFilter = [&](uint32_t houseId, uint32_t streetId)
-//    {
-//      auto const res = cache.emplace(houseId, false);
-//      if (res.second)
-//        res.first->second = houseNumberFilter(houseId, streetId);
-//      return res.first->second;
-//    };
+    //    std::unordered_map<uint32_t, bool> cache;
+    //    auto const cachingHouseNumberFilter = [&](uint32_t houseId, uint32_t streetId)
+    //    {
+    //      auto const res = cache.emplace(houseId, false);
+    //      if (res.second)
+    //        res.first->second = houseNumberFilter(houseId, streetId);
+    //      return res.first->second;
+    //    };
 
     for (uint32_t streetId : streets)
     {
@@ -383,10 +359,8 @@ private:
         continue;
 
       for (uint32_t houseId : street.m_features)
-      {
         if (houseNumberFilter(houseId, streetId))
           fn(houseId, streetId);
-      }
     }
   }
 
@@ -402,10 +376,8 @@ private:
     if (!buildings.empty())
     {
       for (uint32_t houseId : buildings)
-      {
         if (std::binary_search(ids.begin(), ids.end(), houseId))
           fn(houseId, placeId);
-      }
     }
     if (!child.m_hasDelayedFeatures)
       return;
@@ -432,10 +404,8 @@ private:
     };
 
     for (uint32_t houseId : ids)
-    {
       if (houseNumberFilter(houseId))
         fn(houseId, placeId);
-    }
   }
 
   template <typename Fn>
diff --git a/libs/search/features_layer_path_finder.cpp b/libs/search/features_layer_path_finder.cpp
index fa13e7bcf..04b6230f6 100644
--- a/libs/search/features_layer_path_finder.cpp
+++ b/libs/search/features_layer_path_finder.cpp
@@ -59,8 +59,7 @@ bool GetPath(uint32_t id, vector<FeaturesLayer const *> const & layers, ParentGr
     return false;
 
   size_t level = 0;
-  for (auto parentGraphLayer = parent.crbegin(); parentGraphLayer != parent.crend();
-       ++parentGraphLayer, ++level)
+  for (auto parentGraphLayer = parent.crbegin(); parentGraphLayer != parent.crend(); ++parentGraphLayer, ++level)
   {
     result.Set(layers[level]->m_type, id);
     auto const it = parentGraphLayer->find(id);
@@ -81,8 +80,7 @@ bool MayHaveDelayedFeatures(FeaturesLayer const & layer)
 
 template <class FnT>
 void FeaturesLayerPathFinder::FindReachableVertices(FeaturesLayerMatcher & matcher,
-                                                    vector<FeaturesLayer const *> const & layers,
-                                                    FnT && fn)
+                                                    vector<FeaturesLayer const *> const & layers, FnT && fn)
 {
   switch (m_mode)
   {
@@ -103,9 +101,8 @@ void FeaturesLayerPathFinder::FindReachableVertices(FeaturesLayerMatcher & match
 }
 
 template <class FnT>
-void FeaturesLayerPathFinder::FindReachableVerticesTopDown(
-    FeaturesLayerMatcher & matcher, vector<FeaturesLayer const *> const & layers,
-    FnT && fn)
+void FeaturesLayerPathFinder::FindReachableVerticesTopDown(FeaturesLayerMatcher & matcher,
+                                                           vector<FeaturesLayer const *> const & layers, FnT && fn)
 {
   ASSERT(!layers.empty(), ());
 
@@ -114,7 +111,8 @@ void FeaturesLayerPathFinder::FindReachableVerticesTopDown(
 
   ParentGraph parentGraph;
 
-  auto addEdge = [&](uint32_t childFeature, uint32_t parentFeature) {
+  auto addEdge = [&](uint32_t childFeature, uint32_t parentFeature)
+  {
     auto & parent = parentGraph.back();
     if (parent.find(childFeature) != parent.end())
       return;
@@ -148,16 +146,13 @@ void FeaturesLayerPathFinder::FindReachableVerticesTopDown(
 
   IntersectionResult result;
   for (auto const & id : lowestLevel)
-  {
     if (GetPath(id, layers, parentGraph, result))
       fn(result);
-  }
 }
 
 template <class FnT>
-void FeaturesLayerPathFinder::FindReachableVerticesBottomUp(
-    FeaturesLayerMatcher & matcher, vector<FeaturesLayer const *> const & layers,
-    FnT && fn)
+void FeaturesLayerPathFinder::FindReachableVerticesBottomUp(FeaturesLayerMatcher & matcher,
+                                                            vector<FeaturesLayer const *> const & layers, FnT && fn)
 {
   ASSERT(!layers.empty(), ());
 
@@ -176,7 +171,8 @@ void FeaturesLayerPathFinder::FindReachableVerticesBottomUp(
   // True iff |addEdge| works with the lowest level.
   bool first = true;
 
-  auto addEdge = [&](uint32_t childFeature, uint32_t parentFeature) {
+  auto addEdge = [&](uint32_t childFeature, uint32_t parentFeature)
+  {
     auto & parent = parentGraph.front();
     if (parent.find(childFeature) != parent.end())
       return;
@@ -212,9 +208,7 @@ void FeaturesLayerPathFinder::FindReachableVerticesBottomUp(
 
   IntersectionResult result;
   for (auto const & id : lowestLevel)
-  {
     if (GetPath(id, layers, parentGraph, result))
       fn(result);
-  }
 }
 }  // namespace search
diff --git a/libs/search/features_layer_path_finder.hpp b/libs/search/features_layer_path_finder.hpp
index de173e5a8..d3054e6c4 100644
--- a/libs/search/features_layer_path_finder.hpp
+++ b/libs/search/features_layer_path_finder.hpp
@@ -50,8 +50,8 @@ public:
   FeaturesLayerPathFinder(base::Cancellable const & cancellable) : m_cancellable(cancellable) {}
 
   template <typename TFn>
-  void ForEachReachableVertex(FeaturesLayerMatcher & matcher,
-                              std::vector<FeaturesLayer const *> const & layers, TFn && fn)
+  void ForEachReachableVertex(FeaturesLayerMatcher & matcher, std::vector<FeaturesLayer const *> const & layers,
+                              TFn && fn)
   {
     if (layers.empty())
       return;
@@ -86,22 +86,19 @@ private:
   void BailIfCancelled() { ::search::BailIfCancelled(m_cancellable); }
 
   template <class FnT>
-  void FindReachableVertices(FeaturesLayerMatcher & matcher,
-                             std::vector<FeaturesLayer const *> const & layers,
+  void FindReachableVertices(FeaturesLayerMatcher & matcher, std::vector<FeaturesLayer const *> const & layers,
                              FnT && fn);
 
   // Tries to find all |reachable| features from the lowest layer in a
   // high level -> low level pass.
   template <class FnT>
-  void FindReachableVerticesTopDown(FeaturesLayerMatcher & matcher,
-                                    std::vector<FeaturesLayer const *> const & layers,
+  void FindReachableVerticesTopDown(FeaturesLayerMatcher & matcher, std::vector<FeaturesLayer const *> const & layers,
                                     FnT && fn);
 
   // Tries to find all |reachable| features from the lowest layer in a
   // low level -> high level pass.
   template <class FnT>
-  void FindReachableVerticesBottomUp(FeaturesLayerMatcher & matcher,
-                                     std::vector<FeaturesLayer const *> const & layers,
+  void FindReachableVerticesBottomUp(FeaturesLayerMatcher & matcher, std::vector<FeaturesLayer const *> const & layers,
                                      FnT && fn);
 
   base::Cancellable const & m_cancellable;
diff --git a/libs/search/filtering_params.hpp b/libs/search/filtering_params.hpp
index 70f4e38b7..035fe09d0 100644
--- a/libs/search/filtering_params.hpp
+++ b/libs/search/filtering_params.hpp
@@ -25,4 +25,4 @@ struct RecommendedFilteringParams
   /// @}
 };
 
-} // namespace search
+}  // namespace search
diff --git a/libs/search/geocoder.cpp b/libs/search/geocoder.cpp
index 519ecea40..331f7c8fa 100644
--- a/libs/search/geocoder.cpp
+++ b/libs/search/geocoder.cpp
@@ -45,7 +45,7 @@
 #include "base/timer.hpp"
 #endif  // DEBUG
 
-#include "search/features_layer_path_finder.cpp"    // template functions implementation
+#include "search/features_layer_path_finder.cpp"  // template functions implementation
 
 namespace search
 {
@@ -72,14 +72,14 @@ size_t constexpr kPostcodesRectsCacheSize = 10;
 size_t constexpr kSuburbsRectsCacheSize = 10;
 size_t constexpr kLocalityRectsCacheSize = 10;
 
-
 struct ScopedMarkTokens
 {
   static BaseContext::TokenType constexpr kUnused = BaseContext::TOKEN_TYPE_COUNT;
 
-  ScopedMarkTokens(vector<BaseContext::TokenType> & tokens, BaseContext::TokenType type,
-                   TokenRange const & range)
-    : m_tokens(tokens), m_type(type), m_range(range)
+  ScopedMarkTokens(vector<BaseContext::TokenType> & tokens, BaseContext::TokenType type, TokenRange const & range)
+    : m_tokens(tokens)
+    , m_type(type)
+    , m_range(range)
   {
     ASSERT(m_range.IsValid(), ());
     ASSERT_LESS_OR_EQUAL(m_range.End(), m_tokens.size(), ());
@@ -215,8 +215,7 @@ private:
   LazyRankTable m_ranks;
 };
 
-void JoinQueryTokens(QueryParams const & params, TokenRange const & range, UniString const & sep,
-                     UniString & res)
+void JoinQueryTokens(QueryParams const & params, TokenRange const & range, UniString const & sep, UniString & res)
 {
   ASSERT(range.IsValid(), (range));
   for (size_t i : range)
@@ -246,7 +245,10 @@ void JoinQueryTokens(QueryParams const & params, TokenRange const & range, UniSt
   return true;
 }
 
-double Area(m2::RectD const & rect) { return rect.IsValid() ? rect.SizeX() * rect.SizeY() : 0; }
+double Area(m2::RectD const & rect)
+{
+  return rect.IsValid() ? rect.SizeX() * rect.SizeY() : 0;
+}
 
 /// @brief Computes the average similarity between |rect| and |pivot|.
 /// By similarity between two rects we mean a fraction of the area of
@@ -275,7 +277,8 @@ double GetDistanceMeters(m2::PointD const & pivot, m2::RectD const & rect)
 
   double distance = numeric_limits<double>::max();
 
-  rect.ForEachSide([&](m2::PointD const & a, m2::PointD const & b) {
+  rect.ForEachSide([&](m2::PointD const & a, m2::PointD const & b)
+  {
     m2::ParametrizedSegment<m2::PointD> segment(a, b);
     distance = min(distance, mercator::DistanceOnEarth(pivot, segment.ClosestPointTo(pivot)));
   });
@@ -293,20 +296,18 @@ unique_ptr<MwmContext> GetWorldContext(DataSource const & dataSource)
   return {};
 }
 
-#define TRACE(branch)                                      \
-  m_resultTracer.CallMethod(ResultTracer::Branch::branch); \
+#define TRACE(branch)                                                                         \
+  m_resultTracer.CallMethod(ResultTracer::Branch::branch);                                    \
   SCOPE_GUARD(tracerGuard, [&] { m_resultTracer.LeaveMethod(ResultTracer::Branch::branch); })
 }  // namespace
 
-
 // Geocoder::LocalitiesCaches ----------------------------------------------------------------------
 Geocoder::LocalitiesCaches::LocalitiesCaches(base::Cancellable const & cancellable)
   : m_countries(cancellable)
   , m_states(cancellable)
   , m_citiesTownsOrVillages(cancellable)
   , m_villages(cancellable)
-{
-}
+{}
 
 void Geocoder::LocalitiesCaches::Clear()
 {
@@ -318,9 +319,8 @@ void Geocoder::LocalitiesCaches::Clear()
 
 // Geocoder::Geocoder ------------------------------------------------------------------------------
 Geocoder::Geocoder(DataSource const & dataSource, storage::CountryInfoGetter const & infoGetter,
-                   CategoriesHolder const & categories,
-                   CitiesBoundariesTable const & citiesBoundaries, PreRanker & preRanker,
-                   LocalitiesCaches & localitiesCaches, base::Cancellable const & cancellable)
+                   CategoriesHolder const & categories, CitiesBoundariesTable const & citiesBoundaries,
+                   PreRanker & preRanker, LocalitiesCaches & localitiesCaches, base::Cancellable const & cancellable)
   : m_dataSource(dataSource)
   , m_infoGetter(infoGetter)
   , m_categories(categories)
@@ -340,8 +340,7 @@ Geocoder::Geocoder(DataSource const & dataSource, storage::CountryInfoGetter con
   , m_matcher(nullptr)
   , m_finder(m_cancellable)
   , m_preRanker(preRanker)
-{
-}
+{}
 
 Geocoder::~Geocoder() {}
 
@@ -389,9 +388,7 @@ void Geocoder::GoEverywhere()
 // work fast for most cases (significantly less than 1 second).
 #if defined(DEBUG)
   base::Timer timer;
-  SCOPE_GUARD(printDuration, [&timer]() {
-    LOG(LINFO, ("Total geocoding time:", timer.ElapsedSeconds(), "seconds"));
-  });
+  SCOPE_GUARD(printDuration, [&timer]() { LOG(LINFO, ("Total geocoding time:", timer.ElapsedSeconds(), "seconds")); });
 #endif
 
   TRACE(GoEverywhere);
@@ -415,9 +412,7 @@ void Geocoder::GoInViewport()
   vector<MwmInfoPtr> infos;
   m_dataSource.GetMwmsInfo(infos);
 
-  base::EraseIf(infos, [this](MwmInfoPtr const & info) {
-    return !m_params.m_pivot.IsIntersect(info->m_bordersRect);
-  });
+  base::EraseIf(infos, [this](MwmInfoPtr const & info) { return !m_params.m_pivot.IsIntersect(info->m_bordersRect); });
 
   GoImpl(infos, true /* inViewport */);
 }
@@ -458,27 +453,17 @@ Geocoder::ExtendedMwmInfos Geocoder::OrderCountries(bool inViewport, vector<MwmI
   if (!inViewport)
   {
     for (auto const & p : m_cities)
-    {
       for (auto const & city : p.second)
         mwmsWithCities.insert(m_infoGetter.GetRegionCountryId(city.m_rect.Center()));
-    }
     for (auto const & p : m_regions[Region::TYPE_STATE])
-    {
       for (auto const & state : p.second)
-      {
         mwmsWithStates.insert(m_infoGetter.GetRegionCountryId(state.m_center));
-      }
-    }
   }
 
   auto const hasMatchedCity = [&mwmsWithCities](auto const & i)
-  {
-    return mwmsWithCities.count(i->GetCountryName()) != 0;
-  };
+  { return mwmsWithCities.count(i->GetCountryName()) != 0; };
   auto const hasMatchedState = [&mwmsWithStates](auto const & i)
-  {
-    return mwmsWithStates.count(i->GetCountryName()) != 0;
-  };
+  { return mwmsWithStates.count(i->GetCountryName()) != 0; };
 
   std::string locationMwm;
   if (m_params.m_position)
@@ -528,9 +513,7 @@ Geocoder::ExtendedMwmInfos Geocoder::OrderCountries(bool inViewport, vector<MwmI
   sort(res.m_infos.begin(), res.m_infos.end());
 
   auto const sep = stable_partition(res.m_infos.begin(), res.m_infos.end(), [&](auto const & extendedInfo)
-  {
-    return extendedInfo.m_type.IsFirstBatchMwm(inViewport);
-  });
+  { return extendedInfo.m_type.IsFirstBatchMwm(inViewport); });
   res.m_firstBatchSize = distance(res.m_infos.begin(), sep);
 
   return res;
@@ -581,11 +564,13 @@ void Geocoder::GoImpl(vector<MwmInfoPtr> const & infos, bool inViewport)
 
   // MatchAroundPivot() should always be matched in mwms
   // intersecting with position and viewport.
-  auto processCountry = [&](unique_ptr<MwmContext> context, bool updatePreranker) {
+  auto processCountry = [&](unique_ptr<MwmContext> context, bool updatePreranker)
+  {
     ASSERT(context, ());
     m_context = std::move(context);
 
-    SCOPE_GUARD(cleanup, [&]() {
+    SCOPE_GUARD(cleanup, [&]()
+    {
       LOG(LDEBUG, (m_context->GetName(), "geocoding complete."));
       m_matcher->OnQueryFinished();
       m_matcher = nullptr;
@@ -596,8 +581,8 @@ void Geocoder::GoImpl(vector<MwmInfoPtr> const & infos, bool inViewport)
     if (it == m_matchersCache.end())
     {
       it = m_matchersCache
-               .insert(make_pair(m_context->GetId(),
-                                 std::make_unique<FeaturesLayerMatcher>(m_dataSource, m_cancellable)))
+               .insert(
+                   make_pair(m_context->GetId(), std::make_unique<FeaturesLayerMatcher>(m_dataSource, m_cancellable)))
                .first;
     }
     m_matcher = it->second.get();
@@ -608,8 +593,7 @@ void Geocoder::GoImpl(vector<MwmInfoPtr> const & infos, bool inViewport)
 
     if (inViewport)
     {
-      auto const viewportCBV =
-          RetrieveGeometryFeatures(*m_context, m_params.m_pivot, RectId::Pivot);
+      auto const viewportCBV = RetrieveGeometryFeatures(*m_context, m_params.m_pivot, RectId::Pivot);
       for (auto & features : ctx.m_features)
         features = features.Intersect(viewportCBV);
     }
@@ -684,12 +668,10 @@ void Geocoder::InitLayer(Model::Type type, TokenRange const & tokenRange, Featur
   layer.m_tokenRange = tokenRange;
 
   JoinQueryTokens(m_params, layer.m_tokenRange, UniString::kSpace /* sep */, layer.m_subQuery);
-  layer.m_lastTokenIsPrefix =
-      !layer.m_tokenRange.Empty() && m_params.IsPrefixToken(layer.m_tokenRange.End() - 1);
+  layer.m_lastTokenIsPrefix = !layer.m_tokenRange.Empty() && m_params.IsPrefixToken(layer.m_tokenRange.End() - 1);
 }
 
-void Geocoder::FillLocalityCandidates(BaseContext const & ctx, CBV const & filter,
-                                      size_t const maxNumLocalities,
+void Geocoder::FillLocalityCandidates(BaseContext const & ctx, CBV const & filter, size_t const maxNumLocalities,
                                       vector<Locality> & preLocalities)
 {
   // todo(@m) "food moscow" should be a valid categorial request.
@@ -703,16 +685,13 @@ void Geocoder::FillLocalityCandidates(BaseContext const & ctx, CBV const & filte
   for (auto const & type : m_regions)
   {
     for (auto const & ranges : type)
-    {
       for (auto const & regions : ranges.second)
         ids.insert(ids.end(), regions.m_ids.begin(), regions.m_ids.end());
-    }
   }
   base::SortUnique(ids);
 
-  auto const belongsToMatchedRegion = [&](m2::PointD const & point) {
-    return m_infoGetter.BelongsToAnyRegion(point, ids);
-  };
+  auto const belongsToMatchedRegion = [&](m2::PointD const & point)
+  { return m_infoGetter.BelongsToAnyRegion(point, ids); };
 
   LocalityScorerDelegate delegate(*m_context, m_params, belongsToMatchedRegion, m_cancellable);
   LocalityScorer scorer(m_params, m_params.m_pivot.Center(), delegate);
@@ -813,8 +792,8 @@ void Geocoder::FillLocalitiesTable(BaseContext const & ctx)
           /// @todo Replace with assert in future. Now make additional check for compatibility with old "buggy" World.
           if (city.m_rect.IsPointInside(center))
             haveBoundary = true;
-          //else
-          //  ASSERT(false, (city.m_rect, center, ft->GetID()));
+          // else
+          //   ASSERT(false, (city.m_rect, center, ft->GetID()));
         }
       }
 
@@ -825,11 +804,10 @@ void Geocoder::FillLocalitiesTable(BaseContext const & ctx)
         city.m_rect = mercator::RectByCenterXYAndSizeInMeters(center, radius);
       }
 
-      LOG(LDEBUG,
-          ("City =", ft->GetName(StringUtf8Multilang::kDefaultCode), "ll =", mercator::ToLatLon(center),
-           "rect =", mercator::ToLatLon(city.m_rect), "rect source:", haveBoundary ? "table" : "population",
-           "sizeX =", mercator::DistanceOnEarth(city.m_rect.LeftTop(), city.m_rect.RightTop()),
-           "sizeY =", mercator::DistanceOnEarth(city.m_rect.LeftTop(), city.m_rect.LeftBottom())));
+      LOG(LDEBUG, ("City =", ft->GetName(StringUtf8Multilang::kDefaultCode), "ll =", mercator::ToLatLon(center),
+                   "rect =", mercator::ToLatLon(city.m_rect), "rect source:", haveBoundary ? "table" : "population",
+                   "sizeX =", mercator::DistanceOnEarth(city.m_rect.LeftTop(), city.m_rect.RightTop()),
+                   "sizeY =", mercator::DistanceOnEarth(city.m_rect.LeftTop(), city.m_rect.LeftBottom())));
 
       m_cities[city.m_tokenRange].push_back(std::move(city));
     }
@@ -874,8 +852,8 @@ void Geocoder::FillVillageLocalities(BaseContext const & ctx)
     auto const radius = ftypes::GetRadiusByPopulation(population);
     village.m_rect = mercator::RectByCenterXYAndSizeInMeters(center, radius);
 
-    LOG(LDEBUG, ("Village =", ft->GetName(StringUtf8Multilang::kDefaultCode),
-                 "ll =", mercator::ToLatLon(center), "radius =", radius));
+    LOG(LDEBUG, ("Village =", ft->GetName(StringUtf8Multilang::kDefaultCode), "ll =", mercator::ToLatLon(center),
+                 "radius =", radius));
 
     m_cities[village.m_tokenRange].push_back(std::move(village));
   }
@@ -908,11 +886,8 @@ void Geocoder::ForEachCountry(ExtendedMwmInfos const & extendedInfos, Fn && fn)
       continue;
     bool const updatePreranker = i + 1 >= extendedInfos.m_firstBatchSize;
     auto const & mwmType = extendedInfos.m_infos[i].m_type;
-    if (fn(make_unique<MwmContext>(std::move(handle), mwmType), updatePreranker) ==
-        base::ControlFlow::Break)
-    {
+    if (fn(make_unique<MwmContext>(std::move(handle), mwmType), updatePreranker) == base::ControlFlow::Break)
       break;
-    }
   }
 }
 
@@ -924,12 +899,10 @@ void Geocoder::MatchCategories(BaseContext & ctx, bool aroundPivot)
 
   if (aroundPivot)
   {
-    auto const pivotFeatures =
-        RetrieveGeometryFeatures(*m_context, m_params.m_pivot, RectId::Pivot);
+    auto const pivotFeatures = RetrieveGeometryFeatures(*m_context, m_params.m_pivot, RectId::Pivot);
     ViewportFilter filter(pivotFeatures, m_preRanker.Limit() /* threshold */);
     features.m_features = filter.Filter(features.m_features);
-    features.m_exactMatchingFeatures =
-        features.m_exactMatchingFeatures.Intersect(features.m_features);
+    features.m_exactMatchingFeatures = features.m_exactMatchingFeatures.Intersect(features.m_features);
   }
 
   // Features have been retrieved from the search index
@@ -941,9 +914,9 @@ void Geocoder::MatchCategories(BaseContext & ctx, bool aroundPivot)
     if (!GetTypeInGeocoding(ctx, featureId, type))
       return;
 
-    EmitResult(ctx, {m_context->GetId(), featureId}, type, TokenRange(0, ctx.NumTokens()),
-               nullptr /* geoParts */, true /* allTokensUsed */, exactMatch);
- });
+    EmitResult(ctx, {m_context->GetId(), featureId}, type, TokenRange(0, ctx.NumTokens()), nullptr /* geoParts */,
+               true /* allTokensUsed */, exactMatch);
+  });
 }
 
 void Geocoder::MatchRegions(BaseContext & ctx, Region::Type type)
@@ -989,8 +962,8 @@ void Geocoder::MatchRegions(BaseContext & ctx, Region::Type type)
       // mwm that is currently being processed belongs to region.
       if (isWorld)
       {
-        matches = ctx.m_regions.empty() ||
-                  m_infoGetter.BelongsToAnyRegion(region.m_center, ctx.m_regions.back()->m_ids);
+        matches =
+            ctx.m_regions.empty() || m_infoGetter.BelongsToAnyRegion(region.m_center, ctx.m_regions.back()->m_ids);
       }
       else
       {
@@ -1009,10 +982,8 @@ void Geocoder::MatchRegions(BaseContext & ctx, Region::Type type)
       {
         bool exactMatch = true;
         for (auto const & region : ctx.m_regions)
-        {
           if (!region->m_exactMatch)
             exactMatch = false;
-        }
 
         // Region matches to search query, we need to emit it as is.
         EmitResult(ctx, region, tokenRange, true /* allTokensUsed */, exactMatch);
@@ -1046,11 +1017,8 @@ void Geocoder::MatchCities(BaseContext & ctx)
     {
       BailIfCancelled();
 
-      if (!ctx.m_regions.empty() &&
-          !m_infoGetter.BelongsToAnyRegion(city.m_rect.Center(), ctx.m_regions.back()->m_ids))
-      {
+      if (!ctx.m_regions.empty() && !m_infoGetter.BelongsToAnyRegion(city.m_rect.Center(), ctx.m_regions.back()->m_ids))
         continue;
-      }
 
       ScopedMarkTokens mark(ctx.m_tokens, BaseContext::FromModelType(city.m_type), tokenRange);
       ctx.m_city = &city;
@@ -1113,8 +1081,7 @@ void Geocoder::MatchAroundPivot(BaseContext & ctx)
   LimitedSearch(ctx, filter, centers);
 }
 
-void Geocoder::LimitedSearch(BaseContext & ctx, FeaturesFilter const & filter,
-                             CentersFilter const & centers)
+void Geocoder::LimitedSearch(BaseContext & ctx, FeaturesFilter const & filter, CentersFilter const & centers)
 {
   m_filter = &filter;
   SCOPE_GUARD(resetFilter, [&]() { m_filter = nullptr; });
@@ -1127,7 +1094,8 @@ void Geocoder::LimitedSearch(BaseContext & ctx, FeaturesFilter const & filter,
 
   MatchUnclassified(ctx, 0 /* curToken */);
 
-  auto const search = [this, &ctx, &centers]() {
+  auto const search = [this, &ctx, &centers]()
+  {
     GreedilyMatchStreets(ctx, centers);
     MatchPOIsAndBuildings(ctx, 0 /* curToken */, CBV::GetFull());
   };
@@ -1194,10 +1162,7 @@ void Geocoder::WithPostcodes(BaseContext & ctx, Fn && fn)
       m_postcodes.Clear();
 
       if (worldContext)
-      {
-        m_postcodes.m_worldFeatures =
-            RetrievePostcodeFeatures(*worldContext, TokenSlice(m_params, tokenRange));
-      }
+        m_postcodes.m_worldFeatures = RetrievePostcodeFeatures(*worldContext, TokenSlice(m_params, tokenRange));
 
       m_postcodes.m_tokenRange = tokenRange;
       m_postcodes.m_countryFeatures = std::move(postcodes);
@@ -1256,7 +1221,7 @@ void Geocoder::GreedilyMatchStreetsWithSuburbs(BaseContext & ctx, CentersFilter
       auto & layers = ctx.m_layers;
       ASSERT(layers.empty(), ());
       layers.emplace_back();
-      SCOPE_GUARD(cleanupGuard, [&layers]{ layers.pop_back(); });
+      SCOPE_GUARD(cleanupGuard, [&layers] { layers.pop_back(); });
 
       auto & layer = layers.back();
       InitLayer(Model::TYPE_SUBURB, suburb.m_tokenRange, layer);
@@ -1288,8 +1253,8 @@ void Geocoder::GreedilyMatchStreetsWithSuburbs(BaseContext & ctx, CentersFilter
 }
 
 template <class FnT>
-void Geocoder::CentersFilter::ClusterizeStreets(std::vector<uint32_t> & streets,
-                                                Geocoder const & geocoder, FnT && fn) const
+void Geocoder::CentersFilter::ClusterizeStreets(std::vector<uint32_t> & streets, Geocoder const & geocoder,
+                                                FnT && fn) const
 {
   std::vector<std::tuple<double, m2::PointD, uint32_t>> loadedStreets;
   loadedStreets.reserve(streets.size());
@@ -1313,27 +1278,23 @@ void Geocoder::CentersFilter::ClusterizeStreets(std::vector<uint32_t> & streets,
   }
 
   // Sort by distance.
-  std::sort(loadedStreets.begin(), loadedStreets.end(), [](auto const & t1, auto const & t2)
-  {
-    return std::get<0>(t1) < std::get<0>(t2);
-  });
+  std::sort(loadedStreets.begin(), loadedStreets.end(),
+            [](auto const & t1, auto const & t2) { return std::get<0>(t1) < std::get<0>(t2); });
 
   buffer_vector<m2::RectD, 2> rects(m_centers.size());
   for (size_t i = 0; i < rects.size(); ++i)
   {
-    rects[i] = mercator::RectByCenterXYAndSizeInMeters(
-          m_centers[i], geocoder.m_params.m_filteringParams.m_streetSearchRadiusM);
+    rects[i] = mercator::RectByCenterXYAndSizeInMeters(m_centers[i],
+                                                       geocoder.m_params.m_filteringParams.m_streetSearchRadiusM);
   }
 
   // Find the first (after m_maxStreetsCount) street that is out of the rect's bounds
   size_t count = std::min(loadedStreets.size(), geocoder.m_params.m_filteringParams.m_maxStreetsCount);
   for (; count < loadedStreets.size(); ++count)
   {
-    bool const outside = std::all_of(rects.begin(), rects.end(),
-                                     [pt = std::get<1>(loadedStreets[count])](m2::RectD const & rect)
-                                     {
-                                       return !rect.IsPointInside(pt);
-                                     });
+    bool const outside =
+        std::all_of(rects.begin(), rects.end(), [pt = std::get<1>(loadedStreets[count])](m2::RectD const & rect)
+    { return !rect.IsPointInside(pt); });
     if (outside)
       break;
   }
@@ -1360,14 +1321,13 @@ void Geocoder::CentersFilter::ClusterizeStreets(std::vector<uint32_t> & streets,
   fn();
 }
 
-void Geocoder::CreateStreetsLayerAndMatchLowerLayers(BaseContext & ctx,
-                                                     StreetsMatcher::Prediction const & prediction,
+void Geocoder::CreateStreetsLayerAndMatchLowerLayers(BaseContext & ctx, StreetsMatcher::Prediction const & prediction,
                                                      CentersFilter const & centers, bool makeRelaxed)
 {
   auto & layers = ctx.m_layers;
 
   layers.emplace_back();
-  SCOPE_GUARD(cleanupGuard, [&]{ layers.pop_back(); });
+  SCOPE_GUARD(cleanupGuard, [&] { layers.pop_back(); });
 
   auto & layer = layers.back();
   InitLayer(Model::TYPE_STREET, prediction.m_tokenRange, layer);
@@ -1375,10 +1335,7 @@ void Geocoder::CreateStreetsLayerAndMatchLowerLayers(BaseContext & ctx,
   vector<uint32_t> sortedFeatures;
   layer.m_sortedFeatures = &sortedFeatures;
   sortedFeatures.reserve(base::asserted_cast<size_t>(prediction.m_features.PopCount()));
-  prediction.m_features.ForEach([&](uint64_t bit)
-  {
-    sortedFeatures.push_back(base::asserted_cast<uint32_t>(bit));
-  });
+  prediction.m_features.ForEach([&](uint64_t bit) { sortedFeatures.push_back(base::asserted_cast<uint32_t>(bit)); });
 
   centers.ClusterizeStreets(sortedFeatures, *this, [&]()
   {
@@ -1425,8 +1382,8 @@ void Geocoder::MatchPOIsAndBuildings(BaseContext & ctx, size_t curToken, CBV con
         Model::Type type;
         if (GetTypeInGeocoding(ctx, featureId, type))
         {
-          EmitResult(ctx, {m_context->GetId(), featureId}, type, m_postcodes.m_tokenRange,
-                     nullptr /* geoParts */, true /* allTokensUsed */, true /* exactMatch */);
+          EmitResult(ctx, {m_context->GetId(), featureId}, type, m_postcodes.m_tokenRange, nullptr /* geoParts */,
+                     true /* allTokensUsed */, true /* exactMatch */);
         }
       });
       return;
@@ -1455,22 +1412,20 @@ void Geocoder::MatchPOIsAndBuildings(BaseContext & ctx, size_t curToken, CBV con
     // Following code creates a fake TYPE_BUILDING layer and intersects it with the streets layer.
     // Controversial: we can emit streets like buildings here. Filtered in IsFakeBuildingButStreet().
     layers.emplace_back();
-    SCOPE_GUARD(cleanupGuard, [&]{ layers.pop_back(); });
+    SCOPE_GUARD(cleanupGuard, [&] { layers.pop_back(); });
 
     auto & layer = layers.back();
     InitLayer(Model::TYPE_BUILDING, m_postcodes.m_tokenRange, layer);
 
     vector<uint32_t> features;
     m_postcodes.m_countryFeatures.ForEach([&features](uint64_t bit)
-    {
-      features.push_back(base::asserted_cast<uint32_t>(bit));
-    });
+    { features.push_back(base::asserted_cast<uint32_t>(bit)); });
     layer.m_sortedFeatures = &features;
     return FindPaths(ctx);
   }
 
   layers.emplace_back();
-  SCOPE_GUARD(cleanupGuard, [&]{ layers.pop_back(); });
+  SCOPE_GUARD(cleanupGuard, [&] { layers.pop_back(); });
 
   // Clusters of features by search type. Each cluster is a sorted
   // list of ids.
@@ -1519,8 +1474,8 @@ void Geocoder::MatchPOIsAndBuildings(BaseContext & ctx, size_t curToken, CBV con
     if (m_filter->NeedToFilter(features.m_features))
       filtered = m_filter->Filter(features.m_features);
 
-    bool const looksLikeHouseNumber = house_numbers::LooksLikeHouseNumber(
-        layers.back().m_subQuery, layers.back().m_lastTokenIsPrefix);
+    bool const looksLikeHouseNumber =
+        house_numbers::LooksLikeHouseNumber(layers.back().m_subQuery, layers.back().m_lastTokenIsPrefix);
     if (filtered.IsEmpty() && !looksLikeHouseNumber)
       break;
 
@@ -1530,10 +1485,7 @@ void Geocoder::MatchPOIsAndBuildings(BaseContext & ctx, size_t curToken, CBV con
     }
     else
     {
-      auto noFeature = [&filtered](uint64_t bit) -> bool
-      {
-        return !filtered.HasBit(bit);
-      };
+      auto noFeature = [&filtered](uint64_t bit) -> bool { return !filtered.HasBit(bit); };
       for (auto & cluster : clusters)
         base::EraseIf(cluster, noFeature);
 
@@ -1542,21 +1494,21 @@ void Geocoder::MatchPOIsAndBuildings(BaseContext & ctx, size_t curToken, CBV con
       for (size_t i = 0; i < kNumClusters; ++i)
         ends[i] = clusters[i].size();
       filtered.ForEach([&](uint64_t bit)
-                       {
-                         auto const featureId = base::asserted_cast<uint32_t>(bit);
-                         bool found = false;
-                         for (size_t i = 0; i < kNumClusters && !found; ++i)
-                         {
-                           size_t & cur = curs[i];
-                           size_t const end = ends[i];
-                           while (cur != end && clusters[i][cur] < featureId)
-                             ++cur;
-                           if (cur != end && clusters[i][cur] == featureId)
-                             found = true;
-                         }
-                         if (!found)
-                           clusterize(featureId);
-                       });
+      {
+        auto const featureId = base::asserted_cast<uint32_t>(bit);
+        bool found = false;
+        for (size_t i = 0; i < kNumClusters && !found; ++i)
+        {
+          size_t & cur = curs[i];
+          size_t const end = ends[i];
+          while (cur != end && clusters[i][cur] < featureId)
+            ++cur;
+          if (cur != end && clusters[i][cur] == featureId)
+            found = true;
+        }
+        if (!found)
+          clusterize(featureId);
+      });
       for (size_t i = 0; i < kNumClusters; ++i)
         inplace_merge(clusters[i].begin(), clusters[i].begin() + ends[i], clusters[i].end());
     }
@@ -1574,16 +1526,15 @@ void Geocoder::MatchPOIsAndBuildings(BaseContext & ctx, size_t curToken, CBV con
           continue;
       }
       else if (layer.m_sortedFeatures->empty() ||
-              /// @todo The crutch, but can't invent a better solution now. Should refactor layers iteration.
-              /// @see ProcessorTest_Smoke and Numeric_POI_Name tests.
+               /// @todo The crutch, but can't invent a better solution now. Should refactor layers iteration.
+               /// @see ProcessorTest_Smoke and Numeric_POI_Name tests.
                (house_numbers::LooksLikeHouseNumberStrict(layer.m_subQuery) && numTokens > 1))
       {
         continue;
       }
 
       layer.m_type = static_cast<Model::Type>(i);
-      ScopedMarkTokens mark(ctx.m_tokens, BaseContext::FromModelType(layer.m_type),
-                            TokenRange(curToken, endToken));
+      ScopedMarkTokens mark(ctx.m_tokens, BaseContext::FromModelType(layer.m_type), TokenRange(curToken, endToken));
       if (IsLayerSequenceSane(layers))
         MatchPOIsAndBuildings(ctx, endToken, filter);
     }
@@ -1633,9 +1584,7 @@ bool Geocoder::IsLayerSequenceSane(vector<FeaturesLayer> const & layers) const
       return false;
   }
   if (hasBuildings && hasPois && !hasStreets)
-  {
     return false;
-  }
 
   return true;
 }
@@ -1659,8 +1608,7 @@ uint32_t Geocoder::MatchWorld2Country(FeatureID const & id) const
   uint32_t resID = kInvalidFeatureId;
   m_context->ForEachFeature({pt, pt}, [&](FeatureType & ft)
   {
-    if (resID == kInvalidFeatureId &&
-        ft.GetName(StringUtf8Multilang::kDefaultCode) == name &&
+    if (resID == kInvalidFeatureId && ft.GetName(StringUtf8Multilang::kDefaultCode) == name &&
         // Relaxed points comparison because geometry coding in the World and in a Country is different.
         feature::GetCenter(ft).EqualDxDy(pt, kMwmPointAccuracy * 100))
     {
@@ -1693,9 +1641,7 @@ void Geocoder::FindPaths(BaseContext & ctx)
         hasBuilding = l.m_sortedFeatures->empty() || house_numbers::LooksLikeHouseNumberStrict(l.m_subQuery);
         break;
       case Model::TYPE_STREET:
-      case Model::TYPE_SUBURB:
-        hasStreetOrSuburb = true;
-        break;
+      case Model::TYPE_SUBURB: hasStreetOrSuburb = true; break;
       case Model::TYPE_CITY:
       case Model::TYPE_COMPLEX_POI:
       case Model::TYPE_COUNT:
@@ -1718,9 +1664,7 @@ void Geocoder::FindPaths(BaseContext & ctx)
         cityFeature.push_back(fid);
       cityLayer.m_sortedFeatures = &cityFeature;
       cityLayer.m_getFeatures = [this, &ctx]()
-      {
-        return RetrieveGeometryFeatures(*m_context, ctx.m_city->m_rect, RectId::Locality);
-      };
+      { return RetrieveGeometryFeatures(*m_context, ctx.m_city->m_rect, RectId::Locality); };
     }
   }
 
@@ -1776,10 +1720,8 @@ void Geocoder::FindPaths(BaseContext & ctx)
     if (haveRegion)
     {
       for (auto const & region : ctx.m_regions)
-      {
         if (!region->m_exactMatch)
           return false;
-      }
     }
 
     return true;
@@ -1791,14 +1733,13 @@ void Geocoder::FindPaths(BaseContext & ctx)
     if (result.IsFakeBuildingButStreet())
       return;
 
-    EmitResult(ctx, {m_context->GetId(), result.InnermostResult()}, innermostLayer.m_type,
-               innermostLayer.m_tokenRange, &result, ctx.AllTokensUsed(),
-               isExactMatch(result));
+    EmitResult(ctx, {m_context->GetId(), result.InnermostResult()}, innermostLayer.m_type, innermostLayer.m_tokenRange,
+               &result, ctx.AllTokensUsed(), isExactMatch(result));
   });
 }
 
-void Geocoder::TraceResult(Tracer & tracer, BaseContext const & ctx, MwmSet::MwmId const & mwmId,
-                           uint32_t ftId, Model::Type type, TokenRange const & tokenRange)
+void Geocoder::TraceResult(Tracer & tracer, BaseContext const & ctx, MwmSet::MwmId const & mwmId, uint32_t ftId,
+                           Model::Type type, TokenRange const & tokenRange)
 {
   SCOPE_GUARD(emitParse, [&]() { tracer.EmitParse(ctx.m_tokens); });
 
@@ -1813,15 +1754,13 @@ void Geocoder::TraceResult(Tracer & tracer, BaseContext const & ctx, MwmSet::Mwm
     return;
 
   feature::TypesHolder holder(*ft);
-  CategoriesInfo catInfo(holder, TokenSlice(m_params, tokenRange), m_params.m_categoryLocales,
-                         m_categories);
+  CategoriesInfo catInfo(holder, TokenSlice(m_params, tokenRange), m_params.m_categoryLocales, m_categories);
 
   emitParse.release();
   tracer.EmitParse(ctx.m_tokens, catInfo.IsPureCategories());
 }
 
-void Geocoder::EmitResult(BaseContext & ctx, FeatureID const & id,
-                          Model::Type type, TokenRange const & tokenRange,
+void Geocoder::EmitResult(BaseContext & ctx, FeatureID const & id, Model::Type type, TokenRange const & tokenRange,
                           IntersectionResult const * geoParts, bool allTokensUsed, bool exactMatch)
 {
   double matchedFraction = 1.0;
@@ -1903,19 +1842,16 @@ void Geocoder::EmitResult(BaseContext & ctx, FeatureID const & id,
   ++ctx.m_numEmitted;
 }
 
-void Geocoder::EmitResult(BaseContext & ctx, Region const & region, TokenRange const & tokenRange,
-                          bool allTokensUsed, bool exactMatch)
+void Geocoder::EmitResult(BaseContext & ctx, Region const & region, TokenRange const & tokenRange, bool allTokensUsed,
+                          bool exactMatch)
 {
   auto const type = Region::ToModelType(region.m_type);
-  EmitResult(ctx, region.m_featureId, type, tokenRange, nullptr /* geoParts */,
-             allTokensUsed, exactMatch);
+  EmitResult(ctx, region.m_featureId, type, tokenRange, nullptr /* geoParts */, allTokensUsed, exactMatch);
 }
 
-void Geocoder::EmitResult(BaseContext & ctx, City const & city, TokenRange const & tokenRange,
-                          bool allTokensUsed)
+void Geocoder::EmitResult(BaseContext & ctx, City const & city, TokenRange const & tokenRange, bool allTokensUsed)
 {
-  EmitResult(ctx, city.m_featureId, city.m_type, tokenRange,
-             nullptr /* geoParts */, allTokensUsed, city.m_exactMatch);
+  EmitResult(ctx, city.m_featureId, city.m_type, tokenRange, nullptr /* geoParts */, allTokensUsed, city.m_exactMatch);
 }
 
 void Geocoder::MatchUnclassified(BaseContext & ctx, size_t curToken)
@@ -1940,9 +1876,7 @@ void Geocoder::MatchUnclassified(BaseContext & ctx, size_t curToken)
   curToken = ctx.SkipUsedTokens(curToken);
   auto startToken = curToken;
   for (; curToken < ctx.NumTokens() && !ctx.IsTokenUsed(curToken); ++curToken)
-  {
     allFeatures = allFeatures.Intersect(ctx.m_features[curToken]);
-  }
 
   if (m_filter->NeedToFilter(allFeatures.m_features))
   {
@@ -1959,8 +1893,8 @@ void Geocoder::MatchUnclassified(BaseContext & ctx, size_t curToken)
     {
       auto const tokenRange = TokenRange(startToken, curToken);
       ScopedMarkTokens mark(ctx.m_tokens, BaseContext::TOKEN_TYPE_UNCLASSIFIED, tokenRange);
-      EmitResult(ctx, {m_context->GetId(), featureId}, type, tokenRange,
-                 nullptr /* geoParts */, true /* allTokensUsed */, exactMatch);
+      EmitResult(ctx, {m_context->GetId(), featureId}, type, tokenRange, nullptr /* geoParts */,
+                 true /* allTokensUsed */, exactMatch);
     }
   };
   allFeatures.ForEach(emitUnclassified);
@@ -1972,8 +1906,7 @@ CBV Geocoder::RetrievePostcodeFeatures(MwmContext const & context, TokenSlice co
   return CBV(retrieval.RetrievePostcodeFeatures(slice));
 }
 
-CBV Geocoder::RetrieveGeometryFeatures(MwmContext const & context, m2::RectD const & rect,
-                                       RectId id)
+CBV Geocoder::RetrieveGeometryFeatures(MwmContext const & context, m2::RectD const & rect, RectId id)
 {
   switch (id)
   {
diff --git a/libs/search/geocoder.hpp b/libs/search/geocoder.hpp
index 9f8f62f88..118c8ead2 100644
--- a/libs/search/geocoder.hpp
+++ b/libs/search/geocoder.hpp
@@ -98,9 +98,8 @@ public:
   };
 
   Geocoder(DataSource const & dataSource, storage::CountryInfoGetter const & infoGetter,
-           CategoriesHolder const & categories, CitiesBoundariesTable const & citiesBoundaries,
-           PreRanker & preRanker, LocalitiesCaches & localitiesCaches,
-           base::Cancellable const & cancellable);
+           CategoriesHolder const & categories, CitiesBoundariesTable const & citiesBoundaries, PreRanker & preRanker,
+           LocalitiesCaches & localitiesCaches, base::Cancellable const & cancellable);
   ~Geocoder();
 
   // Sets search query params.
@@ -195,8 +194,8 @@ private:
 
   void InitLayer(Model::Type type, TokenRange const & tokenRange, FeaturesLayer & layer);
 
-  void FillLocalityCandidates(BaseContext const & ctx, CBV const & filter,
-                              size_t const maxNumLocalities, std::vector<Locality> & preLocalities);
+  void FillLocalityCandidates(BaseContext const & ctx, CBV const & filter, size_t const maxNumLocalities,
+                              std::vector<Locality> & preLocalities);
 
   void FillLocalitiesTable(BaseContext const & ctx);
 
@@ -241,8 +240,7 @@ private:
   // Tries to do geocoding in a limited scope, assuming that knowledge
   // about high-level features, like cities or countries, is
   // incorporated into |filter|.
-  void LimitedSearch(BaseContext & ctx, FeaturesFilter const & filter,
-                     CentersFilter const & centers);
+  void LimitedSearch(BaseContext & ctx, FeaturesFilter const & filter, CentersFilter const & centers);
 
   template <typename Fn>
   void WithPostcodes(BaseContext & ctx, Fn && fn);
@@ -253,8 +251,7 @@ private:
   // Matches suburbs and streets inside suburbs like |GreedilyMatchStreets|.
   void GreedilyMatchStreetsWithSuburbs(BaseContext & ctx, CentersFilter const & centers);
 
-  void CreateStreetsLayerAndMatchLowerLayers(BaseContext & ctx,
-                                             StreetsMatcher::Prediction const & prediction,
+  void CreateStreetsLayerAndMatchLowerLayers(BaseContext & ctx, StreetsMatcher::Prediction const & prediction,
                                              CentersFilter const & centers, bool makeRelaxed);
 
   void ProcessStreets(BaseContext & ctx, CentersFilter const & centers, CBV const & streets);
@@ -274,17 +271,15 @@ private:
   // Finds all paths through layers and emits reachable features from the lowest layer.
   void FindPaths(BaseContext & ctx);
 
-  void TraceResult(Tracer & tracer, BaseContext const & ctx, MwmSet::MwmId const & mwmId,
-                   uint32_t ftId, Model::Type type, TokenRange const & tokenRange);
+  void TraceResult(Tracer & tracer, BaseContext const & ctx, MwmSet::MwmId const & mwmId, uint32_t ftId,
+                   Model::Type type, TokenRange const & tokenRange);
 
   // Forms result and feeds it to |m_preRanker|.
-  void EmitResult(BaseContext & ctx, FeatureID const & id, Model::Type type,
-                  TokenRange const & tokenRange, IntersectionResult const * geoParts,
-                  bool allTokensUsed, bool exactMatch);
-  void EmitResult(BaseContext & ctx, Region const & region, TokenRange const & tokenRange,
-                  bool allTokensUsed, bool exactMatch);
-  void EmitResult(BaseContext & ctx, City const & city, TokenRange const & tokenRange,
-                  bool allTokensUsed);
+  void EmitResult(BaseContext & ctx, FeatureID const & id, Model::Type type, TokenRange const & tokenRange,
+                  IntersectionResult const * geoParts, bool allTokensUsed, bool exactMatch);
+  void EmitResult(BaseContext & ctx, Region const & region, TokenRange const & tokenRange, bool allTokensUsed,
+                  bool exactMatch);
+  void EmitResult(BaseContext & ctx, City const & city, TokenRange const & tokenRange, bool allTokensUsed);
 
   // Tries to match unclassified objects from lower layers, like
   // parks, forests, lakes, rivers, etc. This method finds all
diff --git a/libs/search/geocoder_context.cpp b/libs/search/geocoder_context.cpp
index 735820b93..6dde4fabc 100644
--- a/libs/search/geocoder_context.cpp
+++ b/libs/search/geocoder_context.cpp
@@ -5,7 +5,6 @@
 #include "base/assert.hpp"
 #include "base/stl_helpers.hpp"
 
-
 namespace search
 {
 // static
@@ -62,10 +61,8 @@ bool BaseContext::IsTokenUsed(size_t token) const
 bool BaseContext::AllTokensUsed() const
 {
   for (size_t i = 0; i < m_tokens.size(); ++i)
-  {
     if (!IsTokenUsed(i))
       return false;
-  }
   return true;
 }
 
@@ -73,10 +70,8 @@ bool BaseContext::HasUsedTokensInRange(TokenRange const & range) const
 {
   ASSERT(range.IsValid(), (range));
   for (size_t i = range.Begin(); i < range.End(); ++i)
-  {
     if (IsTokenUsed(i))
       return true;
-  }
   return false;
 }
 
@@ -84,10 +79,8 @@ size_t BaseContext::NumUnusedTokenGroups() const
 {
   size_t numGroups = 0;
   for (size_t i = 0; i < m_tokens.size(); ++i)
-  {
     if (!IsTokenUsed(i) && (i == 0 || IsTokenUsed(i - 1)))
       ++numGroups;
-  }
   return numGroups;
 }
 
diff --git a/libs/search/geocoder_locality.hpp b/libs/search/geocoder_locality.hpp
index b24b8656d..828ab72eb 100644
--- a/libs/search/geocoder_locality.hpp
+++ b/libs/search/geocoder_locality.hpp
@@ -24,8 +24,7 @@ struct Locality
     , m_tokenRange(tokenRange)
     , m_queryVec(queryVec)
     , m_exactMatch(exactMatch)
-  {
-  }
+  {}
 
   uint32_t GetFeatureIndex() const { return m_featureId.m_index; }
 
@@ -62,9 +61,7 @@ struct Region : public Locality
 // states and Locality for smaller settlements.
 struct City : public Locality
 {
-  City(Locality && locality, Model::Type type) : Locality(std::move(locality)), m_type(type)
-  {
-  }
+  City(Locality && locality, Model::Type type) : Locality(std::move(locality)), m_type(type) {}
 
   m2::RectD m_rect;
   Model::Type m_type;
@@ -72,10 +69,8 @@ struct City : public Locality
 
 struct Suburb
 {
-  Suburb(FeatureID const & featureId, TokenRange const & tokenRange)
-    : m_featureId(featureId), m_tokenRange(tokenRange)
-  {
-  }
+  Suburb(FeatureID const & featureId, TokenRange const & tokenRange) : m_featureId(featureId), m_tokenRange(tokenRange)
+  {}
 
   FeatureID m_featureId;
   TokenRange m_tokenRange;
diff --git a/libs/search/geometry_cache.cpp b/libs/search/geometry_cache.cpp
index f42772aa0..30a3073c8 100644
--- a/libs/search/geometry_cache.cpp
+++ b/libs/search/geometry_cache.cpp
@@ -12,13 +12,13 @@ namespace search
 {
 // GeometryCache -----------------------------------------------------------------------------------
 GeometryCache::GeometryCache(size_t maxNumEntries, base::Cancellable const & cancellable)
-  : m_maxNumEntries(maxNumEntries), m_cancellable(cancellable)
+  : m_maxNumEntries(maxNumEntries)
+  , m_cancellable(cancellable)
 {
   CHECK_GREATER(m_maxNumEntries, 0, ());
 }
 
-void GeometryCache::InitEntry(MwmContext const & context, m2::RectD const & rect, int scale,
-                              Entry & entry)
+void GeometryCache::InitEntry(MwmContext const & context, m2::RectD const & rect, int scale, Entry & entry)
 {
   Retrieval retrieval(context, m_cancellable);
 
@@ -28,20 +28,18 @@ void GeometryCache::InitEntry(MwmContext const & context, m2::RectD const & rect
 }
 
 // PivotRectsCache ---------------------------------------------------------------------------------
-PivotRectsCache::PivotRectsCache(size_t maxNumEntries, base::Cancellable const & cancellable,
-                                 double maxRadiusMeters)
-  : GeometryCache(maxNumEntries, cancellable), m_maxRadiusMeters(maxRadiusMeters)
-{
-}
+PivotRectsCache::PivotRectsCache(size_t maxNumEntries, base::Cancellable const & cancellable, double maxRadiusMeters)
+  : GeometryCache(maxNumEntries, cancellable)
+  , m_maxRadiusMeters(maxRadiusMeters)
+{}
 
 CBV PivotRectsCache::Get(MwmContext const & context, m2::RectD const & rect, int scale)
 {
-  auto p = FindOrCreateEntry(
-      context.GetId(), [&rect, &scale](Entry const & entry)
-      {
-        return scale == entry.m_scale &&
-               (entry.m_rect.IsRectInside(rect) || IsEqualMercator(rect, entry.m_rect, kMwmPointAccuracy));
-      });
+  auto p = FindOrCreateEntry(context.GetId(), [&rect, &scale](Entry const & entry)
+  {
+    return scale == entry.m_scale &&
+           (entry.m_rect.IsRectInside(rect) || IsEqualMercator(rect, entry.m_rect, kMwmPointAccuracy));
+  });
   auto & entry = p.first;
   if (p.second)
   {
@@ -54,19 +52,14 @@ CBV PivotRectsCache::Get(MwmContext const & context, m2::RectD const & rect, int
 }
 
 // LocalityRectsCache ------------------------------------------------------------------------------
-LocalityRectsCache::LocalityRectsCache(size_t maxNumEntries,
-                                       base::Cancellable const & cancellable)
+LocalityRectsCache::LocalityRectsCache(size_t maxNumEntries, base::Cancellable const & cancellable)
   : GeometryCache(maxNumEntries, cancellable)
-{
-}
+{}
 
 CBV LocalityRectsCache::Get(MwmContext const & context, m2::RectD const & rect, int scale)
 {
   auto p = FindOrCreateEntry(context.GetId(), [&rect, &scale](Entry const & entry)
-                             {
-                               return scale == entry.m_scale &&
-                                      IsEqualMercator(rect, entry.m_rect, kMwmPointAccuracy);
-                             });
+  { return scale == entry.m_scale && IsEqualMercator(rect, entry.m_rect, kMwmPointAccuracy); });
   auto & entry = p.first;
   if (p.second)
     InitEntry(context, rect, scale, entry);
diff --git a/libs/search/geometry_cache.hpp b/libs/search/geometry_cache.hpp
index a75db8407..add3bed49 100644
--- a/libs/search/geometry_cache.hpp
+++ b/libs/search/geometry_cache.hpp
@@ -81,8 +81,7 @@ protected:
 class PivotRectsCache : public GeometryCache
 {
 public:
-  PivotRectsCache(size_t maxNumEntries, base::Cancellable const & cancellable,
-                  double maxRadiusMeters);
+  PivotRectsCache(size_t maxNumEntries, base::Cancellable const & cancellable, double maxRadiusMeters);
 
   // GeometryCache overrides:
   CBV Get(MwmContext const & context, m2::RectD const & rect, int scale) override;
diff --git a/libs/search/highlighting.cpp b/libs/search/highlighting.cpp
index f876b97e1..e0c3c188d 100644
--- a/libs/search/highlighting.cpp
+++ b/libs/search/highlighting.cpp
@@ -33,16 +33,12 @@ public:
     return *this;
   }
 
-  bool operator==(CombinedIterator const & other) const
-  {
-    return m_val == other.m_val && m_cur == other.m_cur;
-  }
+  bool operator==(CombinedIterator const & other) const { return m_val == other.m_val && m_cur == other.m_cur; }
 
   bool operator!=(CombinedIterator const & other) const { return !(*this == other); }
 };
 }  // namespace
 
-
 void HighlightResult(QueryTokens const & tokens, strings::UniString const & prefix, Result & res)
 {
   using Iter = QueryTokens::const_iterator;
@@ -52,17 +48,11 @@ void HighlightResult(QueryTokens const & tokens, strings::UniString const & pref
   CombinedIter end(tokens.end() /* cur */, tokens.end() /* end */, nullptr);
 
   // Highlight Title
-  SearchStringTokensIntersectionRanges(res.GetString(), beg, end,
-                                       [&](std::pair<uint16_t, uint16_t> const & range)
-  {
-    res.AddHighlightRange(range);
-  });
+  SearchStringTokensIntersectionRanges(
+      res.GetString(), beg, end, [&](std::pair<uint16_t, uint16_t> const & range) { res.AddHighlightRange(range); });
 
   // Highlight description.
-  SearchStringTokensIntersectionRanges(res.GetAddress(), beg, end,
-                                       [&](std::pair<uint16_t, uint16_t> const & range)
-  {
-    res.AddDescHighlightRange(range);
-  });
+  SearchStringTokensIntersectionRanges(res.GetAddress(), beg, end, [&](std::pair<uint16_t, uint16_t> const & range)
+  { res.AddDescHighlightRange(range); });
 }
 }  // namespace search
diff --git a/libs/search/highlighting.hpp b/libs/search/highlighting.hpp
index 1d7f93320..76d2925c3 100644
--- a/libs/search/highlighting.hpp
+++ b/libs/search/highlighting.hpp
@@ -14,8 +14,7 @@
 namespace search
 {
 template <typename LowTokensIter, typename F>
-void SearchStringTokensIntersectionRanges(std::string const & s, LowTokensIter itLowBeg,
-                                          LowTokensIter itLowEnd, F && f)
+void SearchStringTokensIntersectionRanges(std::string const & s, LowTokensIter itLowBeg, LowTokensIter itLowEnd, F && f)
 {
   // split input query by tokens and prefix
   search::Delimiters delimsTest;
diff --git a/libs/search/house_detector.cpp b/libs/search/house_detector.cpp
index d7e465264..63105b215 100644
--- a/libs/search/house_detector.cpp
+++ b/libs/search/house_detector.cpp
@@ -24,7 +24,6 @@
 
 #include <boost/iterator/transform_iterator.hpp>
 
-
 namespace search
 {
 using namespace std;
@@ -103,18 +102,15 @@ double const STREET_CONNECTION_LENGTH_M = 100.0;
 int const HN_NEARBY_DISTANCE = 4;
 double const STREET_CONNECTION_MAX_ANGLE = math::pi / 2.0;
 size_t const HN_COUNT_FOR_ODD_TEST = 16;
-//double const HN_MIN_READ_OFFSET_M = 50.0;
-//int const HN_NEARBY_INDEX_RANGE = 5;
+// double const HN_MIN_READ_OFFSET_M = 50.0;
+// int const HN_NEARBY_INDEX_RANGE = 5;
 double const HN_MAX_CONNECTION_DIST_M = 300.0;
 
 class StreetCreator
 {
 public:
   explicit StreetCreator(Street * st) : m_street(st) {}
-  void operator () (m2::PointD const & pt) const
-  {
-    m_street->m_points.push_back(pt);
-  }
+  void operator()(m2::PointD const & pt) const { m_street->m_points.push_back(pt); }
 
 private:
   Street * m_street;
@@ -133,12 +129,12 @@ double GetDistanceMeters(m2::PointD const & p1, m2::PointD const & p2)
 pair<double, double> GetConnectionAngleAndDistance(bool & isBeg, Street const * s1, Street const * s2)
 {
   m2::PointD const & p1 = isBeg ? s1->m_points.front() : s1->m_points.back();
-  m2::PointD const & p0 = isBeg ? s1->m_points[1] : s1->m_points[s1->m_points.size()-2];
+  m2::PointD const & p0 = isBeg ? s1->m_points[1] : s1->m_points[s1->m_points.size() - 2];
 
   double const d0 = p1.SquaredLength(s2->m_points.front());
   double const d2 = p1.SquaredLength(s2->m_points.back());
   isBeg = (d0 < d2);
-  m2::PointD const & p2 = isBeg ? s2->m_points[1] : s2->m_points[s2->m_points.size()-2];
+  m2::PointD const & p2 = isBeg ? s2->m_points[1] : s2->m_points[s2->m_points.size() - 2];
 
   return make_pair(ang::GetShortestDistance(ang::AngleTo(p0, p1), ang::AngleTo(p1, p2)), min(d0, d2));
 }
@@ -166,10 +162,8 @@ public:
   bool operator()(MergedStreet const & st) const
   {
     for (size_t i = 0; i < st.m_cont.size(); ++i)
-    {
       if (m_streets.count(st.m_cont[i]) > 0)
         return true;
-    }
     return false;
   }
 
@@ -280,10 +274,7 @@ public:
   House const * GetNearbyCandidate() const { return (HasBestMatch() ? 0 : m_results[3].house); }
 
 private:
-  bool IsBetter(int ind, double dist) const
-  {
-    return m_results[ind].house == 0 || m_results[ind].score > dist;
-  }
+  bool IsBetter(int ind, double dist) const { return m_results[ind].house == 0 || m_results[ind].score > dist; }
 
   ParsedNumber m_number;
   bool m_isOdd = false;
@@ -412,9 +403,10 @@ struct Competitiors
   uint32_t m_chainIndex;
   double m_score;
   Competitiors(uint32_t candidateIndex, uint32_t chainIndex, double score)
-    : m_candidateIndex(candidateIndex), m_chainIndex(chainIndex), m_score(score)
-  {
-  }
+    : m_candidateIndex(candidateIndex)
+    , m_chainIndex(chainIndex)
+    , m_score(score)
+  {}
   bool operator<(Competitiors const & c) const { return m_score < c.m_score; }
 };
 
@@ -452,10 +444,8 @@ void ProccessHouses(vector<HouseProjection const *> const & st, ResultAccumulato
       ASSERT_LESS(used.size(), numeric_limits<uint32_t>::max(), ());
       uint32_t const count = static_cast<uint32_t>(used.size());
       for (uint32_t i = 0; i < count; ++i)
-      {
         if (!used[i] && st[i]->m_house->GetIntNumber() == candidateHouseNumber)
           candidates.push_back(i);
-      }
 
       bool shouldAddHouseToQueue = false;
       vector<Competitiors> comp;
@@ -470,12 +460,10 @@ void ProccessHouses(vector<HouseProjection const *> const & st, ResultAccumulato
           {
             double dist = numeric_limits<double>::max();
             for (size_t k = 0; k < houseChains[j].houses.size(); ++k)
-            {
-              if (abs(houseChains[j].houses[k]->m_house->GetIntNumber() -
-                      st[candidates[i]]->m_house->GetIntNumber()) <= HN_NEARBY_DISTANCE)
+              if (abs(houseChains[j].houses[k]->m_house->GetIntNumber() - st[candidates[i]]->m_house->GetIntNumber()) <=
+                  HN_NEARBY_DISTANCE)
                 dist = min(dist, GetDistanceMeters(houseChains[j].houses[k]->m_house->GetPosition(),
                                                    st[candidates[i]]->m_house->GetPosition()));
-            }
             if (dist < HN_MAX_CONNECTION_DIST_M)
               comp.push_back(Competitiors(candidates[i], static_cast<uint32_t>(j), dist));
           }
@@ -582,8 +570,7 @@ struct GreaterSecond
   }
 };
 
-void ProduceVoting(vector<ResultAccumulator> const & acc, vector<HouseResult> & res,
-                   MergedStreet const & st)
+void ProduceVoting(vector<ResultAccumulator> const & acc, vector<HouseResult> & res, MergedStreet const & st)
 {
   buffer_vector<pair<House const *, size_t>, 4> voting;
 
@@ -600,12 +587,10 @@ void ProduceVoting(vector<ResultAccumulator> const & acc, vector<HouseResult> &
   // Emit results with equal best score.
   size_t const score = voting[0].second;
   for (size_t i = 0; i < voting.size(); ++i)
-  {
     if (score == voting[i].second)
       res.push_back(HouseResult(voting[i].first, &st));
     else
       break;
-  }
 }
 }  // namespace
 
@@ -625,9 +610,7 @@ ParsedNumber::ParsedNumber(string const & number, bool american) : m_fullN(numbe
     switch (number[curr])
     {
     case ' ':
-    case '\t':
-      ++curr;
-      break;
+    case '\t': ++curr; break;
     case ',':
     case ';':
       ++curr;
@@ -672,11 +655,8 @@ ParsedNumber::ParsedNumber(string const & number, bool american) : m_fullN(numbe
     {
       if (abs(m_endN - m_startN) >= 2 * HN_NEARBY_DISTANCE)
         m_endN = -1;
-      else
-      {
-        if (m_startN > m_endN)
-          std::swap(m_startN, m_endN);
-      }
+      else if (m_startN > m_endN)
+        std::swap(m_startN, m_endN);
     }
   }
 }
@@ -748,16 +728,21 @@ void Street::Reverse()
   reverse(m_points.begin(), m_points.end());
 }
 
-void Street::SortHousesProjection() { sort(m_houses.begin(), m_houses.end(), &LessStreetDistance); }
+void Street::SortHousesProjection()
+{
+  sort(m_houses.begin(), m_houses.end(), &LessStreetDistance);
+}
 
-HouseDetector::HouseDetector(DataSource const & dataSource)
-  : m_loader(dataSource), m_streetNum(0)
+HouseDetector::HouseDetector(DataSource const & dataSource) : m_loader(dataSource), m_streetNum(0)
 {
   // Default value for conversions.
   SetMetersToMercator(mercator::Bounds::kDegreesInMeter);
 }
 
-HouseDetector::~HouseDetector() { ClearCaches(); }
+HouseDetector::~HouseDetector()
+{
+  ClearCaches();
+}
 
 void HouseDetector::SetMetersToMercator(double factor)
 {
@@ -858,10 +843,10 @@ int HouseDetector::LoadStreets(vector<FeatureID> const & ids)
 
     // Do clear cache if we have elements that are present in the one set,
     // but not in the other one (set's order is irrelevant).
-    size_t const count = set_intersection(make_transform_iterator(m_id2st.begin(), f),
-                                          make_transform_iterator(m_id2st.end(), f), ids.begin(),
-                                          ids.end(), CounterIterator())
-                             .GetCount();
+    size_t const count =
+        set_intersection(make_transform_iterator(m_id2st.begin(), f), make_transform_iterator(m_id2st.end(), f),
+                         ids.begin(), ids.end(), CounterIterator())
+            .GetCount();
 
     if (count < min(ids.size(), m_id2st.size()))
     {
@@ -926,9 +911,9 @@ int HouseDetector::MergeStreets()
 {
   LOG(LDEBUG, ("MergeStreets() called", m_id2st.size()));
 
-  //#ifdef DEBUG
-  //  KMLFileGuard file("dbg_merged_streets.kml");
-  //#endif
+  // #ifdef DEBUG
+  //   KMLFileGuard file("dbg_merged_streets.kml");
+  // #endif
 
   for (auto it = m_id2st.begin(); it != m_id2st.end(); ++it)
   {
@@ -944,16 +929,16 @@ int HouseDetector::MergeStreets()
   // Put longer streets first (for better house scoring).
   sort(m_streets.begin(), m_streets.end(), MergedStreet::GreaterLength());
 
-  //#ifdef DEBUG
-  //  char const * arrColor[] = { "FFFF0000", "FF00FFFF", "FFFFFF00", "FF0000FF", "FF00FF00",
-  //  "FFFF00FF" };
+  // #ifdef DEBUG
+  //   char const * arrColor[] = { "FFFF0000", "FF00FFFF", "FFFFFF00", "FF0000FF", "FF00FF00",
+  //   "FFFF00FF" };
 
   //  // Write to kml from short to long to get the longest one at the top.
   //  for (int i = int(m_streets.size()) - 1; i >= 0; --i)
   //  {
   //    Streets2KML(file.GetStream(), m_streets[i], arrColor[i % ARRAY_SIZE(arrColor)]);
   //  }
-  //#endif
+  // #endif
 
   LOG(LDEBUG, ("MergeStreets() result", m_streetNum));
   return m_streetNum;
@@ -1002,10 +987,8 @@ void MergedStreet::FinishReadingHouses()
   for (size_t i = 0; i < m_cont.size(); ++i)
   {
     if (i != 0)
-    {
       for (size_t j = 0; j < m_cont[i]->m_houses.size(); ++j)
         m_cont[i]->m_houses[j].m_streetDistance += length;
-    }
 
     length += m_cont[i]->m_length;
     m_cont[i]->m_housesRead = true;
@@ -1094,14 +1077,12 @@ void HouseDetector::ReadHouse(FeatureType & f, Street * st, ProjectionCalculator
   auto const it = m_id2house.find(f.GetID());
   bool const isNew = it == m_id2house.end();
 
-  m2::PointD const pt =
-      isNew ? f.GetLimitRect(FeatureType::BEST_GEOMETRY).Center() : it->second->GetPosition();
+  m2::PointD const pt = isNew ? f.GetLimitRect(FeatureType::BEST_GEOMETRY).Center() : it->second->GetPosition();
 
   HouseProjection pr;
   if (calc.GetProjection(pt, pr) && pr.m_distMeters <= m_houseOffsetM)
   {
-    pr.m_streetDistance =
-        st->GetPrefixLength(pr.m_segIndex) + st->m_points[pr.m_segIndex].Length(pr.m_proj);
+    pr.m_streetDistance = st->GetPrefixLength(pr.m_segIndex) + st->m_points[pr.m_segIndex].Length(pr.m_proj);
 
     House * p;
     if (isNew)
@@ -1129,9 +1110,8 @@ void HouseDetector::ReadHouses(Street * st)
   // offsetMeters));
 
   ProjectionOnStreetCalculator calc(st->m_points);
-  m_loader.ForEachInRect(st->GetLimitRect(m_houseOffsetM), [this, &st, &calc](FeatureType & ft) {
-    ReadHouse<ProjectionOnStreetCalculator>(ft, st, calc);
-  });
+  m_loader.ForEachInRect(st->GetLimitRect(m_houseOffsetM), [this, &st, &calc](FeatureType & ft)
+  { ReadHouse<ProjectionOnStreetCalculator>(ft, st, calc); });
 
   st->m_length = st->GetLength();
   st->SortHousesProjection();
@@ -1145,10 +1125,8 @@ void HouseDetector::ReadAllHouses(double offsetMeters)
     ReadHouses(e.second);
 
   for (auto & st : m_streets)
-  {
     if (!st.IsHousesRead())
       st.FinishReadingHouses();
-  }
 }
 
 void HouseDetector::ClearCaches()
@@ -1171,7 +1149,6 @@ void HouseDetector::ClearUnusedStreets(vector<FeatureID> const & ids)
 {
   set<Street *> streets;
   for (auto it = m_id2st.begin(); it != m_id2st.end();)
-  {
     if (!binary_search(ids.begin(), ids.end(), it->first))
     {
       streets.insert(it->second);
@@ -1179,11 +1156,9 @@ void HouseDetector::ClearUnusedStreets(vector<FeatureID> const & ids)
     }
     else
       ++it;
-  }
 
   m_end2st.erase(remove_if(m_end2st.begin(), m_end2st.end(), HasSecond(streets)), m_end2st.end());
-  m_streets.erase(remove_if(m_streets.begin(), m_streets.end(), HasStreet(streets)),
-                  m_streets.end());
+  m_streets.erase(remove_if(m_streets.begin(), m_streets.end(), HasStreet(streets)), m_streets.end());
 
   for_each(streets.begin(), streets.end(), base::DeleteFunctor());
 }
@@ -1206,7 +1181,7 @@ void HouseDetector::GetHouseForName(string const & houseNumber, vector<HouseResu
 
   vector<ResultAccumulator> acc(3, ResultAccumulator(houseNumber));
 
-  int offsets[] = { 25, 50, 100, 200, 500 };
+  int offsets[] = {25, 50, 100, 200, 500};
 
   for (size_t i = 0; i < count; ++i)
   {
@@ -1227,7 +1202,7 @@ void HouseDetector::GetHouseForName(string const & houseNumber, vector<HouseResu
       }
     }
 
-end:
+  end:
     ProduceVoting(acc, res, m_streets[i]);
 
     for (size_t j = 0; j < acc.size(); ++j)
@@ -1238,7 +1213,10 @@ end:
   res.erase(unique(res.begin(), res.end()), res.end());
 }
 
-string DebugPrint(HouseProjection const & p) { return p.m_house->GetNumber(); }
+string DebugPrint(HouseProjection const & p)
+{
+  return p.m_house->GetNumber();
+}
 
 string DebugPrint(HouseResult const & r)
 {
diff --git a/libs/search/house_detector.hpp b/libs/search/house_detector.hpp
index 83ab066e2..1f728a90b 100644
--- a/libs/search/house_detector.hpp
+++ b/libs/search/house_detector.hpp
@@ -76,7 +76,7 @@ struct HouseProjection : public ProjectionOnStreet
   {
   public:
     explicit EqualHouse(House const * h) : m_house(h) {}
-    bool operator() (HouseProjection const * p) const { return m_house == p->m_house; }
+    bool operator()(HouseProjection const * p) const { return m_house == p->m_house; }
 
   private:
     House const * m_house;
@@ -106,10 +106,7 @@ public:
 
   double GetPrefixLength(size_t numSegs) const;
 
-  static bool IsSameStreets(Street const * s1, Street const * s2)
-  {
-    return s1->m_processedName == s2->m_processedName;
-  }
+  static bool IsSameStreets(Street const * s1, Street const * s2) { return s1->m_processedName == s2->m_processedName; }
 
   void SetName(std::string_view name);
   std::string const & GetDbgName() const { return m_processedName; }
@@ -137,10 +134,7 @@ public:
 
   struct GreaterLength
   {
-    bool operator() (MergedStreet const & s1, MergedStreet const & s2) const
-    {
-      return (s1.m_length > s2.m_length);
-    }
+    bool operator()(MergedStreet const & s1, MergedStreet const & s2) const { return (s1.m_length > s2.m_length); }
   };
 
   MergedStreet() : m_length(0.0) {}
@@ -190,9 +184,7 @@ private:
 
 struct HouseResult
 {
-  HouseResult(House const * house, MergedStreet const * street) : m_house(house), m_street(street)
-  {
-  }
+  HouseResult(House const * house, MergedStreet const * street) : m_house(house), m_street(street) {}
 
   bool operator<(HouseResult const & a) const { return m_house < a.m_house; }
   bool operator==(HouseResult const & a) const { return m_house == a.m_house; }
diff --git a/libs/search/house_numbers_matcher.cpp b/libs/search/house_numbers_matcher.cpp
index e395d3c53..6d34e4d5c 100644
--- a/libs/search/house_numbers_matcher.cpp
+++ b/libs/search/house_numbers_matcher.cpp
@@ -48,50 +48,27 @@ namespace
 // "way", "we", "west",
 
 char const * g_strings[] = {
-    "aa",     "ab",      "abc",     "ac",   "ad",   "ae",      "af",      "ag",
-    "ah",     "ai",      "aj",      "ak",   "al",   "am",      "an",      "ao",       "ap",
-    "aq",     "ar",      "are",     "as",   "at",   "au",      "aw",
-    "ax",     "ay",      "az",      "azm",  "ba",   "bab",     "bah",     "bak",
-    "bb",     "bc",      "bd",      "be",   "bedr", "ben",     "bf",      "bg",       "bh",
-    "bij",    "bis",     "bk",      "bl",   "bldg", "blk",     "bloc",    "block",    "bloco",
-    "blok",   "bm",      "bmn",     "bn",   "bo",   "boe",     "bol",     "bor",      "bov",
-    "box",    "bp",      "br",      "bra",  "brc",  "bs",      "bsa",     "bu",       "building",
-    "bv",     "bwn",     "bx",      "by",   "cab",  "cat",     "cbi",     "cbu",      "cc",
-    "ccz",    "cd",      "ce",      "centre", "cfn",  "cgc",   "cjg",     "cl",       "club",
-    "cottage", "cottages", "cso",   "cum",  "db",   "dd",      "df",
-    "dia",    "dvu",     "ec",      "ee",   "eh",   "em",      "en",      "esm",
-    "ev",     "fdo",     "fer",     "ff",   "flat", "flats",   "floor",
-    "gar",    "gara",    "gas",     "gb",   "gg",   "gr",
-    "grg",    "ha",      "haus",    "hh",   "hl",   "ho",      "house",   "hr",
-    "hs",     "hv",      "ii",      "iii",  "int",  "iv",      "ix",
-    "jab",    "jf",      "jj",      "jms",  "jtg",  "ka",      "kab",     "kk",
-    "kmb",    "kmk",     "knn",     "koy",  "kp",   "kra",     "ksn",     "kud",
-    "ldo",    "ll",      "local",   "loja", "lot",  "lote",
-    "lsb",    "lt",      "mac",     "mad",  "mah",  "mak",     "mat",     "mb",
-    "mbb",    "mbn",     "mch",     "mei",  "mks",  "mm",      "mny",     "mo",       "mok",
-    "mor",    "msb",     "mtj",     "mtk",  "mvd",  "na",
-    "ncc",    "nij",     "nn",      "no",   "nr",   "nst",     "nu",      "nut",
-    "of",     "ofof",    "old",     "one",  "oo",   "opl",     "pa",
-    "pap",    "pav",     "pb",      "pch",  "pg",   "ph",      "phd",
-    "pkf",    "plot",    "po",      "pos",  "pp",   "pr",      "pra",     "pya",
-    "qq",     "quater",  "ra",      "rbo",  "rear", "reisach",
-    "rk",     "rm",      "rosso",   "rs",   "rw",
-    "sab",    "sal",     "sav",     "sb",   "sba",  "sbb",     "sbl",     "sbn",      "sbx",
-    "sc",     "sch",     "sco",     "seb",  "sep",  "sf",      "sgr",     "sir",
-    "sj",     "sl",      "sm",      "sn",   "snc",  "som",     "sp",
-    "spi",    "spn",     "ss",      "sta",  "stc",  "std",     "stiege",
-    "suite",  "sur",     "tam",     "ter",  "terrace", "tf",   "th",      "the",
-    "tl",     "to",      "torre",   "tr",   "traf", "trd",     "ts",      "tt",       "tu",
-    "uhm",    "unit",    "utc",     "vii",  "wa",
-    "wf",     "wink",    "wrh",     "ws",   "wsb",
-    "xx",     "za",      "zh",      "zona", "zu",   "zw",      "א",
-    "ב",      "ג",       "α",       "бб",   "бл",   "вл",
-    "вх",    "лит",      "разр",    "стр",  "тп",   "уч",      "участок", "ა",
-    "丁目",   "之",       "号",      "號",
+    "aa", "ab", "abc", "ac", "ad", "ae", "af", "ag", "ah", "ai", "aj", "ak", "al", "am", "an", "ao", "ap", "aq", "ar",
+    "are", "as", "at", "au", "aw", "ax", "ay", "az", "azm", "ba", "bab", "bah", "bak", "bb", "bc", "bd", "be", "bedr",
+    "ben", "bf", "bg", "bh", "bij", "bis", "bk", "bl", "bldg", "blk", "bloc", "block", "bloco", "blok", "bm", "bmn",
+    "bn", "bo", "boe", "bol", "bor", "bov", "box", "bp", "br", "bra", "brc", "bs", "bsa", "bu", "building", "bv", "bwn",
+    "bx", "by", "cab", "cat", "cbi", "cbu", "cc", "ccz", "cd", "ce", "centre", "cfn", "cgc", "cjg", "cl", "club",
+    "cottage", "cottages", "cso", "cum", "db", "dd", "df", "dia", "dvu", "ec", "ee", "eh", "em", "en", "esm", "ev",
+    "fdo", "fer", "ff", "flat", "flats", "floor", "gar", "gara", "gas", "gb", "gg", "gr", "grg", "ha", "haus", "hh",
+    "hl", "ho", "house", "hr", "hs", "hv", "ii", "iii", "int", "iv", "ix", "jab", "jf", "jj", "jms", "jtg", "ka", "kab",
+    "kk", "kmb", "kmk", "knn", "koy", "kp", "kra", "ksn", "kud", "ldo", "ll", "local", "loja", "lot", "lote", "lsb",
+    "lt", "mac", "mad", "mah", "mak", "mat", "mb", "mbb", "mbn", "mch", "mei", "mks", "mm", "mny", "mo", "mok", "mor",
+    "msb", "mtj", "mtk", "mvd", "na", "ncc", "nij", "nn", "no", "nr", "nst", "nu", "nut", "of", "ofof", "old", "one",
+    "oo", "opl", "pa", "pap", "pav", "pb", "pch", "pg", "ph", "phd", "pkf", "plot", "po", "pos", "pp", "pr", "pra",
+    "pya", "qq", "quater", "ra", "rbo", "rear", "reisach", "rk", "rm", "rosso", "rs", "rw", "sab", "sal", "sav", "sb",
+    "sba", "sbb", "sbl", "sbn", "sbx", "sc", "sch", "sco", "seb", "sep", "sf", "sgr", "sir", "sj", "sl", "sm", "sn",
+    "snc", "som", "sp", "spi", "spn", "ss", "sta", "stc", "std", "stiege", "suite", "sur", "tam", "ter", "terrace",
+    "tf", "th", "the", "tl", "to", "torre", "tr", "traf", "trd", "ts", "tt", "tu", "uhm", "unit", "utc", "vii", "wa",
+    "wf", "wink", "wrh", "ws", "wsb", "xx", "za", "zh", "zona", "zu", "zw", "א", "ב", "ג", "α", "бб", "бл", "вл", "вх",
+    "лит", "разр", "стр", "тп", "уч", "участок", "ა", "丁目", "之", "号", "號",
 
     // List of exceptions
-    "владение"
-};
+    "владение"};
 
 // Common strings in house numbers.
 // To get this list, just run:
@@ -99,27 +76,20 @@ char const * g_strings[] = {
 // ./clusterize-tag-values.lisp house-number path-to-taginfo-db.db > numbers.txt
 // tail -n +2 numbers.txt  | head -78 | sed 's/^.*) \(.*\) \[.*$/"\1"/g;s/[ -/]//g;s/$/,/' |
 // sort | uniq
-vector<string> const g_patterns = {
-    "BL",  "BLN",  "BLNSL", "BN",   "BNL",    "BNSL", "L",   "LL",   "LN",  "LNL",  "LNLN", "LNN",
-    "N",   "NBL",  "NBLN",  "NBN",  "NBNBN",  "NBNL", "NL",  "NLBN", "NLL", "NLLN", "NLN",  "NLNL",
-    "NLS", "NLSN", "NN",    "NNBN", "NNL",    "NNLN", "NNN", "NNS",  "NS",  "NSN",  "NSS",  "S",
-    "SL",  "SLL",  "SLN",   "SN",   "SNBNSS", "SNL",  "SNN", "SS",   "SSN", "SSS",  "SSSS",
+vector<string> const g_patterns = {"BL", "BLN", "BLNSL", "BN", "BNL", "BNSL", "L", "LL", "LN", "LNL", "LNLN", "LNN",
+                                   "N", "NBL", "NBLN", "NBN", "NBNBN", "NBNL", "NL", "NLBN", "NLL", "NLLN", "NLN",
+                                   "NLNL", "NLS", "NLSN", "NN", "NNBN", "NNL", "NNLN", "NNN", "NNS", "NS", "NSN", "NSS",
+                                   "S", "SL", "SLL", "SLN", "SN", "SNBNSS", "SNL", "SNN", "SS", "SSN", "SSS", "SSSS",
 
-    // List of exceptions
-    "NNBNL"
-};
+                                   // List of exceptions
+                                   "NNBNL"};
 
 // List of patterns which look like house numbers more than other patterns. Constructed by hand.
-vector<string> const g_patternsStrict = {
-    "N", "NBN", "NBL", "NL"
-};
-
+vector<string> const g_patternsStrict = {"N", "NBN", "NBL", "NL"};
 
 // List of common synonyms for building parts. Constructed by hand.
-char const * g_buildingPartSynonyms[] = {
-    "building", "bldg", "bld",   "bl",  "unit",     "block", "blk",  "корпус",
-    "корп",     "кор",  "литер", "лит", "строение", "стр",   "блок", "бл"
-};
+char const * g_buildingPartSynonyms[] = {"building", "bldg", "bld",   "bl",  "unit",     "block", "blk",  "корпус",
+                                         "корп",     "кор",  "литер", "лит", "строение", "стр",   "блок", "бл"};
 
 // List of common stop words for buildings. Constructed by hand.
 UniString const g_stopWords[] = {MakeUniString("дом"), MakeUniString("house"), MakeUniString("д")};
@@ -127,10 +97,8 @@ UniString const g_stopWords[] = {MakeUniString("дом"), MakeUniString("house")
 bool IsStopWord(UniString const & s, bool isPrefix)
 {
   for (auto const & p : g_stopWords)
-  {
     if ((isPrefix && StartsWith(p, s)) || (!isPrefix && p == s))
       return true;
-  }
   return false;
 }
 
@@ -149,10 +117,7 @@ public:
   }
 
   // Returns true if |s| looks like a building synonym.
-  inline bool Has(UniString const & s) const
-  {
-    return m_synonyms.Has(s.begin(), s.end()) == Synonyms::Status::Full;
-  }
+  inline bool Has(UniString const & s) const { return m_synonyms.Has(s.begin(), s.end()) == Synonyms::Status::Full; }
 
 private:
   Synonyms m_synonyms;
@@ -205,10 +170,7 @@ public:
   HouseNumberClassifier(vector<string> const & patterns = g_patterns)
   {
     for (auto const & p : patterns)
-    {
-      m_patterns.Add(make_transform_iterator(p.begin(), &CharToType),
-                     make_transform_iterator(p.end(), &CharToType));
-    }
+      m_patterns.Add(make_transform_iterator(p.begin(), &CharToType), make_transform_iterator(p.end(), &CharToType));
   }
 
   // Returns true when the string |s| looks like a valid house number,
@@ -306,8 +268,7 @@ Token::Type GetCharType(UniChar c)
 
 bool IsLiteralType(Token::Type type)
 {
-  return type == Token::TYPE_STRING || type == Token::TYPE_LETTER ||
-         type == Token::TYPE_BUILDING_PART_OR_LETTER;
+  return type == Token::TYPE_STRING || type == Token::TYPE_LETTER || type == Token::TYPE_BUILDING_PART_OR_LETTER;
 }
 
 // Leaves only numbers and letters, removes all trailing prefix
@@ -368,10 +329,8 @@ bool IsShortBuildingSynonym(UniString const & t)
 {
   static UniString const kSynonyms[] = {MakeUniString("к"), MakeUniString("с")};
   for (auto const & s : kSynonyms)
-  {
     if (t == s)
       return true;
-  }
   return false;
 }
 
@@ -458,10 +417,7 @@ uint64_t ToUInt(UniString const & s)
 void Tokenize(UniString s, bool isPrefix, TokensT & ts)
 {
   MakeLowerCaseInplace(s);
-  auto addToken = [&ts](UniString && value, Token::Type type)
-  {
-    ts.emplace_back(std::move(value), type);
-  };
+  auto addToken = [&ts](UniString && value, Token::Type type) { ts.emplace_back(std::move(value), type); };
 
   size_t i = 0;
   while (i < s.size())
@@ -519,31 +475,29 @@ void ParseHouseNumber(UniString const & s, vector<TokensT> & parses)
 
   bool numbersSequence = true;
   ForEachGroup(tokens, [&tokens, &numbersSequence](size_t i, size_t j)
-               {
-                 switch (j - i)
-                 {
-                 case 0: break;
-                 case 1:
-                   numbersSequence = numbersSequence && tokens[i].m_type == Token::TYPE_NUMBER;
-                   break;
-                 case 2:
-                   numbersSequence = numbersSequence && tokens[i].m_type == Token::TYPE_NUMBER &&
-                                     IsLiteralType(tokens[i + 1].m_type);
-                   break;
-                 default: numbersSequence = false; break;
-                 }
-               });
+  {
+    switch (j - i)
+    {
+    case 0: break;
+    case 1: numbersSequence = numbersSequence && tokens[i].m_type == Token::TYPE_NUMBER; break;
+    case 2:
+      numbersSequence =
+          numbersSequence && tokens[i].m_type == Token::TYPE_NUMBER && IsLiteralType(tokens[i + 1].m_type);
+      break;
+    default: numbersSequence = false; break;
+    }
+  });
 
   size_t const oldSize = parses.size();
   if (numbersSequence)
   {
     ForEachGroup(tokens, [&tokens, &parses](size_t i, size_t j)
-                 {
-                   parses.emplace_back();
-                   auto & parse = parses.back();
-                   for (size_t k = i; k < j; ++k)
-                     parse.emplace_back(std::move(tokens[k]));
-                 });
+    {
+      parses.emplace_back();
+      auto & parse = parses.back();
+      for (size_t k = i; k < j; ++k)
+        parse.emplace_back(std::move(tokens[k]));
+    });
   }
   else
   {
@@ -597,13 +551,13 @@ bool HouseNumbersMatchConscription(UniString const & houseNumber, TokensT const
   if (i != end)
   {
     // Conscription number / street number.
-    return HouseNumbersMatch(UniString(beg, i), queryParse) ||
-           HouseNumbersMatch(UniString(i + 1, end), queryParse);
+    return HouseNumbersMatch(UniString(beg, i), queryParse) || HouseNumbersMatch(UniString(i + 1, end), queryParse);
   }
   return HouseNumbersMatch(houseNumber, queryParse);
 }
 
-bool HouseNumbersMatchRange(std::string_view const & hnRange, TokensT const & queryParse, feature::InterpolType interpol)
+bool HouseNumbersMatchRange(std::string_view const & hnRange, TokensT const & queryParse,
+                            feature::InterpolType interpol)
 {
   ASSERT(interpol != feature::InterpolType::None, ());
 
diff --git a/libs/search/house_numbers_matcher.hpp b/libs/search/house_numbers_matcher.hpp
index 90288cc25..79b21f0e1 100644
--- a/libs/search/house_numbers_matcher.hpp
+++ b/libs/search/house_numbers_matcher.hpp
@@ -35,10 +35,7 @@ struct Token
   Token & operator=(Token &&) = default;
   Token & operator=(Token const &) = default;
 
-  bool operator==(Token const & rhs) const
-  {
-    return m_type == rhs.m_type && m_value == rhs.m_value;
-  }
+  bool operator==(Token const & rhs) const { return m_type == rhs.m_type && m_value == rhs.m_value; }
 
   bool operator!=(Token const & rhs) const { return !(*this == rhs); }
 
@@ -73,7 +70,8 @@ void ParseQuery(strings::UniString const & query, bool queryIsPrefix, TokensT &
 /// @{
 bool HouseNumbersMatch(strings::UniString const & houseNumber, TokensT const & queryParse);
 bool HouseNumbersMatchConscription(strings::UniString const & houseNumber, TokensT const & queryParse);
-bool HouseNumbersMatchRange(std::string_view const & hnRange, TokensT const & queryParse, feature::InterpolType interpol);
+bool HouseNumbersMatchRange(std::string_view const & hnRange, TokensT const & queryParse,
+                            feature::InterpolType interpol);
 /// @}
 
 // Returns true if |s| looks like a house number.
diff --git a/libs/search/house_to_street_table.cpp b/libs/search/house_to_street_table.cpp
index fe5eba61c..038a4ad48 100644
--- a/libs/search/house_to_street_table.cpp
+++ b/libs/search/house_to_street_table.cpp
@@ -55,7 +55,7 @@ public:
     uint32_t fID;
     if (!m_map->Get(houseId, fID))
       return {};
-    return {{ fID, StreetIdType::FeatureId }};
+    return {{fID, StreetIdType::FeatureId}};
   }
 
 private:
@@ -99,7 +99,7 @@ unique_ptr<HouseToStreetTable> LoadHouseTableImpl(MwmValue const & value, std::s
     result = make_unique<DummyTable>();
   return result;
 }
-} // namespace
+}  // namespace
 
 std::unique_ptr<HouseToStreetTable> LoadHouseToStreetTable(MwmValue const & value)
 {
@@ -146,8 +146,7 @@ void HouseToStreetTableBuilder::Freeze(Writer & writer) const
 
   header.m_tableOffset = base::asserted_cast<uint32_t>(writer.Pos() - startOffset);
   m_builder.Freeze(writer, writeBlockCallback);
-  header.m_tableSize =
-      base::asserted_cast<uint32_t>(writer.Pos() - header.m_tableOffset - startOffset);
+  header.m_tableSize = base::asserted_cast<uint32_t>(writer.Pos() - header.m_tableOffset - startOffset);
 
   auto const endOffset = writer.Pos();
   writer.Seek(startOffset);
diff --git a/libs/search/idf_map.cpp b/libs/search/idf_map.cpp
index 4638aa85b..46f69a3f9 100644
--- a/libs/search/idf_map.cpp
+++ b/libs/search/idf_map.cpp
@@ -4,8 +4,7 @@
 
 namespace search
 {
-IdfMap::IdfMap(Delegate const & delegate, double unknownIdf)
-  : m_delegate(delegate), m_unknownIdf(unknownIdf)
+IdfMap::IdfMap(Delegate const & delegate, double unknownIdf) : m_delegate(delegate), m_unknownIdf(unknownIdf)
 {
   ASSERT_GREATER(m_unknownIdf, 0.0, ());
 }
diff --git a/libs/search/intermediate_result.cpp b/libs/search/intermediate_result.cpp
index bd74978fb..1c06e1e94 100644
--- a/libs/search/intermediate_result.cpp
+++ b/libs/search/intermediate_result.cpp
@@ -11,8 +11,8 @@
 #include "indexer/ftypes_matcher.hpp"
 #include "indexer/road_shields_parser.hpp"
 
-#include "platform/measurement_utils.hpp"
 #include "platform/localization.hpp"
+#include "platform/measurement_utils.hpp"
 
 #include "base/string_utils.hpp"
 
@@ -34,10 +34,7 @@ class SkipRegionInfo
 public:
   SkipRegionInfo()
   {
-    base::StringIL arr[] = {
-      {"place", "continent"},
-      {"place", "country"}
-    };
+    base::StringIL arr[] = {{"place", "continent"}, {"place", "country"}};
     static_assert(kCount == ARRAY_SIZE(arr), "");
 
     Classificator const & c = classif();
@@ -48,10 +45,8 @@ public:
   bool IsSkip(uint32_t type) const
   {
     for (uint32_t t : m_types)
-    {
       if (t == type)
         return true;
-    }
     return false;
   }
 };
@@ -60,10 +55,11 @@ public:
 // PreRankerResult ---------------------------------------------------------------------------------
 PreRankerResult::PreRankerResult(FeatureID const & id, PreRankingInfo const & info,
                                  vector<ResultTracer::Branch> const & provenance)
-: m_id(id), m_info(info)
-, m_isRelaxed(base::IsExist(provenance, ResultTracer::Branch::Relaxed))
+  : m_id(id)
+  , m_info(info)
+  , m_isRelaxed(base::IsExist(provenance, ResultTracer::Branch::Relaxed))
 #ifdef SEARCH_USE_PROVENANCE
-, m_provenance(provenance)
+  , m_provenance(provenance)
 #endif
 {
   ASSERT(m_id.IsValid(), ());
@@ -104,7 +100,7 @@ int PreRankerResult::CompareByTokensMatch(PreRankerResult const & lhs, PreRanker
     return lRange.Size() > rRange.Size() ? -1 : 1;
 
   if (lhs.m_matchedTokensNumber != rhs.m_matchedTokensNumber)
-     return lhs.m_matchedTokensNumber > rhs.m_matchedTokensNumber ? -1 : 1;
+    return lhs.m_matchedTokensNumber > rhs.m_matchedTokensNumber ? -1 : 1;
 
   if (lRange.Begin() != rRange.Begin())
     return lRange.Begin() < rRange.Begin() ? -1 : 1;
@@ -123,8 +119,7 @@ bool PreRankerResult::LessByExactMatch(PreRankerResult const & lhs, PreRankerRes
   return CompareByTokensMatch(lhs, rhs) == -1;
 }
 
-bool PreRankerResult::CategoriesComparator::operator()(PreRankerResult const & lhs,
-                                                       PreRankerResult const & rhs) const
+bool PreRankerResult::CategoriesComparator::operator()(PreRankerResult const & lhs, PreRankerResult const & rhs) const
 {
   if (m_positionIsInsideViewport)
     return lhs.GetDistance() < rhs.GetDistance();
@@ -145,17 +140,14 @@ std::string DebugPrint(PreRankerResult const & r)
 {
   ostringstream os;
   os << "PreRankerResult "
-     << "{ FID: " << r.GetId().m_index    // index is enough here for debug purpose
-     << "; m_matchedTokensNumber: " << r.m_matchedTokensNumber
-     << "; m_isRelaxed: " << r.m_isRelaxed
-     << "; " << DebugPrint(r.m_info)
-     << " }";
+     << "{ FID: " << r.GetId().m_index  // index is enough here for debug purpose
+     << "; m_matchedTokensNumber: " << r.m_matchedTokensNumber << "; m_isRelaxed: " << r.m_isRelaxed << "; "
+     << DebugPrint(r.m_info) << " }";
   return os.str();
 }
 
 // RankerResult ------------------------------------------------------------------------------------
-RankerResult::RankerResult(FeatureType & ft, m2::PointD const & center,
-                           string displayName, string const & fileName)
+RankerResult::RankerResult(FeatureType & ft, m2::PointD const & center, string displayName, string const & fileName)
   : m_types(ft)
   , m_str(std::move(displayName))
   , m_id(ft.GetID())
@@ -173,19 +165,19 @@ RankerResult::RankerResult(FeatureType & ft, m2::PointD const & center,
 }
 
 RankerResult::RankerResult(FeatureType & ft, std::string const & fileName)
-  : RankerResult(ft, feature::GetCenter(ft, FeatureType::WORST_GEOMETRY),
-                 std::string(ft.GetReadableName()), fileName)
-{
-}
+  : RankerResult(ft, feature::GetCenter(ft, FeatureType::WORST_GEOMETRY), std::string(ft.GetReadableName()), fileName)
+{}
 
 RankerResult::RankerResult(double lat, double lon)
-  : m_str("(" + measurement_utils::FormatLatLon(lat, lon) + ")"), m_resultType(Type::LatLon)
+  : m_str("(" + measurement_utils::FormatLatLon(lat, lon) + ")")
+  , m_resultType(Type::LatLon)
 {
   m_region.SetParams({}, mercator::FromLatLon(lat, lon));
 }
 
 RankerResult::RankerResult(m2::PointD const & coord, string_view postcode)
-  : m_str(postcode), m_resultType(Type::Postcode)
+  : m_str(postcode)
+  , m_resultType(Type::Postcode)
 {
   strings::AsciiToUpper(m_str);
   m_region.SetParams({}, coord);
@@ -202,9 +194,7 @@ bool RankerResult::GetCountryId(storage::CountryInfoGetter const & infoGetter, u
 
 bool RankerResult::IsEqualBasic(RankerResult const & r) const
 {
-  return (m_geomType == r.m_geomType &&
-          GetRankingInfo().m_type == r.GetRankingInfo().m_type &&
-          m_str == r.m_str);
+  return (m_geomType == r.m_geomType && GetRankingInfo().m_type == r.GetRankingInfo().m_type && m_str == r.m_str);
 }
 
 bool RankerResult::IsEqualCommon(RankerResult const & r) const
@@ -212,7 +202,10 @@ bool RankerResult::IsEqualCommon(RankerResult const & r) const
   return (IsEqualBasic(r) && GetBestType() == r.GetBestType());
 }
 
-bool RankerResult::IsStreet() const { return ftypes::IsStreetOrSquareChecker::Instance()(m_types); }
+bool RankerResult::IsStreet() const
+{
+  return ftypes::IsStreetOrSquareChecker::Instance()(m_types);
+}
 
 uint32_t RankerResult::GetBestType(vector<uint32_t> const * preferredTypes /* = nullptr */) const
 {
@@ -220,10 +213,8 @@ uint32_t RankerResult::GetBestType(vector<uint32_t> const * preferredTypes /* =
   {
     ASSERT(is_sorted(preferredTypes->begin(), preferredTypes->end()), ());
     for (uint32_t type : m_types)
-    {
       if (binary_search(preferredTypes->begin(), preferredTypes->end(), type))
         return type;
-    }
   }
 
   return m_types.GetBestType();
@@ -257,7 +248,7 @@ void FillDetails(FeatureType & ft, std::string const & name, Result::Details & d
 
   std::string_view airportIata = ft.GetMetadata(feature::Metadata::FMD_AIRPORT_IATA);
 
-  std::string brand {ft.GetMetadata(feature::Metadata::FMD_BRAND)};
+  std::string brand{ft.GetMetadata(feature::Metadata::FMD_BRAND)};
   if (!brand.empty())
     brand = platform::GetLocalizedBrandName(brand);
 
@@ -297,7 +288,8 @@ void FillDetails(FeatureType & ft, std::string const & name, Result::Details & d
   auto const cuisines = feature::GetLocalizedCuisines(typesHolder);
   auto const cuisine = strings::JoinStrings(cuisines, feature::kFieldsSeparator);
 
-  auto const recycling = strings::JoinStrings(feature::GetLocalizedRecyclingTypes(typesHolder), feature::kFieldsSeparator);
+  auto const recycling =
+      strings::JoinStrings(feature::GetLocalizedRecyclingTypes(typesHolder), feature::kFieldsSeparator);
 
   auto const roadShields = ftypes::GetRoadShieldsNames(ft);
   auto const roadShield = strings::JoinStrings(roadShields, feature::kFieldsSeparator);
@@ -335,14 +327,13 @@ string DebugPrint(RankerResult const & r)
 {
   stringstream ss;
   ss << "RankerResult "
-     << "{ FID: " << r.GetID().m_index    // index is enough here for debug purpose
-     << "; Name: " << r.GetName()
-     << "; Type: " << classif().GetReadableObjectName(r.GetBestType())
+     << "{ FID: " << r.GetID().m_index  // index is enough here for debug purpose
+     << "; Name: " << r.GetName() << "; Type: " << classif().GetReadableObjectName(r.GetBestType())
      << "; Linear model rank: " << r.GetLinearModelRank();
 
 #ifdef SEARCH_USE_PROVENANCE
-    if (!r.m_provenance.empty())
-      ss << "; Provenance: " << ::DebugPrint(r.m_provenance);
+  if (!r.m_provenance.empty())
+    ss << "; Provenance: " << ::DebugPrint(r.m_provenance);
 #endif
 
   if (r.m_dbgInfo)
diff --git a/libs/search/intermediate_result.hpp b/libs/search/intermediate_result.hpp
index d68fc4ce6..bc77cd24b 100644
--- a/libs/search/intermediate_result.hpp
+++ b/libs/search/intermediate_result.hpp
@@ -20,7 +20,7 @@ namespace storage
 {
 class CountryInfoGetter;
 struct CountryInfo;
-}
+}  // namespace storage
 
 namespace search
 {
@@ -62,8 +62,8 @@ public:
   std::vector<ResultTracer::Branch> const & GetProvenance() const { return m_provenance; }
 #endif
 
-  //size_t GetInnermostTokensNumber() const { return m_info.InnermostTokenRange().Size(); }
-  //size_t GetMatchedTokensNumber() const { return m_matchedTokensNumber; }
+  // size_t GetInnermostTokensNumber() const { return m_info.InnermostTokenRange().Size(); }
+  // size_t GetMatchedTokensNumber() const { return m_matchedTokensNumber; }
   bool IsNotRelaxed() const { return !m_isRelaxed; }
 
   bool SkipForViewportSearch(size_t queryTokensNumber) const
@@ -109,8 +109,7 @@ public:
   };
 
   /// For Type::Feature and Type::Building.
-  RankerResult(FeatureType & ft, m2::PointD const & center,
-               std::string displayName, std::string const & fileName);
+  RankerResult(FeatureType & ft, m2::PointD const & center, std::string displayName, std::string const & fileName);
   RankerResult(FeatureType & ft, std::string const & fileName);
 
   /// For Type::LatLon.
@@ -168,8 +167,7 @@ private:
       m_point = point;
     }
 
-    bool GetCountryId(storage::CountryInfoGetter const & infoGetter,
-                      storage::CountryId & countryId) const;
+    bool GetCountryId(storage::CountryInfoGetter const & infoGetter, storage::CountryId & countryId) const;
   };
 
   RegionInfo m_region;
@@ -178,7 +176,7 @@ private:
   Result::Details m_details;
 
   StoredRankingInfo m_info;
-  std::shared_ptr<RankingInfo> m_dbgInfo;   // used in debug logs and tests, nullptr in production
+  std::shared_ptr<RankingInfo> m_dbgInfo;  // used in debug logs and tests, nullptr in production
 
   FeatureID m_id;
   double m_finalRank;
diff --git a/libs/search/intersection_result.cpp b/libs/search/intersection_result.cpp
index 5ef2d30bb..fd282a0cd 100644
--- a/libs/search/intersection_result.cpp
+++ b/libs/search/intersection_result.cpp
@@ -26,9 +26,7 @@ void IntersectionResult::Set(Model::Type type, uint32_t id)
   case Model::TYPE_STATE:
   case Model::TYPE_COUNTRY:
   case Model::TYPE_UNCLASSIFIED:
-  case Model::TYPE_COUNT:
-    ASSERT(false, ("Unsupported type."));
-    break;
+  case Model::TYPE_COUNT: ASSERT(false, ("Unsupported type.")); break;
   }
 }
 
diff --git a/libs/search/intersection_result.hpp b/libs/search/intersection_result.hpp
index cead149d2..c302576d4 100644
--- a/libs/search/intersection_result.hpp
+++ b/libs/search/intersection_result.hpp
@@ -24,15 +24,9 @@ struct IntersectionResult
 
   // Building == Streets means that we have actual street result, but got here
   // via _fake_ TYPE_BUILDING layer (see MatchPOIsAndBuildings).
-  inline bool IsFakeBuildingButStreet() const
-  {
-    return m_building != kInvalidId && m_building == m_street;
-  }
+  inline bool IsFakeBuildingButStreet() const { return m_building != kInvalidId && m_building == m_street; }
 
-  inline bool IsPoiAndComplexPoi() const
-  {
-    return m_complexPoi != kInvalidId && m_subpoi != kInvalidId;
-  }
+  inline bool IsPoiAndComplexPoi() const { return m_complexPoi != kInvalidId && m_subpoi != kInvalidId; }
 
   // Clears all fields to an invalid state.
   void Clear();
diff --git a/libs/search/interval_set.hpp b/libs/search/interval_set.hpp
index 13a6cd076..023440e8a 100644
--- a/libs/search/interval_set.hpp
+++ b/libs/search/interval_set.hpp
@@ -97,8 +97,7 @@ void IntervalSet<Elem>::Add(Interval const & interval)
 }
 
 template <typename Elem>
-void IntervalSet<Elem>::SubtractFrom(Interval const & interval,
-                                     std::vector<Interval> & difference) const
+void IntervalSet<Elem>::SubtractFrom(Interval const & interval, std::vector<Interval> & difference) const
 {
   Iterator begin;
   Iterator end;
diff --git a/libs/search/keyword_lang_matcher.cpp b/libs/search/keyword_lang_matcher.cpp
index c44b10d5d..fc4601df3 100644
--- a/libs/search/keyword_lang_matcher.cpp
+++ b/libs/search/keyword_lang_matcher.cpp
@@ -15,14 +15,12 @@ using namespace std;
 namespace search
 {
 // KeywordLangMatcher::Score ----------------------------------------------------------------------
-KeywordLangMatcher::Score::Score() : m_langScore(numeric_limits<int>::min())
-{
-}
+KeywordLangMatcher::Score::Score() : m_langScore(numeric_limits<int>::min()) {}
 
 KeywordLangMatcher::Score::Score(KeywordMatcher::Score const & score, int langScore)
-  : m_parentScore(score), m_langScore(langScore)
-{
-}
+  : m_parentScore(score)
+  , m_langScore(langScore)
+{}
 
 bool KeywordLangMatcher::Score::operator<(KeywordLangMatcher::Score const & score) const
 {
@@ -40,8 +38,7 @@ bool KeywordLangMatcher::Score::operator<=(KeywordLangMatcher::Score const & sco
   return !(score < *this);
 }
 // KeywordLangMatcher ------------------------------------------------------------------------------
-KeywordLangMatcher::KeywordLangMatcher(size_t maxLanguageTiers)
-  : m_languagePriorities(maxLanguageTiers)
+KeywordLangMatcher::KeywordLangMatcher(size_t maxLanguageTiers) : m_languagePriorities(maxLanguageTiers)
 {
   // Should we ever have this many tiers, the idea of storing a vector of vectors must be revised.
   ASSERT_LESS(maxLanguageTiers, 10, ());
@@ -59,10 +56,8 @@ int KeywordLangMatcher::CalcLangScore(int8_t lang) const
   for (int i = 0; i < numTiers; ++i)
   {
     for (int8_t x : m_languagePriorities[i])
-    {
       if (x == lang)
         return -i;
-    }
   }
 
   return -numTiers;
@@ -73,14 +68,12 @@ KeywordLangMatcher::Score KeywordLangMatcher::CalcScore(int8_t lang, string_view
   return Score(m_keywordMatcher.CalcScore(name), CalcLangScore(lang));
 }
 
-KeywordLangMatcher::Score KeywordLangMatcher::CalcScore(int8_t lang,
-                                                        strings::UniString const & name) const
+KeywordLangMatcher::Score KeywordLangMatcher::CalcScore(int8_t lang, strings::UniString const & name) const
 {
   return Score(m_keywordMatcher.CalcScore(name), CalcLangScore(lang));
 }
 
-KeywordLangMatcher::Score KeywordLangMatcher::CalcScore(int8_t lang,
-                                                        strings::UniString const * tokens,
+KeywordLangMatcher::Score KeywordLangMatcher::CalcScore(int8_t lang, strings::UniString const * tokens,
                                                         size_t count) const
 {
   return Score(m_keywordMatcher.CalcScore(tokens, count), CalcLangScore(lang));
diff --git a/libs/search/keyword_lang_matcher.hpp b/libs/search/keyword_lang_matcher.hpp
index cd94db87d..6dd515138 100644
--- a/libs/search/keyword_lang_matcher.hpp
+++ b/libs/search/keyword_lang_matcher.hpp
@@ -43,17 +43,12 @@ public:
   void ForEachLanguage(Fn && fn) const
   {
     for (auto const & langs : m_languagePriorities)
-    {
       for (int8_t lang : langs)
         fn(lang);
-    }
   }
 
   // Store references to keywords from source array of strings.
-  inline void SetKeywords(QueryString const & query)
-  {
-    m_keywordMatcher.SetKeywords(query);
-  }
+  inline void SetKeywords(QueryString const & query) { m_keywordMatcher.SetKeywords(query); }
 
   // Returns the Score of the name (greater is better).
   Score CalcScore(int8_t lang, std::string_view name) const;
diff --git a/libs/search/keyword_matcher.cpp b/libs/search/keyword_matcher.cpp
index 41795a130..2127d838a 100644
--- a/libs/search/keyword_matcher.cpp
+++ b/libs/search/keyword_matcher.cpp
@@ -44,8 +44,7 @@ KeywordMatcher::Score KeywordMatcher::CalcScore(strings::UniString const & name)
   return CalcScore(tokens.data(), tokens.size());
 }
 
-KeywordMatcher::Score KeywordMatcher::CalcScore(strings::UniString const * tokens,
-                                                size_t count) const
+KeywordMatcher::Score KeywordMatcher::CalcScore(strings::UniString const * tokens, size_t count) const
 {
   // Some names can have too many tokens. Trim them.
   count = min(count, kMaxNumTokens);
@@ -87,10 +86,8 @@ KeywordMatcher::Score KeywordMatcher::CalcScore(strings::UniString const * token
 
   uint8_t numQueryTokensMatched = 0;
   for (size_t i = 0; i < isQueryTokenMatched.size(); ++i)
-  {
     if (isQueryTokenMatched[i])
       ++numQueryTokensMatched;
-  }
 
   Score score;
   score.m_fullQueryMatched = prefixMatched && (numQueryTokensMatched == isQueryTokenMatched.size());
@@ -117,8 +114,7 @@ KeywordMatcher::Score::Score()
   , m_numQueryTokensAndPrefixMatched(0)
   , m_fullQueryMatched(false)
   , m_prefixMatched(false)
-{
-}
+{}
 
 bool KeywordMatcher::Score::operator<(KeywordMatcher::Score const & s) const
 {
@@ -138,11 +134,9 @@ bool KeywordMatcher::Score::operator<(KeywordMatcher::Score const & s) const
 
 bool KeywordMatcher::Score::operator==(KeywordMatcher::Score const & s) const
 {
-  return m_sumTokenMatchDistance == s.m_sumTokenMatchDistance
-      && m_nameTokensMatched == s.m_nameTokensMatched
-      && m_numQueryTokensAndPrefixMatched == s.m_numQueryTokensAndPrefixMatched
-      && m_fullQueryMatched == s.m_fullQueryMatched
-      && m_prefixMatched == s.m_prefixMatched;
+  return m_sumTokenMatchDistance == s.m_sumTokenMatchDistance && m_nameTokensMatched == s.m_nameTokensMatched &&
+         m_numQueryTokensAndPrefixMatched == s.m_numQueryTokensAndPrefixMatched &&
+         m_fullQueryMatched == s.m_fullQueryMatched && m_prefixMatched == s.m_prefixMatched;
 }
 
 bool KeywordMatcher::Score::LessInTokensLength(Score const & s) const
diff --git a/libs/search/latlon_match.cpp b/libs/search/latlon_match.cpp
index 7857537f7..6e6bdb830 100644
--- a/libs/search/latlon_match.cpp
+++ b/libs/search/latlon_match.cpp
@@ -43,7 +43,7 @@ void Skip(Char *& s)
     ++s;
 }
 
-bool MatchDMSArray(char const * & s, char const * arr[], size_t count)
+bool MatchDMSArray(char const *& s, char const * arr[], size_t count)
 {
   for (size_t i = 0; i < count; ++i)
   {
@@ -57,14 +57,14 @@ bool MatchDMSArray(char const * & s, char const * arr[], size_t count)
   return false;
 }
 
-int GetDMSIndex(char const * & s)
+int GetDMSIndex(char const *& s)
 {
-  char const * arrDegree[] = { "*", "°" };
-  char const * arrMinutes[] = { "\'", "’", "′" };
-  char const * arrSeconds[] = { "\"", "”", "″", "\'\'", "’’", "′′" };
+  char const * arrDegree[] = {"*", "°"};
+  char const * arrMinutes[] = {"\'", "’", "′"};
+  char const * arrSeconds[] = {"\"", "”", "″", "\'\'", "’’", "′′"};
 
   if (MatchDMSArray(s, arrDegree, ARRAY_SIZE(arrDegree)))
-      return 0;
+    return 0;
   if (MatchDMSArray(s, arrSeconds, ARRAY_SIZE(arrSeconds)))
     return 2;
   if (MatchDMSArray(s, arrMinutes, ARRAY_SIZE(arrMinutes)))
@@ -73,17 +73,21 @@ int GetDMSIndex(char const * & s)
   return -1;
 }
 
-bool SkipNSEW(char const * & s, char const * (&arrPos) [4])
+bool SkipNSEW(char const *& s, char const * (&arrPos)[4])
 {
   Skip(s);
 
   int ind;
   switch (*s)
   {
-  case 'N': case 'n': ind = 0; break;
-  case 'S': case 's': ind = 1; break;
-  case 'E': case 'e': ind = 2; break;
-  case 'W': case 'w': ind = 3; break;
+  case 'N':
+  case 'n': ind = 0; break;
+  case 'S':
+  case 's': ind = 1; break;
+  case 'E':
+  case 'e': ind = 2; break;
+  case 'W':
+  case 'w': ind = 3; break;
   default: return false;
   }
 
@@ -157,7 +161,7 @@ bool MatchLatLonDegree(string const & query, double & lat, double & lon)
 
   // Positions of N, S, E, W symbols
   char const * arrPos[] = {nullptr, nullptr, nullptr, nullptr};
-  bool arrDegreeSymbol[] = { false, false };
+  bool arrDegreeSymbol[] = {false, false};
 
   char const * const startQuery = query.c_str();
   char const * s = startQuery;
@@ -195,7 +199,7 @@ bool MatchLatLonDegree(string const & query, double & lat, double & lon)
         break;
       }
     }
-    else if (x < 0 && s == s1 && !(s == startQuery || kSpaces.find(*(s-1)) != string::npos))
+    else if (x < 0 && s == s1 && !(s == startQuery || kSpaces.find(*(s - 1)) != string::npos))
     {
       // Skip input like "3-8"
       return false;
@@ -223,7 +227,7 @@ bool MatchLatLonDegree(string const & query, double & lat, double & lon)
       }
     }
 
-    if (i == 0) // degrees
+    if (i == 0)  // degrees
     {
       if (v[base].second)
       {
@@ -239,8 +243,7 @@ bool MatchLatLonDegree(string const & query, double & lat, double & lon)
       }
       arrDegreeSymbol[base / 3] = degreeSymbol;
     }
-    else  // minutes or seconds
-    {
+    else                                    // minutes or seconds
       if (x < 0.0 || x > 60.0 ||            // minutes or seconds should be in [0, 60] range
           v[base + i].second ||             // value already exists
           !v[base].second ||                // no degrees found for value
@@ -248,7 +251,6 @@ bool MatchLatLonDegree(string const & query, double & lat, double & lon)
       {
         return false;
       }
-    }
 
     v[base + i].first = x;
     v[base + i].second = true;
@@ -268,10 +270,12 @@ bool MatchLatLonDegree(string const & query, double & lat, double & lon)
 
   // Calculate Lat, Lon with correct sign.
   lat = fabs(v[0].first) + v[1].first / 60.0 + v[2].first / 3600.0;
-  if (v[0].first < 0.0) lat = -lat;
+  if (v[0].first < 0.0)
+    lat = -lat;
 
   lon = fabs(v[3].first) + v[4].first / 60.0 + v[5].first / 3600.0;
-  if (v[3].first < 0.0) lon = -lon;
+  if (v[3].first < 0.0)
+    lon = -lon;
 
   if (max(arrPos[0], arrPos[1]) > max(arrPos[2], arrPos[3]))
     swap(lat, lon);
diff --git a/libs/search/lazy_centers_table.cpp b/libs/search/lazy_centers_table.cpp
index 574c9faea..8465d0813 100644
--- a/libs/search/lazy_centers_table.cpp
+++ b/libs/search/lazy_centers_table.cpp
@@ -9,9 +9,10 @@
 namespace search
 {
 LazyCentersTable::LazyCentersTable(MwmValue const & value)
-  : m_value(value), m_state(STATE_NOT_LOADED), m_reader(std::unique_ptr<ModelReader>())
-{
-}
+  : m_value(value)
+  , m_state(STATE_NOT_LOADED)
+  , m_reader(std::unique_ptr<ModelReader>())
+{}
 
 void LazyCentersTable::EnsureTableLoaded()
 {
@@ -33,17 +34,11 @@ void LazyCentersTable::EnsureTableLoaded()
   auto const format = traits.GetCentersTableFormat();
 
   if (format == version::MwmTraits::CentersTableFormat::PlainEliasFanoMap)
-  {
     m_table = CentersTable::LoadV0(*m_reader.GetPtr(), m_value.GetHeader().GetDefGeometryCodingParams());
-  }
   else if (format == version::MwmTraits::CentersTableFormat::EliasFanoMapWithHeader)
-  {
     m_table = CentersTable::LoadV1(*m_reader.GetPtr());
-  }
   else
-  {
     CHECK(false, ("Unknown centers table format."));
-  }
 
   if (m_table)
     m_state = STATE_LOADED;
diff --git a/libs/search/locality_finder.cpp b/libs/search/locality_finder.cpp
index 8032ef618..404bc0f2a 100644
--- a/libs/search/locality_finder.cpp
+++ b/libs/search/locality_finder.cpp
@@ -57,16 +57,14 @@ private:
 class LocalitiesLoader
 {
 public:
-  LocalitiesLoader(MwmContext const & ctx, CitiesBoundariesTable const & boundaries,
-                   Filter const & filter, LocalityFinder::Holder & holder,
-                   map<MwmSet::MwmId, unordered_set<uint32_t>> & loadedIds)
+  LocalitiesLoader(MwmContext const & ctx, CitiesBoundariesTable const & boundaries, Filter const & filter,
+                   LocalityFinder::Holder & holder, map<MwmSet::MwmId, unordered_set<uint32_t>> & loadedIds)
     : m_ctx(ctx)
     , m_boundaries(boundaries)
     , m_filter(filter)
     , m_holder(holder)
     , m_loadedIds(loadedIds[m_ctx.GetId()])
-  {
-  }
+  {}
 
   void operator()(uint32_t id) const
   {
@@ -88,10 +86,8 @@ public:
     {
     case LocalityType::City:
     case LocalityType::Town:
-    case LocalityType::Village:
-      break;
-    default:
-      return;
+    case LocalityType::Village: break;
+    default: return;
     }
 
     auto const population = ftypes::GetPopulation(*ft);
@@ -131,19 +127,21 @@ int GetVillagesScale()
   // Needed for backward compatibility. |kCompatibilityVillagesMinDrawableScale| should be set to
   // maximal value we have in mwms over all data versions.
   int const kCompatibilityVillagesMinDrawableScale = 13;
-  ASSERT_LESS_OR_EQUAL(
-      currentVillagesMinDrawableScale, kCompatibilityVillagesMinDrawableScale,
-      ("Set kCompatibilityVillagesMinDrawableScale to", currentVillagesMinDrawableScale));
+  ASSERT_LESS_OR_EQUAL(currentVillagesMinDrawableScale, kCompatibilityVillagesMinDrawableScale,
+                       ("Set kCompatibilityVillagesMinDrawableScale to", currentVillagesMinDrawableScale));
   return max(currentVillagesMinDrawableScale, kCompatibilityVillagesMinDrawableScale);
 }
 }  // namespace
 
 // LocalityItem ------------------------------------------------------------------------------------
-LocalityItem::LocalityItem(StringUtf8Multilang const & names, m2::PointD const & center,
-                           Boundaries && boundaries, uint64_t population, FeatureID const & id)
-  : m_names(names), m_center(center), m_boundaries(std::move(boundaries)), m_population(population), m_id(id)
-{
-}
+LocalityItem::LocalityItem(StringUtf8Multilang const & names, m2::PointD const & center, Boundaries && boundaries,
+                           uint64_t population, FeatureID const & id)
+  : m_names(names)
+  , m_center(center)
+  , m_boundaries(std::move(boundaries))
+  , m_population(population)
+  , m_id(id)
+{}
 
 string DebugPrint(LocalityItem const & item)
 {
@@ -167,8 +165,7 @@ void LocalitySelector::operator()(LocalityItem const & item)
   double const distance = mercator::DistanceOnEarth(item.m_center, m_p);
 
   // GetPopulationByRadius may return 0.
-  double const score =
-      (ftypes::GetPopulationByRadius(distance) + 1) / static_cast<double>(item.m_population);
+  double const score = (ftypes::GetPopulationByRadius(distance) + 1) / static_cast<double>(item.m_population);
 
   if (!inside && m_inside)
     return;
@@ -203,8 +200,7 @@ void LocalityFinder::Holder::Add(LocalityItem const & item)
   m_localities.Add(item, m2::RectD(item.m_center, item.m_center));
 }
 
-void LocalityFinder::Holder::ForEachInVicinity(m2::RectD const & rect,
-                                               LocalitySelector & selector) const
+void LocalityFinder::Holder::ForEachInVicinity(m2::RectD const & rect, LocalitySelector & selector) const
 {
   m_localities.ForEachInRect(rect, selector);
 }
@@ -226,8 +222,7 @@ void LocalityFinder::Holder::Clear()
 }
 
 // LocalityFinder ----------------------------------------------------------------------------------
-LocalityFinder::LocalityFinder(DataSource const & dataSource,
-                               CitiesBoundariesTable const & boundariesTable,
+LocalityFinder::LocalityFinder(DataSource const & dataSource, CitiesBoundariesTable const & boundariesTable,
                                VillagesCache & villagesCache)
   : m_dataSource(dataSource)
   , m_boundariesTable(boundariesTable)
@@ -235,8 +230,7 @@ LocalityFinder::LocalityFinder(DataSource const & dataSource,
   , m_cities(kMaxCityRadiusMeters)
   , m_villages(kMaxVillageRadiusMeters)
   , m_mapsLoaded(false)
-{
-}
+{}
 
 void LocalityFinder::ClearCache()
 {
@@ -268,8 +262,7 @@ void LocalityFinder::LoadVicinity(m2::PointD const & p, bool loadCities, bool lo
         m_ranks = make_unique<DummyRankTable>();
 
       MwmContext ctx(std::move(handle));
-      ctx.ForEachIndex(crect, LocalitiesLoader(ctx, m_boundariesTable, CityFilter(*m_ranks),
-                                               m_cities, m_loadedIds));
+      ctx.ForEachIndex(crect, LocalitiesLoader(ctx, m_boundariesTable, CityFilter(*m_ranks), m_cities, m_loadedIds));
     }
 
     m_cities.SetCovered(p);
@@ -278,16 +271,17 @@ void LocalityFinder::LoadVicinity(m2::PointD const & p, bool loadCities, bool lo
   if (loadVillages)
   {
     m2::RectD const vrect = m_villages.GetDRect(p);
-    m_maps.ForEachInRect(m2::RectD(p, p), [&](MwmSet::MwmId const & id) {
+    m_maps.ForEachInRect(m2::RectD(p, p), [&](MwmSet::MwmId const & id)
+    {
       auto handle = m_dataSource.GetMwmHandleById(id);
       if (!handle.IsAlive())
         return;
 
       static int const scale = GetVillagesScale();
       MwmContext ctx(std::move(handle));
-      ctx.ForEachIndex(vrect, scale,
-                       LocalitiesLoader(ctx, m_boundariesTable, VillageFilter(ctx, m_villagesCache),
-                                        m_villages, m_loadedIds));
+      ctx.ForEachIndex(
+          vrect, scale,
+          LocalitiesLoader(ctx, m_boundariesTable, VillageFilter(ctx, m_villagesCache), m_villages, m_loadedIds));
     });
 
     m_villages.SetCovered(p);
diff --git a/libs/search/locality_finder.hpp b/libs/search/locality_finder.hpp
index 9253518c1..feaa21930 100644
--- a/libs/search/locality_finder.hpp
+++ b/libs/search/locality_finder.hpp
@@ -34,8 +34,8 @@ struct LocalityItem
 {
   using Boundaries = CitiesBoundariesTable::Boundaries;
 
-  LocalityItem(StringUtf8Multilang const & names, m2::PointD const & center,
-               Boundaries && boundaries, uint64_t population, FeatureID const & id);
+  LocalityItem(StringUtf8Multilang const & names, m2::PointD const & center, Boundaries && boundaries,
+               uint64_t population, FeatureID const & id);
 
   bool GetName(int8_t lang, std::string_view & name) const { return m_names.GetString(lang, name); }
 
@@ -51,8 +51,8 @@ struct LocalityItem
       return false;
 
     feature::NameParamsOut out;
-    feature::GetReadableName({ m_names, mwmInfo->GetRegionData(), languages::GetCurrentMapLanguage(),
-                               false /* allowTranslit */ }, out);
+    feature::GetReadableName(
+        {m_names, mwmInfo->GetRegionData(), languages::GetCurrentMapLanguage(), false /* allowTranslit */}, out);
 
     name = out.primary;
     return !name.empty();
@@ -127,8 +127,7 @@ public:
     m2::RectD const crect = m_cities.GetRect(p);
     m2::RectD const vrect = m_villages.GetRect(p);
 
-    LoadVicinity(p, !m_cities.IsCovered(crect) /* loadCities */,
-                 !m_villages.IsCovered(vrect) /* loadVillages */);
+    LoadVicinity(p, !m_cities.IsCovered(crect) /* loadCities */, !m_villages.IsCovered(vrect) /* loadVillages */);
 
     LocalitySelector selector(p);
     m_cities.ForEachInVicinity(crect, selector);
diff --git a/libs/search/locality_scorer.cpp b/libs/search/locality_scorer.cpp
index db7c21308..997f1cad8 100644
--- a/libs/search/locality_scorer.cpp
+++ b/libs/search/locality_scorer.cpp
@@ -29,9 +29,9 @@ class IdfMapDelegate : public IdfMap::Delegate
 public:
   IdfMapDelegate(vector<pair<LevenshteinDFA, uint64_t>> const & tokensToDf,
                  vector<pair<PrefixDFA, uint64_t>> const & prefixToDf)
-    : m_tokensToDf(tokensToDf), m_prefixToDf(prefixToDf)
-  {
-  }
+    : m_tokensToDf(tokensToDf)
+    , m_prefixToDf(prefixToDf)
+  {}
 
   ~IdfMapDelegate() override = default;
 
@@ -70,20 +70,20 @@ size_t constexpr kDefaultReadLimit = 100;
 
 // LocalityScorer::ExLocality ----------------------------------------------------------------------
 LocalityScorer::ExLocality::ExLocality(Locality && locality, double queryNorm, uint8_t rank)
-  : m_locality(std::move(locality)), m_queryNorm(queryNorm), m_rank(rank)
-{
-}
+  : m_locality(std::move(locality))
+  , m_queryNorm(queryNorm)
+  , m_rank(rank)
+{}
 
 // LocalityScorer ----------------------------------------------------------------------------------
-LocalityScorer::LocalityScorer(QueryParams const & params, m2::PointD const & pivot,
-                               Delegate & delegate)
-  : m_params(params), m_pivot(pivot), m_delegate(delegate)
-{
-}
+LocalityScorer::LocalityScorer(QueryParams const & params, m2::PointD const & pivot, Delegate & delegate)
+  : m_params(params)
+  , m_pivot(pivot)
+  , m_delegate(delegate)
+{}
 
-void LocalityScorer::GetTopLocalities(MwmSet::MwmId const & countryId, BaseContext const & ctx,
-                                      CBV const & filter, size_t limit,
-                                      vector<Locality> & localities)
+void LocalityScorer::GetTopLocalities(MwmSet::MwmId const & countryId, BaseContext const & ctx, CBV const & filter,
+                                      size_t limit, vector<Locality> & localities)
 {
   double constexpr kUnknownIdf = 1.0;
   size_t const numTokens = ctx.NumTokens();
@@ -104,9 +104,8 @@ void LocalityScorer::GetTopLocalities(MwmSet::MwmId const & countryId, BaseConte
     {
       auto const & token = m_params.GetToken(i);
       tokensToDf.emplace_back(BuildLevenshteinDFA(token.GetOriginal()), df);
-      token.ForEachSynonym([&tokensToDf, &df](UniString const & s) {
-        tokensToDf.emplace_back(strings::LevenshteinDFA(s, 0 /* maxErrors */), df);
-      });
+      token.ForEachSynonym([&tokensToDf, &df](UniString const & s)
+      { tokensToDf.emplace_back(strings::LevenshteinDFA(s, 0 /* maxErrors */), df); });
     }
   }
 
@@ -119,9 +118,8 @@ void LocalityScorer::GetTopLocalities(MwmSet::MwmId const & countryId, BaseConte
     {
       auto const & token = m_params.GetToken(count);
       prefixToDf.emplace_back(PrefixDFA(BuildLevenshteinDFA(token.GetOriginal())), prefixDf);
-      token.ForEachSynonym([&prefixToDf, &prefixDf](UniString const & s) {
-        prefixToDf.emplace_back(PrefixDFA(strings::LevenshteinDFA(s, 0 /* maxErrors */)), prefixDf);
-      });
+      token.ForEachSynonym([&prefixToDf, &prefixDf](UniString const & s)
+      { prefixToDf.emplace_back(PrefixDFA(strings::LevenshteinDFA(s, 0 /* maxErrors */)), prefixDf); });
     }
   }
 
@@ -133,8 +131,7 @@ void LocalityScorer::GetTopLocalities(MwmSet::MwmId const & countryId, BaseConte
     auto intersection = intersections[startToken];
     QueryVec::Builder builder;
 
-    for (size_t endToken = startToken + 1;
-         endToken <= numTokens && !intersection.m_features.IsEmpty(); ++endToken)
+    for (size_t endToken = startToken + 1; endToken <= numTokens && !intersection.m_features.IsEmpty(); ++endToken)
     {
       auto const curToken = endToken - 1;
       auto const & token = m_params.GetToken(curToken).GetOriginal();
@@ -148,9 +145,7 @@ void LocalityScorer::GetTopLocalities(MwmSet::MwmId const & countryId, BaseConte
       if (!m_params.IsNumberTokens(tokenRange))
       {
         intersection.ForEach([&](uint32_t featureId, bool exactMatch)
-        {
-          localities.emplace_back(FeatureID(countryId, featureId), tokenRange, QueryVec(idfs, builder), exactMatch);
-        });
+        { localities.emplace_back(FeatureID(countryId, featureId), tokenRange, QueryVec(idfs, builder), exactMatch); });
       }
 
       if (endToken < numTokens)
@@ -196,8 +191,7 @@ void LocalityScorer::LeaveTopLocalities(IdfMap & idfs, size_t limit, vector<Loca
     GetDocVecs(els[i].GetId(), dvs);
 
     auto const center = m_delegate.GetCenter(els[i].GetId());
-    auto const distance =
-        center ? mercator::DistanceOnEarth(m_pivot, *center) : els[i].m_distanceToPivot;
+    auto const distance = center ? mercator::DistanceOnEarth(m_pivot, *center) : els[i].m_distanceToPivot;
     auto const belongsToMatchedRegion =
         center ? m_delegate.BelongsToMatchedRegion(*center) : els[i].m_belongsToMatchedRegion;
 
@@ -216,15 +210,12 @@ void LocalityScorer::LeaveTopLocalities(IdfMap & idfs, size_t limit, vector<Loca
 
   unordered_set<uint32_t> seen;
   for (auto it = els.begin(); it != els.end() && localities.size() < limit; ++it)
-  {
     if (seen.insert(it->GetId()).second)
       localities.push_back(std::move(it->m_locality));
-  }
   ASSERT_EQUAL(seen.size(), localities.size(), ());
 }
 
-void LocalityScorer::LeaveTopByExactMatchNormAndRank(size_t limitUniqueIds,
-                                                     vector<ExLocality> & els) const
+void LocalityScorer::LeaveTopByExactMatchNormAndRank(size_t limitUniqueIds, vector<ExLocality> & els) const
 {
   sort(els.begin(), els.end(), [](ExLocality const & lhs, ExLocality const & rhs)
   {
@@ -264,9 +255,7 @@ void LocalityScorer::GroupBySimilarityAndOther(vector<ExLocality> & els) const
   });
 
   auto const lessDistance = [](ExLocality const & lhs, ExLocality const & rhs)
-  {
-    return lhs.m_distanceToPivot < rhs.m_distanceToPivot;
-  };
+  { return lhs.m_distanceToPivot < rhs.m_distanceToPivot; };
 
   auto const compareSimilaritySizeAndRegion = [](ExLocality const & lhs, ExLocality const & rhs)
   {
@@ -291,10 +280,8 @@ void LocalityScorer::GroupBySimilarityAndOther(vector<ExLocality> & els) const
     auto const closest = min_element(range.first, range.second, lessDistance);
     tmp.emplace_back(std::move(*closest));
     for (auto it = range.first; it != range.second; ++it)
-    {
       if (it != closest)
         tmp.emplace_back(std::move(*it));
-    }
     begin = range.second;
   }
 
diff --git a/libs/search/locality_scorer.hpp b/libs/search/locality_scorer.hpp
index bda3e5789..0bcb7d98d 100644
--- a/libs/search/locality_scorer.hpp
+++ b/libs/search/locality_scorer.hpp
@@ -35,8 +35,8 @@ public:
 
   // Leaves at most |limit| elements of |localities|, ordered by their
   // features.
-  void GetTopLocalities(MwmSet::MwmId const & countryId, BaseContext const & ctx,
-                        CBV const & filter, size_t limit, std::vector<Locality> & localities);
+  void GetTopLocalities(MwmSet::MwmId const & countryId, BaseContext const & ctx, CBV const & filter, size_t limit,
+                        std::vector<Locality> & localities);
 
 private:
   struct ExLocality
diff --git a/libs/search/model.cpp b/libs/search/model.cpp
index a18627a42..10df0946e 100644
--- a/libs/search/model.cpp
+++ b/libs/search/model.cpp
@@ -8,7 +8,6 @@
 
 #include <vector>
 
-
 namespace search
 {
 using namespace ftypes;
@@ -23,32 +22,30 @@ class IsComplexPoiChecker : public ftypes::BaseChecker
   {
     // For MatchPOIsWithParent matching. Some entries may be controversial here, but keep as-is for now.
     // POI near "Complex POI" matching.
-    base::StringIL const paths[] = {
-        {"aeroway", "aerodrome"},
-        {"amenity", "hospital"},
-        {"amenity", "university"},
-        {"building", "train_station"},
-        {"historic", "archaeological_site"},
-        {"historic", "castle"},
-        {"historic", "fort"},
-        {"landuse", "cemetery"},
-        {"landuse", "religious"},
-        {"landuse", "commercial"},
-        {"landuse", "forest"},
-        {"landuse", "industrial"},
-        {"landuse", "retail"},
-        {"leisure", "garden"},
-        {"leisure", "nature_reserve"},
-        {"leisure", "park"},
-        {"leisure", "stadium"},
-        {"leisure", "water_park"},
-        {"natural", "beach"},
-        {"office", "company"},
-        {"railway", "station"},
-        {"shop", "mall"},
-        {"tourism", "museum"},
-        {"tourism", "gallery"}
-    };
+    base::StringIL const paths[] = {{"aeroway", "aerodrome"},
+                                    {"amenity", "hospital"},
+                                    {"amenity", "university"},
+                                    {"building", "train_station"},
+                                    {"historic", "archaeological_site"},
+                                    {"historic", "castle"},
+                                    {"historic", "fort"},
+                                    {"landuse", "cemetery"},
+                                    {"landuse", "religious"},
+                                    {"landuse", "commercial"},
+                                    {"landuse", "forest"},
+                                    {"landuse", "industrial"},
+                                    {"landuse", "retail"},
+                                    {"leisure", "garden"},
+                                    {"leisure", "nature_reserve"},
+                                    {"leisure", "park"},
+                                    {"leisure", "stadium"},
+                                    {"leisure", "water_park"},
+                                    {"natural", "beach"},
+                                    {"office", "company"},
+                                    {"railway", "station"},
+                                    {"shop", "mall"},
+                                    {"tourism", "museum"},
+                                    {"tourism", "gallery"}};
 
     Classificator const & c = classif();
     for (auto const & path : paths)
diff --git a/libs/search/model.hpp b/libs/search/model.hpp
index d7aa1e3f1..77966173d 100644
--- a/libs/search/model.hpp
+++ b/libs/search/model.hpp
@@ -42,10 +42,7 @@ public:
     TYPE_COUNT
   };
 
-  static bool IsLocalityType(Type const type)
-  {
-    return type >= TYPE_VILLAGE && type <= TYPE_COUNTRY;
-  }
+  static bool IsLocalityType(Type const type) { return type >= TYPE_VILLAGE && type <= TYPE_COUNTRY; }
 
   static bool IsPoi(Type const type) { return type == TYPE_SUBPOI || type == TYPE_COMPLEX_POI; }
   static bool IsPoiOrBuilding(Type const type) { return IsPoi(type) || type == TYPE_BUILDING; }
diff --git a/libs/search/mwm_context.cpp b/libs/search/mwm_context.cpp
index 957fd975e..fc2924c7b 100644
--- a/libs/search/mwm_context.cpp
+++ b/libs/search/mwm_context.cpp
@@ -5,7 +5,6 @@
 #include "indexer/fake_feature_ids.hpp"
 #include "indexer/feature_source.hpp"
 
-
 namespace search
 {
 void CoverRect(m2::RectD const & rect, int scale, covering::Intervals & result)
@@ -22,11 +21,9 @@ MwmContext::MwmContext(MwmSet::MwmHandle handle)
   , m_index(m_value.m_cont.GetReader(INDEX_FILE_TAG), m_value.m_factory)
   , m_centers(m_value)
   , m_editableSource(m_handle)
-{
-}
+{}
 
-MwmContext::MwmContext(MwmSet::MwmHandle handle, MwmType type)
-  : MwmContext(std::move(handle))
+MwmContext::MwmContext(MwmSet::MwmHandle handle, MwmType type) : MwmContext(std::move(handle))
 {
   m_type = type;
 }
@@ -37,8 +34,7 @@ std::unique_ptr<FeatureType> MwmContext::GetFeature(uint32_t index) const
   switch (GetEditedStatus(index))
   {
   case FeatureStatus::Deleted:
-  case FeatureStatus::Obsolete:
-    return ft;
+  case FeatureStatus::Obsolete: return ft;
   case FeatureStatus::Modified:
   case FeatureStatus::Created:
     ft = m_editableSource.GetModifiedFeature(index);
diff --git a/libs/search/mwm_context.hpp b/libs/search/mwm_context.hpp
index bd9e1f603..a40547a2a 100644
--- a/libs/search/mwm_context.hpp
+++ b/libs/search/mwm_context.hpp
@@ -61,12 +61,12 @@ public:
   void ForEachIndex(covering::Intervals const & intervals, uint32_t scale, Fn && fn) const
   {
     ForEachIndexImpl(intervals, scale, [&](uint32_t index)
-                     {
-                       // TODO: Optimize deleted checks by getting vector of deleted indexes from
-                       // the Editor.
-                       if (GetEditedStatus(index) != FeatureStatus::Deleted)
-                         fn(index);
-                     });
+    {
+      // TODO: Optimize deleted checks by getting vector of deleted indexes from
+      // the Editor.
+      if (GetEditedStatus(index) != FeatureStatus::Deleted)
+        fn(index);
+    });
   }
 
   template <typename Fn>
@@ -91,7 +91,8 @@ public:
     covering::Intervals intervals;
     CoverRect(rect, scale, intervals);
 
-    ForEachIndexImpl(intervals, scale, [&](uint32_t index) {
+    ForEachIndexImpl(intervals, scale, [&](uint32_t index)
+    {
       auto ft = GetFeature(index);
       if (ft)
         fn(*ft);
@@ -101,10 +102,7 @@ public:
   // Returns false if feature was deleted by user.
   std::unique_ptr<FeatureType> GetFeature(uint32_t index) const;
 
-  [[nodiscard]] inline bool GetCenter(uint32_t index, m2::PointD & center)
-  {
-    return m_centers.Get(index, center);
-  }
+  [[nodiscard]] inline bool GetCenter(uint32_t index, m2::PointD & center) { return m_centers.Get(index, center); }
 
   std::optional<uint32_t> GetStreet(uint32_t index) const;
 
@@ -112,22 +110,18 @@ public:
   MwmValue & m_value;
 
 private:
-  FeatureStatus GetEditedStatus(uint32_t index) const
-  {
-    return m_editableSource.GetFeatureStatus(index);
-  }
+  FeatureStatus GetEditedStatus(uint32_t index) const { return m_editableSource.GetFeatureStatus(index); }
 
   template <class Fn>
   void ForEachIndexImpl(covering::Intervals const & intervals, uint32_t scale, Fn && fn) const
   {
     CheckUniqueIndexes checkUnique;
     for (auto const & i : intervals)
-      m_index.ForEachInIntervalAndScale(i.first, i.second, scale,
-          [&](uint64_t /* key */, uint32_t value)
-          {
-            if (checkUnique(value))
-              fn(value);
-          });
+      m_index.ForEachInIntervalAndScale(i.first, i.second, scale, [&](uint64_t /* key */, uint32_t value)
+      {
+        if (checkUnique(value))
+          fn(value);
+      });
   }
 
   FeaturesVector m_vector;
diff --git a/libs/search/nested_rects_cache.cpp b/libs/search/nested_rects_cache.cpp
index 0144572c8..5793cb685 100644
--- a/libs/search/nested_rects_cache.cpp
+++ b/libs/search/nested_rects_cache.cpp
@@ -20,9 +20,11 @@ double const kPositionToleranceMeters = 15.0;
 }  // namespace
 
 NestedRectsCache::NestedRectsCache(DataSource const & dataSource)
-  : m_dataSource(dataSource), m_scale(0), m_position(0, 0), m_valid(false)
-{
-}
+  : m_dataSource(dataSource)
+  , m_scale(0)
+  , m_position(0, 0)
+  , m_valid(false)
+{}
 
 void NestedRectsCache::SetPosition(m2::PointD const & position, int scale)
 {
@@ -92,8 +94,8 @@ void NestedRectsCache::Update()
     auto & bucket = m_buckets[scale];
     bucket.clear();
 
-    m2::RectD const rect = mercator::RectByCenterXYAndSizeInMeters(
-        m_position, GetRadiusMeters(static_cast<RectScale>(scale)));
+    m2::RectD const rect =
+        mercator::RectByCenterXYAndSizeInMeters(m_position, GetRadiusMeters(static_cast<RectScale>(scale)));
 
     MwmSet::MwmId lastId;
     Features * lastFeatures = nullptr;
diff --git a/libs/search/point_rect_matcher.hpp b/libs/search/point_rect_matcher.hpp
index dc062d646..e15355c38 100644
--- a/libs/search/point_rect_matcher.hpp
+++ b/libs/search/point_rect_matcher.hpp
@@ -81,9 +81,7 @@ public:
       case Event::TYPE_SEGMENT_START: tree.Add(e.m_segment); break;
       case Event::TYPE_POINT:
       {
-        auto const segmentFn = [&](SegmentTree::Segment const & segment) {
-          fn(e.m_point.m_id, segment.m_id);
-        };
+        auto const segmentFn = [&](SegmentTree::Segment const & segment) { fn(e.m_point.m_id, segment.m_id); };
         switch (requestType)
         {
         case RequestType::Any: tree.FindAny(e.m_point.m_x, segmentFn); break;
@@ -116,15 +114,12 @@ private:
       TYPE_SEGMENT_END,
     };
 
-    Event(Type type, SegmentEvent const & segment, double time)
-      : m_segment(segment), m_time(time), m_type(type)
+    Event(Type type, SegmentEvent const & segment, double time) : m_segment(segment), m_time(time), m_type(type)
     {
       ASSERT(m_type == TYPE_SEGMENT_START || m_type == TYPE_SEGMENT_END, ());
     }
 
-    Event(PointEvent const & point, double time) : m_point(point), m_time(time), m_type(TYPE_POINT)
-    {
-    }
+    Event(PointEvent const & point, double time) : m_point(point), m_time(time), m_type(TYPE_POINT) {}
 
     bool operator<(Event const & rhs) const
     {
@@ -133,7 +128,8 @@ private:
       return m_type < rhs.m_type;
     }
 
-    union {
+    union
+    {
       SegmentEvent m_segment;
       PointEvent m_point;
     };
diff --git a/libs/search/postcode_points.cpp b/libs/search/postcode_points.cpp
index f93c9ce97..5ea9569b6 100644
--- a/libs/search/postcode_points.cpp
+++ b/libs/search/postcode_points.cpp
@@ -14,7 +14,6 @@
 
 #include "defines.hpp"
 
-
 namespace search
 {
 using namespace std;
@@ -38,31 +37,26 @@ PostcodePoints::PostcodePoints(MwmValue const & value)
   m_header.Read(*reader.GetPtr());
 
   m_trieSubReader = reader.GetPtr()->CreateSubReader(m_header.m_trieOffset, m_header.m_trieSize);
-  m_root = trie::ReadTrie<SubReaderWrapper<Reader>, SingleUint64Value>(
-      SubReaderWrapper<Reader>(m_trieSubReader.get()), SingleValueSerializer<Uint64IndexValue>());
+  m_root = trie::ReadTrie<SubReaderWrapper<Reader>, SingleUint64Value>(SubReaderWrapper<Reader>(m_trieSubReader.get()),
+                                                                       SingleValueSerializer<Uint64IndexValue>());
   CHECK(m_root, ());
 
   version::MwmTraits traits(value.GetMwmVersion());
   auto const format = traits.GetCentersTableFormat();
-  CHECK_EQUAL(format, version::MwmTraits::CentersTableFormat::EliasFanoMapWithHeader,
-              ("Unexpected format."));
+  CHECK_EQUAL(format, version::MwmTraits::CentersTableFormat::EliasFanoMapWithHeader, ("Unexpected format."));
 
-  m_pointsSubReader =
-      reader.GetPtr()->CreateSubReader(m_header.m_pointsOffset, m_header.m_pointsSize);
+  m_pointsSubReader = reader.GetPtr()->CreateSubReader(m_header.m_pointsOffset, m_header.m_pointsSize);
   m_points = CentersTable::LoadV1(*m_pointsSubReader);
   CHECK(m_points, ());
 
   auto const kPostcodeRadiusMultiplier = 5.0;
   auto const area = value.GetHeader().GetBounds().Area();
   auto const count = static_cast<double>(m_points->Count());
-  CHECK_NOT_EQUAL(
-      count, 0.0,
-      ("Zero postcodes should not be serialized to", POSTCODE_POINTS_FILE_TAG, "section"));
+  CHECK_NOT_EQUAL(count, 0.0, ("Zero postcodes should not be serialized to", POSTCODE_POINTS_FILE_TAG, "section"));
   m_radius = kPostcodeRadiusMultiplier * 0.5 * sqrt(area / count);
 }
 
-void PostcodePoints::Get(UniString const & postcode, bool recursive,
-                         vector<m2::PointD> & points) const
+void PostcodePoints::Get(UniString const & postcode, bool recursive, vector<m2::PointD> & points) const
 {
   if (!m_root || !m_points || !m_trieSubReader || !m_pointsSubReader || postcode.empty())
     return;
@@ -73,9 +67,7 @@ void PostcodePoints::Get(UniString const & postcode, bool recursive,
   while (postcodeIt != postcode.end())
   {
     auto it = find_if(trieIt->m_edges.begin(), trieIt->m_edges.end(), [&](auto const & edge)
-    {
-      return StartsWith(postcodeIt, postcode.end(), edge.m_label.begin(), edge.m_label.end());
-    });
+    { return StartsWith(postcodeIt, postcode.end(), edge.m_label.begin(), edge.m_label.end()); });
     if (it == trieIt->m_edges.end())
       return;
 
@@ -88,19 +80,12 @@ void PostcodePoints::Get(UniString const & postcode, bool recursive,
 
   vector<uint32_t> indexes;
   trieIt->m_values.ForEach([&indexes](auto const & v)
-  {
-    indexes.push_back(base::asserted_cast<uint32_t>(v.m_featureId));
-  });
+  { indexes.push_back(base::asserted_cast<uint32_t>(v.m_featureId)); });
 
   if (recursive)
   {
-    trie::ForEachRef(
-        *trieIt,
-        [&indexes](auto const & /* s */, auto const & v)
-        {
-          indexes.push_back(base::asserted_cast<uint32_t>(v.m_featureId));
-        },
-        UniString{});
+    trie::ForEachRef(*trieIt, [&indexes](auto const & /* s */, auto const & v)
+    { indexes.push_back(base::asserted_cast<uint32_t>(v.m_featureId)); }, UniString{});
   }
 
   points.resize(indexes.size());
diff --git a/libs/search/postcode_points.hpp b/libs/search/postcode_points.hpp
index 34ad3c75a..93db068c4 100644
--- a/libs/search/postcode_points.hpp
+++ b/libs/search/postcode_points.hpp
@@ -58,8 +58,7 @@ public:
   double GetRadius() const { return m_radius; }
 
 private:
-  void Get(strings::UniString const & postcode, bool recursive,
-           std::vector<m2::PointD> & points) const;
+  void Get(strings::UniString const & postcode, bool recursive, std::vector<m2::PointD> & points) const;
 
   Header m_header;
   std::unique_ptr<CentersTable> m_points;
diff --git a/libs/search/pre_ranker.cpp b/libs/search/pre_ranker.cpp
index 4c42b7c7d..4b04c4bd3 100644
--- a/libs/search/pre_ranker.cpp
+++ b/libs/search/pre_ranker.cpp
@@ -51,7 +51,7 @@ void SweepNearbyResults(m2::PointD const & eps, unordered_set<FeatureID> const &
     uint8_t const exactMatch = results[i].GetInfo().m_exactMatch ? 6 : 0;
 
     // We prefer result which passed the filter even if it has lower rank / popularity / exactMatch.
-    //uint8_t const filterPassed = results[i].GetInfo().m_refusedByFilter ? 0 : 2;
+    // uint8_t const filterPassed = results[i].GetInfo().m_refusedByFilter ? 0 : 2;
     // We prefer result from prevEmit over result with better filterPassed because otherwise we have
     // lots of blinking results.
     uint8_t const prevCount = prevEmit.count(results[i].GetId()) == 0 ? 0 : 3;
@@ -61,20 +61,18 @@ void SweepNearbyResults(m2::PointD const & eps, unordered_set<FeatureID> const &
 
   vector<PreRankerResult> filtered;
   filtered.reserve(results.size());
-  sweeper.Sweep([&filtered, &results](size_t i)
-  {
-    filtered.push_back(std::move(results[i]));
-  });
+  sweeper.Sweep([&filtered, &results](size_t i) { filtered.push_back(std::move(results[i])); });
 
   results.swap(filtered);
 }
 }  // namespace
 
 PreRanker::PreRanker(DataSource const & dataSource, Ranker & ranker)
-: m_dataSource(dataSource), m_ranker(ranker), m_pivotFeatures(dataSource)
-, m_rndSeed(std::random_device()())
-{
-}
+  : m_dataSource(dataSource)
+  , m_ranker(ranker)
+  , m_pivotFeatures(dataSource)
+  , m_rndSeed(std::random_device()())
+{}
 
 void PreRanker::Init(Params const & params)
 {
@@ -160,19 +158,17 @@ void PreRanker::FillMissingFieldsInPreResults()
 
 namespace
 {
-template <class CompT, class ContT> class CompareIndices
+template <class CompT, class ContT>
+class CompareIndices
 {
   CompT m_cmp;
   ContT const & m_cont;
 
 public:
   CompareIndices(CompT const & cmp, ContT const & cont) : m_cmp(cmp), m_cont(cont) {}
-  bool operator()(size_t l, size_t r) const
-  {
-    return m_cmp(m_cont[l], m_cont[r]);
-  }
+  bool operator()(size_t l, size_t r) const { return m_cmp(m_cont[l], m_cont[r]); }
 };
-} // namespace
+}  // namespace
 
 void PreRanker::DbgFindAndLog(std::set<uint32_t> const & ids) const
 {
@@ -206,7 +202,7 @@ void PreRanker::Filter()
     return;
 
   std::vector<size_t> indices(m_results.size());
-  std::generate(indices.begin(), indices.end(), [n = 0] () mutable { return n++; });
+  std::generate(indices.begin(), indices.end(), [n = 0]() mutable { return n++; });
   std::unordered_set<size_t> filtered;
 
   auto const iBeg = indices.begin();
@@ -235,9 +231,9 @@ void PreRanker::Filter()
     PreRankerResult::CategoriesComparator comparator;
     comparator.m_positionIsInsideViewport =
         m_params.m_position && m_params.m_viewport.IsPointInside(*m_params.m_position);
-    comparator.m_detailedScale = mercator::DistanceOnEarth(m_params.m_viewport.LeftTop(),
-                                                           m_params.m_viewport.RightBottom()) <
-                                 2 * kPedestrianRadiusMeters;
+    comparator.m_detailedScale =
+        mercator::DistanceOnEarth(m_params.m_viewport.LeftTop(), m_params.m_viewport.RightBottom()) <
+        2 * kPedestrianRadiusMeters;
     comparator.m_viewport = m_params.m_viewport;
 
     std::nth_element(iBeg, iMiddle, iEnd, CompareIndices(comparator, m_results));
@@ -306,10 +302,7 @@ void PreRanker::FilterRelaxedResults(bool lastUpdate)
   }
   else
   {
-    auto const it = partition(m_results.begin(), iEnd, [](PreRankerResult const & res)
-    {
-      return res.IsNotRelaxed();
-    });
+    auto const it = partition(m_results.begin(), iEnd, [](PreRankerResult const & res) { return res.IsNotRelaxed(); });
 
     m_relaxedResults.insert(m_relaxedResults.end(), make_move_iterator(it), make_move_iterator(iEnd));
     m_results.erase(it, iEnd);
diff --git a/libs/search/pre_ranker.hpp b/libs/search/pre_ranker.hpp
index 868d06108..91fed4a11 100644
--- a/libs/search/pre_ranker.hpp
+++ b/libs/search/pre_ranker.hpp
@@ -25,7 +25,8 @@ class PreRanker
 public:
   struct Params
   {
-    // Minimal distance between search results (by x,y axes in mercator), needed for filtering of viewport search results.
+    // Minimal distance between search results (by x,y axes in mercator), needed for filtering of viewport search
+    // results.
     m2::PointD m_minDistanceOnMapBetweenResults{0, 0};
 
     // This is different from geocoder's pivot because pivot is
@@ -83,8 +84,7 @@ public:
   size_t Size() const { return m_results.size() + m_relaxedResults.size(); }
   size_t BatchSize() const
   {
-    return m_params.m_viewportSearch ? std::numeric_limits<size_t>::max()
-                                     : m_params.m_everywhereBatchSize;
+    return m_params.m_viewportSearch ? std::numeric_limits<size_t>::max() : m_params.m_everywhereBatchSize;
   }
   size_t NumSentResults() const { return m_numSentResults; }
   bool ContinueSearch() const { return !m_haveFullyMatchedResult || Size() < BatchSize(); }
@@ -126,7 +126,8 @@ public:
       }
 
       processed.insert(mwmId);
-    } while (nextAssigned);
+    }
+    while (nextAssigned);
   }
 
   void ClearCaches();
diff --git a/libs/search/pre_ranking_info.cpp b/libs/search/pre_ranking_info.cpp
index 955ca8996..e6d345152 100644
--- a/libs/search/pre_ranking_info.cpp
+++ b/libs/search/pre_ranking_info.cpp
@@ -8,8 +8,7 @@ std::string DebugPrint(PreRankingInfo const & info)
 {
   std::ostringstream os;
   os << std::boolalpha << "PreRankingInfo "
-     << "{ m_distanceToPivot: " << info.m_distanceToPivot
-     << ", m_tokenRanges [ ";
+     << "{ m_distanceToPivot: " << info.m_distanceToPivot << ", m_tokenRanges [ ";
   for (size_t i = 0; i < Model::TYPE_COUNT; ++i)
   {
     if (info.m_tokenRanges[i].Empty())
@@ -19,13 +18,9 @@ std::string DebugPrint(PreRankingInfo const & info)
     os << DebugPrint(type) << " : " << DebugPrint(info.m_tokenRanges[i]) << ", ";
   }
   os << " ]"
-     << ", m_rank: " << static_cast<int>(info.m_rank)
-     << ", m_popularity: " << static_cast<int>(info.m_popularity)
-     << ", m_type: " << DebugPrint(info.m_type)
-     << ", m_allTokensUsed: " << info.m_allTokensUsed
-     << ", m_exactMatch: " << info.m_exactMatch
-     << ", m_isCommonMatchOnly: " << info.m_isCommonMatchOnly
-     << " }";
+     << ", m_rank: " << static_cast<int>(info.m_rank) << ", m_popularity: " << static_cast<int>(info.m_popularity)
+     << ", m_type: " << DebugPrint(info.m_type) << ", m_allTokensUsed: " << info.m_allTokensUsed
+     << ", m_exactMatch: " << info.m_exactMatch << ", m_isCommonMatchOnly: " << info.m_isCommonMatchOnly << " }";
 
   return os.str();
 }
diff --git a/libs/search/pre_ranking_info.hpp b/libs/search/pre_ranking_info.hpp
index 46e47ad13..b5835bf25 100644
--- a/libs/search/pre_ranking_info.hpp
+++ b/libs/search/pre_ranking_info.hpp
@@ -18,7 +18,10 @@ namespace search
 struct PreRankingInfo
 {
   PreRankingInfo(Model::Type type, TokenRange const & range)
-    : m_allTokensUsed(true), m_exactMatch(true), m_centerLoaded(false), m_isCommonMatchOnly(false)
+    : m_allTokensUsed(true)
+    , m_exactMatch(true)
+    , m_centerLoaded(false)
+    , m_isCommonMatchOnly(false)
   {
     ASSERT_LESS(type, Model::TYPE_COUNT, ());
     m_type = type;
diff --git a/libs/search/processor.cpp b/libs/search/processor.cpp
index d634766da..b8665219d 100644
--- a/libs/search/processor.cpp
+++ b/libs/search/processor.cpp
@@ -75,10 +75,8 @@ void RemoveStopWordsIfNeeded(QueryTokens & tokens, strings::UniString & prefix)
 {
   size_t numStopWords = 0;
   for (auto const & token : tokens)
-  {
     if (IsStopWord(token))
       ++numStopWords;
-  }
 
   if (numStopWords == tokens.size() && prefix.empty())
     return;
@@ -112,8 +110,8 @@ bool EatFid(string & s, uint32_t & fid)
   return false;
 }
 
-bool EatMwmName(base::MemTrie<storage::CountryId, base::VectorValues<bool>> const & countriesTrie,
-                string & s, storage::CountryId & mwmName)
+bool EatMwmName(base::MemTrie<storage::CountryId, base::VectorValues<bool>> const & countriesTrie, string & s,
+                storage::CountryId & mwmName)
 {
   TrimLeadingSpaces(s);
 
@@ -159,30 +157,26 @@ bool EatVersion(string & s, uint32_t & version)
 }  // namespace
 
 Processor::Processor(DataSource const & dataSource, CategoriesHolder const & categories,
-                     vector<Suggest> const & suggests,
-                     storage::CountryInfoGetter const & infoGetter)
+                     vector<Suggest> const & suggests, storage::CountryInfoGetter const & infoGetter)
   : m_categories(categories)
   , m_infoGetter(infoGetter)
   , m_dataSource(dataSource)
   , m_localitiesCaches(static_cast<base::Cancellable const &>(*this))
   , m_citiesBoundaries(m_dataSource)
   , m_keywordsScorer(LanguageTier::LANGUAGE_TIER_COUNT)
-  , m_ranker(m_dataSource, m_citiesBoundaries, infoGetter, m_keywordsScorer, m_emitter, categories,
-             suggests, m_localitiesCaches.m_villages, static_cast<base::Cancellable const &>(*this))
+  , m_ranker(m_dataSource, m_citiesBoundaries, infoGetter, m_keywordsScorer, m_emitter, categories, suggests,
+             m_localitiesCaches.m_villages, static_cast<base::Cancellable const &>(*this))
   , m_preRanker(m_dataSource, m_ranker)
-  , m_geocoder(m_dataSource, infoGetter, categories, m_citiesBoundaries, m_preRanker,
-               m_localitiesCaches, static_cast<base::Cancellable const &>(*this))
+  , m_geocoder(m_dataSource, infoGetter, categories, m_citiesBoundaries, m_preRanker, m_localitiesCaches,
+               static_cast<base::Cancellable const &>(*this))
   , m_bookmarksProcessor(m_emitter, static_cast<base::Cancellable const &>(*this))
 {
   // Current and input langs are to be set later.
-  m_keywordsScorer.SetLanguages(
-      LanguageTier::LANGUAGE_TIER_EN_AND_INTERNATIONAL,
-      {StringUtf8Multilang::kInternationalCode, StringUtf8Multilang::kEnglishCode});
-  m_keywordsScorer.SetLanguages(LanguageTier::LANGUAGE_TIER_DEFAULT,
-                                {StringUtf8Multilang::kDefaultCode});
-  m_keywordsScorer.SetLanguages(
-      LanguageTier::LANGUAGE_TIER_ALT_AND_OLD,
-      {StringUtf8Multilang::kAltNameCode, StringUtf8Multilang::kOldNameCode});
+  m_keywordsScorer.SetLanguages(LanguageTier::LANGUAGE_TIER_EN_AND_INTERNATIONAL,
+                                {StringUtf8Multilang::kInternationalCode, StringUtf8Multilang::kEnglishCode});
+  m_keywordsScorer.SetLanguages(LanguageTier::LANGUAGE_TIER_DEFAULT, {StringUtf8Multilang::kDefaultCode});
+  m_keywordsScorer.SetLanguages(LanguageTier::LANGUAGE_TIER_ALT_AND_OLD,
+                                {StringUtf8Multilang::kAltNameCode, StringUtf8Multilang::kOldNameCode});
 
   for (auto const & country : m_infoGetter.GetCountries())
     m_countriesTrie.Add(country.m_countryId, true);
@@ -324,7 +318,10 @@ m2::RectD const & Processor::GetViewport() const
   return m_viewport;
 }
 
-void Processor::CacheWorldLocalities() { m_geocoder.CacheWorldLocalities(); }
+void Processor::CacheWorldLocalities()
+{
+  m_geocoder.CacheWorldLocalities();
+}
 
 void Processor::LoadCitiesBoundaries()
 {
@@ -334,7 +331,10 @@ void Processor::LoadCitiesBoundaries()
     LOG(LWARNING, ("Can't load cities boundaries"));
 }
 
-void Processor::LoadCountriesTree() { m_ranker.LoadCountriesTree(); }
+void Processor::LoadCountriesTree()
+{
+  m_ranker.LoadCountriesTree();
+}
 
 void Processor::EnableIndexingOfBookmarksDescriptions(bool enable)
 {
@@ -369,15 +369,13 @@ void Processor::OnBookmarksDeleted(vector<bookmarks::Id> const & marks)
     m_bookmarksProcessor.Erase(id);
 }
 
-void Processor::OnBookmarksAttachedToGroup(bookmarks::GroupId const & groupId,
-                                           vector<bookmarks::Id> const & marks)
+void Processor::OnBookmarksAttachedToGroup(bookmarks::GroupId const & groupId, vector<bookmarks::Id> const & marks)
 {
   for (auto const & id : marks)
     m_bookmarksProcessor.AttachToGroup(id, groupId);
 }
 
-void Processor::OnBookmarksDetachedFromGroup(bookmarks::GroupId const & groupId,
-                                             vector<bookmarks::Id> const & marks)
+void Processor::OnBookmarksDetachedFromGroup(bookmarks::GroupId const & groupId, vector<bookmarks::Id> const & marks)
 {
   for (auto const & id : marks)
     m_bookmarksProcessor.DetachFromGroup(id, groupId);
@@ -454,9 +452,7 @@ void Processor::SearchByFeatureId()
     string s = query;
     bool const parenPref = strings::EatPrefix(s, "(");
     bool const parenSuff = strings::EatSuffix(s, ")");
-    if (parenPref == parenSuff &&
-        EatMwmName(m_countriesTrie, s, mwmName) &&
-        strings::EatPrefix(s, ",") &&
+    if (parenPref == parenSuff && EatMwmName(m_countriesTrie, s, mwmName) && strings::EatPrefix(s, ",") &&
         EatFid(s, fid))
     {
       EmitResultsFromMwms(infos, [&putFeature, &mwmName, fid](FeaturesLoaderGuard & guard, auto const & fn)
@@ -470,13 +466,8 @@ void Processor::SearchByFeatureId()
   // Case 2.
   {
     string s = query;
-    if (strings::EatPrefix(s, "{ MwmId [") &&
-        EatMwmName(m_countriesTrie, s, mwmName) &&
-        strings::EatPrefix(s, ", ") &&
-        EatVersion(s, version) &&
-        strings::EatPrefix(s, "], ") &&
-        EatFid(s, fid) &&
-        strings::EatPrefix(s, " }"))
+    if (strings::EatPrefix(s, "{ MwmId [") && EatMwmName(m_countriesTrie, s, mwmName) && strings::EatPrefix(s, ", ") &&
+        EatVersion(s, version) && strings::EatPrefix(s, "], ") && EatFid(s, fid) && strings::EatPrefix(s, " }"))
     {
       EmitResultsFromMwms(infos, [&putFeature, &mwmName, version, fid](FeaturesLoaderGuard & guard, auto const & fn)
       {
@@ -495,10 +486,8 @@ void Processor::EmitWithMetadata(feature::Metadata::EType type)
   std::sort(infos.begin(), infos.end());
 
   std::vector<FeatureID> ids;
-  m_dataSource.ForEachFeatureIDInRect([&ids](FeatureID id)
-  {
-    ids.push_back(std::move(id));
-  }, m_viewport, scales::GetUpperScale());
+  m_dataSource.ForEachFeatureIDInRect([&ids](FeatureID id) { ids.push_back(std::move(id)); }, m_viewport,
+                                      scales::GetUpperScale());
 
   // The same, first criteria is less<MwmId> -> less<MwmInfo*>
   std::sort(ids.begin(), ids.end());
@@ -713,8 +702,8 @@ bool Processor::SearchCoordinates()
   base::SortUnique(results);
   for (auto const & r : results)
   {
-    m_emitter.AddResultNoChecks(m_ranker.MakeResult(
-        RankerResult(r.m_lat, r.m_lon), true /* needAddress */, true /* needHighlighting */));
+    m_emitter.AddResultNoChecks(
+        m_ranker.MakeResult(RankerResult(r.m_lat, r.m_lon), true /* needAddress */, true /* needHighlighting */));
     m_emitter.Emit();
   }
   return coords_found;
@@ -729,9 +718,8 @@ void Processor::SearchPlusCode()
   if (openlocationcode::IsFull(query))
   {
     openlocationcode::CodeArea const area = openlocationcode::Decode(query);
-    m_emitter.AddResultNoChecks(
-            m_ranker.MakeResult(RankerResult(area.GetCenter().latitude, area.GetCenter().longitude),
-                                true /* needAddress */, false /* needHighlighting */));
+    m_emitter.AddResultNoChecks(m_ranker.MakeResult(RankerResult(area.GetCenter().latitude, area.GetCenter().longitude),
+                                                    true /* needAddress */, false /* needHighlighting */));
   }
   else if (openlocationcode::IsShort(query))
   {
@@ -744,8 +732,8 @@ void Processor::SearchPlusCode()
       openlocationcode::CodeArea const areaFromPos = openlocationcode::Decode(codeFromPos);
 
       m_emitter.AddResultNoChecks(
-              m_ranker.MakeResult(RankerResult(areaFromPos.GetCenter().latitude, areaFromPos.GetCenter().longitude),
-                                  true /* needAddress */, false /* needHighlighting */));
+          m_ranker.MakeResult(RankerResult(areaFromPos.GetCenter().latitude, areaFromPos.GetCenter().longitude),
+                              true /* needAddress */, false /* needHighlighting */));
     }
 
     ms::LatLon const latLonFromView = mercator::ToLatLon(m_viewport.Center());
@@ -756,7 +744,7 @@ void Processor::SearchPlusCode()
       openlocationcode::CodeArea const areaFromView = openlocationcode::Decode(codeFromView);
 
       m_emitter.AddResultNoChecks(
-              m_ranker.MakeResult(RankerResult(areaFromView.GetCenter().latitude, areaFromView.GetCenter().longitude),
+          m_ranker.MakeResult(RankerResult(areaFromView.GetCenter().latitude, areaFromView.GetCenter().longitude),
                               true /* needAddress */, false /* needHighlighting */));
     }
   }
@@ -798,8 +786,8 @@ void Processor::SearchPostcode()
     for (auto const & p : points)
       r.Add(p);
 
-    m_emitter.AddResultNoChecks(m_ranker.MakeResult(
-        RankerResult(r.Center(), query), true /* needAddress */, true /* needHighlighting */));
+    m_emitter.AddResultNoChecks(
+        m_ranker.MakeResult(RankerResult(r.Center(), query), true /* needAddress */, true /* needHighlighting */));
     m_emitter.Emit();
 
     return;
@@ -859,10 +847,7 @@ void Processor::InitParams(QueryParams & params) const
   for (size_t i = 0; i < params.GetNumTokens(); ++i)
     base::SortUnique(params.GetTypeIndices(i));
 
-  m_keywordsScorer.ForEachLanguage([&params](int8_t lang)
-  {
-    params.GetLangs().Insert(static_cast<uint64_t>(lang));
-  });
+  m_keywordsScorer.ForEachLanguage([&params](int8_t lang) { params.GetLangs().Insert(static_cast<uint64_t>(lang)); });
 }
 
 void Processor::InitGeocoder(Geocoder::Params & geocoderParams, SearchParams const & searchParams)
@@ -884,8 +869,7 @@ void Processor::InitGeocoder(Geocoder::Params & geocoderParams, SearchParams con
   m_geocoder.SetParams(geocoderParams);
 }
 
-void Processor::InitPreRanker(Geocoder::Params const & geocoderParams,
-                              SearchParams const & searchParams)
+void Processor::InitPreRanker(Geocoder::Params const & geocoderParams, SearchParams const & searchParams)
 {
   bool const viewportSearch = searchParams.m_mode == Mode::Viewport;
 
@@ -912,7 +896,7 @@ class NotInPreffered : public ftypes::BaseChecker
 {
   NotInPreffered() : ftypes::BaseChecker(1)
   {
-    base::StringIL const types[] = { {"organic"}, {"internet_access"} };
+    base::StringIL const types[] = {{"organic"}, {"internet_access"}};
     auto const & c = classif();
     for (auto const & e : types)
       m_types.push_back(c.GetTypeByPath(e));
@@ -921,10 +905,9 @@ class NotInPreffered : public ftypes::BaseChecker
 public:
   DECLARE_CHECKER_INSTANCE(NotInPreffered);
 };
-} // namespace
+}  // namespace
 
-void Processor::InitRanker(Geocoder::Params const & geocoderParams,
-                           SearchParams const & searchParams)
+void Processor::InitRanker(Geocoder::Params const & geocoderParams, SearchParams const & searchParams)
 {
   bool const viewportSearch = searchParams.m_mode == Mode::Viewport;
 
@@ -990,9 +973,8 @@ void Processor::EmitResultsFromMwms(std::vector<std::shared_ptr<MwmInfo>> const
 
   for (auto const & [_, country, ft] : results)
   {
-    m_emitter.AddResultNoChecks(m_ranker.MakeResult(RankerResult(*ft, country),
-                                                    true /* needAddress */,
-                                                    true /* needHighlighting */));
+    m_emitter.AddResultNoChecks(
+        m_ranker.MakeResult(RankerResult(*ft, country), true /* needAddress */, true /* needHighlighting */));
   }
 
   m_emitter.Emit();
diff --git a/libs/search/processor.hpp b/libs/search/processor.hpp
index ff4d1416f..145b6fc1e 100644
--- a/libs/search/processor.hpp
+++ b/libs/search/processor.hpp
@@ -56,8 +56,8 @@ public:
   // Maximum result candidates count for each viewport/criteria.
   static size_t const kPreResultsCount;
 
-  Processor(DataSource const & dataSource, CategoriesHolder const & categories,
-            std::vector<Suggest> const & suggests, storage::CountryInfoGetter const & infoGetter);
+  Processor(DataSource const & dataSource, CategoriesHolder const & categories, std::vector<Suggest> const & suggests,
+            storage::CountryInfoGetter const & infoGetter);
 
   void SetViewport(m2::RectD const & viewport);
   void SetPreferredLocale(std::string const & locale);
@@ -101,10 +101,8 @@ public:
   void OnBookmarksCreated(std::vector<std::pair<bookmarks::Id, bookmarks::Doc>> const & marks);
   void OnBookmarksUpdated(std::vector<std::pair<bookmarks::Id, bookmarks::Doc>> const & marks);
   void OnBookmarksDeleted(std::vector<bookmarks::Id> const & marks);
-  void OnBookmarksAttachedToGroup(bookmarks::GroupId const & groupId,
-                                  std::vector<bookmarks::Id> const & marks);
-  void OnBookmarksDetachedFromGroup(bookmarks::GroupId const & groupId,
-                                    std::vector<bookmarks::Id> const & marks);
+  void OnBookmarksAttachedToGroup(bookmarks::GroupId const & groupId, std::vector<bookmarks::Id> const & marks);
+  void OnBookmarksDetachedFromGroup(bookmarks::GroupId const & groupId, std::vector<bookmarks::Id> const & marks);
 
   // base::Cancellable overrides:
   void Reset() override;
diff --git a/libs/search/projection_on_street.cpp b/libs/search/projection_on_street.cpp
index 4a0a1aa33..ca652fa74 100644
--- a/libs/search/projection_on_street.cpp
+++ b/libs/search/projection_on_street.cpp
@@ -6,14 +6,10 @@
 
 #include <limits>
 
-
 namespace search
 {
 // ProjectionOnStreet ------------------------------------------------------------------------------
-ProjectionOnStreet::ProjectionOnStreet()
-  : m_proj(0, 0), m_distMeters(0), m_segIndex(0), m_projSign(false)
-{
-}
+ProjectionOnStreet::ProjectionOnStreet() : m_proj(0, 0), m_distMeters(0), m_segIndex(0), m_projSign(false) {}
 
 // ProjectionOnStreetCalculator --------------------------------------------------------------------
 ProjectionOnStreetCalculator::ProjectionOnStreetCalculator(std::vector<m2::PointD> const & points)
@@ -27,8 +23,7 @@ ProjectionOnStreetCalculator::ProjectionOnStreetCalculator(std::vector<m2::Point
     m_segments.emplace_back(points[i - 1], points[i]);
 }
 
-bool ProjectionOnStreetCalculator::GetProjection(m2::PointD const & point,
-                                                 ProjectionOnStreet & proj) const
+bool ProjectionOnStreetCalculator::GetProjection(m2::PointD const & point, ProjectionOnStreet & proj) const
 {
   size_t const kInvalidIndex = m_segments.size();
   proj.m_segIndex = kInvalidIndex;
@@ -43,11 +38,10 @@ bool ProjectionOnStreetCalculator::GetProjection(m2::PointD const & point,
       proj.m_proj = ptProj;
       proj.m_distMeters = distMeters;
       proj.m_segIndex = index;
-      proj.m_projSign =
-          m2::robust::OrientedS(m_segments[index].GetP0(), m_segments[index].GetP1(), point) <= 0.0;
+      proj.m_projSign = m2::robust::OrientedS(m_segments[index].GetP0(), m_segments[index].GetP1(), point) <= 0.0;
     }
   }
 
   return (proj.m_segIndex < kInvalidIndex);
 }
-} // namespace search
+}  // namespace search
diff --git a/libs/search/pysearch/bindings.cpp b/libs/search/pysearch/bindings.cpp
index c999de768..7a1eeb7d9 100644
--- a/libs/search/pysearch/bindings.cpp
+++ b/libs/search/pysearch/bindings.cpp
@@ -75,8 +75,7 @@ struct Params
   string ToString() const
   {
     ostringstream os;
-    os << m_query << ", " << m_locale << ", " << m_position.ToString() << ", "
-       << m_viewport.ToString();
+    os << m_query << ", " << m_locale << ", " << m_position.ToString() << ", " << m_viewport.ToString();
     return os.str();
   }
 
@@ -135,8 +134,8 @@ struct SearchEngineProxy
   {
     search::search_quality::InitDataSource(m_dataSource, "" /* mwmListPath */);
     search::search_quality::InitStorageData(m_affiliations, m_countryNameSynonyms);
-    m_engine = search::search_quality::InitSearchEngine(m_dataSource, m_affiliations,
-                                                        "en" /* locale */, 1 /* numThreads */);
+    m_engine =
+        search::search_quality::InitSearchEngine(m_dataSource, m_affiliations, "en" /* locale */, 1 /* numThreads */);
   }
 
   search::SearchParams MakeSearchParams(Params const & params) const
@@ -167,7 +166,7 @@ struct SearchEngineProxy
     return results;
   }
 
-  boost::python::list Trace(Params const &params) const
+  boost::python::list Trace(Params const & params) const
   {
     m_engine->SetLocale(params.m_locale);
 
diff --git a/libs/search/query_params.cpp b/libs/search/query_params.cpp
index 9246d0527..158a05994 100644
--- a/libs/search/query_params.cpp
+++ b/libs/search/query_params.cpp
@@ -839,7 +839,9 @@ map<string, vector<string>> const kSynonyms = {
     {"płk", {"pułkownika (pułkownik)"}},
     {"pln", {"plaine", "plein"}},
     {"pln", {"plein"}},
-    {"pl", {"placu", "plaça", "platz", "plain", "placem", "planta", "plass", "place", "plaza", "plassen", "plains", "plats", "platsen", "plac"}},
+    {"pl",
+     {"placu", "plaça", "platz", "plain", "placem", "planta", "plass", "place", "plaza", "plassen", "plains", "plats",
+      "platsen", "plac"}},
     {"plt", {"plateau", "plateaux"}},
     {"plut", {"plutonowego", "plutonowy"}},
     {"plza", {"plaza"}},
@@ -1081,7 +1083,9 @@ map<string, vector<string>> const kSynonyms = {
     {"s:t", {"sankt"}},
     /// @todo Should not duplicate Street synonyms defined in StreetsSynonymsHolder (avoid useless double queries).
     /// Remove "street" and "avenue" here, but should update GetNameScore.
-    {"st", {"santo", "sant", "sint", "saint", "stara", "street", "stary", "stora", "sankt", "store", "stare", "stig", "stigen"}},
+    {"st",
+     {"santo", "sant", "sint", "saint", "stara", "street", "stary", "stora", "sankt", "store", "stare", "stig",
+      "stigen"}},
     {"št", {"šent"}},
     {"stwg", {"steenweg"}},
     {"subdiv", {"subdivision"}},
@@ -1208,7 +1212,9 @@ map<string, vector<string>> const kSynonyms = {
     {"vst", {"vista"}},
     {"vs", {"volksschule"}},
     {"vte", {"vieille route"}},
-    {"v", {"västra", "vei", "von", "velike", "veliko", "väg", "via", "quinta", "velikem", "veliki", "vegen", "veien", "veg", "vägen", "quinto", "velika", "van"}},
+    {"v",
+     {"västra", "vei", "von", "velike", "veliko", "väg", "via", "quinta", "velikem", "veliki", "vegen", "veien", "veg",
+      "vägen", "quinto", "velika", "van"}},
     {"vvdas", {"viviendas"}},
     {"vv", {"vivenda"}},
     {"vw", {"view"}},
@@ -1462,8 +1468,8 @@ void QueryParams::Token::AddSynonym(String const & s)
 string DebugPrint(QueryParams::Token const & token)
 {
   ostringstream os;
-  os << "Token [ m_original=" << DebugPrint(token.GetOriginal())
-     << ", m_synonyms=" << DebugPrint(token.m_synonyms) << " ]";
+  os << "Token [ m_original=" << DebugPrint(token.GetOriginal()) << ", m_synonyms=" << DebugPrint(token.m_synonyms)
+     << " ]";
   return os.str();
 }
 
@@ -1473,14 +1479,15 @@ void QueryParams::ClearStreetIndices()
   class AdditionalCommonTokens
   {
     set<String> m_strings;
+
   public:
     AdditionalCommonTokens()
     {
       char const * arr[] = {
-        "the",                      // English
-        "der", "zum", "und", "auf", // German
-        "del", "les",               // Spanish
-        "в", "на"                   // Cyrillic
+          "the",                       // English
+          "der", "zum", "und", "auf",  // German
+          "del", "les",                // Spanish
+          "в",   "на"                  // Cyrillic
       };
       for (char const * s : arr)
         m_strings.insert(NormalizeAndSimplifyString(s));
@@ -1515,7 +1522,10 @@ void QueryParams::Clear()
   m_langs.Clear();
 }
 
-bool QueryParams::IsCategorySynonym(size_t i) const { return !GetTypeIndices(i).empty(); }
+bool QueryParams::IsCategorySynonym(size_t i) const
+{
+  return !GetTypeIndices(i).empty();
+}
 
 QueryParams::TypeIndices & QueryParams::GetTypeIndices(size_t i)
 {
@@ -1558,10 +1568,8 @@ bool QueryParams::IsNumberTokens(TokenRange const & range) const
   ASSERT_LESS_OR_EQUAL(range.End(), GetNumTokens(), ());
 
   for (size_t i : range)
-  {
     if (!GetToken(i).AnyOfOriginalOrSynonyms([](String const & s) { return strings::IsASCIINumeric(s); }))
       return false;
-  }
 
   return true;
 }
@@ -1588,20 +1596,16 @@ void QueryParams::AddSynonyms()
     string const ss = ToUtf8(MakeLowerCase(token.GetOriginal()));
     auto const it = kSynonyms.find(ss);
     if (it != kSynonyms.end())
-    {
       for (auto const & synonym : it->second)
         token.AddSynonym(synonym);
-    }
   }
   if (m_hasPrefix)
   {
     string const ss = ToUtf8(MakeLowerCase(m_prefixToken.GetOriginal()));
     auto const it = kSynonyms.find(ss);
     if (it != kSynonyms.end())
-    {
       for (auto const & synonym : it->second)
         m_prefixToken.AddSynonym(synonym);
-    }
   }
 }
 
@@ -1609,12 +1613,9 @@ string DebugPrint(QueryParams const & params)
 {
   ostringstream os;
   os << boolalpha << "QueryParams "
-     << "{ m_tokens: " << ::DebugPrint(params.m_tokens)
-     << ", m_prefixToken: " << DebugPrint(params.m_prefixToken)
-     << ", m_typeIndices: " << ::DebugPrint(params.m_typeIndices)
-     << ", m_langs: " << DebugPrint(params.m_langs)
-     << ", m_isCommonToken: " << ::DebugPrint(params.m_isCommonToken)
-     << " }";
+     << "{ m_tokens: " << ::DebugPrint(params.m_tokens) << ", m_prefixToken: " << DebugPrint(params.m_prefixToken)
+     << ", m_typeIndices: " << ::DebugPrint(params.m_typeIndices) << ", m_langs: " << DebugPrint(params.m_langs)
+     << ", m_isCommonToken: " << ::DebugPrint(params.m_isCommonToken) << " }";
   return os.str();
 }
 }  // namespace search
diff --git a/libs/search/query_params.hpp b/libs/search/query_params.hpp
index f2eb7d009..bb7adc3bf 100644
--- a/libs/search/query_params.hpp
+++ b/libs/search/query_params.hpp
@@ -10,7 +10,6 @@
 #include <string>
 #include <vector>
 
-
 namespace search
 {
 class TokenRange;
diff --git a/libs/search/query_saver.cpp b/libs/search/query_saver.cpp
index e85ea8ff1..e2cea6974 100644
--- a/libs/search/query_saver.cpp
+++ b/libs/search/query_saver.cpp
@@ -30,20 +30,14 @@ class SecureMemReader : public Reader
   void CheckPosAndSize(uint64_t pos, uint64_t size) const
   {
     if (pos + size > m_size || size > numeric_limits<size_t>::max())
-      MYTHROW(SizeException, (pos, size, m_size) );
+      MYTHROW(SizeException, (pos, size, m_size));
   }
 
 public:
   // Construct from block of memory.
-  SecureMemReader(void const * pData, size_t size)
-    : m_pData(static_cast<char const *>(pData)), m_size(size)
-  {
-  }
+  SecureMemReader(void const * pData, size_t size) : m_pData(static_cast<char const *>(pData)), m_size(size) {}
 
-  inline uint64_t Size() const override
-  {
-    return m_size;
-  }
+  inline uint64_t Size() const override { return m_size; }
 
   inline void Read(uint64_t pos, void * p, size_t size) const override
   {
@@ -69,7 +63,6 @@ private:
 };
 }  // namespace
 
-
 QuerySaver::QuerySaver()
 {
   Load();
@@ -78,11 +71,12 @@ QuerySaver::QuerySaver()
 void QuerySaver::Add(SearchRequest const & query)
 {
   // This change was made just before release, so we don't use untested search normalization methods.
-  //TODO (ldragunov) Rewrite to normalized requests.
+  // TODO (ldragunov) Rewrite to normalized requests.
   SearchRequest trimmedQuery(query);
   strings::Trim(trimmedQuery.first);
   strings::Trim(trimmedQuery.second);
-  auto trimmedComparator = [&trimmedQuery](SearchRequest request) {
+  auto trimmedComparator = [&trimmedQuery](SearchRequest request)
+  {
     strings::Trim(request.first);
     strings::Trim(request.second);
     return trimmedQuery == request;
@@ -140,8 +134,7 @@ void QuerySaver::Deserialize(string const & data)
     Length stringLength = ReadPrimitiveFromSource<Length>(reader);
     vector<char> str(stringLength);
     reader.Read(&str[0], stringLength);
-    m_topQueries.emplace_back(make_pair(string(&locale[0], localeLength),
-                                        string(&str[0], stringLength)));
+    m_topQueries.emplace_back(make_pair(string(&locale[0], localeLength), string(&str[0], stringLength)));
   }
 }
 
@@ -168,4 +161,4 @@ void QuerySaver::Load()
     LOG(LWARNING, ("Search history data corrupted! Creating new one."));
   }
 }
-}  // namesapce search
+}  // namespace search
diff --git a/libs/search/ranker.cpp b/libs/search/ranker.cpp
index 0664b17b0..c7f7a8bf7 100644
--- a/libs/search/ranker.cpp
+++ b/libs/search/ranker.cpp
@@ -38,16 +38,9 @@ template <typename Slice>
 void UpdateNameScores(string_view name, uint8_t lang, Slice const & slice, NameScores & bestScores)
 {
   if (StringUtf8Multilang::IsAltOrOldName(lang))
-  {
-    strings::Tokenize(name, ";", [&](string_view n)
-    {
-      bestScores.UpdateIfBetter(GetNameScores(n, lang, slice));
-    });
-  }
+    strings::Tokenize(name, ";", [&](string_view n) { bestScores.UpdateIfBetter(GetNameScores(n, lang, slice)); });
   else
-  {
     bestScores.UpdateIfBetter(GetNameScores(name, lang, slice));
-  }
 }
 
 template <typename Slice>
@@ -102,15 +95,12 @@ vector<strings::UniString> RemoveStreetSynonyms(vector<strings::UniString> const
 {
   vector<strings::UniString> res;
   for (auto const & e : tokens)
-  {
     if (!IsStreetSynonym(e))
       res.push_back(e);
-  }
   return res;
 }
 
-NameScores GetNameScores(FeatureType & ft, Geocoder::Params const & params,
-                         TokenRange const & range, Model::Type type)
+NameScores GetNameScores(FeatureType & ft, Geocoder::Params const & params, TokenRange const & range, Model::Type type)
 {
   NameScores bestScores;
 
@@ -157,16 +147,9 @@ NameScores GetNameScores(FeatureType & ft, Geocoder::Params const & params,
     };
 
     if (StringUtf8Multilang::IsAltOrOldName(lang))
-    {
-      strings::Tokenize(name, ";", [&updateScore](string_view n)
-      {
-        updateScore(n);
-      });
-    }
+      strings::Tokenize(name, ";", [&updateScore](string_view n) { updateScore(n); });
     else
-    {
       updateScore(name);
-    }
   }
 
   if (type == Model::TYPE_BUILDING)
@@ -202,16 +185,12 @@ NameScores GetNameScores(FeatureType & ft, Geocoder::Params const & params,
   if (!brand.empty())
   {
     indexer::ForEachLocalizedBrands(brand, [&](indexer::BrandsHolder::Brand::Name const & name)
-    {
-      UpdateNameScores(name.m_name, name.m_locale, sliceNoCategories, bestScores);
-    });
+    { UpdateNameScores(name.m_name, name.m_locale, sliceNoCategories, bestScores); });
   }
 
   if (type == Model::TYPE_STREET)
-  {
     for (auto const & shield : ftypes::GetRoadShieldsNames(ft))
       UpdateNameScores(shield, StringUtf8Multilang::kDefaultCode, sliceNoCategories, bestScores);
-  }
 
   return bestScores;
 }
@@ -328,8 +307,7 @@ class RankerResultMaker
   ftypes::IsCountryChecker const & m_countryChecker;
 
 public:
-  RankerResultMaker(Ranker & ranker, DataSource const & dataSource,
-                    storage::CountryInfoGetter const & infoGetter,
+  RankerResultMaker(Ranker & ranker, DataSource const & dataSource, storage::CountryInfoGetter const & infoGetter,
                     ReverseGeocoder const & reverseGeocoder, Geocoder::Params const & params)
     : m_wayChecker(ftypes::IsWayChecker::Instance())
     , m_capitalChecker(ftypes::IsCapitalChecker::Instance())
@@ -340,8 +318,7 @@ public:
     , m_reverseGeocoder(reverseGeocoder)
     , m_params(params)
     , m_isViewportMode(m_params.m_mode == Mode::Viewport)
-  {
-  }
+  {}
 
   optional<RankerResult> operator()(PreRankerResult const & preResult)
   {
@@ -385,16 +362,15 @@ public:
       // We do not compare result name and request for categorial requests, but we prefer named features
       // for Eat, Hotel or Shop categories. Toilets, stops, defibrillators, ... are equal w/wo names.
 
-      if (info.m_classifType.poi != PoiType::Eat &&
-          info.m_classifType.poi != PoiType::Hotel &&
+      if (info.m_classifType.poi != PoiType::Eat && info.m_classifType.poi != PoiType::Hotel &&
           info.m_classifType.poi != PoiType::ShopOrAmenity)
       {
         info.m_hasName = false;
       }
     }
 
-    info.m_rank = NormalizeRank(info.m_rank, info.m_type, center, country,
-                                m_capitalChecker(*ft), !info.m_allTokensUsed);
+    info.m_rank =
+        NormalizeRank(info.m_rank, info.m_type, center, country, m_capitalChecker(*ft), !info.m_allTokensUsed);
 
     if (preResult.GetInfo().m_isCommonMatchOnly)
     {
@@ -402,10 +378,7 @@ public:
       auto normalized = NormalizeAndSimplifyString(res.GetName());
       PreprocessBeforeTokenization(normalized);
       int count = 0;
-      SplitUniString(normalized, [&count](strings::UniString const &)
-      {
-        ++count;
-      }, Delimiters());
+      SplitUniString(normalized, [&count](strings::UniString const &) { ++count; }, Delimiters());
 
       // Factor is a number of the rest, not common matched tokens in Feature' name. Bigger is worse.
       // Example when count == 0: UTH airport has empty name, but "ut" is a _common_ token.
@@ -424,10 +397,7 @@ public:
   }
 
 private:
-  bool IsSameLoader(FeatureID const & id) const
-  {
-    return (m_loader && m_loader->GetId() == id.m_mwmId);
-  }
+  bool IsSameLoader(FeatureID const & id) const { return (m_loader && m_loader->GetId() == id.m_mwmId); }
 
   unique_ptr<FeatureType> LoadFeature(FeatureID const & id)
   {
@@ -457,8 +427,7 @@ private:
   }
 
   // For the best performance, incoming ids should be sorted by id.first (mwm file id).
-  unique_ptr<FeatureType> LoadFeature(FeatureID const & id, m2::PointD & center, string & name,
-                                      string & country)
+  unique_ptr<FeatureType> LoadFeature(FeatureID const & id, m2::PointD & center, string & name, string & country)
   {
     auto ft = LoadFeature(id);
     if (!ft)
@@ -479,7 +448,7 @@ private:
     {
       std::string_view brand = (*ft).GetMetadata(feature::Metadata::FMD_BRAND);
       if (!brand.empty())
-        name = platform::GetLocalizedBrandName(std::string{ brand });
+        name = platform::GetLocalizedBrandName(std::string{brand});
     }
 
     // Insert exact address (street and house number) instead of empty result name.
@@ -489,7 +458,7 @@ private:
       featureTypes.SortBySpec();
       auto const bestType = featureTypes.GetBestType();
       auto const addressChecker = ftypes::IsAddressChecker::Instance();
-    
+
       if (!addressChecker.IsMatched(bestType))
         return ft;
 
@@ -552,8 +521,8 @@ private:
       info.m_hasName = ft.HasName();
       if (!info.m_hasName)
       {
-        info.m_hasName = ft.HasMetadata(feature::Metadata::FMD_OPERATOR) ||
-                         ft.HasMetadata(feature::Metadata::FMD_BRAND);
+        info.m_hasName =
+            ft.HasMetadata(feature::Metadata::FMD_OPERATOR) || ft.HasMetadata(feature::Metadata::FMD_BRAND);
       }
     }
     else
@@ -583,7 +552,7 @@ private:
       {
         if (info.m_type != type && dependID != IntersectionResult::kInvalidId)
         {
-          if (auto p = LoadFeature({ ft.GetID().m_mwmId, dependID }))
+          if (auto p = LoadFeature({ft.GetID().m_mwmId, dependID}))
             updateScoreForFeature(*p, type);
         }
       };
@@ -639,8 +608,7 @@ private:
       info.m_nearbyMatch = preInfo.m_geoParts.IsPoiAndComplexPoi();
     }
 
-    CategoriesInfo const categoriesInfo(featureTypes,
-                                        TokenSlice(m_params, preInfo.InnermostTokenRange()),
+    CategoriesInfo const categoriesInfo(featureTypes, TokenSlice(m_params, preInfo.InnermostTokenRange()),
                                         m_ranker.m_params.m_categoryLocales, m_ranker.m_categories);
 
     info.m_pureCats = categoriesInfo.IsPureCategories();
@@ -653,16 +621,16 @@ private:
         info.m_nameScore = NameScore::FULL_PREFIX;
 
       ASSERT_LESS_OR_EQUAL(categoriesInfo.GetMatchedLength(), totalLength, (featureTypes));
-      info.m_matchedFraction = std::max(info.m_matchedFraction,
-                                        categoriesInfo.GetMatchedLength() / static_cast<float>(totalLength));
+      info.m_matchedFraction =
+          std::max(info.m_matchedFraction, categoriesInfo.GetMatchedLength() / static_cast<float>(totalLength));
       if (!info.m_errorsMade.IsValid())
         info.m_errorsMade = ErrorsMade(0);
     }
     info.m_falseCats = categoriesInfo.IsFalseCategories();
   }
 
-  uint16_t NormalizeRank(uint16_t rank, Model::Type type, m2::PointD const & center,
-                        string const & country, bool isCapital, bool isRelaxed)
+  uint16_t NormalizeRank(uint16_t rank, Model::Type type, m2::PointD const & center, string const & country,
+                         bool isCapital, bool isRelaxed)
   {
     // Do not prioritize objects with population < 800. Same as RankToPopulation(rank) < 800, but faster.
     if (rank <= 70)
@@ -689,7 +657,8 @@ private:
         return rank * 1.7;
 
       // Fallthrough like "STATE" for cities without info.
-    } [[fallthrough]];
+    }
+      [[fallthrough]];
     case Model::TYPE_STATE: return rank / 1.5;
     case Model::TYPE_COUNTRY: return rank;
 
@@ -708,9 +677,8 @@ private:
 };
 
 Ranker::Ranker(DataSource const & dataSource, CitiesBoundariesTable const & boundariesTable,
-               storage::CountryInfoGetter const & infoGetter, KeywordLangMatcher & keywordsScorer,
-               Emitter & emitter, CategoriesHolder const & categories,
-               vector<Suggest> const & suggests, VillagesCache & villagesCache,
+               storage::CountryInfoGetter const & infoGetter, KeywordLangMatcher & keywordsScorer, Emitter & emitter,
+               CategoriesHolder const & categories, vector<Suggest> const & suggests, VillagesCache & villagesCache,
                base::Cancellable const & cancellable)
   : m_reverseGeocoder(dataSource)
   , m_cancellable(cancellable)
@@ -721,8 +689,7 @@ Ranker::Ranker(DataSource const & dataSource, CitiesBoundariesTable const & boun
   , m_emitter(emitter)
   , m_categories(categories)
   , m_suggests(suggests)
-{
-}
+{}
 
 void Ranker::Init(Params const & params, Geocoder::Params const & geocoderParams)
 {
@@ -763,13 +730,15 @@ Result Ranker::MakeResult(RankerResult const & rankerResult, bool needAddress, b
   {
   case RankerResult::Type::Feature:
   case RankerResult::Type::Building:
-    res.FromFeature(rankerResult.GetID(), rankerResult.GetBestType(), rankerResult.GetBestType(&m_params.m_preferredTypes), rankerResult.m_details);
+    res.FromFeature(rankerResult.GetID(), rankerResult.GetBestType(),
+                    rankerResult.GetBestType(&m_params.m_preferredTypes), rankerResult.m_details);
     break;
   case RankerResult::Type::LatLon: res.SetType(Result::Type::LatLon); break;
   case RankerResult::Type::Postcode: res.SetType(Result::Type::Postcode); break;
   }
 
-  if (needAddress && ftypes::IsLocalityChecker::Instance().GetType(rankerResult.GetTypes()) == ftypes::LocalityType::None)
+  if (needAddress &&
+      ftypes::IsLocalityChecker::Instance().GetType(rankerResult.GetTypes()) == ftypes::LocalityType::None)
   {
     m_localities.GetLocality(res.GetFeatureCenter(), [&](LocalityItem const & item)
     {
@@ -825,10 +794,8 @@ void Ranker::UpdateResults(bool lastUpdate)
     auto it = std::max_element(resV.begin(), resV.end(), base::LessBy(&RankerResult::GetLinearModelRank));
     double const lowestAllowed = it->GetLinearModelRank() - RankingInfo::GetLinearRankViewportThreshold();
 
-    it = std::partition(resV.begin(), resV.end(), [lowestAllowed](RankerResult const & r)
-    {
-      return r.GetLinearModelRank() >= lowestAllowed;
-    });
+    it = std::partition(resV.begin(), resV.end(),
+                        [lowestAllowed](RankerResult const & r) { return r.GetLinearModelRank() >= lowestAllowed; });
     if (it != resV.end())
     {
       LOG(LDEBUG, ("Removed", std::distance(it, resV.end()), "viewport results."));
@@ -838,13 +805,11 @@ void Ranker::UpdateResults(bool lastUpdate)
   else
   {
     // Can get same Town features (from World) when searching in many MWMs.
-    base::SortUnique(m_tentativeResults,
-        [](RankerResult const & r1, RankerResult const & r2)
-        {
-          // Expect that linear rank is equal for the same features.
-          return r1.GetLinearModelRank() > r2.GetLinearModelRank();
-        },
-        base::EqualsBy(&RankerResult::GetID));
+    base::SortUnique(m_tentativeResults, [](RankerResult const & r1, RankerResult const & r2)
+    {
+      // Expect that linear rank is equal for the same features.
+      return r1.GetLinearModelRank() > r2.GetLinearModelRank();
+    }, base::EqualsBy(&RankerResult::GetID));
 
     ProcessSuggestions(m_tentativeResults);
   }
@@ -854,11 +819,8 @@ void Ranker::UpdateResults(bool lastUpdate)
   size_t i = 0;
   for (; i < m_tentativeResults.size(); ++i)
   {
-    if (!lastUpdate && count >= m_params.m_batchSize && !m_params.m_viewportSearch &&
-        !m_params.m_categorialRequest)
-    {
+    if (!lastUpdate && count >= m_params.m_batchSize && !m_params.m_viewportSearch && !m_params.m_categorialRequest)
       break;
-    }
 
     if (!lastUpdate)
     {
@@ -878,7 +840,7 @@ void Ranker::UpdateResults(bool lastUpdate)
 
     /// @DebugNote
     // Uncomment for extended ranking print.
-    //if (!m_params.m_viewportSearch)
+    // if (!m_params.m_viewportSearch)
     //  LOG(LDEBUG, (rankerResult));
 
     // Don't make move here in case of BailIfCancelled() throw. Objects in m_tentativeResults should remain valid.
@@ -907,14 +869,20 @@ void Ranker::UpdateResults(bool lastUpdate)
   }
 }
 
-void Ranker::ClearCaches() { m_localities.ClearCache(); }
+void Ranker::ClearCaches()
+{
+  m_localities.ClearCache();
+}
 
 void Ranker::SetLocale(string const & locale)
 {
   m_regionInfoGetter.SetLocale(locale);
 }
 
-void Ranker::LoadCountriesTree() { m_regionInfoGetter.LoadCountriesTree(); }
+void Ranker::LoadCountriesTree()
+{
+  m_regionInfoGetter.LoadCountriesTree();
+}
 
 void Ranker::MakeRankerResults()
 {
@@ -955,16 +923,9 @@ void Ranker::GetBestMatchName(FeatureType & f, string & name) const
   auto bestNameFinder = [&](int8_t lang, string_view s)
   {
     if (StringUtf8Multilang::IsAltOrOldName(lang))
-    {
-      strings::Tokenize(s, ";", [lang, &updateScore](std::string_view n)
-      {
-        updateScore(lang, n, true /* force */);
-      });
-    }
+      strings::Tokenize(s, ";", [lang, &updateScore](std::string_view n) { updateScore(lang, n, true /* force */); });
     else
-    {
       updateScore(lang, s, true /* force */);
-    }
 
     // Default name should be written in the regional language.
     if (lang == StringUtf8Multilang::kDefaultCode)
@@ -987,15 +948,13 @@ void Ranker::GetBestMatchName(FeatureType & f, string & name) const
   }
 }
 
-void Ranker::MatchForSuggestions(strings::UniString const & token, int8_t locale,
-                                 string const & prologue)
+void Ranker::MatchForSuggestions(strings::UniString const & token, int8_t locale, string const & prologue)
 {
   for (auto const & suggest : m_suggests)
   {
     strings::UniString const & s = suggest.m_name;
-    if (suggest.m_prefixLength <= token.size()
-        && token != s                  // do not push suggestion if it already equals to token
-        && suggest.m_locale == locale  // push suggestions only for needed language
+    if (suggest.m_prefixLength <= token.size() && token != s  // do not push suggestion if it already equals to token
+        && suggest.m_locale == locale                         // push suggestions only for needed language
         && strings::StartsWith(s, token))
     {
       string const utf8Str = strings::ToUtf8(s);
@@ -1024,8 +983,8 @@ void Ranker::ProcessSuggestions(vector<RankerResult> const & vec) const
       if (!suggestion.empty())
       {
         // todo(@m) RankingInfo is lost here. Should it be?
-        if (m_emitter.AddResult(Result(MakeResult(r, false /* needAddress */, true /* needHighlighting */),
-                                       std::move(suggestion))))
+        if (m_emitter.AddResult(
+                Result(MakeResult(r, false /* needAddress */, true /* needHighlighting */), std::move(suggestion))))
         {
           ++added;
         }
diff --git a/libs/search/ranker.hpp b/libs/search/ranker.hpp
index 8a75c8871..41338363b 100644
--- a/libs/search/ranker.hpp
+++ b/libs/search/ranker.hpp
@@ -61,9 +61,8 @@ public:
   };
 
   Ranker(DataSource const & dataSource, CitiesBoundariesTable const & boundariesTable,
-         storage::CountryInfoGetter const & infoGetter, KeywordLangMatcher & keywordsScorer,
-         Emitter & emitter, CategoriesHolder const & categories,
-         std::vector<Suggest> const & suggests, VillagesCache & villagesCache,
+         storage::CountryInfoGetter const & infoGetter, KeywordLangMatcher & keywordsScorer, Emitter & emitter,
+         CategoriesHolder const & categories, std::vector<Suggest> const & suggests, VillagesCache & villagesCache,
          base::Cancellable const & cancellable);
   virtual ~Ranker() = default;
 
@@ -82,8 +81,7 @@ public:
 
   virtual void AddPreRankerResults(std::vector<PreRankerResult> && preRankerResults)
   {
-    std::move(preRankerResults.begin(), preRankerResults.end(),
-              std::back_inserter(m_preRankerResults));
+    std::move(preRankerResults.begin(), preRankerResults.end(), std::back_inserter(m_preRankerResults));
   }
 
   virtual void UpdateResults(bool lastUpdate);
@@ -102,8 +100,7 @@ private:
   void MakeRankerResults();
 
   void GetBestMatchName(FeatureType & f, std::string & name) const;
-  void MatchForSuggestions(strings::UniString const & token, int8_t locale,
-                           std::string const & prolog);
+  void MatchForSuggestions(strings::UniString const & token, int8_t locale, std::string const & prolog);
   void ProcessSuggestions(std::vector<RankerResult> const & vec) const;
 
   std::string GetLocalizedRegionInfoForResult(RankerResult const & result) const;
diff --git a/libs/search/ranking_info.cpp b/libs/search/ranking_info.cpp
index f8aae6596..60492cbc0 100644
--- a/libs/search/ranking_info.cpp
+++ b/libs/search/ranking_info.cpp
@@ -31,7 +31,7 @@ double constexpr kWalkingDistanceM = 5000.0;
 
 double constexpr AbsPenaltyPerKm()
 {
-  return - kDistanceToPivot * 1000.0 / RankingInfo::kMaxDistMeters;
+  return -kDistanceToPivot * 1000.0 / RankingInfo::kMaxDistMeters;
 }
 
 // These constants are very important and checked in Famous_Cities_Rank test.
@@ -42,7 +42,7 @@ double constexpr kErrorsMade = -0.4;
 double constexpr kMatchedFraction = 0.1876736;
 double constexpr kAllTokensUsed = 0.3;
 double constexpr kCommonTokens = -0.05;
-double constexpr kAltOldName = -0.3;    // Some reasonable penalty like kErrorsMade.
+double constexpr kAltOldName = -0.3;  // Some reasonable penalty like kErrorsMade.
 
 // Some thoughts about reasonable diff here:
 // - should be a bit less than fabs(kAltOldName) to filter non-obvious matching
@@ -53,62 +53,62 @@ static_assert(kViewportDiffThreshold < -kAltOldName && kViewportDiffThreshold >
 static_assert(kViewportDiffThreshold < kAllTokensUsed);
 
 double constexpr kNameScore[] = {
- -0.05,   // Zero
-  0,      // Substring
-  0.01,   // Prefix
-  0.012,  // First Match
-  0.018,  // Full Prefix
-  0.02,   // Full Match
+    -0.05,  // Zero
+    0,      // Substring
+    0.01,   // Prefix
+    0.012,  // First Match
+    0.018,  // Full Prefix
+    0.02,   // Full Match
 };
 static_assert(std::size(kNameScore) == base::E2I(NameScore::COUNT));
 
 // 0-based factors from POIs, Streets, Buildings, since we don't have ratings or popularities now.
 double constexpr kType[] = {
-  0,          // POI
-  0,          // Complex POI
-  0.007,      // Building, to compensate max(kStreetType), see Arbat_Address test.
-  0,          // Street
-  0,          // Suburb
- -0.025,      // Unclassified
-  0,          // Village
-  0.01,       // City
-  0.0233254,  // State
-  0.1679389,  // Country
+    0,          // POI
+    0,          // Complex POI
+    0.007,      // Building, to compensate max(kStreetType), see Arbat_Address test.
+    0,          // Street
+    0,          // Suburb
+    -0.025,     // Unclassified
+    0,          // Village
+    0.01,       // City
+    0.0233254,  // State
+    0.1679389,  // Country
 };
 static_assert(std::size(kType) == Model::TYPE_COUNT);
 
 // 0-based factors from General.
 double constexpr kPoiType[] = {
-  0.03,       // TransportMajor
-  0.003,      // TransportLocal (0 < it < Residential st)
-  0.01,       // Eat
-  0.01,       // Hotel
-  0.01,       // Shop or Amenity
-  0.01,       // Attraction
-  0.008,      // CarInfra
-  0.005,      // PureCategory
-  0,          // General
- -0.01,       // Service
+    0.03,   // TransportMajor
+    0.003,  // TransportLocal (0 < it < Residential st)
+    0.01,   // Eat
+    0.01,   // Hotel
+    0.01,   // Shop or Amenity
+    0.01,   // Attraction
+    0.008,  // CarInfra
+    0.005,  // PureCategory
+    0,      // General
+    -0.01,  // Service
 };
 static_assert(std::size(kPoiType) == base::E2I(PoiType::Count));
 
 // - When search for "eat", we'd prefer category types, rather than "eat" name.
 // - To _equalize_ "subway" search: Metro category should be equal with "Subway" fast food.
 // - See NY_Subway test.
-double constexpr kFalseCats =
-    kNameScore[base::E2I(NameScore::FULL_PREFIX)] - kNameScore[base::E2I(NameScore::FULL_MATCH)] +
-    kPoiType[base::E2I(PoiType::PureCategory)] - kPoiType[base::E2I(PoiType::Eat)];
+double constexpr kFalseCats = kNameScore[base::E2I(NameScore::FULL_PREFIX)] -
+                              kNameScore[base::E2I(NameScore::FULL_MATCH)] +
+                              kPoiType[base::E2I(PoiType::PureCategory)] - kPoiType[base::E2I(PoiType::Eat)];
 static_assert(kFalseCats < 0.0);
 
 double constexpr kStreetType[] = {
-  0,          // Default
-  0,          // Pedestrian
-  0,          // Cycleway
-  0,          // Outdoor
-  0.004,      // Minors
-  0.004,      // Residential
-  0.005,      // Regular
-  0.006,      // Motorway
+    0,      // Default
+    0,      // Pedestrian
+    0,      // Cycleway
+    0,      // Outdoor
+    0.004,  // Minors
+    0.004,  // Residential
+    0.005,  // Regular
+    0.006,  // Motorway
 };
 static_assert(std::size(kStreetType) == base::Underlying(StreetType::Count));
 
@@ -156,7 +156,7 @@ protected:
   std::vector<uint32_t> m_types;
 
 public:
-  bool operator() (feature::TypesHolder const & th) const
+  bool operator()(feature::TypesHolder const & th) const
   {
     return base::AnyOf(m_types, [&th](uint32_t t) { return th.HasWithSubclass(t); });
   }
@@ -167,7 +167,7 @@ class IsAttraction
   std::vector<uint32_t> m_types;
 
 public:
-  bool operator() (feature::TypesHolder const & th) const
+  bool operator()(feature::TypesHolder const & th) const
   {
     // Strict check (unlike in BaseTypesChecker) to avoid matching:
     // - historic-memorial-plaque
@@ -187,11 +187,8 @@ public:
 
     // Add _attraction_ leisures too!
     base::StringIL const types[] = {
-      {"leisure", "beach_resort"},
-      {"leisure", "garden"},
-      {"leisure", "marina"},
-      {"leisure", "nature_reserve"},
-      {"leisure", "park"},
+        {"leisure", "beach_resort"},   {"leisure", "garden"}, {"leisure", "marina"},
+        {"leisure", "nature_reserve"}, {"leisure", "park"},
     };
 
     Classificator const & c = classif();
@@ -206,24 +203,24 @@ public:
   IsShopOrAmenity()
   {
     base::StringIL const types[] = {
-      {"shop"},
+        {"shop"},
 
-      // Amenity types are very fragmented, so take only most _interesting_ here.
-      {"amenity", "bank"},
-      {"amenity", "brothel"},
-      {"amenity", "casino"},
-      {"amenity", "cinema"},
-      {"amenity", "clinic"},
-      {"amenity", "hospital"},
-      {"amenity", "ice_cream"},
-      {"amenity", "library"},
-      {"amenity", "marketplace"},
-      {"amenity", "nightclub"},
-      {"amenity", "pharmacy"},
-      {"amenity", "police"},
-      {"amenity", "post_office"},
-      {"amenity", "stripclub"},
-      {"amenity", "theatre"},
+        // Amenity types are very fragmented, so take only most _interesting_ here.
+        {"amenity", "bank"},
+        {"amenity", "brothel"},
+        {"amenity", "casino"},
+        {"amenity", "cinema"},
+        {"amenity", "clinic"},
+        {"amenity", "hospital"},
+        {"amenity", "ice_cream"},
+        {"amenity", "library"},
+        {"amenity", "marketplace"},
+        {"amenity", "nightclub"},
+        {"amenity", "pharmacy"},
+        {"amenity", "police"},
+        {"amenity", "post_office"},
+        {"amenity", "stripclub"},
+        {"amenity", "theatre"},
     };
 
     Classificator const & c = classif();
@@ -238,16 +235,16 @@ public:
   IsCarInfra()
   {
     base::StringIL const types[] = {
-      {"amenity", "car_rental"},
-      {"amenity", "car_sharing"},
-      {"amenity", "car_wash"},
-      {"amenity", "charging_station"},
-      {"amenity", "fuel"},
-      // Do not add parking here, no need to rank them by name.
-      //{"amenity", "parking"},
+        {"amenity", "car_rental"},
+        {"amenity", "car_sharing"},
+        {"amenity", "car_wash"},
+        {"amenity", "charging_station"},
+        {"amenity", "fuel"},
+        // Do not add parking here, no need to rank them by name.
+        //{"amenity", "parking"},
 
-      {"highway", "rest_area"},
-      {"highway", "services"},
+        {"highway", "rest_area"},
+        {"highway", "services"},
     };
 
     Classificator const & c = classif();
@@ -292,8 +289,7 @@ std::string DebugPrint(StoredRankingInfo const & info)
 {
   ostringstream os;
   os << "StoredRankingInfo "
-     << "{ m_distanceToPivot: " << info.m_distanceToPivot
-     << ", m_type: " << DebugPrint(info.m_type)
+     << "{ m_distanceToPivot: " << info.m_distanceToPivot << ", m_type: " << DebugPrint(info.m_type)
      << ", m_classifType: ";
 
   if (Model::IsPoi(info.m_type))
@@ -308,26 +304,17 @@ std::string DebugPrint(StoredRankingInfo const & info)
 string DebugPrint(RankingInfo const & info)
 {
   ostringstream os;
-  os << boolalpha << "RankingInfo { "
-     << DebugPrint(static_cast<StoredRankingInfo const &>(info)) << ", ";
+  os << boolalpha << "RankingInfo { " << DebugPrint(static_cast<StoredRankingInfo const &>(info)) << ", ";
 
   PrintParse(os, info.m_tokenRanges, info.m_numTokens);
 
-  os << ", m_rank: " << static_cast<int>(info.m_rank)
-     << ", m_popularity: " << static_cast<int>(info.m_popularity)
-     << ", m_nameScore: " << DebugPrint(info.m_nameScore)
-     << ", m_errorsMade: " << DebugPrint(info.m_errorsMade)
-     << ", m_isAltOrOldName: " << info.m_isAltOrOldName
-     << ", m_numTokens: " << info.m_numTokens
-     << ", m_commonTokensFactor: " << info.m_commonTokensFactor
-     << ", m_matchedFraction: " << info.m_matchedFraction
-     << ", m_pureCats: " << info.m_pureCats
-     << ", m_falseCats: " << info.m_falseCats
-     << ", m_allTokensUsed: " << info.m_allTokensUsed
-     << ", m_categorialRequest: " << info.m_categorialRequest
-     << ", m_hasName: " << info.m_hasName
-     << ", m_nearbyMatch: " << info.m_nearbyMatch
-     << " }";
+  os << ", m_rank: " << static_cast<int>(info.m_rank) << ", m_popularity: " << static_cast<int>(info.m_popularity)
+     << ", m_nameScore: " << DebugPrint(info.m_nameScore) << ", m_errorsMade: " << DebugPrint(info.m_errorsMade)
+     << ", m_isAltOrOldName: " << info.m_isAltOrOldName << ", m_numTokens: " << info.m_numTokens
+     << ", m_commonTokensFactor: " << info.m_commonTokensFactor << ", m_matchedFraction: " << info.m_matchedFraction
+     << ", m_pureCats: " << info.m_pureCats << ", m_falseCats: " << info.m_falseCats
+     << ", m_allTokensUsed: " << info.m_allTokensUsed << ", m_categorialRequest: " << info.m_categorialRequest
+     << ", m_hasName: " << info.m_hasName << ", m_nearbyMatch: " << info.m_nearbyMatch << " }";
 
   return os.str();
 }
@@ -397,8 +384,7 @@ double RankingInfo::GetLinearModelRank(bool viewportMode /* = false */) const
     if (m_allTokensUsed)
       result += kAllTokensUsed;
 
-    auto const nameRank = kNameScore[static_cast<size_t>(GetNameScore())] +
-                          kErrorsMade * GetErrorsMadePerToken() +
+    auto const nameRank = kNameScore[static_cast<size_t>(GetNameScore())] + kErrorsMade * GetErrorsMadePerToken() +
                           kMatchedFraction * m_matchedFraction;
     result += nameRank;
 
@@ -448,10 +434,8 @@ NameScore RankingInfo::GetNameScore() const
   {
     // Promote POI's name rank if all tokens were matched with TYPE_SUBPOI/TYPE_COMPLEXPOI only.
     for (int i = Model::TYPE_BUILDING; i < Model::TYPE_COUNT; ++i)
-    {
       if (!m_tokenRanges[i].Empty())
         return m_nameScore;
-    }
 
     // It's better for ranking when POIs would be equal by name score in the next cases:
 
@@ -497,8 +481,7 @@ PoiType GetPoiType(feature::TypesHolder const & th)
   if (IsHotelChecker::Instance()(th))
     return PoiType::Hotel;
 
-  if (IsRailwayStationChecker::Instance()(th) ||
-      IsSubwayStationChecker::Instance()(th) ||
+  if (IsRailwayStationChecker::Instance()(th) || IsSubwayStationChecker::Instance()(th) ||
       IsAirportChecker::Instance()(th))
   {
     return PoiType::TransportMajor;
diff --git a/libs/search/ranking_info.hpp b/libs/search/ranking_info.hpp
index 79cd65b7e..83193ddef 100644
--- a/libs/search/ranking_info.hpp
+++ b/libs/search/ranking_info.hpp
@@ -10,7 +10,10 @@
 #include <ostream>
 #include <string>
 
-namespace feature { class TypesHolder; }
+namespace feature
+{
+class TypesHolder;
+}
 
 namespace search
 {
diff --git a/libs/search/ranking_utils.cpp b/libs/search/ranking_utils.cpp
index 1dd6b6f99..22f778196 100644
--- a/libs/search/ranking_utils.cpp
+++ b/libs/search/ranking_utils.cpp
@@ -17,8 +17,8 @@ using namespace std;
 using namespace strings;
 
 // CategoriesInfo ----------------------------------------------------------------------------------
-CategoriesInfo::CategoriesInfo(feature::TypesHolder const & holder, TokenSlice const & tokens,
-                               Locales const & locales, CategoriesHolder const & categories)
+CategoriesInfo::CategoriesInfo(feature::TypesHolder const & holder, TokenSlice const & tokens, Locales const & locales,
+                               CategoriesHolder const & categories)
 {
   struct TokenInfo
   {
@@ -40,10 +40,8 @@ CategoriesInfo::CategoriesInfo(feature::TypesHolder const & holder, TokenSlice c
   });
 
   for (size_t i = 0; i < slice.Size(); ++i)
-  {
     if (infos[i].m_inFeatureTypes)
       m_matchedLength += slice.Get(i).size();
-  }
 
   // Note that m_inFeatureTypes implies m_isCategoryToken.
 
@@ -53,10 +51,8 @@ CategoriesInfo::CategoriesInfo(feature::TypesHolder const & holder, TokenSlice c
     return info.m_inFeatureTypes;
   });
 
-  m_falseCategories = all_of(infos.begin(), infos.end(), [](TokenInfo const & info)
-  {
-    return !info.m_inFeatureTypes && info.m_isCategoryToken;
-  });
+  m_falseCategories = all_of(infos.begin(), infos.end(),
+                             [](TokenInfo const & info) { return !info.m_inFeatureTypes && info.m_isCategoryToken; });
 }
 
 // ErrorsMade --------------------------------------------------------------------------------------
@@ -70,8 +66,7 @@ string DebugPrint(ErrorsMade const & errorsMade)
 
 namespace impl
 {
-ErrorsMade GetErrorsMade(QueryParams::Token const & token,
-                         strings::UniString const & text, LevenshteinDFA const & dfa)
+ErrorsMade GetErrorsMade(QueryParams::Token const & token, strings::UniString const & text, LevenshteinDFA const & dfa)
 {
   if (token.AnyOfSynonyms([&text](strings::UniString const & s) { return text == s; }))
     return ErrorsMade(0);
@@ -84,8 +79,8 @@ ErrorsMade GetErrorsMade(QueryParams::Token const & token,
   return {};
 }
 
-ErrorsMade GetPrefixErrorsMade(QueryParams::Token const & token,
-                               strings::UniString const & text, LevenshteinDFA const & dfa)
+ErrorsMade GetPrefixErrorsMade(QueryParams::Token const & token, strings::UniString const & text,
+                               LevenshteinDFA const & dfa)
 {
   if (token.AnyOfSynonyms([&text](strings::UniString const & s) { return StartsWith(text, s); }))
     return ErrorsMade(0);
@@ -106,16 +101,17 @@ bool IsStopWord(UniString const & s)
   class StopWordsChecker
   {
     set<UniString> m_set;
+
   public:
     StopWordsChecker()
     {
       // Don't want to put _full_ stopwords list, not to break current ranking.
       // Only 2-letters and the most common.
       char const * arr[] = {
-        "a", "s", "the",  // English
-        "am", "im", "an", // German
-        "d", "da", "de", "di", "du", "la", "le", // French, Spanish, Italian
-        "и", "я"          // Cyrillic
+          "a",  "s",  "the",                          // English
+          "am", "im", "an",                           // German
+          "d",  "da", "de",  "di", "du", "la", "le",  // French, Spanish, Italian
+          "и",  "я"                                   // Cyrillic
       };
       for (char const * s : arr)
         m_set.insert(MakeUniString(s));
@@ -157,10 +153,8 @@ string DebugPrint(NameScores const & scores)
 {
   ostringstream os;
   os << boolalpha << "NameScores "
-     << "{ m_nameScore: " << DebugPrint(scores.m_nameScore)
-     << ", m_matchedLength: " << scores.m_matchedLength
-     << ", m_errorsMade: " << DebugPrint(scores.m_errorsMade)
-     << ", m_isAltOrOldName: "
+     << "{ m_nameScore: " << DebugPrint(scores.m_nameScore) << ", m_matchedLength: " << scores.m_matchedLength
+     << ", m_errorsMade: " << DebugPrint(scores.m_errorsMade) << ", m_isAltOrOldName: "
      << " }";
   return os.str();
 }
diff --git a/libs/search/ranking_utils.hpp b/libs/search/ranking_utils.hpp
index 069d3f3c4..51d81e027 100644
--- a/libs/search/ranking_utils.hpp
+++ b/libs/search/ranking_utils.hpp
@@ -27,8 +27,8 @@ class TokenSlice;
 class CategoriesInfo
 {
 public:
-  CategoriesInfo(feature::TypesHolder const & holder, TokenSlice const & tokens,
-                 Locales const & locales, CategoriesHolder const & categories);
+  CategoriesInfo(feature::TypesHolder const & holder, TokenSlice const & tokens, Locales const & locales,
+                 CategoriesHolder const & categories);
 
   size_t GetMatchedLength() const { return m_matchedLength; }
 
@@ -98,23 +98,23 @@ namespace impl
 // Returns the minimum number of errors needed to match |text| with |token|.
 // If it's not possible in accordance with GetMaxErrorsForToken(|text|), returns kInfiniteErrors.
 /// @param[in]  dfa DFA for |text|
-ErrorsMade GetErrorsMade(QueryParams::Token const & token,
-                         strings::UniString const & text, strings::LevenshteinDFA const & dfa);
-ErrorsMade GetPrefixErrorsMade(QueryParams::Token const & token,
-                               strings::UniString const & text, strings::LevenshteinDFA const & dfa);
+ErrorsMade GetErrorsMade(QueryParams::Token const & token, strings::UniString const & text,
+                         strings::LevenshteinDFA const & dfa);
+ErrorsMade GetPrefixErrorsMade(QueryParams::Token const & token, strings::UniString const & text,
+                               strings::LevenshteinDFA const & dfa);
 }  // namespace impl
 
 // The order and numeric values are important here. Please, check all use-cases before changing this enum.
 enum class NameScore : uint8_t
 {
   // example name = "Carrefour Mini"
-                  // example query:
-  ZERO = 0,       // Rewe
-  SUBSTRING,      // Mini
-  PREFIX,         // Carref
-  FIRST_MATCH,    // Carrefour Maxi
-  FULL_PREFIX,    // Carrefour
-  FULL_MATCH,     // Carrefour Mini
+  // example query:
+  ZERO = 0,     // Rewe
+  SUBSTRING,    // Mini
+  PREFIX,       // Carref
+  FIRST_MATCH,  // Carrefour Maxi
+  FULL_PREFIX,  // Carrefour
+  FULL_MATCH,   // Carrefour Mini
 
   COUNT
 };
@@ -123,9 +123,11 @@ struct NameScores
 {
   NameScores() = default;
   NameScores(NameScore nameScore, ErrorsMade const & errorsMade, bool isAltOrOldName, size_t matchedLength)
-    : m_nameScore(nameScore), m_errorsMade(errorsMade), m_isAltOrOldName(isAltOrOldName), m_matchedLength(matchedLength)
-  {
-  }
+    : m_nameScore(nameScore)
+    , m_errorsMade(errorsMade)
+    , m_isAltOrOldName(isAltOrOldName)
+    , m_matchedLength(matchedLength)
+  {}
 
   void UpdateIfBetter(NameScores const & rhs)
   {
@@ -135,8 +137,7 @@ struct NameScores
       newNameScoreIsBetter = false;
 
     // FULL_PREFIX with !alt_old_name) is better than FULL_MATCH with alt_old_name.
-    if (!m_isAltOrOldName && rhs.m_isAltOrOldName &&
-        !rhs.m_errorsMade.IsBetterThan(m_errorsMade) &&
+    if (!m_isAltOrOldName && rhs.m_isAltOrOldName && !rhs.m_errorsMade.IsBetterThan(m_errorsMade) &&
         (int)rhs.m_nameScore - (int)m_nameScore < 2)
     {
       newNameScoreIsBetter = false;
@@ -151,9 +152,8 @@ struct NameScores
     // It's okay to pick a slightly worse matched length if other scores are better.
     auto const matchedLengthsAreSimilar = (m_matchedLength - m_matchedLength / 4) <= rhs.m_matchedLength;
 
-    if (newMatchedLengthIsBetter ||
-       (matchedLengthsAreSimilar && newNameScoreIsBetter) ||
-       (matchedLengthsAreSimilar && nameScoresAreEqual && newLanguageIsBetter))
+    if (newMatchedLengthIsBetter || (matchedLengthsAreSimilar && newNameScoreIsBetter) ||
+        (matchedLengthsAreSimilar && nameScoresAreEqual && newLanguageIsBetter))
     {
       m_nameScore = rhs.m_nameScore;
       m_errorsMade = rhs.m_errorsMade;
@@ -183,25 +183,18 @@ std::string DebugPrint(NameScores const & scores);
 // Returns true when |s| is a stop-word and may be removed from a query.
 bool IsStopWord(strings::UniString const & s);
 
-
 class TokensVector
 {
   std::vector<strings::UniString> m_tokens;
   std::vector<strings::LevenshteinDFA> m_dfas;
 
 private:
-  void Init()
-  {
-    m_dfas.resize(m_tokens.size());
-  }
+  void Init() { m_dfas.resize(m_tokens.size()); }
 
 public:
   TokensVector() = default;
   explicit TokensVector(std::string_view name);
-  explicit TokensVector(std::vector<strings::UniString> && tokens) : m_tokens(std::move(tokens))
-  {
-    Init();
-  }
+  explicit TokensVector(std::vector<strings::UniString> && tokens) : m_tokens(std::move(tokens)) { Init(); }
 
   std::vector<strings::UniString> const & GetTokens() const { return m_tokens; }
   size_t Size() const { return m_tokens.size(); }
@@ -214,7 +207,6 @@ public:
   }
 };
 
-
 /// @param[in]  tokens  Feature's name (splitted on tokens, without delimiters) to match.
 /// @param[in]  slice   Input query.
 /// @todo Should make the honest recurrent score calculation like:
@@ -267,9 +259,7 @@ NameScores GetNameScores(TokensVector & tokens, uint8_t lang, Slice const & slic
     bool isAltOrOldName = false;
 
     auto const isFullScore = [&nameScore]()
-    {
-      return (nameScore == NameScore::FULL_MATCH || nameScore == NameScore::FULL_PREFIX);
-    };
+    { return (nameScore == NameScore::FULL_MATCH || nameScore == NameScore::FULL_PREFIX); };
 
     // Iterate through the entire slice. Incomplete matches can still be good.
     // Using this slice & token as an example:
@@ -291,8 +281,7 @@ NameScores GetNameScores(TokensVector & tokens, uint8_t lang, Slice const & slic
     //                 -6  -5  -4  -3  -2  -1   0   1   2
 
     size_t iToken, iSlice;
-    for (size_t i = std::max(0, int(offset) + 1 - int(tokenCount));
-                i < std::min(sliceCount, offset + 1); ++i)
+    for (size_t i = std::max(0, int(offset) + 1 - int(tokenCount)); i < std::min(sliceCount, offset + 1); ++i)
     {
       size_t const tIdx = i + tokenCount - 1 - offset;
 
diff --git a/libs/search/region_address_getter.cpp b/libs/search/region_address_getter.cpp
index 0107b8345..ddb25ecb2 100644
--- a/libs/search/region_address_getter.cpp
+++ b/libs/search/region_address_getter.cpp
@@ -6,22 +6,21 @@
 
 namespace search
 {
-RegionAddressGetter::RegionAddressGetter(DataSource const & dataSource,
-                                         storage::CountryInfoGetter const & infoGetter)
-  : m_reverseGeocoder(dataSource), m_cityFinder(dataSource), m_infoGetter(infoGetter)
+RegionAddressGetter::RegionAddressGetter(DataSource const & dataSource, storage::CountryInfoGetter const & infoGetter)
+  : m_reverseGeocoder(dataSource)
+  , m_cityFinder(dataSource)
+  , m_infoGetter(infoGetter)
 {
   m_nameGetter.LoadCountriesTree();
   m_nameGetter.SetLocale(languages::GetCurrentMapLanguage());
 }
 
-ReverseGeocoder::RegionAddress RegionAddressGetter::GetNearbyRegionAddress(
-    m2::PointD const & center)
+ReverseGeocoder::RegionAddress RegionAddressGetter::GetNearbyRegionAddress(m2::PointD const & center)
 {
   return ReverseGeocoder::GetNearbyRegionAddress(center, m_infoGetter, m_cityFinder);
 }
 
-std::string RegionAddressGetter::GetLocalizedRegionAddress(
-    ReverseGeocoder::RegionAddress const & addr) const
+std::string RegionAddressGetter::GetLocalizedRegionAddress(ReverseGeocoder::RegionAddress const & addr) const
 {
   return m_reverseGeocoder.GetLocalizedRegionAddress(addr, m_nameGetter);
 }
diff --git a/libs/search/region_info_getter.cpp b/libs/search/region_info_getter.cpp
index bef3ef75e..8afdfe8ce 100644
--- a/libs/search/region_info_getter.cpp
+++ b/libs/search/region_info_getter.cpp
@@ -5,7 +5,6 @@
 #include "base/logging.hpp"
 #include "base/string_utils.hpp"
 
-
 namespace search
 {
 using namespace std;
@@ -32,7 +31,8 @@ void GetPathToRoot(storage::CountryId const & id, storage::CountryTree const & c
   {
     fn(cur->Value().Name());
     cur = &cur->Parent();
-  } while (!cur->IsRoot());
+  }
+  while (!cur->IsRoot());
 }
 }  // namespace
 
@@ -43,8 +43,8 @@ void RegionInfoGetter::LoadCountriesTree()
   CountryNameSynonyms countryNameSynonyms;
   MwmTopCityGeoIds mwmTopCityGeoIds;
   MwmTopCountryGeoIds mwmTopCountryGeoIds;
-  LoadCountriesFromFile(COUNTRIES_FILE, m_countries, affiliations, countryNameSynonyms,
-                        mwmTopCityGeoIds, mwmTopCountryGeoIds);
+  LoadCountriesFromFile(COUNTRIES_FILE, m_countries, affiliations, countryNameSynonyms, mwmTopCityGeoIds,
+                        mwmTopCountryGeoIds);
 }
 
 void RegionInfoGetter::SetLocale(string const & locale)
@@ -55,10 +55,7 @@ void RegionInfoGetter::SetLocale(string const & locale)
 void RegionInfoGetter::GetLocalizedFullName(storage::CountryId const & id, NameBufferT & nameParts) const
 {
   buffer_vector<storage::CountryId const *, 4> ids;
-  GetPathToRoot(id, m_countries, [&ids](storage::CountryId const & id)
-  {
-    ids.push_back(&id);
-  });
+  GetPathToRoot(id, m_countries, [&ids](storage::CountryId const & id) { ids.push_back(&id); });
 
   if (!ids.empty())
   {
diff --git a/libs/search/result.cpp b/libs/search/result.cpp
index 14fa47702..92d4257d4 100644
--- a/libs/search/result.cpp
+++ b/libs/search/result.cpp
@@ -30,9 +30,10 @@ void Result::FromFeature(FeatureID const & id, uint32_t mainType, uint32_t match
 }
 
 Result::Result(string str, string && suggest)
-  : m_resultType(Type::PureSuggest), m_str(std::move(str)), m_suggestionStr(std::move(suggest))
-{
-}
+  : m_resultType(Type::PureSuggest)
+  , m_str(std::move(str))
+  , m_suggestionStr(std::move(suggest))
+{}
 
 Result::Result(Result && res, string && suggest)
   : m_id(std::move(res.m_id))
@@ -71,7 +72,7 @@ uint32_t Result::GetFeatureType() const
 bool Result::IsSameType(uint32_t type) const
 {
   uint8_t const level = ftype::GetLevel(type);
-  for (uint32_t t : { m_mainType, m_matchedType })
+  for (uint32_t t : {m_mainType, m_matchedType})
   {
     ftype::TruncValue(t, level);
     if (t == type)
@@ -277,19 +278,15 @@ bool Results::AddResult(Result && result)
       return false;
 
     for (auto i = m_results.begin(); i != it; ++i)
-    {
       if (result.IsEqualSuggest(*i))
         return false;
-    }
     InsertResult(it, std::move(result));
   }
   else
   {
     for (; it != m_results.end(); ++it)
-    {
       if (result.IsEqualFeature(*it))
         return false;
-    }
     InsertResult(m_results.end(), std::move(result));
   }
 
diff --git a/libs/search/result.hpp b/libs/search/result.hpp
index 3e2d3dc96..a7a3c13c3 100644
--- a/libs/search/result.hpp
+++ b/libs/search/result.hpp
@@ -10,8 +10,8 @@
 #include "geometry/point2d.hpp"
 
 #include "base/assert.hpp"
-#include "base/checked_cast.hpp"
 #include "base/buffer_vector.hpp"
+#include "base/checked_cast.hpp"
 
 #include <algorithm>
 #include <string>
@@ -20,7 +20,7 @@
 
 // Define this option to DebugPrint provenance.
 #ifdef DEBUG
-//#define SEARCH_USE_PROVENANCE
+// #define SEARCH_USE_PROVENANCE
 #endif
 
 namespace search
@@ -107,11 +107,11 @@ public:
   bool IsEqualFeature(Result const & r) const;
 
   void AddHighlightRange(std::pair<uint16_t, uint16_t> const & range);
-  void AddDescHighlightRange(const std::pair<uint16_t, uint16_t> & range);
+  void AddDescHighlightRange(std::pair<uint16_t, uint16_t> const & range);
   std::pair<uint16_t, uint16_t> const & GetHighlightRange(size_t idx) const;
   size_t GetHighlightRangesCount() const { return m_hightlightRanges.size(); }
-  
-  //returns ranges to hightlight in address
+
+  // returns ranges to hightlight in address
   std::pair<uint16_t, uint16_t> const & GetDescHighlightRange(size_t idx) const;
   size_t GetDescHighlightRangesCount() const { return m_descHightlightRanges.size(); }
 
@@ -158,7 +158,7 @@ private:
   buffer_vector<std::pair<uint16_t, uint16_t>, 4> m_hightlightRanges;
   buffer_vector<std::pair<uint16_t, uint16_t>, 4> m_descHightlightRanges;
 
-  std::shared_ptr<RankingInfo> m_dbgInfo;   // used in debug logs and tests, nullptr in production
+  std::shared_ptr<RankingInfo> m_dbgInfo;  // used in debug logs and tests, nullptr in production
 
   // The position that this result occupied in the vector returned by
   // a search query. -1 if undefined.
@@ -192,10 +192,7 @@ public:
   bool IsEndedNormal() const { return m_status == Status::EndedNormal; }
   bool IsEndedCancelled() const { return m_status == Status::EndedCancelled; }
 
-  void SetEndMarker(bool cancelled)
-  {
-    m_status = cancelled ? Status::EndedCancelled : Status::EndedNormal;
-  }
+  void SetEndMarker(bool cancelled) { m_status = cancelled ? Status::EndedCancelled : Status::EndedNormal; }
 
   // Used for results in the list.
   bool AddResult(Result && result);
diff --git a/libs/search/retrieval.cpp b/libs/search/retrieval.cpp
index fae511043..4323f8acc 100644
--- a/libs/search/retrieval.cpp
+++ b/libs/search/retrieval.cpp
@@ -46,8 +46,7 @@ public:
     , m_features(features)
     , m_exactlyMatchedFeatures(exactlyMatchedFeatures)
     , m_counter(0)
-  {
-  }
+  {}
 
   template <typename Value>
   void operator()(Value const & value, bool exactMatch)
@@ -189,8 +188,7 @@ pair<bool, bool> MatchesByType(feature::TypesHolder const & types, vector<DFA> c
 }
 
 template <typename DFA>
-pair<bool, bool> MatchFeatureByNameAndType(EditableMapObject const & emo,
-                                           SearchTrieRequest<DFA> const & request)
+pair<bool, bool> MatchFeatureByNameAndType(EditableMapObject const & emo, SearchTrieRequest<DFA> const & request)
 {
   auto const & th = emo.GetTypes();
 
@@ -249,14 +247,11 @@ Retrieval::ExtendedFeatures RetrieveAddressFeaturesImpl(Retrieval::TrieRoot<Valu
   vector<uint64_t> exactlyMatchedFeatures;
   FeaturesCollector collector(cancellable, features, exactlyMatchedFeatures);
 
-  MatchFeaturesInTrie(
-      request, root,
-      [&holder](Value const & value) {
-        return !holder.ModifiedOrDeleted(base::asserted_cast<uint32_t>(value.m_featureId));
-      } /* filter */,
-      collector);
+  MatchFeaturesInTrie(request, root, [&holder](Value const & value)
+  { return !holder.ModifiedOrDeleted(base::asserted_cast<uint32_t>(value.m_featureId)); } /* filter */, collector);
 
-  holder.ForEachModifiedOrCreated([&](EditableMapObject const & emo, uint64_t index) {
+  holder.ForEachModifiedOrCreated([&](EditableMapObject const & emo, uint64_t index)
+  {
     auto const matched = MatchFeatureByNameAndType(emo, request);
     if (matched.first)
     {
@@ -280,14 +275,11 @@ Retrieval::ExtendedFeatures RetrievePostcodeFeaturesImpl(Retrieval::TrieRoot<Val
   vector<uint64_t> exactlyMatchedFeatures;
   FeaturesCollector collector(cancellable, features, exactlyMatchedFeatures);
 
-  MatchPostcodesInTrie(
-      slice, root,
-      [&holder](Value const & value) {
-        return !holder.ModifiedOrDeleted(base::asserted_cast<uint32_t>(value.m_featureId));
-      } /* filter */,
-      collector);
+  MatchPostcodesInTrie(slice, root, [&holder](Value const & value)
+  { return !holder.ModifiedOrDeleted(base::asserted_cast<uint32_t>(value.m_featureId)); } /* filter */, collector);
 
-  holder.ForEachModifiedOrCreated([&](EditableMapObject const & emo, uint64_t index) {
+  holder.ForEachModifiedOrCreated([&](EditableMapObject const & emo, uint64_t index)
+  {
     if (MatchFeatureByPostcode(emo, slice))
       features.push_back(index);
   });
@@ -296,8 +288,8 @@ Retrieval::ExtendedFeatures RetrievePostcodeFeaturesImpl(Retrieval::TrieRoot<Val
 }
 
 Retrieval::ExtendedFeatures RetrieveGeometryFeaturesImpl(MwmContext const & context,
-                                                         base::Cancellable const & cancellable,
-                                                         m2::RectD const & rect, int scale)
+                                                         base::Cancellable const & cancellable, m2::RectD const & rect,
+                                                         int scale)
 {
   EditedFeaturesHolder holder(context.GetId());
 
@@ -311,7 +303,8 @@ Retrieval::ExtendedFeatures RetrieveGeometryFeaturesImpl(MwmContext const & cont
 
   context.ForEachIndex(coverage, scale, collector);
 
-  holder.ForEachModifiedOrCreated([&](EditableMapObject const & emo, uint64_t index) {
+  holder.ForEachModifiedOrCreated([&](EditableMapObject const & emo, uint64_t index)
+  {
     auto const center = emo.GetMercator();
     if (rect.IsPointInside(center))
       features.push_back(index);
@@ -342,13 +335,15 @@ struct RetrievePostcodeFeaturesAdaptor
 template <typename Value>
 unique_ptr<Retrieval::TrieRoot<Value>> ReadTrie(ModelReaderPtr & reader)
 {
-  return trie::ReadTrie<SubReaderWrapper<Reader>, ValueList<Value>>(
-      SubReaderWrapper<Reader>(reader.GetPtr()), SingleValueSerializer<Value>());
+  return trie::ReadTrie<SubReaderWrapper<Reader>, ValueList<Value>>(SubReaderWrapper<Reader>(reader.GetPtr()),
+                                                                    SingleValueSerializer<Value>());
 }
 }  // namespace
 
 Retrieval::Retrieval(MwmContext const & context, base::Cancellable const & cancellable)
-  : m_context(context), m_cancellable(cancellable), m_reader(unique_ptr<ModelReader>())
+  : m_context(context)
+  , m_cancellable(cancellable)
+  , m_reader(unique_ptr<ModelReader>())
 {
   auto const & value = context.m_value;
 
@@ -375,8 +370,7 @@ Retrieval::Retrieval(MwmContext const & context, base::Cancellable const & cance
   m_root = ReadTrie<Uint64IndexValue>(m_reader);
 }
 
-Retrieval::ExtendedFeatures Retrieval::RetrieveAddressFeatures(
-    SearchTrieRequest<UniStringDFA> const & request) const
+Retrieval::ExtendedFeatures Retrieval::RetrieveAddressFeatures(SearchTrieRequest<UniStringDFA> const & request) const
 {
   return Retrieve<RetrieveAddressFeaturesAdaptor>(request);
 }
@@ -387,8 +381,7 @@ Retrieval::ExtendedFeatures Retrieval::RetrieveAddressFeatures(
   return Retrieve<RetrieveAddressFeaturesAdaptor>(request);
 }
 
-Retrieval::ExtendedFeatures Retrieval::RetrieveAddressFeatures(
-    SearchTrieRequest<LevenshteinDFA> const & request) const
+Retrieval::ExtendedFeatures Retrieval::RetrieveAddressFeatures(SearchTrieRequest<LevenshteinDFA> const & request) const
 {
   return Retrieve<RetrieveAddressFeaturesAdaptor>(request);
 }
diff --git a/libs/search/retrieval.hpp b/libs/search/retrieval.hpp
index c4a798816..d5720474c 100644
--- a/libs/search/retrieval.hpp
+++ b/libs/search/retrieval.hpp
@@ -30,7 +30,7 @@ class TokenSlice;
 class Retrieval
 {
 public:
-  template<typename Value>
+  template <typename Value>
   using TrieRoot = trie::Iterator<ValueList<Value>>;
   using Features = search::CBV;
 
@@ -40,14 +40,12 @@ public:
     ExtendedFeatures(ExtendedFeatures const &) = default;
     ExtendedFeatures(ExtendedFeatures &&) = default;
 
-    explicit ExtendedFeatures(Features const & cbv) : m_features(cbv), m_exactMatchingFeatures(cbv)
-    {
-    }
+    explicit ExtendedFeatures(Features const & cbv) : m_features(cbv), m_exactMatchingFeatures(cbv) {}
 
     ExtendedFeatures(Features && features, Features && exactMatchingFeatures)
-      : m_features(std::move(features)), m_exactMatchingFeatures(std::move(exactMatchingFeatures))
-    {
-    }
+      : m_features(std::move(features))
+      , m_exactMatchingFeatures(std::move(exactMatchingFeatures))
+    {}
 
     ExtendedFeatures & operator=(ExtendedFeatures const &) = default;
     ExtendedFeatures & operator=(ExtendedFeatures &&) = default;
@@ -56,8 +54,7 @@ public:
     {
       ExtendedFeatures result;
       result.m_features = m_features.Intersect(rhs.m_features);
-      result.m_exactMatchingFeatures =
-          m_exactMatchingFeatures.Intersect(rhs.m_exactMatchingFeatures);
+      result.m_exactMatchingFeatures = m_exactMatchingFeatures.Intersect(rhs.m_exactMatchingFeatures);
       return result;
     }
 
@@ -77,9 +74,8 @@ public:
 
     void ForEach(std::function<void(uint32_t, bool)> const & f) const
     {
-      m_features.ForEach([&](uint64_t id) {
-        f(base::asserted_cast<uint32_t>(id), m_exactMatchingFeatures.HasBit(id));
-      });
+      m_features.ForEach([&](uint64_t id)
+      { f(base::asserted_cast<uint32_t>(id), m_exactMatchingFeatures.HasBit(id)); });
     }
 
     Features m_features;
@@ -89,14 +85,12 @@ public:
   Retrieval(MwmContext const & context, base::Cancellable const & cancellable);
 
   // Following functions retrieve all features matching to |request| from the search index.
-  ExtendedFeatures RetrieveAddressFeatures(
-      SearchTrieRequest<strings::UniStringDFA> const & request) const;
+  ExtendedFeatures RetrieveAddressFeatures(SearchTrieRequest<strings::UniStringDFA> const & request) const;
 
   ExtendedFeatures RetrieveAddressFeatures(
       SearchTrieRequest<strings::PrefixDFAModifier<strings::UniStringDFA>> const & request) const;
 
-  ExtendedFeatures RetrieveAddressFeatures(
-      SearchTrieRequest<strings::LevenshteinDFA> const & request) const;
+  ExtendedFeatures RetrieveAddressFeatures(SearchTrieRequest<strings::LevenshteinDFA> const & request) const;
 
   ExtendedFeatures RetrieveAddressFeatures(
       SearchTrieRequest<strings::PrefixDFAModifier<strings::LevenshteinDFA>> const & request) const;
diff --git a/libs/search/reverse_geocoder.cpp b/libs/search/reverse_geocoder.cpp
index 0c55ce277..79cc4ac2d 100644
--- a/libs/search/reverse_geocoder.cpp
+++ b/libs/search/reverse_geocoder.cpp
@@ -22,7 +22,6 @@
 #include <algorithm>
 #include <functional>
 
-
 namespace search
 {
 using namespace std;
@@ -34,8 +33,7 @@ int constexpr kQueryScale = scales::GetUpperScale();
 size_t constexpr kMaxNumTriesToApproxAddress = 10;
 
 using AppendStreet = function<void(FeatureType & ft)>;
-using FillStreets =
-    function<void(MwmSet::MwmHandle && handle, m2::RectD const & rect, AppendStreet && addStreet)>;
+using FillStreets = function<void(MwmSet::MwmHandle && handle, m2::RectD const & rect, AppendStreet && addStreet)>;
 
 m2::RectD GetLookupRect(m2::PointD const & center, double radiusM)
 {
@@ -62,7 +60,7 @@ string Join(string const & s, Args &&... args)
 
 ReverseGeocoder::Building FromFeatureImpl(FeatureType & ft, std::string const & hn, double distMeters)
 {
-  return { ft.GetID(), distMeters, hn, feature::GetCenter(ft) };
+  return {ft.GetID(), distMeters, hn, feature::GetCenter(ft)};
 }
 
 std::string const & GetHouseNumber(FeatureType & ft)
@@ -78,8 +76,8 @@ std::string const & GetHouseNumber(FeatureType & ft)
 ReverseGeocoder::ReverseGeocoder(DataSource const & dataSource) : m_dataSource(dataSource) {}
 
 template <class ObjT, class FilterT>
-vector<ObjT> GetNearbyObjects(search::MwmContext & context, m2::PointD const & center,
-                              double radiusM, FilterT && filter)
+vector<ObjT> GetNearbyObjects(search::MwmContext & context, m2::PointD const & center, double radiusM,
+                              FilterT && filter)
 {
   vector<ObjT> objs;
 
@@ -98,17 +96,15 @@ vector<ObjT> GetNearbyObjects(search::MwmContext & context, m2::PointD const & c
   return objs;
 }
 
-vector<ReverseGeocoder::Street> ReverseGeocoder::GetNearbyStreets(
-    search::MwmContext & context, m2::PointD const & center, double radiusM)
+vector<ReverseGeocoder::Street> ReverseGeocoder::GetNearbyStreets(search::MwmContext & context,
+                                                                  m2::PointD const & center, double radiusM)
 {
-  return GetNearbyObjects<Street>(context, center, radiusM, [](FeatureType & ft)
-  {
-    return StreetVicinityLoader::IsStreet(ft);
-  });
+  return GetNearbyObjects<Street>(context, center, radiusM,
+                                  [](FeatureType & ft) { return StreetVicinityLoader::IsStreet(ft); });
 }
 
-vector<ReverseGeocoder::Street> ReverseGeocoder::GetNearbyStreets(
-    MwmSet::MwmId const & id, m2::PointD const & center) const
+vector<ReverseGeocoder::Street> ReverseGeocoder::GetNearbyStreets(MwmSet::MwmId const & id,
+                                                                  m2::PointD const & center) const
 {
   MwmSet::MwmHandle mwmHandle = m_dataSource.GetMwmHandleById(id);
   if (mwmHandle.IsAlive())
@@ -125,8 +121,8 @@ vector<ReverseGeocoder::Street> ReverseGeocoder::GetNearbyStreets(FeatureType &
   return GetNearbyStreets(ft.GetID().m_mwmId, feature::GetCenter(ft));
 }
 
-std::vector<ReverseGeocoder::Place> ReverseGeocoder::GetNearbyPlaces(
-    search::MwmContext & context, m2::PointD const & center, double radiusM)
+std::vector<ReverseGeocoder::Place> ReverseGeocoder::GetNearbyPlaces(search::MwmContext & context,
+                                                                     m2::PointD const & center, double radiusM)
 {
   return GetNearbyObjects<Place>(context, center, radiusM, [](FeatureType & ft)
   {
@@ -149,8 +145,7 @@ string ReverseGeocoder::GetOriginalFeatureStreetName(FeatureID const & fid) cons
   HouseTable table(m_dataSource);
   Building bld;
 
-  m_dataSource.ReadFeature([&](FeatureType & ft) { bld = FromFeature(ft, 0.0 /* distMeters */); },
-                           fid);
+  m_dataSource.ReadFeature([&](FeatureType & ft) { bld = FromFeature(ft, 0.0 /* distMeters */); }, fid);
   GetNearbyAddress(table, bld, true /* ignoreEdits */, addr);
   return addr.m_street.m_name;
 }
@@ -175,8 +170,8 @@ void ReverseGeocoder::GetNearbyAddress(m2::PointD const & center, Address & addr
   GetNearbyAddress(center, kLookupRadiusM, addr);
 }
 
-void ReverseGeocoder::GetNearbyAddress(m2::PointD const & center, double maxDistanceM,
-                                       Address & addr, bool placeAsStreet/* = false*/) const
+void ReverseGeocoder::GetNearbyAddress(m2::PointD const & center, double maxDistanceM, Address & addr,
+                                       bool placeAsStreet /* = false*/) const
 {
   vector<Building> buildings;
   GetNearbyBuildings(center, maxDistanceM, buildings);
@@ -188,13 +183,12 @@ void ReverseGeocoder::GetNearbyAddress(m2::PointD const & center, double maxDist
   {
     // It's quite enough to analyze nearest kMaxNumTriesToApproxAddress houses for the exact nearby address.
     // When we can't guarantee suitable address for the point with distant houses.
-    if (GetNearbyAddress(table, b, false /* ignoreEdits */, addr) ||
-        (++triesCount == kMaxNumTriesToApproxAddress))
+    if (GetNearbyAddress(table, b, false /* ignoreEdits */, addr) || (++triesCount == kMaxNumTriesToApproxAddress))
       break;
   }
 }
 
-bool ReverseGeocoder::GetExactAddress(FeatureType & ft, Address & addr, bool placeAsStreet/* = false*/) const
+bool ReverseGeocoder::GetExactAddress(FeatureType & ft, Address & addr, bool placeAsStreet /* = false*/) const
 {
   std::string const & hn = GetHouseNumber(ft);
   if (hn.empty())
@@ -207,15 +201,11 @@ bool ReverseGeocoder::GetExactAddress(FeatureType & ft, Address & addr, bool pla
 bool ReverseGeocoder::GetExactAddress(FeatureID const & fid, Address & addr) const
 {
   bool res;
-  m_dataSource.ReadFeature([&](FeatureType & ft)
-  {
-    res = GetExactAddress(ft, addr, true /* placeAsStreet */);
-  }, fid);
+  m_dataSource.ReadFeature([&](FeatureType & ft) { res = GetExactAddress(ft, addr, true /* placeAsStreet */); }, fid);
   return res;
 }
 
-bool ReverseGeocoder::GetNearbyAddress(HouseTable & table, Building const & bld, bool ignoreEdits,
-                                       Address & addr) const
+bool ReverseGeocoder::GetNearbyAddress(HouseTable & table, Building const & bld, bool ignoreEdits, Address & addr) const
 {
   string street;
   if (!ignoreEdits && osm::Editor::Instance().GetEditedFeatureStreet(bld.m_id, street))
@@ -232,20 +222,20 @@ bool ReverseGeocoder::GetNearbyAddress(HouseTable & table, Building const & bld,
   switch (res->m_type)
   {
     // Not used since OM.
-//  case HouseToStreetTable::StreetIdType::Index:
-//  {
-//    vector<Street> streets;
-//    // Get streets without squares and suburbs for backward compatibility with data.
-//    GetNearbyStreetsWaysOnly(bld.m_id.m_mwmId, bld.m_center, streets);
-//    if (res->m_streetId < streets.size())
-//    {
-//      addr.m_building = bld;
-//      addr.m_street = streets[res->m_streetId];
-//      return true;
-//    }
-//    LOG(LWARNING, ("Out of bound street index", res->m_streetId, "for", bld.m_id));
-//    return false;
-//  }
+    //  case HouseToStreetTable::StreetIdType::Index:
+    //  {
+    //    vector<Street> streets;
+    //    // Get streets without squares and suburbs for backward compatibility with data.
+    //    GetNearbyStreetsWaysOnly(bld.m_id.m_mwmId, bld.m_center, streets);
+    //    if (res->m_streetId < streets.size())
+    //    {
+    //      addr.m_building = bld;
+    //      addr.m_street = streets[res->m_streetId];
+    //      return true;
+    //    }
+    //    LOG(LWARNING, ("Out of bound street index", res->m_streetId, "for", bld.m_id));
+    //    return false;
+    //  }
   case HouseToStreetTable::StreetIdType::FeatureId:
   {
     FeatureID streetFeature(bld.m_id.m_mwmId, res->m_streetId);
@@ -268,8 +258,7 @@ bool ReverseGeocoder::GetNearbyAddress(HouseTable & table, Building const & bld,
   }
 }
 
-void ReverseGeocoder::GetNearbyBuildings(m2::PointD const & center, double radius,
-                                         vector<Building> & buildings) const
+void ReverseGeocoder::GetNearbyBuildings(m2::PointD const & center, double radius, vector<Building> & buildings) const
 {
   auto const addBuilding = [&](FeatureType & ft)
   {
@@ -289,22 +278,18 @@ void ReverseGeocoder::GetNearbyBuildings(m2::PointD const & center, double radiu
 }
 
 // static
-ReverseGeocoder::RegionAddress ReverseGeocoder::GetNearbyRegionAddress(
-    m2::PointD const & center, storage::CountryInfoGetter const & infoGetter,
-    CityFinder & cityFinder)
+ReverseGeocoder::RegionAddress ReverseGeocoder::GetNearbyRegionAddress(m2::PointD const & center,
+                                                                       storage::CountryInfoGetter const & infoGetter,
+                                                                       CityFinder & cityFinder)
 {
   RegionAddress addr;
   addr.m_featureId = cityFinder.GetCityFeatureID(center);
-  if (!addr.m_featureId.IsValid() ||
-      addr.m_featureId.m_mwmId.GetInfo()->GetType() == MwmInfo::WORLD)
-  {
+  if (!addr.m_featureId.IsValid() || addr.m_featureId.m_mwmId.GetInfo()->GetType() == MwmInfo::WORLD)
     addr.m_countryId = infoGetter.GetRegionCountryId(center);
-  }
   return addr;
 }
 
-string ReverseGeocoder::GetLocalizedRegionAddress(RegionAddress const & addr,
-                                                  RegionInfoGetter const & nameGetter) const
+string ReverseGeocoder::GetLocalizedRegionAddress(RegionAddress const & addr, RegionInfoGetter const & nameGetter) const
 {
   if (!addr.IsValid())
     return {};
@@ -421,4 +406,4 @@ string DebugPrint(ReverseGeocoder::Address const & addr)
   return "{ " + DebugPrint(addr.m_building) + ", " + DebugPrint(addr.m_street) + " }";
 }
 
-} // namespace search
+}  // namespace search
diff --git a/libs/search/reverse_geocoder.hpp b/libs/search/reverse_geocoder.hpp
index 0fde082dc..986dcf80c 100644
--- a/libs/search/reverse_geocoder.hpp
+++ b/libs/search/reverse_geocoder.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "indexer/house_to_street_iface.hpp"
 #include "indexer/feature_decl.hpp"
+#include "indexer/house_to_street_iface.hpp"
 
 #include "storage/storage_defines.hpp"
 
@@ -37,10 +37,7 @@ class ReverseGeocoder
     std::string m_name;
 
     Object() : m_distanceMeters(-1.0) {}
-    Object(FeatureID const & id, double dist, std::string_view name)
-      : m_id(id), m_distanceMeters(dist), m_name(name)
-    {
-    }
+    Object(FeatureID const & id, double dist, std::string_view name) : m_id(id), m_distanceMeters(dist), m_name(name) {}
 
     inline bool IsValid() const { return m_id.IsValid(); }
   };
@@ -58,11 +55,10 @@ public:
     StringUtf8Multilang m_multilangName;
 
     Street() = default;
-    Street(FeatureID const & id, double dist, std::string_view name,
-           StringUtf8Multilang const & multilangName)
-      : Object(id, dist, name), m_multilangName(multilangName)
-    {
-    }
+    Street(FeatureID const & id, double dist, std::string_view name, StringUtf8Multilang const & multilangName)
+      : Object(id, dist, name)
+      , m_multilangName(multilangName)
+    {}
   };
   using Place = Street;
 
@@ -74,11 +70,10 @@ public:
     // There are no houses in (0, 0) coordinates.
     Building() : m_center(0, 0) {}
 
-    Building(FeatureID const & id, double dist, std::string const & number,
-             m2::PointD const & center)
-      : Object(id, dist, number), m_center(center)
-    {
-    }
+    Building(FeatureID const & id, double dist, std::string const & number, m2::PointD const & center)
+      : Object(id, dist, number)
+      , m_center(center)
+    {}
   };
 
   struct Address
@@ -113,19 +108,17 @@ public:
 
   /// Returns a feature id of street from |streets| whose name best matches |keyName|
   /// or empty value if the match was not found.
-  static std::optional<uint32_t> GetMatchedStreetIndex(std::string_view keyName,
-                                                       std::vector<Street> const & streets);
+  static std::optional<uint32_t> GetMatchedStreetIndex(std::string_view keyName, std::vector<Street> const & streets);
 
   /// @return Sorted by distance streets vector for the specified MwmId.
   /// Parameter |includeSquaresAndSuburbs| needed for backward compatibility:
   /// existing mwms operate on streets without squares and suburbs.
-  static std::vector<Street> GetNearbyStreets(
-      search::MwmContext & context, m2::PointD const & center, double radiusM = kLookupRadiusM);
+  static std::vector<Street> GetNearbyStreets(search::MwmContext & context, m2::PointD const & center,
+                                              double radiusM = kLookupRadiusM);
   std::vector<Street> GetNearbyStreets(MwmSet::MwmId const & id, m2::PointD const & center) const;
   std::vector<Street> GetNearbyStreets(FeatureType & ft) const;
 
-  static std::vector<Place> GetNearbyPlaces(
-      search::MwmContext & context, m2::PointD const & center, double radiusM);
+  static std::vector<Place> GetNearbyPlaces(search::MwmContext & context, m2::PointD const & center, double radiusM);
 
   /// @return feature street name.
   /// Returns empty string when there is no street the feature belongs to.
@@ -154,11 +147,9 @@ public:
   bool GetExactAddress(FeatureID const & fid, Address & addr) const;
 
   /// Returns the nearest region address where mwm or exact city is known.
-  static RegionAddress GetNearbyRegionAddress(m2::PointD const & center,
-                                              storage::CountryInfoGetter const & infoGetter,
+  static RegionAddress GetNearbyRegionAddress(m2::PointD const & center, storage::CountryInfoGetter const & infoGetter,
                                               CityFinder & cityFinder);
-  std::string GetLocalizedRegionAddress(RegionAddress const & addr,
-                                        RegionInfoGetter const & nameGetter) const;
+  std::string GetLocalizedRegionAddress(RegionAddress const & addr, RegionInfoGetter const & nameGetter) const;
 
 private:
   /// Helper class to incapsulate house 2 street table reloading.
@@ -166,9 +157,9 @@ private:
   {
   public:
     explicit HouseTable(DataSource const & dataSource, bool placeAsStreet = false)
-      : m_dataSource(dataSource), m_placeAsStreet(placeAsStreet)
-    {
-    }
+      : m_dataSource(dataSource)
+      , m_placeAsStreet(placeAsStreet)
+    {}
     std::optional<HouseToStreetTable::Result> Get(FeatureID const & fid);
 
   private:
@@ -178,14 +169,12 @@ private:
   };
 
   /// Ignores changes from editor if |ignoreEdits| is true.
-  bool GetNearbyAddress(HouseTable & table, Building const & bld, bool ignoreEdits,
-                        Address & addr) const;
+  bool GetNearbyAddress(HouseTable & table, Building const & bld, bool ignoreEdits, Address & addr) const;
 
   /// @return Sorted by distance houses vector with valid house number.
-  void GetNearbyBuildings(m2::PointD const & center, double maxDistanceM,
-                          std::vector<Building> & buildings) const;
+  void GetNearbyBuildings(m2::PointD const & center, double maxDistanceM, std::vector<Building> & buildings) const;
 
   static Building FromFeature(FeatureType & ft, double distMeters);
 };
 
-} // namespace search
+}  // namespace search
diff --git a/libs/search/search_index_values.hpp b/libs/search/search_index_values.hpp
index 11d224692..c4f8ef709 100644
--- a/libs/search/search_index_values.hpp
+++ b/libs/search/search_index_values.hpp
@@ -38,10 +38,7 @@ template <>
 struct hash<Uint64IndexValue>
 {
 public:
-  size_t operator()(Uint64IndexValue const & value) const
-  {
-    return std::hash<uint64_t>{}(value.m_featureId);
-  }
+  size_t operator()(Uint64IndexValue const & value) const { return std::hash<uint64_t>{}(value.m_featureId); }
 };
 }  // namespace std
 
@@ -137,8 +134,7 @@ public:
   // A better approach is to make Serialize/Deserialize responsible for
   // every part of serialization and as such it should not need valueCount.
   template <typename Source>
-  void Deserialize(Source & src, uint32_t valueCount,
-                   SingleValueSerializer<Value> const & /* serializer */)
+  void Deserialize(Source & src, uint32_t valueCount, SingleValueSerializer<Value> const & /* serializer */)
   {
     if (valueCount > 0)
       m_cbv = coding::CompressedBitVectorBuilder::DeserializeFromSource(src);
@@ -160,8 +156,8 @@ public:
   {
     if (IsEmpty())
       return;
-    coding::CompressedBitVectorEnumerator::ForEach(
-        *m_cbv, [&toDo](uint64_t const bitPosition) { toDo(Value(bitPosition)); });
+    coding::CompressedBitVectorEnumerator::ForEach(*m_cbv,
+                                                   [&toDo](uint64_t const bitPosition) { toDo(Value(bitPosition)); });
   }
 
 private:
@@ -202,8 +198,7 @@ public:
   }
 
   template <typename Source>
-  void Deserialize(Source & src, uint64_t valueCount,
-                   SingleValueSerializer<Value> const & /* serializer */)
+  void Deserialize(Source & src, uint64_t valueCount, SingleValueSerializer<Value> const & /* serializer */)
   {
     CHECK_LESS_OR_EQUAL(valueCount, 1, ());
     m_empty = valueCount == 0;
diff --git a/libs/search/search_integration_tests/downloader_search_test.cpp b/libs/search/search_integration_tests/downloader_search_test.cpp
index cf521ab66..9a2b7c032 100644
--- a/libs/search/search_integration_tests/downloader_search_test.cpp
+++ b/libs/search/search_integration_tests/downloader_search_test.cpp
@@ -9,8 +9,8 @@
 #include "search/search_tests_support/test_results_matching.hpp"
 #include "search/search_tests_support/test_search_request.hpp"
 
-#include "storage/downloader_search_params.hpp"
 #include "storage/downloader_queue_universal.hpp"
+#include "storage/downloader_search_params.hpp"
 #include "storage/map_files_downloader.hpp"
 #include "storage/queued_country.hpp"
 #include "storage/storage.hpp"
@@ -107,7 +107,9 @@ public:
   void RunUITask(function<void()> fn) override { fn(); }
 };
 
-class DownloaderSearchRequest : public TestSearchRequest, public TestDelegate
+class DownloaderSearchRequest
+  : public TestSearchRequest
+  , public TestDelegate
 {
 public:
   DownloaderSearchRequest(DataSource & dataSource, TestSearchEngine & engine, string const & query)
@@ -170,8 +172,7 @@ private:
 class DownloaderSearchTest : public SearchTest
 {
 public:
-  void AddRegion(string const & countryName, string const & regionName, m2::PointD const & p1,
-                 m2::PointD const & p2)
+  void AddRegion(string const & countryName, string const & regionName, m2::PointD const & p1, m2::PointD const & p2)
   {
     TestPOI cornerPost1(p1, regionName + " corner post 1", "en");
     TestPOI cornerPost2(p2, regionName + " corner post 2", "en");
@@ -190,7 +191,7 @@ public:
       }
     });
     m_worldCities.push_back(capital);
-  };
+  }
 
   void BuildWorld()
   {
@@ -228,16 +229,14 @@ UNIT_CLASS_TEST(DownloaderSearchTest, Smoke)
     DownloaderSearchRequest request(m_dataSource, m_engine, "squareland one");
     request.Run();
 
-    TestResults(request.GetResults(),
-                {storage::DownloaderSearchResult("Squareland One", "Squareland One capital")});
+    TestResults(request.GetResults(), {storage::DownloaderSearchResult("Squareland One", "Squareland One capital")});
   }
 
   {
     DownloaderSearchRequest request(m_dataSource, m_engine, "shortpondland");
     request.Run();
 
-    TestResults(request.GetResults(),
-                {storage::DownloaderSearchResult("Shortpondland", "Shortpondland capital")});
+    TestResults(request.GetResults(), {storage::DownloaderSearchResult("Shortpondland", "Shortpondland capital")});
   }
 
   {
@@ -251,9 +250,8 @@ UNIT_CLASS_TEST(DownloaderSearchTest, Smoke)
     DownloaderSearchRequest request(m_dataSource, m_engine, "squareland");
     request.Run();
 
-    TestResults(request.GetResults(),
-                {storage::DownloaderSearchResult("Squareland One", "Squareland One capital"),
-                 storage::DownloaderSearchResult("Squareland Two", "Squareland Two capital")});
+    TestResults(request.GetResults(), {storage::DownloaderSearchResult("Squareland One", "Squareland One capital"),
+                                       storage::DownloaderSearchResult("Squareland Two", "Squareland Two capital")});
   }
 }
 }  // namespace
diff --git a/libs/search/search_integration_tests/generate_tests.cpp b/libs/search/search_integration_tests/generate_tests.cpp
index 369480e7e..b69325e02 100644
--- a/libs/search/search_integration_tests/generate_tests.cpp
+++ b/libs/search/search_integration_tests/generate_tests.cpp
@@ -30,8 +30,7 @@ namespace
 class GenerateTest : public TestWithClassificator
 {
 public:
-  void MakeFeature(TestMwmBuilder & builder, vector<pair<string, string>> const & tags,
-                   m2::PointD const & pt)
+  void MakeFeature(TestMwmBuilder & builder, vector<pair<string, string>> const & tags, m2::PointD const & pt)
   {
     OsmElement e;
     for (auto const & tag : tags)
@@ -78,7 +77,8 @@ UNIT_CLASS_TEST(GenerateTest, GenerateDeprecatedTypes)
     types.insert(cl.GetTypeByPath(s));
 
   int count = 0;
-  auto const fn = [&](FeatureType & ft) {
+  auto const fn = [&](FeatureType & ft)
+  {
     ++count;
     ft.ForEachType([&](uint32_t t) { TEST(types.count(t) > 0, (cl.GetReadableObjectName(t))); });
   };
diff --git a/libs/search/search_integration_tests/postcode_points_tests.cpp b/libs/search/search_integration_tests/postcode_points_tests.cpp
index c7c4a11ee..dc02301c0 100644
--- a/libs/search/search_integration_tests/postcode_points_tests.cpp
+++ b/libs/search/search_integration_tests/postcode_points_tests.cpp
@@ -16,7 +16,6 @@
 
 #include "base/file_name_utils.hpp"
 
-
 namespace postcode_points_tests
 {
 using namespace generator::tests_support;
@@ -26,8 +25,7 @@ using namespace search;
 using namespace std;
 
 class PostcodePointsTest : public SearchTest
-{
-};
+{};
 
 UNIT_CLASS_TEST(PostcodePointsTest, SmokeUK)
 {
@@ -42,17 +40,14 @@ UNIT_CLASS_TEST(PostcodePointsTest, SmokeUK)
                                  "header\n"
                                  "aa11 0bb, 1.0, 1.0\n"
                                  "aa11 1bb, 2.0, 2.0\n"
-                                 "aa11 2bb, 3.0, 3.0\n"
-  );
+                                 "aa11 2bb, 3.0, 3.0\n");
 
   auto infoGetter = std::make_shared<storage::CountryInfoGetterForTesting>();
-  infoGetter->AddCountry(storage::CountryDef(countryName,
-      m2::RectD(mercator::FromLatLon(0.99, 0.99), mercator::FromLatLon(3.01, 3.01))));
+  infoGetter->AddCountry(
+      storage::CountryDef(countryName, m2::RectD(mercator::FromLatLon(0.99, 0.99), mercator::FromLatLon(3.01, 3.01))));
 
   auto const id = BuildCountry(countryName, [&](TestMwmBuilder & builder)
-  {
-    builder.SetPostcodesData(postcodesRelativePath, indexer::PostcodePointsDatasetType::UK, infoGetter);
-  });
+  { builder.SetPostcodesData(postcodesRelativePath, indexer::PostcodePointsDatasetType::UK, infoGetter); });
 
   auto handle = m_dataSource.GetMwmHandleById(id);
   auto value = handle.GetValue();
@@ -98,19 +93,17 @@ UNIT_CLASS_TEST(PostcodePointsTest, SmokeUS)
   string const testFile = "postcodes.csv";
   auto const postcodesRelativePath = base::JoinPath(writableDir, testFile);
 
-  ScopedFile const osmScopedFile(testFile,
-                                 "header\n"
-                                 R"("00601","18.18027","-66.75266","Adjuntas","PR","Puerto Rico","TRUE","","16834","100.9","72001","Adjuntas","{""72001"": 98.74, ""72141"": 1.26}","Adjuntas|Utuado","72001|72141","FALSE","FALSE","America/Puerto_Rico")"
-  );
+  ScopedFile const osmScopedFile(
+      testFile,
+      "header\n"
+      R"("00601","18.18027","-66.75266","Adjuntas","PR","Puerto Rico","TRUE","","16834","100.9","72001","Adjuntas","{""72001"": 98.74, ""72141"": 1.26}","Adjuntas|Utuado","72001|72141","FALSE","FALSE","America/Puerto_Rico")");
 
   auto infoGetter = std::make_shared<storage::CountryInfoGetterForTesting>();
-  infoGetter->AddCountry(storage::CountryDef(countryName,
-      m2::RectD(mercator::FromLatLon(0, -180), mercator::FromLatLon(90, 0))));
+  infoGetter->AddCountry(
+      storage::CountryDef(countryName, m2::RectD(mercator::FromLatLon(0, -180), mercator::FromLatLon(90, 0))));
 
   auto const id = BuildCountry(countryName, [&](TestMwmBuilder & builder)
-  {
-    builder.SetPostcodesData(postcodesRelativePath, indexer::PostcodePointsDatasetType::UK, infoGetter);
-  });
+  { builder.SetPostcodesData(postcodesRelativePath, indexer::PostcodePointsDatasetType::UK, infoGetter); });
 
   auto handle = m_dataSource.GetMwmHandleById(id);
   auto value = handle.GetValue();
@@ -142,16 +135,14 @@ UNIT_CLASS_TEST(PostcodePointsTest, SearchPostcode)
                                  "BA6 8JP, 5.0, 6.0\n");
 
   auto infoGetter = std::make_shared<storage::CountryInfoGetterForTesting>();
-  infoGetter->AddCountry(storage::CountryDef(
-      countryName,
-      m2::RectD(mercator::FromLatLon(3.0, 3.0), mercator::FromLatLon(7.0, 7.0))));
+  infoGetter->AddCountry(
+      storage::CountryDef(countryName, m2::RectD(mercator::FromLatLon(3.0, 3.0), mercator::FromLatLon(7.0, 7.0))));
 
   auto const id = BuildCountry(countryName, [&](TestMwmBuilder & builder)
-  {
-    builder.SetPostcodesData(postcodesRelativePath, indexer::PostcodePointsDatasetType::UK, infoGetter);
-  });
+  { builder.SetPostcodesData(postcodesRelativePath, indexer::PostcodePointsDatasetType::UK, infoGetter); });
 
-  auto test = [&](string const & query, m2::PointD const & expected) {
+  auto test = [&](string const & query, m2::PointD const & expected)
+  {
     auto request = MakeRequest(query);
     auto const & results = request->Results();
     TEST_EQUAL(results.size(), 1, ());
@@ -182,37 +173,35 @@ UNIT_CLASS_TEST(PostcodePointsTest, SearchStreetWithPostcode)
   string const testFile = "postcodes.csv";
   auto const postcodesRelativePath = base::JoinPath(writableDir, testFile);
 
-  ScopedFile const osmScopedFile(
-      testFile,
-      "header\n"
-      "AA5 6KL, 4.0, 4.0\n"
-      "BB7 8MN, 6.0, 6.0\n"
-      "XX6 7KL, 4.0, 6.0\n"
-      "YY8 9MN, 6.0, 4.0\n"
-      // Some dummy postcodes to make postcode radius approximation not too big.
-      "CC1 0AA, 5.0, 5.0\n"
-      "CC1 0AB, 5.0, 5.0\n"
-      "CC1 0AC, 5.0, 5.0\n"
-      "CC1 0AD, 5.0, 5.0\n"
-      "CC1 0AE, 5.0, 5.0\n"
-      "CC1 0AF, 5.0, 5.0\n"
-      "CC1 0AG, 5.0, 5.0\n"
-      "CC1 0AH, 5.0, 5.0\n"
-      "CC1 0AI, 5.0, 5.0\n"
-      "CC1 0AJ, 5.0, 5.0\n"
-      "CC1 0AK, 5.0, 5.0\n"
-      "CC1 0AL, 5.0, 5.0\n"
-      "CC1 0AM, 5.0, 5.0\n"
-      "CC1 0AN, 5.0, 5.0\n"
-      "CC1 0AO, 5.0, 5.0\n"
-      "CC1 0AP, 5.0, 5.0\n"
-      "CC1 0AQ, 5.0, 5.0\n"
-      "CC1 0AR, 5.0, 5.0\n"
-      "CC1 0AS, 5.0, 5.0\n"
-      "CC1 0AT, 5.0, 5.0\n");
+  ScopedFile const osmScopedFile(testFile,
+                                 "header\n"
+                                 "AA5 6KL, 4.0, 4.0\n"
+                                 "BB7 8MN, 6.0, 6.0\n"
+                                 "XX6 7KL, 4.0, 6.0\n"
+                                 "YY8 9MN, 6.0, 4.0\n"
+                                 // Some dummy postcodes to make postcode radius approximation not too big.
+                                 "CC1 0AA, 5.0, 5.0\n"
+                                 "CC1 0AB, 5.0, 5.0\n"
+                                 "CC1 0AC, 5.0, 5.0\n"
+                                 "CC1 0AD, 5.0, 5.0\n"
+                                 "CC1 0AE, 5.0, 5.0\n"
+                                 "CC1 0AF, 5.0, 5.0\n"
+                                 "CC1 0AG, 5.0, 5.0\n"
+                                 "CC1 0AH, 5.0, 5.0\n"
+                                 "CC1 0AI, 5.0, 5.0\n"
+                                 "CC1 0AJ, 5.0, 5.0\n"
+                                 "CC1 0AK, 5.0, 5.0\n"
+                                 "CC1 0AL, 5.0, 5.0\n"
+                                 "CC1 0AM, 5.0, 5.0\n"
+                                 "CC1 0AN, 5.0, 5.0\n"
+                                 "CC1 0AO, 5.0, 5.0\n"
+                                 "CC1 0AP, 5.0, 5.0\n"
+                                 "CC1 0AQ, 5.0, 5.0\n"
+                                 "CC1 0AR, 5.0, 5.0\n"
+                                 "CC1 0AS, 5.0, 5.0\n"
+                                 "CC1 0AT, 5.0, 5.0\n");
 
-  auto const rect =
-      m2::RectD(mercator::FromLatLon(3.99, 3.99), mercator::FromLatLon(6.01, 6.01));
+  auto const rect = m2::RectD(mercator::FromLatLon(3.99, 3.99), mercator::FromLatLon(6.01, 6.01));
   auto infoGetter = std::make_shared<storage::CountryInfoGetterForTesting>();
   infoGetter->AddCountry(storage::CountryDef(countryName, rect));
 
@@ -243,7 +232,8 @@ UNIT_CLASS_TEST(PostcodePointsTest, SearchStreetWithPostcode)
     builder.Add(streetY);
   });
 
-  auto test = [&](string const & query, TestFeature const & bestResult) {
+  auto test = [&](string const & query, TestFeature const & bestResult)
+  {
     auto request = MakeRequest(query);
     auto const & results = request->Results();
 
@@ -260,4 +250,4 @@ UNIT_CLASS_TEST(PostcodePointsTest, SearchStreetWithPostcode)
   test("Main street YY8 9MN ", streetY);
 }
 
-} // namespace postcode_points_tests
+}  // namespace postcode_points_tests
diff --git a/libs/search/search_integration_tests/pre_ranker_test.cpp b/libs/search/search_integration_tests/pre_ranker_test.cpp
index a9500ee43..a353ffd09 100644
--- a/libs/search/search_integration_tests/pre_ranker_test.cpp
+++ b/libs/search/search_integration_tests/pre_ranker_test.cpp
@@ -44,11 +44,11 @@ class TestRanker : public Ranker
 {
 public:
   TestRanker(DataSource & dataSource, storage::CountryInfoGetter & infoGetter,
-             CitiesBoundariesTable const & boundariesTable, KeywordLangMatcher & keywordsScorer,
-             Emitter & emitter, vector<Suggest> const & suggests, VillagesCache & villagesCache,
-             base::Cancellable const & cancellable, size_t limit, vector<PreRankerResult> & results)
-    : Ranker(dataSource, boundariesTable, infoGetter, keywordsScorer, emitter,
-             GetDefaultCategories(), suggests, villagesCache, cancellable)
+             CitiesBoundariesTable const & boundariesTable, KeywordLangMatcher & keywordsScorer, Emitter & emitter,
+             vector<Suggest> const & suggests, VillagesCache & villagesCache, base::Cancellable const & cancellable,
+             size_t limit, vector<PreRankerResult> & results)
+    : Ranker(dataSource, boundariesTable, infoGetter, keywordsScorer, emitter, GetDefaultCategories(), suggests,
+             villagesCache, cancellable)
     , m_results(results)
   {
     Ranker::Params rankerParams;
@@ -119,8 +119,8 @@ UNIT_CLASS_TEST(PreRankerTest, Smoke)
   VillagesCache villagesCache(m_cancellable);
   KeywordLangMatcher keywordsScorer(0 /* maxLanguageTiers */);
 
-  TestRanker ranker(m_dataSource, m_engine.GetCountryInfoGetter(), boundariesTable, keywordsScorer,
-                    emitter, m_suggests, villagesCache, m_cancellable, pois.size(), results);
+  TestRanker ranker(m_dataSource, m_engine.GetCountryInfoGetter(), boundariesTable, keywordsScorer, emitter, m_suggests,
+                    villagesCache, m_cancellable, pois.size(), results);
 
   PreRanker preRanker(m_dataSource, ranker);
   PreRanker::Params params;
@@ -154,7 +154,7 @@ UNIT_CLASS_TEST(PreRankerTest, Smoke)
 
   size_t const count = results.size();
   // Depends on std::shuffle, but lets keep 6% threshold.
-  TEST(count > batchSize*1.06 && count < batchSize*1.94, (count));
+  TEST(count > batchSize * 1.06 && count < batchSize * 1.94, (count));
 
   vector<bool> checked(pois.size());
   for (size_t i = 0; i < count; ++i)
@@ -168,4 +168,4 @@ UNIT_CLASS_TEST(PreRankerTest, Smoke)
     checked[index] = true;
   }
 }
-} // namespace pre_ranker_test
+}  // namespace pre_ranker_test
diff --git a/libs/search/search_integration_tests/processor_test.cpp b/libs/search/search_integration_tests/processor_test.cpp
index b203f8aa4..8f646cf5d 100644
--- a/libs/search/search_integration_tests/processor_test.cpp
+++ b/libs/search/search_integration_tests/processor_test.cpp
@@ -42,7 +42,8 @@ class TestAirport : public TestPOI
 {
 public:
   TestAirport(m2::PointD const & center, string const & name, string const & lang, string const & iata)
-    : TestPOI(center, name, lang), m_iata(iata)
+    : TestPOI(center, name, lang)
+    , m_iata(iata)
   {
     SetTypes({{"aeroway", "aerodrome"}});
   }
@@ -64,7 +65,8 @@ class TestATM : public TestPOI
 {
 public:
   TestATM(m2::PointD const & center, string const & op, string const & lang)
-    : TestPOI(center, {} /* name */, lang), m_operator(op)
+    : TestPOI(center, {} /* name */, lang)
+    , m_operator(op)
   {
     SetTypes({{"amenity", "atm"}});
   }
@@ -86,9 +88,9 @@ class TestBrandFeature : public TestCafe
 {
 public:
   TestBrandFeature(m2::PointD const & center, string const & brand, string const & lang)
-    : TestCafe(center, {} /* name */, lang), m_brand(brand)
-  {
-  }
+    : TestCafe(center, {} /* name */, lang)
+    , m_brand(brand)
+  {}
 
   // TestPOI overrides:
   void Serialize(FeatureBuilder & fb) const override
@@ -106,11 +108,12 @@ private:
 class TestAddrInterpol : public TestStreet
 {
 public:
-  TestAddrInterpol(vector<m2::PointD> const & points, feature::InterpolType interpol,
-                   string const & hnBeg, string const & hnEnd, string_view const & street = {})
-    : TestStreet(points, {}), m_street(street)
+  TestAddrInterpol(vector<m2::PointD> const & points, feature::InterpolType interpol, string const & hnBeg,
+                   string const & hnEnd, string_view const & street = {})
+    : TestStreet(points, {})
+    , m_street(street)
   {
-    SetRoadNumber(hnBeg + ":" + hnEnd); // assigned as ref
+    SetRoadNumber(hnBeg + ":" + hnEnd);  // assigned as ref
     switch (interpol)
     {
     case feature::InterpolType::Odd: SetType({"addr:interpolation", "odd"}); break;
@@ -134,7 +137,6 @@ private:
 
 using ProcessorTest = SearchTest;
 
-
 UNIT_CLASS_TEST(ProcessorTest, AddressSmoke)
 {
   string const countryName = "Address";
@@ -144,11 +146,11 @@ UNIT_CLASS_TEST(ProcessorTest, AddressSmoke)
 
   TestStreet street({{-coord, -coord}, {0, 0}, {coord, coord}}, streetName, lang);
 
-  m2::PointD p1{-coord/2, -coord/2};
-  m2::PointD p2{coord/2, coord/2};
+  m2::PointD p1{-coord / 2, -coord / 2};
+  m2::PointD p2{coord / 2, coord / 2};
 
-  TestBuilding withRef(p1, {}/* name */, "20", streetName, lang);
-  TestBuilding withoutRef(p2, {}/* name */, "40", lang);
+  TestBuilding withRef(p1, {} /* name */, "20", streetName, lang);
+  TestBuilding withoutRef(p2, {} /* name */, "40", lang);
 
   TestAddrInterpol even({p1, p2}, feature::InterpolType::Even, "20", "40", streetName);
   TestAddrInterpol odd({p1, p2}, feature::InterpolType::Odd, "21", "41", streetName);
@@ -165,7 +167,7 @@ UNIT_CLASS_TEST(ProcessorTest, AddressSmoke)
   SetViewport(m2::RectD(-coord, -coord, coord, coord));
   TEST(ResultsMatch("20 1st", {ExactMatch(wonderlandId, withRef)}), ());
   // No street defined.
-  //TEST(ResultsMatch("40 1st", {ExactMatch(wonderlandId, withoutRef)}), ());
+  // TEST(ResultsMatch("40 1st", {ExactMatch(wonderlandId, withoutRef)}), ());
   TEST(ResultsMatch("36 1st", {ExactMatch(wonderlandId, even)}), ());
   TEST(ResultsMatch("35 1st", {ExactMatch(wonderlandId, odd)}), ());
 }
@@ -176,38 +178,39 @@ UNIT_CLASS_TEST(ProcessorTest, AddressPlaceSmoke)
   m2::PointD const sm(0.005, 0.005);
 
   // 1.
-  TestVillage village1({0, 0}, "Баравая", lang, 0/* rank */);
-  TestBuilding bld1(village1.GetCenter() + sm, {}/* name */, "36", {}/* street */, lang);
+  TestVillage village1({0, 0}, "Баравая", lang, 0 /* rank */);
+  TestBuilding bld1(village1.GetCenter() + sm, {} /* name */, "36", {} /* street */, lang);
   bld1.SetPlace(village1.GetName(lang));
   // No place for it.
-  TestBuilding bld2(village1.GetCenter() - sm, {}/* name */, "36", {}/* street */, lang);
+  TestBuilding bld2(village1.GetCenter() - sm, {} /* name */, "36", {} /* street */, lang);
 
   // 2.
-  TestCity city1({0.5, 0.5}, "Mannheim", lang, 0/* rank */);
+  TestCity city1({0.5, 0.5}, "Mannheim", lang, 0 /* rank */);
   TestSuburb suburb1(city1.GetCenter() + sm, "F2", lang);
-  TestBuilding bld3(suburb1.GetCenter() + sm, {}/* name */, "4", {}/* street */, lang);
+  TestBuilding bld3(suburb1.GetCenter() + sm, {} /* name */, "4", {} /* street */, lang);
   bld3.SetPlace(suburb1.GetName(lang));
 
   // 3.
-  TestCity city2({-0.5, -0.5}, "Brno", lang, 100/* rank */);
+  TestCity city2({-0.5, -0.5}, "Brno", lang, 100 /* rank */);
   TestSuburb suburb2(city2.GetCenter() - sm, "Štýřice", lang);
   TestStreet street({city2.GetCenter() - sm, city2.GetCenter() + sm}, "Gallašova", lang);
-  TestBuilding bld4(city2.GetCenter() + sm, {}/* name */, "54/11", street.GetName(lang), lang);
+  TestBuilding bld4(city2.GetCenter() + sm, {} /* name */, "54/11", street.GetName(lang), lang);
   bld4.SetPlace(suburb2.GetName(lang));
 
   // 4.
-  TestCity city3(mercator::FromLatLon(55.9964233, 37.1985340), "Зеленоград", lang, 0/* rank */);
-  TestBuilding bld5(mercator::FromLatLon(55.9642412, 37.1897657), {}/* name */, "к2308А", {}/* street */, lang);
+  TestCity city3(mercator::FromLatLon(55.9964233, 37.1985340), "Зеленоград", lang, 0 /* rank */);
+  TestBuilding bld5(mercator::FromLatLon(55.9642412, 37.1897657), {} /* name */, "к2308А", {} /* street */, lang);
   bld5.SetPlace(city3.GetName(lang));
   // City that presents only in World to mix World and Country IDs.
-  TestCity city4(mercator::FromLatLon(50, 30), "Dummy", lang, 0/* rank */);
+  TestCity city4(mercator::FromLatLon(50, 30), "Dummy", lang, 0 /* rank */);
 
   // 5.
-  TestVillage village2(mercator::FromLatLon(53.8041415, 27.6151914), "Пашковичи", lang, 0/* rank */);
+  TestVillage village2(mercator::FromLatLon(53.8041415, 27.6151914), "Пашковичи", lang, 0 /* rank */);
   village2.SetType({"place", "hamlet"});
-  TestBuilding bld6(mercator::FromLatLon(53.8040029, 27.6091967), {}/* name */, "43А", {}/* street */, lang);
+  TestBuilding bld6(mercator::FromLatLon(53.8040029, 27.6091967), {} /* name */, "43А", {} /* street */, lang);
   bld6.SetPlace(village2.GetName(lang));
-  TestBuilding bld7(mercator::FromLatLon(53.7956458, 27.6248433), "уч. 43", {}/* house number*/, {}/* street */, lang);
+  TestBuilding bld7(mercator::FromLatLon(53.7956458, 27.6248433), "уч. 43", {} /* house number*/, {} /* street */,
+                    lang);
 
   auto const worldId = BuildWorld([&](TestMwmBuilder & builder)
   {
@@ -286,8 +289,8 @@ UNIT_CLASS_TEST(ProcessorTest, Smoke)
 
   TestBuilding feynmanHouse({10, 10}, "Feynman house", "1 unit 1", feynmanStreet.GetName("en"), "en");
   TestBuilding bohrHouse({10, 10}, "Bohr house", "1 unit 1", bohrStreet1.GetName("en"), "en");
-  TestBuilding hilbertHouse({10.0005, 10.0005, 10.0006, 10.0006},
-                            "Hilbert house", "1 unit 2", bohrStreet1.GetName("en"), "en");
+  TestBuilding hilbertHouse({10.0005, 10.0005, 10.0006, 10.0006}, "Hilbert house", "1 unit 2",
+                            bohrStreet1.GetName("en"), "en");
   TestBuilding descartesHouse({10, 10}, "Descartes house", "2", "en");
   TestBuilding bornHouse({14.999, 15}, "Born house", "8", firstAprilStreet.GetName("en"), "en");
 
@@ -355,14 +358,12 @@ UNIT_CLASS_TEST(ProcessorTest, Smoke)
     TEST(ResultsMatch("Central bus stop", rules), ());
   }
   {
-    Rules rules = {ExactMatch(wonderlandId, quantumCafe),
-                   ExactMatch(wonderlandId, quantumTeleport1),
+    Rules rules = {ExactMatch(wonderlandId, quantumCafe), ExactMatch(wonderlandId, quantumTeleport1),
                    ExactMatch(wonderlandId, quantumTeleport2)};
     TEST(ResultsMatch("quantum", rules), ());
   }
   {
-    Rules rules = {ExactMatch(wonderlandId, quantumCafe),
-                   ExactMatch(wonderlandId, quantumTeleport1)};
+    Rules rules = {ExactMatch(wonderlandId, quantumCafe), ExactMatch(wonderlandId, quantumTeleport1)};
     TEST(ResultsMatch("quantum Moscow ", rules), ());
   }
   {
@@ -381,14 +382,14 @@ UNIT_CLASS_TEST(ProcessorTest, Smoke)
     // but not lantern1 (building next to Feynman street with name 'lantern 1') because '1'
     // looks like housenumber.
     // "street 1" -> "1st April street", like Relaxed match.
-    Rules rules = { ExactMatch(wonderlandId, feynmanHouse), ExactMatch(wonderlandId, firstAprilStreet) };
+    Rules rules = {ExactMatch(wonderlandId, feynmanHouse), ExactMatch(wonderlandId, firstAprilStreet)};
     TEST(ResultsMatch("feynman street 1", rules), ());
   }
   {
     // Here we expect to find bohrHouse (building next to Bohr street with housenumber '1 unit 1')
     // but not lantern1 (building next to Bohr street with name 'lantern 1') because '1' looks like
     // housenumber.
-    Rules rules = { ExactMatch(wonderlandId, bohrHouse), ExactMatch(wonderlandId, hilbertHouse) };
+    Rules rules = {ExactMatch(wonderlandId, bohrHouse), ExactMatch(wonderlandId, hilbertHouse)};
     TEST(ResultsMatch("bohr street 1 ", rules), ());
   }
   {
@@ -466,10 +467,7 @@ UNIT_CLASS_TEST(ProcessorTest, SearchByName)
   TestPark hydePark({{0.5, 0.5}, {1.5, 0.5}, {1.5, 1.5}, {0.5, 1.5}}, "Hyde Park", "en");
   TestPOI cafe({1.0, 1.0}, "London Cafe", "en");
 
-  auto worldId = BuildWorld([&](TestMwmBuilder & builder)
-  {
-    builder.Add(london);
-  });
+  auto worldId = BuildWorld([&](TestMwmBuilder & builder) { builder.Add(london); });
   auto wonderlandId = BuildCountry("Wonderland", [&](TestMwmBuilder & builder)
   {
     builder.Add(hydePark);
@@ -576,8 +574,7 @@ UNIT_CLASS_TEST(ProcessorTest, TestRankingInfo_Smoke)
   {
     auto request = MakeRequest("golden gate bridge ");
 
-    Rules rules = {ExactMatch(wonderlandId, goldenGateBridge),
-                   ExactMatch(wonderlandId, goldenGateStreet)};
+    Rules rules = {ExactMatch(wonderlandId, goldenGateBridge), ExactMatch(wonderlandId, goldenGateStreet)};
 
     TEST(ResultsMatch(request->Results(), rules), ());
     for (auto const & result : request->Results())
@@ -594,8 +591,7 @@ UNIT_CLASS_TEST(ProcessorTest, TestRankingInfo_Smoke)
     auto request = MakeRequest("cafe лермонтов");
     auto const & results = request->Results();
 
-    Rules rules{ExactMatch(wonderlandId, cafe1), ExactMatch(wonderlandId, cafe2),
-                ExactMatch(wonderlandId, lermontov)};
+    Rules rules{ExactMatch(wonderlandId, cafe1), ExactMatch(wonderlandId, cafe2), ExactMatch(wonderlandId, lermontov)};
     TEST(ResultsMatch(results, rules), ());
 
     TEST_EQUAL(3, results.size(), ("Unexpected number of retrieved cafes."));
@@ -637,9 +633,7 @@ UNIT_CLASS_TEST(ProcessorTest, TestRankingInfo_PureCategory)
   /// @todo We don't match cuisines if input query is category.
   /// Good news that "ice cream (gelato)" is the only category like this now.
   /// https://github.com/organicmaps/organicmaps/issues/2961
-  Rules const rules{ExactMatch(wonderlandId, cafe1),
-                    ExactMatch(wonderlandId, cafe2),
-                    ExactMatch(wonderlandId, cafe4)};
+  Rules const rules{ExactMatch(wonderlandId, cafe1), ExactMatch(wonderlandId, cafe2), ExactMatch(wonderlandId, cafe4)};
 
   // Pure category results should be ordered by distance, not matter about name.
   double constexpr rad = 1;
@@ -741,10 +735,7 @@ UNIT_CLASS_TEST(ProcessorTest, RankingInfo_ErrorsMade_2)
 {
   TestStreet hernandes({{-0.5, -0.5}, {0, 0}, {0.5, 0.5}}, "José Hernández", "es");
 
-  auto wonderlandId = BuildCountry("Wonderland", [&](TestMwmBuilder & builder)
-  {
-    builder.Add(hernandes);
-  });
+  auto wonderlandId = BuildCountry("Wonderland", [&](TestMwmBuilder & builder) { builder.Add(hernandes); });
 
   SetViewport(m2::RectD(-1, -1, 1, 1));
 
@@ -886,13 +877,12 @@ UNIT_CLASS_TEST(ProcessorTest, TestPostcodes)
     QueryParams params;
     {
       string const query = "141702";
-      vector<strings::UniString> const tokens = { strings::MakeUniString(query) };
+      vector<strings::UniString> const tokens = {strings::MakeUniString(query)};
       params.Init(query, tokens, false);
     }
 
     Retrieval retrieval(context, cancellable);
-    auto features = retrieval.RetrievePostcodeFeatures(
-        TokenSlice(params, TokenRange(0, params.GetNumTokens())));
+    auto features = retrieval.RetrievePostcodeFeatures(TokenSlice(params, TokenRange(0, params.GetNumTokens())));
     TEST_EQUAL(1, features.PopCount(), ());
 
     uint64_t index = 0;
@@ -916,9 +906,8 @@ UNIT_CLASS_TEST(ProcessorTest, TestPostcodes)
     TEST(ResultsMatch("Долгопрудный первомайская 28а, 141701", rules, "ru"), ());
   }
   {
-    Rules rules{ExactMatch(countryId, building28),
-                ExactMatch(countryId, building29),
-                //ExactMatch(countryId, building30),  // No street defined.
+    Rules rules{ExactMatch(countryId, building28), ExactMatch(countryId, building29),
+                // ExactMatch(countryId, building30),  // No street defined.
                 ExactMatch(countryId, street)};
     TEST(ResultsMatch("Долгопрудный первомайская 141701", rules, "ru"), ());
   }
@@ -927,8 +916,8 @@ UNIT_CLASS_TEST(ProcessorTest, TestPostcodes)
     TEST(ResultsMatch("Долгопрудный первомайская 141702", rules, "ru"), ());
   }
   {
-    Rules rules{ExactMatch(countryId, building28), ExactMatch(countryId, building29),
-                ExactMatch(countryId, building30), ExactMatch(countryId, street)};
+    Rules rules{ExactMatch(countryId, building28), ExactMatch(countryId, building29), ExactMatch(countryId, building30),
+                ExactMatch(countryId, street)};
     TEST(ResultsMatch("Долгопрудный 141701", rules, "ru"), ());
   }
   {
@@ -972,10 +961,7 @@ UNIT_CLASS_TEST(ProcessorTest, TestCategories)
   TestPOI namedResidential({0.04, 0.04}, "Residential", "en");
   namedResidential.SetTypes({{"landuse", "residential"}});
 
-  BuildWorld([&](TestMwmBuilder & builder)
-  {
-    builder.Add(sanFrancisco);
-  });
+  BuildWorld([&](TestMwmBuilder & builder) { builder.Add(sanFrancisco); });
   auto wonderlandId = BuildCountry("Wonderland", [&](TestMwmBuilder & builder)
   {
     builder.Add(busStop);
@@ -1021,9 +1007,7 @@ UNIT_CLASS_TEST(ProcessorTest, TestCategories)
   TEST(ResultsMatch("wi-fi", {ExactMatch(wonderlandId, cafe)}), ());
   TEST(ResultsMatch("wai-fai", {}), ());
   TEST(ResultsMatch("toilet", {ExactMatch(wonderlandId, toi)}), ());
-  TEST(ResultsMatch("beach ",
-                    {ExactMatch(wonderlandId, nonameBeach), ExactMatch(wonderlandId, namedBeach)}),
-       ());
+  TEST(ResultsMatch("beach ", {ExactMatch(wonderlandId, nonameBeach), ExactMatch(wonderlandId, namedBeach)}), ());
   TEST(ResultsMatch("district", {ExactMatch(wonderlandId, namedResidential)}), ());
   TEST(ResultsMatch("residential", {ExactMatch(wonderlandId, namedResidential)}), ());
 }
@@ -1116,8 +1100,7 @@ UNIT_CLASS_TEST(ProcessorTest, TestCategorialSearch)
 
   {
     Rules const rules = {ExactMatch(wonderlandId, hotel1), ExactMatch(wonderlandId, hotel2),
-                         ExactMatch(wonderlandId, hotelCafe),
-                         ExactMatch(wonderlandId, hotelDeVille)};
+                         ExactMatch(wonderlandId, hotelCafe), ExactMatch(wonderlandId, hotelDeVille)};
     // It looks like a category search but we cannot tell it, so
     // even the features that match only by name are emitted.
     TEST(ResultsMatch("hotel san diego ", rules), ());
@@ -1150,10 +1133,7 @@ UNIT_CLASS_TEST(ProcessorTest, SearchDebug)
   TestPOI hotel({0, 0.01}, "", "ru");
   hotel.SetTypes({{"tourism", "hotel"}});
 
-  auto const testWorldId = BuildWorld([&](TestMwmBuilder & builder)
-  {
-    builder.Add(debugville);
-  });
+  auto const testWorldId = BuildWorld([&](TestMwmBuilder & builder) { builder.Add(debugville); });
   auto wonderlandId = BuildCountry(countryName, [&](TestMwmBuilder & builder)
   {
     builder.Add(hotel);
@@ -1191,14 +1171,12 @@ UNIT_CLASS_TEST(ProcessorTest, SearchCoordinates)
        34.770793, 32.433265},
 
       {"https://yandex.ru/maps/?ll=158.828916%2C52.931098&z=9.1", 52.931098, 158.828916},
-      {"https://yandex.ru/maps/78/petropavlovsk/?ll=158.657810%2C53.024529&z=12.99", 53.024529,
-       158.657810},
+      {"https://yandex.ru/maps/78/petropavlovsk/?ll=158.657810%2C53.024529&z=12.99", 53.024529, 158.657810},
       {"https://yandex.ru/maps/78/petropavlovsk/"
        "?ll=158.643359%2C53.018729&mode=whatshere&whatshere%5Bpoint%5D=158.643270%2C53.021174&"
        "whatshere%5Bzoom%5D=16.07&z=15.65",
        53.018729, 158.643359},
-      {"https://yandex.com.tr/harita/115707/fatih/?ll=28.967470%2C41.008857&z=10", 41.008857,
-       28.967470},
+      {"https://yandex.com.tr/harita/115707/fatih/?ll=28.967470%2C41.008857&z=10", 41.008857, 28.967470},
 
       {"http://comaps.app/kyuh76X_vf/Borgo_Maggiore", 43.941187, 12.447423},
       {"ge0://kyuh76X_vf/Borgo_Maggiore", 43.941187, 12.447423},
@@ -1273,7 +1251,7 @@ UNIT_CLASS_TEST(ProcessorTest, FuzzyMatch)
     TEST(ResultsMatch("моксва ленинргадский черчиль", rules, "ru"), ());
 
     TEST(ResultsMatch("food", rulesWithoutStreet, "ru"), ());
-    //TEST(ResultsMatch("foood", rulesWithoutStreet, "ru"), ());
+    // TEST(ResultsMatch("foood", rulesWithoutStreet, "ru"), ());
     TEST(ResultsMatch("fod", {}, "ru"), ());
 
     Rules rulesMetro = {ExactMatch(id, metro)};
@@ -1294,15 +1272,13 @@ UNIT_CLASS_TEST(ProcessorTest, SpacesInCategories)
   TestPOI nightclub({5.0, 5.0}, "Crasy daizy", "ru");
   nightclub.SetTypes({{"amenity", "nightclub"}});
 
-  BuildWorld([&](TestMwmBuilder & builder) {
+  BuildWorld([&](TestMwmBuilder & builder)
+  {
     builder.Add(country);
     builder.Add(city);
   });
 
-  auto id = BuildCountry(countryName, [&](TestMwmBuilder & builder)
-  {
-    builder.Add(nightclub);
-  });
+  auto id = BuildCountry(countryName, [&](TestMwmBuilder & builder) { builder.Add(nightclub); });
 
   {
     Rules rules = {ExactMatch(id, nightclub)};
@@ -1366,10 +1342,7 @@ UNIT_CLASS_TEST(ProcessorTest, Numerals)
   TestPOI school({0, 0}, "СШ №61", "ru");
   school.SetTypes({{"amenity", "school"}});
 
-  auto id = BuildCountry(country.GetName("ru"), [&](TestMwmBuilder & builder)
-  {
-    builder.Add(school);
-  });
+  auto id = BuildCountry(country.GetName("ru"), [&](TestMwmBuilder & builder) { builder.Add(school); });
 
   SetViewport(m2::RectD(-1.0, -1.0, 1.0, 1.0));
   {
@@ -1514,8 +1487,8 @@ UNIT_CLASS_TEST(ProcessorTest, RelaxedRetrieval)
   string const countryName = "Wonderland";
   TestCountry country({10.0, 10.0}, countryName, "en");
 
-  TestCity city({{-10.0, -10.0}, {10.0, -10.0}, {10.0, 10.0}, {-10.0, 10.0}} /* boundary */,
-                "Sick City", "en", 255 /* rank */);
+  TestCity city({{-10.0, -10.0}, {10.0, -10.0}, {10.0, 10.0}, {-10.0, 10.0}} /* boundary */, "Sick City", "en",
+                255 /* rank */);
 
   TestStreet street({{-1.0, 0.0}, {1.0, 0.0}}, "Queer Street", "en");
   TestBuilding building0({-1.0, 0.0}, "" /* name */, "0", street.GetName("en"), "en");
@@ -1603,13 +1576,12 @@ UNIT_CLASS_TEST(ProcessorTest, PathsThroughLayers)
 
   TestCountry scienceCountry({0.0, 0.0}, countryName, "en");
 
-  TestCity mathTown({{-100.0, -100.0}, {100.0, -100.0}, {100.0, 100.0}, {-100.0, 100.0}},
-                    "Math Town", "en", 100 /* rank */);
+  TestCity mathTown({{-100.0, -100.0}, {100.0, -100.0}, {100.0, 100.0}, {-100.0, 100.0}}, "Math Town", "en",
+                    100 /* rank */);
 
   TestStreet computingStreet({{-16.0, -16.0}, {0.0, 0.0}, {16.0, 16.0}}, "Computing street", "en");
 
-  TestBuilding statisticalLearningBuilding({8.0, 8.0},
-                                           "Statistical Learning Buisiness Center", "0",
+  TestBuilding statisticalLearningBuilding({8.0, 8.0}, "Statistical Learning Buisiness Center", "0",
                                            computingStreet.GetName("en"), "en");
 
   TestPOI supervisedOffice({8.0, 8.0}, "Supervised, Inc.", "en");
@@ -1634,14 +1606,11 @@ UNIT_CLASS_TEST(ProcessorTest, PathsThroughLayers)
 
   SetViewport(m2::RectD(-100.0, -100.0, 100.0, 100.0));
 
-  for (auto const mode :
-       {FeaturesLayerPathFinder::MODE_AUTO, FeaturesLayerPathFinder::MODE_TOP_DOWN,
-        FeaturesLayerPathFinder::MODE_BOTTOM_UP})
+  for (auto const mode : {FeaturesLayerPathFinder::MODE_AUTO, FeaturesLayerPathFinder::MODE_TOP_DOWN,
+                          FeaturesLayerPathFinder::MODE_BOTTOM_UP})
   {
     FeaturesLayerPathFinder::SetModeForTesting(mode);
-    SCOPE_GUARD(rollbackMode, [&] {
-      FeaturesLayerPathFinder::SetModeForTesting(FeaturesLayerPathFinder::MODE_AUTO);
-    });
+    SCOPE_GUARD(rollbackMode, [&] { FeaturesLayerPathFinder::SetModeForTesting(FeaturesLayerPathFinder::MODE_AUTO); });
 
     auto const ruleStreet = ExactMatch(countryId, computingStreet);
     auto const ruleBuilding = ExactMatch(countryId, statisticalLearningBuilding);
@@ -1699,9 +1668,8 @@ UNIT_CLASS_TEST(ProcessorTest, SelectProperName)
     TEST_EQUAL(results[0].GetString(), expectedRes, (results));
   };
 
-  TestMultilingualPOI cafe(
-      {0.0, 0.0}, "Default",
-      {{"es", "Spanish"}, {"int_name", "International"}, {"fr", "French"}, {"ru", "Russian"}});
+  TestMultilingualPOI cafe({0.0, 0.0}, "Default",
+                           {{"es", "Spanish"}, {"int_name", "International"}, {"fr", "French"}, {"ru", "Russian"}});
   cafe.SetTypes({{"amenity", "cafe"}});
 
   BuildCountry("Wonderland", [&](TestMwmBuilder & builder)
@@ -1931,7 +1899,7 @@ UNIT_CLASS_TEST(ProcessorTest, SquareAsStreetTest)
   SetViewport(m2::RectD(0.0, 0.0, 1.0, 2.0));
 
   {
-    Rules const rules = { ExactMatch(countryId, nonameHouse) };
+    Rules const rules = {ExactMatch(countryId, nonameHouse)};
     TEST(OrderedResultsMatch("revolution square 3", rules), ());
     TEST(OrderedResultsMatch("revolution sq 3", rules), ());
   }
@@ -2083,13 +2051,13 @@ UNIT_CLASS_TEST(ProcessorTest, RemoveDuplicatingStreets)
 
   // Distance between centers should be less than 3km (0.027).
   TestStreet street1({{0.0, 0.0}, {0.0, 0.01}}, streetName, "ru");
-  street1.SetType({ "highway", "primary" });
+  street1.SetType({"highway", "primary"});
   TestStreet street2({{0.0, 0.01}, {0.0, 0.015}}, streetName, "ru");
-  street2.SetType({ "highway", "secondary" });
+  street2.SetType({"highway", "secondary"});
   TestStreet street3({{0.0, 0.015}, {0.0, 0.02}}, streetName, "ru");
-  street3.SetType({ "highway", "footway" });
+  street3.SetType({"highway", "footway"});
   TestStreet street4({{0.0, 0.02}, {0.0, 0.03}}, streetName, "ru");
-  street4.SetType({ "highway", "tertiary_link", "tunnel" });
+  street4.SetType({"highway", "tertiary_link", "tunnel"});
 
   auto wonderlandId = BuildCountry("Wonderland", [&](TestMwmBuilder & builder)
   {
@@ -2214,9 +2182,9 @@ UNIT_CLASS_TEST(ProcessorTest, StreetSynonymPrefix)
 
 UNIT_CLASS_TEST(ProcessorTest, Strasse)
 {
-  TestStreet s1({{-1.0, -1.0},{1.0, 1.0}}, "abcdstraße", "de");
+  TestStreet s1({{-1.0, -1.0}, {1.0, 1.0}}, "abcdstraße", "de");
   TestStreet s2({{1.0, -1.0}, {-1.0, 1.0}}, "xyz strasse", "de");
-  TestStreet s3({{-2.0, -2.0},{2.0, 2.0}}, "bahnhofplatz", "de");
+  TestStreet s3({{-2.0, -2.0}, {2.0, 2.0}}, "bahnhofplatz", "de");
 
   auto countryId = BuildCountry("Wonderland", [&](TestMwmBuilder & builder)
   {
@@ -2426,9 +2394,11 @@ UNIT_CLASS_TEST(ProcessorTest, SynonymMisprintsTest)
   {
     Rules rules = {ExactMatch(wonderlandId, bolshaya), ExactMatch(wonderlandId, bolnaya)};
     TEST(OrderedResultsMatch("большая дмитровка",
-                             { ExactMatch(wonderlandId, bolshaya), ExactMatch(wonderlandId, bolnaya) }), ());
+                             {ExactMatch(wonderlandId, bolshaya), ExactMatch(wonderlandId, bolnaya)}),
+         ());
     TEST(OrderedResultsMatch("больная дмировка",
-                             { ExactMatch(wonderlandId, bolnaya), ExactMatch(wonderlandId, bolshaya) }), ());
+                             {ExactMatch(wonderlandId, bolnaya), ExactMatch(wonderlandId, bolshaya)}),
+         ());
   }
   {
     Rules rules = {ExactMatch(wonderlandId, bolshaya)};
@@ -2438,10 +2408,8 @@ UNIT_CLASS_TEST(ProcessorTest, SynonymMisprintsTest)
   {
     /// @todo Results are controversial here, despite 2-errors matching.
     // "southeast" and "southwest" len is 9 and Levenstein distance is 2.
-    TEST(OrderedResultsMatch("southeast street",
-                             { ExactMatch(wonderlandId, se), ExactMatch(wonderlandId, sw) }), ());
-    TEST(OrderedResultsMatch("southwest street",
-                             { ExactMatch(wonderlandId, sw), ExactMatch(wonderlandId, se) }), ());
+    TEST(OrderedResultsMatch("southeast street", {ExactMatch(wonderlandId, se), ExactMatch(wonderlandId, sw)}), ());
+    TEST(OrderedResultsMatch("southwest street", {ExactMatch(wonderlandId, sw), ExactMatch(wonderlandId, se)}), ());
   }
   {
     Rules rules = {ExactMatch(wonderlandId, sw)};
@@ -2458,9 +2426,9 @@ UNIT_CLASS_TEST(ProcessorTest, SynonymMisprintsTest)
 UNIT_CLASS_TEST(ProcessorTest, StreetsFallback)
 {
   TestStreet st1({{-0.5, -0.5}, {0.5, -0.5}}, "1st north street", "en");
-  TestStreet st2({{-0.5,  0.5}, {0.5,  0.5}}, "2nd north street", "en");
+  TestStreet st2({{-0.5, 0.5}, {0.5, 0.5}}, "2nd north street", "en");
   TestStreet rue1({{-1.5, -1.5}, {1.5, -1.5}}, "rue la foo", "fr");
-  TestStreet rue2({{-1.5,  1.5}, {1.5,  1.5}}, "avenue la bar", "fr");
+  TestStreet rue2({{-1.5, 1.5}, {1.5, 1.5}}, "avenue la bar", "fr");
 
   auto wonderlandId = BuildCountry("Wonderland", [&](TestMwmBuilder & builder)
   {
@@ -2471,19 +2439,19 @@ UNIT_CLASS_TEST(ProcessorTest, StreetsFallback)
   });
 
   {
-    TEST(ResultsMatch("1st street", { ExactMatch(wonderlandId, st1) }), ());
-    TEST(ResultsMatch("2nd street", { ExactMatch(wonderlandId, st2) }), ());
+    TEST(ResultsMatch("1st street", {ExactMatch(wonderlandId, st1)}), ());
+    TEST(ResultsMatch("2nd street", {ExactMatch(wonderlandId, st2)}), ());
 
-    TEST(ResultsMatch("rue foo", { ExactMatch(wonderlandId, rue1) }, "fr"), ());
-    TEST(ResultsMatch("rue bar", { ExactMatch(wonderlandId, rue2) }, "fr"), ());
+    TEST(ResultsMatch("rue foo", {ExactMatch(wonderlandId, rue1)}, "fr"), ());
+    TEST(ResultsMatch("rue bar", {ExactMatch(wonderlandId, rue2)}, "fr"), ());
 
-    TEST(ResultsMatch("avenue la foo", { ExactMatch(wonderlandId, rue1) }, "fr"), ());
-    TEST(ResultsMatch("av la bar", { ExactMatch(wonderlandId, rue2) }, "fr"), ());
+    TEST(ResultsMatch("avenue la foo", {ExactMatch(wonderlandId, rue1)}, "fr"), ());
+    TEST(ResultsMatch("av la bar", {ExactMatch(wonderlandId, rue2)}, "fr"), ());
   }
 
   {
-    TEST(OrderedResultsMatch("1st north street", { ExactMatch(wonderlandId, st1) }), ());
-    TEST(OrderedResultsMatch("2nd north street", { ExactMatch(wonderlandId, st2) }), ());
+    TEST(OrderedResultsMatch("1st north street", {ExactMatch(wonderlandId, st1)}), ());
+    TEST(OrderedResultsMatch("2nd north street", {ExactMatch(wonderlandId, st2)}), ());
   }
 }
 
@@ -2565,11 +2533,10 @@ UNIT_CLASS_TEST(ProcessorTest, CityPostcodes)
 
   TestBuilding building({0.0, 0.00001}, "", "4", street.GetName("en"), "en");
 
-  auto const worldId = BuildWorld([&](TestMwmBuilder & builder) {
-    builder.Add(moscow);
-  });
+  auto const worldId = BuildWorld([&](TestMwmBuilder & builder) { builder.Add(moscow); });
 
-  auto countryId = BuildCountry("Wonderland", [&](TestMwmBuilder & builder) {
+  auto countryId = BuildCountry("Wonderland", [&](TestMwmBuilder & builder)
+  {
     builder.Add(moscow);
     builder.Add(street);
     builder.Add(building);
@@ -2588,10 +2555,7 @@ UNIT_CLASS_TEST(ProcessorTest, StreetNumber)
   TestStreet street({{-1.0, -1.0}, {1.0, 1.0}}, "Симферопольское шоссе", "ru");
   street.SetRoadNumber("M2");
 
-  auto countryId = BuildCountry("Wonderland", [&](TestMwmBuilder & builder)
-  {
-    builder.Add(street);
-  });
+  auto countryId = BuildCountry("Wonderland", [&](TestMwmBuilder & builder) { builder.Add(street); });
 
   SetViewport(m2::RectD(0.0, 0.0, 1.0, 2.0));
   {
@@ -2605,10 +2569,7 @@ UNIT_CLASS_TEST(ProcessorTest, StreetNumberEnriched)
   TestStreet street({{-1.0, -1.0}, {1.0, 1.0}}, "Нева", "ru");
   street.SetRoadNumber("M-11;ru:national/M-11");
 
-  auto countryId = BuildCountry("Wonderland", [&](TestMwmBuilder & builder)
-  {
-    builder.Add(street);
-  });
+  auto countryId = BuildCountry("Wonderland", [&](TestMwmBuilder & builder) { builder.Add(street); });
 
   SetViewport(m2::RectD(0.0, 0.0, 1.0, 2.0));
   {
@@ -2629,10 +2590,7 @@ UNIT_CLASS_TEST(ProcessorTest, PostcodesErrorTest)
   TestPOI postbox({0.0, 0.0}, "127001", "default");
   postbox.SetTypes({{"amenity", "post_box"}});
 
-  auto countryId = BuildCountry("Wonderland", [&](TestMwmBuilder & builder)
-  {
-    builder.Add(postbox);
-  });
+  auto countryId = BuildCountry("Wonderland", [&](TestMwmBuilder & builder) { builder.Add(postbox); });
 
   SetViewport(m2::RectD(0.0, 0.0, 1.0, 1.0));
   {
@@ -2700,8 +2658,8 @@ UNIT_CLASS_TEST(ProcessorTest, OrderCountries)
     TEST(ResultsMatch({results[1]}, {ExactMatch(UkId, wheeling)}), ());
     // (UkId, wheeling) has higher rank but it's second in results because it was not in the first
     // batch.
-    TEST_GREATER(results[1].GetRankingInfo().GetLinearModelRank(),
-                 results[0].GetRankingInfo().GetLinearModelRank(), ());
+    TEST_GREATER(results[1].GetRankingInfo().GetLinearModelRank(), results[0].GetRankingInfo().GetLinearModelRank(),
+                 ());
   }
 }
 
@@ -2751,10 +2709,7 @@ UNIT_CLASS_TEST(ProcessorTest, Suburbs1)
   // The same with neighborhood
   TestSuburb suburb({0, 0}, "les Planes", "default");
 
-  auto countryId = BuildCountry("Wonderland", [&](TestMwmBuilder & builder)
-  {
-    builder.Add(suburb);
-  });
+  auto countryId = BuildCountry("Wonderland", [&](TestMwmBuilder & builder) { builder.Add(suburb); });
 
   SetViewport(m2::RectD(-1.0, -1.0, 1.0, 1.0));
 
@@ -2768,7 +2723,8 @@ UNIT_CLASS_TEST(ProcessorTest, ViewportFilter)
   TestStreet street23({{0.5, -1.0}, {0.5, 1.0}}, "23rd February street", "en");
   TestStreet street8({{0.0, -1.0}, {0.0, 1.0}}, "8th March street", "en");
 
-  auto const countryId = BuildCountry("Wounderland", [&](TestMwmBuilder & builder) {
+  auto const countryId = BuildCountry("Wounderland", [&](TestMwmBuilder & builder)
+  {
     builder.Add(street23);
     builder.Add(street8);
   });
@@ -2785,7 +2741,7 @@ UNIT_CLASS_TEST(ProcessorTest, ViewportFilter)
 
     // |street23| should not appear in viewport search because it has 2 unmatched tokens.
     // |street8| has 1 unmatched token.
-    //Rules const rules = {ExactMatch(countryId, street8)};
+    // Rules const rules = {ExactMatch(countryId, street8)};
     Rules const rules;
 
     TestSearchRequest request(m_engine, params);
@@ -2802,7 +2758,7 @@ UNIT_CLASS_TEST(ProcessorTest, ViewportFilter)
 
     /// @todo |street23| should be in everywhere search results because everywhere search mode does not
     /// have matched tokens number restriction. Or not?
-    Rules const rules = {ExactMatch(countryId, street8)/*, ExactMatch(countryId, street23) */ };
+    Rules const rules = {ExactMatch(countryId, street8) /*, ExactMatch(countryId, street23) */};
 
     TestSearchRequest request(m_engine, params);
     request.Run();
@@ -2819,7 +2775,8 @@ UNIT_CLASS_TEST(ProcessorTest, FilterStreetPredictions)
   TestStreet lenina2({{2.0, -1.0}, {2.0, 1.0}}, "Lenina", "en");
   TestStreet lenina3({{3.0, -1.0}, {3.0, 1.0}}, "Lenina", "en");
 
-  auto const countryId = BuildCountry("Wounderland", [&](TestMwmBuilder & builder) {
+  auto const countryId = BuildCountry("Wounderland", [&](TestMwmBuilder & builder)
+  {
     builder.Add(lenina0);
     builder.Add(lenina1);
     builder.Add(lenina2);
@@ -2831,12 +2788,12 @@ UNIT_CLASS_TEST(ProcessorTest, FilterStreetPredictions)
   SearchParams defaultParams;
   defaultParams.m_query = "Lenina";
   defaultParams.m_inputLocale = "en";
-  defaultParams.m_viewport = m2::RectD(-1.0, -1.0, 1.0, 1.0); // viewport center is {0, 0}
+  defaultParams.m_viewport = m2::RectD(-1.0, -1.0, 1.0, 1.0);  // viewport center is {0, 0}
   defaultParams.m_mode = Mode::Everywhere;
 
   {
-    Rules const rules = {ExactMatch(countryId, lenina0), ExactMatch(countryId, lenina1),
-                         ExactMatch(countryId, lenina2), ExactMatch(countryId, lenina3)};
+    Rules const rules = {ExactMatch(countryId, lenina0), ExactMatch(countryId, lenina1), ExactMatch(countryId, lenina2),
+                         ExactMatch(countryId, lenina3)};
 
     TestSearchRequest request(m_engine, defaultParams);
     request.Run();
@@ -3029,7 +2986,7 @@ UNIT_CLASS_TEST(ProcessorTest, MatchAroundPivotInMwmWithCity)
   SetViewport(m2::RectD(-1.0, -1.0, 1.0, 1.0));
   {
     // UPD: Of course, we should show Minsk cafe _after_ Minsk city.
-    Rules rules = { ExactMatch(worldId, minsk), ExactMatch(minskId, minskCafe) };
+    Rules rules = {ExactMatch(worldId, minsk), ExactMatch(minskId, minskCafe)};
     TEST(OrderedResultsMatch("Minsk ", rules), ());
     TEST(OrderedResultsMatch("Minsk", rules), ());
   }
@@ -3051,7 +3008,8 @@ UNIT_CLASS_TEST(ProcessorTest, LocalityScorer)
   TestCity spAtacama({5.5, 5.5}, "San Pedro de Atacama", "en", 100 /* rank */);
   TestCity spAlcantara({6.5, 6.5}, "San Pedro de Alcantara", "en", 40 /* rank */);
 
-  auto worldId = BuildWorld([&](TestMwmBuilder & builder) {
+  auto worldId = BuildWorld([&](TestMwmBuilder & builder)
+  {
     builder.Add(sp0);
     builder.Add(sp1);
     builder.Add(sp2);
@@ -3111,7 +3069,8 @@ UNIT_CLASS_TEST(ProcessorTest, StreetWithNumber)
 
 UNIT_CLASS_TEST(ProcessorTest, SimilarLanguage)
 {
-  auto testLanguage = [&](string language, string searchString, bool expectedRes) {
+  auto testLanguage = [&](string language, string searchString, bool expectedRes)
+  {
     auto request = MakeRequest(searchString, language);
     auto const & results = request->Results();
     TEST_EQUAL(results.size(), expectedRes ? 1 : 0, (results, language, searchString, expectedRes));
@@ -3124,10 +3083,7 @@ UNIT_CLASS_TEST(ProcessorTest, SimilarLanguage)
                            {"ja_kana", "じゆうがおか"},
                            {"ko", "지유가오카"}});
 
-  auto wonderlandId = BuildCountry("Wonderland", [&](TestMwmBuilder & builder)
-  {
-    builder.Add(poi);
-  });
+  auto wonderlandId = BuildCountry("Wonderland", [&](TestMwmBuilder & builder) { builder.Add(poi); });
 
   SetViewport(m2::RectD(-1, -1, 1, 1));
 
@@ -3152,13 +3108,9 @@ UNIT_CLASS_TEST(ProcessorTest, SimilarLanguage)
 
 UNIT_CLASS_TEST(ProcessorTest, AltAndOldName)
 {
-  TestMultilingualPOI poi({0.0, 0.0}, "default",
-                          {{"en", "english"}, {"alt_name", "alternative"}, {"old_name", "old"}});
+  TestMultilingualPOI poi({0.0, 0.0}, "default", {{"en", "english"}, {"alt_name", "alternative"}, {"old_name", "old"}});
 
-  auto wonderlandId = BuildCountry("Wonderland", [&](TestMwmBuilder & builder)
-  {
-    builder.Add(poi);
-  });
+  auto wonderlandId = BuildCountry("Wonderland", [&](TestMwmBuilder & builder) { builder.Add(poi); });
 
   SetViewport(m2::RectD(-1, -1, 1, 1));
   {
@@ -3184,8 +3136,7 @@ UNIT_CLASS_TEST(ProcessorTest, TestRankingInfo_IsAltOrOldName)
   streetName.AddString("old_name", "проспект Пролетарской Победы");
   TestStreet street({{0.0, -0.5}, {0.0, 0.0}, {0.0, 0.5}}, streetName);
 
-  TestMultilingualPOI poi({0.0, 0.0}, "KFC",
-                          {{"alt_name", "Kentucky Fried Chicken"}, {"old_name", "Ростикс"}});
+  TestMultilingualPOI poi({0.0, 0.0}, "KFC", {{"alt_name", "Kentucky Fried Chicken"}, {"old_name", "Ростикс"}});
 
   auto worldId = BuildWorld([&](TestMwmBuilder & builder) { builder.Add(city); });
 
@@ -3226,11 +3177,9 @@ UNIT_CLASS_TEST(ProcessorTest, TestRankingInfo_IsAltOrOldName)
   checkIsAltOrOldName("Санкт-Петербург проспект Пролетарской Победы KFC", true);
   checkIsAltOrOldName("Питер проспект Пролетарской Победы KFC", true);
   checkIsAltOrOldName("Ленинград проспект Пролетарской Победы KFC", true);
-  checkIsAltOrOldName(
-      "Санкт-Петербург Большой проспект Васильевского Острова Kentucky Fried Chicken", true);
+  checkIsAltOrOldName("Санкт-Петербург Большой проспект Васильевского Острова Kentucky Fried Chicken", true);
   checkIsAltOrOldName("Питер Большой проспект Васильевского Острова Kentucky Fried Chicken", true);
-  checkIsAltOrOldName("Ленинград Большой проспект Васильевского Острова Kentucky Fried Chicken",
-                      true);
+  checkIsAltOrOldName("Ленинград Большой проспект Васильевского Острова Kentucky Fried Chicken", true);
   checkIsAltOrOldName("Санкт-Петербург Большой проспект В. О. Kentucky Fried Chicken", true);
   checkIsAltOrOldName("Питер Большой проспект В. О. Kentucky Fried Chicken", true);
   checkIsAltOrOldName("Ленинград Большой проспект В. О. Kentucky Fried Chicken", true);
@@ -3253,7 +3202,8 @@ UNIT_CLASS_TEST(ProcessorTest, JaKanaNormalizationTest)
   TestPOI poiHiragana({0.0, 0.0}, "とうきょうと", "default");
   TestPOI poiKatakana({1.0, 1.0}, "トウキョウト", "default");
 
-  auto countryId = BuildCountry("Wonderland", [&](TestMwmBuilder & builder) {
+  auto countryId = BuildCountry("Wonderland", [&](TestMwmBuilder & builder)
+  {
     builder.Add(poiHiragana);
     builder.Add(poiKatakana);
   });
@@ -3277,7 +3227,8 @@ UNIT_CLASS_TEST(ProcessorTest, TestRankingInfo_MultipleOldNames)
 
   SetViewport(m2::RectD(-1, -1, 1, 1));
 
-  auto checkResult = [&](string const & query, string const & expectedName) {
+  auto checkResult = [&](string const & query, string const & expectedName)
+  {
     auto request = MakeRequest(query, "ru");
     auto const & results = request->Results();
 
@@ -3390,10 +3341,10 @@ UNIT_CLASS_TEST(ProcessorTest, PoiStreetCity_FancyMatch)
   TestCity moloCity(FromLatLon(54.3073327, 26.8389111), "Молодечно", "ru", feature::PopulationToRank(100000));
   TestCity minskCity(FromLatLon(53.9024716, 27.5618225), "Минск", "ru", feature::PopulationToRank(2000000));
 
-  TestStreet moloStreet({FromLatLon(54.3082251, 26.8319660), FromLatLon(54.3071611, 26.8379171)},
-                        "улица Льва Толстого", "ru");
-  TestStreet minskStreet({FromLatLon(53.8861373, 27.5492881), FromLatLon(53.8908963, 27.5422647)},
-                         "улица Толстого", "ru");
+  TestStreet moloStreet({FromLatLon(54.3082251, 26.8319660), FromLatLon(54.3071611, 26.8379171)}, "улица Льва Толстого",
+                        "ru");
+  TestStreet minskStreet({FromLatLon(53.8861373, 27.5492881), FromLatLon(53.8908963, 27.5422647)}, "улица Толстого",
+                         "ru");
 
   TestPOI moloBusStop(FromLatLon(54.3082210, 26.8349911), "улица Буховщина", "en");
   moloBusStop.SetTypes({{"highway", "bus_stop"}});
@@ -3418,9 +3369,9 @@ UNIT_CLASS_TEST(ProcessorTest, PoiStreetCity_FancyMatch)
   // moloBusStop (on second place) was matched like:
   // prefix name match = "улица", near street = "Толстого", in city = "Молодечно".
   Rules const rules = {
-    ExactMatch(countryId, moloStreet),
-    ExactMatch(countryId, moloBusStop),
-    ExactMatch(countryId, minskStreet),
+      ExactMatch(countryId, moloStreet),
+      ExactMatch(countryId, moloBusStop),
+      ExactMatch(countryId, minskStreet),
   };
   TEST(OrderedResultsMatch("улица Толстого Молодечно", rules), ());
 }
@@ -3443,10 +3394,7 @@ UNIT_CLASS_TEST(ProcessorTest, ComplexPoi_Rank)
 
   SetViewport({-0.5, -0.5, 0.5, 0.5});
 
-  Rules const rules = {
-    ExactMatch(countryId, telekom),
-    ExactMatch(countryId, poiInMall)
-  };
+  Rules const rules = {ExactMatch(countryId, telekom), ExactMatch(countryId, poiInMall)};
   TEST(OrderedResultsMatch("Telekom shop", rules), ());
 }
 
@@ -3454,10 +3402,7 @@ UNIT_CLASS_TEST(ProcessorTest, Place_Region)
 {
   TestPlace region({1, 1}, "Carthage", "en", classif().GetTypeByPath({"place", "region"}));
 
-  auto const worldId = BuildWorld([&](TestMwmBuilder & builder)
-  {
-    builder.Add(region);
-  });
+  auto const worldId = BuildWorld([&](TestMwmBuilder & builder) { builder.Add(region); });
 
   Rules rules{ExactMatch(worldId, region)};
   TEST(ResultsMatch("carth", rules, "en"), ());
@@ -3528,24 +3473,24 @@ UNIT_CLASS_TEST(ProcessorTest, StreetCategories)
 
   {
     Rules const rules = {
-      ExactMatch(wonderlandId, street),
-      ExactMatch(wonderlandId, bus),
+        ExactMatch(wonderlandId, street),
+        ExactMatch(wonderlandId, bus),
     };
     TEST(OrderedResultsMatch("avenida santa fe ", rules), ());
   }
 
   {
     Rules const rules = {
-      ExactMatch(wonderlandId, street),
-      ExactMatch(wonderlandId, bus),
+        ExactMatch(wonderlandId, street),
+        ExactMatch(wonderlandId, bus),
     };
     TEST(OrderedResultsMatch("avenida santa fe street ", rules), ());
   }
 
   {
     Rules const rules = {
-      ExactMatch(wonderlandId, street),
-      ExactMatch(wonderlandId, bus),
+        ExactMatch(wonderlandId, street),
+        ExactMatch(wonderlandId, bus),
     };
     TEST(OrderedResultsMatch(MakeRequest("avenida santa fe улица ", "ru")->Results(), rules), ());
   }
@@ -3570,9 +3515,9 @@ UNIT_CLASS_TEST(ProcessorTest, BarcelonaStreet)
 
   {
     Rules const rules = {
-      ExactMatch(wonderlandId, street),
-      // 1 token match is discarded for _relaxed_
-      //ExactMatch(wonderlandId, highway),
+        ExactMatch(wonderlandId, street),
+        // 1 token match is discarded for _relaxed_
+        // ExactMatch(wonderlandId, highway),
     };
     TEST(OrderedResultsMatch(MakeRequest("carrer de concordia 59", "en")->Results(), rules), ());
     // Add some misspellings.
@@ -3614,7 +3559,7 @@ UNIT_CLASS_TEST(ProcessorTest, ComplexPoi_Match)
 
   {
     /// @todo Looks like a building can't be matched with name and housenumber at the same time.
-    //Rules const rules = {ExactMatch(wonderlandId, building)};
+    // Rules const rules = {ExactMatch(wonderlandId, building)};
     Rules const rules = {ExactMatch(wonderlandId, street)};
     TEST(ResultsMatch("фрэор задворенская 8", rules), ());
   }
@@ -3648,8 +3593,7 @@ UNIT_CLASS_TEST(ProcessorTest, NonDrawable_Categories)
   SetViewport(m2::RectD(-0.5, -0.5, 0.5, 0.5));
 
   {
-    Rules const rules = {ExactMatch(wonderlandId, noWheelchair),
-                         ExactMatch(wonderlandId, elevator),
+    Rules const rules = {ExactMatch(wonderlandId, noWheelchair), ExactMatch(wonderlandId, elevator),
                          ExactMatch(wonderlandId, yesWheelchair)};
     TEST(ResultsMatch("subway", rules), ());
   }
@@ -3694,10 +3638,7 @@ UNIT_CLASS_TEST(ProcessorTest, Numeric_POI_Name)
   TestPOI kiosk({0, 0}, "365", "default");
   kiosk.SetTypes({{"shop", "kiosk"}});
 
-  auto wonderlandId = BuildCountry("Wonderland", [&](TestMwmBuilder & builder)
-  {
-    builder.Add(kiosk);
-  });
+  auto wonderlandId = BuildCountry("Wonderland", [&](TestMwmBuilder & builder) { builder.Add(kiosk); });
 
   SetViewport(m2::RectD(-0.5, -0.5, 0.5, 0.5));
 
@@ -3709,4 +3650,4 @@ UNIT_CLASS_TEST(ProcessorTest, Numeric_POI_Name)
   }
 }
 
-} // namespace processor_test
+}  // namespace processor_test
diff --git a/libs/search/search_integration_tests/ranker_test.cpp b/libs/search/search_integration_tests/ranker_test.cpp
index 03287e40b..5ad8b05d2 100644
--- a/libs/search/search_integration_tests/ranker_test.cpp
+++ b/libs/search/search_integration_tests/ranker_test.cpp
@@ -16,22 +16,20 @@ using namespace search;
 using namespace std;
 
 class RankerTest : public SearchTest
-{
-};
+{};
 
 UNIT_CLASS_TEST(RankerTest, ErrorsInStreets)
 {
-  TestStreet mazurova(
-      vector<m2::PointD>{m2::PointD(-0.001, -0.001), m2::PointD(0, 0), m2::PointD(0.001, 0.001)},
-      "Мазурова", "ru");
+  TestStreet mazurova(vector<m2::PointD>{m2::PointD(-0.001, -0.001), m2::PointD(0, 0), m2::PointD(0.001, 0.001)},
+                      "Мазурова", "ru");
   TestBuilding mazurova14(m2::PointD(-0.001, -0.001), "", "14", mazurova.GetName("ru"), "ru");
 
-  TestStreet masherova(
-      vector<m2::PointD>{m2::PointD(-0.001, 0.001), m2::PointD(0, 0), m2::PointD(0.001, -0.001)},
-      "Машерова", "ru");
+  TestStreet masherova(vector<m2::PointD>{m2::PointD(-0.001, 0.001), m2::PointD(0, 0), m2::PointD(0.001, -0.001)},
+                       "Машерова", "ru");
   TestBuilding masherova14(m2::PointD(0.001, 0.001), "", "14", masherova.GetName("ru"), "ru");
 
-  auto id = BuildCountry("Belarus", [&](TestMwmBuilder & builder) {
+  auto id = BuildCountry("Belarus", [&](TestMwmBuilder & builder)
+  {
     builder.Add(mazurova);
     builder.Add(mazurova14);
 
@@ -70,10 +68,7 @@ UNIT_CLASS_TEST(RankerTest, UniteSameResults)
   TestCafe cafe1({0.5, 0.5}, "И точка", "ru");
   TestCafe cafe2({0.5, 0.5}, "И точка", "ru");
 
-  auto const worldID = BuildWorld([&](TestMwmBuilder & builder)
-  {
-    builder.Add(city);
-  });
+  auto const worldID = BuildWorld([&](TestMwmBuilder & builder) { builder.Add(city); });
 
   auto const countryID = BuildCountry("Wonderland", [&](TestMwmBuilder & builder)
   {
@@ -97,19 +92,13 @@ UNIT_CLASS_TEST(RankerTest, UniteSameResults)
 UNIT_CLASS_TEST(RankerTest, PreferCountry)
 {
   std::string const name = "Wonderland";
-  TestCountry wonderland(m2::PointD(9.0, 9.0), name, "en");   // ~1400 km from (0, 0)
+  TestCountry wonderland(m2::PointD(9.0, 9.0), name, "en");  // ~1400 km from (0, 0)
   TestPOI cafe(m2::PointD(0.0, 0.0), name, "en");
   cafe.SetTypes({{"amenity", "cafe"}});
 
-  auto const worldID = BuildWorld([&](TestMwmBuilder & builder)
-  {
-    builder.Add(wonderland);
-  });
+  auto const worldID = BuildWorld([&](TestMwmBuilder & builder) { builder.Add(wonderland); });
 
-  auto const countryID = BuildCountry(name, [&](TestMwmBuilder & builder)
-  {
-    builder.Add(cafe);
-  });
+  auto const countryID = BuildCountry(name, [&](TestMwmBuilder & builder) { builder.Add(cafe); });
 
   SetViewport({0.0, 0.0, 1.0, 1.0});
   {
@@ -123,4 +112,4 @@ UNIT_CLASS_TEST(RankerTest, PreferCountry)
     TEST(OrderedResultsMatch("Wanderland", rules), ());
   }
 }
-} // namespace ranker_test
+}  // namespace ranker_test
diff --git a/libs/search/search_integration_tests/search_edited_features_test.cpp b/libs/search/search_integration_tests/search_edited_features_test.cpp
index 19a484089..1ce3a4ceb 100644
--- a/libs/search/search_integration_tests/search_edited_features_test.cpp
+++ b/libs/search/search_integration_tests/search_edited_features_test.cpp
@@ -38,9 +38,8 @@ UNIT_CLASS_TEST(SearchEditedFeaturesTest, Smoke)
     TEST(ResultsMatch("cafe Bar", rules), ());
     TEST(ResultsMatch("Drunken", Rules{}), ());
 
-    EditFeature(cafeId, [](osm::EditableMapObject & emo) {
-      emo.SetName("The Drunken Clam", StringUtf8Multilang::kEnglishCode);
-    });
+    EditFeature(cafeId, [](osm::EditableMapObject & emo)
+    { emo.SetName("The Drunken Clam", StringUtf8Multilang::kEnglishCode); });
 
     TEST(ResultsMatch("Eat ", rules), ());
     TEST(ResultsMatch("cafe Bar", rules), ());
@@ -63,8 +62,7 @@ UNIT_CLASS_TEST(SearchEditedFeaturesTest, NonamePoi)
 {
   TestCafe nonameCafe(m2::PointD(0, 0), "", "default");
 
-  auto const id =
-      BuildCountry("Wonderland", [&](TestMwmBuilder & builder) { builder.Add(nonameCafe); });
+  auto const id = BuildCountry("Wonderland", [&](TestMwmBuilder & builder) { builder.Add(nonameCafe); });
 
   FeatureID cafeId(id, 0 /* index */);
 
@@ -107,8 +105,8 @@ UNIT_CLASS_TEST(SearchEditedFeaturesTest, SearchInViewport)
 
   SetViewport({-1.0, -1.0, 4.0, 4.0});
   {
-    Rules const rules = {ExactMatch(countryId, bakery0), ExactMatch(countryId, bakery1),
-                         ExactMatch(countryId, bakery2), ExactMatch(countryId, bakery3)};
+    Rules const rules = {ExactMatch(countryId, bakery0), ExactMatch(countryId, bakery1), ExactMatch(countryId, bakery2),
+                         ExactMatch(countryId, bakery3)};
 
     TEST(ResultsMatch("french bakery", rules, "en", Mode::Viewport), ());
   }
@@ -159,12 +157,12 @@ UNIT_CLASS_TEST(SearchEditedFeaturesTest, ViewportFilter)
   SearchParams params;
   params.m_query = "pushkin";
   params.m_inputLocale = "en";
-  params.m_viewport = { -1.0, -1.0, 1.0, 1.0 };
+  params.m_viewport = {-1.0, -1.0, 1.0, 1.0};
   params.m_mode = Mode::Viewport;
 
   // Test center for created feature loaded and filter for viewport works.
   {
-    params.m_minDistanceOnMapBetweenResults = { 0.02, 0.02 };
+    params.m_minDistanceOnMapBetweenResults = {0.02, 0.02};
 
     // Min distance on map between results is 0.02, distance between results is 0.01.
     // The second result must be filtered out.
@@ -176,7 +174,7 @@ UNIT_CLASS_TEST(SearchEditedFeaturesTest, ViewportFilter)
   }
 
   {
-    params.m_minDistanceOnMapBetweenResults = { 0.005, 0.005 };
+    params.m_minDistanceOnMapBetweenResults = {0.005, 0.005};
 
     // Min distance on map between results is 0.005, distance between results is 0.01.
     // Filter should keep both results.
@@ -190,7 +188,7 @@ UNIT_CLASS_TEST(SearchEditedFeaturesTest, ViewportFilter)
   SetViewport({-1.0, -1.0, 1.0, 1.0});
   {
     params.m_mode = Mode::Everywhere;
-    params.m_minDistanceOnMapBetweenResults = { 0.02, 0.02 };
+    params.m_minDistanceOnMapBetweenResults = {0.02, 0.02};
 
     // No viewport filter for everywhere search mode.
     Rules const rulesEverywhere = {ExactMatch(countryId, restaurant), ExactMatch(countryId, cafe)};
@@ -200,4 +198,4 @@ UNIT_CLASS_TEST(SearchEditedFeaturesTest, ViewportFilter)
     TEST(ResultsMatch(request.Results(), rulesEverywhere), ());
   }
 }
-} // namespace search_edited_features_test
+}  // namespace search_edited_features_test
diff --git a/libs/search/search_integration_tests/smoke_test.cpp b/libs/search/search_integration_tests/smoke_test.cpp
index 0143cc129..41b25a9dd 100644
--- a/libs/search/search_integration_tests/smoke_test.cpp
+++ b/libs/search/search_integration_tests/smoke_test.cpp
@@ -34,8 +34,7 @@ class IncorrectCountry : public TestCountry
 public:
   IncorrectCountry(m2::PointD const & center, string const & name, string const & lang)
     : TestCountry(center, name, lang)
-  {
-  }
+  {}
 
   // TestFeature overrides:
   void Serialize(FeatureBuilder & fb) const override
@@ -55,14 +54,12 @@ public:
 };
 
 class SmokeTest : public SearchTest
-{
-};
+{};
 
 class AlcoShop : public TestPOI
 {
 public:
-  AlcoShop(m2::PointD const & center, string const & name, string const & lang)
-    : TestPOI(center, name, lang)
+  AlcoShop(m2::PointD const & center, string const & name, string const & lang) : TestPOI(center, name, lang)
   {
     SetTypes({{"shop", "alcohol"}});
   }
@@ -71,8 +68,7 @@ public:
 class SubwayStation : public TestPOI
 {
 public:
-  SubwayStation(m2::PointD const & center, string const & name, string const & lang)
-    : TestPOI(center, name, lang)
+  SubwayStation(m2::PointD const & center, string const & name, string const & lang) : TestPOI(center, name, lang)
   {
     SetTypes({{"railway", "station", "subway"}});
   }
@@ -81,8 +77,7 @@ public:
 class SubwayStationMoscow : public TestPOI
 {
 public:
-  SubwayStationMoscow(m2::PointD const & center, string const & name, string const & lang)
-    : TestPOI(center, name, lang)
+  SubwayStationMoscow(m2::PointD const & center, string const & name, string const & lang) : TestPOI(center, name, lang)
   {
     SetTypes({{"railway", "station", "subway", "moscow"}});
   }
@@ -114,8 +109,8 @@ UNIT_CLASS_TEST(SmokeTest, Smoke)
     TEST(ResultsMatch("wine ", rules), ());
   }
 
-  Rules const allRule = { ExactMatch(id, wineShop), ExactMatch(id, tequilaShop),
-                          ExactMatch(id, brandyShop), ExactMatch(id, vodkaShop) };
+  Rules const allRule = {ExactMatch(id, wineShop), ExactMatch(id, tequilaShop), ExactMatch(id, brandyShop),
+                         ExactMatch(id, vodkaShop)};
 
   TEST(ResultsMatch("shop ", allRule), ());
   TEST(ResultsMatch("alcohol ", allRule), ());
@@ -129,7 +124,8 @@ UNIT_CLASS_TEST(SmokeTest, DeepCategoryTest)
   SubwayStation redStation(m2::PointD(0, 0), "red", "en");
   SubwayStationMoscow blueStation(m2::PointD(1, 1), "blue", "en");
 
-  auto id = BuildMwm(kCountryName, DataHeader::MapType::Country, [&](TestMwmBuilder & builder) {
+  auto id = BuildMwm(kCountryName, DataHeader::MapType::Country, [&](TestMwmBuilder & builder)
+  {
     builder.Add(redStation);
     builder.Add(blueStation);
   });
@@ -319,11 +315,7 @@ UNIT_CLASS_TEST(SmokeTest, CategoriesTest)
       builder.AddSafe(withoutName);
     });
 
-    Rules const rules[] = {
-      {ExactMatch(id, withName), ExactMatch(id, withoutName)},
-      {ExactMatch(id, withName)},
-      {}
-    };
+    Rules const rules[] = {{ExactMatch(id, withName), ExactMatch(id, withoutName)}, {ExactMatch(id, withName)}, {}};
     auto const query = holder.GetReadableFeatureType(type, CategoriesHolder::kEnglishCode);
 
     // If you have "Unsatisfied rules" error, consider:
@@ -342,7 +334,8 @@ UNIT_CLASS_TEST(SmokeTest, NotPrefixFreeNames)
 {
   char const kCountryName[] = "ATown";
 
-  auto id = BuildMwm(kCountryName, DataHeader::MapType::Country, [&](TestMwmBuilder & builder) {
+  auto id = BuildMwm(kCountryName, DataHeader::MapType::Country, [&](TestMwmBuilder & builder)
+  {
     builder.Add(TestPOI(m2::PointD(0, 0), "a", "en"));
     builder.Add(TestPOI(m2::PointD(0, 1), "aa", "en"));
     builder.Add(TestPOI(m2::PointD(1, 1), "aa", "en"));
@@ -385,13 +378,13 @@ UNIT_CLASS_TEST(SmokeTest, NoDefaultNameTest)
 UNIT_CLASS_TEST(SmokeTest, PoiWithAddress)
 {
   char const kCountryName[] = "Wonderland";
-  TestStreet mainStreet({m2::PointD(0.0, 0.0), m2::PointD(1.0, 1.0), m2::PointD(2.0, 2.0)},
-                        "Main Street", "en");
+  TestStreet mainStreet({m2::PointD(0.0, 0.0), m2::PointD(1.0, 1.0), m2::PointD(2.0, 2.0)}, "Main Street", "en");
   TestCafe cafe(m2::PointD(1.0, 1.0), "Starbucks", "en");
   cafe.SetStreetName(mainStreet.GetName("en"));
   cafe.SetHouseNumber("27");
 
-  auto id = BuildMwm(kCountryName, DataHeader::MapType::Country, [&](TestMwmBuilder & builder) {
+  auto id = BuildMwm(kCountryName, DataHeader::MapType::Country, [&](TestMwmBuilder & builder)
+  {
     builder.Add(mainStreet);
     builder.Add(cafe);
   });
@@ -405,4 +398,4 @@ UNIT_CLASS_TEST(SmokeTest, PoiWithAddress)
     TEST(ResultsMatch("Starbucks Main street 27 ", rules), ());
   }
 }
-} // namespace smoke_test
+}  // namespace smoke_test
diff --git a/libs/search/search_integration_tests/tracer_tests.cpp b/libs/search/search_integration_tests/tracer_tests.cpp
index a5c202183..f34a33281 100644
--- a/libs/search/search_integration_tests/tracer_tests.cpp
+++ b/libs/search/search_integration_tests/tracer_tests.cpp
@@ -18,8 +18,7 @@ using namespace std;
 namespace
 {
 class TracerTest : public SearchTest
-{
-};
+{};
 
 UNIT_CLASS_TEST(TracerTest, Smoke)
 {
@@ -28,12 +27,12 @@ UNIT_CLASS_TEST(TracerTest, Smoke)
   TestCity moscow(m2::PointD(0, 0), "Moscow", "en", 100 /* rank */);
   TestCafe regularCafe(m2::PointD(0, 0));
   TestCafe moscowCafe(m2::PointD(0, 0), "Moscow", "en");
-  TestStreet tverskaya(vector<m2::PointD>{m2::PointD(0, 0), m2::PointD(0, 1)}, "Tverskaya street",
-                       "en");
+  TestStreet tverskaya(vector<m2::PointD>{m2::PointD(0, 0), m2::PointD(0, 1)}, "Tverskaya street", "en");
 
   BuildWorld([&](TestMwmBuilder & builder) { builder.Add(moscow); });
 
-  auto const id = BuildCountry("Wonderland", [&](TestMwmBuilder & builder) {
+  auto const id = BuildCountry("Wonderland", [&](TestMwmBuilder & builder)
+  {
     builder.Add(regularCafe);
     builder.Add(moscowCafe);
     builder.Add(tverskaya);
@@ -58,9 +57,9 @@ UNIT_CLASS_TEST(TracerTest, Smoke)
 
     vector<Tracer::Parse> const expected{
         Tracer::Parse{{{TokenType::TOKEN_TYPE_SUBPOI, TokenRange(0, 2)}}, false /* category */},
-        Tracer::Parse{{{TokenType::TOKEN_TYPE_CITY, TokenRange(0, 1)},
-                       {TokenType::TOKEN_TYPE_SUBPOI, TokenRange(1, 2)}},
-                      true /* category */}};
+        Tracer::Parse{
+            {{TokenType::TOKEN_TYPE_CITY, TokenRange(0, 1)}, {TokenType::TOKEN_TYPE_SUBPOI, TokenRange(1, 2)}},
+            true /* category */}};
 
     TEST_EQUAL(expected, actual, ());
   }
@@ -78,9 +77,9 @@ UNIT_CLASS_TEST(TracerTest, Smoke)
     // Unrecognized tokens are not included into the parses.
     vector<Tracer::Parse> const expected{
         Tracer::Parse{{{TokenType::TOKEN_TYPE_STREET, TokenRange(1, 2)}}, false /* category */},
-        Tracer::Parse{{{TokenType::TOKEN_TYPE_CITY, TokenRange(0, 1)},
-                       {TokenType::TOKEN_TYPE_STREET, TokenRange(1, 2)}},
-                      false /* category */},
+        Tracer::Parse{
+            {{TokenType::TOKEN_TYPE_CITY, TokenRange(0, 1)}, {TokenType::TOKEN_TYPE_STREET, TokenRange(1, 2)}},
+            false /* category */},
     };
 
     TEST_EQUAL(expected, actual, ());
diff --git a/libs/search/search_integration_tests/utils_test.cpp b/libs/search/search_integration_tests/utils_test.cpp
index aed9695e5..29c72ea01 100644
--- a/libs/search/search_integration_tests/utils_test.cpp
+++ b/libs/search/search_integration_tests/utils_test.cpp
@@ -43,7 +43,8 @@ UNIT_CLASS_TEST(SearchUtilsTest, Utils)
   TestPOI bar(m2::PointD(0.0, 0.0), "bar", "en");
   bar.SetTypes({{"amenity", "bar"}});
 
-  auto id = BuildCountry(kCountryName, [&](TestMwmBuilder & builder) {
+  auto id = BuildCountry(kCountryName, [&](TestMwmBuilder & builder)
+  {
     builder.Add(cafe);
     builder.Add(restaurant);
     builder.Add(bar);
@@ -79,10 +80,10 @@ UNIT_CLASS_TEST(SearchUtilsTest, Utils)
   auto const & dataSource = GetDataSource();
   auto const rect = m2::RectD(m2::PointD(-0.5, -0.5), m2::PointD(0.5, 0.5));
 
-  auto const testTypes = [&](vector<uint32_t> const & types, size_t expectedCount) {
+  auto const testTypes = [&](vector<uint32_t> const & types, size_t expectedCount)
+  {
     vector<FeatureID> features;
-    ForEachOfTypesInRect(dataSource, types, rect,
-                         [&features](FeatureID const & f) { features.push_back(f); });
+    ForEachOfTypesInRect(dataSource, types, rect, [&features](FeatureID const & f) { features.push_back(f); });
     TEST_EQUAL(features.size(), expectedCount, ());
   };
 
diff --git a/libs/search/search_quality/assessment_tool/context.cpp b/libs/search/search_quality/assessment_tool/context.cpp
index 0875f5607..1065f0a8a 100644
--- a/libs/search/search_quality/assessment_tool/context.cpp
+++ b/libs/search/search_quality/assessment_tool/context.cpp
@@ -122,8 +122,7 @@ ContextList::ContextList(OnResultsUpdate onResultsUpdate, OnResultsUpdate onNonF
   : m_onResultsUpdate(onResultsUpdate)
   , m_onNonFoundResultsUpdate(onNonFoundResultsUpdate)
   , m_onSampleUpdate(onSampleUpdate)
-{
-}
+{}
 
 void ContextList::Resize(size_t size)
 {
@@ -138,21 +137,23 @@ void ContextList::Resize(size_t size)
   for (size_t i = oldSize; i < size; ++i)
   {
     m_contexts.emplace_back(
-        [this, i](ResultsEdits::Update const & update) {
-          OnContextUpdated(i);
-          if (m_onResultsUpdate)
-            m_onResultsUpdate(i, update);
-        },
-        [this, i](ResultsEdits::Update const & update) {
-          OnContextUpdated(i);
-          if (m_onNonFoundResultsUpdate)
-            m_onNonFoundResultsUpdate(i, update);
-        },
-        [this, i]() {
-          OnContextUpdated(i);
-          if (m_onSampleUpdate)
-            m_onSampleUpdate(i);
-        });
+        [this, i](ResultsEdits::Update const & update)
+    {
+      OnContextUpdated(i);
+      if (m_onResultsUpdate)
+        m_onResultsUpdate(i, update);
+    },
+        [this, i](ResultsEdits::Update const & update)
+    {
+      OnContextUpdated(i);
+      if (m_onNonFoundResultsUpdate)
+        m_onNonFoundResultsUpdate(i, update);
+    }, [this, i]()
+    {
+      OnContextUpdated(i);
+      if (m_onSampleUpdate)
+        m_onSampleUpdate(i);
+    });
   }
 }
 
diff --git a/libs/search/search_quality/assessment_tool/context.hpp b/libs/search/search_quality/assessment_tool/context.hpp
index 85185548e..8f3d61a77 100644
--- a/libs/search/search_quality/assessment_tool/context.hpp
+++ b/libs/search/search_quality/assessment_tool/context.hpp
@@ -26,13 +26,12 @@ struct Context
     Completed
   };
 
-  Context(ResultsEdits::OnUpdate onFoundResultsUpdate,
-          ResultsEdits::OnUpdate onNonFoundResultsUpdate, SampleEdits::OnUpdate onSampleUpdate)
+  Context(ResultsEdits::OnUpdate onFoundResultsUpdate, ResultsEdits::OnUpdate onNonFoundResultsUpdate,
+          SampleEdits::OnUpdate onSampleUpdate)
     : m_foundResultsEdits(onFoundResultsUpdate)
     , m_nonFoundResultsEdits(onNonFoundResultsUpdate)
     , m_sampleEdits(onSampleUpdate)
-  {
-  }
+  {}
 
   void AddNonFoundResult(search::Sample::Result const & result)
   {
@@ -94,17 +93,11 @@ public:
 
     bool IsValid() const { return m_contexts != nullptr; }
 
-    std::string GetLabel(size_t index) const
-    {
-      return strings::ToUtf8((*m_contexts)[index].m_sample.m_query);
-    }
+    std::string GetLabel(size_t index) const { return strings::ToUtf8((*m_contexts)[index].m_sample.m_query); }
 
     bool IsChanged(size_t index) const { return (*m_contexts)[index].HasChanges(); }
 
-    Context::SearchState GetSearchState(size_t index) const
-    {
-      return (*m_contexts)[index].m_searchState;
-    }
+    Context::SearchState GetSearchState(size_t index) const { return (*m_contexts)[index].m_searchState; }
 
     bool IsUseless(size_t index) const { return (*m_contexts)[index].m_sampleEdits.m_currUseless; }
 
@@ -117,8 +110,7 @@ public:
   using OnResultsUpdate = std::function<void(size_t index, ResultsEdits::Update const & update)>;
   using OnSampleUpdate = std::function<void(size_t index)>;
 
-  ContextList(OnResultsUpdate onResultsUpdate, OnResultsUpdate onNonFoundResultsUpdate,
-              OnSampleUpdate onSampleUpdate);
+  ContextList(OnResultsUpdate onResultsUpdate, OnResultsUpdate onNonFoundResultsUpdate, OnSampleUpdate onSampleUpdate);
 
   void Resize(size_t size);
   size_t Size() const { return m_contexts.size(); }
diff --git a/libs/search/search_quality/assessment_tool/edits.cpp b/libs/search/search_quality/assessment_tool/edits.cpp
index eed399858..f57e8d1c1 100644
--- a/libs/search/search_quality/assessment_tool/edits.cpp
+++ b/libs/search/search_quality/assessment_tool/edits.cpp
@@ -6,8 +6,7 @@ using namespace std;
 
 namespace
 {
-void UpdateNumEdits(ResultsEdits::Entry const & entry, ResultsEdits::Relevance const & r,
-                    size_t & numEdits)
+void UpdateNumEdits(ResultsEdits::Entry const & entry, ResultsEdits::Relevance const & r, size_t & numEdits)
 {
   if (entry.m_currRelevance != entry.m_origRelevance && r == entry.m_origRelevance)
   {
@@ -41,9 +40,7 @@ void SampleEdits::Apply()
 }
 
 // ResultsEdits::Editor ----------------------------------------------------------------------------
-ResultsEdits::Editor::Editor(ResultsEdits & parent, size_t index) : m_parent(parent), m_index(index)
-{
-}
+ResultsEdits::Editor::Editor(ResultsEdits & parent, size_t index) : m_parent(parent), m_index(index) {}
 
 bool ResultsEdits::Editor::Set(Relevance relevance)
 {
@@ -55,7 +52,10 @@ optional<ResultsEdits::Relevance> const & ResultsEdits::Editor::Get() const
   return m_parent.Get(m_index).m_currRelevance;
 }
 
-bool ResultsEdits::Editor::HasChanges() const { return m_parent.HasChanges(m_index); }
+bool ResultsEdits::Editor::HasChanges() const
+{
+  return m_parent.HasChanges(m_index);
+}
 
 ResultsEdits::Entry::Type ResultsEdits::Editor::GetType() const
 {
@@ -65,7 +65,8 @@ ResultsEdits::Entry::Type ResultsEdits::Editor::GetType() const
 // ResultsEdits ------------------------------------------------------------------------------------
 void ResultsEdits::Apply()
 {
-  WithObserver(Update::MakeAll(), [this]() {
+  WithObserver(Update::MakeAll(), [this]()
+  {
     for (auto & entry : m_entries)
     {
       entry.m_origRelevance = entry.m_currRelevance;
@@ -77,7 +78,8 @@ void ResultsEdits::Apply()
 
 void ResultsEdits::Reset(vector<optional<ResultsEdits::Relevance>> const & relevances)
 {
-  WithObserver(Update::MakeAll(), [this, &relevances]() {
+  WithObserver(Update::MakeAll(), [this, &relevances]()
+  {
     m_entries.resize(relevances.size());
     for (size_t i = 0; i < m_entries.size(); ++i)
     {
@@ -93,7 +95,8 @@ void ResultsEdits::Reset(vector<optional<ResultsEdits::Relevance>> const & relev
 
 bool ResultsEdits::SetRelevance(size_t index, Relevance relevance)
 {
-  return WithObserver(Update::MakeSingle(index), [this, index, relevance]() {
+  return WithObserver(Update::MakeSingle(index), [this, index, relevance]()
+  {
     CHECK_LESS(index, m_entries.size(), ());
 
     auto & entry = m_entries[index];
@@ -107,7 +110,8 @@ bool ResultsEdits::SetRelevance(size_t index, Relevance relevance)
 
 void ResultsEdits::SetAllRelevances(Relevance relevance)
 {
-  WithObserver(Update::MakeAll(), [this, relevance]() {
+  WithObserver(Update::MakeAll(), [this, relevance]()
+  {
     for (auto & entry : m_entries)
     {
       UpdateNumEdits(entry, relevance, m_numEdits);
@@ -119,7 +123,8 @@ void ResultsEdits::SetAllRelevances(Relevance relevance)
 void ResultsEdits::Add(Relevance relevance)
 {
   auto const index = m_entries.size();
-  WithObserver(Update::MakeAdd(index), [&]() {
+  WithObserver(Update::MakeAdd(index), [&]()
+  {
     m_entries.emplace_back(relevance, Entry::Type::Created);
     ++m_numEdits;
   });
@@ -127,7 +132,8 @@ void ResultsEdits::Add(Relevance relevance)
 
 void ResultsEdits::Delete(size_t index)
 {
-  return WithObserver(Update::MakeDelete(index), [this, index]() {
+  return WithObserver(Update::MakeDelete(index), [this, index]()
+  {
     CHECK_LESS(index, m_entries.size(), ());
 
     auto & entry = m_entries[index];
@@ -143,7 +149,8 @@ void ResultsEdits::Delete(size_t index)
 
 void ResultsEdits::Resurrect(size_t index)
 {
-  return WithObserver(Update::MakeResurrect(index), [this, index]() {
+  return WithObserver(Update::MakeResurrect(index), [this, index]()
+  {
     CHECK_LESS(index, m_entries.size(), ());
 
     auto & entry = m_entries[index];
@@ -186,13 +193,17 @@ ResultsEdits::Entry const & ResultsEdits::Get(size_t index) const
 
 void ResultsEdits::Clear()
 {
-  WithObserver(Update::MakeAll(), [this]() {
+  WithObserver(Update::MakeAll(), [this]()
+  {
     m_entries.clear();
     m_numEdits = 0;
   });
 }
 
-bool ResultsEdits::HasChanges() const { return m_numEdits != 0; }
+bool ResultsEdits::HasChanges() const
+{
+  return m_numEdits != 0;
+}
 
 bool ResultsEdits::HasChanges(size_t index) const
 {
diff --git a/libs/search/search_quality/assessment_tool/edits.hpp b/libs/search/search_quality/assessment_tool/edits.hpp
index f5bba5797..c09e9cbb5 100644
--- a/libs/search/search_quality/assessment_tool/edits.hpp
+++ b/libs/search/search_quality/assessment_tool/edits.hpp
@@ -44,9 +44,10 @@ public:
 
     Entry() = default;
     Entry(std::optional<Relevance> relevance, Type type)
-      : m_currRelevance(relevance), m_origRelevance(relevance), m_type(type)
-    {
-    }
+      : m_currRelevance(relevance)
+      , m_origRelevance(relevance)
+      , m_type(type)
+    {}
 
     std::optional<Relevance> m_currRelevance = {};
     std::optional<Relevance> m_origRelevance = {};
@@ -68,7 +69,7 @@ public:
     };
 
     Update() = default;
-    Update(Type type, size_t index): m_type(type), m_index(index) {}
+    Update(Type type, size_t index) : m_type(type), m_index(index) {}
 
     static Update MakeAll() { return {}; }
     static Update MakeSingle(size_t index) { return {Type::Single, index}; }
@@ -128,7 +129,6 @@ public:
 
   Entry const & Get(size_t index) const;
 
-
   void Clear();
   bool HasChanges() const;
   bool HasChanges(size_t index) const;
@@ -137,10 +137,11 @@ private:
   template <typename Fn>
   std::invoke_result_t<Fn> WithObserver(Update const & update, Fn && fn)
   {
-    SCOPE_GUARD(obsCall, ([this, &update]() {
-                  if (m_onUpdate)
-                    m_onUpdate(update);
-                }));
+    SCOPE_GUARD(obsCall, ([this, &update]()
+    {
+      if (m_onUpdate)
+        m_onUpdate(update);
+    }));
     return fn();
   }
 
diff --git a/libs/search/search_quality/assessment_tool/feature_info_dialog.cpp b/libs/search/search_quality/assessment_tool/feature_info_dialog.cpp
index 579580fdd..42a495ae6 100644
--- a/libs/search/search_quality/assessment_tool/feature_info_dialog.cpp
+++ b/libs/search/search_quality/assessment_tool/feature_info_dialog.cpp
@@ -32,8 +32,7 @@ QLabel * MakeSelectableLabel(string const & s)
 }  // namespace
 
 FeatureInfoDialog::FeatureInfoDialog(QWidget * parent, osm::MapObject const & mapObject,
-                                     search::ReverseGeocoder::Address const & address,
-                                     string const & locale)
+                                     search::ReverseGeocoder::Address const & address, string const & locale)
   : QDialog(parent)
 {
   auto * layout = new QGridLayout();
diff --git a/libs/search/search_quality/assessment_tool/feature_info_dialog.hpp b/libs/search/search_quality/assessment_tool/feature_info_dialog.hpp
index 0c975b15d..7b3177a60 100644
--- a/libs/search/search_quality/assessment_tool/feature_info_dialog.hpp
+++ b/libs/search/search_quality/assessment_tool/feature_info_dialog.hpp
@@ -15,15 +15,13 @@ class MapObject;
 class FeatureInfoDialog : public QDialog
 {
   Q_OBJECT
+
 public:
   FeatureInfoDialog(QWidget * parent, osm::MapObject const & mapObject,
                     search::ReverseGeocoder::Address const & address, std::string const & locale);
 
 private:
-  void AddElems(QGridLayout & layout, int row, int col, QWidget * widget)
-  {
-    layout.addWidget(widget, row, col);
-  }
+  void AddElems(QGridLayout & layout, int row, int col, QWidget * widget) { layout.addWidget(widget, row, col); }
 
   template <typename... Args>
   void AddElems(QGridLayout & layout, int row, int col, QWidget * widget, Args *... args)
diff --git a/libs/search/search_quality/assessment_tool/main_model.cpp b/libs/search/search_quality/assessment_tool/main_model.cpp
index 53e877a00..37b1cdd7d 100644
--- a/libs/search/search_quality/assessment_tool/main_model.cpp
+++ b/libs/search/search_quality/assessment_tool/main_model.cpp
@@ -26,20 +26,17 @@ MainModel::MainModel(Framework & framework)
   : m_framework(framework)
   , m_dataSource(m_framework.GetDataSource())
   , m_loader(m_dataSource)
-  , m_contexts(
-        [this](size_t sampleIndex, ResultsEdits::Update const & update) {
-          OnUpdate(View::ResultType::Found, sampleIndex, update);
-        },
-        [this](size_t sampleIndex, ResultsEdits::Update const & update) {
-          OnUpdate(View::ResultType::NonFound, sampleIndex, update);
-        },
-        [this](size_t sampleIndex) { OnSampleUpdate(sampleIndex); })
+  , m_contexts([this](size_t sampleIndex, ResultsEdits::Update const & update)
+{ OnUpdate(View::ResultType::Found, sampleIndex, update); },
+               [this](size_t sampleIndex, ResultsEdits::Update const & update)
+{ OnUpdate(View::ResultType::NonFound, sampleIndex, update); },
+               [this](size_t sampleIndex) { OnSampleUpdate(sampleIndex); })
   , m_runner(m_framework, m_dataSource, m_contexts,
-             [this](search::Results const & results) { UpdateViewOnResults(results); },
-             [this](size_t index) {
-               // Only the first parameter matters because we only change SearchStatus.
-               m_view->OnSampleChanged(index, false /* isUseless */, false /* hasEdits */);
-             })
+             [this](search::Results const & results) { UpdateViewOnResults(results); }, [this](size_t index)
+{
+  // Only the first parameter matters because we only change SearchStatus.
+  m_view->OnSampleChanged(index, false /* isUseless */, false /* hasEdits */);
+})
 {
   search::search_quality::CheckLocale();
 }
@@ -208,8 +205,7 @@ void MainModel::OnShowPositionClicked()
   auto boundingBox = m2::ApplyCalculator(points, m2::CalculateBoundingBox());
   boundingBox.Scale(kViewportAroundTopResultsScale);
 
-  auto const minRect =
-      mercator::RectByCenterXYAndSizeInMeters(boundingBox.Center(), kViewportAroundTopResultsSizeM);
+  auto const minRect = mercator::RectByCenterXYAndSizeInMeters(boundingBox.Center(), kViewportAroundTopResultsSizeM);
   m_view->MoveViewportToRect(m2::Add(boundingBox, minRect));
 }
 
@@ -223,7 +219,10 @@ void MainModel::OnMarkAllAsIrrelevantClicked()
   OnChangeAllRelevancesClicked(ResultsEdits::Relevance::Irrelevant);
 }
 
-bool MainModel::HasChanges() { return m_contexts.HasChanges(); }
+bool MainModel::HasChanges()
+{
+  return m_contexts.HasChanges();
+}
 
 bool MainModel::AlreadyInSamples(FeatureID const & id)
 {
@@ -232,7 +231,8 @@ bool MainModel::AlreadyInSamples(FeatureID const & id)
   CHECK_LESS(static_cast<size_t>(m_selectedSample), m_contexts.Size(), ());
 
   bool found = false;
-  ForAnyMatchingEntry(m_contexts[m_selectedSample], id, [&](ResultsEdits & edits, size_t index) {
+  ForAnyMatchingEntry(m_contexts[m_selectedSample], id, [&](ResultsEdits & edits, size_t index)
+  {
     auto const & entry = edits.GetEntry(index);
     if (!entry.m_deleted)
       found = true;
@@ -249,7 +249,8 @@ void MainModel::AddNonFoundResult(FeatureID const & id)
   auto & context = m_contexts[m_selectedSample];
 
   bool resurrected = false;
-  ForAnyMatchingEntry(context, id, [&](ResultsEdits & edits, size_t index) {
+  ForAnyMatchingEntry(context, id, [&](ResultsEdits & edits, size_t index)
+  {
     auto const & entry = edits.GetEntry(index);
     CHECK(entry.m_deleted, ());
     edits.Resurrect(index);
@@ -284,8 +285,7 @@ void MainModel::InitiateForegroundSearch(size_t index)
   m_view->OnSearchStarted();
 }
 
-void MainModel::OnUpdate(View::ResultType type, size_t sampleIndex,
-                         ResultsEdits::Update const & update)
+void MainModel::OnUpdate(View::ResultType type, size_t sampleIndex, ResultsEdits::Update const & update)
 {
   using Type = ResultsEdits::Update::Type;
 
@@ -295,18 +295,15 @@ void MainModel::OnUpdate(View::ResultType type, size_t sampleIndex,
   if (update.m_type == Type::Add)
   {
     CHECK_EQUAL(type, View::ResultType::NonFound, ());
-    m_view->ShowNonFoundResults(context.m_nonFoundResults,
-                                context.m_nonFoundResultsEdits.GetEntries());
-    m_view->SetResultsEdits(m_selectedSample, context.m_foundResultsEdits,
-                            context.m_nonFoundResultsEdits);
+    m_view->ShowNonFoundResults(context.m_nonFoundResults, context.m_nonFoundResultsEdits.GetEntries());
+    m_view->SetResultsEdits(m_selectedSample, context.m_foundResultsEdits, context.m_nonFoundResultsEdits);
   }
 
   m_view->OnResultChanged(sampleIndex, type, update);
   m_view->OnSampleChanged(sampleIndex, context.IsUseless(), context.HasChanges());
   m_view->OnSamplesChanged(m_contexts.HasChanges());
 
-  if (update.m_type == Type::Add || update.m_type == Type::Resurrect ||
-      update.m_type == Type::Delete)
+  if (update.m_type == Type::Add || update.m_type == Type::Resurrect || update.m_type == Type::Delete)
   {
     CHECK(context.m_initialized, ());
     CHECK_EQUAL(type, View::ResultType::NonFound, ());
@@ -333,18 +330,14 @@ void MainModel::UpdateViewOnResults(search::Results const & results)
 
   auto & context = m_contexts[m_selectedSample];
 
-  m_view->ShowNonFoundResults(context.m_nonFoundResults,
-                              context.m_nonFoundResultsEdits.GetEntries());
+  m_view->ShowNonFoundResults(context.m_nonFoundResults, context.m_nonFoundResultsEdits.GetEntries());
   m_view->ShowMarks(context);
-  m_view->OnResultChanged(m_selectedSample, View::ResultType::Found,
-                          ResultsEdits::Update::MakeAll());
-  m_view->OnResultChanged(m_selectedSample, View::ResultType::NonFound,
-                          ResultsEdits::Update::MakeAll());
+  m_view->OnResultChanged(m_selectedSample, View::ResultType::Found, ResultsEdits::Update::MakeAll());
+  m_view->OnResultChanged(m_selectedSample, View::ResultType::NonFound, ResultsEdits::Update::MakeAll());
   m_view->OnSampleChanged(m_selectedSample, context.IsUseless(), context.HasChanges());
   m_view->OnSamplesChanged(m_contexts.HasChanges());
 
-  m_view->SetResultsEdits(m_selectedSample, context.m_foundResultsEdits,
-                          context.m_nonFoundResultsEdits);
+  m_view->SetResultsEdits(m_selectedSample, context.m_foundResultsEdits, context.m_nonFoundResultsEdits);
   m_view->OnSearchCompleted();
 }
 
@@ -357,10 +350,8 @@ void MainModel::OnChangeAllRelevancesClicked(ResultsEdits::Relevance relevance)
   context.m_foundResultsEdits.SetAllRelevances(relevance);
   context.m_nonFoundResultsEdits.SetAllRelevances(relevance);
 
-  m_view->OnResultChanged(m_selectedSample, View::ResultType::Found,
-                          ResultsEdits::Update::MakeAll());
-  m_view->OnResultChanged(m_selectedSample, View::ResultType::NonFound,
-                          ResultsEdits::Update::MakeAll());
+  m_view->OnResultChanged(m_selectedSample, View::ResultType::Found, ResultsEdits::Update::MakeAll());
+  m_view->OnResultChanged(m_selectedSample, View::ResultType::NonFound, ResultsEdits::Update::MakeAll());
   m_view->OnSampleChanged(m_selectedSample, context.IsUseless(), context.HasChanges());
   m_view->OnSamplesChanged(m_contexts.HasChanges());
 }
diff --git a/libs/search/search_quality/assessment_tool/main_view.cpp b/libs/search/search_quality/assessment_tool/main_view.cpp
index 1740dbb0c..8c69e70bd 100644
--- a/libs/search/search_quality/assessment_tool/main_view.cpp
+++ b/libs/search/search_quality/assessment_tool/main_view.cpp
@@ -45,8 +45,7 @@ namespace
 char const kJSON[] = "JSON Lines files (*.jsonl)";
 }  // namespace
 
-MainView::MainView(Framework & framework, QRect const & screenGeometry)
-: m_framework(framework)
+MainView::MainView(Framework & framework, QRect const & screenGeometry) : m_framework(framework)
 {
   setGeometry(screenGeometry);
 
@@ -55,31 +54,28 @@ MainView::MainView(Framework & framework, QRect const & screenGeometry)
   InitDocks();
   InitMenuBar();
 
-  m_framework.SetPlacePageListeners(
-      [this]() {
-        auto const & info = m_framework.GetCurrentPlacePageInfo();
-        auto const & selectedFeature = info.GetID();
-        if (!selectedFeature.IsValid())
-          return;
-        m_selectedFeature = selectedFeature;
+  m_framework.SetPlacePageListeners([this]()
+  {
+    auto const & info = m_framework.GetCurrentPlacePageInfo();
+    auto const & selectedFeature = info.GetID();
+    if (!selectedFeature.IsValid())
+      return;
+    m_selectedFeature = selectedFeature;
 
-        if (m_skipFeatureInfoDialog)
-        {
-          m_skipFeatureInfoDialog = false;
-          return;
-        }
+    if (m_skipFeatureInfoDialog)
+    {
+      m_skipFeatureInfoDialog = false;
+      return;
+    }
 
-        auto mapObject = m_framework.GetMapObjectByID(selectedFeature);
-        if (!mapObject.GetID().IsValid())
-          return;
+    auto mapObject = m_framework.GetMapObjectByID(selectedFeature);
+    if (!mapObject.GetID().IsValid())
+      return;
 
-        auto const address = m_framework.GetAddressAtPoint(mapObject.GetMercator());
-        FeatureInfoDialog dialog(this /* parent */, mapObject, address, m_sampleLocale);
-        dialog.exec();
-      },
-      [this]() { m_selectedFeature = FeatureID(); },
-      {} /* onUpdate */,
-      {} /* onSwitchFullScreenMode */);
+    auto const address = m_framework.GetAddressAtPoint(mapObject.GetMercator());
+    FeatureInfoDialog dialog(this /* parent */, mapObject, address, m_sampleLocale);
+    dialog.exec();
+  }, [this]() { m_selectedFeature = FeatureID(); }, {} /* onUpdate */, {} /* onSwitchFullScreenMode */);
 }
 
 MainView::~MainView()
@@ -110,8 +106,8 @@ void MainView::OnSearchCompleted()
   m_sampleView->OnSearchCompleted();
 }
 
-void MainView::ShowSample(size_t sampleIndex, search::Sample const & sample,
-                          std::optional<m2::PointD> const & position, bool isUseless, bool hasEdits)
+void MainView::ShowSample(size_t sampleIndex, search::Sample const & sample, std::optional<m2::PointD> const & position,
+                          bool isUseless, bool hasEdits)
 {
   m_sampleLocale = sample.m_locale;
 
@@ -152,8 +148,7 @@ void MainView::MoveViewportToResult(search::Result const & result)
 void MainView::MoveViewportToResult(search::Sample::Result const & result)
 {
   int constexpr kViewportAroundResultSizeM = 100;
-  auto const rect =
-      mercator::RectByCenterXYAndSizeInMeters(result.m_pos, kViewportAroundResultSizeM);
+  auto const rect = mercator::RectByCenterXYAndSizeInMeters(result.m_pos, kViewportAroundResultSizeM);
   MoveViewportToRect(rect);
 }
 
@@ -162,8 +157,7 @@ void MainView::MoveViewportToRect(m2::RectD const & rect)
   m_framework.ShowRect(rect, -1 /* maxScale */, false /* animation */);
 }
 
-void MainView::OnResultChanged(size_t sampleIndex, ResultType type,
-                               ResultsEdits::Update const & update)
+void MainView::OnResultChanged(size_t sampleIndex, ResultType type, ResultsEdits::Update const & update)
 {
   m_samplesView->OnUpdate(sampleIndex);
 
@@ -202,9 +196,8 @@ void MainView::SetResultsEdits(size_t sampleIndex, ResultsEdits & foundResultsEd
 
 void MainView::ShowError(std::string const & msg)
 {
-  QMessageBox box(QMessageBox::Critical /* icon */, tr("Error") /* title */,
-                  QString::fromStdString(msg) /* text */, QMessageBox::Ok /* buttons */,
-                  this /* parent */);
+  QMessageBox box(QMessageBox::Critical /* icon */, tr("Error") /* title */, QString::fromStdString(msg) /* text */,
+                  QMessageBox::Ok /* buttons */, this /* parent */);
   box.exec();
 }
 
@@ -287,11 +280,9 @@ void MainView::InitMenuBar()
   {
     m_initiateBackgroundSearch = new QAction(tr("Initiate background search"), this /* parent */);
     m_initiateBackgroundSearch->setShortcut(static_cast<int>(Qt::CTRL) | static_cast<int>(Qt::Key_I));
-    m_initiateBackgroundSearch->setStatusTip(
-        tr("Search in the background for the queries from a selected range"));
+    m_initiateBackgroundSearch->setStatusTip(tr("Search in the background for the queries from a selected range"));
     m_initiateBackgroundSearch->setEnabled(false);
-    connect(m_initiateBackgroundSearch, &QAction::triggered, this,
-            &MainView::InitiateBackgroundSearch);
+    connect(m_initiateBackgroundSearch, &QAction::triggered, this, &MainView::InitiateBackgroundSearch);
     fileMenu->addAction(m_initiateBackgroundSearch);
   }
 
@@ -325,8 +316,7 @@ void MainView::InitMapWidget()
   widget->setLayout(layout);
 
   {
-    auto * mapWidget = new qt::common::MapWidget(m_framework,
-                                                 false /* screenshotMode */, widget /* parent */);
+    auto * mapWidget = new qt::common::MapWidget(m_framework, false /* screenshotMode */, widget /* parent */);
     connect(mapWidget, &qt::common::MapWidget::OnContextMenuRequested,
             [this](QPoint const & p) { AddSelectedFeature(p); });
     auto * toolBar = new QToolBar(widget /* parent */);
@@ -359,26 +349,21 @@ void MainView::InitDocks()
 
   m_sampleView = new SampleView(this /* parent */, m_framework);
 
-  connect(m_sampleView, &SampleView::OnShowViewportClicked,
-          [this]() { m_model->OnShowViewportClicked(); });
-  connect(m_sampleView, &SampleView::OnShowPositionClicked,
-          [this]() { m_model->OnShowPositionClicked(); });
+  connect(m_sampleView, &SampleView::OnShowViewportClicked, [this]() { m_model->OnShowViewportClicked(); });
+  connect(m_sampleView, &SampleView::OnShowPositionClicked, [this]() { m_model->OnShowPositionClicked(); });
 
-  connect(m_sampleView, &SampleView::OnMarkAllAsRelevantClicked,
-          [this]() { m_model->OnMarkAllAsRelevantClicked(); });
+  connect(m_sampleView, &SampleView::OnMarkAllAsRelevantClicked, [this]() { m_model->OnMarkAllAsRelevantClicked(); });
   connect(m_sampleView, &SampleView::OnMarkAllAsIrrelevantClicked,
           [this]() { m_model->OnMarkAllAsIrrelevantClicked(); });
 
   {
     auto const & view = m_sampleView->GetFoundResultsView();
-    connect(&view, &ResultsView::OnResultSelected,
-            [this](int index) { m_model->OnResultSelected(index); });
+    connect(&view, &ResultsView::OnResultSelected, [this](int index) { m_model->OnResultSelected(index); });
   }
 
   {
     auto const & view = m_sampleView->GetNonFoundResultsView();
-    connect(&view, &ResultsView::OnResultSelected,
-            [this](int index) { m_model->OnNonFoundResultSelected(index); });
+    connect(&view, &ResultsView::OnResultSelected, [this](int index) { m_model->OnNonFoundResultSelected(index); });
   }
 
   m_sampleDock = CreateDock(*m_sampleView);
@@ -395,8 +380,7 @@ void MainView::Open()
   if (TryToSaveEdits(tr("Save changes before opening samples?")) == SaveResult::Cancelled)
     return;
 
-  auto const name = QFileDialog::getOpenFileName(this /* parent */, tr("Open samples..."),
-                                                 QString() /* dir */, kJSON);
+  auto const name = QFileDialog::getOpenFileName(this /* parent */, tr("Open samples..."), QString() /* dir */, kJSON);
   auto const file = name.toStdString();
   if (file.empty())
     return;
@@ -404,12 +388,15 @@ void MainView::Open()
   m_model->Open(file);
 }
 
-void MainView::Save() { m_model->Save(); }
+void MainView::Save()
+{
+  m_model->Save();
+}
 
 void MainView::SaveAs()
 {
-  auto const name = QFileDialog::getSaveFileName(this /* parent */, tr("Save samples as..."),
-                                                 QString() /* dir */, kJSON);
+  auto const name =
+      QFileDialog::getSaveFileName(this /* parent */, tr("Save samples as..."), QString() /* dir */, kJSON);
   auto const file = name.toStdString();
   if (!file.empty())
     m_model->SaveAs(file);
@@ -432,8 +419,7 @@ void MainView::InitiateBackgroundSearch()
   form.addRow(new QLabel("Last"), lineEditTo);
   lineEditTo->setValidator(validator);
 
-  QDialogButtonBox buttonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal,
-                             &dialog);
+  QDialogButtonBox buttonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, &dialog);
   form.addRow(&buttonBox);
 
   connect(&buttonBox, &QDialogButtonBox::accepted, &dialog, &QDialog::accept);
@@ -457,8 +443,7 @@ void MainView::InitiateBackgroundSearch()
     return;
   }
 
-  m_model->InitiateBackgroundSearch(base::checked_cast<size_t>(from),
-                                    base::checked_cast<size_t>(to));
+  m_model->InitiateBackgroundSearch(base::checked_cast<size_t>(from), base::checked_cast<size_t>(to));
 }
 
 void MainView::SetSamplesDockTitle(bool hasEdits)
@@ -489,8 +474,7 @@ MainView::SaveResult MainView::TryToSaveEdits(QString const & msg)
     return SaveResult::NoEdits;
 
   QMessageBox box(QMessageBox::Question /* icon */, tr("Save edits?") /* title */, msg /* text */,
-                  QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel /* buttons */,
-                  this /* parent */);
+                  QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel /* buttons */, this /* parent */);
   auto const button = box.exec();
   switch (button)
   {
@@ -518,16 +502,14 @@ void MainView::AddSelectedFeature(QPoint const & p)
 
   QMenu menu;
   auto const * action = menu.addAction("Add to non-found results");
-  connect(action, &QAction::triggered,
-          [this, selectedFeature]() { m_model->AddNonFoundResult(selectedFeature); });
+  connect(action, &QAction::triggered, [this, selectedFeature]() { m_model->AddNonFoundResult(selectedFeature); });
   menu.exec(p);
 }
 
 QDockWidget * MainView::CreateDock(QWidget & widget)
 {
   auto * dock = new QDockWidget(QString(), this /* parent */, Qt::Widget);
-  dock->setFeatures(QDockWidget::DockWidgetClosable |
-                    QDockWidget::DockWidgetMovable |
+  dock->setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable |
                     QDockWidget::DockWidgetFloatable);
   dock->setWidget(&widget);
   return dock;
diff --git a/libs/search/search_quality/assessment_tool/main_view.hpp b/libs/search/search_quality/assessment_tool/main_view.hpp
index 93a5ff885..5a7e08851 100644
--- a/libs/search/search_quality/assessment_tool/main_view.hpp
+++ b/libs/search/search_quality/assessment_tool/main_view.hpp
@@ -17,9 +17,11 @@ namespace common
 {
 class MapWidget;
 }
-}
+}  // namespace qt
 
-class MainView : public QMainWindow, public View
+class MainView
+  : public QMainWindow
+  , public View
 {
   Q_OBJECT
 
@@ -31,9 +33,8 @@ public:
   void SetSamples(ContextList::SamplesSlice const & samples) override;
   void OnSearchStarted() override;
   void OnSearchCompleted() override;
-  void ShowSample(size_t sampleIndex, search::Sample const & sample,
-                  std::optional<m2::PointD> const & position, bool isUseless,
-                  bool hasEdits) override;
+  void ShowSample(size_t sampleIndex, search::Sample const & sample, std::optional<m2::PointD> const & position,
+                  bool isUseless, bool hasEdits) override;
 
   void AddFoundResults(search::Results const & results) override;
   void ShowNonFoundResults(std::vector<search::Sample::Result> const & results,
@@ -45,8 +46,7 @@ public:
   void MoveViewportToResult(search::Sample::Result const & result) override;
   void MoveViewportToRect(m2::RectD const & rect) override;
 
-  void OnResultChanged(size_t sampleIndex, ResultType type,
-                       ResultsEdits::Update const & update) override;
+  void OnResultChanged(size_t sampleIndex, ResultType type, ResultsEdits::Update const & update) override;
   void SetResultsEdits(size_t sampleIndex, ResultsEdits & foundResultsResultsEdits,
                        ResultsEdits & nonFoundResultsResultsEdits) override;
   void OnSampleChanged(size_t sampleIndex, bool isUseless, bool hasEdits) override;
diff --git a/libs/search/search_quality/assessment_tool/result_view.cpp b/libs/search/search_quality/assessment_tool/result_view.cpp
index 53b8b9a8d..27a78a0e1 100644
--- a/libs/search/search_quality/assessment_tool/result_view.cpp
+++ b/libs/search/search_quality/assessment_tool/result_view.cpp
@@ -46,8 +46,7 @@ string GetResultType(search::Result const & result)
 }
 }  // namespace
 
-ResultView::ResultView(string const & name, string const & type, string const & address,
-                       QWidget & parent)
+ResultView::ResultView(string const & name, string const & type, string const & address, QWidget & parent)
   : QWidget(&parent)
 {
   Init();
@@ -58,13 +57,11 @@ ResultView::ResultView(string const & name, string const & type, string const &
 
 ResultView::ResultView(search::Result const & result, QWidget & parent)
   : ResultView(result.GetString(), GetResultType(result), result.GetAddress(), parent)
-{
-}
+{}
 
 ResultView::ResultView(search::Sample::Result const & result, QWidget & parent)
   : ResultView(strings::ToUtf8(result.m_name), GetResultType(result), {} /* address */, parent)
-{
-}
+{}
 
 void ResultView::SetEditor(ResultsEdits::Editor && editor)
 {
@@ -84,17 +81,11 @@ void ResultView::Update()
   }
 
   if (m_editor->GetType() == ResultsEdits::Entry::Type::Created)
-  {
     setStyleSheet("#result {background: rgba(173, 223, 173, 50%)}");
-  }
   else if (m_editor->HasChanges())
-  {
     setStyleSheet("#result {background: rgba(255, 255, 200, 50%)}");
-  }
   else
-  {
     setStyleSheet("");
-  }
 
   UpdateRelevanceRadioButtons();
 }
diff --git a/libs/search/search_quality/assessment_tool/result_view.hpp b/libs/search/search_quality/assessment_tool/result_view.hpp
index 4e03d6900..8a8c75cf0 100644
--- a/libs/search/search_quality/assessment_tool/result_view.hpp
+++ b/libs/search/search_quality/assessment_tool/result_view.hpp
@@ -29,12 +29,10 @@ public:
   void Update();
 
 private:
-  ResultView(std::string const & name, std::string const & type, std::string const & address,
-             QWidget & parent);
+  ResultView(std::string const & name, std::string const & type, std::string const & address, QWidget & parent);
 
   void Init();
-  void SetContents(std::string const & name, std::string const & type,
-                   std::string const & address);
+  void SetContents(std::string const & name, std::string const & type, std::string const & address);
 
   QRadioButton * CreateRatioButton(std::string const & label, QLayout & layout);
   void OnRelevanceChanged();
diff --git a/libs/search/search_quality/assessment_tool/results_view.cpp b/libs/search/search_quality/assessment_tool/results_view.cpp
index e89e77424..5315ca811 100644
--- a/libs/search/search_quality/assessment_tool/results_view.cpp
+++ b/libs/search/search_quality/assessment_tool/results_view.cpp
@@ -11,17 +11,18 @@ ResultsView::ResultsView(QWidget & parent) : QListWidget(&parent)
 {
   setAlternatingRowColors(true);
 
-  connect(selectionModel(), &QItemSelectionModel::selectionChanged,
-          [&](QItemSelection const & current) {
-            auto const indexes = current.indexes();
-            for (auto const & index : indexes)
-              emit OnResultSelected(index.row());
-          });
-
-  connect(this, &ResultsView::itemClicked, [&](QListWidgetItem * item) {
-      auto const index = indexFromItem(item);
+  connect(selectionModel(), &QItemSelectionModel::selectionChanged, [&](QItemSelection const & current)
+  {
+    auto const indexes = current.indexes();
+    for (auto const & index : indexes)
       emit OnResultSelected(index.row());
-    });
+  });
+
+  connect(this, &ResultsView::itemClicked, [&](QListWidgetItem * item)
+  {
+    auto const index = indexFromItem(item);
+    emit OnResultSelected(index.row());
+  });
 }
 
 void ResultsView::Add(search::Result const & result)
diff --git a/libs/search/search_quality/assessment_tool/sample_view.cpp b/libs/search/search_quality/assessment_tool/sample_view.cpp
index 3b676c028..4b3c41d41 100644
--- a/libs/search/search_quality/assessment_tool/sample_view.cpp
+++ b/libs/search/search_quality/assessment_tool/sample_view.cpp
@@ -53,8 +53,7 @@ void SetVerticalStretch(QWidget & widget, int stretch)
 }
 }  // namespace
 
-SampleView::SampleView(QWidget * parent, Framework & framework)
-  : QWidget(parent), m_framework(framework)
+SampleView::SampleView(QWidget * parent, Framework & framework) : QWidget(parent), m_framework(framework)
 {
   m_framework.GetBookmarkManager().GetEditSession().SetIsVisible(UserMark::Type::SEARCH, true);
   m_framework.GetBookmarkManager().GetEditSession().SetIsVisible(UserMark::Type::COLORED, true);
@@ -96,8 +95,7 @@ SampleView::SampleView(QWidget * parent, Framework & framework)
   }
 
   {
-    auto * layout =
-        BuildSubLayout<QVBoxLayout>(*mainLayout, *this /* parent */, &m_relatedQueriesBox);
+    auto * layout = BuildSubLayout<QVBoxLayout>(*mainLayout, *this /* parent */, &m_relatedQueriesBox);
     SetVerticalStretch(*m_relatedQueriesBox, 1 /* stretch */);
 
     layout->addWidget(new QLabel(tr("Related queries")));
@@ -110,13 +108,11 @@ SampleView::SampleView(QWidget * parent, Framework & framework)
     auto * layout = BuildSubLayout<QHBoxLayout>(*mainLayout, *this /* parent */);
 
     m_markAllAsRelevant = new QPushButton(tr("Mark all as Relevant"), this /* parent */);
-    connect(m_markAllAsRelevant, &QPushButton::clicked,
-            [this]() { emit OnMarkAllAsRelevantClicked(); });
+    connect(m_markAllAsRelevant, &QPushButton::clicked, [this]() { emit OnMarkAllAsRelevantClicked(); });
     layout->addWidget(m_markAllAsRelevant);
 
     m_markAllAsIrrelevant = new QPushButton(tr("Mark all as Irrelevant"), this /* parent */);
-    connect(m_markAllAsIrrelevant, &QPushButton::clicked,
-            [this]() { emit OnMarkAllAsIrrelevantClicked(); });
+    connect(m_markAllAsIrrelevant, &QPushButton::clicked, [this]() { emit OnMarkAllAsIrrelevantClicked(); });
     layout->addWidget(m_markAllAsIrrelevant);
   }
 
@@ -128,8 +124,7 @@ SampleView::SampleView(QWidget * parent, Framework & framework)
   }
 
   {
-    auto * layout =
-        BuildSubLayout<QVBoxLayout>(*mainLayout, *this /* parent */, &m_foundResultsBox);
+    auto * layout = BuildSubLayout<QVBoxLayout>(*mainLayout, *this /* parent */, &m_foundResultsBox);
     SetVerticalStretch(*m_foundResultsBox, 4 /* stretch */);
 
     {
@@ -145,15 +140,15 @@ SampleView::SampleView(QWidget * parent, Framework & framework)
   }
 
   {
-    auto * layout =
-        BuildSubLayout<QVBoxLayout>(*mainLayout, *this /* parent */, &m_nonFoundResultsBox);
+    auto * layout = BuildSubLayout<QVBoxLayout>(*mainLayout, *this /* parent */, &m_nonFoundResultsBox);
     SetVerticalStretch(*m_nonFoundResultsBox, 2 /* stretch */);
 
     layout->addWidget(new QLabel(tr("Non found results")));
 
     m_nonFoundResults = new ResultsView(*this /* parent */);
     m_nonFoundResults->setContextMenuPolicy(Qt::CustomContextMenu);
-    connect(m_nonFoundResults, &ResultsView::customContextMenuRequested, [&](QPoint pos) {
+    connect(m_nonFoundResults, &ResultsView::customContextMenuRequested, [&](QPoint pos)
+    {
       pos = m_nonFoundResults->mapToGlobal(pos);
 
       auto const items = m_nonFoundResults->selectedItems();
@@ -176,8 +171,7 @@ SampleView::SampleView(QWidget * parent, Framework & framework)
   Clear();
 }
 
-void SampleView::SetContents(search::Sample const & sample,
-                             std::optional<m2::PointD> const & position)
+void SampleView::SetContents(search::Sample const & sample, std::optional<m2::PointD> const & position)
 {
   if (!sample.m_query.empty())
   {
@@ -305,8 +299,7 @@ void SampleView::ClearAllResults()
   ClearSearchResultMarks();
 }
 
-void SampleView::SetResultsEdits(ResultsEdits & resultsResultsEdits,
-                                 ResultsEdits & nonFoundResultsEdits)
+void SampleView::SetResultsEdits(ResultsEdits & resultsResultsEdits, ResultsEdits & nonFoundResultsEdits)
 {
   SetResultsEdits(*m_foundResults, resultsResultsEdits);
   SetResultsEdits(*m_nonFoundResults, nonFoundResultsEdits);
@@ -367,7 +360,10 @@ void SampleView::SetResultsEdits(ResultsView & results, ResultsEdits & edits)
     results.Get(i).SetEditor(ResultsEdits::Editor(edits, i));
 }
 
-void SampleView::OnRemoveNonFoundResult(int row) { m_nonFoundResultsEdits->Delete(row); }
+void SampleView::OnRemoveNonFoundResult(int row)
+{
+  m_nonFoundResultsEdits->Delete(row);
+}
 
 void SampleView::ShowUserPosition(m2::PointD const & position)
 {
diff --git a/libs/search/search_quality/assessment_tool/sample_view.hpp b/libs/search/search_quality/assessment_tool/sample_view.hpp
index 4231ab74a..408b2ff5b 100644
--- a/libs/search/search_quality/assessment_tool/sample_view.hpp
+++ b/libs/search/search_quality/assessment_tool/sample_view.hpp
@@ -42,8 +42,7 @@ public:
                                 std::vector<ResultsEdits::Entry> const & entries);
   void ClearSearchResultMarks();
 
-  void SetResultsEdits(ResultsEdits & resultsResultsEdits,
-                       ResultsEdits & nonFoundResultsResultsEdits);
+  void SetResultsEdits(ResultsEdits & resultsResultsEdits, ResultsEdits & nonFoundResultsResultsEdits);
 
   void OnUselessnessChanged(bool isUseless);
 
diff --git a/libs/search/search_quality/assessment_tool/samples_view.cpp b/libs/search/search_quality/assessment_tool/samples_view.cpp
index 919447579..29ace0bc7 100644
--- a/libs/search/search_quality/assessment_tool/samples_view.cpp
+++ b/libs/search/search_quality/assessment_tool/samples_view.cpp
@@ -7,17 +7,14 @@
 
 #include <string>
 
+#include <QtGui/QAction>
 #include <QtGui/QContextMenuEvent>
 #include <QtGui/QStandardItem>
-#include <QtGui/QAction>
 #include <QtWidgets/QHeaderView>
 #include <QtWidgets/QMenu>
 
 // SamplesView::Model ------------------------------------------------------------------------------
-SamplesView::Model::Model(QWidget * parent)
-  : QStandardItemModel(0 /* rows */, 1 /* columns */, parent)
-{
-}
+SamplesView::Model::Model(QWidget * parent) : QStandardItemModel(0 /* rows */, 1 /* columns */, parent) {}
 
 QVariant SamplesView::Model::data(QModelIndex const & index, int role) const
 {
diff --git a/libs/search/search_quality/assessment_tool/search_request_runner.cpp b/libs/search/search_quality/assessment_tool/search_request_runner.cpp
index c608e1ce8..063be46aa 100644
--- a/libs/search/search_quality/assessment_tool/search_request_runner.cpp
+++ b/libs/search/search_quality/assessment_tool/search_request_runner.cpp
@@ -11,8 +11,7 @@
 
 using namespace std;
 
-SearchRequestRunner::SearchRequestRunner(Framework & framework, DataSource const & dataSource,
-                                         ContextList & contexts,
+SearchRequestRunner::SearchRequestRunner(Framework & framework, DataSource const & dataSource, ContextList & contexts,
                                          UpdateViewOnResults && updateViewOnResults,
                                          UpdateSampleSearchState && updateSampleSearchState)
   : m_framework(framework)
@@ -20,8 +19,7 @@ SearchRequestRunner::SearchRequestRunner(Framework & framework, DataSource const
   , m_contexts(contexts)
   , m_updateViewOnResults(std::move(updateViewOnResults))
   , m_updateSampleSearchState(std::move(updateSampleSearchState))
-{
-}
+{}
 
 void SearchRequestRunner::InitiateForegroundSearch(size_t index)
 {
@@ -33,8 +31,7 @@ void SearchRequestRunner::InitiateBackgroundSearch(size_t from, size_t to)
   // 1 <= from <= to <= m_contexts.Size().
   if (from < 1 || from > to || to > m_contexts.Size())
   {
-    LOG(LINFO,
-        ("Could not initiate search in the range", from, to, "Total samples:", m_contexts.Size()));
+    LOG(LINFO, ("Could not initiate search in the range", from, to, "Total samples:", m_contexts.Size()));
     return;
   }
 
@@ -163,12 +160,11 @@ void SearchRequestRunner::RunRequest(size_t index, bool background, size_t times
         }
       }
 
-      LOG(LINFO, ("Request number", index + 1, "has been processed in the",
-                  background ? "background" : "foreground"));
+      LOG(LINFO, ("Request number", index + 1, "has been processed in the", background ? "background" : "foreground"));
     }
 
-    GetPlatform().RunTask(Platform::Thread::Gui, [this, background, timestamp, index, results,
-                                                  relevances, goldenMatching, actualMatching]
+    GetPlatform().RunTask(Platform::Thread::Gui,
+                          [this, background, timestamp, index, results, relevances, goldenMatching, actualMatching]
     {
       size_t const latestTimestamp = background ? m_backgroundTimestamp : m_foregroundTimestamp;
       if (timestamp != latestTimestamp)
@@ -239,23 +235,19 @@ void SearchRequestRunner::RunRequest(size_t index, bool background, size_t times
 
 void SearchRequestRunner::PrintBackgroundSearchStats() const
 {
-  LOG(LINFO, ("All requests from", m_backgroundFirstIndex + 1, "to", m_backgroundLastIndex + 1,
-              "have been processed"));
+  LOG(LINFO, ("All requests from", m_backgroundFirstIndex + 1, "to", m_backgroundLastIndex + 1, "have been processed"));
 
   vector<size_t> vitals;
   vitals.reserve(m_backgroundLastIndex - m_backgroundFirstIndex + 1);
   for (size_t index = m_backgroundFirstIndex; index <= m_backgroundLastIndex; ++index)
   {
     auto const & entries = m_contexts[index].m_foundResultsEdits.GetEntries();
-    bool const foundVital =
-        any_of(entries.begin(), entries.end(), [](ResultsEdits::Entry const & e) {
-          return e.m_currRelevance == search::Sample::Result::Relevance::Vital;
-        });
+    bool const foundVital = any_of(entries.begin(), entries.end(), [](ResultsEdits::Entry const & e)
+    { return e.m_currRelevance == search::Sample::Result::Relevance::Vital; });
     if (foundVital)
       vitals.emplace_back(index + 1);
   }
 
-  LOG(LINFO, ("Vital results found:", vitals.size(), "out of",
-              m_backgroundLastIndex - m_backgroundFirstIndex + 1));
+  LOG(LINFO, ("Vital results found:", vitals.size(), "out of", m_backgroundLastIndex - m_backgroundFirstIndex + 1));
   LOG(LINFO, ("Vital results found for these queries (1-based):", vitals));
 }
diff --git a/libs/search/search_quality/assessment_tool/search_request_runner.hpp b/libs/search/search_quality/assessment_tool/search_request_runner.hpp
index e1b45bdfb..24907302c 100644
--- a/libs/search/search_quality/assessment_tool/search_request_runner.hpp
+++ b/libs/search/search_quality/assessment_tool/search_request_runner.hpp
@@ -25,8 +25,7 @@ public:
   using UpdateSampleSearchState = std::function<void(size_t index)>;
 
   SearchRequestRunner(Framework & framework, DataSource const & dataSource, ContextList & contexts,
-                      UpdateViewOnResults && updateViewOnResults,
-                      UpdateSampleSearchState && updateSampleSearchState);
+                      UpdateViewOnResults && updateViewOnResults, UpdateSampleSearchState && updateSampleSearchState);
 
   void InitiateForegroundSearch(size_t index);
 
diff --git a/libs/search/search_quality/assessment_tool/view.hpp b/libs/search/search_quality/assessment_tool/view.hpp
index 8e19e3bd1..da02928f2 100644
--- a/libs/search/search_quality/assessment_tool/view.hpp
+++ b/libs/search/search_quality/assessment_tool/view.hpp
@@ -32,9 +32,8 @@ public:
   virtual void SetSamples(ContextList::SamplesSlice const & samples) = 0;
   virtual void OnSearchStarted() = 0;
   virtual void OnSearchCompleted() = 0;
-  virtual void ShowSample(size_t index, search::Sample const & sample,
-                          std::optional<m2::PointD> const & position, bool isUseless,
-                          bool hasEdits) = 0;
+  virtual void ShowSample(size_t index, search::Sample const & sample, std::optional<m2::PointD> const & position,
+                          bool isUseless, bool hasEdits) = 0;
 
   virtual void AddFoundResults(search::Results const & results) = 0;
   virtual void ShowNonFoundResults(std::vector<search::Sample::Result> const & results,
@@ -46,10 +45,8 @@ public:
   virtual void MoveViewportToResult(search::Sample::Result const & result) = 0;
   virtual void MoveViewportToRect(m2::RectD const & rect) = 0;
 
-  virtual void OnResultChanged(size_t sampleIndex, ResultType type,
-                               ResultsEdits::Update const & update) = 0;
-  virtual void SetResultsEdits(size_t index, ResultsEdits & foundResultsEdits,
-                               ResultsEdits & nonFoundResultsEdits) = 0;
+  virtual void OnResultChanged(size_t sampleIndex, ResultType type, ResultsEdits::Update const & update) = 0;
+  virtual void SetResultsEdits(size_t index, ResultsEdits & foundResultsEdits, ResultsEdits & nonFoundResultsEdits) = 0;
   virtual void OnSampleChanged(size_t sampleIndex, bool isUseless, bool hasEdits) = 0;
   virtual void OnSamplesChanged(bool hasEdits) = 0;
 
diff --git a/libs/search/search_quality/features_collector_tool/features_collector_tool.cpp b/libs/search/search_quality/features_collector_tool/features_collector_tool.cpp
index c5aaa82c9..ddc151286 100644
--- a/libs/search/search_quality/features_collector_tool/features_collector_tool.cpp
+++ b/libs/search/search_quality/features_collector_tool/features_collector_tool.cpp
@@ -62,10 +62,8 @@ void DisplayStats(ostream & os, vector<Sample> const & samples, vector<Stats> co
 
   size_t numWarnings = 0;
   for (auto const & stat : stats)
-  {
     if (!stat.m_notFound.empty())
       ++numWarnings;
-  }
 
   if (numWarnings == 0)
   {
@@ -175,12 +173,10 @@ int main(int argc, char * argv[])
     auto & s = stats[i];
     for (size_t j = 0; j < goldenMatching.size(); ++j)
     {
-      auto const wasNotFound =
-          goldenMatching[j] == Matcher::kInvalidId ||
-          goldenMatching[j] >= search::SearchParams::kDefaultNumResultsEverywhere;
-      auto const isRelevant =
-          sample.m_results[j].m_relevance == Sample::Result::Relevance::Relevant ||
-          sample.m_results[j].m_relevance == Sample::Result::Relevance::Vital;
+      auto const wasNotFound = goldenMatching[j] == Matcher::kInvalidId ||
+                               goldenMatching[j] >= search::SearchParams::kDefaultNumResultsEverywhere;
+      auto const isRelevant = sample.m_results[j].m_relevance == Sample::Result::Relevance::Relevant ||
+                              sample.m_results[j].m_relevance == Sample::Result::Relevance::Vital;
       if (wasNotFound && isRelevant)
         s.m_notFound.push_back(j);
     }
diff --git a/libs/search/search_quality/helpers.cpp b/libs/search/search_quality/helpers.cpp
index d427c3bd1..19456d672 100644
--- a/libs/search/search_quality/helpers.cpp
+++ b/libs/search/search_quality/helpers.cpp
@@ -34,10 +34,8 @@ uint64_t ReadVersionFromHeader(platform::LocalCountryFile const & mwm)
 {
   vector<string> const kSpecialFiles = {WORLD_FILE_NAME, WORLD_COASTS_FILE_NAME};
   for (auto const & name : kSpecialFiles)
-  {
     if (mwm.GetCountryName() == name)
       return mwm.GetVersion();
-  }
 
   return version::MwmVersion::Read(FilesContainerR(mwm.GetPath(MapFileType::Map))).GetVersion();
 }
@@ -59,8 +57,7 @@ void CheckLocale()
     auto root = base::NewJSONObject();
     ToJSONObject(*root, "coord", coord);
 
-    unique_ptr<char, JSONFreeDeleter> buffer(
-        json_dumps(root.get(), JSON_COMPACT));
+    unique_ptr<char, JSONFreeDeleter> buffer(json_dumps(root.get(), JSON_COMPACT));
 
     line.append(buffer.get());
   }
@@ -105,11 +102,10 @@ void SetPlatformDirs(string const & dataPath, string const & mwmPath)
 
 void InitViewport(string viewportName, m2::RectD & viewport)
 {
-  map<string, m2::RectD> const kViewports = {
-      {"default", m2::RectD(m2::PointD(0.0, 0.0), m2::PointD(1.0, 1.0))},
-      {"moscow", mercator::RectByCenterLatLonAndSizeInMeters(55.7, 37.7, 5000)},
-      {"london", mercator::RectByCenterLatLonAndSizeInMeters(51.5, 0.0, 5000)},
-      {"zurich", mercator::RectByCenterLatLonAndSizeInMeters(47.4, 8.5, 5000)}};
+  map<string, m2::RectD> const kViewports = {{"default", m2::RectD(m2::PointD(0.0, 0.0), m2::PointD(1.0, 1.0))},
+                                             {"moscow", mercator::RectByCenterLatLonAndSizeInMeters(55.7, 37.7, 5000)},
+                                             {"london", mercator::RectByCenterLatLonAndSizeInMeters(51.5, 0.0, 5000)},
+                                             {"zurich", mercator::RectByCenterLatLonAndSizeInMeters(47.4, 8.5, 5000)}};
 
   auto it = kViewports.find(viewportName);
   if (it == kViewports.end())
@@ -135,8 +131,7 @@ void InitDataSource(FrozenDataSource & dataSource, string const & mwmListPath)
   }
   else
   {
-    platform::FindAllLocalMapsAndCleanup(numeric_limits<int64_t>::max() /* the latest version */,
-                                         mwms);
+    platform::FindAllLocalMapsAndCleanup(numeric_limits<int64_t>::max() /* the latest version */, mwms);
   }
 
   LOG(LINFO, ("Initializing the data source with the following mwms:"));
@@ -149,8 +144,8 @@ void InitDataSource(FrozenDataSource & dataSource, string const & mwmListPath)
   LOG(LINFO, ());
 }
 
-unique_ptr<search::tests_support::TestSearchEngine> InitSearchEngine(
-    DataSource & dataSource, string const & locale, size_t numThreads)
+unique_ptr<search::tests_support::TestSearchEngine> InitSearchEngine(DataSource & dataSource, string const & locale,
+                                                                     size_t numThreads)
 {
   search::Engine::Params params;
   params.m_locale = locale;
diff --git a/libs/search/search_quality/helpers.hpp b/libs/search/search_quality/helpers.hpp
index a37248de4..49d6ec330 100644
--- a/libs/search/search_quality/helpers.hpp
+++ b/libs/search/search_quality/helpers.hpp
@@ -28,7 +28,8 @@ void InitViewport(std::string viewportName, m2::RectD & viewport);
 
 void InitDataSource(FrozenDataSource & dataSource, std::string const & mwmListPath);
 
-std::unique_ptr<search::tests_support::TestSearchEngine> InitSearchEngine(
-    DataSource & dataSource, std::string const & locale, size_t numThreads);
+std::unique_ptr<search::tests_support::TestSearchEngine> InitSearchEngine(DataSource & dataSource,
+                                                                          std::string const & locale,
+                                                                          size_t numThreads);
 }  // namespace search_quality
 }  // namespace search
diff --git a/libs/search/search_quality/helpers_json.hpp b/libs/search/search_quality/helpers_json.hpp
index 16f906bab..7f59d0d1a 100644
--- a/libs/search/search_quality/helpers_json.hpp
+++ b/libs/search/search_quality/helpers_json.hpp
@@ -18,8 +18,7 @@ void ToJSONObject(json_t & root, std::string const & field, RectD const & rect);
 void FromJSONObject(json_t * root, char const * field, PointD & point);
 void FromJSONObjectOptional(json_t * root, char const * field, std::optional<PointD> & point);
 void FromJSONObject(json_t * root, std::string const & field, PointD & point);
-void FromJSONObjectOptional(json_t * root, std::string const & field,
-                            std::optional<PointD> & point);
+void FromJSONObjectOptional(json_t * root, std::string const & field, std::optional<PointD> & point);
 
 void ToJSONObject(json_t & root, char const * field, PointD const & point);
 void ToJSONObject(json_t & root, std::string const & field, PointD const & point);
diff --git a/libs/search/search_quality/matcher.cpp b/libs/search/search_quality/matcher.cpp
index 3be55aa69..81ff80dd0 100644
--- a/libs/search/search_quality/matcher.cpp
+++ b/libs/search/search_quality/matcher.cpp
@@ -61,10 +61,7 @@ bool EndsWithHouseNumber(Iter beg, Iter end)
 std::vector<std::string> NormalizeAndTokenizeAsUtf8(std::string_view str)
 {
   std::vector<std::string> res;
-  ForEachNormalizedToken(str, [&res](strings::UniString const & token)
-  {
-    res.push_back(strings::ToUtf8(token));
-  });
+  ForEachNormalizedToken(str, [&res](strings::UniString const & token) { res.push_back(strings::ToUtf8(token)); });
   return res;
 }
 
@@ -136,8 +133,7 @@ void Matcher::Match(Sample const & goldenSample, std::vector<Result> const & act
   }
 }
 
-bool Matcher::Matches(strings::UniString const & query, Sample::Result const & golden,
-                      search::Result const & actual)
+bool Matcher::Matches(strings::UniString const & query, Sample::Result const & golden, search::Result const & actual)
 {
   if (actual.GetResultType() != Result::Type::Feature)
     return false;
@@ -149,8 +145,7 @@ bool Matcher::Matches(strings::UniString const & query, Sample::Result const & g
   return Matches(query, golden, *ft);
 }
 
-bool Matcher::Matches(strings::UniString const & query, Sample::Result const & golden,
-                      FeatureType & ft)
+bool Matcher::Matches(strings::UniString const & query, Sample::Result const & golden, FeatureType & ft)
 {
   auto const queryTokens = NormalizeAndTokenizeAsUtf8(ToUtf8(query));
 
@@ -188,8 +183,7 @@ bool Matcher::Matches(strings::UniString const & query, Sample::Result const & g
       return base::ControlFlow::Break;
     }
 
-    if (golden.m_name.empty() && ft.GetGeomType() == feature::GeomType::Line &&
-        StreetMatches(name, queryTokens))
+    if (golden.m_name.empty() && ft.GetGeomType() == feature::GeomType::Line && StreetMatches(name, queryTokens))
     {
       nameMatches = true;
       return base::ControlFlow::Break;
diff --git a/libs/search/search_quality/matcher.hpp b/libs/search/search_quality/matcher.hpp
index db4a4528c..b49c1d582 100644
--- a/libs/search/search_quality/matcher.hpp
+++ b/libs/search/search_quality/matcher.hpp
@@ -29,11 +29,10 @@ public:
   // the sample result number i.
   // actualMatching[j] is the index of the sample in |golden| that matches
   // the golden result number j.
-  void Match(Sample const & goldenSample, std::vector<Result> const & actual,
-             std::vector<size_t> & goldenMatching, std::vector<size_t> & actualMatching);
+  void Match(Sample const & goldenSample, std::vector<Result> const & actual, std::vector<size_t> & goldenMatching,
+             std::vector<size_t> & actualMatching);
 
-  bool Matches(strings::UniString const & query, Sample::Result const & golden,
-               Result const & actual);
+  bool Matches(strings::UniString const & query, Sample::Result const & golden, Result const & actual);
   bool Matches(strings::UniString const & query, Sample::Result const & golden, FeatureType & ft);
 
 private:
diff --git a/libs/search/search_quality/sample.cpp b/libs/search/search_quality/sample.cpp
index 4d6c9bba1..410fce3ea 100644
--- a/libs/search/search_quality/sample.cpp
+++ b/libs/search/search_quality/sample.cpp
@@ -120,7 +120,10 @@ bool Sample::operator<(Sample const & rhs) const
   return Less(m_relatedQueries, rhs.m_relatedQueries);
 }
 
-bool Sample::operator==(Sample const & rhs) const { return !(*this < rhs) && !(rhs < *this); }
+bool Sample::operator==(Sample const & rhs) const
+{
+  return !(*this < rhs) && !(rhs < *this);
+}
 
 // static
 bool Sample::DeserializeFromJSONLines(string const & lines, vector<Sample> & samples)
@@ -149,8 +152,7 @@ void Sample::SerializeToJSONLines(vector<Sample> const & samples, string & lines
 {
   for (auto const & sample : samples)
   {
-    unique_ptr<char, JSONFreeDeleter> buffer(
-        json_dumps(sample.SerializeToJSON().get(), JSON_COMPACT));
+    unique_ptr<char, JSONFreeDeleter> buffer(json_dumps(sample.SerializeToJSON().get(), JSON_COMPACT));
     lines.append(buffer.get());
     lines.push_back('\n');
   }
@@ -189,7 +191,7 @@ void Sample::FillSearchParams(search::SearchParams & params) const
   params.m_needAddress = true;
   params.m_suggestsEnabled = false;
   params.m_needHighlighting = false;
-  params.m_useDebugInfo = true;     // for RankingInfo printing
+  params.m_useDebugInfo = true;  // for RankingInfo printing
 }
 
 void FromJSONObject(json_t * root, char const * field, Sample::Result::Relevance & relevance)
diff --git a/libs/search/search_quality/sample.hpp b/libs/search/search_quality/sample.hpp
index 8803075f8..dd1074602 100644
--- a/libs/search/search_quality/sample.hpp
+++ b/libs/search/search_quality/sample.hpp
@@ -93,11 +93,9 @@ struct Sample
   bool m_useless = false;
 };
 
-void FromJSONObject(json_t * root, char const * field,
-                    Sample::Result::Relevance & relevance);
+void FromJSONObject(json_t * root, char const * field, Sample::Result::Relevance & relevance);
 void ToJSONObject(json_t & root, char const * field, Sample::Result::Relevance relevance);
-void FromJSONObject(json_t * root, std::string const & field,
-                    Sample::Result::Relevance & relevance);
+void FromJSONObject(json_t * root, std::string const & field, Sample::Result::Relevance & relevance);
 void ToJSONObject(json_t & root, std::string const & field, Sample::Result::Relevance relevance);
 
 void FromJSON(json_t * root, Sample::Result & result);
diff --git a/libs/search/search_quality/samples_generation_tool/samples_generation_tool.cpp b/libs/search/search_quality/samples_generation_tool/samples_generation_tool.cpp
index dd5d391b4..5bdce8992 100644
--- a/libs/search/search_quality/samples_generation_tool/samples_generation_tool.cpp
+++ b/libs/search/search_quality/samples_generation_tool/samples_generation_tool.cpp
@@ -21,7 +21,7 @@
 #include "base/string_utils.hpp"
 
 #include <algorithm>
-#include <cstring>    // strlen
+#include <cstring>  // strlen
 #include <fstream>
 #include <map>
 #include <random>
@@ -45,8 +45,7 @@ DEFINE_string(data_path, "", "Path to data directory (resources dir).");
 DEFINE_string(mwm_path, "", "Path to mwm files (writable dir).");
 DEFINE_string(out_buildings_path, "buildings.json", "Path to output file for buildings samples.");
 DEFINE_string(out_cafes_path, "cafes.json", "Path to output file for cafes samples.");
-DEFINE_double(max_distance_to_object, kMaxDistanceToObjectM,
-              "Maximal distance from user position to object (meters).");
+DEFINE_double(max_distance_to_object, kMaxDistanceToObjectM, "Maximal distance from user position to object (meters).");
 DEFINE_double(min_viewport_size, kMinViewportSizeM, "Minimal size of viewport (meters).");
 DEFINE_double(max_viewport_size, kMaxViewportSizeM, "Maximal size of viewport (meters).");
 DEFINE_uint64(max_samples_per_mwm, kMaxSamplesPerMwm,
@@ -122,38 +121,34 @@ void AddMisprints(string & str)
   }
 }
 
-map<string, vector<string>> const kStreetSynonyms = {
-    {"улица", {"ул", "у"}},
-    {"проспект", {"пр-т", "пр", "пркт", "прт", "пр-кт"}},
-    {"переулок", {"пер"}},
-    {"проезд", {"пр-д", "пр", "прд"}},
-    {"аллея", {"ал"}},
-    {"бульвар", {"б-р", "бр"}},
-    {"набережная", {"наб", "наб-я"}},
-    {"шоссе", {"шос"}},
-    {"вyлица", {"вул"}},
-    {"площадь", {"пл", "площ"}},
-    {"тупик", {"туп"}},
-    {"street", {"str", "st"}},
-    {"avenue", {"ave", "av"}},
-    {"boulevard", {"bld", "blv", "bv", "blvd"}},
-    {"drive", {"dr"}},
-    {"highway", {"hw", "hwy"}},
-    {"road", {"rd"}},
-    {"square", {"sq"}}};
+map<string, vector<string>> const kStreetSynonyms = {{"улица", {"ул", "у"}},
+                                                     {"проспект", {"пр-т", "пр", "пркт", "прт", "пр-кт"}},
+                                                     {"переулок", {"пер"}},
+                                                     {"проезд", {"пр-д", "пр", "прд"}},
+                                                     {"аллея", {"ал"}},
+                                                     {"бульвар", {"б-р", "бр"}},
+                                                     {"набережная", {"наб", "наб-я"}},
+                                                     {"шоссе", {"шос"}},
+                                                     {"вyлица", {"вул"}},
+                                                     {"площадь", {"пл", "площ"}},
+                                                     {"тупик", {"туп"}},
+                                                     {"street", {"str", "st"}},
+                                                     {"avenue", {"ave", "av"}},
+                                                     {"boulevard", {"bld", "blv", "bv", "blvd"}},
+                                                     {"drive", {"dr"}},
+                                                     {"highway", {"hw", "hwy"}},
+                                                     {"road", {"rd"}},
+                                                     {"square", {"sq"}}};
 
 void ModifyStreet(string & str)
 {
   auto tokens = strings::Tokenize<std::string>(str, " -&");
   str.clear();
 
-  auto const isStreetSynonym = [](string const & s) {
-    return kStreetSynonyms.find(s) != kStreetSynonyms.end();
-  };
+  auto const isStreetSynonym = [](string const & s) { return kStreetSynonyms.find(s) != kStreetSynonyms.end(); };
 
   auto const synonymIt = find_if(tokens.begin(), tokens.end(), isStreetSynonym);
-  if (synonymIt != tokens.end() &&
-      find_if(synonymIt + 1, tokens.end(), isStreetSynonym) == tokens.end())
+  if (synonymIt != tokens.end() && find_if(synonymIt + 1, tokens.end(), isStreetSynonym) == tokens.end())
   {
     // Only one street synonym.
     if (GetRandomBool())
@@ -226,8 +221,8 @@ bool GetBuildingInfo(FeatureType & ft, search::ReverseGeocoder const & coder, st
   return true;
 }
 
-bool GetCafeInfo(FeatureType & ft, search::ReverseGeocoder const & coder, string & street,
-                 uint32_t & cafeType, string_view & name)
+bool GetCafeInfo(FeatureType & ft, search::ReverseGeocoder const & coder, string & street, uint32_t & cafeType,
+                 string_view & name)
 {
   if (!ft.HasName())
     return false;
@@ -277,8 +272,8 @@ void ModifyCafe(string const & name, string const & type, string & out)
   AddMisprints(out);
 }
 
-string_view GetLocalizedCafeType(unordered_map<uint32_t, StringUtf8Multilang> const & typesTranslations,
-                                 uint32_t type, uint8_t lang)
+string_view GetLocalizedCafeType(unordered_map<uint32_t, StringUtf8Multilang> const & typesTranslations, uint32_t type,
+                                 uint8_t lang)
 {
   auto const it = typesTranslations.find(type);
   if (it == typesTranslations.end())
@@ -290,10 +285,9 @@ string_view GetLocalizedCafeType(unordered_map<uint32_t, StringUtf8Multilang> co
   return translation;
 }
 
-optional<Sample> GenerateRequest(
-    FeatureType & ft, search::ReverseGeocoder const & coder,
-    unordered_map<uint32_t, StringUtf8Multilang> const & typesTranslations,
-    vector<int8_t> const & mwmLangCodes, RequestType requestType)
+optional<Sample> GenerateRequest(FeatureType & ft, search::ReverseGeocoder const & coder,
+                                 unordered_map<uint32_t, StringUtf8Multilang> const & typesTranslations,
+                                 vector<int8_t> const & mwmLangCodes, RequestType requestType)
 {
   string street;
   string cafeStr;
@@ -338,8 +332,7 @@ optional<Sample> GenerateRequest(
 
 unordered_map<uint32_t, StringUtf8Multilang> ParseStrings()
 {
-  auto const stringsFile =
-      base::JoinPath(GetPlatform().ResourcesDir(), "strings", "types_strings.txt");
+  auto const stringsFile = base::JoinPath(GetPlatform().ResourcesDir(), "strings", "types_strings.txt");
   ifstream s(stringsFile);
   CHECK(s.is_open(), ("Cannot open", stringsFile));
 
@@ -430,13 +423,13 @@ int main(int argc, char * argv[])
     base::Cancellable const cancellable;
     FeaturesLoaderGuard g(dataSource, mwmId);
 
-    auto generate = [&](ftypes::BaseChecker const & checker, RequestType type, ofstream & out) {
+    auto generate = [&](ftypes::BaseChecker const & checker, RequestType type, ofstream & out)
+    {
       CategoriesCache cache(checker, cancellable);
       auto features = cache.Get(mwmContext);
 
       vector<uint32_t> fids;
-      features.ForEach(
-          [&fids](uint64_t fid) { fids.push_back(base::asserted_cast<uint32_t>(fid)); });
+      features.ForEach([&fids](uint64_t fid) { fids.push_back(base::asserted_cast<uint32_t>(fid)); });
       shuffle(fids.begin(), fids.end(), g_rng);
 
       size_t numSamples = 0;
diff --git a/libs/search/search_quality/search_quality_tests/benchmark_tests.cpp b/libs/search/search_quality/search_quality_tests/benchmark_tests.cpp
index b079d6030..7b8755311 100644
--- a/libs/search/search_quality/search_quality_tests/benchmark_tests.cpp
+++ b/libs/search/search_quality/search_quality_tests/benchmark_tests.cpp
@@ -11,10 +11,10 @@ UNIT_CLASS_TEST(BenchmarkFixture, Smoke)
 {
   RegisterLocalMapsInViewport(mercator::Bounds::FullRect());
 
-  SetViewport({50.1052, 8.6868}, 10000); // Frankfurt am Main
+  SetViewport({50.1052, 8.6868}, 10000);  // Frankfurt am Main
 
   auto request = MakeRequest("b");
   LOG(LINFO, (request->ResponseTime().count()));
 }
 
-} // namespace benchmark_tests
+}  // namespace benchmark_tests
diff --git a/libs/search/search_quality/search_quality_tests/real_mwm_tests.cpp b/libs/search/search_quality/search_quality_tests/real_mwm_tests.cpp
index e1653a940..c805abdad 100644
--- a/libs/search/search_quality/search_quality_tests/real_mwm_tests.cpp
+++ b/libs/search/search_quality/search_quality_tests/real_mwm_tests.cpp
@@ -43,10 +43,7 @@ public:
       TEST_LESS(beg, end, ());
       TEST_GREATER_OR_EQUAL(v.size(), end, ());
     }
-    explicit Range(ResultsT const & v, bool all = false)
-      : Range(v, 0, all ? v.size() : kTopPoiResultsCount)
-    {
-    }
+    explicit Range(ResultsT const & v, bool all = false) : Range(v, 0, all ? v.size() : kTopPoiResultsCount) {}
 
     size_t size() const { return m_end - m_beg; }
     auto begin() const { return m_v.begin() + m_beg; }
@@ -63,7 +60,7 @@ public:
     for (size_t i = 1; i < results.size(); ++i)
     {
       double const dist = GetDistanceM(results[i], center);
-      TEST_LESS(prevDist, dist + kDistanceEpsilon, (results[i-1], results[i]));
+      TEST_LESS(prevDist, dist + kDistanceEpsilon, (results[i - 1], results[i]));
       prevDist = dist;
     }
 
@@ -85,10 +82,7 @@ public:
   {
     for (auto const & r : results)
     {
-      auto const it = std::find_if(types.begin(), types.end(), [&r](uint32_t inType)
-      {
-        return r.IsSameType(inType);
-      });
+      auto const it = std::find_if(types.begin(), types.end(), [&r](uint32_t inType) { return r.IsSameType(inType); });
 
       TEST(it != types.end(), (r));
     }
@@ -96,20 +90,16 @@ public:
 
   static size_t CountClassifType(Range const & results, uint32_t type)
   {
-    return std::count_if(results.begin(), results.end(), [type](search::Result const & r)
-    {
-      return r.IsSameType(type);
-    });
+    return std::count_if(results.begin(), results.end(),
+                         [type](search::Result const & r) { return r.IsSameType(type); });
   }
 
   static void NameStartsWith(Range const & results, base::StringIL const & prefixes)
   {
     for (auto const & r : results)
     {
-      auto const it = std::find_if(prefixes.begin(), prefixes.end(), [name = r.GetString()](char const * prefix)
-      {
-        return name.starts_with(prefix);
-      });
+      auto const it = std::find_if(prefixes.begin(), prefixes.end(),
+                                   [name = r.GetString()](char const * prefix) { return name.starts_with(prefix); });
 
       TEST(it != prefixes.end(), (r));
     }
@@ -274,7 +264,7 @@ UNIT_CLASS_TEST(MwmTestsFixture, Paris_Hotel)
 UNIT_CLASS_TEST(MwmTestsFixture, London_Asda)
 {
   // London
-  ms::LatLon const arrPivots[] = { {51.50295, 0.00325}, {51.47890,0.01062} };
+  ms::LatLon const arrPivots[] = {{51.50295, 0.00325}, {51.47890, 0.01062}};
   for (auto const & center : arrPivots)
   {
     SetViewportAndLoadMaps(center);
@@ -336,21 +326,19 @@ UNIT_CLASS_TEST(MwmTestsFixture, Hamburg_Park)
 
   Range const range(results, 0, 3);
   EqualClassifType(range, GetClassifTypes({
-      {"tourism", "theme_park"},
-      {"amenity", "fast_food"},
-      {"shop", "gift"},
-  /// @todo Add _near street_ penalty
-      // {"amenity", "pharmacy"}, // "Heide-Apotheke" near the "Parkstraße" street
-  }));
+                              {"tourism", "theme_park"}, {"amenity", "fast_food"}, {"shop", "gift"},
+                              /// @todo Add _near street_ penalty
+                              // {"amenity", "pharmacy"}, // "Heide-Apotheke" near the "Parkstraße" street
+                          }));
 
   NameStartsWith(range, {"Heide Park", "Heide-Park"});
   TEST_LESS(SortedByDistance(range, center).first, 100000, ());
 
   EqualClassifType(Range(results, 4, 7), GetClassifTypes({
-      {"highway", "service"},
-      {"railway", "halt"},
-      {"highway", "bus_stop"},
-  }));
+                                             {"highway", "service"},
+                                             {"railway", "halt"},
+                                             {"highway", "bus_stop"},
+                                         }));
 }
 
 // https://github.com/organicmaps/organicmaps/issues/1560
@@ -397,7 +385,7 @@ UNIT_CLASS_TEST(MwmTestsFixture, Barcelona_Carrers)
     CenterInRect(Range(results, 0, 1), {27.5134786, 53.8717921, 27.5210173, 53.875768});
 
     /// @todo Second result is expected to be the nearby street in "Прилукская Слобода", but not always ..
-    //TEST_GREATER(GetDistanceM(results[0], center), GetDistanceM(results[1], center), ());
+    // TEST_GREATER(GetDistanceM(results[0], center), GetDistanceM(results[1], center), ());
   }
 }
 
@@ -587,7 +575,8 @@ UNIT_CLASS_TEST(MwmTestsFixture, Generic_Buildings_Rank)
 
     // results[0] is a named POI ~9km (https://www.openstreetmap.org/node/9730886727)
     Range const range(results, 1, kResultsCount);
-    EqualClassifType(range, GetClassifTypes({{"man_made", "tower", "communication"}, {"man_made", "communications_tower"}}));
+    EqualClassifType(range,
+                     GetClassifTypes({{"man_made", "tower", "communication"}, {"man_made", "communications_tower"}}));
     TEST_LESS(SortedByDistance(range, center).first, 3000.0, ());
   }
 
@@ -710,39 +699,17 @@ UNIT_CLASS_TEST(MwmTestsFixture, Famous_Cities_Rank)
   uint32_t const cityType = cl.GetTypeByPath({"place", "city"});
 
   std::string arrCities[] = {
-      "Buenos Aires",
-      "Rio de Janeiro",
-      "New York",
+      "Buenos Aires",  "Rio de Janeiro", "New York",
       "San Francisco",  // not a capital
       "Las Vegas",      // not a capital
-      "Los Angeles",
-      "Toronto",
-      "Lisboa",
-      "Madrid",
-      "Barcelona",
-      "London",
-      "Paris",
-      "Zurich",         // not a capital
-      "Rome",
-      "Milan",
-      "Venezia",
-      "Amsterdam",
-      "Berlin",
-      "Stockholm",
-      "Istanbul",
-      "Minsk",
-      "Moscow",
-      "Kyiv",
-      "New Delhi",
-      "Bangkok",
-      "Beijing",
-      "Tokyo",
-      "Melbourne",
-      "Sydney",
+      "Los Angeles",   "Toronto",        "Lisboa",    "Madrid",    "Barcelona", "London",    "Paris",
+      "Zurich",  // not a capital
+      "Rome",          "Milan",          "Venezia",   "Amsterdam", "Berlin",    "Stockholm", "Istanbul",  "Minsk",
+      "Moscow",        "Kyiv",           "New Delhi", "Bangkok",   "Beijing",   "Tokyo",     "Melbourne", "Sydney",
   };
   size_t const count = std::size(arrCities);
 
-  std::set<std::string> const notCapital = { "San Francisco", "Las Vegas", "Zurich" };
+  std::set<std::string> const notCapital = {"San Francisco", "Las Vegas", "Zurich"};
 
   std::vector<ms::LatLon> arrCenters(count);
   // Buenos Aires like starting point :)
@@ -913,8 +880,8 @@ UNIT_CLASS_TEST(MwmTestsFixture, BA_SanMartin)
     auto const & results = request->Results();
     size_t constexpr kResultsCount = 12;
     TEST_GREATER(results.size(), kResultsCount, ());
-    TEST_GREATER(CountClassifType(Range(results, 0, kResultsCount),
-                                  classif().GetTypeByPath({"railway", "station"})), 2, ());
+    TEST_GREATER(CountClassifType(Range(results, 0, kResultsCount), classif().GetTypeByPath({"railway", "station"})), 2,
+                 ());
   }
 }
 
@@ -1221,12 +1188,12 @@ UNIT_CLASS_TEST(MwmTestsFixture, Opfikon_Viewport)
   ms::LatLon const center(47.42404, 8.5667463);
   SetViewportAndLoadMaps(center);
 
-  auto params = GetDefaultSearchParams("ofikon");     // spelling error
+  auto params = GetDefaultSearchParams("ofikon");  // spelling error
   params.m_mode = search::Mode::Viewport;
   params.m_maxNumResults = search::SearchParams::kDefaultNumResultsInViewport;
 
   {
-    params.m_viewport = { 8.5418196173686862238, 53.987953174041166449, 8.5900051973703153152, 54.022951994627547379 };
+    params.m_viewport = {8.5418196173686862238, 53.987953174041166449, 8.5900051973703153152, 54.022951994627547379};
 
     auto request = MakeRequest(params);
     auto const & results = request->Results();
@@ -1264,7 +1231,7 @@ UNIT_CLASS_TEST(MwmTestsFixture, PostOffice_Viewport)
   params.m_maxNumResults = search::SearchParams::kDefaultNumResultsInViewport;
 
   {
-    params.m_viewport = { 8.5130497227411314753, 53.90688220139293918, 8.5701093069557838788, 53.940255929097141063 };
+    params.m_viewport = {8.5130497227411314753, 53.90688220139293918, 8.5701093069557838788, 53.940255929097141063};
 
     auto request = MakeRequest(params);
     auto const & results = request->Results();
@@ -1291,7 +1258,7 @@ UNIT_CLASS_TEST(MwmTestsFixture, Family_Viewport)
   params.m_maxNumResults = search::SearchParams::kDefaultNumResultsInViewport;
 
   {
-    params.m_viewport = { LonToX(-58.4015885), LatToY(-34.5901233), LonToX(-58.396118), LatToY(-34.5876888) };
+    params.m_viewport = {LonToX(-58.4015885), LatToY(-34.5901233), LonToX(-58.396118), LatToY(-34.5876888)};
 
     auto request = MakeRequest(params);
     auto const & results = request->Results();
@@ -1456,4 +1423,4 @@ UNIT_CLASS_TEST(MwmTestsFixture, Synonyms)
   }
 }
 
-} // namespace real_mwm_tests
+}  // namespace real_mwm_tests
diff --git a/libs/search/search_quality/search_quality_tests/sample_test.cpp b/libs/search/search_quality/search_quality_tests/sample_test.cpp
index fa83b8333..2811bc306 100644
--- a/libs/search/search_quality/search_quality_tests/sample_test.cpp
+++ b/libs/search/search_quality/search_quality_tests/sample_test.cpp
@@ -37,8 +37,7 @@ void SampleTest::Init()
   cubaRes.m_pos = {-80.832886, 15.521132748163712};
   cubaRes.m_houseNumber = "";
   m_cuba.m_results = {cubaRes};
-  m_cuba.m_relatedQueries = {strings::MakeUniString("Cuba Libre"),
-                             strings::MakeUniString("Patria o Muerte")};
+  m_cuba.m_relatedQueries = {strings::MakeUniString("Cuba Libre"), strings::MakeUniString("Patria o Muerte")};
 
   m_riga.m_query = strings::MakeUniString("riga");
   m_riga.m_locale = "en";
@@ -172,4 +171,4 @@ UNIT_CLASS_TEST(SampleTest, SerDes)
   std::sort(actual.begin(), actual.end());
   TEST_EQUAL(expected, actual, ());
 }
-} // namespace sample_test
+}  // namespace sample_test
diff --git a/libs/search/search_quality/search_quality_tool/search_quality_tool.cpp b/libs/search/search_quality/search_quality_tool/search_quality_tool.cpp
index 02ef643b9..f6df91ceb 100644
--- a/libs/search/search_quality/search_quality_tool/search_quality_tool.cpp
+++ b/libs/search/search_quality/search_quality_tool/search_quality_tool.cpp
@@ -50,8 +50,7 @@ using namespace std;
 DEFINE_string(data_path, "", "Path to data directory (resources dir)");
 DEFINE_string(locale, "en", "Locale of all the search queries");
 DEFINE_int32(num_threads, 1, "Number of search engine threads");
-DEFINE_string(mwm_list_path, "",
-              "Path to a file containing the names of available mwms, one per line");
+DEFINE_string(mwm_list_path, "", "Path to a file containing the names of available mwms, one per line");
 DEFINE_string(mwm_path, "", "Path to mwm files (writable dir)");
 DEFINE_string(queries_path, "", "Path to the file with queries");
 DEFINE_int32(top, 1, "Number of top results to show for every query");
@@ -59,8 +58,7 @@ DEFINE_string(viewport, "", "Viewport to use when searching (default, moscow, lo
 DEFINE_string(check_completeness, "", "Path to the file with completeness data");
 DEFINE_string(ranking_csv_file, "", "File ranking info will be exported to");
 
-string const kDefaultQueriesPathSuffix =
-    "/../search/search_quality/search_quality_tool/queries.txt";
+string const kDefaultQueriesPathSuffix = "/../search/search_quality/search_quality_tool/queries.txt";
 string const kEmptyResult = "<empty>";
 
 // Unlike strings::Tokenize, this function allows for empty tokens.
@@ -83,10 +81,7 @@ struct CompletenessQuery
     vector<string> parts;
     Split(s, ';', parts);
     if (parts.size() != 7)
-    {
-      MYTHROW(MalformedQueryException,
-              ("Can't split", s, ", found", parts.size(), "part(s):", parts));
-    }
+      MYTHROW(MalformedQueryException, ("Can't split", s, ", found", parts.size(), "part(s):", parts));
 
     auto const idx = parts[0].find(':');
     if (idx == string::npos)
@@ -130,13 +125,15 @@ struct CompletenessQuery
   double m_lon = 0;
 };
 
-string MakePrefixFree(string const & query) { return query + " "; }
+string MakePrefixFree(string const & query)
+{
+  return query + " ";
+}
 
 // If n == 1, prints the query and the top result separated by a tab.
 // Otherwise, prints the query on a separate line
 // and then prints n top results on n lines starting with tabs.
-void PrintTopResults(string const & query, vector<Result> const & results, size_t n,
-                     double elapsedSeconds)
+void PrintTopResults(string const & query, vector<Result> const & results, size_t n, double elapsedSeconds)
 {
   cout << query;
   char timeBuf[100];
@@ -159,8 +156,7 @@ void PrintTopResults(string const & query, vector<Result> const & results, size_
   cout << endl;
 }
 
-void CalcStatistics(vector<double> const & a, double & avg, double & maximum, double & var,
-                    double & stdDev)
+void CalcStatistics(vector<double> const & a, double & avg, double & maximum, double & var, double & stdDev)
 {
   avg = 0;
   maximum = 0;
@@ -186,8 +182,8 @@ void CalcStatistics(vector<double> const & a, double & avg, double & maximum, do
 
 // Returns the position of the result that is expected to be found by geocoder completeness
 // tests in the |result| vector or -1 if it does not occur there.
-int FindResult(DataSource & dataSource, string const & mwmName, uint32_t const featureId,
-               double const lat, double const lon, vector<Result> const & results)
+int FindResult(DataSource & dataSource, string const & mwmName, uint32_t const featureId, double const lat,
+               double const lon, vector<Result> const & results)
 {
   CHECK_LESS_OR_EQUAL(results.size(), numeric_limits<int>::max(), ());
   auto const mwmId = dataSource.GetMwmIdByCountryFile(platform::CountryFile(mwmName));
@@ -205,11 +201,9 @@ int FindResult(DataSource & dataSource, string const & mwmName, uint32_t const f
   for (size_t i = 0; i < results.size(); ++i)
   {
     auto const & r = results[i];
-    if (r.HasPoint() &&
-        AlmostEqualAbs(r.GetFeatureCenter(), mercator::FromLatLon(lat, lon), kEps))
+    if (r.HasPoint() && AlmostEqualAbs(r.GetFeatureCenter(), mercator::FromLatLon(lat, lon), kEps))
     {
-      double const dist =
-          mercator::DistanceOnEarth(r.GetFeatureCenter(), mercator::FromLatLon(lat, lon));
+      double const dist = mercator::DistanceOnEarth(r.GetFeatureCenter(), mercator::FromLatLon(lat, lon));
       LOG(LDEBUG, ("dist =", dist));
       return static_cast<int>(i);
     }
@@ -247,8 +241,7 @@ void CheckCompleteness(string const & path, DataSource & dataSource, TestSearchE
     try
     {
       CompletenessQuery q(std::move(line));
-      q.m_request =
-          make_unique<TestSearchRequest>(engine, q.m_query, locale, Mode::Everywhere, viewport);
+      q.m_request = make_unique<TestSearchRequest>(engine, q.m_query, locale, Mode::Everywhere, viewport);
       queries.push_back(std::move(q));
     }
     catch (CompletenessQuery::MalformedQueryException & e)
@@ -263,8 +256,7 @@ void CheckCompleteness(string const & path, DataSource & dataSource, TestSearchE
     q.m_request->Run();
 
     LOG(LDEBUG, (q.m_query, q.m_request->Results()));
-    int pos = FindResult(dataSource, q.m_mwmName, q.m_featureId, q.m_lat, q.m_lon,
-                         q.m_request->Results());
+    int pos = FindResult(dataSource, q.m_mwmName, q.m_featureId, q.m_lat, q.m_lon, q.m_request->Results());
     if (pos >= 0)
       ++expectedResultsFound;
     if (pos == 0)
@@ -272,25 +264,20 @@ void CheckCompleteness(string const & path, DataSource & dataSource, TestSearchE
   }
 
   double const expectedResultsFoundPercentage =
-      totalQueries == 0
-          ? 0
-          : 100.0 * static_cast<double>(expectedResultsFound) / static_cast<double>(totalQueries);
+      totalQueries == 0 ? 0 : 100.0 * static_cast<double>(expectedResultsFound) / static_cast<double>(totalQueries);
   double const expectedResultsTop1Percentage =
-      totalQueries == 0
-          ? 0
-          : 100.0 * static_cast<double>(expectedResultsTop1) / static_cast<double>(totalQueries);
+      totalQueries == 0 ? 0 : 100.0 * static_cast<double>(expectedResultsTop1) / static_cast<double>(totalQueries);
 
   cout << "Time spent on checking completeness: " << timer.ElapsedSeconds() << "s." << endl;
   cout << "Total queries: " << totalQueries << endl;
   cout << "Malformed queries: " << malformedQueries << endl;
-  cout << "Expected results found: " << expectedResultsFound << " ("
-       << expectedResultsFoundPercentage << "%)." << endl;
-  cout << "Expected results found in the top1 slot: " << expectedResultsTop1 << " ("
-       << expectedResultsTop1Percentage << "%)." << endl;
+  cout << "Expected results found: " << expectedResultsFound << " (" << expectedResultsFoundPercentage << "%)." << endl;
+  cout << "Expected results found in the top1 slot: " << expectedResultsTop1 << " (" << expectedResultsTop1Percentage
+       << "%)." << endl;
 }
 
-void RunRequests(TestSearchEngine & engine, m2::RectD const & viewport, string queriesPath,
-                 string const & locale, string const & rankingCSVFile, size_t top)
+void RunRequests(TestSearchEngine & engine, m2::RectD const & viewport, string queriesPath, string const & locale,
+                 string const & rankingCSVFile, size_t top)
 {
   vector<string> queries;
   {
@@ -303,8 +290,8 @@ void RunRequests(TestSearchEngine & engine, m2::RectD const & viewport, string q
   for (size_t i = 0; i < queries.size(); ++i)
   {
     // todo(@m) Add a bool flag to search with prefixes?
-    requests.emplace_back(make_unique<TestSearchRequest>(engine, MakePrefixFree(queries[i]), locale,
-                                                         Mode::Everywhere, viewport));
+    requests.emplace_back(
+        make_unique<TestSearchRequest>(engine, MakePrefixFree(queries[i]), locale, Mode::Everywhere, viewport));
   }
 
   ofstream csv;
diff --git a/libs/search/search_tests/algos_tests.cpp b/libs/search/search_tests/algos_tests.cpp
index 4c7d33afc..85e3fe007 100644
--- a/libs/search/search_tests/algos_tests.cpp
+++ b/libs/search/search_tests/algos_tests.cpp
@@ -28,23 +28,23 @@ void TestLongestSequence(int in[], size_t inSz, int eta[])
 UNIT_TEST(LS_Smoke)
 {
   {
-    int arr[] = { 1 };
+    int arr[] = {1};
     TestLongestSequence(arr, ARRAY_SIZE(arr), arr);
   }
 
   {
-    int arr[] = { 1, 2 };
+    int arr[] = {1, 2};
     TestLongestSequence(arr, ARRAY_SIZE(arr), arr);
   }
 
   {
-    int arr[] = { 2, 1 };
+    int arr[] = {2, 1};
     TestLongestSequence(arr, ARRAY_SIZE(arr), arr);
   }
 
   {
-    int arr[] = { 1, 9, 2, 3, 8, 0, 7, -1, 7, -2, 7 };
-    int res[] = { 1, 2, 3, 7, 7, 7 };
+    int arr[] = {1, 9, 2, 3, 8, 0, 7, -1, 7, -2, 7};
+    int res[] = {1, 2, 3, 7, 7, 7};
     TestLongestSequence(arr, ARRAY_SIZE(arr), res);
   }
 }
diff --git a/libs/search/search_tests/bookmarks_processor_tests.cpp b/libs/search/search_tests/bookmarks_processor_tests.cpp
index fbafada5c..c82381463 100644
--- a/libs/search/search_tests/bookmarks_processor_tests.cpp
+++ b/libs/search/search_tests/bookmarks_processor_tests.cpp
@@ -48,10 +48,7 @@ public:
   }
 
   void AttachToGroup(Id const & id, GroupId const & group) { m_processor.AttachToGroup(id, group); }
-  void DetachFromGroup(Id const & id, GroupId const & group)
-  {
-    m_processor.DetachFromGroup(id, group);
-  }
+  void DetachFromGroup(Id const & id, GroupId const & group) { m_processor.DetachFromGroup(id, group); }
 
   Ids Search(string const & query, GroupId const & groupId = kInvalidGroupId)
   {
@@ -78,8 +75,8 @@ protected:
   Processor m_processor;
 };
 
-kml::BookmarkData MakeBookmarkData(string const & name, string const & customName,
-                                   string const & description, vector<string> const & types)
+kml::BookmarkData MakeBookmarkData(string const & name, string const & customName, string const & description,
+                                   vector<string> const & types)
 {
   kml::BookmarkData b;
   b.m_name = {{kml::kDefaultLangCode, name}};
@@ -108,14 +105,12 @@ UNIT_CLASS_TEST(BookmarksProcessorTest, Smoke)
                        {"amenity-cafe"} /* types */));
 
   Add(Id{18}, GroupId{0},
-      MakeBookmarkData(
-          "Silver Mustang Casino" /* name */, "Ag Mustang" /* customName */,
-          "Joyful place, owners Bradley and Rodney are very friendly!" /* description */,
-          {"amenity-casino"} /* types */));
+      MakeBookmarkData("Silver Mustang Casino" /* name */, "Ag Mustang" /* customName */,
+                       "Joyful place, owners Bradley and Rodney are very friendly!" /* description */,
+                       {"amenity-casino"} /* types */));
   Add(Id{20}, GroupId{1},
       MakeBookmarkData("Great Northern Hotel" /* name */, "N Hotel" /* customName */,
-                       "Clean place with a reasonable price" /* description */,
-                       {"tourism-hotel"} /* types */));
+                       "Clean place with a reasonable price" /* description */, {"tourism-hotel"} /* types */));
 
   TEST_EQUAL(Search("R&R food"), Ids{}, ());
   GetProcessor().EnableIndexingOfBookmarkGroup(GroupId{0}, true /* enable */);
@@ -160,11 +155,9 @@ UNIT_CLASS_TEST(BookmarksProcessorTest, SearchByType)
                        {"amenity-cafe"} /* types */));
 
   Add(Id{12}, GroupId{0},
-      MakeBookmarkData("" /* name */, "" /* customName */, "" /* description */,
-                       {"amenity-cafe"} /* types */));
+      MakeBookmarkData("" /* name */, "" /* customName */, "" /* description */, {"amenity-cafe"} /* types */));
 
-  Add(Id{0}, GroupId{0},
-      MakeBookmarkData("" /* name */, "" /* customName */, "" /* description */, {} /* types */));
+  Add(Id{0}, GroupId{0}, MakeBookmarkData("" /* name */, "" /* customName */, "" /* description */, {} /* types */));
 
   TEST_EQUAL(Search("cafe", GroupId{0}), Ids({12, 10}), ());
   TEST_EQUAL(Search("кафе", GroupId{0}), Ids{}, ());
@@ -207,4 +200,4 @@ UNIT_CLASS_TEST(BookmarksProcessorTest, IndexDescriptions)
   TEST_EQUAL(Search("cherry pie"), Ids{}, ());
 }
 
-} // namespace bookmarks_processor_tests
+}  // namespace bookmarks_processor_tests
diff --git a/libs/search/search_tests/feature_offset_match_tests.cpp b/libs/search/search_tests/feature_offset_match_tests.cpp
index 35309f141..0ff787601 100644
--- a/libs/search/search_tests/feature_offset_match_tests.cpp
+++ b/libs/search/search_tests/feature_offset_match_tests.cpp
@@ -2,8 +2,8 @@
 
 #include "search/feature_offset_match.hpp"
 
-#include "indexer/trie.hpp"
 #include "indexer/search_string_utils.hpp"
+#include "indexer/trie.hpp"
 
 #include "base/mem_trie.hpp"
 #include "base/string_utils.hpp"
@@ -99,4 +99,4 @@ UNIT_TEST(MatchPrefixInTrieTest)
     TEST(vals.at(1), (vals));
   }
 }
-} // namespace feature_offset_match_tests
+}  // namespace feature_offset_match_tests
diff --git a/libs/search/search_tests/highlighting_tests.cpp b/libs/search/search_tests/highlighting_tests.cpp
index 22cc4b534..8dcd1b1a4 100644
--- a/libs/search/search_tests/highlighting_tests.cpp
+++ b/libs/search/search_tests/highlighting_tests.cpp
@@ -64,7 +64,7 @@ public:
     ++m_idx;
   }
 };
-}
+}  // namespace
 
 UNIT_TEST(SearchStringTokensIntersectionRange)
 {
@@ -120,7 +120,7 @@ UNIT_TEST(SearchStringTokensIntersectionRange)
 
   for (TestData const & data : tests)
   {
-    search::SearchStringTokensIntersectionRanges(
-        data.m_input, data.m_lowTokens.begin(), data.m_lowTokens.end(), CheckRange(data.m_results));
+    search::SearchStringTokensIntersectionRanges(data.m_input, data.m_lowTokens.begin(), data.m_lowTokens.end(),
+                                                 CheckRange(data.m_results));
   }
 }
diff --git a/libs/search/search_tests/house_detector_tests.cpp b/libs/search/search_tests/house_detector_tests.cpp
index b6f7bcc01..2400d4295 100644
--- a/libs/search/search_tests/house_detector_tests.cpp
+++ b/libs/search/search_tests/house_detector_tests.cpp
@@ -156,7 +156,6 @@ UNIT_TEST(HS_ParseNumber)
     TEST(!n.IsIntersect(Number("136")), ());
   }
 
-
   {
     Number n("135-24", true);
     TEST(!n.IsOdd(), ());
@@ -263,8 +262,7 @@ UNIT_TEST(HS_StreetsMerge)
 
 namespace
 {
-m2::PointD FindHouse(DataSource & dataSource, vector<string> const & streets,
-                     string const & houseName, double offset)
+m2::PointD FindHouse(DataSource & dataSource, vector<string> const & streets, string const & houseName, double offset)
 {
   search::HouseDetector houser(dataSource);
 
@@ -284,7 +282,7 @@ m2::PointD FindHouse(DataSource & dataSource, vector<string> const & streets,
   return houses[0].m_house->GetPosition();
 }
 
-}
+}  // namespace
 
 UNIT_TEST(HS_FindHouseSmoke)
 {
@@ -299,7 +297,7 @@ UNIT_TEST(HS_FindHouseSmoke)
   {
     vector<string> streetName = {"Московская улица"};
     TEST_ALMOST_EQUAL_ABS(FindHouse(dataSource, streetName, "7", 100),
-                      m2::PointD(27.539850827603416406, 64.222406776416349317), epsPoints, ());
+                          m2::PointD(27.539850827603416406, 64.222406776416349317), epsPoints, ());
   }
   /// @todo HouseDetector used in tests only, so do not want to waste time here ..
   /*{
@@ -311,28 +309,26 @@ UNIT_TEST(HS_FindHouseSmoke)
     vector<string> streetName = {"улица Ленина"};
 
     /// @todo This cases doesn't work, but should in new search algorithms.
-    //m2::PointD pt = FindHouse(dataSource, streetName, "28", 50);
-    //m2::PointD pt = FindHouse(dataSource, streetName, "30", 50);
+    // m2::PointD pt = FindHouse(dataSource, streetName, "28", 50);
+    // m2::PointD pt = FindHouse(dataSource, streetName, "30", 50);
 
     m2::PointD pt = FindHouse(dataSource, streetName, "21", 50);
     TEST_ALMOST_EQUAL_ABS(pt, m2::PointD(27.56477391395549148, 64.234502198059132638), epsPoints, ());
   }
 }
 
-
 UNIT_TEST(HS_StreetsCompare)
 {
   search::Street A, B;
   TEST(search::Street::IsSameStreets(&A, &B), ());
-  string str[8][2] = { {"Московская", "Московская"},
-                       {"ул. Московская", "Московская ул."},
-                       {"ул. Московская", "Московская улица"},
-                       {"ул. Московская", "улица Московская"},
-                       {"ул. Московская", "площадь Московская"},
-                       {"ул. мОСКОВСКАЯ", "Московская улица"},
-                       {"Московская", "площадь Московская"},
-                       {"Московская         ", "аллея Московская"}
-                     };
+  string str[8][2] = {{"Московская", "Московская"},
+                      {"ул. Московская", "Московская ул."},
+                      {"ул. Московская", "Московская улица"},
+                      {"ул. Московская", "улица Московская"},
+                      {"ул. Московская", "площадь Московская"},
+                      {"ул. мОСКОВСКАЯ", "Московская улица"},
+                      {"Московская", "площадь Московская"},
+                      {"Московская         ", "аллея Московская"}};
   for (size_t i = 0; i < ARRAY_SIZE(str); ++i)
   {
     A.SetName(str[i][0]);
@@ -476,8 +472,8 @@ UNIT_TEST(HS_MWMSearch)
       p.x = mercator::XToLon(p.x);
       p.y = mercator::YToLat(p.y);
 
-      //double constexpr eps = 3.0E-4;
-      //if (fabs(p.x - a.m_lon) < eps && fabs(p.y - a.m_lat) < eps)
+      // double constexpr eps = 3.0E-4;
+      // if (fabs(p.x - a.m_lon) < eps && fabs(p.y - a.m_lat) < eps)
       if (ms::DistanceOnEarth(a.m_lat, a.m_lon, p.y, p.x) < 3.0)
       {
         ++matched;
diff --git a/libs/search/search_tests/house_numbers_matcher_test.cpp b/libs/search/search_tests/house_numbers_matcher_test.cpp
index 17c99b3f2..4fa463e80 100644
--- a/libs/search/search_tests/house_numbers_matcher_test.cpp
+++ b/libs/search/search_tests/house_numbers_matcher_test.cpp
@@ -7,7 +7,6 @@
 #include <string>
 #include <vector>
 
-
 namespace house_number_matcher_test
 {
 using namespace search::house_numbers;
@@ -208,7 +207,7 @@ UNIT_TEST(HouseNumber_Matcher_Range)
   TEST(!HouseNumbersMatchRange("2:40", "33B", IType::Even), ());
 
   /// @todo Maybe some day ..
-  //TEST(HouseNumbersMatchRange("30A:30D", "30B", IType::Any), ());
+  // TEST(HouseNumbersMatchRange("30A:30D", "30B", IType::Any), ());
 }
 
 UNIT_TEST(HouseNumber_LooksLike)
@@ -271,4 +270,4 @@ UNIT_TEST(HouseNumber_LooksLike)
   TEST(LooksLikeHouseNumber("к424", false /* isPrefix */), ());
   TEST(LooksLikeHouseNumber("к12", true /* isPrefix */), ());
 }
-} // namespace house_number_matcher_test
+}  // namespace house_number_matcher_test
diff --git a/libs/search/search_tests/interval_set_test.cpp b/libs/search/search_tests/interval_set_test.cpp
index d0d790738..68cd9c69a 100644
--- a/libs/search/search_tests/interval_set_test.cpp
+++ b/libs/search/search_tests/interval_set_test.cpp
@@ -101,8 +101,7 @@ UNIT_TEST(IntervalSet_SubtractFrom)
   {
     std::vector<Interval<int>> difference;
     set.SubtractFrom(Interval<int>(-1, 11), difference);
-    std::vector<Interval<int>> expected{Interval<int>(-1, 0), Interval<int>(2, 4),
-                                    Interval<int>(7, 10)};
+    std::vector<Interval<int>> expected{Interval<int>(-1, 0), Interval<int>(2, 4), Interval<int>(7, 10)};
     TEST_EQUAL(difference, expected, ());
   }
 
diff --git a/libs/search/search_tests/keyword_lang_matcher_test.cpp b/libs/search/search_tests/keyword_lang_matcher_test.cpp
index f9c3663e3..4023335ce 100644
--- a/libs/search/search_tests/keyword_lang_matcher_test.cpp
+++ b/libs/search/search_tests/keyword_lang_matcher_test.cpp
@@ -58,4 +58,4 @@ UNIT_TEST(KeywordMatcher_LanguageMatchIsUsedWhenTokenMatchIsTheSame)
   TEST(matcher.CalcScore(LANG_SOME_OTHER, name) < matcher.CalcScore(LANG_HIGH_PRIORITY, name), ());
 }
 
-} // namespace keyword_lang_matcher_test
+}  // namespace keyword_lang_matcher_test
diff --git a/libs/search/search_tests/keyword_matcher_test.cpp b/libs/search/search_tests/keyword_matcher_test.cpp
index 05654bc48..8da42fbc4 100644
--- a/libs/search/search_tests/keyword_matcher_test.cpp
+++ b/libs/search/search_tests/keyword_matcher_test.cpp
@@ -7,7 +7,6 @@
 #include <sstream>
 #include <string>
 
-
 namespace keyword_matcher_test
 {
 using namespace std;
@@ -77,7 +76,7 @@ void TestKeywordMatcher(char const * const query, KeywordMatcherTestCase const (
   for (size_t i = 0; i < N; ++i)
   {
     char const * const name = testCases[i].m_name;
-    char const * const prevName = (i == 0 ? "N/A" : testCases[i-1].m_name);
+    char const * const prevName = (i == 0 ? "N/A" : testCases[i - 1].m_name);
     TestScore const testScore(matcher.CalcScore(name));
 
     // Test that a newly created matcher returns the same result
@@ -92,28 +91,18 @@ void TestKeywordMatcher(char const * const query, KeywordMatcherTestCase const (
     }
 
     if (testCases[i].m_eMatch != ANY_RES)
-    {
-      TEST_EQUAL(testCases[i].m_eMatch == MATCHES,
-                 testScore.IsQueryMatched(),
-                 (query, name, testScore));
-    }
+      TEST_EQUAL(testCases[i].m_eMatch == MATCHES, testScore.IsQueryMatched(), (query, name, testScore));
 
     switch (testCases[i].m_eMatchType)
     {
-    case DOES_NOT_MATTER:
-      break;
+    case DOES_NOT_MATTER: break;
     case PERFECTLY_EQUAL:
       TEST(!(testScore < prevScore), (query, name, testScore, prevName, prevScore));
       TEST(!(prevScore < testScore), (query, name, testScore, prevName, prevScore));
       break;
-    case BETTER_OR_EQUAL:
-      TEST(!(testScore < prevScore), (query, name, testScore, prevName, prevScore));
-      break;
-    case STRONGLY_BETTER:
-      TEST(prevScore < testScore, (query, name, testScore, prevName, prevScore));
-      break;
-    default:
-      ASSERT(false, ());
+    case BETTER_OR_EQUAL: TEST(!(testScore < prevScore), (query, name, testScore, prevName, prevScore)); break;
+    case STRONGLY_BETTER: TEST(prevScore < testScore, (query, name, testScore, prevName, prevScore)); break;
+    default: ASSERT(false, ());
     }
 
     prevScore = testScore;
@@ -123,22 +112,21 @@ void TestKeywordMatcher(char const * const query, KeywordMatcherTestCase const (
 UNIT_TEST(KeywordMatcher_Prefix)
 {
   char const query[] = "new";
-  KeywordMatcherTestCase const testCases[] =
-  {
-    {NOMATCH, DOES_NOT_MATTER, ""},
-    {NOMATCH, DOES_NOT_MATTER, "zzz"},
-    {NOMATCH, DOES_NOT_MATTER, "ne"},
+  KeywordMatcherTestCase const testCases[] = {
+      {NOMATCH, DOES_NOT_MATTER, ""},
+      {NOMATCH, DOES_NOT_MATTER, "zzz"},
+      {NOMATCH, DOES_NOT_MATTER, "ne"},
 
-    {MATCHES, STRONGLY_BETTER, "the newark"},
-    {MATCHES, BETTER_OR_EQUAL, "york new"},
+      {MATCHES, STRONGLY_BETTER, "the newark"},
+      {MATCHES, BETTER_OR_EQUAL, "york new"},
 
-    {MATCHES, STRONGLY_BETTER, "new york gym"},
-    {MATCHES, BETTER_OR_EQUAL, "new new york"},
-    {MATCHES, STRONGLY_BETTER, "new york"},
+      {MATCHES, STRONGLY_BETTER, "new york gym"},
+      {MATCHES, BETTER_OR_EQUAL, "new new york"},
+      {MATCHES, STRONGLY_BETTER, "new york"},
 
-    {MATCHES, STRONGLY_BETTER, "newark"},
+      {MATCHES, STRONGLY_BETTER, "newark"},
 
-    {MATCHES, STRONGLY_BETTER, "new"},
+      {MATCHES, STRONGLY_BETTER, "new"},
   };
   TestKeywordMatcher(query, testCases);
 }
@@ -146,20 +134,19 @@ UNIT_TEST(KeywordMatcher_Prefix)
 UNIT_TEST(KeywordMatcher_Keyword)
 {
   char const query[] = "new ";
-  KeywordMatcherTestCase const testCases[] =
-  {
-    {NOMATCH, DOES_NOT_MATTER, ""},
-    {NOMATCH, DOES_NOT_MATTER, "zzz"},
-    {NOMATCH, DOES_NOT_MATTER, "ne"},
-    {NOMATCH, DOES_NOT_MATTER, "the netherlands"},
-    {NOMATCH, DOES_NOT_MATTER, "newark"},
+  KeywordMatcherTestCase const testCases[] = {
+      {NOMATCH, DOES_NOT_MATTER, ""},
+      {NOMATCH, DOES_NOT_MATTER, "zzz"},
+      {NOMATCH, DOES_NOT_MATTER, "ne"},
+      {NOMATCH, DOES_NOT_MATTER, "the netherlands"},
+      {NOMATCH, DOES_NOT_MATTER, "newark"},
 
-    {MATCHES, STRONGLY_BETTER, "york new"},
+      {MATCHES, STRONGLY_BETTER, "york new"},
 
-    {MATCHES, STRONGLY_BETTER, "new york gym"},
-    {MATCHES, BETTER_OR_EQUAL, "new new york"},
+      {MATCHES, STRONGLY_BETTER, "new york gym"},
+      {MATCHES, BETTER_OR_EQUAL, "new new york"},
 
-    {MATCHES, STRONGLY_BETTER, "new york"},
+      {MATCHES, STRONGLY_BETTER, "new york"},
   };
   TestKeywordMatcher(query, testCases);
 }
@@ -168,10 +155,9 @@ UNIT_TEST(KeywordMatcher_SanSa_ShouldMatch_SanSalvador_BetterThan_San)
 {
   char const query[] = "San Sa";
 
-  KeywordMatcherTestCase const testCases[] =
-  {
-    {NOMATCH, DOES_NOT_MATTER, "San"},
-    {MATCHES, STRONGLY_BETTER, "San Salvador"},
+  KeywordMatcherTestCase const testCases[] = {
+      {NOMATCH, DOES_NOT_MATTER, "San"},
+      {MATCHES, STRONGLY_BETTER, "San Salvador"},
   };
   TestKeywordMatcher(query, testCases);
 }
@@ -180,25 +166,24 @@ UNIT_TEST(KeywordMatcher_KeywordAndPrefix)
 {
   char const query[] = "new yo";
 
-  KeywordMatcherTestCase const testCases[] =
-  {
-    {NOMATCH, DOES_NOT_MATTER, "new"},
-    {NOMATCH, DOES_NOT_MATTER, "new old"},
-    {NOMATCH, DOES_NOT_MATTER, "old york"},
+  KeywordMatcherTestCase const testCases[] = {
+      {NOMATCH, DOES_NOT_MATTER, "new"},
+      {NOMATCH, DOES_NOT_MATTER, "new old"},
+      {NOMATCH, DOES_NOT_MATTER, "old york"},
 
-    {MATCHES, STRONGLY_BETTER, "the york new"},
+      {MATCHES, STRONGLY_BETTER, "the york new"},
 
-    {MATCHES, STRONGLY_BETTER, "the new york"},
-    {MATCHES, BETTER_OR_EQUAL, "york new the"},
-    {MATCHES, BETTER_OR_EQUAL, "york new"},
+      {MATCHES, STRONGLY_BETTER, "the new york"},
+      {MATCHES, BETTER_OR_EQUAL, "york new the"},
+      {MATCHES, BETTER_OR_EQUAL, "york new"},
 
-    {MATCHES, STRONGLY_BETTER, "yo new"},
+      {MATCHES, STRONGLY_BETTER, "yo new"},
 
-    {MATCHES, STRONGLY_BETTER, "new york pizza"},
+      {MATCHES, STRONGLY_BETTER, "new york pizza"},
 
-    {MATCHES, STRONGLY_BETTER, "new york"},
+      {MATCHES, STRONGLY_BETTER, "new york"},
 
-    {MATCHES, STRONGLY_BETTER, "new yo"},
+      {MATCHES, STRONGLY_BETTER, "new yo"},
   };
   TestKeywordMatcher(query, testCases);
 }
@@ -207,23 +192,22 @@ UNIT_TEST(KeywordMatcher_KeywordAndKeyword)
 {
   char const query[] = "new york ";
 
-  KeywordMatcherTestCase const testCases[] =
-  {
-    {NOMATCH, DOES_NOT_MATTER, "new"},
-    {NOMATCH, DOES_NOT_MATTER, "new old"},
-    {NOMATCH, DOES_NOT_MATTER, "old york"},
-    {NOMATCH, DOES_NOT_MATTER, "new yorkshire"},
-    {NOMATCH, DOES_NOT_MATTER, "york newcastle"},
+  KeywordMatcherTestCase const testCases[] = {
+      {NOMATCH, DOES_NOT_MATTER, "new"},
+      {NOMATCH, DOES_NOT_MATTER, "new old"},
+      {NOMATCH, DOES_NOT_MATTER, "old york"},
+      {NOMATCH, DOES_NOT_MATTER, "new yorkshire"},
+      {NOMATCH, DOES_NOT_MATTER, "york newcastle"},
 
-    {MATCHES, STRONGLY_BETTER, "the york new"},
+      {MATCHES, STRONGLY_BETTER, "the york new"},
 
-    {MATCHES, STRONGLY_BETTER, "the new york"},
-    {MATCHES, BETTER_OR_EQUAL, "york new the"},
+      {MATCHES, STRONGLY_BETTER, "the new york"},
+      {MATCHES, BETTER_OR_EQUAL, "york new the"},
 
-    {MATCHES, STRONGLY_BETTER, "york new"},
+      {MATCHES, STRONGLY_BETTER, "york new"},
 
-    {MATCHES, STRONGLY_BETTER, "new york pizza"},
-    {MATCHES, STRONGLY_BETTER, "new york"},
+      {MATCHES, STRONGLY_BETTER, "new york pizza"},
+      {MATCHES, STRONGLY_BETTER, "new york"},
   };
   TestKeywordMatcher(query, testCases);
 }
@@ -236,7 +220,6 @@ string GetManyTokens(string tokenPrefix, int tokenCount, bool countForward = tru
   return out.str();
 }
 
-
 UNIT_TEST(KeywordMatcher_QueryTooLong)
 {
   static_assert(kMaxNumTokens >= 2, "");
@@ -248,25 +231,17 @@ UNIT_TEST(KeywordMatcher_QueryTooLong)
     string const queryWithPrefix = query + " Prefix";
     string const queryWithPrefixAndSomethingElse = query + " PrefixAndSomethingElse";
 
-    KeywordMatcherTestCase const testCases[] =
-    {
-      {NOMATCH, DOES_NOT_MATTER, ""},
-      {NOMATCH, DOES_NOT_MATTER, "Q"},
-      {NOMATCH, DOES_NOT_MATTER, "Q "},
-      {NOMATCH, DOES_NOT_MATTER, "Q3"},
-      {NOMATCH, DOES_NOT_MATTER, "Q3 "},
-      {NOMATCH, DOES_NOT_MATTER, "Q3 Q"},
-      {NOMATCH, DOES_NOT_MATTER, "Q3 Q4"},
-      {NOMATCH, DOES_NOT_MATTER, "zzz"},
+    KeywordMatcherTestCase const testCases[] = {
+        {NOMATCH, DOES_NOT_MATTER, ""},      {NOMATCH, DOES_NOT_MATTER, "Q"},
+        {NOMATCH, DOES_NOT_MATTER, "Q "},    {NOMATCH, DOES_NOT_MATTER, "Q3"},
+        {NOMATCH, DOES_NOT_MATTER, "Q3 "},   {NOMATCH, DOES_NOT_MATTER, "Q3 Q"},
+        {NOMATCH, DOES_NOT_MATTER, "Q3 Q4"}, {NOMATCH, DOES_NOT_MATTER, "zzz"},
 
-      {NOMATCH, DOES_NOT_MATTER, "Q"},
-      {ANY_RES, STRONGLY_BETTER, query.c_str()},
+        {NOMATCH, DOES_NOT_MATTER, "Q"},     {ANY_RES, STRONGLY_BETTER, query.c_str()},
 
-      {NOMATCH, DOES_NOT_MATTER, "Q"},
-      {ANY_RES, STRONGLY_BETTER, queryWithPrefix.c_str()},
+        {NOMATCH, DOES_NOT_MATTER, "Q"},     {ANY_RES, STRONGLY_BETTER, queryWithPrefix.c_str()},
 
-      {NOMATCH, DOES_NOT_MATTER, "Q"},
-      {ANY_RES, STRONGLY_BETTER, queryWithPrefixAndSomethingElse.c_str()},
+        {NOMATCH, DOES_NOT_MATTER, "Q"},     {ANY_RES, STRONGLY_BETTER, queryWithPrefixAndSomethingElse.c_str()},
     };
     TestKeywordMatcher(query.c_str(), testCases);
     TestKeywordMatcher(queryWithPrefix.c_str(), testCases);
@@ -281,16 +256,15 @@ UNIT_TEST(KeywordMatcher_NameTooLong)
       "Aa Bb " + GetManyTokens("T", kMaxNumTokens - 1),
   };
 
-  KeywordMatcherTestCase const testCases[] =
-  {
-    {NOMATCH, DOES_NOT_MATTER, "zzz"},
+  KeywordMatcherTestCase const testCases[] = {
+      {NOMATCH, DOES_NOT_MATTER, "zzz"},
 
-    {MATCHES, STRONGLY_BETTER, name[0].c_str()},
-    {MATCHES, BETTER_OR_EQUAL, name[1].c_str()},
-    {MATCHES, BETTER_OR_EQUAL, name[2].c_str()},
+      {MATCHES, STRONGLY_BETTER, name[0].c_str()},
+      {MATCHES, BETTER_OR_EQUAL, name[1].c_str()},
+      {MATCHES, BETTER_OR_EQUAL, name[2].c_str()},
   };
 
-  char const * queries[] = { "a", "aa", "aa ", "b", "bb", "bb ", "t" };
+  char const * queries[] = {"a", "aa", "aa ", "b", "bb", "bb ", "t"};
   for (auto const & query : queries)
     TestKeywordMatcher(query, testCases);
 }
@@ -301,13 +275,12 @@ UNIT_TEST(KeywordMatcher_ManyTokensInReverseOrder)
   string const name = GetManyTokens("Q", kMaxNumTokens);
   string const reversedName = GetManyTokens("Q", kMaxNumTokens, false);
 
-  KeywordMatcherTestCase const testCases[] =
-  {
-    {NOMATCH, DOES_NOT_MATTER, "zzz"},
+  KeywordMatcherTestCase const testCases[] = {
+      {NOMATCH, DOES_NOT_MATTER, "zzz"},
 
-    {MATCHES, STRONGLY_BETTER, reversedName.c_str()},
+      {MATCHES, STRONGLY_BETTER, reversedName.c_str()},
 
-    {MATCHES, STRONGLY_BETTER, name.c_str()},
+      {MATCHES, STRONGLY_BETTER, name.c_str()},
   };
   TestKeywordMatcher(query.c_str(), testCases);
 }
@@ -318,9 +291,9 @@ UNIT_TEST(KeywordMatcher_DifferentLangs)
 
   InitMatcher("не", matcher);
 
-  char const * arr[] = { "Невский переулок", "Неўскі завулак" };
+  char const * arr[] = {"Невский переулок", "Неўскі завулак"};
   TEST(!(matcher.CalcScore(arr[0]) < matcher.CalcScore(arr[1])), ());
   TEST(!(matcher.CalcScore(arr[1]) < matcher.CalcScore(arr[0])), ());
 }
 
-} // namespace keyword_matcher_test
+}  // namespace keyword_matcher_test
diff --git a/libs/search/search_tests/latlon_match_test.cpp b/libs/search/search_tests/latlon_match_test.cpp
index 3a4b83d99..ce5a26a1e 100644
--- a/libs/search/search_tests/latlon_match_test.cpp
+++ b/libs/search/search_tests/latlon_match_test.cpp
@@ -49,7 +49,7 @@ UNIT_TEST(LatLon_Match_Smoke)
   TEST(MatchLatLonDegree("-10,10, 20,20", lat, lon), ());
   TestAlmostEqual(lat, -10.1);
   TestAlmostEqual(lon, 20.2);
-  
+
   TEST(MatchLatLonDegree("10,10, -20,20", lat, lon), ());
   TestAlmostEqual(lat, 10.1);
   TestAlmostEqual(lon, -20.2);
@@ -61,7 +61,7 @@ UNIT_TEST(LatLon_Match_Smoke)
   TEST(MatchLatLonDegree("-10,10 20,20", lat, lon), ());
   TestAlmostEqual(lat, -10.1);
   TestAlmostEqual(lon, 20.2);
-  
+
   TEST(MatchLatLonDegree("10,10 -20,20", lat, lon), ());
   TestAlmostEqual(lat, 10.1);
   TestAlmostEqual(lon, -20.2);
@@ -189,4 +189,4 @@ UNIT_TEST(LatLon_Match_False)
   TEST(!MatchLatLonDegree("2 1st", lat, lon), ());
 }
 
-} // namespace latlon_match_test
+}  // namespace latlon_match_test
diff --git a/libs/search/search_tests/locality_finder_test.cpp b/libs/search/search_tests/locality_finder_test.cpp
index faf1ef84f..a0444c6ca 100644
--- a/libs/search/search_tests/locality_finder_test.cpp
+++ b/libs/search/search_tests/locality_finder_test.cpp
@@ -59,10 +59,7 @@ public:
     }
   }
 
-  ~LocalityFinderTest()
-  {
-    platform::CountryIndexes::DeleteFromDisk(m_worldFile);
-  }
+  ~LocalityFinderTest() { platform::CountryIndexes::DeleteFromDisk(m_worldFile); }
 
   void RunTests(std::vector<ms::LatLon> const & input, char const * results[])
   {
@@ -70,9 +67,7 @@ public:
     {
       std::string_view result;
       m_finder.GetLocality(mercator::FromLatLon(input[i]), [&](search::LocalityItem const & item)
-      {
-        item.GetSpecifiedOrDefaultName(StringUtf8Multilang::kEnglishCode, result);
-      });
+      { item.GetSpecifiedOrDefaultName(StringUtf8Multilang::kEnglishCode, result); });
       TEST_EQUAL(result, results[i], ());
     }
   }
@@ -85,16 +80,11 @@ public:
 UNIT_CLASS_TEST(LocalityFinderTest, Smoke)
 {
   std::vector<ms::LatLon> input;
-  input.emplace_back(53.8993094, 27.5433964);   // Minsk
-  input.emplace_back(48.856517, 2.3521);        // Paris
-  input.emplace_back(52.5193859, 13.3908289);   // Berlin
+  input.emplace_back(53.8993094, 27.5433964);  // Minsk
+  input.emplace_back(48.856517, 2.3521);       // Paris
+  input.emplace_back(52.5193859, 13.3908289);  // Berlin
 
-  char const * results[] =
-  {
-    "Minsk",
-    "Paris",
-    "Berlin"
-  };
+  char const * results[] = {"Minsk", "Paris", "Berlin"};
 
   RunTests(input, results);
 
@@ -110,17 +100,8 @@ UNIT_CLASS_TEST(LocalityFinderTest, Smoke)
   input.emplace_back(43.9363996, 12.4466991);  // City of San Marino
   input.emplace_back(47.3345002, 8.531262);    // Zurich
 
-  char const * results3[] =
-  {
-    "Chicago",
-    "Rio de Janeiro",
-    "Melbourne",
-    "Minsk",
-    "Minsk",
-    "Budva",
-    "City of San Marino",
-    "Zurich"
-  };
+  char const * results3[] = {"Chicago", "Rio de Janeiro", "Melbourne",          "Minsk",
+                             "Minsk",   "Budva",          "City of San Marino", "Zurich"};
 
   RunTests(input, results3);
 }
@@ -128,13 +109,10 @@ UNIT_CLASS_TEST(LocalityFinderTest, Smoke)
 UNIT_CLASS_TEST(LocalityFinderTest, Moscow)
 {
   std::vector<ms::LatLon> input;
-  input.emplace_back(55.80166, 37.54066);   // Krasnoarmeyskaya 30
+  input.emplace_back(55.80166, 37.54066);  // Krasnoarmeyskaya 30
 
-  char const * results[] =
-  {
-    "Moscow"
-  };
+  char const * results[] = {"Moscow"};
 
   RunTests(input, results);
 }
-} // namespace locality_finder_test
+}  // namespace locality_finder_test
diff --git a/libs/search/search_tests/locality_scorer_test.cpp b/libs/search/search_tests/locality_scorer_test.cpp
index 258b499a8..85d28e5ef 100644
--- a/libs/search/search_tests/locality_scorer_test.cpp
+++ b/libs/search/search_tests/locality_scorer_test.cpp
@@ -33,15 +33,9 @@ class LocalityScorerTest : public LocalityScorer::Delegate
 public:
   using Ids = vector<uint32_t>;
 
-  LocalityScorerTest()
-    : m_scorer(m_params, m2::PointD(), static_cast<LocalityScorer::Delegate &>(*this))
-  {
-  }
+  LocalityScorerTest() : m_scorer(m_params, m2::PointD(), static_cast<LocalityScorer::Delegate &>(*this)) {}
 
-  void InitParams(string const & query, bool lastTokenIsPrefix)
-  {
-    InitParams(query, m2::PointD(), lastTokenIsPrefix);
-  }
+  void InitParams(string const & query, bool lastTokenIsPrefix) { InitParams(query, m2::PointD(), lastTokenIsPrefix); }
 
   void InitParams(string const & query, m2::PointD const & pivot, bool lastTokenIsPrefix)
   {
@@ -59,8 +53,8 @@ public:
     m_params.Init(query, tokens, lastTokenIsPrefix);
   }
 
-  void AddLocality(string const & name, uint32_t featureId, uint8_t rank = 0,
-                   m2::PointD const & center = {}, bool belongsToMatchedRegion = false)
+  void AddLocality(string const & name, uint32_t featureId, uint8_t rank = 0, m2::PointD const & center = {},
+                   bool belongsToMatchedRegion = false)
   {
     set<UniString> tokens;
     SplitUniString(NormalizeAndSimplifyString(name), base::MakeInsertFunctor(tokens), Delimiters());
@@ -86,18 +80,16 @@ public:
       bool const isPrefixToken = m_params.IsPrefixToken(i);
 
       vector<uint64_t> ids;
-      token.ForOriginalAndSynonyms([&](UniString const & synonym) {
+      token.ForOriginalAndSynonyms([&](UniString const & synonym)
+      {
         if (isPrefixToken)
         {
-          m_searchIndex.ForEachInSubtree(synonym,
-                                         [&](UniString const & /* prefix */, uint32_t featureId) {
-                                           ids.push_back(featureId);
-                                         });
+          m_searchIndex.ForEachInSubtree(
+              synonym, [&](UniString const & /* prefix */, uint32_t featureId) { ids.push_back(featureId); });
         }
         else
         {
-          m_searchIndex.ForEachInNode(synonym,
-                                      [&](uint32_t featureId) { ids.push_back(featureId); });
+          m_searchIndex.ForEachInNode(synonym, [&](uint32_t featureId) { ids.push_back(featureId); });
         }
       });
 
@@ -252,8 +244,7 @@ UNIT_CLASS_TEST(LocalityScorerTest, Ranks)
   AddLocality("San Francisco", ID_SAN_FRANCISCO, 30 /* rank */);
 
   InitParams("San", false /* lastTokenIsPrefix */);
-  TEST_EQUAL(GetTopLocalities(100 /* limit */),
-             Ids({ID_SAN_MARINO, ID_SAN_ANTONIO, ID_SAN_FRANCISCO}), ());
+  TEST_EQUAL(GetTopLocalities(100 /* limit */), Ids({ID_SAN_MARINO, ID_SAN_ANTONIO, ID_SAN_FRANCISCO}), ());
   TEST_EQUAL(GetTopLocalities(2 /* limit */), Ids({ID_SAN_MARINO, ID_SAN_FRANCISCO}), ());
   TEST_EQUAL(GetTopLocalities(1 /* limit */), Ids({ID_SAN_FRANCISCO}), ());
 }
@@ -301,8 +292,7 @@ UNIT_CLASS_TEST(LocalityScorerTest, DistanceToPivot)
   // Expected order is: the closest one (ID_ABERDEEN_CLOSE) first, then sorted by rank.
   TEST_EQUAL(GetTopLocalities(1 /* limit */), Ids({ID_ABERDEEN_CLOSE}), ());
   TEST_EQUAL(GetTopLocalities(2 /* limit */), Ids({ID_ABERDEEN_CLOSE, ID_ABERDEEN_RANK1}), ());
-  TEST_EQUAL(GetTopLocalities(3 /* limit */),
-             Ids({ID_ABERDEEN_CLOSE, ID_ABERDEEN_RANK1, ID_ABERDEEN_RANK2}), ());
+  TEST_EQUAL(GetTopLocalities(3 /* limit */), Ids({ID_ABERDEEN_CLOSE, ID_ABERDEEN_RANK1, ID_ABERDEEN_RANK2}), ());
 }
 
 UNIT_CLASS_TEST(LocalityScorerTest, MatchedRegion)
@@ -328,8 +318,7 @@ UNIT_CLASS_TEST(LocalityScorerTest, MatchedRegion)
 
   // Expected order is: the city from the matched region, then the closest one, then sorted by rank.
   TEST_EQUAL(GetTopLocalities(1 /* limit */), Ids({ID_SPRINGFIELD_MATCHED_REGION}), ());
-  TEST_EQUAL(GetTopLocalities(2 /* limit */),
-             Ids({ID_SPRINGFIELD_MATCHED_REGION, ID_SPRINGFIELD_CLOSE}), ());
+  TEST_EQUAL(GetTopLocalities(2 /* limit */), Ids({ID_SPRINGFIELD_MATCHED_REGION, ID_SPRINGFIELD_CLOSE}), ());
   TEST_EQUAL(GetTopLocalities(3 /* limit */),
              Ids({ID_SPRINGFIELD_MATCHED_REGION, ID_SPRINGFIELD_CLOSE, ID_SPRINGFIELD_RANK1}), ());
 }
diff --git a/libs/search/search_tests/locality_selector_test.cpp b/libs/search/search_tests/locality_selector_test.cpp
index 3c27e0e1e..314d94752 100644
--- a/libs/search/search_tests/locality_selector_test.cpp
+++ b/libs/search/search_tests/locality_selector_test.cpp
@@ -24,8 +24,7 @@ struct City
 {
   City(string const & name, m2::PointD const & center, uint64_t population, FeatureID const & id)
     : m_item(ToMultilang(name), center, {} /* boundaries */, population, id)
-  {
-  }
+  {}
 
   LocalityItem m_item;
 };
@@ -58,11 +57,10 @@ MatchedCity GetMatchedCity(m2::PointD const & point, vector<City> const & cities
 UNIT_TEST(LocalitySelector_Test1)
 {
   MwmSet::MwmId mwmId;
-  auto const city =
-      GetMatchedCity(m2::PointD(-97.56345, 26.79672),
-                     {{"Matamoros", m2::PointD(-97.50665, 26.79718), 918536, {mwmId, 0}},
+  auto const city = GetMatchedCity(m2::PointD(-97.56345, 26.79672),
+                                   {{"Matamoros", m2::PointD(-97.50665, 26.79718), 918536, {mwmId, 0}},
 
-                      {"Brownsville", m2::PointD(-97.48910, 26.84558), 180663, {mwmId, 1}}});
+                                    {"Brownsville", m2::PointD(-97.48910, 26.84558), 180663, {mwmId, 1}}});
   TEST_EQUAL(city.m_name, "Matamoros", ());
   TEST_EQUAL(city.m_id.m_index, 0, ());
 }
diff --git a/libs/search/search_tests/mem_search_index_tests.cpp b/libs/search/search_tests/mem_search_index_tests.cpp
index e8dd08451..f16330bb6 100644
--- a/libs/search/search_tests/mem_search_index_tests.cpp
+++ b/libs/search/search_tests/mem_search_index_tests.cpp
@@ -67,14 +67,12 @@ public:
       request.m_langs.insert(StringUtf8Multilang::GetLangIndex(lang));
 
       vector<Id> curr;
-      MatchFeaturesInTrie(request, m_index.GetRootIterator(),
-                          [](Id const & /* id */) { return true; } /* filter */,
+      MatchFeaturesInTrie(request, m_index.GetRootIterator(), [](Id const & /* id */) { return true; } /* filter */,
                           [&curr](Id const & id, bool /* exactMatch */) { curr.push_back(id); } /* toDo */);
       base::SortUnique(curr);
 
       vector<Id> intersection;
-      set_intersection(prev.begin(), prev.end(), curr.begin(), curr.end(),
-                       back_inserter(intersection));
+      set_intersection(prev.begin(), prev.end(), curr.begin(), curr.end(), back_inserter(intersection));
       prev = intersection;
     });
 
diff --git a/libs/search/search_tests/point_rect_matcher_tests.cpp b/libs/search/search_tests/point_rect_matcher_tests.cpp
index 31841a508..e249947b5 100644
--- a/libs/search/search_tests/point_rect_matcher_tests.cpp
+++ b/libs/search/search_tests/point_rect_matcher_tests.cpp
@@ -26,9 +26,8 @@ UNIT_TEST(PointRectMatcher_Smoke)
   for (auto requestType : {PointRectMatcher::RequestType::Any, PointRectMatcher::RequestType::All})
   {
     matcher.Match(vector<PointIdPair>{}, vector<RectIdPair>{}, requestType,
-                  [](size_t /* pointId */, size_t /* rectId */) {
-                    TEST(false, ("This callback should not be called!"));
-                  });
+                  [](size_t /* pointId */, size_t /* rectId */)
+    { TEST(false, ("This callback should not be called!")); });
   }
 }
 
@@ -45,27 +44,23 @@ UNIT_TEST(PointRectMatcher_Simple)
   PointRectMatcher matcher;
 
   {
-    matcher.Match(points, vector<RectIdPair>{}, PointRectMatcher::RequestType::Any,
-                  [](size_t pointId, size_t rectId) {
-                    TEST(false, ("Callback should not be called:", pointId, rectId));
-                  });
+    matcher.Match(points, vector<RectIdPair>{}, PointRectMatcher::RequestType::Any, [](size_t pointId, size_t rectId)
+    { TEST(false, ("Callback should not be called:", pointId, rectId)); });
   }
 
   {
-    matcher.Match(vector<PointIdPair>{}, rects, PointRectMatcher::RequestType::Any,
-                  [](size_t pointId, size_t rectId) {
-                    TEST(false, ("Callback should not be called:", pointId, rectId));
-                  });
+    matcher.Match(vector<PointIdPair>{}, rects, PointRectMatcher::RequestType::Any, [](size_t pointId, size_t rectId)
+    { TEST(false, ("Callback should not be called:", pointId, rectId)); });
   }
 
   {
     vector<size_t> actualMatching(points.size(), kInvalidId);
-    matcher.Match(points, rects, PointRectMatcher::RequestType::Any,
-                  [&](size_t pointId, size_t rectId) {
-                    TEST_LESS(pointId, actualMatching.size(), ());
-                    TEST_EQUAL(actualMatching[pointId], kInvalidId, ());
-                    actualMatching[pointId] = rectId;
-                  });
+    matcher.Match(points, rects, PointRectMatcher::RequestType::Any, [&](size_t pointId, size_t rectId)
+    {
+      TEST_LESS(pointId, actualMatching.size(), ());
+      TEST_EQUAL(actualMatching[pointId], kInvalidId, ());
+      actualMatching[pointId] = rectId;
+    });
 
     vector<size_t> const expectedMatching = {{0, 2, 2, kInvalidId}};
     TEST_EQUAL(actualMatching, expectedMatching, ());
@@ -87,12 +82,12 @@ UNIT_TEST(PointRectMatcher_MultiplePointsInRect)
 
   {
     vector<pair<size_t, size_t>> actualCalls;
-    matcher.Match(points, rects, PointRectMatcher::RequestType::All,
-                  [&](size_t pointId, size_t rectId) {
-                    TEST_LESS(pointId, points.size(), ());
-                    TEST_LESS(rectId, rects.size(), ());
-                    actualCalls.emplace_back(pointId, rectId);
-                  });
+    matcher.Match(points, rects, PointRectMatcher::RequestType::All, [&](size_t pointId, size_t rectId)
+    {
+      TEST_LESS(pointId, points.size(), ());
+      TEST_LESS(rectId, rects.size(), ());
+      actualCalls.emplace_back(pointId, rectId);
+    });
 
     vector<pair<size_t, size_t>> const expectedCalls = {{0, 0}, {0, 2}, {1, 0}, {1, 2}, {2, 1},
                                                         {2, 2}, {3, 1}, {3, 2}, {4, 2}, {5, 2}};
diff --git a/libs/search/search_tests/query_saver_tests.cpp b/libs/search/search_tests/query_saver_tests.cpp
index a8ae9d595..05c1bd746 100644
--- a/libs/search/search_tests/query_saver_tests.cpp
+++ b/libs/search/search_tests/query_saver_tests.cpp
@@ -11,7 +11,7 @@ namespace
 {
 search::QuerySaver::SearchRequest const record1("RU_ru", "test record1");
 search::QuerySaver::SearchRequest const record2("En_us", "sometext");
-}
+}  // namespace
 
 namespace search
 {
diff --git a/libs/search/search_tests/ranking_tests.cpp b/libs/search/search_tests/ranking_tests.cpp
index 048e44940..33682ca65 100644
--- a/libs/search/search_tests/ranking_tests.cpp
+++ b/libs/search/search_tests/ranking_tests.cpp
@@ -2,8 +2,8 @@
 
 #include "search/pre_ranker.hpp"
 #include "search/query_params.hpp"
-#include "search/ranking_utils.hpp"
 #include "search/ranking_info.hpp"
+#include "search/ranking_utils.hpp"
 #include "search/token_range.hpp"
 #include "search/token_slice.hpp"
 
@@ -42,12 +42,12 @@ void AssignRankingInfo(NameScores const & scores, RankingInfo & info, size_t tot
   info.m_isAltOrOldName = scores.m_isAltOrOldName;
   info.m_matchedFraction = scores.m_matchedLength / static_cast<float>(totalLength);
 }
-} // namespace
+}  // namespace
 
 UNIT_TEST(NameScore_Smoke)
 {
-  auto const test = [](string const & name, string const & query,
-                       NameScore nameScore, size_t errorsMade, size_t matchedLength)
+  auto const test =
+      [](string const & name, string const & query, NameScore nameScore, size_t errorsMade, size_t matchedLength)
   {
     NameScores const expected(nameScore, nameScore == NameScore::ZERO ? ErrorsMade() : ErrorsMade(errorsMade),
                               false /* isAltOrOldNAme */, matchedLength);
@@ -102,7 +102,7 @@ UNIT_TEST(NameScore_Smoke)
 
   test("Mariano Acosta", "arcos", NameScore::SUBSTRING, 1, 5);  /// @todo PREFIX?
   /// @todo Matched, rank calculation is bad.
-  //test("Marcos Paz", "arcos", NameScore::FULL_PREFIX, 1, 5);
+  // test("Marcos Paz", "arcos", NameScore::FULL_PREFIX, 1, 5);
 }
 
 namespace
@@ -115,7 +115,7 @@ ErrorsMade GetPrefixErrorsMade(QueryParams::Token const & token, strings::UniStr
 {
   return search::impl::GetPrefixErrorsMade(token, text, search::BuildLevenshteinDFA(text));
 }
-} // namespace
+}  // namespace
 
 UNIT_TEST(ErrorsMade_Smoke)
 {
@@ -219,7 +219,7 @@ UNIT_TEST(RankingInfo_PreferCountry)
   country.m_distanceToPivot = 1e6;
   country.m_tokenRanges[Model::TYPE_COUNTRY] = TokenRange(0, 1);
   country.m_type = Model::TYPE_COUNTRY;
-  country.m_rank = 100;   // This is rather small rank for a country.
+  country.m_rank = 100;  // This is rather small rank for a country.
 
   // Country should be preferred even if cafe is much closer to viewport center.
   TEST_LESS(cafe.GetLinearModelRank(), country.GetLinearModelRank(), (cafe, country));
@@ -256,6 +256,7 @@ namespace
 class MwmIdWrapper
 {
   FeatureID m_id;
+
 public:
   MwmIdWrapper(MwmSet::MwmId id) : m_id(std::move(id), 0) {}
   FeatureID const & GetId() const { return m_id; }
@@ -280,7 +281,7 @@ size_t UniqueMwmIdCount(std::vector<MwmIdWrapper> & test)
   TEST_EQUAL(count, test.size(), ());
   return mwmSet.size();
 }
-} // namespace
+}  // namespace
 
 UNIT_TEST(PreRanker_ForEachMwmOrder)
 {
@@ -298,4 +299,4 @@ UNIT_TEST(PreRanker_ForEachMwmOrder)
     TEST_EQUAL(3, UniqueMwmIdCount(test), ());
   }
 }
-} // namespace ranking_tests
+}  // namespace ranking_tests
diff --git a/libs/search/search_tests/results_tests.cpp b/libs/search/search_tests/results_tests.cpp
index 26505fba3..33f415830 100644
--- a/libs/search/search_tests/results_tests.cpp
+++ b/libs/search/search_tests/results_tests.cpp
@@ -29,9 +29,7 @@ UNIT_TEST(Results_Sorting)
     TEST_EQUAL(result.GetPositionInResults(), std::distance(r.begin(), it), ());
   }
 
-  r.SortBy([](auto const & lhs, auto const & rhs) {
-    return lhs.GetFeatureID().m_index < rhs.GetFeatureID().m_index;
-  });
+  r.SortBy([](auto const & lhs, auto const & rhs) { return lhs.GetFeatureID().m_index < rhs.GetFeatureID().m_index; });
 
   for (auto it = r.begin(); it != r.end(); ++it)
   {
diff --git a/libs/search/search_tests/segment_tree_tests.cpp b/libs/search/search_tests/segment_tree_tests.cpp
index e648e618e..1afcb4f88 100644
--- a/libs/search/search_tests/segment_tree_tests.cpp
+++ b/libs/search/search_tests/segment_tree_tests.cpp
@@ -24,7 +24,8 @@ size_t FindAny(SegmentTree const & tree, double x)
 {
   size_t id = kInvalidId;
   bool called = false;
-  tree.FindAny(x, [&](SegmentTree::Segment const & segment) {
+  tree.FindAny(x, [&](SegmentTree::Segment const & segment)
+  {
     CHECK(!called, ());
     id = segment.m_id;
     called = true;
@@ -35,7 +36,8 @@ size_t FindAny(SegmentTree const & tree, double x)
 set<size_t> FindAll(SegmentTree & tree, double x)
 {
   set<size_t> result;
-  tree.FindAll(x, [&](SegmentTree::Segment const & segment) {
+  tree.FindAll(x, [&](SegmentTree::Segment const & segment)
+  {
     auto const id = segment.m_id;
     CHECK(result.find(id) == result.end(), ());
     result.insert(id);
@@ -55,8 +57,8 @@ UNIT_TEST(SegmentTree_Smoke)
 
 UNIT_TEST(SegmentTree_Simple)
 {
-  vector<Segment> segments = {Segment(-10000 /* from */, -10000 /* to */, 0 /* id */),
-                              Segment(-10, -6, 1), Segment(-7, -3, 2), Segment(-5, -2, 3)};
+  vector<Segment> segments = {Segment(-10000 /* from */, -10000 /* to */, 0 /* id */), Segment(-10, -6, 1),
+                              Segment(-7, -3, 2), Segment(-5, -2, 3)};
   CHECK(is_sorted(segments.begin(), segments.end()), ());
 
   SegmentTree tree(segments);
diff --git a/libs/search/search_tests/string_match_test.cpp b/libs/search/search_tests/string_match_test.cpp
index 216e3c3af..e91571f0b 100644
--- a/libs/search/search_tests/string_match_test.cpp
+++ b/libs/search/search_tests/string_match_test.cpp
@@ -104,29 +104,29 @@ UNIT_TEST(StringMatchCost_PrefixMatch)
 
 UNIT_TEST(StringSplit_Smoke)
 {
-  TestEqual(NormalizeAndTokenizeString("1/2"), { "1", "2" });
-  TestEqual(NormalizeAndTokenizeString("xxx-yyy"), { "xxx", "yyy" });
+  TestEqual(NormalizeAndTokenizeString("1/2"), {"1", "2"});
+  TestEqual(NormalizeAndTokenizeString("xxx-yyy"), {"xxx", "yyy"});
 }
 
 UNIT_TEST(StringSplit_Apostrophe)
 {
-  TestEqual(NormalizeAndTokenizeString("Barne's & Noble"), { "barnes", "noble" });
-  TestEqual(NormalizeAndTokenizeString("Michael's"), { "michaels" });
-  TestEqual(NormalizeAndTokenizeString("'s"), { "s" });
-  TestEqual(NormalizeAndTokenizeString("xyz'"), { "xyz" });
-  TestEqual(NormalizeAndTokenizeString("'''"), { });
+  TestEqual(NormalizeAndTokenizeString("Barne's & Noble"), {"barnes", "noble"});
+  TestEqual(NormalizeAndTokenizeString("Michael's"), {"michaels"});
+  TestEqual(NormalizeAndTokenizeString("'s"), {"s"});
+  TestEqual(NormalizeAndTokenizeString("xyz'"), {"xyz"});
+  TestEqual(NormalizeAndTokenizeString("'''"), {});
 }
 
 UNIT_TEST(StringSplit_NumeroHashtag)
 {
-  TestEqual(NormalizeAndTokenizeString("Зона №51"), { "зона", "51" });
-  TestEqual(NormalizeAndTokenizeString("Зона № 51"), { "зона", "51" });
-  TestEqual(NormalizeAndTokenizeString("Area #51"), { "area", "51" });
-  TestEqual(NormalizeAndTokenizeString("Area # "), { "area" });
-  TestEqual(NormalizeAndTokenizeString("Area #One"), { "area", "one" });
-  TestEqual(NormalizeAndTokenizeString("xxx#yyy"), { "xxx", "yyy" });
-  TestEqual(NormalizeAndTokenizeString("#'s"), { "s" });
-  TestEqual(NormalizeAndTokenizeString("##osm's"), { "osms" });
+  TestEqual(NormalizeAndTokenizeString("Зона №51"), {"зона", "51"});
+  TestEqual(NormalizeAndTokenizeString("Зона № 51"), {"зона", "51"});
+  TestEqual(NormalizeAndTokenizeString("Area #51"), {"area", "51"});
+  TestEqual(NormalizeAndTokenizeString("Area # "), {"area"});
+  TestEqual(NormalizeAndTokenizeString("Area #One"), {"area", "one"});
+  TestEqual(NormalizeAndTokenizeString("xxx#yyy"), {"xxx", "yyy"});
+  TestEqual(NormalizeAndTokenizeString("#'s"), {"s"});
+  TestEqual(NormalizeAndTokenizeString("##osm's"), {"osms"});
 }
 
-} // namespace string_match_test
+}  // namespace string_match_test
diff --git a/libs/search/search_tests/suggest_tests.cpp b/libs/search/search_tests/suggest_tests.cpp
index 677b106e4..9b3b55457 100644
--- a/libs/search/search_tests/suggest_tests.cpp
+++ b/libs/search/search_tests/suggest_tests.cpp
@@ -1,18 +1,19 @@
 #include "testing/testing.hpp"
 
-#include "search/suggest.hpp"
 #include "search/string_utils.hpp"
+#include "search/suggest.hpp"
 
 UNIT_TEST(Suggest_Smoke)
 {
   std::string const street = "Avenida Santa Fe";
   TEST_EQUAL(street + ' ', search::GetSuggestion(street, search::MakeQueryString("santa f")), ());
   TEST_EQUAL("3655 " + street + ' ', search::GetSuggestion(street, search::MakeQueryString("3655 santa f")), ());
-  TEST_EQUAL("3655 east " + street + ' ', search::GetSuggestion(street, search::MakeQueryString("3655 santa east f")), ());
+  TEST_EQUAL("3655 east " + street + ' ', search::GetSuggestion(street, search::MakeQueryString("3655 santa east f")),
+             ());
 
   // Full prefix match -> no suggest.
   TEST_EQUAL("", search::GetSuggestion(street, search::MakeQueryString("east santa fe")), ());
 
   /// @todo Process street shorts like: st, av, ne, w, ..
-  //TEST_EQUAL(street, search::GetSuggestion(street, search::MakeQueryString("av sant")), ());
+  // TEST_EQUAL(street, search::GetSuggestion(street, search::MakeQueryString("av sant")), ());
 }
diff --git a/libs/search/search_tests/text_index_tests.cpp b/libs/search/search_tests/text_index_tests.cpp
index 93b8ebcc2..3b5e8175f 100644
--- a/libs/search/search_tests/text_index_tests.cpp
+++ b/libs/search/search_tests/text_index_tests.cpp
@@ -44,9 +44,7 @@ search_base::MemTextIndex BuildMemTextIndex(vector<string> const & docsCollectio
   for (size_t docId = 0; docId < docsCollection.size(); ++docId)
   {
     strings::Tokenize(docsCollection[docId], " ", [&memIndex, docId](std::string_view tok)
-    {
-      memIndex.AddPosting(std::string(tok), static_cast<uint32_t>(docId));
-    });
+    { memIndex.AddPosting(std::string(tok), static_cast<uint32_t>(docId)); });
   }
 
   return memIndex;
@@ -124,9 +122,8 @@ UNIT_TEST(TextIndex_UniString)
 
   for (size_t docId = 0; docId < docsCollection.size(); ++docId)
   {
-    auto addToIndex = [&](strings::UniString const & token) {
-      memIndex.AddPosting(strings::ToUtf8(token), static_cast<uint32_t>(docId));
-    };
+    auto addToIndex = [&](strings::UniString const & token)
+    { memIndex.AddPosting(strings::ToUtf8(token), static_cast<uint32_t>(docId)); };
     auto delims = [](strings::UniChar const & c) { return c == ' '; };
     SplitUniString(docsCollection[docId], addToIndex, delims);
   }
diff --git a/libs/search/search_tests/utm_mgrs_coords_match_test.cpp b/libs/search/search_tests/utm_mgrs_coords_match_test.cpp
index 01082d328..ef1245c75 100644
--- a/libs/search/search_tests/utm_mgrs_coords_match_test.cpp
+++ b/libs/search/search_tests/utm_mgrs_coords_match_test.cpp
@@ -161,4 +161,4 @@ UNIT_TEST(MatchMGRSCoords_convert)
   TestAlmostEqual(MatchMGRSCoords("31N BA 32007 00000"), 0.000000, 0.592330);
 }
 
-} // namespace utm_mgrs_coords_match_test
+}  // namespace utm_mgrs_coords_match_test
diff --git a/libs/search/search_tests_support/helpers.cpp b/libs/search/search_tests_support/helpers.cpp
index f385bb5e7..9e78fc167 100644
--- a/libs/search/search_tests_support/helpers.cpp
+++ b/libs/search/search_tests_support/helpers.cpp
@@ -14,7 +14,8 @@ namespace tests_support
 using namespace std;
 
 SearchTestBase::SearchTestBase(base::LogLevel logLevel, bool mockCountryInfo)
-  : m_scopedLog(logLevel), m_engine(m_dataSource, {}, mockCountryInfo)
+  : m_scopedLog(logLevel)
+  , m_engine(m_dataSource, {}, mockCountryInfo)
 {
   SetViewport(mercator::Bounds::FullRect());
 
@@ -27,8 +28,7 @@ void SearchTestBase::SetViewport(ms::LatLon const & ll, double radiusM)
   SetViewport(mercator::MetersToXY(ll.m_lon, ll.m_lat, radiusM));
 }
 
-bool SearchTestBase::CategoryMatch(std::string const & query, Rules const & rules,
-                                   string const & locale /* = "en" */)
+bool SearchTestBase::CategoryMatch(std::string const & query, Rules const & rules, string const & locale /* = "en" */)
 {
   TestSearchRequest request(m_engine, query, locale, Mode::Everywhere, m_viewport);
   request.SetCategorial();
@@ -38,8 +38,7 @@ bool SearchTestBase::CategoryMatch(std::string const & query, Rules const & rule
 }
 
 bool SearchTestBase::ResultsMatch(std::string const & query, Rules const & rules,
-                                  std::string const & locale /* = "en" */,
-                                  Mode mode /* = Mode::Everywhere */)
+                                  std::string const & locale /* = "en" */, Mode mode /* = Mode::Everywhere */)
 {
   TestSearchRequest request(m_engine, query, locale, mode, m_viewport);
   request.Run();
@@ -47,8 +46,7 @@ bool SearchTestBase::ResultsMatch(std::string const & query, Rules const & rules
 }
 
 bool SearchTestBase::OrderedResultsMatch(std::string const & query, Rules const & rules,
-                                         std::string const & locale /* = "en" */,
-                                         Mode mode /* = Mode::Everywhere */)
+                                         std::string const & locale /* = "en" */, Mode mode /* = Mode::Everywhere */)
 {
   TestSearchRequest request(m_engine, query, locale, mode, m_viewport);
   request.Run();
@@ -120,7 +118,7 @@ unique_ptr<TestSearchRequest> SearchTestBase::MakeRequest(SearchParams const & p
 size_t SearchTestBase::CountFeatures(m2::RectD const & rect)
 {
   size_t count = 0;
-  auto counter = [&count](const FeatureType & /* ft */) { ++count; };
+  auto counter = [&count](FeatureType const & /* ft */) { ++count; };
   m_dataSource.ForEachInRect(counter, rect, scales::GetUpperScale());
   return count;
 }
@@ -141,5 +139,5 @@ void SearchTest::OnMwmBuilt(MwmInfo const & info)
   }
 }
 
-} // namespace tests_supoort
-} // namespace search
+}  // namespace tests_support
+}  // namespace search
diff --git a/libs/search/search_tests_support/helpers.hpp b/libs/search/search_tests_support/helpers.hpp
index 923f46796..24752814d 100644
--- a/libs/search/search_tests_support/helpers.hpp
+++ b/libs/search/search_tests_support/helpers.hpp
@@ -29,15 +29,12 @@ public:
   inline void SetViewport(m2::RectD const & viewport) { m_viewport = viewport; }
   void SetViewport(ms::LatLon const & ll, double radiusM);
 
-  bool CategoryMatch(std::string const & query, Rules const & rules,
-                     std::string const & locale = "en");
+  bool CategoryMatch(std::string const & query, Rules const & rules, std::string const & locale = "en");
 
-  bool ResultsMatch(std::string const & query, Rules const & rules,
-                    std::string const & locale = "en",
+  bool ResultsMatch(std::string const & query, Rules const & rules, std::string const & locale = "en",
                     Mode mode = Mode::Everywhere);
 
-  bool OrderedResultsMatch(std::string const & query, Rules const & rules,
-                           std::string const & locale = "en",
+  bool OrderedResultsMatch(std::string const & query, Rules const & rules, std::string const & locale = "en",
                            Mode mode = Mode::Everywhere);
 
   bool ResultsMatch(std::vector<Result> const & results, Rules const & rules);
@@ -69,10 +66,7 @@ protected:
 class SearchTest : public SearchTestBase
 {
 public:
-  explicit SearchTest(base::LogLevel logLevel = base::LDEBUG)
-    : SearchTestBase(logLevel, true /* mockCountryInfo*/)
-  {
-  }
+  explicit SearchTest(base::LogLevel logLevel = base::LDEBUG) : SearchTestBase(logLevel, true /* mockCountryInfo*/) {}
 
   // Registers country in internal records. Note that physical country file may be absent.
   void RegisterCountry(std::string const & name, m2::RectD const & rect);
@@ -84,8 +78,7 @@ protected:
 class TestCafe : public generator::tests_support::TestPOI
 {
 public:
-  TestCafe(m2::PointD const & center, std::string const & name, std::string const & lang)
-    : TestPOI(center, name, lang)
+  TestCafe(m2::PointD const & center, std::string const & name, std::string const & lang) : TestPOI(center, name, lang)
   {
     SetTypes({{"amenity", "cafe"}});
   }
@@ -96,8 +89,7 @@ public:
 class TestHotel : public generator::tests_support::TestPOI
 {
 public:
-  TestHotel(m2::PointD const & center, std::string const & name, std::string const & lang)
-    : TestPOI(center, name, lang)
+  TestHotel(m2::PointD const & center, std::string const & name, std::string const & lang) : TestPOI(center, name, lang)
   {
     SetTypes({{"tourism", "hotel"}});
   }
@@ -105,5 +97,5 @@ public:
   explicit TestHotel(m2::PointD const & center) : TestHotel(center, "hotel", "en") {}
 };
 
-} // namespace tests_support
-} // namespace search
+}  // namespace tests_support
+}  // namespace search
diff --git a/libs/search/search_tests_support/test_results_matching.cpp b/libs/search/search_tests_support/test_results_matching.cpp
index aa5e5802b..fb52eb347 100644
--- a/libs/search/search_tests_support/test_results_matching.cpp
+++ b/libs/search/search_tests_support/test_results_matching.cpp
@@ -16,9 +16,9 @@ namespace search
 namespace tests_support
 {
 ExactMatchingRule::ExactMatchingRule(MwmSet::MwmId const & mwmId, TestFeature const & feature)
-  : m_mwmId(mwmId), m_feature(feature)
-{
-}
+  : m_mwmId(mwmId)
+  , m_feature(feature)
+{}
 
 bool ExactMatchingRule::Matches(FeatureType & feature) const
 {
@@ -36,16 +36,13 @@ string ExactMatchingRule::ToString() const
 
 AlternativesMatchingRule::AlternativesMatchingRule(vector<shared_ptr<MatchingRule>> && rules)
   : m_rules(std::move(rules))
-{
-}
+{}
 
 bool AlternativesMatchingRule::Matches(FeatureType & feature) const
 {
   for (auto const & rule : m_rules)
-  {
     if (rule->Matches(feature))
       return true;
-  }
   return false;
 }
 
@@ -73,7 +70,8 @@ bool MatchResults(DataSource const & dataSource, vector<shared_ptr<MatchingRule>
   sort(resultIds.begin(), resultIds.end());
 
   vector<string> unexpected;
-  auto removeMatched = [&rules, &unexpected](FeatureType & feature) {
+  auto removeMatched = [&rules, &unexpected](FeatureType & feature)
+  {
     for (auto it = rules.begin(); it != rules.end(); ++it)
     {
       if ((*it)->Matches(feature))
@@ -101,32 +99,29 @@ bool MatchResults(DataSource const & dataSource, vector<shared_ptr<MatchingRule>
   return false;
 }
 
-bool MatchResults(DataSource const & dataSource, vector<shared_ptr<MatchingRule>> rules,
-                  search::Results const & actual)
+bool MatchResults(DataSource const & dataSource, vector<shared_ptr<MatchingRule>> rules, search::Results const & actual)
 {
   vector<search::Result> const results(actual.begin(), actual.end());
   return MatchResults(dataSource, rules, results);
 }
 
-bool ResultMatches(DataSource const & dataSource, shared_ptr<MatchingRule> rule,
-                   search::Result const & result)
+bool ResultMatches(DataSource const & dataSource, shared_ptr<MatchingRule> rule, search::Result const & result)
 {
   bool matches = false;
-  dataSource.ReadFeature([&](FeatureType & ft) { matches = rule->Matches(ft); },
-                         result.GetFeatureID());
+  dataSource.ReadFeature([&](FeatureType & ft) { matches = rule->Matches(ft); }, result.GetFeatureID());
   return matches;
 }
 
-bool AlternativeMatch(DataSource const & dataSource,
-                      vector<vector<shared_ptr<MatchingRule>>> rulesList,
+bool AlternativeMatch(DataSource const & dataSource, vector<vector<shared_ptr<MatchingRule>>> rulesList,
                       std::vector<search::Result> const & results)
 {
-  return any_of(rulesList.begin(), rulesList.end(),
-                [&](vector<shared_ptr<MatchingRule>> const & rules) {
-                  return MatchResults(dataSource, rules, results);
-                });
+  return any_of(rulesList.begin(), rulesList.end(), [&](vector<shared_ptr<MatchingRule>> const & rules)
+  { return MatchResults(dataSource, rules, results); });
 }
 
-string DebugPrint(MatchingRule const & rule) { return rule.ToString(); }
+string DebugPrint(MatchingRule const & rule)
+{
+  return rule.ToString();
+}
 }  // namespace tests_support
 }  // namespace search
diff --git a/libs/search/search_tests_support/test_results_matching.hpp b/libs/search/search_tests_support/test_results_matching.hpp
index 324915fee..28dcda1ac 100644
--- a/libs/search/search_tests_support/test_results_matching.hpp
+++ b/libs/search/search_tests_support/test_results_matching.hpp
@@ -19,7 +19,7 @@ namespace tests_support
 {
 class TestFeature;
 }
-}
+}  // namespace generator
 
 namespace search
 {
@@ -37,8 +37,7 @@ public:
 class ExactMatchingRule : public MatchingRule
 {
 public:
-  ExactMatchingRule(MwmSet::MwmId const & mwmId,
-                    generator::tests_support::TestFeature const & feature);
+  ExactMatchingRule(MwmSet::MwmId const & mwmId, generator::tests_support::TestFeature const & feature);
 
   // MatchingRule overrides:
   bool Matches(FeatureType & feature) const override;
@@ -68,8 +67,7 @@ std::shared_ptr<MatchingRule> ExactMatch(Args &&... args)
   return std::make_shared<ExactMatchingRule>(std::forward<Args>(args)...);
 }
 
-inline std::shared_ptr<MatchingRule> AlternativesMatch(
-    std::vector<std::shared_ptr<MatchingRule>> && rules)
+inline std::shared_ptr<MatchingRule> AlternativesMatch(std::vector<std::shared_ptr<MatchingRule>> && rules)
 {
   return std::make_shared<AlternativesMatchingRule>(std::move(rules));
 }
@@ -78,10 +76,8 @@ bool MatchResults(DataSource const & dataSource, std::vector<std::shared_ptr<Mat
                   std::vector<search::Result> const & actual);
 bool MatchResults(DataSource const & dataSource, std::vector<std::shared_ptr<MatchingRule>> rules,
                   search::Results const & actual);
-bool ResultMatches(DataSource const & dataSource, std::shared_ptr<MatchingRule> rule,
-                   search::Result const & result);
-bool AlternativeMatch(DataSource const & dataSource,
-                      std::vector<std::vector<std::shared_ptr<MatchingRule>>> rules,
+bool ResultMatches(DataSource const & dataSource, std::shared_ptr<MatchingRule> rule, search::Result const & result);
+bool AlternativeMatch(DataSource const & dataSource, std::vector<std::vector<std::shared_ptr<MatchingRule>>> rules,
                       std::vector<search::Result> const & results);
 
 std::string DebugPrint(MatchingRule const & rule);
diff --git a/libs/search/search_tests_support/test_search_engine.cpp b/libs/search/search_tests_support/test_search_engine.cpp
index e26ce3202..d6a244244 100644
--- a/libs/search/search_tests_support/test_search_engine.cpp
+++ b/libs/search/search_tests_support/test_search_engine.cpp
@@ -15,12 +15,10 @@ namespace tests_support
 using namespace std;
 
 TestSearchEngine::TestSearchEngine(DataSource & dataSource, Engine::Params const & params, bool mockCountryInfo)
-  : m_infoGetter(mockCountryInfo ?
-                   make_unique<storage::CountryInfoGetterForTesting>() :
-                   storage::CountryInfoReader::CreateCountryInfoGetter(GetPlatform()))
+  : m_infoGetter(mockCountryInfo ? make_unique<storage::CountryInfoGetterForTesting>()
+                                 : storage::CountryInfoReader::CreateCountryInfoGetter(GetPlatform()))
   , m_engine(dataSource, GetDefaultCategories(), *m_infoGetter, params)
-{
-}
+{}
 
 void TestSearchEngine::InitAffiliations()
 {
diff --git a/libs/search/search_tests_support/test_search_request.cpp b/libs/search/search_tests_support/test_search_request.cpp
index 73c3a5690..55871cafa 100644
--- a/libs/search/search_tests_support/test_search_request.cpp
+++ b/libs/search/search_tests_support/test_search_request.cpp
@@ -13,8 +13,8 @@ namespace tests_support
 using namespace std::chrono;
 using namespace std;
 
-TestSearchRequest::TestSearchRequest(TestSearchEngine & engine, string const & query,
-                                     string const & locale, Mode mode, m2::RectD const & viewport)
+TestSearchRequest::TestSearchRequest(TestSearchEngine & engine, string const & query, string const & locale, Mode mode,
+                                     m2::RectD const & viewport)
   : m_engine(engine)
 {
   m_params.m_query = query;
@@ -28,16 +28,16 @@ TestSearchRequest::TestSearchRequest(TestSearchEngine & engine, string const & q
 }
 
 TestSearchRequest::TestSearchRequest(TestSearchEngine & engine, SearchParams const & params)
-  : m_engine(engine), m_params(params)
+  : m_engine(engine)
+  , m_params(params)
 {
   m_params.m_useDebugInfo = true;
 
   SetUpCallbacks();
 }
 
-TestSearchRequest::TestSearchRequest(TestSearchEngine & engine, string const & query,
-                                     string const & locale, Mode mode, m2::RectD const & viewport,
-                                     SearchParams::OnStarted const & onStarted,
+TestSearchRequest::TestSearchRequest(TestSearchEngine & engine, string const & query, string const & locale, Mode mode,
+                                     m2::RectD const & viewport, SearchParams::OnStarted const & onStarted,
                                      SearchParams::OnResults const & onResults)
   : m_engine(engine)
 {
diff --git a/libs/search/search_tests_support/test_search_request.hpp b/libs/search/search_tests_support/test_search_request.hpp
index 91c80b232..d68e311d5 100644
--- a/libs/search/search_tests_support/test_search_request.hpp
+++ b/libs/search/search_tests_support/test_search_request.hpp
@@ -25,8 +25,8 @@ class TestSearchEngine;
 class TestSearchRequest
 {
 public:
-  TestSearchRequest(TestSearchEngine & engine, std::string const & query,
-                    std::string const & locale, Mode mode, m2::RectD const & viewport);
+  TestSearchRequest(TestSearchEngine & engine, std::string const & query, std::string const & locale, Mode mode,
+                    m2::RectD const & viewport);
   TestSearchRequest(TestSearchEngine & engine, SearchParams const & params);
 
   void SetCategorial() { m_params.m_categorialRequest = true; }
@@ -46,9 +46,8 @@ public:
   std::vector<search::Result> const & Results() const;
 
 protected:
-  TestSearchRequest(TestSearchEngine & engine, std::string const & query,
-                    std::string const & locale, Mode mode, m2::RectD const & viewport,
-                    SearchParams::OnStarted const & onStarted,
+  TestSearchRequest(TestSearchEngine & engine, std::string const & query, std::string const & locale, Mode mode,
+                    m2::RectD const & viewport, SearchParams::OnStarted const & onStarted,
                     SearchParams::OnResults const & onResults);
 
   void SetUpCallbacks();
diff --git a/libs/search/search_tests_support/test_with_custom_mwms.hpp b/libs/search/search_tests_support/test_with_custom_mwms.hpp
index 9e07788ac..66df45623 100644
--- a/libs/search/search_tests_support/test_with_custom_mwms.hpp
+++ b/libs/search/search_tests_support/test_with_custom_mwms.hpp
@@ -21,10 +21,7 @@ namespace tests_support
 class TestWithCustomMwms : public generator::tests_support::TestWithCustomMwms
 {
 public:
-  TestWithCustomMwms()
-  {
-    editor::tests_support::SetUpEditorForTesting(std::make_unique<EditorDelegate>(m_dataSource));
-  }
+  TestWithCustomMwms() { editor::tests_support::SetUpEditorForTesting(std::make_unique<EditorDelegate>(m_dataSource)); }
 
   ~TestWithCustomMwms() override { editor::tests_support::TearDownEditorForTesting(); }
 
diff --git a/libs/search/search_trie.hpp b/libs/search/search_trie.hpp
index 6a11ea2bb..f53ca9069 100644
--- a/libs/search/search_trie.hpp
+++ b/libs/search/search_trie.hpp
@@ -4,6 +4,6 @@
 
 namespace search
 {
-static const uint8_t kCategoriesLang = 128;
-static const uint8_t kPostcodesLang = 129;
+static uint8_t const kCategoriesLang = 128;
+static uint8_t const kPostcodesLang = 129;
 }  // namespace search
diff --git a/libs/search/segment_tree.cpp b/libs/search/segment_tree.cpp
index 410b985dc..1bbf8c06e 100644
--- a/libs/search/segment_tree.cpp
+++ b/libs/search/segment_tree.cpp
@@ -51,8 +51,7 @@ void SegmentTree::FindSegment(size_t index, Segment const & segment, Fn && fn)
   Update(index);
 }
 
-void SegmentTree::BuildTree(size_t index, std::vector<Segment> const & segments, size_t left,
-                            size_t right)
+void SegmentTree::BuildTree(size_t index, std::vector<Segment> const & segments, size_t left, size_t right)
 {
   ASSERT_LESS_OR_EQUAL(left, right, ());
   auto const size = right - left;
diff --git a/libs/search/segment_tree.hpp b/libs/search/segment_tree.hpp
index 51e0c1f76..f8fe2a810 100644
--- a/libs/search/segment_tree.hpp
+++ b/libs/search/segment_tree.hpp
@@ -33,10 +33,7 @@ public:
       return m_id < rhs.m_id;
     }
 
-    bool operator==(Segment const & rhs) const
-    {
-      return m_id == rhs.m_id && m_from == rhs.m_from && m_to == rhs.m_to;
-    }
+    bool operator==(Segment const & rhs) const { return m_id == rhs.m_id && m_from == rhs.m_from && m_to == rhs.m_to; }
 
     // *NOTE* Do not change these values without care - current code
     // depends on default values.
diff --git a/libs/search/stats_cache.hpp b/libs/search/stats_cache.hpp
index 4c31861b8..96b2969f4 100644
--- a/libs/search/stats_cache.hpp
+++ b/libs/search/stats_cache.hpp
@@ -18,14 +18,11 @@ class Cache
   size_t m_accesses;
   size_t m_misses;
 
-  size_t m_emptyQueriesCount;       /// empty queries count at a row
-  std::string m_name;               /// cache name for print functions
+  size_t m_emptyQueriesCount;  /// empty queries count at a row
+  std::string m_name;          /// cache name for print functions
 
 public:
-  explicit Cache(std::string const & name)
-    : m_accesses(0), m_misses(0), m_emptyQueriesCount(0), m_name(name)
-  {
-  }
+  explicit Cache(std::string const & name) : m_accesses(0), m_misses(0), m_emptyQueriesCount(0), m_name(name) {}
 
   std::pair<Value &, bool> Get(Key const & key)
   {
@@ -50,8 +47,8 @@ public:
   {
     if (m_accesses != 0)
     {
-      LOG(LDEBUG, ("Cache", m_name, "Queries =", m_accesses, "From cache =", m_accesses - m_misses,
-                   "Added =", m_misses));
+      LOG(LDEBUG,
+          ("Cache", m_name, "Queries =", m_accesses, "From cache =", m_accesses - m_misses, "Added =", m_misses));
       m_accesses = m_misses = 0;
       m_emptyQueriesCount = 0;
     }
diff --git a/libs/search/street_vicinity_loader.cpp b/libs/search/street_vicinity_loader.cpp
index 0e672cec9..83c6a70eb 100644
--- a/libs/search/street_vicinity_loader.cpp
+++ b/libs/search/street_vicinity_loader.cpp
@@ -10,13 +10,14 @@
 
 #include "base/math.hpp"
 
-
 namespace search
 {
 StreetVicinityLoader::StreetVicinityLoader(int scale, double offsetMeters)
-  : m_context(nullptr), m_scale(scale), m_offsetMeters(offsetMeters), m_cache("Streets")
-{
-}
+  : m_context(nullptr)
+  , m_scale(scale)
+  , m_offsetMeters(offsetMeters)
+  , m_cache("Streets")
+{}
 
 void StreetVicinityLoader::SetContext(MwmContext * context)
 {
@@ -29,7 +30,10 @@ void StreetVicinityLoader::SetContext(MwmContext * context)
   m_scale = math::Clamp(m_scale, scaleRange.first, scaleRange.second);
 }
 
-void StreetVicinityLoader::OnQueryFinished() { m_cache.ClearIfNeeded(); }
+void StreetVicinityLoader::OnQueryFinished()
+{
+  m_cache.ClearIfNeeded();
+}
 
 StreetVicinityLoader::Street const & StreetVicinityLoader::GetStreet(uint32_t featureId)
 {
@@ -58,18 +62,16 @@ void StreetVicinityLoader::LoadStreet(uint32_t featureId, Street & street)
 
   /// @todo Can be optimized here. Do not aggregate rect, but aggregate covering intervals for each segment, instead.
   auto const sumRect = [&street, this](m2::PointD const & pt)
-  {
-    street.m_rect.Add(mercator::RectByCenterXYAndSizeInMeters(pt, m_offsetMeters));
-  };
+  { street.m_rect.Add(mercator::RectByCenterXYAndSizeInMeters(pt, m_offsetMeters)); };
 
   if (feature->GetGeomType() == feature::GeomType::Area)
   {
     feature->ForEachTriangle([&sumRect](m2::PointD const & p1, m2::PointD const & p2, m2::PointD const & p3)
-                             {
-                               sumRect(p1);
-                               sumRect(p2);
-                               sumRect(p3);
-                             }, FeatureType::BEST_GEOMETRY);
+    {
+      sumRect(p1);
+      sumRect(p2);
+      sumRect(p3);
+    }, FeatureType::BEST_GEOMETRY);
   }
   else
     feature->ForEachPoint(sumRect, FeatureType::BEST_GEOMETRY);
@@ -83,6 +85,6 @@ void StreetVicinityLoader::LoadStreet(uint32_t featureId, Street & street)
       street.m_features.push_back(id);
   });
 
-  //street.m_calculator = std::make_unique<ProjectionOnStreetCalculator>(points);
+  // street.m_calculator = std::make_unique<ProjectionOnStreetCalculator>(points);
 }
 }  // namespace search
diff --git a/libs/search/street_vicinity_loader.hpp b/libs/search/street_vicinity_loader.hpp
index 5c0a4e17a..27753fcb6 100644
--- a/libs/search/street_vicinity_loader.hpp
+++ b/libs/search/street_vicinity_loader.hpp
@@ -27,7 +27,7 @@ public:
 
     std::vector<uint32_t> m_features;
     m2::RectD m_rect;
-    //std::unique_ptr<ProjectionOnStreetCalculator> m_calculator;
+    // std::unique_ptr<ProjectionOnStreetCalculator> m_calculator;
 
     /// @todo Cache GetProjection results for features here, because
     /// feature::GetCenter and ProjectionOnStreetCalculator::GetProjection are not so fast.
diff --git a/libs/search/streets_matcher.cpp b/libs/search/streets_matcher.cpp
index 6c6eb9d36..d6599b598 100644
--- a/libs/search/streets_matcher.cpp
+++ b/libs/search/streets_matcher.cpp
@@ -15,8 +15,7 @@ using namespace std;
 
 namespace
 {
-bool LessByHashAndRange(StreetsMatcher::Prediction const & lhs,
-                        StreetsMatcher::Prediction const & rhs)
+bool LessByHashAndRange(StreetsMatcher::Prediction const & lhs, StreetsMatcher::Prediction const & rhs)
 {
   if (lhs.m_hash != rhs.m_hash)
     return lhs.m_hash < rhs.m_hash;
@@ -36,11 +35,10 @@ bool LessByHashAndRange(StreetsMatcher::Prediction const & lhs,
   return false;
 }
 
-bool EqualsByHashAndRange(StreetsMatcher::Prediction const & lhs,
-                          StreetsMatcher::Prediction const & rhs)
+bool EqualsByHashAndRange(StreetsMatcher::Prediction const & lhs, StreetsMatcher::Prediction const & rhs)
 {
-  return lhs.GetNumTokens() == rhs.GetNumTokens() &&
-         lhs.m_tokenRange.Begin() == rhs.m_tokenRange.Begin() && lhs.m_hash == rhs.m_hash;
+  return lhs.GetNumTokens() == rhs.GetNumTokens() && lhs.m_tokenRange.Begin() == rhs.m_tokenRange.Begin() &&
+         lhs.m_hash == rhs.m_hash;
 }
 
 void FindStreets(BaseContext const & ctx, CBV const & candidates, FeaturesFilter const & filter,
@@ -116,7 +114,6 @@ void FindStreets(BaseContext const & ctx, CBV const & candidates, FeaturesFilter
     streets = buffer;
     all = all.Intersect(ctx.m_features[tag].m_features);
     emptyIntersection = false;
-
   }, withMisprints);
 
   for (; curToken < ctx.NumTokens() && !ctx.IsTokenUsed(curToken) && !streets.IsEmpty(); ++curToken)
@@ -138,9 +135,8 @@ void FindStreets(BaseContext const & ctx, CBV const & candidates, FeaturesFilter
 }  // namespace
 
 // static
-void StreetsMatcher::Go(BaseContext const & ctx, CBV const & candidates,
-                        FeaturesFilter const & filter, QueryParams const & params,
-                        vector<Prediction> & predictions)
+void StreetsMatcher::Go(BaseContext const & ctx, CBV const & candidates, FeaturesFilter const & filter,
+                        QueryParams const & params, vector<Prediction> & predictions)
 {
   predictions.clear();
   FindStreets(ctx, candidates, filter, params, predictions);
@@ -175,35 +171,27 @@ void StreetsMatcher::Go(BaseContext const & ctx, CBV const & candidates,
   //
   // That's why we need all predictions here.
 
-  sort(predictions.begin(), predictions.end(), [](Prediction const & l, Prediction const & r)
-  {
-    return l.IsBetter(r);
-  });
+  sort(predictions.begin(), predictions.end(),
+       [](Prediction const & l, Prediction const & r) { return l.IsBetter(r); });
 
   // I suppose, it was made to avoid matching by *very* common tokens (like 'street' only).
   size_t constexpr kMaxNumOfImprobablePredictions = 3;
   double constexpr kTailProbability = 0.05;
-  while (predictions.size() > kMaxNumOfImprobablePredictions &&
-         predictions.back().m_prob < kTailProbability)
-  {
+  while (predictions.size() > kMaxNumOfImprobablePredictions && predictions.back().m_prob < kTailProbability)
     predictions.pop_back();
-  }
 }
 
 // static
-void StreetsMatcher::FindStreets(BaseContext const & ctx, CBV const & candidates,
-                                 FeaturesFilter const & filter, QueryParams const & params,
-                                 vector<Prediction> & predictions)
+void StreetsMatcher::FindStreets(BaseContext const & ctx, CBV const & candidates, FeaturesFilter const & filter,
+                                 QueryParams const & params, vector<Prediction> & predictions)
 {
   for (size_t startToken = 0; startToken < ctx.NumTokens(); ++startToken)
   {
     if (ctx.IsTokenUsed(startToken))
       continue;
 
-    ::search::FindStreets(ctx, candidates, filter, params, startToken, false /* withMisprints */,
-                          predictions);
-    ::search::FindStreets(ctx, candidates, filter, params, startToken, true /* withMisprints */,
-                          predictions);
+    ::search::FindStreets(ctx, candidates, filter, params, startToken, false /* withMisprints */, predictions);
+    ::search::FindStreets(ctx, candidates, filter, params, startToken, true /* withMisprints */, predictions);
   }
 }
 }  // namespace search
diff --git a/libs/search/streets_matcher.hpp b/libs/search/streets_matcher.hpp
index 5ece99f07..5386212c4 100644
--- a/libs/search/streets_matcher.hpp
+++ b/libs/search/streets_matcher.hpp
@@ -22,8 +22,7 @@ public:
     // searching for "French 1700", gives 100% probabilty 'street' "Peatonal Juramento 1700".
     bool SameForRelaxedMatch(Prediction const & rhs) const
     {
-      return (m_withMisprints == rhs.m_withMisprints &&
-              GetNumTokens() == rhs.GetNumTokens());
+      return (m_withMisprints == rhs.m_withMisprints && GetNumTokens() == rhs.GetNumTokens());
     }
     bool IsBetter(Prediction const & rhs) const
     {
@@ -48,8 +47,7 @@ public:
                  QueryParams const & params, std::vector<Prediction> & predictions);
 
 private:
-  static void FindStreets(BaseContext const & ctx, CBV const & candidates,
-                          FeaturesFilter const & filter, QueryParams const & params,
-                          std::vector<Prediction> & prediction);
+  static void FindStreets(BaseContext const & ctx, CBV const & candidates, FeaturesFilter const & filter,
+                          QueryParams const & params, std::vector<Prediction> & prediction);
 };
 }  // namespace search
diff --git a/libs/search/string_utils.cpp b/libs/search/string_utils.cpp
index 9658ee3c1..484fb5775 100644
--- a/libs/search/string_utils.cpp
+++ b/libs/search/string_utils.cpp
@@ -25,4 +25,4 @@ QueryString MakeQueryString(std::string s)
   return qs;
 }
 
-} // namespace search
+}  // namespace search
diff --git a/libs/search/string_utils.hpp b/libs/search/string_utils.hpp
index 2eca8c784..f57de882b 100644
--- a/libs/search/string_utils.hpp
+++ b/libs/search/string_utils.hpp
@@ -7,4 +7,4 @@ namespace search
 
 QueryString MakeQueryString(std::string s);
 
-} // namespace search
+}  // namespace search
diff --git a/libs/search/suggest.hpp b/libs/search/suggest.hpp
index 4358ce754..f8ec30221 100644
--- a/libs/search/suggest.hpp
+++ b/libs/search/suggest.hpp
@@ -9,9 +9,10 @@ namespace search
 struct Suggest
 {
   Suggest(strings::UniString const & name, uint8_t len, int8_t locale)
-    : m_name(name), m_prefixLength(len), m_locale(locale)
-  {
-  }
+    : m_name(name)
+    , m_prefixLength(len)
+    , m_locale(locale)
+  {}
 
   strings::UniString m_name;
   uint8_t m_prefixLength;
diff --git a/libs/search/token_range.hpp b/libs/search/token_range.hpp
index 4ea26a967..16b06a6e1 100644
--- a/libs/search/token_range.hpp
+++ b/libs/search/token_range.hpp
@@ -15,8 +15,7 @@ class TokenRange final
 {
 public:
   TokenRange() = default;
-  TokenRange(size_t begin, size_t end)
-    : m_begin(static_cast<uint8_t>(begin)), m_end(static_cast<uint8_t>(end))
+  TokenRange(size_t begin, size_t end) : m_begin(static_cast<uint8_t>(begin)), m_end(static_cast<uint8_t>(end))
 
   {
     ASSERT_LESS_OR_EQUAL(begin, kMaxNumTokens, ());
@@ -54,10 +53,7 @@ public:
     return m_end < rhs.m_end;
   }
 
-  inline bool operator==(TokenRange const & rhs) const
-  {
-    return m_begin == rhs.m_begin && m_end == rhs.m_end;
-  }
+  inline bool operator==(TokenRange const & rhs) const { return m_begin == rhs.m_begin && m_end == rhs.m_end; }
 
   inline size_t Begin() const { return m_begin; }
   inline size_t End() const { return m_end; }
diff --git a/libs/search/token_slice.cpp b/libs/search/token_slice.cpp
index 4f50e1eb1..f0ffc392a 100644
--- a/libs/search/token_slice.cpp
+++ b/libs/search/token_slice.cpp
@@ -26,7 +26,9 @@ string SliceToString(string const & name, Slice const & slice)
 
 // TokenSlice --------------------------------------------------------------------------------------
 TokenSlice::TokenSlice(QueryParams const & params, TokenRange const & range)
-  : m_params(params), m_offset(range.Begin()), m_size(range.Size())
+  : m_params(params)
+  , m_offset(range.Begin())
+  , m_size(range.Size())
 {
   ASSERT(range.IsValid(), (range));
 }
@@ -38,18 +40,18 @@ bool TokenSlice::IsPrefix(size_t i) const
 }
 
 // TokenSliceNoCategories --------------------------------------------------------------------------
-TokenSliceNoCategories::TokenSliceNoCategories(QueryParams const & params, TokenRange const & range)
-  : m_params(params)
+TokenSliceNoCategories::TokenSliceNoCategories(QueryParams const & params, TokenRange const & range) : m_params(params)
 {
   m_indexes.reserve(range.Size());
   for (size_t i : range)
-  {
     if (!m_params.IsCategorySynonym(i))
       m_indexes.push_back(i);
-  }
 }
 
-string DebugPrint(TokenSlice const & slice) { return SliceToString("TokenSlice", slice); }
+string DebugPrint(TokenSlice const & slice)
+{
+  return SliceToString("TokenSlice", slice);
+}
 
 string DebugPrint(TokenSliceNoCategories const & slice)
 {
diff --git a/libs/search/token_slice.hpp b/libs/search/token_slice.hpp
index 3661d365a..d97ea93be 100644
--- a/libs/search/token_slice.hpp
+++ b/libs/search/token_slice.hpp
@@ -76,10 +76,7 @@ template <typename Cont>
 class QuerySliceOnRawStrings : public StringSliceBase
 {
 public:
-  QuerySliceOnRawStrings(Cont const & tokens, String const & prefix)
-    : m_tokens(tokens), m_prefix(prefix)
-  {
-  }
+  QuerySliceOnRawStrings(Cont const & tokens, String const & prefix) : m_tokens(tokens), m_prefix(prefix) {}
 
   bool HasPrefixToken() const { return !m_prefix.empty(); }
 
diff --git a/libs/search/tracer.cpp b/libs/search/tracer.cpp
index 585448653..f8509c505 100644
--- a/libs/search/tracer.cpp
+++ b/libs/search/tracer.cpp
@@ -27,8 +27,7 @@ Tracer::Parse::Parse(vector<TokenType> const & types, bool category) : m_categor
   }
 }
 
-Tracer::Parse::Parse(vector<pair<TokenType, TokenRange>> const & ranges, bool category)
-  : m_category(category)
+Tracer::Parse::Parse(vector<pair<TokenType, TokenRange>> const & ranges, bool category) : m_category(category)
 {
   for (auto const & kv : ranges)
     m_ranges[kv.first] = kv.second;
@@ -43,9 +42,15 @@ vector<Tracer::Parse> Tracer::GetUniqueParses() const
 }
 
 // ResultTracer ------------------------------------------------------------------------------------
-void ResultTracer::Clear() { m_provenance.clear(); }
+void ResultTracer::Clear()
+{
+  m_provenance.clear();
+}
 
-void ResultTracer::CallMethod(Branch branch) { m_provenance.emplace_back(branch); }
+void ResultTracer::CallMethod(Branch branch)
+{
+  m_provenance.emplace_back(branch);
+}
 
 void ResultTracer::LeaveMethod(Branch branch)
 {
@@ -94,8 +99,7 @@ string DebugPrint(ResultTracer::Branch branch)
   case ResultTracer::Branch::MatchAroundPivot: return "MatchAroundPivot";
   case ResultTracer::Branch::MatchPOIsAndBuildings: return "MatchPOIsAndBuildings";
   case ResultTracer::Branch::GreedilyMatchStreets: return "GreedilyMatchStreets";
-  case ResultTracer::Branch::GreedilyMatchStreetsWithSuburbs:
-    return "GreedilyMatchStreetsWithSuburbs";
+  case ResultTracer::Branch::GreedilyMatchStreetsWithSuburbs: return "GreedilyMatchStreetsWithSuburbs";
   case ResultTracer::Branch::WithPostcodes: return "WithPostcodes";
   case ResultTracer::Branch::MatchUnclassified: return "MatchUnclassified";
   case ResultTracer::Branch::Relaxed: return "Relaxed";
diff --git a/libs/search/tracer.hpp b/libs/search/tracer.hpp
index 207c2e69e..9e9849e4c 100644
--- a/libs/search/tracer.hpp
+++ b/libs/search/tracer.hpp
@@ -18,13 +18,9 @@ public:
     using TokenType = BaseContext::TokenType;
 
     explicit Parse(std::vector<TokenType> const & types, bool category = false);
-    explicit Parse(std::vector<std::pair<TokenType, TokenRange>> const & ranges,
-                   bool category = false);
+    explicit Parse(std::vector<std::pair<TokenType, TokenRange>> const & ranges, bool category = false);
 
-    bool operator==(Parse const & rhs) const
-    {
-      return m_ranges == rhs.m_ranges && m_category == rhs.m_category;
-    }
+    bool operator==(Parse const & rhs) const { return m_ranges == rhs.m_ranges && m_category == rhs.m_category; }
 
     bool operator<(Parse const & rhs) const
     {
@@ -37,7 +33,7 @@ public:
     bool m_category = false;
   };
 
-  template <typename ...Args>
+  template <typename... Args>
   void EmitParse(Args &&... args)
   {
     m_parses.emplace_back(std::forward<Args>(args)...);
diff --git a/libs/search/types_skipper.cpp b/libs/search/types_skipper.cpp
index d0686fc36..6ba6814cc 100644
--- a/libs/search/types_skipper.cpp
+++ b/libs/search/types_skipper.cpp
@@ -20,16 +20,16 @@ TypesSkipper::TypesSkipper()
   /// and natural-water-pond/lake?
   // POIs like natural-spring, waterway-waterfall, highway-bus_stop are saved from skipping by the TwoLevelPOIChecker().
   StringIL const arrSkipEmptyName1[] = {
-    {"area:highway"}, {"building"}, {"highway"}, {"landuse"}, {"natural"}, {"office"}, {"place"}, {"waterway"},
+      {"area:highway"}, {"building"}, {"highway"}, {"landuse"}, {"natural"}, {"office"}, {"place"}, {"waterway"},
   };
   for (auto const & e : arrSkipEmptyName1)
     m_skipIfEmptyName[0].push_back(c.GetTypeByPath(e));
 
   StringIL const arrSkipEmptyName2[] = {
-    {"man_made", "chimney"},
-    {"man_made", "flagpole"},
-    {"man_made", "mast"},
-    {"man_made", "water_tower"},
+      {"man_made", "chimney"},
+      {"man_made", "flagpole"},
+      {"man_made", "mast"},
+      {"man_made", "water_tower"},
   };
   for (auto const & e : arrSkipEmptyName2)
     m_skipIfEmptyName[1].push_back(c.GetTypeByPath(e));
@@ -38,7 +38,8 @@ TypesSkipper::TypesSkipper()
 
   // Do not index "entrance" only features.
   StringIL const arrSkipSpecialNames1[] = {
-    {"entrance"}, {"wheelchair"},
+      {"entrance"},
+      {"wheelchair"},
   };
   for (auto const & e : arrSkipSpecialNames1)
     m_skipSpecialNames[0].push_back(c.GetTypeByPath(e));
@@ -85,10 +86,8 @@ bool TypesSkipper::SkipSpecialNames(feature::TypesHolder const & types, std::str
     return false;
 
   for (auto type : types)
-  {
     if (!HasType(m_skipSpecialNames[0], type))
       return false;
-  }
   return true;
 }
 
diff --git a/libs/search/types_skipper.hpp b/libs/search/types_skipper.hpp
index 50de6fff4..b7c200560 100644
--- a/libs/search/types_skipper.hpp
+++ b/libs/search/types_skipper.hpp
@@ -5,7 +5,6 @@
 
 #include "base/buffer_vector.hpp"
 
-
 namespace search
 {
 // Helper functions to determine if a feature should be indexed for search.
diff --git a/libs/search/utils.cpp b/libs/search/utils.cpp
index b885e1f05..d85bed986 100644
--- a/libs/search/utils.cpp
+++ b/libs/search/utils.cpp
@@ -24,23 +24,23 @@ std::vector<uint32_t> GetCategoryTypes(std::string const & name, std::string con
 
   auto const tokens = NormalizeAndTokenizeString(name);
 
-  FillCategories(QuerySliceOnRawStrings<std::vector<strings::UniString>>(tokens, {} /* prefix */),
-                 locales, categories, types);
+  FillCategories(QuerySliceOnRawStrings<std::vector<strings::UniString>>(tokens, {} /* prefix */), locales, categories,
+                 types);
 
   base::SortUnique(types);
   return types;
 }
 
-void ForEachOfTypesInRect(DataSource const & dataSource, std::vector<uint32_t> const & types,
-                          m2::RectD const & pivot, FeatureIndexCallback const & fn)
+void ForEachOfTypesInRect(DataSource const & dataSource, std::vector<uint32_t> const & types, m2::RectD const & pivot,
+                          FeatureIndexCallback const & fn)
 {
   std::vector<std::shared_ptr<MwmInfo>> infos;
   dataSource.GetMwmsInfo(infos);
 
   base::Cancellable const cancellable;
   CategoriesCache cache(types, cancellable);
-  auto pivotRectsCache = PivotRectsCache(1 /* maxNumEntries */, cancellable,
-                                         std::max(pivot.SizeX(), pivot.SizeY()) /* maxRadiusMeters */);
+  auto pivotRectsCache =
+      PivotRectsCache(1 /* maxNumEntries */, cancellable, std::max(pivot.SizeX(), pivot.SizeY()) /* maxRadiusMeters */);
 
   for (auto const & info : infos)
   {
@@ -59,9 +59,7 @@ void ForEachOfTypesInRect(DataSource const & dataSource, std::vector<uint32_t> c
     ViewportFilter const filter(pivotFeatures, 0 /* threshold */);
     features = filter.Filter(features);
     MwmSet::MwmId mwmId(info);
-    features.ForEach([&fn, &mwmId](uint64_t bit) {
-      fn(FeatureID(mwmId, base::asserted_cast<uint32_t>(bit)));
-    });
+    features.ForEach([&fn, &mwmId](uint64_t bit) { fn(FeatureID(mwmId, base::asserted_cast<uint32_t>(bit))); });
   }
 }
 
diff --git a/libs/search/utils.hpp b/libs/search/utils.hpp
index bf4b9fb28..985139df9 100644
--- a/libs/search/utils.hpp
+++ b/libs/search/utils.hpp
@@ -24,8 +24,8 @@ class MwmInfo;
 namespace search
 {
 template <typename ToDo>
-void ForEachCategoryType(StringSliceBase const & slice, Locales const & locales,
-                         CategoriesHolder const & categories, ToDo && todo)
+void ForEachCategoryType(StringSliceBase const & slice, Locales const & locales, CategoriesHolder const & categories,
+                         ToDo && todo)
 {
   for (size_t i = 0; i < slice.Size(); ++i)
   {
@@ -68,8 +68,7 @@ void ForEachCategoryTypeFuzzy(StringSliceBase const & slice, Locales const & loc
     request.m_names.push_back(BuildLevenshteinDFA_Category(slice.Get(i)));
     request.SetLangs(locales);
 
-    MatchFeaturesInTrie(request, iterator,
-                        [](uint32_t) { return true; } /* filter */,
+    MatchFeaturesInTrie(request, iterator, [](uint32_t) { return true; } /* filter */,
                         [&todo, i](uint32_t type, bool) { todo(i, type); } /* todo */);
   }
 }
@@ -95,10 +94,8 @@ bool FillCategories(QuerySliceOnRawStrings<T> const & slice, Locales const & loc
       return;
 
     for (size_t i = 0; i < slice.Size(); ++i)
-    {
       if (slice.Get(i) != categoryTokens[i])
         return;
-    }
 
     types.push_back(type);
   });
@@ -113,8 +110,8 @@ std::vector<uint32_t> GetCategoryTypes(std::string const & name, std::string con
 
 using FeatureIndexCallback = std::function<void(FeatureID const &)>;
 // Applies |fn| to each feature index of type from |types| in |rect|.
-void ForEachOfTypesInRect(DataSource const & dataSource, std::vector<uint32_t> const & types,
-                          m2::RectD const & rect, FeatureIndexCallback const & fn);
+void ForEachOfTypesInRect(DataSource const & dataSource, std::vector<uint32_t> const & types, m2::RectD const & rect,
+                          FeatureIndexCallback const & fn);
 
 // Returns true iff |query| contains |categoryEn| synonym.
 bool IsCategorialRequestFuzzy(std::string const & query, std::string const & categoryName);
@@ -124,8 +121,7 @@ void FillRequestFromToken(QueryParams::Token const & token, SearchTrieRequest<DF
 {
   request.m_names.emplace_back(BuildLevenshteinDFA(token.GetOriginal()));
   // Allow misprints for original token only.
-  token.ForEachSynonym([&request](strings::UniString const & s) {
-    request.m_names.emplace_back(strings::LevenshteinDFA(s, 0 /* maxErrors */));
-  });
+  token.ForEachSynonym([&request](strings::UniString const & s)
+  { request.m_names.emplace_back(strings::LevenshteinDFA(s, 0 /* maxErrors */)); });
 }
 }  // namespace search
diff --git a/libs/search/utm_mgrs_coords_match.cpp b/libs/search/utm_mgrs_coords_match.cpp
index 79408d69b..7251e7f07 100644
--- a/libs/search/utm_mgrs_coords_match.cpp
+++ b/libs/search/utm_mgrs_coords_match.cpp
@@ -29,7 +29,6 @@ static size_t MatchZoneCode(std::string const & query, int & zoneCode)
   return pos + 2;
 }
 
-
 // Matches zone letter ignoring spaces. Returns end position of matched chars or string::npos if no match.
 size_t MatchZoneLetter(std::string const & query, char & zoneLetter, size_t startPos)
 {
@@ -56,14 +55,14 @@ size_t MatchInt(std::string const & query, int & value, size_t startPos)
   while (pos < query.size())
   {
     char const ch = query[pos];
-    if (ch >= '0' && ch <= '9') // Found digit
+    if (ch >= '0' && ch <= '9')  // Found digit
     {
       n = n * 10 + (ch - '0');
       pos++;
     }
-    else if (kSpaceChars.find(ch) != std::string::npos) // Found space char matching end of the number
+    else if (kSpaceChars.find(ch) != std::string::npos)  // Found space char matching end of the number
       break;
-    else // Found invalid char
+    else  // Found invalid char
       return std::string::npos;
   }
 
@@ -78,8 +77,8 @@ size_t MatchInt(std::string const & query, int & value, size_t startPos)
 // TODO: Support additional formats listed here: https://www.killetsoft.de/t_0901_e.htm
 std::optional<ms::LatLon> MatchUTMCoords(std::string const & query)
 {
-  int  easting, northing;
-  int  zoneCode;
+  int easting, northing;
+  int zoneCode;
   char zoneLetter;
 
   size_t pos = MatchZoneCode(query, zoneCode);
@@ -206,4 +205,4 @@ std::optional<ms::LatLon> MatchMGRSCoords(std::string const & query)
   return utm_mgrs_utils::MGRStoLatLon(easting, northing, zoneCode, zoneLetter, squareCode);
 }
 
-}
+}  // namespace search
diff --git a/libs/shaders/gl_program_info.hpp b/libs/shaders/gl_program_info.hpp
index 18063d5a5..a0936719a 100644
--- a/libs/shaders/gl_program_info.hpp
+++ b/libs/shaders/gl_program_info.hpp
@@ -8,10 +8,8 @@ namespace gpu
 struct GLProgramInfo
 {
   GLProgramInfo() = default;
-  GLProgramInfo(std::string const & vertexShaderName,
-                std::string const & fragmentShaderName,
-                char const * const vertexSource,
-                char const * const fragmentSource)
+  GLProgramInfo(std::string const & vertexShaderName, std::string const & fragmentShaderName,
+                char const * const vertexSource, char const * const fragmentSource)
     : m_vertexShaderName(vertexShaderName)
     , m_fragmentShaderName(fragmentShaderName)
     , m_vertexShaderSource(vertexSource)
diff --git a/libs/shaders/gl_program_params.cpp b/libs/shaders/gl_program_params.cpp
index dee6450aa..cb56faf6f 100644
--- a/libs/shaders/gl_program_params.cpp
+++ b/libs/shaders/gl_program_params.cpp
@@ -26,8 +26,7 @@ struct UniformsGuard
   ~UniformsGuard()
   {
     auto const uniformsCount = m_program->GetNumericUniformsCount();
-    CHECK_EQUAL(m_counter, uniformsCount, ("Not all numeric uniforms are set up",
-                m_program->GetName(), m_paramsName));
+    CHECK_EQUAL(m_counter, uniformsCount, ("Not all numeric uniforms are set up", m_program->GetName(), m_paramsName));
   }
 
   ref_ptr<dp::GLGpuProgram> m_program;
@@ -35,13 +34,18 @@ struct UniformsGuard
   uint32_t m_counter = 0;
 };
 
-template <typename ParamType> class GLTypeWrapper;
+template <typename ParamType>
+class GLTypeWrapper;
 
 #define BIND_GL_TYPE(DataType, GLType) \
-  template <> class GLTypeWrapper<DataType> \
-  { \
-  public: \
-    static glConst Value() { return GLType; } \
+  template <>                          \
+  class GLTypeWrapper<DataType>        \
+  {                                    \
+  public:                              \
+    static glConst Value()             \
+    {                                  \
+      return GLType;                   \
+    }                                  \
   };
 
 BIND_GL_TYPE(float, gl_const::GLFloatType)
@@ -57,18 +61,16 @@ BIND_GL_TYPE(glsl::ivec4, gl_const::GLIntVec4)
 class Parameter
 {
 public:
-  template<typename ParamType>
-  static void CheckApply(UniformsGuard & guard, std::string const & name,
-                         ParamType const & t)
+  template <typename ParamType>
+  static void CheckApply(UniformsGuard & guard, std::string const & name, ParamType const & t)
   {
     if (Apply<ParamType>(guard.m_program, name, t))
       guard.m_counter++;
   }
 
 private:
-  template<typename ParamType>
-  static bool Apply(ref_ptr<dp::GLGpuProgram> program, std::string const & name,
-                    ParamType const & p)
+  template <typename ParamType>
+  static bool Apply(ref_ptr<dp::GLGpuProgram> program, std::string const & name, ParamType const & p)
   {
     auto const location = program->GetUniformLocation(name);
     if (location < 0)
@@ -81,8 +83,7 @@ private:
 };
 }  // namespace
 
-void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
-                                  ref_ptr<dp::GpuProgram> program,
+void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
                                   MapProgramParams const & params)
 {
   UNUSED_VALUE(context);
@@ -98,8 +99,7 @@ void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
   Parameter::CheckApply(guard, "u_contrastGamma", params.m_contrastGamma);
 }
 
-void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
-                                  ref_ptr<dp::GpuProgram> program,
+void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
                                   RouteProgramParams const & params)
 {
   UNUSED_VALUE(context);
@@ -121,8 +121,7 @@ void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
   Parameter::CheckApply(guard, "u_fakeOutlineColor", params.m_fakeOutlineColor);
 }
 
-void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
-                                  ref_ptr<dp::GpuProgram> program,
+void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
                                   TrafficProgramParams const & params)
 {
   UNUSED_VALUE(context);
@@ -139,8 +138,7 @@ void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
   Parameter::CheckApply(guard, "u_darkArrowColor", params.m_darkArrowColorAligned);
 }
 
-void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
-                                  ref_ptr<dp::GpuProgram> program,
+void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
                                   TransitProgramParams const & params)
 {
   UNUSED_VALUE(context);
@@ -154,8 +152,7 @@ void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
   Parameter::CheckApply(guard, "u_maxRadius", params.m_maxRadius);
 }
 
-void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
-                                  ref_ptr<dp::GpuProgram> program,
+void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
                                   GuiProgramParams const & params)
 {
   UNUSED_VALUE(context);
@@ -170,8 +167,7 @@ void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
   Parameter::CheckApply(guard, "u_length", params.m_length);
 }
 
-void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
-                                  ref_ptr<dp::GpuProgram> program,
+void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
                                   ShapesProgramParams const & params)
 {
   UNUSED_VALUE(context);
@@ -188,8 +184,7 @@ void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
   Parameter::CheckApply(guard, "u_azimut", params.m_azimut);
 }
 
-void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
-                                  ref_ptr<dp::GpuProgram> program,
+void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
                                   Arrow3dProgramParams const & params)
 {
   UNUSED_VALUE(context);
@@ -201,8 +196,7 @@ void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
   Parameter::CheckApply(guard, "u_texCoordFlipping", params.m_texCoordFlipping);
 }
 
-void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
-                                  ref_ptr<dp::GpuProgram> program,
+void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
                                   DebugRectProgramParams const & params)
 {
   UNUSED_VALUE(context);
@@ -211,8 +205,7 @@ void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
   Parameter::CheckApply(guard, "u_color", params.m_color);
 }
 
-void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
-                                  ref_ptr<dp::GpuProgram> program,
+void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
                                   ScreenQuadProgramParams const & params)
 {
   UNUSED_VALUE(context);
@@ -221,8 +214,7 @@ void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
   Parameter::CheckApply(guard, "u_opacity", params.m_opacity);
 }
 
-void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
-                                  ref_ptr<dp::GpuProgram> program,
+void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
                                   SMAAProgramParams const & params)
 {
   UNUSED_VALUE(context);
@@ -231,8 +223,7 @@ void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
   Parameter::CheckApply(guard, "u_framebufferMetrics", params.m_framebufferMetrics);
 }
 
-void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
-                                  ref_ptr<dp::GpuProgram> program, 
+void GLProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
                                   ImGuiProgramParams const & params)
 {
   UNUSED_VALUE(context);
diff --git a/libs/shaders/gl_program_params.hpp b/libs/shaders/gl_program_params.hpp
index 20626abdc..ae01449ac 100644
--- a/libs/shaders/gl_program_params.hpp
+++ b/libs/shaders/gl_program_params.hpp
@@ -9,27 +9,27 @@ namespace gpu
 class GLProgramParamsSetter : public ProgramParamsSetter
 {
 public:
-  void Apply(ref_ptr<dp::GraphicsContext> context,
-             ref_ptr<dp::GpuProgram> program, MapProgramParams const & params) override;
-  void Apply(ref_ptr<dp::GraphicsContext> context,
-             ref_ptr<dp::GpuProgram> program, RouteProgramParams const & params) override;
-  void Apply(ref_ptr<dp::GraphicsContext> context,
-             ref_ptr<dp::GpuProgram> program, TrafficProgramParams const & params) override;
-  void Apply(ref_ptr<dp::GraphicsContext> context,
-             ref_ptr<dp::GpuProgram> program, TransitProgramParams const & params) override;
-  void Apply(ref_ptr<dp::GraphicsContext> context,
-             ref_ptr<dp::GpuProgram> program, GuiProgramParams const & params) override;
-  void Apply(ref_ptr<dp::GraphicsContext> context,
-             ref_ptr<dp::GpuProgram> program, ShapesProgramParams const & params) override;
-  void Apply(ref_ptr<dp::GraphicsContext> context,
-             ref_ptr<dp::GpuProgram> program, Arrow3dProgramParams const & params) override;
-  void Apply(ref_ptr<dp::GraphicsContext> context,
-             ref_ptr<dp::GpuProgram> program, DebugRectProgramParams const & params) override;
-  void Apply(ref_ptr<dp::GraphicsContext> context,
-             ref_ptr<dp::GpuProgram> program, ScreenQuadProgramParams const & params) override;
-  void Apply(ref_ptr<dp::GraphicsContext> context,
-             ref_ptr<dp::GpuProgram> program, SMAAProgramParams const & params) override;
-  void Apply(ref_ptr<dp::GraphicsContext> context,
-             ref_ptr<dp::GpuProgram> program, ImGuiProgramParams const & params) override;
+  void Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
+             MapProgramParams const & params) override;
+  void Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
+             RouteProgramParams const & params) override;
+  void Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
+             TrafficProgramParams const & params) override;
+  void Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
+             TransitProgramParams const & params) override;
+  void Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
+             GuiProgramParams const & params) override;
+  void Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
+             ShapesProgramParams const & params) override;
+  void Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
+             Arrow3dProgramParams const & params) override;
+  void Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
+             DebugRectProgramParams const & params) override;
+  void Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
+             ScreenQuadProgramParams const & params) override;
+  void Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
+             SMAAProgramParams const & params) override;
+  void Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
+             ImGuiProgramParams const & params) override;
 };
 }  // namespace gpu
diff --git a/libs/shaders/gl_program_pool.cpp b/libs/shaders/gl_program_pool.cpp
index d373bc559..e7ea278a2 100644
--- a/libs/shaders/gl_program_pool.cpp
+++ b/libs/shaders/gl_program_pool.cpp
@@ -1,14 +1,13 @@
 #include "shaders/gl_program_pool.hpp"
-#include "shaders/program_params.hpp"
 #include "shaders/gl_shaders.hpp"
+#include "shaders/program_params.hpp"
 
-#include "drape/gl_gpu_program.hpp"
 #include "drape/gl_functions.hpp"
+#include "drape/gl_gpu_program.hpp"
 
 namespace gpu
 {
-GLProgramPool::GLProgramPool(dp::ApiVersion apiVersion)
-  : m_apiVersion(apiVersion)
+GLProgramPool::GLProgramPool(dp::ApiVersion apiVersion) : m_apiVersion(apiVersion)
 {
   ProgramParams::Init();
 
@@ -31,10 +30,10 @@ GLProgramPool::~GLProgramPool()
 drape_ptr<dp::GpuProgram> GLProgramPool::Get(Program program)
 {
   auto const programInfo = GetProgramInfo(m_apiVersion, program);
-  auto vertexShader = GetShader(programInfo.m_vertexShaderName, programInfo.m_vertexShaderSource,
-                                dp::Shader::Type::VertexShader);
-  auto fragmentShader = GetShader(programInfo.m_fragmentShaderName, programInfo.m_fragmentShaderSource,
-                                  dp::Shader::Type::FragmentShader);
+  auto vertexShader =
+      GetShader(programInfo.m_vertexShaderName, programInfo.m_vertexShaderSource, dp::Shader::Type::VertexShader);
+  auto fragmentShader =
+      GetShader(programInfo.m_fragmentShaderName, programInfo.m_fragmentShaderSource, dp::Shader::Type::FragmentShader);
 
   auto const name = DebugPrint(program);
   return make_unique_dp<dp::GLGpuProgram>(name, vertexShader, fragmentShader);
diff --git a/libs/shaders/gl_program_pool.hpp b/libs/shaders/gl_program_pool.hpp
index 4768e153c..d725ada24 100644
--- a/libs/shaders/gl_program_pool.hpp
+++ b/libs/shaders/gl_program_pool.hpp
@@ -3,8 +3,8 @@
 #include "shaders/program_pool.hpp"
 
 #include "drape/drape_global.hpp"
-#include "drape/shader.hpp"
 #include "drape/pointers.hpp"
+#include "drape/shader.hpp"
 
 #include <cstdint>
 #include <map>
@@ -23,8 +23,7 @@ public:
   void SetDefines(std::string const & defines);
 
 private:
-  ref_ptr<dp::Shader> GetShader(std::string const & name, std::string const & source,
-                                dp::Shader::Type type);
+  ref_ptr<dp::Shader> GetShader(std::string const & name, std::string const & source, dp::Shader::Type type);
 
   dp::ApiVersion const m_apiVersion;
   std::string m_baseDefines;
diff --git a/libs/shaders/metal_program_pool.hpp b/libs/shaders/metal_program_pool.hpp
index 8c9f3802c..e53c2c29e 100644
--- a/libs/shaders/metal_program_pool.hpp
+++ b/libs/shaders/metal_program_pool.hpp
@@ -15,10 +15,10 @@ enum class SystemProgram
   ClearColor = 0,
   ClearDepth,
   ClearColorAndDepth,
-  
+
   SystemProgramsCount
 };
-  
+
 namespace metal
 {
 class MetalProgramPool : public ProgramPool
@@ -29,13 +29,11 @@ public:
 
   drape_ptr<dp::GpuProgram> Get(Program program) override;
   drape_ptr<dp::GpuProgram> GetSystemProgram(SystemProgram program);
-  
+
 private:
-  drape_ptr<dp::GpuProgram> Get(std::string const & programName,
-                                std::string const & vertexShaderName,
-                                std::string const & fragmentShaderName,
-                                std::map<uint8_t, uint8_t> const & layout);
-  
+  drape_ptr<dp::GpuProgram> Get(std::string const & programName, std::string const & vertexShaderName,
+                                std::string const & fragmentShaderName, std::map<uint8_t, uint8_t> const & layout);
+
   id<MTLFunction> GetFunction(std::string const & name);
   id<MTLDevice> m_device;
   id<MTLLibrary> m_library;
diff --git a/libs/shaders/program_manager.cpp b/libs/shaders/program_manager.cpp
index ae69d0fc9..3ccd1fbe0 100644
--- a/libs/shaders/program_manager.cpp
+++ b/libs/shaders/program_manager.cpp
@@ -80,8 +80,8 @@ void ProgramManager::InitForOpenGL(ref_ptr<dp::GraphicsContext> context)
 void ProgramManager::InitForVulkan(ref_ptr<dp::GraphicsContext> context)
 {
   m_pool = make_unique_dp<vulkan::VulkanProgramPool>(context);
-  m_paramsSetter = make_unique_dp<vulkan::VulkanProgramParamsSetter>(context,
-      make_ref(static_cast<vulkan::VulkanProgramPool *>(m_pool.get())));
+  m_paramsSetter = make_unique_dp<vulkan::VulkanProgramParamsSetter>(
+      context, make_ref(static_cast<vulkan::VulkanProgramPool *>(m_pool.get())));
 }
 
 void ProgramManager::DestroyForVulkan(ref_ptr<dp::GraphicsContext> context)
diff --git a/libs/shaders/program_manager.hpp b/libs/shaders/program_manager.hpp
index 0feb3e235..39683fcc5 100644
--- a/libs/shaders/program_manager.hpp
+++ b/libs/shaders/program_manager.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "shaders/program_pool.hpp"
 #include "shaders/program_params.hpp"
+#include "shaders/program_pool.hpp"
 
 #include "drape/drape_global.hpp"
-#include "drape/graphics_context.hpp"
 #include "drape/gpu_program.hpp"
+#include "drape/graphics_context.hpp"
 #include "drape/pointers.hpp"
 
 #include "base/macros.hpp"
@@ -38,8 +38,7 @@ private:
   void DestroyForMetal(ref_ptr<dp::GraphicsContext> context);
 #endif
 
-  using Programs = std::array<drape_ptr<dp::GpuProgram>,
-                              static_cast<size_t>(Program::ProgramsCount)>;
+  using Programs = std::array<drape_ptr<dp::GpuProgram>, static_cast<size_t>(Program::ProgramsCount)>;
   drape_ptr<ProgramPool> m_pool;
   Programs m_programs;
   drape_ptr<ProgramParamsSetter> m_paramsSetter;
diff --git a/libs/shaders/program_params.hpp b/libs/shaders/program_params.hpp
index fcf4079eb..45c445d2b 100644
--- a/libs/shaders/program_params.hpp
+++ b/libs/shaders/program_params.hpp
@@ -4,8 +4,8 @@
 
 #include "drape/drape_global.hpp"
 #include "drape/glsl_types.hpp"
-#include "drape/graphics_context.hpp"
 #include "drape/gpu_program.hpp"
+#include "drape/graphics_context.hpp"
 #include "drape/pointers.hpp"
 
 #include "base/assert.hpp"
@@ -28,22 +28,24 @@ private:
   static std::map<std::string, std::string> m_boundParams;
 };
 
-#define BIND_PROGRAMS(ParamsType, ...) \
-  static std::vector<gpu::Program> const & GetBoundPrograms() \
-  { \
-    static std::vector<gpu::Program> programs = {__VA_ARGS__}; \
-    return programs; \
-  } \
-  static std::string GetName() { return std::string(#ParamsType); } \
-  static void BindPrograms(std::map<std::string, std::string> & params) \
-  { \
-    for (auto const p : GetBoundPrograms()) \
-    { \
-      auto const programName = DebugPrint(p); \
-      CHECK(params.find(programName) == params.cend(), \
-        ("Program has already bound", programName)); \
-      params[programName] = GetName(); \
-    } \
+#define BIND_PROGRAMS(ParamsType, ...)                                                              \
+  static std::vector<gpu::Program> const & GetBoundPrograms()                                       \
+  {                                                                                                 \
+    static std::vector<gpu::Program> programs = {__VA_ARGS__};                                      \
+    return programs;                                                                                \
+  }                                                                                                 \
+  static std::string GetName()                                                                      \
+  {                                                                                                 \
+    return std::string(#ParamsType);                                                                \
+  }                                                                                                 \
+  static void BindPrograms(std::map<std::string, std::string> & params)                             \
+  {                                                                                                 \
+    for (auto const p : GetBoundPrograms())                                                         \
+    {                                                                                               \
+      auto const programName = DebugPrint(p);                                                       \
+      CHECK(params.find(programName) == params.cend(), ("Program has already bound", programName)); \
+      params[programName] = GetName();                                                              \
+    }                                                                                               \
   }
 
 #define ALIGNMENT alignas(16)
@@ -63,37 +65,15 @@ struct ALIGNMENT MapProgramParams
   float m_zScale = 1.0f;
   float m_interpolation = 1.0f;
   float m_isOutlinePass = 1.0f;
-  
-  BIND_PROGRAMS(MapProgramParams,
-    Program::Area,
-    Program::Area3d,
-    Program::Area3dOutline,
-    Program::AreaOutline,
-    Program::Bookmark,
-    Program::BookmarkAnim,
-    Program::BookmarkAnimBillboard,
-    Program::BookmarkBillboard,
-    Program::CapJoin,
-    Program::CirclePoint,
-    Program::ColoredSymbol,
-    Program::ColoredSymbolBillboard,
-    Program::DashedLine,
-    Program::TransparentArea,
-    Program::HatchingArea,
-    Program::Line,
-    Program::MaskedTexturing,
-    Program::MaskedTexturingBillboard,
-    Program::PathSymbol,
-    Program::Text,
-    Program::TextBillboard,
-    Program::TextOutlined,
-    Program::TextOutlinedBillboard,
-    Program::Texturing,
-    Program::TexturingBillboard,
-    Program::BookmarkAboveText,
-    Program::BookmarkAnimAboveText,
-    Program::BookmarkAnimAboveTextBillboard,
-    Program::BookmarkAboveTextBillboard)
+
+  BIND_PROGRAMS(MapProgramParams, Program::Area, Program::Area3d, Program::Area3dOutline, Program::AreaOutline,
+                Program::Bookmark, Program::BookmarkAnim, Program::BookmarkAnimBillboard, Program::BookmarkBillboard,
+                Program::CapJoin, Program::CirclePoint, Program::ColoredSymbol, Program::ColoredSymbolBillboard,
+                Program::DashedLine, Program::TransparentArea, Program::HatchingArea, Program::Line,
+                Program::MaskedTexturing, Program::MaskedTexturingBillboard, Program::PathSymbol, Program::Text,
+                Program::TextBillboard, Program::TextOutlined, Program::TextOutlinedBillboard, Program::Texturing,
+                Program::TexturingBillboard, Program::BookmarkAboveText, Program::BookmarkAnimAboveText,
+                Program::BookmarkAnimAboveTextBillboard, Program::BookmarkAboveTextBillboard)
 };
 
 struct ALIGNMENT RouteProgramParams
@@ -112,12 +92,8 @@ struct ALIGNMENT RouteProgramParams
   glsl::vec2 m_angleCosSin;
   float m_arrowHalfWidth = 0.0f;
   float m_opacity = 1.0f;
-  
-  BIND_PROGRAMS(RouteProgramParams,
-    Program::Route,
-    Program::RouteDash,
-    Program::RouteArrow,
-    Program::RouteMarker)
+
+  BIND_PROGRAMS(RouteProgramParams, Program::Route, Program::RouteDash, Program::RouteArrow, Program::RouteMarker)
 };
 
 struct ALIGNMENT TrafficProgramParams
@@ -144,16 +120,13 @@ struct ALIGNMENT TrafficProgramParams
   float m_outline = 0.0f;
   float m_opacity = 1.0f;
 
-  TrafficProgramParams() 
+  TrafficProgramParams()
     : m_outlineColorAligned(0.0f, 0.0f, 0.0f, 0.0f)
     , m_lightArrowColorAligned(0.0f, 0.0f, 0.0f, 0.0f)
     , m_darkArrowColorAligned(0.0f, 0.0f, 0.0f, 0.0f)
   {}
 
-  BIND_PROGRAMS(TrafficProgramParams,
-    Program::Traffic,
-    Program::TrafficLine,
-    Program::TrafficCircle)
+  BIND_PROGRAMS(TrafficProgramParams, Program::Traffic, Program::TrafficLine, Program::TrafficCircle)
 };
 
 struct ALIGNMENT TransitProgramParams
@@ -171,10 +144,7 @@ struct ALIGNMENT TransitProgramParams
 
   TransitProgramParams() : m_paramsAligned(0.0f, 0.0f, 0.0f, 0.0f) {}
 
-  BIND_PROGRAMS(TransitProgramParams,
-    Program::Transit,
-    Program::TransitCircle,
-    Program::TransitMarker)
+  BIND_PROGRAMS(TransitProgramParams, Program::Transit, Program::TransitCircle, Program::TransitMarker)
 };
 
 struct ALIGNMENT GuiProgramParams
@@ -187,11 +157,8 @@ struct ALIGNMENT GuiProgramParams
   float m_opacity = 1.0f;
   float m_length = 0.0f;
 
-  BIND_PROGRAMS(GuiProgramParams,
-    Program::TextStaticOutlinedGui,
-    Program::TextOutlinedGui,
-    Program::TexturingGui,
-    Program::Ruler)
+  BIND_PROGRAMS(GuiProgramParams, Program::TextStaticOutlinedGui, Program::TextOutlinedGui, Program::TexturingGui,
+                Program::Ruler)
 };
 
 struct ALIGNMENT ShapesProgramParams
@@ -212,10 +179,7 @@ struct ALIGNMENT ShapesProgramParams
 
   ShapesProgramParams() : m_positionAligned(0.0f, 0.0f, 0.0f, 0.0f) {}
 
-  BIND_PROGRAMS(ShapesProgramParams,
-    Program::Accuracy,
-    Program::MyPosition,
-    Program::SelectionLine)
+  BIND_PROGRAMS(ShapesProgramParams, Program::Accuracy, Program::MyPosition, Program::SelectionLine)
 };
 
 struct ALIGNMENT Arrow3dProgramParams
@@ -225,11 +189,8 @@ struct ALIGNMENT Arrow3dProgramParams
   glsl::vec4 m_color;
   glsl::vec2 m_texCoordFlipping;
 
-  BIND_PROGRAMS(Arrow3dProgramParams,
-    Program::Arrow3d,
-    Program::Arrow3dTextured,
-    Program::Arrow3dShadow,
-    Program::Arrow3dOutline)
+  BIND_PROGRAMS(Arrow3dProgramParams, Program::Arrow3d, Program::Arrow3dTextured, Program::Arrow3dShadow,
+                Program::Arrow3dOutline)
 };
 
 struct ALIGNMENT DebugRectProgramParams
@@ -251,18 +212,14 @@ struct ALIGNMENT SMAAProgramParams
 {
   glsl::vec4 m_framebufferMetrics;
 
-  BIND_PROGRAMS(SMAAProgramParams,
-    Program::SmaaEdges,
-    Program::SmaaBlendingWeight,
-    Program::SmaaFinal)
+  BIND_PROGRAMS(SMAAProgramParams, Program::SmaaEdges, Program::SmaaBlendingWeight, Program::SmaaFinal)
 };
 
 struct ALIGNMENT ImGuiProgramParams
 {
   glsl::mat4 m_projection;
 
-  BIND_PROGRAMS(ImGuiProgramParams,
-    Program::ImGui)
+  BIND_PROGRAMS(ImGuiProgramParams, Program::ImGui)
 };
 
 #undef ALIGNMENT
@@ -271,27 +228,27 @@ class ProgramParamsSetter
 {
 public:
   virtual ~ProgramParamsSetter() = default;
-  virtual void Apply(ref_ptr<dp::GraphicsContext> context,
-                     ref_ptr<dp::GpuProgram> program, MapProgramParams const & params) = 0;
-  virtual void Apply(ref_ptr<dp::GraphicsContext> context,
-                     ref_ptr<dp::GpuProgram> program, RouteProgramParams const & params) = 0;
-  virtual void Apply(ref_ptr<dp::GraphicsContext> context,
-                     ref_ptr<dp::GpuProgram> program, TrafficProgramParams const & params) = 0;
-  virtual void Apply(ref_ptr<dp::GraphicsContext> context,
-                     ref_ptr<dp::GpuProgram> program, TransitProgramParams const & params) = 0;
-  virtual void Apply(ref_ptr<dp::GraphicsContext> context,
-                     ref_ptr<dp::GpuProgram> program, GuiProgramParams const & params) = 0;
-  virtual void Apply(ref_ptr<dp::GraphicsContext> context,
-                     ref_ptr<dp::GpuProgram> program, ShapesProgramParams const & params) = 0;
-  virtual void Apply(ref_ptr<dp::GraphicsContext> context,
-                     ref_ptr<dp::GpuProgram> program, Arrow3dProgramParams const & params) = 0;
-  virtual void Apply(ref_ptr<dp::GraphicsContext> context,
-                     ref_ptr<dp::GpuProgram> program, DebugRectProgramParams const & params) = 0;
-  virtual void Apply(ref_ptr<dp::GraphicsContext> context,
-                     ref_ptr<dp::GpuProgram> program, ScreenQuadProgramParams const & params) = 0;
-  virtual void Apply(ref_ptr<dp::GraphicsContext> context,
-                     ref_ptr<dp::GpuProgram> program, SMAAProgramParams const & params) = 0;
-  virtual void Apply(ref_ptr<dp::GraphicsContext> context,
-                     ref_ptr<dp::GpuProgram> program, ImGuiProgramParams const & params) = 0;
+  virtual void Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
+                     MapProgramParams const & params) = 0;
+  virtual void Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
+                     RouteProgramParams const & params) = 0;
+  virtual void Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
+                     TrafficProgramParams const & params) = 0;
+  virtual void Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
+                     TransitProgramParams const & params) = 0;
+  virtual void Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
+                     GuiProgramParams const & params) = 0;
+  virtual void Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
+                     ShapesProgramParams const & params) = 0;
+  virtual void Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
+                     Arrow3dProgramParams const & params) = 0;
+  virtual void Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
+                     DebugRectProgramParams const & params) = 0;
+  virtual void Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
+                     ScreenQuadProgramParams const & params) = 0;
+  virtual void Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
+                     SMAAProgramParams const & params) = 0;
+  virtual void Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
+                     ImGuiProgramParams const & params) = 0;
 };
 }  // namespace gpu
diff --git a/libs/shaders/programs.hpp b/libs/shaders/programs.hpp
index 2804d29a0..ca69b7a22 100644
--- a/libs/shaders/programs.hpp
+++ b/libs/shaders/programs.hpp
@@ -131,8 +131,7 @@ inline std::string DebugPrint(Program p)
   case Program::SmaaFinal: return "SmaaFinal";
   case Program::ImGui: return "ImGui";
 
-  case Program::ProgramsCount:
-    CHECK(false, ("Try to output ProgramsCount"));
+  case Program::ProgramsCount: CHECK(false, ("Try to output ProgramsCount"));
   }
   CHECK(false, ("Unknown program"));
   return {};
diff --git a/libs/shaders/shaders_tests/gl_program_params_tests.cpp b/libs/shaders/shaders_tests/gl_program_params_tests.cpp
index 3b96e0d53..8b4488432 100644
--- a/libs/shaders/shaders_tests/gl_program_params_tests.cpp
+++ b/libs/shaders/shaders_tests/gl_program_params_tests.cpp
@@ -37,8 +37,7 @@ void TestProgramParams()
 #ifdef OMIM_OS_MAC
 UNIT_TEST(MapProgramParams_Test)
 {
-  RunTestInOpenGLOffscreenEnvironment("MapProgramParams_Test",
-                                      std::bind(&TestProgramParams<gpu::MapProgramParams>));
+  RunTestInOpenGLOffscreenEnvironment("MapProgramParams_Test", std::bind(&TestProgramParams<gpu::MapProgramParams>));
 }
 
 UNIT_TEST(RouteProgramParams_Test)
@@ -61,8 +60,7 @@ UNIT_TEST(TransitProgramParams_Test)
 
 UNIT_TEST(GuiProgramParams_Test)
 {
-  RunTestInOpenGLOffscreenEnvironment("GuiProgramParams_Test",
-                                      std::bind(&TestProgramParams<gpu::GuiProgramParams>));
+  RunTestInOpenGLOffscreenEnvironment("GuiProgramParams_Test", std::bind(&TestProgramParams<gpu::GuiProgramParams>));
 }
 
 UNIT_TEST(ShapesProgramParams_Test)
@@ -91,7 +89,6 @@ UNIT_TEST(ScreenQuadProgramParams_Test)
 
 UNIT_TEST(SMAAProgramParams_Test)
 {
-  RunTestInOpenGLOffscreenEnvironment("SMAAProgramParams_Test",
-                                      std::bind(&TestProgramParams<gpu::SMAAProgramParams>));
+  RunTestInOpenGLOffscreenEnvironment("SMAAProgramParams_Test", std::bind(&TestProgramParams<gpu::SMAAProgramParams>));
 }
 #endif
diff --git a/libs/shaders/shaders_tests/gl_shaders_desktop_compile_tests.cpp b/libs/shaders/shaders_tests/gl_shaders_desktop_compile_tests.cpp
index 10f8eeec8..961cc730c 100644
--- a/libs/shaders/shaders_tests/gl_shaders_desktop_compile_tests.cpp
+++ b/libs/shaders/shaders_tests/gl_shaders_desktop_compile_tests.cpp
@@ -28,13 +28,11 @@ UNIT_TEST(DesktopCompileShaders_GLES3_Test)
 {
   RunTestInOpenGLOffscreenEnvironment("DesktopCompileShaders_GLES3_Test",
                                       std::bind(&CompileShaders, false /* enableVTF */));
-
 }
 
 UNIT_TEST(DesktopCompileShaders_GLES3_VTF_Test)
 {
   RunTestInOpenGLOffscreenEnvironment("DesktopCompileShaders_GLES3_VTF_Test",
                                       std::bind(&CompileShaders, true /* enableVTF */));
-
 }
 #endif
diff --git a/libs/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp b/libs/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp
index a23fb6803..6493dcf1e 100644
--- a/libs/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp
+++ b/libs/shaders/shaders_tests/gl_shaders_mobile_compile_test.cpp
@@ -9,10 +9,10 @@
 #include "base/logging.hpp"
 #include "base/thread_pool_delayed.hpp"
 
-#include <QtCore/QTemporaryFile>
 #include <QtCore/QDebug>
 #include <QtCore/QDir>
 #include <QtCore/QProcess>
+#include <QtCore/QTemporaryFile>
 #include <QtCore/QTextStream>
 
 #include <atomic>
@@ -35,7 +35,10 @@ std::string const kCompilerMaliOpenGLES3 = kMaliCompilerOpenGLES3Dir + "/malisc"
 std::string const kCompilerOpenGLES = "linux/glslangValidator";
 #endif
 
-std::string DebugPrint(QString const & s) { return s.toStdString(); }
+std::string DebugPrint(QString const & s)
+{
+  return s.toStdString();
+}
 
 namespace
 {
@@ -71,10 +74,10 @@ std::map<std::string, std::string> GetFragmentShaders(dp::ApiVersion apiVersion)
   return shaders;
 }
 
-void RunShaderTest(dp::ApiVersion apiVersion, std::string const & shaderName,
-                   QString const & glslCompiler, QString const & fileName,
-                   PrepareProcessFn const & procPrepare, PrepareArgumentsFn const & argsPrepare,
-                   SuccessChecker const & successChecker, QTextStream & errorLog)
+void RunShaderTest(dp::ApiVersion apiVersion, std::string const & shaderName, QString const & glslCompiler,
+                   QString const & fileName, PrepareProcessFn const & procPrepare,
+                   PrepareArgumentsFn const & argsPrepare, SuccessChecker const & successChecker,
+                   QTextStream & errorLog)
 {
   QProcess p;
   procPrepare(p);
@@ -116,22 +119,18 @@ void TestShaders(dp::ApiVersion apiVersion, std::string const & defines, QString
       // Use desktop shader version for Linux
 #ifdef OMIM_OS_LINUX
       if (glslCompiler.contains(kCompilerOpenGLES.c_str()))
-      {
         fullSrc = std::string(gpu::GL3_SHADER_VERSION) + defines + src.second;
-      }
       else
 #endif
-      {
         fullSrc = std::string(gpu::GLES3_SHADER_VERSION) + defines + src.second;
-      }
     }
     else
     {
       fullSrc = defines + src.second;
     }
     WriteShaderToFile(srcFile, fullSrc);
-    RunShaderTest(apiVersion, src.first, glslCompiler, srcFile.fileName(), procPrepare, argsPrepare,
-                  successChecker, errorLog);
+    RunShaderTest(apiVersion, src.first, glslCompiler, srcFile.fileName(), procPrepare, argsPrepare, successChecker,
+                  errorLog);
   }
 }
 
@@ -152,20 +151,16 @@ struct CompilerData
 
 void CompileShaders(CompilerData const & compiler, std::string const & additionalDefines = {})
 {
-  auto successChecker = [](QString const & output) {
-    return output.isEmpty();
-  };
+  auto successChecker = [](QString const & output) { return output.isEmpty(); };
 
   QString errorLog;
   QTextStream ss(&errorLog);
 
   QString compilerPath = QString::fromStdString(compiler.m_compilerPath);
-  auto argsPrepareFn = [](QStringList & args, QString const & fileName) {
-    args << fileName;
-  };
+  auto argsPrepareFn = [](QStringList & args, QString const & fileName) { args << fileName; };
 
-  TestShaders(compiler.m_apiVersion, additionalDefines, ".vert", GetVertexShaders(compiler.m_apiVersion),
-              compilerPath, [](QProcess const &) {}, argsPrepareFn, successChecker, ss);
+  TestShaders(compiler.m_apiVersion, additionalDefines, ".vert", GetVertexShaders(compiler.m_apiVersion), compilerPath,
+              [](QProcess const &) {}, argsPrepareFn, successChecker, ss);
   TestShaders(compiler.m_apiVersion, additionalDefines, ".frag", GetFragmentShaders(compiler.m_apiVersion),
               compilerPath, [](QProcess const &) {}, argsPrepareFn, successChecker, ss);
 
@@ -176,14 +171,10 @@ UNIT_TEST(MobileCompileShaders_Test)
 {
   base::DelayedThreadPool workerThread(6 /* threadsCount */);
 
-  workerThread.Push([] {
-    CompileShaders({dp::ApiVersion::OpenGLES3, GetCompilerPath(kCompilerOpenGLES)});
-  });
+  workerThread.Push([] { CompileShaders({dp::ApiVersion::OpenGLES3, GetCompilerPath(kCompilerOpenGLES)}); });
 
-  workerThread.Push([] {
-    CompileShaders({dp::ApiVersion::OpenGLES3, GetCompilerPath(kCompilerOpenGLES)},
-      "#define ENABLE_VTF\n");
-  });
+  workerThread.Push([]
+  { CompileShaders({dp::ApiVersion::OpenGLES3, GetCompilerPath(kCompilerOpenGLES)}, "#define ENABLE_VTF\n"); });
 
   workerThread.Shutdown(base::DelayedThreadPool::Exit::ExecPending);
 }
@@ -214,9 +205,7 @@ struct MaliCompilerData
 void MaliCompileShaders(MaliCompilerData const & compiler, MaliDriverSet const & driverSet,
                         MaliReleaseVersion const & version)
 {
-  auto successChecker = [](QString const & output) {
-    return output.indexOf("Compilation succeeded.") != -1;
-  };
+  auto successChecker = [](QString const & output) { return output.indexOf("Compilation succeeded.") != -1; };
 
   QString errorLog;
   QTextStream ss(&errorLog);
@@ -225,19 +214,18 @@ void MaliCompileShaders(MaliCompilerData const & compiler, MaliDriverSet const &
   env.insert("MALICM_LOCATION", QString::fromStdString(compiler.m_compilerAdditionalPath));
   auto procPrepare = [&env](QProcess & p) { p.setProcessEnvironment(env); };
   QString shaderType = "-v";
-  auto argForming = [&](QStringList & args, QString const & fileName) {
-    args << shaderType
-         << "-r" << version.m_version << "-c" << version.m_series << "-d" << driverSet.m_driverName
+  auto argForming = [&](QStringList & args, QString const & fileName)
+  {
+    args << shaderType << "-r" << version.m_version << "-c" << version.m_series << "-d" << driverSet.m_driverName
          << fileName;
   };
   QString const compilerPath = QString::fromStdString(compiler.m_compilerPath);
-  TestShaders(compiler.m_apiVersion, "", {}, GetVertexShaders(compiler.m_apiVersion),
-              compilerPath, procPrepare, argForming, successChecker, ss);
+  TestShaders(compiler.m_apiVersion, "", {}, GetVertexShaders(compiler.m_apiVersion), compilerPath, procPrepare,
+              argForming, successChecker, ss);
   shaderType = "-f";
-  TestShaders(compiler.m_apiVersion, "", {}, GetFragmentShaders(compiler.m_apiVersion),
-              compilerPath, procPrepare, argForming, successChecker, ss);
-  TEST(errorLog.isEmpty(),
-       (shaderType, version.m_series, version.m_version, driverSet.m_driverName, "", errorLog));
+  TestShaders(compiler.m_apiVersion, "", {}, GetFragmentShaders(compiler.m_apiVersion), compilerPath, procPrepare,
+              argForming, successChecker, ss);
+  TEST(errorLog.isEmpty(), (shaderType, version.m_series, version.m_version, driverSet.m_driverName, "", errorLog));
 
   // MALI GPUs do not support ENABLE_VTF. Do not test it here.
 }
@@ -245,228 +233,214 @@ void MaliCompileShaders(MaliCompilerData const & compiler, MaliDriverSet const &
 UNIT_TEST(MALI_MobileCompileShaders_Test)
 {
 #if defined(OMIM_OS_MAC)
-  std::vector<MaliDriverSet> const driversES2old = {
-     {"Mali-400_r4p0-00rel1",
-      {{"Mali-200", "r0p1", true}, {"Mali-200", "r0p2", true},
-       {"Mali-200", "r0p3", true}, {"Mali-200", "r0p4", true},
-       {"Mali-200", "r0p5", true}, {"Mali-200", "r0p6", true},
-       {"Mali-400", "r0p0", true}, {"Mali-400", "r0p1", true},
-       {"Mali-400", "r1p0", true}, {"Mali-400", "r1p1", true},
-       {"Mali-300", "r0p0", true}, {"Mali-450", "r0p0", true}}},
-     {"Mali-T600_r4p0-00rel0",
-      {{"Mali-T600", "r0p0", true}, {"Mali-T600", "r0p0_15dev0", true},
-       {"Mali-T600", "r0p1", true}, {"Mali-T620", "r0p1", true},
-       {"Mali-T620", "r1p0", true}, {"Mali-T670", "r1p0", true}}},
-     {"Mali-T600_r4p1-00rel0",
-      {{"Mali-T600", "r0p0", true}, {"Mali-T600", "r0p0_15dev0", true},
-       {"Mali-T600", "r0p1", true}, {"Mali-T620", "r0p1", true},
-       {"Mali-T620", "r1p0", true}, {"Mali-T620", "r1p1", true},
-       {"Mali-T720", "r0p0", true}, {"Mali-T720", "r1p0", true},
-       {"Mali-T760", "r0p0", true}, {"Mali-T760", "r0p1", true},
-       {"Mali-T760", "r0p1_50rel0", true}, {"Mali-T760", "r0p2", true},
-       {"Mali-T760", "r0p3", true}, {"Mali-T760", "r1p0", true}}}};
+  std::vector<MaliDriverSet> const driversES2old = {{"Mali-400_r4p0-00rel1",
+                                                     {{"Mali-200", "r0p1", true},
+                                                      {"Mali-200", "r0p2", true},
+                                                      {"Mali-200", "r0p3", true},
+                                                      {"Mali-200", "r0p4", true},
+                                                      {"Mali-200", "r0p5", true},
+                                                      {"Mali-200", "r0p6", true},
+                                                      {"Mali-400", "r0p0", true},
+                                                      {"Mali-400", "r0p1", true},
+                                                      {"Mali-400", "r1p0", true},
+                                                      {"Mali-400", "r1p1", true},
+                                                      {"Mali-300", "r0p0", true},
+                                                      {"Mali-450", "r0p0", true}}},
+                                                    {"Mali-T600_r4p0-00rel0",
+                                                     {{"Mali-T600", "r0p0", true},
+                                                      {"Mali-T600", "r0p0_15dev0", true},
+                                                      {"Mali-T600", "r0p1", true},
+                                                      {"Mali-T620", "r0p1", true},
+                                                      {"Mali-T620", "r1p0", true},
+                                                      {"Mali-T670", "r1p0", true}}},
+                                                    {"Mali-T600_r4p1-00rel0",
+                                                     {{"Mali-T600", "r0p0", true},
+                                                      {"Mali-T600", "r0p0_15dev0", true},
+                                                      {"Mali-T600", "r0p1", true},
+                                                      {"Mali-T620", "r0p1", true},
+                                                      {"Mali-T620", "r1p0", true},
+                                                      {"Mali-T620", "r1p1", true},
+                                                      {"Mali-T720", "r0p0", true},
+                                                      {"Mali-T720", "r1p0", true},
+                                                      {"Mali-T760", "r0p0", true},
+                                                      {"Mali-T760", "r0p1", true},
+                                                      {"Mali-T760", "r0p1_50rel0", true},
+                                                      {"Mali-T760", "r0p2", true},
+                                                      {"Mali-T760", "r0p3", true},
+                                                      {"Mali-T760", "r1p0", true}}}};
 #endif
 
   std::vector<MaliDriverSet> const driversES3new = {
-     {"Mali-T600_r3p0-00rel0",
-      {{"Mali-T600", "r0p0", false}, {"Mali-T600", "r0p0_15dev0", false},
-       {"Mali-T600", "r0p1", false},
-       {"Mali-T620", "r0p0", false}, {"Mali-T620", "r0p1", false},
-       {"Mali-T620", "r1p0", false}}},
-     {"Mali-T600_r4p0-00rel0",
-      {{"Mali-T600", "r0p0", true}, {"Mali-T600", "r0p0_15dev0", true},
-       {"Mali-T600", "r0p1", true}, {"Mali-T620", "r0p1", true},
-       {"Mali-T620", "r1p0", true}}},
-     {"Mali-T600_r4p1-00rel0",
-      {{"Mali-T600", "r0p0", true}, {"Mali-T600", "r0p0_15dev0", true},
-       {"Mali-T600", "r0p1", true}, {"Mali-T620", "r0p1", true},
-       {"Mali-T620", "r1p0", true}, {"Mali-T620", "r1p1", true},
-       {"Mali-T720", "r0p0", true}, {"Mali-T720", "r1p0", true},
-       {"Mali-T760", "r0p0", true}, {"Mali-T760", "r0p1", true},
-       {"Mali-T760", "r0p1_50rel0", true}, {"Mali-T760", "r0p2", true},
-       {"Mali-T760", "r0p3", true}, {"Mali-T760", "r1p0", true}}},
-     {"Mali-T600_r5p0-00rel0",
-      {{"Mali-T600", "r0p0", true}, {"Mali-T600", "r0p0_15dev0", true},
-       {"Mali-T600", "r0p1", true}, {"Mali-T620", "r0p1", true},
-       {"Mali-T620", "r1p0", true}, {"Mali-T620", "r1p1", true},
-       {"Mali-T720", "r0p0", true}, {"Mali-T720", "r1p0", true},
-       {"Mali-T720", "r1p1", true},
-       {"Mali-T760", "r0p0", true}, {"Mali-T760", "r0p1", true},
-       {"Mali-T760", "r0p1_50rel0", true}, {"Mali-T760", "r0p2", true},
-       {"Mali-T760", "r0p3", true}, {"Mali-T760", "r1p0", true}}},
-     {"Mali-T600_r5p1-00rel0",
-      {{"Mali-T600", "r0p0", true}, {"Mali-T600", "r0p0_15dev0", true},
-       {"Mali-T600", "r0p1", true}, {"Mali-T620", "r0p1", true},
-       {"Mali-T620", "r1p0", true}, {"Mali-T620", "r1p1", true},
-       {"Mali-T720", "r0p0", true}, {"Mali-T720", "r1p0", true},
-       {"Mali-T720", "r1p1", true},
-       {"Mali-T760", "r0p0", true}, {"Mali-T760", "r0p1", true},
-       {"Mali-T760", "r0p1_50rel0", true}, {"Mali-T760", "r0p2", true},
-       {"Mali-T760", "r0p3", true}, {"Mali-T760", "r1p0", true},
-       {"Mali-T860", "r0p2", true}, {"Mali-T880", "r0p0", true},
-       {"Mali-T880", "r0p1", true}, {"Mali-T880", "r0p2", true}}},
-     {"Mali-T600_r6p0-00rel0",
-      {{"Mali-T600", "r0p0", true}, {"Mali-T600", "r0p0_15dev0", true},
-       {"Mali-T600", "r0p1", true}, {"Mali-T620", "r0p1", true},
-       {"Mali-T620", "r1p0", true}, {"Mali-T620", "r1p1", true},
-       {"Mali-T720", "r0p0", true}, {"Mali-T720", "r1p0", true},
-       {"Mali-T720", "r1p1", true},
-       {"Mali-T760", "r0p0", true}, {"Mali-T760", "r0p1", true},
-       {"Mali-T760", "r0p1_50rel0", true}, {"Mali-T760", "r0p2", true},
-       {"Mali-T760", "r0p3", true}, {"Mali-T760", "r1p0", true},
-       {"Mali-T820", "r0p0", true},
-       {"Mali-T830", "r1p0", true}, {"Mali-T830", "r0p1", true},
-       {"Mali-T860", "r0p2", true}, {"Mali-T860", "r1p0", true},
-       {"Mali-T880", "r1p0", true}, {"Mali-T880", "r0p2", true},
-       {"Mali-T880", "r0p1", true}}},
-     {"Mali-T600_r7p0-00rel0",
-      {{"Mali-T600", "r0p0", true}, {"Mali-T600", "r0p0_15dev0", true},
-       {"Mali-T600", "r0p1", true},
-       {"Mali-T620", "r0p1", true}, {"Mali-T620", "r1p0", true},
-       {"Mali-T620", "r1p1", true},
-       {"Mali-T720", "r0p0", true}, {"Mali-T720", "r1p0", true},
-       {"Mali-T720", "r1p1", true},
-       {"Mali-T760", "r0p0", true}, {"Mali-T760", "r0p1", true},
-       {"Mali-T760", "r0p1_50rel0", true}, {"Mali-T760", "r0p2", true},
-       {"Mali-T760", "r0p3", true}, {"Mali-T760", "r1p0", true},
-       {"Mali-T820", "r0p0", true}, {"Mali-T820", "r0p1", true},
-       {"Mali-T820", "r1p0", true},
-       {"Mali-T830", "r1p0", true}, {"Mali-T830", "r0p1", true},
-       {"Mali-T860", "r0p2", true}, {"Mali-T860", "r1p0", true},
-       {"Mali-T860", "r2p0", true},
-       {"Mali-T880", "r1p0", true}, {"Mali-T880", "r0p2", true},
-       {"Mali-T880", "r0p1", true}, {"Mali-T880", "r2p0", true}}},
-     {"Mali-T600_r8p0-00rel0",
-      {{"Mali-T600", "r0p0", true}, {"Mali-T600", "r0p0_15dev0", true},
-       {"Mali-T600", "r0p1", true},
-       {"Mali-T620", "r0p1", true}, {"Mali-T620", "r1p0", true},
-       {"Mali-T620", "r1p1", true},
-       {"Mali-T720", "r0p0", true}, {"Mali-T720", "r1p0", true},
-       {"Mali-T720", "r1p1", true},
-       {"Mali-T760", "r0p0", true}, {"Mali-T760", "r0p1", true},
-       {"Mali-T760", "r0p1_50rel0", true}, {"Mali-T760", "r0p2", true},
-       {"Mali-T760", "r0p3", true}, {"Mali-T760", "r1p0", true},
-       {"Mali-T820", "r0p0", true}, {"Mali-T820", "r0p1", true},
-       {"Mali-T820", "r1p0", true},
-       {"Mali-T830", "r1p0", true}, {"Mali-T830", "r0p1", true},
-       {"Mali-T860", "r0p2", true}, {"Mali-T860", "r1p0", true},
-       {"Mali-T860", "r2p0", true},
-       {"Mali-T880", "r1p0", true}, {"Mali-T880", "r0p2", true},
-       {"Mali-T880", "r0p1", true}, {"Mali-T880", "r2p0", true}}},
-     {"Mali-T600_r9p0-00rel0",
-      {{"Mali-T600", "r0p0", true}, {"Mali-T600", "r0p0_15dev0", true},
-       {"Mali-T600", "r0p1", true},
-       {"Mali-T620", "r0p1", true}, {"Mali-T620", "r1p0", true},
-       {"Mali-T620", "r1p1", true},
-       {"Mali-T720", "r0p0", true}, {"Mali-T720", "r1p0", true},
-       {"Mali-T720", "r1p1", true},
-       {"Mali-T760", "r0p0", true}, {"Mali-T760", "r0p1", true},
-       {"Mali-T760", "r0p1_50rel0", true}, {"Mali-T760", "r0p2", true},
-       {"Mali-T760", "r0p3", true}, {"Mali-T760", "r1p0", true},
-       {"Mali-T820", "r0p0", true}, {"Mali-T820", "r0p1", true},
-       {"Mali-T820", "r1p0", true},
-       {"Mali-T830", "r1p0", true}, {"Mali-T830", "r0p1", true},
-       {"Mali-T860", "r0p2", true}, {"Mali-T860", "r1p0", true},
-       {"Mali-T860", "r2p0", true},
-       {"Mali-T880", "r1p0", true}, {"Mali-T880", "r0p2", true},
-       {"Mali-T880", "r0p1", true}, {"Mali-T880", "r2p0", true}}},
-     {"Mali-T600_r10p0-00rel0",
-      {{"Mali-T600", "r0p0", true}, {"Mali-T600", "r0p0_15dev0", true},
-       {"Mali-T600", "r0p1", true},
-       {"Mali-T620", "r0p1", true}, {"Mali-T620", "r1p0", true},
-       {"Mali-T620", "r1p1", true},
-       {"Mali-T720", "r0p0", true}, {"Mali-T720", "r1p0", true},
-       {"Mali-T720", "r1p1", true},
-       {"Mali-T760", "r0p0", true}, {"Mali-T760", "r0p1", true},
-       {"Mali-T760", "r0p1_50rel0", true}, {"Mali-T760", "r0p2", true},
-       {"Mali-T760", "r0p3", true}, {"Mali-T760", "r1p0", true},
-       {"Mali-T820", "r0p0", true}, {"Mali-T820", "r0p1", true},
-       {"Mali-T820", "r1p0", true},
-       {"Mali-T830", "r1p0", true}, {"Mali-T830", "r0p1", true},
-       {"Mali-T860", "r0p2", true}, {"Mali-T860", "r1p0", true},
-       {"Mali-T860", "r2p0", true},
-       {"Mali-T880", "r1p0", true}, {"Mali-T880", "r0p2", true},
-       {"Mali-T880", "r0p1", true}, {"Mali-T880", "r2p0", true}}},
-     {"Mali-T600_r11p0-00rel0",
-      {{"Mali-T600", "r0p0", true}, {"Mali-T600", "r0p0_15dev0", true},
-       {"Mali-T600", "r0p1", true},
-       {"Mali-T620", "r0p1", true}, {"Mali-T620", "r1p0", true},
-       {"Mali-T620", "r1p1", true},
-       {"Mali-T720", "r0p0", true}, {"Mali-T720", "r1p0", true},
-       {"Mali-T720", "r1p1", true},
-       {"Mali-T760", "r0p0", true}, {"Mali-T760", "r0p1", true},
-       {"Mali-T760", "r0p1_50rel0", true}, {"Mali-T760", "r0p2", true},
-       {"Mali-T760", "r0p3", true}, {"Mali-T760", "r1p0", true},
-       {"Mali-T820", "r0p0", true}, {"Mali-T820", "r0p1", true},
-       {"Mali-T820", "r1p0", true},
-       {"Mali-T830", "r1p0", true}, {"Mali-T830", "r0p1", true},
-       {"Mali-T860", "r0p2", true}, {"Mali-T860", "r1p0", true},
-       {"Mali-T860", "r2p0", true},
-       {"Mali-T880", "r1p0", true}, {"Mali-T880", "r0p2", true},
-       {"Mali-T880", "r0p1", true}, {"Mali-T880", "r2p0", true}}},
-     {"Mali-T600_r12p0-00rel0",
-      {{"Mali-T600", "r0p0", true}, {"Mali-T600", "r0p0_15dev0", true},
-       {"Mali-T600", "r0p1", true},
-       {"Mali-T620", "r0p1", true}, {"Mali-T620", "r1p0", true},
-       {"Mali-T620", "r1p1", true},
-       {"Mali-T720", "r0p0", true}, {"Mali-T720", "r1p0", true},
-       {"Mali-T720", "r1p1", true},
-       {"Mali-T760", "r0p0", true}, {"Mali-T760", "r0p1", true},
-       {"Mali-T760", "r0p1_50rel0", true}, {"Mali-T760", "r0p2", true},
-       {"Mali-T760", "r0p3", true}, {"Mali-T760", "r1p0", true},
-       {"Mali-T820", "r0p0", true}, {"Mali-T820", "r0p1", true},
-       {"Mali-T820", "r1p0", true},
-       {"Mali-T830", "r1p0", true}, {"Mali-T830", "r0p1", true},
-       {"Mali-T860", "r0p2", true}, {"Mali-T860", "r1p0", true},
-       {"Mali-T860", "r2p0", true},
-       {"Mali-T880", "r1p0", true}, {"Mali-T880", "r0p2", true},
-       {"Mali-T880", "r0p1", true}, {"Mali-T880", "r2p0", true}}},
-     {"Mali-T600_r13p0-00rel0",
-      {{"Mali-T600", "r0p0", true}, {"Mali-T600", "r0p0_15dev0", true},
-       {"Mali-T600", "r0p1", true},
-       {"Mali-T620", "r0p1", true}, {"Mali-T620", "r1p0", true},
-       {"Mali-T620", "r1p1", true},
-       {"Mali-T720", "r0p0", true}, {"Mali-T720", "r1p0", true},
-       {"Mali-T720", "r1p1", true},
-       {"Mali-T760", "r0p0", true}, {"Mali-T760", "r0p1", true},
-       {"Mali-T760", "r0p1_50rel0", true}, {"Mali-T760", "r0p2", true},
-       {"Mali-T760", "r0p3", true}, {"Mali-T760", "r1p0", true},
-       {"Mali-T820", "r0p0", true}, {"Mali-T820", "r0p1", true},
-       {"Mali-T820", "r1p0", true},
-       {"Mali-T830", "r1p0", true}, {"Mali-T830", "r0p1", true},
-       {"Mali-T860", "r0p2", true}, {"Mali-T860", "r1p0", true},
-       {"Mali-T860", "r2p0", true},
-       {"Mali-T880", "r1p0", true}, {"Mali-T880", "r0p2", true},
-       {"Mali-T880", "r0p1", true}, {"Mali-T880", "r2p0", true}}},
-     {"Mali-Gxx_r3p0-00rel0",
-      {{"Mali-G71", "r0p0", false}}}};
+      {"Mali-T600_r3p0-00rel0",
+       {{"Mali-T600", "r0p0", false},
+        {"Mali-T600", "r0p0_15dev0", false},
+        {"Mali-T600", "r0p1", false},
+        {"Mali-T620", "r0p0", false},
+        {"Mali-T620", "r0p1", false},
+        {"Mali-T620", "r1p0", false}}},
+      {"Mali-T600_r4p0-00rel0",
+       {{"Mali-T600", "r0p0", true},
+        {"Mali-T600", "r0p0_15dev0", true},
+        {"Mali-T600", "r0p1", true},
+        {"Mali-T620", "r0p1", true},
+        {"Mali-T620", "r1p0", true}}},
+      {"Mali-T600_r4p1-00rel0",
+       {{"Mali-T600", "r0p0", true},
+        {"Mali-T600", "r0p0_15dev0", true},
+        {"Mali-T600", "r0p1", true},
+        {"Mali-T620", "r0p1", true},
+        {"Mali-T620", "r1p0", true},
+        {"Mali-T620", "r1p1", true},
+        {"Mali-T720", "r0p0", true},
+        {"Mali-T720", "r1p0", true},
+        {"Mali-T760", "r0p0", true},
+        {"Mali-T760", "r0p1", true},
+        {"Mali-T760", "r0p1_50rel0", true},
+        {"Mali-T760", "r0p2", true},
+        {"Mali-T760", "r0p3", true},
+        {"Mali-T760", "r1p0", true}}},
+      {"Mali-T600_r5p0-00rel0",
+       {{"Mali-T600", "r0p0", true},
+        {"Mali-T600", "r0p0_15dev0", true},
+        {"Mali-T600", "r0p1", true},
+        {"Mali-T620", "r0p1", true},
+        {"Mali-T620", "r1p0", true},
+        {"Mali-T620", "r1p1", true},
+        {"Mali-T720", "r0p0", true},
+        {"Mali-T720", "r1p0", true},
+        {"Mali-T720", "r1p1", true},
+        {"Mali-T760", "r0p0", true},
+        {"Mali-T760", "r0p1", true},
+        {"Mali-T760", "r0p1_50rel0", true},
+        {"Mali-T760", "r0p2", true},
+        {"Mali-T760", "r0p3", true},
+        {"Mali-T760", "r1p0", true}}},
+      {"Mali-T600_r5p1-00rel0",
+       {{"Mali-T600", "r0p0", true},
+        {"Mali-T600", "r0p0_15dev0", true},
+        {"Mali-T600", "r0p1", true},
+        {"Mali-T620", "r0p1", true},
+        {"Mali-T620", "r1p0", true},
+        {"Mali-T620", "r1p1", true},
+        {"Mali-T720", "r0p0", true},
+        {"Mali-T720", "r1p0", true},
+        {"Mali-T720", "r1p1", true},
+        {"Mali-T760", "r0p0", true},
+        {"Mali-T760", "r0p1", true},
+        {"Mali-T760", "r0p1_50rel0", true},
+        {"Mali-T760", "r0p2", true},
+        {"Mali-T760", "r0p3", true},
+        {"Mali-T760", "r1p0", true},
+        {"Mali-T860", "r0p2", true},
+        {"Mali-T880", "r0p0", true},
+        {"Mali-T880", "r0p1", true},
+        {"Mali-T880", "r0p2", true}}},
+      {"Mali-T600_r6p0-00rel0",
+       {{"Mali-T600", "r0p0", true}, {"Mali-T600", "r0p0_15dev0", true}, {"Mali-T600", "r0p1", true},
+        {"Mali-T620", "r0p1", true}, {"Mali-T620", "r1p0", true},        {"Mali-T620", "r1p1", true},
+        {"Mali-T720", "r0p0", true}, {"Mali-T720", "r1p0", true},        {"Mali-T720", "r1p1", true},
+        {"Mali-T760", "r0p0", true}, {"Mali-T760", "r0p1", true},        {"Mali-T760", "r0p1_50rel0", true},
+        {"Mali-T760", "r0p2", true}, {"Mali-T760", "r0p3", true},        {"Mali-T760", "r1p0", true},
+        {"Mali-T820", "r0p0", true}, {"Mali-T830", "r1p0", true},        {"Mali-T830", "r0p1", true},
+        {"Mali-T860", "r0p2", true}, {"Mali-T860", "r1p0", true},        {"Mali-T880", "r1p0", true},
+        {"Mali-T880", "r0p2", true}, {"Mali-T880", "r0p1", true}}},
+      {"Mali-T600_r7p0-00rel0",
+       {{"Mali-T600", "r0p0", true}, {"Mali-T600", "r0p0_15dev0", true}, {"Mali-T600", "r0p1", true},
+        {"Mali-T620", "r0p1", true}, {"Mali-T620", "r1p0", true},        {"Mali-T620", "r1p1", true},
+        {"Mali-T720", "r0p0", true}, {"Mali-T720", "r1p0", true},        {"Mali-T720", "r1p1", true},
+        {"Mali-T760", "r0p0", true}, {"Mali-T760", "r0p1", true},        {"Mali-T760", "r0p1_50rel0", true},
+        {"Mali-T760", "r0p2", true}, {"Mali-T760", "r0p3", true},        {"Mali-T760", "r1p0", true},
+        {"Mali-T820", "r0p0", true}, {"Mali-T820", "r0p1", true},        {"Mali-T820", "r1p0", true},
+        {"Mali-T830", "r1p0", true}, {"Mali-T830", "r0p1", true},        {"Mali-T860", "r0p2", true},
+        {"Mali-T860", "r1p0", true}, {"Mali-T860", "r2p0", true},        {"Mali-T880", "r1p0", true},
+        {"Mali-T880", "r0p2", true}, {"Mali-T880", "r0p1", true},        {"Mali-T880", "r2p0", true}}},
+      {"Mali-T600_r8p0-00rel0",
+       {{"Mali-T600", "r0p0", true}, {"Mali-T600", "r0p0_15dev0", true}, {"Mali-T600", "r0p1", true},
+        {"Mali-T620", "r0p1", true}, {"Mali-T620", "r1p0", true},        {"Mali-T620", "r1p1", true},
+        {"Mali-T720", "r0p0", true}, {"Mali-T720", "r1p0", true},        {"Mali-T720", "r1p1", true},
+        {"Mali-T760", "r0p0", true}, {"Mali-T760", "r0p1", true},        {"Mali-T760", "r0p1_50rel0", true},
+        {"Mali-T760", "r0p2", true}, {"Mali-T760", "r0p3", true},        {"Mali-T760", "r1p0", true},
+        {"Mali-T820", "r0p0", true}, {"Mali-T820", "r0p1", true},        {"Mali-T820", "r1p0", true},
+        {"Mali-T830", "r1p0", true}, {"Mali-T830", "r0p1", true},        {"Mali-T860", "r0p2", true},
+        {"Mali-T860", "r1p0", true}, {"Mali-T860", "r2p0", true},        {"Mali-T880", "r1p0", true},
+        {"Mali-T880", "r0p2", true}, {"Mali-T880", "r0p1", true},        {"Mali-T880", "r2p0", true}}},
+      {"Mali-T600_r9p0-00rel0",
+       {{"Mali-T600", "r0p0", true}, {"Mali-T600", "r0p0_15dev0", true}, {"Mali-T600", "r0p1", true},
+        {"Mali-T620", "r0p1", true}, {"Mali-T620", "r1p0", true},        {"Mali-T620", "r1p1", true},
+        {"Mali-T720", "r0p0", true}, {"Mali-T720", "r1p0", true},        {"Mali-T720", "r1p1", true},
+        {"Mali-T760", "r0p0", true}, {"Mali-T760", "r0p1", true},        {"Mali-T760", "r0p1_50rel0", true},
+        {"Mali-T760", "r0p2", true}, {"Mali-T760", "r0p3", true},        {"Mali-T760", "r1p0", true},
+        {"Mali-T820", "r0p0", true}, {"Mali-T820", "r0p1", true},        {"Mali-T820", "r1p0", true},
+        {"Mali-T830", "r1p0", true}, {"Mali-T830", "r0p1", true},        {"Mali-T860", "r0p2", true},
+        {"Mali-T860", "r1p0", true}, {"Mali-T860", "r2p0", true},        {"Mali-T880", "r1p0", true},
+        {"Mali-T880", "r0p2", true}, {"Mali-T880", "r0p1", true},        {"Mali-T880", "r2p0", true}}},
+      {"Mali-T600_r10p0-00rel0",
+       {{"Mali-T600", "r0p0", true}, {"Mali-T600", "r0p0_15dev0", true}, {"Mali-T600", "r0p1", true},
+        {"Mali-T620", "r0p1", true}, {"Mali-T620", "r1p0", true},        {"Mali-T620", "r1p1", true},
+        {"Mali-T720", "r0p0", true}, {"Mali-T720", "r1p0", true},        {"Mali-T720", "r1p1", true},
+        {"Mali-T760", "r0p0", true}, {"Mali-T760", "r0p1", true},        {"Mali-T760", "r0p1_50rel0", true},
+        {"Mali-T760", "r0p2", true}, {"Mali-T760", "r0p3", true},        {"Mali-T760", "r1p0", true},
+        {"Mali-T820", "r0p0", true}, {"Mali-T820", "r0p1", true},        {"Mali-T820", "r1p0", true},
+        {"Mali-T830", "r1p0", true}, {"Mali-T830", "r0p1", true},        {"Mali-T860", "r0p2", true},
+        {"Mali-T860", "r1p0", true}, {"Mali-T860", "r2p0", true},        {"Mali-T880", "r1p0", true},
+        {"Mali-T880", "r0p2", true}, {"Mali-T880", "r0p1", true},        {"Mali-T880", "r2p0", true}}},
+      {"Mali-T600_r11p0-00rel0",
+       {{"Mali-T600", "r0p0", true}, {"Mali-T600", "r0p0_15dev0", true}, {"Mali-T600", "r0p1", true},
+        {"Mali-T620", "r0p1", true}, {"Mali-T620", "r1p0", true},        {"Mali-T620", "r1p1", true},
+        {"Mali-T720", "r0p0", true}, {"Mali-T720", "r1p0", true},        {"Mali-T720", "r1p1", true},
+        {"Mali-T760", "r0p0", true}, {"Mali-T760", "r0p1", true},        {"Mali-T760", "r0p1_50rel0", true},
+        {"Mali-T760", "r0p2", true}, {"Mali-T760", "r0p3", true},        {"Mali-T760", "r1p0", true},
+        {"Mali-T820", "r0p0", true}, {"Mali-T820", "r0p1", true},        {"Mali-T820", "r1p0", true},
+        {"Mali-T830", "r1p0", true}, {"Mali-T830", "r0p1", true},        {"Mali-T860", "r0p2", true},
+        {"Mali-T860", "r1p0", true}, {"Mali-T860", "r2p0", true},        {"Mali-T880", "r1p0", true},
+        {"Mali-T880", "r0p2", true}, {"Mali-T880", "r0p1", true},        {"Mali-T880", "r2p0", true}}},
+      {"Mali-T600_r12p0-00rel0",
+       {{"Mali-T600", "r0p0", true}, {"Mali-T600", "r0p0_15dev0", true}, {"Mali-T600", "r0p1", true},
+        {"Mali-T620", "r0p1", true}, {"Mali-T620", "r1p0", true},        {"Mali-T620", "r1p1", true},
+        {"Mali-T720", "r0p0", true}, {"Mali-T720", "r1p0", true},        {"Mali-T720", "r1p1", true},
+        {"Mali-T760", "r0p0", true}, {"Mali-T760", "r0p1", true},        {"Mali-T760", "r0p1_50rel0", true},
+        {"Mali-T760", "r0p2", true}, {"Mali-T760", "r0p3", true},        {"Mali-T760", "r1p0", true},
+        {"Mali-T820", "r0p0", true}, {"Mali-T820", "r0p1", true},        {"Mali-T820", "r1p0", true},
+        {"Mali-T830", "r1p0", true}, {"Mali-T830", "r0p1", true},        {"Mali-T860", "r0p2", true},
+        {"Mali-T860", "r1p0", true}, {"Mali-T860", "r2p0", true},        {"Mali-T880", "r1p0", true},
+        {"Mali-T880", "r0p2", true}, {"Mali-T880", "r0p1", true},        {"Mali-T880", "r2p0", true}}},
+      {"Mali-T600_r13p0-00rel0",
+       {{"Mali-T600", "r0p0", true}, {"Mali-T600", "r0p0_15dev0", true}, {"Mali-T600", "r0p1", true},
+        {"Mali-T620", "r0p1", true}, {"Mali-T620", "r1p0", true},        {"Mali-T620", "r1p1", true},
+        {"Mali-T720", "r0p0", true}, {"Mali-T720", "r1p0", true},        {"Mali-T720", "r1p1", true},
+        {"Mali-T760", "r0p0", true}, {"Mali-T760", "r0p1", true},        {"Mali-T760", "r0p1_50rel0", true},
+        {"Mali-T760", "r0p2", true}, {"Mali-T760", "r0p3", true},        {"Mali-T760", "r1p0", true},
+        {"Mali-T820", "r0p0", true}, {"Mali-T820", "r0p1", true},        {"Mali-T820", "r1p0", true},
+        {"Mali-T830", "r1p0", true}, {"Mali-T830", "r0p1", true},        {"Mali-T860", "r0p2", true},
+        {"Mali-T860", "r1p0", true}, {"Mali-T860", "r2p0", true},        {"Mali-T880", "r1p0", true},
+        {"Mali-T880", "r0p2", true}, {"Mali-T880", "r0p1", true},        {"Mali-T880", "r2p0", true}}},
+      {"Mali-Gxx_r3p0-00rel0", {{"Mali-G71", "r0p0", false}}}};
 
-  std::vector<MaliDriverSet> driversES2new = {
-     {"Mali-400_r5p0-01rel0",
-      {{"Mali-300", "r0p0", true},
-       {"Mali-400", "r1p1", true}, {"Mali-400", "r1p0", true},
-       {"Mali-400", "r0p1", true}, {"Mali-400", "r0p0", true},
-       {"Mali-450", "r0p0", true}
-       }},
-     {"Mali-400_r6p1-00rel0",
-      {{"Mali-400", "r1p1", true}, {"Mali-400", "r1p0", true},
-       {"Mali-400", "r0p1", true}, {"Mali-400", "r0p0", true},
-       {"Mali-450", "r0p0", true},
-       {"Mali-470", "r0p1", true}
-       }},
-     {"Mali-400_r7p0-00rel0",
-      {{"Mali-400", "r1p1", true}, {"Mali-400", "r1p0", true},
-       {"Mali-400", "r0p1", true}, {"Mali-400", "r0p0", true},
-       {"Mali-450", "r0p0", true},
-       {"Mali-470", "r0p1", true}}}};
+  std::vector<MaliDriverSet> driversES2new = {{"Mali-400_r5p0-01rel0",
+                                               {{"Mali-300", "r0p0", true},
+                                                {"Mali-400", "r1p1", true},
+                                                {"Mali-400", "r1p0", true},
+                                                {"Mali-400", "r0p1", true},
+                                                {"Mali-400", "r0p0", true},
+                                                {"Mali-450", "r0p0", true}}},
+                                              {"Mali-400_r6p1-00rel0",
+                                               {{"Mali-400", "r1p1", true},
+                                                {"Mali-400", "r1p0", true},
+                                                {"Mali-400", "r0p1", true},
+                                                {"Mali-400", "r0p0", true},
+                                                {"Mali-450", "r0p0", true},
+                                                {"Mali-470", "r0p1", true}}},
+                                              {"Mali-400_r7p0-00rel0",
+                                               {{"Mali-400", "r1p1", true},
+                                                {"Mali-400", "r1p0", true},
+                                                {"Mali-400", "r0p1", true},
+                                                {"Mali-400", "r0p0", true},
+                                                {"Mali-450", "r0p0", true},
+                                                {"Mali-470", "r0p1", true}}}};
   driversES2new.insert(driversES2new.end(), driversES3new.begin(), driversES3new.end());
 
-  std::vector<MaliCompilerData> const compilers = {
-    {dp::ApiVersion::OpenGLES3,
-     GetCompilerPath(kCompilerMaliOpenGLES3),
-     GetCompilerPath(kMaliCompilerOpenGLES3Dir),
-     driversES3new}
-  };
+  std::vector<MaliCompilerData> const compilers = {{dp::ApiVersion::OpenGLES3, GetCompilerPath(kCompilerMaliOpenGLES3),
+                                                    GetCompilerPath(kMaliCompilerOpenGLES3Dir), driversES3new}};
 
   base::DelayedThreadPool workerThread(16 /* threadsCount */);
   uint32_t counter = 0;
@@ -482,7 +456,8 @@ UNIT_TEST(MALI_MobileCompileShaders_Test)
           continue;
 #endif
         counter++;
-        workerThread.Push([&progressCounter, compiler, set, version] {
+        workerThread.Push([&progressCounter, compiler, set, version]
+        {
           MaliCompileShaders(compiler, set, version);
           progressCounter++;
         });
diff --git a/libs/shaders/vulkan_program_params.cpp b/libs/shaders/vulkan_program_params.cpp
index 58dd83ffa..fc7fefac2 100644
--- a/libs/shaders/vulkan_program_params.cpp
+++ b/libs/shaders/vulkan_program_params.cpp
@@ -42,26 +42,20 @@ VulkanProgramParamsSetter::VulkanProgramParamsSetter(ref_ptr<dp::vulkan::VulkanB
   m_objectManager->SetMaxImageSamplers(programPool->GetMaxImageSamplers());
 
   for (auto & ub : m_uniformBuffers)
-  {
-    ub.emplace_back(CreateUniformBuffer(context->GetDevice(), m_objectManager,
-                                        m_sizeAlignment, m_offsetAlignment));
-  }
+    ub.emplace_back(CreateUniformBuffer(context->GetDevice(), m_objectManager, m_sizeAlignment, m_offsetAlignment));
 
-  m_flushHandlerId = context->RegisterHandler(VulkanBaseContext::HandlerType::PrePresent,
-    [this](uint32_t)
-  {
-    Flush();
-  });
+  m_flushHandlerId =
+      context->RegisterHandler(VulkanBaseContext::HandlerType::PrePresent, [this](uint32_t) { Flush(); });
 
-  m_finishHandlerId = context->RegisterHandler(VulkanBaseContext::HandlerType::PostPresent,
-    [this](uint32_t inflightFrameIndex)
+  m_finishHandlerId =
+      context->RegisterHandler(VulkanBaseContext::HandlerType::PostPresent, [this](uint32_t inflightFrameIndex)
   {
     CHECK_LESS(inflightFrameIndex, dp::vulkan::kMaxInflightFrames, ());
     Finish(inflightFrameIndex);
   });
 
-  m_updateInflightFrameId = context->RegisterHandler(VulkanBaseContext::HandlerType::UpdateInflightFrame,
-    [this](uint32_t inflightFrameIndex)
+  m_updateInflightFrameId =
+      context->RegisterHandler(VulkanBaseContext::HandlerType::UpdateInflightFrame, [this](uint32_t inflightFrameIndex)
   {
     CHECK_LESS(inflightFrameIndex, dp::vulkan::kMaxInflightFrames, ());
     m_currentInflightFrameIndex = inflightFrameIndex;
@@ -112,8 +106,8 @@ void VulkanProgramParamsSetter::Finish(uint32_t inflightFrameIndex)
     b.m_freeOffset = 0;
 }
 
-void VulkanProgramParamsSetter::ApplyBytes(ref_ptr<dp::vulkan::VulkanBaseContext> context,
-                                           void const * data, uint32_t sizeInBytes)
+void VulkanProgramParamsSetter::ApplyBytes(ref_ptr<dp::vulkan::VulkanBaseContext> context, void const * data,
+                                           uint32_t sizeInBytes)
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
   auto const & mm = m_objectManager->GetMemoryManager();
@@ -133,8 +127,7 @@ void VulkanProgramParamsSetter::ApplyBytes(ref_ptr<dp::vulkan::VulkanBaseContext
   if (index < 0)
   {
     uint32_t sizeAlignment, offsetAlignment;
-    ub.emplace_back(CreateUniformBuffer(context->GetDevice(), m_objectManager,
-                                        sizeAlignment, offsetAlignment));
+    ub.emplace_back(CreateUniformBuffer(context->GetDevice(), m_objectManager, sizeAlignment, offsetAlignment));
     CHECK_EQUAL(m_sizeAlignment, sizeAlignment, ());
     CHECK_EQUAL(m_offsetAlignment, offsetAlignment, ());
     index = static_cast<int>(ub.size()) - 1;
@@ -146,8 +139,8 @@ void VulkanProgramParamsSetter::ApplyBytes(ref_ptr<dp::vulkan::VulkanBaseContext
 
   // Update offset and align it.
   ub[index].m_freeOffset += alignedSize;
-  ub[index].m_freeOffset = std::min(mm.GetAligned(ub[index].m_freeOffset, m_offsetAlignment),
-                                    ub[index].m_object.GetAlignedSize());
+  ub[index].m_freeOffset =
+      std::min(mm.GetAligned(ub[index].m_freeOffset, m_offsetAlignment), ub[index].m_object.GetAlignedSize());
 
   memcpy(ptr, data, sizeInBytes);
 
@@ -159,79 +152,68 @@ void VulkanProgramParamsSetter::ApplyBytes(ref_ptr<dp::vulkan::VulkanBaseContext
   descriptor.m_id = static_cast<uint32_t>(index);
   context->ApplyParamDescriptor(std::move(descriptor));
 }
-  
-void VulkanProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
-                                      ref_ptr<dp::GpuProgram> program,
+
+void VulkanProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
                                       MapProgramParams const & params)
 {
   ApplyImpl(context, program, params);
 }
 
-void VulkanProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
-                                      ref_ptr<dp::GpuProgram> program,
+void VulkanProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
                                       RouteProgramParams const & params)
 {
   ApplyImpl(context, program, params);
 }
 
-void VulkanProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
-                                      ref_ptr<dp::GpuProgram> program,
+void VulkanProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
                                       TrafficProgramParams const & params)
 {
   ApplyImpl(context, program, params);
 }
 
-void VulkanProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
-                                      ref_ptr<dp::GpuProgram> program,
+void VulkanProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
                                       TransitProgramParams const & params)
 {
   ApplyImpl(context, program, params);
 }
 
-void VulkanProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
-                                      ref_ptr<dp::GpuProgram> program,
+void VulkanProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
                                       GuiProgramParams const & params)
 {
   ApplyImpl(context, program, params);
 }
 
-void VulkanProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
-                                      ref_ptr<dp::GpuProgram> program,
+void VulkanProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
                                       ShapesProgramParams const & params)
 {
   ApplyImpl(context, program, params);
 }
 
-void VulkanProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
-                                      ref_ptr<dp::GpuProgram> program,
+void VulkanProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
                                       Arrow3dProgramParams const & params)
 {
   ApplyImpl(context, program, params);
 }
 
-void VulkanProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
-                                      ref_ptr<dp::GpuProgram> program,
+void VulkanProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
                                       DebugRectProgramParams const & params)
 {
   ApplyImpl(context, program, params);
 }
 
-void VulkanProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
-                                      ref_ptr<dp::GpuProgram> program,
+void VulkanProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
                                       ScreenQuadProgramParams const & params)
 {
   ApplyImpl(context, program, params);
 }
 
-void VulkanProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
-                                      ref_ptr<dp::GpuProgram> program,
+void VulkanProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
                                       SMAAProgramParams const & params)
 {
   ApplyImpl(context, program, params);
 }
 
-void VulkanProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context,
-                                      ref_ptr<dp::GpuProgram> program, 
+void VulkanProgramParamsSetter::Apply(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
                                       ImGuiProgramParams const & params)
 {
   ApplyImpl(context, program, params);
diff --git a/libs/shaders/vulkan_program_params.hpp b/libs/shaders/vulkan_program_params.hpp
index 25a2dcf8f..ae66e357b 100644
--- a/libs/shaders/vulkan_program_params.hpp
+++ b/libs/shaders/vulkan_program_params.hpp
@@ -26,7 +26,7 @@ public:
     dp::vulkan::VulkanObject m_object;
     uint8_t * m_pointer = nullptr;
     uint32_t m_freeOffset = 0;
-};
+  };
 
   VulkanProgramParamsSetter(ref_ptr<dp::vulkan::VulkanBaseContext> context, ref_ptr<VulkanProgramPool> programPool);
   ~VulkanProgramParamsSetter() override;
@@ -59,17 +59,15 @@ public:
              ImGuiProgramParams const & params) override;
 
 private:
-  template<typename T>
-  void ApplyImpl(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program,
-                 T const & params)
+  template <typename T>
+  void ApplyImpl(ref_ptr<dp::GraphicsContext> context, ref_ptr<dp::GpuProgram> program, T const & params)
   {
     ASSERT_EQUAL(T::GetName(), ProgramParams::GetBoundParamsName(program),
                  ("Mismatched program and parameters", program->GetName()));
     ApplyBytes(context, reinterpret_cast<void const *>(&params), sizeof(params));
   }
 
-  void ApplyBytes(ref_ptr<dp::vulkan::VulkanBaseContext> context,
-                  void const * data, uint32_t sizeInBytes);
+  void ApplyBytes(ref_ptr<dp::vulkan::VulkanBaseContext> context, void const * data, uint32_t sizeInBytes);
 
   ref_ptr<dp::vulkan::VulkanObjectManager> m_objectManager;
   std::array<std::vector<UniformBuffer>, dp::vulkan::kMaxInflightFrames> m_uniformBuffers;
diff --git a/libs/shaders/vulkan_program_pool.cpp b/libs/shaders/vulkan_program_pool.cpp
index c8d07744f..1fea8fc28 100644
--- a/libs/shaders/vulkan_program_pool.cpp
+++ b/libs/shaders/vulkan_program_pool.cpp
@@ -55,9 +55,7 @@ struct TextureBindingReflectionInfo
   std::string m_name;
   int8_t m_index = kInvalidBindingIndex;
   int8_t m_isInFragmentShader = 1;
-  DECLARE_VISITOR(visitor(m_name, "name"),
-                  visitor(m_index, "idx"),
-                  visitor(m_isInFragmentShader, "frag"))
+  DECLARE_VISITOR(visitor(m_name, "name"), visitor(m_index, "idx"), visitor(m_isInFragmentShader, "frag"))
 };
 
 struct ReflectionInfo
@@ -66,8 +64,7 @@ struct ReflectionInfo
   int8_t m_fsUniformsIndex = kInvalidBindingIndex;
   std::vector<TextureBindingReflectionInfo> m_textures;
 
-  DECLARE_VISITOR(visitor(m_vsUniformsIndex, "vs_uni"),
-                  visitor(m_fsUniformsIndex, "fs_uni"),
+  DECLARE_VISITOR(visitor(m_vsUniformsIndex, "vs_uni"), visitor(m_fsUniformsIndex, "fs_uni"),
                   visitor(m_textures, "tex"))
 };
 
@@ -79,12 +76,8 @@ struct ReflectionData
   uint32_t m_vsSize = 0;
   uint32_t m_fsSize = 0;
   ReflectionInfo m_info;
-  DECLARE_VISITOR(visitor(m_programIndex, "prg"),
-                  visitor(m_vsOffset, "vs_off"),
-                  visitor(m_fsOffset, "fs_off"),
-                  visitor(m_vsSize, "vs_size"),
-                  visitor(m_fsSize, "fs_size"),
-                  visitor(m_info, "info"))
+  DECLARE_VISITOR(visitor(m_programIndex, "prg"), visitor(m_vsOffset, "vs_off"), visitor(m_fsOffset, "fs_off"),
+                  visitor(m_vsSize, "vs_size"), visitor(m_fsSize, "fs_size"), visitor(m_info, "info"))
 };
 
 struct ReflectionFile
@@ -122,10 +115,7 @@ std::map<uint8_t, ReflectionData> ReadReflectionFile(std::string const & filenam
   for (auto & d : reflectionFile.m_reflectionData)
   {
     auto const index = d.m_programIndex;
-    std::ranges::sort(d.m_info.m_textures, [](auto const & a, auto const & b)
-              {
-                return a.m_index < b.m_index;
-              });
+    std::ranges::sort(d.m_info.m_textures, [](auto const & a, auto const & b) { return a.m_index < b.m_index; });
     result.insert(std::make_pair(index, std::move(d)));
   }
 
@@ -185,18 +175,17 @@ std::vector<VkDescriptorSetLayoutBinding> GetLayoutBindings(ReflectionInfo const
 
   for (uint32_t i = static_cast<uint32_t>(reflectionInfo.m_textures.size()); i < maxTextureBindings; ++i)
     result.push_back({
-      .binding = bindingIndex++,
-      .descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
-      .descriptorCount = 1,
-      .stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT,
-      .pImmutableSamplers = nullptr,
+        .binding = bindingIndex++,
+        .descriptorType = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER,
+        .descriptorCount = 1,
+        .stageFlags = VK_SHADER_STAGE_FRAGMENT_BIT,
+        .pImmutableSamplers = nullptr,
     });
 
   return result;
 }
 
-VkShaderModule LoadShaderModule(VkDevice device, std::vector<uint8_t> const & packData,
-                                uint32_t offset, uint32_t size)
+VkShaderModule LoadShaderModule(VkDevice device, std::vector<uint8_t> const & packData, uint32_t offset, uint32_t size)
 {
   VkShaderModule shaderModule;
   CHECK(offset % sizeof(uint32_t) == 0, ("Incorrect SPIR-V file alignment."));
@@ -235,21 +224,21 @@ VulkanProgramPool::VulkanProgramPool(ref_ptr<dp::GraphicsContext> context)
     auto const bindings = GetLayoutBindings(refl.m_info, m_maxImageSamplers);
     CHECK(bindings.size() == kMaxUniformBuffers + m_maxImageSamplers, ("Incorrect bindings count."));
 
-    VkDescriptorSetLayoutCreateInfo descriptorLayout  = {};
+    VkDescriptorSetLayoutCreateInfo descriptorLayout = {};
     descriptorLayout.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO;
     descriptorLayout.pBindings = bindings.data();
     descriptorLayout.bindingCount = static_cast<uint32_t>(bindings.size());
 
-    CHECK_VK_CALL(vkCreateDescriptorSetLayout(device, &descriptorLayout, nullptr,
-                                              &m_programData[i].m_descriptorSetLayout));
+    CHECK_VK_CALL(
+        vkCreateDescriptorSetLayout(device, &descriptorLayout, nullptr, &m_programData[i].m_descriptorSetLayout));
 
     VkPipelineLayoutCreateInfo pipelineLayoutCreateInfo = {};
     pipelineLayoutCreateInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
     pipelineLayoutCreateInfo.setLayoutCount = 1;
     pipelineLayoutCreateInfo.pSetLayouts = &m_programData[i].m_descriptorSetLayout;
 
-    CHECK_VK_CALL(vkCreatePipelineLayout(device, &pipelineLayoutCreateInfo, nullptr,
-                                         &m_programData[i].m_pipelineLayout));
+    CHECK_VK_CALL(
+        vkCreatePipelineLayout(device, &pipelineLayoutCreateInfo, nullptr, &m_programData[i].m_pipelineLayout));
 
     for (auto const & t : refl.m_info.m_textures)
       m_programData[i].m_textureBindings[t.m_name] = t.m_index;
@@ -293,11 +282,8 @@ drape_ptr<dp::GpuProgram> VulkanProgramPool::Get(Program program)
   fsStage.module = d.m_fragmentShader;
   fsStage.pName = "main";
 
-  return make_unique_dp<dp::vulkan::VulkanGpuProgram>(DebugPrint(program),
-                                                      vsStage, fsStage,
-                                                      d.m_descriptorSetLayout,
-                                                      d.m_pipelineLayout,
-                                                      d.m_textureBindings);
+  return make_unique_dp<dp::vulkan::VulkanGpuProgram>(DebugPrint(program), vsStage, fsStage, d.m_descriptorSetLayout,
+                                                      d.m_pipelineLayout, d.m_textureBindings);
 }
 
 uint32_t VulkanProgramPool::GetMaxUniformBuffers() const
diff --git a/libs/std/target_os.hpp b/libs/std/target_os.hpp
index 0423d7945..1cfcddbc3 100644
--- a/libs/std/target_os.hpp
+++ b/libs/std/target_os.hpp
@@ -1,41 +1,41 @@
 #pragma once
 
 #if defined(ANDROID) || defined(__ANDROID__)
-  #define OMIM_OS_ANDROID
-  #define OMIM_OS_NAME "android"
-  #define OMIM_OS_MOBILE
+#define OMIM_OS_ANDROID
+#define OMIM_OS_NAME "android"
+#define OMIM_OS_MOBILE
 
 #elif defined(__APPLE__)
-  #include <TargetConditionals.h>
-  #if (TARGET_OS_IPHONE > 0)
-    #define OMIM_OS_IPHONE
-    #define OMIM_OS_NAME "ios"
-    #if (TARGET_IPHONE_SIMULATOR > 0)
-      #define OMIM_OS_IPHONE_SIMULATOR
-    #else
-      #define OMIM_OS_IPHONE_DEVICE
-    #endif
-    #define OMIM_OS_MOBILE
-
-  #else
-    #define OMIM_OS_MAC
-    #define OMIM_OS_NAME "mac"
-    #define OMIM_OS_DESKTOP
-  #endif
-
-#elif defined(_WIN32)
-  #define OMIM_OS_WINDOWS
-  #define OMIM_OS_NAME "win"
-  #define OMIM_OS_DESKTOP
-
-  #ifdef __MINGW32__
-    #define OMIM_OS_WINDOWS_MINGW
-  #else
-    #define OMIM_OS_WINDOWS_NATIVE
-  #endif
+#include <TargetConditionals.h>
+#if (TARGET_OS_IPHONE > 0)
+#define OMIM_OS_IPHONE
+#define OMIM_OS_NAME "ios"
+#if (TARGET_IPHONE_SIMULATOR > 0)
+#define OMIM_OS_IPHONE_SIMULATOR
+#else
+#define OMIM_OS_IPHONE_DEVICE
+#endif
+#define OMIM_OS_MOBILE
 
 #else
-  #define OMIM_OS_LINUX
-  #define OMIM_OS_NAME "linux"
-  #define OMIM_OS_DESKTOP
+#define OMIM_OS_MAC
+#define OMIM_OS_NAME "mac"
+#define OMIM_OS_DESKTOP
+#endif
+
+#elif defined(_WIN32)
+#define OMIM_OS_WINDOWS
+#define OMIM_OS_NAME "win"
+#define OMIM_OS_DESKTOP
+
+#ifdef __MINGW32__
+#define OMIM_OS_WINDOWS_MINGW
+#else
+#define OMIM_OS_WINDOWS_NATIVE
+#endif
+
+#else
+#define OMIM_OS_LINUX
+#define OMIM_OS_NAME "linux"
+#define OMIM_OS_DESKTOP
 #endif
diff --git a/libs/std/windows.hpp b/libs/std/windows.hpp
index 2003a55eb..e558a0022 100644
--- a/libs/std/windows.hpp
+++ b/libs/std/windows.hpp
@@ -7,7 +7,7 @@
 
 #undef min
 #undef max
-//#undef far
-//#undef near
+// #undef far
+// #undef near
 
-#endif // OMIM_OS_WINDOWS
+#endif  // OMIM_OS_WINDOWS
diff --git a/libs/storage/background_downloading/downloader_queue.hpp b/libs/storage/background_downloading/downloader_queue.hpp
index b8a70ce1f..5431d3b5d 100644
--- a/libs/storage/background_downloading/downloader_queue.hpp
+++ b/libs/storage/background_downloading/downloader_queue.hpp
@@ -18,36 +18,23 @@ class BackgroundDownloaderQueue : public QueueInterface
 public:
   using ForEachTaskInfoTypeFunction = std::function<void(TaskInfo const & info)>;
 
-  bool IsEmpty() const override
-  {
-    return m_queue.empty();
-  }
+  bool IsEmpty() const override { return m_queue.empty(); }
 
-  size_t Count() const override
-  {
-    return m_queue.size();
-  }
+  size_t Count() const override { return m_queue.size(); }
 
-  bool Contains(CountryId const & country) const override
-  {
-    return m_queue.find(country) != m_queue.cend();
-  }
+  bool Contains(CountryId const & country) const override { return m_queue.find(country) != m_queue.cend(); }
 
   void ForEachCountry(ForEachCountryFunction const & fn) const override
   {
     for (auto const & item : m_queue)
-    {
       fn(item.second.m_queuedCountry);
-    }
   }
 
   void ForEachTaskInfo(ForEachTaskInfoTypeFunction const & fn) const
   {
     for (auto const & item : m_queue)
-    {
       if (item.second.m_taskInfo)
         fn(*item.second.m_taskInfo);
-    }
   }
 
   void Append(QueuedCountry && country)
@@ -74,20 +61,11 @@ public:
     return it->second.m_taskInfo;
   }
 
-  QueuedCountry & GetCountryById(CountryId const & countryId)
-  {
-    return m_queue.at(countryId).m_queuedCountry;
-  }
+  QueuedCountry & GetCountryById(CountryId const & countryId) { return m_queue.at(countryId).m_queuedCountry; }
 
-  void Remove(CountryId const & countryId)
-  {
-    m_queue.erase(countryId);
-  }
+  void Remove(CountryId const & countryId) { m_queue.erase(countryId); }
 
-  void Clear()
-  {
-    m_queue.clear();
-  }
+  void Clear() { m_queue.clear(); }
 
 private:
   struct TaskData
diff --git a/libs/storage/country.hpp b/libs/storage/country.hpp
index 3e832b135..586d468c6 100644
--- a/libs/storage/country.hpp
+++ b/libs/storage/country.hpp
@@ -34,9 +34,9 @@ class Country
 public:
   Country() = default;
   explicit Country(CountryId const & name, CountryId const & parent = kInvalidCountryId)
-    : m_name(name), m_parent(parent)
-  {
-  }
+    : m_name(name)
+    , m_parent(parent)
+  {}
 
   void SetFile(platform::CountryFile && file) { m_file = std::move(file); }
   void SetSubtreeAttrs(MwmCounter subtreeMwmNumber, MwmSize subtreeMwmSizeBytes)
diff --git a/libs/storage/country_decl.cpp b/libs/storage/country_decl.cpp
index 9c23f94eb..9f9d7a940 100644
--- a/libs/storage/country_decl.cpp
+++ b/libs/storage/country_decl.cpp
@@ -14,7 +14,7 @@ void CountryInfo::FileName2FullName(string & fName)
   {
     // replace '_' with ", "
     fName[i] = ',';
-    fName.insert(i+1, " ");
+    fName.insert(i + 1, " ");
   }
 }
 
diff --git a/libs/storage/country_decl.hpp b/libs/storage/country_decl.hpp
index 3a165aa5a..91fd2c797 100644
--- a/libs/storage/country_decl.hpp
+++ b/libs/storage/country_decl.hpp
@@ -19,10 +19,7 @@ namespace storage
 struct CountryDef
 {
   CountryDef() = default;
-  CountryDef(CountryId const & countryId, m2::RectD const & rect)
-    : m_countryId(countryId), m_rect(rect)
-  {
-  }
+  CountryDef(CountryId const & countryId, m2::RectD const & rect) : m_countryId(countryId), m_rect(rect) {}
 
   CountryId m_countryId;
   m2::RectD m_rect;
@@ -36,8 +33,7 @@ struct CountryInfo
   // @TODO(bykoianko) Twine will be used intead of this function.
   // So id (fName) will be converted to a local name.
   static void FileName2FullName(std::string & fName);
-  static void FullName2GroupAndMap(std::string const & fName, std::string & group,
-                                   std::string & map);
+  static void FullName2GroupAndMap(std::string const & fName, std::string & group, std::string & map);
 
   bool IsNotEmpty() const { return !m_name.empty(); }
 
@@ -62,8 +58,7 @@ void Write(Sink & sink, CountryDef const & p)
 {
   rw::Write(sink, p.m_countryId);
 
-  std::pair<int64_t, int64_t> const r =
-      RectToInt64Obsolete(p.m_rect, serial::GeometryCodingParams().GetCoordBits());
+  std::pair<int64_t, int64_t> const r = RectToInt64Obsolete(p.m_rect, serial::GeometryCodingParams().GetCoordBits());
 
   WriteVarInt(sink, r.first);
   WriteVarInt(sink, r.second);
diff --git a/libs/storage/country_info_getter.cpp b/libs/storage/country_info_getter.cpp
index 0ed1c660e..99a5f3fc0 100644
--- a/libs/storage/country_info_getter.cpp
+++ b/libs/storage/country_info_getter.cpp
@@ -18,7 +18,6 @@
 #include <limits>
 #include <utility>
 
-
 namespace storage
 {
 namespace
@@ -33,42 +32,33 @@ CountryId CountryInfoGetterBase::GetRegionCountryId(m2::PointD const & pt) const
   return id == kInvalidId ? kInvalidCountryId : m_countries[id].m_countryId;
 }
 
-bool CountryInfoGetterBase::BelongsToAnyRegion(m2::PointD const & pt,
-                                               RegionIdVec const & regions) const
+bool CountryInfoGetterBase::BelongsToAnyRegion(m2::PointD const & pt, RegionIdVec const & regions) const
 {
   for (auto const & id : regions)
-  {
     if (BelongsToRegion(pt, id))
       return true;
-  }
   return false;
 }
 
-bool CountryInfoGetterBase::BelongsToAnyRegion(CountryId const & countryId,
-                                               RegionIdVec const & regions) const
+bool CountryInfoGetterBase::BelongsToAnyRegion(CountryId const & countryId, RegionIdVec const & regions) const
 {
   for (auto const & id : regions)
-  {
     if (m_countries[id].m_countryId == countryId)
       return true;
-  }
   return false;
 }
 
 CountryInfoGetterBase::RegionId CountryInfoGetterBase::FindFirstCountry(m2::PointD const & pt) const
 {
   for (size_t id = 0; id < m_countries.size(); ++id)
-  {
     if (BelongsToRegion(pt, id))
       return id;
-  }
 
   return kInvalidId;
 }
 
 // CountryInfoGetter -------------------------------------------------------------------------------
-std::vector<CountryId> CountryInfoGetter::GetRegionsCountryIdByRect(m2::RectD const & rect,
-                                                                    bool rough) const
+std::vector<CountryId> CountryInfoGetter::GetRegionsCountryIdByRect(m2::RectD const & rect, bool rough) const
 {
   std::vector<CountryId> result;
   for (size_t id = 0; id < m_countries.size(); ++id)
@@ -94,10 +84,8 @@ void CountryInfoGetter::GetRegionsCountryId(m2::PointD const & pt, CountriesVec
   m2::RectD const lookupRect = mercator::RectByCenterXYAndSizeInMeters(pt, lookupRadiusM);
 
   for (size_t id = 0; id < m_countries.size(); ++id)
-  {
     if (m_countries[id].m_rect.IsIntersect(lookupRect) && IsCloseEnough(id, pt, lookupRadiusM))
       closestCoutryIds.emplace_back(m_countries[id].m_countryId);
-  }
 }
 
 void CountryInfoGetter::GetRegionInfo(m2::PointD const & pt, CountryInfo & info) const
@@ -122,7 +110,8 @@ void CountryInfoGetter::GetRegionInfo(CountryId const & countryId, CountryInfo &
 
 void CountryInfoGetter::CalcUSALimitRect(m2::RectD rects[3]) const
 {
-  auto fn = [&](CountryDef const & c) {
+  auto fn = [&](CountryDef const & c)
+  {
     if (c.m_countryId == "USA_Alaska")
       rects[1] = c.m_rect;
     else if (c.m_countryId == "USA_Hawaii")
@@ -137,10 +126,7 @@ void CountryInfoGetter::CalcUSALimitRect(m2::RectD rects[3]) const
 m2::RectD CountryInfoGetter::CalcLimitRect(std::string const & prefix) const
 {
   m2::RectD rect;
-  ForEachCountry(prefix, [&rect](CountryDef const & c)
-  {
-    rect.Add(c.m_rect);
-  });
+  ForEachCountry(prefix, [&rect](CountryDef const & c) { rect.Add(c.m_rect); });
   return rect;
 }
 
@@ -159,8 +145,7 @@ m2::RectD CountryInfoGetter::GetLimitRectForLeaf(CountryId const & leafCountryId
   }
 }
 
-void CountryInfoGetter::GetMatchedRegions(std::string const & affiliation,
-                                          RegionIdVec & regions) const
+void CountryInfoGetter::GetMatchedRegions(std::string const & affiliation, RegionIdVec & regions) const
 {
   // Once set, m_affiliations ptr is never changed (same as the content).
   ASSERT(m_affiliations, ());
@@ -170,10 +155,8 @@ void CountryInfoGetter::GetMatchedRegions(std::string const & affiliation,
     return;
 
   for (size_t i = 0; i < m_countries.size(); ++i)
-  {
     if (binary_search(it->second.begin(), it->second.end(), m_countries[i].m_countryId))
       regions.push_back(i);
-  }
 }
 
 void CountryInfoGetter::SetAffiliations(Affiliations const * affiliations)
@@ -185,10 +168,8 @@ template <typename ToDo>
 void CountryInfoGetter::ForEachCountry(std::string const & prefix, ToDo && toDo) const
 {
   for (auto const & country : m_countries)
-  {
     if (country.m_countryId.starts_with(prefix))
       toDo(country);
-  }
 }
 
 // CountryInfoReader -------------------------------------------------------------------------------
@@ -197,8 +178,8 @@ std::unique_ptr<CountryInfoReader> CountryInfoReader::CreateCountryInfoReader(Pl
 {
   try
   {
-    CountryInfoReader * result = new CountryInfoReader(platform.GetReader(PACKED_POLYGONS_FILE),
-                                                       platform.GetReader(COUNTRIES_FILE));
+    CountryInfoReader * result =
+        new CountryInfoReader(platform.GetReader(PACKED_POLYGONS_FILE), platform.GetReader(COUNTRIES_FILE));
     return std::unique_ptr<CountryInfoReader>(result);
   }
   catch (RootException const & e)
@@ -229,7 +210,8 @@ void CountryInfoReader::LoadRegionsFromDisk(size_t id, std::vector<m2::RegionD>
 }
 
 CountryInfoReader::CountryInfoReader(ModelReaderPtr polyR, ModelReaderPtr countryR)
-  : m_reader(polyR), m_cache(3 /* logCacheSize */)
+  : m_reader(polyR)
+  , m_cache(3 /* logCacheSize */)
 
 {
   ReaderSource<ModelReaderPtr> src(m_reader.GetReader(PACKED_POLYGONS_INFO_TAG));
@@ -253,8 +235,7 @@ void CountryInfoReader::ClearCachesImpl() const
 }
 
 template <typename Fn>
-std::invoke_result_t<Fn, std::vector<m2::RegionD>> CountryInfoReader::WithRegion(size_t id,
-                                                                                 Fn && fn) const
+std::invoke_result_t<Fn, std::vector<m2::RegionD>> CountryInfoReader::WithRegion(size_t id, Fn && fn) const
 {
   std::lock_guard<std::mutex> lock(m_cacheMutex);
 
@@ -272,12 +253,11 @@ bool CountryInfoReader::BelongsToRegion(m2::PointD const & pt, size_t id) const
   if (!m_countries[id].m_rect.IsPointInside(pt))
     return false;
 
-  auto contains = [&pt](std::vector<m2::RegionD> const & regions) {
+  auto contains = [&pt](std::vector<m2::RegionD> const & regions)
+  {
     for (auto const & region : regions)
-    {
       if (region.Contains(pt))
         return true;
-    }
     return false;
   };
 
@@ -286,12 +266,12 @@ bool CountryInfoReader::BelongsToRegion(m2::PointD const & pt, size_t id) const
 
 bool CountryInfoReader::IsIntersectedByRegion(m2::RectD const & rect, size_t id) const
 {
-  std::vector<std::pair<m2::PointD, m2::PointD>> const edges = {
-      {rect.LeftTop(), rect.RightTop()},
-      {rect.RightTop(), rect.RightBottom()},
-      {rect.RightBottom(), rect.LeftBottom()},
-      {rect.LeftBottom(), rect.LeftTop()}};
-  auto contains = [&edges](std::vector<m2::RegionD> const & regions) {
+  std::vector<std::pair<m2::PointD, m2::PointD>> const edges = {{rect.LeftTop(), rect.RightTop()},
+                                                                {rect.RightTop(), rect.RightBottom()},
+                                                                {rect.RightBottom(), rect.LeftBottom()},
+                                                                {rect.LeftBottom(), rect.LeftTop()}};
+  auto contains = [&edges](std::vector<m2::RegionD> const & regions)
+  {
     for (auto const & region : regions)
     {
       for (auto const & edge : edges)
@@ -313,12 +293,11 @@ bool CountryInfoReader::IsIntersectedByRegion(m2::RectD const & rect, size_t id)
 bool CountryInfoReader::IsCloseEnough(size_t id, m2::PointD const & pt, double distance) const
 {
   m2::RectD const lookupRect = mercator::RectByCenterXYAndSizeInMeters(pt, distance);
-  auto isCloseEnough = [&](std::vector<m2::RegionD> const & regions) {
+  auto isCloseEnough = [&](std::vector<m2::RegionD> const & regions)
+  {
     for (auto const & region : regions)
-    {
       if (region.Contains(pt) || region.AtBorder(pt, lookupRect.SizeX() / 2))
         return true;
-    }
     return false;
   };
 
@@ -339,14 +318,11 @@ void CountryInfoGetterForTesting::AddCountry(CountryDef const & country)
   m_idToInfo[name].m_name = name;
 }
 
-void CountryInfoGetterForTesting::GetMatchedRegions(std::string const & affiliation,
-                                                    RegionIdVec & regions) const
+void CountryInfoGetterForTesting::GetMatchedRegions(std::string const & affiliation, RegionIdVec & regions) const
 {
   for (size_t i = 0; i < m_countries.size(); ++i)
-  {
     if (m_countries[i].m_countryId == affiliation)
       regions.push_back(i);
-  }
 }
 
 void CountryInfoGetterForTesting::ClearCachesImpl() const {}
@@ -363,8 +339,7 @@ bool CountryInfoGetterForTesting::IsIntersectedByRegion(m2::RectD const & rect,
   return rect.IsIntersect(m_countries[id].m_rect);
 }
 
-bool CountryInfoGetterForTesting::IsCloseEnough(size_t id, m2::PointD const & pt,
-                                                double distance) const
+bool CountryInfoGetterForTesting::IsCloseEnough(size_t id, m2::PointD const & pt, double distance) const
 {
   CHECK_LESS(id, m_countries.size(), ());
 
diff --git a/libs/storage/country_info_reader_light.cpp b/libs/storage/country_info_reader_light.cpp
index f599b3e33..2fc9f2dbf 100644
--- a/libs/storage/country_info_reader_light.cpp
+++ b/libs/storage/country_info_reader_light.cpp
@@ -33,8 +33,7 @@ CountryInfoReader::CountryInfoReader()
   }
   catch (FileReader::Exception const & exception)
   {
-    LOG(LERROR,
-        ("Exception while reading file:", PACKED_POLYGONS_FILE, "reason:", exception.what()));
+    LOG(LERROR, ("Exception while reading file:", PACKED_POLYGONS_FILE, "reason:", exception.what()));
 
     m_reader.reset();
     m_countries.clear();
@@ -66,10 +65,8 @@ bool CountryInfoReader::BelongsToRegion(m2::PointD const & pt, size_t id) const
   LoadRegionsFromDisk(id, regions);
 
   for (auto const & region : regions)
-  {
     if (region.Contains(pt))
       return true;
-  }
 
   return false;
 }
diff --git a/libs/storage/country_parent_getter.cpp b/libs/storage/country_parent_getter.cpp
index b5be02ee1..ae7c098fa 100644
--- a/libs/storage/country_parent_getter.cpp
+++ b/libs/storage/country_parent_getter.cpp
@@ -2,8 +2,7 @@
 
 namespace storage
 {
-CountryParentGetter::CountryParentGetter(std::string const & countriesFile,
-                                         std::string const & countriesDir)
+CountryParentGetter::CountryParentGetter(std::string const & countriesFile, std::string const & countriesDir)
 {
   if (countriesFile.empty())
     m_storage = std::make_shared<Storage>();
diff --git a/libs/storage/country_parent_getter.hpp b/libs/storage/country_parent_getter.hpp
index bcbdc4ad3..e7a0b2d4b 100644
--- a/libs/storage/country_parent_getter.hpp
+++ b/libs/storage/country_parent_getter.hpp
@@ -10,8 +10,7 @@ namespace storage
 class CountryParentGetter
 {
 public:
-  CountryParentGetter(std::string const & countriesFile = "",
-                      std::string const & countriesDir = "");
+  CountryParentGetter(std::string const & countriesFile = "", std::string const & countriesDir = "");
   std::string operator()(std::string const & id) const;
 
   Storage const & GetStorageForTesting() const { return *m_storage; }
diff --git a/libs/storage/country_tree.cpp b/libs/storage/country_tree.cpp
index 3b5b08a07..ffa9c8dcf 100644
--- a/libs/storage/country_tree.cpp
+++ b/libs/storage/country_tree.cpp
@@ -12,7 +12,6 @@
 
 #include <algorithm>
 
-
 namespace storage
 {
 using namespace std;
@@ -28,17 +27,13 @@ class StoreInterface
 {
 public:
   virtual ~StoreInterface() = default;
-  virtual Country * InsertToCountryTree(CountryId const & id, MwmSize mapSize,
-                                        string const & mapSha1, size_t depth,
+  virtual Country * InsertToCountryTree(CountryId const & id, MwmSize mapSize, string const & mapSha1, size_t depth,
                                         CountryId const & parent) = 0;
   virtual void InsertOldMwmMapping(CountryId const & newId, CountryId const & oldId) = 0;
   virtual void InsertAffiliation(CountryId const & countryId, string const & affilation) = 0;
   virtual void InsertCountryNameSynonym(CountryId const & countryId, string const & synonym) = 0;
   virtual void InsertMwmTopCityGeoId(CountryId const & countryId, uint64_t const & geoObjectId) {}
-  virtual void InsertTopCountryGeoIds(CountryId const & countryId,
-                                      vector<uint64_t> const & geoObjectIds)
-  {
-  }
+  virtual void InsertTopCountryGeoIds(CountryId const & countryId, vector<uint64_t> const & geoObjectIds) {}
   virtual OldMwmMapping GetMapping() const = 0;
 };
 
@@ -52,16 +47,14 @@ class StoreCountries : public StoreInterface
   OldMwmMapping m_idsMapping;
 
 public:
-  StoreCountries(CountryTree & countries, Affiliations & affiliations,
-                 CountryNameSynonyms & countryNameSynonyms, MwmTopCityGeoIds & mwmTopCityGeoIds,
-                 MwmTopCountryGeoIds & mwmTopCountryGeoIds)
+  StoreCountries(CountryTree & countries, Affiliations & affiliations, CountryNameSynonyms & countryNameSynonyms,
+                 MwmTopCityGeoIds & mwmTopCityGeoIds, MwmTopCountryGeoIds & mwmTopCountryGeoIds)
     : m_countries(countries)
     , m_affiliations(affiliations)
     , m_countryNameSynonyms(countryNameSynonyms)
     , m_mwmTopCityGeoIds(mwmTopCityGeoIds)
     , m_mwmTopCountryGeoIds(mwmTopCountryGeoIds)
-  {
-  }
+  {}
   ~StoreCountries()
   {
     for (auto & entry : m_affiliations)
@@ -69,8 +62,8 @@ public:
   }
 
   // StoreInterface overrides:
-  Country * InsertToCountryTree(CountryId const & id, MwmSize mapSize, string const & mapSha1,
-                                size_t depth, CountryId const & parent) override
+  Country * InsertToCountryTree(CountryId const & id, MwmSize mapSize, string const & mapSha1, size_t depth,
+                                CountryId const & parent) override
   {
     Country country(id, parent);
     if (mapSize)
@@ -110,8 +103,7 @@ public:
     m_mwmTopCityGeoIds.emplace(countryId, std::move(id));
   }
 
-  void InsertTopCountryGeoIds(CountryId const & countryId,
-                              vector<uint64_t> const & geoObjectIds) override
+  void InsertTopCountryGeoIds(CountryId const & countryId, vector<uint64_t> const & geoObjectIds) override
   {
     ASSERT(!countryId.empty(), ());
     ASSERT(!geoObjectIds.empty(), ());
@@ -128,13 +120,10 @@ class StoreFile2Info : public StoreInterface
   map<string, CountryInfo> & m_file2info;
 
 public:
-  explicit StoreFile2Info(map<string, CountryInfo> & file2info) : m_file2info(file2info)
-  {
-  }
+  explicit StoreFile2Info(map<string, CountryInfo> & file2info) : m_file2info(file2info) {}
   // StoreInterface overrides:
-  Country * InsertToCountryTree(CountryId const & id, MwmSize /* mapSize */,
-                                string const & /* mapSha1 */, size_t /* depth */,
-                                CountryId const & /* parent */) override
+  Country * InsertToCountryTree(CountryId const & id, MwmSize /* mapSize */, string const & /* mapSha1 */,
+                                size_t /* depth */, CountryId const & /* parent */) override
   {
     CountryInfo info(id);
     m_file2info[id] = std::move(info);
@@ -143,15 +132,9 @@ public:
 
   void InsertOldMwmMapping(CountryId const & /* newId */, CountryId const & /* oldId */) override {}
 
-  void InsertAffiliation(CountryId const & /* countryId */,
-                         string const & /* affilation */) override
-  {
-  }
+  void InsertAffiliation(CountryId const & /* countryId */, string const & /* affilation */) override {}
 
-  void InsertCountryNameSynonym(CountryId const & /* countryId */,
-                                string const & /* synonym */) override
-  {
-  }
+  void InsertCountryNameSynonym(CountryId const & /* countryId */, string const & /* synonym */) override {}
 
   OldMwmMapping GetMapping() const override
   {
@@ -236,8 +219,7 @@ void CountryTree::Node::ForEachAncestorExceptForTheRoot(CountryTree::Node::NodeC
   m_parent->ForEachAncestorExceptForTheRoot(f);
 }
 
-void CountryTree::Node::ForEachAncestorExceptForTheRoot(
-    CountryTree::Node::NodeCallback const & f) const
+void CountryTree::Node::ForEachAncestorExceptForTheRoot(CountryTree::Node::NodeCallback const & f) const
 {
   if (m_parent == nullptr || m_parent->m_parent == nullptr)
     return;
@@ -325,15 +307,12 @@ CountryTree::Node const * CountryTree::FindFirstLeaf(CountryId const & key) cons
   Find(key, found);
 
   for (auto node : found)
-  {
     if (node->ChildrenCount() == 0)
       return node;
-  }
   return nullptr;
 }
 
-MwmSubtreeAttrs LoadGroupImpl(size_t depth, json_t * node, CountryId const & parent,
-                              StoreInterface & store)
+MwmSubtreeAttrs LoadGroupImpl(size_t depth, json_t * node, CountryId const & parent, StoreInterface & store)
 {
   CountryId id;
   FromJSONObject(node, "id", id);
@@ -408,10 +387,8 @@ bool LoadCountriesImpl(string const & jsonBuffer, StoreInterface & store)
   }
 }
 
-int64_t LoadCountriesFromBuffer(string const & jsonBuffer, CountryTree & countries,
-                                Affiliations & affiliations,
-                                CountryNameSynonyms & countryNameSynonyms,
-                                MwmTopCityGeoIds & mwmTopCityGeoIds,
+int64_t LoadCountriesFromBuffer(string const & jsonBuffer, CountryTree & countries, Affiliations & affiliations,
+                                CountryNameSynonyms & countryNameSynonyms, MwmTopCityGeoIds & mwmTopCityGeoIds,
                                 MwmTopCountryGeoIds & mwmTopCountryGeoIds)
 {
   countries.Clear();
@@ -423,8 +400,7 @@ int64_t LoadCountriesFromBuffer(string const & jsonBuffer, CountryTree & countri
     base::Json root(jsonBuffer.c_str());
     FromJSONObject(root.get(), "v", version);
 
-    StoreCountries store(countries, affiliations, countryNameSynonyms, mwmTopCityGeoIds,
-                         mwmTopCountryGeoIds);
+    StoreCountries store(countries, affiliations, countryNameSynonyms, mwmTopCityGeoIds, mwmTopCountryGeoIds);
     if (!LoadCountriesImpl(jsonBuffer, store))
       return -1;
   }
@@ -444,16 +420,13 @@ unique_ptr<Reader> GetReaderImpl(Platform & pl, string const & file, string cons
     return pl.GetReader(file, scope);
   }
   catch (RootException const &)
-  {
-  }
+  {}
   return nullptr;
 }
-} // namespace
+}  // namespace
 
-int64_t LoadCountriesFromFile(string const & path, CountryTree & countries,
-                              Affiliations & affiliations,
-                              CountryNameSynonyms & countryNameSynonyms,
-                              MwmTopCityGeoIds & mwmTopCityGeoIds,
+int64_t LoadCountriesFromFile(string const & path, CountryTree & countries, Affiliations & affiliations,
+                              CountryNameSynonyms & countryNameSynonyms, MwmTopCityGeoIds & mwmTopCityGeoIds,
                               MwmTopCountryGeoIds & mwmTopCountryGeoIds)
 {
   string json;
@@ -468,8 +441,8 @@ int64_t LoadCountriesFromFile(string const & path, CountryTree & countries,
   if (reader)
   {
     reader->ReadAsString(json);
-    version = LoadCountriesFromBuffer(json, countries, affiliations, countryNameSynonyms,
-                                      mwmTopCityGeoIds, mwmTopCountryGeoIds);
+    version = LoadCountriesFromBuffer(json, countries, affiliations, countryNameSynonyms, mwmTopCityGeoIds,
+                                      mwmTopCountryGeoIds);
   }
 
   reader = GetReaderImpl(pl, path, "w");
@@ -482,8 +455,7 @@ int64_t LoadCountriesFromFile(string const & path, CountryTree & countries,
     MwmTopCountryGeoIds newCountryIds;
 
     reader->ReadAsString(json);
-    int64_t const newVersion = LoadCountriesFromBuffer(json, newCountries, newAffs, newSyms,
-                                                       newCityIds, newCountryIds);
+    int64_t const newVersion = LoadCountriesFromBuffer(json, newCountries, newAffs, newSyms, newCityIds, newCountryIds);
 
     if (newVersion > version)
     {
diff --git a/libs/storage/country_tree.hpp b/libs/storage/country_tree.hpp
index d68d1b1f8..26070a678 100644
--- a/libs/storage/country_tree.hpp
+++ b/libs/storage/country_tree.hpp
@@ -119,17 +119,12 @@ private:
 };
 
 /// @return version of country file or -1 if error was encountered
-int64_t LoadCountriesFromBuffer(std::string const & buffer, CountryTree & countries,
-                                Affiliations & affiliations,
-                                CountryNameSynonyms & countryNameSynonyms,
-                                MwmTopCityGeoIds & mwmTopCityGeoIds,
+int64_t LoadCountriesFromBuffer(std::string const & buffer, CountryTree & countries, Affiliations & affiliations,
+                                CountryNameSynonyms & countryNameSynonyms, MwmTopCityGeoIds & mwmTopCityGeoIds,
                                 MwmTopCountryGeoIds & mwmTopCountryGeoIds);
-int64_t LoadCountriesFromFile(std::string const & path, CountryTree & countries,
-                              Affiliations & affiliations,
-                              CountryNameSynonyms & countryNameSynonyms,
-                              MwmTopCityGeoIds & mwmTopCityGeoIds,
+int64_t LoadCountriesFromFile(std::string const & path, CountryTree & countries, Affiliations & affiliations,
+                              CountryNameSynonyms & countryNameSynonyms, MwmTopCityGeoIds & mwmTopCityGeoIds,
                               MwmTopCountryGeoIds & mwmTopCountryGeoIds);
 
-void LoadCountryFile2CountryInfo(std::string const & jsonBuffer,
-                                 std::map<std::string, CountryInfo> & id2info);
+void LoadCountryFile2CountryInfo(std::string const & jsonBuffer, std::map<std::string, CountryInfo> & id2info);
 }  // namespace storage
diff --git a/libs/storage/country_tree_helpers.cpp b/libs/storage/country_tree_helpers.cpp
index 70e1438a4..32147674f 100644
--- a/libs/storage/country_tree_helpers.cpp
+++ b/libs/storage/country_tree_helpers.cpp
@@ -2,8 +2,8 @@
 
 #include "base/logging.hpp"
 
-#include <vector>
 #include <utility>
+#include <vector>
 
 namespace storage
 {
@@ -23,10 +23,8 @@ CountryId GetTopmostParentFor(CountryTree const & countries, CountryId const & c
     CHECK(nodes[0]->HasParent(), ());
     auto const parentId = nodes[0]->Parent().Value().Name();
     for (size_t i = 1; i < nodes.size(); ++i)
-    {
       if (nodes[i]->Parent().Value().Name() != parentId)
         return countryId;
-    }
     return GetTopmostParentFor(countries, parentId);
   }
 
@@ -52,8 +50,8 @@ std::optional<CountryTree> LoadCountriesFromFile(std::string const & path)
   MwmTopCityGeoIds mwmTopCityGeoIds;
   MwmTopCountryGeoIds mwmTopCountryGeoIds;
   CountryTree countries;
-  auto const res = LoadCountriesFromFile(path, countries, affiliations, countryNameSynonyms,
-                                         mwmTopCityGeoIds, mwmTopCountryGeoIds);
+  auto const res =
+      LoadCountriesFromFile(path, countries, affiliations, countryNameSynonyms, mwmTopCityGeoIds, mwmTopCountryGeoIds);
 
   if (res == -1)
     return {};
diff --git a/libs/storage/diff_scheme/apply_diff.cpp b/libs/storage/diff_scheme/apply_diff.cpp
index 37caf7f67..fc9a73efa 100644
--- a/libs/storage/diff_scheme/apply_diff.cpp
+++ b/libs/storage/diff_scheme/apply_diff.cpp
@@ -7,17 +7,16 @@
 #include "base/assert.hpp"
 #include "base/cancellable.hpp"
 
-
 namespace storage
 {
 namespace diffs
 {
-void ApplyDiff(ApplyDiffParams && p, base::Cancellable const & cancellable,
-               OnDiffApplicationFinished const & task)
+void ApplyDiff(ApplyDiffParams && p, base::Cancellable const & cancellable, OnDiffApplicationFinished const & task)
 {
   using namespace generator::mwm_diff;
 
-  GetPlatform().RunTask(Platform::Thread::File, [p = std::move(p), &cancellable, task] {
+  GetPlatform().RunTask(Platform::Thread::File, [p = std::move(p), &cancellable, task]
+  {
     CHECK(p.m_diffFile, ());
     CHECK(p.m_oldMwmFile, ());
 
@@ -41,13 +40,9 @@ void ApplyDiff(ApplyDiffParams && p, base::Cancellable const & cancellable,
       std::string const newMwmPath = diffFile->GetPath(MapFileType::Map);
       std::string const diffApplyingInProgressPath = newMwmPath + DIFF_APPLYING_FILE_EXTENSION;
 
-      result = generator::mwm_diff::ApplyDiff(oldMwmPath, diffApplyingInProgressPath, diffPath,
-                                              cancellable);
-      if (result == DiffApplicationResult::Ok &&
-          !base::RenameFileX(diffApplyingInProgressPath, newMwmPath))
-      {
+      result = generator::mwm_diff::ApplyDiff(oldMwmPath, diffApplyingInProgressPath, diffPath, cancellable);
+      if (result == DiffApplicationResult::Ok && !base::RenameFileX(diffApplyingInProgressPath, newMwmPath))
         result = DiffApplicationResult::Failed;
-      }
 
       Platform::RemoveFileIfExists(diffApplyingInProgressPath);
 
@@ -57,23 +52,16 @@ void ApplyDiff(ApplyDiffParams && p, base::Cancellable const & cancellable,
 
     switch (result)
     {
-      case DiffApplicationResult::Ok:
-        diffFile->DeleteFromDisk(MapFileType::Diff);
-        break;
-      case DiffApplicationResult::Cancelled:
-        // The diff file will be deleted by storage.
-        // Another way would be to leave it on disk but all consequences
-        // of interacting with storage are much harder to be taken into account that way.
-        break;
-      case DiffApplicationResult::Failed:
-        diffFile->DeleteFromDisk(MapFileType::Diff);
-        break;
+    case DiffApplicationResult::Ok: diffFile->DeleteFromDisk(MapFileType::Diff); break;
+    case DiffApplicationResult::Cancelled:
+      // The diff file will be deleted by storage.
+      // Another way would be to leave it on disk but all consequences
+      // of interacting with storage are much harder to be taken into account that way.
+      break;
+    case DiffApplicationResult::Failed: diffFile->DeleteFromDisk(MapFileType::Diff); break;
     }
 
-    GetPlatform().RunTask(Platform::Thread::Gui, [task, result]()
-    {
-      task(result);
-    });
+    GetPlatform().RunTask(Platform::Thread::Gui, [task, result]() { task(result); });
   });
 }
 }  // namespace diffs
diff --git a/libs/storage/diff_scheme/apply_diff.hpp b/libs/storage/diff_scheme/apply_diff.hpp
index 7b64c680c..2234f1a5d 100644
--- a/libs/storage/diff_scheme/apply_diff.hpp
+++ b/libs/storage/diff_scheme/apply_diff.hpp
@@ -24,7 +24,6 @@ struct ApplyDiffParams
 
 using OnDiffApplicationFinished = std::function<void(generator::mwm_diff::DiffApplicationResult)>;
 
-void ApplyDiff(ApplyDiffParams && p, base::Cancellable const & cancellable,
-               OnDiffApplicationFinished const & task);
+void ApplyDiff(ApplyDiffParams && p, base::Cancellable const & cancellable, OnDiffApplicationFinished const & task);
 }  // namespace diffs
 }  // namespace storage
diff --git a/libs/storage/diff_scheme/diff_scheme_loader.cpp b/libs/storage/diff_scheme/diff_scheme_loader.cpp
index 4526637ee..21077193a 100644
--- a/libs/storage/diff_scheme/diff_scheme_loader.cpp
+++ b/libs/storage/diff_scheme/diff_scheme_loader.cpp
@@ -137,12 +137,11 @@ namespace diffs
 // static
 void Loader::Load(LocalMapsInfo && info, DiffsReceivedCallback && callback)
 {
-  GetPlatform().RunTask(Platform::Thread::Network, [info = std::move(info), callback = std::move(callback)]() {
+  GetPlatform().RunTask(Platform::Thread::Network, [info = std::move(info), callback = std::move(callback)]()
+  {
     auto result = ::Load(info);
-    GetPlatform().RunTask(Platform::Thread::Gui,
-                          [result = std::move(result), callback = std::move(callback)]() mutable {
-                            callback(std::move(result));
-                          });
+    GetPlatform().RunTask(Platform::Thread::Gui, [result = std::move(result), callback = std::move(callback)]() mutable
+    { callback(std::move(result)); });
   });
 }
 }  // namespace diffs
diff --git a/libs/storage/diff_scheme/diffs_data_source.cpp b/libs/storage/diff_scheme/diffs_data_source.cpp
index 8c8fda9d2..af856d5b6 100644
--- a/libs/storage/diff_scheme/diffs_data_source.cpp
+++ b/libs/storage/diff_scheme/diffs_data_source.cpp
@@ -2,13 +2,11 @@
 
 #include <algorithm>
 
-
 namespace
 {
 bool IsDiffsAvailable(storage::diffs::NameDiffInfoMap const & diffs)
 {
-  return std::any_of(diffs.cbegin(), diffs.cend(),
-                     [](auto const & d) { return d.second.m_isApplied == false; });
+  return std::any_of(diffs.cbegin(), diffs.cend(), [](auto const & d) { return d.second.m_isApplied == false; });
 }
 }  // namespace
 
diff --git a/libs/storage/downloader.hpp b/libs/storage/downloader.hpp
index bba7fd402..11add9b15 100644
--- a/libs/storage/downloader.hpp
+++ b/libs/storage/downloader.hpp
@@ -7,4 +7,4 @@ namespace storage
 class MapFilesDownloader;
 
 std::unique_ptr<MapFilesDownloader> GetDownloader();
-}  // namespace downloader
+}  // namespace storage
diff --git a/libs/storage/downloader_queue_interface.hpp b/libs/storage/downloader_queue_interface.hpp
index d5201eff4..23fbb9532 100644
--- a/libs/storage/downloader_queue_interface.hpp
+++ b/libs/storage/downloader_queue_interface.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "storage/storage_defines.hpp"
 #include "storage/queued_country.hpp"
+#include "storage/storage_defines.hpp"
 
 namespace storage
 {
diff --git a/libs/storage/downloader_queue_universal.cpp b/libs/storage/downloader_queue_universal.cpp
index 88d5874f3..02d44d8af 100644
--- a/libs/storage/downloader_queue_universal.cpp
+++ b/libs/storage/downloader_queue_universal.cpp
@@ -22,17 +22,13 @@ bool Queue::Contains(CountryId const & country) const
 void Queue::ForEachCountry(ForEachCountryFunction const & fn) const
 {
   for (auto const & queuedCountry : m_queue)
-  {
     fn(queuedCountry);
-  }
 }
 
 void Queue::ForEachCountry(ForEachCountryMutable const & fn)
 {
   for (auto & queuedCountry : m_queue)
-  {
     fn(queuedCountry);
-  }
 }
 
 CountryId const & Queue::GetFirstId() const
@@ -49,7 +45,7 @@ QueuedCountry const & Queue::GetFirstCountry() const
   return m_queue.front();
 }
 
-void Queue::Remove(const storage::CountryId & id)
+void Queue::Remove(storage::CountryId const & id)
 {
   auto it = std::find(m_queue.begin(), m_queue.end(), id);
   if (it != m_queue.end())
diff --git a/libs/storage/downloader_search_params.hpp b/libs/storage/downloader_search_params.hpp
index 14b53e514..a164e2f73 100644
--- a/libs/storage/downloader_search_params.hpp
+++ b/libs/storage/downloader_search_params.hpp
@@ -11,9 +11,9 @@ namespace storage
 struct DownloaderSearchResult
 {
   DownloaderSearchResult(CountryId const & countryId, std::string const & matchedName)
-    : m_countryId(countryId), m_matchedName(matchedName)
-  {
-  }
+    : m_countryId(countryId)
+    , m_matchedName(matchedName)
+  {}
 
   bool operator==(DownloaderSearchResult const & rhs) const
   {
diff --git a/libs/storage/downloading_policy.cpp b/libs/storage/downloading_policy.cpp
index 8f31ff42b..2ec8e4741 100644
--- a/libs/storage/downloading_policy.cpp
+++ b/libs/storage/downloading_policy.cpp
@@ -24,17 +24,17 @@ bool StorageDownloadingPolicy::IsDownloadingAllowed()
            !IsCellularDownloadEnabled());
 }
 
-void StorageDownloadingPolicy::ScheduleRetry(storage::CountriesSet const & failedCountries,
-                                             TProcessFunc const & func)
+void StorageDownloadingPolicy::ScheduleRetry(storage::CountriesSet const & failedCountries, TProcessFunc const & func)
 {
   if (IsDownloadingAllowed() && !failedCountries.empty() && m_autoRetryCounter > 0)
   {
     m_downloadRetryFailed = false;
-    auto action = [this, func, failedCountries] {
+    auto action = [this, func, failedCountries]
+    {
       --m_autoRetryCounter;
       func(failedCountries);
     };
-    m_autoRetryWorker.RestartWith([action]{ GetPlatform().RunTask(Platform::Thread::Gui, action); });
+    m_autoRetryWorker.RestartWith([action] { GetPlatform().RunTask(Platform::Thread::Gui, action); });
   }
   else
   {
diff --git a/libs/storage/downloading_policy.hpp b/libs/storage/downloading_policy.hpp
index 1f97ba6c7..04892089d 100644
--- a/libs/storage/downloading_policy.hpp
+++ b/libs/storage/downloading_policy.hpp
@@ -32,13 +32,9 @@ public:
   void EnableCellularDownload(bool enabled);
   bool IsCellularDownloadEnabled();
 
-  inline bool IsAutoRetryDownloadFailed() const
-  {
-    return m_downloadRetryFailed || m_autoRetryCounter == 0;
-  }
+  inline bool IsAutoRetryDownloadFailed() const { return m_downloadRetryFailed || m_autoRetryCounter == 0; }
 
   // DownloadingPolicy overrides:
   bool IsDownloadingAllowed() override;
-  void ScheduleRetry(storage::CountriesSet const & failedCountries,
-                     TProcessFunc const & func) override;
+  void ScheduleRetry(storage::CountriesSet const & failedCountries, TProcessFunc const & func) override;
 };
diff --git a/libs/storage/http_map_files_downloader.cpp b/libs/storage/http_map_files_downloader.cpp
index e7392fe1c..c0b5152a0 100644
--- a/libs/storage/http_map_files_downloader.cpp
+++ b/libs/storage/http_map_files_downloader.cpp
@@ -18,8 +18,7 @@ namespace
 class ErrorHttpRequest : public downloader::HttpRequest
 {
 public:
-  explicit ErrorHttpRequest(std::string const & filePath)
-  : HttpRequest(Callback(), Callback()), m_filePath(filePath)
+  explicit ErrorHttpRequest(std::string const & filePath) : HttpRequest(Callback(), Callback()), m_filePath(filePath)
   {
     m_status = downloader::DownloadStatus::Failed;
   }
@@ -65,8 +64,7 @@ void HttpMapFilesDownloader::Download()
     queuedCountry.OnStartDownloading();
 
     m_request.reset(downloader::HttpRequest::GetFile(
-        urls, path, size,
-        std::bind(&HttpMapFilesDownloader::OnMapFileDownloaded, this, queuedCountry, _1),
+        urls, path, size, std::bind(&HttpMapFilesDownloader::OnMapFileDownloaded, this, queuedCountry, _1),
         std::bind(&HttpMapFilesDownloader::OnMapFileDownloadingProgress, this, queuedCountry, _1)));
   }
   else
@@ -115,8 +113,7 @@ QueueInterface const & HttpMapFilesDownloader::GetQueue() const
   return m_queue;
 }
 
-void HttpMapFilesDownloader::OnMapFileDownloaded(QueuedCountry const & queuedCountry,
-                                                 downloader::HttpRequest & request)
+void HttpMapFilesDownloader::OnMapFileDownloaded(QueuedCountry const & queuedCountry, downloader::HttpRequest & request)
 {
   CHECK_THREAD_CHECKER(m_checker, ());
   // Because this method is called deferred on original thread,
diff --git a/libs/storage/http_map_files_downloader.hpp b/libs/storage/http_map_files_downloader.hpp
index 6eca62e96..eaf3ad36d 100644
--- a/libs/storage/http_map_files_downloader.hpp
+++ b/libs/storage/http_map_files_downloader.hpp
@@ -35,8 +35,7 @@ private:
   void Download();
 
   void OnMapFileDownloaded(QueuedCountry const & queuedCountry, downloader::HttpRequest & request);
-  void OnMapFileDownloadingProgress(QueuedCountry const & queuedCountry,
-                                    downloader::HttpRequest & request);
+  void OnMapFileDownloadingProgress(QueuedCountry const & queuedCountry, downloader::HttpRequest & request);
 
   std::unique_ptr<downloader::HttpRequest> m_request;
   Queue m_queue;
diff --git a/libs/storage/map_files_downloader.cpp b/libs/storage/map_files_downloader.cpp
index ce511b2f3..44e4292e0 100644
--- a/libs/storage/map_files_downloader.cpp
+++ b/libs/storage/map_files_downloader.cpp
@@ -4,11 +4,11 @@
 
 #include "platform/downloader_utils.hpp"
 #include "platform/http_client.hpp"
+#include "platform/locale.hpp"
 #include "platform/platform.hpp"
+#include "platform/products.hpp"
 #include "platform/servers_list.hpp"
 #include "platform/settings.hpp"
-#include "platform/products.hpp"
-#include "platform/locale.hpp"
 
 #include "coding/url.hpp"
 
@@ -31,10 +31,7 @@ void MapFilesDownloader::DownloadMapFile(QueuedCountry && queuedCountry)
   {
     RunMetaConfigAsync([this]()
     {
-      m_pendingRequests.ForEachCountry([this](QueuedCountry & country)
-      {
-        Download(std::move(country));
-      });
+      m_pendingRequests.ForEachCountry([this](QueuedCountry & country) { Download(std::move(country)); });
 
       m_pendingRequests.Clear();
     });
@@ -76,7 +73,7 @@ QueueInterface const & MapFilesDownloader::GetQueue() const
   return m_pendingRequests;
 }
 
-void MapFilesDownloader::DownloadAsString(std::string url, std::function<bool (std::string const &)> && callback,
+void MapFilesDownloader::DownloadAsString(std::string url, std::function<bool(std::string const &)> && callback,
                                           bool forceReset /* = false */)
 {
   EnsureMetaConfigReady([this, forceReset, url = std::move(url), callback = std::move(callback)]()
@@ -86,24 +83,24 @@ void MapFilesDownloader::DownloadAsString(std::string url, std::function<bool (s
 
     // Servers are sorted from best to worst.
     m_fileRequest.reset(RequestT::Get(url::Join(m_serversList.front(), url),
-      [this, callback = std::move(callback)](RequestT & request)
+                                      [this, callback = std::move(callback)](RequestT & request)
+    {
+      bool deleteRequest = true;
+
+      auto const & buffer = request.GetData();
+      if (!buffer.empty())
       {
-        bool deleteRequest = true;
+        // Update deleteRequest flag if new download was requested in callback.
+        deleteRequest = !callback(buffer);
+      }
 
-        auto const & buffer = request.GetData();
-        if (!buffer.empty())
-        {
-          // Update deleteRequest flag if new download was requested in callback.
-          deleteRequest = !callback(buffer);
-        }
-
-        if (deleteRequest)
-          m_fileRequest.reset();
-      }));
+      if (deleteRequest)
+        m_fileRequest.reset();
+    }));
   });
 }
 
-void MapFilesDownloader::EnsureMetaConfigReady(std::function<void ()> && callback)
+void MapFilesDownloader::EnsureMetaConfigReady(std::function<void()> && callback)
 {
   /// @todo Implement logic if m_metaConfig is "outdated".
   /// Fetch new servers list on each download request?
@@ -171,7 +168,7 @@ MetaConfig MapFilesDownloader::LoadMetaConfig()
     request.SetRawHeader("X-OM-DataVersion", std::to_string(m_dataVersion));
     request.SetRawHeader("X-OM-AppVersion", pl.Version());
     request.SetRawHeader("Accept-Language", GetAcceptLanguage());
-    request.SetTimeout(10.0); // timeout in seconds
+    request.SetTimeout(10.0);  // timeout in seconds
     request.RunHttpRequest(httpResult);
   }
 
diff --git a/libs/storage/map_files_downloader.hpp b/libs/storage/map_files_downloader.hpp
index b7aee2916..3a307837d 100644
--- a/libs/storage/map_files_downloader.hpp
+++ b/libs/storage/map_files_downloader.hpp
@@ -58,7 +58,7 @@ public:
    * @param[in]  url        Final url part like "index.json" or "maps/210415/countries.txt".
    * @param[in]  forceReset True - force reset current request, if any.
    */
-  void DownloadAsString(std::string url, std::function<bool (std::string const &)> && callback, bool forceReset = false);
+  void DownloadAsString(std::string url, std::function<bool(std::string const &)> && callback, bool forceReset = false);
 
   // Used in tests only.
   void SetServersList(ServersList const & serversList);
@@ -68,7 +68,7 @@ public:
 
   /// @name Legacy functions for Android resources downloading routine (initial World download).
   /// @{
-  void EnsureMetaConfigReady(std::function<void ()> && callback);
+  void EnsureMetaConfigReady(std::function<void()> && callback);
   std::vector<std::string> MakeUrlListLegacy(std::string const & fileName) const;
   /// @}
 
diff --git a/libs/storage/map_files_downloader_with_ping.cpp b/libs/storage/map_files_downloader_with_ping.cpp
index 0767fb9df..f25806d34 100644
--- a/libs/storage/map_files_downloader_with_ping.cpp
+++ b/libs/storage/map_files_downloader_with_ping.cpp
@@ -10,7 +10,7 @@ namespace storage
 {
 void MapFilesDownloaderWithPing::GetMetaConfig(MetaConfigCallback const & callback)
 {
-  ASSERT(callback , ());
+  ASSERT(callback, ());
 
   MetaConfig metaConfig = LoadMetaConfig();
   CHECK(!metaConfig.m_serversList.empty(), ());
diff --git a/libs/storage/pinger.cpp b/libs/storage/pinger.cpp
index b0fa28b54..88c679e87 100644
--- a/libs/storage/pinger.cpp
+++ b/libs/storage/pinger.cpp
@@ -8,7 +8,6 @@
 
 #include <chrono>
 
-
 namespace pinger
 {
 auto constexpr kTimeoutInSeconds = 4.0;
@@ -35,12 +34,13 @@ int64_t DoPing(std::string const & url)
   }
   else
   {
-    LOG(LWARNING, ("Ping to server", url, "failed with code =", request.ErrorCode(), "; wasRedirected =", request.WasRedirected()));
+    LOG(LWARNING, ("Ping to server", url, "failed with code =", request.ErrorCode(),
+                   "; wasRedirected =", request.WasRedirected()));
   }
 
   return kInvalidPing;
 }
-} // namespace pinger
+}  // namespace pinger
 
 namespace storage
 {
@@ -55,25 +55,15 @@ Pinger::Endpoints Pinger::ExcludeUnavailableAndSortEndpoints(Endpoints const & u
   {
     base::DelayedThreadPool pool(size, base::DelayedThreadPool::Exit::ExecPending);
     for (size_t i = 0; i < size; ++i)
-    {
-      pool.Push([&urls, &timeUrls, i]
-      {
-        timeUrls[i] = { pinger::DoPing(urls[i]), i };
-      });
-    }
+      pool.Push([&urls, &timeUrls, i] { timeUrls[i] = {pinger::DoPing(urls[i]), i}; });
   }
 
-  std::sort(timeUrls.begin(), timeUrls.end(), [](EntryT const & e1, EntryT const & e2)
-  {
-    return e1.first < e2.first;
-  });
+  std::sort(timeUrls.begin(), timeUrls.end(), [](EntryT const & e1, EntryT const & e2) { return e1.first < e2.first; });
 
   Endpoints readyUrls;
   for (auto const & [ping, index] : timeUrls)
-  {
     if (ping >= 0)
       readyUrls.push_back(urls[index]);
-  }
 
   return readyUrls;
 }
diff --git a/libs/storage/queued_country.cpp b/libs/storage/queued_country.cpp
index cf2ae569d..fdaa65bc7 100644
--- a/libs/storage/queued_country.cpp
+++ b/libs/storage/queued_country.cpp
@@ -9,9 +9,8 @@
 
 namespace storage
 {
-QueuedCountry::QueuedCountry(platform::CountryFile const & countryFile, CountryId const & countryId,
-                             MapFileType type, int64_t currentDataVersion,
-                             std::string const & dataDir,
+QueuedCountry::QueuedCountry(platform::CountryFile const & countryFile, CountryId const & countryId, MapFileType type,
+                             int64_t currentDataVersion, std::string const & dataDir,
                              diffs::DiffsSourcePtr const & diffs)
   : m_countryFile(countryFile)
   , m_countryId(countryId)
diff --git a/libs/storage/queued_country.hpp b/libs/storage/queued_country.hpp
index d9ece15d1..5d9eba20c 100644
--- a/libs/storage/queued_country.hpp
+++ b/libs/storage/queued_country.hpp
@@ -22,13 +22,13 @@ public:
     virtual void OnStartDownloading(QueuedCountry const & queuedCountry) = 0;
     virtual void OnDownloadProgress(QueuedCountry const & queuedCountry, downloader::Progress const & progress) = 0;
     virtual void OnDownloadFinished(QueuedCountry const & queuedCountry, downloader::DownloadStatus status) = 0;
+
   protected:
     virtual ~Subscriber() = default;
   };
 
-  QueuedCountry(platform::CountryFile const & countryFile, CountryId const & m_countryId,
-                MapFileType type, int64_t currentDataVersion, std::string const & dataDir,
-                diffs::DiffsSourcePtr const & diffs);
+  QueuedCountry(platform::CountryFile const & countryFile, CountryId const & m_countryId, MapFileType type,
+                int64_t currentDataVersion, std::string const & dataDir, diffs::DiffsSourcePtr const & diffs);
 
   void Subscribe(Subscriber & subscriber);
   void Unsubscribe();
diff --git a/libs/storage/routing_helpers.cpp b/libs/storage/routing_helpers.cpp
index abcfb8098..f1394ba72 100644
--- a/libs/storage/routing_helpers.cpp
+++ b/libs/storage/routing_helpers.cpp
@@ -3,12 +3,13 @@
 namespace routing
 {
 
-std::unique_ptr<m4::Tree<routing::NumMwmId>> MakeNumMwmTree(
-    NumMwmIds const & numMwmIds, storage::CountryInfoGetter const & countryInfoGetter)
+std::unique_ptr<m4::Tree<routing::NumMwmId>> MakeNumMwmTree(NumMwmIds const & numMwmIds,
+                                                            storage::CountryInfoGetter const & countryInfoGetter)
 {
   auto tree = std::make_unique<m4::Tree<NumMwmId>>();
 
-  numMwmIds.ForEachId([&](NumMwmId numMwmId) {
+  numMwmIds.ForEachId([&](NumMwmId numMwmId)
+  {
     auto const & countryName = numMwmIds.GetFile(numMwmId).GetName();
     tree->Add(numMwmId, countryInfoGetter.GetLimitRectForLeaf(countryName));
   });
@@ -19,11 +20,8 @@ std::unique_ptr<m4::Tree<routing::NumMwmId>> MakeNumMwmTree(
 std::shared_ptr<routing::NumMwmIds> CreateNumMwmIds(storage::Storage const & storage)
 {
   auto numMwmIds = std::make_shared<routing::NumMwmIds>();
-  storage.ForEachCountry([&](storage::Country const & country)
-  {
-    numMwmIds->RegisterFile(country.GetFile());
-  });
+  storage.ForEachCountry([&](storage::Country const & country) { numMwmIds->RegisterFile(country.GetFile()); });
   return numMwmIds;
 }
 
-} // namespace routing
+}  // namespace routing
diff --git a/libs/storage/routing_helpers.hpp b/libs/storage/routing_helpers.hpp
index 378ccc6a3..d54a1f622 100644
--- a/libs/storage/routing_helpers.hpp
+++ b/libs/storage/routing_helpers.hpp
@@ -11,7 +11,7 @@
 
 namespace routing
 {
-std::unique_ptr<m4::Tree<routing::NumMwmId>> MakeNumMwmTree(
-    NumMwmIds const & numMwmIds, storage::CountryInfoGetter const & countryInfoGetter);
+std::unique_ptr<m4::Tree<routing::NumMwmId>> MakeNumMwmTree(NumMwmIds const & numMwmIds,
+                                                            storage::CountryInfoGetter const & countryInfoGetter);
 std::shared_ptr<NumMwmIds> CreateNumMwmIds(storage::Storage const & storage);
-} // namespace routing
+}  // namespace routing
diff --git a/libs/storage/storage.cpp b/libs/storage/storage.cpp
index 6b92d95c9..68dea01ea 100644
--- a/libs/storage/storage.cpp
+++ b/libs/storage/storage.cpp
@@ -2,7 +2,7 @@
 
 #include "storage/country_tree_helpers.hpp"
 #include "storage/diff_scheme/apply_diff.hpp"
-//#include "storage/diff_scheme/diff_scheme_loader.hpp"
+// #include "storage/diff_scheme/diff_scheme_loader.hpp"
 #include "storage/downloader.hpp"
 #include "storage/map_files_downloader.hpp"
 #include "storage/storage_helpers.hpp"
@@ -43,7 +43,6 @@ namespace
 {
 string const kDownloadQueueKey = "DownloadQueue";
 
-
 // Editing maps older than approximately three months old is disabled, since the data
 // is most likely already fixed on OSM. Not limited to the latest one or two versions,
 // because a user can forget to update maps after a new app version has been installed
@@ -64,8 +63,7 @@ void DeleteFromDiskWithIndexes(LocalCountryFile const & localFile, MapFileType t
   localFile.DeleteFromDisk(type);
 }
 
-CountryTree::Node const & LeafNodeFromCountryId(CountryTree const & root,
-                                                CountryId const & countryId)
+CountryTree::Node const & LeafNodeFromCountryId(CountryTree const & root, CountryId const & countryId)
 {
   CountryTree::Node const * node = root.FindFirstLeaf(countryId);
   CHECK(node, ("Node with id =", countryId, "not found in country tree as a leaf."));
@@ -97,10 +95,7 @@ bool IsFileDownloaded(string const fileDownloadPath, MapFileType type)
 CountriesSet GetQueuedCountries(QueueInterface const & queue)
 {
   CountriesSet result;
-  queue.ForEachCountry([&result](QueuedCountry const & country)
-  {
-    result.insert(country.GetCountryId());
-  });
+  queue.ForEachCountry([&result](QueuedCountry const & country) { result.insert(country.GetCountryId()); });
 
   return result;
 }
@@ -129,8 +124,7 @@ Storage::Storage(int)
   // Do nothing here, used in RunCountriesCheckAsync() only.
 }
 
-Storage::Storage(string const & pathToCountriesFile /* = COUNTRIES_FILE */,
-                 string const & dataDir /* = string() */)
+Storage::Storage(string const & pathToCountriesFile /* = COUNTRIES_FILE */, string const & dataDir /* = string() */)
   : m_downloader(GetDownloader())
   , m_dataDir(dataDir)
 {
@@ -148,9 +142,8 @@ Storage::Storage(string const & referenceCountriesTxtJsonForTesting,
 {
   m_downloader->SetDownloadingPolicy(m_downloadingPolicy);
 
-  m_currentVersion =
-      LoadCountriesFromBuffer(referenceCountriesTxtJsonForTesting, m_countries, m_affiliations,
-                              m_countryNameSynonyms, m_mwmTopCityGeoIds, m_mwmTopCountryGeoIds);
+  m_currentVersion = LoadCountriesFromBuffer(referenceCountriesTxtJsonForTesting, m_countries, m_affiliations,
+                                             m_countryNameSynonyms, m_mwmTopCityGeoIds, m_mwmTopCountryGeoIds);
   CHECK_LESS_OR_EQUAL(0, m_currentVersion, ("Can't load test countries file"));
 
   m_downloader->SetDataVersion(m_currentVersion);
@@ -213,8 +206,8 @@ Storage::WorldStatus Storage::GetForceDownloadWorlds(std::vector<platform::Count
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
 
-  bool hasWorld[] = { false, false };
-  string const worldName[] = { WORLD_FILE_NAME, WORLD_COASTS_FILE_NAME };
+  bool hasWorld[] = {false, false};
+  string const worldName[] = {WORLD_FILE_NAME, WORLD_COASTS_FILE_NAME};
 
   {
     // Check if Worlds already present.
@@ -223,10 +216,8 @@ Storage::WorldStatus Storage::GetForceDownloadWorlds(std::vector<platform::Count
     for (auto const & f : localFiles)
     {
       for (int i = 0; i < 2; ++i)
-      {
         if (f.GetCountryName() == worldName[i])
           hasWorld[i] = true;
-      }
     }
 
     if (hasWorld[0] && hasWorld[1])
@@ -238,8 +229,8 @@ Storage::WorldStatus Storage::GetForceDownloadWorlds(std::vector<platform::Count
   // Parse root data folder (we stored Worlds here in older versions).
   // Note that m_dataDir maybe empty and we take Platform::WritableDir.
   std::vector<platform::LocalCountryFile> rootFiles;
-  (void)FindAllLocalMapsInDirectoryAndCleanup(m_dataDir.empty() ? pl.WritableDir() : m_dataDir,
-                                              0 /* version */, -1 /* latestVersion */, rootFiles);
+  (void)FindAllLocalMapsInDirectoryAndCleanup(m_dataDir.empty() ? pl.WritableDir() : m_dataDir, 0 /* version */,
+                                              -1 /* latestVersion */, rootFiles);
 
   bool anyWorldWasMoved = false;
   for (auto const & f : rootFiles)
@@ -283,18 +274,16 @@ Storage::WorldStatus Storage::GetForceDownloadWorlds(std::vector<platform::Count
     return WorldStatus::ERROR_CREATE_FOLDER;
 
   for (int i = 0; i < 2; ++i)
-  {
     if (!hasWorld[i])
       res.push_back(GetCountryFile(worldName[i]));
-  }
 
   return (anyWorldWasMoved && res.empty() ? WorldStatus::WAS_MOVED : WorldStatus::READY);
 }
 
 void Storage::RegisterAllLocalMaps(bool enableDiffs /* = false */)
 {
-  //CHECK_THREAD_CHECKER(m_threadChecker, ());
-  //ASSERT(!IsDownloadInProgress(), ());
+  // CHECK_THREAD_CHECKER(m_threadChecker, ());
+  // ASSERT(!IsDownloadInProgress(), ());
 
   m_localFiles.clear();
   m_localFilesForFakeCountries.clear();
@@ -329,13 +318,13 @@ void Storage::RegisterAllLocalMaps(bool enableDiffs /* = false */)
   }
 
   FindAllDiffs(m_dataDir, m_notAppliedDiffs);
-  //if (enableDiffs)
-  //  LoadDiffScheme();
+  // if (enableDiffs)
+  //   LoadDiffScheme();
 }
 
 void Storage::GetLocalMaps(vector<LocalFilePtr> & maps) const
 {
-  //CHECK_THREAD_CHECKER(m_threadChecker, ());
+  // CHECK_THREAD_CHECKER(m_threadChecker, ());
 
   for (auto const & p : m_localFiles)
     maps.push_back(GetLatestLocalFile(p.first));
@@ -430,7 +419,7 @@ LocalFilePtr Storage::GetLatestLocalFile(CountryFile const & countryFile) const
 
 LocalFilePtr Storage::GetLatestLocalFile(CountryId const & countryId) const
 {
-  //CHECK_THREAD_CHECKER(m_threadChecker, ());
+  // CHECK_THREAD_CHECKER(m_threadChecker, ());
 
   auto const it = m_localFiles.find(countryId);
   if (it == m_localFiles.end() || it->second.empty())
@@ -439,10 +428,8 @@ LocalFilePtr Storage::GetLatestLocalFile(CountryId const & countryId) const
   list<LocalFilePtr> const & files = it->second;
   LocalFilePtr latest = files.front();
   for (LocalFilePtr const & file : files)
-  {
     if (file->GetVersion() > latest->GetVersion())
       latest = file;
-  }
   return latest;
 }
 
@@ -494,9 +481,7 @@ void Storage::SaveDownloadQueue()
 
   ostringstream ss;
   m_downloader->GetQueue().ForEachCountry([&ss](QueuedCountry const & country)
-  {
-    ss << (ss.str().empty() ? "" : ";") << country.GetCountryId();
-  });
+  { ss << (ss.str().empty() ? "" : ";") << country.GetCountryId(); });
 
   settings::Set(kDownloadQueueKey, ss.str());
 }
@@ -510,10 +495,8 @@ void Storage::RestoreDownloadQueue()
 
   strings::Tokenize(download, ";", [this](string_view v)
   {
-    auto const it = base::FindIf(m_notAppliedDiffs, [this, v](LocalCountryFile const & localDiff)
-    {
-      return v == FindCountryId(localDiff);
-    });
+    auto const it = base::FindIf(
+        m_notAppliedDiffs, [this, v](LocalCountryFile const & localDiff) { return v == FindCountryId(localDiff); });
 
     if (it == m_notAppliedDiffs.end())
     {
@@ -549,8 +532,7 @@ void Storage::DownloadCountry(CountryId const & countryId, MapFileType type)
     return;
   }
 
-  QueuedCountry queuedCountry(countryFile, countryId, type, m_currentVersion, m_dataDir,
-                              m_diffsDataSource);
+  QueuedCountry queuedCountry(countryFile, countryId, type, m_currentVersion, m_dataDir, m_diffsDataSource);
   queuedCountry.Subscribe(*this);
 
   m_downloader->DownloadMapFile(std::move(queuedCountry));
@@ -607,10 +589,8 @@ void Storage::NotifyStatusChangedForHierarchy(CountryId const & countryId)
   NotifyStatusChanged(countryId);
 
   // Notification status changing for ancestors in country tree.
-  ForEachAncestorExceptForTheRoot(countryId,
-                                  [&](CountryId const & parentId, CountryTree::Node const &) {
-                                    NotifyStatusChanged(parentId);
-                                  });
+  ForEachAncestorExceptForTheRoot(
+      countryId, [&](CountryId const & parentId, CountryTree::Node const &) { NotifyStatusChanged(parentId); });
 }
 
 bool Storage::IsDownloadInProgress() const
@@ -624,9 +604,8 @@ void Storage::LoadCountriesFile(string const & pathToCountriesFile)
 {
   if (m_countries.IsEmpty())
   {
-    m_currentVersion =
-        LoadCountriesFromFile(pathToCountriesFile, m_countries, m_affiliations,
-                              m_countryNameSynonyms, m_mwmTopCityGeoIds, m_mwmTopCountryGeoIds);
+    m_currentVersion = LoadCountriesFromFile(pathToCountriesFile, m_countries, m_affiliations, m_countryNameSynonyms,
+                                             m_mwmTopCityGeoIds, m_mwmTopCountryGeoIds);
     LOG(LINFO, ("Loaded countries list for version:", m_currentVersion));
     if (m_currentVersion < 0)
       LOG(LERROR, ("Can't load countries file", pathToCountriesFile));
@@ -638,7 +617,7 @@ int Storage::Subscribe(ChangeCountryFunction change, ProgressFunction progress)
   CHECK_THREAD_CHECKER(m_threadChecker, ());
 
   int const id = ++m_currentSlotId;
-  m_observers.push_back({ std::move(change), std::move(progress), id });
+  m_observers.push_back({std::move(change), std::move(progress), id});
   return id;
 }
 
@@ -668,11 +647,11 @@ void Storage::ReportProgressForHierarchy(CountryId const & countryId, Progress c
   // Reporting progress for a leaf in country tree.
   ReportProgress(countryId, leafProgress);
 
-  auto calcProgress = [&](CountryId const & parentId, CountryTree::Node const & parentNode) {
+  auto calcProgress = [&](CountryId const & parentId, CountryTree::Node const & parentNode)
+  {
     CountriesVec descendants;
-    parentNode.ForEachDescendant([&descendants](CountryTree::Node const & container) {
-      descendants.push_back(container.Value().Name());
-    });
+    parentNode.ForEachDescendant([&descendants](CountryTree::Node const & container)
+    { descendants.push_back(container.Value().Name()); });
 
     Progress localAndRemoteBytes = CalculateProgress(descendants);
     ReportProgress(parentId, localAndRemoteBytes);
@@ -721,7 +700,7 @@ void Storage::OnDownloadFinished(QueuedCountry const & queuedCountry, DownloadSt
 
   auto const & countryId = queuedCountry.GetCountryId();
   auto const fileType = queuedCountry.GetFileType();
-  auto const finishFn = [this, countryId, fileType] (DownloadStatus status)
+  auto const finishFn = [this, countryId, fileType](DownloadStatus status)
   {
     OnMapDownloadFinished(countryId, status, fileType);
     OnFinishDownloading();
@@ -734,9 +713,9 @@ void Storage::OnDownloadFinished(QueuedCountry const & queuedCountry, DownloadSt
     /// should make this kind of checks (taking expecting SHA as input). But now it's
     /// not so simple as it may seem ..
 
-    GetPlatform().RunTask(Platform::Thread::File, [path = GetFileDownloadPath(countryId, fileType),
-                                                   sha1 = GetCountryFile(countryId).GetSha1(),
-                                                   fn = std::move(finishFn)]()
+    GetPlatform().RunTask(Platform::Thread::File,
+                          [path = GetFileDownloadPath(countryId, fileType), sha1 = GetCountryFile(countryId).GetSha1(),
+                           fn = std::move(finishFn)]()
     {
       DownloadStatus status = DownloadStatus::Completed;
 
@@ -764,7 +743,8 @@ void Storage::RegisterDownloadedFiles(CountryId const & countryId, MapFileType t
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
 
-  auto const fn = [this, countryId, type](bool isSuccess) {
+  auto const fn = [this, countryId, type](bool isSuccess)
+  {
     CHECK_THREAD_CHECKER(m_threadChecker, ());
 
     LOG(LINFO, ("Registering downloaded file:", countryId, type, "; success:", isSuccess));
@@ -829,8 +809,7 @@ void Storage::RegisterDownloadedFiles(CountryId const & countryId, MapFileType t
   fn(true);
 }
 
-void Storage::OnMapDownloadFinished(CountryId const & countryId, DownloadStatus status,
-                                    MapFileType type)
+void Storage::OnMapDownloadFinished(CountryId const & countryId, DownloadStatus status, MapFileType type)
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
   ASSERT(m_didDownload != nullptr, ("Storage::Init wasn't called"));
@@ -915,10 +894,8 @@ LocalFilePtr Storage::GetLocalFile(CountryId const & countryId, int64_t version)
     return LocalFilePtr();
 
   for (auto const & file : it->second)
-  {
     if (file->GetVersion() == version)
       return file;
-  }
   return LocalFilePtr();
 }
 
@@ -930,14 +907,10 @@ void Storage::RegisterCountryFiles(LocalFilePtr localFile)
   CountryId const & countryId = FindCountryId(*localFile);
   LocalFilePtr existingFile = GetLocalFile(countryId, localFile->GetVersion());
   if (existingFile)
-  {
     if (existingFile->IsInBundle())
       *existingFile = *localFile;
     else
-    {
       ASSERT_EQUAL(localFile.get(), existingFile.get(), ());
-    }
-  }
   else
     m_localFiles[countryId].push_front(localFile);
 }
@@ -1025,10 +998,8 @@ string Storage::GetFileDownloadPath(CountryId const & countryId, MapFileType typ
 bool Storage::CheckFailedCountries(CountriesVec const & countries) const
 {
   for (auto const & country : countries)
-  {
     if (m_failedCountries.count(country))
       return true;
-  }
   return false;
 }
 
@@ -1045,27 +1016,26 @@ void Storage::RunCountriesCheckAsync()
     LOG(LDEBUG, ("Try download", COUNTRIES_FILE, "for", dataVersion));
 
     m_downloader->DownloadAsString(downloader::GetFileDownloadUrl(COUNTRIES_FILE, dataVersion),
-      [this, dataVersion](std::string const & buffer)
+                                   [this, dataVersion](std::string const & buffer)
+    {
+      LOG(LDEBUG, (COUNTRIES_FILE, "downloaded"));
+
+      std::shared_ptr<Storage> storage(new Storage(7 /* dummy */));
+      storage->m_currentVersion =
+          LoadCountriesFromBuffer(buffer, storage->m_countries, storage->m_affiliations, storage->m_countryNameSynonyms,
+                                  storage->m_mwmTopCityGeoIds, storage->m_mwmTopCountryGeoIds);
+      if (storage->m_currentVersion > 0)
       {
-        LOG(LDEBUG, (COUNTRIES_FILE, "downloaded"));
+        LOG(LDEBUG, ("Apply new version", storage->m_currentVersion, dataVersion));
+        ASSERT_EQUAL(storage->m_currentVersion, dataVersion, ());
 
-        std::shared_ptr<Storage> storage(new Storage(7 /* dummy */));
-        storage->m_currentVersion = LoadCountriesFromBuffer(buffer, storage->m_countries, storage->m_affiliations, storage->m_countryNameSynonyms,
-                                                                    storage->m_mwmTopCityGeoIds, storage->m_mwmTopCountryGeoIds);
-        if (storage->m_currentVersion > 0)
-        {
-          LOG(LDEBUG, ("Apply new version", storage->m_currentVersion, dataVersion));
-          ASSERT_EQUAL(storage->m_currentVersion, dataVersion, ());
+        /// @todo Or use simple but reliable strategy: download new file and ask to restart the app?
+        GetPlatform().RunTask(Platform::Thread::Gui,
+                              [this, storage, buffer = std::move(buffer)]() { ApplyCountries(buffer, *storage); });
+      }
 
-          /// @todo Or use simple but reliable strategy: download new file and ask to restart the app?
-          GetPlatform().RunTask(Platform::Thread::Gui, [this, storage, buffer = std::move(buffer)]()
-          {
-            ApplyCountries(buffer, *storage);
-          });
-        }
-
-        return false;
-      }, true /* force reset */);
+      return false;
+    }, true /* force reset */);
 
     // True when new download was requested.
     return true;
@@ -1137,14 +1107,14 @@ void Storage::ApplyCountries(std::string const & countriesBuffer, Storage & stor
   /// @todo The best way is to restart the app after ApplyCountries.
   // Do not to update this information containers to avoid possible races.
   // Affiliations, synonyms, etc can be updated with the app update.
-  //m_affiliations = std::move(storage.m_affiliations);
-  //m_countryNameSynonyms = std::move(storage.m_countryNameSynonyms);
-  //m_mwmTopCityGeoIds = std::move(storage.m_mwmTopCityGeoIds);
-  //m_mwmTopCountryGeoIds = std::move(storage.m_mwmTopCountryGeoIds);
+  // m_affiliations = std::move(storage.m_affiliations);
+  // m_countryNameSynonyms = std::move(storage.m_countryNameSynonyms);
+  // m_mwmTopCityGeoIds = std::move(storage.m_mwmTopCityGeoIds);
+  // m_mwmTopCountryGeoIds = std::move(storage.m_mwmTopCountryGeoIds);
 
   LOG(LDEBUG, ("Version", m_currentVersion, "is applied"));
 
-  //LoadDiffScheme();
+  // LoadDiffScheme();
 
   /// @todo Start World and WorldCoasts download ?!
 }
@@ -1219,8 +1189,8 @@ void Storage::GetChildrenInGroups(CountryId const & parent, CountriesVec & downl
     }
 
     vector<pair<CountryId, NodeStatus>> disputedTerritoriesAndStatus;
-    StatusAndError const childStatus = GetNodeStatusInfo(childNode, disputedTerritoriesAndStatus,
-                                                         true /* isDisputedTerritoriesCounted */);
+    StatusAndError const childStatus =
+        GetNodeStatusInfo(childNode, disputedTerritoriesAndStatus, true /* isDisputedTerritoriesCounted */);
 
     ASSERT_NOT_EQUAL(childStatus.status, NodeStatus::Undefined, ());
     for (auto const & disputed : disputedTerritoriesAndStatus)
@@ -1230,10 +1200,8 @@ void Storage::GetChildrenInGroups(CountryId const & parent, CountriesVec & downl
     {
       availChildren.push_back(childValue);
       for (auto const & disputed : disputedTerritoriesAndStatus)
-      {
         if (disputed.second != NodeStatus::NotDownloaded)
           disputedTerritoriesWithoutSiblings.push_back(disputed.first);
-      }
     }
     else
     {
@@ -1243,8 +1211,7 @@ void Storage::GetChildrenInGroups(CountryId const & parent, CountriesVec & downl
     }
   });
 
-  CountriesVec uniqueDisputed(disputedTerritoriesWithoutSiblings.begin(),
-                              disputedTerritoriesWithoutSiblings.end());
+  CountriesVec uniqueDisputed(disputedTerritoriesWithoutSiblings.begin(), disputedTerritoriesWithoutSiblings.end());
   base::SortUnique(uniqueDisputed);
 
   for (auto const & countryId : uniqueDisputed)
@@ -1253,8 +1220,7 @@ void Storage::GetChildrenInGroups(CountryId const & parent, CountriesVec & downl
     // |parent|
     // is equal to the number of disputed territories with out downloaded sibling
     // with |countryId| in subtree with root == |parent|.
-    if (count(disputedTerritoriesWithoutSiblings.begin(), disputedTerritoriesWithoutSiblings.end(),
-              countryId) ==
+    if (count(disputedTerritoriesWithoutSiblings.begin(), disputedTerritoriesWithoutSiblings.end(), countryId) ==
         count(allDisputedTerritories.begin(), allDisputedTerritories.end(), countryId))
     {
       // |countryId| is downloaded without any other map in its group.
@@ -1282,17 +1248,17 @@ bool Storage::IsAllowedToEditVersion(CountryId const & countryId) const
   auto const status = CountryStatusEx(countryId);
   switch (status)
   {
-    case Status::OnDisk: return true;
-    case Status::OnDiskOutOfDate:
-    {
-      auto const localFile = GetLatestLocalFile(countryId);
-      ASSERT(localFile, ("Local file shouldn't be nullptr."));
-      auto const currentVersionTime = base::YYMMDDToSecondsSinceEpoch(static_cast<uint32_t>(m_currentVersion));
-      auto const localVersionTime = base::YYMMDDToSecondsSinceEpoch(static_cast<uint32_t>(localFile->GetVersion()));
-      return currentVersionTime - localVersionTime < kMaxSecondsTillLastVersionUpdate &&
-             base::SecondsSinceEpoch() - localVersionTime < kMaxSecondsTillNoEdits;
-    }
-    default: return false;
+  case Status::OnDisk: return true;
+  case Status::OnDiskOutOfDate:
+  {
+    auto const localFile = GetLatestLocalFile(countryId);
+    ASSERT(localFile, ("Local file shouldn't be nullptr."));
+    auto const currentVersionTime = base::YYMMDDToSecondsSinceEpoch(static_cast<uint32_t>(m_currentVersion));
+    auto const localVersionTime = base::YYMMDDToSecondsSinceEpoch(static_cast<uint32_t>(localFile->GetVersion()));
+    return currentVersionTime - localVersionTime < kMaxSecondsTillLastVersionUpdate &&
+           base::SecondsSinceEpoch() - localVersionTime < kMaxSecondsTillNoEdits;
+  }
+  default: return false;
   }
 }
 
@@ -1321,15 +1287,12 @@ void Storage::DownloadNode(CountryId const & countryId, bool isUpdate /* = false
   if (GetNodeStatus(*node).status == NodeStatus::OnDisk)
     return;
 
-  auto downloadAction = [this, isUpdate](CountryTree::Node const & descendantNode) {
-    if (descendantNode.ChildrenCount() == 0 &&
-        GetNodeStatus(descendantNode).status != NodeStatus::OnDisk)
+  auto downloadAction = [this, isUpdate](CountryTree::Node const & descendantNode)
+  {
+    if (descendantNode.ChildrenCount() == 0 && GetNodeStatus(descendantNode).status != NodeStatus::OnDisk)
     {
       auto const countryId = descendantNode.Value().Name();
-      auto const fileType =
-          isUpdate && m_diffsDataSource->HasDiffFor(countryId)
-              ? MapFileType::Diff
-              : MapFileType::Map;
+      auto const fileType = isUpdate && m_diffsDataSource->HasDiffFor(countryId) ? MapFileType::Diff : MapFileType::Map;
 
       DownloadCountry(countryId, fileType);
     }
@@ -1418,8 +1381,7 @@ void Storage::ApplyDiff(CountryId const & countryId, function<void(bool isSucces
   if (IsDiffApplyingInProgressToCountry(countryId))
     return;
 
-  auto const diffLocalFile = PreparePlaceForCountryFiles(m_currentVersion, m_dataDir,
-                                                         GetCountryFile(countryId));
+  auto const diffLocalFile = PreparePlaceForCountryFiles(m_currentVersion, m_dataDir, GetCountryFile(countryId));
   uint64_t version;
   if (!diffLocalFile || !m_diffsDataSource->VersionFor(countryId, version))
   {
@@ -1427,8 +1389,7 @@ void Storage::ApplyDiff(CountryId const & countryId, function<void(bool isSucces
     return;
   }
 
-  auto const emplaceResult =
-      m_diffsBeingApplied.emplace(countryId, std::make_unique<base::Cancellable>());
+  auto const emplaceResult = m_diffsBeingApplied.emplace(countryId, std::make_unique<base::Cancellable>());
   CHECK_EQUAL(emplaceResult.second, true, ());
 
   NotifyStatusChangedForHierarchy(countryId);
@@ -1439,48 +1400,46 @@ void Storage::ApplyDiff(CountryId const & countryId, function<void(bool isSucces
   params.m_oldMwmFile = GetLocalFile(countryId, version);
 
   LocalFilePtr & diffFile = params.m_diffFile;
-  diffs::ApplyDiff(
-      std::move(params), *emplaceResult.first->second,
-      [this, fn, countryId, diffFile](DiffApplicationResult result)
-      {
-        CHECK_THREAD_CHECKER(m_threadChecker, ());
-        if (result == DiffApplicationResult::Ok && m_integrityValidationEnabled &&
-            !diffFile->ValidateIntegrity())
-        {
-          GetPlatform().RunTask(Platform::Thread::File,
-            [path = diffFile->GetPath(MapFileType::Map)] { base::DeleteFileX(path); });
-          result = DiffApplicationResult::Failed;
-        }
+  diffs::ApplyDiff(std::move(params), *emplaceResult.first->second,
+                   [this, fn, countryId, diffFile](DiffApplicationResult result)
+  {
+    CHECK_THREAD_CHECKER(m_threadChecker, ());
+    if (result == DiffApplicationResult::Ok && m_integrityValidationEnabled && !diffFile->ValidateIntegrity())
+    {
+      GetPlatform().RunTask(Platform::Thread::File,
+                            [path = diffFile->GetPath(MapFileType::Map)] { base::DeleteFileX(path); });
+      result = DiffApplicationResult::Failed;
+    }
 
-        if (m_diffsBeingApplied[countryId]->IsCancelled() && result == DiffApplicationResult::Ok)
-          result = DiffApplicationResult::Cancelled;
+    if (m_diffsBeingApplied[countryId]->IsCancelled() && result == DiffApplicationResult::Ok)
+      result = DiffApplicationResult::Cancelled;
 
-        LOG(LINFO, ("Diff application result for", countryId, ":", result));
+    LOG(LINFO, ("Diff application result for", countryId, ":", result));
 
-        m_diffsBeingApplied.erase(countryId);
-        switch (result)
-        {
-        case DiffApplicationResult::Ok:
-        {
-          RegisterCountryFiles(diffFile);
-          m_diffsDataSource->MarkAsApplied(countryId);
-          fn(true);
-          break;
-        }
-        case DiffApplicationResult::Cancelled:
-        {
-          break;
-        }
-        case DiffApplicationResult::Failed:
-        {
-          m_diffsDataSource->RemoveDiffForCountry(countryId);
-          fn(false);
-          break;
-        }
-        }
+    m_diffsBeingApplied.erase(countryId);
+    switch (result)
+    {
+    case DiffApplicationResult::Ok:
+    {
+      RegisterCountryFiles(diffFile);
+      m_diffsDataSource->MarkAsApplied(countryId);
+      fn(true);
+      break;
+    }
+    case DiffApplicationResult::Cancelled:
+    {
+      break;
+    }
+    case DiffApplicationResult::Failed:
+    {
+      m_diffsDataSource->RemoveDiffForCountry(countryId);
+      fn(false);
+      break;
+    }
+    }
 
-        OnFinishDownloading();
-      });
+    OnFinishDownloading();
+  });
 }
 
 void Storage::SetMapSchemeForCountriesWithAbsentDiffs(IsDiffAbsentForCountry const & isAbsent)
@@ -1543,7 +1502,8 @@ void Storage::OnFinishDownloading()
 
   m_justDownloaded.clear();
 
-  m_downloadingPolicy->ScheduleRetry(m_failedCountries, [this](CountriesSet const & needReload) {
+  m_downloadingPolicy->ScheduleRetry(m_failedCountries, [this](CountriesSet const & needReload)
+  {
     for (auto const & country : needReload)
     {
       NodeStatuses status;
@@ -1558,10 +1518,7 @@ void Storage::OnDiffStatusReceived(diffs::NameDiffInfoMap && diffs)
 {
   m_diffsDataSource->SetDiffInfo(std::move(diffs));
 
-  SetMapSchemeForCountriesWithAbsentDiffs([this] (auto const & id)
-  {
-    return !m_diffsDataSource->HasDiffFor(id);
-  });
+  SetMapSchemeForCountriesWithAbsentDiffs([this](auto const & id) { return !m_diffsDataSource->HasDiffFor(id); });
 
   if (m_diffsDataSource->GetStatus() == diffs::Status::NotAvailable)
     return;
@@ -1596,9 +1553,9 @@ StatusAndError Storage::GetNodeStatusInfo(CountryTree::Node const & node,
   NodeStatus result = NodeStatus::NotDownloaded;
   bool allOnDisk = true;
 
-  auto groupStatusCalculator = [&](CountryTree::Node const & nodeInSubtree) {
-    StatusAndError const statusAndError =
-        ParseStatus(CountryStatusEx(nodeInSubtree.Value().Name()));
+  auto groupStatusCalculator = [&](CountryTree::Node const & nodeInSubtree)
+  {
+    StatusAndError const statusAndError = ParseStatus(CountryStatusEx(nodeInSubtree.Value().Name()));
 
     if (IsDisputed(nodeInSubtree) && isDisputedTerritoriesCounted)
     {
@@ -1645,8 +1602,7 @@ void Storage::GetNodeAttrs(CountryId const & countryId, NodeAttrs & nodeAttrs) c
   nodeAttrs.m_status = statusAndErr.status;
   nodeAttrs.m_error = statusAndErr.error;
   nodeAttrs.m_nodeLocalName = m_countryNameGetter(countryId);
-  nodeAttrs.m_nodeLocalDescription =
-      m_countryNameGetter.Get(countryId + LOCALIZATION_DESCRIPTION_SUFFIX);
+  nodeAttrs.m_nodeLocalDescription = m_countryNameGetter.Get(countryId + LOCALIZATION_DESCRIPTION_SUFFIX);
 
   // Progress.
   if (nodeAttrs.m_status == NodeStatus::OnDisk)
@@ -1659,8 +1615,7 @@ void Storage::GetNodeAttrs(CountryId const & countryId, NodeAttrs & nodeAttrs) c
   else
   {
     CountriesVec subtree;
-    node->ForEachInSubtree(
-        [&subtree](CountryTree::Node const & d) { subtree.push_back(d.Value().Name()); });
+    node->ForEachInSubtree([&subtree](CountryTree::Node const & d) { subtree.push_back(d.Value().Name()); });
 
     nodeAttrs.m_downloadingProgress = CalculateProgress(subtree);
   }
@@ -1680,8 +1635,8 @@ void Storage::GetNodeAttrs(CountryId const & countryId, NodeAttrs & nodeAttrs) c
     // Downloading mwm information.
     StatusAndError const statusAndErr = GetNodeStatus(d);
     ASSERT_NOT_EQUAL(statusAndErr.status, NodeStatus::Undefined, ());
-    if (statusAndErr.status != NodeStatus::NotDownloaded &&
-        statusAndErr.status != NodeStatus::Partly && d.ChildrenCount() == 0)
+    if (statusAndErr.status != NodeStatus::NotDownloaded && statusAndErr.status != NodeStatus::Partly &&
+        d.ChildrenCount() == 0)
     {
       nodeAttrs.m_downloadingMwmCounter += 1;
       nodeAttrs.m_downloadingMwmSize += d.Value().GetSubtreeMwmSizeBytes();
@@ -1713,11 +1668,11 @@ void Storage::GetNodeAttrs(CountryId const & countryId, NodeAttrs & nodeAttrs) c
   }
   // Parents country.
   nodeAttrs.m_topmostParentInfo.clear();
-  ForEachAncestorExceptForTheRoot(
-      nodes, [&](CountryId const & ancestorId, CountryTree::Node const & node) {
-        if (node.Value().GetParent() == GetRootId())
-          nodeAttrs.m_topmostParentInfo.push_back({ancestorId, m_countryNameGetter(ancestorId)});
-      });
+  ForEachAncestorExceptForTheRoot(nodes, [&](CountryId const & ancestorId, CountryTree::Node const & node)
+  {
+    if (node.Value().GetParent() == GetRootId())
+      nodeAttrs.m_topmostParentInfo.push_back({ancestorId, m_countryNameGetter(ancestorId)});
+  });
 }
 
 void Storage::GetNodeStatuses(CountryId const & countryId, NodeStatuses & nodeStatuses) const
@@ -1797,7 +1752,8 @@ void Storage::CancelDownloadNode(CountryId const & countryId)
 
   auto const setQueue = GetQueuedCountries(m_downloader->GetQueue());
 
-  ForEachInSubtree(countryId, [&](CountryId const & descendantId, bool /* groupNode */) {
+  ForEachInSubtree(countryId, [&](CountryId const & descendantId, bool /* groupNode */)
+  {
     auto needNotify = false;
     if (setQueue.count(descendantId) != 0)
       needNotify = DeleteCountryFilesFromDownloader(descendantId);
@@ -1814,7 +1770,8 @@ void Storage::CancelDownloadNode(CountryId const & countryId)
 
 void Storage::RetryDownloadNode(CountryId const & countryId)
 {
-  ForEachInSubtree(countryId, [this](CountryId const & descendantId, bool groupNode) {
+  ForEachInSubtree(countryId, [this](CountryId const & descendantId, bool groupNode)
+  {
     if (!groupNode && m_failedCountries.count(descendantId) != 0)
     {
       bool const isUpdateRequest = m_diffsDataSource->HasDiffFor(descendantId);
@@ -1906,7 +1863,8 @@ void Storage::GetQueuedChildren(CountryId const & parent, CountriesVec & queuedC
   }
 
   queuedChildren.clear();
-  node->ForEachChild([&queuedChildren, this](CountryTree::Node const & child) {
+  node->ForEachChild([&queuedChildren, this](CountryTree::Node const & child)
+  {
     NodeStatus status = GetNodeStatus(child).status;
     ASSERT_NOT_EQUAL(status, NodeStatus::Undefined, ());
     if (status == NodeStatus::Downloading || status == NodeStatus::InQueue)
@@ -1938,13 +1896,12 @@ void Storage::GetGroupNodePathToRoot(CountryId const & groupNode, CountriesVec &
     return;
   }
 
-  ForEachAncestorExceptForTheRoot(
-      nodes, [&path](CountryId const & id, CountryTree::Node const &) { path.push_back(id); });
+  ForEachAncestorExceptForTheRoot(nodes,
+                                  [&path](CountryId const & id, CountryTree::Node const &) { path.push_back(id); });
   path.push_back(m_countries.GetRoot().Value().Name());
 }
 
-void Storage::GetTopmostNodesFor(CountryId const & countryId, CountriesVec & nodes,
-                                 size_t level) const
+void Storage::GetTopmostNodesFor(CountryId const & countryId, CountriesVec & nodes, size_t level) const
 {
   nodes.clear();
 
@@ -1962,8 +1919,7 @@ void Storage::GetTopmostNodesFor(CountryId const & countryId, CountriesVec & nod
     nodes[i] = countryId;
     CountriesVec path;
     ForEachAncestorExceptForTheRoot(
-        {treeNodes[i]},
-        [&path](CountryId const & id, CountryTree::Node const &) { path.emplace_back(id); });
+        {treeNodes[i]}, [&path](CountryId const & id, CountryTree::Node const &) { path.emplace_back(id); });
     if (!path.empty() && level < path.size())
       nodes[i] = path[path.size() - 1 - level];
   }
diff --git a/libs/storage/storage.hpp b/libs/storage/storage.hpp
index 92100159b..780ee4455 100644
--- a/libs/storage/storage.hpp
+++ b/libs/storage/storage.hpp
@@ -28,7 +28,7 @@
 namespace storage_tests
 {
 struct UnitClass_StorageTest_DeleteCountry;
-}  // storage_tests
+}  // namespace storage_tests
 
 namespace storage
 {
@@ -47,9 +47,17 @@ struct CountryIdAndName
 /// It's applicable for expandable and not expandable node id.
 struct NodeAttrs
 {
-  NodeAttrs() : m_mwmCounter(0), m_localMwmCounter(0), m_downloadingMwmCounter(0),
-    m_mwmSize(0), m_localMwmSize(0), m_downloadingMwmSize(0),
-    m_status(NodeStatus::Undefined), m_error(NodeErrorCode::NoError), m_present(false) {}
+  NodeAttrs()
+    : m_mwmCounter(0)
+    , m_localMwmCounter(0)
+    , m_downloadingMwmCounter(0)
+    , m_mwmSize(0)
+    , m_localMwmSize(0)
+    , m_downloadingMwmSize(0)
+    , m_status(NodeStatus::Undefined)
+    , m_error(NodeErrorCode::NoError)
+    , m_present(false)
+  {}
 
   /// If the node is expandable (a big country) |m_mwmCounter| is number of mwm files (leaves)
   /// belonging to the node. If the node isn't expandable |m_mwmCounter| == 1.
@@ -259,32 +267,28 @@ private:
   void LoadCountriesFile(std::string const & pathToCountriesFile);
 
   void ReportProgress(CountryId const & countryId, downloader::Progress const & p);
-  void ReportProgressForHierarchy(CountryId const & countryId,
-                                  downloader::Progress const & leafProgress);
+  void ReportProgressForHierarchy(CountryId const & countryId, downloader::Progress const & leafProgress);
 
   // QueuedCountry::Subscriber overrides:
   void OnCountryInQueue(QueuedCountry const & queuedCountry) override;
   void OnStartDownloading(QueuedCountry const & queuedCountry) override;
   /// Called on the main thread by MapFilesDownloader when
   /// downloading of a map file succeeds/fails.
-  void OnDownloadFinished(QueuedCountry const & queuedCountry,
-                          downloader::DownloadStatus status) override;
+  void OnDownloadFinished(QueuedCountry const & queuedCountry, downloader::DownloadStatus status) override;
 
   /// Periodically called on the main thread by MapFilesDownloader
   /// during the downloading process.
-  void OnDownloadProgress(QueuedCountry const & queuedCountry,
-                          downloader::Progress const & progress) override;
+  void OnDownloadProgress(QueuedCountry const & queuedCountry, downloader::Progress const & progress) override;
 
   void RegisterDownloadedFiles(CountryId const & countryId, MapFileType type);
 
-  void OnMapDownloadFinished(CountryId const & countryId, downloader::DownloadStatus status,
-                             MapFileType type);
+  void OnMapDownloadFinished(CountryId const & countryId, downloader::DownloadStatus status, MapFileType type);
 
   /// Dummy ctor for private use only.
   explicit Storage(int);
 
 public:
-  ThreadChecker const & GetThreadChecker() const {return m_threadChecker;}
+  ThreadChecker const & GetThreadChecker() const { return m_threadChecker; }
 
   /// \brief Storage will create its directories in Writable Directory
   /// (gotten with platform::WritableDir) by default.
@@ -296,8 +300,7 @@ public:
   /// * create a instance of Storage with a special countries.txt and |dataDir|
   /// * download some maps to WritableDir/|dataDir|
   /// * destroy the instance of Storage and move the downloaded maps to proper place
-  Storage(std::string const & pathToCountriesFile = COUNTRIES_FILE,
-          std::string const & dataDir = std::string());
+  Storage(std::string const & pathToCountriesFile = COUNTRIES_FILE, std::string const & dataDir = std::string());
 
   /// \brief This constructor should be used for testing only.
   Storage(std::string const & referenceCountriesTxtJsonForTesting,
@@ -337,8 +340,8 @@ public:
   /// which have been written in coutries.txt or cournties_migrate.txt.
   /// It means the method does not put to its params neither custom maps generated by user
   /// nor World.mwm and WorldCoasts.mwm.
-  void GetChildrenInGroups(CountryId const & parent, CountriesVec & downloadedChildren,
-                           CountriesVec & availChildren, bool keepAvailableChildren = false) const;
+  void GetChildrenInGroups(CountryId const & parent, CountriesVec & downloadedChildren, CountriesVec & availChildren,
+                           bool keepAvailableChildren = false) const;
   /// \brief Fills |queuedChildren| with children of |parent| if they (or thier childen) are in |m_queue|.
   /// \note For group node children if one of child's ancestor has status
   /// NodeStatus::Downloading or NodeStatus::InQueue the child is considered as a queued child
@@ -354,8 +357,7 @@ public:
   /// \param level is distance from top level except root.
   /// For disputed territories all possible owners will be added.
   /// Puts |countryId| to |nodes| when |level| is greater than the level of |countryId|.
-  void GetTopmostNodesFor(CountryId const & countryId, CountriesVec & nodes,
-                          size_t level = 0) const;
+  void GetTopmostNodesFor(CountryId const & countryId, CountriesVec & nodes, size_t level = 0) const;
 
   /// \brief Returns topmost country id prior root id or |countryId| itself, if it's already
   /// a topmost node or disputed territory id if |countryId| is a disputed territory or belongs to
@@ -392,10 +394,7 @@ public:
   /// \note This method works quicklier than GetNodeAttrs().
   void GetNodeStatuses(CountryId const & countryId, NodeStatuses & nodeStatuses) const;
 
-  std::string GetNodeLocalName(CountryId const & countryId) const
-  {
-    return m_countryNameGetter(countryId);
-  }
+  std::string GetNodeLocalName(CountryId const & countryId) const { return m_countryNameGetter(countryId); }
 
   /// \brief Downloads/update one node (expandable or not) by countryId.
   /// If node is expandable downloads/update all children (grandchildren) by the node
@@ -471,7 +470,7 @@ public:
 
   /// \returns real (not fake) local maps contained in countries.txt.
   /// So this method does not return custom user local maps and World and WorldCoasts country id.
-  //void GetLocalRealMaps(CountriesVec & localMaps) const;
+  // void GetLocalRealMaps(CountriesVec & localMaps) const;
 
   /// Do we have downloaded countries
   bool HaveDownloadedCountries() const;
@@ -485,7 +484,8 @@ public:
   /// Used in Android to get absent Worlds files to download.
   /// @param[out] res Out vector, empty if all files are present some or error occured.
   /// @return     WorldStatus:
-  enum class WorldStatus {
+  enum class WorldStatus
+  {
     READY = 0,            ///< Ready to download or all files are present if \a res is empty
     WAS_MOVED,            ///< All World files are present and one or more files was moved, \a res is empty.
     ERROR_CREATE_FOLDER,  ///< Error when creating folder
@@ -523,10 +523,7 @@ public:
   {
     return localFile.GetCountryName();
   }
-  CountryId const & FindCountryIdByFile(std::string const & name) const
-  {
-    return name;
-  }
+  CountryId const & FindCountryIdByFile(std::string const & name) const { return name; }
   /// @}
 
   // Returns true iff |countryId| exists as a node in the tree.
@@ -563,7 +560,7 @@ public:
   bool IsDownloadInProgress() const;
 
   /// @param[out] res Populated with oudated countries.
-  //void GetOutdatedCountries(std::vector<Country const *> & countries) const;
+  // void GetOutdatedCountries(std::vector<Country const *> & countries) const;
 
   /// Sets and gets locale, which is used to get localized counries names
   void SetLocale(std::string const & locale) { m_countryNameGetter.SetLocale(locale); }
@@ -577,7 +574,7 @@ public:
   void SetLocaleForTesting(std::string const & jsonBuffer, std::string const & locale);
 
   /// Returns true if the diff scheme is available and all local outdated maps can be updated via diffs.
-  //bool IsPossibleToAutoupdate() const;
+  // bool IsPossibleToAutoupdate() const;
 
   void SetStartDownloadingCallback(StartDownloadingCallback const & cb);
 
@@ -630,10 +627,9 @@ private:
 
   /// Returns status for a node (group node or not).
   /// Fills |disputedTeritories| with all disputed teritories in subtree with the root == |node|.
-  StatusAndError GetNodeStatusInfo(
-      CountryTree::Node const & node,
-      std::vector<std::pair<CountryId, NodeStatus>> & disputedTeritories,
-      bool isDisputedTerritoriesCounted) const;
+  StatusAndError GetNodeStatusInfo(CountryTree::Node const & node,
+                                   std::vector<std::pair<CountryId, NodeStatus>> & disputedTeritories,
+                                   bool isDisputedTerritoriesCounted) const;
 
   void NotifyStatusChanged(CountryId const & countryId);
   void NotifyStatusChangedForHierarchy(CountryId const & countryId);
@@ -654,7 +650,7 @@ private:
 
   void OnMapDownloadFailed(CountryId const & countryId);
 
-  //void LoadDiffScheme();
+  // void LoadDiffScheme();
   void ApplyDiff(CountryId const & countryId, std::function<void(bool isSuccess)> const & fn);
 
   using IsDiffAbsentForCountry = std::function<bool(CountryId const & id)>;
@@ -677,7 +673,8 @@ void Storage::ForEachInSubtree(CountryId const & root, ToDo && toDo) const
     ASSERT(false, ("CountryId =", root, "not found in m_countries."));
     return;
   }
-  rootNode->ForEachInSubtree([&toDo](CountryTree::Node const & node) {
+  rootNode->ForEachInSubtree([&toDo](CountryTree::Node const & node)
+  {
     Country const & value = node.Value();
     toDo(value.Name(), value.GetSubtreeMwmCounter() != 1 /* groupNode. */);
   });
@@ -712,7 +709,8 @@ void Storage::ForEachAncestorExceptForTheRoot(CountryTree::NodesBufferT const &
   // may be more than one. It means |childId| is present in the country tree more than once.
   for (auto const & node : nodes)
   {
-    node->ForEachAncestorExceptForTheRoot([&](CountryTree::Node const & node) {
+    node->ForEachAncestorExceptForTheRoot([&](CountryTree::Node const & node)
+    {
       CountryId const ancestorId = node.Value().Name();
       if (visitedAncestors.find(&node) != visitedAncestors.end())
         return;  // The node was visited before because countryId is present in the tree more
diff --git a/libs/storage/storage_defines.cpp b/libs/storage/storage_defines.cpp
index be3a960d3..568133982 100644
--- a/libs/storage/storage_defines.cpp
+++ b/libs/storage/storage_defines.cpp
@@ -11,32 +11,25 @@ namespace storage
 {
 storage::CountryId const kInvalidCountryId;
 
-bool IsCountryIdValid(CountryId const & countryId) { return countryId != kInvalidCountryId; }
+bool IsCountryIdValid(CountryId const & countryId)
+{
+  return countryId != kInvalidCountryId;
+}
 
 string DebugPrint(Status status)
 {
   switch (status)
   {
-  case Status::Undefined:
-    return "EUndefined"s;
-  case Status::OnDisk:
-    return "OnDisk"s;
-  case Status::NotDownloaded:
-    return "NotDownloaded"s;
-  case Status::DownloadFailed:
-    return "DownloadFailed"s;
-  case Status::Downloading:
-    return "Downloading"s;
-  case Status::Applying:
-    return "Applying"s;
-  case Status::InQueue:
-    return "InQueue"s;
-  case Status::UnknownError:
-    return "Unknown"s;
-  case Status::OnDiskOutOfDate:
-    return "OnDiskOutOfDate"s;
-  case Status::OutOfMemFailed:
-    return "OutOfMemFailed"s;
+  case Status::Undefined: return "EUndefined"s;
+  case Status::OnDisk: return "OnDisk"s;
+  case Status::NotDownloaded: return "NotDownloaded"s;
+  case Status::DownloadFailed: return "DownloadFailed"s;
+  case Status::Downloading: return "Downloading"s;
+  case Status::Applying: return "Applying"s;
+  case Status::InQueue: return "InQueue"s;
+  case Status::UnknownError: return "Unknown"s;
+  case Status::OnDiskOutOfDate: return "OnDiskOutOfDate"s;
+  case Status::OutOfMemFailed: return "OutOfMemFailed"s;
   }
   UNREACHABLE();
 }
@@ -45,24 +38,15 @@ string DebugPrint(NodeStatus status)
 {
   switch (status)
   {
-  case NodeStatus::Undefined:
-    return "Undefined"s;
-  case NodeStatus::Error:
-    return "Error"s;
-  case NodeStatus::OnDisk:
-    return "OnDisk"s;
-  case NodeStatus::NotDownloaded:
-    return "NotDownloaded"s;
-  case NodeStatus::Downloading:
-    return "Downloading"s;
-  case NodeStatus::Applying:
-    return "Applying"s;
-  case NodeStatus::InQueue:
-    return "InQueue"s;
-  case NodeStatus::OnDiskOutOfDate:
-    return "OnDiskOutOfDate"s;
-  case NodeStatus::Partly:
-    return "Partly"s;
+  case NodeStatus::Undefined: return "Undefined"s;
+  case NodeStatus::Error: return "Error"s;
+  case NodeStatus::OnDisk: return "OnDisk"s;
+  case NodeStatus::NotDownloaded: return "NotDownloaded"s;
+  case NodeStatus::Downloading: return "Downloading"s;
+  case NodeStatus::Applying: return "Applying"s;
+  case NodeStatus::InQueue: return "InQueue"s;
+  case NodeStatus::OnDiskOutOfDate: return "OnDiskOutOfDate"s;
+  case NodeStatus::Partly: return "Partly"s;
   }
   UNREACHABLE();
 }
@@ -71,14 +55,10 @@ string DebugPrint(NodeErrorCode status)
 {
   switch (status)
   {
-  case NodeErrorCode::NoError:
-    return "NoError"s;
-  case NodeErrorCode::UnknownError:
-    return "UnknownError"s;
-  case NodeErrorCode::OutOfMemFailed:
-    return "OutOfMemFailed"s;
-  case NodeErrorCode::NoInetConnection:
-    return "NoInetConnection"s;
+  case NodeErrorCode::NoError: return "NoError"s;
+  case NodeErrorCode::UnknownError: return "UnknownError"s;
+  case NodeErrorCode::OutOfMemFailed: return "OutOfMemFailed"s;
+  case NodeErrorCode::NoInetConnection: return "NoInetConnection"s;
   }
   UNREACHABLE();
 }
@@ -87,26 +67,16 @@ StatusAndError ParseStatus(Status innerStatus)
 {
   switch (innerStatus)
   {
-  case Status::Undefined:
-    return StatusAndError(NodeStatus::Undefined, NodeErrorCode::NoError);
-  case Status::OnDisk:
-    return StatusAndError(NodeStatus::OnDisk, NodeErrorCode::NoError);
-  case Status::NotDownloaded:
-    return StatusAndError(NodeStatus::NotDownloaded, NodeErrorCode::NoError);
-  case Status::DownloadFailed:
-    return StatusAndError(NodeStatus::Error, NodeErrorCode::NoInetConnection);
-  case Status::Downloading:
-    return StatusAndError(NodeStatus::Downloading, NodeErrorCode::NoError);
-  case Status::Applying:
-    return StatusAndError(NodeStatus::Applying, NodeErrorCode::NoError);
-  case Status::InQueue:
-    return StatusAndError(NodeStatus::InQueue, NodeErrorCode::NoError);
-  case Status::UnknownError:
-    return StatusAndError(NodeStatus::Error, NodeErrorCode::UnknownError);
-  case Status::OnDiskOutOfDate:
-    return StatusAndError(NodeStatus::OnDiskOutOfDate, NodeErrorCode::NoError);
-  case Status::OutOfMemFailed:
-    return StatusAndError(NodeStatus::Error, NodeErrorCode::OutOfMemFailed);
+  case Status::Undefined: return StatusAndError(NodeStatus::Undefined, NodeErrorCode::NoError);
+  case Status::OnDisk: return StatusAndError(NodeStatus::OnDisk, NodeErrorCode::NoError);
+  case Status::NotDownloaded: return StatusAndError(NodeStatus::NotDownloaded, NodeErrorCode::NoError);
+  case Status::DownloadFailed: return StatusAndError(NodeStatus::Error, NodeErrorCode::NoInetConnection);
+  case Status::Downloading: return StatusAndError(NodeStatus::Downloading, NodeErrorCode::NoError);
+  case Status::Applying: return StatusAndError(NodeStatus::Applying, NodeErrorCode::NoError);
+  case Status::InQueue: return StatusAndError(NodeStatus::InQueue, NodeErrorCode::NoError);
+  case Status::UnknownError: return StatusAndError(NodeStatus::Error, NodeErrorCode::UnknownError);
+  case Status::OnDiskOutOfDate: return StatusAndError(NodeStatus::OnDiskOutOfDate, NodeErrorCode::NoError);
+  case Status::OutOfMemFailed: return StatusAndError(NodeStatus::Error, NodeErrorCode::OutOfMemFailed);
   }
   UNREACHABLE();
 }
@@ -114,8 +84,7 @@ StatusAndError ParseStatus(Status innerStatus)
 string DebugPrint(StatusAndError statusAndError)
 {
   ostringstream out;
-  out << "StatusAndError[" << DebugPrint(statusAndError.status)
-      << ", " << DebugPrint(statusAndError.error) << "]";
+  out << "StatusAndError[" << DebugPrint(statusAndError.status) << ", " << DebugPrint(statusAndError.error) << "]";
   return out.str();
 }
 }  // namespace storage
diff --git a/libs/storage/storage_defines.hpp b/libs/storage/storage_defines.hpp
index 2d4aced9c..c108a68fc 100644
--- a/libs/storage/storage_defines.hpp
+++ b/libs/storage/storage_defines.hpp
@@ -29,7 +29,7 @@ using CountryNameSynonyms = std::unordered_map<std::string, CountryId>;
 using MwmTopCityGeoIds = std::unordered_map<CountryId, base::GeoObjectId>;
 using MwmTopCountryGeoIds = std::unordered_map<CountryId, std::vector<base::GeoObjectId>>;
 
-extern const storage::CountryId kInvalidCountryId;
+extern storage::CountryId const kInvalidCountryId;
 
 // @TODO(bykoianko) Check in country tree if the countryId is valid.
 bool IsCountryIdValid(CountryId const & countryId);
@@ -77,22 +77,16 @@ std::string DebugPrint(NodeErrorCode status);
 
 struct StatusAndError
 {
-  StatusAndError(NodeStatus nodeStatus, NodeErrorCode nodeError)
-    : status(nodeStatus), error(nodeError)
-  {
-  }
+  StatusAndError(NodeStatus nodeStatus, NodeErrorCode nodeError) : status(nodeStatus), error(nodeError) {}
 
-  bool operator==(StatusAndError const & other) const
-  {
-    return other.status == status && other.error == error;
-  }
+  bool operator==(StatusAndError const & other) const { return other.status == status && other.error == error; }
 
   NodeStatus status;
   NodeErrorCode error;
-  };
-  std::string DebugPrint(StatusAndError statusAndError);
+};
+std::string DebugPrint(StatusAndError statusAndError);
 
-  StatusAndError ParseStatus(Status innerStatus);
+StatusAndError ParseStatus(Status innerStatus);
 }  // namespace storage
 
 using DownloadFn = std::function<void(storage::CountryId const &)>;
diff --git a/libs/storage/storage_helpers.cpp b/libs/storage/storage_helpers.cpp
index d0493abc9..84829dc72 100644
--- a/libs/storage/storage_helpers.cpp
+++ b/libs/storage/storage_helpers.cpp
@@ -9,8 +9,7 @@
 
 namespace storage
 {
-bool IsPointCoveredByDownloadedMaps(m2::PointD const & position,
-                                    Storage const & storage,
+bool IsPointCoveredByDownloadedMaps(m2::PointD const & position, Storage const & storage,
                                     CountryInfoGetter const & countryInfoGetter)
 {
   return storage.IsNodeDownloaded(countryInfoGetter.GetRegionCountryId(position));
@@ -18,16 +17,14 @@ bool IsPointCoveredByDownloadedMaps(m2::PointD const & position,
 
 bool IsDownloadFailed(Status status)
 {
-  return status == Status::DownloadFailed || status == Status::OutOfMemFailed ||
-         status == Status::UnknownError;
+  return status == Status::DownloadFailed || status == Status::OutOfMemFailed || status == Status::UnknownError;
 }
 
 bool IsEnoughSpaceForDownload(MwmSize mwmSize)
 {
   // Additional size which is necessary to have on flash card to download file of mwmSize bytes.
   MwmSize constexpr kExtraSizeBytes = 10 * 1024 * 1024;
-  return GetPlatform().GetWritableStorageStatus(mwmSize + kExtraSizeBytes) ==
-         Platform::TStorageStatus::STORAGE_OK;
+  return GetPlatform().GetWritableStorageStatus(mwmSize + kExtraSizeBytes) == Platform::TStorageStatus::STORAGE_OK;
 }
 
 bool IsEnoughSpaceForDownload(CountryId const & countryId, Storage const & storage)
@@ -51,8 +48,8 @@ bool IsEnoughSpaceForUpdate(CountryId const & countryId, Storage const & storage
   // - final size difference between old and new MWMs = m_sizeDifference
 
   [[maybe_unused]] MwmSize const diff = updateInfo.m_sizeDifference > 0 ? updateInfo.m_sizeDifference : 0;
-//  return IsEnoughSpaceForDownload(std::max(diff, updateInfo.m_totalDownloadSizeInBytes) +
-//                                  updateInfo.m_maxFileSizeInBytes);
+  //  return IsEnoughSpaceForDownload(std::max(diff, updateInfo.m_totalDownloadSizeInBytes) +
+  //                                  updateInfo.m_maxFileSizeInBytes);
 
   // 2. For the current "download and replace" strategy:
   // - Android and Desktop has 1 simultaneous download
@@ -68,8 +65,8 @@ m2::RectD CalcLimitRect(CountryId const & countryId, Storage const & storage,
                         CountryInfoGetter const & countryInfoGetter)
 {
   m2::RectD boundingBox;
-  auto const accumulator = [&countryInfoGetter, &boundingBox](CountryId const & descendantId,
-                                                              bool groupNode) {
+  auto const accumulator = [&countryInfoGetter, &boundingBox](CountryId const & descendantId, bool groupNode)
+  {
     if (!groupNode)
       boundingBox.Add(countryInfoGetter.GetLimitRectForLeaf(descendantId));
   };
@@ -80,12 +77,11 @@ m2::RectD CalcLimitRect(CountryId const & countryId, Storage const & storage,
   return boundingBox;
 }
 
-MwmSize GetRemoteSize(diffs::DiffsDataSource const & diffsDataSource,
-                      platform::CountryFile const & file)
+MwmSize GetRemoteSize(diffs::DiffsDataSource const & diffsDataSource, platform::CountryFile const & file)
 {
   uint64_t size;
   if (diffsDataSource.SizeFor(file.GetName(), size))
     return size;
   return file.GetRemoteSize();
 }
-} // namespace storage
+}  // namespace storage
diff --git a/libs/storage/storage_helpers.hpp b/libs/storage/storage_helpers.hpp
index c93f50e6b..cc3f9f38f 100644
--- a/libs/storage/storage_helpers.hpp
+++ b/libs/storage/storage_helpers.hpp
@@ -31,6 +31,5 @@ bool IsEnoughSpaceForUpdate(CountryId const & countryId, Storage const & storage
 m2::RectD CalcLimitRect(CountryId const & countryId, Storage const & storage,
                         CountryInfoGetter const & countryInfoGetter);
 
-MwmSize GetRemoteSize(diffs::DiffsDataSource const & diffsDataSource,
-                      platform::CountryFile const & file);
+MwmSize GetRemoteSize(diffs::DiffsDataSource const & diffsDataSource, platform::CountryFile const & file);
 }  // namespace storage
diff --git a/libs/storage/storage_integration_tests/download_calc_size_test.cpp b/libs/storage/storage_integration_tests/download_calc_size_test.cpp
index fe3e4cc3f..3e49492d6 100644
--- a/libs/storage/storage_integration_tests/download_calc_size_test.cpp
+++ b/libs/storage/storage_integration_tests/download_calc_size_test.cpp
@@ -15,7 +15,8 @@ using namespace storage;
 void InitStorage(Storage & storage, Storage::UpdateCallback const & didDownload,
                  Storage::ProgressFunction const & progress)
 {
-  auto const changeCountryFunction = [&](CountryId const & /* countryId */) {
+  auto const changeCountryFunction = [&](CountryId const & /* countryId */)
+  {
     if (!storage.IsDownloadInProgress())
     {
       // End wait for downloading complete.
@@ -34,7 +35,7 @@ UNIT_TEST(DownloadingTests_CalcOverallProgress)
   WritableDirChanger writableDirChanger(storage::kMapTestDir);
 
   // A bunch of small islands.
-  CountriesVec const kTestCountries = { "Kiribati", "Tokelau", "Niue", "Palau", "Pitcairn Islands" };
+  CountriesVec const kTestCountries = {"Kiribati", "Tokelau", "Niue", "Palau", "Pitcairn Islands"};
 
   Storage s;
 
@@ -44,13 +45,12 @@ UNIT_TEST(DownloadingTests_CalcOverallProgress)
   TEST_EQUAL(baseProgress.m_bytesDownloaded, 0, ());
   TEST_EQUAL(baseProgress.m_bytesTotal, 0, ());
 
-  for (auto const &country : kTestCountries)
-  {
+  for (auto const & country : kTestCountries)
     baseProgress.m_bytesTotal += s.CountrySizeInBytes(country).second;
-  }
 
-  auto progressChanged = [&s, &kTestCountries, &baseProgress](CountryId const & id,
-                                                              downloader::Progress const & /* progress */) {
+  auto progressChanged =
+      [&s, &kTestCountries, &baseProgress](CountryId const & id, downloader::Progress const & /* progress */)
+  {
     auto const currentProgress = s.GetOverallProgress(kTestCountries);
     LOG_SHORT(LINFO, (id, "downloading progress:", currentProgress));
 
diff --git a/libs/storage/storage_integration_tests/lightweight_matching_tests.cpp b/libs/storage/storage_integration_tests/lightweight_matching_tests.cpp
index eea196bba..8789c1006 100644
--- a/libs/storage/storage_integration_tests/lightweight_matching_tests.cpp
+++ b/libs/storage/storage_integration_tests/lightweight_matching_tests.cpp
@@ -15,10 +15,8 @@ double constexpr kStepInMercator = 1;
 
 struct PointAndCountry
 {
-  PointAndCountry(m2::PointD && pt, storage::CountryId && country)
-    : m_pt(std::move(pt)), m_country(std::move(country))
-  {
-  }
+  PointAndCountry(m2::PointD && pt, storage::CountryId && country) : m_pt(std::move(pt)), m_country(std::move(country))
+  {}
 
   m2::PointD m_pt;
   storage::CountryId m_country;
@@ -44,8 +42,6 @@ UNIT_CLASS_TEST(CountryInfoReader, LightweightMatching)
   LOG(LINFO, ("The dataset is generated. Dataset size:", dataset.size()));
 
   for (auto const & sample : dataset)
-  {
     TEST_EQUAL(GetRegionCountryId(sample.m_pt), sample.m_country, (sample.m_pt));
-  }
 }
 }  // namespace lightweight_matching_tests
diff --git a/libs/storage/storage_integration_tests/storage_3levels_tests.cpp b/libs/storage/storage_integration_tests/storage_3levels_tests.cpp
index 3bf37c4c1..4bc64d120 100644
--- a/libs/storage/storage_integration_tests/storage_3levels_tests.cpp
+++ b/libs/storage/storage_integration_tests/storage_3levels_tests.cpp
@@ -30,7 +30,7 @@ int GetLevelCount(Storage & storage, CountryId const & countryId)
     level = std::max(level, GetLevelCount(storage, child));
   return 1 + level;
 }
-} // namespace
+}  // namespace
 
 UNIT_TEST(SmallMwms_3levels_Test)
 {
@@ -42,13 +42,7 @@ UNIT_TEST(SmallMwms_3levels_Test)
   /// RunOnGui callbacks, so delete Framework also in RunOnGui.
   auto * frm = new Framework(FrameworkParams(false /* m_enableDiffs */));
 
-  SCOPE_GUARD(deleteFramework, [frm]()
-  {
-    GetPlatform().RunTask(Platform::Thread::Gui, [frm]()
-    {
-      delete frm;
-    });
-  });
+  SCOPE_GUARD(deleteFramework, [frm]() { GetPlatform().RunTask(Platform::Thread::Gui, [frm]() { delete frm; }); });
 
   auto & storage = frm->GetStorage();
   std::string const version = strings::to_string(storage.GetCurrentDataVersion());
@@ -60,7 +54,8 @@ UNIT_TEST(SmallMwms_3levels_Test)
 
   auto onProgressFn = [&](CountryId const & countryId, downloader::Progress const & /* progress */) {};
 
-  auto onChangeCountryFn = [&](CountryId const & countryId) {
+  auto onChangeCountryFn = [&](CountryId const & countryId)
+  {
     if (!storage.IsDownloadInProgress())
       testing::StopEventLoop();
   };
diff --git a/libs/storage/storage_integration_tests/storage_downloading_tests.cpp b/libs/storage/storage_integration_tests/storage_downloading_tests.cpp
index eb33ca427..b8ab0f3b2 100644
--- a/libs/storage/storage_integration_tests/storage_downloading_tests.cpp
+++ b/libs/storage/storage_integration_tests/storage_downloading_tests.cpp
@@ -19,8 +19,8 @@
 #include "base/thread.hpp"
 
 #include <cstdlib>
-#include <functional>
 #include <exception>
+#include <functional>
 #include <string>
 
 using namespace platform;
@@ -29,7 +29,7 @@ using namespace std;
 using namespace std::placeholders;
 
 // Uncomment to enable the test that requires network and downloads an mwm several times.
-//#define TEST_INTEGRITY
+// #define TEST_INTEGRITY
 #ifndef TEST_INTEGRITY_ITERATIONS
 #define TEST_INTEGRITY_ITERATIONS 5
 #endif
@@ -40,7 +40,8 @@ using Runner = Platform::ThreadRunner;
 
 string const kCountryId = "Trinidad and Tobago";
 
-class InterruptException : public exception {};
+class InterruptException : public exception
+{};
 
 void Update(CountryId const &, storage::LocalFilePtr const localCountryFile)
 {
@@ -63,7 +64,7 @@ void InitStorage(Storage & storage, Storage::ProgressFunction const & onProgress
   storage.SetDownloadingServersForTesting({kTestWebServer});
 }
 
-} // namespace
+}  // namespace
 
 UNIT_TEST(SmallMwms_ReDownloadExistedMWMIgnored_Test)
 {
@@ -90,7 +91,8 @@ UNIT_CLASS_TEST(Runner, SmallMwms_InterruptDownloadResumeDownload_Test)
   {
     Storage storage;
 
-    auto const onProgressFn = [](CountryId const & countryId, downloader::Progress const & /* progress */) {
+    auto const onProgressFn = [](CountryId const & countryId, downloader::Progress const & /* progress */)
+    {
       TEST_EQUAL(countryId, kCountryId, ());
       // Interrupt download
       testing::StopEventLoop();
@@ -116,30 +118,25 @@ UNIT_CLASS_TEST(Runner, SmallMwms_InterruptDownloadResumeDownload_Test)
 
     bool onProgressIsCalled = false;
     NodeAttrs onProgressAttrs;
-    auto const onProgressFn =
-      [&](CountryId const & countryId, downloader::Progress const & /* progress */)
-      {
-        TEST_EQUAL(countryId, kCountryId, ());
+    auto const onProgressFn = [&](CountryId const & countryId, downloader::Progress const & /* progress */)
+    {
+      TEST_EQUAL(countryId, kCountryId, ());
 
-        if (onProgressIsCalled)
-          return;
+      if (onProgressIsCalled)
+        return;
 
-        onProgressIsCalled = true;
-        storage.GetNodeAttrs(kCountryId, onProgressAttrs);
-        testing::StopEventLoop();
-      };
+      onProgressIsCalled = true;
+      storage.GetNodeAttrs(kCountryId, onProgressAttrs);
+      testing::StopEventLoop();
+    };
 
     InitStorage(storage, onProgressFn);
     storage.Init([](CountryId const &, storage::LocalFilePtr const localCountryFile)
-                 {
-                   TEST_EQUAL(localCountryFile->GetCountryName(), kCountryId, ());
+    {
+      TEST_EQUAL(localCountryFile->GetCountryName(), kCountryId, ());
 
-                   testing::StopEventLoop();
-                 },
-                 [](CountryId const &, storage::LocalFilePtr const)
-                 {
-                   return false;
-                 });
+      testing::StopEventLoop();
+    }, [](CountryId const &, storage::LocalFilePtr const) { return false; });
 
     testing::RunEventLoop();
 
@@ -191,7 +188,8 @@ UNIT_CLASS_TEST(Runner, DownloadIntegrity_Test)
 
       Storage storage(COUNTRIES_FILE);
 
-      auto onProgressFn = [i, j](CountryId const & countryId, LocalAndRemoteSize const & mapSize) {
+      auto onProgressFn = [i, j](CountryId const & countryId, LocalAndRemoteSize const & mapSize)
+      {
         TEST_EQUAL(countryId, kCountryId, ());
         auto progress = static_cast<double>(mapSize.first) / mapSize.second;
         auto interruptionProgress =
diff --git a/libs/storage/storage_integration_tests/storage_group_download_tests.cpp b/libs/storage/storage_integration_tests/storage_group_download_tests.cpp
index 09aee12e8..ccfe1a836 100644
--- a/libs/storage/storage_integration_tests/storage_group_download_tests.cpp
+++ b/libs/storage/storage_integration_tests/storage_group_download_tests.cpp
@@ -24,7 +24,7 @@ using namespace std;
 using namespace storage;
 
 CountryId const kGroupCountryId = "Venezuela";
-CountriesSet const kLeafCountriesIds = { "Venezuela_North", "Venezuela_South" };
+CountriesSet const kLeafCountriesIds = {"Venezuela_North", "Venezuela_South"};
 
 string GetMwmFilePath(string const & version, CountryId const & countryId)
 {
@@ -33,9 +33,8 @@ string GetMwmFilePath(string const & version, CountryId const & countryId)
 
 string GetMwmDownloadingFilePath(string const & version, CountryId const & countryId)
 {
-  return base::JoinPath(
-      GetPlatform().WritableDir(), version,
-      countryId + DATA_FILE_EXTENSION READY_FILE_EXTENSION DOWNLOADING_FILE_EXTENSION);
+  return base::JoinPath(GetPlatform().WritableDir(), version,
+                        countryId + DATA_FILE_EXTENSION READY_FILE_EXTENSION DOWNLOADING_FILE_EXTENSION);
 }
 
 string GetMwmResumeFilePath(string const & version, CountryId const & countryId)
@@ -55,13 +54,12 @@ void DownloadGroup(Storage & storage, bool oneByOne)
   //  All nodes in subtree (including the root) for the group node.
   storage.GetChildren(kGroupCountryId, children);
   CountriesSet subTree;
-  storage.ForEachInSubtree(kGroupCountryId,
-                           [&subTree](CountryId const & descendantId, bool /* groupNode */) {
-                             subTree.insert(descendantId);
-                           });
+  storage.ForEachInSubtree(kGroupCountryId, [&subTree](CountryId const & descendantId, bool /* groupNode */)
+  { subTree.insert(descendantId); });
 
   CountriesSet changed;
-  auto onChangeCountryFn = [&](CountryId const & countryId) {
+  auto onChangeCountryFn = [&](CountryId const & countryId)
+  {
     TEST(subTree.find(countryId) != subTree.end(), (countryId));
     changed.insert(countryId);
     if (!storage.IsDownloadInProgress())
@@ -72,12 +70,13 @@ void DownloadGroup(Storage & storage, bool oneByOne)
   };
 
   CountriesSet downloadedChecker;
-  auto onProgressFn = [&](CountryId const & countryId, downloader::Progress const & progress) {
+  auto onProgressFn = [&](CountryId const & countryId, downloader::Progress const & progress)
+  {
     TEST(subTree.find(countryId) != subTree.end(), ());
     if (progress.m_bytesDownloaded == progress.m_bytesTotal)
     {
       auto const res = downloadedChecker.insert(countryId);
-      TEST_EQUAL(res.second, true, ()); // Every child is downloaded only once.
+      TEST_EQUAL(res.second, true, ());  // Every child is downloaded only once.
     }
   };
 
@@ -124,14 +123,10 @@ void DownloadGroup(Storage & storage, bool oneByOne)
 
   // Download the group.
   if (oneByOne)
-  {
     for (auto const & countryId : children)
       storage.DownloadNode(countryId);
-  }
   else
-  {
     storage.DownloadNode(kGroupCountryId);
-  }
   // Wait for downloading of all children.
   testing::RunEventLoop();
 
@@ -169,8 +164,7 @@ void DownloadGroup(Storage & storage, bool oneByOne)
 
   // Check all group children are downloaded.
   storage.GetChildrenInGroups(kGroupCountryId, downloaded, available);
-  TEST_EQUAL(CountriesSet(children.begin(), children.end()),
-             CountriesSet(downloaded.begin(), downloaded.end()), ());
+  TEST_EQUAL(CountriesSet(children.begin(), children.end()), CountriesSet(downloaded.begin(), downloaded.end()), ());
 
   storage.Unsubscribe(subsrcibtionId);
 }
@@ -205,14 +199,10 @@ void DeleteGroup(Storage & storage, bool oneByOne)
 
   // Delete the group
   if (oneByOne)
-  {
     for (auto const & countryId : children)
       storage.DeleteNode(countryId);
-  }
   else
-  {
     storage.DeleteNode(kGroupCountryId);
-  }
 
   // Check state for the group node is set to NotDownloaded and NoError.
   NodeAttrs attrs;
@@ -251,7 +241,8 @@ void TestDownloadDelete(bool downloadOneByOne, bool deleteOneByOne)
   Storage storage;
   string const version = strings::to_string(storage.GetCurrentDataVersion());
 
-  auto onUpdatedFn = [&](CountryId const &, storage::LocalFilePtr const localCountryFile) {
+  auto onUpdatedFn = [&](CountryId const &, storage::LocalFilePtr const localCountryFile)
+  {
     CountryId const countryId = localCountryFile->GetCountryName();
     TEST(kLeafCountriesIds.find(countryId) != kLeafCountriesIds.end(), ());
   };
@@ -291,4 +282,4 @@ UNIT_TEST(SmallMwms_GroupDownloadDelete_Test4)
 {
   TestDownloadDelete(true, true);
 }
-} // namespace storage_group_download_tests
+}  // namespace storage_group_download_tests
diff --git a/libs/storage/storage_integration_tests/storage_http_tests.cpp b/libs/storage/storage_integration_tests/storage_http_tests.cpp
index 1d16a9d94..c5d5c5a07 100644
--- a/libs/storage/storage_integration_tests/storage_http_tests.cpp
+++ b/libs/storage/storage_integration_tests/storage_http_tests.cpp
@@ -43,22 +43,21 @@ string const GetMwmFullPath(string const & countryId, string const & version)
 
 string const GetDownloadingFullPath(string const & countryId, string const & version)
 {
-  return base::JoinPath(
-      GetPlatform().WritableDir(), version,
-      kCountryId + DATA_FILE_EXTENSION READY_FILE_EXTENSION DOWNLOADING_FILE_EXTENSION);
+  return base::JoinPath(GetPlatform().WritableDir(), version,
+                        kCountryId + DATA_FILE_EXTENSION READY_FILE_EXTENSION DOWNLOADING_FILE_EXTENSION);
 }
 
 string const GetResumeFullPath(string const & countryId, string const & version)
 {
-  return base::JoinPath(
-      GetPlatform().WritableDir(), version,
-      kCountryId + DATA_FILE_EXTENSION READY_FILE_EXTENSION RESUME_FILE_EXTENSION);
+  return base::JoinPath(GetPlatform().WritableDir(), version,
+                        kCountryId + DATA_FILE_EXTENSION READY_FILE_EXTENSION RESUME_FILE_EXTENSION);
 }
 
 void InitStorage(Storage & storage, Storage::UpdateCallback const & didDownload,
                  Storage::ProgressFunction const & progress)
 {
-  auto const changeCountryFunction = [&](CountryId const & /* countryId */) {
+  auto const changeCountryFunction = [&](CountryId const & /* countryId */)
+  {
     if (!storage.IsDownloadInProgress())
     {
       // End wait for downloading complete.
@@ -76,11 +75,10 @@ class StorageHttpTest
 {
 public:
   StorageHttpTest()
-    : m_writableDirChanger(kMapTestDir),
-      m_version(strings::to_string(m_storage.GetCurrentDataVersion())),
-      m_cleanupVersionDir(m_version)
-  {
-  }
+    : m_writableDirChanger(kMapTestDir)
+    , m_version(strings::to_string(m_storage.GetCurrentDataVersion()))
+    , m_cleanupVersionDir(m_version)
+  {}
 
 protected:
   WritableDirChanger const m_writableDirChanger;
@@ -91,15 +89,13 @@ protected:
 
 UNIT_CLASS_TEST(StorageHttpTest, StorageDownloadNodeAndDeleteNode)
 {
-  auto const progressFunction = [this](CountryId const & countryId,
-                                       downloader::Progress const & progress) {
+  auto const progressFunction = [this](CountryId const & countryId, downloader::Progress const & progress)
+  {
     NodeAttrs nodeAttrs;
     m_storage.GetNodeAttrs(countryId, nodeAttrs);
 
-    TEST_EQUAL(progress.m_bytesDownloaded,
-               nodeAttrs.m_downloadingProgress.m_bytesDownloaded, (countryId));
-    TEST_EQUAL(progress.m_bytesTotal,
-               nodeAttrs.m_downloadingProgress.m_bytesTotal, (countryId));
+    TEST_EQUAL(progress.m_bytesDownloaded, nodeAttrs.m_downloadingProgress.m_bytesDownloaded, (countryId));
+    TEST_EQUAL(progress.m_bytesTotal, nodeAttrs.m_downloadingProgress.m_bytesTotal, (countryId));
     TEST_EQUAL(countryId, kCountryId, (countryId));
   };
 
@@ -132,15 +128,13 @@ UNIT_CLASS_TEST(StorageHttpTest, StorageDownloadNodeAndDeleteNode)
 
 UNIT_CLASS_TEST(StorageHttpTest, StorageDownloadAndDeleteDisputedNode)
 {
-  auto const progressFunction = [this](CountryId const & countryId,
-                                       downloader::Progress const & progress) {
+  auto const progressFunction = [this](CountryId const & countryId, downloader::Progress const & progress)
+  {
     NodeAttrs nodeAttrs;
     m_storage.GetNodeAttrs(countryId, nodeAttrs);
 
-    TEST_EQUAL(progress.m_bytesDownloaded,
-               nodeAttrs.m_downloadingProgress.m_bytesDownloaded, (countryId));
-    TEST_EQUAL(progress.m_bytesTotal,
-               nodeAttrs.m_downloadingProgress.m_bytesTotal, (countryId));
+    TEST_EQUAL(progress.m_bytesDownloaded, nodeAttrs.m_downloadingProgress.m_bytesDownloaded, (countryId));
+    TEST_EQUAL(progress.m_bytesTotal, nodeAttrs.m_downloadingProgress.m_bytesTotal, (countryId));
   };
 
   InitStorage(m_storage, UpdateWithoutChecks, progressFunction);
@@ -168,8 +162,7 @@ UNIT_CLASS_TEST(StorageHttpTest, StorageDownloadAndDeleteDisputedNode)
   CountriesVec availChildren;
   m_storage.GetChildrenInGroups(m_storage.GetRootId(), downloadedChildren, availChildren);
 
-  CountriesVec const expectedDownloadedChildren = {"Argentina", kDisputedCountryId2,
-                                                   kDisputedCountryId1};
+  CountriesVec const expectedDownloadedChildren = {"Argentina", kDisputedCountryId2, kDisputedCountryId1};
   TEST_EQUAL(downloadedChildren, expectedDownloadedChildren, ());
   TEST_EQUAL(availChildren.size(), 223, ());
 
diff --git a/libs/storage/storage_integration_tests/storage_update_tests.cpp b/libs/storage/storage_integration_tests/storage_update_tests.cpp
index b2a760768..dd9214fbf 100644
--- a/libs/storage/storage_integration_tests/storage_update_tests.cpp
+++ b/libs/storage/storage_integration_tests/storage_update_tests.cpp
@@ -30,24 +30,21 @@ static FrameworkParams const kFrameworkParams(false /* m_enableDiffs */);
 string const kCountriesTxtFile = COUNTRIES_FILE;
 
 string const kMwmVersion1 = "190830";
-//size_t const kCountriesTxtFileSize1 = 420632;
+// size_t const kCountriesTxtFileSize1 = 420632;
 
 string const kMwmVersion2 = "190910";
-//size_t const kCountriesTxtFileSize2 = 420634;
+// size_t const kCountriesTxtFileSize2 = 420634;
 
 string const kGroupCountryId = "Belarus";
 
-bool DownloadFile(string const & url,
-                  string const & filePath,
-                  size_t fileSize)
+bool DownloadFile(string const & url, string const & filePath, size_t fileSize)
 {
   using namespace downloader;
 
   DownloadStatus httpStatus;
   bool finished = false;
 
-  unique_ptr<HttpRequest> request(HttpRequest::GetFile({url}, filePath, fileSize,
-                                  [&](HttpRequest & request)
+  unique_ptr<HttpRequest> request(HttpRequest::GetFile({url}, filePath, fileSize, [&](HttpRequest & request)
   {
     DownloadStatus const s = request.GetStatus();
     if (s != DownloadStatus::InProgress)
diff --git a/libs/storage/storage_tests/countries_tests.cpp b/libs/storage/storage_tests/countries_tests.cpp
index 4478a6ca9..4cf2b971b 100644
--- a/libs/storage/storage_tests/countries_tests.cpp
+++ b/libs/storage/storage_tests/countries_tests.cpp
@@ -9,6 +9,6 @@
 UNIT_TEST(CalculateWorldSHA)
 {
   auto const path = GetPlatform().ResourcesDir();
-  for (char const * country : { WORLD_FILE_NAME, WORLD_COASTS_FILE_NAME })
+  for (char const * country : {WORLD_FILE_NAME, WORLD_COASTS_FILE_NAME})
     LOG(LINFO, (country, coding::SHA1::CalculateBase64(path + country + DATA_FILE_EXTENSION)));
 }
diff --git a/libs/storage/storage_tests/country_info_getter_tests.cpp b/libs/storage/storage_tests/country_info_getter_tests.cpp
index 5e618f791..bf1597e47 100644
--- a/libs/storage/storage_tests/country_info_getter_tests.cpp
+++ b/libs/storage/storage_tests/country_info_getter_tests.cpp
@@ -45,7 +45,8 @@ class RandomPointGenerator
 {
 public:
   explicit RandomPointGenerator(mt19937 & randomEngine, vector<m2::RegionD> const & regions)
-    : m_randomEngine(randomEngine), m_regions(regions)
+    : m_randomEngine(randomEngine)
+    , m_regions(regions)
   {
     CHECK(!m_regions.empty(), ());
     vector<double> areas(m_regions.size());
@@ -102,36 +103,28 @@ UNIT_TEST(CountryInfoGetter_GetRegionsCountryIdByRect_Smoke)
 
   // Single mwm.
   m2::PointD const halfSize = m2::PointD(0.1, 0.1);
-  auto const countries =
-      getter->GetRegionsCountryIdByRect(m2::RectD(p - halfSize, p + halfSize), false /* rough */);
+  auto const countries = getter->GetRegionsCountryIdByRect(m2::RectD(p - halfSize, p + halfSize), false /* rough */);
   TEST_EQUAL(countries, vector<storage::CountryId>{"Russia_Bryansk Oblast"}, ());
 
   // Several countries.
   m2::PointD const halfSize2 = m2::PointD(0.5, 0.5);
-  auto const countries2 =
-      getter->GetRegionsCountryIdByRect(m2::RectD(p - halfSize2, p + halfSize2), false /* rough */);
-  auto const expected = vector<storage::CountryId>{
-      "Belarus_Homiel Region", "Russia_Bryansk Oblast", "Ukraine_Chernihiv Oblast"};
+  auto const countries2 = getter->GetRegionsCountryIdByRect(m2::RectD(p - halfSize2, p + halfSize2), false /* rough */);
+  auto const expected =
+      vector<storage::CountryId>{"Belarus_Homiel Region", "Russia_Bryansk Oblast", "Ukraine_Chernihiv Oblast"};
   TEST_EQUAL(countries2, expected, ());
 
   // No one found.
-  auto const countries3 =
-      getter->GetRegionsCountryIdByRect(m2::RectD(-halfSize, halfSize), false /* rough */);
+  auto const countries3 = getter->GetRegionsCountryIdByRect(m2::RectD(-halfSize, halfSize), false /* rough */);
   TEST_EQUAL(countries3, vector<storage::CountryId>{}, ());
 
   // Inside mwm (rough).
-  auto const countries4 =
-      getter->GetRegionsCountryIdByRect(m2::RectD(p - halfSize, p + halfSize), true /* rough */);
+  auto const countries4 = getter->GetRegionsCountryIdByRect(m2::RectD(p - halfSize, p + halfSize), true /* rough */);
   TEST_EQUAL(countries, vector<storage::CountryId>{"Russia_Bryansk Oblast"}, ());
 
   // Several countries (rough).
-  auto const countries5 =
-      getter->GetRegionsCountryIdByRect(m2::RectD(p - halfSize2, p + halfSize2), true /* rough */);
-  auto const expected2 = vector<storage::CountryId>{"Belarus_Homiel Region",
-                                                    "Belarus_Maglieu Region",
-                                                    "Russia_Bryansk Oblast",
-                                                    "Ukraine_Chernihiv Oblast",
-                                                    "US_Alaska"};
+  auto const countries5 = getter->GetRegionsCountryIdByRect(m2::RectD(p - halfSize2, p + halfSize2), true /* rough */);
+  auto const expected2 = vector<storage::CountryId>{"Belarus_Homiel Region", "Belarus_Maglieu Region",
+                                                    "Russia_Bryansk Oblast", "Ukraine_Chernihiv Oblast", "US_Alaska"};
   TEST_EQUAL(countries5, expected2, ());
 }
 
@@ -180,8 +173,7 @@ UNIT_TEST(CountryInfoGetter_HitsOnLongLine)
   CountriesVec results;
   getter->GetRegionsCountryId(mercator::FromLatLon(62.2507, -102.0753), results);
   TEST_EQUAL(results.size(), 2, ());
-  TEST(find(results.begin(), results.end(), "Canada_Northwest Territories_East") != results.end(),
-       ());
+  TEST(find(results.begin(), results.end(), "Canada_Northwest Territories_East") != results.end(), ());
   TEST(find(results.begin(), results.end(), "Canada_Nunavut_South") != results.end(), ());
 }
 
@@ -191,8 +183,7 @@ UNIT_TEST(CountryInfoGetter_HitsInTheMiddleOfNowhere)
   CountriesVec results;
   getter->GetRegionsCountryId(mercator::FromLatLon(62.2900, -103.9423), results);
   TEST_EQUAL(results.size(), 1, ());
-  TEST(find(results.begin(), results.end(), "Canada_Northwest Territories_East") != results.end(),
-       ());
+  TEST(find(results.begin(), results.end(), "Canada_Northwest Territories_East") != results.end(), ());
 }
 
 UNIT_TEST(CountryInfoGetter_BorderRelations)
@@ -200,11 +191,9 @@ UNIT_TEST(CountryInfoGetter_BorderRelations)
   auto const getter = CreateCountryInfoGetter();
 
   ms::LatLon labels[] = {
-    {42.4318876, -8.6431592}, {42.6075172, -8.4714942},
-    {42.3436415, -7.8674242}, {42.1968459, -7.6114105},
-    {43.0118437, -7.5565749}, {43.0462247, -7.4739921},
-    {43.3709703, -8.3959425}, {43.0565609, -8.5296941},
-    {27.0006968, 49.6532161},
+      {42.4318876, -8.6431592}, {42.6075172, -8.4714942}, {42.3436415, -7.8674242},
+      {42.1968459, -7.6114105}, {43.0118437, -7.5565749}, {43.0462247, -7.4739921},
+      {43.3709703, -8.3959425}, {43.0565609, -8.5296941}, {27.0006968, 49.6532161},
   };
 
   for (auto const & ll : labels)
@@ -221,8 +210,8 @@ UNIT_TEST(CountryInfoGetter_GetLimitRectForLeafSingleMwm)
   Storage storage;
 
   m2::RectD const boundingBox = getter->GetLimitRectForLeaf("Angola");
-  m2::RectD const expectedBoundingBox = {9.205259 /* minX */, -18.34456 /* minY */,
-                                         24.08212 /* maxX */, -4.393187 /* maxY */};
+  m2::RectD const expectedBoundingBox = {9.205259 /* minX */, -18.34456 /* minY */, 24.08212 /* maxX */,
+                                         -4.393187 /* maxY */};
 
   TEST(AlmostEqualAbs(boundingBox, expectedBoundingBox, kRectCompareEpsilon), ());
 }
@@ -263,10 +252,7 @@ UNIT_TEST(CountryInfoGetter_Countries_And_Polygons)
 
   // Set is used here because disputed territories may occur as leaves several times.
   set<CountryId> storageLeaves;
-  storage.ForEachCountry([&](Country const & country)
-  {
-    storageLeaves.insert(country.Name());
-  });
+  storage.ForEachCountry([&](Country const & country) { storageLeaves.insert(country.Name()); });
 
   TEST_EQUAL(countries.size(), storageLeaves.size(), ());
 
@@ -312,10 +298,8 @@ BENCHMARK_TEST(CountryInfoGetter_RegionsByRect)
 
   size_t totalPoints = 0;
   for (auto const & regs : allRegions)
-  {
     for (auto const & reg : regs)
       totalPoints += reg.Size();
-  }
   LOG(LINFO, ("Total points:", totalPoints));
 
   {
@@ -379,8 +363,7 @@ BENCHMARK_TEST(CountryInfoGetter_RegionsByRect)
         longest = countryId;
     }
 
-    LOG(LINFO, ("Slowest country for CountryInfoGetter (random point)", longest,
-                avgTimeByCountry[longest]));
+    LOG(LINFO, ("Slowest country for CountryInfoGetter (random point)", longest, avgTimeByCountry[longest]));
   }
 
   {
@@ -420,8 +403,7 @@ BENCHMARK_TEST(CountryInfoGetter_RegionsByRect)
       if (longest.empty() || avgTimeByCountry[longest] < avgTimeByCountry[countryId])
         longest = countryId;
     }
-    LOG(LINFO, ("Slowest country for CountryInfoGetter (point on a random side)", longest,
-                avgTimeByCountry[longest]));
+    LOG(LINFO, ("Slowest country for CountryInfoGetter (point on a random side)", longest, avgTimeByCountry[longest]));
   }
 }
-}  // namespace country_info_getter_tests
\ No newline at end of file
+}  // namespace country_info_getter_tests
diff --git a/libs/storage/storage_tests/downloader_tests.cpp b/libs/storage/storage_tests/downloader_tests.cpp
index ef2efec3a..e5a659877 100644
--- a/libs/storage/storage_tests/downloader_tests.cpp
+++ b/libs/storage/storage_tests/downloader_tests.cpp
@@ -11,9 +11,7 @@ namespace downloader_tests
 
 class DownloaderStub : public storage::MapFilesDownloaderWithPing
 {
-  virtual void Download(storage::QueuedCountry && queuedCountry)
-  {
-  }
+  virtual void Download(storage::QueuedCountry && queuedCountry) {}
 };
 
 UNIT_TEST(GetMetaConfig)
@@ -32,4 +30,4 @@ UNIT_TEST(GetMetaConfig)
   });
 }
 
-} // namespace downloader_tests
+}  // namespace downloader_tests
diff --git a/libs/storage/storage_tests/fake_map_files_downloader.cpp b/libs/storage/storage_tests/fake_map_files_downloader.cpp
index 2d129d77f..efc664997 100644
--- a/libs/storage/storage_tests/fake_map_files_downloader.cpp
+++ b/libs/storage/storage_tests/fake_map_files_downloader.cpp
@@ -13,13 +13,15 @@ namespace storage
 {
 int64_t const FakeMapFilesDownloader::kBlockSize;
 
-FakeMapFilesDownloader::FakeMapFilesDownloader(TaskRunner & taskRunner)
-  : m_timestamp(0), m_taskRunner(taskRunner)
+FakeMapFilesDownloader::FakeMapFilesDownloader(TaskRunner & taskRunner) : m_timestamp(0), m_taskRunner(taskRunner)
 {
   SetServersList({"http://test-url/"});
 }
 
-FakeMapFilesDownloader::~FakeMapFilesDownloader() { CHECK_THREAD_CHECKER(m_checker, ()); }
+FakeMapFilesDownloader::~FakeMapFilesDownloader()
+{
+  CHECK_THREAD_CHECKER(m_checker, ());
+}
 
 void FakeMapFilesDownloader::Download(QueuedCountry && queuedCountry)
 {
diff --git a/libs/storage/storage_tests/fake_map_files_downloader.hpp b/libs/storage/storage_tests/fake_map_files_downloader.hpp
index 423f850ab..e4aa40e68 100644
--- a/libs/storage/storage_tests/fake_map_files_downloader.hpp
+++ b/libs/storage/storage_tests/fake_map_files_downloader.hpp
@@ -45,8 +45,7 @@ private:
 
   void Download();
   void DownloadNextChunk(uint64_t requestId);
-  void OnFileDownloaded(QueuedCountry const & queuedCountry,
-                        downloader::DownloadStatus const & status);
+  void OnFileDownloaded(QueuedCountry const & queuedCountry, downloader::DownloadStatus const & status);
 
   downloader::Progress m_progress;
 
diff --git a/libs/storage/storage_tests/helpers.hpp b/libs/storage/storage_tests/helpers.hpp
index 1c3beaef8..1875dc0c9 100644
--- a/libs/storage/storage_tests/helpers.hpp
+++ b/libs/storage/storage_tests/helpers.hpp
@@ -10,4 +10,4 @@ class CountryInfoGetter;
 
 std::unique_ptr<CountryInfoGetter> CreateCountryInfoGetter();
 
-} // namespace storage
+}  // namespace storage
diff --git a/libs/storage/storage_tests/storage_tests.cpp b/libs/storage/storage_tests/storage_tests.cpp
index 4584ae897..471711762 100644
--- a/libs/storage/storage_tests/storage_tests.cpp
+++ b/libs/storage/storage_tests/storage_tests.cpp
@@ -71,8 +71,7 @@ public:
 class SometimesFailingDownloadingPolicy : public DownloadingPolicy
 {
 public:
-  explicit SometimesFailingDownloadingPolicy(vector<uint64_t> const & failedRequests)
-    : m_failedRequests(failedRequests)
+  explicit SometimesFailingDownloadingPolicy(vector<uint64_t> const & failedRequests) : m_failedRequests(failedRequests)
   {
     std::sort(m_failedRequests.begin(), m_failedRequests.end());
   }
@@ -91,7 +90,8 @@ private:
 
 string const kCountriesTxt = string(R"({
            "id": "Countries",
-           "v": )" + strings::to_string(version::FOR_TESTING_MWM1) + R"(,
+           "v": )" + strings::to_string(version::FOR_TESTING_MWM1) +
+                                    R"(,
            "g": [
                {
                 "id": "Abkhazia",
@@ -235,9 +235,8 @@ public:
     , m_currStatus(0)
     , m_transitionList(transitionList)
   {
-    m_slot = m_storage.Subscribe(
-        bind(&CountryDownloaderChecker::OnCountryStatusChanged, this, _1),
-        bind(&CountryDownloaderChecker::OnCountryDownloadingProgress, this, _1, _2));
+    m_slot = m_storage.Subscribe(bind(&CountryDownloaderChecker::OnCountryStatusChanged, this, _1),
+                                 bind(&CountryDownloaderChecker::OnCountryDownloadingProgress, this, _1, _2));
     TEST(storage.IsLeaf(countryId), (m_countryFile));
     TEST(!m_transitionList.empty(), (m_countryFile));
   }
@@ -263,35 +262,32 @@ protected:
       return;
 
     Status const nexStatus = m_storage.CountryStatusEx(m_countryId);
-    LOG(LINFO, (m_countryFile, "status transition: from", m_transitionList[m_currStatus], "to",
-                nexStatus));
+    LOG(LINFO, (m_countryFile, "status transition: from", m_transitionList[m_currStatus], "to", nexStatus));
     TEST_LESS(m_currStatus + 1, m_transitionList.size(), (m_countryFile));
     TEST_EQUAL(nexStatus, m_transitionList[m_currStatus + 1], (m_countryFile));
     ++m_currStatus;
-    if (m_transitionList[m_currStatus] == Status::Downloading ||
-        m_transitionList[m_currStatus] == Status::InQueue)
+    if (m_transitionList[m_currStatus] == Status::Downloading || m_transitionList[m_currStatus] == Status::InQueue)
     {
       LocalAndRemoteSize localAndRemoteSize = m_storage.CountrySizeInBytes(m_countryId);
       m_totalBytesToDownload = localAndRemoteSize.second;
     }
   }
 
-  virtual void OnCountryDownloadingProgress(CountryId const & countryId,
-                                            downloader::Progress const & progress)
+  virtual void OnCountryDownloadingProgress(CountryId const & countryId, downloader::Progress const & progress)
   {
     if (countryId != m_countryId)
       return;
 
     LOG(LINFO, (m_countryFile, "downloading progress:", progress));
 
-    TEST_GREATER(progress.m_bytesDownloaded, static_cast<
-                 decltype(progress.m_bytesDownloaded)>(m_bytesDownloaded), (m_countryFile));
+    TEST_GREATER(progress.m_bytesDownloaded, static_cast<decltype(progress.m_bytesDownloaded)>(m_bytesDownloaded),
+                 (m_countryFile));
     m_bytesDownloaded = progress.m_bytesDownloaded;
     TEST_LESS_OR_EQUAL(m_bytesDownloaded, m_totalBytesToDownload, (m_countryFile));
 
     LocalAndRemoteSize localAndRemoteSize = m_storage.CountrySizeInBytes(m_countryId);
-    TEST_EQUAL(static_cast<decltype(localAndRemoteSize.second)>(m_totalBytesToDownload),
-               localAndRemoteSize.second, (m_countryFile));
+    TEST_EQUAL(static_cast<decltype(localAndRemoteSize.second)>(m_totalBytesToDownload), localAndRemoteSize.second,
+               (m_countryFile));
   }
 
   Storage & m_storage;
@@ -309,27 +305,22 @@ protected:
 class CancelDownloadingWhenAlmostDoneChecker : public CountryDownloaderChecker
 {
 public:
-  CancelDownloadingWhenAlmostDoneChecker(Storage & storage, CountryId const & countryId,
-                                         TaskRunner & runner)
+  CancelDownloadingWhenAlmostDoneChecker(Storage & storage, CountryId const & countryId, TaskRunner & runner)
     : CountryDownloaderChecker(
           storage, countryId, MapFileType::Map,
           vector<Status>{Status::NotDownloaded, Status::InQueue, Status::Downloading, Status::NotDownloaded})
     , m_runner(runner)
-  {
-  }
+  {}
 
 protected:
   // CountryDownloaderChecker overrides:
-  void OnCountryDownloadingProgress(CountryId const & countryId,
-                                    downloader::Progress const & progress) override
+  void OnCountryDownloadingProgress(CountryId const & countryId, downloader::Progress const & progress) override
   {
     CountryDownloaderChecker::OnCountryDownloadingProgress(countryId, progress);
 
     // Cancel downloading when almost done.
     if (progress.m_bytesDownloaded + 2 * FakeMapFilesDownloader::kBlockSize >= progress.m_bytesTotal)
-    {
       m_runner.PostTask([&]() { m_storage.CancelDownloadNode(m_countryId); });
-    }
   }
 
   TaskRunner & m_runner;
@@ -337,8 +328,8 @@ protected:
 
 // Checks following state transitions:
 // NotDownloaded -> Downloading -> OnDisk.
-unique_ptr<CountryDownloaderChecker> AbsentCountryDownloaderChecker(
-    Storage & storage, CountryId const & countryId, MapFileType type)
+unique_ptr<CountryDownloaderChecker> AbsentCountryDownloaderChecker(Storage & storage, CountryId const & countryId,
+                                                                    MapFileType type)
 {
   return make_unique<CountryDownloaderChecker>(
       storage, countryId, type,
@@ -347,8 +338,8 @@ unique_ptr<CountryDownloaderChecker> AbsentCountryDownloaderChecker(
 
 // Checks following state transitions:
 // NotDownloaded -> Downloading -> NotDownloaded.
-unique_ptr<CountryDownloaderChecker> CancelledCountryDownloaderChecker(
-    Storage & storage, CountryId const & countryId, MapFileType type)
+unique_ptr<CountryDownloaderChecker> CancelledCountryDownloaderChecker(Storage & storage, CountryId const & countryId,
+                                                                       MapFileType type)
 {
   return make_unique<CountryDownloaderChecker>(
       storage, countryId, type,
@@ -359,11 +350,13 @@ class CountryStatusChecker
 {
 public:
   CountryStatusChecker(Storage & storage, CountryId const & countryId, Status status)
-    : m_storage(storage), m_countryId(countryId), m_status(status), m_triggered(false)
+    : m_storage(storage)
+    , m_countryId(countryId)
+    , m_status(status)
+    , m_triggered(false)
   {
-    m_slot = m_storage.Subscribe(
-        std::bind(&CountryStatusChecker::OnCountryStatusChanged, this, _1),
-        std::bind(&CountryStatusChecker::OnCountryDownloadingProgress, this, _1, _2));
+    m_slot = m_storage.Subscribe(std::bind(&CountryStatusChecker::OnCountryStatusChanged, this, _1),
+                                 std::bind(&CountryStatusChecker::OnCountryDownloadingProgress, this, _1, _2));
   }
 
   ~CountryStatusChecker()
@@ -383,8 +376,7 @@ private:
     m_triggered = true;
   }
 
-  void OnCountryDownloadingProgress(CountryId const & /* countryId */,
-                                    downloader::Progress const & /* progress */)
+  void OnCountryDownloadingProgress(CountryId const & /* countryId */, downloader::Progress const & /* progress */)
   {
     TEST(false, ("Unexpected country downloading progress."));
   }
@@ -400,7 +392,9 @@ class FailedDownloadingWaiter
 {
 public:
   FailedDownloadingWaiter(Storage & storage, CountryId const & countryId)
-    : m_storage(storage), m_countryId(countryId), m_finished(false)
+    : m_storage(storage)
+    , m_countryId(countryId)
+    , m_finished(false)
   {
     m_slot = m_storage.Subscribe(std::bind(&FailedDownloadingWaiter::OnStatusChanged, this, _1),
                                  std::bind(&FailedDownloadingWaiter::OnProgress, this, _1, _2));
@@ -415,10 +409,7 @@ public:
   void Wait()
   {
     std::unique_lock<std::mutex> lock(m_mu);
-    m_cv.wait(lock, [this]()
-    {
-      return m_finished;
-    });
+    m_cv.wait(lock, [this]() { return m_finished; });
   }
 
   void OnStatusChanged(CountryId const & countryId)
@@ -454,8 +445,7 @@ void OnCountryDownloaded(CountryId const & countryId, LocalFilePtr const localFi
 
 LocalFilePtr CreateDummyMapFile(CountryFile const & countryFile, int64_t version, uint64_t size)
 {
-  LocalFilePtr localFile =
-      PreparePlaceForCountryFiles(version, string() /* dataDir */, countryFile);
+  LocalFilePtr localFile = PreparePlaceForCountryFiles(version, string() /* dataDir */, countryFile);
   TEST(localFile.get(), ("Can't prepare place for", countryFile, "(version", version, ")"));
   {
     string const zeroes(size, '\0');
@@ -468,8 +458,7 @@ LocalFilePtr CreateDummyMapFile(CountryFile const & countryFile, int64_t version
   return localFile;
 }
 
-void InitStorage(Storage & storage, TaskRunner & runner,
-                 Storage::UpdateCallback const & update = &OnCountryDownloaded)
+void InitStorage(Storage & storage, TaskRunner & runner, Storage::UpdateCallback const & update = &OnCountryDownloaded)
 {
   storage.Clear();
   storage.Init(update, [](CountryId const &, LocalFilePtr const) { return false; });
@@ -495,7 +484,8 @@ UNIT_TEST(StorageTest_ParseIndexFile)
   Storage storage;
 
   TEST_EQUAL(storage.ParseIndexAndGetDataVersion(R"([ { "21010101" : 210317 } ])"), 210317, ());
-  TEST_EQUAL(storage.ParseIndexAndGetDataVersion(R"([ { "21010101" : 210317 }, { "21041001" : 210409 } ])"), 210409, ());
+  TEST_EQUAL(storage.ParseIndexAndGetDataVersion(R"([ { "21010101" : 210317 }, { "21041001" : 210409 } ])"), 210409,
+             ());
 
   // Invalid jsons
   TEST_EQUAL(storage.ParseIndexAndGetDataVersion(R"([ { "21010101" : 210317 })"), 0, ());
@@ -523,8 +513,7 @@ UNIT_CLASS_TEST(StorageTest, CountryDownloading)
   storage.DeleteCountry(azerbaijanCountryId, MapFileType::Map);
 
   {
-    SCOPE_GUARD(cleanupCountryFiles,
-                bind(&Storage::DeleteCountry, &storage, azerbaijanCountryId, MapFileType::Map));
+    SCOPE_GUARD(cleanupCountryFiles, bind(&Storage::DeleteCountry, &storage, azerbaijanCountryId, MapFileType::Map));
     unique_ptr<CountryDownloaderChecker> checker =
         AbsentCountryDownloaderChecker(storage, azerbaijanCountryId, MapFileType::Map);
     checker->StartDownload();
@@ -532,8 +521,7 @@ UNIT_CLASS_TEST(StorageTest, CountryDownloading)
   }
 
   {
-    SCOPE_GUARD(cleanupCountryFiles,
-                bind(&Storage::DeleteCountry, &storage, azerbaijanCountryId, MapFileType::Map));
+    SCOPE_GUARD(cleanupCountryFiles, bind(&Storage::DeleteCountry, &storage, azerbaijanCountryId, MapFileType::Map));
     unique_ptr<CountryDownloaderChecker> checker =
         AbsentCountryDownloaderChecker(storage, azerbaijanCountryId, MapFileType::Map);
     checker->StartDownload();
@@ -619,8 +607,7 @@ UNIT_CLASS_TEST(StorageTest, CancelDownloadingWhenAlmostDone)
 UNIT_CLASS_TEST(StorageTest, DeleteCountry)
 {
   tests_support::ScopedFile map("Wonderland.mwm", ScopedFile::Mode::Create);
-  LocalCountryFile file = LocalCountryFile::MakeForTesting("Wonderland",
-                                                           version::FOR_TESTING_MWM1);
+  LocalCountryFile file = LocalCountryFile::MakeForTesting("Wonderland", version::FOR_TESTING_MWM1);
   TEST(file.OnDisk(MapFileType::Map), ());
 
   CountryIndexes::PreparePlaceOnDisk(file);
@@ -656,7 +643,8 @@ UNIT_TEST(StorageTest_FailedDownloading)
   // To prevent interference from other tests and on other tests it's
   // better to remove temprorary downloader files.
   DeleteDownloaderFilesForCountry(storage.GetCurrentDataVersion(), countryFile);
-  SCOPE_GUARD(cleanup, [&]() {
+  SCOPE_GUARD(cleanup, [&]()
+  {
     DeleteDownloaderFilesForCountry(storage.GetCurrentDataVersion(), countryFile);
     // Failed country is added into the "retry later" list, and fails next test.
     storage.Clear();
@@ -669,7 +657,8 @@ UNIT_TEST(StorageTest_FailedDownloading)
   }
 
   // File wasn't downloaded, but temprorary downloader files must exist.
-  string const downloadPath = GetFileDownloadPath(storage.GetCurrentDataVersion(), countryFile.GetName(), MapFileType::Map);
+  string const downloadPath =
+      GetFileDownloadPath(storage.GetCurrentDataVersion(), countryFile.GetName(), MapFileType::Map);
   TEST(!Platform::IsFileExistsByFullPath(downloadPath), ());
   TEST(Platform::IsFileExistsByFullPath(downloadPath + DOWNLOADING_FILE_EXTENSION), ());
   TEST(Platform::IsFileExistsByFullPath(downloadPath + RESUME_FILE_EXTENSION), ());
@@ -704,9 +693,11 @@ UNIT_TEST(StorageTest_GetRootId)
 {
   Storage storage(string(R"({
                            "id": "Countries",
-                           "v": )" + strings::to_string(version::FOR_TESTING_MWM1) + R"(,
+                           "v": )" +
+                         strings::to_string(version::FOR_TESTING_MWM1) + R"(,
                            "g": []
-                         })"), make_unique<TestMapFilesDownloader>());
+                         })"),
+                  make_unique<TestMapFilesDownloader>());
 
   // The name of the root is the same for courntries.txt version 1 and version 2.
   TEST_EQUAL(storage.GetRootId(), COUNTRIES_ROOT, ());
@@ -755,8 +746,7 @@ UNIT_TEST(StorageTest_GetAffiliations)
 
 UNIT_TEST(StorageTest_HasCountryId)
 {
-  CountriesVec middleEarthCountryIdVec = {"Arnor",  "Mordor",  "Rhovanion", "Rhun",
-                                          "Gondor", "Eriador", "Rohan"};
+  CountriesVec middleEarthCountryIdVec = {"Arnor", "Mordor", "Rhovanion", "Rhun", "Gondor", "Eriador", "Rohan"};
   sort(middleEarthCountryIdVec.begin(), middleEarthCountryIdVec.end());
 }
 
@@ -772,19 +762,16 @@ UNIT_CLASS_TEST(StorageTest, DownloadedMap)
 
   SCOPE_GUARD(cleanupAlgeriaCentral,
               bind(&Storage::DeleteCountry, &storage, algeriaCentralCountryId, MapFileType::Map));
-  SCOPE_GUARD(cleanupAlgeriaCoast,
-              bind(&Storage::DeleteCountry, &storage, algeriaCoastCountryId, MapFileType::Map));
+  SCOPE_GUARD(cleanupAlgeriaCoast, bind(&Storage::DeleteCountry, &storage, algeriaCoastCountryId, MapFileType::Map));
 
   {
     auto algeriaCentralChecker = make_unique<CountryDownloaderChecker>(
         storage, algeriaCentralCountryId, MapFileType::Map,
-        vector<Status>{Status::NotDownloaded, Status::InQueue, Status::Downloading,
-                       Status::OnDisk});
+        vector<Status>{Status::NotDownloaded, Status::InQueue, Status::Downloading, Status::OnDisk});
 
     auto algeriaCoastChecker = make_unique<CountryDownloaderChecker>(
         storage, algeriaCoastCountryId, MapFileType::Map,
-        vector<Status>{Status::NotDownloaded, Status::InQueue, Status::Downloading,
-                       Status::OnDisk});
+        vector<Status>{Status::NotDownloaded, Status::InQueue, Status::Downloading, Status::OnDisk});
 
     algeriaCentralChecker->StartDownload();
     algeriaCoastChecker->StartDownload();
@@ -792,9 +779,9 @@ UNIT_CLASS_TEST(StorageTest, DownloadedMap)
   }
 
   // Storage::GetLocalRealMaps() test.
-//  CountriesVec localRealMaps;
-//  storage.GetLocalRealMaps(localRealMaps);
-//  TEST_EQUAL(localRealMaps.size(), 4, ());
+  //  CountriesVec localRealMaps;
+  //  storage.GetLocalRealMaps(localRealMaps);
+  //  TEST_EQUAL(localRealMaps.size(), 4, ());
 
   TEST(storage.IsNodeDownloaded("Algeria_Central"), ());
   TEST(storage.IsNodeDownloaded("Algeria_Coast"), ());
@@ -812,24 +799,22 @@ UNIT_CLASS_TEST(StorageTest, DownloadedMap)
   TEST_EQUAL(available.size(), 223, ());
 
   CountriesVec downloadedWithKeep, availableWithKeep;
-  storage.GetChildrenInGroups(rootCountryId, downloadedWithKeep,
-                              availableWithKeep, true /* keepAvailableChildren*/);
+  storage.GetChildrenInGroups(rootCountryId, downloadedWithKeep, availableWithKeep, true /* keepAvailableChildren*/);
   TEST_EQUAL(downloadedWithKeep.size(), 1, (downloadedWithKeep));
   TEST_EQUAL(availableWithKeep.size(), 224, ());
 
   storage.GetChildrenInGroups("Algeria", downloaded, available);
   TEST_EQUAL(downloaded.size(), 2, (downloaded));
 
-  storage.GetChildrenInGroups("Algeria", downloadedWithKeep,
-                              availableWithKeep, true /* keepAvailableChildren*/);
+  storage.GetChildrenInGroups("Algeria", downloadedWithKeep, availableWithKeep, true /* keepAvailableChildren*/);
   TEST_EQUAL(downloadedWithKeep.size(), 2, (downloadedWithKeep));
   TEST_EQUAL(availableWithKeep.size(), 2, (availableWithKeep));
 
   storage.GetChildrenInGroups("Algeria_Central", downloaded, available);
   TEST(downloaded.empty(), ());
 
-  storage.GetChildrenInGroups("Algeria_Central", downloadedWithKeep,
-                              availableWithKeep, true /* keepAvailableChildren*/);
+  storage.GetChildrenInGroups("Algeria_Central", downloadedWithKeep, availableWithKeep,
+                              true /* keepAvailableChildren*/);
   TEST_EQUAL(downloadedWithKeep.size(), 0, (downloadedWithKeep));
   TEST_EQUAL(availableWithKeep.size(), 0, (availableWithKeep));
 
@@ -839,8 +824,7 @@ UNIT_CLASS_TEST(StorageTest, DownloadedMap)
   storage.GetChildrenInGroups(rootCountryId, downloaded, available);
   TEST_EQUAL(downloaded.size(), 1, (downloaded));
 
-  storage.GetChildrenInGroups("Algeria", downloadedWithKeep,
-                              availableWithKeep, true /* keepAvailableChildren*/);
+  storage.GetChildrenInGroups("Algeria", downloadedWithKeep, availableWithKeep, true /* keepAvailableChildren*/);
   TEST_EQUAL(downloadedWithKeep.size(), 1, (downloadedWithKeep));
   TEST_EQUAL(availableWithKeep.size(), 2, (availableWithKeep));
 
@@ -873,8 +857,7 @@ UNIT_CLASS_TEST(StorageTest, IsPointCoveredByDownloadedMaps)
   TEST(!storage::IsPointCoveredByDownloadedMaps(montevideoUruguay, storage, *countryInfoGetter), ());
 
   {
-    SCOPE_GUARD(cleanupCountryFiles,
-                bind(&Storage::DeleteCountry, &storage, uruguayId, MapFileType::Map));
+    SCOPE_GUARD(cleanupCountryFiles, bind(&Storage::DeleteCountry, &storage, uruguayId, MapFileType::Map));
     auto const checker = AbsentCountryDownloaderChecker(storage, uruguayId, MapFileType::Map);
     checker->StartDownload();
     runner.Run();
@@ -948,7 +931,7 @@ UNIT_TEST(StorageTest_GetNodeAttrsSingleMwm)
   storage.GetNodeAttrs("Algeria", nodeAttrs);
   TEST_EQUAL(nodeAttrs.m_mwmCounter, 2, ());
   TEST_EQUAL(nodeAttrs.m_mwmSize, 90878678, ());
-  TEST_EQUAL(nodeAttrs.m_status, NodeStatus::NotDownloaded, ()); // It's a status of expandable node.
+  TEST_EQUAL(nodeAttrs.m_status, NodeStatus::NotDownloaded, ());  // It's a status of expandable node.
   TEST_EQUAL(nodeAttrs.m_error, NodeErrorCode::NoError, ());
   TEST_EQUAL(nodeAttrs.m_parentInfo.size(), 1, ());
   TEST_EQUAL(nodeAttrs.m_parentInfo[0].m_id, COUNTRIES_ROOT, ());
@@ -1063,19 +1046,16 @@ UNIT_TEST(StorageTest_GetUpdateInfoSingleMwm)
   storage.GetUpdateInfo(storage.GetRootId(), updateInfo);
   TEST_EQUAL(updateInfo.m_numberOfMwmFilesToUpdate, 2, ());
   TEST_EQUAL(updateInfo.m_totalDownloadSizeInBytes, 1050, ());
-  TEST_EQUAL(updateInfo.m_sizeDifference,
-             (1000 + 50) - static_cast<int64_t>((country1Size + country2Size)), ());
+  TEST_EQUAL(updateInfo.m_sizeDifference, (1000 + 50) - static_cast<int64_t>((country1Size + country2Size)), ());
 }
 #endif  // defined(OMIM_OS_DESKTOP)
 
 UNIT_TEST(StorageTest_ParseStatus)
 {
-  TEST_EQUAL(StatusAndError(NodeStatus::Undefined, NodeErrorCode::NoError),
-             ParseStatus(Status::Undefined), ());
-  TEST_EQUAL(StatusAndError(NodeStatus::Error, NodeErrorCode::NoInetConnection),
-             ParseStatus(Status::DownloadFailed), ());
-  TEST_EQUAL(StatusAndError(NodeStatus::Downloading, NodeErrorCode::NoError),
-             ParseStatus(Status::Downloading), ());
+  TEST_EQUAL(StatusAndError(NodeStatus::Undefined, NodeErrorCode::NoError), ParseStatus(Status::Undefined), ());
+  TEST_EQUAL(StatusAndError(NodeStatus::Error, NodeErrorCode::NoInetConnection), ParseStatus(Status::DownloadFailed),
+             ());
+  TEST_EQUAL(StatusAndError(NodeStatus::Downloading, NodeErrorCode::NoError), ParseStatus(Status::Downloading), ());
 }
 
 UNIT_TEST(StorageTest_ForEachInSubtree)
@@ -1083,7 +1063,8 @@ UNIT_TEST(StorageTest_ForEachInSubtree)
   Storage storage(kCountriesTxt, make_unique<TestMapFilesDownloader>());
 
   CountriesVec leafVec;
-  auto const forEach = [&leafVec](CountryId const & descendantId, bool groupNode) {
+  auto const forEach = [&leafVec](CountryId const & descendantId, bool groupNode)
+  {
     if (!groupNode)
       leafVec.push_back(descendantId);
   };
@@ -1107,24 +1088,21 @@ UNIT_TEST(StorageTest_ForEachAncestorExceptForTheRoot)
   Storage storage(kCountriesTxt, make_unique<TestMapFilesDownloader>());
 
   // Two parent case.
-  auto const forEachParentDisputableTerritory = [](CountryId const & parentId,
-                                                   CountryTree::Node const & parentNode) {
+  auto const forEachParentDisputableTerritory = [](CountryId const & parentId, CountryTree::Node const & parentNode)
+  {
     CountriesVec descendants;
-    parentNode.ForEachDescendant([&descendants](CountryTree::Node const & container) {
-      descendants.push_back(container.Value().Name());
-    });
+    parentNode.ForEachDescendant([&descendants](CountryTree::Node const & container)
+    { descendants.push_back(container.Value().Name()); });
 
     if (parentId == "Country1")
     {
-      CountriesVec const expectedDescendants = {"Disputable Territory",
-                                                "Indisputable Territory Of Country1"};
+      CountriesVec const expectedDescendants = {"Disputable Territory", "Indisputable Territory Of Country1"};
       TEST_EQUAL(descendants, expectedDescendants, ());
       return;
     }
     if (parentId == "Country2")
     {
-      CountriesVec const expectedDescendants = {"Indisputable Territory Of Country2",
-                                                "Disputable Territory"};
+      CountriesVec const expectedDescendants = {"Indisputable Territory Of Country2", "Disputable Territory"};
       TEST_EQUAL(descendants, expectedDescendants, ());
       return;
     }
@@ -1133,24 +1111,21 @@ UNIT_TEST(StorageTest_ForEachAncestorExceptForTheRoot)
   storage.ForEachAncestorExceptForTheRoot("Disputable Territory", forEachParentDisputableTerritory);
 
   // One parent case.
-  auto const forEachParentIndisputableTerritory = [](CountryId const & parentId,
-                                                     CountryTree::Node const & parentNode) {
+  auto const forEachParentIndisputableTerritory = [](CountryId const & parentId, CountryTree::Node const & parentNode)
+  {
     CountriesVec descendants;
-    parentNode.ForEachDescendant([&descendants](CountryTree::Node const & container) {
-      descendants.push_back(container.Value().Name());
-    });
+    parentNode.ForEachDescendant([&descendants](CountryTree::Node const & container)
+    { descendants.push_back(container.Value().Name()); });
 
     if (parentId == "Country1")
     {
-      CountriesVec const expectedDescendants = {"Disputable Territory",
-                                                "Indisputable Territory Of Country1"};
+      CountriesVec const expectedDescendants = {"Disputable Territory", "Indisputable Territory Of Country1"};
       TEST_EQUAL(descendants, expectedDescendants, ());
       return;
     }
     TEST(false, ());
   };
-  storage.ForEachAncestorExceptForTheRoot("Indisputable Territory Of Country1",
-                                          forEachParentIndisputableTerritory);
+  storage.ForEachAncestorExceptForTheRoot("Indisputable Territory Of Country1", forEachParentIndisputableTerritory);
 }
 
 UNIT_CLASS_TEST(StorageTest, CalcLimitRect)
@@ -1159,8 +1134,8 @@ UNIT_CLASS_TEST(StorageTest, CalcLimitRect)
   ASSERT(countryInfoGetter, ());
 
   m2::RectD const boundingBox = storage::CalcLimitRect("Algeria", storage, *countryInfoGetter);
-  m2::RectD const expectedBoundingBox = {-8.6689 /* minX */, 19.32443 /* minY */,
-                                         11.99734 /* maxX */, 45.23 /* maxY */};
+  m2::RectD const expectedBoundingBox = {-8.6689 /* minX */, 19.32443 /* minY */, 11.99734 /* maxX */,
+                                         45.23 /* maxY */};
 
   static double constexpr kEpsilon = 1e-2;
   TEST(AlmostEqualAbs(boundingBox, expectedBoundingBox, kEpsilon), ());
@@ -1168,8 +1143,7 @@ UNIT_CLASS_TEST(StorageTest, CalcLimitRect)
 
 UNIT_TEST(StorageTest_CountriesNamesTest)
 {
-  string const kRuJson =
-      string(R"json({
+  string const kRuJson = string(R"json({
              "Countries":"Весь мир",
              "Abkhazia":"Абхазия",
              "Algeria":"Алжир",
@@ -1182,8 +1156,7 @@ UNIT_TEST(StorageTest_CountriesNamesTest)
              "Indisputable Territory Of Country2":"Бесспорная территория страны 2"
              })json");
 
-  string const kFrJson =
-      string(R"json({
+  string const kFrJson = string(R"json({
              "Countries":"Des pays",
              "Abkhazia":"Abkhazie",
              "Algeria":"Algérie",
@@ -1244,8 +1217,7 @@ UNIT_TEST(StorageTest_CountriesNamesTest)
   TEST_EQUAL(nodeAttrs.m_parentInfo.size(), 2, ());
   TEST_EQUAL(nodeAttrs.m_parentInfo[0].m_localName, "Страна 1", ());
   TEST_EQUAL(nodeAttrs.m_parentInfo[1].m_localName, "Страна 2", ());
-  vector<CountryIdAndName> const expectedTopmostParentsRu = {{"Country1", "Страна 1"},
-                                                             {"Country2", "Страна 2"}};
+  vector<CountryIdAndName> const expectedTopmostParentsRu = {{"Country1", "Страна 1"}, {"Country2", "Страна 2"}};
   TEST(nodeAttrs.m_topmostParentInfo == expectedTopmostParentsRu, ());
 
   // set french locale
@@ -1297,8 +1269,7 @@ UNIT_TEST(StorageTest_CountriesNamesTest)
   TEST_EQUAL(nodeAttrs.m_parentInfo.size(), 2, ());
   TEST_EQUAL(nodeAttrs.m_parentInfo[0].m_localName, "Pays 1", ());
   TEST_EQUAL(nodeAttrs.m_parentInfo[1].m_localName, "Pays 2", ());
-  vector<CountryIdAndName> const expectedTopmostParentsFr = {{"Country1", "Pays 1"},
-                                                             {"Country2", "Pays 2"}};
+  vector<CountryIdAndName> const expectedTopmostParentsFr = {{"Country1", "Pays 1"}, {"Country2", "Pays 2"}};
   TEST(nodeAttrs.m_topmostParentInfo == expectedTopmostParentsFr, ());
 }
 
@@ -1453,10 +1424,7 @@ UNIT_TEST(StorageTest_FalsePolicy)
   // To prevent interference with other tests and on other tests it's
   // better to remove temporary downloader files.
   DeleteDownloaderFilesForCountry(storage.GetCurrentDataVersion(), countryFile);
-  SCOPE_GUARD(cleanup, [&]() {
-    DeleteDownloaderFilesForCountry(storage.GetCurrentDataVersion(),
-                                    countryFile);
-  });
+  SCOPE_GUARD(cleanup, [&]() { DeleteDownloaderFilesForCountry(storage.GetCurrentDataVersion(), countryFile); });
 
   {
     FailedDownloadingWaiter waiter(storage, countryId);
@@ -1470,7 +1438,7 @@ UNIT_CLASS_TEST(StorageTest, MultipleMaps)
   // network policy sometimes changes, therefore some countries won't
   // be downloaded.
 
-  vector<uint64_t> const failedRequests {{5, 10, 21}};
+  vector<uint64_t> const failedRequests{{5, 10, 21}};
   TEST(is_sorted(failedRequests.begin(), failedRequests.end()), ());
 
   SometimesFailingDownloadingPolicy policy(failedRequests);
@@ -1482,7 +1450,8 @@ UNIT_CLASS_TEST(StorageTest, MultipleMaps)
   storage.GetChildren(nodeId, children);
   vector<bool> downloaded(children.size());
 
-  auto const onStatusChange = [&](CountryId const & id) {
+  auto const onStatusChange = [&](CountryId const & id)
+  {
     auto const status = storage.CountryStatusEx(id);
     if (status != Status::OnDisk)
       return;
@@ -1494,8 +1463,7 @@ UNIT_CLASS_TEST(StorageTest, MultipleMaps)
     downloaded[distance(children.cbegin(), it)] = true;
   };
 
-  auto const onProgress = [&](CountryId const & /* countryId */,
-                              downloader::Progress const & /* progress */) {};
+  auto const onProgress = [&](CountryId const & /* countryId */, downloader::Progress const & /* progress */) {};
 
   auto const slot = storage.Subscribe(onStatusChange, onProgress);
   SCOPE_GUARD(cleanup, [&]() { storage.Unsubscribe(slot); });
diff --git a/libs/storage/storage_tests/task_runner.cpp b/libs/storage/storage_tests/task_runner.cpp
index a78572c3d..891d3dd1f 100644
--- a/libs/storage/storage_tests/task_runner.cpp
+++ b/libs/storage/storage_tests/task_runner.cpp
@@ -4,7 +4,10 @@
 
 namespace storage
 {
-TaskRunner::~TaskRunner() { CHECK(m_checker.CalledOnOriginalThread(), ()); }
+TaskRunner::~TaskRunner()
+{
+  CHECK(m_checker.CalledOnOriginalThread(), ());
+}
 
 void TaskRunner::Run()
 {
diff --git a/libs/testing/benchmark.hpp b/libs/testing/benchmark.hpp
index 2c2c5a2d3..d973bb937 100644
--- a/libs/testing/benchmark.hpp
+++ b/libs/testing/benchmark.hpp
@@ -13,9 +13,10 @@ class BenchmarkNTimes
 {
 public:
   BenchmarkNTimes(int repeatCount, double maxSecondsToSucceed)
-    : m_repeatCount(repeatCount), m_maxSecondsToSucceed(maxSecondsToSucceed), m_iteration(0)
-  {
-  }
+    : m_repeatCount(repeatCount)
+    , m_maxSecondsToSucceed(maxSecondsToSucceed)
+    , m_iteration(0)
+  {}
 
   ~BenchmarkNTimes()
   {
@@ -29,7 +30,8 @@ public:
       /*
         if (secondsElapsed / m_repeatCount * 1000 >= 10)
           std::cout << static_cast<int>(secondsElapsed / m_repeatCount * 1000) << "ms each";
-        else */ if (secondsElapsed / m_repeatCount * 1000000 >= 10)
+        else */
+      if (secondsElapsed / m_repeatCount * 1000000 >= 10)
         std::cout << static_cast<int>(secondsElapsed / m_repeatCount * 1000000) << "us each";
       else
         std::cout << static_cast<int>(secondsElapsed / m_repeatCount * 1000000000) << "ns each";
diff --git a/libs/testing/testing.hpp b/libs/testing/testing.hpp
index bf04fa942..edc939a6a 100644
--- a/libs/testing/testing.hpp
+++ b/libs/testing/testing.hpp
@@ -12,8 +12,8 @@
 // TestRegister is static to avoid this warning:
 // No previous extern declaration for non-static variable 'g_testRegister_TESTNAME'
 // note: declare 'static' if the variable is not intended to be used outside of this translation unit
-#define UNIT_TEST(name)                                                  \
-  void UnitTest_##name();                                                \
+#define UNIT_TEST(name)                                                         \
+  void UnitTest_##name();                                                       \
   static TestRegister g_testRegister_##name(#name, __FILE__, &UnitTest_##name); \
   void UnitTest_##name()
 
@@ -70,189 +70,186 @@ CommandLineOptions const & GetTestingOptions();
   do                                                                                     \
   {                                                                                      \
     if (X)                                                                               \
-    {                                                                                    \
-    }                                                                                    \
+    {}                                                                                   \
     else                                                                                 \
     {                                                                                    \
       ::base::OnTestFailed(SRC(), ::base::Message("TEST(" #X ")", ::base::Message msg)); \
     }                                                                                    \
-  } while (0)
+  }                                                                                      \
+  while (0)
 
-#define TEST_EQUAL(X, Y, msg)                                                                      \
-  do                                                                                               \
-  {                                                                                                \
-    if ((X) == (Y))                                                                                \
-    {                                                                                              \
-    }                                                                                              \
-    else                                                                                           \
-    {                                                                                              \
-      ::base::OnTestFailed(SRC(), ::base::Message("TEST(" #X " == " #Y ")", ::base::Message(X, Y), \
-                                                  ::base::Message msg));                           \
-    }                                                                                              \
-  } while (0)
+#define TEST_EQUAL(X, Y, msg)                                                                                      \
+  do                                                                                                               \
+  {                                                                                                                \
+    if ((X) == (Y))                                                                                                \
+    {}                                                                                                             \
+    else                                                                                                           \
+    {                                                                                                              \
+      ::base::OnTestFailed(SRC(),                                                                                  \
+                           ::base::Message("TEST(" #X " == " #Y ")", ::base::Message(X, Y), ::base::Message msg)); \
+    }                                                                                                              \
+  }                                                                                                                \
+  while (0)
 
-#define TEST_NOT_EQUAL(X, Y, msg)                                                                  \
-  do                                                                                               \
-  {                                                                                                \
-    if ((X) != (Y))                                                                                \
-    {                                                                                              \
-    }                                                                                              \
-    else                                                                                           \
-    {                                                                                              \
-      ::base::OnTestFailed(SRC(), ::base::Message("TEST(" #X " != " #Y ")", ::base::Message(X, Y), \
-                                                  ::base::Message msg));                           \
-    }                                                                                              \
-  } while (0)
+#define TEST_NOT_EQUAL(X, Y, msg)                                                                                  \
+  do                                                                                                               \
+  {                                                                                                                \
+    if ((X) != (Y))                                                                                                \
+    {}                                                                                                             \
+    else                                                                                                           \
+    {                                                                                                              \
+      ::base::OnTestFailed(SRC(),                                                                                  \
+                           ::base::Message("TEST(" #X " != " #Y ")", ::base::Message(X, Y), ::base::Message msg)); \
+    }                                                                                                              \
+  }                                                                                                                \
+  while (0)
 
-#define TEST_LESS(X, Y, msg)                                                                      \
-  do                                                                                              \
-  {                                                                                               \
-    if ((X) < (Y))                                                                                \
-    {                                                                                             \
-    }                                                                                             \
-    else                                                                                          \
-    {                                                                                             \
-      ::base::OnTestFailed(SRC(), ::base::Message("TEST(" #X " < " #Y ")", ::base::Message(X, Y), \
-                                                  ::base::Message msg));                          \
-    }                                                                                             \
-  } while (0)
+#define TEST_LESS(X, Y, msg)                                                                                      \
+  do                                                                                                              \
+  {                                                                                                               \
+    if ((X) < (Y))                                                                                                \
+    {}                                                                                                            \
+    else                                                                                                          \
+    {                                                                                                             \
+      ::base::OnTestFailed(SRC(),                                                                                 \
+                           ::base::Message("TEST(" #X " < " #Y ")", ::base::Message(X, Y), ::base::Message msg)); \
+    }                                                                                                             \
+  }                                                                                                               \
+  while (0)
 
-#define TEST_LESS_OR_EQUAL(X, Y, msg)                                                              \
-  do                                                                                               \
-  {                                                                                                \
-    if ((X) <= (Y))                                                                                \
-    {                                                                                              \
-    }                                                                                              \
-    else                                                                                           \
-    {                                                                                              \
-      ::base::OnTestFailed(SRC(), ::base::Message("TEST(" #X " <= " #Y ")", ::base::Message(X, Y), \
-                                                  ::base::Message msg));                           \
-    }                                                                                              \
-  } while (0)
+#define TEST_LESS_OR_EQUAL(X, Y, msg)                                                                              \
+  do                                                                                                               \
+  {                                                                                                                \
+    if ((X) <= (Y))                                                                                                \
+    {}                                                                                                             \
+    else                                                                                                           \
+    {                                                                                                              \
+      ::base::OnTestFailed(SRC(),                                                                                  \
+                           ::base::Message("TEST(" #X " <= " #Y ")", ::base::Message(X, Y), ::base::Message msg)); \
+    }                                                                                                              \
+  }                                                                                                                \
+  while (0)
 
-#define TEST_GREATER(X, Y, msg)                                                                   \
-  do                                                                                              \
-  {                                                                                               \
-    if ((X) > (Y))                                                                                \
-    {                                                                                             \
-    }                                                                                             \
-    else                                                                                          \
-    {                                                                                             \
-      ::base::OnTestFailed(SRC(), ::base::Message("TEST(" #X " > " #Y ")", ::base::Message(X, Y), \
-                                                  ::base::Message msg));                          \
-    }                                                                                             \
-  } while (0)
+#define TEST_GREATER(X, Y, msg)                                                                                   \
+  do                                                                                                              \
+  {                                                                                                               \
+    if ((X) > (Y))                                                                                                \
+    {}                                                                                                            \
+    else                                                                                                          \
+    {                                                                                                             \
+      ::base::OnTestFailed(SRC(),                                                                                 \
+                           ::base::Message("TEST(" #X " > " #Y ")", ::base::Message(X, Y), ::base::Message msg)); \
+    }                                                                                                             \
+  }                                                                                                               \
+  while (0)
 
-#define TEST_GREATER_OR_EQUAL(X, Y, msg)                                                           \
-  do                                                                                               \
-  {                                                                                                \
-    if ((X) >= (Y))                                                                                \
-    {                                                                                              \
-    }                                                                                              \
-    else                                                                                           \
-    {                                                                                              \
-      ::base::OnTestFailed(SRC(), ::base::Message("TEST(" #X " >= " #Y ")", ::base::Message(X, Y), \
-                                                  ::base::Message msg));                           \
-    }                                                                                              \
-  } while (0)
+#define TEST_GREATER_OR_EQUAL(X, Y, msg)                                                                           \
+  do                                                                                                               \
+  {                                                                                                                \
+    if ((X) >= (Y))                                                                                                \
+    {}                                                                                                             \
+    else                                                                                                           \
+    {                                                                                                              \
+      ::base::OnTestFailed(SRC(),                                                                                  \
+                           ::base::Message("TEST(" #X " >= " #Y ")", ::base::Message(X, Y), ::base::Message msg)); \
+    }                                                                                                              \
+  }                                                                                                                \
+  while (0)
 
-#define TEST_ALMOST_EQUAL_ULPS(X, Y, msg)                                                       \
-  do                                                                                            \
-  {                                                                                             \
-    if (AlmostEqualULPs(X, Y))                                                          \
-    {                                                                                           \
-    }                                                                                           \
-    else                                                                                        \
-    {                                                                                           \
-      ::base::OnTestFailed(SRC(), ::base::Message("TEST(AlmostEqualULPs(" #X ", " #Y ")", \
-                                                  ::base::Message(X, Y), ::base::Message msg)); \
-    }                                                                                           \
-  } while (0)
+#define TEST_ALMOST_EQUAL_ULPS(X, Y, msg)                                                                              \
+  do                                                                                                                   \
+  {                                                                                                                    \
+    if (AlmostEqualULPs(X, Y))                                                                                         \
+    {}                                                                                                                 \
+    else                                                                                                               \
+    {                                                                                                                  \
+      ::base::OnTestFailed(                                                                                            \
+          SRC(), ::base::Message("TEST(AlmostEqualULPs(" #X ", " #Y ")", ::base::Message(X, Y), ::base::Message msg)); \
+    }                                                                                                                  \
+  }                                                                                                                    \
+  while (0)
 
-#define TEST_NOT_ALMOST_EQUAL_ULPS(X, Y, msg)                                                    \
-  do                                                                                             \
-  {                                                                                              \
-    if (!AlmostEqualULPs(X, Y))                                                          \
-    {                                                                                            \
-    }                                                                                            \
-    else                                                                                         \
-    {                                                                                            \
-      ::base::OnTestFailed(SRC(), ::base::Message("TEST(!AlmostEqualULPs(" #X ", " #Y ")", \
-                                                  ::base::Message(X, Y), ::base::Message msg));  \
-    }                                                                                            \
-  } while (0)
+#define TEST_NOT_ALMOST_EQUAL_ULPS(X, Y, msg)                                                                     \
+  do                                                                                                              \
+  {                                                                                                               \
+    if (!AlmostEqualULPs(X, Y))                                                                                   \
+    {}                                                                                                            \
+    else                                                                                                          \
+    {                                                                                                             \
+      ::base::OnTestFailed(SRC(), ::base::Message("TEST(!AlmostEqualULPs(" #X ", " #Y ")", ::base::Message(X, Y), \
+                                                  ::base::Message msg));                                          \
+    }                                                                                                             \
+  }                                                                                                               \
+  while (0)
 
-#define TEST_ALMOST_EQUAL_ABS(X, Y, eps, msg)                                                      \
-  do                                                                                               \
-  {                                                                                                \
-    if (AlmostEqualAbs(X, Y, eps))                                                         \
-    {                                                                                              \
-    }                                                                                              \
-    else                                                                                           \
-    {                                                                                              \
-      ::base::OnTestFailed(SRC(),                                                                  \
-                           ::base::Message("TEST(!AlmostEqualAbs(" #X ", " #Y ", " #eps ")", \
-                           ::base::Message(X, Y, eps), ::base::Message msg));                      \
-    }                                                                                              \
-  } while (0)
+#define TEST_ALMOST_EQUAL_ABS(X, Y, eps, msg)                                                        \
+  do                                                                                                 \
+  {                                                                                                  \
+    if (AlmostEqualAbs(X, Y, eps))                                                                   \
+    {}                                                                                               \
+    else                                                                                             \
+    {                                                                                                \
+      ::base::OnTestFailed(SRC(), ::base::Message("TEST(!AlmostEqualAbs(" #X ", " #Y ", " #eps ")",  \
+                                                  ::base::Message(X, Y, eps), ::base::Message msg)); \
+    }                                                                                                \
+  }                                                                                                  \
+  while (0)
 
 // TODO(AlexZ): Add more cool macroses (or switch all unit tests to gtest).
-#define TEST_THROW(X, exception, msg)                                                           \
-  do                                                                                            \
-  {                                                                                             \
-    bool expected_exception = false;                                                            \
-    try                                                                                         \
-    {                                                                                           \
-      X;                                                                                        \
-    }                                                                                           \
-    catch (std::exception const &)                                                              \
-    {                                                                                           \
-      expected_exception = true;                                                                \
-    }                                                                                           \
-    catch (...)                                                                                 \
-    {                                                                                           \
-      ::base::OnTestFailed(                                                                     \
-          SRC(), ::base::Message("Unexpected exception at TEST(" #X ")", ::base::Message msg)); \
-    }                                                                                           \
-    if (!expected_exception)                                                                    \
-      ::base::OnTestFailed(SRC(), ::base::Message("Expected exception " #exception              \
-                                                  " was not thrown in TEST(" #X ")",            \
-                                                  ::base::Message msg));                        \
-  } while (0)
+#define TEST_THROW(X, exception, msg)                                                                                 \
+  do                                                                                                                  \
+  {                                                                                                                   \
+    bool expected_exception = false;                                                                                  \
+    try                                                                                                               \
+    {                                                                                                                 \
+      X;                                                                                                              \
+    }                                                                                                                 \
+    catch (std::exception const &)                                                                                    \
+    {                                                                                                                 \
+      expected_exception = true;                                                                                      \
+    }                                                                                                                 \
+    catch (...)                                                                                                       \
+    {                                                                                                                 \
+      ::base::OnTestFailed(SRC(), ::base::Message("Unexpected exception at TEST(" #X ")", ::base::Message msg));      \
+    }                                                                                                                 \
+    if (!expected_exception)                                                                                          \
+      ::base::OnTestFailed(SRC(), ::base::Message("Expected exception " #exception " was not thrown in TEST(" #X ")", \
+                                                  ::base::Message msg));                                              \
+  }                                                                                                                   \
+  while (0)
 
-#define TEST_NO_THROW(X, msg)                                                                   \
-  do                                                                                            \
-  {                                                                                             \
-    try                                                                                         \
-    {                                                                                           \
-      X;                                                                                        \
-    }                                                                                           \
-    catch (RootException const & ex)                                                            \
-    {                                                                                           \
-      ::base::OnTestFailed(SRC(),                                                               \
-                           ::base::Message("Unexpected exception at TEST(" #X ")",              \
-                           ::base::Message(ex.Msg()), ::base::Message msg));                    \
-    }                                                                                           \
-    catch (...)                                                                                 \
-    {                                                                                           \
-      ::base::OnTestFailed(                                                                     \
-          SRC(), ::base::Message("Unexpected exception at TEST(" #X ")", ::base::Message msg)); \
-    }                                                                                           \
-  } while (0)
+#define TEST_NO_THROW(X, msg)                                                                                        \
+  do                                                                                                                 \
+  {                                                                                                                  \
+    try                                                                                                              \
+    {                                                                                                                \
+      X;                                                                                                             \
+    }                                                                                                                \
+    catch (RootException const & ex)                                                                                 \
+    {                                                                                                                \
+      ::base::OnTestFailed(SRC(), ::base::Message("Unexpected exception at TEST(" #X ")", ::base::Message(ex.Msg()), \
+                                                  ::base::Message msg));                                             \
+    }                                                                                                                \
+    catch (...)                                                                                                      \
+    {                                                                                                                \
+      ::base::OnTestFailed(SRC(), ::base::Message("Unexpected exception at TEST(" #X ")", ::base::Message msg));     \
+    }                                                                                                                \
+  }                                                                                                                  \
+  while (0)
 
-#define TEST_ANY_THROW(X, msg)                                                                 \
-  do                                                                                           \
-  {                                                                                            \
-    bool was_exception = false;                                                                \
-    try                                                                                        \
-    {                                                                                          \
-      X;                                                                                       \
-    }                                                                                          \
-    catch (...)                                                                                \
-    {                                                                                          \
-      was_exception = true;                                                                    \
-    }                                                                                          \
-    if (!was_exception)                                                                        \
-      ::base::OnTestFailed(SRC(), ::base::Message("No exceptions were thrown in TEST(" #X ")", \
-                                                  ::base::Message msg));                       \
-  } while (0)
+#define TEST_ANY_THROW(X, msg)                                                                                        \
+  do                                                                                                                  \
+  {                                                                                                                   \
+    bool was_exception = false;                                                                                       \
+    try                                                                                                               \
+    {                                                                                                                 \
+      X;                                                                                                              \
+    }                                                                                                                 \
+    catch (...)                                                                                                       \
+    {                                                                                                                 \
+      was_exception = true;                                                                                           \
+    }                                                                                                                 \
+    if (!was_exception)                                                                                               \
+      ::base::OnTestFailed(SRC(), ::base::Message("No exceptions were thrown in TEST(" #X ")", ::base::Message msg)); \
+  }                                                                                                                   \
+  while (0)
diff --git a/libs/testing/testingmain.cpp b/libs/testing/testingmain.cpp
index db4f2a6b8..698679755 100644
--- a/libs/testing/testingmain.cpp
+++ b/libs/testing/testingmain.cpp
@@ -17,27 +17,27 @@
 #include <vector>
 
 #ifdef WITH_GL_MOCK
-# include "base/scope_guard.hpp"
-# include "drape/drape_tests/gl_mock_functions.hpp"
+#include "base/scope_guard.hpp"
+#include "drape/drape_tests/gl_mock_functions.hpp"
 #endif
 
 #ifdef OMIM_OS_IPHONE
-# include <CoreFoundation/CoreFoundation.h>
+#include <CoreFoundation/CoreFoundation.h>
 #endif
 
 #ifndef OMIM_UNIT_TEST_DISABLE_PLATFORM_INIT
-# include "platform/platform.hpp"
+#include "platform/platform.hpp"
 #endif
 
 #if defined(OMIM_UNIT_TEST_WITH_QT_EVENT_LOOP) && !defined(OMIM_OS_IPHONE)
-  #include <QtCore/Qt>
-  #ifdef OMIM_OS_MAC // on Mac OS X native run loop works only for QApplication :(
-    #include <QtWidgets/QApplication>
-    #define QAPP QApplication
-  #else
-    #include <QtCore/QCoreApplication>
-    #define QAPP QCoreApplication
-  #endif
+#include <QtCore/Qt>
+#ifdef OMIM_OS_MAC  // on Mac OS X native run loop works only for QApplication :(
+#include <QtWidgets/QApplication>
+#define QAPP QApplication
+#else
+#include <QtCore/QCoreApplication>
+#define QAPP QCoreApplication
+#endif
 #endif
 
 namespace testing
@@ -50,7 +50,7 @@ void RunEventLoop()
 {
 #if defined(OMIM_OS_IPHONE)
   CFRunLoopRun();
-#elif defined (QAPP)
+#elif defined(QAPP)
   QAPP::exec();
 #endif
 }
@@ -100,18 +100,15 @@ void DisplayOption(ostream & os, char const * option, char const * description)
 
 void DisplayOption(ostream & os, char const * option, char const * value, char const * description)
 {
-  os << "  " << setw(kOptionFieldWidth) << left << (string(option) + value) << " "
-     << description << '\n';
+  os << "  " << setw(kOptionFieldWidth) << left << (string(option) + value) << " " << description << '\n';
 }
 
 void Usage(char const * name)
 {
   cerr << "USAGE: " << name << " [options]\n\n";
   cerr << "OPTIONS:\n";
-  DisplayOption(cerr, kFilterOption, "<ECMA Regexp>",
-                "Run tests with names corresponding to regexp.");
-  DisplayOption(cerr, kSuppressOption, "<ECMA Regexp>",
-                "Do not run tests with names corresponding to regexp.");
+  DisplayOption(cerr, kFilterOption, "<ECMA Regexp>", "Run tests with names corresponding to regexp.");
+  DisplayOption(cerr, kSuppressOption, "<ECMA Regexp>", "Do not run tests with names corresponding to regexp.");
   DisplayOption(cerr, kDataPathOptions, "<Path>", "Path to data files.");
   DisplayOption(cerr, kResourcePathOptions, "<Path>", "Path to resources, styles and classificators.");
   DisplayOption(cerr, kListAllTestsOption, "List all the tests in the test suite and exit.");
@@ -215,19 +212,13 @@ int main(int argc, char * argv[])
   }
 
   int testIndex = 0;
-  for (TestRegister *test = TestRegister::FirstRegister(); test; ++testIndex, test = test->m_next)
+  for (TestRegister * test = TestRegister::FirstRegister(); test; ++testIndex, test = test->m_next)
   {
     auto const & testname = testnames[testIndex];
-    if (g_testingOptions.m_filterRegExp &&
-        !regex_search(testname.begin(), testname.end(), filterRegExp))
-    {
+    if (g_testingOptions.m_filterRegExp && !regex_search(testname.begin(), testname.end(), filterRegExp))
       continue;
-    }
-    if (g_testingOptions.m_suppressRegExp &&
-        regex_search(testname.begin(), testname.end(), suppressRegExp))
-    {
+    if (g_testingOptions.m_suppressRegExp && regex_search(testname.begin(), testname.end(), suppressRegExp))
       continue;
-    }
 
     LOG(LINFO, ("Running", testname));
     if (!g_lastTestOK)
@@ -257,7 +248,7 @@ int main(int argc, char * argv[])
         ++numFailedTests;
       }
     }
-    catch (TestFailureException const & )
+    catch (TestFailureException const &)
     {
       testResults[testIndex] = false;
       ++numFailedTests;
@@ -284,10 +275,8 @@ int main(int argc, char * argv[])
   {
     LOG(LINFO, (numFailedTests, " tests failed:"));
     for (size_t i = 0; i < testnames.size(); ++i)
-    {
       if (!testResults[i])
         LOG(LINFO, (testnames[i]));
-    }
     LOG(LINFO, ("Some tests FAILED."));
     return STATUS_FAILED;
   }
@@ -297,4 +286,7 @@ int main(int argc, char * argv[])
 }
 }  // namespace testing
 
-int main(int argc, char * argv[]) { return ::testing::main(argc, argv); }
+int main(int argc, char * argv[])
+{
+  return ::testing::main(argc, argv);
+}
diff --git a/libs/testing/testregister.hpp b/libs/testing/testregister.hpp
index 7c59b0831..6b2778240 100644
--- a/libs/testing/testregister.hpp
+++ b/libs/testing/testregister.hpp
@@ -7,7 +7,10 @@ class TestRegister
 {
 public:
   TestRegister(char const * testname, char const * filename, std::function<void()> && fnTest)
-    : m_testname(testname), m_filename(filename), m_fn(std::move(fnTest)), m_next(nullptr)
+    : m_testname(testname)
+    , m_filename(filename)
+    , m_fn(std::move(fnTest))
+    , m_next(nullptr)
   {
     if (FirstRegister() == nullptr)
     {
diff --git a/libs/tracking/archival_file.cpp b/libs/tracking/archival_file.cpp
index 3f456ec00..89e3763e9 100644
--- a/libs/tracking/archival_file.cpp
+++ b/libs/tracking/archival_file.cpp
@@ -71,9 +71,8 @@ std::vector<std::string> FilesAccumulator::PrepareArchives(std::string const & p
     {
       if (it.second.m_files.empty())
         continue;
-      std::string const archivePath =
-          base::JoinPath(path, base::GetNameFromFullPathWithoutExt(it.second.m_files[0]) +
-                                   ARCHIVE_TRACKS_ZIPPED_FILE_EXTENSION);
+      std::string const archivePath = base::JoinPath(
+          path, base::GetNameFromFullPathWithoutExt(it.second.m_files[0]) + ARCHIVE_TRACKS_ZIPPED_FILE_EXTENSION);
 
       if (CreateZipFromFiles(it.second.m_files, archivePath, CompressionLevel::NoCompression))
         archives.emplace_back(archivePath);
@@ -89,10 +88,8 @@ std::vector<std::string> FilesAccumulator::PrepareArchives(std::string const & p
 void FilesAccumulator::DeleteProcessedFiles()
 {
   for (auto const & it : m_filesByType)
-  {
     for (auto const & file : it.second.m_files)
       base::DeleteFileX(file);
-  }
 }
 
 std::string GetArchiveFilename(uint8_t protocolVersion, std::chrono::seconds timestamp,
@@ -101,9 +98,8 @@ std::string GetArchiveFilename(uint8_t protocolVersion, std::chrono::seconds tim
   std::string filename;
   size_t constexpr kTrackFilenameSize = 20;
   filename.reserve(kTrackFilenameSize);  // All filename parts have fixed length.
-  filename = std::to_string(protocolVersion) + kDelimiter + std::to_string(timestamp.count()) +
-             kDelimiter + std::to_string(static_cast<uint8_t>(trackType)) +
-             ARCHIVE_TRACKS_FILE_EXTENSION;
+  filename = std::to_string(protocolVersion) + kDelimiter + std::to_string(timestamp.count()) + kDelimiter +
+             std::to_string(static_cast<uint8_t>(trackType)) + ARCHIVE_TRACKS_FILE_EXTENSION;
   CHECK_EQUAL(filename.size(), kTrackFilenameSize, ());
   return filename;
 }
@@ -123,10 +119,8 @@ FileInfo ParseArchiveFilename(std::string const & fileName)
   {
     FileInfo res;
     res.m_protocolVersion = static_cast<uint32_t>(std::stoul(metaData.substr(0, indexFirstDelim)));
-    res.m_timestamp =
-        std::stoul(metaData.substr(indexFirstDelim + 1, indexLastDelim - indexFirstDelim - 1));
-    res.m_trackType =
-        static_cast<routing::RouterType>(std::stoul(metaData.substr(indexLastDelim + 1)));
+    res.m_timestamp = std::stoul(metaData.substr(indexFirstDelim + 1, indexLastDelim - indexFirstDelim - 1));
+    res.m_trackType = static_cast<routing::RouterType>(std::stoul(metaData.substr(indexLastDelim + 1)));
     return res;
   }
   catch (std::exception const & e)
diff --git a/libs/tracking/archival_manager.cpp b/libs/tracking/archival_manager.cpp
index c42b5e05f..d0fd358ee 100644
--- a/libs/tracking/archival_manager.cpp
+++ b/libs/tracking/archival_manager.cpp
@@ -41,16 +41,16 @@ ArchivalManager::ArchivalManager(std::string const & url)
   : m_url(url)
   , m_tracksDir(GetTracksDirectory())
   , m_timestampFile(GetTimestampFile(m_tracksDir))
+{}
+
+void ArchivalManager::SetSettings(ArchivingSettings const & settings)
 {
+  m_settings = settings;
 }
 
-void ArchivalManager::SetSettings(ArchivingSettings const & settings) { m_settings = settings; }
-
-std::optional<FileWriter> ArchivalManager::GetFileWriter(
-    routing::RouterType const & trackType) const
+std::optional<FileWriter> ArchivalManager::GetFileWriter(routing::RouterType const & trackType) const
 {
-  std::string const fileName =
-      archival_file::GetArchiveFilename(m_settings.m_version, GetTimestamp(), trackType);
+  std::string const fileName = archival_file::GetArchiveFilename(m_settings.m_version, GetTimestamp(), trackType);
   try
   {
     return std::optional<FileWriter>(base::JoinPath(m_tracksDir, fileName));
@@ -71,10 +71,12 @@ bool ArchivalManager::CreateTracksDir() const
   return true;
 }
 
-size_t ArchivalManager::IntervalBetweenDumpsSeconds() { return m_settings.m_dumpIntervalSeconds; }
+size_t ArchivalManager::IntervalBetweenDumpsSeconds()
+{
+  return m_settings.m_dumpIntervalSeconds;
+}
 
-std::vector<std::string> ArchivalManager::GetFilesOrderedByCreation(
-    std::string const & extension) const
+std::vector<std::string> ArchivalManager::GetFilesOrderedByCreation(std::string const & extension) const
 {
   Platform::FilesList files;
   Platform::GetFilesByExt(m_tracksDir, extension, files);
@@ -175,10 +177,8 @@ void ArchivalManager::DeleteOldDataByExtension(std::string const & extension) co
   auto const files = GetFilesOrderedByCreation(extension);
   auto const maxCount = GetMaxSavedFilesCount(extension);
   if (files.size() > maxCount)
-  {
     for (size_t i = 0; i < files.size() - maxCount; ++i)
       base::DeleteFileX(files[i]);
-  }
 }
 
 void ArchivalManager::WriteTimestamp(std::string const & filePath)
diff --git a/libs/tracking/archival_reporter.cpp b/libs/tracking/archival_reporter.cpp
index cdf800358..38110f642 100644
--- a/libs/tracking/archival_reporter.cpp
+++ b/libs/tracking/archival_reporter.cpp
@@ -21,8 +21,7 @@ ArchivalReporter::ArchivalReporter(std::string const & host)
   , m_manager(host)
   , m_isAlive(true)
   , m_threadDump([this] { Run(); })
-{
-}
+{}
 
 ArchivalReporter::~ArchivalReporter()
 {
diff --git a/libs/tracking/archive.cpp b/libs/tracking/archive.cpp
index 4456dcfd0..20ff99004 100644
--- a/libs/tracking/archive.cpp
+++ b/libs/tracking/archive.cpp
@@ -20,29 +20,27 @@ Limits GetLimits(bool isDelta)
   }
   return {ms::LatLon::kMinLat, ms::LatLon::kMaxLat, ms::LatLon::kMinLon, ms::LatLon::kMaxLon};
 }
-} // namespace helpers
+}  // namespace helpers
 
 Packet::Packet() : m_lat(0.0), m_lon(0.0), m_timestamp(0) {}
 
 Packet::Packet(location::GpsInfo const & info)
-  : m_lat(info.m_latitude), m_lon(info.m_longitude), m_timestamp(info.m_timestamp)
-{
-}
+  : m_lat(info.m_latitude)
+  , m_lon(info.m_longitude)
+  , m_timestamp(info.m_timestamp)
+{}
 
-Packet::Packet(double lat, double lon, uint32_t timestamp)
-  : m_lat(lat), m_lon(lon), m_timestamp(timestamp)
-{
-}
+Packet::Packet(double lat, double lon, uint32_t timestamp) : m_lat(lat), m_lon(lon), m_timestamp(timestamp) {}
 
 PacketCar::PacketCar() : m_speedGroup(traffic::SpeedGroup::Unknown) {}
 
 PacketCar::PacketCar(location::GpsInfo const & info, traffic::SpeedGroup const & speedGroup)
-  : Packet(info), m_speedGroup(speedGroup)
-{
-}
+  : Packet(info)
+  , m_speedGroup(speedGroup)
+{}
 
 PacketCar::PacketCar(double lat, double lon, uint32_t timestamp, traffic::SpeedGroup speed)
-  : Packet(lat, lon, timestamp), m_speedGroup(speed)
-{
-}
+  : Packet(lat, lon, timestamp)
+  , m_speedGroup(speed)
+{}
 }  // namespace tracking
diff --git a/libs/tracking/archive.hpp b/libs/tracking/archive.hpp
index ff3d5e357..8ba1d8fd2 100644
--- a/libs/tracking/archive.hpp
+++ b/libs/tracking/archive.hpp
@@ -29,7 +29,6 @@
 #pragma clang diagnostic pop
 #endif
 
-
 namespace tracking
 {
 namespace helpers
@@ -51,7 +50,7 @@ struct Limits
 };
 
 Limits GetLimits(bool isDelta);
-} // namespace helpers
+}  // namespace helpers
 
 struct Packet
 {
@@ -100,8 +99,7 @@ private:
 // Abstract packet traits.
 template <typename Pack>
 struct TraitsPacket
-{
-};
+{};
 
 template <>
 struct TraitsPacket<Packet>
@@ -123,10 +121,8 @@ struct TraitsPacket<Packet>
   {
     auto const lim = helpers::GetLimits(isDelta);
 
-    double const lat =
-        Uint32ToDouble(ReadVarUint<uint32_t>(src), lim.m_minLat, lim.m_maxLat, kCoordBits);
-    double const lon =
-        Uint32ToDouble(ReadVarUint<uint32_t>(src), lim.m_minLon, lim.m_maxLon, kCoordBits);
+    double const lat = Uint32ToDouble(ReadVarUint<uint32_t>(src), lim.m_minLat, lim.m_maxLat, kCoordBits);
+    double const lon = Uint32ToDouble(ReadVarUint<uint32_t>(src), lim.m_minLon, lim.m_maxLon, kCoordBits);
     uint32_t const timestamp = ReadVarUint<uint32_t>(src);
     return Packet(lat, lon, timestamp);
   }
@@ -147,10 +143,7 @@ struct TraitsPacket<Packet>
     return Packet(lat, lon, timestamp);
   }
 
-  static traffic::SpeedGroup GetSpeedGroup(Packet const & packet)
-  {
-    return traffic::SpeedGroup::Unknown;
-  }
+  static traffic::SpeedGroup GetSpeedGroup(Packet const & packet) { return traffic::SpeedGroup::Unknown; }
 };
 
 template <>
@@ -160,8 +153,7 @@ struct TraitsPacket<PacketCar>
   static void Write(Writer & writer, PacketCar const & packet, bool isDelta)
   {
     TraitsPacket<Packet>::Write(writer, packet, isDelta);
-    static_assert(
-        std::is_same<uint8_t, std::underlying_type_t<decltype(packet.m_speedGroup)>>::value, "");
+    static_assert(std::is_same<uint8_t, std::underlying_type_t<decltype(packet.m_speedGroup)>>::value, "");
     WriteVarUint(writer, static_cast<uint8_t>(packet.m_speedGroup));
   }
 
@@ -185,10 +177,7 @@ struct TraitsPacket<PacketCar>
     return PacketCar(base.m_lat, base.m_lon, base.m_timestamp, delta.m_speedGroup);
   }
 
-  static traffic::SpeedGroup GetSpeedGroup(PacketCar const & packet)
-  {
-    return packet.m_speedGroup;
-  }
+  static traffic::SpeedGroup GetSpeedGroup(PacketCar const & packet) { return packet.m_speedGroup; }
 };
 
 template <typename Reader>
@@ -206,8 +195,7 @@ std::vector<uint8_t> InflateToBuffer(Reader & src)
 template <typename Writer>
 void DeflateToDst(Writer & dst, std::vector<uint8_t> const & buf)
 {
-  coding::ZLib::Deflate deflate(coding::ZLib::Deflate::Format::ZLib,
-                                coding::ZLib::Deflate::Level::BestCompression);
+  coding::ZLib::Deflate deflate(coding::ZLib::Deflate::Format::ZLib, coding::ZLib::Deflate::Level::BestCompression);
   std::vector<uint8_t> deflatedBuf;
   deflate(buf.data(), buf.size(), std::back_inserter(deflatedBuf));
   dst.Write(deflatedBuf.data(), deflatedBuf.size());
@@ -215,9 +203,9 @@ void DeflateToDst(Writer & dst, std::vector<uint8_t> const & buf)
 
 template <typename Pack>
 BasicArchive<Pack>::BasicArchive(size_t maxSize, double minDelaySeconds)
-  : m_buffer(maxSize), m_minDelaySeconds(minDelaySeconds)
-{
-}
+  : m_buffer(maxSize)
+  , m_minDelaySeconds(minDelaySeconds)
+{}
 
 template <typename Pack>
 template <typename... PackParameters>
@@ -306,7 +294,7 @@ bool BasicArchive<Pack>::Read(Reader & src)
     // Read with delta.
     while (reader.Size() > 0)
     {
-      Pack const delta = TraitsPacket<Pack>::Read(reader, true  /* isDelta */);
+      Pack const delta = TraitsPacket<Pack>::Read(reader, true /* isDelta */);
       m_buffer.push_back(TraitsPacket<Pack>::Combine(m_buffer.back(), delta));
     }
     return true;
diff --git a/libs/tracking/connection.cpp b/libs/tracking/connection.cpp
index 75192c166..4a70ecd06 100644
--- a/libs/tracking/connection.cpp
+++ b/libs/tracking/connection.cpp
@@ -12,9 +12,11 @@ uint32_t constexpr kSocketTimeoutMs = 10000;
 
 namespace tracking
 {
-Connection::Connection(std::unique_ptr<platform::Socket> socket, std::string const & host,
-                       uint16_t port, bool isHistorical)
-  : m_socket(std::move(socket)), m_host(host), m_port(port)
+Connection::Connection(std::unique_ptr<platform::Socket> socket, std::string const & host, uint16_t port,
+                       bool isHistorical)
+  : m_socket(std::move(socket))
+  , m_host(host)
+  , m_port(port)
 {
   if (!m_socket)
     return;
@@ -40,8 +42,7 @@ bool Connection::Reconnect()
     return false;
 
   std::string check(std::begin(Protocol::kFail), std::end(Protocol::kFail));
-  bool const isSuccess =
-      m_socket->Read(reinterpret_cast<uint8_t *>(&check[0]), static_cast<uint32_t>(check.size()));
+  bool const isSuccess = m_socket->Read(reinterpret_cast<uint8_t *>(&check[0]), static_cast<uint32_t>(check.size()));
   if (!isSuccess || check != std::string(std::begin(Protocol::kOk), std::end(Protocol::kOk)))
     return false;
 
diff --git a/libs/tracking/connection.hpp b/libs/tracking/connection.hpp
index e1e1ac237..c34267fb3 100644
--- a/libs/tracking/connection.hpp
+++ b/libs/tracking/connection.hpp
@@ -15,7 +15,10 @@
 #pragma clang diagnostic pop
 #endif
 
-namespace platform { class Socket; }
+namespace platform
+{
+class Socket;
+}
 
 namespace tracking
 {
@@ -24,8 +27,7 @@ using DataPoint = coding::TrafficGPSEncoder::DataPoint;
 class Connection final
 {
 public:
-  Connection(std::unique_ptr<platform::Socket> socket, std::string const & host, uint16_t port,
-             bool isHistorical);
+  Connection(std::unique_ptr<platform::Socket> socket, std::string const & host, uint16_t port, bool isHistorical);
   bool Reconnect();
   void Shutdown();
   bool Send(boost::circular_buffer<DataPoint> const & points);
diff --git a/libs/tracking/protocol.cpp b/libs/tracking/protocol.cpp
index e8e1e82ed..aec9a8a44 100644
--- a/libs/tracking/protocol.cpp
+++ b/libs/tracking/protocol.cpp
@@ -14,8 +14,7 @@ using namespace std;
 namespace
 {
 template <typename Container>
-vector<uint8_t> CreateDataPacketImpl(Container const & points,
-                                     tracking::Protocol::PacketType const type)
+vector<uint8_t> CreateDataPacketImpl(Container const & points, tracking::Protocol::PacketType const type)
 {
   vector<uint8_t> buffer;
   MemWriter<decltype(buffer)> writer(buffer);
@@ -101,9 +100,7 @@ string Protocol::DecodeAuthPacket(Protocol::PacketType type, vector<uint8_t> con
   case Protocol::PacketType::AuthV0: return string(begin(data), end(data));
   case Protocol::PacketType::Error:
   case Protocol::PacketType::DataV0:
-  case Protocol::PacketType::DataV1:
-    LOG(LERROR, ("Error decoding AUTH packet. PacketType =", type));
-    break;
+  case Protocol::PacketType::DataV1: LOG(LERROR, ("Error decoding AUTH packet. PacketType =", type)); break;
   }
   return string();
 }
@@ -118,16 +115,10 @@ Protocol::DataElementsVec Protocol::DecodeDataPacket(PacketType type, vector<uin
   {
     switch (type)
     {
-    case Protocol::PacketType::DataV0:
-      Encoder::DeserializeDataPoints(0 /* version */, src, points);
-      break;
-    case Protocol::PacketType::DataV1:
-      Encoder::DeserializeDataPoints(1 /* version */, src, points);
-      break;
+    case Protocol::PacketType::DataV0: Encoder::DeserializeDataPoints(0 /* version */, src, points); break;
+    case Protocol::PacketType::DataV1: Encoder::DeserializeDataPoints(1 /* version */, src, points); break;
     case Protocol::PacketType::Error:
-    case Protocol::PacketType::AuthV0:
-      LOG(LERROR, ("Error decoding DATA packet. PacketType =", type));
-      return {};
+    case Protocol::PacketType::AuthV0: LOG(LERROR, ("Error decoding DATA packet. PacketType =", type)); return {};
     }
     return points;
   }
diff --git a/libs/tracking/pytracking/bindings.cpp b/libs/tracking/pytracking/bindings.cpp
index 26ee587d0..c0d634760 100644
--- a/libs/tracking/pytracking/bindings.cpp
+++ b/libs/tracking/pytracking/bindings.cpp
@@ -11,7 +11,6 @@
 #include <boost/python.hpp>
 #include <boost/python/suite/indexing/vector_indexing_suite.hpp>
 
-
 BOOST_PYTHON_MODULE(pytracking)
 {
   using namespace boost::python;
@@ -24,12 +23,9 @@ BOOST_PYTHON_MODULE(pytracking)
   to_python_converter<std::vector<uint8_t>, vector_uint8t_to_str>();
   vector_uint8t_from_python_str();
 
-  class_<Protocol::DataElementsVec>("DataElementsVec")
-      .def(vector_indexing_suite<Protocol::DataElementsVec>());
+  class_<Protocol::DataElementsVec>("DataElementsVec").def(vector_indexing_suite<Protocol::DataElementsVec>());
 
-  class_<ms::LatLon>("LatLon")
-      .def_readwrite("lat", &ms::LatLon::m_lat)
-      .def_readwrite("lon", &ms::LatLon::m_lon);
+  class_<ms::LatLon>("LatLon").def_readwrite("lat", &ms::LatLon::m_lat).def_readwrite("lon", &ms::LatLon::m_lon);
 
   class_<coding::TrafficGPSEncoder::DataPoint>("DataPoint")
       .def(init<uint64_t, ms::LatLon const &, uint8_t>())
@@ -45,11 +41,9 @@ BOOST_PYTHON_MODULE(pytracking)
       .value("CurrentAuth", Protocol::PacketType::CurrentAuth)
       .value("CurrentData", Protocol::PacketType::CurrentData);
 
-  std::vector<uint8_t> (*CreateDataPacket1)(Protocol::DataElementsCirc const &,
-                                            tracking::Protocol::PacketType) =
+  std::vector<uint8_t> (*CreateDataPacket1)(Protocol::DataElementsCirc const &, tracking::Protocol::PacketType) =
       &Protocol::CreateDataPacket;
-  std::vector<uint8_t> (*CreateDataPacket2)(Protocol::DataElementsVec const &,
-                                            tracking::Protocol::PacketType) =
+  std::vector<uint8_t> (*CreateDataPacket2)(Protocol::DataElementsVec const &, tracking::Protocol::PacketType) =
       &Protocol::CreateDataPacket;
 
   class_<Protocol>("Protocol")
diff --git a/libs/tracking/reporter.cpp b/libs/tracking/reporter.cpp
index 2ad082011..e364780b6 100644
--- a/libs/tracking/reporter.cpp
+++ b/libs/tracking/reporter.cpp
@@ -22,25 +22,23 @@ double constexpr kReconnectDelaySeconds = 40.0;
 double constexpr kNotChargingEventPeriod = 5 * 60.0;
 
 static_assert(kMinDelaySeconds != 0, "");
-} // namespace
+}  // namespace
 
 namespace tracking
 {
-const char Reporter::kEnableTrackingKey[] = "StatisticsEnabled";
+char const Reporter::kEnableTrackingKey[] = "StatisticsEnabled";
 
 // static
 milliseconds const Reporter::kPushDelayMs = milliseconds(20000);
 
 // Set m_points size to be enough to keep all points even if one reconnect attempt failed.
-Reporter::Reporter(unique_ptr<platform::Socket> socket, string const & host, uint16_t port,
-                   milliseconds pushDelay)
+Reporter::Reporter(unique_ptr<platform::Socket> socket, string const & host, uint16_t port, milliseconds pushDelay)
   : m_allowSendingPoints(true)
   , m_realtimeSender(std::move(socket), host, port, false)
   , m_pushDelay(pushDelay)
   , m_points(ceil(duration_cast<seconds>(pushDelay).count() + kReconnectDelaySeconds) / kMinDelaySeconds)
   , m_thread([this] { Run(); })
-{
-}
+{}
 
 Reporter::~Reporter()
 {
@@ -73,9 +71,8 @@ void Reporter::AddLocation(location::GpsInfo const & info, traffic::SpeedGroup t
   }
 
   m_lastGpsTime = info.m_timestamp;
-  m_input.push_back(
-      DataPoint(info.m_timestamp, ms::LatLon(info.m_latitude, info.m_longitude),
-                static_cast<std::underlying_type<traffic::SpeedGroup>::type>(traffic)));
+  m_input.push_back(DataPoint(info.m_timestamp, ms::LatLon(info.m_latitude, info.m_longitude),
+                              static_cast<std::underlying_type<traffic::SpeedGroup>::type>(traffic)));
 }
 
 void Reporter::Run()
@@ -94,19 +91,14 @@ void Reporter::Run()
 
     lock.unlock();
     if (m_points.empty() && m_idleFn)
-    {
       m_idleFn();
-    }
-    else
-    {
-      if (SendPoints())
-        m_points.clear();
-    }
+    else if (SendPoints())
+      m_points.clear();
     lock.lock();
 
     auto const passedMs = duration_cast<milliseconds>(steady_clock::now() - startTime);
     if (passedMs < m_pushDelay)
-      m_cv.wait_for(lock, m_pushDelay - passedMs, [this]{return m_isFinished;});
+      m_cv.wait_for(lock, m_pushDelay - passedMs, [this] { return m_isFinished; });
   }
 
   LOG(LINFO, ("Tracking Reporter finished"));
diff --git a/libs/tracking/reporter.hpp b/libs/tracking/reporter.hpp
index 3c10931cd..ec8fcdb31 100644
--- a/libs/tracking/reporter.hpp
+++ b/libs/tracking/reporter.hpp
@@ -41,7 +41,7 @@ class Reporter final
 {
 public:
   static std::chrono::milliseconds const kPushDelayMs;
-  static const char kEnableTrackingKey[];
+  static char const kEnableTrackingKey[];
 
   Reporter(std::unique_ptr<platform::Socket> socket, std::string const & host, uint16_t port,
            std::chrono::milliseconds pushDelay);
diff --git a/libs/tracking/tracking_fuzz_tests/tracking_fuzz_tests.cpp b/libs/tracking/tracking_fuzz_tests/tracking_fuzz_tests.cpp
index b32af49f1..a779d4e59 100644
--- a/libs/tracking/tracking_fuzz_tests/tracking_fuzz_tests.cpp
+++ b/libs/tracking/tracking_fuzz_tests/tracking_fuzz_tests.cpp
@@ -57,8 +57,8 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const * data, size_t size)
   Protocol::DataElementsCirc dataElementsCirc(dataElementsVec.cbegin(), dataElementsVec.cend());
 
   Protocol::DecodeHeader(dataVec);
-  for (auto const type : {Protocol::PacketType::Error, Protocol::PacketType::AuthV0,
-                          Protocol::PacketType::DataV0, Protocol::PacketType::DataV1})
+  for (auto const type : {Protocol::PacketType::Error, Protocol::PacketType::AuthV0, Protocol::PacketType::DataV0,
+                          Protocol::PacketType::DataV1})
   {
     Protocol::CreateDataPacket(dataElementsVec, type);
     Protocol::CreateDataPacket(dataElementsCirc, type);
diff --git a/libs/tracking/tracking_tests/archival_reporter_tests.cpp b/libs/tracking/tracking_tests/archival_reporter_tests.cpp
index 824e7bc29..166da3702 100644
--- a/libs/tracking/tracking_tests/archival_reporter_tests.cpp
+++ b/libs/tracking/tracking_tests/archival_reporter_tests.cpp
@@ -147,8 +147,7 @@ UNIT_TEST(ArchiveName_Create)
   routing::RouterType const routerType = routing::RouterType::Pedestrian;
   uint32_t const version = 1;
   std::chrono::seconds const timestamp(1573635326);
-  std::string const filename =
-      tracking::archival_file::GetArchiveFilename(version, timestamp, routerType);
+  std::string const filename = tracking::archival_file::GetArchiveFilename(version, timestamp, routerType);
 
   CHECK_EQUAL(filename, "1_1573635326_1.track", ());
 }
diff --git a/libs/tracking/tracking_tests/protocol_test.cpp b/libs/tracking/tracking_tests/protocol_test.cpp
index 888f2403a..29d10757a 100644
--- a/libs/tracking/tracking_tests/protocol_test.cpp
+++ b/libs/tracking/tracking_tests/protocol_test.cpp
@@ -102,8 +102,7 @@ void DecodeDataPacketVersionTest(Container const & points, Protocol::PacketType
   TEST_EQUAL(points.size(), result.size(), ());
   for (size_t i = 0; i < points.size(); ++i)
   {
-    TEST_EQUAL(points[i].m_timestamp, result[i].m_timestamp,
-               (points[i].m_timestamp, result[i].m_timestamp));
+    TEST_EQUAL(points[i].m_timestamp, result[i].m_timestamp, (points[i].m_timestamp, result[i].m_timestamp));
     TEST(AlmostEqualAbsOrRel(points[i].m_latLon.m_lat, result[i].m_latLon.m_lat, kEps),
          (points[i].m_latLon.m_lat, result[i].m_latLon.m_lat));
     TEST(AlmostEqualAbsOrRel(points[i].m_latLon.m_lon, result[i].m_latLon.m_lon, kEps),
diff --git a/libs/tracking/tracking_tests/reporter_test.cpp b/libs/tracking/tracking_tests/reporter_test.cpp
index 283ed721e..ec2bf07b3 100644
--- a/libs/tracking/tracking_tests/reporter_test.cpp
+++ b/libs/tracking/tracking_tests/reporter_test.cpp
@@ -1,7 +1,7 @@
 #include "testing/testing.hpp"
 
-#include "tracking/reporter.hpp"
 #include "tracking/protocol.hpp"
+#include "tracking/reporter.hpp"
 
 #include "coding/traffic.hpp"
 
@@ -25,8 +25,8 @@ using namespace platform::tests_support;
 
 namespace
 {
-void TransferLocation(Reporter & reporter, TestSocket & testSocket, double timestamp,
-                      double latidute, double longtitude)
+void TransferLocation(Reporter & reporter, TestSocket & testSocket, double timestamp, double latidute,
+                      double longtitude)
 {
   location::GpsInfo gpsInfo;
   gpsInfo.m_timestamp = timestamp;
@@ -60,15 +60,15 @@ void TransferLocation(Reporter & reporter, TestSocket & testSocket, double times
       break;
     }
     }
-  } while (readSize);
+  }
+  while (readSize);
 
   TEST(!buffer.empty(), ());
   vector<coding::TrafficGPSEncoder::DataPoint> points;
   MemReader memReader(buffer.data(), buffer.size());
   ReaderSource<MemReader> src(memReader);
   src.Skip(sizeof(uint32_t /* header */));
-  coding::TrafficGPSEncoder::DeserializeDataPoints(coding::TrafficGPSEncoder::kLatestVersion, src,
-                                                   points);
+  coding::TrafficGPSEncoder::DeserializeDataPoints(coding::TrafficGPSEncoder::kLatestVersion, src, points);
 
   TEST_EQUAL(points.size(), 1, ());
   auto const & point = points[0];
@@ -76,7 +76,7 @@ void TransferLocation(Reporter & reporter, TestSocket & testSocket, double times
   TEST(AlmostEqualAbs(point.m_latLon.m_lat, latidute, 0.001), ());
   TEST(AlmostEqualAbs(point.m_latLon.m_lon, longtitude, 0.001), ());
 }
-}
+}  // namespace
 
 UNIT_TEST(Reporter_Smoke)
 {
diff --git a/libs/traffic/pytraffic/bindings.cpp b/libs/traffic/pytraffic/bindings.cpp
index 49ac6a03c..b2278e500 100644
--- a/libs/traffic/pytraffic/bindings.cpp
+++ b/libs/traffic/pytraffic/bindings.cpp
@@ -1,5 +1,5 @@
-#include "traffic/traffic_info.hpp"
 #include "traffic/speed_groups.hpp"
+#include "traffic/traffic_info.hpp"
 
 #include "indexer/classificator_loader.hpp"
 
@@ -31,9 +31,10 @@ struct SegmentSpeeds
 {
   SegmentSpeeds() = default;
   SegmentSpeeds(double weightedSpeed, double weightedRefSpeed, double weight)
-    : m_weightedSpeed(weightedSpeed), m_weightedRefSpeed(weightedRefSpeed), m_weight(weight)
-  {
-  }
+    : m_weightedSpeed(weightedSpeed)
+    , m_weightedRefSpeed(weightedRefSpeed)
+    , m_weight(weight)
+  {}
 
   double m_weightedSpeed = 0;
   double m_weightedRefSpeed = 0;
@@ -103,8 +104,7 @@ boost::python::list GenerateTrafficKeys(std::string const & mwmPath)
 }
 
 std::vector<uint8_t> GenerateTrafficValues(std::vector<traffic::TrafficInfo::RoadSegmentId> const & keys,
-                                           boost::python::dict const & segmentMappingDict,
-                                           uint8_t useTempBlock)
+                                           boost::python::dict const & segmentMappingDict, uint8_t useTempBlock)
 {
   SegmentMapping segmentMapping;
   boost::python::list mappingKeys = segmentMappingDict.keys();
@@ -178,15 +178,13 @@ BOOST_PYTHON_MODULE(pytraffic)
       .def("__repr__", &SegmentSpeedsRepr)
       .def_readwrite("weighted_speed", &SegmentSpeeds::m_weightedSpeed)
       .def_readwrite("weighted_ref_speed", &SegmentSpeeds::m_weightedRefSpeed)
-      .def_readwrite("weight", &SegmentSpeeds::m_weight)
-  ;
+      .def_readwrite("weight", &SegmentSpeeds::m_weight);
 
   class_<traffic::TrafficInfo::RoadSegmentId>("RoadSegmentId", init<uint32_t, uint16_t, uint8_t>())
       .def("__repr__", &RoadSegmentIdRepr)
       .add_property("fid", &traffic::TrafficInfo::RoadSegmentId::GetFid)
       .add_property("idx", &traffic::TrafficInfo::RoadSegmentId::GetIdx)
-      .add_property("dir", &traffic::TrafficInfo::RoadSegmentId::GetDir)
-  ;
+      .add_property("dir", &traffic::TrafficInfo::RoadSegmentId::GetDir);
 
   class_<std::vector<traffic::TrafficInfo::RoadSegmentId>>("RoadSegmentIdVec")
       .def(vector_indexing_suite<std::vector<traffic::TrafficInfo::RoadSegmentId>>());
@@ -199,8 +197,7 @@ BOOST_PYTHON_MODULE(pytraffic)
       .value("G4", traffic::SpeedGroup::G4)
       .value("G5", traffic::SpeedGroup::G5)
       .value("TempBlock", traffic::SpeedGroup::TempBlock)
-      .value("Unknown", traffic::SpeedGroup::Unknown)
-  ;
+      .value("Unknown", traffic::SpeedGroup::Unknown);
 
   def("load_classificator", LoadClassificator);
   def("generate_traffic_keys", GenerateTrafficKeys);
diff --git a/libs/traffic/speed_groups.cpp b/libs/traffic/speed_groups.cpp
index 25498813e..191a747df 100644
--- a/libs/traffic/speed_groups.cpp
+++ b/libs/traffic/speed_groups.cpp
@@ -11,10 +11,8 @@ SpeedGroup GetSpeedGroupByPercentage(double p)
   p = math::Clamp(p, 0.0, 100.0);
   SpeedGroup res = SpeedGroup::Unknown;
   for (int i = static_cast<int>(SpeedGroup::Count) - 1; i >= 0; --i)
-  {
     if (p <= kSpeedGroupThresholdPercentage[i])
       res = static_cast<SpeedGroup>(i);
-  }
   return res;
 }
 
diff --git a/libs/traffic/traffic_cache.hpp b/libs/traffic/traffic_cache.hpp
index d80a5f353..bc4659405 100644
--- a/libs/traffic/traffic_cache.hpp
+++ b/libs/traffic/traffic_cache.hpp
@@ -10,7 +10,7 @@
 
 namespace traffic
 {
-using AllMwmTrafficInfo = std::map<MwmSet::MwmId, std::shared_ptr<const traffic::TrafficInfo::Coloring>>;
+using AllMwmTrafficInfo = std::map<MwmSet::MwmId, std::shared_ptr<traffic::TrafficInfo::Coloring const>>;
 
 class TrafficCache
 {
diff --git a/libs/traffic/traffic_info.cpp b/libs/traffic/traffic_info.cpp
index 526a4e4b3..e4a339b2e 100644
--- a/libs/traffic/traffic_info.cpp
+++ b/libs/traffic/traffic_info.cpp
@@ -29,7 +29,6 @@
 #include "defines.hpp"
 #include "private.h"
 
-
 namespace traffic
 {
 using namespace std;
@@ -80,10 +79,8 @@ char const kETag[] = "etag";
 // TrafficInfo::RoadSegmentId -----------------------------------------------------------------
 TrafficInfo::RoadSegmentId::RoadSegmentId() : m_fid(0), m_idx(0), m_dir(0) {}
 
-TrafficInfo::RoadSegmentId::RoadSegmentId(uint32_t fid, uint16_t idx, uint8_t dir)
-  : m_fid(fid), m_idx(idx), m_dir(dir)
-{
-}
+TrafficInfo::RoadSegmentId::RoadSegmentId(uint32_t fid, uint16_t idx, uint8_t dir) : m_fid(fid), m_idx(idx), m_dir(dir)
+{}
 
 // TrafficInfo --------------------------------------------------------------------------------
 
@@ -117,8 +114,8 @@ TrafficInfo::TrafficInfo(MwmSet::MwmId const & mwmId, int64_t currentDataVersion
       catch (Reader::Exception const & e)
       {
         auto const info = mwmId.GetInfo();
-        LOG(LINFO, ("Could not read traffic keys from section. MWM:", info->GetCountryName(),
-                "Version:", info->GetVersion()));
+        LOG(LINFO,
+            ("Could not read traffic keys from section. MWM:", info->GetCountryName(), "Version:", info->GetVersion()));
       }
     }
     else
@@ -152,13 +149,10 @@ bool TrafficInfo::ReceiveTrafficData(string & etag)
   vector<SpeedGroup> values;
   switch (ReceiveTrafficValues(etag, values))
   {
-  case ServerDataStatus::New:
-    return UpdateTrafficData(values);
-  case ServerDataStatus::NotChanged:
-    return true;
+  case ServerDataStatus::New: return UpdateTrafficData(values);
+  case ServerDataStatus::NotChanged: return true;
   case ServerDataStatus::NotFound:
-  case ServerDataStatus::Error:
-    return false;
+  case ServerDataStatus::Error: return false;
   }
   return false;
 }
@@ -185,10 +179,8 @@ void TrafficInfo::ExtractTrafficKeys(string const & mwmPath, vector<RoadSegmentI
     auto const numPoints = static_cast<uint16_t>(ft.GetPointsCount());
     uint8_t const numDirs = routing::CarModel::AllLimitsInstance().IsOneWay(types) ? 1 : 2;
     for (uint16_t i = 0; i + 1 < numPoints; ++i)
-    {
       for (uint8_t dir = 0; dir < numDirs; ++dir)
         result.emplace_back(fid, i, dir);
-    }
   });
 
   ASSERT(is_sorted(result.begin(), result.end()), ());
@@ -196,8 +188,7 @@ void TrafficInfo::ExtractTrafficKeys(string const & mwmPath, vector<RoadSegmentI
 
 // static
 void TrafficInfo::CombineColorings(vector<TrafficInfo::RoadSegmentId> const & keys,
-                                   TrafficInfo::Coloring const & knownColors,
-                                   TrafficInfo::Coloring & result)
+                                   TrafficInfo::Coloring const & knownColors, TrafficInfo::Coloring & result)
 {
   result.clear();
   size_t numKnown = 0;
@@ -290,8 +281,7 @@ void TrafficInfo::SerializeTrafficKeys(vector<RoadSegmentId> const & keys, vecto
 }
 
 // static
-void TrafficInfo::DeserializeTrafficKeys(vector<uint8_t> const & data,
-                                         vector<TrafficInfo::RoadSegmentId> & result)
+void TrafficInfo::DeserializeTrafficKeys(vector<uint8_t> const & data, vector<TrafficInfo::RoadSegmentId> & result)
 {
   MemReaderWithExceptions memReader(data.data(), data.size());
   ReaderSource<decltype(memReader)> src(memReader);
@@ -338,8 +328,7 @@ void TrafficInfo::DeserializeTrafficKeys(vector<uint8_t> const & data,
 }
 
 // static
-void TrafficInfo::SerializeTrafficValues(vector<SpeedGroup> const & values,
-                                         vector<uint8_t> & result)
+void TrafficInfo::SerializeTrafficValues(vector<SpeedGroup> const & values, vector<uint8_t> & result)
 {
   vector<uint8_t> buf;
   MemWriter<vector<uint8_t>> memWriter(buf);
@@ -364,8 +353,7 @@ void TrafficInfo::SerializeTrafficValues(vector<SpeedGroup> const & values,
 }
 
 // static
-void TrafficInfo::DeserializeTrafficValues(vector<uint8_t> const & data,
-                                           vector<SpeedGroup> & result)
+void TrafficInfo::DeserializeTrafficValues(vector<uint8_t> const & data, vector<SpeedGroup> & result)
 {
   using Inflate = coding::ZLib::Inflate;
 
@@ -461,8 +449,8 @@ TrafficInfo::ServerDataStatus TrafficInfo::ReceiveTrafficValues(string & etag, v
   catch (Reader::Exception const & e)
   {
     m_availability = Availability::NoData;
-    LOG(LWARNING, ("Could not read traffic values received from server. MWM:",
-                   info->GetCountryName(), "Version:", info->GetVersion()));
+    LOG(LWARNING, ("Could not read traffic values received from server. MWM:", info->GetCountryName(),
+                   "Version:", info->GetVersion()));
     return ServerDataStatus::Error;
   }
   // Update ETag for this MWM.
@@ -481,23 +469,21 @@ bool TrafficInfo::UpdateTrafficData(vector<SpeedGroup> const & values)
 
   if (m_keys.size() != values.size())
   {
-    LOG(LWARNING,
-        ("The number of received traffic values does not correspond to the number of keys:",
-         m_keys.size(), "keys", values.size(), "values."));
+    LOG(LWARNING, ("The number of received traffic values does not correspond to the number of keys:", m_keys.size(),
+                   "keys", values.size(), "values."));
     m_availability = Availability::NoData;
     return false;
   }
 
   for (size_t i = 0; i < m_keys.size(); ++i)
-  {
     if (values[i] != SpeedGroup::Unknown)
       m_coloring.emplace(m_keys[i], values[i]);
-  }
 
   return true;
 }
 
-TrafficInfo::ServerDataStatus TrafficInfo::ProcessFailure(platform::HttpClient const & request, int64_t const mwmVersion)
+TrafficInfo::ServerDataStatus TrafficInfo::ProcessFailure(platform::HttpClient const & request,
+                                                          int64_t const mwmVersion)
 {
   switch (request.ErrorCode())
   {
@@ -528,11 +514,10 @@ TrafficInfo::ServerDataStatus TrafficInfo::ProcessFailure(platform::HttpClient c
 
 string DebugPrint(TrafficInfo::RoadSegmentId const & id)
 {
-  string const dir =
-  id.m_dir == TrafficInfo::RoadSegmentId::kForwardDirection ? "Forward" : "Backward";
+  string const dir = id.m_dir == TrafficInfo::RoadSegmentId::kForwardDirection ? "Forward" : "Backward";
   ostringstream oss;
   oss << "RoadSegmentId ["
-  << " fid = " << id.m_fid << " idx = " << id.m_idx << " dir = " << dir << " ]";
+      << " fid = " << id.m_fid << " idx = " << id.m_idx << " dir = " << dir << " ]";
   return oss.str();
 }
 }  // namespace traffic
diff --git a/libs/traffic/traffic_info.hpp b/libs/traffic/traffic_info.hpp
index c92378fc1..5981a8aab 100644
--- a/libs/traffic/traffic_info.hpp
+++ b/libs/traffic/traffic_info.hpp
@@ -42,10 +42,7 @@ public:
 
     RoadSegmentId(uint32_t fid, uint16_t idx, uint8_t dir);
 
-    bool operator==(RoadSegmentId const & o) const
-    {
-      return m_fid == o.m_fid && m_idx == o.m_idx && m_dir == o.m_dir;
-    }
+    bool operator==(RoadSegmentId const & o) const { return m_fid == o.m_fid && m_idx == o.m_idx && m_dir == o.m_dir; }
 
     bool operator<(RoadSegmentId const & o) const
     {
@@ -103,8 +100,7 @@ public:
   // Adds the unknown values to the partially known coloring map |knownColors|
   // so that the keys of the resulting map are exactly |keys|.
   static void CombineColorings(std::vector<TrafficInfo::RoadSegmentId> const & keys,
-                               TrafficInfo::Coloring const & knownColors,
-                               TrafficInfo::Coloring & result);
+                               TrafficInfo::Coloring const & knownColors, TrafficInfo::Coloring & result);
 
   // Serializes the keys of the coloring map to |result|.
   // The keys are road segments ids which do not change during
diff --git a/libs/traffic/traffic_tests/traffic_info_test.cpp b/libs/traffic/traffic_tests/traffic_info_test.cpp
index 14b230582..003ef0c97 100644
--- a/libs/traffic/traffic_tests/traffic_info_test.cpp
+++ b/libs/traffic/traffic_tests/traffic_info_test.cpp
@@ -33,10 +33,7 @@ protected:
     return info;
   }
 
-  unique_ptr<MwmValue> CreateValue(MwmInfo & info) const override
-  {
-    return make_unique<MwmValue>(info.GetLocalFile());
-  }
+  unique_ptr<MwmValue> CreateValue(MwmInfo & info) const override { return make_unique<MwmValue>(info.GetLocalFile()); }
 };
 }  // namespace
 
@@ -123,15 +120,20 @@ UNIT_TEST(TrafficInfo_UpdateTrafficData)
   vector<TrafficInfo::RoadSegmentId> const keys = {
       TrafficInfo::RoadSegmentId(0, 0, 0),
 
-      TrafficInfo::RoadSegmentId(1, 0, 0), TrafficInfo::RoadSegmentId(1, 0, 1),
+      TrafficInfo::RoadSegmentId(1, 0, 0),
+      TrafficInfo::RoadSegmentId(1, 0, 1),
   };
 
   vector<SpeedGroup> const values1 = {
-      SpeedGroup::G1, SpeedGroup::G2, SpeedGroup::G3,
+      SpeedGroup::G1,
+      SpeedGroup::G2,
+      SpeedGroup::G3,
   };
 
   vector<SpeedGroup> const values2 = {
-      SpeedGroup::G4, SpeedGroup::G5, SpeedGroup::Unknown,
+      SpeedGroup::G4,
+      SpeedGroup::G5,
+      SpeedGroup::Unknown,
   };
 
   TrafficInfo info;
diff --git a/libs/transit/experimental/transit_data.cpp b/libs/transit/experimental/transit_data.cpp
index 364f9c4ae..d97726ebe 100644
--- a/libs/transit/experimental/transit_data.cpp
+++ b/libs/transit/experimental/transit_data.cpp
@@ -17,8 +17,8 @@ namespace transit
 namespace experimental
 {
 template <class E>
-void ReadItems(uint32_t start, uint32_t end, std::string const & entityName,
-               NonOwningReaderSource & src, std::vector<E> & entities)
+void ReadItems(uint32_t start, uint32_t end, std::string const & entityName, NonOwningReaderSource & src,
+               std::vector<E> & entities)
 {
   routing::transit::Deserializer<NonOwningReaderSource> deserializer(src);
 
@@ -265,8 +265,7 @@ Schedule GetScheduleFromJson(json_t * obj)
       uint32_t rawData = 0;
       FromJSONObject(item, "dates_interval", rawData);
 
-      schedule.AddDatesInterval(DatesInterval(rawData),
-                                GetFrequencyIntervals(item, "time_intervals"));
+      schedule.AddDatesInterval(DatesInterval(rawData), GetFrequencyIntervals(item, "time_intervals"));
     }
   }
 
@@ -278,16 +277,14 @@ Schedule GetScheduleFromJson(json_t * obj)
       uint32_t rawData = 0;
       FromJSONObject(item, "exception", rawData);
 
-      schedule.AddDateException(DateException(rawData),
-                                GetFrequencyIntervals(item, "time_intervals"));
+      schedule.AddDateException(DateException(rawData), GetFrequencyIntervals(item, "time_intervals"));
     }
   }
 
   return schedule;
 }
 
-std::tuple<OsmId, FeatureId, TransitId> CalculateIds(base::Json const & obj,
-                                                     OsmIdToFeatureIdsMap const & mapping)
+std::tuple<OsmId, FeatureId, TransitId> CalculateIds(base::Json const & obj, OsmIdToFeatureIdsMap const & mapping)
 {
   OsmId osmId = kInvalidOsmId;
   FeatureId featureId = kInvalidFeatureId;
@@ -308,14 +305,14 @@ std::tuple<OsmId, FeatureId, TransitId> CalculateIds(base::Json const & obj,
     auto const it = mapping.find(geoId);
     if (it != mapping.cend())
     {
-      CHECK(!it->second.empty(), ("Osm id", osmId, "encoded as", geoId.GetEncodedId(),
-                                  "from transit does not correspond to any feature."));
+      CHECK(!it->second.empty(),
+            ("Osm id", osmId, "encoded as", geoId.GetEncodedId(), "from transit does not correspond to any feature."));
       if (it->second.size() != 1)
       {
         // |osmId| corresponds to several feature ids. It may happen in case of stops,
         // if a stop is present as a relation. It's a rare case.
-        LOG(LWARNING, ("Osm id", osmId, "encoded as", geoId.GetEncodedId(), "corresponds to",
-                       it->second.size(), "feature ids."));
+        LOG(LWARNING,
+            ("Osm id", osmId, "encoded as", geoId.GetEncodedId(), "corresponds to", it->second.size(), "feature ids."));
       }
       featureId = it->second[0];
     }
@@ -396,8 +393,7 @@ void Read(base::Json const & obj, std::vector<Stop> & stops, OsmIdToFeatureIdsMa
   FromJSONObject(obj.get(), "title", title);
   TimeTable const timetable = GetTimeTableFromJson(obj.get());
   m2::PointD const point = GetPointFromJson(base::GetJSONObligatoryField(obj.get(), "point"));
-  IdList const & transferIds =
-      GetVectorFromJson<TransitId>(obj.get(), "transfer_ids", false /* obligatory */);
+  IdList const & transferIds = GetVectorFromJson<TransitId>(obj.get(), "transfer_ids", false /* obligatory */);
 
   stops.emplace_back(id, featureId, osmId, title, timetable, point, transferIds);
 }
@@ -498,8 +494,7 @@ void ReadData(std::string const & path, Args &&... args)
   }
 }
 
-void TransitData::DeserializeFromJson(std::string const & dirWithJsons,
-                                      OsmIdToFeatureIdsMap const & mapping)
+void TransitData::DeserializeFromJson(std::string const & dirWithJsons, OsmIdToFeatureIdsMap const & mapping)
 {
   ReadData(base::JoinPath(dirWithJsons, kNetworksFile), m_networks);
   ReadData(base::JoinPath(dirWithJsons, kRoutesFile), m_routes);
@@ -564,7 +559,8 @@ void TransitData::Serialize(Writer & writer)
 
 void TransitData::Deserialize(Reader & reader)
 {
-  DeserializeWith(reader, [this](NonOwningReaderSource & src) {
+  DeserializeWith(reader, [this](NonOwningReaderSource & src)
+  {
     ReadStops(src);
     ReadGates(src);
     ReadEdges(src);
@@ -579,7 +575,8 @@ void TransitData::Deserialize(Reader & reader)
 
 void TransitData::DeserializeForRouting(Reader & reader)
 {
-  DeserializeWith(reader, [this](NonOwningReaderSource & src) {
+  DeserializeWith(reader, [this](NonOwningReaderSource & src)
+  {
     ReadStops(src);
     ReadGates(src);
     ReadEdges(src);
@@ -590,7 +587,8 @@ void TransitData::DeserializeForRouting(Reader & reader)
 
 void TransitData::DeserializeForRendering(Reader & reader)
 {
-  DeserializeWith(reader, [this](NonOwningReaderSource & src) {
+  DeserializeWith(reader, [this](NonOwningReaderSource & src)
+  {
     ReadStops(src);
     src.Skip(m_header.m_edgesOffset - src.Pos());
     ReadEdges(src);
@@ -605,7 +603,8 @@ void TransitData::DeserializeForRendering(Reader & reader)
 
 void TransitData::DeserializeForCrossMwm(Reader & reader)
 {
-  DeserializeWith(reader, [this](NonOwningReaderSource & src) {
+  DeserializeWith(reader, [this](NonOwningReaderSource & src)
+  {
     ReadStops(src);
     src.Skip(m_header.m_edgesOffset - src.Pos());
     ReadEdges(src);
@@ -639,8 +638,8 @@ void TransitData::CheckUnique() const
 bool TransitData::IsEmpty() const
 {
   // |m_transfers| and |m_gates| may be empty and it is ok.
-  return m_networks.empty() || m_routes.empty() || m_lines.empty() || m_shapes.empty() ||
-         m_stops.empty() || m_edges.empty();
+  return m_networks.empty() || m_routes.empty() || m_lines.empty() || m_shapes.empty() || m_stops.empty() ||
+         m_edges.empty();
 }
 
 void TransitData::Sort()
@@ -649,15 +648,13 @@ void TransitData::Sort()
   Visit(visitor);
 }
 
-void TransitData::SetGatePedestrianSegments(size_t gateIdx,
-                                            std::vector<SingleMwmSegment> const & seg)
+void TransitData::SetGatePedestrianSegments(size_t gateIdx, std::vector<SingleMwmSegment> const & seg)
 {
   CHECK_LESS(gateIdx, m_gates.size(), ());
   m_gates[gateIdx].SetBestPedestrianSegments(seg);
 }
 
-void TransitData::SetStopPedestrianSegments(size_t stopIdx,
-                                            std::vector<SingleMwmSegment> const & seg)
+void TransitData::SetStopPedestrianSegments(size_t stopIdx, std::vector<SingleMwmSegment> const & seg)
 {
   CHECK_LESS(stopIdx, m_stops.size(), ());
   m_stops[stopIdx].SetBestPedestrianSegments(seg);
@@ -698,8 +695,7 @@ void TransitData::ReadLines(NonOwningReaderSource & src)
 
 void TransitData::ReadLinesMetadata(NonOwningReaderSource & src)
 {
-  ReadItems(m_header.m_linesMetadataOffset, m_header.m_shapesOffset, "linesMetadata", src,
-            m_linesMetadata);
+  ReadItems(m_header.m_linesMetadataOffset, m_header.m_shapesOffset, "linesMetadata", src, m_linesMetadata);
 }
 
 void TransitData::ReadShapes(NonOwningReaderSource & src)
diff --git a/libs/transit/experimental/transit_types_experimental.cpp b/libs/transit/experimental/transit_types_experimental.cpp
index 39c426e4e..3873eb718 100644
--- a/libs/transit/experimental/transit_types_experimental.cpp
+++ b/libs/transit/experimental/transit_types_experimental.cpp
@@ -26,33 +26,31 @@ std::string GetTranslation(Translations const & titles)
 // TransitHeader ----------------------------------------------------------------------------------
 bool TransitHeader::IsValid() const
 {
-  return m_stopsOffset <= m_gatesOffset && m_gatesOffset <= m_transfersOffset &&
-         m_transfersOffset <= m_linesOffset && m_linesOffset <= m_linesMetadataOffset &&
-         m_linesMetadataOffset <= m_shapesOffset && m_shapesOffset <= m_routesOffset &&
-         m_routesOffset <= m_networksOffset && m_networksOffset <= m_endOffset;
+  return m_stopsOffset <= m_gatesOffset && m_gatesOffset <= m_transfersOffset && m_transfersOffset <= m_linesOffset &&
+         m_linesOffset <= m_linesMetadataOffset && m_linesMetadataOffset <= m_shapesOffset &&
+         m_shapesOffset <= m_routesOffset && m_routesOffset <= m_networksOffset && m_networksOffset <= m_endOffset;
 }
 
 // SingleMwmSegment --------------------------------------------------------------------------------
 SingleMwmSegment::SingleMwmSegment(FeatureId featureId, uint32_t segmentIdx, bool forward)
-  : m_featureId(featureId), m_segmentIdx(segmentIdx), m_forward(forward)
-{
-}
+  : m_featureId(featureId)
+  , m_segmentIdx(segmentIdx)
+  , m_forward(forward)
+{}
 
 bool SingleMwmSegment::operator==(SingleMwmSegment const & rhs) const
 {
-  return std::tie(m_featureId, m_segmentIdx, m_forward) ==
-         std::tie(rhs.m_featureId, rhs.m_segmentIdx, rhs.m_forward);
+  return std::tie(m_featureId, m_segmentIdx, m_forward) == std::tie(rhs.m_featureId, rhs.m_segmentIdx, rhs.m_forward);
 }
 
 // IdBundle ----------------------------------------------------------------------------------------
-IdBundle::IdBundle(bool serializeFeatureIdOnly) : m_serializeFeatureIdOnly(serializeFeatureIdOnly)
-{
-}
+IdBundle::IdBundle(bool serializeFeatureIdOnly) : m_serializeFeatureIdOnly(serializeFeatureIdOnly) {}
 
 IdBundle::IdBundle(FeatureId featureId, OsmId osmId, bool serializeFeatureIdOnly)
-  : m_featureId(featureId), m_osmId(osmId), m_serializeFeatureIdOnly(serializeFeatureIdOnly)
-{
-}
+  : m_featureId(featureId)
+  , m_osmId(osmId)
+  , m_serializeFeatureIdOnly(serializeFeatureIdOnly)
+{}
 
 bool IdBundle::operator<(IdBundle const & rhs) const
 {
@@ -71,7 +69,10 @@ bool IdBundle::operator==(IdBundle const & rhs) const
                                   : m_featureId == rhs.m_featureId && m_osmId == rhs.m_osmId;
 }
 
-bool IdBundle::operator!=(IdBundle const & rhs) const { return !(*this == rhs); }
+bool IdBundle::operator!=(IdBundle const & rhs) const
+{
+  return !(*this == rhs);
+}
 
 bool IdBundle::IsValid() const
 {
@@ -79,56 +80,110 @@ bool IdBundle::IsValid() const
                                   : m_featureId != kInvalidFeatureId && m_osmId != kInvalidOsmId;
 }
 
-void IdBundle::SetOsmId(OsmId osmId) { m_osmId = osmId; }
+void IdBundle::SetOsmId(OsmId osmId)
+{
+  m_osmId = osmId;
+}
 
-void IdBundle::SetFeatureId(FeatureId featureId) { m_featureId = featureId; }
+void IdBundle::SetFeatureId(FeatureId featureId)
+{
+  m_featureId = featureId;
+}
 
-OsmId IdBundle::GetOsmId() const { return m_osmId; }
+OsmId IdBundle::GetOsmId() const
+{
+  return m_osmId;
+}
 
-FeatureId IdBundle::GetFeatureId() const { return m_featureId; }
+FeatureId IdBundle::GetFeatureId() const
+{
+  return m_featureId;
+}
 
-bool IdBundle::SerializeFeatureIdOnly() const { return m_serializeFeatureIdOnly; }
+bool IdBundle::SerializeFeatureIdOnly() const
+{
+  return m_serializeFeatureIdOnly;
+}
 
 // Network -----------------------------------------------------------------------------------------
 Network::Network(TransitId id, std::string const & title) : m_id(id), m_title(title) {}
 
 Network::Network(TransitId id) : m_id(id), m_title{} {}
 
-bool Network::operator<(Network const & rhs) const { return m_id < rhs.m_id; }
-
-bool Network::operator==(Network const & rhs) const { return m_id == rhs.m_id; }
-
-bool Network::IsValid() const { return m_id != kInvalidTransitId; }
-
-TransitId Network::GetId() const { return m_id; }
-
-std::string const & Network::GetTitle() const { return m_title; }
-
-// Route -------------------------------------------------------------------------------------------
-Route::Route(TransitId id, TransitId networkId, std::string const & routeType,
-             std::string const & title, std::string const & color)
-  : m_id(id), m_networkId(networkId), m_routeType(routeType), m_title(title), m_color(color)
+bool Network::operator<(Network const & rhs) const
 {
+  return m_id < rhs.m_id;
 }
 
-bool Route::operator<(Route const & rhs) const { return m_id < rhs.m_id; }
+bool Network::operator==(Network const & rhs) const
+{
+  return m_id == rhs.m_id;
+}
 
-bool Route::operator==(Route const & rhs) const { return m_id == rhs.m_id; }
+bool Network::IsValid() const
+{
+  return m_id != kInvalidTransitId;
+}
+
+TransitId Network::GetId() const
+{
+  return m_id;
+}
+
+std::string const & Network::GetTitle() const
+{
+  return m_title;
+}
+
+// Route -------------------------------------------------------------------------------------------
+Route::Route(TransitId id, TransitId networkId, std::string const & routeType, std::string const & title,
+             std::string const & color)
+  : m_id(id)
+  , m_networkId(networkId)
+  , m_routeType(routeType)
+  , m_title(title)
+  , m_color(color)
+{}
+
+bool Route::operator<(Route const & rhs) const
+{
+  return m_id < rhs.m_id;
+}
+
+bool Route::operator==(Route const & rhs) const
+{
+  return m_id == rhs.m_id;
+}
 
 bool Route::IsValid() const
 {
   return m_id != kInvalidTransitId && m_networkId != kInvalidTransitId && !m_routeType.empty();
 }
 
-TransitId Route::GetId() const { return m_id; }
+TransitId Route::GetId() const
+{
+  return m_id;
+}
 
-std::string const & Route::GetTitle() const { return m_title; }
+std::string const & Route::GetTitle() const
+{
+  return m_title;
+}
 
-std::string const & Route::GetType() const { return m_routeType; }
+std::string const & Route::GetType() const
+{
+  return m_routeType;
+}
 
-std::string const & Route::GetColor() const { return m_color; }
+std::string const & Route::GetColor() const
+{
+  return m_color;
+}
 
-TransitId Route::GetNetworkId() const { return m_networkId; }
+TransitId Route::GetNetworkId() const
+{
+  return m_networkId;
+}
 
 // Line --------------------------------------------------------------------------------------------
 Line::Line(TransitId id, TransitId routeId, ShapeLink const & shapeLink, std::string const & title,
@@ -139,58 +194,95 @@ Line::Line(TransitId id, TransitId routeId, ShapeLink const & shapeLink, std::st
   , m_title(title)
   , m_stopIds(stopIds)
   , m_schedule(schedule)
+{}
+
+bool Line::operator<(Line const & rhs) const
 {
+  return m_id < rhs.m_id;
 }
 
-bool Line::operator<(Line const & rhs) const { return m_id < rhs.m_id; }
-
-bool Line::operator==(Line const & rhs) const { return m_id == rhs.m_id; }
+bool Line::operator==(Line const & rhs) const
+{
+  return m_id == rhs.m_id;
+}
 
 bool Line::IsValid() const
 {
-  return m_id != kInvalidTransitId && m_routeId != kInvalidTransitId &&
-         m_shapeLink.m_shapeId != kInvalidTransitId && !m_stopIds.empty();
+  return m_id != kInvalidTransitId && m_routeId != kInvalidTransitId && m_shapeLink.m_shapeId != kInvalidTransitId &&
+         !m_stopIds.empty();
 }
 
-TransitId Line::GetId() const { return m_id; }
+TransitId Line::GetId() const
+{
+  return m_id;
+}
 
-std::string const & Line::GetTitle() const { return m_title; }
+std::string const & Line::GetTitle() const
+{
+  return m_title;
+}
 
-TransitId Line::GetRouteId() const { return m_routeId; }
+TransitId Line::GetRouteId() const
+{
+  return m_routeId;
+}
 
-ShapeLink const & Line::GetShapeLink() const { return m_shapeLink; }
+ShapeLink const & Line::GetShapeLink() const
+{
+  return m_shapeLink;
+}
 
-IdList const & Line::GetStopIds() const { return m_stopIds; }
+IdList const & Line::GetStopIds() const
+{
+  return m_stopIds;
+}
 
-Schedule const & Line::GetSchedule() const { return m_schedule; }
+Schedule const & Line::GetSchedule() const
+{
+  return m_schedule;
+}
 
 // LineMetadata ------------------------------------------------------------------------------------
 LineMetadata::LineMetadata(TransitId id, LineSegmentsOrder const & segmentsOrder)
-  : m_id(id), m_segmentsOrder(segmentsOrder)
+  : m_id(id)
+  , m_segmentsOrder(segmentsOrder)
+{}
+
+bool LineMetadata::operator<(LineMetadata const & rhs) const
 {
+  return m_id < rhs.GetId();
+}
+bool LineMetadata::operator==(LineMetadata const & rhs) const
+{
+  return m_id == rhs.GetId();
 }
 
-bool LineMetadata::operator<(LineMetadata const & rhs) const { return m_id < rhs.GetId(); }
-bool LineMetadata::operator==(LineMetadata const & rhs) const { return m_id == rhs.GetId(); }
+bool LineMetadata::IsValid() const
+{
+  return m_id != kInvalidTransitId;
+}
 
-bool LineMetadata::IsValid() const { return m_id != kInvalidTransitId; }
-
-TransitId LineMetadata::GetId() const { return m_id; }
-LineSegmentsOrder const & LineMetadata::GetLineSegmentsOrder() const { return m_segmentsOrder; }
+TransitId LineMetadata::GetId() const
+{
+  return m_id;
+}
+LineSegmentsOrder const & LineMetadata::GetLineSegmentsOrder() const
+{
+  return m_segmentsOrder;
+}
 
 // Stop --------------------------------------------------------------------------------------------
 Stop::Stop() : m_ids(true /* serializeFeatureIdOnly */) {}
 
-Stop::Stop(TransitId id, FeatureId featureId, OsmId osmId, std::string const & title,
-           TimeTable const & timetable, m2::PointD const & point, IdList const & transferIds)
+Stop::Stop(TransitId id, FeatureId featureId, OsmId osmId, std::string const & title, TimeTable const & timetable,
+           m2::PointD const & point, IdList const & transferIds)
   : m_id(id)
   , m_ids(featureId, osmId, true /* serializeFeatureIdOnly */)
   , m_title(title)
   , m_timetable(timetable)
   , m_point(point)
   , m_transferIds(transferIds)
-{
-}
+{}
 
 Stop::Stop(TransitId id) : m_id(id), m_ids(true /* serializeFeatureIdOnly */) {}
 
@@ -207,8 +299,7 @@ bool Stop::operator==(Stop const & rhs) const
   if (m_id != kInvalidTransitId || rhs.m_id != kInvalidTransitId)
     return m_id == rhs.m_id;
 
-  return m_ids.GetFeatureId() == rhs.m_ids.GetFeatureId() &&
-         m_ids.GetOsmId() == rhs.m_ids.GetOsmId();
+  return m_ids.GetFeatureId() == rhs.m_ids.GetFeatureId() && m_ids.GetOsmId() == rhs.m_ids.GetOsmId();
 }
 
 bool Stop::IsValid() const
@@ -217,19 +308,40 @@ bool Stop::IsValid() const
           (m_ids.GetFeatureId() != kInvalidFeatureId));
 }
 
-FeatureId Stop::GetId() const { return m_id; }
+FeatureId Stop::GetId() const
+{
+  return m_id;
+}
 
-FeatureId Stop::GetFeatureId() const { return m_ids.GetFeatureId(); }
+FeatureId Stop::GetFeatureId() const
+{
+  return m_ids.GetFeatureId();
+}
 
-OsmId Stop::GetOsmId() const { return m_ids.GetOsmId(); }
+OsmId Stop::GetOsmId() const
+{
+  return m_ids.GetOsmId();
+}
 
-std::string const & Stop::GetTitle() const { return m_title; }
+std::string const & Stop::GetTitle() const
+{
+  return m_title;
+}
 
-TimeTable const & Stop::GetTimeTable() const { return m_timetable; }
+TimeTable const & Stop::GetTimeTable() const
+{
+  return m_timetable;
+}
 
-m2::PointD const & Stop::GetPoint() const { return m_point; }
+m2::PointD const & Stop::GetPoint() const
+{
+  return m_point;
+}
 
-IdList const & Stop::GetTransferIds() const { return m_transferIds; }
+IdList const & Stop::GetTransferIds() const
+{
+  return m_transferIds;
+}
 
 void Stop::SetBestPedestrianSegments(std::vector<SingleMwmSegment> const & seg)
 {
@@ -252,25 +364,22 @@ Gate::Gate(TransitId id, FeatureId featureId, OsmId osmId, bool entrance, bool e
   , m_exit(exit)
   , m_weights(weights)
   , m_point(point)
-{
-}
+{}
 
 bool Gate::operator<(Gate const & rhs) const
 {
-  return std::tie(m_id, m_ids, m_entrance, m_exit) <
-         std::tie(rhs.m_id, rhs.m_ids, rhs.m_entrance, rhs.m_exit);
+  return std::tie(m_id, m_ids, m_entrance, m_exit) < std::tie(rhs.m_id, rhs.m_ids, rhs.m_entrance, rhs.m_exit);
 }
 
 bool Gate::operator==(Gate const & rhs) const
 {
-  return std::tie(m_id, m_ids, m_entrance, m_exit) ==
-         std::tie(rhs.m_id, rhs.m_ids, rhs.m_entrance, rhs.m_exit);
+  return std::tie(m_id, m_ids, m_entrance, m_exit) == std::tie(rhs.m_id, rhs.m_ids, rhs.m_entrance, rhs.m_exit);
 }
 
 bool Gate::IsValid() const
 {
-  return ((m_id != kInvalidTransitId) || (m_ids.GetOsmId() != kInvalidOsmId)) &&
-         (m_entrance || m_exit) && !m_weights.empty();
+  return ((m_id != kInvalidTransitId) || (m_ids.GetOsmId() != kInvalidOsmId)) && (m_entrance || m_exit) &&
+         !m_weights.empty();
 }
 
 void Gate::SetBestPedestrianSegments(std::vector<SingleMwmSegment> const & seg)
@@ -278,24 +387,45 @@ void Gate::SetBestPedestrianSegments(std::vector<SingleMwmSegment> const & seg)
   m_bestPedestrianSegments = seg;
 }
 
-FeatureId Gate::GetFeatureId() const { return m_ids.GetFeatureId(); }
+FeatureId Gate::GetFeatureId() const
+{
+  return m_ids.GetFeatureId();
+}
 
-OsmId Gate::GetOsmId() const { return m_ids.GetOsmId(); }
+OsmId Gate::GetOsmId() const
+{
+  return m_ids.GetOsmId();
+}
 
-TransitId Gate::GetId() const { return m_id; }
+TransitId Gate::GetId() const
+{
+  return m_id;
+}
 
 std::vector<SingleMwmSegment> const & Gate::GetBestPedestrianSegments() const
 {
   return m_bestPedestrianSegments;
 }
 
-bool Gate::IsEntrance() const { return m_entrance; }
+bool Gate::IsEntrance() const
+{
+  return m_entrance;
+}
 
-bool Gate::IsExit() const { return m_exit; }
+bool Gate::IsExit() const
+{
+  return m_exit;
+}
 
-std::vector<TimeFromGateToStop> const & Gate::GetStopsWithWeight() const { return m_weights; }
+std::vector<TimeFromGateToStop> const & Gate::GetStopsWithWeight() const
+{
+  return m_weights;
+}
 
-m2::PointD const & Gate::GetPoint() const { return m_point; }
+m2::PointD const & Gate::GetPoint() const
+{
+  return m_point;
+}
 
 // Edge --------------------------------------------------------------------------------------------
 Edge::Edge(TransitId stop1Id, TransitId stop2Id, EdgeWeight weight, TransitId lineId, bool transfer,
@@ -306,22 +436,22 @@ Edge::Edge(TransitId stop1Id, TransitId stop2Id, EdgeWeight weight, TransitId li
   , m_isTransfer(transfer)
   , m_lineId(lineId)
   , m_shapeLink(shapeLink)
-{
-}
+{}
 
 bool Edge::operator<(Edge const & rhs) const
 {
-  return std::tie(m_stop1Id, m_stop2Id, m_lineId) <
-         std::tie(rhs.m_stop1Id, rhs.m_stop2Id, rhs.m_lineId);
+  return std::tie(m_stop1Id, m_stop2Id, m_lineId) < std::tie(rhs.m_stop1Id, rhs.m_stop2Id, rhs.m_lineId);
 }
 
 bool Edge::operator==(Edge const & rhs) const
 {
-  return std::tie(m_stop1Id, m_stop2Id, m_lineId) ==
-         std::tie(rhs.m_stop1Id, rhs.m_stop2Id, rhs.m_lineId);
+  return std::tie(m_stop1Id, m_stop2Id, m_lineId) == std::tie(rhs.m_stop1Id, rhs.m_stop2Id, rhs.m_lineId);
 }
 
-bool Edge::operator!=(Edge const & rhs) const { return !(*this == rhs); }
+bool Edge::operator!=(Edge const & rhs) const
+{
+  return !(*this == rhs);
+}
 
 bool Edge::IsValid() const
 {
@@ -334,52 +464,104 @@ bool Edge::IsValid() const
   return m_stop1Id != kInvalidTransitId && m_stop2Id != kInvalidTransitId;
 }
 
-void Edge::SetWeight(EdgeWeight weight) { m_weight = weight; }
+void Edge::SetWeight(EdgeWeight weight)
+{
+  m_weight = weight;
+}
 
-TransitId Edge::GetStop1Id() const { return m_stop1Id; }
+TransitId Edge::GetStop1Id() const
+{
+  return m_stop1Id;
+}
 
-TransitId Edge::GetStop2Id() const { return m_stop2Id; }
+TransitId Edge::GetStop2Id() const
+{
+  return m_stop2Id;
+}
 
-EdgeWeight Edge::GetWeight() const { return m_weight; }
+EdgeWeight Edge::GetWeight() const
+{
+  return m_weight;
+}
 
-TransitId Edge::GetLineId() const { return m_lineId; }
+TransitId Edge::GetLineId() const
+{
+  return m_lineId;
+}
 
-bool Edge::IsTransfer() const { return m_isTransfer; }
+bool Edge::IsTransfer() const
+{
+  return m_isTransfer;
+}
 
-ShapeLink const & Edge::GetShapeLink() const { return m_shapeLink; }
+ShapeLink const & Edge::GetShapeLink() const
+{
+  return m_shapeLink;
+}
 
 // Transfer ----------------------------------------------------------------------------------------
 Transfer::Transfer(TransitId id, m2::PointD const & point, IdList const & stopIds)
-  : m_id(id), m_point(point), m_stopIds(stopIds)
+  : m_id(id)
+  , m_point(point)
+  , m_stopIds(stopIds)
+{}
+
+bool Transfer::operator<(Transfer const & rhs) const
 {
+  return m_id < rhs.m_id;
 }
 
-bool Transfer::operator<(Transfer const & rhs) const { return m_id < rhs.m_id; }
+bool Transfer::operator==(Transfer const & rhs) const
+{
+  return m_id == rhs.m_id;
+}
 
-bool Transfer::operator==(Transfer const & rhs) const { return m_id == rhs.m_id; }
+bool Transfer::IsValid() const
+{
+  return m_id != kInvalidTransitId && m_stopIds.size() > 1;
+}
 
-bool Transfer::IsValid() const { return m_id != kInvalidTransitId && m_stopIds.size() > 1; }
+TransitId Transfer::GetId() const
+{
+  return m_id;
+}
 
-TransitId Transfer::GetId() const { return m_id; }
+m2::PointD const & Transfer::GetPoint() const
+{
+  return m_point;
+}
 
-m2::PointD const & Transfer::GetPoint() const { return m_point; }
-
-IdList const & Transfer::GetStopIds() const { return m_stopIds; }
+IdList const & Transfer::GetStopIds() const
+{
+  return m_stopIds;
+}
 
 // Shape -------------------------------------------------------------------------------------------
-Shape::Shape(TransitId id, std::vector<m2::PointD> const & polyline)
-  : m_id(id), m_polyline(polyline)
+Shape::Shape(TransitId id, std::vector<m2::PointD> const & polyline) : m_id(id), m_polyline(polyline) {}
+
+bool Shape::operator<(Shape const & rhs) const
 {
+  return m_id < rhs.m_id;
 }
 
-bool Shape::operator<(Shape const & rhs) const { return m_id < rhs.m_id; }
+bool Shape::operator==(Shape const & rhs) const
+{
+  return m_id == rhs.m_id;
+}
 
-bool Shape::operator==(Shape const & rhs) const { return m_id == rhs.m_id; }
+bool Shape::IsValid() const
+{
+  return m_id != kInvalidTransitId && m_polyline.size() > 1;
+}
 
-bool Shape::IsValid() const { return m_id != kInvalidTransitId && m_polyline.size() > 1; }
+TransitId Shape::GetId() const
+{
+  return m_id;
+}
 
-TransitId Shape::GetId() const { return m_id; }
-
-std::vector<m2::PointD> const & Shape::GetPolyline() const { return m_polyline; }
+std::vector<m2::PointD> const & Shape::GetPolyline() const
+{
+  return m_polyline;
+}
 }  // namespace experimental
 }  // namespace transit
diff --git a/libs/transit/experimental/transit_types_experimental.hpp b/libs/transit/experimental/transit_types_experimental.hpp
index 95eeba5a1..6221b1e1e 100644
--- a/libs/transit/experimental/transit_types_experimental.hpp
+++ b/libs/transit/experimental/transit_types_experimental.hpp
@@ -36,14 +36,14 @@ namespace transit
 {
 namespace experimental
 {
-#define DECLARE_TRANSIT_TYPES_FRIENDS                 \
-  template <class Sink>                               \
-  friend class routing::transit::Serializer;          \
-  template <class Source>                             \
-  friend class routing::transit::Deserializer;        \
-  template <typename Sink>                            \
-  friend class routing::transit::FixedSizeSerializer; \
-  template <typename Sink>                            \
+#define DECLARE_TRANSIT_TYPES_FRIENDS                   \
+  template <class Sink>                                 \
+  friend class routing::transit::Serializer;            \
+  template <class Source>                               \
+  friend class routing::transit::Deserializer;          \
+  template <typename Sink>                              \
+  friend class routing::transit::FixedSizeSerializer;   \
+  template <typename Sink>                              \
   friend class routing::transit::FixedSizeDeserializer;
 
 using FeatureId = uint32_t;
@@ -66,8 +66,7 @@ public:
 private:
   DECLARE_TRANSIT_TYPES_FRIENDS
   DECLARE_VISITOR_AND_DEBUG_PRINT(SingleMwmSegment, visitor(m_featureId, "feature_id"),
-                                  visitor(m_segmentIdx, "segment_idx"),
-                                  visitor(m_forward, "forward"))
+                                  visitor(m_segmentIdx, "segment_idx"), visitor(m_forward, "forward"))
 
   FeatureId m_featureId = kInvalidFeatureId;
   uint32_t m_segmentIdx = 0;
@@ -94,8 +93,7 @@ public:
 
 private:
   DECLARE_TRANSIT_TYPES_FRIENDS
-  DECLARE_VISITOR_AND_DEBUG_PRINT(IdBundle, visitor(m_featureId, "feature_id"),
-                                  visitor(m_osmId, "osm_id"))
+  DECLARE_VISITOR_AND_DEBUG_PRINT(IdBundle, visitor(m_featureId, "feature_id"), visitor(m_osmId, "osm_id"))
 
   FeatureId m_featureId = kInvalidFeatureId;
   OsmId m_osmId = kInvalidOsmId;
@@ -109,13 +107,13 @@ struct TransitHeader
   bool IsValid() const;
 
   DECLARE_TRANSIT_TYPES_FRIENDS
-  DECLARE_VISITOR_AND_DEBUG_PRINT(
-      TransitHeader, visitor(m_version, "version"), visitor(m_reserve, "reserve"),
-      visitor(m_stopsOffset, "stops"), visitor(m_gatesOffset, "gatesOffset"),
-      visitor(m_edgesOffset, "edgesOffset"), visitor(m_transfersOffset, "transfersOffset"),
-      visitor(m_linesOffset, "linesOffset"), visitor(m_linesMetadataOffset, "linesMetadataOffset"),
-      visitor(m_shapesOffset, "shapesOffset"), visitor(m_routesOffset, "routesOffset"),
-      visitor(m_networksOffset, "networksOffset"), visitor(m_endOffset, "endOffset"))
+  DECLARE_VISITOR_AND_DEBUG_PRINT(TransitHeader, visitor(m_version, "version"), visitor(m_reserve, "reserve"),
+                                  visitor(m_stopsOffset, "stops"), visitor(m_gatesOffset, "gatesOffset"),
+                                  visitor(m_edgesOffset, "edgesOffset"), visitor(m_transfersOffset, "transfersOffset"),
+                                  visitor(m_linesOffset, "linesOffset"),
+                                  visitor(m_linesMetadataOffset, "linesMetadataOffset"),
+                                  visitor(m_shapesOffset, "shapesOffset"), visitor(m_routesOffset, "routesOffset"),
+                                  visitor(m_networksOffset, "networksOffset"), visitor(m_endOffset, "endOffset"))
 
   uint16_t m_version = 0;
   uint16_t m_reserve = 0;
@@ -177,8 +175,7 @@ public:
 private:
   DECLARE_TRANSIT_TYPES_FRIENDS
   DECLARE_VISITOR_AND_DEBUG_PRINT(Route, visitor(m_id, "id"), visitor(m_networkId, "network_id"),
-                                  visitor(m_routeType, "type"), visitor(m_title, "title"),
-                                  visitor(m_color, "color"))
+                                  visitor(m_routeType, "type"), visitor(m_title, "title"), visitor(m_color, "color"))
   TransitId m_id = kInvalidTransitId;
   TransitId m_networkId = kInvalidTransitId;
   std::string m_routeType;
@@ -190,8 +187,8 @@ class Line
 {
 public:
   Line() = default;
-  Line(TransitId id, TransitId routeId, ShapeLink const & shapeLink, std::string const & title,
-       IdList const & stopIds, Schedule const & schedule);
+  Line(TransitId id, TransitId routeId, ShapeLink const & shapeLink, std::string const & title, IdList const & stopIds,
+       Schedule const & schedule);
 
   bool operator<(Line const & rhs) const;
   bool operator==(Line const & rhs) const;
@@ -234,8 +231,7 @@ public:
 
 private:
   DECLARE_TRANSIT_TYPES_FRIENDS
-  DECLARE_VISITOR_AND_DEBUG_PRINT(LineMetadata, visitor(m_id, "id"),
-                                  visitor(m_segmentsOrder, "segments_order"))
+  DECLARE_VISITOR_AND_DEBUG_PRINT(LineMetadata, visitor(m_id, "id"), visitor(m_segmentsOrder, "segments_order"))
   TransitId m_id = kInvalidTransitId;
   LineSegmentsOrder m_segmentsOrder;
 };
@@ -244,8 +240,8 @@ class Stop
 {
 public:
   Stop();
-  Stop(TransitId id, FeatureId featureId, OsmId osmId, std::string const & title,
-       TimeTable const & timetable, m2::PointD const & point, IdList const & transferIds);
+  Stop(TransitId id, FeatureId featureId, OsmId osmId, std::string const & title, TimeTable const & timetable,
+       m2::PointD const & point, IdList const & transferIds);
   explicit Stop(TransitId id);
 
   bool operator<(Stop const & rhs) const;
@@ -350,9 +346,8 @@ public:
 
 private:
   DECLARE_TRANSIT_TYPES_FRIENDS
-  DECLARE_VISITOR_AND_DEBUG_PRINT(Edge, visitor(m_stop1Id, "stop1_id"),
-                                  visitor(m_stop2Id, "stop2_id"), visitor(m_weight, "weight"),
-                                  visitor(m_isTransfer, "is_transfer"),
+  DECLARE_VISITOR_AND_DEBUG_PRINT(Edge, visitor(m_stop1Id, "stop1_id"), visitor(m_stop2Id, "stop2_id"),
+                                  visitor(m_weight, "weight"), visitor(m_isTransfer, "is_transfer"),
                                   visitor(m_lineId, "line_id"), visitor(m_shapeLink, "shape_link"))
 
   TransitId m_stop1Id = kInvalidTransitId;
diff --git a/libs/transit/transit_display_info.hpp b/libs/transit/transit_display_info.hpp
index 94aa2115c..b014ff2bc 100644
--- a/libs/transit/transit_display_info.hpp
+++ b/libs/transit/transit_display_info.hpp
@@ -35,12 +35,10 @@ using TransitStopsInfoPT = std::map<::transit::TransitId, ::transit::experimenta
 using TransitTransfersInfoPT = std::map<::transit::TransitId, ::transit::experimental::Transfer>;
 using TransitShapesInfoPT = std::map<::transit::TransitId, ::transit::experimental::Shape>;
 using TransitLinesInfoPT = std::map<::transit::TransitId, ::transit::experimental::Line>;
-using TransitLinesMetadataInfoPT =
-    std::map<::transit::TransitId, ::transit::experimental::LineMetadata>;
+using TransitLinesMetadataInfoPT = std::map<::transit::TransitId, ::transit::experimental::LineMetadata>;
 using TransitRoutesInfoPT = std::map<::transit::TransitId, ::transit::experimental::Route>;
 using TransitNetworksInfoPT = std::map<::transit::TransitId, ::transit::experimental::Network>;
-using TransitEdgesInfoPT =
-    std::unordered_map<::transit::EdgeId, ::transit::EdgeData, ::transit::EdgeIdHasher>;
+using TransitEdgesInfoPT = std::unordered_map<::transit::EdgeId, ::transit::EdgeData, ::transit::EdgeIdHasher>;
 struct TransitDisplayInfo
 {
   ::transit::TransitVersion m_transitVersion;
diff --git a/libs/transit/transit_entities.hpp b/libs/transit/transit_entities.hpp
index 52d7405b8..1dbf0a52e 100644
--- a/libs/transit/transit_entities.hpp
+++ b/libs/transit/transit_entities.hpp
@@ -43,8 +43,7 @@ inline std::string const kTransfersFile = "transfers" + kTransitFileExtension;
 inline std::string const kGatesFile = "gates" + kTransitFileExtension;
 
 // Route types shown on the subway layer.
-inline std::unordered_set<std::string> const kSubwayLayerTypes{"subway", "train", "light_rail",
-                                                               "monorail"};
+inline std::unordered_set<std::string> const kSubwayLayerTypes{"subway", "train", "light_rail", "monorail"};
 
 // Unique id for transit entities. It is generated by gtfs_converter and is persistent between
 // re-runs. Generated based on the unique string hash of the GTFS entity. Lies in the interval
@@ -59,10 +58,7 @@ using Translations = std::unordered_map<std::string, std::string>;
 struct TimeFromGateToStop
 {
   TimeFromGateToStop() = default;
-  TimeFromGateToStop(TransitId stopId, uint32_t timeSeconds)
-    : m_stopId(stopId), m_timeSeconds(timeSeconds)
-  {
-  }
+  TimeFromGateToStop(TransitId stopId, uint32_t timeSeconds) : m_stopId(stopId), m_timeSeconds(timeSeconds) {}
   bool operator==(TimeFromGateToStop const & rhs) const
   {
     return std::tie(m_stopId, m_timeSeconds) == std::tie(rhs.m_stopId, rhs.m_timeSeconds);
@@ -85,24 +81,22 @@ struct ShapeLink
 {
   ShapeLink() = default;
   ShapeLink(TransitId id, uint32_t startIndex, uint32_t endIndex)
-    : m_shapeId(id), m_startIndex(startIndex), m_endIndex(endIndex)
-  {
-  }
+    : m_shapeId(id)
+    , m_startIndex(startIndex)
+    , m_endIndex(endIndex)
+  {}
 
   bool operator==(ShapeLink const & rhs) const
   {
-    return std::tie(m_shapeId, m_startIndex, m_endIndex) ==
-           std::tie(rhs.m_shapeId, rhs.m_startIndex, rhs.m_endIndex);
+    return std::tie(m_shapeId, m_startIndex, m_endIndex) == std::tie(rhs.m_shapeId, rhs.m_startIndex, rhs.m_endIndex);
   }
 
   bool operator<(ShapeLink const & rhs) const
   {
-    return std::tie(m_shapeId, m_startIndex, m_endIndex) <
-           std::tie(rhs.m_shapeId, rhs.m_startIndex, rhs.m_endIndex);
+    return std::tie(m_shapeId, m_startIndex, m_endIndex) < std::tie(rhs.m_shapeId, rhs.m_startIndex, rhs.m_endIndex);
   }
 
-  DECLARE_VISITOR_AND_DEBUG_PRINT(ShapeLink, visitor(m_shapeId, "id"),
-                                  visitor(m_startIndex, "startIndex"),
+  DECLARE_VISITOR_AND_DEBUG_PRINT(ShapeLink, visitor(m_shapeId, "id"), visitor(m_startIndex, "startIndex"),
                                   visitor(m_endIndex, "endIndex"))
 
   TransitId m_shapeId = kInvalidTransitId;
@@ -114,9 +108,10 @@ struct EdgeId
 {
   EdgeId() = default;
   EdgeId(TransitId fromStopId, TransitId toStopId, TransitId lineId)
-    : m_fromStopId(fromStopId), m_toStopId(toStopId), m_lineId(lineId)
-  {
-  }
+    : m_fromStopId(fromStopId)
+    , m_toStopId(toStopId)
+    , m_lineId(lineId)
+  {}
 
   bool operator==(EdgeId const & other) const
   {
@@ -146,10 +141,7 @@ using IdEdgeSet = std::unordered_set<EdgeId, EdgeIdHasher>;
 struct EdgeData
 {
   EdgeData() = default;
-  EdgeData(ShapeLink const & shapeLink, EdgeWeight const & weight)
-    : m_shapeLink(shapeLink), m_weight(weight)
-  {
-  }
+  EdgeData(ShapeLink const & shapeLink, EdgeWeight const & weight) : m_shapeLink(shapeLink), m_weight(weight) {}
 
   explicit EdgeData(EdgeWeight const & weight) : m_weight(weight) {}
 
@@ -167,13 +159,9 @@ struct LineSegment
   explicit LineSegment(uint32_t startIdx) : m_startIdx(startIdx) {}
   LineSegment(uint32_t startIdx, uint32_t endIdx) : m_startIdx(startIdx), m_endIdx(endIdx) {}
 
-  bool operator==(LineSegment const & rhs) const
-  {
-    return m_startIdx == rhs.m_startIdx && m_endIdx == rhs.m_endIdx;
-  }
+  bool operator==(LineSegment const & rhs) const { return m_startIdx == rhs.m_startIdx && m_endIdx == rhs.m_endIdx; }
 
-  DECLARE_VISITOR_AND_DEBUG_PRINT(LineSegment, visitor(m_startIdx, "startIdx"),
-                                  visitor(m_endIdx, "endIdx"))
+  DECLARE_VISITOR_AND_DEBUG_PRINT(LineSegment, visitor(m_startIdx, "startIdx"), visitor(m_endIdx, "endIdx"))
 
   uint32_t m_startIdx = 0;
   uint32_t m_endIdx = 0;
@@ -184,18 +172,11 @@ using LineSegments = std::vector<LineSegment>;
 struct LineSegmentOrder
 {
   LineSegmentOrder() = default;
-  LineSegmentOrder(LineSegment const & lineSegment, int order)
-    : m_segment(lineSegment), m_order(order)
-  {
-  }
+  LineSegmentOrder(LineSegment const & lineSegment, int order) : m_segment(lineSegment), m_order(order) {}
 
-  bool operator==(LineSegmentOrder const & rhs) const
-  {
-    return m_order == rhs.m_order && m_segment == rhs.m_segment;
-  }
+  bool operator==(LineSegmentOrder const & rhs) const { return m_order == rhs.m_order && m_segment == rhs.m_segment; }
 
-  DECLARE_VISITOR_AND_DEBUG_PRINT(LineSegmentOrder, visitor(m_segment, "segment"),
-                                  visitor(m_order, "order"))
+  DECLARE_VISITOR_AND_DEBUG_PRINT(LineSegmentOrder, visitor(m_segment, "segment"), visitor(m_order, "order"))
 
   LineSegment m_segment;
   int m_order = 0;
@@ -204,19 +185,16 @@ struct LineSegmentOrder
 using LineSegmentsOrder = std::vector<LineSegmentOrder>;
 
 template <class T, class I>
-typename std::vector<T>::const_iterator FindById(std::vector<T> const & container, I const & id,
-                                                 bool exists = true)
+typename std::vector<T>::const_iterator FindById(std::vector<T> const & container, I const & id, bool exists = true)
 {
-  auto const it = std::find_if(container.begin(), container.end(),
-                               [id](T const & obj) { return obj.GetId() == id; });
+  auto const it = std::find_if(container.begin(), container.end(), [id](T const & obj) { return obj.GetId() == id; });
 
   if (exists)
     CHECK(it != container.end(), (id));
   return it;
 }
 
-inline std::vector<m2::PointD> GetPolylinePart(std::vector<m2::PointD> const & polyline,
-                                               size_t startIdx, size_t endIdx)
+inline std::vector<m2::PointD> GetPolylinePart(std::vector<m2::PointD> const & polyline, size_t startIdx, size_t endIdx)
 {
   CHECK_GREATER(endIdx, startIdx, ());
   CHECK_GREATER(polyline.size(), endIdx, ());
diff --git a/libs/transit/transit_experimental_tests/parse_transit_from_json_tests.cpp b/libs/transit/transit_experimental_tests/parse_transit_from_json_tests.cpp
index 888dc1191..d491857ea 100644
--- a/libs/transit/transit_experimental_tests/parse_transit_from_json_tests.cpp
+++ b/libs/transit/transit_experimental_tests/parse_transit_from_json_tests.cpp
@@ -33,9 +33,8 @@ UNIT_TEST(ReadJson_Network)
             "title":"Caltrain"
           })"};
 
-  std::vector<Network> const networksPlan = {
-      Network(4032061478 /* transitId */, "Tránsito Golden Gate" /* title */),
-      Network(4035419389 /* transitId */, "Caltrain" /* title */)};
+  std::vector<Network> const networksPlan = {Network(4032061478 /* transitId */, "Tránsito Golden Gate" /* title */),
+                                             Network(4035419389 /* transitId */, "Caltrain" /* title */)};
 
   std::vector<Network> networksFact;
 
@@ -61,11 +60,10 @@ UNIT_TEST(ReadJson_Route)
            "title":"East Route"
          })"};
 
-  std::vector<Route> const routesPlan = {
-      Route(4036206863 /* id */, 4036206862 /* networkId */, "rail" /* routeType */,
-            "Línea principal" /* title */, "pink_dark" /* color */),
-      Route(4027700598 /* id */, 4027700597 /* networkId */, "bus" /* routeType */,
-            "East Route" /* title */, "blue" /* color */)};
+  std::vector<Route> const routesPlan = {Route(4036206863 /* id */, 4036206862 /* networkId */, "rail" /* routeType */,
+                                               "Línea principal" /* title */, "pink_dark" /* color */),
+                                         Route(4027700598 /* id */, 4027700597 /* networkId */, "bus" /* routeType */,
+                                               "East Route" /* title */, "blue" /* color */)};
 
   std::vector<Route> routesFact;
 
@@ -114,10 +112,10 @@ UNIT_TEST(ReadJson_Line)
   schedule.AddDateException(DateException(519), {});
   schedule.AddDateException(DateException(357), {});
 
-  std::vector<Line> const linesPlan = {
-      Line(4036591532 /* id */, 4036591423 /* routeId */,
-           ShapeLink(4036591460 /* id */, 415 /* startIndex */, 1691 /* endIndex */),
-           "Downtown" /* title */, IdList{4036592571, 4036592572, 4036592573}, schedule)};
+  std::vector<Line> const linesPlan = {Line(4036591532 /* id */, 4036591423 /* routeId */,
+                                            ShapeLink(4036591460 /* id */, 415 /* startIndex */, 1691 /* endIndex */),
+                                            "Downtown" /* title */, IdList{4036592571, 4036592572, 4036592573},
+                                            schedule)};
 
   std::vector<Line> linesFact;
 
@@ -144,9 +142,8 @@ UNIT_TEST(ReadJson_LineMetadata)
            ]
          })"};
 
-  std::vector<LineMetadata> const linesMetadataPlan = {LineMetadata(
-      56 /* id */,
-      LineSegmentsOrder{LineSegmentOrder({34, 99}, -1), LineSegmentOrder({99, 1069}, -3)})};
+  std::vector<LineMetadata> const linesMetadataPlan = {
+      LineMetadata(56 /* id */, LineSegmentsOrder{LineSegmentOrder({34, 99}, -1), LineSegmentOrder({99, 1069}, -3)})};
 
   std::vector<LineMetadata> linesMetadataFact;
 
@@ -173,8 +170,7 @@ UNIT_TEST(ReadJson_Stop)
 
   std::vector<Stop> const stopsPlan = {
       Stop(4036592706 /* id */, kInvalidFeatureId /* featureId */, kInvalidOsmId /* osmId */,
-           "Balfour Rd & Foothill Dr",
-           TimeTable{{204, std::vector<TimeInterval>{TimeInterval(11400205248)}}},
+           "Balfour Rd & Foothill Dr", TimeTable{{204, std::vector<TimeInterval>{TimeInterval(11400205248)}}},
            m2::PointD(-121.74124, 41.04276), {4036593809, 4036595406} /* transferIds */)};
 
   std::vector<Stop> stopsFact;
@@ -208,11 +204,10 @@ UNIT_TEST(ReadJson_Gate)
          })"};
 
   std::vector<Gate> const gatesPlan = {
-      Gate(4034666808 /* id */, kInvalidFeatureId /* featureId */, kInvalidOsmId /* osmId */,
-           true /* entrance */, true /* exit */,
-           std::vector<TimeFromGateToStop>{
-               TimeFromGateToStop(4034666299 /* stopId */, 76 /* timeSeconds */),
-               TimeFromGateToStop(4034666190 /* stopId */, 61 /* timeSeconds */)},
+      Gate(4034666808 /* id */, kInvalidFeatureId /* featureId */, kInvalidOsmId /* osmId */, true /* entrance */,
+           true /* exit */,
+           std::vector<TimeFromGateToStop>{TimeFromGateToStop(4034666299 /* stopId */, 76 /* timeSeconds */),
+                                           TimeFromGateToStop(4034666190 /* stopId */, 61 /* timeSeconds */)},
            m2::PointD(-121.8406, 40.19395))};
 
   std::vector<Gate> gatesFact;
@@ -246,12 +241,10 @@ UNIT_TEST(ReadJson_Edge)
       )"};
 
   std::vector<Edge> const edgesPlan = {
-      Edge(4036592295 /* stop1Id */, 4036592296 /* stop2Id */, 69 /* weight */,
-           4036591958 /* lineId */, false /* transfer */,
-           ShapeLink(4036591484 /* shapeId */, 592 /* startIndex */, 609 /* endIndex */)),
-      Edge(4030648032 /* stop1Id */, 4030648073 /* stop2Id */, 40 /* weight */,
-           kInvalidTransitId /* lineId */, true /* transfer */,
-           ShapeLink(kInvalidTransitId /* shapeId */, 0 /* startIndex */, 0 /* endIndex */))};
+      Edge(4036592295 /* stop1Id */, 4036592296 /* stop2Id */, 69 /* weight */, 4036591958 /* lineId */,
+           false /* transfer */, ShapeLink(4036591484 /* shapeId */, 592 /* startIndex */, 609 /* endIndex */)),
+      Edge(4030648032 /* stop1Id */, 4030648073 /* stop2Id */, 40 /* weight */, kInvalidTransitId /* lineId */,
+           true /* transfer */, ShapeLink(kInvalidTransitId /* shapeId */, 0 /* startIndex */, 0 /* endIndex */))};
 
   std::vector<Edge> edgesFact;
   EdgeIdToFeatureId edgeIdToFeatureId;
@@ -276,9 +269,8 @@ UNIT_TEST(ReadJson_Transfer)
          }
       )"};
 
-  std::vector<Transfer> const transfersPlan = {
-      Transfer(4029752024 /* id */, m2::PointD(-122.16915, 40.41578) /* point */,
-               IdList{4029751945, 4029752010} /* stopIds */)};
+  std::vector<Transfer> const transfersPlan = {Transfer(
+      4029752024 /* id */, m2::PointD(-122.16915, 40.41578) /* point */, IdList{4029751945, 4029752010} /* stopIds */)};
 
   std::vector<Transfer> transfersFact;
 
diff --git a/libs/transit/transit_experimental_tests/transit_serdes_tests.cpp b/libs/transit/transit_experimental_tests/transit_serdes_tests.cpp
index a5c95656f..4c6d4f854 100644
--- a/libs/transit/transit_experimental_tests/transit_serdes_tests.cpp
+++ b/libs/transit/transit_experimental_tests/transit_serdes_tests.cpp
@@ -22,8 +22,7 @@ enum class TransitUseCase
   CrossMwm
 };
 
-void TestEqual(TransitData const & actualTransit, TransitData const & expectedTransit,
-               TransitUseCase const & useCase)
+void TestEqual(TransitData const & actualTransit, TransitData const & expectedTransit, TransitUseCase const & useCase)
 {
   switch (useCase)
   {
@@ -99,10 +98,9 @@ void SerDesTransit(TransitData & src, TransitData & dst, TransitUseCase const &
 TransitData FillTestTransitData()
 {
   TransitData data;
-  data.m_networks = {
-      Network(4032061671 /* transitId */, "ГУП МосГорТранс" /* title */),
-      Network(4035419440 /* transitId */, "EMPRESA DE TRANSPORTE DEL SUR SRL" /* title */),
-      Network(4035418196 /* transitId */, "Buslink Sunraysia" /* title */)};
+  data.m_networks = {Network(4032061671 /* transitId */, "ГУП МосГорТранс" /* title */),
+                     Network(4035419440 /* transitId */, "EMPRESA DE TRANSPORTE DEL SUR SRL" /* title */),
+                     Network(4035418196 /* transitId */, "Buslink Sunraysia" /* title */)};
 
   data.m_routes = {Route(4036206872 /* id */, 4035419440 /* networkId */, "bus" /* routeType */,
                          "Echuca/Moama - Melbourne Via Shepparton" /* title */, "gray" /* color */),
@@ -119,73 +117,59 @@ TransitData FillTestTransitData()
 
   schedule.AddDatesInterval(DatesInterval(75007489), frequencies);
 
-  data.m_lines = {
-      Line(4036598626 /* id */, 4036206872 /* routeId */,
-           ShapeLink(4036591460 /* id */, 0 /* startIndex */, 2690 /* endIndex */),
-           "740G" /* title */,
-           IdList{4036592571, 4036592572, 4036592573, 4036592574, 4036592575, 4036592576},
-           schedule),
-      Line(
-          4036598627 /* id */, 4036206872 /* routeId */,
-          ShapeLink(4036591461 /* id */, 356 /* startIndex */, 40690 /* endIndex */),
-          "" /* title */,
-          IdList{4027013783, 4027013784, 4027013785, 4027013786, 4027013787, 4027013788, 4027013789,
-                 4027013790, 4027013791, 4027013792, 4027013793, 4027013794, 4027013795, 4027013796,
-                 4027013797, 4027013798, 4027013799, 4027013800, 4027013801},
-          schedule)};
+  data.m_lines = {Line(4036598626 /* id */, 4036206872 /* routeId */,
+                       ShapeLink(4036591460 /* id */, 0 /* startIndex */, 2690 /* endIndex */), "740G" /* title */,
+                       IdList{4036592571, 4036592572, 4036592573, 4036592574, 4036592575, 4036592576}, schedule),
+                  Line(4036598627 /* id */, 4036206872 /* routeId */,
+                       ShapeLink(4036591461 /* id */, 356 /* startIndex */, 40690 /* endIndex */), "" /* title */,
+                       IdList{4027013783, 4027013784, 4027013785, 4027013786, 4027013787, 4027013788, 4027013789,
+                              4027013790, 4027013791, 4027013792, 4027013793, 4027013794, 4027013795, 4027013796,
+                              4027013797, 4027013798, 4027013799, 4027013800, 4027013801},
+                       schedule)};
 
-  data.m_linesMetadata = {
-      LineMetadata(4036598626 /* id */, LineSegmentsOrder{LineSegmentOrder({0, 100}, 0),
-                                                          LineSegmentOrder({100, 205}, 2)}),
-      LineMetadata(4036598627 /* id */, LineSegmentsOrder{})};
+  data.m_linesMetadata = {LineMetadata(4036598626 /* id */, LineSegmentsOrder{LineSegmentOrder({0, 100}, 0),
+                                                                              LineSegmentOrder({100, 205}, 2)}),
+                          LineMetadata(4036598627 /* id */, LineSegmentsOrder{})};
 
-  data.m_stops = {Stop(4026990853 /* id */, kInvalidFeatureId /* featureId */,
-                       kInvalidOsmId /* osmId */, "CARLOS DIHEL 2500-2598" /* title */,
-                       TimeTable{{204, std::vector<TimeInterval>{TimeInterval(11400205248)}}},
-                       m2::PointD(-58.57196, -36.82596), {} /* transferIds */),
-                  Stop(4026990854 /* id */, kInvalidFeatureId /* featureId */,
-                       kInvalidOsmId /* osmId */, "QUIROGA 1901-1999" /* title */, TimeTable{},
-                       m2::PointD(-58.57196, -36.82967), {} /* transferIds */)};
+  data.m_stops = {
+      Stop(4026990853 /* id */, kInvalidFeatureId /* featureId */, kInvalidOsmId /* osmId */,
+           "CARLOS DIHEL 2500-2598" /* title */, TimeTable{{204, std::vector<TimeInterval>{TimeInterval(11400205248)}}},
+           m2::PointD(-58.57196, -36.82596), {} /* transferIds */),
+      Stop(4026990854 /* id */, kInvalidFeatureId /* featureId */, kInvalidOsmId /* osmId */,
+           "QUIROGA 1901-1999" /* title */, TimeTable{}, m2::PointD(-58.57196, -36.82967), {} /* transferIds */)};
 
-  data.SetStopPedestrianSegments(
-      0 /* stopIdx */,
-      {SingleMwmSegment(981 /* featureId */, 0 /* segmentIdx */, true /* forward */),
-       SingleMwmSegment(91762 /* featureId */, 108 /* segmentIdx */, false /* forward */)});
-  data.SetStopPedestrianSegments(
-      1 /* stopIdx */,
-      {SingleMwmSegment(15000 /* featureId */, 100 /* segmentIdx */, false /* forward */)});
+  data.SetStopPedestrianSegments(0 /* stopIdx */,
+                                 {SingleMwmSegment(981 /* featureId */, 0 /* segmentIdx */, true /* forward */),
+                                  SingleMwmSegment(91762 /* featureId */, 108 /* segmentIdx */, false /* forward */)});
+  data.SetStopPedestrianSegments(1 /* stopIdx */,
+                                 {SingleMwmSegment(15000 /* featureId */, 100 /* segmentIdx */, false /* forward */)});
 
-  data.m_gates = {Gate(4034666808 /* id */, kInvalidFeatureId /* featureId */,
-                       kInvalidOsmId /* osmId */, true /* entrance */, true /* exit */,
-                       std::vector<TimeFromGateToStop>{
-                           TimeFromGateToStop(4026990854 /* stopId */, 76 /* timeSeconds */)},
-                       m2::PointD(-121.84063, 40.19393)),
-                  Gate(4034666809 /* id */, kInvalidFeatureId /* featureId */,
-                       kInvalidOsmId /* osmId */, false /* entrance */, true /* exit */,
-                       std::vector<TimeFromGateToStop>{
-                           TimeFromGateToStop(4026990857 /* stopId */, 0 /* timeSeconds */),
-                           TimeFromGateToStop(4026990858 /* stopId */, 0 /* timeSeconds */)},
-                       m2::PointD(-58.96030, -36.40335)),
-                  Gate(4034666810 /* id */, kInvalidFeatureId /* featureId */,
-                       kInvalidOsmId /* osmId */, true /* entrance */, false /* exit */,
-                       std::vector<TimeFromGateToStop>{
-                           TimeFromGateToStop(4026990889 /* stopId */, 80 /* timeSeconds */),
-                           TimeFromGateToStop(4026990890 /* stopId */, 108 /* timeSeconds */),
-                           TimeFromGateToStop(4026990891 /* stopId */, 90 /* timeSeconds */)},
-                       m2::PointD(-58.96030, -36.40335))};
+  data.m_gates = {
+      Gate(4034666808 /* id */, kInvalidFeatureId /* featureId */, kInvalidOsmId /* osmId */, true /* entrance */,
+           true /* exit */,
+           std::vector<TimeFromGateToStop>{TimeFromGateToStop(4026990854 /* stopId */, 76 /* timeSeconds */)},
+           m2::PointD(-121.84063, 40.19393)),
+      Gate(4034666809 /* id */, kInvalidFeatureId /* featureId */, kInvalidOsmId /* osmId */, false /* entrance */,
+           true /* exit */,
+           std::vector<TimeFromGateToStop>{TimeFromGateToStop(4026990857 /* stopId */, 0 /* timeSeconds */),
+                                           TimeFromGateToStop(4026990858 /* stopId */, 0 /* timeSeconds */)},
+           m2::PointD(-58.96030, -36.40335)),
+      Gate(4034666810 /* id */, kInvalidFeatureId /* featureId */, kInvalidOsmId /* osmId */, true /* entrance */,
+           false /* exit */,
+           std::vector<TimeFromGateToStop>{TimeFromGateToStop(4026990889 /* stopId */, 80 /* timeSeconds */),
+                                           TimeFromGateToStop(4026990890 /* stopId */, 108 /* timeSeconds */),
+                                           TimeFromGateToStop(4026990891 /* stopId */, 90 /* timeSeconds */)},
+           m2::PointD(-58.96030, -36.40335))};
 
-  data.SetGatePedestrianSegments(
-      1 /* gateIdx */,
-      {SingleMwmSegment(6861 /* featureId */, 15 /* segmentIdx */, true /* forward */),
-       SingleMwmSegment(307920 /* featureId */, 2 /* segmentIdx */, false /* forward */)});
+  data.SetGatePedestrianSegments(1 /* gateIdx */,
+                                 {SingleMwmSegment(6861 /* featureId */, 15 /* segmentIdx */, true /* forward */),
+                                  SingleMwmSegment(307920 /* featureId */, 2 /* segmentIdx */, false /* forward */)});
 
   data.m_edges = {
-      Edge(4036592295 /* stop1Id */, 4036592296 /* stop2Id */, 69 /* weight */,
-           4036591958 /* lineId */, false /* transfer */,
-           ShapeLink(4036591484 /* shapeId */, 592 /* startIndex */, 609 /* endIndex */)),
-      Edge(4030648032 /* stop1Id */, 4030648073 /* stop2Id */, 40 /* weight */,
-           kInvalidTransitId /* lineId */, true /* transfer */,
-           ShapeLink(kInvalidTransitId /* shapeId */, 0 /* startIndex */, 0 /* endIndex */))};
+      Edge(4036592295 /* stop1Id */, 4036592296 /* stop2Id */, 69 /* weight */, 4036591958 /* lineId */,
+           false /* transfer */, ShapeLink(4036591484 /* shapeId */, 592 /* startIndex */, 609 /* endIndex */)),
+      Edge(4030648032 /* stop1Id */, 4030648073 /* stop2Id */, 40 /* weight */, kInvalidTransitId /* lineId */,
+           true /* transfer */, ShapeLink(kInvalidTransitId /* shapeId */, 0 /* startIndex */, 0 /* endIndex */))};
 
   data.m_transfers = {Transfer(4029752024 /* id */, m2::PointD(-122.16915, 40.41578) /* point */,
                                IdList{4029751945, 4029752010} /* stopIds */)};
diff --git a/libs/transit/transit_graph_data.cpp b/libs/transit/transit_graph_data.cpp
index 853b92a16..6cae428f7 100644
--- a/libs/transit/transit_graph_data.cpp
+++ b/libs/transit/transit_graph_data.cpp
@@ -25,13 +25,16 @@ namespace
 {
 struct ClearVisitor
 {
-  template<typename Cont>
-  void operator()(Cont & c, char const * /* name */) const { c.clear(); }
+  template <typename Cont>
+  void operator()(Cont & c, char const * /* name */) const
+  {
+    c.clear();
+  }
 };
 
 struct SortVisitor
 {
-  template<typename Cont>
+  template <typename Cont>
   void operator()(Cont & c, char const * /* name */) const
   {
     sort(c.begin(), c.end());
@@ -83,7 +86,7 @@ struct CheckSortedVisitor
   }
 };
 
-template<typename T>
+template <typename T>
 void Append(vector<T> const & src, vector<T> & dst)
 {
   dst.insert(dst.end(), src.begin(), src.end());
@@ -143,8 +146,7 @@ void UpdateItems(set<Id> const & ids, vector<Item> & items)
 }
 
 template <class Item>
-void ReadItems(uint32_t start, uint32_t end, string const & name, NonOwningReaderSource & src,
-               vector<Item> & items)
+void ReadItems(uint32_t start, uint32_t end, string const & name, NonOwningReaderSource & src, vector<Item> & items)
 {
   Deserializer<NonOwningReaderSource> deserializer(src);
   CHECK_EQUAL(src.Pos(), start, ("Wrong", TRANSIT_FILE_TAG, "section format. Table name:", name));
@@ -154,13 +156,11 @@ void ReadItems(uint32_t start, uint32_t end, string const & name, NonOwningReade
 }
 }  // namespace
 
-
 // DeserializerFromJson ---------------------------------------------------------------------------
-DeserializerFromJson::DeserializerFromJson(json_t * node,
-                                           OsmIdToFeatureIdsMap const & osmIdToFeatureIds)
-    : m_node(node), m_osmIdToFeatureIds(osmIdToFeatureIds)
-{
-}
+DeserializerFromJson::DeserializerFromJson(json_t * node, OsmIdToFeatureIdsMap const & osmIdToFeatureIds)
+  : m_node(node)
+  , m_osmIdToFeatureIds(osmIdToFeatureIds)
+{}
 
 void DeserializerFromJson::operator()(m2::PointD & p, char const * name)
 {
@@ -169,7 +169,7 @@ void DeserializerFromJson::operator()(m2::PointD & p, char const * name)
   // regular method.
   json_t * item = nullptr;
   if (name == nullptr)
-    item = m_node; // Array item case
+    item = m_node;  // Array item case
   else
     item = base::GetJSONObligatoryField(m_node, name);
 
@@ -184,8 +184,7 @@ void DeserializerFromJson::operator()(FeatureIdentifiers & id, char const * name
   string osmIdStr;
   GetField(osmIdStr, name);
   uint64_t osmIdNum;
-  CHECK(strings::to_uint64(osmIdStr, osmIdNum),
-        ("Cann't convert osm id string:", osmIdStr, "to a number."));
+  CHECK(strings::to_uint64(osmIdStr, osmIdNum), ("Cann't convert osm id string:", osmIdStr, "to a number."));
   base::GeoObjectId const osmId(osmIdNum);
   auto const it = m_osmIdToFeatureIds.find(osmId);
   if (it != m_osmIdToFeatureIds.cend())
@@ -196,8 +195,8 @@ void DeserializerFromJson::operator()(FeatureIdentifiers & id, char const * name
     {
       // Note. |osmId| corresponds to several feature ids. It may happen in case of stops,
       // if a stop is present as a relation. It's a rare case.
-      LOG(LWARNING, ("Osm id:", osmId, "( encoded", osmId.GetEncodedId(), ") corresponds to",
-                     it->second.size(), "feature ids."));
+      LOG(LWARNING,
+          ("Osm id:", osmId, "( encoded", osmId.GetEncodedId(), ") corresponds to", it->second.size(), "feature ids."));
     }
     id.SetFeatureId(it->second[0]);
   }
@@ -232,13 +231,12 @@ void GraphData::DeserializeFromJson(base::Json const & root, OsmIdToFeatureIdsMa
   // Note. It's possible that two stops are connected with the same line several times
   // in the same direction. It happens in Oslo metro (T-banen):
   // https://en.wikipedia.org/wiki/Oslo_Metro#/media/File:Oslo_Metro_Map.svg branch 5.
-  base::SortUnique(m_edges,
-                 [](Edge const & e1, Edge const & e2) {
-                   if (e1 != e2)
-                     return e1 < e2;
-                   return e1.GetWeight() < e2.GetWeight();
-                 },
-                 [](Edge const & e1, Edge const & e2) { return e1 == e2; });
+  base::SortUnique(m_edges, [](Edge const & e1, Edge const & e2)
+  {
+    if (e1 != e2)
+      return e1 < e2;
+    return e1.GetWeight() < e2.GetWeight();
+  }, [](Edge const & e1, Edge const & e2) { return e1 == e2; });
 }
 
 void GraphData::Serialize(Writer & writer)
@@ -284,7 +282,8 @@ void GraphData::Serialize(Writer & writer)
 
 void GraphData::DeserializeAll(Reader & reader)
 {
-  DeserializeWith(reader, [this](NonOwningReaderSource & src) {
+  DeserializeWith(reader, [this](NonOwningReaderSource & src)
+  {
     ReadStops(src);
     ReadGates(src);
     ReadEdges(src);
@@ -297,7 +296,8 @@ void GraphData::DeserializeAll(Reader & reader)
 
 void GraphData::DeserializeForRouting(Reader & reader)
 {
-  DeserializeWith(reader, [this](NonOwningReaderSource & src) {
+  DeserializeWith(reader, [this](NonOwningReaderSource & src)
+  {
     ReadStops(src);
     ReadGates(src);
     ReadEdges(src);
@@ -308,7 +308,8 @@ void GraphData::DeserializeForRouting(Reader & reader)
 
 void GraphData::DeserializeForRendering(Reader & reader)
 {
-  DeserializeWith(reader, [this](NonOwningReaderSource & src) {
+  DeserializeWith(reader, [this](NonOwningReaderSource & src)
+  {
     ReadStops(src);
     src.Skip(m_header.m_transfersOffset - src.Pos());
     ReadTransfers(src);
@@ -319,7 +320,8 @@ void GraphData::DeserializeForRendering(Reader & reader)
 
 void GraphData::DeserializeForCrossMwm(Reader & reader)
 {
-  DeserializeWith(reader, [this](NonOwningReaderSource & src) {
+  DeserializeWith(reader, [this](NonOwningReaderSource & src)
+  {
     ReadStops(src);
     src.Skip(m_header.m_edgesOffset - src.Pos());
     ReadEdges(src);
@@ -364,8 +366,8 @@ void GraphData::CheckValidSortedUnique() const
 bool GraphData::IsEmpty() const
 {
   // Note. |m_transfers| may be empty if GraphData instance is not empty.
-  return m_stops.empty() || m_gates.empty() || m_edges.empty() || m_lines.empty()
-      || m_shapes.empty() || m_networks.empty();
+  return m_stops.empty() || m_gates.empty() || m_edges.empty() || m_lines.empty() || m_shapes.empty() ||
+         m_networks.empty();
 }
 
 void GraphData::Sort()
@@ -399,10 +401,8 @@ void GraphData::ClipLines(vector<m2::RegionD> const & borders)
   // Set with stop ids with stops which are inside |borders|.
   set<StopId> stopIdInside;
   for (auto const & stop : m_stops)
-  {
     if (m2::RegionsContain(borders, stop.GetPoint()))
       stopIdInside.insert(stop.GetId());
-  }
 
   set<StopId> hasNeighborInside;
   for (auto const & edge : m_edges)
@@ -432,7 +432,8 @@ void GraphData::ClipLines(vector<m2::RegionD> const & borders)
     CHECK_EQUAL(ranges.size(), 1, ());
     vector<StopId> const & stopIds = ranges[0];
     auto it = stopIds.begin();
-    while (it != stopIds.end()) {
+    while (it != stopIds.end())
+    {
       while (it != stopIds.end() && stopIdInside.count(*it) == 0)
         ++it;
       auto jt = it;
@@ -445,8 +446,8 @@ void GraphData::ClipLines(vector<m2::RegionD> const & borders)
 
     if (!stopIdsToFill.empty())
     {
-      lines.emplace_back(line.GetId(), line.GetNumber(), line.GetTitle(), line.GetType(),
-                         line.GetColor(), line.GetNetworkId(), stopIdsToFill, line.GetInterval());
+      lines.emplace_back(line.GetId(), line.GetNumber(), line.GetTitle(), line.GetType(), line.GetColor(),
+                         line.GetNetworkId(), stopIdsToFill, line.GetInterval());
     }
   }
 
@@ -458,10 +459,8 @@ void GraphData::ClipStops()
   CHECK(is_sorted(m_stops.cbegin(), m_stops.cend()), ());
   set<StopId> stopIds;
   for (auto const & line : m_lines)
-  {
     for (auto const & range : line.GetStopIds())
       stopIds.insert(range.cbegin(), range.cend());
-  }
 
   UpdateItems(stopIds, m_stops);
 }
@@ -492,10 +491,8 @@ void GraphData::ClipEdges()
 
   vector<Edge> edges;
   for (auto const & edge : m_edges)
-  {
     if (HasStop(m_stops, edge.GetStop1Id()) && HasStop(m_stops, edge.GetStop2Id()))
       edges.push_back(edge);
-  }
 
   SortVisitor{}(edges, nullptr /* name */);
   m_edges.swap(edges);
@@ -515,10 +512,8 @@ void GraphData::ClipShapes()
 
   vector<Shape> shapes;
   for (auto const & shape : m_shapes)
-  {
     if (shapeIdInEdges.count(shape.GetId()) != 0)
       shapes.push_back(shape);
-  }
 
   m_shapes.swap(shapes);
 }
diff --git a/libs/transit/transit_graph_data.hpp b/libs/transit/transit_graph_data.hpp
index ad943b907..8b450a1f2 100644
--- a/libs/transit/transit_graph_data.hpp
+++ b/libs/transit/transit_graph_data.hpp
@@ -33,8 +33,7 @@ public:
   DeserializerFromJson(json_t * node, OsmIdToFeatureIdsMap const & osmIdToFeatureIds);
 
   template <typename T>
-  typename std::enable_if<std::is_integral<T>::value || std::is_enum<T>::value ||
-      std::is_same<T, double>::value>::type
+  typename std::enable_if<std::is_integral<T>::value || std::is_enum<T>::value || std::is_same<T, double>::value>::type
   operator()(T & t, char const * name = nullptr)
   {
     GetField(t, name);
@@ -49,7 +48,7 @@ public:
 
   template <typename T>
   typename std::enable_if<std::is_same<T, Edge::WrappedEdgeId>::value ||
-      std::is_same<T, Stop::WrappedStopId>::value>::type
+                          std::is_same<T, Stop::WrappedStopId>::value>::type
   operator()(T & t, char const * name = nullptr)
   {
     typename T::RepType id;
@@ -76,16 +75,15 @@ public:
   }
 
   template <typename T>
-  typename std::enable_if<std::is_class<T>::value &&
-      !std::is_same<T, Edge::WrappedEdgeId>::value &&
-      !std::is_same<T, Stop::WrappedStopId>::value>::type
+  typename std::enable_if<std::is_class<T>::value && !std::is_same<T, Edge::WrappedEdgeId>::value &&
+                          !std::is_same<T, Stop::WrappedStopId>::value>::type
   operator()(T & t, char const * name = nullptr)
   {
     if (name != nullptr && json_is_object(m_node))
     {
       json_t * dictNode = base::GetJSONOptionalField(m_node, name);
       if (dictNode == nullptr)
-        return; // No such field in json.
+        return;  // No such field in json.
 
       DeserializerFromJson dict(dictNode, m_osmIdToFeatureIds);
       t.Visit(dict);
diff --git a/libs/transit/transit_schedule.cpp b/libs/transit/transit_schedule.cpp
index b9e5dc963..cd9900674 100644
--- a/libs/transit/transit_schedule.cpp
+++ b/libs/transit/transit_schedule.cpp
@@ -123,11 +123,10 @@ DatesInterval::DatesInterval(gtfs::CalendarItem const & calendarItem)
   // From high bit to the least significant bit (from 31 to 0):
   // year1 (4 bits), month1 (4 bits), day1 (5 bits), year delta (3 bits), month2 (4 bits), day2 (5
   // bits), sunday, monday, ..., saturday - 7 bits, each week day is 1 bit.
-  m_data = y1 << 28 | m1 << 24 | d1 << 19 | yDelta << 16 | m2 << 12 | d2 << 7 |
-           GetRawStatus(calendarItem.sunday) << 6 | GetRawStatus(calendarItem.monday) << 5 |
-           GetRawStatus(calendarItem.tuesday) << 4 | GetRawStatus(calendarItem.wednesday) << 3 |
-           GetRawStatus(calendarItem.thursday) << 2 | GetRawStatus(calendarItem.friday) << 1 |
-           GetRawStatus(calendarItem.saturday);
+  m_data = y1 << 28 | m1 << 24 | d1 << 19 | yDelta << 16 | m2 << 12 | d2 << 7 | GetRawStatus(calendarItem.sunday) << 6 |
+           GetRawStatus(calendarItem.monday) << 5 | GetRawStatus(calendarItem.tuesday) << 4 |
+           GetRawStatus(calendarItem.wednesday) << 3 | GetRawStatus(calendarItem.thursday) << 2 |
+           GetRawStatus(calendarItem.friday) << 1 | GetRawStatus(calendarItem.saturday);
 }
 
 DatesInterval::DatesInterval(uint32_t data) : m_data(data) {}
@@ -173,11 +172,13 @@ Status DatesInterval::GetStatusInInterval(Date const & date, uint8_t wdIndex) co
   return Status::Closed;
 }
 
-bool DatesInterval::operator==(DatesInterval const & rhs) const { return m_data == rhs.m_data; }
+bool DatesInterval::operator==(DatesInterval const & rhs) const
+{
+  return m_data == rhs.m_data;
+}
 
 // DateException -----------------------------------------------------------------------------------
-DateException::DateException(gtfs::Date const & date,
-                             gtfs::CalendarDateException const & dateException)
+DateException::DateException(gtfs::Date const & date, gtfs::CalendarDateException const & dateException)
 {
   uint32_t y = 0;
   uint32_t m = 0;
@@ -194,7 +195,10 @@ DateException::DateException(gtfs::Date const & date,
 
 DateException::DateException(uint16_t data) : m_data(data) {}
 
-bool DateException::operator==(DateException const & rhs) const { return m_data == rhs.m_data; }
+bool DateException::operator==(DateException const & rhs) const
+{
+  return m_data == rhs.m_data;
+}
 
 std::tuple<Date, bool> DateException::Extract() const
 {
@@ -240,9 +244,15 @@ TimeInterval::TimeInterval(gtfs::Time const & startTime, gtfs::Time const & endT
 
 TimeInterval::TimeInterval(uint64_t data) : m_data(data) {}
 
-bool TimeInterval::operator<(TimeInterval const & rhs) const { return m_data < rhs.m_data; }
+bool TimeInterval::operator<(TimeInterval const & rhs) const
+{
+  return m_data < rhs.m_data;
+}
 
-bool TimeInterval::operator==(TimeInterval const & rhs) const { return m_data == rhs.m_data; }
+bool TimeInterval::operator==(TimeInterval const & rhs) const
+{
+  return m_data == rhs.m_data;
+}
 
 std::pair<Time, Time> TimeInterval::Extract() const
 {
@@ -276,12 +286,10 @@ Status TimeInterval::GetTimeStatus(Time const & time) const
 FrequencyIntervals::FrequencyIntervals(gtfs::Frequencies const & frequencies)
 {
   for (auto const & freq : frequencies)
-  {
     if (freq.headway_secs > 0)
       m_intervals.emplace(TimeInterval(freq.start_time, freq.end_time), freq.headway_secs);
     else
       LOG(LINFO, ("Bad headway_secs:", freq.headway_secs));
-  }
 }
 
 bool FrequencyIntervals::operator==(FrequencyIntervals const & rhs) const
@@ -297,10 +305,8 @@ void FrequencyIntervals::AddInterval(TimeInterval const & timeInterval, Frequenc
 Frequency FrequencyIntervals::GetFrequency(Time const & time) const
 {
   for (auto const & [interval, freq] : m_intervals)
-  {
     if (interval.GetTimeStatus(time) == Status::Open)
       return freq;
-  }
 
   return kDefaultFrequency;
 }
@@ -313,36 +319,37 @@ std::map<TimeInterval, Frequency> const & FrequencyIntervals::GetFrequencies() c
 // Schedule ----------------------------------------------------------------------------------------
 bool Schedule::operator==(Schedule const & rhs) const
 {
-  return m_serviceIntervals == rhs.m_serviceIntervals &&
-         m_serviceExceptions == rhs.m_serviceExceptions &&
+  return m_serviceIntervals == rhs.m_serviceIntervals && m_serviceExceptions == rhs.m_serviceExceptions &&
          m_defaultFrequency == rhs.m_defaultFrequency;
 }
 
-void Schedule::AddDatesInterval(gtfs::CalendarItem const & calendarItem,
-                                gtfs::Frequencies const & frequencies)
+void Schedule::AddDatesInterval(gtfs::CalendarItem const & calendarItem, gtfs::Frequencies const & frequencies)
 {
   m_serviceIntervals.emplace(DatesInterval(calendarItem), FrequencyIntervals(frequencies));
 }
 
-void Schedule::AddDateException(gtfs::Date const & date,
-                                gtfs::CalendarDateException const & dateException,
+void Schedule::AddDateException(gtfs::Date const & date, gtfs::CalendarDateException const & dateException,
                                 gtfs::Frequencies const & frequencies)
 {
   m_serviceExceptions.emplace(DateException(date, dateException), FrequencyIntervals(frequencies));
 }
 
-DatesIntervals const & Schedule::GetServiceIntervals() const { return m_serviceIntervals; }
+DatesIntervals const & Schedule::GetServiceIntervals() const
+{
+  return m_serviceIntervals;
+}
 
-DatesExceptions const & Schedule::GetServiceExceptions() const { return m_serviceExceptions; }
+DatesExceptions const & Schedule::GetServiceExceptions() const
+{
+  return m_serviceExceptions;
+}
 
-void Schedule::AddDatesInterval(DatesInterval const & interval,
-                                FrequencyIntervals const & frequencies)
+void Schedule::AddDatesInterval(DatesInterval const & interval, FrequencyIntervals const & frequencies)
 {
   m_serviceIntervals[interval] = frequencies;
 }
 
-void Schedule::AddDateException(DateException const & dateException,
-                                FrequencyIntervals const & frequencies)
+void Schedule::AddDateException(DateException const & dateException, FrequencyIntervals const & frequencies)
 {
   m_serviceExceptions[dateException] = frequencies;
 }
@@ -380,16 +387,12 @@ Frequency Schedule::GetFrequency(time_t const & time) const
   auto const & [date, timeHms, wdIndex] = GetDateTimeAndWeekIndex(time);
 
   for (auto const & [dateException, freqInts] : m_serviceExceptions)
-  {
     if (dateException.GetExceptionStatus(date) == Status::Open)
       return freqInts.GetFrequency(timeHms);
-  }
 
   for (auto const & [datesInterval, freqInts] : m_serviceIntervals)
-  {
     if (datesInterval.GetStatusInInterval(date, wdIndex) == Status::Open)
       return freqInts.GetFrequency(timeHms);
-  }
 
   LOG(LWARNING, ("No frequency for date", date, "time", timeHms));
   return m_defaultFrequency;
diff --git a/libs/transit/transit_schedule.hpp b/libs/transit/transit_schedule.hpp
index 4c4ccc502..7ac60125f 100644
--- a/libs/transit/transit_schedule.hpp
+++ b/libs/transit/transit_schedule.hpp
@@ -35,14 +35,14 @@ class FixedSizeDeserializer;
 
 namespace transit
 {
-#define DECLARE_SCHEDULE_TYPES_FRIENDS                \
-  template <class Sink>                               \
-  friend class routing::transit::Serializer;          \
-  template <class Source>                             \
-  friend class routing::transit::Deserializer;        \
-  template <typename Sink>                            \
-  friend class routing::transit::FixedSizeSerializer; \
-  template <typename Sink>                            \
+#define DECLARE_SCHEDULE_TYPES_FRIENDS                  \
+  template <class Sink>                                 \
+  friend class routing::transit::Serializer;            \
+  template <class Source>                               \
+  friend class routing::transit::Deserializer;          \
+  template <typename Sink>                              \
+  friend class routing::transit::FixedSizeSerializer;   \
+  template <typename Sink>                              \
   friend class routing::transit::FixedSizeDeserializer;
 
 // Status of some transit itinerary (e.g. line) in the moment of time.
@@ -61,8 +61,7 @@ struct Date
   Date(uint32_t year, uint8_t month, uint16_t day) : m_year(year), m_month(month), m_day(day) {}
 
   DECLARE_SCHEDULE_TYPES_FRIENDS
-  DECLARE_VISITOR_AND_DEBUG_PRINT(Date, visitor(m_year, "y"), visitor(m_month, "m"),
-                                  visitor(m_day, "d"))
+  DECLARE_VISITOR_AND_DEBUG_PRINT(Date, visitor(m_year, "y"), visitor(m_month, "m"), visitor(m_day, "d"))
 
   uint32_t m_year = 0;
   uint8_t m_month = 0;
@@ -72,14 +71,10 @@ struct Date
 struct Time
 {
   Time() = default;
-  Time(uint8_t hour, uint8_t minute, uint8_t second)
-    : m_hour(hour), m_minute(minute), m_second(second)
-  {
-  }
+  Time(uint8_t hour, uint8_t minute, uint8_t second) : m_hour(hour), m_minute(minute), m_second(second) {}
 
   DECLARE_SCHEDULE_TYPES_FRIENDS
-  DECLARE_VISITOR_AND_DEBUG_PRINT(Time, visitor(m_hour, "h"), visitor(m_minute, "m"),
-                                  visitor(m_second, "s"))
+  DECLARE_VISITOR_AND_DEBUG_PRINT(Time, visitor(m_hour, "h"), visitor(m_minute, "m"), visitor(m_second, "s"))
 
   uint8_t m_hour = 0;
   uint8_t m_minute = 0;
@@ -222,8 +217,7 @@ class Schedule
 public:
   bool operator==(Schedule const & rhs) const;
 
-  void AddDatesInterval(gtfs::CalendarItem const & calendarItem,
-                        gtfs::Frequencies const & frequencies);
+  void AddDatesInterval(gtfs::CalendarItem const & calendarItem, gtfs::Frequencies const & frequencies);
   void AddDateException(gtfs::Date const & date, gtfs::CalendarDateException const & dateException,
                         gtfs::Frequencies const & frequencies);
 
@@ -235,8 +229,7 @@ public:
   DatesExceptions const & GetServiceExceptions() const;
 
   void AddDatesInterval(DatesInterval const & interval, FrequencyIntervals const & frequencies);
-  void AddDateException(DateException const & dateException,
-                        FrequencyIntervals const & frequencies);
+  void AddDateException(DateException const & dateException, FrequencyIntervals const & frequencies);
 
   void SetDefaultFrequency(Frequency const & frequency) { m_defaultFrequency = frequency; }
 
diff --git a/libs/transit/transit_serdes.hpp b/libs/transit/transit_serdes.hpp
index 2f7c2a727..7edc15c7e 100644
--- a/libs/transit/transit_serdes.hpp
+++ b/libs/transit/transit_serdes.hpp
@@ -42,9 +42,9 @@ public:
   explicit Serializer(Sink & sink) : m_sink(sink) {}
 
   template <typename T>
-  std::enable_if_t<(std::is_integral<T>::value || std::is_enum<T>::value) &&
-                   !std::is_same<T, uint32_t>::value && !std::is_same<T, uint64_t>::value &&
-                   !std::is_same<T, int32_t>::value && !std::is_same<T, int64_t>::value>
+  std::enable_if_t<(std::is_integral<T>::value || std::is_enum<T>::value) && !std::is_same<T, uint32_t>::value &&
+                   !std::is_same<T, uint64_t>::value && !std::is_same<T, int32_t>::value &&
+                   !std::is_same<T, int64_t>::value>
   operator()(T const & t, char const * /* name */ = nullptr)
   {
     WriteToSink(m_sink, t);
@@ -73,10 +73,7 @@ public:
     (*this)(DoubleToUint32(d, kMinDoubleAtTransitSection, kMaxDoubleAtTransitSection, kDoubleBits), name);
   }
 
-  void operator()(std::string const & s, char const * /* name */ = nullptr)
-  {
-    rw::Write(m_sink, s);
-  }
+  void operator()(std::string const & s, char const * /* name */ = nullptr) { rw::Write(m_sink, s); }
 
   void operator()(m2::PointD const & p, char const * /* name */ = nullptr)
   {
@@ -125,10 +122,7 @@ public:
       id.Visit(*this);
   }
 
-  void operator()(osmoh::OpeningHours const & oh, char const * /* name */ = nullptr)
-  {
-    (*this)(ToString(oh));
-  }
+  void operator()(osmoh::OpeningHours const & oh, char const * /* name */ = nullptr) { (*this)(ToString(oh)); }
 
   void operator()(Edge const & e, char const * /* name */ = nullptr)
   {
@@ -138,8 +132,7 @@ public:
     (*this)(e.m_lineId);
     // Note. |Edge::m_flags| is not filled fully after deserialization from json.
     // So it's necessary to fill it here.
-    EdgeFlags const flags =
-        GetEdgeFlags(e.GetTransfer(), e.GetStop1Id(), e.GetStop2Id(), e.GetShapeIds());
+    EdgeFlags const flags = GetEdgeFlags(e.GetTransfer(), e.GetStop1Id(), e.GetStop2Id(), e.GetShapeIds());
     (*this)(flags);
 
     if (flags.m_isShapeIdsEmpty || flags.m_isShapeIdsSame || flags.m_isShapeIdsReversed)
@@ -188,8 +181,7 @@ public:
   }
 
   template <typename T>
-  std::enable_if_t<std::is_class<T>::value> operator()(T const & t,
-                                                       char const * /* name */ = nullptr)
+  std::enable_if_t<std::is_class<T>::value> operator()(T const & t, char const * /* name */ = nullptr)
   {
     t.Visit(*this);
   }
@@ -207,9 +199,9 @@ public:
   explicit Deserializer(Source & source) : m_source(source) {}
 
   template <typename T>
-  std::enable_if_t<(std::is_integral<T>::value || std::is_enum<T>::value) &&
-                   !std::is_same<T, uint32_t>::value && !std::is_same<T, uint64_t>::value &&
-                   !std::is_same<T, int32_t>::value && !std::is_same<T, int64_t>::value>
+  std::enable_if_t<(std::is_integral<T>::value || std::is_enum<T>::value) && !std::is_same<T, uint32_t>::value &&
+                   !std::is_same<T, uint64_t>::value && !std::is_same<T, int32_t>::value &&
+                   !std::is_same<T, int64_t>::value>
   operator()(T & t, char const * name = nullptr)
   {
     ReadPrimitiveFromSource(m_source, t);
@@ -238,10 +230,7 @@ public:
     d = Uint32ToDouble(ui, kMinDoubleAtTransitSection, kMaxDoubleAtTransitSection, kDoubleBits);
   }
 
-  void operator()(std::string & s, char const * /* name */ = nullptr)
-  {
-    rw::Read(m_source, s);
-  }
+  void operator()(std::string & s, char const * /* name */ = nullptr) { rw::Read(m_source, s); }
 
   void operator()(m2::PointD & p, char const * /* name */ = nullptr)
   {
@@ -336,8 +325,7 @@ public:
     vs.resize(size);
     for (auto & p : vs)
     {
-      m2::PointU const pointU = coding::DecodePointDeltaFromUint(
-          ReadVarUint<uint64_t>(m_source), lastDecodedPoint);
+      m2::PointU const pointU = coding::DecodePointDeltaFromUint(ReadVarUint<uint64_t>(m_source), lastDecodedPoint);
       p = PointUToPointD(pointU, kPointCoordBits);
       lastDecodedPoint = pointU;
     }
@@ -434,18 +422,15 @@ public:
   explicit FixedSizeDeserializer(Source & source) : m_source(source) {}
 
   template <typename T>
-  std::enable_if_t<std::is_integral<T>::value || std::is_enum<T>::value, void> operator()(
-      T & t, char const * name = nullptr)
+  std::enable_if_t<std::is_integral<T>::value || std::is_enum<T>::value, void> operator()(T & t,
+                                                                                          char const * name = nullptr)
   {
     ReadPrimitiveFromSource(m_source, t);
   }
 
   void operator()(TransitHeader & header) { header.Visit(*this); }
 
-  void operator()(::transit::experimental::TransitHeader & headerExperimental)
-  {
-    headerExperimental.Visit(*this);
-  }
+  void operator()(::transit::experimental::TransitHeader & headerExperimental) { headerExperimental.Visit(*this); }
 
 private:
   Source & m_source;
diff --git a/libs/transit/transit_tests/transit_graph_test.cpp b/libs/transit/transit_tests/transit_graph_test.cpp
index 119c802a2..496fffdd4 100644
--- a/libs/transit/transit_tests/transit_graph_test.cpp
+++ b/libs/transit/transit_tests/transit_graph_test.cpp
@@ -284,82 +284,165 @@ unique_ptr<GraphData> CreateGraphFromJson()
 unique_ptr<Graph> MakeFullGraph()
 {
   auto graph = make_unique<Graph>();
-  graph->m_stops = {{0 /* stop id */, 100 /* osm id */, 10 /* feature id */,
-                     kInvalidTransferId, {1} /* line ids */,
-                     m2::PointD(-2.0, 1.0), {}},
-                    {1 /* stop id */, 101 /* osm id */, 11 /* feature id */,
-                     kInvalidTransferId, {1} /* line ids */,
-                     m2::PointD(0.0, 1.0), {}},
-                    {2 /* stop id */, 102 /* osm id */, 12 /* feature id */,
-                     kInvalidTransferId, {1} /* line ids */,
-                     m2::PointD(2.0, 1.0), {}},
-                    {3 /* stop id */, 103 /* osm id */, 13 /* feature id */,
-                     kInvalidTransferId, {1} /* line ids */,
-                     m2::PointD(4.0, 1.0), {}},
-                    {4 /* stop id */, 104 /* osm id */, 14 /* feature id */,
-                     kInvalidTransferId, {1} /* line ids */,
-                     m2::PointD(5.0, 1.0), {}},
-                    {5 /* stop id */, 105 /* osm id */, 15 /* feature id */,
-                     kInvalidTransferId, {2} /* line ids */,
-                     m2::PointD(-1.0, -1.0), {}},
-                    {6 /* stop id */, 106 /* osm id */, 16 /* feature id */,
-                     kInvalidTransferId, {2} /* line ids */,
-                     m2::PointD(1.0, -1.0), {}}};
+  graph->m_stops = {{0 /* stop id */,
+                     100 /* osm id */,
+                     10 /* feature id */,
+                     kInvalidTransferId,
+                     {1} /* line ids */,
+                     m2::PointD(-2.0, 1.0),
+                     {}},
+                    {1 /* stop id */,
+                     101 /* osm id */,
+                     11 /* feature id */,
+                     kInvalidTransferId,
+                     {1} /* line ids */,
+                     m2::PointD(0.0, 1.0),
+                     {}},
+                    {2 /* stop id */,
+                     102 /* osm id */,
+                     12 /* feature id */,
+                     kInvalidTransferId,
+                     {1} /* line ids */,
+                     m2::PointD(2.0, 1.0),
+                     {}},
+                    {3 /* stop id */,
+                     103 /* osm id */,
+                     13 /* feature id */,
+                     kInvalidTransferId,
+                     {1} /* line ids */,
+                     m2::PointD(4.0, 1.0),
+                     {}},
+                    {4 /* stop id */,
+                     104 /* osm id */,
+                     14 /* feature id */,
+                     kInvalidTransferId,
+                     {1} /* line ids */,
+                     m2::PointD(5.0, 1.0),
+                     {}},
+                    {5 /* stop id */,
+                     105 /* osm id */,
+                     15 /* feature id */,
+                     kInvalidTransferId,
+                     {2} /* line ids */,
+                     m2::PointD(-1.0, -1.0),
+                     {}},
+                    {6 /* stop id */,
+                     106 /* osm id */,
+                     16 /* feature id */,
+                     kInvalidTransferId,
+                     {2} /* line ids */,
+                     m2::PointD(1.0, -1.0),
+                     {}}};
 
   graph->m_gates = {
-      {100 /* osm id */, 10 /* feature id */, true /* entrance */, true /* exit */, 0 /* weight */,
-       {0} /* stop ids */, m2::PointD(-2.0, 1.0)},
-      {101 /* osm id */, 11 /* feature id */, true /* entrance */, true /* exit */, 0 /* weight */,
-       {1} /* stop ids */, m2::PointD(0.0, 1.0)},
-      {102 /* osm id */, 12 /* feature id */, true /* entrance */, true /* exit */, 0 /* weight */,
-       {2} /* stop ids */, m2::PointD(2.0, 1.0)},
-      {103 /* osm id */, 13 /* feature id */, true /* entrance */, true /* exit */, 0 /* weight */,
-       {3} /* stop ids */, m2::PointD(4.0, 1.0)},
-      {104 /* osm id */, 14 /* feature id */, true /* entrance */, true /* exit */, 0 /* weight */,
-       {4} /* stop ids */, m2::PointD(5.0, 1.0)},
-      {105 /* osm id */, 15 /* feature id */, true /* entrance */, true /* exit */, 0 /* weight */,
-       {5} /* stop ids */, m2::PointD(-1.0, -1.0)},
-      {106 /* osm id */, 16 /* feature id */, true /* entrance */, true /* exit */, 0 /* weight */,
-       {6} /* stop ids */, m2::PointD(1.0, -1.0)},
+      {100 /* osm id */,
+       10 /* feature id */,
+       true /* entrance */,
+       true /* exit */,
+       0 /* weight */,
+       {0} /* stop ids */,
+       m2::PointD(-2.0, 1.0)},
+      {101 /* osm id */,
+       11 /* feature id */,
+       true /* entrance */,
+       true /* exit */,
+       0 /* weight */,
+       {1} /* stop ids */,
+       m2::PointD(0.0, 1.0)},
+      {102 /* osm id */,
+       12 /* feature id */,
+       true /* entrance */,
+       true /* exit */,
+       0 /* weight */,
+       {2} /* stop ids */,
+       m2::PointD(2.0, 1.0)},
+      {103 /* osm id */,
+       13 /* feature id */,
+       true /* entrance */,
+       true /* exit */,
+       0 /* weight */,
+       {3} /* stop ids */,
+       m2::PointD(4.0, 1.0)},
+      {104 /* osm id */,
+       14 /* feature id */,
+       true /* entrance */,
+       true /* exit */,
+       0 /* weight */,
+       {4} /* stop ids */,
+       m2::PointD(5.0, 1.0)},
+      {105 /* osm id */,
+       15 /* feature id */,
+       true /* entrance */,
+       true /* exit */,
+       0 /* weight */,
+       {5} /* stop ids */,
+       m2::PointD(-1.0, -1.0)},
+      {106 /* osm id */,
+       16 /* feature id */,
+       true /* entrance */,
+       true /* exit */,
+       0 /* weight */,
+       {6} /* stop ids */,
+       m2::PointD(1.0, -1.0)},
   };
 
-  graph->m_edges = {
-      {0 /* stop 1 id */, 1 /* stop 2 id */, 20 /* weight */, 1 /* line id */, false /* transfer */,
-       {{0, 1}} /* shape ids */},
-      {1 /* stop 1 id */, 2 /* stop 2 id */, 20 /* weight */, 1 /* line id */, false /* transfer */,
-       {{1, 2}} /* shape ids */},
-      {2 /* stop 1 id */, 3 /* stop 2 id */, 20 /* weight */, 1 /* line id */, false /* transfer */,
-       {{2, 3}} /* shape ids */},
-      {3 /* stop 1 id */, 4 /* stop 2 id */, 10 /* weight */, 1 /* line id */, false /* transfer */,
-       {{3, 4}} /* shape ids */},
-      {5 /* stop 1 id */, 6 /* stop 2 id */, 20 /* weight */, 2 /* line id */, false /* transfer */,
-       {{5, 6}} /* shape ids */}
-  };
+  graph->m_edges = {{0 /* stop 1 id */,
+                     1 /* stop 2 id */,
+                     20 /* weight */,
+                     1 /* line id */,
+                     false /* transfer */,
+                     {{0, 1}} /* shape ids */},
+                    {1 /* stop 1 id */,
+                     2 /* stop 2 id */,
+                     20 /* weight */,
+                     1 /* line id */,
+                     false /* transfer */,
+                     {{1, 2}} /* shape ids */},
+                    {2 /* stop 1 id */,
+                     3 /* stop 2 id */,
+                     20 /* weight */,
+                     1 /* line id */,
+                     false /* transfer */,
+                     {{2, 3}} /* shape ids */},
+                    {3 /* stop 1 id */,
+                     4 /* stop 2 id */,
+                     10 /* weight */,
+                     1 /* line id */,
+                     false /* transfer */,
+                     {{3, 4}} /* shape ids */},
+                    {5 /* stop 1 id */,
+                     6 /* stop 2 id */,
+                     20 /* weight */,
+                     2 /* line id */,
+                     false /* transfer */,
+                     {{5, 6}} /* shape ids */}};
 
   // |graph.m_transfers| should be empty.
 
-  graph->m_lines = {
-      {1 /* line id */, "1" /* number */, "Московская линия" /* title */, "subway" /* type */,
-       "green",
-       2 /* network id */, {{0, 1, 2, 3, 4}} /* stop id */,
-       150 /* interval */},
-      {2 /* line id */, "2" /* number */, "Варшавская линия" /* title */, "subway" /* type */,
-       "red",
-       2 /* network id */, {{5, 6}} /* stop id */,
-       150 /* interval */}
-  };
+  graph->m_lines = {{1 /* line id */,
+                     "1" /* number */,
+                     "Московская линия" /* title */,
+                     "subway" /* type */,
+                     "green",
+                     2 /* network id */,
+                     {{0, 1, 2, 3, 4}} /* stop id */,
+                     150 /* interval */},
+                    {2 /* line id */,
+                     "2" /* number */,
+                     "Варшавская линия" /* title */,
+                     "subway" /* type */,
+                     "red",
+                     2 /* network id */,
+                     {{5, 6}} /* stop id */,
+                     150 /* interval */}};
 
-  graph->m_shapes = {
-      {{0, 1} /* shape id */, {{-2.0, 1.0}, {0.0, 1.0}} /* polyline */},
-      {{1, 2} /* shape id */, {{0.0, 1.0}, {2.0, 1.0}} /* polyline */},
-      {{2, 3} /* shape id */, {{2.0, 1.0}, {4.0, 1.0}} /* polyline */},
-      {{3, 4} /* shape id */, {{4.0, 1.0}, {5.0, 1.0}} /* polyline */},
-      {{5, 6} /* shape id */, {{-1.0, -1.0}, {1.0, -1.0}} /* polyline */}
-  };
+  graph->m_shapes = {{{0, 1} /* shape id */, {{-2.0, 1.0}, {0.0, 1.0}} /* polyline */},
+                     {{1, 2} /* shape id */, {{0.0, 1.0}, {2.0, 1.0}} /* polyline */},
+                     {{2, 3} /* shape id */, {{2.0, 1.0}, {4.0, 1.0}} /* polyline */},
+                     {{3, 4} /* shape id */, {{4.0, 1.0}, {5.0, 1.0}} /* polyline */},
+                     {{5, 6} /* shape id */, {{-1.0, -1.0}, {1.0, -1.0}} /* polyline */}};
 
-  graph->m_networks = {
-      {2 /* network id */, "Минский метрополитен" /* title */}
-  };
+  graph->m_networks = {{2 /* network id */, "Минский метрополитен" /* title */}};
 
   return graph;
 }
@@ -368,59 +451,99 @@ unique_ptr<Graph> MakeOneLineGraph()
 {
   auto graph = make_unique<Graph>();
 
-  graph->m_stops = {
-      {0 /* stop id */, 100 /* osm id */, 10 /* feature id */, kInvalidTransferId,
-       {1} /* line ids */,
-       m2::PointD(-2.0, 1.0), {}},
-      {1 /* stop id */, 101 /* osm id */, 11 /* feature id */, kInvalidTransferId,
-       {1} /* line ids */,
-       m2::PointD(0.0, 1.0), {}},
-      {2 /* stop id */, 102 /* osm id */, 12 /* feature id */, kInvalidTransferId,
-       {1} /* line ids */,
-       m2::PointD(2.0, 1.0), {}},
-      {3 /* stop id */, 103 /* osm id */, 13 /* feature id */, kInvalidTransferId,
-       {1} /* line ids */,
-       m2::PointD(4.0, 1.0), {}}
-  };
+  graph->m_stops = {{0 /* stop id */,
+                     100 /* osm id */,
+                     10 /* feature id */,
+                     kInvalidTransferId,
+                     {1} /* line ids */,
+                     m2::PointD(-2.0, 1.0),
+                     {}},
+                    {1 /* stop id */,
+                     101 /* osm id */,
+                     11 /* feature id */,
+                     kInvalidTransferId,
+                     {1} /* line ids */,
+                     m2::PointD(0.0, 1.0),
+                     {}},
+                    {2 /* stop id */,
+                     102 /* osm id */,
+                     12 /* feature id */,
+                     kInvalidTransferId,
+                     {1} /* line ids */,
+                     m2::PointD(2.0, 1.0),
+                     {}},
+                    {3 /* stop id */,
+                     103 /* osm id */,
+                     13 /* feature id */,
+                     kInvalidTransferId,
+                     {1} /* line ids */,
+                     m2::PointD(4.0, 1.0),
+                     {}}};
 
-  graph->m_gates = {
-      {100 /* osm id */, 10 /* feature id */, true /* entrance */, true /* exit */, 0 /* weight */,
-       {0} /* stop ids */, m2::PointD(-2.0, 1.0)},
-      {101 /* osm id */, 11 /* feature id */, true /* entrance */, true /* exit */, 0 /* weight */,
-       {1} /* stop ids */, m2::PointD(0.0, 1.0)},
-      {102 /* osm id */, 12 /* feature id */, true /* entrance */, true /* exit */, 0 /* weight */,
-       {2} /* stop ids */, m2::PointD(2.0, 1.0)},
-      {103 /* osm id */, 13 /* feature id */, true /* entrance */, true /* exit */, 0 /* weight */,
-       {3} /* stop ids */, m2::PointD(4.0, 1.0)}
-  };
+  graph->m_gates = {{100 /* osm id */,
+                     10 /* feature id */,
+                     true /* entrance */,
+                     true /* exit */,
+                     0 /* weight */,
+                     {0} /* stop ids */,
+                     m2::PointD(-2.0, 1.0)},
+                    {101 /* osm id */,
+                     11 /* feature id */,
+                     true /* entrance */,
+                     true /* exit */,
+                     0 /* weight */,
+                     {1} /* stop ids */,
+                     m2::PointD(0.0, 1.0)},
+                    {102 /* osm id */,
+                     12 /* feature id */,
+                     true /* entrance */,
+                     true /* exit */,
+                     0 /* weight */,
+                     {2} /* stop ids */,
+                     m2::PointD(2.0, 1.0)},
+                    {103 /* osm id */,
+                     13 /* feature id */,
+                     true /* entrance */,
+                     true /* exit */,
+                     0 /* weight */,
+                     {3} /* stop ids */,
+                     m2::PointD(4.0, 1.0)}};
 
-  graph->m_edges = {
-      {0 /* stop 1 id */, 1 /* stop 2 id */, 20 /* weight */, 1 /* line id */, false /* transfer */,
-       {{0, 1}} /* shape ids */},
-      {1 /* stop 1 id */, 2 /* stop 2 id */, 20 /* weight */, 1 /* line id */, false /* transfer */,
-       {{1, 2}} /* shape ids */},
-      {2 /* stop 1 id */, 3 /* stop 2 id */, 20 /* weight */, 1 /* line id */, false /* transfer */,
-       {{2, 3}} /* shape ids */}
-  };
+  graph->m_edges = {{0 /* stop 1 id */,
+                     1 /* stop 2 id */,
+                     20 /* weight */,
+                     1 /* line id */,
+                     false /* transfer */,
+                     {{0, 1}} /* shape ids */},
+                    {1 /* stop 1 id */,
+                     2 /* stop 2 id */,
+                     20 /* weight */,
+                     1 /* line id */,
+                     false /* transfer */,
+                     {{1, 2}} /* shape ids */},
+                    {2 /* stop 1 id */,
+                     3 /* stop 2 id */,
+                     20 /* weight */,
+                     1 /* line id */,
+                     false /* transfer */,
+                     {{2, 3}} /* shape ids */}};
 
   // |graph.m_transfers| should be empty.
 
-  graph->m_lines = {
-      {1 /* line id */, "1" /* number */, "Московская линия" /* title */, "subway" /* type */,
-       "green",
-       2 /* network id */, {{0, 1, 2, 3}} /* stop id */,
-       150 /* interval */}
-  };
+  graph->m_lines = {{1 /* line id */,
+                     "1" /* number */,
+                     "Московская линия" /* title */,
+                     "subway" /* type */,
+                     "green",
+                     2 /* network id */,
+                     {{0, 1, 2, 3}} /* stop id */,
+                     150 /* interval */}};
 
-  graph->m_shapes = {
-      {{0, 1} /* shape id */, {{-2.0, 1.0}, {0.0, 1.0}} /* polyline */},
-      {{1, 2} /* shape id */, {{0.0, 1.0}, {2.0, 1.0}} /* polyline */},
-      {{2, 3} /* shape id */, {{2.0, 1.0}, {4.0, 1.0}} /* polyline */}
-  };
+  graph->m_shapes = {{{0, 1} /* shape id */, {{-2.0, 1.0}, {0.0, 1.0}} /* polyline */},
+                     {{1, 2} /* shape id */, {{0.0, 1.0}, {2.0, 1.0}} /* polyline */},
+                     {{2, 3} /* shape id */, {{2.0, 1.0}, {4.0, 1.0}} /* polyline */}};
 
-  graph->m_networks = {
-      {2 /* network id */, "Минский метрополитен" /* title */}
-  };
+  graph->m_networks = {{2 /* network id */, "Минский метрополитен" /* title */}};
 
   return graph;
 }
@@ -429,67 +552,123 @@ unique_ptr<Graph> MakeTwoLinesGraph()
 {
   auto graph = make_unique<Graph>();
 
-  graph->m_stops = {
-      {1 /* stop id */, 101 /* osm id */, 11 /* feature id */, kInvalidTransferId,
-       {1} /* line ids */,
-       m2::PointD(0.0, 1.0), {}},
-      {2 /* stop id */, 102 /* osm id */, 12 /* feature id */, kInvalidTransferId,
-       {1} /* line ids */,
-       m2::PointD(2.0, 1.0), {}},
-      {3 /* stop id */, 103 /* osm id */, 13 /* feature id */, kInvalidTransferId,
-       {1} /* line ids */,
-       m2::PointD(4.0, 1.0), {}},
-      {5 /* stop id */, 105 /* osm id */, 15 /* feature id */, kInvalidTransferId,
-       {2} /* line ids */,
-       m2::PointD(-1.0, -1.0), {}},
-      {6 /* stop id */, 106 /* osm id */, 16 /* feature id */, kInvalidTransferId,
-       {2} /* line ids */,
-       m2::PointD(1.0, -1.0), {}}};
+  graph->m_stops = {{1 /* stop id */,
+                     101 /* osm id */,
+                     11 /* feature id */,
+                     kInvalidTransferId,
+                     {1} /* line ids */,
+                     m2::PointD(0.0, 1.0),
+                     {}},
+                    {2 /* stop id */,
+                     102 /* osm id */,
+                     12 /* feature id */,
+                     kInvalidTransferId,
+                     {1} /* line ids */,
+                     m2::PointD(2.0, 1.0),
+                     {}},
+                    {3 /* stop id */,
+                     103 /* osm id */,
+                     13 /* feature id */,
+                     kInvalidTransferId,
+                     {1} /* line ids */,
+                     m2::PointD(4.0, 1.0),
+                     {}},
+                    {5 /* stop id */,
+                     105 /* osm id */,
+                     15 /* feature id */,
+                     kInvalidTransferId,
+                     {2} /* line ids */,
+                     m2::PointD(-1.0, -1.0),
+                     {}},
+                    {6 /* stop id */,
+                     106 /* osm id */,
+                     16 /* feature id */,
+                     kInvalidTransferId,
+                     {2} /* line ids */,
+                     m2::PointD(1.0, -1.0),
+                     {}}};
 
   graph->m_gates = {
-      {101 /* osm id */, 11 /* feature id */, true /* entrance */, true /* exit */, 0 /* weight */,
-       {1} /* stop ids */, m2::PointD(0.0, 1.0)},
-      {102 /* osm id */, 12 /* feature id */, true /* entrance */, true /* exit */, 0 /* weight */,
-       {2} /* stop ids */, m2::PointD(2.0, 1.0)},
-      {103 /* osm id */, 13 /* feature id */, true /* entrance */, true /* exit */, 0 /* weight */,
-       {3} /* stop ids */, m2::PointD(4.0, 1.0)},
-      {105 /* osm id */, 15 /* feature id */, true /* entrance */, true /* exit */, 0 /* weight */,
-       {5} /* stop ids */, m2::PointD(-1.0, -1.0)},
-      {106 /* osm id */, 16 /* feature id */, true /* entrance */, true /* exit */, 0 /* weight */,
-       {6} /* stop ids */, m2::PointD(1.0, -1.0)},
+      {101 /* osm id */,
+       11 /* feature id */,
+       true /* entrance */,
+       true /* exit */,
+       0 /* weight */,
+       {1} /* stop ids */,
+       m2::PointD(0.0, 1.0)},
+      {102 /* osm id */,
+       12 /* feature id */,
+       true /* entrance */,
+       true /* exit */,
+       0 /* weight */,
+       {2} /* stop ids */,
+       m2::PointD(2.0, 1.0)},
+      {103 /* osm id */,
+       13 /* feature id */,
+       true /* entrance */,
+       true /* exit */,
+       0 /* weight */,
+       {3} /* stop ids */,
+       m2::PointD(4.0, 1.0)},
+      {105 /* osm id */,
+       15 /* feature id */,
+       true /* entrance */,
+       true /* exit */,
+       0 /* weight */,
+       {5} /* stop ids */,
+       m2::PointD(-1.0, -1.0)},
+      {106 /* osm id */,
+       16 /* feature id */,
+       true /* entrance */,
+       true /* exit */,
+       0 /* weight */,
+       {6} /* stop ids */,
+       m2::PointD(1.0, -1.0)},
   };
 
-  graph->m_edges = {
-      {1 /* stop 1 id */, 2 /* stop 2 id */, 20 /* weight */, 1 /* line id */, false /* transfer */,
-       {{1, 2}} /* shape ids */},
-      {2 /* stop 1 id */, 3 /* stop 2 id */, 20 /* weight */, 1 /* line id */, false /* transfer */,
-       {{2, 3}} /* shape ids */},
-      {5 /* stop 1 id */, 6 /* stop 2 id */, 20 /* weight */, 2 /* line id */, false /* transfer */,
-       {{5, 6}} /* shape ids */}
-  };
+  graph->m_edges = {{1 /* stop 1 id */,
+                     2 /* stop 2 id */,
+                     20 /* weight */,
+                     1 /* line id */,
+                     false /* transfer */,
+                     {{1, 2}} /* shape ids */},
+                    {2 /* stop 1 id */,
+                     3 /* stop 2 id */,
+                     20 /* weight */,
+                     1 /* line id */,
+                     false /* transfer */,
+                     {{2, 3}} /* shape ids */},
+                    {5 /* stop 1 id */,
+                     6 /* stop 2 id */,
+                     20 /* weight */,
+                     2 /* line id */,
+                     false /* transfer */,
+                     {{5, 6}} /* shape ids */}};
 
   // |graph.m_transfers| should be empty.
 
-  graph->m_lines = {
-      {1 /* line id */, "1" /* number */, "Московская линия" /* title */, "subway" /* type */,
-       "green",
-       2 /* network id */, {{1, 2, 3}} /* stop id */,
-       150 /* interval */},
-      {2 /* line id */, "2" /* number */, "Варшавская линия" /* title */, "subway" /* type */,
-       "red",
-       2 /* network id */, {{5, 6}} /* stop id */,
-       150 /* interval */}
-  };
+  graph->m_lines = {{1 /* line id */,
+                     "1" /* number */,
+                     "Московская линия" /* title */,
+                     "subway" /* type */,
+                     "green",
+                     2 /* network id */,
+                     {{1, 2, 3}} /* stop id */,
+                     150 /* interval */},
+                    {2 /* line id */,
+                     "2" /* number */,
+                     "Варшавская линия" /* title */,
+                     "subway" /* type */,
+                     "red",
+                     2 /* network id */,
+                     {{5, 6}} /* stop id */,
+                     150 /* interval */}};
 
-  graph->m_shapes = {
-      {{1, 2} /* shape id */, {{0.0, 1.0}, {2.0, 1.0}} /* polyline */},
-      {{2, 3} /* shape id */, {{2.0, 1.0}, {4.0, 1.0}} /* polyline */},
-      {{5, 6} /* shape id */, {{-1.0, -1.0}, {1.0, -1.0}} /* polyline */}
-  };
+  graph->m_shapes = {{{1, 2} /* shape id */, {{0.0, 1.0}, {2.0, 1.0}} /* polyline */},
+                     {{2, 3} /* shape id */, {{2.0, 1.0}, {4.0, 1.0}} /* polyline */},
+                     {{5, 6} /* shape id */, {{-1.0, -1.0}, {1.0, -1.0}} /* polyline */}};
 
-  graph->m_networks = {
-      {2 /* network id */, "Минский метрополитен" /* title */}
-  };
+  graph->m_networks = {{2 /* network id */, "Минский метрополитен" /* title */}};
 
   return graph;
 }
diff --git a/libs/transit/transit_tests/transit_json_parsing_test.cpp b/libs/transit/transit_tests/transit_json_parsing_test.cpp
index e4f1f912f..2efd52c0a 100644
--- a/libs/transit/transit_tests/transit_json_parsing_test.cpp
+++ b/libs/transit/transit_tests/transit_json_parsing_test.cpp
@@ -19,9 +19,8 @@ using namespace std;
 namespace
 {
 template <typename Obj>
-void TestDeserializerFromJson(string const & jsonBuffer,
-                              OsmIdToFeatureIdsMap const & osmIdToFeatureIds, string const & name,
-                              vector<Obj> const & expected)
+void TestDeserializerFromJson(string const & jsonBuffer, OsmIdToFeatureIdsMap const & osmIdToFeatureIds,
+                              string const & name, vector<Obj> const & expected)
 {
   base::Json root(jsonBuffer.c_str());
   CHECK(root.get() != nullptr, ("Cannot parse the json."));
@@ -36,8 +35,7 @@ void TestDeserializerFromJson(string const & jsonBuffer,
 }
 
 template <typename Obj>
-void TestDeserializerFromJson(string const & jsonBuffer, string const & name,
-                              vector<Obj> const & expected)
+void TestDeserializerFromJson(string const & jsonBuffer, string const & name, vector<Obj> const & expected)
 {
   return TestDeserializerFromJson(jsonBuffer, OsmIdToFeatureIdsMap(), name, expected);
 }
@@ -92,9 +90,8 @@ UNIT_TEST(DeserializerFromJson_Stops)
   ]})";
 
   vector<Stop> const expected = {
-      Stop(343259523 /* id */, 1234 /* osm id */, 1 /* feature id */,
-           kInvalidTransferId /* transfer id */, {19207936, 19207937} /* lineIds */,
-           {27.4970954, 64.20146835878187} /* point */, {} /* anchors */),
+      Stop(343259523 /* id */, 1234 /* osm id */, 1 /* feature id */, kInvalidTransferId /* transfer id */,
+           {19207936, 19207937} /* lineIds */, {27.4970954, 64.20146835878187} /* point */, {} /* anchors */),
       Stop(266680843 /* id */, 2345 /* osm id */, 2 /* feature id */, 5 /* transfer id */,
            {19213568, 19213569} /* line ids */, {27.5227942, 64.25206634443111} /* point */,
            {TitleAnchor(12 /* min zoom */, 0 /* anchor */), TitleAnchor(15, 9)})};
@@ -135,12 +132,10 @@ UNIT_TEST(DeserializerFromJson_Gates)
   ]})";
 
   vector<Gate> const expected = {
-      Gate(46116860 /* osm id */, 0 /* feature id */, true /* entrance */,
-           true /* exit */, 60 /* weight */, {442018474} /* stop ids */,
-           {43.8594864, 68.33320554776377} /* point */),
-      Gate(18446744073709551615ULL /* osm id */, 2 /* feature id */, true /* entrance */,
-           true /* exit */, 60 /* weight */, {442018465} /* stop ids */,
-           {43.9290544, 68.41120791512581} /* point */)};
+      Gate(46116860 /* osm id */, 0 /* feature id */, true /* entrance */, true /* exit */, 60 /* weight */,
+           {442018474} /* stop ids */, {43.8594864, 68.33320554776377} /* point */),
+      Gate(18446744073709551615ULL /* osm id */, 2 /* feature id */, true /* entrance */, true /* exit */,
+           60 /* weight */, {442018465} /* stop ids */, {43.9290544, 68.41120791512581} /* point */)};
 
   OsmIdToFeatureIdsMap mapping;
   mapping[base::GeoObjectId(46116860)] = vector<FeatureId>({0});
@@ -181,11 +176,10 @@ UNIT_TEST(DeserializerFromJson_Edges)
   ]})";
 
   vector<Edge> const expected = {
-      Edge(442018444 /* stop 1 id */, 442018445 /* stop 2 id */, kInvalidWeight /* weight */,
-           72551680 /* line id */, false /* transfer */,
-           {ShapeId(209186407, 209186410), ShapeId(209186408, 209186411)}),
-      Edge(442018445 /* stop 1 id */, 442018446 /* stop 2 id */, 345 /* weight */,
-           72551680 /* line id */, false /* transfer */, {} /* shape ids */)};
+      Edge(442018444 /* stop 1 id */, 442018445 /* stop 2 id */, kInvalidWeight /* weight */, 72551680 /* line id */,
+           false /* transfer */, {ShapeId(209186407, 209186410), ShapeId(209186408, 209186411)}),
+      Edge(442018445 /* stop 1 id */, 442018446 /* stop 2 id */, 345 /* weight */, 72551680 /* line id */,
+           false /* transfer */, {} /* shape ids */)};
 
   TestDeserializerFromJson(jsonBuffer, "edges", expected);
 }
@@ -208,9 +202,8 @@ UNIT_TEST(DeserializerFromJson_Transfers)
     }
   ]})";
 
-  vector<Transfer> const expected = {
-      Transfer(922337203 /* stop id */, {27.5619844, 64.24325959173672} /* point */,
-               {209186416, 277039518} /* stopIds */, {} /* anchors */)};
+  vector<Transfer> const expected = {Transfer(922337203 /* stop id */, {27.5619844, 64.24325959173672} /* point */,
+                                              {209186416, 277039518} /* stopIds */, {} /* anchors */)};
 
   TestDeserializerFromJson(jsonBuffer, "transfers", expected);
 }
@@ -256,14 +249,14 @@ UNIT_TEST(DeserializerFromJson_Lines)
     }
   ]})";
 
-  vector<Line> const expected = {Line(19207936 /* line id */, "1" /* number */, "Московская линия" /* title */,
-                                      "subway" /* type */, "green" /* color */, 2 /* network id */,
-                                      {{343262691, 343259523, 343252898, 209191847, 2947858576}} /* stop ids */,
-                                      150 /* interval */),
-                                 Line(19207937 /* line id */, "2" /* number */, "Московская линия" /* title */,
-                                      "subway" /* type */, "red" /* color */, 2 /* network id */,
-                                      {{246659391, 246659390, 209191855, 209191854, 209191853,
-                                        209191852, 209191851}} /* stop ids */, 150 /* interval */)};
+  vector<Line> const expected = {
+      Line(19207936 /* line id */, "1" /* number */, "Московская линия" /* title */, "subway" /* type */,
+           "green" /* color */, 2 /* network id */,
+           {{343262691, 343259523, 343252898, 209191847, 2947858576}} /* stop ids */, 150 /* interval */),
+      Line(19207937 /* line id */, "2" /* number */, "Московская линия" /* title */, "subway" /* type */,
+           "red" /* color */, 2 /* network id */,
+           {{246659391, 246659390, 209191855, 209191854, 209191853, 209191852, 209191851}} /* stop ids */,
+           150 /* interval */)};
 
   TestDeserializerFromJson(jsonBuffer, "lines", expected);
 }
@@ -315,14 +308,14 @@ UNIT_TEST(DeserializerFromJson_Shapes)
     }
   ]})";
 
-  vector<Shape> const expected = {Shape(ShapeId(209186424 /* stop 1 id */, 248520179 /* stop 2 id */),
-                                        {m2::PointD(27.5762295, 64.256768574044699),
-                                         m2::PointD(27.576325736220355, 64.256879325696005),
-                                         m2::PointD(27.576420780761875, 64.256990221238539),
-                                         m2::PointD(27.576514659541523, 64.257101255242176)} /* polyline */),
-                                  Shape(ShapeId(209191850 /* stop 1 id */, 209191851 /* stop 2 id */),
-                                        {m2::PointD(27.554025800000002, 64.250591911669844),
-                                         m2::PointD(27.553906184631536, 64.250633404586054)} /* polyline */)};
+  vector<Shape> const expected = {
+      Shape(ShapeId(209186424 /* stop 1 id */, 248520179 /* stop 2 id */),
+            {m2::PointD(27.5762295, 64.256768574044699), m2::PointD(27.576325736220355, 64.256879325696005),
+             m2::PointD(27.576420780761875, 64.256990221238539),
+             m2::PointD(27.576514659541523, 64.257101255242176)} /* polyline */),
+      Shape(ShapeId(209191850 /* stop 1 id */, 209191851 /* stop 2 id */),
+            {m2::PointD(27.554025800000002, 64.250591911669844),
+             m2::PointD(27.553906184631536, 64.250633404586054)} /* polyline */)};
 
   TestDeserializerFromJson(jsonBuffer, "shapes", expected);
 }
diff --git a/libs/transit/transit_tests/transit_schedule_tests.cpp b/libs/transit/transit_tests/transit_schedule_tests.cpp
index 86c6a99c8..75cedde45 100644
--- a/libs/transit/transit_tests/transit_schedule_tests.cpp
+++ b/libs/transit/transit_tests/transit_schedule_tests.cpp
@@ -16,20 +16,37 @@ using namespace ::transit;
 
 // String dates are provided in GTFS date format YYYYMMDD.
 // String times are provided in GTFS time format HH:MM:SS.
-uint32_t GetYear(std::string const & date) { return std::stoi(date.substr(0, 4)); }
+uint32_t GetYear(std::string const & date)
+{
+  return std::stoi(date.substr(0, 4));
+}
 
-uint32_t GetMonth(std::string const & date) { return std::stoi(date.substr(4, 2)); }
+uint32_t GetMonth(std::string const & date)
+{
+  return std::stoi(date.substr(4, 2));
+}
 
-uint32_t GetDay(std::string const & date) { return std::stoi(date.substr(6)); }
+uint32_t GetDay(std::string const & date)
+{
+  return std::stoi(date.substr(6));
+}
 
-uint32_t GetHour(std::string const & time) { return std::stoi(time.substr(0, 2)); }
+uint32_t GetHour(std::string const & time)
+{
+  return std::stoi(time.substr(0, 2));
+}
 
-uint32_t GetMinute(std::string const & time) { return std::stoi(time.substr(3, 2)); }
+uint32_t GetMinute(std::string const & time)
+{
+  return std::stoi(time.substr(3, 2));
+}
 
-uint32_t GetSecond(std::string const & time) { return std::stoi(time.substr(6)); }
+uint32_t GetSecond(std::string const & time)
+{
+  return std::stoi(time.substr(6));
+}
 
-gtfs::Frequency GetFrequency(std::string const & startTime, std::string const & endTime,
-                             Frequency headwayS)
+gtfs::Frequency GetFrequency(std::string const & startTime, std::string const & endTime, Frequency headwayS)
 {
   gtfs::Frequency freq;
   freq.start_time = gtfs::Time(startTime);
@@ -41,8 +58,7 @@ gtfs::Frequency GetFrequency(std::string const & startTime, std::string const &
 
 gtfs::CalendarAvailability GetAvailability(bool available)
 {
-  return available ? gtfs::CalendarAvailability::Available
-                   : gtfs::CalendarAvailability::NotAvailable;
+  return available ? gtfs::CalendarAvailability::Available : gtfs::CalendarAvailability::NotAvailable;
 }
 
 void TestDatesInterval(std::string const & date1, std::string const & date2, WeekSchedule weekDays)
@@ -115,33 +131,29 @@ void TestTimeInterval(std::string const & time1, std::string const & time2)
 
 UNIT_TEST(TransitSchedule_DatesInterval)
 {
-  TestDatesInterval(
-      "20200902", "20210531",
-      {
-          false /* sunday */, true /* monday */, false /* tuesday */, true /* wednesday */,
-          false /* thursday */, false /* friday */, false /* saturday */
-      });
+  TestDatesInterval("20200902", "20210531",
+                    {
+                        false /* sunday */, true /* monday */, false /* tuesday */, true /* wednesday */,
+                        false /* thursday */, false /* friday */, false /* saturday */
+                    });
 
-  TestDatesInterval(
-      "20201101", "20201130",
-      {
-          true /* sunday */, false /* monday */, false /* tuesday */, false /* wednesday */,
-          false /* thursday */, false /* friday */, true /* saturday */
-      });
+  TestDatesInterval("20201101", "20201130",
+                    {
+                        true /* sunday */, false /* monday */, false /* tuesday */, false /* wednesday */,
+                        false /* thursday */, false /* friday */, true /* saturday */
+                    });
 
-  TestDatesInterval(
-      "20210101", "20210228",
-      {
-          false /* sunday */, true /* monday */, true /* tuesday */, true /* wednesday */,
-          true /* thursday */, true /* friday */, false /* saturday */
-      });
+  TestDatesInterval("20210101", "20210228",
+                    {
+                        false /* sunday */, true /* monday */, true /* tuesday */, true /* wednesday */,
+                        true /* thursday */, true /* friday */, false /* saturday */
+                    });
 
-  TestDatesInterval(
-      "20220101", "20240101",
-      {
-          false /* sunday */, false /* monday */, false /* tuesday */, false /* wednesday */,
-          true /* thursday */, true /* friday */, true /* saturday */
-      });
+  TestDatesInterval("20220101", "20240101",
+                    {
+                        false /* sunday */, false /* monday */, false /* tuesday */, false /* wednesday */,
+                        true /* thursday */, true /* friday */, true /* saturday */
+                    });
 }
 
 UNIT_TEST(TransitSchedule_DateException)
@@ -222,14 +234,10 @@ UNIT_TEST(TransitSchedule_Schedule_DateException_Status)
   gtfs::Frequencies const emptyFrequencies;
 
   Schedule busSchedule;
-  busSchedule.AddDateException(gtfs::Date("20200606"), gtfs::CalendarDateException::Added,
-                               emptyFrequencies);
-  busSchedule.AddDateException(gtfs::Date("20200607"), gtfs::CalendarDateException::Removed,
-                               emptyFrequencies);
-  busSchedule.AddDateException(gtfs::Date("20211029"), gtfs::CalendarDateException::Added,
-                               emptyFrequencies);
-  busSchedule.AddDateException(gtfs::Date("20211128"), gtfs::CalendarDateException::Removed,
-                               emptyFrequencies);
+  busSchedule.AddDateException(gtfs::Date("20200606"), gtfs::CalendarDateException::Added, emptyFrequencies);
+  busSchedule.AddDateException(gtfs::Date("20200607"), gtfs::CalendarDateException::Removed, emptyFrequencies);
+  busSchedule.AddDateException(gtfs::Date("20211029"), gtfs::CalendarDateException::Added, emptyFrequencies);
+  busSchedule.AddDateException(gtfs::Date("20211128"), gtfs::CalendarDateException::Removed, emptyFrequencies);
 
   // 06.06.2020.
   TEST(busSchedule.GetStatus(time_t(1591438888)) == Status::Open, ());
diff --git a/libs/transit/transit_tests/transit_test.cpp b/libs/transit/transit_tests/transit_test.cpp
index f6501ee94..d67aa3254 100644
--- a/libs/transit/transit_tests/transit_test.cpp
+++ b/libs/transit/transit_tests/transit_test.cpp
@@ -21,7 +21,7 @@ namespace transit
 {
 auto constexpr kTransitHeaderVersion = static_cast<uint16_t>(::transit::TransitVersion::OnlySubway);
 
-template<class S, class D, class Obj>
+template <class S, class D, class Obj>
 void TestCommonSerialization(Obj const & obj)
 {
   vector<uint8_t> buffer;
@@ -45,19 +45,17 @@ void TestSerialization(TransitHeader const & header)
                           FixedSizeDeserializer<ReaderSource<MemReader>>>(header);
 }
 
-template<class Obj>
+template <class Obj>
 void TestSerialization(Obj const & obj)
 {
-  TestCommonSerialization<Serializer<MemWriter<vector<uint8_t>>>,
-                          Deserializer<ReaderSource<MemReader>>>(obj);
+  TestCommonSerialization<Serializer<MemWriter<vector<uint8_t>>>, Deserializer<ReaderSource<MemReader>>>(obj);
 }
 
 UNIT_TEST(Transit_HeaderRewriting)
 {
-  TransitHeader const bigHeader(
-      kTransitHeaderVersion /* version */, 500 /* stopsOffset */, 1000 /* gatesOffset */,
-      200000 /* edgesOffset */, 300000 /* transfersOffset */, 400000 /* linesOffset */,
-      5000000 /* shapesOffset */, 6000000 /* networksOffset */, 700000000 /* endOffset */);
+  TransitHeader const bigHeader(kTransitHeaderVersion /* version */, 500 /* stopsOffset */, 1000 /* gatesOffset */,
+                                200000 /* edgesOffset */, 300000 /* transfersOffset */, 400000 /* linesOffset */,
+                                5000000 /* shapesOffset */, 6000000 /* networksOffset */, 700000000 /* endOffset */);
 
   TransitHeader header;
   vector<uint8_t> buffer;
@@ -106,10 +104,9 @@ UNIT_TEST(Transit_HeaderSerialization)
     TEST(header.IsValid(), (header));
   }
   {
-    TransitHeader header(kTransitHeaderVersion /* version */, 500 /* stopsOffset */,
-                         1000 /* gatesOffset */, 2000 /* edgesOffset */, 3000 /* transfersOffset */,
-                         4000 /* linesOffset */, 5000 /* shapesOffset */, 6000 /* networksOffset */,
-                         7000 /* endOffset */);
+    TransitHeader header(kTransitHeaderVersion /* version */, 500 /* stopsOffset */, 1000 /* gatesOffset */,
+                         2000 /* edgesOffset */, 3000 /* transfersOffset */, 4000 /* linesOffset */,
+                         5000 /* shapesOffset */, 6000 /* networksOffset */, 7000 /* endOffset */);
     TestSerialization(header);
     TEST(header.IsValid(), (header));
   }
@@ -122,17 +119,15 @@ UNIT_TEST(Transit_TransitHeaderValidity)
     TEST(header.IsValid(), (header));
   }
   {
-    TransitHeader const header(kTransitHeaderVersion /* version */, 40 /* stopsOffset */,
-                               44 /* gatesOffset */, 48 /* edgesOffset */, 52 /* transfersOffset */,
-                               56 /* linesOffset */, 60 /* shapesOffset */, 64 /* networksOffset */,
-                               68 /* endOffset */);
+    TransitHeader const header(kTransitHeaderVersion /* version */, 40 /* stopsOffset */, 44 /* gatesOffset */,
+                               48 /* edgesOffset */, 52 /* transfersOffset */, 56 /* linesOffset */,
+                               60 /* shapesOffset */, 64 /* networksOffset */, 68 /* endOffset */);
     TEST(header.IsValid(), (header));
   }
   {
-    TransitHeader const header(kTransitHeaderVersion /* version */, 44 /* stopsOffset */,
-                               40 /* gatesOffset */, 48 /* edgesOffset */, 52 /* transfersOffset */,
-                               56 /* linesOffset */, 60 /* shapesOffset */, 64 /* networksOffset */,
-                               68 /* endOffset */);
+    TransitHeader const header(kTransitHeaderVersion /* version */, 44 /* stopsOffset */, 40 /* gatesOffset */,
+                               48 /* edgesOffset */, 52 /* transfersOffset */, 56 /* linesOffset */,
+                               60 /* shapesOffset */, 64 /* networksOffset */, 68 /* endOffset */);
     TEST(!header.IsValid(), (header));
   }
 }
@@ -187,8 +182,8 @@ UNIT_TEST(Transit_SingleMwmSegmentSerialization)
 
 UNIT_TEST(Transit_GateSerialization)
 {
-  Gate gate(12345678 /* osm id */, 12345 /* feature id */, true /* entrance */, false /* exit */,
-            117 /* weight */, {1, 2, 3} /* stop ids */, {30.0, 50.0} /* point */);
+  Gate gate(12345678 /* osm id */, 12345 /* feature id */, true /* entrance */, false /* exit */, 117 /* weight */,
+            {1, 2, 3} /* stop ids */, {30.0, 50.0} /* point */);
   TestSerialization(gate);
   TEST(gate.IsValid(), (gate));
 }
@@ -222,32 +217,32 @@ UNIT_TEST(Transit_GatesRelational)
 UNIT_TEST(Transit_EdgeSerialization)
 {
   {
-    Edge edge(1 /* start stop id */, 2 /* finish stop id */, 123 /* weight */, 11 /* line id */,
-              false /* transfer */, {ShapeId(1, 2), ShapeId(3, 4), ShapeId(5, 6)} /* shape ids */);
+    Edge edge(1 /* start stop id */, 2 /* finish stop id */, 123 /* weight */, 11 /* line id */, false /* transfer */,
+              {ShapeId(1, 2), ShapeId(3, 4), ShapeId(5, 6)} /* shape ids */);
     TestSerialization(edge);
     TEST(edge.IsValid(), (edge));
   }
   {
-    Edge edge(1 /* start stop id */, 2 /* finish stop id */, 123 /* weight */, 11 /* line id */,
-              false /* transfer */, {ShapeId(1, 2)} /* shape ids */);
+    Edge edge(1 /* start stop id */, 2 /* finish stop id */, 123 /* weight */, 11 /* line id */, false /* transfer */,
+              {ShapeId(1, 2)} /* shape ids */);
     TestSerialization(edge);
     TEST(edge.IsValid(), (edge));
   }
   {
-    Edge edge(1 /* start stop id */, 2 /* finish stop id */, 123 /* weight */, 11 /* line id */,
-              false /* transfer */, {ShapeId(2, 1)} /* shape ids */);
+    Edge edge(1 /* start stop id */, 2 /* finish stop id */, 123 /* weight */, 11 /* line id */, false /* transfer */,
+              {ShapeId(2, 1)} /* shape ids */);
     TestSerialization(edge);
     TEST(edge.IsValid(), (edge));
   }
   {
-    Edge edge(1 /* start stop id */, 2 /* finish stop id */, 123 /* weight */, kInvalidLineId,
-              true /* transfer */, {} /* shape ids */);
+    Edge edge(1 /* start stop id */, 2 /* finish stop id */, 123 /* weight */, kInvalidLineId, true /* transfer */,
+              {} /* shape ids */);
     TestSerialization(edge);
     TEST(edge.IsValid(), (edge));
   }
   {
-    Edge edge(1 /* start stop id */, 2 /* finish stop id */, 123 /* weight */, 11 /* line id */,
-              true /* transfer */, {} /* shape ids */);
+    Edge edge(1 /* start stop id */, 2 /* finish stop id */, 123 /* weight */, 11 /* line id */, true /* transfer */,
+              {} /* shape ids */);
     TestSerialization(edge);
     // Note. A transfer edge (transfer == true) with a valid line id is not allowable.
     TEST(!edge.IsValid(), (edge));
@@ -256,8 +251,7 @@ UNIT_TEST(Transit_EdgeSerialization)
 
 UNIT_TEST(Transit_TransferSerialization)
 {
-  Transfer transfer(1 /* id */, {40.0, 35.0} /* point */, {1, 2, 3} /* stop ids */,
-                    {TitleAnchor(16, 0 /* anchor */)});
+  Transfer transfer(1 /* id */, {40.0, 35.0} /* point */, {1, 2, 3} /* stop ids */, {TitleAnchor(16, 0 /* anchor */)});
   TestSerialization(transfer);
   TEST(transfer.IsValid(), (transfer));
 }
@@ -265,23 +259,20 @@ UNIT_TEST(Transit_TransferSerialization)
 UNIT_TEST(Transit_LineSerialization)
 {
   {
-    Line line(1 /* line id */, "2" /* number */, "Линия" /* title */,
-              "subway" /* type */, "red" /* color */, 3 /* network id */, {{1}} /* stop ids */,
-              10 /* interval */);
+    Line line(1 /* line id */, "2" /* number */, "Линия" /* title */, "subway" /* type */, "red" /* color */,
+              3 /* network id */, {{1}} /* stop ids */, 10 /* interval */);
     TestSerialization(line);
     TEST(line.IsValid(), (line));
   }
   {
-    Line line(10 /* line id */, "11" /* number */, "Линия" /* title */,
-              "subway" /* type */, "green" /* color */, 12 /* network id */,
-              {{13, 14, 15}} /* stop ids */, 15 /* interval */);
+    Line line(10 /* line id */, "11" /* number */, "Линия" /* title */, "subway" /* type */, "green" /* color */,
+              12 /* network id */, {{13, 14, 15}} /* stop ids */, 15 /* interval */);
     TestSerialization(line);
     TEST(line.IsValid(), (line));
   }
   {
-    Line line(100 /* line id */, "101" /* number */, "Линия" /* title */,
-              "subway" /* type */, "blue" /* color */, 103 /* network id */,
-              {{1, 2, 3}, {7, 8, 9}} /* stop ids */, 15 /* interval */);
+    Line line(100 /* line id */, "101" /* number */, "Линия" /* title */, "subway" /* type */, "blue" /* color */,
+              103 /* network id */, {{1, 2, 3}, {7, 8, 9}} /* stop ids */, 15 /* interval */);
     TestSerialization(line);
     TEST(line.IsValid(), (line));
   }
diff --git a/libs/transit/transit_tests/transit_tools.hpp b/libs/transit/transit_tests/transit_tools.hpp
index f32d51bed..f467caa26 100644
--- a/libs/transit/transit_tests/transit_tools.hpp
+++ b/libs/transit/transit_tests/transit_tools.hpp
@@ -43,17 +43,15 @@ inline bool Equal(Network const & n1, Network const & n2)
 
 inline bool Equal(Route const & r1, Route const & r2)
 {
-  return std::make_tuple(r1.GetId(), r1.GetNetworkId(), r1.GetType(), r1.GetTitle(),
-                         r1.GetColor()) ==
+  return std::make_tuple(r1.GetId(), r1.GetNetworkId(), r1.GetType(), r1.GetTitle(), r1.GetColor()) ==
          std::make_tuple(r2.GetId(), r2.GetNetworkId(), r2.GetType(), r2.GetTitle(), r2.GetColor());
 }
 
 inline bool Equal(Line const & l1, Line const & l2)
 {
-  return std::make_tuple(l1.GetId(), l1.GetRouteId(), l1.GetTitle(), l1.GetStopIds(),
-                         l1.GetSchedule(), l1.GetShapeLink()) ==
-         std::make_tuple(l2.GetId(), l2.GetRouteId(), l2.GetTitle(), l2.GetStopIds(),
-                         l2.GetSchedule(), l2.GetShapeLink());
+  return std::make_tuple(l1.GetId(), l1.GetRouteId(), l1.GetTitle(), l1.GetStopIds(), l1.GetSchedule(),
+                         l1.GetShapeLink()) == std::make_tuple(l2.GetId(), l2.GetRouteId(), l2.GetTitle(),
+                                                               l2.GetStopIds(), l2.GetSchedule(), l2.GetShapeLink());
 }
 
 inline bool Equal(LineMetadata const & lm1, LineMetadata const & lm2)
@@ -64,42 +62,38 @@ inline bool Equal(LineMetadata const & lm1, LineMetadata const & lm2)
 
 inline bool Equal(Stop const & s1, Stop const & s2)
 {
-  return (std::make_tuple(s1.GetId(), s1.GetFeatureId(), s1.GetOsmId(), s1.GetTitle(),
-                          s1.GetTimeTable(), s1.GetTransferIds(), s1.GetBestPedestrianSegments()) ==
-          std::make_tuple(s2.GetId(), s2.GetFeatureId(), s2.GetOsmId(), s2.GetTitle(),
-                          s2.GetTimeTable(), s2.GetTransferIds(),
-                          s2.GetBestPedestrianSegments())) &&
+  return (std::make_tuple(s1.GetId(), s1.GetFeatureId(), s1.GetOsmId(), s1.GetTitle(), s1.GetTimeTable(),
+                          s1.GetTransferIds(), s1.GetBestPedestrianSegments()) ==
+          std::make_tuple(s2.GetId(), s2.GetFeatureId(), s2.GetOsmId(), s2.GetTitle(), s2.GetTimeTable(),
+                          s2.GetTransferIds(), s2.GetBestPedestrianSegments())) &&
          AlmostEqualAbs(s1.GetPoint(), s2.GetPoint(), kPointsEqualEpsilon);
 }
 
 inline bool Equal(Gate const & g1, Gate const & g2)
 {
-  return (std::make_tuple(g1.GetId(), g1.GetFeatureId(), g1.GetOsmId(), g1.IsEntrance(),
-                          g1.IsExit(), g1.GetStopsWithWeight(), g1.GetBestPedestrianSegments()) ==
-          std::make_tuple(g2.GetId(), g2.GetFeatureId(), g2.GetOsmId(), g2.IsEntrance(),
-                          g2.IsExit(), g2.GetStopsWithWeight(), g2.GetBestPedestrianSegments())) &&
+  return (std::make_tuple(g1.GetId(), g1.GetFeatureId(), g1.GetOsmId(), g1.IsEntrance(), g1.IsExit(),
+                          g1.GetStopsWithWeight(), g1.GetBestPedestrianSegments()) ==
+          std::make_tuple(g2.GetId(), g2.GetFeatureId(), g2.GetOsmId(), g2.IsEntrance(), g2.IsExit(),
+                          g2.GetStopsWithWeight(), g2.GetBestPedestrianSegments())) &&
          AlmostEqualAbs(g1.GetPoint(), g2.GetPoint(), kPointsEqualEpsilon);
 }
 
 inline bool Equal(Edge const & e1, Edge const & e2)
 {
-  return (std::make_tuple(e1.GetStop1Id(), e1.GetStop2Id(), e1.GetLineId(), e1.GetWeight(),
-                          e1.IsTransfer(), e1.GetShapeLink()) ==
-          std::make_tuple(e2.GetStop1Id(), e2.GetStop2Id(), e2.GetLineId(), e2.GetWeight(),
-                          e2.IsTransfer(), e2.GetShapeLink()));
+  return (std::make_tuple(e1.GetStop1Id(), e1.GetStop2Id(), e1.GetLineId(), e1.GetWeight(), e1.IsTransfer(),
+                          e1.GetShapeLink()) == std::make_tuple(e2.GetStop1Id(), e2.GetStop2Id(), e2.GetLineId(),
+                                                                e2.GetWeight(), e2.IsTransfer(), e2.GetShapeLink()));
 }
 
 inline bool Equal(Transfer const & t1, Transfer const & t2)
 {
-  return (std::make_tuple(t1.GetId(), t1.GetStopIds()) ==
-          std::make_tuple(t2.GetId(), t2.GetStopIds())) &&
+  return (std::make_tuple(t1.GetId(), t1.GetStopIds()) == std::make_tuple(t2.GetId(), t2.GetStopIds())) &&
          AlmostEqualAbs(t1.GetPoint(), t2.GetPoint(), kPointsEqualEpsilon);
 }
 
 inline bool Equal(Shape const & s1, Shape const & s2)
 {
-  return std::make_tuple(s1.GetId(), s1.GetPolyline()) ==
-         std::make_tuple(s2.GetId(), s2.GetPolyline());
+  return std::make_tuple(s1.GetId(), s1.GetPolyline()) == std::make_tuple(s2.GetId(), s2.GetPolyline());
 }
 
 template <class Item>
diff --git a/libs/transit/transit_types.cpp b/libs/transit/transit_types.cpp
index 7b52d270f..42bedc98c 100644
--- a/libs/transit/transit_types.cpp
+++ b/libs/transit/transit_types.cpp
@@ -15,9 +15,9 @@ namespace routing
 namespace transit
 {
 // TransitHeader ----------------------------------------------------------------------------------
-TransitHeader::TransitHeader(uint16_t version, uint32_t stopsOffset, uint32_t gatesOffset,
-                             uint32_t edgesOffset, uint32_t transfersOffset, uint32_t linesOffset,
-                             uint32_t shapesOffset, uint32_t networksOffset, uint32_t endOffset)
+TransitHeader::TransitHeader(uint16_t version, uint32_t stopsOffset, uint32_t gatesOffset, uint32_t edgesOffset,
+                             uint32_t transfersOffset, uint32_t linesOffset, uint32_t shapesOffset,
+                             uint32_t networksOffset, uint32_t endOffset)
   : m_version(version)
   , m_reserve(0)
   , m_stopsOffset(stopsOffset)
@@ -28,8 +28,7 @@ TransitHeader::TransitHeader(uint16_t version, uint32_t stopsOffset, uint32_t ga
   , m_shapesOffset(shapesOffset)
   , m_networksOffset(networksOffset)
   , m_endOffset(endOffset)
-{
-}
+{}
 
 void TransitHeader::Reset()
 {
@@ -47,37 +46,29 @@ void TransitHeader::Reset()
 
 bool TransitHeader::IsEqualForTesting(TransitHeader const & header) const
 {
-  return m_version == header.m_version
-         && m_reserve == header.m_reserve
-         && m_stopsOffset == header.m_stopsOffset
-         && m_gatesOffset == header.m_gatesOffset
-         && m_edgesOffset == header.m_edgesOffset
-         && m_transfersOffset == header.m_transfersOffset
-         && m_linesOffset == header.m_linesOffset
-         && m_shapesOffset == header.m_shapesOffset
-         && m_networksOffset == header.m_networksOffset
-         && m_endOffset == header.m_endOffset;
+  return m_version == header.m_version && m_reserve == header.m_reserve && m_stopsOffset == header.m_stopsOffset &&
+         m_gatesOffset == header.m_gatesOffset && m_edgesOffset == header.m_edgesOffset &&
+         m_transfersOffset == header.m_transfersOffset && m_linesOffset == header.m_linesOffset &&
+         m_shapesOffset == header.m_shapesOffset && m_networksOffset == header.m_networksOffset &&
+         m_endOffset == header.m_endOffset;
 }
 
 bool TransitHeader::IsValid() const
 {
-  return m_stopsOffset <= m_gatesOffset && m_gatesOffset <= m_edgesOffset &&
-         m_edgesOffset <= m_transfersOffset && m_transfersOffset <= m_linesOffset &&
-         m_linesOffset <= m_shapesOffset && m_shapesOffset <= m_networksOffset &&
+  return m_stopsOffset <= m_gatesOffset && m_gatesOffset <= m_edgesOffset && m_edgesOffset <= m_transfersOffset &&
+         m_transfersOffset <= m_linesOffset && m_linesOffset <= m_shapesOffset && m_shapesOffset <= m_networksOffset &&
          m_networksOffset <= m_endOffset;
 }
 
 // FeatureIdentifiers -----------------------------------------------------------------------------
-FeatureIdentifiers::FeatureIdentifiers(bool serializeFeatureIdOnly)
-  : m_serializeFeatureIdOnly(serializeFeatureIdOnly)
-{
-}
+FeatureIdentifiers::FeatureIdentifiers(bool serializeFeatureIdOnly) : m_serializeFeatureIdOnly(serializeFeatureIdOnly)
+{}
 
-FeatureIdentifiers::FeatureIdentifiers(OsmId osmId, FeatureId const & featureId,
-                                       bool serializeFeatureIdOnly)
-  : m_osmId(osmId), m_featureId(featureId), m_serializeFeatureIdOnly(serializeFeatureIdOnly)
-{
-}
+FeatureIdentifiers::FeatureIdentifiers(OsmId osmId, FeatureId const & featureId, bool serializeFeatureIdOnly)
+  : m_osmId(osmId)
+  , m_featureId(featureId)
+  , m_serializeFeatureIdOnly(serializeFeatureIdOnly)
+{}
 
 bool FeatureIdentifiers::operator<(FeatureIdentifiers const & rhs) const
 {
@@ -122,24 +113,21 @@ bool TitleAnchor::IsValid() const
 }
 
 // Stop -------------------------------------------------------------------------------------------
-Stop::Stop(StopId id, OsmId osmId, FeatureId featureId, TransferId transferId,
-           std::vector<LineId> const & lineIds, m2::PointD const & point,
-           std::vector<TitleAnchor> const & titleAnchors)
+Stop::Stop(StopId id, OsmId osmId, FeatureId featureId, TransferId transferId, std::vector<LineId> const & lineIds,
+           m2::PointD const & point, std::vector<TitleAnchor> const & titleAnchors)
   : m_id(id)
   , m_featureIdentifiers(osmId, featureId, true /* serializeFeatureIdOnly */)
   , m_transferId(transferId)
   , m_lineIds(lineIds)
   , m_point(point)
   , m_titleAnchors(titleAnchors)
-{
-}
+{}
 
 bool Stop::IsEqualForTesting(Stop const & stop) const
 {
   double constexpr kPointsEqualEpsilon = 1e-6;
-  return m_id == stop.m_id && m_featureIdentifiers == stop.m_featureIdentifiers &&
-         m_transferId == stop.m_transferId && m_lineIds == stop.m_lineIds &&
-         AlmostEqualAbs(m_point, stop.m_point, kPointsEqualEpsilon) &&
+  return m_id == stop.m_id && m_featureIdentifiers == stop.m_featureIdentifiers && m_transferId == stop.m_transferId &&
+         m_lineIds == stop.m_lineIds && AlmostEqualAbs(m_point, stop.m_point, kPointsEqualEpsilon) &&
          m_titleAnchors == stop.m_titleAnchors;
 }
 
@@ -150,9 +138,10 @@ bool Stop::IsValid() const
 
 // SingleMwmSegment -------------------------------------------------------------------------------
 SingleMwmSegment::SingleMwmSegment(FeatureId featureId, uint32_t segmentIdx, bool forward)
-  : m_featureId(featureId), m_segmentIdx(segmentIdx), m_forward(forward)
-{
-}
+  : m_featureId(featureId)
+  , m_segmentIdx(segmentIdx)
+  , m_forward(forward)
+{}
 
 bool SingleMwmSegment::IsEqualForTesting(SingleMwmSegment const & s) const
 {
@@ -173,8 +162,7 @@ Gate::Gate(OsmId osmId, FeatureId featureId, bool entrance, bool exit, Weight we
   , m_weight(weight)
   , m_stopIds(stopIds)
   , m_point(point)
-{
-}
+{}
 
 bool Gate::operator<(Gate const & rhs) const
 {
@@ -192,21 +180,21 @@ bool Gate::operator<(Gate const & rhs) const
 
 bool Gate::operator==(Gate const & rhs) const
 {
-  return m_featureIdentifiers == rhs.m_featureIdentifiers && m_entrance == rhs.m_entrance &&
-         m_exit == rhs.m_exit && m_stopIds == rhs.m_stopIds;
+  return m_featureIdentifiers == rhs.m_featureIdentifiers && m_entrance == rhs.m_entrance && m_exit == rhs.m_exit &&
+         m_stopIds == rhs.m_stopIds;
 }
 
 bool Gate::IsEqualForTesting(Gate const & gate) const
 {
-  return m_featureIdentifiers == gate.m_featureIdentifiers && m_entrance == gate.m_entrance &&
-         m_exit == gate.m_exit && m_weight == gate.m_weight && m_stopIds == gate.m_stopIds &&
+  return m_featureIdentifiers == gate.m_featureIdentifiers && m_entrance == gate.m_entrance && m_exit == gate.m_exit &&
+         m_weight == gate.m_weight && m_stopIds == gate.m_stopIds &&
          AlmostEqualAbs(m_point, gate.m_point, kPointsEqualEpsilon);
 }
 
 bool Gate::IsValid() const
 {
-  return m_featureIdentifiers.GetOsmId() != kInvalidOsmId && m_weight != kInvalidWeight &&
-         (m_entrance || m_exit) && !m_stopIds.empty();
+  return m_featureIdentifiers.GetOsmId() != kInvalidOsmId && m_weight != kInvalidWeight && (m_entrance || m_exit) &&
+         !m_stopIds.empty();
 }
 
 // ShapeId ----------------------------------------------------------------------------------------
@@ -230,10 +218,8 @@ bool ShapeId::IsValid() const
 // EdgeFlags --------------------------------------------------------------------------------------
 uint8_t EdgeFlags::GetFlags() const
 {
-  return BoolToUint(m_transfer) * kTransferMask +
-         BoolToUint(m_isShapeIdsEmpty) * kEmptyShapeIdsMask +
-         BoolToUint(m_isShapeIdsSingle) * kSingleShapeIdMask +
-         BoolToUint(m_isShapeIdsSame) * kShapeIdIsSameMask +
+  return BoolToUint(m_transfer) * kTransferMask + BoolToUint(m_isShapeIdsEmpty) * kEmptyShapeIdsMask +
+         BoolToUint(m_isShapeIdsSingle) * kSingleShapeIdMask + BoolToUint(m_isShapeIdsSame) * kShapeIdIsSameMask +
          BoolToUint(m_isShapeIdsReversed) * kShapeIdIsReversedMask;
 }
 
@@ -266,8 +252,7 @@ Edge::Edge(StopId stop1Id, StopId stop2Id, Weight weight, LineId lineId, bool tr
   , m_lineId(lineId)
   , m_flags(GetEdgeFlags(transfer, stop1Id, stop2Id, shapeIds))
   , m_shapeIds(shapeIds)
-{
-}
+{}
 
 bool Edge::operator<(Edge const & rhs) const
 {
@@ -286,8 +271,7 @@ bool Edge::operator==(Edge const & rhs) const
 bool Edge::IsEqualForTesting(Edge const & edge) const
 {
   return m_stop1Id == edge.m_stop1Id && m_stop2Id == edge.m_stop2Id && m_weight == edge.m_weight &&
-         m_lineId == edge.m_lineId && GetTransfer() == edge.GetTransfer() &&
-         m_shapeIds == edge.m_shapeIds;
+         m_lineId == edge.m_lineId && GetTransfer() == edge.GetTransfer() && m_shapeIds == edge.m_shapeIds;
 }
 
 bool Edge::IsValid() const
@@ -304,14 +288,15 @@ bool Edge::IsValid() const
 // Transfer ---------------------------------------------------------------------------------------
 Transfer::Transfer(StopId id, m2::PointD const & point, std::vector<StopId> const & stopIds,
                    std::vector<TitleAnchor> const & titleAnchors)
-  : m_id(id), m_point(point), m_stopIds(stopIds), m_titleAnchors(titleAnchors)
-{
-}
+  : m_id(id)
+  , m_point(point)
+  , m_stopIds(stopIds)
+  , m_titleAnchors(titleAnchors)
+{}
 
 bool Transfer::IsEqualForTesting(Transfer const & transfer) const
 {
-  return m_id == transfer.m_id &&
-         AlmostEqualAbs(m_point, transfer.m_point, kPointsEqualEpsilon) &&
+  return m_id == transfer.m_id && AlmostEqualAbs(m_point, transfer.m_point, kPointsEqualEpsilon) &&
          m_stopIds == transfer.m_stopIds && m_titleAnchors == transfer.m_titleAnchors;
 }
 
@@ -321,9 +306,8 @@ bool Transfer::IsValid() const
 }
 
 // Line -------------------------------------------------------------------------------------------
-Line::Line(LineId id, std::string const & number, std::string const & title,
-           std::string const & type, std::string const & color, NetworkId networkId,
-           Ranges const & stopIds, Weight interval)
+Line::Line(LineId id, std::string const & number, std::string const & title, std::string const & type,
+           std::string const & color, NetworkId networkId, Ranges const & stopIds, Weight interval)
   : m_id(id)
   , m_number(number)
   , m_title(title)
@@ -332,14 +316,13 @@ Line::Line(LineId id, std::string const & number, std::string const & title,
   , m_networkId(networkId)
   , m_stopIds(stopIds)
   , m_interval(interval)
-{
-}
+{}
 
 bool Line::IsEqualForTesting(Line const & line) const
 {
-  return m_id == line.m_id && m_number == line.m_number && m_title == line.m_title &&
-         m_type == line.m_type && m_color == line.m_color && m_networkId == line.m_networkId &&
-         m_stopIds == line.m_stopIds && m_interval == line.m_interval;
+  return m_id == line.m_id && m_number == line.m_number && m_title == line.m_title && m_type == line.m_type &&
+         m_color == line.m_color && m_networkId == line.m_networkId && m_stopIds == line.m_stopIds &&
+         m_interval == line.m_interval;
 }
 
 bool Line::IsValid() const
@@ -355,18 +338,13 @@ bool Shape::IsEqualForTesting(Shape const & shape) const
     return false;
 
   for (size_t i = 0; i < m_polyline.size(); ++i)
-  {
     if (!AlmostEqualAbs(m_polyline[i], shape.m_polyline[i], kPointsEqualEpsilon))
       return false;
-  }
   return true;
 }
 
 // Network ----------------------------------------------------------------------------------------
-Network::Network(NetworkId id, std::string const & title)
-: m_id(id), m_title(title)
-{
-}
+Network::Network(NetworkId id, std::string const & title) : m_id(id), m_title(title) {}
 
 bool Network::IsEqualForTesting(Network const & shape) const
 {
@@ -378,8 +356,7 @@ bool Network::IsValid() const
   return m_id != kInvalidNetworkId;
 }
 
-EdgeFlags GetEdgeFlags(bool transfer, StopId stopId1, StopId stopId2,
-                       std::vector<ShapeId> const & shapeIds)
+EdgeFlags GetEdgeFlags(bool transfer, StopId stopId1, StopId stopId2, std::vector<ShapeId> const & shapeIds)
 {
   EdgeFlags flags;
   flags.m_transfer = transfer;
@@ -388,10 +365,8 @@ EdgeFlags GetEdgeFlags(bool transfer, StopId stopId1, StopId stopId2,
   flags.m_isShapeIdsSingle = singleShapeId;
   if (singleShapeId)
   {
-    flags.m_isShapeIdsSame =
-        stopId1 == shapeIds[0].GetStop1Id() && stopId2 == shapeIds[0].GetStop2Id();
-    flags.m_isShapeIdsReversed =
-        stopId1 == shapeIds[0].GetStop2Id() && stopId2 == shapeIds[0].GetStop1Id();
+    flags.m_isShapeIdsSame = stopId1 == shapeIds[0].GetStop1Id() && stopId2 == shapeIds[0].GetStop2Id();
+    flags.m_isShapeIdsReversed = stopId1 == shapeIds[0].GetStop2Id() && stopId2 == shapeIds[0].GetStop1Id();
   }
   return flags;
 }
diff --git a/libs/transit/transit_types.hpp b/libs/transit/transit_types.hpp
index bba7f6c49..9cedbe289 100644
--- a/libs/transit/transit_types.hpp
+++ b/libs/transit/transit_types.hpp
@@ -36,19 +36,23 @@ StopId constexpr kInvalidStopId = std::numeric_limits<StopId>::max();
 TransferId constexpr kInvalidTransferId = std::numeric_limits<TransferId>::max();
 Weight constexpr kInvalidWeight = std::numeric_limits<Weight>::max();
 
-#define DECLARE_TRANSIT_TYPE_FRIENDS                                                  \
-  template <class Sink> friend class Serializer;                                      \
-  template <class Source> friend class Deserializer;                                  \
-  friend class DeserializerFromJson;                                                  \
-  template <typename Sink> friend class FixedSizeSerializer;                          \
-  template <typename Sink> friend class FixedSizeDeserializer;                        \
+#define DECLARE_TRANSIT_TYPE_FRIENDS  \
+  template <class Sink>               \
+  friend class Serializer;            \
+  template <class Source>             \
+  friend class Deserializer;          \
+  friend class DeserializerFromJson;  \
+  template <typename Sink>            \
+  friend class FixedSizeSerializer;   \
+  template <typename Sink>            \
+  friend class FixedSizeDeserializer;
 
 struct TransitHeader
 {
   TransitHeader() { Reset(); }
   TransitHeader(uint16_t version, uint32_t stopsOffset, uint32_t gatesOffset, uint32_t edgesOffset,
-                uint32_t transfersOffset, uint32_t linesOffset, uint32_t shapesOffset,
-                uint32_t networksOffset, uint32_t endOffset);
+                uint32_t transfersOffset, uint32_t linesOffset, uint32_t shapesOffset, uint32_t networksOffset,
+                uint32_t endOffset);
 
   void Reset();
   bool IsEqualForTesting(TransitHeader const & header) const;
@@ -56,12 +60,11 @@ struct TransitHeader
 
 private:
   DECLARE_TRANSIT_TYPE_FRIENDS
-  DECLARE_VISITOR_AND_DEBUG_PRINT(
-      TransitHeader, visitor(m_version, "version"), visitor(m_reserve, "reserve"),
-      visitor(m_stopsOffset, "stops"), visitor(m_gatesOffset, "gatesOffset"),
-      visitor(m_edgesOffset, "edgesOffset"), visitor(m_transfersOffset, "transfersOffset"),
-      visitor(m_linesOffset, "linesOffset"), visitor(m_shapesOffset, "shapesOffset"),
-      visitor(m_networksOffset, "networksOffset"), visitor(m_endOffset, "endOffset"))
+  DECLARE_VISITOR_AND_DEBUG_PRINT(TransitHeader, visitor(m_version, "version"), visitor(m_reserve, "reserve"),
+                                  visitor(m_stopsOffset, "stops"), visitor(m_gatesOffset, "gatesOffset"),
+                                  visitor(m_edgesOffset, "edgesOffset"), visitor(m_transfersOffset, "transfersOffset"),
+                                  visitor(m_linesOffset, "linesOffset"), visitor(m_shapesOffset, "shapesOffset"),
+                                  visitor(m_networksOffset, "networksOffset"), visitor(m_endOffset, "endOffset"))
 
 public:
   uint16_t m_version;
@@ -98,8 +101,7 @@ public:
 
 private:
   DECLARE_TRANSIT_TYPE_FRIENDS
-  DECLARE_VISITOR_AND_DEBUG_PRINT(FeatureIdentifiers, visitor(m_osmId, "osm_id"),
-                                  visitor(m_featureId, "feature_id"))
+  DECLARE_VISITOR_AND_DEBUG_PRINT(FeatureIdentifiers, visitor(m_osmId, "osm_id"), visitor(m_featureId, "feature_id"))
 
   OsmId m_osmId = kInvalidOsmId;
   FeatureId m_featureId = kInvalidFeatureId;
@@ -121,8 +123,7 @@ public:
 
 private:
   DECLARE_TRANSIT_TYPE_FRIENDS
-  DECLARE_VISITOR_AND_DEBUG_PRINT(TitleAnchor, visitor(m_minZoom, "min_zoom"),
-                                  visitor(m_anchor, "anchor"))
+  DECLARE_VISITOR_AND_DEBUG_PRINT(TitleAnchor, visitor(m_minZoom, "min_zoom"), visitor(m_anchor, "anchor"))
 
   uint8_t m_minZoom = scales::UPPER_STYLE_SCALE;
   Anchor m_anchor = kInvalidAnchor;
@@ -133,10 +134,9 @@ class Stop
 public:
   NEWTYPE(StopId, WrappedStopId);
 
-  Stop() : m_featureIdentifiers(true /* serializeFeatureIdOnly */){};
-  Stop(StopId id, OsmId osmId, FeatureId featureId, TransferId transferId,
-       std::vector<LineId> const & lineIds, m2::PointD const & point,
-       std::vector<TitleAnchor> const & titleAnchors);
+  Stop() : m_featureIdentifiers(true /* serializeFeatureIdOnly */) {}
+  Stop(StopId id, OsmId osmId, FeatureId featureId, TransferId transferId, std::vector<LineId> const & lineIds,
+       m2::PointD const & point, std::vector<TitleAnchor> const & titleAnchors);
   explicit Stop(StopId id) : m_id(id), m_featureIdentifiers(true /* serializeFeatureIdOnly */) {}
 
   bool operator<(Stop const & rhs) const { return m_id < rhs.m_id; }
@@ -154,17 +154,15 @@ public:
 
 private:
   DECLARE_TRANSIT_TYPE_FRIENDS
-  DECLARE_VISITOR_AND_DEBUG_PRINT(Stop, visitor(m_id, "id"),
-                                  visitor(m_featureIdentifiers, "osm_id"),
-                                  visitor(m_transferId, "transfer_id"),
-                                  visitor(m_lineIds, "line_ids"), visitor(m_point, "point"),
-                                  visitor(m_titleAnchors, "title_anchors"))
+  DECLARE_VISITOR_AND_DEBUG_PRINT(Stop, visitor(m_id, "id"), visitor(m_featureIdentifiers, "osm_id"),
+                                  visitor(m_transferId, "transfer_id"), visitor(m_lineIds, "line_ids"),
+                                  visitor(m_point, "point"), visitor(m_titleAnchors, "title_anchors"))
 
   WrappedStopId m_id = WrappedStopId(kInvalidStopId);
   FeatureIdentifiers m_featureIdentifiers;
   TransferId m_transferId = kInvalidTransferId;
   std::vector<LineId> m_lineIds;
-  m2::PointD m_point {0.0, 0.0};
+  m2::PointD m_point{0.0, 0.0};
   std::vector<TitleAnchor> m_titleAnchors;
 };
 NEWTYPE_SIMPLE_OUTPUT(Stop::WrappedStopId)
@@ -184,8 +182,7 @@ public:
 private:
   DECLARE_TRANSIT_TYPE_FRIENDS
   DECLARE_VISITOR_AND_DEBUG_PRINT(SingleMwmSegment, visitor(m_featureId, "feature_id"),
-                                  visitor(m_segmentIdx, "segment_idx"),
-                                  visitor(m_forward, "forward"))
+                                  visitor(m_segmentIdx, "segment_idx"), visitor(m_forward, "forward"))
 
   FeatureId m_featureId = kInvalidFeatureId;
   uint32_t m_segmentIdx = 0;
@@ -195,15 +192,15 @@ private:
 class Gate
 {
 public:
-  Gate() : m_featureIdentifiers(false /* serializeFeatureIdOnly */){};
-  Gate(OsmId osmId, FeatureId featureId, bool entrance, bool exit, Weight weight,
-       std::vector<StopId> const & stopIds, m2::PointD const & point);
+  Gate() : m_featureIdentifiers(false /* serializeFeatureIdOnly */) {}
+  Gate(OsmId osmId, FeatureId featureId, bool entrance, bool exit, Weight weight, std::vector<StopId> const & stopIds,
+       m2::PointD const & point);
 
   bool operator<(Gate const & rhs) const;
   bool operator==(Gate const & rhs) const;
   bool IsEqualForTesting(Gate const & gate) const;
   bool IsValid() const;
-  void SetBestPedestrianSegment(SingleMwmSegment const & s) { m_bestPedestrianSegment = s; };
+  void SetBestPedestrianSegment(SingleMwmSegment const & s) { m_bestPedestrianSegment = s; }
 
   FeatureId GetFeatureId() const { return m_featureIdentifiers.GetFeatureId(); }
   OsmId GetOsmId() const { return m_featureIdentifiers.GetOsmId(); }
@@ -218,9 +215,8 @@ private:
   DECLARE_TRANSIT_TYPE_FRIENDS
   DECLARE_VISITOR_AND_DEBUG_PRINT(Gate, visitor(m_featureIdentifiers, "osm_id"),
                                   visitor(m_bestPedestrianSegment, "best_pedestrian_segment"),
-                                  visitor(m_entrance, "entrance"), visitor(m_exit, "exit"),
-                                  visitor(m_weight, "weight"), visitor(m_stopIds, "stop_ids"),
-                                  visitor(m_point, "point"))
+                                  visitor(m_entrance, "entrance"), visitor(m_exit, "exit"), visitor(m_weight, "weight"),
+                                  visitor(m_stopIds, "stop_ids"), visitor(m_point, "point"))
 
   // |m_featureIdentifiers| contains feature id of a feature which represents gates. Usually it's a
   // point feature.
@@ -252,8 +248,7 @@ public:
 
 private:
   DECLARE_TRANSIT_TYPE_FRIENDS
-  DECLARE_VISITOR_AND_DEBUG_PRINT(ShapeId, visitor(m_stop1Id, "stop1_id"),
-                                  visitor(m_stop2Id, "stop2_id"))
+  DECLARE_VISITOR_AND_DEBUG_PRINT(ShapeId, visitor(m_stop1Id, "stop1_id"), visitor(m_stop2Id, "stop2_id"))
 
   StopId m_stop1Id = kInvalidStopId;
   StopId m_stop2Id = kInvalidStopId;
@@ -321,10 +316,9 @@ public:
 
 private:
   DECLARE_TRANSIT_TYPE_FRIENDS
-  DECLARE_VISITOR_AND_DEBUG_PRINT(Edge, visitor(m_stop1Id, "stop1_id"),
-                                  visitor(m_stop2Id, "stop2_id"), visitor(m_weight, "weight"),
-                                  visitor(m_lineId, "line_id"), visitor(m_flags, "transfer"),
-                                  visitor(m_shapeIds, "shape_ids"))
+  DECLARE_VISITOR_AND_DEBUG_PRINT(Edge, visitor(m_stop1Id, "stop1_id"), visitor(m_stop2Id, "stop2_id"),
+                                  visitor(m_weight, "weight"), visitor(m_lineId, "line_id"),
+                                  visitor(m_flags, "transfer"), visitor(m_shapeIds, "shape_ids"))
 
   WrappedEdgeId m_stop1Id = WrappedEdgeId(kInvalidStopId);
   StopId m_stop2Id = kInvalidStopId;
@@ -355,8 +349,7 @@ public:
 private:
   DECLARE_TRANSIT_TYPE_FRIENDS
   DECLARE_VISITOR_AND_DEBUG_PRINT(Transfer, visitor(m_id, "id"), visitor(m_point, "point"),
-                                  visitor(m_stopIds, "stop_ids"),
-                                  visitor(m_titleAnchors, "title_anchors"))
+                                  visitor(m_stopIds, "stop_ids"), visitor(m_titleAnchors, "title_anchors"))
 
   StopId m_id = kInvalidStopId;
   m2::PointD m_point;
@@ -405,10 +398,10 @@ public:
 
 private:
   DECLARE_TRANSIT_TYPE_FRIENDS
-  DECLARE_VISITOR_AND_DEBUG_PRINT(Line, visitor(m_id, "id"), visitor(m_number, "number"),
-                                  visitor(m_title, "title"), visitor(m_type, "type"),
-                                  visitor(m_color, "color"), visitor(m_networkId, "network_id"),
-                                  visitor(m_stopIds, "stop_ids"), visitor(m_interval, "interval"))
+  DECLARE_VISITOR_AND_DEBUG_PRINT(Line, visitor(m_id, "id"), visitor(m_number, "number"), visitor(m_title, "title"),
+                                  visitor(m_type, "type"), visitor(m_color, "color"),
+                                  visitor(m_networkId, "network_id"), visitor(m_stopIds, "stop_ids"),
+                                  visitor(m_interval, "interval"))
 
   LineId m_id = kInvalidLineId;
   std::string m_number;
@@ -424,10 +417,7 @@ class Shape
 {
 public:
   Shape() = default;
-  Shape(ShapeId const & id, std::vector<m2::PointD> const & polyline)
-    : m_id(id), m_polyline(polyline)
-  {
-  }
+  Shape(ShapeId const & id, std::vector<m2::PointD> const & polyline) : m_id(id), m_polyline(polyline) {}
 
   bool operator<(Shape const & rhs) const { return m_id < rhs.m_id; }
   bool operator==(Shape const & rhs) const { return m_id == rhs.m_id; }
@@ -496,8 +486,7 @@ void CheckValidSortedUnique(std::vector<Item> const & items, std::string const &
   CheckUnique(items, name);
 }
 
-EdgeFlags GetEdgeFlags(bool transfer, StopId stopId1, StopId stopId2,
-                       std::vector<ShapeId> const & shapeIds);
+EdgeFlags GetEdgeFlags(bool transfer, StopId stopId1, StopId stopId2, std::vector<ShapeId> const & shapeIds);
 
 #undef DECLARE_TRANSIT_TYPE_FRIENDS
 }  // namespace transit
diff --git a/libs/transit/transit_version.cpp b/libs/transit/transit_version.cpp
index 18d16f1fe..718a3b88e 100644
--- a/libs/transit/transit_version.cpp
+++ b/libs/transit/transit_version.cpp
@@ -15,8 +15,7 @@ TransitVersion GetVersion(Reader & reader)
     NonOwningReaderSource src(reader);
     uint16_t headerVersion = std::numeric_limits<uint16_t>::max();
     ReadPrimitiveFromSource(src, headerVersion);
-    CHECK_LESS(headerVersion, static_cast<uint16_t>(TransitVersion::Counter),
-               ("Invalid transit header version."));
+    CHECK_LESS(headerVersion, static_cast<uint16_t>(TransitVersion::Counter), ("Invalid transit header version."));
 
     return static_cast<TransitVersion>(headerVersion);
   }
diff --git a/libs/transit/transit_version.hpp b/libs/transit/transit_version.hpp
index 97b3c8547..12e175296 100644
--- a/libs/transit/transit_version.hpp
+++ b/libs/transit/transit_version.hpp
@@ -28,8 +28,7 @@ inline std::string DebugPrint(TransitVersion version)
   case TransitVersion::Counter: return "Counter";
   }
 
-  LOG(LERROR,
-      ("Unknown version:", static_cast<std::underlying_type<TransitVersion>::type>(version)));
+  LOG(LERROR, ("Unknown version:", static_cast<std::underlying_type<TransitVersion>::type>(version)));
   UNREACHABLE();
 }
 }  // namespace transit
diff --git a/libs/transit/world_feed/color_picker.cpp b/libs/transit/world_feed/color_picker.cpp
index 395dbe9d9..0628cf62d 100644
--- a/libs/transit/world_feed/color_picker.cpp
+++ b/libs/transit/world_feed/color_picker.cpp
@@ -46,10 +46,8 @@ ColorPicker::ColorPicker()
   // We need only colors for route polylines, not for text. So we skip items like
   // 'transit_text_navy' and work only with items like 'transit_navy'.
   for (auto const & [name, color] : df::GetTransitClearColors())
-  {
     if (name.find(df::kTransitTextPrefix) == std::string::npos)
       m_drapeClearColors.emplace(name, color);
-  }
 }
 
 std::string ColorPicker::GetNearestColor(std::string const & rgb)
@@ -82,10 +80,7 @@ std::string ColorPicker::GetNearestColor(std::string const & rgb)
   }
 
   if (nearestColor.find(df::kTransitColorPrefix + df::kTransitLinePrefix) == 0)
-  {
-    nearestColor =
-        nearestColor.substr(df::kTransitColorPrefix.size() + df::kTransitLinePrefix.size());
-  }
+    nearestColor = nearestColor.substr(df::kTransitColorPrefix.size() + df::kTransitLinePrefix.size());
 
   it->second = nearestColor;
   return nearestColor;
diff --git a/libs/transit/world_feed/date_time_helpers.cpp b/libs/transit/world_feed/date_time_helpers.cpp
index 9a7b60f07..9ff8e7d24 100644
--- a/libs/transit/world_feed/date_time_helpers.cpp
+++ b/libs/transit/world_feed/date_time_helpers.cpp
@@ -56,8 +56,7 @@ private:
   bool m_inited = false;
 };
 
-void AccumExceptionDates::InitIntervals(boost::gregorian::date const & gregorianDate,
-                                        gtfs::Date const & gtfsDate)
+void AccumExceptionDates::InitIntervals(boost::gregorian::date const & gregorianDate, gtfs::Date const & gtfsDate)
 {
   m_GregorianInterval = std::make_pair(gregorianDate, gregorianDate);
   m_GtfsInterval = std::make_pair(gtfsDate, gtfsDate);
@@ -66,13 +65,15 @@ void AccumExceptionDates::InitIntervals(boost::gregorian::date const & gregorian
 
 void AccumExceptionDates::AddRange()
 {
-  osmoh::MonthdayRange range =
-      GetMonthdayRangeFromDates(m_GtfsInterval.first, m_GtfsInterval.second);
+  osmoh::MonthdayRange range = GetMonthdayRangeFromDates(m_GtfsInterval.first, m_GtfsInterval.second);
   m_ranges.push_back(range);
   m_inited = false;
 }
 
-bool AccumExceptionDates::IsInited() const { return m_inited; }
+bool AccumExceptionDates::IsInited() const
+{
+  return m_inited;
+}
 
 osmoh::Weekday ConvertWeekDayIndexToOsmoh(size_t index)
 {
@@ -87,8 +88,7 @@ osmoh::Weekday ConvertWeekDayIndexToOsmoh(size_t index)
   return osmoh::ToWeekday(index);
 }
 
-std::vector<WeekdaysInterval> GetOpenCloseIntervals(
-    std::vector<gtfs::CalendarAvailability> const & week)
+std::vector<WeekdaysInterval> GetOpenCloseIntervals(std::vector<gtfs::CalendarAvailability> const & week)
 {
   std::vector<WeekdaysInterval> intervals;
 
@@ -96,8 +96,8 @@ std::vector<WeekdaysInterval> GetOpenCloseIntervals(
   for (size_t i = 0; i < week.size(); ++i)
   {
     osmoh::RuleSequence::Modifier const status = week[i] == gtfs::CalendarAvailability::Available
-                                                     ? osmoh::RuleSequence::Modifier::DefaultOpen
-                                                     : osmoh::RuleSequence::Modifier::Closed;
+                                                   ? osmoh::RuleSequence::Modifier::DefaultOpen
+                                                   : osmoh::RuleSequence::Modifier::Closed;
     if (status == interval.m_status)
     {
       interval.m_end = i;
@@ -140,8 +140,7 @@ void SetOpeningHoursRange(osmoh::MonthdayRange & range, gtfs::Date const & date,
 
 void GetServiceDaysOsmoh(gtfs::CalendarItem const & serviceDays, osmoh::TRuleSequences & rules)
 {
-  osmoh::MonthdayRange range =
-      GetMonthdayRangeFromDates(serviceDays.start_date, serviceDays.end_date);
+  osmoh::MonthdayRange range = GetMonthdayRangeFromDates(serviceDays.start_date, serviceDays.end_date);
   osmoh::TMonthdayRanges const rangesMonths{range};
 
   std::vector<gtfs::CalendarAvailability> const weekDayStatuses = {
@@ -155,9 +154,8 @@ void GetServiceDaysOsmoh(gtfs::CalendarItem const & serviceDays, osmoh::TRuleSeq
 
   for (auto const & interval : intervals)
   {
-    osmoh::RuleSequence & ruleSeq = interval.m_status == osmoh::RuleSequence::Modifier::DefaultOpen
-                                        ? ruleSeqOpen
-                                        : ruleSeqClose;
+    osmoh::RuleSequence & ruleSeq =
+        interval.m_status == osmoh::RuleSequence::Modifier::DefaultOpen ? ruleSeqOpen : ruleSeqClose;
     ruleSeq.SetMonths(rangesMonths);
     ruleSeq.SetModifier(interval.m_status);
 
@@ -180,8 +178,8 @@ void GetServiceDaysOsmoh(gtfs::CalendarItem const & serviceDays, osmoh::TRuleSeq
     rules.push_back(ruleSeqClose);
 }
 
-void AppendMonthRules(osmoh::RuleSequence::Modifier const & status,
-                      osmoh::TMonthdayRanges const & monthRanges, osmoh::TRuleSequences & rules)
+void AppendMonthRules(osmoh::RuleSequence::Modifier const & status, osmoh::TMonthdayRanges const & monthRanges,
+                      osmoh::TRuleSequences & rules)
 {
   osmoh::RuleSequence ruleSeq;
   ruleSeq.SetMonths(monthRanges);
@@ -189,8 +187,7 @@ void AppendMonthRules(osmoh::RuleSequence::Modifier const & status,
   rules.push_back(ruleSeq);
 }
 
-void GetServiceDaysExceptionsOsmoh(gtfs::CalendarDates const & exceptionDays,
-                                   osmoh::TRuleSequences & rules)
+void GetServiceDaysExceptionsOsmoh(gtfs::CalendarDates const & exceptionDays, osmoh::TRuleSequences & rules)
 {
   if (exceptionDays.empty())
     return;
@@ -201,8 +198,7 @@ void GetServiceDaysExceptionsOsmoh(gtfs::CalendarDates const & exceptionDays,
   for (size_t i = 0; i < exceptionDays.size(); ++i)
   {
     AccumExceptionDates & curAccum =
-        (exceptionDays[i].exception_type == gtfs::CalendarDateException::Added) ? accumOpen
-                                                                                : accumClosed;
+        (exceptionDays[i].exception_type == gtfs::CalendarDateException::Added) ? accumOpen : accumClosed;
 
     auto const [year, month, day] = exceptionDays[i].date.get_yyyy_mm_dd();
     boost::gregorian::date const date{year, month, day};
@@ -229,8 +225,7 @@ void GetServiceDaysExceptionsOsmoh(gtfs::CalendarDates const & exceptionDays,
     }
 
     AccumExceptionDates & prevAccum =
-        (exceptionDays[i].exception_type == gtfs::CalendarDateException::Added) ? accumClosed
-                                                                                : accumOpen;
+        (exceptionDays[i].exception_type == gtfs::CalendarDateException::Added) ? accumClosed : accumOpen;
     if (prevAccum.IsInited())
       prevAccum.AddRange();
 
@@ -248,9 +243,7 @@ void GetServiceDaysExceptionsOsmoh(gtfs::CalendarDates const & exceptionDays,
 void MergeRules(osmoh::TRuleSequences & dstRules, osmoh::TRuleSequences const & srcRules)
 {
   for (auto const & rule : srcRules)
-  {
     if (!base::IsExist(dstRules, rule))
       dstRules.push_back(rule);
-  }
 }
 }  // namespace transit
diff --git a/libs/transit/world_feed/date_time_helpers.hpp b/libs/transit/world_feed/date_time_helpers.hpp
index 0ebdaa8b9..92ac16249 100644
--- a/libs/transit/world_feed/date_time_helpers.hpp
+++ b/libs/transit/world_feed/date_time_helpers.hpp
@@ -27,8 +27,7 @@ struct WeekdaysInterval
 };
 
 // Calculates open/closed intervals for |week|.
-std::vector<WeekdaysInterval> GetOpenCloseIntervals(
-    std::vector<gtfs::CalendarAvailability> const & week);
+std::vector<WeekdaysInterval> GetOpenCloseIntervals(std::vector<gtfs::CalendarAvailability> const & week);
 
 // Sets start or end |date| for |range|.
 void SetOpeningHoursRange(osmoh::MonthdayRange & range, gtfs::Date const & date, bool isStart);
@@ -37,8 +36,7 @@ void SetOpeningHoursRange(osmoh::MonthdayRange & range, gtfs::Date const & date,
 void GetServiceDaysOsmoh(gtfs::CalendarItem const & serviceDays, osmoh::TRuleSequences & rules);
 
 // Extracts open/closed exception service days ranges from |exceptionDays| to |rules|.
-void GetServiceDaysExceptionsOsmoh(gtfs::CalendarDates const & exceptionDays,
-                                   osmoh::TRuleSequences & rules);
+void GetServiceDaysExceptionsOsmoh(gtfs::CalendarDates const & exceptionDays, osmoh::TRuleSequences & rules);
 
 // Adds |srcRules| to |dstRules| if they are not present.
 void MergeRules(osmoh::TRuleSequences & dstRules, osmoh::TRuleSequences const & srcRules);
diff --git a/libs/transit/world_feed/feed_helpers.cpp b/libs/transit/world_feed/feed_helpers.cpp
index c50d82053..1150c101b 100644
--- a/libs/transit/world_feed/feed_helpers.cpp
+++ b/libs/transit/world_feed/feed_helpers.cpp
@@ -48,17 +48,15 @@ bool CloserToEndingAndOnSimilarDistToLine(ProjectionData const & p1, ProjectionD
 
 namespace transit
 {
-ProjectionToShape ProjectStopOnTrack(m2::PointD const & stopPoint, m2::PointD const & point1,
-                                     m2::PointD const & point2)
+ProjectionToShape ProjectStopOnTrack(m2::PointD const & stopPoint, m2::PointD const & point1, m2::PointD const & point2)
 {
-  m2::PointD const stopProjection =
-      m2::ParametrizedSegment<m2::PointD>(point1, point2).ClosestPointTo(stopPoint);
+  m2::PointD const stopProjection = m2::ParametrizedSegment<m2::PointD>(point1, point2).ClosestPointTo(stopPoint);
   double const distM = mercator::DistanceOnEarth(stopProjection, stopPoint);
   return {stopProjection, distM};
 }
 
-ProjectionData GetProjection(std::vector<m2::PointD> const & polyline, size_t index,
-                             Direction direction, ProjectionToShape const & proj)
+ProjectionData GetProjection(std::vector<m2::PointD> const & polyline, size_t index, Direction direction,
+                             ProjectionToShape const & proj)
 {
   ProjectionData projData;
   projData.m_distFromPoint = proj.m_dist;
@@ -87,9 +85,8 @@ ProjectionData GetProjection(std::vector<m2::PointD> const & polyline, size_t in
   return projData;
 }
 
-void FillProjections(std::vector<m2::PointD> & polyline, size_t startIndex, size_t endIndex,
-                     m2::PointD const & point, double distStopsM, Direction direction,
-                     std::vector<ProjectionData> & projections)
+void FillProjections(std::vector<m2::PointD> & polyline, size_t startIndex, size_t endIndex, m2::PointD const & point,
+                     double distStopsM, Direction direction, std::vector<ProjectionData> & projections)
 {
   CHECK_LESS_OR_EQUAL(startIndex, endIndex, ());
 
@@ -99,11 +96,10 @@ void FillProjections(std::vector<m2::PointD> & polyline, size_t startIndex, size
 
   size_t const from = direction == Direction::Forward ? startIndex : endIndex;
 
-  auto const endCriterion = [&](size_t i) {
-    return direction == Direction::Forward ? i < endIndex : i > startIndex;
-  };
+  auto const endCriterion = [&](size_t i) { return direction == Direction::Forward ? i < endIndex : i > startIndex; };
 
-  auto const move = [&](size_t & i) {
+  auto const move = [&](size_t & i)
+  {
     direction == Direction::Forward ? ++i : --i;
     CHECK_LESS_OR_EQUAL(i, polyline.size(), ());
   };
@@ -117,10 +113,9 @@ void FillProjections(std::vector<m2::PointD> & polyline, size_t startIndex, size
     if (i != from)
       distTravelledM += mercator::DistanceOnEarth(polyline[prev], polyline[current]);
 
-    auto proj = GetProjection(polyline, current, direction,
-                              ProjectStopOnTrack(point, polyline[current], polyline[next]));
-    proj.m_distFromEnding =
-        distTravelledM + mercator::DistanceOnEarth(polyline[current], proj.m_proj);
+    auto proj =
+        GetProjection(polyline, current, direction, ProjectStopOnTrack(point, polyline[current], polyline[next]));
+    proj.m_distFromEnding = distTravelledM + mercator::DistanceOnEarth(polyline[current], proj.m_proj);
 
     // The distance on the polyline between the projections of stops must not be less than the
     // shortest possible distance between the stops themselves.
@@ -133,9 +128,8 @@ void FillProjections(std::vector<m2::PointD> & polyline, size_t startIndex, size
 }
 
 std::pair<size_t, bool> PrepareNearestPointOnTrack(m2::PointD const & point,
-                                                   std::optional<m2::PointD> const & prevPoint,
-                                                   size_t prevIndex, Direction direction,
-                                                   std::vector<m2::PointD> & polyline)
+                                                   std::optional<m2::PointD> const & prevPoint, size_t prevIndex,
+                                                   Direction direction, std::vector<m2::PointD> & polyline)
 {
   // We skip 70% of the distance in a straight line between two stops for preventing incorrect
   // projection of the |point| to the polyline of complex shape.
@@ -157,7 +151,8 @@ std::pair<size_t, bool> PrepareNearestPointOnTrack(m2::PointD const & point,
   // We find the most fitting projection of the stop to the polyline. For two different projections
   // with approximately equal distances to the stop the most preferable is the one that is closer
   // to the beginning of the polyline segment.
-  auto const cmp = [](ProjectionData const & p1, ProjectionData const & p2) {
+  auto const cmp = [](ProjectionData const & p1, ProjectionData const & p2)
+  {
     if (CloserToEndingAndOnSimilarDistToLine(p1, p2))
       return true;
 
@@ -177,9 +172,8 @@ std::pair<size_t, bool> PrepareNearestPointOnTrack(m2::PointD const & point,
   if (proj->m_indexOnShape == prevIndex)
   {
     proj = std::min_element(projections.begin(), projections.end(),
-                         [](ProjectionData const & p1, ProjectionData const & p2) {
-                           return p1.m_distFromPoint < p2.m_distFromPoint;
-                         });
+                            [](ProjectionData const & p1, ProjectionData const & p2)
+    { return p1.m_distFromPoint < p2.m_distFromPoint; });
   }
 
   if (proj->m_needsInsertion)
@@ -193,9 +187,9 @@ bool IsRelevantType(gtfs::RouteType const & routeType)
   // All types and constants are described in GTFS:
   // https://developers.google.com/transit/gtfs/reference
 
-  auto const isSubway = [](gtfs::RouteType const & routeType) {
-    return routeType == gtfs::RouteType::Subway ||
-           routeType == gtfs::RouteType::MetroService ||
+  auto const isSubway = [](gtfs::RouteType const & routeType)
+  {
+    return routeType == gtfs::RouteType::Subway || routeType == gtfs::RouteType::MetroService ||
            routeType == gtfs::RouteType::UndergroundService;
   };
 
@@ -214,16 +208,15 @@ bool IsRelevantType(gtfs::RouteType const & routeType)
     return false;
 
   // Other not relevant types - school buses, lorry services etc.
-  static std::vector<gtfs::RouteType> const kNotRelevantTypes{
-      gtfs::RouteType::CarTransportRailService,
-      gtfs::RouteType::LorryTransportRailService,
-      gtfs::RouteType::VehicleTransportRailService,
-      gtfs::RouteType::PostBusService,
-      gtfs::RouteType::SpecialNeedsBus,
-      gtfs::RouteType::MobilityBusService,
-      gtfs::RouteType::MobilityBusForRegisteredDisabled,
-      gtfs::RouteType::SchoolBus,
-      gtfs::RouteType::SchoolAndPublicServiceBus};
+  static std::vector<gtfs::RouteType> const kNotRelevantTypes{gtfs::RouteType::CarTransportRailService,
+                                                              gtfs::RouteType::LorryTransportRailService,
+                                                              gtfs::RouteType::VehicleTransportRailService,
+                                                              gtfs::RouteType::PostBusService,
+                                                              gtfs::RouteType::SpecialNeedsBus,
+                                                              gtfs::RouteType::MobilityBusService,
+                                                              gtfs::RouteType::MobilityBusForRegisteredDisabled,
+                                                              gtfs::RouteType::SchoolBus,
+                                                              gtfs::RouteType::SchoolAndPublicServiceBus};
 
   return !base::IsExist(kNotRelevantTypes, routeType);
 }
@@ -293,15 +286,14 @@ std::string ToStringExtendedType(gtfs::RouteType const & routeType)
   return {};
 }
 
-gtfs::StopTimes GetStopTimesForTrip(gtfs::StopTimes const & allStopTimes,
-                                    std::string const & tripId)
+gtfs::StopTimes GetStopTimesForTrip(gtfs::StopTimes const & allStopTimes, std::string const & tripId)
 {
   gtfs::StopTime reference;
   reference.trip_id = tripId;
 
-  auto itStart = std::lower_bound(
-      allStopTimes.begin(), allStopTimes.end(), reference,
-      [](const gtfs::StopTime & t1, const gtfs::StopTime & t2) { return t1.trip_id < t2.trip_id; });
+  auto itStart =
+      std::lower_bound(allStopTimes.begin(), allStopTimes.end(), reference,
+                       [](gtfs::StopTime const & t1, gtfs::StopTime const & t2) { return t1.trip_id < t2.trip_id; });
 
   if (itStart == allStopTimes.end())
     return {};
@@ -310,15 +302,13 @@ gtfs::StopTimes GetStopTimesForTrip(gtfs::StopTimes const & allStopTimes,
     ++itEnd;
 
   gtfs::StopTimes res(itStart, itEnd);
-  std::sort(res.begin(), res.end(), [](gtfs::StopTime const & t1, gtfs::StopTime const & t2) {
-    return t1.stop_sequence < t2.stop_sequence;
-  });
+  std::sort(res.begin(), res.end(),
+            [](gtfs::StopTime const & t1, gtfs::StopTime const & t2) { return t1.stop_sequence < t2.stop_sequence; });
   return res;
 }
 
-void UpdateLinePart(LineParts & lineParts, LineSegment const & segment,
-                    m2::PointD const & startPoint, TransitId commonLineId,
-                    m2::PointD const & startPointParallel)
+void UpdateLinePart(LineParts & lineParts, LineSegment const & segment, m2::PointD const & startPoint,
+                    TransitId commonLineId, m2::PointD const & startPointParallel)
 {
   if (auto it = FindLinePart(lineParts, segment); it == lineParts.end())
   {
@@ -386,13 +376,11 @@ std::pair<LineSegments, LineSegments> FindIntersections(std::vector<m2::PointD>
 
 LineParts::iterator FindLinePart(LineParts & lineParts, LineSegment const & segment)
 {
-  return std::find_if(lineParts.begin(), lineParts.end(), [&segment](LinePart const & linePart) {
-    return linePart.m_segment == segment;
-  });
+  return std::find_if(lineParts.begin(), lineParts.end(),
+                      [&segment](LinePart const & linePart) { return linePart.m_segment == segment; });
 }
 
-std::optional<LineSegment> GetIntersection(size_t start1, size_t finish1, size_t start2,
-                                           size_t finish2)
+std::optional<LineSegment> GetIntersection(size_t start1, size_t finish1, size_t start2, size_t finish2)
 {
   int const maxStart = static_cast<int>(std::max(start1, start2));
   int const minFinish = static_cast<int>(std::min(finish1, finish2));
@@ -409,8 +397,7 @@ int CalcSegmentOrder(size_t segIndex, size_t totalSegCount)
 {
   int constexpr shapeOffsetIncrement = 2;
 
-  int const shapeOffset =
-      -static_cast<int>(totalSegCount / 2) * 2 - static_cast<int>(totalSegCount % 2) + 1;
+  int const shapeOffset = -static_cast<int>(totalSegCount / 2) * 2 - static_cast<int>(totalSegCount % 2) + 1;
   int const curSegOffset = shapeOffset + shapeOffsetIncrement * static_cast<int>(segIndex);
 
   return curSegOffset;
@@ -432,9 +419,7 @@ std::pair<size_t, size_t> GetStopsRange(IdList const & lineStopIds, IdSet const
     if (stopIdsInRegion.count(stopId) != 0)
     {
       if (!StopIndexIsSet(first))
-      {
         first = i;
-      }
       last = i;
     }
   }
@@ -453,8 +438,7 @@ std::pair<size_t, size_t> GetStopsRange(IdList const & lineStopIds, IdSet const
 }
 
 // Returns indexes of nearest to the |point| elements in |shape|.
-std::vector<size_t> GetMinDistIndexes(std::vector<m2::PointD> const & shape,
-                                      m2::PointD const & point)
+std::vector<size_t> GetMinDistIndexes(std::vector<m2::PointD> const & shape, m2::PointD const & point)
 {
   double minDist = std::numeric_limits<double>::max();
 
@@ -517,8 +501,8 @@ std::pair<size_t, size_t> FindSegmentOnShape(std::vector<m2::PointD> const & sha
   return {firstIntersection.m_startIdx, firstIntersection.m_endIdx};
 }
 
-std::pair<size_t, size_t> FindPointsOnShape(std::vector<m2::PointD> const & shape,
-                                            m2::PointD const & p1, m2::PointD const & p2)
+std::pair<size_t, size_t> FindPointsOnShape(std::vector<m2::PointD> const & shape, m2::PointD const & p1,
+                                            m2::PointD const & p2)
 {
   // We find indexes of nearest points in |shape| to |p1| and |p2| correspondingly.
   std::vector<size_t> const & indexes1 = GetMinDistIndexes(shape, p1);
@@ -541,9 +525,7 @@ std::pair<size_t, size_t> FindPointsOnShape(std::vector<m2::PointD> const & shap
   auto const & [first, last] = distToIndexes.begin()->second;
   if (first == last)
   {
-    LOG(LINFO,
-        ("Edge with equal indexes of first and last points on the shape. Index on the shape:",
-         first));
+    LOG(LINFO, ("Edge with equal indexes of first and last points on the shape. Index on the shape:", first));
     CHECK_GREATER(distToIndexes.size(), 1, ());
 
     auto const & nextPair = std::next(distToIndexes.begin());
diff --git a/libs/transit/world_feed/feed_helpers.hpp b/libs/transit/world_feed/feed_helpers.hpp
index 77d5dbc61..d73ceccff 100644
--- a/libs/transit/world_feed/feed_helpers.hpp
+++ b/libs/transit/world_feed/feed_helpers.hpp
@@ -36,12 +36,11 @@ ProjectionToShape ProjectStopOnTrack(m2::PointD const & stopPoint, m2::PointD co
 /// the |polyline| and the flag is set to true. New point should follow prevPoint in the direction
 /// |direction|.
 std::pair<size_t, bool> PrepareNearestPointOnTrack(m2::PointD const & point,
-                                                   std::optional<m2::PointD> const & prevPoint,
-                                                   size_t prevIndex, Direction direction,
-                                                   std::vector<m2::PointD> & polyline);
+                                                   std::optional<m2::PointD> const & prevPoint, size_t prevIndex,
+                                                   Direction direction, std::vector<m2::PointD> & polyline);
 
 /// \returns true if we should not skip routes with this GTFS |routeType|.
-bool IsRelevantType(const gtfs::RouteType & routeType);
+bool IsRelevantType(gtfs::RouteType const & routeType);
 
 /// \return string representation of the GTFS |routeType|.
 std::string ToString(gtfs::RouteType const & routeType);
@@ -50,8 +49,7 @@ std::string ToString(gtfs::RouteType const & routeType);
 std::string ToStringExtendedType(gtfs::RouteType const & routeType);
 
 /// \return stop times for trip with |tripId|.
-gtfs::StopTimes GetStopTimesForTrip(gtfs::StopTimes const & allStopTimes,
-                                    std::string const & tripId);
+gtfs::StopTimes GetStopTimesForTrip(gtfs::StopTimes const & allStopTimes, std::string const & tripId);
 
 // Delete item from the |container| by its key.
 template <class C, class K>
@@ -113,14 +111,12 @@ std::pair<LineSegments, LineSegments> FindIntersections(std::vector<m2::PointD>
 
 // Finds item in |lineParts| equal to |segment| and updates it. If it doesn't exist it is added to
 // the |lineParts|.
-void UpdateLinePart(LineParts & lineParts, LineSegment const & segment,
-                    m2::PointD const & startPoint, TransitId commonLineId,
-                    m2::PointD const & startPointParallel);
+void UpdateLinePart(LineParts & lineParts, LineSegment const & segment, m2::PointD const & startPoint,
+                    TransitId commonLineId, m2::PointD const & startPointParallel);
 
 // Calculates start and end indexes of intersection of two segments: [start1, finish1] and [start2,
 // finish2].
-std::optional<LineSegment> GetIntersection(size_t start1, size_t finish1, size_t start2,
-                                           size_t finish2);
+std::optional<LineSegment> GetIntersection(size_t start1, size_t finish1, size_t start2, size_t finish2);
 
 // Calculates line order on segment based on two parameters: line index between all parallel lines,
 // total parallel lines count. Line order must be symmetrical with respect to the сentral axis of
@@ -136,8 +132,8 @@ std::pair<size_t, size_t> GetStopsRange(IdList const & lineStopIds, IdSet const
 
 // Returns indexes of points |p1| and |p2| on the |shape| polyline. If there are more then 1
 // occurrences of |p1| or |p2| in |shape|, indexes with minimum distance are returned.
-std::pair<size_t, size_t> FindPointsOnShape(std::vector<m2::PointD> const & shape,
-                                            m2::PointD const & p1, m2::PointD const & p2);
+std::pair<size_t, size_t> FindPointsOnShape(std::vector<m2::PointD> const & shape, m2::PointD const & p1,
+                                            m2::PointD const & p2);
 
 // Returns indexes of first and last points of |segment| in the |shape| polyline. If |edgeShape|
 // is not found returns pair of zeroes.
diff --git a/libs/transit/world_feed/gtfs_converter/gtfs_converter.cpp b/libs/transit/world_feed/gtfs_converter/gtfs_converter.cpp
index d5a7aad4e..5bb10853b 100644
--- a/libs/transit/world_feed/gtfs_converter/gtfs_converter.cpp
+++ b/libs/transit/world_feed/gtfs_converter/gtfs_converter.cpp
@@ -13,11 +13,9 @@
 
 #include <gflags/gflags.h>
 
-DEFINE_string(
-    path_mapping, "",
-    "Path to the mapping file of TransitId to GTFS hash for all transit entities except edges");
-DEFINE_string(path_mapping_edges, "",
-              "Path to the mapping file of TransitId to GTFS hash for edges");
+DEFINE_string(path_mapping, "",
+              "Path to the mapping file of TransitId to GTFS hash for all transit entities except edges");
+DEFINE_string(path_mapping_edges, "", "Path to the mapping file of TransitId to GTFS hash for edges");
 // One of these two paths should be specified: |path_gtfs_feeds| and/or |path_subway_json|.
 DEFINE_string(path_gtfs_feeds, "", "Directory with GTFS feeds subdirectories");
 DEFINE_string(path_subway_json, "", "OMaps json file with subway data from OSM");
@@ -166,8 +164,7 @@ FeedStatus ReadFeed(gtfs::Feed & feed)
 // Reads GTFS feeds from directories in |FLAGS_path_gtfs_feeds|. Converts each feed to the WorldFeed
 // object and saves to the |FLAGS_path_json| path in the new transit line-by-line json format.
 bool ConvertFeeds(transit::IdGenerator & generator, transit::IdGenerator & generatorEdges,
-                  transit::ColorPicker & colorPicker,
-                  feature::CountriesFilesAffiliation & mwmMatcher)
+                  transit::ColorPicker & colorPicker, feature::CountriesFilesAffiliation & mwmMatcher)
 {
   auto const gtfsFeeds = GetGtfsFeedsInDirectory(FLAGS_path_gtfs_feeds);
 
@@ -253,8 +250,7 @@ bool ConvertFeeds(transit::IdGenerator & generator, transit::IdGenerator & gener
 // Reads subway json from |FLAGS_path_subway_json|, converts it to the WorldFeed object and saves
 // to the |FLAGS_path_json| path in the new transit line-by-line json format.
 bool ConvertSubway(transit::IdGenerator & generator, transit::IdGenerator & generatorEdges,
-                   transit::ColorPicker & colorPicker,
-                   feature::CountriesFilesAffiliation & mwmMatcher, bool overwrite)
+                   transit::ColorPicker & colorPicker, feature::CountriesFilesAffiliation & mwmMatcher, bool overwrite)
 {
   transit::WorldFeed globalFeed(generator, generatorEdges, colorPicker, mwmMatcher);
   transit::SubwayConverter converter(FLAGS_path_subway_json, globalFeed);
@@ -289,11 +285,10 @@ int main(int argc, char ** argv)
 
   if ((!FLAGS_path_gtfs_feeds.empty() && !Platform::IsDirectory(FLAGS_path_gtfs_feeds)) ||
       !Platform::IsDirectory(FLAGS_path_json) || !Platform::IsDirectory(FLAGS_path_resources) ||
-      (!FLAGS_path_subway_json.empty() &&
-       !Platform::IsFileExistsByFullPath(FLAGS_path_subway_json)))
+      (!FLAGS_path_subway_json.empty() && !Platform::IsFileExistsByFullPath(FLAGS_path_subway_json)))
   {
-    LOG(LWARNING, ("Some paths set in options are not valid. Check the directories:",
-                   FLAGS_path_gtfs_feeds, FLAGS_path_json, FLAGS_path_resources));
+    LOG(LWARNING, ("Some paths set in options are not valid. Check the directories:", FLAGS_path_gtfs_feeds,
+                   FLAGS_path_json, FLAGS_path_resources));
     gflags::ShowUsageWithFlagsRestrict(argv[0], toolName.c_str());
     return EXIT_FAILURE;
   }
@@ -304,13 +299,11 @@ int main(int argc, char ** argv)
   GetPlatform().SetResourceDir(FLAGS_path_resources);
   transit::ColorPicker colorPicker;
 
-  feature::CountriesFilesAffiliation mwmMatcher(GetPlatform().ResourcesDir(),
-                                                false /* haveBordersForWholeWorld */);
+  feature::CountriesFilesAffiliation mwmMatcher(GetPlatform().ResourcesDir(), false /* haveBordersForWholeWorld */);
 
   // We convert GTFS feeds to the json format suitable for generator_tool and save it to the
   // corresponding directory.
-  if (!FLAGS_path_gtfs_feeds.empty() &&
-      !ConvertFeeds(generator, generatorEdges, colorPicker, mwmMatcher))
+  if (!FLAGS_path_gtfs_feeds.empty() && !ConvertFeeds(generator, generatorEdges, colorPicker, mwmMatcher))
     return EXIT_FAILURE;
 
   // We mixin data in our "old transit" (in fact subway-only) json format to the resulting files
@@ -318,8 +311,7 @@ int main(int argc, char ** argv)
   // experimental transit section. We use the same id |generator| so ids of subway and GTFS
   // itineraries will not conflict.
   if (!FLAGS_path_subway_json.empty() &&
-      !ConvertSubway(generator, generatorEdges, colorPicker, mwmMatcher,
-                     FLAGS_path_gtfs_feeds.empty() /* overwrite */))
+      !ConvertSubway(generator, generatorEdges, colorPicker, mwmMatcher, FLAGS_path_gtfs_feeds.empty() /* overwrite */))
   {
     return EXIT_FAILURE;
   }
diff --git a/libs/transit/world_feed/subway_converter.cpp b/libs/transit/world_feed/subway_converter.cpp
index 5ddd4ebcd..d19eceae1 100644
--- a/libs/transit/world_feed/subway_converter.cpp
+++ b/libs/transit/world_feed/subway_converter.cpp
@@ -36,8 +36,8 @@ void ShiftSegmentOnShape(transit::LineSegment & lineSegment, transit::ShapeLink
 }
 
 // Returns segment edge points on the polyline.
-std::pair<m2::PointD, m2::PointD> GetSegmentEdgesOnPolyline(
-    std::vector<m2::PointD> const & polyline, transit::LineSegment const & segment)
+std::pair<m2::PointD, m2::PointD> GetSegmentEdgesOnPolyline(std::vector<m2::PointD> const & polyline,
+                                                            transit::LineSegment const & segment)
 {
   CHECK_GREATER(polyline.size(), std::max(segment.m_startIdx, segment.m_endIdx), ());
 
@@ -63,12 +63,10 @@ void UpdateReversedSegmentIndexes(transit::LineSegment & segment, size_t polylin
 }
 }  // namespace
 
-
-
 SubwayConverter::SubwayConverter(std::string const & subwayJson, WorldFeed & feed)
-  : m_subwayJson(subwayJson), m_feed(feed)
-{
-}
+  : m_subwayJson(subwayJson)
+  , m_feed(feed)
+{}
 
 bool SubwayConverter::Convert()
 {
@@ -120,8 +118,7 @@ bool SubwayConverter::ConvertNetworks()
     m_feed.m_networks.m_data.emplace(networkId, networkSubway.GetTitle());
   }
 
-  LOG(LINFO,
-      ("Converted", m_feed.m_networks.m_data.size(), "networks from subways to public transport."));
+  LOG(LINFO, ("Converted", m_feed.m_networks.m_data.size(), "networks from subways to public transport."));
 
   return !m_feed.m_networks.m_data.empty();
 }
@@ -143,13 +140,12 @@ bool SubwayConverter::SplitEdges()
   return !m_edgesSubway.empty() && !m_edgesTransferSubway.empty();
 }
 
-std::pair<TransitId, RouteData> SubwayConverter::MakeRoute(
-    routing::transit::Line const & lineSubway)
+std::pair<TransitId, RouteData> SubwayConverter::MakeRoute(routing::transit::Line const & lineSubway)
 {
   uint32_t routeSubwayId = GetSubwayRouteId(lineSubway.GetId());
 
-  std::string const routeHash = BuildHash(kHashPrefix, std::to_string(lineSubway.GetNetworkId()),
-                                          std::to_string(routeSubwayId));
+  std::string const routeHash =
+      BuildHash(kHashPrefix, std::to_string(lineSubway.GetNetworkId()), std::to_string(routeSubwayId));
 
   TransitId const routeId = m_feed.m_idGenerator.MakeId(routeHash);
 
@@ -165,8 +161,7 @@ std::pair<TransitId, RouteData> SubwayConverter::MakeRoute(
 std::pair<TransitId, GateData> SubwayConverter::MakeGate(routing::transit::Gate const & gateSubway)
 {
   // This id is used only for storing gates in gtfs_converter tool. It is not saved to json.
-  TransitId const gateId =
-      m_feed.m_idGenerator.MakeId(BuildHash(kHashPrefix, std::to_string(gateSubway.GetOsmId())));
+  TransitId const gateId = m_feed.m_idGenerator.MakeId(BuildHash(kHashPrefix, std::to_string(gateSubway.GetOsmId())));
   GateData gateData;
 
   gateData.m_isEntrance = gateSubway.GetEntrance();
@@ -176,15 +171,14 @@ std::pair<TransitId, GateData> SubwayConverter::MakeGate(routing::transit::Gate
 
   for (auto stopIdSubway : gateSubway.GetStopIds())
   {
-    gateData.m_weights.emplace_back(TimeFromGateToStop(m_stopIdMapping[stopIdSubway] /* stopId */,
-                                                       gateSubway.GetWeight() /* timeSeconds */));
+    gateData.m_weights.emplace_back(
+        TimeFromGateToStop(m_stopIdMapping[stopIdSubway] /* stopId */, gateSubway.GetWeight() /* timeSeconds */));
   }
 
   return {gateId, gateData};
 }
 
-std::pair<TransitId, TransferData> SubwayConverter::MakeTransfer(
-    routing::transit::Transfer const & transferSubway)
+std::pair<TransitId, TransferData> SubwayConverter::MakeTransfer(routing::transit::Transfer const & transferSubway)
 {
   TransitId const transferId =
       m_feed.m_idGenerator.MakeId(BuildHash(kHashPrefix, std::to_string(transferSubway.GetId())));
@@ -198,8 +192,7 @@ std::pair<TransitId, TransferData> SubwayConverter::MakeTransfer(
   return {transferId, transferData};
 }
 
-std::pair<TransitId, LineData> SubwayConverter::MakeLine(routing::transit::Line const & lineSubway,
-                                                         TransitId routeId)
+std::pair<TransitId, LineData> SubwayConverter::MakeLine(routing::transit::Line const & lineSubway, TransitId routeId)
 {
   TransitId const lineId = lineSubway.GetId();
   CHECK(!routing::FakeFeatureIds::IsTransitFeature(lineId), (lineId));
@@ -212,12 +205,10 @@ std::pair<TransitId, LineData> SubwayConverter::MakeLine(routing::transit::Line
   return {lineId, lineData};
 }
 
-std::pair<EdgeId, EdgeData> SubwayConverter::MakeEdge(routing::transit::Edge const & edgeSubway,
-                                                      uint32_t index)
+std::pair<EdgeId, EdgeData> SubwayConverter::MakeEdge(routing::transit::Edge const & edgeSubway, uint32_t index)
 {
   auto const lineId = edgeSubway.GetLineId();
-  EdgeId const edgeId(m_stopIdMapping[edgeSubway.GetStop1Id()],
-                      m_stopIdMapping[edgeSubway.GetStop2Id()], lineId);
+  EdgeId const edgeId(m_stopIdMapping[edgeSubway.GetStop1Id()], m_stopIdMapping[edgeSubway.GetStop2Id()], lineId);
   EdgeData edgeData;
   edgeData.m_weight = edgeSubway.GetWeight();
   edgeData.m_featureId = index;
@@ -229,8 +220,8 @@ std::pair<EdgeId, EdgeData> SubwayConverter::MakeEdge(routing::transit::Edge con
   return {edgeId, edgeData};
 }
 
-std::pair<EdgeTransferId, EdgeData> SubwayConverter::MakeEdgeTransfer(
-    routing::transit::Edge const & edgeSubway, uint32_t index)
+std::pair<EdgeTransferId, EdgeData> SubwayConverter::MakeEdgeTransfer(routing::transit::Edge const & edgeSubway,
+                                                                      uint32_t index)
 {
   EdgeTransferId const edgeTransferId(m_stopIdMapping[edgeSubway.GetStop1Id()] /* fromStopId */,
                                       m_stopIdMapping[edgeSubway.GetStop2Id()] /* toStopId */);
@@ -270,8 +261,8 @@ bool SubwayConverter::ConvertLinesBasedData()
 
     auto [lineId, lineData] = MakeLine(lineSubway, routeId);
 
-    TransitId const shapeId = m_feed.m_idGenerator.MakeId(
-        BuildHash(kHashPrefix, std::string("shape"), std::to_string(lineId)));
+    TransitId const shapeId =
+        m_feed.m_idGenerator.MakeId(BuildHash(kHashPrefix, std::string("shape"), std::to_string(lineId)));
     lineData.m_shapeId = shapeId;
 
     ShapeData shapeData;
@@ -342,8 +333,8 @@ bool SubwayConverter::ConvertLinesBasedData()
       if (inserted)
       {
         itEdgeOnShape->second.push_back(edgePoints);
-        LOG(LWARNING, ("Edge duplicate in subways. stop1_id", stopIdSubwayPrev, "stop2_id",
-                       stopIdSubway, "line_id", lineId));
+        LOG(LWARNING,
+            ("Edge duplicate in subways. stop1_id", stopIdSubwayPrev, "stop2_id", stopIdSubway, "line_id", lineId));
       }
     }
 
@@ -351,8 +342,7 @@ bool SubwayConverter::ConvertLinesBasedData()
     m_feed.m_shapes.m_data.emplace(shapeId, shapeData);
   }
 
-  LOG(LDEBUG, ("Converted", m_feed.m_routes.m_data.size(), "routes,", m_feed.m_lines.m_data.size(),
-               "lines."));
+  LOG(LDEBUG, ("Converted", m_feed.m_routes.m_data.size(), "routes,", m_feed.m_lines.m_data.size(), "lines."));
 
   return !m_feed.m_lines.m_data.empty();
 }
@@ -384,10 +374,8 @@ bool SubwayConverter::ConvertTransfers()
     for (auto const & stopId : transferData.m_stopsIds)
     {
       for (auto const & [lineId, lineData] : m_feed.m_lines.m_data)
-      {
         if (base::IsExist(lineData.m_stopIds, stopId))
           routeToStops[lineData.m_routeId].insert(stopId);
-      }
     }
 
     // We don't count as transfers transfer points between lines on the same route, so we skip them.
@@ -463,8 +451,7 @@ void SubwayConverter::MinimizeReversedLinesCount()
       if (revStopIds == lineDataStraight.m_stopIds)
       {
         lineData.m_shapeLink = lineDataStraight.m_shapeLink;
-        LOG(LDEBUG, ("Reversed line", lineId, "to line", lineIdStraight, "shapeLink",
-                     lineData.m_shapeLink));
+        LOG(LDEBUG, ("Reversed line", lineId, "to line", lineIdStraight, "shapeLink", lineData.m_shapeLink));
         reversed = true;
         break;
       }
@@ -519,19 +506,15 @@ std::vector<LineSchemeData> SubwayConverter::GetLinesOnScheme(
         continue;
 
       // New shape link is fully included into the existing one.
-      if (shapeLink.m_startIndex <= newShapeLink.m_startIndex &&
-          shapeLink.m_endIndex >= newShapeLink.m_endIndex)
+      if (shapeLink.m_startIndex <= newShapeLink.m_startIndex && shapeLink.m_endIndex >= newShapeLink.m_endIndex)
       {
         insert = false;
         continue;
       }
 
       // Existing shape link is fully included into the new one. It should be removed.
-      if (newShapeLink.m_startIndex <= shapeLink.m_startIndex &&
-          newShapeLink.m_endIndex >= shapeLink.m_endIndex)
-      {
+      if (newShapeLink.m_startIndex <= shapeLink.m_startIndex && newShapeLink.m_endIndex >= shapeLink.m_endIndex)
         linksForRemoval.push_back(shapeLink);
-      }
     }
 
     for (auto const & sl : linksForRemoval)
@@ -570,10 +553,8 @@ enum class LineSegmentState
 struct LineSegmentInfo
 {
   LineSegmentInfo() = default;
-  LineSegmentInfo(LineSegmentState const & state, bool codirectional)
-    : m_state(state), m_codirectional(codirectional)
-  {
-  }
+  LineSegmentInfo(LineSegmentState const & state, bool codirectional) : m_state(state), m_codirectional(codirectional)
+  {}
 
   LineSegmentState m_state = LineSegmentState::Start;
   bool m_codirectional = false;
@@ -594,16 +575,13 @@ bool Equal(LineGeometry const & line1, LineGeometry const & line2)
     return false;
 
   for (size_t i = 0; i < line1.size(); ++i)
-  {
     if (!AlmostEqualAbs(line1[i], line2[i], kEps))
       return false;
-  }
 
   return true;
 }
 
-bool AddToCache(std::string const & color, LineGeometry const & linePart,
-                ColorToLinepartsCache & cache)
+bool AddToCache(std::string const & color, LineGeometry const & linePart, ColorToLinepartsCache & cache)
 {
   auto [it, inserted] = cache.emplace(color, std::vector<LineGeometry>());
 
@@ -616,10 +594,8 @@ bool AddToCache(std::string const & color, LineGeometry const & linePart,
   std::vector<m2::PointD> linePartRev = GetReversed(linePart);
 
   for (LineGeometry const & cachedPart : it->second)
-  {
     if (Equal(cachedPart, linePart) || Equal(cachedPart, linePartRev))
       return false;
-  }
 
   it->second.push_back(linePart);
   return true;
@@ -643,13 +619,10 @@ void SubwayConverter::CalculateLinePriorities(std::vector<LineSchemeData> const
 
       for (auto const & [parallelLineId, parallelFirstPoint] : linePart.m_commonLines)
       {
-        bool const codirectional =
-            AlmostEqualAbs(linePart.m_firstPoint, parallelFirstPoint, kEps);
+        bool const codirectional = AlmostEqualAbs(linePart.m_firstPoint, parallelFirstPoint, kEps);
 
-        startPointState.parallelLineStates[parallelLineId] =
-            LineSegmentInfo(LineSegmentState::Start, codirectional);
-        endPointState.parallelLineStates[parallelLineId] =
-            LineSegmentInfo(LineSegmentState::Finish, codirectional);
+        startPointState.parallelLineStates[parallelLineId] = LineSegmentInfo(LineSegmentState::Start, codirectional);
+        endPointState.parallelLineStates[parallelLineId] = LineSegmentInfo(LineSegmentState::Finish, codirectional);
       }
     }
 
@@ -705,14 +678,11 @@ void SubwayConverter::CalculateLinePriorities(std::vector<LineSchemeData> const
       }
 
       LineSegmentOrder lso;
-      lso.m_segment =
-          LineSegment(static_cast<uint32_t>(startIndex), static_cast<uint32_t>(endIndex));
+      lso.m_segment = LineSegment(static_cast<uint32_t>(startIndex), static_cast<uint32_t>(endIndex));
 
-      auto const & polyline =
-          m_feed.m_shapes.m_data.at(lineSchemeData.m_shapeLink.m_shapeId).m_points;
+      auto const & polyline = m_feed.m_shapes.m_data.at(lineSchemeData.m_shapeLink.m_shapeId).m_points;
 
-      if (!AddToCache(color,
-                      GetPolylinePart(polyline, lso.m_segment.m_startIdx, lso.m_segment.m_endIdx),
+      if (!AddToCache(color, GetPolylinePart(polyline, lso.m_segment.m_startIdx, lso.m_segment.m_endIdx),
                       routeSegmentsCache))
       {
         continue;
@@ -735,10 +705,9 @@ void SubwayConverter::CalculateLinePriorities(std::vector<LineSchemeData> const
 
       m_feed.m_linesMetadata.m_data[lineId].push_back(lso);
 
-      LOG(LINFO,
-          ("routeId", routeId, "lineId", lineId, "start", startIndex, "end", endIndex, "len",
-           endIndex - startIndex + 1, "order", lso.m_order, "index", index, "reversed", reversed,
-           "|| lines count:", parallelLines.size(), "colors count:", colors.size()));
+      LOG(LINFO, ("routeId", routeId, "lineId", lineId, "start", startIndex, "end", endIndex, "len",
+                  endIndex - startIndex + 1, "order", lso.m_order, "index", index, "reversed", reversed,
+                  "|| lines count:", parallelLines.size(), "colors count:", colors.size()));
     }
   }
 }
@@ -757,9 +726,8 @@ void SubwayConverter::PrepareLinesMetadata()
       auto const & shapeLink1 = linesInRegion.at(line1.m_lineId).m_shapeLink;
 
       // |polyline1| is sub-polyline of the shapeLink1 geometry.
-      auto const polyline1 =
-          GetPolylinePart(m_feed.m_shapes.m_data.at(shapeLink1.m_shapeId).m_points,
-                          shapeLink1.m_startIndex, shapeLink1.m_endIndex);
+      auto const polyline1 = GetPolylinePart(m_feed.m_shapes.m_data.at(shapeLink1.m_shapeId).m_points,
+                                             shapeLink1.m_startIndex, shapeLink1.m_endIndex);
 
       for (size_t j = i + 1; j < linesOnScheme.size(); ++j)
       {
@@ -771,9 +739,8 @@ void SubwayConverter::PrepareLinesMetadata()
           CHECK_LESS(shapeLink1.m_startIndex, shapeLink1.m_endIndex, ());
           CHECK_LESS(shapeLink2.m_startIndex, shapeLink2.m_endIndex, ());
 
-          std::optional<LineSegment> inter =
-              GetIntersection(shapeLink1.m_startIndex, shapeLink1.m_endIndex,
-                              shapeLink2.m_startIndex, shapeLink2.m_endIndex);
+          std::optional<LineSegment> inter = GetIntersection(shapeLink1.m_startIndex, shapeLink1.m_endIndex,
+                                                             shapeLink2.m_startIndex, shapeLink2.m_endIndex);
 
           if (inter != std::nullopt)
           {
@@ -798,33 +765,26 @@ void SubwayConverter::PrepareLinesMetadata()
             std::tie(segments1, segments2) = FindIntersections(polyline1, polyline2Rev);
 
             if (!segments1.empty())
-            {
               for (auto & seg : segments2)
                 UpdateReversedSegmentIndexes(seg, polyline2.size());
-            }
           }
 
           if (!segments1.empty())
           {
             for (size_t k = 0; k < segments1.size(); ++k)
             {
-              auto const & [startPoint1, endPoint1] =
-                  GetSegmentEdgesOnPolyline(polyline1, segments1[k]);
-              auto const & [startPoint2, endPoint2] =
-                  GetSegmentEdgesOnPolyline(polyline2, segments2[k]);
+              auto const & [startPoint1, endPoint1] = GetSegmentEdgesOnPolyline(polyline1, segments1[k]);
+              auto const & [startPoint2, endPoint2] = GetSegmentEdgesOnPolyline(polyline2, segments2[k]);
 
-              CHECK((AlmostEqualAbs(startPoint1, startPoint2, kEps) &&
-                     AlmostEqualAbs(endPoint1, endPoint2, kEps)) ||
-                    (AlmostEqualAbs(startPoint1, endPoint2, kEps) &&
-                     AlmostEqualAbs(endPoint1, startPoint2, kEps)), ());
+              CHECK((AlmostEqualAbs(startPoint1, startPoint2, kEps) && AlmostEqualAbs(endPoint1, endPoint2, kEps)) ||
+                        (AlmostEqualAbs(startPoint1, endPoint2, kEps) && AlmostEqualAbs(endPoint1, startPoint2, kEps)),
+                    ());
 
               ShiftSegmentOnShape(segments1[k], shapeLink1);
               ShiftSegmentOnShape(segments2[k], shapeLink2);
 
-              UpdateLinePart(line1.m_lineParts, segments1[k], startPoint1, line2.m_lineId,
-                             startPoint2);
-              UpdateLinePart(line2.m_lineParts, segments2[k], startPoint2, line1.m_lineId,
-                             startPoint1);
+              UpdateLinePart(line1.m_lineParts, segments1[k], startPoint1, line2.m_lineId, startPoint2);
+              UpdateLinePart(line2.m_lineParts, segments2[k], startPoint2, line1.m_lineId, startPoint1);
             }
           }
         }
@@ -836,12 +796,10 @@ void SubwayConverter::PrepareLinesMetadata()
   }
 }
 
-routing::transit::Edge SubwayConverter::FindEdge(routing::transit::StopId stop1Id,
-                                                 routing::transit::StopId stop2Id,
+routing::transit::Edge SubwayConverter::FindEdge(routing::transit::StopId stop1Id, routing::transit::StopId stop2Id,
                                                  routing::transit::LineId lineId) const
 {
-  routing::transit::Edge edge(stop1Id, stop2Id, 0 /* weight */, lineId, false /* transfer */,
-                              {} /* shapeIds */);
+  routing::transit::Edge edge(stop1Id, stop2Id, 0 /* weight */, lineId, false /* transfer */, {} /* shapeIds */);
 
   auto const itEdge = m_edgesSubway.find(edge);
 
diff --git a/libs/transit/world_feed/subway_converter.hpp b/libs/transit/world_feed/subway_converter.hpp
index e57cab0e4..befcdd16a 100644
--- a/libs/transit/world_feed/subway_converter.hpp
+++ b/libs/transit/world_feed/subway_converter.hpp
@@ -63,17 +63,13 @@ private:
   // Methods for creating id & data pairs for |m_feed| based on the subway items.
   std::pair<TransitId, RouteData> MakeRoute(routing::transit::Line const & lineSubway);
   std::pair<TransitId, GateData> MakeGate(routing::transit::Gate const & gateSubway);
-  std::pair<TransitId, TransferData> MakeTransfer(
-      routing::transit::Transfer const & transferSubway);
-  static std::pair<TransitId, LineData> MakeLine(routing::transit::Line const & lineSubway,
-                                                 TransitId routeId);
+  std::pair<TransitId, TransferData> MakeTransfer(routing::transit::Transfer const & transferSubway);
+  static std::pair<TransitId, LineData> MakeLine(routing::transit::Line const & lineSubway, TransitId routeId);
   std::pair<EdgeId, EdgeData> MakeEdge(routing::transit::Edge const & edgeSubway, uint32_t index);
-  std::pair<EdgeTransferId, EdgeData> MakeEdgeTransfer(routing::transit::Edge const & edgeSubway,
-                                                       uint32_t index);
+  std::pair<EdgeTransferId, EdgeData> MakeEdgeTransfer(routing::transit::Edge const & edgeSubway, uint32_t index);
   std::pair<TransitId, StopData> MakeStop(routing::transit::Stop const & stopSubway);
 
-  routing::transit::Edge FindEdge(routing::transit::StopId stop1Id,
-                                  routing::transit::StopId stop2Id,
+  routing::transit::Edge FindEdge(routing::transit::StopId stop1Id, routing::transit::StopId stop2Id,
                                   routing::transit::LineId lineId) const;
 
   // Path to the file with subways json.
diff --git a/libs/transit/world_feed/world_feed.cpp b/libs/transit/world_feed/world_feed.cpp
index 524f9109f..49d488ce9 100644
--- a/libs/transit/world_feed/world_feed.cpp
+++ b/libs/transit/world_feed/world_feed.cpp
@@ -2,8 +2,8 @@
 
 #include "transit/transit_entities.hpp"
 
-#include "platform/platform.hpp"
 #include "platform/measurement_utils.hpp"
+#include "platform/platform.hpp"
 
 #include "coding/string_utf8_multilang.hpp"
 
@@ -41,27 +41,22 @@ void AddToRegions(C & container, ID const & id, transit::Regions const & regions
 }
 
 template <class C, class ID, class S>
-transit::Regions AddToRegions(C & container, S const & splitter, ID const & id,
-                              m2::PointD const & point)
+transit::Regions AddToRegions(C & container, S const & splitter, ID const & id, m2::PointD const & point)
 {
   auto const & regions = splitter.GetAffiliations(point);
-  CHECK_LESS_OR_EQUAL(
-      regions.size(), 1,
-      ("Point", mercator::ToLatLon(point), "belongs to multiple regions:", regions));
+  CHECK_LESS_OR_EQUAL(regions.size(), 1, ("Point", mercator::ToLatLon(point), "belongs to multiple regions:", regions));
 
   AddToRegions(container, id, regions);
   return regions;
 }
 
 template <class C>
-void AddToRegionsIfMatches(C & container, transit::TransitId idForAdd,
-                           transit::IdsInRegion const & stopsInRegion, transit::TransitId stopId)
+void AddToRegionsIfMatches(C & container, transit::TransitId idForAdd, transit::IdsInRegion const & stopsInRegion,
+                           transit::TransitId stopId)
 {
   for (auto const & [region, stopIds] : stopsInRegion)
-  {
     if (stopIds.find(stopId) != stopIds.end())
       container[region].emplace(idForAdd);
-  }
 }
 
 void WriteJson(json_t * node, std::ofstream & output)
@@ -88,8 +83,7 @@ base::JSONPtr ShapeLinkToJson(transit::ShapeLink const & shapeLink)
   return node;
 }
 
-base::JSONPtr FrequenciesToJson(
-    std::map<::transit::TimeInterval, ::transit::Frequency> const & frequencyIntervals)
+base::JSONPtr FrequenciesToJson(std::map<::transit::TimeInterval, ::transit::Frequency> const & frequencyIntervals)
 {
   auto timeIntervalsArr = base::NewJSONArray();
 
@@ -206,9 +200,8 @@ struct StopOnShape
   size_t m_index = 0;
 };
 
-std::optional<size_t> GetStopIndex(
-    std::unordered_map<transit::TransitId, std::vector<size_t>> const & stopIndexes,
-    transit::TransitId id, size_t fromIndex, transit::Direction direction)
+std::optional<size_t> GetStopIndex(std::unordered_map<transit::TransitId, std::vector<size_t>> const & stopIndexes,
+                                   transit::TransitId id, size_t fromIndex, transit::Direction direction)
 {
   auto it = stopIndexes.find(id);
   CHECK(it != stopIndexes.end(), (id));
@@ -216,11 +209,9 @@ std::optional<size_t> GetStopIndex(
   std::optional<size_t> bestIdx;
   for (auto const & index : it->second)
   {
-    if (direction == transit::Direction::Forward && index >= fromIndex &&
-        (!bestIdx || index < bestIdx))
+    if (direction == transit::Direction::Forward && index >= fromIndex && (!bestIdx || index < bestIdx))
       bestIdx = index;
-    if (direction == transit::Direction::Backward && index <= fromIndex &&
-        (!bestIdx || index > bestIdx))
+    if (direction == transit::Direction::Backward && index <= fromIndex && (!bestIdx || index > bestIdx))
       bestIdx = index;
   }
   return bestIdx;
@@ -228,8 +219,7 @@ std::optional<size_t> GetStopIndex(
 
 std::optional<std::pair<StopOnShape, StopOnShape>> GetStopPairOnShape(
     std::unordered_map<transit::TransitId, std::vector<size_t>> const & stopIndexes,
-    transit::StopsOnLines const & stopsOnLines, size_t index, size_t fromIndex,
-    transit::Direction direction)
+    transit::StopsOnLines const & stopsOnLines, size_t index, size_t fromIndex, transit::Direction direction)
 {
   auto const & stopIds = stopsOnLines.m_stopSeq;
 
@@ -265,9 +255,10 @@ struct Link
 };
 
 Link::Link(transit::TransitId lineId, transit::TransitId shapeId, size_t shapeSize)
-  : m_lineId(lineId), m_shapeId(shapeId), m_shapeSize(shapeSize)
-{
-}
+  : m_lineId(lineId)
+  , m_shapeId(shapeId)
+  , m_shapeSize(shapeSize)
+{}
 }  // namespace
 
 namespace transit
@@ -276,9 +267,9 @@ namespace transit
 std::unordered_set<std::string> WorldFeed::m_agencyHashes;
 
 EdgeTransferId::EdgeTransferId(TransitId fromStopId, TransitId toStopId)
-  : m_fromStopId(fromStopId), m_toStopId(toStopId)
-{
-}
+  : m_fromStopId(fromStopId)
+  , m_toStopId(toStopId)
+{}
 
 bool EdgeTransferId::operator==(EdgeTransferId const & other) const
 {
@@ -343,7 +334,7 @@ IdGenerator::IdGenerator(std::string const & idMappingPath) : m_idMappingPath(id
   LOG(LINFO, ("Loaded", m_hashToId.size(), "hash-to-id mappings. Current free id:", m_curId));
 }
 
-TransitId IdGenerator::MakeId(const std::string & hash)
+TransitId IdGenerator::MakeId(std::string const & hash)
 {
   CHECK(!hash.empty(), ("Empty hash cannot be added to the mapping."));
 
@@ -402,18 +393,17 @@ void StopData::UpdateTimetable(TransitId lineId, gtfs::StopTime const & stopTime
     it->second.push_back(timeInterval);
 }
 
-WorldFeed::WorldFeed(IdGenerator & generator, IdGenerator & generatorEdges,
-                     ColorPicker & colorPicker, feature::CountriesFilesAffiliation & mwmMatcher)
+WorldFeed::WorldFeed(IdGenerator & generator, IdGenerator & generatorEdges, ColorPicker & colorPicker,
+                     feature::CountriesFilesAffiliation & mwmMatcher)
   : m_idGenerator(generator)
   , m_idGeneratorEdges(generatorEdges)
   , m_colorPicker(colorPicker)
   , m_affiliation(mwmMatcher)
-{
-}
+{}
 
 bool WorldFeed::FillNetworks()
 {
-  for (const auto & agency : m_feed.get_agencies())
+  for (auto const & agency : m_feed.get_agencies())
   {
     // For one agency_name there can be multiple agency_id in the same feed.
     std::string const agencyHash = BuildHash(agency.agency_id, agency.agency_name);
@@ -446,7 +436,7 @@ bool WorldFeed::FillNetworks()
 
 bool WorldFeed::FillRoutes()
 {
-  for (const auto & route : m_feed.get_routes())
+  for (auto const & route : m_feed.get_routes())
   {
     // Filters irrelevant types, e.g. taxi, subway.
     if (!IsRelevantType(route.route_type))
@@ -508,8 +498,7 @@ bool WorldFeed::SetFeedLanguage()
   return false;
 }
 
-void WorldFeed::AddShape(GtfsIdToHash::iterator & iter, gtfs::Shape const & shapeItems,
-                         TransitId lineId)
+void WorldFeed::AddShape(GtfsIdToHash::iterator & iter, gtfs::Shape const & shapeItems, TransitId lineId)
 {
   std::string const shapeHash = BuildHash(m_gtfsHash, shapeItems[0].shape_id);
   iter->second = shapeHash;
@@ -532,8 +521,8 @@ void WorldFeed::AddShape(GtfsIdToHash::iterator & iter, gtfs::Shape const & shap
   it->second.m_lineIds.insert(lineId);
 }
 
-bool WorldFeed::UpdateStop(TransitId stopId, gtfs::StopTime const & stopTime,
-                           std::string const & stopHash, TransitId lineId)
+bool WorldFeed::UpdateStop(TransitId stopId, gtfs::StopTime const & stopTime, std::string const & stopHash,
+                           TransitId lineId)
 {
   auto [it, inserted] = m_stops.m_data.emplace(stopId, StopData());
 
@@ -574,9 +563,8 @@ std::pair<TransitId, std::string> WorldFeed::GetStopIdAndHash(std::string const
 bool WorldFeed::FillStopsEdges()
 {
   gtfs::StopTimes allStopTimes = m_feed.get_stop_times();
-  std::sort(
-      allStopTimes.begin(), allStopTimes.end(),
-      [](const gtfs::StopTime & t1, const gtfs::StopTime & t2) { return t1.trip_id < t2.trip_id; });
+  std::sort(allStopTimes.begin(), allStopTimes.end(),
+            [](gtfs::StopTime const & t1, gtfs::StopTime const & t2) { return t1.trip_id < t2.trip_id; });
 
   std::vector<std::unordered_map<TransitId, LineData>::iterator> linesForRemoval;
 
@@ -619,19 +607,16 @@ bool WorldFeed::FillStopsEdges()
           return false;
       }
 
-      std::string const edgeHash =
-          BuildHash(std::to_string(lineId), std::to_string(stop1Id), std::to_string(stop2Id));
+      std::string const edgeHash = BuildHash(std::to_string(lineId), std::to_string(stop1Id), std::to_string(stop2Id));
       EdgeData data;
       data.m_featureId = m_idGeneratorEdges.MakeId(edgeHash);
       data.m_shapeLink.m_shapeId = shapeId;
-      data.m_weight =
-          static_cast<transit::EdgeWeight>(stopTime2.arrival_time.get_total_seconds() -
-                                           stopTime1.departure_time.get_total_seconds());
+      data.m_weight = static_cast<transit::EdgeWeight>(stopTime2.arrival_time.get_total_seconds() -
+                                                       stopTime1.departure_time.get_total_seconds());
 
       if (data.m_weight == 0)
       {
-        double const distBetweenStopsM =
-            stopTime2.shape_dist_traveled - stopTime1.shape_dist_traveled;
+        double const distBetweenStopsM = stopTime2.shape_dist_traveled - stopTime1.shape_dist_traveled;
         if (distBetweenStopsM > 0)
           data.m_weight = std::ceil(distBetweenStopsM / kAvgTransitSpeedMpS);
       }
@@ -660,30 +645,22 @@ bool WorldFeed::FillStopsEdges()
 bool WorldFeed::FillLinesAndShapes()
 {
   std::unordered_map<gtfs::Id, gtfs::Shape> shapes;
-  for (const auto & shape : m_feed.get_shapes())
+  for (auto const & shape : m_feed.get_shapes())
     shapes[shape.shape_id].emplace_back(shape);
 
   for (auto & shape : shapes)
-  {
-    std::sort(shape.second.begin(), shape.second.end(),
-              base::LessBy(&gtfs::ShapePoint::shape_pt_sequence));
-  }
+    std::sort(shape.second.begin(), shape.second.end(), base::LessBy(&gtfs::ShapePoint::shape_pt_sequence));
 
-  auto const getShape = [&shapes](gtfs::Id const & gtfsShapeId) -> gtfs::Shape const & {
-    return shapes[gtfsShapeId];
-  };
+  auto const getShape = [&shapes](gtfs::Id const & gtfsShapeId) -> gtfs::Shape const & { return shapes[gtfsShapeId]; };
 
   std::unordered_map<gtfs::Id, gtfs::StopTimes> stopTimes;
-  for (const auto & stop_time : m_feed.get_stop_times())
+  for (auto const & stop_time : m_feed.get_stop_times())
     stopTimes[stop_time.trip_id].emplace_back(stop_time);
 
   for (auto & stop_time : stopTimes)
-  {
-    std::sort(stop_time.second.begin(), stop_time.second.end(),
-              base::LessBy(&gtfs::StopTime::stop_sequence));
-  }
+    std::sort(stop_time.second.begin(), stop_time.second.end(), base::LessBy(&gtfs::StopTime::stop_sequence));
 
-  for (const auto & trip : m_feed.get_trips())
+  for (auto const & trip : m_feed.get_trips())
   {
     // We skip routes filtered on the route preparation stage.
     auto const itRoute = m_gtfsIdToHash[FieldIdx::RoutesIdx].find(trip.route_id);
@@ -753,16 +730,12 @@ void WorldFeed::ModifyLinesAndShapes()
   links.reserve(m_lines.m_data.size());
 
   for (auto const & [lineId, lineData] : m_lines.m_data)
-  {
-    links.emplace_back(lineId, lineData.m_shapeId,
-                       m_shapes.m_data[lineData.m_shapeId].m_points.size());
-  }
+    links.emplace_back(lineId, lineData.m_shapeId, m_shapes.m_data[lineData.m_shapeId].m_points.size());
 
   // We sort links by shape length so we could search for shapes in which i-th shape is included
   // only in the left part of the array [0, i).
-  std::sort(links.begin(), links.end(), [](Link const & link1, Link const & link2) {
-    return link1.m_shapeSize > link2.m_shapeSize;
-  });
+  std::sort(links.begin(), links.end(),
+            [](Link const & link1, Link const & link2) { return link1.m_shapeSize > link2.m_shapeSize; });
 
   size_t subShapesCount = 0;
 
@@ -807,13 +780,13 @@ void WorldFeed::ModifyLinesAndShapes()
 
       auto const & pointsHaystack = m_shapes.m_data[shapeIdHaystack].m_points;
 
-      auto const it = std::search(pointsHaystack.begin(), pointsHaystack.end(),
-                                  pointsNeedle.begin(), pointsNeedle.end());
+      auto const it =
+          std::search(pointsHaystack.begin(), pointsHaystack.end(), pointsNeedle.begin(), pointsNeedle.end());
 
       if (it == pointsHaystack.end())
       {
-        auto const itRev = std::search(pointsHaystack.begin(), pointsHaystack.end(),
-                                       pointsNeedleRev.begin(), pointsNeedleRev.end());
+        auto const itRev =
+            std::search(pointsHaystack.begin(), pointsHaystack.end(), pointsNeedleRev.begin(), pointsNeedleRev.end());
         if (itRev == pointsHaystack.end())
           continue;
 
@@ -821,10 +794,9 @@ void WorldFeed::ModifyLinesAndShapes()
         // |pointsHaystack| polyline.
         lineDataNeedle.m_shapeId = 0;
         lineDataNeedle.m_shapeLink.m_shapeId = shapeIdHaystack;
-        lineDataNeedle.m_shapeLink.m_endIndex =
-            static_cast<uint32_t>(std::distance(pointsHaystack.begin(), itRev));
-        lineDataNeedle.m_shapeLink.m_startIndex = static_cast<uint32_t>(
-            lineDataNeedle.m_shapeLink.m_endIndex + pointsNeedleRev.size() - 1);
+        lineDataNeedle.m_shapeLink.m_endIndex = static_cast<uint32_t>(std::distance(pointsHaystack.begin(), itRev));
+        lineDataNeedle.m_shapeLink.m_startIndex =
+            static_cast<uint32_t>(lineDataNeedle.m_shapeLink.m_endIndex + pointsNeedleRev.size() - 1);
 
         itCache->second = lineIdNeedle;
         shapesForRemoval.insert(shapeIdNeedle);
@@ -835,8 +807,7 @@ void WorldFeed::ModifyLinesAndShapes()
       // Shape with |pointsNeedle| polyline is fully contained in the shape |pointsHaystack|.
       lineDataNeedle.m_shapeId = 0;
       lineDataNeedle.m_shapeLink.m_shapeId = shapeIdHaystack;
-      lineDataNeedle.m_shapeLink.m_startIndex =
-          static_cast<uint32_t>(std::distance(pointsHaystack.begin(), it));
+      lineDataNeedle.m_shapeLink.m_startIndex = static_cast<uint32_t>(std::distance(pointsHaystack.begin(), it));
 
       CHECK_GREATER_OR_EQUAL(pointsNeedle.size(), 2, ());
 
@@ -860,8 +831,7 @@ void WorldFeed::ModifyLinesAndShapes()
 
     CHECK_GREATER_OR_EQUAL(m_shapes.m_data[lineData.m_shapeId].m_points.size(), 2, ());
 
-    lineData.m_shapeLink.m_endIndex =
-        static_cast<uint32_t>(m_shapes.m_data[lineData.m_shapeId].m_points.size() - 1);
+    lineData.m_shapeLink.m_endIndex = static_cast<uint32_t>(m_shapes.m_data[lineData.m_shapeId].m_points.size() - 1);
 
     lineData.m_shapeId = 0;
   }
@@ -882,8 +852,7 @@ void WorldFeed::FillLinesSchedule()
     for (auto const & serviceId : lineData.m_gtfsServiceIds)
     {
       for (auto const & dateException : m_feed.get_calendar_dates(serviceId))
-        lineData.m_schedule.AddDateException(dateException.date, dateException.exception_type,
-                                             frequencies);
+        lineData.m_schedule.AddDateException(dateException.date, dateException.exception_type, frequencies);
 
       std::optional<gtfs::CalendarItem> calendar = m_feed.get_calendar(serviceId);
       if (calendar)
@@ -910,8 +879,8 @@ std::optional<Direction> WorldFeed::ProjectStopsToShape(
       CHECK(itStop != m_stops.m_data.end(), (stopId));
       auto const & stop = itStop->second;
 
-      size_t const prevIdx = i == 0 ? (direction == Direction::Forward ? 0 : shape.size() - 1)
-                                    : stopsToIndexes[stopIds[i - 1]].back();
+      size_t const prevIdx =
+          i == 0 ? (direction == Direction::Forward ? 0 : shape.size() - 1) : stopsToIndexes[stopIds[i - 1]].back();
       auto const [curIdx, pointInserted] =
           PrepareNearestPointOnTrack(stop.m_point, prevPoint, prevIdx, direction, shape);
 
@@ -920,10 +889,9 @@ std::optional<Direction> WorldFeed::ProjectStopsToShape(
         CHECK(!itShape->second.m_lineIds.empty(), (shapeId));
         TransitId const lineId = *stopsOnLines.m_lines.begin();
 
-        LOG(LWARNING,
-            ("Error projecting stops to the shape. GTFS trip id",
-             m_lines.m_data[lineId].m_gtfsTripId, "shapeId", shapeId, "stopId", stopId, "i", i,
-             "previous index on shape", prevIdx, "trips count", stopsOnLines.m_lines.size()));
+        LOG(LWARNING, ("Error projecting stops to the shape. GTFS trip id", m_lines.m_data[lineId].m_gtfsTripId,
+                       "shapeId", shapeId, "stopId", stopId, "i", i, "previous index on shape", prevIdx, "trips count",
+                       stopsOnLines.m_lines.size()));
         return false;
       }
 
@@ -934,10 +902,8 @@ std::optional<Direction> WorldFeed::ProjectStopsToShape(
         for (auto & indexesList : stopsToIndexes)
         {
           for (auto & stopIndex : indexesList.second)
-          {
             if (stopIndex >= curIdx)
               ++stopIndex;
-          }
         }
 
         for (auto const & lineId : m_shapes.m_data[shapeId].m_lineIds)
@@ -1071,12 +1037,10 @@ std::pair<size_t, size_t> WorldFeed::ModifyShapes()
             m_lines.m_data.erase(lineId);
             // todo: use std::erase_if after c++20
             for (auto it = m_edges.m_data.begin(); it != m_edges.m_data.end();)
-            {
               if (it->first.m_lineId == lineId)
                 it = m_edges.m_data.erase(it);
               else
                 ++it;
-            }
           }
           else
           {
@@ -1144,8 +1108,8 @@ void WorldFeed::FillTransfers()
 
       EdgeData data;
       data.m_weight = static_cast<EdgeWeight>(transfer.min_transfer_time);
-      std::string const edgeHash = BuildHash(std::to_string(kInvalidLineId),
-                                             std::to_string(stop1Id), std::to_string(stop2Id));
+      std::string const edgeHash =
+          BuildHash(std::to_string(kInvalidLineId), std::to_string(stop1Id), std::to_string(stop2Id));
 
       data.m_featureId = m_idGeneratorEdges.MakeId(edgeHash);
 
@@ -1221,10 +1185,9 @@ bool WorldFeed::SpeedExceedsMaxVal(EdgeId const & edgeId, EdgeData const & edgeD
   bool speedExceedsMaxVal = speedMpS > maxSpeedMpS;
   if (speedExceedsMaxVal)
   {
-    LOG(LWARNING,
-        ("Invalid edge weight conflicting with kTransitMaxSpeedKMpH:", edgeId.m_fromStopId,
-         edgeId.m_toStopId, edgeId.m_lineId, "speed (km/h):", measurement_utils::MpsToKmph(speedMpS),
-         "maxSpeed (km/h):", routing::kTransitMaxSpeedKMpH));
+    LOG(LWARNING, ("Invalid edge weight conflicting with kTransitMaxSpeedKMpH:", edgeId.m_fromStopId, edgeId.m_toStopId,
+                   edgeId.m_lineId, "speed (km/h):", measurement_utils::MpsToKmph(speedMpS),
+                   "maxSpeed (km/h):", routing::kTransitMaxSpeedKMpH));
   }
 
   return speedExceedsMaxVal;
@@ -1255,10 +1218,8 @@ bool WorldFeed::ClearFeedByLineIds(std::unordered_set<TransitId> const & corrupt
   }
 
   for (auto const & [routeId, routeData] : m_routes.m_data)
-  {
     if (corruptedRouteIds.find(routeId) == corruptedRouteIds.end())
       DeleteIfExists(corruptedNetworkIds, routeData.m_networkId);
-  }
 
   DeleteAllEntriesByIds(m_shapes.m_data, corruptedShapeIds);
   DeleteAllEntriesByIds(m_routes.m_data, corruptedRouteIds);
@@ -1314,12 +1275,10 @@ bool WorldFeed::ClearFeedByLineIds(std::unordered_set<TransitId> const & corrupt
     auto & gateData = it->second;
 
     for (auto itW = gateData.m_weights.begin(); itW != gateData.m_weights.end();)
-    {
       if (corruptedStopIds.find(itW->m_stopId) != corruptedStopIds.end())
         itW = gateData.m_weights.erase(itW);
       else
         ++itW;
-    }
 
     if (gateData.m_weights.empty())
       it = m_gates.m_data.erase(it);
@@ -1329,12 +1288,12 @@ bool WorldFeed::ClearFeedByLineIds(std::unordered_set<TransitId> const & corrupt
 
   DeleteAllEntriesByIds(m_stops.m_data, corruptedStopIds);
 
-  LOG(LINFO, ("Count of lines linked to the corrupted edges:", corruptedLineIds.size(),
-              ", routes:", corruptedRouteIds.size(), ", networks:", corruptedNetworkIds.size(),
-              ", shapes:", corruptedShapeIds.size()));
+  LOG(LINFO,
+      ("Count of lines linked to the corrupted edges:", corruptedLineIds.size(), ", routes:", corruptedRouteIds.size(),
+       ", networks:", corruptedNetworkIds.size(), ", shapes:", corruptedShapeIds.size()));
 
-  return !m_networks.m_data.empty() && !m_routes.m_data.empty() && !m_lines.m_data.empty() &&
-         !m_stops.m_data.empty() && !m_edges.m_data.empty();
+  return !m_networks.m_data.empty() && !m_routes.m_data.empty() && !m_lines.m_data.empty() && !m_stops.m_data.empty() &&
+         !m_edges.m_data.empty();
 }
 
 bool WorldFeed::UpdateEdgeWeights()
@@ -1349,18 +1308,15 @@ bool WorldFeed::UpdateEdgeWeights()
 
       bool const isInverted = edgeData.m_shapeLink.m_startIndex > edgeData.m_shapeLink.m_endIndex;
 
-      size_t const startIndex =
-          isInverted ? edgeData.m_shapeLink.m_endIndex : edgeData.m_shapeLink.m_startIndex;
-      size_t const endIndex =
-          isInverted ? edgeData.m_shapeLink.m_startIndex : edgeData.m_shapeLink.m_endIndex;
+      size_t const startIndex = isInverted ? edgeData.m_shapeLink.m_endIndex : edgeData.m_shapeLink.m_startIndex;
+      size_t const endIndex = isInverted ? edgeData.m_shapeLink.m_startIndex : edgeData.m_shapeLink.m_endIndex;
 
-      auto const edgePolyLine =
-          std::vector<m2::PointD>(polyLine.begin() + startIndex, polyLine.begin() + endIndex + 1);
+      auto const edgePolyLine = std::vector<m2::PointD>(polyLine.begin() + startIndex, polyLine.begin() + endIndex + 1);
 
       if (edgePolyLine.size() < 1)
       {
-        LOG(LWARNING, ("Invalid edge with too short shape polyline:", edgeId.m_fromStopId,
-                       edgeId.m_toStopId, edgeId.m_lineId));
+        LOG(LWARNING,
+            ("Invalid edge with too short shape polyline:", edgeId.m_fromStopId, edgeId.m_toStopId, edgeId.m_lineId));
         corruptedLineIds.emplace(edgeId.m_lineId);
         continue;
       }
@@ -1372,8 +1328,7 @@ bool WorldFeed::UpdateEdgeWeights()
 
       if (edgeLengthM == 0.0)
       {
-        LOG(LWARNING, ("Invalid edge with 0 length:", edgeId.m_fromStopId, edgeId.m_toStopId,
-                       edgeId.m_lineId));
+        LOG(LWARNING, ("Invalid edge with 0 length:", edgeId.m_fromStopId, edgeId.m_toStopId, edgeId.m_lineId));
         corruptedLineIds.emplace(edgeId.m_lineId);
         continue;
       }
@@ -1494,8 +1449,7 @@ void Routes::Write(IdSet const & ids, std::ofstream & stream) const
   }
 }
 
-void Lines::Write(std::unordered_map<TransitId, LineSegmentInRegion> const & ids,
-                  std::ofstream & stream) const
+void Lines::Write(std::unordered_map<TransitId, LineSegmentInRegion> const & ids, std::ofstream & stream) const
 {
   for (auto const & [lineId, data] : ids)
   {
@@ -1599,8 +1553,7 @@ void Stops::Write(IdSet const & ids, std::ofstream & stream) const
         for (auto const & timeInterval : timeIntervals)
           rawValues.push_back(timeInterval.GetRaw());
 
-        json_object_set_new(lineTimetableItem.get(), "intervals",
-                            VectorToJson(rawValues).release());
+        json_object_set_new(lineTimetableItem.get(), "intervals", VectorToJson(rawValues).release());
         json_array_append_new(timeTableArr.get(), lineTimetableItem.release());
       }
 
@@ -1625,7 +1578,7 @@ void Edges::Write(IdEdgeSet const & ids, std::ofstream & stream) const
     ToJSONObject(*node, "stop_id_to", edgeId.m_toStopId);
 
     CHECK_NOT_EQUAL(edge.m_featureId, std::numeric_limits<uint32_t>::max(),
-                   (edgeId.m_lineId, edgeId.m_fromStopId, edgeId.m_toStopId));
+                    (edgeId.m_lineId, edgeId.m_fromStopId, edgeId.m_toStopId));
     ToJSONObject(*node, "feature_id", edge.m_featureId);
 
     CHECK_GREATER(edge.m_weight, 0, (edgeId.m_fromStopId, edgeId.m_toStopId, edgeId.m_lineId));
@@ -1649,7 +1602,7 @@ void EdgesTransfer::Write(IdEdgeTransferSet const & ids, std::ofstream & stream)
     ToJSONObject(*node, "weight", edgeData.m_weight);
 
     CHECK_NOT_EQUAL(edgeData.m_featureId, std::numeric_limits<uint32_t>::max(),
-                   (edgeTransferId.m_fromStopId, edgeTransferId.m_toStopId));
+                    (edgeTransferId.m_fromStopId, edgeTransferId.m_toStopId));
     ToJSONObject(*node, "feature_id", edgeData.m_featureId);
 
     WriteJson(node.get(), stream);
@@ -1732,8 +1685,7 @@ void WorldFeed::SplitStopsBasedData()
   // Fill regional stops from transfer edges.
   for (auto const & [edgeTransferId, data] : m_edgesTransfers.m_data)
   {
-    auto const [regFrom, regTo] =
-        ExtendRegionsByPair(edgeTransferId.m_fromStopId, edgeTransferId.m_toStopId);
+    auto const [regFrom, regTo] = ExtendRegionsByPair(edgeTransferId.m_fromStopId, edgeTransferId.m_toStopId);
     AddToRegions(m_splitting.m_edgesTransfers, edgeTransferId, regFrom);
     AddToRegions(m_splitting.m_edgesTransfers, edgeTransferId, regTo);
   }
@@ -1745,10 +1697,8 @@ bool IsSplineSubset(IdList const & stops, IdList const & stopsOther)
     return false;
 
   for (TransitId stopId : stops)
-  {
     if (!base::IsExist(stopsOther, stopId))
       return false;
-  }
 
   return true;
 }
@@ -1839,14 +1789,16 @@ bool WorldFeed::PrepareEdgesInRegion(std::string const & region)
           FindPointsOnShape(shapePoints, it->second[0].front(), it->second[0].back());
     }
 
-    CHECK(edgeData.m_shapeLink.m_startIndex != 0 || edgeData.m_shapeLink.m_endIndex != 0, (edgeData.m_shapeLink.m_shapeId));
+    CHECK(edgeData.m_shapeLink.m_startIndex != 0 || edgeData.m_shapeLink.m_endIndex != 0,
+          (edgeData.m_shapeLink.m_shapeId));
 
     auto const & pointOnShapeStart = shapePoints[edgeData.m_shapeLink.m_startIndex];
     auto const & pointOnShapeEnd = shapePoints[edgeData.m_shapeLink.m_endIndex];
 
     auto const & pointStopStart = m_stops.m_data.at(edgeId.m_fromStopId).m_point;
 
-    if (mercator::DistanceOnEarth(pointOnShapeStart, pointStopStart) > mercator::DistanceOnEarth(pointOnShapeEnd, pointStopStart))
+    if (mercator::DistanceOnEarth(pointOnShapeStart, pointStopStart) >
+        mercator::DistanceOnEarth(pointOnShapeEnd, pointStopStart))
     {
       std::swap(edgeData.m_shapeLink.m_startIndex, edgeData.m_shapeLink.m_endIndex);
     }
@@ -1884,15 +1836,11 @@ void WorldFeed::SplitLinesBasedData()
   }
 
   for (auto & [region, linesInRegion] : m_splitting.m_lines)
-  {
     for (auto & [lineId, lineInRegion] : linesInRegion)
       lineInRegion.m_splineParent = GetParentLineForSpline(lineId);
-  }
 
   for (auto & [region, edges] : m_splitting.m_edges)
-  {
     PrepareEdgesInRegion(region);
-  }
 
   for (auto & [region, linesInRegion] : m_splitting.m_lines)
   {
@@ -1909,13 +1857,13 @@ void WorldFeed::SplitLinesBasedData()
 
       lineInRegion.m_shapeLink.m_shapeId = lineData.m_shapeLink.m_shapeId;
 
-      auto const edgeFirst = m_edges.m_data.at(
-          EdgeId(lineData.m_stopIds[firstStopIdx], lineData.m_stopIds[firstStopIdx + 1], lineId));
+      auto const edgeFirst =
+          m_edges.m_data.at(EdgeId(lineData.m_stopIds[firstStopIdx], lineData.m_stopIds[firstStopIdx + 1], lineId));
       if (edgeFirst.m_shapeLink.m_startIndex == 0 && edgeFirst.m_shapeLink.m_endIndex == 0)
         continue;
 
-      auto const edgeLast = m_edges.m_data.at(
-          EdgeId(lineData.m_stopIds[lastStopIdx - 1], lineData.m_stopIds[lastStopIdx], lineId));
+      auto const edgeLast =
+          m_edges.m_data.at(EdgeId(lineData.m_stopIds[lastStopIdx - 1], lineData.m_stopIds[lastStopIdx], lineId));
       if (edgeLast.m_shapeLink.m_startIndex == 0 && edgeLast.m_shapeLink.m_endIndex == 0)
         continue;
 
@@ -1946,25 +1894,19 @@ void WorldFeed::SplitLinesBasedData()
 
   // Fill regional networks based on routes.
   for (auto const & [region, routeIds] : m_splitting.m_routes)
-  {
     for (auto routeId : routeIds)
       m_splitting.m_networks[region].emplace(m_routes.m_data[routeId].m_networkId);
-  }
 }
 
 void WorldFeed::SplitSupplementalData()
 {
   for (auto const & [gateId, gateData] : m_gates.m_data)
-  {
     for (auto const & weight : gateData.m_weights)
       AddToRegionsIfMatches(m_splitting.m_gates, gateId, m_splitting.m_stops, weight.m_stopId);
-  }
 
   for (auto const & [transferId, transferData] : m_transfers.m_data)
-  {
     for (auto const & stopId : transferData.m_stopsIds)
       AddToRegionsIfMatches(m_splitting.m_transfers, transferId, m_splitting.m_stops, stopId);
-  }
 }
 
 std::pair<Regions, Regions> WorldFeed::ExtendRegionsByPair(TransitId fromId, TransitId toId)
@@ -1979,40 +1921,26 @@ std::pair<Regions, Regions> WorldFeed::ExtendRegionsByPair(TransitId fromId, Tra
   return {regionsFrom, regionsTo};
 }
 
-void WorldFeed::SaveRegions(std::string const & worldFeedDir, std::string const & region,
-                            bool overwrite)
+void WorldFeed::SaveRegions(std::string const & worldFeedDir, std::string const & region, bool overwrite)
 {
   auto const path = base::JoinPath(worldFeedDir, region);
   CHECK(Platform::MkDirRecursively(path), (path));
 
-  CHECK(DumpData(m_networks, m_splitting.m_networks[region], base::JoinPath(path, kNetworksFile),
-                 overwrite),
-        ());
-  CHECK(DumpData(m_routes, m_splitting.m_routes[region], base::JoinPath(path, kRoutesFile),
-                 overwrite),
-        ());
-  CHECK(DumpData(m_lines, m_splitting.m_lines[region], base::JoinPath(path, kLinesFile), overwrite),
+  CHECK(DumpData(m_networks, m_splitting.m_networks[region], base::JoinPath(path, kNetworksFile), overwrite), ());
+  CHECK(DumpData(m_routes, m_splitting.m_routes[region], base::JoinPath(path, kRoutesFile), overwrite), ());
+  CHECK(DumpData(m_lines, m_splitting.m_lines[region], base::JoinPath(path, kLinesFile), overwrite), ());
+
+  CHECK(DumpData(m_linesMetadata, m_splitting.m_lines[region], base::JoinPath(path, kLinesMetadataFile), overwrite),
         ());
 
-  CHECK(DumpData(m_linesMetadata, m_splitting.m_lines[region],
-                 base::JoinPath(path, kLinesMetadataFile), overwrite),
-        ());
-
-  CHECK(DumpData(m_shapes, m_splitting.m_shapes[region], base::JoinPath(path, kShapesFile),
+  CHECK(DumpData(m_shapes, m_splitting.m_shapes[region], base::JoinPath(path, kShapesFile), overwrite), ());
+  CHECK(DumpData(m_stops, m_splitting.m_stops[region], base::JoinPath(path, kStopsFile), overwrite), ());
+  CHECK(DumpData(m_edges, m_splitting.m_edges[region], base::JoinPath(path, kEdgesFile), overwrite), ());
+  CHECK(DumpData(m_edgesTransfers, m_splitting.m_edgesTransfers[region], base::JoinPath(path, kEdgesTransferFile),
                  overwrite),
         ());
-  CHECK(DumpData(m_stops, m_splitting.m_stops[region], base::JoinPath(path, kStopsFile), overwrite),
-        ());
-  CHECK(DumpData(m_edges, m_splitting.m_edges[region], base::JoinPath(path, kEdgesFile), overwrite),
-        ());
-  CHECK(DumpData(m_edgesTransfers, m_splitting.m_edgesTransfers[region],
-                 base::JoinPath(path, kEdgesTransferFile), overwrite),
-        ());
-  CHECK(DumpData(m_transfers, m_splitting.m_transfers[region], base::JoinPath(path, kTransfersFile),
-                 overwrite),
-        ());
-  CHECK(DumpData(m_gates, m_splitting.m_gates[region], base::JoinPath(path, kGatesFile), overwrite),
-        ());
+  CHECK(DumpData(m_transfers, m_splitting.m_transfers[region], base::JoinPath(path, kTransfersFile), overwrite), ());
+  CHECK(DumpData(m_gates, m_splitting.m_gates[region], base::JoinPath(path, kGatesFile), overwrite), ());
 }
 
 bool WorldFeed::Save(std::string const & worldFeedDir, bool overwrite)
@@ -2020,11 +1948,10 @@ bool WorldFeed::Save(std::string const & worldFeedDir, bool overwrite)
   CHECK(!worldFeedDir.empty(), ());
   CHECK(!m_networks.m_data.empty(), ());
 
-  if (m_routes.m_data.empty() || m_lines.m_data.empty() || m_stops.m_data.empty() ||
-      m_shapes.m_data.empty())
+  if (m_routes.m_data.empty() || m_lines.m_data.empty() || m_stops.m_data.empty() || m_shapes.m_data.empty())
   {
-    LOG(LINFO, ("Skipping feed with routes, lines, stops, shapes sizes:", m_routes.m_data.size(),
-                m_lines.m_data.size(), m_stops.m_data.size(), m_shapes.m_data.size()));
+    LOG(LINFO, ("Skipping feed with routes, lines, stops, shapes sizes:", m_routes.m_data.size(), m_lines.m_data.size(),
+                m_stops.m_data.size(), m_shapes.m_data.size()));
     return false;
   }
 
diff --git a/libs/transit/world_feed/world_feed.hpp b/libs/transit/world_feed/world_feed.hpp
index 400e221be..820ac0c2f 100644
--- a/libs/transit/world_feed/world_feed.hpp
+++ b/libs/transit/world_feed/world_feed.hpp
@@ -99,16 +99,14 @@ struct LineSegmentInRegion
 
 struct Lines
 {
-  void Write(std::unordered_map<TransitId, LineSegmentInRegion> const & ids,
-             std::ofstream & stream) const;
+  void Write(std::unordered_map<TransitId, LineSegmentInRegion> const & ids, std::ofstream & stream) const;
 
   std::unordered_map<TransitId, LineData> m_data;
 };
 
 struct LinesMetadata
 {
-  void Write(std::unordered_map<TransitId, LineSegmentInRegion> const & linesInRegion,
-             std::ofstream & stream) const;
+  void Write(std::unordered_map<TransitId, LineSegmentInRegion> const & linesInRegion, std::ofstream & stream) const;
 
   // Line id to line additional data (e.g. for rendering).
   std::unordered_map<TransitId, LineSegmentsOrder> m_data;
@@ -249,8 +247,7 @@ struct StopsOnLines
 };
 
 using IdsInRegion = std::unordered_map<std::string, IdSet>;
-using LinesInRegion =
-    std::unordered_map<std::string, std::unordered_map<TransitId, LineSegmentInRegion>>;
+using LinesInRegion = std::unordered_map<std::string, std::unordered_map<TransitId, LineSegmentInRegion>>;
 using EdgeIdsInRegion = std::unordered_map<std::string, IdEdgeSet>;
 using EdgeTransferIdsInRegion = std::unordered_map<std::string, IdEdgeTransferSet>;
 
@@ -320,8 +317,7 @@ private:
 
   // Adds new stop with |stopId| and fills it with GTFS data by |gtfsId| or just
   // links to it |lineId|.
-  bool UpdateStop(TransitId stopId, gtfs::StopTime const & stopTime, std::string const & stopHash,
-                  TransitId lineId);
+  bool UpdateStop(TransitId stopId, gtfs::StopTime const & stopTime, std::string const & stopHash, TransitId lineId);
 
   std::optional<TransitId> GetParentLineForSpline(TransitId lineId) const;
   bool PrepareEdgesInRegion(std::string const & region);
@@ -340,9 +336,8 @@ private:
   // Recalculates 0-weights of edges based on the shape length.
   bool UpdateEdgeWeights();
 
-  std::optional<Direction> ProjectStopsToShape(
-      ShapesIter & itShape, StopsOnLines const & stopsOnLines,
-      std::unordered_map<TransitId, std::vector<size_t>> & stopsToIndexes);
+  std::optional<Direction> ProjectStopsToShape(ShapesIter & itShape, StopsOnLines const & stopsOnLines,
+                                               std::unordered_map<TransitId, std::vector<size_t>> & stopsToIndexes);
 
   // Splits data into regions.
   void SplitFeedIntoRegions();
diff --git a/libs/transit/world_feed/world_feed_tests/subway_converter_tests.cpp b/libs/transit/world_feed/world_feed_tests/subway_converter_tests.cpp
index c602d11f7..5bc7341ca 100644
--- a/libs/transit/world_feed/world_feed_tests/subway_converter_tests.cpp
+++ b/libs/transit/world_feed/world_feed_tests/subway_converter_tests.cpp
@@ -34,11 +34,9 @@ namespace transit
 class SubwayConverterTests
 {
 public:
-  SubwayConverterTests()
-    : m_mwmMatcher(GetPlatform().ResourcesDir(), false /* haveBordersForWholeWorld */)
+  SubwayConverterTests() : m_mwmMatcher(GetPlatform().ResourcesDir(), false /* haveBordersForWholeWorld */)
   {
-    CHECK(Platform::MkDirChecked(kSubwayTestsDir),
-          ("Could not create directory for test data:", kSubwayTestsDir));
+    CHECK(Platform::MkDirChecked(kSubwayTestsDir), ("Could not create directory for test data:", kSubwayTestsDir));
     m_generator = transit::IdGenerator(base::JoinPath(kSubwayTestsDir, kMappingFile));
     m_generatorEdges = transit::IdGenerator(base::JoinPath(kSubwayTestsDir, kMappingEdgesFile));
   }
@@ -378,7 +376,13 @@ private:
   feature::CountriesFilesAffiliation m_mwmMatcher;
 };
 
-UNIT_CLASS_TEST(SubwayConverterTests, SubwayConverter_ParseInvalidJson) { ParseEmptySubway(); }
+UNIT_CLASS_TEST(SubwayConverterTests, SubwayConverter_ParseInvalidJson)
+{
+  ParseEmptySubway();
+}
 
-UNIT_CLASS_TEST(SubwayConverterTests, SubwayConverter_ParseValidJson) { ParseValidSubway(); }
+UNIT_CLASS_TEST(SubwayConverterTests, SubwayConverter_ParseValidJson)
+{
+  ParseValidSubway();
+}
 }  // namespace transit
diff --git a/libs/transit/world_feed/world_feed_tests/world_feed_tests.cpp b/libs/transit/world_feed/world_feed_tests/world_feed_tests.cpp
index f7a0cd8fc..7235cb413 100644
--- a/libs/transit/world_feed/world_feed_tests/world_feed_tests.cpp
+++ b/libs/transit/world_feed/world_feed_tests/world_feed_tests.cpp
@@ -27,12 +27,10 @@ std::vector<gtfs::CalendarAvailability> GetCalendarAvailability(std::vector<size
   std::vector<gtfs::CalendarAvailability> res;
 
   for (auto val : data)
-  {
     if (val == 0)
       res.push_back(gtfs::CalendarAvailability::NotAvailable);
     else
       res.push_back(gtfs::CalendarAvailability::Available);
-  }
 
   return res;
 }
@@ -52,8 +50,7 @@ gtfs::StopTimes GetFakeStopTimes(std::vector<std::string> const & transitIds)
   return res;
 }
 
-void TestInterval(WeekdaysInterval const & interval, size_t start, size_t end,
-                  osmoh::RuleSequence::Modifier status)
+void TestInterval(WeekdaysInterval const & interval, size_t start, size_t end, osmoh::RuleSequence::Modifier status)
 {
   TEST_EQUAL(interval.m_start, start, ());
   TEST_EQUAL(interval.m_end, end, ());
@@ -70,8 +67,7 @@ void TestExceptionIntervals(gtfs::CalendarDates const & dates, size_t intervalsC
   TEST_EQUAL(openingHours, resOpeningHoursStr, ());
 }
 
-void TestStopsRange(IdList const & stopsOnLine, IdSet const & stopsInRegion, size_t firstIdxPlan,
-                    size_t lastIdxPlan)
+void TestStopsRange(IdList const & stopsOnLine, IdSet const & stopsInRegion, size_t firstIdxPlan, size_t lastIdxPlan)
 {
   auto const & [firstIdxFact, lastIdxFact] = GetStopsRange(stopsOnLine, stopsInRegion);
   TEST_EQUAL(firstIdxFact, firstIdxPlan, ());
@@ -125,9 +121,8 @@ UNIT_TEST(Transit_GTFS_ServiceDaysExceptions1)
       {"serviceId1", gtfs::Date(2015, 01, 31), gtfs::CalendarDateException::Removed},
       {"serviceId1", gtfs::Date(2015, 02, 01), gtfs::CalendarDateException::Removed},
       {"serviceId1", gtfs::Date(2015, 04, 03), gtfs::CalendarDateException::Added}};
-  TestExceptionIntervals(
-      exceptionDays, 2 /* intervalsCount */,
-      "2015 Apr 03-2015 Apr 03; 2015 Jan 30-2015 Feb 01 closed" /* resOpeningHoursStr */);
+  TestExceptionIntervals(exceptionDays, 2 /* intervalsCount */,
+                         "2015 Apr 03-2015 Apr 03; 2015 Jan 30-2015 Feb 01 closed" /* resOpeningHoursStr */);
 }
 
 UNIT_TEST(Transit_GTFS_ServiceDaysExceptions2)
@@ -147,10 +142,9 @@ UNIT_TEST(Transit_GTFS_ServiceDaysExceptions3)
       {"serviceId2", gtfs::Date(2005, 10, 12), gtfs::CalendarDateException::Removed},
       {"serviceId2", gtfs::Date(2005, 10, 13), gtfs::CalendarDateException::Added},
       {"serviceId2", gtfs::Date(1999, 10, 14), gtfs::CalendarDateException::Removed}};
-  TestExceptionIntervals(
-      exceptionDays, 2 /* intervalsCount */,
-      "2005 Aug 01-2005 Aug 01, 2005 Aug 12-2005 Aug 12, 2005 Oct 13-2005 Oct 13; 2005 Oct 11-2005 "
-      "Oct 12, 1999 Oct 14-1999 Oct 14 closed" /* resOpeningHoursStr */);
+  TestExceptionIntervals(exceptionDays, 2 /* intervalsCount */,
+                         "2005 Aug 01-2005 Aug 01, 2005 Aug 12-2005 Aug 12, 2005 Oct 13-2005 Oct 13; 2005 Oct 11-2005 "
+                         "Oct 12, 1999 Oct 14-1999 Oct 14 closed" /* resOpeningHoursStr */);
 }
 
 UNIT_TEST(Transit_GTFS_FindStopTimesByTransitId)
@@ -206,8 +200,7 @@ UNIT_TEST(Transit_GTFS_ProjectStopToLine_Simple)
   // Test that point_A is projected between two existing polyline points and the new point is
   // added in the place of its projection.
   TEST_EQUAL(ResT(1, true),
-               PrepareNearestPointOnTrack(point_A, std::nullopt, 0 /* prevIndex */,
-                                          Direction::Forward, shape), ());
+             PrepareNearestPointOnTrack(point_A, std::nullopt, 0 /* prevIndex */, Direction::Forward, shape), ());
 
   TEST_EQUAL(shape.size(), 5, ());
   TEST_EQUAL(shape[1 /* expectedIndex */], m2::PointD(point_A.x, y), ());
@@ -216,35 +209,31 @@ UNIT_TEST(Transit_GTFS_ProjectStopToLine_Simple)
   // Expected point projection index is the same.
   // But this projection is not inserted (it is already present).
   TEST_EQUAL(ResT(1, false),
-               PrepareNearestPointOnTrack(point_A, std::nullopt, 0 /* prevIndex */,
-                                          Direction::Forward, shape), ());
+             PrepareNearestPointOnTrack(point_A, std::nullopt, 0 /* prevIndex */, Direction::Forward, shape), ());
   // So the shape size remains the same.
   TEST_EQUAL(shape.size(), 5, ());
 
   // Test that point_B insertion leads to addition of the new projection to the shape.
   TEST_EQUAL(ResT(4, true),
-               PrepareNearestPointOnTrack(point_B, std::nullopt, 1 /* prevIndex */,
-                                          Direction::Forward, shape), ());
+             PrepareNearestPointOnTrack(point_B, std::nullopt, 1 /* prevIndex */, Direction::Forward, shape), ());
 
   // Test that point_C insertion does not lead to the addition of the new projection.
   TEST_EQUAL(ResT(5, false),
-               PrepareNearestPointOnTrack(point_C, std::nullopt, 4 /* prevIndex */,
-                                          Direction::Forward, shape), ());
+             PrepareNearestPointOnTrack(point_C, std::nullopt, 4 /* prevIndex */, Direction::Forward, shape), ());
 
   // Test point_C projection in backward direction.
-  TEST_EQUAL(ResT(5, false),
-               PrepareNearestPointOnTrack(point_C, std::nullopt, shape.size() - 1 /* prevIndex */,
-                                          Direction::Backward, shape), ());
+  TEST_EQUAL(
+      ResT(5, false),
+      PrepareNearestPointOnTrack(point_C, std::nullopt, shape.size() - 1 /* prevIndex */, Direction::Backward, shape),
+      ());
 
   // Test point_B projection in backward direction.
   TEST_EQUAL(ResT(4, false),
-               PrepareNearestPointOnTrack(point_B, std::nullopt, 5 /* prevIndex */,
-                                          Direction::Backward, shape), ());
+             PrepareNearestPointOnTrack(point_B, std::nullopt, 5 /* prevIndex */, Direction::Backward, shape), ());
 
   // Test point_A projection in backward direction.
   TEST_EQUAL(ResT(1, false),
-               PrepareNearestPointOnTrack(point_A, std::nullopt, 4 /* prevIndex */,
-                                          Direction::Backward, shape), ());
+             PrepareNearestPointOnTrack(point_A, std::nullopt, 4 /* prevIndex */, Direction::Backward, shape), ());
 }
 
 // Stop is on approximately the same distance from the segment (0, 1) and segment (1, 2).
@@ -268,8 +257,7 @@ UNIT_TEST(Transit_GTFS_ProjectStopToLine_DifferentStartIndexes)
   {
     auto shape = referenceShape;
     TEST_EQUAL(ResT(1, true),
-                 PrepareNearestPointOnTrack(point_A, std::nullopt, 0 /* prevIndex */,
-                                            Direction::Forward, shape), ());
+               PrepareNearestPointOnTrack(point_A, std::nullopt, 0 /* prevIndex */, Direction::Forward, shape), ());
     TEST_EQUAL(shape.size(), 4, ());
     TEST_EQUAL(shape[1 /* expectedIndex */], m2::PointD(0.001, point_A.y), ());
   }
@@ -278,8 +266,7 @@ UNIT_TEST(Transit_GTFS_ProjectStopToLine_DifferentStartIndexes)
   {
     auto shape = referenceShape;
     TEST_EQUAL(ResT(2, true),
-                 PrepareNearestPointOnTrack(point_A, std::nullopt, 1 /* prevIndex */,
-                                            Direction::Forward, shape), ());
+               PrepareNearestPointOnTrack(point_A, std::nullopt, 1 /* prevIndex */, Direction::Forward, shape), ());
     TEST_EQUAL(shape.size(), 4, ());
     TEST_EQUAL(shape[2 /* expectedIndex */], m2::PointD(point_A.x, 0.002), ());
   }
@@ -307,8 +294,7 @@ UNIT_TEST(Transit_GTFS_ProjectStopToLine_MaxDistance)
                                 {0.010, 0.0031}, {0.005, 0.0031}, {0.001, 0.0031}};
   m2::PointD const point_A{0.0028, 0.0029};
   TEST_EQUAL(ResT(1, true),
-               PrepareNearestPointOnTrack(point_A, std::nullopt, 0 /* prevIndex */,
-                                          Direction::Forward, shape), ());
+             PrepareNearestPointOnTrack(point_A, std::nullopt, 0 /* prevIndex */, Direction::Forward, shape), ());
 }
 
 /* Complex shape with multiple points on it and multiple stops for projection.
@@ -336,11 +322,11 @@ UNIT_TEST(Transit_GTFS_ProjectStopToLine_NearCircle)
   using ResT = std::pair<size_t, bool>;
 
   double constexpr kEps = 1e-5;
-  std::vector<m2::PointD> const initialShape{
-      {0.003, 0.001},   {0.003, 0.0015},  {0.0025, 0.002},  {0.002, 0.0025},  {0.001, 0.0025},
-      {0.001, 0.0035},  {0.0015, 0.0045}, {0.0025, 0.005},  {0.0035, 0.0045}, {0.004, 0.0055},
-      {0.0055, 0.0055}, {0.0065, 0.0045}, {0.0065, 0.0035}, {0.0075, 0.0035}, {0.0075, 0.0025},
-      {0.0065, 0.0025}, {0.0065, 0.0015}, {0.004, 0.0015},  {0.004, 0.001}};
+  std::vector<m2::PointD> const initialShape{{0.003, 0.001},   {0.003, 0.0015},  {0.0025, 0.002},  {0.002, 0.0025},
+                                             {0.001, 0.0025},  {0.001, 0.0035},  {0.0015, 0.0045}, {0.0025, 0.005},
+                                             {0.0035, 0.0045}, {0.004, 0.0055},  {0.0055, 0.0055}, {0.0065, 0.0045},
+                                             {0.0065, 0.0035}, {0.0075, 0.0035}, {0.0075, 0.0025}, {0.0065, 0.0025},
+                                             {0.0065, 0.0015}, {0.004, 0.0015},  {0.004, 0.001}};
 
   m2::PointD const point_A{0.0024, 0.0018};
   m2::PointD const point_B{0.002499, 0.00199};
@@ -352,66 +338,56 @@ UNIT_TEST(Transit_GTFS_ProjectStopToLine_NearCircle)
   // Forward
   auto shape = initialShape;
   TEST_EQUAL(ResT(2, true),
-               PrepareNearestPointOnTrack(point_A, std::nullopt, 0 /* prevIndex */,
-                                          Direction::Forward, shape), ());
+             PrepareNearestPointOnTrack(point_A, std::nullopt, 0 /* prevIndex */, Direction::Forward, shape), ());
   auto const coordA = shape[2];
 
   TEST_EQUAL(ResT(3, false),
-               PrepareNearestPointOnTrack(point_B, std::nullopt, 2 /* prevIndex */,
-                                          Direction::Forward, shape), ());
+             PrepareNearestPointOnTrack(point_B, std::nullopt, 2 /* prevIndex */, Direction::Forward, shape), ());
   auto const coordB = shape[3];
 
   TEST_EQUAL(ResT(10, true),
-               PrepareNearestPointOnTrack(point_C, std::nullopt, 3 /* prevIndex */,
-                                          Direction::Forward, shape), ());
+             PrepareNearestPointOnTrack(point_C, std::nullopt, 3 /* prevIndex */, Direction::Forward, shape), ());
   auto const coordC = shape[10];
 
   TEST_EQUAL(ResT(12, false),
-               PrepareNearestPointOnTrack(point_D, std::nullopt, 10 /* prevIndex */,
-                                          Direction::Forward, shape), ());
+             PrepareNearestPointOnTrack(point_D, std::nullopt, 10 /* prevIndex */, Direction::Forward, shape), ());
   auto const coordD = shape[12];
 
   TEST_EQUAL(ResT(14, true),
-               PrepareNearestPointOnTrack(point_E, std::nullopt, 12 /* prevIndex */,
-                                          Direction::Forward, shape), ());
+             PrepareNearestPointOnTrack(point_E, std::nullopt, 12 /* prevIndex */, Direction::Forward, shape), ());
   auto const coordE = shape[14];
 
   TEST_EQUAL(ResT(20, true),
-               PrepareNearestPointOnTrack(point_F, std::nullopt, 14 /* prevIndex */,
-                                          Direction::Forward, shape), ());
+             PrepareNearestPointOnTrack(point_F, std::nullopt, 14 /* prevIndex */, Direction::Forward, shape), ());
 
   // Backward processing of reversed shape
   shape = initialShape;
   reverse(shape.begin(), shape.end());
-  TEST_EQUAL(ResT(17, true),
-               PrepareNearestPointOnTrack(point_A, std::nullopt, shape.size() - 1/* prevIndex */,
-                                          Direction::Backward, shape), ());
+  TEST_EQUAL(
+      ResT(17, true),
+      PrepareNearestPointOnTrack(point_A, std::nullopt, shape.size() - 1 /* prevIndex */, Direction::Backward, shape),
+      ());
   TEST(AlmostEqualAbs(coordA, shape[17], kEps), (coordA, shape[17]));
 
   TEST_EQUAL(ResT(16, false),
-               PrepareNearestPointOnTrack(point_B, std::nullopt, 17 /* prevIndex */,
-                                          Direction::Backward, shape), ());
+             PrepareNearestPointOnTrack(point_B, std::nullopt, 17 /* prevIndex */, Direction::Backward, shape), ());
   TEST(AlmostEqualAbs(coordB, shape[16], kEps), (coordA, shape[17]));
 
   TEST_EQUAL(ResT(10, true),
-               PrepareNearestPointOnTrack(point_C, std::nullopt, 16 /* prevIndex */,
-                                          Direction::Backward, shape), ());
+             PrepareNearestPointOnTrack(point_C, std::nullopt, 16 /* prevIndex */, Direction::Backward, shape), ());
   TEST(AlmostEqualAbs(coordC, shape[10], kEps), (coordA, shape[17]));
 
   TEST_EQUAL(ResT(8, false),
-               PrepareNearestPointOnTrack(point_D, std::nullopt, 10 /* prevIndex */,
-                                          Direction::Backward, shape), ());
+             PrepareNearestPointOnTrack(point_D, std::nullopt, 10 /* prevIndex */, Direction::Backward, shape), ());
   TEST(AlmostEqualAbs(coordD, shape[8], kEps), (coordA, shape[17]));
 
   TEST_EQUAL(ResT(7, true),
-               PrepareNearestPointOnTrack(point_E, std::nullopt, 8 /* prevIndex */,
-                                          Direction::Backward, shape), ());
+             PrepareNearestPointOnTrack(point_E, std::nullopt, 8 /* prevIndex */, Direction::Backward, shape), ());
   TEST(AlmostEqualAbs(coordE, shape[7], kEps), (coordA, shape[17]));
 
   // point_F has different position because we do not insert before point 0.
   TEST_EQUAL(ResT(2, true),
-               PrepareNearestPointOnTrack(point_F, std::nullopt, 7 /* prevIndex */,
-                                          Direction::Backward, shape), ());
+             PrepareNearestPointOnTrack(point_F, std::nullopt, 7 /* prevIndex */, Direction::Backward, shape), ());
 }
 
 UNIT_TEST(Transit_ColorPicker)
@@ -438,9 +414,8 @@ UNIT_TEST(Transit_BuildHash1Arg)
 
 UNIT_TEST(IntersectionSimple)
 {
-  auto const & factRes =
-      FindIntersections({{1.0, 1.0}, {2.0, 2.0}, {3.0, 3.0}},
-                        {{4.0, 4.0}, {1.0, 1.0}, {2.0, 2.0}, {3.0, 3.0}, {4.0, 4.0}});
+  auto const & factRes = FindIntersections({{1.0, 1.0}, {2.0, 2.0}, {3.0, 3.0}},
+                                           {{4.0, 4.0}, {1.0, 1.0}, {2.0, 2.0}, {3.0, 3.0}, {4.0, 4.0}});
 
   std::pair<LineSegments, LineSegments> planRes{{LineSegment(0, 2)}, {LineSegment(1, 3)}};
   TEST(factRes == planRes, ());
@@ -488,12 +463,10 @@ UNIT_TEST(IntersectionDouble)
 
 UNIT_TEST(IntersectionTriple)
 {
-  auto const & factRes = GetIntersections({1, 2, 3, 6, 6, 6, 7, 8, 6, 6, 9, 10},
-                                          {0, 0, 1, 2, 3, 0, 7, 8, 0, 9, 10, 0});
+  auto const & factRes = GetIntersections({1, 2, 3, 6, 6, 6, 7, 8, 6, 6, 9, 10}, {0, 0, 1, 2, 3, 0, 7, 8, 0, 9, 10, 0});
 
-  std::pair<LineSegments, LineSegments> planRes{
-      {LineSegment(0, 2), LineSegment(6, 7), LineSegment(10, 11)},
-      {LineSegment(2, 4), LineSegment(6, 7), LineSegment(9, 10)}};
+  std::pair<LineSegments, LineSegments> planRes{{LineSegment(0, 2), LineSegment(6, 7), LineSegment(10, 11)},
+                                                {LineSegment(2, 4), LineSegment(6, 7), LineSegment(9, 10)}};
   TEST(factRes == planRes, ());
 }
 
@@ -558,11 +531,11 @@ UNIT_TEST(CalcSegmentOrder)
 
 UNIT_TEST(SplitLineToRegions)
 {
-  TestStopsRange({1, 2, 3, 4, 5} /* stopsOnLine */, {1, 2, 3, 4, 5} /* stopsInRegion */,
-                 0 /* firstIdxPlan */, 4 /* lastIdxPlan */);
-  TestStopsRange({1, 2, 3, 4, 5, 6, 7} /* stopsOnLine */, {1, 2, 3} /* stopsInRegion */,
-                 0 /* firstIdxPlan */, 3 /* lastIdxPlan */);
-  TestStopsRange({1, 2, 3, 4, 5, 6, 7} /* stopsOnLine */, {3, 4} /* stopsInRegion */,
-                 1 /* firstIdxPlan */, 4 /* lastIdxPlan */);
+  TestStopsRange({1, 2, 3, 4, 5} /* stopsOnLine */, {1, 2, 3, 4, 5} /* stopsInRegion */, 0 /* firstIdxPlan */,
+                 4 /* lastIdxPlan */);
+  TestStopsRange({1, 2, 3, 4, 5, 6, 7} /* stopsOnLine */, {1, 2, 3} /* stopsInRegion */, 0 /* firstIdxPlan */,
+                 3 /* lastIdxPlan */);
+  TestStopsRange({1, 2, 3, 4, 5, 6, 7} /* stopsOnLine */, {3, 4} /* stopsInRegion */, 1 /* firstIdxPlan */,
+                 4 /* lastIdxPlan */);
 }
 }  // namespace world_feed_tests
diff --git a/qt/about.cpp b/qt/about.cpp
index c6ab2d515..aec81727c 100644
--- a/qt/about.cpp
+++ b/qt/about.cpp
@@ -15,8 +15,8 @@
 #include <QtWidgets/QVBoxLayout>
 
 AboutDialog::AboutDialog(QWidget * parent)
-  : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint |
-            Qt::WindowMaximizeButtonHint | Qt::WindowCloseButtonHint)
+  : QDialog(parent,
+            Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMaximizeButtonHint | Qt::WindowCloseButtonHint)
 {
   QIcon icon(":/ui/logo.png");
   setWindowIcon(icon);
@@ -33,7 +33,7 @@ AboutDialog::AboutDialog(QWidget * parent)
   versionLabel->setTextInteractionFlags(Qt::TextSelectableByMouse);
   versionBox->addWidget(versionLabel);
   // TODO: insert maps data version.
-  //versionBox->addWidget(new QLabel(QString("Data: ") + DESIGNER_DATA_VERSION));
+  // versionBox->addWidget(new QLabel(QString("Data: ") + DESIGNER_DATA_VERSION));
 
   QHBoxLayout * hBox = new QHBoxLayout();
   hBox->addWidget(labelIcon);
diff --git a/qt/about.hpp b/qt/about.hpp
index 1fdebf710..ab752d577 100644
--- a/qt/about.hpp
+++ b/qt/about.hpp
@@ -6,6 +6,7 @@
 class AboutDialog : public QDialog
 {
   Q_OBJECT
+
 public:
   explicit AboutDialog(QWidget * parent);
 };
diff --git a/qt/bookmark_dialog.cpp b/qt/bookmark_dialog.cpp
index 3ce42b087..c2404690d 100644
--- a/qt/bookmark_dialog.cpp
+++ b/qt/bookmark_dialog.cpp
@@ -16,7 +16,6 @@
 #include <QtWidgets/QTreeWidget>
 #include <QtWidgets/QVBoxLayout>
 
-
 namespace qt
 {
 using namespace std::placeholders;
@@ -128,8 +127,8 @@ void BookmarkDialog::OnCloseClick()
 
 void BookmarkDialog::OnImportClick()
 {
-  auto const files = QFileDialog::getOpenFileNames(this /* parent */, tr("Open KML, KMZ, GPX..."),
-                                                   QString() /* dir */, "KML, KMZ, GPX files (*.kml *.KML *.kmz *.KMZ, *.gpx *.GPX)");
+  auto const files = QFileDialog::getOpenFileNames(this /* parent */, tr("Open KML, KMZ, GPX..."), QString() /* dir */,
+                                                   "KML, KMZ, GPX files (*.kml *.KML *.kmz *.KMZ, *.gpx *.GPX)");
 
   for (auto const & name : files)
   {
@@ -165,13 +164,13 @@ void BookmarkDialog::OnExportClick()
     return;
   }
 
-  auto const name = QFileDialog::getSaveFileName(this /* parent */, tr("Export KMZ..."),
-                                                 QString() /* dir */, "KMZ files (*.kmz)");
+  auto const name =
+      QFileDialog::getSaveFileName(this /* parent */, tr("Export KMZ..."), QString() /* dir */, "KMZ files (*.kmz)");
   if (name.isEmpty())
     return;
 
   m_framework.GetBookmarkManager().PrepareFileForSharing({categoryIt->second},
-    [this, name](BookmarkManager::SharingResult const & result)
+                                                         [this, name](BookmarkManager::SharingResult const & result)
   {
     if (result.m_code == BookmarkManager::SharingResult::Code::Success)
     {
@@ -280,8 +279,7 @@ void BookmarkDialog::FillTree()
         if (name.empty())
         {
           name = measurement_utils::FormatLatLon(mercator::YToLat(bookmark->GetPivot().y),
-                                                 mercator::XToLon(bookmark->GetPivot().x),
-                                                 true /* withComma */);
+                                                 mercator::XToLon(bookmark->GetPivot().x), true /* withComma */);
         }
         auto bookmarkItem = CreateTreeItem(name + " (Bookmark)", categoryItem);
         m_bookmarks[bookmarkItem] = bookmarkId;
diff --git a/qt/build_style/build_common.cpp b/qt/build_style/build_common.cpp
index 8ef0ad88a..eea4aee11 100644
--- a/qt/build_style/build_common.cpp
+++ b/qt/build_style/build_common.cpp
@@ -63,25 +63,15 @@ bool CopyFile(QString const & oldFile, QString const & newFile)
 void CopyFromResources(QString const & name, QString const & output)
 {
   QString const resourceDir = GetPlatform().ResourcesDir().c_str();
-  if (!CopyFile(JoinPathQt({resourceDir, name}),
-                JoinPathQt({output, name})))
-  {
-    throw std::runtime_error(std::string("Cannot copy file ") +
-                             name.toStdString() +
-                             " to " + output.toStdString());
-  }
+  if (!CopyFile(JoinPathQt({resourceDir, name}), JoinPathQt({output, name})))
+    throw std::runtime_error(std::string("Cannot copy file ") + name.toStdString() + " to " + output.toStdString());
 }
 
 void CopyToResources(QString const & name, QString const & input, QString const & newName)
 {
   QString const resourceDir = GetPlatform().ResourcesDir().c_str();
-  if (!CopyFile(JoinPathQt({input, name}),
-                JoinPathQt({resourceDir, newName.isEmpty() ? name : newName})))
-  {
-    throw std::runtime_error(std::string("Cannot copy file ") +
-                             name.toStdString() +
-                             " from " + input.toStdString());
-  }
+  if (!CopyFile(JoinPathQt({input, name}), JoinPathQt({resourceDir, newName.isEmpty() ? name : newName})))
+    throw std::runtime_error(std::string("Cannot copy file ") + name.toStdString() + " from " + input.toStdString());
 }
 
 QString JoinPathQt(std::initializer_list<QString> folders)
@@ -102,8 +92,7 @@ QString JoinPathQt(std::initializer_list<QString> folders)
   return QDir::cleanPath(result);
 }
 
-QString GetExternalPath(QString const & name, QString const & primaryPath,
-                        QString const & secondaryPath)
+QString GetExternalPath(QString const & name, QString const & primaryPath, QString const & secondaryPath)
 {
   QString const resourceDir = GetPlatform().ResourcesDir().c_str();
   QString path = JoinPathQt({resourceDir, primaryPath, name});
diff --git a/qt/build_style/build_drules.cpp b/qt/build_style/build_drules.cpp
index c5b08824d..431bf9dc1 100644
--- a/qt/build_style/build_drules.cpp
+++ b/qt/build_style/build_drules.cpp
@@ -29,12 +29,17 @@ void BuildDrawingRulesImpl(QString const & mapcssFile, QString const & outputDir
   env.insert("PROTOBUF_EGG_PATH", GetProtobufEggPath());
 
   // Run the script
-  (void)ExecProcess("python", {
-    GetExternalPath("libkomwm.py", "kothic/src", "../tools/kothic/src"),
-    "-s", mapcssFile,
-    "-o", outputTemplate,
-    "-x", "True",
-  }, &env);
+  (void)ExecProcess("python",
+                    {
+                        GetExternalPath("libkomwm.py", "kothic/src", "../tools/kothic/src"),
+                        "-s",
+                        mapcssFile,
+                        "-o",
+                        outputTemplate,
+                        "-x",
+                        "True",
+                    },
+                    &env);
 
   // Ensure that generated file is not empty.
   if (QFile(outputFile).size() == 0)
diff --git a/qt/build_style/build_phone_pack.cpp b/qt/build_style/build_phone_pack.cpp
index 1d0df8474..c3bda0b79 100644
--- a/qt/build_style/build_phone_pack.cpp
+++ b/qt/build_style/build_phone_pack.cpp
@@ -20,11 +20,8 @@ QString RunBuildingPhonePack(QString const & stylesDir, QString const & targetDi
 
   if (!QDir(targetDir).exists())
     throw runtime_error("target directory does not exist" + targetDir.toStdString());
-  
-  return ExecProcess("python", {
-    GetExternalPath("generate_styles_override.py", "", "../tools/python"),
-    stylesDir,
-    targetDir
-  });
+
+  return ExecProcess("python",
+                     {GetExternalPath("generate_styles_override.py", "", "../tools/python"), stylesDir, targetDir});
 }
 }  // namespace build_style
diff --git a/qt/build_style/build_skins.cpp b/qt/build_style/build_skins.cpp
index 121a5364d..9725d2bda 100644
--- a/qt/build_style/build_skins.cpp
+++ b/qt/build_style/build_skins.cpp
@@ -31,30 +31,33 @@ enum SkinType
   SkinCount
 };
 
-using SkinInfo = std::tuple<const char*, int, bool>;
-SkinInfo const g_skinInfo[SkinCount] =
-{
-  std::make_tuple("mdpi", 18, false),
-  std::make_tuple("hdpi", 27, false),
-  std::make_tuple("xhdpi", 36, false),
-  std::make_tuple("6plus", 43, false),
-  std::make_tuple("xxhdpi", 54, false),
-  std::make_tuple("xxxhdpi", 64, false),
+using SkinInfo = std::tuple<char const *, int, bool>;
+SkinInfo const g_skinInfo[SkinCount] = {
+    std::make_tuple("mdpi", 18, false),  std::make_tuple("hdpi", 27, false),   std::make_tuple("xhdpi", 36, false),
+    std::make_tuple("6plus", 43, false), std::make_tuple("xxhdpi", 54, false), std::make_tuple("xxxhdpi", 64, false),
 };
 
-std::array<SkinType, SkinCount> const g_skinTypes =
-{{
-  SkinMDPI,
-  SkinHDPI,
-  SkinXHDPI,
-  Skin6Plus,
-  SkinXXHDPI,
-  SkinXXXHDPI,
+std::array<SkinType, SkinCount> const g_skinTypes = {{
+    SkinMDPI,
+    SkinHDPI,
+    SkinXHDPI,
+    Skin6Plus,
+    SkinXXHDPI,
+    SkinXXXHDPI,
 }};
 
-inline const char * SkinSuffix(SkinType s) { return std::get<0>(g_skinInfo[s]); }
-inline int SkinSize(SkinType s) { return std::get<1>(g_skinInfo[s]); }
-inline bool SkinCoorrectColor(SkinType s) { return std::get<2>(g_skinInfo[s]); }
+inline char const * SkinSuffix(SkinType s)
+{
+  return std::get<0>(g_skinInfo[s]);
+}
+inline int SkinSize(SkinType s)
+{
+  return std::get<1>(g_skinInfo[s]);
+}
+inline bool SkinCoorrectColor(SkinType s)
+{
+  return std::get<2>(g_skinInfo[s]);
+}
 
 QString GetSkinGeneratorPath()
 {
@@ -124,8 +127,8 @@ std::unordered_map<std::string, int> GetSkinSizes(QString const & file)
   return skinSizes;
 }
 
-void BuildSkinImpl(QString const & styleDir, QString const & suffix,
-                   int size, bool colorCorrection, QString const & outputDir)
+void BuildSkinImpl(QString const & styleDir, QString const & suffix, int size, bool colorCorrection,
+                   QString const & outputDir)
 {
   QString const symbolsDir = JoinPathQt({styleDir, "symbols"});
 
@@ -152,13 +155,18 @@ void BuildSkinImpl(QString const & styleDir, QString const & suffix,
   QString const strSize = QString::number(size);
   // Run the script.
   (void)ExecProcess(GetSkinGeneratorPath(), {
-      "--symbolWidth", strSize,
-      "--symbolHeight", strSize,
-      "--symbolsDir", symbolsDir,
-      "--skinName", JoinPathQt({outputDir, "basic"}),
-      "--skinSuffix=",
-      "--colorCorrection", (colorCorrection ? "true" : "false"),
-  });
+                                                "--symbolWidth",
+                                                strSize,
+                                                "--symbolHeight",
+                                                strSize,
+                                                "--symbolsDir",
+                                                symbolsDir,
+                                                "--skinName",
+                                                JoinPathQt({outputDir, "basic"}),
+                                                "--skinSuffix=",
+                                                "--colorCorrection",
+                                                (colorCorrection ? "true" : "false"),
+                                            });
 
   // Check if files were created.
   if (QFile(JoinPathQt({outputDir, "symbols.png"})).size() == 0 ||
@@ -178,7 +186,7 @@ void BuildSkins(QString const & styleDir, QString const & outputDir)
   {
     QString const suffix = SkinSuffix(s);
     QString const outputSkinDir = JoinPathQt({outputDir, "symbols", suffix, "design"});
-    int const size = resolution2size.at(suffix.toStdString()); // SkinSize(s);
+    int const size = resolution2size.at(suffix.toStdString());  // SkinSize(s);
     bool const colorCorrection = SkinCoorrectColor(s);
 
     BuildSkinImpl(styleDir, suffix, size, colorCorrection, outputSkinDir);
@@ -198,10 +206,8 @@ void ApplySkins(QString const & outputDir)
     if (!QFileInfo::exists(resourceSkinDir) && !QDir().mkdir(resourceSkinDir))
       throw std::runtime_error("Cannot create resource skin directory: " + resourceSkinDir.toStdString());
 
-    if (!CopyFile(JoinPathQt({outputSkinDir, "symbols.png"}),
-                  JoinPathQt({resourceSkinDir, "symbols.png"})) ||
-        !CopyFile(JoinPathQt({outputSkinDir, "symbols.sdf"}),
-                  JoinPathQt({resourceSkinDir, "symbols.sdf"})))
+    if (!CopyFile(JoinPathQt({outputSkinDir, "symbols.png"}), JoinPathQt({resourceSkinDir, "symbols.png"})) ||
+        !CopyFile(JoinPathQt({outputSkinDir, "symbols.sdf"}), JoinPathQt({resourceSkinDir, "symbols.sdf"})))
     {
       throw std::runtime_error("Cannot copy skins files");
     }
diff --git a/qt/build_style/build_statistics.cpp b/qt/build_style/build_statistics.cpp
index 328f4b82a..19c71bba8 100644
--- a/qt/build_style/build_statistics.cpp
+++ b/qt/build_style/build_statistics.cpp
@@ -27,11 +27,13 @@ QString GetStyleStatistics(QString const & mapcssMappingFile, QString const & dr
   env.insert("PROTOBUF_EGG_PATH", GetProtobufEggPath());
 
   // Run the script.
-  return ExecProcess("python", {
-    GetExternalPath("drules_info.py", "kothic/src", "../tools/python/stylesheet"),
-    mapcssMappingFile,
-    drulesFile,
-  }, &env);
+  return ExecProcess("python",
+                     {
+                         GetExternalPath("drules_info.py", "kothic/src", "../tools/python/stylesheet"),
+                         mapcssMappingFile,
+                         drulesFile,
+                     },
+                     &env);
 }
 
 QString GetCurrentStyleStatistics()
diff --git a/qt/build_style/build_style.cpp b/qt/build_style/build_style.cpp
index 06842ac78..9a64e9fe3 100644
--- a/qt/build_style/build_style.cpp
+++ b/qt/build_style/build_style.cpp
@@ -9,9 +9,9 @@
 #include <future>
 #include <string>
 
-#include <QtCore/QFile>
-#include <QtCore/QDir>
 #include <QtCore/QCoreApplication>
+#include <QtCore/QDir>
+#include <QtCore/QFile>
 
 namespace
 {
@@ -54,7 +54,7 @@ void BuildAndApply(QString const & mapcssFile)
   {
     auto future = std::async(std::launch::async, BuildSkins, styleDir, outputDir);
     BuildDrawingRules(mapcssFile, outputDir);
-    future.get(); // may rethrow exception from the BuildSkin
+    future.get();  // may rethrow exception from the BuildSkin
 
     ApplyDrawingRules(outputDir);
     ApplySkins(outputDir);
@@ -108,13 +108,13 @@ void RunRecalculationGeometryScript(QString const & mapcssFile)
   CopyFromResources("types.txt", geometryToolResourceDir);
 
   (void)ExecProcess("python", {
-      GetRecalculateGeometryScriptPath(),
-      resourceDir,
-      writableDir,
-      generatorToolPath,
-      appPath,
-      mapcssFile,
-  });
+                                  GetRecalculateGeometryScriptPath(),
+                                  resourceDir,
+                                  writableDir,
+                                  generatorToolPath,
+                                  appPath,
+                                  mapcssFile,
+                              });
 }
 
 bool NeedRecalculate = false;
diff --git a/qt/build_style/run_tests.cpp b/qt/build_style/run_tests.cpp
index ae9b30868..5c0feacf1 100644
--- a/qt/build_style/run_tests.cpp
+++ b/qt/build_style/run_tests.cpp
@@ -11,12 +11,12 @@ std::pair<bool, QString> RunCurrentStyleTests()
   QString const program = GetExternalPath("style_tests", "style_tests.app/Contents/MacOS", "");
   QString const resourcesDir = QString::fromStdString(GetPlatform().ResourcesDir());
   QString const output = ExecProcess(program, {
-      "--user_resource_path=" + resourcesDir,
-      "--data_path=" + resourcesDir,
-  });
+                                                  "--user_resource_path=" + resourcesDir,
+                                                  "--data_path=" + resourcesDir,
+                                              });
 
   // Unfortunately test process returns 0 even if some test failed,
   // therefore phrase 'All tests passed.' is looked to be sure that everything is OK.
   return std::make_pair(output.contains("All tests passed."), output);
 }
-} // namespace build_style
+}  // namespace build_style
diff --git a/qt/create_feature_dialog.cpp b/qt/create_feature_dialog.cpp
index 0b48418c1..30b8440ad 100644
--- a/qt/create_feature_dialog.cpp
+++ b/qt/create_feature_dialog.cpp
@@ -11,8 +11,7 @@
 #include <QtWidgets/QListWidget>
 #include <QtWidgets/QVBoxLayout>
 
-CreateFeatureDialog::CreateFeatureDialog(QWidget * parent, osm::NewFeatureCategories & cats)
-  : QDialog(parent)
+CreateFeatureDialog::CreateFeatureDialog(QWidget * parent, osm::NewFeatureCategories & cats) : QDialog(parent)
 {
   cats.AddLanguage("en");
   cats.AddLanguage(languages::GetCurrentNorm());
diff --git a/qt/create_feature_dialog.hpp b/qt/create_feature_dialog.hpp
index 0eb6cf919..b16289822 100644
--- a/qt/create_feature_dialog.hpp
+++ b/qt/create_feature_dialog.hpp
@@ -11,6 +11,7 @@ class NewFeatureCategories;
 class CreateFeatureDialog : public QDialog
 {
   Q_OBJECT
+
 public:
   CreateFeatureDialog(QWidget * parent, osm::NewFeatureCategories & cats);
   /// Valid only if dialog has finished with Accepted code.
diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp
index 1991e8288..c6681b76e 100644
--- a/qt/draw_widget.cpp
+++ b/qt/draw_widget.cpp
@@ -51,13 +51,12 @@ using namespace qt::common;
 namespace
 {
 std::vector<dp::Color> colorList = {
-    dp::Color(255, 0, 0, 255),   dp::Color(0, 255, 0, 255),   dp::Color(0, 0, 255, 255),
-    dp::Color(255, 255, 0, 255), dp::Color(0, 255, 255, 255), dp::Color(255, 0, 255, 255),
-    dp::Color(100, 0, 0, 255),   dp::Color(0, 100, 0, 255),   dp::Color(0, 0, 100, 255),
-    dp::Color(100, 100, 0, 255), dp::Color(0, 100, 100, 255), dp::Color(100, 0, 100, 255)};
+    dp::Color(255, 0, 0, 255),   dp::Color(0, 255, 0, 255),   dp::Color(0, 0, 255, 255),   dp::Color(255, 255, 0, 255),
+    dp::Color(0, 255, 255, 255), dp::Color(255, 0, 255, 255), dp::Color(100, 0, 0, 255),   dp::Color(0, 100, 0, 255),
+    dp::Color(0, 0, 100, 255),   dp::Color(100, 100, 0, 255), dp::Color(0, 100, 100, 255), dp::Color(100, 0, 100, 255)};
 
-void DrawMwmBorder(df::DrapeApi & drapeApi, std::string const & mwmName,
-                   std::vector<m2::RegionD> const & regions, bool withVertices)
+void DrawMwmBorder(df::DrapeApi & drapeApi, std::string const & mwmName, std::vector<m2::RegionD> const & regions,
+                   bool withVertices)
 {
   for (size_t i = 0; i < regions.size(); ++i)
   {
@@ -84,62 +83,60 @@ df::TouchEvent::ETouchType qtTouchEventTypeToDfTouchEventType(QEvent::Type qEven
 {
   switch (qEventType)
   {
-    case QEvent::TouchBegin: return df::TouchEvent::TOUCH_DOWN;
-    case QEvent::TouchEnd: return df::TouchEvent::TOUCH_UP;
-    case QEvent::TouchUpdate: return df::TouchEvent::TOUCH_MOVE;
-    case QEvent::TouchCancel: return df::TouchEvent::TOUCH_CANCEL;
-    default: return df::TouchEvent::TOUCH_NONE;
+  case QEvent::TouchBegin: return df::TouchEvent::TOUCH_DOWN;
+  case QEvent::TouchEnd: return df::TouchEvent::TOUCH_UP;
+  case QEvent::TouchUpdate: return df::TouchEvent::TOUCH_MOVE;
+  case QEvent::TouchCancel: return df::TouchEvent::TOUCH_CANCEL;
+  default: return df::TouchEvent::TOUCH_NONE;
   }
 }
 #endif
 }  // namespace
 
-DrawWidget::DrawWidget(Framework & framework, std::unique_ptr<ScreenshotParams> && screenshotParams,
-                       QWidget * parent)
+DrawWidget::DrawWidget(Framework & framework, std::unique_ptr<ScreenshotParams> && screenshotParams, QWidget * parent)
   : TBase(framework, screenshotParams != nullptr, parent)
   , m_rubberBand(nullptr)
   , m_emulatingLocation(false)
 {
   setFocusPolicy(Qt::StrongFocus);
 
-  m_framework.SetPlacePageListeners([this]() { ShowPlacePage(); },
-                                    {} /* onClose */, {} /* onUpdate */, {} /*onSwitchFullScreen */);
+  m_framework.SetPlacePageListeners([this]() { ShowPlacePage(); }, {} /* onClose */, {} /* onUpdate */,
+                                    {} /*onSwitchFullScreen */);
 
   auto & routingManager = m_framework.GetRoutingManager();
 
   routingManager.SetRouteBuildingListener(
       [&routingManager, this](routing::RouterResultCode, storage::CountriesSet const &)
+  {
+    auto & drapeApi = m_framework.GetDrapeApi();
+
+    m_turnsVisualizer.ClearTurns(drapeApi);
+
+    if (RoutingSettings::TurnsEnabled())
+      m_turnsVisualizer.Visualize(routingManager, drapeApi);
+
+    auto const routerType = routingManager.GetLastUsedRouter();
+    if (routerType == routing::RouterType::Pedestrian || routerType == routing::RouterType::Bicycle)
+    {
+      RoutingManager::DistanceAltitude da;
+      if (!routingManager.GetRouteAltitudesAndDistancesM(da))
+        return;
+
+      for (int iter = 0; iter < 2; ++iter)
       {
-        auto & drapeApi = m_framework.GetDrapeApi();
+        LOG(LINFO, ("Altitudes", iter == 0 ? "before" : "after", "simplify:"));
+        LOG_SHORT(LDEBUG, (da));
 
-        m_turnsVisualizer.ClearTurns(drapeApi);
+        uint32_t totalAscent, totalDescent;
+        da.CalculateAscentDescent(totalAscent, totalDescent);
+        LOG_SHORT(LINFO, ("Ascent:", totalAscent, "Descent:", totalDescent));
 
-        if (RoutingSettings::TurnsEnabled())
-          m_turnsVisualizer.Visualize(routingManager, drapeApi);
+        da.Simplify();
+      }
+    }
+  });
 
-        auto const routerType = routingManager.GetLastUsedRouter();
-        if (routerType == routing::RouterType::Pedestrian || routerType == routing::RouterType::Bicycle)
-        {
-          RoutingManager::DistanceAltitude da;
-          if (!routingManager.GetRouteAltitudesAndDistancesM(da))
-            return;
-
-          for (int iter = 0; iter < 2; ++iter)
-          {
-            LOG(LINFO, ("Altitudes", iter == 0 ? "before" : "after", "simplify:"));
-            LOG_SHORT(LDEBUG, (da));
-
-            uint32_t totalAscent, totalDescent;
-            da.CalculateAscentDescent(totalAscent, totalDescent);
-            LOG_SHORT(LINFO, ("Ascent:", totalAscent, "Descent:", totalDescent));
-
-            da.Simplify();
-          }
-        }
-      });
-
-  routingManager.SetRouteRecommendationListener(
-      [this](RoutingManager::Recommendation r) { OnRouteRecommendation(r); });
+  routingManager.SetRouteRecommendationListener([this](RoutingManager::Recommendation r) { OnRouteRecommendation(r); });
 
   if (screenshotParams != nullptr)
   {
@@ -209,7 +206,7 @@ void DrawWidget::initializeGL()
 bool DrawWidget::event(QEvent * event)
 {
 #if !defined(OMIM_OS_LINUX)
-    return QOpenGLWidget::event(event);
+  return QOpenGLWidget::event(event);
 #else
   // TouchScreen
   if (auto dfTouchEventType = qtTouchEventTypeToDfTouchEventType(event->type());
@@ -231,9 +228,9 @@ bool DrawWidget::event(QEvent * event)
       touch.m_id = i;
       touch.m_location = m2::PointD(L2D(it->position().x()), L2D(it->position().y()));
       if (i == 0)
-         dfTouchEvent.SetFirstTouch(touch);
+        dfTouchEvent.SetFirstTouch(touch);
       else
-         dfTouchEvent.SetSecondTouch(touch);
+        dfTouchEvent.SetSecondTouch(touch);
     }
     m_framework.TouchEvent(dfTouchEvent);
     return true;
@@ -242,7 +239,7 @@ bool DrawWidget::event(QEvent * event)
   else if (event->type() == QEvent::NativeGesture)
   {
     event->accept();
-    auto qNativeGestureEvent = dynamic_cast<QNativeGestureEvent*>(event);
+    auto qNativeGestureEvent = dynamic_cast<QNativeGestureEvent *>(event);
     if (qNativeGestureEvent->gestureType() == Qt::ZoomNativeGesture)
     {
       QPointF const pos = qNativeGestureEvent->position();
@@ -314,8 +311,8 @@ void DrawWidget::mouseMoveEvent(QMouseEvent * e)
     m_rubberBand->setGeometry(QRect(m_rubberBandOrigin, e->pos()).normalized());
 }
 
-void DrawWidget::VisualizeMwmsBordersInRect(m2::RectD const & rect, bool withVertices,
-                                            bool fromPackedPolygon, bool boundingBox)
+void DrawWidget::VisualizeMwmsBordersInRect(m2::RectD const & rect, bool withVertices, bool fromPackedPolygon,
+                                            bool boundingBox)
 {
   auto const getRegions = [&](std::string const & mwmName)
   {
@@ -360,8 +357,8 @@ void DrawWidget::VisualizeMwmsBordersInRect(m2::RectD const & rect, bool withVer
       for (auto const & region : regions)
       {
         auto const r = region.GetRect();
-        boxes.emplace_back(std::vector<m2::PointD>({r.LeftBottom(), r.LeftTop(), r.RightTop(),
-                                                    r.RightBottom(), r.LeftBottom()}));
+        boxes.emplace_back(
+            std::vector<m2::PointD>({r.LeftBottom(), r.LeftTop(), r.RightTop(), r.RightBottom(), r.LeftBottom()}));
       }
 
       regions = std::move(boxes);
@@ -378,14 +375,9 @@ void DrawWidget::mouseReleaseEvent(QMouseEvent * e)
 
   QOpenGLWidget::mouseReleaseEvent(e);
   if (IsLeftButton(e) && !IsAltModifier(e))
-  {
     m_framework.TouchEvent(GetDfTouchEventFromQMouseEvent(e, df::TouchEvent::TOUCH_UP));
-  }
-  else if (m_selectionMode && IsRightButton(e) &&
-           m_rubberBand != nullptr && m_rubberBand->isVisible())
-  {
+  else if (m_selectionMode && IsRightButton(e) && m_rubberBand != nullptr && m_rubberBand->isVisible())
     ProcessSelectionMode();
-  }
 }
 
 void DrawWidget::ProcessSelectionMode()
@@ -398,54 +390,39 @@ void DrawWidget::ProcessSelectionMode()
 
   switch (*m_selectionMode)
   {
-  case SelectionMode::Features:
-    m_framework.VisualizeRoadsInRect(rect);
-    break;
+  case SelectionMode::Features: m_framework.VisualizeRoadsInRect(rect); break;
 
-  case SelectionMode::CityBoundaries:
-    m_framework.VisualizeCityBoundariesInRect(rect);
-    break;
+  case SelectionMode::CityBoundaries: m_framework.VisualizeCityBoundariesInRect(rect); break;
 
-  case SelectionMode::CityRoads:
-    m_framework.VisualizeCityRoadsInRect(rect);
-    break;
+  case SelectionMode::CityRoads: m_framework.VisualizeCityRoadsInRect(rect); break;
 
-  case SelectionMode::CrossMwmSegments:
-    m_framework.VisualizeCrossMwmTransitionsInRect(rect);
-    break;
+  case SelectionMode::CrossMwmSegments: m_framework.VisualizeCrossMwmTransitionsInRect(rect); break;
 
   case SelectionMode::MwmsBordersByPolyFiles:
-    VisualizeMwmsBordersInRect(rect, false /* withVertices */, false /* fromPackedPolygon */,
-                               false /* boundingBox */);
+    VisualizeMwmsBordersInRect(rect, false /* withVertices */, false /* fromPackedPolygon */, false /* boundingBox */);
     break;
 
   case SelectionMode::MwmsBordersWithVerticesByPolyFiles:
-    VisualizeMwmsBordersInRect(rect, true /* withVertices */, false /* fromPackedPolygon */,
-                               false /* boundingBox */);
+    VisualizeMwmsBordersInRect(rect, true /* withVertices */, false /* fromPackedPolygon */, false /* boundingBox */);
     break;
 
   case SelectionMode::MwmsBordersByPackedPolygon:
-    VisualizeMwmsBordersInRect(rect, false /* withVertices */, true /* fromPackedPolygon */,
-                               false /* boundingBox */);
+    VisualizeMwmsBordersInRect(rect, false /* withVertices */, true /* fromPackedPolygon */, false /* boundingBox */);
     break;
 
   case SelectionMode::MwmsBordersWithVerticesByPackedPolygon:
-    VisualizeMwmsBordersInRect(rect, true /* withVertices */, true /* fromPackedPolygon */,
-                               false /* boundingBox */);
+    VisualizeMwmsBordersInRect(rect, true /* withVertices */, true /* fromPackedPolygon */, false /* boundingBox */);
     break;
 
   case SelectionMode::BoundingBoxByPolyFiles:
-    VisualizeMwmsBordersInRect(rect, true /* withVertices */, false /* fromPackedPolygon */,
-                               true /* boundingBox */);
+    VisualizeMwmsBordersInRect(rect, true /* withVertices */, false /* fromPackedPolygon */, true /* boundingBox */);
     break;
 
   case SelectionMode::BoundingBoxByPackedPolygon:
-    VisualizeMwmsBordersInRect(rect, true /* withVertices */, true /* fromPackedPolygon */,
-                               true /* boundingBox */);
+    VisualizeMwmsBordersInRect(rect, true /* withVertices */, true /* fromPackedPolygon */, true /* boundingBox */);
     break;
 
-  default:
-    UNREACHABLE();
+  default: UNREACHABLE();
   }
 
   m_rubberBand->hide();
@@ -456,8 +433,7 @@ void DrawWidget::keyPressEvent(QKeyEvent * e)
   if (m_screenshotMode)
     return;
 
-  if (IsLeftButton(QGuiApplication::mouseButtons()) &&
-      e->key() == Qt::Key_Control)
+  if (IsLeftButton(QGuiApplication::mouseButtons()) && e->key() == Qt::Key_Control)
   {
     df::TouchEvent event;
     event.SetTouchType(df::TouchEvent::TOUCH_DOWN);
@@ -476,8 +452,7 @@ void DrawWidget::keyReleaseEvent(QKeyEvent * e)
   if (m_screenshotMode)
     return;
 
-  if (IsLeftButton(QGuiApplication::mouseButtons()) &&
-      e->key() == Qt::Key_Control)
+  if (IsLeftButton(QGuiApplication::mouseButtons()) && e->key() == Qt::Key_Control)
   {
     df::TouchEvent event;
     event.SetTouchType(df::TouchEvent::TOUCH_UP);
@@ -500,8 +475,7 @@ std::string DrawWidget::GetDistance(search::Result const & res) const
   {
     auto const ll = mercator::ToLatLon(*position);
     double dummy;
-    (void)m_framework.GetDistanceAndAzimut(res.GetFeatureCenter(), ll.m_lat, ll.m_lon, -1.0, dist,
-                                           dummy);
+    (void)m_framework.GetDistanceAndAzimut(res.GetFeatureCenter(), ll.m_lat, ll.m_lon, -1.0, dist, dummy);
   }
   return dist.ToString();
 }
@@ -560,21 +534,19 @@ void DrawWidget::SubmitFakeLocationPoint(m2::PointD const & pt)
     routingManager.GetRouteFollowingInfo(loc);
     if (routingManager.GetCurrentRouterType() == routing::RouterType::Pedestrian)
     {
-      LOG(LDEBUG, ("Distance:", loc.m_distToTarget, "Time:", loc.m_time,
-                   DebugPrint(loc.m_pedestrianTurn),
-                   "in", loc.m_distToTurn.ToString(),
-                   loc.m_nextStreetName.empty() ? "" : "to " + loc.m_nextStreetName ));
+      LOG(LDEBUG, ("Distance:", loc.m_distToTarget, "Time:", loc.m_time, DebugPrint(loc.m_pedestrianTurn), "in",
+                   loc.m_distToTurn.ToString(), loc.m_nextStreetName.empty() ? "" : "to " + loc.m_nextStreetName));
     }
     else
     {
       std::string speed;
       if (loc.m_speedLimitMps > 0)
-        speed = "SpeedLimit: " + measurement_utils::FormatSpeedNumeric(loc.m_speedLimitMps, measurement_utils::Units::Metric);
+        speed = "SpeedLimit: " +
+                measurement_utils::FormatSpeedNumeric(loc.m_speedLimitMps, measurement_utils::Units::Metric);
 
-      LOG(LDEBUG, ("Distance:", loc.m_distToTarget, "Time:", loc.m_time, speed,
-                   GetTurnString(loc.m_turn), (loc.m_exitNum != 0 ? ":" + std::to_string(loc.m_exitNum) : ""),
-                   "in", loc.m_distToTurn.ToString(),
-                   loc.m_nextStreetName.empty() ? "" : "to " + loc.m_nextStreetName ));
+      LOG(LDEBUG, ("Distance:", loc.m_distToTarget, "Time:", loc.m_time, speed, GetTurnString(loc.m_turn),
+                   (loc.m_exitNum != 0 ? ":" + std::to_string(loc.m_exitNum) : ""), "in", loc.m_distToTurn.ToString(),
+                   loc.m_nextStreetName.empty() ? "" : "to " + loc.m_nextStreetName));
     }
   }
 }
@@ -608,7 +580,7 @@ void DrawWidget::SubmitRoutingPoint(m2::PointD const & pt, bool pointIsMercator)
   point.m_isMyPosition = false;
   if (!isIntermediate)
     point.m_position = GetCoordsFromSettingsIfExists(false /* start */, pt, pointIsMercator);
- else
+  else
     point.m_position = pointIsMercator ? pt : P2G(pt);
 
   routingManager.AddRoutePoint(std::move(point));
@@ -791,7 +763,7 @@ m2::PointD DrawWidget::P2G(m2::PointD const & pt) const
   return m_framework.P3dtoG(pt);
 }
 
-m2::PointD DrawWidget::GetCoordsFromSettingsIfExists(bool start, m2::PointD const & pt,  bool pointIsMercator) const
+m2::PointD DrawWidget::GetCoordsFromSettingsIfExists(bool start, m2::PointD const & pt, bool pointIsMercator) const
 {
   if (auto optional = RoutingSettings::GetCoords(start))
     return mercator::FromLatLon(*optional);
diff --git a/qt/draw_widget.hpp b/qt/draw_widget.hpp
index 05790e64b..900a6dbcd 100644
--- a/qt/draw_widget.hpp
+++ b/qt/draw_widget.hpp
@@ -42,8 +42,7 @@ public Q_SLOTS:
   void ChoosePositionModeDisable();
 
 public:
-  DrawWidget(Framework & framework, std::unique_ptr<ScreenshotParams> && screenshotParams,
-             QWidget * parent);
+  DrawWidget(Framework & framework, std::unique_ptr<ScreenshotParams> && screenshotParams, QWidget * parent);
   ~DrawWidget() override;
 
   std::string GetDistance(search::Result const & res) const;
@@ -97,8 +96,7 @@ private:
   void SubmitBookmark(m2::PointD const & pt);
   void ShowPlacePage();
 
-  void VisualizeMwmsBordersInRect(m2::RectD const & rect, bool withVertices,
-                                  bool fromPackedPolygon, bool boundingBox);
+  void VisualizeMwmsBordersInRect(m2::RectD const & rect, bool withVertices, bool fromPackedPolygon, bool boundingBox);
 
   m2::PointD P2G(m2::PointD const & pt) const;
   m2::PointD GetCoordsFromSettingsIfExists(bool start, m2::PointD const & pt, bool pointIsMercator) const;
diff --git a/qt/editor_dialog.cpp b/qt/editor_dialog.cpp
index c0b89fd3e..476303c6b 100644
--- a/qt/editor_dialog.cpp
+++ b/qt/editor_dialog.cpp
@@ -22,8 +22,7 @@ constexpr char const * kHouseNumberObjectName = "addr:housenumber";
 constexpr char const * kPostcodeObjectName = "addr:postcode";
 constexpr char const * kInternetObjectName = "internet_access";
 
-EditorDialog::EditorDialog(QWidget * parent, osm::EditableMapObject & emo)
-  : QDialog(parent), m_feature(emo)
+EditorDialog::EditorDialog(QWidget * parent, osm::EditableMapObject & emo) : QDialog(parent), m_feature(emo)
 {
   QGridLayout * grid = new QGridLayout();
   int row = 0;
@@ -33,8 +32,8 @@ EditorDialog::EditorDialog(QWidget * parent, osm::EditableMapObject & emo)
     ms::LatLon const ll = emo.GetLatLon();
     grid->addWidget(new QLabel("Latitude/Longitude:"), row, 0);
     QHBoxLayout * coords = new QHBoxLayout();
-    coords->addWidget(new QLabel(QString::fromStdString(strings::to_string_dac(ll.m_lat, 7) + " " +
-                                                        strings::to_string_dac(ll.m_lon, 7))));
+    coords->addWidget(new QLabel(
+        QString::fromStdString(strings::to_string_dac(ll.m_lat, 7) + " " + strings::to_string_dac(ll.m_lon, 7))));
     grid->addLayout(coords, row++, 1);
   }
 
@@ -111,30 +110,23 @@ EditorDialog::EditorDialog(QWidget * parent, osm::EditableMapObject & emo)
     switch (prop)
     {
     case PropID::FMD_INTERNET:
-      {
-        grid->addWidget(new QLabel(kInternetObjectName), row, 0);
-        QComboBox * cmb = new QComboBox();
-        std::string const values[] = {DebugPrint(feature::Internet::Unknown),
-                                      DebugPrint(feature::Internet::Wlan),
-                                      DebugPrint(feature::Internet::Wired),
-                                      DebugPrint(feature::Internet::Terminal),
-                                      DebugPrint(feature::Internet::Yes),
-                                      DebugPrint(feature::Internet::No)};
-        for (auto const & v : values)
-          cmb->addItem(v.c_str());
-        cmb->setCurrentText(DebugPrint(emo.GetInternet()).c_str());
-        cmb->setObjectName(kInternetObjectName);
-        grid->addWidget(cmb, row++, 1);
-      }
+    {
+      grid->addWidget(new QLabel(kInternetObjectName), row, 0);
+      QComboBox * cmb = new QComboBox();
+      std::string const values[] = {DebugPrint(feature::Internet::Unknown), DebugPrint(feature::Internet::Wlan),
+                                    DebugPrint(feature::Internet::Wired),   DebugPrint(feature::Internet::Terminal),
+                                    DebugPrint(feature::Internet::Yes),     DebugPrint(feature::Internet::No)};
+      for (auto const & v : values)
+        cmb->addItem(v.c_str());
+      cmb->setCurrentText(DebugPrint(emo.GetInternet()).c_str());
+      cmb->setObjectName(kInternetObjectName);
+      grid->addWidget(cmb, row++, 1);
+    }
       continue;
-    case PropID::FMD_CUISINE:
-      v = strings::JoinStrings(emo.GetLocalizedCuisines(), ", ");
-      break;
+    case PropID::FMD_CUISINE: v = strings::JoinStrings(emo.GetLocalizedCuisines(), ", "); break;
     case PropID::FMD_POSTCODE:  // already set above
       continue;
-    default:
-      v = emo.GetMetadata(prop);
-      break;
+    default: v = emo.GetMetadata(prop); break;
     }
 
     QString const fieldName = QString::fromStdString(DebugPrint(prop));
@@ -146,8 +138,7 @@ EditorDialog::EditorDialog(QWidget * parent, osm::EditableMapObject & emo)
 
   // Dialog buttons.
   {
-    QDialogButtonBox * buttonBox =
-        new QDialogButtonBox(QDialogButtonBox::Cancel | QDialogButtonBox::Save);
+    QDialogButtonBox * buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel | QDialogButtonBox::Save);
     connect(buttonBox, &QDialogButtonBox::accepted, this, &EditorDialog::OnSave);
     connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
     // Delete button should send custom int return value from dialog.
@@ -170,8 +161,8 @@ void EditorDialog::OnSave()
   if (m_feature.IsNameEditable())
   {
     StringUtf8Multilang names;
-    for (int8_t langCode = StringUtf8Multilang::kDefaultCode;
-         langCode < StringUtf8Multilang::kMaxSupportedLanguages; ++langCode)
+    for (int8_t langCode = StringUtf8Multilang::kDefaultCode; langCode < StringUtf8Multilang::kMaxSupportedLanguages;
+         ++langCode)
     {
       std::string_view const lang = StringUtf8Multilang::GetLangByCode(langCode);
       QLineEdit * le = findChild<QLineEdit *>(QString::fromUtf8(lang.data(), lang.size()));
@@ -215,7 +206,7 @@ void EditorDialog::OnSave()
       m_feature.SetInternet(feature::InternetFromString(cmb->currentText().toStdString()));
       continue;
     }
-    if (prop == PropID::FMD_POSTCODE) // already set above
+    if (prop == PropID::FMD_POSTCODE)  // already set above
       continue;
 
     QLineEdit * editor = findChild<QLineEdit *>(QString::fromStdString(DebugPrint(prop)));
@@ -225,9 +216,7 @@ void EditorDialog::OnSave()
     std::string v = editor->text().toStdString();
     switch (prop)
     {
-    case PropID::FMD_CUISINE:
-      m_feature.SetCuisines(strings::Tokenize(v, ";"));
-      break;
+    case PropID::FMD_CUISINE: m_feature.SetCuisines(strings::Tokenize(v, ";")); break;
     default:
       if (osm::EditableMapObject::IsValidMetadata(prop, v))
         m_feature.SetMetadata(prop, std::move(v));
diff --git a/qt/editor_dialog.hpp b/qt/editor_dialog.hpp
index b93acdb84..7a39906df 100644
--- a/qt/editor_dialog.hpp
+++ b/qt/editor_dialog.hpp
@@ -10,6 +10,7 @@ class EditableMapObject;
 class EditorDialog : public QDialog
 {
   Q_OBJECT
+
 public:
   EditorDialog(QWidget * parent, osm::EditableMapObject & emo);
 private slots:
diff --git a/qt/info_dialog.cpp b/qt/info_dialog.cpp
index 9c3dd54c0..0c3fcf63c 100644
--- a/qt/info_dialog.cpp
+++ b/qt/info_dialog.cpp
@@ -3,63 +3,61 @@
 #include "base/assert.hpp"
 
 #include <QtGui/QIcon>
-#include <QtWidgets/QTextBrowser>
-#include <QtWidgets/QPushButton>
 #include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QVBoxLayout>
 #include <QtWidgets/QLabel>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QTextBrowser>
+#include <QtWidgets/QVBoxLayout>
 
 namespace qt
 {
-  InfoDialog::InfoDialog(QString const & title, QString const & text, QWidget * parent,
-                         QStringList const & buttons)
+InfoDialog::InfoDialog(QString const & title, QString const & text, QWidget * parent, QStringList const & buttons)
   : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
+{
+  QIcon icon(":/ui/logo.png");
+  setWindowIcon(icon);
+  setWindowTitle(title);
+  setFocusPolicy(Qt::StrongFocus);
+  setWindowModality(Qt::WindowModal);
+
+  QVBoxLayout * vBox = new QVBoxLayout();
+  QTextBrowser * browser = new QTextBrowser();
+  browser->setReadOnly(true);
+  browser->setOpenLinks(true);
+  browser->setOpenExternalLinks(true);
+  browser->setText(text);
+  vBox->addWidget(browser);
+
+  // this horizontal layout is for buttons
+  QHBoxLayout * hBox = new QHBoxLayout();
+  hBox->addSpacing(static_cast<int>(browser->width() / 4 * (3.5 - buttons.size())));
+  for (int i = 0; i < buttons.size(); ++i)
   {
-    QIcon icon(":/ui/logo.png");
-    setWindowIcon(icon);
-    setWindowTitle(title);
-    setFocusPolicy(Qt::StrongFocus);
-    setWindowModality(Qt::WindowModal);
-
-    QVBoxLayout * vBox = new QVBoxLayout();
-    QTextBrowser * browser = new QTextBrowser();
-    browser->setReadOnly(true);
-    browser->setOpenLinks(true);
-    browser->setOpenExternalLinks(true);
-    browser->setText(text);
-    vBox->addWidget(browser);
-
-    // this horizontal layout is for buttons
-    QHBoxLayout * hBox = new QHBoxLayout();
-    hBox->addSpacing(static_cast<int>(browser->width() / 4 * (3.5 - buttons.size())));
-    for (int i = 0; i < buttons.size(); ++i)
+    QPushButton * button = new QPushButton(buttons[i], this);
+    switch (i)
     {
-      QPushButton * button = new QPushButton(buttons[i], this);
-      switch (i)
-      {
-      case 0: connect(button, &QAbstractButton::clicked, this, &InfoDialog::OnButtonClick1); break;
-      case 1: connect(button, &QAbstractButton::clicked, this, &InfoDialog::OnButtonClick2); break;
-      case 2: connect(button, &QAbstractButton::clicked, this, &InfoDialog::OnButtonClick3); break;
-      default:
-        ASSERT(false, ("Only 3 buttons are currently supported in info dialog"));
-      }
-      hBox->addWidget(button);
+    case 0: connect(button, &QAbstractButton::clicked, this, &InfoDialog::OnButtonClick1); break;
+    case 1: connect(button, &QAbstractButton::clicked, this, &InfoDialog::OnButtonClick2); break;
+    case 2: connect(button, &QAbstractButton::clicked, this, &InfoDialog::OnButtonClick3); break;
+    default: ASSERT(false, ("Only 3 buttons are currently supported in info dialog"));
     }
-
-    vBox->addLayout(hBox);
-    setLayout(vBox);
+    hBox->addWidget(button);
   }
 
-  void InfoDialog::OnButtonClick1()
-  {
-    done(1);
-  }
-  void InfoDialog::OnButtonClick2()
-  {
-    done(2);
-  }
-  void InfoDialog::OnButtonClick3()
-  {
-    done(3);
-  }
+  vBox->addLayout(hBox);
+  setLayout(vBox);
 }
+
+void InfoDialog::OnButtonClick1()
+{
+  done(1);
+}
+void InfoDialog::OnButtonClick2()
+{
+  done(2);
+}
+void InfoDialog::OnButtonClick3()
+{
+  done(3);
+}
+}  // namespace qt
diff --git a/qt/info_dialog.hpp b/qt/info_dialog.hpp
index fa987ab63..5e3acad84 100644
--- a/qt/info_dialog.hpp
+++ b/qt/info_dialog.hpp
@@ -5,18 +5,18 @@
 
 namespace qt
 {
-  /// Simple information dialog with scrollable html content
-  /// @note exec() returns 0 if dialog was closed or [1..buttons_count] for any button pressed
-  class InfoDialog : public QDialog
-  {
-    Q_OBJECT
+/// Simple information dialog with scrollable html content
+/// @note exec() returns 0 if dialog was closed or [1..buttons_count] for any button pressed
+class InfoDialog : public QDialog
+{
+  Q_OBJECT
 
-  public:
-    explicit InfoDialog(QString const & title, QString const & text,
-                        QWidget * parent, QStringList const & buttons = QStringList());
-  public Q_SLOTS:
-    void OnButtonClick1();
-    void OnButtonClick2();
-    void OnButtonClick3();
-  };
-}
+public:
+  explicit InfoDialog(QString const & title, QString const & text, QWidget * parent,
+                      QStringList const & buttons = QStringList());
+public Q_SLOTS:
+  void OnButtonClick1();
+  void OnButtonClick2();
+  void OnButtonClick3();
+};
+}  // namespace qt
diff --git a/qt/main.cpp b/qt/main.cpp
index 56c048320..675f1d2a7 100644
--- a/qt/main.cpp
+++ b/qt/main.cpp
@@ -17,23 +17,26 @@
 #include "build_style/build_style.h"
 
 #include <QtGlobal>
-#include <QtWidgets/QMessageBox>
 #include <QtWidgets/QApplication>
 #include <QtWidgets/QFileDialog>
+#include <QtWidgets/QMessageBox>
 
 #include <sstream>
 
 #include <gflags/gflags.h>
 
-
 DEFINE_string(data_path, "", "Path to data directory.");
-DEFINE_string(log_abort_level, base::ToString(base::GetDefaultLogAbortLevel()), "Log messages severity that causes termination.");
+DEFINE_string(log_abort_level, base::ToString(base::GetDefaultLogAbortLevel()),
+              "Log messages severity that causes termination.");
 DEFINE_string(resources_path, "", "Path to resources directory.");
-DEFINE_string(kml_path, "", "Activates screenshot mode. Path to a kml file or a directory with kml files to take screenshots.");
-DEFINE_string(points, "", "Activates screenshot mode. Points on the map and zoom level "
+DEFINE_string(kml_path, "",
+              "Activates screenshot mode. Path to a kml file or a directory with kml files to take screenshots.");
+DEFINE_string(points, "",
+              "Activates screenshot mode. Points on the map and zoom level "
               "[1..18] in format \"lat,lon,zoom[;lat,lon,zoom]\" or path to a file with points in "
               "the same format. Each point and zoom define a place on the map to take screenshot.");
-DEFINE_string(rects, "", "Activates screenshot mode. Rects on the map in format"
+DEFINE_string(rects, "",
+              "Activates screenshot mode. Rects on the map in format"
               "\"lat_leftBottom,lon_leftBottom,lat_rightTop,lon_rightTop"
               "[;lat_leftBottom,lon_leftBottom,lat_rightTop,lon_rightTop]\" or path to a file with "
               "rects in the same format. Each rect defines a place on the map to take screenshot.");
@@ -41,7 +44,9 @@ DEFINE_string(dst_path, "", "Path to a directory to save screenshots.");
 DEFINE_string(lang, "", "Device language.");
 DEFINE_int32(width, 0, "Screenshot width.");
 DEFINE_int32(height, 0, "Screenshot height.");
-DEFINE_double(dpi_scale, 0.0, "Screenshot dpi scale (mdpi = 1.0, hdpi = 1.5, xhdpiScale = 2.0, 6plus = 2.4, xxhdpi = 3.0, xxxhdpi = 3.5).");
+DEFINE_double(
+    dpi_scale, 0.0,
+    "Screenshot dpi scale (mdpi = 1.0, hdpi = 1.5, xhdpiScale = 2.0, 6plus = 2.4, xxhdpi = 3.0, xxxhdpi = 3.5).");
 
 namespace
 {
@@ -49,7 +54,7 @@ bool ValidateLogAbortLevel(char const * flagname, std::string const & value)
 {
   if (auto level = base::FromString(value); !level)
   {
-    std::cerr << "Invalid value for --" << flagname << ": "<< value << ", must be one of: ";
+    std::cerr << "Invalid value for --" << flagname << ": " << value << ", must be one of: ";
     auto const & names = base::GetLogLevelNames();
     for (size_t i = 0; i < names.size(); ++i)
     {
@@ -74,29 +79,27 @@ public:
     // useful when using memory and resource leak utilites
     // google::protobuf::ShutdownProtobufLibrary();
   }
-  };
+};
 
-#if defined(OMIM_OS_WINDOWS) //&& defined(PROFILER_COMMON)
-  class InitializeFinalize : public FinalizeBase
+#if defined(OMIM_OS_WINDOWS)  //&& defined(PROFILER_COMMON)
+class InitializeFinalize : public FinalizeBase
+{
+  FILE * m_errFile;
+  base::ScopedLogLevelChanger const m_debugLog;
+
+public:
+  InitializeFinalize() : m_debugLog(LDEBUG)
   {
-    FILE * m_errFile;
-    base::ScopedLogLevelChanger const m_debugLog;
-  public:
-    InitializeFinalize() : m_debugLog(LDEBUG)
-    {
-      // App runs without error console under win32.
-      m_errFile = ::freopen(".\\mapsme.log", "w", stderr);
+    // App runs without error console under win32.
+    m_errFile = ::freopen(".\\mapsme.log", "w", stderr);
 
-      //_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_DELAY_FREE_MEM_DF);
-      //_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
-    }
-    ~InitializeFinalize()
-    {
-      ::fclose(m_errFile);
-    }
-  };
+    //_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_DELAY_FREE_MEM_DF);
+    //_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
+  }
+  ~InitializeFinalize() { ::fclose(m_errFile); }
+};
 #else
-  typedef FinalizeBase InitializeFinalize;
+typedef FinalizeBase InitializeFinalize;
 #endif
 }  // namespace
 
@@ -111,7 +114,7 @@ int main(int argc, char * argv[])
   Platform & platform = GetPlatform();
 
   LOG(LINFO, ("CoMaps", platform.Version(), "built with QT:", QT_VERSION_STR, "runtime QT:", qVersion(),
-    "detected CPU cores:", platform.CpuCores()));
+              "detected CPU cores:", platform.CpuCores()));
 
   gflags::SetUsageMessage("Desktop application.");
   gflags::SetVersionString(platform.Version());
@@ -136,14 +139,12 @@ int main(int argc, char * argv[])
   app.setDesktopFileName("app.comaps.comaps");
   platform.SetupMeasurementSystem();
 
-
 #ifdef BUILD_DESIGNER
-    QApplication::setApplicationName("CoMaps Designer");
+  QApplication::setApplicationName("CoMaps Designer");
 #else
-    QApplication::setApplicationName("CoMaps");
+  QApplication::setApplicationName("CoMaps");
 #endif
 
-
 #ifdef DEBUG
   static bool constexpr developerMode = true;
 #else
@@ -169,7 +170,7 @@ int main(int argc, char * argv[])
   }
 
   int returnCode = -1;
-  if (eulaAccepted)   // User has accepted EULA
+  if (eulaAccepted)  // User has accepted EULA
   {
     std::unique_ptr<qt::ScreenshotParams> screenshotParams;
 
@@ -211,7 +212,7 @@ int main(int argc, char * argv[])
 #ifdef BUILD_DESIGNER
     QString mapcssFilePath;
     if (argc >= 2 && platform.IsFileExistsByFullPath(argv[1]))
-        mapcssFilePath = argv[1];
+      mapcssFilePath = argv[1];
     if (0 == mapcssFilePath.length())
       mapcssFilePath = QFileDialog::getOpenFileName(nullptr, "Open style.mapcss file", "~/", "MapCSS Files (*.mapcss)");
     if (mapcssFilePath.isEmpty())
@@ -232,14 +233,15 @@ int main(int argc, char * argv[])
       return returnCode;
     }
 
-#endif // BUILD_DESIGNER
+#endif  // BUILD_DESIGNER
 
     Framework framework(frameworkParams);
     qt::MainWindow w(framework, std::move(screenshotParams), QApplication::primaryScreen()->geometry()
 #ifdef BUILD_DESIGNER
-                     , mapcssFilePath
-#endif // BUILD_DESIGNER
-                     );
+                                                                 ,
+                     mapcssFilePath
+#endif  // BUILD_DESIGNER
+    );
     w.show();
     returnCode = QApplication::exec();
   }
@@ -261,7 +263,7 @@ int main(int argc, char * argv[])
       msgBox.exec();
     }
   }
-#endif // BUILD_DESIGNER
+#endif  // BUILD_DESIGNER
 
   LOG_SHORT(LINFO, ("Finished with code", returnCode));
   return returnCode;
diff --git a/qt/mainwindow.cpp b/qt/mainwindow.cpp
index d4b17c3d9..b3a20f2f5 100644
--- a/qt/mainwindow.cpp
+++ b/qt/mainwindow.cpp
@@ -1,7 +1,7 @@
+#include "qt/mainwindow.hpp"
 #include "qt/about.hpp"
 #include "qt/bookmark_dialog.hpp"
 #include "qt/draw_widget.hpp"
-#include "qt/mainwindow.hpp"
 #include "qt/mwms_borders_selection.hpp"
 #include "qt/osm_auth_dialog.hpp"
 #include "qt/popup_menu_holder.hpp"
@@ -12,8 +12,8 @@
 #include "qt/screenshoter.hpp"
 #include "qt/search_panel.hpp"
 
-#include "platform/settings.hpp"
 #include "platform/platform.hpp"
+#include "platform/settings.hpp"
 
 #include "base/assert.hpp"
 
@@ -27,12 +27,12 @@
 #ifdef BUILD_DESIGNER
 #include "build_style/build_common.h"
 #include "build_style/build_phone_pack.h"
-#include "build_style/build_style.h"
 #include "build_style/build_statistics.h"
+#include "build_style/build_style.h"
 #include "build_style/run_tests.h"
 
 #include "drape_frontend/debug_rect_renderer.hpp"
-#endif // BUILD_DESIGNER
+#endif  // BUILD_DESIGNER
 
 #include <QtGui/QCloseEvent>
 #include <QtWidgets/QDockWidget>
@@ -46,14 +46,14 @@
 #include <QtWidgets/QToolBar>
 
 #ifdef OMIM_OS_WINDOWS
-#define IDM_ABOUT_DIALOG        1001
-#define IDM_PREFERENCES_DIALOG  1002
+#define IDM_ABOUT_DIALOG       1001
+#define IDM_PREFERENCES_DIALOG 1002
 #endif
 
 #ifndef NO_DOWNLOADER
-#include "qt/update_dialog.hpp"
 #include "qt/info_dialog.hpp"
-#endif // NO_DOWNLOADER
+#include "qt/update_dialog.hpp"
+#endif  // NO_DOWNLOADER
 
 namespace qt
 {
@@ -70,7 +70,7 @@ void FormatMapSize(uint64_t sizeInBytes, std::string & units, size_t & sizeToDow
   }
   else if (sizeInBytes > kbInBytes)
   {
-    sizeToDownload = (sizeInBytes + kbInBytes -1) / kbInBytes;
+    sizeToDownload = (sizeInBytes + kbInBytes - 1) / kbInBytes;
     units = "KB";
   }
   else
@@ -80,7 +80,8 @@ void FormatMapSize(uint64_t sizeInBytes, std::string & units, size_t & sizeToDow
   }
 }
 
-template <class T> T * CreateBlackControl(QString const & name)
+template <class T>
+T * CreateBlackControl(QString const & name)
 {
   T * p = new T(name);
   p->setStyleSheet("color: black;");
@@ -92,11 +93,11 @@ template <class T> T * CreateBlackControl(QString const & name)
 // Defined in osm_auth_dialog.cpp.
 extern char const * kOauthTokenSetting;
 
-MainWindow::MainWindow(Framework & framework,
-                       std::unique_ptr<ScreenshotParams> && screenshotParams,
+MainWindow::MainWindow(Framework & framework, std::unique_ptr<ScreenshotParams> && screenshotParams,
                        QRect const & screenGeometry
 #ifdef BUILD_DESIGNER
-                       , QString const & mapcssFilePath
+                       ,
+                       QString const & mapcssFilePath
 #endif
                        )
   : m_locationService(CreateDesktopLocationService(*this))
@@ -200,8 +201,7 @@ MainWindow::MainWindow(Framework & framework,
 
     if (!text.empty())
     {
-      InfoDialog welcomeDlg(QString("Welcome to ") + caption, text.c_str(),
-                            this, QStringList(tr("Download Maps")));
+      InfoDialog welcomeDlg(QString("Welcome to ") + caption, text.c_str(), this, QStringList(tr("Download Maps")));
       if (welcomeDlg.exec() == QDialog::Rejected)
         bShowUpdateDialog = false;
     }
@@ -210,7 +210,7 @@ MainWindow::MainWindow(Framework & framework,
     if (bShowUpdateDialog)
       ShowUpdateDialog();
   }
-#endif // NO_DOWNLOADER
+#endif  // NO_DOWNLOADER
 
   m_pDrawWidget->UpdateAfterSettingsChanged();
 
@@ -262,11 +262,9 @@ void MainWindow::CreateNavigationBar()
     m_pDrawWidget->BindHotkeys(*this);
 
     // Add navigation hot keys.
-    qt::common::Hotkey const hotkeys[] = {
-      { Qt::Key_A, SLOT(ShowAll()) },
-      // Use CMD+n (New Item hotkey) to activate Create Feature mode.
-      { Qt::Key_Escape, SLOT(ChoosePositionModeDisable()) }
-    };
+    qt::common::Hotkey const hotkeys[] = {{Qt::Key_A, SLOT(ShowAll())},
+                                          // Use CMD+n (New Item hotkey) to activate Create Feature mode.
+                                          {Qt::Key_Escape, SLOT(ChoosePositionModeDisable())}};
 
     for (auto const & hotkey : hotkeys)
     {
@@ -304,8 +302,9 @@ void MainWindow::CreateNavigationBar()
 
     pToolBar->addSeparator();
 
-    pToolBar->addAction(QIcon(":/navig64/bookmark.png"), tr("Show bookmarks and tracks; use ALT + RMB to add a bookmark"),
-                        this, SLOT(OnBookmarksAction()));
+    pToolBar->addAction(QIcon(":/navig64/bookmark.png"),
+                        tr("Show bookmarks and tracks; use ALT + RMB to add a bookmark"), this,
+                        SLOT(OnBookmarksAction()));
     pToolBar->addSeparator();
 
 #ifndef BUILD_DESIGNER
@@ -324,15 +323,17 @@ void MainWindow::CreateNavigationBar()
     pToolBar->addWidget(toolBtn);
     m_routing->setCurrent(m_pDrawWidget->GetRoutePointAddMode());
 
-    QAction * act = pToolBar->addAction(QIcon(":/navig64/routing.png"), tr("Follow route"), this, SLOT(OnFollowRoute()));
+    QAction * act =
+        pToolBar->addAction(QIcon(":/navig64/routing.png"), tr("Follow route"), this, SLOT(OnFollowRoute()));
     act->setToolTip(tr("Build route and use ALT + LMB to emulate current position"));
     pToolBar->addAction(QIcon(":/navig64/clear-route.png"), tr("Clear route"), this, SLOT(OnClearRoute()));
-    pToolBar->addAction(QIcon(":/navig64/settings-routing.png"), tr("Routing settings"), this, SLOT(OnRoutingSettings()));
+    pToolBar->addAction(QIcon(":/navig64/settings-routing.png"), tr("Routing settings"), this,
+                        SLOT(OnRoutingSettings()));
 
     pToolBar->addSeparator();
 
-    m_pCreateFeatureAction = pToolBar->addAction(QIcon(":/navig64/select.png"), tr("Create Feature"),
-                                                 this, SLOT(OnCreateFeatureClicked()));
+    m_pCreateFeatureAction =
+        pToolBar->addAction(QIcon(":/navig64/select.png"), tr("Create Feature"), this, SLOT(OnCreateFeatureClicked()));
     m_pCreateFeatureAction->setCheckable(true);
     m_pCreateFeatureAction->setToolTip(tr("Push to select position, next push to create Feature"));
     m_pCreateFeatureAction->setShortcut(QKeySequence::New);
@@ -350,8 +351,8 @@ void MainWindow::CreateNavigationBar()
                            std::bind(&MainWindow::OnSwitchSelectionMode, this, SelectionMode::CityRoads), true);
     m_selection->addAction(QIcon(":/navig64/test.png"), tr("Cross MWM segments selection mode"),
                            std::bind(&MainWindow::OnSwitchSelectionMode, this, SelectionMode::CrossMwmSegments), true);
-    m_selection->addAction(QIcon(":/navig64/borders_selection.png"), tr("MWMs borders selection mode"),
-                           this, SLOT(OnSwitchMwmsBordersSelectionMode()), true);
+    m_selection->addAction(QIcon(":/navig64/borders_selection.png"), tr("MWMs borders selection mode"), this,
+                           SLOT(OnSwitchMwmsBordersSelectionMode()), true);
 
     toolBtn = m_selection->create();
     toolBtn->setToolTip(tr("Select mode and use RMB to define selection box"));
@@ -361,11 +362,11 @@ void MainWindow::CreateNavigationBar()
 
     pToolBar->addSeparator();
 
-#endif // NOT BUILD_DESIGNER
+#endif  // NOT BUILD_DESIGNER
 
     // Add search button with "checked" behavior.
-    m_pSearchAction = pToolBar->addAction(QIcon(":/navig64/search.png"), tr("Offline Search"),
-                                          this, SLOT(OnSearchButtonClicked()));
+    m_pSearchAction =
+        pToolBar->addAction(QIcon(":/navig64/search.png"), tr("Offline Search"), this, SLOT(OnSearchButtonClicked()));
     m_pSearchAction->setCheckable(true);
     m_pSearchAction->setShortcut(QKeySequence::Find);
 
@@ -378,62 +379,50 @@ void MainWindow::CreateNavigationBar()
 
     // add my position button with "checked" behavior
 
-    m_pMyPositionAction = pToolBar->addAction(QIcon(":/navig64/location.png"), tr("My Position"), this, SLOT(OnMyPosition()));
+    m_pMyPositionAction =
+        pToolBar->addAction(QIcon(":/navig64/location.png"), tr("My Position"), this, SLOT(OnMyPosition()));
     m_pMyPositionAction->setCheckable(true);
 
 #ifdef BUILD_DESIGNER
     // Add "Build style" button
     if (!m_mapcssFilePath.isEmpty())
     {
-      m_pBuildStyleAction = pToolBar->addAction(QIcon(":/navig64/run.png"),
-                                                tr("Build style"),
-                                                this,
-                                                SLOT(OnBuildStyle()));
+      m_pBuildStyleAction =
+          pToolBar->addAction(QIcon(":/navig64/run.png"), tr("Build style"), this, SLOT(OnBuildStyle()));
       m_pBuildStyleAction->setCheckable(false);
       m_pBuildStyleAction->setToolTip(tr("Build style"));
 
-      m_pRecalculateGeomIndex = pToolBar->addAction(QIcon(":/navig64/geom.png"),
-                                                    tr("Recalculate geometry index"),
-                                                    this,
+      m_pRecalculateGeomIndex = pToolBar->addAction(QIcon(":/navig64/geom.png"), tr("Recalculate geometry index"), this,
                                                     SLOT(OnRecalculateGeomIndex()));
       m_pRecalculateGeomIndex->setCheckable(false);
       m_pRecalculateGeomIndex->setToolTip(tr("Recalculate geometry index"));
     }
 
     // Add "Debug style" button
-    m_pDrawDebugRectAction = pToolBar->addAction(QIcon(":/navig64/bug.png"),
-                                              tr("Debug style"),
-                                              this,
-                                              SLOT(OnDebugStyle()));
+    m_pDrawDebugRectAction =
+        pToolBar->addAction(QIcon(":/navig64/bug.png"), tr("Debug style"), this, SLOT(OnDebugStyle()));
     m_pDrawDebugRectAction->setCheckable(true);
     m_pDrawDebugRectAction->setChecked(false);
     m_pDrawDebugRectAction->setToolTip(tr("Debug style"));
     m_pDrawWidget->GetFramework().EnableDebugRectRendering(false);
 
     // Add "Get statistics" button
-    m_pGetStatisticsAction = pToolBar->addAction(QIcon(":/navig64/chart.png"),
-                                                 tr("Get statistics"),
-                                                 this,
-                                                 SLOT(OnGetStatistics()));
+    m_pGetStatisticsAction =
+        pToolBar->addAction(QIcon(":/navig64/chart.png"), tr("Get statistics"), this, SLOT(OnGetStatistics()));
     m_pGetStatisticsAction->setCheckable(false);
     m_pGetStatisticsAction->setToolTip(tr("Get statistics"));
 
     // Add "Run tests" button
-    m_pRunTestsAction = pToolBar->addAction(QIcon(":/navig64/test.png"),
-                                            tr("Run tests"),
-                                            this,
-                                            SLOT(OnRunTests()));
+    m_pRunTestsAction = pToolBar->addAction(QIcon(":/navig64/test.png"), tr("Run tests"), this, SLOT(OnRunTests()));
     m_pRunTestsAction->setCheckable(false);
     m_pRunTestsAction->setToolTip(tr("Run tests"));
 
     // Add "Build phone package" button
-    m_pBuildPhonePackAction = pToolBar->addAction(QIcon(":/navig64/phonepack.png"),
-                                                  tr("Build phone package"),
-                                                  this,
+    m_pBuildPhonePackAction = pToolBar->addAction(QIcon(":/navig64/phonepack.png"), tr("Build phone package"), this,
                                                   SLOT(OnBuildPhonePackage()));
     m_pBuildPhonePackAction->setCheckable(false);
     m_pBuildPhonePackAction->setToolTip(tr("Build phone package"));
-#endif // BUILD_DESIGNER
+#endif  // BUILD_DESIGNER
   }
 
   pToolBar->addSeparator();
@@ -442,7 +431,7 @@ void MainWindow::CreateNavigationBar()
 #ifndef NO_DOWNLOADER
   pToolBar->addSeparator();
   pToolBar->addAction(QIcon(":/navig64/download.png"), tr("Download Maps"), this, SLOT(ShowUpdateDialog()));
-#endif // NO_DOWNLOADER
+#endif  // NO_DOWNLOADER
 
   if (m_screenshotMode)
     pToolBar->setVisible(false);
@@ -525,18 +514,17 @@ void MainWindow::CreateCountryStatusControls()
   GetFramework().SetCurrentCountryChangedListener(OnCountryChanged);
 
   GetFramework().GetStorage().Subscribe(
-    [this, onChanged = std::move(OnCountryChanged)](storage::CountryId const & countryId)
-    {
-      // Storage also calls notifications for parents, but we are interested in leafs only.
-      if (GetFramework().GetStorage().IsLeaf(countryId))
-        onChanged(countryId);
-    },
-    [this](storage::CountryId const & countryId, downloader::Progress const & progress)
-    {
-      std::stringstream str;
-      str << "Downloading (" << countryId << ") " << progress.m_bytesDownloaded * 100 / progress.m_bytesTotal << "%";
-      m_downloadingStatusLabel->setText(str.str().c_str());
-    });
+      [this, onChanged = std::move(OnCountryChanged)](storage::CountryId const & countryId)
+  {
+    // Storage also calls notifications for parents, but we are interested in leafs only.
+    if (GetFramework().GetStorage().IsLeaf(countryId))
+      onChanged(countryId);
+  }, [this](storage::CountryId const & countryId, downloader::Progress const & progress)
+  {
+    std::stringstream str;
+    str << "Downloading (" << countryId << ") " << progress.m_bytesDownloaded * 100 / progress.m_bytesTotal << "%";
+    m_downloadingStatusLabel->setText(str.str().c_str());
+  });
 }
 
 void MainWindow::OnAbout()
@@ -549,20 +537,18 @@ void MainWindow::OnLocationError(location::TLocationError errorCode)
 {
   switch (errorCode)
   {
-  case location::EDenied:  [[fallthrough]];
+  case location::EDenied: [[fallthrough]];
   case location::ETimeout: [[fallthrough]];
   case location::EUnknown:
-    {
-      if (m_pDrawWidget && m_pMyPositionAction)
-        m_pMyPositionAction->setEnabled(false);
-      break;
-    }
-
-  default:
-    ASSERT(false, ("Not handled location notification:", errorCode));
+  {
+    if (m_pDrawWidget && m_pMyPositionAction)
+      m_pMyPositionAction->setEnabled(false);
     break;
   }
 
+  default: ASSERT(false, ("Not handled location notification:", errorCode)); break;
+  }
+
   if (m_pDrawWidget != nullptr)
     m_pDrawWidget->GetFramework().OnLocationError(errorCode);
 }
@@ -656,9 +642,7 @@ void MainWindow::OnUploadEditsMenuItem()
 void MainWindow::OnBeforeEngineCreation()
 {
   m_pDrawWidget->GetFramework().SetMyPositionModeListener([this](location::EMyPositionMode mode, bool /*routingActive*/)
-  {
-    LocationStateModeChanged(mode);
-  });
+  { LocationStateModeChanged(mode); });
 }
 
 void MainWindow::OnPreferences()
@@ -814,7 +798,7 @@ void MainWindow::OnBuildPhonePackage()
     msgBox.exec();
   }
 }
-#endif // BUILD_DESIGNER
+#endif  // BUILD_DESIGNER
 
 #ifndef NO_DOWNLOADER
 void MainWindow::ShowUpdateDialog()
@@ -824,7 +808,7 @@ void MainWindow::ShowUpdateDialog()
   m_pDrawWidget->update();
 }
 
-#endif // NO_DOWNLOADER
+#endif  // NO_DOWNLOADER
 
 void MainWindow::CreateSearchBarAndPanel()
 {
@@ -834,8 +818,8 @@ void MainWindow::CreateSearchBarAndPanel()
   m_Docks[0]->setWidget(panel);
 }
 
-void MainWindow::CreatePanelImpl(size_t i, Qt::DockWidgetArea area, QString const & name,
-                                 QKeySequence const & hotkey, char const * slot)
+void MainWindow::CreatePanelImpl(size_t i, Qt::DockWidgetArea area, QString const & name, QKeySequence const & hotkey,
+                                 char const * slot)
 {
   ASSERT_LESS(i, m_Docks.size(), ());
   m_Docks[i] = new QDockWidget(name, this);
diff --git a/qt/mainwindow.hpp b/qt/mainwindow.hpp
index 07973c6ec..20b944f21 100644
--- a/qt/mainwindow.hpp
+++ b/qt/mainwindow.hpp
@@ -12,15 +12,18 @@
 #include <QtWidgets/QMainWindow>
 
 #include <array>
-#include <string>
 #include <memory>
+#include <string>
 
 class Framework;
 class QDockWidget;
 class QLabel;
 class QPushButton;
 
-namespace search { class Result; }
+namespace search
+{
+class Result;
+}
 
 namespace qt
 {
@@ -28,7 +31,9 @@ class DrawWidget;
 class PopupMenuHolder;
 struct ScreenshotParams;
 
-class MainWindow : public QMainWindow, location::LocationObserver
+class MainWindow
+  : public QMainWindow
+  , location::LocationObserver
 {
   DrawWidget * m_pDrawWidget = nullptr;
   // TODO(mgsergio): Make indexing more informative.
@@ -52,7 +57,7 @@ class MainWindow : public QMainWindow, location::LocationObserver
   {
     /// @todo Uncomment when we will integrate a traffic provider.
     // TRAFFIC = 0,
-    TRANSIT = 0,      // Metro scheme
+    TRANSIT = 0,  // Metro scheme
     ISOLINES,
     OUTDOORS,
   };
@@ -68,17 +73,17 @@ class MainWindow : public QMainWindow, location::LocationObserver
   QAction * m_pGetStatisticsAction = nullptr;
   QAction * m_pRunTestsAction = nullptr;
   QAction * m_pBuildPhonePackAction = nullptr;
-#endif // BUILD_DESIGNER
+#endif  // BUILD_DESIGNER
 
   Q_OBJECT
 
 public:
-  MainWindow(Framework & framework, std::unique_ptr<ScreenshotParams> && screenshotParams,
-             QRect const & screenGeometry
+  MainWindow(Framework & framework, std::unique_ptr<ScreenshotParams> && screenshotParams, QRect const & screenGeometry
 #ifdef BUILD_DESIGNER
-             , QString const & mapcssFilePath = QString()
+             ,
+             QString const & mapcssFilePath = QString()
 #endif
-            );
+  );
 
 protected:
   Framework & GetFramework() const;
@@ -87,8 +92,8 @@ protected:
   void OnLocationUpdated(location::GpsInfo const & info) override;
   void LocationStateModeChanged(location::EMyPositionMode mode);
 
-  void CreatePanelImpl(size_t i, Qt::DockWidgetArea area, QString const & name,
-                       QKeySequence const & hotkey, char const * slot);
+  void CreatePanelImpl(size_t i, Qt::DockWidgetArea area, QString const & name, QKeySequence const & hotkey,
+                       char const * slot);
   void CreateNavigationBar();
   void CreateSearchBarAndPanel();
   void CreateCountryStatusControls();
@@ -105,7 +110,7 @@ protected:
 protected Q_SLOTS:
 #ifndef NO_DOWNLOADER
   void ShowUpdateDialog();
-#endif // NO_DOWNLOADER
+#endif  // NO_DOWNLOADER
 
   void OnPreferences();
   void OnAbout();
@@ -142,6 +147,6 @@ protected Q_SLOTS:
   void OnGetStatistics();
   void OnRunTests();
   void OnBuildPhonePackage();
-#endif // BUILD_DESIGNER
+#endif  // BUILD_DESIGNER
 };
 }  // namespace qt
diff --git a/qt/mwms_borders_selection.cpp b/qt/mwms_borders_selection.cpp
index c0446fd32..75305a894 100644
--- a/qt/mwms_borders_selection.cpp
+++ b/qt/mwms_borders_selection.cpp
@@ -4,13 +4,12 @@
 
 #include <QtWidgets/QDialogButtonBox>
 #include <QtWidgets/QRadioButton>
-#include <QtWidgets/QVBoxLayout>
 #include <QtWidgets/QSplitter>
+#include <QtWidgets/QVBoxLayout>
 
 namespace qt
 {
-MwmsBordersSelection::MwmsBordersSelection(QWidget * parent)
-  : QDialog(parent)
+MwmsBordersSelection::MwmsBordersSelection(QWidget * parent) : QDialog(parent)
 {
   setWindowTitle("Mwms borders selection settings");
 
@@ -26,8 +25,7 @@ QGroupBox * MwmsBordersSelection::CreateButtonBoxGroup()
 {
   auto * groupBox = new QGroupBox();
 
-  auto * buttonBox =
-      new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, this);
+  auto * buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, Qt::Horizontal, this);
 
   auto * vbox = new QVBoxLayout;
 
diff --git a/qt/osm_auth_dialog.cpp b/qt/osm_auth_dialog.cpp
index e8894b3f1..a490c9dbf 100644
--- a/qt/osm_auth_dialog.cpp
+++ b/qt/osm_auth_dialog.cpp
@@ -128,4 +128,4 @@ void OsmAuthDialog::OnAction()
     SwitchToLogin(this);
   }
 }
-} // namespace qt
+}  // namespace qt
diff --git a/qt/osm_auth_dialog.hpp b/qt/osm_auth_dialog.hpp
index 258507b23..0558c3b79 100644
--- a/qt/osm_auth_dialog.hpp
+++ b/qt/osm_auth_dialog.hpp
@@ -8,6 +8,7 @@ namespace qt
 class OsmAuthDialog : public QDialog
 {
   Q_OBJECT
+
 public:
   explicit OsmAuthDialog(QWidget * parent);
 
@@ -15,4 +16,4 @@ private slots:
   void OnAction();
 };
 
-} // namespace qt
+}  // namespace qt
diff --git a/qt/place_page_dialog_common.cpp b/qt/place_page_dialog_common.cpp
index ed6e213f9..98f30c7b1 100644
--- a/qt/place_page_dialog_common.cpp
+++ b/qt/place_page_dialog_common.cpp
@@ -11,46 +11,32 @@ void addCommonButtons(QDialog * this_, QDialogButtonBox * dbb, bool shouldShowEd
   QPushButton * fromButton = new QPushButton("Route From");
   fromButton->setIcon(QIcon(":/navig64/point-start.png"));
   fromButton->setAutoDefault(false);
-  this_->connect(fromButton, &QAbstractButton::clicked, this_, [this_]
-  {
-    this_->done(RouteFrom);
-  });
+  this_->connect(fromButton, &QAbstractButton::clicked, this_, [this_] { this_->done(RouteFrom); });
   dbb->addButton(fromButton, QDialogButtonBox::ActionRole);
 
   QPushButton * addStopButton = new QPushButton("Add Stop");
   addStopButton->setIcon(QIcon(":/navig64/point-intermediate.png"));
   addStopButton->setAutoDefault(false);
-  this_->connect(addStopButton, &QAbstractButton::clicked, this_, [this_]
-  {
-    this_->done(AddStop);
-  });
+  this_->connect(addStopButton, &QAbstractButton::clicked, this_, [this_] { this_->done(AddStop); });
   dbb->addButton(addStopButton, QDialogButtonBox::ActionRole);
 
   QPushButton * routeToButton = new QPushButton("Route To");
   routeToButton->setIcon(QIcon(":/navig64/point-finish.png"));
   routeToButton->setAutoDefault(false);
-  this_->connect(routeToButton, &QAbstractButton::clicked, this_, [this_]
-  {
-    this_->done(RouteTo);
-  });
+  this_->connect(routeToButton, &QAbstractButton::clicked, this_, [this_] { this_->done(RouteTo); });
   dbb->addButton(routeToButton, QDialogButtonBox::ActionRole);
 
   QPushButton * closeButton = new QPushButton("Close");
   closeButton->setDefault(true);
-  this_->connect(closeButton, &QAbstractButton::clicked, this_, [this_]
-  {
-    this_->done(place_page_dialog::Close);
-  });
+  this_->connect(closeButton, &QAbstractButton::clicked, this_, [this_] { this_->done(place_page_dialog::Close); });
   dbb->addButton(closeButton, QDialogButtonBox::RejectRole);
 
   if (shouldShowEditPlace)
   {
     QPushButton * editButton = new QPushButton("Edit Place");
-    this_->connect(editButton, &QAbstractButton::clicked, this_, [this_]
-    {
-      this_->done(place_page_dialog::EditPlace);
-    });
+    this_->connect(editButton, &QAbstractButton::clicked, this_,
+                   [this_] { this_->done(place_page_dialog::EditPlace); });
     dbb->addButton(editButton, QDialogButtonBox::AcceptRole);
   }
 }
-}
+}  // namespace place_page_dialog
diff --git a/qt/place_page_dialog_common.hpp b/qt/place_page_dialog_common.hpp
index 490d648fe..364c6f707 100644
--- a/qt/place_page_dialog_common.hpp
+++ b/qt/place_page_dialog_common.hpp
@@ -5,7 +5,8 @@
 
 namespace place_page_dialog
 {
-enum PressedButton : int {
+enum PressedButton : int
+{
   Close = QDialog::Rejected,
   RouteFrom,
   AddStop,
@@ -14,4 +15,4 @@ enum PressedButton : int {
 };
 
 void addCommonButtons(QDialog * this_, QDialogButtonBox * dbb, bool shouldShowEditPlace);
-}
+}  // namespace place_page_dialog
diff --git a/qt/place_page_dialog_developer.cpp b/qt/place_page_dialog_developer.cpp
index acc31a9ab..0db67dad7 100644
--- a/qt/place_page_dialog_developer.cpp
+++ b/qt/place_page_dialog_developer.cpp
@@ -1,5 +1,5 @@
-#include "qt/place_page_dialog_common.hpp"
 #include "qt/place_page_dialog_developer.hpp"
+#include "qt/place_page_dialog_common.hpp"
 
 #include "qt/qt_common/text_dialog.hpp"
 
@@ -117,11 +117,8 @@ PlacePageDialogDeveloper::PlacePageDialogDeveloper(QWidget * parent, place_page:
     case PropID::FMD_CONTACT_BLUESKY:
     case PropID::FMD_WIKIPEDIA:
     case PropID::FMD_WIKIMEDIA_COMMONS:
-    case PropID::FMD_PANORAMAX:
-      isLink = true;
-      break;
-    default:
-      break;
+    case PropID::FMD_PANORAMAX: isLink = true; break;
+    default: break;
     }
 
     addEntry(DebugPrint(id), value, isLink);
diff --git a/qt/place_page_dialog_developer.hpp b/qt/place_page_dialog_developer.hpp
index 075b58617..e48113b30 100644
--- a/qt/place_page_dialog_developer.hpp
+++ b/qt/place_page_dialog_developer.hpp
@@ -12,6 +12,7 @@ class Info;
 class PlacePageDialogDeveloper : public QDialog
 {
   Q_OBJECT
+
 public:
   PlacePageDialogDeveloper(QWidget * parent, place_page::Info const & info,
                            search::ReverseGeocoder::Address const & address);
diff --git a/qt/place_page_dialog_user.cpp b/qt/place_page_dialog_user.cpp
index 63499e7dd..3e6d12f0e 100644
--- a/qt/place_page_dialog_user.cpp
+++ b/qt/place_page_dialog_user.cpp
@@ -1,18 +1,18 @@
-#include "qt/place_page_dialog_common.hpp"
 #include "qt/place_page_dialog_user.hpp"
+#include "qt/place_page_dialog_common.hpp"
 
 #include "qt/qt_common/text_dialog.hpp"
 
-#include "map/place_page_info.hpp"
 #include "indexer/validate_and_format_contacts.hpp"
+#include "map/place_page_info.hpp"
 #include "platform/settings.hpp"
 
+#include <QtWidgets/QDialog>
 #include <QtWidgets/QDialogButtonBox>
 #include <QtWidgets/QGridLayout>
-#include <QtWidgets/QVBoxLayout>
 #include <QtWidgets/QLabel>
 #include <QtWidgets/QPushButton>
-#include <QtWidgets/QDialog>
+#include <QtWidgets/QVBoxLayout>
 
 #include <sstream>
 #include <string>
@@ -22,7 +22,7 @@ namespace
 static int constexpr kMaxLengthOfPlacePageDescription = 500;
 static int constexpr kMinWidthOfShortDescription = 390;
 
-std::string getShortDescription(const std::string & description)
+std::string getShortDescription(std::string const & description)
 {
   std::string_view view(description);
 
@@ -38,12 +38,11 @@ std::string getShortDescription(const std::string & description)
   return std::string(view);
 }
 
-std::string_view stripSchemeFromURI(std::string_view uri) {
+std::string_view stripSchemeFromURI(std::string_view uri)
+{
   for (std::string_view prefix : {"https://", "http://"})
-  {
     if (uri.starts_with(prefix))
       return uri.substr(prefix.size());
-  }
   return uri;
 }
 }  // namespace
@@ -121,19 +120,19 @@ PlacePageDialogUser::PlacePageDialogUser(QWidget * parent, place_page::Info cons
     if (info.IsBookmark())
       addEntry("Bookmark", "Yes");
 
-
     // Wikipedia fragment
     if (auto const & wikipedia = info.GetMetadata(feature::Metadata::EType::FMD_WIKIPEDIA); !wikipedia.empty())
     {
       QLabel * name = new QLabel("Wikipedia");
       name->setOpenExternalLinks(true);
       name->setTextInteractionFlags(Qt::TextBrowserInteraction);
-      name->setText(QString::fromStdString("<a href=\"" + feature::Metadata::ToWikiURL(std::string(wikipedia)) + "\">Wikipedia</a>"));
+      name->setText(QString::fromStdString("<a href=\"" + feature::Metadata::ToWikiURL(std::string(wikipedia)) +
+                                           "\">Wikipedia</a>"));
       data->addWidget(name, row++, 0);
     }
 
     // Description
-    if (const auto & description = info.GetWikiDescription(); !description.empty())
+    if (auto const & description = info.GetWikiDescription(); !description.empty())
     {
       auto descriptionShort = getShortDescription(description);
 
@@ -146,7 +145,8 @@ PlacePageDialogUser::PlacePageDialogUser(QWidget * parent, place_page::Info cons
       wikiButton->setAutoDefault(false);
       connect(wikiButton, &QAbstractButton::clicked, this, [this, description, title]()
       {
-        auto textDialog = TextDialog(this, QString::fromStdString(description), QString::fromStdString("Wikipedia: " + title));
+        auto textDialog =
+            TextDialog(this, QString::fromStdString(description), QString::fromStdString("Wikipedia: " + title));
         textDialog.exec();
       });
 
@@ -169,7 +169,8 @@ PlacePageDialogUser::PlacePageDialogUser(QWidget * parent, place_page::Info cons
     {
       data->addWidget(new QLabel("Phone"), row, 0);
 
-      QLabel * value = new QLabel(QString::fromStdString("<a href='tel:" + std::string(phoneNumber) + "'>" + std::string(phoneNumber) + "</a>"));
+      QLabel * value = new QLabel(QString::fromStdString("<a href='tel:" + std::string(phoneNumber) + "'>" +
+                                                         std::string(phoneNumber) + "</a>"));
       value->setOpenExternalLinks(true);
 
       data->addWidget(value, row++, 1);
@@ -191,7 +192,8 @@ PlacePageDialogUser::PlacePageDialogUser(QWidget * parent, place_page::Info cons
     {
       data->addWidget(new QLabel("Email"), row, 0);
 
-      QLabel * value = new QLabel(QString::fromStdString("<a href='mailto:" + std::string(email) + "'>" + std::string(email) + "</a>"));
+      QLabel * value = new QLabel(
+          QString::fromStdString("<a href='mailto:" + std::string(email) + "'>" + std::string(email) + "</a>"));
       value->setOpenExternalLinks(true);
 
       data->addWidget(value, row++, 1);
@@ -199,13 +201,14 @@ PlacePageDialogUser::PlacePageDialogUser(QWidget * parent, place_page::Info cons
 
     // Social networks
     {
-      auto addSocialNetworkWidget = [data, &info, &row](const std::string label, const feature::Metadata::EType eType)
+      auto addSocialNetworkWidget = [data, &info, &row](std::string const label, feature::Metadata::EType const eType)
       {
         if (auto item = info.GetMetadata(eType); !item.empty())
         {
           data->addWidget(new QLabel(QString::fromStdString(label)), row, 0);
 
-          QLabel * value = new QLabel(QString::fromStdString("<a href='" + osm::socialContactToURL(eType, std::string(item)) + "'>" + std::string(item) + "</a>"));
+          QLabel * value = new QLabel(QString::fromStdString(
+              "<a href='" + osm::socialContactToURL(eType, std::string(item)) + "'>" + std::string(item) + "</a>"));
           value->setOpenExternalLinks(true);
           value->setTextInteractionFlags(Qt::TextBrowserInteraction);
 
@@ -222,11 +225,14 @@ PlacePageDialogUser::PlacePageDialogUser(QWidget * parent, place_page::Info cons
       addSocialNetworkWidget("Bluesky", feature::Metadata::EType::FMD_CONTACT_BLUESKY);
     }
 
-    if (auto wikimedia_commons = info.GetMetadata(feature::Metadata::EType::FMD_WIKIMEDIA_COMMONS); !wikimedia_commons.empty())
+    if (auto wikimedia_commons = info.GetMetadata(feature::Metadata::EType::FMD_WIKIMEDIA_COMMONS);
+        !wikimedia_commons.empty())
     {
       data->addWidget(new QLabel("Wikimedia Commons"), row, 0);
 
-      QLabel * value = new QLabel(QString::fromStdString("<a href='" + feature::Metadata::ToWikimediaCommonsURL(std::string(wikimedia_commons)) + "'>Wikimedia Commons</a>"));
+      QLabel * value = new QLabel(QString::fromStdString(
+          "<a href='" + feature::Metadata::ToWikimediaCommonsURL(std::string(wikimedia_commons)) +
+          "'>Wikimedia Commons</a>"));
       value->setOpenExternalLinks(true);
       value->setTextInteractionFlags(Qt::TextBrowserInteraction);
 
@@ -237,7 +243,8 @@ PlacePageDialogUser::PlacePageDialogUser(QWidget * parent, place_page::Info cons
     {
       data->addWidget(new QLabel("Panoramax Picture"), row, 0);
 
-      QLabel * value = new QLabel(QString::fromStdString("<a href='https://api.panoramax.xyz/?pic=" + std::string(panoramax) + "'>Panoramax Image</a>"));
+      QLabel * value = new QLabel(QString::fromStdString(
+          "<a href='https://api.panoramax.xyz/?pic=" + std::string(panoramax) + "'>Panoramax Image</a>"));
       value->setOpenExternalLinks(true);
       value->setTextInteractionFlags(Qt::TextBrowserInteraction);
 
@@ -265,7 +272,7 @@ PlacePageDialogUser::PlacePageDialogUser(QWidget * parent, place_page::Info cons
     layout->addLayout(data);
   }
 
-  layout->addStretch(); 
+  layout->addStretch();
 
   {
     QHLine * line = new QHLine();
diff --git a/qt/place_page_dialog_user.hpp b/qt/place_page_dialog_user.hpp
index e02e52fb5..bd6de21ff 100644
--- a/qt/place_page_dialog_user.hpp
+++ b/qt/place_page_dialog_user.hpp
@@ -12,6 +12,7 @@ class Info;
 class PlacePageDialogUser : public QDialog
 {
   Q_OBJECT
+
 public:
   PlacePageDialogUser(QWidget * parent, place_page::Info const & info,
                       search::ReverseGeocoder::Address const & address);
diff --git a/qt/popup_menu_holder.cpp b/qt/popup_menu_holder.cpp
index 0cb98514f..a19ffc32d 100644
--- a/qt/popup_menu_holder.cpp
+++ b/qt/popup_menu_holder.cpp
@@ -7,10 +7,7 @@
 namespace qt
 {
 
-PopupMenuHolder::PopupMenuHolder(QObject * parent)
-: QObject(parent)
-{
-}
+PopupMenuHolder::PopupMenuHolder(QObject * parent) : QObject(parent) {}
 
 QAction * PopupMenuHolder::addActionImpl(QIcon const & icon, QString const & text, bool checkable)
 {
@@ -57,4 +54,4 @@ bool PopupMenuHolder::isChecked(size_t idx)
   return m_actions[idx]->isChecked();
 }
 
-} // namespace qt
+}  // namespace qt
diff --git a/qt/popup_menu_holder.hpp b/qt/popup_menu_holder.hpp
index 7ef29b7e5..bde088f22 100644
--- a/qt/popup_menu_holder.hpp
+++ b/qt/popup_menu_holder.hpp
@@ -3,8 +3,8 @@
 #include <QtGui/QAction>
 #include <QtWidgets/QToolButton>
 
-#include <vector>
 #include <type_traits>
+#include <vector>
 
 namespace qt
 {
@@ -15,15 +15,15 @@ class PopupMenuHolder : public QObject
 
   QToolButton * m_toolButton;
 
-  std::vector<QAction*> m_actions;
+  std::vector<QAction *> m_actions;
 
   QAction * addActionImpl(QIcon const & icon, QString const & text, bool checkable);
 
 public:
   explicit PopupMenuHolder(QObject * parent = nullptr);
 
-  QAction * addAction(QIcon const & icon, QString const & text,
-                      QObject const * receiver, char const * member, bool checkable)
+  QAction * addAction(QIcon const & icon, QString const & text, QObject const * receiver, char const * member,
+                      bool checkable)
   {
     QAction * p = addActionImpl(icon, text, checkable);
     connect(p, SIGNAL(triggered()), receiver, member);
@@ -42,13 +42,19 @@ public:
   void setMainIcon(QIcon const & icon);
 
   void setCurrent(size_t idx);
-  template <class T> typename std::enable_if<std::is_enum<T>::value, void>::type
-  setCurrent(T idx) { setCurrent(static_cast<size_t>(idx)); }
+  template <class T>
+  typename std::enable_if<std::is_enum<T>::value, void>::type setCurrent(T idx)
+  {
+    setCurrent(static_cast<size_t>(idx));
+  }
 
   void setChecked(size_t idx, bool checked);
 
   bool isChecked(size_t idx);
-  template <class T> typename std::enable_if<std::is_enum<T>::value, bool>::type
-  isChecked(T idx) { return isChecked(static_cast<size_t>(idx)); }
+  template <class T>
+  typename std::enable_if<std::is_enum<T>::value, bool>::type isChecked(T idx)
+  {
+    return isChecked(static_cast<size_t>(idx));
+  }
 };
-} // namespace qt
+}  // namespace qt
diff --git a/qt/preferences_dialog.cpp b/qt/preferences_dialog.cpp
index 27a394a02..dae32db7a 100644
--- a/qt/preferences_dialog.cpp
+++ b/qt/preferences_dialog.cpp
@@ -1,7 +1,7 @@
 #include "qt/preferences_dialog.hpp"
 
-#include "indexer/map_style.hpp"
 #include "coding/string_utf8_multilang.hpp"
+#include "indexer/map_style.hpp"
 #include "map/framework.hpp"
 
 #include "platform/measurement_utils.hpp"
@@ -9,17 +9,17 @@
 #include "platform/settings.hpp"
 #include "platform/style_utils.hpp"
 
-#include <QtGui/QIcon>
 #include <QLocale>
-#include <QtWidgets/QComboBox>
+#include <QtGui/QIcon>
+#include <QtWidgets/QButtonGroup>
 #include <QtWidgets/QCheckBox>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QGroupBox>
 #include <QtWidgets/QHBoxLayout>
 #include <QtWidgets/QLabel>
-#include <QtWidgets/QVBoxLayout>
 #include <QtWidgets/QPushButton>
-#include <QtWidgets/QGroupBox>
-#include <QtWidgets/QButtonGroup>
 #include <QtWidgets/QRadioButton>
+#include <QtWidgets/QVBoxLayout>
 
 using namespace measurement_utils;
 
@@ -29,179 +29,174 @@ std::string const kEnabledAutoRegenGeomIndex = "EnabledAutoRegenGeomIndex";
 
 namespace qt
 {
-  PreferencesDialog::PreferencesDialog(QWidget * parent, Framework & framework)
+PreferencesDialog::PreferencesDialog(QWidget * parent, Framework & framework)
   : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
+{
+  QIcon icon(":/ui/logo.png");
+  setWindowIcon(icon);
+  setWindowTitle(tr("Preferences"));
+
+  QButtonGroup * unitsGroup = new QButtonGroup(this);
+  QGroupBox * unitsRadioBox = new QGroupBox("System of measurement");
   {
-    QIcon icon(":/ui/logo.png");
-    setWindowIcon(icon);
-    setWindowTitle(tr("Preferences"));
+    QHBoxLayout * layout = new QHBoxLayout();
 
-    QButtonGroup * unitsGroup = new QButtonGroup(this);
-    QGroupBox * unitsRadioBox = new QGroupBox("System of measurement");
+    QRadioButton * radioButton = new QRadioButton("Metric");
+    layout->addWidget(radioButton);
+    unitsGroup->addButton(radioButton, static_cast<int>(Units::Metric));
+
+    radioButton = new QRadioButton("Imperial (foot)");
+    layout->addWidget(radioButton);
+    unitsGroup->addButton(radioButton, static_cast<int>(Units::Imperial));
+
+    unitsRadioBox->setLayout(layout);
+
+    Units u;
+    if (!settings::Get(settings::kMeasurementUnits, u))
     {
-      QHBoxLayout * layout = new QHBoxLayout();
+      // Set default measurement from system locale
+      if (QLocale::system().measurementSystem() == QLocale::MetricSystem)
+        u = Units::Metric;
+      else
+        u = Units::Imperial;
+    }
+    unitsGroup->button(static_cast<int>(u))->setChecked(true);
 
-      QRadioButton * radioButton = new QRadioButton("Metric");
-      layout->addWidget(radioButton);
-      unitsGroup->addButton(radioButton, static_cast<int>(Units::Metric));
-
-      radioButton = new QRadioButton("Imperial (foot)");
-      layout->addWidget(radioButton);
-      unitsGroup->addButton(radioButton, static_cast<int>(Units::Imperial));
-
-      unitsRadioBox->setLayout(layout);
-
-      Units u;
-      if (!settings::Get(settings::kMeasurementUnits, u))
+    // Temporary to pass the address of overloaded function.
+    void (QButtonGroup::*buttonClicked)(int) = &QButtonGroup::idClicked;
+    connect(unitsGroup, buttonClicked, [&framework](int i)
+    {
+      Units u = Units::Metric;
+      switch (i)
       {
-        // Set default measurement from system locale
-        if (QLocale::system().measurementSystem() == QLocale::MetricSystem)
-          u = Units::Metric;
-        else
-          u = Units::Imperial;
+      case 0: u = Units::Metric; break;
+      case 1: u = Units::Imperial; break;
       }
-      unitsGroup->button(static_cast<int>(u))->setChecked(true);
 
-      // Temporary to pass the address of overloaded function.
-      void (QButtonGroup::* buttonClicked)(int) = &QButtonGroup::idClicked;
-      connect(unitsGroup, buttonClicked, [&framework](int i)
-      {
-        Units u = Units::Metric;
-        switch (i)
-        {
-        case 0: u = Units::Metric; break;
-        case 1: u = Units::Imperial; break;
-        }
-
-        settings::Set(settings::kMeasurementUnits, u);
-        framework.SetupMeasurementSystem();
-      });
-    }
-
-    QCheckBox * largeFontCheckBox = new QCheckBox("Use larger font on the map");
-    {
-      largeFontCheckBox->setChecked(framework.LoadLargeFontsSize());
-      connect(largeFontCheckBox, &QCheckBox::stateChanged, [&framework](int i)
-      {
-        framework.SetLargeFontsSize(static_cast<bool>(i));
-      });
-    }
-
-    QCheckBox * transliterationCheckBox = new QCheckBox("Transliterate to Latin");
-    {
-      transliterationCheckBox->setChecked(framework.LoadTransliteration());
-      connect(transliterationCheckBox, &QCheckBox::stateChanged, [&framework](int i)
-      {
-        bool const enable = i > 0;
-        framework.SaveTransliteration(enable);
-        framework.AllowTransliteration(enable);
-      });
-    }
-
-    QCheckBox * developerModeCheckBox = new QCheckBox("Developer Mode");
-    {
-      bool developerMode;
-      if (settings::Get(settings::kDeveloperMode, developerMode) && developerMode)
-        developerModeCheckBox->setChecked(developerMode);
-      connect(developerModeCheckBox, &QCheckBox::stateChanged, [](int i)
-      {
-        settings::Set(settings::kDeveloperMode, static_cast<bool>(i));
-      });
-    }
-
-    QLabel * mapLanguageLabel = new QLabel("Map Language");
-    QComboBox * mapLanguageComboBox = new QComboBox();
-    {
-      // The property maxVisibleItems is ignored for non-editable comboboxes in styles that
-      // return true for `QStyle::SH_ComboBox_Popup such as the Mac style or the Gtk+ Style.
-      // So we ensure that it returns false here.
-      mapLanguageComboBox->setStyleSheet("QComboBox { combobox-popup: 0; }");
-      mapLanguageComboBox->setMaxVisibleItems(10);
-      StringUtf8Multilang::Languages const & supportedLanguages = StringUtf8Multilang::GetSupportedLanguages(/* includeServiceLangs */ false);
-      QStringList languagesList = QStringList();
-      for (auto const & language : supportedLanguages)
-        languagesList << QString::fromStdString(std::string(language.m_name));
-
-      mapLanguageComboBox->addItems(languagesList);
-      std::string const & mapLanguageCode = framework.GetMapLanguageCode();
-      int8_t languageIndex = StringUtf8Multilang::GetLangIndex(mapLanguageCode);
-      if (languageIndex == StringUtf8Multilang::kUnsupportedLanguageCode)
-        languageIndex = StringUtf8Multilang::kDefaultCode;
-
-      mapLanguageComboBox->setCurrentText(QString::fromStdString(std::string(StringUtf8Multilang::GetLangNameByCode(languageIndex))));
-      connect(mapLanguageComboBox, &QComboBox::activated, [&framework, &supportedLanguages](int index)
-      {
-        auto const & mapLanguageCode = std::string(supportedLanguages[index].m_code);
-        framework.SetMapLanguageCode(mapLanguageCode);
-      });
-    }
-
-    QButtonGroup * nightModeGroup = new QButtonGroup(this);
-    QGroupBox * nightModeRadioBox = new QGroupBox("Night Mode");
-    {
-      using namespace style_utils;
-      QHBoxLayout * layout = new QHBoxLayout();
-
-      QRadioButton * radioButton = new QRadioButton("Off");
-      layout->addWidget(radioButton);
-      nightModeGroup->addButton(radioButton, static_cast<int>(NightMode::Off));
-
-      radioButton = new QRadioButton("On");
-      layout->addWidget(radioButton);
-      nightModeGroup->addButton(radioButton, static_cast<int>(NightMode::On));
-
-      nightModeRadioBox->setLayout(layout);
-
-      int const btn = MapStyleIsDark(framework.GetMapStyle()) ? 1 : 0;
-      nightModeGroup->button(btn)->setChecked(true);
-
-      void (QButtonGroup::* buttonClicked)(int) = &QButtonGroup::idClicked;
-      connect(nightModeGroup, buttonClicked, [&framework](int i)
-      {
-        auto const currStyle = framework.GetMapStyle();
-        framework.SetMapStyle((i == 0) ? GetLightMapStyleVariant(currStyle) :
-                                         GetDarkMapStyleVariant(currStyle));
-      });
-    }
-
-#ifdef BUILD_DESIGNER
-    QCheckBox * indexRegenCheckBox = new QCheckBox("Enable auto regeneration of geometry index");
-    {
-      bool enabled = false;
-      if (!settings::Get(kEnabledAutoRegenGeomIndex, enabled))
-        settings::Set(kEnabledAutoRegenGeomIndex, false);
-      indexRegenCheckBox->setChecked(enabled);
-      connect(indexRegenCheckBox, &QCheckBox::stateChanged, [](int i)
-      {
-        settings::Set(kEnabledAutoRegenGeomIndex, static_cast<bool>(i))
-      });
-    }
-#endif
-
-    QHBoxLayout * bottomLayout = new QHBoxLayout();
-    {
-      QPushButton * closeButton = new QPushButton(tr("Close"));
-      closeButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-      closeButton->setDefault(true);
-      connect(closeButton, &QAbstractButton::clicked, [this](){ done(0); });
-
-      bottomLayout->addStretch(1);
-      bottomLayout->setSpacing(0);
-      bottomLayout->addWidget(closeButton);
-    }
-
-    QVBoxLayout * finalLayout = new QVBoxLayout();
-    finalLayout->addWidget(unitsRadioBox);
-    finalLayout->addWidget(largeFontCheckBox);
-    finalLayout->addWidget(transliterationCheckBox);
-    finalLayout->addWidget(developerModeCheckBox);
-    finalLayout->addWidget(mapLanguageLabel);
-    finalLayout->addWidget(mapLanguageComboBox);
-    finalLayout->addWidget(nightModeRadioBox);
-#ifdef BUILD_DESIGNER
-    finalLayout->addWidget(indexRegenCheckBox);
-#endif
-    finalLayout->addLayout(bottomLayout);
-    setLayout(finalLayout);
+      settings::Set(settings::kMeasurementUnits, u);
+      framework.SetupMeasurementSystem();
+    });
   }
+
+  QCheckBox * largeFontCheckBox = new QCheckBox("Use larger font on the map");
+  {
+    largeFontCheckBox->setChecked(framework.LoadLargeFontsSize());
+    connect(largeFontCheckBox, &QCheckBox::stateChanged,
+            [&framework](int i) { framework.SetLargeFontsSize(static_cast<bool>(i)); });
+  }
+
+  QCheckBox * transliterationCheckBox = new QCheckBox("Transliterate to Latin");
+  {
+    transliterationCheckBox->setChecked(framework.LoadTransliteration());
+    connect(transliterationCheckBox, &QCheckBox::stateChanged, [&framework](int i)
+    {
+      bool const enable = i > 0;
+      framework.SaveTransliteration(enable);
+      framework.AllowTransliteration(enable);
+    });
+  }
+
+  QCheckBox * developerModeCheckBox = new QCheckBox("Developer Mode");
+  {
+    bool developerMode;
+    if (settings::Get(settings::kDeveloperMode, developerMode) && developerMode)
+      developerModeCheckBox->setChecked(developerMode);
+    connect(developerModeCheckBox, &QCheckBox::stateChanged,
+            [](int i) { settings::Set(settings::kDeveloperMode, static_cast<bool>(i)); });
+  }
+
+  QLabel * mapLanguageLabel = new QLabel("Map Language");
+  QComboBox * mapLanguageComboBox = new QComboBox();
+  {
+    // The property maxVisibleItems is ignored for non-editable comboboxes in styles that
+    // return true for `QStyle::SH_ComboBox_Popup such as the Mac style or the Gtk+ Style.
+    // So we ensure that it returns false here.
+    mapLanguageComboBox->setStyleSheet("QComboBox { combobox-popup: 0; }");
+    mapLanguageComboBox->setMaxVisibleItems(10);
+    StringUtf8Multilang::Languages const & supportedLanguages =
+        StringUtf8Multilang::GetSupportedLanguages(/* includeServiceLangs */ false);
+    QStringList languagesList = QStringList();
+    for (auto const & language : supportedLanguages)
+      languagesList << QString::fromStdString(std::string(language.m_name));
+
+    mapLanguageComboBox->addItems(languagesList);
+    std::string const & mapLanguageCode = framework.GetMapLanguageCode();
+    int8_t languageIndex = StringUtf8Multilang::GetLangIndex(mapLanguageCode);
+    if (languageIndex == StringUtf8Multilang::kUnsupportedLanguageCode)
+      languageIndex = StringUtf8Multilang::kDefaultCode;
+
+    mapLanguageComboBox->setCurrentText(
+        QString::fromStdString(std::string(StringUtf8Multilang::GetLangNameByCode(languageIndex))));
+    connect(mapLanguageComboBox, &QComboBox::activated, [&framework, &supportedLanguages](int index)
+    {
+      auto const & mapLanguageCode = std::string(supportedLanguages[index].m_code);
+      framework.SetMapLanguageCode(mapLanguageCode);
+    });
+  }
+
+  QButtonGroup * nightModeGroup = new QButtonGroup(this);
+  QGroupBox * nightModeRadioBox = new QGroupBox("Night Mode");
+  {
+    using namespace style_utils;
+    QHBoxLayout * layout = new QHBoxLayout();
+
+    QRadioButton * radioButton = new QRadioButton("Off");
+    layout->addWidget(radioButton);
+    nightModeGroup->addButton(radioButton, static_cast<int>(NightMode::Off));
+
+    radioButton = new QRadioButton("On");
+    layout->addWidget(radioButton);
+    nightModeGroup->addButton(radioButton, static_cast<int>(NightMode::On));
+
+    nightModeRadioBox->setLayout(layout);
+
+    int const btn = MapStyleIsDark(framework.GetMapStyle()) ? 1 : 0;
+    nightModeGroup->button(btn)->setChecked(true);
+
+    void (QButtonGroup::*buttonClicked)(int) = &QButtonGroup::idClicked;
+    connect(nightModeGroup, buttonClicked, [&framework](int i)
+    {
+      auto const currStyle = framework.GetMapStyle();
+      framework.SetMapStyle((i == 0) ? GetLightMapStyleVariant(currStyle) : GetDarkMapStyleVariant(currStyle));
+    });
+  }
+
+#ifdef BUILD_DESIGNER
+  QCheckBox * indexRegenCheckBox = new QCheckBox("Enable auto regeneration of geometry index");
+  {
+    bool enabled = false;
+    if (!settings::Get(kEnabledAutoRegenGeomIndex, enabled))
+      settings::Set(kEnabledAutoRegenGeomIndex, false);
+    indexRegenCheckBox->setChecked(enabled);
+    connect(indexRegenCheckBox, &QCheckBox::stateChanged,
+            [](int i) { settings::Set(kEnabledAutoRegenGeomIndex, static_cast<bool>(i)) });
+  }
+#endif
+
+  QHBoxLayout * bottomLayout = new QHBoxLayout();
+  {
+    QPushButton * closeButton = new QPushButton(tr("Close"));
+    closeButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+    closeButton->setDefault(true);
+    connect(closeButton, &QAbstractButton::clicked, [this]() { done(0); });
+
+    bottomLayout->addStretch(1);
+    bottomLayout->setSpacing(0);
+    bottomLayout->addWidget(closeButton);
+  }
+
+  QVBoxLayout * finalLayout = new QVBoxLayout();
+  finalLayout->addWidget(unitsRadioBox);
+  finalLayout->addWidget(largeFontCheckBox);
+  finalLayout->addWidget(transliterationCheckBox);
+  finalLayout->addWidget(developerModeCheckBox);
+  finalLayout->addWidget(mapLanguageLabel);
+  finalLayout->addWidget(mapLanguageComboBox);
+  finalLayout->addWidget(nightModeRadioBox);
+#ifdef BUILD_DESIGNER
+  finalLayout->addWidget(indexRegenCheckBox);
+#endif
+  finalLayout->addLayout(bottomLayout);
+  setLayout(finalLayout);
 }
+}  // namespace qt
diff --git a/qt/preferences_dialog.hpp b/qt/preferences_dialog.hpp
index 735d9435f..4cb23a296 100644
--- a/qt/preferences_dialog.hpp
+++ b/qt/preferences_dialog.hpp
@@ -8,16 +8,16 @@ class Framework;
 
 namespace qt
 {
-  class PreferencesDialog : public QDialog
-  {
-    typedef QDialog base_t;
+class PreferencesDialog : public QDialog
+{
+  typedef QDialog base_t;
 
-    Q_OBJECT
+  Q_OBJECT
 
-  public:
-    PreferencesDialog(QWidget * parent, Framework & framework);
-  };
-} // namespace qt
+public:
+  PreferencesDialog(QWidget * parent, Framework & framework);
+};
+}  // namespace qt
 
 #ifdef BUILD_DESIGNER
 extern std::string const kEnabledAutoRegenGeomIndex;
diff --git a/qt/qt_common/helpers.cpp b/qt/qt_common/helpers.cpp
index 4f55fc9f9..f6698a7f9 100644
--- a/qt/qt_common/helpers.cpp
+++ b/qt/qt_common/helpers.cpp
@@ -10,25 +10,40 @@
 namespace qt::common
 {
 
-bool IsLeftButton(Qt::MouseButtons buttons) { return buttons & Qt::LeftButton; }
+bool IsLeftButton(Qt::MouseButtons buttons)
+{
+  return buttons & Qt::LeftButton;
+}
 
 bool IsLeftButton(QMouseEvent const * const e)
 {
   return IsLeftButton(e->button()) || IsLeftButton(e->buttons());
 }
 
-bool IsRightButton(Qt::MouseButtons buttons) { return buttons & Qt::RightButton; }
+bool IsRightButton(Qt::MouseButtons buttons)
+{
+  return buttons & Qt::RightButton;
+}
 
 bool IsRightButton(QMouseEvent const * const e)
 {
   return IsRightButton(e->button()) || IsRightButton(e->buttons());
 }
 
-bool IsCommandModifier(QMouseEvent const * const e) { return e->modifiers() & Qt::ControlModifier; }
+bool IsCommandModifier(QMouseEvent const * const e)
+{
+  return e->modifiers() & Qt::ControlModifier;
+}
 
-bool IsShiftModifier(QMouseEvent const * const e) { return e->modifiers() & Qt::ShiftModifier; }
+bool IsShiftModifier(QMouseEvent const * const e)
+{
+  return e->modifiers() & Qt::ShiftModifier;
+}
 
-bool IsAltModifier(QMouseEvent const * const e) { return e->modifiers() & Qt::AltModifier; }
+bool IsAltModifier(QMouseEvent const * const e)
+{
+  return e->modifiers() & Qt::AltModifier;
+}
 
 location::GpsInfo MakeGpsInfo(m2::PointD const & point)
 {
@@ -78,4 +93,4 @@ void SetDefaultSurfaceFormat(QString const & platformName)
   QSurfaceFormat::setDefaultFormat(fmt);
 }
 
-} // namespace qt::common
+}  // namespace qt::common
diff --git a/qt/qt_common/helpers.hpp b/qt/qt_common/helpers.hpp
index e56484227..81afef067 100644
--- a/qt/qt_common/helpers.hpp
+++ b/qt/qt_common/helpers.hpp
@@ -28,4 +28,4 @@ struct Hotkey
 location::GpsInfo MakeGpsInfo(m2::PointD const & point);
 
 void SetDefaultSurfaceFormat(QString const & platformName);
-} // namespace qt::common
+}  // namespace qt::common
diff --git a/qt/qt_common/map_widget.cpp b/qt/qt_common/map_widget.cpp
index dc3f2455a..08b10284c 100644
--- a/qt/qt_common/map_widget.cpp
+++ b/qt/qt_common/map_widget.cpp
@@ -15,14 +15,14 @@
 #include <functional>
 #include <string>
 
-#include <QOpenGLShaderProgram>
 #include <QOpenGLBuffer>
+#include <QOpenGLShaderProgram>
 #include <QOpenGLVertexArrayObject>
 #include <QTouchEvent>
 
+#include <QtGui/QAction>
 #include <QtGui/QMouseEvent>
 #include <QtGui/QOpenGLFunctions>
-#include <QtGui/QAction>
 #include <QtWidgets/QMenu>
 
 // Fraction of the viewport for a move event
@@ -33,7 +33,7 @@ static constexpr float kViewportFractionSmoothMove = 0.1;
 
 namespace qt::common
 {
-//#define ENABLE_AA_SWITCH
+// #define ENABLE_AA_SWITCH
 
 MapWidget::MapWidget(Framework & framework, bool isScreenshotMode, QWidget * parent)
   : QOpenGLWidget(parent)
@@ -116,8 +116,7 @@ void MapWidget::CreateEngine()
 
   m_skin.reset(new gui::Skin(gui::ResolveGuiSkinFile("default"), m_ratio));
   m_skin->Resize(p.m_surfaceWidth, p.m_surfaceHeight);
-  m_skin->ForEach(
-      [&p](gui::EWidget widget, gui::Position const & pos) { p.m_widgetsInitInfo[widget] = pos; });
+  m_skin->ForEach([&p](gui::EWidget widget, gui::Position const & pos) { p.m_widgetsInitInfo[widget] = pos; });
 
   p.m_widgetsInitInfo[gui::WIDGET_SCALE_FPS_LABEL] = gui::Position(dp::LeftTop);
 
@@ -125,29 +124,65 @@ void MapWidget::CreateEngine()
   m_framework.SetViewportListener(std::bind(&MapWidget::OnViewportChanged, this, std::placeholders::_1));
 }
 
-void MapWidget::ScalePlus() { m_framework.Scale(Framework::SCALE_MAG, true); }
+void MapWidget::ScalePlus()
+{
+  m_framework.Scale(Framework::SCALE_MAG, true);
+}
 
-void MapWidget::ScaleMinus() { m_framework.Scale(Framework::SCALE_MIN, true); }
+void MapWidget::ScaleMinus()
+{
+  m_framework.Scale(Framework::SCALE_MIN, true);
+}
 
-void MapWidget::ScalePlusLight() { m_framework.Scale(Framework::SCALE_MAG_LIGHT, true); }
+void MapWidget::ScalePlusLight()
+{
+  m_framework.Scale(Framework::SCALE_MAG_LIGHT, true);
+}
 
-void MapWidget::ScaleMinusLight() { m_framework.Scale(Framework::SCALE_MIN_LIGHT, true); }
+void MapWidget::ScaleMinusLight()
+{
+  m_framework.Scale(Framework::SCALE_MIN_LIGHT, true);
+}
 
-void MapWidget::MoveRight() { m_framework.Move(-kViewportFractionRoughMove, 0, true); }
+void MapWidget::MoveRight()
+{
+  m_framework.Move(-kViewportFractionRoughMove, 0, true);
+}
 
-void MapWidget::MoveRightSmooth() { m_framework.Move(-kViewportFractionSmoothMove, 0, true); }
+void MapWidget::MoveRightSmooth()
+{
+  m_framework.Move(-kViewportFractionSmoothMove, 0, true);
+}
 
-void MapWidget::MoveLeft() { m_framework.Move(kViewportFractionRoughMove, 0, true); }
+void MapWidget::MoveLeft()
+{
+  m_framework.Move(kViewportFractionRoughMove, 0, true);
+}
 
-void MapWidget::MoveLeftSmooth() { m_framework.Move(kViewportFractionSmoothMove, 0, true); }
+void MapWidget::MoveLeftSmooth()
+{
+  m_framework.Move(kViewportFractionSmoothMove, 0, true);
+}
 
-void MapWidget::MoveUp() { m_framework.Move(0, -kViewportFractionRoughMove, true); }
+void MapWidget::MoveUp()
+{
+  m_framework.Move(0, -kViewportFractionRoughMove, true);
+}
 
-void MapWidget::MoveUpSmooth() { m_framework.Move(0, -kViewportFractionSmoothMove, true); }
+void MapWidget::MoveUpSmooth()
+{
+  m_framework.Move(0, -kViewportFractionSmoothMove, true);
+}
 
-void MapWidget::MoveDown() { m_framework.Move(0, kViewportFractionRoughMove, true); }
+void MapWidget::MoveDown()
+{
+  m_framework.Move(0, kViewportFractionRoughMove, true);
+}
 
-void MapWidget::MoveDownSmooth() { m_framework.Move(0, kViewportFractionSmoothMove, true); }
+void MapWidget::MoveDownSmooth()
+{
+  m_framework.Move(0, kViewportFractionSmoothMove, true);
+}
 
 void MapWidget::AntialiasingOn()
 {
@@ -176,9 +211,15 @@ void MapWidget::ScaleChanged(int action)
     m_framework.Scale(factor, false);
 }
 
-void MapWidget::SliderPressed() { m_sliderState = SliderState::Pressed; }
+void MapWidget::SliderPressed()
+{
+  m_sliderState = SliderState::Pressed;
+}
 
-void MapWidget::SliderReleased() { m_sliderState = SliderState::Released; }
+void MapWidget::SliderReleased()
+{
+  m_sliderState = SliderState::Released;
+}
 
 m2::PointD MapWidget::GetDevicePoint(QMouseEvent * e) const
 {
@@ -233,11 +274,11 @@ void MapWidget::Build()
   std::string_view vertexSrc;
   std::string_view fragmentSrc;
 #if defined(OMIM_OS_LINUX)
-    vertexSrc = ":common/shaders/gles_300.vsh.glsl";
-    fragmentSrc = ":common/shaders/gles_300.fsh.glsl";
+  vertexSrc = ":common/shaders/gles_300.vsh.glsl";
+  fragmentSrc = ":common/shaders/gles_300.fsh.glsl";
 #else
-    vertexSrc = ":common/shaders/gl_150.vsh.glsl";
-    fragmentSrc = ":common/shaders/gl_150.fsh.glsl";
+  vertexSrc = ":common/shaders/gl_150.vsh.glsl";
+  fragmentSrc = ":common/shaders/gl_150.fsh.glsl";
 #endif
 
   m_program = std::make_unique<QOpenGLShaderProgram>(this);
@@ -254,12 +295,10 @@ void MapWidget::Build()
   m_vbo->create();
   m_vbo->bind();
 
-  QVector4D vertices[4] = {QVector4D(-1.0, 1.0, 0.0, 1.0),
-                           QVector4D(1.0, 1.0, 1.0, 1.0),
-                           QVector4D(-1.0, -1.0, 0.0, 0.0),
-                           QVector4D(1.0, -1.0, 1.0, 0.0)};
-  m_vbo->allocate(static_cast<void*>(vertices), sizeof(vertices));
-  QOpenGLFunctions *f = QOpenGLContext::currentContext()->functions();
+  QVector4D vertices[4] = {QVector4D(-1.0, 1.0, 0.0, 1.0), QVector4D(1.0, 1.0, 1.0, 1.0),
+                           QVector4D(-1.0, -1.0, 0.0, 0.0), QVector4D(1.0, -1.0, 1.0, 0.0)};
+  m_vbo->allocate(static_cast<void *>(vertices), sizeof(vertices));
+  QOpenGLFunctions * f = QOpenGLContext::currentContext()->functions();
   // 0-index of the buffer is linked to "a_position" attribute in vertex shader.
   // Introduced in https://github.com/organicmaps/organicmaps/pull/9814
   f->glEnableVertexAttribArray(0);
@@ -278,7 +317,7 @@ search::ReverseGeocoder::Address GetFeatureAddressInfo(Framework const & framewo
   coder.GetExactAddress(ft, address);
   return address;
 }
-} // namespace
+}  // namespace
 
 void MapWidget::ShowInfoPopup(QMouseEvent * e, m2::PointD const & pt)
 {
@@ -343,16 +382,12 @@ void MapWidget::initializeGL()
 #if defined(OMIM_OS_LINUX)
   {
     QOpenGLFunctions * funcs = context()->functions();
-    LOG(LINFO, ("Vendor:", funcs->glGetString(GL_VENDOR),
-                "\nRenderer:", funcs->glGetString(GL_RENDERER),
-                "\nVersion:", funcs->glGetString(GL_VERSION),
-                "\nShading language version:\n",funcs->glGetString(GL_SHADING_LANGUAGE_VERSION),
-                "\nExtensions:", funcs->glGetString(GL_EXTENSIONS)));
+    LOG(LINFO, ("Vendor:", funcs->glGetString(GL_VENDOR), "\nRenderer:", funcs->glGetString(GL_RENDERER),
+                "\nVersion:", funcs->glGetString(GL_VERSION), "\nShading language version:\n",
+                funcs->glGetString(GL_SHADING_LANGUAGE_VERSION), "\nExtensions:", funcs->glGetString(GL_EXTENSIONS)));
 
     if (!context()->isOpenGLES())
-    {
       LOG(LCRITICAL, ("Context is not LibGLES! This shouldn't have happened."));
-    }
 
     auto fmt = context()->format();
     if (context()->format().version() < qMakePair(3, 0))
@@ -407,7 +442,6 @@ void MapWidget::paintGL()
 
     m_program->release();
     m_vao->release();
-
   }
 }
 
@@ -422,8 +456,7 @@ void MapWidget::resizeGL(int width, int height)
     m_skin->Resize(w, h);
 
     gui::TWidgetsLayoutInfo layout;
-    m_skin->ForEach(
-        [&layout](gui::EWidget w, gui::Position const & pos) { layout[w] = pos.m_pixelPivot; });
+    m_skin->ForEach([&layout](gui::EWidget w, gui::Position const & pos) { layout[w] = pos.m_pixelPivot; });
 
     m_framework.SetWidgetLayout(std::move(layout));
   }
@@ -486,4 +519,4 @@ void MapWidget::wheelEvent(QWheelEvent * e)
   /// @todo Here you can tune the speed of zooming.
   m_framework.Scale(exp(factor), m2::PointD(L2D(pos.x()), L2D(pos.y())), false);
 }
-} // namespace qt::common
+}  // namespace qt::common
diff --git a/qt/qt_common/map_widget.hpp b/qt/qt_common/map_widget.hpp
index aacb29237..3e806f74c 100644
--- a/qt/qt_common/map_widget.hpp
+++ b/qt/qt_common/map_widget.hpp
@@ -35,7 +35,7 @@ public:
   void BindHotkeys(QWidget & parent);
   void BindSlider(ScaleSlider & slider);
   void CreateEngine();
-  void grabGestures(const QList<Qt::GestureType> &gestures);
+  void grabGestures(QList<Qt::GestureType> const & gestures);
 
 signals:
   void OnContextMenuRequested(QPoint const & p);
@@ -54,7 +54,6 @@ public slots:
   void MoveDown();
   void MoveDownSmooth();
 
-
   void ScaleChanged(int action);
   void SliderPressed();
   void SliderReleased();
@@ -89,7 +88,6 @@ protected:
   void paintGL() override;
   void resizeGL(int width, int height) override;
 
-
   void mouseDoubleClickEvent(QMouseEvent * e) override;
   void mousePressEvent(QMouseEvent * e) override;
   void mouseMoveEvent(QMouseEvent * e) override;
@@ -112,4 +110,4 @@ protected:
   std::unique_ptr<QOpenGLBuffer> m_vbo;
 };
 
-} // namespace qt::common
+}  // namespace qt::common
diff --git a/qt/qt_common/proxy_style.cpp b/qt/qt_common/proxy_style.cpp
index 62ce54185..b1fefd821 100644
--- a/qt/qt_common/proxy_style.cpp
+++ b/qt/qt_common/proxy_style.cpp
@@ -6,47 +6,42 @@ namespace common
 {
 ProxyStyle::ProxyStyle(QStyle * p) : QStyle(), style(p) {}
 
-void ProxyStyle::drawComplexControl(ComplexControl control, QStyleOptionComplex const * option,
-                                    QPainter * painter, QWidget const * widget) const
+void ProxyStyle::drawComplexControl(ComplexControl control, QStyleOptionComplex const * option, QPainter * painter,
+                                    QWidget const * widget) const
 {
   style->drawComplexControl(control, option, painter, widget);
 }
 
-void ProxyStyle::drawControl(ControlElement element, QStyleOption const * option,
-                             QPainter * painter, QWidget const * widget) const
+void ProxyStyle::drawControl(ControlElement element, QStyleOption const * option, QPainter * painter,
+                             QWidget const * widget) const
 {
   style->drawControl(element, option, painter, widget);
 }
 
-void ProxyStyle::drawItemPixmap(QPainter * painter, QRect const & rect, int alignment,
-                                QPixmap const & pixmap) const
+void ProxyStyle::drawItemPixmap(QPainter * painter, QRect const & rect, int alignment, QPixmap const & pixmap) const
 {
   style->drawItemPixmap(painter, rect, alignment, pixmap);
 }
 
-void ProxyStyle::drawItemText(QPainter * painter, QRect const & rect, int alignment,
-                              QPalette const & pal, bool enabled, QString const & text,
-                              QPalette::ColorRole textRole) const
+void ProxyStyle::drawItemText(QPainter * painter, QRect const & rect, int alignment, QPalette const & pal, bool enabled,
+                              QString const & text, QPalette::ColorRole textRole) const
 {
   style->drawItemText(painter, rect, alignment, pal, enabled, text, textRole);
 }
 
-void ProxyStyle::drawPrimitive(PrimitiveElement elem, QStyleOption const * option,
-                               QPainter * painter, QWidget const * widget) const
+void ProxyStyle::drawPrimitive(PrimitiveElement elem, QStyleOption const * option, QPainter * painter,
+                               QWidget const * widget) const
 {
   style->drawPrimitive(elem, option, painter, widget);
 }
 
-QPixmap ProxyStyle::generatedIconPixmap(QIcon::Mode iconMode, QPixmap const & pixmap,
-                                        QStyleOption const * option) const
+QPixmap ProxyStyle::generatedIconPixmap(QIcon::Mode iconMode, QPixmap const & pixmap, QStyleOption const * option) const
 {
   return style->generatedIconPixmap(iconMode, pixmap, option);
 }
 
-QStyle::SubControl ProxyStyle::hitTestComplexControl(ComplexControl control,
-                                                     QStyleOptionComplex const * option,
-                                                     QPoint const & pos,
-                                                     QWidget const * widget) const
+QStyle::SubControl ProxyStyle::hitTestComplexControl(ComplexControl control, QStyleOptionComplex const * option,
+                                                     QPoint const & pos, QWidget const * widget) const
 {
   return style->hitTestComplexControl(control, option, pos, widget);
 }
@@ -56,37 +51,47 @@ QRect ProxyStyle::itemPixmapRect(QRect const & rect, int alignment, QPixmap cons
   return style->itemPixmapRect(rect, alignment, pixmap);
 }
 
-QRect ProxyStyle::itemTextRect(QFontMetrics const & metrics, QRect const & rect, int alignment,
-                               bool enabled, QString const & text) const
+QRect ProxyStyle::itemTextRect(QFontMetrics const & metrics, QRect const & rect, int alignment, bool enabled,
+                               QString const & text) const
 {
   return style->itemTextRect(metrics, rect, alignment, enabled, text);
 }
 
-int ProxyStyle::pixelMetric(PixelMetric metric, QStyleOption const * option,
-                            QWidget const * widget) const
+int ProxyStyle::pixelMetric(PixelMetric metric, QStyleOption const * option, QWidget const * widget) const
 {
   return style->pixelMetric(metric, option, widget);
 }
 
-void ProxyStyle::polish(QWidget * widget) { style->polish(widget); }
+void ProxyStyle::polish(QWidget * widget)
+{
+  style->polish(widget);
+}
 
-void ProxyStyle::polish(QApplication * app) { style->polish(app); }
+void ProxyStyle::polish(QApplication * app)
+{
+  style->polish(app);
+}
 
-void ProxyStyle::polish(QPalette & pal) { style->polish(pal); }
+void ProxyStyle::polish(QPalette & pal)
+{
+  style->polish(pal);
+}
 
-QSize ProxyStyle::sizeFromContents(ContentsType type, QStyleOption const * option,
-                                   QSize const & contentsSize, QWidget const * widget) const
+QSize ProxyStyle::sizeFromContents(ContentsType type, QStyleOption const * option, QSize const & contentsSize,
+                                   QWidget const * widget) const
 {
   return style->sizeFromContents(type, option, contentsSize, widget);
 }
 
-QIcon ProxyStyle::standardIcon(StandardPixmap standardIcon, QStyleOption const * option,
-                               QWidget const * widget) const
+QIcon ProxyStyle::standardIcon(StandardPixmap standardIcon, QStyleOption const * option, QWidget const * widget) const
 {
   return style->standardIcon(standardIcon, option, widget);
 }
 
-QPalette ProxyStyle::standardPalette() const { return style->standardPalette(); }
+QPalette ProxyStyle::standardPalette() const
+{
+  return style->standardPalette();
+}
 
 QPixmap ProxyStyle::standardPixmap(StandardPixmap standardPixmap, QStyleOption const * option,
                                    QWidget const * widget) const
@@ -100,25 +105,29 @@ int ProxyStyle::styleHint(StyleHint hint, QStyleOption const * option, QWidget c
   return style->styleHint(hint, option, widget, returnData);
 }
 
-QRect ProxyStyle::subControlRect(ComplexControl control, QStyleOptionComplex const * option,
-                                 SubControl subControl, QWidget const * widget) const
+QRect ProxyStyle::subControlRect(ComplexControl control, QStyleOptionComplex const * option, SubControl subControl,
+                                 QWidget const * widget) const
 {
   return style->subControlRect(control, option, subControl, widget);
 }
 
-QRect ProxyStyle::subElementRect(SubElement element, QStyleOption const * option,
-                                 QWidget const * widget) const
+QRect ProxyStyle::subElementRect(SubElement element, QStyleOption const * option, QWidget const * widget) const
 {
   return style->subElementRect(element, option, widget);
 }
 
-void ProxyStyle::unpolish(QWidget * widget) { style->unpolish(widget); }
+void ProxyStyle::unpolish(QWidget * widget)
+{
+  style->unpolish(widget);
+}
 
-void ProxyStyle::unpolish(QApplication * app) { style->unpolish(app); }
+void ProxyStyle::unpolish(QApplication * app)
+{
+  style->unpolish(app);
+}
 
 int ProxyStyle::layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2,
-                              Qt::Orientation orientation, QStyleOption const * option,
-                              QWidget const * widget) const
+                              Qt::Orientation orientation, QStyleOption const * option, QWidget const * widget) const
 {
   return style->layoutSpacing(control1, control2, orientation, option, widget);
 }
diff --git a/qt/qt_common/proxy_style.hpp b/qt/qt_common/proxy_style.hpp
index 45faffeb2..3486710cc 100644
--- a/qt/qt_common/proxy_style.hpp
+++ b/qt/qt_common/proxy_style.hpp
@@ -12,26 +12,22 @@ public:
   explicit ProxyStyle(QStyle * p);
 
   // QStyle overrides:
-  void drawComplexControl(ComplexControl control, QStyleOptionComplex const * option,
-                          QPainter * painter, QWidget const * widget = 0) const override;
+  void drawComplexControl(ComplexControl control, QStyleOptionComplex const * option, QPainter * painter,
+                          QWidget const * widget = 0) const override;
   void drawControl(ControlElement element, QStyleOption const * option, QPainter * painter,
                    QWidget const * widget = 0) const override;
-  void drawItemPixmap(QPainter * painter, QRect const & rect, int alignment,
-                      QPixmap const & pixmap) const override;
-  void drawItemText(QPainter * painter, QRect const & rect, int alignment, QPalette const & pal,
-                    bool enabled, QString const & text,
-                    QPalette::ColorRole textRole = QPalette::NoRole) const override;
+  void drawItemPixmap(QPainter * painter, QRect const & rect, int alignment, QPixmap const & pixmap) const override;
+  void drawItemText(QPainter * painter, QRect const & rect, int alignment, QPalette const & pal, bool enabled,
+                    QString const & text, QPalette::ColorRole textRole = QPalette::NoRole) const override;
   void drawPrimitive(PrimitiveElement elem, QStyleOption const * option, QPainter * painter,
                      QWidget const * widget = 0) const override;
-  QPixmap generatedIconPixmap(QIcon::Mode iconMode, QPixmap const & pixmap,
-                              QStyleOption const * option) const override;
-  SubControl hitTestComplexControl(ComplexControl control, QStyleOptionComplex const * option,
-                                   QPoint const & pos, QWidget const * widget = 0) const override;
+  QPixmap generatedIconPixmap(QIcon::Mode iconMode, QPixmap const & pixmap, QStyleOption const * option) const override;
+  SubControl hitTestComplexControl(ComplexControl control, QStyleOptionComplex const * option, QPoint const & pos,
+                                   QWidget const * widget = 0) const override;
   QRect itemPixmapRect(QRect const & rect, int alignment, QPixmap const & pixmap) const override;
   QRect itemTextRect(QFontMetrics const & metrics, QRect const & rect, int alignment, bool enabled,
                      QString const & text) const override;
-  int pixelMetric(PixelMetric metric, QStyleOption const * option = 0,
-                  QWidget const * widget = 0) const override;
+  int pixelMetric(PixelMetric metric, QStyleOption const * option = 0, QWidget const * widget = 0) const override;
   void polish(QWidget * widget) override;
   void polish(QApplication * app) override;
   void polish(QPalette & pal) override;
@@ -44,15 +40,13 @@ public:
                          QWidget const * widget = 0) const override;
   int styleHint(StyleHint hint, QStyleOption const * option = 0, QWidget const * widget = 0,
                 QStyleHintReturn * returnData = 0) const override;
-  QRect subControlRect(ComplexControl control, QStyleOptionComplex const * option,
-                       SubControl subControl, QWidget const * widget = 0) const override;
-  QRect subElementRect(SubElement element, QStyleOption const * option,
+  QRect subControlRect(ComplexControl control, QStyleOptionComplex const * option, SubControl subControl,
                        QWidget const * widget = 0) const override;
+  QRect subElementRect(SubElement element, QStyleOption const * option, QWidget const * widget = 0) const override;
   void unpolish(QWidget * widget) override;
   void unpolish(QApplication * app) override;
-  int layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2,
-                    Qt::Orientation orientation, QStyleOption const * option = 0,
-                    QWidget const * widget = 0) const override;
+  int layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, Qt::Orientation orientation,
+                    QStyleOption const * option = 0, QWidget const * widget = 0) const override;
 
 private:
   QStyle * style;
diff --git a/qt/qt_common/qtoglcontext.cpp b/qt/qt_common/qtoglcontext.cpp
index ea503b9eb..d56d9ab6d 100644
--- a/qt/qt_common/qtoglcontext.cpp
+++ b/qt/qt_common/qtoglcontext.cpp
@@ -67,22 +67,18 @@ void QtRenderOGLContext::Resize(int w, int h)
 
   if (nw <= m_width && nh <= m_height && m_backFrame != nullptr)
   {
-    m_frameRect =
-      QRectF(0.0, 0.0, w / static_cast<float>(m_width), h / static_cast<float>(m_height));
+    m_frameRect = QRectF(0.0, 0.0, w / static_cast<float>(m_width), h / static_cast<float>(m_height));
     return;
   }
 
   m_width = nw;
   m_height = nh;
-  m_frameRect =
-    QRectF(0.0, 0.0, w / static_cast<float>(m_width), h / static_cast<float>(m_height));
+  m_frameRect = QRectF(0.0, 0.0, w / static_cast<float>(m_width), h / static_cast<float>(m_height));
 
-  m_backFrame = std::make_unique<QOpenGLFramebufferObject>(QSize(m_width, m_height),
-                                                           QOpenGLFramebufferObject::Depth);
-  m_frontFrame = std::make_unique<QOpenGLFramebufferObject>(QSize(m_width, m_height),
-                                                            QOpenGLFramebufferObject::Depth);
-  m_acquiredFrame = std::make_unique<QOpenGLFramebufferObject>(QSize(m_width, m_height),
-                                                               QOpenGLFramebufferObject::Depth);
+  m_backFrame = std::make_unique<QOpenGLFramebufferObject>(QSize(m_width, m_height), QOpenGLFramebufferObject::Depth);
+  m_frontFrame = std::make_unique<QOpenGLFramebufferObject>(QSize(m_width, m_height), QOpenGLFramebufferObject::Depth);
+  m_acquiredFrame =
+      std::make_unique<QOpenGLFramebufferObject>(QSize(m_width, m_height), QOpenGLFramebufferObject::Depth);
 }
 
 bool QtRenderOGLContext::AcquireFrame()
@@ -118,7 +114,8 @@ GLuint QtRenderOGLContext::GetTextureHandle() const
 }
 
 QtUploadOGLContext::QtUploadOGLContext(QOpenGLContext * rootContext, QOffscreenSurface * surface)
-  : m_surface(surface), m_ctx(std::make_unique<QOpenGLContext>())
+  : m_surface(surface)
+  , m_ctx(std::make_unique<QOpenGLContext>())
 {
   m_ctx->setFormat(rootContext->format());
   m_ctx->setShareContext(rootContext);
diff --git a/qt/qt_common/qtoglcontext.hpp b/qt/qt_common/qtoglcontext.hpp
index 4186dc252..7249180a3 100644
--- a/qt/qt_common/qtoglcontext.hpp
+++ b/qt/qt_common/qtoglcontext.hpp
@@ -48,7 +48,7 @@ private:
   std::mutex m_frameMutex;
 };
 
-class QtUploadOGLContext: public dp::OGLContext
+class QtUploadOGLContext : public dp::OGLContext
 {
 public:
   QtUploadOGLContext(QOpenGLContext * rootContext, QOffscreenSurface * surface);
diff --git a/qt/qt_common/scale_slider.cpp b/qt/qt_common/scale_slider.cpp
index 1c4b753c3..4ea632d82 100644
--- a/qt/qt_common/scale_slider.cpp
+++ b/qt/qt_common/scale_slider.cpp
@@ -23,7 +23,7 @@ class MyProxyStyle : public ProxyStyle
 public:
   explicit MyProxyStyle(QStyle * parent) : ProxyStyle(parent) {}
 
-  int styleHint(StyleHint hint, const QStyleOption * option, const QWidget * widget,
+  int styleHint(StyleHint hint, QStyleOption const * option, QWidget const * widget,
                 QStyleHintReturn * returnData) const override
   {
     if (hint == SH_Slider_AbsoluteSetButtons)
@@ -33,8 +33,7 @@ public:
 };
 }  // namespace
 
-ScaleSlider::ScaleSlider(Qt::Orientation orient, QWidget * parent)
-  : QSlider(orient, parent), m_factor(20)
+ScaleSlider::ScaleSlider(Qt::Orientation orient, QWidget * parent) : QSlider(orient, parent), m_factor(20)
 {
   setStyle(new MyProxyStyle(style()));
   SetRange(2, scales::GetUpperScale());
@@ -72,6 +71,9 @@ void ScaleSlider::SetPosWithBlockedSignals(double pos)
   blockSignals(blocked);
 }
 
-void ScaleSlider::SetRange(int low, int up) { setRange(low * m_factor, up * m_factor); }
+void ScaleSlider::SetRange(int low, int up)
+{
+  setRange(low * m_factor, up * m_factor);
+}
 }  // namespace common
 }  // namespace qt
diff --git a/qt/qt_common/spinner.cpp b/qt/qt_common/spinner.cpp
index 52d868614..9361f305d 100644
--- a/qt/qt_common/spinner.cpp
+++ b/qt/qt_common/spinner.cpp
@@ -30,7 +30,8 @@ Spinner::Spinner()
   setPixmap(m_pixmaps.front());
 
   m_timer = new QTimer(this /* parent */);
-  connect(m_timer, &QTimer::timeout, [this]() {
+  connect(m_timer, &QTimer::timeout, [this]()
+  {
     m_progress = (m_progress + 1) % m_pixmaps.size();
     setPixmap(m_pixmaps[m_progress]);
   });
diff --git a/qt/qt_common/text_dialog.cpp b/qt/qt_common/text_dialog.cpp
index a59035fa6..5bb8259d7 100644
--- a/qt/qt_common/text_dialog.cpp
+++ b/qt/qt_common/text_dialog.cpp
@@ -1,13 +1,11 @@
 #include "qt/qt_common/text_dialog.hpp"
 
 #include <QtWidgets/QDialogButtonBox>
-#include <QtWidgets/QVBoxLayout>
 #include <QtWidgets/QPushButton>
 #include <QtWidgets/QTextEdit>
+#include <QtWidgets/QVBoxLayout>
 
-
-TextDialog::TextDialog(QWidget * parent, QString const & htmlOrText, QString const & title)
-  : QDialog(parent)
+TextDialog::TextDialog(QWidget * parent, QString const & htmlOrText, QString const & title) : QDialog(parent)
 {
   auto * textEdit = new QTextEdit(this);
   textEdit->setReadOnly(true);
@@ -33,4 +31,7 @@ TextDialog::TextDialog(QWidget * parent, QString const & htmlOrText, QString con
     resize(parent->size());
 }
 
-void TextDialog::OnClose() { reject(); }
+void TextDialog::OnClose()
+{
+  reject();
+}
diff --git a/qt/qt_common/text_dialog.hpp b/qt/qt_common/text_dialog.hpp
index 2f841bc2f..fecdddfd0 100644
--- a/qt/qt_common/text_dialog.hpp
+++ b/qt/qt_common/text_dialog.hpp
@@ -6,6 +6,7 @@
 class TextDialog : public QDialog
 {
   Q_OBJECT
+
 public:
   TextDialog(QWidget * parent, QString const & htmlOrText, QString const & title = "");
 
diff --git a/qt/routing_settings_dialog.cpp b/qt/routing_settings_dialog.cpp
index 7c014d61f..c5adf173d 100644
--- a/qt/routing_settings_dialog.cpp
+++ b/qt/routing_settings_dialog.cpp
@@ -9,8 +9,8 @@
 #include "base/string_utils.hpp"
 
 #include <QtWidgets/QComboBox>
-#include <QtWidgets/QFormLayout>
 #include <QtWidgets/QDialogButtonBox>
+#include <QtWidgets/QFormLayout>
 #include <QtWidgets/QMessageBox>
 
 namespace qt
@@ -96,9 +96,7 @@ void RoutingSettings::LoadSession(Framework & framework)
   }
 }
 
-RoutingSettings::RoutingSettings(QWidget * parent, Framework & framework)
-: QDialog(parent)
-, m_framework(framework)
+RoutingSettings::RoutingSettings(QWidget * parent, Framework & framework) : QDialog(parent), m_framework(framework)
 {
   setWindowTitle("Routing settings");
   QVBoxLayout * layout = new QVBoxLayout(this);
diff --git a/qt/routing_turns_visualizer.cpp b/qt/routing_turns_visualizer.cpp
index 3744d6209..7ad7ac258 100644
--- a/qt/routing_turns_visualizer.cpp
+++ b/qt/routing_turns_visualizer.cpp
@@ -17,8 +17,7 @@ void RoutingTurnsVisualizer::Visualize(RoutingManager & routingManager, df::Drap
     std::vector<m2::PointD> const fakePoly = {turnPoint, turnPoint};
     static dp::Color const orangeColor = dp::Color(242, 138, 2, 255);
 
-    drape.AddLine(
-        id, df::DrapeApiLineData(fakePoly, orangeColor).Width(7.0f).ShowPoints(true).ShowId());
+    drape.AddLine(id, df::DrapeApiLineData(fakePoly, orangeColor).Width(7.0f).ShowPoints(true).ShowId());
   }
 }
 
@@ -33,8 +32,8 @@ void RoutingTurnsVisualizer::ClearTurns(df::DrapeApi & drape)
 std::string RoutingTurnsVisualizer::GetId(routing::turns::TurnItem const & turn)
 {
   std::string const maneuver = turn.m_pedestrianTurn == routing::turns::PedestrianDirection::None
-                                   ? DebugPrint(turn.m_turn)
-                                   : DebugPrint(turn.m_pedestrianTurn);
+                                 ? DebugPrint(turn.m_turn)
+                                 : DebugPrint(turn.m_pedestrianTurn);
 
   std::string const index = std::to_string(turn.m_index);
 
diff --git a/qt/ruler.cpp b/qt/ruler.cpp
index e652b90af..999cde5dc 100644
--- a/qt/ruler.cpp
+++ b/qt/ruler.cpp
@@ -7,7 +7,10 @@
 
 namespace qt
 {
-bool Ruler::IsActive() { return m_isActive; }
+bool Ruler::IsActive()
+{
+  return m_isActive;
+}
 
 void Ruler::SetActive(bool status)
 {
@@ -37,13 +40,18 @@ void Ruler::DrawLine(df::DrapeApi & drapeApi)
 
   drapeApi.RemoveLine(m_id);
   SetId();
-  drapeApi.AddLine(
-      m_id, df::DrapeApiLineData(m_polyline, lightGreyColor).Width(7.0f).ShowPoints(true).ShowId());
+  drapeApi.AddLine(m_id, df::DrapeApiLineData(m_polyline, lightGreyColor).Width(7.0f).ShowPoints(true).ShowId());
 }
 
-void Ruler::EraseLine(df::DrapeApi & drapeApi) { drapeApi.RemoveLine(m_id); }
+void Ruler::EraseLine(df::DrapeApi & drapeApi)
+{
+  drapeApi.RemoveLine(m_id);
+}
 
-bool Ruler::IsValidPolyline() { return m_polyline.size() > 1; }
+bool Ruler::IsValidPolyline()
+{
+  return m_polyline.size() > 1;
+}
 
 void Ruler::SetDistance()
 {
diff --git a/qt/screenshoter.cpp b/qt/screenshoter.cpp
index 372c30ca8..2bf50252c 100644
--- a/qt/screenshoter.cpp
+++ b/qt/screenshoter.cpp
@@ -37,10 +37,9 @@ bool ParsePoint(std::string_view s, char const * delim, m2::PointD & pt, uint8_t
   double lat;
   double lon;
   uint8_t zoomLevel;
-  if (strings::to_double(*iter, lat) && mercator::ValidLat(lat) && ++iter &&
-      strings::to_double(*iter, lon) && mercator::ValidLon(lon) && ++iter &&
-      strings::to_uint(*iter, zoomLevel) &&
-      zoomLevel >= 1 && zoomLevel <= scales::GetUpperStyleScale())
+  if (strings::to_double(*iter, lat) && mercator::ValidLat(lat) && ++iter && strings::to_double(*iter, lon) &&
+      mercator::ValidLon(lon) && ++iter && strings::to_uint(*iter, zoomLevel) && zoomLevel >= 1 &&
+      zoomLevel <= scales::GetUpperStyleScale())
   {
     pt = mercator::FromLatLon(lat, lon);
     zoom = zoomLevel;
@@ -65,8 +64,8 @@ bool ParseRect(std::string_view s, char const * delim, m2::RectD & rect)
       strings::to_double(*iter, latRigthTop) && mercator::ValidLat(latRigthTop) && ++iter &&
       strings::to_double(*iter, lonRigthTop) && mercator::ValidLon(lonRigthTop))
   {
-    rect = m2::RectD(mercator::FromLatLon(latLeftBottom, lonLeftBottom),
-                     mercator::FromLatLon(latRigthTop, lonRigthTop));
+    rect =
+        m2::RectD(mercator::FromLatLon(latLeftBottom, lonLeftBottom), mercator::FromLatLon(latRigthTop, lonRigthTop));
     return true;
   }
   return false;
@@ -114,15 +113,13 @@ bool ParseRectsStr(std::string const & rectsStr, std::list<m2::RectD> & rects)
 }
 }  // namespace
 
-Screenshoter::Screenshoter(ScreenshotParams const & screenshotParams, Framework & framework,
-                           QOpenGLWidget * widget)
+Screenshoter::Screenshoter(ScreenshotParams const & screenshotParams, Framework & framework, QOpenGLWidget * widget)
   : m_screenshotParams(screenshotParams)
   , m_framework(framework)
   , m_widget(widget)
 {
-  m_framework.GetStorage().Subscribe(
-      std::bind(&Screenshoter::OnCountryChanged, this, std::placeholders::_1),
-      [](storage::CountryId const &, downloader::Progress const &) {});
+  m_framework.GetStorage().Subscribe(std::bind(&Screenshoter::OnCountryChanged, this, std::placeholders::_1),
+                                     [](storage::CountryId const &, downloader::Progress const &) {});
 }
 
 void Screenshoter::Start()
@@ -137,9 +134,8 @@ void Screenshoter::Start()
               "\n  mode:",
               m_screenshotParams.m_mode, "\n  kml_path:", m_screenshotParams.m_kmlPath,
               "\n  points:", m_screenshotParams.m_points, "\n  rects:", m_screenshotParams.m_rects,
-              "\n  dst_path:", m_screenshotParams.m_dstPath,
-              "\n  width:", m_screenshotParams.m_width, "\n  height:", m_screenshotParams.m_height,
-              "\n  dpi_scale:", m_screenshotParams.m_dpiScale));
+              "\n  dst_path:", m_screenshotParams.m_dstPath, "\n  width:", m_screenshotParams.m_width,
+              "\n  height:", m_screenshotParams.m_height, "\n  dpi_scale:", m_screenshotParams.m_dpiScale));
 
   if (!Platform::MkDirChecked(m_screenshotParams.m_dstPath))
   {
@@ -224,8 +220,7 @@ void Screenshoter::ProcessNextRect()
 
   std::string const postfix = "_" + languages::GetCurrentNorm();
   std::stringstream ss;
-  ss << "rect_" << std::setfill('0') << std::setw(4) << m_itemsCount - m_rectsToProcess.size()
-     << postfix;
+  ss << "rect_" << std::setfill('0') << std::setw(4) << m_itemsCount - m_rectsToProcess.size() << postfix;
 
   m_nextScreenshotName = ss.str();
 
@@ -235,8 +230,7 @@ void Screenshoter::ProcessNextRect()
   CHECK(rect.IsValid(), ());
 
   ChangeState(State::WaitPosition);
-  m_framework.ShowRect(rect, -1 /* maxScale */, false /* animation */,
-                       false /* useVisibleViewport */);
+  m_framework.ShowRect(rect, -1 /* maxScale */, false /* animation */, false /* useVisibleViewport */);
   WaitPosition();
 }
 
@@ -250,8 +244,7 @@ void Screenshoter::ProcessNextPoint()
 
   std::string const postfix = "_" + languages::GetCurrentNorm();
   std::stringstream ss;
-  ss << "point_" << std::setfill('0') << std::setw(4) << m_itemsCount - m_pointsToProcess.size()
-     << postfix;
+  ss << "point_" << std::setfill('0') << std::setw(4) << m_itemsCount - m_pointsToProcess.size() << postfix;
 
   m_nextScreenshotName = ss.str();
 
@@ -305,7 +298,7 @@ void Screenshoter::OnCountryChanged(storage::CountryId countryId)
     {
       ChangeState(State::WaitGraphics);
       auto const kDelay = std::chrono::seconds(3);
-      GetPlatform().RunDelayedTask(Platform::Thread::File, kDelay, [this]{ WaitGraphics(); });
+      GetPlatform().RunDelayedTask(Platform::Thread::File, kDelay, [this] { WaitGraphics(); });
     }
   }
 }
@@ -328,16 +321,14 @@ void Screenshoter::OnGraphicsReady()
 
 void Screenshoter::WaitPosition()
 {
-  m_framework.NotifyGraphicsReady(
-      [this]() { GetPlatform().RunTask(Platform::Thread::Gui, [this] { OnPositionReady(); }); },
-      false /* needInvalidate */);
+  m_framework.NotifyGraphicsReady([this]()
+  { GetPlatform().RunTask(Platform::Thread::Gui, [this] { OnPositionReady(); }); }, false /* needInvalidate */);
 }
 
 void Screenshoter::WaitGraphics()
 {
-  m_framework.NotifyGraphicsReady(
-      [this]() { GetPlatform().RunTask(Platform::Thread::Gui, [this] { OnGraphicsReady(); }); },
-      true /* needInvalidate */);
+  m_framework.NotifyGraphicsReady([this]()
+  { GetPlatform().RunTask(Platform::Thread::Gui, [this] { OnGraphicsReady(); }); }, true /* needInvalidate */);
 }
 
 void Screenshoter::SaveScreenshot()
@@ -355,9 +346,9 @@ void Screenshoter::SaveScreenshot()
   ASSERT_EQUAL(framebuffer.width() % screenshotSize.width(), 0, ());
   ASSERT_EQUAL(framebuffer.height() % screenshotSize.height(), 0, ());
   QImage screenshot = framebuffer.scaled(screenshotSize);
-  if (!screenshot.save(QString::fromStdString(base::JoinPath(m_screenshotParams.m_dstPath,
-                                                             m_nextScreenshotName + ".png")),
-                       "PNG", 100))
+  if (!screenshot.save(
+          QString::fromStdString(base::JoinPath(m_screenshotParams.m_dstPath, m_nextScreenshotName + ".png")), "PNG",
+          100))
   {
     ChangeState(State::FileError);
     return;
@@ -373,8 +364,8 @@ void Screenshoter::ChangeState(State newState, std::string const & msg)
   if (m_screenshotParams.m_statusChangedFn)
   {
     std::ostringstream ss;
-    ss << "[" << m_itemsCount - GetItemsToProcessCount() << "/" << m_itemsCount
-       << "] file: " << m_nextScreenshotName << " state: " << DebugPrint(newState);
+    ss << "[" << m_itemsCount - GetItemsToProcessCount() << "/" << m_itemsCount << "] file: " << m_nextScreenshotName
+       << " state: " << DebugPrint(newState);
     if (!msg.empty())
       ss << " msg: " << msg;
     LOG(LINFO, (ss.str()));
diff --git a/qt/screenshoter.hpp b/qt/screenshoter.hpp
index d61a23058..ca9ed719f 100644
--- a/qt/screenshoter.hpp
+++ b/qt/screenshoter.hpp
@@ -43,8 +43,7 @@ struct ScreenshotParams
 class Screenshoter
 {
 public:
-  Screenshoter(ScreenshotParams const & screenshotParams, Framework & framework,
-               QOpenGLWidget * widget);
+  Screenshoter(ScreenshotParams const & screenshotParams, Framework & framework, QOpenGLWidget * widget);
 
   void Start();
 
diff --git a/qt/search_panel.cpp b/qt/search_panel.cpp
index e8bb0c4e4..65eff2ceb 100644
--- a/qt/search_panel.cpp
+++ b/qt/search_panel.cpp
@@ -157,16 +157,12 @@ void SearchPanel::OnEverywhereSearchResults(uint64_t timestamp, search::Results
     switch (res.GetResultType())
     {
     case search::Result::Type::SuggestFromFeature:
-    case search::Result::Type::PureSuggest:
-      showDistance = false;
-      break;
+    case search::Result::Type::PureSuggest: showDistance = false; break;
     case search::Result::Type::Feature:
     case search::Result::Type::Postcode:
       m_pTable->setItem(rowCount, 0, CreateItem(res.GetLocalizedFeatureType()));
       break;
-    case search::Result::Type::LatLon:
-      m_pTable->setItem(rowCount, 0, CreateItem("LatLon"));
-      break;
+    case search::Result::Type::LatLon: m_pTable->setItem(rowCount, 0, CreateItem("LatLon")); break;
     }
 
     if (showDistance)
@@ -213,7 +209,7 @@ std::string SearchPanel::GetCurrentInputLocale()
 {
   /// @DebugNote
   // Hardcode search input language.
-  //return "de";
+  // return "de";
 
   QString loc = QGuiApplication::inputMethod()->locale().name();
   loc.replace('_', '-');
@@ -227,7 +223,7 @@ void SearchPanel::OnSearchTextChanged(QString const & str)
 {
   // Pass input query as-is without any normalization.
   // Otherwise № -> No, and it's unexpectable for the search index.
-  //QString const normalized = str.normalized(QString::NormalizationForm_KC);
+  // QString const normalized = str.normalized(QString::NormalizationForm_KC);
   std::string const normalized = str.toStdString();
 
   if (Try3dModeCmd(normalized))
@@ -252,42 +248,37 @@ void SearchPanel::OnSearchTextChanged(QString const & str)
   using namespace search;
   if (m_mode == Mode::Everywhere)
   {
-    EverywhereSearchParams params
-    {
-      normalized, GetCurrentInputLocale(), {} /* timeout */, isCategory,
-      // m_onResults
-      [this, timestamp](Results results, std::vector<ProductInfo> /* productInfo */)
-      {
-        OnEverywhereSearchResults(timestamp, std::move(results));
-      }
-    };
+    EverywhereSearchParams params{normalized,
+                                  GetCurrentInputLocale(),
+                                  {} /* timeout */,
+                                  isCategory,
+                                  // m_onResults
+                                  [this, timestamp](Results results, std::vector<ProductInfo> /* productInfo */)
+    { OnEverywhereSearchResults(timestamp, std::move(results)); }};
 
     if (GetFramework().GetSearchAPI().SearchEverywhere(std::move(params)))
       StartBusyIndicator();
   }
   else if (m_mode == Mode::Viewport)
   {
-    ViewportSearchParams params
+    ViewportSearchParams params{normalized,
+                                GetCurrentInputLocale(),
+                                {} /* timeout */,
+                                isCategory,
+                                // m_onStarted
+                                [this]() { StartBusyIndicator(); },
+                                // m_onCompleted
+                                [this](search::Results results)
     {
-      normalized, GetCurrentInputLocale(), {} /* timeout */, isCategory,
-      // m_onStarted
-      [this]()
-      {
-        StartBusyIndicator();
-      },
-      // m_onCompleted
-      [this](search::Results results)
-      {
-        // |m_pTable| is not updated here because the OnResults callback is recreated within
-        // SearchAPI when the viewport is changed. Thus a single call to SearchInViewport may
-        // initiate an arbitrary amount of actual search requests with different viewports, and
-        // clearing the table would require additional care (or, most likely, we would need a better
-        // API). This is similar to the Android and iOS clients where we do not show the list of
-        // results in the viewport search mode.
-        GetFramework().FillSearchResultsMarks(true /* clear */, results);
-        StopBusyIndicator();
-      }
-    };
+      // |m_pTable| is not updated here because the OnResults callback is recreated within
+      // SearchAPI when the viewport is changed. Thus a single call to SearchInViewport may
+      // initiate an arbitrary amount of actual search requests with different viewports, and
+      // clearing the table would require additional care (or, most likely, we would need a better
+      // API). This is similar to the Android and iOS clients where we do not show the list of
+      // results in the viewport search mode.
+      GetFramework().FillSearchResultsMarks(true /* clear */, results);
+      StopBusyIndicator();
+    }};
 
     GetFramework().GetSearchAPI().SearchInViewport(std::move(params));
   }
@@ -299,10 +290,8 @@ void SearchPanel::OnSearchModeChanged(int mode)
   switch (newMode)
   {
   case search::Mode::Everywhere:
-  case search::Mode::Viewport:
-    break;
-  default:
-    UNREACHABLE();
+  case search::Mode::Viewport: break;
+  default: UNREACHABLE();
   }
 
   if (m_mode == newMode)
diff --git a/qt/selection.hpp b/qt/selection.hpp
index d5a1ea736..b4554aac0 100644
--- a/qt/selection.hpp
+++ b/qt/selection.hpp
@@ -23,4 +23,4 @@ enum class SelectionMode
   // Should be the last
   Cancelled,
 };
-} // namespace qt
+}  // namespace qt
diff --git a/qt/update_dialog.cpp b/qt/update_dialog.cpp
index 9220659b4..db1586853 100644
--- a/qt/update_dialog.cpp
+++ b/qt/update_dialog.cpp
@@ -37,13 +37,13 @@ enum
   KNumberOfColumns
 };
 
-#define COLOR_NOTDOWNLOADED   Qt::black
-#define COLOR_ONDISK          Qt::darkGreen
-#define COLOR_INPROGRESS      Qt::blue
-#define COLOR_DOWNLOADFAILED  Qt::red
-#define COLOR_INQUEUE         Qt::gray
-#define COLOR_OUTOFDATE       Qt::magenta
-#define COLOR_MIXED           Qt::yellow
+#define COLOR_NOTDOWNLOADED  Qt::black
+#define COLOR_ONDISK         Qt::darkGreen
+#define COLOR_INPROGRESS     Qt::blue
+#define COLOR_DOWNLOADFAILED Qt::red
+#define COLOR_INQUEUE        Qt::gray
+#define COLOR_OUTOFDATE      Qt::magenta
+#define COLOR_MIXED          Qt::yellow
 
 namespace
 {
@@ -62,474 +62,456 @@ bool DeleteNotUploadedEditsConfirmation()
 
 namespace qt
 {
-  UpdateDialog::UpdateDialog(QWidget * parent, Framework & framework)
-    : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
-      m_framework(framework),
-      m_observerSlotId(0)
+UpdateDialog::UpdateDialog(QWidget * parent, Framework & framework)
+  : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
+  , m_framework(framework)
+  , m_observerSlotId(0)
+{
+  setWindowModality(Qt::WindowModal);
+
+  QPushButton * closeButton = new QPushButton(QObject::tr("Close"), this);
+  closeButton->setDefault(true);
+  connect(closeButton, &QAbstractButton::clicked, this, &UpdateDialog::OnCloseClick);
+
+  m_tree = new QTreeWidget(this);
+  m_tree->setColumnCount(KNumberOfColumns);
+  QStringList columnLabels;
+  columnLabels << tr("Country") << tr("Status") << tr("Size") << tr("Matched by") << tr("Rank");
+  m_tree->setHeaderLabels(columnLabels);
+
+  m_tree->setColumnHidden(KColumnIndexPositionInRanking, true);
+
+  m_tree->header()->setSectionResizeMode(KColumnIndexCountry, QHeaderView::ResizeToContents);
+  m_tree->header()->setSectionResizeMode(KColumnIndexStatus, QHeaderView::ResizeToContents);
+  m_tree->header()->setSectionResizeMode(KColumnIndexMatchedBy, QHeaderView::ResizeToContents);
+  m_tree->header()->setSectionResizeMode(KColumnIndexPositionInRanking, QHeaderView::ResizeToContents);
+
+  connect(m_tree, &QTreeWidget::itemClicked, this, &UpdateDialog::OnItemClick);
+
+  QHBoxLayout * horizontalLayout = new QHBoxLayout();
+  horizontalLayout->addStretch();
+  horizontalLayout->addWidget(closeButton);
+
+  QLabel * localeLabel = new QLabel(tr("locale:"));
+  QLineEdit * localeEdit = new QLineEdit(this);
+  localeEdit->setText(m_locale.c_str());
+  connect(localeEdit, &QLineEdit::textChanged, this, &UpdateDialog::OnLocaleTextChanged);
+
+  QLabel * queryLabel = new QLabel(tr("search query:"));
+  QLineEdit * queryEdit = new QLineEdit(this);
+  connect(queryEdit, &QLineEdit::textChanged, this, &UpdateDialog::OnQueryTextChanged);
+
+  QGridLayout * inputLayout = new QGridLayout();
+  // widget, row, column
+  inputLayout->addWidget(localeLabel, 0, 0);
+  inputLayout->addWidget(localeEdit, 0, 1);
+  inputLayout->addWidget(queryLabel, 1, 0);
+  inputLayout->addWidget(queryEdit, 1, 1);
+
+  QVBoxLayout * verticalLayout = new QVBoxLayout();
+  verticalLayout->addLayout(inputLayout);
+  verticalLayout->addWidget(m_tree);
+  verticalLayout->addLayout(horizontalLayout);
+  setLayout(verticalLayout);
+
+  setWindowTitle(tr("Geographical Regions"));
+  resize(900, 600);
+
+  // We want to receive all download progress and result events.
+  using namespace std::placeholders;
+  m_observerSlotId = GetStorage().Subscribe(bind(&UpdateDialog::OnCountryChanged, this, _1),
+                                            bind(&UpdateDialog::OnCountryDownloadProgress, this, _1, _2));
+}
+
+UpdateDialog::~UpdateDialog()
+{
+  // Tell download manager that we're gone.
+  GetStorage().Unsubscribe(m_observerSlotId);
+}
+
+/// when user clicks on any map row in the table
+void UpdateDialog::OnItemClick(QTreeWidgetItem * item, int column)
+{
+  CountryId const countryId = GetCountryIdByTreeItem(item);
+
+  Storage & st = GetStorage();
+
+  NodeAttrs attrs;
+  st.GetNodeAttrs(countryId, attrs);
+
+  CountriesVec children;
+  st.GetChildren(countryId, children);
+
+  // For group process only click on the column #.
+  if (!children.empty() && column != 1)
+    return;
+
+  switch (attrs.m_status)
   {
-    setWindowModality(Qt::WindowModal);
+  case NodeStatus::OnDiskOutOfDate:
+  {
+    // Map is already downloaded, so ask user about deleting.
+    QMessageBox ask(this);
+    ask.setIcon(QMessageBox::Question);
+    ask.setText(tr("Do you want to update or delete %1?").arg(countryId.c_str()));
+    QPushButton * const btnUpdate = ask.addButton(tr("Update"), QMessageBox::ActionRole);
+    QPushButton * const btnDelete = ask.addButton(tr("Delete"), QMessageBox::ActionRole);
+    QPushButton * const btnCancel = ask.addButton(tr("Cancel"), QMessageBox::NoRole);
+    UNUSED_VALUE(btnCancel);
 
-    QPushButton * closeButton = new QPushButton(QObject::tr("Close"), this);
-    closeButton->setDefault(true);
-    connect(closeButton, &QAbstractButton::clicked, this, &UpdateDialog::OnCloseClick);
+    ask.exec();
 
-    m_tree = new QTreeWidget(this);
-    m_tree->setColumnCount(KNumberOfColumns);
-    QStringList columnLabels;
-    columnLabels << tr("Country") << tr("Status") << tr("Size") << tr("Matched by") << tr("Rank");
-    m_tree->setHeaderLabels(columnLabels);
+    QAbstractButton * const res = ask.clickedButton();
 
-    m_tree->setColumnHidden(KColumnIndexPositionInRanking, true);
+    if (res == btnUpdate)
+      st.UpdateNode(countryId);
+    else if (res == btnDelete)
+    {
+      if (!m_framework.HasUnsavedEdits(countryId) || DeleteNotUploadedEditsConfirmation())
+        st.DeleteNode(countryId);
+    }
+  }
+  break;
 
-    m_tree->header()->setSectionResizeMode(KColumnIndexCountry, QHeaderView::ResizeToContents);
-    m_tree->header()->setSectionResizeMode(KColumnIndexStatus, QHeaderView::ResizeToContents);
-    m_tree->header()->setSectionResizeMode(KColumnIndexMatchedBy, QHeaderView::ResizeToContents);
-    m_tree->header()->setSectionResizeMode(KColumnIndexPositionInRanking,
-                                           QHeaderView::ResizeToContents);
+  case NodeStatus::OnDisk:
+  {
+    // Map is already downloaded, so ask user about deleting.
+    QMessageBox ask(this);
+    ask.setIcon(QMessageBox::Question);
+    ask.setText(tr("Do you want to delete %1?").arg(countryId.c_str()));
+    QPushButton * const btnDelete = ask.addButton(tr("Delete"), QMessageBox::ActionRole);
+    QPushButton * const btnCancel = ask.addButton(tr("Cancel"), QMessageBox::NoRole);
+    UNUSED_VALUE(btnCancel);
 
-    connect(m_tree, &QTreeWidget::itemClicked, this, &UpdateDialog::OnItemClick);
+    ask.exec();
 
-    QHBoxLayout * horizontalLayout = new QHBoxLayout();
-    horizontalLayout->addStretch();
-    horizontalLayout->addWidget(closeButton);
+    QAbstractButton * const res = ask.clickedButton();
 
-    QLabel * localeLabel = new QLabel(tr("locale:"));
-    QLineEdit * localeEdit = new QLineEdit(this);
-    localeEdit->setText(m_locale.c_str());
-    connect(localeEdit, &QLineEdit::textChanged, this, &UpdateDialog::OnLocaleTextChanged);
+    if (res == btnDelete)
+    {
+      if (!m_framework.HasUnsavedEdits(countryId) || DeleteNotUploadedEditsConfirmation())
+        st.DeleteNode(countryId);
+    }
+  }
+  break;
 
-    QLabel * queryLabel = new QLabel(tr("search query:"));
-    QLineEdit * queryEdit = new QLineEdit(this);
-    connect(queryEdit, &QLineEdit::textChanged, this, &UpdateDialog::OnQueryTextChanged);
+  case NodeStatus::NotDownloaded:
+  case NodeStatus::Error:
+  case NodeStatus::Partly: st.DownloadNode(countryId); break;
 
-    QGridLayout * inputLayout = new QGridLayout();
-    // widget, row, column
-    inputLayout->addWidget(localeLabel, 0, 0);
-    inputLayout->addWidget(localeEdit, 0, 1);
-    inputLayout->addWidget(queryLabel, 1, 0);
-    inputLayout->addWidget(queryEdit, 1, 1);
+  case NodeStatus::InQueue:
+  case NodeStatus::Downloading: st.DeleteNode(countryId); break;
 
-    QVBoxLayout * verticalLayout = new QVBoxLayout();
-    verticalLayout->addLayout(inputLayout);
-    verticalLayout->addWidget(m_tree);
-    verticalLayout->addLayout(horizontalLayout);
-    setLayout(verticalLayout);
+  case NodeStatus::Applying:
+    // Do nothing.
+    break;
 
-    setWindowTitle(tr("Geographical Regions"));
-    resize(900, 600);
+  default: ASSERT(false, ("We shouldn't be here")); break;
+  }
+}
 
-    // We want to receive all download progress and result events.
-    using namespace std::placeholders;
-    m_observerSlotId = GetStorage().Subscribe(bind(&UpdateDialog::OnCountryChanged, this, _1),
-                                              bind(&UpdateDialog::OnCountryDownloadProgress, this, _1, _2));
+void UpdateDialog::OnCloseClick()
+{
+  done(0);
+}
+
+void UpdateDialog::OnLocaleTextChanged(QString const & text)
+{
+  m_locale.assign(text.toStdString());
+  strings::Trim(m_locale);
+
+  RefillTree();
+}
+
+void UpdateDialog::OnQueryTextChanged(QString const & text)
+{
+  m_query.assign(text.toStdString());
+
+  RefillTree();
+}
+
+void UpdateDialog::RefillTree()
+{
+  ++m_fillTreeTimestamp;
+
+  string trimmed = m_query;
+  strings::Trim(trimmed);
+
+  if (trimmed.empty())
+    FillTree({} /* filter */, m_fillTreeTimestamp);
+  else
+    StartSearchInDownloader();
+}
+
+void UpdateDialog::StartSearchInDownloader()
+{
+  CHECK(!m_query.empty(), ());
+
+  auto const timestamp = m_fillTreeTimestamp;
+
+  DownloaderSearchParams params{m_query, m_locale,
+                                // m_onResults
+                                [this, timestamp](DownloaderSearchResults const & results)
+  {
+    Filter filter;
+    for (size_t i = 0; i < results.m_results.size(); ++i)
+    {
+      auto const & res = results.m_results[i];
+      auto const added = filter.emplace(res.m_countryId, make_pair(i + 1, res.m_matchedName));
+      if (!added.second)
+        LOG(LWARNING, ("Duplicate CountryId in results for query:", results.m_query));
+    }
+
+    FillTree(filter, timestamp);
+  }};
+
+  m_framework.GetSearchAPI().SearchInDownloader(std::move(params));
+}
+
+void UpdateDialog::FillTree(optional<Filter> const & filter, uint64_t timestamp)
+{
+  CHECK_THREAD_CHECKER(m_threadChecker, ());
+
+  if (m_fillTreeTimestamp != timestamp)
+    return;
+
+  m_tree->setSortingEnabled(false);
+  m_tree->clear();
+  m_treeItemByCountryId.clear();
+
+  auto const rootId = m_framework.GetStorage().GetRootId();
+  FillTreeImpl(nullptr /* parent */, rootId, filter);
+
+  // Expand the root.
+  ASSERT_EQUAL(m_tree->topLevelItemCount(), 1, ());
+  m_tree->topLevelItem(0)->setExpanded(true);
+
+  m_tree->sortItems(KColumnIndexPositionInRanking, Qt::AscendingOrder);
+  m_tree->setSortingEnabled(true);
+}
+
+void UpdateDialog::FillTreeImpl(QTreeWidgetItem * parent, CountryId const & countryId, optional<Filter> const & filter)
+{
+  CountriesVec children;
+  GetStorage().GetChildren(countryId, children);
+
+  size_t posInRanking = kInvalidPos;
+  string matchedBy;
+  if (filter)
+  {
+    auto const it = filter->find(countryId);
+    if (it != filter->end())
+    {
+      posInRanking = it->second.first;
+      matchedBy = it->second.second;
+    }
+  }
+  else
+  {
+    posInRanking = kIrrelevantPos;
   }
 
-  UpdateDialog::~UpdateDialog()
+  if (children.empty())
   {
-    // Tell download manager that we're gone.
-    GetStorage().Unsubscribe(m_observerSlotId);
-  }
-
-  /// when user clicks on any map row in the table
-  void UpdateDialog::OnItemClick(QTreeWidgetItem * item, int column)
-  {
-    CountryId const countryId = GetCountryIdByTreeItem(item);
-
-    Storage & st = GetStorage();
-
-    NodeAttrs attrs;
-    st.GetNodeAttrs(countryId, attrs);
-
-    CountriesVec children;
-    st.GetChildren(countryId, children);
-
-    // For group process only click on the column #.
-    if (!children.empty() && column != 1)
+    if (filter && posInRanking == kInvalidPos)
       return;
 
-    switch (attrs.m_status)
-    {
-    case NodeStatus::OnDiskOutOfDate:
-      {
-        // Map is already downloaded, so ask user about deleting.
-        QMessageBox ask(this);
-        ask.setIcon(QMessageBox::Question);
-        ask.setText(tr("Do you want to update or delete %1?").arg(countryId.c_str()));
-        QPushButton * const btnUpdate = ask.addButton(tr("Update"), QMessageBox::ActionRole);
-        QPushButton * const btnDelete = ask.addButton(tr("Delete"), QMessageBox::ActionRole);
-        QPushButton * const btnCancel = ask.addButton(tr("Cancel"), QMessageBox::NoRole);
-        UNUSED_VALUE(btnCancel);
-
-        ask.exec();
-
-        QAbstractButton * const res = ask.clickedButton();
-
-        if (res == btnUpdate)
-          st.UpdateNode(countryId);
-        else if (res == btnDelete)
-        {
-          if (!m_framework.HasUnsavedEdits(countryId) || DeleteNotUploadedEditsConfirmation())
-            st.DeleteNode(countryId);
-        }
-      }
-      break;
-
-    case NodeStatus::OnDisk:
-      {
-        // Map is already downloaded, so ask user about deleting.
-        QMessageBox ask(this);
-        ask.setIcon(QMessageBox::Question);
-        ask.setText(tr("Do you want to delete %1?").arg(countryId.c_str()));
-        QPushButton * const btnDelete = ask.addButton(tr("Delete"), QMessageBox::ActionRole);
-        QPushButton * const btnCancel = ask.addButton(tr("Cancel"), QMessageBox::NoRole);
-        UNUSED_VALUE(btnCancel);
-
-        ask.exec();
-
-        QAbstractButton * const res = ask.clickedButton();
-
-        if (res == btnDelete)
-        {
-          if (!m_framework.HasUnsavedEdits(countryId) || DeleteNotUploadedEditsConfirmation())
-            st.DeleteNode(countryId);
-        }
-      }
-      break;
-
-    case NodeStatus::NotDownloaded:
-    case NodeStatus::Error:
-    case NodeStatus::Partly:
-      st.DownloadNode(countryId);
-      break;
-
-    case NodeStatus::InQueue:
-    case NodeStatus::Downloading:
-      st.DeleteNode(countryId);
-      break;
-
-    case NodeStatus::Applying:
-      // Do nothing.
-      break;
-
-    default:
-      ASSERT(false, ("We shouldn't be here"));
-      break;
-    }
-  }
-
-  void UpdateDialog::OnCloseClick()
-  {
-    done(0);
-  }
-
-  void UpdateDialog::OnLocaleTextChanged(QString const & text)
-  {
-    m_locale.assign(text.toStdString());
-    strings::Trim(m_locale);
-
-    RefillTree();
-  }
-
-  void UpdateDialog::OnQueryTextChanged(QString const & text)
-  {
-    m_query.assign(text.toStdString());
-
-    RefillTree();
-  }
-
-  void UpdateDialog::RefillTree()
-  {
-    ++m_fillTreeTimestamp;
-
-    string trimmed = m_query;
-    strings::Trim(trimmed);
-
-    if (trimmed.empty())
-      FillTree({} /* filter */, m_fillTreeTimestamp);
-    else
-      StartSearchInDownloader();
-  }
-
-  void UpdateDialog::StartSearchInDownloader()
-  {
-    CHECK(!m_query.empty(), ());
-
-    auto const timestamp = m_fillTreeTimestamp;
-
-    DownloaderSearchParams params{
-      m_query, m_locale,
-      // m_onResults
-      [this, timestamp](DownloaderSearchResults const & results)
-      {
-        Filter filter;
-        for (size_t i = 0; i < results.m_results.size(); ++i)
-        {
-          auto const & res = results.m_results[i];
-          auto const added = filter.emplace(res.m_countryId, make_pair(i + 1, res.m_matchedName));
-          if (!added.second)
-            LOG(LWARNING, ("Duplicate CountryId in results for query:", results.m_query));
-        }
-
-        FillTree(filter, timestamp);
-      }
-    };
-
-    m_framework.GetSearchAPI().SearchInDownloader(std::move(params));
-  }
-
-  void UpdateDialog::FillTree(optional<Filter> const & filter, uint64_t timestamp)
-  {
-    CHECK_THREAD_CHECKER(m_threadChecker, ());
-
-    if (m_fillTreeTimestamp != timestamp)
-      return;
-
-    m_tree->setSortingEnabled(false);
-    m_tree->clear();
-    m_treeItemByCountryId.clear();
-
-    auto const rootId = m_framework.GetStorage().GetRootId();
-    FillTreeImpl(nullptr /* parent */, rootId, filter);
-
-    // Expand the root.
-    ASSERT_EQUAL(m_tree->topLevelItemCount(), 1, ());
-    m_tree->topLevelItem(0)->setExpanded(true);
-
-    m_tree->sortItems(KColumnIndexPositionInRanking, Qt::AscendingOrder);
-    m_tree->setSortingEnabled(true);
-  }
-
-  void UpdateDialog::FillTreeImpl(QTreeWidgetItem * parent, CountryId const & countryId,
-                                  optional<Filter> const & filter)
-  {
-    CountriesVec children;
-    GetStorage().GetChildren(countryId, children);
-
-    size_t posInRanking = kInvalidPos;
-    string matchedBy;
-    if (filter)
-    {
-      auto const it = filter->find(countryId);
-      if (it != filter->end())
-      {
-        posInRanking = it->second.first;
-        matchedBy = it->second.second;
-      }
-    }
-    else
-    {
-      posInRanking = kIrrelevantPos;
-    }
-
-    if (children.empty())
-    {
-      if (filter && posInRanking == kInvalidPos)
-        return;
-
-      QTreeWidgetItem * item = CreateTreeItem(countryId, posInRanking, matchedBy, parent);
-      UpdateRowWithCountryInfo(item, countryId);
-      return;
-    }
-
     QTreeWidgetItem * item = CreateTreeItem(countryId, posInRanking, matchedBy, parent);
     UpdateRowWithCountryInfo(item, countryId);
+    return;
+  }
 
-    if (filter && posInRanking != kInvalidPos)
-    {
-      // Filter matches to the group name, do not filter the group.
-      for (auto const & child : children)
-        FillTreeImpl(item, child, {} /* filter */);
+  QTreeWidgetItem * item = CreateTreeItem(countryId, posInRanking, matchedBy, parent);
+  UpdateRowWithCountryInfo(item, countryId);
 
-      return;
-    }
-
-    // Filter does not match to the group, but children can.
+  if (filter && posInRanking != kInvalidPos)
+  {
+    // Filter matches to the group name, do not filter the group.
     for (auto const & child : children)
-      FillTreeImpl(item, child, filter);
+      FillTreeImpl(item, child, {} /* filter */);
 
-    // Drop the item if it has no children.
-    if (filter && item->childCount() == 0 && parent != nullptr)
+    return;
+  }
+
+  // Filter does not match to the group, but children can.
+  for (auto const & child : children)
+    FillTreeImpl(item, child, filter);
+
+  // Drop the item if it has no children.
+  if (filter && item->childCount() == 0 && parent != nullptr)
+  {
+    parent->removeChild(item);
+    item = nullptr;
+  }
+}
+
+/// Changes row's text color
+void SetRowColor(QTreeWidgetItem & item, QColor const & color)
+{
+  for (int column = 0; column < item.columnCount(); ++column)
+    item.setForeground(column, color);
+}
+
+void UpdateDialog::UpdateRowWithCountryInfo(CountryId const & countryId)
+{
+  auto const items = GetTreeItemsByCountryId(countryId);
+  for (auto const item : items)
+    UpdateRowWithCountryInfo(item, countryId);
+}
+
+void UpdateDialog::UpdateRowWithCountryInfo(QTreeWidgetItem * item, CountryId const & countryId)
+{
+  Storage const & st = GetStorage();
+
+  QColor rowColor;
+  QString statusString;
+  LocalAndRemoteSize size(0, 0);
+
+  CountriesVec children;
+  st.GetChildren(countryId, children);
+
+  NodeAttrs attrs;
+  st.GetNodeAttrs(countryId, attrs);
+
+  size.first = attrs.m_downloadingProgress.m_bytesDownloaded;
+  size.second = attrs.m_mwmSize;
+
+  switch (attrs.m_status)
+  {
+  case NodeStatus::NotDownloaded:
+    ASSERT(size.second > 0, (countryId));
+    statusString = tr("Click to download");
+    rowColor = COLOR_NOTDOWNLOADED;
+    break;
+
+  case NodeStatus::OnDisk:
+  case NodeStatus::Partly:
+    statusString = tr("Installed (click to delete)");
+    rowColor = COLOR_ONDISK;
+    break;
+
+  case NodeStatus::OnDiskOutOfDate:
+    statusString = tr("Out of date (click to update or delete)");
+    rowColor = COLOR_OUTOFDATE;
+    break;
+
+  case NodeStatus::Error:
+    statusString = tr("Download has failed");
+    rowColor = COLOR_DOWNLOADFAILED;
+    break;
+
+  case NodeStatus::Downloading:
+    statusString = tr("Downloading ...");
+    rowColor = COLOR_INPROGRESS;
+    break;
+
+  case NodeStatus::Applying:
+    statusString = tr("Applying ...");
+    rowColor = COLOR_INPROGRESS;
+    break;
+
+  case NodeStatus::InQueue:
+    statusString = tr("Marked for download");
+    rowColor = COLOR_INQUEUE;
+    break;
+
+  default: ASSERT(false, ("We shouldn't be here")); break;
+  }
+
+  if (!statusString.isEmpty())
+    item->setText(KColumnIndexStatus, statusString);
+
+  if (size.second > 0)
+  {
+    int const halfMb = 512 * 1024;
+    int const Mb = 1024 * 1024;
+
+    if (size.second > Mb)
     {
-      parent->removeChild(item);
-      item = nullptr;
+      item->setText(KColumnIndexSize,
+                    QString("%1/%2 MB").arg(uint((size.first + halfMb) / Mb)).arg(uint((size.second + halfMb) / Mb)));
     }
-  }
-
-  /// Changes row's text color
-  void SetRowColor(QTreeWidgetItem & item, QColor const & color)
-  {
-    for (int column = 0; column < item.columnCount(); ++column)
-      item.setForeground(column, color);
-  }
-
-  void UpdateDialog::UpdateRowWithCountryInfo(CountryId const & countryId)
-  {
-    auto const items = GetTreeItemsByCountryId(countryId);
-    for (auto const item : items)
-      UpdateRowWithCountryInfo(item, countryId);
-  }
-
-  void UpdateDialog::UpdateRowWithCountryInfo(QTreeWidgetItem * item, CountryId const & countryId)
-  {
-    Storage const & st = GetStorage();
-
-    QColor rowColor;
-    QString statusString;
-    LocalAndRemoteSize size(0, 0);
-
-    CountriesVec children;
-    st.GetChildren(countryId, children);
-
-    NodeAttrs attrs;
-    st.GetNodeAttrs(countryId, attrs);
-
-    size.first = attrs.m_downloadingProgress.m_bytesDownloaded;
-    size.second = attrs.m_mwmSize;
-
-    switch (attrs.m_status)
+    else
     {
-    case NodeStatus::NotDownloaded:
-      ASSERT(size.second > 0, (countryId));
-      statusString = tr("Click to download");
-      rowColor = COLOR_NOTDOWNLOADED;
-      break;
-
-    case NodeStatus::OnDisk:
-    case NodeStatus::Partly:
-      statusString = tr("Installed (click to delete)");
-      rowColor = COLOR_ONDISK;
-      break;
-
-    case NodeStatus::OnDiskOutOfDate:
-      statusString = tr("Out of date (click to update or delete)");
-      rowColor = COLOR_OUTOFDATE;
-      break;
-
-    case NodeStatus::Error:
-      statusString = tr("Download has failed");
-      rowColor = COLOR_DOWNLOADFAILED;
-      break;
-
-    case NodeStatus::Downloading:
-      statusString = tr("Downloading ...");
-      rowColor = COLOR_INPROGRESS;
-      break;
-
-    case NodeStatus::Applying:
-      statusString = tr("Applying ...");
-      rowColor = COLOR_INPROGRESS;
-      break;
-
-    case NodeStatus::InQueue:
-      statusString = tr("Marked for download");
-      rowColor = COLOR_INQUEUE;
-      break;
-
-    default:
-      ASSERT(false, ("We shouldn't be here"));
-      break;
+      item->setText(KColumnIndexSize,
+                    QString("%1/%2 kB").arg(uint((size.first + 1023) / 1024)).arg(uint((size.second + 1023) / 1024)));
     }
 
-    if (!statusString.isEmpty())
-      item->setText(KColumnIndexStatus, statusString);
-
-    if (size.second > 0)
-    {
-      int const halfMb = 512 * 1024;
-      int const Mb = 1024 * 1024;
-
-      if (size.second > Mb)
-      {
-        item->setText(KColumnIndexSize, QString("%1/%2 MB").arg(
-            uint((size.first + halfMb) / Mb)).arg(uint((size.second + halfMb) / Mb)));
-      }
-      else
-      {
-        item->setText(KColumnIndexSize, QString("%1/%2 kB").arg(
-            uint((size.first + 1023) / 1024)).arg(uint((size.second + 1023) / 1024)));
-      }
-
-      item->setData(KColumnIndexSize, Qt::UserRole, QVariant(static_cast<qint64>(size.second)));
-    }
-
-    // Commented out because it looks terrible on black backgrounds.
-    //  if (!statusString.isEmpty())
-    //    SetRowColor(*item, rowColor);
+    item->setData(KColumnIndexSize, Qt::UserRole, QVariant(static_cast<qint64>(size.second)));
   }
 
-  QString UpdateDialog::GetNodeName(CountryId const & countryId)
-  {
-    // QString const text = QString::fromUtf8(GetStorage().CountryName(countryId).c_str()); // ???
-    NodeAttrs attrs;
-    GetStorage().GetNodeAttrs(countryId, attrs);
-    return attrs.m_nodeLocalName.c_str();
-  }
+  // Commented out because it looks terrible on black backgrounds.
+  //  if (!statusString.isEmpty())
+  //    SetRowColor(*item, rowColor);
+}
 
-  QTreeWidgetItem * UpdateDialog::CreateTreeItem(CountryId const & countryId, size_t posInRanking,
-                                                 string matchedBy, QTreeWidgetItem * parent)
-  {
-    QString const text = GetNodeName(countryId);
-    QTreeWidgetItem * item = new QTreeWidgetItem(parent, QStringList(text));
-    item->setData(KColumnIndexCountry, Qt::UserRole, QVariant(countryId.c_str()));
+QString UpdateDialog::GetNodeName(CountryId const & countryId)
+{
+  // QString const text = QString::fromUtf8(GetStorage().CountryName(countryId).c_str()); // ???
+  NodeAttrs attrs;
+  GetStorage().GetNodeAttrs(countryId, attrs);
+  return attrs.m_nodeLocalName.c_str();
+}
 
-    auto const pos = QVariant(static_cast<qint64>(posInRanking));
-    item->setData(KColumnIndexPositionInRanking, Qt::DisplayRole, pos);
+QTreeWidgetItem * UpdateDialog::CreateTreeItem(CountryId const & countryId, size_t posInRanking, string matchedBy,
+                                               QTreeWidgetItem * parent)
+{
+  QString const text = GetNodeName(countryId);
+  QTreeWidgetItem * item = new QTreeWidgetItem(parent, QStringList(text));
+  item->setData(KColumnIndexCountry, Qt::UserRole, QVariant(countryId.c_str()));
 
-    auto const matched = QVariant(matchedBy.c_str());
-    item->setData(KColumnIndexMatchedBy, Qt::DisplayRole, matched);
+  auto const pos = QVariant(static_cast<qint64>(posInRanking));
+  item->setData(KColumnIndexPositionInRanking, Qt::DisplayRole, pos);
 
-    if (parent == nullptr)
-      m_tree->addTopLevelItem(item);
+  auto const matched = QVariant(matchedBy.c_str());
+  item->setData(KColumnIndexMatchedBy, Qt::DisplayRole, matched);
 
-    m_treeItemByCountryId.insert(make_pair(countryId, item));
+  if (parent == nullptr)
+    m_tree->addTopLevelItem(item);
 
-    return item;
-  }
+  m_treeItemByCountryId.insert(make_pair(countryId, item));
 
-  vector<QTreeWidgetItem *> UpdateDialog::GetTreeItemsByCountryId(CountryId const & countryId)
-  {
-    vector<QTreeWidgetItem *> res;
-    auto const p = m_treeItemByCountryId.equal_range(countryId);
-    for (auto i = p.first; i != p.second; ++i)
-      res.emplace_back(i->second);
-    return res;
-  }
+  return item;
+}
 
-  CountryId UpdateDialog::GetCountryIdByTreeItem(QTreeWidgetItem * item)
-  {
-    return item->data(KColumnIndexCountry, Qt::UserRole).toString().toStdString();
-  }
+vector<QTreeWidgetItem *> UpdateDialog::GetTreeItemsByCountryId(CountryId const & countryId)
+{
+  vector<QTreeWidgetItem *> res;
+  auto const p = m_treeItemByCountryId.equal_range(countryId);
+  for (auto i = p.first; i != p.second; ++i)
+    res.emplace_back(i->second);
+  return res;
+}
 
-  void UpdateDialog::OnCountryChanged(CountryId const & countryId)
-  {
-    UpdateRowWithCountryInfo(countryId);
+CountryId UpdateDialog::GetCountryIdByTreeItem(QTreeWidgetItem * item)
+{
+  return item->data(KColumnIndexCountry, Qt::UserRole).toString().toStdString();
+}
 
-    // Now core does not support callbacks about parent country change, therefore emulate it.
-    auto const items = GetTreeItemsByCountryId(countryId);
-    for (auto const item : items)
-    {
-      for (auto p = item->parent(); p != nullptr; p = p->parent())
-        UpdateRowWithCountryInfo(GetCountryIdByTreeItem(p));
-    }
-  }
+void UpdateDialog::OnCountryChanged(CountryId const & countryId)
+{
+  UpdateRowWithCountryInfo(countryId);
 
-  void UpdateDialog::OnCountryDownloadProgress(CountryId const & countryId,
-                                               downloader::Progress const & progress)
-  {
-    auto const items = GetTreeItemsByCountryId(countryId);
-    for (auto const item : items)
-    {
-      item->setText(KColumnIndexSize, QString("%1%").arg(progress.m_bytesDownloaded * 100 /
-                                                         progress.m_bytesTotal));
-    }
-  }
+  // Now core does not support callbacks about parent country change, therefore emulate it.
+  auto const items = GetTreeItemsByCountryId(countryId);
+  for (auto const item : items)
+    for (auto p = item->parent(); p != nullptr; p = p->parent())
+      UpdateRowWithCountryInfo(GetCountryIdByTreeItem(p));
+}
 
-  void UpdateDialog::ShowModal()
-  {
-    // If called for the first time.
-    if (!m_tree->topLevelItemCount())
-      FillTree({} /* filter */, m_fillTreeTimestamp);
+void UpdateDialog::OnCountryDownloadProgress(CountryId const & countryId, downloader::Progress const & progress)
+{
+  auto const items = GetTreeItemsByCountryId(countryId);
+  for (auto const item : items)
+    item->setText(KColumnIndexSize, QString("%1%").arg(progress.m_bytesDownloaded * 100 / progress.m_bytesTotal));
+}
 
-    exec();
-  }
+void UpdateDialog::ShowModal()
+{
+  // If called for the first time.
+  if (!m_tree->topLevelItemCount())
+    FillTree({} /* filter */, m_fillTreeTimestamp);
+
+  exec();
+}
 }  // namespace qt
diff --git a/qt/update_dialog.hpp b/qt/update_dialog.hpp
index 50ff228d2..1f928f0c0 100644
--- a/qt/update_dialog.hpp
+++ b/qt/update_dialog.hpp
@@ -25,64 +25,63 @@ class Framework;
 
 namespace qt
 {
-  class UpdateDialog : public QDialog
-  {
-    Q_OBJECT
+class UpdateDialog : public QDialog
+{
+  Q_OBJECT
 
-  public:
-    explicit UpdateDialog(QWidget * parent, Framework & framework);
-    virtual ~UpdateDialog();
+public:
+  explicit UpdateDialog(QWidget * parent, Framework & framework);
+  virtual ~UpdateDialog();
 
-    /// @name Called from downloader to notify GUI
-    //@{
-    void OnCountryChanged(storage::CountryId const & countryId);
-    void OnCountryDownloadProgress(storage::CountryId const & countryId,
-                                   downloader::Progress const & progress);
-    //@}
+  /// @name Called from downloader to notify GUI
+  //@{
+  void OnCountryChanged(storage::CountryId const & countryId);
+  void OnCountryDownloadProgress(storage::CountryId const & countryId, downloader::Progress const & progress);
+  //@}
 
-    void ShowModal();
+  void ShowModal();
 
-  private slots:
-    void OnItemClick(QTreeWidgetItem * item, int column);
-    void OnCloseClick();
-    void OnLocaleTextChanged(QString const & text);
-    void OnQueryTextChanged(QString const & text);
+private slots:
+  void OnItemClick(QTreeWidgetItem * item, int column);
+  void OnCloseClick();
+  void OnLocaleTextChanged(QString const & text);
+  void OnQueryTextChanged(QString const & text);
 
-  private:
-    // CountryId to its ranking position and matched string (assuming no duplicates).
-    using Filter = std::unordered_map<storage::CountryId, std::pair<size_t, std::string>>;
+private:
+  // CountryId to its ranking position and matched string (assuming no duplicates).
+  using Filter = std::unordered_map<storage::CountryId, std::pair<size_t, std::string>>;
 
-    void RefillTree();
-    void StartSearchInDownloader();
+  void RefillTree();
+  void StartSearchInDownloader();
 
-    // Adds only those countries present in |filter|.
-    // Calls whose timestamp is not the latest are discarded.
-    void FillTree(std::optional<Filter> const & filter, uint64_t timestamp);
-    void FillTreeImpl(QTreeWidgetItem * parent, storage::CountryId const & countryId,
-                      std::optional<Filter> const & filter);
+  // Adds only those countries present in |filter|.
+  // Calls whose timestamp is not the latest are discarded.
+  void FillTree(std::optional<Filter> const & filter, uint64_t timestamp);
+  void FillTreeImpl(QTreeWidgetItem * parent, storage::CountryId const & countryId,
+                    std::optional<Filter> const & filter);
 
-    void UpdateRowWithCountryInfo(storage::CountryId const & countryId);
-    void UpdateRowWithCountryInfo(QTreeWidgetItem * item, storage::CountryId const & countryId);
-    QString GetNodeName(storage::CountryId const & countryId);
+  void UpdateRowWithCountryInfo(storage::CountryId const & countryId);
+  void UpdateRowWithCountryInfo(QTreeWidgetItem * item, storage::CountryId const & countryId);
+  QString GetNodeName(storage::CountryId const & countryId);
 
-    QTreeWidgetItem * CreateTreeItem(storage::CountryId const & countryId, size_t posInRanking,
-                                     std::string matchedBy, QTreeWidgetItem * parent);
-    std::vector<QTreeWidgetItem *> GetTreeItemsByCountryId(storage::CountryId const & countryId);
-    storage::CountryId GetCountryIdByTreeItem(QTreeWidgetItem *);
+  QTreeWidgetItem * CreateTreeItem(storage::CountryId const & countryId, size_t posInRanking, std::string matchedBy,
+                                   QTreeWidgetItem * parent);
+  std::vector<QTreeWidgetItem *> GetTreeItemsByCountryId(storage::CountryId const & countryId);
+  storage::CountryId GetCountryIdByTreeItem(QTreeWidgetItem *);
 
-    inline storage::Storage & GetStorage() const { return m_framework.GetStorage(); }
+  inline storage::Storage & GetStorage() const { return m_framework.GetStorage(); }
 
-    QTreeWidget * m_tree;
-    Framework & m_framework;
-    int m_observerSlotId;
+  QTreeWidget * m_tree;
+  Framework & m_framework;
+  int m_observerSlotId;
 
-    // Params of the queries to the search engine.
-    std::string m_query;
-    std::string m_locale = "en";
-    uint64_t m_fillTreeTimestamp = 0;
+  // Params of the queries to the search engine.
+  std::string m_query;
+  std::string m_locale = "en";
+  uint64_t m_fillTreeTimestamp = 0;
 
-    std::unordered_multimap<storage::CountryId, QTreeWidgetItem *> m_treeItemByCountryId;
+  std::unordered_multimap<storage::CountryId, QTreeWidgetItem *> m_treeItemByCountryId;
 
-    DECLARE_THREAD_CHECKER(m_threadChecker);
-  };
+  DECLARE_THREAD_CHECKER(m_threadChecker);
+};
 }  // namespace qt
diff --git a/tools/feature_list/feature_list.cpp b/tools/feature_list/feature_list.cpp
index a8d357912..eec415ca3 100644
--- a/tools/feature_list/feature_list.cpp
+++ b/tools/feature_list/feature_list.cpp
@@ -67,9 +67,8 @@ m2::PointD FindCenter(FeatureType & f)
   ClosestPoint closest(f.GetLimitRect(FeatureType::BEST_GEOMETRY).Center());
   if (f.GetGeomType() == feature::GeomType::Area)
   {
-    f.ForEachTriangle([&closest](m2::PointD const & p1, m2::PointD const & p2,
-                                 m2::PointD const & p3) { closest((p1 + p2 + p3) / 3); },
-                      FeatureType::BEST_GEOMETRY);
+    f.ForEachTriangle([&closest](m2::PointD const & p1, m2::PointD const & p2, m2::PointD const & p3)
+    { closest((p1 + p2 + p3) / 3); }, FeatureType::BEST_GEOMETRY);
   }
   else
   {
@@ -93,7 +92,7 @@ string GetReadableType(FeatureType & f)
 
 string GetWheelchairType(FeatureType & f)
 {
-  static const uint32_t wheelchair = classif().GetTypeByPath({"wheelchair"});
+  static uint32_t const wheelchair = classif().GetTypeByPath({"wheelchair"});
   string result;
   f.ForEachType([&result](uint32_t type)
   {
@@ -110,9 +109,10 @@ string GetWheelchairType(FeatureType & f)
 
 bool HasAtm(FeatureType & f)
 {
-  static const uint32_t atm = classif().GetTypeByPath({"amenity", "atm"});
+  static uint32_t const atm = classif().GetTypeByPath({"amenity", "atm"});
   bool result = false;
-  f.ForEachType([&result](uint32_t type) {
+  f.ForEachType([&result](uint32_t type)
+  {
     if (type == atm)
       result = true;
   });
@@ -122,8 +122,7 @@ bool HasAtm(FeatureType & f)
 string BuildUniqueId(ms::LatLon const & coords, string const & name)
 {
   ostringstream ss;
-  ss << strings::to_string_dac(coords.m_lat, 6) << ','
-     << strings::to_string_dac(coords.m_lon, 6) << ',' << name;
+  ss << strings::to_string_dac(coords.m_lat, 6) << ',' << strings::to_string_dac(coords.m_lon, 6) << ',' << name;
   uint32_t hash = 0;
   for (char const c : ss.str())
     hash = hash * 101 + c;
@@ -191,10 +190,7 @@ public:
 
   void ClearCache() { m_villagesCache.Clear(); }
 
-  void operator()(FeatureType & f, map<uint32_t, base::GeoObjectId> const & ft2osm)
-  {
-    Process(f, ft2osm);
-  }
+  void operator()(FeatureType & f, map<uint32_t, base::GeoObjectId> const & ft2osm) { Process(f, ft2osm); }
 
   void Process(FeatureType & f, map<uint32_t, base::GeoObjectId> const & ft2osm)
   {
@@ -205,8 +201,7 @@ public:
     auto const metaOperator = meta.Get(feature::Metadata::FMD_OPERATOR);
     auto const & osmIt = ft2osm.find(f.GetID().m_index);
     if ((!f.HasName() && metaOperator.empty()) ||
-        (f.GetGeomType() == feature::GeomType::Line && category != "highway-pedestrian") ||
-        category.empty())
+        (f.GetGeomType() == feature::GeomType::Line && category != "highway-pedestrian") || category.empty())
     {
       return;
     }
@@ -217,9 +212,7 @@ public:
 
     string_view city;
     m_finder.GetLocality(center, [&city](search::LocalityItem const & item)
-    {
-      item.GetSpecifiedOrDefaultName(StringUtf8Multilang::kDefaultCode, city);
-    });
+    { item.GetSpecifiedOrDefaultName(StringUtf8Multilang::kDefaultCode, city); });
 
     string const & mwmName = f.GetID().GetMwmName();
 
@@ -276,11 +269,39 @@ public:
     string const fee = category.ends_with("-fee") ? "yes" : "";
     string const atm = HasAtm(f) ? "yes" : "";
 
-    vector<string> columns = {
-        osmId,             uid,             lat,           lon,       mwmName, category,     name,    std::string(city),
-        addrStreet,        addrHouse,       phone,         website,   stars,   std::string(metaOperator), internet,
-        denomination,      wheelchair,      opening_hours, check_date, check_date_opening_hours, wikipedia, floor,   fee,          atm,     contact_facebook,
-        contact_instagram, contact_twitter, contact_vk,    contact_line, contact_fediverse, contact_bluesky, wikimedia_commons, panoramax};
+    vector<string> columns = {osmId,
+                              uid,
+                              lat,
+                              lon,
+                              mwmName,
+                              category,
+                              name,
+                              std::string(city),
+                              addrStreet,
+                              addrHouse,
+                              phone,
+                              website,
+                              stars,
+                              std::string(metaOperator),
+                              internet,
+                              denomination,
+                              wheelchair,
+                              opening_hours,
+                              check_date,
+                              check_date_opening_hours,
+                              wikipedia,
+                              floor,
+                              fee,
+                              atm,
+                              contact_facebook,
+                              contact_instagram,
+                              contact_twitter,
+                              contact_vk,
+                              contact_line,
+                              contact_fediverse,
+                              contact_bluesky,
+                              wikimedia_commons,
+                              panoramax};
 
     AppendNames(f, columns);
     PrintAsCSV(columns, ';', cout);
@@ -289,12 +310,40 @@ public:
 
 void PrintHeader()
 {
-  vector<string> columns = {"id",              "old_id",       "lat",        "lon",              "mwm",
-                            "category",        "name",         "city",       "street",           "house",
-                            "phone",           "website",      "cuisines",   "stars",            "operator",
-                            "internet",        "denomination", "wheelchair", "opening_hours",    "check_date", "check_date_opening_hours", "wikipedia",
-                            "floor",           "fee",          "atm",        "contact_facebook", "contact_instagram",
-                            "contact_twitter", "contact_vk",   "contact_line", "contact_fediverse", "contact_bluesky", "wikimedia_commons", "panoramax"};
+  vector<string> columns = {"id",
+                            "old_id",
+                            "lat",
+                            "lon",
+                            "mwm",
+                            "category",
+                            "name",
+                            "city",
+                            "street",
+                            "house",
+                            "phone",
+                            "website",
+                            "cuisines",
+                            "stars",
+                            "operator",
+                            "internet",
+                            "denomination",
+                            "wheelchair",
+                            "opening_hours",
+                            "check_date",
+                            "check_date_opening_hours",
+                            "wikipedia",
+                            "floor",
+                            "fee",
+                            "atm",
+                            "contact_facebook",
+                            "contact_instagram",
+                            "contact_twitter",
+                            "contact_vk",
+                            "contact_line",
+                            "contact_fediverse",
+                            "contact_bluesky",
+                            "wikimedia_commons",
+                            "panoramax"};
   // Append all supported name languages in order.
   for (uint8_t idx = 1; idx < kLangCount; idx++)
     columns.push_back("name_" + string(StringUtf8Multilang::GetLangByCode(idx)));
@@ -304,15 +353,12 @@ void PrintHeader()
 bool ParseFeatureIdToOsmIdMapping(string const & path, map<uint32_t, base::GeoObjectId> & mapping)
 {
   return generator::ForEachOsmId2FeatureId(
-      path, [&](auto const & compositeId, uint32_t const featureId) {
-        mapping[featureId] = compositeId.m_mainId;
-      });
+      path, [&](auto const & compositeId, uint32_t const featureId) { mapping[featureId] = compositeId.m_mainId; });
 }
 
 void DidDownload(storage::CountryId const & /* countryId */,
                  shared_ptr<platform::LocalCountryFile> const & /* localFile */)
-{
-}
+{}
 
 bool WillDelete(storage::CountryId const & /* countryId */,
                 shared_ptr<platform::LocalCountryFile> const & /* localFile */)
@@ -325,8 +371,7 @@ int main(int argc, char ** argv)
   platform::tests_support::ChangeMaxNumberOfOpenFiles(search::search_quality::kMaxOpenFiles);
   if (argc <= 1)
   {
-    LOG(LERROR, ("Usage:", argc == 1 ? argv[0] : "feature_list",
-                 "<mwm_path> [<data_path>] [<mwm_prefix>]"));
+    LOG(LERROR, ("Usage:", argc == 1 ? argv[0] : "feature_list", "<mwm_path> [<data_path>] [<mwm_prefix>]"));
     return 1;
   }
 
@@ -350,8 +395,7 @@ int main(int argc, char ** argv)
 
   FrozenDataSource dataSource;
   vector<platform::LocalCountryFile> mwms;
-  platform::FindAllLocalMapsAndCleanup(numeric_limits<int64_t>::max() /* the latest version */,
-                                       mwms);
+  platform::FindAllLocalMapsAndCleanup(numeric_limits<int64_t>::max() /* the latest version */, mwms);
   for (auto & mwm : mwms)
   {
     mwm.SyncWithDisk();
@@ -372,17 +416,15 @@ int main(int argc, char ** argv)
     if (argc > 3 && !(mwmInfo->GetCountryName() + DATA_FILE_EXTENSION).starts_with(argv[3]))
       continue;
     LOG(LINFO, ("Processing", mwmInfo->GetCountryName()));
-    string osmToFeatureFile = base::JoinPath(
-        argv[1], mwmInfo->GetCountryName() + DATA_FILE_EXTENSION + OSM2FEATURE_FILE_EXTENSION);
+    string osmToFeatureFile =
+        base::JoinPath(argv[1], mwmInfo->GetCountryName() + DATA_FILE_EXTENSION + OSM2FEATURE_FILE_EXTENSION);
     map<uint32_t, base::GeoObjectId> featureIdToOsmId;
     ParseFeatureIdToOsmIdMapping(osmToFeatureFile, featureIdToOsmId);
     MwmSet::MwmId mwmId(mwmInfo);
     FeaturesLoaderGuard loader(dataSource, mwmId);
     for (uint32_t ftIndex = 0; ftIndex < loader.GetNumFeatures(); ftIndex++)
-    {
       if (auto ft = loader.GetFeatureByIndex(static_cast<uint32_t>(ftIndex)))
         doProcess.Process(*ft, featureIdToOsmId);
-    }
     doProcess.ClearCache();
   }
 
diff --git a/tools/openlr/cache_line_size.hpp b/tools/openlr/cache_line_size.hpp
index dce41471d..662f6dc6c 100644
--- a/tools/openlr/cache_line_size.hpp
+++ b/tools/openlr/cache_line_size.hpp
@@ -5,4 +5,4 @@
 namespace openlr
 {
 size_t constexpr kCacheLineSize = 64;
-}  // namespace
+}  // namespace openlr
diff --git a/tools/openlr/candidate_paths_getter.cpp b/tools/openlr/candidate_paths_getter.cpp
index 06b39668f..c523bc735 100644
--- a/tools/openlr/candidate_paths_getter.cpp
+++ b/tools/openlr/candidate_paths_getter.cpp
@@ -62,9 +62,8 @@ bool CandidatePathsGetter::Link::IsPointOnPath(geometry::PointWithAltitude const
 }
 
 // CandidatePathsGetter ----------------------------------------------------------------------------
-bool CandidatePathsGetter::GetLineCandidatesForPoints(
-    vector<LocationReferencePoint> const & points,
-    vector<vector<Graph::EdgeVector>> & lineCandidates)
+bool CandidatePathsGetter::GetLineCandidatesForPoints(vector<LocationReferencePoint> const & points,
+                                                      vector<vector<Graph::EdgeVector>> & lineCandidates)
 {
   for (size_t i = 0; i < points.size(); ++i)
   {
@@ -77,14 +76,11 @@ bool CandidatePathsGetter::GetLineCandidatesForPoints(
 
     lineCandidates.emplace_back();
     auto const isLastPoint = i == points.size() - 1;
-    double const distanceToNextPointM =
-        (isLastPoint ? points[i - 1] : points[i]).m_distanceToNextPoint;
+    double const distanceToNextPointM = (isLastPoint ? points[i - 1] : points[i]).m_distanceToNextPoint;
 
     vector<m2::PointD> pointCandidates;
-    m_pointsGetter.GetCandidatePoints(mercator::FromLatLon(points[i].m_latLon),
-                                      pointCandidates);
-    GetLineCandidates(points[i], isLastPoint, distanceToNextPointM, pointCandidates,
-                      lineCandidates.back());
+    m_pointsGetter.GetCandidatePoints(mercator::FromLatLon(points[i].m_latLon), pointCandidates);
+    GetLineCandidates(points[i], isLastPoint, distanceToNextPointM, pointCandidates, lineCandidates.back());
 
     if (lineCandidates.back().empty())
     {
@@ -117,11 +113,9 @@ void CandidatePathsGetter::GetStartLines(vector<m2::PointD> const & points, bool
   base::SortUnique(edges, less<Graph::Edge>(), EdgesAreAlmostEqual);
 }
 
-void CandidatePathsGetter::GetAllSuitablePaths(Graph::EdgeVector const & startLines,
-                                               bool isLastPoint, double bearDistM,
-                                               FunctionalRoadClass functionalRoadClass,
-                                               FormOfWay formOfWay, double distanceToNextPointM,
-                                               vector<LinkPtr> & allPaths)
+void CandidatePathsGetter::GetAllSuitablePaths(Graph::EdgeVector const & startLines, bool isLastPoint, double bearDistM,
+                                               FunctionalRoadClass functionalRoadClass, FormOfWay formOfWay,
+                                               double distanceToNextPointM, vector<LinkPtr> & allPaths)
 {
   queue<LinkPtr> q;
 
@@ -179,9 +173,9 @@ void CandidatePathsGetter::GetAllSuitablePaths(Graph::EdgeVector const & startLi
   }
 }
 
-void CandidatePathsGetter::GetBestCandidatePaths(
-    vector<LinkPtr> const & allPaths, bool const isLastPoint, uint32_t const requiredBearing,
-    double const bearDistM, m2::PointD const & startPoint, vector<Graph::EdgeVector> & candidates)
+void CandidatePathsGetter::GetBestCandidatePaths(vector<LinkPtr> const & allPaths, bool const isLastPoint,
+                                                 uint32_t const requiredBearing, double const bearDistM,
+                                                 m2::PointD const & startPoint, vector<Graph::EdgeVector> & candidates)
 {
   set<CandidatePath> candidatePaths;
   set<CandidatePath> fakeEndingsCandidatePaths;
@@ -212,8 +206,7 @@ void CandidatePathsGetter::GetBestCandidatePaths(
 
       --traceBackIterationsLeft;
 
-      auto const bearEndPoint =
-          pointsSelector.GetEndPoint(part->m_edge, part->m_distanceM);
+      auto const bearEndPoint = pointsSelector.GetEndPoint(part->m_edge, part->m_distanceM);
 
       auto const bearing = cpg::Bearing(bearStartPoint, bearEndPoint);
       auto const bearingDiff = AbsDifference(bearing, requiredBearing);
@@ -228,21 +221,16 @@ void CandidatePathsGetter::GetBestCandidatePaths(
     }
   }
 
-  ASSERT(
-      none_of(begin(candidatePaths), end(candidatePaths), mem_fn(&CandidatePath::HasFakeEndings)),
-      ());
-  ASSERT(fakeEndingsCandidatePaths.empty() ||
-             any_of(begin(fakeEndingsCandidatePaths), end(fakeEndingsCandidatePaths),
-                    mem_fn(&CandidatePath::HasFakeEndings)),
+  ASSERT(none_of(begin(candidatePaths), end(candidatePaths), mem_fn(&CandidatePath::HasFakeEndings)), ());
+  ASSERT(fakeEndingsCandidatePaths.empty() || any_of(begin(fakeEndingsCandidatePaths), end(fakeEndingsCandidatePaths),
+                                                     mem_fn(&CandidatePath::HasFakeEndings)),
          ());
 
   vector<CandidatePath> paths;
-  copy_n(begin(candidatePaths), min(static_cast<size_t>(kMaxCandidates), candidatePaths.size()),
-         back_inserter(paths));
+  copy_n(begin(candidatePaths), min(static_cast<size_t>(kMaxCandidates), candidatePaths.size()), back_inserter(paths));
 
   copy_n(begin(fakeEndingsCandidatePaths),
-         min(static_cast<size_t>(kMaxFakeCandidates), fakeEndingsCandidatePaths.size()),
-         back_inserter(paths));
+         min(static_cast<size_t>(kMaxFakeCandidates), fakeEndingsCandidatePaths.size()), back_inserter(paths));
 
   LOG(LDEBUG, ("List candidate paths..."));
   for (auto const & path : paths)
@@ -258,8 +246,7 @@ void CandidatePathsGetter::GetBestCandidatePaths(
   }
 }
 
-void CandidatePathsGetter::GetLineCandidates(openlr::LocationReferencePoint const & p,
-                                             bool const isLastPoint,
+void CandidatePathsGetter::GetLineCandidates(openlr::LocationReferencePoint const & p, bool const isLastPoint,
                                              double const distanceToNextPointM,
                                              vector<m2::PointD> const & pointCandidates,
                                              vector<Graph::EdgeVector> & candidates)
@@ -280,8 +267,8 @@ void CandidatePathsGetter::GetLineCandidates(openlr::LocationReferencePoint cons
   auto const startPoint = mercator::FromLatLon(p.m_latLon);
 
   vector<LinkPtr> allPaths;
-  GetAllSuitablePaths(startLines, isLastPoint, bearDistM, p.m_functionalRoadClass, p.m_formOfWay,
-                      distanceToNextPointM, allPaths);
+  GetAllSuitablePaths(startLines, isLastPoint, bearDistM, p.m_functionalRoadClass, p.m_formOfWay, distanceToNextPointM,
+                      allPaths);
   GetBestCandidatePaths(allPaths, isLastPoint, p.m_bearing, bearDistM, startPoint, candidates);
   LOG(LDEBUG, (candidates.size(), "candidate paths found for point (LatLon)", p.m_latLon));
 }
diff --git a/tools/openlr/candidate_paths_getter.hpp b/tools/openlr/candidate_paths_getter.hpp
index b87ace5ce..92dac407e 100644
--- a/tools/openlr/candidate_paths_getter.hpp
+++ b/tools/openlr/candidate_paths_getter.hpp
@@ -20,11 +20,13 @@ class CandidatePointsGetter;
 class CandidatePathsGetter
 {
 public:
-  CandidatePathsGetter(CandidatePointsGetter & pointsGetter, Graph & graph,
-                       RoadInfoGetter & infoGetter, v2::Stats & stat)
-    : m_pointsGetter(pointsGetter), m_graph(graph), m_infoGetter(infoGetter), m_stats(stat)
-  {
-  }
+  CandidatePathsGetter(CandidatePointsGetter & pointsGetter, Graph & graph, RoadInfoGetter & infoGetter,
+                       v2::Stats & stat)
+    : m_pointsGetter(pointsGetter)
+    , m_graph(graph)
+    , m_infoGetter(infoGetter)
+    , m_stats(stat)
+  {}
 
   bool GetLineCandidatesForPoints(std::vector<LocationReferencePoint> const & points,
                                   std::vector<std::vector<Graph::EdgeVector>> & lineCandidates);
@@ -44,8 +46,7 @@ private:
       , m_edge(edge)
       , m_distanceM(distanceM)
       , m_hasFake((parent && parent->m_hasFake) || edge.IsFake())
-    {
-    }
+    {}
 
     bool IsPointOnPath(geometry::PointWithAltitude const & point) const;
 
@@ -71,8 +72,7 @@ private:
       , m_bearingDiff(bearingDiff)
       , m_pathDistanceDiff(pathDistanceDiff)
       , m_startPointDistance(startPointDistance)
-    {
-    }
+    {}
 
     bool operator<(CandidatePath const & o) const { return GetPenalty() < o.GetPenalty(); }
 
@@ -102,21 +102,18 @@ private:
   // distance-to-next point is taken from point 3. You can learn more in
   // TomTom OpenLR spec.
 
-  void GetStartLines(std::vector<m2::PointD> const & points, bool const isLastPoint,
-                     Graph::EdgeVector & edges);
+  void GetStartLines(std::vector<m2::PointD> const & points, bool const isLastPoint, Graph::EdgeVector & edges);
 
   void GetAllSuitablePaths(Graph::EdgeVector const & startLines, bool isLastPoint, double bearDistM,
-                           FunctionalRoadClass functionalRoadClass, FormOfWay formOfWay,
-                           double distanceToNextPointM, std::vector<LinkPtr> & allPaths);
+                           FunctionalRoadClass functionalRoadClass, FormOfWay formOfWay, double distanceToNextPointM,
+                           std::vector<LinkPtr> & allPaths);
 
   void GetBestCandidatePaths(std::vector<LinkPtr> const & allPaths, bool const isLastPoint,
-                             uint32_t const requiredBearing, double const bearDistM,
-                             m2::PointD const & startPoint,
+                             uint32_t const requiredBearing, double const bearDistM, m2::PointD const & startPoint,
                              std::vector<Graph::EdgeVector> & candidates);
 
   void GetLineCandidates(openlr::LocationReferencePoint const & p, bool const isLastPoint,
-                         double const distanceToNextPointM,
-                         std::vector<m2::PointD> const & pointCandidates,
+                         double const distanceToNextPointM, std::vector<m2::PointD> const & pointCandidates,
                          std::vector<Graph::EdgeVector> & candidates);
 
   CandidatePointsGetter & m_pointsGetter;
diff --git a/tools/openlr/candidate_points_getter.cpp b/tools/openlr/candidate_points_getter.cpp
index 355cb927c..8adabc8c8 100644
--- a/tools/openlr/candidate_points_getter.cpp
+++ b/tools/openlr/candidate_points_getter.cpp
@@ -18,22 +18,21 @@ using namespace routing;
 
 namespace openlr
 {
-void CandidatePointsGetter::FillJunctionPointCandidates(m2::PointD const & p,
-                                                        std::vector<m2::PointD> & candidates)
+void CandidatePointsGetter::FillJunctionPointCandidates(m2::PointD const & p, std::vector<m2::PointD> & candidates)
 {
   // TODO(mgsergio): Get optimal value using experiments on a sample.
   // Or start with small radius and scale it up when there are too few points.
   size_t const kRectSideMeters = 110;
 
   auto const rect = mercator::RectByCenterXYAndSizeInMeters(p, kRectSideMeters);
-  auto const selectCandidates = [&rect, &candidates](FeatureType & ft) {
+  auto const selectCandidates = [&rect, &candidates](FeatureType & ft)
+  {
     ft.ParseGeometry(FeatureType::BEST_GEOMETRY);
-    ft.ForEachPoint(
-        [&rect, &candidates](m2::PointD const & candidate) {
-          if (rect.IsPointInside(candidate))
-            candidates.emplace_back(candidate);
-        },
-        scales::GetUpperScale());
+    ft.ForEachPoint([&rect, &candidates](m2::PointD const & candidate)
+    {
+      if (rect.IsPointInside(candidate))
+        candidates.emplace_back(candidate);
+    }, scales::GetUpperScale());
   };
 
   m_dataSource.ForEachInRect(selectCandidates, rect, scales::GetUpperScale());
@@ -44,17 +43,14 @@ void CandidatePointsGetter::FillJunctionPointCandidates(m2::PointD const & p,
   // later. The idea to fix this was to move SortUnique to the stage
   // after enriching with projections.
 
-  base::SortUnique(candidates,
-                   [&p](m2::PointD const & a, m2::PointD const & b) {
-                     return mercator::DistanceOnEarth(a, p) < mercator::DistanceOnEarth(b, p);
-                   },
+  base::SortUnique(candidates, [&p](m2::PointD const & a, m2::PointD const & b)
+  { return mercator::DistanceOnEarth(a, p) < mercator::DistanceOnEarth(b, p); },
                    [](m2::PointD const & a, m2::PointD const & b) { return a == b; });
 
   candidates.resize(std::min(m_maxJunctionCandidates, candidates.size()));
 }
 
-void CandidatePointsGetter::EnrichWithProjectionPoints(m2::PointD const & p,
-                                                       std::vector<m2::PointD> & candidates)
+void CandidatePointsGetter::EnrichWithProjectionPoints(m2::PointD const & p, std::vector<m2::PointD> & candidates)
 {
   m_graph.ResetFakes();
 
diff --git a/tools/openlr/candidate_points_getter.hpp b/tools/openlr/candidate_points_getter.hpp
index 02c16c0b8..eb0a1b49a 100644
--- a/tools/openlr/candidate_points_getter.hpp
+++ b/tools/openlr/candidate_points_getter.hpp
@@ -22,8 +22,7 @@ public:
     , m_maxProjectionCandidates(maxProjectionCandidates)
     , m_dataSource(dataSource)
     , m_graph(graph)
-  {
-  }
+  {}
 
   void GetCandidatePoints(m2::PointD const & p, std::vector<m2::PointD> & candidates)
   {
diff --git a/tools/openlr/decoded_path.cpp b/tools/openlr/decoded_path.cpp
index cc84fe15e..13a625217 100644
--- a/tools/openlr/decoded_path.cpp
+++ b/tools/openlr/decoded_path.cpp
@@ -15,7 +15,7 @@
 
 #define THROW_IF_NODE_IS_EMPTY(node, exc, msg) \
   if (!node)                                   \
-    MYTHROW(exc, msg)
+  MYTHROW(exc, msg)
 
 namespace
 {
@@ -81,10 +81,7 @@ void WriteAsMappingForSpark(std::string const & fileName, std::vector<DecodedPat
   WriteAsMappingForSpark(ofs, paths);
 
   if (ofs.fail())
-  {
-    MYTHROW(DecodedPathSaveError,
-            ("An error occured while writing file", fileName, strerror(errno)));
-  }
+    MYTHROW(DecodedPathSaveError, ("An error occured while writing file", fileName, strerror(errno)));
 }
 
 void WriteAsMappingForSpark(std::ostream & ost, std::vector<DecodedPath> const & paths)
@@ -105,11 +102,9 @@ void WriteAsMappingForSpark(std::ostream & ost, std::vector<DecodedPath> const &
     for (auto it = std::begin(p.m_path); it != std::end(p.m_path); ++it)
     {
       auto const & fid = it->GetFeatureId();
-      ost << fid.m_mwmId.GetInfo()->GetCountryName()
-          << kFieldSep << fid.m_index
-          << kFieldSep << it->GetSegId()
-          << kFieldSep << (it->IsForward() ? "fwd" : "bwd")
-          << kFieldSep << mercator::DistanceOnEarth(GetStart(*it), GetEnd(*it));
+      ost << fid.m_mwmId.GetInfo()->GetCountryName() << kFieldSep << fid.m_index << kFieldSep << it->GetSegId()
+          << kFieldSep << (it->IsForward() ? "fwd" : "bwd") << kFieldSep
+          << mercator::DistanceOnEarth(GetStart(*it), GetEnd(*it));
 
       if (std::next(it) != std::end(p.m_path))
         ost << kSegmentSep;
@@ -135,10 +130,10 @@ void PathFromXML(pugi::xml_node const & node, DataSource const & dataSource, Pat
     LatLonFromXML(e.child("StartJunction"), start);
     LatLonFromXML(e.child("EndJunction"), end);
 
-    p.push_back(Edge::MakeReal(
-        fid, isForward, segmentId,
-        geometry::PointWithAltitude(mercator::FromLatLon(start), geometry::kDefaultAltitudeMeters),
-        geometry::PointWithAltitude(mercator::FromLatLon(end), geometry::kDefaultAltitudeMeters)));
+    p.push_back(
+        Edge::MakeReal(fid, isForward, segmentId,
+                       geometry::PointWithAltitude(mercator::FromLatLon(start), geometry::kDefaultAltitudeMeters),
+                       geometry::PointWithAltitude(mercator::FromLatLon(end), geometry::kDefaultAltitudeMeters)));
   }
 }
 
diff --git a/tools/openlr/decoded_path.hpp b/tools/openlr/decoded_path.hpp
index fe4923768..5a94cb017 100644
--- a/tools/openlr/decoded_path.hpp
+++ b/tools/openlr/decoded_path.hpp
@@ -42,8 +42,14 @@ void PathToXML(Path const & path, pugi::xml_node & node);
 
 namespace routing
 {
-inline m2::PointD GetStart(Edge const & e) { return e.GetStartJunction().GetPoint(); }
-inline m2::PointD GetEnd(Edge const & e) { return e.GetEndJunction().GetPoint(); }
+inline m2::PointD GetStart(Edge const & e)
+{
+  return e.GetStartJunction().GetPoint();
+}
+inline m2::PointD GetEnd(Edge const & e)
+{
+  return e.GetEndJunction().GetPoint();
+}
 
 std::vector<m2::PointD> GetPoints(routing::RoadGraphBase::EdgeVector const & p);
 }  // namespace routing
diff --git a/tools/openlr/graph.cpp b/tools/openlr/graph.cpp
index b76ec654e..6b32c16de 100644
--- a/tools/openlr/graph.cpp
+++ b/tools/openlr/graph.cpp
@@ -15,13 +15,10 @@ namespace openlr
 {
 namespace
 {
-using EdgeGetter = void (IRoadGraph::*)(geometry::PointWithAltitude const &,
-                                        RoadGraphBase::EdgeListT &) const;
+using EdgeGetter = void (IRoadGraph::*)(geometry::PointWithAltitude const &, RoadGraphBase::EdgeListT &) const;
 
 void GetRegularEdges(geometry::PointWithAltitude const & junction, IRoadGraph const & graph,
-                     EdgeGetter const edgeGetter,
-                     Graph::EdgeCacheT & cache,
-                     Graph::EdgeListT & edges)
+                     EdgeGetter const edgeGetter, Graph::EdgeCacheT & cache, Graph::EdgeListT & edges)
 {
   auto const it = cache.find(junction);
   if (it == end(cache))
@@ -39,9 +36,9 @@ void GetRegularEdges(geometry::PointWithAltitude const & junction, IRoadGraph co
 }  // namespace
 
 Graph::Graph(DataSource & dataSource, shared_ptr<CarModelFactory> carModelFactory)
-  : m_dataSource(dataSource, nullptr /* numMwmIDs */), m_graph(m_dataSource, IRoadGraph::Mode::ObeyOnewayTag, carModelFactory)
-{
-}
+  : m_dataSource(dataSource, nullptr /* numMwmIDs */)
+  , m_graph(m_dataSource, IRoadGraph::Mode::ObeyOnewayTag, carModelFactory)
+{}
 
 void Graph::GetOutgoingEdges(Junction const & junction, EdgeListT & edges)
 {
@@ -68,9 +65,8 @@ void Graph::GetRegularIngoingEdges(Junction const & junction, EdgeListT & edges)
 void Graph::FindClosestEdges(m2::PointD const & point, uint32_t const count,
                              vector<pair<Edge, Junction>> & vicinities) const
 {
-  m_graph.FindClosestEdges(
-      mercator::RectByCenterXYAndSizeInMeters(point, FeaturesRoadGraph::kClosestEdgesRadiusM),
-      count, vicinities);
+  m_graph.FindClosestEdges(mercator::RectByCenterXYAndSizeInMeters(point, FeaturesRoadGraph::kClosestEdgesRadiusM),
+                           count, vicinities);
 }
 
 void Graph::AddIngoingFakeEdge(Edge const & e)
diff --git a/tools/openlr/graph.hpp b/tools/openlr/graph.hpp
index 4caa9f1fa..452efe9e8 100644
--- a/tools/openlr/graph.hpp
+++ b/tools/openlr/graph.hpp
@@ -53,6 +53,7 @@ public:
   void GetFeatureTypes(FeatureID const & featureId, feature::TypesHolder & types) const;
 
   using EdgeCacheT = std::map<Junction, EdgeListT>;
+
 private:
   routing::MwmDataSource m_dataSource;
   routing::FeaturesRoadGraph m_graph;
diff --git a/tools/openlr/helpers.cpp b/tools/openlr/helpers.cpp
index 2f80fab1a..52e9959b2 100644
--- a/tools/openlr/helpers.cpp
+++ b/tools/openlr/helpers.cpp
@@ -12,7 +12,6 @@
 #include <optional>
 #include <sstream>
 
-
 namespace
 {
 using namespace openlr;
@@ -34,8 +33,7 @@ openlr::FunctionalRoadClass HighwayClassToFunctionalRoadClass(ftypes::HighwayCla
 }
 
 /// \returns nullopt if |e| doesn't conform to |functionalRoadClass| and score otherwise.
-optional<Score> GetFrcScore(Graph::Edge const & e, FunctionalRoadClass functionalRoadClass,
-                            RoadInfoGetter & infoGetter)
+optional<Score> GetFrcScore(Graph::Edge const & e, FunctionalRoadClass functionalRoadClass, RoadInfoGetter & infoGetter)
 {
   CHECK(!e.IsFake(), ());
   Score constexpr kMaxScoreForFrc = 25;
@@ -54,38 +52,31 @@ optional<Score> GetFrcScore(Graph::Edge const & e, FunctionalRoadClass functiona
     return hwClass == HighwayClass::Trunk ? optional<Score>(kMaxScoreForFrc) : nullopt;
 
   case FunctionalRoadClass::FRC1:
-    return (hwClass == HighwayClass::Trunk || hwClass == HighwayClass::Primary)
-               ? optional<Score>(kMaxScoreForFrc)
-               : nullopt;
+    return (hwClass == HighwayClass::Trunk || hwClass == HighwayClass::Primary) ? optional<Score>(kMaxScoreForFrc)
+                                                                                : nullopt;
 
   case FunctionalRoadClass::FRC2:
   case FunctionalRoadClass::FRC3:
     if (hwClass == HighwayClass::Secondary || hwClass == HighwayClass::Tertiary)
       return optional<Score>(kMaxScoreForFrc);
 
-    return hwClass == HighwayClass::Primary || hwClass == HighwayClass::LivingStreet
-               ? optional<Score>(0)
-               : nullopt;
+    return hwClass == HighwayClass::Primary || hwClass == HighwayClass::LivingStreet ? optional<Score>(0) : nullopt;
 
   case FunctionalRoadClass::FRC4:
     if (hwClass == HighwayClass::LivingStreet || hwClass == HighwayClass::Service)
       return optional<Score>(kMaxScoreForFrc);
 
-    return (hwClass == HighwayClass::Tertiary || hwClass == HighwayClass::Secondary)
-               ? optional<Score>(0)
-               : nullopt;
+    return (hwClass == HighwayClass::Tertiary || hwClass == HighwayClass::Secondary) ? optional<Score>(0) : nullopt;
 
   case FunctionalRoadClass::FRC5:
   case FunctionalRoadClass::FRC6:
   case FunctionalRoadClass::FRC7:
-    return (hwClass == HighwayClass::LivingStreet ||
-            hwClass == HighwayClass::Service ||
+    return (hwClass == HighwayClass::LivingStreet || hwClass == HighwayClass::Service ||
             hwClass == HighwayClass::ServiceMinor)
-               ? optional<Score>(kMaxScoreForFrc)
-               : nullopt;
+             ? optional<Score>(kMaxScoreForFrc)
+             : nullopt;
 
-  case FunctionalRoadClass::NotAValue:
-    UNREACHABLE();
+  case FunctionalRoadClass::NotAValue: UNREACHABLE();
   }
   UNREACHABLE();
 }
@@ -95,9 +86,9 @@ namespace openlr
 {
 // BearingPointsSelector ---------------------------------------------------------------------------
 BearingPointsSelector::BearingPointsSelector(uint32_t bearDistM, bool isLastPoint)
-    : m_bearDistM(bearDistM), m_isLastPoint(isLastPoint)
-{
-}
+  : m_bearDistM(bearDistM)
+  , m_isLastPoint(isLastPoint)
+{}
 
 m2::PointD BearingPointsSelector::GetStartPoint(Graph::Edge const & e) const
 {
@@ -131,8 +122,7 @@ double EdgeLength(Graph::Edge const & e)
 bool EdgesAreAlmostEqual(Graph::Edge const & e1, Graph::Edge const & e2)
 {
   // TODO(mgsergio): Do I need to check fields other than points?
-  return PointsAreClose(e1.GetStartPoint(), e2.GetStartPoint()) &&
-         PointsAreClose(e1.GetEndPoint(), e2.GetEndPoint());
+  return PointsAreClose(e1.GetStartPoint(), e2.GetStartPoint()) && PointsAreClose(e1.GetEndPoint(), e2.GetEndPoint());
 }
 
 string LogAs2GisPath(Graph::EdgeVector const & path)
@@ -157,10 +147,13 @@ string LogAs2GisPath(Graph::EdgeVector const & path)
   return ost.str();
 }
 
-string LogAs2GisPath(Graph::Edge const & e) { return LogAs2GisPath(Graph::EdgeVector({e})); }
+string LogAs2GisPath(Graph::Edge const & e)
+{
+  return LogAs2GisPath(Graph::EdgeVector({e}));
+}
 
-bool PassesRestriction(Graph::Edge const & e, FunctionalRoadClass restriction, FormOfWay formOfWay,
-                       int frcThreshold, RoadInfoGetter & infoGetter)
+bool PassesRestriction(Graph::Edge const & e, FunctionalRoadClass restriction, FormOfWay formOfWay, int frcThreshold,
+                       RoadInfoGetter & infoGetter)
 {
   if (e.IsFake() || restriction == FunctionalRoadClass::NotAValue)
     return true;
@@ -169,8 +162,8 @@ bool PassesRestriction(Graph::Edge const & e, FunctionalRoadClass restriction, F
   return static_cast<int>(frc) <= static_cast<int>(restriction) + frcThreshold;
 }
 
-bool PassesRestrictionV3(Graph::Edge const & e, FunctionalRoadClass functionalRoadClass,
-                         FormOfWay formOfWay, RoadInfoGetter & infoGetter, Score & score)
+bool PassesRestrictionV3(Graph::Edge const & e, FunctionalRoadClass functionalRoadClass, FormOfWay formOfWay,
+                         RoadInfoGetter & infoGetter, Score & score)
 {
   CHECK(!e.IsFake(), ("Edges should not be fake:", e));
   auto const frcScore = GetFrcScore(e, functionalRoadClass, infoGetter);
@@ -185,8 +178,8 @@ bool PassesRestrictionV3(Graph::Edge const & e, FunctionalRoadClass functionalRo
   return true;
 }
 
-bool ConformLfrcnp(Graph::Edge const & e, FunctionalRoadClass lowestFrcToNextPoint,
-                   int frcThreshold, RoadInfoGetter & infoGetter)
+bool ConformLfrcnp(Graph::Edge const & e, FunctionalRoadClass lowestFrcToNextPoint, int frcThreshold,
+                   RoadInfoGetter & infoGetter)
 {
   if (e.IsFake() || lowestFrcToNextPoint == FunctionalRoadClass::NotAValue)
     return true;
@@ -195,8 +188,7 @@ bool ConformLfrcnp(Graph::Edge const & e, FunctionalRoadClass lowestFrcToNextPoi
   return static_cast<int>(frc) <= static_cast<int>(lowestFrcToNextPoint) + frcThreshold;
 }
 
-bool ConformLfrcnpV3(Graph::Edge const & e, FunctionalRoadClass lowestFrcToNextPoint,
-                     RoadInfoGetter & infoGetter)
+bool ConformLfrcnpV3(Graph::Edge const & e, FunctionalRoadClass lowestFrcToNextPoint, RoadInfoGetter & infoGetter)
 {
   return GetFrcScore(e, lowestFrcToNextPoint, infoGetter).has_value();
 }
diff --git a/tools/openlr/helpers.hpp b/tools/openlr/helpers.hpp
index 11d78aea6..15dd08b24 100644
--- a/tools/openlr/helpers.hpp
+++ b/tools/openlr/helpers.hpp
@@ -38,27 +38,25 @@ bool EdgesAreAlmostEqual(Graph::Edge const & e1, Graph::Edge const & e2);
 std::string LogAs2GisPath(Graph::EdgeVector const & path);
 std::string LogAs2GisPath(Graph::Edge const & e);
 
-template <typename T, typename U,
-          std::enable_if_t<!(std::is_signed<T>::value ^ std::is_signed<U>::value), int> = 0>
+template <typename T, typename U, std::enable_if_t<!(std::is_signed<T>::value ^ std::is_signed<U>::value), int> = 0>
 std::common_type_t<T, U> AbsDifference(T const a, U const b)
 {
   return a >= b ? a - b : b - a;
 }
 
-bool PassesRestriction(Graph::Edge const & e, FunctionalRoadClass restriction, FormOfWay formOfWay,
-                       int frcThreshold, RoadInfoGetter & infoGetter);
+bool PassesRestriction(Graph::Edge const & e, FunctionalRoadClass restriction, FormOfWay formOfWay, int frcThreshold,
+                       RoadInfoGetter & infoGetter);
 /// \returns true if |e| conforms |functionalRoadClass| and |formOfWay| and false otherwise.
 /// \note If the method returns true |score| should be considered next.
-bool PassesRestrictionV3(Graph::Edge const & e, FunctionalRoadClass functionalRoadClass,
-                         FormOfWay formOfWay, RoadInfoGetter & infoGetter, Score & score);
+bool PassesRestrictionV3(Graph::Edge const & e, FunctionalRoadClass functionalRoadClass, FormOfWay formOfWay,
+                         RoadInfoGetter & infoGetter, Score & score);
 
 /// \returns true if edge |e| conforms Lowest Functional Road Class to Next Point.
 /// \note frc means Functional Road Class. Please see openlr documentation for details:
 /// http://www.openlr.org/data/docs/whitepaper/1_0/OpenLR-Whitepaper_v1.0.pdf
-bool ConformLfrcnp(Graph::Edge const & e, FunctionalRoadClass lowestFrcToNextPoint,
-                   int frcThreshold, RoadInfoGetter & infoGetter);
-bool ConformLfrcnpV3(Graph::Edge const & e, FunctionalRoadClass lowestFrcToNextPoint,
-                     RoadInfoGetter & infoGetter);
+bool ConformLfrcnp(Graph::Edge const & e, FunctionalRoadClass lowestFrcToNextPoint, int frcThreshold,
+                   RoadInfoGetter & infoGetter);
+bool ConformLfrcnpV3(Graph::Edge const & e, FunctionalRoadClass lowestFrcToNextPoint, RoadInfoGetter & infoGetter);
 
 size_t IntersectionLen(Graph::EdgeVector a, Graph::EdgeVector b);
 
diff --git a/tools/openlr/openlr_decoder.cpp b/tools/openlr/openlr_decoder.cpp
index 7fffe394b..5b028cb18 100644
--- a/tools/openlr/openlr_decoder.cpp
+++ b/tools/openlr/openlr_decoder.cpp
@@ -90,17 +90,15 @@ bool IsRealVertex(m2::PointD const & p, FeatureID const & fid, DataSource const
   FeaturesLoaderGuard g(dataSource, fid.m_mwmId);
   auto const ft = g.GetOriginalFeatureByIndex(fid.m_index);
   bool matched = false;
-  ft->ForEachPoint(
-      [&p, &matched](m2::PointD const & fp) {
-        if (p == fp)
-          matched = true;
-      },
-      FeatureType::BEST_GEOMETRY);
+  ft->ForEachPoint([&p, &matched](m2::PointD const & fp)
+  {
+    if (p == fp)
+      matched = true;
+  }, FeatureType::BEST_GEOMETRY);
   return matched;
 }
 
-void ExpandFake(Graph::EdgeVector & path, Graph::EdgeVector::iterator edgeIt, DataSource const & dataSource,
-                Graph & g)
+void ExpandFake(Graph::EdgeVector & path, Graph::EdgeVector::iterator edgeIt, DataSource const & dataSource, Graph & g)
 {
   if (!edgeIt->IsFake())
     return;
@@ -120,16 +118,18 @@ void ExpandFake(Graph::EdgeVector & path, Graph::EdgeVector::iterator edgeIt, Da
 
   CHECK(!edges.empty(), ());
 
-  auto it = find_if(begin(edges), end(edges), [&edgeIt](Graph::Edge const & real) {
-      if (real.GetFeatureId() == edgeIt->GetFeatureId() && real.GetSegId() == edgeIt->GetSegId())
-        return true;
-      return false;
-    });
+  auto it = find_if(begin(edges), end(edges), [&edgeIt](Graph::Edge const & real)
+  {
+    if (real.GetFeatureId() == edgeIt->GetFeatureId() && real.GetSegId() == edgeIt->GetSegId())
+      return true;
+    return false;
+  });
 
   // For features which cross mwm border FeatureIds may not match. Check geometry.
   if (it == end(edges))
   {
-    it = find_if(begin(edges), end(edges), [&edgeIt, &startIsFake](Graph::Edge const & real) {
+    it = find_if(begin(edges), end(edges), [&edgeIt, &startIsFake](Graph::Edge const & real)
+    {
       // Features from the same mwm should be already matched.
       if (real.GetFeatureId().m_mwmId == edgeIt->GetFeatureId().m_mwmId)
         return false;
@@ -170,8 +170,7 @@ void ExpandFakes(DataSource const & dataSource, Graph & g, Graph::EdgeVector & p
 // to some point along that path and drop everything form the start to that point or from
 // that point to the end.
 template <typename InputIterator>
-InputIterator CutOffset(InputIterator start, InputIterator stop, double offset,
-                        bool keepEnd)
+InputIterator CutOffset(InputIterator start, InputIterator stop, double offset, bool keepEnd)
 {
   if (offset == 0.0)
     return start;
@@ -193,8 +192,8 @@ InputIterator CutOffset(InputIterator start, InputIterator stop, double offset,
 }
 
 template <typename InputIterator, typename OutputIterator>
-void CopyWithoutOffsets(InputIterator start, InputIterator stop, OutputIterator out,
-                        uint32_t positiveOffset, uint32_t negativeOffset, bool keepEnds)
+void CopyWithoutOffsets(InputIterator start, InputIterator stop, OutputIterator out, uint32_t positiveOffset,
+                        uint32_t negativeOffset, bool keepEnds)
 {
   auto from = start;
   auto to = stop;
@@ -203,8 +202,9 @@ void CopyWithoutOffsets(InputIterator start, InputIterator stop, OutputIterator
   {
     from = CutOffset(start, stop, positiveOffset, keepEnds);
     // |to| points past the last edge we need to take.
-    to = CutOffset(reverse_iterator<InputIterator>(stop), reverse_iterator<InputIterator>(start),
-                   negativeOffset, keepEnds).base();
+    to = CutOffset(reverse_iterator<InputIterator>(stop), reverse_iterator<InputIterator>(start), negativeOffset,
+                   keepEnds)
+             .base();
   }
 
   if (!keepEnds)
@@ -216,14 +216,14 @@ void CopyWithoutOffsets(InputIterator start, InputIterator stop, OutputIterator
   copy(from, to, out);
 }
 
-
 class SegmentsDecoderV2
 {
 public:
   SegmentsDecoderV2(DataSource & dataSource, unique_ptr<CarModelFactory> cmf)
-    : m_dataSource(dataSource), m_graph(dataSource, std::move(cmf)), m_infoGetter(dataSource)
-  {
-  }
+    : m_dataSource(dataSource)
+    , m_graph(dataSource, std::move(cmf))
+    , m_infoGetter(dataSource)
+  {}
 
   bool DecodeSegment(LinearSegment const & segment, DecodedPath & path, v2::Stats & stat)
   {
@@ -241,8 +241,7 @@ public:
     lineCandidates.reserve(points.size());
     LOG(LDEBUG, ("Decoding segment:", segment.m_segmentId, "with", points.size(), "points"));
 
-    CandidatePointsGetter pointsGetter(kMaxJunctionCandidates, kMaxProjectionCandidates,
-                                       m_dataSource, m_graph);
+    CandidatePointsGetter pointsGetter(kMaxJunctionCandidates, kMaxProjectionCandidates, m_dataSource, m_graph);
     CandidatePathsGetter pathsGetter(pointsGetter, m_graph, m_infoGetter, stat);
 
     if (!pathsGetter.GetLineCandidatesForPoints(points, lineCandidates))
@@ -261,7 +260,7 @@ public:
     // Sum app all distances between points. Last point's m_distanceToNextPoint
     // should be equal to zero, but let's skip it just in case.
     CHECK(!points.empty(), ());
-    for (auto it = begin(points); it != prev(end(points));  ++it)
+    for (auto it = begin(points); it != prev(end(points)); ++it)
       requiredRouteDistanceM += it->m_distanceToNextPoint;
 
     double actualRouteDistanceM = 0.0;
@@ -269,8 +268,8 @@ public:
       actualRouteDistanceM += EdgeLength(e);
 
     auto const scale = actualRouteDistanceM / requiredRouteDistanceM;
-    LOG(LDEBUG, ("actualRouteDistance:", actualRouteDistanceM,
-                 "requiredRouteDistance:", requiredRouteDistanceM, "scale:", scale));
+    LOG(LDEBUG, ("actualRouteDistance:", actualRouteDistanceM, "requiredRouteDistance:", requiredRouteDistanceM,
+                 "scale:", scale));
 
     auto const positiveOffsetM = segment.m_locationReference.m_positiveOffsetMeters * scale;
     auto const negativeOffsetM = segment.m_locationReference.m_negativeOffsetMeters * scale;
@@ -284,8 +283,8 @@ public:
 
     ExpandFakes(m_dataSource, m_graph, route);
     ASSERT(none_of(begin(route), end(route), mem_fn(&Graph::Edge::IsFake)), (segment.m_segmentId));
-    CopyWithoutOffsets(begin(route), end(route), back_inserter(path.m_path), positiveOffsetM,
-                       negativeOffsetM, false /* keep ends */);
+    CopyWithoutOffsets(begin(route), end(route), back_inserter(path.m_path), positiveOffsetM, negativeOffsetM,
+                       false /* keep ends */);
 
     if (path.m_path.empty())
     {
@@ -310,9 +309,10 @@ class SegmentsDecoderV3
 {
 public:
   SegmentsDecoderV3(DataSource & dataSource, unique_ptr<CarModelFactory> carModelFactory)
-      : m_dataSource(dataSource), m_graph(dataSource, std::move(carModelFactory)), m_infoGetter(dataSource)
-  {
-  }
+    : m_dataSource(dataSource)
+    , m_graph(dataSource, std::move(carModelFactory))
+    , m_infoGetter(dataSource)
+  {}
 
   bool DecodeSegment(LinearSegment const & segment, DecodedPath & path, v2::Stats & stat)
   {
@@ -329,8 +329,7 @@ public:
     lineCandidates.reserve(points.size());
     LOG(LINFO, ("Decoding segment:", segment.m_segmentId, "with", points.size(), "points"));
 
-    ScoreCandidatePointsGetter pointsGetter(kMaxJunctionCandidates, kMaxProjectionCandidates,
-                                            m_dataSource, m_graph);
+    ScoreCandidatePointsGetter pointsGetter(kMaxJunctionCandidates, kMaxProjectionCandidates, m_dataSource, m_graph);
     ScoreCandidatePathsGetter pathsGetter(pointsGetter, m_graph, m_infoGetter, stat);
 
     if (!pathsGetter.GetLineCandidatesForPoints(points, segment.m_source, lineCandidates))
@@ -355,7 +354,7 @@ public:
     // Sum up all distances between points. Last point's m_distanceToNextPoint
     // should be equal to zero, but let's skip it just in case.
     CHECK(!points.empty(), ());
-    for (auto it = points.begin(); it != prev(points.end());  ++it)
+    for (auto it = points.begin(); it != prev(points.end()); ++it)
       requiredRouteDistanceM += it->m_distanceToNextPoint;
 
     double actualRouteDistanceM = 0.0;
@@ -363,11 +362,10 @@ public:
       actualRouteDistanceM += EdgeLength(e);
 
     auto const scale = actualRouteDistanceM / requiredRouteDistanceM;
-    LOG(LINFO, ("actualRouteDistance:", actualRouteDistanceM,
-        "requiredRouteDistance:", requiredRouteDistanceM, "scale:", scale));
+    LOG(LINFO, ("actualRouteDistance:", actualRouteDistanceM, "requiredRouteDistance:", requiredRouteDistanceM,
+                "scale:", scale));
 
-    if (segment.m_locationReference.m_positiveOffsetMeters +
-            segment.m_locationReference.m_negativeOffsetMeters >=
+    if (segment.m_locationReference.m_positiveOffsetMeters + segment.m_locationReference.m_negativeOffsetMeters >=
         requiredRouteDistanceM)
     {
       ++stat.m_wrongOffsets;
@@ -379,8 +377,8 @@ public:
     auto const negativeOffsetM = segment.m_locationReference.m_negativeOffsetMeters * scale;
 
     CHECK(none_of(route.begin(), route.end(), mem_fn(&Graph::Edge::IsFake)), (segment.m_segmentId));
-    CopyWithoutOffsets(route.begin(), route.end(), back_inserter(path.m_path), positiveOffsetM,
-                       negativeOffsetM, true /* keep ends */);
+    CopyWithoutOffsets(route.begin(), route.end(), back_inserter(path.m_path), positiveOffsetM, negativeOffsetM,
+                       true /* keep ends */);
 
     if (path.m_path.empty())
     {
@@ -403,16 +401,15 @@ size_t constexpr GetOptimalBatchSize()
   // This code computes the most optimal (in the sense of cache lines
   // occupancy) batch size.
   size_t constexpr a = math::LCM(sizeof(LinearSegment), kCacheLineSize) / sizeof(LinearSegment);
-  size_t constexpr b =
-      math::LCM(sizeof(IRoadGraph::EdgeVector), kCacheLineSize) / sizeof(IRoadGraph::EdgeVector);
+  size_t constexpr b = math::LCM(sizeof(IRoadGraph::EdgeVector), kCacheLineSize) / sizeof(IRoadGraph::EdgeVector);
   return math::LCM(a, b);
 }
 }  // namespace
 
 // OpenLRDecoder::SegmentsFilter -------------------------------------------------------------
-OpenLRDecoder::SegmentsFilter::SegmentsFilter(string const & idsPath,
-                                              bool const multipointsOnly)
-  : m_idsSet(false), m_multipointsOnly(multipointsOnly)
+OpenLRDecoder::SegmentsFilter::SegmentsFilter(string const & idsPath, bool const multipointsOnly)
+  : m_idsSet(false)
+  , m_multipointsOnly(multipointsOnly)
 {
   if (idsPath.empty())
     return;
@@ -437,9 +434,9 @@ bool OpenLRDecoder::SegmentsFilter::Matches(LinearSegment const & segment) const
 // OpenLRDecoder -----------------------------------------------------------------------------
 OpenLRDecoder::OpenLRDecoder(vector<FrozenDataSource> & dataSources,
                              CountryParentNameGetter const & countryParentNameGetter)
-  : m_dataSources(dataSources), m_countryParentNameGetter(countryParentNameGetter)
-{
-}
+  : m_dataSources(dataSources)
+  , m_countryParentNameGetter(countryParentNameGetter)
+{}
 
 void OpenLRDecoder::DecodeV2(vector<LinearSegment> const & segments, uint32_t const numThreads,
                              vector<DecodedPath> & paths)
@@ -447,15 +444,14 @@ void OpenLRDecoder::DecodeV2(vector<LinearSegment> const & segments, uint32_t co
   Decode<SegmentsDecoderV2, v2::Stats>(segments, numThreads, paths);
 }
 
-void OpenLRDecoder::DecodeV3(vector<LinearSegment> const & segments, uint32_t numThreads,
-                             vector<DecodedPath> & paths)
+void OpenLRDecoder::DecodeV3(vector<LinearSegment> const & segments, uint32_t numThreads, vector<DecodedPath> & paths)
 {
   Decode<SegmentsDecoderV3, v2::Stats>(segments, numThreads, paths);
 }
 
 template <typename Decoder, typename Stats>
-void OpenLRDecoder::Decode(vector<LinearSegment> const & segments,
-                           uint32_t const numThreads, vector<DecodedPath> & paths)
+void OpenLRDecoder::Decode(vector<LinearSegment> const & segments, uint32_t const numThreads,
+                           vector<DecodedPath> & paths)
 {
   auto const worker = [&](size_t threadNum, DataSource & dataSource, Stats & stat)
   {
@@ -476,8 +472,7 @@ void OpenLRDecoder::Decode(vector<LinearSegment> const & segments,
 
         if (stat.m_routesHandled % kProgressFrequency == 0 || i == segments.size() - 1)
         {
-          LOG(LINFO, ("Thread", threadNum, "processed", stat.m_routesHandled,
-                      "failed:", stat.m_routesFailed));
+          LOG(LINFO, ("Thread", threadNum, "processed", stat.m_routesHandled, "failed:", stat.m_routesFailed));
           timer.Reset();
         }
       }
diff --git a/tools/openlr/openlr_decoder.hpp b/tools/openlr/openlr_decoder.hpp
index 67a190220..c765524ee 100644
--- a/tools/openlr/openlr_decoder.hpp
+++ b/tools/openlr/openlr_decoder.hpp
@@ -40,20 +40,17 @@ public:
     bool const m_multipointsOnly;
   };
 
-  OpenLRDecoder(std::vector<FrozenDataSource> & dataSources,
-                CountryParentNameGetter const & countryParentNameGetter);
+  OpenLRDecoder(std::vector<FrozenDataSource> & dataSources, CountryParentNameGetter const & countryParentNameGetter);
 
   // Maps partner segments to mwm paths. |segments| should be sorted by partner id.
   void DecodeV2(std::vector<LinearSegment> const & segments, uint32_t const numThreads,
                 std::vector<DecodedPath> & paths);
 
-  void DecodeV3(std::vector<LinearSegment> const & segments, uint32_t numThreads,
-                std::vector<DecodedPath> & paths);
+  void DecodeV3(std::vector<LinearSegment> const & segments, uint32_t numThreads, std::vector<DecodedPath> & paths);
 
 private:
   template <typename Decoder, typename Stats>
-  void Decode(std::vector<LinearSegment> const & segments, uint32_t const numThreads,
-              std::vector<DecodedPath> & paths);
+  void Decode(std::vector<LinearSegment> const & segments, uint32_t const numThreads, std::vector<DecodedPath> & paths);
 
   std::vector<FrozenDataSource> & m_dataSources;
   CountryParentNameGetter m_countryParentNameGetter;
diff --git a/tools/openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.cpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.cpp
index 0f68d25cd..7f97db57d 100644
--- a/tools/openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.cpp
+++ b/tools/openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.cpp
@@ -53,48 +53,38 @@ public:
     : m_framework(framework)
     , m_drapeApi(m_framework.GetDrapeApi())
     , m_bm(framework.GetBookmarkManager())
-  {
-  }
+  {}
 
-  void SetViewportCenter(m2::PointD const & center) override
-  {
-    m_framework.SetViewportCenter(center);
-  }
+  void SetViewportCenter(m2::PointD const & center) override { m_framework.SetViewportCenter(center); }
 
   void DrawDecodedSegments(std::vector<m2::PointD> const & points) override
   {
     CHECK(!points.empty(), ("Points must not be empty."));
 
     LOG(LINFO, ("Decoded segment", points));
-    m_drapeApi.AddLine(kDecodedLineId,
-                       df::DrapeApiLineData(points, dp::Color(0, 0, 255, 255))
-                       .Width(3.0f).ShowPoints(true /* markPoints */));
+    m_drapeApi.AddLine(
+        kDecodedLineId,
+        df::DrapeApiLineData(points, dp::Color(0, 0, 255, 255)).Width(3.0f).ShowPoints(true /* markPoints */));
   }
 
   void DrawEncodedSegment(std::vector<m2::PointD> const & points) override
   {
     LOG(LINFO, ("Encoded segment", points));
-    m_drapeApi.AddLine(kEncodedLineId,
-                       df::DrapeApiLineData(points, dp::Color(255, 0, 0, 255))
-                       .Width(3.0f).ShowPoints(true /* markPoints */));
+    m_drapeApi.AddLine(
+        kEncodedLineId,
+        df::DrapeApiLineData(points, dp::Color(255, 0, 0, 255)).Width(3.0f).ShowPoints(true /* markPoints */));
   }
 
   void DrawGoldenPath(std::vector<m2::PointD> const & points) override
   {
-    m_drapeApi.AddLine(kGoldenLineId,
-                       df::DrapeApiLineData(points, dp::Color(255, 127, 36, 255))
-                       .Width(4.0f).ShowPoints(true /* markPoints */));
+    m_drapeApi.AddLine(
+        kGoldenLineId,
+        df::DrapeApiLineData(points, dp::Color(255, 127, 36, 255)).Width(4.0f).ShowPoints(true /* markPoints */));
   }
 
-  void ClearGoldenPath() override
-  {
-    m_drapeApi.RemoveLine(kGoldenLineId);
-  }
+  void ClearGoldenPath() override { m_drapeApi.RemoveLine(kGoldenLineId); }
 
-  void ClearAllPaths() override
-  {
-    m_drapeApi.Clear();
-  }
+  void ClearAllPaths() override { m_drapeApi.Clear(); }
 
   void VisualizePoints(std::vector<m2::PointD> const & points) override
   {
@@ -104,10 +94,7 @@ public:
       editSession.CreateUserMark<DebugMarkPoint>(p);
   }
 
-  void ClearAllVisualizedPoints() override
-  {
-    m_bm.GetEditSession().ClearGroup(UserMark::Type::DEBUG_MARK);
-  }
+  void ClearAllVisualizedPoints() override { m_bm.GetEditSession().ClearGroup(UserMark::Type::DEBUG_MARK); }
 
 private:
   Framework & m_framework;
@@ -129,8 +116,7 @@ public:
     , m_dataSource(const_cast<DataSource &>(GetDataSource()), nullptr /* numMwmIDs */)
     , m_roadGraph(m_dataSource, routing::IRoadGraph::Mode::ObeyOnewayTag,
                   std::make_unique<routing::CarModelFactory>(storage::CountryParentGetter{}))
-  {
-  }
+  {}
 
   std::vector<m2::PointD> GetAllJunctionPointsInViewport() const override
   {
@@ -141,10 +127,8 @@ public:
       if (!rect.IsPointInside(point))
         return;
       for (auto const & p : points)
-      {
         if (PointsMatch(point, p))
           return;
-      }
       points.push_back(point);
     };
 
@@ -155,11 +139,8 @@ public:
 
       /// @todo Transported (railway=rail) are also present here :)
       auto const roadClass = ftypes::GetHighwayClass(feature::TypesHolder(ft));
-      if (roadClass == ftypes::HighwayClass::Undefined ||
-          roadClass == ftypes::HighwayClass::Pedestrian)
-      {
+      if (roadClass == ftypes::HighwayClass::Undefined || roadClass == ftypes::HighwayClass::Pedestrian)
         return;
-      }
       ft.ForEachPoint(pushPoint, scales::GetUpperScale());
     };
 
@@ -167,8 +148,7 @@ public:
     return points;
   }
 
-  std::pair<std::vector<FeaturePoint>, m2::PointD> GetCandidatePoints(
-      m2::PointD const & p) const override
+  std::pair<std::vector<FeaturePoint>, m2::PointD> GetCandidatePoints(m2::PointD const & p) const override
   {
     auto constexpr kInvalidIndex = std::numeric_limits<size_t>::max();
 
@@ -207,8 +187,7 @@ public:
   std::vector<m2::PointD> GetReachablePoints(m2::PointD const & p) const override
   {
     routing::FeaturesRoadGraph::EdgeListT edges;
-    m_roadGraph.GetOutgoingEdges(geometry::PointWithAltitude(p, geometry::kDefaultAltitudeMeters),
-                                 edges);
+    m_roadGraph.GetOutgoingEdges(geometry::PointWithAltitude(p, geometry::kDefaultAltitudeMeters), edges);
 
     std::vector<m2::PointD> points;
     for (auto const & e : edges)
@@ -216,8 +195,7 @@ public:
     return points;
   }
 
-  ClickType CheckClick(m2::PointD const & clickPoint,
-                       m2::PointD const & lastClickedPoint,
+  ClickType CheckClick(m2::PointD const & clickPoint, m2::PointD const & lastClickedPoint,
                        std::vector<m2::PointD> const & reachablePoints) const override
   {
     // == Comparison is safe here since |clickPoint| is adjusted by GetFeaturesPointsByPoint
@@ -225,10 +203,8 @@ public:
     if (clickPoint == lastClickedPoint)
       return ClickType::Remove;
     for (auto const & p : reachablePoints)
-    {
       if (PointsMatch(clickPoint, p))
         return ClickType::Add;
-    }
     return ClickType::Miss;
   }
 
@@ -241,9 +217,7 @@ private:
 };
 }  // namespace
 
-
-MainWindow::MainWindow(Framework & framework)
-  : m_framework(framework)
+MainWindow::MainWindow(Framework & framework) : m_framework(framework)
 {
   m_mapWidget = new MapWidget(m_framework, this /* parent */);
 
@@ -264,37 +238,37 @@ MainWindow::MainWindow(Framework & framework)
 
   fileMenu->addAction("Open sample", QKeySequence("Ctrl+O"), this, &MainWindow::OnOpenTrafficSample);
 
-  m_closeTrafficSampleAction = fileMenu->addAction("Close sample", QKeySequence("Ctrl+W"), this, &MainWindow::OnCloseTrafficSample);
-  m_saveTrafficSampleAction = fileMenu->addAction("Save sample", QKeySequence("Ctrl+S"), this, &MainWindow::OnSaveTrafficSample);
+  m_closeTrafficSampleAction =
+      fileMenu->addAction("Close sample", QKeySequence("Ctrl+W"), this, &MainWindow::OnCloseTrafficSample);
+  m_saveTrafficSampleAction =
+      fileMenu->addAction("Save sample", QKeySequence("Ctrl+S"), this, &MainWindow::OnSaveTrafficSample);
 
   fileMenu->addSeparator();
 
-  m_goldifyMatchedPathAction = fileMenu->addAction("Goldify", QKeySequence("Ctrl+G"), [this] { m_trafficMode->GoldifyMatchedPath(); });
-  m_startEditingAction = fileMenu->addAction("Edit", QKeySequence("Ctrl+E"),
-                                             [this] {
-                                               m_trafficMode->StartBuildingPath();
-                                               m_mapWidget->SetMode(MapWidget::Mode::TrafficMarkup);
-                                               m_commitPathAction->setEnabled(true /* enabled */);
-                                               m_cancelPathAction->setEnabled(true /* enabled */);
-                                             });
-  m_commitPathAction = fileMenu->addAction("Accept path",
-                                           QKeySequence("Ctrl+A"),
-                                           [this] {
-                                             m_trafficMode->CommitPath();
-                                             m_mapWidget->SetMode(MapWidget::Mode::Normal);
-                                           });
-  m_cancelPathAction = fileMenu->addAction("Revert path",
-                                           QKeySequence("Ctrl+R"),
-                                           [this] {
-                                             m_trafficMode->RollBackPath();
-                                             m_mapWidget->SetMode(MapWidget::Mode::Normal);
-                                           });
-  m_ignorePathAction = fileMenu->addAction("Ignore path",
-                                           QKeySequence("Ctrl+I"),
-                                           [this] {
-                                             m_trafficMode->IgnorePath();
-                                             m_mapWidget->SetMode(MapWidget::Mode::Normal);
-                                           });
+  m_goldifyMatchedPathAction =
+      fileMenu->addAction("Goldify", QKeySequence("Ctrl+G"), [this] { m_trafficMode->GoldifyMatchedPath(); });
+  m_startEditingAction = fileMenu->addAction("Edit", QKeySequence("Ctrl+E"), [this]
+  {
+    m_trafficMode->StartBuildingPath();
+    m_mapWidget->SetMode(MapWidget::Mode::TrafficMarkup);
+    m_commitPathAction->setEnabled(true /* enabled */);
+    m_cancelPathAction->setEnabled(true /* enabled */);
+  });
+  m_commitPathAction = fileMenu->addAction("Accept path", QKeySequence("Ctrl+A"), [this]
+  {
+    m_trafficMode->CommitPath();
+    m_mapWidget->SetMode(MapWidget::Mode::Normal);
+  });
+  m_cancelPathAction = fileMenu->addAction("Revert path", QKeySequence("Ctrl+R"), [this]
+  {
+    m_trafficMode->RollBackPath();
+    m_mapWidget->SetMode(MapWidget::Mode::Normal);
+  });
+  m_ignorePathAction = fileMenu->addAction("Ignore path", QKeySequence("Ctrl+I"), [this]
+  {
+    m_trafficMode->IgnorePath();
+    m_mapWidget->SetMode(MapWidget::Mode::Normal);
+  });
 
   m_goldifyMatchedPathAction->setEnabled(false /* enabled */);
   m_closeTrafficSampleAction->setEnabled(false /* enabled */);
@@ -307,15 +281,12 @@ MainWindow::MainWindow(Framework & framework)
 
 void MainWindow::CreateTrafficPanel(std::string const & dataFilePath)
 {
-  m_trafficMode = new TrafficMode(dataFilePath,
-                                  m_framework.GetDataSource(),
-                                  std::make_unique<TrafficDrawerDelegate>(m_framework),
-                                  std::make_unique<PointsControllerDelegate>(m_framework));
+  m_trafficMode =
+      new TrafficMode(dataFilePath, m_framework.GetDataSource(), std::make_unique<TrafficDrawerDelegate>(m_framework),
+                      std::make_unique<PointsControllerDelegate>(m_framework));
 
-  connect(m_mapWidget, &MapWidget::TrafficMarkupClick,
-          m_trafficMode, &TrafficMode::OnClick);
-  connect(m_trafficMode, &TrafficMode::EditingStopped,
-          this, &MainWindow::OnPathEditingStop);
+  connect(m_mapWidget, &MapWidget::TrafficMarkupClick, m_trafficMode, &TrafficMode::OnClick);
+  connect(m_trafficMode, &TrafficMode::EditingStopped, this, &MainWindow::OnPathEditingStop);
   connect(m_trafficMode, &TrafficMode::SegmentSelected,
           [](int segmentId) { QApplication::clipboard()->setText(QString::number(segmentId)); });
 
@@ -391,11 +362,7 @@ void MainWindow::OnSaveTrafficSample()
     return;
 
   if (!m_trafficMode->SaveSampleAs(fileName.toStdString()))
-  {
-    QMessageBox::critical(
-        this, "Saving error",
-        QString("Can't save file: ") + strerror(errno));
-  }
+    QMessageBox::critical(this, "Saving error", QString("Can't save file: ") + strerror(errno));
 }
 
 void MainWindow::OnPathEditingStop()
diff --git a/tools/openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.hpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.hpp
index c2108e396..a7c02368e 100644
--- a/tools/openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.hpp
+++ b/tools/openlr/openlr_match_quality/openlr_assessment_tool/mainwindow.hpp
@@ -16,7 +16,7 @@ namespace openlr
 class MapWidget;
 class TrafficMode;
 class WebView;
-}
+}  // namespace openlr
 
 namespace df
 {
@@ -52,7 +52,7 @@ private:
   QAction * m_saveTrafficSampleAction = nullptr;
   QAction * m_closeTrafficSampleAction = nullptr;
   QAction * m_startEditingAction = nullptr;
-  QAction * m_commitPathAction  = nullptr;
+  QAction * m_commitPathAction = nullptr;
   QAction * m_cancelPathAction = nullptr;
   QAction * m_ignorePathAction = nullptr;
 
diff --git a/tools/openlr/openlr_match_quality/openlr_assessment_tool/map_widget.cpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/map_widget.cpp
index c9fa7953f..0b98913f0 100644
--- a/tools/openlr/openlr_match_quality/openlr_assessment_tool/map_widget.cpp
+++ b/tools/openlr/openlr_match_quality/openlr_assessment_tool/map_widget.cpp
@@ -8,10 +8,7 @@
 
 namespace openlr
 {
-MapWidget::MapWidget(Framework & framework, QWidget * parent)
-  : Base(framework, false /* screenshotMode */, parent)
-{
-}
+MapWidget::MapWidget(Framework & framework, QWidget * parent) : Base(framework, false /* screenshotMode */, parent) {}
 
 void MapWidget::mousePressEvent(QMouseEvent * e)
 {
diff --git a/tools/openlr/openlr_match_quality/openlr_assessment_tool/map_widget.hpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/map_widget.hpp
index 3820c0e7e..4b79b0fd6 100644
--- a/tools/openlr/openlr_match_quality/openlr_assessment_tool/map_widget.hpp
+++ b/tools/openlr/openlr_match_quality/openlr_assessment_tool/map_widget.hpp
@@ -29,10 +29,7 @@ public:
 
   void SetMode(Mode const mode) { m_mode = mode; }
 
-  QSize sizeHint() const override
-  {
-    return QSize(800, 600);
-  }
+  QSize sizeHint() const override { return QSize(800, 600); }
 
 signals:
   void TrafficMarkupClick(m2::PointD const & p, Qt::MouseButton const b);
diff --git a/tools/openlr/openlr_match_quality/openlr_assessment_tool/points_controller_delegate_base.hpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/points_controller_delegate_base.hpp
index 5c03d7cb2..1166a8b6e 100644
--- a/tools/openlr/openlr_match_quality/openlr_assessment_tool/points_controller_delegate_base.hpp
+++ b/tools/openlr/openlr_match_quality/openlr_assessment_tool/points_controller_delegate_base.hpp
@@ -28,13 +28,11 @@ public:
   virtual std::vector<m2::PointD> GetAllJunctionPointsInViewport() const = 0;
   /// Returns all junction points at a given location in the form of feature id and
   /// point index in the feature.
-  virtual std::pair<std::vector<FeaturePoint>, m2::PointD> GetCandidatePoints(
-      m2::PointD const & p) const = 0;
+  virtual std::pair<std::vector<FeaturePoint>, m2::PointD> GetCandidatePoints(m2::PointD const & p) const = 0;
   // Returns all points that are one step reachable from |p|.
   virtual std::vector<m2::PointD> GetReachablePoints(m2::PointD const & p) const = 0;
 
-  virtual ClickType CheckClick(m2::PointD const & clickPoint,
-                               m2::PointD const & lastClickedPoint,
+  virtual ClickType CheckClick(m2::PointD const & clickPoint, m2::PointD const & lastClickedPoint,
                                std::vector<m2::PointD> const & reachablePoints) const = 0;
 };
 }  // namespace openlr
diff --git a/tools/openlr/openlr_match_quality/openlr_assessment_tool/segment_correspondence.cpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/segment_correspondence.cpp
index 17bf153d6..503ce5bf3 100644
--- a/tools/openlr/openlr_match_quality/openlr_assessment_tool/segment_correspondence.cpp
+++ b/tools/openlr/openlr_match_quality/openlr_assessment_tool/segment_correspondence.cpp
@@ -19,11 +19,9 @@ SegmentCorrespondence::SegmentCorrespondence(SegmentCorrespondence const & sc)
   m_status = sc.m_status;
 }
 
-SegmentCorrespondence::SegmentCorrespondence(openlr::LinearSegment const & segment,
-                                             uint32_t positiveOffset, uint32_t negativeOffset,
-                                             openlr::Path const & matchedPath,
-                                             openlr::Path const & fakePath,
-                                             openlr::Path const & goldenPath,
+SegmentCorrespondence::SegmentCorrespondence(openlr::LinearSegment const & segment, uint32_t positiveOffset,
+                                             uint32_t negativeOffset, openlr::Path const & matchedPath,
+                                             openlr::Path const & fakePath, openlr::Path const & goldenPath,
                                              pugi::xml_node const & partnerSegmentXML)
   : m_partnerSegment(segment)
   , m_positiveOffset(positiveOffset)
diff --git a/tools/openlr/openlr_match_quality/openlr_assessment_tool/segment_correspondence.hpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/segment_correspondence.hpp
index 1f93ac042..153b3e49d 100644
--- a/tools/openlr/openlr_match_quality/openlr_assessment_tool/segment_correspondence.hpp
+++ b/tools/openlr/openlr_match_quality/openlr_assessment_tool/segment_correspondence.hpp
@@ -18,12 +18,9 @@ public:
   };
 
   SegmentCorrespondence(SegmentCorrespondence const & sc);
-  SegmentCorrespondence(openlr::LinearSegment const & segment,
-                        uint32_t positiveOffset, uint32_t negativeOffset,
-                        openlr::Path const & matchedPath,
-                        openlr::Path const & fakePath,
-                        openlr::Path const & goldenPath,
-                        pugi::xml_node const & partnerSegmentXML);
+  SegmentCorrespondence(openlr::LinearSegment const & segment, uint32_t positiveOffset, uint32_t negativeOffset,
+                        openlr::Path const & matchedPath, openlr::Path const & fakePath,
+                        openlr::Path const & goldenPath, pugi::xml_node const & partnerSegmentXML);
 
   openlr::Path const & GetMatchedPath() const { return m_matchedPath; }
   bool HasMatchedPath() const { return !m_matchedPath.empty(); }
diff --git a/tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.cpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.cpp
index 0cec12a32..84a81def8 100644
--- a/tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.cpp
+++ b/tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.cpp
@@ -16,14 +16,12 @@ namespace
 {
 void RemovePointFromPull(m2::PointD const & toBeRemoved, std::vector<m2::PointD> & pool)
 {
-  pool.erase(
-      remove_if(begin(pool), end(pool),
-                [&toBeRemoved](m2::PointD const & p) { return p.EqualDxDy(toBeRemoved, 1e-6); }),
-      end(pool));
+  pool.erase(remove_if(begin(pool), end(pool),
+                       [&toBeRemoved](m2::PointD const & p) { return p.EqualDxDy(toBeRemoved, 1e-6); }),
+             end(pool));
 }
 
-std::vector<m2::PointD> GetReachablePoints(m2::PointD const & srcPoint,
-                                           std::vector<m2::PointD> const path,
+std::vector<m2::PointD> GetReachablePoints(m2::PointD const & srcPoint, std::vector<m2::PointD> const path,
                                            PointsControllerDelegateBase const & pointsDelegate,
                                            size_t const lookbackIndex)
 {
@@ -46,8 +44,7 @@ size_t const RoadPointCandidate::kInvalidId = std::numeric_limits<size_t>::max()
 /// I.e. it is a set of all pairs <FeatureID, point index>
 /// located at a specified coordinate.
 /// Only one point at a time is considered active.
-RoadPointCandidate::RoadPointCandidate(std::vector<FeaturePoint> const & points,
-                                       m2::PointD const & coord)
+RoadPointCandidate::RoadPointCandidate(std::vector<FeaturePoint> const & points, m2::PointD const & coord)
   : m_coord(coord)
   , m_points(points)
 {
@@ -98,8 +95,7 @@ void RoadPointCandidate::SetActivePoint(FeatureID const & fid)
 // TrafficMode -------------------------------------------------------------------------------------
 TrafficMode::TrafficMode(std::string const & dataFileName, DataSource const & dataSource,
                          std::unique_ptr<TrafficDrawerDelegateBase> drawerDelegate,
-                         std::unique_ptr<PointsControllerDelegateBase> pointsDelegate,
-                         QObject * parent)
+                         std::unique_ptr<PointsControllerDelegateBase> pointsDelegate, QObject * parent)
   : QAbstractTableModel(parent)
   , m_dataSource(dataSource)
   , m_drawerDelegate(std::move(drawerDelegate))
@@ -153,8 +149,7 @@ TrafficMode::TrafficMode(std::string const & dataFileName, DataSource const & da
         {
           if (auto const locationReference = method.child("olr:locationReference"))
           {
-            if (auto const optionLinearLocationReference = locationReference
-                .child("olr:optionLinearLocationReference"))
+            if (auto const optionLinearLocationReference = locationReference.child("olr:optionLinearLocationReference"))
             {
               if (auto const positiveOffset = optionLinearLocationReference.child("olr:positiveOffset"))
                 positiveOffsetM = UintValueFromXML(positiveOffset);
@@ -166,8 +161,8 @@ TrafficMode::TrafficMode(std::string const & dataFileName, DataSource const & da
         }
       }
 
-      m_segments.emplace_back(segment, positiveOffsetM, negativeOffsetM, matchedPath, fakePath,
-                              goldenPath, partnerSegmentXML);
+      m_segments.emplace_back(segment, positiveOffsetM, negativeOffsetM, matchedPath, fakePath, goldenPath,
+                              partnerSegmentXML);
       if (auto const status = xmlSegment.child("Ignored"))
       {
         if (status.text().as_bool())
@@ -198,9 +193,7 @@ bool TrafficMode::SaveSampleAs(std::string const & fileName) const
     segment.append_copy(sc.GetPartnerXMLSegment());
 
     if (sc.GetStatus() == SegmentCorrespondence::Status::Ignored)
-    {
       segment.append_child("Ignored").text() = true;
-    }
     if (sc.HasMatchedPath())
     {
       auto node = segment.append_child("Route");
@@ -222,14 +215,17 @@ bool TrafficMode::SaveSampleAs(std::string const & fileName) const
   return true;
 }
 
-int TrafficMode::rowCount(const QModelIndex & parent) const
+int TrafficMode::rowCount(QModelIndex const & parent) const
 {
   return static_cast<int>(m_segments.size());
 }
 
-int TrafficMode::columnCount(const QModelIndex & parent) const { return 4; }
+int TrafficMode::columnCount(QModelIndex const & parent) const
+{
+  return 4;
+}
 
-QVariant TrafficMode::data(const QModelIndex & index, int role) const
+QVariant TrafficMode::data(QModelIndex const & index, int role) const
 {
   if (!index.isValid())
     return QVariant();
@@ -255,8 +251,7 @@ QVariant TrafficMode::data(const QModelIndex & index, int role) const
   return QVariant();
 }
 
-QVariant TrafficMode::headerData(int section, Qt::Orientation orientation,
-                                 int role /* = Qt::DisplayRole */) const
+QVariant TrafficMode::headerData(int section, Qt::Orientation orientation, int role /* = Qt::DisplayRole */) const
 {
   if (orientation != Qt::Horizontal && role != Qt::DisplayRole)
     return QVariant();
@@ -309,8 +304,7 @@ void TrafficMode::GoldifyMatchedPath()
 {
   if (!m_currentSegment->HasMatchedPath())
   {
-    QMessageBox::information(nullptr /* parent */, "Error",
-                             "The selected segment does not have a matched path");
+    QMessageBox::information(nullptr /* parent */, "Error", "The selected segment does not have a matched path");
     return;
   }
 
@@ -384,10 +378,10 @@ void TrafficMode::CommitPath()
     auto const & prevFt = prevPoint.GetPoint();
     auto const & ft = point.GetPoint();
 
-    path.push_back(Edge::MakeReal(
-        ft.first, prevFt.second < ft.second /* forward */, base::checked_cast<uint32_t>(prevFt.second),
-        geometry::PointWithAltitude(prevPoint.GetCoordinate(), 0 /* altitude */),
-        geometry::PointWithAltitude(point.GetCoordinate(), 0 /* altitude */)));
+    path.push_back(Edge::MakeReal(ft.first, prevFt.second < ft.second /* forward */,
+                                  base::checked_cast<uint32_t>(prevFt.second),
+                                  geometry::PointWithAltitude(prevPoint.GetCoordinate(), 0 /* altitude */),
+                                  geometry::PointWithAltitude(point.GetCoordinate(), 0 /* altitude */)));
   }
 
   m_currentSegment->SetGoldenPath(path);
@@ -417,9 +411,8 @@ void TrafficMode::IgnorePath()
 
   if (m_currentSegment->HasGoldenPath())
   {
-    auto const btn =
-        QMessageBox::question(nullptr /* parent */, "Override warning",
-                              "The selected segment has a golden path. Do you want to discard it?");
+    auto const btn = QMessageBox::question(nullptr /* parent */, "Override warning",
+                                           "The selected segment has a golden path. Do you want to discard it?");
     if (btn == QMessageBox::No)
       return;
   }
@@ -466,9 +459,7 @@ void TrafficMode::HandlePoint(m2::PointD clickPoint, Qt::MouseButton const butto
     return;
 
   auto const currentPathLength = GetPointsCount();
-  auto const lastClickedPoint = currentPathLength != 0
-      ? GetLastPoint()
-      : m2::PointD::Zero();
+  auto const lastClickedPoint = currentPathLength != 0 ? GetLastPoint() : m2::PointD::Zero();
 
   auto const & p = m_pointsDelegate->GetCandidatePoints(clickPoint);
   auto const & candidatePoints = p.first;
@@ -476,14 +467,14 @@ void TrafficMode::HandlePoint(m2::PointD clickPoint, Qt::MouseButton const butto
   if (candidatePoints.empty())
     return;
 
-  auto reachablePoints = GetReachablePoints(clickPoint, GetGoldenPathPoints(), *m_pointsDelegate,
-                                            0 /* lookBackIndex */);
-  auto const & clickablePoints = currentPathLength != 0
-      ? GetReachablePoints(lastClickedPoint, GetGoldenPathPoints(), *m_pointsDelegate,
-                           1 /* lookbackIndex */)
-      // TODO(mgsergio): This is not quite correct since view port can change
-      // since first call to visualize points. But it's ok in general.
-      : m_pointsDelegate->GetAllJunctionPointsInViewport();
+  auto reachablePoints =
+      GetReachablePoints(clickPoint, GetGoldenPathPoints(), *m_pointsDelegate, 0 /* lookBackIndex */);
+  auto const & clickablePoints =
+      currentPathLength != 0
+          ? GetReachablePoints(lastClickedPoint, GetGoldenPathPoints(), *m_pointsDelegate, 1 /* lookbackIndex */)
+          // TODO(mgsergio): This is not quite correct since view port can change
+          // since first call to visualize points. But it's ok in general.
+          : m_pointsDelegate->GetAllJunctionPointsInViewport();
 
   using ClickType = PointsControllerDelegateBase::ClickType;
   switch (m_pointsDelegate->CheckClick(clickPoint, lastClickedPoint, clickablePoints))
@@ -518,8 +509,8 @@ void TrafficMode::HandlePoint(m2::PointD clickPoint, Qt::MouseButton const butto
       }
       else
       {
-        m_drawerDelegate->VisualizePoints(GetReachablePoints(
-            GetLastPoint(), GetGoldenPathPoints(), *m_pointsDelegate, 1 /* lookBackIndex */));
+        m_drawerDelegate->VisualizePoints(
+            GetReachablePoints(GetLastPoint(), GetGoldenPathPoints(), *m_pointsDelegate, 1 /* lookBackIndex */));
       }
 
       if (GetPointsCount() > 1)
@@ -546,9 +537,8 @@ bool TrafficMode::StartBuildingPathChecks() const
 
   if (m_currentSegment->HasGoldenPath())
   {
-    auto const btn = QMessageBox::question(
-        nullptr /* parent */, "Override warning",
-        "The selected segment already has a golden path. Do you want to override?");
+    auto const btn = QMessageBox::question(nullptr /* parent */, "Override warning",
+                                           "The selected segment already has a golden path. Do you want to override?");
     if (btn == QMessageBox::No)
       return false;
   }
diff --git a/tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.hpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.hpp
index 01c33a1f2..c8200489a 100644
--- a/tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.hpp
+++ b/tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_mode.hpp
@@ -18,7 +18,6 @@
 
 #include <QAbstractTableModel>
 
-
 class QItemSelection;
 class Selection;
 
@@ -35,8 +34,7 @@ namespace impl
 class RoadPointCandidate
 {
 public:
-  RoadPointCandidate(std::vector<openlr::FeaturePoint> const & points,
-                     m2::PointD const & coord);
+  RoadPointCandidate(std::vector<openlr::FeaturePoint> const & points, m2::PointD const & coord);
 
   void ActivateCommonPoint(RoadPointCandidate const & rpc);
   openlr::FeaturePoint const & GetPoint() const;
@@ -64,25 +62,22 @@ public:
   // TODO(mgsergio): Check we are on the right mwm. I.e. right mwm version and everything.
   TrafficMode(std::string const & dataFileName, DataSource const & dataSource,
               std::unique_ptr<TrafficDrawerDelegateBase> drawerDelegate,
-              std::unique_ptr<PointsControllerDelegateBase> pointsDelegate,
-              QObject * parent = Q_NULLPTR);
+              std::unique_ptr<PointsControllerDelegateBase> pointsDelegate, QObject * parent = Q_NULLPTR);
 
   bool SaveSampleAs(std::string const & fileName) const;
 
-  int rowCount(const QModelIndex & parent = QModelIndex()) const Q_DECL_OVERRIDE;
-  int columnCount(const QModelIndex & parent = QModelIndex()) const Q_DECL_OVERRIDE;
-  QVariant headerData(int section, Qt::Orientation orientation,
-                      int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
+  int rowCount(QModelIndex const & parent = QModelIndex()) const Q_DECL_OVERRIDE;
+  int columnCount(QModelIndex const & parent = QModelIndex()) const Q_DECL_OVERRIDE;
+  QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
 
-  QVariant data(const QModelIndex & index, int role) const Q_DECL_OVERRIDE;
+  QVariant data(QModelIndex const & index, int role) const Q_DECL_OVERRIDE;
 
   Qt::ItemFlags flags(QModelIndex const & index) const Q_DECL_OVERRIDE;
 
   bool IsBuildingPath() const { return m_buildingPath; }
   void GoldifyMatchedPath();
   void StartBuildingPath();
-  void PushPoint(m2::PointD const & coord,
-                 std::vector<FeaturePoint> const & points);
+  void PushPoint(m2::PointD const & coord, std::vector<FeaturePoint> const & points);
   void PopPoint();
   void CommitPath();
   void RollBackPath();
@@ -95,10 +90,7 @@ public:
 
 public slots:
   void OnItemSelected(QItemSelection const & selected, QItemSelection const &);
-  void OnClick(m2::PointD const & clickPoint, Qt::MouseButton const button)
-  {
-    HandlePoint(clickPoint, button);
-  }
+  void OnClick(m2::PointD const & clickPoint, Qt::MouseButton const button) { HandlePoint(clickPoint, button); }
 
 signals:
   void EditingStopped();
diff --git a/tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_panel.cpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_panel.cpp
index a10d71437..ae27c4ffb 100644
--- a/tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_panel.cpp
+++ b/tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_panel.cpp
@@ -11,10 +11,7 @@
 namespace openlr
 {
 // ComboBoxDelegate --------------------------------------------------------------------------------
-ComboBoxDelegate::ComboBoxDelegate(QObject * parent)
-  : QStyledItemDelegate(parent)
-{
-}
+ComboBoxDelegate::ComboBoxDelegate(QObject * parent) : QStyledItemDelegate(parent) {}
 
 QWidget * ComboBoxDelegate::createEditor(QWidget * parent, QStyleOptionViewItem const & option,
                                          QModelIndex const & index) const
@@ -30,13 +27,12 @@ QWidget * ComboBoxDelegate::createEditor(QWidget * parent, QStyleOptionViewItem
 void ComboBoxDelegate::setEditorData(QWidget * editor, QModelIndex const & index) const
 {
   auto const value = index.model()->data(index, Qt::EditRole).toString();
-  static_cast<QComboBox*>(editor)->setCurrentText(value);
+  static_cast<QComboBox *>(editor)->setCurrentText(value);
 }
 
-void ComboBoxDelegate::setModelData(QWidget * editor, QAbstractItemModel * model,
-                                    QModelIndex const & index) const
+void ComboBoxDelegate::setModelData(QWidget * editor, QAbstractItemModel * model, QModelIndex const & index) const
 {
-  model->setData(index, static_cast<QComboBox*>(editor)->currentText(), Qt::EditRole);
+  model->setData(index, static_cast<QComboBox *>(editor)->currentText(), Qt::EditRole);
 }
 
 void ComboBoxDelegate::updateEditorGeometry(QWidget * editor, QStyleOptionViewItem const & option,
@@ -46,8 +42,7 @@ void ComboBoxDelegate::updateEditorGeometry(QWidget * editor, QStyleOptionViewIt
 }
 
 // TrafficPanel ------------------------------------------------------------------------------------
-TrafficPanel::TrafficPanel(QAbstractItemModel * trafficModel, QWidget * parent)
-  : QWidget(parent)
+TrafficPanel::TrafficPanel(QAbstractItemModel * trafficModel, QWidget * parent) : QWidget(parent)
 {
   CreateTable(trafficModel);
 
@@ -75,8 +70,7 @@ void TrafficPanel::CreateTable(QAbstractItemModel * trafficModel)
   m_table->setModel(trafficModel);
   m_table->setItemDelegate(new ComboBoxDelegate());
 
-  connect(m_table->selectionModel(),
-          SIGNAL(selectionChanged(QItemSelection const &, QItemSelection const &)),
+  connect(m_table->selectionModel(), SIGNAL(selectionChanged(QItemSelection const &, QItemSelection const &)),
           trafficModel, SLOT(OnItemSelected(QItemSelection const &, QItemSelection const &)));
 }
 }  // namespace openlr
diff --git a/tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_panel.hpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_panel.hpp
index 21638f47a..c16d31a48 100644
--- a/tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_panel.hpp
+++ b/tools/openlr/openlr_match_quality/openlr_assessment_tool/traffic_panel.hpp
@@ -21,8 +21,7 @@ public:
 
   void setEditorData(QWidget * editor, QModelIndex const & index) const Q_DECL_OVERRIDE;
 
-  void setModelData(QWidget * editor, QAbstractItemModel * model,
-                    QModelIndex const & index) const Q_DECL_OVERRIDE;
+  void setModelData(QWidget * editor, QAbstractItemModel * model, QModelIndex const & index) const Q_DECL_OVERRIDE;
 
   void updateEditorGeometry(QWidget * editor, QStyleOptionViewItem const & option,
                             QModelIndex const & index) const Q_DECL_OVERRIDE;
diff --git a/tools/openlr/openlr_match_quality/openlr_assessment_tool/trafficmodeinitdlg.cpp b/tools/openlr/openlr_match_quality/openlr_assessment_tool/trafficmodeinitdlg.cpp
index 6772bd72f..e786709ff 100644
--- a/tools/openlr/openlr_match_quality/openlr_assessment_tool/trafficmodeinitdlg.cpp
+++ b/tools/openlr/openlr_match_quality/openlr_assessment_tool/trafficmodeinitdlg.cpp
@@ -14,9 +14,7 @@ std::string const kDataFilePath = "LastOpenlrAssessmentDataFilePath";
 
 namespace openlr
 {
-TrafficModeInitDlg::TrafficModeInitDlg(QWidget * parent) :
-  QDialog(parent),
-  m_ui(new Ui::TrafficModeInitDlg)
+TrafficModeInitDlg::TrafficModeInitDlg(QWidget * parent) : QDialog(parent), m_ui(new Ui::TrafficModeInitDlg)
 {
   m_ui->setupUi(this);
 
@@ -24,9 +22,8 @@ TrafficModeInitDlg::TrafficModeInitDlg(QWidget * parent) :
   if (settings::Get(kDataFilePath, lastDataFilePath))
     m_ui->dataFileName->setText(QString::fromStdString(lastDataFilePath));
 
-  connect(m_ui->chooseDataFileButton, &QPushButton::clicked, [this](bool) {
-      SetFilePathViaDialog(*m_ui->dataFileName, tr("Choose data file"), "*.xml");
-  });
+  connect(m_ui->chooseDataFileButton, &QPushButton::clicked,
+          [this](bool) { SetFilePathViaDialog(*m_ui->dataFileName, tr("Choose data file"), "*.xml"); });
 }
 
 TrafficModeInitDlg::~TrafficModeInitDlg()
@@ -41,8 +38,7 @@ void TrafficModeInitDlg::accept()
   QDialog::accept();
 }
 
-void TrafficModeInitDlg::SetFilePathViaDialog(QLineEdit & dest, QString const & title,
-                                              QString const & filter)
+void TrafficModeInitDlg::SetFilePathViaDialog(QLineEdit & dest, QString const & title, QString const & filter)
 {
   QFileDialog openFileDlg(nullptr, title, {} /* directory */, filter);
   openFileDlg.exec();
diff --git a/tools/openlr/openlr_model_xml.cpp b/tools/openlr/openlr_model_xml.cpp
index 7eb0f74dd..84fa9ec2b 100644
--- a/tools/openlr/openlr_model_xml.cpp
+++ b/tools/openlr/openlr_model_xml.cpp
@@ -20,9 +20,7 @@ bool IntegerFromXML(pugi::xml_node const & node, Value & value)
 {
   if (!node)
     return false;
-  value = static_cast<Value>(is_signed<Value>::value
-                             ? node.text().as_int()
-                             : node.text().as_uint());
+  value = static_cast<Value>(is_signed<Value>::value ? node.text().as_int() : node.text().as_uint());
   return true;
 }
 
@@ -33,11 +31,8 @@ std::optional<double> DoubleFromXML(pugi::xml_node const & node)
 
 bool GetLatLon(pugi::xml_node const & node, int32_t & lat, int32_t & lon)
 {
-  if (!IntegerFromXML(node.child("olr:latitude"), lat) ||
-      !IntegerFromXML(node.child("olr:longitude"), lon))
-  {
+  if (!IntegerFromXML(node.child("olr:latitude"), lat) || !IntegerFromXML(node.child("olr:longitude"), lon))
     return false;
-  }
 
   return true;
 }
@@ -49,9 +44,8 @@ bool TableValueFromXML(pugi::xml_node const & node, Value & value)
 {
   if (!node)
     return false;
-  value = static_cast<Value>(is_signed<Value>::value
-                             ? node.attribute("olr:code").as_int()
-                             : node.attribute("olr:code").as_uint());
+  value = static_cast<Value>(is_signed<Value>::value ? node.attribute("olr:code").as_int()
+                                                     : node.attribute("olr:code").as_uint());
   return true;
 }
 
@@ -66,7 +60,6 @@ pugi::xml_node GetCoordinates(pugi::xml_node const & node)
   return node.select_node(".//coordinates").node();
 }
 
-
 bool IsLocationReferenceTag(pugi::xml_node const & node)
 {
   return node.select_node(".//olr:locationReference").node();
@@ -119,8 +112,7 @@ std::optional<ms::LatLon> LatLonFormXML(pugi::xml_node const & node)
   return lat && lon ? ms::LatLon(*lat, *lon) : ms::LatLon::Zero();
 }
 
-bool CoordinateFromXML(pugi::xml_node const & node, ms::LatLon const & prevCoord,
-                       ms::LatLon & latLon)
+bool CoordinateFromXML(pugi::xml_node const & node, ms::LatLon const & prevCoord, ms::LatLon & latLon)
 {
   int32_t lat, lon;
   if (!GetLatLon(node.child("olr:coordinate"), lat, lon))
@@ -136,8 +128,7 @@ bool CoordinateFromXML(pugi::xml_node const & node, ms::LatLon const & prevCoord
   return true;
 }
 
-bool LinePropertiesFromXML(pugi::xml_node const & linePropNode,
-                           openlr::LocationReferencePoint & locPoint)
+bool LinePropertiesFromXML(pugi::xml_node const & linePropNode, openlr::LocationReferencePoint & locPoint)
 {
   if (!linePropNode)
   {
@@ -166,8 +157,7 @@ bool LinePropertiesFromXML(pugi::xml_node const & linePropNode,
   return true;
 }
 
-bool PathPropertiesFromXML(pugi::xml_node const & locPointNode,
-                           openlr::LocationReferencePoint & locPoint)
+bool PathPropertiesFromXML(pugi::xml_node const & locPointNode, openlr::LocationReferencePoint & locPoint)
 {
   // Last point does not contain path properties.
   if (strcmp(locPointNode.name(), "olr:last") == 0)
@@ -203,8 +193,7 @@ bool PathPropertiesFromXML(pugi::xml_node const & locPointNode,
   return true;
 }
 
-bool LocationReferencePointFromXML(pugi::xml_node const & locPointNode,
-                                   openlr::LocationReferencePoint & locPoint)
+bool LocationReferencePointFromXML(pugi::xml_node const & locPointNode, openlr::LocationReferencePoint & locPoint)
 {
   if (!FirstCoordinateFromXML(locPointNode, locPoint.m_latLon))
   {
@@ -216,8 +205,7 @@ bool LocationReferencePointFromXML(pugi::xml_node const & locPointNode,
          PathPropertiesFromXML(locPointNode, locPoint);
 }
 
-bool LocationReferencePointFromXML(pugi::xml_node const & locPointNode,
-                                   ms::LatLon const & firstPoint,
+bool LocationReferencePointFromXML(pugi::xml_node const & locPointNode, ms::LatLon const & firstPoint,
                                    openlr::LocationReferencePoint & locPoint)
 {
   if (!CoordinateFromXML(locPointNode, firstPoint, locPoint.m_latLon))
@@ -230,8 +218,7 @@ bool LocationReferencePointFromXML(pugi::xml_node const & locPointNode,
          PathPropertiesFromXML(locPointNode, locPoint);
 }
 
-bool LinearLocationReferenceFromXML(pugi::xml_node const & locRefNode,
-                                    openlr::LinearLocationReference & locRef)
+bool LinearLocationReferenceFromXML(pugi::xml_node const & locRefNode, openlr::LinearLocationReference & locRef)
 {
   if (!locRefNode)
   {
@@ -256,8 +243,7 @@ bool LinearLocationReferenceFromXML(pugi::xml_node const & locRefNode,
 
   {
     openlr::LocationReferencePoint point;
-    if (!LocationReferencePointFromXML(locRefNode.child("olr:last"),
-                                       locRef.m_points.back().m_latLon, point))
+    if (!LocationReferencePointFromXML(locRefNode.child("olr:last"), locRef.m_points.back().m_latLon, point))
       return false;
     locRef.m_points.push_back(point);
   }
@@ -268,7 +254,7 @@ bool LinearLocationReferenceFromXML(pugi::xml_node const & locRefNode,
     return false;
   }
 
-  if(!ParseValueIfExists(locRefNode.child("olr:negativeOffset"), locRef.m_negativeOffsetMeters))
+  if (!ParseValueIfExists(locRefNode.child("olr:negativeOffset"), locRef.m_negativeOffsetMeters))
   {
     LOG(LERROR, ("Can't parse negative offset"));
     return false;
diff --git a/tools/openlr/openlr_stat/openlr_stat.cpp b/tools/openlr/openlr_stat/openlr_stat.cpp
index 938c4edf6..34dc096f4 100644
--- a/tools/openlr/openlr_stat/openlr_stat.cpp
+++ b/tools/openlr/openlr_stat/openlr_stat.cpp
@@ -35,8 +35,7 @@ DEFINE_string(input, "", "Path to OpenLR file.");
 DEFINE_string(spark_output, "", "Path to output file in spark-oriented format");
 DEFINE_string(assessment_output, "", "Path to output file in assessment-tool oriented format");
 
-DEFINE_string(non_matched_ids, "non-matched-ids.txt",
-              "Path to a file ids of non-matched segments will be saved to");
+DEFINE_string(non_matched_ids, "non-matched-ids.txt", "Path to a file ids of non-matched segments will be saved to");
 DEFINE_string(mwms_path, "", "Path to a folder with mwms.");
 DEFINE_string(resources_path, "", "Path to a folder with resources.");
 DEFINE_int32(limit, -1, "Max number of segments to handle. -1 for all.");
@@ -56,8 +55,7 @@ int32_t const kMinNumThreads = 1;
 int32_t const kMaxNumThreads = 128;
 int32_t const kHandleAllSegments = -1;
 
-void LoadDataSources(std::string const & pathToMWMFolder,
-                     std::vector<FrozenDataSource> & dataSources)
+void LoadDataSources(std::string const & pathToMWMFolder, std::vector<FrozenDataSource> & dataSources)
 {
   CHECK(Platform::IsDirectory(pathToMWMFolder), (pathToMWMFolder, "must be a directory."));
 
@@ -73,8 +71,7 @@ void LoadDataSources(std::string const & pathToMWMFolder,
   {
     auto const fullFileName = base::JoinPath(pathToMWMFolder, fileName);
     ModelReaderPtr reader(GetPlatform().GetReader(fullFileName, "f"));
-    platform::LocalCountryFile localFile(pathToMWMFolder,
-                                         platform::CountryFile(base::FilenameWithoutExt(fileName)),
+    platform::LocalCountryFile localFile(pathToMWMFolder, platform::CountryFile(base::FilenameWithoutExt(fileName)),
                                          version::ReadVersionDate(reader));
 
     LOG(LINFO, ("Found mwm:", fullFileName));
@@ -98,18 +95,15 @@ void LoadDataSources(std::string const & pathToMWMFolder,
   }
 
   for (size_t i = 0; i < numDataSources; ++i)
-  {
     if (numCountries[i] == 0)
       LOG(LWARNING, ("No countries for thread", i));
-  }
 }
 
 bool ValidateLimit(char const * flagname, int32_t value)
 {
   if (value < -1)
   {
-    LOG(LINFO, ("Valid value for --", std::string(flagname), ":", value,
-                "must be greater or equal to -1."));
+    LOG(LINFO, ("Valid value for --", std::string(flagname), ":", value, "must be greater or equal to -1."));
     return false;
   }
 
@@ -120,8 +114,8 @@ bool ValidateNumThreads(char const * flagname, int32_t value)
 {
   if (value < kMinNumThreads || value > kMaxNumThreads)
   {
-    LOG(LINFO, ("Valid value for --", std::string(flagname), ":", value, "must be between",
-                kMinNumThreads, "and", kMaxNumThreads));
+    LOG(LINFO, ("Valid value for --", std::string(flagname), ":", value, "must be between", kMinNumThreads, "and",
+                kMaxNumThreads));
     return false;
   }
 
@@ -157,8 +151,7 @@ bool ValidateVersion(char const * flagname, int32_t value)
 }
 
 bool const g_limitDummy = gflags::RegisterFlagValidator(&FLAGS_limit, &ValidateLimit);
-bool const g_numThreadsDummy =
-    gflags::RegisterFlagValidator(&FLAGS_num_threads, &ValidateNumThreads);
+bool const g_numThreadsDummy = gflags::RegisterFlagValidator(&FLAGS_num_threads, &ValidateNumThreads);
 bool const g_mwmsPathDummy = gflags::RegisterFlagValidator(&FLAGS_mwms_path, &ValidateMwmPath);
 bool const g_algoVersion = gflags::RegisterFlagValidator(&FLAGS_algo_version, &ValidateVersion);
 
@@ -169,10 +162,8 @@ void SaveNonMatchedIds(std::string const & filename, std::vector<DecodedPath> co
 
   std::ofstream ofs(filename);
   for (auto const & p : paths)
-  {
     if (p.m_path.empty())
       ofs << p.m_segmentId << std::endl;
-  }
 }
 
 std::vector<LinearSegment> LoadSegments(pugi::xml_document & document)
@@ -185,14 +176,10 @@ std::vector<LinearSegment> LoadSegments(pugi::xml_document & document)
   }
 
   OpenLRDecoder::SegmentsFilter filter(FLAGS_ids_path, FLAGS_multipoints_only);
-  if (FLAGS_limit != kHandleAllSegments && FLAGS_limit >= 0 &&
-      static_cast<size_t>(FLAGS_limit) < segments.size())
-  {
+  if (FLAGS_limit != kHandleAllSegments && FLAGS_limit >= 0 && static_cast<size_t>(FLAGS_limit) < segments.size())
     segments.resize(FLAGS_limit);
-  }
 
-  base::EraseIf(segments,
-                [&filter](LinearSegment const & segment) { return !filter.Matches(segment); });
+  base::EraseIf(segments, [&filter](LinearSegment const & segment) { return !filter.Matches(segment); });
 
   std::sort(segments.begin(), segments.end(), base::LessBy(&LinearSegment::m_segmentId));
 
@@ -261,8 +248,8 @@ int main(int argc, char * argv[])
 
   LoadDataSources(FLAGS_mwms_path, dataSources);
 
-  OpenLRDecoder decoder(dataSources, storage::CountryParentGetter(FLAGS_countries_filename,
-                                                              GetPlatform().ResourcesDir()));
+  OpenLRDecoder decoder(dataSources,
+                        storage::CountryParentGetter(FLAGS_countries_filename, GetPlatform().ResourcesDir()));
 
   pugi::xml_document document;
   auto const load_result = document.load_file(FLAGS_input.data());
diff --git a/tools/openlr/openlr_tests/decoded_path_test.cpp b/tools/openlr/openlr_tests/decoded_path_test.cpp
index 45583299e..734dad2b2 100644
--- a/tools/openlr/openlr_tests/decoded_path_test.cpp
+++ b/tools/openlr/openlr_tests/decoded_path_test.cpp
@@ -14,8 +14,8 @@
 #include "platform/platform_tests_support/scoped_dir.hpp"
 #include "platform/platform_tests_support/scoped_file.hpp"
 
-#include "base/file_name_utils.hpp"
 #include "base/checked_cast.hpp"
+#include "base/file_name_utils.hpp"
 
 #include <algorithm>
 #include <iomanip>
@@ -43,7 +43,10 @@ double RoughUpToFive(double d)
   return d;
 }
 
-m2::PointD RoughPoint(m2::PointD const & p) { return {RoughUpToFive(p.x), RoughUpToFive(p.y)}; }
+m2::PointD RoughPoint(m2::PointD const & p)
+{
+  return {RoughUpToFive(p.x), RoughUpToFive(p.y)};
+}
 
 geometry::PointWithAltitude RoughJunction(geometry::PointWithAltitude const & j)
 {
@@ -52,8 +55,7 @@ geometry::PointWithAltitude RoughJunction(geometry::PointWithAltitude const & j)
 
 routing::Edge RoughEdgeJunctions(routing::Edge const & e)
 {
-  return routing::Edge::MakeReal(e.GetFeatureId(), e.IsForward(), e.GetSegId(),
-                                 RoughJunction(e.GetStartJunction()),
+  return routing::Edge::MakeReal(e.GetFeatureId(), e.IsForward(), e.GetSegId(), RoughJunction(e.GetStartJunction()),
                                  RoughJunction(e.GetEndJunction()));
 }
 
@@ -103,10 +105,8 @@ openlr::Path MakePath(FeatureType const & road, bool const forward)
     auto const from = road.GetPoint(current);
     auto const to = road.GetPoint(next);
     path.push_back(routing::Edge::MakeReal(
-        road.GetID(), forward,
-        base::checked_cast<uint32_t>(current - static_cast<size_t>(!forward)) /* segId */,
-        geometry::PointWithAltitude(from, 0 /* altitude */),
-        geometry::PointWithAltitude(to, 0 /* altitude */)));
+        road.GetID(), forward, base::checked_cast<uint32_t>(current - static_cast<size_t>(!forward)) /* segId */,
+        geometry::PointWithAltitude(from, 0 /* altitude */), geometry::PointWithAltitude(to, 0 /* altitude */)));
   }
 
   RoughJunctionsInPath(path);
@@ -124,8 +124,7 @@ void WithRoad(vector<m2::PointD> const & points, Func && fn)
 
   LocalCountryFile country(mwmPath, CountryFile(kTestMwm), 0 /* version */);
   ScopedDir testScopedDir(kTestDir);
-  ScopedFile testScopedMwm(base::JoinPath(kTestDir, kTestMwm + DATA_FILE_EXTENSION),
-                           ScopedFile::Mode::Create);
+  ScopedFile testScopedMwm(base::JoinPath(kTestDir, kTestMwm + DATA_FILE_EXTENSION), ScopedFile::Mode::Create);
 
   {
     TestMwmBuilder builder(country, feature::DataHeader::MapType::Country);
@@ -150,21 +149,20 @@ void WithRoad(vector<m2::PointD> const & points, Func && fn)
 UNIT_TEST(MakePath_Test)
 {
   std::vector<m2::PointD> const points{{0, 0}, {0, 1}, {1, 0}, {1, 1}};
-  WithRoad(points, [&points](DataSource const & dataSource, FeatureType & road) {
+  WithRoad(points, [&points](DataSource const & dataSource, FeatureType & road)
+  {
     auto const & id = road.GetID();
     {
-      openlr::Path const expected{
-          routing::Edge::MakeReal(id, true /* forward */, 0 /* segId*/, points[0], points[1]),
-          routing::Edge::MakeReal(id, true /* forward */, 1 /* segId*/, points[1], points[2]),
-          routing::Edge::MakeReal(id, true /* forward */, 2 /* segId*/, points[2], points[3])};
+      openlr::Path const expected{routing::Edge::MakeReal(id, true /* forward */, 0 /* segId*/, points[0], points[1]),
+                                  routing::Edge::MakeReal(id, true /* forward */, 1 /* segId*/, points[1], points[2]),
+                                  routing::Edge::MakeReal(id, true /* forward */, 2 /* segId*/, points[2], points[3])};
       auto const path = MakePath(road, true /* forward */);
       TEST_EQUAL(path, expected, ());
     }
     {
-      openlr::Path const expected{
-          routing::Edge::MakeReal(id, false /* forward */, 2 /* segId*/, points[3], points[2]),
-          routing::Edge::MakeReal(id, false /* forward */, 1 /* segId*/, points[2], points[1]),
-          routing::Edge::MakeReal(id, false /* forward */, 0 /* segId*/, points[1], points[0])};
+      openlr::Path const expected{routing::Edge::MakeReal(id, false /* forward */, 2 /* segId*/, points[3], points[2]),
+                                  routing::Edge::MakeReal(id, false /* forward */, 1 /* segId*/, points[2], points[1]),
+                                  routing::Edge::MakeReal(id, false /* forward */, 0 /* segId*/, points[1], points[0])};
       {
         auto const path = MakePath(road, false /* forward */);
         TEST_EQUAL(path, expected, ());
@@ -175,7 +173,8 @@ UNIT_TEST(MakePath_Test)
 
 UNIT_TEST(PathSerializeDeserialize_Test)
 {
-  WithRoad({{0, 0}, {0, 1}, {1, 0}, {1, 1}}, [](DataSource const & dataSource, FeatureType & road) {
+  WithRoad({{0, 0}, {0, 1}, {1, 0}, {1, 1}}, [](DataSource const & dataSource, FeatureType & road)
+  {
     {
       auto const path = MakePath(road, true /* forward */);
       TestSerializeDeserialize(path, dataSource);
@@ -190,7 +189,8 @@ UNIT_TEST(PathSerializeDeserialize_Test)
 UNIT_TEST(GetPoints_Test)
 {
   vector<m2::PointD> const points{{0, 0}, {0, 1}, {1, 0}, {1, 1}};
-  WithRoad(points, [&points](DataSource const &, FeatureType & road) {
+  WithRoad(points, [&points](DataSource const &, FeatureType & road)
+  {
     {
       auto path = MakePath(road, true /* forward */);
       // RoughJunctionsInPath(path);
diff --git a/tools/openlr/paths_connector.cpp b/tools/openlr/paths_connector.cpp
index e5f0a7e00..5686f9791 100644
--- a/tools/openlr/paths_connector.cpp
+++ b/tools/openlr/paths_connector.cpp
@@ -16,24 +16,20 @@ namespace openlr
 {
 namespace
 {
-bool ValidatePath(Graph::EdgeVector const & path,
-                  double const distanceToNextPoint,
-                  double const pathLengthTolerance)
+bool ValidatePath(Graph::EdgeVector const & path, double const distanceToNextPoint, double const pathLengthTolerance)
 {
-
   double pathLen = 0.0;
   for (auto const & e : path)
     pathLen += EdgeLength(e);
 
-  double pathDiffPercent = AbsDifference(static_cast<double>(distanceToNextPoint), pathLen) /
-                           static_cast<double>(distanceToNextPoint);
+  double pathDiffPercent =
+      AbsDifference(static_cast<double>(distanceToNextPoint), pathLen) / static_cast<double>(distanceToNextPoint);
 
   LOG(LDEBUG, ("Validating path:", LogAs2GisPath(path)));
 
   if (pathDiffPercent > pathLengthTolerance)
   {
-    LOG(LDEBUG,
-        ("Shortest path doest not meet required length constraints, error:", pathDiffPercent));
+    LOG(LDEBUG, ("Shortest path doest not meet required length constraints, error:", pathDiffPercent));
     return false;
   }
 
@@ -41,14 +37,12 @@ bool ValidatePath(Graph::EdgeVector const & path,
 }
 }  // namespace
 
-PathsConnector::PathsConnector(double pathLengthTolerance, Graph & graph,
-                               RoadInfoGetter & infoGetter, v2::Stats & stat)
+PathsConnector::PathsConnector(double pathLengthTolerance, Graph & graph, RoadInfoGetter & infoGetter, v2::Stats & stat)
   : m_pathLengthTolerance(pathLengthTolerance)
   , m_graph(graph)
   , m_infoGetter(infoGetter)
   , m_stat(stat)
-{
-}
+{}
 
 bool PathsConnector::ConnectCandidates(vector<LocationReferencePoint> const & points,
                                        vector<vector<Graph::EdgeVector>> const & lineCandidates,
@@ -79,16 +73,14 @@ bool PathsConnector::ConnectCandidates(vector<LocationReferencePoint> const & po
       {
         resultPathPart.clear();
 
-        found = ConnectAdjacentCandidateLines(fromCandidates[fromInd], toCandidates[toInd],
-                                              point.m_lfrcnp, distanceToNextPoint,
-                                              resultPathPart);
+        found = ConnectAdjacentCandidateLines(fromCandidates[fromInd], toCandidates[toInd], point.m_lfrcnp,
+                                              distanceToNextPoint, resultPathPart);
 
         if (!found)
           continue;
 
         found = ValidatePath(resultPathPart, distanceToNextPoint, m_pathLengthTolerance);
-        if (fakePath.empty() && found &&
-            (resultPathPart.front().IsFake() || resultPathPart.back().IsFake()))
+        if (fakePath.empty() && found && (resultPathPart.front().IsFake() || resultPathPart.back().IsFake()))
         {
           fakePath = resultPathPart;
           found = false;
@@ -127,10 +119,7 @@ bool PathsConnector::FindShortestPath(Graph::Edge const & from, Graph::Edge cons
   {
     State(Graph::Edge const & e, uint32_t const s) : m_edge(e), m_score(s) {}
 
-    bool operator>(State const & o) const
-    {
-      return make_tuple(m_score, m_edge) > make_tuple(o.m_score, o.m_edge);
-    }
+    bool operator>(State const & o) const { return make_tuple(m_score, m_edge) > make_tuple(o.m_score, o.m_edge); }
 
     Graph::Edge m_edge;
     uint32_t m_score;
@@ -196,10 +185,8 @@ bool PathsConnector::FindShortestPath(Graph::Edge const & from, Graph::Edge cons
   return false;
 }
 
-bool PathsConnector::ConnectAdjacentCandidateLines(Graph::EdgeVector const & from,
-                                                   Graph::EdgeVector const & to,
-                                                   FunctionalRoadClass lowestFrcToNextPoint,
-                                                   double distanceToNextPoint,
+bool PathsConnector::ConnectAdjacentCandidateLines(Graph::EdgeVector const & from, Graph::EdgeVector const & to,
+                                                   FunctionalRoadClass lowestFrcToNextPoint, double distanceToNextPoint,
                                                    Graph::EdgeVector & resultPath)
 
 {
@@ -217,8 +204,7 @@ bool PathsConnector::ConnectAdjacentCandidateLines(Graph::EdgeVector const & fro
   ASSERT(from.back() != to.front(), ());
 
   Graph::EdgeVector shortestPath;
-  auto const found =
-      FindShortestPath(from.back(), to.front(), lowestFrcToNextPoint, distanceToNextPoint, shortestPath);
+  auto const found = FindShortestPath(from.back(), to.front(), lowestFrcToNextPoint, distanceToNextPoint, shortestPath);
   if (!found)
     return false;
 
diff --git a/tools/openlr/paths_connector.hpp b/tools/openlr/paths_connector.hpp
index 27937d447..c4f04889c 100644
--- a/tools/openlr/paths_connector.hpp
+++ b/tools/openlr/paths_connector.hpp
@@ -14,21 +14,19 @@ namespace openlr
 class PathsConnector
 {
 public:
-  PathsConnector(double pathLengthTolerance, Graph & graph, RoadInfoGetter & infoGetter,
-                 v2::Stats & stat);
+  PathsConnector(double pathLengthTolerance, Graph & graph, RoadInfoGetter & infoGetter, v2::Stats & stat);
 
   bool ConnectCandidates(std::vector<LocationReferencePoint> const & points,
                          std::vector<std::vector<Graph::EdgeVector>> const & lineCandidates,
                          std::vector<Graph::EdgeVector> & resultPath);
 
 private:
-  bool FindShortestPath(Graph::Edge const & from, Graph::Edge const & to,
-                        FunctionalRoadClass lowestFrcToNextPoint, uint32_t maxPathLength,
-                        Graph::EdgeVector & path);
+  bool FindShortestPath(Graph::Edge const & from, Graph::Edge const & to, FunctionalRoadClass lowestFrcToNextPoint,
+                        uint32_t maxPathLength, Graph::EdgeVector & path);
 
   bool ConnectAdjacentCandidateLines(Graph::EdgeVector const & from, Graph::EdgeVector const & to,
-                                     FunctionalRoadClass lowestFrcToNextPoint,
-                                     double distanceToNextPoint, Graph::EdgeVector & resultPath);
+                                     FunctionalRoadClass lowestFrcToNextPoint, double distanceToNextPoint,
+                                     Graph::EdgeVector & resultPath);
 
   double m_pathLengthTolerance;
   Graph & m_graph;
diff --git a/tools/openlr/road_info_getter.cpp b/tools/openlr/road_info_getter.cpp
index 26e7f029b..493524343 100644
--- a/tools/openlr/road_info_getter.cpp
+++ b/tools/openlr/road_info_getter.cpp
@@ -1,8 +1,8 @@
 #include "openlr/road_info_getter.hpp"
 
 #include "indexer/classificator.hpp"
-#include "indexer/feature.hpp"
 #include "indexer/data_source.hpp"
+#include "indexer/feature.hpp"
 
 #include "base/assert.hpp"
 
@@ -14,14 +14,10 @@ RoadInfoGetter::RoadInfo::RoadInfo(FeatureType & ft)
   , m_link(ftypes::IsLinkChecker::Instance()(ft))
   , m_oneWay(ftypes::IsOneWayChecker::Instance()(ft))
   , m_isRoundabout(ftypes::IsRoundAboutChecker::Instance()(ft))
-{
-}
+{}
 
 // RoadInfoGetter ----------------------------------------------------------------------------------
-RoadInfoGetter::RoadInfoGetter(DataSource const & dataSource)
-  : m_dataSource(dataSource)
-{
-}
+RoadInfoGetter::RoadInfoGetter(DataSource const & dataSource) : m_dataSource(dataSource) {}
 
 RoadInfoGetter::RoadInfo RoadInfoGetter::Get(FeatureID const & fid)
 {
diff --git a/tools/openlr/road_info_getter.hpp b/tools/openlr/road_info_getter.hpp
index a5601e28b..d694e34e8 100644
--- a/tools/openlr/road_info_getter.hpp
+++ b/tools/openlr/road_info_getter.hpp
@@ -34,8 +34,7 @@ public:
 
   RoadInfo Get(FeatureID const & fid);
 
- private:
-
+private:
   DataSource const & m_dataSource;
   std::map<FeatureID, RoadInfo> m_cache;
 };
diff --git a/tools/openlr/router.cpp b/tools/openlr/router.cpp
index a97060f75..00b1ed8cb 100644
--- a/tools/openlr/router.cpp
+++ b/tools/openlr/router.cpp
@@ -83,16 +83,14 @@ bool Router::Vertex::Score::operator==(Score const & rhs) const
 }
 
 // Router::Vertex ----------------------------------------------------------------------------------
-Router::Vertex::Vertex(geometry::PointWithAltitude const & junction,
-                       geometry::PointWithAltitude const & stageStart, double stageStartDistance,
-                       size_t stage, bool bearingChecked)
+Router::Vertex::Vertex(geometry::PointWithAltitude const & junction, geometry::PointWithAltitude const & stageStart,
+                       double stageStartDistance, size_t stage, bool bearingChecked)
   : m_junction(junction)
   , m_stageStart(stageStart)
   , m_stageStartDistance(stageStartDistance)
   , m_stage(stage)
   , m_bearingChecked(bearingChecked)
-{
-}
+{}
 
 bool Router::Vertex::operator<(Vertex const & rhs) const
 {
@@ -116,9 +114,11 @@ bool Router::Vertex::operator==(Vertex const & rhs) const
 
 // Router::Edge ------------------------------------------------------------------------------------
 Router::Edge::Edge(Vertex const & u, Vertex const & v, routing::Edge const & raw, bool isSpecial)
-  : m_u(u), m_v(v), m_raw(raw), m_isSpecial(isSpecial)
-{
-}
+  : m_u(u)
+  , m_v(v)
+  , m_raw(raw)
+  , m_isSpecial(isSpecial)
+{}
 
 // static
 Router::Edge Router::Edge::MakeNormal(Vertex const & u, Vertex const & v, routing::Edge const & raw)
@@ -146,20 +146,18 @@ std::pair<m2::PointD, m2::PointD> Router::Edge::ToPairRev() const
 
 // Router::Router ----------------------------------------------------------------------------------
 Router::Router(routing::FeaturesRoadGraph & graph, RoadInfoGetter & roadInfoGetter)
-  : m_graph(graph), m_roadInfoGetter(roadInfoGetter)
-{
-}
+  : m_graph(graph)
+  , m_roadInfoGetter(roadInfoGetter)
+{}
 
-bool Router::Go(std::vector<WayPoint> const & points, double positiveOffsetM,
-                double negativeOffsetM, Path & path)
+bool Router::Go(std::vector<WayPoint> const & points, double positiveOffsetM, double negativeOffsetM, Path & path)
 {
   if (!Init(points, positiveOffsetM, negativeOffsetM))
     return false;
   return FindPath(path);
 }
 
-bool Router::Init(std::vector<WayPoint> const & points, double positiveOffsetM,
-                  double negativeOffsetM)
+bool Router::Init(std::vector<WayPoint> const & points, double positiveOffsetM, double negativeOffsetM)
 {
   CHECK_GREATER_OR_EQUAL(points.size(), 2, ());
 
@@ -177,8 +175,7 @@ bool Router::Init(std::vector<WayPoint> const & points, double positiveOffsetM,
 
     std::vector<std::pair<routing::Edge, geometry::PointWithAltitude>> vicinity;
     m_graph.FindClosestEdges(
-        mercator::RectByCenterXYAndSizeInMeters(m_points[i].m_point,
-                                                routing::FeaturesRoadGraph::kClosestEdgesRadiusM),
+        mercator::RectByCenterXYAndSizeInMeters(m_points[i].m_point, routing::FeaturesRoadGraph::kClosestEdgesRadiusM),
         kMaxRoadCandidates, vicinity);
     for (auto const & v : vicinity)
     {
@@ -197,20 +194,18 @@ bool Router::Init(std::vector<WayPoint> const & points, double positiveOffsetM,
   {
     m_sourceJunction = geometry::PointWithAltitude(m_points.front().m_point, 0 /* altitude */);
     std::vector<std::pair<routing::Edge, geometry::PointWithAltitude>> sourceVicinity;
-    m_graph.FindClosestEdges(
-        mercator::RectByCenterXYAndSizeInMeters(m_sourceJunction.GetPoint(),
-                                                routing::FeaturesRoadGraph::kClosestEdgesRadiusM),
-        kMaxRoadCandidates, sourceVicinity);
+    m_graph.FindClosestEdges(mercator::RectByCenterXYAndSizeInMeters(m_sourceJunction.GetPoint(),
+                                                                     routing::FeaturesRoadGraph::kClosestEdgesRadiusM),
+                             kMaxRoadCandidates, sourceVicinity);
     m_graph.AddFakeEdges(m_sourceJunction, sourceVicinity);
   }
 
   {
     m_targetJunction = geometry::PointWithAltitude(m_points.back().m_point, 0 /* altitude */);
     std::vector<std::pair<routing::Edge, geometry::PointWithAltitude>> targetVicinity;
-    m_graph.FindClosestEdges(
-        mercator::RectByCenterXYAndSizeInMeters(m_targetJunction.GetPoint(),
-                                                routing::FeaturesRoadGraph::kClosestEdgesRadiusM),
-        kMaxRoadCandidates, targetVicinity);
+    m_graph.FindClosestEdges(mercator::RectByCenterXYAndSizeInMeters(m_targetJunction.GetPoint(),
+                                                                     routing::FeaturesRoadGraph::kClosestEdgesRadiusM),
+                             kMaxRoadCandidates, targetVicinity);
     m_graph.AddFakeEdges(m_targetJunction, targetVicinity);
   }
 
@@ -224,9 +219,9 @@ bool Router::FindPath(Path & path)
   std::map<Vertex, Vertex::Score> scores;
   Links links;
 
-  auto const pushVertex = [&queue, &scores, &links](Vertex const & u, Vertex const & v,
-                                                    Vertex::Score const & vertexScore,
-                                                    Edge const & e) {
+  auto const pushVertex =
+      [&queue, &scores, &links](Vertex const & u, Vertex const & v, Vertex::Score const & vertexScore, Edge const & e)
+  {
     if ((scores.count(v) == 0 || scores[v].GetScore() > vertexScore.GetScore() + kEps) && u != v)
     {
       scores[v] = vertexScore;
@@ -279,11 +274,8 @@ bool Router::FindPath(Path & path)
 
     // max(kDistanceAccuracyM, m_distanceToNextPointM) is added here
     // to throw out quite long paths.
-    if (ud > u.m_stageStartDistance + distanceToNextPointM +
-                 std::max(kDistanceAccuracyM, distanceToNextPointM))
-    {
+    if (ud > u.m_stageStartDistance + distanceToNextPointM + std::max(kDistanceAccuracyM, distanceToNextPointM))
       continue;
-    }
 
     if (NearNextStage(u, piU) && !u.m_bearingChecked)
     {
@@ -303,14 +295,12 @@ bool Router::FindPath(Path & path)
 
     if (MayMoveToNextStage(u, piU))
     {
-      Vertex v(u.m_junction, u.m_junction, ud /* stageStartDistance */, stage + 1,
-               false /* bearingChecked */);
+      Vertex v(u.m_junction, u.m_junction, ud /* stageStartDistance */, stage + 1, false /* bearingChecked */);
       double const piV = GetPotential(v);
 
       Vertex::Score sv = su;
       sv.AddDistance(std::max(piV - piU, 0.0));
-      sv.AddIntermediateErrorPenalty(
-          mercator::DistanceOnEarth(v.m_junction.GetPoint(), m_points[v.m_stage].m_point));
+      sv.AddIntermediateErrorPenalty(mercator::DistanceOnEarth(v.m_junction.GetPoint(), m_points[v.m_stage].m_point));
 
       if (IsFinalVertex(v))
       {
@@ -322,7 +312,8 @@ bool Router::FindPath(Path & path)
       pushVertex(u, v, sv, Edge::MakeSpecial(u, v));
     }
 
-    ForEachEdge(u, true /* outgoing */, m_points[stage].m_lfrcnp, [&](routing::Edge const & edge) {
+    ForEachEdge(u, true /* outgoing */, m_points[stage].m_lfrcnp, [&](routing::Edge const & edge)
+    {
       Vertex v = u;
       v.m_junction = edge.GetEndJunction();
 
@@ -338,8 +329,7 @@ bool Router::FindPath(Path & path)
         CHECK(!NeedToCheckBearing(u, ud), ());
 
         double const delta = vd - v.m_stageStartDistance - kBearingDist;
-        auto const p = PointAtSegment(edge.GetStartJunction().GetPoint(),
-                                      edge.GetEndJunction().GetPoint(), delta);
+        auto const p = PointAtSegment(edge.GetStartJunction().GetPoint(), edge.GetEndJunction().GetPoint(), delta);
         if (v.m_stageStart.GetPoint() != p)
         {
           int const expected = m_points[stage].m_bearing;
@@ -423,8 +413,7 @@ uint32_t Router::GetReverseBearing(Vertex const & u, Links const & links) const
     if (passed + weight >= kBearingDist)
     {
       double const delta = kBearingDist - passed;
-      b = PointAtSegment(edge.GetEndJunction().GetPoint(), edge.GetStartJunction().GetPoint(),
-                         delta);
+      b = PointAtSegment(edge.GetEndJunction().GetPoint(), edge.GetStartJunction().GetPoint(), delta);
       found = true;
       break;
     }
@@ -453,25 +442,20 @@ void Router::ForEachEdge(Vertex const & u, bool outgoing, FunctionalRoadClass re
   }
 }
 
-void Router::GetOutgoingEdges(geometry::PointWithAltitude const & u,
-                              routing::IRoadGraph::EdgeListT & edges)
+void Router::GetOutgoingEdges(geometry::PointWithAltitude const & u, routing::IRoadGraph::EdgeListT & edges)
 {
-  GetEdges(u, &routing::IRoadGraph::GetRegularOutgoingEdges,
-           &routing::IRoadGraph::GetFakeOutgoingEdges, m_outgoingCache, edges);
+  GetEdges(u, &routing::IRoadGraph::GetRegularOutgoingEdges, &routing::IRoadGraph::GetFakeOutgoingEdges,
+           m_outgoingCache, edges);
 }
 
-void Router::GetIngoingEdges(geometry::PointWithAltitude const & u,
-                             routing::IRoadGraph::EdgeListT & edges)
+void Router::GetIngoingEdges(geometry::PointWithAltitude const & u, routing::IRoadGraph::EdgeListT & edges)
 {
-  GetEdges(u, &routing::IRoadGraph::GetRegularIngoingEdges,
-           &routing::IRoadGraph::GetFakeIngoingEdges, m_ingoingCache, edges);
+  GetEdges(u, &routing::IRoadGraph::GetRegularIngoingEdges, &routing::IRoadGraph::GetFakeIngoingEdges, m_ingoingCache,
+           edges);
 }
 
-void Router::GetEdges(
-    geometry::PointWithAltitude const & u, RoadGraphEdgesGetter getRegular,
-    RoadGraphEdgesGetter getFake,
-    EdgeCacheT & cache,
-    routing::IRoadGraph::EdgeListT & edges)
+void Router::GetEdges(geometry::PointWithAltitude const & u, RoadGraphEdgesGetter getRegular,
+                      RoadGraphEdgesGetter getFake, EdgeCacheT & cache, routing::IRoadGraph::EdgeListT & edges)
 {
   auto const it = cache.find(u);
   if (it == cache.end())
@@ -489,24 +473,22 @@ void Router::GetEdges(
 }
 
 template <typename Fn>
-void Router::ForEachNonFakeEdge(Vertex const & u, bool outgoing, FunctionalRoadClass restriction,
-                                Fn && fn)
+void Router::ForEachNonFakeEdge(Vertex const & u, bool outgoing, FunctionalRoadClass restriction, Fn && fn)
 {
-  ForEachEdge(u, outgoing, restriction, [&fn](routing::Edge const & edge) {
+  ForEachEdge(u, outgoing, restriction, [&fn](routing::Edge const & edge)
+  {
     if (!edge.IsFake())
       fn(edge);
   });
 }
 
 template <typename Fn>
-void Router::ForEachNonFakeClosestEdge(Vertex const & u, FunctionalRoadClass const restriction,
-                                       Fn && fn)
+void Router::ForEachNonFakeClosestEdge(Vertex const & u, FunctionalRoadClass const restriction, Fn && fn)
 {
   std::vector<std::pair<routing::Edge, geometry::PointWithAltitude>> vicinity;
-  m_graph.FindClosestEdges(
-      mercator::RectByCenterXYAndSizeInMeters(u.m_junction.GetPoint(),
-                                              routing::FeaturesRoadGraph::kClosestEdgesRadiusM),
-      kMaxRoadCandidates, vicinity);
+  m_graph.FindClosestEdges(mercator::RectByCenterXYAndSizeInMeters(u.m_junction.GetPoint(),
+                                                                   routing::FeaturesRoadGraph::kClosestEdgesRadiusM),
+                           kMaxRoadCandidates, vicinity);
 
   for (auto const & p : vicinity)
   {
@@ -652,64 +634,61 @@ bool Router::ReconstructPath(std::vector<Edge> & edges, Path & path)
 
   {
     auto toPair = [](auto && e) { return e.ToPair(); };
-    size_t const n = FindPrefixLengthToConsume(
-        make_transform_iterator(edges.begin(), toPair),
-        make_transform_iterator(edges.end(), toPair), m_positiveOffsetM);
+    size_t const n = FindPrefixLengthToConsume(make_transform_iterator(edges.begin(), toPair),
+                                               make_transform_iterator(edges.end(), toPair), m_positiveOffsetM);
     CHECK_LESS_OR_EQUAL(n, edges.size(), ());
     edges.erase(edges.begin(), edges.begin() + n);
   }
 
   {
     auto toPairRev = [](auto && e) { return e.ToPairRev(); };
-    size_t const n = FindPrefixLengthToConsume(
-        make_transform_iterator(edges.rbegin(), toPairRev),
-        make_transform_iterator(edges.rend(), toPairRev), m_negativeOffsetM);
+    size_t const n = FindPrefixLengthToConsume(make_transform_iterator(edges.rbegin(), toPairRev),
+                                               make_transform_iterator(edges.rend(), toPairRev), m_negativeOffsetM);
     CHECK_LESS_OR_EQUAL(n, edges.size(), ());
     edges.erase(edges.begin() + edges.size() - n, edges.end());
   }
 
   double frontEdgeScore = -1.0;
   routing::Edge frontEdge;
-  ForStagePrefix(edges.begin(), edges.end(), 0, [&](EdgeIt e) {
-    ForEachNonFakeEdge(e->m_u, false /* outgoing */, m_points[0].m_lfrcnp,
-                       [&](routing::Edge const & edge) {
-                         auto toPairRev = [](auto && e) { return e.ToPairRev(); };
-                         double const score = GetMatchingScore(
-                             edge.GetEndJunction().GetPoint(), edge.GetStartJunction().GetPoint(),
-                             make_transform_iterator(EdgeItRev(e), toPairRev),
-                             make_transform_iterator(edges.rend(), toPairRev));
-                         if (score > frontEdgeScore)
-                         {
-                           frontEdgeScore = score;
-                           frontEdge = edge.GetReverseEdge();
-                         }
-                       });
+  ForStagePrefix(edges.begin(), edges.end(), 0, [&](EdgeIt e)
+  {
+    ForEachNonFakeEdge(e->m_u, false /* outgoing */, m_points[0].m_lfrcnp, [&](routing::Edge const & edge)
+    {
+      auto toPairRev = [](auto && e) { return e.ToPairRev(); };
+      double const score = GetMatchingScore(edge.GetEndJunction().GetPoint(), edge.GetStartJunction().GetPoint(),
+                                            make_transform_iterator(EdgeItRev(e), toPairRev),
+                                            make_transform_iterator(edges.rend(), toPairRev));
+      if (score > frontEdgeScore)
+      {
+        frontEdgeScore = score;
+        frontEdge = edge.GetReverseEdge();
+      }
+    });
   });
 
   double backEdgeScore = -1.0;
   routing::Edge backEdge;
-  ForStagePrefix(edges.rbegin(), edges.rend(), m_points.size() - 2 /* stage */, [&](EdgeItRev e) {
+  ForStagePrefix(edges.rbegin(), edges.rend(), m_points.size() - 2 /* stage */, [&](EdgeItRev e)
+  {
     ForEachNonFakeEdge(e->m_v, true /* outgoing */, m_points[m_points.size() - 2].m_lfrcnp,
-                       [&](routing::Edge const & edge) {
-                         auto toPair = [](auto && e) { return e.ToPair(); };
-                         double const score = GetMatchingScore(
-                             edge.GetStartJunction().GetPoint(), edge.GetEndJunction().GetPoint(),
-                             make_transform_iterator(e.base(), toPair),
-                             make_transform_iterator(edges.end(), toPair));
-                         if (score > backEdgeScore)
-                         {
-                           backEdgeScore = score;
-                           backEdge = edge;
-                         }
-                       });
+                       [&](routing::Edge const & edge)
+    {
+      auto toPair = [](auto && e) { return e.ToPair(); };
+      double const score =
+          GetMatchingScore(edge.GetStartJunction().GetPoint(), edge.GetEndJunction().GetPoint(),
+                           make_transform_iterator(e.base(), toPair), make_transform_iterator(edges.end(), toPair));
+      if (score > backEdgeScore)
+      {
+        backEdgeScore = score;
+        backEdge = edge;
+      }
+    });
   });
 
   path.clear();
   for (auto const & e : edges)
-  {
     if (!e.IsFake())
       path.push_back(e.m_raw);
-  }
 
   if (frontEdgeScore >= kFakeCoverageThreshold && !path.empty() && path.front() != frontEdge)
     path.insert(path.begin(), frontEdge);
@@ -742,11 +721,11 @@ void Router::FindSingleEdgeApproximation(std::vector<Edge> const & edges, Path &
   double bestCoverage = -1.0;
   routing::Edge bestEdge;
 
-  auto checkEdge = [&](routing::Edge const & edge) {
+  auto checkEdge = [&](routing::Edge const & edge)
+  {
     double const weight = GetWeight(edge);
     double const fraction =
-        GetCoverage(edge.GetStartJunction().GetPoint(), edge.GetEndJunction().GetPoint(),
-                    edges.begin(), edges.end());
+        GetCoverage(edge.GetStartJunction().GetPoint(), edge.GetEndJunction().GetPoint(), edges.begin(), edges.end());
     double const coverage = weight * fraction;
     if (coverage >= bestCoverage)
     {
diff --git a/tools/openlr/router.hpp b/tools/openlr/router.hpp
index 118443402..fca2d79a3 100644
--- a/tools/openlr/router.hpp
+++ b/tools/openlr/router.hpp
@@ -35,20 +35,20 @@ private:
     {
     public:
       // A weight for total length of true fake edges.
-      static const int kTrueFakeCoeff = 10;
+      static int const kTrueFakeCoeff = 10;
 
       // A weight for total length of fake edges that are parts of some
       // real edges.
       static constexpr double kFakeCoeff = 0.001;
 
       // A weight for passing too far from pivot points.
-      static const int kIntermediateErrorCoeff = 3;
+      static int const kIntermediateErrorCoeff = 3;
 
       // A weight for excess of distance limit.
-      static const int kDistanceErrorCoeff = 3;
+      static int const kDistanceErrorCoeff = 3;
 
       // A weight for deviation from bearing.
-      static const int kBearingErrorCoeff = 5;
+      static int const kBearingErrorCoeff = 5;
 
       void AddDistance(double p) { m_distance += p; }
       void AddFakePenalty(double p, bool partOfReal);
@@ -73,9 +73,8 @@ private:
     };
 
     Vertex() = default;
-    Vertex(geometry::PointWithAltitude const & junction,
-           geometry::PointWithAltitude const & stageStart, double stageStartDistance, size_t stage,
-           bool bearingChecked);
+    Vertex(geometry::PointWithAltitude const & junction, geometry::PointWithAltitude const & stageStart,
+           double stageStartDistance, size_t stage, bool bearingChecked);
 
     bool operator<(Vertex const & rhs) const;
     bool operator==(Vertex const & rhs) const;
@@ -137,8 +136,8 @@ private:
 
   using Links = std::map<Vertex, std::pair<Vertex, Edge>>;
 
-  using RoadGraphEdgesGetter = void (routing::IRoadGraph::*)(
-      geometry::PointWithAltitude const & junction, routing::IRoadGraph::EdgeListT & edges) const;
+  using RoadGraphEdgesGetter = void (routing::IRoadGraph::*)(geometry::PointWithAltitude const & junction,
+                                                             routing::IRoadGraph::EdgeListT & edges) const;
 
   bool Init(std::vector<WayPoint> const & points, double positiveOffsetM, double negativeOffsetM);
   bool FindPath(Path & path);
@@ -162,8 +161,7 @@ private:
 
   double GetWeight(routing::Edge const & e) const
   {
-    return mercator::DistanceOnEarth(e.GetStartJunction().GetPoint(),
-                                     e.GetEndJunction().GetPoint());
+    return mercator::DistanceOnEarth(e.GetStartJunction().GetPoint(), e.GetEndJunction().GetPoint());
   }
 
   double GetWeight(Edge const & e) const { return GetWeight(e.m_raw); }
@@ -173,20 +171,15 @@ private:
   template <typename Fn>
   void ForEachEdge(Vertex const & u, bool outgoing, FunctionalRoadClass restriction, Fn && fn);
 
-  void GetOutgoingEdges(geometry::PointWithAltitude const & u,
-                        routing::IRoadGraph::EdgeListT & edges);
-  void GetIngoingEdges(geometry::PointWithAltitude const & u,
-                       routing::IRoadGraph::EdgeListT & edges);
+  void GetOutgoingEdges(geometry::PointWithAltitude const & u, routing::IRoadGraph::EdgeListT & edges);
+  void GetIngoingEdges(geometry::PointWithAltitude const & u, routing::IRoadGraph::EdgeListT & edges);
 
   using EdgeCacheT = std::map<geometry::PointWithAltitude, routing::IRoadGraph::EdgeListT>;
-  void GetEdges(geometry::PointWithAltitude const & u, RoadGraphEdgesGetter getRegular,
-                RoadGraphEdgesGetter getFake,
-                EdgeCacheT & cache,
-                routing::IRoadGraph::EdgeListT & edges);
+  void GetEdges(geometry::PointWithAltitude const & u, RoadGraphEdgesGetter getRegular, RoadGraphEdgesGetter getFake,
+                EdgeCacheT & cache, routing::IRoadGraph::EdgeListT & edges);
 
   template <typename Fn>
-  void ForEachNonFakeEdge(Vertex const & u, bool outgoing, FunctionalRoadClass restriction,
-                          Fn && fn);
+  void ForEachNonFakeEdge(Vertex const & u, bool outgoing, FunctionalRoadClass restriction, Fn && fn);
 
   template <typename Fn>
   void ForEachNonFakeClosestEdge(Vertex const & u, FunctionalRoadClass const restriction, Fn && fn);
diff --git a/tools/openlr/score_candidate_paths_getter.cpp b/tools/openlr/score_candidate_paths_getter.cpp
index a17471c83..86def7092 100644
--- a/tools/openlr/score_candidate_paths_getter.cpp
+++ b/tools/openlr/score_candidate_paths_getter.cpp
@@ -55,16 +55,14 @@ double DifferenceInDeg(double a1, double a2)
 
 void EdgeSortUniqueByStartAndEndPoints(Graph::EdgeListT & edges)
 {
-  base::SortUnique(
-      edges,
-      [](Edge const & e1, Edge const & e2) {
-        if (e1.GetStartPoint() != e2.GetStartPoint())
-          return e1.GetStartPoint() < e2.GetStartPoint();
-        return e1.GetEndPoint() < e2.GetEndPoint();
-      },
-      [](Edge const & e1, Edge const & e2) {
-        return e1.GetStartPoint() == e2.GetStartPoint() && e1.GetEndPoint() == e2.GetEndPoint();
-      });
+  base::SortUnique(edges,
+                   [](Edge const & e1, Edge const & e2)
+  {
+    if (e1.GetStartPoint() != e2.GetStartPoint())
+      return e1.GetStartPoint() < e2.GetStartPoint();
+    return e1.GetEndPoint() < e2.GetEndPoint();
+  }, [](Edge const & e1, Edge const & e2)
+  { return e1.GetStartPoint() == e2.GetStartPoint() && e1.GetEndPoint() == e2.GetEndPoint(); });
 }
 }  // namespace scpg
 
@@ -93,9 +91,9 @@ bool ScoreCandidatePathsGetter::Link::IsJunctionInPath(geometry::PointWithAltitu
 }
 
 // ScoreCandidatePathsGetter ----------------------------------------------------------------------------
-bool ScoreCandidatePathsGetter::GetLineCandidatesForPoints(
-    vector<LocationReferencePoint> const & points, LinearSegmentSource source,
-    vector<ScorePathVec> & lineCandidates)
+bool ScoreCandidatePathsGetter::GetLineCandidatesForPoints(vector<LocationReferencePoint> const & points,
+                                                           LinearSegmentSource source,
+                                                           vector<ScorePathVec> & lineCandidates)
 {
   CHECK_GREATER(points.size(), 1, ());
 
@@ -110,15 +108,12 @@ bool ScoreCandidatePathsGetter::GetLineCandidatesForPoints(
 
     lineCandidates.emplace_back();
     auto const isLastPoint = i == points.size() - 1;
-    double const distanceToNextPointM =
-        (isLastPoint ? points[i - 1] : points[i]).m_distanceToNextPoint;
+    double const distanceToNextPointM = (isLastPoint ? points[i - 1] : points[i]).m_distanceToNextPoint;
 
     ScoreEdgeVec edgesCandidates;
-    m_pointsGetter.GetEdgeCandidates(mercator::FromLatLon(points[i].m_latLon),
-                                     isLastPoint, edgesCandidates);
+    m_pointsGetter.GetEdgeCandidates(mercator::FromLatLon(points[i].m_latLon), isLastPoint, edgesCandidates);
 
-    GetLineCandidates(points[i], source, isLastPoint, distanceToNextPointM, edgesCandidates,
-                      lineCandidates.back());
+    GetLineCandidates(points[i], source, isLastPoint, distanceToNextPointM, edgesCandidates, lineCandidates.back());
 
     if (lineCandidates.back().empty())
     {
@@ -132,13 +127,10 @@ bool ScoreCandidatePathsGetter::GetLineCandidatesForPoints(
   return true;
 }
 
-void ScoreCandidatePathsGetter::GetAllSuitablePaths(ScoreEdgeVec const & startLines,
-                                                    LinearSegmentSource source, bool isLastPoint,
-                                                    double bearDistM,
-                                                    FunctionalRoadClass functionalRoadClass,
-                                                    FormOfWay formOfWay,
-                                                    double distanceToNextPointM,
-                                                    vector<shared_ptr<Link>> & allPaths)
+void ScoreCandidatePathsGetter::GetAllSuitablePaths(ScoreEdgeVec const & startLines, LinearSegmentSource source,
+                                                    bool isLastPoint, double bearDistM,
+                                                    FunctionalRoadClass functionalRoadClass, FormOfWay formOfWay,
+                                                    double distanceToNextPointM, vector<shared_ptr<Link>> & allPaths)
 {
   CHECK_NOT_EQUAL(source, LinearSegmentSource::NotValid, ());
 
@@ -146,15 +138,14 @@ void ScoreCandidatePathsGetter::GetAllSuitablePaths(ScoreEdgeVec const & startLi
 
   for (auto const & e : startLines)
   {
-    Score roadScore = 0; // Score based on functional road class and form of way.
+    Score roadScore = 0;  // Score based on functional road class and form of way.
     if (source == LinearSegmentSource::FromLocationReferenceTag &&
         !PassesRestrictionV3(e.m_edge, functionalRoadClass, formOfWay, m_infoGetter, roadScore))
     {
       continue;
     }
 
-    q.push(
-        make_shared<Link>(nullptr /* parent */, e.m_edge, 0 /* distanceM */, e.m_score, roadScore));
+    q.push(make_shared<Link>(nullptr /* parent */, e.m_edge, 0 /* distanceM */, e.m_score, roadScore));
   }
 
   // Filling |allPaths| staring from |startLines| which have passed functional road class
@@ -214,8 +205,8 @@ void ScoreCandidatePathsGetter::GetAllSuitablePaths(ScoreEdgeVec const & startLi
 
       // Road score for a path is minimum value of score of segments based on functional road class
       // of the segments and form of way of the segments.
-      q.emplace(make_shared<Link>(u, e, u->m_distanceM + currentEdgeLen, u->m_pointScore,
-                                  min(roadScore, u->m_minRoadScore)));
+      q.emplace(
+          make_shared<Link>(u, e, u->m_distanceM + currentEdgeLen, u->m_pointScore, min(roadScore, u->m_minRoadScore)));
     }
   }
 }
@@ -223,8 +214,7 @@ void ScoreCandidatePathsGetter::GetAllSuitablePaths(ScoreEdgeVec const & startLi
 void ScoreCandidatePathsGetter::GetBestCandidatePaths(vector<shared_ptr<Link>> const & allPaths,
                                                       LinearSegmentSource source, bool isLastPoint,
                                                       uint32_t requiredBearing, double bearDistM,
-                                                      m2::PointD const & startPoint,
-                                                      ScorePathVec & candidates)
+                                                      m2::PointD const & startPoint, ScorePathVec & candidates)
 {
   CHECK_NOT_EQUAL(source, LinearSegmentSource::NotValid, ());
   CHECK_LESS_OR_EQUAL(requiredBearing, 255, ());
@@ -269,8 +259,7 @@ void ScoreCandidatePathsGetter::GetBestCandidatePaths(vector<shared_ptr<Link>> c
 
   size_t constexpr kMaxCandidates = 7;
   vector<CandidatePath> paths;
-  copy_n(candidatePaths.begin(), min(static_cast<size_t>(kMaxCandidates), candidatePaths.size()),
-         back_inserter(paths));
+  copy_n(candidatePaths.begin(), min(static_cast<size_t>(kMaxCandidates), candidatePaths.size()), back_inserter(paths));
 
   for (auto const & path : paths)
   {
@@ -285,12 +274,9 @@ void ScoreCandidatePathsGetter::GetBestCandidatePaths(vector<shared_ptr<Link>> c
   }
 }
 
-void ScoreCandidatePathsGetter::GetLineCandidates(openlr::LocationReferencePoint const & p,
-                                                  LinearSegmentSource source,
-                                                  bool isLastPoint,
-                                                  double distanceToNextPointM,
-                                                  ScoreEdgeVec const & edgeCandidates,
-                                                  ScorePathVec & candidates)
+void ScoreCandidatePathsGetter::GetLineCandidates(openlr::LocationReferencePoint const & p, LinearSegmentSource source,
+                                                  bool isLastPoint, double distanceToNextPointM,
+                                                  ScoreEdgeVec const & edgeCandidates, ScorePathVec & candidates)
 {
   double constexpr kDefaultBearDistM = 25.0;
   double const bearDistM = min(kDefaultBearDistM, distanceToNextPointM);
@@ -303,11 +289,10 @@ void ScoreCandidatePathsGetter::GetLineCandidates(openlr::LocationReferencePoint
   auto const startPoint = mercator::FromLatLon(p.m_latLon);
 
   vector<shared_ptr<Link>> allPaths;
-  GetAllSuitablePaths(startLines, source, isLastPoint, bearDistM, p.m_functionalRoadClass,
-                      p.m_formOfWay, distanceToNextPointM, allPaths);
+  GetAllSuitablePaths(startLines, source, isLastPoint, bearDistM, p.m_functionalRoadClass, p.m_formOfWay,
+                      distanceToNextPointM, allPaths);
 
-  GetBestCandidatePaths(allPaths, source, isLastPoint, p.m_bearing, bearDistM, startPoint,
-                        candidates);
+  GetBestCandidatePaths(allPaths, source, isLastPoint, p.m_bearing, bearDistM, startPoint, candidates);
   // Sorting by increasing order.
   sort(candidates.begin(), candidates.end(),
        [](ScorePath const & s1, ScorePath const & s2) { return s1.m_score > s2.m_score; });
@@ -316,8 +301,8 @@ void ScoreCandidatePathsGetter::GetLineCandidates(openlr::LocationReferencePoint
 
 bool ScoreCandidatePathsGetter::GetBearingScore(BearingPointsSelector const & pointsSelector,
                                                 ScoreCandidatePathsGetter::Link const & part,
-                                                m2::PointD const & bearStartPoint,
-                                                uint32_t requiredBearing, Score & score)
+                                                m2::PointD const & bearStartPoint, uint32_t requiredBearing,
+                                                Score & score)
 {
   auto const bearEndPoint = pointsSelector.GetEndPoint(part.m_edge, part.m_distanceM);
 
@@ -333,8 +318,7 @@ bool ScoreCandidatePathsGetter::GetBearingScore(BearingPointsSelector const & po
 
   double constexpr kMaxScoreForBearing = 60.0;
   double constexpr kAngleDeviationFactor = 1.0 / 4.3;
-  score =
-      static_cast<Score>(kMaxScoreForBearing / (1.0 + angleDeviationDeg * kAngleDeviationFactor));
+  score = static_cast<Score>(kMaxScoreForBearing / (1.0 + angleDeviationDeg * kAngleDeviationFactor));
 
   return true;
 }
diff --git a/tools/openlr/score_candidate_paths_getter.hpp b/tools/openlr/score_candidate_paths_getter.hpp
index c8fc14335..d27fd2046 100644
--- a/tools/openlr/score_candidate_paths_getter.hpp
+++ b/tools/openlr/score_candidate_paths_getter.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "openlr/helpers.hpp"
 #include "openlr/graph.hpp"
+#include "openlr/helpers.hpp"
 #include "openlr/openlr_model.hpp"
 #include "openlr/road_info_getter.hpp"
 #include "openlr/score_types.hpp"
@@ -23,21 +23,22 @@ class ScoreCandidatePointsGetter;
 class ScoreCandidatePathsGetter
 {
 public:
-  ScoreCandidatePathsGetter(ScoreCandidatePointsGetter & pointsGetter, Graph & graph,
-                            RoadInfoGetter & infoGetter, v2::Stats & stat)
-    : m_pointsGetter(pointsGetter), m_graph(graph), m_infoGetter(infoGetter), m_stats(stat)
-  {
-  }
+  ScoreCandidatePathsGetter(ScoreCandidatePointsGetter & pointsGetter, Graph & graph, RoadInfoGetter & infoGetter,
+                            v2::Stats & stat)
+    : m_pointsGetter(pointsGetter)
+    , m_graph(graph)
+    , m_infoGetter(infoGetter)
+    , m_stats(stat)
+  {}
 
-  bool GetLineCandidatesForPoints(std::vector<LocationReferencePoint> const & points,
-                                  LinearSegmentSource source,
+  bool GetLineCandidatesForPoints(std::vector<LocationReferencePoint> const & points, LinearSegmentSource source,
                                   std::vector<ScorePathVec> & lineCandidates);
 
 private:
   struct Link
   {
-    Link(std::shared_ptr<Link> const & parent, Graph::Edge const & edge, double distanceM,
-         Score pointScore, Score rfcScore)
+    Link(std::shared_ptr<Link> const & parent, Graph::Edge const & edge, double distanceM, Score pointScore,
+         Score rfcScore)
       : m_parent(parent)
       , m_edge(edge)
       , m_distanceM(distanceM)
@@ -69,8 +70,7 @@ private:
       , m_pointScore(pointScore)
       , m_roadScore(rfcScore)
       , m_bearingScore(bearingScore)
-    {
-    }
+    {}
 
     bool operator>(CandidatePath const & o) const { return GetScore() > o.GetScore(); }
 
@@ -97,23 +97,18 @@ private:
   /// \brief Fills |allPaths| with paths near start or finish point starting from |startLines|.
   /// To extract a path from |allPaths| a item from |allPaths| should be taken,
   /// then should be taken the member |m_parent| of the item and so on till the beginning.
-  void GetAllSuitablePaths(ScoreEdgeVec const & startLines, LinearSegmentSource source,
-                           bool isLastPoint, double bearDistM,
-                           FunctionalRoadClass functionalRoadClass, FormOfWay formOfWay,
-                           double distanceToNextPointM,
-                           std::vector<std::shared_ptr<Link>> & allPaths);
+  void GetAllSuitablePaths(ScoreEdgeVec const & startLines, LinearSegmentSource source, bool isLastPoint,
+                           double bearDistM, FunctionalRoadClass functionalRoadClass, FormOfWay formOfWay,
+                           double distanceToNextPointM, std::vector<std::shared_ptr<Link>> & allPaths);
 
-  void GetBestCandidatePaths(std::vector<std::shared_ptr<Link>> const & allPaths,
-                             LinearSegmentSource source, bool isLastPoint, uint32_t requiredBearing,
-                             double bearDistM, m2::PointD const & startPoint,
-                             ScorePathVec & candidates);
+  void GetBestCandidatePaths(std::vector<std::shared_ptr<Link>> const & allPaths, LinearSegmentSource source,
+                             bool isLastPoint, uint32_t requiredBearing, double bearDistM,
+                             m2::PointD const & startPoint, ScorePathVec & candidates);
 
-  void GetLineCandidates(openlr::LocationReferencePoint const & p, LinearSegmentSource source,
-                         bool isLastPoint, double distanceToNextPointM,
-                         ScoreEdgeVec const & edgeCandidates, ScorePathVec & candidates);
+  void GetLineCandidates(openlr::LocationReferencePoint const & p, LinearSegmentSource source, bool isLastPoint,
+                         double distanceToNextPointM, ScoreEdgeVec const & edgeCandidates, ScorePathVec & candidates);
 
-  bool GetBearingScore(BearingPointsSelector const & pointsSelector,
-                       ScoreCandidatePathsGetter::Link const & part,
+  bool GetBearingScore(BearingPointsSelector const & pointsSelector, ScoreCandidatePathsGetter::Link const & part,
                        m2::PointD const & bearStartPoint, uint32_t requiredBearing, Score & score);
 
   ScoreCandidatePointsGetter & m_pointsGetter;
diff --git a/tools/openlr/score_candidate_points_getter.cpp b/tools/openlr/score_candidate_points_getter.cpp
index 5ec03b9dd..fa4f135f5 100644
--- a/tools/openlr/score_candidate_points_getter.cpp
+++ b/tools/openlr/score_candidate_points_getter.cpp
@@ -28,7 +28,7 @@ namespace
 {
 // Ends of segments and intermediate points of segments are considered only within this radius.
 double const kRadius = 30.0;
-} //  namespace
+}  //  namespace
 
 namespace openlr
 {
@@ -36,17 +36,17 @@ void ScoreCandidatePointsGetter::GetJunctionPointCandidates(m2::PointD const & p
                                                             ScoreEdgeVec & edgeCandidates)
 {
   ScorePointVec pointCandidates;
-  auto const selectCandidates = [&p, &pointCandidates, this](FeatureType & ft) {
+  auto const selectCandidates = [&p, &pointCandidates, this](FeatureType & ft)
+  {
     ft.ParseGeometry(FeatureType::BEST_GEOMETRY);
     if (ft.GetGeomType() != feature::GeomType::Line || !routing::IsRoad(feature::TypesHolder(ft)))
       return;
 
-    ft.ForEachPoint(
-        [&p, &pointCandidates, this](m2::PointD const & candidate) {
-          if (mercator::DistanceOnEarth(p, candidate) < kRadius)
-            pointCandidates.emplace_back(GetScoreByDistance(p, candidate), candidate);
-        },
-        scales::GetUpperScale());
+    ft.ForEachPoint([&p, &pointCandidates, this](m2::PointD const & candidate)
+    {
+      if (mercator::DistanceOnEarth(p, candidate) < kRadius)
+        pointCandidates.emplace_back(GetScoreByDistance(p, candidate), candidate);
+    }, scales::GetUpperScale());
   };
 
   m_dataSource.ForEachInRect(selectCandidates, mercator::RectByCenterXYAndSizeInMeters(p, kRadius),
@@ -70,8 +70,7 @@ void ScoreCandidatePointsGetter::GetJunctionPointCandidates(m2::PointD const & p
   }
 }
 
-void ScoreCandidatePointsGetter::EnrichWithProjectionPoints(m2::PointD const & p,
-                                                            ScoreEdgeVec & edgeCandidates)
+void ScoreCandidatePointsGetter::EnrichWithProjectionPoints(m2::PointD const & p, ScoreEdgeVec & edgeCandidates)
 {
   m_graph.ResetFakes();
 
@@ -115,8 +114,7 @@ bool ScoreCandidatePointsGetter::IsJunction(m2::PointD const & p)
   return ids.size() >= 3;
 }
 
-Score ScoreCandidatePointsGetter::GetScoreByDistance(m2::PointD const & point,
-                                                     m2::PointD const & candidate)
+Score ScoreCandidatePointsGetter::GetScoreByDistance(m2::PointD const & point, m2::PointD const & candidate)
 {
   // Maximum possible score for the distance between an openlr segment ends and an osm segments.
   Score constexpr kMaxScoreForDist = 70;
@@ -128,10 +126,9 @@ Score ScoreCandidatePointsGetter::GetScoreByDistance(m2::PointD const & point,
   double const junctionFactor = IsJunction(candidate) ? 1.1 : 1.0;
 
   double const distM = mercator::DistanceOnEarth(point, candidate);
-  double const score =
-      distM <= kMaxScoreDistM
-          ? kMaxScoreForDist * junctionFactor
-          : static_cast<double>(kMaxScoreForDist) * junctionFactor / (1.0 + distM - kMaxScoreDistM);
+  double const score = distM <= kMaxScoreDistM
+                         ? kMaxScoreForDist * junctionFactor
+                         : static_cast<double>(kMaxScoreForDist) * junctionFactor / (1.0 + distM - kMaxScoreDistM);
 
   CHECK_GREATER_OR_EQUAL(score, 0.0, ());
   CHECK_LESS_OR_EQUAL(score, static_cast<double>(kMaxScoreForDist) * junctionFactor, ());
diff --git a/tools/openlr/score_candidate_points_getter.hpp b/tools/openlr/score_candidate_points_getter.hpp
index 3c8c964ec..960719df7 100644
--- a/tools/openlr/score_candidate_points_getter.hpp
+++ b/tools/openlr/score_candidate_points_getter.hpp
@@ -23,8 +23,7 @@ public:
     , m_maxProjectionCandidates(maxProjectionCandidates)
     , m_dataSource(dataSource)
     , m_graph(graph)
-  {
-  }
+  {}
 
   void GetEdgeCandidates(m2::PointD const & p, bool isLastPoint, ScoreEdgeVec & edges)
   {
@@ -33,8 +32,7 @@ public:
   }
 
 private:
-  void GetJunctionPointCandidates(m2::PointD const & p, bool isLastPoint,
-                                  ScoreEdgeVec & edgeCandidates);
+  void GetJunctionPointCandidates(m2::PointD const & p, bool isLastPoint, ScoreEdgeVec & edgeCandidates);
   void EnrichWithProjectionPoints(m2::PointD const & p, ScoreEdgeVec & edgeCandidates);
 
   /// \returns true if |p| is a junction and false otherwise.
diff --git a/tools/openlr/score_paths_connector.cpp b/tools/openlr/score_paths_connector.cpp
index 5cd76f7e3..aa4fc0cfa 100644
--- a/tools/openlr/score_paths_connector.cpp
+++ b/tools/openlr/score_paths_connector.cpp
@@ -13,8 +13,8 @@
 #include <algorithm>
 #include <cmath>
 #include <map>
-#include <string>
 #include <queue>
+#include <string>
 #include <tuple>
 
 using namespace std;
@@ -48,10 +48,8 @@ public:
     {
       CHECK(hwClass != ftypes::HighwayClass::Undefined, (edge));
 
-      m_minHwClass = static_cast<ftypes::HighwayClass>(
-          min(base::Underlying(m_minHwClass), base::Underlying(hwClass)));
-      m_maxHwClass = static_cast<ftypes::HighwayClass>(
-          max(base::Underlying(m_maxHwClass), base::Underlying(hwClass)));
+      m_minHwClass = static_cast<ftypes::HighwayClass>(min(base::Underlying(m_minHwClass), base::Underlying(hwClass)));
+      m_maxHwClass = static_cast<ftypes::HighwayClass>(max(base::Underlying(m_maxHwClass), base::Underlying(hwClass)));
 
       if (m_oneWay.m_allEqual && m_oneWay.m_field != ftypes::IsOneWayChecker::Instance()(types))
         m_oneWay.m_allEqual = false;
@@ -96,8 +94,8 @@ private:
 /// \returns true if |path| may be used as a candidate. In that case |lenScore| is filled
 /// with score of this candidate based on length. The closer length of the |path| to
 /// |distanceToNextPoint| the more score.
-bool ValidatePathByLength(Graph::EdgeVector const & path, double distanceToNextPoint,
-                          LinearSegmentSource source, Score & lenScore)
+bool ValidatePathByLength(Graph::EdgeVector const & path, double distanceToNextPoint, LinearSegmentSource source,
+                          Score & lenScore)
 {
   CHECK(!path.empty(), ());
   CHECK_NOT_EQUAL(source, LinearSegmentSource::NotValid, ());
@@ -109,12 +107,10 @@ bool ValidatePathByLength(Graph::EdgeVector const & path, double distanceToNextP
     pathLen += EdgeLength(e);
 
   // 0 <= |pathDiffRatio| <= 1. The more pathDiffRatio the closer |distanceToNextPoint| and |pathLen|.
-  double const pathDiffRatio =
-      1.0 - abs(distanceToNextPoint - pathLen) / max(distanceToNextPoint, pathLen);
+  double const pathDiffRatio = 1.0 - abs(distanceToNextPoint - pathLen) / max(distanceToNextPoint, pathLen);
 
   bool const shortPath = path.size() <= 2;
-  double const kMinValidPathDiffRation =
-      source == LinearSegmentSource::FromLocationReferenceTag ? 0.6 : 0.25;
+  double const kMinValidPathDiffRation = source == LinearSegmentSource::FromLocationReferenceTag ? 0.6 : 0.25;
   if (pathDiffRatio <= kMinValidPathDiffRation && !shortPath)
     return false;
 
@@ -126,21 +122,20 @@ bool ValidatePathByLength(Graph::EdgeVector const & path, double distanceToNextP
 
 bool AreEdgesEqualWithoutAltitude(Graph::Edge const & e1, Graph::Edge const & e2)
 {
-  return make_tuple(e1.GetType(), e1.GetFeatureId(), e1.IsForward(), e1.GetSegId(),
-                    e1.GetStartPoint(), e1.GetEndPoint()) ==
-         make_tuple(e2.GetType(), e2.GetFeatureId(), e2.IsForward(), e2.GetSegId(),
-                    e2.GetStartPoint(), e2.GetEndPoint());
+  return make_tuple(e1.GetType(), e1.GetFeatureId(), e1.IsForward(), e1.GetSegId(), e1.GetStartPoint(),
+                    e1.GetEndPoint()) == make_tuple(e2.GetType(), e2.GetFeatureId(), e2.IsForward(), e2.GetSegId(),
+                                                    e2.GetStartPoint(), e2.GetEndPoint());
 }
 }  // namespace
 
 ScorePathsConnector::ScorePathsConnector(Graph & graph, RoadInfoGetter & infoGetter, v2::Stats & stat)
-  : m_graph(graph), m_infoGetter(infoGetter), m_stat(stat)
-{
-}
+  : m_graph(graph)
+  , m_infoGetter(infoGetter)
+  , m_stat(stat)
+{}
 
 bool ScorePathsConnector::FindBestPath(vector<LocationReferencePoint> const & points,
-                                       vector<vector<ScorePath>> const & lineCandidates,
-                                       LinearSegmentSource source,
+                                       vector<vector<ScorePath>> const & lineCandidates, LinearSegmentSource source,
                                        vector<Graph::EdgeVector> & resultPath)
 {
   CHECK_NOT_EQUAL(source, LinearSegmentSource::NotValid, ());
@@ -166,9 +161,8 @@ bool ScorePathsConnector::FindBestPath(vector<LocationReferencePoint> const & po
       for (size_t toInd = 0; toInd < toCandidates.size(); ++toInd)
       {
         Graph::EdgeVector path;
-        if (!ConnectAdjacentCandidateLines(fromCandidates[fromInd].m_path,
-                                           toCandidates[toInd].m_path, source, point.m_lfrcnp,
-                                           distanceToNextPoint, path))
+        if (!ConnectAdjacentCandidateLines(fromCandidates[fromInd].m_path, toCandidates[toInd].m_path, source,
+                                           point.m_lfrcnp, distanceToNextPoint, path))
         {
           continue;
         }
@@ -177,8 +171,8 @@ bool ScorePathsConnector::FindBestPath(vector<LocationReferencePoint> const & po
         if (!ValidatePathByLength(path, distanceToNextPoint, source, pathLenScore))
           continue;
 
-        auto const score = pathLenScore + GetScoreForUniformity(path) +
-                           fromCandidates[fromInd].m_score + toCandidates[toInd].m_score;
+        auto const score =
+            pathLenScore + GetScoreForUniformity(path) + fromCandidates[fromInd].m_score + toCandidates[toInd].m_score;
         result.emplace_back(score, std::move(path));
       }
     }
@@ -194,9 +188,8 @@ bool ScorePathsConnector::FindBestPath(vector<LocationReferencePoint> const & po
       return false;
     }
 
-    auto const it = max_element(
-        result.cbegin(), result.cend(),
-        [](ScorePath const & o1, ScorePath const & o2) { return o1.m_score < o2.m_score; });
+    auto const it = max_element(result.cbegin(), result.cend(),
+                                [](ScorePath const & o1, ScorePath const & o2) { return o1.m_score < o2.m_score; });
 
     // Note. In case of source == LinearSegmentSource::FromCoordinatesTag there is less
     // information about a openlr segment so less score is collected.
@@ -217,10 +210,9 @@ bool ScorePathsConnector::FindBestPath(vector<LocationReferencePoint> const & po
   return true;
 }
 
-bool ScorePathsConnector::FindShortestPath(Graph::Edge const & from, Graph::Edge const & to,
-                                           LinearSegmentSource source,
-                                           FunctionalRoadClass lowestFrcToNextPoint,
-                                           uint32_t maxPathLength, Graph::EdgeVector & path)
+bool ScorePathsConnector::FindShortestPath(Graph::Edge const & from, Graph::Edge const & to, LinearSegmentSource source,
+                                           FunctionalRoadClass lowestFrcToNextPoint, uint32_t maxPathLength,
+                                           Graph::EdgeVector & path)
 {
   double constexpr kLengthToleranceFactor = 1.1;
   uint32_t constexpr kMinLengthTolerance = 20;
@@ -231,10 +223,7 @@ bool ScorePathsConnector::FindShortestPath(Graph::Edge const & from, Graph::Edge
   {
     State(Graph::Edge const & e, uint32_t const s) : m_edge(e), m_score(s) {}
 
-    bool operator>(State const & o) const
-    {
-      return tie(m_score, m_edge) > tie(o.m_score, o.m_edge);
-    }
+    bool operator>(State const & o) const { return tie(m_score, m_edge) > tie(o.m_score, o.m_edge); }
 
     Graph::Edge m_edge;
     uint32_t m_score;
@@ -300,12 +289,10 @@ bool ScorePathsConnector::FindShortestPath(Graph::Edge const & from, Graph::Edge
   return false;
 }
 
-bool ScorePathsConnector::ConnectAdjacentCandidateLines(Graph::EdgeVector const & from,
-                                                        Graph::EdgeVector const & to,
+bool ScorePathsConnector::ConnectAdjacentCandidateLines(Graph::EdgeVector const & from, Graph::EdgeVector const & to,
                                                         LinearSegmentSource source,
                                                         FunctionalRoadClass lowestFrcToNextPoint,
-                                                        double distanceToNextPoint,
-                                                        Graph::EdgeVector & resultPath)
+                                                        double distanceToNextPoint, Graph::EdgeVector & resultPath)
 {
   CHECK(!to.empty(), ());
 
@@ -322,9 +309,8 @@ bool ScorePathsConnector::ConnectAdjacentCandidateLines(Graph::EdgeVector const
   CHECK_NOT_EQUAL(from, to, ());
 
   Graph::EdgeVector shortestPath;
-  auto const found =
-      FindShortestPath(from.back(), to.front(), source, lowestFrcToNextPoint,
-                       static_cast<uint32_t>(ceil(distanceToNextPoint)), shortestPath);
+  auto const found = FindShortestPath(from.back(), to.front(), source, lowestFrcToNextPoint,
+                                      static_cast<uint32_t>(ceil(distanceToNextPoint)), shortestPath);
   if (!found)
     return false;
 
@@ -332,8 +318,7 @@ bool ScorePathsConnector::ConnectAdjacentCandidateLines(Graph::EdgeVector const
   resultPath.insert(resultPath.end(), from.cbegin(), prev(from.cend()));
   resultPath.insert(resultPath.end(), shortestPath.cbegin(), shortestPath.cend());
 
-  CHECK(AreEdgesEqualWithoutAltitude(to.front(), shortestPath.back()),
-        (to.front(), shortestPath.back()));
+  CHECK(AreEdgesEqualWithoutAltitude(to.front(), shortestPath.back()), (to.front(), shortestPath.back()));
   resultPath.insert(resultPath.end(), next(to.begin()), to.end());
 
   return !resultPath.empty();
@@ -348,17 +333,16 @@ Score ScorePathsConnector::GetScoreForUniformity(Graph::EdgeVector const & path)
   auto const hwClassDiff = edgeContainer.GetHighwayClassDiff();
   Score constexpr kScoreForTheSameHwClass = 40;
   Score constexpr kScoreForNeighboringHwClasses = 15;
-  Score const hwClassScore = hwClassDiff == 0
-                             ? kScoreForTheSameHwClass
-                             : hwClassDiff == 1 ? kScoreForNeighboringHwClasses : 0;
+  Score const hwClassScore = hwClassDiff == 0 ? kScoreForTheSameHwClass
+                           : hwClassDiff == 1 ? kScoreForNeighboringHwClasses
+                                              : 0;
 
   Score constexpr kScoreForOneWayOnly = 17;
   Score constexpr kScoreForRoundaboutOnly = 18;
   Score constexpr kScoreForLinkOnly = 10;
-  Score const allEqualScore =
-      (edgeContainer.AreAllOneWaysEqual() ? kScoreForOneWayOnly : 0) +
-      (edgeContainer.AreAllRoundaboutEqual() ? kScoreForRoundaboutOnly : 0) +
-      (edgeContainer.AreAllLinksEqual() ? kScoreForLinkOnly : 0);
+  Score const allEqualScore = (edgeContainer.AreAllOneWaysEqual() ? kScoreForOneWayOnly : 0) +
+                              (edgeContainer.AreAllRoundaboutEqual() ? kScoreForRoundaboutOnly : 0) +
+                              (edgeContainer.AreAllLinksEqual() ? kScoreForLinkOnly : 0);
 
   return hwClassScore + allEqualScore;
 }
diff --git a/tools/openlr/score_paths_connector.hpp b/tools/openlr/score_paths_connector.hpp
index 5561ceab9..f144eee68 100644
--- a/tools/openlr/score_paths_connector.hpp
+++ b/tools/openlr/score_paths_connector.hpp
@@ -21,18 +21,15 @@ public:
   /// if there's a good enough.
   /// \returns true if the best path is found and false otherwise.
   bool FindBestPath(std::vector<LocationReferencePoint> const & points,
-                    std::vector<std::vector<ScorePath>> const & lineCandidates,
-                    LinearSegmentSource source,
+                    std::vector<std::vector<ScorePath>> const & lineCandidates, LinearSegmentSource source,
                     std::vector<Graph::EdgeVector> & resultPath);
 
 private:
-  bool FindShortestPath(Graph::Edge const & from, Graph::Edge const & to,
-                        LinearSegmentSource source, FunctionalRoadClass lowestFrcToNextPoint,
-                        uint32_t maxPathLength, Graph::EdgeVector & path);
+  bool FindShortestPath(Graph::Edge const & from, Graph::Edge const & to, LinearSegmentSource source,
+                        FunctionalRoadClass lowestFrcToNextPoint, uint32_t maxPathLength, Graph::EdgeVector & path);
 
   bool ConnectAdjacentCandidateLines(Graph::EdgeVector const & from, Graph::EdgeVector const & to,
-                                     LinearSegmentSource source,
-                                     FunctionalRoadClass lowestFrcToNextPoint,
+                                     LinearSegmentSource source, FunctionalRoadClass lowestFrcToNextPoint,
                                      double distanceToNextPoint, Graph::EdgeVector & resultPath);
 
   Score GetScoreForUniformity(Graph::EdgeVector const & path);
diff --git a/tools/openlr/score_types.hpp b/tools/openlr/score_types.hpp
index b254e8365..5d5ab4339 100644
--- a/tools/openlr/score_types.hpp
+++ b/tools/openlr/score_types.hpp
@@ -20,15 +20,9 @@ struct ScorePoint
   ScorePoint() = default;
   ScorePoint(Score score, m2::PointD const & point) : m_score(score), m_point(point) {}
 
-  bool operator<(ScorePoint const & o) const
-  {
-    return std::tie(m_score, m_point) < std::tie(o.m_score, o.m_point);
-  }
+  bool operator<(ScorePoint const & o) const { return std::tie(m_score, m_point) < std::tie(o.m_score, o.m_point); }
 
-  bool operator==(ScorePoint const & o) const
-  {
-    return m_score == o.m_score && m_point == o.m_point;
-  }
+  bool operator==(ScorePoint const & o) const { return m_score == o.m_score && m_point == o.m_point; }
 
   Score m_score = 0;
   m2::PointD m_point;
diff --git a/tools/openlr/stats.hpp b/tools/openlr/stats.hpp
index 4f42a1116..bdb121b2b 100644
--- a/tools/openlr/stats.hpp
+++ b/tools/openlr/stats.hpp
@@ -44,5 +44,5 @@ struct alignas(kCacheLineSize) Stats
   // Number of zeroed distance-to-next point values in the input.
   uint32_t m_zeroDistToNextPointCount = 0;
 };
-}  // namespace V2
+}  // namespace v2
 }  // namespace openlr
diff --git a/tools/openlr/way_point.hpp b/tools/openlr/way_point.hpp
index 5b48b65ed..e296a6ebd 100644
--- a/tools/openlr/way_point.hpp
+++ b/tools/openlr/way_point.hpp
@@ -16,8 +16,7 @@ struct WayPoint final
     , m_distanceToNextPointM(lrp.m_distanceToNextPoint)
     , m_bearing(lrp.m_bearing)
     , m_lfrcnp(lrp.m_functionalRoadClass)
-  {
-  }
+  {}
 
   m2::PointD m_point;
   double m_distanceToNextPointM = 0.0;
diff --git a/tools/poly_borders/borders_data.cpp b/tools/poly_borders/borders_data.cpp
index 1db26cc4c..1870194b2 100644
--- a/tools/poly_borders/borders_data.cpp
+++ b/tools/poly_borders/borders_data.cpp
@@ -50,8 +50,7 @@ bool IsReversedIntervals(size_t fromDst, size_t toDst, size_t fromSrc, size_t to
   return (fromDst > toDst) != (fromSrc > toSrc);
 }
 
-std::vector<m2::PointD> AppendPointsWithAnyDirection(std::vector<MarkedPoint> const & copyFrom,
-                                                     size_t from, size_t to)
+std::vector<m2::PointD> AppendPointsWithAnyDirection(std::vector<MarkedPoint> const & copyFrom, size_t from, size_t to)
 {
   std::vector<m2::PointD> result;
   if (from > to)
@@ -63,16 +62,14 @@ std::vector<m2::PointD> AppendPointsWithAnyDirection(std::vector<MarkedPoint> co
   return result;
 }
 
-double AbsAreaDiff(std::vector<m2::PointD> const & firstPolygon,
-                   std::vector<m2::PointD> const & secondPolygon)
+double AbsAreaDiff(std::vector<m2::PointD> const & firstPolygon, std::vector<m2::PointD> const & secondPolygon)
 {
   auto const firstArea = generator::AreaOnEarth(firstPolygon);
   auto const secondArea = generator::AreaOnEarth(secondPolygon);
   return std::abs(secondArea - firstArea);
 }
 
-bool NeedReplace(std::vector<m2::PointD> const & curSubpolygon,
-                 std::vector<m2::PointD> const & anotherSubpolygon)
+bool NeedReplace(std::vector<m2::PointD> const & curSubpolygon, std::vector<m2::PointD> const & anotherSubpolygon)
 {
   auto const areaDiff = AbsAreaDiff(curSubpolygon, anotherSubpolygon);
   double constexpr kMaxAreaDiffMetersSquared = 20000.0;
@@ -195,7 +192,7 @@ void BordersData::Init(std::string const & bordersDir)
 void BordersData::DumpPolyFiles(std::string const & targetDir)
 {
   size_t n = m_bordersPolygons.size();
-  for (size_t i = 0; i < n; )
+  for (size_t i = 0; i < n;)
   {
     // Russia_Moscow.poly1 -> Russia_Moscow.poly
     auto name = RemoveIndexFromMwmName(m_indexToPolyFileName.at(i));
@@ -270,11 +267,9 @@ void BordersData::PrintDiff()
   CHECK_NOT_EQUAL(allNumberBeforeCount, 0, ("Empty input?"));
   std::cout << "Number of removed points: " << m_removedPointsCount << std::endl
             << "Removed duplicate point: " << m_duplicatedPointsCount << std::endl
-            << "Total removed points: " << m_removedPointsCount + m_duplicatedPointsCount
-            << std::endl;
+            << "Total removed points: " << m_removedPointsCount + m_duplicatedPointsCount << std::endl;
   std::cout << "Points number before processing: " << allNumberBeforeCount << ", remove( "
-            << static_cast<double>(m_removedPointsCount + m_duplicatedPointsCount) /
-                   allNumberBeforeCount * 100.0
+            << static_cast<double>(m_removedPointsCount + m_duplicatedPointsCount) / allNumberBeforeCount * 100.0
             << "% )" << std::endl;
 }
 
@@ -298,8 +293,8 @@ void BordersData::RemoveEmptySpaceBetweenBorders()
       size_t constexpr kMaxLookAhead = 5;
       for (size_t shift = 1; shift <= kMaxLookAhead; ++shift)
       {
-        if (TryToReplace(curBorderId, curPointId /* curLeftPointId */,
-                         curPointId + shift /* curRightPointId */) == base::ControlFlow::Break)
+        if (TryToReplace(curBorderId, curPointId /* curLeftPointId */, curPointId + shift /* curRightPointId */) ==
+            base::ControlFlow::Break)
         {
           break;
         }
@@ -310,8 +305,7 @@ void BordersData::RemoveEmptySpaceBetweenBorders()
   DoReplace();
 }
 
-base::ControlFlow BordersData::TryToReplace(size_t curBorderId, size_t & curLeftPointId,
-                                            size_t curRightPointId)
+base::ControlFlow BordersData::TryToReplace(size_t curBorderId, size_t & curLeftPointId, size_t curRightPointId)
 {
   auto & curPolygon = m_bordersPolygons[curBorderId];
   if (curRightPointId >= curPolygon.m_points.size())
@@ -348,10 +342,9 @@ base::ControlFlow BordersData::TryToReplace(size_t curBorderId, size_t & curLeft
   }
 
   auto const anotherSubpolygon =
-     AppendPointsWithAnyDirection(anotherPolygon.m_points, anotherLeftPointId, anotherRightPointId);
+      AppendPointsWithAnyDirection(anotherPolygon.m_points, anotherLeftPointId, anotherRightPointId);
 
-  auto const curSubpolygon =
-     AppendPointsWithAnyDirection(curPolygon.m_points, curLeftPointId, curRightPointId);
+  auto const curSubpolygon = AppendPointsWithAnyDirection(curPolygon.m_points, curLeftPointId, curRightPointId);
 
   if (!NeedReplace(curSubpolygon, anotherSubpolygon))
     return base::ControlFlow::Break;
@@ -361,26 +354,25 @@ base::ControlFlow BordersData::TryToReplace(size_t curBorderId, size_t & curLeft
   bool const curLenIsLess = curSubpolygon.size() < anotherSubpolygon.size();
 
   size_t dstFrom = curLenIsLess ? anotherLeftPointId : curLeftPointId;
-  size_t dstTo   = curLenIsLess ? anotherRightPointId : curRightPointId;
+  size_t dstTo = curLenIsLess ? anotherRightPointId : curRightPointId;
 
-  size_t srcFrom = curLenIsLess ? curLeftPointId  : anotherLeftPointId;
-  size_t srcTo   = curLenIsLess ? curRightPointId : anotherRightPointId;
+  size_t srcFrom = curLenIsLess ? curLeftPointId : anotherLeftPointId;
+  size_t srcTo = curLenIsLess ? curRightPointId : anotherRightPointId;
 
   size_t const borderIdWhereAreaWillBeChanged = curLenIsLess ? anotherBorderId : curBorderId;
   size_t const srcBorderId = curLenIsLess ? curBorderId : anotherBorderId;
 
   bool const reversed = IsReversedIntervals(dstFrom, dstTo, srcFrom, srcTo);
 
-  m_additionalAreaMetersSqr[borderIdWhereAreaWillBeChanged] +=
-      AbsAreaDiff(curSubpolygon, anotherSubpolygon);
+  m_additionalAreaMetersSqr[borderIdWhereAreaWillBeChanged] += AbsAreaDiff(curSubpolygon, anotherSubpolygon);
 
   SwapIfNeeded(dstFrom, dstTo);
   SwapIfNeeded(srcFrom, srcTo);
 
   // Save info for |borderIdWhereAreaWillBeChanged| - where from it should gets info about
   // replacement.
-  m_bordersPolygons[borderIdWhereAreaWillBeChanged].AddReplaceInfo(
-      dstFrom, dstTo, srcFrom, srcTo, srcBorderId, reversed);
+  m_bordersPolygons[borderIdWhereAreaWillBeChanged].AddReplaceInfo(dstFrom, dstTo, srcFrom, srcTo, srcBorderId,
+                                                                   reversed);
 
   // And say for |srcBorderId| that points in segment: [srcFrom, srcTo] are frozen and cannot
   // be used anywhere (because we use them to replace points in segment: [dstFrom, dstTo]).
diff --git a/tools/poly_borders/borders_data.hpp b/tools/poly_borders/borders_data.hpp
index fbd4c0c27..d24652495 100644
--- a/tools/poly_borders/borders_data.hpp
+++ b/tools/poly_borders/borders_data.hpp
@@ -30,12 +30,10 @@ private:
   /// points and leaves only unique.
   size_t RemoveDuplicatePoints();
 
-  template <class PointsT> static size_t RemoveDuplicatingPointImpl(PointsT & points)
+  template <class PointsT>
+  static size_t RemoveDuplicatingPointImpl(PointsT & points)
   {
-    auto const equalFn = [](auto const & p1, auto const & p2)
-    {
-      return p1.EqualDxDy(p2, kEqualityEpsilon);
-    };
+    auto const equalFn = [](auto const & p1, auto const & p2) { return p1.EqualDxDy(p2, kEqualityEpsilon); };
 
     auto const last = std::unique(points.begin(), points.end(), equalFn);
     size_t count = std::distance(last, points.end());
@@ -53,8 +51,7 @@ private:
   /// \brief Checks whether we can replace points from segment: [curLeftPointId, curRightPointId]
   /// of |curBorderId| to points from another border in order to get rid of empty space
   /// between curBorder and anotherBorder.
-  base::ControlFlow TryToReplace(size_t curBorderId, size_t & curLeftPointId,
-                                 size_t curRightPointId);
+  base::ControlFlow TryToReplace(size_t curBorderId, size_t & curLeftPointId, size_t curRightPointId);
 
   bool HasLinkAt(size_t curBorderId, size_t pointId);
 
diff --git a/tools/poly_borders/help_structures.cpp b/tools/poly_borders/help_structures.cpp
index bb4ace554..1cefb3dc9 100644
--- a/tools/poly_borders/help_structures.cpp
+++ b/tools/poly_borders/help_structures.cpp
@@ -57,8 +57,7 @@ bool Polygon::IsFrozen(size_t a, size_t b) const
   return m_replaced.Intersects(a, b);
 }
 
-void Polygon::AddReplaceInfo(size_t dstFrom, size_t dstTo,
-                             size_t srcFrom, size_t srcTo, size_t srcBorderId,
+void Polygon::AddReplaceInfo(size_t dstFrom, size_t dstTo, size_t srcFrom, size_t srcTo, size_t srcBorderId,
                              bool reversed)
 {
   CHECK_LESS_OR_EQUAL(dstFrom, dstTo, ());
@@ -73,10 +72,8 @@ void Polygon::AddReplaceInfo(size_t dstFrom, size_t dstTo,
 std::set<ReplaceData>::const_iterator Polygon::FindReplaceData(size_t index)
 {
   for (auto it = m_replaceData.cbegin(); it != m_replaceData.cend(); ++it)
-  {
     if (it->m_dstFrom <= index && index <= it->m_dstTo)
       return it;
-  }
 
   return m_replaceData.cend();
 }
diff --git a/tools/poly_borders/help_structures.hpp b/tools/poly_borders/help_structures.hpp
index dd327ee14..edeb073a7 100644
--- a/tools/poly_borders/help_structures.hpp
+++ b/tools/poly_borders/help_structures.hpp
@@ -31,14 +31,15 @@ struct Link
 /// \note Using next semantic here: [replaceFrom, replaceTo], [replaceFromSrc, replaceToSrc].
 struct ReplaceData
 {
-  ReplaceData(size_t replaceFrom, size_t replaceTo, size_t replaceFromSrc, size_t replaceToSrc,
-              size_t borderIdSrc, bool reversed)
+  ReplaceData(size_t replaceFrom, size_t replaceTo, size_t replaceFromSrc, size_t replaceToSrc, size_t borderIdSrc,
+              bool reversed)
     : m_dstFrom(replaceFrom)
     , m_dstTo(replaceTo)
     , m_srcReplaceFrom(replaceFromSrc)
     , m_srcReplaceTo(replaceToSrc)
     , m_srcBorderId(borderIdSrc)
-    , m_reversed(reversed) {}
+    , m_reversed(reversed)
+  {}
 
   bool operator<(ReplaceData const & rhs) const;
 
@@ -62,10 +63,7 @@ struct MarkedPoint
 
   std::optional<Link> GetLink(size_t curBorderId) const;
 
-  bool EqualDxDy(MarkedPoint const & p, double eps) const
-  {
-    return m_point.EqualDxDy(p.m_point, eps);
-  }
+  bool EqualDxDy(MarkedPoint const & p, double eps) const { return m_point.EqualDxDy(p.m_point, eps); }
 
   m2::PointD m_point;
   std::set<Link> m_links;
@@ -78,10 +76,7 @@ struct Polygon
   {
     m_points.assign(points.begin(), points.end());
   }
-  Polygon(m2::RectD const & rect, std::vector<MarkedPoint> && points)
-    : m_rect(rect), m_points(std::move(points))
-  {
-  }
+  Polygon(m2::RectD const & rect, std::vector<MarkedPoint> && points) : m_rect(rect), m_points(std::move(points)) {}
 
   Polygon(Polygon &&) = default;
   Polygon & operator=(Polygon &&) noexcept = default;
@@ -93,9 +88,8 @@ struct Polygon
   // @}
 
   // [replaceFrom, replaceTo], [replaceFromSrc, replaceToSrc]
-  void AddReplaceInfo(size_t replaceFrom, size_t replaceTo,
-                      size_t replaceFromSrc, size_t replaceToSrc, size_t borderIdSrc,
-                      bool reversed);
+  void AddReplaceInfo(size_t replaceFrom, size_t replaceTo, size_t replaceFromSrc, size_t replaceToSrc,
+                      size_t borderIdSrc, bool reversed);
 
   std::set<ReplaceData>::const_iterator FindReplaceData(size_t index);
 
diff --git a/tools/poly_borders/poly_borders_tests/mark_points_tests.cpp b/tools/poly_borders/poly_borders_tests/mark_points_tests.cpp
index 4620ef879..1a18dddf7 100644
--- a/tools/poly_borders/poly_borders_tests/mark_points_tests.cpp
+++ b/tools/poly_borders/poly_borders_tests/mark_points_tests.cpp
@@ -39,12 +39,10 @@ void CheckByMask(Polygon const & polygons, vector<bool> markedMask)
 {
   CHECK_EQUAL(polygons.m_points.size(), markedMask.size(), ());
   for (size_t i = 0; i < polygons.m_points.size(); ++i)
-  {
     if (markedMask[i])
       TestMarked(polygons, i);
     else
       TestNotMarked(polygons, i);
-  }
 }
 
 UNIT_TEST(PolyBordersPostprocessor_MarkPoints_1)
@@ -55,21 +53,13 @@ UNIT_TEST(PolyBordersPostprocessor_MarkPoints_1)
   m2::PointD a(-1.0, -1.0);
   m2::PointD b(-1.0, 1.0);
 
-  vector<vector<m2::PointD>> polygons1 = {
-      {a, b, {1.0, 1.0}, {1.0, -1.0}}
-  };
+  vector<vector<m2::PointD>> polygons1 = {{a, b, {1.0, 1.0}, {1.0, -1.0}}};
 
-  vector<vector<bool>> markedMask1 = {
-      {true, true, false, false}
-  };
+  vector<vector<bool>> markedMask1 = {{true, true, false, false}};
 
-  vector<vector<m2::PointD>> polygons2 = {
-      {a, b, {2.0, 1.0}, {5.0, -1.0}}
-  };
+  vector<vector<m2::PointD>> polygons2 = {{a, b, {2.0, 1.0}, {5.0, -1.0}}};
 
-  vector<vector<bool>> markedMask2 = {
-      {true, true, false, false}
-  };
+  vector<vector<bool>> markedMask2 = {{true, true, false, false}};
 
   vector<shared_ptr<ScopedFile>> files;
   files.emplace_back(CreatePolyBorderFileByPolygon(kTestDir, "First", polygons1));
@@ -90,21 +80,13 @@ UNIT_TEST(PolyBordersPostprocessor_MarkPoints_2)
   ScopedDir const scopedDir(kTestDir);
   string const & bordersDir = scopedDir.GetFullPath();
 
-  vector<vector<m2::PointD>> polygons1 = {
-      {{-1.0, -1.0}, {-1.0, 1.0}, {1.0, 1.0}, {1.0, -1.0}}
-  };
+  vector<vector<m2::PointD>> polygons1 = {{{-1.0, -1.0}, {-1.0, 1.0}, {1.0, 1.0}, {1.0, -1.0}}};
 
-  vector<vector<bool>> markedMask1 = {
-      {false, false, false, false}
-  };
+  vector<vector<bool>> markedMask1 = {{false, false, false, false}};
 
-  vector<vector<m2::PointD>> polygons2 = {
-      {{-12.0, -1.0}, {-10.0, 1.0}, {2.0, 1.0}, {5.0, -1.0}}
-  };
+  vector<vector<m2::PointD>> polygons2 = {{{-12.0, -1.0}, {-10.0, 1.0}, {2.0, 1.0}, {5.0, -1.0}}};
 
-  vector<vector<bool>> markedMask2 = {
-      {false, false, false, false}
-  };
+  vector<vector<bool>> markedMask2 = {{false, false, false, false}};
 
   vector<shared_ptr<ScopedFile>> files;
   files.emplace_back(CreatePolyBorderFileByPolygon(kTestDir, "First", polygons1));
@@ -132,37 +114,21 @@ UNIT_TEST(PolyBordersPostprocessor_MarkPoints_3)
   m2::PointD e(-4.0, 2.0);
   m2::PointD f(-1.0, 4.0);
 
-  vector<vector<m2::PointD>> polygons1 = {
-      {a, b, c, {1.0, -3.0}, d}
-  };
+  vector<vector<m2::PointD>> polygons1 = {{a, b, c, {1.0, -3.0}, d}};
 
-  vector<vector<bool>> markedMask1 = {
-      {true, true, true, false, true}
-  };
+  vector<vector<bool>> markedMask1 = {{true, true, true, false, true}};
 
-  vector<vector<m2::PointD>> polygons2 = {
-      {b, f, {2.0, 5.0}, {6.0, 3.0}, c}
-  };
+  vector<vector<m2::PointD>> polygons2 = {{b, f, {2.0, 5.0}, {6.0, 3.0}, c}};
 
-  vector<vector<bool>> markedMask2 = {
-      {true, true, false, false, true}
-  };
+  vector<vector<bool>> markedMask2 = {{true, true, false, false, true}};
 
-  vector<vector<m2::PointD>> polygons3 = {
-      {a, b, f, {-3.0, 4.0}, e}
-  };
+  vector<vector<m2::PointD>> polygons3 = {{a, b, f, {-3.0, 4.0}, e}};
 
-  vector<vector<bool>> markedMask3 = {
-      {true, true, true, false, true}
-  };
+  vector<vector<bool>> markedMask3 = {{true, true, true, false, true}};
 
-  vector<vector<m2::PointD>> polygons4 = {
-      {a, e, {-3.0, -1.0}, d}
-  };
+  vector<vector<m2::PointD>> polygons4 = {{a, e, {-3.0, -1.0}, d}};
 
-  vector<vector<bool>> markedMask4 = {
-      {true, true, false, true}
-  };
+  vector<vector<bool>> markedMask4 = {{true, true, false, true}};
 
   vector<shared_ptr<ScopedFile>> files;
   files.emplace_back(CreatePolyBorderFileByPolygon(kTestDir, "First", polygons1));
@@ -194,23 +160,14 @@ UNIT_TEST(PolyBordersPostprocessor_MarkPoints_4)
   m2::PointD a(6.0, 2.0);
   m2::PointD b(6.0, 4.0);
 
-  vector<vector<m2::PointD>> polygons1 = {
-      {{-2.0, -2.0}, {-2.0, 2.0}, {2.0, 2.0}, {2.0, -2.0}},
-      {{4.0, 2.0}, {4.0, 4.0}, a, b}
-  };
+  vector<vector<m2::PointD>> polygons1 = {{{-2.0, -2.0}, {-2.0, 2.0}, {2.0, 2.0}, {2.0, -2.0}},
+                                          {{4.0, 2.0}, {4.0, 4.0}, a, b}};
 
-  vector<vector<bool>> markedMask1 = {
-      {false, false, false, false},
-      {false, false, true, true}
-  };
+  vector<vector<bool>> markedMask1 = {{false, false, false, false}, {false, false, true, true}};
 
-  vector<vector<m2::PointD>> polygons2 = {
-      {a, b, {8.0, 6.0}, {8.0, 0.0}}
-  };
+  vector<vector<m2::PointD>> polygons2 = {{a, b, {8.0, 6.0}, {8.0, 0.0}}};
 
-  vector<vector<bool>> markedMask2 = {
-      {true, true, false, false}
-  };
+  vector<vector<bool>> markedMask2 = {{true, true, false, false}};
 
   vector<shared_ptr<ScopedFile>> files;
   files.emplace_back(CreatePolyBorderFileByPolygon(kTestDir, "First", polygons1));
@@ -219,10 +176,12 @@ UNIT_TEST(PolyBordersPostprocessor_MarkPoints_4)
   BordersData bordersData;
   bordersData.Init(bordersDir);
 
-  auto const & firstBordersPolygon1 = bordersData.GetBordersPolygonByName("First" + BordersData::kBorderExtension + "1");
+  auto const & firstBordersPolygon1 =
+      bordersData.GetBordersPolygonByName("First" + BordersData::kBorderExtension + "1");
   CheckByMask(firstBordersPolygon1, markedMask1[0]);
 
-  auto const & secondBordersPolygon1 = bordersData.GetBordersPolygonByName("First" + BordersData::kBorderExtension + "2");
+  auto const & secondBordersPolygon1 =
+      bordersData.GetBordersPolygonByName("First" + BordersData::kBorderExtension + "2");
   CheckByMask(secondBordersPolygon1, markedMask1[1]);
 
   auto const & bordersPolygon2 = bordersData.GetBordersPolygonByName("Second" + BordersData::kBorderExtension + "1");
diff --git a/tools/poly_borders/poly_borders_tests/remove_empty_spaces_tests.cpp b/tools/poly_borders/poly_borders_tests/remove_empty_spaces_tests.cpp
index 6d036349d..a5237a0da 100644
--- a/tools/poly_borders/poly_borders_tests/remove_empty_spaces_tests.cpp
+++ b/tools/poly_borders/poly_borders_tests/remove_empty_spaces_tests.cpp
@@ -40,8 +40,7 @@ bool ConsistsOf(Polygon const & polygon, vector<m2::PointD> const & points)
     for (size_t i = 0; i < polygon.m_points.size(); ++i)
     {
       static double constexpr kEps = 1e-5;
-      if (AlmostEqualAbs(point, polygon.m_points[i].m_point, kEps) &&
-          used.count(i) == 0)
+      if (AlmostEqualAbs(point, polygon.m_points[i].m_point, kEps) && used.count(i) == 0)
       {
         used.emplace(i);
         break;
@@ -63,13 +62,9 @@ UNIT_TEST(PolyBordersPostprocessor_RemoveEmptySpaces_1)
   m2::PointD d(3.0, 0.0);
   m2::PointD e(4.0, 0.0);
 
-  vector<vector<m2::PointD>> polygons1 = {
-    {a, b, c, d, e}
-  };
+  vector<vector<m2::PointD>> polygons1 = {{a, b, c, d, e}};
 
-  vector<vector<m2::PointD>> polygons2 = {
-    {a, b, c, d, e}
-  };
+  vector<vector<m2::PointD>> polygons2 = {{a, b, c, d, e}};
 
   vector<shared_ptr<ScopedFile>> files;
   files.emplace_back(CreatePolyBorderFileByPolygon(kTestDir, "First", polygons1));
@@ -99,13 +94,9 @@ UNIT_TEST(PolyBordersPostprocessor_RemoveEmptySpaces_2)
   m2::PointD e(4.0, 0.0);
 
   // Point |c| is absent from polygons2, algorithm should remove |c| from polygon1.
-  vector<vector<m2::PointD>> polygons1 = {
-      {a, b, c, d, e}
-  };
+  vector<vector<m2::PointD>> polygons1 = {{a, b, c, d, e}};
 
-  vector<vector<m2::PointD>> polygons2 = {
-      {a, b, d, e}
-  };
+  vector<vector<m2::PointD>> polygons2 = {{a, b, d, e}};
 
   vector<shared_ptr<ScopedFile>> files;
   files.emplace_back(CreatePolyBorderFileByPolygon(kTestDir, "First", polygons1));
@@ -138,13 +129,9 @@ UNIT_TEST(PolyBordersPostprocessor_RemoveEmptySpaces_3)
   m2::PointD f(5.0, 0.0);
 
   // Point |c| and |d| is absent from polygons2, algorithm should remove |c| from polygon1.
-  vector<vector<m2::PointD>> polygons1 = {
-      {a, b, c, d, e, f}
-  };
+  vector<vector<m2::PointD>> polygons1 = {{a, b, c, d, e, f}};
 
-  vector<vector<m2::PointD>> polygons2 = {
-      {a, b, e, f}
-  };
+  vector<vector<m2::PointD>> polygons2 = {{a, b, e, f}};
 
   vector<shared_ptr<ScopedFile>> files;
   files.emplace_back(CreatePolyBorderFileByPolygon(kTestDir, "First", polygons1));
@@ -172,13 +159,9 @@ UNIT_TEST(PolyBordersPostprocessor_RemoveEmptySpaces_4)
   m2::PointD d(4.0, 0.0);
   m2::PointD e(5.0, 0.0);
 
-  vector<vector<m2::PointD>> polygons1 = {
-      {a, b, c, d, e}
-  };
+  vector<vector<m2::PointD>> polygons1 = {{a, b, c, d, e}};
 
-  vector<vector<m2::PointD>> polygons2 = {
-      {a, b, d, e}
-  };
+  vector<vector<m2::PointD>> polygons2 = {{a, b, d, e}};
 
   vector<shared_ptr<ScopedFile>> files;
   files.emplace_back(CreatePolyBorderFileByPolygon(kTestDir, "First", polygons1));
@@ -210,13 +193,9 @@ UNIT_TEST(PolyBordersPostprocessor_RemoveEmptySpaces_5)
   m2::PointD c2(c1 + kSmallPointShift);
   m2::PointD d2(d1 + kSmallPointShift);
 
-  vector<vector<m2::PointD>> polygons1 = {
-      {a, c1, d1, e1, b}
-  };
+  vector<vector<m2::PointD>> polygons1 = {{a, c1, d1, e1, b}};
 
-  vector<vector<m2::PointD>> polygons2 = {
-      {a, c2, d2, b}
-  };
+  vector<vector<m2::PointD>> polygons2 = {{a, c2, d2, b}};
 
   vector<shared_ptr<ScopedFile>> files;
   files.emplace_back(CreatePolyBorderFileByPolygon(kTestDir, "First", polygons1));
@@ -244,13 +223,9 @@ UNIT_TEST(PolyBordersPostprocessor_RemoveEmptySpaces_6)
   m2::PointD d(4.0, 0.0);
   m2::PointD e(5.0, 0.0);
 
-  vector<vector<m2::PointD>> polygons1 = {
-      {a, b, c, d, d, d, e, e, e}
-  };
+  vector<vector<m2::PointD>> polygons1 = {{a, b, c, d, d, d, e, e, e}};
 
-  vector<vector<m2::PointD>> polygons2 = {
-      {a, d, d, d, e}
-  };
+  vector<vector<m2::PointD>> polygons2 = {{a, d, d, d, e}};
 
   vector<shared_ptr<ScopedFile>> files;
   files.emplace_back(CreatePolyBorderFileByPolygon(kTestDir, "First", polygons1));
diff --git a/tools/poly_borders/poly_borders_tests/tools.cpp b/tools/poly_borders/poly_borders_tests/tools.cpp
index 7e91aede3..b4d5bb986 100644
--- a/tools/poly_borders/poly_borders_tests/tools.cpp
+++ b/tools/poly_borders/poly_borders_tests/tools.cpp
@@ -15,8 +15,7 @@ using namespace platform::tests_support;
 
 namespace
 {
-std::vector<m2::RegionD> ConvertFromPointsVector(
-    std::vector<std::vector<m2::PointD>> const & polygons)
+std::vector<m2::RegionD> ConvertFromPointsVector(std::vector<std::vector<m2::PointD>> const & polygons)
 {
   std::vector<m2::RegionD> res;
   res.reserve(polygons.size());
@@ -29,9 +28,8 @@ std::vector<m2::RegionD> ConvertFromPointsVector(
 
 namespace poly_borders
 {
-std::shared_ptr<ScopedFile> CreatePolyBorderFileByPolygon(
-    std::string const & relativeDirPath, std::string const & name,
-    std::vector<std::vector<m2::PointD>> const & polygons)
+std::shared_ptr<ScopedFile> CreatePolyBorderFileByPolygon(std::string const & relativeDirPath, std::string const & name,
+                                                          std::vector<std::vector<m2::PointD>> const & polygons)
 {
   std::string path = base::JoinPath(relativeDirPath, name + BordersData::kBorderExtension);
 
diff --git a/tools/poly_borders/poly_borders_tests/tools.hpp b/tools/poly_borders/poly_borders_tests/tools.hpp
index 8c3d28514..e65c131db 100644
--- a/tools/poly_borders/poly_borders_tests/tools.hpp
+++ b/tools/poly_borders/poly_borders_tests/tools.hpp
@@ -10,8 +10,7 @@
 
 namespace poly_borders
 {
-std::shared_ptr<platform::tests_support::ScopedFile>
-CreatePolyBorderFileByPolygon(std::string const & relativeDirPath,
-                              std::string const & name,
-                              std::vector<std::vector<m2::PointD>> const & polygons);
+std::shared_ptr<platform::tests_support::ScopedFile> CreatePolyBorderFileByPolygon(
+    std::string const & relativeDirPath, std::string const & name,
+    std::vector<std::vector<m2::PointD>> const & polygons);
 }  // namespace poly_borders
diff --git a/tools/poly_borders/poly_borders_tool/poly_borders_tool.cpp b/tools/poly_borders/poly_borders_tool/poly_borders_tool.cpp
index 3d23e0bd8..89178289c 100644
--- a/tools/poly_borders/poly_borders_tool/poly_borders_tool.cpp
+++ b/tools/poly_borders/poly_borders_tool/poly_borders_tool.cpp
@@ -19,14 +19,15 @@ using namespace poly_borders;
 int main(int argc, char ** argv)
 {
   gflags::ParseCommandLineFlags(&argc, &argv, true);
-  gflags::SetUsageMessage("\n\n\tThe tool is used to process *.poly borders files. We use such files\n"
-                          "\tto cut the planet into mwms in generator. The problem is that we have\n"
-                          "\tempty spaces between neighbouring borders. This tool creates new borders\n"
-                          "\tbased on input data by removing points from borders in such a way that the\n"
-                          "\tchanged area of each border will not be too large.\n"
-                          "\tArguments:\n"
-                          "\t\t--borders_path=/path/to/directory/with/borders\n"
-                          "\t\t--output_path=/path/to/directory/where/new/borders/will/be/placed\n");
+  gflags::SetUsageMessage(
+      "\n\n\tThe tool is used to process *.poly borders files. We use such files\n"
+      "\tto cut the planet into mwms in generator. The problem is that we have\n"
+      "\tempty spaces between neighbouring borders. This tool creates new borders\n"
+      "\tbased on input data by removing points from borders in such a way that the\n"
+      "\tchanged area of each border will not be too large.\n"
+      "\tArguments:\n"
+      "\t\t--borders_path=/path/to/directory/with/borders\n"
+      "\t\t--output_path=/path/to/directory/where/new/borders/will/be/placed\n");
 
   if (FLAGS_borders_path.empty() || FLAGS_output_path.empty())
   {
diff --git a/tools/skin_generator/generator.cpp b/tools/skin_generator/generator.cpp
index 9471ec109..fb12583e7 100644
--- a/tools/skin_generator/generator.cpp
+++ b/tools/skin_generator/generator.cpp
@@ -9,28 +9,26 @@
 #include <iostream>
 #include <iterator>
 
-#include <QtXml/QDomElement>
-#include <QtXml/QDomDocument>
 #include <QtCore/QDir>
+#include <QtXml/QDomDocument>
+#include <QtXml/QDomElement>
 
 namespace tools
 {
 namespace
 {
 
-static constexpr double kLargeIconSize = 24.0;  // Size of the -l SVG icons
-static constexpr double kMediumIconSize = 18.0; // size of the -m SVG icons
+static constexpr double kLargeIconSize = 24.0;   // Size of the -l SVG icons
+static constexpr double kMediumIconSize = 18.0;  // size of the -m SVG icons
 
 struct GreaterHeight
 {
-  bool operator() (SkinGenerator::SymbolInfo const & left,
-                   SkinGenerator::SymbolInfo const & right) const
+  bool operator()(SkinGenerator::SymbolInfo const & left, SkinGenerator::SymbolInfo const & right) const
   {
     QString symbolIDleft = left.m_fullFileName.left(left.m_fullFileName.lastIndexOf("."));
     QString symbolIDright = right.m_fullFileName.left(right.m_fullFileName.lastIndexOf("."));
-    if (left.m_size.height() == right.m_size.height()) {
+    if (left.m_size.height() == right.m_size.height())
       return symbolIDleft > symbolIDright;
-    }
     return (left.m_size.height() > right.m_size.height());
   }
 };
@@ -40,8 +38,7 @@ struct MaxDimensions
   uint32_t & m_width;
   uint32_t & m_height;
 
-  MaxDimensions(uint32_t & width, uint32_t & height)
-    : m_width(width), m_height(height)
+  MaxDimensions(uint32_t & width, uint32_t & height) : m_width(width), m_height(height)
   {
     m_width = 0;
     m_height = 0;
@@ -65,12 +62,10 @@ uint32_t NextPowerOf2(uint32_t n)
 
   return n + 1;
 }
-}
+}  // namespace
 
-void SkinGenerator::ProcessSymbols(std::string const & svgDataDir,
-                                   std::string const & skinName,
-                                   std::vector<QSize> const & symbolSizes,
-                                   std::vector<std::string> const & suffixes)
+void SkinGenerator::ProcessSymbols(std::string const & svgDataDir, std::string const & skinName,
+                                   std::vector<QSize> const & symbolSizes, std::vector<std::string> const & suffixes)
 {
   for (size_t j = 0; j < symbolSizes.size(); ++j)
   {
@@ -97,7 +92,7 @@ void SkinGenerator::ProcessSymbols(std::string const & svgDataDir,
         QString fullFileName = QString(dir.absolutePath()) + "/" + fileName;
         if (m_svgRenderer.load(fullFileName))
         {
-          QSize svgSize = m_svgRenderer.defaultSize(); // Size of the SVG file
+          QSize svgSize = m_svgRenderer.defaultSize();  // Size of the SVG file
 
           // Capping svg symbol to kLargeIconSize maximum, keeping aspect ratio
           /*if (svgSize.width() > kLargeIconSize)
@@ -153,8 +148,8 @@ bool SkinGenerator::RenderPages(uint32_t maxSize)
 
       for (auto & s : page.m_symbols)
       {
-        s.m_handle = page.m_packer.pack(static_cast<uint32_t>(s.m_size.width()),
-                                        static_cast<uint32_t>(s.m_size.height()));
+        s.m_handle =
+            page.m_packer.pack(static_cast<uint32_t>(s.m_size.width()), static_cast<uint32_t>(s.m_size.height()));
         if (m_overflowDetected)
           break;
       }
@@ -221,7 +216,7 @@ void SkinGenerator::MarkOverflow()
   m_overflowDetected = true;
 }
 
-bool SkinGenerator::WriteToFileNewStyle(std::string const &skinName)
+bool SkinGenerator::WriteToFileNewStyle(std::string const & skinName)
 {
   QDomDocument doc = QDomDocument("skin");
   QDomElement rootElem = doc.createElement("root");
@@ -254,4 +249,4 @@ bool SkinGenerator::WriteToFileNewStyle(std::string const &skinName)
   ts << doc.toString();
   return true;
 }
-} // namespace tools
+}  // namespace tools
diff --git a/tools/skin_generator/generator.hpp b/tools/skin_generator/generator.hpp
index 8bcd370f9..e5439f046 100644
--- a/tools/skin_generator/generator.hpp
+++ b/tools/skin_generator/generator.hpp
@@ -1,16 +1,16 @@
 #pragma once
 
-#include "geometry/rect2d.hpp"
 #include "geometry/packer.hpp"
+#include "geometry/rect2d.hpp"
 
 #include "coding/writer.hpp"
 
 #include "base/base.hpp"
 
-#include <QtGui/QPainter>
-#include <QtGui/QImage>
 #include <QtCore/QFileInfo>
 #include <QtCore/QSize>
+#include <QtGui/QImage>
+#include <QtGui/QPainter>
 #include <QtSvg/QSvgRenderer>
 
 #include <cstdint>
@@ -35,7 +35,9 @@ public:
 
     SymbolInfo() {}
     SymbolInfo(QSize size, QString const & fullFileName, QString const & symbolID)
-      : m_size(size), m_fullFileName(fullFileName), m_symbolID(symbolID)
+      : m_size(size)
+      , m_fullFileName(fullFileName)
+      , m_symbolID(symbolID)
     {}
   };
 
@@ -53,8 +55,7 @@ public:
   };
 
   void ProcessSymbols(std::string const & symbolsDir, std::string const & skinName,
-                      std::vector<QSize> const & symbolSizes,
-                      std::vector<std::string> const & suffix);
+                      std::vector<QSize> const & symbolSizes, std::vector<std::string> const & suffix);
   bool RenderPages(uint32_t maxSize);
   bool WriteToFileNewStyle(std::string const & skinName);
 
diff --git a/tools/skin_generator/main.cpp b/tools/skin_generator/main.cpp
index 2c7abdf9e..434018046 100644
--- a/tools/skin_generator/main.cpp
+++ b/tools/skin_generator/main.cpp
@@ -1,17 +1,18 @@
 #include "generator.hpp"
 
-#include "base/logging.hpp"
 #include <iostream>
+#include "base/logging.hpp"
 
 #include <QApplication>
 #include <QtCore/QFile>
-#include <QtCore/QString>
 #include <QtCore/QHash>
+#include <QtCore/QString>
 
 #include <gflags/gflags.h>
 
 DEFINE_string(fontFileName, "../../data/01_dejavusans.ttf", "path to TrueType font file");
-DEFINE_string(symbolsFile, "../../data/results.unicode", "file with 2bytes symbols for which the skin should be generated");
+DEFINE_string(symbolsFile, "../../data/results.unicode",
+              "file with 2bytes symbols for which the skin should be generated");
 DEFINE_string(symbolsDir, "../../data/styles/symbols", "directory with svg symbol files");
 DEFINE_int32(symbolWidth, 24, "width of the rendered symbol");
 DEFINE_int32(symbolHeight, 24, "height of the rendered symbol");
@@ -21,9 +22,9 @@ DEFINE_int32(searchIconWidth, 24, "width of the search category icon");
 DEFINE_int32(searchIconHeight, 24, "height of the search category icon");
 DEFINE_int32(maxSize, 4096, "max width/height of output textures");
 
-int main(int argc, char *argv[])
+int main(int argc, char * argv[])
 {
-// Used to lock the hash seed, so the order of XML attributes is always the same.
+  // Used to lock the hash seed, so the order of XML attributes is always the same.
   QHashSeed::setDeterministicGlobalSeed();
   try
   {
diff --git a/tools/topography_generator/filters_impl.hpp b/tools/topography_generator/filters_impl.hpp
index 3dd39dfc9..9ff5c823a 100644
--- a/tools/topography_generator/filters_impl.hpp
+++ b/tools/topography_generator/filters_impl.hpp
@@ -10,10 +10,8 @@
 namespace topography_generator
 {
 template <typename ValueType>
-void GetExtendedTile(ms::LatLon const & leftBottom, size_t stepsInDegree,
-                     size_t tileSize, size_t tileSizeExtension,
-                     ValuesProvider<ValueType> & valuesProvider,
-                     std::vector<ValueType> & extTileValues)
+void GetExtendedTile(ms::LatLon const & leftBottom, size_t stepsInDegree, size_t tileSize, size_t tileSizeExtension,
+                     ValuesProvider<ValueType> & valuesProvider, std::vector<ValueType> & extTileValues)
 {
   size_t const extendedTileSize = tileSize + 2 * tileSizeExtension;
   extTileValues.resize(extendedTileSize * extendedTileSize);
@@ -22,19 +20,16 @@ void GetExtendedTile(ms::LatLon const & leftBottom, size_t stepsInDegree,
   double const offset = step * tileSizeExtension;
 
   // Store values from North to South.
-  ms::LatLon startPos = ms::LatLon(leftBottom.m_lat + 1.0 + offset,
-                                   leftBottom.m_lon - offset);
+  ms::LatLon startPos = ms::LatLon(leftBottom.m_lat + 1.0 + offset, leftBottom.m_lon - offset);
   for (size_t i = 0; i < extendedTileSize; ++i)
   {
     for (size_t j = 0; j < extendedTileSize; ++j)
     {
-      auto pos = ms::LatLon(startPos.m_lat - i * step,
-                            startPos.m_lon + j * step);
+      auto pos = ms::LatLon(startPos.m_lat - i * step, startPos.m_lon + j * step);
       auto val = valuesProvider.GetValue(pos);
 
-      if (val == valuesProvider.GetInvalidValue() &&
-          ((i < tileSizeExtension) || (i >= tileSizeExtension + tileSize) ||
-           (j < tileSizeExtension) || (j >= tileSizeExtension + tileSize)))
+      if (val == valuesProvider.GetInvalidValue() && ((i < tileSizeExtension) || (i >= tileSizeExtension + tileSize) ||
+                                                      (j < tileSizeExtension) || (j >= tileSizeExtension + tileSize)))
       {
         auto const ni = std::max(std::min(i, tileSizeExtension + tileSize - 1), tileSizeExtension);
         auto const nj = std::max(std::min(j, tileSizeExtension + tileSize - 1), tileSizeExtension);
@@ -49,8 +44,7 @@ void GetExtendedTile(ms::LatLon const & leftBottom, size_t stepsInDegree,
 
 template <typename ValueType>
 void ProcessWithLinearKernel(std::vector<double> const & kernel, size_t tileSize, size_t tileOffset,
-                             std::vector<ValueType> const & srcValues,
-                             std::vector<ValueType> & dstValues,
+                             std::vector<ValueType> const & srcValues, std::vector<ValueType> & dstValues,
                              ValueType invalidValue)
 {
   auto const kernelSize = kernel.size();
@@ -84,9 +78,7 @@ void ProcessWithLinearKernel(std::vector<double> const & kernel, size_t tileSize
       }
     }
     for (size_t j = tileOffset; j < tileSize - tileOffset; ++j)
-    {
       dstValues[i * tileSize + j] = tempValues[j];
-    }
   }
 
   for (size_t j = tileOffset; j < tileSize - tileOffset; ++j)
@@ -112,17 +104,13 @@ void ProcessWithLinearKernel(std::vector<double> const & kernel, size_t tileSize
       }
     }
     for (size_t i = tileOffset; i < tileSize - tileOffset; ++i)
-    {
       dstValues[i * tileSize + j] = tempValues[i];
-    }
   }
 }
 
 template <typename ValueType>
-void ProcessWithSquareKernel(std::vector<double> const & kernel, size_t kernelSize,
-                             size_t tileSize, size_t tileOffset,
-                             std::vector<ValueType> const & srcValues,
-                             std::vector<ValueType> & dstValues,
+void ProcessWithSquareKernel(std::vector<double> const & kernel, size_t kernelSize, size_t tileSize, size_t tileOffset,
+                             std::vector<ValueType> const & srcValues, std::vector<ValueType> & dstValues,
                              ValueType invalidValue)
 {
   CHECK_EQUAL(kernelSize * kernelSize, kernel.size(), ());
@@ -161,10 +149,8 @@ void ProcessWithSquareKernel(std::vector<double> const & kernel, size_t kernelSi
 }
 
 template <typename ValueType>
-void ProcessMedian(size_t kernelRadius, size_t tileSize, size_t tileOffset,
-                   std::vector<ValueType> const & srcValues,
-                   std::vector<ValueType> & dstValues,
-                   ValueType invalidValue)
+void ProcessMedian(size_t kernelRadius, size_t tileSize, size_t tileOffset, std::vector<ValueType> const & srcValues,
+                   std::vector<ValueType> & dstValues, ValueType invalidValue)
 {
   CHECK_LESS_OR_EQUAL(kernelRadius, tileOffset, ());
   CHECK_GREATER(tileSize, tileOffset * 2, ());
diff --git a/tools/topography_generator/generator.cpp b/tools/topography_generator/generator.cpp
index ebd2ce1d5..50495fe00 100644
--- a/tools/topography_generator/generator.cpp
+++ b/tools/topography_generator/generator.cpp
@@ -25,8 +25,7 @@ size_t constexpr kArcSecondsInDegree = 60 * 60;
 int constexpr kAsterTilesLatTop = 60;
 int constexpr kAsterTilesLatBottom = -60;
 
-void MercatorRectToTilesRange(m2::RectD const & rect,
-                              int & left, int & bottom, int & right, int & top)
+void MercatorRectToTilesRange(m2::RectD const & rect, int & left, int & bottom, int & right, int & top)
 {
   auto const leftBottom = mercator::ToLatLon(rect.LeftBottom());
   auto const rightTop = mercator::ToLatLon(rect.RightTop());
@@ -65,19 +64,15 @@ bool LoadTileProfiles(std::string const & fileName, std::set<std::string> & prof
     return false;
   std::string line;
   while (std::getline(fin, line))
-  {
     if (!line.empty())
       profileNames.insert(line);
-  }
   return true;
 }
 
 class SrtmProvider : public ValuesProvider<Altitude>
 {
 public:
-  explicit SrtmProvider(std::string const & srtmDir):
-    m_srtmManager(srtmDir)
-  {}
+  explicit SrtmProvider(std::string const & srtmDir) : m_srtmManager(srtmDir) {}
 
   void SetPrefferedTile(ms::LatLon const & pos)
   {
@@ -95,10 +90,7 @@ public:
 
   Altitude GetInvalidValue() const override { return kInvalidAltitude; }
 
-  static bool IsValidAltitude(Altitude alt)
-  {
-    return alt != kInvalidAltitude && alt > -435 && alt < 8850;
-  }
+  static bool IsValidAltitude(Altitude alt) { return alt != kInvalidAltitude && alt > -435 && alt < 8850; }
 
 private:
   Altitude GetValueImpl(ms::LatLon pos)
@@ -111,8 +103,8 @@ private:
       // Try to prevent loading a new tile if the position can be found in the loaded one.
       auto const latDist = pos.m_lat - m_leftBottomOfPreferredTile.m_lat;
       auto const lonDist = pos.m_lon - m_leftBottomOfPreferredTile.m_lon;
-      if (latDist > -kPointEqualityEps && latDist < 1.0 + kPointEqualityEps &&
-          lonDist > -kPointEqualityEps && lonDist < 1.0 + kPointEqualityEps)
+      if (latDist > -kPointEqualityEps && latDist < 1.0 + kPointEqualityEps && lonDist > -kPointEqualityEps &&
+          lonDist < 1.0 + kPointEqualityEps)
       {
         if (latDist < 0.0)
           pos.m_lat += kPointEqualityEps;
@@ -174,8 +166,7 @@ private:
 class RawAltitudesTile : public ValuesProvider<Altitude>
 {
 public:
-  RawAltitudesTile(std::vector<Altitude> const & values,
-                   int leftLon, int bottomLat)
+  RawAltitudesTile(std::vector<Altitude> const & values, int leftLon, int bottomLat)
     : m_values(values)
     , m_leftLon(leftLon)
     , m_bottomLat(bottomLat)
@@ -209,10 +200,9 @@ private:
 class SeamlessAltitudeProvider : public ValuesProvider<Altitude>
 {
 public:
-  using IsOnBorderFn = std::function<bool (ms::LatLon const & pos)>;
+  using IsOnBorderFn = std::function<bool(ms::LatLon const & pos)>;
 
-  SeamlessAltitudeProvider(ValuesProvider<Altitude> & originalProvider,
-                           ValuesProvider<Altitude> & filteredProvider,
+  SeamlessAltitudeProvider(ValuesProvider<Altitude> & originalProvider, ValuesProvider<Altitude> & filteredProvider,
                            IsOnBorderFn && isOnBorderFn)
     : m_originalProvider(originalProvider)
     , m_filteredProvider(filteredProvider)
@@ -267,10 +257,8 @@ public:
   void Do()
   {
     for (int lat = m_bottom; lat <= m_top; ++lat)
-    {
       for (int lon = m_left; lon <= m_right; ++lon)
         ProcessTile(lat, lon);
-    }
   }
 
 private:
@@ -337,8 +325,7 @@ private:
     auto const outFile = GetIsolinesFilePath(lat, lon, params.m_outputDir);
     if (!m_forceRegenerate && GetPlatform().IsFileExistsByFullPath(outFile))
     {
-      LOG(LINFO, ("Isolines for", tileName, ", profile", profileName,
-                  "are ready, skip processing."));
+      LOG(LINFO, ("Isolines for", tileName, ", profile", profileName, "are ready, skip processing."));
       return;
     }
 
@@ -350,11 +337,8 @@ private:
     if (!params.m_filters.empty() && (lat >= kAsterTilesLatTop || lat < kAsterTilesLatBottom))
     {
       // Filter tiles converted from ASTER, cause they are noisy enough.
-      std::vector<Altitude> filteredValues = FilterTile(params.m_filters,
-                                                        ms::LatLon(lat, lon),
-                                                        kArcSecondsInDegree,
-                                                        kArcSecondsInDegree + 1,
-                                                        m_srtmProvider);
+      std::vector<Altitude> filteredValues = FilterTile(params.m_filters, ms::LatLon(lat, lon), kArcSecondsInDegree,
+                                                        kArcSecondsInDegree + 1, m_srtmProvider);
       RawAltitudesTile filteredProvider(filteredValues, lon, lat);
       GenerateSeamlessContours(lat, lon, params, filteredProvider, contours);
     }
@@ -363,9 +347,8 @@ private:
       GenerateSeamlessContours(lat, lon, params, m_srtmProvider, contours);
     }
 
-    LOG(LINFO, ("Isolines for tile", tileName, ", profile", profileName,
-      "min altitude", contours.m_minValue, "max altitude",
-      contours.m_maxValue, "invalid values count", contours.m_invalidValuesCount));
+    LOG(LINFO, ("Isolines for tile", tileName, ", profile", profileName, "min altitude", contours.m_minValue,
+                "max altitude", contours.m_maxValue, "invalid values count", contours.m_invalidValuesCount));
 
     if (params.m_simplificationZoom > 0)
       SimplifyContours(params.m_simplificationZoom, contours);
@@ -375,23 +358,21 @@ private:
   }
 
   void GenerateSeamlessContours(int lat, int lon, TileIsolinesParams const & params,
-                                ValuesProvider<Altitude> & altProvider,
-                                Contours<Altitude> & contours)
+                                ValuesProvider<Altitude> & altProvider, Contours<Altitude> & contours)
   {
     // Avoid seam between SRTM and ASTER.
     if ((lat == kAsterTilesLatTop) || (lat == kAsterTilesLatBottom - 1))
     {
       m_srtmProvider.SetPrefferedTile(ms::LatLon(lat == kAsterTilesLatTop ? lat - 0.5 : lat + 0.5, lon));
-      SeamlessAltitudeProvider seamlessAltProvider(m_srtmProvider, altProvider,
-          [](ms::LatLon const & pos)
-          {
-            // In case when two altitudes sources are used for altitudes extraction,
-            // for the same position on the border could be returned different altitudes.
-            // Force to use altitudes near the srtm/aster border from srtm source,
-            // it helps to avoid contours gaps due to different altitudes for equal positions.
-            return fabs(pos.m_lat - kAsterTilesLatTop) < mercator::kPointEqualityEps ||
-                   fabs(pos.m_lat - kAsterTilesLatBottom) < mercator::kPointEqualityEps;
-          });
+      SeamlessAltitudeProvider seamlessAltProvider(m_srtmProvider, altProvider, [](ms::LatLon const & pos)
+      {
+        // In case when two altitudes sources are used for altitudes extraction,
+        // for the same position on the border could be returned different altitudes.
+        // Force to use altitudes near the srtm/aster border from srtm source,
+        // it helps to avoid contours gaps due to different altitudes for equal positions.
+        return fabs(pos.m_lat - kAsterTilesLatTop) < mercator::kPointEqualityEps ||
+               fabs(pos.m_lat - kAsterTilesLatBottom) < mercator::kPointEqualityEps;
+      });
       GenerateContours(lat, lon, params, seamlessAltProvider, contours);
     }
     else
@@ -400,16 +381,14 @@ private:
     }
   }
 
-  void GenerateContours(int lat, int lon, TileIsolinesParams const & params,
-                        ValuesProvider<Altitude> & altProvider, Contours<Altitude> & contours)
+  void GenerateContours(int lat, int lon, TileIsolinesParams const & params, ValuesProvider<Altitude> & altProvider,
+                        Contours<Altitude> & contours)
   {
     auto const leftBottom = ms::LatLon(lat, lon);
     auto const rightTop = ms::LatLon(lat + 1.0, lon + 1.0);
     auto const squaresStep = 1.0 / kArcSecondsInDegree * params.m_latLonStepFactor;
 
-    MarchingSquares<Altitude> squares(leftBottom, rightTop,
-                                      squaresStep, params.m_alitudesStep,
-                                      altProvider, m_debugId);
+    MarchingSquares<Altitude> squares(leftBottom, rightTop, squaresStep, params.m_alitudesStep, altProvider, m_debugId);
     squares.GenerateContours(contours);
   }
 
@@ -426,9 +405,8 @@ private:
 };
 
 template <typename ParamsType>
-void RunGenerateIsolinesTasks(int left, int bottom, int right, int top,
-                              std::string const & srtmPath, ParamsType const & params,
-                              long threadsCount, long maxCachedTilesPerThread,
+void RunGenerateIsolinesTasks(int left, int bottom, int right, int top, std::string const & srtmPath,
+                              ParamsType const & params, long threadsCount, long maxCachedTilesPerThread,
                               bool forceRegenerate)
 {
   std::vector<std::unique_ptr<TileIsolinesTask>> tasks;
@@ -447,12 +425,10 @@ void RunGenerateIsolinesTasks(int left, int bottom, int right, int top,
   else
   {
     while (tilesRowPerTask * tilesColPerTask > static_cast<long>(maxCachedTilesPerThread))
-    {
       if (tilesRowPerTask > tilesColPerTask)
         tilesRowPerTask = (tilesRowPerTask + 1) / 2;
       else
         tilesColPerTask = (tilesColPerTask + 1) / 2;
-    }
   }
 
   base::ComputationalThreadPool threadPool(threadsCount);
@@ -463,43 +439,38 @@ void RunGenerateIsolinesTasks(int left, int bottom, int right, int top,
     for (int lon = left; lon < right; lon += tilesColPerTask)
     {
       int const rightLon = std::min(lon + tilesColPerTask - 1, right - 1);
-      auto task = std::make_unique<TileIsolinesTask>(lon, lat, rightLon, topLat, srtmPath, &params,
-                                                     forceRegenerate);
-      threadPool.SubmitWork([task = std::move(task)](){ task->Do(); });
+      auto task = std::make_unique<TileIsolinesTask>(lon, lat, rightLon, topLat, srtmPath, &params, forceRegenerate);
+      threadPool.SubmitWork([task = std::move(task)]() { task->Do(); });
     }
   }
 }
 }  // namespace
 
-Generator::Generator(std::string const & srtmPath, long threadsCount,
-                     long maxCachedTilesPerThread, bool forceRegenerate)
+Generator::Generator(std::string const & srtmPath, long threadsCount, long maxCachedTilesPerThread,
+                     bool forceRegenerate)
   : m_threadsCount(threadsCount)
   , m_maxCachedTilesPerThread(maxCachedTilesPerThread)
   , m_srtmPath(srtmPath)
   , m_forceRegenerate(forceRegenerate)
 {}
 
-void Generator::GenerateIsolines(int left, int bottom, int right, int top,
-                                 TileIsolinesParams const & params)
+void Generator::GenerateIsolines(int left, int bottom, int right, int top, TileIsolinesParams const & params)
 {
-  RunGenerateIsolinesTasks(left, bottom, right, top, m_srtmPath, params,
-                           m_threadsCount, m_maxCachedTilesPerThread, m_forceRegenerate);
+  RunGenerateIsolinesTasks(left, bottom, right, top, m_srtmPath, params, m_threadsCount, m_maxCachedTilesPerThread,
+                           m_forceRegenerate);
 }
 
-
-void Generator::GenerateIsolines(int left, int bottom, int right, int top,
-                                 std::string const & tilesProfilesDir)
+void Generator::GenerateIsolines(int left, int bottom, int right, int top, std::string const & tilesProfilesDir)
 {
   TileIsolinesProfileParams params(m_profileToTileParams, tilesProfilesDir);
-  RunGenerateIsolinesTasks(left, bottom, right, top, m_srtmPath, params,
-                           m_threadsCount, m_maxCachedTilesPerThread, m_forceRegenerate);
+  RunGenerateIsolinesTasks(left, bottom, right, top, m_srtmPath, params, m_threadsCount, m_maxCachedTilesPerThread,
+                           m_forceRegenerate);
 }
 
 void Generator::GenerateIsolinesForCountries()
 {
   auto const & pl = GetPlatform();
-  if (!pl.IsFileExistsByFullPath(m_isolinesTilesOutDir) &&
-      !pl.MkDirRecursively(m_isolinesTilesOutDir))
+  if (!pl.IsFileExistsByFullPath(m_isolinesTilesOutDir) && !pl.MkDirRecursively(m_isolinesTilesOutDir))
   {
     LOG(LERROR, ("Can't create directory", m_isolinesTilesOutDir));
     return;
@@ -513,8 +484,7 @@ void Generator::GenerateIsolinesForCountries()
       continue;
     checkedProfiles.insert(profileName);
     auto const profileTilesDir = GetTilesDir(m_isolinesTilesOutDir, profileName);
-    if (!pl.IsFileExistsByFullPath(profileTilesDir) &&
-        !pl.MkDirChecked(profileTilesDir))
+    if (!pl.IsFileExistsByFullPath(profileTilesDir) && !pl.MkDirChecked(profileTilesDir))
     {
       LOG(LERROR, ("Can't create directory", profileTilesDir));
       return;
@@ -576,18 +546,16 @@ void Generator::GenerateIsolinesForCountries()
 
   LOG(LINFO, ("Generate isolines for tiles rect", boundingRect));
 
-  GenerateIsolines(boundingRect.LeftBottom().x, boundingRect.LeftBottom().y,
-                   boundingRect.RightTop().x + 1, boundingRect.RightTop().y + 1, tmpTileProfilesDir);
+  GenerateIsolines(boundingRect.LeftBottom().x, boundingRect.LeftBottom().y, boundingRect.RightTop().x + 1,
+                   boundingRect.RightTop().y + 1, tmpTileProfilesDir);
 }
 
-void Generator::PackIsolinesForCountry(storage::CountryId const & countryId,
-                                       IsolinesPackingParams const & params)
+void Generator::PackIsolinesForCountry(storage::CountryId const & countryId, IsolinesPackingParams const & params)
 {
   PackIsolinesForCountry(countryId, params, nullptr /*needSkipTileFn*/);
 }
 
-void Generator::PackIsolinesForCountry(storage::CountryId const & countryId,
-                                       IsolinesPackingParams const & params,
+void Generator::PackIsolinesForCountry(storage::CountryId const & countryId, IsolinesPackingParams const & params,
                                        NeedSkipTileFn const & needSkipTileFn)
 {
   auto const outFile = GetIsolinesFilePath(countryId, params.m_outputDir);
@@ -629,8 +597,7 @@ void Generator::PackIsolinesForCountry(storage::CountryId const & countryId,
 
       LOG(LINFO, ("Begin packing isolines from tile", tileFilePath));
 
-      CropContours(countryRect, countryRegions, params.m_maxIsolineLength,
-                   params.m_alitudesStepFactor, isolines);
+      CropContours(countryRect, countryRegions, params.m_maxIsolineLength, params.m_alitudesStepFactor, isolines);
       // Simplification is done already while processing tiles in ProcessTile().
       // But now a different country-specific simpificationZoom could be applied.
       if (params.m_simplificationZoom > 0)
@@ -644,17 +611,15 @@ void Generator::PackIsolinesForCountry(storage::CountryId const & countryId,
       for (auto & levelIsolines : isolines.m_contours)
       {
         auto & dst = countryIsolines.m_contours[levelIsolines.first];
-        std::move(levelIsolines.second.begin(), levelIsolines.second.end(),
-                  std::back_inserter(dst));
+        std::move(levelIsolines.second.begin(), levelIsolines.second.end(), std::back_inserter(dst));
       }
 
       LOG(LINFO, ("End packing isolines from tile", tileFilePath));
     }
   }
 
-  LOG(LINFO, ("End packing isolines for country", countryId,
-              "min altitude", countryIsolines.m_minValue,
-              "max altitude", countryIsolines.m_maxValue));
+  LOG(LINFO, ("End packing isolines for country", countryId, "min altitude", countryIsolines.m_minValue, "max altitude",
+              countryIsolines.m_maxValue));
 
   SaveContrours(outFile, std::move(countryIsolines));
 
@@ -684,7 +649,7 @@ void Generator::PackIsolinesForCountries()
 
       auto const & packingParams = m_profileToPackingParams.at(params.m_profileName);
       PackIsolinesForCountry(countryId, packingParams,
-                             [&params](int lat, int lon){ return params.NeedSkipTile(lat, lon); });
+                             [&params](int lat, int lon) { return params.NeedSkipTile(lat, lon); });
 
       LOG(LINFO, ("End task", taskInd, "/", tasksCount, countryId));
     });
@@ -703,8 +668,7 @@ void Generator::InitCountryInfoGetter(std::string const & dataDir)
 }
 
 void Generator::InitProfiles(std::string const & isolinesProfilesFileName,
-                             std::string const & countriesToGenerateFileName,
-                             std::string const & isolinesTilesOutDir,
+                             std::string const & countriesToGenerateFileName, std::string const & isolinesTilesOutDir,
                              std::string const & isolinesCountriesOutDir)
 {
   CHECK(Deserialize(isolinesProfilesFileName, m_profilesCollection), ());
@@ -714,8 +678,7 @@ void Generator::InitProfiles(std::string const & isolinesProfilesFileName,
   for (auto const & countryParams : m_countriesToGenerate.m_countryParams)
   {
     auto const & params = countryParams.second;
-    CHECK(profiles.find(params.m_profileName) != profiles.end(),
-          ("Unknown profile name", params.m_profileName));
+    CHECK(profiles.find(params.m_profileName) != profiles.end(), ("Unknown profile name", params.m_profileName));
   }
 
   m_isolinesTilesOutDir = isolinesTilesOutDir;
@@ -735,9 +698,8 @@ void Generator::InitProfiles(std::string const & isolinesProfilesFileName,
       tileParams.m_filters.emplace_back(std::make_unique<MedianFilter<Altitude>>(profileParams.m_medianFilterR));
     if (profileParams.m_gaussianFilterStDev > 0.0 && profileParams.m_gaussianFilterRFactor > 0)
     {
-      tileParams.m_filters.emplace_back(
-        std::make_unique<GaussianFilter<Altitude>>(profileParams.m_gaussianFilterStDev,
-                                                   profileParams.m_gaussianFilterRFactor));
+      tileParams.m_filters.emplace_back(std::make_unique<GaussianFilter<Altitude>>(
+          profileParams.m_gaussianFilterStDev, profileParams.m_gaussianFilterRFactor));
     }
     m_profileToTileParams.emplace(profileName, std::move(tileParams));
 
@@ -758,10 +720,8 @@ void Generator::GetCountryRegions(storage::CountryId const & countryId, m2::Rect
 
   size_t id;
   for (id = 0; id < m_infoReader->GetCountries().size(); ++id)
-  {
     if (m_infoReader->GetCountries().at(id).m_countryId == countryId)
       break;
-  }
   CHECK_LESS(id, m_infoReader->GetCountries().size(), ());
 
   /// @todo Refactor using Memory[Mapped] reader for countries.
diff --git a/tools/topography_generator/generator.hpp b/tools/topography_generator/generator.hpp
index f131e735e..e68e665f4 100644
--- a/tools/topography_generator/generator.hpp
+++ b/tools/topography_generator/generator.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "topography_generator/isolines_utils.hpp"
 #include "topography_generator/isolines_profile.hpp"
+#include "topography_generator/isolines_utils.hpp"
 #include "topography_generator/tile_filter.hpp"
 
 #include "storage/country_info_getter.hpp"
@@ -18,7 +18,7 @@ struct TileIsolinesParams
 {
   Altitude m_alitudesStep = 10;
   size_t m_latLonStepFactor = 1;
-  int m_simplificationZoom = 17; // Value == 0 disables simplification.
+  int m_simplificationZoom = 17;  // Value == 0 disables simplification.
   FiltersSequence<Altitude> m_filters;
   std::string m_outputDir;
 };
@@ -27,8 +27,7 @@ using ProfileToTileIsolinesParams = std::map<std::string, TileIsolinesParams>;
 
 struct TileIsolinesProfileParams
 {
-  TileIsolinesProfileParams(ProfileToTileIsolinesParams const & profiles,
-                            std::string const & tilesProfilesDir)
+  TileIsolinesProfileParams(ProfileToTileIsolinesParams const & profiles, std::string const & tilesProfilesDir)
     : m_profiles(profiles)
     , m_tilesProfilesDir(tilesProfilesDir)
   {}
@@ -40,7 +39,7 @@ struct TileIsolinesProfileParams
 struct IsolinesPackingParams
 {
   size_t m_maxIsolineLength = 1000;
-  int m_simplificationZoom = 17; // Value == 0 disables simplification.
+  int m_simplificationZoom = 17;  // Value == 0 disables simplification.
   size_t m_alitudesStepFactor = 1;
   std::string m_isolinesTilesPath;
   std::string m_outputDir;
@@ -51,32 +50,25 @@ using ProfileToIsolinesPackingParams = std::map<std::string, IsolinesPackingPara
 class Generator
 {
 public:
-  Generator(std::string const & srtmPath, long threadsCount, long maxCachedTilesPerThread,
-            bool forceRegenerate);
+  Generator(std::string const & srtmPath, long threadsCount, long maxCachedTilesPerThread, bool forceRegenerate);
 
   void InitCountryInfoGetter(std::string const & dataDir);
 
-  void GenerateIsolines(int left, int bottom, int right, int top,
-                        TileIsolinesParams const & params);
+  void GenerateIsolines(int left, int bottom, int right, int top, TileIsolinesParams const & params);
 
-  void PackIsolinesForCountry(storage::CountryId const & countryId,
-                              IsolinesPackingParams const & params);
+  void PackIsolinesForCountry(storage::CountryId const & countryId, IsolinesPackingParams const & params);
 
-  void InitProfiles(std::string const & isolinesProfilesFileName,
-                    std::string const & countriesToGenerateFileName,
-                    std::string const & isolinesTilesOutDir,
-                    std::string const & isolinesCountriesOutDir);
+  void InitProfiles(std::string const & isolinesProfilesFileName, std::string const & countriesToGenerateFileName,
+                    std::string const & isolinesTilesOutDir, std::string const & isolinesCountriesOutDir);
 
   void GenerateIsolinesForCountries();
   void PackIsolinesForCountries();
 
 private:
-  void GenerateIsolines(int left, int bottom, int right, int top,
-                        std::string const & tilesProfilesDir);
+  void GenerateIsolines(int left, int bottom, int right, int top, std::string const & tilesProfilesDir);
 
   using NeedSkipTileFn = std::function<bool(int lat, int lon)>;
-  void PackIsolinesForCountry(storage::CountryId const & countryId,
-                              IsolinesPackingParams const & params,
+  void PackIsolinesForCountry(storage::CountryId const & countryId, IsolinesPackingParams const & params,
                               NeedSkipTileFn const & needSkipTileFn);
 
   void GetCountryRegions(storage::CountryId const & countryId, m2::RectD & countryRect,
diff --git a/tools/topography_generator/isolines_profile.hpp b/tools/topography_generator/isolines_profile.hpp
index 1ea1ed5f2..a59e1bb21 100644
--- a/tools/topography_generator/isolines_profile.hpp
+++ b/tools/topography_generator/isolines_profile.hpp
@@ -21,10 +21,10 @@ struct IsolinesProfile
   uint32_t m_alitudesStep = 10;
   uint8_t m_latLonStepFactor = 1;
   uint32_t m_maxIsolinesLength = 1000;
-  uint8_t m_simplificationZoom = 17; // Value == 0 disables simplification.
-  uint8_t m_medianFilterR = 1; // Value == 0 disables filter.
-  double m_gaussianFilterStDev = 2.0; // Value == 0.0 disables filter.
-  double m_gaussianFilterRFactor = 1.0; // Value == 0.0 disables filter.
+  uint8_t m_simplificationZoom = 17;     // Value == 0 disables simplification.
+  uint8_t m_medianFilterR = 1;           // Value == 0 disables filter.
+  double m_gaussianFilterStDev = 2.0;    // Value == 0.0 disables filter.
+  double m_gaussianFilterRFactor = 1.0;  // Value == 0.0 disables filter.
 
   DECLARE_VISITOR_AND_DEBUG_PRINT(IsolinesProfile, visitor(m_alitudesStep, "alitudesStep"),
                                   visitor(m_latLonStepFactor, "latLonStepFactor"),
@@ -45,18 +45,14 @@ struct IsolinesProfilesCollection
 struct TileCoord
 {
   TileCoord() = default;
-  TileCoord(int bottomLat, int leftLon): m_leftLon(leftLon), m_bottomLat(bottomLat) {}
+  TileCoord(int bottomLat, int leftLon) : m_leftLon(leftLon), m_bottomLat(bottomLat) {}
 
   int32_t m_leftLon = 0;
   int32_t m_bottomLat = 0;
 
-  bool operator==(TileCoord const & rhs) const
-  {
-    return m_leftLon == rhs.m_leftLon && m_bottomLat == rhs.m_bottomLat;
-  }
+  bool operator==(TileCoord const & rhs) const { return m_leftLon == rhs.m_leftLon && m_bottomLat == rhs.m_bottomLat; }
 
-  DECLARE_VISITOR_AND_DEBUG_PRINT(TileCoord, visitor(m_bottomLat, "bottomLat"),
-                                   visitor(m_leftLon, "leftLon"))
+  DECLARE_VISITOR_AND_DEBUG_PRINT(TileCoord, visitor(m_bottomLat, "bottomLat"), visitor(m_leftLon, "leftLon"))
 };
 
 struct TileCoordHash
@@ -94,7 +90,7 @@ struct CountriesToGenerate
   DECLARE_VISITOR_AND_DEBUG_PRINT(CountriesToGenerate, visitor(m_countryParams, "countryParams"))
 };
 
-template<typename DataType>
+template <typename DataType>
 bool Serialize(std::string const & fileName, DataType const & data)
 {
   try
@@ -115,7 +111,7 @@ bool Serialize(std::string const & fileName, DataType const & data)
   return false;
 }
 
-template<typename DataType>
+template <typename DataType>
 bool Deserialize(std::string const & fileName, DataType & data)
 {
   try
diff --git a/tools/topography_generator/main.cpp b/tools/topography_generator/main.cpp
index 32261455a..9616cf30a 100644
--- a/tools/topography_generator/main.cpp
+++ b/tools/topography_generator/main.cpp
@@ -12,14 +12,18 @@
 DEFINE_bool(force, false, "Force to regenerate isolines for tiles and countries.");
 
 // Options for automatic isolines generating mode.
-DEFINE_string(profiles_path, "", "Automatic isolines generating mode. "
-                                 "Path to a json file with isolines profiles.");
-DEFINE_string(countries_to_generate_path, "", "Automatic isolines generating mode. "
-                                              "Path to a json file with countries to generate.");
-DEFINE_string(tiles_isolines_out_dir, "", "Automatic isolines generating mode. Path to output "
-                                          "intermediate directory with tiles isolines.");
-DEFINE_string(countries_isolines_out_dir, "", "Automatic isolines generating mode. "
-                                              "Path to output directory with countries isolines.");
+DEFINE_string(profiles_path, "",
+              "Automatic isolines generating mode. "
+              "Path to a json file with isolines profiles.");
+DEFINE_string(countries_to_generate_path, "",
+              "Automatic isolines generating mode. "
+              "Path to a json file with countries to generate.");
+DEFINE_string(tiles_isolines_out_dir, "",
+              "Automatic isolines generating mode. Path to output "
+              "intermediate directory with tiles isolines.");
+DEFINE_string(countries_isolines_out_dir, "",
+              "Automatic isolines generating mode. "
+              "Path to output directory with countries isolines.");
 
 // Common option for automatic isolines generating mode and custom packing mode.
 DEFINE_string(data_dir, "", "Path to data directory.");
@@ -34,10 +38,8 @@ DEFINE_string(out_dir, "", "Path to output directory.");
 DEFINE_uint64(simpl_zoom, 16, "Isolines simplification zoom.");
 
 // Options for custom isolines packing mode.
-DEFINE_string(countryId, "",
-              "Custom isolines packing mode. Pack isolines for countryId.");
-DEFINE_string(isolines_path, "",
-              "Custom isolines packing mode. Path to the directory with isolines tiles.");
+DEFINE_string(countryId, "", "Custom isolines packing mode. Pack isolines for countryId.");
+DEFINE_string(isolines_path, "", "Custom isolines packing mode. Path to the directory with isolines tiles.");
 DEFINE_uint64(max_length, 1000, "Custom isolines packing mode. Isolines max length.");
 DEFINE_uint64(alt_step_factor, 1, "Custom isolines packing mode. Altitude step factor.");
 
@@ -57,40 +59,38 @@ using namespace topography_generator;
 MAIN_WITH_ERROR_HANDLING([](int argc, char ** argv)
 {
   gflags::SetUsageMessage(
-    "\n\nThis tool generates isolines and works in the following modes:\n"
-    "1. Automatic isolines generating mode. Generates a binary file with isolines for each\n"
-    "   country id from the countries_to_generate_path. Gets options for isolines generating\n"
-    "   from the corresponding to the country profile in profiles_path.\n"
-    "   Stores intermediate binary isolines tiles to tiles_isolines_out_dir and result countries\n"
-    "   isolines to countries_isolines_out_dir.\n"
-    "2. Custom isolines generating mode. Generates binary tile with isolines for each SRTM tile in the\n"
-    "   specified tile rect.\n"
-    "   Mode activates by passing a valid tiles rect.\n"
-    "   An isoline would be generated for each isolines_step difference in height.\n"
-    "   Tiles for lat >= 60 && lat < -60 (converted from ASTER source) can be filtered by\n"
-    "   median and/or gaussian filters.\n"
-    "   Median filter activates by nonzero filter kernel radius median_r.\n"
-    "   Gaussian filter activates by gaussian_st_dev > 0.0 && gaussian_r_factor > 0.0 parameters.\n"
-    "   Contours generating steps through altitudes matrix of SRTM tile can be adjusted by\n"
-    "   latlon_step_factor parameter.\n"
-    "   Isolines simplification activates by nonzero simpl_zoom [1..17]\n"
-    "\n"
-    "3. Custom packing isolines from ready tiles into a binary file for specified country id.\n"
-    "   Mode activates by passing a countryId parameter.\n"
-    "   Tool gets isolines from the tiles, covered by the country regions, selects\n"
-    "   altitude levels with alt_step_factor (if a tile stores altitudes for each 10 meters\n"
-    "   and alt_step_factor == 5, the result binary file will store altitudes for each 50 meters).\n"
-    "   Isolines cropped by the country regions and cut by max_length parameter.\n"
-    "   Isolines simplification activates by nonzero simpl_zoom [1..17]\n\n");
+      "\n\nThis tool generates isolines and works in the following modes:\n"
+      "1. Automatic isolines generating mode. Generates a binary file with isolines for each\n"
+      "   country id from the countries_to_generate_path. Gets options for isolines generating\n"
+      "   from the corresponding to the country profile in profiles_path.\n"
+      "   Stores intermediate binary isolines tiles to tiles_isolines_out_dir and result countries\n"
+      "   isolines to countries_isolines_out_dir.\n"
+      "2. Custom isolines generating mode. Generates binary tile with isolines for each SRTM tile in the\n"
+      "   specified tile rect.\n"
+      "   Mode activates by passing a valid tiles rect.\n"
+      "   An isoline would be generated for each isolines_step difference in height.\n"
+      "   Tiles for lat >= 60 && lat < -60 (converted from ASTER source) can be filtered by\n"
+      "   median and/or gaussian filters.\n"
+      "   Median filter activates by nonzero filter kernel radius median_r.\n"
+      "   Gaussian filter activates by gaussian_st_dev > 0.0 && gaussian_r_factor > 0.0 parameters.\n"
+      "   Contours generating steps through altitudes matrix of SRTM tile can be adjusted by\n"
+      "   latlon_step_factor parameter.\n"
+      "   Isolines simplification activates by nonzero simpl_zoom [1..17]\n"
+      "\n"
+      "3. Custom packing isolines from ready tiles into a binary file for specified country id.\n"
+      "   Mode activates by passing a countryId parameter.\n"
+      "   Tool gets isolines from the tiles, covered by the country regions, selects\n"
+      "   altitude levels with alt_step_factor (if a tile stores altitudes for each 10 meters\n"
+      "   and alt_step_factor == 5, the result binary file will store altitudes for each 50 meters).\n"
+      "   Isolines cropped by the country regions and cut by max_length parameter.\n"
+      "   Isolines simplification activates by nonzero simpl_zoom [1..17]\n\n");
 
   gflags::ParseCommandLineFlags(&argc, &argv, true);
 
   bool isCustomGeneratingMode = false;
   bool isCustomPackingMode = false;
-  bool const isAutomaticMode = !FLAGS_profiles_path.empty() ||
-                               !FLAGS_countries_to_generate_path.empty() ||
-                               !FLAGS_tiles_isolines_out_dir.empty() ||
-                               !FLAGS_countries_isolines_out_dir.empty();
+  bool const isAutomaticMode = !FLAGS_profiles_path.empty() || !FLAGS_countries_to_generate_path.empty() ||
+                               !FLAGS_tiles_isolines_out_dir.empty() || !FLAGS_countries_isolines_out_dir.empty();
   if (isAutomaticMode)
   {
     if (FLAGS_profiles_path.empty() || FLAGS_countries_to_generate_path.empty() ||
@@ -110,9 +110,8 @@ MAIN_WITH_ERROR_HANDLING([](int argc, char ** argv)
       return EXIT_FAILURE;
     }
 
-    auto const validTilesRect = FLAGS_right > FLAGS_left && FLAGS_top > FLAGS_bottom &&
-                                FLAGS_right <= 180 && FLAGS_left >= -180 &&
-                                FLAGS_top <= 90 && FLAGS_bottom >= -90;
+    auto const validTilesRect = FLAGS_right > FLAGS_left && FLAGS_top > FLAGS_bottom && FLAGS_right <= 180 &&
+                                FLAGS_left >= -180 && FLAGS_top <= 90 && FLAGS_bottom >= -90;
 
     isCustomGeneratingMode = validTilesRect;
     isCustomPackingMode = !FLAGS_countryId.empty();
@@ -155,8 +154,8 @@ MAIN_WITH_ERROR_HANDLING([](int argc, char ** argv)
   if (isAutomaticMode)
   {
     generator.InitCountryInfoGetter(FLAGS_data_dir);
-    generator.InitProfiles(FLAGS_profiles_path, FLAGS_countries_to_generate_path,
-                           FLAGS_tiles_isolines_out_dir, FLAGS_countries_isolines_out_dir);
+    generator.InitProfiles(FLAGS_profiles_path, FLAGS_countries_to_generate_path, FLAGS_tiles_isolines_out_dir,
+                           FLAGS_countries_isolines_out_dir);
     generator.GenerateIsolinesForCountries();
     generator.PackIsolinesForCountries();
 
@@ -188,14 +187,12 @@ MAIN_WITH_ERROR_HANDLING([](int argc, char ** argv)
 
   TileIsolinesParams params;
   if (FLAGS_median_r > 0)
-  {
     params.m_filters.emplace_back(std::make_unique<MedianFilter<Altitude>>(FLAGS_median_r));
-  }
 
   if (FLAGS_gaussian_st_dev > 0.0 && FLAGS_gaussian_r_factor > 0)
   {
     params.m_filters.emplace_back(
-      std::make_unique<GaussianFilter<Altitude>>(FLAGS_gaussian_st_dev, FLAGS_gaussian_r_factor));
+        std::make_unique<GaussianFilter<Altitude>>(FLAGS_gaussian_st_dev, FLAGS_gaussian_r_factor));
   }
 
   params.m_outputDir = FLAGS_out_dir;
diff --git a/tools/topography_generator/marching_squares/contours_builder.cpp b/tools/topography_generator/marching_squares/contours_builder.cpp
index 69c9ea882..ae41755e0 100644
--- a/tools/topography_generator/marching_squares/contours_builder.cpp
+++ b/tools/topography_generator/marching_squares/contours_builder.cpp
@@ -49,10 +49,8 @@ void ContoursBuilder::AddSegment(size_t levelInd, ms::LatLon const & beginPos, m
 void ContoursBuilder::BeginLine()
 {
   for (auto & contoursList : m_activeContours)
-  {
     for (auto & activeContour : contoursList)
       activeContour.m_active = false;
-  }
 }
 
 void ContoursBuilder::EndLine(bool finalLine)
@@ -80,10 +78,8 @@ ContoursBuilder::ActiveContourIter ContoursBuilder::FindContourWithStartPoint(si
 {
   auto & contours = m_activeContours[levelInd];
   for (auto it = contours.begin(); it != contours.end(); ++it)
-  {
     if (it->m_countour.front().EqualDxDy(pos, mercator::kPointEqualityEps))
       return it;
-  }
   return contours.end();
 }
 
@@ -91,10 +87,8 @@ ContoursBuilder::ActiveContourIter ContoursBuilder::FindContourWithEndPoint(size
 {
   auto & contours = m_activeContours[levelInd];
   for (auto it = contours.begin(); it != contours.end(); ++it)
-  {
     if (it->m_countour.back().EqualDxDy(pos, mercator::kPointEqualityEps))
       return it;
-  }
   return contours.end();
 }
 }  // namespace topography_generator
diff --git a/tools/topography_generator/marching_squares/contours_builder.hpp b/tools/topography_generator/marching_squares/contours_builder.hpp
index b88d6d192..6a30425ea 100644
--- a/tools/topography_generator/marching_squares/contours_builder.hpp
+++ b/tools/topography_generator/marching_squares/contours_builder.hpp
@@ -8,8 +8,8 @@
 #include <algorithm>
 #include <deque>
 #include <list>
-#include <vector>
 #include <unordered_map>
+#include <vector>
 
 namespace topography_generator
 {
@@ -36,7 +36,7 @@ public:
         Contour contourMerc;
         contourMerc.reserve(contour.size());
         std::transform(contour.begin(), contour.end(), std::back_inserter(contourMerc),
-                       [](ms::LatLon const & pt){ return mercator::FromLatLon(pt); });
+                       [](ms::LatLon const & pt) { return mercator::FromLatLon(pt); });
 
         contours[levelValue].emplace_back(std::move(contourMerc));
       }
@@ -49,9 +49,7 @@ private:
 
   struct ActiveContour
   {
-    explicit ActiveContour(ContourRaw && isoline)
-      : m_countour(std::move(isoline))
-    {}
+    explicit ActiveContour(ContourRaw && isoline) : m_countour(std::move(isoline)) {}
 
     ContourRaw m_countour;
     bool m_active = true;
diff --git a/tools/topography_generator/marching_squares/marching_squares.hpp b/tools/topography_generator/marching_squares/marching_squares.hpp
index b5cd3d0ee..2485d3c59 100644
--- a/tools/topography_generator/marching_squares/marching_squares.hpp
+++ b/tools/topography_generator/marching_squares/marching_squares.hpp
@@ -13,9 +13,8 @@ template <typename ValueType>
 class MarchingSquares
 {
 public:
-  MarchingSquares(ms::LatLon const & leftBottom, ms::LatLon const & rightTop,
-                  double step, ValueType valueStep, ValuesProvider<ValueType> & valuesProvider,
-                  std::string const & debugId)
+  MarchingSquares(ms::LatLon const & leftBottom, ms::LatLon const & rightTop, double step, ValueType valueStep,
+                  ValuesProvider<ValueType> & valuesProvider, std::string const & debugId)
     : m_leftBottom(leftBottom)
     , m_rightTop(rightTop)
     , m_step(step)
@@ -58,18 +57,17 @@ public:
         // This point should be calculated _exact_ the same way as in ScanValuesInRect.
         // leftBottom + m_step doesn't work due to different floating results.
 
-        square.Init(
-            m_leftBottom.m_lon + m_step * j,        // Left
-            m_leftBottom.m_lat + m_step * i,        // Bottom
-            m_leftBottom.m_lon + m_step * (j + 1),  // Right
-            m_leftBottom.m_lat + m_step * (i + 1),  // Top
+        square.Init(m_leftBottom.m_lon + m_step * j,        // Left
+                    m_leftBottom.m_lat + m_step * i,        // Bottom
+                    m_leftBottom.m_lon + m_step * (j + 1),  // Right
+                    m_leftBottom.m_lat + m_step * (i + 1),  // Top
 
-            grid[Idx(i, j)],          // LB
-            grid[Idx(i, j + 1)],      // RB
-            grid[Idx(i + 1, j)],      // LT
-            grid[Idx(i + 1, j + 1)],  // RT
+                    grid[Idx(i, j)],          // LB
+                    grid[Idx(i, j + 1)],      // RB
+                    grid[Idx(i + 1, j)],      // LT
+                    grid[Idx(i + 1, j + 1)],  // RT
 
-            m_valuesProvider.GetInvalidValue());
+                    m_valuesProvider.GetInvalidValue());
 
         square.GenerateSegments(contoursBuilder);
       }
diff --git a/tools/topography_generator/marching_squares/square.hpp b/tools/topography_generator/marching_squares/square.hpp
index ef6173c7e..c06964762 100644
--- a/tools/topography_generator/marching_squares/square.hpp
+++ b/tools/topography_generator/marching_squares/square.hpp
@@ -2,7 +2,6 @@
 
 #include "topography_generator/marching_squares/contours_builder.hpp"
 
-
 namespace topography_generator
 {
 template <typename ValueType>
@@ -17,8 +16,8 @@ public:
     static_assert(std::is_integral<ValueType>::value && std::is_signed<ValueType>::value);
   }
 
-  void Init(double left, double bottom, double right, double top,
-            ValueType lb, ValueType rb, ValueType lt, ValueType rt, ValueType invalid)
+  void Init(double left, double bottom, double right, double top, ValueType lb, ValueType rb, ValueType lt,
+            ValueType rt, ValueType invalid)
   {
     m_isValid = true;
 
@@ -79,7 +78,7 @@ private:
     // Shift the value slightly from the corner.
     if (val == invalid)
     {
-      //LOG(LWARNING, ("Invalid value at the position", pos, m_debugId));
+      // LOG(LWARNING, ("Invalid value at the position", pos, m_debugId));
       m_isValid = false;
       return val;
     }
@@ -92,28 +91,27 @@ private:
   void AddSegments(ValueType val, uint16_t ind, ContoursBuilder & builder) const
   {
     // Segment is a vector directed so that higher values is on the right.
-    static const std::pair<Rib, Rib> intersectedRibs[] =
-      {
-        {Rib::None, Rib::None},       // 0000
-        {Rib::Left, Rib::Bottom},     // 0001
-        {Rib::Top, Rib::Left},        // 0010
-        {Rib::Top, Rib::Bottom},      // 0011
-        {Rib::Right, Rib::Top},       // 0100
-        {Rib::Unclear, Rib::Unclear}, // 0101
-        {Rib::Right, Rib::Left},      // 0110
-        {Rib::Right, Rib::Bottom},    // 0111
-        {Rib::Bottom, Rib::Right},    // 1000
-        {Rib::Left, Rib::Right},      // 1001
-        {Rib::Unclear, Rib::Unclear}, // 1010
-        {Rib::Top, Rib::Right},       // 1011
-        {Rib::Bottom, Rib::Top},      // 1100
-        {Rib::Left, Rib::Top},        // 1101
-        {Rib::Bottom, Rib::Left},     // 1110
-        {Rib::None, Rib::None},       // 1111
-      };
+    static std::pair<Rib, Rib> const intersectedRibs[] = {
+        {Rib::None, Rib::None},        // 0000
+        {Rib::Left, Rib::Bottom},      // 0001
+        {Rib::Top, Rib::Left},         // 0010
+        {Rib::Top, Rib::Bottom},       // 0011
+        {Rib::Right, Rib::Top},        // 0100
+        {Rib::Unclear, Rib::Unclear},  // 0101
+        {Rib::Right, Rib::Left},       // 0110
+        {Rib::Right, Rib::Bottom},     // 0111
+        {Rib::Bottom, Rib::Right},     // 1000
+        {Rib::Left, Rib::Right},       // 1001
+        {Rib::Unclear, Rib::Unclear},  // 1010
+        {Rib::Top, Rib::Right},        // 1011
+        {Rib::Bottom, Rib::Top},       // 1100
+        {Rib::Left, Rib::Top},         // 1101
+        {Rib::Bottom, Rib::Left},      // 1110
+        {Rib::None, Rib::None},        // 1111
+    };
 
-    uint8_t const pattern =  (m_valueLB > val ? 1u : 0u) | ((m_valueLT > val ? 1u : 0u) << 1u) |
-      ((m_valueRT > val ? 1u : 0u) << 2u) | ((m_valueRB > val ? 1u : 0u) << 3u);
+    uint8_t const pattern = (m_valueLB > val ? 1u : 0u) | ((m_valueLT > val ? 1u : 0u) << 1u) |
+                            ((m_valueRT > val ? 1u : 0u) << 2u) | ((m_valueRB > val ? 1u : 0u) << 3u);
 
     auto const ribs = intersectedRibs[pattern];
 
@@ -145,18 +143,15 @@ private:
           builder.AddSegment(ind, topPos, rightPos);
         }
       }
+      else if (m_valueLB > val)
+      {
+        builder.AddSegment(ind, leftPos, bottomPos);
+        builder.AddSegment(ind, rightPos, topPos);
+      }
       else
       {
-        if (m_valueLB > val)
-        {
-          builder.AddSegment(ind, leftPos, bottomPos);
-          builder.AddSegment(ind, rightPos, topPos);
-        }
-        else
-        {
-          builder.AddSegment(ind, topPos, leftPos);
-          builder.AddSegment(ind, bottomPos, rightPos);
-        }
+        builder.AddSegment(ind, topPos, leftPos);
+        builder.AddSegment(ind, bottomPos, rightPos);
       }
     }
   }
@@ -190,8 +185,7 @@ private:
       val2 = static_cast<double>(m_valueRB);
       lat = m_bottom;
       break;
-    default:
-      UNREACHABLE();
+    default: UNREACHABLE();
     }
 
     CHECK_NOT_EQUAL(val, val2, (m_debugId));
@@ -200,15 +194,10 @@ private:
     switch (rib)
     {
     case Rib::Left:
-    case Rib::Right:
-      lat = (m_bottom + m_top * coeff) / (1 + coeff);
-      break;
+    case Rib::Right: lat = (m_bottom + m_top * coeff) / (1 + coeff); break;
     case Rib::Bottom:
-    case Rib::Top:
-      lon = (m_left + m_right * coeff) / (1 + coeff);
-      break;
-    default:
-      UNREACHABLE();
+    case Rib::Top: lon = (m_left + m_right * coeff) / (1 + coeff); break;
+    default: UNREACHABLE();
     }
 
     return {lat, lon};
@@ -230,4 +219,4 @@ private:
 
   bool m_isValid;
 };
-}  // topography_generator
+}  // namespace topography_generator
diff --git a/tools/topography_generator/tile_filter.hpp b/tools/topography_generator/tile_filter.hpp
index 47887d3ba..14f0e5c6f 100644
--- a/tools/topography_generator/tile_filter.hpp
+++ b/tools/topography_generator/tile_filter.hpp
@@ -11,23 +11,19 @@ public:
   virtual ~FilterInterface() = default;
 
   virtual size_t GetKernelRadius() const = 0;
-  virtual void Process(size_t tileSize, size_t tileOffset,
-               std::vector<ValueType> const & srcValues,
-               std::vector<ValueType> & dstValues, ValueType invalidValue) const = 0;
+  virtual void Process(size_t tileSize, size_t tileOffset, std::vector<ValueType> const & srcValues,
+                       std::vector<ValueType> & dstValues, ValueType invalidValue) const = 0;
 };
 
 template <typename ValueType>
 class MedianFilter : public FilterInterface<ValueType>
 {
 public:
-  explicit MedianFilter(size_t kernelRadius)
-    : m_kernelRadius(kernelRadius)
-  {}
+  explicit MedianFilter(size_t kernelRadius) : m_kernelRadius(kernelRadius) {}
 
   size_t GetKernelRadius() const override { return m_kernelRadius; }
 
-  void Process(size_t tileSize, size_t tileOffset,
-               std::vector<ValueType> const & srcValues,
+  void Process(size_t tileSize, size_t tileOffset, std::vector<ValueType> const & srcValues,
                std::vector<ValueType> & dstValues, ValueType invalidValue) const override
   {
     ProcessMedian(m_kernelRadius, tileSize, tileOffset, srcValues, dstValues, invalidValue);
@@ -47,8 +43,7 @@ public:
 
   size_t GetKernelRadius() const override { return m_kernel.size() / 2; }
 
-  void Process(size_t tileSize, size_t tileOffset,
-               std::vector<ValueType> const & srcValues,
+  void Process(size_t tileSize, size_t tileOffset, std::vector<ValueType> const & srcValues,
                std::vector<ValueType> & dstValues, ValueType invalidValue) const override
   {
     ProcessWithLinearKernel(m_kernel, tileSize, tileOffset, srcValues, dstValues, invalidValue);
@@ -62,10 +57,8 @@ template <typename ValueType>
 using FiltersSequence = std::vector<std::unique_ptr<FilterInterface<ValueType>>>;
 
 template <typename ValueType>
-std::vector<ValueType> FilterTile(FiltersSequence<ValueType> const & filters,
-                                  ms::LatLon const & leftBottom,
-                                  size_t stepsInDegree, size_t tileSize,
-                                  ValuesProvider<ValueType> & valuesProvider)
+std::vector<ValueType> FilterTile(FiltersSequence<ValueType> const & filters, ms::LatLon const & leftBottom,
+                                  size_t stepsInDegree, size_t tileSize, ValuesProvider<ValueType> & valuesProvider)
 {
   size_t combinedOffset = 0;
   for (auto const & filter : filters)
diff --git a/tools/topography_generator/utils/contours.hpp b/tools/topography_generator/utils/contours.hpp
index 0481cc9c2..c0b40ae2d 100644
--- a/tools/topography_generator/utils/contours.hpp
+++ b/tools/topography_generator/utils/contours.hpp
@@ -7,8 +7,8 @@
 
 #include "indexer/scales.hpp"
 
-#include <vector>
 #include <unordered_map>
+#include <vector>
 
 namespace topography_generator
 {
@@ -27,12 +27,12 @@ struct Contours
   ValueType m_minValue = 0;
   ValueType m_maxValue = 0;
   ValueType m_valueStep = 0;
-  size_t m_invalidValuesCount = 0; // for debug purpose only.
+  size_t m_invalidValuesCount = 0;  // for debug purpose only.
 };
 
 template <typename ValueType>
-void CropContours(m2::RectD & rect, std::vector<m2::RegionD> & regions, size_t maxLength,
-                  size_t valueStepFactor, Contours<ValueType> & contours)
+void CropContours(m2::RectD & rect, std::vector<m2::RegionD> & regions, size_t maxLength, size_t valueStepFactor,
+                  Contours<ValueType> & contours)
 {
   static_assert(std::is_integral<ValueType>::value, "Only integral types are supported.");
 
@@ -90,8 +90,7 @@ void SimplifyContours(int simplificationZoom, Contours<ValueType> & contours)
     for (auto & contour : levelContours.second)
     {
       std::vector<m2::PointD> contourSimple;
-      feature::SimplifyPoints(m2::SquaredDistanceFromSegmentToPoint(),
-                              simplificationZoom, contour, contourSimple);
+      feature::SimplifyPoints(m2::SquaredDistanceFromSegmentToPoint(), simplificationZoom, contour, contourSimple);
       CHECK_GREATER(contourSimple.size(), 1, ());
       // Discard closed lines which are degenerate (<=3 points) or too small for the requested zoom level.
       /// @todo it doesn't fix all cases as the simplification algo
diff --git a/tools/topography_generator/utils/contours_serdes.hpp b/tools/topography_generator/utils/contours_serdes.hpp
index c72b99354..d1430b3aa 100644
--- a/tools/topography_generator/utils/contours_serdes.hpp
+++ b/tools/topography_generator/utils/contours_serdes.hpp
@@ -2,8 +2,8 @@
 
 #include "topography_generator/utils/contours.hpp"
 
-#include "coding/file_writer.hpp"
 #include "coding/file_reader.hpp"
+#include "coding/file_writer.hpp"
 #include "coding/geometry_coding.hpp"
 #include "coding/internal/file_data.hpp"
 
@@ -13,7 +13,7 @@ template <typename ValueType>
 class SerializerContours
 {
 public:
-  explicit SerializerContours(Contours<ValueType> && contours): m_contours(std::move(contours)) {}
+  explicit SerializerContours(Contours<ValueType> && contours) : m_contours(std::move(contours)) {}
 
   template <typename Sink>
   void Serialize(Sink & sink)
@@ -31,8 +31,7 @@ public:
 
 private:
   template <typename Sink>
-  void SerializeContours(Sink & sink, ValueType value,
-                         std::vector<topography_generator::Contour> const & contours)
+  void SerializeContours(Sink & sink, ValueType value, std::vector<topography_generator::Contour> const & contours)
   {
     WriteToSink(sink, value);
     WriteToSink(sink, static_cast<uint32_t>(contours.size()));
@@ -81,7 +80,7 @@ public:
 
 private:
   void DeserializeContours(NonOwningReaderSource & source, ValueType & value,
-                            std::vector<topography_generator::Contour> & contours)
+                           std::vector<topography_generator::Contour> & contours)
   {
     value = ReadPrimitiveFromSource<ValueType>(source);
     size_t const contoursCount = ReadPrimitiveFromSource<uint32_t>(source);
@@ -90,8 +89,7 @@ private:
       DeserializeContour(source, contour);
   }
 
-  void DeserializeContour(NonOwningReaderSource & source,
-                          topography_generator::Contour & contour)
+  void DeserializeContour(NonOwningReaderSource & source, topography_generator::Contour & contour)
   {
     serial::GeometryCodingParams codingParams;
     codingParams.Load(source);
@@ -102,8 +100,7 @@ private:
 };
 
 template <typename ValueType>
-bool SaveContrours(std::string const & filePath,
-                   Contours<ValueType> && contours)
+bool SaveContrours(std::string const & filePath, Contours<ValueType> && contours)
 {
   auto const tmpFilePath = filePath + ".tmp";
   try
diff --git a/tools/track_analyzing/log_parser.cpp b/tools/track_analyzing/log_parser.cpp
index dc02fe8f9..add71072e 100644
--- a/tools/track_analyzing/log_parser.cpp
+++ b/tools/track_analyzing/log_parser.cpp
@@ -33,8 +33,7 @@ vector<DataPoint> ReadDataPoints(string const & data)
 
   try
   {
-    coding::TrafficGPSEncoder::DeserializeDataPoints(coding::TrafficGPSEncoder::kLatestVersion, src,
-                                                     points);
+    coding::TrafficGPSEncoder::DeserializeDataPoints(coding::TrafficGPSEncoder::kLatestVersion, src, points);
   }
   catch (Reader::SizeException const & e)
   {
@@ -48,11 +47,12 @@ vector<DataPoint> ReadDataPoints(string const & data)
 class PointToMwmId final
 {
 public:
-  PointToMwmId(shared_ptr<m4::Tree<routing::NumMwmId>> mwmTree,
-               routing::NumMwmIds const & numMwmIds, string const & dataDir)
+  PointToMwmId(shared_ptr<m4::Tree<routing::NumMwmId>> mwmTree, routing::NumMwmIds const & numMwmIds,
+               string const & dataDir)
     : m_mwmTree(mwmTree)
   {
-    numMwmIds.ForEachId([&](routing::NumMwmId numMwmId) {
+    numMwmIds.ForEachId([&](routing::NumMwmId numMwmId)
+    {
       string const & mwmName = numMwmIds.GetFile(numMwmId).GetName();
       string const polyFile = base::JoinPath(dataDir, BORDERS_DIR, mwmName + BORDERS_EXTENSION);
       borders::LoadBorders(polyFile, m_borders[numMwmId]);
@@ -66,7 +66,8 @@ public:
 
     routing::NumMwmId result = routing::kFakeNumMwmId;
     m2::RectD const rect = mercator::RectByCenterXYAndSizeInMeters(point, 1);
-    m_mwmTree->ForEachInRect(rect, [&](routing::NumMwmId numMwmId) {
+    m_mwmTree->ForEachInRect(rect, [&](routing::NumMwmId numMwmId)
+    {
       if (result == routing::kFakeNumMwmId && m2::RegionsContain(GetBorders(numMwmId), point))
         result = numMwmId;
     });
@@ -89,9 +90,11 @@ private:
 
 namespace track_analyzing
 {
-LogParser::LogParser(shared_ptr<routing::NumMwmIds> numMwmIds,
-                     unique_ptr<m4::Tree<routing::NumMwmId>> mwmTree, string const & dataDir)
-  : m_numMwmIds(std::move(numMwmIds)), m_mwmTree(std::move(mwmTree)), m_dataDir(dataDir)
+LogParser::LogParser(shared_ptr<routing::NumMwmIds> numMwmIds, unique_ptr<m4::Tree<routing::NumMwmId>> mwmTree,
+                     string const & dataDir)
+  : m_numMwmIds(std::move(numMwmIds))
+  , m_mwmTree(std::move(mwmTree))
+  , m_dataDir(dataDir)
 {
   CHECK(m_numMwmIds, ());
   CHECK(m_mwmTree, ());
@@ -145,10 +148,9 @@ void LogParser::ParseUserTracks(string const & logFile, UserToTrack & userToTrac
     pointsCount += packet.size();
   };
 
-  LOG(LINFO, ("Tracks parsing finished, elapsed:", timer.ElapsedSeconds(), "seconds, lines:",
-              linesCount, ", points", pointsCount));
-  LOG(LINFO, ("Users with current version:", userToTrack.size(), ", old version:",
-              usersWithOldVersion.size()));
+  LOG(LINFO, ("Tracks parsing finished, elapsed:", timer.ElapsedSeconds(), "seconds, lines:", linesCount, ", points",
+              pointsCount));
+  LOG(LINFO, ("Users with current version:", userToTrack.size(), ", old version:", usersWithOldVersion.size()));
 }
 
 void LogParser::SplitIntoMwms(UserToTrack const & userToTrack, MwmToTracks & mwmToTracks) const
@@ -173,7 +175,6 @@ void LogParser::SplitIntoMwms(UserToTrack const & userToTrack, MwmToTracks & mwm
     }
   }
 
-  LOG(LINFO, ("Data was split into", mwmToTracks.size(), "mwms, elapsed:", timer.ElapsedSeconds(),
-              "seconds"));
+  LOG(LINFO, ("Data was split into", mwmToTracks.size(), "mwms, elapsed:", timer.ElapsedSeconds(), "seconds"));
 }
 }  // namespace track_analyzing
diff --git a/tools/track_analyzing/log_parser.hpp b/tools/track_analyzing/log_parser.hpp
index ddf6855c5..ff1d687a6 100644
--- a/tools/track_analyzing/log_parser.hpp
+++ b/tools/track_analyzing/log_parser.hpp
@@ -14,8 +14,8 @@ namespace track_analyzing
 class LogParser final
 {
 public:
-  LogParser(std::shared_ptr<routing::NumMwmIds> numMwmIds,
-            std::unique_ptr<m4::Tree<routing::NumMwmId>> mwmTree, std::string const & dataDir);
+  LogParser(std::shared_ptr<routing::NumMwmIds> numMwmIds, std::unique_ptr<m4::Tree<routing::NumMwmId>> mwmTree,
+            std::string const & dataDir);
 
   void Parse(std::string const & logFile, MwmToTracks & mwmToTracks) const;
 
diff --git a/tools/track_analyzing/serialization.hpp b/tools/track_analyzing/serialization.hpp
index 9ef3a8906..6ad01433e 100644
--- a/tools/track_analyzing/serialization.hpp
+++ b/tools/track_analyzing/serialization.hpp
@@ -27,10 +27,7 @@ namespace track_analyzing
 class MwmToMatchedTracksSerializer final
 {
 public:
-  MwmToMatchedTracksSerializer(std::shared_ptr<routing::NumMwmIds> numMwmIds)
-    : m_numMwmIds(std::move(numMwmIds))
-  {
-  }
+  MwmToMatchedTracksSerializer(std::shared_ptr<routing::NumMwmIds> numMwmIds) : m_numMwmIds(std::move(numMwmIds)) {}
 
   template <typename Sink>
   void Serialize(MwmToMatchedTracks const & mwmToMatchedTracks, Sink & sink)
@@ -68,8 +65,8 @@ public:
 
           std::vector<uint8_t> buffer;
           MemWriter<decltype(buffer)> memWriter(buffer);
-          coding::TrafficGPSEncoder::SerializeDataPoints(coding::TrafficGPSEncoder::kLatestVersion,
-                                                         memWriter, dataPoints);
+          coding::TrafficGPSEncoder::SerializeDataPoints(coding::TrafficGPSEncoder::kLatestVersion, memWriter,
+                                                         dataPoints);
 
           WriteSize(sink, buffer.size());
           sink.Write(buffer.data(), buffer.size());
@@ -123,8 +120,8 @@ public:
           ReaderSource<MemReader> memSrc(memReader);
 
           std::vector<DataPoint> dataPoints;
-          coding::TrafficGPSEncoder::DeserializeDataPoints(
-              coding::TrafficGPSEncoder::kLatestVersion, memSrc, dataPoints);
+          coding::TrafficGPSEncoder::DeserializeDataPoints(coding::TrafficGPSEncoder::kLatestVersion, memSrc,
+                                                           dataPoints);
           CHECK_EQUAL(numSegments, dataPoints.size(), ("mwm:", mwmName, "user:", user));
 
           MatchedTrack & track = tracks[iTrack];
diff --git a/tools/track_analyzing/temporary_file.cpp b/tools/track_analyzing/temporary_file.cpp
index 7ab88b078..9e6641d29 100644
--- a/tools/track_analyzing/temporary_file.cpp
+++ b/tools/track_analyzing/temporary_file.cpp
@@ -10,8 +10,7 @@ TemporaryFile::TemporaryFile() : m_filePath(GetPlatform().TmpPathForFile()) {}
 
 TemporaryFile::TemporaryFile(std::string const & namePrefix, std::string const & nameSuffix)
   : m_filePath(GetPlatform().TmpPathForFile(namePrefix, nameSuffix))
-{
-}
+{}
 
 TemporaryFile::~TemporaryFile()
 {
diff --git a/tools/track_analyzing/temporary_file.hpp b/tools/track_analyzing/temporary_file.hpp
index ddfcc7f33..30d743a8f 100644
--- a/tools/track_analyzing/temporary_file.hpp
+++ b/tools/track_analyzing/temporary_file.hpp
@@ -13,10 +13,7 @@ public:
 
   ~TemporaryFile();
 
-  std::string const & GetFilePath() const
-  {
-    return m_filePath;
-  }
+  std::string const & GetFilePath() const { return m_filePath; }
 
   void WriteData(std::string const & data);
 
diff --git a/tools/track_analyzing/track.cpp b/tools/track_analyzing/track.cpp
index fa924eeef..af3fe32f0 100644
--- a/tools/track_analyzing/track.cpp
+++ b/tools/track_analyzing/track.cpp
@@ -2,18 +2,15 @@
 
 namespace track_analyzing
 {
-TrackFilter::TrackFilter(uint64_t minDuration, double minLength, double minSpeed, double maxSpeed,
-                         bool ignoreTraffic)
+TrackFilter::TrackFilter(uint64_t minDuration, double minLength, double minSpeed, double maxSpeed, bool ignoreTraffic)
   : m_minDuration(minDuration)
   , m_minLength(minLength)
   , m_minSpeed(minSpeed)
   , m_maxSpeed(maxSpeed)
   , m_ignoreTraffic(ignoreTraffic)
-{
-}
+{}
 
-bool TrackFilter::Passes(uint64_t duration, double length, double speed,
-                         bool hasTrafficPoints) const
+bool TrackFilter::Passes(uint64_t duration, double length, double speed, bool hasTrafficPoints) const
 {
   if (duration < m_minDuration)
     return false;
diff --git a/tools/track_analyzing/track.hpp b/tools/track_analyzing/track.hpp
index d92ecd17e..a100aca41 100644
--- a/tools/track_analyzing/track.hpp
+++ b/tools/track_analyzing/track.hpp
@@ -21,9 +21,9 @@ class MatchedTrackPoint final
 {
 public:
   MatchedTrackPoint(DataPoint const & dataPoint, routing::Segment const & segment)
-    : m_dataPoint(dataPoint), m_segment(segment)
-  {
-  }
+    : m_dataPoint(dataPoint)
+    , m_segment(segment)
+  {}
 
   DataPoint const & GetDataPoint() const { return m_dataPoint; }
   routing::Segment const & GetSegment() const { return m_segment; }
@@ -40,8 +40,7 @@ using MwmToMatchedTracks = std::unordered_map<routing::NumMwmId, UserToMatchedTr
 class TrackFilter final
 {
 public:
-  TrackFilter(uint64_t minDuration, double minLength, double minSpeed, double maxSpeed,
-              bool ignoreTraffic);
+  TrackFilter(uint64_t minDuration, double minLength, double minSpeed, double maxSpeed, bool ignoreTraffic);
 
   bool Passes(uint64_t duration, double length, double speed, bool hasTrafficPoints) const;
 
diff --git a/tools/track_analyzing/track_analyzer/cmd_balance_csv.cpp b/tools/track_analyzing/track_analyzer/cmd_balance_csv.cpp
index 90bec22a1..ed72ae71c 100644
--- a/tools/track_analyzing/track_analyzer/cmd_balance_csv.cpp
+++ b/tools/track_analyzing/track_analyzer/cmd_balance_csv.cpp
@@ -26,11 +26,10 @@ namespace track_analyzing
 {
 using namespace std;
 
-void FillTable(basic_istream<char> & tableCsvStream, MwmToDataPoints & matchedDataPoints,
-               vector<TableRow> & table)
+void FillTable(basic_istream<char> & tableCsvStream, MwmToDataPoints & matchedDataPoints, vector<TableRow> & table)
 {
-  for (auto const & row : coding::CSVRunner(
-      coding::CSVReader(tableCsvStream, true /* hasHeader */, ',' /* delimiter */)))
+  for (auto const & row :
+       coding::CSVRunner(coding::CSVReader(tableCsvStream, true /* hasHeader */, ',' /* delimiter */)))
   {
     CHECK_EQUAL(row.size(), kTableColumns, (row));
     auto const & mwmName = row[kMwmNameCsvColumn];
@@ -39,13 +38,12 @@ void FillTable(basic_istream<char> & tableCsvStream, MwmToDataPoints & matchedDa
   }
 }
 
-void RemoveKeysSmallValue(MwmToDataPoints & checkedMap, MwmToDataPoints & additionalMap,
-                          uint64_t ignoreDataPointNumber)
+void RemoveKeysSmallValue(MwmToDataPoints & checkedMap, MwmToDataPoints & additionalMap, uint64_t ignoreDataPointNumber)
 {
   CHECK(AreKeysEqual(additionalMap, checkedMap),
         ("Mwms in |checkedMap| and in |additionalMap| should have the same set of keys."));
 
-  for (auto it = checkedMap.begin() ; it != checkedMap.end();)
+  for (auto it = checkedMap.begin(); it != checkedMap.end();)
   {
     auto const dataPointNumberAfterMatching = it->second;
     if (dataPointNumberAfterMatching > ignoreDataPointNumber)
@@ -72,14 +70,13 @@ MwmToDataPointFraction GetMwmToDataPointFraction(MwmToDataPoints const & numberM
   return fractionMapping;
 }
 
-MwmToDataPoints CalcsMatchedDataPointsToKeepDistribution(
-    MwmToDataPoints const & matchedDataPoints, MwmToDataPointFraction const & distributionFractions)
+MwmToDataPoints CalcsMatchedDataPointsToKeepDistribution(MwmToDataPoints const & matchedDataPoints,
+                                                         MwmToDataPointFraction const & distributionFractions)
 {
   CHECK(!matchedDataPoints.empty(), ());
   CHECK(AreKeysEqual(matchedDataPoints, distributionFractions),
         ("Mwms in |matchedDataPoints| and in |distributionFractions| should have the same set of keys."));
-  CHECK(AlmostEqualAbs(ValueSum(distributionFractions), 1.0, kSumFractionEps),
-        (ValueSum(distributionFractions)));
+  CHECK(AlmostEqualAbs(ValueSum(distributionFractions), 1.0, kSumFractionEps), (ValueSum(distributionFractions)));
 
   auto const matchedFractions = GetMwmToDataPointFraction(matchedDataPoints);
 
@@ -137,17 +134,14 @@ MwmToDataPoints CalcsMatchedDataPointsToKeepDistribution(
 
     if (matchedDataPointsToKeepDistributionForMwm == 0)
     {
-      LOG(LWARNING, ("Zero points should be put to", mwm,
-                     "to keep the distribution. Distribution fraction:", fraction,
-                     "totalMatchedPointNumberToKeepDistribution:",
-                     totalMatchedPointNumberToKeepDistribution));
+      LOG(LWARNING, ("Zero points should be put to", mwm, "to keep the distribution. Distribution fraction:", fraction,
+                     "totalMatchedPointNumberToKeepDistribution:", totalMatchedPointNumberToKeepDistribution));
     }
   }
   return matchedDataPointsToKeepDistribution;
 }
 
-MwmToDataPoints BalancedDataPointNumber(MwmToDataPoints && matchedDataPoints,
-                                        MwmToDataPoints && distribution,
+MwmToDataPoints BalancedDataPointNumber(MwmToDataPoints && matchedDataPoints, MwmToDataPoints && distribution,
                                         uint64_t ignoreDataPointsNumber)
 {
   // Removing every mwm from |distribution| and |matchedDataPoints| if it has
@@ -188,7 +182,7 @@ void FilterTable(MwmToDataPoints const & balancedDataPointNumbers, vector<TableR
     auto it = balancedDataPointNumbers.find(mwmName);
     if (it == balancedDataPointNumbers.end())
     {
-      mwmRecordsIndices.resize(0); // No indices.
+      mwmRecordsIndices.resize(0);  // No indices.
       continue;
     }
 
@@ -201,16 +195,13 @@ void FilterTable(MwmToDataPoints const & balancedDataPointNumbers, vector<TableR
   // Refilling |table| with part of its items to corresponds |balancedDataPointNumbers| distribution.
   vector<TableRow> balancedTable;
   for (auto const & kv : tableIdx)
-  {
     for (auto const idx : kv.second)
       balancedTable.emplace_back(std::move(table[idx]));
-  }
   table = std::move(balancedTable);
 }
 
-void BalanceDataPoints(basic_istream<char> & tableCsvStream,
-                       basic_istream<char> & distributionCsvStream, uint64_t ignoreDataPointsNumber,
-                       vector<TableRow> & balancedTable)
+void BalanceDataPoints(basic_istream<char> & tableCsvStream, basic_istream<char> & distributionCsvStream,
+                       uint64_t ignoreDataPointsNumber, vector<TableRow> & balancedTable)
 {
   LOG(LINFO, ("Balancing data points..."));
   // Filling a map mwm to DataPoints number according to distribution csv file.
@@ -232,15 +223,14 @@ void BalanceDataPoints(basic_istream<char> & tableCsvStream,
 
   // Removing every mwm from |distribution| if there is no such mwm in |matchedDataPoints|.
   for (auto it = distribution.begin(); it != distribution.end();)
-  {
     if (matchedDataPoints.count(it->first) == 0)
       it = distribution.erase(it);
     else
       ++it;
-  }
 
   CHECK(AreKeysEqual(distribution, matchedDataPoints),
-        ("Mwms in |distribution| and in |matchedDataPoints| should have the same set of keys.", distribution, matchedDataPoints));
+        ("Mwms in |distribution| and in |matchedDataPoints| should have the same set of keys.", distribution,
+         matchedDataPoints));
 
   // Calculating how many points should have every mwm to keep the |distribution|.
   MwmToDataPoints const balancedDataPointNumber =
@@ -252,18 +242,15 @@ void BalanceDataPoints(basic_istream<char> & tableCsvStream,
   // Removing some items form |tableCsvStream| (if it's necessary) to correspond to
   // the distribution.
   FilterTable(balancedDataPointNumber, balancedTable);
-  LOG(LINFO, ("Data points have balanced. Total distribution data points number:",
-              totalDistributionDataPointsNumber,
+  LOG(LINFO, ("Data points have balanced. Total distribution data points number:", totalDistributionDataPointsNumber,
               "Total matched data points number:", totalMatchedDataPointsNumber,
               "Total balanced data points number:", totalBalancedDataPointsNumber));
 }
 
-void CmdBalanceCsv(string const & csvPath, string const & distributionPath,
-                   uint64_t ignoreDataPointsNumber)
+void CmdBalanceCsv(string const & csvPath, string const & distributionPath, uint64_t ignoreDataPointsNumber)
 {
-  LOG(LINFO, ("Balancing csv file", csvPath, "with distribution set in", distributionPath,
-              ". If an mwm has", ignoreDataPointsNumber,
-              "data points or less it will not be considered."));
+  LOG(LINFO, ("Balancing csv file", csvPath, "with distribution set in", distributionPath, ". If an mwm has",
+              ignoreDataPointsNumber, "data points or less it will not be considered."));
   ifstream table(csvPath);
   CHECK(table.is_open(), ("Cannot open", csvPath));
   ifstream distribution(distributionPath);
diff --git a/tools/track_analyzing/track_analyzer/cmd_balance_csv.hpp b/tools/track_analyzing/track_analyzer/cmd_balance_csv.hpp
index 15dda00e5..caf2f81dc 100644
--- a/tools/track_analyzing/track_analyzer/cmd_balance_csv.hpp
+++ b/tools/track_analyzing/track_analyzer/cmd_balance_csv.hpp
@@ -32,17 +32,17 @@ typename MapCont::mapped_type ValueSum(MapCont const & mapCont)
 }
 
 /// \returns true if |map1| and |map2| have the same key and false otherwise.
-template<typename Map1, typename Map2>
+template <typename Map1, typename Map2>
 bool AreKeysEqual(Map1 const & map1, Map2 const & map2)
 {
   if (map1.size() != map2.size())
   {
-    LOG(LINFO,
-        ("AreKeysEqual() returns false. map1.size():", map1.size(), "map2.size()", map2.size()));
+    LOG(LINFO, ("AreKeysEqual() returns false. map1.size():", map1.size(), "map2.size()", map2.size()));
     return false;
   }
 
-  return std::equal(map1.begin(), map1.end(), map2.begin(), [](auto const & kv1, auto const & kv2) {
+  return std::equal(map1.begin(), map1.end(), map2.begin(), [](auto const & kv1, auto const & kv2)
+  {
     if (kv1.first == kv2.first)
       return true;
 
@@ -68,13 +68,11 @@ MwmToDataPointFraction GetMwmToDataPointFraction(MwmToDataPoints const & numberM
 /// *  number of data points in the returned mapping is less than or equal to
 ///    number of data points in |matchedDataPoints| for every mwm
 /// * distribution defined by |distributionFraction| is kept
-MwmToDataPoints CalcsMatchedDataPointsToKeepDistribution(
-    MwmToDataPoints const & matchedDataPoints,
-    MwmToDataPointFraction const & distributionFractions);
+MwmToDataPoints CalcsMatchedDataPointsToKeepDistribution(MwmToDataPoints const & matchedDataPoints,
+                                                         MwmToDataPointFraction const & distributionFractions);
 
 /// \returns mapping with number of matched data points for every mwm to correspond to |distribution|.
-MwmToDataPoints BalancedDataPointNumber(MwmToDataPoints && matchedDataPoints,
-                                        MwmToDataPoints && distribution,
+MwmToDataPoints BalancedDataPointNumber(MwmToDataPoints && matchedDataPoints, MwmToDataPoints && distribution,
                                         uint64_t ignoreDataPointsNumber);
 
 /// \breif Leaves in |table| only number of items according to |balancedDataPointNumbers|.
@@ -83,13 +81,11 @@ void FilterTable(MwmToDataPoints const & balancedDataPointNumbers, std::vector<T
 
 /// \brief Fills |balancedTable| with TableRow(s) according to the distribution set in
 /// |distributionCsvStream|.
-void BalanceDataPoints(std::basic_istream<char> & tableCsvStream,
-                       std::basic_istream<char> & distributionCsvStream,
+void BalanceDataPoints(std::basic_istream<char> & tableCsvStream, std::basic_istream<char> & distributionCsvStream,
                        uint64_t ignoreDataPointsNumber, std::vector<TableRow> & balancedTable);
 
 /// \brief Removes some data point for every mwm from |csvPath| to correspond distribution
 /// set in |distributionPath|. If an mwm in |csvPath| contains data points less of equal to
 /// |ignoreDataPointsNumber| than the mwm will not be taken into acount while balancing.
-void CmdBalanceCsv(std::string const & csvPath, std::string const & distributionPath,
-                   uint64_t ignoreDataPointsNumber);
+void CmdBalanceCsv(std::string const & csvPath, std::string const & distributionPath, uint64_t ignoreDataPointsNumber);
 }  // namespace track_analyzing
diff --git a/tools/track_analyzing/track_analyzer/cmd_cpp_track.cpp b/tools/track_analyzing/track_analyzer/cmd_cpp_track.cpp
index 15058e921..a1a98257d 100644
--- a/tools/track_analyzing/track_analyzer/cmd_cpp_track.cpp
+++ b/tools/track_analyzing/track_analyzer/cmd_cpp_track.cpp
@@ -9,24 +9,19 @@ using namespace std;
 
 namespace track_analyzing
 {
-void CmdCppTrack(string const & trackFile, string const & mwmName, string const & user,
-                 size_t trackIdx)
+void CmdCppTrack(string const & trackFile, string const & mwmName, string const & user, size_t trackIdx)
 {
   storage::Storage storage;
   auto const numMwmIds = CreateNumMwmIds(storage);
   MwmToMatchedTracks mwmToMatchedTracks;
   ReadTracks(numMwmIds, trackFile, mwmToMatchedTracks);
 
-  MatchedTrack const & track =
-      GetMatchedTrack(mwmToMatchedTracks, *numMwmIds, mwmName, user, trackIdx);
+  MatchedTrack const & track = GetMatchedTrack(mwmToMatchedTracks, *numMwmIds, mwmName, user, trackIdx);
 
   auto const backupPrecision = cout.precision();
   cout.precision(8);
   for (MatchedTrackPoint const & point : track)
-  {
-    cout << "  {" << point.GetDataPoint().m_latLon.m_lat << ", " << point.GetDataPoint().m_latLon.m_lon
-         << "}," << endl;
-  }
+    cout << "  {" << point.GetDataPoint().m_latLon.m_lat << ", " << point.GetDataPoint().m_latLon.m_lon << "}," << endl;
   cout.precision(backupPrecision);
 }
 }  // namespace track_analyzing
diff --git a/tools/track_analyzing/track_analyzer/cmd_gpx.cpp b/tools/track_analyzing/track_analyzer/cmd_gpx.cpp
index 962b06152..adecfe7ef 100644
--- a/tools/track_analyzing/track_analyzer/cmd_gpx.cpp
+++ b/tools/track_analyzing/track_analyzer/cmd_gpx.cpp
@@ -48,10 +48,7 @@ void CmdGPX(string const & logFile, string const & outputDirName, string const &
       ofs << "</metadata>\n";
       for (auto const & point : track.second)
       {
-        ofs << "<wpt lat=\""
-            << point.m_latLon.m_lat
-            << "\" lon=\""
-            << point.m_latLon.m_lon << "\">"
+        ofs << "<wpt lat=\"" << point.m_latLon.m_lat << "\" lon=\"" << point.m_latLon.m_lon << "\">"
             << "</wpt>\n";
       }
 
diff --git a/tools/track_analyzing/track_analyzer/cmd_match.cpp b/tools/track_analyzing/track_analyzer/cmd_match.cpp
index b23a9ceb9..316a0a3f8 100644
--- a/tools/track_analyzing/track_analyzer/cmd_match.cpp
+++ b/tools/track_analyzing/track_analyzer/cmd_match.cpp
@@ -37,8 +37,8 @@ namespace
 {
 using Iter = typename vector<string>::iterator;
 
-void MatchTracks(MwmToTracks const & mwmToTracks, storage::Storage const & storage,
-                 NumMwmIds const & numMwmIds, MwmToMatchedTracks & mwmToMatchedTracks)
+void MatchTracks(MwmToTracks const & mwmToTracks, storage::Storage const & storage, NumMwmIds const & numMwmIds,
+                 MwmToMatchedTracks & mwmToMatchedTracks)
 {
   base::Timer timer;
 
@@ -46,7 +46,8 @@ void MatchTracks(MwmToTracks const & mwmToTracks, storage::Storage const & stora
   uint64_t pointsCount = 0;
   uint64_t nonMatchedPointsCount = 0;
 
-  auto processMwm = [&](string const & mwmName, UserToTrack const & userToTrack) {
+  auto processMwm = [&](string const & mwmName, UserToTrack const & userToTrack)
+  {
     auto const countryFile = platform::CountryFile(mwmName);
     auto const mwmId = numMwmIds.GetId(countryFile);
     TrackMatcher matcher(storage, mwmId, countryFile);
@@ -78,23 +79,22 @@ void MatchTracks(MwmToTracks const & mwmToTracks, storage::Storage const & stora
     pointsCount += matcher.GetPointsCount();
     nonMatchedPointsCount += matcher.GetNonMatchedPointsCount();
 
-    LOG(LINFO, (numMwmIds.GetFile(mwmId).GetName(), ", users:", userToTrack.size(), ", tracks:",
-                matcher.GetTracksCount(), ", points:", matcher.GetPointsCount(),
-                ", non matched points:", matcher.GetNonMatchedPointsCount()));
+    LOG(LINFO,
+        (numMwmIds.GetFile(mwmId).GetName(), ", users:", userToTrack.size(), ", tracks:", matcher.GetTracksCount(),
+         ", points:", matcher.GetPointsCount(), ", non matched points:", matcher.GetNonMatchedPointsCount()));
   };
 
   ForTracksSortedByMwmName(mwmToTracks, numMwmIds, processMwm);
 
-  LOG(LINFO,
-      ("Matching finished, elapsed:", timer.ElapsedSeconds(), "seconds, tracks:", tracksCount,
-       ", points:", pointsCount, ", non matched points:", nonMatchedPointsCount));
+  LOG(LINFO, ("Matching finished, elapsed:", timer.ElapsedSeconds(), "seconds, tracks:", tracksCount,
+              ", points:", pointsCount, ", non matched points:", nonMatchedPointsCount));
 }
 }  // namespace
 
 namespace track_analyzing
 {
-void CmdMatch(string const & logFile, string const & trackFile,
-              shared_ptr<NumMwmIds> const & numMwmIds, Storage const & storage, Stats & stats)
+void CmdMatch(string const & logFile, string const & trackFile, shared_ptr<NumMwmIds> const & numMwmIds,
+              Storage const & storage, Stats & stats)
 {
   MwmToTracks mwmToTracks;
   ParseTracks(logFile, numMwmIds, mwmToTracks);
@@ -165,8 +165,7 @@ void UnzipAndMatch(Iter begin, Iter end, string const & trackExt, Stats & stats)
 
 void CmdMatchDir(string const & logDir, string const & trackExt, string const & inputDistribution)
 {
-  LOG(LINFO,
-      ("Matching dir:", logDir, ". Input distribution will be saved to:", inputDistribution));
+  LOG(LINFO, ("Matching dir:", logDir, ". Input distribution will be saved to:", inputDistribution));
   Platform::EFileType fileType = Platform::EFileType::Unknown;
   Platform::EError const result = Platform::GetFileType(logDir, fileType);
 
diff --git a/tools/track_analyzing/track_analyzer/cmd_table.cpp b/tools/track_analyzing/track_analyzer/cmd_table.cpp
index ff3af8934..dfb5c875f 100644
--- a/tools/track_analyzing/track_analyzer/cmd_table.cpp
+++ b/tools/track_analyzing/track_analyzer/cmd_table.cpp
@@ -69,11 +69,9 @@ bool DayTimeToBool(DayTimeType type)
   switch (type)
   {
   case DayTimeType::Day:
-  case DayTimeType::PolarDay:
-    return true;
+  case DayTimeType::PolarDay: return true;
   case DayTimeType::Night:
-  case DayTimeType::PolarNight:
-    return false;
+  case DayTimeType::PolarNight: return false;
   }
 
   UNREACHABLE();
@@ -100,15 +98,9 @@ public:
       return tie(m_hwType, m_surfaceType) < tie(rhs.m_hwType, rhs.m_surfaceType);
     }
 
-    bool operator==(Type const & rhs) const
-    {
-      return tie(m_hwType, m_surfaceType) == tie(rhs.m_hwType, m_surfaceType);
-    }
+    bool operator==(Type const & rhs) const { return tie(m_hwType, m_surfaceType) == tie(rhs.m_hwType, m_surfaceType); }
 
-    bool operator!=(Type const & rhs) const
-    {
-      return !(*this == rhs);
-    }
+    bool operator!=(Type const & rhs) const { return !(*this == rhs); }
 
     string GetSummary() const
     {
@@ -158,10 +150,7 @@ struct RoadInfo
            tie(rhs.m_type, rhs.m_maxspeedKMpH, rhs.m_isCityRoad, rhs.m_isOneWay);
   }
 
-  bool operator!=(RoadInfo const & rhs) const
-  {
-    return !(*this == rhs);
-  }
+  bool operator!=(RoadInfo const & rhs) const { return !(*this == rhs); }
 
   bool operator<(RoadInfo const & rhs) const
   {
@@ -172,11 +161,8 @@ struct RoadInfo
   string GetSummary() const
   {
     ostringstream out;
-    out << TypeToString(m_type.m_hwType) << ","
-        << TypeToString(m_type.m_surfaceType) << ","
-        << m_maxspeedKMpH << ","
-        << m_isCityRoad << ","
-        << m_isOneWay;
+    out << TypeToString(m_type.m_hwType) << "," << TypeToString(m_type.m_surfaceType) << "," << m_maxspeedKMpH << ","
+        << m_isCityRoad << "," << m_isOneWay;
 
     return out.str();
   }
@@ -193,7 +179,9 @@ public:
   MoveType() = default;
 
   MoveType(RoadInfo const & roadType, traffic::SpeedGroup speedGroup, DataPoint const & dataPoint)
-    : m_roadInfo(roadType), m_speedGroup(speedGroup), m_latLon(dataPoint.m_latLon)
+    : m_roadInfo(roadType)
+    , m_speedGroup(speedGroup)
+    , m_latLon(dataPoint.m_latLon)
   {
     m_isDayTime = DayTimeToBool(GetDayTime(dataPoint.m_timestamp, m_latLon.m_lat, m_latLon.m_lon));
   }
@@ -213,17 +201,14 @@ public:
   bool IsValid() const
   {
     // In order to collect cleaner data we don't use speed group lower than G5.
-    return m_roadInfo.m_type.m_hwType != 0 &&
-           m_roadInfo.m_type.m_surfaceType != 0 &&
+    return m_roadInfo.m_type.m_hwType != 0 && m_roadInfo.m_type.m_surfaceType != 0 &&
            m_speedGroup == kValidTrafficValue;
   }
 
   string GetSummary() const
   {
     ostringstream out;
-    out << m_roadInfo.GetSummary() << ","
-        << m_isDayTime << ","
-        << m_latLon.m_lat << " " << m_latLon.m_lon;
+    out << m_roadInfo.GetSummary() << "," << m_isDayTime << "," << m_latLon.m_lat << " " << m_latLon.m_lon;
 
     return out.str();
   }
@@ -250,9 +235,7 @@ public:
   string GetSummary() const
   {
     ostringstream out;
-    out << m_totalDistance << ","
-        << m_totalTime << ","
-        << CalcSpeedKMpH(m_totalDistance, m_totalTime) << ",";
+    out << m_totalDistance << "," << m_totalTime << "," << CalcSpeedKMpH(m_totalDistance, m_totalTime) << ",";
 
     for (size_t i = 0; i < m_crossroads.size(); ++i)
     {
@@ -276,8 +259,8 @@ private:
 class MoveTypeAggregator final
 {
 public:
-  void Add(MoveType && moveType, IsCrossroadChecker::CrossroadInfo const & crossroads, MatchedTrack::const_iterator begin,
-           MatchedTrack::const_iterator end, Geometry & geometry)
+  void Add(MoveType && moveType, IsCrossroadChecker::CrossroadInfo const & crossroads,
+           MatchedTrack::const_iterator begin, MatchedTrack::const_iterator end, Geometry & geometry)
   {
     if (begin + 1 >= end)
       return;
@@ -288,9 +271,9 @@ public:
 
     if (time == 0)
     {
-      LOG(LWARNING, ("Track with the same time at the beginning and at the end. Beginning:",
-                     beginDataPoint.m_latLon, " End:", endDataPoint.m_latLon,
-                     " Timestamp:", beginDataPoint.m_timestamp, " Segment:", begin->GetSegment()));
+      LOG(LWARNING, ("Track with the same time at the beginning and at the end. Beginning:", beginDataPoint.m_latLon,
+                     " End:", endDataPoint.m_latLon, " Timestamp:", beginDataPoint.m_timestamp,
+                     " Segment:", begin->GetSegment()));
       return;
     }
 
@@ -298,8 +281,7 @@ public:
     m_moveInfos[moveType].Add(length, time, crossroads, static_cast<uint32_t>(distance(begin, end)));
   }
 
-  string GetSummary(string const & user, string const & mwmName, string const & countryName,
-                    Stats & stats) const
+  string GetSummary(string const & user, string const & mwmName, string const & countryName, Stats & stats) const
   {
     ostringstream out;
     for (auto const & it : m_moveInfos)
@@ -307,8 +289,7 @@ public:
       if (!it.first.IsValid())
         continue;
 
-      out << user << "," << mwmName << "," << it.first.GetSummary() << ","
-          << it.second.GetSummary() << '\n';
+      out << user << "," << mwmName << "," << it.first.GetSummary() << "," << it.second.GetSummary() << '\n';
 
       stats.AddDataPoints(mwmName, countryName, it.second.GetDataPointsNumber());
     }
@@ -324,7 +305,8 @@ class MatchedTrackPointToMoveType final
 {
 public:
   MatchedTrackPointToMoveType(FilesContainerR const & container, VehicleModelInterface & vehicleModel)
-    : m_featuresVector(container), m_vehicleModel(vehicleModel)
+    : m_featuresVector(container)
+    , m_vehicleModel(vehicleModel)
   {
     if (container.IsExist(CITY_ROADS_FILE_TAG))
       m_cityRoads.Load(container.GetReader(CITY_ROADS_FILE_TAG));
@@ -336,9 +318,7 @@ public:
   MoveType GetMoveType(MatchedTrackPoint const & point)
   {
     auto const & dataPoint = point.GetDataPoint();
-    return MoveType(GetRoadInfo(point.GetSegment()),
-                    static_cast<traffic::SpeedGroup>(dataPoint.m_traffic),
-                    dataPoint);
+    return MoveType(GetRoadInfo(point.GetSegment()), static_cast<traffic::SpeedGroup>(dataPoint.m_traffic), dataPoint);
   }
 
 private:
@@ -352,15 +332,14 @@ private:
     CHECK(feature, ());
 
     auto const maxspeed = m_maxspeeds.GetMaxspeed(featureId);
-    auto const maxspeedValueKMpH = maxspeed.IsValid() ?
-                                   min(maxspeed.GetSpeedKmPH(segment.IsForward()), kMaxspeedTopBound) :
-                                   kInvalidSpeed;
+    auto const maxspeedValueKMpH =
+        maxspeed.IsValid() ? min(maxspeed.GetSpeedKmPH(segment.IsForward()), kMaxspeedTopBound) : kInvalidSpeed;
 
     m_prevFeatureId = featureId;
 
     feature::TypesHolder const types(*feature);
-    m_prevRoadInfo = {m_carModelTypes.GetType(types), maxspeedValueKMpH,
-                      m_cityRoads.IsCityRoad(featureId), m_vehicleModel.IsOneWay(types)};
+    m_prevRoadInfo = {m_carModelTypes.GetType(types), maxspeedValueKMpH, m_cityRoads.IsCityRoad(featureId),
+                      m_vehicleModel.IsOneWay(types)};
     return m_prevRoadInfo;
   }
 
@@ -374,7 +353,6 @@ private:
 };
 }  // namespace
 
-
 void CmdTagsTable(string const & filepath, string const & trackExtension, StringFilter mwmFilter,
                   StringFilter userFilter)
 {
@@ -393,18 +371,17 @@ void CmdTagsTable(string const & filepath, string const & trackExtension, String
 
     auto const countryName = storage.GetTopmostParentFor(mwmName);
     auto const carModelFactory = make_shared<CarModelFactory>(VehicleModelFactory::CountryParentNameGetterFn{});
-    shared_ptr<VehicleModelInterface> vehicleModel =
-        carModelFactory->GetVehicleModelForCountry(mwmName);
+    shared_ptr<VehicleModelInterface> vehicleModel = carModelFactory->GetVehicleModelForCountry(mwmName);
     string const mwmFile = GetCurrentVersionMwmFile(storage, mwmName);
     MatchedTrackPointToMoveType pointToMoveType(FilesContainerR(make_unique<FileReader>(mwmFile)), *vehicleModel);
     Geometry geometry(GeometryLoader::CreateFromFile(mwmFile, vehicleModel));
     auto const vehicleType = VehicleType::Car;
-    auto const edgeEstimator = EdgeEstimator::Create(vehicleType, *vehicleModel,
-      nullptr /* trafficStash */, &dataSource, numMwmIds);
+    auto const edgeEstimator =
+        EdgeEstimator::Create(vehicleType, *vehicleModel, nullptr /* trafficStash */, &dataSource, numMwmIds);
 
     MwmDataSource routingSource(dataSource, numMwmIds);
-    auto indexGraphLoader = IndexGraphLoader::Create(vehicleType, false /* loadAltitudes */,
-                                                     carModelFactory, edgeEstimator, routingSource);
+    auto indexGraphLoader =
+        IndexGraphLoader::Create(vehicleType, false /* loadAltitudes */, carModelFactory, edgeEstimator, routingSource);
 
     platform::CountryFile const countryFile(mwmName);
     auto localCountryFile = storage.GetLatestLocalFile(countryFile);
@@ -412,8 +389,7 @@ void CmdTagsTable(string const & filepath, string const & trackExtension, String
     if (!dataSource.IsLoaded(countryFile))
     {
       auto registerResult = dataSource.Register(*localCountryFile);
-      CHECK_EQUAL(registerResult.second, MwmSet::RegResult::Success,
-                  ("Can't register mwm", countryFile.GetName()));
+      CHECK_EQUAL(registerResult.second, MwmSet::RegResult::Success, ("Can't register mwm", countryFile.GetName()));
     }
 
     auto const mwmId = numMwmIds->GetId(countryFile);
@@ -440,18 +416,14 @@ void CmdTagsTable(string const & filepath, string const & trackExtension, String
           // Splitting track with points where MoveType is changed.
           while (end != track.end() && pointToMoveType.GetMoveType(*end) == moveType)
           {
-            IsCrossroadChecker::MergeCrossroads(checker(prev->GetSegment(), end->GetSegment()),
-                                                info);
+            IsCrossroadChecker::MergeCrossroads(checker(prev->GetSegment(), end->GetSegment()), info);
             prev = end;
             ++end;
           }
 
           // If it's not the end of the track than it could be a crossroad.
           if (end != track.end())
-          {
-            IsCrossroadChecker::MergeCrossroads(checker(prev->GetSegment(), end->GetSegment()),
-                                                info);
-          }
+            IsCrossroadChecker::MergeCrossroads(checker(prev->GetSegment(), end->GetSegment()), info);
 
           aggregator.Add(std::move(moveType), info, subtrackBegin, end, geometry);
           subtrackBegin = end;
diff --git a/tools/track_analyzing/track_analyzer/cmd_track.cpp b/tools/track_analyzing/track_analyzer/cmd_track.cpp
index 0fe781561..2a8d50eda 100644
--- a/tools/track_analyzing/track_analyzer/cmd_track.cpp
+++ b/tools/track_analyzing/track_analyzer/cmd_track.cpp
@@ -23,28 +23,24 @@ using namespace std;
 
 namespace track_analyzing
 {
-void CmdTrack(string const & trackFile, string const & mwmName, string const & user,
-              size_t trackIdx)
+void CmdTrack(string const & trackFile, string const & mwmName, string const & user, size_t trackIdx)
 {
   storage::Storage storage;
   auto const numMwmIds = CreateNumMwmIds(storage);
   MwmToMatchedTracks mwmToMatchedTracks;
   ReadTracks(numMwmIds, trackFile, mwmToMatchedTracks);
 
-  MatchedTrack const & track =
-      GetMatchedTrack(mwmToMatchedTracks, *numMwmIds, mwmName, user, trackIdx);
+  MatchedTrack const & track = GetMatchedTrack(mwmToMatchedTracks, *numMwmIds, mwmName, user, trackIdx);
 
   string const mwmFile = GetCurrentVersionMwmFile(storage, mwmName);
-  shared_ptr<VehicleModelInterface> vehicleModel =
-      CarModelFactory({}).GetVehicleModelForCountry(mwmName);
+  shared_ptr<VehicleModelInterface> vehicleModel = CarModelFactory({}).GetVehicleModelForCountry(mwmName);
   Geometry geometry(GeometryLoader::CreateFromFile(mwmFile, vehicleModel));
 
-  uint64_t const duration =
-      track.back().GetDataPoint().m_timestamp - track.front().GetDataPoint().m_timestamp;
+  uint64_t const duration = track.back().GetDataPoint().m_timestamp - track.front().GetDataPoint().m_timestamp;
   double const length = CalcTrackLength(track, geometry);
   double const averageSpeed = CalcSpeedKMpH(length, duration);
-  LOG(LINFO, ("Mwm:", mwmName, ", user:", user, ", points:", track.size(), "duration:", duration,
-              "length:", length, ", speed:", averageSpeed, "km/h"));
+  LOG(LINFO, ("Mwm:", mwmName, ", user:", user, ", points:", track.size(), "duration:", duration, "length:", length,
+              ", speed:", averageSpeed, "km/h"));
 
   for (size_t i = 0; i < track.size(); ++i)
   {
@@ -64,10 +60,9 @@ void CmdTrack(string const & trackFile, string const & mwmName, string const & u
     if (elapsed != 0)
       speed = CalcSpeedKMpH(distance, elapsed);
 
-    LOG(LINFO, (base::SecondsSinceEpochToString(point.GetDataPoint().m_timestamp),
-                point.GetDataPoint().m_latLon, point.GetSegment(), ", traffic:",
-                point.GetDataPoint().m_traffic, ", distance:", distance, ", elapsed:", elapsed,
-                ", speed:", speed));
+    LOG(LINFO, (base::SecondsSinceEpochToString(point.GetDataPoint().m_timestamp), point.GetDataPoint().m_latLon,
+                point.GetSegment(), ", traffic:", point.GetDataPoint().m_traffic, ", distance:", distance,
+                ", elapsed:", elapsed, ", speed:", speed));
   }
 }
 }  // namespace track_analyzing
diff --git a/tools/track_analyzing/track_analyzer/cmd_tracks.cpp b/tools/track_analyzing/track_analyzer/cmd_tracks.cpp
index 46fdc4e46..a60bd4e61 100644
--- a/tools/track_analyzing/track_analyzer/cmd_tracks.cpp
+++ b/tools/track_analyzing/track_analyzer/cmd_tracks.cpp
@@ -22,7 +22,6 @@
 #include <iostream>
 #include <sstream>
 
-
 namespace track_analyzing
 {
 using namespace routing;
@@ -105,8 +104,7 @@ bool TrackHasTrafficPoints(MatchedTrack const & track)
   return false;
 }
 
-double EstimateDuration(MatchedTrack const & track, shared_ptr<EdgeEstimator> estimator,
-                        Geometry & geometry)
+double EstimateDuration(MatchedTrack const & track, shared_ptr<EdgeEstimator> estimator, Geometry & geometry)
 {
   double result = 0.0;
   Segment segment;
@@ -117,16 +115,15 @@ double EstimateDuration(MatchedTrack const & track, shared_ptr<EdgeEstimator> es
       continue;
 
     segment = point.GetSegment();
-    result += estimator->CalcSegmentWeight(segment, geometry.GetRoad(segment.GetFeatureId()),
-                                           EdgeEstimator::Purpose::ETA);
+    result +=
+        estimator->CalcSegmentWeight(segment, geometry.GetRoad(segment.GetFeatureId()), EdgeEstimator::Purpose::ETA);
   }
 
   return result;
 }
 
-void CmdTracks(string const & filepath, string const & trackExtension, StringFilter mwmFilter,
-               StringFilter userFilter, TrackFilter const & filter, bool noTrackLogs,
-               bool noMwmLogs, bool noWorldLogs)
+void CmdTracks(string const & filepath, string const & trackExtension, StringFilter mwmFilter, StringFilter userFilter,
+               TrackFilter const & filter, bool noTrackLogs, bool noMwmLogs, bool noWorldLogs)
 {
   storage::Storage storage;
   auto numMwmIds = CreateNumMwmIds(storage);
@@ -135,21 +132,19 @@ void CmdTracks(string const & filepath, string const & trackExtension, StringFil
   ErrorStat absoluteError;
   ErrorStat relativeError;
 
-  auto processMwm = [&](string const & mwmName, UserToMatchedTracks const & userToMatchedTracks) {
+  auto processMwm = [&](string const & mwmName, UserToMatchedTracks const & userToMatchedTracks)
+  {
     if (mwmFilter(mwmName))
       return;
 
     TrackStats & mwmStats = mwmToStats[mwmName];
 
-    shared_ptr<VehicleModelInterface> vehicleModel =
-        CarModelFactory({}).GetVehicleModelForCountry(mwmName);
+    shared_ptr<VehicleModelInterface> vehicleModel = CarModelFactory({}).GetVehicleModelForCountry(mwmName);
 
-    Geometry geometry(
-        GeometryLoader::CreateFromFile(GetCurrentVersionMwmFile(storage, mwmName), vehicleModel));
+    Geometry geometry(GeometryLoader::CreateFromFile(GetCurrentVersionMwmFile(storage, mwmName), vehicleModel));
 
-    shared_ptr<EdgeEstimator> estimator =
-        EdgeEstimator::Create(VehicleType::Car, *vehicleModel,
-          nullptr /* trafficStash */, nullptr /* dataSource */, nullptr /* numMwmIds */);
+    shared_ptr<EdgeEstimator> estimator = EdgeEstimator::Create(
+        VehicleType::Car, *vehicleModel, nullptr /* trafficStash */, nullptr /* dataSource */, nullptr /* numMwmIds */);
 
     for (auto const & it : userToMatchedTracks)
     {
@@ -181,13 +176,13 @@ void CmdTracks(string const & filepath, string const & trackExtension, StringFil
         if (!noTrackLogs)
         {
           cout << fixed << setprecision(1) << "  points: " << track.size() << ", length: " << length
-               << ", duration: " << duration << ", estimated duration: " << estimatedDuration
-               << ", speed: " << speed << ", traffic: " << hasTrafficPoints
+               << ", duration: " << duration << ", estimated duration: " << estimatedDuration << ", speed: " << speed
+               << ", traffic: " << hasTrafficPoints
                << ", departure: " << base::SecondsSinceEpochToString(start.m_timestamp)
                << ", arrival: " << base::SecondsSinceEpochToString(finish.m_timestamp)
-               << setprecision(numeric_limits<double>::max_digits10)
-               << ", start: " << start.m_latLon.m_lat << ", " << start.m_latLon.m_lon
-               << ", finish: " << finish.m_latLon.m_lat << ", " << finish.m_latLon.m_lon << endl;
+               << setprecision(numeric_limits<double>::max_digits10) << ", start: " << start.m_latLon.m_lat << ", "
+               << start.m_latLon.m_lon << ", finish: " << finish.m_latLon.m_lat << ", " << finish.m_latLon.m_lon
+               << endl;
         }
 
         mwmStats.AddTracks(1);
@@ -202,7 +197,8 @@ void CmdTracks(string const & filepath, string const & trackExtension, StringFil
     }
   };
 
-  auto processFile = [&](string const & filename, MwmToMatchedTracks const & mwmToMatchedTracks) {
+  auto processFile = [&](string const & filename, MwmToMatchedTracks const & mwmToMatchedTracks)
+  {
     LOG(LINFO, ("Processing", filename));
     ForTracksSortedByMwmName(mwmToMatchedTracks, *numMwmIds, processMwm);
   };
@@ -213,10 +209,8 @@ void CmdTracks(string const & filepath, string const & trackExtension, StringFil
   {
     cout << endl;
     for (auto const & it : mwmToStats)
-    {
       if (!it.second.IsEmpty())
         cout << it.first << ": " << it.second.GetSummary() << endl;
-    }
   }
 
   if (!noWorldLogs)
@@ -226,11 +220,9 @@ void CmdTracks(string const & filepath, string const & trackExtension, StringFil
       worldStats.Add(it.second);
 
     cout << endl << "World: " << worldStats.GetSummary() << endl;
-    cout << fixed << setprecision(1)
-         << "Absolute error: deviation: " << absoluteError.GetStdDevString()
+    cout << fixed << setprecision(1) << "Absolute error: deviation: " << absoluteError.GetStdDevString()
          << ", min: " << absoluteError.GetMin() << ", max: " << absoluteError.GetMax() << endl;
-    cout << fixed << setprecision(3)
-         << "Relative error: deviation: " << relativeError.GetStdDevString()
+    cout << fixed << setprecision(3) << "Relative error: deviation: " << relativeError.GetStdDevString()
          << ", min: " << relativeError.GetMin() << ", max: " << relativeError.GetMax() << endl;
   }
 }
diff --git a/tools/track_analyzing/track_analyzer/crossroad_checker.cpp b/tools/track_analyzing/track_analyzer/crossroad_checker.cpp
index 586619466..366c37a68 100644
--- a/tools/track_analyzing/track_analyzer/crossroad_checker.cpp
+++ b/tools/track_analyzing/track_analyzer/crossroad_checker.cpp
@@ -23,10 +23,8 @@ bool IsHighwayLink(HighwayType type)
   case HighwayType::HighwayTrunkLink:
   case HighwayType::HighwayPrimaryLink:
   case HighwayType::HighwaySecondaryLink:
-  case HighwayType::HighwayTertiaryLink:
-    return true;
-  default:
-    return false;
+  case HighwayType::HighwayTertiaryLink: return true;
+  default: return false;
   }
 
   UNREACHABLE();
@@ -40,10 +38,8 @@ bool IsBigHighway(HighwayType type)
   case HighwayType::HighwayTrunk:
   case HighwayType::HighwayPrimary:
   case HighwayType::HighwaySecondary:
-  case HighwayType::HighwayTertiary:
-    return true;
-  default:
-    return false;
+  case HighwayType::HighwayTertiary: return true;
+  default: return false;
   }
 
   UNREACHABLE();
@@ -54,12 +50,8 @@ bool FromSmallerToBigger(HighwayType lhs, HighwayType rhs)
   CHECK_NOT_EQUAL(lhs, rhs, ());
 
   static std::array<HighwayType, 5> constexpr kHighwayTypes = {
-      HighwayType::HighwayTertiary,
-      HighwayType::HighwaySecondary,
-      HighwayType::HighwayPrimary,
-      HighwayType::HighwayTrunk,
-      HighwayType::HighwayMotorway
-  };
+      HighwayType::HighwayTertiary, HighwayType::HighwaySecondary, HighwayType::HighwayPrimary,
+      HighwayType::HighwayTrunk, HighwayType::HighwayMotorway};
 
   auto const lhsIt = find(kHighwayTypes.begin(), kHighwayTypes.end(), lhs);
   auto const rhsIt = find(kHighwayTypes.begin(), kHighwayTypes.end(), rhs);
@@ -112,7 +104,8 @@ IsCrossroadChecker::Type IsCrossroadChecker::operator()(Segment const & current,
 
   Type retType = Type::Count;
   auto const nextRoadPoint = next.GetRoadPoint(false /* isFront */);
-  m_indexGraph.ForEachPoint(jointId, [&](RoadPoint const & point) {
+  m_indexGraph.ForEachPoint(jointId, [&](RoadPoint const & point)
+  {
     if (retType != IsCrossroadChecker::Type::Count)
       return;
 
@@ -129,11 +122,8 @@ IsCrossroadChecker::Type IsCrossroadChecker::operator()(Segment const & current,
     if (pointHwType == nextSegmentHwType)
     {
       // Is the same road but parted on different features.
-      if (roadGeometry.IsEndPointId(point.GetPointId()) &&
-          roadGeometry.IsEndPointId(nextRoadPoint.GetPointId()))
-      {
+      if (roadGeometry.IsEndPointId(point.GetPointId()) && roadGeometry.IsEndPointId(nextRoadPoint.GetPointId()))
         return;
-      }
     }
 
     if (isCurrentLink && IsBigHighway(*pointHwType))
diff --git a/tools/track_analyzing/track_analyzer/crossroad_checker.hpp b/tools/track_analyzing/track_analyzer/crossroad_checker.hpp
index f62307a42..af65b9f0e 100644
--- a/tools/track_analyzing/track_analyzer/crossroad_checker.hpp
+++ b/tools/track_analyzing/track_analyzer/crossroad_checker.hpp
@@ -30,8 +30,7 @@ public:
   Type operator()(Segment const & current, Segment const & next) const;
 
   static void MergeCrossroads(Type from, CrossroadInfo & to);
-  static void MergeCrossroads(IsCrossroadChecker::CrossroadInfo const & from,
-                              IsCrossroadChecker::CrossroadInfo & to);
+  static void MergeCrossroads(IsCrossroadChecker::CrossroadInfo const & from, IsCrossroadChecker::CrossroadInfo & to);
 
 private:
   IndexGraph & m_indexGraph;
diff --git a/tools/track_analyzing/track_analyzer/track_analyzer.cpp b/tools/track_analyzing/track_analyzer/track_analyzer.cpp
index ba46ce250..a8d5800d0 100644
--- a/tools/track_analyzing/track_analyzer/track_analyzer.cpp
+++ b/tools/track_analyzing/track_analyzer/track_analyzer.cpp
@@ -51,19 +51,17 @@ DEFINE_string_ext(output_dir, "", "output dir for gpx files");
 DEFINE_string_ext(mwm, "", "short mwm name");
 DEFINE_string_ext(user, "", "user id");
 DEFINE_int32(track, -1, "track index");
-DEFINE_string(
-    input_distribution, "",
-    "path to input data point distribution file. It's a csv file with data point count for "
-    "some mwms. Usage:\n"
-    "- It may be used with match and match_dir command. If so it's a path to save file with "
-    "data point distribution by mwm. If it's empty no file is saved.\n"
-    "- It may be used with balance_csv command. If so it's a path of a file with distribution which "
-    "will be used for normalization (balancing) the result of the command. It should not be empty.");
-DEFINE_uint64(
-    ignore_datapoints_number, 100,
-    "The number of datapoints in an mwm to exclude the mwm from balancing process. If this number "
-    "of datapoints or less number is in an mwm after matching and tabling, the mwm will not used "
-    "for balancing. This param should be used with balance_csv command.");
+DEFINE_string(input_distribution, "",
+              "path to input data point distribution file. It's a csv file with data point count for "
+              "some mwms. Usage:\n"
+              "- It may be used with match and match_dir command. If so it's a path to save file with "
+              "data point distribution by mwm. If it's empty no file is saved.\n"
+              "- It may be used with balance_csv command. If so it's a path of a file with distribution which "
+              "will be used for normalization (balancing) the result of the command. It should not be empty.");
+DEFINE_uint64(ignore_datapoints_number, 100,
+              "The number of datapoints in an mwm to exclude the mwm from balancing process. If this number "
+              "of datapoints or less number is in an mwm after matching and tabling, the mwm will not used "
+              "for balancing. This param should be used with balance_csv command.");
 
 DEFINE_string(track_extension, ".track", "track files extension");
 DEFINE_bool(no_world_logs, false, "don't print world summary logs");
@@ -86,7 +84,8 @@ size_t Checked_track()
 
 StringFilter MakeFilter(string const & filter)
 {
-  return [&](string const & value) {
+  return [&](string const & value)
+  {
     if (filter.empty())
       return false;
     return value != filter;
@@ -97,8 +96,7 @@ StringFilter MakeFilter(string const & filter)
 namespace track_analyzing
 {
 // Print the specified track in C++ form that you can copy paste to C++ source for debugging.
-void CmdCppTrack(string const & trackFile, string const & mwmName, string const & user,
-                 size_t trackIdx);
+void CmdCppTrack(string const & trackFile, string const & mwmName, string const & user, size_t trackIdx);
 // Match raw gps logs to tracks.
 void CmdMatch(string const & logFile, string const & trackFile, string const & inputDistribution);
 // The same as match but applies for the directory with raw logs.
@@ -106,15 +104,13 @@ void CmdMatchDir(string const & logDir, string const & trackExt, string const &
 // Parse |logFile| and save tracks (mwm name, aloha id, lats, lons, timestamps in seconds in csv).
 void CmdUnmatchedTracks(string const & logFile, string const & trackFileCsv);
 // Print aggregated tracks to csv table.
-void CmdTagsTable(string const & filepath, string const & trackExtension,
-                  StringFilter mwmIsFiltered, StringFilter userFilter);
+void CmdTagsTable(string const & filepath, string const & trackExtension, StringFilter mwmIsFiltered,
+                  StringFilter userFilter);
 // Print track information.
-void CmdTrack(string const & trackFile, string const & mwmName, string const & user,
-              size_t trackIdx);
+void CmdTrack(string const & trackFile, string const & mwmName, string const & user, size_t trackIdx);
 // Print tracks statistics.
-void CmdTracks(string const & filepath, string const & trackExtension, StringFilter mwmFilter,
-               StringFilter userFilter, TrackFilter const & filter, bool noTrackLogs,
-               bool noMwmLogs, bool noWorldLogs);
+void CmdTracks(string const & filepath, string const & trackExtension, StringFilter mwmFilter, StringFilter userFilter,
+               TrackFilter const & filter, bool noTrackLogs, bool noMwmLogs, bool noWorldLogs);
 
 void CmdGPX(string const & logFile, string const & outputFilesDir, string const & userID);
 }  // namespace track_analyzing
@@ -145,10 +141,10 @@ int main(int argc, char ** argv)
     }
     else if (cmd == "tracks")
     {
-      TrackFilter const filter(FLAGS_min_duration, FLAGS_min_length, FLAGS_min_speed,
-                               FLAGS_max_speed, FLAGS_ignore_traffic);
-      CmdTracks(Checked_in(), FLAGS_track_extension, MakeFilter(FLAGS_mwm), MakeFilter(FLAGS_user),
-                filter, FLAGS_no_track_logs, FLAGS_no_mwm_logs, FLAGS_no_world_logs);
+      TrackFilter const filter(FLAGS_min_duration, FLAGS_min_length, FLAGS_min_speed, FLAGS_max_speed,
+                               FLAGS_ignore_traffic);
+      CmdTracks(Checked_in(), FLAGS_track_extension, MakeFilter(FLAGS_mwm), MakeFilter(FLAGS_user), filter,
+                FLAGS_no_track_logs, FLAGS_no_mwm_logs, FLAGS_no_world_logs);
     }
     else if (cmd == "track")
     {
@@ -160,8 +156,7 @@ int main(int argc, char ** argv)
     }
     else if (cmd == "table")
     {
-      CmdTagsTable(Checked_in(), FLAGS_track_extension, MakeFilter(FLAGS_mwm),
-                   MakeFilter(FLAGS_user));
+      CmdTagsTable(Checked_in(), FLAGS_track_extension, MakeFilter(FLAGS_mwm), MakeFilter(FLAGS_user));
     }
     else if (cmd == "balance_csv")
     {
@@ -171,8 +166,7 @@ int main(int argc, char ** argv)
                      "distribution. Hint: this file may be saved by match or match_dir command."));
         return 1;
       }
-      CmdBalanceCsv(FLAGS_in, FLAGS_input_distribution,
-                    base::checked_cast<uint64_t>(FLAGS_ignore_datapoints_number));
+      CmdBalanceCsv(FLAGS_in, FLAGS_input_distribution, base::checked_cast<uint64_t>(FLAGS_ignore_datapoints_number));
     }
     else if (cmd == "gpx")
     {
diff --git a/tools/track_analyzing/track_analyzer/utils.cpp b/tools/track_analyzing/track_analyzer/utils.cpp
index e3dac5df5..8681f791a 100644
--- a/tools/track_analyzing/track_analyzer/utils.cpp
+++ b/tools/track_analyzing/track_analyzer/utils.cpp
@@ -31,8 +31,7 @@ namespace
 set<string> GetKeys(Stats::NameToCountMapping const & mapping)
 {
   set<string> keys;
-  transform(mapping.begin(), mapping.end(), inserter(keys, keys.end()),
-            [](auto const & kv) { return kv.first; });
+  transform(mapping.begin(), mapping.end(), inserter(keys, keys.end()), [](auto const & kv) { return kv.first; });
   return keys;
 }
 
@@ -57,8 +56,8 @@ void Add(Stats::NameToCountMapping const & addition, Stats::NameToCountMapping &
   }
 }
 
-void PrintMap(string const & keyName, string const & descr,
-              Stats::NameToCountMapping const & mapping, ostringstream & ss)
+void PrintMap(string const & keyName, string const & descr, Stats::NameToCountMapping const & mapping,
+              ostringstream & ss)
 {
   ss << descr << '\n';
   if (mapping.empty())
@@ -74,17 +73,15 @@ void PrintMap(string const & keyName, string const & descr,
 namespace track_analyzing
 {
 // Stats ===========================================================================================
-Stats::Stats(NameToCountMapping const & mwmToTotalDataPoints,
-             NameToCountMapping const & countryToTotalDataPoint)
+Stats::Stats(NameToCountMapping const & mwmToTotalDataPoints, NameToCountMapping const & countryToTotalDataPoint)
   : m_mwmToTotalDataPoints(mwmToTotalDataPoints)
   , m_countryToTotalDataPoints(countryToTotalDataPoint)
-{
-}
+{}
 
 bool Stats::operator==(Stats const & stats) const
 {
   return m_mwmToTotalDataPoints == stats.m_mwmToTotalDataPoints &&
-      m_countryToTotalDataPoints == stats.m_countryToTotalDataPoints;
+         m_countryToTotalDataPoints == stats.m_countryToTotalDataPoints;
 }
 
 void Stats::Add(Stats const & stats)
@@ -93,8 +90,7 @@ void Stats::Add(Stats const & stats)
   ::Add(stats.m_countryToTotalDataPoints, m_countryToTotalDataPoints);
 }
 
-void Stats::AddTracksStats(MwmToTracks const & mwmToTracks, NumMwmIds const & numMwmIds,
-                           Storage const & storage)
+void Stats::AddTracksStats(MwmToTracks const & mwmToTracks, NumMwmIds const & numMwmIds, Storage const & storage)
 {
   for (auto const & kv : mwmToTracks)
   {
@@ -109,15 +105,13 @@ void Stats::AddTracksStats(MwmToTracks const & mwmToTracks, NumMwmIds const & nu
   }
 }
 
-void Stats::AddDataPoints(string const & mwmName, string const & countryName,
-                          uint64_t dataPointNum)
+void Stats::AddDataPoints(string const & mwmName, string const & countryName, uint64_t dataPointNum)
 {
   m_mwmToTotalDataPoints[mwmName] += dataPointNum;
   m_countryToTotalDataPoints[countryName] += dataPointNum;
 }
 
-void Stats::AddDataPoints(string const & mwmName, storage::Storage const & storage,
-                          uint64_t dataPointNum)
+void Stats::AddDataPoints(string const & mwmName, storage::Storage const & storage, uint64_t dataPointNum)
 {
   auto const countryName = storage.GetTopmostParentFor(mwmName);
   // Note. In case of disputed mwms |countryName| will be empty.
@@ -126,8 +120,7 @@ void Stats::AddDataPoints(string const & mwmName, storage::Storage const & stora
 
 void Stats::SaveMwmDistributionToCsv(string const & csvPath) const
 {
-  LOG(LINFO, ("Saving mwm distribution to", csvPath, "m_mwmToTotalDataPoints size is",
-              m_mwmToTotalDataPoints.size()));
+  LOG(LINFO, ("Saving mwm distribution to", csvPath, "m_mwmToTotalDataPoints size is", m_mwmToTotalDataPoints.size()));
   if (csvPath.empty())
     return;
 
@@ -162,8 +155,8 @@ void Stats::LogCountries() const
   LogNameToCountMapping("country", "Country name to data points number:", m_countryToTotalDataPoints);
 }
 
-void MappingToCsv(string const & keyName, Stats::NameToCountMapping const & mapping,
-                  bool printPercentage, basic_ostream<char> & ss)
+void MappingToCsv(string const & keyName, Stats::NameToCountMapping const & mapping, bool printPercentage,
+                  basic_ostream<char> & ss)
 {
   struct KeyValue
   {
@@ -208,8 +201,7 @@ void MappingToCsv(string const & keyName, Stats::NameToCountMapping const & mapp
 
 void MappingFromCsv(basic_istream<char> & ss, Stats::NameToCountMapping & mapping)
 {
-  for (auto const & row :
-       coding::CSVRunner(coding::CSVReader(ss, true /* hasHeader */, ',' /* kCsvDelimiter */)))
+  for (auto const & row : coding::CSVRunner(coding::CSVReader(ss, true /* hasHeader */, ',' /* kCsvDelimiter */)))
   {
     CHECK_EQUAL(row.size(), 2, (row));
     auto const & key = row[0];
@@ -220,8 +212,7 @@ void MappingFromCsv(basic_istream<char> & ss, Stats::NameToCountMapping & mappin
   }
 }
 
-void ParseTracks(string const & logFile, shared_ptr<NumMwmIds> const & numMwmIds,
-                 MwmToTracks & mwmToTracks)
+void ParseTracks(string const & logFile, shared_ptr<NumMwmIds> const & numMwmIds, MwmToTracks & mwmToTracks)
 {
   Platform const & platform = GetPlatform();
   string const dataDir = platform.WritableDir();
@@ -240,8 +231,7 @@ void WriteCsvTableHeader(basic_ostream<char> & stream)
             "intersection with big\n";
 }
 
-void LogNameToCountMapping(string const & keyName, string const & descr,
-                           Stats::NameToCountMapping const & mapping)
+void LogNameToCountMapping(string const & keyName, string const & descr, Stats::NameToCountMapping const & mapping)
 {
   ostringstream ss;
   LOG(LINFO, ("\n"));
diff --git a/tools/track_analyzing/track_analyzer/utils.hpp b/tools/track_analyzing/track_analyzer/utils.hpp
index 6fd428d2f..fd57330df 100644
--- a/tools/track_analyzing/track_analyzer/utils.hpp
+++ b/tools/track_analyzing/track_analyzer/utils.hpp
@@ -23,8 +23,7 @@ public:
   using NameToCountMapping = std::map<std::string, uint64_t>;
 
   Stats() = default;
-  Stats(NameToCountMapping const & mwmToTotalDataPoints,
-        NameToCountMapping const & countryToTotalDataPoint);
+  Stats(NameToCountMapping const & mwmToTotalDataPoints, NameToCountMapping const & countryToTotalDataPoint);
 
   bool operator==(Stats const & stats) const;
   void Add(Stats const & stats);
@@ -34,11 +33,9 @@ public:
                       storage::Storage const & storage);
 
   /// \brief Adds |dataPointNum| to |m_mwmToTotalDataPoints| and |m_countryToTotalDataPoints|.
-  void AddDataPoints(std::string const & mwmName, std::string const & countryName,
-                     uint64_t dataPointNum);
+  void AddDataPoints(std::string const & mwmName, std::string const & countryName, uint64_t dataPointNum);
 
-  void AddDataPoints(std::string const & mwmName, storage::Storage const & storage,
-                     uint64_t dataPointNum);
+  void AddDataPoints(std::string const & mwmName, storage::Storage const & storage, uint64_t dataPointNum);
 
   /// \brief Saves csv file with numbers of DataPoints for each mwm to |csvPath|.
   /// If |csvPath| is empty it does nothing.
@@ -60,8 +57,8 @@ private:
 };
 
 /// \brief Saves |mapping| as csv to |ss|.
-void MappingToCsv(std::string const & keyName, Stats::NameToCountMapping const & mapping,
-                  bool printPercentage, std::basic_ostream<char> & ss);
+void MappingToCsv(std::string const & keyName, Stats::NameToCountMapping const & mapping, bool printPercentage,
+                  std::basic_ostream<char> & ss);
 /// \breif Fills |mapping| according to csv in |ss|. Csv header is skipped.
 void MappingFromCsv(std::basic_istream<char> & ss, Stats::NameToCountMapping & mapping);
 
diff --git a/tools/track_analyzing/track_analyzing_tests/balance_tests.cpp b/tools/track_analyzing/track_analyzing_tests/balance_tests.cpp
index 8bad8209d..ed340c711 100644
--- a/tools/track_analyzing/track_analyzing_tests/balance_tests.cpp
+++ b/tools/track_analyzing/track_analyzing_tests/balance_tests.cpp
@@ -13,7 +13,8 @@ namespace
 using namespace std;
 using namespace track_analyzing;
 
-string const csv =  R"(user,mwm,hw type,surface type,maxspeed km/h,is city road,is one way,is day,lat lon,distance,time,mean speed km/h,turn from smaller to bigger,turn from bigger to smaller,from link,to link,intersection with big,intersection with small,intersection with link
+string const csv =
+    R"(user,mwm,hw type,surface type,maxspeed km/h,is city road,is one way,is day,lat lon,distance,time,mean speed km/h,turn from smaller to bigger,turn from bigger to smaller,from link,to link,intersection with big,intersection with small,intersection with link
 I:D923B4DC-09E0-4B0B-B7F8-153965396B55,New Zealand,highway-trunk,psurface-paved_good,80,0,0,1,-41.4832 173.844,163.984,6,98.3902,0,0,0,0,0,1,0
 I:D923B4DC-09E0-4B0B-B7F8-153965396B55,New Zealand,highway-trunk,psurface-paved_good,80,0,0,1,-41.4831 173.845,2274.59,108,75.8196,0,0,0,0,0,4,0
 A:b6e31294-5c90-4105-9f7b-51a382eabfa0,Poland,highway-primary,psurface-paved_good,50,0,0,0,53.8524 21.3061,1199.34,60,71.9604,0,0,0,0,0,10,0)";
@@ -48,15 +49,12 @@ UNIT_TEST(FillTableTest)
   MwmToDataPoints const expectedMatchedDataPoints = {{"New Zealand", 2 /* data points */},
                                                      {"Poland", 1 /* data points */}};
   std::vector<TableRow> expectedTable = {
-      {"I:D923B4DC-09E0-4B0B-B7F8-153965396B55", "New Zealand", "highway-trunk",
-       "psurface-paved_good", "80", "0", "0", "1", "-41.4832 173.844", "163.984", "6", "98.3902",
-       "0", "0", "0", "0", "0", "1", "0"},
-      {"I:D923B4DC-09E0-4B0B-B7F8-153965396B55", "New Zealand", "highway-trunk",
-       "psurface-paved_good", "80", "0", "0", "1", "-41.4831 173.845", "2274.59", "108", "75.8196",
-       "0", "0", "0", "0", "0", "4", "0"},
-      {"A:b6e31294-5c90-4105-9f7b-51a382eabfa0", "Poland", "highway-primary", "psurface-paved_good",
-       "50", "0", "0", "0", "53.8524 21.3061", "1199.34", "60", "71.9604", "0", "0", "0", "0", "0",
-       "10", "0"}};
+      {"I:D923B4DC-09E0-4B0B-B7F8-153965396B55", "New Zealand", "highway-trunk", "psurface-paved_good", "80", "0", "0",
+       "1", "-41.4832 173.844", "163.984", "6", "98.3902", "0", "0", "0", "0", "0", "1", "0"},
+      {"I:D923B4DC-09E0-4B0B-B7F8-153965396B55", "New Zealand", "highway-trunk", "psurface-paved_good", "80", "0", "0",
+       "1", "-41.4831 173.845", "2274.59", "108", "75.8196", "0", "0", "0", "0", "0", "4", "0"},
+      {"A:b6e31294-5c90-4105-9f7b-51a382eabfa0", "Poland", "highway-primary", "psurface-paved_good", "50", "0", "0",
+       "0", "53.8524 21.3061", "1199.34", "60", "71.9604", "0", "0", "0", "0", "0", "10", "0"}};
 
   TEST_EQUAL(matchedDataPoints, expectedMatchedDataPoints, ());
   TEST_EQUAL(table, expectedTable, ());
@@ -69,10 +67,8 @@ UNIT_TEST(AreKeysEqualEmptyMapsTest)
 
 UNIT_TEST(AreKeysEqualTest)
 {
-  MwmToDataPoints const map1 = {{"Russia_Moscow", 5 /* data points */},
-                                {"San Marino", 7 /* data points */}};
-  MwmToDataPoints map2 = {{"Russia_Moscow", 7 /* data points*/},
-                          {"San Marino", 9 /* data points */}};
+  MwmToDataPoints const map1 = {{"Russia_Moscow", 5 /* data points */}, {"San Marino", 7 /* data points */}};
+  MwmToDataPoints map2 = {{"Russia_Moscow", 7 /* data points*/}, {"San Marino", 9 /* data points */}};
   TEST(AreKeysEqual(map1, map2), ());
 
   map2["Slovakia"] = 3;
@@ -90,10 +86,8 @@ UNIT_TEST(RemoveKeysSmallValueEmptyTest)
 
 UNIT_TEST(RemoveKeysSmallValueTest)
 {
-  MwmToDataPoints checkedMap = {{"Russia_Moscow", 3 /* data points */},
-                                {"San Marino", 5 /* data points */}};
-  MwmToDataPoints additionalMap = {{"Russia_Moscow", 7 /* data points*/},
-                                   {"San Marino", 9 /* data points */}};
+  MwmToDataPoints checkedMap = {{"Russia_Moscow", 3 /* data points */}, {"San Marino", 5 /* data points */}};
+  MwmToDataPoints additionalMap = {{"Russia_Moscow", 7 /* data points*/}, {"San Marino", 9 /* data points */}};
   RemoveKeysSmallValue(checkedMap, additionalMap, 4 /* ignoreDataPointNumber */);
 
   MwmToDataPoints expectedCheckedMap = {{"San Marino", 5 /* data points */}};
@@ -110,9 +104,8 @@ UNIT_TEST(GetMwmToDataPointFractionTest)
                                          {"Slovakia", 50 /* data points */}};
   auto const fractionMapping = GetMwmToDataPointFraction(numberMapping);
 
-  MwmToDataPointFraction expectedFractionMapping{{"Russia_Moscow", 0.5 /* fraction */},
-                                                 {"San Marino", 0.25 /* fraction */},
-                                                 {"Slovakia", 0.25 /* fraction */}};
+  MwmToDataPointFraction expectedFractionMapping{
+      {"Russia_Moscow", 0.5 /* fraction */}, {"San Marino", 0.25 /* fraction */}, {"Slovakia", 0.25 /* fraction */}};
   TEST_EQUAL(fractionMapping, expectedFractionMapping, ());
 }
 
@@ -153,9 +146,8 @@ UNIT_TEST(BalancedDataPointNumberTheSameTest)
   MwmToDataPoints const distribution = {{"Russia_Moscow", 100 /* data points */},
                                         {"San Marino", 50 /* data points */},
                                         {"Slovakia", 50 /* data points */}};
-  MwmToDataPoints const matchedDataPoints = {{"Russia_Moscow", 10 /* data points */},
-                                             {"San Marino", 5 /* data points */},
-                                             {"Slovakia", 5 /* data points */}};
+  MwmToDataPoints const matchedDataPoints = {
+      {"Russia_Moscow", 10 /* data points */}, {"San Marino", 5 /* data points */}, {"Slovakia", 5 /* data points */}};
   {
     // Case when the distribution is not changed. All mwms lose the same percent of data points.
     auto distr = distribution;
@@ -226,7 +218,8 @@ UNIT_TEST(FilterTableTest)
   ss << csv;
   FillTable(ss, matchedDataPoints, csvTable);
 
-  auto const calcRecords = [](vector<TableRow> const & t, string const & mwmName) {
+  auto const calcRecords = [](vector<TableRow> const & t, string const & mwmName)
+  {
     return count_if(t.cbegin(), t.cend(),
                     [&mwmName](TableRow const & row) { return row[kMwmNameCsvColumn] == mwmName; });
   };
diff --git a/tools/track_analyzing/track_analyzing_tests/statistics_tests.cpp b/tools/track_analyzing/track_analyzing_tests/statistics_tests.cpp
index a0dd75945..73ecd8670 100644
--- a/tools/track_analyzing/track_analyzing_tests/statistics_tests.cpp
+++ b/tools/track_analyzing/track_analyzing_tests/statistics_tests.cpp
@@ -13,8 +13,8 @@
 
 #include "geometry/latlon.hpp"
 
-#include <string>
 #include <sstream>
+#include <string>
 
 namespace
 {
@@ -43,27 +43,24 @@ UNIT_TEST(AddDataPointsTest)
   stats.AddDataPoints("mwm2", "country1", 5);
   stats.AddDataPoints("mwm3", "country3", 7);
 
-  Stats const expected = {
-      {{"mwm1", 4}, {"mwm2", 5}, {"mwm3", 7} /* Mwm to number */},
-      {{"country1", 9}, {"country3", 7} /* Country to number */}};
+  Stats const expected = {{{"mwm1", 4}, {"mwm2", 5}, {"mwm3", 7} /* Mwm to number */},
+                          {{"country1", 9}, {"country3", 7} /* Country to number */}};
 
   TEST_EQUAL(stats, expected, ());
 }
 
 UNIT_TEST(AddStatTest)
 {
-  Stats stats1 = {
-      {{"Belarus_Minsk Region", 1}, {"Uzbekistan", 7}, {"Russia_Moscow", 5} /* Mwm to number */},
-      {{"Russian Federation", 10}, {"Poland", 5} /* Country to number */}};
+  Stats stats1 = {{{"Belarus_Minsk Region", 1}, {"Uzbekistan", 7}, {"Russia_Moscow", 5} /* Mwm to number */},
+                  {{"Russian Federation", 10}, {"Poland", 5} /* Country to number */}};
 
   Stats const stats2 = {{{"Belarus_Minsk Region", 2} /* Mwm to number */},
                         {{"Russian Federation", 1}, {"Belarus", 8} /* Country to number */}};
 
   stats1.Add(stats2);
 
-  Stats const expected = {
-      {{"Belarus_Minsk Region", 3}, {"Uzbekistan", 7}, {"Russia_Moscow", 5} /* Mwm to number */},
-      {{"Russian Federation", 11}, {"Poland", 5}, {"Belarus", 8} /* Country to number */}};
+  Stats const expected = {{{"Belarus_Minsk Region", 3}, {"Uzbekistan", 7}, {"Russia_Moscow", 5} /* Mwm to number */},
+                          {{"Russian Federation", 11}, {"Poland", 5}, {"Belarus", 8} /* Country to number */}};
 
   TEST_EQUAL(stats1, expected, ());
 }
@@ -101,8 +98,7 @@ UNIT_TEST(AddTracksStatsTest)
 
 UNIT_TEST(MappingToCsvTest)
 {
-  Stats::NameToCountMapping const mapping = {
-      {{"Belarus_Minsk Region", 2}, {"Uzbekistan", 5}, {"Russia_Moscow", 3}}};
+  Stats::NameToCountMapping const mapping = {{{"Belarus_Minsk Region", 2}, {"Uzbekistan", 5}, {"Russia_Moscow", 3}}};
   {
     std::ostringstream ss;
     MappingToCsv("mwm", mapping, true /* printPercentage */, ss);
@@ -127,8 +123,7 @@ Belarus_Minsk Region,2
 
 UNIT_TEST(MappingToCsvUint64Test)
 {
-  Stats::NameToCountMapping const mapping = {{"Belarus_Minsk Region", 5'000'000'000},
-                                             {"Uzbekistan", 15'000'000'000}};
+  Stats::NameToCountMapping const mapping = {{"Belarus_Minsk Region", 5'000'000'000}, {"Uzbekistan", 15'000'000'000}};
   std::stringstream ss;
   MappingToCsv("mwm", mapping, true /* printPercentage */, ss);
   std::string const expected = R"(mwm,number,percent
@@ -140,21 +135,17 @@ Belarus_Minsk Region,5000000000,25
 
 UNIT_TEST(SerializationToCsvTest)
 {
-  Stats::NameToCountMapping const mapping1 = {{"Belarus_Minsk Region", 2},
-                                              {"Uzbekistan", 5},
-                                              {"Russia_Moscow", 1},
-                                              {"Russia_Moscow Oblast_East", 2}};
+  Stats::NameToCountMapping const mapping1 = {
+      {"Belarus_Minsk Region", 2}, {"Uzbekistan", 5}, {"Russia_Moscow", 1}, {"Russia_Moscow Oblast_East", 2}};
   TestSerializationToCsv(mapping1);
 
-  Stats::NameToCountMapping const mapping2 = {
-      {{"Belarus_Minsk Region", 2}, {"Uzbekistan", 5}, {"Russia_Moscow", 3}}};
+  Stats::NameToCountMapping const mapping2 = {{{"Belarus_Minsk Region", 2}, {"Uzbekistan", 5}, {"Russia_Moscow", 3}}};
   TestSerializationToCsv(mapping2);
 }
 
 UNIT_TEST(SerializationToCsvWithZeroValueTest)
 {
-  Stats::NameToCountMapping const mapping = {{"Russia_Moscow Oblast_East", 2},
-                                             {"Poland_Lesser Poland Voivodeship", 0}};
+  Stats::NameToCountMapping const mapping = {{"Russia_Moscow Oblast_East", 2}, {"Poland_Lesser Poland Voivodeship", 0}};
   Stats::NameToCountMapping const expected = {{"Russia_Moscow Oblast_East", 2}};
 
   std::stringstream ss;
@@ -168,9 +159,8 @@ UNIT_TEST(SerializationToCsvWithZeroValueTest)
 
 UNIT_TEST(SerializationToCsvUint64Test)
 {
-  Stats::NameToCountMapping const mapping = {{"Belarus_Minsk Region", 20'000'000'000},
-                                             {"Uzbekistan", 5},
-                                             {"Russia_Moscow", 7'000'000'000}};
+  Stats::NameToCountMapping const mapping = {
+      {"Belarus_Minsk Region", 20'000'000'000}, {"Uzbekistan", 5}, {"Russia_Moscow", 7'000'000'000}};
   TestSerializationToCsv(mapping);
 }
 }  // namespace
diff --git a/tools/track_analyzing/track_analyzing_tests/track_archive_reader_tests.cpp b/tools/track_analyzing/track_analyzing_tests/track_archive_reader_tests.cpp
index e29915c7f..2b7602c54 100644
--- a/tools/track_analyzing/track_analyzing_tests/track_archive_reader_tests.cpp
+++ b/tools/track_analyzing/track_analyzing_tests/track_archive_reader_tests.cpp
@@ -11,8 +11,8 @@
 #include "coding/zip_creator.hpp"
 
 #include <optional>
-#include <string>
 #include <sstream>
+#include <string>
 
 #include "3party/minizip/minizip.hpp"
 
@@ -31,8 +31,7 @@ struct UserTrackInfo
   Track m_track;
 };
 
-std::optional<UserTrackInfo> ParseLogRecord(std::string const & record,
-                                            TemporaryFile & tmpArchiveFile);
+std::optional<UserTrackInfo> ParseLogRecord(std::string const & record, TemporaryFile & tmpArchiveFile);
 std::optional<std::string> ParseMultipartData(std::string const & binaryData);
 bool ParseTrackFile(unzip::File & zipReader, Track & trackData) noexcept;
 template <typename Reader, typename Pack>
@@ -83,8 +82,8 @@ UNIT_TEST(UnpackTrackArchiveDataTest)
   vector<string> trackFiles;
   trackFiles.push_back(archiveFileName);
   string const containerFileName("test_track_archive.zip");
-  TEST_EQUAL(CreateZipFromFiles(trackFiles, containerFileName, CompressionLevel::NoCompression),
-             true, ("Unable to create tracks archive"));
+  TEST_EQUAL(CreateZipFromFiles(trackFiles, containerFileName, CompressionLevel::NoCompression), true,
+             ("Unable to create tracks archive"));
   FileWriter::DeleteFileX(archiveFileName);
 
   // Step 2.3: Read batch archive content
@@ -99,8 +98,7 @@ UNIT_TEST(UnpackTrackArchiveDataTest)
   // Step 2.4: Wrap as multipart data
   stringstream multipartStream;
   multipartStream << "------0000000000000\r\n";
-  multipartStream << "Content-Disposition: form-data; name=\"file\"; filename=\""
-                  << containerFileName << "\"\r\n";
+  multipartStream << "Content-Disposition: form-data; name=\"file\"; filename=\"" << containerFileName << "\"\r\n";
   multipartStream << "Content-Type: application/zip\r\n";
   multipartStream << "\r\n";
   multipartStream.write(buffer.data(), buffer.size());
@@ -110,16 +108,14 @@ UNIT_TEST(UnpackTrackArchiveDataTest)
   string multipartData = multipartStream.str();
 
   stringstream logStream;
-  logStream << testUserId << "\t1\t1577826010\t" << multipartData.size() << "\t"
-            << ToHex(multipartData);
+  logStream << testUserId << "\t1\t1577826010\t" << multipartData.size() << "\t" << ToHex(multipartData);
 
   string const logRecord = logStream.str();
 
   // Unpack log record
   TemporaryFile tmpArchiveFile("tmp-unittest", ".zip");
 
-  optional<track_analyzing::details::UserTrackInfo> data =
-      ParseLogRecord(logRecord, tmpArchiveFile);
+  optional<track_analyzing::details::UserTrackInfo> data = ParseLogRecord(logRecord, tmpArchiveFile);
   TEST_EQUAL(bool(data), true, ("Unable parse track archive record"));
 
   TEST_EQUAL(data->m_userId, testUserId, ());
@@ -128,10 +124,8 @@ UNIT_TEST(UnpackTrackArchiveDataTest)
   for (size_t i = 0; i < testTrack.size(); ++i)
   {
     TEST_EQUAL(data->m_track[i].m_timestamp, testTrack[i].m_timestamp, ());
-    TEST_ALMOST_EQUAL_ABS(data->m_track[i].m_latLon.m_lat, testTrack[i].m_latLon.m_lat,
-                          kAccuracyEps, ());
-    TEST_ALMOST_EQUAL_ABS(data->m_track[i].m_latLon.m_lon, testTrack[i].m_latLon.m_lon,
-                          kAccuracyEps, ());
+    TEST_ALMOST_EQUAL_ABS(data->m_track[i].m_latLon.m_lat, testTrack[i].m_latLon.m_lat, kAccuracyEps, ());
+    TEST_ALMOST_EQUAL_ABS(data->m_track[i].m_latLon.m_lon, testTrack[i].m_latLon.m_lon, kAccuracyEps, ());
     TEST_EQUAL(data->m_track[i].m_traffic, testTrack[i].m_traffic, ());
   }
 }
diff --git a/tools/track_analyzing/track_archive_reader.cpp b/tools/track_analyzing/track_archive_reader.cpp
index a3e31f585..8a33ee3dd 100644
--- a/tools/track_analyzing/track_archive_reader.cpp
+++ b/tools/track_analyzing/track_archive_reader.cpp
@@ -27,7 +27,7 @@ using namespace track_analyzing;
 
 namespace track_analyzing
 {
-const string kTmpArchiveFileNameTemplate("-tmp-track-archive.zip");
+string const kTmpArchiveFileNameTemplate("-tmp-track-archive.zip");
 
 // Track record fields:
 //  0: user ID
@@ -124,8 +124,8 @@ optional<string> ParseMultipartData(string const & binaryData)
   {
     if (expectedContentType == header)
       hasContentTypeHeader = true;
-    if (expectedContentDispositionPrefix.compare(0, string::npos, header, 0,
-                                                 expectedContentDispositionPrefix.size()) == 0)
+    if (expectedContentDispositionPrefix.compare(0, string::npos, header, 0, expectedContentDispositionPrefix.size()) ==
+        0)
     {
       hasContentDispositionHeader = true;
     }
@@ -140,8 +140,8 @@ optional<string> ParseMultipartData(string const & binaryData)
 
 bool HasZipSignature(string const & binaryData)
 {
-  return binaryData.size() >= 4 && binaryData[0] == 0x50 && binaryData[1] == 0x4b &&
-         binaryData[2] == 0x03 && binaryData[3] == 0x04;
+  return binaryData.size() >= 4 && binaryData[0] == 0x50 && binaryData[1] == 0x4b && binaryData[2] == 0x03 &&
+         binaryData[3] == 0x04;
 }
 
 template <typename Reader, typename Pack>
@@ -153,8 +153,7 @@ bool ReadTrackFromArchive(char const * data, size_t dataSize, Track & trackData)
     vector<uint8_t> buffer;
     inflate(data, dataSize, back_inserter(buffer));
 
-    ReaderSource<MemReaderWithExceptions> reader(
-        MemReaderWithExceptions(buffer.data(), buffer.size()));
+    ReaderSource<MemReaderWithExceptions> reader(MemReaderWithExceptions(buffer.data(), buffer.size()));
     if (reader.Size() == 0)
       return false;
 
@@ -209,13 +208,13 @@ bool ParseTrackFile(unzip::File & zipReader, Track & trackData) noexcept
   bool result = false;
   if (archiveInfo.m_trackType == routing::RouterType::Vehicle)
   {
-    result = ReadTrackFromArchive<ReaderSource<MemReaderWithExceptions>, tracking::PacketCar>(
-        fileData.data(), dataSize, trackData);
+    result = ReadTrackFromArchive<ReaderSource<MemReaderWithExceptions>, tracking::PacketCar>(fileData.data(), dataSize,
+                                                                                              trackData);
   }
   else
   {
-    result = ReadTrackFromArchive<ReaderSource<MemReaderWithExceptions>, tracking::Packet>(
-        fileData.data(), dataSize, trackData);
+    result = ReadTrackFromArchive<ReaderSource<MemReaderWithExceptions>, tracking::Packet>(fileData.data(), dataSize,
+                                                                                           trackData);
   }
 
   if (unzip::CloseCurrentFile(zipReader) != unzip::Code::Ok)
@@ -254,9 +253,7 @@ optional<Track> ParseTrackArchiveData(string const & content, TemporaryFile & tm
 
   bool result = ParseTrackFile(zipReader, trackData);
   while (result && unzip::GoToNextFile(zipReader) == unzip::Code::Ok)
-  {
     result = ParseTrackFile(zipReader, trackData);
-  }
 
   if (unzip::Close(zipReader) != unzip::Code::Ok)
     LOG(LERROR, ("Unable to close temporary zip archive"));
@@ -285,8 +282,7 @@ optional<UserTrackInfo> ParseLogRecord(string const & record, TemporaryFile & tm
 
 }  // namespace details
 
-void TrackArchiveReader::ParseUserTracksFromFile(string const & logFile,
-                                                 UserToTrack & userToTrack) const
+void TrackArchiveReader::ParseUserTracksFromFile(string const & logFile, UserToTrack & userToTrack) const
 {
   // Read file content
   FileReader reader(logFile);
diff --git a/tools/track_analyzing/track_matcher.cpp b/tools/track_analyzing/track_matcher.cpp
index 7f6ddb443..135912213 100644
--- a/tools/track_analyzing/track_matcher.cpp
+++ b/tools/track_analyzing/track_matcher.cpp
@@ -12,7 +12,6 @@
 
 #include "base/stl_helpers.hpp"
 
-
 namespace track_analyzing
 {
 using namespace routing;
@@ -25,8 +24,7 @@ namespace
 double constexpr kMatchingRange = 20.0;
 
 // Mercator distance from segment to point in meters.
-double DistanceToSegment(m2::PointD const & segmentBegin, m2::PointD const & segmentEnd,
-                         m2::PointD const & point)
+double DistanceToSegment(m2::PointD const & segmentBegin, m2::PointD const & segmentEnd, m2::PointD const & point)
 {
   m2::ParametrizedSegment<m2::PointD> const segment(segmentBegin, segmentEnd);
   m2::PointD const projectionPoint = segment.ClosestPointTo(point);
@@ -36,41 +34,36 @@ double DistanceToSegment(m2::PointD const & segmentBegin, m2::PointD const & seg
 double DistanceToSegment(Segment const & segment, m2::PointD const & point, IndexGraph & indexGraph)
 {
   auto const & road = indexGraph.GetRoadGeometry(segment.GetFeatureId());
-  return DistanceToSegment(
-      mercator::FromLatLon(road.GetPoint(segment.GetPointId(false))),
-      mercator::FromLatLon(road.GetPoint(segment.GetPointId(true))), point);
+  return DistanceToSegment(mercator::FromLatLon(road.GetPoint(segment.GetPointId(false))),
+                           mercator::FromLatLon(road.GetPoint(segment.GetPointId(true))), point);
 }
 
 bool EdgesContain(IndexGraph::SegmentEdgeListT const & edges, Segment const & segment)
 {
   for (auto const & edge : edges)
-  {
     if (edge.GetTarget() == segment)
       return true;
-  }
 
   return false;
 }
 }  // namespace
 
 // TrackMatcher ------------------------------------------------------------------------------------
-TrackMatcher::TrackMatcher(storage::Storage const & storage, NumMwmId mwmId,
-                           platform::CountryFile const & countryFile)
+TrackMatcher::TrackMatcher(storage::Storage const & storage, NumMwmId mwmId, platform::CountryFile const & countryFile)
   : m_mwmId(mwmId)
   , m_vehicleModel(CarModelFactory({}).GetVehicleModelForCountry(countryFile.GetName()))
 {
   auto localCountryFile = storage.GetLatestLocalFile(countryFile);
   CHECK(localCountryFile, ("Can't find latest country file for", countryFile.GetName()));
   auto registerResult = m_dataSource.Register(*localCountryFile);
-  CHECK_EQUAL(registerResult.second, MwmSet::RegResult::Success,
-              ("Can't register mwm", countryFile.GetName()));
+  CHECK_EQUAL(registerResult.second, MwmSet::RegResult::Success, ("Can't register mwm", countryFile.GetName()));
 
   MwmSet::MwmHandle handle = m_dataSource.GetMwmHandleByCountryFile(countryFile);
 
   m_graph = make_unique<IndexGraph>(
       make_shared<Geometry>(GeometryLoader::Create(handle, m_vehicleModel, false /* loadAltitudes */)),
-      EdgeEstimator::Create(VehicleType::Car, *m_vehicleModel, nullptr /* trafficStash */,
-        nullptr /* dataSource */, nullptr /* numMvmIds */));
+      EdgeEstimator::Create(VehicleType::Car, *m_vehicleModel, nullptr /* trafficStash */, nullptr /* dataSource */,
+                            nullptr /* numMvmIds */));
 
   DeserializeIndexGraph(*handle.GetValue(), VehicleType::Car, *m_graph);
 }
@@ -88,8 +81,7 @@ void TrackMatcher::MatchTrack(vector<DataPoint> const & track, vector<MatchedTra
   {
     for (; trackBegin < steps.size(); ++trackBegin)
     {
-      steps[trackBegin].FillCandidatesWithNearbySegments(m_dataSource, *m_graph, *m_vehicleModel,
-                                                         m_mwmId);
+      steps[trackBegin].FillCandidatesWithNearbySegments(m_dataSource, *m_graph, *m_vehicleModel, m_mwmId);
       if (steps[trackBegin].HasCandidates())
         break;
 
@@ -130,13 +122,12 @@ void TrackMatcher::MatchTrack(vector<DataPoint> const & track, vector<MatchedTra
 
 // TrackMatcher::Step ------------------------------------------------------------------------------
 TrackMatcher::Step::Step(DataPoint const & dataPoint)
-  : m_dataPoint(dataPoint), m_point(mercator::FromLatLon(dataPoint.m_latLon))
-{
-}
+  : m_dataPoint(dataPoint)
+  , m_point(mercator::FromLatLon(dataPoint.m_latLon))
+{}
 
-void TrackMatcher::Step::FillCandidatesWithNearbySegments(
-    DataSource const & dataSource, IndexGraph const & graph,
-    VehicleModelInterface const & vehicleModel, NumMwmId mwmId)
+void TrackMatcher::Step::FillCandidatesWithNearbySegments(DataSource const & dataSource, IndexGraph const & graph,
+                                                          VehicleModelInterface const & vehicleModel, NumMwmId mwmId)
 {
   dataSource.ForEachInRect([&](FeatureType & ft)
   {
@@ -154,25 +145,20 @@ void TrackMatcher::Step::FillCandidatesWithNearbySegments(
 
     for (size_t segIdx = 0; segIdx + 1 < ft.GetPointsCount(); ++segIdx)
     {
-      double const distance =
-          DistanceToSegment(ft.GetPoint(segIdx), ft.GetPoint(segIdx + 1), m_point);
+      double const distance = DistanceToSegment(ft.GetPoint(segIdx), ft.GetPoint(segIdx + 1), m_point);
       if (distance < kMatchingRange)
       {
-        AddCandidate(Segment(mwmId, ft.GetID().m_index, static_cast<uint32_t>(segIdx),
-                             true /* forward */),
-                     distance, graph);
+        AddCandidate(Segment(mwmId, ft.GetID().m_index, static_cast<uint32_t>(segIdx), true /* forward */), distance,
+                     graph);
 
         if (!vehicleModel.IsOneWay(types))
         {
-          AddCandidate(Segment(mwmId, ft.GetID().m_index, static_cast<uint32_t>(segIdx),
-                               false /* forward */),
-                       distance, graph);
+          AddCandidate(Segment(mwmId, ft.GetID().m_index, static_cast<uint32_t>(segIdx), false /* forward */), distance,
+                       graph);
         }
       }
     }
-  },
-  mercator::RectByCenterXYAndSizeInMeters(m_point, kMatchingRange),
-  scales::GetUpperScale());
+  }, mercator::RectByCenterXYAndSizeInMeters(m_point, kMatchingRange), scales::GetUpperScale());
 }
 
 void TrackMatcher::Step::FillCandidates(Step const & previousStep, IndexGraph & graph)
@@ -198,9 +184,7 @@ void TrackMatcher::Step::FillCandidates(Step const & previousStep, IndexGraph &
   base::SortUnique(m_candidates);
 
   m_candidates.erase(remove_if(m_candidates.begin(), m_candidates.end(),
-                               [&](Candidate const & candidate) {
-                                 return candidate.GetDistance() > kMatchingRange;
-                               }),
+                               [&](Candidate const & candidate) { return candidate.GetDistance() > kMatchingRange; }),
                      m_candidates.end());
 }
 
@@ -211,8 +195,7 @@ void TrackMatcher::Step::ChooseSegment(Step const & nextStep, IndexGraph & index
   double minDistance = numeric_limits<double>::max();
 
   IndexGraph::SegmentEdgeListT edges;
-  indexGraph.GetEdgeList(nextStep.m_segment, false /* isOutgoing */, true /* useRoutingOptions */,
-                         edges);
+  indexGraph.GetEdgeList(nextStep.m_segment, false /* isOutgoing */, true /* useRoutingOptions */, edges);
   edges.emplace_back(nextStep.m_segment, GetAStarWeightZero<RouteWeight>());
 
   for (Candidate const & candidate : m_candidates)
@@ -244,8 +227,7 @@ void TrackMatcher::Step::ChooseNearestSegment()
   }
 }
 
-void TrackMatcher::Step::AddCandidate(Segment const & segment, double distance,
-                                      IndexGraph const & graph)
+void TrackMatcher::Step::AddCandidate(Segment const & segment, double distance, IndexGraph const & graph)
 {
   if (graph.GetAccessType(segment) == RoadAccess::Type::Yes)
     m_candidates.emplace_back(segment, distance);
diff --git a/tools/track_analyzing/track_matcher.hpp b/tools/track_analyzing/track_matcher.hpp
index 3939faf21..5871925cb 100644
--- a/tools/track_analyzing/track_matcher.hpp
+++ b/tools/track_analyzing/track_matcher.hpp
@@ -22,8 +22,7 @@ namespace track_analyzing
 class TrackMatcher final
 {
 public:
-  TrackMatcher(storage::Storage const & storage, routing::NumMwmId mwmId,
-               platform::CountryFile const & countryFile);
+  TrackMatcher(storage::Storage const & storage, routing::NumMwmId mwmId, platform::CountryFile const & countryFile);
 
   void MatchTrack(std::vector<DataPoint> const & track, std::vector<MatchedTrack> & matchedTracks);
 
@@ -35,9 +34,7 @@ private:
   class Candidate final
   {
   public:
-    Candidate(routing::Segment segment, double distance) : m_segment(segment), m_distance(distance)
-    {
-    }
+    Candidate(routing::Segment segment, double distance) : m_segment(segment), m_distance(distance) {}
 
     routing::Segment const & GetSegment() const { return m_segment; }
     double GetDistance() const { return m_distance; }
@@ -57,17 +54,14 @@ private:
     DataPoint const & GetDataPoint() const { return m_dataPoint; }
     routing::Segment const & GetSegment() const { return m_segment; }
     bool HasCandidates() const { return !m_candidates.empty(); }
-    void FillCandidatesWithNearbySegments(DataSource const & dataSource,
-                                          routing::IndexGraph const & graph,
-                                          routing::VehicleModelInterface const & vehicleModel,
-                                          routing::NumMwmId mwmId);
+    void FillCandidatesWithNearbySegments(DataSource const & dataSource, routing::IndexGraph const & graph,
+                                          routing::VehicleModelInterface const & vehicleModel, routing::NumMwmId mwmId);
     void FillCandidates(Step const & previousStep, routing::IndexGraph & graph);
     void ChooseSegment(Step const & nextStep, routing::IndexGraph & indexGraph);
     void ChooseNearestSegment();
 
   private:
-    void AddCandidate(routing::Segment const & segment, double distance,
-                      routing::IndexGraph const & graph);
+    void AddCandidate(routing::Segment const & segment, double distance, routing::IndexGraph const & graph);
 
     DataPoint m_dataPoint;
     m2::PointD m_point;
diff --git a/tools/track_analyzing/utils.cpp b/tools/track_analyzing/utils.cpp
index f9e465ad8..3d28b681f 100644
--- a/tools/track_analyzing/utils.cpp
+++ b/tools/track_analyzing/utils.cpp
@@ -17,8 +17,7 @@ using namespace std;
 
 namespace track_analyzing
 {
-double CalcSubtrackLength(MatchedTrack::const_iterator begin, MatchedTrack::const_iterator end,
-                          Geometry & geometry)
+double CalcSubtrackLength(MatchedTrack::const_iterator begin, MatchedTrack::const_iterator end, Geometry & geometry)
 {
   double length = 0.0;
 
@@ -29,10 +28,8 @@ double CalcSubtrackLength(MatchedTrack::const_iterator begin, MatchedTrack::cons
     Segment const & segment = point.GetSegment();
     if (segment != prevSegment)
     {
-      length +=
-          ms::DistanceOnEarth(
-          geometry.GetPoint(segment.GetRoadPoint(false /* front */)),
-          geometry.GetPoint(segment.GetRoadPoint(true /* front */)));
+      length += ms::DistanceOnEarth(geometry.GetPoint(segment.GetRoadPoint(false /* front */)),
+                                    geometry.GetPoint(segment.GetRoadPoint(true /* front */)));
       prevSegment = segment;
     }
   }
@@ -51,8 +48,7 @@ double CalcSpeedKMpH(double meters, uint64_t secondsElapsed)
   return measurement_utils::MpsToKmph(meters / static_cast<double>(secondsElapsed));
 }
 
-void ReadTracks(shared_ptr<NumMwmIds> numMwmIds, string const & filename,
-                MwmToMatchedTracks & mwmToMatchedTracks)
+void ReadTracks(shared_ptr<NumMwmIds> numMwmIds, string const & filename, MwmToMatchedTracks & mwmToMatchedTracks)
 {
   FileReader reader(filename);
   ReaderSource<FileReader> src(reader);
@@ -60,9 +56,8 @@ void ReadTracks(shared_ptr<NumMwmIds> numMwmIds, string const & filename,
   serializer.Deserialize(mwmToMatchedTracks, src);
 }
 
-MatchedTrack const & GetMatchedTrack(MwmToMatchedTracks const & mwmToMatchedTracks,
-                                     NumMwmIds const & numMwmIds, string const & mwmName,
-                                     string const & user, size_t trackIdx)
+MatchedTrack const & GetMatchedTrack(MwmToMatchedTracks const & mwmToMatchedTracks, NumMwmIds const & numMwmIds,
+                                     string const & mwmName, string const & user, size_t trackIdx)
 {
   auto const countryFile = platform::CountryFile(mwmName);
   if (!numMwmIds.ContainsFile(countryFile))
@@ -84,8 +79,8 @@ MatchedTrack const & GetMatchedTrack(MwmToMatchedTracks const & mwmToMatchedTrac
 
   if (trackIdx >= tracks.size())
   {
-    MYTHROW(MessageException, ("There is no track", trackIdx, "for user", user, ", she has",
-                               tracks.size(), "tracks only"));
+    MYTHROW(MessageException,
+            ("There is no track", trackIdx, "for user", user, ", she has", tracks.size(), "tracks only"));
   }
 
   return tracks[trackIdx];
@@ -96,10 +91,9 @@ std::string GetCurrentVersionMwmFile(storage::Storage const & storage, std::stri
   return storage.GetFilePath(mwmName, MapFileType::Map);
 }
 
-void ForEachTrackFile(
-    std::string const & filepath, std::string const & extension,
-    shared_ptr<routing::NumMwmIds> numMwmIds,
-    std::function<void(std::string const & filename, MwmToMatchedTracks const &)> && toDo)
+void ForEachTrackFile(std::string const & filepath, std::string const & extension,
+                      shared_ptr<routing::NumMwmIds> numMwmIds,
+                      std::function<void(std::string const & filename, MwmToMatchedTracks const &)> && toDo)
 {
   Platform::EFileType fileType = Platform::EFileType::Unknown;
   Platform::EError const result = Platform::GetFileType(filepath, fileType);
diff --git a/tools/track_analyzing/utils.hpp b/tools/track_analyzing/utils.hpp
index 91b650cd9..0f4a7a32e 100644
--- a/tools/track_analyzing/utils.hpp
+++ b/tools/track_analyzing/utils.hpp
@@ -29,14 +29,12 @@ double CalcSpeedKMpH(double meters, uint64_t secondsElapsed);
 void ReadTracks(std::shared_ptr<routing::NumMwmIds> numMwmIds, std::string const & filename,
                 MwmToMatchedTracks & mwmToMatchedTracks);
 MatchedTrack const & GetMatchedTrack(MwmToMatchedTracks const & mwmToMatchedTracks,
-                                     routing::NumMwmIds const & numMwmIds,
-                                     std::string const & mwmName, std::string const & user,
-                                     size_t trackIdx);
+                                     routing::NumMwmIds const & numMwmIds, std::string const & mwmName,
+                                     std::string const & user, size_t trackIdx);
 std::string GetCurrentVersionMwmFile(storage::Storage const & storage, std::string const & mwmName);
 
 template <typename MwmToTracks, typename ToDo>
-void ForTracksSortedByMwmName(MwmToTracks const & mwmToTracks, routing::NumMwmIds const & numMwmIds,
-                              ToDo && toDo)
+void ForTracksSortedByMwmName(MwmToTracks const & mwmToTracks, routing::NumMwmIds const & numMwmIds, ToDo && toDo)
 {
   std::vector<std::string> mwmNames;
   mwmNames.reserve(mwmToTracks.size());
@@ -53,8 +51,7 @@ void ForTracksSortedByMwmName(MwmToTracks const & mwmToTracks, routing::NumMwmId
   }
 }
 
-void ForEachTrackFile(
-    std::string const & filepath, std::string const & extension,
-    std::shared_ptr<routing::NumMwmIds> numMwmIds,
-    std::function<void(std::string const & filename, MwmToMatchedTracks const &)> && toDo);
+void ForEachTrackFile(std::string const & filepath, std::string const & extension,
+                      std::shared_ptr<routing::NumMwmIds> numMwmIds,
+                      std::function<void(std::string const & filename, MwmToMatchedTracks const &)> && toDo);
 }  // namespace track_analyzing
diff --git a/tools/track_generator/track_generator_tool.cpp b/tools/track_generator/track_generator_tool.cpp
index 394700bf7..df3b0327c 100644
--- a/tools/track_generator/track_generator_tool.cpp
+++ b/tools/track_generator/track_generator_tool.cpp
@@ -13,20 +13,22 @@ DEFINE_string(inputDir, "", "Path to kmls.");
 
 DEFINE_string(outputDir, "", "Path to converted kmls.");
 
-DEFINE_int32(vehicleType, 0, "Numeric value of routing::VehicleType enum. "
-                             "Pedestrian by default.");
+DEFINE_int32(vehicleType, 0,
+             "Numeric value of routing::VehicleType enum. "
+             "Pedestrian by default.");
 
 DEFINE_bool(showHelp, false, "Show help on all flags.");
 
 int main(int argc, char ** argv)
 {
-  gflags::SetUsageMessage("The tool is used to generate more smooth track based on "
-                          "waypoints from the kml. The kml has to contain points "
-                          "within LineString tag. If the router can't build the route "
-                          "than the specific path will be untouched. Multiple kmls into "
-                          " the directory are supported.\n\n"
-                          "Usage example: "
-                          "./track_generator_tool -inputDir=path/to/input/ -outputDir=/path/to/output/");
+  gflags::SetUsageMessage(
+      "The tool is used to generate more smooth track based on "
+      "waypoints from the kml. The kml has to contain points "
+      "within LineString tag. If the router can't build the route "
+      "than the specific path will be untouched. Multiple kmls into "
+      " the directory are supported.\n\n"
+      "Usage example: "
+      "./track_generator_tool -inputDir=path/to/input/ -outputDir=/path/to/output/");
 
   gflags::ParseCommandLineFlags(&argc, &argv, false /* remove_flags */);
 

From 8bac8b7d379925220eddc1b2a3fc0a08f8292805 Mon Sep 17 00:00:00 2001
From: vikiawv <vikiawv@noreply.codeberg.org>
Date: Sun, 17 Aug 2025 15:54:03 +0200
Subject: [PATCH 047/302] [styles] Austria Reference Color

Signed-off-by: vikiawv <vikiawv@noreply.codeberg.org>
Co-authored-by: vikiawv <vikiawv@noreply.codeberg.org>
Co-committed-by: vikiawv <vikiawv@noreply.codeberg.org>
---
 libs/indexer/road_shields_parser.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/libs/indexer/road_shields_parser.cpp b/libs/indexer/road_shields_parser.cpp
index e4b000beb..1ae7e550e 100644
--- a/libs/indexer/road_shields_parser.cpp
+++ b/libs/indexer/road_shields_parser.cpp
@@ -429,6 +429,18 @@ private:
 
 // Implementations of "ref" parses for some countries.
 
+class AustriaRoadShieldParser : public SimpleRoadShieldParser
+{
+public:
+  explicit AustriaRoadShieldParser(std::string const & baseRoadNumber)
+    : SimpleRoadShieldParser(baseRoadNumber, {{"A", RoadShieldType::Generic_Blue},
+                                              {"S", RoadShieldType::Generic_Blue},
+                                              {"B", RoadShieldType::Generic_Blue},
+                                              {"L", RoadShieldType::Generic_White}})
+  {
+  }
+};
+
 class RussiaRoadShieldParser : public DefaultTypeRoadShieldParser
 {
 public:
@@ -641,6 +653,8 @@ RoadShieldsSetT GetRoadShields(std::string const & mwmName, std::string const &
     return UKRoadShieldParser(roadNumber).GetRoadShields();
   if (mwmName == "India")
     return IndiaRoadShieldParser(roadNumber).GetRoadShields();
+  if (mwmName == "Austria")
+    return AustriaRoadShieldParser(roadNumber).GetRoadShields();
   if (mwmName == "Russia")
     return RussiaRoadShieldParser(roadNumber).GetRoadShields();
   if (mwmName == "France")

From 90667e9fa149d5b6f8ed6ad43884391958b562ca Mon Sep 17 00:00:00 2001
From: Codeberg Translate <translate@codeberg.org>
Date: Sun, 17 Aug 2025 06:31:24 +0000
Subject: [PATCH 048/302] [strings] Update from Codeberg Translate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Codeberg Translate <translate@codeberg.org>
Co-authored-by: Fjuro <fjuro@alius.cz>
Co-authored-by: Mickael81 <mickael81@noreply.codeberg.org>
Co-authored-by: N4ta <codeberg@n4ta.anonaddy.me>
Co-authored-by: Priit Jõerüüt <jrtcdbrg@noreply.codeberg.org>
Co-authored-by: Stephan-P <stephan-p@noreply.codeberg.org>
Co-authored-by: alexgabi <alexgabi@noreply.codeberg.org>
Co-authored-by: aoxa <aoxa@noreply.codeberg.org>
Co-authored-by: concede2913 <concede2913@noreply.codeberg.org>
Co-authored-by: metehan <metehan@noreply.codeberg.org>
Co-authored-by: patepelo <patepelo@noreply.codeberg.org>
Co-authored-by: phama <phama@noreply.codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/comaps/ios-typestrings/
Translation: CoMaps/Android - Map Feature Types
Translation: CoMaps/Android UI Strings
Translation: CoMaps/Apple AppStore description
Translation: CoMaps/Countries and regions names
Translation: CoMaps/F-Droid app description
Translation: CoMaps/iOS - Map Feature Types
Translation: CoMaps/iOS Plist
Translation: CoMaps/iOS UI Strings
---
 .../play/listings/eu-ES/full-description.txt  |   2 +-
 .../app/src/main/res/values-cs/strings.xml    |   2 +
 .../app/src/main/res/values-es/strings.xml    |  38 ++---
 .../src/main/res/values-es/types_strings.xml  |  36 ++--
 .../app/src/main/res/values-et/strings.xml    |   2 +
 .../app/src/main/res/values-eu/strings.xml    |  24 +--
 .../src/main/res/values-eu/types_strings.xml  |  16 +-
 .../src/main/res/values-fa/types_strings.xml  |  35 ++--
 .../app/src/main/res/values-fi/strings.xml    |   2 +
 .../app/src/main/res/values-nl/strings.xml    | 161 +++++++++---------
 .../app/src/main/res/values-pt/strings.xml    |   2 +
 .../src/main/res/values-ru/types_strings.xml  |   1 +
 .../app/src/main/res/values-tr/strings.xml    |   6 +-
 data/countries-strings/et.json/localize.json  |  10 +-
 data/countries-strings/fi.json/localize.json  |  48 +++---
 data/countries-strings/nl.json/localize.json  |   4 +-
 .../es.lproj/Localizable.strings              |  26 +--
 .../es.lproj/LocalizableTypes.strings         |  36 ++--
 .../eu.lproj/InfoPlist.strings                |   6 +-
 .../eu.lproj/Localizable.strings              |  20 +--
 .../eu.lproj/LocalizableTypes.strings         |  16 +-
 .../fa.lproj/LocalizableTypes.strings         |  40 ++---
 .../nl.lproj/InfoPlist.strings                |   2 +-
 .../nl.lproj/Localizable.strings              | 100 +++++------
 .../ru.lproj/LocalizableTypes.strings         |   2 +-
 .../tr.lproj/Localizable.strings              |   2 +-
 iphone/metadata/fr-FR/keywords.txt            |   2 +-
 iphone/metadata/fr-FR/subtitle.txt            |   2 +-
 28 files changed, 330 insertions(+), 313 deletions(-)

diff --git a/android/app/src/fdroid/play/listings/eu-ES/full-description.txt b/android/app/src/fdroid/play/listings/eu-ES/full-description.txt
index f2a1db5d9..778614bd1 100644
--- a/android/app/src/fdroid/play/listings/eu-ES/full-description.txt
+++ b/android/app/src/fdroid/play/listings/eu-ES/full-description.txt
@@ -24,7 +24,7 @@ Sartu komunitatean eta lagundu maparik onena aplikatzen
 • Lineaz kanpoko Wikipedia artikuluak
 • Metroaren garraio geruza eta jarraibideak
 • Arrastoen grabazioa
-• Laster-markak eta ibilbideak esportatu eta inportatu KML, KMZ, GPX formatuetan
+• Markagailuak eta arrastoak esportatu eta inportatu KML, KMZ, GPX formatuetan
 • Gauean erabiltzeko modu iluna
 • Hobetu mapako datuak guztiontzat oinarrizko editore integratua erabiliz
 
diff --git a/android/app/src/main/res/values-cs/strings.xml b/android/app/src/main/res/values-cs/strings.xml
index 8886b95fb..3468263f0 100644
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -912,4 +912,6 @@
     <string name="open_now">Otevřeno</string>
     <string name="closed_now">Zavřeno</string>
     <string name="at">v %s</string>
+    <string name="osm_note_toast">Poznámka bude odeslána do OpenStreetMap</string>
+    <string name="osm_note_hint">Případně můžete zanechat poznámku komunitě OpenStreetMap, aby zde někdo jiný mohl místo přidat nebo opravit.</string>
 </resources>
diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml
index c3edacf93..9f6e12cce 100644
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -600,11 +600,11 @@
     <string name="placepage_add_stop">Añadir parada</string>
     <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
     <string name="alert_reauth_message">Inicia sesión en OpenStreetMap para cargar automáticamente todas tus ediciones de mapas. Más información <a href="https://github.com/organicmaps/organicmaps/issues/6144">aquí</a>.</string>
-    <string name="dialog_error_storage_title">Problema de acceso al almacenamiento</string>
-    <string name="dialog_error_storage_message">El almacenamiento externo no está disponible; puede que se haya quitado o dañado la tarjeta SD, o el sistema de archivos solo permite lectura. Por favor, compruébelo ó escríbanos a support@comaps.app</string>
+    <string name="dialog_error_storage_title">Error de acceso al almacenamiento</string>
+    <string name="dialog_error_storage_message">El almacenamiento externo no está disponible; puede que se haya quitado o dañado la tarjeta SD, o el sistema de archivos solo permite lectura. Por favor, compruébalo ó escríbenos a support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emular almacenamiento dañado</string>
     <string name="core_entrance">Entrada</string>
-    <string name="error_enter_correct_name">Por favor, introduzca el nombre correcto</string>
+    <string name="error_enter_correct_name">Por favor, introduce un nombre válido</string>
     <string name="bookmark_lists">Listas</string>
     <!-- Do not display all bookmark lists on the map -->
     <string name="bookmark_lists_hide_all">Ocultar todo</string>
@@ -648,7 +648,7 @@
     <string name="layers_title">Estilos y capas del mapa</string>
     <string name="subway_data_unavailable">El mapa del metro no está disponible</string>
     <string name="bookmarks_empty_list_title">Esta lista está vacía</string>
-    <string name="bookmarks_empty_list_message">Para agregar un marcador, toque un lugar en el mapa y después toque el icono de la estrella</string>
+    <string name="bookmarks_empty_list_message">Para agregar un marcador, toca un lugar en el mapa y después toca el icono de la estrella</string>
     <string name="category_desc_more">…más</string>
     <string name="export_file">Exportar KMZ</string>
     <string name="export_file_gpx">Exportar GPX</string>
@@ -731,10 +731,10 @@
     <string name="mountains">Montañas</string>
     <string name="animals">Animales</string>
     <string name="hotels">Hoteles</string>
-    <string name="buildings">Edificios</string>
+    <string name="buildings">Edificaciones</string>
     <string name="money">Dinero</string>
     <string name="shops">Tiendas</string>
-    <string name="parkings">Estacionamiento</string>
+    <string name="parkings">Aparcamiento</string>
     <string name="fuel_places">Gasolineras</string>
     <string name="medicine">Medicina</string>
     <string name="search_in_the_list">Buscar en la lista</string>
@@ -770,7 +770,7 @@
     <!-- A preference title; keep short! -->
     <string name="enable_show_on_lock_screen">Mostrar en la pantalla de bloqueo</string>
     <!-- Description in preferences -->
-    <string name="enable_show_on_lock_screen_description">Cuando se activa, no tiene que desbloquear el dispositivo para ejecutar la aplicación.</string>
+    <string name="enable_show_on_lock_screen_description">Cuando se activa, no tienes que desbloquear el dispositivo para ejecutar la aplicación.</string>
     <!-- Current language of the map! -->
     <string name="change_map_locale">Idioma del mapa</string>
     <!-- OpenStreetMap text on splash screen -->
@@ -784,27 +784,27 @@
     <!-- App Tip #00 -->
     <string name="app_tip_00">¡Gracias por utilizar nuestros mapas creados por la comunidad!</string>
     <!-- App tip #01 -->
-    <string name="app_tip_01">¡Con sus donaciones y apoyo, podemos crear los mejores mapas del mundo!</string>
+    <string name="app_tip_01">¡Con tus donaciones y apoyo, podemos crear los mejores mapas del mundo!</string>
     <!-- App tip #02 -->
-    <string name="app_tip_02">¿Le gusta nuestra aplicación? ¡Por favor done para apoyar su desarrollo! ¿Todavía no le gusta? ¡Díganos por qué y lo arreglaremos!</string>
+    <string name="app_tip_02">¿Te gusta nuestra aplicación? ¡Por favor dona para apoyar su desarrollo! ¿Todavía no te gusta? ¡Dinos por qué y lo arreglaremos!</string>
     <!-- App tip #03 -->
     <string name="app_tip_03">Si conoce a algún desarrollador o desarrolladora de software, le puede pedir que implemente alguna funcionalidad que usted necesite.</string>
     <!-- App tip #04 -->
-    <string name="app_tip_04">Toque en cualquier lugar del mapa para seleccionar cualquier elemento. Mantenga pulsado para ocultar y volver a mostrar la interfaz.</string>
+    <string name="app_tip_04">Toca en cualquier lugar del mapa para seleccionar cualquier elemento. Manten pulsado para ocultar y volver a mostrar la interfaz.</string>
     <!-- App tip #05 -->
-    <string name="app_tip_05">¿Sabía que su ubicación actual en el mapa se puede seleccionar?</string>
+    <string name="app_tip_05">¿Sabías que tu ubicación actual en el mapa se puede seleccionar?</string>
     <!-- App tip #06 -->
-    <string name="app_tip_06">Puede ayudar a traducir nuestra aplicación a su idioma.</string>
+    <string name="app_tip_06">Puedes ayudar a traducir nuestra aplicación a tu idioma.</string>
     <!-- App tip #07 -->
     <string name="app_tip_07">Nuestra aplicación está desarrollada por unos pocos entusiastas y la comunidad.</string>
     <!-- App tip #08 -->
-    <string name="app_tip_08">Puede arreglar y mejorar fácilmente los datos del mapa.</string>
+    <string name="app_tip_08">Puedes arreglar y mejorar fácilmente los datos del mapa.</string>
     <!-- App tip #09 -->
-    <string name="app_tip_09">Nuestro principal objetivo es crear mapas rápidos, centrados en la privacidad y fáciles de utilizar que le encantarán.</string>
+    <string name="app_tip_09">Nuestro principal objetivo es crear mapas rápidos, centrados en la privacidad y fáciles de utilizar, que te encantarán.</string>
     <!-- Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen -->
-    <string name="car_used_on_the_phone_screen">Ahora usa CoMaps en la pantalla del teléfono</string>
+    <string name="car_used_on_the_phone_screen">Ahora estás usando CoMaps en la pantalla del teléfono</string>
     <!-- Text on the phone placeholder screen that maps are displayed on the car screen -->
-    <string name="car_used_on_the_car_screen">Ahora usa CoMaps en la pantalla del coche</string>
+    <string name="car_used_on_the_car_screen">Ahora estás usando CoMaps en la pantalla del coche</string>
     <!-- Displayed on the phone screen. Android Auto connected -->
     <string name="aa_connected_title">Se ha conectado a Android Auto</string>
     <!-- Displayed on the phone screen. Button to display maps on the phone screen instead of a car -->
@@ -812,9 +812,9 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">A la pantalla del coche</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">CoMaps necesita acceder a la ubicación. Cuando sea seguro, compruebe la notificación en el teléfono.</string>
+    <string name="aa_location_permissions_request">CoMaps necesita acceder a la ubicación. Cuando sea seguro, comprueba la notificación en el teléfono.</string>
     <!-- Notification title for permission request from AA. -->
-    <string name="aa_request_permission_notification">Esta aplicación necesita su permiso</string>
+    <string name="aa_request_permission_notification">Esta aplicación necesita tu permiso</string>
     <!-- The text in the activity for location permission request. -->
     <string name="aa_request_permission_activity_text">CoMaps en Android Auto necesita permiso de ubicación para funcionar eficazmente</string>
     <!-- Grant Permissions button. -->
@@ -825,7 +825,7 @@
     <string name="browser_not_available">El navegador web no está disponible</string>
     <string name="volume">Volumen</string>
     <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Exportar todos los marcadores y trayectos</string>
+    <string name="bookmarks_export">Exportar todos los marcadores y trazas</string>
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
     <string name="pref_tts_open_system_settings">Configuración de síntesis de voz del sistema</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
diff --git a/android/app/src/main/res/values-es/types_strings.xml b/android/app/src/main/res/values-es/types_strings.xml
index d211e9332..6dfc8b8dc 100644
--- a/android/app/src/main/res/values-es/types_strings.xml
+++ b/android/app/src/main/res/values-es/types_strings.xml
@@ -322,19 +322,19 @@
     <string name="type.cuisine.noodles">Fideos</string>
     <string name="type.cuisine.oriental">Oriental</string>
     <string name="type.cuisine.pancake">Tortitas</string>
-    <string name="type.cuisine.pasta">Pastas</string>
+    <string name="type.cuisine.pasta">Pasta</string>
     <string name="type.cuisine.persian">Persa</string>
     <string name="type.cuisine.peruvian">Peruana</string>
     <string name="type.cuisine.pizza">Pizzas</string>
     <string name="type.cuisine.polish">Polaca</string>
     <string name="type.cuisine.portuguese">Portuguesa</string>
     <string name="type.cuisine.ramen">Ramen</string>
-    <string name="type.cuisine.regional">Cocina regional</string>
+    <string name="type.cuisine.regional">Regional</string>
     <string name="type.cuisine.russian">Rusa</string>
     <string name="type.cuisine.sandwich">Sándwiches</string>
     <string name="type.cuisine.sausage">Salchichas</string>
     <string name="type.cuisine.savory_pancakes">Tortitas saladas</string>
-    <string name="type.cuisine.seafood">Mariscos</string>
+    <string name="type.cuisine.seafood">del mar</string>
     <string name="type.cuisine.soba">Soba</string>
     <string name="type.cuisine.spanish">Española</string>
     <string name="type.cuisine.steak_house">Asador</string>
@@ -373,10 +373,10 @@
     <string name="type.healthcare.speech_therapist">Logopedia</string>
     <!-- SECTION: Types: Roads -->
     <string name="type.highway">Carretera</string>
-    <string name="type.highway.bridleway">Camino de caballos</string>
+    <string name="type.highway.bridleway">Camino ecuestre</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.bridleway.bridge">Puente</string>
-    <string name="type.highway.bridleway.permissive">Camino de caballos</string>
+    <string name="type.highway.bridleway.permissive">Camino ecuestre</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.bridleway.tunnel">Túnel</string>
     <string name="type.highway.busway">Carretera exclusiva para autobuses</string>
@@ -384,7 +384,7 @@
     <string name="type.highway.busway.bridge">Puente</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.busway.tunnel">Túnel</string>
-    <string name="type.highway.bus_stop">Parada de autobús</string>
+    <string name="type.highway.bus_stop">Parada de bus</string>
     <string name="type.highway.construction">Vía en construcción</string>
     <string name="type.highway.cycleway">Ciclovía</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
@@ -440,7 +440,7 @@
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.primary.bridge">Puente</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
-    <string name="type.highway.primary.tunnel">Túnel de carretera principal</string>
+    <string name="type.highway.primary.tunnel">Túnel</string>
     <string name="type.highway.primary_link">Enlace de carretera principal</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.primary_link.bridge">Puente</string>
@@ -788,18 +788,18 @@
     <string name="type.power.generator">Generador</string>
     <string name="type.power.generator.solar">Generador solar</string>
     <string name="type.power.generator.wind">Generador de viento</string>
-    <string name="type.power.generator.gas">Planta de energía de turbina de gas</string>
-    <string name="type.power.generator.hydro">Planta de energía hidroeléctrica</string>
+    <string name="type.power.generator.gas">Planta termoeléctrica de gas</string>
+    <string name="type.power.generator.hydro">Planta hidroeléctrica</string>
     <string name="type.power.line">Línea eléctrica</string>
     <string name="type.power.line.underground">Línea eléctrica subterránea</string>
-    <string name="type.power.minor_line">Línea eléctrica de baja tensión</string>
-    <string name="type.power.plant">Planta de energía</string>
+    <string name="type.power.minor_line">Línea eléctrica menor</string>
+    <string name="type.power.plant">Planta eléctrica</string>
     <string name="type.power.plant.coal">Central eléctrica de carbón</string>
-    <string name="type.power.plant.gas">Planta de energía de turbina de gas</string>
-    <string name="type.power.plant.hydro">Planta de energía hidroeléctrica</string>
+    <string name="type.power.plant.gas">Planta termoeléctrica de gas</string>
+    <string name="type.power.plant.hydro">Planta hidroeléctrica</string>
     <string name="type.power.plant.solar">Planta de energía solar</string>
     <string name="type.power.plant.wind">Planta eólica</string>
-    <string name="type.power.substation">Subestación eléctrica</string>
+    <string name="type.power.substation">Subestación</string>
     <!-- A tower or pylon carrying high voltage electricity cables. -->
     <string name="type.power.tower">Torre eléctrica</string>
     <string name="type.public_transport">Transporte público</string>
@@ -813,9 +813,9 @@
     <string name="type.railway.halt">Punto de parada</string>
     <string name="type.railway.level_crossing">Cruce a nivel</string>
     <string name="type.railway.light_rail">Tren ligero</string>
-    <string name="type.railway.monorail">Monorraíl</string>
+    <string name="type.railway.monorail">Monorriel</string>
     <string name="type.railway.narrow_gauge">Vía férrea estrecha</string>
-    <string name="type.railway.platform">Plataforma de vía férrea</string>
+    <string name="type.railway.platform">Plataforma ferroviaria</string>
     <string name="type.railway.rail">Ferrocarril</string>
     <string name="type.railway.rail.highspeed">Ferrocarril de alta velocidad</string>
     <string name="type.railway.rail.tourism">Ferrocarril turístico</string>
@@ -1362,8 +1362,8 @@
     <string name="type.railway.funicular.bridge">Puente de funicular</string>
     <string name="type.railway.funicular.tunnel">Túnel de funicular</string>
     <string name="type.railway.light_rail.tunnel">Túnel de tren ligero</string>
-    <string name="type.railway.monorail.bridge">Puente de monorraíl</string>
-    <string name="type.railway.monorail.tunnel">Túnel de monorraíl</string>
+    <string name="type.railway.monorail.bridge">Puente de monorriel</string>
+    <string name="type.railway.monorail.tunnel">Túnel de monorriel</string>
     <string name="type.railway.narrow_gauge.bridge">Puente de vía férrea estrecha</string>
     <string name="type.railway.preserved">Raíl conservado</string>
     <string name="type.fee.yes">$</string>
diff --git a/android/app/src/main/res/values-et/strings.xml b/android/app/src/main/res/values-et/strings.xml
index 2802b53e2..8c6e280d4 100644
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -916,4 +916,6 @@
     <string name="open_now">Hetkel avatud</string>
     <string name="at">kell %s</string>
     <string name="closed_now">Praegu suletud</string>
+    <string name="osm_note_toast">Märge salvestatakse OpenStreetMapi andmebaasi</string>
+    <string name="osm_note_hint">Või alternatiivina jäta märge OpenStreetMapi kogukonnale ja keegi teine saab selle koha andmed parandada või uue lisada.</string>
 </resources>
diff --git a/android/app/src/main/res/values-eu/strings.xml b/android/app/src/main/res/values-eu/strings.xml
index 37b5c46ff..40dee4c28 100644
--- a/android/app/src/main/res/values-eu/strings.xml
+++ b/android/app/src/main/res/values-eu/strings.xml
@@ -74,7 +74,7 @@
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
     <string name="bookmarks">Markagailuak</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Markagailuak eta ibilbideak</string>
+    <string name="bookmarks_and_tracks">Markagailuak eta arrastoak</string>
     <!-- Default bookmark list name -->
     <string name="core_my_places">Nire tokiak</string>
     <!-- Add bookmark dialog - bookmark name -->
@@ -203,7 +203,7 @@
     <!-- Confirmation for OpenStreetMap log out. -->
     <string name="osm_log_out_confirmation">Ziur zure OpenStreetMap kontutik saioa amaitu nahi duzula?</string>
     <!-- Title for tracks category in bookmarks manager -->
-    <string name="tracks_title">Arrasto</string>
+    <string name="tracks_title">Arrastoak</string>
     <!-- Length of track in cell that describes route -->
     <string name="length">Luzera</string>
     <string name="share_my_location">Partekatu nire kokapena</string>
@@ -559,7 +559,7 @@
     <string name="editor_share_to_all_dialog_message_2">OpenStreetMap editoreek aldaketak egiaztatuko dituzte eta zurekin harremanetan jarriko dira zalantzaren bat izanez gero.</string>
     <string name="navigation_stop_button">Gelditu</string>
     <!-- Shown as toast when starting the recent track recording -->
-    <string name="track_recording">Ibilbidea grabatzea</string>
+    <string name="track_recording">Arrastoa grabatzea</string>
     <!-- For the first routing -->
     <string name="accept">Onartu</string>
     <!-- For the first routing -->
@@ -613,7 +613,7 @@
     </plurals>
     <string name="bookmarks_create_new_group">Sortu zerrenda berria</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Inportatu markagailuak eta ibilbideak</string>
+    <string name="bookmarks_import">Inportatu markagailuak eta arrastoak</string>
     <string name="bookmarks_error_message_share_general">Ezin izan da partekatu aplikazioaren errore baten ondorioz</string>
     <string name="bookmarks_error_title_share_empty">Partekatzeak huts egin du</string>
     <string name="bookmarks_error_message_share_empty">Ezin da partekatu zerrenda hutsik</string>
@@ -631,8 +631,8 @@
     </plurals>
     <string name="restore">Berreskuratu</string>
     <plurals name="tracks">
-        <item quantity="one">%d arrasto</item>
-        <item quantity="other">%d arrastos</item>
+        <item quantity="one">arrasto %d</item>
+        <item quantity="other">%d arrasto</item>
     </plurals>
     <!-- Settings privacy group in settings screen -->
     <string name="privacy">Pribatutasuna</string>
@@ -816,7 +816,7 @@
     <string name="browser_not_available">Web arakatzailea ez dago erabilgarri</string>
     <string name="volume">Bolumena</string>
     <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Esportatu Laster-marka eta Pista guztiak</string>
+    <string name="bookmarks_export">Esportatu markagailu eta arrasto guztiak</string>
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
     <string name="pref_tts_open_system_settings">Sistemaren ahots-sintesiaren ezarpenak</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -840,17 +840,17 @@
     <!-- Disclaimer summary shown when Power Saving Mode is enabled -->
     <string name="power_save_dialog_summary">Nabigazio zehatzena lortzeko, telefonoaren bateriaren ezarpenetan energia aurrezteko modua desgaitzea gomendatzen dugu.</string>
     <!-- Prompt to start recording a track. -->
-    <string name="start_track_recording">Ibilbidearen grabaketa</string>
+    <string name="start_track_recording">Grabatu arrastoa</string>
     <!-- Prompt for stopping a track recording. -->
-    <string name="stop_track_recording">Gelditu ibilbidearen grabaketa</string>
+    <string name="stop_track_recording">Gelditu arrastoaren grabaketa</string>
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="stop_without_saving">Gelditu gorde gabe</string>
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="continue_recording">Jarraitu grabatzen</string>
     <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Ibilbidearen grabaketa markagailuetan eta ibilbideetan gorde nahi duzu?</string>
+    <string name="track_recording_alert_title">Markagailu eta arrastoetan gorde nahi duzu?</string>
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
-    <string name="track_recording_toast_nothing_to_save">Ibilbidea hutsik dago; ez dago ezer gordetzeko</string>
+    <string name="track_recording_toast_nothing_to_save">Arrastoa hutsik dago; ez dago ezer gordetzeko</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
     <string name="error_no_file_manager_app">Ezin da karpeta hautatzeko elkarrizketa-koadroa erakutsi zure gailuan ez dagoelako aplikazio egokirik instalatuta. Instalatu fitxategi-kudeatzaile aplikazio bat eta saiatu berriro.</string>
     <string name="choose_color">Aukeratu kolorea</string>
@@ -909,7 +909,7 @@
     <string name="backup_interval_every_week">Astero</string>
     <string name="backup_interval_manual_only">Itzalita (eskuz bakarrik)</string>
     <string name="pref_backup_title">Markagailu eta arrastoen babeskopia</string>
-    <string name="pref_backup_summary">Egin babeskopia zure gailuan automatikoki</string>
+    <string name="pref_backup_summary">Automatikoki egin babeskopia zure gailuan</string>
     <string name="pref_backup_now_summary_folder_unavailable">Babeskopiaren karpeta ez dago eskuragarri</string>
     <string name="dialog_report_error_missing_folder">Babeskopiarako hautatutako kokapena ez dago eskuragarri edo ezin da idatzi. Hautatu beste kokapen bat.</string>
     <string name="pref_backup_now_summary_progress">Babeskopia egiten…</string>
diff --git a/android/app/src/main/res/values-eu/types_strings.xml b/android/app/src/main/res/values-eu/types_strings.xml
index d2c035ab9..9f28603a0 100644
--- a/android/app/src/main/res/values-eu/types_strings.xml
+++ b/android/app/src/main/res/values-eu/types_strings.xml
@@ -484,12 +484,12 @@
     <string name="type.highway.tertiary_link.bridge">Zubia</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.tertiary_link.tunnel">Tunel</string>
-    <string name="type.highway.track">Kalea</string>
-    <string name="type.highway.track.area">Kalea</string>
+    <string name="type.highway.track">Arrastoa</string>
+    <string name="type.highway.track.area">Arrastoa</string>
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.track.bridge">Zubia</string>
-    <string name="type.highway.track.grade1">Kalea</string>
-    <string name="type.highway.track.no.access">Kalea</string>
+    <string name="type.highway.track.grade1">Arrastoa</string>
+    <string name="type.highway.track.no.access">Arrastoa</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
     <string name="type.highway.track.tunnel">Tunel</string>
     <string name="type.highway.traffic_signals">Semaforoak</string>
@@ -521,7 +521,7 @@
     <string name="type.area_highway.service">Kalea</string>
     <string name="type.area_highway.tertiary">Kalea</string>
     <string name="type.area_highway.steps">Bidea</string>
-    <string name="type.area_highway.track">Kalea</string>
+    <string name="type.area_highway.track">Arrastoa</string>
     <string name="type.area_highway.trunk">Kalea</string>
     <string name="type.area_highway.unclassified">Kalea</string>
     <!-- SECTION: Types: Historic -->
@@ -749,7 +749,7 @@
     <string name="type.railway.rail.utility">Erabilgarritasun trena</string>
     <string name="type.railway.rail.spur">Trenbide-spur</string>
     <!-- Short service tracks: siding, yard, crossover. -->
-    <string name="type.railway.rail.service">Trenbide laguntzailea</string>
+    <string name="type.railway.rail.service">Zerbitzuko trenbidea</string>
     <string name="type.railway.rail.bridge">Trenbide zubia</string>
     <string name="type.railway.rail.highspeed.bridge">Trenbide zubia</string>
     <string name="type.railway.rail.tourism.bridge">Trenbide zubia</string>
@@ -1274,8 +1274,8 @@
     <string name="type.landuse.military">Militar-gunea</string>
     <string name="type.leisure.recreation_ground">Parkea</string>
     <string name="type.leisure.slipway">Arrapala</string>
-    <string name="type.leisure.track">Pista</string>
-    <string name="type.leisure.track.area">Pista</string>
+    <string name="type.leisure.track">Arrastoa</string>
+    <string name="type.leisure.track.area">Arrastoa</string>
     <string name="type.landuse.plant_nursery">Landare haztegia</string>
     <string name="type.leisure.firepit">Su-ontzi</string>
     <string name="type.man_made.breakwater">Dike</string>
diff --git a/android/app/src/main/res/values-fa/types_strings.xml b/android/app/src/main/res/values-fa/types_strings.xml
index 0ee28830c..8a6d6262d 100644
--- a/android/app/src/main/res/values-fa/types_strings.xml
+++ b/android/app/src/main/res/values-fa/types_strings.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- SECTION: Types -->
-    <string name="type.addr_interpolation">آدرس/بلاک</string>
-    <string name="type.addr_interpolation.even">آدرس/بلاک</string>
-    <string name="type.addr_interpolation.odd">آدرس/بلاک</string>
+    <string name="type.addr_interpolation">نشانی/بست</string>
+    <string name="type.addr_interpolation.even">نشانی/بست</string>
+    <string name="type.addr_interpolation.odd">نشانی/بست</string>
     <string name="type.aeroway.aerodrome">فرودگاه</string>
-    <string name="type.aeroway.aerodrome.international">فرودگاه</string>
-    <string name="type.aeroway.helipad">پد فرود بالگرد</string>
-    <string name="type.amenity">زیر ساخت</string>
-    <string name="type.amenity.arts_centre">مرکز هنری</string>
+    <string name="type.aeroway.aerodrome.international">فرودگاه فرامرزی</string>
+    <string name="type.aeroway.helipad">بالگَردنشین</string>
+    <string name="type.amenity">امکانات آسایشی</string>
+    <string name="type.amenity.arts_centre">کانون هنری</string>
     <string name="type.amenity.atm">خودپرداز</string>
     <string name="type.amenity.bank">بانک</string>
-    <string name="type.amenity.bar">میکده</string>
-    <string name="type.amenity.bbq">منقل کباب</string>
-    <string name="type.amenity.bench">سَکو</string>
-    <string name="type.amenity.bicycle_parking">پارکینگ دوچرخه</string>
-    <string name="type.amenity.bicycle_rental">مکان اجاره دوچرخه</string>
+    <string name="type.amenity.bar">می‌کده</string>
+    <string name="type.amenity.bbq">اَدیشت کباب</string>
+    <string name="type.amenity.bench">نیمکت</string>
+    <string name="type.amenity.bicycle_parking">ایستگاه دوچرخه</string>
+    <string name="type.amenity.bicycle_rental">جایگاه کرایه دوچرخه</string>
     <string name="type.amenity.bicycle_repair_station">ایستگاه تعمیر دوچرخه</string>
     <string name="type.amenity.biergarten">غذا</string>
     <string name="type.amenity.brothel">فاحشه خانه</string>
@@ -1092,8 +1092,13 @@
     <string name="type.leisure.sports_hall">سالن ورزشی</string>
     <string name="type.man_made.silo">سیلو</string>
     <string name="type.man_made.storage_tank">مخازن سیال</string>
-    <string name="type.aerialway.cable_car">ماشین کابلی</string>
-    <string name="type.aerialway.station">ایستگاه راه هوایی</string>
-    <string name="type.aeroway">­زیرساخت هوا و فضا</string>
+    <string name="type.aerialway.cable_car">خودردو کابلی</string>
+    <string name="type.aerialway.station">ایستگاه راه‌هوایی</string>
+    <string name="type.aeroway">زیرساخت مرز‌هوایی</string>
     <string name="type.aerialway">راه هوایی</string>
+    <string name="type.amenity.bicycle_parking.covered">ایستگاه پوشیده‌ی دوچرخه</string>
+    <string name="type.aeroway.apron">پیشگاه</string>
+    <string name="type.aeroway.gate">دروازه</string>
+    <string name="type.aeroway.taxiway">رج وزیگ</string>
+    <string name="type.aeroway.terminal">پایانه</string>
 </resources>
diff --git a/android/app/src/main/res/values-fi/strings.xml b/android/app/src/main/res/values-fi/strings.xml
index ca6b88007..3bac1bc67 100644
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -921,4 +921,6 @@
     <string name="open_now">Auki nyt</string>
     <string name="closed_now">Suljettu nyt</string>
     <string name="at">kello %s</string>
+    <string name="osm_note_toast">Huomio lähetetään OpenStreetMap:iin</string>
+    <string name="osm_note_hint">Vaihtoehtoisesti voit jättää huomion OpenStreetMap yhteisölle, jotta joku muu voi lisätä tai korjata paikan tiedot.</string>
 </resources>
diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml
index b31787436..29a947afe 100644
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -4,10 +4,10 @@
     <!-- Button text (should be short) -->
     <string name="back">Terug</string>
     <!-- Button text (should be short) -->
-    <string name="cancel">Annuleer</string>
+    <string name="cancel">Annuleren</string>
     <!-- Button which deletes downloaded country -->
-    <string name="delete">Verwijder</string>
-    <string name="download_maps">Download kaarten</string>
+    <string name="delete">Verwijderen</string>
+    <string name="download_maps">Kaarten downloaden</string>
     <!-- Settings/Downloader - info for country when download fails -->
     <string name="download_has_failed">Downloaden is mislukt, tik om het opnieuw te proberen.</string>
     <!-- Settings/Downloader - info for country which started downloading -->
@@ -21,21 +21,21 @@
     <!-- Update maps later button text -->
     <string name="later">Later</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
-    <string name="search">Zoek</string>
+    <string name="search">Zoeken</string>
     <!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
-    <string name="search_map">Zoek op de kaart</string>
+    <string name="search_map">Zoeken op de kaart</string>
     <!-- Location services are disabled by user alert - message -->
     <string name="location_is_disabled_long_text">U heeft momenteel alle locatieservices voor dit apparaat of deze app uitgeschakeld. Schakel ze in bij Instellingen.</string>
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
     <string name="limited_accuracy">Beperkte nauwkeurigheid</string>
     <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">Voor nauwkeurige navigatie schakelt u Precise Location in bij instellingen</string>
+    <string name="precise_location_is_disabled_long_text">Voor nauwkeurige navigatie moet Nauwkeurige Locatie worden ingesteld bij Instellingen</string>
     <!-- View and button titles for accessibility -->
-    <string name="zoom_to_country">Toon op de kaart</string>
+    <string name="zoom_to_country">Weergeven op de kaart</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
     <string name="country_status_download_failed">Downloaden is mislukt</string>
     <!-- Button text for the button under the country_status_download_failed message -->
-    <string name="try_again">Probeer opnieuw</string>
+    <string name="try_again">Opnieuw proberen</string>
     <string name="about_menu_title">Over CoMaps</string>
     <!-- Text in About screen -->
     <string name="about_headline">Open project, gemaakt door de community</string>
@@ -46,29 +46,29 @@
     <!-- Text in About screen -->
     <string name="about_proposition_3">• Offline, snel en compact</string>
     <!-- Text in About screen -->
-    <string name="about_developed_by_enthusiasts">Volledig open source, non-profit, transparante besluitvorming en financiën.</string>
+    <string name="about_developed_by_enthusiasts">Volledig open source, non-profit, transparante besluitvorming en financiering.</string>
     <!-- The button that opens system location settings -->
     <string name="location_settings">Locatie-instellingen</string>
-    <string name="close">Sluit</string>
-    <string name="unsupported_phone">Een hardware geaccellereerde OpenGL is nodig. Jammer genoeg wordt uw apparaat niet ondersteund.</string>
-    <string name="download">Download</string>
+    <string name="close">Sluiten</string>
+    <string name="unsupported_phone">De app vereist hardwareversnelde OpenGL. Helaas wordt dit apparaat niet ondersteund.</string>
+    <string name="download">Downloaden</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="disconnect_usb_cable">Verwijder de USB-kabel of plaats een geheugenkaart om CoMaps te gebruiken</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Maak eerst ruimte vrij op de SD-kaart/USB-opslag om de app te gebruiken</string>
-    <string name="download_resources">Voordat u start, laten we de algemene wereldkaart naar uw apparaat downloaden. \nDeze neemt %s in beslag.</string>
+    <string name="download_resources">Laten we, voor de eerste start, de algemene wereldkaart downloaden. \nDeze gebruikt %s aan opslag.</string>
     <string name="download_resources_continue">Ga naar de kaart</string>
-    <string name="downloading_country_can_proceed">%1$s (%2$s) aan het downloaden. U kunt nu \ndoorgaan naar de kaart.</string>
+    <string name="downloading_country_can_proceed">%1$s (%2$s) downloaden. U kunt nu \ndoorgaan naar de kaart.</string>
     <string name="download_country_ask">%1$s downloaden? (%2$s)</string>
-    <string name="update_country_ask">%1$s updaten? (%2$s)</string>
+    <string name="update_country_ask">%1$s bijwerken? (%2$s)</string>
     <!-- REMOVE THIS STRING AFTER REFACTORING -->
-    <string name="pause">Pauzeer</string>
+    <string name="pause">Pauzeren</string>
     <!-- REMOVE THIS STRING AFTER REFACTORING -->
-    <string name="continue_button">Ga verder</string>
+    <string name="continue_button">Doorgaan</string>
     <!-- Show popup notification on top of the map when country download has failed. -->
     <string name="download_country_failed">%s download is mislukt</string>
     <!-- "Add new bookmark list" dialog title -->
-    <string name="add_new_set">Voeg nieuwe groep toe</string>
+    <string name="add_new_set">Nieuwe groep toevoegen</string>
     <!-- Add Bookmark list dialog - hint when the list name is empty -->
     <string name="bookmark_set_name">Naam van bladwijzergroep</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
@@ -88,19 +88,19 @@
     <!-- Header of settings activity where user defines storage path -->
     <string name="maps_storage">Kaarten opslaan in</string>
     <!-- Detailed description of Maps Storage settings button -->
-    <string name="maps_storage_summary">Selecteer de map waar kaarten naar gedownload worden</string>
+    <string name="maps_storage_summary">Selecteer de map om kaarten naar te downloaden</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
-    <string name="maps_storage_downloaded">Kaarten</string>
+    <string name="maps_storage_downloaded">Gedownloade kaarten</string>
     <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">Intern persoonlijk geheugen</string>
+    <string name="maps_storage_internal">Interne persoonlijke opslag</string>
     <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">Intern gedeeld geheugen</string>
+    <string name="maps_storage_shared">Interne gedeelde opslag</string>
     <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
     <string name="maps_storage_removable">SD-kaart</string>
     <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">Extern gedeeld geheugen</string>
+    <string name="maps_storage_external">Externe gedeelde opslag</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
-    <string name="maps_storage_free_size">%1$s beschikbaar van %2$s</string>
+    <string name="maps_storage_free_size">%1$s van %2$s beschikbaar</string>
     <!-- Question dialog for transferring maps from one storage to another -->
     <string name="move_maps">Kaarten verplaatsen?</string>
     <!-- Error moving map files from one storage to another -->
@@ -162,20 +162,20 @@
     <!-- Notes field in Bookmarks view -->
     <string name="description">Notities</string>
     <!-- Email Subject when sharing bookmark list -->
-    <string name="share_bookmarks_email_subject">Bladwijzers van CoMaps zijn met u gedeeld</string>
+    <string name="share_bookmarks_email_subject">CoMaps bladwijzers zijn met u gedeeld</string>
     <string name="share_bookmarks_email_body">Hallo! \n \nBijgesloten zijn mijn bladwijzers uit de CoMaps app. Open ze als je CoMaps geïnstalleerd hebt. Of, als je dat niet hebt, download de app voor je iOS- of Android-apparaat door deze link te volgen: https://www.comaps.app/download/ \n \nGeniet van het reizen met CoMaps!</string>
     <!-- message title of loading file -->
-    <string name="load_kmz_title">Bladwijzers worden geladen</string>
+    <string name="load_kmz_title">Bladwijzers laden</string>
     <!-- Kmz file successful loading -->
-    <string name="load_kmz_successful">Bladwijzers succesvol geüpload! U vindt ze op de kaart of op het scherm van de Bladwijzerbeheerder.</string>
+    <string name="load_kmz_successful">Bladwijzers succesvol geladen! U vindt ze op de kaart of op het scherm van de Bladwijzerbeheerder.</string>
     <!-- Kml file loading failed -->
-    <string name="load_kmz_failed">Bladwijzers uploaden is mislukt. Het bestand is mogelijk beschadigd of defect.</string>
+    <string name="load_kmz_failed">Bladwijzers laden is mislukt. Het bestand is mogelijk beschadigd of defect.</string>
     <!-- Failed to recognize the format of a bookmarks or tracks file. -->
     <string name="unknown_file_type">Het bestandstype wordt niet herkend door de app: \n%1$s</string>
     <!-- Failed to open a bookmarks or tracks file in CoMaps. -->
     <string name="failed_to_open_file">Bestand openen mislukt %1$s \n \n%2$s</string>
     <!-- resource for context menu -->
-    <string name="edit">Wijzig</string>
+    <string name="edit">Bewerken</string>
     <!-- Warning message when doing search around current position -->
     <string name="unknown_current_position">Je locatie is nog niet vastgesteld</string>
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
@@ -191,7 +191,7 @@
     <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
     <string name="my_position_share_email">Hoi, \n \nMomenteel ben ik hier: %1$s. Klik op deze %2$s link of deze %3$s link om de plaats op de kaart te zien. \n \nBedankt.</string>
     <!-- Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. -->
-    <string name="share">Deel</string>
+    <string name="share">Delen</string>
     <!-- Share by email button text, also used in editor and About. -->
     <string name="email">E-mail</string>
     <!-- Text for message when used successfully copied something -->
@@ -206,7 +206,7 @@
     <string name="tracks_title">Tracks</string>
     <!-- Length of track in cell that describes route -->
     <string name="length">Lengte</string>
-    <string name="share_my_location">Deel mijn locatie</string>
+    <string name="share_my_location">Mijn locatie delen</string>
     <!-- Settings general group in settings screen -->
     <string name="prefs_group_general">Algemene instellingen</string>
     <!-- Settings information group in settings screen -->
@@ -237,14 +237,14 @@
     <!-- Settings «Route» category: «Tts language» title -->
     <string name="pref_tts_language_title">Gesproken taal</string>
     <!-- Settings «Route» category: «Test Voice Directions» title -->
-    <string name="pref_tts_test_voice_title">Test gesproken aanwijzingen</string>
+    <string name="pref_tts_test_voice_title">Gesproken aanwijzingen testen</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
     <string name="pref_tts_playing_test_voice">Controleer het volume of de tekst-naar-spraak instellingen van het systeem als je de stem nu niet hoort</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
     <string name="pref_tts_unavailable">Niet beschikbaar</string>
     <string name="pref_map_auto_zoom">Automatisch zoomen</string>
     <string name="placepage_distance">Afstand</string>
-    <string name="search_show_on_map">Bekijk op de kaart</string>
+    <string name="search_show_on_map">Weergeven op kaart</string>
     <!-- Text in menu -->
     <string name="website">Website</string>
     <!-- Text in About menu, opens CoMaps news website -->
@@ -258,7 +258,7 @@
     <!-- Button in the main Help dialog -->
     <string name="faq">Vragen en antwoorden</string>
     <!-- Button in the main menu -->
-    <string name="donate">Doneer</string>
+    <string name="donate">Doneren</string>
     <!-- Button in the main Help dialog -->
     <string name="how_to_support_us">Steun het project</string>
     <!-- Button in the main Help dialog -->
@@ -272,30 +272,30 @@
     <!-- Toast text when user hides UI with a long tap anywhere on the map -->
     <string name="long_tap_toast">Tik nogmaals lang op de kaart om de interface te zien</string>
     <!-- Update all button text -->
-    <string name="downloader_update_all_button">Update alles</string>
+    <string name="downloader_update_all_button">Alles bijwerken</string>
     <!-- Cancel all button text -->
-    <string name="downloader_cancel_all">Annuleer alles</string>
+    <string name="downloader_cancel_all">Alles annuleren</string>
     <!-- Downloaded maps list header -->
     <string name="downloader_downloaded_subtitle">Gedownload</string>
     <!-- Country queued for download -->
     <string name="downloader_queued">In de wachtrij</string>
-    <string name="downloader_near_me_subtitle">Bij mij in de buurt</string>
+    <string name="downloader_near_me_subtitle">In de buurt</string>
     <!-- In maps downloader and country place page shows how many maps are downloaded / to download, e.g. "Maps: 3 of 10" -->
     <string name="downloader_status_maps">Kaarten</string>
-    <string name="downloader_download_all_button">Download alles</string>
-    <string name="downloader_downloading">Aan het downloaden:</string>
+    <string name="downloader_download_all_button">Alles downloaden</string>
+    <string name="downloader_downloading">Downloaden:</string>
     <!-- Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode -->
     <string name="downloader_delete_map_while_routing_dialog">Stop de navigatie om de kaart te verwijderen</string>
     <!-- PointsInDifferentMWM -->
-    <string name="routing_failed_cross_mwm_building">Enkel routes die volledig in één kaart passen, kunnen gecreëerd worden.</string>
+    <string name="routing_failed_cross_mwm_building">Alleen routes die volledig in één kaart passen, kunnen gecreëerd worden.</string>
     <!-- Context menu item for downloader. -->
-    <string name="downloader_download_map">Download de kaart</string>
+    <string name="downloader_download_map">Kaart downloaden</string>
     <!-- Item status in downloader. -->
-    <string name="downloader_retry">Probeer opnieuw</string>
+    <string name="downloader_retry">Opnieuw</string>
     <!-- Item in context menu. -->
-    <string name="downloader_delete_map">Verwijder kaart</string>
+    <string name="downloader_delete_map">Kaart verwijderen</string>
     <!-- Item in context menu. -->
-    <string name="downloader_update_map">Update kaart</string>
+    <string name="downloader_update_map">Kaart bijwerken</string>
     <!-- Preference title -->
     <string name="google_play_services">Google Fused-locatieservices</string>
     <!-- Preference text -->
@@ -305,12 +305,12 @@
     <!-- Text for routing error dialog -->
     <string name="routing_download_maps_along">Download kaarten op de route</string>
     <!-- Text for routing error dialog -->
-    <string name="routing_requires_all_map">Voor het creëren van een route is het nodig dat alle kaarten van uw locatie naar uw bestemming gedownload en bijgewerkt zijn.</string>
+    <string name="routing_requires_all_map">Voor het creëren van een route is het nodig dat alle kaarten van uw locatie naar de bestemming gedownload en bijgewerkt zijn.</string>
     <!-- Text for routing error dialog -->
     <string name="routing_not_enough_space">Niet genoeg ruimte</string>
     <!-- location service disabled -->
-    <string name="enable_location_services">Schakel locatiediensten in</string>
-    <string name="save">Bewaar</string>
+    <string name="enable_location_services">Locatiediensten inschakelen</string>
+    <string name="save">Opslaan</string>
     <string name="create">aanmaken</string>
     <!-- red color -->
     <string name="red">Rood</string>
@@ -358,15 +358,15 @@
     <string name="dialog_routing_location_unknown_turn_on">De huidige gps-coördinaten kunnen niet worden gevonden. Schakel locatiediensten in om de route te berekenen.</string>
     <string name="dialog_routing_unable_locate_route">Route vinden mislukt</string>
     <string name="dialog_routing_cant_build_route">Route samenstellen mislukt</string>
-    <string name="dialog_routing_change_start_or_end">Kies een ander startpunt of een andere bestemming.</string>
-    <string name="dialog_routing_change_start">Kies ander startpunt</string>
+    <string name="dialog_routing_change_start_or_end">Pas het startpunt of de bestemming aan.</string>
+    <string name="dialog_routing_change_start">Startpunt aanpassen</string>
     <string name="dialog_routing_start_not_determined">Route samenstellen mislukt. Startpunt kan niet worden gevonden.</string>
     <string name="dialog_routing_select_closer_start">Kies een startpunt dat dichter bij een weg ligt.</string>
-    <string name="dialog_routing_change_end">Kies andere bestemming</string>
+    <string name="dialog_routing_change_end">Bestemming aanpassen</string>
     <string name="dialog_routing_end_not_determined">Route samenstellen mislukt. Bestemming kan niet worden gevonden.</string>
     <string name="dialog_routing_select_closer_end">Kies een bestemming die dichter bij een weg ligt</string>
     <string name="dialog_routing_change_intermediate">Kan de tussenstop niet vinden</string>
-    <string name="dialog_routing_intermediate_not_determined">Gelieve uw tussenstop aan te passen</string>
+    <string name="dialog_routing_intermediate_not_determined">Pas de tussenstop aan</string>
     <string name="dialog_routing_system_error">Systeemfout</string>
     <string name="dialog_routing_application_error">Route samenstellen mislukt door een applicatiefout</string>
     <string name="dialog_routing_try_again">Probeer het opnieuw</string>
@@ -377,21 +377,21 @@
     <string name="search_without_internet_advertisement">Om te beginnen met zoeken en om routebeschrijvingen te kunnen maken, moet u de kaart downloaden. U heeft vervolgens geen internetverbinding meer nodig.</string>
     <string name="search_select_map">Selecteer de kaart</string>
     <!-- «Show» context menu -->
-    <string name="show">Toon</string>
+    <string name="show">Tonen</string>
     <!-- «Hide» context menu -->
-    <string name="hide">Verberg</string>
+    <string name="hide">Verbergen</string>
     <string name="categories">Categorieën</string>
     <string name="history">Geschiedenis</string>
-    <string name="search_not_found">Sorry, geen resultaten gevonden</string>
+    <string name="search_not_found">Geen resultaten gevonden</string>
     <!-- The message when user did not find anything in the search. -->
     <string name="search_not_found_query">Download de regio waar u zoekt of probeer een nabijgelegen stad/dorpnaam toe te voegen.</string>
     <string name="search_history_title">Zoekgeschiedenis</string>
-    <string name="search_history_text">Snel toegang tot recente zoekopdrachten</string>
-    <string name="clear_search">Wis zoekgeschiedenis</string>
+    <string name="search_history_text">Recente zoekopdrachten</string>
+    <string name="clear_search">Zoekgeschiedenis wissen</string>
     <string name="p2p_your_location">Uw locatie</string>
     <string name="p2p_start">Start</string>
     <string name="p2p_from_here">Van</string>
-    <string name="p2p_to_here">Route naar</string>
+    <string name="p2p_to_here">Naar</string>
     <string name="p2p_only_from_current">Navigatie is uitsluitend beschikbaar vanuit uw huidige locatie</string>
     <string name="p2p_reroute_from_current">Wilt u een route plannen vanaf uw huidige locatie?</string>
     <!-- Edit open hours/set time and minutes dialog -->
@@ -400,10 +400,10 @@
     <string name="editor_time_from">Van</string>
     <!-- Tab title in the Edit Opening Hours time picker -->
     <string name="editor_time_to">Tot</string>
-    <string name="editor_time_add">Voeg schema toe</string>
-    <string name="editor_time_delete">Verwijder schema</string>
+    <string name="editor_time_add">Schema toevoegen</string>
+    <string name="editor_time_delete">Schema verwijderen</string>
     <!-- Text for allday switch. -->
-    <string name="editor_time_allday">Elke dag (24 uur)</string>
+    <string name="editor_time_allday">Hele dag (24 uur)</string>
     <string name="editor_time_open">Open</string>
     <string name="editor_time_close">Gesloten</string>
     <string name="editor_time_add_closed">Sluitingstijden toevoegen</string>
@@ -416,12 +416,12 @@
     <string name="editor_add_select_location">Locatie selecteren</string>
     <string name="editor_report_problem_desription_1">Beschrijf het probleem gedetailleerd, zodat de OpenStreetMap-community de fout kan oplossen.</string>
     <string name="editor_report_problem_desription_2">Of doe het zelf op https://www.openstreetmap.org/</string>
-    <string name="editor_report_problem_send_button">Verzend</string>
+    <string name="editor_report_problem_send_button">Verzenden</string>
     <string name="editor_report_problem_title">Probleem</string>
     <string name="editor_report_problem_no_place_title">De plaats bestaat niet</string>
-    <string name="editor_report_problem_under_construction_title">Gesloten voor onderhoud</string>
+    <string name="editor_report_problem_under_construction_title">Gesloten i.v.m. onderhoud</string>
     <string name="editor_report_problem_duplicate_place_title">Dubbele plaats</string>
-    <string name="autodownload">Download kaarten automatisch</string>
+    <string name="autodownload">Kaarten automatisch downloaden</string>
     <!-- Place Page opening hours text -->
     <string name="daily">Dagelijks</string>
     <string name="twentyfour_seven">24/7</string>
@@ -431,7 +431,7 @@
     <string name="opens_in">Opent over %s</string>
     <string name="closes_in">Sluit over %s</string>
     <string name="closed">Gesloten</string>
-    <string name="edit_opening_hours">Bewerk openingstijden</string>
+    <string name="edit_opening_hours">Openingstijden bewerken</string>
     <string name="no_osm_account">Geen account bij OpenStreetMap?</string>
     <string name="register_at_openstreetmap">Registreer bij OpenStreetMap</string>
     <string name="login">Log in</string>
@@ -441,8 +441,8 @@
     <string name="password">Wachtwoord</string>
     <string name="forgot_password">Wachtwoord vergeten?</string>
     <string name="logout">Log uit</string>
-    <string name="edit_place">Bewerk de locatie</string>
-    <string name="add_language">Voeg een taal toe</string>
+    <string name="edit_place">Locatie bewerken</string>
+    <string name="add_language">Taal toevoegen</string>
     <string name="street">Straat</string>
     <!-- Editable House Number text field (in address block). -->
     <string name="house_number">Huisnummer</string>
@@ -450,9 +450,9 @@
     <string name="social_media">Sociale media</string>
     <string name="building">Gebouw</string>
     <!-- Text field to enter non-existing street name, below list of known streets around -->
-    <string name="add_street">Voeg een straat toe</string>
+    <string name="add_street">Een straat toevoegen</string>
     <!-- Error to display when a new street name is not entered in the New street dialog -->
-    <string name="empty_street_name_error">Voer een straatnaam in a.u.b.</string>
+    <string name="empty_street_name_error">Voer een straatnaam in</string>
     <string name="choose_language">Kies een taal</string>
     <string name="choose_street">Kies een straat</string>
     <string name="postal_code">Postcode</string>
@@ -460,14 +460,14 @@
     <string name="select_cuisine">Selecteer keuken</string>
     <!-- login text field -->
     <string name="email_or_username">E-mailadres of gebruikersnaam</string>
-    <string name="editor_add_phone">Voeg telefoonnummer toe</string>
+    <string name="editor_add_phone">Telefoonnummer toevoegen</string>
     <string name="level">Verdieping</string>
     <string name="downloader_delete_map_dialog">Alle wijzigingen aan de kaart zullen samen met de kaart worden verwijderd</string>
-    <string name="downloader_update_maps">Update kaarten</string>
+    <string name="downloader_update_maps">Kaarten bijwerken</string>
     <string name="downloader_mwm_migration_dialog">Om een route te creëren, moet je alle kaarten updaten en dan de route opnieuw plannen.</string>
-    <string name="downloader_search_field_hint">Vind een kaart</string>
+    <string name="downloader_search_field_hint">Kaart zoeken</string>
     <string name="common_check_internet_connection_dialog">Controleer je instellingen en zorg ervoor dat het apparaat verbonden is met het internet</string>
-    <string name="downloader_no_space_title">Niet genoeg ruimte</string>
+    <string name="downloader_no_space_title">Onvoldoende ruimte</string>
     <string name="downloader_no_space_message">Verwijder overbodige gegevens</string>
     <string name="editor_login_error_dialog">Inlogfout</string>
     <string name="editor_profile_changes">Gecontroleerde wijzigingen</string>
@@ -480,16 +480,16 @@
     <string name="editor_edit_place_category_title">Categorie</string>
     <string name="detailed_problem_description">Gedetailleerde probleemomschrijving</string>
     <string name="editor_report_problem_other_title">Een ander probleem</string>
-    <string name="placepage_add_business_button">Voeg een organisatie toe</string>
+    <string name="placepage_add_business_button">Bedrijf toevoegen</string>
     <string name="message_invalid_feature_position">Hier kan geen object worden geplaatst</string>
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">Door de gemeenschap gemaakte OpenStreetMap-gegevens tot %s. Lees meer over hoe je de kaart kunt bewerken en bijwerken op OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
     <string name="login_osm_presentation">OpenStreetMap.org (OSM) is een gemeenschapsproject om een vrije en open kaart te bouwen. Het is de belangrijkste bron van kaartgegevens in CoMaps en werkt ongeveer hetzelfde als Wikipedia. U kunt plaatsen toevoegen of bewerken en deze worden dan beschikbaar voor miljoenen gebruikers over de hele wereld. \nSluit u aan bij de gemeenschap en help mee om een betere kaart voor iedereen te maken!</string>
-    <string name="login_to_make_edits_visible">Maak een OpenStreetMap account aan of log in om uw kaartbewerkingen voor de wereld te publiceren</string>
+    <string name="login_to_make_edits_visible">Maak een OpenStreetMap-account aan of log in om uw kaartbewerkingen voor de wereld te publiceren</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d van %2$d</string>
-    <string name="download_over_mobile_header">Downloaden via een mobiele gegevensverbinding?</string>
+    <string name="download_over_mobile_header">Downloaden via mobiele internetverbinding?</string>
     <string name="download_over_mobile_message">Met sommige abonnementen of bij roaming kan dit behoorlijk duur zijn</string>
     <string name="error_enter_correct_house_number">Voer een geldig huisnummer in</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
@@ -522,15 +522,15 @@
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/h</string>
     <!-- abbreviation for mile(s) -->
-    <string name="mi">mijl</string>
+    <string name="mi">mi</string>
     <!-- A unit of measure -->
-    <string name="ft">voet</string>
+    <string name="ft">ft</string>
     <string name="miles_per_hour">mph</string>
     <string name="hour">u</string>
     <string name="minute">min</string>
     <string name="day">d</string>
     <string name="placepage_more_button">Meer</string>
-    <string name="placepage_edit_bookmark_button">Bewerk bladwijzer</string>
+    <string name="placepage_edit_bookmark_button">Bladwijzer bewerken</string>
     <string name="placepage_personal_notes_hint">Persoonlijke aantekeningen (tekst of html)</string>
     <string name="editor_comment_hint">Reactie…</string>
     <string name="editor_reset_edits_message">Alle lokale wijzigingen weggooien?</string>
@@ -862,7 +862,7 @@
     <string name="github">GitHub</string>
     <string name="gb">GB</string>
     <string name="telegram">Telegram</string>
-    <string name="matrix">Matrix</string>
+    <string name="matrix">[Matrix]</string>
     <string name="mastodon">Mastodon</string>
     <string name="facebook">Facebook</string>
     <string name="twitter">X (Twitter)</string>
@@ -919,4 +919,7 @@
     <string name="open_now">Nu open</string>
     <string name="closed_now">Nu gesloten</string>
     <string name="at">om %s</string>
+    <string name="dialog_report_error_with_logs">Stuur ons een foutenrapport:\n - stel \"Logboek inschakelen\" in bij de Instellingen\n - reproduceer het probleem\n - druk in het scherm \"Over &amp; Hulp\" op de knop \"Meld een fout\" en verzend via e-mail of chat\n - logboek uitschakelen</string>
+    <string name="osm_note_toast">Opmerking wordt verzonden naar OpenStreetMap</string>
+    <string name="osm_note_hint">Of laat een opmerking achter bij de OpenStreetMap-gemeenschap, zodat iemand anders hier een plaats kan toevoegen of verbeteren.</string>
 </resources>
diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index 2ac212575..c6d5e3289 100644
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -909,4 +909,6 @@
     <string name="open_now">Aberto agora</string>
     <string name="closed_now">Fechado agora</string>
     <string name="at">às %s</string>
+    <string name="osm_note_toast">Nota será enviada para o OpenStreetMap</string>
+    <string name="osm_note_hint">Ou, em vez disso, deixe uma nota para a comunidade do OpenStreetMap de tal maneira que outra pessoa possa adicionar ou consertar um local aqui.</string>
 </resources>
diff --git a/android/app/src/main/res/values-ru/types_strings.xml b/android/app/src/main/res/values-ru/types_strings.xml
index 41a3b7713..e0a6bf4c5 100644
--- a/android/app/src/main/res/values-ru/types_strings.xml
+++ b/android/app/src/main/res/values-ru/types_strings.xml
@@ -1386,4 +1386,5 @@
     <string name="type.man_made.crane">Кран</string>
     <string name="type.landuse.religious">Церковный двор</string>
     <string name="type.railway.station.subway.qingdao">Станция метро</string>
+    <string name="type.amenity.ranger_station">Пост лесников</string>
 </resources>
diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml
index c7d741369..ef7c9feb1 100644
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -9,7 +9,7 @@
     <string name="delete">Sil</string>
     <string name="download_maps">Harita İndir</string>
     <!-- Settings/Downloader - info for country when download fails -->
-    <string name="download_has_failed">İndirme başarısız. Yeniden denemek için dokun.</string>
+    <string name="download_has_failed">İndirme başarısız olmuştur, yeniden denemek için dokunun.</string>
     <!-- Settings/Downloader - info for country which started downloading -->
     <string name="downloading">İndiriliyor…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
@@ -90,7 +90,7 @@
     <!-- Header of settings activity where user defines storage path -->
     <string name="maps_storage">Haritaları şuraya kaydet:</string>
     <!-- Detailed description of Maps Storage settings button -->
-    <string name="maps_storage_summary">Haritaların indirileceği yeri seç.</string>
+    <string name="maps_storage_summary">Haritaların indirileceği klasörü seçin</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Haritalar</string>
     <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
@@ -681,7 +681,7 @@
     <string name="unable_to_calc_alert_title">Rota hesaplanamıyor</string>
     <string name="unable_to_calc_alert_subtitle">Rota bulunamadı. Bunun nedeni, belirlediğiniz seçenekler ya da eksik OpenStreetMap verisi olabilir. Lütfen rota seçeneklerinizi değiştirin ve yeniden deneyin.</string>
     <string name="define_to_avoid_btn">Kaçınılması gereken yolları tanımlayın</string>
-    <string name="change_driving_options_btn">Sürüş seçenekleri etkinleştirildi</string>
+    <string name="change_driving_options_btn">Yönlendirme seçenekleri etkin</string>
     <string name="toll_road">Paralı yol</string>
     <string name="unpaved_road">Asfaltsız yol</string>
     <string name="ferry_crossing">Vapur geçişi</string>
diff --git a/data/countries-strings/et.json/localize.json b/data/countries-strings/et.json/localize.json
index 82ccdb8c4..769239cc1 100644
--- a/data/countries-strings/et.json/localize.json
+++ b/data/countries-strings/et.json/localize.json
@@ -1923,19 +1923,19 @@
 "Japan_Tohoku_Iwate Description":"Morioka, Hachimantai, Ninohe",
 "Japan_Tohoku_Miyagi Description":"Sendai, Higashimatsushima, Tome",
 "Japan_Tohoku_Yamagata Description":"Nanyo, Higashine, Obanazawa",
-"Jersey Description":"Saint Helier, St. Saviour, St. John",
+"Jersey Description":"Saint Helier, Saint Saviour, Saint John",
 "Jerusalem Description":"Jerusalemm, 'Anata, Al-Walaja",
-"Jordan Description":"Amman, Zarqa, Irbid",
+"Jordan Description":"Amman, Az-Zarqā’, Irbid",
 "Kazakhstan_North Description":"Astana, Karagandõ, Pavlodar",
 "Kazakhstan_South Description":"Almatõ, Šõmkent, Aktöbe",
 "Kenya Description":"Nairobi, Kisumu, Kitale",
 "Kingdom of Lesotho Description":"Maseru, Butha-Buthe, Mohale's Hoek",
 "Kiribati Description":"Betio, Kabuna, Bairiki",
-"Kuwait Description":"Kuwait City, Al Ahmadi, Jahra",
+"Kuwait Description":"Al-Kuwayt, Al-Aḩmadi, Al-Jahrā’",
 "Kyrgyzstan Description":"Biškek, Oš, Balõktšõ",
-"Laos Description":"Vientiane, Pakxan, Oudomxay",
+"Laos Description":"Vientiane, Pakxé, Oudomxay",
 "Latvia Description":"Riia, Daugavpils, Liepāja",
-"Lebanon Description":"Beirut, Zahle, Sidon",
+"Lebanon Description":"Beirut, Zaḩlah, Siidon",
 "Liberia Description":"Monrovia, Sanniquellie, Fish Town City",
 "Libya Description":"Tripoli, Benghazi, Misrata",
 "Liechtenstein Description":"Vaduz, Schaan, Triesen",
diff --git a/data/countries-strings/fi.json/localize.json b/data/countries-strings/fi.json/localize.json
index bb2d53ede..f6842793c 100644
--- a/data/countries-strings/fi.json/localize.json
+++ b/data/countries-strings/fi.json/localize.json
@@ -1350,7 +1350,7 @@
 "Andorra Description":"Andorra la Vella, La Massana, Ordino",
 "Angola Description":"Luanda, Lobito, Namibe",
 "Anguilla Description":"The Valley, George Hill, Stoney Ground",
-"Antarctica Description":"McMurdo Station, Chilean research station „Villa Las Estrellas”, Rocky Cove",
+"Antarctica Description":"McMurdo Station, Chilean research station “Villa Las Estrellas”, Rocky Cove",
 "Antigua and Barbuda Description":"St. John’s",
 "Argentina_Buenos Aires_Buenos Aires Description":"Buenos Aires, José C. Paz, González Catán",
 "Argentina_Buenos Aires_North Description":"Dolores, Pinamar, Villa Gesell",
@@ -1514,7 +1514,7 @@
 "China_Chongqing Description":"Chongqing, Changshou, Kai",
 "China_Fujian Description":"Longyan, Sanming, Shaowu",
 "China_Gansu Description":"Lanzhou, Hongliuwan, Dangchengwan",
-"China_Guangdong Description":"Guangzhou, Shenzhen, Jiāngmén",
+"China_Guangdong Description":"Guangzhou, Shenzhen, Jiangmen",
 "China_Guangxi Description":"Guigang, Dongxing, Wuzhou",
 "China_Guizhou Description":"Guiyang, Liupanshui, Weining",
 "China_Hebei Description":"Peking",
@@ -1582,7 +1582,7 @@
 "Egypt Description":"Kairo",
 "El Salvador Description":"San Salvador, Ahuachapan, Sonsonate",
 "Equatorial Guinea Description":"Malabo, Mongomo, Bata",
-"Eritrea Description":"ኣስመራ, Keren, Omhajer",
+"Eritrea Description":"Asmara, Keren, Omhajer",
 "Estonia_East Description":"Tartto",
 "Estonia_West Description":"Tallinna",
 "Ethiopia Description":"Addis Abeba",
@@ -1781,7 +1781,7 @@
 "India_Karnataka_North Description":"Belagavi, Hubballi, Mangaluru",
 "India_Karnataka_South Description":"Bengaluru, Mysuru, Kolar Gold Fields",
 "India_Kerala Description":"Thiruvananthapuram, Ernakulam, Thrissur",
-"India_Lakshadweep Description":"Kavaratti, Minicoy, agatti village center",
+"India_Lakshadweep Description":"Kavaratti, Minicoy, Agatti",
 "India_Madhya Pradesh Description":"Indore, Bhopal, Gwalior",
 "India_Maharashtra Description":"Mumbai, Pune, Nagpur",
 "India_Manipur Description":"Imphal, Imphal, Jiribam",
@@ -1817,7 +1817,7 @@
 "Isle of Man Description":"Douglas, Onchan",
 "Israel Description":"Tel Aviv-Yafo, Herzliya, Modiin-Maccabim-Reut",
 "Italy_Abruzzo Description":"Pescara, Rosciolo, Pineto",
-"Italy_Aosta Valley Description":"Quart, Aosta, Aosta",
+"Italy_Aosta Valley Description":"Quart, Aosta",
 "Italy_Apulia Description":"Taranto",
 "Italy_Basilicata Description":"Potenza, Matera, Melfi",
 "Italy_Calabria Description":"Reggio di Calabria, Catanzaro, Cosenza",
@@ -1839,21 +1839,21 @@
 "Italy_Liguria Description":"Genoa, La Spezia, La Spezia",
 "Italy_Lombardy_Bergamo Description":"Bergamo, Tagliuno, Treviglio",
 "Italy_Lombardy_Brescia Description":"Brescia, Bossotti, Lumezzane",
-"Italy_Lombardy_Como Description":"Como, Como, Cantù",
-"Italy_Lombardy_Cremona Description":"Cremona, Cremona, Trescore Cremasco",
+"Italy_Lombardy_Como Description":"Como, Cantù",
+"Italy_Lombardy_Cremona Description":"Cremona, Trescore Cremasco",
 "Italy_Lombardy_Lecco Description":"Lecco, Merate, Calolziocorte",
 "Italy_Lombardy_Lodi Description":"Lodi, Codogno, Casalpusterlengo",
-"Italy_Lombardy_Mantua Description":"Mantua, Mantua, Suzzara",
+"Italy_Lombardy_Mantua Description":"Mantua, Suzzara",
 "Italy_Lombardy_Milan Description":"Milano",
 "Italy_Lombardy_Monza and Brianza Description":"Monza, Besana in Brianza, Seregno",
 "Italy_Lombardy_Pavia Description":"Pavia, Vigevano, Buscarella",
-"Italy_Lombardy_Sondrio Description":"Sondrio, Sondrio, Morbegno",
+"Italy_Lombardy_Sondrio Description":"Sondrio, Morbegno",
 "Italy_Lombardy_Varese Description":"Busto Arsizio, Varese, Gallarate",
 "Italy_Marche Description":"Ancona, Pesaro",
 "Italy_Molise Description":"Campobasso, Termoli, Isernia",
 "Italy_Piemont_Alessandria Description":"Alessandria, Casale Monferrato, Novi Ligure",
 "Italy_Piemont_Asti Description":"Asti, Canelli, Nizza Monferrato",
-"Italy_Piemont_Biella Description":"Biella, Biella, Cossato",
+"Italy_Piemont_Biella Description":"Biella, Cossato",
 "Italy_Piemont_Cuneo Description":"Cuneo, Verduno, Bergolo",
 "Italy_Piemont_Novara Description":"Novara, Borgomanero, Trecate",
 "Italy_Piemont_Torino Description":"Torino",
@@ -1975,9 +1975,9 @@
 "Nagorno-Karabakh Description":"Khankendi, Shusha, Lachin",
 "Namibia Description":"Windhoek, Opuwo, Eenhana",
 "Nauru Description":"Yaren, Buada, Orro",
-"Nepal_Kathmandu Description":"Kathmandu, Kathmandu, Patan",
+"Nepal_Kathmandu Description":"Kathmandu, Patan",
 "Nepal_Madhyamanchal Description":"Bharatpur, Birganj",
-"Nepal_Purwanchal Description":"sarang pada, campa bazzar, Kerkha bajar",
+"Nepal_Purwanchal Description":"Sarang Pada, Campa Bazzar, Kerkha Bazar",
 "Nepal_West Description":"Butwal, Pokhara, Nepalgunj Sub Metropolitan City",
 "Netherlands_Drenthe Description":"Assen, Emmen, Hoogeveen",
 "Netherlands_Flevoland Description":"Almere, Lelystad, Dronten",
@@ -2079,8 +2079,8 @@
 "Russia_Astrakhan Oblast Description":"Astrahan",
 "Russia_Bashkortostan Description":"Ufa, Sterlitamak, Salavat",
 "Russia_Belgorod Oblast Description":"Belgorod, Stary Oskol, Gubkin",
-"Russia_Bryansk Oblast Description":"Brjansk",
-"Russia_Buryatia Description":"Ulan-Ude, Selenduma, Джида",
+"Russia_Bryansk Oblast Description":"Bryansk, Novozybkov, Klintsy",
+"Russia_Buryatia Description":"Ulan-Ude, Selenduma, Dzhida",
 "Russia_Chechen Republic Description":"Grozny, Urus-Martan, Shali",
 "Russia_Chelyabinsk Oblast Description":"Tšeljabinsk",
 "Russia_Chukotka Autonomous Okrug Description":"Anadyr, Bilibino, Pevek",
@@ -2088,7 +2088,7 @@
 "Russia_Ingushetia Description":"Nazran, Ordzhonikidzevskaya, Karabulak",
 "Russia_Irkutsk Oblast Description":"Irkutsk, Bratsk, Angarsk",
 "Russia_Ivanovo Oblast Description":"Ivanovo",
-"Russia_Jewish Autonomous Oblast Description":"Birobidžan",
+"Russia_Jewish Autonomous Oblast Description":"Birobidzhan, Obluchye, Nikolayevka",
 "Russia_Kabardino-Balkaria Description":"Nalchik, Prokhladny, Baksan",
 "Russia_Kaliningrad Oblast Description":"Kaliningrad, Sovetsk, Chernyakhovsk",
 "Russia_Kaluga Oblast Description":"Obninsk",
@@ -2102,9 +2102,9 @@
 "Russia_Kostroma Oblast Description":"Kostroma",
 "Russia_Krasnodar Krai Description":"Krasnodar",
 "Russia_Krasnodar Krai_Adygeya Description":"Sotši, Gelendžik",
-"Russia_Krasnoyarsk Krai_North Description":"Norilsk, Dudinka, Северо-Енисейский",
+"Russia_Krasnoyarsk Krai_North Description":"Norilsk, Dudinka, Severo-Yeniseyskiy",
 "Russia_Krasnoyarsk Krai_South Description":"Krasnoyarsk, Achinsk, Kansk",
-"Russia_Kurgan Oblast Description":"Kurgan, Shadrinsk, Варгаши",
+"Russia_Kurgan Oblast Description":"Kurgan, Shadrinsk, Vargashi",
 "Russia_Kursk Oblast Description":"Kursk, Железногорск, Kurchatov",
 "Russia_Leningradskaya Oblast_Karelsky Description":"Viipuri, Seuloskoi, Sierattala",
 "Russia_Leningradskaya Oblast_Southeast Description":"Hatsina, Tihvinä",
@@ -2120,7 +2120,7 @@
 "Russia_North Ossetia-Alania Description":"Vladikavkaz, Mozdok, Beslan",
 "Russia_Novgorod Oblast Description":"Veliki Novgorod",
 "Russia_Novosibirsk Oblast Description":"Novosibirsk, Berdsk, Iskitim",
-"Russia_Omsk Oblast Description":"Omsk, Tara, Исилькуль",
+"Russia_Omsk Oblast Description":"Omsk, Tara, Isilkul",
 "Russia_Orenburg Oblast Description":"Orenburg, Orsk, Novotroitsk",
 "Russia_Oryol Oblast Description":"Oryol, Livny, Mtsensk",
 "Russia_Penza Oblast Description":"Penza, Kuznetsk, Zarecnyy",
@@ -2140,7 +2140,7 @@
 "Russia_Sakhalin Oblast Description":"Yuzhno-Sakhalinsk, Korsakov, Kholmsk",
 "Russia_Samara Oblast Description":"Samara, Tolyatti, Syzran",
 "Russia_Saratov Oblast Description":"Saratov, Engels, Balakovo",
-"Russia_Smolensk Oblast Description":"Smolensk, Вязьма, Roslavl",
+"Russia_Smolensk Oblast Description":"Smolensk, Vyazma, Roslavl",
 "Russia_Stavropol Krai Description":"Stavropol, Pyatigorsk, Kislovodsk",
 "Russia_Sverdlovsk Oblast_Ekaterinburg Description":"Yekaterinburg, Kamensk-Uralsky, Pervouralsk",
 "Russia_Sverdlovsk Oblast_North Description":"Nizhny Tagil, Serov, Novouralsk",
@@ -2300,7 +2300,7 @@
 "US_Alabama_Montgomery Description":"Creola, Centreville, Valley",
 "US_Alaska Description":"Scammon Bay, McGrath, Fort Wainright",
 "US_Arizona_Flagstaff Description":"Cottonwood, Holbrook, Show Low",
-"US_Arizona_Phoenix Description":"Phoenix, Mesa, Mesa",
+"US_Arizona_Phoenix Description":"Phoenix, Mesa",
 "US_Arizona_Tucson Description":"Tucson, South Tucson, Bisbee",
 "US_Arkansas_North Description":"Ward, Cabot, Des Arc",
 "US_Arkansas_South Description":"Stamps, Rockport",
@@ -2330,7 +2330,7 @@
 "US_Georgia_Macon Description":"Grovetown, Perry, Byron",
 "US_Georgia_North Description":"Emerson, Jefferson, Cartersville",
 "US_Georgia_South Description":"De Soto, Santa Claus, Pearson",
-"US_Guam Description":"Dededo Flea (Market), Tumon Golf Driving Range, San José",
+"US_Guam Description":"Dededo Flea Market, Tumon Golf Driving Range, San José",
 "US_Hawaii Description":"Hilo, Kailua-Kona, Kahului",
 "US_Idaho_North Description":"Huetter, Peck, Hayden",
 "US_Idaho_South Description":"Arco, Middleton, Greenleaf",
@@ -2470,13 +2470,13 @@
 "Ukraine_Rivne Oblast Description":"Rivne, Varash (Kuznetsovsk), Dubno",
 "Ukraine_Sumy Oblast Description":"Sumy, Konotop, Shostka",
 "Ukraine_Ternopil Oblast Description":"Ternopil, Chortkiv, Kremenets",
-"Ukraine_Vinnytsia Oblast Description":"Vinnytsia, Ворошиловка, Zhmerynka",
+"Ukraine_Vinnytsia Oblast Description":"Vinnytsia, Voroshylivka, Zhmerynka",
 "Ukraine_Volyn Oblast Description":"Lutsk, Kovel, Novovolynsk",
 "Ukraine_Zakarpattia Oblast Description":"Uzhhorod, Mukacheve, Khust",
 "Ukraine_Zaporizhia Oblast Description":"Zaporizhzhia, Melitopol, Berdiansk",
 "Ukraine_Zhytomyr Oblast Description":"Zhytomyr, Berdychiv, Korosten",
 "United Arab Emirates Description":"Abu Dhabi, Dubai, Ajman",
-"United States Virgin Islands Description":"Frederiksted, Christiansted, Christiansted",
+"United States Virgin Islands Description":"Frederiksted, Christiansted",
 "Uruguay Description":"Montevideo, Ciudad de la Costa, Salto",
 "Uzbekistan Description":"Taškent",
 "Vanuatu Description":"Port Vila, Vao Mainland, Saratamata",
@@ -2484,7 +2484,7 @@
 "Venezuela_South Description":"Maracaibo, Ciudad Guayana, San Cristóbal",
 "Vietnam Description":"Hanoi",
 "Wallis and Futuna Description":"Mata-Utu, Fiua, Tavai",
-"Yemen Description":"Sana'a, Sanʿaʾ, Aden",
+"Yemen Description":"Sana'a, Aden",
 "Zambia Description":"Lusaka, Kitwe, Ndola",
 "Zimbabwe Description":"Harare, Hwange, Masvingo",
 "United States of America Short":"Yhdysvallat",
diff --git a/data/countries-strings/nl.json/localize.json b/data/countries-strings/nl.json/localize.json
index 6106263e6..aad117a59 100644
--- a/data/countries-strings/nl.json/localize.json
+++ b/data/countries-strings/nl.json/localize.json
@@ -1244,8 +1244,8 @@
 "Mexico_Chihuahua":"Chihuahua",
 "Mexico_Sonora":"Sonora",
 "Nepal_Kathmandu":"Kathmandu",
-"Nepal_Madhyamanchal":"Centrale regio",
-"Nepal_Purwanchal":"oostelijke regio",
+"Nepal_Madhyamanchal":"Centrale ontwikkelingsregio",
+"Nepal_Purwanchal":"Oostelijke ontwikkelingsregio",
 "Nigeria_North":"Nigeria — Noord",
 "Nigeria_South":"Nigeria — Zuid",
 "Norway_Hordaland":"Hordaland",
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index 84934038e..2df15d30d 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -764,7 +764,7 @@
 /* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
 "alert_reauth_link_text_ios" = "aquí";
 "core_entrance" = "Entrada";
-"error_enter_correct_name" = "Por favor, introduzca el nombre correcto";
+"error_enter_correct_name" = "Por favor, introduce un nombre válido";
 "bookmark_lists" = "Listas";
 
 /* Do not display all bookmark lists on the map */
@@ -903,10 +903,10 @@
 "mountains" = "Montañas";
 "animals" = "Animales";
 "hotels" = "Hoteles";
-"buildings" = "Edificios";
+"buildings" = "Edificaciones";
 "money" = "Dinero";
 "shops" = "Tiendas";
-"parkings" = "Estacionamiento";
+"parkings" = "Aparcamiento";
 "fuel_places" = "Gasolineras";
 "medicine" = "Medicina";
 "search_in_the_list" = "Buscar en la lista";
@@ -963,37 +963,37 @@
 "app_tip_00" = "¡Gracias por utilizar nuestros mapas creados por la comunidad!";
 
 /* App tip #01 */
-"app_tip_01" = "¡Con sus donaciones y apoyo, podemos crear los mejores mapas del mundo!";
+"app_tip_01" = "¡Con tus donaciones y apoyo, podemos crear los mejores mapas del mundo!";
 
 /* App tip #02 */
-"app_tip_02" = "¿Le gusta nuestra aplicación? ¡Por favor done para apoyar su desarrollo! ¿Todavía no le gusta? ¡Díganos por qué y lo arreglaremos!";
+"app_tip_02" = "¿Te gusta nuestra aplicación? ¡Por favor dona para apoyar su desarrollo! ¿Todavía no te gusta? ¡Dinos por qué y lo arreglaremos!";
 
 /* App tip #03 */
 "app_tip_03" = "Si conoce a algún desarrollador o desarrolladora de software, le puede pedir que implemente alguna funcionalidad que usted necesite.";
 
 /* App tip #04 */
-"app_tip_04" = "Toque en cualquier lugar del mapa para seleccionar cualquier elemento. Mantenga pulsado para ocultar y volver a mostrar la interfaz.";
+"app_tip_04" = "Toca en cualquier lugar del mapa para seleccionar cualquier elemento. Manten pulsado para ocultar y volver a mostrar la interfaz.";
 
 /* App tip #05 */
-"app_tip_05" = "¿Sabía que su ubicación actual en el mapa se puede seleccionar?";
+"app_tip_05" = "¿Sabías que tu ubicación actual en el mapa se puede seleccionar?";
 
 /* App tip #06 */
-"app_tip_06" = "Puede ayudar a traducir nuestra aplicación a su idioma.";
+"app_tip_06" = "Puedes ayudar a traducir nuestra aplicación a tu idioma.";
 
 /* App tip #07 */
 "app_tip_07" = "Nuestra aplicación está desarrollada por unos pocos entusiastas y la comunidad.";
 
 /* App tip #08 */
-"app_tip_08" = "Puede arreglar y mejorar fácilmente los datos del mapa.";
+"app_tip_08" = "Puedes arreglar y mejorar fácilmente los datos del mapa.";
 
 /* App tip #09 */
-"app_tip_09" = "Nuestro principal objetivo es crear mapas rápidos, centrados en la privacidad y fáciles de utilizar que le encantarán.";
+"app_tip_09" = "Nuestro principal objetivo es crear mapas rápidos, centrados en la privacidad y fáciles de utilizar, que te encantarán.";
 
 /* Text on the Android Auto or CarPlay placeholder screen that maps are displayed on the phone screen */
-"car_used_on_the_phone_screen" = "Ahora usa CoMaps en la pantalla del teléfono";
+"car_used_on_the_phone_screen" = "Ahora estás usando CoMaps en la pantalla del teléfono";
 
 /* Text on the phone placeholder screen that maps are displayed on the car screen */
-"car_used_on_the_car_screen" = "Ahora usa CoMaps en la pantalla del coche";
+"car_used_on_the_car_screen" = "Ahora estás usando CoMaps en la pantalla del coche";
 
 /* Displayed on the phone screen. Button to display maps on the phone screen instead of a car */
 "car_continue_on_the_phone" = "Pasar al teléfono";
@@ -1005,7 +1005,7 @@
 "button_layer_outdoor" = "Senderismo";
 
 /* Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks */
-"bookmarks_export" = "Exportar todos los marcadores y trayectos";
+"bookmarks_export" = "Exportar todos los marcadores y trazas";
 
 /* Text for the editing the Track's color button. */
 "change_color" = "Cambiar color";
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
index 975c5dc0e..dcca85771 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
@@ -329,19 +329,19 @@
 "type.cuisine.noodles" = "Fideos";
 "type.cuisine.oriental" = "Oriental";
 "type.cuisine.pancake" = "Tortitas";
-"type.cuisine.pasta" = "Pastas";
+"type.cuisine.pasta" = "Pasta";
 "type.cuisine.persian" = "Persa";
 "type.cuisine.peruvian" = "Peruana";
 "type.cuisine.pizza" = "Pizzas";
 "type.cuisine.polish" = "Polaca";
 "type.cuisine.portuguese" = "Portuguesa";
 "type.cuisine.ramen" = "Ramen";
-"type.cuisine.regional" = "Cocina regional";
+"type.cuisine.regional" = "Regional";
 "type.cuisine.russian" = "Rusa";
 "type.cuisine.sandwich" = "Sándwiches";
 "type.cuisine.sausage" = "Salchichas";
 "type.cuisine.savory_pancakes" = "Tortitas saladas";
-"type.cuisine.seafood" = "Mariscos";
+"type.cuisine.seafood" = "del mar";
 "type.cuisine.soba" = "Soba";
 "type.cuisine.spanish" = "Española";
 "type.cuisine.steak_house" = "Asador";
@@ -384,11 +384,11 @@
 "type.healthcare.sample_collection" = "Muestreo";
 "type.healthcare.speech_therapist" = "Logopedia";
 "type.highway" = "Carretera";
-"type.highway.bridleway" = "Camino de caballos";
+"type.highway.bridleway" = "Camino ecuestre";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.bridleway.bridge" = "Puente";
-"type.highway.bridleway.permissive" = "Camino de caballos";
+"type.highway.bridleway.permissive" = "Camino ecuestre";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.bridleway.tunnel" = "Túnel";
@@ -399,7 +399,7 @@
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.busway.tunnel" = "Túnel";
-"type.highway.bus_stop" = "Parada de autobús";
+"type.highway.bus_stop" = "Parada de bus";
 "type.highway.construction" = "Vía en construcción";
 "type.highway.cycleway" = "Ciclovía";
 
@@ -473,7 +473,7 @@
 "type.highway.primary.bridge" = "Puente";
 
 /* These translations are used for all type.highway.*.tunnel. */
-"type.highway.primary.tunnel" = "Túnel de carretera principal";
+"type.highway.primary.tunnel" = "Túnel";
 "type.highway.primary_link" = "Enlace de carretera principal";
 
 /* These translations are used for all type.highway.*.bridge. */
@@ -863,18 +863,18 @@
 "type.power.generator" = "Generador";
 "type.power.generator.solar" = "Generador solar";
 "type.power.generator.wind" = "Generador de viento";
-"type.power.generator.gas" = "Planta de energía de turbina de gas";
-"type.power.generator.hydro" = "Planta de energía hidroeléctrica";
+"type.power.generator.gas" = "Planta termoeléctrica de gas";
+"type.power.generator.hydro" = "Planta hidroeléctrica";
 "type.power.line" = "Línea eléctrica";
 "type.power.line.underground" = "Línea eléctrica subterránea";
-"type.power.minor_line" = "Línea eléctrica de baja tensión";
-"type.power.plant" = "Planta de energía";
+"type.power.minor_line" = "Línea eléctrica menor";
+"type.power.plant" = "Planta eléctrica";
 "type.power.plant.coal" = "Central eléctrica de carbón";
-"type.power.plant.gas" = "Planta de energía de turbina de gas";
-"type.power.plant.hydro" = "Planta de energía hidroeléctrica";
+"type.power.plant.gas" = "Planta termoeléctrica de gas";
+"type.power.plant.hydro" = "Planta hidroeléctrica";
 "type.power.plant.solar" = "Planta de energía solar";
 "type.power.plant.wind" = "Planta eólica";
-"type.power.substation" = "Subestación eléctrica";
+"type.power.substation" = "Subestación";
 
 /* A tower or pylon carrying high voltage electricity cables. */
 "type.power.tower" = "Torre eléctrica";
@@ -901,13 +901,13 @@
 "type.railway.light_rail" = "Tren ligero";
 "type.railway.light_rail.bridge" = "Puente de tren ligero";
 "type.railway.light_rail.tunnel" = "Túnel de tren ligero";
-"type.railway.monorail" = "Monorraíl";
-"type.railway.monorail.bridge" = "Puente de monorraíl";
-"type.railway.monorail.tunnel" = "Túnel de monorraíl";
+"type.railway.monorail" = "Monorriel";
+"type.railway.monorail.bridge" = "Puente de monorriel";
+"type.railway.monorail.tunnel" = "Túnel de monorriel";
 "type.railway.narrow_gauge" = "Vía férrea estrecha";
 "type.railway.narrow_gauge.bridge" = "Puente de vía férrea estrecha";
 "type.railway.narrow_gauge.tunnel" = "Túnel de vía férrea estrecha";
-"type.railway.platform" = "Plataforma de vía férrea";
+"type.railway.platform" = "Plataforma ferroviaria";
 "type.railway.preserved" = "Raíl conservado";
 "type.railway.preserved.bridge" = "Puente ferroviario conservado";
 "type.railway.preserved.tunnel" = "Túnel ferroviario conservado";
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/eu.lproj/InfoPlist.strings
index a572605bb..21bee9a61 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/InfoPlist.strings
@@ -3,13 +3,13 @@
 "search" = "Bilatu";
 
 /* Used in home screen quick actions. */
-"bookmarks_and_tracks" = "Markagailuak eta ibilbideak";
+"bookmarks_and_tracks" = "Markagailuak eta arrastoak";
 
 /* Used in home screen quick actions. */
 "route" = "Ibilbidea";
 
 /* Needed to explain why we always require access to GPS coordinates, and not only when the app is active. */
-"NSLocationAlwaysUsageDescription" = "Beharrezkoa da inguruneko egungo kokapena definitzea aplikazioaren funtzionaltasunaz guztiz gozatzeko. Ibilbidea jarraitu eta duela gutxi egindako bidea gordetzeko aukeretan erabiltzen da.";
+"NSLocationAlwaysUsageDescription" = "Beharrezkoa da inguruneko egungo kokapena definitzea aplikazioaren funtzionaltasunaz guztiz gozatzeko. Ibilbidea jarraitu eta duela gutxi egindako arrastoa gordetzeko aukeretan erabiltzen da.";
 
 /* Needed to explain why we require access to GPS coordinates when the app is active. */
-"NSLocationWhenInUseUsageDescription" = "Uneko kokapenaren definizioa ibilbidea jarraitu eta duela gutxi egindako bidea gordetzeko aukeretan erabiltzen da.";
+"NSLocationWhenInUseUsageDescription" = "Uneko kokapenaren definizioa ibilbidea jarraitu eta duela gutxi egindako arrastoa gordetzeko aukeretan erabiltzen da.";
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
index 2439d348a..af9bb3243 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
@@ -69,7 +69,7 @@
 "bookmarks" = "Markagailuak";
 
 /* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
-"bookmarks_and_tracks" = "Markagailuak eta ibilbideak";
+"bookmarks_and_tracks" = "Markagailuak eta arrastoak";
 
 /* Default bookmark list name */
 "core_my_places" = "Nire tokiak";
@@ -195,7 +195,7 @@
 "version: %@ (%@)\nmap data: %@" = "Bertsioa: %@ (%@)\nMaparen datuak: %@";
 
 /* Title for tracks category in bookmarks manager */
-"tracks_title" = "Arrasto";
+"tracks_title" = "Arrastoak";
 
 /* Length of track in cell that describes route */
 "length" = "Luzera";
@@ -770,7 +770,7 @@
 "bookmarks_create_new_group" = "Sortu zerrenda berria";
 
 /* Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files */
-"bookmarks_import" = "Inportatu markagailuak eta ibilbideak";
+"bookmarks_import" = "Inportatu markagailuak eta arrastoak";
 "downloader_hide_screen" = "Ezkutatu pantaila";
 "downloader_percent" = "%@ (%@/%@)";
 "downloader_process" = "%@ deskargatzen…";
@@ -942,7 +942,7 @@
 "placepage_delete_track_button" = "Ezabatu arrastoa";
 
 /* The track deletion confirmaion alert message. */
-"placepage_delete_track_confirmation_alert_message" = "Ziur pista hau ezabatu nahi duzula?";
+"placepage_delete_track_confirmation_alert_message" = "Ziur arrasto hau ezabatu nahi duzula?";
 
 /* Placeholder for track name input on track edit screen */
 "placepage_track_name_hint" = "Arrastoaren izena";
@@ -1002,7 +1002,7 @@
 "button_layer_outdoor" = "Landa-eremua";
 
 /* Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks */
-"bookmarks_export" = "Esportatu Laster-marka eta Pista guztiak";
+"bookmarks_export" = "Esportatu markagailu eta arrasto guztiak";
 
 /* Text for the editing the Track's color button. */
 "change_color" = "Kolorea aldatu";
@@ -1024,7 +1024,7 @@
 "enable_icloud_synchronization_title" = "Gaitu iCloud sinkronizazioa";
 
 /* Message for the "Enable iCloud Syncronization" alert. */
-"enable_icloud_synchronization_message" = "iCloud sinkronizazioa garatzen ari den ezaugarri esperimental bat da. Ziurtatu zure laster-marka eta ibilbide guztien babeskopia egin duzula.";
+"enable_icloud_synchronization_message" = "iCloud sinkronizazioa garatzen ari den ezaugarri esperimental bat da. Ziurtatu zure markagailu eta arrasto guztien babeskopia egin duzula.";
 
 /* Title for the "iCloud Is Disabled" alert. */
 "icloud_disabled_title" = "iCloud desgaituta dago";
@@ -1075,10 +1075,10 @@
 "recover_all" = "Guztia berreskuratu";
 
 /* Prompt to start recording a track. */
-"start_track_recording" = "Ibilbidearen grabaketa";
+"start_track_recording" = "Grabatu arrastoa";
 
 /* Prompt for stopping a track recording. */
-"stop_track_recording" = "Gelditu ibilbidearen grabaketa";
+"stop_track_recording" = "Gelditu arrastoaren grabaketa";
 
 /* Title for the "Stop Without Saving" action for the alert when saving a track recording. */
 "stop_without_saving" = "Gelditu gorde gabe";
@@ -1087,10 +1087,10 @@
 "continue_recording" = "Jarraitu grabatzen";
 
 /* Title for the alert when saving a track recording. */
-"track_recording_alert_title" = "Ibilbidearen grabaketa markagailuetan eta ibilbideetan gorde nahi duzu?";
+"track_recording_alert_title" = "Markagailu eta arrastoetan gorde nahi duzu?";
 
 /* Message for the toast when saving the track recording is finished but nothing to save. */
-"track_recording_toast_nothing_to_save" = "Ibilbidea hutsik dago; ez dago ezer gordetzeko";
+"track_recording_toast_nothing_to_save" = "Arrastoa hutsik dago; ez dago ezer gordetzeko";
 "edit_track" = "Editatu arrastoa";
 "osm_profile_view_notes" = "Oharrak ikusi";
 "osm_profile_view_edit_history" = "Aldaketen historia ikusi";
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings
index 3005c4ab5..a9bbcd5f8 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings
@@ -548,13 +548,13 @@
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.tertiary_link.tunnel" = "Tunel";
-"type.highway.track" = "Kalea";
-"type.highway.track.area" = "Kalea";
+"type.highway.track" = "Arrastoa";
+"type.highway.track.area" = "Arrastoa";
 
 /* These translations are used for all type.highway.*.bridge. */
 "type.highway.track.bridge" = "Zubia";
-"type.highway.track.grade1" = "Kalea";
-"type.highway.track.no.access" = "Kalea";
+"type.highway.track.grade1" = "Arrastoa";
+"type.highway.track.no.access" = "Arrastoa";
 
 /* These translations are used for all type.highway.*.tunnel. */
 "type.highway.track.tunnel" = "Tunel";
@@ -593,7 +593,7 @@
 "type.area_highway.service" = "Kalea";
 "type.area_highway.tertiary" = "Kalea";
 "type.area_highway.steps" = "Bidea";
-"type.area_highway.track" = "Kalea";
+"type.area_highway.track" = "Arrastoa";
 "type.area_highway.trunk" = "Kalea";
 "type.area_highway.unclassified" = "Kalea";
 "type.historic" = "Objektu historikoa";
@@ -718,8 +718,8 @@
 "type.leisure.stadium" = "Estadioa";
 "type.leisure.swimming_pool" = "Igerilekua";
 "type.leisure.swimming_pool.private" = "Igerilekua";
-"type.leisure.track" = "Pista";
-"type.leisure.track.area" = "Pista";
+"type.leisure.track" = "Arrastoa";
+"type.leisure.track.area" = "Arrastoa";
 "type.leisure.water_park" = "Ur-parkea";
 "type.leisure.beach_resort" = "Hondartzako oporleku";
 "type.man_made" = "Artifiziala";
@@ -924,7 +924,7 @@
 "type.railway.rail.spur" = "Trenbide-spur";
 
 /* Short service tracks: siding, yard, crossover. */
-"type.railway.rail.service" = "Trenbide laguntzailea";
+"type.railway.rail.service" = "Zerbitzuko trenbidea";
 "type.railway.rail.bridge" = "Trenbide zubia";
 "type.railway.rail.highspeed.bridge" = "Trenbide zubia";
 "type.railway.rail.tourism.bridge" = "Trenbide zubia";
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings
index 920a1e7f3..ea2b693f9 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings
@@ -1,31 +1,31 @@
-"type.addr_interpolation" = "آدرس/بلاک";
-"type.addr_interpolation.even" = "آدرس/بلاک";
-"type.addr_interpolation.odd" = "آدرس/بلاک";
+"type.addr_interpolation" = "نشانی/بست";
+"type.addr_interpolation.even" = "نشانی/بست";
+"type.addr_interpolation.odd" = "نشانی/بست";
 "type.aerialway" = "راه هوایی";
-"type.aerialway.cable_car" = "ماشین کابلی";
+"type.aerialway.cable_car" = "خودردو کابلی";
 "type.aerialway.chair_lift" = "Chair Lift";
 "type.aerialway.drag_lift" = "Drag Lift";
 "type.aerialway.gondola" = "Gondola";
 "type.aerialway.mixed_lift" = "Mixed Lift";
-"type.aerialway.station" = "ایستگاه راه هوایی";
-"type.aeroway" = "­زیرساخت هوا و فضا";
+"type.aerialway.station" = "ایستگاه راه‌هوایی";
+"type.aeroway" = "زیرساخت مرز‌هوایی";
 "type.aeroway.aerodrome" = "فرودگاه";
-"type.aeroway.aerodrome.international" = "فرودگاه";
-"type.aeroway.apron" = "Apron";
-"type.aeroway.gate" = "Gate";
-"type.aeroway.helipad" = "پد فرود بالگرد";
+"type.aeroway.aerodrome.international" = "فرودگاه فرامرزی";
+"type.aeroway.apron" = "پیشگاه";
+"type.aeroway.gate" = "دروازه";
+"type.aeroway.helipad" = "بالگَردنشین";
 "type.aeroway.runway" = "Runway";
-"type.aeroway.taxiway" = "Taxiway";
-"type.aeroway.terminal" = "Terminal";
-"type.amenity" = "زیر ساخت";
-"type.amenity.arts_centre" = "مرکز هنری";
+"type.aeroway.taxiway" = "رج وزیگ";
+"type.aeroway.terminal" = "پایانه";
+"type.amenity" = "امکانات آسایشی";
+"type.amenity.arts_centre" = "کانون هنری";
 "type.amenity.atm" = "خودپرداز";
 "type.amenity.bank" = "بانک";
-"type.amenity.bar" = "میکده";
-"type.amenity.bbq" = "منقل کباب";
-"type.amenity.bench" = "سَکو";
-"type.amenity.bicycle_parking" = "پارکینگ دوچرخه";
-"type.amenity.bicycle_rental" = "مکان اجاره دوچرخه";
+"type.amenity.bar" = "می‌کده";
+"type.amenity.bbq" = "اَدیشت کباب";
+"type.amenity.bench" = "نیمکت";
+"type.amenity.bicycle_parking" = "ایستگاه دوچرخه";
+"type.amenity.bicycle_rental" = "جایگاه کرایه دوچرخه";
 "type.amenity.bicycle_repair_station" = "ایستگاه تعمیر دوچرخه";
 "type.amenity.biergarten" = "غذا";
 "type.amenity.brothel" = "فاحشه خانه";
@@ -1479,5 +1479,5 @@
 "type.leisure.escape_game" = "Escape Room";
 "type.amenity.luggage_locker" = "Luggage Locker";
 "type.amenity.ranger_station" = "Ranger Station";
-"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
+"type.amenity.bicycle_parking.covered" = "ایستگاه پوشیده‌ی دوچرخه";
 "type.post_office.post_partner" = "Post Partner";
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/nl.lproj/InfoPlist.strings
index 1d0351200..f47bbdff2 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/InfoPlist.strings
@@ -1,6 +1,6 @@
 
 /* Used in home screen quick actions. */
-"search" = "Zoek";
+"search" = "Zoeken";
 
 /* Used in home screen quick actions. */
 "bookmarks_and_tracks" = "Bladwijzers en tracks";
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index aa98187f3..4606b6efe 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -1,13 +1,13 @@
 
 /* Button text (should be short) */
-"cancel" = "Annuleer";
+"cancel" = "Annuleren";
 
 /* Button which interrupts country download */
 "cancel_download" = "Downloaden annuleren";
 
 /* Button which deletes downloaded country */
-"delete" = "Verwijder";
-"download_maps" = "Download kaarten";
+"delete" = "Verwijderen";
+"download_maps" = "Kaarten downloaden";
 
 /* Settings/Downloader - info for country which started downloading */
 "downloading" = "Downloaden…";
@@ -28,13 +28,13 @@
 "later" = "Later";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
-"search" = "Zoek";
+"search" = "Zoeken";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
 "use_cellular_data" = "Ja";
 
 /* View and button titles for accessibility */
-"zoom_to_country" = "Toon op de kaart";
+"zoom_to_country" = "Weergeven op de kaart";
 
 /* Button text for the button at the center of the screen when the country is not downloaded and the size should not be shown */
 "country_status_download_without_size" = "Download kaart";
@@ -53,14 +53,14 @@
 
 /* Text in About screen */
 "about_proposition_3" = "Transparant en zonder winstoogmerk";
-"close" = "Sluit";
-"download" = "Download";
+"close" = "Sluiten";
+"download" = "Downloaden";
 
 /* REMOVE THIS STRING AFTER REFACTORING */
-"continue_button" = "Ga verder";
+"continue_button" = "Doorgaan";
 
 /* "Add new bookmark list" dialog title */
-"add_new_set" = "Voeg nieuwe groep toe";
+"add_new_set" = "Nieuwe groep toevoegen";
 
 /* Add Bookmark list dialog - hint when the list name is empty */
 "bookmark_set_name" = "Naam van bladwijzergroep";
@@ -157,16 +157,16 @@
 "share_bookmarks_email_body" = "Hallo!\n\nBijgesloten zijn mijn bladwijzers uit de CoMaps app. Open ze als je CoMaps geïnstalleerd hebt. Of, als je dat niet hebt, download de app voor je iOS- of Android-apparaat door deze link te volgen: https://www.comaps.app/download/\n\nGeniet van het reizen met CoMaps!";
 
 /* message title of loading file */
-"load_kmz_title" = "Bladwijzers worden geladen";
+"load_kmz_title" = "Bladwijzers laden";
 
 /* Kmz file successful loading */
-"load_kmz_successful" = "Bladwijzers succesvol geüpload! U vindt ze op de kaart of op het scherm van de Bladwijzerbeheerder.";
+"load_kmz_successful" = "Bladwijzers succesvol geladen! U vindt ze op de kaart of op het scherm van de Bladwijzerbeheerder.";
 
 /* Kml file loading failed */
-"load_kmz_failed" = "Bladwijzers uploaden is mislukt. Het bestand is mogelijk beschadigd of defect.";
+"load_kmz_failed" = "Bladwijzers laden is mislukt. Het bestand is mogelijk beschadigd of defect.";
 
 /* resource for context menu */
-"edit" = "Wijzig";
+"edit" = "Bewerken";
 
 /* Warning message when doing search around current position */
 "unknown_current_position" = "Je locatie is nog niet vastgesteld";
@@ -202,7 +202,7 @@
 
 /* Length of track in cell that describes route */
 "length" = "Lengte";
-"share_my_location" = "Deel mijn locatie";
+"share_my_location" = "Mijn locatie delen";
 "prefs_group_route" = "Navigatie";
 "pref_zoom_title" = "Zoomknoppen";
 "pref_left_button_type" = "Left Main Button";
@@ -253,13 +253,13 @@
 "pref_tts_language_title" = "Gesproken taal";
 
 /* Settings «Route» category: «Test Voice Directions» title */
-"pref_tts_test_voice_title" = "Test gesproken aanwijzingen";
+"pref_tts_test_voice_title" = "Gesproken aanwijzingen testen";
 
 /* Title for "Other" section in TTS settings. */
 "pref_tts_other_section_title" = "Andere";
 "pref_map_auto_zoom" = "Automatisch zoomen";
 "placepage_distance" = "Afstand";
-"search_show_on_map" = "Bekijk op de kaart";
+"search_show_on_map" = "Weergeven op kaart";
 
 /* Text in menu */
 "website" = "Website";
@@ -313,7 +313,7 @@
 "faq" = "Vragen en antwoorden";
 
 /* Button in the main menu */
-"donate" = "Doneer";
+"donate" = "Doneren";
 
 /* Button in the main Help dialog */
 "copyright" = "Auteursrechten";
@@ -343,7 +343,7 @@
 "long_tap_toast" = "Tik nogmaals lang op de kaart om de interface te zien";
 
 /* Update all button text */
-"downloader_update_all_button" = "Update alles";
+"downloader_update_all_button" = "Alles bijwerken";
 
 /* Downloaded maps list header */
 "downloader_downloaded_subtitle" = "Gedownload";
@@ -353,12 +353,12 @@
 
 /* Country queued for download */
 "downloader_queued" = "In de wachtrij";
-"downloader_near_me_subtitle" = "Bij mij in de buurt";
+"downloader_near_me_subtitle" = "In de buurt";
 
 /* In maps downloader and country place page shows how many maps are downloaded / to download, e.g. "Maps: 3 of 10" */
 "downloader_status_maps" = "Kaarten";
-"downloader_download_all_button" = "Download alles";
-"downloader_downloading" = "Aan het downloaden:";
+"downloader_download_all_button" = "Alles downloaden";
+"downloader_downloading" = "Downloaden:";
 "downloader_search_results" = "Gevonden";
 
 /* Status of outdated country in the list */
@@ -371,26 +371,26 @@
 "downloader_delete_map_while_routing_dialog" = "Stop de navigatie om de kaart te verwijderen.";
 
 /* PointsInDifferentMWM */
-"routing_failed_cross_mwm_building" = "Enkel routes die volledig in één kaart passen, kunnen gecreëerd worden.";
+"routing_failed_cross_mwm_building" = "Alleen routes die volledig in één kaart passen, kunnen gecreëerd worden.";
 
 /* Context menu item for downloader. */
-"downloader_download_map" = "Download de kaart";
+"downloader_download_map" = "Kaart downloaden";
 
 /* Item status in downloader. */
-"downloader_retry" = "Probeer opnieuw";
+"downloader_retry" = "Opnieuw";
 
 /* Item in context menu. */
-"downloader_delete_map" = "Verwijder kaart";
+"downloader_delete_map" = "Kaart verwijderen";
 
 /* Text for routing error dialog */
 "routing_download_maps_along" = "Download kaarten op de route";
 
 /* Text for routing error dialog */
-"routing_requires_all_map" = "Voor het creëren van een route is het nodig dat alle kaarten van uw locatie naar uw bestemming gedownload en bijgewerkt zijn.";
+"routing_requires_all_map" = "Voor het creëren van een route is het nodig dat alle kaarten van uw locatie naar de bestemming gedownload en bijgewerkt zijn.";
 
 /* bookmark button text */
 "bookmark" = "markeer";
-"save" = "Bewaar";
+"save" = "Opslaan";
 "create" = "aanmaken";
 
 /* red color */
@@ -454,11 +454,11 @@
 "dialog_routing_download_files" = "Download de vereiste bestanden";
 "dialog_routing_download_and_update_all" = "Download de kaart en route-informatie voor het ingestelde traject en werk deze bij om de route te berekenen.";
 "dialog_routing_unable_locate_route" = "Route vinden mislukt";
-"dialog_routing_change_start_or_end" = "Kies een ander startpunt of een andere bestemming.";
-"dialog_routing_change_start" = "Kies ander startpunt";
+"dialog_routing_change_start_or_end" = "Pas het startpunt of de bestemming aan.";
+"dialog_routing_change_start" = "Startpunt aanpassen";
 "dialog_routing_start_not_determined" = "Route samenstellen mislukt. Startpunt kan niet worden gevonden.";
 "dialog_routing_select_closer_start" = "Kies een startpunt dat dichter bij een weg ligt.";
-"dialog_routing_change_end" = "Kies andere bestemming";
+"dialog_routing_change_end" = "Bestemming aanpassen";
 "dialog_routing_end_not_determined" = "Route samenstellen mislukt. Bestemming kan niet worden gevonden.";
 "dialog_routing_select_closer_end" = "Kies een bestemming die dichter bij een weg ligt.";
 "dialog_routing_change_intermediate" = "Kan de tussenstop niet vinden.";
@@ -470,10 +470,10 @@
 "dialog_routing_download_cross_route" = "Download de kaart om een betere route samen te stellen die de grenzen van deze kaart overschrijdt.";
 
 /* «Show» context menu */
-"show" = "Toon";
+"show" = "Tonen";
 
 /* «Hide» context menu */
-"hide" = "Verberg";
+"hide" = "Verbergen";
 
 /* Failed planning route message in navigation view */
 "routing_planning_error" = "Routeberekening mislukt";
@@ -491,7 +491,7 @@
 "search_not_found_query" = "Download de regio waar u zoekt of probeer een nabijgelegen stad/dorpnaam toe te voegen.";
 "search_history_title" = "Zoekgeschiedenis";
 "search_history_text" = "Snel toegang tot recente zoekopdrachten.";
-"clear_search" = "Wis zoekgeschiedenis";
+"clear_search" = "Zoekgeschiedenis wissen";
 
 /* Place Page link to Wikipedia article (if map object has it). */
 "read_in_wikipedia" = "Wikipedia";
@@ -501,14 +501,14 @@
 "p2p_your_location" = "Uw locatie";
 "p2p_start" = "Start";
 "p2p_from_here" = "Van";
-"p2p_to_here" = "Route naar";
+"p2p_to_here" = "Naar";
 "p2p_only_from_current" = "Navigatie is uitsluitend beschikbaar vanuit uw huidige locatie.";
 "p2p_reroute_from_current" = "Wilt u een route plannen vanaf uw huidige locatie?";
-"editor_time_add" = "Voeg schema toe";
-"editor_time_delete" = "Verwijder schema";
+"editor_time_add" = "Schema toevoegen";
+"editor_time_delete" = "Schema verwijderen";
 
 /* Text for allday switch. */
-"editor_time_allday" = "Elke dag (24 uur)";
+"editor_time_allday" = "Hele dag (24 uur)";
 "editor_time_open" = "Open";
 "editor_time_close" = "Gesloten";
 "editor_time_add_closed" = "Sluitingstijden toevoegen";
@@ -520,8 +520,8 @@
 "editor_add_select_location" = "Locatie selecteren";
 "editor_done_dialog_1" = "Je hebt de wereldkaart gewijzigd. Verberg dit niet! Vertel het je vrienden en bewerk haar samen.";
 "share_with_friends" = "Deel met je vrienden";
-"editor_report_problem_send_button" = "Verzend";
-"autodownload" = "Download kaarten automatisch";
+"editor_report_problem_send_button" = "Verzenden";
+"autodownload" = "Kaarten automatisch downloaden";
 
 /* Place Page opening hours text */
 "closed_now" = "Nu gesloten";
@@ -565,16 +565,16 @@
 /* Information text: "Last upload 11.01.2016" */
 "last_upload" = "Laatste upload";
 "thank_you" = "Dank je wel";
-"edit_place" = "Bewerk de locatie";
+"edit_place" = "Locatie bewerken";
 "place_name" = "Locatienaam";
-"add_language" = "Voeg een taal toe";
+"add_language" = "Taal toevoegen";
 
 /* Editable House Number text field (in address block). */
 "house_number" = "Huisnummer";
 "details" = "Details";
 
 /* Text field to enter non-existing street name, below list of known streets around */
-"add_street" = "Voeg een straat toe";
+"add_street" = "Een straat toevoegen";
 "choose_language" = "Kies een taal";
 "choose_street" = "Kies een straat";
 "postal_code" = "Postcode";
@@ -587,11 +587,11 @@
 "level" = "Verdieping";
 "please_note" = "Opgelet";
 "downloader_delete_map_dialog" = "Alle wijzigingen aan de kaart zullen samen met de kaart worden verwijderd.";
-"downloader_update_maps" = "Update kaarten";
-"downloader_search_field_hint" = "Vind een kaart";
+"downloader_update_maps" = "Kaarten bijwerken";
+"downloader_search_field_hint" = "Kaart zoeken";
 "migration_download_error_dialog" = "Downloadfout";
 "common_check_internet_connection_dialog" = "Controleer je instellingen en zorg ervoor dat het apparaat verbonden is met het internet.";
-"downloader_no_space_title" = "Niet genoeg ruimte";
+"downloader_no_space_title" = "Onvoldoende ruimte";
 "downloader_no_space_message" = "Verwijder overbodige gegevens";
 "editor_profile_changes" = "Gecontroleerde wijzigingen";
 "editor_focus_map_on_location" = "Sleep de kaart om het kruis op de locatie van de plaats of het bedrijf te plaatsen.";
@@ -615,7 +615,7 @@
 
 /* Downloaded 10 **of** 20 <- it is that "of" */
 "downloader_of" = "%1$d van %2$d";
-"download_over_mobile_header" = "Downloaden via een mobiele gegevensverbinding?";
+"download_over_mobile_header" = "Downloaden via mobiele internetverbinding?";
 "download_over_mobile_message" = "Met sommige abonnementen of bij roaming kan dit behoorlijk duur zijn.";
 "error_enter_correct_house_number" = "Voer een geldig huisnummer in";
 "editor_storey_number" = "Aantal verdiepingen (max. %d)";
@@ -665,10 +665,10 @@
 "kilometers_per_hour" = "km/h";
 
 /* abbreviation for mile(s) */
-"mi" = "mijl";
+"mi" = "mi";
 
 /* A unit of measure */
-"ft" = "voet";
+"ft" = "ft";
 "miles_per_hour" = "mph";
 "hour" = "u";
 "minute" = "min";
@@ -676,7 +676,7 @@
 "placepage_more_button" = "Meer";
 "book_button" = "Boek";
 "placepage_call_button" = "Bel";
-"placepage_edit_bookmark_button" = "Bewerk bladwijzer";
+"placepage_edit_bookmark_button" = "Bladwijzer bewerken";
 "placepage_bookmark_name_hint" = "Bladwijzernaam";
 "placepage_personal_notes_hint" = "Persoonlijke aantekeningen (tekst of html)";
 "placepage_delete_bookmark_button" = "Verwijder bladwijzer";
@@ -1099,5 +1099,5 @@
 "osm_profile_view_notes" = "Opmerkingen bekijken";
 "pref_mapappearance_title" = "Kaart uiterlijk";
 "pref_maplanguage_title" = "Kaarttaal";
-"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"transliteration_title_disabled_summary" = "Uitgeschakeld wanneer altijd de lokale taal voor de kaart wordt gebruikt";
 "pref_maplanguage_local" = "Lokale Taal";
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings
index 75df7e20f..ed94fd1d9 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings
@@ -1480,4 +1480,4 @@
 "type.amenity.luggage_locker" = "Luggage Locker";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.post_office.post_partner" = "Post Partner";
-"type.amenity.ranger_station" = "Ranger Station";
+"type.amenity.ranger_station" = "Пост лесников";
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index da01fe6db..de5dfddcb 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -834,7 +834,7 @@
 "unable_to_calc_alert_title" = "Rota hesaplanamıyor";
 "unable_to_calc_alert_subtitle" = "Rota bulunamadı. Bunun nedeni, belirlediğiniz seçenekler ya da eksik OpenStreetMap verisi olabilir. Lütfen rota seçeneklerinizi değiştirin ve yeniden deneyin.";
 "define_to_avoid_btn" = "Kaçınılması gereken yolları tanımlayın";
-"change_driving_options_btn" = "Sürüş seçenekleri etkinleştirildi";
+"change_driving_options_btn" = "Yönlendirme seçenekleri etkin";
 "toll_road" = "Paralı yol";
 "unpaved_road" = "Asfaltsız yol";
 "ferry_crossing" = "Vapur geçişi";
diff --git a/iphone/metadata/fr-FR/keywords.txt b/iphone/metadata/fr-FR/keywords.txt
index 66d886edb..4cb73ff9a 100644
--- a/iphone/metadata/fr-FR/keywords.txt
+++ b/iphone/metadata/fr-FR/keywords.txt
@@ -1 +1 @@
-cartes,cartes routières ouvertes,osm,voyage,randonnée,vélo,conduite,hors ligne,confidentialité,GPS
+cartes routières, osm, voyage, randonnée, vélo, conduite, hors ligne, confidentialité, GPS
diff --git a/iphone/metadata/fr-FR/subtitle.txt b/iphone/metadata/fr-FR/subtitle.txt
index e5b62c7b7..d7cda6c98 100644
--- a/iphone/metadata/fr-FR/subtitle.txt
+++ b/iphone/metadata/fr-FR/subtitle.txt
@@ -1 +1 @@
-Naviguer sans suivi
+Naviguez avec confidentialité

From f549108e7218d04a1ac77804e8a9c8d5760b392d Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Sun, 17 Aug 2025 18:24:37 +0200
Subject: [PATCH 049/302] [docs] Remove custom styles badges to fix render on
 Github

Signed-off-by: Jean-Baptiste Charron <jeanbaptiste.charron@outlook.fr>
---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index f73eca5c6..114771c8b 100644
--- a/README.md
+++ b/README.md
@@ -20,19 +20,19 @@
 <div align="center">
   <p align="center">
     <a href="https://codeberg.org/comaps/comaps/releases">
-      <img src="https://img.shields.io/github/license/comaps/comaps?style=for-the-badge&logo=opensourceinitiative&logoColor=white&color=588157" alt="License" style="width: 90%; max-width: 150px;"/>
+      <img src="https://img.shields.io/github/license/comaps/comaps?style=for-the-badge&logo=opensourceinitiative&logoColor=white&color=588157" alt="License"/>
     </a>
     <a href="https://github.com/comaps/comaps/actions/workflows/android-check.yaml">
-      <img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/android-check.yaml?label=Android%20Build&logo=android&logoColor=white&style=for-the-badge&color=588157" alt="Android Build Status" style="width: 90%; max-width: 170px;"/>
+      <img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/android-check.yaml?label=Android%20Build&logo=android&logoColor=white&style=for-the-badge&color=588157" alt="Android Build Status"/>
     </a>
     <a href="https://github.com/comaps/comaps/actions/workflows/ios-check.yaml">
-      <img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/ios-check.yaml?label=iOS%20Build&logo=apple&logoColor=white&style=for-the-badge&color=588157" alt="iOS Build Status" style="width: 90%; max-width: 145px;"/>
+      <img src="https://img.shields.io/github/actions/workflow/status/comaps/comaps/.github/workflows/ios-check.yaml?label=iOS%20Build&logo=apple&logoColor=white&style=for-the-badge&color=588157" alt="iOS Build Status"/>
     </a>
     <a href="https://opencollective.com/comaps">
-      <img src="https://img.shields.io/opencollective/all/comaps?label=Open%20Collective%20Donors&logo=opencollective&logoColor=white&style=for-the-badge&color=588157" alt="Open Collective Donors" style="width: 90%; max-width: 191px;"/>
+      <img src="https://img.shields.io/opencollective/all/comaps?label=Open%20Collective%20Donors&logo=opencollective&logoColor=white&style=for-the-badge&color=588157" alt="Open Collective Donors"/>
     </a>
     <a href="https://liberapay.com/CoMaps">
-      <img src="https://img.shields.io/liberapay/patrons/CoMaps.svg?label=Liberapay%20Patrons&logo=liberapay&logoColor=white&style=for-the-badge&color=588157" alt="Liberapay Patrons" style="width: 90%; max-width: 160px;"/>
+      <img src="https://img.shields.io/liberapay/patrons/CoMaps.svg?label=Liberapay%20Patrons&logo=liberapay&logoColor=white&style=for-the-badge&color=588157" alt="Liberapay Patrons"/>
     </a>
   </p>
 </div>

From daf2a7d8e75840e1e5fd5695ed14c31dab02ef20 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Sat, 16 Aug 2025 18:14:30 +0200
Subject: [PATCH 050/302] [android] Fix color issues for AppCompat components

Signed-off-by: Jean-Baptiste Charron <jeanbaptiste.charron@outlook.fr>
---
 .../java/app/organicmaps/search/SearchAdapter.java   |  2 +-
 android/app/src/main/res/values-night-v27/themes.xml |  1 +
 android/app/src/main/res/values-night/themes.xml     |  7 +++++++
 android/app/src/main/res/values-v27/themes.xml       |  1 +
 android/app/src/main/res/values/styles-editor.xml    |  2 +-
 android/app/src/main/res/values/styles.xml           | 12 ++++++------
 android/app/src/main/res/values/themes.xml           |  8 ++++++++
 7 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java b/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java
index acf8095be..34b13b89f 100644
--- a/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java
@@ -65,7 +65,7 @@ class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHol
     @AttrRes
     int getTintAttr()
     {
-      return com.google.android.material.R.attr.colorSecondary;
+      return androidx.appcompat.R.attr.colorAccent;
     }
 
     abstract TextView getTitleView();
diff --git a/android/app/src/main/res/values-night-v27/themes.xml b/android/app/src/main/res/values-night-v27/themes.xml
index 87388ede0..e2b160af1 100644
--- a/android/app/src/main/res/values-night-v27/themes.xml
+++ b/android/app/src/main/res/values-night-v27/themes.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <style name="MwmTheme.Night.MainActivity">
+        <item name="android:colorPrimaryDark">@android:color/black</item>
         <item name="colorPrimaryVariant">@android:color/black</item>
         <item name="android:windowBackground">@null</item>
         <item name="android:windowTranslucentNavigation">false</item>
diff --git a/android/app/src/main/res/values-night/themes.xml b/android/app/src/main/res/values-night/themes.xml
index 888d0138e..dd4c09bb6 100644
--- a/android/app/src/main/res/values-night/themes.xml
+++ b/android/app/src/main/res/values-night/themes.xml
@@ -13,6 +13,7 @@
         <item name="android:textColorPrimaryInverse">@color/text_dark</item>
         <item name="android:textColorSecondary">@color/text_light_subtitle</item>
         <item name="android:windowBackground">?windowBackgroundForced</item>
+        <item name="android:colorPrimaryDark">@color/bg_primary_dark_night</item>
         <item name="colorPrimaryVariant">@color/bg_primary_dark_night</item>
         <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
         <item name="android:fontFamily">@string/robotoRegular</item>
@@ -30,6 +31,7 @@
         <item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen.Night</item>
         <item name="colorPrimary">@color/bg_primary_night</item>
         <item name="colorControlNormal">?secondary</item>
+        <item name="colorAccent">@color/base_accent_night</item>
         <item name="colorSecondary">@color/base_accent_night</item>
         <item name="colorAccentTransparent">@color/base_accent_transparent</item>
         <item name="colorBtnHighlight">@color/white_24</item>
@@ -132,6 +134,7 @@
 
     <!-- Theme is overridden in v27 folder to handle cutouts -->
     <style name="MwmTheme.Night.MainActivity">
+        <item name="android:colorPrimaryDark">@android:color/black</item>
         <item name="colorPrimaryVariant">@android:color/black</item>
         <item name="android:windowBackground">@null</item>
         <item name="android:windowTranslucentNavigation">false</item>
@@ -147,6 +150,7 @@
     </style>
 
     <style name="MwmTheme.Night.AlertDialog" parent="Theme.MaterialComponents.Dialog.Alert">
+        <item name="colorAccent">?buttonDialogTextColor</item>
         <item name="colorSecondary">?buttonDialogTextColor</item>
         <item name="colorPrimary">?buttonDialogTextColor</item>
         <item name="android:background">?cardBackground</item>
@@ -162,6 +166,8 @@
     </style>
 
     <style name="MwmTheme.DialogFragment.Fullscreen.Night" parent="Theme.AppCompat">
+        <item name="android:colorPrimaryDark">?statusBar</item>
+        <item name="colorAccent">@color/base_accent_night</item>
         <item name="colorPrimary">@color/bg_primary_night</item>
         <item name="colorPrimaryVariant">?statusBar</item>
         <item name="colorSecondary">@color/base_accent_night</item>
@@ -182,6 +188,7 @@
     </style>
 
     <style name="MwmMain.DialogFragment.TimePicker.Night" parent="Theme.MaterialComponents.Dialog.Alert">
+        <item name="colorAccent">@color/base_accent_night</item>
         <item name="colorSecondary">@color/base_accent_night</item>
         <item name="colorPrimary">?buttonDialogTextColor</item>
         <item name="android:fontFamily">@string/robotoMedium</item>
diff --git a/android/app/src/main/res/values-v27/themes.xml b/android/app/src/main/res/values-v27/themes.xml
index 2965eda39..1f4882c4d 100644
--- a/android/app/src/main/res/values-v27/themes.xml
+++ b/android/app/src/main/res/values-v27/themes.xml
@@ -2,6 +2,7 @@
 <!-- Cutouts API is available for API >= 27 -->
 <resources>
   <style name="MwmTheme.MainActivity">
+    <item name="android:colorPrimaryDark">@android:color/black</item>
     <item name="colorPrimaryVariant">@android:color/black</item>
     <item name="android:windowBackground">@null</item>
     <item name="android:windowTranslucentNavigation">false</item>
diff --git a/android/app/src/main/res/values/styles-editor.xml b/android/app/src/main/res/values/styles-editor.xml
index b6f80eb52..e88d81250 100644
--- a/android/app/src/main/res/values/styles-editor.xml
+++ b/android/app/src/main/res/values/styles-editor.xml
@@ -38,7 +38,7 @@
     <item name="android:layout_width">wrap_content</item>
     <item name="android:layout_height">wrap_content</item>
     <item name="android:checked">true</item>
-    <item name="buttonTint">?colorSecondary</item>
+    <item name="buttonTint">?colorAccent</item>
   </style>
 
   <style name="MwmWidget.Editor.DayText">
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index cdba5938c..ae6bc4e1d 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -144,17 +144,20 @@
 
   <style name="MwmWidget.ToolbarTheme" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
     <item name="android:gravity">center_vertical</item>
+    <item name="colorAccent">@android:color/white</item>
     <item name="colorSecondary">@android:color/white</item>
     <item name="iconTint">@color/white_primary</item>
   </style>
 
   <style name="MwmWidget.ToolbarTheme.Light" parent="MwmWidget.ToolbarTheme">
     <item name="android:gravity">center_vertical</item>
+    <item name="colorAccent">@android:color/white</item>
     <item name="colorSecondary">@color/bg_window_night</item>
   </style>
 
   <style name="MwmWidget.ToolbarTheme.Transparent" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
     <item name="android:gravity">center_vertical</item>
+    <item name="colorAccent">@android:color/white</item>
     <item name="colorSecondary">@android:color/white</item>
     <item name="android:windowActionBarOverlay">true</item>
     <item name="windowActionBarOverlay">true</item>
@@ -164,6 +167,7 @@
     name="MwmWidget.ToolbarTheme.DownButton"
     parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
     <item name="android:gravity">center_vertical</item>
+    <item name="colorAccent">@android:color/white</item>
     <item name="colorSecondary">@android:color/white</item>
     <item name="android:homeAsUpIndicator">@drawable/ic_down</item>
   </style>
@@ -352,12 +356,8 @@
     <item name="android:minWidth">30dp</item>
     <item name="android:paddingTop">7dp</item>
     <item name="android:paddingBottom">7dp</item>
-    <item name="android:paddingStart" >
-      12dp
-    </item>
-    <item name="android:paddingEnd" >
-      12dp
-    </item>
+    <item name="android:paddingStart">12dp</item>
+    <item name="android:paddingEnd">12dp</item>
     <item name="android:paddingLeft">12dp</item>
     <item name="android:paddingRight">12dp</item>
     <item name="iconPadding">4dp</item>
diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml
index 2649b6a62..83a8b8a97 100644
--- a/android/app/src/main/res/values/themes.xml
+++ b/android/app/src/main/res/values/themes.xml
@@ -13,6 +13,7 @@
     <item name="android:textColorPrimaryInverse">@color/text_light</item>
     <item name="android:textColorSecondary">@color/text_dark_subtitle</item>
     <item name="android:windowBackground">?windowBackgroundForced</item>
+    <item name="android:colorPrimaryDark">@color/bg_primary_dark</item>
     <item name="colorPrimaryVariant">@color/bg_primary_dark</item>
     <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
     <item name="android:fontFamily">@string/robotoRegular</item>
@@ -28,6 +29,7 @@
     <item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen</item>
     <item name="colorPrimary">@color/bg_primary</item>
     <item name="colorControlNormal">?secondary</item>
+    <item name="colorAccent">@color/base_accent</item>
     <item name="colorSecondary">@color/base_accent</item>
     <item name="colorAccentTransparent">@color/base_accent_transparent</item>
     <item name="colorBtnHighlight">@color/white_38</item>
@@ -146,6 +148,7 @@
 
   <!-- Theme is overridden in v27 folder to handle cutouts -->
   <style name="MwmTheme.MainActivity">
+    <item name="android:colorPrimaryDark">@android:color/black</item>
     <item name="colorPrimaryVariant">@android:color/black</item>
     <item name="android:windowBackground">@null</item>
     <item name="android:windowTranslucentNavigation">false</item>
@@ -165,6 +168,7 @@
   </style>
 
   <style name="MwmTheme.AlertDialog" parent="Theme.MaterialComponents.Light.Dialog.Alert">
+    <item name="colorAccent">?buttonDialogTextColor</item>
     <item name="colorSecondary">?buttonDialogTextColor</item>
     <item name="colorPrimary">?buttonDialogTextColor</item>
     <item name="android:background">?cardBackground</item>
@@ -183,6 +187,8 @@
   </style>
 
   <style name="MwmTheme.DialogFragment.Fullscreen" parent="Theme.AppCompat.Light">
+    <item name="android:colorPrimaryDark">?statusBar</item>
+    <item name="colorAccent">@color/base_accent</item>
     <item name="colorPrimary">@color/bg_primary</item>
     <item name="colorPrimaryVariant">?statusBar</item>
     <item name="colorSecondary">@color/base_accent</item>
@@ -203,6 +209,7 @@
   </style>
 
   <style name="MwmTheme.DialogFragment.Fullscreen.Translucent">
+    <item name="android:colorPrimaryDark">@android:color/black</item>
     <item name="colorPrimaryVariant">@android:color/black</item>
     <item name="android:windowBackground">@color/bg_dialog_translucent</item>
     <item name="android:windowIsTranslucent">true</item>
@@ -210,6 +217,7 @@
   </style>
 
   <style name="MwmMain.DialogFragment.TimePicker" parent="Theme.MaterialComponents.Light.Dialog.Alert">
+    <item name="colorAccent">@color/base_accent</item>
     <item name="colorSecondary">@color/base_accent</item>
     <item name="colorPrimary">?buttonDialogTextColor</item>
     <item name="android:fontFamily">@string/robotoMedium</item>

From c59b63d784cc3491e7fb088950268f809f131b93 Mon Sep 17 00:00:00 2001
From: Henry Sternberg <henry@bluelightmaps.com>
Date: Mon, 28 Jul 2025 17:48:44 +0100
Subject: [PATCH 051/302] [routing] OSM tag based time and turn penalties

Signed-off-by: Henry Sternberg <dev@bluelightmaps.com>
Co-Authored-By: eisa01 <eisa01@gmail.com>
Co-Authored-By: x7z4w <x7z4w@noreply.codeberg.org>
Co-Authored-By: Yannik Bloscheck <git@yannikbloscheck.com>
---
 defines.hpp                                   |   2 +
 generator/CMakeLists.txt                      |   2 +
 generator/generator_tool/generator_tool.cpp   |   5 +-
 generator/road_penalty_generator.cpp          | 253 ++++++++++++++++
 generator/road_penalty_generator.hpp          |  70 +++++
 generator/routing_helpers.cpp                 |  11 +-
 generator/translator_country.cpp              |   3 +
 generator/way_nodes_mapper.hpp                |   7 +
 libs/geometry/distance_on_sphere.cpp          |   9 +
 libs/geometry/distance_on_sphere.hpp          |   2 +
 libs/geometry/point3d.hpp                     |   6 +
 libs/indexer/road_shields_parser.cpp          |  10 +-
 libs/routing/CMakeLists.txt                   |   3 +
 libs/routing/edge_estimator.cpp               | 283 ++++++++++++++++--
 libs/routing/edge_estimator.hpp               |  12 +-
 libs/routing/index_graph.cpp                  |  58 +++-
 libs/routing/index_graph.hpp                  |  12 +-
 libs/routing/index_graph_loader.cpp           |  42 ++-
 libs/routing/road_penalty.cpp                 |  82 +++++
 libs/routing/road_penalty.hpp                 | 127 ++++++++
 libs/routing/road_penalty_serialization.hpp   | 110 +++++++
 libs/routing/routing_tests/CMakeLists.txt     |   1 +
 .../routing_tests/index_graph_tools.cpp       |   5 +
 .../routing_tests/index_graph_tools.hpp       |   4 +-
 .../routing_tests/road_penalty_test.cpp       | 169 +++++++++++
 libs/routing_common/car_model_coefs.hpp       |   2 +-
 libs/routing_common/vehicle_model.cpp         |  38 +++
 libs/routing_common/vehicle_model.hpp         |   1 +
 .../routing/routing.xcodeproj/project.pbxproj |  17 ++
 29 files changed, 1301 insertions(+), 45 deletions(-)
 create mode 100644 generator/road_penalty_generator.cpp
 create mode 100644 generator/road_penalty_generator.hpp
 create mode 100644 libs/routing/road_penalty.cpp
 create mode 100644 libs/routing/road_penalty.hpp
 create mode 100644 libs/routing/road_penalty_serialization.hpp
 create mode 100644 libs/routing/routing_tests/road_penalty_test.cpp

diff --git a/defines.hpp b/defines.hpp
index 081f461a8..71d18a375 100644
--- a/defines.hpp
+++ b/defines.hpp
@@ -42,6 +42,7 @@
 #define METADATA_FILE_TAG "meta"
 #define ALTITUDES_FILE_TAG "altitudes"
 #define ROAD_ACCESS_FILE_TAG "roadaccess"
+#define ROAD_PENALTY_FILE_TAG "roadpenalty"
 #define RESTRICTIONS_FILE_TAG "restrictions"
 #define ROUTING_FILE_TAG "routing"
 #define CROSS_MWM_FILE_TAG "cross_mwm"
@@ -90,6 +91,7 @@
 #define GPS_TRACK_FILENAME "gps_track.dat"
 #define RESTRICTIONS_FILENAME "restrictions.csv"
 #define ROAD_ACCESS_FILENAME "road_access.bin"
+#define ROAD_PENALTY_FILENAME "road_penalty.bin"
 
 #define METALINES_FILENAME "metalines.bin"
 #define CAMERAS_TO_WAYS_FILENAME "cameras_to_ways.bin"
diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt
index 9da16f131..b1af498d3 100644
--- a/generator/CMakeLists.txt
+++ b/generator/CMakeLists.txt
@@ -186,6 +186,8 @@ set(SRC
   restriction_writer.hpp
   road_access_generator.cpp
   road_access_generator.hpp
+  road_penalty_generator.cpp
+  road_penalty_generator.hpp
   routing_city_boundaries_processor.cpp
   routing_city_boundaries_processor.hpp
   routing_helpers.cpp
diff --git a/generator/generator_tool/generator_tool.cpp b/generator/generator_tool/generator_tool.cpp
index 2853d8158..c0dcc8cef 100644
--- a/generator/generator_tool/generator_tool.cpp
+++ b/generator/generator_tool/generator_tool.cpp
@@ -21,6 +21,7 @@
 #include "generator/raw_generator.hpp"
 #include "generator/restriction_generator.hpp"
 #include "generator/road_access_generator.hpp"
+#include "generator/road_penalty_generator.hpp"
 #include "generator/routing_index_generator.hpp"
 #include "generator/routing_world_roads_generator.hpp"
 #include "generator/search_index_builder.hpp"
@@ -466,6 +467,7 @@ MAIN_WITH_ERROR_HANDLING([](int argc, char ** argv)
 
       string const restrictionsFilename = genInfo.GetIntermediateFileName(RESTRICTIONS_FILENAME);
       string const roadAccessFilename = genInfo.GetIntermediateFileName(ROAD_ACCESS_FILENAME);
+      string const roadPenaltyFilename = genInfo.GetIntermediateFileName(ROAD_PENALTY_FILENAME);
 
       BuildRoutingIndex(dataFile, country, *countryParentGetter);
       auto routingGraph = CreateIndexGraph(dataFile, country, *countryParentGetter);
@@ -475,7 +477,8 @@ MAIN_WITH_ERROR_HANDLING([](int argc, char ** argv)
 
       /// @todo CHECK return result doesn't work now for some small countries like Somalie.
       if (!BuildRoadRestrictions(*routingGraph, dataFile, restrictionsFilename, osmToFeatureFilename) ||
-          !BuildRoadAccessInfo(dataFile, roadAccessFilename, *osm2feature))
+          !BuildRoadAccessInfo(dataFile, roadAccessFilename, *osm2feature) ||
+          !BuildRoadPenalty(dataFile, roadPenaltyFilename, *osm2feature))
       {
         LOG(LERROR, ("Routing build failed for", dataFile));
       }
diff --git a/generator/road_penalty_generator.cpp b/generator/road_penalty_generator.cpp
new file mode 100644
index 000000000..91de5b2d1
--- /dev/null
+++ b/generator/road_penalty_generator.cpp
@@ -0,0 +1,253 @@
+#include "generator/road_penalty_generator.hpp"
+
+#include "generator/feature_builder.hpp"
+#include "generator/intermediate_data.hpp"
+#include "generator/osm_element.hpp"
+#include "generator/routing_helpers.hpp"
+
+#include "routing/road_penalty_serialization.hpp"
+#include "routing/routing_helpers.hpp"
+#include "routing/vehicle_mask.hpp"
+
+#include "coding/file_reader.hpp"
+#include "coding/file_writer.hpp"
+#include "coding/files_container.hpp"
+#include "coding/internal/file_data.hpp"
+#include "coding/varint.hpp"
+#include "coding/write_to_sink.hpp"
+
+#include "base/assert.hpp"
+#include "base/logging.hpp"
+
+#include <optional>
+
+namespace routing_builder
+{
+using namespace feature;
+using namespace generator;
+using namespace routing;
+using std::string, std::vector;
+
+namespace
+{
+// Unified penalty mapping for all OSM tags that create road penalties
+std::map<OsmElement::Tag, RoadPenalty::Type> const kUnifiedPenaltyMapping = {
+    // Traffic calming measures
+
+    {OsmElement::Tag("traffic_calming", "rumble_strip"), RoadPenalty::Type::SmallCalming},
+    {OsmElement::Tag("traffic_calming", "island"), RoadPenalty::Type::SmallCalming},
+
+    {OsmElement::Tag("traffic_calming", "cushion"), RoadPenalty::Type::MediumCalming},
+    {OsmElement::Tag("traffic_calming", "chicane"), RoadPenalty::Type::MediumCalming},
+    {OsmElement::Tag("traffic_calming", "choker"), RoadPenalty::Type::MediumCalming},
+    {OsmElement::Tag("traffic_calming", "table"), RoadPenalty::Type::MediumCalming},
+
+    {OsmElement::Tag("traffic_calming", "bump"), RoadPenalty::Type::LargeCalming},
+    {OsmElement::Tag("traffic_calming", "hump"), RoadPenalty::Type::LargeCalming},
+
+    {OsmElement::Tag("crossing", "unmarked"), RoadPenalty::Type::LargeCalming},
+
+    // Barrier penalties
+    {OsmElement::Tag("barrier", "gate"), RoadPenalty::Type::Gate},
+    {OsmElement::Tag("barrier", "lift_gate"), RoadPenalty::Type::Gate},
+    {OsmElement::Tag("barrier", "swing_gate"), RoadPenalty::Type::Gate},
+
+    // Junction penalties
+    {OsmElement::Tag("highway", "stop"), RoadPenalty::Type::UncontrolledJunction},
+    {OsmElement::Tag("highway", "give_way"), RoadPenalty::Type::UncontrolledJunction},
+    {OsmElement::Tag("crossing", "uncontrolled"), RoadPenalty::Type::UncontrolledJunction},
+    {OsmElement::Tag("crossing", "marked"), RoadPenalty::Type::UncontrolledJunction},
+    // highway=crossing ommitted as often accompanied by traffic_signals
+
+    {OsmElement::Tag("highway", "traffic_signals"), RoadPenalty::Type::ControlledJunction},
+    {OsmElement::Tag("railway", "crossing"), RoadPenalty::Type::ControlledJunction},
+    {OsmElement::Tag("railway", "level_crossing"), RoadPenalty::Type::ControlledJunction},
+};
+
+std::optional<RoadPenalty::Type> GetPenaltyByMapping(OsmElement const & elem)
+{
+  for (auto const & tag : elem.m_tags)
+  {
+    auto const it = kUnifiedPenaltyMapping.find(tag);
+    if (it != kUnifiedPenaltyMapping.cend())
+      return it->second;
+  }
+  return {};
+}
+
+void ReadRoadPenalty(std::string const & penaltyPath, routing::OsmWay2FeaturePoint & way2Feature,
+                     RoadPenaltyByVehicleType & penalties)
+{
+  FileReader reader(penaltyPath);
+  ReaderSource src(reader);
+
+  // Read node penalties grouped by way
+  uint64_t nodeWayCount = ReadPrimitiveFromSource<uint64_t>(src);
+  while (nodeWayCount-- > 0)
+  {
+    uint64_t wayID = ReadPrimitiveFromSource<uint64_t>(src);
+    uint32_t nodeCount = ReadPrimitiveFromSource<uint32_t>(src);
+
+    for (uint32_t i = 0; i < nodeCount; ++i)
+    {
+      uint32_t nodeIdx = ReadPrimitiveFromSource<uint32_t>(src);
+      m2::PointU coord;
+      coord.x = ReadPrimitiveFromSource<uint32_t>(src);
+      coord.y = ReadPrimitiveFromSource<uint32_t>(src);
+      VehicleMask vehicleMask = ReadPrimitiveFromSource<VehicleMask>(src);
+
+      // Read penalty type and derive time based on vehicle type
+      RoadPenalty::Type type;
+      routing::Load(src, type);
+
+      // For each vehicle type, create penalty with vehicle-specific time
+      for (uint8_t vType = 0; vType < static_cast<uint8_t>(VehicleType::Count); ++vType)
+      {
+        if (vehicleMask & (1 << vType))
+        {
+          // Create penalty with time specific to this vehicle type
+          auto vehicleSpecificPenalty = RoadPenalty::Penalty(type, static_cast<VehicleType>(vType));
+
+          // Process this location only once
+          RoadPenalty::PointToPenalty pointToPenalty;
+          way2Feature.ForEachNodeIdx(wayID, nodeIdx, coord, [&](uint32_t featureID, uint32_t nodeIdx)
+          { pointToPenalty[RoadPoint(featureID, nodeIdx)] = vehicleSpecificPenalty; });
+
+          if (!pointToPenalty.empty())
+          {
+            auto existingPenalties = penalties[vType].GetPointToPenalty();
+            existingPenalties.insert(pointToPenalty.begin(), pointToPenalty.end());
+            penalties[vType].SetPointPenalties(std::move(existingPenalties));
+          }
+        }
+      }
+    }
+  }
+}
+}  // namespace
+
+// RoadPenaltyCollector implementation
+RoadPenaltyCollector::RoadPenaltyCollector(string const & filename, IDRInterfacePtr cache)
+  : generator::CollectorInterface(filename)
+  , m_cache(std::move(cache))
+{
+  // Empty - initialization handled in member initializer list
+}
+
+std::shared_ptr<CollectorInterface> RoadPenaltyCollector::Clone(IDRInterfacePtr const & cache) const
+{
+  return std::make_shared<RoadPenaltyCollector>(GetFilename(), cache ? cache : m_cache);
+}
+
+void RoadPenaltyCollector::CollectFeature(feature::FeatureBuilder const & fb, OsmElement const & elem)
+{
+  // Track roads for barrier processing
+  if (elem.IsWay() && routing::IsCarRoad(fb.GetTypes()))
+    m_roads.AddWay(elem);
+
+  // Process only nodes for penalty types
+  if (elem.IsNode())
+  {
+    auto penaltyType = GetPenaltyByMapping(elem);
+    if (penaltyType)
+      m_nodesWithType.Add(elem.m_id, ms::LatLon(elem.m_lat, elem.m_lon), *penaltyType);
+  }
+}
+
+void RoadPenaltyCollector::MergeInto(RoadPenaltyCollector & collector) const
+{
+  m_nodesWithType.MergeInto(collector.m_nodesWithType);
+  m_roads.MergeInto(collector.m_roads);
+}
+
+void RoadPenaltyCollector::Save()
+{
+  auto const fileName = GetFilename();
+  LOG(LINFO, ("Saving road penalty values to", fileName));
+  FileWriter writer(fileName);
+
+  // All vehicles use the same penalty types
+
+  // Group node penalties by way
+  struct NodePenaltyEntry
+  {
+    uint32_t nodeIdx = 0;
+    m2::PointU coord;
+    RoadPenalty::Type type = RoadPenalty::Type::None;
+  };
+
+  std::map<uint64_t, std::vector<NodePenaltyEntry>> penaltiesByWay;
+
+  m_roads.ForEachWayWithIndex([&](uint64_t wayID, std::vector<uint64_t> const & nodes, size_t idx)
+  {
+    std::vector<NodePenaltyEntry> wayNodePenalties;
+
+    for (uint32_t nodeIdx = 0; nodeIdx < nodes.size(); ++nodeIdx)
+    {
+      uint64_t const nodeID = nodes[nodeIdx];
+      auto const * barrierEntry = m_nodesWithType.Find(nodeID);
+      if (barrierEntry == nullptr)
+        continue;
+
+      NodePenaltyEntry entry;
+      entry.nodeIdx = nodeIdx;
+      entry.coord = barrierEntry->m_coord;
+      entry.type = barrierEntry->m_t;
+      wayNodePenalties.push_back(entry);
+    }
+
+    if (!wayNodePenalties.empty())
+      penaltiesByWay[wayID] = std::move(wayNodePenalties);
+  }, m_cache);
+
+  // Write node penalties grouped by way
+  uint64_t const wayCount = penaltiesByWay.size();
+  WriteToSink(writer, wayCount);
+  for (auto const & [wayID, entries] : penaltiesByWay)
+  {
+    WriteToSink(writer, wayID);
+    WriteToSink(writer, static_cast<uint32_t>(entries.size()));
+
+    for (auto const & entry : entries)
+    {
+      WriteToSink(writer, entry.nodeIdx);
+      WriteToSink(writer, entry.coord.x);
+      WriteToSink(writer, entry.coord.y);
+      WriteToSink(writer, kAllVehiclesMask);
+
+      // Store only penalty type (time derived from vehicle type when loading)
+      routing::Save(writer, entry.type);
+    }
+  }
+}
+
+bool BuildRoadPenalty(string const & dataFilePath, string const & roadPenaltyPath,
+                      routing::OsmWay2FeaturePoint & way2feature)
+{
+  LOG(LINFO, ("Generating road penalty info for", dataFilePath));
+
+  try
+  {
+    RoadPenaltyByVehicleType penalties;
+    ReadRoadPenalty(roadPenaltyPath, way2feature, penalties);
+
+    FilesContainerW cont(dataFilePath, FileWriter::OP_WRITE_EXISTING);
+    auto writer = cont.GetWriter(ROAD_PENALTY_FILE_TAG);
+
+    // Write number of vehicle types
+    uint32_t const vehicleTypeCount = penalties.size();
+    WriteToSink(*writer, vehicleTypeCount);
+
+    // Write penalty data for each vehicle type
+    for (size_t i = 0; i < penalties.size(); ++i)
+      RoadPenaltySerializer::Serialize(*writer, penalties[i]);
+
+    return true;
+  }
+  catch (RootException const & ex)
+  {
+    LOG(LWARNING, ("No road penalty created:", ex.Msg()));
+    return false;
+  }
+}
+}  // namespace routing_builder
diff --git a/generator/road_penalty_generator.hpp b/generator/road_penalty_generator.hpp
new file mode 100644
index 000000000..e42dde562
--- /dev/null
+++ b/generator/road_penalty_generator.hpp
@@ -0,0 +1,70 @@
+#pragma once
+
+#include "generator/collector_interface.hpp"
+#include "generator/feature_builder.hpp"
+#include "generator/osm_element.hpp"
+#include "generator/way_nodes_mapper.hpp"
+
+#include "routing/road_penalty.hpp"
+#include "routing/vehicle_mask.hpp"
+
+#include <array>
+#include <map>
+#include <memory>
+#include <set>
+#include <string>
+#include <unordered_map>
+#include <vector>
+
+namespace routing
+{
+class OsmWay2FeaturePoint;
+
+template <class Sink>
+void Save(Sink & sink, RoadPenalty::Type const & type)
+{
+  WriteToSink(sink, static_cast<uint8_t>(type));
+}
+
+template <class Source>
+void Load(Source & src, RoadPenalty::Type & type)
+{
+  uint8_t const res = ReadPrimitiveFromSource<uint8_t>(src);
+  CHECK_LESS(res, static_cast<uint8_t>(RoadPenalty::Type::Count), ());
+  type = static_cast<RoadPenalty::Type>(res);
+}
+}  // namespace routing
+
+namespace routing_builder
+{
+using RoadPenalty = routing::RoadPenalty;
+using VehicleType = routing::VehicleType;
+
+using RoadPenaltyByVehicleType = std::array<RoadPenalty, static_cast<size_t>(VehicleType::Count)>;
+
+class RoadPenaltyCollector : public generator::CollectorInterface
+{
+public:
+  RoadPenaltyCollector(std::string const & filename, IDRInterfacePtr cache);
+
+  std::shared_ptr<CollectorInterface> Clone(IDRInterfacePtr const & cache = {}) const override;
+
+  void CollectFeature(feature::FeatureBuilder const & fb, OsmElement const & elem) override;
+
+  IMPLEMENT_COLLECTOR_IFACE(RoadPenaltyCollector);
+  void MergeInto(RoadPenaltyCollector & collector) const;
+
+protected:
+  void Save() override;
+
+private:
+  IDRInterfacePtr m_cache;
+
+  // Store only penalty types during collection phase
+  generator::WayNodesMapper<RoadPenalty::Type> m_nodesWithType;
+  generator::WaysIDHolder m_roads;
+};
+
+bool BuildRoadPenalty(std::string const & dataFilePath, std::string const & roadPenaltyPath,
+                      routing::OsmWay2FeaturePoint & way2feature);
+}  // namespace routing_builder
diff --git a/generator/routing_helpers.cpp b/generator/routing_helpers.cpp
index dabce7fe2..35d2d801c 100644
--- a/generator/routing_helpers.cpp
+++ b/generator/routing_helpers.cpp
@@ -88,9 +88,16 @@ public:
     {
       auto ft = m_featureGetter.GetFeatureByIndex(featureID);
       CHECK(ft, (featureID));
-      CHECK(ft->GetGeomType() == feature::GeomType::Line, (featureID));
 
-      // Converison should work with the same logic as in WayNodesMapper::EncodePoint.
+      // Skip non-line features (e.g., barriers on area boundaries)
+      if (ft->GetGeomType() != feature::GeomType::Line)
+      {
+        // Use LDEBUG to reduce log spam for features processed multiple times per vehicle type
+        LOG(LDEBUG, ("Skipping non-line feature", featureID, "for node penalty mapping"));
+        continue;
+      }
+
+      // Conversion should work with the same logic as in WayNodesMapper::EncodePoint.
       auto const mercatorPt = PointUToPointD(pt, kPointCoordBits, fullRect);
       double minSquareDist = 1.0E6;
 
diff --git a/generator/translator_country.cpp b/generator/translator_country.cpp
index 442d28459..cd47c9a05 100644
--- a/generator/translator_country.cpp
+++ b/generator/translator_country.cpp
@@ -21,6 +21,7 @@
 // #include "generator/node_mixer.hpp"
 #include "generator/restriction_writer.hpp"
 #include "generator/road_access_generator.hpp"
+#include "generator/road_penalty_generator.hpp"
 
 #include "platform/platform.hpp"
 
@@ -107,6 +108,8 @@ TranslatorCountry::TranslatorCountry(std::shared_ptr<FeatureProcessorInterface>
       info.GetIntermediateFileName(RESTRICTIONS_FILENAME), cache->GetCache()));
   collectors->Append(std::make_shared<routing_builder::RoadAccessCollector>(
       info.GetIntermediateFileName(ROAD_ACCESS_FILENAME), cache->GetCache()));
+  collectors->Append(std::make_shared<routing_builder::RoadPenaltyCollector>(
+      info.GetIntermediateFileName(ROAD_PENALTY_FILENAME), cache->GetCache()));
   collectors->Append(std::make_shared<routing_builder::CameraCollector>(
       info.GetIntermediateFileName(CAMERAS_TO_WAYS_FILENAME), cache->GetCache()));
   collectors->Append(std::make_shared<MiniRoundaboutCollector>(info.GetIntermediateFileName(MINI_ROUNDABOUTS_FILENAME),
diff --git a/generator/way_nodes_mapper.hpp b/generator/way_nodes_mapper.hpp
index 4a3b35563..09e8751bc 100644
--- a/generator/way_nodes_mapper.hpp
+++ b/generator/way_nodes_mapper.hpp
@@ -146,6 +146,13 @@ public:
 
   void MergeInto(WaysMapper & mapper) const { mapper.m_ways.insert(m_ways.begin(), m_ways.end()); }
 
+  template <class Fn>
+  void ForEach(Fn && fn) const
+  {
+    for (auto const & [id, value] : m_ways)
+      fn(id, value);
+  }
+
   template <class Sink>
   void Serialize(Sink & sink) const
   {
diff --git a/libs/geometry/distance_on_sphere.cpp b/libs/geometry/distance_on_sphere.cpp
index 760ded13d..5e97187ee 100644
--- a/libs/geometry/distance_on_sphere.cpp
+++ b/libs/geometry/distance_on_sphere.cpp
@@ -26,4 +26,13 @@ double DistanceOnEarth(LatLon const & ll1, LatLon const & ll2)
 {
   return DistanceOnEarth(ll1.m_lat, ll1.m_lon, ll2.m_lat, ll2.m_lon);
 }
+
+m3::Point<double> ToVector(LatLon const & ll)
+{
+  double const lat = math::DegToRad(ll.m_lat);
+  double const lon = math::DegToRad(ll.m_lon);
+  return {kEarthRadiusMeters * cos(lat) * cos(lon), kEarthRadiusMeters * cos(lat) * sin(lon),
+          kEarthRadiusMeters * sin(lat)};
+}
+
 }  // namespace ms
diff --git a/libs/geometry/distance_on_sphere.hpp b/libs/geometry/distance_on_sphere.hpp
index 48fca4948..88e2c9317 100644
--- a/libs/geometry/distance_on_sphere.hpp
+++ b/libs/geometry/distance_on_sphere.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "geometry/latlon.hpp"
+#include "geometry/point3d.hpp"
 
 // namespace ms - "math on sphere", similar to namespace m2.
 namespace ms
@@ -14,4 +15,5 @@ double DistanceOnSphere(double lat1Deg, double lon1Deg, double lat2Deg, double l
 // lat1, lat2, lon1, lon2 - in degrees.
 double DistanceOnEarth(double lat1Deg, double lon1Deg, double lat2Deg, double lon2Deg);
 double DistanceOnEarth(LatLon const & ll1, LatLon const & ll2);
+m3::Point<double> ToVector(LatLon const & ll);
 }  // namespace ms
diff --git a/libs/geometry/point3d.hpp b/libs/geometry/point3d.hpp
index 1ffc95848..338725504 100644
--- a/libs/geometry/point3d.hpp
+++ b/libs/geometry/point3d.hpp
@@ -14,6 +14,12 @@ class Point
 public:
   Point() = default;
   constexpr Point(T x_, T y_, T z_) : x(x_), y(y_), z(z_) {}
+  Point<T> operator+(Point<T> const & obj) { return {x + obj.x, y + obj.y, z + obj.z}; }
+  Point<T> operator-(Point<T> const & obj) { return {x - obj.x, y - obj.y, z - obj.z}; }
+
+  Point<T> operator*(T const & obj) { return {x * obj, y * obj, z * obj}; }
+
+  Point<T> operator/(T const & obj) { return {x / obj, y / obj, z / obj}; }
 
   T Length() const { return std::sqrt(x * x + y * y + z * z); }
 
diff --git a/libs/indexer/road_shields_parser.cpp b/libs/indexer/road_shields_parser.cpp
index 1ae7e550e..e6e2ac1cd 100644
--- a/libs/indexer/road_shields_parser.cpp
+++ b/libs/indexer/road_shields_parser.cpp
@@ -578,11 +578,11 @@ public:
                                               {"LF.", RoadShieldType::Generic_White},  // Blue font.
                                               {"İK.", RoadShieldType::Generic_White},  // Blue font.
                                                                                        // South Cyprus.
-                                              {"A", RoadShieldType::Generic_Green},  // Yellow font. Hexagon.
-                                              {"B", RoadShieldType::Generic_Blue},   // Yellow font.
-                                              {"E", RoadShieldType::Generic_Blue},   // Yellow font.
-                                              {"F", RoadShieldType::Generic_Blue},   // Yellow font.
-                                              {"U", RoadShieldType::Generic_Blue}})  // Yellow font.
+                                              {"A", RoadShieldType::Generic_Green},    // Yellow font. Hexagon.
+                                              {"B", RoadShieldType::Generic_Blue},     // Yellow font.
+                                              {"E", RoadShieldType::Generic_Blue},     // Yellow font.
+                                              {"F", RoadShieldType::Generic_Blue},     // Yellow font.
+                                              {"U", RoadShieldType::Generic_Blue}})    // Yellow font.
   {}
 };
 
diff --git a/libs/routing/CMakeLists.txt b/libs/routing/CMakeLists.txt
index dfb9603e7..8194471db 100644
--- a/libs/routing/CMakeLists.txt
+++ b/libs/routing/CMakeLists.txt
@@ -113,6 +113,9 @@ set(SRC
   road_access.hpp
   road_access_serialization.cpp
   road_access_serialization.hpp
+  road_penalty.cpp
+  road_penalty.hpp
+  road_penalty_serialization.hpp
   road_graph.cpp
   road_graph.hpp
   road_index.cpp
diff --git a/libs/routing/edge_estimator.cpp b/libs/routing/edge_estimator.cpp
index 628485cd2..1fb3bf2db 100644
--- a/libs/routing/edge_estimator.cpp
+++ b/libs/routing/edge_estimator.cpp
@@ -1,5 +1,4 @@
 #include "routing/edge_estimator.hpp"
-
 #include "routing/geometry.hpp"
 #include "routing/latlon_with_altitude.hpp"
 #include "routing/routing_helpers.hpp"
@@ -10,10 +9,11 @@
 #include "geometry/distance_on_sphere.hpp"
 #include "geometry/point_with_altitude.hpp"
 
-#include "base/assert.hpp"
+#include "coding/csv_reader.hpp"
 
-#include <algorithm>
-#include <unordered_map>
+#include "base/assert.hpp"
+#include "base/logging.hpp"
+#include "platform/platform.hpp"
 
 namespace routing
 {
@@ -166,10 +166,12 @@ double GetCarClimbPenalty(EdgeEstimator::Purpose, double, geometry::Altitude)
 }
 
 // EdgeEstimator -----------------------------------------------------------------------------------
-EdgeEstimator::EdgeEstimator(double maxWeightSpeedKMpH, SpeedKMpH const & offroadSpeedKMpH,
+EdgeEstimator::EdgeEstimator(VehicleType vehicleType, double maxWeightSpeedKMpH, SpeedKMpH const & offroadSpeedKMpH,
                              DataSource * /*dataSourcePtr*/, std::shared_ptr<NumMwmIds> /*numMwmIds*/)
-  : m_maxWeightSpeedMpS(KmphToMps(maxWeightSpeedKMpH))
+  : m_vehicleType(vehicleType)
+  , m_maxWeightSpeedMpS(KmphToMps(maxWeightSpeedKMpH))
   , m_offroadSpeedKMpH(offroadSpeedKMpH)
+
 //, m_dataSourcePtr(dataSourcePtr)
 //, m_numMwmIds(numMwmIds)
 {
@@ -179,6 +181,204 @@ EdgeEstimator::EdgeEstimator(double maxWeightSpeedKMpH, SpeedKMpH const & offroa
 
   if (m_offroadSpeedKMpH.m_eta != kNotUsed)
     CHECK_GREATER_OR_EQUAL(m_maxWeightSpeedMpS, KmphToMps(m_offroadSpeedKMpH.m_eta), ());
+
+  LOG(LINFO, ("Loading turn penalties for vehicle type:", static_cast<int>(vehicleType)));
+
+  struct TurnPenaltyMatrix
+  {
+    int road;
+    VehicleType vehicleType;
+    double penalty;
+  };
+
+  struct TurnPenalty
+  {
+    HighwayType fromRoadType;
+    HighwayType toRoadType;
+    VehicleType vehicleType;
+    double penalty;
+  };
+
+#define N 144
+
+  static auto constexpr kTurnPenaltyMatrix = []
+  {
+    array<TurnPenalty, N> constexpr kTable = {{
+        {HighwayType::HighwayLivingStreet, HighwayType::HighwayLivingStreet, VehicleType::Car, 0.07},
+        {HighwayType::HighwayLivingStreet, HighwayType::HighwayPrimary, VehicleType::Car, 0.09},
+        {HighwayType::HighwayLivingStreet, HighwayType::HighwayPrimaryLink, VehicleType::Car, 0.09},
+        {HighwayType::HighwayLivingStreet, HighwayType::HighwayResidential, VehicleType::Car, 0.07},
+        {HighwayType::HighwayLivingStreet, HighwayType::HighwaySecondary, VehicleType::Car, 0.08},
+        {HighwayType::HighwayLivingStreet, HighwayType::HighwaySecondaryLink, VehicleType::Car, 0.08},
+        {HighwayType::HighwayLivingStreet, HighwayType::HighwayService, VehicleType::Car, 0.07},
+        {HighwayType::HighwayLivingStreet, HighwayType::HighwayTertiary, VehicleType::Car, 0.07},
+        {HighwayType::HighwayLivingStreet, HighwayType::HighwayTertiaryLink, VehicleType::Car, 0.07},
+        {HighwayType::HighwayLivingStreet, HighwayType::HighwayTrunk, VehicleType::Car, 0.09},
+        {HighwayType::HighwayLivingStreet, HighwayType::HighwayTrunkLink, VehicleType::Car, 0.09},
+        {HighwayType::HighwayLivingStreet, HighwayType::HighwayUnclassified, VehicleType::Car, 0.07},
+        {HighwayType::HighwayPrimary, HighwayType::HighwayLivingStreet, VehicleType::Car, 0.11},
+        {HighwayType::HighwayPrimary, HighwayType::HighwayPrimary, VehicleType::Car, 0.06},
+        {HighwayType::HighwayPrimary, HighwayType::HighwayPrimaryLink, VehicleType::Car, 0.06},
+        {HighwayType::HighwayPrimary, HighwayType::HighwayResidential, VehicleType::Car, 0.1},
+        {HighwayType::HighwayPrimary, HighwayType::HighwaySecondary, VehicleType::Car, 0.07},
+        {HighwayType::HighwayPrimary, HighwayType::HighwaySecondaryLink, VehicleType::Car, 0.07},
+        {HighwayType::HighwayPrimary, HighwayType::HighwayService, VehicleType::Car, 0.1},
+        {HighwayType::HighwayPrimary, HighwayType::HighwayTertiary, VehicleType::Car, 0.08},
+        {HighwayType::HighwayPrimary, HighwayType::HighwayTertiaryLink, VehicleType::Car, 0.07},
+        {HighwayType::HighwayPrimary, HighwayType::HighwayTrunk, VehicleType::Car, 0.04},
+        {HighwayType::HighwayPrimary, HighwayType::HighwayTrunkLink, VehicleType::Car, 0.04},
+        {HighwayType::HighwayPrimary, HighwayType::HighwayUnclassified, VehicleType::Car, 0.1},
+        {HighwayType::HighwayPrimaryLink, HighwayType::HighwayLivingStreet, VehicleType::Car, 0.1},
+        {HighwayType::HighwayPrimaryLink, HighwayType::HighwayPrimary, VehicleType::Car, 0.06},
+        {HighwayType::HighwayPrimaryLink, HighwayType::HighwayPrimaryLink, VehicleType::Car, 0.06},
+        {HighwayType::HighwayPrimaryLink, HighwayType::HighwayResidential, VehicleType::Car, 0.1},
+        {HighwayType::HighwayPrimaryLink, HighwayType::HighwaySecondary, VehicleType::Car, 0.06},
+        {HighwayType::HighwayPrimaryLink, HighwayType::HighwaySecondaryLink, VehicleType::Car, 0.06},
+        {HighwayType::HighwayPrimaryLink, HighwayType::HighwayService, VehicleType::Car, 0.09},
+        {HighwayType::HighwayPrimaryLink, HighwayType::HighwayTertiary, VehicleType::Car, 0.08},
+        {HighwayType::HighwayPrimaryLink, HighwayType::HighwayTertiaryLink, VehicleType::Car, 0.08},
+        {HighwayType::HighwayPrimaryLink, HighwayType::HighwayTrunk, VehicleType::Car, 0.07},
+        {HighwayType::HighwayPrimaryLink, HighwayType::HighwayTrunkLink, VehicleType::Car, 0.07},
+        {HighwayType::HighwayPrimaryLink, HighwayType::HighwayUnclassified, VehicleType::Car, 0.1},
+        {HighwayType::HighwayResidential, HighwayType::HighwayLivingStreet, VehicleType::Car, 0.07},
+        {HighwayType::HighwayResidential, HighwayType::HighwayPrimary, VehicleType::Car, 0.09},
+        {HighwayType::HighwayResidential, HighwayType::HighwayPrimaryLink, VehicleType::Car, 0.09},
+        {HighwayType::HighwayResidential, HighwayType::HighwayResidential, VehicleType::Car, 0.08},
+        {HighwayType::HighwayResidential, HighwayType::HighwaySecondary, VehicleType::Car, 0.08},
+        {HighwayType::HighwayResidential, HighwayType::HighwaySecondaryLink, VehicleType::Car, 0.08},
+        {HighwayType::HighwayResidential, HighwayType::HighwayService, VehicleType::Car, 0.07},
+        {HighwayType::HighwayResidential, HighwayType::HighwayTertiary, VehicleType::Car, 0.07},
+        {HighwayType::HighwayResidential, HighwayType::HighwayTertiaryLink, VehicleType::Car, 0.07},
+        {HighwayType::HighwayResidential, HighwayType::HighwayTrunk, VehicleType::Car, 0.09},
+        {HighwayType::HighwayResidential, HighwayType::HighwayTrunkLink, VehicleType::Car, 0.09},
+        {HighwayType::HighwayResidential, HighwayType::HighwayUnclassified, VehicleType::Car, 0.07},
+        {HighwayType::HighwaySecondary, HighwayType::HighwayLivingStreet, VehicleType::Car, 0.1},
+        {HighwayType::HighwaySecondary, HighwayType::HighwayPrimary, VehicleType::Car, 0.07},
+        {HighwayType::HighwaySecondary, HighwayType::HighwayPrimaryLink, VehicleType::Car, 0.07},
+        {HighwayType::HighwaySecondary, HighwayType::HighwayResidential, VehicleType::Car, 0.1},
+        {HighwayType::HighwaySecondary, HighwayType::HighwaySecondary, VehicleType::Car, 0.08},
+        {HighwayType::HighwaySecondary, HighwayType::HighwaySecondaryLink, VehicleType::Car, 0.08},
+        {HighwayType::HighwaySecondary, HighwayType::HighwayService, VehicleType::Car, 0.08},
+        {HighwayType::HighwaySecondary, HighwayType::HighwayTertiary, VehicleType::Car, 0.07},
+        {HighwayType::HighwaySecondary, HighwayType::HighwayTertiaryLink, VehicleType::Car, 0.07},
+        {HighwayType::HighwaySecondary, HighwayType::HighwayTrunk, VehicleType::Car, 0.07},
+        {HighwayType::HighwaySecondary, HighwayType::HighwayTrunkLink, VehicleType::Car, 0.06},
+        {HighwayType::HighwaySecondary, HighwayType::HighwayUnclassified, VehicleType::Car, 0.08},
+        {HighwayType::HighwaySecondaryLink, HighwayType::HighwayLivingStreet, VehicleType::Car, 0.07},
+        {HighwayType::HighwaySecondaryLink, HighwayType::HighwayPrimary, VehicleType::Car, 0.07},
+        {HighwayType::HighwaySecondaryLink, HighwayType::HighwayPrimaryLink, VehicleType::Car, 0.07},
+        {HighwayType::HighwaySecondaryLink, HighwayType::HighwayResidential, VehicleType::Car, 0.07},
+        {HighwayType::HighwaySecondaryLink, HighwayType::HighwaySecondary, VehicleType::Car, 0.05},
+        {HighwayType::HighwaySecondaryLink, HighwayType::HighwaySecondaryLink, VehicleType::Car, 0.05},
+        {HighwayType::HighwaySecondaryLink, HighwayType::HighwayService, VehicleType::Car, 0.06},
+        {HighwayType::HighwaySecondaryLink, HighwayType::HighwayTertiary, VehicleType::Car, 0.05},
+        {HighwayType::HighwaySecondaryLink, HighwayType::HighwayTertiaryLink, VehicleType::Car, 0.05},
+        {HighwayType::HighwaySecondaryLink, HighwayType::HighwayTrunk, VehicleType::Car, 0.08},
+        {HighwayType::HighwaySecondaryLink, HighwayType::HighwayTrunkLink, VehicleType::Car, 0.08},
+        {HighwayType::HighwaySecondaryLink, HighwayType::HighwayUnclassified, VehicleType::Car, 0.06},
+        {HighwayType::HighwayService, HighwayType::HighwayLivingStreet, VehicleType::Car, 0.07},
+        {HighwayType::HighwayService, HighwayType::HighwayPrimary, VehicleType::Car, 0.09},
+        {HighwayType::HighwayService, HighwayType::HighwayPrimaryLink, VehicleType::Car, 0.09},
+        {HighwayType::HighwayService, HighwayType::HighwayResidential, VehicleType::Car, 0.07},
+        {HighwayType::HighwayService, HighwayType::HighwaySecondary, VehicleType::Car, 0.07},
+        {HighwayType::HighwayService, HighwayType::HighwaySecondaryLink, VehicleType::Car, 0.07},
+        {HighwayType::HighwayService, HighwayType::HighwayService, VehicleType::Car, 0.07},
+        {HighwayType::HighwayService, HighwayType::HighwayTertiary, VehicleType::Car, 0.07},
+        {HighwayType::HighwayService, HighwayType::HighwayTertiaryLink, VehicleType::Car, 0.07},
+        {HighwayType::HighwayService, HighwayType::HighwayTrunk, VehicleType::Car, 0.07},
+        {HighwayType::HighwayService, HighwayType::HighwayTrunkLink, VehicleType::Car, 0.07},
+        {HighwayType::HighwayService, HighwayType::HighwayUnclassified, VehicleType::Car, 0.07},
+        {HighwayType::HighwayTertiary, HighwayType::HighwayLivingStreet, VehicleType::Car, 0.08},
+        {HighwayType::HighwayTertiary, HighwayType::HighwayPrimary, VehicleType::Car, 0.07},
+        {HighwayType::HighwayTertiary, HighwayType::HighwayPrimaryLink, VehicleType::Car, 0.07},
+        {HighwayType::HighwayTertiary, HighwayType::HighwayResidential, VehicleType::Car, 0.08},
+        {HighwayType::HighwayTertiary, HighwayType::HighwaySecondary, VehicleType::Car, 0.07},
+        {HighwayType::HighwayTertiary, HighwayType::HighwaySecondaryLink, VehicleType::Car, 0.07},
+        {HighwayType::HighwayTertiary, HighwayType::HighwayService, VehicleType::Car, 0.07},
+        {HighwayType::HighwayTertiary, HighwayType::HighwayTertiary, VehicleType::Car, 0.07},
+        {HighwayType::HighwayTertiary, HighwayType::HighwayTertiaryLink, VehicleType::Car, 0.07},
+        {HighwayType::HighwayTertiary, HighwayType::HighwayTrunk, VehicleType::Car, 0.07},
+        {HighwayType::HighwayTertiary, HighwayType::HighwayTrunkLink, VehicleType::Car, 0.07},
+        {HighwayType::HighwayTertiary, HighwayType::HighwayUnclassified, VehicleType::Car, 0.08},
+        {HighwayType::HighwayTertiaryLink, HighwayType::HighwayLivingStreet, VehicleType::Car, 0.07},
+        {HighwayType::HighwayTertiaryLink, HighwayType::HighwayPrimary, VehicleType::Car, 0.07},
+        {HighwayType::HighwayTertiaryLink, HighwayType::HighwayPrimaryLink, VehicleType::Car, 0.07},
+        {HighwayType::HighwayTertiaryLink, HighwayType::HighwayResidential, VehicleType::Car, 0.07},
+        {HighwayType::HighwayTertiaryLink, HighwayType::HighwaySecondary, VehicleType::Car, 0.07},
+        {HighwayType::HighwayTertiaryLink, HighwayType::HighwaySecondaryLink, VehicleType::Car, 0.07},
+        {HighwayType::HighwayTertiaryLink, HighwayType::HighwayService, VehicleType::Car, 0.07},
+        {HighwayType::HighwayTertiaryLink, HighwayType::HighwayTertiary, VehicleType::Car, 0.07},
+        {HighwayType::HighwayTertiaryLink, HighwayType::HighwayTertiaryLink, VehicleType::Car, 0.07},
+        {HighwayType::HighwayTertiaryLink, HighwayType::HighwayTrunk, VehicleType::Car, 0.07},
+        {HighwayType::HighwayTertiaryLink, HighwayType::HighwayTrunkLink, VehicleType::Car, 0.07},
+        {HighwayType::HighwayTertiaryLink, HighwayType::HighwayUnclassified, VehicleType::Car, 0.07},
+        {HighwayType::HighwayTrunk, HighwayType::HighwayLivingStreet, VehicleType::Car, 0.1},
+        {HighwayType::HighwayTrunk, HighwayType::HighwayPrimary, VehicleType::Car, 0.05},
+        {HighwayType::HighwayTrunk, HighwayType::HighwayPrimaryLink, VehicleType::Car, 0.03},
+        {HighwayType::HighwayTrunk, HighwayType::HighwayResidential, VehicleType::Car, 0.09},
+        {HighwayType::HighwayTrunk, HighwayType::HighwaySecondary, VehicleType::Car, 0.08},
+        {HighwayType::HighwayTrunk, HighwayType::HighwaySecondaryLink, VehicleType::Car, 0.08},
+        {HighwayType::HighwayTrunk, HighwayType::HighwayService, VehicleType::Car, 0.08},
+        {HighwayType::HighwayTrunk, HighwayType::HighwayTertiary, VehicleType::Car, 0.08},
+        {HighwayType::HighwayTrunk, HighwayType::HighwayTertiaryLink, VehicleType::Car, 0.08},
+        {HighwayType::HighwayTrunk, HighwayType::HighwayTrunk, VehicleType::Car, 0.01},
+        {HighwayType::HighwayTrunk, HighwayType::HighwayTrunkLink, VehicleType::Car, 0.01},
+        {HighwayType::HighwayTrunk, HighwayType::HighwayUnclassified, VehicleType::Car, 0.08},
+        {HighwayType::HighwayTrunkLink, HighwayType::HighwayLivingStreet, VehicleType::Car, 0.11},
+        {HighwayType::HighwayTrunkLink, HighwayType::HighwayPrimary, VehicleType::Car, 0.04},
+        {HighwayType::HighwayTrunkLink, HighwayType::HighwayPrimaryLink, VehicleType::Car, 0.04},
+        {HighwayType::HighwayTrunkLink, HighwayType::HighwayResidential, VehicleType::Car, 0.1},
+        {HighwayType::HighwayTrunkLink, HighwayType::HighwaySecondary, VehicleType::Car, 0.04},
+        {HighwayType::HighwayTrunkLink, HighwayType::HighwaySecondaryLink, VehicleType::Car, 0.04},
+        {HighwayType::HighwayTrunkLink, HighwayType::HighwayService, VehicleType::Car, 0.07},
+        {HighwayType::HighwayTrunkLink, HighwayType::HighwayTertiary, VehicleType::Car, 0.06},
+        {HighwayType::HighwayTrunkLink, HighwayType::HighwayTertiaryLink, VehicleType::Car, 0.06},
+        {HighwayType::HighwayTrunkLink, HighwayType::HighwayTrunk, VehicleType::Car, 0.07},
+        {HighwayType::HighwayTrunkLink, HighwayType::HighwayTrunkLink, VehicleType::Car, 0.02},
+        {HighwayType::HighwayTrunkLink, HighwayType::HighwayUnclassified, VehicleType::Car, 0.1},
+        {HighwayType::HighwayUnclassified, HighwayType::HighwayLivingStreet, VehicleType::Car, 0.07},
+        {HighwayType::HighwayUnclassified, HighwayType::HighwayPrimary, VehicleType::Car, 0.09},
+        {HighwayType::HighwayUnclassified, HighwayType::HighwayPrimaryLink, VehicleType::Car, 0.09},
+        {HighwayType::HighwayUnclassified, HighwayType::HighwayResidential, VehicleType::Car, 0.07},
+        {HighwayType::HighwayUnclassified, HighwayType::HighwaySecondary, VehicleType::Car, 0.08},
+        {HighwayType::HighwayUnclassified, HighwayType::HighwaySecondaryLink, VehicleType::Car, 0.08},
+        {HighwayType::HighwayUnclassified, HighwayType::HighwayService, VehicleType::Car, 0.08},
+        {HighwayType::HighwayUnclassified, HighwayType::HighwayTertiary, VehicleType::Car, 0.07},
+        {HighwayType::HighwayUnclassified, HighwayType::HighwayTertiaryLink, VehicleType::Car, 0.07},
+        {HighwayType::HighwayUnclassified, HighwayType::HighwayTrunk, VehicleType::Car, 0.09},
+        {HighwayType::HighwayUnclassified, HighwayType::HighwayTrunkLink, VehicleType::Car, 0.09},
+        {HighwayType::HighwayUnclassified, HighwayType::HighwayUnclassified, VehicleType::Car, 0.08},
+    }};
+
+    array<TurnPenaltyMatrix, N> result{};
+
+    for (size_t i = 0; i < N; ++i)
+      result[i] = {static_cast<int>(kTable[i].fromRoadType) * 65535 + static_cast<int>(kTable[i].toRoadType),
+                   kTable[i].vehicleType, kTable[i].penalty};
+
+    return result;
+  }();
+
+  double totalPenalty = 0;
+
+  for (TurnPenaltyMatrix const & row : kTurnPenaltyMatrix)
+  {
+    if (row.vehicleType != vehicleType)
+      continue;
+
+    m_turnPenaltyMap[row.road] += row.penalty;
+    totalPenalty += row.penalty;
+  }
+
+  if (!m_turnPenaltyMap.empty())
+  {
+    m_defaultPenalty = totalPenalty / m_turnPenaltyMap.size();
+    LOG(LINFO, ("Loaded", m_turnPenaltyMap.size(), "turn penalties with default:", m_defaultPenalty));
+  }
+  else
+  {
+    LOG(LWARNING, ("No turn penalties loaded for vehicle type:", static_cast<int>(vehicleType)));
+  }
 }
 
 double EdgeEstimator::CalcHeuristic(ms::LatLon const & from, ms::LatLon const & to) const
@@ -265,11 +465,18 @@ class PedestrianEstimator final : public EdgeEstimator
 {
 public:
   PedestrianEstimator(double maxWeightSpeedKMpH, SpeedKMpH const & offroadSpeedKMpH)
-    : EdgeEstimator(maxWeightSpeedKMpH, offroadSpeedKMpH)
+    : EdgeEstimator(VehicleType::Pedestrian, maxWeightSpeedKMpH, offroadSpeedKMpH)
   {}
 
   // EdgeEstimator overrides:
   double GetUTurnPenalty(Purpose /* purpose */) const override { return 0.0 /* seconds */; }
+
+  double GetTurnPenalty(Purpose purpose, double angle, RoadGeometry const & from_road, RoadGeometry const & to_road,
+                        bool is_left_hand_traffic = false) const override
+  {
+    return 0;
+  }
+
   double GetFerryLandingPenalty(Purpose purpose) const override
   {
     switch (purpose)
@@ -293,11 +500,18 @@ class BicycleEstimator final : public EdgeEstimator
 {
 public:
   BicycleEstimator(double maxWeightSpeedKMpH, SpeedKMpH const & offroadSpeedKMpH)
-    : EdgeEstimator(maxWeightSpeedKMpH, offroadSpeedKMpH)
+    : EdgeEstimator(VehicleType::Bicycle, maxWeightSpeedKMpH, offroadSpeedKMpH)
   {}
 
   // EdgeEstimator overrides:
   double GetUTurnPenalty(Purpose /* purpose */) const override { return 20.0 /* seconds */; }
+
+  double GetTurnPenalty(Purpose purpose, double angle, RoadGeometry const & from_road, RoadGeometry const & to_road,
+                        bool is_left_hand_traffic = false) const override
+  {
+    return 0;
+  }
+
   double GetFerryLandingPenalty(Purpose purpose) const override
   {
     switch (purpose)
@@ -349,20 +563,15 @@ class CarEstimator final : public EdgeEstimator
 public:
   CarEstimator(DataSource * dataSourcePtr, std::shared_ptr<NumMwmIds> numMwmIds, shared_ptr<TrafficStash> trafficStash,
                double maxWeightSpeedKMpH, SpeedKMpH const & offroadSpeedKMpH)
-    : EdgeEstimator(maxWeightSpeedKMpH, offroadSpeedKMpH, dataSourcePtr, numMwmIds)
+    : EdgeEstimator(VehicleType::Car, maxWeightSpeedKMpH, offroadSpeedKMpH, dataSourcePtr, numMwmIds)
     , m_trafficStash(std::move(trafficStash))
   {}
 
   // EdgeEstimator overrides:
   double CalcSegmentWeight(Segment const & segment, RoadGeometry const & road, Purpose purpose) const override;
-  double GetUTurnPenalty(Purpose /* purpose */) const override
-  {
-    // Adds 2 minutes penalty for U-turn. The value is quite arbitrary
-    // and needs to be properly selected after a number of real-world
-    // experiments.
-    return 2 * 60;  // seconds
-  }
-
+  double GetUTurnPenalty(Purpose /* purpose */) const override;
+  double GetTurnPenalty(Purpose purpose, double angle, RoadGeometry const & from_road, RoadGeometry const & to_road,
+                        bool is_left_hand_traffic = false) const override;
   double GetFerryLandingPenalty(Purpose purpose) const override
   {
     switch (purpose)
@@ -374,9 +583,47 @@ public:
   }
 
 private:
-  shared_ptr<TrafficStash> m_trafficStash;
+  std::shared_ptr<TrafficStash> m_trafficStash;
 };
 
+double CarEstimator::GetUTurnPenalty(Purpose /* purpose */) const
+{
+  // Adds 2 minutes penalty for U-turn. The value is quite arbitrary
+  // and needs to be properly selected after a number of real-world
+  // experiments.
+  return 2 * 60;  // seconds
+}
+
+double CarEstimator::GetTurnPenalty(Purpose purpose, double angle, RoadGeometry const & from_road,
+                                    RoadGeometry const & to_road, bool is_left_hand_traffic) const
+{
+  auto penalty = m_defaultPenalty;
+
+  if (from_road.GetHighwayType().has_value() && to_road.GetHighwayType().has_value())
+  {
+    int const from_road_idx = static_cast<int>(from_road.GetHighwayType().value());
+    int const to_road_idx = static_cast<int>(to_road.GetHighwayType().value());
+    auto const pen = m_turnPenaltyMap.find(from_road_idx * 65535 + to_road_idx);
+    if (pen != m_turnPenaltyMap.end())
+      penalty = pen->second;
+  }
+
+  // Determine if turn crosses traffic based on driving side
+  // @TODO We should really account for oneway roads etc.
+
+  bool turn_crosses_traffic;
+  if (is_left_hand_traffic)
+    turn_crosses_traffic = angle < 0;
+  else
+    turn_crosses_traffic = angle > 0;
+
+  // Twice as long to turn across traffic than not to
+  auto const extra_penalty = turn_crosses_traffic ? 2.0 : 1.0;
+  auto const result = fabs(angle) * penalty * extra_penalty;
+
+  return result;
+}
+
 double CarEstimator::CalcSegmentWeight(Segment const & segment, RoadGeometry const & road, Purpose purpose) const
 {
   double result = road.GetDistance(segment.GetSegmentIdx()) / GetSpeedMpS(purpose, segment, road);
diff --git a/libs/routing/edge_estimator.hpp b/libs/routing/edge_estimator.hpp
index 4dedcd954..98a66169a 100644
--- a/libs/routing/edge_estimator.hpp
+++ b/libs/routing/edge_estimator.hpp
@@ -10,6 +10,7 @@
 #include "geometry/point_with_altitude.hpp"
 
 #include <memory>
+#include <unordered_map>
 
 class DataSource;
 
@@ -27,8 +28,8 @@ public:
     ETA
   };
 
-  EdgeEstimator(double maxWeightSpeedKMpH, SpeedKMpH const & offroadSpeedKMpH, DataSource * dataSourcePtr = nullptr,
-                std::shared_ptr<NumMwmIds> numMwmIds = nullptr);
+  EdgeEstimator(VehicleType vehicleType, double maxWeightSpeedKMpH, SpeedKMpH const & offroadSpeedKMpH,
+                DataSource * dataSourcePtr = nullptr, std::shared_ptr<NumMwmIds> numMwmIds = nullptr);
   virtual ~EdgeEstimator() = default;
 
   double CalcHeuristic(ms::LatLon const & from, ms::LatLon const & to) const;
@@ -47,6 +48,8 @@ public:
 
   virtual double CalcSegmentWeight(Segment const & segment, RoadGeometry const & road, Purpose purpose) const = 0;
   virtual double GetUTurnPenalty(Purpose purpose) const = 0;
+  virtual double GetTurnPenalty(Purpose purpose, double angle, RoadGeometry const & from_road,
+                                RoadGeometry const & to_road, bool is_left_hand_traffic = false) const = 0;
   virtual double GetFerryLandingPenalty(Purpose purpose) const = 0;
 
   static std::shared_ptr<EdgeEstimator> Create(VehicleType vehicleType, double maxWeighSpeedKMpH,
@@ -58,6 +61,11 @@ public:
                                                std::shared_ptr<TrafficStash> trafficStash, DataSource * dataSourcePtr,
                                                std::shared_ptr<NumMwmIds> numMwmIds);
 
+protected:
+  VehicleType const m_vehicleType;
+  double m_defaultPenalty = 0.0;
+  std::unordered_map<int, double> m_turnPenaltyMap;
+
 private:
   double const m_maxWeightSpeedMpS;
   SpeedKMpH const m_offroadSpeedKMpH;
diff --git a/libs/routing/index_graph.cpp b/libs/routing/index_graph.cpp
index eff85d3ba..a2de29691 100644
--- a/libs/routing/index_graph.cpp
+++ b/libs/routing/index_graph.cpp
@@ -11,9 +11,9 @@
 #include "base/exception.hpp"
 #include "base/timer.hpp"
 
+#include "geometry/distance_on_sphere.hpp"
+
 #include <algorithm>
-#include <cstdlib>
-#include <iterator>
 #include <limits>
 #include <utility>
 
@@ -34,13 +34,22 @@ bool IsBoarding(bool prevIsFerry, bool nextIsFerry)
 }
 
 IndexGraph::IndexGraph(shared_ptr<Geometry> geometry, shared_ptr<EdgeEstimator> estimator,
-                       RoutingOptions routingOptions)
+                       RoutingOptions routingOptions, feature::RegionData const * regionData)
   : m_geometry(std::move(geometry))
   , m_estimator(std::move(estimator))
   , m_avoidRoutingOptions(routingOptions)
 {
   CHECK(m_geometry, ());
   CHECK(m_estimator, ());
+  if (regionData)
+  {
+    auto const driving_side = regionData->Get(feature::RegionData::RD_DRIVING);
+    m_isLeftHandTraffic = (driving_side == "l");
+  }
+  else
+  {
+    m_isLeftHandTraffic = false;
+  }
 }
 
 bool IndexGraph::IsJoint(RoadPoint const & roadPoint) const
@@ -229,6 +238,11 @@ void IndexGraph::SetRoadAccess(RoadAccess && roadAccess)
   m_roadAccess.SetCurrentTimeGetter(m_currentTimeGetter);
 }
 
+void IndexGraph::SetRoadPenalty(RoadPenalty && roadPenalty)
+{
+  m_roadPenalty = std::move(roadPenalty);
+}
+
 void IndexGraph::GetNeighboringEdges(astar::VertexData<Segment, RouteWeight> const & fromVertexData,
                                      RoadPoint const & rp, bool isOutgoing, bool useRoutingOptions,
                                      SegmentEdgeListT & edges, Parents<Segment> const & parents,
@@ -340,7 +354,7 @@ void IndexGraph::ReconstructJointSegment(astar::VertexData<JointSegment, RouteWe
     do
     {
       // This is optimization: we calculate accesses of road points before calculating weight of
-      // segments between these road points. Because of that we make less calculations when some
+      // segments between these road points. Because of that we make fewer calculations when some
       // points have RoadAccess::Type::No.
       // And using |weightTimeToParent| is not fair in fact, because we should calculate weight
       // until this |rp|. But we assume that segments have small length and inaccuracy will not
@@ -456,6 +470,12 @@ RouteWeight IndexGraph::GetPenalties(EdgeEstimator::Purpose purpose, Segment con
   auto const rp = u.GetRoadPoint(true /* front */);
   auto const [rpAccessType, rpConfidence] =
       prevWeight ? m_roadAccess.GetAccess(rp, *prevWeight) : m_roadAccess.GetAccessWithoutConditional(rp);
+  // Get penalty from new penalty system if MWM supports it
+  auto penalty = m_roadPenalty.GetPenalty(rp);
+  uint16_t penaltyTime = 0;
+  if (penalty)
+    penaltyTime = penalty->m_timeSeconds;
+
   switch (rpConfidence)
   {
   case RoadAccess::Confidence::Sure:
@@ -478,7 +498,7 @@ RouteWeight IndexGraph::GetPenalties(EdgeEstimator::Purpose purpose, Segment con
   if (IsBoarding(fromPenaltyData.m_isFerry, toPenaltyData.m_isFerry))
     weightPenalty += m_estimator->GetFerryLandingPenalty(purpose);
 
-  return {weightPenalty /* weight */, passThroughPenalty, accessPenalty, accessConditionalPenalties,
+  return {penaltyTime + weightPenalty /* weight */, passThroughPenalty, accessPenalty, accessConditionalPenalties,
           0.0 /* transitTime */};
 }
 
@@ -516,12 +536,30 @@ RouteWeight IndexGraph::CalculateEdgeWeight(EdgeEstimator::Purpose purpose, bool
                                             Segment const & to,
                                             std::optional<RouteWeight const> const & prevWeight) const
 {
-  auto const & segment = isOutgoing ? to : from;
-  auto const & road = GetRoadGeometry(segment.GetFeatureId());
-
-  auto const weight = RouteWeight(m_estimator->CalcSegmentWeight(segment, road, purpose));
+  auto const & to_segment = isOutgoing ? to : from;
+  auto const & from_segment = isOutgoing ? from : to;
+  auto const & to_road = GetRoadGeometry(to_segment.GetFeatureId());
+  auto const weight = RouteWeight(m_estimator->CalcSegmentWeight(to_segment, to_road, purpose));
   auto const penalties = GetPenalties(purpose, isOutgoing ? from : to, isOutgoing ? to : from, prevWeight);
+  auto const turn_penalty = getTurnPenalty(purpose, from_segment, to_segment);
+  return weight + penalties + turn_penalty;
+}
 
-  return weight + penalties;
+RouteWeight IndexGraph::getTurnPenalty(EdgeEstimator::Purpose purpose, Segment const & from, Segment const & to) const
+{
+  if (from.GetFeatureId() == to.GetFeatureId())
+    return {0, 0, 0, 0, 0};
+  auto const & to_road = GetRoadGeometry(to.GetFeatureId());
+  auto const & from_road = GetRoadGeometry(from.GetFeatureId());
+  auto v1 = ms::ToVector(GetPoint(from, true)) - ms::ToVector(GetPoint(from, false));
+  auto v2 = ms::ToVector(GetPoint(to, true)) - ms::ToVector(GetPoint(to, false));
+  auto const dotLen = v1.Length() * v2.Length();
+  if (dotLen == 0)
+    return {0, 0, 0, 0, 0};
+  auto normal = ms::ToVector(GetPoint(from, true)) + ms::ToVector(GetPoint(to, false));
+  normal = normal / normal.Length();
+  auto const signed_angle =
+      math::RadToDeg(atan2(m3::DotProduct(m3::CrossProduct(v1, v2), normal), m3::DotProduct(v1, v2)));
+  return {m_estimator->GetTurnPenalty(purpose, signed_angle, from_road, to_road, m_isLeftHandTraffic), 0, 0, 0, 0};
 }
 }  // namespace routing
diff --git a/libs/routing/index_graph.hpp b/libs/routing/index_graph.hpp
index b065d9bcb..881956d63 100644
--- a/libs/routing/index_graph.hpp
+++ b/libs/routing/index_graph.hpp
@@ -11,10 +11,13 @@
 #include "routing/restrictions_serialization.hpp"
 #include "routing/road_access.hpp"
 #include "routing/road_index.hpp"
+#include "routing/road_penalty.hpp"
 #include "routing/road_point.hpp"
 #include "routing/routing_options.hpp"
 #include "routing/segment.hpp"
 
+#include "indexer/feature_meta.hpp"
+
 #include "geometry/point2d.hpp"
 
 #include <memory>
@@ -49,7 +52,7 @@ public:
 
   IndexGraph() = default;
   IndexGraph(std::shared_ptr<Geometry> geometry, std::shared_ptr<EdgeEstimator> estimator,
-             RoutingOptions routingOptions = RoutingOptions());
+             RoutingOptions routingOptions = RoutingOptions(), feature::RegionData const * regionData = nullptr);
 
   // Put outgoing (or ingoing) egdes for segment to the 'edges' vector.
   void GetEdgeList(astar::VertexData<Segment, RouteWeight> const & vertexData, bool isOutgoing, bool useRoutingOptions,
@@ -89,6 +92,7 @@ public:
   void SetRestrictions(RestrictionVec && restrictions);
   void SetUTurnRestrictions(std::vector<RestrictionUTurn> && noUTurnRestrictions);
   void SetRoadAccess(RoadAccess && roadAccess);
+  void SetRoadPenalty(RoadPenalty && roadPenalty);
 
   void PushFromSerializer(Joint::Id jointId, RoadPoint const & rp) { m_roadIndex.PushFromSerializer(jointId, rp); }
 
@@ -186,10 +190,8 @@ private:
   std::shared_ptr<EdgeEstimator> m_estimator;
   RoadIndex m_roadIndex;
   JointIndex m_jointIndex;
-
   Restrictions m_restrictionsForward;
   Restrictions m_restrictionsBackward;
-
   // u_turn can be in both sides of feature.
   struct UTurnEnding
   {
@@ -202,11 +204,13 @@ private:
   // If m_noUTurnRestrictions.count(featureId) == 0, that means, that there are no any
   // no_u_turn restriction at the feature with id = featureId.
   std::unordered_map<uint32_t, UTurnEnding> m_noUTurnRestrictions;
-
   RoadAccess m_roadAccess;
+  RoadPenalty m_roadPenalty;
   RoutingOptions m_avoidRoutingOptions;
+  bool m_isLeftHandTraffic;
 
   std::function<time_t()> m_currentTimeGetter = []() { return GetCurrentTimestamp(); };
+  RouteWeight getTurnPenalty(EdgeEstimator::Purpose purpose, Segment const & from, Segment const & to) const;
 };
 
 template <typename AccessPositionType>
diff --git a/libs/routing/index_graph_loader.cpp b/libs/routing/index_graph_loader.cpp
index 87210cdf5..c342bae62 100644
--- a/libs/routing/index_graph_loader.cpp
+++ b/libs/routing/index_graph_loader.cpp
@@ -5,6 +5,8 @@
 #include "routing/restriction_loader.hpp"
 #include "routing/road_access.hpp"
 #include "routing/road_access_serialization.hpp"
+#include "routing/road_penalty.hpp"
+#include "routing/road_penalty_serialization.hpp"
 #include "routing/route.hpp"
 #include "routing/speed_camera_ser_des.hpp"
 
@@ -138,7 +140,7 @@ IndexGraphLoaderImpl::GraphPtrT IndexGraphLoaderImpl::CreateIndexGraph(NumMwmId
       geometry = make_shared<Geometry>(GeometryLoader::Create(handle, std::move(vehicleModel), m_loadAltitudes));
     }
 
-    auto graph = make_unique<IndexGraph>(geometry, m_estimator, m_avoidRoutingOptions);
+    auto graph = make_unique<IndexGraph>(geometry, m_estimator, m_avoidRoutingOptions, &value->GetRegionData());
     graph->SetCurrentTimeGetter(m_currentTimeGetter);
     DeserializeIndexGraph(*value, m_vehicleType, *graph);
 
@@ -209,6 +211,40 @@ bool ReadRoadAccessFromMwm(MwmValue const & mwmValue, VehicleType vehicleType, R
   return false;
 }
 
+bool ReadRoadPenaltyFromMwm(MwmValue const & mwmValue, VehicleType vehicleType, RoadPenalty & roadPenalty)
+{
+  try
+  {
+    auto const reader = mwmValue.m_cont.GetReader(ROAD_PENALTY_FILE_TAG);
+    ReaderSource src(reader);
+
+    // Read number of vehicle types
+    uint32_t numVehicleTypes = ReadPrimitiveFromSource<uint32_t>(src);
+    CHECK_EQUAL(numVehicleTypes, static_cast<uint32_t>(VehicleType::Count), ());
+
+    // Skip to the correct vehicle type
+    for (uint32_t i = 0; i < static_cast<uint32_t>(vehicleType); ++i)
+    {
+      RoadPenalty dummy;
+      RoadPenaltySerializer::Deserialize(src, dummy, static_cast<VehicleType>(i));
+    }
+
+    // Read the penalty data for this vehicle type
+    RoadPenaltySerializer::Deserialize(src, roadPenalty, vehicleType);
+    return true;
+  }
+  catch (Reader::OpenException const &)
+  {
+    // This is expected for older mwm files - not an error
+    LOG(LDEBUG, (ROAD_PENALTY_FILE_TAG, "section not found - using legacy penalty system"));
+  }
+  catch (Reader::Exception const & e)
+  {
+    LOG(LERROR, ("Error while reading", ROAD_PENALTY_FILE_TAG, "section.", e.Msg()));
+  }
+  return false;
+}
+
 // static
 unique_ptr<IndexGraphLoader> IndexGraphLoader::Create(VehicleType vehicleType, bool loadAltitudes,
                                                       shared_ptr<VehicleModelFactoryInterface> vehicleModelFactory,
@@ -244,6 +280,10 @@ void DeserializeIndexGraph(MwmValue const & mwmValue, VehicleType vehicleType, I
   RoadAccess roadAccess;
   if (ReadRoadAccessFromMwm(mwmValue, vehicleType, roadAccess))
     graph.SetRoadAccess(std::move(roadAccess));
+
+  RoadPenalty roadPenalty;
+  if (ReadRoadPenaltyFromMwm(mwmValue, vehicleType, roadPenalty))
+    graph.SetRoadPenalty(std::move(roadPenalty));
 }
 
 uint32_t DeserializeIndexGraphNumRoads(MwmValue const & mwmValue, VehicleType vehicleType)
diff --git a/libs/routing/road_penalty.cpp b/libs/routing/road_penalty.cpp
new file mode 100644
index 000000000..e76a38177
--- /dev/null
+++ b/libs/routing/road_penalty.cpp
@@ -0,0 +1,82 @@
+#include "routing/road_penalty.hpp"
+
+#include "base/assert.hpp"
+
+#include <sstream>
+
+namespace routing
+{
+namespace penalty_impl
+{
+// Array of strings must be in the same order as RoadPenalty::Type enum
+std::string const kNames[] = {"None", "SmallCalming",         "MediumCalming",      "LargeCalming",
+                              "Gate", "UncontrolledJunction", "ControlledJunction", "Count"};
+}  // namespace penalty_impl
+
+std::optional<RoadPenalty::Penalty> RoadPenalty::GetPenalty(RoadPoint const & point) const
+{
+  auto const it = m_pointToPenalty.find(point);
+  if (it != m_pointToPenalty.end())
+    return it->second;
+  return {};
+}
+
+bool RoadPenalty::operator==(RoadPenalty const & rhs) const
+{
+  return m_pointToPenalty == rhs.m_pointToPenalty;
+}
+
+std::string ToString(RoadPenalty::Type type)
+{
+  if (type <= RoadPenalty::Type::Count)
+    return penalty_impl::kNames[static_cast<size_t>(type)];
+  ASSERT(false, ("Bad RoadPenalty::Type", static_cast<size_t>(type)));
+  return "Bad RoadPenalty::Type";
+}
+
+void FromString(std::string_view s, RoadPenalty::Type & result)
+{
+  for (size_t i = 0; i <= static_cast<size_t>(RoadPenalty::Type::Count); ++i)
+  {
+    if (s == penalty_impl::kNames[i])
+    {
+      result = static_cast<RoadPenalty::Type>(i);
+      return;
+    }
+  }
+  ASSERT(false, ("Could not read RoadPenalty::Type from string", s));
+}
+
+std::string DebugPrint(RoadPenalty::Type type)
+{
+  return ToString(type);
+}
+
+std::string DebugPrint(RoadPenalty::Penalty const & penalty)
+{
+  std::ostringstream oss;
+  oss << "Penalty(" << DebugPrint(penalty.m_type) << ", " << penalty.m_timeSeconds << "s)";
+  return oss.str();
+}
+
+std::string DebugPrint(RoadPenalty const & roadPenalty)
+{
+  size_t constexpr kMaxKV = 10;
+  std::ostringstream oss;
+  oss << "RoadPenalty { PointToPenalty: [";
+  size_t i = 0;
+  for (auto const & kv : roadPenalty.GetPointToPenalty())
+  {
+    if (i > 0)
+      oss << ", ";
+    oss << "(" << DebugPrint(kv.first) << ", " << DebugPrint(kv.second) << ")";
+    ++i;
+    if (i == kMaxKV)
+      break;
+  }
+  if (roadPenalty.GetPointToPenalty().size() > kMaxKV)
+    oss << ", ...";
+  oss << "] }";
+  return oss.str();
+}
+}  // namespace routing
diff --git a/libs/routing/road_penalty.hpp b/libs/routing/road_penalty.hpp
new file mode 100644
index 000000000..5c1d9c711
--- /dev/null
+++ b/libs/routing/road_penalty.hpp
@@ -0,0 +1,127 @@
+#pragma once
+
+#include "routing/road_point.hpp"
+#include "routing/vehicle_mask.hpp"
+
+#include <optional>
+#include <string>
+#include <vector>
+
+#include "3party/skarupke/flat_hash_map.hpp"
+
+namespace routing
+{
+// This class provides information about road penalties (time delays)
+// that are separate from access restrictions. Examples include:
+// - Speed bumps and traffic calming measures
+// - Traffic signals
+// - Gates that take time to open
+// One instance of RoadPenalty holds information about one mwm.
+//
+// FILE FORMATS:
+//
+// 1. Intermediate file (from RoadPenaltyCollector::Save()):
+//    [uint64_t] Number of ways with penalties
+//    For each way:
+//      [uint64_t] Way ID
+//      [uint32_t] Number of nodes with penalties
+//      For each node:
+//        [uint32_t] Node index within way
+//        [uint32_t] Coordinate X
+//        [uint32_t] Coordinate Y
+//        [VehicleMask] Vehicle mask (uint32_t)
+//        [uint8_t] Penalty type
+//
+// 2. Final MWM file:
+//    [uint32_t] Number of vehicle types (4)
+//    For each vehicle type:
+//      [uint32_t] Number of point penalties
+//      For each penalty:
+//        [uint32_t] Feature ID
+//        [uint32_t] Point ID
+//        [uint8_t] Penalty type (time derived from type + vehicle)
+class RoadPenalty final
+{
+public:
+  // Types of penalties that can be applied to roads/nodes
+  enum class Type : uint8_t
+  {
+    None = 0,
+
+    // Traffic calming devices with different severities
+    SmallCalming,   // Traffic islands
+    MediumCalming,  // Cushions, chicanes, tables, choker
+    LargeCalming,   // Humps, bumps
+
+    // Gates and barriers
+    Gate,  // Emergency gates, barrier gates
+
+    // Traffic control
+    UncontrolledJunction,
+    ControlledJunction,
+
+    // The number of different penalty types
+    Count
+  };
+
+  struct Penalty
+  {
+    Type m_type = Type::None;
+    uint16_t m_timeSeconds = 0;  // Time penalty in seconds (0-65535)
+
+    Penalty() = default;
+
+    // Constructor that derives time from type and vehicle
+    Penalty(Type type, VehicleType vehicleType) : m_type(type), m_timeSeconds(GetTimePenalty(type, vehicleType)) {}
+
+    bool operator==(Penalty const & rhs) const { return m_type == rhs.m_type && m_timeSeconds == rhs.m_timeSeconds; }
+
+    bool operator!=(Penalty const & rhs) const { return !(*this == rhs); }
+
+    // Get default time penalty for a given type and vehicle
+    static uint16_t GetTimePenalty(Type type, VehicleType vehicleType)
+    {
+      // Penalty times lookup table [Type][VehicleType]
+      // Rows: penalty types (None, SmallCalming, MediumCalming, LargeCalming, Gate, Uncontrolled, Controlled)
+      // Columns: vehicle types (Pedestrian, Bicycle, Car, Transit)
+      static constexpr uint16_t kPenaltyTimes[7][4] = {
+          // Ped, Bic, Car, Tran
+          {0, 0, 0, 0},     // None
+          {0, 0, 3, 0},     // SmallCalming
+          {0, 0, 5, 0},     // MediumCalming
+          {0, 0, 7, 0},     // LargeCalming
+          {10, 10, 30, 0},  // Gate
+          {0, 10, 5, 0},    // Uncontrolled Junction
+          {0, 15, 10, 0},   // Controlled Junction
+      };
+
+      if (type >= Type::Count || vehicleType >= VehicleType::Count)
+        return 0;
+
+      return kPenaltyTimes[static_cast<size_t>(type)][static_cast<size_t>(vehicleType)];
+    }
+  };
+
+  using PointToPenalty = ska::flat_hash_map<RoadPoint, Penalty, RoadPoint::Hash>;
+
+  RoadPenalty() = default;
+
+  PointToPenalty const & GetPointToPenalty() const { return m_pointToPenalty; }
+
+  std::optional<Penalty> GetPenalty(RoadPoint const & point) const;
+
+  void SetPointPenalties(PointToPenalty && penalties) { m_pointToPenalty = std::move(penalties); }
+
+  bool operator==(RoadPenalty const & rhs) const;
+
+private:
+  PointToPenalty m_pointToPenalty;
+};
+
+std::string ToString(RoadPenalty::Type type);
+void FromString(std::string_view s, RoadPenalty::Type & result);
+
+std::string DebugPrint(RoadPenalty::Type type);
+std::string DebugPrint(RoadPenalty::Penalty const & penalty);
+std::string DebugPrint(RoadPenalty const & roadPenalty);
+}  // namespace routing
diff --git a/libs/routing/road_penalty_serialization.hpp b/libs/routing/road_penalty_serialization.hpp
new file mode 100644
index 000000000..b472fc1d7
--- /dev/null
+++ b/libs/routing/road_penalty_serialization.hpp
@@ -0,0 +1,110 @@
+#pragma once
+
+#include "routing/road_penalty.hpp"
+#include "routing/road_point.hpp"
+
+#include "coding/reader.hpp"
+#include "coding/write_to_sink.hpp"
+
+#include "base/assert.hpp"
+
+#include <cstdint>
+#include <vector>
+
+namespace routing
+{
+class RoadPenaltySerializer final
+{
+public:
+  using PointToPenalty = RoadPenalty::PointToPenalty;
+  using Penalty = RoadPenalty::Penalty;
+
+  RoadPenaltySerializer() = delete;
+
+  template <typename Sink>
+  static void Serialize(Sink & sink, RoadPenalty const & roadPenalty)
+  {
+    SerializePenalties(sink, roadPenalty.GetPointToPenalty());
+  }
+
+  template <typename Source>
+  static void Deserialize(Source & src, RoadPenalty & roadPenalty, VehicleType vehicleType)
+  {
+    PointToPenalty pointToPenalty;
+    DeserializePenalties(src, pointToPenalty, vehicleType);
+
+    roadPenalty.SetPointPenalties(std::move(pointToPenalty));
+  }
+
+private:
+  template <typename Sink>
+  static void SerializePenalty(Sink & sink, Penalty const & penalty)
+  {
+    WriteToSink(sink, static_cast<uint8_t>(penalty.m_type));
+    // Time is derived from type + vehicle when loading
+  }
+
+  template <typename Source>
+  static void DeserializePenalty(Source & src, Penalty & penalty, VehicleType vehicleType)
+  {
+    penalty.m_type = static_cast<RoadPenalty::Type>(ReadPrimitiveFromSource<uint8_t>(src));
+    penalty.m_timeSeconds = Penalty::GetTimePenalty(penalty.m_type, vehicleType);
+  }
+
+  template <typename Sink, typename PenaltyMap>
+  static void SerializePenalties(Sink & sink, PenaltyMap const & penalties)
+  {
+    WriteToSink(sink, static_cast<uint32_t>(penalties.size()));
+    for (auto const & [key, penalty] : penalties)
+    {
+      SerializeKey(sink, key);
+      SerializePenalty(sink, penalty);
+    }
+  }
+
+  template <typename Source, typename PenaltyMap>
+  static void DeserializePenalties(Source & src, PenaltyMap & penalties, VehicleType vehicleType)
+  {
+    uint32_t const size = ReadPrimitiveFromSource<uint32_t>(src);
+    penalties.reserve(size);
+
+    for (uint32_t i = 0; i < size; ++i)
+    {
+      typename PenaltyMap::key_type key;
+      DeserializeKey(src, key);
+
+      Penalty penalty;
+      DeserializePenalty(src, penalty, vehicleType);
+
+      penalties[key] = penalty;
+    }
+  }
+
+  template <typename Sink>
+  static void SerializeKey(Sink & sink, uint32_t key)
+  {
+    WriteToSink(sink, key);
+  }
+
+  template <typename Source>
+  static void DeserializeKey(Source & src, uint32_t & key)
+  {
+    key = ReadPrimitiveFromSource<uint32_t>(src);
+  }
+
+  template <typename Sink>
+  static void SerializeKey(Sink & sink, RoadPoint const & key)
+  {
+    WriteToSink(sink, key.GetFeatureId());
+    WriteToSink(sink, key.GetPointId());
+  }
+
+  template <typename Source>
+  static void DeserializeKey(Source & src, RoadPoint & key)
+  {
+    uint32_t featureId = ReadPrimitiveFromSource<uint32_t>(src);
+    uint32_t pointId = ReadPrimitiveFromSource<uint32_t>(src);
+    key = RoadPoint(featureId, pointId);
+  }
+};
+}  // namespace routing
diff --git a/libs/routing/routing_tests/CMakeLists.txt b/libs/routing/routing_tests/CMakeLists.txt
index 3340b8777..898b34865 100644
--- a/libs/routing/routing_tests/CMakeLists.txt
+++ b/libs/routing/routing_tests/CMakeLists.txt
@@ -26,6 +26,7 @@ set(SRC
   position_accumulator_tests.cpp
   restriction_test.cpp
   road_access_test.cpp
+  road_penalty_test.cpp
   road_graph_builder.cpp
   road_graph_builder.hpp
   road_graph_nearest_edges_test.cpp
diff --git a/libs/routing/routing_tests/index_graph_tools.cpp b/libs/routing/routing_tests/index_graph_tools.cpp
index 0a75cd98e..c980285d5 100644
--- a/libs/routing/routing_tests/index_graph_tools.cpp
+++ b/libs/routing/routing_tests/index_graph_tools.cpp
@@ -150,6 +150,11 @@ double WeightedEdgeEstimator::GetUTurnPenalty(Purpose purpose) const
 {
   return 0.0;
 }
+double WeightedEdgeEstimator::GetTurnPenalty(Purpose purpose, double angle, RoadGeometry const & from_road,
+                                             RoadGeometry const & to_road, bool is_left_hand_traffic) const
+{
+  return 0;
+}
 double WeightedEdgeEstimator::GetFerryLandingPenalty(Purpose purpose) const
 {
   return 0.0;
diff --git a/libs/routing/routing_tests/index_graph_tools.hpp b/libs/routing/routing_tests/index_graph_tools.hpp
index e2b883d71..e10ff4457 100644
--- a/libs/routing/routing_tests/index_graph_tools.hpp
+++ b/libs/routing/routing_tests/index_graph_tools.hpp
@@ -163,7 +163,7 @@ public:
   // maxSpeedKMpH doesn't matter, but should be greater then any road speed in all tests.
   // offroadSpeedKMpH doesn't matter, but should be > 0 and <= maxSpeedKMpH.
   explicit WeightedEdgeEstimator(std::map<Segment, double> const & segmentWeights)
-    : EdgeEstimator(1e10 /* maxSpeedKMpH */, 1.0 /* offroadSpeedKMpH */)
+    : EdgeEstimator(VehicleType::Count, 1e10 /* maxSpeedKMpH */, 1.0 /* offroadSpeedKMpH */)
     , m_segmentWeights(segmentWeights)
   {}
 
@@ -174,6 +174,8 @@ public:
                            EdgeEstimator::Purpose purpose) const override;
 
   double GetUTurnPenalty(Purpose purpose) const override;
+  double GetTurnPenalty(Purpose purpose, double angle, RoadGeometry const & from_road, RoadGeometry const & to_road,
+                        bool is_left_hand_traffic = false) const override;
   double GetFerryLandingPenalty(Purpose purpose) const override;
 
 private:
diff --git a/libs/routing/routing_tests/road_penalty_test.cpp b/libs/routing/routing_tests/road_penalty_test.cpp
new file mode 100644
index 000000000..22850449b
--- /dev/null
+++ b/libs/routing/routing_tests/road_penalty_test.cpp
@@ -0,0 +1,169 @@
+#include "testing/testing.hpp"
+
+#include "routing/road_penalty.hpp"
+#include "routing/road_point.hpp"
+#include "routing/vehicle_mask.hpp"
+
+#include <optional>
+#include <utility>
+
+namespace road_penalty_test
+{
+using namespace routing;
+
+UNIT_TEST(RoadPenalty_Basic)
+{
+  RoadPenalty penalty;
+
+  // Test empty penalty
+  TEST(!penalty.GetPenalty(RoadPoint(1, 0)).has_value(), ());
+  TEST(!penalty.GetPenalty(RoadPoint(2, 1)).has_value(), ());
+}
+
+UNIT_TEST(RoadPenalty_PointPenalties)
+{
+  RoadPenalty penalty;
+
+  // Test point penalties
+  RoadPenalty::PointToPenalty pointPenalties;
+  pointPenalties[RoadPoint(1, 0)] = RoadPenalty::Penalty(RoadPenalty::Type::MediumCalming, VehicleType::Car);
+  pointPenalties[RoadPoint(2, 3)] = RoadPenalty::Penalty(RoadPenalty::Type::Gate, VehicleType::Car);
+  penalty.SetPointPenalties(std::move(pointPenalties));
+
+  auto p1 = penalty.GetPenalty(RoadPoint(1, 0));
+  TEST(p1.has_value(), ());
+  TEST_EQUAL(p1->m_type, RoadPenalty::Type::MediumCalming, ());
+  TEST_EQUAL(p1->m_timeSeconds, 5, ());
+
+  auto p2 = penalty.GetPenalty(RoadPoint(2, 3));
+  TEST(p2.has_value(), ());
+  TEST_EQUAL(p2->m_type, RoadPenalty::Type::Gate, ());
+  TEST_EQUAL(p2->m_timeSeconds, 30, ());
+
+  TEST(!penalty.GetPenalty(RoadPoint(1, 1)).has_value(), ());
+}
+
+UNIT_TEST(RoadPenalty_TypeConversion)
+{
+  // Test ToString/FromString
+  TEST_EQUAL(ToString(RoadPenalty::Type::None), "None", ());
+  TEST_EQUAL(ToString(RoadPenalty::Type::SmallCalming), "SmallCalming", ());
+  TEST_EQUAL(ToString(RoadPenalty::Type::MediumCalming), "MediumCalming", ());
+  TEST_EQUAL(ToString(RoadPenalty::Type::LargeCalming), "LargeCalming", ());
+  TEST_EQUAL(ToString(RoadPenalty::Type::Gate), "Gate", ());
+  TEST_EQUAL(ToString(RoadPenalty::Type::UncontrolledJunction), "UncontrolledJunction", ());
+  TEST_EQUAL(ToString(RoadPenalty::Type::ControlledJunction), "ControlledJunction", ());
+
+  RoadPenalty::Type type;
+  FromString("SmallCalming", type);
+  TEST_EQUAL(type, RoadPenalty::Type::SmallCalming, ());
+
+  FromString("Gate", type);
+  TEST_EQUAL(type, RoadPenalty::Type::Gate, ());
+
+  FromString("UncontrolledJunction", type);
+  TEST_EQUAL(type, RoadPenalty::Type::UncontrolledJunction, ());
+
+  FromString("ControlledJunction", type);
+  TEST_EQUAL(type, RoadPenalty::Type::ControlledJunction, ());
+}
+
+UNIT_TEST(RoadPenalty_Equality)
+{
+  RoadPenalty penalty1, penalty2;
+  TEST(penalty1 == penalty2, ());
+
+  RoadPenalty::PointToPenalty pointPenalties;
+  pointPenalties[RoadPoint(1, 0)] = RoadPenalty::Penalty(RoadPenalty::Type::SmallCalming, VehicleType::Car);
+  penalty1.SetPointPenalties(std::move(pointPenalties));
+
+  TEST(!(penalty1 == penalty2), ());
+
+  pointPenalties.clear();
+  pointPenalties[RoadPoint(1, 0)] = RoadPenalty::Penalty(RoadPenalty::Type::SmallCalming, VehicleType::Car);
+  penalty2.SetPointPenalties(std::move(pointPenalties));
+
+  TEST(penalty1 == penalty2, ());
+}
+
+// Test vehicle mask functionality
+UNIT_TEST(RoadPenalty_VehicleMask)
+{
+  // Test basic mask operations
+  VehicleMask mask = 0;
+
+  // Set bit for Car (VehicleType::Car = 2)
+  mask |= (1 << 2);
+  TEST((mask & (1 << 2)) != 0, ());
+  TEST((mask & (1 << 1)) == 0, ());
+
+  // Test mask with multiple vehicle types
+  VehicleMask multiMask = 0;
+  multiMask |= (1 << 0);  // Pedestrian
+  multiMask |= (1 << 1);  // Bicycle
+  multiMask |= (1 << 2);  // Car
+
+  // Verify multiple bits are set
+  TEST_EQUAL(__builtin_popcount(multiMask), 3, ());
+}
+
+// Test default time penalties
+UNIT_TEST(RoadPenalty_DefaultTimes)
+{
+  // Test GetTimePenalty with Car as default
+  TEST_EQUAL(RoadPenalty::Penalty::GetTimePenalty(RoadPenalty::Type::None, VehicleType::Car), 0, ());
+  TEST_EQUAL(RoadPenalty::Penalty::GetTimePenalty(RoadPenalty::Type::SmallCalming, VehicleType::Car), 3, ());
+  TEST_EQUAL(RoadPenalty::Penalty::GetTimePenalty(RoadPenalty::Type::MediumCalming, VehicleType::Car), 5, ());
+  TEST_EQUAL(RoadPenalty::Penalty::GetTimePenalty(RoadPenalty::Type::LargeCalming, VehicleType::Car), 7, ());
+  TEST_EQUAL(RoadPenalty::Penalty::GetTimePenalty(RoadPenalty::Type::Gate, VehicleType::Car), 30, ());
+  TEST_EQUAL(RoadPenalty::Penalty::GetTimePenalty(RoadPenalty::Type::UncontrolledJunction, VehicleType::Car), 15, ());
+  TEST_EQUAL(RoadPenalty::Penalty::GetTimePenalty(RoadPenalty::Type::ControlledJunction, VehicleType::Car), 30, ());
+
+  // Test constructor with vehicle type
+  RoadPenalty::Penalty smallCalming(RoadPenalty::Type::SmallCalming, VehicleType::Car);
+  TEST_EQUAL(smallCalming.m_type, RoadPenalty::Type::SmallCalming, ());
+  TEST_EQUAL(smallCalming.m_timeSeconds, 3, ());
+
+  RoadPenalty::Penalty gate(RoadPenalty::Type::Gate, VehicleType::Car);
+  TEST_EQUAL(gate.m_type, RoadPenalty::Type::Gate, ());
+  TEST_EQUAL(gate.m_timeSeconds, 30, ());
+}
+
+// Test vehicle-specific time penalties
+UNIT_TEST(RoadPenalty_VehicleSpecificTimes)
+{
+  // Test GetTimePenalty with different vehicle types
+  TEST_EQUAL(RoadPenalty::Penalty::GetTimePenalty(RoadPenalty::Type::Gate, VehicleType::Car), 30, ());
+  TEST_EQUAL(RoadPenalty::Penalty::GetTimePenalty(RoadPenalty::Type::Gate, VehicleType::Bicycle), 10, ());
+  TEST_EQUAL(RoadPenalty::Penalty::GetTimePenalty(RoadPenalty::Type::Gate, VehicleType::Pedestrian), 10, ());
+  TEST_EQUAL(RoadPenalty::Penalty::GetTimePenalty(RoadPenalty::Type::Gate, VehicleType::Transit), 5, ());
+
+  // Test constructor with vehicle type
+  RoadPenalty::Penalty carGate(RoadPenalty::Type::Gate, VehicleType::Car);
+  TEST_EQUAL(carGate.m_type, RoadPenalty::Type::Gate, ());
+  TEST_EQUAL(carGate.m_timeSeconds, 30, ());
+
+  RoadPenalty::Penalty bicycleGate(RoadPenalty::Type::Gate, VehicleType::Bicycle);
+  TEST_EQUAL(bicycleGate.m_type, RoadPenalty::Type::Gate, ());
+  TEST_EQUAL(bicycleGate.m_timeSeconds, 10, ());
+
+  // Test traffic calming with different vehicles
+  RoadPenalty::Penalty carCalming(RoadPenalty::Type::SmallCalming, VehicleType::Car);
+  TEST_EQUAL(carCalming.m_type, RoadPenalty::Type::SmallCalming, ());
+  TEST_EQUAL(carCalming.m_timeSeconds, 3, ());
+
+  RoadPenalty::Penalty bicycleCalming(RoadPenalty::Type::SmallCalming, VehicleType::Bicycle);
+  TEST_EQUAL(bicycleCalming.m_type, RoadPenalty::Type::SmallCalming, ());
+  TEST_EQUAL(bicycleCalming.m_timeSeconds, 0, ());
+
+  // Test junction penalties with different vehicles
+  TEST_EQUAL(RoadPenalty::Penalty::GetTimePenalty(RoadPenalty::Type::UncontrolledJunction, VehicleType::Bicycle), 10,
+             ());
+  TEST_EQUAL(RoadPenalty::Penalty::GetTimePenalty(RoadPenalty::Type::ControlledJunction, VehicleType::Bicycle), 30, ());
+  TEST_EQUAL(RoadPenalty::Penalty::GetTimePenalty(RoadPenalty::Type::UncontrolledJunction, VehicleType::Pedestrian), 0,
+             ());
+  TEST_EQUAL(RoadPenalty::Penalty::GetTimePenalty(RoadPenalty::Type::ControlledJunction, VehicleType::Pedestrian), 0,
+             ());
+}
+
+}  // namespace road_penalty_test
diff --git a/libs/routing_common/car_model_coefs.hpp b/libs/routing_common/car_model_coefs.hpp
index 123ff71bd..6a466d946 100644
--- a/libs/routing_common/car_model_coefs.hpp
+++ b/libs/routing_common/car_model_coefs.hpp
@@ -18,7 +18,7 @@ HighwayBasedFactors const kHighwayBasedFactors = {
 
     // Tier 2:
     {HighwayType::HighwayPrimary,
-     InOutCityFactor(SpeedFactor{0.85 /* weight */, 0.80 /* eta */} /* in city */, 0.85 /* out city */)},
+     InOutCityFactor(SpeedFactor{0.95 /* weight */, 0.90 /* eta */} /* in city */, 0.85 /* out city */)},
     {HighwayType::HighwayPrimaryLink, InOutCityFactor(0.70 /* in city */, 0.75 /* out city */)},  // 0.10 less
     {HighwayType::HighwaySecondary, InOutCityFactor(0.80 /* in city */, 0.85 /* out city */)},
     {HighwayType::HighwaySecondaryLink, InOutCityFactor(0.70 /* in city */, 0.75 /* out city */)},  // 0.10 less
diff --git a/libs/routing_common/vehicle_model.cpp b/libs/routing_common/vehicle_model.cpp
index af7966fd3..3c94d0613 100644
--- a/libs/routing_common/vehicle_model.cpp
+++ b/libs/routing_common/vehicle_model.cpp
@@ -7,6 +7,7 @@
 
 #include <algorithm>
 #include <sstream>
+#include <unordered_map>
 
 namespace routing
 {
@@ -378,4 +379,41 @@ string DebugPrint(HighwayType type)
 
   UNREACHABLE();
 }
+
+void FromString(std::string_view s, HighwayType & highwayType)
+{
+  // Build reverse lookup from DebugPrint function
+  static std::unordered_map<std::string, HighwayType> const stringToEnum = []()
+  {
+    std::unordered_map<std::string, HighwayType> map;
+
+    // All possible HighwayType values
+    constexpr HighwayType allTypes[] = {
+        HighwayType::HighwayResidential,   HighwayType::HighwayService,    HighwayType::HighwayUnclassified,
+        HighwayType::HighwayFootway,       HighwayType::HighwayTrack,      HighwayType::HighwayTertiary,
+        HighwayType::HighwaySecondary,     HighwayType::HighwayPath,       HighwayType::HighwayPrimary,
+        HighwayType::HighwayRoad,          HighwayType::HighwayCycleway,   HighwayType::HighwayMotorwayLink,
+        HighwayType::HighwayLivingStreet,  HighwayType::HighwayMotorway,   HighwayType::HighwaySteps,
+        HighwayType::HighwayTrunk,         HighwayType::HighwayPedestrian, HighwayType::HighwayTrunkLink,
+        HighwayType::HighwayPrimaryLink,   HighwayType::ManMadePier,       HighwayType::HighwayBridleway,
+        HighwayType::HighwaySecondaryLink, HighwayType::RouteFerry,        HighwayType::HighwayTertiaryLink,
+        HighwayType::HighwayBusway,        HighwayType::RouteShuttleTrain};
+
+    for (auto type : allTypes)
+      map[DebugPrint(type)] = type;
+
+    return map;
+  }();
+
+  auto it = stringToEnum.find(std::string(s));
+  if (it != stringToEnum.end())
+  {
+    highwayType = it->second;
+  }
+  else
+  {
+    ASSERT(false, ("Could not read HighwayType from string", s));
+    highwayType = HighwayType::HighwayResidential;  // default fallback
+  }
+}
 }  // namespace routing
diff --git a/libs/routing_common/vehicle_model.hpp b/libs/routing_common/vehicle_model.hpp
index c60032344..3303854ba 100644
--- a/libs/routing_common/vehicle_model.hpp
+++ b/libs/routing_common/vehicle_model.hpp
@@ -366,4 +366,5 @@ std::string DebugPrint(SpeedFactor const & speedFactor);
 std::string DebugPrint(InOutCitySpeedKMpH const & speed);
 std::string DebugPrint(InOutCityFactor const & speedFactor);
 std::string DebugPrint(HighwayType type);
+void FromString(std::string_view s, HighwayType & highwayType);
 }  // namespace routing
diff --git a/xcode/routing/routing.xcodeproj/project.pbxproj b/xcode/routing/routing.xcodeproj/project.pbxproj
index a097ab6ac..e216877a9 100644
--- a/xcode/routing/routing.xcodeproj/project.pbxproj
+++ b/xcode/routing/routing.xcodeproj/project.pbxproj
@@ -212,6 +212,10 @@
 		67C79BA21E2CEE1400C40034 /* restriction_loader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67C79BA01E2CEE1400C40034 /* restriction_loader.hpp */; };
 		67C7D42D1B4EB48F00FE41AA /* turns_sound_settings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67C7D4251B4EB48F00FE41AA /* turns_sound_settings.cpp */; };
 		67C7D42E1B4EB48F00FE41AA /* turns_sound_settings.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 67C7D4261B4EB48F00FE41AA /* turns_sound_settings.hpp */; };
+		833F71FA2E48DF27008F7617 /* road_penalty.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 833F71F82E48DF27008F7617 /* road_penalty.hpp */; };
+		833F71FB2E48DF27008F7617 /* road_penalty.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 833F71F92E48DF27008F7617 /* road_penalty.cpp */; };
+		833F71FD2E48E011008F7617 /* road_penalty_serialization.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 833F71FC2E48E010008F7617 /* road_penalty_serialization.hpp */; };
+		833F71FF2E48E02E008F7617 /* road_penalty_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 833F71FE2E48E02E008F7617 /* road_penalty_test.cpp */; };
 		A120B3531B4A7C1C002F3808 /* astar_algorithm.hpp in Headers */ = {isa = PBXBuildFile; fileRef = A120B3521B4A7C1C002F3808 /* astar_algorithm.hpp */; };
 		A1616E2B1B6B60AB003F078E /* router_delegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A1616E291B6B60AB003F078E /* router_delegate.cpp */; };
 		A1616E2C1B6B60AB003F078E /* router_delegate.hpp in Headers */ = {isa = PBXBuildFile; fileRef = A1616E2A1B6B60AB003F078E /* router_delegate.hpp */; };
@@ -498,6 +502,10 @@
 		67C79BA01E2CEE1400C40034 /* restriction_loader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = restriction_loader.hpp; sourceTree = "<group>"; };
 		67C7D4251B4EB48F00FE41AA /* turns_sound_settings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; path = turns_sound_settings.cpp; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.cpp; };
 		67C7D4261B4EB48F00FE41AA /* turns_sound_settings.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = turns_sound_settings.hpp; sourceTree = "<group>"; };
+		833F71F82E48DF27008F7617 /* road_penalty.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = road_penalty.hpp; sourceTree = "<group>"; };
+		833F71F92E48DF27008F7617 /* road_penalty.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = road_penalty.cpp; sourceTree = "<group>"; };
+		833F71FC2E48E010008F7617 /* road_penalty_serialization.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = road_penalty_serialization.hpp; sourceTree = "<group>"; };
+		833F71FE2E48E02E008F7617 /* road_penalty_test.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = road_penalty_test.cpp; sourceTree = "<group>"; };
 		A120B3521B4A7C1C002F3808 /* astar_algorithm.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = astar_algorithm.hpp; sourceTree = "<group>"; };
 		A1616E291B6B60AB003F078E /* router_delegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = router_delegate.cpp; sourceTree = "<group>"; };
 		A1616E2A1B6B60AB003F078E /* router_delegate.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = router_delegate.hpp; sourceTree = "<group>"; };
@@ -618,6 +626,7 @@
 				6742ACAF1C68A0B1009CB89E /* road_graph_builder.cpp */,
 				6742ACB01C68A0B1009CB89E /* road_graph_builder.hpp */,
 				6742ACB11C68A0B1009CB89E /* road_graph_nearest_edges_test.cpp */,
+				833F71FE2E48E02E008F7617 /* road_penalty_test.cpp */,
 				6742ACB21C68A0B1009CB89E /* route_tests.cpp */,
 				56290B85206A3231003892E0 /* routing_algorithm.cpp */,
 				56290B86206A3231003892E0 /* routing_algorithm.hpp */,
@@ -694,6 +703,7 @@
 				671F58BA1B874EA20032311E /* base */,
 				5694723F2418C8220013CD21 /* car_directions.hpp */,
 				569472402418C8220013CD21 /* car_directions.cpp */,
+				5670595B1F3AF97F0062672D /* checkpoint_predictor.cpp */,
 				5670595C1F3AF97F0062672D /* checkpoint_predictor.hpp */,
 				5670595B1F3AF97F0062672D /* checkpoint_predictor.cpp */,
 				0C15B8011F02A61B0058E253 /* checkpoints.hpp */,
@@ -792,6 +802,9 @@
 				674F9BC41B0A580E00704FFA /* road_graph.cpp */,
 				0C5FEC671DDE193F0017688C /* road_index.hpp */,
 				0C5FEC661DDE193F0017688C /* road_index.cpp */,
+				833F71F82E48DF27008F7617 /* road_penalty.hpp */,
+				833F71F92E48DF27008F7617 /* road_penalty.cpp */,
+				833F71FC2E48E010008F7617 /* road_penalty_serialization.hpp */,
 				0C5FEC681DDE193F0017688C /* road_point.hpp */,
 				6753440E1A3F644F00A0A8C3 /* route.hpp */,
 				6753440D1A3F644F00A0A8C3 /* route.cpp */,
@@ -941,6 +954,7 @@
 				44642D2D29CDA44700F8813A /* ruler_router.hpp in Headers */,
 				56CBED5522E9CE2600D51AF7 /* position_accumulator.hpp in Headers */,
 				5694CECB1EBA25F7004576D3 /* road_access_serialization.hpp in Headers */,
+				833F71FA2E48DF27008F7617 /* road_penalty.hpp in Headers */,
 				0C08AA371DF8324D004195DD /* vehicle_mask.hpp in Headers */,
 				6753441D1A3F644F00A0A8C3 /* router.hpp in Headers */,
 				A1616E2E1B6B60B3003F078E /* astar_progress.hpp in Headers */,
@@ -972,6 +986,7 @@
 				4443DC3822789793000C8E32 /* leaps_postprocessor.hpp in Headers */,
 				0C62BFE61E8ADC3100055A79 /* coding.hpp in Headers */,
 				674F9BD51B0A580E00704FFA /* road_graph.hpp in Headers */,
+				833F71FD2E48E011008F7617 /* road_penalty_serialization.hpp in Headers */,
 				562BDE2020D14860008EFF6F /* routing_callbacks.hpp in Headers */,
 				567F81952154D6FF0093C25B /* city_roads.hpp in Headers */,
 				D5C9497C2525C855001E45E2 /* directions_engine_helpers.hpp in Headers */,
@@ -1179,6 +1194,7 @@
 				6742AD371C68A9DF009CB89E /* turns_tts_text_tests.cpp in Sources */,
 				6742AD2C1C68A9DF009CB89E /* followed_polyline_test.cpp in Sources */,
 				FAA838AC26BB4B3D002E54C6 /* coding_test.cpp in Sources */,
+				833F71FF2E48E02E008F7617 /* road_penalty_test.cpp in Sources */,
 				FAA8389D26BB4ADD002E54C6 /* guides_tests.cpp in Sources */,
 				56CBED5822E9CFB600D51AF7 /* position_accumulator_tests.cpp in Sources */,
 				FAA838A826BB4B21002E54C6 /* routing_helpers_tests.cpp in Sources */,
@@ -1233,6 +1249,7 @@
 				6741AA9C1BF35331002C974C /* turns_notification_manager.cpp in Sources */,
 				0C0DF9211DE898B70055A22F /* index_graph_starter.cpp in Sources */,
 				56C439281E93BF8C00998E29 /* cross_mwm_graph.cpp in Sources */,
+				833F71FB2E48DF27008F7617 /* road_penalty.cpp in Sources */,
 				670EE5731B664796001E8064 /* pedestrian_directions.cpp in Sources */,
 				567F81942154D6FF0093C25B /* city_roads.cpp in Sources */,
 				6753441B1A3F644F00A0A8C3 /* route.cpp in Sources */,

From 035a8edebbbc63da34dc5f4d24184b1a324a1349 Mon Sep 17 00:00:00 2001
From: Yannik Bloscheck <git@yannikbloscheck.com>
Date: Sun, 17 Aug 2025 22:07:30 +0200
Subject: [PATCH 052/302] [ios] Adding CarPlay entitlement

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
---
 iphone/Maps/CoMaps-Debug.entitlements   | 2 ++
 iphone/Maps/CoMaps-Release.entitlements | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/iphone/Maps/CoMaps-Debug.entitlements b/iphone/Maps/CoMaps-Debug.entitlements
index 72f29a73f..d09ed271a 100644
--- a/iphone/Maps/CoMaps-Debug.entitlements
+++ b/iphone/Maps/CoMaps-Debug.entitlements
@@ -8,6 +8,8 @@
 	<array>
 		<string>applinks:comaps.at</string>
 	</array>
+	<key>com.apple.developer.carplay-maps</key>
+	<true/>
 	<key>com.apple.developer.icloud-container-identifiers</key>
 	<array>
 		<string>iCloud.app.comaps.debug</string>
diff --git a/iphone/Maps/CoMaps-Release.entitlements b/iphone/Maps/CoMaps-Release.entitlements
index b0347e4e3..0e96a0801 100644
--- a/iphone/Maps/CoMaps-Release.entitlements
+++ b/iphone/Maps/CoMaps-Release.entitlements
@@ -8,6 +8,8 @@
 	<array>
 		<string>applinks:comaps.at</string>
 	</array>
+	<key>com.apple.developer.carplay-maps</key>
+	<true/>
 	<key>com.apple.developer.icloud-container-identifiers</key>
 	<array>
 		<string>iCloud.app.comaps</string>

From abc755c058dbbc4578282ebefd47e4f7c10778ad Mon Sep 17 00:00:00 2001
From: Harry Bond <me@hbond.xyz>
Date: Sun, 17 Aug 2025 21:46:19 +0100
Subject: [PATCH 053/302] [styles] Don't show postbox labels

Fixes #1399
Signed-off-by: Harry Bond <me@hbond.xyz>


Signed-off-by: Harry Bond <me@hbond.xyz>
---
 data/styles/default/include/Icons.mapcss                    | 3 +--
 data/styles/default/include/priorities_4_overlays.prio.txt  | 3 +--
 data/styles/outdoors/include/priorities_4_overlays.prio.txt | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index 3f0edcf15..b2f3717ce 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -813,7 +813,6 @@ node|z17-[sport],
 node|z17-[highway=ladder],
 node|z18-[amenity=dojo],
 node|z18-[amenity=vending_machine],
-node|z18-[amenity=post_box],
 node|z18-[amenity=fire_station],
 node|z18-[emergency=defibrillator],
 node|z18-[emergency=assembly_point],
@@ -1303,7 +1302,7 @@ node|z18-[amenity=post_office],
 node|z18-[post_office=post_partner],
 {font-size: 11;}
 node|z18-[amenity=post_box],
-{icon-image: postbox-m.svg;font-size: 11;}
+{icon-image: postbox-m.svg;text: none;}
 node|z19-[emergency=fire_hydrant],
 {icon-image: firehydrant-m.svg;font-size: 11;}
 
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index 1894b6352..b73a64279 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -1241,7 +1241,7 @@ historic-memorial-plaque                            # icon z18- (also has captio
 historic-stone                                      # icon z18- (also has caption(optional) z18-)
 === 210
 
-amenity-post_box                                    # icon z18- (also has caption(optional) z18-)
+amenity-post_box                                    # icon z18-
 amenity-recycling-container                         # icon z17- (also has caption(optional) z19-)
 historic-memorial-stolperstein                      # icon z19- (also has caption(optional) z19-)
 === 200
@@ -2164,7 +2164,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # historic-stone                                    # caption(optional) z18- (also has icon z18-)
 # === -9790
 
-# amenity-post_box                                  # caption(optional) z18- (also has icon z18-)
 # amenity-recycling-container                       # caption(optional) z19- (also has icon z17-)
 # historic-memorial-stolperstein                    # caption(optional) z19- (also has icon z19-)
 # === -9800
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 7765af9d7..1af9d05fc 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -1244,7 +1244,7 @@ historic-memorial-plaque                            # icon z18- (also has captio
 historic-stone                                      # icon z18- (also has caption(optional) z18-)
 === 210
 
-amenity-post_box                                    # icon z18- (also has caption(optional) z18-)
+amenity-post_box                                    # icon z18-
 amenity-recycling-container                         # icon z17- (also has caption(optional) z19-)
 historic-memorial-stolperstein                      # icon z19- (also has caption(optional) z19-)
 === 200
@@ -2169,7 +2169,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # historic-stone                                    # caption(optional) z18- (also has icon z18-)
 # === -9790
 
-# amenity-post_box                                  # caption(optional) z18- (also has icon z18-)
 # amenity-recycling-container                       # caption(optional) z19- (also has icon z17-)
 # historic-memorial-stolperstein                    # caption(optional) z19- (also has icon z19-)
 # === -9800

From 580209f7ea56fc0fc03af9c2d8dbd32db5930295 Mon Sep 17 00:00:00 2001
From: Yannik Bloscheck <git@yannikbloscheck.com>
Date: Thu, 14 Aug 2025 15:00:30 +0200
Subject: [PATCH 054/302] [ios] Ending search when switching over to routing

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
---
 .../Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm b/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm
index 1fbe1b5c0..a07cbffe2 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm
+++ b/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm
@@ -42,6 +42,9 @@ using namespace storage;
     [MWMRouter stopRouting];
   }
 
+  [MWMSearch clear];
+  [[[MapViewController sharedController] searchManager] close];
+
   if ([MWMMapOverlayManager transitEnabled]) {
     [MWMRouter setType:MWMRouterTypePublicTransport];
   }

From c4599f4889c84d4ec80ff1d6668fb77fc69205a3 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Wed, 23 Jul 2025 01:06:19 +0300
Subject: [PATCH 055/302] C++23

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 CMakeLists.txt                              |  10 +-
 cmake/OmimHelpers.cmake                     |   4 +-
 libs/base/bits.hpp                          |   1 +
 libs/base/string_utils.hpp                  |   1 +
 libs/drape/vulkan/vulkan_object_manager.hpp |   2 -
 libs/drape/vulkan/vulkan_texture.cpp        |   1 -
 libs/drape/vulkan/vulkan_texture.hpp        |   3 +-
 libs/indexer/drules_struct.pb.cc            | 296 ++++++++++----------
 xcode/common.xcconfig                       |   4 +-
 9 files changed, 161 insertions(+), 161 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c559bf5c1..85e0b6828 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.22.1)
 
 project(omim C CXX)
 
-set(CMAKE_CXX_STANDARD 20)
-set(CMAKE_C_STANDARD 17)
+set(CMAKE_CXX_STANDARD 23)
+set(CMAKE_C_STANDARD 23)
 # Our code does not rely on gnu extensions.
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_C_EXTENSIONS OFF)
@@ -39,12 +39,12 @@ if (APPLE AND NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL Android))
   # https://gitlab.kitware.com/cmake/cmake/-/issues/21963
   enable_language(OBJC)
   set(CMAKE_OBJC_EXTENSIONS OFF)
-  set(CMAKE_OBJC_STANDARD 11)
+  set(CMAKE_OBJC_STANDARD 23)
   set(CMAKE_OBJC_FLAGS -fobjc-arc)
   set(CMAKE_OBJC_VISIBILITY_PRESET hidden)
   enable_language(OBJCXX)
   set(CMAKE_OBJCXX_EXTENSIONS OFF)
-  set(CMAKE_OBJCXX_STANDARD 20)
+  set(CMAKE_OBJCXX_STANDARD 23)
   set(CMAKE_OBJCXX_FLAGS -fobjc-arc)
   set(CMAKE_OBJCXX_VISIBILITY_PRESET hidden)
 endif()
@@ -87,7 +87,7 @@ if (MSVC)
   add_compile_options(/utf-8)
   add_link_options(/INCREMENTAL:NO)
 else()
-  add_compile_options(-ffast-math)
+  add_compile_options(-ffast-math $<$<CXX_COMPILER_ID:GNU>:-Wno-psabi>)
 endif()
 
 if (PLATFORM_WIN)
diff --git a/cmake/OmimHelpers.cmake b/cmake/OmimHelpers.cmake
index 94ce85930..9f6081c09 100644
--- a/cmake/OmimHelpers.cmake
+++ b/cmake/OmimHelpers.cmake
@@ -159,8 +159,8 @@ function(add_precompiled_headers header pch_target_name)
   export_directory_flags("${pch_flags_file}")
   set(compiler_flags "@${pch_flags_file}")
 
-  # CMAKE_CXX_STANDARD 20 flags:
-  set(c_standard_flags "-std=c++20")
+  # CMAKE_CXX_STANDARD 23 flags:
+  set(c_standard_flags "-std=c++23")
   get_filename_component(pch_file_name ${header} NAME)
 
   add_pic_pch_target(${header} ${pch_target_name} ${pch_file_name} lib "-fPIC")
diff --git a/libs/base/bits.hpp b/libs/base/bits.hpp
index b0b9d0503..ec02e8fef 100644
--- a/libs/base/bits.hpp
+++ b/libs/base/bits.hpp
@@ -2,6 +2,7 @@
 
 #include "base/assert.hpp"
 
+#include <bit>
 #include <cstdint>
 #include <limits>
 #include <type_traits>
diff --git a/libs/base/string_utils.hpp b/libs/base/string_utils.hpp
index abf3d33d1..071366563 100644
--- a/libs/base/string_utils.hpp
+++ b/libs/base/string_utils.hpp
@@ -13,6 +13,7 @@
 #include <sstream>
 #include <string>
 #include <string_view>
+#include <system_error>
 #include <type_traits>
 
 #include <utf8/unchecked.h>
diff --git a/libs/drape/vulkan/vulkan_object_manager.hpp b/libs/drape/vulkan/vulkan_object_manager.hpp
index 593eeb687..5871064eb 100644
--- a/libs/drape/vulkan/vulkan_object_manager.hpp
+++ b/libs/drape/vulkan/vulkan_object_manager.hpp
@@ -47,8 +47,6 @@ struct VulkanObject
   }
 };
 
-class VulkanStagingBuffer;
-
 class VulkanObjectManager
 {
 public:
diff --git a/libs/drape/vulkan/vulkan_texture.cpp b/libs/drape/vulkan/vulkan_texture.cpp
index 35ad8eca1..e5ed41d5a 100644
--- a/libs/drape/vulkan/vulkan_texture.cpp
+++ b/libs/drape/vulkan/vulkan_texture.cpp
@@ -1,6 +1,5 @@
 #include "drape/vulkan/vulkan_texture.hpp"
 #include "drape/vulkan/vulkan_base_context.hpp"
-#include "drape/vulkan/vulkan_staging_buffer.hpp"
 
 drape_ptr<dp::HWTextureAllocator> CreateVulkanAllocator()
 {
diff --git a/libs/drape/vulkan/vulkan_texture.hpp b/libs/drape/vulkan/vulkan_texture.hpp
index 71f2dfbdd..60dd9129a 100644
--- a/libs/drape/vulkan/vulkan_texture.hpp
+++ b/libs/drape/vulkan/vulkan_texture.hpp
@@ -3,6 +3,7 @@
 #include "drape/hw_texture.hpp"
 #include "drape/pointers.hpp"
 #include "drape/vulkan/vulkan_object_manager.hpp"
+#include "drape/vulkan/vulkan_staging_buffer.hpp"
 #include "drape/vulkan/vulkan_utils.hpp"
 
 #include <cstdint>
@@ -11,8 +12,6 @@ namespace dp
 {
 namespace vulkan
 {
-class VulkanStagingBuffer;
-
 class VulkanTextureAllocator : public HWTextureAllocator
 {
 public:
diff --git a/libs/indexer/drules_struct.pb.cc b/libs/indexer/drules_struct.pb.cc
index 75a955052..6d5ca3ef8 100644
--- a/libs/indexer/drules_struct.pb.cc
+++ b/libs/indexer/drules_struct.pb.cc
@@ -5,6 +5,8 @@
 #include "indexer/drules_struct.pb.h"
 
 #include <algorithm>
+// Manually added to avoid C++23 build errors caused by missing include.
+#include <type_traits>
 
 #include <google/protobuf/stubs/common.h>
 #include <google/protobuf/stubs/port.h>
@@ -463,7 +465,7 @@ double DashDotProto::offset() const {
   return offset_;
 }
 void DashDotProto::set_offset(double value) {
-  
+
   offset_ = value;
   // @@protoc_insertion_point(field_set:DashDotProto.offset)
 }
@@ -736,13 +738,13 @@ const ::std::string& PathSymProto::name() const {
   return name_.GetNoArena();
 }
 void PathSymProto::set_name(const ::std::string& value) {
-  
+
   name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
   // @@protoc_insertion_point(field_set:PathSymProto.name)
 }
 #if LANG_CXX11
 void PathSymProto::set_name(::std::string&& value) {
-  
+
   name_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
   // @@protoc_insertion_point(field_set_rvalue:PathSymProto.name)
@@ -750,31 +752,31 @@ void PathSymProto::set_name(::std::string&& value) {
 #endif
 void PathSymProto::set_name(const char* value) {
   GOOGLE_DCHECK(value != NULL);
-  
+
   name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
   // @@protoc_insertion_point(field_set_char:PathSymProto.name)
 }
 void PathSymProto::set_name(const char* value, size_t size) {
-  
+
   name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
   // @@protoc_insertion_point(field_set_pointer:PathSymProto.name)
 }
 ::std::string* PathSymProto::mutable_name() {
-  
+
   // @@protoc_insertion_point(field_mutable:PathSymProto.name)
   return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 ::std::string* PathSymProto::release_name() {
   // @@protoc_insertion_point(field_release:PathSymProto.name)
-  
+
   return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 void PathSymProto::set_allocated_name(::std::string* name) {
   if (name != NULL) {
-    
+
   } else {
-    
+
   }
   name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name);
   // @@protoc_insertion_point(field_set_allocated:PathSymProto.name)
@@ -789,7 +791,7 @@ double PathSymProto::step() const {
   return step_;
 }
 void PathSymProto::set_step(double value) {
-  
+
   step_ = value;
   // @@protoc_insertion_point(field_set:PathSymProto.step)
 }
@@ -803,7 +805,7 @@ double PathSymProto::offset() const {
   return offset_;
 }
 void PathSymProto::set_offset(double value) {
-  
+
   offset_ = value;
   // @@protoc_insertion_point(field_set:PathSymProto.offset)
 }
@@ -1211,7 +1213,7 @@ double LineRuleProto::width() const {
   return width_;
 }
 void LineRuleProto::set_width(double value) {
-  
+
   width_ = value;
   // @@protoc_insertion_point(field_set:LineRuleProto.width)
 }
@@ -1225,7 +1227,7 @@ void LineRuleProto::clear_color() {
   return color_;
 }
 void LineRuleProto::set_color(::google::protobuf::uint32 value) {
-  
+
   color_ = value;
   // @@protoc_insertion_point(field_set:LineRuleProto.color)
 }
@@ -1244,7 +1246,7 @@ const ::DashDotProto& LineRuleProto::dashdot() const {
                          : *::DashDotProto::internal_default_instance();
 }
 ::DashDotProto* LineRuleProto::mutable_dashdot() {
-  
+
   if (dashdot_ == NULL) {
     dashdot_ = new ::DashDotProto;
   }
@@ -1253,7 +1255,7 @@ const ::DashDotProto& LineRuleProto::dashdot() const {
 }
 ::DashDotProto* LineRuleProto::release_dashdot() {
   // @@protoc_insertion_point(field_release:LineRuleProto.dashdot)
-  
+
   ::DashDotProto* temp = dashdot_;
   dashdot_ = NULL;
   return temp;
@@ -1262,9 +1264,9 @@ void LineRuleProto::set_allocated_dashdot(::DashDotProto* dashdot) {
   delete dashdot_;
   dashdot_ = dashdot;
   if (dashdot) {
-    
+
   } else {
-    
+
   }
   // @@protoc_insertion_point(field_set_allocated:LineRuleProto.dashdot)
 }
@@ -1278,7 +1280,7 @@ void LineRuleProto::clear_priority() {
   return priority_;
 }
 void LineRuleProto::set_priority(::google::protobuf::int32 value) {
-  
+
   priority_ = value;
   // @@protoc_insertion_point(field_set:LineRuleProto.priority)
 }
@@ -1297,7 +1299,7 @@ const ::PathSymProto& LineRuleProto::pathsym() const {
                          : *::PathSymProto::internal_default_instance();
 }
 ::PathSymProto* LineRuleProto::mutable_pathsym() {
-  
+
   if (pathsym_ == NULL) {
     pathsym_ = new ::PathSymProto;
   }
@@ -1306,7 +1308,7 @@ const ::PathSymProto& LineRuleProto::pathsym() const {
 }
 ::PathSymProto* LineRuleProto::release_pathsym() {
   // @@protoc_insertion_point(field_release:LineRuleProto.pathsym)
-  
+
   ::PathSymProto* temp = pathsym_;
   pathsym_ = NULL;
   return temp;
@@ -1315,9 +1317,9 @@ void LineRuleProto::set_allocated_pathsym(::PathSymProto* pathsym) {
   delete pathsym_;
   pathsym_ = pathsym;
   if (pathsym) {
-    
+
   } else {
-    
+
   }
   // @@protoc_insertion_point(field_set_allocated:LineRuleProto.pathsym)
 }
@@ -1331,7 +1333,7 @@ void LineRuleProto::clear_join() {
   return static_cast< ::LineJoin >(join_);
 }
 void LineRuleProto::set_join(::LineJoin value) {
-  
+
   join_ = value;
   // @@protoc_insertion_point(field_set:LineRuleProto.join)
 }
@@ -1345,7 +1347,7 @@ void LineRuleProto::clear_cap() {
   return static_cast< ::LineCap >(cap_);
 }
 void LineRuleProto::set_cap(::LineCap value) {
-  
+
   cap_ = value;
   // @@protoc_insertion_point(field_set:LineRuleProto.cap)
 }
@@ -1722,7 +1724,7 @@ double LineDefProto::width() const {
   return width_;
 }
 void LineDefProto::set_width(double value) {
-  
+
   width_ = value;
   // @@protoc_insertion_point(field_set:LineDefProto.width)
 }
@@ -1736,7 +1738,7 @@ void LineDefProto::clear_color() {
   return color_;
 }
 void LineDefProto::set_color(::google::protobuf::uint32 value) {
-  
+
   color_ = value;
   // @@protoc_insertion_point(field_set:LineDefProto.color)
 }
@@ -1755,7 +1757,7 @@ const ::DashDotProto& LineDefProto::dashdot() const {
                          : *::DashDotProto::internal_default_instance();
 }
 ::DashDotProto* LineDefProto::mutable_dashdot() {
-  
+
   if (dashdot_ == NULL) {
     dashdot_ = new ::DashDotProto;
   }
@@ -1764,7 +1766,7 @@ const ::DashDotProto& LineDefProto::dashdot() const {
 }
 ::DashDotProto* LineDefProto::release_dashdot() {
   // @@protoc_insertion_point(field_release:LineDefProto.dashdot)
-  
+
   ::DashDotProto* temp = dashdot_;
   dashdot_ = NULL;
   return temp;
@@ -1773,9 +1775,9 @@ void LineDefProto::set_allocated_dashdot(::DashDotProto* dashdot) {
   delete dashdot_;
   dashdot_ = dashdot;
   if (dashdot) {
-    
+
   } else {
-    
+
   }
   // @@protoc_insertion_point(field_set_allocated:LineDefProto.dashdot)
 }
@@ -1794,7 +1796,7 @@ const ::PathSymProto& LineDefProto::pathsym() const {
                          : *::PathSymProto::internal_default_instance();
 }
 ::PathSymProto* LineDefProto::mutable_pathsym() {
-  
+
   if (pathsym_ == NULL) {
     pathsym_ = new ::PathSymProto;
   }
@@ -1803,7 +1805,7 @@ const ::PathSymProto& LineDefProto::pathsym() const {
 }
 ::PathSymProto* LineDefProto::release_pathsym() {
   // @@protoc_insertion_point(field_release:LineDefProto.pathsym)
-  
+
   ::PathSymProto* temp = pathsym_;
   pathsym_ = NULL;
   return temp;
@@ -1812,9 +1814,9 @@ void LineDefProto::set_allocated_pathsym(::PathSymProto* pathsym) {
   delete pathsym_;
   pathsym_ = pathsym;
   if (pathsym) {
-    
+
   } else {
-    
+
   }
   // @@protoc_insertion_point(field_set_allocated:LineDefProto.pathsym)
 }
@@ -1828,7 +1830,7 @@ void LineDefProto::clear_join() {
   return static_cast< ::LineJoin >(join_);
 }
 void LineDefProto::set_join(::LineJoin value) {
-  
+
   join_ = value;
   // @@protoc_insertion_point(field_set:LineDefProto.join)
 }
@@ -1842,7 +1844,7 @@ void LineDefProto::clear_cap() {
   return static_cast< ::LineCap >(cap_);
 }
 void LineDefProto::set_cap(::LineCap value) {
-  
+
   cap_ = value;
   // @@protoc_insertion_point(field_set:LineDefProto.cap)
 }
@@ -2115,7 +2117,7 @@ void AreaRuleProto::clear_color() {
   return color_;
 }
 void AreaRuleProto::set_color(::google::protobuf::uint32 value) {
-  
+
   color_ = value;
   // @@protoc_insertion_point(field_set:AreaRuleProto.color)
 }
@@ -2134,7 +2136,7 @@ const ::LineDefProto& AreaRuleProto::border() const {
                          : *::LineDefProto::internal_default_instance();
 }
 ::LineDefProto* AreaRuleProto::mutable_border() {
-  
+
   if (border_ == NULL) {
     border_ = new ::LineDefProto;
   }
@@ -2143,7 +2145,7 @@ const ::LineDefProto& AreaRuleProto::border() const {
 }
 ::LineDefProto* AreaRuleProto::release_border() {
   // @@protoc_insertion_point(field_release:AreaRuleProto.border)
-  
+
   ::LineDefProto* temp = border_;
   border_ = NULL;
   return temp;
@@ -2152,9 +2154,9 @@ void AreaRuleProto::set_allocated_border(::LineDefProto* border) {
   delete border_;
   border_ = border;
   if (border) {
-    
+
   } else {
-    
+
   }
   // @@protoc_insertion_point(field_set_allocated:AreaRuleProto.border)
 }
@@ -2168,7 +2170,7 @@ void AreaRuleProto::clear_priority() {
   return priority_;
 }
 void AreaRuleProto::set_priority(::google::protobuf::int32 value) {
-  
+
   priority_ = value;
   // @@protoc_insertion_point(field_set:AreaRuleProto.priority)
 }
@@ -2476,13 +2478,13 @@ const ::std::string& SymbolRuleProto::name() const {
   return name_.GetNoArena();
 }
 void SymbolRuleProto::set_name(const ::std::string& value) {
-  
+
   name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
   // @@protoc_insertion_point(field_set:SymbolRuleProto.name)
 }
 #if LANG_CXX11
 void SymbolRuleProto::set_name(::std::string&& value) {
-  
+
   name_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
   // @@protoc_insertion_point(field_set_rvalue:SymbolRuleProto.name)
@@ -2490,31 +2492,31 @@ void SymbolRuleProto::set_name(::std::string&& value) {
 #endif
 void SymbolRuleProto::set_name(const char* value) {
   GOOGLE_DCHECK(value != NULL);
-  
+
   name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
   // @@protoc_insertion_point(field_set_char:SymbolRuleProto.name)
 }
 void SymbolRuleProto::set_name(const char* value, size_t size) {
-  
+
   name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
   // @@protoc_insertion_point(field_set_pointer:SymbolRuleProto.name)
 }
 ::std::string* SymbolRuleProto::mutable_name() {
-  
+
   // @@protoc_insertion_point(field_mutable:SymbolRuleProto.name)
   return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 ::std::string* SymbolRuleProto::release_name() {
   // @@protoc_insertion_point(field_release:SymbolRuleProto.name)
-  
+
   return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 void SymbolRuleProto::set_allocated_name(::std::string* name) {
   if (name != NULL) {
-    
+
   } else {
-    
+
   }
   name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name);
   // @@protoc_insertion_point(field_set_allocated:SymbolRuleProto.name)
@@ -2529,7 +2531,7 @@ void SymbolRuleProto::clear_apply_for_type() {
   return apply_for_type_;
 }
 void SymbolRuleProto::set_apply_for_type(::google::protobuf::int32 value) {
-  
+
   apply_for_type_ = value;
   // @@protoc_insertion_point(field_set:SymbolRuleProto.apply_for_type)
 }
@@ -2543,7 +2545,7 @@ void SymbolRuleProto::clear_priority() {
   return priority_;
 }
 void SymbolRuleProto::set_priority(::google::protobuf::int32 value) {
-  
+
   priority_ = value;
   // @@protoc_insertion_point(field_set:SymbolRuleProto.priority)
 }
@@ -2557,7 +2559,7 @@ void SymbolRuleProto::clear_min_distance() {
   return min_distance_;
 }
 void SymbolRuleProto::set_min_distance(::google::protobuf::int32 value) {
-  
+
   min_distance_ = value;
   // @@protoc_insertion_point(field_set:SymbolRuleProto.min_distance)
 }
@@ -2956,7 +2958,7 @@ void CaptionDefProto::clear_height() {
   return height_;
 }
 void CaptionDefProto::set_height(::google::protobuf::int32 value) {
-  
+
   height_ = value;
   // @@protoc_insertion_point(field_set:CaptionDefProto.height)
 }
@@ -2970,7 +2972,7 @@ void CaptionDefProto::clear_color() {
   return color_;
 }
 void CaptionDefProto::set_color(::google::protobuf::uint32 value) {
-  
+
   color_ = value;
   // @@protoc_insertion_point(field_set:CaptionDefProto.color)
 }
@@ -2984,7 +2986,7 @@ void CaptionDefProto::clear_stroke_color() {
   return stroke_color_;
 }
 void CaptionDefProto::set_stroke_color(::google::protobuf::uint32 value) {
-  
+
   stroke_color_ = value;
   // @@protoc_insertion_point(field_set:CaptionDefProto.stroke_color)
 }
@@ -2998,7 +3000,7 @@ void CaptionDefProto::clear_offset_x() {
   return offset_x_;
 }
 void CaptionDefProto::set_offset_x(::google::protobuf::int32 value) {
-  
+
   offset_x_ = value;
   // @@protoc_insertion_point(field_set:CaptionDefProto.offset_x)
 }
@@ -3012,7 +3014,7 @@ void CaptionDefProto::clear_offset_y() {
   return offset_y_;
 }
 void CaptionDefProto::set_offset_y(::google::protobuf::int32 value) {
-  
+
   offset_y_ = value;
   // @@protoc_insertion_point(field_set:CaptionDefProto.offset_y)
 }
@@ -3026,13 +3028,13 @@ const ::std::string& CaptionDefProto::text() const {
   return text_.GetNoArena();
 }
 void CaptionDefProto::set_text(const ::std::string& value) {
-  
+
   text_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
   // @@protoc_insertion_point(field_set:CaptionDefProto.text)
 }
 #if LANG_CXX11
 void CaptionDefProto::set_text(::std::string&& value) {
-  
+
   text_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
   // @@protoc_insertion_point(field_set_rvalue:CaptionDefProto.text)
@@ -3040,31 +3042,31 @@ void CaptionDefProto::set_text(::std::string&& value) {
 #endif
 void CaptionDefProto::set_text(const char* value) {
   GOOGLE_DCHECK(value != NULL);
-  
+
   text_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
   // @@protoc_insertion_point(field_set_char:CaptionDefProto.text)
 }
 void CaptionDefProto::set_text(const char* value, size_t size) {
-  
+
   text_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
   // @@protoc_insertion_point(field_set_pointer:CaptionDefProto.text)
 }
 ::std::string* CaptionDefProto::mutable_text() {
-  
+
   // @@protoc_insertion_point(field_mutable:CaptionDefProto.text)
   return text_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 ::std::string* CaptionDefProto::release_text() {
   // @@protoc_insertion_point(field_release:CaptionDefProto.text)
-  
+
   return text_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 void CaptionDefProto::set_allocated_text(::std::string* text) {
   if (text != NULL) {
-    
+
   } else {
-    
+
   }
   text_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), text);
   // @@protoc_insertion_point(field_set_allocated:CaptionDefProto.text)
@@ -3079,7 +3081,7 @@ bool CaptionDefProto::is_optional() const {
   return is_optional_;
 }
 void CaptionDefProto::set_is_optional(bool value) {
-  
+
   is_optional_ = value;
   // @@protoc_insertion_point(field_set:CaptionDefProto.is_optional)
 }
@@ -3365,7 +3367,7 @@ const ::CaptionDefProto& CaptionRuleProto::primary() const {
                          : *::CaptionDefProto::internal_default_instance();
 }
 ::CaptionDefProto* CaptionRuleProto::mutable_primary() {
-  
+
   if (primary_ == NULL) {
     primary_ = new ::CaptionDefProto;
   }
@@ -3374,7 +3376,7 @@ const ::CaptionDefProto& CaptionRuleProto::primary() const {
 }
 ::CaptionDefProto* CaptionRuleProto::release_primary() {
   // @@protoc_insertion_point(field_release:CaptionRuleProto.primary)
-  
+
   ::CaptionDefProto* temp = primary_;
   primary_ = NULL;
   return temp;
@@ -3383,9 +3385,9 @@ void CaptionRuleProto::set_allocated_primary(::CaptionDefProto* primary) {
   delete primary_;
   primary_ = primary;
   if (primary) {
-    
+
   } else {
-    
+
   }
   // @@protoc_insertion_point(field_set_allocated:CaptionRuleProto.primary)
 }
@@ -3404,7 +3406,7 @@ const ::CaptionDefProto& CaptionRuleProto::secondary() const {
                          : *::CaptionDefProto::internal_default_instance();
 }
 ::CaptionDefProto* CaptionRuleProto::mutable_secondary() {
-  
+
   if (secondary_ == NULL) {
     secondary_ = new ::CaptionDefProto;
   }
@@ -3413,7 +3415,7 @@ const ::CaptionDefProto& CaptionRuleProto::secondary() const {
 }
 ::CaptionDefProto* CaptionRuleProto::release_secondary() {
   // @@protoc_insertion_point(field_release:CaptionRuleProto.secondary)
-  
+
   ::CaptionDefProto* temp = secondary_;
   secondary_ = NULL;
   return temp;
@@ -3422,9 +3424,9 @@ void CaptionRuleProto::set_allocated_secondary(::CaptionDefProto* secondary) {
   delete secondary_;
   secondary_ = secondary;
   if (secondary) {
-    
+
   } else {
-    
+
   }
   // @@protoc_insertion_point(field_set_allocated:CaptionRuleProto.secondary)
 }
@@ -3438,7 +3440,7 @@ void CaptionRuleProto::clear_priority() {
   return priority_;
 }
 void CaptionRuleProto::set_priority(::google::protobuf::int32 value) {
-  
+
   priority_ = value;
   // @@protoc_insertion_point(field_set:CaptionRuleProto.priority)
 }
@@ -3740,7 +3742,7 @@ double CircleRuleProto::radius() const {
   return radius_;
 }
 void CircleRuleProto::set_radius(double value) {
-  
+
   radius_ = value;
   // @@protoc_insertion_point(field_set:CircleRuleProto.radius)
 }
@@ -3754,7 +3756,7 @@ void CircleRuleProto::clear_color() {
   return color_;
 }
 void CircleRuleProto::set_color(::google::protobuf::uint32 value) {
-  
+
   color_ = value;
   // @@protoc_insertion_point(field_set:CircleRuleProto.color)
 }
@@ -3773,7 +3775,7 @@ const ::LineDefProto& CircleRuleProto::border() const {
                          : *::LineDefProto::internal_default_instance();
 }
 ::LineDefProto* CircleRuleProto::mutable_border() {
-  
+
   if (border_ == NULL) {
     border_ = new ::LineDefProto;
   }
@@ -3782,7 +3784,7 @@ const ::LineDefProto& CircleRuleProto::border() const {
 }
 ::LineDefProto* CircleRuleProto::release_border() {
   // @@protoc_insertion_point(field_release:CircleRuleProto.border)
-  
+
   ::LineDefProto* temp = border_;
   border_ = NULL;
   return temp;
@@ -3791,9 +3793,9 @@ void CircleRuleProto::set_allocated_border(::LineDefProto* border) {
   delete border_;
   border_ = border;
   if (border) {
-    
+
   } else {
-    
+
   }
   // @@protoc_insertion_point(field_set_allocated:CircleRuleProto.border)
 }
@@ -3807,7 +3809,7 @@ void CircleRuleProto::clear_priority() {
   return priority_;
 }
 void CircleRuleProto::set_priority(::google::protobuf::int32 value) {
-  
+
   priority_ = value;
   // @@protoc_insertion_point(field_set:CircleRuleProto.priority)
 }
@@ -4093,7 +4095,7 @@ const ::CaptionDefProto& PathTextRuleProto::primary() const {
                          : *::CaptionDefProto::internal_default_instance();
 }
 ::CaptionDefProto* PathTextRuleProto::mutable_primary() {
-  
+
   if (primary_ == NULL) {
     primary_ = new ::CaptionDefProto;
   }
@@ -4102,7 +4104,7 @@ const ::CaptionDefProto& PathTextRuleProto::primary() const {
 }
 ::CaptionDefProto* PathTextRuleProto::release_primary() {
   // @@protoc_insertion_point(field_release:PathTextRuleProto.primary)
-  
+
   ::CaptionDefProto* temp = primary_;
   primary_ = NULL;
   return temp;
@@ -4111,9 +4113,9 @@ void PathTextRuleProto::set_allocated_primary(::CaptionDefProto* primary) {
   delete primary_;
   primary_ = primary;
   if (primary) {
-    
+
   } else {
-    
+
   }
   // @@protoc_insertion_point(field_set_allocated:PathTextRuleProto.primary)
 }
@@ -4132,7 +4134,7 @@ const ::CaptionDefProto& PathTextRuleProto::secondary() const {
                          : *::CaptionDefProto::internal_default_instance();
 }
 ::CaptionDefProto* PathTextRuleProto::mutable_secondary() {
-  
+
   if (secondary_ == NULL) {
     secondary_ = new ::CaptionDefProto;
   }
@@ -4141,7 +4143,7 @@ const ::CaptionDefProto& PathTextRuleProto::secondary() const {
 }
 ::CaptionDefProto* PathTextRuleProto::release_secondary() {
   // @@protoc_insertion_point(field_release:PathTextRuleProto.secondary)
-  
+
   ::CaptionDefProto* temp = secondary_;
   secondary_ = NULL;
   return temp;
@@ -4150,9 +4152,9 @@ void PathTextRuleProto::set_allocated_secondary(::CaptionDefProto* secondary) {
   delete secondary_;
   secondary_ = secondary;
   if (secondary) {
-    
+
   } else {
-    
+
   }
   // @@protoc_insertion_point(field_set_allocated:PathTextRuleProto.secondary)
 }
@@ -4166,7 +4168,7 @@ void PathTextRuleProto::clear_priority() {
   return priority_;
 }
 void PathTextRuleProto::set_priority(::google::protobuf::int32 value) {
-  
+
   priority_ = value;
   // @@protoc_insertion_point(field_set:PathTextRuleProto.priority)
 }
@@ -4552,7 +4554,7 @@ void ShieldRuleProto::clear_height() {
   return height_;
 }
 void ShieldRuleProto::set_height(::google::protobuf::int32 value) {
-  
+
   height_ = value;
   // @@protoc_insertion_point(field_set:ShieldRuleProto.height)
 }
@@ -4566,7 +4568,7 @@ void ShieldRuleProto::clear_color() {
   return color_;
 }
 void ShieldRuleProto::set_color(::google::protobuf::uint32 value) {
-  
+
   color_ = value;
   // @@protoc_insertion_point(field_set:ShieldRuleProto.color)
 }
@@ -4580,7 +4582,7 @@ void ShieldRuleProto::clear_stroke_color() {
   return stroke_color_;
 }
 void ShieldRuleProto::set_stroke_color(::google::protobuf::uint32 value) {
-  
+
   stroke_color_ = value;
   // @@protoc_insertion_point(field_set:ShieldRuleProto.stroke_color)
 }
@@ -4594,7 +4596,7 @@ void ShieldRuleProto::clear_priority() {
   return priority_;
 }
 void ShieldRuleProto::set_priority(::google::protobuf::int32 value) {
-  
+
   priority_ = value;
   // @@protoc_insertion_point(field_set:ShieldRuleProto.priority)
 }
@@ -4608,7 +4610,7 @@ void ShieldRuleProto::clear_min_distance() {
   return min_distance_;
 }
 void ShieldRuleProto::set_min_distance(::google::protobuf::int32 value) {
-  
+
   min_distance_ = value;
   // @@protoc_insertion_point(field_set:ShieldRuleProto.min_distance)
 }
@@ -4622,7 +4624,7 @@ void ShieldRuleProto::clear_text_color() {
   return text_color_;
 }
 void ShieldRuleProto::set_text_color(::google::protobuf::uint32 value) {
-  
+
   text_color_ = value;
   // @@protoc_insertion_point(field_set:ShieldRuleProto.text_color)
 }
@@ -4636,7 +4638,7 @@ void ShieldRuleProto::clear_text_stroke_color() {
   return text_stroke_color_;
 }
 void ShieldRuleProto::set_text_stroke_color(::google::protobuf::uint32 value) {
-  
+
   text_stroke_color_ = value;
   // @@protoc_insertion_point(field_set:ShieldRuleProto.text_stroke_color)
 }
@@ -5159,7 +5161,7 @@ void DrawElementProto::clear_scale() {
   return scale_;
 }
 void DrawElementProto::set_scale(::google::protobuf::int32 value) {
-  
+
   scale_ = value;
   // @@protoc_insertion_point(field_set:DrawElementProto.scale)
 }
@@ -5208,7 +5210,7 @@ const ::AreaRuleProto& DrawElementProto::area() const {
                          : *::AreaRuleProto::internal_default_instance();
 }
 ::AreaRuleProto* DrawElementProto::mutable_area() {
-  
+
   if (area_ == NULL) {
     area_ = new ::AreaRuleProto;
   }
@@ -5217,7 +5219,7 @@ const ::AreaRuleProto& DrawElementProto::area() const {
 }
 ::AreaRuleProto* DrawElementProto::release_area() {
   // @@protoc_insertion_point(field_release:DrawElementProto.area)
-  
+
   ::AreaRuleProto* temp = area_;
   area_ = NULL;
   return temp;
@@ -5226,9 +5228,9 @@ void DrawElementProto::set_allocated_area(::AreaRuleProto* area) {
   delete area_;
   area_ = area;
   if (area) {
-    
+
   } else {
-    
+
   }
   // @@protoc_insertion_point(field_set_allocated:DrawElementProto.area)
 }
@@ -5247,7 +5249,7 @@ const ::SymbolRuleProto& DrawElementProto::symbol() const {
                          : *::SymbolRuleProto::internal_default_instance();
 }
 ::SymbolRuleProto* DrawElementProto::mutable_symbol() {
-  
+
   if (symbol_ == NULL) {
     symbol_ = new ::SymbolRuleProto;
   }
@@ -5256,7 +5258,7 @@ const ::SymbolRuleProto& DrawElementProto::symbol() const {
 }
 ::SymbolRuleProto* DrawElementProto::release_symbol() {
   // @@protoc_insertion_point(field_release:DrawElementProto.symbol)
-  
+
   ::SymbolRuleProto* temp = symbol_;
   symbol_ = NULL;
   return temp;
@@ -5265,9 +5267,9 @@ void DrawElementProto::set_allocated_symbol(::SymbolRuleProto* symbol) {
   delete symbol_;
   symbol_ = symbol;
   if (symbol) {
-    
+
   } else {
-    
+
   }
   // @@protoc_insertion_point(field_set_allocated:DrawElementProto.symbol)
 }
@@ -5286,7 +5288,7 @@ const ::CaptionRuleProto& DrawElementProto::caption() const {
                          : *::CaptionRuleProto::internal_default_instance();
 }
 ::CaptionRuleProto* DrawElementProto::mutable_caption() {
-  
+
   if (caption_ == NULL) {
     caption_ = new ::CaptionRuleProto;
   }
@@ -5295,7 +5297,7 @@ const ::CaptionRuleProto& DrawElementProto::caption() const {
 }
 ::CaptionRuleProto* DrawElementProto::release_caption() {
   // @@protoc_insertion_point(field_release:DrawElementProto.caption)
-  
+
   ::CaptionRuleProto* temp = caption_;
   caption_ = NULL;
   return temp;
@@ -5304,9 +5306,9 @@ void DrawElementProto::set_allocated_caption(::CaptionRuleProto* caption) {
   delete caption_;
   caption_ = caption;
   if (caption) {
-    
+
   } else {
-    
+
   }
   // @@protoc_insertion_point(field_set_allocated:DrawElementProto.caption)
 }
@@ -5325,7 +5327,7 @@ const ::CircleRuleProto& DrawElementProto::circle() const {
                          : *::CircleRuleProto::internal_default_instance();
 }
 ::CircleRuleProto* DrawElementProto::mutable_circle() {
-  
+
   if (circle_ == NULL) {
     circle_ = new ::CircleRuleProto;
   }
@@ -5334,7 +5336,7 @@ const ::CircleRuleProto& DrawElementProto::circle() const {
 }
 ::CircleRuleProto* DrawElementProto::release_circle() {
   // @@protoc_insertion_point(field_release:DrawElementProto.circle)
-  
+
   ::CircleRuleProto* temp = circle_;
   circle_ = NULL;
   return temp;
@@ -5343,9 +5345,9 @@ void DrawElementProto::set_allocated_circle(::CircleRuleProto* circle) {
   delete circle_;
   circle_ = circle;
   if (circle) {
-    
+
   } else {
-    
+
   }
   // @@protoc_insertion_point(field_set_allocated:DrawElementProto.circle)
 }
@@ -5364,7 +5366,7 @@ const ::PathTextRuleProto& DrawElementProto::path_text() const {
                          : *::PathTextRuleProto::internal_default_instance();
 }
 ::PathTextRuleProto* DrawElementProto::mutable_path_text() {
-  
+
   if (path_text_ == NULL) {
     path_text_ = new ::PathTextRuleProto;
   }
@@ -5373,7 +5375,7 @@ const ::PathTextRuleProto& DrawElementProto::path_text() const {
 }
 ::PathTextRuleProto* DrawElementProto::release_path_text() {
   // @@protoc_insertion_point(field_release:DrawElementProto.path_text)
-  
+
   ::PathTextRuleProto* temp = path_text_;
   path_text_ = NULL;
   return temp;
@@ -5382,9 +5384,9 @@ void DrawElementProto::set_allocated_path_text(::PathTextRuleProto* path_text) {
   delete path_text_;
   path_text_ = path_text;
   if (path_text) {
-    
+
   } else {
-    
+
   }
   // @@protoc_insertion_point(field_set_allocated:DrawElementProto.path_text)
 }
@@ -5403,7 +5405,7 @@ const ::ShieldRuleProto& DrawElementProto::shield() const {
                          : *::ShieldRuleProto::internal_default_instance();
 }
 ::ShieldRuleProto* DrawElementProto::mutable_shield() {
-  
+
   if (shield_ == NULL) {
     shield_ = new ::ShieldRuleProto;
   }
@@ -5412,7 +5414,7 @@ const ::ShieldRuleProto& DrawElementProto::shield() const {
 }
 ::ShieldRuleProto* DrawElementProto::release_shield() {
   // @@protoc_insertion_point(field_release:DrawElementProto.shield)
-  
+
   ::ShieldRuleProto* temp = shield_;
   shield_ = NULL;
   return temp;
@@ -5421,9 +5423,9 @@ void DrawElementProto::set_allocated_shield(::ShieldRuleProto* shield) {
   delete shield_;
   shield_ = shield;
   if (shield) {
-    
+
   } else {
-    
+
   }
   // @@protoc_insertion_point(field_set_allocated:DrawElementProto.shield)
 }
@@ -5734,13 +5736,13 @@ const ::std::string& ClassifElementProto::name() const {
   return name_.GetNoArena();
 }
 void ClassifElementProto::set_name(const ::std::string& value) {
-  
+
   name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
   // @@protoc_insertion_point(field_set:ClassifElementProto.name)
 }
 #if LANG_CXX11
 void ClassifElementProto::set_name(::std::string&& value) {
-  
+
   name_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
   // @@protoc_insertion_point(field_set_rvalue:ClassifElementProto.name)
@@ -5748,31 +5750,31 @@ void ClassifElementProto::set_name(::std::string&& value) {
 #endif
 void ClassifElementProto::set_name(const char* value) {
   GOOGLE_DCHECK(value != NULL);
-  
+
   name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
   // @@protoc_insertion_point(field_set_char:ClassifElementProto.name)
 }
 void ClassifElementProto::set_name(const char* value, size_t size) {
-  
+
   name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
   // @@protoc_insertion_point(field_set_pointer:ClassifElementProto.name)
 }
 ::std::string* ClassifElementProto::mutable_name() {
-  
+
   // @@protoc_insertion_point(field_mutable:ClassifElementProto.name)
   return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 ::std::string* ClassifElementProto::release_name() {
   // @@protoc_insertion_point(field_release:ClassifElementProto.name)
-  
+
   return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 void ClassifElementProto::set_allocated_name(::std::string* name) {
   if (name != NULL) {
-    
+
   } else {
-    
+
   }
   name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name);
   // @@protoc_insertion_point(field_set_allocated:ClassifElementProto.name)
@@ -6107,13 +6109,13 @@ const ::std::string& ColorElementProto::name() const {
   return name_.GetNoArena();
 }
 void ColorElementProto::set_name(const ::std::string& value) {
-  
+
   name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
   // @@protoc_insertion_point(field_set:ColorElementProto.name)
 }
 #if LANG_CXX11
 void ColorElementProto::set_name(::std::string&& value) {
-  
+
   name_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
   // @@protoc_insertion_point(field_set_rvalue:ColorElementProto.name)
@@ -6121,31 +6123,31 @@ void ColorElementProto::set_name(::std::string&& value) {
 #endif
 void ColorElementProto::set_name(const char* value) {
   GOOGLE_DCHECK(value != NULL);
-  
+
   name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
   // @@protoc_insertion_point(field_set_char:ColorElementProto.name)
 }
 void ColorElementProto::set_name(const char* value, size_t size) {
-  
+
   name_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
   // @@protoc_insertion_point(field_set_pointer:ColorElementProto.name)
 }
 ::std::string* ColorElementProto::mutable_name() {
-  
+
   // @@protoc_insertion_point(field_mutable:ColorElementProto.name)
   return name_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 ::std::string* ColorElementProto::release_name() {
   // @@protoc_insertion_point(field_release:ColorElementProto.name)
-  
+
   return name_.ReleaseNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 void ColorElementProto::set_allocated_name(::std::string* name) {
   if (name != NULL) {
-    
+
   } else {
-    
+
   }
   name_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), name);
   // @@protoc_insertion_point(field_set_allocated:ColorElementProto.name)
@@ -6160,7 +6162,7 @@ void ColorElementProto::clear_color() {
   return color_;
 }
 void ColorElementProto::set_color(::google::protobuf::uint32 value) {
-  
+
   color_ = value;
   // @@protoc_insertion_point(field_set:ColorElementProto.color)
 }
@@ -6174,7 +6176,7 @@ float ColorElementProto::x() const {
   return x_;
 }
 void ColorElementProto::set_x(float value) {
-  
+
   x_ = value;
   // @@protoc_insertion_point(field_set:ColorElementProto.x)
 }
@@ -6188,7 +6190,7 @@ float ColorElementProto::y() const {
   return y_;
 }
 void ColorElementProto::set_y(float value) {
-  
+
   y_ = value;
   // @@protoc_insertion_point(field_set:ColorElementProto.y)
 }
@@ -6674,7 +6676,7 @@ const ::ColorsElementProto& ContainerProto::colors() const {
                          : *::ColorsElementProto::internal_default_instance();
 }
 ::ColorsElementProto* ContainerProto::mutable_colors() {
-  
+
   if (colors_ == NULL) {
     colors_ = new ::ColorsElementProto;
   }
@@ -6683,7 +6685,7 @@ const ::ColorsElementProto& ContainerProto::colors() const {
 }
 ::ColorsElementProto* ContainerProto::release_colors() {
   // @@protoc_insertion_point(field_release:ContainerProto.colors)
-  
+
   ::ColorsElementProto* temp = colors_;
   colors_ = NULL;
   return temp;
@@ -6692,9 +6694,9 @@ void ContainerProto::set_allocated_colors(::ColorsElementProto* colors) {
   delete colors_;
   colors_ = colors;
   if (colors) {
-    
+
   } else {
-    
+
   }
   // @@protoc_insertion_point(field_set_allocated:ContainerProto.colors)
 }
diff --git a/xcode/common.xcconfig b/xcode/common.xcconfig
index 7edb7fa65..ae6a3d653 100644
--- a/xcode/common.xcconfig
+++ b/xcode/common.xcconfig
@@ -69,7 +69,7 @@ GCC_WARN_UNUSED_VARIABLE = YES
 ALWAYS_SEARCH_USER_PATHS = NO
 CLANG_ADDRESS_SANITIZER_CONTAINER_OVERFLOW = YES
 CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES
-CLANG_CXX_LANGUAGE_STANDARD = c++20
+CLANG_CXX_LANGUAGE_STANDARD = c++23
 CLANG_CXX_LIBRARY = libc++
 CLANG_ENABLE_MODULES = YES
 CLANG_ENABLE_OBJC_ARC = YES
@@ -82,7 +82,7 @@ DEBUG_INFORMATION_FORMAT = dwarf
 ENABLE_CODE_COVERAGE = NO
 ENABLE_STRICT_OBJC_MSGSEND = YES
 ENABLE_USER_SCRIPT_SANDBOXING = YES
-GCC_C_LANGUAGE_STANDARD = c17
+GCC_C_LANGUAGE_STANDARD = c23
 GCC_DYNAMIC_NO_PIC = NO
 GCC_FAST_MATH = YES
 // -fvisibility-inlines-hidden

From b107638b8bd49b10806b2b8c21b4b8844aef0a50 Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Thu, 17 Jul 2025 08:23:04 -0300
Subject: [PATCH 056/302] [routing] SaveRoute minor fixes and CHECK.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 libs/map/bookmark_manager.cpp    | 25 +++++++++----------------
 libs/map/bookmark_manager.hpp    |  2 +-
 libs/map/routing_manager.cpp     |  8 +++-----
 libs/routing/routing_session.cpp | 14 ++++----------
 4 files changed, 17 insertions(+), 32 deletions(-)

diff --git a/libs/map/bookmark_manager.cpp b/libs/map/bookmark_manager.cpp
index 81ff5b556..30d54ef55 100644
--- a/libs/map/bookmark_manager.cpp
+++ b/libs/map/bookmark_manager.cpp
@@ -1163,32 +1163,25 @@ std::string BookmarkManager::GenerateSavedRouteName(std::string const & from, st
   return GenerateTrackRecordingName();
 }
 
-kml::TrackId BookmarkManager::SaveRoute(std::vector<geometry::PointWithAltitude> const & points,
-                                        std::string const & from, std::string const & to)
+kml::TrackId BookmarkManager::SaveRoute(std::vector<geometry::PointWithAltitude> points, std::string const & from,
+                                        std::string const & to)
 {
   CHECK(!points.empty(), ("Route points should not be empty"));
 
-  kml::MultiGeometry geometry;
-  geometry.m_lines.emplace_back();
-  geometry.m_timestamps.emplace_back();
-  auto & line = geometry.m_lines.back();
-
-  for (auto const & pt : points)
-    line.emplace_back(pt);
-
   kml::TrackData trackData;
-  trackData.m_geometry = std::move(geometry);
+  trackData.m_geometry.m_lines.push_back(std::move(points));
+  trackData.m_geometry.m_timestamps.emplace_back();
 
-  auto trackName = GenerateSavedRouteName(from, to);
-  kml::SetDefaultStr(trackData.m_name, trackName);
+  kml::SetDefaultStr(trackData.m_name, GenerateSavedRouteName(from, to));
 
   kml::ColorData colorData;
   colorData.m_rgba = GenerateTrackRecordingColor().GetRGBA();
   kml::TrackLayer layer;
   layer.m_color = colorData;
-  std::vector<kml::TrackLayer> m_layers;
-  m_layers.emplace_back(layer);
-  trackData.m_layers = std::move(m_layers);
+
+  std::vector<kml::TrackLayer> layers;
+  layers.emplace_back(layer);
+  trackData.m_layers = std::move(layers);
 
   trackData.m_timestamp = kml::TimestampClock::now();
 
diff --git a/libs/map/bookmark_manager.hpp b/libs/map/bookmark_manager.hpp
index cf5e663d0..d59774344 100644
--- a/libs/map/bookmark_manager.hpp
+++ b/libs/map/bookmark_manager.hpp
@@ -430,7 +430,7 @@ public:
   std::string GenerateTrackRecordingName() const;
   dp::Color GenerateTrackRecordingColor() const;
 
-  kml::TrackId SaveRoute(std::vector<geometry::PointWithAltitude> const & points, std::string const & from,
+  kml::TrackId SaveRoute(std::vector<geometry::PointWithAltitude> points, std::string const & from,
                          std::string const & to);
 
 private:
diff --git a/libs/map/routing_manager.cpp b/libs/map/routing_manager.cpp
index beb7bc562..9fd6f2adf 100644
--- a/libs/map/routing_manager.cpp
+++ b/libs/map/routing_manager.cpp
@@ -1084,16 +1084,14 @@ kml::TrackId RoutingManager::SaveRoute()
   std::vector<geometry::PointWithAltitude> junctions;
   RoutingSession().GetRouteJunctionPoints(junctions);
 
-  junctions.erase(std::unique(junctions.begin(), junctions.end(),
-                              [](geometry::PointWithAltitude const & p1, geometry::PointWithAltitude const & p2)
-  { return AlmostEqualAbs(p1, p2, kMwmPointAccuracy); }),
-                  junctions.end());
+  base::Unique(junctions, [](geometry::PointWithAltitude const & p1, geometry::PointWithAltitude const & p2)
+  { return AlmostEqualAbs(p1, p2, kMwmPointAccuracy); });
 
   auto const routePoints = GetRoutePoints();
   std::string const from = GetNameFromPoint(routePoints.front());
   std::string const to = GetNameFromPoint(routePoints.back());
 
-  return m_bmManager->SaveRoute(junctions, from, to);
+  return m_bmManager->SaveRoute(std::move(junctions), from, to);
 }
 
 bool RoutingManager::DisableFollowMode()
diff --git a/libs/routing/routing_session.cpp b/libs/routing/routing_session.cpp
index 2014ccc58..48bb2b9f8 100644
--- a/libs/routing/routing_session.cpp
+++ b/libs/routing/routing_session.cpp
@@ -1,8 +1,5 @@
 #include "routing/routing_session.hpp"
 
-#include "routing/routing_helpers.hpp"
-#include "routing/speed_camera.hpp"
-
 #include "platform/distance.hpp"
 #include "platform/location.hpp"
 #include "platform/measurement_utils.hpp"
@@ -789,15 +786,12 @@ bool RoutingSession::GetRouteJunctionPoints(std::vector<geometry::PointWithAltit
     return false;
 
   auto const & segments = m_route->GetRouteSegments();
+  CHECK(!segments.empty(), ());
+
   routeJunctionPoints.reserve(segments.size());
+  for (auto const & s : segments)
+    routeJunctionPoints.push_back(s.GetJunction());
 
-  for (size_t i = 0; i < segments.size(); ++i)
-  {
-    auto const & junction = segments[i].GetJunction();
-    routeJunctionPoints.push_back(junction);
-  }
-
-  ASSERT_EQUAL(routeJunctionPoints.size(), routeJunctionPoints.size(), ());
   return true;
 }
 

From 5ae8156fa346f3103a774c75010d73f90ac48d24 Mon Sep 17 00:00:00 2001
From: Osyotr <Osyotr@users.noreply.github.com>
Date: Sun, 27 Jul 2025 13:24:11 +0300
Subject: [PATCH 057/302] Fix std::atomic_flag initialization

Signed-off-by: Osyotr <Osyotr@users.noreply.github.com>
---
 libs/drape/texture_manager.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/drape/texture_manager.hpp b/libs/drape/texture_manager.hpp
index db814abef..06a3ed24e 100644
--- a/libs/drape/texture_manager.hpp
+++ b/libs/drape/texture_manager.hpp
@@ -206,7 +206,7 @@ private:
   std::vector<drape_ptr<HWTexture>> m_texturesToCleanup;
 
   base::Timer m_uploadTimer;
-  std::atomic_flag m_nothingToUpload{false};
+  std::atomic_flag m_nothingToUpload = ATOMIC_FLAG_INIT;
   std::mutex m_calcGlyphsMutex;
 
   // TODO(AB): Make a more robust use of BreakIterator to split strings and get rid of this space glyph.

From e00d5d33b2390806219d57fe7432b911d59b81eb Mon Sep 17 00:00:00 2001
From: Osyotr <Osyotr@users.noreply.github.com>
Date: Sun, 27 Jul 2025 13:33:57 +0300
Subject: [PATCH 058/302] Add missing include

Signed-off-by: Osyotr <Osyotr@users.noreply.github.com>
---
 qt/mainwindow.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qt/mainwindow.cpp b/qt/mainwindow.cpp
index b3a20f2f5..e88b7b3f2 100644
--- a/qt/mainwindow.cpp
+++ b/qt/mainwindow.cpp
@@ -46,6 +46,7 @@
 #include <QtWidgets/QToolBar>
 
 #ifdef OMIM_OS_WINDOWS
+#include "std/windows.hpp"
 #define IDM_ABOUT_DIALOG       1001
 #define IDM_PREFERENCES_DIALOG 1002
 #endif

From dfd7af92fa6c1b17aaa4f0d9f01a9b72f14f7f93 Mon Sep 17 00:00:00 2001
From: Osyotr <Osyotr@users.noreply.github.com>
Date: Sun, 27 Jul 2025 13:26:24 +0300
Subject: [PATCH 059/302] Remove usage of boost/iostreams from 3party/succint

Signed-off-by: Osyotr <Osyotr@users.noreply.github.com>
---
 3party/succinct/mapper.hpp |  7 -------
 3party/succinct/util.hpp   | 24 ------------------------
 2 files changed, 31 deletions(-)

diff --git a/3party/succinct/mapper.hpp b/3party/succinct/mapper.hpp
index 2b43a7083..8e096c8e0 100644
--- a/3party/succinct/mapper.hpp
+++ b/3party/succinct/mapper.hpp
@@ -7,7 +7,6 @@
 #include <boost/utility/enable_if.hpp>
 #include <boost/utility.hpp>
 #include <boost/type_traits/is_pod.hpp>
-#include <boost/iostreams/device/mapped_file.hpp>
 
 #include "mappable_vector.hpp"
 
@@ -283,12 +282,6 @@ namespace succinct { namespace mapper {
         return mapper.bytes_read();
     }
 
-    template <typename T>
-    size_t map(T& val, boost::iostreams::mapped_file_source const& m, uint64_t flags = 0, const char* friendly_name = "<TOP>")
-    {
-        return map(val, m.data(), flags, friendly_name);
-    }
-
     template <typename T>
     uint64_t size_of(T& val)
     {
diff --git a/3party/succinct/util.hpp b/3party/succinct/util.hpp
index 47a4f332b..8121a31a3 100644
--- a/3party/succinct/util.hpp
+++ b/3party/succinct/util.hpp
@@ -8,7 +8,6 @@
 #include <stdint.h>
 
 #include <boost/iterator/iterator_facade.hpp>
-#include <boost/iostreams/device/mapped_file.hpp>
 
 namespace succinct { namespace util {
 
@@ -205,29 +204,6 @@ namespace succinct { namespace util {
         std::string m_cur_value;
     };
 
-    struct mmap_lines
-    {
-        typedef buffer_line_iterator iterator;
-        typedef buffer_line_iterator const_iterator;
-
-        mmap_lines(std::string filename)
-            : m_map(filename)
-        {}
-
-        const_iterator begin() const
-        {
-            return const_iterator(m_map.data(), m_map.size());
-        }
-
-        const_iterator end() const
-        {
-            return const_iterator();
-        }
-
-    private:
-        boost::iostreams::mapped_file_source m_map;
-    };
-
     struct input_error : std::invalid_argument
     {
         input_error(std::string const& what)

From b5b333c832f318743d500adf698f2487ff4129f3 Mon Sep 17 00:00:00 2001
From: Osyotr <Osyotr@users.noreply.github.com>
Date: Sun, 27 Jul 2025 13:32:44 +0300
Subject: [PATCH 060/302] Fix TokenizeIterator on Windows

Signed-off-by: Osyotr <Osyotr@users.noreply.github.com>
---
 libs/base/string_utils.hpp | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/libs/base/string_utils.hpp b/libs/base/string_utils.hpp
index 071366563..1452425b5 100644
--- a/libs/base/string_utils.hpp
+++ b/libs/base/string_utils.hpp
@@ -150,25 +150,30 @@ inline std::string DebugPrint(UniString const & s)
   return ToUtf8(s);
 }
 
-template <typename DelimFn, typename Iter>
 class TokenizeIteratorBase
 {
+  template <typename...>
+  static constexpr bool is_utf8cpp_iterator = false;
+
+  template <typename... Args>
+  static constexpr bool is_utf8cpp_iterator<utf8::unchecked::iterator<Args...>> = true;
+
 public:
   using difference_type = std::ptrdiff_t;
   using iterator_category = std::input_iterator_tag;
 
-  // Hack to get buffer pointer from any iterator.
-  // Deliberately made non-static to simplify the call like this->ToCharPtr.
-  char const * ToCharPtr(char const * p) const { return p; }
   template <class T>
-  auto ToCharPtr(T const & i) const
+  static std::string_view ToStringView(T first, T last)
   {
-    return ToCharPtr(i.base());
+    if constexpr (is_utf8cpp_iterator<T>)
+      return TokenizeIteratorBase::ToStringView(first.base(), last.base());
+    else
+      return std::string_view(first, last);
   }
 };
 
 template <typename DelimFn, typename Iter, bool KeepEmptyTokens = false>
-class TokenizeIterator : public TokenizeIteratorBase<DelimFn, Iter>
+class TokenizeIterator : public TokenizeIteratorBase
 {
 public:
   template <class InIterT>
@@ -185,8 +190,7 @@ public:
   {
     ASSERT(m_start != m_finish, ("Dereferencing of empty iterator."));
 
-    auto const baseI = this->ToCharPtr(m_start);
-    return std::string_view(baseI, std::distance(baseI, this->ToCharPtr(m_end)));
+    return this->ToStringView(m_start, m_end);
   }
 
   UniString GetUniString() const
@@ -246,7 +250,7 @@ private:
 
 /// Used in ParseCSVRow for the generator routine.
 template <typename DelimFn, typename Iter>
-class TokenizeIterator<DelimFn, Iter, true /* KeepEmptyTokens */> : public TokenizeIteratorBase<DelimFn, Iter>
+class TokenizeIterator<DelimFn, Iter, true /* KeepEmptyTokens */> : public TokenizeIteratorBase
 {
 public:
   template <class InIterT>
@@ -265,8 +269,7 @@ public:
   {
     ASSERT(!m_finished, ("Dereferencing of empty iterator."));
 
-    auto const baseI = this->ToCharPtr(m_start);
-    return std::string_view(baseI, std::distance(baseI, this->ToCharPtr(m_end)));
+    return this->ToStringView(m_start, m_end);
   }
 
   explicit operator bool() const { return !m_finished; }

From 215c19dcc73a08c366fb4ce8c9c7a1eb019301f4 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Sat, 26 Jul 2025 21:46:13 +0200
Subject: [PATCH 061/302] Fix unity build error by removing `using namespace
 std;`

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 libs/platform/chunks_download_strategy.cpp    | 24 ++++-----
 libs/platform/country_file.cpp                |  8 ++-
 libs/platform/get_text_by_id.cpp              |  2 +-
 libs/platform/http_client.cpp                 |  8 +--
 libs/platform/http_request.cpp                | 28 +++++-----
 libs/platform/http_thread_qt.cpp              | 10 ++--
 libs/platform/local_country_file.cpp          | 15 +++---
 libs/platform/local_country_file_utils.cpp    | 29 ++++++-----
 libs/platform/platform_android.cpp            | 40 +++++++--------
 .../platform_tests/country_file_tests.cpp     |  6 +--
 .../downloader_tests/downloader_test.cpp      | 50 +++++++++---------
 .../platform_tests/get_text_by_id_tests.cpp   | 13 ++---
 .../local_country_file_tests.cpp              | 51 +++++++++++--------
 .../platform_tests_support/test_socket.cpp    | 19 +++----
 libs/platform/platform_unix_impl.cpp          | 30 +++++------
 libs/platform/platform_win.cpp                | 28 +++++-----
 libs/platform/settings.cpp                    | 20 ++++----
 17 files changed, 184 insertions(+), 197 deletions(-)

diff --git a/libs/platform/chunks_download_strategy.cpp b/libs/platform/chunks_download_strategy.cpp
index a942c6fae..b0d2f2bc1 100644
--- a/libs/platform/chunks_download_strategy.cpp
+++ b/libs/platform/chunks_download_strategy.cpp
@@ -10,30 +10,28 @@
 #include "base/logging.hpp"
 #include "base/macros.hpp"
 
-using namespace std;
-
 namespace downloader
 {
-ChunksDownloadStrategy::ChunksDownloadStrategy(vector<string> const & urls)
+ChunksDownloadStrategy::ChunksDownloadStrategy(std::vector<std::string> const & urls)
 {
   // init servers list
   for (size_t i = 0; i < urls.size(); ++i)
     m_servers.push_back(ServerT(urls[i], SERVER_READY));
 }
 
-pair<ChunksDownloadStrategy::ChunkT *, int> ChunksDownloadStrategy::GetChunk(RangeT const & range)
+std::pair<ChunksDownloadStrategy::ChunkT *, int> ChunksDownloadStrategy::GetChunk(RangeT const & range)
 {
-  vector<ChunkT>::iterator i = lower_bound(m_chunks.begin(), m_chunks.end(), range.first, LessChunks());
+  std::vector<ChunkT>::iterator i = lower_bound(m_chunks.begin(), m_chunks.end(), range.first, LessChunks());
 
   if (i != m_chunks.end() && i->m_pos == range.first)
   {
     ASSERT_EQUAL((i + 1)->m_pos, range.second + 1, ());
-    return pair<ChunkT *, int>(&(*i), distance(m_chunks.begin(), i));
+    return std::pair<ChunkT *, int>(&(*i), std::distance(m_chunks.begin(), i));
   }
   else
   {
     LOG(LERROR, ("Downloader error. Invalid chunk range: ", range));
-    return pair<ChunkT *, int>(static_cast<ChunkT *>(0), -1);
+    return std::pair<ChunkT *, int>(static_cast<ChunkT *>(0), -1);
   }
 }
 
@@ -87,7 +85,7 @@ void ChunksDownloadStrategy::AddChunk(RangeT const & range, ChunkStatusT status)
   m_chunks.push_back(ChunkT(range.second + 1, CHUNK_AUX));
 }
 
-void ChunksDownloadStrategy::SaveChunks(int64_t fileSize, string const & fName)
+void ChunksDownloadStrategy::SaveChunks(int64_t fileSize, std::string const & fName)
 {
   if (!m_chunks.empty())
   {
@@ -109,7 +107,7 @@ void ChunksDownloadStrategy::SaveChunks(int64_t fileSize, string const & fName)
   UNUSED_VALUE(Platform::RemoveFileIfExists(fName));
 }
 
-int64_t ChunksDownloadStrategy::LoadOrInitChunks(string const & fName, int64_t fileSize, int64_t chunkSize)
+int64_t ChunksDownloadStrategy::LoadOrInitChunks(std::string const & fName, int64_t fileSize, int64_t chunkSize)
 {
   ASSERT(fileSize > 0, ());
 
@@ -161,10 +159,10 @@ int64_t ChunksDownloadStrategy::LoadOrInitChunks(string const & fName, int64_t f
   return 0;
 }
 
-string ChunksDownloadStrategy::ChunkFinished(bool success, RangeT const & range)
+std::string ChunksDownloadStrategy::ChunkFinished(bool success, RangeT const & range)
 {
-  pair<ChunkT *, int> res = GetChunk(range);
-  string url;
+  std::pair<ChunkT *, int> res = GetChunk(range);
+  std::string url;
   // find server which was downloading this chunk
   if (res.first)
   {
@@ -194,7 +192,7 @@ string ChunksDownloadStrategy::ChunkFinished(bool success, RangeT const & range)
   return url;
 }
 
-ChunksDownloadStrategy::ResultT ChunksDownloadStrategy::NextChunk(string & outUrl, RangeT & range)
+ChunksDownloadStrategy::ResultT ChunksDownloadStrategy::NextChunk(std::string & outUrl, RangeT & range)
 {
   // If no servers at all.
   if (m_servers.empty())
diff --git a/libs/platform/country_file.cpp b/libs/platform/country_file.cpp
index 07ddd72c0..f5d1d7f46 100644
--- a/libs/platform/country_file.cpp
+++ b/libs/platform/country_file.cpp
@@ -8,9 +8,7 @@
 
 namespace platform
 {
-using namespace std;
-
-string GetFileName(string const & countryName, MapFileType type)
+std::string GetFileName(std::string const & countryName, MapFileType type)
 {
   ASSERT(!countryName.empty(), ());
 
@@ -34,9 +32,9 @@ CountryFile::CountryFile(std::string name, MwmSize size, std::string sha1)
   , m_sha1(std::move(sha1))
 {}
 
-string DebugPrint(CountryFile const & file)
+std::string DebugPrint(CountryFile const & file)
 {
-  ostringstream os;
+  std::ostringstream os;
   os << "CountryFile [" << file.m_name << "]";
   return os.str();
 }
diff --git a/libs/platform/get_text_by_id.cpp b/libs/platform/get_text_by_id.cpp
index 510ce6c5b..399350d80 100644
--- a/libs/platform/get_text_by_id.cpp
+++ b/libs/platform/get_text_by_id.cpp
@@ -11,7 +11,7 @@
 
 namespace platform
 {
-using namespace std;
+using std::string;
 
 namespace
 {
diff --git a/libs/platform/http_client.cpp b/libs/platform/http_client.cpp
index 3efb8f7e4..94fb6be34 100644
--- a/libs/platform/http_client.cpp
+++ b/libs/platform/http_client.cpp
@@ -6,10 +6,10 @@
 
 #include <sstream>
 
-using namespace std;
-
 namespace platform
 {
+using std::string;
+
 HttpClient::HttpClient(string const & url) : m_urlRequested(url) {}
 
 bool HttpClient::RunHttpRequest(string & response, SuccessChecker checker /* = nullptr */)
@@ -164,7 +164,7 @@ HttpClient::Headers const & HttpClient::GetHeaders() const
 // static
 string HttpClient::NormalizeServerCookies(string && cookies)
 {
-  istringstream is(cookies);
+  std::istringstream is(cookies);
   string str, result;
 
   // Split by ", ". Can have invalid tokens here, expires= can also contain a comma.
@@ -195,7 +195,7 @@ string HttpClient::NormalizeServerCookies(string && cookies)
 
 string DebugPrint(HttpClient const & request)
 {
-  ostringstream ostr;
+  std::ostringstream ostr;
   ostr << "HTTP " << request.ErrorCode() << " url [" << request.UrlRequested() << "]";
   if (request.WasRedirected())
     ostr << " was redirected to [" << request.UrlReceived() << "]";
diff --git a/libs/platform/http_request.cpp b/libs/platform/http_request.cpp
index 6b6a45117..82b9f8672 100644
--- a/libs/platform/http_request.cpp
+++ b/libs/platform/http_request.cpp
@@ -19,12 +19,12 @@
 
 #include "defines.hpp"
 
-using namespace std;
-
 class HttpThread;
 
 namespace downloader
 {
+using std::string;
+
 namespace non_http_error_code
 {
 string DebugPrint(long errorCode)
@@ -37,7 +37,7 @@ string DebugPrint(long errorCode)
   case kNonHttpResponse: return "Non-http response";
   case kInvalidURL: return "Invalid URL";
   case kCancelled: return "Cancelled";
-  default: return to_string(errorCode);
+  default: return std::to_string(errorCode);
   }
 }
 }  // namespace non_http_error_code
@@ -117,12 +117,12 @@ class FileHttpRequest
   , public IHttpThreadCallback
 {
   ChunksDownloadStrategy m_strategy;
-  typedef pair<HttpThread *, int64_t> ThreadHandleT;
-  typedef list<ThreadHandleT> ThreadsContainerT;
+  typedef std::pair<HttpThread *, int64_t> ThreadHandleT;
+  typedef std::list<ThreadHandleT> ThreadsContainerT;
   ThreadsContainerT m_threads;
 
-  string m_filePath;
-  unique_ptr<FileWriter> m_writer;
+  std::string m_filePath;
+  std::unique_ptr<FileWriter> m_writer;
 
   bool m_doCleanProgressFiles;
 
@@ -130,13 +130,13 @@ class FileHttpRequest
   ChunksDownloadStrategy::ResultT StartThreads()
   {
     string url;
-    pair<int64_t, int64_t> range;
+    std::pair<int64_t, int64_t> range;
     ChunksDownloadStrategy::ResultT result;
     while ((result = m_strategy.NextChunk(url, range)) == ChunksDownloadStrategy::ENextChunk)
     {
       HttpThread * p = CreateNativeHttpThread(url, *this, range.first, range.second, m_progress.m_bytesTotal);
       ASSERT(p, ());
-      m_threads.push_back(make_pair(p, range.first));
+      m_threads.push_back(std::make_pair(p, range.first));
     }
     return result;
   }
@@ -208,7 +208,7 @@ class FileHttpRequest
 #endif
 
     bool const isChunkOk = (httpOrErrorCode == 200);
-    string const urlError = m_strategy.ChunkFinished(isChunkOk, make_pair(begRange, endRange));
+    string const urlError = m_strategy.ChunkFinished(isChunkOk, std::make_pair(begRange, endRange));
 
     // remove completed chunk from the list, beg is the key
     RemoveHttpThreadByKey(begRange);
@@ -275,8 +275,8 @@ class FileHttpRequest
   }
 
 public:
-  FileHttpRequest(vector<string> const & urls, string const & filePath, int64_t fileSize, Callback && onFinish,
-                  Callback && onProgress, int64_t chunkSize, bool doCleanProgressFiles)
+  FileHttpRequest(std::vector<std::string> const & urls, std::string const & filePath, int64_t fileSize,
+                  Callback && onFinish, Callback && onProgress, int64_t chunkSize, bool doCleanProgressFiles)
     : HttpRequest(std::move(onFinish), std::move(onProgress))
     , m_strategy(urls)
     , m_filePath(filePath)
@@ -303,7 +303,7 @@ public:
     }
 
     // Create file and reserve needed size.
-    unique_ptr<FileWriter> writer(new FileWriter(filePath + DOWNLOADING_FILE_EXTENSION, openMode));
+    std::unique_ptr<FileWriter> writer(new FileWriter(filePath + DOWNLOADING_FILE_EXTENSION, openMode));
 
     // Assign here, because previous functions can throw an exception.
     m_writer.swap(writer);
@@ -359,7 +359,7 @@ HttpRequest * HttpRequest::PostJson(string const & url, string const & postData,
   return new MemoryHttpRequest(url, postData, std::move(onFinish), std::move(onProgress));
 }
 
-HttpRequest * HttpRequest::GetFile(vector<string> const & urls, string const & filePath, int64_t fileSize,
+HttpRequest * HttpRequest::GetFile(std::vector<string> const & urls, string const & filePath, int64_t fileSize,
                                    Callback && onFinish, Callback && onProgress, int64_t chunkSize,
                                    bool doCleanOnCancel)
 {
diff --git a/libs/platform/http_thread_qt.cpp b/libs/platform/http_thread_qt.cpp
index cbe5cb4c6..1dc81f745 100644
--- a/libs/platform/http_thread_qt.cpp
+++ b/libs/platform/http_thread_qt.cpp
@@ -11,10 +11,8 @@
 #include <QSslError>
 #include <QUrl>
 
-using namespace std;
-
-HttpThread::HttpThread(string const & url, downloader::IHttpThreadCallback & cb, int64_t beg, int64_t end, int64_t size,
-                       string const & pb)
+HttpThread::HttpThread(std::string const & url, downloader::IHttpThreadCallback & cb, int64_t beg, int64_t end,
+                       int64_t size, std::string const & pb)
   : m_callback(cb)
   , m_begRange(beg)
   , m_endRange(end)
@@ -145,8 +143,8 @@ void HttpThread::OnDownloadFinished()
 namespace downloader
 {
 
-HttpThread * CreateNativeHttpThread(string const & url, downloader::IHttpThreadCallback & cb, int64_t beg, int64_t end,
-                                    int64_t size, string const & pb)
+HttpThread * CreateNativeHttpThread(std::string const & url, downloader::IHttpThreadCallback & cb, int64_t beg,
+                                    int64_t end, int64_t size, std::string const & pb)
 {
   return new HttpThread(url, cb, beg, end, size, pb);
 }
diff --git a/libs/platform/local_country_file.cpp b/libs/platform/local_country_file.cpp
index 222dac545..9e5019921 100644
--- a/libs/platform/local_country_file.cpp
+++ b/libs/platform/local_country_file.cpp
@@ -16,11 +16,10 @@
 
 namespace platform
 {
-using namespace std;
 
 LocalCountryFile::LocalCountryFile() : m_version(0) {}
 
-LocalCountryFile::LocalCountryFile(string directory, CountryFile countryFile, int64_t version)
+LocalCountryFile::LocalCountryFile(std::string directory, CountryFile countryFile, int64_t version)
   : m_directory(std::move(directory))
   , m_countryFile(std::move(countryFile))
   , m_version(version)
@@ -58,7 +57,7 @@ void LocalCountryFile::DeleteFromDisk(MapFileType type) const
     LOG(LERROR, (type, "from", *this, "wasn't deleted from disk."));
 }
 
-string LocalCountryFile::GetPath(MapFileType type) const
+std::string LocalCountryFile::GetPath(MapFileType type) const
 {
   return base::JoinPath(m_directory, GetFileName(type));
 }
@@ -114,7 +113,7 @@ bool LocalCountryFile::ValidateIntegrity() const
 }
 
 // static
-LocalCountryFile LocalCountryFile::MakeForTesting(string countryFileName, int64_t version)
+LocalCountryFile LocalCountryFile::MakeForTesting(std::string countryFileName, int64_t version)
 {
   LocalCountryFile localFile(GetPlatform().WritableDir(), CountryFile(std::move(countryFileName)), version);
   localFile.SyncWithDisk();
@@ -122,18 +121,18 @@ LocalCountryFile LocalCountryFile::MakeForTesting(string countryFileName, int64_
 }
 
 // static
-LocalCountryFile LocalCountryFile::MakeTemporary(string const & fullPath)
+LocalCountryFile LocalCountryFile::MakeTemporary(std::string const & fullPath)
 {
-  string name = fullPath;
+  auto name = fullPath;
   base::GetNameFromFullPath(name);
   base::GetNameWithoutExt(name);
 
   return LocalCountryFile(base::GetDirectory(fullPath), CountryFile(std::move(name)), 0 /* version */);
 }
 
-string DebugPrint(LocalCountryFile const & file)
+std::string DebugPrint(LocalCountryFile const & file)
 {
-  ostringstream os;
+  std::ostringstream os;
   os << "LocalCountryFile [" << file.m_directory << ", " << DebugPrint(file.m_countryFile) << ", " << file.m_version
      << ", [";
 
diff --git a/libs/platform/local_country_file_utils.cpp b/libs/platform/local_country_file_utils.cpp
index e7a1b863d..bb0d08dc1 100644
--- a/libs/platform/local_country_file_utils.cpp
+++ b/libs/platform/local_country_file_utils.cpp
@@ -25,7 +25,7 @@
 
 namespace platform
 {
-using namespace std;
+using std::string;
 
 namespace
 {
@@ -42,8 +42,8 @@ bool IsSpecialName(string const & name) { return name == "." || name == ".."; }
 */
 bool IsDownloaderFile(string const & name)
 {
-  static regex const filter(".*\\.(downloading|resume|ready)[0-9]?$");
-  return regex_match(name.begin(), name.end(), filter);
+  static std::regex const filter(".*\\.(downloading|resume|ready)[0-9]?$");
+  return std::regex_match(name.begin(), name.end(), filter);
 }
 
 bool IsDiffFile(string const & name)
@@ -80,7 +80,7 @@ inline string GetDataDirFullPath(string const & dataDir)
   return dataDir.empty() ? platform.WritableDir() : base::JoinPath(platform.WritableDir(), dataDir);
 }
 
-void FindAllDiffsInDirectory(string const & dir, vector<LocalCountryFile> & diffs)
+void FindAllDiffsInDirectory(string const & dir, std::vector<LocalCountryFile> & diffs)
 {
   Platform & platform = GetPlatform();
 
@@ -139,7 +139,7 @@ void DeleteDownloaderFilesForCountry(int64_t version, string const & dataDir, Co
 }
 
 size_t FindAllLocalMapsInDirectoryAndCleanup(string const & directory, int64_t version, int64_t latestVersion,
-                                             vector<LocalCountryFile> & localFiles)
+                                             std::vector<LocalCountryFile> & localFiles)
 {
   Platform & platform = GetPlatform();
   size_t const szBefore = localFiles.size();
@@ -192,7 +192,7 @@ size_t FindAllLocalMapsInDirectoryAndCleanup(string const & directory, int64_t v
   */
 }
 
-void FindAllDiffs(string const & dataDir, vector<LocalCountryFile> & diffs)
+void FindAllDiffs(std::string const & dataDir, std::vector<LocalCountryFile> & diffs)
 {
   string const dir = GetDataDirFullPath(dataDir);
   FindAllDiffsInDirectory(dir, diffs);
@@ -204,12 +204,13 @@ void FindAllDiffs(string const & dataDir, vector<LocalCountryFile> & diffs)
     FindAllDiffsInDirectory(base::JoinPath(dir, fwt.first /* subdir */), diffs);
 }
 
-void FindAllLocalMapsAndCleanup(int64_t latestVersion, vector<LocalCountryFile> & localFiles)
+void FindAllLocalMapsAndCleanup(int64_t latestVersion, std::vector<LocalCountryFile> & localFiles)
 {
   FindAllLocalMapsAndCleanup(latestVersion, string(), localFiles);
 }
 
-void FindAllLocalMapsAndCleanup(int64_t latestVersion, string const & dataDir, vector<LocalCountryFile> & localFiles)
+void FindAllLocalMapsAndCleanup(int64_t latestVersion, string const & dataDir,
+                                std::vector<LocalCountryFile> & localFiles)
 {
   string const dir = GetDataDirFullPath(dataDir);
 
@@ -275,7 +276,7 @@ void FindAllLocalMapsAndCleanup(int64_t latestVersion, string const & dataDir, v
 
 void CleanupMapsDirectory(int64_t latestVersion)
 {
-  vector<LocalCountryFile> localFiles;
+  std::vector<LocalCountryFile> localFiles;
   FindAllLocalMapsAndCleanup(latestVersion, localFiles);
 }
 
@@ -296,13 +297,13 @@ bool ParseVersion(string const & s, int64_t & version)
   return true;
 }
 
-shared_ptr<LocalCountryFile> PreparePlaceForCountryFiles(int64_t version, CountryFile const & countryFile)
+std::shared_ptr<LocalCountryFile> PreparePlaceForCountryFiles(int64_t version, CountryFile const & countryFile)
 {
   return PreparePlaceForCountryFiles(version, string(), countryFile);
 }
 
-shared_ptr<LocalCountryFile> PreparePlaceForCountryFiles(int64_t version, string const & dataDir,
-                                                         CountryFile const & countryFile)
+std::shared_ptr<LocalCountryFile> PreparePlaceForCountryFiles(int64_t version, string const & dataDir,
+                                                              CountryFile const & countryFile)
 {
   string const dir = PrepareDirToDownloadCountry(version, dataDir);
   return (!dir.empty() ? make_shared<LocalCountryFile>(dir, countryFile, version) : nullptr);
@@ -322,7 +323,7 @@ string GetFileDownloadPath(int64_t version, string const & dataDir, string const
   return GetFilePath(version, dataDir, countryName, type) + READY_FILE_EXTENSION;
 }
 
-unique_ptr<ModelReader> GetCountryReader(LocalCountryFile const & file, MapFileType type)
+std::unique_ptr<ModelReader> GetCountryReader(LocalCountryFile const & file, MapFileType type)
 {
   Platform & platform = GetPlatform();
   if (file.IsInBundle())
@@ -378,7 +379,7 @@ string CountryIndexes::GetPath(LocalCountryFile const & localFile, Index index)
 }
 
 // static
-void CountryIndexes::GetIndexesExts(vector<string> & exts)
+void CountryIndexes::GetIndexesExts(std::vector<string> & exts)
 {
   exts.push_back(kBitsExt);
   exts.push_back(kNodesExt);
diff --git a/libs/platform/platform_android.cpp b/libs/platform/platform_android.cpp
index 6d66e0762..964602984 100644
--- a/libs/platform/platform_android.cpp
+++ b/libs/platform/platform_android.cpp
@@ -18,8 +18,6 @@
 #include <sys/stat.h>
 #include <unistd.h>  // for sysconf
 
-using namespace std;
-
 Platform::Platform()
 {
   /// @see initialization routine in android/sdk/src/main/cpp/com/.../Platform.hpp
@@ -31,22 +29,22 @@ namespace
 class DbgLogger
 {
 public:
-  explicit DbgLogger(string const & file) : m_file(file) {}
+  explicit DbgLogger(std::string const & file) : m_file(file) {}
 
   ~DbgLogger() { LOG(LDEBUG, ("Source for file", m_file, "is", m_src)); }
 
   void SetSource(char src) { m_src = src; }
 
 private:
-  string const & m_file;
+  std::string const & m_file;
   char m_src;
 };
 }  // namespace
 #endif
 
-unique_ptr<ModelReader> Platform::GetReader(string const & file, string searchScope) const
+std::unique_ptr<ModelReader> Platform::GetReader(std::string const & file, std::string searchScope) const
 {
-  string ext = base::GetFileExtension(file);
+  std::string ext = base::GetFileExtension(file);
   strings::AsciiToLower(ext);
   ASSERT(!ext.empty(), ());
 
@@ -87,17 +85,17 @@ unique_ptr<ModelReader> Platform::GetReader(string const & file, string searchSc
     {
     case 'w':
     {
-      string const path = base::JoinPath(m_writableDir, file);
+      auto const path = base::JoinPath(m_writableDir, file);
       if (IsFileExistsByFullPath(path))
-        return make_unique<FileReader>(path, logPageSize, logPageCount);
+        return std::make_unique<FileReader>(path, logPageSize, logPageCount);
       break;
     }
 
     case 's':
     {
-      string const path = base::JoinPath(m_settingsDir, file);
+      auto const path = base::JoinPath(m_settingsDir, file);
       if (IsFileExistsByFullPath(path))
-        return make_unique<FileReader>(path, logPageSize, logPageCount);
+        return std::make_unique<FileReader>(path, logPageSize, logPageCount);
       break;
     }
 
@@ -107,7 +105,7 @@ unique_ptr<ModelReader> Platform::GetReader(string const & file, string searchSc
       break;
 
     case 'r':
-      ASSERT_EQUAL(file.find("assets/"), string::npos, ());
+      ASSERT_EQUAL(file.find("assets/"), std::string::npos, ());
       try
       {
         return make_unique<ZipFileReader>(m_resourcesDir, "assets/" + file, logPageSize, logPageCount);
@@ -127,7 +125,7 @@ unique_ptr<ModelReader> Platform::GetReader(string const & file, string searchSc
   return nullptr;
 }
 
-void Platform::GetFilesByRegExp(string const & directory, string const & regexp, FilesList & res)
+void Platform::GetFilesByRegExp(std::string const & directory, std::string const & regexp, FilesList & res)
 {
   if (ZipFileReader::IsZip(directory))
   {
@@ -136,12 +134,12 @@ void Platform::GetFilesByRegExp(string const & directory, string const & regexp,
     FilesT fList;
     ZipFileReader::FilesList(directory, fList);
 
-    regex exp(regexp);
+    std::regex exp(regexp);
 
     for (FilesT::iterator it = fList.begin(); it != fList.end(); ++it)
     {
-      string & name = it->first;
-      if (regex_search(name.begin(), name.end(), exp))
+      std::string & name = it->first;
+      if (std::regex_search(name.begin(), name.end(), exp))
       {
         // Remove assets/ prefix - clean files are needed for fonts white/blacklisting logic
         size_t const ASSETS_LENGTH = 7;
@@ -166,7 +164,7 @@ int Platform::PreCachingDepth() const
   return 3;
 }
 
-bool Platform::GetFileSizeByName(string const & fileName, uint64_t & size) const
+bool Platform::GetFileSizeByName(std::string const & fileName, uint64_t & size) const
 {
   try
   {
@@ -181,7 +179,7 @@ bool Platform::GetFileSizeByName(string const & fileName, uint64_t & size) const
 }
 
 // static
-Platform::EError Platform::MkDir(string const & dirName)
+Platform::EError Platform::MkDir(std::string const & dirName)
 {
   if (0 != mkdir(dirName.c_str(), 0755))
     return ErrnoToError();
@@ -202,16 +200,16 @@ void Platform::GetSystemFontNames(FilesList & res) const
 {
   bool wasRoboto = false;
 
-  string const path = "/system/fonts/";
+  std::string const path = "/system/fonts/";
   pl::EnumerateFiles(path, [&](char const * entry)
   {
-    string name(entry);
+    std::string name(entry);
     if (name != "Roboto-Medium.ttf" && name != "Roboto-Regular.ttf")
     {
       if (!name.starts_with("NotoNaskh") && !name.starts_with("NotoSans"))
         return;
 
-      if (name.find("-Regular") == string::npos)
+      if (name.find("-Regular") == std::string::npos)
         return;
     }
     else
@@ -222,7 +220,7 @@ void Platform::GetSystemFontNames(FilesList & res) const
 
   if (!wasRoboto)
   {
-    string droidSans = path + "DroidSans.ttf";
+    std::string droidSans = path + "DroidSans.ttf";
     if (IsFileExistsByFullPath(droidSans))
       res.push_back(std::move(droidSans));
   }
diff --git a/libs/platform/platform_tests/country_file_tests.cpp b/libs/platform/platform_tests/country_file_tests.cpp
index b377bf325..0b202feef 100644
--- a/libs/platform/platform_tests/country_file_tests.cpp
+++ b/libs/platform/platform_tests/country_file_tests.cpp
@@ -7,8 +7,6 @@
 
 #include <string>
 
-using namespace std;
-
 namespace platform
 {
 UNIT_TEST(CountryFile_Smoke)
@@ -16,7 +14,7 @@ UNIT_TEST(CountryFile_Smoke)
   {
     CountryFile cf("One");
     TEST_EQUAL("One", cf.GetName(), ());
-    string const mapFileName = cf.GetFileName(MapFileType::Map);
+    auto const mapFileName = cf.GetFileName(MapFileType::Map);
 
     TEST_EQUAL("One" DATA_FILE_EXTENSION, mapFileName, ());
     TEST_EQUAL(0, cf.GetRemoteSize(), ());
@@ -25,7 +23,7 @@ UNIT_TEST(CountryFile_Smoke)
   {
     CountryFile cf("Three", 666, "xxxSHAxxx");
     TEST_EQUAL("Three", cf.GetName(), ());
-    string const mapFileName = cf.GetFileName(MapFileType::Map);
+    auto const mapFileName = cf.GetFileName(MapFileType::Map);
 
     TEST_EQUAL("Three" DATA_FILE_EXTENSION, mapFileName, ());
     TEST_EQUAL(666, cf.GetRemoteSize(), ());
diff --git a/libs/platform/platform_tests/downloader_tests/downloader_test.cpp b/libs/platform/platform_tests/downloader_tests/downloader_test.cpp
index f4ea08a9b..f6273f303 100644
--- a/libs/platform/platform_tests/downloader_tests/downloader_test.cpp
+++ b/libs/platform/platform_tests/downloader_tests/downloader_test.cpp
@@ -23,7 +23,7 @@ namespace downloader_test
 {
 using namespace downloader;
 using namespace std::placeholders;
-using namespace std;
+using std::bind, std::string, std::vector;
 
 char constexpr kTestUrl1[] = "http://localhost:34568/unit_tests/1.txt";
 char constexpr kTestUrl404[] = "http://localhost:34568/unit_tests/notexisting_unittest";
@@ -125,7 +125,7 @@ struct DeleteOnFinish
 UNIT_TEST(DownloaderSimpleGet)
 {
   DownloadObserver observer;
-  auto const MakeRequest = [&observer](std::string const & url)
+  auto const MakeRequest = [&observer](string const & url)
   {
     return HttpRequest::Get(url, bind(&DownloadObserver::OnDownloadFinish, &observer, _1),
                             bind(&DownloadObserver::OnDownloadProgress, &observer, _1));
@@ -133,7 +133,7 @@ UNIT_TEST(DownloaderSimpleGet)
 
   {
     // simple success case
-    unique_ptr<HttpRequest> const request{MakeRequest(kTestUrl1)};
+    std::unique_ptr<HttpRequest> const request{MakeRequest(kTestUrl1)};
     // wait until download is finished
     QCoreApplication::exec();
     observer.TestOk();
@@ -143,7 +143,7 @@ UNIT_TEST(DownloaderSimpleGet)
   observer.Reset();
   {
     // We DO NOT SUPPORT redirects to avoid data corruption when downloading mwm files
-    unique_ptr<HttpRequest> const request{MakeRequest("http://localhost:34568/unit_tests/permanent")};
+    std::unique_ptr<HttpRequest> const request{MakeRequest("http://localhost:34568/unit_tests/permanent")};
     QCoreApplication::exec();
     observer.TestFailed();
     TEST_EQUAL(request->GetData().size(), 0, (request->GetData()));
@@ -152,7 +152,7 @@ UNIT_TEST(DownloaderSimpleGet)
   observer.Reset();
   {
     // fail case 404
-    unique_ptr<HttpRequest> const request{MakeRequest(kTestUrl404)};
+    std::unique_ptr<HttpRequest> const request{MakeRequest(kTestUrl404)};
     QCoreApplication::exec();
     observer.TestFileNotFound();
     TEST_EQUAL(request->GetData().size(), 0, (request->GetData()));
@@ -161,7 +161,7 @@ UNIT_TEST(DownloaderSimpleGet)
   observer.Reset();
   {
     // fail case not existing host
-    unique_ptr<HttpRequest> const request{MakeRequest("http://not-valid-host123532.ath.cx")};
+    std::unique_ptr<HttpRequest> const request{MakeRequest("http://not-valid-host123532.ath.cx")};
     QCoreApplication::exec();
     observer.TestFailed();
     TEST_EQUAL(request->GetData().size(), 0, (request->GetData()));
@@ -179,7 +179,7 @@ UNIT_TEST(DownloaderSimpleGet)
   observer.Reset();
   {
     // https success case
-    unique_ptr<HttpRequest> const request{MakeRequest("https://github.com")};
+    std::unique_ptr<HttpRequest> const request{MakeRequest("https://github.com")};
     // wait until download is finished
     QCoreApplication::exec();
     observer.TestOk();
@@ -203,7 +203,7 @@ UNIT_TEST(DownloaderSimplePost)
   // simple success case
   string const postData = "{\"jsonKey\":\"jsonValue\"}";
   DownloadObserver observer;
-  unique_ptr<HttpRequest> const request{HttpRequest::PostJson(
+  std::unique_ptr<HttpRequest> const request{HttpRequest::PostJson(
       "http://localhost:34568/unit_tests/post.php", postData, bind(&DownloadObserver::OnDownloadFinish, &observer, _1),
       bind(&DownloadObserver::OnDownloadProgress, &observer, _1))};
   // wait until download is finished
@@ -217,7 +217,7 @@ UNIT_TEST(ChunksDownloadStrategy)
 {
   vector<string> const servers = {"UrlOfServer1", "UrlOfServer2", "UrlOfServer3"};
 
-  typedef pair<int64_t, int64_t> RangeT;
+  typedef std::pair<int64_t, int64_t> RangeT;
   RangeT const R1{0, 249}, R2{250, 499}, R3{500, 749}, R4{750, 800};
 
   int64_t constexpr kFileSize = 800;
@@ -291,7 +291,7 @@ UNIT_TEST(ChunksDownloadStrategyFAIL)
 {
   vector<string> const servers = {"UrlOfServer1", "UrlOfServer2"};
 
-  typedef pair<int64_t, int64_t> RangeT;
+  typedef std::pair<int64_t, int64_t> RangeT;
 
   int64_t constexpr kFileSize = 800;
   int64_t constexpr kChunkSize = 250;
@@ -367,7 +367,7 @@ string ReadFileAsString(string const & file)
   catch (FileReader::Exception const &)
   {
     TEST(false, ("File ", file, " should exist"));
-    return string();
+    return {};
   }
 }  // namespace
 
@@ -423,7 +423,7 @@ UNIT_TEST(DownloadChunks)
 
   {
     // should use only one thread
-    unique_ptr<HttpRequest> const request{MakeRequest(512 * 1024)};
+    std::unique_ptr<HttpRequest> const request{MakeRequest(512 * 1024)};
     // wait until download is finished
     QCoreApplication::exec();
     observer.TestOk();
@@ -437,7 +437,7 @@ UNIT_TEST(DownloadChunks)
   fileSize = 5;
   {
     // 3 threads - fail, because of invalid size
-    [[maybe_unused]] unique_ptr<HttpRequest> const request{MakeRequest(2048)};
+    [[maybe_unused]] std::unique_ptr<HttpRequest> const request{MakeRequest(2048)};
     // wait until download is finished
     QCoreApplication::exec();
     observer.TestFailed();
@@ -449,7 +449,7 @@ UNIT_TEST(DownloadChunks)
   fileSize = kBigFileSize;
   {
     // 3 threads - succeeded
-    [[maybe_unused]] unique_ptr<HttpRequest> const request{MakeRequest(2048)};
+    [[maybe_unused]] std::unique_ptr<HttpRequest> const request{MakeRequest(2048)};
     // wait until download is finished
     QCoreApplication::exec();
     observer.TestOk();
@@ -461,7 +461,7 @@ UNIT_TEST(DownloadChunks)
   fileSize = kBigFileSize;
   {
     // 3 threads with only one valid url - succeeded
-    [[maybe_unused]] unique_ptr<HttpRequest> const request{MakeRequest(2048)};
+    [[maybe_unused]] std::unique_ptr<HttpRequest> const request{MakeRequest(2048)};
     // wait until download is finished
     QCoreApplication::exec();
     observer.TestOk();
@@ -473,7 +473,7 @@ UNIT_TEST(DownloadChunks)
   fileSize = 12345;
   {
     // 2 threads and all points to file with invalid size - fail
-    [[maybe_unused]] unique_ptr<HttpRequest> const request{MakeRequest(2048)};
+    [[maybe_unused]] std::unique_ptr<HttpRequest> const request{MakeRequest(2048)};
     // wait until download is finished
     QCoreApplication::exec();
     observer.TestFailed();
@@ -532,7 +532,7 @@ UNIT_TEST(DownloadResumeChunks)
   {
     DownloadObserver observer;
 
-    unique_ptr<HttpRequest> const request(
+    std::unique_ptr<HttpRequest> const request(
         HttpRequest::GetFile(urls, FILENAME, kBigFileSize, bind(&DownloadObserver::OnDownloadFinish, &observer, _1),
                              bind(&DownloadObserver::OnDownloadProgress, &observer, _1)));
 
@@ -559,10 +559,10 @@ UNIT_TEST(DownloadResumeChunks)
     f.Write(b2, ARRAY_SIZE(b2));
 
     ChunksDownloadStrategy strategy((vector<string>()));
-    strategy.AddChunk(make_pair(int64_t(0), beg1 - 1), ChunksDownloadStrategy::CHUNK_COMPLETE);
-    strategy.AddChunk(make_pair(beg1, end1), ChunksDownloadStrategy::CHUNK_FREE);
-    strategy.AddChunk(make_pair(end1 + 1, beg2 - 1), ChunksDownloadStrategy::CHUNK_COMPLETE);
-    strategy.AddChunk(make_pair(beg2, end2), ChunksDownloadStrategy::CHUNK_FREE);
+    strategy.AddChunk(std::make_pair(int64_t(0), beg1 - 1), ChunksDownloadStrategy::CHUNK_COMPLETE);
+    strategy.AddChunk(std::make_pair(beg1, end1), ChunksDownloadStrategy::CHUNK_FREE);
+    strategy.AddChunk(std::make_pair(end1 + 1, beg2 - 1), ChunksDownloadStrategy::CHUNK_COMPLETE);
+    strategy.AddChunk(std::make_pair(beg2, end2), ChunksDownloadStrategy::CHUNK_FREE);
 
     strategy.SaveChunks(kBigFileSize, RESUME_FILENAME);
   }
@@ -570,9 +570,9 @@ UNIT_TEST(DownloadResumeChunks)
   // 3rd step - check that resume works
   {
     ResumeChecker checker;
-    unique_ptr<HttpRequest> const request(HttpRequest::GetFile(urls, FILENAME, kBigFileSize,
-                                                               bind(&ResumeChecker::OnFinish, &checker, _1),
-                                                               bind(&ResumeChecker::OnProgress, &checker, _1)));
+    std::unique_ptr<HttpRequest> const request(HttpRequest::GetFile(urls, FILENAME, kBigFileSize,
+                                                                    bind(&ResumeChecker::OnFinish, &checker, _1),
+                                                                    bind(&ResumeChecker::OnProgress, &checker, _1)));
     QCoreApplication::exec();
 
     FinishDownloadSuccess(FILENAME);
@@ -598,7 +598,7 @@ UNIT_TEST(DownloadResumeChunksWithCancel)
     if (arrCancelChunks[i] > 0)
       observer.CancelDownloadOnGivenChunk(arrCancelChunks[i]);
 
-    unique_ptr<HttpRequest> const request(
+    std::unique_ptr<HttpRequest> const request(
         HttpRequest::GetFile(urls, FILENAME, kBigFileSize, bind(&DownloadObserver::OnDownloadFinish, &observer, _1),
                              bind(&DownloadObserver::OnDownloadProgress, &observer, _1), 1024, false));
 
diff --git a/libs/platform/platform_tests/get_text_by_id_tests.cpp b/libs/platform/platform_tests/get_text_by_id_tests.cpp
index 59e310501..7c20fd990 100644
--- a/libs/platform/platform_tests/get_text_by_id_tests.cpp
+++ b/libs/platform/platform_tests/get_text_by_id_tests.cpp
@@ -4,12 +4,9 @@
 
 #include <string>
 
-using namespace platform;
-using namespace std;
-
 UNIT_TEST(GetTextByIdEnglishTest)
 {
-  string const shortJson =
+  std::string const shortJson =
       "\
       {\
       \"make_a_slight_right_turn\":\"Make a slight right turn.\",\
@@ -32,7 +29,7 @@ UNIT_TEST(GetTextByIdEnglishTest)
 
 UNIT_TEST(GetTextByIdRussianTest)
 {
-  string const shortJson =
+  std::string const shortJson =
       "\
       {\
       \"in_800_meters\":\"Через восемьсот метров.\",\
@@ -55,7 +52,7 @@ UNIT_TEST(GetTextByIdRussianTest)
 
 UNIT_TEST(GetTextByIdKoreanTest)
 {
-  string const shortJson =
+  std::string const shortJson =
       "\
       {\
       \"in_700_meters\":\"700 미터 앞\",\
@@ -78,7 +75,7 @@ UNIT_TEST(GetTextByIdKoreanTest)
 
 UNIT_TEST(GetTextByIdArabicTest)
 {
-  string const shortJson =
+  std::string const shortJson =
       "\
       {\
       \"in_1_kilometer\":\"بعد كيلو متر واحدٍ\",\
@@ -101,7 +98,7 @@ UNIT_TEST(GetTextByIdArabicTest)
 
 UNIT_TEST(GetTextByIdFrenchTest)
 {
-  string const shortJson =
+  std::string const shortJson =
       "\
       {\
       \"in_1_5_kilometers\":\"Dans un virgule cinq kilomètre.\",\
diff --git a/libs/platform/platform_tests/local_country_file_tests.cpp b/libs/platform/platform_tests/local_country_file_tests.cpp
index c77c9373f..525cc11b5 100644
--- a/libs/platform/platform_tests/local_country_file_tests.cpp
+++ b/libs/platform/platform_tests/local_country_file_tests.cpp
@@ -25,14 +25,17 @@
 
 namespace local_country_file_tests
 {
-using namespace platform;
-using namespace platform::tests_support;
-using namespace std;
+using platform::CountryFile;
+using platform::LocalCountryFile;
+using platform::tests_support::ScopedDir;
+using platform::tests_support::ScopedFile;
 
 // Checks that all unsigned numbers less than 10 ^ 18 can be parsed as
 // a timestamp.
 UNIT_TEST(LocalCountryFile_ParseVersion)
 {
+  using namespace platform;
+
   int64_t version = 0;
   TEST(ParseVersion("1", version), ());
   TEST_EQUAL(version, 1, ());
@@ -88,8 +91,8 @@ UNIT_TEST(LocalCountryFile_DiskFiles)
     TEST(!localFile.OnDisk(MapFileType::Map), ());
     TEST(!localFile.OnDisk(MapFileType::Diff), ());
 
-    string const mapFileName = countryFile.GetFileName(MapFileType::Map);
-    string const mapFileContents("map");
+    std::string const mapFileName = countryFile.GetFileName(MapFileType::Map);
+    std::string const mapFileContents("map");
     ScopedFile testMapFile(mapFileName, mapFileContents);
 
     localFile.SyncWithDisk();
@@ -110,7 +113,7 @@ UNIT_TEST(LocalCountryFile_DiskFiles)
 UNIT_TEST(LocalCountryFile_CleanupMapFiles)
 {
   Platform & platform = GetPlatform();
-  string const mapsDir = platform.WritableDir();
+  std::string const mapsDir = platform.WritableDir();
 
   // Two fake directories for test country files and indexes.
   ScopedDir dir3("3");
@@ -125,7 +128,7 @@ UNIT_TEST(LocalCountryFile_CleanupMapFiles)
   ScopedFile irelandMapFile(dir4, irelandFile, MapFileType::Map);
 
   // Check FindAllLocalMaps()
-  vector<LocalCountryFile> localFiles;
+  std::vector<LocalCountryFile> localFiles;
   FindAllLocalMapsAndCleanup(4 /* latestVersion */, localFiles);
   TEST(base::IsExist(localFiles, irelandLocalFile), (irelandLocalFile, localFiles));
 
@@ -168,7 +171,7 @@ UNIT_TEST(LocalCountryFile_CleanupPartiallyDownloadedFiles)
       {DataFilePath("Spain.mwm.routing"), ScopedFile::Mode::Create},
       {base::JoinPath(latestDir.GetRelativePath(), "Russia_Southern.mwm.downloading"), ScopedFile::Mode::Create}};
 
-  CleanupMapsDirectory(101010 /* latestVersion */);
+  platform::CleanupMapsDirectory(101010 /* latestVersion */);
 
   for (ScopedFile & file : toBeDeleted)
   {
@@ -202,10 +205,10 @@ UNIT_TEST(LocalCountryFile_DirectoryLookup)
   ScopedFile testIrelandMapFile(testDir, irelandFile, MapFileType::Map);
   ScopedFile testNetherlandsMapFile(testDir, netherlandsFile, MapFileType::Map);
 
-  vector<LocalCountryFile> localFiles;
+  std::vector<LocalCountryFile> localFiles;
   FindAllLocalMapsInDirectoryAndCleanup(testDir.GetFullPath(), 150309 /* version */, -1 /* latestVersion */,
                                         localFiles);
-  sort(localFiles.begin(), localFiles.end());
+  std::sort(localFiles.begin(), localFiles.end());
   for (LocalCountryFile & localFile : localFiles)
     localFile.SyncWithDisk();
 
@@ -215,8 +218,8 @@ UNIT_TEST(LocalCountryFile_DirectoryLookup)
   LocalCountryFile expectedNetherlandsFile(testDir.GetFullPath(), netherlandsFile, 150309);
   expectedNetherlandsFile.SyncWithDisk();
 
-  vector<LocalCountryFile> expectedLocalFiles = {expectedIrelandFile, expectedNetherlandsFile};
-  sort(expectedLocalFiles.begin(), expectedLocalFiles.end());
+  std::vector expectedLocalFiles = {expectedIrelandFile, expectedNetherlandsFile};
+  std::sort(expectedLocalFiles.begin(), expectedLocalFiles.end());
   TEST_EQUAL(expectedLocalFiles, localFiles, ());
 }
 
@@ -234,9 +237,9 @@ UNIT_TEST(LocalCountryFile_AllLocalFilesLookup)
 
   ScopedFile testItalyMapFile(testDir, italyFile, MapFileType::Map);
 
-  vector<LocalCountryFile> localFiles;
+  std::vector<LocalCountryFile> localFiles;
   FindAllLocalMapsAndCleanup(10101 /* latestVersion */, localFiles);
-  multiset<LocalCountryFile> localFilesSet(localFiles.begin(), localFiles.end());
+  std::multiset<LocalCountryFile> localFilesSet(localFiles.begin(), localFiles.end());
 
   bool worldFound = false;
   bool worldCoastsFound = false;
@@ -267,7 +270,7 @@ UNIT_TEST(LocalCountryFile_PreparePlaceForCountryFiles)
 
   CountryFile italyFile("Italy");
   LocalCountryFile expectedItalyFile(platform.WritableDir(), italyFile, 0 /* version */);
-  shared_ptr<LocalCountryFile> italyLocalFile = PreparePlaceForCountryFiles(0 /* version */, italyFile);
+  auto italyLocalFile = PreparePlaceForCountryFiles(0 /* version */, italyFile);
   TEST(italyLocalFile.get(), ());
   TEST_EQUAL(expectedItalyFile, *italyLocalFile, ());
 
@@ -275,19 +278,21 @@ UNIT_TEST(LocalCountryFile_PreparePlaceForCountryFiles)
 
   CountryFile germanyFile("Germany");
   LocalCountryFile expectedGermanyFile(directoryForV1.GetFullPath(), germanyFile, 1 /* version */);
-  shared_ptr<LocalCountryFile> germanyLocalFile = PreparePlaceForCountryFiles(1 /* version */, germanyFile);
+  auto germanyLocalFile = PreparePlaceForCountryFiles(1 /* version */, germanyFile);
   TEST(germanyLocalFile.get(), ());
   TEST_EQUAL(expectedGermanyFile, *germanyLocalFile, ());
 
   CountryFile franceFile("France");
   LocalCountryFile expectedFranceFile(directoryForV1.GetFullPath(), franceFile, 1 /* version */);
-  shared_ptr<LocalCountryFile> franceLocalFile = PreparePlaceForCountryFiles(1 /* version */, franceFile);
+  auto franceLocalFile = PreparePlaceForCountryFiles(1 /* version */, franceFile);
   TEST(franceLocalFile.get(), ());
   TEST_EQUAL(expectedFranceFile, *franceLocalFile, ());
 }
 
 UNIT_TEST(LocalCountryFile_CountryIndexes)
 {
+  using platform::CountryIndexes;
+
   ScopedDir testDir("101010");
 
   CountryFile germanyFile("Germany");
@@ -296,11 +301,11 @@ UNIT_TEST(LocalCountryFile_CountryIndexes)
              CountryIndexes::IndexesDir(germanyLocalFile), ());
   CountryIndexes::PreparePlaceOnDisk(germanyLocalFile);
 
-  string const bitsPath = CountryIndexes::GetPath(germanyLocalFile, CountryIndexes::Index::Bits);
+  auto const bitsPath = CountryIndexes::GetPath(germanyLocalFile, CountryIndexes::Index::Bits);
   TEST(!Platform::IsFileExistsByFullPath(bitsPath), (bitsPath));
   {
     FileWriter writer(bitsPath);
-    string const contents = "bits index";
+    std::string const contents = "bits index";
     writer.Write(contents.data(), contents.size());
   }
   TEST(Platform::IsFileExistsByFullPath(bitsPath), (bitsPath));
@@ -312,6 +317,8 @@ UNIT_TEST(LocalCountryFile_CountryIndexes)
 
 UNIT_TEST(LocalCountryFile_DoNotDeleteUserFiles)
 {
+  using platform::CountryIndexes;
+
   base::ScopedLogLevelChanger const criticalLogLevel(LCRITICAL);
 
   ScopedDir testDir("101010");
@@ -320,10 +327,10 @@ UNIT_TEST(LocalCountryFile_DoNotDeleteUserFiles)
   LocalCountryFile germanyLocalFile(testDir.GetFullPath(), germanyFile, 101010 /* version */);
   CountryIndexes::PreparePlaceOnDisk(germanyLocalFile);
 
-  string const userFilePath = base::JoinPath(CountryIndexes::IndexesDir(germanyLocalFile), "user-data.txt");
+  auto const userFilePath = base::JoinPath(CountryIndexes::IndexesDir(germanyLocalFile), "user-data.txt");
   {
     FileWriter writer(userFilePath);
-    string const data = "user data";
+    std::string const data = "user data";
     writer.Write(data.data(), data.size());
   }
   TEST(!CountryIndexes::DeleteFromDisk(germanyLocalFile), ("Indexes dir should not be deleted for:", germanyLocalFile));
@@ -334,7 +341,7 @@ UNIT_TEST(LocalCountryFile_DoNotDeleteUserFiles)
 
 UNIT_TEST(LocalCountryFile_MakeTemporary)
 {
-  string const path = GetPlatform().WritablePathForFile("minsk-pass" DATA_FILE_EXTENSION);
+  auto const path = GetPlatform().WritablePathForFile("minsk-pass" DATA_FILE_EXTENSION);
   LocalCountryFile file = LocalCountryFile::MakeTemporary(path);
   TEST_EQUAL(file.GetPath(MapFileType::Map), path, ());
 }
diff --git a/libs/platform/platform_tests_support/test_socket.cpp b/libs/platform/platform_tests_support/test_socket.cpp
index e6f913c02..ada2f0542 100644
--- a/libs/platform/platform_tests_support/test_socket.cpp
+++ b/libs/platform/platform_tests_support/test_socket.cpp
@@ -5,9 +5,6 @@
 #include <algorithm>
 #include <chrono>
 
-using namespace std;
-using namespace std::chrono;
-
 namespace platform
 {
 namespace tests_support
@@ -17,7 +14,7 @@ TestSocket::~TestSocket()
   m_isConnected = false;
 }
 
-bool TestSocket::Open(string const & host, uint16_t port)
+bool TestSocket::Open(std::string const & host, uint16_t port)
 {
   if (m_isConnected)
     return false;
@@ -36,13 +33,13 @@ bool TestSocket::Read(uint8_t * data, uint32_t count)
   if (!m_isConnected)
     return false;
 
-  unique_lock<mutex> lock(m_inputMutex);
+  std::unique_lock<std::mutex> lock(m_inputMutex);
 
-  m_inputCondition.wait_for(lock, milliseconds(m_timeoutMs), [this]() { return !m_input.empty(); });
+  m_inputCondition.wait_for(lock, std::chrono::milliseconds(m_timeoutMs), [this]() { return !m_input.empty(); });
   if (m_input.size() < count)
     return false;
 
-  copy(m_input.begin(), m_input.end(), data);
+  std::copy(m_input.begin(), m_input.end(), data);
   m_input.erase(m_input.begin(), m_input.begin() + count);
   return true;
 }
@@ -53,7 +50,7 @@ bool TestSocket::Write(uint8_t const * data, uint32_t count)
     return false;
 
   {
-    lock_guard<mutex> lg(m_outputMutex);
+    std::lock_guard lg(m_outputMutex);
     m_output.insert(m_output.end(), data, data + count);
   }
   m_outputCondition.notify_one();
@@ -64,10 +61,10 @@ void TestSocket::SetTimeout(uint32_t milliseconds)
 {
   m_timeoutMs = milliseconds;
 }
-size_t TestSocket::ReadServer(vector<uint8_t> & destination)
+size_t TestSocket::ReadServer(std::vector<uint8_t> & destination)
 {
-  unique_lock<mutex> lock(m_outputMutex);
-  m_outputCondition.wait_for(lock, milliseconds(m_timeoutMs), [this]() { return !m_output.empty(); });
+  std::unique_lock lock(m_outputMutex);
+  m_outputCondition.wait_for(lock, std::chrono::milliseconds(m_timeoutMs), [this]() { return !m_output.empty(); });
 
   size_t const outputSize = m_output.size();
   destination.insert(destination.end(), m_output.begin(), m_output.end());
diff --git a/libs/platform/platform_unix_impl.cpp b/libs/platform/platform_unix_impl.cpp
index 3e49650dc..fe5a27b8f 100644
--- a/libs/platform/platform_unix_impl.cpp
+++ b/libs/platform/platform_unix_impl.cpp
@@ -21,8 +21,6 @@
 #include <sys/vfs.h>
 #endif
 
-using namespace std;
-
 namespace
 {
 struct CloseDir
@@ -36,7 +34,7 @@ struct CloseDir
 }  // namespace
 
 // static
-Platform::EError Platform::RmDir(string const & dirName)
+Platform::EError Platform::RmDir(std::string const & dirName)
 {
   if (rmdir(dirName.c_str()) != 0)
     return ErrnoToError();
@@ -44,7 +42,7 @@ Platform::EError Platform::RmDir(string const & dirName)
 }
 
 // static
-Platform::EError Platform::GetFileType(string const & path, EFileType & type)
+Platform::EError Platform::GetFileType(std::string const & path, EFileType & type)
 {
   struct stat stats;
   if (stat(path.c_str(), &stats) != 0)
@@ -59,7 +57,7 @@ Platform::EError Platform::GetFileType(string const & path, EFileType & type)
 }
 
 // static
-bool Platform::IsFileExistsByFullPath(string const & filePath)
+bool Platform::IsFileExistsByFullPath(std::string const & filePath)
 {
   struct stat s;
   return stat(filePath.c_str(), &s) == 0;
@@ -67,11 +65,11 @@ bool Platform::IsFileExistsByFullPath(string const & filePath)
 
 #if !defined(OMIM_OS_IPHONE)
 // static
-void Platform::DisableBackupForFile(string const & /*filePath*/) {}
+void Platform::DisableBackupForFile(std::string const & /*filePath*/) {}
 #endif
 
 // static
-string Platform::GetCurrentWorkingDirectory() noexcept
+std::string Platform::GetCurrentWorkingDirectory() noexcept
 {
   char path[PATH_MAX];
   char const * const dir = getcwd(path, PATH_MAX);
@@ -80,9 +78,9 @@ string Platform::GetCurrentWorkingDirectory() noexcept
   return dir;
 }
 
-bool Platform::IsDirectoryEmpty(string const & directory)
+bool Platform::IsDirectoryEmpty(std::string const & directory)
 {
-  unique_ptr<DIR, CloseDir> dir(opendir(directory.c_str()));
+  std::unique_ptr<DIR, CloseDir> dir(opendir(directory.c_str()));
   if (!dir)
     return true;
 
@@ -98,7 +96,7 @@ bool Platform::IsDirectoryEmpty(string const & directory)
   return true;
 }
 
-bool Platform::GetFileSizeByFullPath(string const & filePath, uint64_t & size)
+bool Platform::GetFileSizeByFullPath(std::string const & filePath, uint64_t & size)
 {
   struct stat s;
   if (stat(filePath.c_str(), &s) == 0)
@@ -134,9 +132,9 @@ Platform::TStorageStatus Platform::GetWritableStorageStatus(uint64_t neededSize)
 namespace pl
 {
 
-void EnumerateFiles(string const & directory, function<void(char const *)> const & fn)
+void EnumerateFiles(std::string const & directory, std::function<void(char const *)> const & fn)
 {
-  unique_ptr<DIR, CloseDir> dir(opendir(directory.c_str()));
+  std::unique_ptr<DIR, CloseDir> dir(opendir(directory.c_str()));
   if (!dir)
     return;
 
@@ -145,13 +143,13 @@ void EnumerateFiles(string const & directory, function<void(char const *)> const
     fn(entry->d_name);
 }
 
-void EnumerateFilesByRegExp(string const & directory, string const & regexp, vector<string> & res)
+void EnumerateFilesByRegExp(std::string const & directory, std::string const & regexp, std::vector<std::string> & res)
 {
-  regex exp(regexp);
+  std::regex exp(regexp);
   EnumerateFiles(directory, [&](char const * entry)
   {
-    string const name(entry);
-    if (regex_search(name.begin(), name.end(), exp))
+    std::string const name(entry);
+    if (std::regex_search(name.begin(), name.end(), exp))
       res.push_back(name);
   });
 }
diff --git a/libs/platform/platform_win.cpp b/libs/platform/platform_win.cpp
index e1fa2fcb9..75111f43a 100644
--- a/libs/platform/platform_win.cpp
+++ b/libs/platform/platform_win.cpp
@@ -17,9 +17,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-using namespace std;
-
-static bool GetUserWritableDir(string & outDir)
+static bool GetUserWritableDir(std::string & outDir)
 {
   char pathBuf[MAX_PATH] = {0};
   if (SUCCEEDED(::SHGetFolderPathA(NULL, CSIDL_LOCAL_APPDATA | CSIDL_FLAG_CREATE, NULL, SHGFP_TYPE_CURRENT, pathBuf)))
@@ -34,7 +32,7 @@ static bool GetUserWritableDir(string & outDir)
 }
 
 /// @return Full path to the executable file
-static bool GetPathToBinary(string & outPath)
+static bool GetPathToBinary(std::string & outPath)
 {
   // get path to executable
   char pathBuf[MAX_PATH] = {0};
@@ -56,7 +54,7 @@ std::unique_ptr<Socket> CreateSocket()
 
 Platform::Platform()
 {
-  string path;
+  std::string path;
   CHECK(GetPathToBinary(path), ("Can't get path to binary"));
 
   // resources path:
@@ -80,7 +78,7 @@ Platform::Platform()
   // writable path:
   // 1. the same as resources if we have write access to this folder
   // 2. otherwise, use system-specific folder
-  string const tmpFilePath = base::JoinPath(m_resourcesDir, "mapswithmetmptestfile");
+  auto const tmpFilePath = base::JoinPath(m_resourcesDir, "mapswithmetmptestfile");
   try
   {
     FileWriter tmpfile(tmpFilePath);
@@ -106,16 +104,16 @@ Platform::Platform()
   LOG(LINFO, ("Settings Directory:", m_settingsDir));
 }
 
-bool Platform::IsFileExistsByFullPath(string const & filePath)
+bool Platform::IsFileExistsByFullPath(std::string const & filePath)
 {
   return ::GetFileAttributesA(filePath.c_str()) != INVALID_FILE_ATTRIBUTES;
 }
 
 // static
-void Platform::DisableBackupForFile(string const & filePath) {}
+void Platform::DisableBackupForFile(std::string const & filePath) {}
 
 // static
-string Platform::GetCurrentWorkingDirectory() noexcept
+std::string Platform::GetCurrentWorkingDirectory() noexcept
 {
   char path[MAX_PATH];
   char const * const dir = getcwd(path, MAX_PATH);
@@ -125,7 +123,7 @@ string Platform::GetCurrentWorkingDirectory() noexcept
 }
 
 // static
-Platform::EError Platform::RmDir(string const & dirName)
+Platform::EError Platform::RmDir(std::string const & dirName)
 {
   if (_rmdir(dirName.c_str()) != 0)
     return ErrnoToError();
@@ -133,7 +131,7 @@ Platform::EError Platform::RmDir(string const & dirName)
 }
 
 // static
-Platform::EError Platform::GetFileType(string const & path, EFileType & type)
+Platform::EError Platform::GetFileType(std::string const & path, EFileType & type)
 {
   struct _stat32 stats;
   if (_stat32(path.c_str(), &stats) != 0)
@@ -147,12 +145,12 @@ Platform::EError Platform::GetFileType(string const & path, EFileType & type)
   return ERR_OK;
 }
 
-string Platform::DeviceName() const
+std::string Platform::DeviceName() const
 {
   return OMIM_OS_NAME;
 }
 
-string Platform::DeviceModel() const
+std::string Platform::DeviceModel() const
 {
   return {};
 }
@@ -189,12 +187,12 @@ Platform::TStorageStatus Platform::GetWritableStorageStatus(uint64_t neededSize)
   return STORAGE_OK;
 }
 
-bool Platform::IsDirectoryEmpty(string const & directory)
+bool Platform::IsDirectoryEmpty(std::string const & directory)
 {
   return PathIsDirectoryEmptyA(directory.c_str());
 }
 
-bool Platform::GetFileSizeByFullPath(string const & filePath, uint64_t & size)
+bool Platform::GetFileSizeByFullPath(std::string const & filePath, uint64_t & size)
 {
   HANDLE hFile =
       CreateFileA(filePath.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
diff --git a/libs/platform/settings.cpp b/libs/platform/settings.cpp
index 1fc8fbd33..500906c13 100644
--- a/libs/platform/settings.cpp
+++ b/libs/platform/settings.cpp
@@ -18,7 +18,7 @@
 
 namespace settings
 {
-using namespace std;
+using std::string;
 
 std::string_view kMeasurementUnits = "Units";
 std::string_view kMapLanguageCode = "MapLanguageCode";
@@ -54,7 +54,7 @@ namespace impl
 template <class T, size_t N>
 bool FromStringArray(string const & s, T (&arr)[N])
 {
-  istringstream in(s);
+  std::istringstream in(s);
   size_t count = 0;
   while (count < N && in >> arr[count])
   {
@@ -70,7 +70,7 @@ bool FromStringArray(string const & s, T (&arr)[N])
 template <>
 string ToString<m2::AnyRectD>(m2::AnyRectD const & rect)
 {
-  ostringstream out;
+  std::ostringstream out;
   out.precision(12);
   m2::PointD glbZero(rect.GlobalZero());
   out << glbZero.x << " " << glbZero.y << " ";
@@ -99,7 +99,7 @@ bool FromString<m2::AnyRectD>(string const & str, m2::AnyRectD & rect)
 template <>
 string ToString<m2::RectD>(m2::RectD const & rect)
 {
-  ostringstream stream;
+  std::ostringstream stream;
   stream.precision(12);
   stream << rect.minX() << " " << rect.minY() << " " << rect.maxX() << " " << rect.maxY();
   return stream.str();
@@ -139,7 +139,7 @@ namespace impl
 template <typename T>
 string ToStringScalar(T const & v)
 {
-  ostringstream stream;
+  std::ostringstream stream;
   stream.precision(12);
   stream << v;
   return stream.str();
@@ -148,7 +148,7 @@ string ToStringScalar(T const & v)
 template <typename T>
 bool FromStringScalar(string const & str, T & v)
 {
-  istringstream stream(str);
+  std::istringstream stream(str);
   if (stream)
   {
     stream >> v;
@@ -224,7 +224,7 @@ namespace impl
 template <class TPair>
 string ToStringPair(TPair const & value)
 {
-  ostringstream stream;
+  std::ostringstream stream;
   stream.precision(12);
   stream << value.first << " " << value.second;
   return stream.str();
@@ -233,7 +233,7 @@ string ToStringPair(TPair const & value)
 template <class TPair>
 bool FromStringPair(string const & str, TPair & value)
 {
-  istringstream stream(str);
+  std::istringstream stream(str);
   if (stream)
   {
     stream >> value.first;
@@ -247,8 +247,8 @@ bool FromStringPair(string const & str, TPair & value)
 }
 }  // namespace impl
 
-typedef pair<int, int> IPairT;
-typedef pair<double, double> DPairT;
+typedef std::pair<int, int> IPairT;
+typedef std::pair<double, double> DPairT;
 
 template <>
 string ToString<IPairT>(IPairT const & v)

From 4de9de38ad96dfbfd7f98287d1149cb3428317c1 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Sat, 26 Jul 2025 15:03:19 +0300
Subject: [PATCH 062/302] [3party] Add glaze submodule

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 .gitmodules           | 4 ++++
 3party/CMakeLists.txt | 1 +
 3party/glaze          | 1 +
 3 files changed, 6 insertions(+)
 create mode 160000 3party/glaze

diff --git a/.gitmodules b/.gitmodules
index 320fd8f71..6944e9898 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -65,3 +65,7 @@
 [submodule "3party/imgui/imgui"]
   path = 3party/imgui/imgui
   url = https://github.com/ocornut/imgui
+[submodule "3party/glaze"]
+  path = 3party/glaze
+  url = https://github.com/stephenberry/glaze
+  branch = main
diff --git a/3party/CMakeLists.txt b/3party/CMakeLists.txt
index 5178ae0b5..dd851d7db 100644
--- a/3party/CMakeLists.txt
+++ b/3party/CMakeLists.txt
@@ -57,6 +57,7 @@ endif()
 
 add_subdirectory(agg)
 add_subdirectory(bsdiff-courgette)
+add_subdirectory(glaze)
 add_subdirectory(minizip)
 add_subdirectory(open-location-code)
 add_subdirectory(opening_hours)
diff --git a/3party/glaze b/3party/glaze
new file mode 160000
index 000000000..5a58d7936
--- /dev/null
+++ b/3party/glaze
@@ -0,0 +1 @@
+Subproject commit 5a58d7936ece70eeb64cc30aa82e9e83ae9c05bb

From 52a0c45083a35769efcd5efb17c1914459b3b5ca Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Sat, 26 Jul 2025 15:04:10 +0300
Subject: [PATCH 063/302] Glaze smoke test

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 libs/platform/platform_tests/CMakeLists.txt |  2 +
 libs/platform/platform_tests/glaze_test.cpp | 90 +++++++++++++++++++++
 2 files changed, 92 insertions(+)
 create mode 100644 libs/platform/platform_tests/glaze_test.cpp

diff --git a/libs/platform/platform_tests/CMakeLists.txt b/libs/platform/platform_tests/CMakeLists.txt
index 454c2e55b..2cea6978d 100644
--- a/libs/platform/platform_tests/CMakeLists.txt
+++ b/libs/platform/platform_tests/CMakeLists.txt
@@ -7,6 +7,7 @@ set(SRC
   downloader_tests/downloader_test.cpp
   downloader_utils_tests.cpp
   get_text_by_id_tests.cpp
+  glaze_test.cpp
   jansson_test.cpp
   language_test.cpp
   local_country_file_tests.cpp
@@ -24,4 +25,5 @@ target_link_libraries(${PROJECT_NAME}
   platform_tests_support
   platform
   cppjansson
+  glaze::glaze
 )
diff --git a/libs/platform/platform_tests/glaze_test.cpp b/libs/platform/platform_tests/glaze_test.cpp
new file mode 100644
index 000000000..dd57c51b3
--- /dev/null
+++ b/libs/platform/platform_tests/glaze_test.cpp
@@ -0,0 +1,90 @@
+#include "testing/testing.hpp"
+
+#include "glaze/json.hpp"
+
+#include <optional>
+#include <string>
+
+enum class LocationSource
+{
+  GPS,
+  Network,
+  Unknown
+};
+
+// If enumeration should be represented as string instead of integer in JSON,
+// then enum should be declared in the global namespace.
+template <>
+struct glz::meta<LocationSource>
+{
+  using enum LocationSource;
+  static constexpr auto value = glz::enumerate(GPS, Network, Unknown);
+};
+
+// For our test macros.
+std::string DebugPrint(LocationSource source)
+{
+  return std::string{glz::get_enum_name(source)};
+}
+
+namespace glaze_test
+{
+struct Location
+{
+  LocationSource source;
+  double latitude;
+  double longitude;
+  double accuracy;
+  std::optional<double> altitude;
+  std::optional<double> altitudeAccuracy;
+};
+
+struct AccessToken
+{
+  Location location;
+  std::string accessToken;
+};
+
+UNIT_TEST(Glaze_Smoke)
+{
+  std::string_view constexpr fullJsonWithComments = R"({
+  "location": {
+    "source": "GPS",  // Where the location data comes from.
+    "latitude": 47.3345141,
+    "longitude": 8.5312839,
+    "accuracy": 22,
+    "altitude": 100.5,
+    "altitudeAccuracy": 5.0
+  },
+  /* Access token for authentication
+   * This token is used to access protected resources.
+   */
+  "accessToken": "2:vC65Xv0mxMtsNVf4:hY5YSIkuFfnAU77z"
+})";
+
+  AccessToken token;
+  auto error = glz::read_jsonc(token, fullJsonWithComments);
+  TEST(!error, (glz::format_error(error, fullJsonWithComments)));
+
+  TEST_EQUAL(token.location.source, LocationSource::GPS, ());
+  TEST_EQUAL(token.location.latitude, 47.3345141, ());
+  TEST_EQUAL(token.location.longitude, 8.5312839, ());
+  TEST_EQUAL(token.location.accuracy, 22.0, ());
+  TEST_EQUAL(token.location.altitude, 100.5, ());
+  TEST_EQUAL(token.location.altitudeAccuracy, 5.0, ());
+  TEST_EQUAL(token.accessToken, "2:vC65Xv0mxMtsNVf4:hY5YSIkuFfnAU77z", ());
+
+  std::string_view constexpr partialJson =
+      R"({"location":{"source":"Network","latitude":47.3345141,"longitude":8.5312839,"accuracy":22},"accessToken":""})";
+
+  token.location.source = LocationSource::Network;
+  token.location.altitude = {};
+  token.location.altitudeAccuracy = {};
+  token.accessToken = {};
+
+  std::string buffer;
+  error = glz::write_json(token, buffer);
+  TEST(!error, (glz::format_error(error, "Failed to write JSON")));
+  TEST_EQUAL(buffer, partialJson, ());
+}
+}  // namespace glaze_test

From b1c2b204a1b4913d33a740d4408a482d57d0341f Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Mon, 28 Jul 2025 12:12:54 -0300
Subject: [PATCH 064/302] gcc13 fix

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 libs/base/string_utils.hpp | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/libs/base/string_utils.hpp b/libs/base/string_utils.hpp
index 1452425b5..c8d3e621c 100644
--- a/libs/base/string_utils.hpp
+++ b/libs/base/string_utils.hpp
@@ -152,11 +152,17 @@ inline std::string DebugPrint(UniString const & s)
 
 class TokenizeIteratorBase
 {
-  template <typename...>
-  static constexpr bool is_utf8cpp_iterator = false;
+  template <typename T>
+  struct is_utf8cpp_iterator
+  {
+    static bool constexpr value = false;
+  };
 
-  template <typename... Args>
-  static constexpr bool is_utf8cpp_iterator<utf8::unchecked::iterator<Args...>> = true;
+  template <typename T>
+  struct is_utf8cpp_iterator<utf8::unchecked::iterator<T>>
+  {
+    static bool constexpr value = true;
+  };
 
 public:
   using difference_type = std::ptrdiff_t;
@@ -165,7 +171,7 @@ public:
   template <class T>
   static std::string_view ToStringView(T first, T last)
   {
-    if constexpr (is_utf8cpp_iterator<T>)
+    if constexpr (is_utf8cpp_iterator<T>::value)
       return TokenizeIteratorBase::ToStringView(first.base(), last.base());
     else
       return std::string_view(first, last);

From 0ea0f2e49a5577d64b45adf2036e09c5fd740dc0 Mon Sep 17 00:00:00 2001
From: Osyotr <Osyotr@users.noreply.github.com>
Date: Tue, 29 Jul 2025 00:08:40 +0300
Subject: [PATCH 065/302] Make UniformRandom standard-conforming

std::uniform_int_distribution<T> requires sizeof(T) >= sizeof(short)

Signed-off-by: Osyotr <Osyotr@users.noreply.github.com>
---
 libs/base/random.hpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libs/base/random.hpp b/libs/base/random.hpp
index 799745102..54e2f49b2 100644
--- a/libs/base/random.hpp
+++ b/libs/base/random.hpp
@@ -12,12 +12,15 @@ class UniformRandom
 
   std::random_device m_rd;
   std::mt19937 m_gen;
-  std::uniform_int_distribution<T> m_distr;
+
+  using distribution_int_type =
+      std::conditional_t<sizeof(T) != 1, T, std::conditional_t<std::is_signed_v<T>, short, unsigned short>>;
+  std::uniform_int_distribution<distribution_int_type> m_distr;
 
 public:
   UniformRandom(T min, T max) : m_gen(m_rd()), m_distr(min, max) {}
   UniformRandom() : UniformRandom(std::numeric_limits<T>::min(), std::numeric_limits<T>::max()) {}
 
-  T operator()() { return m_distr(m_gen); }
+  T operator()() { return static_cast<T>(m_distr(m_gen)); }
 };
 }  // namespace base

From 7e5e6ec78e88a1ff978151c5df1ff5633fcebb2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ferenc=20G=C3=A9czi?= <Ferenc-@users.noreply.github.com>
Date: Tue, 29 Jul 2025 19:14:16 +0200
Subject: [PATCH 066/302] [libs][linux] Fix incorrect include of fcntl.h
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The POSIX standard says, that `fcntl.h` is to be included as `#include <fcntl.h>`.

This change fixes the compiler warnings that happen with `musl` libc :
```
/usr/include/sys/fcntl.h:1:2: warning: #warning redirecting incorrect #include <sys/fcntl.h> to <fcntl.h> [-Wcpp]
    1 | #warning redirecting incorrect #include <sys/fcntl.h> to <fcntl.h>
      |  ^~~~~~~
In file included from /home/ferenc/github.com/organicmaps/organicmaps/libs/coding/mmap_reader.cpp:18,
                 from /home/ferenc/github.com/organicmaps/organicmaps/build-alpine-3.21/build-alpine-3.21/libs/coding/CMakeFiles/coding.dir/Unity/unity_0_cxx.cxx:40:
/usr/include/sys/fcntl.h:1:2: warning: #warning redirecting incorrect #include <sys/fcntl.h> to <fcntl.h> [-Wcpp]
    1 | #warning redirecting incorrect #include <sys/fcntl.h> to <fcntl.h>
      |  ^~~~~~~
````

This happens because of the explicit [warning in the proxy header](
https://git.musl-libc.org/cgit/musl/tree/include/sys/fcntl.h)

Signed-off-by: Ferenc Géczi <ferenc.gm@gmail.com>
---
 libs/coding/files_container.cpp | 13 ++++---------
 libs/coding/mmap_reader.cpp     |  8 ++------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/libs/coding/files_container.cpp b/libs/coding/files_container.cpp
index 267e45133..532c66366 100644
--- a/libs/coding/files_container.cpp
+++ b/libs/coding/files_container.cpp
@@ -8,18 +8,13 @@
 #include <cstring>
 #include <sstream>
 
-#ifndef OMIM_OS_WINDOWS
-#include <stdio.h>
+#ifdef OMIM_OS_WINDOWS
+#include "std/windows.hpp"
+#else
+#include <fcntl.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <unistd.h>  // _SC_PAGESIZE
-#ifdef OMIM_OS_ANDROID
-#include <fcntl.h>
-#else
-#include <sys/fcntl.h>
-#endif
-#else
-#include <windows.h>
 #endif
 
 #include <errno.h>
diff --git a/libs/coding/mmap_reader.cpp b/libs/coding/mmap_reader.cpp
index 97ef3bb01..9043cbed1 100644
--- a/libs/coding/mmap_reader.cpp
+++ b/libs/coding/mmap_reader.cpp
@@ -7,16 +7,12 @@
 #include <cstring>
 
 #ifdef OMIM_OS_WINDOWS
-#include <windows.h>
+#include "std/windows.hpp"
 #else
+#include <fcntl.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#ifdef OMIM_OS_ANDROID
-#include <fcntl.h>
-#else
-#include <sys/fcntl.h>
-#endif
 #endif
 
 class MmapReader::MmapData

From 5158ceb3117a405df292b37460e8f54d334ab0cb Mon Sep 17 00:00:00 2001
From: Osyotr <Osyotr@users.noreply.github.com>
Date: Sun, 27 Jul 2025 13:33:43 +0300
Subject: [PATCH 067/302] Add windows support to vulkan_wrapper

Signed-off-by: Osyotr <Osyotr@users.noreply.github.com>
---
 3party/vulkan_wrapper/vulkan_wrapper.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/3party/vulkan_wrapper/vulkan_wrapper.cpp b/3party/vulkan_wrapper/vulkan_wrapper.cpp
index 4322a49d9..bd56577fb 100755
--- a/3party/vulkan_wrapper/vulkan_wrapper.cpp
+++ b/3party/vulkan_wrapper/vulkan_wrapper.cpp
@@ -19,7 +19,18 @@ extern "C" {
 #endif
 
 #include "vulkan_wrapper.h"
+
+#if defined(_WIN32)
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+#include <windows.h>
+#else
 #include <dlfcn.h>
+#endif
 
 int InitVulkan(void) {
 #if defined(__APPLE__)
@@ -30,6 +41,9 @@ int InitVulkan(void) {
     if (!libvulkan) {
         libvulkan = dlopen("libMoltenVK.dylib", RTLD_NOW | RTLD_LOCAL);
     }
+#elif defined( _WIN32 )
+    HMODULE libvulkan = LoadLibraryA("vulkan-1.dll");
+    auto dlsym = [](HMODULE h, char const * name) { return GetProcAddress(h, name); };
 #else
     void* libvulkan = dlopen("libvulkan.so.1", RTLD_NOW | RTLD_LOCAL);
     if (!libvulkan) {

From 8477fff98828d1f2b4667606211b37ee7550903b Mon Sep 17 00:00:00 2001
From: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>
Date: Wed, 30 Jul 2025 23:52:29 +0200
Subject: [PATCH 068/302] [strings] Add more Spanish categories translations

Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>
---
 data/categories.txt | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/data/categories.txt b/data/categories.txt
index 14079d4ca..31f60e874 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -2640,7 +2640,7 @@ pl:Sklep rowerowy|4rower
 pt:Loja de bicicletas|4bicicleta
 pt-BR:Loja de bicicletas|4bicicletaria|4bicicleta|bike
 ro:3Bicicletă|Magazin biciclete
-es:Tienda de bicicletas|4bicicleta|bici
+es:Tienda de bicicletas|4bicicleta|Tienda de bicis
 et:3Jalgrattapood
 eu:4Bizikleta-denda|4bizikleta
 sr:Бицикли|Bicikli
@@ -4978,7 +4978,7 @@ pl:4Wynajem rowerów|4rower|3Wynajem
 pt:Aluguer de bicicletas|4bicicleta|3aluguar
 pt-BR:Aluguel de bicicletas|4bicicleta|3aluguel
 ro:Închiriere de biciclete|Bicicletă
-es:Alquiler de bicicletas|4bicicleta|3alquiler
+es:3Alquiler de bicicletas|4bicicleta|alquiler|Alquiler de bicis
 et:Jalgrataste laenutus
 eu:Bizikleta alokairua|4bizikleta|3alokairua
 sr:Изнајмљивање бицикала|Iznajmljivanje bicikala
@@ -5000,7 +5000,7 @@ ar:تصليح الدراجات
 cs:Oprava jízdních kol|4jízdní kolo|3kolo|Oprava
 da:4Cykel reparation
 de:4Fahrradreparatur|Radservicestation|Radreparatur
-es:Reparación de bicicletas|4bicicleta
+es:Reparación de bicicletas|4bicicleta|Reparación de bicis
 et:Jalgrataste remondipunkt
 fa:تعمیر دوچرخه
 fi:Polkupyörän korjaus
@@ -5083,7 +5083,7 @@ pl:Wynajem samochodów|samochód|auto|Wynajem
 pt:Aluguer de automóveis|3carro|3automóvel|3aluguer|3rent-a-car
 pt-BR:Aluguel de automóveis|carro|aluguel
 ro:Închiriere mașini
-es:3Coche de alquiler|alquiler|rentadora|alquiladora|alquiler de coches|alquiler de autos|alquiler de carros
+es:3Coche de alquiler|alquiler|rentadora|alquiladora|3alquiler de coches|alquiler de autos|alquiler de carros
 et:4Autorent
 eu:3Autoa alokairua|alokairua
 sv:3Biluthyrning|bilpool|bil|uthyrning|delning
@@ -5109,7 +5109,7 @@ cs:Půjčovna motocyklů
 da:Udlejning af motorcykler
 de:Motorradvermietung
 el:Ενοικίαση μοτοσικλέτας
-es:Alquiler de motos
+es:3Alquiler de motos
 et:Mootorratta rentimine
 eu:Motorren alokairua
 fa:اجاره موتور سیکلت
@@ -8207,7 +8207,7 @@ el:δρόμος
 sk:Ulica
 sw:mtaani
 fa:جاده
-mr:रस्ता 
+mr:रस्ता
 
 highway-motorway_junction
 en:3Exit|3junction
@@ -8948,7 +8948,7 @@ cs:Úniková místnost
 da:Escape room
 de:Escape room
 el:Δωμάτιο απόδρασης
-es:Escape room
+es:Escape room|Sala de escape|Cuarto de escape
 et:Põgenemistuba
 eu:Ihes gela
 fa:اتاق فرار
@@ -13004,7 +13004,7 @@ cs:Nabíjení jízdních kol
 da:Opladning af cykler
 de:Fahrrad aufladen
 el:Φόρτιση ποδηλάτων
-es:Carga de bicicletas
+es:Carga de bicicletas|4bicicleta|Carga de bicis
 et:Jalgratta laadimine
 eu:Bizikleta kargatzea
 fa:شارژ دوچرخه
@@ -13105,7 +13105,7 @@ pl:Parking dla rowerów
 pt:Estacionamento de bicicletas
 pt-BR:Bicicletário|estacionamento de bicicletas
 ro:Parcare biciclete
-es:5Aparcamiento de bicicletas|5Estacionamiento de bicicletas|4Parking de bicicletas|Aparcamiento de bicis|Estacionamiento de bicis|Parking de bicis
+es:5Aparcamiento de bicicletas|5Estacionamiento de bicicletas|4Parking de bicicletas|Aparcamiento de bicis|Estacionamiento de bicis|Parking de bicis|4bicicleta
 et:4Jalgrattaparkla
 eu:Bizikleta aparkalekua
 sr:Паркинг за бицикле|Parking za bicikle
@@ -18978,7 +18978,7 @@ cs:Skříňka na zavazadla
 da:Bagageskab
 de:Gepäckschließfach
 el:Θυρίδα αποσκευών
-es:Consigna de equipajes
+es:Consigna de equipajes|Guardaequipaje
 et:Pagasiruum
 eu:Ekipajearen aldagela
 fa:قفل چمدان

From fda1da03c8b93ab0b07cf49b917149d688b16532 Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Mon, 21 Jul 2025 22:03:58 -0300
Subject: [PATCH 069/302] [tracks] Fixed starting points.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 libs/map/gps_track_filter.cpp | 59 ++++++++++++++++-------------------
 libs/map/gps_track_filter.hpp |  4 +--
 2 files changed, 28 insertions(+), 35 deletions(-)

diff --git a/libs/map/gps_track_filter.cpp b/libs/map/gps_track_filter.cpp
index 753329e7a..67c08971e 100644
--- a/libs/map/gps_track_filter.cpp
+++ b/libs/map/gps_track_filter.cpp
@@ -6,8 +6,6 @@
 #include "platform/settings.hpp"
 
 #include "base/assert.hpp"
-#include "base/macros.hpp"
-#include "base/math.hpp"
 
 namespace
 {
@@ -80,37 +78,34 @@ void GpsTrackFilter::Process(std::vector<location::GpsInfo> const & inPoints,
     if (!currInfo.HasSpeed())
       continue;
 
-    if (m_countAcceptedInfo < 2 || currInfo.m_timestamp < GetLastAcceptedInfo().m_timestamp)
+    if (m_countAcceptedInfo == 0 || (IsGoodPoint(currInfo) && (m_countLastInfo < 2 || IsGoodVector(currInfo))))
     {
-      AddLastInfo(currInfo);
+      outPoints.emplace_back(currInfo);
       AddLastAcceptedInfo(currInfo);
-      continue;
-    }
-
-    if (IsGoodPoint(currInfo))
-    {
-      double const predictionDistance = GetDistance(m_lastInfo[1], m_lastInfo[0]);  // meters
-      double const realDistance = GetDistance(m_lastInfo[0], currInfo);             // meters
-
-      m2::PointD const predictionDirection = GetDirection(m_lastInfo[1], m_lastInfo[0]);
-      m2::PointD const realDirection = GetDirection(m_lastInfo[0], currInfo);
-
-      // Cosine of angle between prediction direction and real direction is
-      double const cosine = m2::DotProduct(predictionDirection, realDirection);
-
-      // Acceptable angle must be from 0 to 45 or from 0 to -45.
-      // Acceptable distance must be not great than 2x than predicted, otherwise it is jump.
-      if (cosine >= kCosine45degrees && realDistance <= std::max(kClosePointDistanceMeters, 2. * predictionDistance))
-      {
-        outPoints.emplace_back(currInfo);
-        AddLastAcceptedInfo(currInfo);
-      }
     }
 
     AddLastInfo(currInfo);
   }
 }
 
+bool GpsTrackFilter::IsGoodVector(location::GpsInfo const & info) const
+{
+  ASSERT_GREATER(m_countLastInfo, 1, ());
+
+  double const predictionDistance = GetDistance(m_lastInfo[1], m_lastInfo[0]);  // meters
+  double const realDistance = GetDistance(m_lastInfo[0], info);                 // meters
+
+  m2::PointD const predictionDirection = GetDirection(m_lastInfo[1], m_lastInfo[0]);
+  m2::PointD const realDirection = GetDirection(m_lastInfo[0], info);
+
+  // Cosine of angle between prediction direction and real direction is
+  double const cosine = m2::DotProduct(predictionDirection, realDirection);
+
+  // Acceptable angle must be from 0 to 45 or from 0 to -45.
+  // Acceptable distance must be not great than 2x than predicted, otherwise it is jump.
+  return (cosine >= kCosine45degrees && realDistance <= std::max(kClosePointDistanceMeters, 2. * predictionDistance));
+}
+
 bool GpsTrackFilter::IsGoodPoint(location::GpsInfo const & info) const
 {
   // Filter by point accuracy
@@ -120,6 +115,11 @@ bool GpsTrackFilter::IsGoodPoint(location::GpsInfo const & info) const
   auto const & lastInfo = GetLastInfo();
   auto const & lastAcceptedInfo = GetLastAcceptedInfo();
 
+  // Time spend to move from the last point to the current point, sec:
+  double const timeFromLast = info.m_timestamp - lastInfo.m_timestamp;
+  if (timeFromLast <= 0.0)
+    return false;
+
   // Distance in meters between last accepted and current point is, meters:
   double const distanceFromLastAccepted = GetDistance(lastAcceptedInfo, info);
 
@@ -135,11 +135,6 @@ bool GpsTrackFilter::IsGoodPoint(location::GpsInfo const & info) const
   // Distance in meters between last and current point is, meters:
   double const distanceFromLast = GetDistance(lastInfo, info);
 
-  // Time spend to move from the last point to the current point, sec:
-  double const timeFromLast = info.m_timestamp - lastInfo.m_timestamp;
-  if (timeFromLast <= 0.0)
-    return false;
-
   // Speed to move from the last point to the current point
   double const speedFromLast = distanceFromLast / timeFromLast;
 
@@ -167,12 +162,12 @@ void GpsTrackFilter::AddLastInfo(location::GpsInfo const & info)
 {
   m_lastInfo[1] = m_lastInfo[0];
   m_lastInfo[0] = info;
-  m_countLastInfo += 1;
+  ++m_countLastInfo;
 }
 
 void GpsTrackFilter::AddLastAcceptedInfo(location::GpsInfo const & info)
 {
   m_lastAcceptedInfo[1] = m_lastAcceptedInfo[0];
   m_lastAcceptedInfo[0] = info;
-  m_countAcceptedInfo += 1;
+  ++m_countAcceptedInfo;
 }
diff --git a/libs/map/gps_track_filter.hpp b/libs/map/gps_track_filter.hpp
index f31109943..1308eeb6d 100644
--- a/libs/map/gps_track_filter.hpp
+++ b/libs/map/gps_track_filter.hpp
@@ -2,9 +2,6 @@
 
 #include "platform/location.hpp"
 
-#include "geometry/latlon.hpp"
-
-#include <cstddef>
 #include <vector>
 
 class IGpsTrackFilter
@@ -35,6 +32,7 @@ public:
 
 private:
   bool IsGoodPoint(location::GpsInfo const & info) const;
+  bool IsGoodVector(location::GpsInfo const & info) const;
 
   location::GpsInfo const & GetLastInfo() const;
   location::GpsInfo const & GetLastAcceptedInfo() const;

From 64f50d4e49e974f189b7ce0db73a2b9fe7b7805b Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Tue, 22 Jul 2025 23:49:28 -0300
Subject: [PATCH 070/302] [tracks] Fixed ending points.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 libs/map/bookmark_manager.cpp     |  7 +--
 libs/map/gps_track.cpp            | 75 ++++++++++++++-----------------
 libs/map/gps_track.hpp            | 13 +++---
 libs/map/gps_track_collection.cpp |  4 --
 libs/map/gps_track_collection.hpp |  3 +-
 libs/map/gps_track_filter.cpp     | 19 ++++++--
 libs/map/gps_track_filter.hpp     |  9 ++--
 libs/map/gps_track_storage.cpp    |  6 +--
 libs/map/gps_track_storage.hpp    |  3 ++
 libs/map/gps_tracker.cpp          | 19 +-------
 libs/map/gps_tracker.hpp          | 13 ++++--
 11 files changed, 83 insertions(+), 88 deletions(-)

diff --git a/libs/map/bookmark_manager.cpp b/libs/map/bookmark_manager.cpp
index 30d54ef55..0a404cf80 100644
--- a/libs/map/bookmark_manager.cpp
+++ b/libs/map/bookmark_manager.cpp
@@ -1096,7 +1096,7 @@ kml::CompilationType BookmarkManager::GetCompilationType(kml::MarkGroupId id) co
 kml::TrackId BookmarkManager::SaveTrackRecording(std::string trackName)
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
-  auto const & tracker = GpsTracker::Instance();
+  auto & tracker = GpsTracker::Instance();
   CHECK(!tracker.IsEmpty(), ("Track recording should be not be empty"));
 
   kml::MultiGeometry geometry;
@@ -1104,11 +1104,12 @@ kml::TrackId BookmarkManager::SaveTrackRecording(std::string trackName)
   geometry.m_timestamps.emplace_back();
   auto & line = geometry.m_lines.back();
   auto & timestamps = geometry.m_timestamps.back();
-  auto const trackSize = tracker.GetTrackSize();
+
+  auto const trackSize = tracker.Finalize();
   line.reserve(trackSize);
   timestamps.reserve(trackSize);
 
-  tracker.ForEachTrackPoint([&line, &timestamps](location::GpsInfo const & pt, size_t id) -> bool
+  tracker.ForEachTrackPoint([&line, &timestamps](location::GpsInfo const & pt, size_t id)
   {
     line.emplace_back(mercator::FromLatLon(pt.m_latitude, pt.m_longitude), pt.m_altitude);
     timestamps.emplace_back(pt.m_timestamp);
diff --git a/libs/map/gps_track.cpp b/libs/map/gps_track.cpp
index 1c13b724c..b39577d89 100644
--- a/libs/map/gps_track.cpp
+++ b/libs/map/gps_track.cpp
@@ -3,36 +3,7 @@
 #include "base/assert.hpp"
 #include "base/logging.hpp"
 
-#include <algorithm>
-
 using namespace std;
-using namespace std::chrono;
-
-namespace gps_track
-{
-
-inline pair<size_t, size_t> UnionRanges(pair<size_t, size_t> const & a, pair<size_t, size_t> const & b)
-{
-  if (a.first == GpsTrack::kInvalidId)
-  {
-    ASSERT_EQUAL(a.second, GpsTrack::kInvalidId, ());
-    return b;
-  }
-  if (b.first == GpsTrack::kInvalidId)
-  {
-    ASSERT_EQUAL(b.second, GpsTrack::kInvalidId, ());
-    return a;
-  }
-  ASSERT_LESS_OR_EQUAL(a.first, a.second, ());
-  ASSERT_LESS_OR_EQUAL(b.first, b.second, ());
-  return make_pair(min(a.first, b.first), max(a.second, b.second));
-}
-
-size_t constexpr kItemBlockSize = 1000;
-
-}  // namespace gps_track
-
-size_t const GpsTrack::kInvalidId = GpsTrackCollection::kInvalidId;
 
 GpsTrack::GpsTrack(string const & filePath, unique_ptr<IGpsTrackFilter> && filter)
   : m_filePath(filePath)
@@ -99,12 +70,6 @@ void GpsTrack::Clear()
   ScheduleTask();
 }
 
-size_t GpsTrack::GetSize() const
-{
-  CHECK(m_collection != nullptr, ());
-  return m_collection->GetSize();
-}
-
 bool GpsTrack::IsEmpty() const
 {
   if (!m_collection)
@@ -126,6 +91,7 @@ void GpsTrack::ScheduleTask()
 {
   lock_guard<mutex> lg(m_threadGuard);
 
+  /// @todo Replace with !m_thread.joinable() ?
   if (m_thread.get_id() == std::thread::id())
   {
     m_thread = threads::SimpleThread([this]()
@@ -133,11 +99,16 @@ void GpsTrack::ScheduleTask()
       unique_lock<mutex> ul(m_threadGuard);
       while (true)
       {
-        m_cv.wait(ul, [this]() -> bool { return m_threadExit || m_threadWakeup; });
+        m_cv.wait(ul, [this]() { return m_threadExit || m_threadWakeup; });
+
+        if (m_threadWakeup)
+        {
+          m_threadWakeup = false;
+          ProcessPoints();
+        }
+
         if (m_threadExit)
           break;
-        m_threadWakeup = false;
-        ProcessPoints();
       }
 
       m_storage.reset();
@@ -179,7 +150,7 @@ void GpsTrack::InitCollection()
     // and filtered points are inserted in the runtime collection.
 
     vector<location::GpsInfo> originPoints;
-    originPoints.reserve(gps_track::kItemBlockSize);
+    originPoints.reserve(GpsTrackStorage::kItemBlockSize);
 
     m_storage->ForEach([this, &originPoints](location::GpsInfo const & originPoint) -> bool
     {
@@ -239,13 +210,35 @@ void GpsTrack::ProcessPoints()
   vector<location::GpsInfo> points;
   m_filter->Process(originPoints, points);
 
-  pair<size_t, size_t> addedIds;
-  pair<size_t, size_t> evictedIds;
+  pair<size_t, size_t> addedIds, evictedIds;
   UpdateCollection(needClear, points, addedIds, evictedIds);
 
   NotifyCallback(addedIds, evictedIds);
 }
 
+size_t GpsTrack::Finalize()
+{
+  if (m_thread.joinable())
+  {
+    {
+      lock_guard<mutex> lg(m_threadGuard);
+      m_threadWakeup = true;
+      m_threadExit = true;
+      m_cv.notify_one();
+    }
+    m_thread.join();
+    m_thread = {};
+  }
+
+  vector<location::GpsInfo> points;
+  m_filter->Finalize(points);
+
+  if (!points.empty())
+    m_collection->Add(points);
+
+  return m_collection->GetSize();
+}
+
 bool GpsTrack::HasCallback()
 {
   lock_guard<mutex> lg(m_callbackGuard);
diff --git a/libs/map/gps_track.hpp b/libs/map/gps_track.hpp
index fb29c4ae1..493ee0c14 100644
--- a/libs/map/gps_track.hpp
+++ b/libs/map/gps_track.hpp
@@ -11,13 +11,12 @@
 #include <memory>
 #include <mutex>
 #include <string>
-#include <utility>
 #include <vector>
 
 class GpsTrack final
 {
 public:
-  static size_t const kInvalidId;  // = numeric_limits<size_t>::max();
+  static size_t constexpr kInvalidId = GpsTrackCollection::kInvalidId;
 
   /// @param filePath - path to the file on disk to persist track
   /// @param filter - filter object used for filtering points, GpsTrackNullFilter is created by default
@@ -40,7 +39,6 @@ public:
   void Clear();
 
   bool IsEmpty() const;
-  size_t GetSize() const;
 
   /// Notification callback about a change of the gps track.
   /// @param toAdd - collection of points and ids to add.
@@ -57,10 +55,13 @@ public:
   /// next time callbacks it receives only modifications. It simplifies getter/callback model.
   void SetCallback(TGpsTrackDiffCallback callback);
 
-  template <typename F>
-  void ForEachPoint(F && f) const
+  size_t Finalize();
+
+  /// @pre Finalize should be called before.
+  template <class FnT>
+  void ForEachPoint(FnT && fn)
   {
-    m_collection->ForEach(std::move(f));
+    m_collection->ForEach(fn);
   }
 
 private:
diff --git a/libs/map/gps_track_collection.cpp b/libs/map/gps_track_collection.cpp
index 9ed3c0b43..0716e6673 100644
--- a/libs/map/gps_track_collection.cpp
+++ b/libs/map/gps_track_collection.cpp
@@ -2,8 +2,6 @@
 
 #include "base/assert.hpp"
 
-#include <algorithm>
-
 namespace
 {
 
@@ -27,8 +25,6 @@ private:
 
 }  // namespace
 
-size_t const GpsTrackCollection::kInvalidId = std::numeric_limits<size_t>::max();
-
 GpsTrackCollection::GpsTrackCollection() : m_lastId(0), m_elevationInfoDirty(true) {}
 
 std::pair<size_t, size_t> GpsTrackCollection::Add(std::vector<TItem> const & items)
diff --git a/libs/map/gps_track_collection.hpp b/libs/map/gps_track_collection.hpp
index 7026a7d9d..f582b65fe 100644
--- a/libs/map/gps_track_collection.hpp
+++ b/libs/map/gps_track_collection.hpp
@@ -7,13 +7,12 @@
 
 #include <deque>
 #include <limits>
-#include <utility>
 #include <vector>
 
 class GpsTrackCollection final
 {
 public:
-  static size_t const kInvalidId;  // = numeric_limits<size_t>::max();
+  static size_t constexpr kInvalidId = std::numeric_limits<size_t>::max();
 
   using TItem = location::GpsInfo;
 
diff --git a/libs/map/gps_track_filter.cpp b/libs/map/gps_track_filter.cpp
index 67c08971e..b68f12622 100644
--- a/libs/map/gps_track_filter.cpp
+++ b/libs/map/gps_track_filter.cpp
@@ -9,7 +9,7 @@
 
 namespace
 {
-char const kMinHorizontalAccuracyKey[] = "GpsTrackingMinAccuracy";
+std::string_view constexpr kMinHorizontalAccuracyKey = "GpsTrackingMinAccuracy";
 
 // Minimal horizontal accuracy is required to skip 'bad' points.
 // Use 250 meters to allow points from a pure GPS + GPS through wifi.
@@ -56,8 +56,7 @@ GpsTrackFilter::GpsTrackFilter()
   settings::TryGet(kMinHorizontalAccuracyKey, m_minAccuracy);
 }
 
-void GpsTrackFilter::Process(std::vector<location::GpsInfo> const & inPoints,
-                             std::vector<location::GpsInfo> & outPoints)
+void GpsTrackFilter::Process(GpsVectorT const & inPoints, GpsVectorT & outPoints)
 {
   outPoints.reserve(inPoints.size());
 
@@ -88,6 +87,20 @@ void GpsTrackFilter::Process(std::vector<location::GpsInfo> const & inPoints,
   }
 }
 
+void GpsTrackFilter::Finalize(GpsVectorT & outPoints)
+{
+  if (m_countLastInfo > 0)
+  {
+    // Force append the last point, if wasn't added before.
+    auto const & info = GetLastInfo();
+    if (m_countAcceptedInfo == 0 || info.m_timestamp > GetLastAcceptedInfo().m_timestamp)
+    {
+      outPoints.push_back(info);
+      AddLastAcceptedInfo(info);
+    }
+  }
+}
+
 bool GpsTrackFilter::IsGoodVector(location::GpsInfo const & info) const
 {
   ASSERT_GREATER(m_countLastInfo, 1, ());
diff --git a/libs/map/gps_track_filter.hpp b/libs/map/gps_track_filter.hpp
index 1308eeb6d..65028ab50 100644
--- a/libs/map/gps_track_filter.hpp
+++ b/libs/map/gps_track_filter.hpp
@@ -9,14 +9,16 @@ class IGpsTrackFilter
 public:
   virtual ~IGpsTrackFilter() = default;
 
-  virtual void Process(std::vector<location::GpsInfo> const & inPoints, std::vector<location::GpsInfo> & outPoints) = 0;
+  using GpsVectorT = std::vector<location::GpsInfo>;
+  virtual void Process(GpsVectorT const & inPoints, GpsVectorT & outPoints) = 0;
+  virtual void Finalize(GpsVectorT & outPoints) {}
 };
 
 class GpsTrackNullFilter : public IGpsTrackFilter
 {
 public:
   // IGpsTrackFilter overrides
-  void Process(std::vector<location::GpsInfo> const & inPoints, std::vector<location::GpsInfo> & outPoints) override;
+  void Process(GpsVectorT const & inPoints, GpsVectorT & outPoints) override;
 };
 
 class GpsTrackFilter : public IGpsTrackFilter
@@ -28,7 +30,8 @@ public:
   GpsTrackFilter();
 
   // IGpsTrackFilter overrides
-  void Process(std::vector<location::GpsInfo> const & inPoints, std::vector<location::GpsInfo> & outPoints) override;
+  void Process(GpsVectorT const & inPoints, GpsVectorT & outPoints) override;
+  void Finalize(GpsVectorT & outPoints) override;
 
 private:
   bool IsGoodPoint(location::GpsInfo const & info) const;
diff --git a/libs/map/gps_track_storage.cpp b/libs/map/gps_track_storage.cpp
index d547eebe1..31b92dd72 100644
--- a/libs/map/gps_track_storage.cpp
+++ b/libs/map/gps_track_storage.cpp
@@ -1,13 +1,12 @@
 #include "map/gps_track_storage.hpp"
 
 #include "coding/endianness.hpp"
-#include "coding/internal/file_data.hpp"
 
 #include "base/assert.hpp"
 #include "base/logging.hpp"
 
 #include <algorithm>
-#include <cstring>
+#include <cstring>  // for memcpy
 
 using namespace std;
 
@@ -20,9 +19,6 @@ uint32_t constexpr kCurrentVersion = 1;
 // Header size in bytes, header consists of uint32_t 'version' only
 uint32_t constexpr kHeaderSize = sizeof(uint32_t);
 
-// Number of items for batch processing
-size_t constexpr kItemBlockSize = 1000;
-
 // TODO
 // Now GpsInfo written as plain values, but values can be compressed.
 
diff --git a/libs/map/gps_track_storage.hpp b/libs/map/gps_track_storage.hpp
index 5f3dc7896..fd83bc266 100644
--- a/libs/map/gps_track_storage.hpp
+++ b/libs/map/gps_track_storage.hpp
@@ -17,6 +17,9 @@ public:
   DECLARE_EXCEPTION(WriteException, RootException);
   DECLARE_EXCEPTION(ReadException, RootException);
 
+  // Number of items for batch processing.
+  static size_t constexpr kItemBlockSize = 1000;
+
   using TItem = location::GpsInfo;
 
   /// Opens storage with track data.
diff --git a/libs/map/gps_tracker.cpp b/libs/map/gps_tracker.cpp
index ca7a17fa8..da29ebfdd 100644
--- a/libs/map/gps_tracker.cpp
+++ b/libs/map/gps_tracker.cpp
@@ -1,20 +1,16 @@
 #include "map/gps_tracker.hpp"
-#include "map/framework.hpp"
 
 #include "platform/platform.hpp"
+#include "platform/settings.hpp"
 
 #include "base/file_name_utils.hpp"
 
-#include <string>
-
 #include "defines.hpp"
 
-using namespace std::chrono;
-
 namespace
 {
 
-char const kEnabledKey[] = "GpsTrackingEnabled";
+std::string_view constexpr kEnabledKey = "GpsTrackingEnabled";
 
 inline std::string GetFilePath()
 {
@@ -72,11 +68,6 @@ bool GpsTracker::IsEmpty() const
   return m_track.IsEmpty();
 }
 
-size_t GpsTracker::GetTrackSize() const
-{
-  return m_track.GetSize();
-}
-
 TrackStatistics GpsTracker::GetTrackStatistics() const
 {
   return m_track.GetTrackStatistics();
@@ -103,9 +94,3 @@ void GpsTracker::OnLocationUpdated(location::GpsInfo const & info)
     return;
   m_track.AddPoint(info);
 }
-
-void GpsTracker::ForEachTrackPoint(GpsTrackCallback const & callback) const
-{
-  CHECK(callback != nullptr, ("Callback should be provided"));
-  m_track.ForEachPoint(callback);
-}
diff --git a/libs/map/gps_tracker.hpp b/libs/map/gps_tracker.hpp
index 05f98269f..f0b5cdf36 100644
--- a/libs/map/gps_tracker.hpp
+++ b/libs/map/gps_tracker.hpp
@@ -4,7 +4,6 @@
 
 #include <atomic>
 #include <functional>
-#include <utility>
 #include <vector>
 
 class GpsTracker
@@ -17,7 +16,7 @@ public:
   void Clear();
 
   bool IsEmpty() const;
-  size_t GetTrackSize() const;
+
   TrackStatistics GetTrackStatistics() const;
   ElevationInfo const & GetElevationInfo() const;
 
@@ -30,8 +29,14 @@ public:
 
   void OnLocationUpdated(location::GpsInfo const & info);
 
-  using GpsTrackCallback = std::function<bool(location::GpsInfo const &, size_t)>;
-  void ForEachTrackPoint(GpsTrackCallback const & callback) const;
+  size_t Finalize() { return m_track.Finalize(); }
+
+  /// @pre Finalize should be called before.
+  template <class FnT>
+  void ForEachTrackPoint(FnT && fn)
+  {
+    m_track.ForEachPoint(fn);
+  }
 
 private:
   GpsTracker();

From fb62982000a0f429b55723a9b6321990d4867796 Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Wed, 23 Jul 2025 00:03:16 -0300
Subject: [PATCH 071/302] [tracks] Set close distance threshold to 10m.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 libs/map/gps_track_filter.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/map/gps_track_filter.cpp b/libs/map/gps_track_filter.cpp
index b68f12622..83787f673 100644
--- a/libs/map/gps_track_filter.cpp
+++ b/libs/map/gps_track_filter.cpp
@@ -16,7 +16,7 @@ std::string_view constexpr kMinHorizontalAccuracyKey = "GpsTrackingMinAccuracy";
 double constexpr kMinHorizontalAccuracyMeters = 250;
 
 // Required for points decimation to reduce number of close points.
-double constexpr kClosePointDistanceMeters = 15;
+double constexpr kClosePointDistanceMeters = 10;
 
 // Max acceptable acceleration to filter gps jumps
 double constexpr kMaxAcceptableAcceleration = 2;  // m / sec ^ 2

From b7b87f55304f802cfb154a536b8b81d83af86c86 Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Wed, 30 Jul 2025 15:27:29 -0300
Subject: [PATCH 072/302] [tracks] Safe GpsTrackCollection requests during
 recording.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 libs/map/gps_track.cpp   | 9 +++++++--
 libs/map/gps_track.hpp   | 4 ++--
 libs/map/gps_tracker.cpp | 4 ++--
 libs/map/gps_tracker.hpp | 4 ++--
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/libs/map/gps_track.cpp b/libs/map/gps_track.cpp
index b39577d89..5ecbb5e5d 100644
--- a/libs/map/gps_track.cpp
+++ b/libs/map/gps_track.cpp
@@ -50,15 +50,20 @@ void GpsTrack::AddPoints(vector<location::GpsInfo> const & points)
   ScheduleTask();
 }
 
-TrackStatistics GpsTrack::GetTrackStatistics() const
+/// @note These functions are called during recording, so should be synchronized with Collection writer thread.
+/// @{
+TrackStatistics GpsTrack::GetTrackStatistics()
 {
+  lock_guard<mutex> lg(m_threadGuard);
   return m_collection ? m_collection->GetTrackStatistics() : TrackStatistics();
 }
 
-ElevationInfo const & GpsTrack::GetElevationInfo() const
+ElevationInfo const & GpsTrack::GetElevationInfo()
 {
+  lock_guard<mutex> lg(m_threadGuard);
   return m_collection->UpdateAndGetElevationInfo();
 }
+/// @}
 
 void GpsTrack::Clear()
 {
diff --git a/libs/map/gps_track.hpp b/libs/map/gps_track.hpp
index 493ee0c14..edfaa5790 100644
--- a/libs/map/gps_track.hpp
+++ b/libs/map/gps_track.hpp
@@ -31,8 +31,8 @@ public:
   void AddPoints(std::vector<location::GpsInfo> const & points);
 
   /// Returns track statistics
-  TrackStatistics GetTrackStatistics() const;
-  ElevationInfo const & GetElevationInfo() const;
+  TrackStatistics GetTrackStatistics();
+  ElevationInfo const & GetElevationInfo();
 
   /// Clears any previous tracking info
   /// @note Callback is called with 'toRemove' points, if some points were removed.
diff --git a/libs/map/gps_tracker.cpp b/libs/map/gps_tracker.cpp
index da29ebfdd..f1feeb03d 100644
--- a/libs/map/gps_tracker.cpp
+++ b/libs/map/gps_tracker.cpp
@@ -68,12 +68,12 @@ bool GpsTracker::IsEmpty() const
   return m_track.IsEmpty();
 }
 
-TrackStatistics GpsTracker::GetTrackStatistics() const
+TrackStatistics GpsTracker::GetTrackStatistics()
 {
   return m_track.GetTrackStatistics();
 }
 
-ElevationInfo const & GpsTracker::GetElevationInfo() const
+ElevationInfo const & GpsTracker::GetElevationInfo()
 {
   return m_track.GetElevationInfo();
 }
diff --git a/libs/map/gps_tracker.hpp b/libs/map/gps_tracker.hpp
index f0b5cdf36..a72d2bd3d 100644
--- a/libs/map/gps_tracker.hpp
+++ b/libs/map/gps_tracker.hpp
@@ -17,8 +17,8 @@ public:
 
   bool IsEmpty() const;
 
-  TrackStatistics GetTrackStatistics() const;
-  ElevationInfo const & GetElevationInfo() const;
+  TrackStatistics GetTrackStatistics();
+  ElevationInfo const & GetElevationInfo();
 
   using TGpsTrackDiffCallback =
       std::function<void(std::vector<std::pair<size_t, location::GpsInfo>> && toAdd,

From 7b4862b44297481452c09cb15bf16afa4d71fb55 Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Thu, 3 Jul 2025 20:01:54 -0300
Subject: [PATCH 073/302] [base] Updated IsSortedAndUnique function.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 generator/altitude_generator.cpp                    |  2 +-
 generator/gen_mwm_info.hpp                          |  2 +-
 libs/base/stl_helpers.hpp                           | 12 ++++++------
 libs/platform/duration.cpp                          |  2 +-
 libs/search/features_layer_matcher.cpp              |  2 +-
 libs/search/house_detector.cpp                      |  2 +-
 libs/search/search_tests/mem_search_index_tests.cpp |  2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/generator/altitude_generator.cpp b/generator/altitude_generator.cpp
index 68f15a438..98fcf876e 100644
--- a/generator/altitude_generator.cpp
+++ b/generator/altitude_generator.cpp
@@ -172,7 +172,7 @@ void BuildRoadAltitudes(std::string const & mwmPath, AltitudeGetter & altitudeGe
     }
     {
       // Altitude offsets serialization.
-      CHECK(base::IsSortedAndUnique(offsets.begin(), offsets.end()), ());
+      CHECK(base::IsSortedAndUnique(offsets), ());
 
       succinct::elias_fano::elias_fano_builder builder(offsets.back(), offsets.size());
       for (uint32_t offset : offsets)
diff --git a/generator/gen_mwm_info.hpp b/generator/gen_mwm_info.hpp
index 7958325f6..fe50c6e8e 100644
--- a/generator/gen_mwm_info.hpp
+++ b/generator/gen_mwm_info.hpp
@@ -89,7 +89,7 @@ public:
 
       m_version = Version::V0;
     }
-    ASSERT(std::is_sorted(std::cbegin(m_data), std::cend(m_data)), ());
+    CHECK(base::IsSortedAndUnique(m_data), ());
   }
 
 private:
diff --git a/libs/base/stl_helpers.hpp b/libs/base/stl_helpers.hpp
index 3fa4a2815..24b9f5911 100644
--- a/libs/base/stl_helpers.hpp
+++ b/libs/base/stl_helpers.hpp
@@ -304,6 +304,12 @@ bool IsSortedAndUnique(Iter beg, Iter end, Compare comp)
   return true;
 }
 
+template <typename ContT>
+bool IsSortedAndUnique(ContT const & cont)
+{
+  return IsSortedAndUnique(cont.begin(), cont.end(), std::less<>());
+}
+
 template <typename Iter, typename Compare>
 Iter RemoveIfKeepValid(Iter beg, Iter end, Compare comp)
 {
@@ -328,12 +334,6 @@ Iter RemoveIfKeepValid(Iter beg, Iter end, Compare comp)
   return end;
 }
 
-template <typename Iter>
-bool IsSortedAndUnique(Iter beg, Iter end)
-{
-  return IsSortedAndUnique(beg, end, std::less<typename std::iterator_traits<Iter>::value_type>());
-}
-
 struct DeleteFunctor
 {
   template <typename T>
diff --git a/libs/platform/duration.cpp b/libs/platform/duration.cpp
index 63576a826..e490d4a52 100644
--- a/libs/platform/duration.cpp
+++ b/libs/platform/duration.cpp
@@ -50,7 +50,7 @@ std::string_view GetUnitsGroupingSeparator(Locale const & locale)
 
 bool IsUnitsOrderValid(std::initializer_list<Duration::Units> units)
 {
-  return base::IsSortedAndUnique(units.begin(), units.end());
+  return base::IsSortedAndUnique(units);
 }
 }  // namespace
 
diff --git a/libs/search/features_layer_matcher.cpp b/libs/search/features_layer_matcher.cpp
index 68e0729b5..4ef8ff029 100644
--- a/libs/search/features_layer_matcher.cpp
+++ b/libs/search/features_layer_matcher.cpp
@@ -73,7 +73,7 @@ std::vector<uint32_t> const & FeaturesLayerMatcher::GetPlaceAddrFeatures(uint32_
         res.first.push_back(fid);
     });
 
-    ASSERT(base::IsSortedAndUnique(res.first.begin(), res.first.end()), ());
+    ASSERT(base::IsSortedAndUnique(res.first), ());
   }
   return res.first;
 }
diff --git a/libs/search/house_detector.cpp b/libs/search/house_detector.cpp
index 63105b215..4776af5f6 100644
--- a/libs/search/house_detector.cpp
+++ b/libs/search/house_detector.cpp
@@ -833,7 +833,7 @@ int HouseDetector::LoadStreets(vector<FeatureID> const & ids)
 {
   // LOG(LDEBUG, ("IDs = ", ids));
 
-  ASSERT(base::IsSortedAndUnique(ids.begin(), ids.end()), ());
+  ASSERT(base::IsSortedAndUnique(ids), ());
 
   // Check if the cache is obsolete and need to be cleared.
   if (!m_id2st.empty())
diff --git a/libs/search/search_tests/mem_search_index_tests.cpp b/libs/search/search_tests/mem_search_index_tests.cpp
index f16330bb6..b8d28accd 100644
--- a/libs/search/search_tests/mem_search_index_tests.cpp
+++ b/libs/search/search_tests/mem_search_index_tests.cpp
@@ -58,7 +58,7 @@ public:
   vector<Id> StrictQuery(string const & query, string const & lang) const
   {
     auto prev = m_index.GetAllIds();
-    TEST(base::IsSortedAndUnique(prev.cbegin(), prev.cend()), ());
+    TEST(base::IsSortedAndUnique(prev), ());
 
     ForEachNormalizedToken(query, [&](strings::UniString const & token)
     {

From 1d29e7816a1c9029b4f70abe9e13cc1fcad4ba05 Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Wed, 2 Jul 2025 22:05:34 -0300
Subject: [PATCH 074/302] [coding] Rename non-empty string serialization.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 generator/boundary_postcodes_enricher.cpp     |  2 +-
 generator/collector_boundary_postcode.cpp     |  2 +-
 .../collector_boundary_postcode_tests.cpp     |  2 +-
 generator/road_access_generator.hpp           |  5 ++-
 libs/coding/string_utf8_multilang.hpp         | 36 +++++++------------
 libs/indexer/feature_data.hpp                 |  8 ++---
 libs/indexer/feature_meta.hpp                 |  4 +--
 libs/kml/serdes_common.hpp                    |  1 +
 8 files changed, 24 insertions(+), 36 deletions(-)

diff --git a/generator/boundary_postcodes_enricher.cpp b/generator/boundary_postcodes_enricher.cpp
index e7b6488af..5bac09836 100644
--- a/generator/boundary_postcodes_enricher.cpp
+++ b/generator/boundary_postcodes_enricher.cpp
@@ -22,7 +22,7 @@ BoundaryPostcodesEnricher::BoundaryPostcodesEnricher(std::string const & boundar
   while (src.Size() > 0)
   {
     std::string postcode;
-    utils::ReadString(src, postcode);
+    rw::ReadNonEmpty(src, postcode);
     std::vector<m2::PointD> geometry;
     rw::ReadVectorOfPOD(src, geometry);
     CHECK(!postcode.empty() && !geometry.empty(), ());
diff --git a/generator/collector_boundary_postcode.cpp b/generator/collector_boundary_postcode.cpp
index d5f5c25b7..5033c6fdf 100644
--- a/generator/collector_boundary_postcode.cpp
+++ b/generator/collector_boundary_postcode.cpp
@@ -57,7 +57,7 @@ void BoundaryPostcodeCollector::Save()
   FileWriter writer(GetFilename());
   for (auto const & p : m_data)
   {
-    utils::WriteString(writer, p.first);
+    rw::WriteNonEmpty(writer, p.first);
     rw::WriteVectorOfPOD(writer, p.second);
   }
 }
diff --git a/generator/generator_tests/collector_boundary_postcode_tests.cpp b/generator/generator_tests/collector_boundary_postcode_tests.cpp
index 33649e34c..0d82ac216 100644
--- a/generator/generator_tests/collector_boundary_postcode_tests.cpp
+++ b/generator/generator_tests/collector_boundary_postcode_tests.cpp
@@ -91,7 +91,7 @@ unordered_map<string, vector<m2::PointD>> Read(string const & dumpFilename)
   while (src.Size() > 0)
   {
     string postcode;
-    utils::ReadString(src, postcode);
+    rw::ReadNonEmpty(src, postcode);
     vector<m2::PointD> geometry;
     rw::ReadVectorOfPOD(src, geometry);
     result.emplace(std::move(postcode), std::move(geometry));
diff --git a/generator/road_access_generator.hpp b/generator/road_access_generator.hpp
index 766291a06..f24c0ef09 100644
--- a/generator/road_access_generator.hpp
+++ b/generator/road_access_generator.hpp
@@ -14,7 +14,6 @@
 #include <optional>
 #include <set>
 #include <string>
-#include <unordered_map>
 #include <vector>
 
 namespace routing
@@ -74,7 +73,7 @@ void Save(Sink & sink, ConditionalRAVectorT const & ac)
   for (auto const & e : ac)
   {
     Save(sink, e.m_accessType);
-    utils::WriteString(sink, e.m_openingHours);
+    rw::WriteNonEmpty(sink, e.m_openingHours);
   }
 }
 
@@ -86,7 +85,7 @@ void Load(Source & src, ConditionalRAVectorT & vec)
   for (uint32_t i = 0; i < count; ++i)
   {
     Load(src, vec[i].m_accessType);
-    utils::ReadString(src, vec[i].m_openingHours);
+    rw::ReadNonEmpty(src, vec[i].m_openingHours);
   }
 }
 
diff --git a/libs/coding/string_utf8_multilang.hpp b/libs/coding/string_utf8_multilang.hpp
index f11eebec6..257e3d862 100644
--- a/libs/coding/string_utf8_multilang.hpp
+++ b/libs/coding/string_utf8_multilang.hpp
@@ -1,46 +1,35 @@
 #pragma once
 
-#include "coding/reader.hpp"
+#include "coding/read_write_utils.hpp"
 #include "coding/varint.hpp"
-#include "coding/writer.hpp"
 
 #include "base/assert.hpp"
 #include "base/buffer_vector.hpp"
 #include "base/control_flow.hpp"
 
-#include <map>
 #include <string>
 #include <string_view>
 #include <vector>
 
-namespace utils
+namespace rw
 {
-template <class TSink, bool EnableExceptions = false>
-void WriteString(TSink & sink, std::string const & s)
+template <class TSink>
+void WriteNonEmpty(TSink & sink, std::string const & s)
 {
-  if (EnableExceptions && s.empty())
-    MYTHROW(Writer::WriteException, ("String is empty"));
-  else
-    CHECK(!s.empty(), ());
-
+  CHECK(!s.empty(), ());
   size_t const sz = s.size();
   WriteVarUint(sink, static_cast<uint32_t>(sz - 1));
   sink.Write(s.c_str(), sz);
 }
 
-template <class TSource, bool EnableExceptions = false>
-void ReadString(TSource & src, std::string & s)
+template <class TSource>
+void ReadNonEmpty(TSource & src, std::string & s)
 {
   uint32_t const sz = ReadVarUint<uint32_t>(src) + 1;
   s.resize(sz);
   src.Read(&s[0], sz);
-
-  if (EnableExceptions && s.empty())
-    MYTHROW(Reader::ReadException, ("String is empty"));
-  else
-    CHECK(!s.empty(), ());
 }
-}  // namespace utils
+}  // namespace rw
 
 // A class to store strings in multiple languages.
 // May be used e.g. to store several translations of a feature's name.
@@ -201,15 +190,14 @@ public:
   /// @name Used for serdes.
   /// @{
   template <class TSink>
-  void Write(TSink & sink) const
+  void WriteNonEmpty(TSink & sink) const
   {
-    utils::WriteString(sink, m_s);
+    rw::WriteNonEmpty(sink, m_s);
   }
-
   template <class TSource>
-  void Read(TSource & src)
+  void ReadNonEmpty(TSource & src)
   {
-    utils::ReadString(src, m_s);
+    rw::ReadNonEmpty(src, m_s);
   }
 
   std::string const & GetBuffer() const { return m_s; }
diff --git a/libs/indexer/feature_data.hpp b/libs/indexer/feature_data.hpp
index c0930a085..8b98c1cb5 100644
--- a/libs/indexer/feature_data.hpp
+++ b/libs/indexer/feature_data.hpp
@@ -176,7 +176,7 @@ struct FeatureParamsBase
     using namespace feature;
 
     if (header & HEADER_MASK_HAS_NAME)
-      name.Write(sink);
+      name.WriteNonEmpty(sink);
 
     if (header & HEADER_MASK_HAS_LAYER)
       WriteToSink(sink, layer);
@@ -187,7 +187,7 @@ struct FeatureParamsBase
       switch (headerGeomType)
       {
       case HeaderGeomType::Point: WriteToSink(sink, rank); break;
-      case HeaderGeomType::Line: utils::WriteString(sink, ref); break;
+      case HeaderGeomType::Line: rw::WriteNonEmpty(sink, ref); break;
       case HeaderGeomType::Area:
       case HeaderGeomType::PointEx: house.Write(sink); break;
       }
@@ -200,7 +200,7 @@ struct FeatureParamsBase
     using namespace feature;
 
     if (header & HEADER_MASK_HAS_NAME)
-      name.Read(src);
+      name.ReadNonEmpty(src);
 
     if (header & HEADER_MASK_HAS_LAYER)
       layer = ReadPrimitiveFromSource<int8_t>(src);
@@ -211,7 +211,7 @@ struct FeatureParamsBase
       switch (headerGeomType)
       {
       case HeaderGeomType::Point: rank = ReadPrimitiveFromSource<uint8_t>(src); break;
-      case HeaderGeomType::Line: utils::ReadString(src, ref); break;
+      case HeaderGeomType::Line: rw::ReadNonEmpty(src, ref); break;
       case HeaderGeomType::Area:
       case HeaderGeomType::PointEx: house.Read(src); break;
       }
diff --git a/libs/indexer/feature_meta.hpp b/libs/indexer/feature_meta.hpp
index 4ff611c3b..94c8badb0 100644
--- a/libs/indexer/feature_meta.hpp
+++ b/libs/indexer/feature_meta.hpp
@@ -46,7 +46,7 @@ public:
     for (auto const & it : m_metadata)
     {
       WriteVarUint(sink, static_cast<uint32_t>(it.first));
-      utils::WriteString(sink, it.second);
+      rw::WriteNonEmpty(sink, it.second);
     }
   }
 
@@ -57,7 +57,7 @@ public:
     for (size_t i = 0; i < sz; ++i)
     {
       auto const key = ReadVarUint<uint32_t>(src);
-      utils::ReadString(src, m_metadata[key]);
+      rw::ReadNonEmpty(src, m_metadata[key]);
     }
   }
 
diff --git a/libs/kml/serdes_common.hpp b/libs/kml/serdes_common.hpp
index cab89da17..8c05cfa94 100644
--- a/libs/kml/serdes_common.hpp
+++ b/libs/kml/serdes_common.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "coding/string_utf8_multilang.hpp"
+#include "coding/writer.hpp"
 
 #include "geometry/point2d.hpp"
 #include "geometry/point_with_altitude.hpp"

From 72ff90defdd7c78daf85b2ea6ec51d56a98c8aeb Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Sat, 5 Jul 2025 11:18:08 -0300
Subject: [PATCH 075/302] [base] Added to_uint base for string_view.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 libs/base/base_tests/string_utils_test.cpp | 4 ++++
 libs/base/string_utils.hpp                 | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/libs/base/base_tests/string_utils_test.cpp b/libs/base/base_tests/string_utils_test.cpp
index 00490c447..05ef767cd 100644
--- a/libs/base/base_tests/string_utils_test.cpp
+++ b/libs/base/base_tests/string_utils_test.cpp
@@ -269,7 +269,11 @@ UNIT_TEST(to_uint)
   TEST(strings::to_uint("AF", i, 16), ());
   TEST_EQUAL(175, i, ());
 
+  TEST(strings::to_uint(std::string_view("C8"), i, 16), ());
+  TEST_EQUAL(200, i, ());
+
   TEST(!strings::to_uint("AXF", i, 16), ());
+  TEST(!strings::to_uint(std::string_view("AXF"), i, 16), ());
 
   uint8_t i8;
   TEST(!strings::to_uint(std::string_view("256"), i8), ());
diff --git a/libs/base/string_utils.hpp b/libs/base/string_utils.hpp
index c8d3e621c..b9ec4189f 100644
--- a/libs/base/string_utils.hpp
+++ b/libs/base/string_utils.hpp
@@ -538,19 +538,19 @@ bool ToInteger(char const * start, T & result, int base = 10)
 namespace impl
 {
 template <typename T>
-bool from_sv(std::string_view sv, T & t)
+bool from_sv(std::string_view sv, T & t, int base = 10)
 {
   auto const end = sv.data() + sv.size();
-  auto const res = std::from_chars(sv.data(), end, t);
+  auto const res = std::from_chars(sv.data(), end, t, base);
   return (res.ec != std::errc::invalid_argument && res.ec != std::errc::result_out_of_range && res.ptr == end);
 }
 }  // namespace impl
 
 template <class T>
-inline bool to_uint(std::string_view sv, T & i)
+inline bool to_uint(std::string_view sv, T & i, int base = 10)
 {
   static_assert(std::is_unsigned<T>::value, "");
-  return impl::from_sv(sv, i);
+  return impl::from_sv(sv, i, base);
 }
 
 inline bool to_double(std::string_view sv, double & d)

From fbaa59ce3b9d5104fff72c8858ae5dfd59379866 Mon Sep 17 00:00:00 2001
From: hemanggs <hemangmanhas@gmail.com>
Date: Sat, 2 Aug 2025 22:23:40 +0530
Subject: [PATCH 076/302] [android] Refactoring regression fix

Signed-off-by: hemanggs <hemangmanhas@gmail.com>
---
 .../editor/FeatureCategoryAdapter.java            | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryAdapter.java b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryAdapter.java
index 7ae679850..9264ec1e9 100644
--- a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryAdapter.java
@@ -55,20 +55,23 @@ public class FeatureCategoryAdapter extends RecyclerView.Adapter<RecyclerView.Vi
   @Override
   public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType)
   {
+    final LayoutInflater inflater = LayoutInflater.from(parent.getContext());
+
     switch (viewType)
     {
     case TYPE_CATEGORY ->
     {
-      return new FeatureViewHolder(
-          LayoutInflater.from(parent.getContext()).inflate(R.layout.item_feature_category, parent, false));
+      return new FeatureViewHolder(inflater.inflate(R.layout.item_feature_category, parent, false));
     }
     case TYPE_FOOTER ->
     {
-      return new FooterViewHolder(
-          LayoutInflater.from(parent.getContext()).inflate(R.layout.item_feature_category_footer, parent, false),
-          (FooterListener) mFragment);
+      return new FooterViewHolder(inflater.inflate(R.layout.item_feature_category_footer, parent, false),
+                                  (FooterListener) mFragment);
+    }
+    default ->
+    {
+      throw new IllegalArgumentException("Unsupported viewType: " + viewType);
     }
-    default -> throw new IllegalArgumentException("Unsupported");
     }
   }
 

From 674abcf02e632d92c56aa2683c70938c152e012d Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Sat, 26 Jul 2025 20:10:04 +0200
Subject: [PATCH 077/302] [linux] Fix zero file creation (birth) time

Observed in Ubuntu 24 via Orb on arm-based Mac

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 libs/map/map_tests/bookmarks_test.cpp | 26 +++++++++++++-------------
 libs/platform/platform_android.cpp    |  6 ++++++
 libs/platform/platform_linux.cpp      | 23 ++++++++++++++++++++---
 libs/platform/platform_mac.mm         |  6 ++++++
 libs/platform/platform_win.cpp        | 14 +++++++++++---
 5 files changed, 56 insertions(+), 19 deletions(-)

diff --git a/libs/map/map_tests/bookmarks_test.cpp b/libs/map/map_tests/bookmarks_test.cpp
index 61d44ed9d..31a9f4308 100644
--- a/libs/map/map_tests/bookmarks_test.cpp
+++ b/libs/map/map_tests/bookmarks_test.cpp
@@ -1029,9 +1029,9 @@ UNIT_CLASS_TEST(Runner, Bookmarks_SpecialXMLNames)
   BookmarkManager bmManager(BM_CALLBACKS);
   bmManager.EnableTestMode(true);
 
-  auto const file1Name = "file1";
+  auto const fileNameFromMemory = "";
   BookmarkManager::KMLDataCollection kmlDataCollection1;
-  kmlDataCollection1.emplace_back(file1Name /* filePath */,
+  kmlDataCollection1.emplace_back(fileNameFromMemory /* filePath */,
                                   LoadKmlData(MemReader(kmlString3, strlen(kmlString3)), KmlFileType::Text));
   bmManager.CreateCategories(std::move(kmlDataCollection1));
 
@@ -1056,29 +1056,29 @@ UNIT_CLASS_TEST(Runner, Bookmarks_SpecialXMLNames)
 
   bmManager.GetEditSession().DeleteBmCategory(catId, true);
 
-  auto const file2Name = "file2";
+  auto const fileNameOnDisk = "file1";
   BookmarkManager::KMLDataCollection kmlDataCollection2;
-  kmlDataCollection2.emplace_back(file1Name /* filePath */, LoadKmlFile(fileNameTmp, GetActiveKmlFileType()));
+  kmlDataCollection2.emplace_back(fileNameOnDisk /* filePath */, LoadKmlFile(fileNameTmp, GetActiveKmlFileType()));
   bmManager.CreateCategories(std::move(kmlDataCollection2));
 
   BookmarkManager::KMLDataCollection kmlDataCollection3;
-  kmlDataCollection3.emplace_back(file2Name /* filePath */,
+  kmlDataCollection3.emplace_back(fileNameFromMemory /* filePath */,
                                   LoadKmlData(MemReader(kmlString3, strlen(kmlString3)), KmlFileType::Text));
 
   bmManager.CreateCategories(std::move(kmlDataCollection3));
 
   TEST_EQUAL(bmManager.GetBmGroupsCount(), 2, ());
-  auto const catId2 = bmManager.GetSortedBmGroupIdList().front();
-  auto const catId3 = bmManager.GetSortedBmGroupIdList().back();
+  auto const lastModifiedCatId = bmManager.GetSortedBmGroupIdList().front();
+  auto const olderCatId = bmManager.GetSortedBmGroupIdList().back();
 
-  TEST_EQUAL(bmManager.GetUserMarkIds(catId2).size(), 1, ());
-  TEST_EQUAL(bmManager.GetCategoryName(catId2), expectedName, ());
-  TEST_EQUAL(bmManager.GetCategoryFileName(catId2), file1Name, ());
-  TEST_EQUAL(bmManager.GetCategoryFileName(catId3), file2Name, ());
+  TEST_EQUAL(bmManager.GetUserMarkIds(lastModifiedCatId).size(), 1, ());
+  TEST_EQUAL(bmManager.GetCategoryName(olderCatId), expectedName, ());
+  TEST_EQUAL(bmManager.GetCategoryFileName(lastModifiedCatId), fileNameFromMemory, ());
+  TEST_EQUAL(bmManager.GetCategoryFileName(olderCatId), fileNameOnDisk, ());
 
-  auto const bmId1 = *bmManager.GetUserMarkIds(catId2).begin();
+  auto const bmId1 = *bmManager.GetUserMarkIds(lastModifiedCatId).begin();
   auto const * bm1 = bmManager.GetBookmark(bmId1);
-  auto const bmId2 = *bmManager.GetUserMarkIds(catId3).begin();
+  auto const bmId2 = *bmManager.GetUserMarkIds(olderCatId).begin();
   auto const * bm2 = bmManager.GetBookmark(bmId2);
   TEST(EqualBookmarks(*bm1, *bm2), ());
   TEST_EQUAL(kml::GetDefaultStr(bm1->GetName()), "![X1]{X2}(X3)", ());
diff --git a/libs/platform/platform_android.cpp b/libs/platform/platform_android.cpp
index 964602984..82ff39ed7 100644
--- a/libs/platform/platform_android.cpp
+++ b/libs/platform/platform_android.cpp
@@ -232,6 +232,9 @@ time_t Platform::GetFileCreationTime(std::string const & path)
   struct stat st;
   if (0 == stat(path.c_str(), &st))
     return st.st_atim.tv_sec;
+
+  LOG(LERROR, ("GetFileCreationTime stat failed for", path, "with error", strerror(errno)));
+  // TODO(AB): Refactor to return std::optional<time_t>.
   return 0;
 }
 
@@ -241,5 +244,8 @@ time_t Platform::GetFileModificationTime(std::string const & path)
   struct stat st;
   if (0 == stat(path.c_str(), &st))
     return st.st_mtim.tv_sec;
+
+  LOG(LERROR, ("GetFileModificationTime stat failed for", path, "with error", strerror(errno)));
+  // TODO(AB): Refactor to return std::optional<time_t>.
   return 0;
 }
diff --git a/libs/platform/platform_linux.cpp b/libs/platform/platform_linux.cpp
index 27208fa1e..e2ab1dfcc 100644
--- a/libs/platform/platform_linux.cpp
+++ b/libs/platform/platform_linux.cpp
@@ -260,16 +260,30 @@ void Platform::GetSystemFontNames(FilesList & res) const
 // static
 time_t Platform::GetFileCreationTime(std::string const & path)
 {
-// In older Linux versions there is no reliable way to get file creation time.
-#if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 28
+  // In older Linux versions there is no reliable way to get file creation time with GLIBC.
+  // Musl supports statx since 2018.
+#if !defined(__GLIBC__) || (__GLIBC__ >= 2 && __GLIBC_MINOR__ >= 28)
   struct statx st;
   if (0 == statx(AT_FDCWD, path.c_str(), 0, STATX_BTIME, &st))
-    return st.stx_btime.tv_sec;
+  {
+    // Orbstack on MacOS returns zero birth time, see https://github.com/orbstack/orbstack/issues/2064
+    if (st.stx_btime.tv_sec != 0)
+      return st.stx_btime.tv_sec;
+
+    LOG(LWARNING, ("statx returned zero birth time for", path,
+                   ", using the earliest time from access, modification or status change instead."));
+    return std::min(st.stx_atime.tv_sec, std::min(st.stx_mtime.tv_sec, st.stx_ctime.tv_sec));
+  }
+
+  LOG(LERROR, ("GetFileCreationTime statx failed for", path, "with error", strerror(errno)));
 #else
   struct stat st;
   if (0 == stat(path.c_str(), &st))
     return std::min(st.st_atim.tv_sec, st.st_mtim.tv_sec);
+
+  LOG(LERROR, ("GetFileCreationTime stat failed for", path, "with error", strerror(errno)));
 #endif
+  // TODO(AB): Refactor to return std::optional<time_t>.
   return 0;
 }
 
@@ -279,5 +293,8 @@ time_t Platform::GetFileModificationTime(std::string const & path)
   struct stat st;
   if (0 == stat(path.c_str(), &st))
     return st.st_mtim.tv_sec;
+
+  LOG(LERROR, ("GetFileModificationTime stat failed for", path, "with error", strerror(errno)));
+  // TODO(AB): Refactor to return std::optional<time_t>.
   return 0;
 }
diff --git a/libs/platform/platform_mac.mm b/libs/platform/platform_mac.mm
index 7a18a1348..ec5d74825 100644
--- a/libs/platform/platform_mac.mm
+++ b/libs/platform/platform_mac.mm
@@ -190,6 +190,9 @@ time_t Platform::GetFileCreationTime(std::string const & path)
   struct stat st;
   if (0 == stat(path.c_str(), &st))
     return st.st_birthtimespec.tv_sec;
+
+  LOG(LERROR, ("GetFileCreationTime stat failed for", path, "with error", strerror(errno)));
+  // TODO(AB): Refactor to return std::optional<time_t>.
   return 0;
 }
 
@@ -199,5 +202,8 @@ time_t Platform::GetFileModificationTime(std::string const & path)
   struct stat st;
   if (0 == stat(path.c_str(), &st))
     return st.st_mtimespec.tv_sec;
+
+  LOG(LERROR, ("GetFileModificationTime stat failed for", path, "with error", strerror(errno)));
+  // TODO(AB): Refactor to return std::optional<time_t>.
   return 0;
 }
diff --git a/libs/platform/platform_win.cpp b/libs/platform/platform_win.cpp
index 75111f43a..7becc89e9 100644
--- a/libs/platform/platform_win.cpp
+++ b/libs/platform/platform_win.cpp
@@ -220,7 +220,10 @@ time_t GetFileTime(std::string const & path, FileTimeType fileTimeType)
 {
   HANDLE hFile = CreateFileA(path.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
   if (hFile == INVALID_HANDLE_VALUE)
-    return 0;
+  {
+    LOG(LERROR, ("GetFileTime CreateFileA failed for", path, "with error", strerror(errno)));
+    return 0;  // TODO(AB): Refactor to return std::optional<time_t>.
+  }
 
   SCOPE_GUARD(autoClose, bind(&CloseHandle, hFile));
 
@@ -234,8 +237,11 @@ time_t GetFileTime(std::string const & path, FileTimeType fileTimeType)
   case FileTimeType::Modification: ftLastWrite = &ft; break;
   }
 
-  if (!GetFileTime(hFile, ftCreate, nullptr, ftLastWrite))
-    return 0;
+  if (!::GetFileTime(hFile, ftCreate, nullptr, ftLastWrite))
+  {
+    LOG(LERROR, ("GetFileTime ::GetFileTime failed for", path, "with error", strerror(errno)));
+    return 0;  // TODO(AB): Refactor to return std::optional<time_t>.
+  }
 
   ULARGE_INTEGER ull;
   ull.LowPart = ft.dwLowDateTime;
@@ -247,12 +253,14 @@ time_t GetFileTime(std::string const & path, FileTimeType fileTimeType)
 // static
 time_t Platform::GetFileCreationTime(std::string const & path)
 {
+  // TODO(AB): Refactor to return std::optional<time_t>.
   return GetFileTime(path, FileTimeType::Creation);
 }
 
 // static
 time_t Platform::GetFileModificationTime(std::string const & path)
 {
+  // TODO(AB): Refactor to return std::optional<time_t>.
   return GetFileTime(path, FileTimeType::Modification);
 }
 

From 8e0d4776af1b573ab9b345005ef4ca8cd1ab08bc Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Tue, 8 Jul 2025 21:43:50 +0200
Subject: [PATCH 078/302] [style] Some improvements

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 tools/python/stylesheet/convert_styles.py   |  51 ---
 tools/python/stylesheet/drules_dump.py      |  28 --
 tools/python/stylesheet/drules_info.py      |  49 +--
 tools/python/stylesheet/drules_merge.py     |  35 +-
 tools/python/stylesheet/drules_to_mapcss.py | 449 --------------------
 tools/unix/generate_drules.sh               |  15 +-
 6 files changed, 52 insertions(+), 575 deletions(-)
 delete mode 100644 tools/python/stylesheet/convert_styles.py
 delete mode 100755 tools/python/stylesheet/drules_dump.py
 delete mode 100644 tools/python/stylesheet/drules_to_mapcss.py

diff --git a/tools/python/stylesheet/convert_styles.py b/tools/python/stylesheet/convert_styles.py
deleted file mode 100644
index 88c159b8c..000000000
--- a/tools/python/stylesheet/convert_styles.py
+++ /dev/null
@@ -1,51 +0,0 @@
-import sys
-
-lns = open(sys.argv[1]).readlines()
-lns = [l.strip("\n") for l in lns]
-
-newlns = []
-isCaption = False
-
-captionLns = []
-leadSpaces = ""
-
-i = 0
-
-for l in lns:
-    if not isCaption:
-        i = l.find(" caption ")
-        if i != -1:
-            isCaption = True
-            captionLns = []
-            leadSpaces = l[0:i + 1]
-            newlns.append(l)
-            newlns.append(leadSpaces + "  primary {")
-        else:
-            i = l.find(" path_text ")
-            if i != -1:
-                isCaption = True
-                captionLns = []
-                leadSpaces = l[0:i + 1]
-                newlns.append(l)
-                newlns.append(leadSpaces + "  primary {")
-            else:
-                newlns.append(l)
-    else:
-        if l[i + 1] == "}":
-            isCaption = False
-            newlns.append(l)
-        else:
-            if l.find("priority") == -1:
-                newlns.append("  " + l)
-                captionLns.append("  " + l)
-            else:
-                newlns.append(leadSpaces + "  }")
-#                newlns.append(leadSpaces + "  secondary {")
-#                for l1 in captionLns:
-#                    newlns.append(l1)
-#                newlns.append(leadSpaces + "  }")
-                newlns.append(l)
-
-
-for i in newlns:
-    print i
diff --git a/tools/python/stylesheet/drules_dump.py b/tools/python/stylesheet/drules_dump.py
deleted file mode 100755
index 529275aa3..000000000
--- a/tools/python/stylesheet/drules_dump.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env python3
-# Dumps hashes of protobuffed drules
-import sys, re
-import itertools
-import drules_struct_pb2
-
-if len(sys.argv) < 2:
-  print 'Usage: {} <drules_proto.bin>'.format(sys.argv[0])
-  sys.exit(1)
-
-drules = drules_struct_pb2.ContainerProto()
-drules.ParseFromString(open(sys.argv[1]).read())
-result = []
-
-for elem in drules.cont:
-  if not elem.element:
-    continue
-  for el in elem.element:
-    zoom = el.scale
-    if zoom <= 0:
-      continue
-    for l in itertools.chain(el.lines, (el.caption, el.path_text, el.circle, el.area, el.symbol)):
-      if l.HasField('priority'):
-        l.ClearField('priority')
-    result.append('{} z{}: {}'.format(elem.name, zoom, re.sub(r'[\r\n\s]+', ' ', str(el))))
-
-for line in sorted(result):
-  print line
diff --git a/tools/python/stylesheet/drules_info.py b/tools/python/stylesheet/drules_info.py
index c3e83fa53..a73a35b92 100644
--- a/tools/python/stylesheet/drules_info.py
+++ b/tools/python/stylesheet/drules_info.py
@@ -1,34 +1,31 @@
-# Tool shows following information about classes
+#!/usr/bin/env python3
+
+# Tool shows the following information about classes
 #  - zooms range, for classes with a style
 #  - classes without a style
 
-# If path to the protobuf EGG is specified then apply it before import drules_struct_pb2
-import os
-import sys
-PROTOBUF_EGG_PATH = os.environ.get("PROTOBUF_EGG_PATH")
-if PROTOBUF_EGG_PATH:
-    # another version of protobuf may be installed, override it
-    for i in range(len(sys.path)):
-        if -1 != sys.path[i].find("protobuf-"):
-            sys.path[i] = PROTOBUF_EGG_PATH
-    sys.path.append(PROTOBUF_EGG_PATH)
-
-import sys
 import csv
+import sys
+
 import drules_struct_pb2
 
+
 def GetAllClasses(mapping_path):
     class_order = []
     for row in csv.reader(open(mapping_path), delimiter=';'):
+        if not row or row[0].startswith('#'):
+            continue
         cl = row[0].replace("|", "-")
         if row[2] != "x":
             class_order.append(cl)
     class_order.sort()
     return class_order
 
+
 def GetClassesZoomRange(drules_path):
     drules = drules_struct_pb2.ContainerProto()
-    drules.ParseFromString(open(drules_path).read())
+    with open(drules_path, 'rb') as f:
+        drules.ParseFromString(f.read())
     result = {}
     for rule in drules.cont:
         name = str(rule.name)
@@ -41,13 +38,12 @@ def GetClassesZoomRange(drules_path):
                     zooms[1] = elem.scale
         if zooms[0] != -1:
             if name in result:
-                if result[name][0] < zooms[0]:
-                    zooms[0] = result[name][0]
-                if result[name][1] > zooms[1]:
-                    zooms[1] = result[name][1]
+                zooms[0] = min(zooms[0], result[name][0])
+                zooms[1] = max(zooms[1], result[name][1])
             result[name] = zooms
     return result
 
+
 def ShowZoomInfo(mapping_path, drules_path):
     classes_order = GetAllClasses(mapping_path)
     classes_zooms = GetClassesZoomRange(drules_path)
@@ -64,20 +60,19 @@ def ShowZoomInfo(mapping_path, drules_path):
     classes_with_style.sort()
     classes_without_style.sort()
 
-    print "Classes with a style: (%s)" % (str(len(classes_with_style)))
+    print(f"Classes with a style: {len(classes_with_style)}")
     for c in classes_with_style:
-        print "    %s - [%s, %s]" % (c, str(classes_zooms[c][0]), str(classes_zooms[c][1]))
-
-    print ""
-    print "Classes without a style (%s):" % (len(classes_without_style))
+        print(f"\t{c} - [{str(classes_zooms[c][0])}, {str(classes_zooms[c][1])}]")
+    print()
+    print(f"Classes without a style ({len(classes_without_style)}):")
     for c in classes_without_style:
-        print "    %s" % c
+        print(f"\t{c}")
+
 
 if __name__ == "__main__":
-
     if len(sys.argv) < 3:
-        print "Usage:"
-        print "drules_info.py <mapcss_mapping_file> <drules_proto_file>"
+        print("Usage:")
+        print(f"{sys.argv[0]} <mapcss_mapping_file> <drules_proto_file>")
         exit(-1)
 
     mapping_path = sys.argv[1]
diff --git a/tools/python/stylesheet/drules_merge.py b/tools/python/stylesheet/drules_merge.py
index 50a7382b2..815c7fa6d 100755
--- a/tools/python/stylesheet/drules_merge.py
+++ b/tools/python/stylesheet/drules_merge.py
@@ -106,21 +106,32 @@ def apply_diff(drules, diff):
 
 if __name__ == '__main__':
   if len(sys.argv) <= 3:
-    print('Usage: {} <drules1.bin> <drules2.bin> <drules_out.bin> [drules_out.txt]'.format(sys.argv[0]))
+    print(f'Usage: {sys.argv[0]} <drules1.bin> <drules2.bin> [drules3.bin ...] <drules_out.bin> [drules_out.txt]')
     sys.exit(1)
 
-  drules1 = drules_struct_pb2.ContainerProto()
-  drules1.ParseFromString(open(sys.argv[1], mode='rb').read())
-  drules2 = drules_struct_pb2.ContainerProto()
-  drules2.ParseFromString(open(sys.argv[2], mode='rb').read())
+  drules_out_txt = None
+  if sys.argv[-1].endswith('txt'):
+    drules_out_txt = sys.argv[-1]
+    sys.argv = sys.argv[:-1]
+  drules_out_bin = sys.argv[-1]
+  drules_list = sys.argv[1:-1]
 
-  zooms1 = read_drules(drules1)
-  zooms2 = read_drules(drules2)
-  diff = create_diff(zooms1, zooms2)
-  merged = apply_diff(drules1, diff)
+  print(f'Merging {drules_list} into {drules_out_bin}({drules_out_txt if drules_out_txt else "no text output"})')
 
-  with open(sys.argv[3], 'wb') as f:
+  drules_merged = drules_struct_pb2.ContainerProto()
+  drules_merged.ParseFromString(open(drules_list[0], mode='rb').read())
+  merged = drules_merged
+
+  for drules_path in drules_list[1:]:
+    drules = drules_struct_pb2.ContainerProto()
+    drules.ParseFromString(open(drules_path, mode='rb').read())
+    zooms1 = read_drules(merged)
+    zooms2 = read_drules(drules)
+    diff = create_diff(zooms1, zooms2)
+    merged = apply_diff(merged, diff)
+
+  with open(drules_out_bin, 'wb') as f:
     f.write(merged.SerializeToString())
-  if len(sys.argv) > 4:
-    with open(sys.argv[4], 'wb') as f:
+  if drules_out_txt:
+    with open(drules_out_txt, 'wb') as f:
       f.write(str(merged).encode('utf-8'))
diff --git a/tools/python/stylesheet/drules_to_mapcss.py b/tools/python/stylesheet/drules_to_mapcss.py
deleted file mode 100644
index 3a3787f9f..000000000
--- a/tools/python/stylesheet/drules_to_mapcss.py
+++ /dev/null
@@ -1,449 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-import csv
-import os
-
-import drules_struct_pb2
-from webcolors.webcolors import hex_to_color_name
-from operator import *
-from copy import *
-
-import sys
-reload(sys)
-sys.setdefaultencoding("utf-8")
-
-DATADIR = "../../../data"
-files = {
-    "mapcss_mapping": os.path.join(DATADIR, 'mapcss-mapping.csv'),
-    "drules_proto": os.path.join(DATADIR, 'drules_proto.bin'),
-}
-
-MINIMAL_WIDTH = .1
-LAST_ZOOM = 17
-
-FLAVOUR = set(["JOSM"])  # "JOSM"
-FLAVOUR = []
-
-
-def number(f):
-    if float(int(float(f))) == float(str(f)):
-        return int(float(f))
-    return float(('%.2f' % float(f)).rstrip('0'))
-
-
-def color_to_properties(color, prefix=""):
-    if prefix:
-        prefix += "-"
-    colorvar = prefix + "color"
-    opacityvar = prefix + "opacity"
-    dd = {}
-    dd[colorvar] = hex_to_color_name("#" + hex(int(color) % (0x1000000))[2:])  # leave only last 24 bits
-    opacity = (255 - (int(color) >> 24)) / 255.
-    if opacity != 1:
-        dd[opacityvar] = number(opacity)
-    return dd
-
-print """
-canvas {
-    background-color: #f1eee8;
-    default-lines: false;
-    default-points: false;
-}
-
-way::* {
-    linejoin: round;
-    linecap: round;
-    fill-opacity: 0;
-    casing-linecap: none;
-    text-position: line;
-}
-
-*::* {
-    text-halo-color: white;
-    text-anchor-horizontal: center;
-    text-anchor-vertical: center;
-}
-
-node::* {
-    text-anchor-vertical: top;
-}
-
-area::* {
-    text-position: center;
-    text-anchor-vertical: center;
-}
-
-area[landuse],
-area[natural],
-area[leisure],
-area[place] {fill-position: background}
-
-"""
-
-if True:
-    classificator = {}
-    classificator_mapping = {}
-    class_order = []
-    for row in csv.reader(open(files['mapcss_mapping']), delimiter=';'):
-        try:
-            pairs = [i.strip(']').split("=") for i in row[1].split(',')[0].split('[')]
-        except:
-            print row
-        classificator_mapping[row[0].replace("|", "-")] = row[1]
-        kv = {}
-        for i in pairs:
-            if len(i) == 1:
-                if i[0]:
-                    if i[0][0] == "!":
-                        kv[i[0][1:].strip('?')] = "no"
-                    else:
-                        kv[i[0].strip('?')] = "yes"
-            else:
-                kv[i[0].strip('?')] = i[1]
-        classificator[row[0].replace("|", "-")] = kv
-        if row[2] != "x":
-            class_order.append(row[0].replace("|", "-"))
-    class_order.sort()
-    drules = drules_struct_pb2.ContainerProto()
-    drules.ParseFromString(open(files["drules_proto"]).read())
-    names = set()
-    linejoins = {drules_struct_pb2.BEVELJOIN: "bevel", drules_struct_pb2.ROUNDJOIN: "round", drules_struct_pb2.NOJOIN: "none"}
-    linecaps = {drules_struct_pb2.SQUARECAP: "square", drules_struct_pb2.ROUNDCAP: "round", drules_struct_pb2.BUTTCAP: "none"}
-    deduped_sheet = {}
-    for elem in drules.cont:
-        visible_on_zooms = []
-        if elem.name not in class_order and elem.element:
-            print >> sys.stderr, elem.name, "rendered but not in classificator"
-            continue
-        names.add(elem.name)
-        if not elem.element:
-            print >> sys.stderr, elem.name, "is not rendered"
-            continue
-        for el in elem.element:
-            etype = set()
-            zoom = el.scale
-            if zoom <= 0:
-                continue
-            # if zoom <= 1:
-            #    zoom = -1
-            visible_on_zooms.append(zoom)
-            selector = classificator_mapping[elem.name]
-            kvrules = [{}]
-            tdashes = False
-            for tline in el.lines:
-                if tline.pathsym.name or tline.dashdot.dd:
-                    tdashes = True
-            if len(el.lines) == 2 and not tdashes:  # and not "bridge" in elem.name:
-                """
-                    line and casing, no dashes
-                """
-                etype.add("line")
-                if el.lines[0].priority < el.lines[1].priority:
-                    tline = el.lines[1]
-                    tcasing = el.lines[0]
-                elif el.lines[0].priority > el.lines[1].priority:
-                    tline = el.lines[0]
-                    tcasing = el.lines[1]
-                else:
-                    print >> sys.stderr, elem.name, "has two lines on same z"
-                twidth = tline.width
-                if twidth < MINIMAL_WIDTH:
-                    print >> sys.stderr, elem.name, "has invisible lines on zoom", zoom
-                else:
-                    # tlinedashes =
-                    kvrules[0]["width"] = number(twidth)
-                    kvrules[0].update(color_to_properties(tline.color))
-                    kvrules[0]["z-index"] = number(tline.priority)
-                    tlinedashes = ",".join([str(number(t)) for t in tline.dashdot.dd])
-                    if tlinedashes:
-                        kvrules[0]["dashes"] = tlinedashes
-                    if tline.HasField("cap"):
-                        kvrules[0]["linecap"] = linecaps.get(tline.cap, 'round')
-                    if tline.HasField("join"):
-                        kvrules[0]["linejoin"] = linejoins.get(tline.join, 'round')
-                tcasingwidth = (tcasing.width - tline.width) / 2
-                if ("width" not in kvrules[0]) and tcasingwidth < MINIMAL_WIDTH:
-                    print >> sys.stderr, elem.name, "has invisible casing on zoom", zoom
-                else:
-                    tcasingdashes = ",".join([str(number(t)) for t in tcasing.dashdot.dd])
-                    if tlinedashes != tcasingdashes:
-                        kvrules[0]["casing-dashes"] = tcasingdashes
-                    kvrules[0]["casing-width"] = number(tcasingwidth)
-                    kvrules[0].update(color_to_properties(tcasing.color, "casing"))
-                    if tcasing.HasField("cap"):
-                        kvrules[0]["casing-linecap"] = linecaps.get(tcasing.cap, 'round')
-                    if tcasing.HasField("join"):
-                        kvrules[0]["casing-linejoin"] = linejoins.get(tcasing.join, 'round')
-            elif len(el.lines) > 0:
-                """
-                    do we have lines at all?
-                """
-                etype.add("line")
-                for tline in el.lines:
-                    tkv = {}
-                    twidth = tline.width
-                    tlinedashes = ",".join([str(number(t)) for t in tline.dashdot.dd])
-                    if twidth < MINIMAL_WIDTH:
-                        if not tline.pathsym.name:
-                            print >> sys.stderr, elem.name, "has invisible lines on zoom", zoom
-                    else:
-                        tkv["width"] = number(twidth)
-                        tkv.update(color_to_properties(tline.color))
-                        tkv["z-index"] = number(tline.priority)
-                        if tline.HasField("cap"):
-                            tkv["linecap"] = linecaps.get(tline.cap, 'round')
-                        if tline.HasField("join"):
-                            tkv["linejoin"] = linejoins.get(tline.join, 'round')
-                        if tline.dashdot.dd:
-                            tkv["dashes"] = tlinedashes
-                        for trule in kvrules:
-                            if "width" not in trule and tkv["z-index"] == trule.get("z-index", tkv["z-index"]):
-                                trule.update(tkv)
-                                break
-                        else:
-                            kvrules.append(tkv)
-                    if tline.pathsym.name:
-                        kvrules[0]["pattern-image"] = tline.pathsym.name + ".svg"
-                        kvrules[0]["pattern-spacing"] = number(tline.pathsym.step - 16)
-                        kvrules[0]["pattern-offset"] = number(tline.pathsym.offset)
-                        kvrules[0]["z-index"] = number(tline.priority)
-
-            if el.area.color:
-                etype.add("area")
-                tkv = {}
-                tkv["z-index"] = el.area.priority
-                tkv.update(color_to_properties(el.area.color, "fill"))
-
-                # if el.area.border.width:
-                #    tline = el.area.border
-                #    tkv["casing-width"] = str(tline.width)
-                #    tkv.update(color_to_properties(tline.color, "casing"))
-                #    if tline.dashdot.dd:
-                #        tkv["casing-dashes"] = ",".join([str(t) for t in tline.dashdot.dd])
-                if not kvrules[0]:
-                    kvrules[0] = tkv
-                else:
-                    kvrules.append(tkv)
-
-            if el.symbol.name:
-                if el.symbol.apply_for_type == 0:
-                    etype.add("node")
-                    etype.add("area")
-                elif el.symbol.apply_for_type == 1:
-                    etype.add("node")
-                elif el.symbol.apply_for_type == 2:
-                    etype.add("area")
-                kvrules[0]["icon-image"] = el.symbol.name + ".svg"
-
-            if el.circle.radius:
-                etype.add("node")
-                kvrules[0]["symbol-shape"] = "circle"
-                kvrules[0]["symbol-size"] = number(el.circle.radius)
-                kvrules[0].update(color_to_properties(el.circle.color, "symbol-fill"))
-
-            if el.caption.primary.height:
-                etype.add("node")
-                etype.add("area")
-                kvrules[0].update(color_to_properties(el.caption.primary.color, "text"))
-                if el.caption.primary.stroke_color:
-                    kvrules[0].update(color_to_properties(el.caption.primary.stroke_color, "text-halo"))
-                    kvrules[0]["text-halo-radius"] = 2
-                kvrules[0]["text"] = "name"
-                if "building" in selector:
-                    kvrules[0]["text"] = "addr:housenumber"
-                kvrules[0]["font-size"] = el.caption.primary.height
-                if el.caption.primary.offset_y:
-                    kvrules[0]["text-offset"] = el.caption.primary.offset_y
-
-            if el.caption.secondary.height:
-                tkv = {}
-                etype.add("node")
-                etype.add("area")
-                tkv.update(color_to_properties(el.caption.secondary.color, "text"))
-                if el.caption.secondary.stroke_color:
-                    tkv.update(color_to_properties(el.caption.secondary.stroke_color, "text-halo"))
-                    tkv["text-halo-radius"] = 2
-                tkv["text"] = "int_name"
-                tkv["font-size"] = el.caption.secondary.height
-                if el.caption.primary.offset_y:
-                    tkv["text-offset"] = el.caption.secondary.offset_y
-                kvrules.append(tkv)
-
-            if el.path_text.primary.height:
-                etype.add("line")
-                kvrules[0].update(color_to_properties(el.path_text.primary.color, "text"))
-                if el.path_text.primary.stroke_color:
-                    kvrules[0].update(color_to_properties(el.path_text.primary.stroke_color, "text-halo"))
-                    kvrules[0]["text-halo-radius"] = 2
-                kvrules[0]["text"] = "name"
-                kvrules[0]["text-position"] = "line"
-                if "building" in selector:
-                    kvrules[0]["text"] = "addr:housenumber"
-                kvrules[0]["font-size"] = el.path_text.primary.height
-
-            if el.path_text.secondary.height:
-                tkv = {}
-                etype.add("line")
-                tkv.update(color_to_properties(el.path_text.secondary.color, "text"))
-                if el.path_text.secondary.stroke_color:
-                    tkv.update(color_to_properties(el.path_text.secondary.stroke_color, "text-halo"))
-                    tkv["text-halo-radius"] = 2
-                tkv["text"] = "int_name"
-                tkv["text-position"] = "line"
-                tkv["font-size"] = el.path_text.secondary.height
-                kvrules.append(tkv)
-
-            tt = []
-            if "[area?]" in selector:
-                etype.discard("way")
-                etype.discard("line")
-                etype.add("area")
-                selector = selector.replace("[area?]", "")
-            if ("line" in etype) and ("JOSM" in FLAVOUR):
-                etype.add("way")
-                etype.discard("line")
-            for tetype in etype:
-                # lzoom = zoom
-                # if zoom == LAST_ZOOM:
-                    # lzoom = str(zoom)+"-"
-                for tsel in selector.split(","):
-                    tsel = tsel.strip()
-                    # tt.append( "%(tetype)s|z%(lzoom)s%(tsel)s"%(locals()))
-                    tt.append([tetype, zoom, zoom, tsel, ''])
-            tl = 0
-            for kvrul in kvrules:
-                if not kvrul:
-                    continue
-                tsubpart = ""
-
-                filt = {
-                    #'z': [['z-index', 'fill-position'], []],
-                    #'halo': [['text-halo-radius', 'text-halo-color'], []],
-                    'text': [['font-size', 'text-offset', 'text', 'text-color', 'text-position', 'text-halo-radius', 'text-halo-color'], []],
-                    #'casing': ['casing-width', 'casing-dashes', 'casing-color'],
-                    'icon': [['icon-image', 'symbol-shape', 'symbol-size', 'symbol-fill-color'], ['node', 'area']],
-                    'fill': [['fill-color', 'fill-opacity'], ['area']]
-                }
-                genkv = []
-                for k, v in filt.iteritems():
-                    f = {}
-                    for vi in v[0]:
-                        if vi in kvrul:
-                            f[vi] = kvrul[vi]
-                            del kvrul[vi]
-                    if f:
-                        genkv.append(f)
-                genkv.append(kvrul)
-                for kvrule in genkv:
-                    tl += 1
-                    # print selector
-                    if (tl > 1) or ("bridge" in selector) or ("junction" in selector):
-                        tsubpart = "::d%sp%s" % (elem.name.count("-"), tl)
-                        if ("bridge" in selector):
-                            kvrule['z-index'] = tl
-                    if "dashes" in kvrule:
-                        kvrule["linecap"] = "none"
-                    if float(kvrule.get('z-index', 0)) < -5000:
-                        kvrule['fill-position'] = 'background'
-                        if "z-index" in kvrule:
-                            del kvrule['z-index']
-                        # kvrule['z-index'] = float(kvrule.get('z-index',0)) + 9962
-                    if float(kvrule.get('z-index', 0)) > 10000:
-                        kvrule['-x-kot-layer'] = 'top'
-                        kvrule['z-index'] = float(kvrule.get('z-index', 0)) - 10000
-                    if float(kvrule.get('fill-opacity', 1)) == 0:
-                        for discard in ['fill-color', 'fill-opacity', 'z-index', 'fill-position']:
-                            if discard in kvrule:
-                                del kvrule[discard]
-                    if float(kvrule.get('opacity', 1)) == 0:
-                        for discard in ['color', 'width', 'z-index']:
-                            if discard in kvrule:
-                                del kvrule[discard]
-                    if float(kvrule.get('z-index', 0)) == 0:
-                        if 'z-index' in kvrule:
-                            del kvrule['z-index']
-                    key = kvrule.copy()
-                    # if "z-index" in key:
-                    #    del key["z-index"]
-                    if not kvrule:
-                        continue
-                    key = (frozenset(key.items()))
-                    minzoom = min([i[1] for i in tt])
-                    if key not in deduped_sheet:
-                        deduped_sheet[key] = {
-                            "sel": [],
-                            "maxz": kvrule.get('z-index', 0),
-                            "minz": kvrule.get('z-index', 0),
-                            "minzoom": minzoom,
-                            "z": kvrule.get('z-index', 0),
-                            "kv": {}
-                        }
-                    tt = deepcopy(tt)
-                    for t in tt:
-                        t[-1] = tsubpart
-                    deduped_sheet[key]['sel'].extend(tt)
-                    deduped_sheet[key]['maxz'] = max(deduped_sheet[key]['maxz'], kvrule.get('z-index', 0))
-                    deduped_sheet[key]['minz'] = max(deduped_sheet[key]['minz'], kvrule.get('z-index', 0))
-                    deduped_sheet[key]['z'] = number((deduped_sheet[key]['minz'] + deduped_sheet[key]['maxz']) / 2)
-                    deduped_sheet[key]['minzoom'] = min(deduped_sheet[key]['minzoom'], minzoom)
-                    deduped_sheet[key]['kv'] = kvrule
-            # else:
-            #    print >> sys.stderr, selector,  el
-        skipped_unstyled_zooms = set(range(min(visible_on_zooms), max(visible_on_zooms) + 1)).difference(visible_on_zooms)
-        if skipped_unstyled_zooms:
-            print >> sys.stderr, elem.name, "has no styles available for zooms", ", ".join([str(i) for i in skipped_unstyled_zooms])
-    # print len(deduped_sheet)
-    dds = deduped_sheet.keys()
-    dds.sort(lambda k, v: int(deduped_sheet[k]['minzoom'] - deduped_sheet[v]['minzoom']))
-
-    allz = list(set([f['z'] for f in deduped_sheet.values()]))
-    allz.sort()
-    for tk in dds:
-        tv = deduped_sheet[tk]
-        tv['sel'].sort(key=itemgetter(0, 4, 3, 1, 2))
-
-        def dedup_zooms(lst, item):
-            if lst:
-                lst[-1] = lst[-1][:]
-                if lst[-1][0] == item[0] and lst[-1][3] in item[3] and lst[-1][4] == item[4] and lst[-1][2] >= item[2] and lst[-1][1] <= item[1]:
-                    return lst
-                if lst[-1][0] == item[0] and lst[-1][3] == item[3] and lst[-1][4] == item[4] and lst[-1][2] == (item[1] - 1):
-                    lst[-1][2] = item[2]
-                    return lst
-            lst.append(item)
-            return lst
-        tv['sel'] = reduce(dedup_zooms, tv['sel'], [])
-
-        def format_string(i):
-            i = i[:]
-            dash = '-'
-            zmark = '|z'
-            if i[2] == LAST_ZOOM:
-                i[2] = ''
-            if i[1] == i[2]:
-                i[2] = ''
-                dash = ''
-            if i[1] <= 1:
-                i[1] = ''
-            if i[1] == i[2] and i[1] == '':
-                zmark = ''
-                dash = ''
-            return "%s%s%s%s%s%s%s" % (i[0], zmark, i[1], dash, i[2], i[3], i[4])
-
-        tv['sel'] = [format_string(i) for i in tv['sel']]
-        print (",\n").join([i for i in tv['sel']])
-        print "{"
-        kvrule = tv['kv']
-        kvrule['z-index'] = allz.index(tv['z'])
-        for k, v in kvrule.iteritems():
-            v = str(v)
-            if k == "z-index" and str(number(v)) == "0":
-                continue
-            # elif k == "z-index":
-            #    v = str(2000 - int(v))
-            if " " in v or ":" in v or not v:
-                v = '"' + v + '"'
-            print "  " + k + ":\t" + str(v) + ";"
-        print "}"
-    for i in names.symmetric_difference(class_order):
-        print >> sys.stderr, i, "in classificator but not rendered"
diff --git a/tools/unix/generate_drules.sh b/tools/unix/generate_drules.sh
index 3bbde5d66..44ffded4b 100755
--- a/tools/unix/generate_drules.sh
+++ b/tools/unix/generate_drules.sh
@@ -44,12 +44,11 @@ echo "Exporting transit colors..."
 python3 "$OMIM_PATH/tools/python/transit/transit_colors_export.py" \
   "$DATA_PATH/colors.txt" > /dev/null
 
-echo "Merging default and vehicle styles..."
+echo "Merging styles..."
 python3 "$OMIM_PATH/tools/python/stylesheet/drules_merge.py" \
-  "$DATA_PATH/drules_proto_default_light.bin" "$DATA_PATH/drules_proto_vehicle_light.bin" \
-  "$DATA_PATH/drules_proto.bin.tmp" > /dev/null
-echo "Merging in outdoors style..."
-python3 "$OMIM_PATH/tools/python/stylesheet/drules_merge.py" \
-  "$DATA_PATH/drules_proto.bin.tmp" "$DATA_PATH/drules_proto_outdoors_light.bin" \
-  "$DATA_PATH/drules_proto.bin" "$DATA_PATH/drules_proto.txt" > /dev/null
-rm "$DATA_PATH/drules_proto.bin.tmp" || true
+  "$DATA_PATH/drules_proto_default_light.bin" \
+  "$DATA_PATH/drules_proto_vehicle_light.bin" \
+  "$DATA_PATH/drules_proto_outdoors_light.bin" \
+  "$DATA_PATH/drules_proto.bin" \
+  "$DATA_PATH/drules_proto.txt" \
+   > /dev/null

From a580c19dc0c3d0859a85725cd04989371381f7a6 Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Sun, 3 Aug 2025 15:05:32 +0200
Subject: [PATCH 079/302] [android-auto] Fix null pointer exception

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 .../src/main/java/app/organicmaps/MapFragment.java |  6 +++---
 .../java/app/organicmaps/car/SurfaceRenderer.java  |  4 ++--
 .../app/src/main/java/app/organicmaps/sdk/Map.java | 14 ++++++++++----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/MapFragment.java b/android/app/src/main/java/app/organicmaps/MapFragment.java
index b76d97292..7bfa884d5 100644
--- a/android/app/src/main/java/app/organicmaps/MapFragment.java
+++ b/android/app/src/main/java/app/organicmaps/MapFragment.java
@@ -24,9 +24,8 @@ public class MapFragment extends BaseMwmFragment implements View.OnTouchListener
 {
   private static final String TAG = MapFragment.class.getSimpleName();
 
-  @SuppressWarnings("NonNullFieldNotInitialized")
   @NonNull
-  private Map mMap;
+  private final Map mMap = new Map(DisplayType.Device);
 
   public void updateCompassOffset(int offsetX, int offsetY)
   {
@@ -87,7 +86,8 @@ public class MapFragment extends BaseMwmFragment implements View.OnTouchListener
   {
     Logger.d(TAG);
     super.onAttach(context);
-    mMap = new Map(DisplayType.Device, MwmApplication.from(requireContext()).getLocationHelper());
+
+    mMap.setLocationHelper(MwmApplication.from(requireContext()).getLocationHelper());
     mMap.setMapRenderingListener((MapRenderingListener) context);
     mMap.setCallbackUnsupported(this::reportUnsupported);
   }
diff --git a/android/app/src/main/java/app/organicmaps/car/SurfaceRenderer.java b/android/app/src/main/java/app/organicmaps/car/SurfaceRenderer.java
index 2855afbe6..810dff898 100644
--- a/android/app/src/main/java/app/organicmaps/car/SurfaceRenderer.java
+++ b/android/app/src/main/java/app/organicmaps/car/SurfaceRenderer.java
@@ -31,7 +31,7 @@ public class SurfaceRenderer implements DefaultLifecycleObserver, SurfaceCallbac
   private final CarContext mCarContext;
 
   @NonNull
-  private final Map mMap;
+  private final Map mMap = new Map(Car);
 
   @NonNull
   private Rect mVisibleArea = new Rect();
@@ -45,7 +45,6 @@ public class SurfaceRenderer implements DefaultLifecycleObserver, SurfaceCallbac
   {
     Logger.d(TAG, "SurfaceRenderer()");
     mCarContext = carContext;
-    mMap = new Map(Car, MwmApplication.from(mCarContext).getLocationHelper());
     mIsRunning = true;
     lifecycle.addObserver(this);
     mMap.setMapRenderingListener(this);
@@ -60,6 +59,7 @@ public class SurfaceRenderer implements DefaultLifecycleObserver, SurfaceCallbac
       mSurface.release();
     mSurface = surfaceContainer.getSurface();
 
+    mMap.setLocationHelper(MwmApplication.from(mCarContext).getLocationHelper());
     mMap.onSurfaceCreated(mCarContext, mSurface,
                           new Rect(0, 0, surfaceContainer.getWidth(), surfaceContainer.getHeight()),
                           surfaceContainer.getDpi());
diff --git a/android/app/src/main/java/app/organicmaps/sdk/Map.java b/android/app/src/main/java/app/organicmaps/sdk/Map.java
index f5dce6179..cc3e3fdac 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/Map.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/Map.java
@@ -56,8 +56,8 @@ public final class Map
   @NonNull
   private final DisplayType mDisplayType;
 
-  @NonNull
-  private final LocationHelper mLocationHelper;
+  @Nullable
+  private LocationHelper mLocationHelper;
 
   private int mCurrentCompassOffsetX;
   private int mCurrentCompassOffsetY;
@@ -79,13 +79,17 @@ public final class Map
 
   private static int sCurrentDpi = 0;
 
-  public Map(@NonNull DisplayType mapType, @NonNull LocationHelper locationHelper)
+  public Map(@NonNull DisplayType mapType)
   {
     mDisplayType = mapType;
-    mLocationHelper = locationHelper;
     onCreate(false);
   }
 
+  public void setLocationHelper(@NonNull LocationHelper locationHelper)
+  {
+    mLocationHelper = locationHelper;
+  }
+
   /**
    * Moves the map compass using the given offsets.
    *
@@ -142,6 +146,8 @@ public final class Map
 
   public void onSurfaceCreated(final Context context, final Surface surface, Rect surfaceFrame, int surfaceDpi)
   {
+    assert mLocationHelper != null : "LocationHelper must be initialized before calling onSurfaceCreated";
+
     if (isThemeChangingProcess(context))
     {
       Logger.d(TAG, "Theme changing process, skip 'onSurfaceCreated' callback");

From e3d47775fcd3304e1176d6e738b0226ac9cce914 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Fri, 1 Aug 2025 10:29:07 +0200
Subject: [PATCH 080/302] [TTS] Clearer pronouncement of route recalculation in
 ru
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

> При уходе с тропы если язык подсказок русский, говорит - «преращик маршрута».

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 data/sound-strings/ru.json/localize.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/sound-strings/ru.json/localize.json b/data/sound-strings/ru.json/localize.json
index b1842a26c..1433a12df 100644
--- a/data/sound-strings/ru.json/localize.json
+++ b/data/sound-strings/ru.json/localize.json
@@ -27,7 +27,7 @@
 "onto":"на",
 "take_exit_number":"Съезд на",
 "take_exit_number_street_verb":"NULL",
-"route_recalculating":"Перерасчет маршрута",
+"route_recalculating":"Пересчёт пути",
 "destination":"Вы прибудете в пункт назначения.",
 "you_have_reached_the_destination":"Вы прибыли в пункт назначения.",
 "in_50_meters":"Через пятьдесят метров",

From d8f9323705285731b1bb89afdf4b350b09d64014 Mon Sep 17 00:00:00 2001
From: Osyotr <Osyotr@users.noreply.github.com>
Date: Wed, 6 Aug 2025 23:31:23 +0300
Subject: [PATCH 081/302] Add missing lib on Windows (#11004)

* Add missing lib on Windows

Signed-off-by: Osyotr <Osyotr@users.noreply.github.com>

* Update libs/platform/CMakeLists.txt

Signed-off-by: Alexander Borsuk <170263+biodranik@users.noreply.github.com>

---------

Signed-off-by: Osyotr <Osyotr@users.noreply.github.com>
Signed-off-by: Alexander Borsuk <170263+biodranik@users.noreply.github.com>
Co-authored-by: Alexander Borsuk <170263+biodranik@users.noreply.github.com>
---
 libs/platform/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libs/platform/CMakeLists.txt b/libs/platform/CMakeLists.txt
index 2570745ed..7282d9bac 100644
--- a/libs/platform/CMakeLists.txt
+++ b/libs/platform/CMakeLists.txt
@@ -180,6 +180,7 @@ target_link_libraries(${PROJECT_NAME}
   $<$<BOOL:${PLATFORM_DESKTOP}>:Qt6::Core>
   $<$<BOOL:${PLATFORM_LINUX}>:Qt6::Network>
   $<$<BOOL:${PLATFORM_WIN}>:Qt6::Network>
+  $<$<BOOL:${PLATFORM_WIN}>:shlwapi>  # PathIsDirectoryEmptyA
   $<$<BOOL:${PLATFORM_MAC}>:
     -framework\ Foundation
     -framework\ SystemConfiguration

From 416b8ab95ad04d37ba05352dd859cf851b4e9c3d Mon Sep 17 00:00:00 2001
From: Osyotr <Osyotr@users.noreply.github.com>
Date: Mon, 28 Jul 2025 23:42:07 +0300
Subject: [PATCH 082/302] Fix quoting in curl cmdline

Signed-off-by: Osyotr <Osyotr@users.noreply.github.com>
---
 libs/platform/http_client_curl.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/libs/platform/http_client_curl.cpp b/libs/platform/http_client_curl.cpp
index 48c041a8f..fac5b9e05 100644
--- a/libs/platform/http_client_curl.cpp
+++ b/libs/platform/http_client_curl.cpp
@@ -186,7 +186,7 @@ bool HttpClient::RunHttpRequest()
   ScopedRemoveFile body_deleter;
   ScopedRemoveFile received_file_deleter;
 
-  std::string cmd = "curl -s -w '%{http_code}' -D '" + headers_deleter.m_fileName + "' ";
+  std::string cmd = "curl -s -w \"%{http_code}\" -D \"" + headers_deleter.m_fileName + "\" ";
   // From curl manual:
   // This  option [-X] only changes the actual word used in the HTTP request, it does not alter
   // the way curl behaves. So for example if you want to make a proper
@@ -197,12 +197,12 @@ bool HttpClient::RunHttpRequest()
     cmd += "-X " + m_httpMethod + " ";
 
   for (auto const & header : m_headers)
-    cmd += "-H '" + header.first + ": " + header.second + "' ";
+    cmd += "-H \"" + header.first + ": " + header.second + "\" ";
 
   if (!m_cookies.empty())
-    cmd += "-b '" + m_cookies + "' ";
+    cmd += "-b \"" + m_cookies + "\" ";
 
-  cmd += "-m '" + strings::to_string(m_timeoutSec) + "' ";
+  cmd += "-m \"" + strings::to_string(m_timeoutSec) + "\" ";
 
   if (!m_bodyData.empty())
   {
@@ -216,7 +216,7 @@ bool HttpClient::RunHttpRequest()
   }
   // Content-Length is added automatically by curl.
   if (!m_inputFile.empty())
-    cmd += "--data-binary '@" + m_inputFile + "' ";
+    cmd += "--data-binary \"@" + m_inputFile + "\" ";
 
   // Use temporary file to receive data from server.
   // If user has specified file name to save data, it is not temporary and is not deleted automatically.
@@ -227,7 +227,7 @@ bool HttpClient::RunHttpRequest()
     received_file_deleter.m_fileName = rfile;
   }
 
-  cmd += "-o " + rfile + strings::to_string(" ") + "'" + m_urlRequested + "'";
+  cmd += "-o " + rfile + strings::to_string(" ") + "\"" + m_urlRequested + "\"";
 
   LOG(LDEBUG, ("Executing", cmd));
 

From 4117cca562adacbdc59a58b458bd6d198c2cf8e9 Mon Sep 17 00:00:00 2001
From: Osyotr <Osyotr@users.noreply.github.com>
Date: Thu, 7 Aug 2025 01:55:57 +0300
Subject: [PATCH 083/302] CMake fixes for Windows

Signed-off-by: Osyotr <Osyotr@users.noreply.github.com>
---
 3party/freetype/CMakeLists.txt |  4 +++-
 3party/harfbuzz/CMakeLists.txt | 39 +++++++++++++++++++++++-----------
 3party/icu/CMakeLists.txt      |  1 +
 3party/protobuf/CMakeLists.txt |  1 +
 CMakeLists.txt                 |  2 +-
 libs/base/CMakeLists.txt       |  4 +++-
 libs/platform/CMakeLists.txt   |  2 +-
 7 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/3party/freetype/CMakeLists.txt b/3party/freetype/CMakeLists.txt
index cd8d17ad7..f1e5950b3 100644
--- a/3party/freetype/CMakeLists.txt
+++ b/3party/freetype/CMakeLists.txt
@@ -4,7 +4,9 @@ set(FT_DISABLE_HARFBUZZ ON)
 add_subdirectory(freetype)
 
 # Fix warning with ONE_PIXEL macro clash.
-target_compile_options(freetype PRIVATE -Wno-macro-redefined)
+if(NOT MSVC)
+ target_compile_options(freetype PRIVATE -Wno-macro-redefined)
+endif()
 
 # Use ft2build.h from the current directory instead of the default.
 target_include_directories(freetype
diff --git a/3party/harfbuzz/CMakeLists.txt b/3party/harfbuzz/CMakeLists.txt
index d7041d46b..871e34359 100644
--- a/3party/harfbuzz/CMakeLists.txt
+++ b/3party/harfbuzz/CMakeLists.txt
@@ -11,14 +11,23 @@ target_include_directories(${PROJECT_NAME}
     harfbuzz/src
 )
 
-# Keep these settigns in sync with xcode/harfbuzz project.
-target_compile_options(${PROJECT_NAME}
-  PRIVATE
-    -fno-rtti
-    -fno-exceptions
-    -fno-threadsafe-statics
-    $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:-Wno-format-pedantic>
-)
+if (MSVC)
+  target_compile_options(${PROJECT_NAME}
+    PRIVATE
+      /GR-
+      /EHsc-
+      /Zc:threadSafeInit-
+  )
+else()
+  # Keep these settings in sync with xcode/harfbuzz project.
+  target_compile_options(${PROJECT_NAME}
+    PRIVATE
+      -fno-rtti
+      -fno-exceptions
+      -fno-threadsafe-statics
+      $<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:-Wno-format-pedantic>
+  )
+endif()
 
 target_compile_definitions(${PROJECT_NAME}
   PRIVATE
@@ -28,14 +37,20 @@ target_compile_definitions(${PROJECT_NAME}
     #$<$<BOOL:${APPLE}>:HAVE_CORETEXT>
     HAVE_ATEXIT
     HAVE_GETPAGESIZE
-    HAVE_MMAP
     HAVE_MPROTECT
-    HAVE_PTHREAD
     HAVE_SYSCONF
-    HAVE_SYS_MMAN_H
-    HAVE_UNISTD_H
 )
 
+if (NOT MSVC)
+  target_compile_definitions(${PROJECT_NAME}
+    PRIVATE
+      HAVE_MMAP
+      HAVE_PTHREAD
+      HAVE_SYS_MMAN_H
+      HAVE_UNISTD_H
+  )
+endif()
+
 target_link_libraries(${PROJECT_NAME} Freetype::Freetype)
 
 add_library(harfbuzz::harfbuzz ALIAS harfbuzz)
diff --git a/3party/icu/CMakeLists.txt b/3party/icu/CMakeLists.txt
index 0258c86dc..7b8df431b 100644
--- a/3party/icu/CMakeLists.txt
+++ b/3party/icu/CMakeLists.txt
@@ -172,6 +172,7 @@ add_library(icuuc
   icu/icu4c/source/common/uvector.cpp
   icu/icu4c/source/common/uvectr32.cpp
   icu/icu4c/source/common/uvectr64.h
+  icu/icu4c/source/common/wintz.cpp
   icu/icu4c/source/common/wintz.h
 )
 
diff --git a/3party/protobuf/CMakeLists.txt b/3party/protobuf/CMakeLists.txt
index 58e6a1d0b..850776731 100644
--- a/3party/protobuf/CMakeLists.txt
+++ b/3party/protobuf/CMakeLists.txt
@@ -11,6 +11,7 @@ set(SRC
   protobuf/src/google/protobuf/message_lite.cc
   protobuf/src/google/protobuf/repeated_field.cc
   protobuf/src/google/protobuf/stubs/atomicops_internals_x86_gcc.cc
+  protobuf/src/google/protobuf/stubs/atomicops_internals_x86_msvc.cc
   protobuf/src/google/protobuf/stubs/bytestream.cc
   protobuf/src/google/protobuf/stubs/common.cc
   protobuf/src/google/protobuf/stubs/int128.cc
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85e0b6828..ab4f0b54d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -197,7 +197,7 @@ if (USE_PCH)
 endif()
 
 # Should be on the root level, not in 3party, so tests can get these dependencies.
-if (PLATFORM_LINUX OR PLATFORM_WIN)
+if (PLATFORM_LINUX)
   find_package(ICU COMPONENTS uc i18n data REQUIRED)
   find_package(Freetype REQUIRED)
   find_package(harfbuzz REQUIRED)
diff --git a/libs/base/CMakeLists.txt b/libs/base/CMakeLists.txt
index 493b83e8a..cd36429ce 100644
--- a/libs/base/CMakeLists.txt
+++ b/libs/base/CMakeLists.txt
@@ -108,7 +108,9 @@ omim_add_library(${PROJECT_NAME} ${SRC})
 
 # Exception for some of our math to work reliably.
 # Ubuntu x86_64 gcc 14.2.0 ignores -fno-finite-math-only in debug builds without -O1
-set_source_files_properties(fast_math.cpp PROPERTIES COMPILE_OPTIONS "-fno-finite-math-only;$<$<CONFIG:DEBUG>:-O1>")
+if (NOT MSVC)
+  set_source_files_properties(fast_math.cpp PROPERTIES COMPILE_OPTIONS "-fno-finite-math-only;$<$<CONFIG:DEBUG>:-O1>")
+endif()
 
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
diff --git a/libs/platform/CMakeLists.txt b/libs/platform/CMakeLists.txt
index 7282d9bac..f87b1a7c6 100644
--- a/libs/platform/CMakeLists.txt
+++ b/libs/platform/CMakeLists.txt
@@ -94,7 +94,7 @@ elseif(${PLATFORM_ANDROID})
   )
 else() # neither iPhone nor Android
   # Find bash first, on Windows it can be either in Git or in WSL
-  find_program(BASH bash REQUIRED)
+  find_program(BASH bash REQUIRED HINTS "$ENV{ProgramFiles}/Git/bin")
   # Generate version header file.
   execute_process(COMMAND "${BASH}" tools/unix/version.sh qt_version
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}

From 8d61c7447b8850fbaae7728e044c1c9df12e8c40 Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Tue, 5 Aug 2025 22:12:39 -0300
Subject: [PATCH 084/302] [routing][tests] Added "agricultural" roads test.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 libs/routing/routing_integration_tests/route_test.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/libs/routing/routing_integration_tests/route_test.cpp b/libs/routing/routing_integration_tests/route_test.cpp
index 14aaf1d83..12a0aae64 100644
--- a/libs/routing/routing_integration_tests/route_test.cpp
+++ b/libs/routing/routing_integration_tests/route_test.cpp
@@ -890,4 +890,11 @@ UNIT_TEST(Norway_FauxOneway_MotorVehicleBackward_No)
                                    {0., 0.}, FromLatLon(59.921042, 10.759302), 210);
 }
 
+// https://github.com/organicmaps/organicmaps/issues/9620
+UNIT_TEST(Germany_Avoid_Agricultural)
+{
+  CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(47.6584463, 11.038139), {0., 0.},
+                                   FromLatLon(47.6580109, 11.0432625), 1096.11);
+}
+
 }  // namespace route_test

From 5e8eeb1f20b2f2a2e096200ad2c261a5e08cc85f Mon Sep 17 00:00:00 2001
From: Interactiondesigner <mr.funky@gmx.de>
Date: Mon, 4 Aug 2025 22:42:58 +0200
Subject: [PATCH 085/302] Update categories_cuisines.txt

Changed translation of cuisine=barbecue in German from "Grill" to "Barbecue" since cuisine=Grill als uses "Grill". So when adding a restaurant, it can be better distinguished between more traditional European/Middle Eastern grill and the more American Barbecue cuisine.

Signed-off-by: Interactiondesigner <mr.funky@gmx.de>
---
 data/categories_cuisines.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/categories_cuisines.txt b/data/categories_cuisines.txt
index 352dbaae5..a8f016585 100644
--- a/data/categories_cuisines.txt
+++ b/data/categories_cuisines.txt
@@ -1344,7 +1344,7 @@ sr:Веганска|Вегетаријанска|Вегетаријанци|Ве
 # nl:Barbecue
 # fi:Grilli
 # fr:Barbecue
-# de:Grill
+# de:Barbecue
 # hu:Grill
 # id:Barbekyu
 # it:Barbecue

From 3d6d08e2a12618ec5abaefc2b81a209ed79c3175 Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Sat, 9 Aug 2025 14:50:16 -0300
Subject: [PATCH 086/302] [kml] Factor out ParseXXXColor functions.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 libs/kml/CMakeLists.txt                   |   2 +
 libs/kml/color_parser.cpp                 | 122 ++++++++++++++++++++++
 libs/kml/color_parser.hpp                 |  21 ++++
 libs/kml/kml_tests/CMakeLists.txt         |   1 +
 libs/kml/kml_tests/color_parser_tests.cpp |  19 ++++
 libs/kml/serdes.cpp                       |   1 +
 libs/kml/serdes_common.hpp                |  10 +-
 libs/kml/serdes_gpx.cpp                   |  49 +++------
 xcode/kml/kml.xcodeproj/project.pbxproj   |   6 ++
 9 files changed, 185 insertions(+), 46 deletions(-)
 create mode 100644 libs/kml/color_parser.cpp
 create mode 100644 libs/kml/color_parser.hpp
 create mode 100644 libs/kml/kml_tests/color_parser_tests.cpp

diff --git a/libs/kml/CMakeLists.txt b/libs/kml/CMakeLists.txt
index 4bfa286a5..39c34ff72 100644
--- a/libs/kml/CMakeLists.txt
+++ b/libs/kml/CMakeLists.txt
@@ -1,6 +1,8 @@
 project(kml)
 
 set(SRC
+  color_parser.cpp
+  color_parser.hpp
   header_binary.hpp
   minzoom_quadtree.hpp
   serdes_common.cpp
diff --git a/libs/kml/color_parser.cpp b/libs/kml/color_parser.cpp
new file mode 100644
index 000000000..2e66603ae
--- /dev/null
+++ b/libs/kml/color_parser.cpp
@@ -0,0 +1,122 @@
+#include "color_parser.hpp"
+
+#include "coding/hex.hpp"
+
+#include "base/string_utils.hpp"
+
+namespace kml
+{
+
+struct RGBColor
+{
+  uint8_t r, g, b;
+};
+
+std::optional<uint32_t> ParseHexColor(std::string_view c)
+{
+  if (c.empty())
+    return {};
+
+  if (c.front() == '#')
+    c.remove_prefix(1);
+  if (c.size() != 6 && c.size() != 8)
+    return {};
+
+  auto const colorBytes = FromHex(c);
+  switch (colorBytes.size())
+  {
+  case 3: return ToRGBA(colorBytes[0], colorBytes[1], colorBytes[2]);
+  case 4: return ToRGBA(colorBytes[1], colorBytes[2], colorBytes[3], colorBytes[0]);
+  default: return {};
+  }
+}
+
+// Garmin extensions spec: https://www8.garmin.com/xmlschemas/GpxExtensionsv3.xsd
+// Color mapping: https://help.locusmap.eu/topic/extend-garmin-gpx-compatibilty
+std::optional<uint32_t> ParseGarminColor(std::string_view c)
+{
+  /// @todo Unify with RGBColor instead of string.
+  static std::pair<std::string_view, std::string_view> arrColors[] = {
+      {"Black", "000000"},    {"DarkRed", "8b0000"},     {"DarkGreen", "006400"}, {"DarkYellow", "b5b820"},
+      {"DarkBlue", "00008b"}, {"DarkMagenta", "8b008b"}, {"DarkCyan", "008b8b"},  {"LightGray", "cccccc"},
+      {"DarkGray", "444444"}, {"Red", "ff0000"},         {"Green", "00ff00"},     {"Yellow", "ffff00"},
+      {"Blue", "0000ff"},     {"Magenta", "ff00ff"},     {"Cyan", "00ffff"},      {"White", "ffffff"}};
+
+  for (auto const & e : arrColors)
+    if (c == e.first)
+      return ParseHexColor(e.second);
+
+  return {};
+}
+
+std::optional<uint32_t> ParseOSMColor(std::string_view c)
+{
+  static std::pair<std::string_view, RGBColor> arrColors[] = {
+      {"black", {0, 0, 0}},
+      {"white", {255, 255, 255}},
+      {"red", {255, 0, 0}},
+      {"green", {0, 128, 0}},
+      {"blue", {0, 0, 255}},
+      {"yellow", {255, 255, 0}},
+      {"orange", {255, 165, 0}},
+      {"gray", {128, 128, 128}},
+      {"grey", {128, 128, 128}},  // British spelling
+      {"brown", {165, 42, 42}},
+      {"pink", {255, 192, 203}},
+      {"purple", {128, 0, 128}},
+      {"cyan", {0, 255, 255}},
+      {"magenta", {255, 0, 255}},
+
+      {"maroon", {128, 0, 0}},
+      {"olive", {128, 128, 0}},
+      {"teal", {0, 128, 128}},
+      {"navy", {0, 0, 128}},
+      {"silver", {192, 192, 192}},
+      {"lime", {0, 255, 0}},
+      {"aqua", {0, 255, 255}},     // cyan
+      {"fuchsia", {255, 0, 255}},  // magenta
+
+      // From top taginfo for "colour" and CSS standart values.
+      {"darkgreen", {0, 100, 0}},
+      {"beige", {245, 245, 220}},
+      {"dimgray", {105, 105, 105}},
+      {"lightgrey", {211, 211, 211}},  // British spelling
+      {"lightgray", {211, 211, 211}},
+      {"tan", {210, 180, 140}},
+      {"gold", {255, 215, 0}},
+
+      {"red;white", {255, 127, 127}},
+      {"red and white", {255, 127, 127}},
+      {"red-white", {255, 127, 127}},
+  };
+
+  if (!c.empty())
+  {
+    if (c[0] == '#')
+    {
+      using strings::to_uint;
+      if (c.size() == 7)  // #rrggbb
+      {
+        uint8_t r, g, b;
+        if (to_uint(c.substr(1, 2), r, 16) && to_uint(c.substr(3, 2), g, 16) && to_uint(c.substr(5, 2), b, 16))
+          return ToRGBA(r, g, b);
+      }
+      else if (c.size() == 4)  // #rgb shorthand
+      {
+        uint8_t r, g, b;
+        if (to_uint(c.substr(1, 1), r, 16) && to_uint(c.substr(2, 1), g, 16) && to_uint(c.substr(3, 1), b, 16))
+          return ToRGBA(uint8_t(r * 17), uint8_t(g * 17), uint8_t(b * 17));
+      }
+    }
+    else
+    {
+      for (auto const & e : arrColors)
+        if (c == e.first)
+          return ToRGBA(e.second.r, e.second.g, e.second.b);
+    }
+  }
+
+  return {};
+}
+
+}  // namespace kml
diff --git a/libs/kml/color_parser.hpp b/libs/kml/color_parser.hpp
new file mode 100644
index 000000000..f4bb86633
--- /dev/null
+++ b/libs/kml/color_parser.hpp
@@ -0,0 +1,21 @@
+#pragma once
+
+#include <cstdint>
+#include <optional>
+#include <string_view>
+
+namespace kml
+{
+
+template <typename Channel>
+constexpr uint32_t ToRGBA(Channel red, Channel green, Channel blue, Channel alpha = Channel(255))
+{
+  return static_cast<uint8_t>(red) << 24 | static_cast<uint8_t>(green) << 16 | static_cast<uint8_t>(blue) << 8 |
+         static_cast<uint8_t>(alpha);
+}
+
+std::optional<uint32_t> ParseHexColor(std::string_view c);
+std::optional<uint32_t> ParseGarminColor(std::string_view c);
+std::optional<uint32_t> ParseOSMColor(std::string_view c);
+
+}  // namespace kml
diff --git a/libs/kml/kml_tests/CMakeLists.txt b/libs/kml/kml_tests/CMakeLists.txt
index c74eb3436..04593f1d5 100644
--- a/libs/kml/kml_tests/CMakeLists.txt
+++ b/libs/kml/kml_tests/CMakeLists.txt
@@ -1,6 +1,7 @@
 project(kml_tests)
 
 set(SRC
+  color_parser_tests.cpp
   gpx_tests.cpp
   minzoom_quadtree_tests.cpp
   serdes_tests.cpp
diff --git a/libs/kml/kml_tests/color_parser_tests.cpp b/libs/kml/kml_tests/color_parser_tests.cpp
new file mode 100644
index 000000000..90eb96320
--- /dev/null
+++ b/libs/kml/kml_tests/color_parser_tests.cpp
@@ -0,0 +1,19 @@
+#include "testing/testing.hpp"
+
+#include "kml/color_parser.hpp"
+
+UNIT_TEST(ColorParser_Smoke)
+{
+  auto const magenta = kml::ParseGarminColor("Magenta");
+  TEST(magenta, ());
+  TEST_EQUAL(magenta, kml::ParseOSMColor("magenta"), ());
+  TEST_EQUAL(magenta, kml::ParseHexColor("ff00ff"), ());
+  TEST_EQUAL(magenta, kml::ParseHexColor("#ff00ff"), ());
+  TEST_EQUAL(magenta, kml::ParseOSMColor("#f0f"), ());
+
+  TEST(!kml::ParseGarminColor("xxyyzz"), ());
+  TEST(!kml::ParseOSMColor("#xxyyzz"), ());
+
+  // Current implementation gives assert with default 0 channel value. I didn't change this.
+  // TEST(!kml::ParseHexColor("#xxyyzz"), ());
+}
diff --git a/libs/kml/serdes.cpp b/libs/kml/serdes.cpp
index ae40ce442..b1007a6a2 100644
--- a/libs/kml/serdes.cpp
+++ b/libs/kml/serdes.cpp
@@ -1,4 +1,5 @@
 #include "kml/serdes.hpp"
+#include "kml/color_parser.hpp"
 
 #include "indexer/classificator.hpp"
 
diff --git a/libs/kml/serdes_common.hpp b/libs/kml/serdes_common.hpp
index 8c05cfa94..8b40547f9 100644
--- a/libs/kml/serdes_common.hpp
+++ b/libs/kml/serdes_common.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include "kml/type_utils.hpp"
 
 #include "coding/string_utf8_multilang.hpp"
 #include "coding/writer.hpp"
@@ -6,21 +7,12 @@
 #include "geometry/point2d.hpp"
 #include "geometry/point_with_altitude.hpp"
 
-#include "type_utils.hpp"
-
 namespace kml
 {
 auto constexpr kDefaultLang = StringUtf8Multilang::kDefaultCode;
 auto constexpr kDefaultTrackWidth = 5.0;
 auto constexpr kDefaultTrackColor = 0x006ec7ff;
 
-template <typename Channel>
-uint32_t ToRGBA(Channel red, Channel green, Channel blue, Channel alpha)
-{
-  return static_cast<uint8_t>(red) << 24 | static_cast<uint8_t>(green) << 16 | static_cast<uint8_t>(blue) << 8 |
-         static_cast<uint8_t>(alpha);
-}
-
 std::string PointToString(m2::PointD const & org, char const separator);
 
 std::string PointToLineString(geometry::PointWithAltitude const & pt);
diff --git a/libs/kml/serdes_gpx.cpp b/libs/kml/serdes_gpx.cpp
index cb6e2e0ff..705a15d29 100644
--- a/libs/kml/serdes_gpx.cpp
+++ b/libs/kml/serdes_gpx.cpp
@@ -1,4 +1,5 @@
 #include "kml/serdes_gpx.hpp"
+#include "kml/color_parser.hpp"
 #include "kml/serdes_common.hpp"
 
 #include "coding/hex.hpp"
@@ -134,31 +135,16 @@ std::string const & GpxParser::GetTagFromEnd(size_t n) const
 
 std::optional<uint32_t> GpxParser::ParseColorFromHexString(std::string_view colorStr)
 {
-  if (colorStr.empty())
-  {
+  auto const res = ParseHexColor(colorStr);
+  if (!res)
     LOG(LWARNING, ("Invalid color value", colorStr));
-    return {};
-  }
-  if (colorStr.front() == '#')
-    colorStr.remove_prefix(1);
-  if (colorStr.size() != 6 && colorStr.size() != 8)
-  {
-    LOG(LWARNING, ("Invalid color value", colorStr));
-    return {};
-  }
-  auto const colorBytes = FromHex(colorStr);
-  switch (colorBytes.size())
-  {
-  case 3: return kml::ToRGBA(colorBytes[0], colorBytes[1], colorBytes[2], (char)255);
-  case 4: return kml::ToRGBA(colorBytes[1], colorBytes[2], colorBytes[3], colorBytes[0]);
-  default: LOG(LWARNING, ("Invalid color value", colorStr)); return {};
-  }
+  return res;
 }
 
 void GpxParser::ParseColor(std::string_view colorStr)
 {
-  if (auto const parsed = ParseColorFromHexString(colorStr); parsed)
-    m_color = parsed.value();
+  if (auto const parsed = ParseColorFromHexString(colorStr))
+    m_color = *parsed;
 }
 
 // https://osmand.net/docs/technical/osmand-file-formats/osmand-gpx/. Supported colors:
@@ -168,6 +154,7 @@ void GpxParser::ParseOsmandColor(std::string const & value)
   auto const color = ParseColorFromHexString(value);
   if (!color)
     return;
+
   if (m_tags.size() > 2 && GetTagFromEnd(2) == gpx::kGpx)
   {
     m_globalColor = *color;
@@ -176,31 +163,19 @@ void GpxParser::ParseOsmandColor(std::string const & value)
         layer.m_color.m_rgba = m_globalColor;
   }
   else
-  {
     m_color = *color;
-  }
 }
 
-// Garmin extensions spec: https://www8.garmin.com/xmlschemas/GpxExtensionsv3.xsd
-// Color mapping: https://help.locusmap.eu/topic/extend-garmin-gpx-compatibilty
 void GpxParser::ParseGarminColor(std::string const & v)
 {
-  static std::unordered_map<std::string, std::string> const kGarminToHex = {
-      {"Black", "000000"},      {"DarkRed", "8b0000"},     {"DarkGreen", "006400"}, {"DarkYellow", "b5b820"},
-      {"DarkBlue", "00008b"},   {"DarkMagenta", "8b008b"}, {"DarkCyan", "008b8b"},  {"LightGray", "cccccc"},
-      {"DarkGray", "444444"},   {"Red", "ff0000"},         {"Green", "00ff00"},     {"Yellow", "ffff00"},
-      {"Blue", "0000ff"},       {"Magenta", "ff00ff"},     {"Cyan", "00ffff"},      {"White", "ffffff"},
-      {"Transparent", "ff0000"}};
-  auto const it = kGarminToHex.find(v);
-  if (it != kGarminToHex.end())
-  {
-    return ParseColor(it->second);
-  }
-  else
+  auto const res = kml::ParseGarminColor(v);
+  if (!res)
   {
     LOG(LWARNING, ("Unsupported color value", v));
-    return ParseColor("ff0000");  // default to red
+    m_color = ToRGBA(255, 0, 0);  // default to red
   }
+  else
+    m_color = *res;
 }
 
 void GpxParser::CheckAndCorrectTimestamps()
diff --git a/xcode/kml/kml.xcodeproj/project.pbxproj b/xcode/kml/kml.xcodeproj/project.pbxproj
index d56d1c68a..9f97bb2b2 100644
--- a/xcode/kml/kml.xcodeproj/project.pbxproj
+++ b/xcode/kml/kml.xcodeproj/project.pbxproj
@@ -15,6 +15,7 @@
 		45E456142058509200D9F45E /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45E456122058508C00D9F45E /* testingmain.cpp */; };
 		464344F3294F952700984CB7 /* gpx_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 464344F2294F952700984CB7 /* gpx_tests.cpp */; };
 		46AA9E60294549B000ECED73 /* serdes_gpx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 464BD0FB294546B20011955A /* serdes_gpx.cpp */; };
+		ACBAA59E2E47C53800769B1B /* color_parser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ACBAA59D2E47C53800769B1B /* color_parser.cpp */; };
 		ACDD8A7B2A73684F000F2C43 /* serdes_common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ACDD8A782A736045000F2C43 /* serdes_common.cpp */; };
 		E2AA225E25275C6B002589E2 /* minzoom_quadtree_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E2AA225C25275C6B002589E2 /* minzoom_quadtree_tests.cpp */; };
 		E2DC9C9125264E3E0098174E /* types.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E2DC9C9025264E3E0098174E /* types.cpp */; };
@@ -60,6 +61,8 @@
 		464344F2294F952700984CB7 /* gpx_tests.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = gpx_tests.cpp; sourceTree = "<group>"; };
 		464BD0FB294546B20011955A /* serdes_gpx.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; path = serdes_gpx.cpp; sourceTree = "<group>"; };
 		464BD0FC294546B20011955A /* serdes_gpx.hpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 2; lastKnownFileType = sourcecode.cpp.h; path = serdes_gpx.hpp; sourceTree = "<group>"; };
+		ACBAA59C2E47C53800769B1B /* color_parser.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = color_parser.hpp; sourceTree = "<group>"; };
+		ACBAA59D2E47C53800769B1B /* color_parser.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = color_parser.cpp; sourceTree = "<group>"; };
 		ACDD8A772A736045000F2C43 /* serdes_common.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = serdes_common.hpp; sourceTree = "<group>"; };
 		ACDD8A782A736045000F2C43 /* serdes_common.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = serdes_common.cpp; sourceTree = "<group>"; };
 		E2AA225925275C1D002589E2 /* minzoom_quadtree.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = minzoom_quadtree.hpp; sourceTree = "<group>"; };
@@ -136,6 +139,8 @@
 		45E4557F205849A600D9F45E /* kml */ = {
 			isa = PBXGroup;
 			children = (
+				ACBAA59D2E47C53800769B1B /* color_parser.cpp */,
+				ACBAA59C2E47C53800769B1B /* color_parser.hpp */,
 				45E4558D20584AB900D9F45E /* header_binary.hpp */,
 				E2AA225925275C1D002589E2 /* minzoom_quadtree.hpp */,
 				45E4558E20584AB900D9F45E /* serdes.cpp */,
@@ -284,6 +289,7 @@
 				464344F3294F952700984CB7 /* gpx_tests.cpp in Sources */,
 				4568C86420BD455700E2192B /* type_utils.cpp in Sources */,
 				46AA9E60294549B000ECED73 /* serdes_gpx.cpp in Sources */,
+				ACBAA59E2E47C53800769B1B /* color_parser.cpp in Sources */,
 				45E4559520584ABA00D9F45E /* serdes.cpp in Sources */,
 				E2DC9C9125264E3E0098174E /* types.cpp in Sources */,
 				ACDD8A7B2A73684F000F2C43 /* serdes_common.cpp in Sources */,

From e2fa1698324fe94b88497f47a75240550a16adac Mon Sep 17 00:00:00 2001
From: Yannik Bloscheck <git@yannikbloscheck.com>
Date: Sun, 17 Aug 2025 21:52:55 +0200
Subject: [PATCH 087/302] [ios] Fix modulemap path in Xcode

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
---
 xcode/editor/editor.xcodeproj/project.pbxproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xcode/editor/editor.xcodeproj/project.pbxproj b/xcode/editor/editor.xcodeproj/project.pbxproj
index 262da3180..e43c070a2 100644
--- a/xcode/editor/editor.xcodeproj/project.pbxproj
+++ b/xcode/editor/editor.xcodeproj/project.pbxproj
@@ -74,7 +74,7 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		270C9C212E16AABF00ABA688 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; name = module.modulemap; path = ../../editor/module.modulemap; sourceTree = SOURCE_ROOT; };
+		270C9C212E16AABF00ABA688 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; name = module.modulemap; path = ../../libs/editor/module.modulemap; sourceTree = SOURCE_ROOT; };
 		340C20DC1C3E4DFD00111D22 /* osm_auth.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osm_auth.cpp; sourceTree = "<group>"; };
 		340C20DD1C3E4DFD00111D22 /* osm_auth.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = osm_auth.hpp; sourceTree = "<group>"; };
 		340DC8271C4E71E500EAA2CC /* changeset_wrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = changeset_wrapper.cpp; sourceTree = "<group>"; };

From 3097b540363658b7de67d87be90226d6eea8245e Mon Sep 17 00:00:00 2001
From: Yannik Bloscheck <git@yannikbloscheck.com>
Date: Sun, 17 Aug 2025 21:53:28 +0200
Subject: [PATCH 088/302] [ios] Import functional in `MWMEditorHelper.mm`

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
---
 iphone/Maps/Core/Editor/MWMEditorHelper.mm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/iphone/Maps/Core/Editor/MWMEditorHelper.mm b/iphone/Maps/Core/Editor/MWMEditorHelper.mm
index 1a4aefcbd..651aecebe 100644
--- a/iphone/Maps/Core/Editor/MWMEditorHelper.mm
+++ b/iphone/Maps/Core/Editor/MWMEditorHelper.mm
@@ -4,6 +4,7 @@
 
 #include <string>
 #include <map>
+#include <functional>
 #include "editor/osm_editor.hpp"
 
 @implementation MWMEditorHelper

From d04327082d962772718a2df5934266b404249d6d Mon Sep 17 00:00:00 2001
From: Eivind Samseth <eisa01@gmail.com>
Date: Fri, 15 Aug 2025 20:00:39 +0200
Subject: [PATCH 089/302] [drape] Match iOS double tap to zoom behavior

Signed-off-by: eisa01 <eisa01@gmail.com>
---
 libs/drape_frontend/user_event_stream.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/libs/drape_frontend/user_event_stream.cpp b/libs/drape_frontend/user_event_stream.cpp
index 0de671cb5..c21495520 100644
--- a/libs/drape_frontend/user_event_stream.cpp
+++ b/libs/drape_frontend/user_event_stream.cpp
@@ -15,6 +15,8 @@
 
 #include "base/macros.hpp"
 
+#include "std/target_os.hpp"
+
 #include <cmath>
 
 #ifdef DEBUG
@@ -1245,8 +1247,13 @@ void UserEventStream::UpdateDoubleTapAndHold(Touch const & touch)
   TEST_CALL(DOUBLE_TAP_AND_HOLD);
   ASSERT_EQUAL(m_state, STATE_DOUBLE_TAP_HOLD, ());
   float const kPowerModifier = 10.0f;
+#if defined(OMIM_OS_IPHONE) || defined(OMIM_OS_MAC)
+  int const kPlatformScaleModifier = -1;
+#else
+  int const kPlatformScaleModifier = 1;
+#endif
   double const scaleFactor = exp(kPowerModifier * (touch.m_location.y - m_startDoubleTapAndHold.y) /
-                                 GetCurrentScreen().PixelRectIn3d().SizeY());
+                                 GetCurrentScreen().PixelRectIn3d().SizeY() * kPlatformScaleModifier);
   m_startDoubleTapAndHold = touch.m_location;
 
   m2::PointD scaleCenter = m_startDragOrg;

From bfacc2a98d845b4443137cf53893c3fc38c4866a Mon Sep 17 00:00:00 2001
From: map-per <map-per@gmx.de>
Date: Sun, 17 Aug 2025 17:52:05 +0200
Subject: [PATCH 090/302] Fix standalone notes not being saved when not logged
 in (#1433)

Signed-off-by: map-per <map-per@gmx.de>
---
 .../editor/FeatureCategoryFragment.java       | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java
index 6a445d308..e52abfc43 100644
--- a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryFragment.java
@@ -130,13 +130,6 @@ public class FeatureCategoryFragment
   @Override
   public void onSendNoteClicked()
   {
-    if (!OsmOAuth.isAuthorized())
-    {
-      final Intent intent = new Intent(requireActivity(), OsmLoginActivity.class);
-      startActivity(intent);
-      return;
-    }
-
     final double[] center = Framework.nativeGetScreenRectCenter();
     final double lat = center[0];
     final double lon = center[1];
@@ -150,6 +143,13 @@ public class FeatureCategoryFragment
       Editor.nativeCreateStandaloneNote(lat, lon, mPendingNoteText);
       mPendingNoteText = "";
       Toast.makeText(requireContext(), R.string.osm_note_toast, Toast.LENGTH_SHORT).show();
+
+      if (!OsmOAuth.isAuthorized())
+      {
+        final Intent intent = new Intent(requireActivity(), OsmLoginActivity.class);
+        startActivity(intent);
+      }
+
       requireActivity().finish();
     }
   }
@@ -170,6 +170,13 @@ public class FeatureCategoryFragment
                              Editor.nativeCreateStandaloneNote(lat, lon, noteText);
                              mPendingNoteText = "";
                              Toast.makeText(requireContext(), R.string.osm_note_toast, Toast.LENGTH_SHORT).show();
+
+                             if (!OsmOAuth.isAuthorized())
+                             {
+                               final Intent intent = new Intent(requireActivity(), OsmLoginActivity.class);
+                               startActivity(intent);
+                             }
+
                              requireActivity().finish();
                            })
         .setNegativeButton(R.string.cancel, null)

From 4232de04ac51909a60fe97094b82ad609dc0b745 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Mon, 18 Aug 2025 20:29:12 +0200
Subject: [PATCH 091/302] [android] Fix padding in bookmark category settings

Signed-off-by: JeanBaptisteC <jeanbaptiste.charron@outlook.fr>
---
 .../main/res/layout/fragment_bookmark_category_settings.xml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/app/src/main/res/layout/fragment_bookmark_category_settings.xml b/android/app/src/main/res/layout/fragment_bookmark_category_settings.xml
index 5abc06c6b..feb312ca8 100644
--- a/android/app/src/main/res/layout/fragment_bookmark_category_settings.xml
+++ b/android/app/src/main/res/layout/fragment_bookmark_category_settings.xml
@@ -46,6 +46,8 @@
         </com.google.android.material.textfield.TextInputLayout>
     </LinearLayout>
     <com.google.android.material.textfield.TextInputLayout
+      android:paddingStart="@dimen/margin_half"
+      android:paddingEnd="@dimen/margin_half"
       app:hintAnimationEnabled="false"
       style="@style/MwmWidget.Editor.CustomTextInput"
       android:textColorHint="?android:textColorSecondary">
@@ -54,8 +56,6 @@
       style="@style/MwmWidget.Editor.CustomTextInput"
       android:hint="@string/placepage_personal_notes_hint"
       android:minHeight="@dimen/height_item_multiline"
-      android:paddingStart="@dimen/margin_base"
-      android:paddingEnd="@dimen/margin_base"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:inputType="textMultiLine"/>

From d44f0ae7da47e60bf56261c7ae070e6bc5a245c4 Mon Sep 17 00:00:00 2001
From: Harry Bond <me@hbond.xyz>
Date: Sun, 17 Aug 2025 22:47:48 +0100
Subject: [PATCH 092/302] [android] Display overlay layer state with icon Fixes
 #1402

Signed-off-by: Harry Bond <me@hbond.xyz>
---
 .../app/organicmaps/maplayer/LayersButton.java    |  2 +-
 .../src/main/res/color/accent_color_selector.xml  |  2 +-
 .../res/color/accent_color_selector_night.xml     |  2 +-
 android/app/src/main/res/drawable/ic_layers.xml   | 15 ++++++++++-----
 .../src/main/res/drawable/ic_layers_default.xml   |  5 +++++
 android/app/src/main/res/values/attrs.xml         |  2 +-
 6 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 android/app/src/main/res/drawable/ic_layers_default.xml

diff --git a/android/app/src/main/java/app/organicmaps/maplayer/LayersButton.java b/android/app/src/main/java/app/organicmaps/maplayer/LayersButton.java
index 2530b3c84..a3f31c88c 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/LayersButton.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/LayersButton.java
@@ -29,7 +29,7 @@ public class LayersButton extends FloatingActionButton
   {
     final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);
     if (mAreLayersActive)
-      mergeDrawableStates(drawableState, new int[] {R.attr.layers_enabled});
+      mergeDrawableStates(drawableState, new int[] {R.attr.state_layers_enabled});
     return drawableState;
   }
 
diff --git a/android/app/src/main/res/color/accent_color_selector.xml b/android/app/src/main/res/color/accent_color_selector.xml
index 9ae6d9e14..d151c84fe 100644
--- a/android/app/src/main/res/color/accent_color_selector.xml
+++ b/android/app/src/main/res/color/accent_color_selector.xml
@@ -9,7 +9,7 @@
       android:state_checked="true"/>
 
   <item android:color="@color/base_accent"
-      app:layers_enabled="true"/>
+      app:state_layers_enabled="true"/>
 
   <item android:color="@color/icon_tint"/>
 </selector>
diff --git a/android/app/src/main/res/color/accent_color_selector_night.xml b/android/app/src/main/res/color/accent_color_selector_night.xml
index 5ac5acec9..54c03571d 100644
--- a/android/app/src/main/res/color/accent_color_selector_night.xml
+++ b/android/app/src/main/res/color/accent_color_selector_night.xml
@@ -9,7 +9,7 @@
         android:state_checked="true"/>
 
   <item android:color="@color/base_accent_night"
-        app:layers_enabled="true"/>
+        app:state_layers_enabled="true"/>
 
   <item android:color="@color/white_secondary"/>
 </selector>
diff --git a/android/app/src/main/res/drawable/ic_layers.xml b/android/app/src/main/res/drawable/ic_layers.xml
index 90dd2540f..e23c8e3d3 100644
--- a/android/app/src/main/res/drawable/ic_layers.xml
+++ b/android/app/src/main/res/drawable/ic_layers.xml
@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M11.99,18.54l-7.37,-5.73L3,14.07l9,7 9,-7 -1.63,-1.27 -7.38,5.74zM12,16l7.36,-5.73L21,9l-9,-7 -9,7 1.63,1.27L12,16z"/>
-</vector>
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        app:state_layers_enabled="true"
+        android:drawable="@drawable/ic_layers_clear"/>
+    <item
+        app:state_layers_enabled="false"
+        android:drawable="@drawable/ic_layers_default"/>
+</selector>
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable/ic_layers_default.xml b/android/app/src/main/res/drawable/ic_layers_default.xml
new file mode 100644
index 000000000..90dd2540f
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_layers_default.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M11.99,18.54l-7.37,-5.73L3,14.07l9,7 9,-7 -1.63,-1.27 -7.38,5.74zM12,16l7.36,-5.73L21,9l-9,-7 -9,7 1.63,1.27L12,16z"/>
+</vector>
diff --git a/android/app/src/main/res/values/attrs.xml b/android/app/src/main/res/values/attrs.xml
index 1de353baa..5ed44bb51 100644
--- a/android/app/src/main/res/values/attrs.xml
+++ b/android/app/src/main/res/values/attrs.xml
@@ -28,7 +28,7 @@
   </declare-styleable>
 
   <declare-styleable name="layersButton">
-    <attr name="layers_enabled" format="boolean"/>
+    <attr name="state_layers_enabled" format="boolean"/>
   </declare-styleable>
 
   <declare-styleable name="PlacePageView">

From e786dbe5f5a007532ae3d7ff2f2eb54a8070a49d Mon Sep 17 00:00:00 2001
From: Codeberg Translate <translate@codeberg.org>
Date: Mon, 18 Aug 2025 23:45:03 +0000
Subject: [PATCH 093/302] [strings] Update from Codeberg Translate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: AnanasSux <ananassux@noreply.codeberg.org>
Co-authored-by: B o d o <timtrek@noreply.codeberg.org>
Co-authored-by: Codeberg Translate <translate@codeberg.org>
Co-authored-by: Fjuro <fjuro@alius.cz>
Co-authored-by: Laurent FAVOLE <lfavole@noreply.codeberg.org>
Co-authored-by: Lenny Angst <lenny@familie-angst.ch>
Co-authored-by: Mickael81 <mickael81@noreply.codeberg.org>
Co-authored-by: N4ta <codeberg@n4ta.anonaddy.me>
Co-authored-by: Outbreak2096 <outbreak2096@noreply.codeberg.org>
Co-authored-by: Prefill add-on <noreply-addon-prefill@weblate.org>
Co-authored-by: Priit Jõerüüt <jrtcdbrg@noreply.codeberg.org>
Co-authored-by: Stephan-P <stephan-p@noreply.codeberg.org>
Co-authored-by: alexgabi <alexgabi@noreply.codeberg.org>
Co-authored-by: and4po <and4po@noreply.codeberg.org>
Co-authored-by: aoxa <aoxa@noreply.codeberg.org>
Co-authored-by: concede2913 <concede2913@noreply.codeberg.org>
Co-authored-by: ghose <ghose@noreply.codeberg.org>
Co-authored-by: gimse <gimse@noreply.codeberg.org>
Co-authored-by: lazlo <lazlo@noreply.codeberg.org>
Co-authored-by: ldmpub <ldmpub@noreply.codeberg.org>
Co-authored-by: matheusgomesms <matheusgomesms@noreply.codeberg.org>
Co-authored-by: metehan <metehan@noreply.codeberg.org>
Co-authored-by: patepelo <patepelo@noreply.codeberg.org>
Co-authored-by: phama <phama@noreply.codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/comaps/android-typestrings/
Translate-URL: https://translate.codeberg.org/projects/comaps/ios-typestrings/
Translation: CoMaps/Android - Map Feature Types
Translation: CoMaps/Android UI Strings
Translation: CoMaps/Apple AppStore description
Translation: CoMaps/Countries and regions names
Translation: CoMaps/F-Droid app description
Translation: CoMaps/Voice announcements for navigation (TTS)
Translation: CoMaps/iOS - Map Feature Types
Translation: CoMaps/iOS Plist
Translation: CoMaps/iOS Plurals
Translation: CoMaps/iOS UI Strings
---
 .../play/listings/no-NO/short-description.txt |  1 +
 .../app/src/main/res/values-cs/strings.xml    |  4 +-
 .../app/src/main/res/values-de/strings.xml    |  2 +
 .../app/src/main/res/values-es/strings.xml    |  2 +
 .../src/main/res/values-es/types_strings.xml  |  4 +-
 .../app/src/main/res/values-fr/strings.xml    |  2 +
 .../app/src/main/res/values-gl/strings.xml    |  2 +
 .../app/src/main/res/values-gsw/strings.xml   |  2 +
 .../src/main/res/values-nb/types_strings.xml  |  1 +
 .../src/main/res/values-pt-rBR/strings.xml    |  2 +
 .../app/src/main/res/values-pt/strings.xml    |  4 +-
 .../app/src/main/res/values-tr/strings.xml    | 54 ++++++++++---------
 .../src/main/res/values-tr/types_strings.xml  |  6 ++-
 .../app/src/main/res/values-zh/strings.xml    |  2 +
 data/countries-strings/tr.json/localize.json  |  6 +--
 data/sound-strings/ca.json/localize.json      |  2 +-
 .../cs.lproj/Localizable.strings              |  4 +-
 .../es.lproj/LocalizableTypes.strings         |  4 +-
 .../nb.lproj/Localizable.strings              | 10 ++--
 .../nb.lproj/Localizable.stringsdict          |  4 ++
 .../nb.lproj/LocalizableTypes.strings         |  2 +-
 .../nl.lproj/Localizable.strings              |  2 +-
 .../pt.lproj/Localizable.strings              |  4 +-
 .../tr.lproj/Localizable.strings              | 10 ++--
 .../tr.lproj/LocalizableTypes.strings         | 14 ++---
 iphone/metadata/tr/keywords.txt               |  2 +-
 26 files changed, 89 insertions(+), 63 deletions(-)
 create mode 100644 android/app/src/fdroid/play/listings/no-NO/short-description.txt

diff --git a/android/app/src/fdroid/play/listings/no-NO/short-description.txt b/android/app/src/fdroid/play/listings/no-NO/short-description.txt
new file mode 100644
index 000000000..8bee04c06
--- /dev/null
+++ b/android/app/src/fdroid/play/listings/no-NO/short-description.txt
@@ -0,0 +1 @@
+Lett kart navigasjon - Opplev mere på din reise - Drevet av felleskapet
diff --git a/android/app/src/main/res/values-cs/strings.xml b/android/app/src/main/res/values-cs/strings.xml
index 3468263f0..bd8535e53 100644
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -139,7 +139,7 @@
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Policie</string>
     <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">WiFi</string>
+    <string name="category_wifi">Wi-Fi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Recyklace</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -340,7 +340,7 @@
     <string name="dialog_routing_disclaimer_beware">Na silnici buďte pozorní a chovejte se bezpečně!</string>
     <string name="dialog_routing_check_gps">Zkontrolovat signál GPS</string>
     <string name="dialog_routing_error_location_not_found">Trasu se nepodařilo vytvořit. Nelze zjistit aktuální souřadnice GPS.</string>
-    <string name="dialog_routing_location_turn_wifi">Zkontrolujte signál GPS. Povolením připojení WiFi zpřesníte určení vaší polohy.</string>
+    <string name="dialog_routing_location_turn_wifi">Zkontrolujte signál GPS. Povolením připojení Wi-Fi zlepšíte přesnost určování vaší polohy.</string>
     <string name="dialog_routing_location_turn_on">Povolit služby určování polohy</string>
     <string name="dialog_routing_location_unknown_turn_on">Aktuální souřadnice GPS se nepodařilo zjistit. Pro výpočet trasy povolte služby určování polohy.</string>
     <string name="dialog_routing_unable_locate_route">Trasu se nepodařilo zjistit</string>
diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
index 3a293df61..16797985e 100644
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -921,4 +921,6 @@
     <string name="open_now">Jetzt geöffnet</string>
     <string name="at">um %s</string>
     <string name="closed_now">Jetzt geschlossen</string>
+    <string name="osm_note_hint">Oder hinterlasse alternativ einen Hinweis für die OpenStreetMap Community, sodass jemand anders einen Ort hinzufügen oder korrigieren kann.</string>
+    <string name="osm_note_toast">Ein Hinweis wird zu OpenStreetMap geschickt</string>
 </resources>
diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml
index 9f6e12cce..652f04b6b 100644
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -926,4 +926,6 @@
     <string name="open_now">Abierto ahora</string>
     <string name="closed_now">Cerrado ahora</string>
     <string name="at">a las %s</string>
+    <string name="osm_note_hint">O, como alternativa, deja una nota a la comunidad de OpenStreetMap para que alguien lo agregue o arregle.</string>
+    <string name="osm_note_toast">Una nota será enviada a OpenStreetMap</string>
 </resources>
diff --git a/android/app/src/main/res/values-es/types_strings.xml b/android/app/src/main/res/values-es/types_strings.xml
index 6dfc8b8dc..eb0d936a9 100644
--- a/android/app/src/main/res/values-es/types_strings.xml
+++ b/android/app/src/main/res/values-es/types_strings.xml
@@ -1147,7 +1147,7 @@
     <string name="type.shop.mobile_phone">Tienda de Móviles</string>
     <string name="type.shop.money_lender">Prestamista</string>
     <string name="type.shop.motorcycle">Tienda de motos</string>
-    <string name="type.shop.motorcycle_repair">Reparación de motos</string>
+    <string name="type.shop.motorcycle_repair">Taller de motos</string>
     <string name="type.shop.music">Tienda de discos</string>
     <string name="type.shop.musical_instrument">Instrumentos musicales</string>
     <string name="type.shop.newsagent">Puesto de venta de periódicos</string>
@@ -1165,7 +1165,7 @@
     <string name="type.shop.seafood">Pescadería</string>
     <string name="type.shop.second_hand">Tienda de segunda mano</string>
     <string name="type.shop.shoes">Zapatería</string>
-    <string name="type.shop.sports">Artículos de deporte</string>
+    <string name="type.shop.sports">Tienda deportiva</string>
     <string name="type.shop.stationery">Papelería</string>
     <string name="type.shop.supermarket">Supermercado</string>
     <string name="type.shop.tattoo">Estudio de tatuajes</string>
diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml
index c92b51bd7..30743e1c8 100644
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -927,4 +927,6 @@
     <string name="dialog_report_error_with_logs">Veuillez nous envoyer un rapport d\'erreur :\n - \"Activer la journalisation\" dans les paramètres\n - reproduire le problème\n - dans l\'écran \"À propos &amp; Help\", appuyez sur le bouton \"SIGNAER UN BUG\" et envoyez-le par e-mail ou par chat\n - désactiver la journalisation</string>
     <string name="pref_backup_now_summary">Créer une sauvegarde immédiatement</string>
     <string name="at">à %s</string>
+    <string name="osm_note_hint">Sinon, laissez une note à la communauté OpenStreetMap pour que quelqu\'un d\'autre puisse ajouter ou corriger ce lieu.</string>
+    <string name="osm_note_toast">La note va être envoyée à OpenStreetMap</string>
 </resources>
diff --git a/android/app/src/main/res/values-gl/strings.xml b/android/app/src/main/res/values-gl/strings.xml
index 265784283..a8b1f88d8 100644
--- a/android/app/src/main/res/values-gl/strings.xml
+++ b/android/app/src/main/res/values-gl/strings.xml
@@ -639,4 +639,6 @@
     <string name="open_now">Aberto agora</string>
     <string name="closed_now">Agora Fechado</string>
     <string name="at">ás %s</string>
+    <string name="osm_note_hint">Ou, de xeito alternativo, deixarlle unha nota á comunidade OpenStreetMap para que alguén poida engadir ou arranxar a localización.</string>
+    <string name="osm_note_toast">Enviarase unha nota a OpenStreetMap</string>
 </resources>
diff --git a/android/app/src/main/res/values-gsw/strings.xml b/android/app/src/main/res/values-gsw/strings.xml
index 42a449bcd..13e27dcc7 100644
--- a/android/app/src/main/res/values-gsw/strings.xml
+++ b/android/app/src/main/res/values-gsw/strings.xml
@@ -639,4 +639,6 @@
     <string name="open_now">Jetzt offe</string>
     <string name="closed_now">Jetzt zue</string>
     <string name="at">am %s</string>
+    <string name="osm_note_hint">Oder hinterlaa alternativ en Hiiwiis für d OpenStreetMap Community, sodass öpper andersch en Ort hinzuefüege oder korrigiere cha.</string>
+    <string name="osm_note_toast">En Hiiwiis wird zu OpenStreetMap gschickt</string>
 </resources>
diff --git a/android/app/src/main/res/values-nb/types_strings.xml b/android/app/src/main/res/values-nb/types_strings.xml
index 950134935..5872b3d61 100644
--- a/android/app/src/main/res/values-nb/types_strings.xml
+++ b/android/app/src/main/res/values-nb/types_strings.xml
@@ -1193,4 +1193,5 @@
     <string name="type.leisure.sports_hall">Idrettshall</string>
     <string name="type.leisure.hackerspace">Skaperverksted</string>
     <string name="type.man_made.silo">Silo</string>
+    <string name="type.aeroway">Luftromsinfrastruktur</string>
 </resources>
diff --git a/android/app/src/main/res/values-pt-rBR/strings.xml b/android/app/src/main/res/values-pt-rBR/strings.xml
index 6a925860a..6ebe962b4 100644
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -897,4 +897,6 @@
     <string name="open_now">Aberto agora</string>
     <string name="closed_now">Fechado agora</string>
     <string name="at">às %s</string>
+    <string name="osm_note_hint">Ou, em vez disso, deixe uma nota para a comunidade do OpenStreetMap para que outra pessoa possa adicionar ou corrigir um lugar aqui.</string>
+    <string name="osm_note_toast">A nota será enviada ao OpenStreetMap</string>
 </resources>
diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index c6d5e3289..ab4c01961 100644
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -380,8 +380,8 @@
     <string name="read_in_wikipedia">Wikipédia</string>
     <string name="p2p_your_location">Localização atual</string>
     <string name="p2p_start">Iniciar</string>
-    <string name="p2p_from_here">De</string>
-    <string name="p2p_to_here">Itinerário para</string>
+    <string name="p2p_from_here">Rota desde</string>
+    <string name="p2p_to_here">Rota para</string>
     <string name="p2p_only_from_current">Só é possível navegar a partir da sua localização atual</string>
     <string name="p2p_reroute_from_current">Quer planear uma rota a partir da sua localização atual?</string>
     <!-- Edit open hours/set time and minutes dialog -->
diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml
index ef7c9feb1..70f25d4f5 100644
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -183,7 +183,7 @@
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
     <string name="cant_change_this_setting">Üzgünüz, Harita Depolama ayarları şu anda devre dışı.</string>
     <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">Harita indirme işlemi şu anda sürüyor.</string>
+    <string name="downloading_is_active">Harita indiriliyor</string>
     <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
     <string name="my_position_share_sms">Hey, CoMaps’te geçerli konumumu incele! %1$s veya %2$s Çevrimdışı haritalar sende yok mu? Buradan indir: https://www.comaps.app/download/</string>
     <!-- Subject for emailed bookmark -->
@@ -239,9 +239,9 @@
     <!-- Settings «Route» category: «Tts language» title -->
     <string name="pref_tts_language_title">Ses Dili</string>
     <!-- Settings «Route» category: «Test Voice Directions» title -->
-    <string name="pref_tts_test_voice_title">Sesli Yönlendirmeleri Sına (TTS, Text-To-Speech)</string>
+    <string name="pref_tts_test_voice_title">Sesli Navigasyon Testi</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
-    <string name="pref_tts_playing_test_voice">Sesi şimdi duymuyorsanız ses düzeyini veya sistem metin okuma ayarlarını denetleyin.</string>
+    <string name="pref_tts_playing_test_voice">Sesi duyamıyorsanız ses seviyesini veya sistem metin okuma ayarlarını kontrol edin.</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
     <string name="pref_tts_unavailable">Yok</string>
     <string name="pref_map_auto_zoom">Kendiliğinden yaklaştır</string>
@@ -287,7 +287,7 @@
     <string name="downloader_download_all_button">Tümünü İndir</string>
     <string name="downloader_downloading">İndiriliyor:</string>
     <!-- Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode -->
-    <string name="downloader_delete_map_while_routing_dialog">Haritayı silmek için lütfen navigasyonu durdurun.</string>
+    <string name="downloader_delete_map_while_routing_dialog">Haritayı silmek için lütfen navigasyonu kapatın.</string>
     <!-- PointsInDifferentMWM -->
     <string name="routing_failed_cross_mwm_building">Rotalar yalnızca tümüyle tek bir bölgenin haritası içinde oluşturulabilir.</string>
     <!-- Context menu item for downloader. -->
@@ -357,18 +357,18 @@
     <string name="dialog_routing_location_turn_on">Konum hizmetlerini etkinleştir</string>
     <string name="dialog_routing_location_unknown_turn_on">Mevcut GPS koordinatları belirlenemiyor. Rota hesaplamak için konum hizmetlerini etkinleştirin.</string>
     <string name="dialog_routing_unable_locate_route">Rota belirlenemiyor</string>
-    <string name="dialog_routing_cant_build_route">Rota oluşturulamıyor.</string>
+    <string name="dialog_routing_cant_build_route">Rota oluşturulamıyor</string>
     <string name="dialog_routing_change_start_or_end">Lütfen başlangıç noktanızı veya hedefinizi ayarlayın.</string>
     <string name="dialog_routing_change_start">Başlangıç noktasını ayarla</string>
     <string name="dialog_routing_start_not_determined">Rota oluşturulamadı. Başlangıç noktası belirlenemiyor.</string>
     <string name="dialog_routing_select_closer_start">Lütfen yola daha yakın bir başlangıç noktası seçin.</string>
     <string name="dialog_routing_change_end">Hedefinizi ayarlayın</string>
     <string name="dialog_routing_end_not_determined">Rota oluşturulamadı. Hedef belirlenemiyor.</string>
-    <string name="dialog_routing_select_closer_end">Lütfen yola daha yakın hedef noktası seçin.</string>
-    <string name="dialog_routing_change_intermediate">Ara nokta bulunamadı.</string>
-    <string name="dialog_routing_intermediate_not_determined">Lütfen ara noktanızı ayarlayın.</string>
+    <string name="dialog_routing_select_closer_end">Lütfen yola daha yakın hedef noktası seçin</string>
+    <string name="dialog_routing_change_intermediate">Ara nokta bulunamadı</string>
+    <string name="dialog_routing_intermediate_not_determined">Lütfen ara noktanızı ayarlayın</string>
     <string name="dialog_routing_system_error">Sistem hatası</string>
-    <string name="dialog_routing_application_error">Uygulama hatası nedeniyle rota oluşturulamadı.</string>
+    <string name="dialog_routing_application_error">Uygulama hatası nedeniyle rota oluşturulamadı</string>
     <string name="dialog_routing_try_again">Lütfen yeniden deneyin</string>
     <string name="not_now">Şimdi Değil</string>
     <string name="dialog_routing_download_and_build_cross_route">Haritayı indirerek birden çok haritaya uzanan daha uygun bir rota oluşturmak ister misiniz?</string>
@@ -382,11 +382,11 @@
     <string name="hide">Gizle</string>
     <string name="categories">Kategoriler</string>
     <string name="history">Geçmiş</string>
-    <string name="search_not_found">Tüh, sonuç bulunamadı.</string>
+    <string name="search_not_found">Tüh, sonuç bulunamadı</string>
     <!-- The message when user did not find anything in the search. -->
     <string name="search_not_found_query">Arama yapmak istediğiniz bölgenin haritasını indirin veya yakındaki bir yerleşim yeri adını eklemeyi deneyin.</string>
     <string name="search_history_title">Arama Geçmişi</string>
-    <string name="search_history_text">Son aramalarınızı görüntüleyin.</string>
+    <string name="search_history_text">Son aramalarınızı görüntüleyin</string>
     <string name="clear_search">Arama Geçmişini Temizle</string>
     <!-- Place Page link to Wikipedia article (if map object has it). -->
     <string name="read_in_wikipedia">Vikipedi</string>
@@ -394,7 +394,7 @@
     <string name="p2p_start">Başla</string>
     <string name="p2p_from_here">Başlangıç</string>
     <string name="p2p_to_here">Varış yeri</string>
-    <string name="p2p_only_from_current">Navigasyon yalnızca şu anki konumunuzdan kullanılabilir.</string>
+    <string name="p2p_only_from_current">Navigasyon yalnızca mevcut konumunuzdan başlatılabilir.</string>
     <string name="p2p_reroute_from_current">Şu anki konumunuzdan rota planlamamızı ister misiniz?</string>
     <!-- Edit open hours/set time and minutes dialog -->
     <string name="next_button">Sonraki</string>
@@ -466,14 +466,14 @@
     <string name="level">Kat</string>
     <!-- Building level -->
     <string name="level_value_generic">Kat sayısı: %s</string>
-    <string name="downloader_delete_map_dialog">Harita ile birlikte tüm harita değişiklikleri de silinecektir.</string>
+    <string name="downloader_delete_map_dialog">Harita ile birlikte tüm harita değişiklikleri de silinecektir</string>
     <string name="downloader_update_maps">Haritaları güncelle</string>
     <string name="downloader_mwm_migration_dialog">Rota oluşturmak için tüm haritaları güncellemeli ve rotayı yeniden planlamalısınız.</string>
     <string name="downloader_search_field_hint">Harita bul</string>
-    <string name="common_check_internet_connection_dialog">Lütfen aygıtınızın internete bağlandığından emin olun.</string>
+    <string name="common_check_internet_connection_dialog">Lütfen cihazın internete bağlandığından emin olun.</string>
     <string name="downloader_no_space_title">Yeterli alan yok</string>
     <string name="downloader_no_space_message">Lütfen gereksiz verileri silin</string>
-    <string name="editor_login_error_dialog">Giriş hatası.</string>
+    <string name="editor_login_error_dialog">Giriş hatası</string>
     <string name="editor_profile_changes">Doğrulanan Düzenleme</string>
     <string name="editor_focus_map_on_location">Çarpı imini mekân veya işletmenin konumuna yerleştirmek için haritayı sürükleyin.</string>
     <string name="editor_edit_place_title">Düzenleme</string>
@@ -490,16 +490,16 @@
     <string name="osm_presentation">%s tarihine ait topluluk tarafından oluşturulmuş OpenStreetMap verilerini kullanıyorsunuz. OpenStreetMap.org adresinden haritayı nasıl düzenleyebileceğiniz hakkında bilgi edinebilirsiniz</string>
     <!-- OSM explanation on Android login screen -->
     <string name="login_osm_presentation">OpenStreetMap.org (OSM), ücretsiz ve açık harita oluşturmayı amaçlayan bir topluluk projesidir. OSM, CoMaps\'teki harita verilerinin ana kaynağıdır ve Vikipedi\'ye benzer şekilde çalışır. Haritadaki yerleri ekleyebilir veya düzenleyebilirsiniz ve bunlar tüm dünyadaki milyonlarca kullanıcı tarafından kullanılabilir hale gelir. \nTopluluğa katılın ve herkes için daha iyi bir harita oluşturmaya yardımcı olun!</string>
-    <string name="login_to_make_edits_visible">Harita düzenlemelerinizi herkese ulaştırmak için OpenStreetMap hesabı oluşturun veya oturum açın.</string>
+    <string name="login_to_make_edits_visible">Harita düzenlemelerinizi herkese ulaştırmak için OpenStreetMap hesabı oluşturun veya oturum açın</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d/%2$d</string>
     <string name="download_over_mobile_header">Hücresel bir ağ bağlantısı kullanarak indirilsin mi?</string>
-    <string name="download_over_mobile_message">Bu işlem, bazı planlarda veya dolaşımda oldukça pahalı olabilir.</string>
+    <string name="download_over_mobile_message">Bu işlem, bazı planlarda veya dolaşımda oldukça pahalı olabilir</string>
     <string name="error_enter_correct_house_number">Geçerli bir bina numarası girin</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Kat sayısı %d\'i geçmemelidir</string>
     <string name="editor_zip_code">Posta Kodu</string>
-    <string name="error_enter_correct_zip_code">Geçerli posta kodu gir</string>
+    <string name="error_enter_correct_zip_code">Geçerli bir posta kodu girin</string>
     <!-- Place Page title for long tap -->
     <string name="core_placepage_unknown_place">Harita Noktası</string>
     <!-- Title for OSM note section in the editor -->
@@ -517,8 +517,8 @@
     <string name="editor_category_unsuitable_title">Uygun bir kategori bulamıyor musunuz?</string>
     <string name="editor_category_unsuitable_text">CoMaps yalnızca basit nokta kategorilerini eklemeye izin verir. Yani kasaba, yol, göl, bina vb. çizgi/alan verisi ekleme desteği yoktur. Lütfen bu tür kategorileri doğrudan <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> üzerinden ekleyin. Adım adım ayrıntılı yönergeler için <a href="https://www.comaps.app/support/advanced-map-editing/">rehberimize</a> göz atabilirsiniz.</string>
     <string name="downloader_no_downloaded_maps_title">Hiç harita indirmediniz</string>
-    <string name="downloader_no_downloaded_maps_message">Çevrim dışı olarak adres bulmak ve gezinmek için haritaları indirin.</string>
-    <string name="current_location_unknown_error_title">Geçerli konum bilinmiyor.</string>
+    <string name="downloader_no_downloaded_maps_message">İnternetsiz olarak biyerleri bulmak ve gezinmek için haritaları indirin.</string>
+    <string name="current_location_unknown_error_title">Mevcut konum bilinmiyor.</string>
     <!-- abbreviation for meters -->
     <string name="m">m</string>
     <!-- abbreviation for kilometers -->
@@ -557,8 +557,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Bunu tüm kullanıcılara göndermek ister misiniz?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Herhangi bir kişisel bilgi girmediğinizden emin olun.</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap editörleri değişikliklerinizi denetleyecek ve bir soruları olursa sizinle iletişime geçecek.</string>
+    <string name="editor_share_to_all_dialog_message_1">Herhangi bir kişisel bilgi girmediğinizden emin olun</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap editörleri değişikliklerinizi denetleyecek ve bir soruları olursa sizinle iletişime geçecektir</string>
     <string name="navigation_stop_button">Dur</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">GPS iziniz kaydediliyor</string>
@@ -572,10 +572,10 @@
     <string name="mobile_data_option_not_today">Bugün Kullanma</string>
     <string name="mobile_data">Mobil İnternet</string>
     <!-- NOTE to translators: please synchronize your translation with the English one. -->
-    <string name="mobile_data_description">Harita güncelleme bildirimleri ve yapılan düzenlemelerin yüklenmesi için mobil internet gereklidir.</string>
+    <string name="mobile_data_description">Harita güncelleme bildirimleri ve yapılan düzenlemelerin yüklenmesi için mobil internet gereklidir</string>
     <string name="mobile_data_option_never">Asla Kullanma</string>
     <string name="mobile_data_option_ask">Her Zaman Sor</string>
-    <string name="traffic_update_maps_text">Trafik verilerini görüntülemek için haritaların güncellenmesi gerekiyor.</string>
+    <string name="traffic_update_maps_text">Trafik verilerini görüntülemek için haritaların güncellenmesi gerekiyor</string>
     <string name="big_font">Haritadaki yazı tipi boyutunu artır</string>
     <string name="traffic_update_app">Lütfen CoMaps\'i güncelleyin</string>
     <!-- "traffic" as in "road congestion" -->
@@ -585,7 +585,7 @@
     <string name="feedback_general">Genel Geri Bildirim</string>
     <string name="prefs_languages_information">Sesli yönlendirme için TTS sistemini kullanıyoruz. Çoğu Android aygıt, Google TTS\'yi kullanıyor. Uygulamayı, Google Play\'den indirebilir veya güncelleyebilirsiniz (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
     <string name="prefs_languages_information_off">Bazı diller için uygulama mağazasından (Google Play, Galaxy Store, App Gallery, FDroid) başka konuşma sentezleyici ya da ek dil paketi kurmanız gerekebilir.\nAygıt ayarları → Dil ve Giriş → Konuşma → Metin Okuma seçeneğini açın.\nBuradan konuşma sentezi ayarlarını yönetebilir (örneğin, çevrim dışı kullanım için dil paketini karşıdan yükleyebilir) ve başka metin okuma motorunu seçebilirsiniz.</string>
-    <string name="prefs_languages_information_off_link">Daha fazla bilgi için lütfen bu kılavuzu inceleyin.</string>
+    <string name="prefs_languages_information_off_link">Daha fazla bilgi için lütfen bu kılavuzu inceleyin</string>
     <string name="transliteration_title">Latin alfabesine çevir</string>
     <string name="learn_more">Daha fazla bilgi edinin</string>
     <!-- Subway exits for public transport marks on the map -->
@@ -664,7 +664,7 @@
     <!-- Speed camera settings menu option - Never warn (about speedcams) -->
     <string name="pref_tts_speedcams_never">Hiçbir zaman uyarma</string>
     <string name="power_managment_title">Güç tasarrufu modu</string>
-    <string name="power_managment_description">Kimi işlevler pahasına olsa da güç kullanımını düşürmeyi dener.</string>
+    <string name="power_managment_description">Bazı fonksiyonlardan kısarak güç tüketimini azaltır</string>
     <string name="power_managment_setting_never">Asla</string>
     <string name="power_managment_setting_auto">Pil düşükken</string>
     <string name="power_managment_setting_manual_max">Her zaman</string>
@@ -923,4 +923,6 @@
     <string name="pref_backup_now_summary_folder_unavailable">Yedekleme klasörü kullanılamıyor</string>
     <string name="pref_backup_now_summary_empty_lists">Yedeklenecek yer imi ve parça yok</string>
     <string name="dialog_report_error_missing_folder">Seçilen yedekleme konumu kullanılamıyor veya yazılabilir değil. Lütfen farklı bir konum seçin.</string>
+    <string name="osm_note_hint">Veya alternatif olarak, OpenStreetMap topluluğuna bir not bırakın, böylece başka biri buraya ekleme yapabilir veya hatayı düzeltebilir.</string>
+    <string name="osm_note_toast">Notunuz OpenStreetMap\'e gönderilecektir</string>
 </resources>
diff --git a/android/app/src/main/res/values-tr/types_strings.xml b/android/app/src/main/res/values-tr/types_strings.xml
index 9b3524371..74ad62c73 100644
--- a/android/app/src/main/res/values-tr/types_strings.xml
+++ b/android/app/src/main/res/values-tr/types_strings.xml
@@ -1365,7 +1365,7 @@
     <string name="type.power.pole">Elektrik Direği</string>
     <string name="type.man_made.utility_pole">Hizmet Direği</string>
     <string name="type.amenity.studio">Stüdyo</string>
-    <string name="type.sport.diving">Dalış Sporu</string>
+    <string name="type.sport.diving">Yüksek Dalış Alanı</string>
     <string name="type.man_made.survey_point">Anket Noktası</string>
     <string name="type.highway.ladder">Merdiven</string>
     <string name="type.man_made.crane">Vinç</string>
@@ -1377,4 +1377,8 @@
     <string name="type.natural.wetland.saltmarsh">Tuz Bataklığı</string>
     <string name="type.natural.wetland.saltmarsh.tidal">Gelgit Tuz Bataklığı</string>
     <string name="type.natural.wetland.fen">Bataklık</string>
+    <string name="type.amenity.bicycle_parking.covered">Üstü kapalı bisiklet park alanı</string>
+    <string name="type.natural.wetland.swamp">Bataklık</string>
+    <string name="type.railway.station.subway.qingdao">Metro İstasyonu</string>
+    <string name="type.attraction.big_wheel">Dönme Dolap</string>
 </resources>
diff --git a/android/app/src/main/res/values-zh/strings.xml b/android/app/src/main/res/values-zh/strings.xml
index 7ea9c6e15..aa84578cc 100644
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -924,4 +924,6 @@
     <string name="closed_now">已歇业</string>
     <string name="open_now">营业中</string>
     <string name="at">%s</string>
+    <string name="osm_note_hint">或者，也可以给 OpenStreetMap 社区留言，以便其他人可以在此添加或修复地点。</string>
+    <string name="osm_note_toast">注释将发送至 OpenStreetMap</string>
 </resources>
diff --git a/data/countries-strings/tr.json/localize.json b/data/countries-strings/tr.json/localize.json
index 0f0d69fb7..ac7e5443a 100644
--- a/data/countries-strings/tr.json/localize.json
+++ b/data/countries-strings/tr.json/localize.json
@@ -34,7 +34,7 @@
 "Austria_Burgenland":"Burgenland",
 "Austria_Carinthia":"Karintiya",
 "Austria_Lower Austria_West":"Aşağı Avusturya — Batı",
-"Austria_Lower Austria_Wien":"Viyana",
+"Austria_Lower Austria_Wien":"Viyana ve Aşağı Avusturya - Doğu",
 "Austria_Salzburg":"Salzburg",
 "Austria_Styria":"Steiermark",
 "Austria_Tyrol":"Tirol",
@@ -568,8 +568,8 @@
 "Italy_Sardinia":"Sardinya",
 "Italy_Sicily":"Sicilya",
 "Italy_Trentino-Alto Adige Sudtirol":"Trentino-Alto Adige",
-"Italy_Tuscany_Grosseto":"Toskana — Grosseto ili",
-"Italy_Tuscany_Massa e Carrara":"Toskana — Massa ve Carrara ili",
+"Italy_Tuscany_Grosseto":"Toskana — Güney Doğu",
+"Italy_Tuscany_Massa e Carrara":"Toskana — Kuzey Batı",
 "Italy_Umbria":"Umbria",
 "Italy_Veneto":"Veneto",
 "Italy_Veneto_Belluno":"Belluno ili",
diff --git a/data/sound-strings/ca.json/localize.json b/data/sound-strings/ca.json/localize.json
index b90d60a7a..f1f3a88c7 100644
--- a/data/sound-strings/ca.json/localize.json
+++ b/data/sound-strings/ca.json/localize.json
@@ -24,7 +24,7 @@
 "make_a_u_turn_street_verb":"NULL",
 "go_straight":"Seguiu tot recte.",
 "exit":"Sortida.",
-"onto":"onto",
+"onto":"cap a",
 "take_exit_number":"Agafeu la sortida",
 "take_exit_number_street_verb":"NULL",
 "route_recalculating":"Recalcular el recorregut",
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index 6f61c735b..f06217527 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -144,7 +144,7 @@
 "category_police" = "Policie";
 
 /* Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! */
-"category_wifi" = "WiFi";
+"category_wifi" = "Wi-Fi";
 
 /* Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! */
 "category_recycling" = "Recyklace";
@@ -448,7 +448,7 @@
 "dialog_routing_disclaimer_beware" = "Na silnici buďte pozorní a chovejte se bezpečně!";
 "dialog_routing_check_gps" = "Zkontrolovat signál GPS";
 "dialog_routing_error_location_not_found" = "Trasu se nepodařilo vytvořit. Nelze zjistit aktuální souřadnice GPS.";
-"dialog_routing_location_turn_wifi" = "Zkontrolujte signál GPS. Povolením připojení WiFi zpřesníte určení vaší polohy.";
+"dialog_routing_location_turn_wifi" = "Zkontrolujte signál GPS. Povolením připojení Wi-Fi zlepšíte přesnost určování vaší polohy.";
 "dialog_routing_location_turn_on" = "Povolit služby určování polohy";
 "dialog_routing_location_unknown_turn_on" = "Aktuální souřadnice GPS se nepodařilo zjistit. Pro výpočet trasy povolte služby určování polohy.";
 "dialog_routing_download_files" = "Stáhnout požadované soubory";
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
index dcca85771..bf334a043 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
@@ -1245,7 +1245,7 @@
 "type.shop.mobile_phone" = "Tienda de Móviles";
 "type.shop.money_lender" = "Prestamista";
 "type.shop.motorcycle" = "Tienda de motos";
-"type.shop.motorcycle_repair" = "Reparación de motos";
+"type.shop.motorcycle_repair" = "Taller de motos";
 "type.shop.music" = "Tienda de discos";
 "type.shop.musical_instrument" = "Instrumentos musicales";
 "type.shop.newsagent" = "Puesto de venta de periódicos";
@@ -1263,7 +1263,7 @@
 "type.shop.seafood" = "Pescadería";
 "type.shop.second_hand" = "Tienda de segunda mano";
 "type.shop.shoes" = "Zapatería";
-"type.shop.sports" = "Artículos de deporte";
+"type.shop.sports" = "Tienda deportiva";
 "type.shop.stationery" = "Papelería";
 "type.shop.supermarket" = "Supermercado";
 "type.shop.tattoo" = "Estudio de tatuajes";
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index df65f768a..8258df859 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -325,7 +325,7 @@
 "volunteer" = "Frivillig arbeid";
 
 /* "Social media" section header in the About screen */
-"follow_us" = "Følg og kontakt oss";
+"follow_us" = "Følg oss";
 
 /* Alert text */
 "email_error_body" = "E-postklienten har ikke blitt konfigurert. Konfigurer den eller bruk en annen måte å kontakte oss på %@";
@@ -1094,8 +1094,8 @@
 "edit_track" = "Rediger ruten";
 "osm_profile_view_edit_history" = "Vis redigeringshistorikk";
 "osm_profile_view_notes" = "Vis merknader";
-"about_proposition_3" = "Transparent and not for profit";
-"pref_mapappearance_title" = "Map Appearance";
-"pref_maplanguage_title" = "Map Language";
+"about_proposition_3" = "Transparent og ikke for profitt";
+"pref_mapappearance_title" = "Kartets Utseende";
+"pref_maplanguage_title" = "Kart Språk";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
-"pref_maplanguage_local" = "Local Language";
+"pref_maplanguage_local" = "Lokalt Språk";
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.stringsdict
index 83cc23d45..bd8185859 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.stringsdict
@@ -12,6 +12,8 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>zero</key>
+			<string>Ingen bokmerker</string>
 			<key>one</key>
 			<string>%d bokmerke</string>
 			<key>other</key>
@@ -28,6 +30,8 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>zero</key>
+			<string>Ingen filer funnet</string>
 			<key>one</key>
 			<string>%d fil funnet. Du vil se den etter konverteringen.</string>
 			<key>other</key>
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings
index b7a8402b8..702a9fafb 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings
@@ -8,7 +8,7 @@
 "type.aerialway.gondola" = "Gondolbane";
 "type.aerialway.mixed_lift" = "Kombibane";
 "type.aerialway.station" = "Taubanestasjon";
-"type.aeroway" = "Airspace Infrastructure";
+"type.aeroway" = "Luftromsinfrastruktur";
 "type.aeroway.aerodrome" = "Flyplass";
 "type.aeroway.aerodrome.international" = "Flyplass";
 "type.aeroway.apron" = "Apron";
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index 4606b6efe..df18c4126 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -1021,7 +1021,7 @@
 "bugreport_alert_message" = "Wil je een bugrapport naar de ontwikkelaars sturen?\nWe vertrouwen op onze gebruikers, want CoMaps verzamelt geen foutinformatie automatisch. Alvast bedankt voor je steun aan CoMaps!";
 
 /* Title for the iCloud syncronization setting */
-"icloud_sync" = "iCloud Syncronization (Beta)";
+"icloud_sync" = "iCloud synchronisatie (bèta)";
 
 /* Title for the "Enable iCloud Syncronization" alert. */
 "enable_icloud_synchronization_title" = "Schakel iCloud-synchronisatie in";
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index 0ad6d0495..d656ccbe2 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -497,8 +497,8 @@
 "wikimedia_commons" = "Wikimedia Commons";
 "p2p_your_location" = "Localização atual";
 "p2p_start" = "Iniciar";
-"p2p_from_here" = "De";
-"p2p_to_here" = "Itinerário para";
+"p2p_from_here" = "Rota desde";
+"p2p_to_here" = "Rota para";
 "p2p_only_from_current" = "Só é possível navegar a partir da sua localização atual.";
 "p2p_reroute_from_current" = "Quer planear uma rota a partir da sua localização atual?";
 "editor_time_add" = "Adicionar horário";
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index de5dfddcb..9b6e41da3 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -253,7 +253,7 @@
 "pref_tts_language_title" = "Ses Dili";
 
 /* Settings «Route» category: «Test Voice Directions» title */
-"pref_tts_test_voice_title" = "Sesli Yönlendirmeleri Sına (TTS, Text-To-Speech)";
+"pref_tts_test_voice_title" = "Sesli Navigasyon Testi";
 
 /* Title for "Other" section in TTS settings. */
 "pref_tts_other_section_title" = "Diğer";
@@ -623,7 +623,7 @@
 /* Error message in Editor when a user tries to set the number of floors for a building higher than %d floors */
 "error_enter_correct_storey_number" = "Kat sayısı %d'i geçmemelidir";
 "editor_zip_code" = "Posta Kodu";
-"error_enter_correct_zip_code" = "Geçerli posta kodu gir";
+"error_enter_correct_zip_code" = "Geçerli bir posta kodu girin";
 
 /* Place Page title for long tap */
 "core_placepage_unknown_place" = "Harita Noktası";
@@ -1097,7 +1097,7 @@
 "edit_track" = "Kaydı Düzenle";
 "osm_profile_view_edit_history" = "Düzenleme geçmişini görüntüle";
 "osm_profile_view_notes" = "Notları görüntüle";
-"pref_mapappearance_title" = "Map Appearance";
-"pref_maplanguage_title" = "Map Language";
+"pref_mapappearance_title" = "Harita Teması";
+"pref_maplanguage_title" = "Harita Dili";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
-"pref_maplanguage_local" = "Local Language";
+"pref_maplanguage_local" = "Uygulama Dili";
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings
index 1892948b8..b6b6d0c99 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings
@@ -1355,7 +1355,7 @@
 "type.attraction.amusement_ride" = "Eğlence Sürüşü";
 "type.attraction.animal" = "Hayvan Muhafazası";
 "type.attraction.bumper_car" = "Bumper Car";
-"type.attraction.big_wheel" = "Big Wheel";
+"type.attraction.big_wheel" = "Dönme Dolap";
 "type.attraction.carousel" = "Atlıkarınca";
 "type.attraction.historic" = "Tarihi cazibe merkezi";
 "type.attraction.maze" = "Labirent";
@@ -1461,7 +1461,7 @@
 /* https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall */
 "type.leisure.sports_hall" = "Spor salonu";
 "type.amenity.studio" = "Stüdyo";
-"type.sport.diving" = "Dalış Sporu";
+"type.sport.diving" = "Yüksek Dalış Alanı";
 "type.highway.ladder" = "Merdiven";
 "type.man_made.crane" = "Vinç";
 "type.leisure.firepit" = "Ateş çukuru";
@@ -1471,13 +1471,13 @@
 "type.natural.wetland.fen" = "Bataklık";
 "type.natural.wetland.saltmarsh" = "Tuz Bataklığı";
 "type.natural.wetland.saltmarsh.tidal" = "Gelgit Tuz Bataklığı";
-"type.railway.station.subway.qingdao" = "Subway Station";
-"type.natural.wetland.tidalflat" = "Tidal Flat";
-"type.natural.wetland.swamp" = "Swamp";
+"type.railway.station.subway.qingdao" = "Metro İstasyonu";
+"type.natural.wetland.swamp" = "Bataklık";
 "type.natural.wetland.mangrove" = "Mangrove";
 "type.natural.wetland.reedbed" = "Reed Bed";
 "type.leisure.escape_game" = "Escape Room";
 "type.amenity.luggage_locker" = "Luggage Locker";
-"type.amenity.ranger_station" = "Ranger Station";
-"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
+"type.amenity.bicycle_parking.covered" = "Üstü kapalı bisiklet park alanı";
 "type.post_office.post_partner" = "Post Partner";
+"type.amenity.ranger_station" = "Ranger Station";
+"type.natural.wetland.tidalflat" = "Tidal Flat";
diff --git a/iphone/metadata/tr/keywords.txt b/iphone/metadata/tr/keywords.txt
index c9c7cb65f..e4f448acb 100644
--- a/iphone/metadata/tr/keywords.txt
+++ b/iphone/metadata/tr/keywords.txt
@@ -1 +1 @@
-comaps,maps,open street maps,osm,travel,hike,bike,drive,offline,privacy,navigate,gps
+comaps,haritalar,open street map,osm,seyahat,yürüyüş,bisiklet,sürüş,internetsiz,mahremiyet,navigasyon,konum

From 62de63eda0f387983558569d1d33fe8651025133 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Sat, 16 Aug 2025 17:35:54 +0200
Subject: [PATCH 094/302] [android]Use ContextCompat API instead Resources API

Signed-off-by: Jean-Baptiste Charron <jeanbaptiste.charron@outlook.fr>
---
 .../java/app/organicmaps/maplayer/MapButtonsController.java   | 3 ++-
 .../organicmaps/routing/BaseRoutingErrorDialogFragment.java   | 4 +++-
 .../java/app/organicmaps/widget/placepage/PlacePageView.java  | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
index 200ac7082..7f4e8ba34 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
@@ -16,6 +16,7 @@ import android.view.ViewTreeObserver;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.OptIn;
+import androidx.core.content.ContextCompat;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.fragment.app.Fragment;
@@ -295,7 +296,7 @@ public class MapButtonsController extends Fragment
       mBadgeDrawable.setMaxCharacterCount(0);
       mBadgeDrawable.setHorizontalOffset(verticalOffset);
       mBadgeDrawable.setVerticalOffset(dpToPx(9, context));
-      mBadgeDrawable.setBackgroundColor(getResources().getColor(R.color.base_accent));
+      mBadgeDrawable.setBackgroundColor(ContextCompat.getColor(context, R.color.base_accent));
       mBadgeDrawable.setVisible(enable);
       BadgeUtils.attachBadgeDrawable(mBadgeDrawable, menuButton);
     }
diff --git a/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java b/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java
index f05f24d27..a97de9aa6 100644
--- a/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java
@@ -11,6 +11,8 @@ import android.widget.ExpandableListAdapter;
 import android.widget.ExpandableListView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
+import androidx.core.content.ContextCompat;
+
 import app.organicmaps.R;
 import app.organicmaps.adapter.DisabledChildSimpleExpandableListAdapter;
 import app.organicmaps.base.BaseMwmDialogFragment;
@@ -122,7 +124,7 @@ abstract class BaseRoutingErrorDialogFragment extends BaseMwmDialogFragment
     }
 
     listView.setAdapter(buildAdapter());
-    listView.setChildDivider(new ColorDrawable(getResources().getColor(android.R.color.transparent)));
+    listView.setChildDivider(new ColorDrawable(ContextCompat.getColor(requireContext(), android.R.color.transparent)));
 
     UiUtils.waitLayout(listView, () -> {
       final int width = listView.getWidth();
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
index 7187c253d..6d0091334 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
@@ -481,7 +481,7 @@ public class PlacePageView extends Fragment
               ? ContextCompat.getColor(
                     getContext(),
                     UiUtils.getStyledResourceId(getContext(), com.google.android.material.R.attr.colorSecondary))
-              : getResources().getColor(R.color.button_accent_text_disabled);
+              : ContextCompat.getColor(getContext(), R.color.button_accent_text_disabled);
       mTvEditPlace.setTextColor(editPlaceButtonColor);
       mTvAddBusiness.setTextColor(editPlaceButtonColor);
       mTvAddPlace.setTextColor(editPlaceButtonColor);

From e46d3d9b65fc8572b27d1023ebdcaf562720d36e Mon Sep 17 00:00:00 2001
From: vikiawv <vikiawv@noreply.codeberg.org>
Date: Sun, 17 Aug 2025 18:25:04 +0200
Subject: [PATCH 095/302] [styles] Added Roadshieldcolors in Europe
 (Belgium-Portugal)

[styles] Added roadshield-color Romania

also some other, even though only highways there, as there are no letter markers inside the ref code
Spain and Turkey need to be checked by person with local knowledge.

[styles] corrected Ireland Motorway and Romania DS/DJ-Streets

Signed-off-by: vikiawv <vikiawv@noreply.codeberg.org>
---
 libs/indexer/road_shields_parser.cpp | 149 ++++++++++++++++++++++++++-
 1 file changed, 147 insertions(+), 2 deletions(-)

diff --git a/libs/indexer/road_shields_parser.cpp b/libs/indexer/road_shields_parser.cpp
index e6e2ac1cd..660fd10d2 100644
--- a/libs/indexer/road_shields_parser.cpp
+++ b/libs/indexer/road_shields_parser.cpp
@@ -437,8 +437,127 @@ public:
                                               {"S", RoadShieldType::Generic_Blue},
                                               {"B", RoadShieldType::Generic_Blue},
                                               {"L", RoadShieldType::Generic_White}})
-  {
-  }
+  {}
+};
+
+class BelgiumRoadShieldParser : public SimpleRoadShieldParser
+{
+public:
+  explicit BelgiumRoadShieldParser(std::string const & baseRoadNumber)
+    : SimpleRoadShieldParser(baseRoadNumber,
+                             {{"A", RoadShieldType::Generic_White}, {"N", RoadShieldType::Generic_Blue}})
+  {}
+};
+
+class GreeceRoadShieldParser : public SimpleRoadShieldParser
+{
+public:
+  explicit GreeceRoadShieldParser(std::string const & baseRoadNumber)
+    : SimpleRoadShieldParser(baseRoadNumber,
+                             {{"Α", RoadShieldType::Generic_Green}, {"Ε", RoadShieldType::Generic_Blue}})
+  {}
+};
+
+class IrelandRoadShieldParser : public SimpleRoadShieldParser
+{
+public:
+  explicit IrelandRoadShieldParser(std::string const & baseRoadNumber)
+    : SimpleRoadShieldParser(baseRoadNumber, {{"M", RoadShieldType::Generic_Blue},
+                                              {"N", RoadShieldType::UK_Highway},
+                                              {"R", RoadShieldType::Generic_White},
+                                              {"L", RoadShieldType::Generic_White}})
+  {}
+};
+
+class ItalyRoadShieldParser : public SimpleRoadShieldParser
+{
+public:
+  explicit ItalyRoadShieldParser(std::string const & baseRoadNumber)
+    : SimpleRoadShieldParser(baseRoadNumber, {{"A", RoadShieldType::Generic_Green},
+                                              {"SS", RoadShieldType::Generic_Blue},
+                                              {"SR", RoadShieldType::Generic_Blue},
+                                              {"SP", RoadShieldType::Generic_Blue}})
+  {}
+};
+
+class LativaRoadShieldParser : public SimpleRoadShieldParser
+{
+public:
+  explicit LativaRoadShieldParser(std::string const & baseRoadNumber)
+    : SimpleRoadShieldParser(baseRoadNumber, {{"A", RoadShieldType::Generic_Red}, {"P", RoadShieldType::Generic_Blue}})
+  {}
+};
+
+class MoldovaRoadShieldParser : public SimpleRoadShieldParser
+{
+public:
+  explicit MoldovaRoadShieldParser(std::string const & baseRoadNumber)
+    : SimpleRoadShieldParser(baseRoadNumber, {{"M", RoadShieldType::Generic_Red}, {"R", RoadShieldType::Generic_Blue}})
+  {}
+};
+
+class PortugalRoadShieldParser : public SimpleRoadShieldParser
+{
+public:
+  explicit PortugalRoadShieldParser(std::string const & baseRoadNumber)
+    : SimpleRoadShieldParser(baseRoadNumber, {{"A", RoadShieldType::Generic_Blue},
+                                              {"N", RoadShieldType::Generic_White},
+                                              {"EN", RoadShieldType::Generic_White},
+                                              {"R", RoadShieldType::Generic_Orange},
+                                              {"EM", RoadShieldType::Generic_Orange},
+                                              {"CM", RoadShieldType::Generic_Orange}})
+  {}
+};
+
+class RomaniaRoadShieldParser : public SimpleRoadShieldParser
+{
+public:
+  explicit RomaniaRoadShieldParser(std::string const & baseRoadNumber)
+    : SimpleRoadShieldParser(baseRoadNumber, {{"A", RoadShieldType::Generic_Green},
+                                              {"DN", RoadShieldType::Generic_Red},
+                                              {"DJ", RoadShieldType::Generic_Blue},
+                                              {"DC", RoadShieldType::Generic_Blue}})
+  {}
+};
+
+class SerbiaRoadShieldParser : public SimpleRoadShieldParser
+{
+public:
+  explicit SerbiaRoadShieldParser(std::string const & baseRoadNumber)
+    : SimpleRoadShieldParser(baseRoadNumber, {{"A", RoadShieldType::Generic_Green}})
+  {}
+};
+
+class SlovakiaRoadShieldParser : public SimpleRoadShieldParser
+{
+public:
+  explicit SlovakiaRoadShieldParser(std::string const & baseRoadNumber)
+    : SimpleRoadShieldParser(baseRoadNumber, {{"D", RoadShieldType::Generic_Red}, {"R", RoadShieldType::Generic_Red}})
+  {}
+};
+
+class SloveniaRoadShieldParser : public SimpleRoadShieldParser
+{
+public:
+  explicit SloveniaRoadShieldParser(std::string const & baseRoadNumber)
+    : SimpleRoadShieldParser(baseRoadNumber, {{"A", RoadShieldType::Generic_Green}})
+  {}
+};
+
+class SwitzerlandRoadShieldParser : public SimpleRoadShieldParser
+{
+public:
+  explicit SwitzerlandRoadShieldParser(std::string const & baseRoadNumber)
+    : SimpleRoadShieldParser(baseRoadNumber, {{"A", RoadShieldType::Generic_Red}})
+  {}
+};
+
+class LiechtensteinRoadShieldParser : public SimpleRoadShieldParser
+{
+public:
+  explicit LiechtensteinRoadShieldParser(std::string const & baseRoadNumber)
+    : SimpleRoadShieldParser(baseRoadNumber, {{"A", RoadShieldType::Generic_Red}})
+  {}
 };
 
 class RussiaRoadShieldParser : public DefaultTypeRoadShieldParser
@@ -655,6 +774,32 @@ RoadShieldsSetT GetRoadShields(std::string const & mwmName, std::string const &
     return IndiaRoadShieldParser(roadNumber).GetRoadShields();
   if (mwmName == "Austria")
     return AustriaRoadShieldParser(roadNumber).GetRoadShields();
+  if (mwmName == "Belgium")
+    return BelgiumRoadShieldParser(roadNumber).GetRoadShields();
+  if (mwmName == "Greece")
+    return GreeceRoadShieldParser(roadNumber).GetRoadShields();
+  if (mwmName == "Ireland")
+    return IrelandRoadShieldParser(roadNumber).GetRoadShields();
+  if (mwmName == "Italy")
+    return ItalyRoadShieldParser(roadNumber).GetRoadShields();
+  if (mwmName == "Lativa")
+    return LativaRoadShieldParser(roadNumber).GetRoadShields();
+  if (mwmName == "Moldova")
+    return MoldovaRoadShieldParser(roadNumber).GetRoadShields();
+  if (mwmName == "Portugal")
+    return PortugalRoadShieldParser(roadNumber).GetRoadShields();
+  if (mwmName == "Romania")
+    return RomaniaRoadShieldParser(roadNumber).GetRoadShields();
+  if (mwmName == "Serbia")
+    return SerbiaRoadShieldParser(roadNumber).GetRoadShields();
+  if (mwmName == "Slovakia")
+    return SlovakiaRoadShieldParser(roadNumber).GetRoadShields();
+  if (mwmName == "Slovenia")
+    return SloveniaRoadShieldParser(roadNumber).GetRoadShields();
+  if (mwmName == "Switzerland")
+    return SwitzerlandRoadShieldParser(roadNumber).GetRoadShields();
+  if (mwmName == "Liechtenstein")
+    return LiechtensteinRoadShieldParser(roadNumber).GetRoadShields();
   if (mwmName == "Russia")
     return RussiaRoadShieldParser(roadNumber).GetRoadShields();
   if (mwmName == "France")

From 8ef68a5559abd118d6c9d767a3bf03edcd86b618 Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Thu, 14 Aug 2025 21:06:52 -0300
Subject: [PATCH 096/302] [style] Set line rules for highway=ladder.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 data/styles/default/include/Roads.mapcss         | 16 +++++++++++-----
 .../default/include/priorities_3_FG.prio.txt     |  1 +
 .../include/priorities_4_overlays.prio.txt       |  3 +--
 data/styles/outdoors/include/Roads.mapcss        |  7 +++++++
 .../outdoors/include/priorities_3_FG.prio.txt    |  1 +
 .../include/priorities_4_overlays.prio.txt       |  3 +--
 data/styles/vehicle/include/Roads.mapcss         |  1 +
 .../vehicle/include/priorities_3_FG.prio.txt     |  1 +
 8 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/data/styles/default/include/Roads.mapcss b/data/styles/default/include/Roads.mapcss
index d11f1749f..8ffa89e11 100644
--- a/data/styles/default/include/Roads.mapcss
+++ b/data/styles/default/include/Roads.mapcss
@@ -726,6 +726,7 @@ line|z15-[highway=footway],
 {color: @footway;opacity: 0.9;}
 line|z16-[highway=footway],
 {opacity: 0.95;}
+line|z15-[highway=ladder],
 line|z15-[highway=steps],
 {color: @residential;opacity: 1;}
 line|z15-[highway=path],
@@ -1032,15 +1033,20 @@ line|z17-[highway=footway][bridge?]::bridgeblack
 
 /* 8.8 Steps 15-22 ZOOM */
 
-line|z15[highway=steps]
+line|z15[highway=ladder],
+line|z15[highway=steps],
 {width: 2.4; dashes: 1.5,1.3;}
-line|z16[highway=steps]
+line|z16[highway=ladder],
+line|z16[highway=steps],
 {width: 4; dashes: 1.8,1.6;}
-line|z17-[highway=steps]
+line|z17-[highway=ladder],
+line|z17-[highway=steps],
 {width: 6; dashes: 2.5,2.2; opacity: 1;}
-line|z18[highway=steps]
+line|z18[highway=ladder],
+line|z18[highway=steps],
 {width: 8; dashes: 3.2,2.8;}
-line|z19-[highway=steps]
+line|z19-[highway=ladder],
+line|z19-[highway=steps],
 {width: 10; dashes: 4,3.5;}
 
 line|z17-[highway=steps][tunnel?]::tunnelBackground
diff --git a/data/styles/default/include/priorities_3_FG.prio.txt b/data/styles/default/include/priorities_3_FG.prio.txt
index 25584f1e5..4884b9040 100644
--- a/data/styles/default/include/priorities_3_FG.prio.txt
+++ b/data/styles/default/include/priorities_3_FG.prio.txt
@@ -45,6 +45,7 @@ power-line                                          # line z19- (also has line::
 power-line::dash                                    # line::dash z19- (also has line z19-)
 === 340
 
+highway-ladder                                      # line z15- (also has icon z17-, pathtext z17-)
 highway-steps                                       # line z15- (also has pathtext z16-)
 highway-steps-bridge                                # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z16-)
 highway-steps-tunnel                                # line z15- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z16-)
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index b73a64279..c3f474d6a 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -1096,7 +1096,7 @@ amenity-nursing_home                                # icon z17- (also has captio
 amenity-prison                                      # icon z17- (also has caption(optional) z17-, area z12-)
 amenity-social_facility                             # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-waste_transfer_station                      # icon z17- (also has caption(optional) z19-, area z13-)
-highway-ladder                                      # icon z17- (also has caption(optional) z17-)
+highway-ladder                                      # icon z17- and pathtext z17- (also has line z15-)
 historic-ruins                                      # icon z17- (also has caption(optional) z17-)
 landuse-farmland                                    # caption z15- (also has area z10-)
 landuse-garages                                     # caption z15- (also has area z13-)
@@ -2046,7 +2046,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-prison                                    # caption(optional) z17- (also has icon z17-, area z12-)
 # amenity-social_facility                           # caption(optional) z17- (also has icon z17-, area z15-)
 # amenity-waste_transfer_station                    # caption(optional) z19- (also has icon z17-, area z13-)
-# highway-ladder                                    # caption(optional) z17- (also has icon z17-)
 # historic-ruins                                    # caption(optional) z17- (also has icon z17-)
 # leisure-ice_rink                                  # caption(optional) z17- (also has icon z17-)
 # leisure-pitch                                     # caption(optional) z17- (also has icon z17-, area z15-)
diff --git a/data/styles/outdoors/include/Roads.mapcss b/data/styles/outdoors/include/Roads.mapcss
index ab16d9794..f08f1305d 100644
--- a/data/styles/outdoors/include/Roads.mapcss
+++ b/data/styles/outdoors/include/Roads.mapcss
@@ -87,6 +87,7 @@ line|z11-[highway=track],
 
 /* Its not unusual for trails to be tagged as footways, e.g. in UK */
 line|z11-[highway=footway],
+line|z12-[highway=ladder],
 line|z12-[highway=steps],
 {color: @footway; opacity: 1;}
 
@@ -130,6 +131,7 @@ line|z11[highway=path],
 {width: 1; dashes: 3.5,2; opacity: 0.6;}
 line|z12[highway=footway],
 /* Make steps on z12-14 look same as footways, z15- follows main style */
+line|z12[highway=ladder],
 line|z12[highway=steps],
 {width: 1.1; dashes: 3.5,2;}
 line|z12[highway=path],
@@ -138,13 +140,18 @@ line|z12[piste:type=hike],
 line|z13[highway=path],
 line|z13[piste:type=hike],
 line|z13[highway=footway],
+line|z13[highway=ladder],
 line|z13[highway=steps],
 {width: 1.3; dashes: 4,2.5;}
 line|z14[highway=path],
 line|z14[piste:type=hike],
 line|z14[highway=footway],
+line|z14[highway=ladder],
 line|z14[highway=steps],
 {width: 1.6; dashes: 4,2.5;}
+
+/* steps and ladder from z15 are set in default style */
+
 line|z15[highway=path],
 line|z15[piste:type=hike],
 line|z15[highway=footway],
diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt
index 7cce6bdb9..e2b56fcbc 100644
--- a/data/styles/outdoors/include/priorities_3_FG.prio.txt
+++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt
@@ -47,6 +47,7 @@ power-line::dash                                    # line::dash z13- (also has
 power-minor_line::dash                              # line::dash z15- (also has line z15-)
 === 340
 
+highway-ladder                                      # line z12- (also has icon z16-, pathtext z17-)
 highway-steps                                       # line z12- (also has pathtext z13-)
 highway-steps-bridge                                # line z12- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-)
 highway-steps-tunnel                                # line z12- (also has line::tunnelBackground z17-, line::tunnelCasing z17-, pathtext z13-)
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 1af9d05fc..2477a717d 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -1097,7 +1097,7 @@ amenity-nursing_home                                # icon z17- (also has captio
 amenity-prison                                      # icon z17- (also has caption(optional) z17-, area z12-)
 amenity-social_facility                             # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-waste_transfer_station                      # icon z17- (also has caption(optional) z19-, area z13-)
-highway-ladder                                      # icon z16- (also has caption(optional) z17-)
+highway-ladder                                      # icon z16- and pathtext z17- (also has line z12-)
 historic-ruins                                      # icon z17- (also has caption(optional) z17-)
 landuse-farmland                                    # caption z15- (also has area z10-)
 landuse-garages                                     # caption z15- (also has area z13-)
@@ -2049,7 +2049,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-prison                                    # caption(optional) z17- (also has icon z17-, area z12-)
 # amenity-social_facility                           # caption(optional) z17- (also has icon z17-, area z15-)
 # amenity-waste_transfer_station                    # caption(optional) z19- (also has icon z17-, area z13-)
-# highway-ladder                                    # caption(optional) z17- (also has icon z16-)
 # historic-ruins                                    # caption(optional) z17- (also has icon z17-)
 # leisure-ice_rink                                  # caption(optional) z17- (also has icon z17-)
 # leisure-pitch                                     # caption(optional) z17- (also has icon z17-, area z15-)
diff --git a/data/styles/vehicle/include/Roads.mapcss b/data/styles/vehicle/include/Roads.mapcss
index 2abb8253e..93aa63548 100644
--- a/data/styles/vehicle/include/Roads.mapcss
+++ b/data/styles/vehicle/include/Roads.mapcss
@@ -640,6 +640,7 @@ line|z19-[highway=construction],
 /* 8.7 Footway & Steps 18-22 ZOOM */
 
 line|z18-[highway=footway],
+line|z18-[highway=ladder],
 line|z18-[highway=steps],
 {color: @footway; opacity: 0.7; width: 1.5; dashes: 5,2;}
 
diff --git a/data/styles/vehicle/include/priorities_3_FG.prio.txt b/data/styles/vehicle/include/priorities_3_FG.prio.txt
index 72af66213..f04f8c2e3 100644
--- a/data/styles/vehicle/include/priorities_3_FG.prio.txt
+++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt
@@ -15,6 +15,7 @@
 historic-citywalls                                  # line z15-
 === 280
 
+highway-ladder                                      # line z18-
 highway-steps                                       # line z18-
 highway-steps-bridge                                # line z18-
 hwtag-oneway::arrows                                # line::arrows z15-

From c7592276f73dc2b99b32ea1437ae4b4308c49b6d Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Thu, 14 Aug 2025 21:31:15 -0300
Subject: [PATCH 097/302] [classifier] Added highway=ladder to the routing and
 other checkers.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 generator/generator_tests/osm_type_test.cpp                     | 1 +
 libs/indexer/ftypes_matcher.cpp                                 | 2 ++
 libs/routing_common/bicycle_model.cpp                           | 1 +
 libs/routing_common/pedestrian_model.cpp                        | 2 ++
 libs/routing_common/routing_common_tests/vehicle_model_test.cpp | 2 ++
 libs/routing_common/vehicle_model.cpp                           | 2 ++
 libs/routing_common/vehicle_model.hpp                           | 1 +
 7 files changed, 11 insertions(+)

diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp
index f00733e86..2a4aa7827 100644
--- a/generator/generator_tests/osm_type_test.cpp
+++ b/generator/generator_tests/osm_type_test.cpp
@@ -2311,6 +2311,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
       {"highway", "cycleway"},
       {"highway", "footway"},
       {"highway", "ford"},
+      {"highway", "ladder"},
       {"highway", "living_street"},
       {"highway", "motorway"},
       {"highway", "motorway_junction"},
diff --git a/libs/indexer/ftypes_matcher.cpp b/libs/indexer/ftypes_matcher.cpp
index 485528c35..256d70cd4 100644
--- a/libs/indexer/ftypes_matcher.cpp
+++ b/libs/indexer/ftypes_matcher.cpp
@@ -61,6 +61,7 @@ public:
     m_map[c.GetTypeByPath({"highway", "pedestrian"})] = HighwayClass::Pedestrian;
     m_map[c.GetTypeByPath({"highway", "footway"})] = HighwayClass::Pedestrian;
     m_map[c.GetTypeByPath({"highway", "bridleway"})] = HighwayClass::Pedestrian;
+    m_map[c.GetTypeByPath({"highway", "ladder"})] = HighwayClass::Pedestrian;
     m_map[c.GetTypeByPath({"highway", "steps"})] = HighwayClass::Pedestrian;
     m_map[c.GetTypeByPath({"highway", "cycleway"})] = HighwayClass::Pedestrian;
     m_map[c.GetTypeByPath({"highway", "path"})] = HighwayClass::Pedestrian;
@@ -327,6 +328,7 @@ IsWayChecker::IsWayChecker()
       {"secondary", Regular},
       {"secondary_link", Regular},
       {"service", Minors},
+      {"ladder", Pedestrian},
       {"steps", Pedestrian},
       {"tertiary", Regular},
       {"tertiary_link", Regular},
diff --git a/libs/routing_common/bicycle_model.cpp b/libs/routing_common/bicycle_model.cpp
index 063026be9..e016b8051 100644
--- a/libs/routing_common/bicycle_model.cpp
+++ b/libs/routing_common/bicycle_model.cpp
@@ -86,6 +86,7 @@ VehicleModel::LimitsInitList const kDefaultOptions = {
     {HighwayType::HighwayCycleway, true},
     {HighwayType::HighwayResidential, true},
     {HighwayType::HighwayLivingStreet, true},
+    // HighwayLadder is missing
     {HighwayType::HighwaySteps, true},
     {HighwayType::HighwayPedestrian, true},
     {HighwayType::HighwayFootway, true},
diff --git a/libs/routing_common/pedestrian_model.cpp b/libs/routing_common/pedestrian_model.cpp
index 656332a3d..5234cc02f 100644
--- a/libs/routing_common/pedestrian_model.cpp
+++ b/libs/routing_common/pedestrian_model.cpp
@@ -41,6 +41,7 @@ HighwayBasedSpeeds const kDefaultSpeeds = {
     {HighwayType::HighwayResidential, InOutCitySpeedKMpH(SpeedKMpH(4.5, 5.0))},
 
     {HighwayType::HighwayBridleway, InOutCitySpeedKMpH(SpeedKMpH(1.0, 5.0))},
+    {HighwayType::HighwayLadder, InOutCitySpeedKMpH(SpeedKMpH(1.0))},
     {HighwayType::HighwaySteps, InOutCitySpeedKMpH(SpeedKMpH(3.0))},
     {HighwayType::HighwayCycleway, InOutCitySpeedKMpH(SpeedKMpH(4.0, 5.0))},
 
@@ -80,6 +81,7 @@ VehicleModel::LimitsInitList const kDefaultOptions = {
     // HighwayBridleway, HighwayCycleway are missing
     {HighwayType::HighwayResidential, true},
     {HighwayType::HighwayLivingStreet, true},
+    {HighwayType::HighwayLadder, true},
     {HighwayType::HighwaySteps, true},
     {HighwayType::HighwayPedestrian, true},
     {HighwayType::HighwayFootway, true},
diff --git a/libs/routing_common/routing_common_tests/vehicle_model_test.cpp b/libs/routing_common/routing_common_tests/vehicle_model_test.cpp
index 66462fda4..caf501444 100644
--- a/libs/routing_common/routing_common_tests/vehicle_model_test.cpp
+++ b/libs/routing_common/routing_common_tests/vehicle_model_test.cpp
@@ -485,6 +485,7 @@ UNIT_TEST(VehicleModel_HighwayType_Values)
   TEST(check(HighwayType::HighwayMotorwayLink, {"highway", "motorway_link"}), ());
   TEST(check(HighwayType::HighwayLivingStreet, {"highway", "living_street"}), ());
   TEST(check(HighwayType::HighwayMotorway, {"highway", "motorway"}), ());
+  TEST(check(HighwayType::HighwayLadder, {"highway", "ladder"}), ());
   TEST(check(HighwayType::HighwaySteps, {"highway", "steps"}), ());
   TEST(check(HighwayType::HighwayTrunk, {"highway", "trunk"}), ());
   TEST(check(HighwayType::HighwayPedestrian, {"highway", "pedestrian"}), ());
@@ -495,6 +496,7 @@ UNIT_TEST(VehicleModel_HighwayType_Values)
   TEST(check(HighwayType::HighwaySecondaryLink, {"highway", "secondary_link"}), ());
   TEST(check(HighwayType::RouteFerry, {"route", "ferry"}), ());
   TEST(check(HighwayType::HighwayTertiaryLink, {"highway", "tertiary_link"}), ());
+  TEST(check(HighwayType::HighwayLadder, {"highway", "ladder"}), ());
   TEST(check(HighwayType::HighwayBusway, {"highway", "busway"}), ());
   TEST(check(HighwayType::RouteShuttleTrain, {"route", "shuttle_train"}), ());
 }
diff --git a/libs/routing_common/vehicle_model.cpp b/libs/routing_common/vehicle_model.cpp
index 3c94d0613..803c10cf2 100644
--- a/libs/routing_common/vehicle_model.cpp
+++ b/libs/routing_common/vehicle_model.cpp
@@ -301,6 +301,7 @@ HighwayBasedFactors GetOneFactorsForBicycleAndPedestrianModel()
       {HighwayType::HighwayCycleway, InOutCityFactor(1.0)},
       {HighwayType::HighwayResidential, InOutCityFactor(1.0)},
       {HighwayType::HighwayLivingStreet, InOutCityFactor(1.0)},
+      {HighwayType::HighwayLadder, InOutCityFactor(1.0)},
       {HighwayType::HighwaySteps, InOutCityFactor(1.0)},
       {HighwayType::HighwayPedestrian, InOutCityFactor(1.0)},
       {HighwayType::HighwayFootway, InOutCityFactor(1.0)},
@@ -363,6 +364,7 @@ string DebugPrint(HighwayType type)
   case HighwayType::HighwayMotorwayLink: return "highway-motorway_link";
   case HighwayType::HighwayLivingStreet: return "highway-living_street";
   case HighwayType::HighwayMotorway: return "highway-motorway";
+  case HighwayType::HighwayLadder: return "highway-ladder";
   case HighwayType::HighwaySteps: return "highway-steps";
   case HighwayType::HighwayTrunk: return "highway-trunk";
   case HighwayType::HighwayPedestrian: return "highway-pedestrian";
diff --git a/libs/routing_common/vehicle_model.hpp b/libs/routing_common/vehicle_model.hpp
index 3303854ba..03c38965e 100644
--- a/libs/routing_common/vehicle_model.hpp
+++ b/libs/routing_common/vehicle_model.hpp
@@ -54,6 +54,7 @@ enum class HighwayType : uint16_t
   HighwaySecondaryLink = 176,
   RouteFerry = 259,
   HighwayTertiaryLink = 272,
+  HighwayLadder = 478,
   HighwayBusway = 857,  // reserve type here, but this type is not used for any routing by default
   RouteShuttleTrain = 1054,
 };

From 7536591ca45847f0cf526999b4f4a13882297d84 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Tue, 19 Aug 2025 22:53:00 +0700
Subject: [PATCH 098/302] [routing] Make ladder and steps speed slower

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 libs/routing_common/pedestrian_model.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libs/routing_common/pedestrian_model.cpp b/libs/routing_common/pedestrian_model.cpp
index 5234cc02f..d0ae676b5 100644
--- a/libs/routing_common/pedestrian_model.cpp
+++ b/libs/routing_common/pedestrian_model.cpp
@@ -41,8 +41,8 @@ HighwayBasedSpeeds const kDefaultSpeeds = {
     {HighwayType::HighwayResidential, InOutCitySpeedKMpH(SpeedKMpH(4.5, 5.0))},
 
     {HighwayType::HighwayBridleway, InOutCitySpeedKMpH(SpeedKMpH(1.0, 5.0))},
-    {HighwayType::HighwayLadder, InOutCitySpeedKMpH(SpeedKMpH(1.0))},
-    {HighwayType::HighwaySteps, InOutCitySpeedKMpH(SpeedKMpH(3.0))},
+    {HighwayType::HighwayLadder, InOutCitySpeedKMpH(SpeedKMpH(0.5))},
+    {HighwayType::HighwaySteps, InOutCitySpeedKMpH(SpeedKMpH(2.5))},
     {HighwayType::HighwayCycleway, InOutCitySpeedKMpH(SpeedKMpH(4.0, 5.0))},
 
     {HighwayType::HighwayTrack, InOutCitySpeedKMpH(SpeedKMpH(5.0))},

From 139facfb00f0d6bc28e3e02f37b241025e5a6a33 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Tue, 19 Aug 2025 18:49:16 +0200
Subject: [PATCH 099/302] [iOS] Remove old translations about osm re-auth

Signed-off-by: jeanbaptisteC <jeanbaptiste.charron@outlook.fr>
---
 iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/ast.lproj/Localizable.strings   | 2 --
 iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/bn.lproj/Localizable.strings    | 2 --
 iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/cy.lproj/Localizable.strings    | 2 --
 iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings | 5 -----
 iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings | 5 -----
 iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/gl.lproj/Localizable.strings    | 2 --
 iphone/Maps/LocalizedStrings/gsw.lproj/Localizable.strings   | 2 --
 iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/hr.lproj/Localizable.strings    | 2 --
 iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/ia.lproj/Localizable.strings    | 2 --
 iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/is.lproj/Localizable.strings    | 2 --
 iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/kab.lproj/Localizable.strings   | 2 --
 iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/ml.lproj/Localizable.strings    | 2 --
 iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings | 5 -----
 iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings    | 5 -----
 iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings    | 5 -----
 .../Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings  | 5 -----
 .../Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings  | 5 -----
 57 files changed, 255 deletions(-)

diff --git a/iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings
index 66dfa12e4..ef7902f6b 100644
--- a/iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings
@@ -751,11 +751,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Gestoor";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Meld asseblief aan by OpenStreetMap om al jou kaartwysigings outomaties op te laai. Kom meer te wete";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "hier";
 "core_entrance" = "Ingang";
 "error_enter_correct_name" = "Voer asb. ’n korrekte naam in";
 "bookmark_lists" = "Lyste";
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index db35932b7..c577d42d6 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -751,11 +751,6 @@
 /* Title for button when a route was saved. */
 "saved" = "تم الحفظ";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "برجاء تسجيل الدخول إلى OpenStreetMap لتحميل جميع تعديلات الخريطة تلقائيًا. تعرف على المزيد";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "هنا";
 "core_entrance" = "المدخل";
 "error_enter_correct_name" = "الرجاء إدخال اسم صحيح";
 "bookmark_lists" = "قوائم";
diff --git a/iphone/Maps/LocalizedStrings/ast.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ast.lproj/Localizable.strings
index f57d31779..842f9035f 100644
--- a/iphone/Maps/LocalizedStrings/ast.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ast.lproj/Localizable.strings
@@ -218,7 +218,6 @@
 "osm_profile_register" = "Register at OpenStreetMap";
 "osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap";
 "mi" = "mi";
-"alert_reauth_message_ios" = "Please login to OpenStreetMap to automatically upload all your map edits. Learn more";
 "planning_route_remove_title" = "Drag here to remove";
 "sort_distance" = "Sort by distance";
 "downloader_search_results" = "Found";
@@ -246,7 +245,6 @@
 "downloader_process" = "Downloading %@…";
 "bookmark_lists_hide_all" = "Hide all";
 "downloader_applying" = "Applying %@…";
-"alert_reauth_link_text_ios" = "here";
 "bookmarks_error_title_share_empty" = "Sharing error";
 "bookmarks_error_title_list_name_already_taken" = "This name is already taken";
 "downloader_percent" = "%@ (%@ of %@)";
diff --git a/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings
index 15b0d38f2..eab8ca4c6 100644
--- a/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings
@@ -755,11 +755,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Saxlandı";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Bütün xəritə redaktələrinizi avtomatik yükləmək üçün OpenStreetMap-a daxil olun";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "burada";
 "core_entrance" = "Giriş";
 "error_enter_correct_name" = "Düzgün ad daxil edin";
 "bookmark_lists" = "Siyahılar";
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
index 5750846da..70608d393 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
@@ -752,11 +752,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Захавана";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Калі ласка, увайдзіце ў OpenStreetMap, каб аўтаматычна загрузіць усе вашыя праўкі карты. Даведайцеся больш";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "тут";
 "core_entrance" = "Уваход";
 "error_enter_correct_name" = "Увядзіце правільную назву";
 "bookmark_lists" = "Спісы";
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
index b80d95ae4..17b056fe5 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
@@ -752,11 +752,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Запазено";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Моля, влезте в OpenStreetMap, за да качвате автоматично всичките си редакции на картата. Научете повече";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "тук";
 "core_entrance" = "Вход";
 "error_enter_correct_name" = "Моля, въведете правилно име";
 "bookmark_lists" = "Списъци";
diff --git a/iphone/Maps/LocalizedStrings/bn.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bn.lproj/Localizable.strings
index a0708a056..96e614d15 100644
--- a/iphone/Maps/LocalizedStrings/bn.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bn.lproj/Localizable.strings
@@ -146,8 +146,6 @@
 "core_entrance" = "Entrance";
 "bookmarks_import" = "Import Bookmarks and Tracks";
 "bookmark_lists_hide_all" = "Hide all";
-"alert_reauth_link_text_ios" = "here";
-"alert_reauth_message_ios" = "Please login to OpenStreetMap to automatically upload all your map edits. Learn more";
 "bookmark_lists" = "Lists";
 "bookmarks_create_new_group" = "Create a new list";
 "error_enter_correct_name" = "Please enter a correct name";
diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
index 16050613a..3fe50164e 100644
--- a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
@@ -752,11 +752,6 @@
 /* Title for button when a route was saved. */
 "saved" = "S'ha desat";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Si us plau, inicieu sessió a OpenStreetMap per carregar automàticament totes les edicions de mapes. Més informació";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "aquí";
 "core_entrance" = "Entrada";
 "error_enter_correct_name" = "Introduïu un nom correcte";
 "bookmark_lists" = "Llistes";
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index f06217527..4636899f6 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -758,11 +758,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Uloženo";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Přihlaste se do OpenStreetMap, abyste mohli automaticky nahrávat všechny své úpravy mapy. Více informací";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "zde";
 "core_entrance" = "Vstup";
 "error_enter_correct_name" = "Zadejte prosím správný název";
 "bookmark_lists" = "Seznamy";
diff --git a/iphone/Maps/LocalizedStrings/cy.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cy.lproj/Localizable.strings
index a6b3569fb..2f648e822 100644
--- a/iphone/Maps/LocalizedStrings/cy.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cy.lproj/Localizable.strings
@@ -193,7 +193,6 @@
 "planning_route_remove_title" = "Drag here to remove";
 "p2p_your_location" = "Eich Lleoliad";
 "category_transport" = "Trafnidiaeth";
-"alert_reauth_link_text_ios" = "here";
 "text_more_button" = "…more";
 "downloader_of" = "%1$d o %2$d";
 "mobile_data_option_ask" = "Gofyn Bob Amser";
@@ -256,7 +255,6 @@
 "pref_appearance_light" = "Golau";
 "dialog_routing_change_end" = "Addasu cylchfan";
 "planning_route_manage_route" = "Rheoli Llwybr";
-"alert_reauth_message_ios" = "Please login to OpenStreetMap to automatically upload all your map edits. Learn more";
 "place_name" = "Enw Lle";
 "navigation_stop_button" = "Stopio";
 "load_kmz_successful" = "Bookmarks loaded successfully! You can find them on the map or on the Bookmarks Manager screen.";
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
index 41944b243..70b44b560 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -755,11 +755,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Gemt";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Log ind på OpenStreetMap for automatisk at uploade alle dine kortredigeringer. Få mere at vide";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "her";
 "core_entrance" = "Indgang";
 "error_enter_correct_name" = "Angiv et korrekt navn";
 "bookmark_lists" = "Lister";
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
index ea537d031..0e85295d3 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -760,11 +760,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Gespeichert";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Bitte melde dich bei OpenStreetMap an, um alle deine Kartenbearbeitungen automatisch hochzuladen. Erfahre mehr";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "hier";
 "core_entrance" = "Eingang";
 "error_enter_correct_name" = "Bitte geben Sie einen korrekten Namen ein";
 "bookmark_lists" = "Listen";
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
index 288d27881..acf52facb 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -752,11 +752,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Αποθηκεύτηκε";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Παρακαλούμε συνδεθείτε στο OpenStreetMap για να ανεβάσετε αυτόματα όλες τις επεξεργασίες του χάρτη σας. Μάθετε περισσότερα";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "εδώ";
 "core_entrance" = "Είσοδος";
 "error_enter_correct_name" = "Εισάγετε ένα σωστό όνομα";
 "bookmark_lists" = "Λίστες";
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
index 440cdf61f..33b8c12a0 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -771,11 +771,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Saved";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Please login to OpenStreetMap to automatically upload all your map edits. Learn more";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "here";
 "core_entrance" = "Entrance";
 "error_enter_correct_name" = "Please enter a correct name";
 "bookmark_lists" = "Lists";
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
index fc2f760c8..494788128 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@@ -790,11 +790,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Saved";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Please login to OpenStreetMap to automatically upload all your map edits. Learn more";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "here";
 "core_entrance" = "Entrance";
 "error_enter_correct_name" = "Please enter a correct name";
 "bookmark_lists" = "Lists";
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
index 9e23ee69e..a576dbc9c 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -755,11 +755,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Guardado";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Inicie sesión en OpenStreetMap para cargar automáticamente todas las ediciones de su mapa. Obtenga más información";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "aquí";
 "core_entrance" = "Entrada";
 "error_enter_correct_name" = "Introduzca el nombre correcto";
 "bookmark_lists" = "Listas";
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index 2df15d30d..ae2df2408 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -758,11 +758,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Guardado";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Inicia sesión en OpenStreetMap para cargar automáticamente todas tus ediciones de mapas. Más información";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "aquí";
 "core_entrance" = "Entrada";
 "error_enter_correct_name" = "Por favor, introduce un nombre válido";
 "bookmark_lists" = "Listas";
diff --git a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
index 75da5bc44..48f213853 100644
--- a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
@@ -756,11 +756,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Salvestatud";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Oma kaardimuudatuste automaatseks üleslaadimiseks palun logi sisse OpenStreetMappi. Lisateave";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "kuskil siin";
 "core_entrance" = "Sissepääs";
 "error_enter_correct_name" = "Palun sisesta korrektne nimi";
 "bookmark_lists" = "Loendid";
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
index af9bb3243..894851360 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
@@ -755,11 +755,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Gordeta";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Hasi saioa OpenStreetMap-en zure mapen aldaketa guztiak automatikoki kargatzeko. Lortu informazio gehiago";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "hemen";
 "core_entrance" = "Sarrera";
 "error_enter_correct_name" = "Mesedez, idatzi baliozko izen bat";
 "bookmark_lists" = "Zerrendak";
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
index 4d4d4b885..979ef3b24 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -752,11 +752,6 @@
 /* Title for button when a route was saved. */
 "saved" = "ذخیره شد";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "لطفاً به OpenStreetMap وارد شوید تا به طور خودکار تمام ویرایش های نقشه خود را آپلود کنید. یادگیری بیشتر";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "اینجا";
 "core_entrance" = "ورودی";
 "error_enter_correct_name" = "لطفا نام صحیح را وارد کنید";
 "bookmark_lists" = "لیست‌ها";
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index 25cc0e96a..e44345c63 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -758,11 +758,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Tallennettu";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Kirjaudu sisään OpenStreetMapiin, jotta voit ladata kaikki karttamuutoksesi automaattisesti. Lisätietoja";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "täältä";
 "core_entrance" = "Sisäänkäynti";
 "error_enter_correct_name" = "Anna oikea nimi";
 "bookmark_lists" = "Luettelot";
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index d68ca0b04..b77364fce 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -758,11 +758,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Enregistré";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Connecte-toi à OpenStreetMap pour télécharger automatiquement toutes tes modifications de cartes. En savoir plus";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "ici";
 "core_entrance" = "Entrée";
 "error_enter_correct_name" = "Veuillez entrer un nom correct";
 "bookmark_lists" = "Listes";
diff --git a/iphone/Maps/LocalizedStrings/gl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/gl.lproj/Localizable.strings
index cfcd411bd..666d1e7f8 100644
--- a/iphone/Maps/LocalizedStrings/gl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/gl.lproj/Localizable.strings
@@ -366,8 +366,6 @@
 "planning_route_remove_title" = "Arrastre aquí para eliminar";
 "placepage_add_stop" = "Engadir parada";
 "start_from_my_position" = "Empezar desde";
-"alert_reauth_message_ios" = "Inicia sesión en OpenStreetMap para cargar automaticamente todas as túas edicións de mapas. Más información";
-"alert_reauth_link_text_ios" = "aquí";
 "core_entrance" = "Entrada";
 "error_enter_correct_name" = "Por favor, introduza o nome correcto";
 "bookmark_lists" = "Listas";
diff --git a/iphone/Maps/LocalizedStrings/gsw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/gsw.lproj/Localizable.strings
index fae48f087..8a3fc8414 100644
--- a/iphone/Maps/LocalizedStrings/gsw.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/gsw.lproj/Localizable.strings
@@ -494,8 +494,6 @@
 "log_file_size" = "Grössi vo de Protokolldatei: %@";
 "planning_route_remove_title" = "Dahi zieh zum Entferne";
 "start_from_my_position" = "Starte vo";
-"alert_reauth_message_ios" = "Bitte meld dich bi OpenStreetMap aa, zum all dini Chartebearbeitige automatisch ufezlade. Erfahr meh";
-"alert_reauth_link_text_ios" = "da";
 "downloader_hide_screen" = "Bildschirm uusblende";
 "downloader_percent" = "%@ (%@ vo %@)";
 "downloader_process" = "%@ abeglade…";
diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
index 416176651..e183a9a1f 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
@@ -752,11 +752,6 @@
 /* Title for button when a route was saved. */
 "saved" = "נשמר";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "התחבר ל-OpenStreetMap כדי להעלות אוטומטית את כל עריכות המפה שלך. למידע נוסף";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "כאן";
 "core_entrance" = "כניסה";
 "error_enter_correct_name" = "נא להזין שם תקין";
 "bookmark_lists" = "רשימות";
diff --git a/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings
index d97e63bc0..11d63e9e7 100644
--- a/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings
@@ -752,11 +752,6 @@
 /* Title for button when a route was saved. */
 "saved" = "सहेजी हुई";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "कृपया अपने सभी मानचित्र संपादनों को स्वचालित रूप से अपलोड करने के लिए OpenStreetMap पर लॉगिन करें। अधिक जानें";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "यहां";
 "core_entrance" = "Entrance";
 "error_enter_correct_name" = "Please enter a correct name";
 "bookmark_lists" = "सूचियों";
diff --git a/iphone/Maps/LocalizedStrings/hr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hr.lproj/Localizable.strings
index ffe003382..5efcb4eb8 100644
--- a/iphone/Maps/LocalizedStrings/hr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hr.lproj/Localizable.strings
@@ -270,7 +270,6 @@
 "planning_route_remove_title" = "Drag here to remove";
 "p2p_your_location" = "Your Location";
 "category_transport" = "Transport";
-"alert_reauth_link_text_ios" = "here";
 "text_more_button" = "…more";
 "downloader_of" = "%1$d of %2$d";
 "country_status_download_failed" = "Download has failed";
@@ -315,7 +314,6 @@
 "bookmarks_export" = "Export all Bookmarks and Tracks";
 "dialog_routing_change_end" = "Adjust destination";
 "planning_route_manage_route" = "Manage Route";
-"alert_reauth_message_ios" = "Please login to OpenStreetMap to automatically upload all your map edits. Learn more";
 "place_name" = "Place Name";
 "navigation_stop_button" = "Stop";
 "load_kmz_successful" = "Bookmarks loaded successfully! You can find them on the map or on the Bookmarks Manager screen.";
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index bb3e66c12..18aa32fa9 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -752,11 +752,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Mentett";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Jelentkezzen be az OpenStreetMap rendszerébe, hogy automatikusan feltölthesse az összes térképszerkesztését. Tudjon meg többet";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "itt";
 "core_entrance" = "Bejárat";
 "error_enter_correct_name" = "Adjon meg egy érvényes nevet";
 "bookmark_lists" = "Listák";
diff --git a/iphone/Maps/LocalizedStrings/ia.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ia.lproj/Localizable.strings
index 5e05d3159..fbce548d0 100644
--- a/iphone/Maps/LocalizedStrings/ia.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ia.lproj/Localizable.strings
@@ -132,8 +132,6 @@
 "bookmarks_import" = "Import Bookmarks and Tracks";
 "bookmark_lists_hide_all" = "Hide all";
 "downloader_applying" = "Applying %@…";
-"alert_reauth_link_text_ios" = "here";
-"alert_reauth_message_ios" = "Please login to OpenStreetMap to automatically upload all your map edits. Learn more";
 "bookmark_lists" = "Lists";
 "bookmarks_create_new_group" = "Create a new list";
 "downloader_percent" = "%@ (%@ of %@)";
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
index ebb192d5f..6d47552e7 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@@ -752,11 +752,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Disimpan";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Silahkan login ke OpenStreetMap untuk mengupload semua hasil edit peta Anda secara otomatis. Pelajari lebih lanjut";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "di sini";
 "core_entrance" = "Tempat masuk";
 "error_enter_correct_name" = "Harap masukkan nama yang benar";
 "bookmark_lists" = "Daftar";
diff --git a/iphone/Maps/LocalizedStrings/is.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/is.lproj/Localizable.strings
index 7e78c7d17..aa91439fd 100644
--- a/iphone/Maps/LocalizedStrings/is.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/is.lproj/Localizable.strings
@@ -298,7 +298,6 @@
 "mi" = "mi";
 "stop_track_recording" = "Stop Track Recording";
 "category_transport" = "Transport";
-"alert_reauth_link_text_ios" = "here";
 "text_more_button" = "…more";
 "mobile_data_option_ask" = "Always Ask";
 "country_status_download_failed" = "Download has failed";
@@ -339,7 +338,6 @@
 "pref_appearance_light" = "Light";
 "dialog_routing_change_end" = "Adjust destination";
 "planning_route_manage_route" = "Manage Route";
-"alert_reauth_message_ios" = "Please login to OpenStreetMap to automatically upload all your map edits. Learn more";
 "load_kmz_successful" = "Bookmarks loaded successfully! You can find them on the map or on the Bookmarks Manager screen.";
 "icloud_synchronization_error_cloud_is_unavailable" = "Error: iCloud is not available";
 "please_note" = "Please note";
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index 561bc2ef9..90d4b6f9d 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -751,11 +751,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Salvato";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Accedi a OpenStreetMap per caricare automaticamente tutte le tue modifiche alla mappa. Per saperne di più";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "qui";
 "core_entrance" = "Ingresso";
 "error_enter_correct_name" = "Inserire un nome corretto";
 "bookmark_lists" = "Elenchi";
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
index 08ed5972f..bd26f857c 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@@ -758,11 +758,6 @@
 /* Title for button when a route was saved. */
 "saved" = "保存しました";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "すべてのマップ編集を自動的にアップロードするには、OpenStreetMapにログインしてください。詳しくは";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "こちら";
 "core_entrance" = "入口";
 "error_enter_correct_name" = "正しい名前を入力してください";
 "bookmark_lists" = "リスト";
diff --git a/iphone/Maps/LocalizedStrings/kab.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/kab.lproj/Localizable.strings
index 27e1b0482..9339bfab0 100644
--- a/iphone/Maps/LocalizedStrings/kab.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/kab.lproj/Localizable.strings
@@ -109,8 +109,6 @@
 "downloader_hide_screen" = "Hide Screen";
 "core_entrance" = "Entrance";
 "bookmark_lists_hide_all" = "Hide all";
-"alert_reauth_link_text_ios" = "here";
-"alert_reauth_message_ios" = "Please login to OpenStreetMap to automatically upload all your map edits. Learn more";
 "bookmark_lists" = "Lists";
 "bookmarks_create_new_group" = "Create a new list";
 "error_enter_correct_name" = "Please enter a correct name";
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
index 3464bd0ad..4fc35dc08 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@@ -751,11 +751,6 @@
 /* Title for button when a route was saved. */
 "saved" = "저장됨";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "모든 지도 편집 내용을 자동으로 업로드하려면 오픈스트리트맵에 로그인하세요. 자세히 알아보기";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "여기";
 "core_entrance" = "입구";
 "error_enter_correct_name" = "올바른 이름을 입력하세요.";
 "bookmark_lists" = "목록";
diff --git a/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings
index cdfcf1bd5..669d5e325 100644
--- a/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings
@@ -755,11 +755,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Išsaugota";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Prisijunkite prie „OpenStreetMap“, kad galėtumėte automatiškai įkelti visus savo žemėlapio pakeitimus. Išsamesnė informacija –";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "čia";
 "core_entrance" = "Įėjimas";
 "error_enter_correct_name" = "Įveskite teisingą pavadinimą";
 "bookmark_lists" = "Sąrašai";
diff --git a/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings
index e436d2fd3..cf0bc47c5 100644
--- a/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings
@@ -752,11 +752,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Saglabāts";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Ierakstieties „OpenStreetMap“, lai automātiski augšupielādētu visus kartes rediģējumus. Uzziniet vairāk";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "te";
 "core_entrance" = "Ieeja";
 "error_enter_correct_name" = "Ierakstiet pareizu nosaukumu";
 "bookmark_lists" = "Saraksti";
diff --git a/iphone/Maps/LocalizedStrings/ml.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ml.lproj/Localizable.strings
index fe445308e..c427a6b17 100644
--- a/iphone/Maps/LocalizedStrings/ml.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ml.lproj/Localizable.strings
@@ -93,8 +93,6 @@
 "bookmarks_import" = "Import Bookmarks and Tracks";
 "bookmark_lists_hide_all" = "Hide all";
 "downloader_applying" = "Applying %@…";
-"alert_reauth_link_text_ios" = "here";
-"alert_reauth_message_ios" = "Please login to OpenStreetMap to automatically upload all your map edits. Learn more";
 "bookmark_lists" = "Lists";
 "bookmarks_create_new_group" = "Create a new list";
 "downloader_percent" = "%@ (%@ of %@)";
diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
index 0591568b7..6587155fb 100644
--- a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
@@ -749,11 +749,6 @@
 /* Title for button when a route was saved. */
 "saved" = "जतन केले";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "तुमची सर्व नकाशा संपादने स्वयंचलितपणे अपलोड करण्यासाठी कृपया OpenStreetMap वर लॉग इन करा. अधिक जाणून घ्या";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "येथे";
 "core_entrance" = "प्रवेशद्वार";
 "error_enter_correct_name" = "कृपया योग्य नाव प्रविष्ट करा";
 "bookmark_lists" = "याद्या";
diff --git a/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings
index b01aa404c..48511c7ea 100644
--- a/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings
@@ -751,11 +751,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Salvat";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Please login to OpenStreetMap to automatically upload all your map edits. Learn more";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "here";
 "core_entrance" = "Daħla";
 "error_enter_correct_name" = "Daħħal isem korrett";
 "bookmark_lists" = "Listi";
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index 8258df859..2007281f1 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -755,11 +755,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Lagret";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Logg inn på OpenStreetMap for automatisk å laste opp alle kartredigeringene dine. Finn ut mer";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "her";
 "core_entrance" = "Inngang";
 "error_enter_correct_name" = "Skriv inn korrekt navn";
 "bookmark_lists" = "Lister";
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index df18c4126..0bb54bda2 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -758,11 +758,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Opgeslagen";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Log in op OpenStreetMap om al je kaartbewerkingen automatisch te uploaden. Meer informatie";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "hier";
 "core_entrance" = "Ingang";
 "error_enter_correct_name" = "Voer een geldige naam in";
 "bookmark_lists" = "Lijsten";
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index 625d2d3cb..6d73795a2 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -755,11 +755,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Zapisano";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Zaloguj się do OpenStreetMap, aby automatycznie przesyłać wszystkie zmiany na mapie. Dowiedz się więcej";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "tutaj";
 "core_entrance" = "Wejście";
 "error_enter_correct_name" = "Wprowadź poprawną nazwę";
 "bookmark_lists" = "Listy";
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index 02ecdc95b..ed5fff207 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -758,11 +758,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Salvo";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Faça login no OpenStreetMap para carregar automaticamente todas as edições de mapas que você fizer. Saiba mais";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "aqui";
 "core_entrance" = "Entrada";
 "error_enter_correct_name" = "Por favor, digite um nome correto";
 "bookmark_lists" = "Listas";
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index d656ccbe2..ca6b42121 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -755,11 +755,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Guardado";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Por favor, faz o login no OpenStreetMap para carregar automaticamente todas as tuas edições de mapas. Sabe mais";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "aqui";
 "core_entrance" = "Entrada";
 "error_enter_correct_name" = "Introduza um nome correto";
 "bookmark_lists" = "Listas";
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index 13ec86a68..68711c3a5 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -752,11 +752,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Salvat";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Vă rugăm să vă conectați la OpenStreetMap pentru a încărca automat toate modificările aduse hărții. Aflați mai multe";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "aici";
 "core_entrance" = "Intrare";
 "error_enter_correct_name" = "Introdu un nume corect";
 "bookmark_lists" = "Liste";
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index ad6706803..b5555b414 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -758,11 +758,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Сохранено";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Пожалуйста войдите в аккаунт OpenStreetMap.org, чтобы публиковать ваши изменения карты. Подробности по";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "ссылке";
 "core_entrance" = "Вход";
 "error_enter_correct_name" = "Пожалуйста, введите название правильно";
 "bookmark_lists" = "Списки";
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
index 4527ac5ae..329a8305c 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@@ -752,11 +752,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Uložené";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Prihláste sa do OpenStreetMap, aby ste mohli automaticky nahrať všetky svoje úpravy mapy. Viac informácií sa dozviete";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "tade";
 "core_entrance" = "Vchod | vjazd";
 "error_enter_correct_name" = "Prosím, zadajte správne meno";
 "bookmark_lists" = "Zoznamy";
diff --git a/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings
index d17e8ac45..925a27aa0 100644
--- a/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings
@@ -755,11 +755,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Сачувано";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Молим вас да се улогујете на OpenStreetMap да бисте аутоматски послали све ваше промене на мапи. Сазнајте више";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "овде";
 "core_entrance" = "Улаз";
 "error_enter_correct_name" = "Молим Вас да унесете исправан назив";
 "bookmark_lists" = "Листе";
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
index 9d548188d..96bb0a6e0 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@@ -752,11 +752,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Sparad";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Logga in på OpenStreetMap för att automatiskt ladda upp alla dina kartredigeringar. Läs mer";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "här";
 "core_entrance" = "Ingång";
 "error_enter_correct_name" = "Ange ett korrekt namn";
 "bookmark_lists" = "Listor";
diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
index 7064b9a42..e8ae307bb 100644
--- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
@@ -742,11 +742,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Imehifadhiwa";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Tafadhali ingia kwenye OpenStreetMap ili kupakia kiotomatiki hariri zako zote za ramani. Pata maelezo zaidi";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "hapa";
 "core_entrance" = "Kiingilio";
 "error_enter_correct_name" = "Tafadhali, weka jina sahihi";
 "bookmark_lists" = "Orodha";
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
index 2dcb8670d..f4aef565f 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@@ -752,11 +752,6 @@
 /* Title for button when a route was saved. */
 "saved" = "บันทึกแล้ว";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "กรุณาเข้าสู่ระบบ OpenStreetMap เพื่ออัปโหลดการแก้ไขแผนที่ทั้งหมดของคุณโดยอัตโนมัติ เรียนรู้เพิ่มเติม";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "ที่นี่";
 "core_entrance" = "ทางเข้า";
 "error_enter_correct_name" = "กรุณาใส่ชื่อที่ถูกต้อง";
 "bookmark_lists" = "รายการ";
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index 9b6e41da3..a3cf2eaa6 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -758,11 +758,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Kaydedildi";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Tüm harita düzenlemelerinizi otomatik olarak yüklemek için lütfen OpenStreetMap'e giriş yapın. Daha fazla bilgi";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "burada";
 "core_entrance" = "Giriş";
 "error_enter_correct_name" = "Lütfen doğru ad girin";
 "bookmark_lists" = "Listeler";
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
index f5ffdfc7f..936cd1c5f 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -755,11 +755,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Збережено";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Будь ласка увійдіть в акаунт OpenStreetMap.org, щоб автоматично публікувати зміни до мапи. Подробиці за";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "посиланням";
 "core_entrance" = "Вхід";
 "error_enter_correct_name" = "Будь ласка, введіть коректне ім'я";
 "bookmark_lists" = "Списки";
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
index f49759c13..c813b8ba1 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@@ -751,11 +751,6 @@
 /* Title for button when a route was saved. */
 "saved" = "Đã lưu";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "Vui lòng đăng nhập vào OpenStreetMap để tự động tải lên tất cả các chỉnh sửa bản đồ của bạn. Tìm hiểu thêm";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "tại đây";
 "core_entrance" = "Lối vào";
 "error_enter_correct_name" = "Vui lòng nhập một tên chính xác";
 "bookmark_lists" = "Danh sách";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index ce32b97c8..54886764a 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -758,11 +758,6 @@
 /* Title for button when a route was saved. */
 "saved" = "已保存";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "请登录 OpenStreetMap 以自动上传您的所有地图编辑。了解更多";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "这里";
 "core_entrance" = "入口";
 "error_enter_correct_name" = "请输入正确的名称";
 "bookmark_lists" = "列表";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
index c13aadecf..7b44b6e12 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@@ -757,11 +757,6 @@
 /* Title for button when a route was saved. */
 "saved" = "已儲存";
 
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's first part */
-"alert_reauth_message_ios" = "請登入 OpenStreetMap 以自動上傳您的所有地圖編輯。了解更多";
-
-/* For iOS message 'alert_reauth_message' should be splitted in two parts: message + link. Here's link part */
-"alert_reauth_link_text_ios" = "這裡";
 "core_entrance" = "入口";
 "error_enter_correct_name" = "請輸入正確的名稱";
 "bookmark_lists" = "列表";

From fdb72c9d315087877d1e0fb584f6f9612b4d657f Mon Sep 17 00:00:00 2001
From: x7z4w <x7z4w@noreply.codeberg.org>
Date: Tue, 19 Aug 2025 18:20:04 +0000
Subject: [PATCH 100/302] [android] Remove BOM

Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>
---
 android/app/build.gradle                                       | 2 --
 android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp | 2 +-
 data/categories.txt                                            | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index 23da71be5..a46f3a8c1 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -138,8 +138,6 @@ android {
     disable 'MissingTranslation'
     // https://github.com/organicmaps/organicmaps/issues/3551
     disable 'MissingQuantity', 'UnusedQuantity'
-    // https://github.com/organicmaps/organicmaps/issues/3550
-    disable 'ByteOrderMark'
     // https://github.com/organicmaps/organicmaps/issues/1077
     disable 'CustomSplashScreen'
     // https://github.com/organicmaps/organicmaps/issues/3610
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp
index 7b65cee98..e1952788e 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp
@@ -1,4 +1,4 @@
-#include <jni.h>
+#include <jni.h>
 
 #include "app/organicmaps/sdk/Framework.hpp"
 #include "app/organicmaps/sdk/core/jni_helper.hpp"
diff --git a/data/categories.txt b/data/categories.txt
index 31f60e874..e6746653e 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -15559,7 +15559,7 @@ mr:दुचाकी पार्किंग
 
 amenity-parking_space-disabled|@category_parking
 en:Disabled Parking Space
-ar:ﺔﺻﺎﺨﻟﺍ ﺕﺎﺟﺎﻴﺘﺣﻻﺍ ﻱﻭﺬﻟ ﺕﺍﺭﺎﻴﺴﻟﺍ ﻑﻮﻗﻮﻟ ﻦﻛﺎﻣﺃ
+ar:موقف سيارات لذوي الإعاقة
 be:Паркоўка для інвалідаў
 bg:Паркомясто за инвалиди
 cs:Parkovací místo pro invalidy

From c30990ecda15f344ce1f584b10e4ba59171b2503 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Tue, 19 Aug 2025 20:12:47 +0200
Subject: [PATCH 101/302] [android] Fix deprecation in
 HoursMinutesPickerFragment

Signed-off-by: jeanbaptisteC <jeanbaptiste.charron@outlook.fr>
---
 .../java/app/organicmaps/editor/HoursMinutesPickerFragment.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/app/src/main/java/app/organicmaps/editor/HoursMinutesPickerFragment.java b/android/app/src/main/java/app/organicmaps/editor/HoursMinutesPickerFragment.java
index 7bad3f64d..b1566c407 100644
--- a/android/app/src/main/java/app/organicmaps/editor/HoursMinutesPickerFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/HoursMinutesPickerFragment.java
@@ -149,7 +149,7 @@ public class HoursMinutesPickerFragment extends BaseMwmDialogFragment
     tabView.setText(getResources().getString(R.string.editor_time_to));
     tabView.setTextColor(textColor);
     mTabs.addTab(mTabs.newTab().setCustomView(tabView), true);
-    mTabs.setOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
+    mTabs.addOnTabSelectedListener(new TabLayout.OnTabSelectedListener() {
       @Override
       public void onTabSelected(TabLayout.Tab tab)
       {

From dddbfa315de524a161f3d177107ffd861bd9d0a3 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Tue, 19 Aug 2025 18:29:10 +0200
Subject: [PATCH 102/302] [android] Drop OSM OAuth1 login

Signed-off-by: jeanbaptisteC <jeanbaptiste.charron@outlook.fr>
---
 .../java/app/organicmaps/MwmActivity.java     | 35 -------------------
 .../app/organicmaps/sdk/editor/OsmOAuth.java  | 15 --------
 .../app/src/main/res/values-af/strings.xml    |  2 --
 .../app/src/main/res/values-ar/strings.xml    |  2 --
 .../app/src/main/res/values-az/strings.xml    |  2 --
 .../app/src/main/res/values-be/strings.xml    |  2 --
 .../app/src/main/res/values-bg/strings.xml    |  2 --
 .../app/src/main/res/values-ca/strings.xml    |  2 --
 .../app/src/main/res/values-cs/strings.xml    |  2 --
 .../app/src/main/res/values-da/strings.xml    |  2 --
 .../app/src/main/res/values-de/strings.xml    |  2 --
 .../app/src/main/res/values-el/strings.xml    |  2 --
 .../src/main/res/values-es-rMX/strings.xml    |  2 --
 .../app/src/main/res/values-es/strings.xml    |  2 --
 .../app/src/main/res/values-et/strings.xml    |  2 --
 .../app/src/main/res/values-eu/strings.xml    |  2 --
 .../app/src/main/res/values-fa/strings.xml    |  2 --
 .../app/src/main/res/values-fi/strings.xml    |  2 --
 .../app/src/main/res/values-fr/strings.xml    |  2 --
 .../app/src/main/res/values-gl/strings.xml    |  1 -
 .../app/src/main/res/values-gsw/strings.xml   |  1 -
 .../app/src/main/res/values-hi/strings.xml    |  2 --
 .../app/src/main/res/values-hu/strings.xml    |  2 --
 .../app/src/main/res/values-in/strings.xml    |  2 --
 .../app/src/main/res/values-is/strings.xml    |  1 -
 .../app/src/main/res/values-it/strings.xml    |  2 --
 .../app/src/main/res/values-iw/strings.xml    |  2 --
 .../app/src/main/res/values-ja/strings.xml    |  2 --
 .../app/src/main/res/values-ko/strings.xml    |  2 --
 .../app/src/main/res/values-lt/strings.xml    |  2 --
 .../app/src/main/res/values-lv/strings.xml    |  2 --
 .../app/src/main/res/values-mr/strings.xml    |  2 --
 .../app/src/main/res/values-mt/strings.xml    |  1 -
 .../app/src/main/res/values-nb/strings.xml    |  2 --
 .../app/src/main/res/values-nl/strings.xml    |  2 --
 .../app/src/main/res/values-pl/strings.xml    |  2 --
 .../src/main/res/values-pt-rBR/strings.xml    |  2 --
 .../app/src/main/res/values-pt/strings.xml    |  2 --
 .../app/src/main/res/values-ro/strings.xml    |  2 --
 .../app/src/main/res/values-ru/strings.xml    |  2 --
 .../app/src/main/res/values-sk/strings.xml    |  2 --
 .../app/src/main/res/values-sr/strings.xml    |  2 --
 .../app/src/main/res/values-sv/strings.xml    |  2 --
 .../app/src/main/res/values-sw/strings.xml    |  2 --
 .../app/src/main/res/values-th/strings.xml    |  2 --
 .../app/src/main/res/values-tr/strings.xml    |  2 --
 .../app/src/main/res/values-uk/strings.xml    |  2 --
 .../app/src/main/res/values-vi/strings.xml    |  2 --
 .../src/main/res/values-zh-rTW/strings.xml    |  2 --
 .../app/src/main/res/values-zh/strings.xml    |  2 --
 android/app/src/main/res/values/strings.xml   |  2 --
 51 files changed, 144 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/MwmActivity.java b/android/app/src/main/java/app/organicmaps/MwmActivity.java
index 9239c5f50..aa5d898dd 100644
--- a/android/app/src/main/java/app/organicmaps/MwmActivity.java
+++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java
@@ -18,7 +18,6 @@ import android.app.Activity;
 import android.app.Dialog;
 import android.app.PendingIntent;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.res.ColorStateList;
 import android.content.res.Configuration;
@@ -28,7 +27,6 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
-import android.text.method.LinkMovementMethod;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
@@ -66,7 +64,6 @@ import app.organicmaps.downloader.OnmapDownloader;
 import app.organicmaps.editor.EditorActivity;
 import app.organicmaps.editor.EditorHostFragment;
 import app.organicmaps.editor.FeatureCategoryActivity;
-import app.organicmaps.editor.OsmLoginActivity;
 import app.organicmaps.editor.ReportFragment;
 import app.organicmaps.help.HelpActivity;
 import app.organicmaps.intent.Factory;
@@ -99,7 +96,6 @@ import app.organicmaps.sdk.display.DisplayType;
 import app.organicmaps.sdk.downloader.MapManager;
 import app.organicmaps.sdk.downloader.UpdateInfo;
 import app.organicmaps.sdk.editor.Editor;
-import app.organicmaps.sdk.editor.OsmOAuth;
 import app.organicmaps.sdk.location.LocationHelper;
 import app.organicmaps.sdk.location.LocationListener;
 import app.organicmaps.sdk.location.LocationState;
@@ -290,7 +286,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
     }
 
     processIntent();
-    migrateOAuthCredentials();
   }
 
   /**
@@ -345,36 +340,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
     }
   }
 
-  private void migrateOAuthCredentials()
-  {
-    if (OsmOAuth.containsOAuth1Credentials())
-    {
-      // Remove old OAuth v1 secrets
-      OsmOAuth.clearOAuth1Credentials();
-
-      // Notify user to re-login
-      dismissAlertDialog();
-      final DialogInterface.OnClickListener navigateToLoginHandler =
-          (dialog, which) -> startActivity(new Intent(MwmActivity.this, OsmLoginActivity.class));
-
-      final int marginBase = getResources().getDimensionPixelSize(R.dimen.margin_base);
-      final float textSize = getResources().getDimension(R.dimen.line_spacing_extra_1);
-      final TextView text = new TextView(this);
-      text.setText(getText(R.string.alert_reauth_message));
-      text.setPadding(marginBase, marginBase, marginBase, marginBase);
-      text.setTextSize(textSize);
-      text.setMovementMethod(LinkMovementMethod.getInstance());
-
-      mAlertDialog = new MaterialAlertDialogBuilder(this, R.style.MwmTheme_AlertDialog)
-                         .setTitle(R.string.login_osm)
-                         .setView(text)
-                         .setPositiveButton(R.string.login, navigateToLoginHandler)
-                         .setNegativeButton(R.string.cancel, null)
-                         .setOnDismissListener(dialog -> mAlertDialog = null)
-                         .show();
-    }
-  }
-
   private static void checkMeasurementSystem()
   {
     UnitLocale.initializeCurrentUnits();
diff --git a/android/app/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java b/android/app/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java
index e0ea2f329..88b9d8da8 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java
@@ -29,9 +29,6 @@ public final class OsmOAuth
   @SuppressWarnings("NotNullFieldNotInitialized")
   @NonNull
   private static SharedPreferences mPrefs;
-
-  private static final String PREF_OSM_TOKEN = "OsmToken"; // Unused after migration from OAuth1 to OAuth2
-  private static final String PREF_OSM_SECRET = "OsmSecret"; // Unused after migration from OAuth1 to OAuth2
   private static final String PREF_OSM_USERNAME = "OsmUsername";
   private static final String PREF_OSM_CHANGESETS_COUNT = "OsmChangesetsCount";
   private static final String PREF_OSM_OAUTH2_TOKEN = "OsmOAuth2Token";
@@ -48,16 +45,6 @@ public final class OsmOAuth
     return mPrefs.contains(PREF_OSM_OAUTH2_TOKEN);
   }
 
-  public static boolean containsOAuth1Credentials()
-  {
-    return mPrefs.contains(PREF_OSM_TOKEN) && mPrefs.contains(PREF_OSM_SECRET);
-  }
-
-  public static void clearOAuth1Credentials()
-  {
-    mPrefs.edit().remove(PREF_OSM_TOKEN).remove(PREF_OSM_SECRET).apply();
-  }
-
   public static String getAuthToken()
   {
     return mPrefs.getString(PREF_OSM_OAUTH2_TOKEN, "");
@@ -82,8 +69,6 @@ public final class OsmOAuth
   public static void clearAuthorization()
   {
     mPrefs.edit()
-        .remove(PREF_OSM_TOKEN)
-        .remove(PREF_OSM_SECRET)
         .remove(PREF_OSM_USERNAME)
         .remove(PREF_OSM_OAUTH2_TOKEN)
         .apply();
diff --git a/android/app/src/main/res/values-af/strings.xml b/android/app/src/main/res/values-af/strings.xml
index f49ce0f6f..dd6f1453b 100644
--- a/android/app/src/main/res/values-af/strings.xml
+++ b/android/app/src/main/res/values-af/strings.xml
@@ -580,8 +580,6 @@
     <string name="button_plan">Beplan</string>
     <string name="placepage_remove_stop">Verwyder stop</string>
     <string name="placepage_add_stop">Voeg tussenstop toe</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Meld asseblief aan by OpenStreetMap om al jou kaartwysigings outomaties op te laai. Kom meer te wete <a href="https://github.com/organicmaps/organicmaps/issues/6144">hier</a>.</string>
     <string name="dialog_error_storage_title">Bergtoegangprobleem</string>
     <string name="dialog_error_storage_message">Eksterne bergspasie is nie toeganklik nie. Die SD-kaart is dalk verwyder, beskadig, of die lêerstelsel is leesalleen. Gaan u SD-kaart na of kontak ons by support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emuleer slegte bergspasie</string>
diff --git a/android/app/src/main/res/values-ar/strings.xml b/android/app/src/main/res/values-ar/strings.xml
index 2144ed2d6..a8203ac36 100644
--- a/android/app/src/main/res/values-ar/strings.xml
+++ b/android/app/src/main/res/values-ar/strings.xml
@@ -607,8 +607,6 @@
     <string name="button_plan">خطة</string>
     <string name="placepage_remove_stop">إزالة نقطة توقف</string>
     <string name="placepage_add_stop">إضافة نقطة توقف</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">برجاء تسجيل الدخول إلى OpenStreetMap لتحميل جميع تعديلات الخريطة تلقائيًا. تعرف على المزيد <a href="https://github.com/organicmaps/organicmaps/issues/6144">هنا</a>.</string>
     <string name="dialog_error_storage_title">مشكلة الوصول للتخزين</string>
     <string name="dialog_error_storage_message">التخزين الخارجي غير متوفر، ربما تمت إزالة بطاقة SD، أو أنها تالفة أو نظام الملفات للقراءة فقط. افحصه أو راسلنا على support@comaps.app</string>
     <string name="setting_emulate_bad_storage">محاكاة التخزين السيء</string>
diff --git a/android/app/src/main/res/values-az/strings.xml b/android/app/src/main/res/values-az/strings.xml
index 509551efa..56ff37098 100644
--- a/android/app/src/main/res/values-az/strings.xml
+++ b/android/app/src/main/res/values-az/strings.xml
@@ -598,8 +598,6 @@
     <string name="button_plan">Plan</string>
     <string name="placepage_remove_stop">Kəsmə nöqtəsini silin</string>
     <string name="placepage_add_stop">Dayanacaq nöqtəsini əlavə edin</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Bütün xəritə redaktələrinizi avtomatik yükləmək üçün OpenStreetMap-a daxil olun. <a href="https://github.com/organicmaps/organicmaps/issues/6144">burada</a> ətraflı məlumat əldə edin.</string>
     <string name="dialog_error_storage_title">Yaddaş giriş problemi</string>
     <string name="dialog_error_storage_message">Xarici yaddaş mövcud deyil, ola bilsin ki, SD Kart çıxarılıb, zədələnib və ya fayl sistemi yalnız oxunur. Zəhmət olmasa yoxlayın və ya support@comaps.app ünvanında bizimlə əlaqə saxlayın</string>
     <string name="setting_emulate_bad_storage">Zədələnmiş yaddaşı təqlid edin</string>
diff --git a/android/app/src/main/res/values-be/strings.xml b/android/app/src/main/res/values-be/strings.xml
index 5eb2ed4cc..1da7e0fa9 100644
--- a/android/app/src/main/res/values-be/strings.xml
+++ b/android/app/src/main/res/values-be/strings.xml
@@ -588,8 +588,6 @@
     <string name="button_plan">Пракласці</string>
     <string name="placepage_remove_stop">Выдаліць прыпынак</string>
     <string name="placepage_add_stop">Дадаць прыпынак</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Увайдзіце ў OpenStreetMap, каб аўтаматычна запампоўваць усе свае праўкі карты. Даведайцеся больш <a href="https://github.com/organicmaps/organicmaps/issues/6144">тут</a>.</string>
     <string name="dialog_error_storage_title">Праблема з доступам да сховішча</string>
     <string name="dialog_error_storage_message">Знешняе сховішча недаступна. Магчыма, SD-карта была вынята або пашкоджана ці файлавая сістэма даступна толькі для чытання. Праверце SD-карту або зважыцеся з намі праз support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Эмуляваць дрэннае сховішча</string>
diff --git a/android/app/src/main/res/values-bg/strings.xml b/android/app/src/main/res/values-bg/strings.xml
index 6881cff73..1bed3680c 100644
--- a/android/app/src/main/res/values-bg/strings.xml
+++ b/android/app/src/main/res/values-bg/strings.xml
@@ -551,8 +551,6 @@
     <string name="button_plan">Планиране</string>
     <string name="placepage_remove_stop">Премахване на спирка</string>
     <string name="placepage_add_stop">Добавяне на спирка</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Моля, влезте в OpenStreetMap, за да качвате автоматично всичките си редакции на картата. Научете повече <a href="https://github.com/organicmaps/organicmaps/issues/6144">тук</a>.</string>
     <string name="dialog_error_storage_title">Проблем с достъпа до хранилището</string>
     <string name="dialog_error_storage_message">Външната памет на устройството не е налична, SD картата може да е била извадена, повредена или файловата система е само за четене. Проверете това и се свържете с нас support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Емулация на грешки с външна памет</string>
diff --git a/android/app/src/main/res/values-ca/strings.xml b/android/app/src/main/res/values-ca/strings.xml
index 299c155ea..5d28afd04 100644
--- a/android/app/src/main/res/values-ca/strings.xml
+++ b/android/app/src/main/res/values-ca/strings.xml
@@ -595,8 +595,6 @@
     <string name="button_plan">Planifica</string>
     <string name="placepage_remove_stop">Elimina parada</string>
     <string name="placepage_add_stop">Afegeix una parada</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Si us plau, inicieu sessió a OpenStreetMap per carregar automàticament totes les edicions de mapes. Més informació <a href="https://github.com/organicmaps/organicmaps/issues/6144">aquí</a>.</string>
     <string name="dialog_error_storage_title">S\'ha produït un problema en l\'accés a l\'emmagatzematge</string>
     <string name="dialog_error_storage_message">L\'emmagatzematg extern no és accessible. La targeta SD potser s\'ha retirat, malmès, o el sistema de fitxer és de només lectura. Comproveu la targeta SD o contacteu amb nosaltres a support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emula un emmagatzematge malmès</string>
diff --git a/android/app/src/main/res/values-cs/strings.xml b/android/app/src/main/res/values-cs/strings.xml
index bd8535e53..cbcba8d59 100644
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -570,8 +570,6 @@
     <string name="button_plan">Naplánovat</string>
     <string name="placepage_remove_stop">Odstranit zastávku</string>
     <string name="placepage_add_stop">Přidat zastávku</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Přihlaste se do OpenStreetMap, abyste mohli automaticky nahrávat všechny své úpravy mapy. Více informací <a href="https://github.com/organicmaps/organicmaps/issues/6144">zde</a>.</string>
     <string name="dialog_error_storage_title">Problém s přístupem k úložišti</string>
     <string name="dialog_error_storage_message">Externí úložiště není k dispozici, pravděpodobně byla vyjmuta nebo poškozena SD karta, nebo je systém souborů pouze pro čtení. Zkontrolujte to prosím a kontaktujte nás na support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emulovat špatné úložiště</string>
diff --git a/android/app/src/main/res/values-da/strings.xml b/android/app/src/main/res/values-da/strings.xml
index b171083e1..dcf43ffc3 100644
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -566,8 +566,6 @@
     <string name="button_plan">Planlæg</string>
     <string name="placepage_remove_stop">Fjern stop</string>
     <string name="placepage_add_stop">Tilføj stop</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Log ind på OpenStreetMap for automatisk at uploade alle dine kortredigeringer. Få mere at vide <a href="https://github.com/organicmaps/organicmaps/issues/6144">her</a>.</string>
     <string name="dialog_error_storage_title">Problem med lageradgang</string>
     <string name="dialog_error_storage_message">Eksternt lager er ikke tilgængeligt. SD-kortet kan være blevet fjernet eller beskadiget, eller filsystemet er skrivebeskyttet. Kontroller dit SD-kort eller kontakt os på support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emulér beskadiget lager</string>
diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
index 16797985e..1783211ad 100644
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -596,8 +596,6 @@
     <string name="button_plan">Planen</string>
     <string name="placepage_remove_stop">Stopp entfernen</string>
     <string name="placepage_add_stop">Stopp hinzufügen</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Bitte melde dich bei OpenStreetMap an, um alle deine Kartenbearbeitungen automatisch hochzuladen. Erfahre <a href="https://github.com/organicmaps/organicmaps/issues/6144">hier</a> mehr.</string>
     <string name="dialog_error_storage_title">Problem mit dem Zugriff auf den Speicher</string>
     <string name="dialog_error_storage_message">Der externe Speicher ist nicht verfügbar, möglicherweise wurde die SD-Karte entfernt oder sie ist beschädigt oder das Dateisystem ist schreibgeschützt. Überprüfen Sie das bitte oder kontaktieren Sie uns unter support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Fehlerhaften Speicher emulieren</string>
diff --git a/android/app/src/main/res/values-el/strings.xml b/android/app/src/main/res/values-el/strings.xml
index 69d5dd599..f8fa5a2bb 100644
--- a/android/app/src/main/res/values-el/strings.xml
+++ b/android/app/src/main/res/values-el/strings.xml
@@ -591,8 +591,6 @@
     <string name="button_plan">Σχεδιασμός</string>
     <string name="placepage_remove_stop">Αφαίρεση στάσης</string>
     <string name="placepage_add_stop">Προσθήκη στάσης</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Παρακαλούμε συνδεθείτε στο OpenStreetMap για να ανεβάσετε αυτόματα όλες τις επεξεργασίες του χάρτη σας. Μάθετε περισσότερα <a href="https://github.com/organicmaps/organicmaps/issues/6144">εδώ</a>.</string>
     <string name="dialog_error_storage_title">Πρόβλημα πρόσβασης στον αποθηκευτικό χώρο</string>
     <string name="dialog_error_storage_message">Ο εξωτερικός απθηκευτικός χώρος δεν είναι διαθέσιμος, πιθανότατα έχει αφαιρεθεί η κάρτα SD, είναι κατεστραμμένη ή το σύστημα αρχείων είναι μόνο για ανάγνωση. Ελέγξτε το και επικοινωνήστε μαζί μας στη διεύθυνση support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Εξομείωση κακού αποθηκευτικού χώρου</string>
diff --git a/android/app/src/main/res/values-es-rMX/strings.xml b/android/app/src/main/res/values-es-rMX/strings.xml
index 174267feb..dc55003bc 100644
--- a/android/app/src/main/res/values-es-rMX/strings.xml
+++ b/android/app/src/main/res/values-es-rMX/strings.xml
@@ -60,8 +60,6 @@
     <string name="osm_presentation">Datos de OpenStreetMap creados por la comunidad a partir de %s. Obtenga más información sobre cómo editar y actualizar el mapa en OpenStreetMap.org</string>
     <string name="placepage_add_place_button">Agregar lugar a OpenStreetMap</string>
     <string name="transliteration_title">Transliteración al alfabeto latino</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Inicie sesión en OpenStreetMap para cargar automáticamente todas las ediciones de su mapa. Obtenga más información <a href="https://github.com/organicmaps/organicmaps/issues/6144">aquí</a>.</string>
     <string name="dialog_error_storage_title">Problema de acceso al almacenamiento</string>
     <string name="dialog_error_storage_message">El almacenamiento externo no está disponible. Es posible que se haya quitado o dañado la tarjeta SD, o que el sistema de archivos solo permita la lectura. Revíselo y escríbanos a support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emular el almacenamiento dañado</string>
diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml
index 652f04b6b..dcbe6bf96 100644
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -598,8 +598,6 @@
     <string name="button_plan">Planificar</string>
     <string name="placepage_remove_stop">Eliminar parada</string>
     <string name="placepage_add_stop">Añadir parada</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Inicia sesión en OpenStreetMap para cargar automáticamente todas tus ediciones de mapas. Más información <a href="https://github.com/organicmaps/organicmaps/issues/6144">aquí</a>.</string>
     <string name="dialog_error_storage_title">Error de acceso al almacenamiento</string>
     <string name="dialog_error_storage_message">El almacenamiento externo no está disponible; puede que se haya quitado o dañado la tarjeta SD, o el sistema de archivos solo permite lectura. Por favor, compruébalo ó escríbenos a support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emular almacenamiento dañado</string>
diff --git a/android/app/src/main/res/values-et/strings.xml b/android/app/src/main/res/values-et/strings.xml
index 8c6e280d4..0129b7de1 100644
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -590,8 +590,6 @@
     <string name="button_plan">Kavanda</string>
     <string name="placepage_remove_stop">Eemalda peatus</string>
     <string name="placepage_add_stop">Lisa peatus</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Oma kaastöö automaatseks üleslaadimiseks palun logi OpenStreetMappi sisse. Lisateave <a href="https://github.com/organicmaps/organicmaps/issues/6144">leidub siin</a>.</string>
     <string name="dialog_error_storage_title">Andmeruumi ligipääsu probleem</string>
     <string name="dialog_error_storage_message">Väline andmeruum pole juurdepääsetav. SD-kaart võib olla eemaldatud, kahjustatud või failisüsteem on kirjutuskaitstud. Palun kontrolli oma SD-kaarti või võta meiega ühendust aadressil support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Imiteeri vigast andmeruumi</string>
diff --git a/android/app/src/main/res/values-eu/strings.xml b/android/app/src/main/res/values-eu/strings.xml
index 40dee4c28..a1e4a72b6 100644
--- a/android/app/src/main/res/values-eu/strings.xml
+++ b/android/app/src/main/res/values-eu/strings.xml
@@ -596,8 +596,6 @@
     <string name="button_plan">Planifikatu</string>
     <string name="placepage_remove_stop">Kendu geltokia</string>
     <string name="placepage_add_stop">Gehitu geltokia</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Hasi saioa OpenStreetMap-en zure mapen aldaketa guztiak automatikoki kargatzeko. Lortu informazio gehiago <a href="https://github.com/organicmaps/organicmaps/issues/6144">hemen</a>.</string>
     <string name="dialog_error_storage_title">Biltegiratze sarbidearen arazoa</string>
     <string name="dialog_error_storage_message">Kanpoko biltegiratzea ez dago erabilgarri; Baliteke SD txartela kendu edo hondatuta egotea, edo fitxategi sistema irakurtzeko soilik izatea. Mesedez, begiratu edo idatzi iezaguzu support@comaps.app helbidera</string>
     <string name="setting_emulate_bad_storage">Emulatu kaltetutako biltegiratzea</string>
diff --git a/android/app/src/main/res/values-fa/strings.xml b/android/app/src/main/res/values-fa/strings.xml
index 7e1040cc1..77aeb6904 100644
--- a/android/app/src/main/res/values-fa/strings.xml
+++ b/android/app/src/main/res/values-fa/strings.xml
@@ -560,8 +560,6 @@
     <string name="button_plan">برنامه</string>
     <string name="placepage_remove_stop">توقف را حذف کنید</string>
     <string name="placepage_add_stop">اضافه کردن توقف</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">لطفاً به OpenStreetMap وارد شوید تا به طور خودکار تمام ویرایش های نقشه خود را آپلود کنید. <a href="https://github.com/organicmaps/organicmaps/issues/6144">اینجا</a> بیشتر بیاموزید.</string>
     <string name="dialog_error_storage_title">مشکل دسترسی به ذخیره‌سازی</string>
     <string name="dialog_error_storage_message">ذخیره سازی خارجی در دسترس نیست کارت SD ممکن است برداشته شده باشد، آسیب دیده باشد یا سیستم فایل فقط خواندنی باشد. لطفا کارت SD خود را بررسی کنید یا با ما در support@comaps.app تماس بگیرید</string>
     <string name="setting_emulate_bad_storage">شبیه سازی ذخیره سازی بد</string>
diff --git a/android/app/src/main/res/values-fi/strings.xml b/android/app/src/main/res/values-fi/strings.xml
index 3bac1bc67..e3c3bc4f2 100644
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -600,8 +600,6 @@
     <string name="button_plan">Suunnittele</string>
     <string name="placepage_remove_stop">Poista pysähdys</string>
     <string name="placepage_add_stop">Lisää pysähdys</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Kirjaudu sisään OpenStreetMapiin, jotta voit ladata kaikki karttamuutoksesi automaattisesti. Lisätietoja <a href="https://github.com/organicmaps/organicmaps/issues/6144">täältä</a>.</string>
     <string name="dialog_error_storage_title">Ongelma tallennustilan käyttämisessä</string>
     <string name="dialog_error_storage_message">Ulkoinen tallennustila ei ole käytettävissä, SD-kortti on luultavasti poistettu tai vahingoittunut tai tiedostojärjestelmä on vain luku -tilassa. Tarkista SD-kortin toiminta tai ota yhteyttä osoitteeseen support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Jäljittele virheellistä tallennustilaa</string>
diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml
index 30743e1c8..cd89ac02e 100644
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -602,8 +602,6 @@
     <string name="button_plan">Planifier</string>
     <string name="placepage_remove_stop">Supprimer l\'arrêt</string>
     <string name="placepage_add_stop">Ajouter un arrêt</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Connecte-toi à OpenStreetMap pour télécharger automatiquement toutes tes modifications de cartes. En savoir plus <a href="https://github.com/organicmaps/organicmaps/issues/6144">ici</a>.</string>
     <string name="dialog_error_storage_title">Problème d\'accès au stockage</string>
     <string name="dialog_error_storage_message">Le stockage externe n\'est pas disponible. La carte SD a probablement été enlevée, endommagée ou le système est en lecture seule. Veuillez vérifier votre carte SD ou nous contacter via support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Émuler le mauvais stockage</string>
diff --git a/android/app/src/main/res/values-gl/strings.xml b/android/app/src/main/res/values-gl/strings.xml
index a8b1f88d8..cb73f674f 100644
--- a/android/app/src/main/res/values-gl/strings.xml
+++ b/android/app/src/main/res/values-gl/strings.xml
@@ -402,7 +402,6 @@
     <string name="planning_route_manage_route">Administrar roteiro</string>
     <string name="placepage_remove_stop">Eliminar parada</string>
     <string name="placepage_add_stop">Engadir parada</string>
-    <string name="alert_reauth_message">Por favor, Inicia sesión en OpenStreetMap para cargar automaticamente todas as túas edicións de mapas. Más información <a href="https://github.com/organicmaps/organicmaps/issues/6144">aquí</a>.</string>
     <string name="dialog_error_storage_title">Problema de acceso ao almacenamento</string>
     <string name="dialog_error_storage_message">Non se pode acceder ao almacenamento externo. É posible que a tarxeta SD fose eliminada, danada ou que o sistema de ficheiros sexa só de lectura. Comprobe a súa tarxeta SD ou póñase en contacto connosco en support@comaps.app</string>
     <string name="error_enter_correct_name">Por favor, introduza o nome correcto</string>
diff --git a/android/app/src/main/res/values-gsw/strings.xml b/android/app/src/main/res/values-gsw/strings.xml
index 13e27dcc7..27d8432f9 100644
--- a/android/app/src/main/res/values-gsw/strings.xml
+++ b/android/app/src/main/res/values-gsw/strings.xml
@@ -81,7 +81,6 @@
     <string name="dialog_report_error_with_logs">Bitte schick eus en Fehlerbricht:\n - i de Iistellige \"Protokollierig aktiviere\"\n - s Problem reproduziere\n - im Bildschirm \"Über &amp; Hilf\" drück de \"App-Fehler melde\"-Chnopf und schicks via E-Mail oder Chat\n - d Protokollierig deaktiviere</string>
     <string name="route_type">Routetyp</string>
     <string name="routing_add_start_point">Nutz d Suechi oder tipp uf d Charte, zum en Routestartpunkt hinzuezfüege</string>
-    <string name="alert_reauth_message">Bitte meld dich vi OpenStreetMap aa, zum all dini Chartebearbeitige automatisch ufezlade. Erfahr <a href="https://github.com/organicmaps/organicmaps/issues/6144">da</a> meh.</string>
     <string name="error_enter_correct_name">Bitte gib en korrekte Name ii</string>
     <string name="bookmark_lists_hide_all">Alli uusblende</string>
     <plurals name="bookmarks_places">
diff --git a/android/app/src/main/res/values-hi/strings.xml b/android/app/src/main/res/values-hi/strings.xml
index 8d534e711..6a697a749 100644
--- a/android/app/src/main/res/values-hi/strings.xml
+++ b/android/app/src/main/res/values-hi/strings.xml
@@ -423,8 +423,6 @@
     <string name="routing_add_finish_point">गंतव्य बिंदु जोड़ने के लिए खोज का उपयोग करें या मानचित्र पर टैप करें</string>
     <string name="planning_route_manage_route">मार्ग प्रबंधित करें</string>
     <string name="placepage_add_stop">गंतव्य जोड़ें</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">कृपया अपने सभी मानचित्र संपादनों को स्वचालित रूप से अपलोड करने के लिए OpenStreetMap पर लॉगिन करें। अधिक जानें <a href="https://github.com/organicmaps/organicmaps/issues/6144">यहां</a>।</string>
     <string name="bookmark_lists">सूचियों</string>
     <!-- Do not display all bookmark lists on the map -->
     <string name="bookmark_lists_hide_all">सभी को छिपाएं</string>
diff --git a/android/app/src/main/res/values-hu/strings.xml b/android/app/src/main/res/values-hu/strings.xml
index c374ba89d..51dee8297 100644
--- a/android/app/src/main/res/values-hu/strings.xml
+++ b/android/app/src/main/res/values-hu/strings.xml
@@ -576,8 +576,6 @@
     <string name="button_plan">Tervezés</string>
     <string name="placepage_remove_stop">Megálló eltávolítása</string>
     <string name="placepage_add_stop">Köztes célpont hozzáadása</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Jelentkezzen be az OpenStreetMap rendszerébe, hogy automatikusan feltölthesse az összes térképszerkesztését. További információ <a href="https://github.com/organicmaps/organicmaps/issues/6144">itt</a>.</string>
     <string name="dialog_error_storage_title">Tárhelyhozzáférési probléma</string>
     <string name="dialog_error_storage_message">Külső tárhely nem áll rendelkezésre, valószínűleg az SD-kártyát eltávolították vagy sérült, vagy rendszerfájl csak olvasható. Ellenőrizze, és lépjen kapcsolatba velünk a support@comaps.app címen</string>
     <string name="setting_emulate_bad_storage">Sérült tároló emulálása</string>
diff --git a/android/app/src/main/res/values-in/strings.xml b/android/app/src/main/res/values-in/strings.xml
index bec9f2995..51946e9ef 100644
--- a/android/app/src/main/res/values-in/strings.xml
+++ b/android/app/src/main/res/values-in/strings.xml
@@ -565,8 +565,6 @@
     <string name="button_plan">Rencana</string>
     <string name="placepage_remove_stop">Hapus pemberhentian</string>
     <string name="placepage_add_stop">Tambah perhentian</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Silahkan login ke OpenStreetMap untuk mengupload semua hasil edit peta Anda secara otomatis. Pelajari lebih lanjut <a href="https://github.com/organicmaps/organicmaps/issues/6144">di sini</a>.</string>
     <string name="dialog_error_storage_title">Masalah akses penyimpanan</string>
     <string name="dialog_error_storage_message">Penyimpanan eksternal tidak tersedia, mungkin Kartu SD sudah dilepaskan, rusak, atau sistem berkasnya hanya dapat dibaca. Silakan periksa dan beri tahu kami di alamat support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emulasi penyimpanan yang buruk</string>
diff --git a/android/app/src/main/res/values-is/strings.xml b/android/app/src/main/res/values-is/strings.xml
index 1065d5229..b932c9b94 100644
--- a/android/app/src/main/res/values-is/strings.xml
+++ b/android/app/src/main/res/values-is/strings.xml
@@ -506,7 +506,6 @@
     <string name="car_used_on_the_phone_screen">Þú ert núna að nota CoMaps á símaskjánum</string>
     <string name="aa_request_permission_activity_text">CoMaps í Android Auto þarf heimildir fyrir staðsetningar til að virka eðlilega</string>
     <string name="routing_add_finish_point">Notaðu leit eða ýttu á kortið til að bæta við áfangastað</string>
-    <string name="alert_reauth_message">Skráðu þig inn á OpenStreetMap til að senda sjálfkrafa inn allar breytingar þínar á kortinu. Kannaðu þetta nánar <a href="https://github.com/organicmaps/organicmaps/issues/6144">hér</a>.</string>
     <string name="dialog_routing_disclaimer_title">Þegar ferðast er eftir leið, skaltu hafa eftirfarandi í huga:</string>
     <string name="dialog_routing_disclaimer_beware">Vertu vakandi og settu öryggið ofar öllu á vegum úti!</string>
     <string name="dialog_routing_error_location_not_found">Tókst ekki að útbúa leið. Fyrirliggjandi GPS-hnit var ekki hægt að auðkenna.</string>
diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml
index a2d587aee..52a59e254 100644
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -581,8 +581,6 @@
     <string name="button_plan">Pianifica</string>
     <string name="placepage_remove_stop">Rimuovi sosta</string>
     <string name="placepage_add_stop">Aggiungi sosta</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Accedi a OpenStreetMap per caricare automaticamente tutte le tue modifiche alla mappa. Per saperne di più clicca <a href="https://github.com/organicmaps/organicmaps/issues/6144">qui</a>.</string>
     <string name="dialog_error_storage_title">Problema di accesso alla memoria</string>
     <string name="dialog_error_storage_message">Memoria esterna non disponibile. Probabilmente la scheda SD è stata rimossa, danneggiata o il file system è di sola lettura. Controlla la tua scheda SD o contattaci a support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Simula memoria danneggiata</string>
diff --git a/android/app/src/main/res/values-iw/strings.xml b/android/app/src/main/res/values-iw/strings.xml
index 18216d4cc..a75151656 100644
--- a/android/app/src/main/res/values-iw/strings.xml
+++ b/android/app/src/main/res/values-iw/strings.xml
@@ -587,8 +587,6 @@
     <string name="button_plan">תכנון</string>
     <string name="placepage_remove_stop">הסר עצירה</string>
     <string name="placepage_add_stop">הוסף עצירה</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">התחבר ל-OpenStreetMap כדי להעלות אוטומטית את כל עריכות המפה שלך. למידע נוסף <a href="https://github.com/organicmaps/organicmaps/issues/6144">כאן</a>.</string>
     <string name="dialog_error_storage_title">בעיית גישה לאחסון</string>
     <string name="dialog_error_storage_message">לא ניתן לגשת לאחסון החיצוני. ייתכן כי כרטיס הזיכרון הוסר, נפגם, או שמערכת הקבצים היא לקריאה בלבד. נא לבדוק את כרטיס הזיכרון או ליצור איתנו קשר בכתובת support@comaps.app</string>
     <string name="setting_emulate_bad_storage">בצע אמולציה לאחסון רע</string>
diff --git a/android/app/src/main/res/values-ja/strings.xml b/android/app/src/main/res/values-ja/strings.xml
index 0e9729dec..e08eec6cb 100644
--- a/android/app/src/main/res/values-ja/strings.xml
+++ b/android/app/src/main/res/values-ja/strings.xml
@@ -600,8 +600,6 @@
     <string name="button_plan">プラン</string>
     <string name="placepage_remove_stop">停留所を削除</string>
     <string name="placepage_add_stop">中間地点を追加</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">すべてのマップ編集を自動的にアップロードするには、OpenStreetMapにログインしてください。詳しくは <a href="https://github.com/organicmaps/organicmaps/issues/6144">こちら</a>.</string>
     <string name="dialog_error_storage_title">ストレージアクセスの問題</string>
     <string name="dialog_error_storage_message">外部ストレージは使用できません。おそらく SD カードが取り外されたか、破損しているか、あるいはファイルシステムが読み取り専用になっています。SD カードを確認するか、support@comaps.app までご連絡ください</string>
     <string name="setting_emulate_bad_storage">壊れたストレージをシミュレートする</string>
diff --git a/android/app/src/main/res/values-ko/strings.xml b/android/app/src/main/res/values-ko/strings.xml
index 4140ba5f6..152d2dc37 100644
--- a/android/app/src/main/res/values-ko/strings.xml
+++ b/android/app/src/main/res/values-ko/strings.xml
@@ -563,8 +563,6 @@
     <string name="button_plan">계획</string>
     <string name="placepage_remove_stop">정류장 제거</string>
     <string name="placepage_add_stop">스톱 추가</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">모든 지도 편집 내용을 자동으로 업로드하려면 OpenStreetMap에 로그인하세요. 자세히 알아보기 <a href="https://github.com/organicmaps/organicmaps/issues/6144">여기</a>.</string>
     <string name="dialog_error_storage_title">저장소 액세스 문제</string>
     <string name="dialog_error_storage_message">외부 저장소를 사용할 수 없습니다. SD 카드가 제거되었거나 손상되었거나 파일 시스템이 읽기 전용일 수 있습니다. 확인 후 support@comaps.app로 문의하세요.</string>
     <string name="setting_emulate_bad_storage">불량 저장소 에뮬레이션</string>
diff --git a/android/app/src/main/res/values-lt/strings.xml b/android/app/src/main/res/values-lt/strings.xml
index cb41ad787..c45935424 100644
--- a/android/app/src/main/res/values-lt/strings.xml
+++ b/android/app/src/main/res/values-lt/strings.xml
@@ -587,8 +587,6 @@
     <string name="button_plan">Planas</string>
     <string name="placepage_remove_stop">Šalinti stotelę</string>
     <string name="placepage_add_stop">Pridėti stotelę</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Prisijunkite prie „OpenStreetMap“, kad galėtumėte automatiškai įkelti visus savo žemėlapio pakeitimus. Išsamesnė informacija – <a href="https://github.com/organicmaps/organicmaps/issues/6144">čia</a>.</string>
     <string name="dialog_error_storage_title">Prieigos prie saugyklos problema</string>
     <string name="dialog_error_storage_message">Išorinė saugykla yra nepasiekiama. SD kortelė galimai yra pašalinta, pažeista, arba failų sistema joje yra nustatyta tik skaitymui. Patikrinkite SD kortelę arba susisiekite su mumis adresu support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emuliuoti blogą saugyklą</string>
diff --git a/android/app/src/main/res/values-lv/strings.xml b/android/app/src/main/res/values-lv/strings.xml
index cf3f36641..e9c62cfd0 100644
--- a/android/app/src/main/res/values-lv/strings.xml
+++ b/android/app/src/main/res/values-lv/strings.xml
@@ -590,8 +590,6 @@
     <string name="button_plan">Plānot</string>
     <string name="placepage_remove_stop">Noņemt starppunktu</string>
     <string name="placepage_add_stop">Pievienot starppunktu</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Ierakstieties „OpenStreetMap“, lai automātiski augšupielādētu visus kartes rediģējumus. Uzziniet vairāk <a href="https://github.com/organicmaps/organicmaps/issues/6144">te</a>.</string>
     <string name="dialog_error_storage_title">Krātuves pieejas problēma</string>
     <string name="dialog_error_storage_message">Ārējā krātuve nav pieejama. Iespējams, ir izņemta vai bojāta SD karte, vai arī datņu sistēma ir tikai lasāma. Pārbaudiet savu SD karti vai sazinieties ar mums, rakstot uz support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Simulēt bojātu krātuvi</string>
diff --git a/android/app/src/main/res/values-mr/strings.xml b/android/app/src/main/res/values-mr/strings.xml
index e558df068..83333f296 100644
--- a/android/app/src/main/res/values-mr/strings.xml
+++ b/android/app/src/main/res/values-mr/strings.xml
@@ -562,8 +562,6 @@
     <string name="button_plan">नियोजन</string>
     <string name="placepage_remove_stop">थांबा काढा</string>
     <string name="placepage_add_stop">स्टॉप जोडा</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">तुमची सर्व नकाशा संपादने स्वयंचलितपणे अपलोड करण्यासाठी कृपया OpenStreetMap वर लॉग इन करा. <a href="https://github.com/organicmaps/organicmaps/issues/6144">येथे</a> अधिक जाणून घ्या.</string>
     <string name="dialog_error_storage_title">स्टोरेज प्रवेश समस्या</string>
     <string name="dialog_error_storage_message">बाह्य साठ्याचा प्रवेश अपयशी. SD कार्ड कदाचित काढले गेले असेल, खराब झाले असेल किंवा फाइल सिस्टम ही केवळ-वाचनीय असावी. कृपया, तुमचे SD कार्ड तपासा किंवा support@comaps.app वर आमच्याशी संपर्क साधा</string>
     <string name="setting_emulate_bad_storage">खराब साठ्याचे अनुकरण करा</string>
diff --git a/android/app/src/main/res/values-mt/strings.xml b/android/app/src/main/res/values-mt/strings.xml
index e025f28f4..71e2c80a4 100644
--- a/android/app/src/main/res/values-mt/strings.xml
+++ b/android/app/src/main/res/values-mt/strings.xml
@@ -518,7 +518,6 @@
     <string name="mobile_data_description">L-internet mobbli huwa meħtieġ għan-notifiki tal-aġġornament tal-mapep u għat-tlugħ tal-editjar.</string>
     <string name="bookmarks_error_message_share_empty">Ma tistax tixxerja lista vojta</string>
     <string name="category_desc_more">…aktar</string>
-    <string name="alert_reauth_message">Illoggja f’ OpenStreetMap biex awtomatikament ittella’ l-editjar kollu tal-mappa tiegħek. Tgħallem aktar <a href="https://github.com/organicmaps/organicmaps/issues/6144">hawn</a>.</string>
     <string name="blue_gray">Blu Griż</string>
     <string name="dialog_routing_system_error">Żball fis-sistema</string>
     <string name="level">Livell</string>
diff --git a/android/app/src/main/res/values-nb/strings.xml b/android/app/src/main/res/values-nb/strings.xml
index 2bb96ee4e..6f96cb2bc 100644
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
@@ -598,8 +598,6 @@
     <string name="button_plan">Planlegge</string>
     <string name="placepage_remove_stop">Fjern stopp</string>
     <string name="placepage_add_stop">Angi stopp</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Logg inn på OpenStreetMap for automatisk å laste opp alle kartredigeringene dine. Finn ut mer <a href="https://github.com/organicmaps/organicmaps/issues/6144">her</a>.</string>
     <string name="dialog_error_storage_title">Problemer med tilgang til lagring</string>
     <string name="dialog_error_storage_message">Ekstern lagring er ikke tilgjengelig. Sannsynligvis er SD-kortet fjernet eller skadet eller så er filsystemet skrivebeskyttet. Undersøk og kontakt oss på support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emulere skadet lagring</string>
diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml
index 29a947afe..e4c3656d1 100644
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -594,8 +594,6 @@
     <string name="button_plan">Plan</string>
     <string name="placepage_remove_stop">Verwijder tussenstop</string>
     <string name="placepage_add_stop">Voeg tussenstop toe</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Log in op OpenStreetMap om al je kaartbewerkingen automatisch te uploaden. Meer informatie <a href="https://github.com/organicmaps/organicmaps/issues/6144">hier</a>.</string>
     <string name="dialog_error_storage_title">Probleem met opslagtoegang</string>
     <string name="dialog_error_storage_message">Externe opslag is niet beschikbaar, wellicht is de SD-kaart verwijderd, beschadigd of is het bestandssysteem alleen-lezen. Gelieve dit te controleren en ons te contacteren via support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Slechte opslag emuleren</string>
diff --git a/android/app/src/main/res/values-pl/strings.xml b/android/app/src/main/res/values-pl/strings.xml
index 3d58f58a8..2cf0ad3b0 100644
--- a/android/app/src/main/res/values-pl/strings.xml
+++ b/android/app/src/main/res/values-pl/strings.xml
@@ -597,8 +597,6 @@
     <string name="button_plan">Zaplanuj</string>
     <string name="placepage_remove_stop">Usuń postój</string>
     <string name="placepage_add_stop">Dodaj postój</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Zaloguj się do OpenStreetMap, aby automatycznie przesyłać wszystkie zmiany na mapie. Dowiedz się więcej <a href="https://github.com/organicmaps/organicmaps/issues/6144">tutaj</a>.</string>
     <string name="dialog_error_storage_title">Problem z dostępem do pamięci masowej</string>
     <string name="dialog_error_storage_message">Zewnętrzny nośnik pamięci masowej jest niedostępny. Prawdopodobnie usunięto lub uszkodzono kartę SD bądź jej system plików służy tylko do odczytu. Zweryfikuj to i skontaktuj się z nami pod adresem support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emuluj wadliwą pamięć masową</string>
diff --git a/android/app/src/main/res/values-pt-rBR/strings.xml b/android/app/src/main/res/values-pt-rBR/strings.xml
index 6ebe962b4..d012a8eb5 100644
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -534,8 +534,6 @@
     <string name="button_plan">Planejar</string>
     <string name="placepage_remove_stop">Remover parada</string>
     <string name="placepage_add_stop">Adicionar parada</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Faça login no OpenStreetMap para carregar automaticamente todas as edições de mapas que você fizer. Saiba mais <a href="https://github.com/organicmaps/organicmaps/issues/6144">aqui</a>.</string>
     <string name="dialog_error_storage_title">Problema de acesso ao armazenamento</string>
     <string name="dialog_error_storage_message">O armazenamento externo não está disponível, é provável que o cartão SD tenha sido removido, danificado ou o sistema de arquivo seja apenas para leitura. Verifique e entre em contato conosco em support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emular memória ruim</string>
diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index ab4c01961..9293383d2 100644
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -572,8 +572,6 @@
     <string name="button_plan">Planear</string>
     <string name="placepage_remove_stop">Remover paragem</string>
     <string name="placepage_add_stop">Adicionar paragem</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Por favor, faz o login no OpenStreetMap para carregar automaticamente todas as tuas edições de mapas. Sabe mais <a href="https://github.com/organicmaps/organicmaps/issues/6144">aqui</a>.</string>
     <string name="dialog_error_storage_title">Problema de acesso ao armazenamento</string>
     <string name="dialog_error_storage_message">O armazenamento externo não está disponível. Provavelmente porque o cartão SD foi removido, danificado ou o sistema de ficheiros é apenas para leitura. Verifique e contacte-nos através do email support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emular o armazenamento defeituoso</string>
diff --git a/android/app/src/main/res/values-ro/strings.xml b/android/app/src/main/res/values-ro/strings.xml
index 9c646dc58..e3a34c66e 100644
--- a/android/app/src/main/res/values-ro/strings.xml
+++ b/android/app/src/main/res/values-ro/strings.xml
@@ -580,8 +580,6 @@
     <string name="button_plan">Planifică</string>
     <string name="placepage_remove_stop">Scoateți opritorul</string>
     <string name="placepage_add_stop">Adaugă oprire</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Vă rugăm să vă conectați la OpenStreetMap pentru a încărca automat toate modificările aduse hărții. Aflați mai multe <a href="https://github.com/organicmaps/organicmaps/issues/6144">aici</a>.</string>
     <string name="dialog_error_storage_title">Problemă de acces la spațiul de stocare</string>
     <string name="dialog_error_storage_message">Spațiul de stocare extern nu este disponibil. Probabil cardul SD nu este introdus, este deteriorat sau sistemul de fișiere este doar pentru citire. Verifică sau contactează-ne la support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Simulare arhivă deteriorată</string>
diff --git a/android/app/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml
index 8ea5ef4da..b6213ca1c 100644
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
@@ -603,8 +603,6 @@
     <string name="button_plan">Построить</string>
     <string name="placepage_remove_stop">Удалить остановку</string>
     <string name="placepage_add_stop">Добавить остановку</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Пожалуйста войдите в аккаунт OpenStreetMap.org, чтобы публиковать ваши изменения карты. Подробности по <a href="https://github.com/organicmaps/organicmaps/issues/6144">ссылке</a>.</string>
     <string name="dialog_error_storage_title">Проблема с доступом к хранилищу</string>
     <string name="dialog_error_storage_message">Внешняя память устройства недоступна, возможно SD карта была удалена, повреждена или файловая система доступна только для чтения. Проверьте это и свяжитесь, пожалуйста, с нами support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Эмуляция ошибки с внешней памятью</string>
diff --git a/android/app/src/main/res/values-sk/strings.xml b/android/app/src/main/res/values-sk/strings.xml
index e3733ec97..dfdb20108 100644
--- a/android/app/src/main/res/values-sk/strings.xml
+++ b/android/app/src/main/res/values-sk/strings.xml
@@ -593,8 +593,6 @@
     <string name="button_plan">Naplánovať</string>
     <string name="placepage_remove_stop">Odstrániť zastávku</string>
     <string name="placepage_add_stop">Pridať zastávku</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Prihláste sa do OpenStreetMap, aby ste mohli automaticky nahrať všetky svoje úpravy mapy. Viac informácií sa dozviete <a href="https://github.com/organicmaps/organicmaps/issues/6144">tade</a>.</string>
     <string name="dialog_error_storage_title">Problém s prístupom k úložisku</string>
     <string name="dialog_error_storage_message">Externý úložný priestor nie je dostupný, pravdepodobne je vytiahnutá alebo poškodená SD karta alebo je systém súborov určený iba na čítanie. Skontrolujte to, prosím, a kontaktujte nás na support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Imitovať poškodené úložisko</string>
diff --git a/android/app/src/main/res/values-sr/strings.xml b/android/app/src/main/res/values-sr/strings.xml
index 5e75e52bd..b66b8a551 100644
--- a/android/app/src/main/res/values-sr/strings.xml
+++ b/android/app/src/main/res/values-sr/strings.xml
@@ -585,8 +585,6 @@
     <string name="button_plan">План</string>
     <string name="placepage_remove_stop">Уклони међуодредиште</string>
     <string name="placepage_add_stop">Међуодредиште</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Молим Вас да се пријавите на OpenStreetMap да бисте аутоматски послали своје промене на мапи. Сазнајте више о томе <a href="https://github.com/organicmaps/organicmaps/issues/6144">овде</a>.</string>
     <string name="dialog_error_storage_title">Проблем са приступом меморији</string>
     <string name="dialog_error_storage_message">Екстерна меморија није доступна. SD картица је можда уклоњена, оштећена, или је фајл систем само за читање. Молим Вас, проверите Вашу SD картицу или нас контактирајте на support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Симулирај неисправну меморију</string>
diff --git a/android/app/src/main/res/values-sv/strings.xml b/android/app/src/main/res/values-sv/strings.xml
index 50ae77949..bcf064908 100644
--- a/android/app/src/main/res/values-sv/strings.xml
+++ b/android/app/src/main/res/values-sv/strings.xml
@@ -561,8 +561,6 @@
     <string name="button_plan">Planera</string>
     <string name="placepage_remove_stop">Ta bort stoppet</string>
     <string name="placepage_add_stop">Lägg till stopp</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Logga in på OpenStreetMap för att automatiskt ladda upp alla dina kartredigeringar. Läs mer <a href="https://github.com/organicmaps/organicmaps/issues/6144">här</a>.</string>
     <string name="dialog_error_storage_title">Lagringsåtkomstproblem</string>
     <string name="dialog_error_storage_message">Extern lagring är inte tillgänglig. SD-kortet är borttaget, skadat eller så är filsystemet skrivskyddat. Kontrollera det och kontakta oss på support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emulera dålig lagring</string>
diff --git a/android/app/src/main/res/values-sw/strings.xml b/android/app/src/main/res/values-sw/strings.xml
index 16eb92d32..c29a149bb 100644
--- a/android/app/src/main/res/values-sw/strings.xml
+++ b/android/app/src/main/res/values-sw/strings.xml
@@ -149,8 +149,6 @@
     <string name="button_plan">Panga</string>
     <string name="placepage_remove_stop">Ondoa eneo la kusimama</string>
     <string name="placepage_add_stop">Ongeza eneo la kusimama</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Tafadhali ingia kwenye OpenStreetMap ili kupakia kiotomatiki hariri zako zote za ramani. Pata maelezo zaidi <a href="https://github.com/organicmaps/organicmaps/issues/6144">hapa</a>.</string>
     <string name="dialog_error_storage_title">Tatizo la kufikia hifadhi</string>
     <string name="dialog_error_storage_message">Hifadhi ya nje haipatikani, pengine Kadi ya SD imeondolewa, imeharibika au mfumo wa faili ni wa kusoma pekee. Tafadhali ikague na uwasiliane nasi kwa kutumia support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Onyeshana hifadhi mbaya</string>
diff --git a/android/app/src/main/res/values-th/strings.xml b/android/app/src/main/res/values-th/strings.xml
index 886acf37d..24ad93dfd 100644
--- a/android/app/src/main/res/values-th/strings.xml
+++ b/android/app/src/main/res/values-th/strings.xml
@@ -565,8 +565,6 @@
     <string name="button_plan">วางแผน</string>
     <string name="placepage_remove_stop">ลบจุดแวะพัก</string>
     <string name="placepage_add_stop">เพิ่มจุดแวะพัก</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">กรุณาเข้าสู่ระบบ OpenStreetMap เพื่ออัปโหลดการแก้ไขแผนที่ทั้งหมดของคุณโดยอัตโนมัติ เรียนรู้เพิ่มเติม<a href="https://github.com/organicmaps/organicmaps/issues/6144">ที่นี่</a></string>
     <string name="dialog_error_storage_title">ปัญหาการเข้าถึงที่เก็บข้อมูล</string>
     <string name="dialog_error_storage_message">ที่เก็บข้อมูลภายนอกไม่พร้อมใช้งาน อาจเป็นเพราะการ์ด SD ถูกถอดออกไป ได้รับความเสียหาย หรือระบบไฟล์ให้เขียนได้อย่างเดียว กรุณาตรวจสอบและติดต่อเราได้ที่ support@comaps.app</string>
     <string name="setting_emulate_bad_storage">จำลองแบบที่เก็บข้อมูลที่ไม่ดี</string>
diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml
index 70f25d4f5..dfb86fded 100644
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -598,8 +598,6 @@
     <string name="button_plan">Hesapla</string>
     <string name="placepage_remove_stop">Durağı Kaldır</string>
     <string name="placepage_add_stop">Ara nokta ekle</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Tüm harita düzenlemelerinizi kendiliğinden yüklemek için lütfen OpenStreetMap\'e giriş yapın. Daha çok bilgi <a href="https://github.com/organicmaps/organicmaps/issues/6144">buradadır</a>.</string>
     <string name="dialog_error_storage_title">Depolama alanı erişim sorunu</string>
     <string name="dialog_error_storage_message">Harici bellek kullanılamıyor, muhtemelen SD Kart çıkarılmış, hasarlı veya dosya sistemi salt okunur. Lütfen kontrol edin veya support@comaps.app adresinden bizimle iletişime geçin</string>
     <string name="setting_emulate_bad_storage">Bozuk depolama alanını taklit et</string>
diff --git a/android/app/src/main/res/values-uk/strings.xml b/android/app/src/main/res/values-uk/strings.xml
index 928818047..11c0535e5 100644
--- a/android/app/src/main/res/values-uk/strings.xml
+++ b/android/app/src/main/res/values-uk/strings.xml
@@ -600,8 +600,6 @@
     <string name="button_plan">Прокласти маршрут</string>
     <string name="placepage_remove_stop">Видалити зупинку</string>
     <string name="placepage_add_stop">Додати зупинку</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Будь ласка увійдіть в акаунт OpenStreetMap.org, щоб автоматично публікувати зміни до мапи. Подробиці за <a href="https://github.com/organicmaps/organicmaps/issues/6144">посиланням</a>.</string>
     <string name="dialog_error_storage_title">Не вдалося отримати доступ до сховища</string>
     <string name="dialog_error_storage_message">Зовнішнє сховище не доступно. Ймовірно, SD-картку пам\'яті було вилучено, пошкоджено, або система файлів доступна тільки для читання. Перевірте та зв\'яжіться з нами, написавши на поштову адресу support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Емулювати проблемне сховище</string>
diff --git a/android/app/src/main/res/values-vi/strings.xml b/android/app/src/main/res/values-vi/strings.xml
index 989a7a959..606dbdacc 100644
--- a/android/app/src/main/res/values-vi/strings.xml
+++ b/android/app/src/main/res/values-vi/strings.xml
@@ -563,8 +563,6 @@
     <string name="button_plan">Kế hoạch</string>
     <string name="placepage_remove_stop">Xóa điểm dừng</string>
     <string name="placepage_add_stop">Thêm điểm dừng</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Vui lòng đăng nhập vào OpenStreetMap để tự động tải lên tất cả các chỉnh sửa bản đồ của bạn. Tìm hiểu thêm <a href="https://github.com/organicmaps/organicmaps/issues/6144">tại đây</a>.</string>
     <string name="dialog_error_storage_title">Vấn đề truy cập ổ lưu trữ</string>
     <string name="dialog_error_storage_message">Ổ lưu trữ bên ngoài không khả dụng, có thể Thẻ SD đã bị tháo, bị hỏng hoặc hệ thống tập tin được thiết lập chỉ đọc. Hãy kiểm tra và liên hệ với chúng tôi qua support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Giả lập ổ lưu trữ hỏng</string>
diff --git a/android/app/src/main/res/values-zh-rTW/strings.xml b/android/app/src/main/res/values-zh-rTW/strings.xml
index 15b1695ac..cc3d8445c 100644
--- a/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -609,8 +609,6 @@
     <string name="button_plan">計畫</string>
     <string name="placepage_remove_stop">刪除停止</string>
     <string name="placepage_add_stop">新增中途點</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">請登入 OpenStreetMap 以自動上傳您的所有地圖編輯。若要了解更多資訊請點擊<a href="https://github.com/organicmaps/organicmaps/issues/6144">這裡</a>。</string>
     <string name="dialog_error_storage_title">儲存空間存儲問題</string>
     <string name="dialog_error_storage_message">外部儲存空間不可用，很可能是因為 SD 卡已移除、毀損，或檔案系統處於唯讀狀態。請進行檢查，然後透過 support@comaps.app 聯絡我們</string>
     <string name="setting_emulate_bad_storage">模擬不良儲存空間</string>
diff --git a/android/app/src/main/res/values-zh/strings.xml b/android/app/src/main/res/values-zh/strings.xml
index aa84578cc..d918fb1b5 100644
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -609,8 +609,6 @@
     <string name="button_plan">规划</string>
     <string name="placepage_remove_stop">删除站点</string>
     <string name="placepage_add_stop">添加经停点</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">请登录 OpenStreetMap 以自动上传您的所有地图编辑。诺要了解更多信息请点击<a href="https://github.com/organicmaps/organicmaps/issues/6144">这里</a>。</string>
     <string name="dialog_error_storage_title">存储空间访问问题</string>
     <string name="dialog_error_storage_message">外部存储空间不可用，很可能是因为 SD 卡已移除、损毁，或者文件系统为只读状态。请进行检查，然后通过 support@comaps.app 联系我们</string>
     <string name="setting_emulate_bad_storage">模拟不良存储空间</string>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 0f8cb5720..98a93b066 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -659,8 +659,6 @@
     <string name="placepage_remove_stop">Remove Stop</string>
     <string name="placepage_add_stop">Add Stop</string>
     <string name="saved">Saved</string>
-    <!-- Alert to ask user relogin to OpenStreetMap with OAuth2 flow after OAuth1 authentication is deprecated. -->
-    <string name="alert_reauth_message">Please login to OpenStreetMap to automatically upload all your map edits. Learn more <a href="https://github.com/organicmaps/organicmaps/issues/6144">here</a>.</string>
     <string name="dialog_error_storage_title">Storage access problem</string>
     <string name="dialog_error_storage_message">External storage is not accessible. The SD card may have been removed, damaged, or the file system is read-only. Please, check your SD card or contact us at support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emulate bad storage</string>

From ca9b3535a851e608fdd675f9394e3ed5a8423db6 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Tue, 19 Aug 2025 20:45:18 +0200
Subject: [PATCH 103/302] [android] Use Material 3 theme on linear progress bar

Signed-off-by: jeanbaptisteC <jeanbaptiste.charron@outlook.fr>
---
 android/app/src/main/res/layout/button_with_progress.xml | 5 +++--
 android/app/src/main/res/layout/layout_nav_bottom.xml    | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/android/app/src/main/res/layout/button_with_progress.xml b/android/app/src/main/res/layout/button_with_progress.xml
index d7511c20a..a2c3968a1 100644
--- a/android/app/src/main/res/layout/button_with_progress.xml
+++ b/android/app/src/main/res/layout/button_with_progress.xml
@@ -18,7 +18,7 @@
     tools:visibility="visible"/>
   <com.google.android.material.progressindicator.LinearProgressIndicator
     android:id="@+id/progressbar"
-    style="@style/Widget.MaterialComponents.LinearProgressIndicator"
+    style="@style/Widget.Material3.LinearProgressIndicator"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginStart="@dimen/margin_base_plus"
@@ -37,5 +37,6 @@
     android:layout_marginEnd="@dimen/margin_base_plus"
     android:layout_marginBottom="@dimen/margin_base_plus"
     android:text="@string/download"
-    android:textAppearance="@style/MwmTextAppearance.Body1" />
+    android:textAppearance="@style/MwmTextAppearance.Body1"
+    app:backgroundTint="?colorSecondary"/>
 </LinearLayout>
diff --git a/android/app/src/main/res/layout/layout_nav_bottom.xml b/android/app/src/main/res/layout/layout_nav_bottom.xml
index 99ddc9918..d2bed5c4e 100644
--- a/android/app/src/main/res/layout/layout_nav_bottom.xml
+++ b/android/app/src/main/res/layout/layout_nav_bottom.xml
@@ -23,7 +23,7 @@
 
     <com.google.android.material.progressindicator.LinearProgressIndicator
       android:id="@+id/navigation_progress"
-      style="@style/Widget.MaterialComponents.LinearProgressIndicator"
+      style="@style/Widget.Material3.LinearProgressIndicator"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       app:indicatorColor="?colorSecondary"

From 9c0e1abd15b6035c367b7101c99803ecdac19de6 Mon Sep 17 00:00:00 2001
From: Filip Czaplicki <git@starsep.com>
Date: Tue, 19 Aug 2025 23:17:35 +0200
Subject: [PATCH 104/302] [styles] Deduplicate mapcss rules

Change done automatically using
``` zsh
for x in **/*.mapcss; do
    rg --passthru -UN --pcre2 '^node\|([^,]+),?\narea\|\1,?' --replace 'node|$1,' $x | sponge $x;
    rg --passthru -UN --pcre2 '^area\|([^,]+),?\nnode\|\1,?' --replace 'node|$1,' $x | sponge $x;
done
```

Follow up to #999

Signed-off-by: Filip Czaplicki <git@starsep.com>
---
 .../default/include/Basemap_label.mapcss      |  31 +-
 data/styles/default/include/Icons.mapcss      |   1 -
 data/styles/outdoors/include/Icons.mapcss     |  86 ------
 .../vehicle/include/Basemap_label.mapcss      |  13 -
 data/styles/vehicle/include/Icons.mapcss      | 269 +-----------------
 5 files changed, 5 insertions(+), 395 deletions(-)

diff --git a/data/styles/default/include/Basemap_label.mapcss b/data/styles/default/include/Basemap_label.mapcss
index d57b6e418..6f80b6540 100644
--- a/data/styles/default/include/Basemap_label.mapcss
+++ b/data/styles/default/include/Basemap_label.mapcss
@@ -39,14 +39,10 @@
 node|z1-2[place=continent],
 /* TODO: add to mapping
 node|z9-[place=archipelago],
-area|z9-[place=archipelago],
 */
 node|z9-[place=island],
-area|z9-[place=island],
 node|z14-[natural=cape],
-area|z14-[natural=cape],
 node|z14-[place=islet],
-area|z14-[place=islet],
 {text: name; text-color: @district_label;}
 
 node|z1-2[place=continent]
@@ -54,42 +50,31 @@ node|z1-2[place=continent]
 
 /*
 node|z9-[place=archipelago],
-area|z9-[place=archipelago],
 */
 node|z9-[place=island],
-area|z9-[place=island],
 {font-size: 8;}
 
 /*
 node|z12-[place=archipelago],
-area|z12-[place=archipelago],
 */
 node|z12-[place=island],
-area|z12-[place=island]
 {font-size: 9;}
 
 /*
 node|z14-[place=archipelago],
-area|z14-[place=archipelago],
 */
 node|z14-[place=island],
-area|z14-[place=island],
 node|z14-[place=islet],
-area|z14-[place=islet],
 {font-size: 10;}
 
 /*
 node|z16-[place=archipelago],
-area|z16-[place=archipelago],
 */
 node|z16-[place=island],
-area|z16-[place=island],
 node|z16-[place=islet],
-area|z16-[place=islet],
 {font-size: 12;}
 
 node|z14-[natural=cape],
-area|z14-[natural=cape]
 {font-size: 8;text-color: @poi_label;}
 
 /* 3.COUNTRIES & STATES */
@@ -483,7 +468,6 @@ area|z17-[landuse=plant_nursery],
 /* 5.2 Beach, Glacier, Desert, etc. */
 
 area|z14-[natural=desert],
-area|z15-[natural=beach],
 node|z15-[natural=beach],
 {text: name;font-size: 10;text-color: @poi_label;}
 
@@ -523,7 +507,6 @@ line|z13-[natural=strait],
 node|z14-[natural=strait],
 node|z14-[natural=bay],
 node|z16-[natural=wetland],
-area|z16-[natural=wetland],
 {text:name;text-color: @water_label;text-halo-color: @water;text-halo-radius: 0.1;text-halo-opacity: 0.4;}
 
 area|z10-[natural=water][!tunnel][bbox_area<4000000],
@@ -631,10 +614,8 @@ area|z18-[piste:type=snow_park],
 
 area|z15-[landuse=cemetery],
 node|z17-[landuse=cemetery],
-area|z17-[amenity=grave_yard],
 node|z17-[amenity=grave_yard],
 node|z17-[cemetery=grave],
-area|z17-[cemetery=grave],
 {icon-image: cemetery-m.svg; text: name; text-offset: 1; font-size: 10; text-color: @poi_label;}
 
 /* 	7.5 Pedestrian areas */
@@ -649,12 +630,10 @@ area|z16-[place=square],
 {text: name;font-size: 11;text-color: @city_label;text-position: center;text-halo-color: @halo_park_label;text-halo-radius: 0.5;text-halo-opacity: 0.8;}
 /* 	7.6 Military */
 
-area|z16[landuse=military],
-node|z16[landuse=military]
+node|z16[landuse=military],
 {icon-image: military-m.svg;icon-min-distance: 10;}
 
-area|z17-[landuse=military],
-node|z17-[landuse=military]
+node|z17-[landuse=military],
 {icon-image: military-m.svg;text-offset: 1;text: name;font-size: 10;text-color: @poi_label;}
 
 /* 	7.7 Commercial */
@@ -665,10 +644,8 @@ area|z16-[landuse=commercial],
 
 /* 8.BUILDINGS */
 
-area|z16-[building],
 node|z16-[building],
 {text: name;text-color: @building_label;text-position: center;}
-area|z16-[building]::int_name,
 node|z16-[building]::int_name,
 {text:int_name;text-color: @building_label;text-position: center;}
 
@@ -712,16 +689,12 @@ node|z17-[man_made=breakwater]
 
 /*	8.2 Building */
 
-area|z16-17[building],
 node|z16-17[building],
 {font-size: 9;}
-area|z16-17[building]::int_name,
 node|z16-17[building]::int_name,
 {font-size: 8;}
-area|z18-[building],
 node|z18-[building],
 {font-size: 11;}
-area|z18-[building]::int_name,
 node|z18-[building]::int_name,
 {font-size: 10;}
 
diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index b2f3717ce..0e71478a5 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -2040,7 +2040,6 @@ node|z17-[amenity=bicycle_parking],
 {icon-image: bicycle-parking-m.svg;}
 
 node|z17-[amenity=bicycle_parking][covered=yes],
-area|z17-[amenity=bicycle_parking][covered=yes],
 {icon-image: bicycle-parking-covered-m.svg;}
 
 node|z17-[amenity=motorcycle_parking],
diff --git a/data/styles/outdoors/include/Icons.mapcss b/data/styles/outdoors/include/Icons.mapcss
index 934d9d80f..9e63ee350 100644
--- a/data/styles/outdoors/include/Icons.mapcss
+++ b/data/styles/outdoors/include/Icons.mapcss
@@ -5,23 +5,16 @@
 /* 2. NATURAL */
 
 node|z11-[natural=cave_entrance],
-area|z11-[natural=cave_entrance],
 node|z11-[waterway=waterfall],
-area|z11-[waterway=waterfall],
 node|z11-[natural=peak][name],
 node|z15-[natural=saddle],
 node|z12-[mountain_pass],
 node|z13-[man_made=communications_tower],
 node|z14-[natural=spring],
-area|z14-[natural=spring],
 node|z14-[amenity=water_point],
-area|z14-[amenity=water_point],
 node|z14-[amenity=drinking_water],
-area|z14-[amenity=drinking_water],
 node|z14-[man_made=water_tap],
-area|z14-[man_made=water_tap],
 node|z14-[man_made=water_well],
-area|z14-[man_made=water_well],
 node|z15-[tourism=information],
 node|z14-[tourism=information][information=office],
 node|z14-[tourism=information][information=visitor_centre],
@@ -35,11 +28,8 @@ node|z14-[man_made=tower],
 node|z15-[amenity=hunting_stand],
 node|z15-[man_made=survey_point],
 node|z15-[natural=hot_spring],
-area|z15-[natural=hot_spring],
 node|z12-[natural=geyser],
-area|z12-[natural=geyser],
 node|z14-[natural=beach],
-area|z14-[natural=beach],
 area|z13-[natural=bare_rock][name],
 {text: name;text-color: @poi_label;text-position: center;text-offset: 1;font-size: 10;}
 node|z11-[natural=peak][!name],
@@ -47,46 +37,31 @@ area|z13-[natural=bare_rock][!name],
 {text: none;}
 
 node|z11-17[boundary=national_park],
-area|z11-17[boundary=national_park],
 node|z11-17[boundary=protected_area],
-area|z11-17[boundary=protected_area],
 node|z11-17[leisure=nature_reserve],
-area|z11-17[leisure=nature_reserve],
 area|z13-[landuse=forest][name],
 {text: name;text-offset: 1;text-color: @park_label;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;text-halo-radius:0.5;font-size: 10;}
 
 node|z10-12[natural=cave_entrance],
-area|z10-12[natural=cave_entrance],
 {icon-image: cave-s.svg; icon-min-distance: 20;}
 node|z13-[natural=cave_entrance],
-area|z13-[natural=cave_entrance],
 {icon-image: cave-m.svg; font-size: 11;}
 node|z16-[natural=cave_entrance],
-area|z16-[natural=cave_entrance],
 {font-size: 12;}
 
 node|z10-12[boundary=national_park],
-area|z10-12[boundary=national_park],
 node|z10-12[boundary=protected_area],
-area|z10-12[boundary=protected_area],
 node|z10-12[leisure=nature_reserve],
-area|z10-12[leisure=nature_reserve],
 area|z12[landuse=forest][name],
 {icon-image: nparkf-outline-s.svg;}
 node|z13-17[boundary=national_park],
-area|z13-17[boundary=national_park],
 node|z13-17[boundary=protected_area],
-area|z13-17[boundary=protected_area],
 node|z13-17[leisure=nature_reserve],
-area|z13-17[leisure=nature_reserve],
 area|z13-[landuse=forest][name],
 {icon-image: nparkf-outline-m.svg;font-size: 11;text-halo-opacity: 0.9;}
 node|z17[boundary=national_park],
-area|z17[boundary=national_park],
 node|z17[boundary=protected_area],
-area|z17[boundary=protected_area],
 node|z17[leisure=nature_reserve],
-area|z17[leisure=nature_reserve],
 area|z17-[landuse=forest][name],
 {font-size: 12;}
 
@@ -94,23 +69,17 @@ area|z12-[landuse=forest][!name],
 {}
 
 node|z10-12[waterway=waterfall],
-area|z10-12[waterway=waterfall],
 {icon-image: waterfall-s.svg; icon-min-distance: 15;}
 node|z13-[waterway=waterfall],
-area|z13-[waterway=waterfall],
 {icon-image: waterfall-m.svg; font-size: 11;}
 node|z16-[waterway=waterfall],
-area|z16-[waterway=waterfall],
 {font-size: 12;}
 
 node|z10-12[natural=volcano],
-area|z10-12[natural=volcano],
 {icon-image: volcano-s.svg;}
 node|z13-[natural=volcano],
-area|z13-[natural=volcano],
 {icon-image: volcano-m.svg; font-size: 11;}
 node|z16-[natural=volcano],
-area|z16-[natural=volcano],
 {font-size: 12;}
 
 node|z10-12[natural=peak][name],
@@ -139,41 +108,26 @@ node|z16-[mountain_pass],
 {font-size: 12;}
 
 node|z10-12[natural=geyser],
-area|z10-12[natural=geyser],
 {icon-image: geyser-s.svg; icon-min-distance: 24;}
 node|z13-[natural=geyser],
-area|z13-[natural=geyser],
 {icon-image: geyser-m.svg; font-size: 11;}
 node|z16-[natural=geyser],
-area|z16-[natural=geyser],
 {font-size: 12;}
 
 node|z12-14[amenity=water_point],
-area|z12-14[amenity=water_point],
 node|z12-14[amenity=drinking_water],
-area|z12-14[amenity=drinking_water],
 node|z12-14[man_made=water_tap],
-area|z12-14[man_made=water_tap],
 node|z12-14[man_made=water_well],
-area|z12-14[man_made=water_well],
 node|z12-14[natural=spring],
-area|z12-14[natural=spring],
 node|z12-14[natural=hot_spring],
-area|z12-14[natural=hot_spring],
 {icon-image: drinking-water-s.svg;}
 
 node|z15-[amenity=water_point],
-area|z15-[amenity=water_point],
 node|z15-[amenity=drinking_water],
-area|z15-[amenity=drinking_water],
 node|z15-[man_made=water_tap],
-area|z15-[man_made=water_tap],
 node|z15-[man_made=water_well],
-area|z15-[man_made=water_well],
 node|z15-[natural=spring],
-area|z15-[natural=spring],
 node|z15-[natural=hot_spring],
-area|z15-[natural=hot_spring],
 {icon-image: drinking-water-m.svg; font-size: 11;}
 
 node|z12-[natural=spring][drinking_water=not],
@@ -199,83 +153,55 @@ node|z15-[amenity=water_point][drinking_water=not],
 /* 4.2 Apartament */
 
 node|z11-[tourism=alpine_hut],
-area|z11-[tourism=alpine_hut],
 node|z13-[tourism=wilderness_hut],
-area|z13-[tourism=wilderness_hut],
 node|z12-[emergency=mountain_rescue],
 node|z13-[tourism=viewpoint],
 node|z14-[tourism=chalet],
-area|z14-[tourism=chalet],
 node|z13-[tourism=camp_site],
-area|z13-[tourism=camp_site],
 node|z14-[tourism=picnic_site],
-area|z14-[tourism=picnic_site],
 node|z16-[leisure=picnic_table],
-area|z16-[leisure=picnic_table],
 node|z17-[amenity=bbq],
-area|z17-[amenity=bbq],
 node|z17-[leisure=firepit],
 node|z13-[amenity=shelter],
-area|z13-[amenity=shelter],
 node|z13-[amenity=shelter][shelter_type=basic_hut],
 node|z13-[amenity=shelter][shelter_type=lean_to],
 node|z13-[tourism=caravan_site],
-area|z13-[tourism=caravan_site],
 {text: name; text-color: @poi_label; text-offset: 1; font-size: 10;}
 
 node|z11-[tourism=alpine_hut],
-area|z11-[tourism=alpine_hut],
 node|z12-[tourism=wilderness_hut],
-area|z12-[tourism=wilderness_hut],
 {icon-image: alpine_hut-s.svg; icon-min-distance: 24;}
 node|z13-[tourism=alpine_hut],
-area|z13-[tourism=alpine_hut],
 node|z13-[tourism=wilderness_hut],
-area|z13-[tourism=wilderness_hut],
 node|z14-[tourism=chalet],
-area|z14-[tourism=chalet],
 {font-size: 11;}
 node|z14-[tourism=alpine_hut],
-area|z14-[tourism=alpine_hut],
 node|z14-[tourism=wilderness_hut],
-area|z14-[tourism=wilderness_hut],
 node|z14-[tourism=chalet],
-area|z14-[tourism=chalet],
 {icon-image: alpine_hut-m.svg;}
 node|z16-[tourism=alpine_hut],
-area|z16-[tourism=alpine_hut],
 node|z16-[tourism=wilderness_hut],
-area|z16-[tourism=wilderness_hut],
 node|z16-[tourism=chalet],
-area|z16-[tourism=chalet],
 {font-size: 12; icon-min-distance: 0;}
 
 node|z13-[tourism=camp_site],
-area|z13-[tourism=camp_site],
 {icon-image: campsite-s.svg; icon-min-distance: 12; font-size: 11;}
 node|z14-[tourism=camp_site],
-area|z14-[tourism=camp_site],
 {icon-image: campsite-m.svg;}
 node|z16-[tourism=camp_site],
-area|z16-[tourism=camp_site],
 {font-size: 12; icon-min-distance: 0;}
 
 node|z14-[tourism=picnic_site],
-area|z14-[tourism=picnic_site],
 {icon-image: picnic-m.svg;icon-min-distance: 10;font-size: 11;}
 node|z16-[tourism=picnic_site],
-area|z16-[tourism=picnic_site],
 {font-size: 12; icon-min-distance: 0;}
 
 node|z15-[leisure=picnic_table],
-area|z15-[leisure=picnic_table],
 {icon-image: picnic_table-m.svg;}
 node|z16-[leisure=picnic_table],
-area|z16-[leisure=picnic_table],
 {font-size: 11;}
 
 node|z16-[amenity=bbq],
-area|z16-[amenity=bbq],
 {icon-image: bbq-m.svg; font-size: 11;}
 
 node|z16-[leisure=firepit],
@@ -287,13 +213,11 @@ node|z12-[amenity=shelter][shelter_type=lean_to],
 node|z12-[amenity=shelter][shelter_type=basic_hut],
 {icon-image: alpine_hut-s.svg; icon-min-distance: 10; font-size: 11;}
 node|z14-[amenity=shelter],
-area|z14-[amenity=shelter],
 node|z14-[amenity=shelter][shelter_type=lean_to],
 {icon-image: shelter-m.svg;}
 node|z14-[amenity=shelter][shelter_type=basic_hut],
 {icon-image: alpine_hut-m.svg;}
 node|z16-[amenity=shelter],
-area|z16-[amenity=shelter],
 node|z16-[amenity=shelter][shelter_type=lean_to],
 node|z16-[amenity=shelter][shelter_type=basic_hut],
 {font-size: 12; icon-min-distance: 0;}
@@ -303,13 +227,10 @@ node|z14-[amenity=shelter][shelter_type=public_transport],
 {icon-image: shelter-public_transport-m.svg;}
 
 node|z13-[tourism=caravan_site],
-area|z13-[tourism=caravan_site],
 {icon-image: caravan_site-s.svg; font-size: 11; icon-min-distance: 12;}
 node|z14-[tourism=caravan_site],
-area|z14-[tourism=caravan_site],
 {icon-image: caravan_site-m.svg;}
 node|z16-[tourism=caravan_site],
-area|z16-[tourism=caravan_site],
 {font-size: 12; icon-min-distance: 0;}
 
 node|z11-12[tourism=viewpoint],
@@ -349,17 +270,13 @@ area|z14-[highway=rest_area],
 {icon-image: picnic-m.svg;}
 
 node|z15-[amenity=toilets],
-area|z15-[amenity=toilets],
 {icon-image: toilets-m.svg; font-size: 11;}
 
 node|z11-12[man_made=lighthouse],
-area|z11-12[man_made=lighthouse],
 {icon-image: lighthouse-s.svg; icon-min-distance: 10;}
 node|z13-[man_made=lighthouse],
-area|z13-[man_made=lighthouse],
 {icon-image: lighthouse-m.svg; font-size: 11;}
 node|z16-[man_made=lighthouse],
-area|z16-[man_made=lighthouse],
 {font-size: 12;}
 
 node|z12-[barrier=border_control],
@@ -382,14 +299,11 @@ node|z15-[man_made=utility_pole],
 {icon-image: mast-m.svg;}
 
 node|z13-[power=generator][generator:source=wind],
-area|z13-[power=generator][generator:source=wind],
 {icon-image: dot-m.svg;}
 node|z16-[power=generator][generator:source=wind],
-area|z16-[power=generator][generator:source=wind],
 {icon-image: wind_turbine-m.svg;text: name;text-color: @poi_label; text-offset: 1; font-size: 10;}
 
 node|z13-[power=plant][plant:source=wind],
-area|z13-[power=plant][plant:source=wind],
 {icon-image: power_plant_wind-m.svg;}
 
 node|z12-[man_made=flagpole],
diff --git a/data/styles/vehicle/include/Basemap_label.mapcss b/data/styles/vehicle/include/Basemap_label.mapcss
index ebaa6df1e..418aa675d 100644
--- a/data/styles/vehicle/include/Basemap_label.mapcss
+++ b/data/styles/vehicle/include/Basemap_label.mapcss
@@ -37,12 +37,9 @@
 node|z1-2[place=continent],
 /*
 node|z12-[place=archipelago],
-area|z12-[place=archipelago],
 */
 node|z12-14[place=island],
-area|z12-14[place=island],
 node|z14-[natural=cape],
-area|z14-[natural=cape]
 {text: name;}
 
 node|z1-2[place=continent]
@@ -50,14 +47,11 @@ node|z1-2[place=continent]
 
 /*
 node|z12-[place=archipelago],
-area|z12-[place=archipelago],
 */
 node|z12-14[place=island],
-area|z12-14[place=island]
 {font-size: 9;text-color: @district_label;}
 
 node|z14-[natural=cape],
-area|z14-[natural=cape]
 {font-size: 8;text-color: @poi_label;}
 
 /* 3.COUNTRIES & STATES */
@@ -383,7 +377,6 @@ area|z10-[natural=water][!tunnel][bbox_area>=4000000],
 line|z11-[waterway=river],
 node|z14-[natural=bay],
 node|z16-[natural=wetland],
-area|z16-[natural=wetland],
 {text:name;text-color: @water_label;}
 
 area|z10-[natural=water][!tunnel][bbox_area<4000000],
@@ -487,10 +480,8 @@ area|z17-[landuse=military],
 
 /* 8.BUILDINGS */
 
-area|z18-[building],
 node|z18-[building],
 {text: name; text-color: @building_label; text-position: center;}
-area|z18-[building]::int_name,
 node|z18-[building]::int_name,
 {text: int_name; text-color: @building_label; text-position: center;}
 
@@ -524,16 +515,12 @@ node|z19-[entrance=exit]::flats,
 
 /* 8.2 Building */
 
-area|z18[building],
 node|z18[building],
 {font-size: 13;}
-area|z18[building]::int_name,
 node|z18[building]::int_name,
 {font-size: 12;}
-area|z19-[building],
 node|z19-[building],
 {font-size: 14;}
-area|z19-[building]::int_name,
 node|z19-[building]::int_name,
 {font-size: 13;}
 
diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss
index 0110dcf9e..86d41ffd8 100644
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -27,13 +27,9 @@
 /* 2. NATURAL */
 
 node|z12-[landuse=forest][name],
-area|z12-[landuse=forest][name],
 node|z12-[boundary=national_park],
-area|z12-[boundary=national_park],
 node|z12-[boundary=protected_area],
-area|z12-[boundary=protected_area],
 node|z12-[leisure=nature_reserve],
-area|z12-[leisure=nature_reserve]
 {text: name;text-color: @park_label;text-halo-opacity: 0.75;text-halo-color: @label_halo_light;text-halo-radius:0.4;}
 
 
@@ -42,54 +38,33 @@ node|z14-[highway=ford]
 
 /*
 node|z11[landuse=forest][name],
-area|z11[landuse=forest][name],
 node|z11[boundary=national_park],
-area|z11[boundary=national_park],
 node|z11[boundary=protected_area],
-area|z11[boundary=protected_area],
 node|z11[leisure=nature_reserve],
-area|z11[leisure=nature_reserve]
 {icon-image: nparkf-outline-s.svg;icon-min-distance: 20;}
 */
 node|z12-13[landuse=forest][name],
-area|z12-13[landuse=forest][name],
 node|z12-13[boundary=national_park],
-area|z12-13[boundary=national_park],
 node|z12-13[boundary=protected_area],
-area|z12-13[boundary=protected_area],
 node|z12-13[leisure=nature_reserve],
-area|z12-13[leisure=nature_reserve]
 {icon-image: nparkf-outline-s.svg;text-offset: 1;font-size: 11;icon-min-distance: 12;}
 node|z14[landuse=forest][name],
-area|z14[landuse=forest][name],
 node|z14[boundary=national_park],
-area|z14[boundary=national_park],
 node|z14[boundary=protected_area],
-area|z14[boundary=protected_area],
 node|z14[leisure=nature_reserve],
-area|z14[leisure=nature_reserve]
 {icon-image: nparkf-outline-m.svg;text-offset: 1;font-size: 12.25;}
 node|z15-16[landuse=forest][name],
-area|z15-16[landuse=forest][name],
 node|z15-16[boundary=national_park],
-area|z15-16[boundary=national_park],
 node|z15-16[boundary=protected_area],
-area|z15-16[boundary=protected_area],
 node|z15-16[leisure=nature_reserve],
-area|z15-16[leisure=nature_reserve]
 {icon-image: nparkf-outline-m.svg;text-offset: 1;font-size: 12.5;text-halo-opacity: 0.85;}
 node|z17-[landuse=forest][name],
-area|z17-[landuse=forest][name],
 node|z17-[boundary=national_park],
-area|z17-[boundary=national_park],
 node|z17-[boundary=protected_area],
-area|z17-[boundary=protected_area],
 node|z17-[leisure=nature_reserve],
-area|z17-[leisure=nature_reserve]
 {icon-image: nparkf-outline-m.svg;text-offset: 1;font-size: 13.75;text-halo-opacity: 0.9;}
 
 node|z12-[landuse=forest][!name],
-area|z12-[landuse=forest][!name],
 {}
 
 
@@ -103,20 +78,14 @@ node|z14-[railway=halt]::int_name,
 {text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;}
 
 node|z17-[railway=tram_stop],
-area|z17-[railway=tram_stop]
 {text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
 node|z17-[railway=tram_stop]::int_name,
-area|z17-[railway=tram_stop]::int_name
 {text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
 
-area|z10-[aeroway=aerodrome][aerodrome=international],
 node|z10-[aeroway=aerodrome][aerodrome=international],
-area|z14-[aeroway=aerodrome],
 node|z14-[aeroway=aerodrome],
 {text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;}
-area|z12-[aeroway=aerodrome][aerodrome=international]::int_name,
 node|z12-[aeroway=aerodrome][aerodrome=international]::int_name,
-area|z14-[aeroway=aerodrome]::int_name,
 node|z14-[aeroway=aerodrome]::int_name,
 {text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;}
 
@@ -163,13 +132,10 @@ node|z15-[highway=traffic_signals],
 /* 3.3 Tram Station */
 
 node|z17[railway=tram_stop],
-area|z17[railway=tram_stop]
 {icon-image: tram-m.svg;text-offset: 1;font-size: 13;text-opacity: 0;text-halo-opacity: 0;}
 node|z17-[railway=tram_stop]::int_name,
-area|z17-[railway=tram_stop]::int_name
 {text-offset: 1;font-size: 11;text-opacity: 0; text-halo-opacity: 0;} /*check*/
 node|z18-[railway=tram_stop],
-area|z18-[railway=tram_stop]
 {icon-image: tram-m.svg;text-offset: 1;font-size: 13;text-opacity: 0; text-halo-opacity: 0;}
 
 /* 3.4 Bus Station */
@@ -182,25 +148,19 @@ area|z18-[railway=tram_stop]
 
 /* 3.6 Airport */
 
-area|z7-9[aeroway=aerodrome][aerodrome=international],
 node|z7-9[aeroway=aerodrome][aerodrome=international],
 {icon-image: airport-s.svg;}
 
-area|z10[aeroway=aerodrome][aerodrome=international],
 node|z10[aeroway=aerodrome][aerodrome=international],
 {icon-image: airport-s.svg;text-offset: 1;font-size: 10;}
-area|z11-13[aeroway=aerodrome][aerodrome=international],
 node|z11-13[aeroway=aerodrome][aerodrome=international],
 {icon-image: airport-m.svg; text-offset: 1; font-size: 11;}
-area|z14-[aeroway=aerodrome],
-node|z14-[aeroway=aerodrome]
+node|z14-[aeroway=aerodrome],
 {icon-image: airport-m.svg;text-offset: 1;font-size: 12;}
-area|z14-[aeroway=aerodrome]::int_name,
 node|z14-[aeroway=aerodrome]::int_name,
 {font-size: 11;}
 
 /*
-area|z17-[aeroway=heliport],
 node|z17-[aeroway=heliport],
 {icon-image: helipad-m.svg;text-offset: 1;font-size: 11;text: name;text-color: @poi_label;}
 */
@@ -217,151 +177,96 @@ node|z17-[railway=level_crossing]
 /* 4.1 Main POI */
 
 node|z15-[historic=fort],
-area|z15-[historic=fort],
 node|z15-[historic=castle],
-area|z15-[historic=castle],
 node|z15-[historic=monument],
-area|z15-[historic=monument],
 node|z15-[historic=city_gate],
-area|z15-[historic=city_gate],
 node|z15-[tourism=museum],
-area|z15-[tourism=museum],
 node|z15-[tourism=zoo],
-area|z15-[tourism=zoo],
 node|z15-[amenity=theatre],
-area|z15-[amenity=theatre],
 node|z15-[tourism=attraction],
-area|z15-[tourism=attraction],
 node|z15-[tourism=theme_park],
-area|z15-[tourism=theme_park],
 node|z15-[tourism=viewpoint],
 node|z15-[historic=memorial],
-area|z15-[historic=memorial],
 node|z15-[historic=battlefield],
-area|z15-[historic=battlefield],
 node|z15-[tourism=gallery],
-area|z15-[tourism=gallery],
 node|z16-[amenity=community_centre],
-area|z16-[amenity=community_centre],
 node|z16-[historic=boundary_stone],
-area|z16-[historic=boundary_stone],
 node|z16-[historic=wayside_cross],
-area|z16-[historic=wayside_cross],
 node|z16-[historic=gallows],
-area|z16-[historic=gallows],
 node|z16-[historic=pillory],
-area|z16-[historic=pillory],
 node|z16-[historic=ship],
-area|z16-[historic=ship],
 node|z16-[historic=tomb],
-area|z16-[historic=tomb],
 node|z17-[historic=ruins],
-area|z17-[historic=ruins],
 node|z17-[historic=wayside_shrine],
-area|z17-[historic=wayside_shrine],
 node|z17-[historic=archaeological_site],
-area|z17-[historic=archaeological_site],
 node|z17-[amenity=arts_centre],
-area|z17-[amenity=arts_centre],
 node|z18-[tourism=artwork],
 {text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
 
 node|z12-14[historic=fort],
-area|z12-14[historic=fort],
 node|z12-14[historic=castle],
-area|z12-14[historic=castle]
 {icon-image: remains-m.svg;}
 node|z15[historic=fort],
-area|z15[historic=fort],
 node|z15[historic=castle],
-area|z15[historic=castle]
 {icon-image: remains-m.svg;icon-min-distance: 5;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
 node|z16[historic=fort],
-area|z16[historic=fort],
 node|z16[historic=castle],
-area|z16[historic=castle]
 {icon-image: remains-m.svg;text-offset: 1;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
 node|z17-[historic=ruins][name],
-area|z17-[historic=ruins][name],
 node|z17-[historic=fort],
-area|z17-[historic=fort],
 node|z17-[historic=castle],
-area|z17-[historic=castle]
 {icon-image: remains-m.svg;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
 
 node|z17-[historic=archaeological_site],
-area|z17-[historic=archaeological_site]
 {icon-image: archaeological-site-m.svg;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
 
 node|z19-[historic=ruins][!name],
-area|z19-[historic=ruins][!name],
 {icon-image: remains-m.svg;}
 
 node|z13-14[historic=monument],
-area|z13-14[historic=monument],
 {icon-image: monument-m.svg;}
 node|z15[historic=monument],
-area|z15[historic=monument],
 node|z15[historic=memorial],
-area|z15[historic=memorial],
 node|z15[historic=battlefield],
-area|z15[historic=battlefield],
 {icon-image: monument-m.svg;icon-min-distance: 24;}
 node|z16-[historic=monument],
-area|z16-[historic=monument],
 node|z16-[historic=memorial],
-area|z16-[historic=memorial],
 node|z16-[historic=battlefield],
-area|z16-[historic=battlefield],
 {icon-image: monument-m.svg;icon-min-distance: 12;}
 
 /* Do not display following features on lower zoom levels */
 node|z15-[historic=memorial][memorial=plaque],
-area|z15-[historic=memorial][memorial=plaque],
 node|z15-[historic=memorial][memorial=stolperstein],
-area|z15-[historic=memorial][memorial=stolperstein],
 node|z15-16[historic=memorial][memorial=cross],
-area|z15-16[historic=memorial][memorial=cross],
 {icon-image: none; text: none;}
 
 node|z17-[historic=memorial][memorial=cross],
-area|z17-[historic=memorial][memorial=cross],
 {icon-image: cross-m.svg; icon-min-distance: 12;}
 
 node|z13-14[historic=city_gate],
-area|z13-14[historic=city_gate]
 {icon-image: remains-m.svg;}
 node|z15[historic=city_gate],
-area|z15[historic=city_gate],
 {icon-image: remains-m.svg;icon-min-distance: 24;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
 node|z16-[historic=city_gate],
-area|z16-[historic=city_gate],
 {icon-image: remains-m.svg;icon-min-distance: 12;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
 
 node|z15[tourism=museum],
-area|z15[tourism=museum]
 {icon-image: museum-m.svg;icon-min-distance: 24;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
 node|z16-[tourism=museum],
-area|z16-[tourism=museum],
 {icon-image: museum-m.svg;text-offset: 1;icon-min-distance: 12;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
 
 node|z15[tourism=gallery]
 {icon-image: gallery-m.svg;icon-min-distance: 8;} /* <-- <-- не показывается, непонятно почему, позже разобраться */
 node|z16-[tourism=gallery],
-area|z16-[tourism=gallery],
 node|z17-[amenity=arts_centre],
-area|z17-[amenity=arts_centre]
 {icon-image: gallery-m.svg;text-offset: 1;icon-min-distance: 12;}
 
 node|z15-[amenity=theatre],
-area|z15-[amenity=theatre],
 {icon-image: theatre-m.svg;icon-min-distance: 10;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
 
 node|z15[tourism=zoo],
-area|z15[tourism=zoo]
 {icon-image: zoo-m.svg;icon-min-distance: 8;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
 node|z16-[tourism=zoo],
-area|z16-[tourism=zoo]
 {icon-image: zoo-m.svg;text-offset: 1;icon-min-distance: 8;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
 
 node|z14[tourism=viewpoint]
@@ -370,168 +275,114 @@ node|z15-[tourism=viewpoint]
 {icon-image: viewpoint-m.svg;icon-min-distance: 8;text: name;text-offset: 1;font-size: 10;text-color: @poi_label;}
 
 node|z16[historic=boundary_stone],
-area|z16[historic=boundary_stone],
 node|z16[historic=wayside_cross],
-area|z16[historic=wayside_cross],
 node|z16[historic=gallows],
-area|z16[historic=gallows],
 node|z16[historic=pillory],
-area|z16[historic=pillory]
 {icon-image: monument-m.svg;font-size: 11;icon-min-distance: 8;}
 node|z16[historic=ship],
-area|z16[historic=ship]
 {icon-image: historic-ship-m.svg;font-size: 11;icon-min-distance: 8;}
 node|z16[historic=tomb],
-area|z16[historic=tomb]
 {icon-image: tomb-m.svg;font-size: 11;icon-min-distance: 8;}
 node|z16[historic=wayside_shrine],
-area|z16[historic=wayside_shrine]
 {icon-image: wayside_shrine-m.svg;font-size: 11;icon-min-distance: 8;}
 
 node|z17-[historic=boundary_stone],
-area|z17-[historic=boundary_stone],
 node|z17-[historic=wayside_cross],
-area|z17-[historic=wayside_cross],
 node|z17-[historic=gallows],
-area|z17-[historic=gallows],
 node|z17-[historic=pillory],
-area|z17-[historic=pillory],
 {icon-image: monument-m.svg;font-size: 11;icon-min-distance: 8;}
 node|z17-[historic=ship],
-area|z17-[historic=ship]
 {icon-image: historic-ship-m.svg;font-size: 11;icon-min-distance: 8;}
 node|z17-[historic=tomb],
-area|z17-[historic=tomb]
 {icon-image: tomb-m.svg;font-size: 11;icon-min-distance: 8;}
 node|z17-[historic=wayside_shrine],
-area|z17-[historic=wayside_shrine]
 {icon-image: wayside_shrine-m.svg;font-size: 11;icon-min-distance: 8;}
 
 node|z18-[tourism=artwork]
 {icon-image: tourism-m.svg;}
 
 node|z14[tourism=theme_park],
-area|z14[tourism=theme_park]
 {icon-image: theme_park-m.svg;icon-min-distance: 12;}
 node|z15[tourism=attraction],
-area|z15[tourism=attraction]
 {icon-image: tourism-m.svg;icon-min-distance: 36;}
 node|z15[tourism=theme_park],
-area|z15[tourism=theme_park]
 {icon-image: theme_park-m.svg;icon-min-distance: 36;}
 node|z16-[tourism=attraction],
-area|z16-[tourism=attraction]
 {icon-image: tourism-m.svg;icon-min-distance: 36;}
 node|z16-[tourism=theme_park],
-area|z16-[tourism=theme_park]
 {icon-image: theme_park-m.svg;icon-min-distance: 24;}
 
 node|z16-[amenity=community_centre],
-area|z16-[amenity=community_centre],
 node|z16-[amenity=conference_centre],
-area|z16-[amenity=conference_centre],
 node|z16-[amenity=events_venue],
-area|z16-[amenity=events_venue],
 node|z16-[amenity=exhibition_centre],
-area|z16-[amenity=exhibition_centre],
 {icon-image: community-m.svg;icon-min-distance: 24;}
 
 
 /* 4.3 Food */
 node|z15-[amenity=cafe],
-area|z15-[amenity=cafe],
 node|z16-[amenity=restaurant],
-area|z16-[amenity=restaurant],
 node|z16-[amenity=pub],
-area|z16-[amenity=pub],
 node|z17-[amenity=fast_food],
-area|z17-[amenity=fast_food],
 {text: name;text-color: @poi_label;text-offset: 1;font-size: 13;}
 
 node|z15[amenity=cafe],
-area|z15[amenity=cafe]
 {icon-image: cafe-m.svg;icon-min-distance: 3;font-size: 12.5;}
 node|z16[amenity=cafe],
-area|z16[amenity=cafe]
 {icon-image: cafe-m.svg;icon-min-distance: 10;font-size: 12.75;}
 node|z16[amenity=restaurant],
-area|z16[amenity=restaurant]
 {icon-image: restaurant-m.svg;icon-min-distance: 22;font-size: 12.75;}
 node|z16[amenity=pub],
-area|z16[amenity=pub]
 {icon-image: pub-m.svg;icon-min-distance: 22;font-size: 12.75;}
 
 node|z17[amenity=cafe],
-area|z17[amenity=cafe]
 {icon-image: cafe-m.svg;icon-min-distance: 20;font-size: 13.75;}
 node|z17[amenity=restaurant],
-area|z17[amenity=restaurant]
 {icon-image: restaurant-m.svg;icon-min-distance: 22;font-size: 13.75;}
 node|z17[amenity=pub],
-area|z17[amenity=pub]
 {icon-image: pub-m.svg;icon-min-distance: 22;font-size: 13.75;}
 node|z17[amenity=fast_food],
-area|z17[amenity=fast_food]
 {icon-image: fastfood-m.svg;icon-min-distance: 25;font-size: 13.75;}
 
 node|z18[amenity=cafe],
-area|z18[amenity=cafe]
 {icon-image: cafe-m.svg;icon-min-distance: 25;font-size: 14.5;}
 node|z18[amenity=restaurant],
-area|z18[amenity=restaurant]
 {icon-image: restaurant-m.svg;icon-min-distance: 25;font-size: 14.5;}
 node|z18[amenity=pub],
-area|z18[amenity=pub]
 {icon-image: pub-m.svg;icon-min-distance: 25;font-size: 14.5;}
 node|z18[amenity=fast_food],
-area|z18[amenity=fast_food]
 {icon-image: fastfood-m.svg;icon-min-distance: 25;font-size: 14.5;}
 
 node|z19-[amenity=cafe],
-area|z19-[amenity=cafe]
 {icon-image: cafe-m.svg;icon-min-distance: 35;font-size: 14.5;}
 node|z19-[amenity=restaurant],
-area|z19-[amenity=restaurant]
 {icon-image: restaurant-m.svg;icon-min-distance: 40;font-size: 14.5;}
 node|z19-[amenity=pub],
-area|z19-[amenity=pub]
 {icon-image: pub-m.svg;icon-min-distance: 40;font-size: 14.5;}
 node|z19-[amenity=fast_food],
-area|z19-[amenity=fast_food]
 {icon-image: fastfood-m.svg;icon-min-distance: 45;font-size: 14.5;}
 
 /* 5.AMENITY (infrastructure) */
 node|z17-[amenity=place_of_worship],
-area|z17-[amenity=place_of_worship],
 {text: name;text-color: @poi_label;text-offset: 1;font-size: 10;}
 
 node|z16-[amenity=prison],
-area|z16-[amenity=prison]
 {icon-image: prison-m.svg;text: name;text-color: @poi_label;text-offset: 1;font-size: 11;}
 
 /*node|z13-[leisure=stadium],
 area|z13-[leisure=stadium],*/
-area|z15-[amenity=university],
 node|z15-[amenity=university],
 node|z15-[amenity=hospital],
 node|z14-[barrier=toll_booth],
-area|z14-[barrier=toll_booth],
 node|z14-[barrier=border_control],
 node|z16-[barrier=lift_gate],
-area|z16-[barrier=lift_gate],
 node|z16-[man_made=communications_tower],
 node|z17-[amenity=bank],
-area|z17-[amenity=bank],
 node|z17-[amenity=vending_machine][vending=fuel],
-area|z17-[amenity=vending_machine][vending=fuel],
 node|z17-[amenity=vending_machine][vending=parking_tickets],
-area|z17-[amenity=vending_machine][vending=parking_tickets],
 node|z17-[amenity=parcel_locker],
-area|z17-[amenity=parcel_locker],
 node|z17-[amenity=post_office],
-area|z17-[amenity=post_office],
 node|z18-[post_office=post_partner],
-area|z18-[post_office=post_partner],
 {text: name;text-color: @poi_label;text-offset: 1;font-size: 11;}
 
 /* POI */
@@ -553,20 +404,15 @@ node|z18-[amenity=hospital],
 
 /* 5.2 Education */
 
-area|z15-[amenity=university][name],
-node|z15-[amenity=university][name]
+node|z15-[amenity=university][name],
 {icon-image: college-m.svg;icon-min-distance: 15;font-size: 12.5;}
-area|z16[amenity=university][name],
-node|z16[amenity=university][name]
+node|z16[amenity=university][name],
 {icon-min-distance: 9;font-size: 12.75;}
 node|z17[amenity=university][name],
-area|z17[amenity=university][name]
 {icon-min-distance: 9;font-size: 13.75;}
 node|z18[amenity=university][name],
-area|z18[amenity=university][name]
 {icon-min-distance: 10;font-size: 14.5;}
 node|z19-[amenity=university][name],
-area|z19-[amenity=university][name]
 {icon-min-distance: 0; font-size: 14.5;}
 
 node|z15-[amenity=university][!name]
@@ -581,72 +427,52 @@ node|z15-[amenity=university][!name]
 
 
 node|z16-[amenity=place_of_worship],
-area|z16-[amenity=place_of_worship]
 {icon-image: place-of-worship-m.svg;icon-min-distance: 10;font-size: 13;}
 node|z16-[amenity=place_of_worship][religion=christian],
-area|z16-[amenity=place_of_worship][religion=christian]
 {icon-image: christian-m.svg;font-size: 13;}
 node|z16-[amenity=place_of_worship][religion=muslim],
-area|z16-[amenity=place_of_worship][religion=muslim]
 {icon-image: muslim-m.svg;font-size: 13;}
 node|z16-[amenity=place_of_worship][religion=buddhist],
-area|z16-[amenity=place_of_worship][religion=buddhist]
 {icon-image: buddhist-m.svg;font-size: 13;}
 node|z16-[amenity=place_of_worship][religion=hindu],
-area|z16-[amenity=place_of_worship][religion=hindu]
 {icon-image: hindu-m.svg;font-size: 13;}
 node|z16-[amenity=place_of_worship][religion=christian][denomination=mormon],
-area|z16-[amenity=place_of_worship][religion=christian][denomination=mormon],
 {icon-image: mormon-m.svg;font-size: 13;}
 node|z16-[amenity=place_of_worship][religion=christian][denomination=jehovahs_witness],
-area|z16-[amenity=place_of_worship][religion=christian][denomination=jehovahs_witness],
 {icon-image: place-of-worship-m.svg;font-size: 13;}
 
 
 node|z18-[amenity=place_of_worship],
-area|z18-[amenity=place_of_worship]
 {icon-image: place-of-worship-m.svg;font-size: 14.5;}
 node|z18-[amenity=place_of_worship][religion=christian],
-area|z18-[amenity=place_of_worship][religion=christian]
 {icon-image: christian-m.svg;font-size: 14.5;}
 node|z18-[amenity=place_of_worship][religion=muslim],
-area|z18-[amenity=place_of_worship][religion=muslim]
 {icon-image: muslim-m.svg;font-size: 14.5;}
 node|z18-[amenity=place_of_worship][religion=buddhist],
-area|z18-[amenity=place_of_worship][religion=buddhist]
 {icon-image: buddhist-m.svg;font-size: 14.5;}
 node|z18-[amenity=place_of_worship][religion=hindu],
-area|z18-[amenity=place_of_worship][religion=hindu]
 {icon-image: hindu-m.svg;font-size: 14.5;}
 node|z18-[amenity=place_of_worship][religion=christian][denomination=mormon],
-area|z18-[amenity=place_of_worship][religion=christian][denomination=mormon],
 {icon-image: mormon-m.svg;font-size: 14.5;}
 node|z18-[amenity=place_of_worship][religion=christian][denomination=jehovahs_witness],
-area|z18-[amenity=place_of_worship][religion=christian][denomination=jehovahs_witness],
 {icon-image: place-of-worship-m.svg;font-size: 14.5;}
 
 
 /* 5.5 Others */
 
 node|z17[amenity=bank],
-area|z17[amenity=bank]
 {icon-image: bank-m.svg;font-size: 13.75; icon-min-distance: 15;}
 node|z18-[amenity=bank],
-area|z18-[amenity=bank]
 {icon-image: bank-m.svg;font-size: 14.5; icon-min-distance: 10;}
 
 node|z17[amenity=police],
-area|z17[amenity=police]
 {icon-image: police-m.svg; font-size: 13.75; icon-min-distance: 15;}
 node|z18-[amenity=police],
-area|z18-[amenity=police]
 {icon-image: police-m.svg; font-size: 14.5; icon-min-distance: 10;}
 
 node|z12[barrier=toll_booth],
-area|z12[barrier=toll_booth],
 {icon-image: toll_booth-s.svg; icon-min-distance: 8;}
 node|z13-[barrier=toll_booth],
-area|z13-[barrier=toll_booth],
 {icon-image: toll_booth-m.svg; icon-min-distance: 8;}
 
 node|z14-[barrier=border_control],
@@ -657,76 +483,55 @@ node|z15-[man_made=communications_tower],
 {icon-image: mast-m.svg;}
 
 node|z16-[barrier=lift_gate],
-area|z16-[barrier=lift_gate]
 {icon-image: lift_gate-m.svg;icon-min-distance: 30;}
 node|z17-[barrier=lift_gate],
-area|z17-[barrier=lift_gate]
 {icon-image: lift_gate-m.svg;icon-min-distance: 20;}
 node|z18-[barrier=lift_gate],
-area|z18-[barrier=lift_gate]
 {icon-image: lift_gate-m.svg;}
 
 node|z17-[amenity=vending_machine][vending=parking_tickets],
-area|z17-[amenity=vending_machine][vending=parking_tickets],
 {icon-image: parking-meter-m.svg;font-size: 13.5;}
 
 node|z17-[amenity=vending_machine][vending=fuel],
-area|z17-[amenity=vending_machine][vending=fuel],
 {icon-image: fuel-dispenser-m.svg;}
 
 node|z17-[amenity=parcel_locker],
-area|z17-[amenity=parcel_locker],
 {icon-image: parcel_locker-m.svg;}
 
 node|z17-[amenity=post_office],
-area|z17-[amenity=post_office],
 node|z18-[post_office=post_partner],
-area|z18-[post_office=post_partner],
 {icon-image: mail-m.svg;}
 node|z18-[amenity=post_office],
-area|z18-[amenity=post_office],
 node|z18-[post_office=post_partner],
-area|z18-[post_office=post_partner],
 {font-size: 11;}
 
 /* 6. SHOP */
 
 node|z14-[shop=mall],
-area|z14-[shop=mall],
 node|z14-[shop=supermarket],
-area|z14-[shop=supermarket],
 node|z15-[shop=car_repair][service=tyres],
-area|z15-[shop=car_repair][service=tyres],
 node|z18-[shop=convenience],
 {text: name;text-color: @poi_label;text-offset: 1;font-size: 11.5;text-min-distance: 3;}
 
 
 node|z14[shop=mall],
-area|z14[shop=mall]
 {icon-image: shop-m.svg;font-size:12.25;icon-min-distance: 5;}
 node|z15[shop=mall],
-area|z15[shop=mall]
 {icon-image: shop-m.svg;font-size:12.5;icon-min-distance: 6;}
 node|z16-17[shop=mall],
-area|z16-17[shop=mall]
 {icon-image: shop-m.svg;font-size: 13.25;icon-min-distance: 8;}
 node|z18-[shop=mall],
-area|z18-[shop=mall]
 {icon-image: shop-m.svg;font-size: 14.5;icon-min-distance: 8;}
 
 node|z14[shop=supermarket],
-area|z14[shop=supermarket]
 {icon-image: supermarket-m.svg;font-size:12.25;icon-min-distance: 4;}
 node|z15[shop=supermarket],
-area|z15[shop=supermarket]
 {icon-image: supermarket-m.svg;font-size:12.5;icon-min-distance: 3;}
 node|z16-17[shop=supermarket],
-area|z16-17[shop=supermarket]
 {icon-image: supermarket-m.svg;font-size: 13.25;icon-min-distance: 16;text-min-distance:6;}
 
 
 node|z18-[shop=supermarket],
-area|z18-[shop=supermarket]
 {icon-image: supermarket-m.svg;font-size: 14.5;icon-min-distance: 15;}
 
 node|z17-[shop=convenience],
@@ -735,55 +540,39 @@ node|z18-[shop=convenience],
 {font-size: 14.5;}
 
 node|z15[shop=car_repair][service=tyres],
-area|z15[shop=car_repair][service=tyres]
 {icon-image: car-repair-m.svg; text-offset: 1; icon-min-distance: 20; font-size:12.5;}
 node|z16-[shop=car_repair][service=tyres],
-area|z16-[shop=car_repair][service=tyres]
 {icon-image: car-repair-m.svg; font-size: 12.75;}
 node|z17[shop=car_repair][service=tyres],
-area|z17[shop=car_repair][service=tyres]
 {font-size: 13.75;}
 node|z18-[shop=car_repair][service=tyres],
-area|z18-[shop=car_repair][service=tyres]
 {font-size: 14.5;}
 
 
 node|z17[shop=car],
-area|z17[shop=car]
 {icon-image: car_shop-m.svg;icon-min-distance: 24;font-size: 13.75;}
 node|z17[shop=caravan],
-area|z17[shop=caravan]
 {icon-image: caravan-shop-m.svg;icon-min-distance: 24;font-size: 13.75;}
 node|z17[shop=motorcycle],
-area|z17[shop=motorcycle]
 {icon-image: motorcycle_shop-m.svg;icon-min-distance: 24;font-size: 13.75;}
 node|z17[shop=car_parts],
-area|z17[shop=car_parts]
 {icon-image: car-part-m.svg;icon-min-distance: 24;font-size: 13.75;}
 node|z17[shop=car_repair],
-area|z17[shop=car_repair]
 {icon-image: car-repair-m.svg;icon-min-distance: 24;font-size: 13.75;}
 node|z17[amenity=vehicle_inspection],
-area|z17[amenity=vehicle_inspection],
 {icon-image: vehicle_inspection-m.svg;icon-min-distance: 24;font-size: 13.75;}
 
 node|z18-[shop=car],
-area|z18-[shop=car]
 {icon-image: car_shop-m.svg;font-size: 14.5;}
 node|z18-[shop=caravan],
-area|z18-[shop=caravan]
 {icon-image: caravan-shop-m.svg;font-size: 14.5;}
 node|z18-[shop=motorcycle],
-area|z18-[shop=motorcycle]
 {icon-image: motorcycle_shop-m.svg;font-size: 14.5;}
 node|z18-[shop=car_parts],
-area|z18-[shop=car_parts]
 {icon-image: car-part-m.svg;font-size: 14.5;}
 node|z18-[shop=car_repair],
-area|z18-[shop=car_repair]
 {icon-image: car-repair-m.svg;font-size: 14.5;}
 node|z18-[amenity=vehicle_inspection],
-area|z18-[amenity=vehicle_inspection],
 {icon-image: vehicle_inspection-m.svg;font-size: 14.5;}
 
 /* 7. CAR */
@@ -793,64 +582,44 @@ area|z14-[highway=rest_area],
 {text-position: center;}
 
 node|z12-[amenity=fuel],
-area|z12-[amenity=fuel],
 area|z13-[highway=services],
 area|z14-[highway=rest_area],
 node|z14-[amenity=charging_station][motorcar?],
-area|z14-[amenity=charging_station][motorcar?],
 node|z15-[amenity=sanitary_dump_station],
-area|z15-[amenity=sanitary_dump_station],
 node|z16-[amenity=charging_station],
-area|z16-[amenity=charging_station],
 node|z16-[amenity=parking],
-area|z16-[amenity=parking],
 area|z16-[landuse=garages],
 node|z17-[amenity=car_wash],
-area|z17-[amenity=car_wash],
 node|z17-[amenity=toilets],
 node|z18-[amenity=motorcycle_rental],
 node|z18-[amenity=car_rental],
-area|z18-[amenity=car_rental],
 node|z18-[amenity=car_sharing],
-area|z18-[amenity=car_sharing]
 {text: name;text-color: @poi_label;text-offset: 1;font-size: 11;}
 
 node|z12[amenity=fuel],
-area|z12[amenity=fuel]
 {icon-image: fuel-s.svg; text-offset: 1; icon-min-distance: 20;}
 node|z13[amenity=fuel],
-area|z13[amenity=fuel]
 {icon-image: fuel-m.svg; text-offset: 1; icon-min-distance: 20; font-size: 11.75;}
 node|z14[amenity=fuel],
-area|z14[amenity=fuel]
 {icon-image: fuel-m.svg; icon-min-distance: 20; font-size: 12.25;}
 node|z15[amenity=fuel],
-area|z15[amenity=fuel]
 {icon-image: fuel-m.svg; icon-min-distance: 20; font-size: 12.5;}
 node|z16[amenity=fuel],
-area|z16[amenity=fuel]
 {icon-image: fuel-m.svg; icon-min-distance: 10; font-size: 12.75;}
 node|z17[amenity=fuel],
-area|z17[amenity=fuel]
 {icon-image: fuel-m.svg;font-size: 13.75;}
 node|z18-[amenity=fuel],
-area|z18-[amenity=fuel]
 {icon-image: fuel-m.svg;font-size: 14.5;}
 
 node|z14[amenity=charging_station][motorcar?],
-area|z14[amenity=charging_station][motorcar?],
 {icon-image: charging-station-m.svg;text-offset: 1;font-size: 12.25;icon-min-distance: 20;}
 node|z15[amenity=charging_station][motorcar?],
-area|z15[amenity=charging_station][motorcar?],
 {icon-image: charging-station-m.svg;icon-min-distance: 20;font-size: 12.5;}
 node|z16[amenity=charging_station],
-area|z16[amenity=charging_station]
 {icon-image: charging-station-m.svg;icon-min-distance: 10;font-size: 12.75;}
 node|z17[amenity=charging_station],
-area|z17[amenity=charging_station]
 {icon-image: charging-station-m.svg; font-size: 13.75;}
 node|z18-[amenity=charging_station],
-area|z18-[amenity=charging_station]
 {icon-image: charging-station-m.svg;font-size: 14.75;}
 
 area|z12[highway=services],
@@ -884,10 +653,8 @@ node|z14-[highway=speed_camera]
 {icon-image: speedcam-m.svg;}
 
 node|z17[amenity=car_wash],
-area|z17[amenity=car_wash]
 {icon-image: car-wash-m.svg;font-size: 13.75;icon-min-distance: 24;}
 node|z18-[amenity=car_wash],
-area|z18-[amenity=car_wash],
 {icon-image: car-wash-m.svg;text-offset: 1;font-size: 14.5;}
 
 node|z17-[amenity=toilets],
@@ -899,21 +666,16 @@ node|z18-[amenity=motorcycle_rental],
 {icon-image: motorcycle_rental-m.svg; font-size: 14.5;}
 
 node|z18-[amenity=car_rental],
-area|z18-[amenity=car_rental]
 {icon-image: car_sharing-m.svg;text-offset: 1;font-size: 14.5;}
 
 node|z18-[amenity=car_sharing],
-area|z18-[amenity=car_sharing]
 {icon-image: car_sharing-m.svg;text-offset: 1;font-size: 14.5;}
 
 node|z15-[amenity=sanitary_dump_station],
-area|z15-[amenity=sanitary_dump_station],
 {icon-image: dump-station-m.svg; font-size: 12.5; icon-min-distance: 20;}
 node|z17-[amenity=sanitary_dump_station],
-area|z17-[amenity=sanitary_dump_station]
 {font-size: 13.75; icon-min-distance: 15;}
 node|z18-[amenity=sanitary_dump_station],
-area|z18-[amenity=sanitary_dump_station]
 {font-size: 14.5; icon-min-distance: 10;}
 
 area|z16[landuse=garages],
@@ -924,7 +686,6 @@ area|z18-[landuse=garages],
 {font-size: 14.5;}
 
 node|z18-[amenity=compressed_air],
-area|z18-[amenity=compressed_air],
 {icon-image: compressed_air-m.svg;}
 
 node|z16-[amenity=water_point],
@@ -937,80 +698,56 @@ node|z18-[amenity=water_point][drinking_water=not],
 /* 7.1 Parking */
 
 node|z15-[amenity=parking],
-area|z15-[amenity=parking],
 {icon-image: parking-m.svg;icon-min-distance: 10;font-size: 12.5;}
 node|z17[amenity=parking],
-area|z17[amenity=parking],
 {icon-min-distance: 15;font-size: 13.75;}
 node|z18-[amenity=parking],
-area|z18-[amenity=parking],
 {font-size: 14.5;}
 
 node|z15-[amenity=parking][location=underground],
-area|z15-[amenity=parking][location=underground],
 {icon-image: parking_underground-m.svg;}
 
 /* no icon as these subtypes should display later */
 node|z15-[amenity=parking][access=private],
-area|z15-[amenity=parking][access=private],
 node|z15-[amenity=parking][parking=street_side],
-area|z15-[amenity=parking][parking=street_side],
 node|z15-[amenity=parking][parking=lane],
-area|z15-[amenity=parking][parking=lane],
 node|z15-[amenity=parking][parking=street_side][fee?],
-area|z15-[amenity=parking][parking=street_side][fee?],
 node|z15-[amenity=parking][parking=lane][fee?],
-area|z15-[amenity=parking][parking=lane][fee?],
 {icon-image: none; text: none;}
 
 node|z15-[amenity=parking][fee?],
-area|z15-[amenity=parking][fee?],
 {icon-image: parking_pay-m.svg;}
 
 node|z15-[amenity=parking][location=underground][fee],
-area|z15-[amenity=parking][location=underground][fee],
 {icon-image: parking_underground_pay-m.svg;}
 
 node|z17-[amenity=parking][access=private],
-area|z17-[amenity=parking][access=private],
 {icon-image: parking_private-m.svg;text: name;}
 
 node|z17-[amenity=parking][location=underground][access=private],
-area|z17-[amenity=parking][location=underground][access=private],
 {icon-image: parking_underground_private-m.svg;}
 
 node|z17-[amenity=parking][parking=street_side],
-area|z17-[amenity=parking][parking=street_side],
 node|z17-[amenity=parking][parking=lane],
-area|z17-[amenity=parking][parking=lane],
 {icon-image: parking-s.svg;}
 
 node|z17-[amenity=parking][parking=street_side][fee?],
-area|z17-[amenity=parking][parking=street_side][fee?],
 node|z17-[amenity=parking][parking=lane][fee?],
-area|z17-[amenity=parking][parking=lane][fee?],
 {icon-image: parking_pay-s.svg;}
 
 node|z17-[amenity=parking][parking=street_side][access=private],
-area|z17-[amenity=parking][parking=street_side][access=private],
 {icon-image: parking_private-s.svg;}
 node|z17-[amenity=parking][parking=lane][access=private],
-area|z17-[amenity=parking][parking=lane][access=private],
 {icon-image: none; text: none;}
 node|z18-[amenity=parking][parking=lane][access=private],
-area|z18-[amenity=parking][parking=lane][access=private],
 {icon-image: parking_private-s.svg; text: name;}
 
 node|z16-[amenity=parking_entrance],
-area|z16-[amenity=parking_entrance],
 {icon-image: parking_entrance-m.svg; font-size: 12.5;}
 node|z16-[amenity=parking_entrance][access=private],
-area|z16-[amenity=parking_entrance][access=private],
 {icon-image: none;}
 node|z19-[amenity=parking_entrance][access=private],
-area|z19-[amenity=parking_entrance][access=private],
 {icon-image: parking_entrance_private-m.svg; font-size: 12.5;}
 
 node|z17-[amenity=motorcycle_parking],
-area|z17-[amenity=motorcycle_parking],
 {icon-image: motorcycle-parking-m.svg;}

From a1895167364f98ce64995366c7d1c58e9ccec3c0 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Wed, 20 Aug 2025 12:49:25 +0700
Subject: [PATCH 105/302] [tools][styles] Output diffs in generate_drules.sh

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 .gitignore                    | 18 ++++++++++--------
 tools/unix/generate_drules.sh | 29 ++++++++++++++++++++++-------
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4dc9ffa93..c895ffa8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,12 +14,10 @@ stxxl.errlog
 stxxl.log
 screenlog.0
 
-data/symbols/*/design/
 # symbols png/sdf are now generated at build
 data/symbols/**/symbols.png
 data/symbols/**/symbols.sdf
-data/colors_design.txt
-data/patterns_design.txt
+
 data/bookmarks
 data/edits.xml
 data/World.mwm
@@ -27,11 +25,15 @@ data/WorldCoasts.mwm
 data/world_mwm/*
 data/*_hash
 data/drules_proto*
-data/classificator.txt
-data/types.txt
-data/visibility.txt
-data/colors.txt
-data/patterns.txt
+data/classificator.txt*
+data/types.txt*
+data/visibility.txt*
+data/colors.txt*
+data/patterns.txt*
+# TODO: designer is not used at the moment
+# data/symbols/*/design/
+# data/colors_design.txt
+# data/patterns_design.txt
 
 # Compiled Python
 *.pyc
diff --git a/tools/unix/generate_drules.sh b/tools/unix/generate_drules.sh
index 44ffded4b..7ef893fc4 100755
--- a/tools/unix/generate_drules.sh
+++ b/tools/unix/generate_drules.sh
@@ -12,20 +12,24 @@ function BuildDrawingRules() {
   styleName=$2
   suffix=${3-}
   echo "Building drawing rules for style $styleType/$styleName"
-  # Cleanup
-  rm "$DATA_PATH"/drules_proto$suffix.{bin,txt} || true
+  # Cleanup old compiled drules and diff
+  rm "$DATA_PATH"/drules_proto$suffix.{bin,txt.diff} || true
+  # Store old txt version for diff
+  mv -f "$DATA_PATH"/drules_proto$suffix.txt{,.prev} || true
   # Run script to build style
   python3 "$OMIM_PATH/tools/kothic/src/libkomwm.py" --txt \
     -s "$DATA_PATH/styles/$styleType/$styleName/style.mapcss" \
     -o "$DATA_PATH/drules_proto$suffix" \
     -p "$DATA_PATH/styles/$styleType/include/"
+  # Output diff and store to a file
+  diff -u "$DATA_PATH"/drules_proto$suffix.txt{.prev,} | tee "$DATA_PATH"/drules_proto$suffix.txt.diff
 }
 
-# Cleanup
-cleanup=(classificator.txt types.txt visibility.txt colors.txt patterns.txt)
-for item in ${cleanup[*]}
+outputs=(classificator.txt types.txt visibility.txt colors.txt patterns.txt drules_proto.txt)
+# Store old versions for diffs
+for item in ${outputs[*]}
 do
-  rm $DATA_PATH/$item || true
+  mv $DATA_PATH/$item{,.prev} || true
 done
 
 # Building drawing rules
@@ -37,13 +41,16 @@ BuildDrawingRules outdoors  dark _outdoors_dark
 BuildDrawingRules vehicle  light _vehicle_light
 BuildDrawingRules vehicle  dark _vehicle_dark
 
+# TODO: the designer is not used at the moment.
 # In designer mode we use drules_proto_design file instead of standard ones
-cp $OMIM_PATH/data/drules_proto_default_light.bin $OMIM_PATH/data/drules_proto_default_design.bin
+# cp $OMIM_PATH/data/drules_proto_default_light.bin $OMIM_PATH/data/drules_proto_default_design.bin
 
 echo "Exporting transit colors..."
 python3 "$OMIM_PATH/tools/python/transit/transit_colors_export.py" \
   "$DATA_PATH/colors.txt" > /dev/null
 
+# Merged drules_proto.bin is used by the map generator.
+# It contains max visibilities (min visible zoom) for features across all styles.
 echo "Merging styles..."
 python3 "$OMIM_PATH/tools/python/stylesheet/drules_merge.py" \
   "$DATA_PATH/drules_proto_default_light.bin" \
@@ -52,3 +59,11 @@ python3 "$OMIM_PATH/tools/python/stylesheet/drules_merge.py" \
   "$DATA_PATH/drules_proto.bin" \
   "$DATA_PATH/drules_proto.txt" \
    > /dev/null
+
+# Output diffs and store to files
+for item in ${outputs[*]}
+do
+  diff -u "$DATA_PATH"/$item{.prev,} | tee "$DATA_PATH"/$item.diff
+done
+
+echo "Diffs for all changes are stored in $DATA_PATH/*.txt.diff"
\ No newline at end of file

From 16077695515dc19d7e0862436b5e26e1447f21e1 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Wed, 20 Aug 2025 13:42:53 +0700
Subject: [PATCH 106/302] [styles] Add generic barrier=yes points and lines

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 data/mapcss-mapping.csv                                     | 3 ++-
 data/styles/default/include/Basemap.mapcss                  | 3 +++
 data/styles/default/include/Icons.mapcss                    | 2 ++
 data/styles/default/include/priorities_3_FG.prio.txt        | 1 +
 data/styles/default/include/priorities_4_overlays.prio.txt  | 2 ++
 data/styles/outdoors/include/Basemap.mapcss                 | 3 +++
 data/styles/outdoors/include/priorities_3_FG.prio.txt       | 1 +
 data/styles/outdoors/include/priorities_4_overlays.prio.txt | 2 ++
 data/styles/vehicle/include/Basemap.mapcss                  | 2 ++
 data/styles/vehicle/include/priorities_3_FG.prio.txt        | 1 +
 10 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index f5a7c5c11..cf207407e 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -642,7 +642,8 @@ sport|diving;520;
 #~270k uses.
 man_made|utility_pole;521;
 deprecated:boundary|administrative|suburb:04.2024;[boundary=administrative][border_type=suburb];x;name;int_name;522;
-deprecated|deprecated;523;x
+# Generic unspecified barrier, could be node (50k) or way (100k)
+barrier|yes;523;
 railway|monorail|tunnel;[railway=monorail][tunnel?];;name;int_name;524;
 railway|funicular|bridge;[railway=funicular][bridge?];;name;int_name;525;
 deprecated|deprecated;526;x
diff --git a/data/styles/default/include/Basemap.mapcss b/data/styles/default/include/Basemap.mapcss
index 9336f72b8..1aba7acf3 100644
--- a/data/styles/default/include/Basemap.mapcss
+++ b/data/styles/default/include/Basemap.mapcss
@@ -672,12 +672,15 @@ area|z17-[waterway=dam],
 
 line|z16-[barrier=fence],
 line|z16-[barrier=wall],
+line|z16-[barrier=yes],
 {color: @fence; width: 1; opacity: 0.5;}
 line|z17[barrier=fence],
 line|z17[barrier=wall],
+line|z17[barrier=yes],
 {width: 1.3; opacity: 0.6;}
 line|z18-[barrier=fence],
 line|z18-[barrier=wall],
+line|z18-[barrier=yes],
 {width: 1.5; opacity: 0.8;}
 
 line|z17-[barrier=guard_rail],
diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index 0e71478a5..2a4ffb4c6 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -745,6 +745,7 @@ node|z16-[leisure=marina],
 node|z16-[leisure=water_park],
 node|z16-[barrier=block],
 node|z16-[barrier=bollard],
+node|z16-[barrier=yes],
 node|z16-[barrier=chain],
 node|z16-[barrier=entrance],
 node|z16-[barrier=gate],
@@ -1169,6 +1170,7 @@ node|z15-[barrier=border_control],
 
 node|z16-[barrier=block],
 node|z16-[barrier=bollard],
+node|z16-[barrier=yes],
 node|z16-[barrier=chain],
 node|z16-[barrier=stile],
 node|z16-[barrier=turnstile],
diff --git a/data/styles/default/include/priorities_3_FG.prio.txt b/data/styles/default/include/priorities_3_FG.prio.txt
index 4884b9040..12ade7c81 100644
--- a/data/styles/default/include/priorities_3_FG.prio.txt
+++ b/data/styles/default/include/priorities_3_FG.prio.txt
@@ -58,6 +58,7 @@ barrier-fence                                       # line z16-
 barrier-guard_rail                                  # line z17-
 barrier-hedge                                       # line z16-
 barrier-wall                                        # line z16-
+barrier-yes                                         # line z16- (also has icon z16-, caption(optional) z16-)
 railway-funicular                                   # line z12-
 railway-funicular-bridge                            # line z12-
 railway-funicular-tunnel                            # line z12-
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index c3f474d6a..0c3ba6ffb 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -875,6 +875,7 @@ barrier-lift_gate                                   # icon z16- (also has captio
 barrier-stile                                       # icon z16- (also has caption(optional) z16-)
 barrier-swing_gate                                  # icon z16- (also has caption(optional) z16-)
 barrier-turnstile                                   # icon z16- (also has caption(optional) z16-)
+barrier-yes                                         # icon z16- (also has caption(optional) z16-, line z16-)
 leisure-dog_park                                    # icon z16- (also has caption(optional) z16-, area z15-)
 === 2300
 
@@ -1856,6 +1857,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # barrier-stile                                     # caption(optional) z16- (also has icon z16-)
 # barrier-swing_gate                                # caption(optional) z16- (also has icon z16-)
 # barrier-turnstile                                 # caption(optional) z16- (also has icon z16-)
+# barrier-yes                                       # caption(optional) z16- (also has icon z16-, line z16-)
 # leisure-dog_park                                  # caption(optional) z16- (also has icon z16-, area z15-)
 # === -7700
 
diff --git a/data/styles/outdoors/include/Basemap.mapcss b/data/styles/outdoors/include/Basemap.mapcss
index 50d1a903b..61c53ce8a 100644
--- a/data/styles/outdoors/include/Basemap.mapcss
+++ b/data/styles/outdoors/include/Basemap.mapcss
@@ -53,12 +53,15 @@ line|z18-[man_made=cutline],
 
 line|z15-[barrier=fence],
 line|z15-[barrier=wall],
+line|z15-[barrier=yes],
 {color: @fence; width: 1; opacity: 0.7;}
 line|z17[barrier=fence],
 line|z17[barrier=wall],
+line|z17[barrier=yes],
 {width: 1.3; opacity: 0.8;}
 line|z18-[barrier=fence],
 line|z18-[barrier=wall],
+line|z18-[barrier=yes],
 {width: 1.5; opacity: 1;}
 
 line|z16-[barrier=guard_rail],
diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt
index e2b56fcbc..c7720d1c9 100644
--- a/data/styles/outdoors/include/priorities_3_FG.prio.txt
+++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt
@@ -60,6 +60,7 @@ barrier-fence                                       # line z15-
 barrier-guard_rail                                  # line z16-
 barrier-hedge                                       # line z16-
 barrier-wall                                        # line z15-
+barrier-yes                                         # line z15- (also has icon z16-, caption(optional) z16-)
 railway-funicular                                   # line z12-
 railway-funicular-bridge                            # line z12-
 railway-funicular-tunnel                            # line z12-
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 2477a717d..3afef6471 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -875,6 +875,7 @@ barrier-lift_gate                                   # icon z16- (also has captio
 barrier-stile                                       # icon z16- (also has caption(optional) z16-)
 barrier-swing_gate                                  # icon z16- (also has caption(optional) z16-)
 barrier-turnstile                                   # icon z16- (also has caption(optional) z16-)
+barrier-yes                                         # icon z16- (also has caption(optional) z16-, line z15-)
 leisure-dog_park                                    # icon z16- (also has caption(optional) z16-, area z15-)
 === 2300
 
@@ -1859,6 +1860,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # barrier-stile                                     # caption(optional) z16- (also has icon z16-)
 # barrier-swing_gate                                # caption(optional) z16- (also has icon z16-)
 # barrier-turnstile                                 # caption(optional) z16- (also has icon z16-)
+# barrier-yes                                       # caption(optional) z16- (also has icon z16-, line z15-)
 # leisure-dog_park                                  # caption(optional) z16- (also has icon z16-, area z15-)
 # === -7700
 
diff --git a/data/styles/vehicle/include/Basemap.mapcss b/data/styles/vehicle/include/Basemap.mapcss
index 1d008da37..42dc2b0e7 100644
--- a/data/styles/vehicle/include/Basemap.mapcss
+++ b/data/styles/vehicle/include/Basemap.mapcss
@@ -465,9 +465,11 @@ area|z16-[waterway=dam],
 
 line|z17-[barrier=fence],
 line|z17-[barrier=wall],
+line|z17-[barrier=yes],
 {color: @fence; width: 1; opacity: 0.5;}
 line|z18-[barrier=fence],
 line|z18-[barrier=wall],
+line|z18-[barrier=yes],
 {width: 1.3; opacity:0.6;}
 
 line|z17-[barrier=guard_rail],
diff --git a/data/styles/vehicle/include/priorities_3_FG.prio.txt b/data/styles/vehicle/include/priorities_3_FG.prio.txt
index f04f8c2e3..fdb565d1c 100644
--- a/data/styles/vehicle/include/priorities_3_FG.prio.txt
+++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt
@@ -30,6 +30,7 @@ barrier-fence                                       # line z17-
 barrier-guard_rail                                  # line z17-
 barrier-hedge                                       # line z18-
 barrier-wall                                        # line z17-
+barrier-yes                                         # line z17-
 railway-monorail                                    # line z14-
 railway-monorail-bridge                             # line z14-
 railway-monorail-tunnel                             # line z14-

From 8237a7e417e702334347c63164abfc34be7cc279 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Wed, 20 Aug 2025 15:19:15 +0700
Subject: [PATCH 107/302] [styles] Add barrier=wicket_gate

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 data/mapcss-mapping.csv                                     | 2 +-
 data/styles/default/include/Icons.mapcss                    | 2 ++
 data/styles/default/include/priorities_4_overlays.prio.txt  | 2 ++
 data/styles/outdoors/include/priorities_4_overlays.prio.txt | 2 ++
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index cf207407e..b7e74989d 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1022,7 +1022,7 @@ historic|pillory;[historic=pillory];;name;int_name;897;
 amenity|money_transfer;898;
 man_made|crane;899;
 railway|subway|darkgreen;[railway=subway][colour=darkgreen];x;name;int_name;900;railway|subway|tunnel
-deprecated|deprecated;901;x
+barrier|wicket_gate;901;
 railway|subway|gray;[railway=subway][colour=gray];x;name;int_name;902;railway|subway|tunnel
 deprecated|deprecated;903;x
 railway|subway|lightblue;[railway=subway][colour=lightblue];x;name;int_name;904;railway|subway|tunnel
diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index 2a4ffb4c6..6612a26a4 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -754,6 +754,7 @@ node|z16-[barrier=lift_gate],
 node|z16-[barrier=swing_gate],
 node|z16-[barrier=stile],
 node|z16-[barrier=turnstile],
+node|z17-[barrier=wicket_gate],
 node|z16-[barrier=cycle_barrier],
 node|z16-[amenity=nightclub],
 node|z16-[amenity=townhall],
@@ -1174,6 +1175,7 @@ node|z16-[barrier=yes],
 node|z16-[barrier=chain],
 node|z16-[barrier=stile],
 node|z16-[barrier=turnstile],
+node|z17-[barrier=wicket_gate],
 {icon-image: dot-m.svg;font-size: 11;}
 
 node|z16-[barrier=entrance],
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index 0c3ba6ffb..9e5b17b97 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -875,6 +875,7 @@ barrier-lift_gate                                   # icon z16- (also has captio
 barrier-stile                                       # icon z16- (also has caption(optional) z16-)
 barrier-swing_gate                                  # icon z16- (also has caption(optional) z16-)
 barrier-turnstile                                   # icon z16- (also has caption(optional) z16-)
+barrier-wicket_gate                                 # icon z17- (also has caption(optional) z17-)
 barrier-yes                                         # icon z16- (also has caption(optional) z16-, line z16-)
 leisure-dog_park                                    # icon z16- (also has caption(optional) z16-, area z15-)
 === 2300
@@ -1857,6 +1858,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # barrier-stile                                     # caption(optional) z16- (also has icon z16-)
 # barrier-swing_gate                                # caption(optional) z16- (also has icon z16-)
 # barrier-turnstile                                 # caption(optional) z16- (also has icon z16-)
+# barrier-wicket_gate                               # caption(optional) z17- (also has icon z17-)
 # barrier-yes                                       # caption(optional) z16- (also has icon z16-, line z16-)
 # leisure-dog_park                                  # caption(optional) z16- (also has icon z16-, area z15-)
 # === -7700
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 3afef6471..ff51442d3 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -875,6 +875,7 @@ barrier-lift_gate                                   # icon z16- (also has captio
 barrier-stile                                       # icon z16- (also has caption(optional) z16-)
 barrier-swing_gate                                  # icon z16- (also has caption(optional) z16-)
 barrier-turnstile                                   # icon z16- (also has caption(optional) z16-)
+barrier-wicket_gate                                 # icon z17- (also has caption(optional) z17-)
 barrier-yes                                         # icon z16- (also has caption(optional) z16-, line z15-)
 leisure-dog_park                                    # icon z16- (also has caption(optional) z16-, area z15-)
 === 2300
@@ -1860,6 +1861,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # barrier-stile                                     # caption(optional) z16- (also has icon z16-)
 # barrier-swing_gate                                # caption(optional) z16- (also has icon z16-)
 # barrier-turnstile                                 # caption(optional) z16- (also has icon z16-)
+# barrier-wicket_gate                               # caption(optional) z17- (also has icon z17-)
 # barrier-yes                                       # caption(optional) z16- (also has icon z16-, line z15-)
 # leisure-dog_park                                  # caption(optional) z16- (also has icon z16-, area z15-)
 # === -7700

From 3abd04426cdf4f402e4ce878fe362a2341df1889 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Wed, 20 Aug 2025 15:23:31 +0700
Subject: [PATCH 108/302] [routing] Block cars going through barrier=yes

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 generator/road_access_generator.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/generator/road_access_generator.cpp b/generator/road_access_generator.cpp
index 8fd948714..40494ac83 100644
--- a/generator/road_access_generator.cpp
+++ b/generator/road_access_generator.cpp
@@ -86,6 +86,7 @@ TagMapping const kVehicleTagMapping = {
 TagMapping const kCarBarriersTagMapping = {
     {OsmElement::Tag("barrier", "block"), RoadAccess::Type::No},
     {OsmElement::Tag("barrier", "bollard"), RoadAccess::Type::No},
+    {OsmElement::Tag("barrier", "yes"), RoadAccess::Type::No},
     {OsmElement::Tag("barrier", "cycle_barrier"), RoadAccess::Type::No},
     {OsmElement::Tag("barrier", "chain"), RoadAccess::Type::Private},
     {OsmElement::Tag("barrier", "gate"), RoadAccess::Type::Private},

From d5966ff198ea625934b88c15562537a0fccf1801 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Wed, 20 Aug 2025 15:27:07 +0700
Subject: [PATCH 109/302] [tests] Add smoke tests for more barriers

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 generator/generator_tests/osm_type_test.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp
index 2a4aa7827..982210295 100644
--- a/generator/generator_tests/osm_type_test.cpp
+++ b/generator/generator_tests/osm_type_test.cpp
@@ -2053,7 +2053,6 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
       // {"area:highway", "track"},
       // {"area:highway", "trunk"},
       // {"area:highway", "unclassified"},
-      {"barrier", "cycle_barrier"},
       // {"boundary", "administrative"},
       // {"communication", "line"},
       // {"earthquake:damage", "spontaneous_camp"},
@@ -2186,9 +2185,14 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
       {"barrier", "lift_gate"},
       {"barrier", "retaining_wall"},
       {"barrier", "stile"},
+      {"barrier", "kissing_gate"},
+      {"barrier", "turnstile"},
+      {"barrier", "wicket_gate"},
+      {"barrier", "cycle_barrier"},
       {"barrier", "swing_gate"},
       {"barrier", "toll_booth"},
       {"barrier", "wall"},
+      {"barrier", "yes"},
       {"boundary", "national_park"},
       {"boundary", "protected_area"},
       {"building", "has_parts"},

From 697e871c1b6c48d77038b09ae49cf81d485eb392 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Wed, 20 Aug 2025 14:04:10 +0700
Subject: [PATCH 110/302] [strings] Add barriers translations

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 android/app/src/main/res/values-af/types_strings.xml            | 1 +
 android/app/src/main/res/values-ar/types_strings.xml            | 1 +
 android/app/src/main/res/values-az/types_strings.xml            | 1 +
 android/app/src/main/res/values-bg/types_strings.xml            | 1 +
 android/app/src/main/res/values-ca/types_strings.xml            | 1 +
 android/app/src/main/res/values-cs/types_strings.xml            | 1 +
 android/app/src/main/res/values-da/types_strings.xml            | 1 +
 android/app/src/main/res/values-de/types_strings.xml            | 1 +
 android/app/src/main/res/values-el/types_strings.xml            | 1 +
 android/app/src/main/res/values-es/types_strings.xml            | 1 +
 android/app/src/main/res/values-et/types_strings.xml            | 1 +
 android/app/src/main/res/values-eu/types_strings.xml            | 1 +
 android/app/src/main/res/values-fi/types_strings.xml            | 1 +
 android/app/src/main/res/values-fr/types_strings.xml            | 1 +
 android/app/src/main/res/values-gl/types_strings.xml            | 1 +
 android/app/src/main/res/values-gsw/types_strings.xml           | 1 +
 android/app/src/main/res/values-hu/types_strings.xml            | 1 +
 android/app/src/main/res/values-is/types_strings.xml            | 1 +
 android/app/src/main/res/values-it/types_strings.xml            | 1 +
 android/app/src/main/res/values-iw/types_strings.xml            | 1 +
 android/app/src/main/res/values-ja/types_strings.xml            | 1 +
 android/app/src/main/res/values-mr/types_strings.xml            | 1 +
 android/app/src/main/res/values-nb/types_strings.xml            | 1 +
 android/app/src/main/res/values-nl/types_strings.xml            | 1 +
 android/app/src/main/res/values-pl/types_strings.xml            | 1 +
 android/app/src/main/res/values-pt-rBR/types_strings.xml        | 1 +
 android/app/src/main/res/values-pt/types_strings.xml            | 1 +
 android/app/src/main/res/values-ru/types_strings.xml            | 2 ++
 android/app/src/main/res/values-sk/types_strings.xml            | 1 +
 android/app/src/main/res/values-sr/types_strings.xml            | 1 +
 android/app/src/main/res/values-sv/types_strings.xml            | 1 +
 android/app/src/main/res/values-tr/types_strings.xml            | 1 +
 android/app/src/main/res/values-uk/types_strings.xml            | 1 +
 android/app/src/main/res/values-zh-rHK/types_strings.xml        | 1 +
 android/app/src/main/res/values-zh-rTW/types_strings.xml        | 1 +
 android/app/src/main/res/values-zh/types_strings.xml            | 1 +
 android/app/src/main/res/values/types_strings.xml               | 2 ++
 iphone/Maps/LocalizedStrings/af.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/ar.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/ast.lproj/LocalizableTypes.strings | 1 +
 iphone/Maps/LocalizedStrings/az.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/be.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/bn.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/cy.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings  | 1 +
 .../Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings  | 2 ++
 .../Maps/LocalizedStrings/es-MX.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/gl.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/gsw.lproj/LocalizableTypes.strings | 1 +
 iphone/Maps/LocalizedStrings/he.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/hi.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/hr.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/ia.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/id.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/is.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/kab.lproj/LocalizableTypes.strings | 1 +
 iphone/Maps/LocalizedStrings/ko.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/lt.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/lv.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/ml.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/mr.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/mt.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings  | 1 +
 .../Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/ro.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings  | 2 ++
 iphone/Maps/LocalizedStrings/sk.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/sq.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/sw.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/th.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings  | 1 +
 iphone/Maps/LocalizedStrings/vi.lproj/LocalizableTypes.strings  | 1 +
 .../LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings     | 1 +
 .../LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings     | 1 +
 95 files changed, 99 insertions(+)

diff --git a/android/app/src/main/res/values-af/types_strings.xml b/android/app/src/main/res/values-af/types_strings.xml
index 1bf880226..945b41088 100644
--- a/android/app/src/main/res/values-af/types_strings.xml
+++ b/android/app/src/main/res/values-af/types_strings.xml
@@ -169,6 +169,7 @@
     <string name="type.amenity.water_point">Waterpunt</string>
     <string name="type.amenity.water_point.drinking_water_no">Waterpunt</string>
     <string name="type.barrier">Versperring</string>
+    <string name="type.barrier.yes">Versperring</string>
     <string name="type.barrier.block">Blok</string>
     <string name="type.barrier.bollard">Bolder</string>
     <string name="type.barrier.border_control">Grensbeheer</string>
diff --git a/android/app/src/main/res/values-ar/types_strings.xml b/android/app/src/main/res/values-ar/types_strings.xml
index 2e11bef48..89ebb82c9 100644
--- a/android/app/src/main/res/values-ar/types_strings.xml
+++ b/android/app/src/main/res/values-ar/types_strings.xml
@@ -185,6 +185,7 @@
     <string name="type.amenity.water_point">نقطة إعادة تعبة قنينة المياه</string>
     <string name="type.amenity.water_point.drinking_water_no">نقطة إعادة تعبة قنينة المياه</string>
     <string name="type.barrier">حاجز</string>
+    <string name="type.barrier.yes">حاجز</string>
     <string name="type.barrier.block">حاجز</string>
     <string name="type.barrier.bollard">حاجز سيارات</string>
     <string name="type.barrier.border_control">أمن الحدود</string>
diff --git a/android/app/src/main/res/values-az/types_strings.xml b/android/app/src/main/res/values-az/types_strings.xml
index cef0a5041..d7ccb1cd4 100644
--- a/android/app/src/main/res/values-az/types_strings.xml
+++ b/android/app/src/main/res/values-az/types_strings.xml
@@ -177,6 +177,7 @@
     <string name="type.amenity.water_point">Karvanlar üçün su nöqtəsi</string>
     <string name="type.amenity.water_point.drinking_water_no">Karvanlar üçün su nöqtəsi</string>
     <string name="type.barrier">Maneə</string>
+    <string name="type.barrier.yes">Maneə</string>
     <string name="type.barrier.block">Blok</string>
     <string name="type.barrier.bollard">Birbaşa</string>
     <string name="type.barrier.border_control">Sərhəd Nəzarəti</string>
diff --git a/android/app/src/main/res/values-bg/types_strings.xml b/android/app/src/main/res/values-bg/types_strings.xml
index 93c3eecab..8c090d350 100644
--- a/android/app/src/main/res/values-bg/types_strings.xml
+++ b/android/app/src/main/res/values-bg/types_strings.xml
@@ -603,6 +603,7 @@
     <string name="type.amenity.waste_disposal">Кофа</string>
     <string name="type.amenity.waste_basket">Кошче за отпадък</string>
     <string name="type.barrier">Бариера</string>
+    <string name="type.barrier.yes">Бариера</string>
     <string name="type.barrier.chain">Верига</string>
     <string name="type.amenity.place_of_worship.muslim">Джамия</string>
     <string name="type.amenity.post_box">Пощенска кутия</string>
diff --git a/android/app/src/main/res/values-ca/types_strings.xml b/android/app/src/main/res/values-ca/types_strings.xml
index 853abd027..ebb6d5c34 100644
--- a/android/app/src/main/res/values-ca/types_strings.xml
+++ b/android/app/src/main/res/values-ca/types_strings.xml
@@ -187,6 +187,7 @@
     <string name="type.amenity.water_point">Punt d’aigua</string>
     <string name="type.amenity.water_point.drinking_water_no">Punt d’aigua</string>
     <string name="type.barrier">Barrera</string>
+    <string name="type.barrier.yes">Barrera</string>
     <string name="type.barrier.block">Bloc</string>
     <string name="type.barrier.bollard">Bol·lard</string>
     <string name="type.barrier.border_control">Control fronterer</string>
diff --git a/android/app/src/main/res/values-cs/types_strings.xml b/android/app/src/main/res/values-cs/types_strings.xml
index 04dc4a359..4a65aa5e1 100644
--- a/android/app/src/main/res/values-cs/types_strings.xml
+++ b/android/app/src/main/res/values-cs/types_strings.xml
@@ -1193,6 +1193,7 @@
     <string name="type.amenity.vending_machine.fuel">Palivové čerpadlo</string>
     <string name="type.amenity.waste_transfer_station">Překladiště odpadu</string>
     <string name="type.barrier">Bariéra</string>
+    <string name="type.barrier.yes">Bariéra</string>
     <string name="type.barrier.cycle_barrier">Cyklistická bariéra</string>
     <string name="type.cuisine.bubble_tea">Bubble Tea</string>
     <string name="type.emergency">Nouzová stanice</string>
diff --git a/android/app/src/main/res/values-da/types_strings.xml b/android/app/src/main/res/values-da/types_strings.xml
index 4b4ba2d55..80796010d 100644
--- a/android/app/src/main/res/values-da/types_strings.xml
+++ b/android/app/src/main/res/values-da/types_strings.xml
@@ -1201,6 +1201,7 @@
     <string name="type.amenity.vending_machine.fuel">Benzinautomat</string>
     <string name="type.amenity.waste_transfer_station">Affaldsplads</string>
     <string name="type.barrier">Barriere</string>
+    <string name="type.barrier.yes">Barriere</string>
     <string name="type.barrier.chain">Kæde</string>
     <string name="type.amenity.vending_machine.food">Madautomat</string>
     <string name="type.barrier.cycle_barrier">Cykelbarriere</string>
diff --git a/android/app/src/main/res/values-de/types_strings.xml b/android/app/src/main/res/values-de/types_strings.xml
index 1aac21586..d760ac496 100644
--- a/android/app/src/main/res/values-de/types_strings.xml
+++ b/android/app/src/main/res/values-de/types_strings.xml
@@ -182,6 +182,7 @@
     <string name="type.amenity.water_point">Wasseranschluss</string>
     <string name="type.amenity.water_point.drinking_water_no">Wasseranschluss</string>
     <string name="type.barrier">Barriere</string>
+    <string name="type.barrier.yes">Barriere</string>
     <string name="type.barrier.block">Block</string>
     <string name="type.barrier.bollard">Poller</string>
     <string name="type.barrier.border_control">Grenzkontrolle</string>
diff --git a/android/app/src/main/res/values-el/types_strings.xml b/android/app/src/main/res/values-el/types_strings.xml
index d32dce0b1..d2bb036a1 100644
--- a/android/app/src/main/res/values-el/types_strings.xml
+++ b/android/app/src/main/res/values-el/types_strings.xml
@@ -1230,6 +1230,7 @@
     <string name="type.barrier.wall">Τοίχος</string>
     <string name="type.recycling.cans">Κονσερβοκούτια</string>
     <string name="type.barrier">Εμπόδιο</string>
+    <string name="type.barrier.yes">Εμπόδιο</string>
     <string name="type.amenity.vending_machine.sweets">Διανεμητής γλυκών</string>
     <string name="type.barrier.cycle_barrier">Εμπόδιο ποδηλάτου</string>
     <string name="type.recycling.shoes">Παπούτσια</string>
diff --git a/android/app/src/main/res/values-es/types_strings.xml b/android/app/src/main/res/values-es/types_strings.xml
index eb0d936a9..10f74b733 100644
--- a/android/app/src/main/res/values-es/types_strings.xml
+++ b/android/app/src/main/res/values-es/types_strings.xml
@@ -188,6 +188,7 @@
     <string name="type.amenity.water_point">Fuente de agua para caravanas</string>
     <string name="type.amenity.water_point.drinking_water_no">Fuente de agua para caravanas</string>
     <string name="type.barrier">Barrera</string>
+    <string name="type.barrier.yes">Barrera</string>
     <string name="type.barrier.block">Bloque</string>
     <string name="type.barrier.bollard">Bolardo</string>
     <string name="type.barrier.border_control">Control fronterizo</string>
diff --git a/android/app/src/main/res/values-et/types_strings.xml b/android/app/src/main/res/values-et/types_strings.xml
index f1f0bd7d0..a70667406 100644
--- a/android/app/src/main/res/values-et/types_strings.xml
+++ b/android/app/src/main/res/values-et/types_strings.xml
@@ -186,6 +186,7 @@
     <string name="type.amenity.water_point">Joogivee tankimispunkt</string>
     <string name="type.amenity.water_point.drinking_water_no">Joogivee tankimispunkt</string>
     <string name="type.barrier">Barjäär</string>
+    <string name="type.barrier.yes">Barjäär</string>
     <string name="type.barrier.block">Kiviplokk</string>
     <string name="type.barrier.bollard">Piirdetulp</string>
     <string name="type.barrier.border_control">Piirikontroll</string>
diff --git a/android/app/src/main/res/values-eu/types_strings.xml b/android/app/src/main/res/values-eu/types_strings.xml
index 9f28603a0..a371e6a78 100644
--- a/android/app/src/main/res/values-eu/types_strings.xml
+++ b/android/app/src/main/res/values-eu/types_strings.xml
@@ -181,6 +181,7 @@
     <string name="type.amenity.water_point">Ur iturria</string>
     <string name="type.amenity.water_point.drinking_water_no">Ur iturria</string>
     <string name="type.barrier">Hesia</string>
+    <string name="type.barrier.yes">Hesia</string>
     <string name="type.barrier.block">Blokea</string>
     <string name="type.barrier.bollard">Pibotea</string>
     <string name="type.barrier.border_control">Muga kontrola</string>
diff --git a/android/app/src/main/res/values-fi/types_strings.xml b/android/app/src/main/res/values-fi/types_strings.xml
index 5c3bc1997..0ea0b179b 100644
--- a/android/app/src/main/res/values-fi/types_strings.xml
+++ b/android/app/src/main/res/values-fi/types_strings.xml
@@ -184,6 +184,7 @@
     <string name="type.amenity.water_point">Vesipiste</string>
     <string name="type.amenity.water_point.drinking_water_no">Vesipiste</string>
     <string name="type.barrier">Este</string>
+    <string name="type.barrier.yes">Este</string>
     <string name="type.barrier.block">Este</string>
     <string name="type.barrier.bollard">Tolppa</string>
     <string name="type.barrier.border_control">Rajavalvonta</string>
diff --git a/android/app/src/main/res/values-fr/types_strings.xml b/android/app/src/main/res/values-fr/types_strings.xml
index 0c65e57dd..8db7b2402 100644
--- a/android/app/src/main/res/values-fr/types_strings.xml
+++ b/android/app/src/main/res/values-fr/types_strings.xml
@@ -177,6 +177,7 @@
     <string name="type.amenity.water_point">Point d’eau</string>
     <string name="type.amenity.water_point.drinking_water_no">Point d’eau</string>
     <string name="type.barrier">Barrière</string>
+    <string name="type.barrier.yes">Barrière</string>
     <string name="type.barrier.block">Bloc</string>
     <string name="type.barrier.bollard">Poteau</string>
     <string name="type.barrier.border_control">Contrôle aux frontières</string>
diff --git a/android/app/src/main/res/values-gl/types_strings.xml b/android/app/src/main/res/values-gl/types_strings.xml
index 3cef22c5b..645ea26b3 100644
--- a/android/app/src/main/res/values-gl/types_strings.xml
+++ b/android/app/src/main/res/values-gl/types_strings.xml
@@ -189,6 +189,7 @@
     <string name="type.amenity.water_point">Fonte de auga para caravanas</string>
     <string name="type.amenity.water_point.drinking_water_no">Fonte de auga para caravanas</string>
     <string name="type.barrier">Barreira</string>
+    <string name="type.barrier.yes">Barreira</string>
     <string name="type.barrier.block">Bloque</string>
     <string name="type.barrier.bollard">Bolardo</string>
     <string name="type.barrier.border_control">Control fronteirizo</string>
diff --git a/android/app/src/main/res/values-gsw/types_strings.xml b/android/app/src/main/res/values-gsw/types_strings.xml
index 28190177c..ec8e03830 100644
--- a/android/app/src/main/res/values-gsw/types_strings.xml
+++ b/android/app/src/main/res/values-gsw/types_strings.xml
@@ -176,6 +176,7 @@
     <string name="type.amenity.waste_disposal">Müllcontainer</string>
     <string name="type.amenity.water_point">Wasseraaschluss</string>
     <string name="type.barrier">Barriere</string>
+    <string name="type.barrier.yes">Barriere</string>
     <string name="type.barrier.block">Block</string>
     <string name="type.barrier.bollard">Poller</string>
     <string name="type.barrier.border_control">Grenzkontrolle</string>
diff --git a/android/app/src/main/res/values-hu/types_strings.xml b/android/app/src/main/res/values-hu/types_strings.xml
index 05396b487..6f956264e 100644
--- a/android/app/src/main/res/values-hu/types_strings.xml
+++ b/android/app/src/main/res/values-hu/types_strings.xml
@@ -1220,6 +1220,7 @@
     <string name="type.aerialway.chair_lift">Ülőlift</string>
     <string name="type.aerialway.gondola">Gondolakabinos felvonó</string>
     <string name="type.barrier">Akadály</string>
+    <string name="type.barrier.yes">Akadály</string>
     <string name="type.barrier.cycle_barrier">Kerékpárakadály</string>
     <string name="type.barrier.fence">Kerítés</string>
     <string name="type.barrier.hedge">Sövény</string>
diff --git a/android/app/src/main/res/values-is/types_strings.xml b/android/app/src/main/res/values-is/types_strings.xml
index f7e03e67e..f6120780c 100644
--- a/android/app/src/main/res/values-is/types_strings.xml
+++ b/android/app/src/main/res/values-is/types_strings.xml
@@ -620,6 +620,7 @@
     <string name="type.amenity.water_point">Vatnspóstur</string>
     <string name="type.amenity.water_point.drinking_water_no">Vatnspóstur</string>
     <string name="type.barrier">Hindrun</string>
+    <string name="type.barrier.yes">Hindrun</string>
     <string name="type.barrier.city_wall">Borgarmúr</string>
     <string name="type.barrier.cycle_barrier">Hjólahindrun</string>
     <string name="type.waterway.ditch">Drenskurður</string>
diff --git a/android/app/src/main/res/values-it/types_strings.xml b/android/app/src/main/res/values-it/types_strings.xml
index 85af664c6..95f5dc6c5 100644
--- a/android/app/src/main/res/values-it/types_strings.xml
+++ b/android/app/src/main/res/values-it/types_strings.xml
@@ -186,6 +186,7 @@
     <string name="type.amenity.water_point">Punto acqua</string>
     <string name="type.amenity.water_point.drinking_water_no">Punto acqua</string>
     <string name="type.barrier">Barriera</string>
+    <string name="type.barrier.yes">Barriera</string>
     <string name="type.barrier.block">Blocco</string>
     <string name="type.barrier.bollard">Pilastro</string>
     <string name="type.barrier.border_control">Controllo di frontiera</string>
diff --git a/android/app/src/main/res/values-iw/types_strings.xml b/android/app/src/main/res/values-iw/types_strings.xml
index 074863227..6d68df887 100644
--- a/android/app/src/main/res/values-iw/types_strings.xml
+++ b/android/app/src/main/res/values-iw/types_strings.xml
@@ -186,6 +186,7 @@
     <string name="type.amenity.water_point">נקודת מילוי מיכלי מים</string>
     <string name="type.amenity.water_point.drinking_water_no">נקודת מילוי מיכלי מים</string>
     <string name="type.barrier">מחסום</string>
+    <string name="type.barrier.yes">מחסום</string>
     <string name="type.barrier.block">חסימה</string>
     <string name="type.barrier.bollard">עמוד</string>
     <string name="type.barrier.border_control">ביקורת גבולות</string>
diff --git a/android/app/src/main/res/values-ja/types_strings.xml b/android/app/src/main/res/values-ja/types_strings.xml
index 4d43024ce..3df73eeb9 100644
--- a/android/app/src/main/res/values-ja/types_strings.xml
+++ b/android/app/src/main/res/values-ja/types_strings.xml
@@ -170,6 +170,7 @@
     <string name="type.amenity.water_point">給水所</string>
     <string name="type.amenity.water_point.drinking_water_no">給水所</string>
     <string name="type.barrier">障害物</string>
+    <string name="type.barrier.yes">障害物</string>
     <string name="type.barrier.block">ブロック</string>
     <string name="type.barrier.bollard">柱</string>
     <string name="type.barrier.border_control">国境管理</string>
diff --git a/android/app/src/main/res/values-mr/types_strings.xml b/android/app/src/main/res/values-mr/types_strings.xml
index 5acb98e20..13946756e 100644
--- a/android/app/src/main/res/values-mr/types_strings.xml
+++ b/android/app/src/main/res/values-mr/types_strings.xml
@@ -163,6 +163,7 @@
     <string name="type.amenity.waste_disposal">कचऱ्याची मोठी पेटी</string>
     <string name="type.amenity.waste_transfer_station">कचरा हस्तांतरण केंद्र</string>
     <string name="type.barrier">अडथळा</string>
+    <string name="type.barrier.yes">अडथळा</string>
     <string name="type.barrier.block">अडथळा</string>
     <string name="type.barrier.bollard">खांब</string>
     <string name="type.barrier.border_control">सीमा नियंत्रण</string>
diff --git a/android/app/src/main/res/values-nb/types_strings.xml b/android/app/src/main/res/values-nb/types_strings.xml
index 5872b3d61..7bae786d1 100644
--- a/android/app/src/main/res/values-nb/types_strings.xml
+++ b/android/app/src/main/res/values-nb/types_strings.xml
@@ -158,6 +158,7 @@
     <string name="type.amenity.water_point">Vannpunkt</string>
     <string name="type.amenity.water_point.drinking_water_no">Vannpunkt</string>
     <string name="type.barrier">Barriere</string>
+    <string name="type.barrier.yes">Barriere</string>
     <string name="type.barrier.block">Blokk</string>
     <string name="type.barrier.bollard">Pullert</string>
     <string name="type.barrier.border_control">Grensekontroll</string>
diff --git a/android/app/src/main/res/values-nl/types_strings.xml b/android/app/src/main/res/values-nl/types_strings.xml
index 04831e312..eaae470f3 100644
--- a/android/app/src/main/res/values-nl/types_strings.xml
+++ b/android/app/src/main/res/values-nl/types_strings.xml
@@ -185,6 +185,7 @@
     <string name="type.amenity.water_point">Waterpunt</string>
     <string name="type.amenity.water_point.drinking_water_no">Waterpunt</string>
     <string name="type.barrier">Barrière</string>
+    <string name="type.barrier.yes">Barrière</string>
     <string name="type.barrier.block">Blok</string>
     <string name="type.barrier.bollard">Pilaar</string>
     <string name="type.barrier.border_control">Grenscontrole</string>
diff --git a/android/app/src/main/res/values-pl/types_strings.xml b/android/app/src/main/res/values-pl/types_strings.xml
index 1af2b8a9c..29589c62c 100644
--- a/android/app/src/main/res/values-pl/types_strings.xml
+++ b/android/app/src/main/res/values-pl/types_strings.xml
@@ -185,6 +185,7 @@
     <string name="type.amenity.water_point">Ujęcie wody</string>
     <string name="type.amenity.water_point.drinking_water_no">Ujęcie wody</string>
     <string name="type.barrier">Bariera</string>
+    <string name="type.barrier.yes">Bariera</string>
     <string name="type.barrier.block">Blok</string>
     <string name="type.barrier.bollard">Słupek</string>
     <string name="type.barrier.border_control">Kontrola graniczna</string>
diff --git a/android/app/src/main/res/values-pt-rBR/types_strings.xml b/android/app/src/main/res/values-pt-rBR/types_strings.xml
index 583adb9fd..3cfe93396 100644
--- a/android/app/src/main/res/values-pt-rBR/types_strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/types_strings.xml
@@ -162,6 +162,7 @@
     <string name="type.amenity.water_point">Ponto de água</string>
     <string name="type.amenity.water_point.drinking_water_no">Ponto de água</string>
     <string name="type.barrier">Barreira</string>
+    <string name="type.barrier.yes">Barreira</string>
     <string name="type.barrier.block">Bloco</string>
     <string name="type.barrier.bollard">Pilarete</string>
     <string name="type.barrier.border_control">Controle de fronteira</string>
diff --git a/android/app/src/main/res/values-pt/types_strings.xml b/android/app/src/main/res/values-pt/types_strings.xml
index 555dcaf4e..985932f83 100644
--- a/android/app/src/main/res/values-pt/types_strings.xml
+++ b/android/app/src/main/res/values-pt/types_strings.xml
@@ -174,6 +174,7 @@
     <string name="type.amenity.water_point">Ponto de água</string>
     <string name="type.amenity.water_point.drinking_water_no">Ponto de água</string>
     <string name="type.barrier">Barreira</string>
+    <string name="type.barrier.yes">Barreira</string>
     <string name="type.barrier.block">Bloco</string>
     <string name="type.barrier.bollard">Pilarete</string>
     <string name="type.barrier.border_control">Controlo de fronteira</string>
diff --git a/android/app/src/main/res/values-ru/types_strings.xml b/android/app/src/main/res/values-ru/types_strings.xml
index e0a6bf4c5..328db5bb4 100644
--- a/android/app/src/main/res/values-ru/types_strings.xml
+++ b/android/app/src/main/res/values-ru/types_strings.xml
@@ -188,6 +188,7 @@
     <string name="type.amenity.water_point">Вода для автодомов</string>
     <string name="type.amenity.water_point.drinking_water_no">Вода для автодомов</string>
     <string name="type.barrier">Преграда</string>
+    <string name="type.barrier.yes">Преграда</string>
     <string name="type.barrier.block">Блок</string>
     <string name="type.barrier.bollard">Столбик</string>
     <string name="type.barrier.border_control">Погранконтроль</string>
@@ -206,6 +207,7 @@
     <string name="type.barrier.retaining_wall">Поддерживающая стена</string>
     <string name="type.barrier.stile">Перелаз</string>
     <string name="type.barrier.turnstile">Турникет</string>
+    <string name="type.barrier.wicket_gate">Калитка</string>
     <string name="type.barrier.swing_gate">Шлагбаум</string>
     <string name="type.barrier.toll_booth">Пункт оплаты</string>
     <string name="type.barrier.wall">Стена</string>
diff --git a/android/app/src/main/res/values-sk/types_strings.xml b/android/app/src/main/res/values-sk/types_strings.xml
index 15f73bbc0..82e0ddc6c 100644
--- a/android/app/src/main/res/values-sk/types_strings.xml
+++ b/android/app/src/main/res/values-sk/types_strings.xml
@@ -178,6 +178,7 @@
     <string name="type.amenity.water_point">Voda</string>
     <string name="type.amenity.water_point.drinking_water_no">Voda</string>
     <string name="type.barrier">Zábrana</string>
+    <string name="type.barrier.yes">Zábrana</string>
     <string name="type.barrier.block">Blok</string>
     <string name="type.barrier.bollard">Pilier</string>
     <string name="type.barrier.border_control">Hraničná kontrola</string>
diff --git a/android/app/src/main/res/values-sr/types_strings.xml b/android/app/src/main/res/values-sr/types_strings.xml
index ff6685ff8..f63a4bac7 100644
--- a/android/app/src/main/res/values-sr/types_strings.xml
+++ b/android/app/src/main/res/values-sr/types_strings.xml
@@ -187,6 +187,7 @@
     <string name="type.amenity.water_point">Чесма</string>
     <string name="type.amenity.water_point.drinking_water_no">Чесма</string>
     <string name="type.barrier">Баријера</string>
+    <string name="type.barrier.yes">Баријера</string>
     <string name="type.barrier.block">Блок</string>
     <string name="type.barrier.bollard">Стуб</string>
     <string name="type.barrier.border_control">Гранична контрола</string>
diff --git a/android/app/src/main/res/values-sv/types_strings.xml b/android/app/src/main/res/values-sv/types_strings.xml
index 8f6e54dc1..ee98c3e14 100644
--- a/android/app/src/main/res/values-sv/types_strings.xml
+++ b/android/app/src/main/res/values-sv/types_strings.xml
@@ -1182,6 +1182,7 @@
     <string name="type.amenity.vending_machine.coffee">Kaffeautomat</string>
     <string name="type.amenity.vending_machine.fuel">Bränslepump</string>
     <string name="type.barrier">Hinder</string>
+    <string name="type.barrier.yes">Hinder</string>
     <string name="type.barrier.chain">Kedja</string>
     <string name="type.barrier.cycle_barrier">Cykelhinder</string>
     <string name="type.barrier.hedge">Häck</string>
diff --git a/android/app/src/main/res/values-tr/types_strings.xml b/android/app/src/main/res/values-tr/types_strings.xml
index 74ad62c73..f06ff4bda 100644
--- a/android/app/src/main/res/values-tr/types_strings.xml
+++ b/android/app/src/main/res/values-tr/types_strings.xml
@@ -181,6 +181,7 @@
     <string name="type.amenity.water_point">Su Tankı Yeniden Doldurma Noktası</string>
     <string name="type.amenity.water_point.drinking_water_no">Su Tankı Yeniden Doldurma Noktası</string>
     <string name="type.barrier">Bariyer</string>
+    <string name="type.barrier.yes">Bariyer</string>
     <string name="type.barrier.block">Blok</string>
     <string name="type.barrier.bollard">Direk</string>
     <string name="type.barrier.border_control">Sınır Denetimi</string>
diff --git a/android/app/src/main/res/values-uk/types_strings.xml b/android/app/src/main/res/values-uk/types_strings.xml
index 2798c1ae5..9f20d9a39 100644
--- a/android/app/src/main/res/values-uk/types_strings.xml
+++ b/android/app/src/main/res/values-uk/types_strings.xml
@@ -188,6 +188,7 @@
     <string name="type.amenity.water_point">Вода для автобудинків</string>
     <string name="type.amenity.water_point.drinking_water_no">Вода для автобудинків</string>
     <string name="type.barrier">Перешкода</string>
+    <string name="type.barrier.yes">Перешкода</string>
     <string name="type.barrier.block">Блок</string>
     <string name="type.barrier.bollard">Стовпчик</string>
     <string name="type.barrier.border_control">Прикордонний контроль</string>
diff --git a/android/app/src/main/res/values-zh-rHK/types_strings.xml b/android/app/src/main/res/values-zh-rHK/types_strings.xml
index a5f1325f2..1d2c79a7c 100644
--- a/android/app/src/main/res/values-zh-rHK/types_strings.xml
+++ b/android/app/src/main/res/values-zh-rHK/types_strings.xml
@@ -183,6 +183,7 @@
     <string name="type.amenity.water_point">飲水站</string>
     <string name="type.amenity.water_point.drinking_water_no">飲水站</string>
     <string name="type.barrier">障礙物</string>
+    <string name="type.barrier.yes">障礙物</string>
     <string name="type.barrier.block">街區</string>
     <string name="type.barrier.bollard">柱</string>
     <string name="type.barrier.border_control">邊境管制</string>
diff --git a/android/app/src/main/res/values-zh-rTW/types_strings.xml b/android/app/src/main/res/values-zh-rTW/types_strings.xml
index c8c95209c..3953af587 100644
--- a/android/app/src/main/res/values-zh-rTW/types_strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/types_strings.xml
@@ -292,6 +292,7 @@
     <string name="type.healthcare.physiotherapist">物理治療師</string>
     <string name="type.leisure.escape_game">密室脫逃</string>
     <string name="type.barrier">障礙物</string>
+    <string name="type.barrier.yes">障礙物</string>
     <string name="type.entrance.main">主要入口</string>
     <string name="type.entrance.exit">出口</string>
     <string name="type.amenity.shelter">涼亭</string>
diff --git a/android/app/src/main/res/values-zh/types_strings.xml b/android/app/src/main/res/values-zh/types_strings.xml
index a142c9d9a..0044105fc 100644
--- a/android/app/src/main/res/values-zh/types_strings.xml
+++ b/android/app/src/main/res/values-zh/types_strings.xml
@@ -183,6 +183,7 @@
     <string name="type.amenity.water_point">取水点</string>
     <string name="type.amenity.water_point.drinking_water_no">取水点</string>
     <string name="type.barrier">障碍物</string>
+    <string name="type.barrier.yes">障碍物</string>
     <string name="type.barrier.block">路障</string>
     <string name="type.barrier.bollard">护柱</string>
     <string name="type.barrier.border_control">边境检查站</string>
diff --git a/android/app/src/main/res/values/types_strings.xml b/android/app/src/main/res/values/types_strings.xml
index b5247a1e1..5a7a5ae04 100644
--- a/android/app/src/main/res/values/types_strings.xml
+++ b/android/app/src/main/res/values/types_strings.xml
@@ -193,6 +193,7 @@
     <string name="type.amenity.water_point">Water Tank Refill Point</string>
     <string name="type.amenity.water_point.drinking_water_no">Water Tank Refill Point</string>
     <string name="type.barrier">Barrier</string>
+    <string name="type.barrier.yes">Barrier</string>
     <string name="type.barrier.block">Block</string>
     <string name="type.barrier.bollard">Bollard</string>
     <string name="type.barrier.border_control">Border Control</string>
@@ -212,6 +213,7 @@
     <string name="type.barrier.retaining_wall">Retaining Wall</string>
     <string name="type.barrier.stile">Stile</string>
     <string name="type.barrier.turnstile">Turnstile</string>
+    <string name="type.barrier.wicket_gate">Wicket Gate</string>
     <string name="type.barrier.swing_gate">Swing Gate</string>
     <string name="type.barrier.toll_booth">Toll Booth</string>
     <string name="type.barrier.wall">Wall</string>
diff --git a/iphone/Maps/LocalizedStrings/af.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/af.lproj/LocalizableTypes.strings
index 53423af70..c8eb1ea8e 100644
--- a/iphone/Maps/LocalizedStrings/af.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/af.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Waterpunt";
 "type.amenity.water_point.drinking_water_no" = "Waterpunt";
 "type.barrier" = "Versperring";
+"type.barrier.yes" = "Versperring";
 "type.barrier.block" = "Blok";
 "type.barrier.bollard" = "Bolder";
 "type.barrier.border_control" = "Grensbeheer";
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ar.lproj/LocalizableTypes.strings
index 9ba3873e0..2bdf234d0 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "نقطة إعادة تعبة قنينة المياه";
 "type.amenity.water_point.drinking_water_no" = "نقطة إعادة تعبة قنينة المياه";
 "type.barrier" = "حاجز";
+"type.barrier.yes" = "حاجز";
 "type.barrier.block" = "حاجز";
 "type.barrier.bollard" = "حاجز سيارات";
 "type.barrier.border_control" = "أمن الحدود";
diff --git a/iphone/Maps/LocalizedStrings/ast.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ast.lproj/LocalizableTypes.strings
index 1f05a51c7..b2d3ed8ae 100644
--- a/iphone/Maps/LocalizedStrings/ast.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ast.lproj/LocalizableTypes.strings
@@ -368,6 +368,7 @@
 "type.leisure.fitness_centre" = "Fitness Centre";
 "type.junction.circular" = "Roundabout";
 "type.barrier" = "Barrier";
+"type.barrier.yes" = "Barrier";
 "type.cuisine.italian" = "Italian";
 "type.shop.erotic" = "Erotic Shop";
 "type.cuisine.steak_house" = "Steak House";
diff --git a/iphone/Maps/LocalizedStrings/az.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/az.lproj/LocalizableTypes.strings
index eee435431..aa7940735 100644
--- a/iphone/Maps/LocalizedStrings/az.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/az.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Karvanlar üçün su nöqtəsi";
 "type.amenity.water_point.drinking_water_no" = "Karvanlar üçün su nöqtəsi";
 "type.barrier" = "Maneə";
+"type.barrier.yes" = "Maneə";
 "type.barrier.block" = "Blok";
 "type.barrier.bollard" = "Birbaşa";
 "type.barrier.border_control" = "Sərhəd Nəzarəti";
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/be.lproj/LocalizableTypes.strings
index b7a171693..a12e7fba8 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Вада для аўтадомаў";
 "type.amenity.water_point.drinking_water_no" = "Вада для аўтадомаў";
 "type.barrier" = "Barrier";
+"type.barrier.yes" = "Barrier";
 "type.barrier.block" = "Block";
 "type.barrier.bollard" = "Bollard";
 "type.barrier.border_control" = "Border Control";
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings
index b6de53e59..10a830a94 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings
@@ -188,6 +188,7 @@
 "type.amenity.water_point" = "Остановка за пълнене на водни хранилища";
 "type.amenity.water_point.drinking_water_no" = "Остановка за пълнене на водни хранилища";
 "type.barrier" = "Бариера";
+"type.barrier.yes" = "Бариера";
 "type.barrier.block" = "Блокова преграда";
 "type.barrier.bollard" = "Колчета";
 "type.barrier.border_control" = "Гранична остановка";
diff --git a/iphone/Maps/LocalizedStrings/bn.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/bn.lproj/LocalizableTypes.strings
index 6b7f6ac27..d207294ea 100644
--- a/iphone/Maps/LocalizedStrings/bn.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/bn.lproj/LocalizableTypes.strings
@@ -960,6 +960,7 @@
 "type.leisure.fitness_centre" = "Fitness Centre";
 "type.junction.circular" = "Roundabout";
 "type.barrier" = "Barrier";
+"type.barrier.yes" = "Barrier";
 "type.railway.station.subway.santiago" = "Subway Station";
 "type.cuisine.italian" = "Italian";
 "type.man_made.bridge" = "Bridge";
diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings
index 625656a21..b102cfb81 100644
--- a/iphone/Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Punt d’aigua";
 "type.amenity.water_point.drinking_water_no" = "Punt d’aigua";
 "type.barrier" = "Barrera";
+"type.barrier.yes" = "Barrera";
 "type.barrier.block" = "Bloc";
 "type.barrier.bollard" = "Bol·lard";
 "type.barrier.border_control" = "Control fronterer";
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings
index 92c139184..52c89807d 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Doplňovací místo vodní nádrže";
 "type.amenity.water_point.drinking_water_no" = "Doplňovací místo vodní nádrže";
 "type.barrier" = "Bariéra";
+"type.barrier.yes" = "Bariéra";
 "type.barrier.block" = "Blok";
 "type.barrier.bollard" = "Sloupek";
 "type.barrier.border_control" = "Pohraniční kontrola";
diff --git a/iphone/Maps/LocalizedStrings/cy.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/cy.lproj/LocalizableTypes.strings
index ccd415db6..715307cf3 100644
--- a/iphone/Maps/LocalizedStrings/cy.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/cy.lproj/LocalizableTypes.strings
@@ -13,6 +13,7 @@
 "type.natural.water.wastewater" = "Wastewater";
 "type.barrier.bollard" = "Bollard";
 "type.barrier" = "Barrier";
+"type.barrier.yes" = "Barrier";
 "type.barrier.chain" = "Chain";
 "type.amenity.water_point.drinking_water_no" = "Water Tank Refill Point";
 "type.barrier.stile" = "Stile";
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings
index 11170bbc2..da54b93c7 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Vandpost";
 "type.amenity.water_point.drinking_water_no" = "Vandstation";
 "type.barrier" = "Barriere";
+"type.barrier.yes" = "Barriere";
 "type.barrier.block" = "Blokering";
 "type.barrier.bollard" = "Pullert";
 "type.barrier.border_control" = "Grænsekontrol";
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
index 70d104f64..c16f9dc43 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Wasseranschluss";
 "type.amenity.water_point.drinking_water_no" = "Wasseranschluss";
 "type.barrier" = "Barriere";
+"type.barrier.yes" = "Barriere";
 "type.barrier.block" = "Block";
 "type.barrier.bollard" = "Poller";
 "type.barrier.border_control" = "Grenzkontrolle";
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings
index 743a056fc..f1578a46d 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Παροχή νερού";
 "type.amenity.water_point.drinking_water_no" = "Παροχή νερού";
 "type.barrier" = "Εμπόδιο";
+"type.barrier.yes" = "Εμπόδιο";
 "type.barrier.block" = "Εμπόδιο";
 "type.barrier.bollard" = "Πυλώνας";
 "type.barrier.border_control" = "Έλεγχος συνόρων";
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
index 8491f5b03..6c0279c08 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Water Tank Refill Point";
 "type.amenity.water_point.drinking_water_no" = "Water Tank Refill Point";
 "type.barrier" = "Barrier";
+"type.barrier.yes" = "Barrier";
 "type.barrier.block" = "Block";
 "type.barrier.bollard" = "Bollard";
 "type.barrier.border_control" = "Border Control";
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
index 89e92cd90..06bc978ec 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
@@ -203,6 +203,7 @@
 "type.amenity.water_point" = "Water Tank Refill Point";
 "type.amenity.water_point.drinking_water_no" = "Water Tank Refill Point";
 "type.barrier" = "Barrier";
+"type.barrier.yes" = "Barrier";
 "type.barrier.block" = "Block";
 "type.barrier.bollard" = "Bollard";
 "type.barrier.border_control" = "Border Control";
@@ -222,6 +223,7 @@
 "type.barrier.retaining_wall" = "Retaining Wall";
 "type.barrier.stile" = "Stile";
 "type.barrier.turnstile" = "Turnstile";
+"type.barrier.wicket_gate" = "Wicket gate";
 "type.barrier.swing_gate" = "Swing Gate";
 "type.barrier.toll_booth" = "Toll Booth";
 "type.barrier.wall" = "Wall";
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/LocalizableTypes.strings
index ea1e1799c..0500944f9 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Fuente de agua para caravanas";
 "type.amenity.water_point.drinking_water_no" = "Fuente de agua para caravanas";
 "type.barrier" = "Barrera";
+"type.barrier.yes" = "Barrera";
 "type.barrier.block" = "Bloque";
 "type.barrier.bollard" = "Bolardo";
 "type.barrier.border_control" = "Control fronterizo";
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
index bf334a043..85d3908c7 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Fuente de agua para caravanas";
 "type.amenity.water_point.drinking_water_no" = "Fuente de agua para caravanas";
 "type.barrier" = "Barrera";
+"type.barrier.yes" = "Barrera";
 "type.barrier.block" = "Bloque";
 "type.barrier.bollard" = "Bolardo";
 "type.barrier.border_control" = "Control fronterizo";
diff --git a/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings
index 5a9856b35..44fed980c 100644
--- a/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Joogivee tankimispunkt";
 "type.amenity.water_point.drinking_water_no" = "Joogivee tankimispunkt";
 "type.barrier" = "Barjäär";
+"type.barrier.yes" = "Barjäär";
 "type.barrier.block" = "Kiviplokk";
 "type.barrier.bollard" = "Piirdetulp";
 "type.barrier.border_control" = "Piirikontroll";
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings
index a9bbcd5f8..63c0be2b6 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Ur iturria";
 "type.amenity.water_point.drinking_water_no" = "Ur iturria";
 "type.barrier" = "Hesia";
+"type.barrier.yes" = "Hesia";
 "type.barrier.block" = "Blokea";
 "type.barrier.bollard" = "Pibotea";
 "type.barrier.border_control" = "Muga kontrola";
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings
index ea2b693f9..0f269b417 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "شیر آب قابل شرب";
 "type.amenity.water_point.drinking_water_no" = "شیر آب قابل شرب";
 "type.barrier" = "Barrier";
+"type.barrier.yes" = "Barrier";
 "type.barrier.block" = "بلوک";
 "type.barrier.bollard" = "ستون";
 "type.barrier.border_control" = "کنترل مرزی";
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings
index 50b510824..78b1e0223 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Vesipiste";
 "type.amenity.water_point.drinking_water_no" = "Vesipiste";
 "type.barrier" = "Este";
+"type.barrier.yes" = "Este";
 "type.barrier.block" = "Este";
 "type.barrier.bollard" = "Tolppa";
 "type.barrier.border_control" = "Rajavalvonta";
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings
index 2a8006aaa..d3fbe71fd 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Point d’eau";
 "type.amenity.water_point.drinking_water_no" = "Point d’eau";
 "type.barrier" = "Barrière";
+"type.barrier.yes" = "Barrière";
 "type.barrier.block" = "Bloc";
 "type.barrier.bollard" = "Poteau";
 "type.barrier.border_control" = "Contrôle aux frontières";
diff --git a/iphone/Maps/LocalizedStrings/gl.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/gl.lproj/LocalizableTypes.strings
index a516b7c0f..b355684de 100644
--- a/iphone/Maps/LocalizedStrings/gl.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/gl.lproj/LocalizableTypes.strings
@@ -288,6 +288,7 @@
 "type.amenity.water_point" = "Fonte de auga para caravanas";
 "type.amenity.water_point.drinking_water_no" = "Fonte de auga para caravanas";
 "type.barrier" = "Barreira";
+"type.barrier.yes" = "Barreira";
 "type.barrier.block" = "Bloque";
 "type.barrier.bollard" = "Bolardo";
 "type.barrier.border_control" = "Control fronteirizo";
diff --git a/iphone/Maps/LocalizedStrings/gsw.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/gsw.lproj/LocalizableTypes.strings
index 8ca91ec37..036004db0 100644
--- a/iphone/Maps/LocalizedStrings/gsw.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/gsw.lproj/LocalizableTypes.strings
@@ -261,6 +261,7 @@
 "type.amenity.water_point" = "Wasseraaschluss";
 "type.amenity.water_point.drinking_water_no" = "Wasseraaschluss";
 "type.barrier" = "Barriere";
+"type.barrier.yes" = "Barriere";
 "type.barrier.block" = "Block";
 "type.barrier.bollard" = "Poller";
 "type.barrier.border_control" = "Grenzkontrolle";
diff --git a/iphone/Maps/LocalizedStrings/he.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/he.lproj/LocalizableTypes.strings
index 2aafab79b..adb93d16f 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "נקודת מילוי מיכלי מים";
 "type.amenity.water_point.drinking_water_no" = "נקודת מילוי מיכלי מים";
 "type.barrier" = "מחסום";
+"type.barrier.yes" = "מחסום";
 "type.barrier.block" = "חסימה";
 "type.barrier.bollard" = "עמוד";
 "type.barrier.border_control" = "ביקורת גבולות";
diff --git a/iphone/Maps/LocalizedStrings/hi.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/hi.lproj/LocalizableTypes.strings
index 7e441a579..0e097063f 100644
--- a/iphone/Maps/LocalizedStrings/hi.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/hi.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "पानी की टंकी पुनः भरने का स्थान";
 "type.amenity.water_point.drinking_water_no" = "पानी की टंकी पुनः भरने का स्थान";
 "type.barrier" = "Barrier";
+"type.barrier.yes" = "Barrier";
 "type.barrier.block" = "Block";
 "type.barrier.bollard" = "Bollard";
 "type.barrier.border_control" = "Border Control";
diff --git a/iphone/Maps/LocalizedStrings/hr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/hr.lproj/LocalizableTypes.strings
index c7438c562..6d397abbd 100644
--- a/iphone/Maps/LocalizedStrings/hr.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/hr.lproj/LocalizableTypes.strings
@@ -361,6 +361,7 @@
 "type.amenity" = "Amenity";
 "type.junction.circular" = "Roundabout";
 "type.barrier" = "Barrier";
+"type.barrier.yes" = "Barrier";
 "type.railway.station.subway.santiago" = "Subway Station";
 "type.cuisine.italian" = "Italian";
 "type.shop.erotic" = "Erotic Shop";
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings
index 8c1d61a36..d4d8d7e5f 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings
@@ -188,6 +188,7 @@
 "type.amenity.water_point" = "Vízvételi pont";
 "type.amenity.water_point.drinking_water_no" = "Vízvételi pont (ivóvíz nélkül)";
 "type.barrier" = "Akadály";
+"type.barrier.yes" = "Akadály";
 "type.barrier.block" = "Blokk";
 "type.barrier.bollard" = "Terelőoszlop";
 "type.barrier.border_control" = "Határátkelő";
diff --git a/iphone/Maps/LocalizedStrings/ia.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ia.lproj/LocalizableTypes.strings
index 9055281a3..4dc4b8ca2 100644
--- a/iphone/Maps/LocalizedStrings/ia.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ia.lproj/LocalizableTypes.strings
@@ -391,6 +391,7 @@
 "type.drinking_water.yes" = "Drinking Water";
 "type.junction.circular" = "Roundabout";
 "type.barrier" = "Barrier";
+"type.barrier.yes" = "Barrier";
 "type.cuisine.italian" = "Italian";
 "type.shop.erotic" = "Erotic Shop";
 "type.boundary.protected_area.3" = "Protected Area";
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/id.lproj/LocalizableTypes.strings
index 84e7b5c64..ca7a24d8e 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Titik Air";
 "type.amenity.water_point.drinking_water_no" = "Titik Air";
 "type.barrier" = "Barrier";
+"type.barrier.yes" = "Barrier";
 "type.barrier.block" = "Blok";
 "type.barrier.bollard" = "Pilar";
 "type.barrier.border_control" = "Gerbang perbatasan";
diff --git a/iphone/Maps/LocalizedStrings/is.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/is.lproj/LocalizableTypes.strings
index 3a4006f8c..0cbad4247 100644
--- a/iphone/Maps/LocalizedStrings/is.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/is.lproj/LocalizableTypes.strings
@@ -83,6 +83,7 @@
 "type.amenity.water_point" = "Vatnspóstur";
 "type.amenity.water_point.drinking_water_no" = "Vatnspóstur";
 "type.barrier" = "Hindrun";
+"type.barrier.yes" = "Hindrun";
 "type.barrier.block" = "Lokun";
 "type.barrier.bollard" = "Polli";
 "type.barrier.border_control" = "Landamæraeftirlit";
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings
index b945d408e..38bcb8c5d 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Punto acqua";
 "type.amenity.water_point.drinking_water_no" = "Punto acqua";
 "type.barrier" = "Barriera";
+"type.barrier.yes" = "Barriera";
 "type.barrier.block" = "Blocco";
 "type.barrier.bollard" = "Pilastro";
 "type.barrier.border_control" = "Controllo di frontiera";
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings
index 4f0775d54..982756411 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "給水所";
 "type.amenity.water_point.drinking_water_no" = "給水所";
 "type.barrier" = "障害物";
+"type.barrier.yes" = "障害物";
 "type.barrier.block" = "ブロック";
 "type.barrier.bollard" = "柱";
 "type.barrier.border_control" = "国境管理";
diff --git a/iphone/Maps/LocalizedStrings/kab.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/kab.lproj/LocalizableTypes.strings
index 62f06fe82..30626c99e 100644
--- a/iphone/Maps/LocalizedStrings/kab.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/kab.lproj/LocalizableTypes.strings
@@ -854,6 +854,7 @@
 "type.leisure.fitness_centre" = "Fitness Centre";
 "type.junction.circular" = "Roundabout";
 "type.barrier" = "Barrier";
+"type.barrier.yes" = "Barrier";
 "type.cuisine.italian" = "Italian";
 "type.shop.erotic" = "Erotic Shop";
 "type.man_made.bridge" = "Bridge";
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ko.lproj/LocalizableTypes.strings
index c8f272ede..3753e9714 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "상수도";
 "type.amenity.water_point.drinking_water_no" = "상수도";
 "type.barrier" = "Barrier";
+"type.barrier.yes" = "Barrier";
 "type.barrier.block" = "블록";
 "type.barrier.bollard" = "기둥";
 "type.barrier.border_control" = "국경통제소";
diff --git a/iphone/Maps/LocalizedStrings/lt.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/lt.lproj/LocalizableTypes.strings
index 50190e193..274d6c91b 100644
--- a/iphone/Maps/LocalizedStrings/lt.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/lt.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Water Tank Refill Point";
 "type.amenity.water_point.drinking_water_no" = "Water Tank Refill Point";
 "type.barrier" = "Barrier";
+"type.barrier.yes" = "Barrier";
 "type.barrier.block" = "Block";
 "type.barrier.bollard" = "Bollard";
 "type.barrier.border_control" = "Border Control";
diff --git a/iphone/Maps/LocalizedStrings/lv.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/lv.lproj/LocalizableTypes.strings
index da6bea252..5ca15cf76 100644
--- a/iphone/Maps/LocalizedStrings/lv.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/lv.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Water Tank Refill Point";
 "type.amenity.water_point.drinking_water_no" = "Water Tank Refill Point";
 "type.barrier" = "Barrier";
+"type.barrier.yes" = "Barrier";
 "type.barrier.block" = "Block";
 "type.barrier.bollard" = "Bollard";
 "type.barrier.border_control" = "Border Control";
diff --git a/iphone/Maps/LocalizedStrings/ml.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ml.lproj/LocalizableTypes.strings
index 5dd0231b4..1e9e51d92 100644
--- a/iphone/Maps/LocalizedStrings/ml.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ml.lproj/LocalizableTypes.strings
@@ -547,6 +547,7 @@
 "type.amenity" = "Amenity";
 "type.junction.circular" = "Roundabout";
 "type.barrier" = "Barrier";
+"type.barrier.yes" = "Barrier";
 "type.cuisine.italian" = "Italian";
 "type.man_made.bridge" = "Bridge";
 "type.boundary.protected_area.3" = "Protected Area";
diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/mr.lproj/LocalizableTypes.strings
index 10093530d..b6c1ed020 100644
--- a/iphone/Maps/LocalizedStrings/mr.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/mr.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Water Tank Refill Point";
 "type.amenity.water_point.drinking_water_no" = "Water Tank Refill Point";
 "type.barrier" = "अडथळा";
+"type.barrier.yes" = "अडथळा";
 "type.barrier.block" = "अडथळा";
 "type.barrier.bollard" = "खांब";
 "type.barrier.border_control" = "सीमा नियंत्रण";
diff --git a/iphone/Maps/LocalizedStrings/mt.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/mt.lproj/LocalizableTypes.strings
index 5aa62431e..9eeed88c0 100644
--- a/iphone/Maps/LocalizedStrings/mt.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/mt.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Water Tank Refill Point";
 "type.amenity.water_point.drinking_water_no" = "Water Tank Refill Point";
 "type.barrier" = "Barrier";
+"type.barrier.yes" = "Barrier";
 "type.barrier.block" = "Block";
 "type.barrier.bollard" = "Bollard";
 "type.barrier.border_control" = "Border Control";
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings
index 702a9fafb..0e77fa28a 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Vannpunkt";
 "type.amenity.water_point.drinking_water_no" = "Vannpunkt";
 "type.barrier" = "Barriere";
+"type.barrier.yes" = "Barriere";
 "type.barrier.block" = "Blokk";
 "type.barrier.bollard" = "Pullert";
 "type.barrier.border_control" = "Grensekontroll";
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings
index 31b1fe5f1..dfa914e42 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Waterpunt";
 "type.amenity.water_point.drinking_water_no" = "Waterpunt";
 "type.barrier" = "Barrière";
+"type.barrier.yes" = "Barrière";
 "type.barrier.block" = "Blok";
 "type.barrier.bollard" = "Pilaar";
 "type.barrier.border_control" = "Grenscontrole";
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings
index 1ebf845cc..b0f7e10df 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Ujęcie wody";
 "type.amenity.water_point.drinking_water_no" = "Ujęcie wody";
 "type.barrier" = "Bariera";
+"type.barrier.yes" = "Bariera";
 "type.barrier.block" = "Blok";
 "type.barrier.bollard" = "Słupek";
 "type.barrier.border_control" = "Kontrola graniczna";
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings
index 54ff3be10..417d1ed9a 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Ponto de água";
 "type.amenity.water_point.drinking_water_no" = "Ponto de água";
 "type.barrier" = "Barreira";
+"type.barrier.yes" = "Barreira";
 "type.barrier.block" = "Bloco";
 "type.barrier.bollard" = "Pilarete";
 "type.barrier.border_control" = "Controle de fronteira";
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings
index 2894e1b4c..28d231015 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Ponto de água";
 "type.amenity.water_point.drinking_water_no" = "Ponto de água";
 "type.barrier" = "Barreira";
+"type.barrier.yes" = "Barreira";
 "type.barrier.block" = "Bloco";
 "type.barrier.bollard" = "Pilarete";
 "type.barrier.border_control" = "Controlo de fronteira";
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ro.lproj/LocalizableTypes.strings
index fc2506bdf..86ac07ab4 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Punct de alimentare cu apă";
 "type.amenity.water_point.drinking_water_no" = "Punct de alimentare cu apă";
 "type.barrier" = "Barrier";
+"type.barrier.yes" = "Barrier";
 "type.barrier.block" = "Bloc";
 "type.barrier.bollard" = "Stâlp";
 "type.barrier.border_control" = "Control vamal";
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings
index ed94fd1d9..698f0504a 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Вода для автодомов";
 "type.amenity.water_point.drinking_water_no" = "Вода для автодомов";
 "type.barrier" = "Преграда";
+"type.barrier.yes" = "Преграда";
 "type.barrier.block" = "Блок";
 "type.barrier.bollard" = "Столбик";
 "type.barrier.border_control" = "Погранконтроль";
@@ -208,6 +209,7 @@
 "type.barrier.retaining_wall" = "Поддерживающая стена";
 "type.barrier.stile" = "Перелаз";
 "type.barrier.turnstile" = "Турникет";
+"type.barrier.wicket_gate" = "Калитка";
 "type.barrier.swing_gate" = "Шлагбаум";
 "type.barrier.toll_booth" = "Пункт оплаты";
 "type.barrier.wall" = "Стена";
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sk.lproj/LocalizableTypes.strings
index a3527ee0d..5bcf32f5d 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Voda";
 "type.amenity.water_point.drinking_water_no" = "Voda";
 "type.barrier" = "Zábrana";
+"type.barrier.yes" = "Zábrana";
 "type.barrier.block" = "Blok";
 "type.barrier.bollard" = "Pilier";
 "type.barrier.border_control" = "Hraničná kontrola";
diff --git a/iphone/Maps/LocalizedStrings/sq.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sq.lproj/LocalizableTypes.strings
index f60dbb642..7331906bf 100644
--- a/iphone/Maps/LocalizedStrings/sq.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/sq.lproj/LocalizableTypes.strings
@@ -92,6 +92,7 @@
 "type.amenity.waste_transfer_station" = "Waste Transfer Station";
 "type.barrier.bollard" = "Bollard";
 "type.barrier" = "Barrier";
+"type.barrier.yes" = "Barrier";
 "type.barrier.chain" = "Chain";
 "type.amenity.water_point.drinking_water_no" = "Water Tank Refill Point";
 "type.amenity.vending_machine.excrement_bags" = "Excrement Bags Dispenser";
diff --git a/iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings
index cb34dff14..10fc06f23 100644
--- a/iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Чесма";
 "type.amenity.water_point.drinking_water_no" = "Чесма";
 "type.barrier" = "Баријера";
+"type.barrier.yes" = "Баријера";
 "type.barrier.block" = "Блок";
 "type.barrier.bollard" = "Стуб";
 "type.barrier.border_control" = "Гранична контрола";
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings
index d347f2aa9..1ab2b89ab 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Vattenpost";
 "type.amenity.water_point.drinking_water_no" = "Vattenpost";
 "type.barrier" = "Hinder";
+"type.barrier.yes" = "Hinder";
 "type.barrier.block" = "Blockering";
 "type.barrier.bollard" = "Stolpe";
 "type.barrier.border_control" = "Gränskontroll";
diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sw.lproj/LocalizableTypes.strings
index bbb0346f4..56ae9e617 100644
--- a/iphone/Maps/LocalizedStrings/sw.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Water Tank Refill Point";
 "type.amenity.water_point.drinking_water_no" = "Water Tank Refill Point";
 "type.barrier" = "Barrier";
+"type.barrier.yes" = "Barrier";
 "type.barrier.block" = "Block";
 "type.barrier.bollard" = "Bollard";
 "type.barrier.border_control" = "Border Control";
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/th.lproj/LocalizableTypes.strings
index d7958256d..c6e78504c 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "จุดเติมน้ำ";
 "type.amenity.water_point.drinking_water_no" = "จุดเติมน้ำ";
 "type.barrier" = "Barrier";
+"type.barrier.yes" = "Barrier";
 "type.barrier.block" = "บล็อก";
 "type.barrier.bollard" = "เสา";
 "type.barrier.border_control" = "ด่านตรวจคนเข้าเมือง";
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings
index b6b6d0c99..f8e703245 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Su Tankı Yeniden Doldurma Noktası";
 "type.amenity.water_point.drinking_water_no" = "Su Tankı Yeniden Doldurma Noktası";
 "type.barrier" = "Bariyer";
+"type.barrier.yes" = "Bariyer";
 "type.barrier.block" = "Blok";
 "type.barrier.bollard" = "Direk";
 "type.barrier.border_control" = "Sınır Denetimi";
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings
index 70b9bcb02..3aa9d1928 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Вода для автобудинків";
 "type.amenity.water_point.drinking_water_no" = "Вода для автобудинків";
 "type.barrier" = "Перешкода";
+"type.barrier.yes" = "Перешкода";
 "type.barrier.block" = "Блок";
 "type.barrier.bollard" = "Стовпчик";
 "type.barrier.border_control" = "Прикордонний контроль";
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/vi.lproj/LocalizableTypes.strings
index e55699c85..06ff20875 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "Điểm cấp nước";
 "type.amenity.water_point.drinking_water_no" = "Điểm cấp nước";
 "type.barrier" = "Barrier";
+"type.barrier.yes" = "Barrier";
 "type.barrier.block" = "Khối";
 "type.barrier.bollard" = "Trụ";
 "type.barrier.border_control" = "Biên Phòng";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings
index 6b75c48ad..eb652b1f6 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "取水点";
 "type.amenity.water_point.drinking_water_no" = "取水点";
 "type.barrier" = "障碍物";
+"type.barrier.yes" = "障碍物";
 "type.barrier.block" = "路障";
 "type.barrier.bollard" = "护柱";
 "type.barrier.border_control" = "边境检查站";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings
index 253b4ff6e..13065619a 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings
@@ -190,6 +190,7 @@
 "type.amenity.water_point" = "水箱加水點";
 "type.amenity.water_point.drinking_water_no" = "水箱加水點";
 "type.barrier" = "障礙物";
+"type.barrier.yes" = "障礙物";
 "type.barrier.block" = "街區";
 "type.barrier.bollard" = "柱";
 "type.barrier.border_control" = "邊境管制";

From 57ecf3848b48c5906dcb2e2c054dc81c4bbd4729 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Brzozowski?= <www.haxor@gmail.com>
Date: Sat, 24 May 2025 08:14:34 +0200
Subject: [PATCH 111/302] [routing] Remove passed intermediate points when
 assembling a modified route mid-navigation Fixes OM #9592
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michał Brzozowski <www.haxor@gmail.com>

# Conflicts:
#	libs/map/routing_manager.cpp
---
 libs/map/routing_manager.cpp | 13 +++++++++++--
 libs/map/routing_manager.hpp |  2 ++
 libs/map/routing_mark.cpp    | 10 ++++++++++
 libs/map/routing_mark.hpp    |  2 +-
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/libs/map/routing_manager.cpp b/libs/map/routing_manager.cpp
index 9fd6f2adf..75f56827e 100644
--- a/libs/map/routing_manager.cpp
+++ b/libs/map/routing_manager.cpp
@@ -546,8 +546,10 @@ void RoutingManager::RemoveRoute(bool deactivateFollowing)
       es.ClearGroup(UserMark::Type::SPEED_CAM);
       es.ClearGroup(UserMark::Type::ROAD_WARNING);
     }
-    if (deactivateFollowing)
-      SetPointsFollowingMode(false /* enabled */);
+    if (deactivateFollowing) {
+        SetPointsFollowingMode(false /* enabled */);
+        RemovePassedPoints();
+    }
   });
 
   if (deactivateFollowing)
@@ -937,6 +939,13 @@ void RoutingManager::SetPointsFollowingMode(bool enabled)
   routePoints.SetFollowingMode(enabled);
 }
 
+void RoutingManager::RemovePassedPoints()
+{
+    ASSERT(m_bmManager != nullptr, ());
+    RoutePointsLayout routePoints(*m_bmManager);
+    routePoints.RemovePassedPoints();
+}
+
 void RoutingManager::ReorderIntermediatePoints()
 {
   vector<RouteMarkPoint *> prevPoints;
diff --git a/libs/map/routing_manager.hpp b/libs/map/routing_manager.hpp
index 8e3261ac8..59fc30e85 100644
--- a/libs/map/routing_manager.hpp
+++ b/libs/map/routing_manager.hpp
@@ -332,6 +332,8 @@ private:
 
   void SetPointsFollowingMode(bool enabled);
 
+  void RemovePassedPoints();
+
   void ReorderIntermediatePoints();
 
   m2::RectD ShowPreviewSegments(std::vector<RouteMarkData> const & routePoints);
diff --git a/libs/map/routing_mark.cpp b/libs/map/routing_mark.cpp
index eedd14b35..95a50b0f1 100644
--- a/libs/map/routing_mark.cpp
+++ b/libs/map/routing_mark.cpp
@@ -347,6 +347,16 @@ void RoutePointsLayout::SetFollowingMode(bool enabled)
     m_editSession.GetMarkForEdit<RouteMarkPoint>(markId)->SetFollowingMode(enabled);
 }
 
+void RoutePointsLayout::RemovePassedPoints()
+{
+    for (auto markId : m_manager.GetUserMarkIds(UserMark::Type::ROUTING)) {
+        auto * mark = m_editSession.GetMarkForEdit<RouteMarkPoint>(markId);
+        if (mark->IsPassed())
+            m_editSession.DeleteUserMark(mark->GetId());
+    }
+}
+
+
 RouteMarkPoint const * RoutePointsLayout::GetRoutePoint(RouteMarkType type, size_t intermediateIndex) const
 {
   for (auto markId : m_manager.GetUserMarkIds(UserMark::Type::ROUTING))
diff --git a/libs/map/routing_mark.hpp b/libs/map/routing_mark.hpp
index e722fa505..e28e2ea14 100644
--- a/libs/map/routing_mark.hpp
+++ b/libs/map/routing_mark.hpp
@@ -97,7 +97,7 @@ public:
                       size_t destIntermediateIndex);
   void PassRoutePoint(RouteMarkType type, size_t intermediateIndex = 0);
   void SetFollowingMode(bool enabled);
-
+  void RemovePassedPoints();
 private:
   using TRoutePointCallback = std::function<void(RouteMarkPoint * mark)>;
   void ForEachIntermediatePoint(TRoutePointCallback const & fn);

From 1ed27f4052b473c02b79eaf46001d6a798f9505a Mon Sep 17 00:00:00 2001
From: gekeleda <git@davidgekeler.eu>
Date: Mon, 18 Aug 2025 16:38:27 +0200
Subject: [PATCH 112/302] Remove intermediate stops regardless of
 deactivateFollowing

Signed-off-by: gekeleda <git@davidgekeler.eu>
---
 libs/map/routing_manager.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libs/map/routing_manager.cpp b/libs/map/routing_manager.cpp
index 75f56827e..95e679086 100644
--- a/libs/map/routing_manager.cpp
+++ b/libs/map/routing_manager.cpp
@@ -546,12 +546,12 @@ void RoutingManager::RemoveRoute(bool deactivateFollowing)
       es.ClearGroup(UserMark::Type::SPEED_CAM);
       es.ClearGroup(UserMark::Type::ROAD_WARNING);
     }
-    if (deactivateFollowing) {
-        SetPointsFollowingMode(false /* enabled */);
-        RemovePassedPoints();
-    }
+    if (deactivateFollowing)
+      SetPointsFollowingMode(false /* enabled */);
   });
 
+  RemovePassedPoints();
+
   if (deactivateFollowing)
   {
     m_transitReadManager->BlockTransitSchemeMode(false /* isBlocked */);

From cd29eda9492e87ca84b14043b0fc25dccb55cd27 Mon Sep 17 00:00:00 2001
From: x7z4w <x7z4w@noreply.codeberg.org>
Date: Wed, 20 Aug 2025 11:38:59 +0200
Subject: [PATCH 113/302] [docs] nit

Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>
---
 README.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 114771c8b..2b47e335d 100644
--- a/README.md
+++ b/README.md
@@ -41,8 +41,6 @@
 
 A community-led free & open source maps app based on [OpenStreetMap](https://www.openstreetmap.org), built for transparency, privacy, and not-for-profit values. A fork of Organic Maps, originally based on Maps.ME.
 
-**Available for:** Android, iOS, ARM macOS, and alpha Linux/macOS desktop builds (also usable on Linux phones).
-
 <p align="center">
   <a href="https://apps.apple.com/app/comaps/id6747180809">
     <img src="docs/badges/apple-appstore.png" alt="App Store" width="160"/>
@@ -77,9 +75,10 @@ A community-led free & open source maps app based on [OpenStreetMap](https://www
 ## ⚡️ Highlights
 
 - **Offline-first**: Navigate without a connection
-- **Privacy-respecting**: No tracking, Ads or data collection
+- **Privacy-respecting**: No tracking, ads or data collection
 - **Lightweight**: Battery- and space-efficient
 - **Simple**: Polished, user-focused interface
+- **Cross-platform**: Available for Android, iOS, MacOS, and Linux.
 - **Community-built**: Free, open source, and collaborative
 - **Transparent**: Open finances and governance
 

From 00d3f9a37048c98c4249b06311f7db491892250c Mon Sep 17 00:00:00 2001
From: map-per <map-per@gmx.de>
Date: Tue, 19 Aug 2025 21:29:29 +0200
Subject: [PATCH 114/302] Make address addable in the editor

Signed-off-by: map-per <map-per@gmx.de>
---
 .../organicmaps/editor/EditorFragment.java    | 17 ++++++++
 .../editor/EditorHostFragment.java            |  7 +++-
 .../app/organicmaps/sdk/editor/Editor.java    |  1 +
 .../cpp/app/organicmaps/sdk/editor/Editor.cpp |  6 +++
 data/categories.txt                           | 42 +++++++++++++++++++
 data/editor.config                            |  3 +-
 .../Maps/UI/Editor/MWMEditorViewController.mm | 25 +++++++++++
 libs/editor/xml_feature.cpp                   |  4 ++
 libs/indexer/editable_map_object.cpp          |  6 +++
 libs/indexer/editable_map_object.hpp          |  1 +
 10 files changed, 109 insertions(+), 3 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
index 7d408a54e..fe5bed6cc 100644
--- a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
@@ -236,6 +236,11 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
     return true;
   }
 
+  boolean saveEdits()
+  {
+    return setEdits() && beforeSavingValidation();
+  }
+
   @NonNull
   protected String getDescription()
   {
@@ -282,6 +287,18 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
     return validateNames();
   }
 
+  private boolean beforeSavingValidation() {
+    // Validation to make sure address features have a house number
+    if (!Editor.nativeCheckHouseNumberWhenIsAddress())
+    {
+      mHouseNumber.requestFocus();
+      UiUtils.setInputError(mInputHouseNumber, R.string.error_enter_correct_house_number);
+      InputUtils.showKeyboard(mHouseNumber);
+      return false;
+    }
+    return true;
+  }
+
   private boolean validateNames()
   {
     for (int pos = 0; pos < mNamesAdapter.getItemCount(); pos++)
diff --git a/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java b/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
index cdc0ffdfd..fe102c12e 100644
--- a/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
@@ -276,6 +276,11 @@ public class EditorHostFragment
     return ((EditorFragment) getChildFragmentManager().findFragmentByTag(EditorFragment.class.getName())).setEdits();
   }
 
+  private boolean saveEdits()
+  {
+    return ((EditorFragment) getChildFragmentManager().findFragmentByTag(EditorFragment.class.getName())).saveEdits();
+  }
+
   @Override
   public void onClick(View v)
   {
@@ -310,7 +315,7 @@ public class EditorHostFragment
       case LANGUAGE -> editMapObject();
       case MAP_OBJECT ->
       {
-        if (!setEdits())
+        if (!saveEdits())
           return;
 
         // Save object edits
diff --git a/android/app/src/main/java/app/organicmaps/sdk/editor/Editor.java b/android/app/src/main/java/app/organicmaps/sdk/editor/Editor.java
index 10cd2dc55..cc420d9ff 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/editor/Editor.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/editor/Editor.java
@@ -112,6 +112,7 @@ public final class Editor
   public static native String nativeGetHouseNumber();
   public static native void nativeSetHouseNumber(String houseNumber);
   public static native boolean nativeIsHouseValid(String houseNumber);
+  public static native boolean nativeCheckHouseNumberWhenIsAddress();
   public static boolean nativeIsLevelValid(String level)
   {
     return nativeIsMetadataValid(Metadata.MetadataType.FMD_BUILDING_LEVELS.toInt(), level);
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp
index e1952788e..e3c938785 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp
@@ -493,6 +493,12 @@ JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeIsHouseV
   return osm::EditableMapObject::ValidateHouseNumber(jni::ToNativeString(env, houseNumber));
 }
 
+JNIEXPORT jboolean JNICALL
+Java_app_organicmaps_sdk_editor_Editor_nativeCheckHouseNumberWhenIsAddress(JNIEnv * env, jclass clazz)
+{
+  return g_editableMapObject.CheckHouseNumberWhenIsAddress();
+}
+
 JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeIsNameValid(JNIEnv * env, jclass clazz,
                                                                                     jstring name)
 {
diff --git a/data/categories.txt b/data/categories.txt
index e6746653e..e0facb8b9 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -10162,6 +10162,48 @@ sw:Jengo
 fa:ساختمان
 mr:इमारत|बिल्डिंग|वाडा
 
+building-address
+en:Address
+ar:العنوان
+be:Адрас
+bg:Адрес
+ca:Adreça
+cs:Adresa
+da:Adresse
+de:Adresse
+el:Διεύθυνση
+es:Dirección
+et:Aadress
+eu:Helbidea
+fa:آدرس
+fi:Osoite
+fr:Adresse
+he:כתובת
+hi:पता
+hu:Cím
+id:Alamat
+it:Indirizzo
+ja:住所
+ko:주소
+mr:पत्ता
+nb:Adresse
+nl:Adres
+pl:Adres
+pt:Morada|Endereço
+pt-BR:Endereço
+ro:Adresă
+ru:Адрес
+sk:Adresa
+sr:Адреса
+sv:Adress
+sw:Anwani
+th:ที่อยู่
+tr:Adres
+uk:Адреса
+vi:Địa chỉ
+zh-Hans:地址
+zh-Hant:地址
+
 # First keyword should match [police] definition in strings.txt!
 @category_police
 en:4Police|cops
diff --git a/data/editor.config b/data/editor.config
index 3a1da5727..efead9f4a 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -1449,8 +1449,7 @@
       <type id="building" can_add="no">
         <include group="address" />
       </type>
-      <!-- No consensus yet, see https://github.com/organicmaps/organicmaps/issues/6394 -->
-      <type id="building-address" can_add="no">
+      <type id="building-address" can_add="yes">
         <include group="address" />
       </type>
       <!-- Uncomment this after a map style is added
diff --git a/iphone/Maps/UI/Editor/MWMEditorViewController.mm b/iphone/Maps/UI/Editor/MWMEditorViewController.mm
index 6468bb59d..8d406edcc 100644
--- a/iphone/Maps/UI/Editor/MWMEditorViewController.mm
+++ b/iphone/Maps/UI/Editor/MWMEditorViewController.mm
@@ -222,6 +222,31 @@ void registerCellsForTableView(std::vector<MWMEditorCellID> const & cells, UITab
     return;
   }
 
+  // Validation to make sure address features have a house number
+  if (!m_mapObject.CheckHouseNumberWhenIsAddress())
+  {
+    // Find indexPath for the house number cell and mark it as invalid
+    auto const sectionIt = std::find(m_sections.begin(), m_sections.end(), MWMEditorSectionAddress);
+    if (sectionIt != m_sections.end())
+    {
+      NSInteger const section = std::distance(m_sections.begin(), sectionIt);
+      auto const & cells = m_cells[MWMEditorSectionAddress];
+      auto const it = std::find(cells.begin(), cells.end(), MWMEditorCellTypeBuilding);
+      if (it != cells.end())
+      {
+        NSInteger const row = std::distance(cells.begin(), it);
+        NSIndexPath * indexPath = [NSIndexPath indexPathForRow:row inSection:section];
+        [self markCellAsInvalid:indexPath];
+        
+        // Focus the text field to draw the user's attention.
+        MWMEditorTextTableViewCell * cell = [self.tableView cellForRowAtIndexPath:indexPath];
+        [cell.textField becomeFirstResponder];
+      }
+    }
+    // Stop the save process
+    return;
+  }
+
   if ([self showPersonalInfoWarningAlertIfNeeded])
     return;
 
diff --git a/libs/editor/xml_feature.cpp b/libs/editor/xml_feature.cpp
index 9b3022516..5978bfc63 100644
--- a/libs/editor/xml_feature.cpp
+++ b/libs/editor/xml_feature.cpp
@@ -855,6 +855,10 @@ XMLFeature TypeToXML(uint32_t type, feature::GeomType geomType, m2::PointD merca
     toFeature.SetTagValue("amenity", "recycling");
     toFeature.SetTagValue("recycling_type", "container");
   }
+  else if (ftypes::IsAddressChecker::Instance()(type))
+  {
+    // Addresses don't have a category tag
+  }
   else
   {
     string const strType = classif().GetReadableObjectName(type);
diff --git a/libs/indexer/editable_map_object.cpp b/libs/indexer/editable_map_object.cpp
index b5c2538ad..c1baa2e3a 100644
--- a/libs/indexer/editable_map_object.cpp
+++ b/libs/indexer/editable_map_object.cpp
@@ -433,6 +433,12 @@ bool EditableMapObject::ValidateHouseNumber(string const & houseNumber)
   return false;
 }
 
+bool EditableMapObject::CheckHouseNumberWhenIsAddress() const
+{
+  // House number is mandatory for the address type. For other types it's optional.
+  return !m_houseNumber.empty() || !m_types.Has(classif().GetTypeByReadableObjectName("building-address"));
+}
+
 // static
 bool EditableMapObject::ValidateFlats(string const & flats)
 {
diff --git a/libs/indexer/editable_map_object.hpp b/libs/indexer/editable_map_object.hpp
index c123f0ca3..5717a7f17 100644
--- a/libs/indexer/editable_map_object.hpp
+++ b/libs/indexer/editable_map_object.hpp
@@ -127,6 +127,7 @@ public:
 
   static bool ValidateBuildingLevels(std::string const & buildingLevels);
   static bool ValidateHouseNumber(std::string const & houseNumber);
+  bool CheckHouseNumberWhenIsAddress() const;
   static bool ValidateFlats(std::string const & flats);
   static bool ValidatePostCode(std::string const & postCode);
   static bool ValidatePhoneList(std::string const & phone);

From 7c354645b9906b32c8ca397f6e0e62f6a7671e46 Mon Sep 17 00:00:00 2001
From: Yannik Bloscheck <git@yannikbloscheck.com>
Date: Thu, 14 Aug 2025 20:40:47 +0200
Subject: [PATCH 115/302] [xcode] Trying to force Xcode to add changed files

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
---
 iphone/Maps/Maps.xcodeproj/project.pbxproj | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index 9df408e00..0fbc548b7 100644
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -3981,8 +3981,8 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 6741AA541BF340DE002C974C /* Build configuration list for PBXNativeTarget "CoMaps" */;
 			buildPhases = (
+				2768C8A32E4E560D00F617AF /* ShellScript */,
 				FA456C4E26BDCCC300B83C20 /* CopyFiles */,
-				272D46042E3F7B170013A737 /* ShellScript */,
 				6741A9411BF340DE002C974C /* Resources */,
 				6741A9A01BF340DE002C974C /* Sources */,
 				6741AA311BF340DE002C974C /* Frameworks */,
@@ -4309,10 +4309,10 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		272D46042E3F7B170013A737 /* ShellScript */ = {
+		2768C8A32E4E560D00F617AF /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
 			alwaysOutOfDate = 1;
-			buildActionMask = 2147483647;
+			buildActionMask = 12;
 			files = (
 			);
 			inputFileListPaths = (
@@ -4322,10 +4322,11 @@
 			outputFileListPaths = (
 			);
 			outputPaths = (
+				"$(SRCROOT)/data/*",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "cd ${SRCROOT}/../../\nenv -i PATH=\"$PATH:/opt/homebrew/bin\" ./configure.sh 2>/dev/null\n";
+			shellScript = "cd ${SRCROOT}/../../\nenv -i PATH=\"$PATH:/opt/homebrew/bin\" ./configure.sh 2>/dev/null\ntouch data/*\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */

From 9ff72366d5d0ed79d79b9edac6a0829086bf5934 Mon Sep 17 00:00:00 2001
From: x7z4w <x7z4w@noreply.codeberg.org>
Date: Thu, 14 Aug 2025 19:43:15 +0000
Subject: [PATCH 116/302] [build] Check for generated files

Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>
---
 CMakeLists.txt           |  2 --
 configure.sh             | 24 ++++++++++++++++++++++--
 tools/unix/build_omim.sh |  6 +++---
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab4f0b54d..9ac12fa55 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,8 +49,6 @@ if (APPLE AND NOT ("${CMAKE_SYSTEM_NAME}" STREQUAL Android))
   set(CMAKE_OBJCXX_VISIBILITY_PRESET hidden)
 endif()
 
-execute_process(COMMAND "./configure.sh" WORKING_DIRECTORY ${OMIM_ROOT})
-
 message(STATUS "Using compiler ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}")
 
 if (CMAKE_UNITY_BUILD)
diff --git a/configure.sh b/configure.sh
index 1f5bf1665..ec53e3d97 100755
--- a/configure.sh
+++ b/configure.sh
@@ -9,6 +9,26 @@ SKIP_MAP_DOWNLOAD=$SKIP_MAP_DOWNLOAD
 SKIP_GENERATE_SYMBOLS=$SKIP_GENERATE_SYMBOLS
 SKIP_GENERATE_DRULES=$SKIP_GENERATE_DRULES
 
+DRULES_NOT_GENERATED=
+SYMBOLS_NOT_GENERATED=
+
+DRULES_FILES=(drules_proto.bin drules_proto_default_dark.bin drules_proto_default_light.bin drules_proto_outdoors_dark.bin drules_proto_outdoors_light.bin drules_proto_vehicle_dark.bin drules_proto_vehicle_light.bin classificator.txt types.txt visibility.txt colors.txt patterns.txt)
+SYMBOLS_FILES=(xhdpi/light/symbols.png xhdpi/light/symbols.sdf xhdpi/dark/symbols.png xhdpi/dark/symbols.sdf mdpi/light/symbols.png mdpi/light/symbols.sdf mdpi/dark/symbols.png mdpi/dark/symbols.sdf 6plus/light/symbols.png 6plus/light/symbols.sdf 6plus/dark/symbols.png 6plus/dark/symbols.sdf xxxhdpi/light/symbols.png xxxhdpi/light/symbols.sdf xxxhdpi/dark/symbols.png xxxhdpi/dark/symbols.sdf hdpi/light/symbols.png hdpi/light/symbols.sdf hdpi/dark/symbols.png hdpi/dark/symbols.sdf xxhdpi/light/symbols.png xxhdpi/light/symbols.sdf xxhdpi/dark/symbols.png xxhdpi/dark/symbols.sdf)
+
+for f in ${DRULES_FILES[*]}; do
+  if [ ! -f "data/$f" ]; then
+    DRULES_NOT_GENERATED=1
+    break
+  fi
+done
+
+for f in ${SYMBOLS_FILES[*]}; do
+  if [ ! -f "data/symbols/$f" ]; then
+    SYMBOLS_NOT_GENERATED=1
+    break
+  fi
+done
+
 ############################# PROCESS OPTIONS ################################
 
 TEMP=$(getopt -o ms --long skip-map-download,skip-generate-symbols,skip-generate-drules \
@@ -87,7 +107,7 @@ else
 fi
 
 if [ -z "$SKIP_GENERATE_SYMBOLS" ]; then
-  if Diff data/symbols_hash data/styles/*/*/symbols/*; then
+  if Diff data/symbols_hash data/styles/*/*/symbols/* || [ ! -z "$SYMBOLS_NOT_GENERATED" ]; then
     echo "Generating symbols..."
     bash ./tools/unix/generate_symbols.sh
   fi
@@ -96,7 +116,7 @@ else
 fi
 
 if [ -z "$SKIP_GENERATE_DRULES" ]; then
-  if Diff data/drules_hash data/styles/*/*/*.mapcss data/styles/*/*/*.prio.txt data/mapcss-mapping.csv; then
+  if Diff data/drules_hash data/styles/*/*/*.mapcss data/styles/*/*/*.prio.txt data/mapcss-mapping.csv || [ ! -z "$DRULES_NOT_GENERATED" ]; then
     echo "Generating drules..."
     bash ./tools/unix/generate_drules.sh
   fi
diff --git a/tools/unix/build_omim.sh b/tools/unix/build_omim.sh
index 42c02ed66..eba5c847f 100755
--- a/tools/unix/build_omim.sh
+++ b/tools/unix/build_omim.sh
@@ -57,8 +57,8 @@ done
 
 OPT_TARGET=${@:$OPTIND}
 
-CMAKE_CONFIG="${CMAKE_CONFIG:-} -U SKIP_QT_GUI"
-if [ "$OPT_TARGET" != "desktop" -a -z "$OPT_DESIGNER" -a -z "$OPT_STANDALONE"] || [[ "$OPT_TARGET" =~ "generator_tool|topography_generator_tool|world_roads_builder_tool|mwm_diff_tool" ]]; then
+CMAKE_CONFIG="${CMAKE_CONFIG:-} -U SKIP_QT_GUI -U GENERATOR_TOOL"
+if [ "$OPT_TARGET" != "desktop" -a -z "$OPT_DESIGNER" -a -z "$OPT_STANDALONE"]; then
   CMAKE_CONFIG="${CMAKE_CONFIG:-} -DSKIP_QT_GUI=ON"
 fi
 
@@ -68,7 +68,7 @@ if [ -z "$OPT_DEBUG$OPT_RELEASE$OPT_RELEASEDEBUGINFO" ]; then
   OPT_RELEASEDEBUGINFO=1
 fi
 
-if [[ "$OPT_TARGET" =~ "generator_tool|topography_generator_tool|world_roads_builder_tool|mwm_diff_tool" ]]; then
+if [[ "$OPT_TARGET" =~ generator_tool|topography_generator_tool|world_roads_builder_tool|mwm_diff_tool ]]; then
   CMAKE_CONFIG="${CMAKE_CONFIG:-} -DGENERATOR_TOOL=ON"
 fi
 

From 4be5b5dc45ce109dac01cb9a92630c4ec3cebf76 Mon Sep 17 00:00:00 2001
From: x7z4w <x7z4w@noreply.codeberg.org>
Date: Tue, 19 Aug 2025 09:21:48 +0000
Subject: [PATCH 117/302] [build] Add `configure.sh`

Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>
---
 .forgejo/workflows/linux-check.yaml |  8 ++++++++
 android/sdk/build.gradle            | 14 ++++++++++++++
 tools/unix/build_omim.sh            |  6 ++++++
 3 files changed, 28 insertions(+)

diff --git a/.forgejo/workflows/linux-check.yaml b/.forgejo/workflows/linux-check.yaml
index ee76ec45a..f4e978577 100644
--- a/.forgejo/workflows/linux-check.yaml
+++ b/.forgejo/workflows/linux-check.yaml
@@ -133,6 +133,14 @@ jobs:
         with:
           key: ${{ github.workflow }}-unity-${{ matrix.compiler.CC }}-${{ matrix.CMAKE_BUILD_TYPE }}
 
+      - name: Configure repository
+        shell: bash
+        env:
+          SKIP_MAP_DOWNLOAD: 1
+          SKIP_GENERATE_SYMBOLS: 1
+          SKIP_GENERATE_DRULES: 1
+        run: ./configure.sh
+
       - name: CMake
         shell: bash
         env:
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index 8e672dae4..fa387860e 100644
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -114,6 +114,20 @@ project.afterEvaluate {
       nativeTask.onlyIf { false }
     }
   }
+
+  final taskName = gradle.startParameter.taskNames
+
+  if (['assemble', 'bundle', 'compile', 'install'].any{taskName.any{task->task.startsWith(it)}}) {
+    exec {
+      workingDir '../..'
+
+      if (!taskName.toString().contains('Google')) {
+        environment 'SKIP_MAP_DOWNLOAD', '1'
+      }
+
+      commandLine './configure.sh'
+    }
+  }
 }
 
 tasks.withType(JavaCompile).configureEach {
diff --git a/tools/unix/build_omim.sh b/tools/unix/build_omim.sh
index eba5c847f..efb9479dd 100755
--- a/tools/unix/build_omim.sh
+++ b/tools/unix/build_omim.sh
@@ -74,6 +74,12 @@ fi
 
 OMIM_PATH="$(cd "${OMIM_PATH:-$(dirname "$0")/../..}"; pwd)"
 
+if [ "$OPT_TARGET" == "desktop" ]; then
+  ./configure.sh
+else
+  SKIP_MAP_DOWNLOAD=1 SKIP_GENERATE_SYMBOLS=1 SKIP_GENERATE_DRULES=1 ./configure.sh
+fi
+
 DEVTOOLSET_PATH=/opt/rh/devtoolset-7
 if [ -d "$DEVTOOLSET_PATH" ]; then
   export MANPATH=

From 3c4e0d05c54fa3d63e354a374e8da83852b9198e Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Thu, 21 Aug 2025 17:26:46 +0700
Subject: [PATCH 118/302] [routing][tests] Comment changes on old maps after
 adding penalties code

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 .../routing_integration_tests/route_test.cpp  | 22 +++++++++++++++++--
 .../routing_integration_tests/turn_test.cpp   | 11 ++++++++--
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/libs/routing/routing_integration_tests/route_test.cpp b/libs/routing/routing_integration_tests/route_test.cpp
index 12a0aae64..225471dcc 100644
--- a/libs/routing/routing_integration_tests/route_test.cpp
+++ b/libs/routing/routing_integration_tests/route_test.cpp
@@ -313,6 +313,7 @@ UNIT_TEST(GermanyBerlinMunichTimeTest)
 
   /// @todo New time is closer to GraphHopper timing, but still very optimistic. Compare maxspeed=none defaults.
   // https://www.openstreetmap.org/directions?engine=graphhopper_car&route=52.51172%2C13.39468%3B48.13294%2C11.60352
+  // TODO: w/ penalties PR: Route length: 585244 meters. ETA: 19436 seconds.
   TestRouteLength(route, 584960);
   TestRouteTime(route, 19173.3);
 }
@@ -328,6 +329,7 @@ UNIT_TEST(GermanyShuttleTrainTest)
 
   TEST(routeResult.first, ());
   Route const & route = *routeResult.first;
+  // TODO: w/ penalties PR: Route length: 44520.5 meters. ETA: 2732.48 seconds.
   TestRouteLength(route, 44517.4);
   TestRouteTime(route, 2619.62);
 }
@@ -384,6 +386,9 @@ UNIT_TEST(Spain_RestirctionOnlyMany)
                                    FromLatLon(43.38222, -5.69083), 8289.15);
 }
 
+// TODO: w/ penalties PR: Route length: 2409.19 meters. ETA: 189.409 second
+// i.e. prefers to take a longer highway detour instead of service roads many turns - seems good!
+// (current test: Route length: 895.203 meters. ETA: 196.768 seconds.)
 UNIT_TEST(Russia_Moscow_RestirctionOnlyMany)
 {
   // This relation https://www.openstreetmap.org/relation/581743
@@ -531,6 +536,8 @@ UNIT_TEST(Austria_Croatia_SalzburgZagreb)
 }
 
 // https://github.com/organicmaps/organicmaps/issues/1071
+// TODO: w/ penalties PR: Route length: 348417 meters. ETA: 17740.4 seconds.
+// The route seems to be logical, so looks like an improvement?!
 UNIT_TEST(Russia_MoscowDesnogorsk)
 {
   CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(55.715208, 37.396528), {0., 0.},
@@ -660,6 +667,10 @@ UNIT_TEST(Turkey_AvoidMountainsSecondary)
 }
 
 // https://github.com/organicmaps/organicmaps/issues/4110
+// TODO: w/ penalties PR: Route length: 162712 meters. ETA: 6478.54 seconds
+// a strange looking detour is added in the end of the route compared to screenshot in OM #4110
+// Adding intermediate 45.255047, 13.6235211 fixes it:
+// Route length: 156291 meters. ETA: 6469.42 seconds (both shorter and tad faster!)
 UNIT_TEST(Slovenia_Croatia_CrossBorderPenalty)
 {
   CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(46.038579, 14.469414), {0., 0.},
@@ -727,6 +738,7 @@ UNIT_TEST(Germany_Netherlands_AvoidLoops)
 
   TEST(routeResult.first, ());
   Route const & route = *routeResult.first;
+  // TODO: w/ penalties PR: Route length: 405391 meters. ETA: 14249.4 seconds.
   TestRouteLength(route, 405058);
   TestRouteTime(route, 13965.2);
 }
@@ -823,9 +835,11 @@ UNIT_TEST(Netherlands_CrossMwm_Ferry)
 }
 
 // https://github.com/organicmaps/organicmaps/issues/6278
+// TODO: w/ penalties PR: Route length: 4629.08 meters. ETA: 750.719 seconds.
+// The new route looks alright.
 UNIT_TEST(Turkey_PreferSecondary_NotResidential)
 {
-  /// @todo Now the app wrongly takes tertiary (no limits) vs primary/secondary (with maxspeed = 30).
+  /// @todo Now the app wrongly takes tertiary (no limits) vs primary/secondary (with maxspeed = 30) - fixed?
   CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(41.0529, 28.9201), {0., 0.},
                                    FromLatLon(41.0731, 28.9407), 4783.85);
 }
@@ -868,15 +882,19 @@ UNIT_TEST(LATAM_UsePrimary_NotTrunkDetour)
 }
 
 // https://github.com/organicmaps/organicmaps/issues/8729
-// https://github.com/organicmaps/organicmaps/issues/8541
 UNIT_TEST(USA_UseDirt_WithMaxspeed)
 {
+  // Route length: 20907.2 meters. ETA: 1847.97 seconds.
   CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(46.5361985, -111.943183),
                                    {0., 0.}, FromLatLon(46.4925409, -112.105446), 20906.5);
 
+  // TODO: w/ penalties PR: Route length: 3324.62 meters. ETA: 1377.89 seconds.
+  // The new route is shorter and less turns!
   CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(46.7336967, -111.926), {0., 0.},
                                    FromLatLon(46.7467037, -111.917147), 3527.79);
 
+  // Albania https://github.com/organicmaps/organicmaps/issues/8541
+  // 247.14 meters. ETA: 370.356 seconds
   CalculateRouteAndTestRouteLength(GetVehicleComponents(VehicleType::Car), FromLatLon(42.3889581, 19.7812567), {0., 0.},
                                    FromLatLon(42.3878106, 19.7831402), 247.139);
 }
diff --git a/libs/routing/routing_integration_tests/turn_test.cpp b/libs/routing/routing_integration_tests/turn_test.cpp
index b5715816d..4c1b4548b 100644
--- a/libs/routing/routing_integration_tests/turn_test.cpp
+++ b/libs/routing/routing_integration_tests/turn_test.cpp
@@ -95,7 +95,7 @@ UNIT_TEST(Russia_Moscow_TrikotagniAndPohodniRoundabout_TurnTest)
 
   integration::GetNthTurn(route, 0).TestValid().TestDirection(CarDirection::EnterRoundAbout).TestRoundAboutExitNum(2);
   integration::GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::LeaveRoundAbout);
-
+  // Route length: 388.169 meters. ETA: 40.4678 seconds.
   integration::TestRouteLength(route, 387.);
 }
 
@@ -131,7 +131,9 @@ UNIT_TEST(Russia_Moscow_PlanetnayaOnlyStraight_TurnTest)
   integration::GetNthTurn(route, 1).TestValid().TestDirection(CarDirection::TurnRight);
   integration::GetNthTurn(route, 2).TestValid().TestDirection(CarDirection::TurnLeft);
   integration::GetNthTurn(route, 3).TestValid().TestDirection(CarDirection::TurnRight);
-
+  // TODO: w/ penalties PR: Route length: 543.697 meters. ETA: 129.123 seconds.
+  // Old: Route length: 417.806 meters. ETA: 132.629 seconds.
+  // Hard to say which one is better.
   integration::TestRouteLength(route, 418.0);
 }
 
@@ -722,6 +724,11 @@ UNIT_TEST(Russia_Moscow_LeninskyProsp_TurnTest)
 
   TEST_EQUAL(result, RouterResultCode::NoError, ());
 
+  // TODO: w/ penalties PR: Route length: 4 turns, 3346.5 meters. ETA: 323.326 seconds.
+  // Old: 6 turns, Route length: 2976.69 meters. ETA: 251.882 seconds
+  // The new route looks better overall.
+  // However the last "turn" is more like going to off-ramp and might be worth it:
+  // 3355.19 meters. ETA: 322.08 seconds
   integration::TestTurnCount(route, 6 /* expectedTurnCount */);
 }
 

From 3b5d5e882bdc2970e0ed0d436737787280352948 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Wed, 20 Aug 2025 00:27:27 +0700
Subject: [PATCH 119/302] [styles] Make entrances visible earlier

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 .../default/include/Basemap_label.mapcss      | 14 +++++++++----
 .../include/priorities_4_overlays.prio.txt    | 20 +++++++++----------
 .../include/priorities_4_overlays.prio.txt    | 20 +++++++++----------
 3 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/data/styles/default/include/Basemap_label.mapcss b/data/styles/default/include/Basemap_label.mapcss
index 6f80b6540..e0a9c6230 100644
--- a/data/styles/default/include/Basemap_label.mapcss
+++ b/data/styles/default/include/Basemap_label.mapcss
@@ -705,14 +705,20 @@ node|z18-[addr:housenumber][addr:street],
 node|z16-[addr:housenumber][addr:street]::int_name,
 {font-size: 8;}
 
-node|z19-[entrance],
+node|z17[entrance],
+node|z18[amenity=loading_dock],
+node|z16[entrance=main],
+node|z16[emergency=emergency_ward_entrance],
+{icon-image: dot-m.svg;}
+
+node|z18-[entrance],
 node|z19-[amenity=loading_dock],
 {icon-image: entrance-s.svg; font-size: 10; text-offset: 1;}
-node|z19-[entrance=exit],
+node|z18-[entrance=exit],
 {icon-image: entrance-exit-s.svg; font-size: 10; text-offset: 1;}
-node|z18-[entrance=main],
+node|z17-[entrance=main],
 {icon-image: entrance-main-s.svg; font-size: 10; text-offset: 1;}
-node|z18-[emergency=emergency_ward_entrance],
+node|z17-[emergency=emergency_ward_entrance],
 {icon-image: entrance-emergency-s.svg; font-size: 10; text-offset: 1;}
 
 /* 8.3 Airports */
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index 9e5b17b97..f15dc1d6f 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -1216,7 +1216,7 @@ amenity-motorcycle_parking                          # icon z17- (also has captio
 amenity-parking-permissive                          # icon z16- (also has caption(optional) z18-, area z15-)
 amenity-parking_entrance                            # icon z17- (also has caption(optional) z19-)
 amenity-parking_entrance-permissive                 # icon z17- (also has caption(optional) z19-)
-emergency-emergency_ward_entrance                   # icon z18- (also has caption(optional) z18-)
+emergency-emergency_ward_entrance                   # icon z16- (also has caption(optional) z18-)
 === 250
 
 building                                            # caption z16- (also has area z14-)
@@ -1231,7 +1231,7 @@ power-plant-wind                                    # icon z15- (also has captio
 === 230
 
 barrier-entrance                                    # icon z16- (also has caption(optional) z16-)
-entrance-main                                       # icon z18- (also has caption(optional) z18-)
+entrance-main                                       # icon z16- (also has caption(optional) z18-)
 === 220
 
 highway-traffic_signals                             # icon z19-
@@ -2151,14 +2151,14 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-parking-permissive                        # caption(optional) z18- (also has icon z16-, area z15-)
 # amenity-parking_entrance                          # caption(optional) z19- (also has icon z17-)
 # amenity-parking_entrance-permissive               # caption(optional) z19- (also has icon z17-)
-# emergency-emergency_ward_entrance                 # caption(optional) z18- (also has icon z18-)
+# emergency-emergency_ward_entrance                 # caption(optional) z18- (also has icon z16-)
 # === -9750
 
 # power-plant-wind                                  # caption(optional) z16- (also has icon z15-, area z13-)
 # === -9770
 
 # barrier-entrance                                  # caption(optional) z16- (also has icon z16-)
-# entrance-main                                     # caption(optional) z18- (also has icon z18-)
+# entrance-main                                     # caption(optional) z18- (also has icon z16-)
 # === -9780
 
 # historic-anchor                                   # caption(optional) z18- (also has icon z18-)
@@ -2205,7 +2205,7 @@ tourism-information-map                             # icon z16- (also has captio
 
 amenity                                             # caption z19-
 amenity-telephone                                   # icon z17- (also has caption(optional) z19-)
-entrance                                            # icon z19- (also has caption(optional) z19-)
+entrance                                            # icon z17- (also has caption(optional) z19-)
 === -9960
 
 amenity-parking_space                               # caption z19-
@@ -2238,8 +2238,8 @@ power-substation                                    # icon z19- (also has captio
 === -9990
 
 # amenity-bench                                     # caption(optional) z19- (also has icon z18-)
-amenity-loading_dock                                # icon z19- (also has caption(optional) z19-)
-# amenity-loading_dock                              # caption(optional) z19- (also has icon z19-)
+amenity-loading_dock                                # icon z18- (also has caption(optional) z19-)
+# amenity-loading_dock                              # caption(optional) z19- (also has icon z18-)
 # amenity-parking_space-disabled                    # caption(optional) z19- (also has icon z18-)
 # amenity-telephone                                 # caption(optional) z19- (also has icon z17-)
 # amenity-vending_machine                           # caption(optional) z18- (also has icon z18-)
@@ -2256,9 +2256,9 @@ amenity-loading_dock                                # icon z19- (also has captio
 # emergency-assembly_point                          # caption(optional) z18- (also has icon z18-)
 # emergency-defibrillator                           # caption(optional) z18- (also has icon z18-)
 # emergency-fire_hydrant                            # caption(optional) z19- (also has icon z19-)
-# entrance                                          # caption(optional) z19- (also has icon z19-)
-entrance-exit                                       # icon z19- (also has caption(optional) z19-)
-# entrance-exit                                     # caption(optional) z19- (also has icon z19-)
+# entrance                                          # caption(optional) z19- (also has icon z17-)
+entrance-exit                                       # icon z17- (also has caption(optional) z19-)
+# entrance-exit                                     # caption(optional) z19- (also has icon z17-)
 # man_made-cairn                                    # caption(optional) z19- (also has icon z19-)
 # man_made-survey_point                             # caption(optional) z18- (also has icon z18-)
 # power-substation                                  # caption(optional) z19- (also has icon z19-, area z13-)
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index ff51442d3..3b14846e5 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -1217,7 +1217,7 @@ amenity-motorcycle_parking                          # icon z17- (also has captio
 amenity-parking-permissive                          # icon z16- (also has caption(optional) z18-, area z15-)
 amenity-parking_entrance                            # icon z17- (also has caption(optional) z19-)
 amenity-parking_entrance-permissive                 # icon z17- (also has caption(optional) z19-)
-emergency-emergency_ward_entrance                   # icon z18- (also has caption(optional) z18-)
+emergency-emergency_ward_entrance                   # icon z16- (also has caption(optional) z18-)
 === 250
 
 building                                            # caption z16- (also has area z14-)
@@ -1234,7 +1234,7 @@ power-pole                                          # icon z15-
 === 230
 
 barrier-entrance                                    # icon z16- (also has caption(optional) z16-)
-entrance-main                                       # icon z18- (also has caption(optional) z18-)
+entrance-main                                       # icon z16- (also has caption(optional) z18-)
 === 220
 
 highway-traffic_signals                             # icon z19-
@@ -2156,14 +2156,14 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-parking-permissive                        # caption(optional) z18- (also has icon z16-, area z15-)
 # amenity-parking_entrance                          # caption(optional) z19- (also has icon z17-)
 # amenity-parking_entrance-permissive               # caption(optional) z19- (also has icon z17-)
-# emergency-emergency_ward_entrance                 # caption(optional) z18- (also has icon z18-)
+# emergency-emergency_ward_entrance                 # caption(optional) z18- (also has icon z16-)
 # === -9750
 
 # power-plant-wind                                  # caption(optional) z16- (also has icon z13-, area z13-)
 # === -9770
 
 # barrier-entrance                                  # caption(optional) z16- (also has icon z16-)
-# entrance-main                                     # caption(optional) z18- (also has icon z18-)
+# entrance-main                                     # caption(optional) z18- (also has icon z16-)
 # === -9780
 
 # historic-anchor                                   # caption(optional) z18- (also has icon z18-)
@@ -2210,7 +2210,7 @@ tourism-information-map                             # icon z15- (also has captio
 
 amenity                                             # caption z19-
 amenity-telephone                                   # icon z17- (also has caption(optional) z19-)
-entrance                                            # icon z19- (also has caption(optional) z19-)
+entrance                                            # icon z17- (also has caption(optional) z19-)
 === -9960
 
 amenity-parking_space                               # caption z19-
@@ -2243,8 +2243,8 @@ power-substation                                    # icon z19- (also has captio
 === -9990
 
 # amenity-bench                                     # caption(optional) z19- (also has icon z18-)
-amenity-loading_dock                                # icon z19- (also has caption(optional) z19-)
-# amenity-loading_dock                              # caption(optional) z19- (also has icon z19-)
+amenity-loading_dock                                # icon z18- (also has caption(optional) z19-)
+# amenity-loading_dock                              # caption(optional) z19- (also has icon z18-)
 # amenity-parking_space-disabled                    # caption(optional) z19- (also has icon z18-)
 # amenity-telephone                                 # caption(optional) z19- (also has icon z17-)
 # amenity-vending_machine                           # caption(optional) z18- (also has icon z18-)
@@ -2261,9 +2261,9 @@ amenity-loading_dock                                # icon z19- (also has captio
 # emergency-assembly_point                          # caption(optional) z18- (also has icon z18-)
 # emergency-defibrillator                           # caption(optional) z18- (also has icon z18-)
 # emergency-fire_hydrant                            # caption(optional) z19- (also has icon z19-)
-# entrance                                          # caption(optional) z19- (also has icon z19-)
-entrance-exit                                       # icon z19- (also has caption(optional) z19-)
-# entrance-exit                                     # caption(optional) z19- (also has icon z19-)
+# entrance                                          # caption(optional) z19- (also has icon z17-)
+entrance-exit                                       # icon z17- (also has caption(optional) z19-)
+# entrance-exit                                     # caption(optional) z19- (also has icon z17-)
 # man_made-cairn                                    # caption(optional) z17- (also has icon z17-)
 # man_made-survey_point                             # caption(optional) z15- (also has icon z14-)
 # power-substation                                  # caption(optional) z19- (also has icon z19-, area z13-)

From 2587db91bedecf30b2d70722e831f25a34c5120c Mon Sep 17 00:00:00 2001
From: Yannik Bloscheck <git@yannikbloscheck.com>
Date: Thu, 21 Aug 2025 11:35:51 +0200
Subject: [PATCH 120/302] [styles] Changed symbol for early entries to square

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
---
 data/styles/default/dark/symbols/square-m.svg    | 1 +
 data/styles/default/include/Basemap_label.mapcss | 2 +-
 data/styles/default/light/symbols/square-m.svg   | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 data/styles/default/dark/symbols/square-m.svg
 create mode 100644 data/styles/default/light/symbols/square-m.svg

diff --git a/data/styles/default/dark/symbols/square-m.svg b/data/styles/default/dark/symbols/square-m.svg
new file mode 100644
index 000000000..be4d751da
--- /dev/null
+++ b/data/styles/default/dark/symbols/square-m.svg
@@ -0,0 +1 @@
+<svg height="4" viewBox="0 0 4 4" width="4" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h4v4h-4z"/></defs><g fill="none" fill-rule="evenodd" xlink:href="#a"><path d="m0 0h4v4h-4z" fill="#000"/><path d="m.67.67h2.67v2.67h-2.67z" fill="#747474"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/include/Basemap_label.mapcss b/data/styles/default/include/Basemap_label.mapcss
index e0a9c6230..6bd6715e0 100644
--- a/data/styles/default/include/Basemap_label.mapcss
+++ b/data/styles/default/include/Basemap_label.mapcss
@@ -709,7 +709,7 @@ node|z17[entrance],
 node|z18[amenity=loading_dock],
 node|z16[entrance=main],
 node|z16[emergency=emergency_ward_entrance],
-{icon-image: dot-m.svg;}
+{icon-image: square-m.svg;}
 
 node|z18-[entrance],
 node|z19-[amenity=loading_dock],
diff --git a/data/styles/default/light/symbols/square-m.svg b/data/styles/default/light/symbols/square-m.svg
new file mode 100644
index 000000000..3aa3b21de
--- /dev/null
+++ b/data/styles/default/light/symbols/square-m.svg
@@ -0,0 +1 @@
+<svg height="4" viewBox="0 0 4 4" width="4" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path id="a" d="m0 0h4v4h-4z"/></defs><g fill="none" fill-rule="evenodd" xlink:href="#a"><path d="m0 0h4v4h-4z" fill="#eed"/><path d="m.67.67h2.67v2.67h-2.67z" fill="#65655E"/></g></svg>
\ No newline at end of file

From f81bff512a6207b1a5142422f6d66826e0fe4a16 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Thu, 21 Aug 2025 19:36:58 +0700
Subject: [PATCH 121/302] [styles] Add amenity=animal_shelter

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 android/app/src/main/res/values-ru/types_strings.xml        | 1 +
 android/app/src/main/res/values/types_strings.xml           | 1 +
 data/categories.txt                                         | 4 ++++
 data/editor.config                                          | 3 +++
 data/mapcss-mapping.csv                                     | 2 +-
 data/styles/default/include/Icons.mapcss                    | 6 ++++++
 data/styles/default/include/priorities_4_overlays.prio.txt  | 2 ++
 data/styles/outdoors/include/priorities_4_overlays.prio.txt | 2 ++
 .../Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings | 1 +
 .../Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings | 1 +
 10 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/android/app/src/main/res/values-ru/types_strings.xml b/android/app/src/main/res/values-ru/types_strings.xml
index 328db5bb4..f5cfb0b72 100644
--- a/android/app/src/main/res/values-ru/types_strings.xml
+++ b/android/app/src/main/res/values-ru/types_strings.xml
@@ -182,6 +182,7 @@
     <string name="type.amenity.vehicle_inspection">Техосмотр автомобиля</string>
     <string name="type.amenity.vending_machine.fuel">Топливная колонка</string>
     <string name="type.amenity.veterinary">Ветеринарная клиника</string>
+    <string name="type.amenity.animal_shelter">Приют для животных</string>
     <string name="type.amenity.waste_basket">Урна</string>
     <string name="type.amenity.waste_disposal">Мусорный контейнер</string>
     <string name="type.amenity.waste_transfer_station">Станция перевалки отходов</string>
diff --git a/android/app/src/main/res/values/types_strings.xml b/android/app/src/main/res/values/types_strings.xml
index 5a7a5ae04..f5daa3358 100644
--- a/android/app/src/main/res/values/types_strings.xml
+++ b/android/app/src/main/res/values/types_strings.xml
@@ -187,6 +187,7 @@
     <string name="type.amenity.vehicle_inspection">Vehicle Inspection</string>
     <string name="type.amenity.vending_machine.fuel">Fuel Pump</string>
     <string name="type.amenity.veterinary">Veterinary Doctor</string>
+    <string name="type.amenity.animal_shelter">Animal Shelter</string>
     <string name="type.amenity.waste_basket">Trash Bin</string>
     <string name="type.amenity.waste_disposal">Dumpster</string>
     <string name="type.amenity.waste_transfer_station">Waste Transfer Station</string>
diff --git a/data/categories.txt b/data/categories.txt
index e0facb8b9..b3e7dcbae 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -12994,6 +12994,10 @@ sk:4Veterinár
 fa:دامپزشکی
 mr:पशुवैद्यकीय डॉक्टर|प्राण्यांचा डॉक्टर
 
+amenity-animal_shelter
+en:Animal Shelter
+ru:Приют для животных
+
 @charging_station
 en:4Charging Station|charging
 ru:4Зарядная станция|зарядка|электрозарядка|зарядить
diff --git a/data/editor.config b/data/editor.config
index efead9f4a..3415d1136 100644
--- a/data/editor.config
+++ b/data/editor.config
@@ -455,6 +455,9 @@
       <type id="amenity-veterinary" group="health">
         <include group="poi_internet" />
       </type>
+      <type id="amenity-animal_shelter">
+        <include group="poi_internet" />
+      </type>
       <type id="amenity-charging_station">
         <include group="poi" />
         <include field="operator" />
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index b7e74989d..aafa9e027 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1024,7 +1024,7 @@ man_made|crane;899;
 railway|subway|darkgreen;[railway=subway][colour=darkgreen];x;name;int_name;900;railway|subway|tunnel
 barrier|wicket_gate;901;
 railway|subway|gray;[railway=subway][colour=gray];x;name;int_name;902;railway|subway|tunnel
-deprecated|deprecated;903;x
+amenity|animal_shelter;903;
 railway|subway|lightblue;[railway=subway][colour=lightblue];x;name;int_name;904;railway|subway|tunnel
 amenity|motorcycle_rental;[amenity=motorcycle_rental],[shop=motorcycle][motorcycle:rental=yes],[shop=motorcycle][rental=yes],[amenity=scooter_rental];;;;905;
 railway|subway|lightgreen;[railway=subway][colour=lightgreen];x;name;int_name;906;railway|subway|tunnel
diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index 6612a26a4..17caec6a4 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -788,6 +788,7 @@ node|z17-[leisure=amusement_arcade],
 node|z17-[amenity=courthouse],
 node|z17-[amenity=nursing_home],
 node|z17-[amenity=social_facility],
+node|z17-[amenity=animal_shelter],
 node|z17-[amenity=kindergarten],
 node|z17-[amenity=childcare],
 node|z17-[amenity=school],
@@ -922,6 +923,11 @@ node|z16-[amenity=veterinary],
 node|z18-[amenity=veterinary],
 {font-size: 11;}
 
+node|z17-[amenity=animal_shelter],
+{icon-image: dog_park-m.svg;}
+node|z18-[amenity=animal_shelter],
+{font-size: 11;}
+
 node|z16-[amenity=pharmacy],
 {icon-image: pharmacy-m.svg;icon-min-distance: 20;}
 node|z17-[amenity=pharmacy],
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index f15dc1d6f..aa7ee84b5 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -916,6 +916,7 @@ railway-level_crossing                              # icon z17-
 railway-platform                                    # caption z16- (also has area z16-)
 === 1650
 
+amenity-animal_shelter                              # icon z17- (also has caption(optional) z17-)
 amenity-car_wash                                    # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-childcare                                   # icon z17- (also has caption(optional) z17-, area z13-)
 amenity-doctors                                     # icon z17- (also has caption(optional) z17-, area z15-)
@@ -1877,6 +1878,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # tourism-picnic_site                               # caption(optional) z16- (also has icon z16-)
 # === -8200
 
+# amenity-animal_shelter                            # caption(optional) z17- (also has icon z17-)
 # amenity-car_wash                                  # caption(optional) z17- (also has icon z17-, area z15-)
 # amenity-childcare                                 # caption(optional) z17- (also has icon z17-, area z13-)
 # amenity-doctors                                   # caption(optional) z17- (also has icon z17-, area z15-)
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 3b14846e5..01fd40b15 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -916,6 +916,7 @@ railway-level_crossing                              # icon z17-
 railway-platform                                    # caption z16- (also has area z16-)
 === 1650
 
+amenity-animal_shelter                              # icon z17- (also has caption(optional) z17-)
 amenity-car_wash                                    # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-childcare                                   # icon z17- (also has caption(optional) z17-, area z13-)
 amenity-doctors                                     # icon z17- (also has caption(optional) z17-, area z15-)
@@ -1880,6 +1881,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # tourism-picnic_site                               # caption(optional) z14- (also has icon z14-)
 # === -8200
 
+# amenity-animal_shelter                            # caption(optional) z17- (also has icon z17-)
 # amenity-car_wash                                  # caption(optional) z17- (also has icon z17-, area z15-)
 # amenity-childcare                                 # caption(optional) z17- (also has icon z17-, area z13-)
 # amenity-doctors                                   # caption(optional) z17- (also has icon z17-, area z15-)
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
index 06bc978ec..cee9b71b1 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
@@ -197,6 +197,7 @@
 "type.amenity.vehicle_inspection" = "Vehicle Inspection";
 "type.amenity.vending_machine.fuel" = "Fuel Pump";
 "type.amenity.veterinary" = "Veterinary Doctor";
+"type.amenity.animal_shelter" = "Animal Shelter";
 "type.amenity.waste_basket" = "Trash Bin";
 "type.amenity.waste_disposal" = "Dumpster";
 "type.amenity.waste_transfer_station" = "Waste Transfer Station";
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings
index 698f0504a..18ddbfa26 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings
@@ -184,6 +184,7 @@
 "type.amenity.vehicle_inspection" = "Техосмотр автомобиля";
 "type.amenity.vending_machine.fuel" = "Топливная колонка";
 "type.amenity.veterinary" = "Ветеринарная клиника";
+"type.amenity.animal_shelter" = "Приют для животных";
 "type.amenity.waste_basket" = "Урна";
 "type.amenity.waste_disposal" = "Мусорный контейнер";
 "type.amenity.waste_transfer_station" = "Станция перевалки отходов";

From 052a3123aa4c98ff3a2bceb887d07ed1f2541f73 Mon Sep 17 00:00:00 2001
From: Yannik Bloscheck <git@yannikbloscheck.com>
Date: Thu, 21 Aug 2025 15:12:49 +0200
Subject: [PATCH 122/302] [styles] Adding animal shelter icon

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
---
 data/styles/default/dark/symbols/animal_shelter-m.svg | 1 +
 data/styles/default/include/Icons.mapcss              | 2 +-
 data/styles/default/light/animal_shelter-m.svg        | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 data/styles/default/dark/symbols/animal_shelter-m.svg
 create mode 100644 data/styles/default/light/animal_shelter-m.svg

diff --git a/data/styles/default/dark/symbols/animal_shelter-m.svg b/data/styles/default/dark/symbols/animal_shelter-m.svg
new file mode 100644
index 000000000..1f03c4bbd
--- /dev/null
+++ b/data/styles/default/dark/symbols/animal_shelter-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#717065" r="8.25"/><path d="m14.1563206 5.31996974h-1.37501l-.153811-.29514695c-.116437-.22359297-.3545039-.36484026-.6148782-.3648543h-1.1520829l-.5860614-.56265107c-.2167835-.20789337-.58693916-.06063586-.58693916.23326832v3.09042073l2.75002016.94274859v-.73386521h.6874318c.7594737 0 1.3750101-.59090474 1.3750101-1.3200025v-.65999423c0-.18232885-.153811-.33000062-.3437525-.33000062zm-2.4062676.99000187c-.1899415 0-.3437525-.14767177-.3437525-.33000063 0-.18232183.153811-.33000062.3437525-.33000062.1899416 0 .3437525.14767879.3437525.33000062 0 .18232886-.1538109.33000063-.3437525.33000063zm-6.18754523 1.65000312c-.37898349 0-.68750503-.29616503-.68750503-.65998721 0-.36444005-.3078706-.65999423-.68749771-.65999423s-.68750503.29555418-.68750503.65999423c0 .85919524.57642908 1.58505619 1.37501006 1.85832479v4.41168709c0 .1822727.15382559.3300006.34375251.3300006h1.37501006c.1899196 0 .34375251-.1477279.34375251-.3300006v-2.3100044h3.43752516v2.3100044c0 .1822727.1538109.3300006.3437525.3300006h1.3750101c.1899415 0 .3437525-.1477279.3437525-.3300006v-4.50549152l-3.22161934-1.10451911z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index 17caec6a4..58a2118c4 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -924,7 +924,7 @@ node|z18-[amenity=veterinary],
 {font-size: 11;}
 
 node|z17-[amenity=animal_shelter],
-{icon-image: dog_park-m.svg;}
+{icon-image: animal_shelter-m.svg;}
 node|z18-[amenity=animal_shelter],
 {font-size: 11;}
 
diff --git a/data/styles/default/light/animal_shelter-m.svg b/data/styles/default/light/animal_shelter-m.svg
new file mode 100644
index 000000000..93cd602b3
--- /dev/null
+++ b/data/styles/default/light/animal_shelter-m.svg
@@ -0,0 +1 @@
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#fff" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#747e86" r="8.25"/><path d="m14.1563206 5.31996974h-1.37501l-.153811-.29514695c-.116437-.22359297-.3545039-.36484026-.6148782-.3648543h-1.1520829l-.5860614-.56265107c-.2167835-.20789337-.58693916-.06063586-.58693916.23326832v3.09042073l2.75002016.94274859v-.73386521h.6874318c.7594737 0 1.3750101-.59090474 1.3750101-1.3200025v-.65999423c0-.18232885-.153811-.33000062-.3437525-.33000062zm-2.4062676.99000187c-.1899415 0-.3437525-.14767177-.3437525-.33000063 0-.18232183.153811-.33000062.3437525-.33000062.1899416 0 .3437525.14767879.3437525.33000062 0 .18232886-.1538109.33000063-.3437525.33000063zm-6.18754523 1.65000312c-.37898349 0-.68750503-.29616503-.68750503-.65998721 0-.36444005-.3078706-.65999423-.68749771-.65999423s-.68750503.29555418-.68750503.65999423c0 .85919524.57642908 1.58505619 1.37501006 1.85832479v4.41168709c0 .1822727.15382559.3300006.34375251.3300006h1.37501006c.1899196 0 .34375251-.1477279.34375251-.3300006v-2.3100044h3.43752516v2.3100044c0 .1822727.1538109.3300006.3437525.3300006h1.3750101c.1899415 0 .3437525-.1477279.3437525-.3300006v-4.50549152l-3.22161934-1.10451911z" fill="#fff"/></g></svg>
\ No newline at end of file

From 0d4809c18ecf699a33df03a8e7ee3f409cf3b869 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Wed, 20 Aug 2025 19:06:35 +0200
Subject: [PATCH 123/302] [doc] Update badge link to the license

Signed-off-by: jeanbaptisteC <jeanbaptiste.charron@outlook.fr>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2b47e335d..ef018b009 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@
 </div>
 <div align="center">
   <p align="center">
-    <a href="https://codeberg.org/comaps/comaps/releases">
+    <a href="LICENSE">
       <img src="https://img.shields.io/github/license/comaps/comaps?style=for-the-badge&logo=opensourceinitiative&logoColor=white&color=588157" alt="License"/>
     </a>
     <a href="https://github.com/comaps/comaps/actions/workflows/android-check.yaml">

From 3f7815017e398548a204a881d9882933cb2c741d Mon Sep 17 00:00:00 2001
From: hb0nd <me@hbond.xyz>
Date: Thu, 21 Aug 2025 16:48:59 +0200
Subject: [PATCH 124/302] [docs] Use full url for license

it worked at the end of the file, but i guess it doesn't work in a href for some reason...

Signed-off-by: hb0nd <me@hbond.xyz>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ef018b009..de158dafd 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@
 </div>
 <div align="center">
   <p align="center">
-    <a href="LICENSE">
+    <a href="https://codeberg.org/comaps/comaps/src/branch/main/LICENSE">
       <img src="https://img.shields.io/github/license/comaps/comaps?style=for-the-badge&logo=opensourceinitiative&logoColor=white&color=588157" alt="License"/>
     </a>
     <a href="https://github.com/comaps/comaps/actions/workflows/android-check.yaml">

From 3c34765595923bba800f5612a48949ae1bfe9c5a Mon Sep 17 00:00:00 2001
From: x7z4w <x7z4w@noreply.codeberg.org>
Date: Thu, 21 Aug 2025 13:56:48 +0000
Subject: [PATCH 125/302] [core] nits

Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>
---
 libs/base/string_utils.cpp      |  3 +--
 libs/base/string_utils.hpp      | 14 ++++++++++++++
 libs/drape/glyph_manager.cpp    |  7 +------
 libs/drape/harfbuzz_shaping.cpp |  2 +-
 libs/search/query_params.cpp    |  4 ++--
 5 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/libs/base/string_utils.cpp b/libs/base/string_utils.cpp
index fb8e30c2f..b6369f034 100644
--- a/libs/base/string_utils.cpp
+++ b/libs/base/string_utils.cpp
@@ -8,7 +8,6 @@
 #include <cmath>
 #include <cstddef>
 #include <iomanip>
-#include <iterator>
 
 #include <fast_double_parser.h>
 #include <boost/algorithm/string/trim.hpp>
@@ -345,7 +344,7 @@ std::u16string ToUtf16(std::string_view utf8)
 
 bool IsASCIIString(std::string_view sv)
 {
-  for (auto c : sv)
+  for (auto const c : sv)
     if (c & 0x80)
       return false;
   return true;
diff --git a/libs/base/string_utils.hpp b/libs/base/string_utils.hpp
index b9ec4189f..6bb77b17d 100644
--- a/libs/base/string_utils.hpp
+++ b/libs/base/string_utils.hpp
@@ -114,6 +114,20 @@ void Trim(std::string_view & sv);
 void Trim(std::string_view & s, std::string_view anyOf);
 void Trim(std::string & s, std::string_view anyOf);
 
+template <std::convertible_to<std::string_view> Utf8>
+size_t CountChar(Utf8 const & utf8)
+{
+  size_t codePoints = 0;
+
+  for (auto const c : utf8)
+  {
+    if ((c & 0xC0) != 0x80)
+      ++codePoints;
+  }
+
+  return codePoints;
+}
+
 bool Truncate(std::string & utf8, size_t const maxTextLengthPlus1);
 
 // Replace the first match of the search substring in the input with the format string.
diff --git a/libs/drape/glyph_manager.cpp b/libs/drape/glyph_manager.cpp
index 864b728b6..c475677f9 100644
--- a/libs/drape/glyph_manager.cpp
+++ b/libs/drape/glyph_manager.cpp
@@ -19,10 +19,6 @@
 #include <ft2build.h>
 #include <hb-ft.h>
 #include <unicode/unistr.h>
-#include <limits>
-#include <sstream>
-#include <string>
-#include <vector>
 
 #include FT_FREETYPE_H
 #include FT_MODULE_H
@@ -600,8 +596,7 @@ FreetypeError constexpr g_FT_Errors[] =
     // For SplitText it's enough to know if the last visual (first logical) segment is RTL.
     allGlyphs.m_isRTL = segments.back().m_direction == HB_DIRECTION_RTL;
 
-    // TODO(AB): Check if it's slower or faster.
-    allGlyphs.m_glyphs.reserve(icu::UnicodeString{false, text.data(), static_cast<int32_t>(text.size())}.countChar32());
+    allGlyphs.m_glyphs.reserve(strings::CountChar(utf8));
 
     for (auto const & substring : segments)
     {
diff --git a/libs/drape/harfbuzz_shaping.cpp b/libs/drape/harfbuzz_shaping.cpp
index b03df65cf..153a8088c 100644
--- a/libs/drape/harfbuzz_shaping.cpp
+++ b/libs/drape/harfbuzz_shaping.cpp
@@ -213,7 +213,7 @@ void ReorderRTL(TextSegments & segments)
 TextSegments GetTextSegments(std::string_view utf8)
 {
   ASSERT(!utf8.empty(), ("Shaping of empty strings is not supported"));
-  ASSERT(std::string::npos == utf8.find_first_of("\r\n"), ("Shaping with line breaks is not supported", utf8));
+  ASSERT(std::string::npos == utf8.find_first_of("\n"), ("Shaping with line breaks is not supported", utf8));
 
   // TODO(AB): Can unnecessary conversion/allocation be avoided?
   TextSegments segments{strings::ToUtf16(utf8), {}};
diff --git a/libs/search/query_params.cpp b/libs/search/query_params.cpp
index 158a05994..e7f0876c9 100644
--- a/libs/search/query_params.cpp
+++ b/libs/search/query_params.cpp
@@ -3,7 +3,7 @@
 #include "search/ranking_utils.hpp"
 #include "search/token_range.hpp"
 
-#include <map>
+#include <unordered_map>
 #include <sstream>
 
 namespace search
@@ -15,7 +15,7 @@ namespace
 // All synonyms should be lowercase.
 
 /// @todo These should check the map language and use only the corresponding translation.
-map<string, vector<string>> const kSynonyms = {
+unordered_map<string, vector<string>> const kSynonyms = {
     /// @todo Should process synonyms with errors like "blvrd" -> "blvd".
     /// @see HouseOnStreetSynonymsWithMisprints test.
     {"1", {"pierwszy", "pierwsza", "un", "una", "pierwsze", "primo"}},

From 2b2518b0b4afbe25e7bb3defd1b44e19083ce428 Mon Sep 17 00:00:00 2001
From: Kiryl Kaveryn <kirylkaveryn@gmail.com>
Date: Wed, 30 Jul 2025 16:41:39 +0400
Subject: [PATCH 126/302] [ios] Disable track recording live activity widget
 for apps running on macos

Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
---
 iphone/Maps/Core/TrackRecorder/TrackRecordingManager.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/iphone/Maps/Core/TrackRecorder/TrackRecordingManager.swift b/iphone/Maps/Core/TrackRecorder/TrackRecordingManager.swift
index b32dead21..2e1db76f1 100644
--- a/iphone/Maps/Core/TrackRecorder/TrackRecordingManager.swift
+++ b/iphone/Maps/Core/TrackRecorder/TrackRecordingManager.swift
@@ -57,7 +57,7 @@ final class TrackRecordingManager: NSObject {
     let locationManager = LocationManager.self
     var activityManager: TrackRecordingActivityManager? = nil
     #if canImport(ActivityKit)
-    if #available(iOS 16.2, *) {
+    if #available(iOS 16.2, *), !ProcessInfo.processInfo.isiOSAppOnMac {
       activityManager = TrackRecordingLiveActivityManager.shared
     }
     #endif

From cecca729dbdb7985554c6c6309dcff83767a0c79 Mon Sep 17 00:00:00 2001
From: Kiryl Kaveryn <kirylkaveryn@gmail.com>
Date: Wed, 30 Jul 2025 16:51:29 +0400
Subject: [PATCH 127/302] [ios] Check that pp data exists before update the TR
 PP screen

Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
---
 iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.mm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.mm b/iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.mm
index 1bd9e79ba..94249a6b4 100644
--- a/iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.mm
+++ b/iphone/CoreApi/CoreApi/PlacePageData/PlacePageData.mm
@@ -115,8 +115,9 @@ static PlacePageRoadType convertRoadType(RoadWarningMarkType roadType) {
     self.onTrackRecordingProgressUpdate();
 }
 
-- (void)handleActiveTrackSelectionPointChanged {
-  if (!self || !rawData().IsTrack())
+- (void)handleActiveTrackSelectionPointChanged
+{
+  if (!self || !PlacePageData.hasData || !rawData().IsTrack())
     return;
   auto const & trackInfo = GetFramework().GetBookmarkManager().GetTrackSelectionInfo(rawData().GetTrackId());
   auto const latlon = mercator::ToLatLon(trackInfo.m_trackPoint);

From 902e7f6453863ed72d2f5687fcac13c809a98825 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Fri, 22 Aug 2025 13:11:54 +0700
Subject: [PATCH 128/302] Revert "[ios] Fixing ATM translation on place page"

This reverts commit 211e3fb4f006dab706af2e1b76e957810ba57fd9.
---
 .../UI/PlacePage/Components/PlacePageInfoViewController.swift   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/iphone/Maps/UI/PlacePage/Components/PlacePageInfoViewController.swift b/iphone/Maps/UI/PlacePage/Components/PlacePageInfoViewController.swift
index 4f2affab6..b04e0938b 100644
--- a/iphone/Maps/UI/PlacePage/Components/PlacePageInfoViewController.swift
+++ b/iphone/Maps/UI/PlacePage/Components/PlacePageInfoViewController.swift
@@ -313,7 +313,7 @@ class PlacePageInfoViewController: UIViewController {
     }
 
     if let atm = placePageInfoData.atm {
-      atmView = createInfoItem(NSLocalizedString(atm, tableName: "LocalizableTypes", bundle: Bundle.main, comment: String()), icon: UIImage(named: "ic_placepage_atm"))
+      atmView = createInfoItem(atm, icon: UIImage(named: "ic_placepage_atm"))
     }
 
     if let level = placePageInfoData.level {

From 3aa74bc4274c6e3131084bdd86303c3aa9cf3ba6 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Thu, 31 Jul 2025 21:50:27 +0200
Subject: [PATCH 129/302] [ios] Fixed ATM translation in the PlacePage

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 .../CoreApi/CoreApi/PlacePageData/Common/PlacePageInfoData.mm   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageInfoData.mm b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageInfoData.mm
index 2e7f2d863..12d0c9025 100644
--- a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageInfoData.mm
+++ b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageInfoData.mm
@@ -100,7 +100,7 @@ NSString * GetLocalizedMetadataValueString(MapObject::MetadataID metaID, std::st
       }
     });
 
-    _atm = rawData.HasAtm() ? NSLocalizedString(@"type.amenity.atm", nil) : nil;
+    _atm = rawData.HasAtm() ? NSLocalizedStringFromTable(@"type.amenity.atm", @"LocalizableTypes", nil) : nil;
 
     _address = rawData.GetSecondarySubtitle().empty() ? nil : @(rawData.GetSecondarySubtitle().c_str());
     _coordFormats = @[@(rawData.GetFormattedCoordinate(place_page::CoordinatesFormat::LatLonDMS).c_str()),

From 7765d97cda3bde439cb48ae4a9b91624a0869ef9 Mon Sep 17 00:00:00 2001
From: Kiryl Kaveryn <kirylkaveryn@gmail.com>
Date: Mon, 4 Aug 2025 12:46:13 +0400
Subject: [PATCH 130/302] [ios] Fix track recording indicator image

Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
---
 .../Contents.json                                |   2 +-
 .../ic_menu_bookmark_track_recordign.png         | Bin 5981 -> 0 bytes
 .../ic_menu_track_recording.svg                  |   3 +++
 3 files changed, 4 insertions(+), 1 deletion(-)
 delete mode 100644 iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_bookmark_track_recording.imageset/ic_menu_bookmark_track_recordign.png
 create mode 100644 iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_bookmark_track_recording.imageset/ic_menu_track_recording.svg

diff --git a/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_bookmark_track_recording.imageset/Contents.json b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_bookmark_track_recording.imageset/Contents.json
index 077543442..198908852 100644
--- a/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_bookmark_track_recording.imageset/Contents.json	
+++ b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_bookmark_track_recording.imageset/Contents.json	
@@ -1,7 +1,7 @@
 {
   "images" : [
     {
-      "filename" : "ic_menu_bookmark_track_recordign.png",
+      "filename" : "ic_menu_track_recording.svg",
       "idiom" : "universal"
     }
   ],
diff --git a/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_bookmark_track_recording.imageset/ic_menu_bookmark_track_recordign.png b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_bookmark_track_recording.imageset/ic_menu_bookmark_track_recordign.png
deleted file mode 100644
index d54144fd076d6ab7bc5d140f2c3d537c219eb85a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5981
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
U1}`|Lnf;}F*VxJkYY30~KUm8jMF0Q*

diff --git a/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_bookmark_track_recording.imageset/ic_menu_track_recording.svg b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_bookmark_track_recording.imageset/ic_menu_track_recording.svg
new file mode 100644
index 000000000..254dd8d4a
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Bottom Menu/ic_menu_bookmark_track_recording.imageset/ic_menu_track_recording.svg	
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 16.25C13.1758 16.25 14.1781 15.8356 15.0069 15.0069C15.8356 14.1781 16.25 13.1758 16.25 12C16.25 10.8242 15.8356 9.82188 15.0069 8.99313C14.1781 8.16438 13.1758 7.75 12 7.75C10.8242 7.75 9.82188 8.16438 8.99312 8.99313C8.16437 9.82188 7.75 10.8242 7.75 12C7.75 13.1758 8.16437 14.1781 8.99312 15.0069C9.82188 15.8356 10.8242 16.25 12 16.25ZM12 20.5C10.8242 20.5 9.71917 20.2769 8.685 19.8306C7.65083 19.3844 6.75125 18.7788 5.98625 18.0138C5.22125 17.2488 4.61563 16.3492 4.16938 15.315C3.72313 14.2808 3.5 13.1758 3.5 12C3.5 10.8242 3.72313 9.71917 4.16938 8.685C4.61563 7.65083 5.22125 6.75125 5.98625 5.98625C6.75125 5.22125 7.65083 4.61563 8.685 4.16938C9.71917 3.72313 10.8242 3.5 12 3.5C13.1758 3.5 14.2808 3.72313 15.315 4.16938C16.3492 4.61563 17.2488 5.22125 18.0138 5.98625C18.7788 6.75125 19.3844 7.65083 19.8306 8.685C20.2769 9.71917 20.5 10.8242 20.5 12C20.5 13.1758 20.2769 14.2808 19.8306 15.315C19.3844 16.3492 18.7788 17.2488 18.0138 18.0138C17.2488 18.7788 16.3492 19.3844 15.315 19.8306C14.2808 20.2769 13.1758 20.5 12 20.5ZM12 18.8C13.8983 18.8 15.5063 18.1413 16.8238 16.8238C18.1413 15.5063 18.8 13.8983 18.8 12C18.8 10.1017 18.1413 8.49375 16.8238 7.17625C15.5063 5.85875 13.8983 5.2 12 5.2C10.1017 5.2 8.49375 5.85875 7.17625 7.17625C5.85875 8.49375 5.2 10.1017 5.2 12C5.2 13.8983 5.85875 15.5063 7.17625 16.8238C8.49375 18.1413 10.1017 18.8 12 18.8Z" fill="#0000FF"/>
+</svg>

From aac80606f2765d771bf54c0c0f544c6d29df6f0e Mon Sep 17 00:00:00 2001
From: Kiryl Kaveryn <kirylkaveryn@gmail.com>
Date: Wed, 30 Jul 2025 14:25:49 +0400
Subject: [PATCH 131/302] [ios] Disable user interaction on PP vc close

Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
---
 iphone/Maps/UI/PlacePage/PlacePageViewController.swift | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/iphone/Maps/UI/PlacePage/PlacePageViewController.swift b/iphone/Maps/UI/PlacePage/PlacePageViewController.swift
index ec2e2eab5..e1ed42eca 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageViewController.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePageViewController.swift
@@ -332,6 +332,7 @@ extension PlacePageViewController: PlacePageViewProtocol {
 
   @objc
   func closeAnimated(completion: (() -> Void)? = nil) {
+    view.isUserInteractionEnabled = false
     alternativeSizeClass(iPhone: {
       self.scrollTo(CGPoint(x: 0, y: -self.scrollView.height + 1),
                     forced: true) {
@@ -361,7 +362,7 @@ extension PlacePageViewController: PlacePageViewProtocol {
 extension PlacePageViewController: UIScrollViewDelegate {
   func scrollViewDidScroll(_ scrollView: UIScrollView) {
     if scrollView.contentOffset.y < -scrollView.height + 1 && beginDragging {
-      rootViewController.dismissPlacePage()
+      closeAnimated()
     }
     onOffsetChanged(scrollView.contentOffset.y)
 

From ef2dea20feface350bc8663937f789b20ff8b907 Mon Sep 17 00:00:00 2001
From: Kiryl Kaveryn <kirylkaveryn@gmail.com>
Date: Wed, 30 Jul 2025 18:34:43 +0400
Subject: [PATCH 132/302] [ios] Log error during the track editing instead of
 failing

The bug is quite rare and happens when the user taps on the edit (pencil) button on the PlacePage. It seems like the tap happens during the PP data object reloading the and the object type has changed. It is better to avoid failing in such cases because we cannot prevent user interaction during the pp reloading.

Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
---
 .../UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm b/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm
index a07cbffe2..484c99e9f 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm
+++ b/iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm
@@ -225,9 +225,11 @@ using namespace storage;
   [[MapViewController sharedController].navigationController pushViewController:editBookmarkController animated:YES];
 }
 
-- (void)editTrack:(PlacePageData *)data {
-  if (data.objectType != PlacePageObjectTypeTrack) {
-    ASSERT_FAIL("editTrack called for non-track object");
+- (void)editTrack:(PlacePageData *)data
+{
+  if (data.objectType != PlacePageObjectTypeTrack)
+  {
+    LOG(LERROR, ("editTrack called for non-track object"));
     return;
   }
   EditTrackViewController * editTrackController = [[EditTrackViewController alloc] initWithTrackId:data.trackData.trackId editCompletion:^(BOOL edited) {

From 38406b149a2039110c8fe510563a3beab031f68a Mon Sep 17 00:00:00 2001
From: Kiryl Kaveryn <kirylkaveryn@gmail.com>
Date: Tue, 29 Jul 2025 20:52:38 +0400
Subject: [PATCH 133/302] [ios] Skip zoom/pinch gesture when the lower/upper is
 out of bounds

The previous check `if upper - lower < chartData.labels.count / 10 return` produces invalid state for drawing and fails when the upper == lower.

Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
---
 iphone/Chart/Chart/Views/ChartView.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/iphone/Chart/Chart/Views/ChartView.swift b/iphone/Chart/Chart/Views/ChartView.swift
index 19ee63daf..8c3e0ec5e 100644
--- a/iphone/Chart/Chart/Views/ChartView.swift
+++ b/iphone/Chart/Chart/Views/ChartView.swift
@@ -244,10 +244,10 @@ public class ChartView: UIView {
     let lower = max(pinchStartLower + dx, 0)
     let upper = min(pinchStartUpper - dx, chartData.labels.count - 1)
 
-    if upper - lower < chartData.labels.count / 10 {
+    guard upper - lower > max(1, chartData.labels.count / 10) else {
       return
     }
-    
+
     chartPreviewView.setX(min: lower, max: upper)
     xAxisView.setBounds(lower: lower, upper: upper)
     updateCharts(animationStyle: .none)

From 55b85183d53a6a83e53017c24806dfb63a308156 Mon Sep 17 00:00:00 2001
From: Kiryl Kaveryn <kirylkaveryn@gmail.com>
Date: Wed, 6 Aug 2025 16:21:50 +0400
Subject: [PATCH 134/302] [map] Limit the track recording length to 2 points
 min

Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
---
 libs/map/gps_track_collection.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/map/gps_track_collection.cpp b/libs/map/gps_track_collection.cpp
index 0716e6673..b3a1efca6 100644
--- a/libs/map/gps_track_collection.cpp
+++ b/libs/map/gps_track_collection.cpp
@@ -109,5 +109,5 @@ ElevationInfo const & GpsTrackCollection::UpdateAndGetElevationInfo()
 
 bool GpsTrackCollection::IsEmpty() const
 {
-  return m_items.empty();
+  return m_items.size() < 2;
 }

From b5e0d10cb1c741a53cf64b45f0c316b88b6c6ada Mon Sep 17 00:00:00 2001
From: Kiryl Kaveryn <kirylkaveryn@gmail.com>
Date: Wed, 6 Aug 2025 16:25:59 +0400
Subject: [PATCH 135/302] [ios] Set track recrording elevation chart min points
 to draw to 2

Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
---
 .../Components/ElevationProfile/ElevationProfilePresenter.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfilePresenter.swift b/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfilePresenter.swift
index c95b98e3b..7def902a9 100644
--- a/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfilePresenter.swift
+++ b/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfilePresenter.swift
@@ -84,7 +84,7 @@ extension ElevationProfilePresenter: ElevationProfilePresenterProtocol {
   func configure() {
     view?.isChartViewHidden = false
 
-    let kMinPointsToDraw = 3
+    let kMinPointsToDraw = 2
     guard let profileData = trackData.elevationProfileData,
           let chartData,
           chartData.points.count >= kMinPointsToDraw else {

From 59499333ffc9c401729fabbc044e83f7b029e19f Mon Sep 17 00:00:00 2001
From: Kiryl Kaveryn <kirylkaveryn@gmail.com>
Date: Wed, 6 Aug 2025 16:28:24 +0400
Subject: [PATCH 136/302] [ios] Disable chartView user interaction for TR and
 when the chartData is nil

Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
---
 iphone/Chart/Chart/Views/ChartView.swift                        | 2 ++
 .../Components/ElevationProfile/ElevationProfilePresenter.swift | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/iphone/Chart/Chart/Views/ChartView.swift b/iphone/Chart/Chart/Views/ChartView.swift
index 8c3e0ec5e..682b62124 100644
--- a/iphone/Chart/Chart/Views/ChartView.swift
+++ b/iphone/Chart/Chart/Views/ChartView.swift
@@ -142,6 +142,8 @@ public class ChartView: UIView {
   }
 
   private func setup() {
+    isUserInteractionEnabled = false
+
     xAxisView.font = font
     xAxisView.textColor = textColor
     yAxisView.font = font
diff --git a/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfilePresenter.swift b/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfilePresenter.swift
index 7def902a9..654805b03 100644
--- a/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfilePresenter.swift
+++ b/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfilePresenter.swift
@@ -94,13 +94,13 @@ extension ElevationProfilePresenter: ElevationProfilePresenterProtocol {
 
     view?.setChartData(ChartPresentationData(chartData, formatter: formatter))
     view?.reloadDescription()
-    view?.userInteractionEnabled = true
 
     guard !profileData.isTrackRecording else {
       view?.isChartViewInfoHidden = true
       return
     }
 
+    view?.userInteractionEnabled = true
     view?.setActivePointDistance(trackData.activePointDistance)
     view?.setMyPositionDistance(trackData.myPositionDistance)
   }

From c4d5109d5ba41105f7d1c40af213731ee7a1cea2 Mon Sep 17 00:00:00 2001
From: Kiryl Kaveryn <kirylkaveryn@gmail.com>
Date: Wed, 13 Aug 2025 13:48:45 +0400
Subject: [PATCH 137/302] [ios] Log the error when the exclude from icloud
 fails

Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
---
 libs/platform/platform_ios.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libs/platform/platform_ios.mm b/libs/platform/platform_ios.mm
index 191f1f373..d7178727d 100644
--- a/libs/platform/platform_ios.mm
+++ b/libs/platform/platform_ios.mm
@@ -83,7 +83,7 @@ void Platform::DisableBackupForFile(std::string const & filePath)
   BOOL valueRaw = YES;
   CFNumberRef value = CFNumberCreate(kCFAllocatorDefault, kCFNumberCharType, &valueRaw);
   if (!CFURLSetResourcePropertyForKey(url, kCFURLIsExcludedFromBackupKey, value, &err))
-    NSLog(@"Error while disabling iCloud backup for file: %s", filePath.c_str());
+    LOG(LERROR, ("Error:", err, "while disabling iCloud backup for file:", filePath.c_str()));
 
   CFRelease(value);
   CFRelease(url);

From 9d8e84ae5a8c49883fbfa13ce90b6153b06835f0 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Fri, 1 Aug 2025 12:41:51 +0200
Subject: [PATCH 138/302] [mac][ios] Was: Silenced annoying deprecation
 warnings

pastk: removed silencing, left only minor style etc changes

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 libs/drape/metal/metal_base_context.mm | 97 +++++++++++++-------------
 libs/shaders/metal_program_pool.mm     | 38 +++++-----
 2 files changed, 67 insertions(+), 68 deletions(-)

diff --git a/libs/drape/metal/metal_base_context.mm b/libs/drape/metal/metal_base_context.mm
index 25d4dee86..32bca956f 100644
--- a/libs/drape/metal/metal_base_context.mm
+++ b/libs/drape/metal/metal_base_context.mm
@@ -31,10 +31,10 @@ MetalBaseContext::MetalBaseContext(id<MTLDevice> device, m2::PointU const & scre
   m_renderPassDescriptor.stencilAttachment.loadAction = MTLLoadActionClear;
   m_renderPassDescriptor.stencilAttachment.storeAction = MTLStoreActionStore;
   m_renderPassDescriptor.stencilAttachment.clearStencil = 0;
-  
+
   RecreateDepthTexture(screenSize);
 }
-  
+
 void MetalBaseContext::RecreateDepthTexture(m2::PointU const & screenSize)
 {
   if (screenSize.x == 0 || screenSize.y == 0)
@@ -42,7 +42,7 @@ void MetalBaseContext::RecreateDepthTexture(m2::PointU const & screenSize)
     m_depthTexture.reset();
     return;
   }
-  
+
   m_depthTexture = make_unique_dp<MetalTexture>(nullptr /* allocator */);
   HWTexture::Params params;
   params.m_width = screenSize.x;
@@ -51,7 +51,7 @@ void MetalBaseContext::RecreateDepthTexture(m2::PointU const & screenSize)
   params.m_isRenderTarget = true;
   m_depthTexture->Create(make_ref(this), params, nullptr /* data */);
 }
-  
+
 void MetalBaseContext::Init(dp::ApiVersion apiVersion)
 {
   CHECK(apiVersion == dp::ApiVersion::Metal, ());
@@ -62,7 +62,7 @@ ApiVersion MetalBaseContext::GetApiVersion() const
 {
   return dp::ApiVersion::Metal;
 }
-  
+
 std::string MetalBaseContext::GetRendererName() const
 {
   return std::string([m_device.name UTF8String]);
@@ -107,7 +107,7 @@ std::string MetalBaseContext::GetRendererVersion() const
       return s1.first > s2.first;
     });
   }
-  
+
   for (auto featureSet : features)
   {
     if ([m_device supportsFeatureSet:featureSet.first])
@@ -115,26 +115,26 @@ std::string MetalBaseContext::GetRendererVersion() const
   }
   return "Unknown";
 }
-  
+
 void MetalBaseContext::PushDebugLabel(std::string const & label)
 {
   if (m_currentCommandEncoder == nil)
     return;
   [m_currentCommandEncoder pushDebugGroup:@(label.c_str())];
 }
-  
+
 void MetalBaseContext::PopDebugLabel()
 {
   if (m_currentCommandEncoder == nil)
     return;
   [m_currentCommandEncoder popDebugGroup];
 }
-  
+
 void MetalBaseContext::Resize(int w, int h)
 {
   if (m_depthTexture && m_depthTexture->GetWidth() == w && m_depthTexture->GetHeight() == h)
     return;
-  
+
   RecreateDepthTexture(m2::PointU(w, h));
 }
 
@@ -152,7 +152,7 @@ void MetalBaseContext::ApplyFramebuffer(std::string const & framebufferLabel)
     m_frameCommandBuffer = [m_commandQueue commandBuffer];
     m_frameCommandBuffer.label = @"Frame command buffer";
   }
-  
+
   if (!m_currentFramebuffer)
   {
     // Use default(system) framebuffer and depth-stencil.
@@ -164,11 +164,11 @@ void MetalBaseContext::ApplyFramebuffer(std::string const & framebufferLabel)
   else
   {
     ref_ptr<Framebuffer> framebuffer = m_currentFramebuffer;
-    
+
     ASSERT(dynamic_cast<MetalTexture *>(framebuffer->GetTexture()->GetHardwareTexture().get()) != nullptr, ());
     ref_ptr<MetalTexture> colorAttachment = framebuffer->GetTexture()->GetHardwareTexture();
     m_renderPassDescriptor.colorAttachments[0].texture = colorAttachment->GetTexture();
-    
+
     auto const depthStencilRef = framebuffer->GetDepthStencilRef();
     if (depthStencilRef != nullptr)
     {
@@ -186,12 +186,12 @@ void MetalBaseContext::ApplyFramebuffer(std::string const & framebufferLabel)
       m_renderPassDescriptor.stencilAttachment.texture = nil;
     }
   }
-  
+
   CHECK(m_currentCommandEncoder == nil, ("Current command encoder was not finished."));
   m_currentCommandEncoder = [m_frameCommandBuffer renderCommandEncoderWithDescriptor:m_renderPassDescriptor];
   m_currentCommandEncoder.label = @(framebufferLabel.c_str());
   [m_currentCommandEncoder pushDebugGroup:@(framebufferLabel.c_str())];
-  
+
   // Default rendering options.
   [m_currentCommandEncoder setFrontFacingWinding:MTLWindingClockwise];
   [m_currentCommandEncoder setCullMode:MTLCullModeBack];
@@ -204,7 +204,7 @@ void MetalBaseContext::SetClearColor(dp::Color const & color)
   m_renderPassDescriptor.colorAttachments[0].clearColor =
     MTLClearColorMake(color.GetRedF(), color.GetGreenF(), color.GetBlueF(), color.GetAlphaF());
 }
-  
+
 void MetalBaseContext::Clear(uint32_t clearBits, uint32_t storeBits)
 {
   if (m_currentCommandEncoder != nil)
@@ -215,7 +215,7 @@ void MetalBaseContext::Clear(uint32_t clearBits, uint32_t storeBits)
       m_cleaner.ClearColor(make_ref(this), m_currentCommandEncoder);
     else if (clearBits & ClearBits::DepthBit)
       m_cleaner.ClearDepth(make_ref(this), m_currentCommandEncoder);
-    
+
     if (clearBits & ClearBits::StencilBit)
       CHECK(false, ("Stencil clearing is not implemented"));
   }
@@ -227,42 +227,41 @@ void MetalBaseContext::Clear(uint32_t clearBits, uint32_t storeBits)
       m_renderPassDescriptor.colorAttachments[0].loadAction = MTLLoadActionClear;
     else
       m_renderPassDescriptor.colorAttachments[0].loadAction = (storeBits & ClearBits::ColorBit) ? MTLLoadActionLoad : MTLLoadActionDontCare;
-    
+
     if (clearBits & ClearBits::DepthBit)
       m_renderPassDescriptor.depthAttachment.loadAction = MTLLoadActionClear;
     else
       m_renderPassDescriptor.depthAttachment.loadAction = (storeBits & ClearBits::DepthBit) ? MTLLoadActionLoad : MTLLoadActionDontCare;
-    
+
     if (clearBits & ClearBits::StencilBit)
       m_renderPassDescriptor.stencilAttachment.loadAction = MTLLoadActionClear;
     else
       m_renderPassDescriptor.stencilAttachment.loadAction = (storeBits & ClearBits::StencilBit) ? MTLLoadActionLoad : MTLLoadActionDontCare;
-    
+
     // Apply storing mode.
     if (storeBits & ClearBits::ColorBit)
       m_renderPassDescriptor.colorAttachments[0].storeAction = MTLStoreActionStore;
     else
       m_renderPassDescriptor.colorAttachments[0].storeAction = MTLStoreActionDontCare;
-    
+
     if (storeBits & ClearBits::DepthBit)
       m_renderPassDescriptor.depthAttachment.storeAction = MTLStoreActionStore;
     else
       m_renderPassDescriptor.depthAttachment.storeAction = MTLStoreActionDontCare;
-    
+
     if (storeBits & ClearBits::StencilBit)
       m_renderPassDescriptor.stencilAttachment.storeAction = MTLStoreActionStore;
     else
       m_renderPassDescriptor.stencilAttachment.storeAction = MTLStoreActionDontCare;
   }
 }
-  
+
 void MetalBaseContext::SetViewport(uint32_t x, uint32_t y, uint32_t w, uint32_t h)
 {
   id<MTLRenderCommandEncoder> encoder = GetCommandEncoder();
-  [encoder setViewport:(MTLViewport){ static_cast<double>(x), static_cast<double>(y),
-                                      static_cast<double>(w), static_cast<double>(h),
-                                      0.0, 1.0 }];
-  [encoder setScissorRect:(MTLScissorRect){ x, y, w, h }];
+  [encoder setViewport:{static_cast<double>(x), static_cast<double>(y), static_cast<double>(w), static_cast<double>(h),
+                        0.0, 1.0}];
+  [encoder setScissorRect:{x, y, w, h}];
 }
 
 void MetalBaseContext::SetScissor(uint32_t x, uint32_t y, uint32_t w, uint32_t h)
@@ -277,7 +276,7 @@ void MetalBaseContext::SetScissor(uint32_t x, uint32_t y, uint32_t w, uint32_t h
     if (x + w > rpWidth) w = rpWidth - x;
     if (y + h > rpHeight) h = rpHeight - y;
 
-    [encoder setScissorRect:(MTLScissorRect){ x, y, w, h }];
+    [encoder setScissorRect:{x, y, w, h}];
   }
 }
 
@@ -314,12 +313,12 @@ void MetalBaseContext::SetCullingEnabled(bool enabled)
   id<MTLRenderCommandEncoder> encoder = GetCommandEncoder();
   [encoder setCullMode: (enabled ? MTLCullModeBack : MTLCullModeNone)];
 }
-  
+
 id<MTLDevice> MetalBaseContext::GetMetalDevice() const
 {
   return m_device;
 }
-  
+
 id<MTLRenderCommandEncoder> MetalBaseContext::GetCommandEncoder() const
 {
   CHECK(m_currentCommandEncoder != nil, ("Probably encoding commands were called before ApplyFramebuffer."));
@@ -331,41 +330,41 @@ id<MTLCommandBuffer> MetalBaseContext::GetCommandBuffer() const
   CHECK(m_frameCommandBuffer != nil, ("Probably encoding commands were called before ApplyFramebuffer."));
   return m_frameCommandBuffer;
 }
-  
+
 id<MTLDepthStencilState> MetalBaseContext::GetDepthStencilState()
 {
   return m_metalStates.GetDepthStencilState(m_device, m_currentDepthStencilKey);
 }
-  
+
 id<MTLRenderPipelineState> MetalBaseContext::GetPipelineState(ref_ptr<GpuProgram> program, bool blendingEnabled)
 {
   CHECK(m_currentCommandEncoder != nil, ("Probably encoding commands were called before ApplyFramebuffer."));
-  
+
   id<MTLTexture> colorTexture = m_renderPassDescriptor.colorAttachments[0].texture;
   // It can be nil in the case when Metal drawable is absent (e.g. finish rendering in background).
   if (colorTexture == nil)
     return nil;
-  
+
   id<MTLTexture> depthTexture = m_renderPassDescriptor.depthAttachment.texture;
   MTLPixelFormat depthStencilFormat = (depthTexture != nil) ? depthTexture.pixelFormat : MTLPixelFormatInvalid;
-  
+
   MetalStates::PipelineKey const key(program, colorTexture.pixelFormat, depthStencilFormat, blendingEnabled);
   return m_metalStates.GetPipelineState(m_device, key);
 }
-  
+
 id<MTLSamplerState> MetalBaseContext::GetSamplerState(TextureFilter filter, TextureWrapping wrapSMode,
                                                       TextureWrapping wrapTMode)
 {
   MetalStates::SamplerKey const key(filter, wrapSMode, wrapTMode);
   return m_metalStates.GetSamplerState(m_device, key);
 }
-  
+
 bool MetalBaseContext::BeginRendering()
 {
   CHECK(m_currentCommandEncoder == nil, ("Current command encoder was not finished."));
   return true;
 }
-  
+
 void MetalBaseContext::EndRendering()
 {
   FinishCurrentEncoding();
@@ -376,27 +375,27 @@ void MetalBaseContext::Present()
   RequestFrameDrawable();
   if (m_frameDrawable)
     [m_frameCommandBuffer presentDrawable:m_frameDrawable];
-  
+
   [m_frameCommandBuffer commit];
   m_frameDrawable = nil;
   [m_frameCommandBuffer waitUntilCompleted];
   m_frameCommandBuffer = nil;
 }
-  
+
 void MetalBaseContext::RequestFrameDrawable()
 {
   if (m_frameDrawable != nil)
     return;
-  
+
   CHECK(m_drawableRequest != nullptr, ());
   m_frameDrawable = m_drawableRequest();
 }
-  
+
 void MetalBaseContext::ResetFrameDrawable()
 {
   if (m_frameDrawable == nil)
     return;
-  
+
   m_frameDrawable = nil;
   RequestFrameDrawable();
 }
@@ -408,7 +407,7 @@ void MetalBaseContext::FinishCurrentEncoding()
   m_currentCommandEncoder = nil;
   m_lastPipelineState = nil;
 }
-  
+
 void MetalBaseContext::SetSystemPrograms(drape_ptr<GpuProgram> && programClearColor,
                                          drape_ptr<GpuProgram> && programClearDepth,
                                          drape_ptr<GpuProgram> && programClearColorAndDepth)
@@ -416,24 +415,24 @@ void MetalBaseContext::SetSystemPrograms(drape_ptr<GpuProgram> && programClearCo
   m_cleaner.Init(make_ref(this), std::move(programClearColor), std::move(programClearDepth),
                  std::move(programClearColorAndDepth));
 }
-  
+
 void MetalBaseContext::ApplyPipelineState(id<MTLRenderPipelineState> state)
 {
   m_lastPipelineState = state;
   if (state != nil)
     [GetCommandEncoder() setRenderPipelineState:state];
 }
-  
+
 bool MetalBaseContext::HasAppliedPipelineState() const
 {
   return m_lastPipelineState != nil;
 }
-  
+
 void MetalBaseContext::ResetPipelineStatesCache()
 {
   m_metalStates.ResetPipelineStatesCache();
 }
-  
+
 void MetalBaseContext::DebugSynchronizeWithCPU()
 {
   FinishCurrentEncoding();
@@ -444,7 +443,7 @@ void MetalBaseContext::DebugSynchronizeWithCPU()
   m_frameCommandBuffer = nil;
 }
 
-MTLRenderPassDescriptor * MetalBaseContext::GetRenderPassDescriptor() const 
+MTLRenderPassDescriptor * MetalBaseContext::GetRenderPassDescriptor() const
 {
   return m_renderPassDescriptor;
 }
diff --git a/libs/shaders/metal_program_pool.mm b/libs/shaders/metal_program_pool.mm
index 9926082ba..3803d93cd 100644
--- a/libs/shaders/metal_program_pool.mm
+++ b/libs/shaders/metal_program_pool.mm
@@ -21,7 +21,7 @@ struct ProgramInfo
   std::string const m_vertexShaderName;
   std::string const m_fragmentShaderName;
   Layout m_layout;
-  
+
   // Layout is in the format { buffer0, buffer1, ..., bufferN }.
   // bufferX is a pair { start attribute index, end attribute index }.
   ProgramInfo(std::string && vertexShaderName, std::string && fragmentShaderName,
@@ -39,7 +39,7 @@ struct ProgramInfo
     }
   }
 };
-  
+
 std::array<ProgramInfo, static_cast<size_t>(SystemProgram::SystemProgramsCount)> const kMetalSystemProgramsInfo = {{
   ProgramInfo("vsCleaner", "fsClearColor", {{0, 0}}),  // ClearColor
   ProgramInfo("vsCleaner", "fsClearDepth", {{0, 0}}),  // ClearDepth
@@ -117,7 +117,7 @@ MTLVertexFormat GetFormatByDataType(MTLDataType dataType)
   }
   return MTLVertexFormatInvalid;
 }
-  
+
 uint32_t GetSizeByDataType(MTLDataType dataType)
 {
   switch (dataType)
@@ -130,7 +130,7 @@ uint32_t GetSizeByDataType(MTLDataType dataType)
   }
   return 0;
 }
-  
+
 void GetBindings(NSArray<MTLArgument *> * arguments, int8_t & uniformsBindingIndex,
                  dp::metal::MetalGpuProgram::TexturesBindingInfo & textureBindingInfo)
 {
@@ -138,7 +138,7 @@ void GetBindings(NSArray<MTLArgument *> * arguments, int8_t & uniformsBindingInd
   NSString * kUniformsName = @"uniforms";
   // Sampler name must be constructed as concatenation of texture name and kSamplerSuffix.
   static std::string const kSamplerSuffix = "Sampler";
-  
+
   uniformsBindingIndex = dp::metal::MetalGpuProgram::kInvalidBindingIndex;
 
   for (MTLArgument * arg in arguments)
@@ -163,7 +163,7 @@ void GetBindings(NSArray<MTLArgument *> * arguments, int8_t & uniformsBindingInd
     }
   }
 }
-  
+
 MTLVertexDescriptor * GetVertexDescriptor(id<MTLFunction> vertexShader, ProgramInfo::Layout const & layout)
 {
   MTLVertexDescriptor * vertexDesc = [[MTLVertexDescriptor alloc] init];
@@ -189,10 +189,10 @@ MTLVertexDescriptor * GetVertexDescriptor(id<MTLFunction> vertexShader, ProgramI
     sizes[bufferIndex] += sz;
     attrDesc.bufferIndex = bufferIndex;
   }
-  
+
   for (auto const & s : sizes)
     vertexDesc.layouts[s.first].stride = s.second;
-  
+
   return vertexDesc;
 }
 }  // namespace
@@ -204,19 +204,19 @@ std::string DebugPrint(SystemProgram p)
   case SystemProgram::ClearColor: return "ClearColor";
   case SystemProgram::ClearDepth: return "ClearDepth";
   case SystemProgram::ClearColorAndDepth: return "ClearColorAndDepth";
-    
+
   case SystemProgram::SystemProgramsCount:
     CHECK(false, ("Try to output SystemProgramsCount"));
   }
   CHECK(false, ("Unknown program"));
   return {};
 }
-  
+
 MetalProgramPool::MetalProgramPool(id<MTLDevice> device)
   : m_device(device)
 {
   ProgramParams::Init();
-  
+
   NSString * libPath = [[NSBundle mainBundle] pathForResource:@"shaders_metal" ofType:@"metallib"];
   NSError * error = nil;
   m_library = [m_device newLibraryWithFile:libPath error:&error];
@@ -238,13 +238,13 @@ drape_ptr<dp::GpuProgram> MetalProgramPool::GetSystemProgram(SystemProgram progr
   auto const & info = kMetalSystemProgramsInfo[static_cast<size_t>(program)];
   return Get(DebugPrint(program), info.m_vertexShaderName, info.m_fragmentShaderName, info.m_layout);
 }
-  
+
 drape_ptr<dp::GpuProgram> MetalProgramPool::Get(Program program)
 {
   auto const & info = kMetalProgramsInfo[static_cast<size_t>(program)];
   return Get(DebugPrint(program), info.m_vertexShaderName, info.m_fragmentShaderName, info.m_layout);
 }
-  
+
 drape_ptr<dp::GpuProgram> MetalProgramPool::Get(std::string const & programName,
                                                 std::string const & vertexShaderName,
                                                 std::string const & fragmentShaderName,
@@ -252,7 +252,7 @@ drape_ptr<dp::GpuProgram> MetalProgramPool::Get(std::string const & programName,
 {
   CHECK(!vertexShaderName.empty(), ());
   CHECK(!fragmentShaderName.empty(), ());
-  
+
   id<MTLFunction> vertexShader = GetFunction(vertexShaderName);
   id<MTLFunction> fragmentShader = GetFunction(fragmentShaderName);
   MTLVertexDescriptor * vertexDesc = GetVertexDescriptor(vertexShader, layout);
@@ -264,7 +264,7 @@ drape_ptr<dp::GpuProgram> MetalProgramPool::Get(std::string const & programName,
   desc.vertexDescriptor = vertexDesc;
   desc.vertexFunction = vertexShader;
   desc.fragmentFunction = fragmentShader;
-  
+
   NSError * error = nil;
   MTLRenderPipelineReflection * reflectionObj = nil;
   MTLPipelineOption option = MTLPipelineOptionBufferTypeInfo | MTLPipelineOptionArgumentInfo;
@@ -277,22 +277,22 @@ drape_ptr<dp::GpuProgram> MetalProgramPool::Get(std::string const & programName,
     NSLog(@"%@", error);
     CHECK(false, ("Failed to create reflection pipeline state."));
   }
-  
+
   int8_t vsUniformsBindingIndex = dp::metal::MetalGpuProgram::kInvalidBindingIndex;
   dp::metal::MetalGpuProgram::TexturesBindingInfo vsTextureBindingInfo;
   GetBindings(reflectionObj.vertexArguments, vsUniformsBindingIndex, vsTextureBindingInfo);
-  
+
   int8_t fsUniformsBindingIndex = dp::metal::MetalGpuProgram::kInvalidBindingIndex;
   dp::metal::MetalGpuProgram::TexturesBindingInfo fsTextureBindingInfo;
   GetBindings(reflectionObj.fragmentArguments, fsUniformsBindingIndex, fsTextureBindingInfo);
-  
+
   return make_unique_dp<dp::metal::MetalGpuProgram>(programName, vertexShader, fragmentShader,
                                                     vsUniformsBindingIndex, fsUniformsBindingIndex,
                                                     std::move(vsTextureBindingInfo),
                                                     std::move(fsTextureBindingInfo),
                                                     vertexDesc);
 }
-  
+
 id<MTLFunction> MetalProgramPool::GetFunction(std::string const & name)
 {
   auto const it = m_functions.find(name);

From 3b1551be523bc93d6b0b5ce32847d2e99942ebcf Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Fri, 1 Aug 2025 13:05:37 +0200
Subject: [PATCH 139/302] [ios] Fixed wrong ObjC function name that caused
 warnings

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.h  | 2 +-
 iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm | 5 +++--
 iphone/Maps/Classes/CarPlay/CarPlayService.swift       | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.h b/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.h
index d20ac8246..c3eae8154 100644
--- a/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.h
+++ b/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.h
@@ -40,7 +40,7 @@ NS_SWIFT_NAME(FrameworkHelper)
 + (MWMMarkGroupID)invalidCategoryId;
 + (void)zoomMap:(MWMZoomMode)mode;
 + (void)moveMap:(UIOffset)offset;
-+ (void)scrollMap:(double)distanceX :(double) distanceY;
++ (void)scrollMapToDistanceX:(double)x andY:(double)y;
 + (void)deactivateMapSelection;
 + (void)switchMyPositionMode;
 + (void)stopLocationFollow;
diff --git a/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm b/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm
index d31547f39..948d0e72f 100644
--- a/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm
+++ b/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm
@@ -114,8 +114,9 @@
   GetFramework().Move(offset.horizontal, offset.vertical, true);
 }
 
-+ (void)scrollMap:(double) distanceX :(double) distanceY {
-  GetFramework().Scroll(distanceX, distanceY);
++ (void)scrollMapToDistanceX:(double)x andY:(double)y
+{
+  GetFramework().Scroll(x, y);
 }
 
 + (void)deactivateMapSelection {
diff --git a/iphone/Maps/Classes/CarPlay/CarPlayService.swift b/iphone/Maps/Classes/CarPlay/CarPlayService.swift
index 20c33532d..86b471c31 100644
--- a/iphone/Maps/Classes/CarPlay/CarPlayService.swift
+++ b/iphone/Maps/Classes/CarPlay/CarPlayService.swift
@@ -423,7 +423,7 @@ extension CarPlayService: CPMapTemplateDelegate {
 
   func mapTemplate(_ mapTemplate: CPMapTemplate, didUpdatePanGestureWithTranslation translation: CGPoint, velocity: CGPoint) {
     let scaleFactor = self.carplayVC?.mapView?.contentScaleFactor ?? 1
-    FrameworkHelper.scrollMap(-scaleFactor * translation.x, -scaleFactor * translation.y);
+    FrameworkHelper.scrollMap(toDistanceX:-scaleFactor * translation.x, andY:-scaleFactor * translation.y);
   }
 
   func mapTemplate(_ mapTemplate: CPMapTemplate, startedTrip trip: CPTrip, using routeChoice: CPRouteChoice) {

From 8e9dbe02483c2566b45662e82edb041470b80363 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Fri, 1 Aug 2025 13:32:53 +0200
Subject: [PATCH 140/302] [ios] Removed unused variables

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 iphone/Maps/Core/iCloud/MetadataItem.swift         | 3 ++-
 iphone/Maps/UI/PlacePage/PlacePageInteractor.swift | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/iphone/Maps/Core/iCloud/MetadataItem.swift b/iphone/Maps/Core/iCloud/MetadataItem.swift
index 75e4c297d..59d76adea 100644
--- a/iphone/Maps/Core/iCloud/MetadataItem.swift
+++ b/iphone/Maps/Core/iCloud/MetadataItem.swift
@@ -68,7 +68,8 @@ extension CloudMetadataItem {
                                                          .ubiquitousItemDownloadingErrorKey,
                                                          .ubiquitousItemUploadingErrorKey])
     guard let downloadStatus = resources.ubiquitousItemDownloadingStatus,
-          let percentDownloaded = resources.ubiquitousItemDownloadingStatus,
+          // Not used.
+          // let percentDownloaded = resources.ubiquitousItemDownloadingStatus,
           let lastModificationDate = resources.contentModificationDate?.roundedTime,
           let hasUnresolvedConflicts = resources.ubiquitousItemHasUnresolvedConflicts else {
       LOG(.error, "Failed to initialize CloudMetadataItem from \(fileUrl) resources: \(resources.allValues)")
diff --git a/iphone/Maps/UI/PlacePage/PlacePageInteractor.swift b/iphone/Maps/UI/PlacePage/PlacePageInteractor.swift
index b55aca4ae..5d78380cf 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageInteractor.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePageInteractor.swift
@@ -215,7 +215,7 @@ extension PlacePageInteractor: PlacePageEditBookmarkOrTrackViewControllerDelegat
     case .bookmark(let bookmarkData):
       let bookmarkColor = BookmarkColor.bookmarkColor(from: color) ?? bookmarkData.color
       MWMPlacePageManagerHelper.updateBookmark(placePageData, color: bookmarkColor, category: category)
-    case .track(let trackData):
+    case .track:
       MWMPlacePageManagerHelper.updateTrack(placePageData, color: color, category: category)
     }
   }

From 31970c87c4f51bf8e38b6ca96d5e9412a28027de Mon Sep 17 00:00:00 2001
From: Kiryl Kaveryn <kirylkaveryn@gmail.com>
Date: Fri, 15 Aug 2025 10:57:03 +0400
Subject: [PATCH 141/302] [ios] Remove all activities on track recording start
 and stop

Closes https://github.com/organicmaps/organicmaps/issues/11045
1. Remove all activities on track recording start and stop
2. Store the latest activity id in the UD to retrieve on launch after the app termination
Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
---
 .../TrackRecordingActivityManager.swift       | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/iphone/Maps/Core/TrackRecorder/TrackRecordingActivityManager.swift b/iphone/Maps/Core/TrackRecorder/TrackRecordingActivityManager.swift
index d2ea6ed22..723c836dc 100644
--- a/iphone/Maps/Core/TrackRecorder/TrackRecordingActivityManager.swift
+++ b/iphone/Maps/Core/TrackRecorder/TrackRecordingActivityManager.swift
@@ -2,6 +2,8 @@ import ActivityKit
 
 #if canImport(ActivityKit)
 
+private let kCurrentTrackRecordingLiveActivityIDKey = "kCurrentTrackRecordingLiveActivityIDKey"
+
 protocol TrackRecordingActivityManager {
   func start(with info: TrackInfo) throws
   func update(_ info: TrackInfo)
@@ -22,25 +24,39 @@ final class TrackRecordingLiveActivityManager {
 
 @available(iOS 16.2, *)
 extension TrackRecordingLiveActivityManager: TrackRecordingActivityManager {
+
   func start(with info: TrackInfo) throws {
-    guard activity == nil else { return }
+    stop()
     let state = TrackRecordingLiveActivityAttributes.ContentState(trackInfo: info)
     let content = ActivityContent<TrackRecordingLiveActivityAttributes.ContentState>(state: state, staleDate: nil)
     let attributes = TrackRecordingLiveActivityAttributes()
-    activity = try LiveActivityManager.startActivity(attributes, content: content)
+    let activity = try LiveActivityManager.startActivity(attributes, content: content)
+    self.activity = activity
+    UserDefaults.standard.set(activity.id, forKey: kCurrentTrackRecordingLiveActivityIDKey)
   }
 
   func update(_ info: TrackInfo) {
-    guard let activity else { return }
+    guard let activity = activity ?? fetchCurrentActivity() else {
+      LOG(.warning, "No active TrackRecordingLiveActivity found to update.")
+      return
+    }
     let state = TrackRecordingLiveActivityAttributes.ContentState(trackInfo: info)
     let content = ActivityContent<TrackRecordingLiveActivityAttributes.ContentState>(state: state, staleDate: nil)
+    self.activity = activity
     LiveActivityManager.update(activity, content: content)
   }
 
   func stop() {
-    guard let activity else { return }
-    LiveActivityManager.stop(activity)
-    self.activity = nil
+    let activities = Activity<TrackRecordingLiveActivityAttributes>.activities
+    activities.forEach(LiveActivityManager.stop)
+    activity = nil
+    UserDefaults.standard.removeObject(forKey: kCurrentTrackRecordingLiveActivityIDKey)
+  }
+
+  private func fetchCurrentActivity() -> Activity<TrackRecordingLiveActivityAttributes>? {
+    guard let id = UserDefaults.standard.string(forKey: kCurrentTrackRecordingLiveActivityIDKey) else { return nil }
+    let activities = Activity<TrackRecordingLiveActivityAttributes>.activities
+    return activities.first(where: { $0.id == id })
   }
 }
 

From d94351a8f16abde2596a6c5d364c797de79f1ba2 Mon Sep 17 00:00:00 2001
From: Kiryl Kaveryn <kirylkaveryn@gmail.com>
Date: Mon, 18 Aug 2025 13:07:15 +0400
Subject: [PATCH 142/302] [ios] Skip excessive elevation point updates

When the user drags the elevation chart it runs chart's `selected point` update mechanism by calling the `onSelectedPointChanged` inside the `ChartView`'s ` func chartPreviewView(_ view: ChartPreviewView, didChangeMinX minX: Int, maxX: Int)`. This updates may be quite often (tens/hundreds per sec) and may cause the `on point update` callback **recursion** and overloads the `layoutSubviews` method on the _short track_ because the ChartView doesnt have mechanism to skip excessive updates when the parameters the same.
This situation produces fail with internal error `(null) in -[NSISEngine _flushPendingRemovals] ().`

The fix include:
1. skip updates when the current point isn't changed
2. remove layoutSubviews overloading (this method should recalc the layout immediately and should not be called too frequent, the `setNeedsLayout` allows to batch the layout updates and redraw the view on the next runtime cycle)

Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
---
 iphone/Chart/Chart/Views/ChartInfo/ChartPointInfoView.swift | 2 +-
 iphone/Chart/Chart/Views/ChartView.swift                    | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/iphone/Chart/Chart/Views/ChartInfo/ChartPointInfoView.swift b/iphone/Chart/Chart/Views/ChartInfo/ChartPointInfoView.swift
index 87a2f4dc8..feda061a1 100644
--- a/iphone/Chart/Chart/Views/ChartInfo/ChartPointInfoView.swift
+++ b/iphone/Chart/Chart/Views/ChartInfo/ChartPointInfoView.swift
@@ -94,7 +94,7 @@ final class ChartPointInfoView: UIView {
   func update(x: CGFloat, label: String, points: [ChartLineInfo]) {
     distanceLabel.text = label
     altitudeLabel.text = altitudeText(points[0])
-    layoutIfNeeded()
+    setNeedsLayout()
   }
 
   private func altitudeText(_ point: ChartLineInfo) -> String {
diff --git a/iphone/Chart/Chart/Views/ChartView.swift b/iphone/Chart/Chart/Views/ChartView.swift
index 682b62124..90678cde7 100644
--- a/iphone/Chart/Chart/Views/ChartView.swift
+++ b/iphone/Chart/Chart/Views/ChartView.swift
@@ -16,6 +16,7 @@ public class ChartView: UIView {
   var showPreview: Bool = false // Set true to show the preview
 
   private var tapGR: UITapGestureRecognizer!
+  private var selectedPointDistance: Double = 0
   private var panStartPoint = 0
   private var panGR: UIPanGestureRecognizer!
   private var pinchStartLower = 0
@@ -170,6 +171,8 @@ public class ChartView: UIView {
   }
 
   public func setSelectedPoint(_ x: Double) {
+    guard selectedPointDistance != x else { return }
+    selectedPointDistance = x
     let routeLength = chartData.xAxisValueAt(CGFloat(chartData.pointsCount - 1))
     let upper = chartData.xAxisValueAt(CGFloat(chartPreviewView.maxX))
     var lower = chartData.xAxisValueAt(CGFloat(chartPreviewView.minX))

From 266d62831fbbc2a2fd1f18747f9b5390f16a493c Mon Sep 17 00:00:00 2001
From: Kiryl Kaveryn <kirylkaveryn@gmail.com>
Date: Tue, 19 Aug 2025 14:16:11 +0400
Subject: [PATCH 143/302] [ios] Skip elevation info current point updates when
 the data is nil

Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
---
 .../ElevationProfile/ElevationProfilePresenter.swift         | 4 ++--
 .../ElevationProfile/ElevationProfileViewController.swift    | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfilePresenter.swift b/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfilePresenter.swift
index 654805b03..f705307c8 100644
--- a/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfilePresenter.swift
+++ b/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfilePresenter.swift
@@ -72,12 +72,12 @@ extension ElevationProfilePresenter: ElevationProfilePresenterProtocol {
   }
 
   func updateActivePointDistance(_ distance: Double) {
-    guard let view, !view.isChartViewInfoHidden else { return }
+    guard let view, view.canReceiveUpdates else { return }
     view.setActivePointDistance(distance)
   }
 
   func updateMyPositionDistance(_ distance: Double) {
-    guard let view, !view.isChartViewInfoHidden else { return }
+    guard let view, view.canReceiveUpdates else { return }
     view.setMyPositionDistance(distance)
   }
 
diff --git a/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfileViewController.swift b/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfileViewController.swift
index 062a8436f..49a268941 100644
--- a/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfileViewController.swift
+++ b/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfileViewController.swift
@@ -6,6 +6,7 @@ protocol ElevationProfileViewProtocol: AnyObject {
   var userInteractionEnabled: Bool { get set }
   var isChartViewHidden: Bool { get set }
   var isChartViewInfoHidden: Bool { get set }
+  var canReceiveUpdates: Bool { get }
 
   func setChartData(_ data: ChartPresentationData)
   func setActivePointDistance(_ distance: Double)
@@ -139,6 +140,10 @@ extension ElevationProfileViewController: ElevationProfileViewProtocol {
     set { chartView.isChartViewInfoHidden = newValue }
   }
 
+  var canReceiveUpdates: Bool {
+    chartView.chartData != nil
+  }
+
   func setChartData(_ data: ChartPresentationData) {
     chartView.chartData = data
   }

From e0c579634bc76be0abdbc48ec0f0893c59df6c8f Mon Sep 17 00:00:00 2001
From: Kiryl Kaveryn <kirylkaveryn@gmail.com>
Date: Tue, 19 Aug 2025 14:37:08 +0400
Subject: [PATCH 144/302] [ios] Fix track recording points updates
 subscribe/unsubscribe

Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
---
 iphone/Maps/UI/PlacePage/PlacePageInteractor.swift   | 12 ++++++++----
 .../Maps/UI/PlacePage/PlacePageViewController.swift  |  5 +++++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/iphone/Maps/UI/PlacePage/PlacePageInteractor.swift b/iphone/Maps/UI/PlacePage/PlacePageInteractor.swift
index 5d78380cf..a0f056fd4 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageInteractor.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePageInteractor.swift
@@ -1,5 +1,6 @@
 protocol PlacePageInteractorProtocol: AnyObject {
   func viewWillAppear()
+  func viewWillDisappear()
   func updateTopBound(_ bound: CGFloat, duration: TimeInterval)
 }
 
@@ -19,12 +20,11 @@ class PlacePageInteractor: NSObject {
     self.mapViewController = mapViewController
     super.init()
     addToBookmarksManagerObserverList()
-    subscribeOnTrackActivePointUpdates()
+    subscribeOnTrackActivePointUpdatesIfNeeded()
   }
 
   deinit {
     removeFromBookmarksManagerObserverList()
-    unsubscribeFromTrackActivePointUpdates()
   }
 
   private func updatePlacePageIfNeeded() {
@@ -53,7 +53,8 @@ class PlacePageInteractor: NSObject {
     }
   }
 
-  private func subscribeOnTrackActivePointUpdates() {
+  private func subscribeOnTrackActivePointUpdatesIfNeeded() {
+    unsubscribeFromTrackActivePointUpdates()
     guard placePageData.objectType == .track, let trackData = placePageData.trackData else { return }
     bookmarksManager.setElevationActivePointChanged(trackData.trackId) { [weak self] distance in
       self?.trackActivePointPresenter?.updateActivePointDistance(distance)
@@ -65,7 +66,6 @@ class PlacePageInteractor: NSObject {
   }
 
   private func unsubscribeFromTrackActivePointUpdates() {
-    guard placePageData.trackData?.onActivePointChangedHandler != nil else { return }
     bookmarksManager.resetElevationActivePointChanged()
     bookmarksManager.resetElevationMyPositionChanged()
   }
@@ -89,6 +89,10 @@ extension PlacePageInteractor: PlacePageInteractorProtocol {
     updatePlacePageIfNeeded()
   }
 
+  func viewWillDisappear() {
+    unsubscribeFromTrackActivePointUpdates()
+  }
+
   func updateTopBound(_ bound: CGFloat, duration: TimeInterval) {
     mapViewController?.setPlacePageTopBound(bound, duration: duration)
   }
diff --git a/iphone/Maps/UI/PlacePage/PlacePageViewController.swift b/iphone/Maps/UI/PlacePage/PlacePageViewController.swift
index e1ed42eca..37965519a 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageViewController.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePageViewController.swift
@@ -79,6 +79,11 @@ final class PlacePageScrollView: UIScrollView {
     updatePreviewOffset()
   }
 
+  override func viewWillDisappear(_ animated: Bool) {
+    super.viewWillDisappear(animated)
+    interactor?.viewWillDisappear()
+  }
+
   override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
     super.traitCollectionDidChange(previousTraitCollection)
     // Update layout when the device was rotated but skip when the appearance was changed.

From 29d60c9af0760db614efd9f47f4a26d2b2da0a5e Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Fri, 1 Aug 2025 00:11:51 +0200
Subject: [PATCH 145/302] [ios] Fix opening websites with percent encoding
 characters

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 iphone/Maps/Categories/UIKitCategories.m | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/iphone/Maps/Categories/UIKitCategories.m b/iphone/Maps/Categories/UIKitCategories.m
index f88358618..f94e58ed7 100644
--- a/iphone/Maps/Categories/UIKitCategories.m
+++ b/iphone/Maps/Categories/UIKitCategories.m
@@ -181,17 +181,18 @@
 
 - (BOOL)openUrl:(NSString *)urlString externally:(BOOL)externally skipEncoding:(BOOL)skipEncoding
 {
-  // TODO: This is a temporary workaround to open cyrillic/non-ASCII URLs.
-  // URLs in OSM are stored in UTF-8. NSURL constructor documentation says:
-  // > Must be a URL that conforms to RFC 2396. This method parses URLString according to RFCs 1738 and 1808.
-  // The right way to encode the URL string should be:
-  // 1. Split the (non-ASCII) string into components (host, path, query, fragment, etc.)
-  // 2. Encode each component separately (they have different allowed characters).
-  // 3. Merge them back into the string and create NSURL.
   NSString * encoded;
   if (skipEncoding) {
     encoded = urlString;
-  } else {
+  } else if (![urlString canBeConvertedToEncoding:NSASCIIStringEncoding])
+  {
+    // TODO: This is a temporary workaround to open cyrillic/non-ASCII URLs.
+    // URLs in OSM are stored in UTF-8. NSURL constructor documentation says:
+    // > Must be a URL that conforms to RFC 2396. This method parses URLString according to RFCs 1738 and 1808.
+    // The right way to encode the URL string should be:
+    // 1. Split the (non-ASCII) string into components (host, path, query, fragment, etc.)
+    // 2. Encode each component separately (they have different allowed characters).
+    // 3. Merge them back into the string and create NSURL.
     NSMutableCharacterSet * charset = [[NSMutableCharacterSet alloc] init];
     [charset formUnionWithCharacterSet:NSCharacterSet.URLHostAllowedCharacterSet];
     [charset formUnionWithCharacterSet:NSCharacterSet.URLPathAllowedCharacterSet];
@@ -200,7 +201,7 @@
     [charset addCharactersInString:@"#;/?:@&=+$,"];
     encoded = [urlString stringByAddingPercentEncodingWithAllowedCharacters:charset];
   }
-  
+
   // Matrix has an url with two hashes which doesn't work for NSURL and NSURLComponent.
   NSRange const matrixUrl = [encoded rangeOfString:@"#/#"];
   if (matrixUrl.location != NSNotFound)

From 887bc2c755fbd4149410efb4a4fec394f8008ddd Mon Sep 17 00:00:00 2001
From: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>
Date: Tue, 19 Aug 2025 18:08:34 +0200
Subject: [PATCH 146/302] [styles] Convert PNG road warning icons to SVG

Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>
---
 data/styles/default/dark/6plus/ferry.png         | Bin 4852 -> 0 bytes
 data/styles/default/dark/6plus/paid_road.png     | Bin 5784 -> 0 bytes
 data/styles/default/dark/6plus/unpaved_road.png  | Bin 5027 -> 0 bytes
 data/styles/default/dark/hdpi/ferry.png          | Bin 2674 -> 0 bytes
 data/styles/default/dark/hdpi/paid_road.png      | Bin 3145 -> 0 bytes
 data/styles/default/dark/hdpi/unpaved_road.png   | Bin 2726 -> 0 bytes
 data/styles/default/dark/mdpi/ferry.png          | Bin 1550 -> 0 bytes
 data/styles/default/dark/mdpi/paid_road.png      | Bin 1783 -> 0 bytes
 data/styles/default/dark/mdpi/unpaved_road.png   | Bin 1597 -> 0 bytes
 .../default/dark/symbols/warning-ferry.svg       |  15 +++++++++++++++
 .../default/dark/symbols/warning-paid_road.svg   |  15 +++++++++++++++
 .../dark/symbols/warning-unpaved_road.svg        |  15 +++++++++++++++
 data/styles/default/dark/xhdpi/ferry.png         | Bin 3697 -> 0 bytes
 data/styles/default/dark/xhdpi/paid_road.png     | Bin 4468 -> 0 bytes
 data/styles/default/dark/xhdpi/unpaved_road.png  | Bin 3899 -> 0 bytes
 data/styles/default/dark/xxhdpi/ferry.png        | Bin 6370 -> 0 bytes
 data/styles/default/dark/xxhdpi/paid_road.png    | Bin 7809 -> 0 bytes
 data/styles/default/dark/xxhdpi/unpaved_road.png | Bin 6698 -> 0 bytes
 data/styles/default/dark/xxxhdpi/ferry.png       | Bin 7953 -> 0 bytes
 data/styles/default/dark/xxxhdpi/paid_road.png   | Bin 9397 -> 0 bytes
 .../styles/default/dark/xxxhdpi/unpaved_road.png | Bin 8348 -> 0 bytes
 data/styles/default/light/6plus/ferry.png        | Bin 4956 -> 0 bytes
 data/styles/default/light/6plus/paid_road.png    | Bin 5240 -> 0 bytes
 data/styles/default/light/6plus/unpaved_road.png | Bin 5036 -> 0 bytes
 data/styles/default/light/hdpi/ferry.png         | Bin 2678 -> 0 bytes
 data/styles/default/light/hdpi/paid_road.png     | Bin 2827 -> 0 bytes
 data/styles/default/light/hdpi/unpaved_road.png  | Bin 2673 -> 0 bytes
 data/styles/default/light/mdpi/ferry.png         | Bin 1516 -> 0 bytes
 data/styles/default/light/mdpi/paid_road.png     | Bin 1603 -> 0 bytes
 data/styles/default/light/mdpi/unpaved_road.png  | Bin 1515 -> 0 bytes
 .../default/light/symbols/warning-ferry.svg      |  15 +++++++++++++++
 .../default/light/symbols/warning-paid_road.svg  |  15 +++++++++++++++
 .../light/symbols/warning-unpaved_road.svg       |  15 +++++++++++++++
 data/styles/default/light/xhdpi/ferry.png        | Bin 3830 -> 0 bytes
 data/styles/default/light/xhdpi/paid_road.png    | Bin 4133 -> 0 bytes
 data/styles/default/light/xhdpi/unpaved_road.png | Bin 3918 -> 0 bytes
 data/styles/default/light/xxhdpi/ferry.png       | Bin 6602 -> 0 bytes
 data/styles/default/light/xxhdpi/paid_road.png   | Bin 7071 -> 0 bytes
 .../styles/default/light/xxhdpi/unpaved_road.png | Bin 6900 -> 0 bytes
 data/styles/default/light/xxxhdpi/ferry.png      | Bin 8251 -> 0 bytes
 data/styles/default/light/xxxhdpi/paid_road.png  | Bin 8702 -> 0 bytes
 .../default/light/xxxhdpi/unpaved_road.png       | Bin 8465 -> 0 bytes
 libs/map/routing_mark.cpp                        |   6 +++---
 43 files changed, 93 insertions(+), 3 deletions(-)
 delete mode 100644 data/styles/default/dark/6plus/ferry.png
 delete mode 100644 data/styles/default/dark/6plus/paid_road.png
 delete mode 100644 data/styles/default/dark/6plus/unpaved_road.png
 delete mode 100644 data/styles/default/dark/hdpi/ferry.png
 delete mode 100644 data/styles/default/dark/hdpi/paid_road.png
 delete mode 100644 data/styles/default/dark/hdpi/unpaved_road.png
 delete mode 100644 data/styles/default/dark/mdpi/ferry.png
 delete mode 100644 data/styles/default/dark/mdpi/paid_road.png
 delete mode 100644 data/styles/default/dark/mdpi/unpaved_road.png
 create mode 100644 data/styles/default/dark/symbols/warning-ferry.svg
 create mode 100644 data/styles/default/dark/symbols/warning-paid_road.svg
 create mode 100644 data/styles/default/dark/symbols/warning-unpaved_road.svg
 delete mode 100644 data/styles/default/dark/xhdpi/ferry.png
 delete mode 100644 data/styles/default/dark/xhdpi/paid_road.png
 delete mode 100644 data/styles/default/dark/xhdpi/unpaved_road.png
 delete mode 100644 data/styles/default/dark/xxhdpi/ferry.png
 delete mode 100644 data/styles/default/dark/xxhdpi/paid_road.png
 delete mode 100644 data/styles/default/dark/xxhdpi/unpaved_road.png
 delete mode 100644 data/styles/default/dark/xxxhdpi/ferry.png
 delete mode 100644 data/styles/default/dark/xxxhdpi/paid_road.png
 delete mode 100644 data/styles/default/dark/xxxhdpi/unpaved_road.png
 delete mode 100644 data/styles/default/light/6plus/ferry.png
 delete mode 100644 data/styles/default/light/6plus/paid_road.png
 delete mode 100644 data/styles/default/light/6plus/unpaved_road.png
 delete mode 100644 data/styles/default/light/hdpi/ferry.png
 delete mode 100644 data/styles/default/light/hdpi/paid_road.png
 delete mode 100644 data/styles/default/light/hdpi/unpaved_road.png
 delete mode 100644 data/styles/default/light/mdpi/ferry.png
 delete mode 100644 data/styles/default/light/mdpi/paid_road.png
 delete mode 100644 data/styles/default/light/mdpi/unpaved_road.png
 create mode 100644 data/styles/default/light/symbols/warning-ferry.svg
 create mode 100644 data/styles/default/light/symbols/warning-paid_road.svg
 create mode 100644 data/styles/default/light/symbols/warning-unpaved_road.svg
 delete mode 100644 data/styles/default/light/xhdpi/ferry.png
 delete mode 100644 data/styles/default/light/xhdpi/paid_road.png
 delete mode 100644 data/styles/default/light/xhdpi/unpaved_road.png
 delete mode 100644 data/styles/default/light/xxhdpi/ferry.png
 delete mode 100644 data/styles/default/light/xxhdpi/paid_road.png
 delete mode 100644 data/styles/default/light/xxhdpi/unpaved_road.png
 delete mode 100644 data/styles/default/light/xxxhdpi/ferry.png
 delete mode 100644 data/styles/default/light/xxxhdpi/paid_road.png
 delete mode 100644 data/styles/default/light/xxxhdpi/unpaved_road.png

diff --git a/data/styles/default/dark/6plus/ferry.png b/data/styles/default/dark/6plus/ferry.png
deleted file mode 100644
index 738810fb45bf0d95e3ce89e7cacaea04855f8eb1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4852
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
aY4rc(IxIs>niJ#z0000<MNUMnLSTYqB&p8;

diff --git a/data/styles/default/dark/6plus/paid_road.png b/data/styles/default/dark/6plus/paid_road.png
deleted file mode 100644
index 969dcd3d76860ffa5067c110826c0649cef423dc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5784
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
WHqrCE`evvA0000<MNUMnLSTZY7;7c~

diff --git a/data/styles/default/dark/6plus/unpaved_road.png b/data/styles/default/dark/6plus/unpaved_road.png
deleted file mode 100644
index 08f9c60029ecc2d98c618abd71a15e8c25d59d2b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5027
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

diff --git a/data/styles/default/dark/hdpi/ferry.png b/data/styles/default/dark/hdpi/ferry.png
deleted file mode 100644
index aae71123cbd8e8c743260b153465914e62a6896a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2674
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

diff --git a/data/styles/default/dark/hdpi/paid_road.png b/data/styles/default/dark/hdpi/paid_road.png
deleted file mode 100644
index 3579f3452f771eaa7e24407e897020c28dc80ae9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3145
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

diff --git a/data/styles/default/dark/hdpi/unpaved_road.png b/data/styles/default/dark/hdpi/unpaved_road.png
deleted file mode 100644
index 4f78bf60979fd75b4a0c9741a3039c8868af70dd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2726
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

diff --git a/data/styles/default/dark/mdpi/ferry.png b/data/styles/default/dark/mdpi/ferry.png
deleted file mode 100644
index 12e32a33a3e87cdfaa06a184409ff7fefb00ca22..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1550
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
A>i_@%

diff --git a/data/styles/default/dark/mdpi/paid_road.png b/data/styles/default/dark/mdpi/paid_road.png
deleted file mode 100644
index 46e65da5051dd0dc23469be16ce8d08891f863af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1783
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
Z_b(pS$4hPb3Y`D|002ovPDHLkV1gx$Wdi^J

diff --git a/data/styles/default/dark/mdpi/unpaved_road.png b/data/styles/default/dark/mdpi/unpaved_road.png
deleted file mode 100644
index 70e7aad05bc9d8e444b0baa65562ea718cb7e7cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1597
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

diff --git a/data/styles/default/dark/symbols/warning-ferry.svg b/data/styles/default/dark/symbols/warning-ferry.svg
new file mode 100644
index 000000000..6dc6ef60a
--- /dev/null
+++ b/data/styles/default/dark/symbols/warning-ferry.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="26" height="33" version="1.1" viewBox="0 0 26 33" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <linearGradient id="linearGradient1" x1="13" x2="13" y1="1" y2="30" gradientUnits="userSpaceOnUse">
+    <stop stop-color="#e8514e" offset="0"/>
+    <stop stop-color="#cc3633" offset="1"/>
+  </linearGradient>
+  <filter id="filter1" x="-.0882" y="-.441" width="1.1764" height="1.882" color-interpolation-filters="sRGB">
+    <feGaussianBlur stdDeviation="0.55125"/>
+  </filter>
+</defs>
+ <ellipse cx="13" cy="30.177" rx="7.5" ry="1.5" filter="url(#filter1)" opacity=".1" stroke-linecap="round" stroke-linejoin="round"/>
+ <path d="m13 1c-6.3513 0-11.5 5.1487-11.5 11.5 2.4e-4 4.6124 2.7473 8.7238 6.8871 10.534 0.76685 0.33537 1.7261 1.1233 2.097 1.8742l2.5159 5.0935 2.5159-5.0935c0.37091-0.75091 1.3301-1.5388 2.0969-1.8742 4.1398-1.8104 6.8869-5.9219 6.8871-10.534 0-6.3513-5.1487-11.5-11.5-11.5z" fill="url(#linearGradient1)" stroke="#fff" stroke-linejoin="round" stroke-width="2"/>
+ <path d="m7.678 7.9092h3.3009v1.4338h-3.3009zm-1.827 3.3765v-1.2257h7.5392l0.85568 1.2257zm-0.99443 0.90193h16.073l-1.457 4.6253h-13.043z" fill="#fff"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/warning-paid_road.svg b/data/styles/default/dark/symbols/warning-paid_road.svg
new file mode 100644
index 000000000..0a468cbca
--- /dev/null
+++ b/data/styles/default/dark/symbols/warning-paid_road.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="26" height="33" version="1.1" viewBox="0 0 26 33" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <linearGradient id="linearGradient1" x1="13" x2="13" y1="1" y2="30" gradientUnits="userSpaceOnUse">
+    <stop stop-color="#e8514e" offset="0"/>
+    <stop stop-color="#cc3633" offset="1"/>
+  </linearGradient>
+  <filter id="filter1" x="-.0882" y="-.441" width="1.1764" height="1.882" color-interpolation-filters="sRGB">
+    <feGaussianBlur stdDeviation="0.55125"/>
+  </filter>
+</defs>
+ <ellipse cx="13" cy="30.177" rx="7.5" ry="1.5" filter="url(#filter1)" opacity=".1" stroke-linecap="round" stroke-linejoin="round"/>
+ <path d="m13 1c-6.3513 0-11.5 5.1487-11.5 11.5 2.4e-4 4.6124 2.7473 8.7238 6.8871 10.534 0.76685 0.33537 1.7261 1.1233 2.097 1.8742l2.5159 5.0935 2.5159-5.0935c0.37091-0.75091 1.3301-1.5388 2.0969-1.8742 4.1398-1.8104 6.8869-5.9219 6.8871-10.534 0-6.3513-5.1487-11.5-11.5-11.5z" fill="url(#linearGradient1)" stroke="#fff" stroke-linejoin="round" stroke-width="2"/>
+ <path d="m12.158 17.427q-1.1685-0.08059-2.1357-0.69846l0.64474-1.5648q1.0343 0.72533 2.0349 0.72533 1.5379 0 1.5379-1.0611 0-0.53056-0.39625-0.994-0.38953-0.47012-1.491-1.0208-1.0947-0.55071-1.491-0.91337-0.39625-0.36266-0.61116-0.86636-0.20819-0.5037-0.20819-1.1215 0-0.91337 0.57086-1.6119 0.57757-0.69846 1.5447-0.93352v-1.2156h1.5379l-0.0068 1.1485q1.2357 0.12089 1.8402 0.60444l-0.53052 1.5044q-0.92009-0.65816-1.9409-0.65816-0.60444 0-0.94024 0.32908-0.32908 0.32236-0.32908 0.81935 0 0.84621 1.8738 1.7596 0.98724 0.48355 1.4238 0.89322 0.43654 0.40296 0.66488 0.94695 0.22834 0.53728 0.22834 1.2021 0 0.94024-0.60444 1.6455-0.60444 0.69846-1.679 0.9604v1.5447h-1.5379z" fill="#fff" aria-label="$" data-font-family="Trebuchet MS Bold"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/warning-unpaved_road.svg b/data/styles/default/dark/symbols/warning-unpaved_road.svg
new file mode 100644
index 000000000..8d68c0740
--- /dev/null
+++ b/data/styles/default/dark/symbols/warning-unpaved_road.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="26" height="33" version="1.1" viewBox="0 0 26 33" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <linearGradient id="linearGradient1" x1="13" x2="13" y1="1" y2="30" gradientUnits="userSpaceOnUse">
+    <stop stop-color="#e8514e" offset="0"/>
+    <stop stop-color="#cc3633" offset="1"/>
+  </linearGradient>
+  <filter id="filter1" x="-.0882" y="-.441" width="1.1764" height="1.882" color-interpolation-filters="sRGB">
+    <feGaussianBlur stdDeviation="0.55125"/>
+  </filter>
+</defs>
+ <ellipse cx="13" cy="30.177" rx="7.5" ry="1.5" filter="url(#filter1)" opacity=".1" stroke-linecap="round" stroke-linejoin="round"/>
+ <path d="m13 1c-6.3513 0-11.5 5.1487-11.5 11.5 2.4e-4 4.6124 2.7473 8.7238 6.8871 10.534 0.76685 0.33537 1.7261 1.1233 2.097 1.8742l2.5159 5.0935 2.5159-5.0935c0.37091-0.75091 1.3301-1.5388 2.0969-1.8742 4.1398-1.8104 6.8869-5.9219 6.8871-10.534 0-6.3513-5.1487-11.5-11.5-11.5z" fill="url(#linearGradient1)" stroke="#fff" stroke-linejoin="round" stroke-width="2"/>
+ <path d="m11.91 13.481-0.31705-4.7458q-0.08917-1.3871-0.08917-1.9915 0-0.82234 0.42603-1.2781 0.43594-0.46566 1.1394-0.46566 0.85206 0 1.1394 0.59446 0.28732 0.58456 0.28732 1.6942 0 0.65391-0.06935 1.3276l-0.42603 4.8845q-0.06935 0.87188-0.29723 1.3375-0.22788 0.46566-0.75299 0.46566-0.53502 0-0.74308-0.44585-0.20806-0.45576-0.29724-1.3772zm1.0998 6.5193q-0.60437 0-1.0601-0.3864-0.44585-0.39631-0.44585-1.0998 0-0.61428 0.42603-1.0403 0.43594-0.43594 1.0601-0.43594t1.0601 0.43594q0.44585 0.42603 0.44585 1.0403 0 0.69354-0.44585 1.0898-0.44585 0.39631-1.0403 0.39631z" fill="#fff" aria-label="!" data-font-family="Arial Rounded MT Bold"/>
+</svg>
diff --git a/data/styles/default/dark/xhdpi/ferry.png b/data/styles/default/dark/xhdpi/ferry.png
deleted file mode 100644
index e425ac69a5afc278558d5c3949a6e4abe6aeb405..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3697
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
P00000NkvXXu0mjf4ed1q

diff --git a/data/styles/default/dark/xhdpi/paid_road.png b/data/styles/default/dark/xhdpi/paid_road.png
deleted file mode 100644
index fc85827d9b49eb1be0f7a95a0823d19077c0357e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4468
zcmV-)5sU7LP)<h;3K|Lk000e1NJLTq001-q002S=1^@s67z6b;00001b5ch_0Itp)
z=>Px`E=fc|RA>dYT5E7r$Cd6oqZfM5=nY5+NnjHh%L!OK?I=!wY^@V)7D&L}jYG1j
z%_fy9J4tz+%@*dzrflpVyOnav!A{}_&XP4tOt6<2<FznE#$XI42rMBa5J*S@X{6Dh
z=iIsbeLd4xJy$cfB;=zy)7_^}pFUsr>BqfShL}dOEUOUaZUN5*7l3oYGr-AU3p@lK
z1YZMpfLp;0hGFy|ofa}~)(Sur!^TqZVsQ2p?RBBuG4N4<BiJd^lmP+A9Q3*leCw2Z
zkKOPCh+ms3ut@^~kUVsFADA=pS&<3Dhrw?En13>zOc)S=xM28e;5A@(tWH9qkTrDX
zjMaJIK+%mWmvRStd$R_6{hpy4{a#_XLa7<)Jt-cKFC{CxH>0flTEUvHcBNEQ#IzN$
zKa6xYK)oBQzgV&f0Ros5H2x0w_E<*xj@B7h|MaKwwo@lRKR7Vxaaopt6G9nRsRbEq
z2~^57gnVYUr=xK3qLZ^XZoHU!%Yt~|4x!&az$Rzz6G`<IS1A%=KY&7!Q)%GbIkSHI
z6DvELn-{v_zRMK>0f!|;oQL<}GUZAZF-A}nnfRGgb$i|XpFVmjxwtqXQmrQqDC_{J
zfG%|AKM@eXl%T=G;8eY#+1(vHyKU<omp(eZoI@&s=+4r^SfuN)o_Y}(XD)<6L0|{V
zSKj@9760;BvpY4FVXo746rKhspDxt%aRH%&EGYgA9JLh(PM;3F|Jb7&M{W#wT{v0{
z7y48HoDS<fF|Pq|R>?BjTcMC(TxI2YTNnT5Gp{Gln&q6WR#ZO)P$RKy!~_H|iBSFt
zxKwY{wP$zA2haTSn?^_^x#_%<oDMqyPNLonSt4OZvcG!kwq04vmOFbo0l{+sH7*ol
zc*TLVxB*n_R@!#_I_u;sJHL^D8F9vet#=auqzy-Vt}o1%x$Lo@z35%NCTRB)&b$sl
z`y8_Iz5&b%C`EzkdHZemshvAFCZfYAFm!;#RL_T{H~q`Lutwd-pL}BTU}J+5(7o`r
z!r4ibe^5w*!q;`Bp{6GD*b~3l>~^~hxn7j>O!W|A-pSB$B_@iT>Lrq0$+*%f;Cd%2
z&-Nr`hwV|s`Id6@#}98X`+QDN>!rT-69owJuYm1Mz#JY9z5mF=_gkZ*Go+&GD3Z$V
zk!Ko<>6np}Bnnopl$?;BE}g}|p(^aWO6gNrGG>eIDdSE$<PYS1@WUV0Agj|{v|pqP
zY(S_$Z}Jvk*S9^tBe%cLSBT>UhR6RY>6i=Auw;v1P&&n$WUoh9GD^dGVRy&uI_>H8
zT>o9Imp<3?=6>g{cOQHwW=YaKa}aX+R!J#-%)UPJt@ZbR3$v4oU{m4=r<@JX?NuV{
z)>}nVw#RN43XY0_*2|*jqf;W#(rn8olHuW-mX+Op*X}+05X!n!JF!6=rj1A>NrZd^
zu&L=ko}P=43!iKZj~I+WkaDIvr_P=&%KzaZk+*bN6c`$JB_xXUvNBO}|2mOYTq4`W
zvQ3%OKArXZdS-U~erKlbXgI@-Op*$@N|Z7pG7-YsxlsG=mw1uEaS)doORTqJ3VByz
zl9+w(*M&P7*FQ&{ULLx3P4u_6N}YIp#InyTR^y)CHOkjW%C*D?N}=L$p{~$-s5U7W
z3?_4%mc*HeLA-3rk&Nh3J8Qw`a3F?nN^C`0-}y$-TYpCGaGB*5G7LLvYr}0(Zxj28
z*rd#9pM4>;gumNYG}zn}oKaSx{HHoGbSgpAL)w-7`zttg(jiVg)j@PlImt3ZLdxh!
zgp#~o=!}&IIy%JVy|1Zi(SQEDXg~Otu&`M;N!r%?i{y=neO1qPU9ayenDe8DyEPlc
za1b|rxx3}7ijZkqZGSy|2S<a<)7qJ*OvzQMbX^H*jKUU20|BY4+AuXoN2QDd!ZOpz
zFbA>q@R2Izb0jTi%8B5M4V#8rFPX!G1DSH><w$e9!+)F~{xQ|_di_v0UkQxqq?gVS
z$vHVuGF7i^>Ft#)o_*Hi3M;zX+sZ?uqwGjgDh4HkfaGFQ(vhnjyqHdz`WhO9Wrpnb
zoUyV^n?(lJ&U6vi5s(<B&*yyLD<B{qs5XssUQLQO{R}JCG1c=*pRy6ZUtBwm7dRZd
z2q&bZh*E6RGgqw^hTAP|C_5^RXHT!Ej$*E>(XKA~uTwe&e7v?PaP?}cyp(GWDaX_n
zt+rXpl}yiHJ#<KP9zCj>*{Qec4pH&Y7BQm`55E!LRI2%^e3rH;SN%ED!L~NuJ#|VU
zAp6?DnqZ$lnOmpC18a6l%OE*oG8dizDWhCw!us^6<4~=*_{TjWc;iMyJFJxK@rd#V
z9u(d$d|}LXjP^Dv_8WsaLuP+p^bQ0p1f=zd>GFC8al4g{+h8Wxp$>|9e`BNg__-aT
z`@;`ydlH4=5;MQNN_ZFEZVv>VcD9%ONBWj^%8y9u%E}%^R;L>T)UQiYa`T2_jfm_p
zGE$r+vf6UhmaNN^PH<>QTsiQjXnOf2VGa$#=`lA8Yicm2V{1yaQK{Z1^Xx~Z%%>C-
zH~|I50dnW$j$(c$^v6Kc9SjHFn8T`$>5cX_aq+c3>SHI|*ep_uitN6e_Vo68UiFjg
z&2jE>5>T(+OIB6Yh;)ggG0haXbWx1<M+JmPOiP<|FPy=|l$3yb=1hGJ(cxasP#c(E
z1thsWo`mfDyvu5O*_hL;Pk+3Spq$%sK3{6!-GkCoDQ%d;?23Jdd8D^@oSv@FJll~~
zo{td)73B>szCRnID>$Eq67U1xt@DuE7u2GKRp<N%4;J%yWD9jns=TritDayAm#+}H
zix!KX)2Bs$b2HASKD_R73(swpA|)p`jD>bhQw(0eF8xJu++8u2eabBC-!m64X<{3V
zh{3*XHzIEXn)Nq-d+F?f0~ln!c^e~@SE=0IIeNS&fn2F+B7ezJ*(M=1Rpc*SDtXL;
zjYWz&>*|C#g4b)b0aA8V>a<TeXUW7Q6s*0EFCFz;jReGyBh`nK@UQ2tyR0mP9j8_r
zfjCx5M`Y)82%K8LTa=nV-QxIs0M9}l@4YA6#j>sJs#JnTA6yD0w^e?aJaeWF2BRX*
zu@?ylVaIh8HHDR%Hot2|&Ld^anW}Zhl<dFIB+l-5R$M>%p$PF^Lc~+1iYf0rc1$$>
z{uStq-MZEKP$?TY?elyLf^YrymXmZ|qhr7@$g(}0FvPbf-&0C_YJKCYtJe?p`*WxA
zPJyql((ovrIk!xPp^5XTz4jg9J9if6k-Z10?k1EnV)9Gpo~zltN4`JM8vQ!}wX&>2
zj(MW)VTOcvXs#7M|M^}Sb{LiLaHE1lJpsbiUi7!Lh^`NgOYI;IRnFX0!Eoj*mn*nr
z`}TJn-8U;Rl-qzH<OcGFuI&BtDzm)0x{lA5GJ0r~d8RR#U@2#+Se-NOq-48JwWW?z
zU$xWg7;2;7s<mtPJ082~?r#1lvO|sn7-#v%;CU>QOus*PVEwwa{_EFg#e6{@R+GO3
zO9M<v%o}(fN=(l{&Jx2obM$)Z=%nhHl9ats0G~Z?{$E$@e5KCu`sy#3h?m0J;a_`(
zSVSdlybQJ<_}!VA3HQA4(%z(uG@slgP^m_ki<Wt{DR5NPLS|mpA@qiQJz$?KtF}y)
z4pXvftJ~wuc(LOy|IKfYIKc2yy$2jcQGi$jP@PEj>RQ+$6V^QY{4U(R0yZe>g4HPM
zdCFq3uA^o_rFwtN6EJ5cBR8kL=7kscxzp42#~hk}5xxeT?c&*^!M}&{O1;7G<;%f$
zzWeR3b$50Z(>e_5)lmRhp};aFQCrDaR(WSVXN#Lr(fo?DcmL+aT1E-=HR6Zlx3sdI
zjrPbE%Ms%2{WI9UL9jYBFkrs-{eQf(<<v)uxu&MFrPEG4Vz>c}Rk?cg+f~1KvI$}4
zjG`j|!(|bZ;sT;J?D7%!M__xCpq$jb|Mi3;Pds^Vz}J({D^g5gaE{j(j<_V1cg!s7
z)Vj$jD!R1t$?f~ot3K}pLbbnuUjZQJV*~3XeIg)g02HHZGdL>zSQi={4mJPknY=Uq
zv*(L}UY|UG>4geKXGpP)POvR6zD)CG&1$*r!EYTY+PHDRvG`S!y|DYgst_;zR6wdB
zI=u(^4d8Jj$6Iq>-4Wyb%P&<n96x@iFhhwP1<slRMLQ}V2`iDA<LNA3RDGs={e}x!
z%a&0k77atluM2pU^yxHVKr{tVrAWRBo(qmi_zV-Q`@#2@w46G%h-*yE7M0nV0<-ji
z2VblB$xl1u%!ac45i<V;8$KoYv~*H{Xbhm(W-0i7a29wR@pbay2R1FeTwh=1JdAm{
ztlqR~?=AoOZ#*92Q8y}H1rX;YG@iaKpEMxV62SOAj~|y;fJ?zqgtwZ(KdidvA#(`d
zm?E11XD7F$<ieVLZya>F-Ld-q7)IU!p9UCS#U@R$j857Jz|BG<0^>TfZJvL6dv4te
zzgvgLVri47{@Q1M{ha5nFLF64;^Fvba6Le@E8$eraSMDZhTupW_`lIMY8NW|-amD^
z-HF2hEZ0untl2FNFzoJkX#3W5fT6Kz0YpO)dK2k@D&T~7&s$P`T%9qM>;CS2RToK{
z00dvcrjMo-5S-%{%frv6c^kgb5X4Ija`A?Z_VZRmf$L>jX<7kAJd2uzth?_XH4@z;
zg|myB-8nh>os8hQEl(@y9ZZX1%+h778P0^42Hkk_owH!Ux%>qSE;~B-7`mel*-aNe
ziy5L*XLZj?s+XNFT)xtI?nLS6`ZtsRtN`&npG|qoSM+%9T*463>4ILEuKcuzT*R?v
z-NB5-i!EGn^u8EsH+|;leW<*B2r5CG6yKLDv2EKnqqerzHGlqm!{_rEg@uJiM@NUt
z<M9}SgM&s!MussoG-P<a-q2G|J@qJT@y+8n8Xg`#_sAoUJm25nZ_Su7!%9m_!&m-b
zC?_Y!YHx41U^`S<S!r$Ex>X*)SZn%0JkFjjhzE#rW5b3GMssts3y!+;^75o^N=k~0
zPNR%ZJ8oBMYN`RJB#^AEERmd?Y`{U+mMvQrCL|>AA{#|`gJZO|w*Ge4u3ZhR05}VS
zVGRrnSf*))uHipS(1+FA+iNjJ*#dC0tgI~b>Z`93nBpkAs^A19fuPd0Xwf3+Bpi1U
z3}*o&M{oq=A_zK<GNLJwsQ>`V@Zmeb;Ak%a!PaVUB0B__;l94UKOa7P_ynA%vv_?s
zYK@GHSOi9<9srx1Jp#hug-)J48G>C|Mn4v!g!jCdz;r-17)-aTq@+ZKQE6$ZK<92X
zD=_F*U=Uhv1q8FgJpM<}Wu&L4bCwV(2EnH!B_$Qoag6%ao}QkeKp=qsl?`#^34*gC
zFQTZ!|4WSrg-9?jUc4x%N028@oX`QuLEu1;V(oHPeSLihqZFk`WrAW#LdSMKEE)SH
z5S9R(gMl|#zE(JY32p41jx$6ZtR0JkLc;9Hlp!cHkspG&a^(uaGZL(tni{zrbRCt~
zcOGek>jtqZ<CsREXkZhNb#RJu6OOW7sHLUF%FoZ2YX+lk-oO`ch8!G|BaYdT{iuQ9
zj8H%j1jKNnO|-+S^kErNtcQ#tXRjs7=FOWYy1KeT2sak>8DiO{c%y7Q{`ljPIU3NG
zz%e?m?Cfm0wisRvD{c&sNrPNd*bQBonVEv?%I-zW(0Kv`Nf4^4ySqDtIvIuxD-4>|
z*w`os20B3i;b7>jnntBDJB`wa6yT`AZ5!ceAeLo2ZVueh;E3Eb0K~v<CD#y}aVytt
z(MguMhOj$Ye!rhvw1w?IgzaB$60C<^i`zB^RRN%QLiGO-SLedGx;s?>0000<MNUMn
GLSTY-#-L3A

diff --git a/data/styles/default/dark/xhdpi/unpaved_road.png b/data/styles/default/dark/xhdpi/unpaved_road.png
deleted file mode 100644
index 17bc13ed7f5ad9e5845c996d14e589cb9f28dd05..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3899
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
JPDHLkV1h>Yk{AF0

diff --git a/data/styles/default/dark/xxhdpi/ferry.png b/data/styles/default/dark/xxhdpi/ferry.png
deleted file mode 100644
index 608d87687caa98102131fa50fdc2bcb726279c2a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6370
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

diff --git a/data/styles/default/dark/xxhdpi/paid_road.png b/data/styles/default/dark/xxhdpi/paid_road.png
deleted file mode 100644
index 9f50fe38601eb431c2e9fc4d3b690d366b9f493c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7809
zcmV-{9)978P)<h;3K|Lk000e1NJLTq002$^003hM1^@s6HJCQ_00001b5ch_0Itp)
z=>Py8J4r-ARCoc+T?cqw#g(4-p1Nce%c@4MvT-js4sI;6Sy~9agqW}ip(LBKNyzSI
zcN5ws-)@$$+5HIZ3y_4e1OkBs5<&<V+t|jA0plJQY`I`H%WAgzdvE`L?mbWQ?wk80
zSw_zIn|Ef;IdkUBf6vUF+vI>cO(`0UW})kG$fd|7F3kf?N6v6*6tok$%cYH=b;z}D
zJ`e~5dQcwr6d0}^0aOruO+lWDd?xZ3<e~Q83mYFI??T=R5D$V5OB$-<{W=N22+#uL
z`N+BbHW-=$BXK?Q27q{MXr_|4{@8#6U^CJ6#mEzryYR6{ImO>c{sRC!^l|iX%7Fu5
zv*GBa$Q2)l!zW>LE86__R0DX*fCFGfaPTw8jI_VD#0Xr8OaMDhg>yp&4uEmdzX<sf
z<dnfU)l*;J+q&VMtd`w-^G_VuU))w#ThiU$k<-)DliAzVm8pV(Xi8dYM_O7&N5+Wk
zmh7^!+7aU>9vv}dYIFYCXLkp4azcaY54vs0&j375;~}LX0SC~yeYhE!XUTq3Boc|X
z{ds-xqnBTq*sx>!)V8MPGTkVOfCvUu0MzDCGypDSF{z^;8Cg=izjW?dJIb!P?oeiB
z<zNolD)jq206gifjLpw}0iXgv<JRI9<PoeVOX0@G-h+=ndPeo?)r(HFwvAE%A^;eI
zfgp<-EDWO01c7nE(o89XqF=PsII0LrROL@WY03U^7hSxebomX<p^Oa9g8tHBC_I9G
z8~RhU$qjF9VmlAcpAE_9k&{l9t|Lc!_doQL$@|x?J2xDTq;mX0{4nc|$zVzXlvS>o
z&JTf%z*;yO0VAN&Gc#HzUvkMC6*u2n7tG2^>K__#>iz`a9dN7-{MYq-;0@sD`Ov;5
zS&K+dSETy>2TFIn`pT!my^%D`LKPxden5GRQBT11%97M0XcI<`MxrVsC$o9h7jJuc
z)Kyn?27^fhkXI!S!?&GDOecs21sp)*zU+zwD+Z%|^QOqVciwqLYjaB}r(+5MqvIwJ
zQYK~c0_BxETK>PD_E<|5FDVoNEE-#}bIy<Mdn>)PJlPr;hV}yhZ-;*;@sa@p2hf(F
z>5cKt<7-Erc{+RZqmN#Pqn=7HV@KKxglC{JQ2l_6@22k{`02a-g#lm~;H770v@HJN
zy}!(wJvUkCb)%af1HAp-?rik|0SD0Lpz)WHt@@Fkp6H(M|NHnot5#h=Omvj7AZe(;
z4Ys}X3(D!s=)+RcGyB$Ce^tKxb0-Y3w@BH&0I$|7@Yapdc|}egpz-d-cahU<8sXN~
z-cA4T)pKh1AD9`$)Qnrpq=7fWgfG+!jPQke+k5rBa%tz%s5^DJ_ElC@y*~MlJNE}u
zQ~kzH(EbD9aqaU>evNelfJU(X6}jAIfg9L$x88hJ8`iTBEQS0Q;r<3XSh?33FK}La
z(8pNxi38ZFvPqLR&wc3O^}+OXzwz@X!Oy(inDu0Ho_g0KTR~%_ZTS1!E+uFw0va7=
zW)jLW2PV`Ur0APGQ`c#g_-pEz<wQ+~104XNQbHjW3I$coo;|a--TtjPkuc8*)^s+2
z=9=!Ce1Stl-ZxupYZ>n9ifs7Otrs*mG*&Ru^htmqa1hK=7GS)TM#=L_B9nHeO|vX=
zFEw?{GW58y3u1qCaO>8yci-{dN<SCCzZMwq%E+3mz@Y(8il4Q%0CU$pcT7I^(UD57
zXUqvnc%%c#960q{08;bvR7P>J$|xyOsks*4z4qyV@DiL!WH{@vQhV2~TUPu0vzdt+
znv;RwYkg$O3LKO#KrXR0YIy0_>HF5MUq(L}_OSsQ0~Y`WN_Ff3G*af0s-<fD4WCmJ
zK6j%kzwp9-BiP%X{R&U}Aij|z<5#8V^*E|FJ@UwP9eelcZJ%Yl^WB-3AW8rZirLV*
zC_xj9a6?1yrUxIqj>F@YLx2${Np;zvv}5u_$E2o?F88?C-T)wgbxF53fc5ILo-AQZ
zT1=|5tIRR<_Jq?v__yy|jP=e@N;Gt3A`8>q!dwO(ADASht#{uwudBN!lP3cnIUZN{
z*v2RunLMW~dL~@{<w)2G0BQs?IAi)OI%TJ=W3{jB9HKs5>A~Ax^myz!X^z&`jjwt9
zv3&Y&Nn-)_bT2;+I4ICd0+*1QSFH>l+PdXzo(y<~ayl0^y2#Y$YP{T$4&*nZq*SF9
z6vR~1^7B>2WtXd>MT=DSxN*3A>+iaqO$Y9etan?V`{iZ4ixcZOzVNB|Dljk^0PZ~0
zF%=Wjn$KKwUQ=!DMBd_XfJ@YgaX2*yt~*6yd?|=b9{@yEYN{GJ?-MG2%2bs$a-?Wk
zDXvmf^Y(43Vcj|v?sRYFdi(R(PcY=sC(J$ABu_eb>FZOz|AXoTeTVTwjC;Sx;vx>r
zg(5I%^U4*$V>LAsd8{?k>^MoLBb1ZsvOyh@!^MG8JcEv3euFArw76f;*j9r)XRexf
z(@iP>z-hy@X_hIoWmAV`j)_3*UAwv}+|=Y3b#d6lfI|nP(boEaW!GbmErLvUU<HCg
zB+8iSh)@l*%L9o^DcRX-!VNd7^pT?+z8GMQWxoX3iRx+<>B4n6%39T>Ece&H)`uRc
zlsSu{z2UTdk37J~nYP3;Z0rt83^-`=*=IuPI&h%3?!bX*A-KbT?1`5xLd~*xV)9t_
zW@%frV4(`7b6IulIR%(@M?-4Mkw{q8tywGGIXX1qqfbR`lXfkc{^4G<*4e*m^<tkh
zEZ;nsAwI?s1S8?hL8Zgb|B8`F$b1uhVG?Q{ap4P3E8-_5D@zs3oTaO5XUbV_uQ`IX
zY&)W=OQjbUs@%zw5t)Tr|JVncR8LED%qMSqtz`W4Czrl?qUb!)UeNmXs!)E_GTu`5
zCIa^XnHo5RAfFp(fXFmc^;>T);5xy@p0{Y2*pYLiT2~W(L?%6Z^~ulTNdTMBzRg3Q
znPc0wsUxrbA$A}rsa^B7$}B5W1=D9B+SX`aXqU<Hs*jpHvn+Z7l(ZLr8FC!sffrw#
z0^n>nHK))XlT20XQ>vcBhkK5<w3g^oHk8?sbS9KW#353%OqpLw%kSHAcy;RDULD7h
zzB+4aRLvWIQsM4y?T7S7Im@J?D>TlKTQPl<cBFh3!V_T4&K)y(7uk}E5JdX4FThQ*
zD5-|kEAx2-7;&V2S&o!mB%tS|Y$rNmFOY8CW2-3cSoF5HL%q+Ax4qbse!Ozl&Fs||
z+oax196H)N^1Al<UWQdtM}Xta%7oOge*IW78F5T<M7<P4jEex)%}jmKaV#m--FOt-
z#KcRi%yQ>Wme{bh7dwd-;-gOVgxd5?o&eJL_S=3}5@pmEJu7g{hYpXH3o8!Y@1Mxx
z;gVrHtwe`4mOC2iHMO-VKksi<AT2c}mo@|Ke<=FST#u^O-Fu4RfGz2pA3=mF=S%{+
zeCpoXbhLb+N6OYiGG0$xn`%E&V^zs4E>aV@zr)$|bR>?s<<J3ZFhQjGj5zBm-BVv1
z?(Obz?kyYZjjSssO}1uu*ATN_zkZ!I!ysfAZZK+^0njRM{JbihdlqDlg4xzAv$5!y
zWzjKtW?AH3%2zR3>gug`z6CD==k7pJGEz@dOTaT0b6jy{9wF+I4kowl-K(0mY>u_{
z_7_M=QDvC6<FCF}g>aSOXIuJ~_FjMblY8w_zpJY=7sQq{UIfm1dJDHUhs-E2%W<fo
z7w?q<b;%<&%ib#p)(`#hkE(IgCT-H@C3!g$CaB3b-K<7TIx}Y1v@iV(luBFi$Mlh9
z9{zAoZwfZwx<-zXxV)wMMqISLop+G*QD$p7iegEqVbHh8woGC#j>6L;e|lZ#XxO@U
z(rrVTnQH76SE!1Mafb(yX!;{%vFr8MD;GVX;+yWs^^@gjXQ!V-8N6~}`-Bt;gzy*=
z`yoiUDI^s|DT`I|g@<CSEOPRaCAM#P|9y4*@L>%M@5zxT2S>`J1v6&qXA#veyr8<<
zTD4ix6H2|I_#=BjJR8vVEkAhA3R^0RK&2HI_tF6-?-3N97P@lbnYwIm%hVOyEKBOF
zuUC7Xd_o<0<8>A8>WsBDZL*wMRIDakf4vH&rNwm2e!TjW3D4A%GW%yamJl$(P^dTH
z|F%;%f$NGjFbe6TMqxwZ?7+EDu^d~p`YDU9wC7oiW$)Qb>LSznxYRlN-g|22qd!$m
zJGNuM95R0$DrMd!F0HDH*%ceK$t09z%7luZP_5_sCgY<lBQvu#_U?;r9rvSwv%X6a
z%*!LFIyv3aWhav<JhLov?-8a>+z}<iNFpPZw&4>e)PYxCRtJCoJECA{_Z16g%~7dY
z+1eLrr!@%#)!0tj3MJb$L28y=w&rE$<g`fLLpyNqE<$jQc?7x|N>2}_rKWa9^$UB_
zg+rar`eK0H3(qNw9{Hjtl;)kX<957;XbElFwpG=vUTt%cSLG^ujC1c*EXG@pw=Mm7
zsr2P&JHDsp<Q%tmsv6114S@jHIKG*fkVcFgS?2)a6$#hr#E}ZmtIN8`2C5%#qhaF)
z)!We?&va{im@`!SreVE&fRS51y3XVqWgTcT9j!{mGiL76Lp8!&8<0AwEmKK!%(Cd3
zJhSX0=N*&wk3OQNoB9p}W`@H%Mg588;)M&$4y9vK%@^RRO^KAt&RKGp0LTIw1BnWT
zqtY3v&TOMq+_r8RL?>Ce`HDmOsG>L?D<aoNpZy>^_s66Mt)<)bcHl{u+n@G{`daK#
zl)d(}6}OGnGTLih)C(4$V_o}UZa2-#t@CPDyeWUt5}t9n%DFd|yc%vDy+>trwy20q
zQ)vQ=V?K3>$|xMA>Nl)cM>oB%dRm<ogPn2w(rFNz-w|WSSuEqz!iENYkdkx{V;=uR
znG}hA@vKD3H#l=gjjBy8E*5OGj{C#y;fE}XP*+@GjD+&?LL*Dds_|%WJm2tf`-#b=
zp!=nB!thXD^okBeEEmn4t1_@3V=7s=NEI(wq+0jwRjqqJRNbvD01=y8Y%??Q@=fWI
zB`SzLo4127p0OT3c+eR*>`4C}Ty!5XA@!iBb=(HAG6ZCmPMf;ZX_WAL5a$HFebd09
zattBLxts9ZVa$R>TN_{c^>~Ib^t2@!7w5>3vLkf{AUw)l|6-II*V1#&jU5PW4-IlB
zR_e?)W-@J&Fa0;X`!232d$g+bVYZX9=*M&jkc2gr+%m(7Y3wDJSpx|oJx!@2YaGj4
z`QuIFZn@<!I>BcO&L&oGCeg7_9zH3Pnq_@x!Sm9Qv*)N#W`+hp1|!tlKkFhRm2yX8
zqpDlGCc*YV{Lwbxm)N7vEcasbojbCiHn*xO%ziD&3fxAEqT*bi^oe;J_!SGClBg1D
zYoi^5KpgYZ-u4rUuQHr$>cFMhhtEByqs{E=WbLt?fH&=`t5@NQ!8SZDz_BSDi#SZf
z!w~GD5pSye(pR?7a4#~cH=9S<8(p^gv8`Lxjz=C=_3PK`Csr`2Q6{xz_n2v&rky+0
zu3!9IbvHM~l<AN7V3x(0$ur9$*KIMQ@TzOq=o@adUJ$^;HNYtLdW4)D1gkeum?RaU
zxwB^ni^h%F+gN?Dk~~@KM9y)W>yVV?uzBTd*Nt1}hgZC*YSyk*g|la?T-<ZZuBcGK
zl+>6lX&>qBQ7yZ7tD{@DsJ4Ck66E5?Kq>uUictU`Ms3>Cs#PKT7l~9|tsA*N;+wAG
z1i%RV0dk=$kCB#j>jJNS{VTWfRe=<1B*#=wzJLeR*=6Ob{M;&)Gj^=DQ?qKNs(<fY
z{Y3xd4JU8OH<i+}GFvYD-D}TqCt=b40KxLG$&XD{G9l!NWhKkrl(%S6blTFTE4bF_
zaQ7;liaG{x;-kZ==S1ISVtZZf#|oPM_6xo*_}bTh>jN4`wvs<)iUZCStO2#&YMOEP
z_jhHD7;%heAMWJ2MX_bB8RV1NvdE;ZS3ecc7bJ1&_NVXdW1#x{aD<;Nl~0(kqvYD_
zJEcz#tw#MX9$wsbM9UC$yqf-vSCMtj|0Un~7cJwY=RCJ%k&!Yp33Y1mzakU;)DeBp
zN$~Ayys}|S^r;{=5|j;@sn1!%lU*<+rRS6Xb>B*#dv9#=f50TceB2r*o#Kcw68{-_
zyzor={x`lcY3J&dOZoCKpYqcx4T*IrTaCMVqC>k<7JXjB@*`l{<Lz<Yo0C4M?@c1}
z>)$J9d)XnJ_q{uwD82d`>kNb13V`;Uw?EcxQ&rZwry#d(1n1m$-|lfUXKZ5UTqDeZ
zn`Js|%chQiC6rEe)YYl>+8UjEUC_w4*&>fgs8fso72BlDj5bc^`OBBTlms;1$b328
zQeVvq9K}GImte2=srHrl0oj6|KE9!3%$U7ABXP~6BXmfgI1I}5$GhgRZe|&XUwhg}
zmIq^>zS8G27cF|b^4tH^&^M}t62IBUtrvUp1<qCfJ*f3w9lv{D`sCBE7Zi;;qR&hi
zoE%XeeU?eh^2y4@j!>9Q8ex>%68+>X89R0A=DGiS|8}2sjZNPLXx1w!vCFX}O*on*
zQ1}jV->J@M5k7h}yyB+6JHPJWp-TOJ884VUNk9~d2_{ufwcOLaGZVlhaMPDAdkbGo
z?@sdB<$kFCH-JleO(<jW_7ztLcoV_+7IJEwz^(8b{7v8d=JcIw)||r-)-NI&0D6J)
z+VBGBm3!NJ^}TYlJ*Tl=0uZDNzIfA%mEX8sKQl0Oj505`{u7`%4{QyAw>Ti+*a!~H
z0r@hrZ=3xO-k-nb(MPYr$vddOD%6i{b!)d7hd4Y*1BR{`W$EeZ9p~M7_p^nczBE}B
zaUaL8qq(;Cn|wjAwS+V0g1_7*6JE<Z@2ItR-EnbaU2O%UkJFcVI1?jGue<1U;@q<~
z&cFA*jXrmD#VuaEKLpUW3!^_e=n(-tepz@GvTs{{qkrh<kLPW8{LxQ$b#&%v@X){)
zKmv=w;#BVVD`iq7{!-%9`pTvQj4;YIXrQ_I1xFWu_q#6_U3hWqjt1Da#AgcxZLdw}
z$20r((@EgN$ys3Df^2=$Ng9M(TEbg?aL=S2e|qEGa3rihf)^0ssHnw2>Epyiy5I%Q
zlnP*sFs7W`yv7+<UbSlCSHD(|59s>aHE=t^KiFd3IcS4EKYqUYsQ0nqa5-vUK`!d!
z+Dibi_s}y>kKFmvOA8xnYQ|Da03`JS;|)Ns0>R?l2u7EN3!}jG=B^oExapnZOD^q7
za>g_r+=t480Ilzif+_8%eA2+tE(X9Y%5BI~SRY6_zGGW>&(D80Y1hit3%fcyvTbK!
zIwfGzrj$wJ)~{JJ-#=sVl0C)eo!^*s=9wwf9bj4uy<Y;fWG9QHriKI@EdxB>zgmX;
zY2?H!axiU)-}Uc%;3viJJn@UmajPZ7>)zP(^@bd$A$Yta!woDp-L+Le{-59E&Yjoa
zRP=VuH@2TfKfAnw!PbWioOB2Pc}wF;<VC_82tBsq&ETuIfAb5G-f)V5XGR!p&`Cxb
zK`SgPIdt)}FT4^eEF4UP@tXTJWd7;Lla4a9kEK%voLB^a<50dHdA#uYqX(b(MfQpx
z-FpK=S2oYE6N^BC#*E9nj;mk(-Otj?%dH!6pMJK1&+E=wANfhKPdRY(0)wXA*~m+f
z`Qcc<{k;9z>*nv>vUM&$BsNbNXsh>RJZql+y*r*9{n_Q*sP>n5n`j;KTL5g(XUzVL
zQ{L}@24W<c4nXAJzgUR87}<GrZ)w2q#-6?8qTBEuaH@_v=y1w1@(5b#*s*&reD$>z
zmZm0)YuH=J>j2n505;nWsyvu=Vo-)f83W*bEv_%G0fb7>OOX@K!l`GRkvjF9zgfHW
ztrb;#AjFda6E_@u&N2U6-(IB|_MaEQ-iW?<tvM`duxF(qIfa37ch09p)(h?FxBue~
zz{Qt*Vu{gKJbHBX$n(#)-c*I+O4$A5aDqnXh7~w=hyij6y}+_JWloroQgP;#ZG3=&
zIjSF|@T4&P$}87<b=^8|H2&5{_OY^u9XNM1n?S8+xihc6`U9?Q`b-Lnzjhd|Sbl@w
z6y)O1hfBkrP781tEU~dJ^ktV{c^t3G_wet|@bA4%oH28AD6hb_7SqP+VMomE@U#Hu
z_Wdqs!n(yrkQ1g)-zE_^X6bo;yZl`^0C<7q^rX`U90twXIoA7MW2%<zB5>S_lw5Fu
zA2@$LJ&-xQo;KjzL2tGVzU0CS^_rGHs<19|{CL|mWiu=2HhUij?{ovV!#1eQ@e@*V
z@^Tx;%$oHVn;g6&h}dQy*|4xrD{vS*Bdf+X(u%3mc9+cmq~HDjowhc^$vdsUxdXM{
zvL3x);eo=l7y3PI+Bcja+4}lx0PaJZW5r9CHDyhj<Xm?pDpV)3hL_{F@D8UJ*66_<
zUEXD~r8Z3Qqc*{C^8AkIpnbsBA#l$<_XM_Y-yXR3+H2KA4?Pr^Jb5zyE=zi_t*tFk
zP*4y!apFXvqoYIjnVPD<&Q{sk+1>ZwfB&86aMVCLZEtV?;I6ywda@2L=457OMw^<N
zqOcJ~Jz7yw5h*V(k4~F5E&BZP&#URvr$?cSm*x{+(;7%$$#ez<9Kk_Sci(-t258^D
zeZdJ6CIlK98uXMeDk=(ec6J8x^Yb-DUH6@nlM@3hD=RC20h|3sFgV_~yF8hrl;PHS
zu)4bXr%yfg)E*oFeEr_es|O9>{{8!Pne~i}j3_~^!JibuL5q+FA0y<C7%?JRRaF(i
z7(`zv)drl*0oWReoWSTZj$#mi#MVZF#b{zA!6~gn@DK&~z_<@2^5A$NH#b+MrKRC-
z=Jox_>}AWA1u82mZ$}>^ZBCE}&;s4v-TR(=^2x{WU$aC})&uUs9~@w&j(~~C)^&gu
z6%ZMj053Xj+&BgBV?e(5-h0$#)&RR@kmN~#@oI6pX>btofqC=h=?EG#W{lP+NVe!A
zI0RK9iuFAFMM6wh0vQ9FK&RjdLnx&GUIP9$K}z7Pv(CyWEiL8a#yqbx1g*EXw`SwU
zjgQyY*LR|<r>N)=NJf?bNPc5uV}t+_Jl4Gcl6Uy<;pp7CbEB9!Q3F5$Qn#a?E%^cm
zWgTS*YaSgvXgC&FvSf)~t2lTZMa^fVnGr^ym?g3x*Wd_Pv;%+@+sVfmq=on+EoEh8
z^ROJuLY?y*m_-^|T3R;m*s)_12aoBgYHMqwupb35v>PFi$BrGdMxg-6wit)P!PHZh
z(MRBDhrqy}$jX%~S!A8jmlU{!GZ*H*o{DgkMmQKAZ5>IoX3f%|F_H)Z!Q(&(5(XTS
z=@$-%@%Pu$@kbOwI;sdN^}z!k!NBOzqw%NXg7~{8(ID4D*uj5zl!N~%B`b(2SPx*g
zppSPD+3x_fEr_T(_5l!sC@c6Br5)NwL@BgU?Axq!;LXj=T>li;LXLrY0Em1&6R<oe
z*y9-R9(6=<O+=ss=FguWaK}#!tjQK}<Z-HU(bsY~7bq?+4swcejX)&nG6D2P8+*Yz
zhL8Q6b<B)50taw3pgdu4@J!^nQ#tO$!8Hr!7+Db>AONi+4j|yKF@|*nNyKpt<CJCp
zT>n~ITlJbn8yJT!GwL{X0bCT|N4VB8>ad(>Ied*G>U5v9gQWRRG5*&E95u+-Q<W92
zaX9k9Ns}fiMh1BV4USl+D&>q2W&%R+Bue3AK&C1qgy0c4Qnn+Iq~ysWfBg7y4G5wF
zA4`V?JYD8AWj3d(2^ynG);a=5&`8;bIbE@h5|AikS?f^GmV7tBJY55Q0TzGsr89aE
z--cq)ku%OXL$6VoVi86m9MS8J8GS})5v((M{bEFL$^d+Y2+_6)9u5kZ08XP=GXSB>
zj5H>KL(o{3!E>52(JsodlY<+ndWxb=gn9&vTNI812Q#{6%^JPF;o$1^O&fB+N(z{(
z=WH>g;zKz=J#}T@h6sr5%P?5I*0C)?WMtv&s3Q?k6F2o3fz%`ARF+62PZD`d0*dg3
z%5)@909*qiG7~VIK=esK_H$;GnNt`0&<Hom?!In7ps_!RDCxUj%1y9bA)v#+kt0U}
zhYlSImXwsl&b9&|jY$-WVS>rBY*~a)z**+@#hVc2aRVYiobEUPvGt2>2o6BeRHBl6
z9LNaI#PF9>P*2IbhImCWXyE9GUm~cKd4c7$gwqO(aS&577NNL2QrMU2=;X<QZMmKi
z#8IQ1D=^j(UEJ|=E##uFLFCDRQx5znLBX;S<>eOEDgqQGFtmpyGY)j}PDT2E06mao
T3wV&_00000NkvXXu0mjfcGqUC

diff --git a/data/styles/default/dark/xxhdpi/unpaved_road.png b/data/styles/default/dark/xxhdpi/unpaved_road.png
deleted file mode 100644
index 6a41a413a52d2312abd556b711d5fbd07a47556f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6698
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
A5&!@I

diff --git a/data/styles/default/dark/xxxhdpi/ferry.png b/data/styles/default/dark/xxxhdpi/ferry.png
deleted file mode 100644
index 45ac2a454222b7a254016709976654516c760528..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7953
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
Hu0mjfizo4A

diff --git a/data/styles/default/dark/xxxhdpi/paid_road.png b/data/styles/default/dark/xxxhdpi/paid_road.png
deleted file mode 100644
index 5500fd17fa3ce702184cdc9940d7c3dffdb453c0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9397
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

diff --git a/data/styles/default/dark/xxxhdpi/unpaved_road.png b/data/styles/default/dark/xxxhdpi/unpaved_road.png
deleted file mode 100644
index 749df071a24ead6fbff0573b6f45227233f2b5ef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8348
zcmV;NAY<Q&P)<h;3K|Lk000e1NJLTq003J60049d1^@s6>da1h00001b5ch_0Itp)
z=>PyAR!KxbRCoc^T?u$q)wRCK%{)PZ5GElEDxe66inE9)RjgB=1D4MYYTM8Dz1G&g
z=X>q<T5J7OYM<}Z+BZ}>IMiybIBOlz%G6pA!N?ey3<(e*AtAZRy~$huKIcDo-JNsJ
zy$J#GR@ir~z2?2nzWeNR?zxw&NI!zEuC8K9XPC4~X+vE+P;h~?e1$uNZd2`m(DkbA
z%*x8zFa3T6Sw}M)DQ=;}KVI4iZX4N$`Ro>7>)E9EjeY35SFVnDv8BMdlIav_XGl9y
zTDG(!0W}h2xwH?Y@GVCopdI6g6<dltT!LRH?Nn)47LFDqB=ASl-jSkX<{vRQ?8TNM
zSIKBDkv8>+jVkj%nC-7f(br^d(tFLrR%|IUPIT8wo7DUCj+o^RiS+d0p6PvFY$-B!
z4VOv7k`a~m{|Wvk$^KD_eppVXeOhcOG){asNW*rmSCD9Eh&QfWncq^gx%9x+nqykF
ze>OCBu%)y;7AuUmcNBJXbQI)9qwUfB{MOvuyw<$p!j_W3L+eV%joDK=e*FI8Nhh`C
zj~<=VtKg1NOwe;u@V5`ahp%a$6kCdn!F@s6EZ-<0%tS2K+4%O`dG$-*8@2o6>WNKz
z_KxsX&z4lXx+0M*H)YTfmuDFimJ~Hq9zXHpA?KX6WzfZ+Yl)VX_2wOhb^JF{^gi3U
z9CERx(1RtZuSpwajXAK}+1VLsS+OFrebF<=ZU1ofjE-1)5tUKPY!orlC3Ve;WJyth
zO_6o6T?2`4s7|-|on4*gm{30&&F&aBapI~`S6s1n;H=s0*}1tr*=p_+=Z{GIO>VeD
zLWfjr87MADZk2|MleEy8NOU#4_(H*k$9{LgzCC+KnX1T)#puyYap?sG*2N|57ME%s
zw)Am8<uFAOQhXuI!73~++B@OutKS$p|HggMf`UwoE)F73NN(?Yv3g1Ly4X_aQzYh1
z($cPv82FxNpDkGT*rOLW?ca~fa4BwABs)9X6dC<)U=^>MJRL(F9L##BIYtFV1&zml
z{_;0Q-u$(O?EL&pYw)}j{FQWJ!{nI;O7S6uK3^E~q@}fQTfaWB>L)*%)v%-X1kBWI
znaNQpq%mYc;hi)vKo!ejq<KweFY+!q=$&S^J4;V##lW3YzWtq-2hN;@*_#P07Nw`8
z=$Y!L_)J@@6m99ag~pB}6goRPx;8JkXXN@f-n;~pScV$Ok(ulT%%C`4!TloH2crl6
zWDJpnTX@7ccJk!qC*5=Jstix0?@6(r@JlHj&l`I>MaU(|>4I*N7HSu(t?gL(z1!wA
z)b1P)P0VDo9biG=j5ILd5Q^t(Z<y-Ejwd24Epfz^f5oLGyHC6Oo<EgLnUcv`{<0MO
z1?4>>GPG#ggA{tA^#4&>=r(Ha8*fBESa9$4?XmV^?AFYZfr0uAR{QT(>=dDNZ2NQv
z$F>j9$AZ!+FPQ0B(d@+3c{e;W;%i^e<f7&eQt)@|Fk$_SiY<l4{pBA>!_{FR)IR=L
z@ybVjH4n>1)LolB<$%GOB0{OBa?i0#q&paC^l=i8qw<o+gxRxR9s9!{ZIcsty81jM
z1z&5s4(g|KCb7*e(L2OJ=)LBe2Obz){oJCfkZg|Rh@FO4K)>keimPn0vZIlrV@F2v
zk2%J?<zu^dM_P7lmnkXdDHPcc()qXL;zPz7=>T8;jh;GX>4`soV2$j{0|J<!&GPzF
zDLD4yX(7y!F_r}83vq6kC$G@%NibW_G9;e~XdCFe#V8s%GBRxTMUni93XcbIYkhrW
z`}5C5;s*|(+Z_V@8NblB<*o-59P4<OtS!e*K6%CD2OnIW9SvPMH;d`drQo=A8w#N(
z0||_K&!L5`eeBVa>P639g%e?}48Rl`Au$+Y(CM06TvH6t0%gaa5UIN6+DLwRx#{bd
z!ph3X@QW@^`h}1&wPFuxDOw~)8eDB(yJp6QAN_D_8W-b4{`oXIMjTjdDKxGMuMcyw
z_s_59tXlZUJY<F|n=CFJC{|A!M#qAKmR2!cHa{-y$&}xcs;WrdK)L5dJ7VpN`kJR{
z$`zLAW}7OGBb)xRWH#QpVRaDM9H|#R90`TMVvE(4(n^D@V_Ubz|N66^&6BrVR*qzs
zvPNSt0Afvp=hw6jOy#XxI8-h+Sp?XCrmd@AG$Qm=0xf@lAAsf0VS=4y-l=%Ue)8O+
zEB7ycJFHfaeNhVTI;EFX?CU^`MvL0{sjA6dXGg5_@3(*VbMcONA$A?!(vei@PN7f$
z7B3CXE3a@i^DG7nO*`;~&L1?$DOiBqE2b@{A7bWal63MkONt@8vi^48eb*#*?~YUK
zgU1W+Odr0-@-4PV@d-=dQQCOdPscXY?;30FZ^)oc86|0A6oE8wCJh-G8xR6HB_#&S
zffsj<gct(S(c)r5n;33fqpfo2O+Ln-#6iI^nPM#m2mJlJ-<gRmVhCI<dF2JkyA@lM
zaVHN)$rqYG`lxf`;>8!?Q0N)$lp|SK94YXC{TiHu9|So?&W%Lc(wA2RF$A4cSm^6N
zNT2>}j68Hcq=B)Og>cu_ZIgEW@#(NToLF|xfiFMkR%}t4>!%2w+#-#vzUwC!%Um<-
zG~UU{^0EvLcIGx-{r_NxKiZR~c6MH#k|K_y=}<{JJ1^JuL`w&!^Pj4nnzOd09?nak
zKl=3}S0ox6!?t-iS^C}yO)0i0jgi4j;DBsg_rzl*d+Y1Q;y~+JZR_<#KRd@a-)^pP
zB0Um-<pj4LVy$gu>+iiA4;2LgJ`z03Pnc3{QMk}g2|T%r*IE7K@8{t7dc$+qQe#6J
zSkplcwGM4G&a{Y90GT9i3J&(oNBj1pVdVM=vd1|J<NtK|it}Q1wP7bq-#U85mV~hu
zO*MghUh1EEs`Ow>%ODuwDC+@&Hfa#U-lfd|Kua?`(ncj&98$)QYY&tOU^Rn(Vx1f9
zZU2lzY;uD#^K@xXj=np)I}`DonqNGGb6XG$l^m*Up;v4X;PxpV4eJK@IIH@}CoX~j
z%LfuL19LHGyJ;OwQ&00WO}V(t2)YuXyMsU<hy!3eodak9v8JI9e$A34=i^BL$O7OD
zo3D%AO-SXYzq}i5X=)mhEm6#8EP^os5Y?Rs<~Aj0+^$3;O?gjoXI#!f%0Fo{QkQRd
zvK2!-(8O9dD6Y<tcEpU~hcW)Bv_w3SyW@#RaW^ywPLtW~t+-G!#TI6n(8mQ?ZF%O8
zCt^Hi`4H@mEd}$4bEeqX*ehGa0xt-<;?AU@AKRYs<XmEAr!7ZcH|o<L;(`tW*aEZ<
z()3mH);oa{R7`Q9ka8mB%uZn<2qDqjoY=l*?R4`<0hj?(#Uv*(CS+sSQOD4(AFQu_
zEg?mO1^+N?{BiiCJ7Y0p@1$lTfOPUCc4IIu;yI$EzUKMmLt9{Tzyvon>=}XU4&%)K
zC8e$`cHnkz_iL{dClZM~d#lGZfenoTIU_IwHOYg=20d2?dYm05an}cVkax!MynA|Z
z4vO;a#)GBF!F6GB1J7+Jn&AlsZGhP6g}&ll4yb+p*-;^iDRpJBQ;vW(-nC?DmE$&9
zAf(2^0BagDKRNY?5d(A(bhc+!?9TRf<A;8Ubq<;ik~42&=+REolw&alUB7B|N<pph
zjFtoLU2*0}2b=J~TZr}RKAwabVs;_w$RiLSQ|xF5zhXdmKLP_fJK7y0&8s}VCMQOB
z+b6oTxATG<@-(e^;A^mDb{|WtT;z?BE6R9uzyQCiFr+h1n)&DqGaHZg`T}mFHa9iP
zXHia~2o}`f6*A!7G}_XCytP$4rH4eU&BU|q?R?V7?VN3W=A|)~5}6=bjmwu7gk<W~
z7sU?TzO<}eD^AQqAEKtibf<a30`AQp{Ns;t60HY4nmj)oKiJ~hIUdBwfaA;I(JwK%
z#NgY1lmQ1d=Zd2%(y(fknUHR18_7+12T*LULnd+4rVUtPjtXQtv*Rs%$P`5ZusEa*
z^RT?&-2iCbwrz+*`M!FSIdo<>)qHB!aww&ovAK2=`^GplCidB#9qIxtpqBB2cnA0Z
za|712k7`CN?Zc&6?53Ty-csS?%bUzt)B`{IYOMWiC=>0H^$8~gj+uN9TT%3yX^Bi1
zey9TmX$}B96f&<2*IUkf%|hKwPxM_n-Yhelg>Yp_{bat(9oP@RWe$*&W<Ew9F#f%J
z_Jn=@=zIzyJ~3$n7x#{~wjz@n3N4CE2z0teU0~xwVIjML)*;=|(%emt3{S_b*$$UH
z>S#<Eu%@ZQqH<i&0Zo0<lxrMGBy#akKYdwPj<56S4Q6&=vE|-vA);Y2ASi%X2PdCA
z^g-*b9PNTIZGi!>?KsdJF<*l+oMddbYi52I?x6@U7DwzCpE00s=Rq0c+j6^4eXllc
z2jv6Ne7N=l)VLipJ5VFu-c|&sehtCBfQqKBEk|EB+EQP{#vd@D<3JNhUko{YLIHFT
zAP#`>Yz$lQ=#R9m$3FGp6Lh>;iX9AQLStt8-d2TOhuql$HePTDafu2H5E>Udh9_N@
z>tX0&o!9z?1`qnKt-)YW*Of!Jy-|uy$I!8$ec%4x`?q`{p3axF!O(T{H5h%#)5~4D
zxJMHLrj95!F4cTzcQiMrJsxW>^qeA~3mKhoFn|Dk@aY38q=5l=ZQsAovo}ojf<qSD
zFU58NIfBPrNjrzu;gbgwL%SG#J0Gv8YRn!FcJA01FT0??NgU3)gSi~WG7@-QoR^#5
zilqD+{DDtkBw$Tb-Wwd-mwaB4v6u^D#P;qru|R`QtaXFp>KtiD%ot%9ei;XJPH~~`
zf~CRKm@``oJUTZ&ueJGreCDW+t|v_;5Q!(LREg80j3+Q~IbiDBeH2rkaFkIw*J`#+
z>mK>x1vfW8|MUxN=f}e8m^KX?&C~u!<Gzg1DJU|RBjj7yo7n-6fy#r8gO1q)BfdpJ
zBLTmLfJ_dw-6*52s2F`<KQQ+4=tLU|?gui+*dCLfpVaf6X*^#iiU~ge`XdIfu(-HU
zz62Xo?6}-RF*kak&;SEJ$ge!c$ehCA6-DG9X{WGG&(Ux=spU>u`|AhETkGpgT>AwF
zA<-@$9GILOspErm(xa2HlVMWdosq5wr^m4+Z5cPIO`W8_vhs3yiv@x=TSALnHfjvs
z$L7y*l{%axk9=akz?1=Nn!1{oq+7Ocr$P#D-nP~4)1QqYrXNjHPxC<AK-(aF=j(om
zQ8H|}|BP^4dXpK&4ty^ToHoszp?Jo%(>W6T#*G^yU9z0muy5@en{~wdJRC!3oWUdS
zmxDL!QS5Dg8sH6>I!zwJca9)%Si_0R92CKzd)jDg$LMHoj%<11Ime%wsa=uUx8I5!
z{Oq%o7`DBgPdd4sudQ$Ag+9LY1YCa3*<oLJ^6HD-$PQ_kIw>E!OFxobQW7n%9I}01
z{jOt8GO{bciNOzWlp*8MCQW@?9^`|3ZQrzhedOc+dN@)dU->v#S1((>1}_%<(=JoY
zJc)HYKOcT_@bZg_8uLe2p^ibYl>+&+D+?d?q2RtSa{8%jP(kOLRI<GjT0e8aNepAq
z1k#>dWQGTw44QET8&|zUt|s?YS4UzEvIGi~&v-B&%>xZPVoe(X7*=C$LHXM8I)#xC
zAHye1s5V~&K)mjNd&Ke<bO6f;V55V&zmB}*(j88+I8i3IKBR#ic@l%6dDIERh-_>?
z2$;dUSkp%6^Fmw3&^c(D@}6Qnvq57i03JGH#-~2%khM`Jvv<N_u|J~J#>J<c+Er9i
zyx&;JsF@`6Kodw)ZYPJnZm>h2VAe?KaBVd95|1|UYk1I6H03tdI-0ii*cX>6`G60g
zT>Aixiy8TDOQLe_<;i;n#v<j#e9%h{i@ix0ZDeYU?*UG{<g&$>YR*@WB?tngX(k!b
z0XA1z3bUXoSb~~9u%^W>MbGVPpPKg51yAc}n)(<IXkawx5Nq1-+!N#2DU(0Q9Wo?r
zz3yIYcdDldbiv2ma!ajz)wshX=@tWW6oo(<7!5OmSkDsb+gR&p+aQ0?(T%Z!^bwCS
zKtm5eebR>M^P=_5q!XPJZn|Z)k1APpQrDFIH)l2!mQl;b(em<~@u#1$3`ZW@9UgIF
z`^b||47uGX14iSl;!Nv?<y*e^_E@fb`PBA>KJ<yZ*;+9eQ)AeoPv4}q4ru(02K<*-
z4&GKe<4n6$y5Fsy`Yli`npl4ZY75d6ZvE!R>z6J$56R#Od>izUhYT9vQIj<FprgT-
z(>|x5ATsjeIg#>7ljMGsGdFOVUibd{kzIdXVG0C4w!QY9iJb9*@}-<N(k5Mh!(Z$e
zs*iM*tG*$<nJrTuewNw_>=#X(7#%)t{Krso-bQkijS#QSiHw+u5$i&LM?NwA5W^4X
zXhD8t!p*lt%1=B=jQHHYoR{+QBO_*A7^%AQDw9F)UYuyoVM>k#TrHt*@G#LZ_Ttjg
zy~D1#F7O7PsIHZIb~|x;#de)87Ob8haJeoz?an*jlOHNbI6r!&(_(oX?4*uY>Lh80
za`;;AgaDr)-yN43om*NejHDmZupKyILS*2HCwg(TKhnUOro9s-HC~d}Js#}L?@b9l
z{kGelPxBj7f95DOPARq=4P16E(F&R_nm8$X@@1F3hE%YjKb(*i%`r<yx)_5_J~^FA
zpU4w3qcP-TCr(^ldBs&>Pkq)%9euA`Qi|<ng`?ta#O+LvzvBnn2UJwlVRoA@U`i6^
z#G!B|Cn)I9PSfC_6%3K*gWNUR&O!H!D&-j%(bqmSO@B7lI+~`Q=3$)J806&S#7?{K
z{=muT=JkrsPt)CsEk^~n1mDw2n#N7?v+w-ri#W<S+E~XxbN%I-3>(k{=m3EI^feDO
zo=(jKcuyO;unPjpfYH+BtNn1RH~sqSU&<dbLT@Ux8tBzhzrfp(-HPp6zbKdw(YdT7
z8gSNGT_?_*^|m=#;--P~&%+pu=9$rfshS)kM@O)s(FM<iSi{~3p1n>7Ew!~Nei_5K
zf^Tu4X)-jAIvPU{eK|pyyoOd)t*`plw*zlSiz<@+gS0^KEw&sT6#Dr<D-le-@7@iS
zRb$p8Asl%Y3fMH^dl+<@#=#{OyCOT^58GXdPr1)sw{)p75%(T8Gy)1RAJT^D^2wu)
z#*m@Vc=rw*R8e={ZytRs&9CabBz5yXm4UqtzQuNxFj8E``$BeZe)i1YKKgcr+=8{2
z6D}n^!Ke-2+B`6I%a=#?ty||CABEoW<{OdLx;oEJ+mmJvwtrhrJz|UrEx)j!`GQ|9
zd^X@=cjmTJh&R~@!tfmka*{Ykg#RurKS-%#*RJ@>*Ia#Fb7RvW{F06wU89Ou4iF5|
zz?p!yub4bJQZf1DNU>Z&CS+;B(ow&3Nu<RsH2m5AwY{I*&Oz(rJcQqh%E^hw=REk(
zZ_3X)Ctce2%eZ}aAUY0Wgn|_OY*Dx|OsRF#hWJbK=YOfatxbMjF8Pa;EI^oTkc_q*
zr7i|+4pkl$mlrNFYdUBB>%Tod?Aq&mZ_p|Gx1`Wdt9~Gvw%D+gg5MzM{6H@vz*p2>
z|K>NYJJ@ufTo)YAd;qYO!mI}dkOnpYK4@3o<6^qLGxlfeOA=f<^73+9XWw)0?<+36
zC~ynxBpt!d<ChW>dxf-+X|b`ke_h(tFppSL-udd6=hScCJ`SI;q3CFSkgk}v&EeF?
z1i)o8aPffBhB^PU@M+whuye5b_ylHw6gu6^_ssk&;fa%kB$6k++oX+6a=TM_PI=XB
z|8&wPOO~F4BgBFu5DNw?(!hRjr1Vi>%xL6MIdWvptlvKRT6FN>u)Q?W#pAX2NTEY_
zA5hegaj{_}iIoWY7inSNA%SXS(?kDRv25YOtHlVviI)7CP$ND1FQ&+n2G(f6r1NJk
zp0?orb@G5D(hUP#s^f&XB}~ar)}vy>fh36?${o^hhbR=9tE)R#{NRoYYHMmvfFf?q
zVkDAisNLZfdM7~%BwN=V=iGVsD+A69y*JI2u-g2u<iDDXp5R`MS_(cwf_zijpmf1-
zUt!mxMfuAf{ExZK`}X5NnWe=nh*ESf0UQ9#G9C!h?#xRU2lErYoOzn0=^q7#j7vr|
zC%65ydGlT#|DEsFXZX|n&0>y|;by_T0_M_VV|PjUh8P}~iE*N>t#i}Qe>UucXa97G
z{E|W*29APbmLmzQ?JOAlkp}hy7M26B^(n`4fvp0H44&Lg?3i%&S<5DW|Bkgi_+LME
zi79^M7P!~ITzlm}27-FclXh;V4)9}EJDz;9yn4|yXYARzvx>#UPjUkIDNs=Hn6NF^
zN5`4PxJf1sU4xRcvWAnt@P&7)zIs!AbU=B!orcN9eZfq|jK<79Bw+4`<V1=-Qyg3;
zE#1i_CC<T5suLT3y>Q$oi{CxFy{)wvwLuk7aLjlOtQ#-@Qu5F@e3`wtPs2^G{D%@v
z!^Vx<eB8CyuO4#g+*q1>8*pR82g3NR<bsppAw%kj4#Axi94En>rIq#6jcgaYcE9ve
z!P+N&H=}mr<_WMz!O?<>YscUP3G|OWZhZCWKfdd|qLWUNhn0GC{OR_95cuz}{z^t)
z;65uhl97TJ3Hk?VxWw-<;AHyg!@n4~^pRg(Ex&P+gQbNRMSe4xJiWV^dF!oDRo(h6
zeB#twz=s2Wl0paGV(zWuJ}owraA*1T(jQJ<PjKBcPv`&n$3OlOY<P1EGnT~#-=p27
z1M&;L|Ibg1`qGzsTckR1f&Y(Y1N<KjI4s3RqEc|Ye@~ZoxwN!fMA1os^>^Q0x$O6k
zUxArzPM(5OwuY{@S)--kQ$9E6&1v^PP?O>$v(7<LdqdjmQfTa>4;vh|Vl!hYIxc;2
z#V|`+#xos1Z};k@b1vSs<Fhd+HrH>RFqe-(l|w$8`|9g2%75_FlLZ==+_(q*t`s@r
z`x~O)YtXs(+DWE{Qh1#FW=fkZE#3WxNYm<7or`X`;p^C&;HRUJES3uZXn7t^`dyLB
zAAb0eip>6FADDk44bR7XC`Im*U55C|2+|HXBQF^$$>7$B>N+Vpe;sqW^e0L4-S?JF
znU+0f>a>-cKU^ulzLq>$A{=%f_}{~ZjTyTkO`)+gER(iP8XlhM(aj^V=`-lb+pf=o
z%79y?EtB>Oar#SXoUq+uOuhYke*@E8peQN#(x=~k`+JJ*M=q2&k4t+`+EFVs5<4oz
z))kQgtd;(|ny2ZqY16YYdohdgP$NLz8RnUliXoMsrJ2>s#s5m}?`YCTz1Z&HUl1Jl
zpvXz{=B+RV7A0WbOqw+JvgIMgONi{n5cv@o^^0Q5?8DwT@JXX#S6tN`&B^KD%_J0D
z67L!{|BLk@6<Z;G!=Cd9F+Dt@eo<_9Xm14#F)H6$8$WH@O03&)dBJmrBaT0zI)CW!
zuoL_{LH>>wzuy$worN2N3Nh~TE7xJWhrKoMm<wiB2k8obr}*0zB0nmkep76B^no{i
z2G72zMV5~)v*nY555IJ7*b*U6$@f3#Z^g#W!FL;oCz6JbsoIQLT{>XE-hy$*`R>i#
z68Gw3tHXVG`c<*zt&bb@TY?5%b?$j<aU{mb7hywgo$ePu^0a0DgML+Pw>*Js@z9ww
zcjIPM<>{yG2q|TteTdBw5%tGne;hRO0jHdrklQ4kgU<~8Vm|JD^h@ZE#oi*7^1aoG
zXF5iV9lNn${P?i-`qO?{X-TTz6<gL@T={JcD%iA}ZeA|`879t?e$XuT-tT+(DI85+
zzbm#|jLkts8FKj*VfUW51ljcm{?RBlW+fV8n-9|k<4Q2sZFzh4><OINVV{u4VzDi*
z5BQ^R#6e?RA&(C9WwALJ77+u+!<hNf3Z&s4cCj>kC`=3<8s&zbKYu<x-a06)NAUXV
zuj39PeIZUzLmcFV{BV$YaClIJ)%Sn`^%Q8Mi)$xI8L^Jxr>o`0e`90g+_JK=bG0Ch
zj>qGl=H}-9x21z^Is5_R{;cjx*Yv?d0}zA8xdVOYzHU+%vR(lOo(@<r=yC?wSnKGw
zuPL0^0mB|L78{t2HXeT9fd`h#qYarplF%Wu`Zd=-b7MSVoA~ez8Dlah>S;b~sLz=X
zTkV@;gKkCuhhd--qH`t%OrEW$`_#92=#xiGpIM6+FYXvNY}lq#PB~?=>@YCkAV@4(
zvg8l5XV2a$3h+aqFJdhNt^2UiJT23F%yjnY7q%HeP_g|Sf`<SA%E=>kq)9mwqCBV%
zK4l*L^2;x`)zs8{IAg|)NJ&Y_a49-ugsy%2_N`g4V8PQj-gqM}&zTebP!E_gV1njp
zzgma7z|_|~O$XU|I(`b|F#-00(a47r_NhZ2b^S1O04xe^wJzi-{L!OFN5Arwuar-p
zKD})7=FKe&7cOjAvt|uG9p^d=Oxj*&$)}FSh^6Izwv^j4+Coklc)q{^*+M;V>e$7B
zO%TsMAle7)(5DV#k+1tfI(l%Rdr}OoPuj-FrKh~K#r9i9I9Or?2B1%{Y2CMV=!Y0`
z&=`#7fe!!=KpoJ~1ps4Ex(`0Uj}JXIqa-i%tNG+n#}8AVm^!otKNS3mO#>Rk838mK
zcv{9j<+KMMw5<!iAJ7h1H|SCZn#HA#o>}A(Lmz-X?F_@^f!4aDi6LkH;1MX-Jj%LZ
zI_M^F87!Rrb|#;8>}w1e`m|*qJey{pSnC+&kQWYAW70H3UpLM7E54sD_T2#b);i=l
z8Ue2yRDjrHLr*sdbe}X0(Dy5{pPuG{M&iH#_MKj4ul5Xw6^p?Fkw?DnYaQ_Q!5~dL
zV(6s>4l1ppr9e9r6f`mUz-%xjAGF^=0AGXF*R<9FZ4WlA&qC1$b&2&s0!@9$*=XA<
z95#^NIHW&dyYYa)ucjHtwq+5>ryeoob|3nb`C-2zLQgmP>{A>xkUk9(;Eb_@FwH1u
m-w(5>kg;f_H3ogu;Qs(iZl{MigDw960000<MNUMnLSTYEsZzE8

diff --git a/data/styles/default/light/6plus/ferry.png b/data/styles/default/light/6plus/ferry.png
deleted file mode 100644
index 41e6ea7e9afee56847d95f51d51f38fc38213f8c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4956
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
akNzL!P$2!DWN3T<0000<MNUMnLSTYHldz}&

diff --git a/data/styles/default/light/6plus/paid_road.png b/data/styles/default/light/6plus/paid_road.png
deleted file mode 100644
index 326950f0bd2f9632bfcea76b8d2f49db0ff12607..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5240
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

diff --git a/data/styles/default/light/6plus/unpaved_road.png b/data/styles/default/light/6plus/unpaved_road.png
deleted file mode 100644
index 5aec4c69b5db8a7355d0815f5c19d43a8e4bfe1f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5036
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
CkM*?x

diff --git a/data/styles/default/light/hdpi/ferry.png b/data/styles/default/light/hdpi/ferry.png
deleted file mode 100644
index 30d718592e6063b6e305df8539c80c08e0a64ec2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2678
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

diff --git a/data/styles/default/light/hdpi/paid_road.png b/data/styles/default/light/hdpi/paid_road.png
deleted file mode 100644
index 1fb9f97550aa1fd0e716d12699a86ff6a2ec3b48..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2827
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

diff --git a/data/styles/default/light/hdpi/unpaved_road.png b/data/styles/default/light/hdpi/unpaved_road.png
deleted file mode 100644
index 197f839f750390f3870d83b55872d6cd6b983a46..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2673
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

diff --git a/data/styles/default/light/mdpi/ferry.png b/data/styles/default/light/mdpi/ferry.png
deleted file mode 100644
index 2dd0769d74ff92a762c8c9c4e97343fb72a97714..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1516
zcmV<I1rz#-P)<h;3K|Lk000e1NJLTq000^Q001Ef1^@s6$M?IS00001b5ch_0Itp)
z=>Px)rb$FWR7efAR%vWhRTRE&UZ)+pm(t11#1;)>X~6&z3^7PF5|;>+#2BNfgn;_P
z#1In_Q;{D+gIX1lXre#G3Zb$DLo^Ku7JmRu%N8~(rAs<krpt6nX=gg~7QgQ@cX%B^
zYJw;E-Z}T4<-5z7_eK-<5Zkt^5V8t*2B-i6fCc;obOTMmAx+adq5r#pU?Fe>n5rB?
z;GDZLX_*cL>zJzt-UBp@<B4!M6#M<RMB?1JBBQsbMALLjuPBdZFI;pZZ|RfSS*4{F
z*ikm(O<*gq1!EgJEt7~)G#{S*z_YN8SjUwsqn~UGSi{3bE^Sh1x`1WdLi2hf#kHII
zb1G(5g20uku^M(l1*Wr6m;ncY8rWllJHPBRo123OR<U>2h_Nh7<kYNcFIl^8CUQIo
z{vLX*N=jEj@hzC#3>^#CZj6dQJN#)9tXhzenxbsAh?L(3nZD?;?in9^7(gzMas%{E
zrf?U?w;zIfpJwFSZ$hH|ieIjP1)L-->?BF~C4DN+Xls3NWM5+k>q54ob{P#x1kK%K
z<I+3gO-&Ee!Lvt@1doL_wS=;%0WL;qF7W1$4Rews(H@wEz$QSrP=F2a5?~K)t1D!n
zBFUOJUzF`TD7--Ft_H!QAy`;xCkgWiw(Zc4?RZLg0~~r5%;x})8H@ELJFoh6b?%r<
zhC(9x^;a^Q5AKS>VroHhBI7}y(bhK8HqD5p>(en@N}?r<i(kGxgi3z?<lS@UisFsD
zvdNP7+8Q}wbasm2x{vrHn;eiDu?CJx#Jak|xxpZbmXL_A6cO*~<T1)s8<8O~dSJi2
zclt7g^|g{>VGa&uy5yKU;u6eI$P~dK=K>`1(K36lxz*7WzVoio@(bkg(8nZ|%rR}x
z)64GYw?=P>;Z3y+6BFS+y+B&RN1`#>T0y=cFBrBFjS5fY?DU=Rt-wX7w}Z0P!km7i
zHFT>{P{);<$5W(?v%ULixyvg|CKB<JC(<PJse;O%sh#aVe&V=n78Bj+4#-<!i7<&;
zY30tF?=j$HN5xuNgqcX({@rli0TQX=PEsqG6!Dgma!2&%&aO(GoM<J{Q4+b!${w(C
za^kWe&N+Vil-!B4kg^qtj7333JaOi<utrC3wZGRJb>-!$Z`U#2D+7;1JsvrF<ibE*
z-6L$b%*$5|A>;A*S3h<f*uLXp!GcHUBJ?occPqIg%IAEPJhd!n`+N~L1<#n;X>(4^
zD}5)w9-I}<pTD4zH6dT{A$LRryZROCc{4WN_s1(Q7q~`7^0|wtNP2hJiOcVgRQ|Br
zcDdc9$lZh8tY!@-Q8~sffZvSA``cH)nqv?47cuBwA{PV_JrIb@ZrGzpt|D(Sh~%$Y
z9UZPk>xJV5U_|$Lyj6P}jcH4t=wc_z%SIt;r_Byk$2oodo0qC~?{%eiavgP+D-zhZ
zcf<h&h4`=MXMmpzdtzXq>w3d3Bl1&YrS3|ti-d53$o9Uzrro!0{d6u4Q<Mw93Xt^3
zQR<OCI_D(v+5ek?4FJEC!W<v(JO5%$p|~-c$8i>psd`VNrn}uG97E#3r@+S`nc&2f
z1%%}QKkvPOeY3l({nX+`b{mk0M!Pu&xdhY#Gp1blZh<IL3E;Xc<IKwC!x!IvD}*sm
z?k2#`!2J^xJPg?3reDqvpFMMtHsrhe$B?RoqU%^WKG5Hp92>hv8?xg6AezO>mTAUt
zgh`lu+ZRujDE&K1C9n%Q$L|!oZ5qHoFGc92LFluZ%jJQcWt!$OXm&aMjAK0WnE#J%
z<{uUcowON9<fOo4Hz2jo=Q~<mT|E+u#g5h2*MHXB+?;@qc?9FASxb?n-(rfHS|!lV
zOi~MBj7sL$li(kFr=83g%XmcupA?P>wJNnjYR*$DApwghBBe>nd9@&zLi`QXJIQ)P
SaS$s20000<MNUMnLSTYix!`^P

diff --git a/data/styles/default/light/mdpi/paid_road.png b/data/styles/default/light/mdpi/paid_road.png
deleted file mode 100644
index 0de80df491eda43508eeaa3aa04d1b0aeaa012d1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1603
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
B{WAan

diff --git a/data/styles/default/light/mdpi/unpaved_road.png b/data/styles/default/light/mdpi/unpaved_road.png
deleted file mode 100644
index d64c41d2ed55999e3ed5417f873b4b21ee096d09..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1515
zcmV<H1r+*;P)<h;3K|Lk000e1NJLTq000^Q001Ef1^@s6$M?IS00001b5ch_0Itp)
z=>Px)rAb6VR7ee#R#|LRRTw^Vr`s${TP#qEQb8IQG%=P62&IZ?AQA<|peDr>ebK}R
z11JIEMPrDsED1|^K#at=#mFMs5Ywm;M0^m-)^<7+3hh*AJJUPso$L3V-hY_FAkLqB
z{r~fye?RA*sZ0F_*|u$9dk(M+XauGL)j$;J1I`2A0f$^J*C2S|ge1#>4&eV#5=L8r
zNw>@7x_JY}mC$_#Ea9G=$&4gI!ONpRwz;kIX9DTVeU-{TAyzW2cDS^$G2)%w5HNhc
zd(aWPj{vQZzou_4jZ1_iGqHIXs6&ESq`kd6x?}4DhGiAOIoD6iuva#uqFImjR;+tB
zQ(RtNizQW?VgHdfa{gq!olcHJUuPu};eqw*Y*#2WIbVX@09r;7RwknY>o=VC&z<)$
zbnNa;`0f&0Duh0VP?t$02Krxb^&7ptlU)Y3r4w-P%9quoPY-CWow!G!GdFA_A8&bN
z=-|OKPQdLb{z(b06G5>8ie`+<48OO=<&K#iI%nYo^DbVZ46j#tnx4)kpbck5&hE{<
zyJwl57nrOF;04iBGaxY87C=RRI@WE4E>40@Wf;Ig24kVDe11h)`FxtwhF}um40dhP
z#u+G@7o#3n3Fuj}y}FELjSOwy_7IhlL;}HSOoxhfLfBBp1i4AX-iXCYQFMs0K&|}4
z0+v&Vb$4HOrBZGNxCIEPlO>ZnQ92gWoELy#m%^p{>-+cLi=t4CS_B?oqWMf@9z9aT
zSxZ&<xD}0zjm$K&qmr(2IeqQ$KzSw}A3(?wU^Wk|22gQ)jC%f%d3sE$PZ3<m8Xi$b
zMWsqz`)8~}*|>?*PZt`EM%^9{cWc-Y-!7F5^;UBJ`JgMrUV1P**3sbLxQ^(<j>MPt
zT&ISIQ;ZF&W};C_w%-?*v*Elc%NdBA?(5UR5|=LJ-4}o1u99NLCz%xbDS7Ujaa}5s
z>d15D<k=3LDA{pZbFr6>^|;_eZUH3~6=jSK>gO4q1RnG?H%H79$Mr|YoqS}rx2r@b
zq^zEv8y{>wL+EhcwlN_v#o7Ly9UbGs-!Nxl+PSK1U0+jYgfa^9bTFtZ);3P{>`b~6
zIq>3&3wSBmQ8)NSCi)T>Df0PheDfCsIVw5{mjL8tOP8v<cI{D~6)%k&os3X8i>zAp
znv88P;wuB$_*CrXV(NzXy-C~vRx1}GS1w!noKlq&m3P?-dH3m)wk%cNvg%B6pnMua
zjsSZYTW-Y%kT2oRPq}~JCl@e6-c{XMZbzd(990%R*3lz}bw}JI#Fj<*8W#quSHCfx
z!9knQNSH$Qn?&1-u>Kw>j$iHTJooA=(~B(2O`|&zQt4#griH=jA8xtZIh#Y!J`b7C
z(2Yb~AXy98KEOx}4TZYie#@8c>8Zke$GsE`%nHeQE~>OFF?G}C&dR2zW*UZ33iS!#
z86@F9F`BX+i2{z#LOuWlAg4yVy1K6H*ybHQ{@XMJ88bt0-G#>!uUWIMvug2@T9?~B
z!HMw=cngx4&ieKY32K2a0HI7Y*nRfo+y?v4c~97<z|U>o*oE5_69e#mfD<X4;P@D@
z4HyCJt6zO}`qZ4+_8(0P;`sfFPzP!URs(XK3r{2-2+{)B=|p1iM8o6u6(r;ubP~8_
z{Nh(IN3dexDqwf4eJ7ZTM0zQMS_=+#CkF)G!^qcu{pBy54gWL6CuCRM$*<sj1l8lS
zZk)~Eg#?k8L3}uG>iDYjCzwBvexQ8k&YeGlo4Dd!t7J0yE%gA`w4*)!=zrUD%MH%k
z!*8Mjm<Vt@eD15;+S-~;)7%jbhu7BE*Yho-p8NcNo%Zx&Qhu~dnoTGIIiDMXa<L<`
z0D<i5ZxwnzErfNG%%AVvJ#8<Eu&0S@A~!f?DS%vv2^d5Y31<@Or67n({R_-$f@*f_
RL|*^^002ovPDHLkV1nL6(tH2_

diff --git a/data/styles/default/light/symbols/warning-ferry.svg b/data/styles/default/light/symbols/warning-ferry.svg
new file mode 100644
index 000000000..6dc6ef60a
--- /dev/null
+++ b/data/styles/default/light/symbols/warning-ferry.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="26" height="33" version="1.1" viewBox="0 0 26 33" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <linearGradient id="linearGradient1" x1="13" x2="13" y1="1" y2="30" gradientUnits="userSpaceOnUse">
+    <stop stop-color="#e8514e" offset="0"/>
+    <stop stop-color="#cc3633" offset="1"/>
+  </linearGradient>
+  <filter id="filter1" x="-.0882" y="-.441" width="1.1764" height="1.882" color-interpolation-filters="sRGB">
+    <feGaussianBlur stdDeviation="0.55125"/>
+  </filter>
+</defs>
+ <ellipse cx="13" cy="30.177" rx="7.5" ry="1.5" filter="url(#filter1)" opacity=".1" stroke-linecap="round" stroke-linejoin="round"/>
+ <path d="m13 1c-6.3513 0-11.5 5.1487-11.5 11.5 2.4e-4 4.6124 2.7473 8.7238 6.8871 10.534 0.76685 0.33537 1.7261 1.1233 2.097 1.8742l2.5159 5.0935 2.5159-5.0935c0.37091-0.75091 1.3301-1.5388 2.0969-1.8742 4.1398-1.8104 6.8869-5.9219 6.8871-10.534 0-6.3513-5.1487-11.5-11.5-11.5z" fill="url(#linearGradient1)" stroke="#fff" stroke-linejoin="round" stroke-width="2"/>
+ <path d="m7.678 7.9092h3.3009v1.4338h-3.3009zm-1.827 3.3765v-1.2257h7.5392l0.85568 1.2257zm-0.99443 0.90193h16.073l-1.457 4.6253h-13.043z" fill="#fff"/>
+</svg>
diff --git a/data/styles/default/light/symbols/warning-paid_road.svg b/data/styles/default/light/symbols/warning-paid_road.svg
new file mode 100644
index 000000000..0a468cbca
--- /dev/null
+++ b/data/styles/default/light/symbols/warning-paid_road.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="26" height="33" version="1.1" viewBox="0 0 26 33" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <linearGradient id="linearGradient1" x1="13" x2="13" y1="1" y2="30" gradientUnits="userSpaceOnUse">
+    <stop stop-color="#e8514e" offset="0"/>
+    <stop stop-color="#cc3633" offset="1"/>
+  </linearGradient>
+  <filter id="filter1" x="-.0882" y="-.441" width="1.1764" height="1.882" color-interpolation-filters="sRGB">
+    <feGaussianBlur stdDeviation="0.55125"/>
+  </filter>
+</defs>
+ <ellipse cx="13" cy="30.177" rx="7.5" ry="1.5" filter="url(#filter1)" opacity=".1" stroke-linecap="round" stroke-linejoin="round"/>
+ <path d="m13 1c-6.3513 0-11.5 5.1487-11.5 11.5 2.4e-4 4.6124 2.7473 8.7238 6.8871 10.534 0.76685 0.33537 1.7261 1.1233 2.097 1.8742l2.5159 5.0935 2.5159-5.0935c0.37091-0.75091 1.3301-1.5388 2.0969-1.8742 4.1398-1.8104 6.8869-5.9219 6.8871-10.534 0-6.3513-5.1487-11.5-11.5-11.5z" fill="url(#linearGradient1)" stroke="#fff" stroke-linejoin="round" stroke-width="2"/>
+ <path d="m12.158 17.427q-1.1685-0.08059-2.1357-0.69846l0.64474-1.5648q1.0343 0.72533 2.0349 0.72533 1.5379 0 1.5379-1.0611 0-0.53056-0.39625-0.994-0.38953-0.47012-1.491-1.0208-1.0947-0.55071-1.491-0.91337-0.39625-0.36266-0.61116-0.86636-0.20819-0.5037-0.20819-1.1215 0-0.91337 0.57086-1.6119 0.57757-0.69846 1.5447-0.93352v-1.2156h1.5379l-0.0068 1.1485q1.2357 0.12089 1.8402 0.60444l-0.53052 1.5044q-0.92009-0.65816-1.9409-0.65816-0.60444 0-0.94024 0.32908-0.32908 0.32236-0.32908 0.81935 0 0.84621 1.8738 1.7596 0.98724 0.48355 1.4238 0.89322 0.43654 0.40296 0.66488 0.94695 0.22834 0.53728 0.22834 1.2021 0 0.94024-0.60444 1.6455-0.60444 0.69846-1.679 0.9604v1.5447h-1.5379z" fill="#fff" aria-label="$" data-font-family="Trebuchet MS Bold"/>
+</svg>
diff --git a/data/styles/default/light/symbols/warning-unpaved_road.svg b/data/styles/default/light/symbols/warning-unpaved_road.svg
new file mode 100644
index 000000000..8d68c0740
--- /dev/null
+++ b/data/styles/default/light/symbols/warning-unpaved_road.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="26" height="33" version="1.1" viewBox="0 0 26 33" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <linearGradient id="linearGradient1" x1="13" x2="13" y1="1" y2="30" gradientUnits="userSpaceOnUse">
+    <stop stop-color="#e8514e" offset="0"/>
+    <stop stop-color="#cc3633" offset="1"/>
+  </linearGradient>
+  <filter id="filter1" x="-.0882" y="-.441" width="1.1764" height="1.882" color-interpolation-filters="sRGB">
+    <feGaussianBlur stdDeviation="0.55125"/>
+  </filter>
+</defs>
+ <ellipse cx="13" cy="30.177" rx="7.5" ry="1.5" filter="url(#filter1)" opacity=".1" stroke-linecap="round" stroke-linejoin="round"/>
+ <path d="m13 1c-6.3513 0-11.5 5.1487-11.5 11.5 2.4e-4 4.6124 2.7473 8.7238 6.8871 10.534 0.76685 0.33537 1.7261 1.1233 2.097 1.8742l2.5159 5.0935 2.5159-5.0935c0.37091-0.75091 1.3301-1.5388 2.0969-1.8742 4.1398-1.8104 6.8869-5.9219 6.8871-10.534 0-6.3513-5.1487-11.5-11.5-11.5z" fill="url(#linearGradient1)" stroke="#fff" stroke-linejoin="round" stroke-width="2"/>
+ <path d="m11.91 13.481-0.31705-4.7458q-0.08917-1.3871-0.08917-1.9915 0-0.82234 0.42603-1.2781 0.43594-0.46566 1.1394-0.46566 0.85206 0 1.1394 0.59446 0.28732 0.58456 0.28732 1.6942 0 0.65391-0.06935 1.3276l-0.42603 4.8845q-0.06935 0.87188-0.29723 1.3375-0.22788 0.46566-0.75299 0.46566-0.53502 0-0.74308-0.44585-0.20806-0.45576-0.29724-1.3772zm1.0998 6.5193q-0.60437 0-1.0601-0.3864-0.44585-0.39631-0.44585-1.0998 0-0.61428 0.42603-1.0403 0.43594-0.43594 1.0601-0.43594t1.0601 0.43594q0.44585 0.42603 0.44585 1.0403 0 0.69354-0.44585 1.0898-0.44585 0.39631-1.0403 0.39631z" fill="#fff" aria-label="!" data-font-family="Arial Rounded MT Bold"/>
+</svg>
diff --git a/data/styles/default/light/xhdpi/ferry.png b/data/styles/default/light/xhdpi/ferry.png
deleted file mode 100644
index 2b92d5f715b444cc51a4654f2a55b8f16655acff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3830
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

diff --git a/data/styles/default/light/xhdpi/paid_road.png b/data/styles/default/light/xhdpi/paid_road.png
deleted file mode 100644
index 891803f6a5b66f2924fece6e2bca3eb80d56f646..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4133
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

diff --git a/data/styles/default/light/xhdpi/unpaved_road.png b/data/styles/default/light/xhdpi/unpaved_road.png
deleted file mode 100644
index cce18e7c2a3be54e2ac74f6346987163db9ba9cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3918
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

diff --git a/data/styles/default/light/xxhdpi/ferry.png b/data/styles/default/light/xxhdpi/ferry.png
deleted file mode 100644
index c037300cf9903e0c13f396580c99a9067f0e547b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6602
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
IM6N<$g06Ekwg3PC

diff --git a/data/styles/default/light/xxhdpi/paid_road.png b/data/styles/default/light/xxhdpi/paid_road.png
deleted file mode 100644
index ff0de2e61726232d540f35a14e482436c1de4b04..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7071
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
JPDHLkV1jFZ9+&_C

diff --git a/data/styles/default/light/xxhdpi/unpaved_road.png b/data/styles/default/light/xxhdpi/unpaved_road.png
deleted file mode 100644
index 440df9a6b8eae9be2f838446e46166d0761d33a8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6900
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

diff --git a/data/styles/default/light/xxxhdpi/ferry.png b/data/styles/default/light/xxxhdpi/ferry.png
deleted file mode 100644
index 211ae27274e92ac98529d5cb9f8a57ad72e19554..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8251
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

diff --git a/data/styles/default/light/xxxhdpi/paid_road.png b/data/styles/default/light/xxxhdpi/paid_road.png
deleted file mode 100644
index ae5d554dbcc3b2c9b851748cddfcda23a248b403..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8702
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

diff --git a/data/styles/default/light/xxxhdpi/unpaved_road.png b/data/styles/default/light/xxxhdpi/unpaved_road.png
deleted file mode 100644
index b1f5ec93b37483fcdb2537b2f5687f885044c4d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8465
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

diff --git a/libs/map/routing_mark.cpp b/libs/map/routing_mark.cpp
index 95a50b0f1..1e1f62baf 100644
--- a/libs/map/routing_mark.cpp
+++ b/libs/map/routing_mark.cpp
@@ -667,9 +667,9 @@ drape_ptr<df::UserPointMark::SymbolNameZoomInfo> RoadWarningMark::GetSymbolNames
   switch (m_type)
   {
     using enum RoadWarningMarkType;
-  case Toll: symbolName = "paid_road"; break;
-  case Ferry: symbolName = "ferry"; break;
-  case Dirty: symbolName = "unpaved_road"; break;
+  case Toll: symbolName = "warning-paid_road"; break;
+  case Ferry: symbolName = "warning-ferry"; break;
+  case Dirty: symbolName = "warning-unpaved_road"; break;
   case Count: CHECK(false, ()); break;
   }
   auto symbol = make_unique_dp<SymbolNameZoomInfo>();

From eeb53eb0c4501b77331dced82b0984fbcdc18501 Mon Sep 17 00:00:00 2001
From: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>
Date: Wed, 20 Aug 2025 20:22:48 +0200
Subject: [PATCH 147/302] [styles] Convert PNG US road shield icons to SVG

Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>
---
 .../dark/6plus/shield-us-hw-thin-scaled.png      | Bin 2429 -> 0 bytes
 .../default/dark/6plus/shield-us-hw-thin.png     | Bin 1387 -> 0 bytes
 .../dark/6plus/shield-us-hw-wide-scaled.png      | Bin 2709 -> 0 bytes
 .../default/dark/6plus/shield-us-hw-wide.png     | Bin 1632 -> 0 bytes
 .../dark/6plus/shield-us-i-thin-scaled.png       | Bin 3271 -> 0 bytes
 .../default/dark/6plus/shield-us-i-thin.png      | Bin 1909 -> 0 bytes
 .../dark/6plus/shield-us-i-wide-scaled.png       | Bin 3584 -> 0 bytes
 .../default/dark/6plus/shield-us-i-wide.png      | Bin 2213 -> 0 bytes
 .../dark/hdpi/shield-us-hw-thin-scaled.png       | Bin 1759 -> 0 bytes
 .../default/dark/hdpi/shield-us-hw-thin.png      | Bin 1287 -> 0 bytes
 .../dark/hdpi/shield-us-hw-wide-scaled.png       | Bin 2034 -> 0 bytes
 .../default/dark/hdpi/shield-us-hw-wide.png      | Bin 1412 -> 0 bytes
 .../dark/hdpi/shield-us-i-thin-scaled.png        | Bin 1896 -> 0 bytes
 .../default/dark/hdpi/shield-us-i-thin.png       | Bin 1128 -> 0 bytes
 .../dark/hdpi/shield-us-i-wide-scaled.png        | Bin 1973 -> 0 bytes
 .../default/dark/hdpi/shield-us-i-wide.png       | Bin 1287 -> 0 bytes
 .../dark/mdpi/shield-us-hw-thin-scaled.png       | Bin 1139 -> 0 bytes
 .../default/dark/mdpi/shield-us-hw-thin.png      | Bin 768 -> 0 bytes
 .../dark/mdpi/shield-us-hw-wide-scaled.png       | Bin 1265 -> 0 bytes
 .../default/dark/mdpi/shield-us-hw-wide.png      | Bin 804 -> 0 bytes
 .../dark/mdpi/shield-us-i-thin-scaled.png        | Bin 1084 -> 0 bytes
 .../default/dark/mdpi/shield-us-i-thin.png       | Bin 656 -> 0 bytes
 .../dark/mdpi/shield-us-i-wide-scaled.png        | Bin 1199 -> 0 bytes
 .../default/dark/mdpi/shield-us-i-wide.png       | Bin 779 -> 0 bytes
 .../dark/symbols/shield-us-hw-thin-scaled.svg    |   4 ++++
 .../default/dark/symbols/shield-us-hw-thin.svg   |   4 ++++
 .../dark/symbols/shield-us-hw-wide-scaled.svg    |   4 ++++
 .../default/dark/symbols/shield-us-hw-wide.svg   |   4 ++++
 .../dark/symbols/shield-us-i-thin-scaled.svg     |   7 +++++++
 .../default/dark/symbols/shield-us-i-thin.svg    |   7 +++++++
 .../dark/symbols/shield-us-i-wide-scaled.svg     |   7 +++++++
 .../default/dark/symbols/shield-us-i-wide.svg    |   7 +++++++
 .../dark/xhdpi/shield-us-hw-thin-scaled.png      | Bin 2523 -> 0 bytes
 .../default/dark/xhdpi/shield-us-hw-thin.png     | Bin 1700 -> 0 bytes
 .../dark/xhdpi/shield-us-hw-wide-scaled.png      | Bin 2961 -> 0 bytes
 .../default/dark/xhdpi/shield-us-hw-wide.png     | Bin 1856 -> 0 bytes
 .../dark/xhdpi/shield-us-i-thin-scaled.png       | Bin 2407 -> 0 bytes
 .../default/dark/xhdpi/shield-us-i-thin.png      | Bin 1493 -> 0 bytes
 .../dark/xhdpi/shield-us-i-wide-scaled.png       | Bin 2679 -> 0 bytes
 .../default/dark/xhdpi/shield-us-i-wide.png      | Bin 1762 -> 0 bytes
 .../dark/xxhdpi/shield-us-hw-thin-scaled.png     | Bin 4427 -> 0 bytes
 .../default/dark/xxhdpi/shield-us-hw-thin.png    | Bin 3089 -> 0 bytes
 .../dark/xxhdpi/shield-us-hw-wide-scaled.png     | Bin 4882 -> 0 bytes
 .../default/dark/xxhdpi/shield-us-hw-wide.png    | Bin 3175 -> 0 bytes
 .../dark/xxhdpi/shield-us-i-thin-scaled.png      | Bin 3934 -> 0 bytes
 .../default/dark/xxhdpi/shield-us-i-thin.png     | Bin 2385 -> 0 bytes
 .../dark/xxhdpi/shield-us-i-wide-scaled.png      | Bin 4323 -> 0 bytes
 .../default/dark/xxhdpi/shield-us-i-wide.png     | Bin 2752 -> 0 bytes
 .../dark/xxxhdpi/shield-us-hw-thin-scaled.png    | Bin 5280 -> 0 bytes
 .../default/dark/xxxhdpi/shield-us-hw-thin.png   | Bin 3671 -> 0 bytes
 .../dark/xxxhdpi/shield-us-hw-wide-scaled.png    | Bin 5739 -> 0 bytes
 .../default/dark/xxxhdpi/shield-us-hw-wide.png   | Bin 3827 -> 0 bytes
 .../dark/xxxhdpi/shield-us-i-thin-scaled.png     | Bin 5064 -> 0 bytes
 .../default/dark/xxxhdpi/shield-us-i-thin.png    | Bin 2867 -> 0 bytes
 .../dark/xxxhdpi/shield-us-i-wide-scaled.png     | Bin 5452 -> 0 bytes
 .../default/dark/xxxhdpi/shield-us-i-wide.png    | Bin 3305 -> 0 bytes
 .../light/6plus/shield-us-hw-thin-scaled.png     | Bin 3626 -> 0 bytes
 .../default/light/6plus/shield-us-hw-thin.png    | Bin 2469 -> 0 bytes
 .../light/6plus/shield-us-hw-wide-scaled.png     | Bin 3772 -> 0 bytes
 .../default/light/6plus/shield-us-hw-wide.png    | Bin 2546 -> 0 bytes
 .../light/6plus/shield-us-i-thin-scaled.png      | Bin 3271 -> 0 bytes
 .../default/light/6plus/shield-us-i-thin.png     | Bin 1909 -> 0 bytes
 .../light/6plus/shield-us-i-wide-scaled.png      | Bin 3584 -> 0 bytes
 .../default/light/6plus/shield-us-i-wide.png     | Bin 2213 -> 0 bytes
 .../light/hdpi/shield-us-hw-thin-scaled.png      | Bin 1759 -> 0 bytes
 .../default/light/hdpi/shield-us-hw-thin.png     | Bin 1287 -> 0 bytes
 .../light/hdpi/shield-us-hw-wide-scaled.png      | Bin 2034 -> 0 bytes
 .../default/light/hdpi/shield-us-hw-wide.png     | Bin 1412 -> 0 bytes
 .../light/hdpi/shield-us-i-thin-scaled.png       | Bin 1896 -> 0 bytes
 .../default/light/hdpi/shield-us-i-thin.png      | Bin 1128 -> 0 bytes
 .../light/hdpi/shield-us-i-wide-scaled.png       | Bin 1973 -> 0 bytes
 .../default/light/hdpi/shield-us-i-wide.png      | Bin 1287 -> 0 bytes
 .../light/mdpi/shield-us-hw-thin-scaled.png      | Bin 1139 -> 0 bytes
 .../default/light/mdpi/shield-us-hw-thin.png     | Bin 768 -> 0 bytes
 .../light/mdpi/shield-us-hw-wide-scaled.png      | Bin 1265 -> 0 bytes
 .../default/light/mdpi/shield-us-hw-wide.png     | Bin 804 -> 0 bytes
 .../light/mdpi/shield-us-i-thin-scaled.png       | Bin 1084 -> 0 bytes
 .../default/light/mdpi/shield-us-i-thin.png      | Bin 656 -> 0 bytes
 .../light/mdpi/shield-us-i-wide-scaled.png       | Bin 1199 -> 0 bytes
 .../default/light/mdpi/shield-us-i-wide.png      | Bin 779 -> 0 bytes
 .../light/symbols/shield-us-hw-thin-scaled.svg   |   4 ++++
 .../default/light/symbols/shield-us-hw-thin.svg  |   4 ++++
 .../light/symbols/shield-us-hw-wide-scaled.svg   |   4 ++++
 .../default/light/symbols/shield-us-hw-wide.svg  |   4 ++++
 .../light/symbols/shield-us-i-thin-scaled.svg    |   7 +++++++
 .../default/light/symbols/shield-us-i-thin.svg   |   7 +++++++
 .../light/symbols/shield-us-i-wide-scaled.svg    |   7 +++++++
 .../default/light/symbols/shield-us-i-wide.svg   |   7 +++++++
 .../light/xhdpi/shield-us-hw-thin-scaled.png     | Bin 2523 -> 0 bytes
 .../default/light/xhdpi/shield-us-hw-thin.png    | Bin 1700 -> 0 bytes
 .../light/xhdpi/shield-us-hw-wide-scaled.png     | Bin 2961 -> 0 bytes
 .../default/light/xhdpi/shield-us-hw-wide.png    | Bin 1856 -> 0 bytes
 .../light/xhdpi/shield-us-i-thin-scaled.png      | Bin 2407 -> 0 bytes
 .../default/light/xhdpi/shield-us-i-thin.png     | Bin 1493 -> 0 bytes
 .../light/xhdpi/shield-us-i-wide-scaled.png      | Bin 2679 -> 0 bytes
 .../default/light/xhdpi/shield-us-i-wide.png     | Bin 1762 -> 0 bytes
 .../light/xxhdpi/shield-us-hw-thin-scaled.png    | Bin 4427 -> 0 bytes
 .../default/light/xxhdpi/shield-us-hw-thin.png   | Bin 3089 -> 0 bytes
 .../light/xxhdpi/shield-us-hw-wide-scaled.png    | Bin 4882 -> 0 bytes
 .../default/light/xxhdpi/shield-us-hw-wide.png   | Bin 3175 -> 0 bytes
 .../light/xxhdpi/shield-us-i-thin-scaled.png     | Bin 3934 -> 0 bytes
 .../default/light/xxhdpi/shield-us-i-thin.png    | Bin 2385 -> 0 bytes
 .../light/xxhdpi/shield-us-i-wide-scaled.png     | Bin 4323 -> 0 bytes
 .../default/light/xxhdpi/shield-us-i-wide.png    | Bin 2752 -> 0 bytes
 .../light/xxxhdpi/shield-us-hw-thin-scaled.png   | Bin 5280 -> 0 bytes
 .../default/light/xxxhdpi/shield-us-hw-thin.png  | Bin 3671 -> 0 bytes
 .../light/xxxhdpi/shield-us-hw-wide-scaled.png   | Bin 5739 -> 0 bytes
 .../default/light/xxxhdpi/shield-us-hw-wide.png  | Bin 3827 -> 0 bytes
 .../light/xxxhdpi/shield-us-i-thin-scaled.png    | Bin 5064 -> 0 bytes
 .../default/light/xxxhdpi/shield-us-i-thin.png   | Bin 2867 -> 0 bytes
 .../light/xxxhdpi/shield-us-i-wide-scaled.png    | Bin 5452 -> 0 bytes
 .../default/light/xxxhdpi/shield-us-i-wide.png   | Bin 3305 -> 0 bytes
 112 files changed, 88 insertions(+)
 delete mode 100644 data/styles/default/dark/6plus/shield-us-hw-thin-scaled.png
 delete mode 100644 data/styles/default/dark/6plus/shield-us-hw-thin.png
 delete mode 100644 data/styles/default/dark/6plus/shield-us-hw-wide-scaled.png
 delete mode 100644 data/styles/default/dark/6plus/shield-us-hw-wide.png
 delete mode 100644 data/styles/default/dark/6plus/shield-us-i-thin-scaled.png
 delete mode 100644 data/styles/default/dark/6plus/shield-us-i-thin.png
 delete mode 100644 data/styles/default/dark/6plus/shield-us-i-wide-scaled.png
 delete mode 100644 data/styles/default/dark/6plus/shield-us-i-wide.png
 delete mode 100644 data/styles/default/dark/hdpi/shield-us-hw-thin-scaled.png
 delete mode 100644 data/styles/default/dark/hdpi/shield-us-hw-thin.png
 delete mode 100644 data/styles/default/dark/hdpi/shield-us-hw-wide-scaled.png
 delete mode 100644 data/styles/default/dark/hdpi/shield-us-hw-wide.png
 delete mode 100644 data/styles/default/dark/hdpi/shield-us-i-thin-scaled.png
 delete mode 100644 data/styles/default/dark/hdpi/shield-us-i-thin.png
 delete mode 100644 data/styles/default/dark/hdpi/shield-us-i-wide-scaled.png
 delete mode 100644 data/styles/default/dark/hdpi/shield-us-i-wide.png
 delete mode 100644 data/styles/default/dark/mdpi/shield-us-hw-thin-scaled.png
 delete mode 100644 data/styles/default/dark/mdpi/shield-us-hw-thin.png
 delete mode 100644 data/styles/default/dark/mdpi/shield-us-hw-wide-scaled.png
 delete mode 100644 data/styles/default/dark/mdpi/shield-us-hw-wide.png
 delete mode 100644 data/styles/default/dark/mdpi/shield-us-i-thin-scaled.png
 delete mode 100644 data/styles/default/dark/mdpi/shield-us-i-thin.png
 delete mode 100644 data/styles/default/dark/mdpi/shield-us-i-wide-scaled.png
 delete mode 100644 data/styles/default/dark/mdpi/shield-us-i-wide.png
 create mode 100644 data/styles/default/dark/symbols/shield-us-hw-thin-scaled.svg
 create mode 100644 data/styles/default/dark/symbols/shield-us-hw-thin.svg
 create mode 100644 data/styles/default/dark/symbols/shield-us-hw-wide-scaled.svg
 create mode 100644 data/styles/default/dark/symbols/shield-us-hw-wide.svg
 create mode 100644 data/styles/default/dark/symbols/shield-us-i-thin-scaled.svg
 create mode 100644 data/styles/default/dark/symbols/shield-us-i-thin.svg
 create mode 100644 data/styles/default/dark/symbols/shield-us-i-wide-scaled.svg
 create mode 100644 data/styles/default/dark/symbols/shield-us-i-wide.svg
 delete mode 100644 data/styles/default/dark/xhdpi/shield-us-hw-thin-scaled.png
 delete mode 100644 data/styles/default/dark/xhdpi/shield-us-hw-thin.png
 delete mode 100644 data/styles/default/dark/xhdpi/shield-us-hw-wide-scaled.png
 delete mode 100644 data/styles/default/dark/xhdpi/shield-us-hw-wide.png
 delete mode 100644 data/styles/default/dark/xhdpi/shield-us-i-thin-scaled.png
 delete mode 100644 data/styles/default/dark/xhdpi/shield-us-i-thin.png
 delete mode 100644 data/styles/default/dark/xhdpi/shield-us-i-wide-scaled.png
 delete mode 100644 data/styles/default/dark/xhdpi/shield-us-i-wide.png
 delete mode 100644 data/styles/default/dark/xxhdpi/shield-us-hw-thin-scaled.png
 delete mode 100644 data/styles/default/dark/xxhdpi/shield-us-hw-thin.png
 delete mode 100644 data/styles/default/dark/xxhdpi/shield-us-hw-wide-scaled.png
 delete mode 100644 data/styles/default/dark/xxhdpi/shield-us-hw-wide.png
 delete mode 100644 data/styles/default/dark/xxhdpi/shield-us-i-thin-scaled.png
 delete mode 100644 data/styles/default/dark/xxhdpi/shield-us-i-thin.png
 delete mode 100644 data/styles/default/dark/xxhdpi/shield-us-i-wide-scaled.png
 delete mode 100644 data/styles/default/dark/xxhdpi/shield-us-i-wide.png
 delete mode 100644 data/styles/default/dark/xxxhdpi/shield-us-hw-thin-scaled.png
 delete mode 100644 data/styles/default/dark/xxxhdpi/shield-us-hw-thin.png
 delete mode 100644 data/styles/default/dark/xxxhdpi/shield-us-hw-wide-scaled.png
 delete mode 100644 data/styles/default/dark/xxxhdpi/shield-us-hw-wide.png
 delete mode 100644 data/styles/default/dark/xxxhdpi/shield-us-i-thin-scaled.png
 delete mode 100644 data/styles/default/dark/xxxhdpi/shield-us-i-thin.png
 delete mode 100644 data/styles/default/dark/xxxhdpi/shield-us-i-wide-scaled.png
 delete mode 100644 data/styles/default/dark/xxxhdpi/shield-us-i-wide.png
 delete mode 100644 data/styles/default/light/6plus/shield-us-hw-thin-scaled.png
 delete mode 100644 data/styles/default/light/6plus/shield-us-hw-thin.png
 delete mode 100644 data/styles/default/light/6plus/shield-us-hw-wide-scaled.png
 delete mode 100644 data/styles/default/light/6plus/shield-us-hw-wide.png
 delete mode 100644 data/styles/default/light/6plus/shield-us-i-thin-scaled.png
 delete mode 100644 data/styles/default/light/6plus/shield-us-i-thin.png
 delete mode 100644 data/styles/default/light/6plus/shield-us-i-wide-scaled.png
 delete mode 100644 data/styles/default/light/6plus/shield-us-i-wide.png
 delete mode 100644 data/styles/default/light/hdpi/shield-us-hw-thin-scaled.png
 delete mode 100644 data/styles/default/light/hdpi/shield-us-hw-thin.png
 delete mode 100644 data/styles/default/light/hdpi/shield-us-hw-wide-scaled.png
 delete mode 100644 data/styles/default/light/hdpi/shield-us-hw-wide.png
 delete mode 100644 data/styles/default/light/hdpi/shield-us-i-thin-scaled.png
 delete mode 100644 data/styles/default/light/hdpi/shield-us-i-thin.png
 delete mode 100644 data/styles/default/light/hdpi/shield-us-i-wide-scaled.png
 delete mode 100644 data/styles/default/light/hdpi/shield-us-i-wide.png
 delete mode 100644 data/styles/default/light/mdpi/shield-us-hw-thin-scaled.png
 delete mode 100644 data/styles/default/light/mdpi/shield-us-hw-thin.png
 delete mode 100644 data/styles/default/light/mdpi/shield-us-hw-wide-scaled.png
 delete mode 100644 data/styles/default/light/mdpi/shield-us-hw-wide.png
 delete mode 100644 data/styles/default/light/mdpi/shield-us-i-thin-scaled.png
 delete mode 100644 data/styles/default/light/mdpi/shield-us-i-thin.png
 delete mode 100644 data/styles/default/light/mdpi/shield-us-i-wide-scaled.png
 delete mode 100644 data/styles/default/light/mdpi/shield-us-i-wide.png
 create mode 100644 data/styles/default/light/symbols/shield-us-hw-thin-scaled.svg
 create mode 100644 data/styles/default/light/symbols/shield-us-hw-thin.svg
 create mode 100644 data/styles/default/light/symbols/shield-us-hw-wide-scaled.svg
 create mode 100644 data/styles/default/light/symbols/shield-us-hw-wide.svg
 create mode 100644 data/styles/default/light/symbols/shield-us-i-thin-scaled.svg
 create mode 100644 data/styles/default/light/symbols/shield-us-i-thin.svg
 create mode 100644 data/styles/default/light/symbols/shield-us-i-wide-scaled.svg
 create mode 100644 data/styles/default/light/symbols/shield-us-i-wide.svg
 delete mode 100644 data/styles/default/light/xhdpi/shield-us-hw-thin-scaled.png
 delete mode 100644 data/styles/default/light/xhdpi/shield-us-hw-thin.png
 delete mode 100644 data/styles/default/light/xhdpi/shield-us-hw-wide-scaled.png
 delete mode 100644 data/styles/default/light/xhdpi/shield-us-hw-wide.png
 delete mode 100644 data/styles/default/light/xhdpi/shield-us-i-thin-scaled.png
 delete mode 100644 data/styles/default/light/xhdpi/shield-us-i-thin.png
 delete mode 100644 data/styles/default/light/xhdpi/shield-us-i-wide-scaled.png
 delete mode 100644 data/styles/default/light/xhdpi/shield-us-i-wide.png
 delete mode 100644 data/styles/default/light/xxhdpi/shield-us-hw-thin-scaled.png
 delete mode 100644 data/styles/default/light/xxhdpi/shield-us-hw-thin.png
 delete mode 100644 data/styles/default/light/xxhdpi/shield-us-hw-wide-scaled.png
 delete mode 100644 data/styles/default/light/xxhdpi/shield-us-hw-wide.png
 delete mode 100644 data/styles/default/light/xxhdpi/shield-us-i-thin-scaled.png
 delete mode 100644 data/styles/default/light/xxhdpi/shield-us-i-thin.png
 delete mode 100644 data/styles/default/light/xxhdpi/shield-us-i-wide-scaled.png
 delete mode 100644 data/styles/default/light/xxhdpi/shield-us-i-wide.png
 delete mode 100644 data/styles/default/light/xxxhdpi/shield-us-hw-thin-scaled.png
 delete mode 100644 data/styles/default/light/xxxhdpi/shield-us-hw-thin.png
 delete mode 100644 data/styles/default/light/xxxhdpi/shield-us-hw-wide-scaled.png
 delete mode 100644 data/styles/default/light/xxxhdpi/shield-us-hw-wide.png
 delete mode 100644 data/styles/default/light/xxxhdpi/shield-us-i-thin-scaled.png
 delete mode 100644 data/styles/default/light/xxxhdpi/shield-us-i-thin.png
 delete mode 100644 data/styles/default/light/xxxhdpi/shield-us-i-wide-scaled.png
 delete mode 100644 data/styles/default/light/xxxhdpi/shield-us-i-wide.png

diff --git a/data/styles/default/dark/6plus/shield-us-hw-thin-scaled.png b/data/styles/default/dark/6plus/shield-us-hw-thin-scaled.png
deleted file mode 100644
index 50fdac5a105a771d76d54757c7255ff07c00edd4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2429
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

diff --git a/data/styles/default/dark/6plus/shield-us-hw-thin.png b/data/styles/default/dark/6plus/shield-us-hw-thin.png
deleted file mode 100644
index 728771aadfb86acee78e25dbde09b5e2a7e8e3ba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1387
zcmV-x1(f=UP)<h;3K|Lk000e1NJLTq001xm001=z1^@s62hV6U00001b5ch_0Itp)
z=>Px)B}qg<RA>e5nOjI~RT#(DXli)LJRL8n#CSPqq97qC;luGlDIU_!OQ(lWQA_F}
z3X-0Bi}0Zbdyya!LSKwPMZ16`1cHx7XEJZ8=p^D9@N&#ib5{TVKCWTUW$#8hxJH-{
z{<HU9>)Y%5t=nE}&lVzPu@;E6K&%B~EpSaOa4#+{?)|I8N=iz4ow~|Bmoe^L<(^1<
z@5AW~lF&EMi;$hgA+y`zaCj-6Lrk+XmdUaigR$O#o{Bv{Dd&((O-=Rj2%SRTLGM5{
zPyti|-Gx4d9zyh^zq*HM%)1NGw-DmJEQ4jSOmhszd=vU#_BQVR2l5RL4$8f~J=xdS
zCzF$t6%--Es<N_D&dtpk;<=TdN@tlYn=u%RF(Jk#gQYnvbDnhjR~Q10p`js1XJ@D1
z_2}qG%+Ah=nVA`}zP>IHRK&-}i@dx%QC3za+S=L#p#A<lSy)&Q<KyFEadA<&-EMJl
zaUn7@Geto`foN=O6m@lV0zK@%XLxv6baiz}8WP`yzV>HEaPl5}e3($ak&zLj5FI~^
zO$M?+WQxc>gqK8%`o_k_bZ`g6Bm-H<1d+|wK0&TbNJ#LZy8{Z+c|jI3kqshaSmR_d
z9H*zJb@GOdO{T=eL{$m@#EvsnWd`SmoLo6MIi}?3ICVOm#>5BBW9VlqDz3D$y1F`S
zE9gvYXlUT@p+2^PXF7Z2Pe{64E}gsqu~%1D6}%g436S5+Lx_nSV`DtwGdo($#PThe
zxI)|7%gB{gRaF74p!1@(wpR7PE4JjO%nepzcXwAOw-MXp@kne2I5Pf%LUs<pLkK>G
z{l?$r<>e<=8h@9TmIP`-@LwVJM1WaUV1r&;TU!CnIxaRhH&s|ZTtdvM0w?r5KmX79
z5>nvPPB=T`tASyEs}u9lssf30!bZyMtL5Cp5b*d^Fjj<lbl~<_x0x8i!dO+n*vuCf
z7whI1CWgQl3>z{h@?=p_k@iQZ0w^pjRO<lQ0xVn)^wOiHr6s^o=Y@&IV6$Vnh0H^~
z1z`<P4WRvqwLra@9fFUHmi9SvWJgDbcIaS$_V#u)j6SoX=VQvl*SEE`wcz`;Uvo!#
z`F{KeoX>=-L=zGv#+!CnD}d(aX4MO?stTAV@k>msudi2mQFk=4l_@xL1&oCvH#b-1
zMcpynqGqmu0epJOfB2%)O#34Lw%S~QZDL2m7TT)$R#sM2mcgnn)R9ZIEH5v&nnT*t
zD=I3~B(~gE{J~00O-*Ts4F=%<LS%!;XlW0SBk_l;Z-0M3xD0LA2L}fd`yswovI1{e
z(j$YD<9kTrktL&{5@a9?nV=sa{{+T)Si6l>7bHtcN_<=abs2XArKP2+<$nhg*&?#%
z;Kka?jEoH5z`%g?dcD_H55{6l#wG*wBa{w>m|b_o!}|;91KyRMo-SKkTOBnuH6lMh
zU!<g@2z<a3X=!O9J3HGD{USB|Wg{qlEaBR7e0(gnx3|Uo{JfZ$n2;FvitS63`4Myx
zY1zSkRY;hG&LK4xLylQlS+c3AN#e_jJUKZD=`BFY(a}-E2VZ7F?hh)Pu^5xFZB5nE
z*6A|y1sq?4%AstC--DioINZ4ZxC0sGq3dOTf4`%rrw2(OnVb~8y}fd0XGg_j1y&(9
zbO?E&$IveH5c&!7K-X$%h}H~ELB`nS&bGU|+uYi}Ag>L29*SzK1>FXu;Mtn@p&Mnl
tFv(re2B@9TjkMdK&bpE0G3W?e;9p_&`Bcm7M7RI|002ovPDHLkV1n>2mo)$Y

diff --git a/data/styles/default/dark/6plus/shield-us-hw-wide-scaled.png b/data/styles/default/dark/6plus/shield-us-hw-wide-scaled.png
deleted file mode 100644
index 1ac895dbd81a55327f32f931484decdfca0716e9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2709
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
P00000NkvXXu0mjf*@PX}

diff --git a/data/styles/default/dark/6plus/shield-us-hw-wide.png b/data/styles/default/dark/6plus/shield-us-hw-wide.png
deleted file mode 100644
index 411b186bb6ad6fb17a4abc7f38dbf590e5a32ed6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1632
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

diff --git a/data/styles/default/dark/6plus/shield-us-i-thin-scaled.png b/data/styles/default/dark/6plus/shield-us-i-thin-scaled.png
deleted file mode 100644
index 53966ce782ff437356547487288213eb641c9c17..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3271
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
FV1n0PMg#x=

diff --git a/data/styles/default/dark/6plus/shield-us-i-thin.png b/data/styles/default/dark/6plus/shield-us-i-thin.png
deleted file mode 100644
index 7836e351d30b26dbd90ddfb0785aaba41ee53d97..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1909
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

diff --git a/data/styles/default/dark/6plus/shield-us-i-wide-scaled.png b/data/styles/default/dark/6plus/shield-us-i-wide-scaled.png
deleted file mode 100644
index d4b227ce36a830c9d2aa009380663ff471ade0ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3584
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
GLSTZ(Rqv_*

diff --git a/data/styles/default/dark/6plus/shield-us-i-wide.png b/data/styles/default/dark/6plus/shield-us-i-wide.png
deleted file mode 100644
index a9caec586d9deffac12fafe03fa3865232860d7c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2213
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

diff --git a/data/styles/default/dark/hdpi/shield-us-hw-thin-scaled.png b/data/styles/default/dark/hdpi/shield-us-hw-thin-scaled.png
deleted file mode 100644
index d33950c8a5c942fc9e4f29aa279db91a70d8987d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1759
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
BRQ~_~

diff --git a/data/styles/default/dark/hdpi/shield-us-hw-thin.png b/data/styles/default/dark/hdpi/shield-us-hw-thin.png
deleted file mode 100644
index 8e0dea3ce052e226e0304ac327b66bb1c546cf3b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1287
zcmV+i1^D`jP)<h;3K|Lk000e1NJLTq001EX001Ef1^@s6SLDKP00001b5ch_0Itp)
z=>Px(!AV3xR9FeMm|IL7RT#(5%<RH$8bYa1MHJ}XW|mzp3u&5wMWP80YN}~TUo?>d
z)m9T9Ow$)%ND~u7nrP~+DJiK>yl7vvsg03`R;X><F1K|-b_>Nsq(CSHvx9T<`>)IZ
z>ymn#N#I<*@BDw?o;`EUcb2goo`!}7XDH+;-@$BkOOjM+HFl^#2YNf08K27_iekaq
z+JgaA<x-;PdpVa+cXu~Ww)b`Y_i2=9=kmjN=s*v;xqP_n&bqp~-Lky)4aafyet&>X
zOe7%wl^_V`1R;M^RaLjHD+hR<dq>yx>gwtmHa0fOc%C2Ab>m&0ciwV19BEBkuhBH^
zEgJiRBn9=Ush^l(u&B$mt95vI_(3+;Y6k*=VoCCkR8@)Ez`(bLqA142i@nDF{ShS)
z@EBYFT3er0u3h`uz=IO)t#;Hg4&$K%J?KIo91BVnYbHXW&|@^U1N4c-^XGf{rlzMX
zzjQjy#>dB4DwSj|my3D5eijag8O@gEL$Q$0IQdL5S(eGiM?Tfe?RHx}gM;6(6DN-A
zG((d-pZ82W9{<%c*3|f(2nPMh+S-tM`}VEOr?cxH^uYlSTm->2G<XWrX<^LeazEbJ
z_nA;zTW1AlS7l^mn00i#s>yQt7q?rh<`sp@rv+75T3X6PQL>A>O&1*Szy)8JpI`p1
zxOh)&X=&*d`tG@d2b;GIu%pq_^B$vxiZ%68Jf0f07^3L;Sdx6&{QSIK%ORr+eQ>}t
z;noIY7>*C=z2|S-xNh2PDWMMzW6pCXzzV|a)u++9xVT{2Y$+EO?q_s89&N@1SV3I9
znp~${PhMGBF>SV#tE;QnU1ji0fE5JxewrpHHX}P9=!3KMtg(XV@9z&2T&Sq1v@-^_
zp)YLkGAt_y#?+H}c}}gl`Dt5&fIc|jnV?J%!C<hII*zrq9Tkd-icFg=CG^1oZ-e`1
zK0yc9+q7{wySiSt1)MDk4tU_g#<#SzIB2z=Jap(qzO1Y)+uxQpIN*Vs;m^&@JxNFF
zuExgAquUm8mMD1Of=|I{kHTJ9SeWHzZ`0&~PYcsI2i)Z3guT=(^-Z30j!z^K_Z$x4
z=bJZ&j4VG}o8W;9e&!WbRpSHd<f73ZYz3R*;D84%`Z7T{o%tV8RI_K!bZf{b?R=1b
zf&(77+gQP%=Q+xdwa(6Vl^ku!Dc0B5jn2+vDmcV@-V9(fU8WvM@*by@>(i2wy+$Nb
z@4)U>Sy{>U?ekFf>}BQU73R2ymb0_>DDzIS>FK*{W@d&hFE6uL?2bxDIY)PvHzp=h
z7fg|DL7=m$%71{~-&2C%2vHWlSJTu-OlP_bDedhY&cla~;5atBt&&bhcKPxb?9!z^
zg)TeRwU4xx=yq_Qw0@*<XA_C!_tqe){3VF3M%0mw%d$hHz#`=S8iDFVp|IA|b5`*A
z{FZw%ImJ$&KBdLu;{t*1FlJn!J50>wQYWL)yZ>*JLN}-*!C+u99G0{zSH8@w9h7LJ
zA9gFUzgc<cOytsuM0_Rm5`9jy(%jhC#D<0j@%3D%%T`+~mi)*0;lBz3f#Ir8H|<Yo
xD!S-v>MbbP{bn>8RdNMwdmsHi5%{l=KLEnRCOQsb%-jF~002ovPDHLkV1fsmgkAsu

diff --git a/data/styles/default/dark/hdpi/shield-us-hw-wide-scaled.png b/data/styles/default/dark/hdpi/shield-us-hw-wide-scaled.png
deleted file mode 100644
index 1b955306e91c372a508ea301ae838a3b4cde9d92..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2034
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
QOaK4?07*qoM6N<$f`c6Q`v3p{

diff --git a/data/styles/default/dark/hdpi/shield-us-hw-wide.png b/data/styles/default/dark/hdpi/shield-us-hw-wide.png
deleted file mode 100644
index ae80bfb373f2ea0144f50a23e999472ed28bb4be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1412
zcmV-~1$+95P)<h;3K|Lk000e1NJLTq001Wd001Ef1^@s6TKcjm00001b5ch_0Itp)
z=>Px)K1oDDR9FecnEOv#Wf;ew^PWPXsN7o_I6zt`m(q+Pn+e11r<pNO#=POi!e;c>
znI*=MnDB$ijEOP+12f~|Oe7-`TwIpu5RBV^C30=I&M@Z)mRoVO(Dqz>p5xB3tTb_K
zwr_Is-k$gUe%{M@ZvatTd3kvTe$Ph9j!2eenJX<VsvtiiGfD#0PdZVuVatlFR%-!(
zI1C_X0Z5-GB&2*gF)^_ctrDx%{1WDUB1zI7#@JO1f9Q0&2cy~BY_{}J$oByNdmn&X
z1mJ6(PUq~y_7QLu6-CcU68qU;NZGM>ZykT};&(C@3LxkJ$H937{V_8$^Zwl2oSEaq
zW`ucL6va}b(IhrC9p?M`E{Gn_pFFx5gzW*)_2%T{++JE*dK!WD%QC!$Kn+-D;=zOU
z+|bZZqR+Q>kLTsu$;sPy!vQzJ+3m%-fq*<@FeLBn>iUW=D=P=L`xcx#_a*fAe=BWl
zY_Rac6t-B3rIwbX?8uSVATco!g25p4_I?9BJzXM}<sY_BN=lL%8((3^kGFx@Y=P<N
zDL8hlMfCgEf0t!e>vFl~)G`_zjlU!XhV=U6!p_ca-e#**Z4{qGM@L5#Sij#7CX)%O
zsvMA?U$Dt8JaXsGER2nfg2&?lgTbJ{R9C;CG$Pz?VqzRxTaSu?!1`~D>FcJZrslQ$
zUAxTLR;y*kZZ8*Z+!(_-9eYQ*q)!~gLvWnK;V}69tJifpo%QV5PM%s8FGnMD;zX+`
z2!hjKNUdRkfHzZ;z+$u6Sv<k0Lr9-Eh=;h8PO@5y-YqVEUhe7Xj{SIsDUv>M5YML3
z!-UJbcUKFcP$<kic0v5%<eC}>&bgw?Dp=Ukz`j^nS>|zKs(CT>M@FuL*So^wI{29?
ztij=e>Y~K?`G5an)hHG|F5C}fbP5MWG&o#_Je07!yi8uq-O7qr(M(GdmsD{LE*MNv
z!aT1fsWvh3b-I5x6Td%M+f_6YL0B&&3X|zSA4HxgH15qxeJTe<G&o#aUdPQ^qAe*N
z&f%yA(kBj8UxA}tf-!jSz=4;!tSmew#lev-=@SR>5P|}?w&s0D6s5Gbwv*aHAP#&$
z`o!V$c~5F^jPa+iTcyfMdpwvlP0}Y0j^ptVial3RQDG8Aq43b5Ms5CS)^P|B2k{UW
zljUGOG34dt#sMW#QsuzyY$s8!lZnT(5NR2Q6qSQ9VS}Zoo7^171*WGb<A4$=NgTvO
zTuN?9iMg+)rb_Vne6c%*Y@tN@#6dg+ru+mt9qaIVy{x;tGqNc$Od);ZAf8RK#l=PE
z%gRc`c-|pMpEy)7ZIjK;HeHcr;f+g|zE8=^%Tv<V*6u4;J-o95-Z5w{sO7fp)Bfc5
z`>2Otad80_7Cdn6+AnbW^r_IsM&K@E2~CTOi^@;BNv*QdoQL<;3pgFNy5-2Jsi~sT
zXyov|$?w~@AL{EHAR!?kDkz?+VPK#i1_!Uul@c%89(i?jl^VWDmny)9kLdN>;qh_z
zA8LgWMhJ#)9+o|5z5|~m^ysHZ68987OFV-eXT*3e$1%Gki3J%M8A5yeN4kcFMzuc8
z$4fYzIrFiA=R+OtK(n$e{fZ-S4^O&yZe)KkCa+=KhffjonlLvrbL%Ps((A(GJ8VE5
zp7)38LV`mg<7<HO|B+Ae2N#uLvU_~BZPd`w(ZTQ$ryW7W=H^$0n>SrD`4p#g%HKw{
zT9Jrh)p8yofa_8t4*AzO*^}{MXB~&`O_$5v{|Ht5zoytzFP4-P{XqVcQu-Sk*n~;Z
SFaeqX0000<MNUMnLSTZiPPS_R

diff --git a/data/styles/default/dark/hdpi/shield-us-i-thin-scaled.png b/data/styles/default/dark/hdpi/shield-us-i-thin-scaled.png
deleted file mode 100644
index 08cb51197584a7b113f67d62f9dcdd8ce92291e2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1896
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

diff --git a/data/styles/default/dark/hdpi/shield-us-i-thin.png b/data/styles/default/dark/hdpi/shield-us-i-thin.png
deleted file mode 100644
index ce8514d152d2c839239e3f497dd24b6db37f1f30..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1128
zcmV-u1eg1XP)<h;3K|Lk000e1NJLTq0015U001Ni1^@s6p3#bF00001b5ch_0Itp)
z=>Px(B1uF+R9Fe^mt9O0R}{y0?(FRBF6(Xy&a{<OX#ru0LNSHtViigaB^adi#gM8|
z+oX@`gMF~+gT^#ztf_BW)5L_dF@8i$(a_?$jRj4lse(1AbVWc#Xt(IL$}TfI)BhQF
za8Vlj!EE}_ll=Fbd*{sg&AoHE+~I5~rtA7zG%KJB&?zX)ahwi6X~@YyBLJ;Pc76+g
z4tZnAw&9S+BPfI_p<<{5InD5fab|$TR}jBD)ZDDeH8r{@%XH&Cs1N!DazWWpF2vnB
zbV$`ym3yJ7iSo#9LSZNd$q+$Z<3mI0&!<nbx$D+3wD$x4J-p2T11cike&@sq&()nf
z-$NX8NYZz5b@jmPiVD@^_cJ9D(eL*3=yzIMebLL87Xj+00*vSTJ^A_PpI^E1S6^wV
zE=m%^b!{{lbVNEkbCt0%nn8QPwrzW#tE>AR@rQuNO>l!v)805!Rkci06r&&&ok?SY
z(7P-YI%8w34d51r(Fy=mUfZ>cSp}s5P;D^iwNw(5=KW>Jg=t<2Z>ixm(X`WADJ5`V
zw5?6Ga<t}XXk8Es?Im{n_<sryXN{KEn%6D$j_|OICC_u1?|mTA-{k^JiI0l^i14gk
zNoZQhTb~yuv?=?<qqG^0c*YfWAKlo=B6nj6KxxX;V#ESdWn<Ct$=xe0WI%|?9>kQi
zgNezUqL7}Kn=+kFf!CSWoqn*}?XWSATTJ^@dolpd^on+GhB%Tk6PAV<P9Y-sTz1+r
zZ42|IOP117iWlWcJ=7#{e8rNS!IW#3hOd>+8vsBd@DGiz7fgtvJ!&Zt#T^2Fzp1up
z9N|R*2StHr^~>|xtp?WwUTk-YJpE4&GMom65cF+cQ#Rrd?7vwBr_sK@VexI$?+3G=
zMoe}j%je>^ZdiQyVRPnxH@#hUM9Os2Xbpw|#uMB?NBf$(B6UHYbZ(}x1vyz=8{aIZ
z(`N`QI*A&q+T?tNVEBuV>MzcbXZ4z$|JG;Av#uTdxSo!*qfm=k&zx!-o@4@@d+_q3
zExQ{-S<kro&7^<oXZu`(M|U@zaytcDJA1&0o3$pv)PW21HSnp=E5^S0Y;{{nf!tvx
z{#{=@Uq1WwzSXUnUY9W-)Q+Uqn0BAWaY#ZE9qh9|Y3}kIXz6a8P&7InKGhro8(+Vw
z_}G@U<upoK#d`szX`W)!f+-_;-flt|xEGD9JN9?ZIoT1eOC*eQ_>>~l;CW7|eKqgo
z2k!)K(f*GvTBKhBN+W*4{uFFx;sJ6IH$d}a@kAnc{)YW{sBi9t-jNc@DfK_wy{amI
zu(~`)O>Pc-=spIZv3e<II(sVEya^9LA7N$CLda+KCp~@KU4ps*yz<z!X`6o;Y~GCr
upnK*)FD3h~!w&$M_LEGK|G)c>&cGjJ9%HLL8@-bN0000<MNUMnLSTZDo+hsV

diff --git a/data/styles/default/dark/hdpi/shield-us-i-wide-scaled.png b/data/styles/default/dark/hdpi/shield-us-i-wide-scaled.png
deleted file mode 100644
index e81c362a80f4614228f67d19c84bd31d1b54d2a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1973
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
Hu0mjfT#Ur!

diff --git a/data/styles/default/dark/hdpi/shield-us-i-wide.png b/data/styles/default/dark/hdpi/shield-us-i-wide.png
deleted file mode 100644
index d1090d2f1a6b59fb5f45dc4efafff4fd1a30a24a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1287
zcmV+i1^D`jP)<h;3K|Lk000e1NJLTq001Wd001Ni1^@s63O6I000001b5ch_0Itp)
z=>Px(!AV3xR9Fe^m}^X1WgN!Og<dG-+E6Mj>!b|Er5&<?3v-!v24tIAhl(>|oVsK&
zi<<bs#Hfiz;upWDUo=LSIW${LL{u<t=m;7JA`((W!+^PRbCg@lrT3ot{5uYTNXMob
zt;wF`>HD7d`pf^k=RNN!%PcDt3Yn386ut`g!+*dwmSyLWMilyGpt1lihI8Rda4+1C
zzILP$g}zCs)Wi93A*_MVp<gRfhNT}g;*iwMbaW)Uu3TZY)zvH~ms1&O5uShv+67a&
z5>AC_U<J%LdwK%njg4}x#o|dWDT$*ph}zrWIhe)~U}{egnJ|sR2p*3x-p~+IY~31C
zm6tnF^eO-a5ss*z?>Klc$2T`;MxmRJkGINoy3rJ)aW1L2*ssuPnfR=%F!0josNk{L
zn3=9F*@D%oc27<ggn~f>O+;dOemFiO<M%|9$*w9Z^UC#lCSkd+8+~2l<IH?-uf);U
zm+BcC%L;ltI}jkbG&S{Nd2{m+hIkKf{UY3xUc3G7PK)Juh+!n*8KUq582|3Z#*bub
z_0NF&M7(uI+v(GiXo68JXnx{A)=1ZJ2xmId#F_SX9Th}d%Nzo6QRKpF#Wy=!6m2k?
ze-(#;o~ms3qB}6Tvmz!U2Oiy`%j;DtWZ49#UhsyPns;79Ha29Na1xxF;FJR+Gu+;%
zK8+1BP}INmpjV%ntPF3cQ?qV@j2X>3+yTH`gS$GtB#jv|fY_bxpa>^O`0!pFGkg**
z3?$I)bYyB0Widkr5OtcIN8+S4=g@1C=pM(6)T#tpW??v6es(%9mGX3Ih`Qq9c+Yly
z8XcuZDRNexW7u8!cXUOa3;;z2RkuXK({k%0xMA4!aAn>Q(x}T~&ZWbu4<6*`P>0M<
zRreSe-0REHq)SSWP1aOw_k)3sOn!<SsRbF|3$?p0Ub~FW@9~FroacECCnx4RA_&8Q
zasm0a>iu~_jy~;Is@QC4(h`QAK4PL{Jw<Jr<`*MJ`6gUUfBgD^PN{@nqJqs5&#{3I
z-+17Hgy#sZL7aC54zwN=p3<lkadjv6ofR8wM*8g0ooDm(Dtbce!LjnSw*p5HsGukJ
z>%-<8;l<k0GgNk~^+;v@7tb9nabun~%uk<`D_R3brD*Uik{?dg+~vUny`>R6bnmvW
z>Q3&R!F=8DIe3lMedFW&PUTO)dz#vY*_YpKecTri!r!NBdjHD{o@f0p9ozlcvBO5%
z&#dqV2nwA<)@WTgu>~M2kw0>I%n>;8=J|aie>wm2cSeRPVetJ|Dq0G2(rJxdfWHJ7
z?X~~Vb>XNr0O_xSXJF;$Ed%`9r#cVKFL~*U{idW;NT;xmep7p($j@;MJ$z>X)pNZ;
zHiV<j0E|ac1@8|E4F6;I2vgtmo8g!Ki9J5QKy~X%D&gFvg_-S-RTT`I%eI7;H`q2b
zZU)$f2aOwo6K4jb3i<osQaB|T6hhWZcH#RjTS`aoxZ%$+N8X*fl!5YM?eP6&dWR`j
z%>jt!p#MK;(YFF>3h52$rr^X80ZIL~!6umgS=s`x9*bT<BQU+h`{2Py>k4%dwR*sa
xjW()SzU?_^mj#c)Lx7>Z>$Yx3;C~f?zX5ILlf!4!?d1Rf002ovPDHLkV1jh?b{YTx

diff --git a/data/styles/default/dark/mdpi/shield-us-hw-thin-scaled.png b/data/styles/default/dark/mdpi/shield-us-hw-thin-scaled.png
deleted file mode 100644
index b0d8e9e88997c515ec031d3d73be09d5656d1383..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1139
zcmV-(1dRKMP)<h;3K|Lk000e1NJLTq001BW001Hg1^@s6KC;{Y00001b5ch_0Itp)
z=>Px(ElET{R9Fe^mTzbqbr{Eg`FF|U78X|8RFX8!pUc0yWN8MSEPXK=>nmS$u%X~^
zOkcRUjSa1$Z$#gXDFZ<_m0{_a3UPh07dm9nV%xdE{?L*vE5)w)GibB6nB{+(-1&Rd
zJ1%LvO}rCdcyRol-|u<u`+4rUyWc$s{eS#dE8uiGw~?f6^l|yQT-JRak3I0X7?QMx
zKx?xY`9=<!ruAAa5k-g{^!YqL_x9R#t#MAL?Hz_em+N)rw##KZ)ar+8JRZj!UZ22P
zH$byB2Ih*^MUo`j)M~|z{reACE?xRoIY0kv$J|`%q}gnGZtK=(3}*AQuXS~qP8$rJ
zFGeDliNV2rC>o81+uHQ6w72gF=yW=})oOXaT1B4@3=HV6T=_w{y1JrEB;p4;J9XbJ
zF0Ph@Oqp=v^?D5iA&VY7c*t<-)LR7SOQn+N&YjyR7K_!5Mx(O3+loS=J|vg_SwIGt
zVsdf<-M>GNGMP-Bq9|n`(1Xn8E=~fSJ^M-R;>F>`T8-_E$K#8<gEJ_~X7c;J56+$Y
ztj0=ooIn404H&@UxcrD6OT)t#)+A!{vcSNsEDr|5?Y6yy-&Qu4%khCy8NdJ*Fq@Lt
zxs(3#*s-HUslc4>@#9B}fdKUt2j@RShr@N``t_;Yty?!apXeiKPfbnb>~{AXoH(CA
zBob+q%cToful~qzPO(SOE|rR31B=t<6MzMlWit7EzQQ@h9*f0d1vAn@-KGR&GL$P8
z3zAhJpMS*2<+9&4O`y?`?a=G>Dq(<_HfRGwsM%D3?b~%PP!z2e28e0Xv`-C;4K-<+
zwBik-jGq(t#fUzFHZXw2CBavKAhvvT`0(ortyatVL?1yL7{F>0rzpEE5TFa?a#{4d
zZWROuuz(3k{852=o$c@M4>KB#rYSKgCcpp|W`_9$7>33F`7Y^d-*P7=lX(j;`2=tw
zR<hZpYD=7C(}xeURlFap@Cm3?^2zb>aejN0jQp4I*w`4OP$(w&1Y)t-8N5d)M@PSB
zrG}4;472#3vjEH{meXn7<#sz7%gf8HFRo~F(1u=M(@r`V^t}fGrBX>WC?^D)(B8d$
zg`OVYknql%no@A!Hv9vXig?@a_u;0}qQp(8#$xG4xVJ|}<N8)kD8|{DOd8G3&Z1;;
z0j1OFN-DKbpPrsZYinyC&&=HYkc)$HT>`M^^^*QZqp=&C1VL!5_}kr8tyaAq9qr1Y
zp?9~1!vheu?zndCCv@h_>HN}CwysvI<CRL~X02A4$AP%fRsMpLYJTqP6rQkv-;w8W
z36m#Iyjc|Xk6^<Z_#oy9GXKmS3<g!WfBa(4p5DT}dkHp?xXXq@y9=-ezQ3!!;Ujn&
z5wF+rGRw+FAXX-0UyaA-zImGKM2+!y$UZnl75%rxeg`FjbSNzuTzLQh002ovPDHLk
FV1oIyJh}h?

diff --git a/data/styles/default/dark/mdpi/shield-us-hw-thin.png b/data/styles/default/dark/mdpi/shield-us-hw-thin.png
deleted file mode 100644
index 8095ca713c53bbf3b780efb35f62d6e96cb6d503..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 768
zcmV+b1ONPqP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px%x=BPqR5%fxl+9}sK^Vq&ce1-}iiigZ6rsUQlTF-BO=1thBDU#8goI*BDfS|0
zP>>?M2|at3g7|Urpp**!2Vw($q!?No4TXLj(iUuOi0vUC&1QGUc~=w6QfhYxc4y|9
zd44<l&b&iWrsDMqZzV}`nPf^7g_PefNM=10@|^YgJaMy5|0_t6@2;XWo`Ocx%mmAJ
zylXTXPK5A%RaK`z=Xvg-qTo4}Wvi-MOXxa&4m!uN_wxDGXV7jdvMf$Tqy3fL-5tEJ
zkilbP$#N(ZtoHYZ%c<1u%I0PPudS_OXoCi0FejV+g24k`V3?r(>4AZ0WoPFHwp+jp
z3|aP18*mbzq}O{M7mG!^%$5%rz!JsY8;rxjzeflu>+5T6e_^Ks3}7L|%^QC5l~^ox
zwXBn!uv@@8JUmzi7C;$zv25pu?d`2Dnr=HJFm&Pq-mR_8E<s>EwwWL{^?Kdzf(<V)
znowiKvMitBdA`nZTvNAPgBKXU0<!_ub>+^`P)xN<GZ}yZEJKb&BF?_P3kMq;>$bzt
zGy(%yz+|e`gLpW62@8V9^nL4HU;qo4jHY29iHp-Z=4eMS7<6Jxiwwh{d@lF3cJwss
z>hkguVbR|igtTlf_svl%m8?@tj{W^#R3?)-4NPMw7z{j0CP!+`O|V<X<JS)*$^QhP
zMye4I9SX_wJw5JlA~ABx<#JJOx0~wi^^&Y)P3!v8CHFK1cSE62po+ykDx1v~Gnr3I
zi;KByBnxpXhet<85sCG!&d!b~Ip{83*Cb6-UE|{uXmauaOEiN>vXh#bdEA(teWfAf
z_z8PNw7pvG@N;+fxtHm5`v3VLilUob>Td=Iuax18!UOF{<l-ER9r-JN#ny_Cn-mCm
yZt}eI1<a|}tErWhjn~J`w>0MS376qHsp&W6q>dbqJ?`rO0000<MNUMnLSTYSaA)QK

diff --git a/data/styles/default/dark/mdpi/shield-us-hw-wide-scaled.png b/data/styles/default/dark/mdpi/shield-us-hw-wide-scaled.png
deleted file mode 100644
index f7735fb052e5892c1704abdba2d2aee445dd68c5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1265
zcmV<N1P=R&P)<h;3K|Lk000e1NJLTq001Tc001Ni1^@s6<@HFV00001b5ch_0Itp)
z=>Px(t4TybR9Fe^mtRa<RUF69z5PS)E#*%^U}kf+l>WP=r50f{!>|Bunek<Y2OTCN
zn<mEW(Pf61xMZ2(&1p7<!TF%PxfenLA(2iDjJeGOTmGy_eGmdjTcGW|{d=$H*QAvK
z4}>kf(d;C*_uO-S=lA{G-#zE_cMy7B{?8F;X=#z__0_|Ay}taQ?`bk=&%$+3d+=>A
zRDTIt`;8%XH)2D@_I6;%Xf(a*@wjCqNe)D#Z2#QcAMV|@O-)TyAn^Aag@yE0xm=+U
z1OX)yF<&^$ex_ExFg!Ii#qAzrGF4j?3i<<{=errkl9->L`?aV@{ie(1ite<{0b>}Z
zu%JLP=5(I4-MH~J<@fv1z`!^0yLW#~ASA4$Qv7eBP<XnaKz5X(lva)lJ1rJ#qO0ru
zqW1RFX}@D*qv+0^Z@1m<8JSY4nv6ukGqG6WFO{mWQ6eGj2oW!yJNK5XyZfTNtgH-O
zy7VzOIr+;>Bob?1SXc;U;Id#CN-dX@6KBqx)n2=HT|p4puC(o=M-P$D=R;oaLb9x^
zT%y%#3A^2a!1;a!Uh47V^ccbK-$>Qe7^E7F200w{Ipz@Mo}N#mBO}90u^8X%@puAR
z1Cz;gq^_>k*V}tNiVa06pj}sI`4d>OU^W}G+Shk8E(*~O(c8Cg#eoID2%}N^HqWEM
z`}ZHB($dl_tQeJGFo;f^s7EA;-bw4*?aWsfE_8)=z>87^24Kks1yd09^|qyZ_gta?
zfvC&%lK>3B0$?Qk;1wuDBJ9BE=tvTt#VA8VLvg$n-2xWSPlG{45K=z;jrVMb(3g+G
zvTPJHEoZc{U_4I*L!oUx(~<8x))s&vqnic8Ayng4Damx?`wrT`kkQS8sZ^@dcKa)Z
znT~wlK^rr?o}+8E>W<=#jm2|Jv{kvexhYt!W)4^YE*&wcl)8HUe5a(Oq$CG8pAW^w
z#i+CMT>`Uw4!VTFV9-#M+&wutO;Z$=PnJDe9LFK2vytVvxP>H$WP59CYf5Y=pah1t
zwzd>7kvuO{9Y6juy$4^UhGWNGqA=4DJjY1?+S+PP_9zllT6TSXEryvk@TZhajE|3t
zwz2LG0%j3NlK+{+=`2otxy8Z3??s2}@9*O=i+6s0>Gw1+&dF+xMqO%od0Di5Y-MFx
z(Cf7V!|2R8QMB1=KZFi3HrYTRAUK^35zNq)fyy~?FpT~qsZ`!;Hk*Ztib_GDP>@Qc
zQi?Y}xk^<;sMV#Yva$;4bTz2F{9s4Ujg1YoxadWAfuTSkh~Uq9YilbWiA0joXq3m3
zotT}SC6dYbCmzp}oBM)6BZM-Q5>DcLjl~BT1xX69d`oGXs*uSFs_+p^gHsd(hT|_^
zzM^VqXw3M^xj%R?je2{(2zk9vNSdY>@X^nQ&z!3)%dL|n5yY7UhYw<q>d;atIpKDD
z=W-kz=AombLt-%KI`FAxy{G327Y_fMl|voc?DpDqumRh{Xgt*zhr>Z*fFDksY7XPi
zCBOxBXtP?a%BOLjGsh0=h+%5p!<%A19*_O;7d;;DcZc=$%*UC{`eu`<=Cx<;__@RX
bdIbIf&0IWc8+VW`00000NkvXXu0mjf^@eh7

diff --git a/data/styles/default/dark/mdpi/shield-us-hw-wide.png b/data/styles/default/dark/mdpi/shield-us-hw-wide.png
deleted file mode 100644
index 5203f7df75c797f6c69381d43bf15785c6e90b88..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 804
zcmV+<1Ka$GP)<h;3K|Lk000e1NJLTq000^Q000&U1^@s6-iVB~00001b5ch_0Itp)
z=>Px%-bqA3R7efAl}}95P#nj*wp;gy$ry<wUOdpjw!)z8)R;)J7((!(i;2+%5<L(-
zcvnNX7!Jn7gBKHJLNI~5hLiDb#JI7QKNr1eHphgyt!(YqKfd1r3oCFSt1o%od*A(j
zpKpKd>w6exXbjVLF%SrxH^|LtAka4oy(t(5kP8fhj9Cr~Lqp7Ly<VSI6b0|-a4%J>
zd#{|%PC*n!4~{FB-0sfDcDtQ{97&Qk%jM#8n~nHNlI}vKQVcm9u7{#no+L@DMv~++
zLD-x*%x{bb2Lm&a$Q5yC=Z{_}6!f{d*UH$~)e_QWjvK1PVz){wD<5=KRT~|~pmAJi
z4`LuT9)F`iE--)v%oZagJQ^9fEavlh-PkluGfGG1$Hf2(n80qB_4oI_93LOuMePWn
zT>+TD1`nK~EH5&dtTmVW-BP6)6JTbuSsQpXcnssaH#r$Aw_AZRe`4ZJ8Q5Tg!-XU*
zpVH~H4aR0RK}b`YMt%fl!>Ft4TuzoH(~V?Vw)XV&<eNsjyFa}yS4Y*%YJdeyU^k6w
zHR47%d_gnY2$;ZbaM262u<T%FZ7pehmu=6J$%GDU@WB0k-*uX%?Zd;Y*#%)N%V9L_
zqk=&?iWY<B=eV%bbeDY~$MG(-x%9!R+s<Y)_5WqG&)&ufg4jx>k}7(Rrh5Ss*x-S0
zZGB%A#cFDKdCBxuhnOm`!GnM@-0m}9R#!jY?e6Zjp>9EE651_D4Bg48s)W2!sfZPe
zf3fN5C;Gy|TfA0NukE07qj~U!LcM1tNzVZp9d05@qHr9?yk2jWVFt*lsrycz54RX6
z65p`-`FLexV_iWzwF4a&nAK{P;k%$HYQ0tyZwtbYUoA<;O(Kzqonh!;Fz9>0vIBVp
zt)d&yq0i1fl|Y04AO>QOV;pGBiVlR6etDippMdf{8okMTJRWs%aUq4a<7gt0sGOA3
imd>)FMbzJ&7V-~A4T}^N-8z&20000<MNUMnLSTZDqI4(#

diff --git a/data/styles/default/dark/mdpi/shield-us-i-thin-scaled.png b/data/styles/default/dark/mdpi/shield-us-i-thin-scaled.png
deleted file mode 100644
index 9fedc9e63fa3e376daf5b2a75e69977f88e6e5f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1084
zcmV-C1jGA@P)<h;3K|Lk000e1NJLTq001BW001Tk1^@s6r6ZZ?00001b5ch_0Itp)
z=>Px&_DMuRR9Fe^S6NI`Q4sBWw1t*Z1ZpiHQbZJ&sL|9~MUAEy6*Vd@i9ZJXa0z}H
zH7?PpF@9-+V*JoVVxk}zJ`8RwZm770pfS-ZqDZk7!4;v!(t76E+Z2LY46pj(B*UFM
zGk4CpOYgf#B>$RtJf2vnJP=-#*T-C4&$?272a56NuZ8lk&vG31&_C{PBR(GeO!D<1
z*NxoWsOx66x)FeLa#K-}rXfE+b$ni4G?HJzcN1!bHbb@0!O*n!`g(nBPEIOpNuarj
zt5;j%Gc%1CQcdGXxF3x$ixAj*t7grb-Q{phlyIC=q0?2wW@I#K)6+e2osRFc+uhCO
z<(%#O`GgL;-HfS+3gZLJ4N)lWPphmf!<b!Ig)SQFPr%SvSeW(V(4logQIY<nY}|Mh
zt8g3yY6yb%oXI3>K|vDhh}AX~6wnq<Wc7tJfV~dyYHv^NY-vej0kPT+o6RI~xn2TO
zhE@2+R$zEjVWAXGl~};6E-*B<(oz}v!<dhLMvI`Qp}~@T0HqTFwgN+7$N3nEZ^Qs1
zo?wJCfHr1&)~UF+tzXF}x+Et=4Zd(>nJ{6t0?H1DOD#IG7vS?(#{ig0>iP(@J6)09
zxabWgONTv-fEWQcFY);9XR#SLoLv#XQ1}yQQ>o;wVgs}Kd<gdqwr~}*75EYrp$Hm*
z2&McT2z((zjKJ#&BL}@8M=(Si9sU+L9|?;Qcrx3RM67}$GYv!P0Q8)|7y*lEY`jYm
zCVd|a1`DRAd<M>A9|3$6+GH~R-paY7FN;keHA!=SXhI}SwBAR+3tGN@#e@%Ga;dO4
zViDP~X37K9zKBT+KYO+XcmQ#Bl~Q(N--a2*Vu72D`U{3pIy>s$Wf(pJUPsCN8OgSp
zhQv!Op}$&Pba>st&1O1$^coWG0IJ=M00MMD9Lw99{&d_3?M+JP4~bGMti=Zwmxaps
zB4E7nui1?N1(0BsO8LX5_Ajg%Gi=};|KvZhqts!I=W;X8X=9Z1%)iyMhVN0@Gk^y}
zirXz&w>|H=zNEskxMw_&J|<9oV$Zx9wJMaruk|+OrvxY&Bs6H&lwPk(1d-+Vhy?V-
z<T;5ed&#)sO{<JnjHf++M)i7=UlO1JAVKf9r61dzQ@7<_ORl`zFsHXd%r`Pgb1!#`
z`9Wfw`YC)T0se`_dTW16fDHl>J?xdWmge}KN2&~#SFHvXqc&EfdcG;!cr_y}nJ$?#
z0Iv0q|I7}U02KfUI<zL}oJY@^qxT)VJ@)-4XXKVFW3}0&r>|QD^a{W`(FP=aBETwo
ziO@e6bD`nTGH6v_fRW!n;w95R#r{|MzXE?_1-=94|KW$MGOn!v0000<MNUMnLSTYh
Ck@d9z

diff --git a/data/styles/default/dark/mdpi/shield-us-i-thin.png b/data/styles/default/dark/mdpi/shield-us-i-thin.png
deleted file mode 100644
index 64919699baaccb20b2f0217d68988e3618ae9f27..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 656
zcmV;B0&o3^P)<h;3K|Lk000e1NJLTq000yK000;W1^@s6`b*t*00001b5ch_0Itp)
z=>Px%N=ZaPR5%f1WB`Ky|NpZAsY)Pb1>%E1d<%%51F<9!s{ye+5QD&BAie~|uYp(;
zi1mQj7KncXaXTX;<1ZE<0|fl;^z})<*s{e?)Wt<yGBEHLkD?;em;3ksJzu|`?e(5L
z20%-hMeOY*r2_+fxm8tJzTUq5=jr<OoNo>uG?eu9J)=@o<Oeio4I@yY@bCBU8;<$-
zgaX;(VB<+7fG&G!wPnj{RzblACZJxc8*Od8<QfLD8>AOx2FNUsmo49&JZS-vpaek8
zcm^_kDiBi(Ol3KI{xMTZ{dP(m2iH5N(UXbk_QQ7^a1ja_AhVd>efSAVgH!<^vzU0f
zSpQJPG@v0|oUDJCM1{G3QOiJ4L9X9S7J5=tGtfd$@&}WYD9;aJ0nP`Mx>Asj^NFkk
z-)~S(Ihy3J3n~yO0<pe2`+)`=1sS+M)=&2n$Odvv<l|v~mK31(5vczF6EI`HXJ=*J
z)?ezhg@J+bKk0@t{_ibz+QiAuyaQ;~8;}b@V7H~d^xe`#^F<IY@nlhq$znTW*?T}8
zJ3zV^VOoKinG?t^S+Mc4QrChL(SQH`2NkwB0TUy`pOOTNrOAPMAj5iquKNa33^x$O
zff|~4_1;_U;_f}x_n&^$2Z^HtMQQ#^KyMz=RuR1hl$#GT45SXlK#%~?P>`545c?iI
z|CDdl&g(MAE<ZH}$yw=2pAB=@d}3`V{Rzn348%u)hM|NzhJhfBAOJKN<Yhx32DwrL
qh(X{65MKo1^FV_@^~fk-U;qGvju7pz0U7N80000<MNUMnLSTX+ogl9O

diff --git a/data/styles/default/dark/mdpi/shield-us-i-wide-scaled.png b/data/styles/default/dark/mdpi/shield-us-i-wide-scaled.png
deleted file mode 100644
index 20aa79514304520568499c834d7e52461dc81348..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1199
zcmV;g1W@~lP)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf00001b5ch_0Itp)
z=>Px(X-PyuR9Fe^m~Bj3RT#(bZFiv^FNJnMJJ)8sSr@yoh+{6A4j4FK6Bk)bbjB~n
z7)hLFiHW-C5)GOlnTwf;hQ#RR62Y-8bE1wd5wIJIjJXxu6s!qDafOanD6|FY|GDLm
z-ti)xTkk$_lINc1o^zh_|K&ON-g8=xTPn981HoWW16vl!R5bo3V>EN=%o4}s0tUVW
z6X1V?x{c@giMfKQZ5rkQxFyr~k;eEj$2-snP&_L<b6AZ*J9_u;FaE2s@m}+uJwK;x
z+BAy37FZwbZ<q_Fg{8raFsrk<IqphTRStY^ftX};>tT`@!?tZ*nY(tK0$2mZvmyZl
zRJPaQc(Hxw&L@H)aZagHo!72ke<`K7cvNGt@PbaK2n-EPx$X9#v#BZ0)!uHI93RhR
z6H<+s4#e0O88ft@uI_WS(fA(Vdf7ZTg1uoYEzJ+O-34qwH0oHb_VmV+C%*$&71L8N
z2idY<Nz$SXMf!f1YqPtfV<i}}7|#qC8n*Q8+n32YqFLjy;jdIzuY_h1(-q%JkZODb
z1DU?T!I=&=AX>GzudjI0>-`ffDlF-^2nO*rv3k8S-)2)r3uF$Rxal@pwJx@lYj8ua
zvfL#J0NDh=GNv!9tT**u9hMa=$DC@ae|LL2L9mP^xc~9dM^o0~ygsG_KmtL`fO$rJ
zD`cgD_{f-_mNK3=7+8?w6_eB;XYr0r(6%MM1Psiblo)eOPAJk=C^$MShzVj~!>P$}
zvV&>kRRaKXi;#3d`K@rn>Yk7*-*uHCu^;L~M8GoESy5#6$cGeC-d=DwCC5&8A{e%S
zKD}<a%aXO?Y-mXIuSx~)+iK15L%D<0S;ojeTC=;blUMMvyq!-yvi8_=m2eSBx-J1j
z!-e!!Nsb*w=Ht{6&61p`zWVahc}{44!F0njMr{Y*th74TW~bQLfZJWi2+Gk<-zqyH
z2#T+e9Pz;?O$it}ocNY}bm;B!PNN~A`*uUoWAnjl4<9n8>wbXtx8ZscFzUd79(Anp
z<1gQT{LDIY>i6M;Z>1j-v&>Vwx1`pZYwW_jhi{x)a^?^3#DOhiisPPt{Xk2`kyDo+
z3-9~CzAj1asH=YTYok7~6?4@i8IY2edBJEH;Apphw!M46w7dFr$u*Z(Jd#MKh~SRr
zrYZ`}$M;q~)E_G-j{vA;zUT$PC<t)0+y#M&sq&gn+R_d;c9+9f&o|+G?IykE(t%ft
zTJb#5Pqfbfwcr-`pI}UAI(rqK5noQt!5>qPo%yxYADCpvVK!`5Z8B)=uROESwmHv4
zd*BHGE$WS5G#FC^ApM%z>hT8FeOPxsxuNN@b$G;g7wZqzd=R@x+Y3+TUd+GWL|YyG
zZO{rR$=?9d80lTaU@RPf2Kf1~JX>eKs<z=m_AkE=-cx4HvOQOkGpJ9Ar;|c6>|7*3
z7%!Ha24fQdP=J3Q>_OOS*iWz)!2E&w&M1JK^<BI($d)LUGB7&>{{l5?l~T<QBLV;b
N002ovPDHLkV1lK^M#lgE

diff --git a/data/styles/default/dark/mdpi/shield-us-i-wide.png b/data/styles/default/dark/mdpi/shield-us-i-wide.png
deleted file mode 100644
index 849721be95932073192f922323e5c46cc4339afa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 779
zcmV+m1N8ifP)<h;3K|Lk000e1NJLTq000^Q000;W1^@s6<bv(R00001b5ch_0Itp)
z=>Px%#Ysd#R7ef&mQPF*K@`S2+ZJqWtt?0grIb==i+`wKBDN9;h(r?-)EI6?6E#K;
z9z2?8(1QoPcoIDrARee*ObiGAAVvukgop(N6b&sc4H`m)3RRl!`aS4gkQgJ|n=kqL
zW@l!<-@M(O-7*D26vaJA$DvQq2Pg<lL1Bo4HbJ>iA+!^scngg~lh8aQKxvQx%7JW9
z0o2ME>s6saQQcElS186}+jMrjFU{%vp5}0f8l#aQiUq%4nDux#h>whqJ8+_?wOGu&
z%N6FGPGO_Tv^*~w2nb=XmxVnZZDedLkEzv5uJ-mSSoAVfvn4t;)!5h2a0aC*$yl~v
zEMDez-@$?#X(hHv_x%*vA+%a7JkZvbf|iv)`7;A=GO0fq5gr&I?*h6<#?qFSTurKU
zyJW}FLzF}Ax|&mM{LEZbb^;k@=rw%zy<<AMblUlapBYJ^z%=2lC6J(CTs&DI1;=QA
z2?Y9<uHP`7ED*0<_MRh<zoaN@G+CfxYbL#E0t6a5T4M_(3v_5-VG!QK1oG}JF+{R6
zb+T8LzF9L-RhG91#vq6H))E@euAD7@i7abeJn8H}B`?7EK^0MSR_rnc50+cnR}R<z
z>nt`rud6Kh0;ebBwhRK19`EKG7pgwn%^CePu%5`x(hoOXIxqr{yNN5d0wPm%gw!go
z$$h=PcWZun-@k&)2EF&;%_FZgsY-(QBp)U<q>RsoO%N2P8*g`+9y}d8EDC@5>0k<>
zzS8>W+W88fO2st;G9-CY{tZN(fbmEt{GoZv<y&1v{qIBN@wlj_vDKkevRJ7-tNZG?
zijjPy-iPs4K)$Y?w<buM1fT=${fp6<`Ek!gO6O~T_TcFB4jRWMAFkeQ3e~#IOInTE
zhpr9)25D@q_#;R<AyMIW9Mk^*Yoh-nGVS_z0L&)({wMjbz%TmW;I-f6a`ylL002ov
JPDHLkV1gY?UhDt>

diff --git a/data/styles/default/dark/symbols/shield-us-hw-thin-scaled.svg b/data/styles/default/dark/symbols/shield-us-hw-thin-scaled.svg
new file mode 100644
index 000000000..afe6665d6
--- /dev/null
+++ b/data/styles/default/dark/symbols/shield-us-hw-thin-scaled.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32" height="34" version="1.1" viewBox="0 0 32 34" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m23.352 28.025h1.2124c2.0083 0 4.7321-1.7221 5.4357-6.1088 0.18811-1.1729-0.2779-2.3335-0.7569-3.3388-2.2037-3.9859-1.6898-6.826 0.75688-9.3417l-5.5517-5.1815c-1.1376 0.96915-2.6125 1.9581-4.2241 1.9581-1.6116 0-3.0865-0.98877-4.2241-1.9579-1.1376 0.96915-2.6126 1.9579-4.2241 1.9579-1.6116 0-3.0865-0.98891-4.2241-1.9581l-5.5517 5.1815c2.4467 2.5157 2.9606 5.3558 0.75688 9.3417-0.47901 1.0054-0.94501 2.166-0.7569 3.3388 0.70353 4.3866 3.4274 6.1088 5.4357 6.1088h1.2124c2.751 0 6.157 2.5565 7.352 4.0292 1.1949-1.4726 4.601-4.0292 7.352-4.0292z" fill="#fff" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/shield-us-hw-thin.svg b/data/styles/default/dark/symbols/shield-us-hw-thin.svg
new file mode 100644
index 000000000..1c7b49709
--- /dev/null
+++ b/data/styles/default/dark/symbols/shield-us-hw-thin.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22" height="22" version="1.1" viewBox="0 0 22 22" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m16.251 18.122h0.866c1.4345 0 3.3801-1.2301 3.8827-4.3634 0.13436-0.83776-0.1985-1.6668-0.54065-2.3849-1.5741-2.8471-1.207-4.8757 0.54063-6.6727l-3.9656-3.7011c-0.81257 0.69225-1.8661 1.3986-3.0173 1.3986-1.1511 0-2.2047-0.70626-3.0173-1.3985-0.81258 0.69225-1.8661 1.3985-3.0173 1.3985-1.1512 0-2.2047-0.70637-3.0173-1.3986l-3.9656 3.7011c1.7477 1.797 2.1147 3.8256 0.54063 6.6727-0.34215 0.71812-0.67502 1.5471-0.54065 2.3849 0.50253 3.1333 2.4482 4.3634 3.8827 4.3634h0.866c1.965 0 4.3979 1.8261 5.2515 2.878 0.85351-1.0519 3.2865-2.878 5.2515-2.878z" fill="#fff"  stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/shield-us-hw-wide-scaled.svg b/data/styles/default/dark/symbols/shield-us-hw-wide-scaled.svg
new file mode 100644
index 000000000..333621d3e
--- /dev/null
+++ b/data/styles/default/dark/symbols/shield-us-hw-wide-scaled.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="38" height="36" version="1.1" viewBox="0 0 38 36" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m28.184 27.981h3.0171c2.5736 0 4.8382-1.1324 5.7397-5.8296 0.24107-1.256-0.35613-2.8114-0.96996-3.8879-1.9251-4.1295-1.7287-6.2256 0.96993-8.9869l-5.5484-5.5485c-1.4579 1.0378-4.1231 2.0967-6.1883 2.0967-2.0654 0-4.7464-1.0588-6.2043-2.0966-1.4578 1.0378-4.1389 2.0966-6.2043 2.0966s-4.7305-1.059-6.1883-2.0967l-5.5484 5.5485c2.6987 2.7613 2.8951 4.8573 0.96993 8.9869-0.61383 1.0766-1.211 2.6319-0.96996 3.8879 0.90157 4.6973 3.1661 5.8296 5.7397 5.8296h3.0171c4.6277 0 7.7718 2.6339 9.1843 4.2476 1.4123-1.6137 4.5564-4.2476 9.1843-4.2476z" fill="#fff" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/shield-us-hw-wide.svg b/data/styles/default/dark/symbols/shield-us-hw-wide.svg
new file mode 100644
index 000000000..f0a81e015
--- /dev/null
+++ b/data/styles/default/dark/symbols/shield-us-hw-wide.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="26" height="22" version="1.1" viewBox="0 0 26 22" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m19.14 18.386h2.0171c1.7206 0 3.2346-1.2565 3.8373-4.3898 0.16117-0.8378-0.23809-1.9048-0.64847-2.6229-1.287-2.7546-1.1557-4.8308 0.64845-6.6727l-3.7094-3.7011c-0.97466 0.69223-2.7565 1.3986-4.1372 1.3986-1.3808 0-3.1732-0.70625-4.1479-1.3985-0.97463 0.69225-2.7671 1.3985-4.1479 1.3985-1.3808 0-3.1626-0.70637-4.1372-1.3986l-3.7094 3.7011c1.8042 1.8419 1.9355 3.9181 0.64845 6.6727-0.41038 0.71812-0.80964 1.7851-0.64847 2.6229 0.60275 3.1333 2.1167 4.3898 3.8373 4.3898h2.0171c3.0939 0 5.1959 1.9338 6.1402 3.0102 0.94423-1.0764 3.0462-3.0102 6.1402-3.0102z" fill="#fff" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/shield-us-i-thin-scaled.svg b/data/styles/default/dark/symbols/shield-us-i-thin-scaled.svg
new file mode 100644
index 000000000..da8ffff67
--- /dev/null
+++ b/data/styles/default/dark/symbols/shield-us-i-thin-scaled.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32" height="38" version="1.1" viewBox="0 0 32 38" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m27.207 2.2188c-4.0645 2.9696-7.7279 2.9381-11.207 0-3.4792 2.9381-7.1426 2.9696-11.207 0-10.667 19.377 6.606 27.386 11.207 29.168 4.601-1.7815 21.874-9.7912 11.207-29.168z" fill="#fff" stroke="#fff" stroke-linecap="round" stroke-linejoin="round"/>
+ <path d="m29.865 11.066h-27.73c-0.82801 5.1038 0.63161 9.0262 2.9336 12.031 3.4003 4.4387 8.6031 6.8182 10.932 7.7324 2.3285-0.91421 7.5314-3.2937 10.932-7.7324 2.302-3.005 3.7616-6.9275 2.9336-12.031z" fill="#264d99"/>
+ <path d="m29.447 9.1016h-26.895c-0.17704 0.67316-0.31479 1.3289-0.41797 1.9648h27.73c-0.10318-0.63599-0.24093-1.2917-0.41797-1.9648z" fill="#fff"/>
+ <path d="m16 2.8027c-1.7118 1.3573-3.5069 2.1269-5.3828 2.1309-1.8173 0.0038602-3.6786-0.73196-5.5781-2.0078-1.1776 2.2172-1.9855 4.2716-2.4863 6.1758h26.895c-0.50081-1.9042-1.3088-3.9586-2.4863-6.1758-1.8995 1.2758-3.7608 2.0117-5.5781 2.0078-1.876-0.0039847-3.671-0.77359-5.3828-2.1309z" fill="#bf3939"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/shield-us-i-thin.svg b/data/styles/default/dark/symbols/shield-us-i-thin.svg
new file mode 100644
index 000000000..130627eca
--- /dev/null
+++ b/data/styles/default/dark/symbols/shield-us-i-thin.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20" height="24" version="1.1" viewBox="0 0 20 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m2.7073 0.49998c2.6448 1.931 5.0287 1.9106 7.2927 0 2.264 1.9106 4.6479 1.931 7.2927 0 6.9413 12.6-4.345 20.061-7.2927 20.061s-14.234-7.4606-7.2927-20.061z" fill="#fff" stroke="#fff" stroke-linejoin="round"/>
+ <path d="m1.1992 6.2539c-0.32837 1.9515-0.19224 3.7081 0.24609 5.2676 0.36189 1.2875 0.93041 2.4406 1.6152 3.4551 1.1184 1.6567 2.5427 2.9422 3.8555 3.8047s2.558 1.2793 3.084 1.2793c0.52603 0 1.7712-0.41676 3.084-1.2793 1.3128-0.86254 2.7371-2.148 3.8555-3.8047 0.68352-1.0125 1.2513-2.1627 1.6133-3.4473 0.43999-1.5614 0.57693-3.3208 0.24805-5.2754z" fill="#264d99"/>
+ <path d="m1.4766 4.9766c-0.11406 0.4346-0.20717 0.86037-0.27734 1.2773h17.602c-0.07017-0.41697-0.16328-0.84274-0.27734-1.2773z" fill="#fff"/>
+ <path d="m1.4766 4.9766h17.047c-0.31246-1.1906-0.79469-2.448-1.4805-3.7695-1.1938 0.76436-2.3767 1.2368-3.541 1.2344-1.2254-0.0025941-2.3947-0.50897-3.502-1.3574-1.1072 0.84845-2.2765 1.3548-3.502 1.3574-1.1643 0.0024645-2.3472-0.47002-3.541-1.2344-0.68578 1.3216-1.168 2.579-1.4805 3.7695z" fill="#bf3939"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/shield-us-i-wide-scaled.svg b/data/styles/default/dark/symbols/shield-us-i-wide-scaled.svg
new file mode 100644
index 000000000..68a012aa2
--- /dev/null
+++ b/data/styles/default/dark/symbols/shield-us-i-wide-scaled.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="38" height="38" version="1.1" viewBox="0 0 38 38" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m32.165 3.2188c-4.0644 2.9696-9.6859 2.9381-13.165 0-3.4792 2.9381-9.1007 2.9696-13.165 0-13.549 19.268 8.408 27.549 13.165 29.168 4.7571-1.6188 26.714-9.8998 13.165-29.168z" fill="#fff" stroke="#fff" stroke-linejoin="round"/>
+ <path d="m35.729 12.066h-33.457c-0.25961 1.2661-0.3382 2.4579-0.26562 3.5781 0.2187 3.3758 1.7734 6.1552 3.9121 8.4355 4.2193 4.4988 10.647 6.9304 13.082 7.7656 2.4354-0.83519 8.8628-3.2668 13.082-7.7656 2.1387-2.2804 3.6934-5.0598 3.9121-8.4355 0.07257-1.1202-6e-3 -2.312-0.26562-3.5781z" fill="#264d99"/>
+ <path d="m35.197 10.102h-32.395c-0.22548 0.67392-0.40083 1.3288-0.53125 1.9648h33.457c-0.13042-0.63606-0.30577-1.2909-0.53125-1.9648z" fill="#fff"/>
+ <path d="m19 3.7832c-3.5595 2.7678-8.8923 2.7892-12.979 0.083984-1.5317 2.2386-2.5762 4.314-3.2188 6.2344h32.395c-0.64252-1.9203-1.6871-3.9958-3.2188-6.2344-4.0862 2.7052-9.419 2.6838-12.979-0.083984z" fill="#bf3939"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/shield-us-i-wide.svg b/data/styles/default/dark/symbols/shield-us-i-wide.svg
new file mode 100644
index 000000000..b4f483961
--- /dev/null
+++ b/data/styles/default/dark/symbols/shield-us-i-wide.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="26" height="24" version="1.1" viewBox="0 0 26 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m23.743 0.50389c-3.4789 1.931-7.7645 1.9106-10.743 0-2.978 1.9106-7.2636 1.931-10.743 0-6.536 13.842 6.8802 20.065 10.743 20.061 3.8623 0.0036 17.278-6.2194 10.743-20.061z" fill="#fff" stroke="#fff" stroke-linejoin="round"/>
+ <path d="m24.895 6.2578h-23.789c-0.43961 3.9187 0.95508 6.9145 2.9922 9.1309 1.4561 1.5842 3.2403 2.7617 4.8887 3.5371 1.6483 0.77545 3.1826 1.1394 4.0137 1.1387 0.83105 7.75e-4 2.3653-0.36322 4.0137-1.1387 1.6483-0.77545 3.4325-1.9529 4.8887-3.5371 2.0371-2.2163 3.4318-5.2122 2.9922-9.1309z" fill="#264d99"/>
+ <path d="m24.691 4.9805h-23.383c-0.089219 0.43625-0.15653 0.862-0.20312 1.2773h23.789c-0.046594-0.41534-0.11391-0.8411-0.20312-1.2773z" fill="#fff"/>
+ <path d="m13 1.043c-2.9868 1.779-7.0035 1.8031-10.436 0.11719-0.60272 1.3546-1.0118 2.6269-1.2559 3.8203h23.383c-0.24407-1.1934-0.65314-2.4657-1.2559-3.8203-3.432 1.6859-7.4487 1.6618-10.436-0.11719z" fill="#bf3939"/>
+</svg>
diff --git a/data/styles/default/dark/xhdpi/shield-us-hw-thin-scaled.png b/data/styles/default/dark/xhdpi/shield-us-hw-thin-scaled.png
deleted file mode 100644
index 476a82b0282526cc679e252fc7afc9fd98bc8cd3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2523
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

diff --git a/data/styles/default/dark/xhdpi/shield-us-hw-thin.png b/data/styles/default/dark/xhdpi/shield-us-hw-thin.png
deleted file mode 100644
index 561520186e04a0003899f3c8ad3d1229f2a1f2f3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1700
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

diff --git a/data/styles/default/dark/xhdpi/shield-us-hw-wide-scaled.png b/data/styles/default/dark/xhdpi/shield-us-hw-wide-scaled.png
deleted file mode 100644
index e2c63033fe1f6c35101aac9c1ca9037ca3bcd24c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2961
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
Hu0mjfLf)_G

diff --git a/data/styles/default/dark/xhdpi/shield-us-hw-wide.png b/data/styles/default/dark/xhdpi/shield-us-hw-wide.png
deleted file mode 100644
index 85631ddb3a7e0f05754e2bbae23cc3fddaa17e4f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1856
zcmV-G2fz4<P)<h;3K|Lk000e1NJLTq001-q001lq1^@s6D*c-s00001b5ch_0Itp)
z=>Px*`bk7VRA>d=nhQ*oWf;ew_sIPm<Z@sp=1k7v92kPyW=fKI8>>NMwU{`?OPWqM
z4W(qxHZ_}04Yg&>=`=4Th?Ke#oI|{XQCZ7SI~?JFTMcF0733Ta^7TCL;f3$xy0KW_
z>DkzOd7k$@zyEi8ZvgzyY}8PCOs4RydVO%NULWK)Zru1^YieqoL$#6nBO{FodVS!x
zAt6C)LPPbHb#)Ckxqqm9Y;3GHAV9lWFx1yKULULt8_bC?+d4Ztx5{E_7=v8^p2w_K
z>l0ahpDbR8d5p0SB}tkscVgW&Ebp*dZAJ3>-uda%jiZ~II+sflY)0Q0;n!$1+sn!-
zwuy4@bU;C7vtbLue2g7P>FFC;QPCB+efxLb9-&$Qq+G^E<$HUxpG>C7kIKu-{q6Ra
zD7*j(D0(4+m?=0gFi={(dJX@bLx;YQnwy(>9%HN+la2jf_VLkKA|fK5+`s?Fa}I|z
z1AjLW`%l4CM}170G8N{|od*XF?31v6hHbW>sGa2NZT$*DF&|)Odk|d8%G%Eo6W`$N
zu3jyI6DPiel9C^L_akA2qOY-I!yq+vA*7`(0j-vEL2GLZoH}(9a&ofa;lt`7`-qEs
z8I~?x4s+(r<*^qpeg_#D8xT!GG`0!v^4{K^C?LpbHiy55SMC6b*}Z!&OHO{XcN?gx
zs)EA8%W(5%F;rICptiPF(&=<8EG!JBO`8t0X1xmW@vi`0$v$nV0<SU@7yke^Zd`|3
zw|<7|>S}0dX^}!hLs@vZ0cOsOhxzjpVB*AyecE5Ra1Jsv>3WkWNVi%mKkXAFDoiHh
zT732;{Ode>HkTTy(sFapa7GuaajoE2q$p-338A3Vr@vCA5IGbvx&#rkaiu~`RFq+f
z5Oeb6ad|sc=ZRH_A`K*pk3%@d6ky(e@!~XCw=P{FR?UUUlczvqV*}i|Q%c{088}8|
z@wb*S%@G36&(D|Y>gv?2LBU3>1qB84g$2}bm{Kk%HFfcJ%ojE^)U%yCcTl}s7_kyF
z!WN>2j|iFy+$K#jjCVRE3x2Y-d3om`CMH(6RGF5QSs*z%3GWQFdU~>`yLWAW5oq^7
z;i_PtQ|0;d=O|IN;jqH_a5y?7#85@IAS&QUb%jzIEY)swhsZP<_Pv}{AqdCthvdYO
zUml~%Jia@e%fo}!$N?3Cyu4h_`g&KeJWy@<#>PgD<mo9XKFbP08jXKDMLm1gp*H?L
zJTxC9!wI=!eWnm(x7!0LNUPOSqG}V2f?2>S1ToegO^yi@UJ!oOrh-v03s8k1TstL^
zgBDb3H^C^F1#h>Y=;-KRtXxEnq$JmZP6Vkjl`$^rV&|CMf}Bo!22QR0X>n#WMyOGP
zf{7T3m6(ZLIJqF&S;6lGUns3#?>@8b9#(0sOGDR8!Qp73wM5|T*>hAshZA>#QkriP
zGg@Gm2G`UFC#0!Vo077C61OtJEHv;(4ri>BNX68tFS?Z&IWx{f`H<7~QDCFViF;^n
zCrHK|K=9%#*F=TKj~`RwRwiTS8oC5YRiwgZt8gnZN@kY^@ec8I(6wt<-A)kg=91xe
zfNK!%P##s%UKj16xQh{McJ|kNlLRGk4O~!Jne8`JSlrs$$_^g<%w6;Vu@W<}lLi9s
zx<h>Vorz^BC+D<evHYoeQN&2B#EgoFy|3X${pYk386O|l`QSm7YIjYEjTniQnB_{k
zx3Q=aXRTfx9c@=|)QzWeosApcXEX`)^6~;7A0P1b^~1%VA5W<~l7<U6Xlr|lkJMA1
zQn|go9V#lyVc)(_q^71O{-}9)_|Cg`?;c-i6OTd=RiG$cM~9t`9$u&NK<4f34SKyE
zLPA3Mu}4INi62TC490<)^jl9u1s$f9m*3~dG<9{gKzkYvhoj$kQHg3Ud3gAwpcp)S
z>#;t9gbO#nQ*qh;7Cxe5@s4?62Y#5>;XWA6%yk&&D`Mp-oeO1VZU&QyAK=MdiaZ`^
z!k#_5_&Jfn(Nk!{>)nFKRIQZa1%8SzKi!E(xOMf7#bV3p3GK-ZD5xi-|6E*LoG<RY
zi~(?lp~xuw!Ix0z0*nsu#I2YO8#36674P=j_~_9iuz!D+<a9de_nQ&;3|_Eb5Z;34
zx79&GK{X{MB`D}WwwRchpvcJZgIz})(z0b~5>8FJKQ5G~I^m~SYV&Vm5Bm-c27za^
zuc3<L7&FFTFu>u%$9VXvRqx>RitozeX*yemXQY<~>t{H=5fMZnv9ZSI9gfb6`2NKP
z2kZH0PA3KU9+Y}}YZ6OKEB+o1@K9|=Oc4FB*=+X5cPtM@B~Tf~T*i0g?V<k1fntYi
uBPxiXTw|MkFJ>kD%x;p88N-Dhtld8zW;{MI7msTI0000<MNUMnLSTZzD|9sg

diff --git a/data/styles/default/dark/xhdpi/shield-us-i-thin-scaled.png b/data/styles/default/dark/xhdpi/shield-us-i-thin-scaled.png
deleted file mode 100644
index 87a595b9373a8175e42cdd3787871285abdba3cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2407
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
Z{{j7f53W-M{%ZgL002ovPDHLkV1iDFt91YX

diff --git a/data/styles/default/dark/xhdpi/shield-us-i-thin.png b/data/styles/default/dark/xhdpi/shield-us-i-thin.png
deleted file mode 100644
index 76a9d92c073dc4eb5f91ebbb62bbc48282b95dea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1493
zcmV;`1uFW9P)<h;3K|Lk000e1NJLTq001Ze001xu1^@s6V|zH800001b5ch_0Itp)
z=>Px)k4Z#9R9Fe^m~Bi`R~W~8FSiAR0Tn?3(E$}F1BCFRBCk#i%9dfaC3}hT!69y0
zwhx=hbYzQW_+k4triq$m0?D%MB_R`{iH;Xjag)F#I2i#^bSe%j3J58!?f(BmTgoCR
zCeoYCC;9W7_w(bqx96ODB+Y-!ZnvkSXd5&Joq(DoNg9El*3icvl{rv8WQQ7|Q|LDc
zKdqtPd{kyZxzIf58}vB~?=s1iLINGa;68!0Zsk^_|AgA1%g`-|{eq!qp_S0{kOH|I
zLA#;zP$%>cL<@yhK=IHr$eqE0d^sR*zzcJ)B;Zbz8oKuFlLzYS<CkpNat@L-vOJ}o
zqwl1%+3Z)Usx()stCKK>5?)l)8dX|qm%Y7b>}NBZ?UxQ7l&;s*q=c?t|Hty(yKNY>
z2Y_EX2X_sCfyJX8>FKey78h?p{uwqx<D0$_5obeka&82yTxkthu|o72>g==+wYMt+
zO-*5A*RG|b{X*xU4u98s!Ghm|Gc)`2X=&pD2?;XGhdMfJgDovOlhL@;eCyUK6a}&z
z^9-j{R#y8P415x<M=d79;NB?Q3k5Y778=F}2iGAz=cd!^>oe-=dNA=F=u<$O#eaoN
zE)>*%^r+QSaF}1ixye8lC>PSmh@KaG9y2`^6@1}6YHkd9WMc%AAib%%*=ijbS?f_c
zOil)}kO@jAAb%X1-u?R*(W}ASSked>N2t-hzBOuqbFpCQLOPB=X&q$EF&eo@tHsE2
zAJQ>`G`|U_s=wSmC$^`OJ;%aNwO&;fU3N-j*x}DMUJ?<!bp1|*s^|dYWD<bG!{cJR
zQ4^$-NdS(TEj;$9%A8CBaNJ_^RTUjzoJ<1HOP08DtIA|Anahku0P1wgu&U?)qf;hM
z@dD7-$7{wTy(i$kwaPutD*%0TTGavi>XcCzU`#~d-=2ulOmjwt2a26TL@+BgQgwh?
zNfDEP*~yV2oHPALb6uC6wnV&kjG!fIagf%}SK;TRDom$UhL<l5=1Jd1z`saUv@W)R
zUJbS>EBaSi7T?R=1QcNJyq+>3$&y$cJqsz>KX@zkx`UyCfES?tkU(E$b$ocEqrzh@
z`MFSIc!)m_(k7@~#<wSr*7YPRE6wQgY!oGX+4hVMvcMX^Cf-42&OjzZq+WTWAns=t
zc)~Wn5L**(2x0X2;cg@YA2F{T#^I`&E-P6x7#i%?%k*5@{2-sJd*02w>6r67F!6S6
z0+0z5@CK^c3rCy%yEYtGyktVpiSab`)yErZy|v;yy#*}1NfRa_=*+<X2;E7H4N<=M
zFz<*YYk1rAgiW%Szn^m?Ep8FlJ)Ww*cb{+yAjr9+R6t{enK7DO+tyUNH+~Z7oyBQY
zo7crM5N4<X3{ws+QveBo2HcmwhAhP|C0IV%nqKuJe%X9F@4cB?{q`$K1ml7E0Osz4
zpJL+rZAytFgNqwpB<+CYmh=7hcYJ>AwUJTFf(NyoZJD2s)^wn(;D^<TVSKDy<_-a_
z?Lp&A3&_TR<Q469D8O`g%(}I#ZdFg;?G)BMt}R=lZ~M0V#oxFwU<|%<hXL0$-FPzs
zvJ)WrNm>FCR&(;qWzF70r}J)_?uk6h9>o?0`*rUw$!I9Zh;lZ+hy)|YHE&vbC?I?C
zo(`@M%7=7(qklTlC0G8^k$my$?PR-ca=Aj4%lMud7VFP#eL1o1)%@koU4hHjNvIZZ
z58eA83D7yCBbu9#&w>c885*@%kDu<<)i!lUcV0A!n=<SM7dB?c^cJj*9uJtO<)fq#
zhPy)@!0xi(QEXO#&H(|+A4@L8%g+#KCL2KIIj9j}vp#b^7N9!~V0l%R2r+s~9d&*1
vJSDXQs^3xOc?VdD@;u2?f~OJqA4T9_Fs8@YgNRs{00000NkvXXu0mjfP3Oih

diff --git a/data/styles/default/dark/xhdpi/shield-us-i-wide-scaled.png b/data/styles/default/dark/xhdpi/shield-us-i-wide-scaled.png
deleted file mode 100644
index 9cb16fb2ec7f783d809583f90b07875a8bf41490..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2679
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

diff --git a/data/styles/default/dark/xhdpi/shield-us-i-wide.png b/data/styles/default/dark/xhdpi/shield-us-i-wide.png
deleted file mode 100644
index 0ca980c4bd23d9b510184015cab9a40b8014d7a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1762
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
Ef-%lPv;Y7A

diff --git a/data/styles/default/dark/xxhdpi/shield-us-hw-thin-scaled.png b/data/styles/default/dark/xxhdpi/shield-us-hw-thin-scaled.png
deleted file mode 100644
index d5aeb503939e1cc8b48417b64a766a09d9a3b1ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4427
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
RX_No}002ovPDHLkV1lk!LZ<)#

diff --git a/data/styles/default/dark/xxhdpi/shield-us-hw-thin.png b/data/styles/default/dark/xxhdpi/shield-us-hw-thin.png
deleted file mode 100644
index 63076af0c44242e3a8b58e764d0106129dfb7221..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3089
zcmV+s4DR!ZP)<h;3K|Lk000e1NJLTq002S&002S=1^@s6<5U3X00001b5ch_0Itp)
z=>Px=%Sl8*RCodHTMJNB*BSor?t;7&fdwBUDxk~q5YedAv5FCDs-}*HB1Y3_d=+Ce
zt<^RijiZ?un@P2_lZSR}G-?uys2Hbd(uay@RHE%f5Li&~S(WFa@}7P4|IhBZdv;k~
zMq}?z&dl!l&wu}O?)koZ&bjCDUx4odV?g~dJjBGr4AW`@mua;F>S}9i>mH^Io=2~b
zT%gqk#n;vvFLB+&#CpA6hjm&U8anVc*6Chv%aD4TAueuYqRC|Wr`2lJN)i|~8qL$i
z#pM@!TMp)zqN7Lr5y1M2EwA)WS=p7JOOj;mZCP<~y3r<+>4en^K>$*XmzQdKaq;D^
zds9xYh`<|8z#D#HyP>`MlJr2Ovd%9pt^8Y0Z#;40MBn=Q>ODwCx|jz^I1n5hw)pJX
zvn`^&D>)`6a;C*1{RPYF%kAtB=!f`#zT&#>;vRPmoi6hGc(cDF34tz!_Cei(kdR=#
zRvUJy4ui{eIhmfGt~Q%n7q_%D9l$)3<O>cVuC=vkA$FDf)25{sm6Vip+B%{!goN~e
z7t7g#+50$(V3M!JV$BE%2|8U@XT0HZ&26$rEdohML6(o=P5r2p;NTG0xbbz^y7g_i
zdDH1WX0*%3-(NKv_1Ep~QjNE_+1F%(a3pauHru5bj}&XNWXV#N+_mciQ4Lr|IVyHx
zD><dnz|Hn{b&I#RHPmD>Ct?fu5q7D0cwK&w;o(DJ?b=_%>#uKw`g+^5z%rV#&a=zQ
zD~~x9?k3SK5!Cd|W;ld-eJFoeSQvcx;Xa6p8UaS55!SE&4IDf6FE>SZt?JjWAFNyV
z8qA%W#td_F55bl#o8kWb`(0;rb2TL;72bUFEeHw<f{KbOuz2xLpt`!6Tehmzkk(z-
z?UD!_(VxRHZ9hImZz^@rpuw<r??*6n=rDd07U$)ifcM{j7cO4xeth!x_eb#0!KziS
zu$CnjL{IX)_uhfr+{4h+)FfVVD~}$X2rs|<GnhK{X{YNqZd`{KUwi@X+_}y4*s9ub
z41V5Vs66asC?q;1f?jJ#0u5*yvZtoEckjnAc<^8$yR%qQQVb_g=D~#v=UFAF#q{ap
zgMfoUuaAMGq$Eg9{Q>y<2RLVRNi{Y;V6Cj6pa2YpQf%t=(AL(<o;W>>apT5Aa`IG&
zjg523=}6wbeH+PGD0f{X!-QlkLNY#aSUDuOMBr;}iPdV^iDoJ?jf{+hJ$pXFZZW`-
zQvp(SbrmdH^a4~?R`S|fBuTX#U(>s|g2(b;!xcK+h*bcV9hhb$;NT4V_I(0cZ74TU
zOiV3r=FC}e`gA_nUuO8=t+PWyLTc;k>d%WnoQTltqt;?q_yZcSmJ%O7iVciGLBV1k
zMajOtelTOkEI4=WEFVCLjG3XK!A&@uJ;TAsL_|kNZ9o!!%P))>GZuF5-UI#mxlS9n
zg>qsaA0L=CYZjb8{}tT5dxupVU#ru#+F%RLGxABnp1fW^BH3cG<S`5UOG^44?AWmr
z{QTIofvXiCH#av!X6AAzC^#o$QLEL-rKOki**JjggvnP>m_L7k$B{tz=)n>;G2jf8
zy#W{z0Re$W@bz+n8*JFHP8?~uTJbTxJqQ~Qi1|2Sr!?ytB#at0DyXfk`2r3kk(5qI
zNPz6@L!eSIu1KZmfL$LlGSZ;1u+WY}s_fIpZ(LDPk&zVgV2M-G*3i(P6WC2&LcOM{
zstPAQ{xEjzQ}&F?j&|+(GaNolD+Lx>@%g5dl$2fP3b{paMRauJt4PLMlnw~!3we2`
zpl{#4{IVkB2M->=)Txt!W~>yjOT1cER`Iq7rbD|=NO)>1nwF3eWu(QB(gR`OBoMZQ
zgt6OPF?Ap!CnpD&($ep_VSfHeE-E$_F%UMw=nAF-5oDmzsBqA<1sW@q9%#+MgGM9$
zo6BPCmIweZIVWy}iuQ_>Yib-AEEbK7O$6hXh}hWJ8Z=_tWDN~QpjVGl11=kYFxZ1N
zK0aRFvEfRJ-4bCNCxGQ967JpW_3pTMk0&ZOG&IN$61VP*?#72siLlqajUzDQUY$|{
z?z)RrmobS-lHIlln~@|>9%y2v)DRF5AXMFfNl-G;EfI9?fPIUh#{(Sj_4Relr<gR=
z9aosFzJ!UexvRWeA{rWMMx!yCbq*gM;Vz$|bP*AeyuOkh8&AuzTOx32n!+t;mrChD
z#2{i5ak(V|4Hj{u<m6;7DmHe(AY&5&bs)lamSH=MqC=R})ajzVB4xrrSSa8)F_JL4
z0&yaO&L;6VZ8JBb-5hUkZ=O_aOc=zSDZ)rtML<r=aNNcIDfS`S%4bXO<Hz%5CdEuj
zl<6pO+O#P^OL7V-m6T~PRQ!o!kz0iQmAR2$Sg|70V@M!O)HMhb57<REimy_c2&1tY
zPpV-M84esc2oF-1@H`$96DGn&fv^&04o)TlyTmfC%*<Tr5n}_#!($pN2pbO~W;RA7
zB#ao++G@E;1~e1<^2-9YU&%9gQcS1plO`oWON-4Z$Hzw%URZeL7Hbjh?Uo4~Y+~XV
zk0pUH(z=N-^1!j%yM`p6^^*gLrw3<@Htd`T+iU|Fa9*u>CMC`oC5GKjgjM#}X>4rt
zO!NXOXN)%Nj0oJh`7gH<e2=)w<6?0`8aLo>5kPy3fXf_hPyC>`ty1H{!i#d%ajW7A
zB^VK<r4{J@D=}uOs_sH*DLdbhjXg;qY=qGkq+2%Zjut_Fjh}JA2M^|O(c@wfn~0fr
z4LsCQ%MMlt4<6t?M;=84`BCNMWXqUD%rX(=w~WVOC&;R`wH30mw#peiMIcOVZMKbU
z!YcY|%S710zQIA~<Q#zf{5+mid`wsflMrOAq*DtQusay9p>sLy)+Unv%$YMVefl#H
z7#Jv;DNZJT@yyH>xV~t%*In9MUS5$U0&#5-;N|7>OB_Vluv%AF3rm;2B#g3RR%OWa
zh9C@t#U82<<7%GZaR(xbi;L^=9AFL_u;tnH>(?MXJq?PAxXTUC`u`uJTM(-|VXy~u
zP*=?%j9kHEr>#1!q!`_he~jA~<dCkRH2G4^o;?S~kDq{Dr62zK<0i*I7&0XMiThd6
z`RuJ*H_?akE}qjipojkh=2Lm}=n)W(E79*m^*p*CyPX?!N(6yN|I24^^8!a0tGp;9
zy%=b-gS_=4@DPQ3wxgn=*e48eaq;A$Bbt6=86OH17hhtZB2-jVFweiMS1W<M@!Q+m
zJ1rmUK^v9x&|T<@&WyUPDSaseV9LTu%;>BTcY6A+gIs^<!xX+f=FYAsI`WpK4_iL}
z{4?%G+>>m~2A{=0yu8%ExOC}qX;+!LC4y&;jUAa}He2wtN77>p2|{8*P#%u*5VYyE
z9BMK1=4HU@)oYk@8rt?akl#~Q);2hBAiK*ajs;q=3b;hDUc;wfhcdb}Sjw;~<QoiE
z&i3SnodW1dX0kzlOn;N9S%>`;2~z2iAZ$U_DSRWCmqV>$^X4rudGZvl>M|z3rwtp{
z%f8dx7@sgYQ%m^>xD3G>aO^T@G=AmiKiU14F1!#o@i!*IO_{K1(<W7R_QxqWP;J2L
zlSP}fv~>LZ={4Lk6OZd17EMi!_*v3sICQAPn05-^W^ZI<EIfwgKXMnI$3lby7C=l)
z)LgUKx*c@`xIQ8x0=948i34l|SF!l&)vK^_<#M1{2vusev=Uc|xq|MIi%v7kM_xJ>
zh~GpQLPH1a#xH`xG0BeB$(`rZPjm6Dq=#X{hO^t!6nNP(n!Hu9wCzvYuTptGYcO2?
zkDz=k;$v?SVy$($s0{qB>H{1<m=g-kP1daW6*Jkk?RTQDQxkqqwiKtqj-{el&|{Fl
zRU)YV_Rp7(AQ{8m;laW18hYvA?63EqS-UH*r@C*Q2&$M)r^D~c%{lmnnJQKk-voJ9
zt2({Byj)%wh}R#d++nTpIB&+wCZGWU{n7D4+Rt?)lkQ27;HbkBlCVWcdi}^}=|}Pt
fs>XM>6&d&+-g8pSK^ney00000NkvXXu0mjf{2AlW

diff --git a/data/styles/default/dark/xxhdpi/shield-us-hw-wide-scaled.png b/data/styles/default/dark/xxhdpi/shield-us-hw-wide-scaled.png
deleted file mode 100644
index 4eae04c828c1522e25146bf1c4611ef5402ffed6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4882
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
CEOYAs

diff --git a/data/styles/default/dark/xxhdpi/shield-us-hw-wide.png b/data/styles/default/dark/xxhdpi/shield-us-hw-wide.png
deleted file mode 100644
index c437a38730d65df6e37e0d873f7b471cc93c1b97..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3175
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
N002ovPDHLkV1hv&BJ2PF

diff --git a/data/styles/default/dark/xxhdpi/shield-us-i-thin-scaled.png b/data/styles/default/dark/xxhdpi/shield-us-i-thin-scaled.png
deleted file mode 100644
index 83b3f80d4ffa163f8e8b91e215e6fc8fc1ca31a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3934
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

diff --git a/data/styles/default/dark/xxhdpi/shield-us-i-thin.png b/data/styles/default/dark/xxhdpi/shield-us-i-thin.png
deleted file mode 100644
index f6b6bff33fe3dd1a24c7e14ec726c32fbafa086b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2385
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
DlarNj

diff --git a/data/styles/default/dark/xxhdpi/shield-us-i-wide-scaled.png b/data/styles/default/dark/xxhdpi/shield-us-i-wide-scaled.png
deleted file mode 100644
index 3f1da7c045524eefc6ed3a52f966b4674eddc2e6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4323
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
R!cqVL002ovPDHLkV1jiBKUx3)

diff --git a/data/styles/default/dark/xxhdpi/shield-us-i-wide.png b/data/styles/default/dark/xxhdpi/shield-us-i-wide.png
deleted file mode 100644
index c3ac7ee78c1b4e5af874b1d1481aedd8792c7549..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2752
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
GLSTXzYDupE

diff --git a/data/styles/default/dark/xxxhdpi/shield-us-hw-thin-scaled.png b/data/styles/default/dark/xxxhdpi/shield-us-hw-thin-scaled.png
deleted file mode 100644
index 8281311b16ac04a32b3ecc66e39257a4f6ec9002..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5280
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

diff --git a/data/styles/default/dark/xxxhdpi/shield-us-hw-thin.png b/data/styles/default/dark/xxxhdpi/shield-us-hw-thin.png
deleted file mode 100644
index 361ace4af182616daf605a5104aef7bec0f32918..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3671
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

diff --git a/data/styles/default/dark/xxxhdpi/shield-us-hw-wide-scaled.png b/data/styles/default/dark/xxxhdpi/shield-us-hw-wide-scaled.png
deleted file mode 100644
index c63dd27957f17e2a5bb81b9fda4fabc13b7b45a4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5739
zcma)=XD}R4*T>Zm(TUy`39<;$#VX6{qPHM=k1lF-t3|It5WQP1I;$q4cUE03h;9*m
zAJ4q+=Xc(@bMKjZ@0>Ybesj)${?Qum6o?4u2rw`(h?ErNv>qe$aR=f*c{~Xcrv5wz
zOb;yuFh<Q7!yX0()e9v#866+YLzAbUDIslWzvM(YtZ;T|3^GM9F&ie~cORbpXE&78
zlm;YJ{X0vgWyn+Ge}Kqf&W+X@hMJ=oh8Vm^>K34UzYhz(`%^L1&_Qr0J0KB<JXsZv
zo>#iiAxRk_j20KrxevUr{0ob(xd}qoR6H(LEqTCqQVo1g97-$#OlUAz`v15}BU!%R
zGeDHyy?Zxv(Z-c!BUNFa|Jusd_82XeJ56U_Qd%0Rqr-5^%nAxq9R4_8)3?^_w4}F0
zXOCvEFDfcJpSj5L|FklvIUTyQy|uOV<I>}O4rO_HblCpizYpd6l(SzE4r<eX_WdTb
zeSLjjRGS0~sJYBl88$r!rlXlonXv)n410FhuIkKhz3!C5>)vj`Yk>Ux{PNR((S*jw
zkU&{6kt})Zo}Qlh14K%5v5?1nMUkR%44gdEUw!@pe@C?dgCpwW>qsaf7ttzk{JjDF
z`jeFB?gVmU1A8;^7Z-+TdHD`2yp;vjv9Q1db6Rext0{MtYVI(F_aDv9UP_T6j->;~
z-2$1;44xtemzP6{#sY2q)*K$IDAPRszDCaN{7ROypNrC2$<A&frQLhyx$yIvAKNUl
z3;D9>E=DyvxDyDZ#=NzVP;pc4yfS7&=&s{W2P<B`xm1g-EH6h(NuY(1izV0RjdVyq
zZD;2P|ItX)h{#}r*=Qsd;AaRS&^0p?zLl(Ef3|hYDI$^)&-nHwNB6iY4A!h36CdBk
z`SN9(*9o#L^zN?SPfWwHRa^V^JR#<<XmS17RplVF2z8SCVt#(Up!0I|`BuufhK2^|
z_Lh})K<5h}K8!@+E}EZTbH&oqGA4n63z$A_$Ma8Uo;~~tE+j4{{^&~Z<Qh1|7(QH3
zh#K2hnl2grUQzK%+!Yz@<H<KD@WkK<$iuVrBHY%Yxurx=Rka0Acj>cLx2oepZROtU
zAm3atcrkIsx%7vl)c1@Jeo1F2xOb*HWf|c-y>Zyq7Uf6m{ZAQ~Aj*>B0q>gfNf#Nv
zW`J^#{^VkllZwciM7lHlK7o>g!tx0h7gzqk7qpB^S8FfE>UpiW7Yn@Xuu;V8@YU7t
zzuPN}4wyV*Vv>w|`SL7d4ZB|q$(0p%WxZE@sZG3Bjt6ZTG@TB){E#8Hdz%ST$$gk2
zOIsZschLF?qvmo&7dCgFb3jSH#%`I|2$4u^Nvp>WEv>gAy|HmH{QeMfbJV^v_F<~?
zk^*Bfsu`uN=Gf4avib@AaL=ZmTh)Q(Hc>hm^vvv*RVKrFe<B|{j#(<ix${EU!dpAS
zvDtb!ed26eCC5=*EGE9AfN!z1ML0ZC!Rm0KuF#kmIka-}$&0{uRum?iv@=%ITXzup
z>}IMz+M5h+Hx^;qQm$P(@%Ff?$!EPdD_-*FCRIMQ2yY0AJ<!79PJnYH%zfc0#ly4A
zZ@gcO+eDmhV)UxtD`jTxm$$WD+tA^1W4e}cT*$go1A6*eToQ(gfYJlS-hBb;gHF86
zbDRfDB60F@bh2y;AJmOid>mS`0*^br?MJh88~vM?vJk|{2MS%p08>aAPK;|1!}#CO
zj7ZcH(LWH<OGl0O4LKE+JT0yM<X3)pDL|IjjjZ=o*4uyl@7vCGD-#=SQD+1bG8d~p
zY6K6d{+n^zuk+1<Qkg~Ur#j`C!Rf6Y`g(d3k<2xPvz7Xj@r+9=xc?UOvY|<AE*P}(
z6#8%;q2;@3!v;Eb-^i9sd#7nQ8iNkxM`+@I=o%Acx1)Q8+CisLar^X;<Gr4ga&EQ0
z%UKP4?++nh+AXi*4q^;P5@(yAnE73;+xP#FQyC$Vx|23Eq_;=?f!PnIk9yvT!p&A`
zk2p(8K1frWO7#2m@wV++6ry%bULDDLD5Ro(3$4zZx)gx?yF8A*wW;F(7Moqv!|+Vy
zzKsKGXp}qsF3vbVXos{k`D{f0dV0ejCN1TnASV}(vXLIM)Cwlu2_~&P?M73oTfLCD
zTre(tPgOrx+p2*;_!A)~OTRM*Evw^^Fv<ObP3_+Ou%CXSCLKO0bAV{zxHw`|z{Vr)
z7aB}#mS^fv3Pb()v@g=qG}RRVZ45#O7QQsUe&izdPYi0Q)8BgohIh_I$XZnNEdi4=
zK^Li+-jbOu8BhT&^7#obC=gFrY_y+NQYSy<RM^{dV|)d)=kffMshIj4b<i+At*f82
zib-ysdcV(78+fm9jtu)pA5JNT@vkc?>id3^6R<Is1V0Gjr4oaQO)jphyLWXoi5C^M
z^UZ^J5k|c?rJ@#(|JwQ%AImiG8dojLlR8H<B*bdkZfU7$wq~^pgpT5JU$;xAq&6m9
zD{Rt3(+J5WM-3k$hhM|N*iVc(<%TXbahhDv=|?S_aGraC8JboAV6pbN3&^L?^{ruz
zol8q=;|3`pN)axqF1N9Iw=tl?FPX&snCFJ$?%}~FEz)!L1IOYn>J%1xZ~)FIjOK+O
z@=qg37!Ss+!Jhkbae7rgDrCLCl#t&*fgy%2RZ`{#uqxBJhQ!~O_CmN3#;@y^E<WK~
zjgj>a3`{1!7%o@IFc7P8za_(pB%z*mYK|-I1rIY=wT_k${hI03ch}?=g1Ec)>RvJ2
z(O{~AzXb(W^aw)mX@$`q4G%3p%>tBPCSQ#DWmv`MuWxO&XyTt>R#172<-+eXUI*of
zd&MSiayI9&cKcZc)PI1Q2Q;i2qQN$T%my2?Kf1ai_S5**PqWtui?31CWa>OX3IqI^
znHe+X4d<JKhB)`0im*`dX02!apq->(b$TUM3Mqs8Mt}QrfYl(@;OJ}d{rTVFh>t%Q
z4Q&!Fj#uwMSE{}cVo&sa%3f*S`$iq<ckfyQ@G<9r`})FFXpsNezxt5_yOQGKwP^o`
zzkDO>eUW>){zr|3X#`T%x394zsQdh^@0D##3Ll6x6HgY}y<tog)7RL9wh6%_2IoCw
zD$4N_Y5F!%W<!@AI844)bOAS9b2ypuvOqF-H9fub*4lw8E>XfcZ9OxYL;R77v=~vK
zepeiE^tY%J%_caY+iz<?t+zJUaIMN4V0qiv1EeY`Vz-%@pRcBV$a(8s@@Zf4%^x(v
zlol-;JYP!49Qb2deG5X}cXmb~<;EL__&mt;;zcpkz@Cu^0pZ?xVP9NaY``k4N?fuW
z7~VaSDPXtMRIL^N1DB<rRmn`8XEc%vT4>Tf$W^9z20d8uo);xaB6wt26ssdPF@uyK
z%x3fU$vr{ztaCD@LDwfNVC4~ckMH&g5Z1x%oOY;y&;7n};%XK=bS5_k^K@}*JJ22k
zBqwk9G|d>O^*M40JKaQ_pbHq}S_5b>oo^xuY2_qhen0uq|AZTjPWV&5Y^AmyWo5*=
zyli-Vx#YB=hX@SDfOV6H+YQ!S7PNnCe*qn}8BeAV^W4?H6)_l#aQBbu&X>Kyg}hnl
z>OQ;*HPQ+Xmow1Pm0ct64McMDe7egEEh(g;_+Wihf0$0$?sZrJX8i+m9T<QdP3b&H
zh6mq~7rOY+^dnEBZQ_iy1pDVkg!}AAIuQM7JFo-{b!~iXNuP6he>np75=B7bg@DmZ
z-1-j(N|zv3Tr?+;{H=R`j|4!w>6leR&t?zo(@53Jre#*MqI$5aIV}5`nkY>GJLJs0
z;cb+EcHumNP?9ML>y%zz5{bO_vA)9#S$ywXD7C`2?W;(@1Mco_pXS_@!Z)}m_HBfR
zL>ARHQ}cyGp#-J%_ZXO!T?~F7dH0!;LshlpXa)X`z9_%@{1lTTAoKA#Avc*-lbxKt
z@`0Sf;417<Cx__=Nc?Uv(jugN!_MI0xbvmor<CTgB&MM$&8Vu=ge~gYTP3DYA&4$m
zDr%(FeYIMR7A+$^N4<Z#JIQvxvc1Z~#pfyne#g$kqt>PC%&gFDXle(RZyR=RC_)BQ
z)w%t}Nm8`1AkXo4CUL9$C?y?yG2rJxa~uAoQ=EOQ#zsj~=lpoxEFICX6~LHwDurX!
zStn@-8%--v()xbiqXi0RiyEQNi=%PtY|(9Eex%*<UMyC!QwB~Pec+Hxxe$IYFDHmL
zgdeq$EhKkep>^V6%a1(l$6as`?x$S<k8+$co_YIH%*Mo=eVm~@Wyn{{)_4z>Olk8v
z{KH_na{Cku0*S2cw0`oZre82!FWCBlt47%5lcBbbZrU0LevdVih;s*PcpfLb{NvfP
zQ9n-_P?yX&akOiWp7u$doZJO23zVOIX!u4zKt#BGvr|zO(G`c0r<$0=ud@i&d>g+h
zw~>=@DqdaEEvCC`EKC~u#b+&mgcE$#R0A4gWVY_P@uXoa1=My`|J2exA%m2@o3$-u
zv+&gQ|99kcXE5UL3Z$UHKe0jG6`pnl+{R*=@80TU3(IhwO`4=<VTHG-lZIMKTp?wp
zhIy|-FkwOIp{A~Lm3&n$bL}m*OYFGvt+hL8&X;mNj-BRxHR*k?yn|V~ADfbRtYnuA
znut7wl4hGOZj#r7#o}N=N_2x$zZ<}^pK&pELk$&F3K5G3Lir>lmftJ@wuXoqa3V<1
zjCHw;Kl6hg6KA^&aCYZmaBZCR!UJiU;DjAB&@;CEH5S~wo3IDD7<?8ysyEhnOjvrL
zeJ&yiy92wqnN*aX{GT0r*oRIm5=`BKX;RmzhPlD82v|a!I7lmgvL;6X*t5+!bQp;*
zx^H;WZ6`UAOC!5jV7$r{#JRz>1SduI9aWXA!%4#^dwLc%5z~7g-4QCS*!Y+`mXcwi
zjqbd;G6XwuN>|;a)>zD#wxDNBG(|{M>nTNDtI>P6I#vi$8|#)_(a+}oi^n3779Ym0
zJ_EV*Nl4`ojwBWoY5<tDv%1eN>i)@|4Z)DCL9`WSooIS}XX(D#W^09pJiw`(Qz*@b
z@W2KpCTgYu7sV~QUKp(1H`btM*!QsKkDrH&d+6R}znqhWT7b4_8e=g2;0<)u(GXqm
z^(7bGc=s4N)Barbi+x_sUIoNMJjQ=f%^cqrm{8Ml#n1t$$Vsnu{hQS{C2JlcX2JRI
zz%{q(Y#0H@1l~WX>ZXiBya+h_VLipFo)lhxPm9S^Ytbnlt2go8JF>t2s(yX2Y*%@P
z_NRJT2mCo~ul=BYn2|qq7)IvvaJ^%PvO&pW)3+=!4GrCF7`1AoXN7{=yg=TxPu>KQ
zhNN>F9(elv?`(<eu9bwEgBrR9I%`Mw+yQ29#ahSh+B*Z&5-)Zqu_L3Z3Y(mk2$JgW
z2{DgkV;RK05i^LI{aLnoMwgO;x_8i?*sT?0?rkV4;->!v8CdUP9&TaW0OiiQX<`A;
z4Yng+<&B!YZl-VsH*t%I1l3d~x3J^lsVYXTYG@ZGK&K5HlTuQgxc@N=+SOKirjA6C
z88q5q@|fIIWXcNC-@f%~j1%>#RlPHCxTz~t(sB)dms8NZ2@f_R8?&=%37aa{=16WH
zsVgdR{!APqvSuuU`eXPCr+w6>-F#>4uA}755<8bDR#wtIKR=_dfU`%+m#V69&Npw8
zr>0`li_1OJmhniD>f>S_HkNn4-LkM9qWxWsQxT?~X`?nuJ!Hx%3C?lR(G`&><*pq(
zKK`L0<-N0E7)x#Zz|a*bmP9O{?HKp_7S}EcKqGByD|EbdxWY)w6^lh)PgPa$hN|tF
zzWZpUoyeV?qf{e<x9%vn@Gb~|<8{0WNqM=VmiO5rr@hywA5{h@@l7Vm$SYEVs4B+<
z;R_8&TxHK<ztoO}k=F=~y@i#!kpuGNX&4y506@>rCh`1yb4ofohYxerURi!w$pTms
z!GqJwpHHh^x`_AIFD{B#R8|fQcri)}1qptb8W~C8`GK8WE32R_9aRc~%mB4q3x5B8
zs=wcMPjpQ!tIqtg*Da+_s_>*mq3^l*!r_v)bWkyNlVp@&lN9ould395p~rBx^T`L=
z2ZyVMT<?^1l$Nq`JdLorD&t$d_~>7jI+||FUlYnIDn2$=5*i(m_!xP0z!WrPmy=Uc
z&`Bb0oiA}Ya#K@hvdf$SZ$8I~kT}{Kd`KQM!ua`%Blz2IL9=dXYOZAB_~J+VscNdc
zv_ZDWrRE@&)>g69ygU~|8eKiT#zg@MCH${<DV#JpL(35$Jc;NTni7azf!H<A4J`>q
zq`BhjkuN(<?=@BvCD_>d7Fv(z8Dy{jWb>Rq+#XxZ=cyJ_tUBPHzXDW00hY~K;)L9i
z(09bV!gVI&k`upcM?_O>yIoxPv1dh?)e7Pmu|pRQn@Bsv%<Xu-@|n9vhDo<HLkr6t
zBe{$o_VI;#=G^QxIdv$vG+RiX@A*5J`k0Ha1pH&)tQ?#c<stfay<^xPCTr^z1<UV$
zliEzUJy5LseQNU+ZWHm6UdU#@I#`cLRUP~xZh8P=5{I&IYg5tS;j4yx6*v1_<+K!!
zJIbhkXm4l)rOcHa$#yL-FTc_*7H?|OOMtX5JpX>tJ4=tFEG=%|(k7V3<N}iT^p~*E
z*Z!5N%J#CvNY2|xS2<e`CB}#yUQQuq0tKO(```xyO~oj^SnndA@m$c?q)X6dLy;?<
zE<7-LMLoAMp`RWaAatIO?-EGnX567B=rBX$x0^3ziB{K<sJ6Ny{85@081v{rZ7&b+
zaLjDB=B<yKGBP>)yX=g0gjJs}m<rOuUqEBY#dD&){10_bkR&Woz8e^k>yz`D0?fsZ
zFd;na?XnN8Qg^P5qq+Bk_QRAi;o>u9Fg)D71Y29`z+>G4Ng7cWMS$ye+_HniUuFdX
zkA}pj+1}rB#5^u(1Ln?lwhj;i_J@oAAnwW4owRgxf@-UZs%Pgaw$e#pI}B3@P4fKd
zZ`I%6pI#q7>Ssv><?Ew_AN5|*@08=7H64h%mR&9<UL55(+c&q@Ysue9R(u3U4rQ+|
zIDs_jYt-~hhsQK3J@X_cp^8tgfk0rL!7igEpQ<E(X}O$!&F5#g@80!dO!JH3+tBX)
zMj}tL>l-{KLkJ}(5`~~uFK6g7LTOYqJ^F{w=v_LZAGJPJ#KzK~MW2b0e+*NACspVD
zrO~^<_m~b*Ps<p)JkRjUmV!BO9iOq)(qNYxMZDX+sK4~N3F--jq(22cP-JtYwjdIT
z#8Zwf!cX*KNgwKEQ`}z$0{$7w5d0($pU~2}k%$e+6>AZaGA%5$+=Wt8O>~EZ+3nA{
z?5_HAnCrF3MdVQzj|`4IJUk`stK*X)CNn!~h@b?!#8LPGCyKs?QA;@bqed;G^|^lk
z@+vIn?CVAtxNxNQH{8ui?ko1hY&-?U62q}=J%)dISu{RG2xMxU>A#8koIP7c`i)2!
zC@$VMOge+Zn^9c%?S5PyT>CISlm#Y*=jV~3314PD=ntN>UK@LP_2iAEKZJ2Mf6SXL
zB9%r;RP(b8a*~=8JwROz{iAA!^!|UY>;HJNC$DiHnDJ2EY#@hntVj14LkaRut_Ext
F`X3YWBVqsm

diff --git a/data/styles/default/dark/xxxhdpi/shield-us-hw-wide.png b/data/styles/default/dark/xxxhdpi/shield-us-hw-wide.png
deleted file mode 100644
index e4c10d8e416434f8cb17abba56a6c7b79ad927e5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3827
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

diff --git a/data/styles/default/dark/xxxhdpi/shield-us-i-thin-scaled.png b/data/styles/default/dark/xxxhdpi/shield-us-i-thin-scaled.png
deleted file mode 100644
index 23662ab86679f577840d0ee2452503683f405cea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5064
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
T73cq1b9lPiMp_M;PI3Pa{``<%

diff --git a/data/styles/default/dark/xxxhdpi/shield-us-i-thin.png b/data/styles/default/dark/xxxhdpi/shield-us-i-thin.png
deleted file mode 100644
index e738c6d78095e1777eb83e583ca5b8b3b5245cdc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2867
zcmV-33(WM1P)<h;3K|Lk000e1NJLTq002e+002}71^@s6KQKWQ00001b5ch_0Itp)
z=>Px<?MXyIRCodHTzgPd*BRft%kH`eyYdimLGghQ#Rs6lSE4B}nm9&$Bx>_VP3&|W
z(~Oy<O-4JJNz=^ev^F*mQ%!8FF{3rcS2RXVv8h_LYN5W6fGD6?0mX=*?8@HV{=Une
z<KeQ40_y1A{boMCbH4MP@0{<q=bm%!x%VRJ?m!-oXC_Rtyk^%ScYyOGNs_&~P6_yr
zg@dW!G_Rw4$ldUN-ka}~fPXU_i~&Cl?&fv27ydVT(>{gdQ|nd2DLI_u!-fFb2i}hc
zDBUiCUut&{I1@bBPvtV`sf~QJam$a5Up3l@L*Y2^NU+6+;pgys(1%`8`2_}!?XdU_
z*yyh^^ltDO@Cop7G;|r#C&3^2Nd^z|vdyPqYo!yali&hyG1_QoZKBh`zaIK{@DT8D
zFagsRHKA}Z{Qb|DkxyXIhylinz`a<diZ8y9?UN@<#)t^&fIq530f9sOBbbJ9cW|^<
z`UUyYwr#T8;n2m+o=t7HMVC-m4Za2@(CG4r0QUxW0sACpO^sZ=YnRk}&K$A-7ht>u
z;Ix_+`~fo&6{fQmE`Ir?T>8NW^K_C_7d~*{cS#Eu)`le}hOqJuOIg;HuU_rBuwg@*
z+}M~wehem4VN7=RzY`ZMXfjx>Vh|l_=JLLMu5%xM9Pg;C%!Y$5iLbu;N!+YiBKTVY
z%x<;wR={Ai&@cQpSow9EYHQ_#Q>NrVPnT9R0byf!cwUbQ6N(dFdP%;+C}Op^tlhuA
zsbbBV==ze9Cp>Pq&moV_)|+Eu4%nwoJs&@Nwxl<kTlJMYR3)w#6}iek{WR=aK|z|k
zsfjKvPIT#v*}na2V^kCahc2mipl>k^v}z0h%!gqr^K^LT%-F`t$|)?bmT=Idw^)va
z_3vNWZP>8-ZW$Rai`_1nVq*02&6^%)b+sEE)m=M!)N;MBum^^8Y73Cn4t?iu7_HWV
zu%x8&$j2YQVM|YUqYb?wEKIspRpqWPE%jVIbjVb9>QprPI@sfKCHi*LthL0)Zy&jF
zW0hcY48W`q^12qlpu_!9_$D)`+Ofk`ykyCIkFKR1D}Piag7zdYTC^he*=NP+U@5>U
zWihF*;Tf!e<e6p5Mh6-w6c@!*vTWHHN(<B?b`A_i3oWHIViY>Ne7R0`I@zX+sRKs3
zoz7H>QJ{Wa3=|ay205Cwo5}6=U?sYpXZiq>N{onA2#d$800X3AP{?QRb1PTs+_KzH
zs1T4zim`0P3UQtt;>AM8MocCm=LQ!yZ5k1fNcae<a`R@|B{L!nvM8emLbN;O6H(3X
z-7eYT5RJ($V2NU-n1ujG6DBlbQosa`LS?H~C9t$sq$*~@B87nAD-U*w9!FIbA3a(D
zhGM4Jg?Q5l7(VG%u3Lvu<e?ifO%cURu?s;Dp`9N;t2kTZ=zTfk8KGP|Ne^Pj?Rlj)
zVv7W{J`uvF-CvZD*HZE-g5AUdrb~$t-DPSO6v7}9Oc*F60%KxI4NJZ{(;TDFq7U~)
zZ^<oYSxw66*~w8$7K~TUW%!6WUR={xlV}J*ix_ZVs%snQAX(ESV!(m9;c#hg|DqlR
zA_fXD4yP=8+{%*ywXLS|gaKheK`X#qYjD!@p&$VPhJ^ymkJlUdk%QLJVOS`@+;lVr
zf$@$AhZhS47_E;IU-1WlQK7;n+h$<g^h6;@gaA7l4~`i1c<>Gx1(;Ba-<J^7)dD_m
zG&YYF<!?+>Xut=2w*kgPhAPvF0!&1>1yBB^;5-BLBCQq$ljc8qofIBsYVjJx-69-F
zb|#adp^MpY8yE_%uieI<^aoO~?TMvV59=9bub@Mjp#!?JgJ4#sIXS3bR0Ru~12ZDU
zPVcm7nnn!jNeAKzabU)z+VPlD+Y|7U!+SYe0b>g@hxCrMo?-=BlTo(Niny3Ceg@7*
z3;~fjs!yTT0AcZt8y<g*rAZPnwM;Q1D~YF>PAd{m2*ekmZxApXsicGmW3Qg!r?mnG
zi!-uYmkSw#dt#Hz=>!3j$FoSh@XX*NVqOdB=~>DDQpI^tk5@P^Ldn<f*-t;#XfhgZ
zs0;%(YtT!sxl@PI>-~%_1CtUq`SMW{+Qn#?mX)-NSp~Yx9^H3Ol+D6dBgCs<!GJjg
zMLh%IS3k?B2?;UqHJ#}LO-g!6UO0DDxeyn9w6UM^3NRQtw~)>y1rhCOrezM;*_;d9
zzgZax-`Tr|8HEV<0SjdsVIzjh{t3QG38J@tF}5Zw)Oe*i7kGb7#*q5OuZ%AfBBNJ8
z{?76o7$8NL4xd|a`)zo0?x?SsVW7#EXQgemS<T|yk_!y@*LoZnZ{T|&`BxdUCJdC5
z`b6dj8YuBStVQ#lOKTM3qE+czA<ticR&+p&p4)B^4L*B&(qXeXgd-`IJ&I{sR93$;
z>3cm6=Y;-$h1hAH<)j`l_=rs^Lg`Uvf%D*ycju35^NUkv`zXja=45P0uv^7Ts1Px?
zx++=$;|*>-BtM(T$xL+TJe9QVQ3$-PK4y(f*!^P85OHMC7G;gEIzE8`g0wpQ70eIF
z|M2=#)nilR`I7F-*~6?$9~gUJ`J#z@hwts{=ZMwkG~p8%s)Pz95Z`zmD5_Pzopg3^
zV)Q{l_edlY6C(51E}mSdnpbEQI_WO}zrZL+ND=|_A66OX=hFJ$=bY#pXFI`k54*$$
z?uW0I<{U8^0LyJ6KsMjbwoZx0txKCVYasYW$cz>?zBfG&lk!=A6&@CSw9RsU%b#Za
zgYN%?K3zomFBmQC`MpqdJ9$T7;DC07e+FM-)vTdL!?yQl?4kVt(>-jmM^x7{Ti>7Y
zO+?F096dYx2r=F9K2TiC+l&pb)>~olI=Ck@bT-NE7vI{MQczU&B-1?%lIFp6OLC6W
z?p^2)f$|<e5sw&z;+Dy~28OEn0*A)qyDRg$t^fA)^RQ@_zm{FO7dgrE{DkB!zk7My
z71c!BE>Nf^?G6OsbVa>+;AC>Z=;)~``In3L<kU4d?M(L|rM0WM`oo3UTSpIzQ%?`{
zgmnc*N<(}4({5nMIl!SI`U3a~$}_^deDWLbeV>qfxB}nyJgCtlc`~taTl(5h%5WMW
z?r5o7hrw$Bii`E}Ze@pnVa@^2c%*R&wft8qMdxZ=uPx0TTXwN-7_+?}vX9+%a@nsl
z52Pe^R|7&oYylv2Q`{ly6fo2xz@f?b=ipwH7b*8px$ci^503&sLq&aO(*y`k84pbu
z)0cMU>KJG_{tTdy>@caFcE}OHp<iqgcp_N+>*;9z`RH%?kL91fG}a}%O&w_@#Gt=5
zd{EE4SALrQgX&QSb4R0u4w`lX6xw2RitY(8tOo!n8tLc2`~y^0Mv~^Bt$WXyx9lw*
zSW;1&daKFJKRXodSlVRNHzp-S9mC^|qG?$JoT`l)Gb2gQ#x?;ET7B*b-BVy#j{wjB
zr0L_z6sA*4S$2C)mR^zf9;vVuoUV#5DZi?$ayS?(P9GFoiSyXHAp>FzbQ_|sE96fj
zy$gWQece5!wi@kpLjZ{89lE^I!Qy7CGrnb1{x5hB06E_oM{U);ufVW|0TAtdhJ#0f
z6Pdo9vK02T{L+6pQ%>^RS-)N84+I#oM*zu&d=i*09pV_UFRFo(zC|Q10T^|@jP952
zfdius#5<Z2pzrN1tAITJAV!6{FTs2efgl1w1cC?z5eOm>L?DPj5CQEW@P9YXMDFY{
RzeE54002ovPDHLkV1k6zScw1t

diff --git a/data/styles/default/dark/xxxhdpi/shield-us-i-wide-scaled.png b/data/styles/default/dark/xxxhdpi/shield-us-i-wide-scaled.png
deleted file mode 100644
index 05c2982adbd834501b93cd4fcc2786edb5b355f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5452
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

diff --git a/data/styles/default/dark/xxxhdpi/shield-us-i-wide.png b/data/styles/default/dark/xxxhdpi/shield-us-i-wide.png
deleted file mode 100644
index 13bcafe3b060773fb556d49bd8dfd9e45767f5ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3305
zcmV<F3>Nc=P)<h;3K|Lk000e1NJLTq003J6002}71^@s6?O;nx00001b5ch_0Itp)
z=>Px>qe(<TRCodHoC{D?*BQsz7rO}TE)o}cKYSp{KoCU-gC;&hnV3e?X-U&glZ=`)
z>9jL8kEWSC>P)7cj&YKSX=~c5nWofK9c!ye^N^^GroMO#sV{t>APO<S%F4pN`u~<a
zH|Jg!xGXCYJ>Sg7cOKt4_uSt-`|Y{s-bEA9kNAAPm8dEVR6Ag6ptaDG8ja?9pnSv(
z#xouVqwy3&?|^;@Jpet5@mz)-QNeh|;DFiCJZL^N8cIUr+0dJm|JBH|y*YH0gw#vH
z>QLr`Hb9R<Pe9M1^KRI%3dW#Ehgnc|GPVH@(1JQP8O~xn?g4y5s=|1TXqX9|0?mP@
zLxb`|`70R1C0LmRbw<aJ!K+B-*?)%MH$%@u=^|W&w&GxRSXF}K(Kr&I8PLptO@-A#
zhbjcR5qchaE?}=<JTy*Kg7KK)I1Wl<AgCG8L@13@jU2-9{-kv5(-;S`!s%70|3t4I
zIN)|(xS&Z~zFey{82b1tJLK{-+gqVmp%iu~?}TchF#(MYSUNeHIfIJ5uFl=Gb*m})
z!3Uk@++3RdYJ`qW7rzsFEnq3_g_@vrYzhnUP=c&#Ebxo)x?H~IZQH!2v@~CQaWNZ@
z2UX7lcsuzp=>re2%TT$LIUFc0&F<;wm<LC@!D>AcS5$O9Y3Wj@W%_j1F>}3Pw(axJ
z-4`n=VmoSU^E}<%6d(PfGa73wd3m*|<>lAnX3rk6@pK$J=DxIZr>X7Gp$u1h`wV<!
z%#jw$-s1P)Kgq@hyA!Z?ae4X2BJgou0|&ag5%w>>a96EZ@i;o8*(ei@R@)5tb+I`)
zm&VPV>lk;>Jz8B%Odmg4Bb6C@O^vI0*DhoG(W8mZmX>^<$CENxQ;km7XtLRAtc8Wm
ziDhNo=KOraU~SaYdpbM4t(BGD)_wb;uN^<01h~0AuQyTI7L(Ci@b=rkH&2_!E;@aI
zzrcqt*~|v)$#7WBI;vW^GPa|xuAJouvUD(<aD(1#K5t4$Xo*Tob3|um_C!yb<TcuC
z5eBnaV~C6MUkq1Un-_!jb+@!cTsv_>>!`0cU2kkOcQ-dDdz{YfKqwpNaD&#-M_6Yv
zoirvUHjPP1u}4pw=!~5*rFSe=t9&eWyMHW>)2FqLbLS$vE?kIqUb$j(+wB>+(CNV@
zTd)CGa&s#RHf*3U#bhnUaf)S>unFwlta5KjNhuCSUlKx85TH-jy#4!kbFQBPb_L5z
zANxQEDPR?sckgx!(2RyUOW}^Vaoz<1uKpqkHgcIz3v+DTvSpxkEproAK|sNccxEvd
z9`;mLNY-)Y%uGHn(&`8V;YK$=e&J!$osnO##B$>smlpFvhDd<8wO3cWxMp(Lh%2;+
zm!^Bud+*UgUr2}qE^XZ!#Wl?g@RiojlTaz$8n;(fWpK_SIYa{O$Byy*h%51xU`w-_
z3b6*xBP%2{0<Mk@B|kr37PF<bbm#HoZcKaH!W0rB0pdp-x#oVpePFj#R!ZT7a~8=V
z5@_AChuyYQ%QX6<$5o&mxH!s?wCG~3Ek&ih8Syt{0w%rLf*Y5PKnGUhO!Q@&JhNB*
zAZd2UhY$@p0`vfe!KUIA3L~_K%L_ez5;A-ON{;aad#s{g*-Tf|iL818N{(YGj7YHU
zo!y?94{hcb<m$T?o=O5yhbta&nxhTu263!xW?yXS#MZ5la1m&3wRdrS`C-#@K)+mV
zyUvz^tVq~l5V+dm<o8Ho32r3o@7nbqvBqXF!eG05JoG@BiBSf-v#UqUY=$Nb*3sqW
z!*ZkywnNP9Fd+WA3rANEKeOequQ^=&E#}v)L@Fc#jxJZ9nJsms5kW*^5srjL<K-Wy
z`v|YJJh8+W`ESo~9PhU7BR1N|!*&wvZbrl!9YwEA2?-N{7*k{)*bdfr!X43KW-}OJ
zuvW8?{|@Y;nN6?T`ej18l@I8wSlAE=q$gSVt&cAW_7&FGI7^g1Qm>^qPK6AUfKI1z
z*~Uh(7v!n8D+K#8-*4)8v-EBnUoO%^BQQQb=A2He<zu!Vb_3tdth{6an+FnNIzKz%
zgrez1EnfViFd{usSU5X_US1b6Oacpv(xmW=uAI<D3L_*Zdrd^djA`RFdcBS+g$#qh
zoPtz-Wmk_$?Paj($4GuL8g$yCX^96|Uf7`%n2;J*9VcJ*`6n}jU5zfK8=CUcocf_3
zLbPB6md&43!_om;Mb-}+Q=FE2Uj!;57R*ZbnT$Fqj<a%M2Pc62CGYY@+0u<7S~P$!
z{g6v~{fyFw=nsibr`3FWe)fmGIq`QW1PZ4n?vFD^@pq0#SbG*mC{Lk8`aQ@~4;8j*
zv>GY2um-{oOyFk^&-@?fLHz#9@)B%Jb^7-FlvU8(<lKUkPgq{q!3m@!n2*n#I-Y;D
zcm!Ofa4f+NbhQ`O&ANT*iIRFm6e-Wjg$+*N*+*vWSJcQRs|+@-0)>(Pum;Jt82yqt
z6Lzz_u>BL5kYcS~T%5@}oB~hT-MI{Qz;hR@w8#DOsyU6uNIn1U%6BNz0Rn4&GWVbY
z#tubZwi@x*;cC!tygy=&7A($x`u!POSzg$_1m+f|epHwvi`CWOct+_NY-W=W!IlF1
zV-Msx>0_d7Eb<W%Q6~LYYoA_tnqxsv)cee8st*bqSB3UQ{z?u3(X4-d@n?FSRthhy
z;&!($uDWZxd5nQySAPh8&B3??g-woVKr`8Yn@Rc16szIcM`!aFfQoNxDJe+#XxW0v
z{JSCa)azgULFpHEpaK2vT6%Kx!~1ewbM8#}xWCSBr*d0-^x5?<EK$bgzhIKm{Yp?7
z5H=c8+}_ByeCwA>PAA!7rCmb4?siE>8g!1$Ys%iI9a8R`KL9UjtC}m9lDxB2$S2T2
zE%MSn2{x#7J6>B>8E=g`&->jjY1-@m^O~}EvJh6ebEaL=om@U>a!}ZTR`l&k9r}fq
zgFDtO-))XI%AQ}c`dih~-SqnB7j079lGDFG`XeT#XRz~D1v}8udUV#vI<&=)(QjS*
zz;;^tu(Dg(($?v3SI^&g_lz{28NE&RI{37yId{I{fd1%^z9?UZO7EGZCz<sXzrO!(
z6vGB=d<#^*{CLU6vXTk>do?{ctvA8tg4)wl4VyYd$8>kO4l2#&oUC~LreBq9j*2w2
zlh3Uu8sD>z&f4_7dvo|OLFwOthZI`XoVP}elhOx2piDs7(@^OrB9~h`-Q~~iTyUwi
zGh6BZP0dG{3~lRwv3Sdzf@FSD(z^N&08RHHLz0kS(-8nX6=pRwit;4gE{}KBD<4cc
zSlhIqx8$4qH!aap_wK9r?W6A|#aV0w=+6~ps<I)&rrrTO9p*`>h4M_^s5mm_tu4nM
z@_B=A2Qa_UYM0E(+O_WI^Bd{$AU8$|9q)t+n)=~8<N8&f1n{x&ehQk*xB9HQ$@Ao^
z|Nd^5(@pi?2%){77giR(TV6WVtr##Z04PTD8%_$B!L!4LO@{z*`eEf`P}%?4uwQq%
zpIN&ntMYKez2rBVC3oVugKs>ysEQt#D8@;fO6vjI|AbsoH>7M>V6!6v`a-0aLHXx!
z5r^uUJ<q&Wxv=@mPXB+DVg94RT4Rh&FFtYCZpE^W4Q(G1e+Ot<<_%lI3Y$g);At=`
zpf<{L;`_&*dfjg}9b9m=y(^O|zbQ$A{NwWJA3pr8Y2Ap;{Az>7Lt%sB^N?2@1D#CR
zVbj3?oc0Y$p%gx3v)t>A@cnady>`R)>gn|jUlpQ$L?tuXQv0L(^A3M!QMM}xWEu;-
zdbbUr={7v9azkLV5d!*nq|2dGSQ&56HMYCn-d2;i=kSH1HhWhJUl-1FoY~YgZ${eT
z70dH4O-zkb#$<M=i%3)e@)=eTZhJ#vv%vy-4$@1ZS*%QH&jS3;PfuI-9=$l})cLRS
z-5#$|>7zDJtBT1PV{7IWrk-9pZ*oUgs--``)MXQN7xWlF^S9$v7giY&*lfgro{RJ%
zXwaF?{5&47ul7`n_v1qi)&tc|69$9N;1=JRd}d)$dVAhvn^v(#W?l1^ZnZywR^4dG
z?4TnGn;jI;>C3YOS`3Y0<^5SDe1xBDJf=H2M7Y#F#bJ6KY(D_gl5Rxhrod)r2<Ws5
zpwN;Jr8PRm_;AZ*bXXhEGl0xLGYt2!2JG*q!d8w9@Z(T6IiR$mHBRZHB2PCT^mytN
zDd4KwYgW<kuw6zKY~|Uggg<KGD$i$B!&VNKgP)2zTB?nznX4SH$O{63fFK|U2m*qD
nARq_`0)l`bAP5Kop%M5$ck;dI@0+r(00000NkvXXu0mjfb9!fP

diff --git a/data/styles/default/light/6plus/shield-us-hw-thin-scaled.png b/data/styles/default/light/6plus/shield-us-hw-thin-scaled.png
deleted file mode 100644
index 653567bf1bb15238562a59d5aa00fa6062ffa7f7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3626
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

diff --git a/data/styles/default/light/6plus/shield-us-hw-thin.png b/data/styles/default/light/6plus/shield-us-hw-thin.png
deleted file mode 100644
index 9bc46df56af6573eb563855191061b6d20c60e26..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2469
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

diff --git a/data/styles/default/light/6plus/shield-us-hw-wide-scaled.png b/data/styles/default/light/6plus/shield-us-hw-wide-scaled.png
deleted file mode 100644
index 23c785f19e24687cf44f08cb3dcac882a4a4c70e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3772
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

diff --git a/data/styles/default/light/6plus/shield-us-hw-wide.png b/data/styles/default/light/6plus/shield-us-hw-wide.png
deleted file mode 100644
index fa48dd9c9d05be57ff7a2344512eac7484a3a478..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2546
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
IM6N<$f`LoxVgLXD

diff --git a/data/styles/default/light/6plus/shield-us-i-thin-scaled.png b/data/styles/default/light/6plus/shield-us-i-thin-scaled.png
deleted file mode 100644
index 53966ce782ff437356547487288213eb641c9c17..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3271
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
FV1n0PMg#x=

diff --git a/data/styles/default/light/6plus/shield-us-i-thin.png b/data/styles/default/light/6plus/shield-us-i-thin.png
deleted file mode 100644
index 7836e351d30b26dbd90ddfb0785aaba41ee53d97..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1909
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

diff --git a/data/styles/default/light/6plus/shield-us-i-wide-scaled.png b/data/styles/default/light/6plus/shield-us-i-wide-scaled.png
deleted file mode 100644
index d4b227ce36a830c9d2aa009380663ff471ade0ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3584
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
GLSTZ(Rqv_*

diff --git a/data/styles/default/light/6plus/shield-us-i-wide.png b/data/styles/default/light/6plus/shield-us-i-wide.png
deleted file mode 100644
index a9caec586d9deffac12fafe03fa3865232860d7c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2213
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

diff --git a/data/styles/default/light/hdpi/shield-us-hw-thin-scaled.png b/data/styles/default/light/hdpi/shield-us-hw-thin-scaled.png
deleted file mode 100644
index d33950c8a5c942fc9e4f29aa279db91a70d8987d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1759
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
BRQ~_~

diff --git a/data/styles/default/light/hdpi/shield-us-hw-thin.png b/data/styles/default/light/hdpi/shield-us-hw-thin.png
deleted file mode 100644
index 8e0dea3ce052e226e0304ac327b66bb1c546cf3b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1287
zcmV+i1^D`jP)<h;3K|Lk000e1NJLTq001EX001Ef1^@s6SLDKP00001b5ch_0Itp)
z=>Px(!AV3xR9FeMm|IL7RT#(5%<RH$8bYa1MHJ}XW|mzp3u&5wMWP80YN}~TUo?>d
z)m9T9Ow$)%ND~u7nrP~+DJiK>yl7vvsg03`R;X><F1K|-b_>Nsq(CSHvx9T<`>)IZ
z>ymn#N#I<*@BDw?o;`EUcb2goo`!}7XDH+;-@$BkOOjM+HFl^#2YNf08K27_iekaq
z+JgaA<x-;PdpVa+cXu~Ww)b`Y_i2=9=kmjN=s*v;xqP_n&bqp~-Lky)4aafyet&>X
zOe7%wl^_V`1R;M^RaLjHD+hR<dq>yx>gwtmHa0fOc%C2Ab>m&0ciwV19BEBkuhBH^
zEgJiRBn9=Ush^l(u&B$mt95vI_(3+;Y6k*=VoCCkR8@)Ez`(bLqA142i@nDF{ShS)
z@EBYFT3er0u3h`uz=IO)t#;Hg4&$K%J?KIo91BVnYbHXW&|@^U1N4c-^XGf{rlzMX
zzjQjy#>dB4DwSj|my3D5eijag8O@gEL$Q$0IQdL5S(eGiM?Tfe?RHx}gM;6(6DN-A
zG((d-pZ82W9{<%c*3|f(2nPMh+S-tM`}VEOr?cxH^uYlSTm->2G<XWrX<^LeazEbJ
z_nA;zTW1AlS7l^mn00i#s>yQt7q?rh<`sp@rv+75T3X6PQL>A>O&1*Szy)8JpI`p1
zxOh)&X=&*d`tG@d2b;GIu%pq_^B$vxiZ%68Jf0f07^3L;Sdx6&{QSIK%ORr+eQ>}t
z;noIY7>*C=z2|S-xNh2PDWMMzW6pCXzzV|a)u++9xVT{2Y$+EO?q_s89&N@1SV3I9
znp~${PhMGBF>SV#tE;QnU1ji0fE5JxewrpHHX}P9=!3KMtg(XV@9z&2T&Sq1v@-^_
zp)YLkGAt_y#?+H}c}}gl`Dt5&fIc|jnV?J%!C<hII*zrq9Tkd-icFg=CG^1oZ-e`1
zK0yc9+q7{wySiSt1)MDk4tU_g#<#SzIB2z=Jap(qzO1Y)+uxQpIN*Vs;m^&@JxNFF
zuExgAquUm8mMD1Of=|I{kHTJ9SeWHzZ`0&~PYcsI2i)Z3guT=(^-Z30j!z^K_Z$x4
z=bJZ&j4VG}o8W;9e&!WbRpSHd<f73ZYz3R*;D84%`Z7T{o%tV8RI_K!bZf{b?R=1b
zf&(77+gQP%=Q+xdwa(6Vl^ku!Dc0B5jn2+vDmcV@-V9(fU8WvM@*by@>(i2wy+$Nb
z@4)U>Sy{>U?ekFf>}BQU73R2ymb0_>DDzIS>FK*{W@d&hFE6uL?2bxDIY)PvHzp=h
z7fg|DL7=m$%71{~-&2C%2vHWlSJTu-OlP_bDedhY&cla~;5atBt&&bhcKPxb?9!z^
zg)TeRwU4xx=yq_Qw0@*<XA_C!_tqe){3VF3M%0mw%d$hHz#`=S8iDFVp|IA|b5`*A
z{FZw%ImJ$&KBdLu;{t*1FlJn!J50>wQYWL)yZ>*JLN}-*!C+u99G0{zSH8@w9h7LJ
zA9gFUzgc<cOytsuM0_Rm5`9jy(%jhC#D<0j@%3D%%T`+~mi)*0;lBz3f#Ir8H|<Yo
xD!S-v>MbbP{bn>8RdNMwdmsHi5%{l=KLEnRCOQsb%-jF~002ovPDHLkV1fsmgkAsu

diff --git a/data/styles/default/light/hdpi/shield-us-hw-wide-scaled.png b/data/styles/default/light/hdpi/shield-us-hw-wide-scaled.png
deleted file mode 100644
index 1b955306e91c372a508ea301ae838a3b4cde9d92..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2034
zcmV<O2Mzd%P)<h;3K|Lk000e1NJLTq0021v001@!1^@s6eNHh@00001b5ch_0Itp)
z=>Px+tVu*cRA>e5ntg1PMIOiJndjM-?NXubZd$9YWm~%2?vjEvl=31MiR3(lLJmC6
zM8tQ&KQt)%hhmx-b1|B5-sRFW_(J$YI7)ILL5&0go)Iu94Y9RUYg?eUwA&U+cl*LV
z&y3&SwoiSwT}tl{4Ug$0n|WsDH#6VQJkQQE^P7jU=`cM4(<3lF0>AMHs5k4cw6rwk
zw%bzv>2{|V7Z&=@wzakCH>-1_a=(A>gBclVuX#M~Xm@w-_cyY;S$=tWxzpuJ-UdyN
z<mGvfcXV__C#$1OR#;l<ofU~FM}&}zVW)7ec1vlzGjk^UcTG)m-(+>ovdYRzzHi^2
zwT$ssg%Ec;91anUMmfS+#>AT&H*Puz8)4c{7L%TEm_4f~>PtcxZrDoBm9JecxoR>!
zH-ucUpujUYs2oKj^LFn12Y0*Otg7l?;>#~jlE7gp#R1OQUe28->+9>oR&g6PY*5dg
zJ9jr@`Z`tB9y1I*D>pY+-?HU7ZPlvP?8uSB)Runn;zbSRmr?!^W7>a9N=nXFS63U>
zwgQ2`Od$rB3&H-XD11EzD*4`fmkYGTL!l7cw(WUj$#0!bd4FwfQ^;D^yiN!i4Cdz;
zhH^~PG;dYaE_KP0rKUYQf4+h3-@lK2^2s5izrSBq6h%kp-(h4gDGD3H4Zj_E^U!mu
zs;Ux#*!uMwloc!PXUHFGM@q?#9XrYn9H^EUIA)+j3|>F-zr_veK=BMbIXM{2V&rM5
zsj0@AH5KYZ4{c<Af6-VwUw!pIwsq^%hOX<)=x#+_-H(^X3P&$~>2)-tsK`54N`5>g
zCFS<_-~UKmumCqCL5N1LvznS3cIM1!*3j@B>+I|_hKGk`W@e_EmzSq3T)2oWT2#)`
z($W&tj?cPs<qA7}`V{--o71edwN+AE$;rt|R#uiuKxJi%80H4%a3sZ798J~Mo@Gxy
z`Is><FwmhW;=YE4<{uIoQf44fSc1tRR91G6jyr|{v`@f5OVUmHi6bGT-=DwO?=R?E
zwyZqb($ZodI*U@$P5Oz0c;Y~jxe~v@l`HSlJ387e)$Dgk`iX;hh>Jj#K){=87`*AO
zyYl$nz5h|u($eDwz>bOD-X8Yw!+$X@T(}@qRTS{tT;7RUufDVMGVAH-u_Mz2&Aq+7
zG!fElULWHl3!l%I&ACx?=bbs8!-qdpF|$pmXqODk@ND(!2aLA1OCcfD(#FQd_Smux
zcd#Ezq?)T&uWrU_M6tdX?E+`&eD~d*?D+9xxQWV|#>OA;&K(zgzJd>fLBA0W(>vLI
zAsi0N`Sa)LK41PGD;keWaAo)P>(@EG<n0(vo%)&$3`FSZe9x+X9Hh}oh4iPjW9aJY
zipkcr89!R}$3c2Lx$P*FU0wEs?CI$yHc?z$9Jf%9gFJEKgpNgV<l41s)`76iHU5(f
zi~Pv=olG3$2#uV9U>h*2&{5q^YaU(4L1OQgg)Nfi@p#7D*&<E4Nk4H|1;;_^`fzOH
z7zhNdHnzDob(<Wf@Hj}!Igh*D9=)VwzFBUom~@kV;;;%IgT#ux9IyWe9({DPhCi>>
z#x~caoAeV0@tDHLXy9)6JN!8MrcIm8GF!%^pEw|XrwI^)#BTb}@TDx=zWo)=t~09%
zMEZ#X6Hpm(QGN^(fY0aT<mwd_>r7i)$HYNA#1(_YHY*j+@RGG_*J)U}+ZxUkPaMQU
zT*Sv!)hIwAx4QXEV>`#AJTX2F$82nc02id4nI>p=I!6{h#K#>D^)gw6LL)2q3D!2v
z=<Xg_qZ1!bN=m(iMR~Zkw$`RNiDeTHab;v=U!)Ck6tmE0UwrYofemxw8aB%%4&ouM
z*v^XdW2LYQejauA?hkE-lUOcs5D#(1Sriq`Jp=!U0iPviUi${pPaMQ!0*)=~a76d?
z(9oc$tbARXg?5ZdKXDL`sekOGITY&Y%*dGC-_+FfN1P6^rAwEYHnxf1dh2hjx_UoW
zH1frUhNeR|6b^UZ+l7T*xpnKaMr&(}EuLG_NqR{)=^qc5a2@CKdADHteH#a(E=_X?
zheMM%1}DFWq?fGAHIpOevuDp%($mu!{j#&~U~}epV+W+OX3ZMk&y>@BeSNWm-j<eT
z*53XTBbPt@;P{q<gM%Ux2@Aw*XlO_wM|d=<E4m)V%0`XgAb5LYV{_H`&JseB(a3SS
z#96=eBAFzFl7uy(3+WWxUKd?sAn4rQgQ+?Lt9}R7!;B`%%NMh!o_dB;Jk>xx(_OpX
z6NnYG71M>bqBzB-0~)ye4ScU4Bj`7RbE*NlM*cA85+6k<%}%Fs@c%kapQ<pcT`(BT
z)b$}hI$r@{Pe4@m^5uUJZ@lp)&&-T-xmc^g$9tLW*zu}3dGZ99RGb@%4*-Ir{2Ax#
z>gqb<jBlj`97#!d<X^z<e1P2c_{IS269eT_IoXjt)w`8ArliI1_vhin_b5#WFTebf
zpl=E&P)upcr*g8JQiHdu5ttOrcsl@OR8%~u<0A%1F{LS=%71O`zj_BI0KO{u6TT|h
zhe;(Bf4+WvrLhrTX?$vy|8C-<qWoZCVgAPy|8AhBL8eDwdIY9NAkhf?3`#ATol_Se
QOaK4?07*qoM6N<$f`c6Q`v3p{

diff --git a/data/styles/default/light/hdpi/shield-us-hw-wide.png b/data/styles/default/light/hdpi/shield-us-hw-wide.png
deleted file mode 100644
index ae80bfb373f2ea0144f50a23e999472ed28bb4be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1412
zcmV-~1$+95P)<h;3K|Lk000e1NJLTq001Wd001Ef1^@s6TKcjm00001b5ch_0Itp)
z=>Px)K1oDDR9FecnEOv#Wf;ew^PWPXsN7o_I6zt`m(q+Pn+e11r<pNO#=POi!e;c>
znI*=MnDB$ijEOP+12f~|Oe7-`TwIpu5RBV^C30=I&M@Z)mRoVO(Dqz>p5xB3tTb_K
zwr_Is-k$gUe%{M@ZvatTd3kvTe$Ph9j!2eenJX<VsvtiiGfD#0PdZVuVatlFR%-!(
zI1C_X0Z5-GB&2*gF)^_ctrDx%{1WDUB1zI7#@JO1f9Q0&2cy~BY_{}J$oByNdmn&X
z1mJ6(PUq~y_7QLu6-CcU68qU;NZGM>ZykT};&(C@3LxkJ$H937{V_8$^Zwl2oSEaq
zW`ucL6va}b(IhrC9p?M`E{Gn_pFFx5gzW*)_2%T{++JE*dK!WD%QC!$Kn+-D;=zOU
z+|bZZqR+Q>kLTsu$;sPy!vQzJ+3m%-fq*<@FeLBn>iUW=D=P=L`xcx#_a*fAe=BWl
zY_Rac6t-B3rIwbX?8uSVATco!g25p4_I?9BJzXM}<sY_BN=lL%8((3^kGFx@Y=P<N
zDL8hlMfCgEf0t!e>vFl~)G`_zjlU!XhV=U6!p_ca-e#**Z4{qGM@L5#Sij#7CX)%O
zsvMA?U$Dt8JaXsGER2nfg2&?lgTbJ{R9C;CG$Pz?VqzRxTaSu?!1`~D>FcJZrslQ$
zUAxTLR;y*kZZ8*Z+!(_-9eYQ*q)!~gLvWnK;V}69tJifpo%QV5PM%s8FGnMD;zX+`
z2!hjKNUdRkfHzZ;z+$u6Sv<k0Lr9-Eh=;h8PO@5y-YqVEUhe7Xj{SIsDUv>M5YML3
z!-UJbcUKFcP$<kic0v5%<eC}>&bgw?Dp=Ukz`j^nS>|zKs(CT>M@FuL*So^wI{29?
ztij=e>Y~K?`G5an)hHG|F5C}fbP5MWG&o#_Je07!yi8uq-O7qr(M(GdmsD{LE*MNv
z!aT1fsWvh3b-I5x6Td%M+f_6YL0B&&3X|zSA4HxgH15qxeJTe<G&o#aUdPQ^qAe*N
z&f%yA(kBj8UxA}tf-!jSz=4;!tSmew#lev-=@SR>5P|}?w&s0D6s5Gbwv*aHAP#&$
z`o!V$c~5F^jPa+iTcyfMdpwvlP0}Y0j^ptVial3RQDG8Aq43b5Ms5CS)^P|B2k{UW
zljUGOG34dt#sMW#QsuzyY$s8!lZnT(5NR2Q6qSQ9VS}Zoo7^171*WGb<A4$=NgTvO
zTuN?9iMg+)rb_Vne6c%*Y@tN@#6dg+ru+mt9qaIVy{x;tGqNc$Od);ZAf8RK#l=PE
z%gRc`c-|pMpEy)7ZIjK;HeHcr;f+g|zE8=^%Tv<V*6u4;J-o95-Z5w{sO7fp)Bfc5
z`>2Otad80_7Cdn6+AnbW^r_IsM&K@E2~CTOi^@;BNv*QdoQL<;3pgFNy5-2Jsi~sT
zXyov|$?w~@AL{EHAR!?kDkz?+VPK#i1_!Uul@c%89(i?jl^VWDmny)9kLdN>;qh_z
zA8LgWMhJ#)9+o|5z5|~m^ysHZ68987OFV-eXT*3e$1%Gki3J%M8A5yeN4kcFMzuc8
z$4fYzIrFiA=R+OtK(n$e{fZ-S4^O&yZe)KkCa+=KhffjonlLvrbL%Ps((A(GJ8VE5
zp7)38LV`mg<7<HO|B+Ae2N#uLvU_~BZPd`w(ZTQ$ryW7W=H^$0n>SrD`4p#g%HKw{
zT9Jrh)p8yofa_8t4*AzO*^}{MXB~&`O_$5v{|Ht5zoytzFP4-P{XqVcQu-Sk*n~;Z
SFaeqX0000<MNUMnLSTZiPPS_R

diff --git a/data/styles/default/light/hdpi/shield-us-i-thin-scaled.png b/data/styles/default/light/hdpi/shield-us-i-thin-scaled.png
deleted file mode 100644
index 08cb51197584a7b113f67d62f9dcdd8ce92291e2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1896
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

diff --git a/data/styles/default/light/hdpi/shield-us-i-thin.png b/data/styles/default/light/hdpi/shield-us-i-thin.png
deleted file mode 100644
index ce8514d152d2c839239e3f497dd24b6db37f1f30..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1128
zcmV-u1eg1XP)<h;3K|Lk000e1NJLTq0015U001Ni1^@s6p3#bF00001b5ch_0Itp)
z=>Px(B1uF+R9Fe^mt9O0R}{y0?(FRBF6(Xy&a{<OX#ru0LNSHtViigaB^adi#gM8|
z+oX@`gMF~+gT^#ztf_BW)5L_dF@8i$(a_?$jRj4lse(1AbVWc#Xt(IL$}TfI)BhQF
za8Vlj!EE}_ll=Fbd*{sg&AoHE+~I5~rtA7zG%KJB&?zX)ahwi6X~@YyBLJ;Pc76+g
z4tZnAw&9S+BPfI_p<<{5InD5fab|$TR}jBD)ZDDeH8r{@%XH&Cs1N!DazWWpF2vnB
zbV$`ym3yJ7iSo#9LSZNd$q+$Z<3mI0&!<nbx$D+3wD$x4J-p2T11cike&@sq&()nf
z-$NX8NYZz5b@jmPiVD@^_cJ9D(eL*3=yzIMebLL87Xj+00*vSTJ^A_PpI^E1S6^wV
zE=m%^b!{{lbVNEkbCt0%nn8QPwrzW#tE>AR@rQuNO>l!v)805!Rkci06r&&&ok?SY
z(7P-YI%8w34d51r(Fy=mUfZ>cSp}s5P;D^iwNw(5=KW>Jg=t<2Z>ixm(X`WADJ5`V
zw5?6Ga<t}XXk8Es?Im{n_<sryXN{KEn%6D$j_|OICC_u1?|mTA-{k^JiI0l^i14gk
zNoZQhTb~yuv?=?<qqG^0c*YfWAKlo=B6nj6KxxX;V#ESdWn<Ct$=xe0WI%|?9>kQi
zgNezUqL7}Kn=+kFf!CSWoqn*}?XWSATTJ^@dolpd^on+GhB%Tk6PAV<P9Y-sTz1+r
zZ42|IOP117iWlWcJ=7#{e8rNS!IW#3hOd>+8vsBd@DGiz7fgtvJ!&Zt#T^2Fzp1up
z9N|R*2StHr^~>|xtp?WwUTk-YJpE4&GMom65cF+cQ#Rrd?7vwBr_sK@VexI$?+3G=
zMoe}j%je>^ZdiQyVRPnxH@#hUM9Os2Xbpw|#uMB?NBf$(B6UHYbZ(}x1vyz=8{aIZ
z(`N`QI*A&q+T?tNVEBuV>MzcbXZ4z$|JG;Av#uTdxSo!*qfm=k&zx!-o@4@@d+_q3
zExQ{-S<kro&7^<oXZu`(M|U@zaytcDJA1&0o3$pv)PW21HSnp=E5^S0Y;{{nf!tvx
z{#{=@Uq1WwzSXUnUY9W-)Q+Uqn0BAWaY#ZE9qh9|Y3}kIXz6a8P&7InKGhro8(+Vw
z_}G@U<upoK#d`szX`W)!f+-_;-flt|xEGD9JN9?ZIoT1eOC*eQ_>>~l;CW7|eKqgo
z2k!)K(f*GvTBKhBN+W*4{uFFx;sJ6IH$d}a@kAnc{)YW{sBi9t-jNc@DfK_wy{amI
zu(~`)O>Pc-=spIZv3e<II(sVEya^9LA7N$CLda+KCp~@KU4ps*yz<z!X`6o;Y~GCr
upnK*)FD3h~!w&$M_LEGK|G)c>&cGjJ9%HLL8@-bN0000<MNUMnLSTZDo+hsV

diff --git a/data/styles/default/light/hdpi/shield-us-i-wide-scaled.png b/data/styles/default/light/hdpi/shield-us-i-wide-scaled.png
deleted file mode 100644
index e81c362a80f4614228f67d19c84bd31d1b54d2a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1973
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
Hu0mjfT#Ur!

diff --git a/data/styles/default/light/hdpi/shield-us-i-wide.png b/data/styles/default/light/hdpi/shield-us-i-wide.png
deleted file mode 100644
index d1090d2f1a6b59fb5f45dc4efafff4fd1a30a24a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1287
zcmV+i1^D`jP)<h;3K|Lk000e1NJLTq001Wd001Ni1^@s63O6I000001b5ch_0Itp)
z=>Px(!AV3xR9Fe^m}^X1WgN!Og<dG-+E6Mj>!b|Er5&<?3v-!v24tIAhl(>|oVsK&
zi<<bs#Hfiz;upWDUo=LSIW${LL{u<t=m;7JA`((W!+^PRbCg@lrT3ot{5uYTNXMob
zt;wF`>HD7d`pf^k=RNN!%PcDt3Yn386ut`g!+*dwmSyLWMilyGpt1lihI8Rda4+1C
zzILP$g}zCs)Wi93A*_MVp<gRfhNT}g;*iwMbaW)Uu3TZY)zvH~ms1&O5uShv+67a&
z5>AC_U<J%LdwK%njg4}x#o|dWDT$*ph}zrWIhe)~U}{egnJ|sR2p*3x-p~+IY~31C
zm6tnF^eO-a5ss*z?>Klc$2T`;MxmRJkGINoy3rJ)aW1L2*ssuPnfR=%F!0josNk{L
zn3=9F*@D%oc27<ggn~f>O+;dOemFiO<M%|9$*w9Z^UC#lCSkd+8+~2l<IH?-uf);U
zm+BcC%L;ltI}jkbG&S{Nd2{m+hIkKf{UY3xUc3G7PK)Juh+!n*8KUq582|3Z#*bub
z_0NF&M7(uI+v(GiXo68JXnx{A)=1ZJ2xmId#F_SX9Th}d%Nzo6QRKpF#Wy=!6m2k?
ze-(#;o~ms3qB}6Tvmz!U2Oiy`%j;DtWZ49#UhsyPns;79Ha29Na1xxF;FJR+Gu+;%
zK8+1BP}INmpjV%ntPF3cQ?qV@j2X>3+yTH`gS$GtB#jv|fY_bxpa>^O`0!pFGkg**
z3?$I)bYyB0Widkr5OtcIN8+S4=g@1C=pM(6)T#tpW??v6es(%9mGX3Ih`Qq9c+Yly
z8XcuZDRNexW7u8!cXUOa3;;z2RkuXK({k%0xMA4!aAn>Q(x}T~&ZWbu4<6*`P>0M<
zRreSe-0REHq)SSWP1aOw_k)3sOn!<SsRbF|3$?p0Ub~FW@9~FroacECCnx4RA_&8Q
zasm0a>iu~_jy~;Is@QC4(h`QAK4PL{Jw<Jr<`*MJ`6gUUfBgD^PN{@nqJqs5&#{3I
z-+17Hgy#sZL7aC54zwN=p3<lkadjv6ofR8wM*8g0ooDm(Dtbce!LjnSw*p5HsGukJ
z>%-<8;l<k0GgNk~^+;v@7tb9nabun~%uk<`D_R3brD*Uik{?dg+~vUny`>R6bnmvW
z>Q3&R!F=8DIe3lMedFW&PUTO)dz#vY*_YpKecTri!r!NBdjHD{o@f0p9ozlcvBO5%
z&#dqV2nwA<)@WTgu>~M2kw0>I%n>;8=J|aie>wm2cSeRPVetJ|Dq0G2(rJxdfWHJ7
z?X~~Vb>XNr0O_xSXJF;$Ed%`9r#cVKFL~*U{idW;NT;xmep7p($j@;MJ$z>X)pNZ;
zHiV<j0E|ac1@8|E4F6;I2vgtmo8g!Ki9J5QKy~X%D&gFvg_-S-RTT`I%eI7;H`q2b
zZU)$f2aOwo6K4jb3i<osQaB|T6hhWZcH#RjTS`aoxZ%$+N8X*fl!5YM?eP6&dWR`j
z%>jt!p#MK;(YFF>3h52$rr^X80ZIL~!6umgS=s`x9*bT<BQU+h`{2Py>k4%dwR*sa
xjW()SzU?_^mj#c)Lx7>Z>$Yx3;C~f?zX5ILlf!4!?d1Rf002ovPDHLkV1jh?b{YTx

diff --git a/data/styles/default/light/mdpi/shield-us-hw-thin-scaled.png b/data/styles/default/light/mdpi/shield-us-hw-thin-scaled.png
deleted file mode 100644
index b0d8e9e88997c515ec031d3d73be09d5656d1383..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1139
zcmV-(1dRKMP)<h;3K|Lk000e1NJLTq001BW001Hg1^@s6KC;{Y00001b5ch_0Itp)
z=>Px(ElET{R9Fe^mTzbqbr{Eg`FF|U78X|8RFX8!pUc0yWN8MSEPXK=>nmS$u%X~^
zOkcRUjSa1$Z$#gXDFZ<_m0{_a3UPh07dm9nV%xdE{?L*vE5)w)GibB6nB{+(-1&Rd
zJ1%LvO}rCdcyRol-|u<u`+4rUyWc$s{eS#dE8uiGw~?f6^l|yQT-JRak3I0X7?QMx
zKx?xY`9=<!ruAAa5k-g{^!YqL_x9R#t#MAL?Hz_em+N)rw##KZ)ar+8JRZj!UZ22P
zH$byB2Ih*^MUo`j)M~|z{reACE?xRoIY0kv$J|`%q}gnGZtK=(3}*AQuXS~qP8$rJ
zFGeDliNV2rC>o81+uHQ6w72gF=yW=})oOXaT1B4@3=HV6T=_w{y1JrEB;p4;J9XbJ
zF0Ph@Oqp=v^?D5iA&VY7c*t<-)LR7SOQn+N&YjyR7K_!5Mx(O3+loS=J|vg_SwIGt
zVsdf<-M>GNGMP-Bq9|n`(1Xn8E=~fSJ^M-R;>F>`T8-_E$K#8<gEJ_~X7c;J56+$Y
ztj0=ooIn404H&@UxcrD6OT)t#)+A!{vcSNsEDr|5?Y6yy-&Qu4%khCy8NdJ*Fq@Lt
zxs(3#*s-HUslc4>@#9B}fdKUt2j@RShr@N``t_;Yty?!apXeiKPfbnb>~{AXoH(CA
zBob+q%cToful~qzPO(SOE|rR31B=t<6MzMlWit7EzQQ@h9*f0d1vAn@-KGR&GL$P8
z3zAhJpMS*2<+9&4O`y?`?a=G>Dq(<_HfRGwsM%D3?b~%PP!z2e28e0Xv`-C;4K-<+
zwBik-jGq(t#fUzFHZXw2CBavKAhvvT`0(ortyatVL?1yL7{F>0rzpEE5TFa?a#{4d
zZWROuuz(3k{852=o$c@M4>KB#rYSKgCcpp|W`_9$7>33F`7Y^d-*P7=lX(j;`2=tw
zR<hZpYD=7C(}xeURlFap@Cm3?^2zb>aejN0jQp4I*w`4OP$(w&1Y)t-8N5d)M@PSB
zrG}4;472#3vjEH{meXn7<#sz7%gf8HFRo~F(1u=M(@r`V^t}fGrBX>WC?^D)(B8d$
zg`OVYknql%no@A!Hv9vXig?@a_u;0}qQp(8#$xG4xVJ|}<N8)kD8|{DOd8G3&Z1;;
z0j1OFN-DKbpPrsZYinyC&&=HYkc)$HT>`M^^^*QZqp=&C1VL!5_}kr8tyaAq9qr1Y
zp?9~1!vheu?zndCCv@h_>HN}CwysvI<CRL~X02A4$AP%fRsMpLYJTqP6rQkv-;w8W
z36m#Iyjc|Xk6^<Z_#oy9GXKmS3<g!WfBa(4p5DT}dkHp?xXXq@y9=-ezQ3!!;Ujn&
z5wF+rGRw+FAXX-0UyaA-zImGKM2+!y$UZnl75%rxeg`FjbSNzuTzLQh002ovPDHLk
FV1oIyJh}h?

diff --git a/data/styles/default/light/mdpi/shield-us-hw-thin.png b/data/styles/default/light/mdpi/shield-us-hw-thin.png
deleted file mode 100644
index 8095ca713c53bbf3b780efb35f62d6e96cb6d503..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 768
zcmV+b1ONPqP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00001b5ch_0Itp)
z=>Px%x=BPqR5%fxl+9}sK^Vq&ce1-}iiigZ6rsUQlTF-BO=1thBDU#8goI*BDfS|0
zP>>?M2|at3g7|Urpp**!2Vw($q!?No4TXLj(iUuOi0vUC&1QGUc~=w6QfhYxc4y|9
zd44<l&b&iWrsDMqZzV}`nPf^7g_PefNM=10@|^YgJaMy5|0_t6@2;XWo`Ocx%mmAJ
zylXTXPK5A%RaK`z=Xvg-qTo4}Wvi-MOXxa&4m!uN_wxDGXV7jdvMf$Tqy3fL-5tEJ
zkilbP$#N(ZtoHYZ%c<1u%I0PPudS_OXoCi0FejV+g24k`V3?r(>4AZ0WoPFHwp+jp
z3|aP18*mbzq}O{M7mG!^%$5%rz!JsY8;rxjzeflu>+5T6e_^Ks3}7L|%^QC5l~^ox
zwXBn!uv@@8JUmzi7C;$zv25pu?d`2Dnr=HJFm&Pq-mR_8E<s>EwwWL{^?Kdzf(<V)
znowiKvMitBdA`nZTvNAPgBKXU0<!_ub>+^`P)xN<GZ}yZEJKb&BF?_P3kMq;>$bzt
zGy(%yz+|e`gLpW62@8V9^nL4HU;qo4jHY29iHp-Z=4eMS7<6Jxiwwh{d@lF3cJwss
z>hkguVbR|igtTlf_svl%m8?@tj{W^#R3?)-4NPMw7z{j0CP!+`O|V<X<JS)*$^QhP
zMye4I9SX_wJw5JlA~ABx<#JJOx0~wi^^&Y)P3!v8CHFK1cSE62po+ykDx1v~Gnr3I
zi;KByBnxpXhet<85sCG!&d!b~Ip{83*Cb6-UE|{uXmauaOEiN>vXh#bdEA(teWfAf
z_z8PNw7pvG@N;+fxtHm5`v3VLilUob>Td=Iuax18!UOF{<l-ER9r-JN#ny_Cn-mCm
yZt}eI1<a|}tErWhjn~J`w>0MS376qHsp&W6q>dbqJ?`rO0000<MNUMnLSTYSaA)QK

diff --git a/data/styles/default/light/mdpi/shield-us-hw-wide-scaled.png b/data/styles/default/light/mdpi/shield-us-hw-wide-scaled.png
deleted file mode 100644
index f7735fb052e5892c1704abdba2d2aee445dd68c5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1265
zcmV<N1P=R&P)<h;3K|Lk000e1NJLTq001Tc001Ni1^@s6<@HFV00001b5ch_0Itp)
z=>Px(t4TybR9Fe^mtRa<RUF69z5PS)E#*%^U}kf+l>WP=r50f{!>|Bunek<Y2OTCN
zn<mEW(Pf61xMZ2(&1p7<!TF%PxfenLA(2iDjJeGOTmGy_eGmdjTcGW|{d=$H*QAvK
z4}>kf(d;C*_uO-S=lA{G-#zE_cMy7B{?8F;X=#z__0_|Ay}taQ?`bk=&%$+3d+=>A
zRDTIt`;8%XH)2D@_I6;%Xf(a*@wjCqNe)D#Z2#QcAMV|@O-)TyAn^Aag@yE0xm=+U
z1OX)yF<&^$ex_ExFg!Ii#qAzrGF4j?3i<<{=errkl9->L`?aV@{ie(1ite<{0b>}Z
zu%JLP=5(I4-MH~J<@fv1z`!^0yLW#~ASA4$Qv7eBP<XnaKz5X(lva)lJ1rJ#qO0ru
zqW1RFX}@D*qv+0^Z@1m<8JSY4nv6ukGqG6WFO{mWQ6eGj2oW!yJNK5XyZfTNtgH-O
zy7VzOIr+;>Bob?1SXc;U;Id#CN-dX@6KBqx)n2=HT|p4puC(o=M-P$D=R;oaLb9x^
zT%y%#3A^2a!1;a!Uh47V^ccbK-$>Qe7^E7F200w{Ipz@Mo}N#mBO}90u^8X%@puAR
z1Cz;gq^_>k*V}tNiVa06pj}sI`4d>OU^W}G+Shk8E(*~O(c8Cg#eoID2%}N^HqWEM
z`}ZHB($dl_tQeJGFo;f^s7EA;-bw4*?aWsfE_8)=z>87^24Kks1yd09^|qyZ_gta?
zfvC&%lK>3B0$?Qk;1wuDBJ9BE=tvTt#VA8VLvg$n-2xWSPlG{45K=z;jrVMb(3g+G
zvTPJHEoZc{U_4I*L!oUx(~<8x))s&vqnic8Ayng4Damx?`wrT`kkQS8sZ^@dcKa)Z
znT~wlK^rr?o}+8E>W<=#jm2|Jv{kvexhYt!W)4^YE*&wcl)8HUe5a(Oq$CG8pAW^w
z#i+CMT>`Uw4!VTFV9-#M+&wutO;Z$=PnJDe9LFK2vytVvxP>H$WP59CYf5Y=pah1t
zwzd>7kvuO{9Y6juy$4^UhGWNGqA=4DJjY1?+S+PP_9zllT6TSXEryvk@TZhajE|3t
zwz2LG0%j3NlK+{+=`2otxy8Z3??s2}@9*O=i+6s0>Gw1+&dF+xMqO%od0Di5Y-MFx
z(Cf7V!|2R8QMB1=KZFi3HrYTRAUK^35zNq)fyy~?FpT~qsZ`!;Hk*Ztib_GDP>@Qc
zQi?Y}xk^<;sMV#Yva$;4bTz2F{9s4Ujg1YoxadWAfuTSkh~Uq9YilbWiA0joXq3m3
zotT}SC6dYbCmzp}oBM)6BZM-Q5>DcLjl~BT1xX69d`oGXs*uSFs_+p^gHsd(hT|_^
zzM^VqXw3M^xj%R?je2{(2zk9vNSdY>@X^nQ&z!3)%dL|n5yY7UhYw<q>d;atIpKDD
z=W-kz=AombLt-%KI`FAxy{G327Y_fMl|voc?DpDqumRh{Xgt*zhr>Z*fFDksY7XPi
zCBOxBXtP?a%BOLjGsh0=h+%5p!<%A19*_O;7d;;DcZc=$%*UC{`eu`<=Cx<;__@RX
bdIbIf&0IWc8+VW`00000NkvXXu0mjf^@eh7

diff --git a/data/styles/default/light/mdpi/shield-us-hw-wide.png b/data/styles/default/light/mdpi/shield-us-hw-wide.png
deleted file mode 100644
index 5203f7df75c797f6c69381d43bf15785c6e90b88..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 804
zcmV+<1Ka$GP)<h;3K|Lk000e1NJLTq000^Q000&U1^@s6-iVB~00001b5ch_0Itp)
z=>Px%-bqA3R7efAl}}95P#nj*wp;gy$ry<wUOdpjw!)z8)R;)J7((!(i;2+%5<L(-
zcvnNX7!Jn7gBKHJLNI~5hLiDb#JI7QKNr1eHphgyt!(YqKfd1r3oCFSt1o%od*A(j
zpKpKd>w6exXbjVLF%SrxH^|LtAka4oy(t(5kP8fhj9Cr~Lqp7Ly<VSI6b0|-a4%J>
zd#{|%PC*n!4~{FB-0sfDcDtQ{97&Qk%jM#8n~nHNlI}vKQVcm9u7{#no+L@DMv~++
zLD-x*%x{bb2Lm&a$Q5yC=Z{_}6!f{d*UH$~)e_QWjvK1PVz){wD<5=KRT~|~pmAJi
z4`LuT9)F`iE--)v%oZagJQ^9fEavlh-PkluGfGG1$Hf2(n80qB_4oI_93LOuMePWn
zT>+TD1`nK~EH5&dtTmVW-BP6)6JTbuSsQpXcnssaH#r$Aw_AZRe`4ZJ8Q5Tg!-XU*
zpVH~H4aR0RK}b`YMt%fl!>Ft4TuzoH(~V?Vw)XV&<eNsjyFa}yS4Y*%YJdeyU^k6w
zHR47%d_gnY2$;ZbaM262u<T%FZ7pehmu=6J$%GDU@WB0k-*uX%?Zd;Y*#%)N%V9L_
zqk=&?iWY<B=eV%bbeDY~$MG(-x%9!R+s<Y)_5WqG&)&ufg4jx>k}7(Rrh5Ss*x-S0
zZGB%A#cFDKdCBxuhnOm`!GnM@-0m}9R#!jY?e6Zjp>9EE651_D4Bg48s)W2!sfZPe
zf3fN5C;Gy|TfA0NukE07qj~U!LcM1tNzVZp9d05@qHr9?yk2jWVFt*lsrycz54RX6
z65p`-`FLexV_iWzwF4a&nAK{P;k%$HYQ0tyZwtbYUoA<;O(Kzqonh!;Fz9>0vIBVp
zt)d&yq0i1fl|Y04AO>QOV;pGBiVlR6etDippMdf{8okMTJRWs%aUq4a<7gt0sGOA3
imd>)FMbzJ&7V-~A4T}^N-8z&20000<MNUMnLSTZDqI4(#

diff --git a/data/styles/default/light/mdpi/shield-us-i-thin-scaled.png b/data/styles/default/light/mdpi/shield-us-i-thin-scaled.png
deleted file mode 100644
index 9fedc9e63fa3e376daf5b2a75e69977f88e6e5f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1084
zcmV-C1jGA@P)<h;3K|Lk000e1NJLTq001BW001Tk1^@s6r6ZZ?00001b5ch_0Itp)
z=>Px&_DMuRR9Fe^S6NI`Q4sBWw1t*Z1ZpiHQbZJ&sL|9~MUAEy6*Vd@i9ZJXa0z}H
zH7?PpF@9-+V*JoVVxk}zJ`8RwZm770pfS-ZqDZk7!4;v!(t76E+Z2LY46pj(B*UFM
zGk4CpOYgf#B>$RtJf2vnJP=-#*T-C4&$?272a56NuZ8lk&vG31&_C{PBR(GeO!D<1
z*NxoWsOx66x)FeLa#K-}rXfE+b$ni4G?HJzcN1!bHbb@0!O*n!`g(nBPEIOpNuarj
zt5;j%Gc%1CQcdGXxF3x$ixAj*t7grb-Q{phlyIC=q0?2wW@I#K)6+e2osRFc+uhCO
z<(%#O`GgL;-HfS+3gZLJ4N)lWPphmf!<b!Ig)SQFPr%SvSeW(V(4logQIY<nY}|Mh
zt8g3yY6yb%oXI3>K|vDhh}AX~6wnq<Wc7tJfV~dyYHv^NY-vej0kPT+o6RI~xn2TO
zhE@2+R$zEjVWAXGl~};6E-*B<(oz}v!<dhLMvI`Qp}~@T0HqTFwgN+7$N3nEZ^Qs1
zo?wJCfHr1&)~UF+tzXF}x+Et=4Zd(>nJ{6t0?H1DOD#IG7vS?(#{ig0>iP(@J6)09
zxabWgONTv-fEWQcFY);9XR#SLoLv#XQ1}yQQ>o;wVgs}Kd<gdqwr~}*75EYrp$Hm*
z2&McT2z((zjKJ#&BL}@8M=(Si9sU+L9|?;Qcrx3RM67}$GYv!P0Q8)|7y*lEY`jYm
zCVd|a1`DRAd<M>A9|3$6+GH~R-paY7FN;keHA!=SXhI}SwBAR+3tGN@#e@%Ga;dO4
zViDP~X37K9zKBT+KYO+XcmQ#Bl~Q(N--a2*Vu72D`U{3pIy>s$Wf(pJUPsCN8OgSp
zhQv!Op}$&Pba>st&1O1$^coWG0IJ=M00MMD9Lw99{&d_3?M+JP4~bGMti=Zwmxaps
zB4E7nui1?N1(0BsO8LX5_Ajg%Gi=};|KvZhqts!I=W;X8X=9Z1%)iyMhVN0@Gk^y}
zirXz&w>|H=zNEskxMw_&J|<9oV$Zx9wJMaruk|+OrvxY&Bs6H&lwPk(1d-+Vhy?V-
z<T;5ed&#)sO{<JnjHf++M)i7=UlO1JAVKf9r61dzQ@7<_ORl`zFsHXd%r`Pgb1!#`
z`9Wfw`YC)T0se`_dTW16fDHl>J?xdWmge}KN2&~#SFHvXqc&EfdcG;!cr_y}nJ$?#
z0Iv0q|I7}U02KfUI<zL}oJY@^qxT)VJ@)-4XXKVFW3}0&r>|QD^a{W`(FP=aBETwo
ziO@e6bD`nTGH6v_fRW!n;w95R#r{|MzXE?_1-=94|KW$MGOn!v0000<MNUMnLSTYh
Ck@d9z

diff --git a/data/styles/default/light/mdpi/shield-us-i-thin.png b/data/styles/default/light/mdpi/shield-us-i-thin.png
deleted file mode 100644
index 64919699baaccb20b2f0217d68988e3618ae9f27..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 656
zcmV;B0&o3^P)<h;3K|Lk000e1NJLTq000yK000;W1^@s6`b*t*00001b5ch_0Itp)
z=>Px%N=ZaPR5%f1WB`Ky|NpZAsY)Pb1>%E1d<%%51F<9!s{ye+5QD&BAie~|uYp(;
zi1mQj7KncXaXTX;<1ZE<0|fl;^z})<*s{e?)Wt<yGBEHLkD?;em;3ksJzu|`?e(5L
z20%-hMeOY*r2_+fxm8tJzTUq5=jr<OoNo>uG?eu9J)=@o<Oeio4I@yY@bCBU8;<$-
zgaX;(VB<+7fG&G!wPnj{RzblACZJxc8*Od8<QfLD8>AOx2FNUsmo49&JZS-vpaek8
zcm^_kDiBi(Ol3KI{xMTZ{dP(m2iH5N(UXbk_QQ7^a1ja_AhVd>efSAVgH!<^vzU0f
zSpQJPG@v0|oUDJCM1{G3QOiJ4L9X9S7J5=tGtfd$@&}WYD9;aJ0nP`Mx>Asj^NFkk
z-)~S(Ihy3J3n~yO0<pe2`+)`=1sS+M)=&2n$Odvv<l|v~mK31(5vczF6EI`HXJ=*J
z)?ezhg@J+bKk0@t{_ibz+QiAuyaQ;~8;}b@V7H~d^xe`#^F<IY@nlhq$znTW*?T}8
zJ3zV^VOoKinG?t^S+Mc4QrChL(SQH`2NkwB0TUy`pOOTNrOAPMAj5iquKNa33^x$O
zff|~4_1;_U;_f}x_n&^$2Z^HtMQQ#^KyMz=RuR1hl$#GT45SXlK#%~?P>`545c?iI
z|CDdl&g(MAE<ZH}$yw=2pAB=@d}3`V{Rzn348%u)hM|NzhJhfBAOJKN<Yhx32DwrL
qh(X{65MKo1^FV_@^~fk-U;qGvju7pz0U7N80000<MNUMnLSTX+ogl9O

diff --git a/data/styles/default/light/mdpi/shield-us-i-wide-scaled.png b/data/styles/default/light/mdpi/shield-us-i-wide-scaled.png
deleted file mode 100644
index 20aa79514304520568499c834d7e52461dc81348..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1199
zcmV;g1W@~lP)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf00001b5ch_0Itp)
z=>Px(X-PyuR9Fe^m~Bj3RT#(bZFiv^FNJnMJJ)8sSr@yoh+{6A4j4FK6Bk)bbjB~n
z7)hLFiHW-C5)GOlnTwf;hQ#RR62Y-8bE1wd5wIJIjJXxu6s!qDafOanD6|FY|GDLm
z-ti)xTkk$_lINc1o^zh_|K&ON-g8=xTPn981HoWW16vl!R5bo3V>EN=%o4}s0tUVW
z6X1V?x{c@giMfKQZ5rkQxFyr~k;eEj$2-snP&_L<b6AZ*J9_u;FaE2s@m}+uJwK;x
z+BAy37FZwbZ<q_Fg{8raFsrk<IqphTRStY^ftX};>tT`@!?tZ*nY(tK0$2mZvmyZl
zRJPaQc(Hxw&L@H)aZagHo!72ke<`K7cvNGt@PbaK2n-EPx$X9#v#BZ0)!uHI93RhR
z6H<+s4#e0O88ft@uI_WS(fA(Vdf7ZTg1uoYEzJ+O-34qwH0oHb_VmV+C%*$&71L8N
z2idY<Nz$SXMf!f1YqPtfV<i}}7|#qC8n*Q8+n32YqFLjy;jdIzuY_h1(-q%JkZODb
z1DU?T!I=&=AX>GzudjI0>-`ffDlF-^2nO*rv3k8S-)2)r3uF$Rxal@pwJx@lYj8ua
zvfL#J0NDh=GNv!9tT**u9hMa=$DC@ae|LL2L9mP^xc~9dM^o0~ygsG_KmtL`fO$rJ
zD`cgD_{f-_mNK3=7+8?w6_eB;XYr0r(6%MM1Psiblo)eOPAJk=C^$MShzVj~!>P$}
zvV&>kRRaKXi;#3d`K@rn>Yk7*-*uHCu^;L~M8GoESy5#6$cGeC-d=DwCC5&8A{e%S
zKD}<a%aXO?Y-mXIuSx~)+iK15L%D<0S;ojeTC=;blUMMvyq!-yvi8_=m2eSBx-J1j
z!-e!!Nsb*w=Ht{6&61p`zWVahc}{44!F0njMr{Y*th74TW~bQLfZJWi2+Gk<-zqyH
z2#T+e9Pz;?O$it}ocNY}bm;B!PNN~A`*uUoWAnjl4<9n8>wbXtx8ZscFzUd79(Anp
z<1gQT{LDIY>i6M;Z>1j-v&>Vwx1`pZYwW_jhi{x)a^?^3#DOhiisPPt{Xk2`kyDo+
z3-9~CzAj1asH=YTYok7~6?4@i8IY2edBJEH;Apphw!M46w7dFr$u*Z(Jd#MKh~SRr
zrYZ`}$M;q~)E_G-j{vA;zUT$PC<t)0+y#M&sq&gn+R_d;c9+9f&o|+G?IykE(t%ft
zTJb#5Pqfbfwcr-`pI}UAI(rqK5noQt!5>qPo%yxYADCpvVK!`5Z8B)=uROESwmHv4
zd*BHGE$WS5G#FC^ApM%z>hT8FeOPxsxuNN@b$G;g7wZqzd=R@x+Y3+TUd+GWL|YyG
zZO{rR$=?9d80lTaU@RPf2Kf1~JX>eKs<z=m_AkE=-cx4HvOQOkGpJ9Ar;|c6>|7*3
z7%!Ha24fQdP=J3Q>_OOS*iWz)!2E&w&M1JK^<BI($d)LUGB7&>{{l5?l~T<QBLV;b
N002ovPDHLkV1lK^M#lgE

diff --git a/data/styles/default/light/mdpi/shield-us-i-wide.png b/data/styles/default/light/mdpi/shield-us-i-wide.png
deleted file mode 100644
index 849721be95932073192f922323e5c46cc4339afa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 779
zcmV+m1N8ifP)<h;3K|Lk000e1NJLTq000^Q000;W1^@s6<bv(R00001b5ch_0Itp)
z=>Px%#Ysd#R7ef&mQPF*K@`S2+ZJqWtt?0grIb==i+`wKBDN9;h(r?-)EI6?6E#K;
z9z2?8(1QoPcoIDrARee*ObiGAAVvukgop(N6b&sc4H`m)3RRl!`aS4gkQgJ|n=kqL
zW@l!<-@M(O-7*D26vaJA$DvQq2Pg<lL1Bo4HbJ>iA+!^scngg~lh8aQKxvQx%7JW9
z0o2ME>s6saQQcElS186}+jMrjFU{%vp5}0f8l#aQiUq%4nDux#h>whqJ8+_?wOGu&
z%N6FGPGO_Tv^*~w2nb=XmxVnZZDedLkEzv5uJ-mSSoAVfvn4t;)!5h2a0aC*$yl~v
zEMDez-@$?#X(hHv_x%*vA+%a7JkZvbf|iv)`7;A=GO0fq5gr&I?*h6<#?qFSTurKU
zyJW}FLzF}Ax|&mM{LEZbb^;k@=rw%zy<<AMblUlapBYJ^z%=2lC6J(CTs&DI1;=QA
z2?Y9<uHP`7ED*0<_MRh<zoaN@G+CfxYbL#E0t6a5T4M_(3v_5-VG!QK1oG}JF+{R6
zb+T8LzF9L-RhG91#vq6H))E@euAD7@i7abeJn8H}B`?7EK^0MSR_rnc50+cnR}R<z
z>nt`rud6Kh0;ebBwhRK19`EKG7pgwn%^CePu%5`x(hoOXIxqr{yNN5d0wPm%gw!go
z$$h=PcWZun-@k&)2EF&;%_FZgsY-(QBp)U<q>RsoO%N2P8*g`+9y}d8EDC@5>0k<>
zzS8>W+W88fO2st;G9-CY{tZN(fbmEt{GoZv<y&1v{qIBN@wlj_vDKkevRJ7-tNZG?
zijjPy-iPs4K)$Y?w<buM1fT=${fp6<`Ek!gO6O~T_TcFB4jRWMAFkeQ3e~#IOInTE
zhpr9)25D@q_#;R<AyMIW9Mk^*Yoh-nGVS_z0L&)({wMjbz%TmW;I-f6a`ylL002ov
JPDHLkV1gY?UhDt>

diff --git a/data/styles/default/light/symbols/shield-us-hw-thin-scaled.svg b/data/styles/default/light/symbols/shield-us-hw-thin-scaled.svg
new file mode 100644
index 000000000..afe6665d6
--- /dev/null
+++ b/data/styles/default/light/symbols/shield-us-hw-thin-scaled.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32" height="34" version="1.1" viewBox="0 0 32 34" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m23.352 28.025h1.2124c2.0083 0 4.7321-1.7221 5.4357-6.1088 0.18811-1.1729-0.2779-2.3335-0.7569-3.3388-2.2037-3.9859-1.6898-6.826 0.75688-9.3417l-5.5517-5.1815c-1.1376 0.96915-2.6125 1.9581-4.2241 1.9581-1.6116 0-3.0865-0.98877-4.2241-1.9579-1.1376 0.96915-2.6126 1.9579-4.2241 1.9579-1.6116 0-3.0865-0.98891-4.2241-1.9581l-5.5517 5.1815c2.4467 2.5157 2.9606 5.3558 0.75688 9.3417-0.47901 1.0054-0.94501 2.166-0.7569 3.3388 0.70353 4.3866 3.4274 6.1088 5.4357 6.1088h1.2124c2.751 0 6.157 2.5565 7.352 4.0292 1.1949-1.4726 4.601-4.0292 7.352-4.0292z" fill="#fff" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
+</svg>
diff --git a/data/styles/default/light/symbols/shield-us-hw-thin.svg b/data/styles/default/light/symbols/shield-us-hw-thin.svg
new file mode 100644
index 000000000..1c7b49709
--- /dev/null
+++ b/data/styles/default/light/symbols/shield-us-hw-thin.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="22" height="22" version="1.1" viewBox="0 0 22 22" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m16.251 18.122h0.866c1.4345 0 3.3801-1.2301 3.8827-4.3634 0.13436-0.83776-0.1985-1.6668-0.54065-2.3849-1.5741-2.8471-1.207-4.8757 0.54063-6.6727l-3.9656-3.7011c-0.81257 0.69225-1.8661 1.3986-3.0173 1.3986-1.1511 0-2.2047-0.70626-3.0173-1.3985-0.81258 0.69225-1.8661 1.3985-3.0173 1.3985-1.1512 0-2.2047-0.70637-3.0173-1.3986l-3.9656 3.7011c1.7477 1.797 2.1147 3.8256 0.54063 6.6727-0.34215 0.71812-0.67502 1.5471-0.54065 2.3849 0.50253 3.1333 2.4482 4.3634 3.8827 4.3634h0.866c1.965 0 4.3979 1.8261 5.2515 2.878 0.85351-1.0519 3.2865-2.878 5.2515-2.878z" fill="#fff"  stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
+</svg>
diff --git a/data/styles/default/light/symbols/shield-us-hw-wide-scaled.svg b/data/styles/default/light/symbols/shield-us-hw-wide-scaled.svg
new file mode 100644
index 000000000..333621d3e
--- /dev/null
+++ b/data/styles/default/light/symbols/shield-us-hw-wide-scaled.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="38" height="36" version="1.1" viewBox="0 0 38 36" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m28.184 27.981h3.0171c2.5736 0 4.8382-1.1324 5.7397-5.8296 0.24107-1.256-0.35613-2.8114-0.96996-3.8879-1.9251-4.1295-1.7287-6.2256 0.96993-8.9869l-5.5484-5.5485c-1.4579 1.0378-4.1231 2.0967-6.1883 2.0967-2.0654 0-4.7464-1.0588-6.2043-2.0966-1.4578 1.0378-4.1389 2.0966-6.2043 2.0966s-4.7305-1.059-6.1883-2.0967l-5.5484 5.5485c2.6987 2.7613 2.8951 4.8573 0.96993 8.9869-0.61383 1.0766-1.211 2.6319-0.96996 3.8879 0.90157 4.6973 3.1661 5.8296 5.7397 5.8296h3.0171c4.6277 0 7.7718 2.6339 9.1843 4.2476 1.4123-1.6137 4.5564-4.2476 9.1843-4.2476z" fill="#fff" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
+</svg>
diff --git a/data/styles/default/light/symbols/shield-us-hw-wide.svg b/data/styles/default/light/symbols/shield-us-hw-wide.svg
new file mode 100644
index 000000000..f0a81e015
--- /dev/null
+++ b/data/styles/default/light/symbols/shield-us-hw-wide.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="26" height="22" version="1.1" viewBox="0 0 26 22" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m19.14 18.386h2.0171c1.7206 0 3.2346-1.2565 3.8373-4.3898 0.16117-0.8378-0.23809-1.9048-0.64847-2.6229-1.287-2.7546-1.1557-4.8308 0.64845-6.6727l-3.7094-3.7011c-0.97466 0.69223-2.7565 1.3986-4.1372 1.3986-1.3808 0-3.1732-0.70625-4.1479-1.3985-0.97463 0.69225-2.7671 1.3985-4.1479 1.3985-1.3808 0-3.1626-0.70637-4.1372-1.3986l-3.7094 3.7011c1.8042 1.8419 1.9355 3.9181 0.64845 6.6727-0.41038 0.71812-0.80964 1.7851-0.64847 2.6229 0.60275 3.1333 2.1167 4.3898 3.8373 4.3898h2.0171c3.0939 0 5.1959 1.9338 6.1402 3.0102 0.94423-1.0764 3.0462-3.0102 6.1402-3.0102z" fill="#fff" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1"/>
+</svg>
diff --git a/data/styles/default/light/symbols/shield-us-i-thin-scaled.svg b/data/styles/default/light/symbols/shield-us-i-thin-scaled.svg
new file mode 100644
index 000000000..da8ffff67
--- /dev/null
+++ b/data/styles/default/light/symbols/shield-us-i-thin-scaled.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32" height="38" version="1.1" viewBox="0 0 32 38" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m27.207 2.2188c-4.0645 2.9696-7.7279 2.9381-11.207 0-3.4792 2.9381-7.1426 2.9696-11.207 0-10.667 19.377 6.606 27.386 11.207 29.168 4.601-1.7815 21.874-9.7912 11.207-29.168z" fill="#fff" stroke="#fff" stroke-linecap="round" stroke-linejoin="round"/>
+ <path d="m29.865 11.066h-27.73c-0.82801 5.1038 0.63161 9.0262 2.9336 12.031 3.4003 4.4387 8.6031 6.8182 10.932 7.7324 2.3285-0.91421 7.5314-3.2937 10.932-7.7324 2.302-3.005 3.7616-6.9275 2.9336-12.031z" fill="#264d99"/>
+ <path d="m29.447 9.1016h-26.895c-0.17704 0.67316-0.31479 1.3289-0.41797 1.9648h27.73c-0.10318-0.63599-0.24093-1.2917-0.41797-1.9648z" fill="#fff"/>
+ <path d="m16 2.8027c-1.7118 1.3573-3.5069 2.1269-5.3828 2.1309-1.8173 0.0038602-3.6786-0.73196-5.5781-2.0078-1.1776 2.2172-1.9855 4.2716-2.4863 6.1758h26.895c-0.50081-1.9042-1.3088-3.9586-2.4863-6.1758-1.8995 1.2758-3.7608 2.0117-5.5781 2.0078-1.876-0.0039847-3.671-0.77359-5.3828-2.1309z" fill="#bf3939"/>
+</svg>
diff --git a/data/styles/default/light/symbols/shield-us-i-thin.svg b/data/styles/default/light/symbols/shield-us-i-thin.svg
new file mode 100644
index 000000000..130627eca
--- /dev/null
+++ b/data/styles/default/light/symbols/shield-us-i-thin.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20" height="24" version="1.1" viewBox="0 0 20 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m2.7073 0.49998c2.6448 1.931 5.0287 1.9106 7.2927 0 2.264 1.9106 4.6479 1.931 7.2927 0 6.9413 12.6-4.345 20.061-7.2927 20.061s-14.234-7.4606-7.2927-20.061z" fill="#fff" stroke="#fff" stroke-linejoin="round"/>
+ <path d="m1.1992 6.2539c-0.32837 1.9515-0.19224 3.7081 0.24609 5.2676 0.36189 1.2875 0.93041 2.4406 1.6152 3.4551 1.1184 1.6567 2.5427 2.9422 3.8555 3.8047s2.558 1.2793 3.084 1.2793c0.52603 0 1.7712-0.41676 3.084-1.2793 1.3128-0.86254 2.7371-2.148 3.8555-3.8047 0.68352-1.0125 1.2513-2.1627 1.6133-3.4473 0.43999-1.5614 0.57693-3.3208 0.24805-5.2754z" fill="#264d99"/>
+ <path d="m1.4766 4.9766c-0.11406 0.4346-0.20717 0.86037-0.27734 1.2773h17.602c-0.07017-0.41697-0.16328-0.84274-0.27734-1.2773z" fill="#fff"/>
+ <path d="m1.4766 4.9766h17.047c-0.31246-1.1906-0.79469-2.448-1.4805-3.7695-1.1938 0.76436-2.3767 1.2368-3.541 1.2344-1.2254-0.0025941-2.3947-0.50897-3.502-1.3574-1.1072 0.84845-2.2765 1.3548-3.502 1.3574-1.1643 0.0024645-2.3472-0.47002-3.541-1.2344-0.68578 1.3216-1.168 2.579-1.4805 3.7695z" fill="#bf3939"/>
+</svg>
diff --git a/data/styles/default/light/symbols/shield-us-i-wide-scaled.svg b/data/styles/default/light/symbols/shield-us-i-wide-scaled.svg
new file mode 100644
index 000000000..68a012aa2
--- /dev/null
+++ b/data/styles/default/light/symbols/shield-us-i-wide-scaled.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="38" height="38" version="1.1" viewBox="0 0 38 38" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m32.165 3.2188c-4.0644 2.9696-9.6859 2.9381-13.165 0-3.4792 2.9381-9.1007 2.9696-13.165 0-13.549 19.268 8.408 27.549 13.165 29.168 4.7571-1.6188 26.714-9.8998 13.165-29.168z" fill="#fff" stroke="#fff" stroke-linejoin="round"/>
+ <path d="m35.729 12.066h-33.457c-0.25961 1.2661-0.3382 2.4579-0.26562 3.5781 0.2187 3.3758 1.7734 6.1552 3.9121 8.4355 4.2193 4.4988 10.647 6.9304 13.082 7.7656 2.4354-0.83519 8.8628-3.2668 13.082-7.7656 2.1387-2.2804 3.6934-5.0598 3.9121-8.4355 0.07257-1.1202-6e-3 -2.312-0.26562-3.5781z" fill="#264d99"/>
+ <path d="m35.197 10.102h-32.395c-0.22548 0.67392-0.40083 1.3288-0.53125 1.9648h33.457c-0.13042-0.63606-0.30577-1.2909-0.53125-1.9648z" fill="#fff"/>
+ <path d="m19 3.7832c-3.5595 2.7678-8.8923 2.7892-12.979 0.083984-1.5317 2.2386-2.5762 4.314-3.2188 6.2344h32.395c-0.64252-1.9203-1.6871-3.9958-3.2188-6.2344-4.0862 2.7052-9.419 2.6838-12.979-0.083984z" fill="#bf3939"/>
+</svg>
diff --git a/data/styles/default/light/symbols/shield-us-i-wide.svg b/data/styles/default/light/symbols/shield-us-i-wide.svg
new file mode 100644
index 000000000..b4f483961
--- /dev/null
+++ b/data/styles/default/light/symbols/shield-us-i-wide.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="26" height="24" version="1.1" viewBox="0 0 26 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m23.743 0.50389c-3.4789 1.931-7.7645 1.9106-10.743 0-2.978 1.9106-7.2636 1.931-10.743 0-6.536 13.842 6.8802 20.065 10.743 20.061 3.8623 0.0036 17.278-6.2194 10.743-20.061z" fill="#fff" stroke="#fff" stroke-linejoin="round"/>
+ <path d="m24.895 6.2578h-23.789c-0.43961 3.9187 0.95508 6.9145 2.9922 9.1309 1.4561 1.5842 3.2403 2.7617 4.8887 3.5371 1.6483 0.77545 3.1826 1.1394 4.0137 1.1387 0.83105 7.75e-4 2.3653-0.36322 4.0137-1.1387 1.6483-0.77545 3.4325-1.9529 4.8887-3.5371 2.0371-2.2163 3.4318-5.2122 2.9922-9.1309z" fill="#264d99"/>
+ <path d="m24.691 4.9805h-23.383c-0.089219 0.43625-0.15653 0.862-0.20312 1.2773h23.789c-0.046594-0.41534-0.11391-0.8411-0.20312-1.2773z" fill="#fff"/>
+ <path d="m13 1.043c-2.9868 1.779-7.0035 1.8031-10.436 0.11719-0.60272 1.3546-1.0118 2.6269-1.2559 3.8203h23.383c-0.24407-1.1934-0.65314-2.4657-1.2559-3.8203-3.432 1.6859-7.4487 1.6618-10.436-0.11719z" fill="#bf3939"/>
+</svg>
diff --git a/data/styles/default/light/xhdpi/shield-us-hw-thin-scaled.png b/data/styles/default/light/xhdpi/shield-us-hw-thin-scaled.png
deleted file mode 100644
index 476a82b0282526cc679e252fc7afc9fd98bc8cd3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2523
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

diff --git a/data/styles/default/light/xhdpi/shield-us-hw-thin.png b/data/styles/default/light/xhdpi/shield-us-hw-thin.png
deleted file mode 100644
index 561520186e04a0003899f3c8ad3d1229f2a1f2f3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1700
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

diff --git a/data/styles/default/light/xhdpi/shield-us-hw-wide-scaled.png b/data/styles/default/light/xhdpi/shield-us-hw-wide-scaled.png
deleted file mode 100644
index e2c63033fe1f6c35101aac9c1ca9037ca3bcd24c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2961
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
Hu0mjfLf)_G

diff --git a/data/styles/default/light/xhdpi/shield-us-hw-wide.png b/data/styles/default/light/xhdpi/shield-us-hw-wide.png
deleted file mode 100644
index 85631ddb3a7e0f05754e2bbae23cc3fddaa17e4f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1856
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

diff --git a/data/styles/default/light/xhdpi/shield-us-i-thin-scaled.png b/data/styles/default/light/xhdpi/shield-us-i-thin-scaled.png
deleted file mode 100644
index 87a595b9373a8175e42cdd3787871285abdba3cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2407
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
Z{{j7f53W-M{%ZgL002ovPDHLkV1iDFt91YX

diff --git a/data/styles/default/light/xhdpi/shield-us-i-thin.png b/data/styles/default/light/xhdpi/shield-us-i-thin.png
deleted file mode 100644
index 76a9d92c073dc4eb5f91ebbb62bbc48282b95dea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1493
zcmV;`1uFW9P)<h;3K|Lk000e1NJLTq001Ze001xu1^@s6V|zH800001b5ch_0Itp)
z=>Px)k4Z#9R9Fe^m~Bi`R~W~8FSiAR0Tn?3(E$}F1BCFRBCk#i%9dfaC3}hT!69y0
zwhx=hbYzQW_+k4triq$m0?D%MB_R`{iH;Xjag)F#I2i#^bSe%j3J58!?f(BmTgoCR
zCeoYCC;9W7_w(bqx96ODB+Y-!ZnvkSXd5&Joq(DoNg9El*3icvl{rv8WQQ7|Q|LDc
zKdqtPd{kyZxzIf58}vB~?=s1iLINGa;68!0Zsk^_|AgA1%g`-|{eq!qp_S0{kOH|I
zLA#;zP$%>cL<@yhK=IHr$eqE0d^sR*zzcJ)B;Zbz8oKuFlLzYS<CkpNat@L-vOJ}o
zqwl1%+3Z)Usx()stCKK>5?)l)8dX|qm%Y7b>}NBZ?UxQ7l&;s*q=c?t|Hty(yKNY>
z2Y_EX2X_sCfyJX8>FKey78h?p{uwqx<D0$_5obeka&82yTxkthu|o72>g==+wYMt+
zO-*5A*RG|b{X*xU4u98s!Ghm|Gc)`2X=&pD2?;XGhdMfJgDovOlhL@;eCyUK6a}&z
z^9-j{R#y8P415x<M=d79;NB?Q3k5Y778=F}2iGAz=cd!^>oe-=dNA=F=u<$O#eaoN
zE)>*%^r+QSaF}1ixye8lC>PSmh@KaG9y2`^6@1}6YHkd9WMc%AAib%%*=ijbS?f_c
zOil)}kO@jAAb%X1-u?R*(W}ASSked>N2t-hzBOuqbFpCQLOPB=X&q$EF&eo@tHsE2
zAJQ>`G`|U_s=wSmC$^`OJ;%aNwO&;fU3N-j*x}DMUJ?<!bp1|*s^|dYWD<bG!{cJR
zQ4^$-NdS(TEj;$9%A8CBaNJ_^RTUjzoJ<1HOP08DtIA|Anahku0P1wgu&U?)qf;hM
z@dD7-$7{wTy(i$kwaPutD*%0TTGavi>XcCzU`#~d-=2ulOmjwt2a26TL@+BgQgwh?
zNfDEP*~yV2oHPALb6uC6wnV&kjG!fIagf%}SK;TRDom$UhL<l5=1Jd1z`saUv@W)R
zUJbS>EBaSi7T?R=1QcNJyq+>3$&y$cJqsz>KX@zkx`UyCfES?tkU(E$b$ocEqrzh@
z`MFSIc!)m_(k7@~#<wSr*7YPRE6wQgY!oGX+4hVMvcMX^Cf-42&OjzZq+WTWAns=t
zc)~Wn5L**(2x0X2;cg@YA2F{T#^I`&E-P6x7#i%?%k*5@{2-sJd*02w>6r67F!6S6
z0+0z5@CK^c3rCy%yEYtGyktVpiSab`)yErZy|v;yy#*}1NfRa_=*+<X2;E7H4N<=M
zFz<*YYk1rAgiW%Szn^m?Ep8FlJ)Ww*cb{+yAjr9+R6t{enK7DO+tyUNH+~Z7oyBQY
zo7crM5N4<X3{ws+QveBo2HcmwhAhP|C0IV%nqKuJe%X9F@4cB?{q`$K1ml7E0Osz4
zpJL+rZAytFgNqwpB<+CYmh=7hcYJ>AwUJTFf(NyoZJD2s)^wn(;D^<TVSKDy<_-a_
z?Lp&A3&_TR<Q469D8O`g%(}I#ZdFg;?G)BMt}R=lZ~M0V#oxFwU<|%<hXL0$-FPzs
zvJ)WrNm>FCR&(;qWzF70r}J)_?uk6h9>o?0`*rUw$!I9Zh;lZ+hy)|YHE&vbC?I?C
zo(`@M%7=7(qklTlC0G8^k$my$?PR-ca=Aj4%lMud7VFP#eL1o1)%@koU4hHjNvIZZ
z58eA83D7yCBbu9#&w>c885*@%kDu<<)i!lUcV0A!n=<SM7dB?c^cJj*9uJtO<)fq#
zhPy)@!0xi(QEXO#&H(|+A4@L8%g+#KCL2KIIj9j}vp#b^7N9!~V0l%R2r+s~9d&*1
vJSDXQs^3xOc?VdD@;u2?f~OJqA4T9_Fs8@YgNRs{00000NkvXXu0mjfP3Oih

diff --git a/data/styles/default/light/xhdpi/shield-us-i-wide-scaled.png b/data/styles/default/light/xhdpi/shield-us-i-wide-scaled.png
deleted file mode 100644
index 9cb16fb2ec7f783d809583f90b07875a8bf41490..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2679
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

diff --git a/data/styles/default/light/xhdpi/shield-us-i-wide.png b/data/styles/default/light/xhdpi/shield-us-i-wide.png
deleted file mode 100644
index 0ca980c4bd23d9b510184015cab9a40b8014d7a5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1762
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
Ef-%lPv;Y7A

diff --git a/data/styles/default/light/xxhdpi/shield-us-hw-thin-scaled.png b/data/styles/default/light/xxhdpi/shield-us-hw-thin-scaled.png
deleted file mode 100644
index d5aeb503939e1cc8b48417b64a766a09d9a3b1ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4427
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
RX_No}002ovPDHLkV1lk!LZ<)#

diff --git a/data/styles/default/light/xxhdpi/shield-us-hw-thin.png b/data/styles/default/light/xxhdpi/shield-us-hw-thin.png
deleted file mode 100644
index 63076af0c44242e3a8b58e764d0106129dfb7221..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3089
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

diff --git a/data/styles/default/light/xxhdpi/shield-us-hw-wide-scaled.png b/data/styles/default/light/xxhdpi/shield-us-hw-wide-scaled.png
deleted file mode 100644
index 4eae04c828c1522e25146bf1c4611ef5402ffed6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4882
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
CEOYAs

diff --git a/data/styles/default/light/xxhdpi/shield-us-hw-wide.png b/data/styles/default/light/xxhdpi/shield-us-hw-wide.png
deleted file mode 100644
index c437a38730d65df6e37e0d873f7b471cc93c1b97..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3175
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
N002ovPDHLkV1hv&BJ2PF

diff --git a/data/styles/default/light/xxhdpi/shield-us-i-thin-scaled.png b/data/styles/default/light/xxhdpi/shield-us-i-thin-scaled.png
deleted file mode 100644
index 83b3f80d4ffa163f8e8b91e215e6fc8fc1ca31a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3934
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

diff --git a/data/styles/default/light/xxhdpi/shield-us-i-thin.png b/data/styles/default/light/xxhdpi/shield-us-i-thin.png
deleted file mode 100644
index f6b6bff33fe3dd1a24c7e14ec726c32fbafa086b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2385
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
DlarNj

diff --git a/data/styles/default/light/xxhdpi/shield-us-i-wide-scaled.png b/data/styles/default/light/xxhdpi/shield-us-i-wide-scaled.png
deleted file mode 100644
index 3f1da7c045524eefc6ed3a52f966b4674eddc2e6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4323
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
R!cqVL002ovPDHLkV1jiBKUx3)

diff --git a/data/styles/default/light/xxhdpi/shield-us-i-wide.png b/data/styles/default/light/xxhdpi/shield-us-i-wide.png
deleted file mode 100644
index c3ac7ee78c1b4e5af874b1d1481aedd8792c7549..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2752
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
GLSTXzYDupE

diff --git a/data/styles/default/light/xxxhdpi/shield-us-hw-thin-scaled.png b/data/styles/default/light/xxxhdpi/shield-us-hw-thin-scaled.png
deleted file mode 100644
index 8281311b16ac04a32b3ecc66e39257a4f6ec9002..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5280
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

diff --git a/data/styles/default/light/xxxhdpi/shield-us-hw-thin.png b/data/styles/default/light/xxxhdpi/shield-us-hw-thin.png
deleted file mode 100644
index 361ace4af182616daf605a5104aef7bec0f32918..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3671
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

diff --git a/data/styles/default/light/xxxhdpi/shield-us-hw-wide-scaled.png b/data/styles/default/light/xxxhdpi/shield-us-hw-wide-scaled.png
deleted file mode 100644
index c63dd27957f17e2a5bb81b9fda4fabc13b7b45a4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5739
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
F`X3YWBVqsm

diff --git a/data/styles/default/light/xxxhdpi/shield-us-hw-wide.png b/data/styles/default/light/xxxhdpi/shield-us-hw-wide.png
deleted file mode 100644
index e4c10d8e416434f8cb17abba56a6c7b79ad927e5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3827
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

diff --git a/data/styles/default/light/xxxhdpi/shield-us-i-thin-scaled.png b/data/styles/default/light/xxxhdpi/shield-us-i-thin-scaled.png
deleted file mode 100644
index 23662ab86679f577840d0ee2452503683f405cea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5064
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
T73cq1b9lPiMp_M;PI3Pa{``<%

diff --git a/data/styles/default/light/xxxhdpi/shield-us-i-thin.png b/data/styles/default/light/xxxhdpi/shield-us-i-thin.png
deleted file mode 100644
index e738c6d78095e1777eb83e583ca5b8b3b5245cdc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2867
zcmV-33(WM1P)<h;3K|Lk000e1NJLTq002e+002}71^@s6KQKWQ00001b5ch_0Itp)
z=>Px<?MXyIRCodHTzgPd*BRft%kH`eyYdimLGghQ#Rs6lSE4B}nm9&$Bx>_VP3&|W
z(~Oy<O-4JJNz=^ev^F*mQ%!8FF{3rcS2RXVv8h_LYN5W6fGD6?0mX=*?8@HV{=Une
z<KeQ40_y1A{boMCbH4MP@0{<q=bm%!x%VRJ?m!-oXC_Rtyk^%ScYyOGNs_&~P6_yr
zg@dW!G_Rw4$ldUN-ka}~fPXU_i~&Cl?&fv27ydVT(>{gdQ|nd2DLI_u!-fFb2i}hc
zDBUiCUut&{I1@bBPvtV`sf~QJam$a5Up3l@L*Y2^NU+6+;pgys(1%`8`2_}!?XdU_
z*yyh^^ltDO@Cop7G;|r#C&3^2Nd^z|vdyPqYo!yali&hyG1_QoZKBh`zaIK{@DT8D
zFagsRHKA}Z{Qb|DkxyXIhylinz`a<diZ8y9?UN@<#)t^&fIq530f9sOBbbJ9cW|^<
z`UUyYwr#T8;n2m+o=t7HMVC-m4Za2@(CG4r0QUxW0sACpO^sZ=YnRk}&K$A-7ht>u
z;Ix_+`~fo&6{fQmE`Ir?T>8NW^K_C_7d~*{cS#Eu)`le}hOqJuOIg;HuU_rBuwg@*
z+}M~wehem4VN7=RzY`ZMXfjx>Vh|l_=JLLMu5%xM9Pg;C%!Y$5iLbu;N!+YiBKTVY
z%x<;wR={Ai&@cQpSow9EYHQ_#Q>NrVPnT9R0byf!cwUbQ6N(dFdP%;+C}Op^tlhuA
zsbbBV==ze9Cp>Pq&moV_)|+Eu4%nwoJs&@Nwxl<kTlJMYR3)w#6}iek{WR=aK|z|k
zsfjKvPIT#v*}na2V^kCahc2mipl>k^v}z0h%!gqr^K^LT%-F`t$|)?bmT=Idw^)va
z_3vNWZP>8-ZW$Rai`_1nVq*02&6^%)b+sEE)m=M!)N;MBum^^8Y73Cn4t?iu7_HWV
zu%x8&$j2YQVM|YUqYb?wEKIspRpqWPE%jVIbjVb9>QprPI@sfKCHi*LthL0)Zy&jF
zW0hcY48W`q^12qlpu_!9_$D)`+Ofk`ykyCIkFKR1D}Piag7zdYTC^he*=NP+U@5>U
zWihF*;Tf!e<e6p5Mh6-w6c@!*vTWHHN(<B?b`A_i3oWHIViY>Ne7R0`I@zX+sRKs3
zoz7H>QJ{Wa3=|ay205Cwo5}6=U?sYpXZiq>N{onA2#d$800X3AP{?QRb1PTs+_KzH
zs1T4zim`0P3UQtt;>AM8MocCm=LQ!yZ5k1fNcae<a`R@|B{L!nvM8emLbN;O6H(3X
z-7eYT5RJ($V2NU-n1ujG6DBlbQosa`LS?H~C9t$sq$*~@B87nAD-U*w9!FIbA3a(D
zhGM4Jg?Q5l7(VG%u3Lvu<e?ifO%cURu?s;Dp`9N;t2kTZ=zTfk8KGP|Ne^Pj?Rlj)
zVv7W{J`uvF-CvZD*HZE-g5AUdrb~$t-DPSO6v7}9Oc*F60%KxI4NJZ{(;TDFq7U~)
zZ^<oYSxw66*~w8$7K~TUW%!6WUR={xlV}J*ix_ZVs%snQAX(ESV!(m9;c#hg|DqlR
zA_fXD4yP=8+{%*ywXLS|gaKheK`X#qYjD!@p&$VPhJ^ymkJlUdk%QLJVOS`@+;lVr
zf$@$AhZhS47_E;IU-1WlQK7;n+h$<g^h6;@gaA7l4~`i1c<>Gx1(;Ba-<J^7)dD_m
zG&YYF<!?+>Xut=2w*kgPhAPvF0!&1>1yBB^;5-BLBCQq$ljc8qofIBsYVjJx-69-F
zb|#adp^MpY8yE_%uieI<^aoO~?TMvV59=9bub@Mjp#!?JgJ4#sIXS3bR0Ru~12ZDU
zPVcm7nnn!jNeAKzabU)z+VPlD+Y|7U!+SYe0b>g@hxCrMo?-=BlTo(Niny3Ceg@7*
z3;~fjs!yTT0AcZt8y<g*rAZPnwM;Q1D~YF>PAd{m2*ekmZxApXsicGmW3Qg!r?mnG
zi!-uYmkSw#dt#Hz=>!3j$FoSh@XX*NVqOdB=~>DDQpI^tk5@P^Ldn<f*-t;#XfhgZ
zs0;%(YtT!sxl@PI>-~%_1CtUq`SMW{+Qn#?mX)-NSp~Yx9^H3Ol+D6dBgCs<!GJjg
zMLh%IS3k?B2?;UqHJ#}LO-g!6UO0DDxeyn9w6UM^3NRQtw~)>y1rhCOrezM;*_;d9
zzgZax-`Tr|8HEV<0SjdsVIzjh{t3QG38J@tF}5Zw)Oe*i7kGb7#*q5OuZ%AfBBNJ8
z{?76o7$8NL4xd|a`)zo0?x?SsVW7#EXQgemS<T|yk_!y@*LoZnZ{T|&`BxdUCJdC5
z`b6dj8YuBStVQ#lOKTM3qE+czA<ticR&+p&p4)B^4L*B&(qXeXgd-`IJ&I{sR93$;
z>3cm6=Y;-$h1hAH<)j`l_=rs^Lg`Uvf%D*ycju35^NUkv`zXja=45P0uv^7Ts1Px?
zx++=$;|*>-BtM(T$xL+TJe9QVQ3$-PK4y(f*!^P85OHMC7G;gEIzE8`g0wpQ70eIF
z|M2=#)nilR`I7F-*~6?$9~gUJ`J#z@hwts{=ZMwkG~p8%s)Pz95Z`zmD5_Pzopg3^
zV)Q{l_edlY6C(51E}mSdnpbEQI_WO}zrZL+ND=|_A66OX=hFJ$=bY#pXFI`k54*$$
z?uW0I<{U8^0LyJ6KsMjbwoZx0txKCVYasYW$cz>?zBfG&lk!=A6&@CSw9RsU%b#Za
zgYN%?K3zomFBmQC`MpqdJ9$T7;DC07e+FM-)vTdL!?yQl?4kVt(>-jmM^x7{Ti>7Y
zO+?F096dYx2r=F9K2TiC+l&pb)>~olI=Ck@bT-NE7vI{MQczU&B-1?%lIFp6OLC6W
z?p^2)f$|<e5sw&z;+Dy~28OEn0*A)qyDRg$t^fA)^RQ@_zm{FO7dgrE{DkB!zk7My
z71c!BE>Nf^?G6OsbVa>+;AC>Z=;)~``In3L<kU4d?M(L|rM0WM`oo3UTSpIzQ%?`{
zgmnc*N<(}4({5nMIl!SI`U3a~$}_^deDWLbeV>qfxB}nyJgCtlc`~taTl(5h%5WMW
z?r5o7hrw$Bii`E}Ze@pnVa@^2c%*R&wft8qMdxZ=uPx0TTXwN-7_+?}vX9+%a@nsl
z52Pe^R|7&oYylv2Q`{ly6fo2xz@f?b=ipwH7b*8px$ci^503&sLq&aO(*y`k84pbu
z)0cMU>KJG_{tTdy>@caFcE}OHp<iqgcp_N+>*;9z`RH%?kL91fG}a}%O&w_@#Gt=5
zd{EE4SALrQgX&QSb4R0u4w`lX6xw2RitY(8tOo!n8tLc2`~y^0Mv~^Bt$WXyx9lw*
zSW;1&daKFJKRXodSlVRNHzp-S9mC^|qG?$JoT`l)Gb2gQ#x?;ET7B*b-BVy#j{wjB
zr0L_z6sA*4S$2C)mR^zf9;vVuoUV#5DZi?$ayS?(P9GFoiSyXHAp>FzbQ_|sE96fj
zy$gWQece5!wi@kpLjZ{89lE^I!Qy7CGrnb1{x5hB06E_oM{U);ufVW|0TAtdhJ#0f
z6Pdo9vK02T{L+6pQ%>^RS-)N84+I#oM*zu&d=i*09pV_UFRFo(zC|Q10T^|@jP952
zfdius#5<Z2pzrN1tAITJAV!6{FTs2efgl1w1cC?z5eOm>L?DPj5CQEW@P9YXMDFY{
RzeE54002ovPDHLkV1k6zScw1t

diff --git a/data/styles/default/light/xxxhdpi/shield-us-i-wide-scaled.png b/data/styles/default/light/xxxhdpi/shield-us-i-wide-scaled.png
deleted file mode 100644
index 05c2982adbd834501b93cd4fcc2786edb5b355f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5452
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

diff --git a/data/styles/default/light/xxxhdpi/shield-us-i-wide.png b/data/styles/default/light/xxxhdpi/shield-us-i-wide.png
deleted file mode 100644
index 13bcafe3b060773fb556d49bd8dfd9e45767f5ac..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3305
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


From cb2181a80e2321e739d364c84d866fc30c0dd282 Mon Sep 17 00:00:00 2001
From: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>
Date: Thu, 21 Aug 2025 19:56:10 +0200
Subject: [PATCH 148/302] [styles] Convert remaining PNG icons to SVG

Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>
---
 .../default/dark/6plus/coloredmark-bg-l.png      | Bin 1543 -> 0 bytes
 .../default/dark/6plus/coloredmark-bg-s.png      | Bin 468 -> 0 bytes
 .../default/dark/6plus/coloredmark-default-l.png | Bin 2146 -> 0 bytes
 .../default/dark/6plus/coloredmark-default-s.png | Bin 786 -> 0 bytes
 data/styles/default/dark/6plus/compass-image.png | Bin 3841 -> 0 bytes
 .../default/dark/6plus/cross_geoposition.png     | Bin 1113 -> 0 bytes
 .../default/dark/6plus/current-position.png      | Bin 1338 -> 0 bytes
 data/styles/default/dark/6plus/infosign.png      | Bin 3529 -> 0 bytes
 .../dark/6plus/non-found-search-result.png       | Bin 464 -> 0 bytes
 data/styles/default/dark/6plus/route-arrow.png   | Bin 3227 -> 0 bytes
 .../default/dark/6plus/route-point-finish.png    | Bin 6227 -> 0 bytes
 .../default/dark/6plus/route-point-start.png     | Bin 3641 -> 0 bytes
 data/styles/default/dark/6plus/search-result.png | Bin 1162 -> 0 bytes
 .../dark/6plus/track_marker_deselected.png       | Bin 1007 -> 0 bytes
 .../default/dark/6plus/track_marker_selected.png | Bin 3657 -> 0 bytes
 data/styles/default/dark/hdpi-ad/keep.png        | Bin 126 -> 0 bytes
 .../default/dark/hdpi/coloredmark-bg-l.png       | Bin 765 -> 0 bytes
 .../default/dark/hdpi/coloredmark-bg-s.png       | Bin 357 -> 0 bytes
 .../default/dark/hdpi/coloredmark-default-l.png  | Bin 960 -> 0 bytes
 .../default/dark/hdpi/coloredmark-default-s.png  | Bin 620 -> 0 bytes
 data/styles/default/dark/hdpi/compass-image.png  | Bin 2295 -> 0 bytes
 .../default/dark/hdpi/cross_geoposition.png      | Bin 584 -> 0 bytes
 .../default/dark/hdpi/current-position.png       | Bin 891 -> 0 bytes
 data/styles/default/dark/hdpi/infosign.png       | Bin 2178 -> 0 bytes
 .../dark/hdpi/non-found-search-result.png        | Bin 506 -> 0 bytes
 data/styles/default/dark/hdpi/route-arrow.png    | Bin 1893 -> 0 bytes
 .../default/dark/hdpi/route-point-finish.png     | Bin 3494 -> 0 bytes
 .../default/dark/hdpi/route-point-start.png      | Bin 1826 -> 0 bytes
 data/styles/default/dark/hdpi/search-result.png  | Bin 542 -> 0 bytes
 .../dark/hdpi/track_marker_deselected.png        | Bin 604 -> 0 bytes
 .../default/dark/hdpi/track_marker_selected.png  | Bin 1565 -> 0 bytes
 data/styles/default/dark/mdpi-ad/keep.png        | Bin 126 -> 0 bytes
 .../default/dark/mdpi/coloredmark-bg-l.png       | Bin 538 -> 0 bytes
 .../default/dark/mdpi/coloredmark-bg-s.png       | Bin 230 -> 0 bytes
 .../default/dark/mdpi/coloredmark-default-l.png  | Bin 550 -> 0 bytes
 .../default/dark/mdpi/coloredmark-default-s.png  | Bin 322 -> 0 bytes
 data/styles/default/dark/mdpi/compass-image.png  | Bin 1434 -> 0 bytes
 .../default/dark/mdpi/cross_geoposition.png      | Bin 319 -> 0 bytes
 .../default/dark/mdpi/current-position.png       | Bin 582 -> 0 bytes
 data/styles/default/dark/mdpi/infosign.png       | Bin 1407 -> 0 bytes
 .../dark/mdpi/non-found-search-result.png        | Bin 228 -> 0 bytes
 data/styles/default/dark/mdpi/route-arrow.png    | Bin 1146 -> 0 bytes
 .../default/dark/mdpi/route-point-finish.png     | Bin 2009 -> 0 bytes
 .../default/dark/mdpi/route-point-start.png      | Bin 990 -> 0 bytes
 data/styles/default/dark/mdpi/search-result.png  | Bin 381 -> 0 bytes
 .../dark/mdpi/track_marker_deselected.png        | Bin 402 -> 0 bytes
 .../default/dark/mdpi/track_marker_selected.png  | Bin 1086 -> 0 bytes
 .../default/dark/symbols/coloredmark-bg-l.svg    |   4 ++++
 .../default/dark/symbols/coloredmark-bg-s.svg    |   4 ++++
 .../dark/symbols/coloredmark-default-l.svg       |   4 ++++
 .../dark/symbols/coloredmark-default-s.svg       |   4 ++++
 data/styles/default/dark/symbols/compass.svg     |   6 ++++++
 .../default/dark/symbols/cross_geoposition.svg   |   6 ++++++
 .../default/dark/symbols/current-position.svg    |   4 ++++
 data/styles/default/dark/symbols/infosign.svg    |   7 +++++++
 data/styles/default/dark/symbols/route-arrow.svg |   4 ++++
 .../default/dark/symbols/route-point-finish.svg  |  12 ++++++++++++
 .../default/dark/symbols/route-point-start.svg   |  10 ++++++++++
 .../dark/symbols/search-result-non-found.svg     |   4 ++++
 .../default/dark/symbols/search-result.svg       |   4 ++++
 .../dark/symbols/track_marker_deselected.svg     |   5 +++++
 .../dark/symbols/track_marker_selected.svg       |   6 ++++++
 .../default/dark/vector-icons/compass-image.svg  |   5 -----
 data/styles/default/dark/vector-icons/readme.md  |   1 -
 data/styles/default/dark/xhdpi-ad/keep.png       | Bin 126 -> 0 bytes
 .../default/dark/xhdpi/coloredmark-bg-l.png      | Bin 1052 -> 0 bytes
 .../default/dark/xhdpi/coloredmark-bg-s.png      | Bin 376 -> 0 bytes
 .../default/dark/xhdpi/coloredmark-default-l.png | Bin 1598 -> 0 bytes
 .../default/dark/xhdpi/coloredmark-default-s.png | Bin 603 -> 0 bytes
 data/styles/default/dark/xhdpi/compass-image.png | Bin 3089 -> 0 bytes
 .../default/dark/xhdpi/cross_geoposition.png     | Bin 710 -> 0 bytes
 .../default/dark/xhdpi/current-position.png      | Bin 1185 -> 0 bytes
 data/styles/default/dark/xhdpi/infosign.png      | Bin 2913 -> 0 bytes
 .../dark/xhdpi/non-found-search-result.png       | Bin 395 -> 0 bytes
 data/styles/default/dark/xhdpi/route-arrow.png   | Bin 2219 -> 0 bytes
 .../default/dark/xhdpi/route-point-finish.png    | Bin 4842 -> 0 bytes
 .../default/dark/xhdpi/route-point-start.png     | Bin 2484 -> 0 bytes
 data/styles/default/dark/xhdpi/search-result.png | Bin 745 -> 0 bytes
 .../dark/xhdpi/track_marker_deselected.png       | Bin 819 -> 0 bytes
 .../default/dark/xhdpi/track_marker_selected.png | Bin 2123 -> 0 bytes
 data/styles/default/dark/xxhdpi-ad/keep.png      | Bin 126 -> 0 bytes
 .../default/dark/xxhdpi/coloredmark-bg-l.png     | Bin 1738 -> 0 bytes
 .../default/dark/xxhdpi/coloredmark-bg-s.png     | Bin 581 -> 0 bytes
 .../dark/xxhdpi/coloredmark-default-l.png        | Bin 2667 -> 0 bytes
 .../dark/xxhdpi/coloredmark-default-s.png        | Bin 973 -> 0 bytes
 .../styles/default/dark/xxhdpi/compass-image.png | Bin 4931 -> 0 bytes
 .../default/dark/xxhdpi/cross_geoposition.png    | Bin 1169 -> 0 bytes
 .../default/dark/xxhdpi/current-position.png     | Bin 1728 -> 0 bytes
 data/styles/default/dark/xxhdpi/infosign.png     | Bin 4411 -> 0 bytes
 .../dark/xxhdpi/non-found-search-result.png      | Bin 572 -> 0 bytes
 data/styles/default/dark/xxhdpi/route-arrow.png  | Bin 3396 -> 0 bytes
 .../default/dark/xxhdpi/route-point-finish.png   | Bin 8133 -> 0 bytes
 .../default/dark/xxhdpi/route-point-start.png    | Bin 4137 -> 0 bytes
 .../styles/default/dark/xxhdpi/search-result.png | Bin 1134 -> 0 bytes
 .../dark/xxhdpi/track_marker_deselected.png      | Bin 1332 -> 0 bytes
 .../dark/xxhdpi/track_marker_selected.png        | Bin 3717 -> 0 bytes
 data/styles/default/dark/xxxhdpi-ad/keep.png     | Bin 126 -> 0 bytes
 .../default/dark/xxxhdpi/coloredmark-bg-l.png    | Bin 2092 -> 0 bytes
 .../default/dark/xxxhdpi/coloredmark-bg-s.png    | Bin 838 -> 0 bytes
 .../dark/xxxhdpi/coloredmark-default-l.png       | Bin 3289 -> 0 bytes
 .../dark/xxxhdpi/coloredmark-default-s.png       | Bin 1483 -> 0 bytes
 .../default/dark/xxxhdpi/compass-image.png       | Bin 5825 -> 0 bytes
 .../default/dark/xxxhdpi/cross_geoposition.png   | Bin 1563 -> 0 bytes
 .../default/dark/xxxhdpi/current-position.png    | Bin 2164 -> 0 bytes
 data/styles/default/dark/xxxhdpi/infosign.png    | Bin 5182 -> 0 bytes
 .../dark/xxxhdpi/non-found-search-result.png     | Bin 572 -> 0 bytes
 data/styles/default/dark/xxxhdpi/route-arrow.png | Bin 3396 -> 0 bytes
 .../default/dark/xxxhdpi/route-point-finish.png  | Bin 9962 -> 0 bytes
 .../default/dark/xxxhdpi/route-point-start.png   | Bin 5188 -> 0 bytes
 .../default/dark/xxxhdpi/search-result.png       | Bin 1384 -> 0 bytes
 .../dark/xxxhdpi/track_marker_deselected.png     | Bin 1719 -> 0 bytes
 .../dark/xxxhdpi/track_marker_selected.png       | Bin 4578 -> 0 bytes
 .../default/light/6plus/coloredmark-bg-l.png     | Bin 1543 -> 0 bytes
 .../default/light/6plus/coloredmark-bg-s.png     | Bin 468 -> 0 bytes
 .../light/6plus/coloredmark-default-l.png        | Bin 1826 -> 0 bytes
 .../light/6plus/coloredmark-default-s.png        | Bin 786 -> 0 bytes
 .../styles/default/light/6plus/compass-image.png | Bin 3150 -> 0 bytes
 .../default/light/6plus/cross_geoposition.png    | Bin 1115 -> 0 bytes
 .../default/light/6plus/current-position.png     | Bin 1324 -> 0 bytes
 data/styles/default/light/6plus/infosign.png     | Bin 3537 -> 0 bytes
 .../light/6plus/non-found-search-result.png      | Bin 464 -> 0 bytes
 data/styles/default/light/6plus/route-arrow.png  | Bin 3227 -> 0 bytes
 .../default/light/6plus/route-point-finish.png   | Bin 6227 -> 0 bytes
 .../default/light/6plus/route-point-start.png    | Bin 3641 -> 0 bytes
 .../styles/default/light/6plus/search-result.png | Bin 1190 -> 0 bytes
 .../light/6plus/track_marker_deselected.png      | Bin 1014 -> 0 bytes
 .../light/6plus/track_marker_selected.png        | Bin 3634 -> 0 bytes
 data/styles/default/light/hdpi-ad/keep.png       | Bin 126 -> 0 bytes
 .../default/light/hdpi/coloredmark-bg-l.png      | Bin 765 -> 0 bytes
 .../default/light/hdpi/coloredmark-bg-s.png      | Bin 357 -> 0 bytes
 .../default/light/hdpi/coloredmark-default-l.png | Bin 847 -> 0 bytes
 .../default/light/hdpi/coloredmark-default-s.png | Bin 620 -> 0 bytes
 data/styles/default/light/hdpi/compass-image.png | Bin 1880 -> 0 bytes
 .../default/light/hdpi/cross_geoposition.png     | Bin 575 -> 0 bytes
 .../default/light/hdpi/current-position.png      | Bin 890 -> 0 bytes
 data/styles/default/light/hdpi/infosign.png      | Bin 2178 -> 0 bytes
 .../light/hdpi/non-found-search-result.png       | Bin 506 -> 0 bytes
 data/styles/default/light/hdpi/route-arrow.png   | Bin 1893 -> 0 bytes
 .../default/light/hdpi/route-point-finish.png    | Bin 3494 -> 0 bytes
 .../default/light/hdpi/route-point-start.png     | Bin 1826 -> 0 bytes
 data/styles/default/light/hdpi/search-result.png | Bin 617 -> 0 bytes
 .../light/hdpi/track_marker_deselected.png       | Bin 614 -> 0 bytes
 .../default/light/hdpi/track_marker_selected.png | Bin 1641 -> 0 bytes
 data/styles/default/light/mdpi-ad/keep.png       | Bin 126 -> 0 bytes
 .../default/light/mdpi/coloredmark-bg-l.png      | Bin 538 -> 0 bytes
 .../default/light/mdpi/coloredmark-bg-s.png      | Bin 230 -> 0 bytes
 .../default/light/mdpi/coloredmark-default-l.png | Bin 532 -> 0 bytes
 .../default/light/mdpi/coloredmark-default-s.png | Bin 322 -> 0 bytes
 data/styles/default/light/mdpi/compass-image.png | Bin 1207 -> 0 bytes
 .../default/light/mdpi/cross_geoposition.png     | Bin 306 -> 0 bytes
 .../default/light/mdpi/current-position.png      | Bin 580 -> 0 bytes
 data/styles/default/light/mdpi/infosign.png      | Bin 1413 -> 0 bytes
 .../light/mdpi/non-found-search-result.png       | Bin 228 -> 0 bytes
 data/styles/default/light/mdpi/route-arrow.png   | Bin 1146 -> 0 bytes
 .../default/light/mdpi/route-point-finish.png    | Bin 2009 -> 0 bytes
 .../default/light/mdpi/route-point-start.png     | Bin 990 -> 0 bytes
 data/styles/default/light/mdpi/search-result.png | Bin 395 -> 0 bytes
 .../light/mdpi/track_marker_deselected.png       | Bin 401 -> 0 bytes
 .../default/light/mdpi/track_marker_selected.png | Bin 1098 -> 0 bytes
 .../default/light/symbols/coloredmark-bg-l.svg   |   4 ++++
 .../default/light/symbols/coloredmark-bg-s.svg   |   4 ++++
 .../light/symbols/coloredmark-default-l.svg      |   4 ++++
 .../light/symbols/coloredmark-default-s.svg      |   4 ++++
 data/styles/default/light/symbols/compass.svg    |   6 ++++++
 .../default/light/symbols/cross_geoposition.svg  |   6 ++++++
 .../default/light/symbols/current-position.svg   |   4 ++++
 data/styles/default/light/symbols/infosign.svg   |   7 +++++++
 .../styles/default/light/symbols/route-arrow.svg |   4 ++++
 .../default/light/symbols/route-point-finish.svg |  12 ++++++++++++
 .../default/light/symbols/route-point-start.svg  |  10 ++++++++++
 .../light/symbols/search-result-non-found.svg    |   4 ++++
 .../default/light/symbols/search-result.svg      |   4 ++++
 .../light/symbols/track_marker_deselected.svg    |   5 +++++
 .../light/symbols/track_marker_selected.svg      |   6 ++++++
 .../default/light/vector-icons/compass-image.svg |   5 -----
 data/styles/default/light/vector-icons/readme.md |   1 -
 data/styles/default/light/xhdpi-ad/keep.png      | Bin 126 -> 0 bytes
 .../default/light/xhdpi/coloredmark-bg-l.png     | Bin 1052 -> 0 bytes
 .../default/light/xhdpi/coloredmark-bg-s.png     | Bin 376 -> 0 bytes
 .../light/xhdpi/coloredmark-default-l.png        | Bin 1223 -> 0 bytes
 .../light/xhdpi/coloredmark-default-s.png        | Bin 603 -> 0 bytes
 .../styles/default/light/xhdpi/compass-image.png | Bin 2601 -> 0 bytes
 .../default/light/xhdpi/cross_geoposition.png    | Bin 717 -> 0 bytes
 .../default/light/xhdpi/current-position.png     | Bin 1151 -> 0 bytes
 data/styles/default/light/xhdpi/infosign.png     | Bin 2917 -> 0 bytes
 .../light/xhdpi/non-found-search-result.png      | Bin 395 -> 0 bytes
 data/styles/default/light/xhdpi/route-arrow.png  | Bin 2219 -> 0 bytes
 .../default/light/xhdpi/route-point-finish.png   | Bin 4842 -> 0 bytes
 .../default/light/xhdpi/route-point-start.png    | Bin 2484 -> 0 bytes
 .../styles/default/light/xhdpi/search-result.png | Bin 779 -> 0 bytes
 .../light/xhdpi/track_marker_deselected.png      | Bin 834 -> 0 bytes
 .../light/xhdpi/track_marker_selected.png        | Bin 2125 -> 0 bytes
 data/styles/default/light/xxhdpi-ad/keep.png     | Bin 126 -> 0 bytes
 .../default/light/xxhdpi/coloredmark-bg-l.png    | Bin 1738 -> 0 bytes
 .../default/light/xxhdpi/coloredmark-bg-s.png    | Bin 581 -> 0 bytes
 .../light/xxhdpi/coloredmark-default-l.png       | Bin 1979 -> 0 bytes
 .../light/xxhdpi/coloredmark-default-s.png       | Bin 973 -> 0 bytes
 .../default/light/xxhdpi/compass-image.png       | Bin 4018 -> 0 bytes
 .../default/light/xxhdpi/cross_geoposition.png   | Bin 1152 -> 0 bytes
 .../default/light/xxhdpi/current-position.png    | Bin 1722 -> 0 bytes
 data/styles/default/light/xxhdpi/infosign.png    | Bin 4410 -> 0 bytes
 .../light/xxhdpi/non-found-search-result.png     | Bin 572 -> 0 bytes
 data/styles/default/light/xxhdpi/route-arrow.png | Bin 3396 -> 0 bytes
 .../default/light/xxhdpi/route-point-finish.png  | Bin 8133 -> 0 bytes
 .../default/light/xxhdpi/route-point-start.png   | Bin 4137 -> 0 bytes
 .../default/light/xxhdpi/search-result.png       | Bin 1189 -> 0 bytes
 .../light/xxhdpi/track_marker_deselected.png     | Bin 1367 -> 0 bytes
 .../light/xxhdpi/track_marker_selected.png       | Bin 3671 -> 0 bytes
 data/styles/default/light/xxxhdpi-ad/keep.png    | Bin 126 -> 0 bytes
 .../default/light/xxxhdpi/coloredmark-bg-l.png   | Bin 2092 -> 0 bytes
 .../default/light/xxxhdpi/coloredmark-bg-s.png   | Bin 838 -> 0 bytes
 .../light/xxxhdpi/coloredmark-default-l.png      | Bin 2449 -> 0 bytes
 .../light/xxxhdpi/coloredmark-default-s.png      | Bin 1483 -> 0 bytes
 .../default/light/xxxhdpi/compass-image.png      | Bin 4753 -> 0 bytes
 .../default/light/xxxhdpi/cross_geoposition.png  | Bin 1626 -> 0 bytes
 .../default/light/xxxhdpi/current-position.png   | Bin 2170 -> 0 bytes
 data/styles/default/light/xxxhdpi/infosign.png   | Bin 5226 -> 0 bytes
 .../light/xxxhdpi/non-found-search-result.png    | Bin 572 -> 0 bytes
 .../styles/default/light/xxxhdpi/route-arrow.png | Bin 3396 -> 0 bytes
 .../default/light/xxxhdpi/route-point-finish.png | Bin 9962 -> 0 bytes
 .../default/light/xxxhdpi/route-point-start.png  | Bin 5188 -> 0 bytes
 .../default/light/xxxhdpi/search-result.png      | Bin 1410 -> 0 bytes
 .../light/xxxhdpi/track_marker_deselected.png    | Bin 1735 -> 0 bytes
 .../light/xxxhdpi/track_marker_selected.png      | Bin 4445 -> 0 bytes
 libs/drape_frontend/gui/compass.cpp              |   2 +-
 libs/map/search_mark.cpp                         |   2 +-
 libs/map/user_mark.cpp                           |   2 +-
 227 files changed, 171 insertions(+), 15 deletions(-)
 delete mode 100644 data/styles/default/dark/6plus/coloredmark-bg-l.png
 delete mode 100644 data/styles/default/dark/6plus/coloredmark-bg-s.png
 delete mode 100644 data/styles/default/dark/6plus/coloredmark-default-l.png
 delete mode 100644 data/styles/default/dark/6plus/coloredmark-default-s.png
 delete mode 100644 data/styles/default/dark/6plus/compass-image.png
 delete mode 100644 data/styles/default/dark/6plus/cross_geoposition.png
 delete mode 100644 data/styles/default/dark/6plus/current-position.png
 delete mode 100644 data/styles/default/dark/6plus/infosign.png
 delete mode 100644 data/styles/default/dark/6plus/non-found-search-result.png
 delete mode 100644 data/styles/default/dark/6plus/route-arrow.png
 delete mode 100644 data/styles/default/dark/6plus/route-point-finish.png
 delete mode 100644 data/styles/default/dark/6plus/route-point-start.png
 delete mode 100644 data/styles/default/dark/6plus/search-result.png
 delete mode 100644 data/styles/default/dark/6plus/track_marker_deselected.png
 delete mode 100644 data/styles/default/dark/6plus/track_marker_selected.png
 delete mode 100644 data/styles/default/dark/hdpi-ad/keep.png
 delete mode 100644 data/styles/default/dark/hdpi/coloredmark-bg-l.png
 delete mode 100644 data/styles/default/dark/hdpi/coloredmark-bg-s.png
 delete mode 100644 data/styles/default/dark/hdpi/coloredmark-default-l.png
 delete mode 100644 data/styles/default/dark/hdpi/coloredmark-default-s.png
 delete mode 100644 data/styles/default/dark/hdpi/compass-image.png
 delete mode 100644 data/styles/default/dark/hdpi/cross_geoposition.png
 delete mode 100644 data/styles/default/dark/hdpi/current-position.png
 delete mode 100644 data/styles/default/dark/hdpi/infosign.png
 delete mode 100644 data/styles/default/dark/hdpi/non-found-search-result.png
 delete mode 100644 data/styles/default/dark/hdpi/route-arrow.png
 delete mode 100644 data/styles/default/dark/hdpi/route-point-finish.png
 delete mode 100644 data/styles/default/dark/hdpi/route-point-start.png
 delete mode 100644 data/styles/default/dark/hdpi/search-result.png
 delete mode 100644 data/styles/default/dark/hdpi/track_marker_deselected.png
 delete mode 100644 data/styles/default/dark/hdpi/track_marker_selected.png
 delete mode 100644 data/styles/default/dark/mdpi-ad/keep.png
 delete mode 100644 data/styles/default/dark/mdpi/coloredmark-bg-l.png
 delete mode 100644 data/styles/default/dark/mdpi/coloredmark-bg-s.png
 delete mode 100644 data/styles/default/dark/mdpi/coloredmark-default-l.png
 delete mode 100644 data/styles/default/dark/mdpi/coloredmark-default-s.png
 delete mode 100644 data/styles/default/dark/mdpi/compass-image.png
 delete mode 100644 data/styles/default/dark/mdpi/cross_geoposition.png
 delete mode 100644 data/styles/default/dark/mdpi/current-position.png
 delete mode 100644 data/styles/default/dark/mdpi/infosign.png
 delete mode 100644 data/styles/default/dark/mdpi/non-found-search-result.png
 delete mode 100644 data/styles/default/dark/mdpi/route-arrow.png
 delete mode 100644 data/styles/default/dark/mdpi/route-point-finish.png
 delete mode 100644 data/styles/default/dark/mdpi/route-point-start.png
 delete mode 100644 data/styles/default/dark/mdpi/search-result.png
 delete mode 100644 data/styles/default/dark/mdpi/track_marker_deselected.png
 delete mode 100644 data/styles/default/dark/mdpi/track_marker_selected.png
 create mode 100644 data/styles/default/dark/symbols/coloredmark-bg-l.svg
 create mode 100644 data/styles/default/dark/symbols/coloredmark-bg-s.svg
 create mode 100644 data/styles/default/dark/symbols/coloredmark-default-l.svg
 create mode 100644 data/styles/default/dark/symbols/coloredmark-default-s.svg
 create mode 100644 data/styles/default/dark/symbols/compass.svg
 create mode 100644 data/styles/default/dark/symbols/cross_geoposition.svg
 create mode 100644 data/styles/default/dark/symbols/current-position.svg
 create mode 100644 data/styles/default/dark/symbols/infosign.svg
 create mode 100644 data/styles/default/dark/symbols/route-arrow.svg
 create mode 100644 data/styles/default/dark/symbols/route-point-finish.svg
 create mode 100644 data/styles/default/dark/symbols/route-point-start.svg
 create mode 100644 data/styles/default/dark/symbols/search-result-non-found.svg
 create mode 100644 data/styles/default/dark/symbols/search-result.svg
 create mode 100644 data/styles/default/dark/symbols/track_marker_deselected.svg
 create mode 100644 data/styles/default/dark/symbols/track_marker_selected.svg
 delete mode 100644 data/styles/default/dark/vector-icons/compass-image.svg
 delete mode 100644 data/styles/default/dark/vector-icons/readme.md
 delete mode 100644 data/styles/default/dark/xhdpi-ad/keep.png
 delete mode 100644 data/styles/default/dark/xhdpi/coloredmark-bg-l.png
 delete mode 100644 data/styles/default/dark/xhdpi/coloredmark-bg-s.png
 delete mode 100644 data/styles/default/dark/xhdpi/coloredmark-default-l.png
 delete mode 100644 data/styles/default/dark/xhdpi/coloredmark-default-s.png
 delete mode 100644 data/styles/default/dark/xhdpi/compass-image.png
 delete mode 100644 data/styles/default/dark/xhdpi/cross_geoposition.png
 delete mode 100644 data/styles/default/dark/xhdpi/current-position.png
 delete mode 100644 data/styles/default/dark/xhdpi/infosign.png
 delete mode 100644 data/styles/default/dark/xhdpi/non-found-search-result.png
 delete mode 100644 data/styles/default/dark/xhdpi/route-arrow.png
 delete mode 100644 data/styles/default/dark/xhdpi/route-point-finish.png
 delete mode 100644 data/styles/default/dark/xhdpi/route-point-start.png
 delete mode 100644 data/styles/default/dark/xhdpi/search-result.png
 delete mode 100644 data/styles/default/dark/xhdpi/track_marker_deselected.png
 delete mode 100644 data/styles/default/dark/xhdpi/track_marker_selected.png
 delete mode 100644 data/styles/default/dark/xxhdpi-ad/keep.png
 delete mode 100644 data/styles/default/dark/xxhdpi/coloredmark-bg-l.png
 delete mode 100644 data/styles/default/dark/xxhdpi/coloredmark-bg-s.png
 delete mode 100644 data/styles/default/dark/xxhdpi/coloredmark-default-l.png
 delete mode 100644 data/styles/default/dark/xxhdpi/coloredmark-default-s.png
 delete mode 100644 data/styles/default/dark/xxhdpi/compass-image.png
 delete mode 100644 data/styles/default/dark/xxhdpi/cross_geoposition.png
 delete mode 100644 data/styles/default/dark/xxhdpi/current-position.png
 delete mode 100644 data/styles/default/dark/xxhdpi/infosign.png
 delete mode 100644 data/styles/default/dark/xxhdpi/non-found-search-result.png
 delete mode 100644 data/styles/default/dark/xxhdpi/route-arrow.png
 delete mode 100644 data/styles/default/dark/xxhdpi/route-point-finish.png
 delete mode 100644 data/styles/default/dark/xxhdpi/route-point-start.png
 delete mode 100644 data/styles/default/dark/xxhdpi/search-result.png
 delete mode 100644 data/styles/default/dark/xxhdpi/track_marker_deselected.png
 delete mode 100644 data/styles/default/dark/xxhdpi/track_marker_selected.png
 delete mode 100644 data/styles/default/dark/xxxhdpi-ad/keep.png
 delete mode 100644 data/styles/default/dark/xxxhdpi/coloredmark-bg-l.png
 delete mode 100644 data/styles/default/dark/xxxhdpi/coloredmark-bg-s.png
 delete mode 100644 data/styles/default/dark/xxxhdpi/coloredmark-default-l.png
 delete mode 100644 data/styles/default/dark/xxxhdpi/coloredmark-default-s.png
 delete mode 100644 data/styles/default/dark/xxxhdpi/compass-image.png
 delete mode 100644 data/styles/default/dark/xxxhdpi/cross_geoposition.png
 delete mode 100644 data/styles/default/dark/xxxhdpi/current-position.png
 delete mode 100644 data/styles/default/dark/xxxhdpi/infosign.png
 delete mode 100644 data/styles/default/dark/xxxhdpi/non-found-search-result.png
 delete mode 100644 data/styles/default/dark/xxxhdpi/route-arrow.png
 delete mode 100644 data/styles/default/dark/xxxhdpi/route-point-finish.png
 delete mode 100644 data/styles/default/dark/xxxhdpi/route-point-start.png
 delete mode 100644 data/styles/default/dark/xxxhdpi/search-result.png
 delete mode 100644 data/styles/default/dark/xxxhdpi/track_marker_deselected.png
 delete mode 100644 data/styles/default/dark/xxxhdpi/track_marker_selected.png
 delete mode 100644 data/styles/default/light/6plus/coloredmark-bg-l.png
 delete mode 100644 data/styles/default/light/6plus/coloredmark-bg-s.png
 delete mode 100644 data/styles/default/light/6plus/coloredmark-default-l.png
 delete mode 100644 data/styles/default/light/6plus/coloredmark-default-s.png
 delete mode 100644 data/styles/default/light/6plus/compass-image.png
 delete mode 100644 data/styles/default/light/6plus/cross_geoposition.png
 delete mode 100644 data/styles/default/light/6plus/current-position.png
 delete mode 100644 data/styles/default/light/6plus/infosign.png
 delete mode 100644 data/styles/default/light/6plus/non-found-search-result.png
 delete mode 100644 data/styles/default/light/6plus/route-arrow.png
 delete mode 100644 data/styles/default/light/6plus/route-point-finish.png
 delete mode 100644 data/styles/default/light/6plus/route-point-start.png
 delete mode 100644 data/styles/default/light/6plus/search-result.png
 delete mode 100644 data/styles/default/light/6plus/track_marker_deselected.png
 delete mode 100644 data/styles/default/light/6plus/track_marker_selected.png
 delete mode 100644 data/styles/default/light/hdpi-ad/keep.png
 delete mode 100644 data/styles/default/light/hdpi/coloredmark-bg-l.png
 delete mode 100644 data/styles/default/light/hdpi/coloredmark-bg-s.png
 delete mode 100644 data/styles/default/light/hdpi/coloredmark-default-l.png
 delete mode 100644 data/styles/default/light/hdpi/coloredmark-default-s.png
 delete mode 100644 data/styles/default/light/hdpi/compass-image.png
 delete mode 100644 data/styles/default/light/hdpi/cross_geoposition.png
 delete mode 100644 data/styles/default/light/hdpi/current-position.png
 delete mode 100644 data/styles/default/light/hdpi/infosign.png
 delete mode 100644 data/styles/default/light/hdpi/non-found-search-result.png
 delete mode 100644 data/styles/default/light/hdpi/route-arrow.png
 delete mode 100644 data/styles/default/light/hdpi/route-point-finish.png
 delete mode 100644 data/styles/default/light/hdpi/route-point-start.png
 delete mode 100644 data/styles/default/light/hdpi/search-result.png
 delete mode 100644 data/styles/default/light/hdpi/track_marker_deselected.png
 delete mode 100644 data/styles/default/light/hdpi/track_marker_selected.png
 delete mode 100644 data/styles/default/light/mdpi-ad/keep.png
 delete mode 100644 data/styles/default/light/mdpi/coloredmark-bg-l.png
 delete mode 100644 data/styles/default/light/mdpi/coloredmark-bg-s.png
 delete mode 100644 data/styles/default/light/mdpi/coloredmark-default-l.png
 delete mode 100644 data/styles/default/light/mdpi/coloredmark-default-s.png
 delete mode 100644 data/styles/default/light/mdpi/compass-image.png
 delete mode 100644 data/styles/default/light/mdpi/cross_geoposition.png
 delete mode 100644 data/styles/default/light/mdpi/current-position.png
 delete mode 100644 data/styles/default/light/mdpi/infosign.png
 delete mode 100644 data/styles/default/light/mdpi/non-found-search-result.png
 delete mode 100644 data/styles/default/light/mdpi/route-arrow.png
 delete mode 100644 data/styles/default/light/mdpi/route-point-finish.png
 delete mode 100644 data/styles/default/light/mdpi/route-point-start.png
 delete mode 100644 data/styles/default/light/mdpi/search-result.png
 delete mode 100644 data/styles/default/light/mdpi/track_marker_deselected.png
 delete mode 100644 data/styles/default/light/mdpi/track_marker_selected.png
 create mode 100644 data/styles/default/light/symbols/coloredmark-bg-l.svg
 create mode 100644 data/styles/default/light/symbols/coloredmark-bg-s.svg
 create mode 100644 data/styles/default/light/symbols/coloredmark-default-l.svg
 create mode 100644 data/styles/default/light/symbols/coloredmark-default-s.svg
 create mode 100644 data/styles/default/light/symbols/compass.svg
 create mode 100644 data/styles/default/light/symbols/cross_geoposition.svg
 create mode 100644 data/styles/default/light/symbols/current-position.svg
 create mode 100644 data/styles/default/light/symbols/infosign.svg
 create mode 100644 data/styles/default/light/symbols/route-arrow.svg
 create mode 100644 data/styles/default/light/symbols/route-point-finish.svg
 create mode 100644 data/styles/default/light/symbols/route-point-start.svg
 create mode 100644 data/styles/default/light/symbols/search-result-non-found.svg
 create mode 100644 data/styles/default/light/symbols/search-result.svg
 create mode 100644 data/styles/default/light/symbols/track_marker_deselected.svg
 create mode 100644 data/styles/default/light/symbols/track_marker_selected.svg
 delete mode 100644 data/styles/default/light/vector-icons/compass-image.svg
 delete mode 100644 data/styles/default/light/vector-icons/readme.md
 delete mode 100644 data/styles/default/light/xhdpi-ad/keep.png
 delete mode 100644 data/styles/default/light/xhdpi/coloredmark-bg-l.png
 delete mode 100644 data/styles/default/light/xhdpi/coloredmark-bg-s.png
 delete mode 100644 data/styles/default/light/xhdpi/coloredmark-default-l.png
 delete mode 100644 data/styles/default/light/xhdpi/coloredmark-default-s.png
 delete mode 100644 data/styles/default/light/xhdpi/compass-image.png
 delete mode 100644 data/styles/default/light/xhdpi/cross_geoposition.png
 delete mode 100644 data/styles/default/light/xhdpi/current-position.png
 delete mode 100644 data/styles/default/light/xhdpi/infosign.png
 delete mode 100644 data/styles/default/light/xhdpi/non-found-search-result.png
 delete mode 100644 data/styles/default/light/xhdpi/route-arrow.png
 delete mode 100644 data/styles/default/light/xhdpi/route-point-finish.png
 delete mode 100644 data/styles/default/light/xhdpi/route-point-start.png
 delete mode 100644 data/styles/default/light/xhdpi/search-result.png
 delete mode 100644 data/styles/default/light/xhdpi/track_marker_deselected.png
 delete mode 100644 data/styles/default/light/xhdpi/track_marker_selected.png
 delete mode 100644 data/styles/default/light/xxhdpi-ad/keep.png
 delete mode 100644 data/styles/default/light/xxhdpi/coloredmark-bg-l.png
 delete mode 100644 data/styles/default/light/xxhdpi/coloredmark-bg-s.png
 delete mode 100644 data/styles/default/light/xxhdpi/coloredmark-default-l.png
 delete mode 100644 data/styles/default/light/xxhdpi/coloredmark-default-s.png
 delete mode 100644 data/styles/default/light/xxhdpi/compass-image.png
 delete mode 100644 data/styles/default/light/xxhdpi/cross_geoposition.png
 delete mode 100644 data/styles/default/light/xxhdpi/current-position.png
 delete mode 100644 data/styles/default/light/xxhdpi/infosign.png
 delete mode 100644 data/styles/default/light/xxhdpi/non-found-search-result.png
 delete mode 100644 data/styles/default/light/xxhdpi/route-arrow.png
 delete mode 100644 data/styles/default/light/xxhdpi/route-point-finish.png
 delete mode 100644 data/styles/default/light/xxhdpi/route-point-start.png
 delete mode 100644 data/styles/default/light/xxhdpi/search-result.png
 delete mode 100644 data/styles/default/light/xxhdpi/track_marker_deselected.png
 delete mode 100644 data/styles/default/light/xxhdpi/track_marker_selected.png
 delete mode 100644 data/styles/default/light/xxxhdpi-ad/keep.png
 delete mode 100644 data/styles/default/light/xxxhdpi/coloredmark-bg-l.png
 delete mode 100644 data/styles/default/light/xxxhdpi/coloredmark-bg-s.png
 delete mode 100644 data/styles/default/light/xxxhdpi/coloredmark-default-l.png
 delete mode 100644 data/styles/default/light/xxxhdpi/coloredmark-default-s.png
 delete mode 100644 data/styles/default/light/xxxhdpi/compass-image.png
 delete mode 100644 data/styles/default/light/xxxhdpi/cross_geoposition.png
 delete mode 100644 data/styles/default/light/xxxhdpi/current-position.png
 delete mode 100644 data/styles/default/light/xxxhdpi/infosign.png
 delete mode 100644 data/styles/default/light/xxxhdpi/non-found-search-result.png
 delete mode 100644 data/styles/default/light/xxxhdpi/route-arrow.png
 delete mode 100644 data/styles/default/light/xxxhdpi/route-point-finish.png
 delete mode 100644 data/styles/default/light/xxxhdpi/route-point-start.png
 delete mode 100644 data/styles/default/light/xxxhdpi/search-result.png
 delete mode 100644 data/styles/default/light/xxxhdpi/track_marker_deselected.png
 delete mode 100644 data/styles/default/light/xxxhdpi/track_marker_selected.png

diff --git a/data/styles/default/dark/6plus/coloredmark-bg-l.png b/data/styles/default/dark/6plus/coloredmark-bg-l.png
deleted file mode 100644
index 146744ccca75acbd7a5098f5a041888204c7dd24..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1543
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

diff --git a/data/styles/default/dark/6plus/coloredmark-bg-s.png b/data/styles/default/dark/6plus/coloredmark-bg-s.png
deleted file mode 100644
index 67f36984a94bf2ee24e84b0ab7ee4c68e48a5f9f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 468
zcmV;_0W1EAP)<h;3K|Lk000e1NJLTq002q=001Ni1^@s6E-tKF00001b5ch_0Itp)
z=>Px$j!8s8RA>e5nXyU(K@>%^S{SjhG>V0Gg1rc0WhrRq2iW={{)0vQ02^!VtnBRU
zv=C!qVJ9NUdR9{`vc;I>-r2w#xUdX6@4kDOKz63ni4g>XKoDpzfuc>Vm1Q|cKg(zy
zy%a_9)~5cl^#Yh#w2#ivGx|H;nYcnHXenExIgJT^i0)D9sGyyq#hiWHya~F1F3_lB
zz``wC!#Ruy*h6=t5~{8H;Q1&=2DvA}y6CnRcHGBL3hc@ocN-Aud|WaO>tC5$ac7bF
z5oWs~<fNwhvc}zoA#yV*Dh+kMnA=omno%1NVgrvIp-+|JSXlq3v>X&J2kH<G4+p3{
z1E@82?z+;)0cuqlpjKPz;{a8C<T{4b#{tR#N$%kQHIS$HHIVu^Ks}j2Nqrokt_`3b
zIplj#`Zz#cDgz8_J3RC;_>VL7pD=n#H~=a>ic?7gD~?%GU;!!)?ovQi?*J=~g8u<4
zE*DZ^4R=>uSET~ur#Lkipl!QS?*h4p;z~Vrx5axwAP58j2z&!86z$X!0S;II0000<
KMNUMnLSTZCw!)nN

diff --git a/data/styles/default/dark/6plus/coloredmark-default-l.png b/data/styles/default/dark/6plus/coloredmark-default-l.png
deleted file mode 100644
index e354fb2fe3e8219f89d807dd43ee2aded51c348e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2146
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
Y4<csXQHJH|I{*Lx07*qoM6N<$f+xoNMgRZ+

diff --git a/data/styles/default/dark/6plus/coloredmark-default-s.png b/data/styles/default/dark/6plus/coloredmark-default-s.png
deleted file mode 100644
index cd11a0f87abb47f8bbc89432801f5350d8c3344a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 786
zcmV+t1MU2YP)<h;3K|Lk000e1NJLTq002q=001Ni1^@s6E-tKF00001b5ch_0Itp)
z=>Px%%t=H+RA>e5nm=n)K@`P(F+n5#Dbyl@g(d;T!Y-ACMYOQ7u&|0+1REjP`30<E
zBlsmm5J^&47!VbLjW(i)Xab2QMMwk<L_}DB16kNyPoA^y-QCS@=E7k!_syJp=DcLG
zZ{B3PS{Ri|WiRC~fJ>ks90Pq|A6Np5;2U@aCbKM?=X2)-1`UD7U=7q0Z|Hmr^mMda
zOmF}^0%hYf1Xn@UafUIeo8UL_jHi$t>Ik!#NH=&8>CP|u&4Kq|6~x3xIt{k9Sxle{
zOytb=57(x^C<qJrrXbe~hCwiT32YU?)H9m~w^IZ0<6F&){1b30c0TkCrriPGfr>9A
z56ALtn|_EMQL`Zz{?lD4DwMH(;5AV3oMd-V?xv4J>{0Lo*jOZSwyYpH_JD_$e4{;9
zmcMD^5v&&Pb@D@ABH-!)FMy3@5(mBNG>iw4{Xl&Uxb9t)I!C})VB@ZLEq6W?-?OS|
z&$t)bAcXsdsJB9HccW^$@FMV&5Pr^uT#!&Jd<A(YYMvL}w?_)Gr-k4TjaEm^+oJA$
z&$?ZnWN=*+d=nz)ol-Tzu7q278+BYLn-)3O6x%Oz5Y8G>rNwlKZ+aW`&tnKu7UJcU
z>S^m7;LmY?DaM+?-bRH@HydH|tr?-}s2f*Ei?>mQM6|;oZ==HYtqr%kYKcu-)lt7?
zW>{R)+bAW>by3ZkmaX%XMSd-(e_fZnjhYwLheggc#iD%z!jp#7F7D=XeNAtpo{938
zMb0~=YA7w<b&K<Hche(GjC~lTb~R^W#un*Ay|#TQPTMT8cbvPNHtu4~!l<+r9Ai}I
zgIU*riu7{9nutqkVXvB(URPBO!;$m?v}(rxJ~6A_SL(Bj*;%jDYfWVG>5xXPA$dPz
z)&NMye)3GJy@pvu50brQY)cN3we%nslU7F)!@g24s2)uWTQ@I3OOGc01!uj{ZV>rA
Q`v3p{07*qoM6N<$f}5~rasU7T

diff --git a/data/styles/default/dark/6plus/compass-image.png b/data/styles/default/dark/6plus/compass-image.png
deleted file mode 100644
index bc2825cfb3cdcef4f3d44e2f70ecbbee12a68928..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3841
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
D=qpl&

diff --git a/data/styles/default/dark/6plus/cross_geoposition.png b/data/styles/default/dark/6plus/cross_geoposition.png
deleted file mode 100644
index 6b687b20e562344b4469b7b30f0c9404f8a9557d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1113
zcmeAS@N?(olHy`uVBq!ia0vp^(ICvh1|((7e$E6^jKx9jP7LeL$-HD>U=j9oaSW+o
zd^`7`cSxYfvGh%6($tdIsAO;yPj+L`UF530&{cY)SzemxJKq0||JeU?91L}FoOsEN
ziCr*j<&_=*)zpZvuBE=0f4a@z)5h7RZ+XxCe&gZ2@Av*bYx((e#r*ujc`rkX-b`3p
zb#c#eoBV%gYi|B&{kg63!!$m-!*f|~=j_P5cUR>;ul4sEHG5BPUEsGcYEnYD&Pl5m
z4<9}}bL5CiVouJQV)Kt{daqCZpgL(%@<pM&##UBU+rw7dcGVOWeUdx(zKX^E#``HP
zr|j~++;S{PNqJH;=gETy50>8ec=CqLiA<pc`Q8&xi+1*9^chY*Dbp=`y<TDC;|I$;
z8)Rin%oGo%ofNb>sJ39E(BNh5I_zumBJpPS+Ki&Rzpr$PF+a<>yHf0WmCo->$9=Q@
zcQv_gxR~DYZ9Dg~gWs3AoHXy5{#HV6QmF1s^Jl7`-#7HGeUi^Rx6Jb!KTE)o7X{YI
z{}^QVW#sS9nzzaBu-}&bre&!Qqd3AeMEthTK3cpoMC<*d;|tGh-?nYr^5x6#M-{*E
z+S<kBue)$lwSn{VH$Q&-;5{=rW$)g->CR`juV26Zcu{qp>z<^?mN|+UyZm{1c}o+g
zywz_6f)x_C7^L&fJ<gs#|M;Bd?Q|w?Ztm5)<s%QX_04<#E@<VK#ryZy->uW#-8bWH
z@tObc9&boLf9{-~SohJTXV0FU#rUH^TIIk!v*WjUo3<70tXW&w@3;K&_h!E;b;~=7
z@=4M+&5r-JnszqzxBr9g+9$%Fx4u}&rtemn)u+pvZ~o))d2MSukHeD_wfVJ0qrd-C
z5YFxB&H9(JFD<UVt0%$zb-`qww{D&8AHoutza)Keb&}cGdtwd;$2Q@N7Qvi@WhxIO
zyr$~j=wp#_Ub%_&_QZx{jnHig)<Ok5OHYaAxHI)F47u6#*5iQT6s_nDvYZxeL8;u^
zlo^i)tfEA-=Zc&?cNgSkly^Uqkna0_?dbIu6Mv?hFF&r#-hYu>uHD?+{JU1!A4@a-
zqON6^FYxlt&iHxG-`6+y$>*O}bIhXW&YY=vT*~U=zi*dhvYSm!=BgdE(m5IZ?BoBN
z(ocI=xzB%i{DsSkWFal-Hyh;lo4Na|RGDu4do_AWZcSQW-Qfps&H0#@hh5so(gG|i
O7(8A5T-G@yGywo;l@`+g

diff --git a/data/styles/default/dark/6plus/current-position.png b/data/styles/default/dark/6plus/current-position.png
deleted file mode 100644
index bf4f82ea3448425431ba47149356c665210796b8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1338
zcmV-A1;zS_P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px(^hrcPRA>d&noVpQMHI*1&g|NbQ=1k7b%bcbp+Qi@m(-r9io~r#;)LK>BtS?U
z5C<yt!huVr_E2%CQ~^?ZMVydOZU`!IDyS`pB9W?6Qa<9Ufx2<x7_WDi_n+OjS)166
z>m=TN2YdEw=J)r`&d&UwE!vvUGsjNsAAfY}C8xOSIc4XbC#5DWr5{4|f$#lIzQ5?V
zTUXr1%GK3B7rvXjaPm4I@`i2R8lnQ{nfFh>P?)H^uE&aR5?Q+kt1GB^YmM{GrRo<y
zfAZmFzSbS=`ta=g5ul$ve)iSk-pV-&tcR10T2791u0YCmNO9TXZ$!{`$#+}i^S9S(
zQo!You!7r-Th(`eI`!UHynmp(GKc`{sSi%QSgK5auCzTP0J=~lr~Dx0%6rHj8<*XE
zzuRl8)LOnn?(#q6H5>7{zSo|sSLfgQ^~~|_d1nwG=u_C7fa&SNp?6MxsdM>Pq%Nnl
zhsG+8k<9{zi8c#ZtNu=I{Z3qs*ZTMCOP`*2jppZ@@y;HFdkUC7daSbd$kB`PtLx$}
zDpvN9GhXgd<^An;SC^?#y-8kU#Z-X1aqHsjk@?vR)qXYh6>#9~j}Mlgc={WzpoB__
zlT%cfnCw^I(8rofi_}<Lkb3INzy0#^wa-5KL3VV1_Y@GpUosacO{IPN$tevu&~&%9
z$!)h@qxwxAW&QAZW)X*aiO?I>iEcA-@bHg(EU$P}DL?)s+2iIWY;^jT@6-8$85G==
zyA*hB%1=D<hHa0XuU)?y_OC>XDp3xL{J^5m^G1pA%TLV^Mw*=tw28LC02af<Y~38)
z0xXO+^1!0oi~?RDjR<ByfC+3|?CAC#0x-_YP>Bb2r~14h?C}8xupqz&#^k9<0U9qU
zb0QCw+dbMOA?{TM3x;n*#27!ju>edDr0ZauPg@8R7{MxhBET_o8{UgI>{h>|q_JVX
z!2~u$#A+s5MgV4&GBLySAgvLz@g&kPGpG@ODKVh&)DJti*-r6blTlHaAwY-odG0<u
zt4w<cW5lc#R#LJU!IU`dvCe4i2D`#C5YSkRY<50BN|9g$D+25aYglYxC6$#BR<r&#
z3vedKGB7J4tYBAg4*-reY*r#>Wp*Xjhb+LeAVOHdE^p#2aBs+{jOoOOV0~mIgca-x
zjv2t=+hiqTR%TbQ`;34L-2oV6A#>}Bf>((RIA&Q1VFkN_(F$<beQ?au9$*w}66`8;
ziGv!zVfUpy))|8u*fETHaESp9uQKf+j1jYE-UG0>0S==TUS(PXY+?orvk_qYdA7I#
z4x=@#5wkIClv4;-WDM-Wp9eTxVi>Jy3owa;9kH6RG@eQzxd2BP;Bbl47QzI^C=p^1
zV*$M7A-RCPu(;t8rzOB5wtK`Fy1opU6hO#~Ah`f=Sln=lM;%}gyB%y%_9n*a5Wsr_
zWJaVb!Qz&uKE7fH3uxQe?A#`pOxC6=_0%nZkk&zFgs-W?pRX^>jYNcj=eDC9LESKI
zkaGIJ047IT2bmH4*gnsZ?%uezqumMJ25q8k1Xy~dnqrgGoSFEzefitJ9+)~Xi{t_Y
zLB3U6B1>zsi`$#%zyrJb#|`c%CP|4D)8Ss(8Q^w!?Fs(4nCT?nx{3^^Sz{4=x3Zh)
wPN?8wX8&r?DTBS>tp3@fTL`vC_II2A0BS^;<)~_dO8@`>07*qoM6N<$f)xLe*Z=?k

diff --git a/data/styles/default/dark/6plus/infosign.png b/data/styles/default/dark/6plus/infosign.png
deleted file mode 100644
index 9c7fd00ed41739a8bfeee19bb4ebd5082b9c47ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3529
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
DX1}&V

diff --git a/data/styles/default/dark/6plus/non-found-search-result.png b/data/styles/default/dark/6plus/non-found-search-result.png
deleted file mode 100644
index 1ae27d4e318654172a5bea421d96eb67b68e4184..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 464
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`ZG6Q@<T!Hj|a=`~VxgYcA|NHXg
zgO1LZj0~VL|9<`YxpwVG1A{+z?|$<1{C)A_M<b)ZPoI7?G&I)FY5-a$QWE4B%y4sm
z;66d?qs$WocK!YwyXe}&m{03&9gkvQU}W-iaSW-5>z#5_s9Ax>^|8~&?x<Xb?|T3L
zPc(gCaINuB<yW6Q0zx+q-%|5EW#l<~TH|b;{a>d=&$FB&{GR{AWk=0(dz*_lmg|LU
zpQxO6ZC6~`xmw|4eh<4|9rN82z1pCZ&2V9=Q1i;rhJ#Nk^?w}xWVUl#apv=%hnUwd
z-*!fF=Q`(e7cXtKu$*~r^MYpA=Zm7xdJ4U8nJ|Uf;8p9KJD1#p+9g6%`d=h2Suc7;
zrPOYv^2)X;Do-bicxtMMaPAFQ!E!2e*56Beyi{!tT~dBkUU+c!2T>El={Nu7pH8_Y
zbos%F<wA8OAJ3cHa6FvYC426}jCOIiKd(CDlf=TVrpaCtz0DoZzB=5vaydT>Ftivv
MUHx3vIVCg!07QxScK`qY

diff --git a/data/styles/default/dark/6plus/route-arrow.png b/data/styles/default/dark/6plus/route-arrow.png
deleted file mode 100644
index ec0623cf7234a7d128fabf3484559b5140ec857d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3227
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
N002ovPDHLkV1l_TA&me4

diff --git a/data/styles/default/dark/6plus/route-point-finish.png b/data/styles/default/dark/6plus/route-point-finish.png
deleted file mode 100644
index 59882e9f2dbe90eeb06204eb5beeb7458e47368a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6227
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

diff --git a/data/styles/default/dark/6plus/route-point-start.png b/data/styles/default/dark/6plus/route-point-start.png
deleted file mode 100644
index 5301e70999aa88e8daffb1d484c61398b8ba1bff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3641
zcmV-94#x3`P)<h;3K|Lk000e1NJLTq002V(002V>1^@s6$I7^K00001b5ch_0Itp)
z=>Px?^GQTORCoc^TM2NL)fK*P%lZO=utb57ASDP`Kw1Qghz6xt3U0_CGnLY59j!$X
zZ5>23%-FGNOIwSRK{A8LQb`@Q!7Yp(1>D#y3KXFUOJoZK0@+^jUS7ZNC+Fq<OTx<&
zvYeUw?!D)pd;fF3d+zez|2~(xdgQV+t>^W$Ma;;CHKv{>+nU!zzhBb({i@q)Ta9F1
zc-Ay4OPMsJ8_Klg^|Z(`mU5jJbNWhwp&KPe+v486d%M=GS<@FZ!0-28=XSf(JRXnV
z<#Hv5!{KU#iclz2UQ<(3bo%t^Z*y~V|5s2@5QKI04TcLSP9Qk(Vg@Fbin_sWG~huX
zz;Oui2#H&^Y#DIw+_|}dKwv|Cef>EY+!Cs)tE>Cy;>C;4A2@JeB-%@8XxoRF&*3u}
zL=PlepXA|;1q3Qc5E7<No!YsywDdQ%wY8tX^7@uo-<&MGX3vES7oJ(QYE@4>hhXcV
z=sKaObx0m6Ac!X<%$YN%Ygt*@(@?skIis#XS$S1e)ywPFt?L7m1r&N^t9pqQ2=)wJ
zH~HAHWA_1s;wxZi)J<^Mfu0yKVnh;jpjXP!5j`14O)U`?S;p)E!!zd1o7ZW<f(47?
z<KyqU+*2`L)b3Lu^>t}T6`ikF-&NGB%G$81!W0>ge)aoYsz<U*^-J}rfnD8dR4*_1
z^4O+Z4+eufKL7ml8MoYW%MnO%vehSCR*Y(Lz5J8R%bx&2m-KAdupw*W#EJj(dc8yV
zL?@~VhSk=Rp!%@5PHjFCRA;NB(#vQn3H>}S!>jJd@~ND@KGiwCX?5XFr;Cb;ruXmP
z|5H>BA+#8frdw~cOk~6x7<<3@=9@8t1`T=(%VPIN(Z*C|U05yoDxlu@Pe4`HHS%Lk
z(LwId_Nga-oS@SERKbw~XU?2?ynFZV%TY=|7>K^~fW%<gNes1@T;fQ%0AVbhCr+IB
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
LNkvXXu0mjfHbV7-

diff --git a/data/styles/default/dark/6plus/search-result.png b/data/styles/default/dark/6plus/search-result.png
deleted file mode 100644
index 8fb42e5bff8935997cdb9783ff05520599a8e85f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1162
zcmV;51a<p~P)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf00001b5ch_0Itp)
z=>Px(L`g(JR9Fe^SW8G$VH7@-kMS94WfoLSPy|L+(8D0wv<gb7g+>r<+g3(WL@o+y
zBSEzcYSAJj=&`6QLMsY_A}OH<lu>HsWH~iDqvP%SZukHF?{(A}n>(uxoH_UY=lth<
z{?G3!@?X*$fk1lU?r6)hmZPN#y1>yw*d9l_U>^qpfjF%H0x;Fk)6mz@sbl~FSD^LK
zTwl;3aR_=DItq13JTYqZMu)AgNZg9V6E2_e!arn3s^C(ZN+djtgiX+VCXSAb%F}N#
zdGd8gUVM+qz_7(;EqOCULZx}KVQzuc%qx(E#je3>M_?VMxL0>b@-Qhd04hMA3(#Hc
z8%tPnt?Re6eE0=$ZZPyuB<tq}W$)5bSy+;%LO$W47T}(#2CtnEm;>q_I&5U8&i=TZ
z>gbnnY}A`0rFRUX><kslo~1J_6lL8gbSuEMB}*_Fu*>LRk5udDsGRHkDQOH+vRZcA
z+BrdKSUF3IatT%Xpz8qcz3nu9Y_IWdKVq~R@t{GSd6gMZO#ZYlCQZ-#1*?K<VGi^<
z>J`&x$~a&M3L)S)gE)O0sZ7f&<UQZ{L(SF-<Ui!CF%B34PC)ay(7C2EF@4^me82s9
zP#%35RIURUkV^GJ>jDO6HQMUw;O?95LTCR}<l@_i;0R<Wr}C)T#{~?I-OvEfDIN)a
zOLsIOt=)Rmcst~%nqFYFbnx&@=bTc>reoWBG_cv|ze(lLz<`z)@-jMjqGwCE5eDM=
zY}~HuYG7#K?y!Z|OtyrOUILsW8iNUJKApo@jNZFX_43PxV+oa-^vM<znB5p2(m^W5
zcWczN2ZsesU?h1G|GRzpm^CqK7OA2pFq?*y2lb9sF}~Zfv6^JRwwS=W*-`>BMLv~H
zDG%y`HU`$#EqLxyU`X<^DNDxceN=T#U{BB(p@YmbTT)SwW3yeS-fdM^0|O`G;dP4+
z(&220QH#gHO;uL|a~iJFlB1Ij`z^U3KDCQ96>G=fgjG#1uogJp&`FN&b*fI8vfBWv
zqEMd#C(XRB+CV%4XCnjn;Xsb=msA2!-I5ZO{tjy2RWGzIU~E7Dr?Z{U{BR&g&$JZg
z1mxK2GW%#kZeElP-Wub8IRSOBpRfc1{BWo$%lG!1_B%lxSyd*B#y;itVK6$p2^H`5
zwhL&`8Z<tD7V*P@9G!IdUxd@gkupFv1JwRxIVS|hV1U~U!wtc&8F|<{D3{(vgv>J?
z;qK!?=bGZp;z%>>K>*WaOgU&L1;zk?3&C86+FXeoophMYlO!)`R(6E&@T{o_O6}qj
zbN6vgar!RUK@<E;35@*!j@y%;SO=hbtCD$=<dIL2x{xLCLgwAaYbMFnb_e|%lC3GU
zPhSAA5_%RIhNdbb2)qy7l1}B6M$DTKMR+Q1f|8?iiWfMl{&7c^@Da)px`7eWCpzB$
ci!USa2g^SD<kScg(*OVf07*qoM6N<$g2o3Y3;+NC

diff --git a/data/styles/default/dark/6plus/track_marker_deselected.png b/data/styles/default/dark/6plus/track_marker_deselected.png
deleted file mode 100644
index bb1088b1df42a5737dceb5c604ca3814b3853098..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1007
zcmV<L0}%X)P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px&sYygZRA>d&nomy?Q53~r+X&bMNE?kIB)TEO!bB5PT)2=0?2KQ4g(iY~cP1vr
zE#E+6;zuyX9V~F+LPZi6F2JzSM2XQrfbc(1&u`kPLuos=WjZ(~IsG#;@1A?+y_tFU
zwJ8??3WdUHg&7ft#R0KT%!!>MSQl5sMR8u75vNnB)Rx{)21+_7-W6Yo8)BoN4Q+{m
z*?1tatoT@56QcsLh?#Af3kA=J6XH*?RUkGRnMjQ&V6QkU#s#!`BQc>sLt-n>daaX!
z=FqWBD8QJwRZAg;?P!lRWrBt=BxseWX(Cn4oublpZ^e#k`%hrowlr_)x$&V=`-lN0
z&&4w<_Ea8h`F>C+xTVc~x4Z)nye9efw9B_=Tu(OR(y1eomarVNBwmw=AHfEPqA7W9
zU+=}M!GkQH=l*QFcfYpX$KN|{b+?#!WxMXSw7Y(`-Q7Ib;Req%)w!P(^M*|9`>`tx
zOlZe5f2ZaB%gU~M`E|`LtnOJ3FCWw2eahXt*yS$e+REFEA0EiSbN|?~0iAuGg3MJ+
zLuX$@<;B99d-HwMkJZ%s?ekf8zrV|6>_dy8)F%_3a5|v+P@hf7Z|ohoCv(fkP9AMe
z0I`T^1UZtc2d@Wo_L)q56aCp^ac`AZ&OCyjmv^h|ZGO|0e4BeZn78%>v)c>mg%!UC
z?r1}3@}$SGi8^`W5|h|QkSjU6pn=e~T(HL-^YuiCjfN3L0~$UQBcql^+-+Ko1~f*=
zogSc)3Y~{@pKtV5*^F5<&@zCWM=&sKIM{ngS&ob17#@g53}b*Awl0_+@Pv&EXrXDq
z00t<)>w>vWt?5DChE4873rz$1Fc4Z$Gck)BM$H@sLht|ntTIj$M$JwPBpMjtv0N9-
z=i`P^bDhjsF{=xTk+@;h^yWfLq3eQ5iee-#poOLZi)6)GWnEAPQc1-Hw2Y<aJO)^3
z4FzRjTxdXR1_RS#Xjw%KOBvW|pkb_+$$45m<t=efSrVg$Z8aLum?C%o%6x4}i~^h*
zwpAc@14X`<bI?HO^MJ%Dz$yQt1~G|k1iAh*Ky9fFla|J;9z437i_`?k6SIMpiOEvV
zF7eAMWdodjm1xOb*eV%F_R?a>L~<8*F#t4_60^MS-$sj>mtJ*+vkpIgXyeI#887A3
zSQhGu<o?9uTV*(j$^4NoU?RCcvj$8g_lIuZ1n(M7$^5H9&_v0|fAMFJLsN;$B(2}o
dD<}4Mo4=%t<!Fi3AT|I1002ovPDHLkV1lc+*uDS&

diff --git a/data/styles/default/dark/6plus/track_marker_selected.png b/data/styles/default/dark/6plus/track_marker_selected.png
deleted file mode 100644
index b86f91afd1e4df2742b3eed658a39cad1003eb88..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3657
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
biRb?Va-dMKTm>~G00000NkvXXu0mjfWYQ6B

diff --git a/data/styles/default/dark/hdpi-ad/keep.png b/data/styles/default/dark/hdpi-ad/keep.png
deleted file mode 100644
index ce7b6f20e5ba507cfda191ac9e712ca89db4a767..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 126
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k8}bl&H|6fVg?4j!ywFfJby(BP*AeO
zHKHUqKdq!Zu_%?Hyu4g5GcUV1Ik6yBFTW^#_B$IXpdxNh7sn8enaK$ZObiUH42(&k
RMjb$522WQ%mvv4FO#rSW9sB?Q

diff --git a/data/styles/default/dark/hdpi/coloredmark-bg-l.png b/data/styles/default/dark/hdpi/coloredmark-bg-l.png
deleted file mode 100644
index 2c1fcae9262d2d6571d4e0350554e0655223c410..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 765
zcmV<Z0s{SsP)<h;3K|Lk000e1NJLTq002Ay001fo1^@s6?{hfx00001b5ch_0Itp)
z=>Px%w@E}nRA>e5nz2qBK@>%Cj4Zn&O^Qgta$`HcV3Lv|3Jnc^5v4%lBakR8{(^=E
zlw#AF_!qF<SOzJPXrQxY5t)0Xv9Q2GbKmT;E3+f5*4~-fch9^T@7p(CTgyv60xLBF
zg`{alqtW~Ec>KLkC~VJWvrX9h=nk6x%L8>+sEaC<%6YX~y=6sGB{ATBzrPEJ9}xZ(
z$GRuLJ=%3J0LP6+<J7Z{)GT)3Uaz+W1&26Vl9K0*ySQ}FY&QQqud-i>4H(`m!mCG+
z^3yJ7Y0oyiy$`SdUs@|(j0Jc&9Bxdf(-S~%i}t;m12!s^N_(|h?ar&i3yp$-9c&k{
zpI@*OTm|S$K(|7n--RgQG<Kd%6qXt}pw3n?L~{@@*KAVLco`IJx!;Lp)n3=kQ`-F+
zUwB!GztI=#uXl)t`RGZjm~ESY8B~BY^f?<cSS_bPzK01IYl#t5s>P~7Uc)Xnz5%Uo
zxR}(y+#~k>pvK;^hbNQCP6l8(i0e*^G@vpt?w&|AC8>UFENhX0v35Q^+DrG7MT-m!
zM83~vrN~-xU=P>LJlecg6IqMJ!~b53#>0-R#RAMcR91?tMFz%u=~Y%}Em~w?!2Zq(
zFdj>hsznAam&<1`!t7$&g`wrSDnbT!v1>;)ltBBA8b?!u49regJI6eyS*#l5x1~8G
zG9Jtqr}a+UMaF~qZ@HK}?5rHf*5d16wrvJ>Ii+@d4BmHYTk~18V4l+KjK@N8Fc|#8
zS$<7pf3;xUM)i9A8_wok2(yPNmWH__fb*p)UTses&XyULHiLk91MUQHM*xE4Ab|aS
z3hy1qt^;iaP3c9koZc=;zWSSKi{Ni&yL1tnpP4s?*H?c-{3$rox-PrOzdSG>#<a{l
vH8cOq!!@o&jMFXQ;!~UX_k0B2&<H#Lzt8B86C_|@00000NkvXXu0mjfN|$7i

diff --git a/data/styles/default/dark/hdpi/coloredmark-bg-s.png b/data/styles/default/dark/hdpi/coloredmark-bg-s.png
deleted file mode 100644
index 4303e3f8c75a2694902b141cae38cd76cd7d5529..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 357
zcmV-r0h<1aP)<h;3K|Lk000e1NJLTq001ul000*V1^@s6n+_Ii00001b5ch_0Itp)
z=>Px$A4x<(R9Fe^mLU$pPz;9mKml$Jy%X#PvxJ1(V7bC}0W9Gr0|OpIf<k~K$nn>b
z_R+1RGi&mTwSBMOnzz>_$zVeV`t3l|G;?SJ9ia#GhOW>KTJ=j8sSda`^nzk`KroAJ
z;~xUhHb(pvd*V6wr(`MuggV~VZdi~q+xfWwKxh2dQITG(^dn^|fr>uPu0}6CVYXGf
zM(RvHaml+?-YK#QRi=<+g}2@uruA0%na~ui+qB*af7en9d8YMN_*#I{x=rh?@Ov#K
zlXngwTo}Kf3)dZu{4TceqZBHEI)iBBx3Nmt&fg8{9HNo0u?k6Jf67Qj0Hsg~Nxusx
z#Qu6zLWHMN2!J&53y1~~-Q#o}*1dn6fEaA(06Opi!5s;aGS(W$00000NkvXXu0mjf
D=pvY>

diff --git a/data/styles/default/dark/hdpi/coloredmark-default-l.png b/data/styles/default/dark/hdpi/coloredmark-default-l.png
deleted file mode 100644
index 1c98bfa742661655435e6f60ea37847eb5a43cbe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 960
zcmV;x13&zUP)<h;3K|Lk000e1NJLTq002Ay001fo1^@s6?{hfx00001b5ch_0Itp)
z=>Px&dPzh<RA>d|TCr}_KoE@)x|SjZk+_r~U3x@;1O-u)o+dRCp8yT{0_ai$HBBT^
zC5l1;9ZF9SAc2%z6iP}E((&Hi4ti(sd3@eIU*eHocI@-cyl1cD-LbQU#5NcVdPuPb
z+yIt<tD!}+a0Yx2?I*PRS(Y84O=ek&$U)==Vy^?s6>}Wp_&wlN3h_||LueO79|QM+
zy0Hg{u?;+h@DsFAtS+e`2?*`Lc?3KJ=&Sv}#v9-*&<AV?GdG7faSgZ&+ykxvYCo~@
z9C!xdzx0Pje285HUIV8&yukKt;Ifw(j}3j;Hy@8V7QL~O90vj`z+sNu4z_RBO~@Dk
zW2tcFTB#d*s{Tw2d=Ww?@HwQT8e;;CZNiyzwxW@c!&tBEM{M&ROk#`;Fo%g|?%51)
zB<cWq&yvXXBuXVHa{wxu9P<AlrAH(eNj3pH(;RBau56w%a{)TMpX85;x{YLA;2U6q
zqu;Y-gpr%~wB`Q_pU?g@hTvP0Y$r{Y@~GgT|Gl@$drWZzlJtPS2(JC;nS#c!3pntR
zWmlP;IA3?!CD&1-gE%*~nb|I8J%<(gMm;p--VH&?iQHUPMKBivW-rZYuvHGqZ6YO?
zU<?^P=xx=*x$*mnQD^fbIgkr&IdB|pP5A2)jQ(p9;{ZeIw`@1!1`Y?3Tsg|_an~zY
zCl*}w%!|DfBFa&AkGo#MOVaIB{HEQ$5KxY?d))O3=9<-v>)ClR<)R!5`FREF*<&4Q
zUQD?t$3lKy!5YAx#k#L4zcLrEU_Fzrp);d1pj?z=VS2CN%J)iP#<)MIVC7ht#Vc6P
z9t&>sV#-B17V`57{wxvhh~KoUYjGCxOU)~IUm~qy8t1M=O24RX;J~u3nR2v!|FkZ_
zn8tlTPrebLv2J{8=r#L?9IS?Y430-0IxfK>(4GW*AbwM>a!_t@_+SXNs{jy&4Bz#b
zZJN_StGTzm!?`j~T;+BZ@py(Hx;<suAh-k3?J2|u(d~KFLcug#<@UTx8%h2vT3@QM
zR(vsEmx}0f^+LSz0@{RXi>u1Fc#}SPV0DqjKi0#zjI)&us}x+~an-{`$tqyeMYuzY
z`pH8S!Nv^2yYMgmM=d7US_tpK-vHJDE8yGDW$pR-Z0UbWAf9h6SR`lN*oH7$8i%$G
iajv=fVH#Iv$?OkmRAA^xr5O|e0000<MNUMnLSTaIC%#qy

diff --git a/data/styles/default/dark/hdpi/coloredmark-default-s.png b/data/styles/default/dark/hdpi/coloredmark-default-s.png
deleted file mode 100644
index 097bf7868248990bb695434ccddc3b798c71a41e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 620
zcmV-y0+aoTP)<h;3K|Lk000e1NJLTq001ul000*V1^@s6n+_Ii00001b5ch_0Itp)
z=>Px%CP_p=R9Fekm%U2^K@i0~2`Vun#72c+8pT!=gZ>3V3e#F>z%G?`)@jpeX=4#<
z!NQL+ptbgXKvYnhfPzK~P5ceGFoY!D?w!#GkDc3_nKygcyPbGlA)#Kc_mXM>X5cg&
zh5hgmmf<nn^E~g8@qd7#J(z_z@F&!8*oDbIubv`ea39*@nSk`4EdX&T{H&qsd#>|v
z77oEan1oBPagm?QEq8nYh{{%JET+I*v|TaWPr)l_@QyLpE++JQ2xg7?_qgg;1pheH
zzt{!W5x?<){1EDex6q(qn~=Z+te6ChIoljg{s=89QQ6~dw@ND!;?`B3^HzSL&Lg;^
zMDwo6$q|KBm21p4SGR2d{xd4(K-pF%hgFq;k_wW8%?d8Xk0^y}WxJR<UQT2yxD+2#
z3a`p`F?GDO5>{|2{y`}WE8E4?@zMiX!KL`JQV4p$=y;u1NrY(fb=Xi}h<(@8<d{-<
zq}S<j&E-1|k#Q*9p+U-buyQ2$&?I0is$0KnA|`FEf%GbI8%6xrOfcgIoV1A#<cpYe
zit<w%NUxIclN3KGTnaYW^b;4V56WpMZLNXyDstpEZ5NoAJ$?i=PPlO1>t2u*A-qET
zHk7}B25%T8C<l;y$K`V<UzG`{amq!8leVHKJ8H9lc_?kIU&xl(g3eDo)CE#V1m@s5
zYz28oiZHa7Gtjna_5>(yka_8U2B19M7x)D4*djH?(C`HknZS+qOQL%K0000<MNUMn
GLSTY*<r~5P

diff --git a/data/styles/default/dark/hdpi/compass-image.png b/data/styles/default/dark/hdpi/compass-image.png
deleted file mode 100644
index e66fd759899132a3c0ceb23796e78dbb180deb40..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2295
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
R@kjsw002ovPDHLkV1k(SQa=Cy

diff --git a/data/styles/default/dark/hdpi/cross_geoposition.png b/data/styles/default/dark/hdpi/cross_geoposition.png
deleted file mode 100644
index 98c5ce822d09007d73a1f2d4803e3ced059e0010..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 584
zcmV-O0=NB%P)<h;3K|Lk000e1NJLTq0021v0021%1^@s6j2MH300001b5ch_0Itp)
z=>Px%0!c(cRA>e5Td_(5K@iPpu&_%oIZ}w7k{_^8kW@BW`33oeH2I(V0<F?m1wla@
z%b;K-A>4VyDiO6v-b*|%aA6TLBO7L6vUihVX5V|cCCsrwL2p!0>JV0j4Pg(kH<<X?
z6t6HZu#M@wUayzh?RKT#?-$cF-GlE1_B{`g`wZk#FJwNz-BBFJC)H|oCrOet48t4v
z?qE*~kpedx0y*<iQpo}V{+@9?^V26ev_MK?aOO6UPKrDUFeN<^%DGHa(n*mg0j8uU
zLOGXdN;)a>B*2vPL@4JnO-Uz3o&=bZo(Sb!rYY&9$ddq5(i5Sa%Pjsxuxqvplj@$;
zmaJr%e@XbC++#$)!o~#2&h{y63#L6n6r@RwFC@NZbNLLN?OM0nJ<j@~QWZ7xvVq-b
zG;Vvn-hdlVx!G)%)(IfVBp%`-K7t%ZQS?sa{Bm6e@emjA4Eb|adnPB7$wfwD5CoUm
zwctE^Cb{wO_1P6ndUws+U}DrAz$C`P?#cpmNWWdm14)37T!7@Te>{@xYUVa2HQAP|
zWlBo2tC`!B)MQ(-mMJO8u4ZmiQj=}TTBf8VyPCO8NlmsTYnhUg>}uvVB{kWWtYu2B
zkX?2I3t0m@o8g-IS6C-EmDXv34^-dpbUK64Xq2>Ct!JDj_=N8swl=2;$nd|N3z-5#
WerMF^W@zI80000<MNUMnLSTY<A_NZr

diff --git a/data/styles/default/dark/hdpi/current-position.png b/data/styles/default/dark/hdpi/current-position.png
deleted file mode 100644
index 49c7cd390524ad487dca25498e6b481804338802..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 891
zcmV->1BCpEP)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00001b5ch_0Itp)
z=>Px&HAzH4R7efImrY0%VHn4s_nn>D_Di#m#WFJOi%1H>Q&1QkijI2=>lk>6B<NC?
zpz_keq>Hx>A)Pt|5lB%&*9uCb55GuDOD)}Yb#-QTw&(w*%WUqjWwZOh472ad`~S_n
z^UU-7SJ2;u*wuQzF4nOBgb|9iP{7zJq_ziBb58an+2*jBN%y5j-}Vmm-2Q^$QnI4N
z1@hpfTc^UCw{?+}jU)sGLQ#^sp*GBQEK_ZECe1kJInKz!^ydq&Z?-?eX)k?G@V>Si
zP1TLN?+F=b(qlCgtl30*bUg`8E2@>tX30v=(bDV;S*clG340(pGI;u3_mzQS6N-Vw
zq08N^!42`dS|~!{E%l^Fs*26^9JA(s(!%5?%4X(i>BrRBR~>CVd~w0@|9ShO`RbkP
zM)k%{22-?tFKNa)Pk`46%?R=e#VKc7xFk_~_@qA3_u!fP`T{UN=@~#nwc9Doo8Wi4
z*1%k&s)jf>$T63W#G8)|O+J74W<@U##ygGH?RbnQ1=O$5BQbJp6LN`I<AM7#FP=`}
zhs2IUB9YWP-P-Vb#K(P@HK7d#Sddmbd@{&hB+~yZuh+doQ)x2;tQD}pcZyHuU$fT>
zRBRmDV5pivBqS;liUYpWa))9t3rvYJh>C>bQ0`C+W`P+%?L`^%sz`p`3>aV;i}NiK
z1s}DyQlVI2qRUhoteBO0Qa49%F_Y-0Xl<1W)kf{?kVF%&G#E??=YS@Tep>DT11vM0
z?31u7a1LnV<qpMQR%+~huT&n1?FyVjxkE9S1tywA4ju`11<s*d0c|kA0#kJ-7&CYz
z*p(a%o6iAFrOk|G6PWME4vZN*(!#{3&sb8L&<2CWmGjIy5I6(2C&PRq0lNa{;74Sp
zCuos3n7;nbi%(WG^I#0HC+deWgGYj0(PM09xtpvd)bjG`0cxd_9WSq)>vHQ9fN=tD
z5XOuT6IN=Dv|xyxX3#yS<S`N{JvPY6#6Fv!bQxNZJgdM^g&Tx1Goq2B=G^zV&F=?K
zF7+T=2bGVj;L6Y=Yrl?D=G!<s%gjJ>_``Ac^13ILTF1)&g>l~<AN&5N?H4TGoo1Dp
RP3Zst002ovPDHLkV1mk_tD^t_

diff --git a/data/styles/default/dark/hdpi/infosign.png b/data/styles/default/dark/hdpi/infosign.png
deleted file mode 100644
index e3766be0b0ad3040cfaa83185bb88de26734cf10..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2178
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
Eg1wn2!T<mO

diff --git a/data/styles/default/dark/hdpi/non-found-search-result.png b/data/styles/default/dark/hdpi/non-found-search-result.png
deleted file mode 100644
index ee78acb4434fb9fe4e2f87a452393b13f46de7ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 506
zcmV<W0R{evP)<h;3K|Lk000e1NJLTq000*N000*V1^@s6;40Lh0005ONkl<Zc-p0v
zze@sP7{?33mbP|tQCe(`T%1Kra1ZCeF>uuXAZpOjAvY&yhYQ*h3L09n8oR+uO67ih
z`@Zl957Kex`GL>q*O&KwzR&H10brk2X^%cpo6hMQwP=%OcQygQF0IpdL=(_H&BO^l
zphIkqL(5UYk5KquU*7!s8na3T&dCX;*({tw0Y8lf+|eiiQTX&C>?(#(EV^Axb2&`Y
z=}>3q=LkMOUHvn9wjN%G;^*p00-|;Dd3Y}`9*FQt_w-bJs1wHu)jFrA2pmWM!R0Ev
z3L&s<SFU1Xf7@*+#;foi1U_DZV3CKya;Z;$WWt{za4M3AQ`fTe1l3Hq4T0mfRrsRU
zgQ8)=7Z5nd+l6;JP&7^W8w3_)tMKJu07cz|TM*d1t-}4uL_cWJgf}6WN+%8eE|u1I
zP0EC4X#jzhPBtm`_r40h)AjE|FuQ`4-mE~a78D*m*5MiIKrp+4m5v=8_`aU+oBuXr
znfegSu3)82^Fr@fu0r!bQ(-&(f-az8rA_l#5HrVS-1Jne2Oma#jSBP?@$u-boH!Z)
wd-RfyBR*|+@_5NG+l|&}Lpo8X#W*MZ1FJ$Iso;3Dh5!Hn07*qoM6N<$f>5sOcmMzZ

diff --git a/data/styles/default/dark/hdpi/route-arrow.png b/data/styles/default/dark/hdpi/route-arrow.png
deleted file mode 100644
index 9a0c14bb1abf84e1df2fdf061818436736f28cfc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1893
zcmV-r2b%baP)<h;3K|Lk000e1NJLTq003_Q002S=1^@s6S@(#D00001b5ch_0Itp)
z=>Px+A4x<(RCodHU0ZAvRT%!y?5$9O(3F6XAcPjd3T>C55i~yFgOH#PL_`z1+ZKUB
zqC&WoOK<^+mSEzG&=x2q5Go}YO$?XB#()+gWw#fp4??9>3f5w)gwoD-caLYv&g`(e
zvpcghJG+}bleGKqx%~f`@9UX4^X-4O0Q5*%1W?M3T!Vp|i(T&lhPN1osUE5+_)!Cw
zy1Gbj^6bw07{jCy#1S0K$~JE4Igme~D+4NmF)I3|d{==u?o2SO>+kipj4EzkkSZsZ
z*5n0~gaPMxe7?(OyK`Tjqum@_pKR|bd45L5Wg2;I3}i-bzuC!NGuzwd@P*0vO3CxH
z(){Ucc;m&f0!J9*e2hKUE%xTk4hK$3oYH#1VzN0g&z8H^I$|Db=!I?d-SC+8@l^l_
zH8N(Cjjf*35hzT&m6U%`iG-zW(FC}@XEwZ?lNlHW#tVJyaI4AQ{6U~F@fIa73<o(A
zEpTba^RRo_WH1@|ixbWS?5j50T<1ow{_WW?-E=Ra<Virz5YDzOodk`$W<lPRQ9>)S
zB3(S}9=c(+H@_nkCdi=VMFGBG>L~bS_bk}3cp@+yquhaU7RJ7Mv)xtqOj+CbCx!a|
zrsT=M+)OT=74J@ghVq#(eS$^kK~|(I1_wPiEOzIcLZOZZB~Jm^3uk76i#$@4yq+!e
zA_PwMVK{HHxeiX;)GAu#2u<Q<Q1TQ)n`vR7vUn<dyCDZAjWdaQ<Ffu<Pph8t8scOi
zq9*Ji*YP6q(32FaC=nvMnf!B}l7M{!URYn-1!tT31Kkkvkvrr5+-a6i+8ufBK!x@e
zA~)U7$<*Jfz3bHS7z=s)8J@b@2Opoj3;zyy_#!}n+Q5WYx{u6j6ACppxXb2BjeVw_
zyZ2wof)IHP@LW8Mn#?xmmUzi)D4ax;cIaz(!g|VUbitw_ahxkoUTY%q+DkJ;3r}8N
zvpH958IF>tC7OO;xkO&Oyfciv22iD?yhh2319_awsPbA#%W}1$DS2uUjM86HUh{fS
zbMo5Q()O$<E+nfdd6Lj*SHa6`Ka}T&$ZJDh_SabDHA<d#97Xl?>dZ0V+$$lk*<FW}
z%4?LosE}*hU`&RDyoT{wrScjjPg`zeds~t}7Fzbb0L$hFK2aj_<O~nSKaqRkXL7RF
zD0#Bs*1lm@rUB~KPlwty(?G~x!<Zp*W%<q9Y?FDFb8e)ll)Omj=u{U`UbDNlO37<f
z9@B{+xnU|B9zc2h-QeuCD<pfZC^&nK&OEuO>eO!SqU><;+5#?n%~I@KBOV4NPmD&A
z*i!PE&j*!cF>`)&iEA=9RC?J=62hd0(b6>t#Z{fq-aRNZ8IxgfyS+X;op}Nzsbi46
z6eNQUAz^n#>I^+SMoN;JVE^}j!QSug!?1^A>&bx-Ty%SUC68;Y_b7QhDoONuvxfyc
zxl}g&A>QYS1{j34u(gE;`NSAXUJ{YU4MpOU_$!P7+t{PlTjJqT^2BH)(C+RZhE+%I
zKtuaO(I}7`A+-DLB?T2{mLspIV#K861tXGx_jOnM;iHp(hGd^%0~EPy3R}<Ah949q
zFFY=~l>YOG<b59Rf^S0dKJgbM?{jCgyiZD=E;NM(IoJ9S*3{gAp8tl0N|LPGVZg{X
zc--39E|f|elssu{;!^Wy$OoJ2?!wVa51#T*a$XLP%QkLM@>L>~yr&?H@0*{0e*`6m
z??7iSD+D65?LIP~Qnto=zDFpPXHfFw;iRgSn>=LiI(rYky!bcxxTkObL5Qo*FlLlJ
zJet?XmnnIr<S9WbhPL6fNg^rt6QyJw*&p#W|G*uCYoO%Cf|`sz(()F%U}T__lec8J
ziP(ga7ZIM=Dmi(pxVjUrbp**<3~XkPSr4h1ZQ>D8^2BIpU@Q3~Tx~dRe_l7YHCL^p
zRPV25e;#-4lJXXV9NV8OsBk!t=v#TTL5rJtC&*9QZ?04Wr<A<)WOJpp&7sD5guV=s
zVRjMmvx0lxh|rE!g+YLmw^n?08*Ej#1G*%)t(oANJKZurp1WeX;SkQ!_fWI3R8rmo
zhR9omje4L;7c2@<mXf!Ko9gisj2o56TM9#mG^gZ+Kq6fbR^CGB9s*p-*3P@2RNj(~
zB(H{&Cj%!*c?+S_83xO`SmiAlp(8e-<VA!BAgsKFP#;+=tXC^<MF}0Xnvy30ksk7v
zL}=N?l)NxdNy=LYHnFwVO0DFrFrgI{QSyS|(o^0F3a$7p&6xH>#>rbt4%~tdPjrcP
z=!|4<ZQC)e@U`F_I*O5wLkIeh?gy3I+^F|=hpFY0&OASY0&zOZTWZOp_dF4T<TBJ@
zK&WW&Sm6~p*;}Hn2{F@q<{=aiMG&eY@>V`aTtb+LA!u69Jo25G8;LZ(l>ZlO0VZQW
fl6Ij8C_&(VMPlUC=ebSo00000NkvXXu0mjfTaKVV

diff --git a/data/styles/default/dark/hdpi/route-point-finish.png b/data/styles/default/dark/hdpi/route-point-finish.png
deleted file mode 100644
index 6209ce956a238056cb8c386a7e57274e9c0f40b8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3494
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
U0phclrvLx|07*qoM6N<$g7h`Aga7~l

diff --git a/data/styles/default/dark/hdpi/route-point-start.png b/data/styles/default/dark/hdpi/route-point-start.png
deleted file mode 100644
index f928ba045dda36ae41b982a46785962f19396eed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1826
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
QKmY&$07*qoM6N<$f@*7nI{*Lx

diff --git a/data/styles/default/dark/hdpi/search-result.png b/data/styles/default/dark/hdpi/search-result.png
deleted file mode 100644
index 7f7750356e971d6dc8f27717720fdd2822a74d3e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 542
zcmV+(0^$9MP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px$*hxe|R7efAmBCKJKoEv^DWSobsHia*PsWRALgGbFJOwx3z<40x?!hPE<QsV7
zDLCoHghcV8o{Yq(sELt4DC_?(EY?!Bv~-fPEj#o5JG0%X5HXt!!dFV=;Frg>I`n_Q
zSeH^ZhR>4^fZDjqj#9T6eQh{b#-#n5f^P;0*hO&Fl5(xy>Zn??EiYfY;-%BqoJBh!
zwii;OkWH(6#+LBChi?%XoqL7G1OP88Ax<AZdsgM@-6HreqflvU&RLmBI)Lp%r0Vwn
zA;6UbUb}wlCXX*#iH{zh0@!R)ild!Oe{(+71F+!EWF){kBGsFxwv#QLJzGKHMxP>;
zy(MQkZ8cG@4Ty9&moN?(4_R}TWl}g9jA1MpWbr@RNC4Y+zzzMc=7TW*U&fL_mhsR6
zC{GSI>wH_xMA(rGvdAREWWYltqO6|rG#5iNjetI(<~<*{hWm9fG}8!#qxnR6YitDA
zTLe#NRLgubG}9341oKozH5WrOwEzx91FzN{drMRSGRPv6ERz9mPT06yE0|b|v1E{C
zf=7E2d#hmYV9RA!WaDCQ32LU<F_sL|hZsLbK_>CFYqMgAOzneXm}4XN1XnztOs^V*
grvK6RiiCas0@}GeX>MnhDF6Tf07*qoM6N<$g1N`=#sB~S

diff --git a/data/styles/default/dark/hdpi/track_marker_deselected.png b/data/styles/default/dark/hdpi/track_marker_deselected.png
deleted file mode 100644
index fc2c2611cffc8cba81b9a357260c18c8852487d2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 604
zcmV-i0;BzjP)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00001b5ch_0Itp)
z=>Px%7D+@wR7efQmrqL@K^VqoL+}p@q870cuO7sM#X}*`?;z;c(2LNM*Bo>5OL$Pw
z&maT@1rMc%9$TtyQAAKQ5{%C;CSjb}9XGpaeBfbcXW#dI=AE5=XErh^&}=pfGAoO#
z;)+;mQx|jI=Bcg+Vl9fICtb5cf+ONr@voQ`*y1yiNm-6-;!iOv@LfwSF5^h7WL1mt
zBUTg~00!c2jC0;DVkV30VLvl<2V1eT?v6rMypKKmq1!&Ys+*%f_vYL6qq(ZTEZphg
zf?1jzGGAs#&GPiH>*C(8YsK%=*%Fp0EAWRnPp6CDcMY@i{iY@8KC|x`z{cW)nHwwG
z-FEwzZWbi|!1oC@#aL0Y+d95{Q<NYnY|%i=u$U0P5NGJHL8ge_Hkx+#o9*#pWU8M(
zBxU|j0X}vrk|#=Zrngs7{P4jy0ce#GrVM&uAu)AXfiE!<u!=CX*8{6JF9I=E5T@XJ
z$dhd+SRh6zQMmJ+c7kNN24b{?v&2m0)2&Xvb?Z}NKlMOG%8RMw7#Bp36{ZU1MIgpG
z!kipDP<!(t5aR@4jw>E0_<<37_HGBhflcEO;hIPp^FYC;{PhZa@J#?(wL<$~R*f@a
zm)ZU_)sr})_yl&SDw^-MEq3Q|&<BB6Gc56e9erHk_c`n_3S~X`<E@=O?_3<*f!-1S
qZ@)0zRc#BpZDmfODT{skX?q4PvC`mm&yGm|0000<MNUMnLSTZfM-&zS

diff --git a/data/styles/default/dark/hdpi/track_marker_selected.png b/data/styles/default/dark/hdpi/track_marker_selected.png
deleted file mode 100644
index 7dbb48285dd9ae1930b53e40eeb6c2b0c3cc107e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1565
zcmV+&2IBdNP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px)*GWV{RA>d&T1{*lMHHTybsVRTlM=T;LV_y7Pk~C5s3>ZxN<hW03Q|EWmEgbu
zl@lD`hB)+q5EnSWiHZXkq(TLiXoV=KfD|=Rq^fD90;Q;^B7Z=e&?I*3INlxR8+YB^
z^~~;UoDg{q*_}7<=X;Z#nfKn9k`-tNPV=Uz>8W07kxj%Q8#pH&gz^?jSQ6?vaY}^K
z0;ObzFmjdK<Z@@W^U|Shbg5qRbh!%l4vn=e=GkTe_#Vz^FL!uT99@*rCF<}?!lB=q
z)6Rt>13iT}@-A;|2ljsPbF#R;Z95^>4$irpVOQC5pOn%PA@-@%wYlLV`|cO-=FQlF
zgPgN7-;eciZavHiX*D-t&MCm;D7Am;d#vZoK}sDHNh1ed{ARjsKDoHxv3Zw?(t3HA
zMJF?*=EI*oot=x)73sipKaO`VmFWJ}nspsO{5P7C{P0(gbdT$JKo50b_qXE@5Q{xS
z9G(bMvT9?DmWk~gJN{(%Ih_ry0}?!?dvt>TE1mPBIwzP42tFG*^QytMpoy<QVp7<y
z`43>h&RN9+ald)S7}?d8>KWLW+T4}4y3z?Nvo1k1u(?p?^ZBwpKbf~DhprSaoSZC<
zIgZgLQ-zE*(PpO(1sAr@0l8J4oO&hBZnG|FS+Cxm=^wZyHITAcx@s}xrD!|(p}&hm
zA77jwSt!|d2&-=hyHnq;&QH8stj~dGzx#8W!>!#usgTYKceLKSXH({hbb_{ruxW?#
zWj=fK^8AU<|H%ESWeN;1Y9Igl@!L<k<f;Smgl%8{y6LC$*4B<kx8I!F=_;z{Is8v?
z@ZGaBKbYvir<9t#_Mv-XR~IqD15@xH^lyBArN9F;bU~+y1Hf1bWh&g#0R(1<ZA=tk
z=I?56+G4^RhX*>L+f2sVQNc`zJfIL&ngnL}=A&l*?DQfT{Hs9D|63x{i<O-w+sw$8
zo04Sbtu170wpoi2x`mCYs5JqsG7=_av~t3VkXWnr`T%wtELa`iM7~Tu`ejxE5AsYb
z*kod%Ku$~)q$980*G_Irs}FbBI5u9m7`Z!DFpn}MBZ%jNMuUB9mAc&qv;F4CRVDbK
zo+w_}fUTfhun)|@&X7q(B_lYbu+ImTppTh<XLN?-%3^sLHt<3QvZ@AKuo>2X8Q7Uj
z1H(AQ7*1H-A%)K-4tUoTWFV_*umzi{F)t0+8FE-JQT2}SKt;!b#V4`c23hD(HJwc#
zufWb^0`8;Mb`aatQi<GcRP;DB>{zO%v+3mpc82PKm#BJ2V5XwiGyASSoerH%S57_!
zcIK8od;@`w8&w9#)qOrlkJES0ilB_nrk4-c!<V|3dzId+!C0++qiv1JqEoG~kAisK
zN4Va>30rUL(C830b5Xj1ouOhD#fW4?#e?vm-lo%`v+1)Zurpci^HFO%$fRniM8-BM
zdK?<!BUPKw*!1!OJ43C~OH{oh4OGz)nCWIv#UG?WRu|k2Yi#;-2<!}nRv%H(K@N*F
zP%%Uhn6)NCmZC~X&>#a@Rf8?qRE>FQz|K%5MxoU^5PU}hjvO{fM;}q;+YffcasuEX
zql-vkD=O&+W?*M1amy;P3Y~|B1ROc6hg5yVr|^FN2BXg@iWfFutEyb{0?fc(3Ccx@
zTf{`lc*m7Te2xVCr90d9xis$+v-#dbSsB|bH=%((*oe#pzzEEuNe57$FXpVLqOvk%
zO1*8#!LY0hi&D2RVKA&AxsS@mAdhl<bJ~_0i#&-cmkai(Fy-zTst3Q%E}eJ#EA@m<
z)5-+y65I=s>QRcz1(YmI0KGAC<x9+#39ktcbU~*HuPmzwtS+x_|7+;N7CdVB(juH_
z=;AIMKtn0JRAw))*~LZ$#*M$?q9d7bK2_b;R2T6LZbBrZxEb-%*7RLqQGo|0-y#lz
zZ0IW{*O`XC<a3>9=xbKjiH5%DcAdbpVSj4ibwWDQs6X}yI)eUM{@mt2BDWo%FMb*=
P00000NkvXXu0mjfFZ1|;

diff --git a/data/styles/default/dark/mdpi-ad/keep.png b/data/styles/default/dark/mdpi-ad/keep.png
deleted file mode 100644
index ce7b6f20e5ba507cfda191ac9e712ca89db4a767..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 126
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k8}bl&H|6fVg?4j!ywFfJby(BP*AeO
zHKHUqKdq!Zu_%?Hyu4g5GcUV1Ik6yBFTW^#_B$IXpdxNh7sn8enaK$ZObiUH42(&k
RMjb$522WQ%mvv4FO#rSW9sB?Q

diff --git a/data/styles/default/dark/mdpi/coloredmark-bg-l.png b/data/styles/default/dark/mdpi/coloredmark-bg-l.png
deleted file mode 100644
index 8997c45f0dc2ca21065dbab17ac0892f1ce504a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 538
zcmV+#0_FXQP)<h;3K|Lk000e1NJLTq001Ze000~a1^@s66BYf|00001b5ch_0Itp)
z=>Px$)Ja4^R9Fe^SIbJnKorem)j)rsND(C9zZ4YrZu|kkFA)Dj=*GQN=)XvcAVvBE
zfn=4`b6^URl$<+h0xmjGW-@c{xo6J2ZiC=lPE#N}#eK8cT-0@a3yj5nzrR8~b9lQj
z48PD`M^Us&)AYyndsn>(ZnxW6S(Yz|_5fmWS5y$KFut5jCeQQveAi`rY|NV=RJ*CF
z>J4DiV}Kofc^t?0Q1he1rZp6`dOA9?EPKR~zQe?q98stAB}PYx){t32D#rj=Qm;uh
zBVx&G?8`f=k|u)Ob45{nQiW!~p5J+rB-fTbX;Q--h@r@FPE&^|=O-0(SIM_Jtuj)>
zfTtTveW|V>sUYvUp~;aeF^S#a-TIUS;jw6W4c8&DB|*%TFT^Otf-MPx+2Q#bgQUc^
z5FCS;8Ph`0`~5UW4+4oT3A(JrBc|Qdf-MOm+}a+}+frgng3RZ5sd|SN4(_5}39~>F
zbT|D{0rePPs#k=Vk|2$kY@*899;oCFQ^J`DGV5TniDjuJqA(x^u`HPkp-cp6$ovi9
zPp6QiFENNkOiPj3OcUf^r~D+#*)!RM60i8l(@h)N(#J=+gD~C-9voS_TyfODoqyw<
c+kF)H1x)ax_1wsqpa1{>07*qoM6N<$g6^mG-~a#s

diff --git a/data/styles/default/dark/mdpi/coloredmark-bg-s.png b/data/styles/default/dark/mdpi/coloredmark-bg-s.png
deleted file mode 100644
index 2a76753bd773ec1c62f1dd6c0dc47d7e3fc7538d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 230
zcmeAS@N?(olHy`uVBq!ia0vp^@<7bb!3HE{Dnu3mDaPU;cPEB*=VV?2ISV{p978Mw
z-%c^)Yf#{E?cSUxbNrxkk%qhe1KvBO$K#oOr0kA)B;{Oc`1B{YK4hZ32m7AyVlO8M
z7xAu+iw=4u*T%$L<T$VOp8Pw_^m$Di{Axli%oaaCZ_N<6bsFdNnaZ-}nbYroseGak
z;m4z?AyLVCTj)<(&r1$JFSYrSjs`m6AvG%9n`JcFdA41zzP;7gB;dJqzZ@(3z5j=g
dve|8X*Vgh^M_%#A2cTOSJYD@<);T3K0RT82Qyu^S

diff --git a/data/styles/default/dark/mdpi/coloredmark-default-l.png b/data/styles/default/dark/mdpi/coloredmark-default-l.png
deleted file mode 100644
index a3df12ff22198e8e72af7623bc8be49a42c20060..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 550
zcmV+>0@?kEP)<h;3K|Lk000e1NJLTq001Ze000~a1^@s66BYf|00001b5ch_0Itp)
z=>Px$;7LS5R9Fekm_1IzKoEsvXgL5hp`cDfgVG~GksIU&Tz~^W!v&~0L<%C&rAh%5
zh?0U7{2T(A@5M7H$no0i*osGbUjNLzc^<EK*G_sHSem8-!q348*f-Ghz6^8P`y@$T
zbh3^mb%GE!BJL6#Rg8bb?*^fhivE9YQ34UxC-N2?8^b5<6g+@;pvuWq%|mbs&cFeX
zJ%I~^E|y14ZV)#FuiyhbgE81G%OM~0Rg7ZAF)WLVx-LSn07`HN_M!-IR*c1pLtM>>
zgs2a^a#!r{#ENr&#e!?#l~kA6%pjW>p(<BfoU0HA5SK(ozckLXY#|sKk@`>cWBo_A
zav(0?eNrPrJ%eNhbf@Eb48>96H11ikSKtc410#5(Eqz-9RBJDZ6Np;{(15?zLVZdz
zglx*V^^@&3w>3_Up)${v9j$Cb0yTZfGzhn4&h5E!c|rm;8^|<6v}MlixpH}`2=wVI
z7u>)J=dLBNf&7&z(jw1L1xxR)h&1B7SMIwgriwtVO4>5#_G0Angam4_DbtdvEpu+q
zRXvXePa8zHI#34{Be1(uos=W6+lvJg+1=%q3GDWQ)kJo8$uEI2`r}qUnmYg486_~Q
oW%hQn-@Ola7w9dIz4c!ozr;HCCLk1eRsaA107*qoM6N<$f|POZP5=M^

diff --git a/data/styles/default/dark/mdpi/coloredmark-default-s.png b/data/styles/default/dark/mdpi/coloredmark-default-s.png
deleted file mode 100644
index 779399bc0f4c58c9691110e6a077204abc41a845..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 322
zcmV-I0lof-P)<h;3K|Lk000e1NJLTq0018V000jN1^@s69C#F>00001b5ch_0Itp)
z=>Px#{7FPXR5%gEmAwtZKn#UZ>QGasfdSGoNVdpsEWiS=1_g)#QXTILwon9I9EcQ4
zPv*|g&-ddTtJMTcDHTE^9E6L|nP<#=F+na)m2f4Tg`5$u;;I2Ag2L6R-sD@M7E1Gs
znaAMGvj7Qk)V|}Res4almwACW2LJynkO+5)v9phbeKEw1Czl$Z|Jh4~X2RNt2)v%H
zya+$bkq}*t)mfqi;q`3gMfh2cg!r7WGE00FUq9)o8{<cs;%*|lF)@p8&3oS0v`F!j
zW$(YL3<J*dykT_8NJqG6w=egdb4uF%GB2E8kuAVqI&0`RM|_^A)eF0q@T~u854OIw
UDAA5c)c^nh07*qoM6N<$g5^Gqga7~l

diff --git a/data/styles/default/dark/mdpi/compass-image.png b/data/styles/default/dark/mdpi/compass-image.png
deleted file mode 100644
index a3995424c866454eb9ee6d53ad46fe23aaa055b5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1434
zcmV;L1!ek)P)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700009a7bBm000Cx
z000Cx0gzh_N&o-=8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11t&>F
zK~z|U&6vw?8&wp>zcb^BJ&EJEwu7rc-B3yuk%pu%sShe4)KZWTR4m{hC>s_P60c47
zNL7(4U<a&`3Tg$rg4h7+W7Pmr#j3P+?AVUuxSrUa=RGW1J4yY>+!2VL)tx!_eD|k&
z=bn4#(CO2s@i?3Ee*<h~p`d}4%34NI_=o__fp`)?8lce!UN!)fz;u^^TO@EJm5OHn
zb3jeg)KaN-N`T*nifI9Q=%Gh?QVc*0gl7pj2^CnW8VdsA(nLCS)o~o}Uk9wz)?Q$N
z4~X!T-<XZYM0*M9-lcN&jKX{&k%(RM6Q@p1O%3c&DwTB8#yJ3Ii4Y3{x7lcniC%4)
z)^^)!-Hb#c?x5ZSH;G{wNp)!CYY<-ZGjv>dT3mRVpS}!w-4p6prB*8u2+%N$q~+pE
z0DJrl2mlA&X5xU`95~=6NTMm#bO%EA1T2+Gy5-X60A>6R1^~}{W^zuLNtqacGNG3H
zS*=!!_y$z9k&huUa{#bY*uyDy^`vn1jIec?SSFfsSpCo!V0qOz;`f`|X#1V@Wjg4#
zBxeyI&>JiF8^;C$YMQ1hz(=y;3N!5$W(V*&&rB%Hk0!@0jfHq$(=@d&V6nLR3P3w#
zg{R$COlQ&Ay~8ZDY0nIhk|<Lsue{tBkO^<eivs(F)wK)vxu);kyxC|ILkF-@S<8Sh
zEi0$9r|$C1_@nRl2rE9!toDi-hzFXfR-2tw>;O`TkIISxzya6XruEot3Rs!*n%jbC
z3UUv30kWXkAY!v#{~bFgk+e4&gZ8!C>oW*`T2?3}oS_NfMEm)l6z=E~o*S0cCD3HM
zy*`6PX<4B|u9<A-lB_yZzZf20xELN^$SOni2Lk~IyuoK}Ph;NR1qkM084Ut3vmqg0
z4vl5YYRD?9A?va>*14R{xUHmgLIg(Ijlef*2KdIQH^0?FS_}Z{*KZENY>op!Jvy@Z
z^NEvp0KjpbI{*6H6uNJ<zHEI4iJFqJR46Q2?T5LU>3l>FFGuw7^6boPq5b}0A6d9Y
zyV03JVlFYY|0(=gZZVgc+?i=IgGQp!@neUN+7DeR03ZVA^LhCjI8m|P+%SX69a$aA
zvJ=flv)a$!Xf{?_rkRq}W$@o!fW+c=Ss?&e%;)<qUoKyeK1l$8!1L{P2T%yQ9z-l(
zSlUg*P7jw`EEIPKkmL}F4oe3xm5OGGc|lgq6P~_Wt#vJPb#-;c_1vDf<Sp#acs#z?
z1qc8H<x&7aWOKQ$&6UmNg8cy!Z(`U4m`=y90xVqtC|4@a2=+Q@$`hhhsZ@4J!!hoi
zc=7m;eE}WE@tEkmtS%8L<<hdzeqJt@>qI17_fa4|ou8i<eE|VrJRZG4;2&hgvy0iz
z`FSt9-u7*bE4``>z5nXSJ5S7i$><wKW5Tk{n(bKk*BXrpNxa*mBie;tj-G(=c-(aL
z&{^5<v9MTl^ZBJ-DQAFj*0a_3!r`#h%iFg$6V<eq0r8XSh(jRqbs98UO}%ayanJMo
zrkC5E9eOvN*884D13%=nu2)sXJHz1b{fuVY_LyzkW4_QBS4M}mcLu=$KB`-hNW>k{
z!@rm<bAbud0Qm#x4|b0goEzU3{U#I&ZCNMW60mK$9?p%$qTd;7jU0$l1nC?29}Mxu
z$(N3QV$`ZRzd;nVh+eHWcX$v-Ks-mFNic6`APN8ktbwS=;JXCA<*B%qj>Ymp#tD3*
oP9%nN0CE5V9glwPv9I#~1GTXYpB8-eY5)KL07*qoM6N<$g1kDVlK=n!

diff --git a/data/styles/default/dark/mdpi/cross_geoposition.png b/data/styles/default/dark/mdpi/cross_geoposition.png
deleted file mode 100644
index 1b2ee9e49af63e973834ea728f4c5ac54750f43d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 319
zcmV-F0l@x=P)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf00001b5ch_0Itp)
z=>Px#`AI}UR9Fe^STPR5FbpJ!sc&HA2Z<Q^3l?Tx#>~PmI-q1@WbGTe249p&6+<iI
zAVtWQ5=V+{Ip-TrF`GKJr!svmHIN^rWp~m7IluSbA8~fh!QHS)tX5;4wf2x3c}f~8
zx!ZDR&1+-ai6~-<7#9I<ymCwt<08O~SC0J+Vvs#W<aOLvEyQ0I?$)j*3K$G+XNbI+
zo?1)%>3s;{MPl>OBKad;4#cXAGRAmH1&z7G3oMNi92;p#HTox~u7bu=YKx=P#=e@W
zj*<(TBBqFO5#Yuv#}qLx0^Im!IacdOaf0$BR3P%8r^E)KSi_3gM6D{H!*6kNB(kT#
RQfmMJ002ovPDHLkV1iLJgAM=y

diff --git a/data/styles/default/dark/mdpi/current-position.png b/data/styles/default/dark/mdpi/current-position.png
deleted file mode 100644
index a4a0d993adfdd77f6da4e2cd4d26f8a057fc78ad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 582
zcmV-M0=fN(P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px%07*naR5%f(l}j%JQ546|z0;}cV>~J(o*{@=iG@hSRxB-i0>r`>5F3fa#@fb0
z#23KM0z0u2kE9+63vclVNvkbpYR3IfT$$7(YR=}ixBv6&J$KIk45ROZwTw(ea*8Ya
zJ^o-1<4Qebmicy+P9@e}@6H$ZW+tN8%1mdO8%@LG&01Y#Ue&@KUagSSK!~`SW6MnA
zm5k&Q>G4N0;t!kg<LJP_?Bu?a;RLewv6%sXY1LeyteVtdo>TYbvyq5V^6G?A*JndJ
zQzP?2V4qfzN&y=TR@TmisvF7U^ULiYSH<fiZ+;k@zHp@L{AOc$2Vxs&ms#7g0vPwG
zKSDBp5O+(eRzPN2?+caJEZlFe-+P3J;m%NIHZTcC4szdK5-7V<5l^!<P}MN$FDaLr
ztXGtueomHY6*Ws7t%0ZMHoyRjqtDP9ZUYRkIGR@WnHwk=Hp>mfnQMKRhQm&9fZMPP
z-L@u&H(@8Y0R~tcMu#`u1{h#*Obr+v-u!PM7YwktfLNFsFuIvGvSuO&xnO{0dl?=q
zYU{p$(cw*a^e+Ke;_Qf$mnTEf>Csi>d}fMiv5Tnzqbt5#f}MT~lqq2!<I9$R0`Uza
z2vdU?b-<gJX^PWwVocnOWs#}BkRE%a)a?a5-<)p74!3&c$>g6q2dvz~`tMi3J5X);
U*grcH{Qv*}07*qoM6N<$g1i_B7ytkO

diff --git a/data/styles/default/dark/mdpi/infosign.png b/data/styles/default/dark/mdpi/infosign.png
deleted file mode 100644
index 2ffd8c2b10e6b28f16c4f4073e85c52c2d948e6a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1407
zcmV-_1%UdAP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px)IY~r8R9FecS8YrjMHt?_-P`+syMrDF6iNgurGmCnZ3I$8VoejjO^op)wuvPs
z4O;zM^@nLvlm2L;wlSu$G5ukTsZEV(At3>6YcWBprnOdzP{3k=<Ez{q_qDg{^DZ~X
z_HOsih7jN6*_nCYXXbr&Zf16l<Njyk?<Bvfs?Fd(0W<>l0Be8*a1$5@&H<-^exB!5
zlq)wRwE(+;K_J}}I0)%R+?RozFPN2p0jlr{r-04$DvHXD^!X!$KTL#OS7zfC3-JVI
zfKPZN%Vce#b$WZ5b7qUzR%hY4yND0_4R{H&F`%^!9;O12ydL}xpfsVX!$${#V;y6m
zW|dO~gK?H!JTE_0;p~2+#$5v;l?dDdUWJG=%cSL+p#UU*9F&uQYc`s=&~|?M{+Ob;
zm%HVzNdh1ExS^=GB2U}_wgNn3BqBoql5YaJ53r2{<*vQG{ucDMp?$~3bG-6?ePQRr
zKHHP%8~_?2;);Ht+XNuFgy640?O0ImZttCL#gtq09rSe(y`QggU6y!GJ$XG;7g3aq
zpNB+zw$0a5?i9A8FD2g$5wvqOOBc`%?-9WN%J)-oEV8mCn(_0KMqmHkF7Y9X&P0{p
zcb%QQ&xmQY@PU($l}=$ztVg^J0**0W>h19Mq<$X-P7DY7b0sHUl}oIolFVzf)Y$|+
zywtk=8CO)-7lRAKN$&^ATv{_F0IgP_TvoZk<3k~uuAFuwB>%!lVOi~uCR7J&r<bQj
z7hAELhTvZZG_kl|z_aAM=#LC@s%m9~Y~@?M{;gmB75t`iJpA=*XD71$To_ZlJQpVc
zWLhq&i1bJr?R&0gB3!^6xk}7d;a9_f7jp4fyyNeX`++sI&b6albL(fIhCEm2;xtA7
z$;zApx6vcX`a!aF91Y4P$@p5v)6YO2IYV)!kOj@kT^l?@Pggh!>;mrvN5sH?wD<aJ
z&G^jkk0`!mJte?Me8yg815jxdxbPz-wtgh1FQI1ZoPvwhvz4MHb&SUuPcPsGIZK`5
zGz%J)@dW4C{iFXyRn^XTjWQckt{ZXFeO^hJPx?|h^a8F?aFbW^r*}+mSLO?Tp661F
zwa*_l-2dtQ>b<s!r0)`o=>>F?v$fPNv!GeoTw)*7$9n!*EYi2l>aArC`Y4fISSmP9
zFW@^k)oQm?moHheifAZy=#TK&;H|jf5zLZMnJ-!r)ov>-R1$H5d}JvBIG^c|ID@Hm
z?Ahosy+BZ>wN9a!%A`q0w-ry}7>+WBQMsqK;41udQg$KN2;-y#Bpv%vDlMh<+J<7g
z=~@WH75ZY5g%c`w4kuw}RN+i_PmM<kwv^g7fKPA#E_Gz4pGwV#55-5Qyp4h9UqA29
zpNYu&vqIxwmc|Pup?fYy`&!+K9bvi#D)NQck;dY%z;hmSK8&~Ds|}KT7zwZ=Mhmhj
zAged`{XF9v3B)r*=m#;Y7du4d)25<XoEaqWC*V;Ci0Szm0w{=CpcAeO*n+!t^w>Zk
z^zCRcb?^`;o6+z3Tvguu&h;*<XyNIErLX1=Bv0*s*56P71tEfF;xN!gZCuYLj$aG-
zE>1@TwwK7SH(WTl2aD|ToA-L=ymkvac29#tm(m42m(@)LFam_^MEygcoP4-kEdDtk
z3k(Nj+hjz^6CkzFCWNcqVg!rLh0Cauc(5tpJtY2IYpvt~5mtcyX!HTO>=Fp?08GeA
zQfKzXz=yIZIF#9A6+94d&_Kk&RY+w%Bm^ALi8x@+T*U|k>?f=w#lL1`Te6Lz!At-E
N002ovPDHLkV1g}2rG5Ya

diff --git a/data/styles/default/dark/mdpi/non-found-search-result.png b/data/styles/default/dark/mdpi/non-found-search-result.png
deleted file mode 100644
index 0c20465af8a19ab6c56cf55c7175e5e3cae350fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 228
zcmV<A02}{_P)<h;3K|Lk000e1NJLTq000jF000jN1^@s6JJyv-00021Nkl<ZcmbtT
zg$=_n5PW%$k}we~Yh;0plbO6nvqe!*X88J|D|7xN<1@)ERMmx*h2_KQhPC18`S0Wr
z6l{gn)(;@P^-6FE>T$7HuJZgiOH&<3k>bP~|5Pxf0=i0z`=Xdnl0?V#`qRQc=r<lX
zK`dvB?*wlZ+<1@)lTo@xrjHAJ6!yYwma+XJ3_hYOEC-VFlkhl>mDrdpn_@O)+f-*;
ehuM1DFjXfjB44m7cEIES0000<MNUMnLSTZq>tL$@

diff --git a/data/styles/default/dark/mdpi/route-arrow.png b/data/styles/default/dark/mdpi/route-arrow.png
deleted file mode 100644
index 3c52b070de5fd0bf95e48cb538e3eb0e740b6fc4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1146
zcmV-=1cm#FP)<h;3K|Lk000e1NJLTq002q=001lq1^@s6!hJ3_00001b5ch_0Itp)
z=>Px(G)Y83RA>e5noDRCK^VusZ<B6nRD3^Z6)UxB2|gM{@O{vW2TvZvgKcfqibVvi
zSW!w8d?140#abUN2x<?42dO#eLB)#JrmYeLrP}%k)M9PbM6)Itzln{un#U%aSSRZo
zc9Yp}W_N!3&6n>#697TVn62%jEH<Y+RF5kS)s5r5uUqMBeg4w>!c^i|6K~sO*b4)S
zF_y!CWe5DMA*0w)J*lE?crpN}?L!z)p#jN8iFmQH58b}DVMQ%VL-naX3kT}K!Pz)}
zni&{Ct`FHAx!7^+Z^SO)Kv}Xgp|NT<RIZ&2^zcYiaxcZMCV6x7+*Ep%aG*F0qXFR1
zx-7VJU>4?0&Lr<*bJ;g+BJZlS*;q=(l#)(U`DO?9y(rfVj}GO-wp9~&bq0CY(Zd}r
zcTHQL<PNk;#%G~HaR9?)gi{-*Lc^XJm^E7FfqqHA`>oAX?AVqJK%qW_2NfE~YRgDy
zJCctZ7LTPWHax)CX_|^R%q5Pjkd2lz@&u0gp@v??6fGV7t+q;?HRi3ZHuXYz-7D7P
z_8}nlAV4{_yArcu6a$ot9Ir)z#K)lq6u0Z@^Fdi{Cp5J7@vp=S>oX0e?H|uudV&>k
z9x$V*nNkw<4-jYnLvDWl_Is$f^oF^;eqx0#1Xk*;TVRj(!O|v1MH+bN%5l(gI3JhI
z8bNWMWd#`ANJIjqJtz(^XS@uzDrds6^-~~G38V{992QbU-?e5UBr1V)1B%1qB~b~a
zJ5U@}A`(cKpg1gE21_6&N0UIh2E}3hl0bP7O#<m26o<tNmq4viBv9HXoIfzccN{2z
zj0Ws8%hHbj9;JpMrSnELc6zbt_4r}u#n*88eozi_$z!MVtMvWp`L6$<`n}+$^Al`7
z+sRzL3b8@AgiztFvsNqp*L4r-i^5=U{Tryh)y<LcWtn@DoKfVhnbY3SD0tF!jC$Da
zfrV91`yru1Q*Gb=oPrg<L*k@#=}|sEZBATs!SU-|j8;NP2I6B{ao?z%TkzNx^q)Tu
zx&!5W`xQ3TbU<sThbv{Ggvax8OjS;sB@~YSq(n8k0mW!}@}&J8R9$s3#TVd<3GD{N
z!Y{Q2jn1%W23P6=)XQ!KO3rq`y=R~K=y||CGiJPDch`w|?!h=Be@lB%;g^D~_O8fG
z!d^kSxcL>i<<ziO|G`QPn+sQHbD=!Z%>^S$SOx-ZSE+e-1GO4WvmT1s+m%{tebi_j
zqhpF`ViYyIMZZZ9VuW_11f`w}R+rXMrcI2BB|&r#DvShaBneU&F1ywOOK1rbL4qt#
zHY5&M$f=iz1kvJ6LV`+Ef@lRL+^-(r>HR4|Bq=CCv_eqRUbq;=Aq6GK1mire)6@(y
z88*ViD9VXC=+Bx)N*=e+%46ITL@O*|K$!sxvZu?QSj!<=fkbNm9YbRJom9zp-T(jq
M07*qoM6N<$f<+S&NdN!<

diff --git a/data/styles/default/dark/mdpi/route-point-finish.png b/data/styles/default/dark/mdpi/route-point-finish.png
deleted file mode 100644
index af72712af076c1441ad8976a082df96aeda52cf7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2009
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

diff --git a/data/styles/default/dark/mdpi/route-point-start.png b/data/styles/default/dark/mdpi/route-point-start.png
deleted file mode 100644
index f464ec835473d1f06dc100b4da0e859e9a40ae52..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 990
zcmV<410np0P)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<00001b5ch_0Itp)
z=>Px&m`OxIR7ef2md{I6Q547Do9C22vT<RPKd7AkfYFT$p^!k(c1CS#8Hf-mwdn_K
z+JqG?LLv|%+O_EyLa3p+Q3N3zTM0ptGHR2HnHpy%otfA9+<AAH@drB2960ZuckVsk
z?>qP0ciuCNy~T8vFy`90ZD)=#*LK{64Vu7OSXl5yqtP218ylZesnj>yw*R8o_?Tmj
zz+0j^t{^sothu?lrg%L5O2Ct%dr6YD#1JbA#x~i>smMa1(1qIC+Lxwj9!aJRd+f)i
zDQbKTrHo(eX$5q=%4PVymeJ{Rqjs6gFy*PDYiny)y<YEoS(FmhTdiWY5^`S_4u@}e
zJf4SQyGFln8V_a?#^Rq0iHh3ca`LFlxYt&0be(oHn~p>xcWP>Co{F6m&64I4s?37H
z;Khc9hS#hZn2DQ1feo?tFTE{?jJs_Wwt(5o%ga|98ynwBbT(6$0|l9DVq)S{eSQ54
zvCV^!fyDz73m#ZtVvFKa1|w3|+S+=bnz4<AW|o1-T!{q(EHJ^=^P1T;GBVOsU0r>d
z147M;6)?a86Kug#TzX3_zu(_2PK(pH*8$nj!+-%6m>Qcnone`r%1#^{{Zfg>a<JJ}
zGfU`pyPF{5Ju8)HEC)MF2);|4UJU(GV;3tL%fVLV(;2EGTP(rWcrzcBJGG^1oiyR!
z7__TWiMKL?rLn=qLsPL6iNqofdSj_XV>#H0N2ilsSy}lE5skQ1qOlxo)r@t9$>HJQ
zk3y89>(hvf6)?a8)4^6vToqEBq~(z(d0tmncZs&tI~FU7bEvaYeK}TFSKmlay(VB0
z(M_ESFJEGCaPUbwonGe?L)Sm35DNxaV1g~GUhupVGBq_7Yj1B4`h33gXHK|{c+xh%
ztQOV?az9U#lan`ldU~dXjP1&9so3h%LAK?hHGx3jdUJF0EwK;$0iK_qf85g2@=P$o
zqGZUS;X9cXY%;D8^^A^=c6W4iJhCjSvXEa4`LT+PkB{H(>gxI+IMgjJ$~JL;wh5#h
zplZ>^zP`S*OG``d<UeI!KT)hDhFAv!tlXsJcDt~EMq4F%Ow`xk-+yj)c6LC1j;3R=
z*iXq~9mU4S9BWwX#1N~RwTyYP8#{h#N)X4D+8%ZkpFZ8xg~RaAQEJ6c5I$8i8S`W}
zLKf*cz^N@nnoQ487flKYwc;MxwPu;=-LD#)G1n$SgEHpY%<U-u0Ui_U;9EunoB#j-
M07*qoM6N<$f(+BukpKVy

diff --git a/data/styles/default/dark/mdpi/search-result.png b/data/styles/default/dark/mdpi/search-result.png
deleted file mode 100644
index 1610fc169dfb21aca29f4ae5ace5dbd1b6f8d0a9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 381
zcmV-@0fPRCP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px$H%UZ6R5%f>lQB!gFc^lD_N=F;4jn{PoSa2>Cr1Zo@1F>QgK*$KIcEn)CwIkJ
z9YjSOI@mky#Y<zJV1pIT3x^++Hu>K7Nt*AA5dR&<nE8P=om}a=PhA!~d^1Px_j>Z@
zgca-*+H@~pJ{Ha&-<uD;p-ZpLHN@`fY_YvG^VW=ITS|FR`8)t~e`wA+*IDZ(Q&qn9
z-bfR1xS94_4Y^lA9DuFam2Z!)vc*y6iUj0nD}A*)S+|fpBB4rgz_!Pk(V{_%hp_|L
zgKG27OoRklrOSP^4lo_d<?6sf0BG$mtaw0(X_Ut8z}EPgQiTRud+1N-9bhVsy3{!o
zfHsMvQx8ZYaYB<&qH%!+Eglb`o^%*Z@)v|0n(uDR0r*a2Fi9)ps|8)j#px-1A99&$
b=1B%$myorg`^6g{00000NkvXXu0mjf+$g0w

diff --git a/data/styles/default/dark/mdpi/track_marker_deselected.png b/data/styles/default/dark/mdpi/track_marker_deselected.png
deleted file mode 100644
index 92d6b95e02a8ba6c942120b5ad28e12496205814..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 402
zcmV;D0d4+?P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px$Oi4sRR5%f>m9cKZFcd|fX=&A}17ZY;rBjD?;v47+d<$QJ_?9*+d;=2<UD~A*
zjEJFX1+)tHhWIH;9Ac%p(!=5T=Gcj!9U~5fVOU4HA4eB$E4HoC&Jh8_7;}j8`3+zL
z#5<x$^bB%I=&T{eMHELr@2O?LC1I97wm`!RWI6R0n~ZZZUH!;x^(~)Yzfo7`?oxW~
zTX}BZ2;N`P&g&s^uLdwKz#HP8S!%QUlgV-`i_QL&Nc}!FuVnPtkmmJ8vgZST9{B8B
zO@(2AvoI1k5C^0;Au{?FsChnS-ptg53wr2HDFU+2RD5T?a(KI(p)J~oV;8^&>hQL*
z_2WZ2;~|jSNyXCemBYIxkb6_bI`fsoJ13AEUB#khofU~5dQ%E2FYL;<p3WFmU*@F2
wZISeFNCK-pzAPEz{p*0uoIwNwTKW@k1Y45O+#6`A(*OVf07*qoM6N<$f_eV2aR2}S

diff --git a/data/styles/default/dark/mdpi/track_marker_selected.png b/data/styles/default/dark/mdpi/track_marker_selected.png
deleted file mode 100644
index 243c3b095a1148f6365524d5d6d96bcee7fe57ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1086
zcmV-E1i|}>P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px&_(?=TR9FecS50VBK@gtZyyP`$5+oY5w*J+F0e^~A5fRjiS}guhL`1y^qDN02
zMT&Uz<iU#<FCJ7xtUsU@s|B&3MYO1`2dmPmr4rjDHqGB#ciwZioA+MQR&2BI*x8wH
zXJ-Fq<`I}?+uqr!g)^&{gQu{HF^B>&LcmDKoK9F07)=raBT(@4C-irppEfn+r=yxo
z1=@e7FT|>X+ZfQb08F0>Z^=o9fYD1PQqS5C#FFLalyso2lW9HKp{)RPGXv%=r=*mO
z0LcLuFB*NdU2RRobw^wsFjwslA7+fzl~O(vJ|Sd~q!ZWOcEjO7%l&~x)T<u_#=<i(
zG9{Lf1f`y9?K>9^t5~WIaOJaN9F6b=8Ajn4+E8uE9Wc*4_x*UeZTEQyJ-8wmYmDfz
zMFDMbK(k)Kc%CJHjOV}g#4~-j22y?50y9)2Dvig{=&iXb?u2w;-^0Nj3<$q;?(I;0
zFxI*(xGUtP5qE^eP3DaF?JudvH$SENO5q5wuDi{3Pf%_;U_G_)X}8->DTT8Q^LB2G
zR&6Pz(2f6cWa9aSH=`Yf;oJ;-9b_VL2`{C22dsDQ{?z`(I68z5<6JlAaG_`uWgd)h
zzCyH>)0!QO+upLIdXLKIcLW{|rQ!02F}Tv7fExoT=pLB>#z8AX8t^lg@Y-r^X`Zp+
z_rJ0~B~ub~{^ApRyUp-wkenmJ;f2F9mv~OZGX=QVI|^^(S(ObR$8!7|gRUQGIJ0&h
zM0AgoqmDaYet&dcOr~RKrx@EMS|RYZs}~Me?q*z>VmgKx#EOPGP?s1N_1re)*k}>+
z?*N~g%ExWDuUwT28Zn4fn_ZWXp>1krHNjDOeCNs#9u1AF!?Ls;Yu6<w^NdPmN|juT
z5J5(;zouMsi4Yg{cC1~O1oL!W6pE!_4hen)yqIul7+zKO(xBs&s^TKrj<xHOU~Zcq
z0WC5lgc#cejs5Q0fI2Ko+p%_Cax%9~%`!@ICJ9U|lOurUT0g9d_*9lFjTpqL&8|zx
z&^E;yPB7FSvl=EA!NUlLL8hD&C_{`I4N(W`5_*byZrf9Hq9x%gEZD>aMTcDA0h{Nc
zL_<VhBPRJZ3Oj22Fu%$Jqgexf=NV{}Kz-N?M^=X5)T%H9I7V&P2a@f*@$87ovuKh@
z>K`7Mft#n|y*w3faDo8Nt&hw&6AC?;5zoJlcZjjt^OXFGr{sI4yI8$i1*8hGXiTZ7
z$SEn$5$V_sWu@cPGnC2HRndY3J*jv}hE8B*Wcb4;|9eG@%CTW(oK9R(%X4`I76M?d
z%W{VU=!jV(R_ez@>_kO>&4d$jH!AUSsyc!6Z2g}90ad&Ox;1L>xBvhE07*qoM6N<$
Ef_w)06aWAK

diff --git a/data/styles/default/dark/symbols/coloredmark-bg-l.svg b/data/styles/default/dark/symbols/coloredmark-bg-l.svg
new file mode 100644
index 000000000..9bd5baf3c
--- /dev/null
+++ b/data/styles/default/dark/symbols/coloredmark-bg-l.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="40" height="28" version="1.1" viewBox="0 0 40 28" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="19.98" cy="13.98" r="12" fill="#d8d8d8"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/coloredmark-bg-s.svg b/data/styles/default/dark/symbols/coloredmark-bg-s.svg
new file mode 100644
index 000000000..f755b4466
--- /dev/null
+++ b/data/styles/default/dark/symbols/coloredmark-bg-s.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="31" height="15" version="1.1" viewBox="0 0 31 15" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="15.5" cy="7.5" r="5.5" fill="#fff"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/coloredmark-default-l.svg b/data/styles/default/dark/symbols/coloredmark-default-l.svg
new file mode 100644
index 000000000..504bc32a0
--- /dev/null
+++ b/data/styles/default/dark/symbols/coloredmark-default-l.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="40" height="28" version="1.1" viewBox="0 0 40 28" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="20" cy="14" r="13" fill="none" stroke="#fff" stroke-width="2"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/coloredmark-default-s.svg b/data/styles/default/dark/symbols/coloredmark-default-s.svg
new file mode 100644
index 000000000..804691c61
--- /dev/null
+++ b/data/styles/default/dark/symbols/coloredmark-default-s.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="31" height="15" version="1.1" viewBox="0 0 31 15" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="15.5" cy="7.5" r="6.5" fill="none" stroke="#fff" stroke-width="2"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/compass.svg b/data/styles/default/dark/symbols/compass.svg
new file mode 100644
index 000000000..69e306fab
--- /dev/null
+++ b/data/styles/default/dark/symbols/compass.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="40" height="40" version="1.1" viewBox="0 0 40 40" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m20 1.9866a18.013 18.013 0 0 0-18.013 18.013 18.013 18.013 0 0 0 18.013 18.013 18.013 18.013 0 0 0 18.013-18.013 18.013 18.013 0 0 0-18.013-18.013zm-5.0402 18.013h3.0653c-1.42e-4 1.0908 0.88413 1.975 1.9749 1.9749 1.0908 1.41e-4 1.975-0.88413 1.9749-1.9749h3.0653l-5.0402 13.727z" fill="#3c3f44" opacity=".8"/>
+ <path d="m20 6.2729-5.0402 13.727h3.0653c-1.42e-4 -1.0908 0.88413-1.975 1.9749-1.9749 1.0908-1.42e-4 1.975 0.88413 1.9749 1.9749h3.0653z" fill="#c2352b"/>
+ <path d="m14.96 20 5.0402 13.727 5.0402-13.727m-3.0653 0c1.41e-4 1.0908-0.88413 1.975-1.9749 1.9749-1.0908 1.41e-4 -1.975-0.88413-1.9749-1.9749" fill="#7f8085" opacity=".69"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/cross_geoposition.svg b/data/styles/default/dark/symbols/cross_geoposition.svg
new file mode 100644
index 000000000..15321fd4f
--- /dev/null
+++ b/data/styles/default/dark/symbols/cross_geoposition.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="38" height="38" version="1.1" viewBox="0 0 38 38" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m19 0a2 2 0 0 0-2 2v15h-15a2 2 0 0 0-2 2 2 2 0 0 0 2 2h15v15a2 2 0 0 0 2 2 2 2 0 0 0 2-2v-15h15a2 2 0 0 0 2-2 2 2 0 0 0-2-2h-15v-15a2 2 0 0 0-2-2z" fill="#000" opacity=".35"/>
+ <path d="m19 2v34" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+ <path d="m2 19h34" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/current-position.svg b/data/styles/default/dark/symbols/current-position.svg
new file mode 100644
index 000000000..efbf712a2
--- /dev/null
+++ b/data/styles/default/dark/symbols/current-position.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20" height="20" version="1.1" viewBox="0 0 20 20" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="10" cy="10" r="9.5" fill="#4bb9e6" stroke="#398cae"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/infosign.svg b/data/styles/default/dark/symbols/infosign.svg
new file mode 100644
index 000000000..e5edc7f34
--- /dev/null
+++ b/data/styles/default/dark/symbols/infosign.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32" height="32" version="1.1" viewBox="0 0 32 32" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m21.328 26.672h-10.656l5.3281 5.3281z" fill="#fff"/>
+ <circle cx="16" cy="14.678" r="12.9" fill="#4bb9e6" stroke="#fff" stroke-width="1.8"/>
+ <circle cx="17.044" cy="9.4531" r="2" fill="#fff"/>
+ <path d="m13.2 21.639c-0.74683-1.2936 0.69865-4.3137 0.73895-4.5659 0.05859-0.36648 0.19758-0.78092 0.03175-1.1129-0.08142-0.16302-0.1064-0.28119-0.44623-0.31578s-0.72948-0.37292-0.57448-0.69542 0.9925-0.85746 1.9-1.025 2.1216-0.35165 2.7616 0.14826 0.12674 2.4886-0.14606 3.601-0.31324 1.2519-0.40097 1.5782c-0.08772 0.32637-0.1317 0.69472-0.0267 0.80472 0.17476 0.18308 1.2421 0.20553 1.2421 0.68774 0 0.94-3.0351 1.4781-3.6715 1.4818-0.63634 0.0037-0.9794 0.02192-1.4085-0.58683z" fill="#fff"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/route-arrow.svg b/data/styles/default/dark/symbols/route-arrow.svg
new file mode 100644
index 000000000..9a307597d
--- /dev/null
+++ b/data/styles/default/dark/symbols/route-arrow.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="74" height="44" version="1.1" viewBox="0 0 74 44" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m43 42v-9h-42v-22h42v-9l29 20z" fill="#fff" stroke="#055fcd" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.8"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/route-point-finish.svg b/data/styles/default/dark/symbols/route-point-finish.svg
new file mode 100644
index 000000000..25d6b7290
--- /dev/null
+++ b/data/styles/default/dark/symbols/route-point-finish.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="40" height="38" version="1.1" viewBox="0 0 40 38" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <filter id="filter1" x="-.051392" y="-.045028" width="1.1028" height="1.0901" color-interpolation-filters="sRGB">
+   <feGaussianBlur stdDeviation="0.63706076"/>
+  </filter>
+ </defs>
+ <path d="m35.164 1.5803c-0.12292-0.00508-0.23005-0.00103-0.30664 0.00391-0.52686 0.033944-1.0338 0.21302-1.4648 0.51367-1.6134 1.1222-2.5018 1.4234-3.0742 1.4687-0.58405 0.046261-1.2411-0.10396-2.627-0.78321-1.1869-0.58171-2.4576-0.94149-3.748-1.0938-3.4378-0.40561-7.077 0.66202-9.9277 3.0215-0.47681-0.29919-1.0435-0.45995-1.6367-0.43945-0.25278 0.00861-0.50333 0.050314-0.74805 0.125l-1.4082 0.43164c-1.5254 0.46958-2.3784 2.0801-1.9121 3.6055 0.22846 0.74879 0.73886 1.3472 1.3906 1.6992l6.3477 17.65v8e-3c-0.0014 0.0078-0.0036 0.01738-0.0059 0.02734-0.03322 0.14953-0.19798 0.51965-0.41602 0.87109-0.42552 0.68591-0.67383 1.4882-0.67383 2.3535 0 2.4688 2.0214 4.4902 4.4902 4.4902s4.4902-2.0214 4.4902-4.4902c0-0.94666-0.29762-1.8391-0.80469-2.5742-0.19103-0.27695-0.91926-1.179-1.0547-1.3633-0.18057-0.24571-0.28418-0.45506-0.2793-0.44141-0.43149-1.2081-0.86514-2.4155-1.2988-3.623 0.40711-0.13286 0.79581-0.36187 1.1328-0.69336 0.86369-0.84844 1.7346-1.4668 2.4844-1.7422 0.39507-0.14509 0.74245-0.21491 1.1289-0.2168 0.38646-0.0019 0.82419 0.06463 1.3887 0.26953 3.0509 1.1075 6.372 1.1013 9.6992-0.56055 0.98315-0.48904 1.6047-1.4918 1.6035-2.5879v-13.035c0.003127-1.5646-1.2189-2.8305-2.7695-2.8945z" filter="url(#filter1)" opacity=".3"/>
+ <path d="m19.603 19.688-4.5433-12.62c3.1385-3.1728 7.8503-4.0076 11.358-2.2882 3.1372 1.5376 4.9933 1.6163 8.6237-0.90889l1e-6 13.041c-2.6179 1.3076-5.0292 1.3024-7.4253 0.43256-3.3809-1.2273-5.9472 0.31419-8.0134 2.3439z" fill="#fff"/>
+ <path d="m35.164 0.98047c-0.12292-0.005075-0.23005-0.001032-0.30664 0.003906-0.52686 0.033944-1.0338 0.21302-1.4648 0.51367-1.6134 1.1222-2.5018 1.4234-3.0742 1.4688-0.58405 0.046265-1.2411-0.10395-2.627-0.7832-1.1869-0.58171-2.4576-0.94149-3.748-1.0938-3.4378-0.40561-7.077 0.66202-9.9277 3.0215-0.47681-0.29919-1.0435-0.45995-1.6367-0.43945-0.25278 0.00861-0.50333 0.050314-0.74805 0.125l-1.4082 0.43164c-1.5254 0.46958-2.3784 2.0801-1.9121 3.6055 0.22846 0.74879 0.73886 1.3472 1.3906 1.6992l6.3477 17.65v8e-3c-0.0014 0.0078-0.0036 0.01738-0.0059 0.02734-0.03322 0.14953-0.19798 0.51965-0.41602 0.87109-0.42552 0.68591-0.67383 1.4882-0.67383 2.3535 0 2.4688 2.0214 4.4902 4.4902 4.4902s4.4902-2.0214 4.4902-4.4902c0-0.94666-0.29762-1.8391-0.80469-2.5742-0.19103-0.27695-0.91926-1.179-1.0547-1.3633-0.18057-0.24571-0.28418-0.45506-0.2793-0.44141-0.43149-1.2081-0.86514-2.4155-1.2988-3.623 0.40711-0.13286 0.79581-0.36187 1.1328-0.69336 0.86369-0.84844 1.7346-1.4668 2.4844-1.7422 0.39507-0.14509 0.74245-0.21491 1.1289-0.2168 0.38646-0.0019 0.82419 0.06463 1.3887 0.26953 3.0509 1.1075 6.372 1.1013 9.6992-0.56055 0.98315-0.48904 1.6047-1.4918 1.6035-2.5879v-13.035c0.003127-1.5646-1.2189-2.8305-2.7695-2.8945z" fill="#fff"/>
+ <path d="m12.443 5.5605c-0.08745 0.00298-0.17412 0.017429-0.25781 0.042969l-1.4062 0.43164c-0.5271 0.16226-0.82332 0.72063-0.66211 1.248 0.13692 0.44876 0.56742 0.742 1.0352 0.70508l6.7007 18.631c0.28934 0.80452-0.17658 1.7496-0.62087 2.4657-0.24593 0.39641-0.38843 0.86215-0.38843 1.3582 0 1.4241 1.1755 2.5996 2.5996 2.5996s2.5996-1.1755 2.5996-2.5996c0-0.5518-0.1733-1.0725-0.4693-1.5016-0.44089-0.63918-1.2934-1.5013-1.5579-2.2418-2.3038-6.4506-4.6403-12.878-6.9572-19.327 0.35026-0.25 0.5013-0.69605 0.375-1.1074-0.13295-0.4317-0.5388-0.72068-0.99024-0.70508zm22.535-2.6895a1.0001 1.0001 0 0 0-0.50781 0.17773c-1.7456 1.2142-2.9475 1.7191-4.0039 1.8027s-2.1028-0.23324-3.6074-0.9707c-0.98516-0.48285-2.0471-0.78551-3.1367-0.91406-3.2688-0.38567-6.8015 0.79683-9.373 3.3965a1.0001 1.0001 0 0 0-0.23047 1.043l4.543 12.619a1.0001 1.0001 0 0 0 1.6426 0.375c0.97573-0.95849 2.0287-1.7539 3.1562-2.168 1.1275-0.41408 2.3265-0.48934 3.8145 0.05078 2.5972 0.94278 5.3745 0.94118 8.2129-0.47656a1.0001 1.0001 0 0 0 0.55469-0.89648v-13.039a1.0001 1.0001 0 0 0-1.0645-1zm-12.424 2.041c0.31284-8.35e-4 0.62442 0.016044 0.93164 0.050781 0.12021 0.013592 0.24054 0.030022 0.35938 0.048828l0.85547 3.1836c0.65528 0.11347 1.33 0.33096 2.0234 0.68164 0.51761 0.26175 0.99506 0.47158 1.4395 0.63477l-0.73047-3.1953c1.0749 0.40441 2.1062 0.61526 3.1914 0.5293 0.30778-0.02438 0.61787-0.079449 0.93164-0.16211l0.26758 3.1445c0.78262-0.20575 1.4801-0.58403 2.2188-1.0039v4.1621c-0.60903 0.2756-1.2143 0.51379-1.8945 0.6543l0.25977 3.0703c-0.87307 0.2015-1.7194 0.24895-2.5645 0.15039l-0.75-3.2793c-0.48346-0.10035-1.0075-0.24278-1.582-0.43555-0.55238-0.18534-1.0808-0.31354-1.5859-0.39258l0.89258 3.3242c-1.355-0.28515-2.6292-0.18587-3.7695 0.18164l-1.1836-3.0918c-1.2554 0.48142-2.2225 1.2107-2.8984 1.7969l-1.6406-4.5586c0.86856-0.51588 1.834-1.0983 2.8867-1.5488l-1.2207-3.1895c1.1568-0.49526 2.374-0.75269 3.5625-0.75586zm6.5391 8.6699c1.2347 0.25629 2.2035 0.23441 3.0547 0.05859l-0.32422-3.8125c-0.99625 0.26191-2.1303 0.24535-3.6602-0.31641zm-4.3926-5.3867c-1.6252-0.28142-3.1297 0.080632-4.4883 0.66211l1.6504 4.3105h2e-3c1.1214-0.42976 2.4749-0.66218 4.0605-0.41406z"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/route-point-start.svg b/data/styles/default/dark/symbols/route-point-start.svg
new file mode 100644
index 000000000..bc81e65a4
--- /dev/null
+++ b/data/styles/default/dark/symbols/route-point-start.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28" height="28" version="1.1" viewBox="0 0 28 28" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <filter id="filter1" x="-.17373" y="-.17373" width="1.3475" height="1.3475" color-interpolation-filters="sRGB">
+   <feGaussianBlur stdDeviation="1.5925"/>
+  </filter>
+ </defs>
+ <circle cx="14" cy="14" r="11" filter="url(#filter1)" opacity=".35"/>
+ <circle cx="14" cy="13" r="11" fill="#1e96f0" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/search-result-non-found.svg b/data/styles/default/dark/symbols/search-result-non-found.svg
new file mode 100644
index 000000000..1815b32bf
--- /dev/null
+++ b/data/styles/default/dark/symbols/search-result-non-found.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="8" cy="8" r="6.5" fill="#f01e1e" stroke="#fff"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/search-result.svg b/data/styles/default/dark/symbols/search-result.svg
new file mode 100644
index 000000000..be320d0be
--- /dev/null
+++ b/data/styles/default/dark/symbols/search-result.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="8" cy="8" r="6.5" fill="#4bb9e6" stroke="#fff"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/track_marker_deselected.svg b/data/styles/default/dark/symbols/track_marker_deselected.svg
new file mode 100644
index 000000000..c4b3767cb
--- /dev/null
+++ b/data/styles/default/dark/symbols/track_marker_deselected.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20" height="20" version="1.1" viewBox="0 0 20 20" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="10" cy="10" r="8" fill="none" stroke="#fff" stroke-width="4"/>
+ <circle cx="10" cy="10" r="6" fill="#4bb9e6"/>
+</svg>
diff --git a/data/styles/default/dark/symbols/track_marker_selected.svg b/data/styles/default/dark/symbols/track_marker_selected.svg
new file mode 100644
index 000000000..139f77887
--- /dev/null
+++ b/data/styles/default/dark/symbols/track_marker_selected.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32" height="32" version="1.1" viewBox="0 0 32 32" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="16" cy="16" r="13" fill="none" opacity=".5" stroke="#4cb9e5" stroke-width="6"/>
+ <circle cx="16" cy="16" r="8" fill="none" stroke="#fff" stroke-width="4"/>
+ <circle cx="16" cy="16" r="6" fill="#4bb9e6"/>
+</svg>
diff --git a/data/styles/default/dark/vector-icons/compass-image.svg b/data/styles/default/dark/vector-icons/compass-image.svg
deleted file mode 100644
index d4a054519..000000000
--- a/data/styles/default/dark/vector-icons/compass-image.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg version="1.1" viewBox="0 0 140 140" xmlns="http://www.w3.org/2000/svg">
-    <path d="M 70,6.953125 A 63.047096,63.047096 0 0 0 6.953125,70 63.047096,63.047096 0 0 0 70,133.04688 63.047096,63.047096 0 0 0 133.04688,70 63.047096,63.047096 0 0 0 70,6.953125 Z M 52.359375,70 H 63.087891 C 63.087395,73.817654 66.182346,76.912605 70,76.912109 73.817654,76.912605 76.912605,73.817654 76.912109,70 H 87.640625 L 70,118.04492 Z" fill="#3c3f44" fill-opacity="0.8"/>
-    <path d="m70 21.955078-17.640625 48.044922h10.728516c-.000496-3.817654 3.094455-6.912605 6.912109-6.912109 3.817654-.000496 6.912605 3.094455 6.912109 6.912109h10.728516z" fill="#c2352b"/>
-    <path d="M 52.359375,70 70,118.04492 87.640625,70 M 76.912109,70 C 76.912605,73.817658 73.817658,76.912605 70,76.912109 66.182342,76.912605 63.087395,73.817658 63.087891,70" fill-opacity="0.694" fill="#7f8085"/>
-</svg>
diff --git a/data/styles/default/dark/vector-icons/readme.md b/data/styles/default/dark/vector-icons/readme.md
deleted file mode 100644
index aaeed7d9e..000000000
--- a/data/styles/default/dark/vector-icons/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-please put SVG recreations of icons in xHDPI here
\ No newline at end of file
diff --git a/data/styles/default/dark/xhdpi-ad/keep.png b/data/styles/default/dark/xhdpi-ad/keep.png
deleted file mode 100644
index ce7b6f20e5ba507cfda191ac9e712ca89db4a767..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 126
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k8}bl&H|6fVg?4j!ywFfJby(BP*AeO
zHKHUqKdq!Zu_%?Hyu4g5GcUV1Ik6yBFTW^#_B$IXpdxNh7sn8enaK$ZObiUH42(&k
RMjb$522WQ%mvv4FO#rSW9sB?Q

diff --git a/data/styles/default/dark/xhdpi/coloredmark-bg-l.png b/data/styles/default/dark/xhdpi/coloredmark-bg-l.png
deleted file mode 100644
index 447f41f0a5923f6062e9914955a4cd9bb5d6d82d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1052
zcmV+%1mpXOP)<h;3K|Lk000e1NJLTq002+`001}$1^@s6YPNrx00001b5ch_0Itp)
z=>Px&)=5M`RCodHo4alkK@^5#r|>nFBGJUia^u?rID(QCq{Zn;g?Ir9>eLjx0TuMb
zZ77lwL>|DoG?s<kAR*a_F9kOL4`azeiIwp=dl_X%TFrXBGxMKs&g^C8?AltCA_5VC
zh`_@o5DSCpolYk;9*>{TX0sh^HE1d!-$cG)^bKOM*e~o~B5z?kP9~FI3WdVR{2y2r
z7{GSBy*ZgoUH}xgT@XlHQWyf{5w>O`k!Ti+MFRFc`3|t#?WV7;uHH<i)3>m8?qO2H
z2l06PT{fG2pU>xq(#mYg`vwqRwtjJO@e1G$AaKh@q{X>CfIKLd%OBvGzb(qGe5x-1
z&(6*s1K=T4)>l?)SMU@78`Wy{hg~uIv*Y$f>`I)UpFaV-?<nOLJPNF{O}1^P*8Xfy
z0k&GLmoVf6vb-9y%Pihv+tje^B<X*i4Phhvqg0?$`Tbh0_DQL(8`XFM&<xuXctG+-
zYXSYh^>B>sS*23>rY%7opt)i2nis^dUB;&eh}+sX7S(GYJZ>Eu@3vusN3gsm9#Z2n
z%C`Th0_1ZZ1o(NkwY9fyG}@NC^L(`-%r}gFzki9A!svaA0D8GxuB7$GqUM2oJ#zpa
zL2enXi%?hISMfkj42(vjHdJW6+pcWTJqr#}sTAfP<P#7o9>`f0hv1R%hS7Xa-glp-
z0uXmL0(2^AX%-J*PKI7zU;hL>+xfhpfe$m8%p>Wftk?rNlk6Zoc3#?O7j>i<Acn$@
zNI`&wHMDC0<Qj&P2>`{~#Q;IB<Rra+qQ%<90MUzFJ##W?Xcq$nIaeN@Z|h{Sb`5~H
z341WdGyo19rX|)c28c<@Ko+z$I!!~n7$6Mc6qc(=tX&Kcz1VV<o`!Y}fX5C46l)g)
zWRw&D`Wla-)L}!TT~wVIAZIf$6plnH0w_$)(wP{_76W7@5YuGtQqt0_0+8`}fG2*Y
z^05O3Mzgp{6@Xk@V0@lfjZYO&tHyc=<*EQ=MGS64*5iK2Q_pBsk*Nld>#PiJR8i$&
zCDf?3CQO;)HIYSIF+H@7*qE<47S`y5Q^dwR#SKI)dR5H>|MmuiL0kj-VI0Z~E^27P
zqs^)SSs|mJFiiF!bj;sjNYp}2+L2kbO&uUBWgH%c^K0&hAyJDLv4OPB6M(GPM1<}K
z>4~Oo&!SUlr|M0F75<+Xt%^?@KI6FGQCs}vVb3eio7?G`2hJOy0q}%v{63u@^C9PF
z4%=SCqaB`m;2ahoaiR}x<}?I(^r@Es-eS?{W5Y!n!hM%NcNLl*6^{r+1R?@X6ZiuR
WA!`3fl#8bT0000<MNUMnLSTXv@Z3`X

diff --git a/data/styles/default/dark/xhdpi/coloredmark-bg-s.png b/data/styles/default/dark/xhdpi/coloredmark-bg-s.png
deleted file mode 100644
index c16c09845fb7c9de048e3aba025b441627700224..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 376
zcmV-;0f+vHP)<h;3K|Lk000e1NJLTq002G!0015c1^@s6bZxD200001b5ch_0Itp)
z=>Px$GD$>1R9Fe^m@y8*FbqW-rf!IpPOMyp^YjQk4qSs7Ru;qxoS^)VQYmynt-dQ<
zV#x}i_SerzgPo$tmNSquFy{<}so>hSUEx`~=v$2I`0N|TGki}EA>8Bdz6Su8@EZPr
ze=}agYfIPE0I1+c_)z0Ll}mUA4!;g1POj&@zTgosm-m>NPPpG6so`hYBUrwtDyuD)
zynI&&EqCt=d?^a}37w64w_k{YOJ(?%rGlm|wWujID{yI$5OV>};zVt7O^X@tDl#R!
zT+;$v32dfi0nXZ6ZE{Tua5fxjJE;XNz}aP~?VuLS1&k`AvBGLpdeCXqRhuxjPbrkG
z|JkH44S@f@wzQl72tTGh^?MMJ!2jgYlYCe2fcs-?SJ`aP=YQDPPeA^jGmtYdX$D>v
WUVk$$)XNJ10000<MNUMnLSTY4fTV-~

diff --git a/data/styles/default/dark/xhdpi/coloredmark-default-l.png b/data/styles/default/dark/xhdpi/coloredmark-default-l.png
deleted file mode 100644
index e68f92818a2f3c34c67b8ac315bdda82d2ca384b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1598
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

diff --git a/data/styles/default/dark/xhdpi/coloredmark-default-s.png b/data/styles/default/dark/xhdpi/coloredmark-default-s.png
deleted file mode 100644
index 6219cc41be3c24bea4b10a4054275adc18faabf0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 603
zcmV-h0;K(kP)<h;3K|Lk000e1NJLTq002G!0015c1^@s6bZxD200001b5ch_0Itp)
z=>Px%6-h)vR9Fe+nY~WKFcgJJrw)~vft>+Hn5sSl6!l&D2JLHfWu!a=6O8Zx2!U9T
zPzN^3cZ5@2T?O(}w@s8I9ode3ukUdZ$99svEnvA^cIc)Lhwuy@29oT(20oD9z`G<#
zzDb)41b5*WzQdwWTiJ9Qshq$^@EKNxY)6d|Pp}D`R8^Z{Ctpde2S5SB>x|%a=>yK-
z5FW!`pz>F62Gu4D@>yT;1ebNEzqmey`+0XwZ9-ewcuex_cT!K3dZ#^JxNu%JAlX3K
zderNkCpyjEej-!gM`cB)?PUwSc=b`A*`8qZ`LWQWTKZ0>qSI79pnvSgY5h)90_#Bk
zou0-D3g4O^EYz14M7sq+3~W^7H8bZ<WJRNvui%qpg+WpKzuLtZIW0pi<}5is?S*yn
z!PngR@O`@K{9+8@T6<ggAZ=aM{H-(eeY)!WVhrKha9BLqLZtko^W*z;)mtd?)-6_V
z-fyNCyIb69m1nV7w~rWieBBs|*!$(`vWU@tZDI)5e%fLakKuvsfc%>)mo9EX_(|y~
z@(oU16F=ClI=>i0xK2(iE^Q%F{=)gWcjfIDnQ<DqfLVK_5Z=xut40p-?c1aT;qBa(
z2J!7Xh>&oBN4|YWPeFLq!$uuI&R{bS8;$s^JCCkPsQ>Y@gr`7ayM8F7!j&Rkvwbap
pA^Ba8jXPQ%@md=9VQqdI{s8%#_`zJ;d%FMt002ovPDHLkV1hkh9s~dY

diff --git a/data/styles/default/dark/xhdpi/compass-image.png b/data/styles/default/dark/xhdpi/compass-image.png
deleted file mode 100644
index 95f8a98df4c023000b7978e4946072c47b708b03..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3089
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

diff --git a/data/styles/default/dark/xhdpi/cross_geoposition.png b/data/styles/default/dark/xhdpi/cross_geoposition.png
deleted file mode 100644
index babe661f1f1cb099c7da2f6bb5fd2ca157bc8772..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 710
zcmeAS@N?(olHy`uVBq!ia0vp^J|N7&1|*M957Y)yjKx9jP7LeL$-HD>U~2GmaSW+o
ze0#^xi#bt%H6dJ8LRV!a%W9cJhx|S;B~86%#_p9p+iOolQu;$#pX9`;2@9LJ3hzyt
zF;}$GC$UW7eY>IcZsnhU=j7-d6OrC|ZC>v46OR)1txd14*-$a}d9S@l@B4(Ej0tli
zw@h1pYBB%ss@#c8xtq7`R0}Q%TYdlidq1_w!7P1+=a{Yst?`k)W<Jqufz{k|b|uR$
zzx3XId+)}><=ukkO!pd<Mo3F=uenuNxi(YBre19Wk6Z~q(_)u>4hi>~(*}fb`*YW;
zC-Jj9XWn|JpY?N9P*2ofA19_a>rd_v&DHq*c|l{9Si9JDi51oxUnJhjw~&zwf4=$6
zpIiDoUwPS@e_zb_k|vSd@ORdq=<20X4y8gt=6|L5ycyf1Z?WCtoAgHd+S^}`R4xDS
zod0o>PwD0PXVacvjrR%^3BS7M;Nzk{va)SI%g-F_*Zm;2>M3gi)9g?6tYY=;jBn2^
zI$7#C@6V)|_>-x3zcim=5{?K^h*-x*Giu(-!>0mQzY2(dYH?N~OwGWYGjjePZnH!C
zrzSHQp8l0BWOSANeqQRuO|>;qHc<}_=auX1)0wA}r)%(GdQvTOc5hJ)(-l)0V8UeZ
MboFyt=akR{0Qg)mS^xk5

diff --git a/data/styles/default/dark/xhdpi/current-position.png b/data/styles/default/dark/xhdpi/current-position.png
deleted file mode 100644
index c86ccc2c1e929615aff7aa53b9c532961afb7861..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1185
zcmV;S1YY}zP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700001b5ch_0Itp)
z=>Px(TS-JgR9FeknN4g=Q546|`<%AZnSM-*K{RQF#4NCos8qtn!h*#htZcBrwqYS6
z5((+b=f=v)LYiP<Awd^}L_#FmASwtgnGQA6j`qDb?>YZFy<<8ZH8eBxPLua>-@Etx
z=Dz!J{-+B4r?tnnG)A}W=rO|0-MVRZl5Tb>s<sNvd2aR%Io7aaS?}!B_~X&Lw;v`3
z2PXc<mGY03%=NvO<7OmsP}R+?|5Dd=tOr&ydG&eUk$$dcm0P!5KyB@@OY!=)=oLj#
zB4}LEbTUHCWHdIBYM7+z2A>1u;m@|nb!>9^Y)||kJ3UTb))7pe=OurRjUIk+?kGUB
zqHvzWUjf$~JRNIV6}v@>(uH=6a4XeC7Ly(fbJ1U`3)c)q&SZ+Fl3&SAeaqo^-tdn%
zgFA<=o*c{-ls?YqLE&E8-O#@5I*%$<ZwOKSk`-hGL#10Pv(%nU)6Xv-$;qU-hT>)t
zpZ9TZ-ryUrR1;dMLN3!boVs=<(9(9Eua$;q2L+dRl4b_}@Ot^hXd}?Nh=+*ApMPB8
zAG|xdX?tK~;N}3gG6%90paM9(F?5_%jY1u(DbUhhK0%pp;*01Fjbx?1^Vl_d7}8|O
z`^DAg0P<(uBYKYEnz~{<))w|jiyao;Yk@j4!!0yDJ|-X|>o*U5eROBmn4ATO2@zVc
z@*X#$pyw(HCqXg$_4*)L3~2<z@o-11Kk@8ABL7@o@L3bHl_vzo9F~x38GOMfCS#6)
z@*Ss22&{8hN-#F++M=?!YG?R_Z!id!8P5{X#3GC`EG4xv>3fF71cv}zckIe8>=0Ol
z7rM?Z<j27`7{G!pH4hkQX+3}&>=3m!$$<SHEIOhRZ2Z_;v3=Fr#1_gd{AsreHiS%o
z!b~c6Z>{8y0E1jXz@{Re6M!6*_{9(*2_|Oaugk$E8$u?(m}CK)ibz-h@`~;k!|o!C
z*;E;(BiQtdNfxj%Ah`fTB<vTHEMQYzC;L_aa(M0+gJgh#O@;c(-Poeg4+rQOVa%pN
z8sY{5$1f&Xz@|dC0u1WQFD6;Qrb1K;KuAMYU$r(cK&HaLrb6*UR71By8rIst02VNT
zO@v!e`~ZV)t+h!8$s~2Lxv{T*1aVlXGgh;h5SlstZV*E)`J^|#lsn53J%|gWBhY&g
z)wMF|dxk|UE3yZ{q;>c8zlJ7&fT^}FnHn3V%;*Q+(!Alvz46t|Bl0$~2LYHxu0*6G
z_(eIB@SxHLUjmL(AvuQMNu|8J0|fLai|1EJM?mpIROcg$3Q=aKGL(A%3Oz@e#K_*4
z7kUQ@UCjc-16KA!$dw=+0mTndjSN5~3_T~{+$=d0>9fzy9J*NSXAU4<Kq3dZ5<o)n
zBhe!?YjN!b++)m5e&R3ysX2ywdTRd(Zcap2h0PXDlEQLa`y%}|AD{sCa{{xlN6StD
zqmpY+S1$!zNXgeGvJepZeoLYkaS~PQ-w?k5_umlYX==Gv00000NkvXXu0mjfOTr~u

diff --git a/data/styles/default/dark/xhdpi/infosign.png b/data/styles/default/dark/xhdpi/infosign.png
deleted file mode 100644
index 4d3a2fb442507fe86c784a692c1c44c11ea8579c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2913
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
LNkvXXu0mjfLldEL

diff --git a/data/styles/default/dark/xhdpi/non-found-search-result.png b/data/styles/default/dark/xhdpi/non-found-search-result.png
deleted file mode 100644
index f73b714b3f0cba2ad7ef3931d61498668e22e234..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 395
zcmV;60d)R}P)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I0003}Nkl<Zc-qBR
zF|NWe424ddf*I7Atr7=d<O*<w-hk<M<PeBU^c-C~!PZhFV2QuqSBA*)M<t5zlb%$$
zv7eIKjyo9xBFdNrvtriFhB<gP-d6cF*(3r|aK<c|R~nD2_nF0tZka8`qeYBQ1gFdc
zrNaR+$B3Rtf$MwsI-lvj+tF>krf#tS|DNyrJ>ebJkdD(^adoH9r+XZa)a5yK^Z8q1
z4c5X(+xh?BRKQ&>ZrE%P^drItzKZx(%idOs_Nx^FMG?M=cnhsixD>~$?KEcR+Od~m
za|r7c-wBQ>h*(;kXAmxA_WDFh!#vlry?}5P7*G~)NJ_*Ms32Si2GnVCVbr-m4dEs*
zpdlm|MofVQ!b4y{H%cyym;%FhgqKSaxS1WbS#nvG(~nsLF>9G7mxS51Xfg<xj6SJ{
pJ=h|KJ%jPqVxYJGg)#eS`vtNw;MeOnDp3Fc002ovPDHLkV1gM;vH$=8

diff --git a/data/styles/default/dark/xhdpi/route-arrow.png b/data/styles/default/dark/xhdpi/route-arrow.png
deleted file mode 100644
index da9afb4c42f7c22072d21fbada048fe7c269c470..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2219
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

diff --git a/data/styles/default/dark/xhdpi/route-point-finish.png b/data/styles/default/dark/xhdpi/route-point-finish.png
deleted file mode 100644
index 4268304df26daf17350f38e39501c2adbb470b1a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4842
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
Qa{vGU07*qoM6N<$g7<G__W%F@

diff --git a/data/styles/default/dark/xhdpi/route-point-start.png b/data/styles/default/dark/xhdpi/route-point-start.png
deleted file mode 100644
index a6bb8caef63b89cf05bbd337e5c3c4fda0686695..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2484
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

diff --git a/data/styles/default/dark/xhdpi/search-result.png b/data/styles/default/dark/xhdpi/search-result.png
deleted file mode 100644
index a85cec856dff45d1d1dbbe10ff9c3c9e4285eead..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 745
zcmV<F0v7#=P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%qe(<TR9Fe+m%nQiK@`Vl6D5hlAzlzPAOwWiSXczEku+Kgf~mw-{{dS|TmJ!V
z#Y!RAY9lrWDJ*PqAc#c_NFs8eNzk}{KhHP&%QJVE?0KLM-p$+D+3)weGqdyFh48;y
zGRy>|X?juPugNdT=j3PP*a!K#{FQtqNs`xU>oXBA%h%+C8e^9SQLyg}2xML$kL4}E
zHh1<y`{Pbn-P{cuU%!V>yFcg-C#NRD>0?L2;_Ostoth4_)05V(pSJvlX5?M$sJ4F;
zAo3**ekyN@D1G#{o4i=x4!<a?F!}X_!pn0r;pVwUDq-Mn$*)Vq%Y0NG^%UUb&o%5Q
zZ+!pF=dit(=1&a}%}gfY&V>^;BO3lqex;X)-vs!yuj+y3v-e-Z!%jC0N1dw!{Py`q
zxO(<Doy^2ybvc-^s<Gxx-uy7+fFk_CTG#dsm~ya7RuZ7MXXmz9bEf^EZ(d{o11vDX
zc8+XFNq~Cqafb~z?3!nYJp!=6^jpRehh+k!j6-IDPmSGPw}A;Z9L{AFnE+jJ!r6ND
z`_$~oA%DPRU%43<aZv!rs~s}5qc9FIH{&8M3gB$F6OMKi#_8#1T*O5ImRREP8b{XI
z7O-OyD+#ERs~=YOg%@Xllxm5k-_r-ZPttPRh(Xq)4)VEWwRp4cmW=6UT*O5I6cd(G
zX-8qCYd7N}E(%zogM41>q^}MG6Kpr*BF?y!r6{916cgn0x(!S(R65RO6qx`gyh}?l
zK|Zg`zyj0pj3Z)~1W4Hv-Dp$EP)yVz0SvIbI%+#d<j<EN>roA-c#HMAwa_?}2*@c&
zeC;Vnz%E(OmsGY|(x~y2WKo`r7*A1J5HYWKq-A;J+PBqgjOUL@Rh3sV6cc~<uUS>d
bKXv^Rj-_gYrX@mk00000NkvXXu0mjfs)$}F

diff --git a/data/styles/default/dark/xhdpi/track_marker_deselected.png b/data/styles/default/dark/xhdpi/track_marker_deselected.png
deleted file mode 100644
index f259a11b8369f08a5277ba1be36fb1154d166005..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 819
zcmV-31I+x1P)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700001b5ch_0Itp)
z=>Px%?MXyIR9FesnZ0WiK^VqoFG6xAiXY*`2wI$lMFb%T{sFcc4R-cop;bzY1#RO$
zptX&Na+YE%2$Cu(6ii`ZPGb~F)FfcCKEL%Q-Uqug+3a4{2VQn>=Y5}j=AGTycjf|<
z5m6M?6*?)Kkd3vOPR(MQ&FZ`n1i=Cgg+iigvb(Z5*-k+Wv9;VqigZL4%2s8&1stJl
zBp0C~nv#8z<qbHeGK*AjAPZ$%vZ4TYC<}HZQ~_1lV_Cnzy{cX!<w)lGDb6N=d%80z
zr_e_1!7=R4VuxZ0;-P&a>$u(>WPdNOZ<^Oj>*me!hH3u#ZN6=6#Z5;BE9UtAedhe=
zpt(>RGNVHSHpF#|<Zw-M=2PpqEkxpY?cd9e*~X;fR|$Kxuxeg@Tr+<qC3zZCQPaf}
zRdc<5z#R1x`dJ~TCGrQX#9K`3#3_!9-F)@MyzmeQF&)5{7-Btu2DHS8GpOt_yYneZ
zojjj^_-P)#TQQ777I3p0XAYW6Cx>0(WUsC)F4+v;)`e7Y^nN$uP(;Tbyj}6hBwB6}
zV+CH}M-q7E?$3SCoVj*hM8XB916OIUXn3hg#?zd6A=Wmt4s0(oTyQ!tjy5t#$&?7D
z65iIl0VmuJOd^naE)hI?uBjw3IHdtjkGFaPffSpGU=l709^7M2fqWr~f(N%-p#6Lm
zA<~087MS1bnSU=LhPau=%ZI-xcyKqlJ1ek6P?Zz~5AH>$KuV^f;K3aWWZjww>bW8Y
z8BVwzn8mM==0vecJ(oA&^eAK-mDY-XK1~3{W_4h@woP;OYJ&?-2j<acNAFphGnMf4
z*+YKofHWet(M`BKs_R(O|530~xvFC`j?SCQr-sd)bB8kxH^WM-M>UO%nU<!1qgK{M
zQ^%7pk)>O9_Kd1ThO)gv*dwU>f|Qke>jS|OS>DYfo6%M#LmkVv{bohBvRTdz%r24T
x-2(0s$|m|fS>HC%JLbW5F|Koo?91N}e*n0Tn=XHxgNgtE002ovPDHLkV1o95cS!&M

diff --git a/data/styles/default/dark/xhdpi/track_marker_selected.png b/data/styles/default/dark/xhdpi/track_marker_selected.png
deleted file mode 100644
index 3e2afa7596ac56d0b49cec3625b396e6d9fbcb90..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2123
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
B1&06t

diff --git a/data/styles/default/dark/xxhdpi-ad/keep.png b/data/styles/default/dark/xxhdpi-ad/keep.png
deleted file mode 100644
index ce7b6f20e5ba507cfda191ac9e712ca89db4a767..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 126
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k8}bl&H|6fVg?4j!ywFfJby(BP*AeO
zHKHUqKdq!Zu_%?Hyu4g5GcUV1Ik6yBFTW^#_B$IXpdxNh7sn8enaK$ZObiUH42(&k
RMjb$522WQ%mvv4FO#rSW9sB?Q

diff --git a/data/styles/default/dark/xxhdpi/coloredmark-bg-l.png b/data/styles/default/dark/xxhdpi/coloredmark-bg-l.png
deleted file mode 100644
index a4b69091eb323566a1b5ccef86b63d36786e7429..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1738
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

diff --git a/data/styles/default/dark/xxhdpi/coloredmark-bg-s.png b/data/styles/default/dark/xxhdpi/coloredmark-bg-s.png
deleted file mode 100644
index 676fe3e60e8f00a67b541576d17688819e62d87f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 581
zcmV-L0=oT)P)<h;3K|Lk000e1NJLTq003P8001or1^@s6%u{Cq00001b5ch_0Itp)
z=>Px$|4BqaRCodHnlVnpFcgN9R)VP$8_Y0(#0@w>2d+?wJM<7m;w}uFfEysC1I(~-
z0FY4l|Ed`xRU&Cpe=T`WdIY4{zy0}PJI~Itupkfwf<O=m0zn`M91?;25E@&S<+<8<
zE5DJS$xr1c@=y7P{9XPmf6VjzP0z4x2nh68ekU*FZOrex+;|(^!IlxQsk|+06{(ra
zPX`OJX~zX=Bwy6fb^pWljheP$Q11!MME=yB@x~fl?_^Lw|LUxOIKp=Yycz}99}!;-
zhG5)RWOn>qRGNc+3bGf?l!h;^=ssPfy{&tZUnY#arL?ZKpZ`gyS(BpYxS3j$61Y2W
zy_tWZjE?j|9ZwD2te1-PtHD9n)Z$P3SE}REy`WMC<n-cP3Tc==3Ejyn(lC7zy0e9(
zVfrL=r)NpS^s(KG7Sb;fKLV+LYau-*^vOu~0R(B7J_+3?KBQs#By=CKk%sA$(0!&!
z8m3P!r13?XI^@=$;Li9F=G+T*Yk-_y4Euo~4(hJDi%l<9k9_)S4ATD4zqk()=4n;4
z`C2!z?4HRf;`_dKp(;1pV$ZtHHAi^jHUNQN;N#v41l|$f_jL@{NAJ=Iob5CP$=5Op
zc^7ke{JKTEp2Keo*uTBCi|*5#j;jX1DTBD5-V|887X*Sp5C{T6AP5A3UJ3jHEcoRJ
T{>GnY00000NkvXXu0mjfNe>SY

diff --git a/data/styles/default/dark/xxhdpi/coloredmark-default-l.png b/data/styles/default/dark/xxhdpi/coloredmark-default-l.png
deleted file mode 100644
index bec92faa1a76aa8915e0eb76e66f395e83ed0d11..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2667
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
Z{0CEoi#&~<R-*s_002ovPDHLkV1j9n52*kE

diff --git a/data/styles/default/dark/xxhdpi/coloredmark-default-s.png b/data/styles/default/dark/xxhdpi/coloredmark-default-s.png
deleted file mode 100644
index 2362fb5571741b5023bb7244c956b07b13f9b61d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 973
zcmV;;12X)HP)<h;3K|Lk000e1NJLTq003P8001or1^@s6%u{Cq00001b5ch_0Itp)
z=>Px&he<?1RCodHoV{+;Koo^B1r~Lh08%;{%52RGAOS585|rg7@&tJRT9Uj0Qc}^<
zq(uBQNQeTI2w1*@yppw=YwzIsaqKzL(JuD*{v1!n<2$odw?>ZDYPCy<PvHXIZ*hn3
zU*V?~-|_vls;V!17WgQD(0lL@p2I)T2WqeDbp4)>-&wXrq#bw!uV4tsj_m2LqM)q+
zqSSB+zrh%gUD>bOerNj~A$H*fOab}PGh)6#fPMHOh1xA2^0%K;^(vQh5`Tv8*YNHZ
zF<jE-4SWkfLd{q-bJ19>8O;Ou7(Ry&VIO|d;03dslfH(NIgj8A_ycy~7blP5BcH_8
zzPV1<cR~KM_IRJX2DK$ojp2Pm${B6E#NG@_*F)Lqg5sF=7*B$lrF1<se{=rjrhr5K
zEqhRQEhwJp&T2^Rm6bWizr!a(1h%e~-Nrs2PAsi!Z}f3e)r*fc4_8l&BKTS~*@sq-
zS6tJ3fg&lr8Cp14ixcw`=Nf7(9L4mV+%{RNmSVlypQQ|lIIM@O;+sybhGbNHazWF&
zL9-O!8zz6ynob`2+8b?qlC)+l$2o!~9?kz<xX2MtaGzwRdAU`dP1?)X$q|owy9<gl
z`n>)2I*^E;dfj)G8!mYbe;?7WX}a;N(!wSbr{ax@6rwMT3{*?W3Cq6~Z?ITXh<?wA
zR>iBFu>4!`28%U?=&Ay`plV@GSpKbegT<Otbd_gw!tx(obk_qes1VEst}uAVVYKFf
zcI`Nx<PdQwCdIaiYvPJp087!+wb<Z7?plZC--_3j!+#x1A$qny;~qt<VZ@5J$K3X(
zbBeAdww$p1Pg-=XY379Ge-ff=tD6g2M9vAzzZGxJSp9sfmH|uc#ZR{3tr7jER2k2Q
zXFC!Lh+gXHsqY1%mzAT`qRSt`cdd~I-F9K+M-1~>BW*-4y8*1;5c4=at?YY=DX_~n
zqSw%x$#Cl5zLcQbF|c{i*p+=36i?IwmrIMJ$4Id3WlXAg;|$?vy=ymmJ>9yg2w(Q6
zTjIn#-t_psZPPRh3i*q^_#9KW!L|`VV|>@cHKgM56MbLHU{O*SK!_SHp|z`*Q-e@`
zU1!}$WYr5)`5mbxP|V{9uUd_YWEu{vvM{HdP<vfB+Fwj(o4ss%(-2Q%ux2`X_-P}M
v);2{gENc;2D?Q?8s0D}<R`W;we*^plFDR8!#k6#U00000NkvXXu0mjfej?f6

diff --git a/data/styles/default/dark/xxhdpi/compass-image.png b/data/styles/default/dark/xxhdpi/compass-image.png
deleted file mode 100644
index 887097536a05e5c684169b3d1d0946ce0578b8f3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4931
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
Bk){9u

diff --git a/data/styles/default/dark/xxhdpi/cross_geoposition.png b/data/styles/default/dark/xxhdpi/cross_geoposition.png
deleted file mode 100644
index 633d346b516bbcb6a25c3f390bc4dfe82777c011..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1169
zcmeAS@N?(olHy`uVBq!ia0vp^MIg+<1|<9Mw$=hE#^NA%Cx&(BWL`2buy}jAIEGX(
zzMZ=<J2+6}*yoT9T)9l87iTGUKf2~yP!L$a`%Y-rSN~T68y;M7wOaPz%E6tpHFjL{
z^jI~eqp@P&hd7S)?_H}k&hDIlzxDR?JLUdG``%ywJS)vYKf9psOp5KPbnWRDTOLoZ
z@%wB#i<xC}?{2jhJJ0?$J+$xUuZ?Fv&-(1Cci+e8^{*u#yMG=^lXY=fcl*wkpQ8Q|
z$9TmQck;#fr3+lYc5Tz&zkk<0EchWL+`n<!`@?c?mP+P`{ycNy!KGU-zW<Ki8~1+Y
z!QH((_wN0>;cni1Svk3XCtlv&sQfQ2sOORS6sMlfisa8?M;36+KKqPKPCVH}YVOvk
zwfsLncgo%ueI8`LDK;uyfN?3$#-!YR=A|7c=JTpB3r}ZjEV(JB@1gM6urO6+g5K>%
ztehz}YU_GfE~Q5AQE2Qreq`!Ihg~_{;wlq9&e&lj<S{+>V-t&!oN%}s)5}e|aT6Sl
zB|kdlp%A<6D7Vmw3ZEEB&LyX}RX8$9_IGM44`#zJBqiIHbj9Sz@2${_dlo+V;<>AP
z&TQSswJRzv<8|zTU(vr`WS<Sm-*$!3VE6R%eX{+z^B!O7@`|~}e8(@FrIcarf`fX@
zM~<6atlZHUcCos;nt#{bcavAuEx)mNV-))Zn;W|v>Tlh>Yb)D-{ODaFyG5d9slQ)b
zUADS>eer^IYt6NaGJn6=C4S{smaNA1uh;g=uYOvX`krsX4-ISS9pA+IOMBirbY2yx
zS1zo~RepOg;e+t@kQXIZ(mTYGeU+y%?^q%yBQxj0;d3cX^_uCASp*E@Z^o2;pLO%y
zlscc~m#>HZOpE-sFU$6!=^dq49Mi*UT5Pv<vi5F~VKCk>TkQUu2W|20X8*UZf8kS9
zl>9QhB%t}!pE>?E{)KO1j9zY^en-B{T5qis3m=CHql<@tN25w%gG-xMkb<X-!o-DL
zA|68Q9w{r7SSKA}6p~yu@X~D2uIH>TE^^GB8JL;7Z~Gqoqt9~`rf>VIx4qv_Fe3I`
zM(bG<t=m=qHw9j`yVX*kF3A7T=W+b)s`IzpXMcFarg5_RK-ffvqO9V}&#dN!^en3V
y^1iG1q~6BR6h@|9Vz;Z3{~nUP*L9ZXxcx%Ijfxp2^P7QX41=eupUXO@geCyBgcIoi

diff --git a/data/styles/default/dark/xxhdpi/current-position.png b/data/styles/default/dark/xxhdpi/current-position.png
deleted file mode 100644
index b03fe0dc56374a400fb9185b21652b086c1d8bd5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1728
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
W|3<sT@D8c~0000<MNUMnLSTXePfb4n

diff --git a/data/styles/default/dark/xxhdpi/infosign.png b/data/styles/default/dark/xxhdpi/infosign.png
deleted file mode 100644
index 28f4665c83596c1f5a3c34faeae1a9d1fb7994f3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4411
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
BO4k4Y

diff --git a/data/styles/default/dark/xxhdpi/non-found-search-result.png b/data/styles/default/dark/xxhdpi/non-found-search-result.png
deleted file mode 100644
index 4a5a8d5d0e215594fb2b05b76c8a69b4464a8d24..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 572
zcmeAS@N?(olHy`uVBq!ia0vp^x**KK3=%mav;s)g1^9%x0_p!$0-v0nKgh}bT)zBE
zQqs59)*mxweD?PKXkr31{)4jeuRVMIeg6FK&!0c{?tN=%`S<tlm-u+ijqASvT_9N!
z<QL2!as20*P36z}*egEBJ^m*AFV$#<pYgGoX)7ZVG#D5dLp)s^Ln`8?PQ5<qumX=O
z<M&BP)_zRy{Qm!!zZ3h;%IA@pmHwVNi7hHB-+29vj(^iRU$&`bvuo1#9q)O5FP1*P
z%liJSeH;JWT_W8QXznV)mOQgNkI%5n{%*<VoJ;;cH`H=}-<5M~U+$@2|E_Ik&rpzm
z60JDZQEa=TfA5)g1HA&?Pev@C`)maY=1-Lhwq4lW&?xZf>(XTvu?yQLlndsy*(`kg
zjU)9_;aBIgfsP+a^CK!2%wqT7`mgGk>#HYCx)VLVUw3oj+UnA{#o*Y*MMW2<Wh9(C
zr?EYX&3D3v$#$<rcV7!TCR002yKJRy`^{fDVQ<``%|3s*x$ef=Z8mMUzG#>A|GMyQ
z*-_s!o^GegomQ%@_1CbiSn}2U<NF!)k!$~XKbpV%ys+`=Wo<_epV4|H!=jmZEa;i}
z3Gs4gzkAkS=DOXV-gZM&es@HI`1!-<m;bk|mwNwG-eBJPD=%NwECNOXgQu&X%Q~lo
FCIHZ}JsSW3

diff --git a/data/styles/default/dark/xxhdpi/route-arrow.png b/data/styles/default/dark/xxhdpi/route-arrow.png
deleted file mode 100644
index 997a21da11a7b2ba757670cf3b4c7aa996a57889..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3396
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

diff --git a/data/styles/default/dark/xxhdpi/route-point-finish.png b/data/styles/default/dark/xxhdpi/route-point-finish.png
deleted file mode 100644
index abbae5688b42d931ec87b524269f777f44dad0bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8133
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

diff --git a/data/styles/default/dark/xxhdpi/route-point-start.png b/data/styles/default/dark/xxhdpi/route-point-start.png
deleted file mode 100644
index 996abdd1988b7553d7f31ce3d8204c9fedfe48e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4137
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

diff --git a/data/styles/default/dark/xxhdpi/search-result.png b/data/styles/default/dark/xxhdpi/search-result.png
deleted file mode 100644
index 45beb049e8692c836647c980a7040827ea552f88..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1134
zcmV-!1d;oRP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px(C`m*?RA>e5Suso$K@|N5az})KK!^!3XJ`a5Di%<vowb-)Q(<ClVPT^MHWns^
z)<hB$Y7?=hQwu0WjEEExFNVY*AOy^D2<LlyJCoVD-Q$isZ}*aW$-kSO*_r>|%<SyU
zUy(ZMJy2E;#LB8|RL*9z7jZcP8-Vo~hNP?-wutm}EEfC3f>1%yuxGGuuu{P~tV`k5
z1)L^fFJT9;a=|v(R`NJ1N}57&5{Hv<*gaUnbhxvBD06FR`LLdmwe*3k?;Xg--l5Pz
zN1{Qx5{=T`+$dMN;xg3TEUirqW_701unE{BOs@<xib2r=K)xFdzJgsh8-D*YEpJl0
z^7(g04zp%SaJm6rFPw_Y&18#QJ>6{I_!b$rA!5xg@VhQb0LWiL<!RVi)yU#zMkbfH
zWoc_)WgY9kzr9Ju&b7%v2M1T<J5nPMv7mDT5=RPf$-hJWR<?l&D=)ro%XI2bK$FMI
z9!Z{*JAG}^7}Jz?(9*S|MCiNy+`7|d4rNZybDlr>xGD1+MNd(`W&`sEJLB@;a)<eR
za3qEbO{YKsAkQ(KfjM)Y<nPa}%a7f^fdnd1aHi#iJRR;bMev!p0TI5vmbVlbBpxH}
zkms~v&;M`o^i3c1MV~Infh(Ucd`AGi&oy}&<}8)Zm$oWC=Y822nS3Vh_P47XF0p+W
zg_O!r|3M?b-gn4zwW;(2tDG15r%(EJ!L^p0@{lJ0z0X(ssJfF&WmvF$kGkAEbn*nC
zbPVR?^Cea8I`8pT;st$^g9~yZHxC@5o*a=|>Y8uZuwik~+!Qa501Oe|xV<dovdQg1
z*dPaTanb8?RM)wwqOWrMdFOH#8?$2fHb(u5C&__a4DigM;TZwso>wK@RYnE#UM`v=
z`Pl+`6zN~s5=RBxo*U2{nHMO4`}wHA;!>Od9!8=9i%UTPnzQd7Lzh-JQHYB@g%~|>
zz++%kU~$nL$<Jn~3wef(3M?*~V?hBtfJX%umx2PmDAI$79z+F<WEfyzOv9c+Jh(d;
zM(BglgRnsk48s`E9GT}4;2xk?SiraqLmy#-9E=#!3OIT~k{$sr+1H9R<2GT#;-I-H
zUVZ{5QRuwI7<6LXCM?jm5%?k}a`PZhfICD}>MjPI!h+>{%AP*tl_$U@`w;(oOfzD}
z19r7RpGLHf`)P8@gRcN6P2o-kS{*QA#-LNRKwtD}V8Z2OWaW~93nflIWIO|NVnb04
zYy}FSK8RpMx;8_L6hOFV(Ao^{<|Jqld;>Z`Ugp<Kc-;_DyB|0V5qz-6VZNW37(HMx
zfahuTiHUVPjZaM6Byyi+Y!7$~!KJd~PfSkDQh)GVMCK!3soXvHLrCbKSqm<s9=1nZ
zxT_U|PK?{|;H```R}JHtgCDvVSWrj32SV<Ff8^D!<)m^QvH$=807*qoM6N<$f(|1H
AG5`Po

diff --git a/data/styles/default/dark/xxhdpi/track_marker_deselected.png b/data/styles/default/dark/xxhdpi/track_marker_deselected.png
deleted file mode 100644
index 70bf17f1680f44f20ce56057a84f1e5d218bb74c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1332
zcmV-41<U%0P)<h;3K|Lk000e1NJLTq002Ay002A)1^@s6I{evk00001b5ch_0Itp)
z=>Px(?ny*JRA>d|Tgy%qK@_bSgdr#*5I_>cQhY4L5HT1PW+#bC;!c<P114bNCusBs
zTxf6uI}^o3R%(=Jz!)Ei4_p!xLFB0z1_V5(?V9vF>08W97tTrUR8MzR-E*e8yQ*&0
zgjAlezP?_8s*l53Va=}XMq23_67|!y38Z7Ly+%453Wa_nwHpvw54#L|28+Q=!LqD_
zb=6y^8l+Cb24O3(T!VG8?vsHF2Z<=`Ijm5iug-!Chtoz_f1y;S@k8H@1rZKMU9h<{
zBno|s9J=x<8V-73tA$pU#UHu!<Xki=jllY{I1c&}xkda44{ekQ71bfneOUWOc>})w
z68^i<e@|uOkyWt!t35#lwu{voDLM+#F?}LA4JV&S`hE-Fw~AO&Cs%To1Fg#!)K*2t
z7g^d{8Y=m^e+b*?4%qOQ{I#;CUQI2jH`B{%YH3wX$5z!$Y)#Q|btJ56BPFV?yhI(Y
zEmKG8%GHk2O}iwgHP~s~+K>3fixj~S+lUOGU{&6X(&HDCOKNa@QGJ+OR%`42N{7Mb
z;I1-trfIu6)==)RQ083oxU?Ulzj?Ey6Woss=e?OE#~){x)txU3>ht`Hq*zMceO0CE
z;@+L=Ky_KlHNlAi2)^LWpCA~m+lh;OD~o{<fVw@lpdO6pc2;+`sX|?9-l<AL2~;Kg
zq7eO57f7fDf}i68=ddF1IlcC7R=u5B7M1gxxuvE|T|HE7`h0V4eM0++3x?PZoP4S;
z_)RIccXV2PUHs#>h*7>h+qbEkZMCMNJ0SWQ9eZDiy;3H;joGsK7E50AasB<QqE7={
z(PbRLXx#>!IHgbeP5I2`>o!iufn6JY8sHQ(I*}9I!h9=llT^gFajsube*DuXeG5Tt
z&f8iGJ}0ce>3XDPa+ROmo&g+<VKg<Pi$^6Da8R+?epccyIWK*agAhlll`YI}NYuM?
z1Qj$4I8ftp3TE8cH`onvxEM6Zfn0=WrQl{sp;1f({Em$!^-A-S1Gxy%EEdeJ!4|xg
zb8!T7`NKDUV2Wo8INcOtH(Qu%J-)&DtSvC$QYjY9$-6Bu;Nl1t@sH0oM5XeR*@O#Q
zm`j$v!LW=iFyQi2ESNDUTVTM&5zNJC-(bMa78r1uU<;2)1hgQ!XbTwW6k<#)xDBCH
zMi+wyIWVj%gd>=HDtv=+V}??L200kSuwS!<hhd`eBICwE!+--d4u=ukVqA4ZB7i}1
z#*KpleH#SoN2rx8Ox*jI`2S>(JSZ6Yb~I|i10XMovvNg%LGnU_J`GkQsI8w|9l>bo
zNgNOHgalj>V352}pfCC~zz{TkXF1)%JifsX3Ap^h6#)jx^9}l-FT*95xVD5I6+y1z
zS!!VmL2wkwW0Tg}l8b4sXg=J<v0Um3ZbVu<3*xTmoNjqwbdkY7#>4cM2l}bO+*)sW
z;G~4(bc5j{t4c=3Ef2{V<KOW-|CgIu;sVnhK(x)f??5jt`qF99=MuUleNv~WE`noj
zfoRv~EKgs8UlfCkSSFs{fk#Rnw_rCeup-+*j@){fQ7i>y70e8%fO{9&Ki}ndOF?c?
zmuv1Q;ubHC?Ze)m45Eu?gSZwB(Z%x@04<s+gm=RJ|37(nMZ3Z~Abb#(&%g0-ADLZ%
q;0Bo0f7Hr4@Yu}H3E@`$74I*7_zIe3tW}%<0000<MNUMnLSTY0HEve`

diff --git a/data/styles/default/dark/xxhdpi/track_marker_selected.png b/data/styles/default/dark/xxhdpi/track_marker_selected.png
deleted file mode 100644
index 3ab1b7058f37df1ffa0bd29134d89718c50810b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3717
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

diff --git a/data/styles/default/dark/xxxhdpi-ad/keep.png b/data/styles/default/dark/xxxhdpi-ad/keep.png
deleted file mode 100644
index ce7b6f20e5ba507cfda191ac9e712ca89db4a767..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 126
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k8}bl&H|6fVg?4j!ywFfJby(BP*AeO
zHKHUqKdq!Zu_%?Hyu4g5GcUV1Ik6yBFTW^#_B$IXpdxNh7sn8enaK$ZObiUH42(&k
RMjb$522WQ%mvv4FO#rSW9sB?Q

diff --git a/data/styles/default/dark/xxxhdpi/coloredmark-bg-l.png b/data/styles/default/dark/xxxhdpi/coloredmark-bg-l.png
deleted file mode 100644
index 93a499a39f1442edda3f9951fdf2995eabed2c42..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2092
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
Wd7jzAX0H(d0000<MNUMnLSTYW%EQC}

diff --git a/data/styles/default/dark/xxxhdpi/coloredmark-bg-s.png b/data/styles/default/dark/xxxhdpi/coloredmark-bg-s.png
deleted file mode 100644
index 5e57bc2548d601c5ea26ee81411eb2bdfd22c016..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 838
zcmV-M1G)T(P)<h;3K|Lk000e1NJLTq003<O001=z1^@s6OC@E@00001b5ch_0Itp)
z=>Px&07*naRCodHoIPt4Q51%ERJ0I95W$aVWuv7Mt!xwvn`jy>waLGTjg1i@V66NF
zmN6iRZ5o?23R(pe6eCDdD1HXAK1XI?i-CCEduHFAIR{>5+1xpE&hyU9PG;_IuNM&n
zf<O=m0zn`M1c4wB1cE?|2^8brTfg7mM-NxfWpo@JEwz{BC-f1mp_gc>D2i7sBbp|F
zQ3bkzo}phTCEhZ49!)e|cW1W;>`Q0`4I4j5FozCw7N&ROz}=4)QSMkL;k0-Coy!l@
zlju!uw+8ZU@p`s%V7(d!<^{Ad0NC^8W0LRm>ZKET0cb~9Q-)PL!$K$EdNc_^`wa6u
zB~~WYEoVG>YJE;fdR%nW8C3V)Z{D12J>;AX0?aP!M;*&Kd&-$>N6ut9a^aNSrMZ_Q
z*N{2v0%&T;94@QNnMRk_(OH*n)05sUccSz)9oJAa?UrM|si{x1!nxFyyvIwK#$IhV
ze=mABotXbx;&}JrQl`<Z-L2p4-gVjruBHw5AFXDZJzi0ZQ=9>gDHWw=+6g5%1GPxi
zrDocZ0Z>XWrRq{M&7L|dhE!c@rr8t$#gM8?%`}_Sp%_wishMVza1=wTE;Z9^)|6sM
z)um>d;`Fxf>_w|edy<-IPn6)4wLE98<WHr#q)aO(lD<;{L@i5V_4K4nE8#2(LE5C2
zr$Y7oEk)6^c`8#m9X;acUk}r^ApoQg40*84uqOWem5tnKVneChP(0GChdH#7+Dzv0
z_t}9yXU^H~bUY53MmF<z6!C(M?rAq+r|tkZI|9evv(3X!Ep;O;0Bx#vQ}K-ro#_Ty
z$1Z`m3oSI@njK+bSWYhiI)iNHuSeKtSez1b8dl{3>?B&w=-L-@-9~ZIQ9<@v0(lC(
zM*kaj#6CoaylRZRH3R@|-@87KY!>jpe7nXjGVDtoH_^eGlw<SO*#EjgMH(Y)nw!m<
zvPn2Lr=$9H1A7)`4>4EyXIbU;80AC+fglhBf<O=m0zn`M1c4wB1ZoNV0V7@@u=pv^
QDF6Tf07*qoM6N<$f}=fiDgXcg

diff --git a/data/styles/default/dark/xxxhdpi/coloredmark-default-l.png b/data/styles/default/dark/xxxhdpi/coloredmark-default-l.png
deleted file mode 100644
index d44c6e25c5259d907c5b2e4f881959cd297a6de3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3289
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
X!N&BgM)<-M00000NkvXXu0mjfg&-Xv

diff --git a/data/styles/default/dark/xxxhdpi/coloredmark-default-s.png b/data/styles/default/dark/xxxhdpi/coloredmark-default-s.png
deleted file mode 100644
index 549b40b83d97e7ecb3058acefc7f32eea7eef703..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1483
zcmV;+1vL7JP)<h;3K|Lk000e1NJLTq003<O001=z1^@s6OC@E@00001b5ch_0Itp)
z=>Px)g-Jv~RCodHoJ(jGR~W~8W0Kl{g0Tw~g_LSEf_CAi8z~CXAT2&XaOpx^RUs=|
z+*Mq;sJnvM=%V7PXra2OG!R5;up1Xvks?G?P(iH<no6#}zot+wIp54=<~(lZ{^6gS
zJLmDe=5gkn@7%@*ZH#8KxeWEUz)f&1TmzTDMX(3HfY0GQcnjWu<M3Le(RjmW2O&H_
zpjN@};B`1x{6oXDa69Y{p?581;M`B(PjDJmiAg%!2fJ$NSRY2?%%$)L_!|0zuH5ZD
zY^YVAIPnmC<}*^W^gYJ0fm%7b3S)8FhwwCvg@*{<T!k&Q=mTdhgI8ij>wj{m_<w(j
zPH&{76i(WJJ{RE10(xmke-Zu$@51{te95O?30A=6@H4mrZiGc}g4ctQA`NO&mw@RC
zy9@I`BS;O|hhc9KCsBU@j=;RKsM<VIL`E&@;uJl@^4=0JQCBb1r9dAG;bHg$W<e*(
z&Qb#BTVouOXV9ThWaW;d&wltb%))aj==R+Kj?l0^3%98-<jY(1-GE24l%V_$T<lAa
zw&)iJd<?VR!^Wwj`9$wP&R+NiS~%uik(34CnG=?GDAN@dBw+vf33&%Ibb3j-Mx^xv
zhHEa-nwruT=<Swhc^tVXp@mVa{k$#1BWEnHP*(Y%Bd;@&-2*2K{d5bBazf>`q4Ihd
ztmPGJw*FG(LJM|?ew(3%dR=XJLhE5JD43<+!wSY|*6QeS-lZhRpTdQ+Hk^+KG1gkZ
zJe!Km=(!$RcZA)k=;~DuoS^9{3&UO&DA+lQ{$VKlW5Mn!sUBmsRyiFmX!7@WS7D^%
z=M1@9jWTaVF@k12uP!p9KIP5YxpjQrXg0`Is3fAGh!HepO}U`um88H)^cM;#o6Chk
zSAnnNF@m<nFlN#yi&<ppW!d9J=NLh=rllTuv9f%pmR^=U<t5M3LyVwV&j77DrwB_g
z%N{Sb#0XlCVTn=%QiP?KWsetIVgya8+Ab)kBSlzxS@w9bB}UNnF6Kh2OCFY9mOU;z
zOC669w0nle%9=_MmR^=UUTldGH0@q-L1}JDftTk#6k2U4W!Ymin|o1=plQ323(8AO
z4PT;=Yc^j4l*!Nv#|YZEVdO^6>;a=ZMv-+QU1r8)I<!(Tf_4oft%vun&`xm4;{?)h
z{wr5G$5Wf!HdHNHgfo;K?1D0XUALo>l8ZG*k8fN`&KzG?tj9L4jltT1Y2k2e^H6RP
z)b1G<CSvOtR6btlhT4JYf>O2ngDTY`4Ef)?l$$wzpry(D|BB(-GHXGp+EI4(Aop|l
z%1}=En8By7qMsEQ-36^&5&7(BXho5^5<ZY{1A9X2m5e-`lJ#tp-}Z)57+HPrPYE?}
zHIzQd%E38fhJ#e}FFfem0A%P2%L*7(nqT<VCHekwf;RbCqck~6P^z|<=Lr4k8J2ZR
zq)PL6@(vB9AkI)Wul6`+VS);kZD6M_4eK>Zv<4j%zr(NmjWHP!Dh$Qt;E?_AeUt02
zGJn?>m-4;^ZI!F97w0@zIMtdrV7>RHxtxt-^dm2Mq0C<;l70&_H$zZIgN$A96nqTx
z;t>@;b?F@Ac$D`b%TOGoP3aoy7u8McT9Z&oILhhJ47^sHwHBsDOf9bzogP#A+}BJB
z|IKFymInyjPN+T3F`;Kz=ay&%s<jM<ZGd-R3>-&jXVB3alsw;Y++uhPYRha0Tt!Id
zJuFXfvg+W-6>t=0ZDOa&oS?bH`c6${1)xkhjvayuo;LJV0loJffL>nO%h+nQEjmK8
z`U+NtlQjy|Z!>O#Tj3zg1C1yzL#;Uf!l>|Oo<^zFY0IFsI*}mua%?Ho8r(-v-xok_
ln|ckE-td?pJ>#?O@fOber3NS&O|}34002ovPDHLkV1gSm#P9$B

diff --git a/data/styles/default/dark/xxxhdpi/compass-image.png b/data/styles/default/dark/xxxhdpi/compass-image.png
deleted file mode 100644
index 155a1dffcc7664ed9ece7e3251ad25cbdbf83c18..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5825
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
LNkvXXu0mjf=K(B|

diff --git a/data/styles/default/dark/xxxhdpi/cross_geoposition.png b/data/styles/default/dark/xxxhdpi/cross_geoposition.png
deleted file mode 100644
index 1f3ccdfcf3d86a8d6a3be23bd540003fe834eb2b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1563
zcmeAS@N?(olHy`uVBq!ia0vp^tsu<71|&;wS=#_9#^NA%Cx&(BWL`2buwM0aaSW+o
zd^`7Gc1)_s(fbx&3M(1|CTWRqvsslHO6xK^nJK-xbya}r^Y+x~Q&;PV-09^|oO(#-
z(G;}{N+D|nI$9k(4u6@q^8Sao89TQ<RH``t^TD&d-|w2oTR#6|_5PsFzObXVb|yb%
zSDUU@U0u97JuG?k@~|n3U03c}b<gnb_ciY<e#u9@Kk(|%PW9B)bAzVpbNv_Gw`teg
z`(bxC*zI%d`~P%bNv@m5yQr>;6d(89ch_y(wr$$>?c2kzUBABi@ZrPVCsTrMy}!jN
zr&&LhvrYN-W9I(eeOGUDl$Vxn-MWAO|C`5-9n+0TmXVeHd+qhtck}1W5iyFp@nxOp
z+2kj>5{@Pxk}O%7W|fzf<y~()AhXV}|8qUtyW`I@*rY|?U!8pS&YeFy>SE75KVxne
z{_b>DN;6Y`|ILWV$jbV%K<k;t_kYB^y*6cePQVf#!>B0>I?7BARy8R(c3c!<aow_*
z^O~>-r&G@~1&u|rz8mH(@DNDa!s00SHlyh)i))j>VpWc=40qu*>KZ~V61t87F4nUW
zY#k>m9LeBpQo41K<uzv)i=vyifXKx@wFv(J6%NCwrr~Ern)UmuV#n$tZ^ZJ?UYUB^
z`gQZHbLN(N-#x$g<o=KK?~hKKb$;!J+VbS;vsNNE7Jm_5?Z5Wb=Q2<GYiAiljy2YX
z*KhoFHEWl6HmCf3j`*m%TP{5)V&M6*#%|NEi?0^#2~IGsU`$jK;D5r;r)6XG;ok>S
zJ%bHbjmth9ZChLX?Rib<<bVI(%Uaml{;jr<k>h7;KE73V&%)R24j)@Z_gQJ>u-VJ?
zzmL89O47D>4qrn4cfaMu1(lVNEOrMUC$Ek9`ulGxW8j?!7E1X~;(~XxX-qrivi<g2
z^V3`UPRj0>^jm0wh5jt}#TO$juTMPQsJ(Ok>$y$pzju0x?+xxbeYfJ~i?3DRzkmBC
z_u%c8Gp}cyXMEB<XJYwVRbi*&Kb9T%ap%>!FFh~Lrx^V#n|LQ|_1C+L;vW5MU-mW~
z=q;IuzlOG#<-^z~*jvo_d#q93W#9Ho`SJy=**bsTGMha(KEZjld)Ul+)xGEVqw8m>
z?~hKETK`o$Q?O_D{3+cn$6q@zD#)pPNm{q$lb_-Cm7ad=EUfA8)@3<9ymk1dh{&9s
zyH~NcX7i^92NXPew@OT8o$VZ7$AdF>uZ{}X@vXp&bp$B}X8PZY&mLRETL~%#%%c@v
za!QMwe{IRve)#dPQp@?EQedb4>xsNw%f(c_J)F~bFyVtlb?x+QnZn+mw`4%2iQCO<
zv)ndt?#;fc-E{kH+12;or|-V|?o)<|)$O}?ZFg__{(axw?!Qr)Y|0`R{`6iwd)-4a
z+BP{oJ?DwH@huat*-jfJ-%q;Q`>f<K*X)D;Q%Y~nP~DO6XW5G5U2k_=hh>K~Jh}5~
k=G7ZruWS!}Id{xEO8lnajQaLzz|x+<)78&qol`;+0O8&5kN^Mx

diff --git a/data/styles/default/dark/xxxhdpi/current-position.png b/data/styles/default/dark/xxxhdpi/current-position.png
deleted file mode 100644
index 61f0ef82d00e86e3efcfb3b80ae6a7c3ef285ca7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2164
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

diff --git a/data/styles/default/dark/xxxhdpi/infosign.png b/data/styles/default/dark/xxxhdpi/infosign.png
deleted file mode 100644
index 4de5106567afb5421d06dc14c8af3d5678fb4e24..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5182
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

diff --git a/data/styles/default/dark/xxxhdpi/non-found-search-result.png b/data/styles/default/dark/xxxhdpi/non-found-search-result.png
deleted file mode 100644
index 4a5a8d5d0e215594fb2b05b76c8a69b4464a8d24..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 572
zcmeAS@N?(olHy`uVBq!ia0vp^x**KK3=%mav;s)g1^9%x0_p!$0-v0nKgh}bT)zBE
zQqs59)*mxweD?PKXkr31{)4jeuRVMIeg6FK&!0c{?tN=%`S<tlm-u+ijqASvT_9N!
z<QL2!as20*P36z}*egEBJ^m*AFV$#<pYgGoX)7ZVG#D5dLp)s^Ln`8?PQ5<qumX=O
z<M&BP)_zRy{Qm!!zZ3h;%IA@pmHwVNi7hHB-+29vj(^iRU$&`bvuo1#9q)O5FP1*P
z%liJSeH;JWT_W8QXznV)mOQgNkI%5n{%*<VoJ;;cH`H=}-<5M~U+$@2|E_Ik&rpzm
z60JDZQEa=TfA5)g1HA&?Pev@C`)maY=1-Lhwq4lW&?xZf>(XTvu?yQLlndsy*(`kg
zjU)9_;aBIgfsP+a^CK!2%wqT7`mgGk>#HYCx)VLVUw3oj+UnA{#o*Y*MMW2<Wh9(C
zr?EYX&3D3v$#$<rcV7!TCR002yKJRy`^{fDVQ<``%|3s*x$ef=Z8mMUzG#>A|GMyQ
z*-_s!o^GegomQ%@_1CbiSn}2U<NF!)k!$~XKbpV%ys+`=Wo<_epV4|H!=jmZEa;i}
z3Gs4gzkAkS=DOXV-gZM&es@HI`1!-<m;bk|mwNwG-eBJPD=%NwECNOXgQu&X%Q~lo
FCIHZ}JsSW3

diff --git a/data/styles/default/dark/xxxhdpi/route-arrow.png b/data/styles/default/dark/xxxhdpi/route-arrow.png
deleted file mode 100644
index 997a21da11a7b2ba757670cf3b4c7aa996a57889..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3396
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

diff --git a/data/styles/default/dark/xxxhdpi/route-point-finish.png b/data/styles/default/dark/xxxhdpi/route-point-finish.png
deleted file mode 100644
index 54b39db0da634503872a5c0ee76ebf2bcc71e6e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9962
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

diff --git a/data/styles/default/dark/xxxhdpi/route-point-start.png b/data/styles/default/dark/xxxhdpi/route-point-start.png
deleted file mode 100644
index 9e7b58294a8bb89363e8cb0eefe2f561b0ccaece..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5188
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

diff --git a/data/styles/default/dark/xxxhdpi/search-result.png b/data/styles/default/dark/xxxhdpi/search-result.png
deleted file mode 100644
index 0b2258415a0e6548b405811fd4a577a29c8ec641..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1384
zcmV-u1(*7XP)<h;3K|Lk000e1NJLTq001}u001}$1^@s6sD?Wp00001b5ch_0Itp)
z=>Px)B1uF+RA>e5T0Kk@K^UFmL=KTCnnTfu8c9ryg+`24CKgr}(oh)ftZYq)1&IVA
zg$<TebQ%g9HL<cVu~LG;L}Oy2QSk@mf@lB%`8nS^cP2Blv-igx3>RMVWp-!h=e?QP
zo!#$SAvUlv0$z_mteou9>2w3yKMZSuZHLvvh$+}F*gM$USS&V))PF!w4Au&}33~<0
z7c9#<tXtMWFKQG)YB%gQ><etAU>j^}cTr?YSqUWSVLh;ESgFA_*|uEPMNuz$IiTaK
z=&>7?boKmkYC$|t&56<JMe%cfSxn3?Wm1;iQBx&$*2FVu^VUt`R5BqB)K|NjVO|Q>
zh5NKWszA2<f(1fYEgBqvU9=mfsK;Obh-ayJ@nd$$zMS=ZS8ZIJPS%KXd$&Z19Yh0H
zAapisL)OKD1VY>%)PDeL)!P||m^<&L#FMdEk=8F1aZEyIn`*`7mU__$(H4eregPuC
zS^1Htc?*QN<7nj(tVy=Eu$&fmA?(5Ej96Hfxur>~tDvO0PF#Y}>MDcg7<xDlkt6x^
zWYmnR5X>A$Pl@~ecS-cVoD^?<Ekso-N&b=T)uQuQgV?s&m`#do&1WWa3JmVKr)*F%
z{(yU}XJk^O<_f#dWc@<ZWFjtZ9B&W@%?A+&{7kNU5(^<G_&_nlbqr0cnmDrKK(bE`
ztOjx-x2(u25VOavKs_zFEID&?ODlbpWaZ?%$UfOOIcT^TaMZHQ!^kCyiriq|!!r9E
zA1Ix}6J@{WOnTun-jltpJM{+-_sK(8s(il<A=?agptRb=xeb*2ff8cp$RGzkxiyd@
zxjNw#h}q+N;5Au;``klp1-^jW5;<wO7I4<G{vSF8;?i|koh;4SEA>7n+b$+07jn`-
zuH+m-NFYXn_hq{*$=5Hwq4)-JA~y}~0e3A+h>$>B<>Pm+EX8-r)qiHn-lJ1;A~y}>
zd_p_V9J&Nv&<pX!*;hEYwb@*=3gpIG=vRT=K{?OK&D#8p$zk7yK&)Z<P>xDc&&TKF
zp||M}zBx4<4K%1MLm+bLAX4}|v#5@JJ>Unm1w(@^klrr^eu?`I2S-DLEs(A~1-co0
zhl8V`!4_yZcpRhSon8k=LxU~QI{_;tWD7Ljf9U=49S)9$23rB$=?Zl1`3?t1LxU}l
zu>u9h=%{PH95^@{8f<}Yb>ei&`VI$2LxUj@U&V~_yq2QqarPY+$Jc=dMcWV<<kGR5
z0p02JIQt56vt0g)yX5Q=cwb&*N_V=iaBwrYlebIY3*>*5q8KZP^i0V@Ymkx?xoIG0
zayJkXh&9Y_$$PRCmjGi0zJZ*q<#{jQZcq&g46fcns=Q1LglzI?8X31BCk^CE&LKDj
zVkEw!WS=a}C{Npd<%5#hYnC!7V@00&0?r{$k@JENM-EZtI({)Ce5dP@L&6XiqdW|R
ztQFWdIauK|Mt_a>Po1B0iOK?~*pK5udCm|PqdbXt<iyLOB~RHW`?kVpg8|3L{&F(K
zQspD`Da?p4t(WjwPJtX6h-B!xG6SF#NI+y{2>br08L?Pm@9?UIu>VU`Gs*WowOo0v
zB7Q>9MDm^-fT_T!yteLtBauRwV#!`b(hW=U+y*_)bR5&SO2<&tk3jqC@FP%T!j8Y|
z&82Ws^p8M#Lj@m0r1!sa6)ehC0YWSDXFOXhgz|UFldxicr)1r{wl2HxsPmFGW_JRz
q4aj4xpfY}lwFPdRZ;ZgoN8le0(!zXf04$pT0000<MNUMnLSTX%mxY-C

diff --git a/data/styles/default/dark/xxxhdpi/track_marker_deselected.png b/data/styles/default/dark/xxxhdpi/track_marker_deselected.png
deleted file mode 100644
index 7de9485e805cef9fd25e0f061d4b23242a6bf9d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1719
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
N002ovPDHLkV1n6tIXwUX

diff --git a/data/styles/default/dark/xxxhdpi/track_marker_selected.png b/data/styles/default/dark/xxxhdpi/track_marker_selected.png
deleted file mode 100644
index bc76a66c76dab6491779f8a73beb2feb38a3e302..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4578
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
M07*qoM6N<$g6CAWCjbBd

diff --git a/data/styles/default/light/6plus/coloredmark-bg-l.png b/data/styles/default/light/6plus/coloredmark-bg-l.png
deleted file mode 100644
index 146744ccca75acbd7a5098f5a041888204c7dd24..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1543
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

diff --git a/data/styles/default/light/6plus/coloredmark-bg-s.png b/data/styles/default/light/6plus/coloredmark-bg-s.png
deleted file mode 100644
index 67f36984a94bf2ee24e84b0ab7ee4c68e48a5f9f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 468
zcmV;_0W1EAP)<h;3K|Lk000e1NJLTq002q=001Ni1^@s6E-tKF00001b5ch_0Itp)
z=>Px$j!8s8RA>e5nXyU(K@>%^S{SjhG>V0Gg1rc0WhrRq2iW={{)0vQ02^!VtnBRU
zv=C!qVJ9NUdR9{`vc;I>-r2w#xUdX6@4kDOKz63ni4g>XKoDpzfuc>Vm1Q|cKg(zy
zy%a_9)~5cl^#Yh#w2#ivGx|H;nYcnHXenExIgJT^i0)D9sGyyq#hiWHya~F1F3_lB
zz``wC!#Ruy*h6=t5~{8H;Q1&=2DvA}y6CnRcHGBL3hc@ocN-Aud|WaO>tC5$ac7bF
z5oWs~<fNwhvc}zoA#yV*Dh+kMnA=omno%1NVgrvIp-+|JSXlq3v>X&J2kH<G4+p3{
z1E@82?z+;)0cuqlpjKPz;{a8C<T{4b#{tR#N$%kQHIS$HHIVu^Ks}j2Nqrokt_`3b
zIplj#`Zz#cDgz8_J3RC;_>VL7pD=n#H~=a>ic?7gD~?%GU;!!)?ovQi?*J=~g8u<4
zE*DZ^4R=>uSET~ur#Lkipl!QS?*h4p;z~Vrx5axwAP58j2z&!86z$X!0S;II0000<
KMNUMnLSTZCw!)nN

diff --git a/data/styles/default/light/6plus/coloredmark-default-l.png b/data/styles/default/light/6plus/coloredmark-default-l.png
deleted file mode 100644
index 71c58007cb795b0d8f82b61b5d3955cb9883282d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1826
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
QssI2007*qoM6N<$f(a3DY5)KL

diff --git a/data/styles/default/light/6plus/coloredmark-default-s.png b/data/styles/default/light/6plus/coloredmark-default-s.png
deleted file mode 100644
index cd11a0f87abb47f8bbc89432801f5350d8c3344a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 786
zcmV+t1MU2YP)<h;3K|Lk000e1NJLTq002q=001Ni1^@s6E-tKF00001b5ch_0Itp)
z=>Px%%t=H+RA>e5nm=n)K@`P(F+n5#Dbyl@g(d;T!Y-ACMYOQ7u&|0+1REjP`30<E
zBlsmm5J^&47!VbLjW(i)Xab2QMMwk<L_}DB16kNyPoA^y-QCS@=E7k!_syJp=DcLG
zZ{B3PS{Ri|WiRC~fJ>ks90Pq|A6Np5;2U@aCbKM?=X2)-1`UD7U=7q0Z|Hmr^mMda
zOmF}^0%hYf1Xn@UafUIeo8UL_jHi$t>Ik!#NH=&8>CP|u&4Kq|6~x3xIt{k9Sxle{
zOytb=57(x^C<qJrrXbe~hCwiT32YU?)H9m~w^IZ0<6F&){1b30c0TkCrriPGfr>9A
z56ALtn|_EMQL`Zz{?lD4DwMH(;5AV3oMd-V?xv4J>{0Lo*jOZSwyYpH_JD_$e4{;9
zmcMD^5v&&Pb@D@ABH-!)FMy3@5(mBNG>iw4{Xl&Uxb9t)I!C})VB@ZLEq6W?-?OS|
z&$t)bAcXsdsJB9HccW^$@FMV&5Pr^uT#!&Jd<A(YYMvL}w?_)Gr-k4TjaEm^+oJA$
z&$?ZnWN=*+d=nz)ol-Tzu7q278+BYLn-)3O6x%Oz5Y8G>rNwlKZ+aW`&tnKu7UJcU
z>S^m7;LmY?DaM+?-bRH@HydH|tr?-}s2f*Ei?>mQM6|;oZ==HYtqr%kYKcu-)lt7?
zW>{R)+bAW>by3ZkmaX%XMSd-(e_fZnjhYwLheggc#iD%z!jp#7F7D=XeNAtpo{938
zMb0~=YA7w<b&K<Hche(GjC~lTb~R^W#un*Ay|#TQPTMT8cbvPNHtu4~!l<+r9Ai}I
zgIU*riu7{9nutqkVXvB(URPBO!;$m?v}(rxJ~6A_SL(Bj*;%jDYfWVG>5xXPA$dPz
z)&NMye)3GJy@pvu50brQY)cN3we%nslU7F)!@g24s2)uWTQ@I3OOGc01!uj{ZV>rA
Q`v3p{07*qoM6N<$f}5~rasU7T

diff --git a/data/styles/default/light/6plus/compass-image.png b/data/styles/default/light/6plus/compass-image.png
deleted file mode 100644
index 3558dec3d66127a0e34c6a7a1c7bec122cb38359..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3150
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

diff --git a/data/styles/default/light/6plus/cross_geoposition.png b/data/styles/default/light/6plus/cross_geoposition.png
deleted file mode 100644
index 359ca800a48378f7c59c1c4d0a1bdbe60a302346..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1115
zcmeAS@N?(olHy`uVBq!ia0vp^(ICvh1|((7e$E6^jKx9jP7LeL$-HD>U=j6naSW+o
zd^^`RBe+oH=;tK+D;!=6oB6DMTy$NjAo(VMeK&{ST&q;=l9CcHhvRx;O##PeHHgf8
zHH(k0Y4&8VmjVKr-HXI{>O!Q?*X{{_wAjgF+Ux%ZcNYBI-#_QhZTan-`4<0OTIaZI
zzpcCI>gyBQCxTD#p9nv(JW!<euvCr9!SW6^#wvl+x=(i2{`%XI{h1*z`$FR7N$op2
z)sio)UcGw%vuDrTrcIl6>7IMR`bq8fO5(Ojo8BvmOZOgQHo4<lTvqmNW2}FXiFm!w
z316ls8C+Xp^z8i|Z%1iOwOjgq!>#nn3lslox7~Siam&uPZ{H@r+_-kG-*cDql`EfH
zoH%TAfKN!~@{|PQD;~WGlOIUT9K5Wv4q@qXVllTjho!v#-~M@W?KK(4_vycC)*e4y
zx8Q`BPV?@}jS^<FOy)1Vd4HW^{}S`!ZTB4ZPg6X~cVnN6b3eo1(+qxZ7C*^vJ2ye<
ze6qgTk<=%w1^bdG=ZZbOap7i;+2YpL*6zq~v3Kl(Z_9q?Y@4`o<HprDvlZv?^Yhow
zpEs{Acx{;V(WH+SRkI9Nf69H5wEF6<e(vfvKUsO6?x?ljF8ok>{Y@}w+3!Q2K5dfO
z#P+BmIW_fZ&8KP2Y`4qIHGF)0YW(!FEFG90KYsjv()Qb?H@5Y<EDT!t<`DNk7O_-E
z{}+Ew8=07VDb31S6}tZV_DSC(`#(e$NvNAHd7CFta%1|#Teog4y{C3@f3BQB)gPDU
z^6rzzG(KBY%2pk>e4Ec)d%I3!_D5%4zMN!{+i8dPsrV~98{NHKA7jt2t^Z+HX^KXo
z|AhRB(hsEVU5{<J{I1}mZJ%y4Cr^WI(|6`-*}wMO%RbghZPfQ@6=pnG#*~}N61_o|
z(_-4C6z*-xjK_m!<s2+ic@W_>S@%XCi;Q>XCf3^%8<I7Bw<TB$73eHIDVF2T)VI{+
zX46}b0~@EPQJ^_QPVM#{&B7V3mbTljzR9<JUcLVHPO&SAatX8h3y!atDZXd=y(dqW
z{5_K+l_thz_0Pbd^~OrewFya^a#c>H?K*zTpnH>Ly0G(e#Tet?vr{ijoPIxc`~7!o
zm2%6Qb7m~OT+{aUP49(s#f-NXB<|w<!Sl)J(zlNW`3rx_&1Tr!Y5L;_Z_Y{k&lw!T
ROu*8D!PC{xWt~$(697B85w-vT

diff --git a/data/styles/default/light/6plus/current-position.png b/data/styles/default/light/6plus/current-position.png
deleted file mode 100644
index e9d07280d287d4575d3ec2a82af8a7620a12df9a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1324
zcmV+{1=IS8P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px(=1D|BRA>d&noW!pMHI(hRZs5>yR*8>E@oNHvKPRQ3z)#cNF?!Og7HM)LZXQ#
z#v{QycMV5kA_*p5B%Fu@5)u+jJc&UPqo`aK48sbpySg9DOiy?D{;#`gdxz~^X1}KU
zB{NgqJze$tPghk}|KBLunDF}FJ-xd;vg@$!sqRx=c|Un-Cy_T4S07GMXdard@l({C
zyWN<)cVqV3(|7q;xZdW~Ix6soPJH&d*FScQ%GD1@sez8_GG>MvbLYd^`xmCZ{`3}~
z8+3Gj^5wM%@LqWT%lBw-^b3aGk#1CZJ*4~!sS<zki#$I*90p`s&G;46$%M`HX+*|6
zrs>+pkG}fo5+CU3s&pbi4IV%9ra!X#9BFTlCD1*+r2DqVuS(VKUhy-k&rvl0PyA{w
zEPgi%{|F}UemMQj$?timSv-(kdNu*$<CPsp&RkSIl_Rz)-8)F7p)u0sKD%p8pHX9;
zT2uEaT9|g{n`Zs;<I5+H(!@mF?aU~wDxmN1CnJ6P-uce{>bhK|((o?Q+n&#;a&5b#
zC;w9G?|T$A=Hd$YYRuoh`quo7vy&^;xT1jPj(vV$+vqFTjZ*!nq%=HErGe3v>Rb1*
z)=Z6sOh`S-nAs<_J8%DY;ndBniZcZOzVhO$Kj1{AJo0z$CEeTEM3dF%YWt&w844c$
z&SN_s&-Dkt9?TNqEmxUzn>}y*$mC^Js*wNEYosf35tjS<hVR2nrmNd|kk1fBE%N(^
zk5gsfd@yk{>0gUY>cwJG;sJ|3k8UHs{OHSsnP#g4ZTj3c7{DUqklETf+65@gHg>>D
zx9I}Bg%lCobtQP}7B=qD_BcM52*5mVr%DXit?Kh>p!PBtz=8l97-b`QOAGMiCdCJ2
zs@&w+CJnJ#88aW45DB9jyH0>C50X19=J~vZV`4^OO#rO`U)DCf6L;8+zDaGwj{zpI
zNnjnu7XxJxfK{bkm|=O4*KlmSh!kckK$gVVz`|^uYn#m!4>micJ7#Xsll43V@TxNJ
z;TZ7@!t5GPQrvxHjo=REScPL`X0U5K27(t4Bl;QF^WD@3MzA8}5f;y|*ueUuC}CN_
zuH^w70`Le}kg%*^*Rgw0OaWl$`#@rS*az?;Tm{GK4cR+!5wMqKWC3hCA=vsTOgPqX
zO2aV&IDDI;gkxoP4ZE+X0>G}}Rf+(1%!(2wVFkN}(JBJi?t^2N_W+}{Cc&=7C5F+;
z0lP2n;TV}2?3hMFxWoW=2Xm~#F~-cH+y`KBivTuS;Z^1}z!oKDuw@nj;?Kk4=77<f
z*Klmin&cFmtrEbW2RK|}7_E5=FgXW1W|cdyTmisJa)BLTl;INREgTawCW#P1bOLxQ
zL~;RpVR6GH&P#yB+U^OX%i^R35Hcf3E&v=BH(cUw2N<l~4z?tF<FJ+p;JrpNBS}|+
z#cfBuJ7WtAXd4U?%p`1Wsi$@UgtQJaBS<d5pATxkbwz~0bK7753z(KmIXx|a<sz+v
z%m|d5R-J-Bf8NsWBnb{~6Kx~Fl9g(5CaHWg_15_1TFo2Ve+9_}L#7<g@@+zUo1W;v
zfDQga4&2BuU$5Ocl$D(U?h>y(#qWxRPVzYwMNYFi5q!0Zo9Ird;9_C_YOquW`}0Np
ivq!rSY<KPNHva=4la6esh&BKK0000<MNUMnLSTYn41v@D

diff --git a/data/styles/default/light/6plus/infosign.png b/data/styles/default/light/6plus/infosign.png
deleted file mode 100644
index 250db341137fe248abefaab6f5f270cb2920d9af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3537
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
LNkvXXu0mjf6(+7V

diff --git a/data/styles/default/light/6plus/non-found-search-result.png b/data/styles/default/light/6plus/non-found-search-result.png
deleted file mode 100644
index 1ae27d4e318654172a5bea421d96eb67b68e4184..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 464
zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k3?#4J%UA`ZG6Q@<T!Hj|a=`~VxgYcA|NHXg
zgO1LZj0~VL|9<`YxpwVG1A{+z?|$<1{C)A_M<b)ZPoI7?G&I)FY5-a$QWE4B%y4sm
z;66d?qs$WocK!YwyXe}&m{03&9gkvQU}W-iaSW-5>z#5_s9Ax>^|8~&?x<Xb?|T3L
zPc(gCaINuB<yW6Q0zx+q-%|5EW#l<~TH|b;{a>d=&$FB&{GR{AWk=0(dz*_lmg|LU
zpQxO6ZC6~`xmw|4eh<4|9rN82z1pCZ&2V9=Q1i;rhJ#Nk^?w}xWVUl#apv=%hnUwd
z-*!fF=Q`(e7cXtKu$*~r^MYpA=Zm7xdJ4U8nJ|Uf;8p9KJD1#p+9g6%`d=h2Suc7;
zrPOYv^2)X;Do-bicxtMMaPAFQ!E!2e*56Beyi{!tT~dBkUU+c!2T>El={Nu7pH8_Y
zbos%F<wA8OAJ3cHa6FvYC426}jCOIiKd(CDlf=TVrpaCtz0DoZzB=5vaydT>Ftivv
MUHx3vIVCg!07QxScK`qY

diff --git a/data/styles/default/light/6plus/route-arrow.png b/data/styles/default/light/6plus/route-arrow.png
deleted file mode 100644
index ec0623cf7234a7d128fabf3484559b5140ec857d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3227
zcmV;M3}o|(P)<h;3K|Lk000e1NJLTq006Q8003$T1^@s680QNr00001b5ch_0Itp)
z=>Px>RY^oaRCodHoqcc=<sHX=&)!=S2ycc$qe7s9yohoa+d9l(ovPDm%T#ImkE3vR
z5Q0|ToXP+VXbPmAsZM#DQU>YWMLKq*ilt>*Z9yVMTMM~M1XRYUTzFB42@pt=yGw4L
zKAUjK#o4`ka(jEbd->grlg)F_%Wpr=*N4r1_xCISevkkXKmtg>7zBth!oVn!3D`ZM
zM}dkj0+9bv0^6#}oPp|UA|}_t<ADTF$OC!k{u`x~*uBB4Kw)HmFyyF(5O*Zt4ELAe
zQ8ED``4>FapFqLVQ<DdZSc-|>9|!RRn>)Bz{|Jp40Seh*^CCuLqhv#(P|O6q$L_BG
z%dm=*<7Dd$;X)L$$tIry%!_r!PTAeTADJw4O~XYYYl>I1&PyoJ*X*8PV3a2$zk+Kv
zv@ttIAscgExT0cz7`i(sJz20Q_z+ivJg$U7Ho@e6Z}v#|_RJBok+PNfws;)=Zu8V{
zEv@{lNVd`tC`2KfV3JEm+2GC9cfgj%Z-+v=+?27q%@kI)L@$L3y^Y^A!6{`uL^&#1
z9|Swh4uPj19t+1ePKU2g9wyr%Tb-wNi{0<C`_MlxucS8FN_kp{LN?jNP95)nqwDX4
z=jWG#%_{3>S*S>#I~fhWZ(q_d(`2WYakwbtjM3@W(86Y|>XGqqY{N8|aciM$AnZ1s
zlXi*q4sZQ4)zvib=Q;0BP<EE{q|iCB5Z<qz1}nca4hWH1ohfyQBK*4MZ0JaVCsdXv
zr!9LLC}deI<|%a82)yvvt#D}V6et_(Pzd~{#qF*4DpW9iF$&rAQ`ma~bMG7u!A;Y_
zGq*(kj3kR&1Yf>d+$d!EX*Xr*@B#sLFP;GVSA7k}jg-G>k*^jv3fYvBO&#<+W}r0G
z%z*j#j#jGJYjL}SwfSOkqmY%R+T`W847b3m%O-)pvJ6HRS!B<K-FIG?FBUfnS$2x^
zr||JPV<5D7MtY0e8{B4QiyMV(FwNRnDoD0Nx@`=H#VyhmX12Id$k|qn%Kp0Il>I%X
z&4=6K_5?SY&EiHOYoi&%_R3{(Q@X)y7I)u2W9&hbAG5XKNj3xJKq)?~Z6GODJWv8V
zJrlAXQK+dCyt~8j;l)n*z6ps66sp!ua&9qt7I)8z%#s>+vIkB6$OQZ#idcS5^Rbl6
z;s*L+O*mLrP|-Na$P9$u+%Ni+k%Pq8v?GvgaZfB!u(&DAjdyo9+Pt9(?IKavv%nt7
zMiHxHm=~=ji#xPAoy9G_)MIgbPLDU*NfVn#+6<)snz+azz_hOx7%k2r9gpPDt(lj*
z9RLnCw82yUb8xw>ONo0c5y+D<zw0%n3b`&PHh2Ai+dZzbBKS9ZG!Q>Sn?P%O9DWiw
z2XCCXstAHTI=Z(A$ck$L=QYJjIr;)`zvT$D*@j72+`d#6H>C?Ci`(G|J*@Znp^){S
z0fUeK1c${fQu-FVMBT2Z#f?HXxR8tx9+$;U>2f_SZWOW+lwy(?xGipXa8s@=ZWOXf
zL}ZjOxh!s=>vL^!qmYfF5EI3b$m0Gd+m;}07PmY2(_Cb6qmWG`AftsU-KtHS#hoLI
z8-;8%b(kz3Zi~AsuIWbQC}fif$Ee|^wYY%}@7t(c1B)AlY*b~KFs|e*?yrnUk;P3T
zr=-V*vw4ar<ZRN!zIq7sW^qr4N6Qr-YrjQ$Y}oD&?afveHwqcWrwM_QVk_)hJ{eM4
z+#o)YEsGn4tjRQDrwIbw7PmXNLyg6aLQW9JpPCWivbcdRYl&TIDD*Vmmq{Qf<V>hx
zn~Vq~Ebe=iHY%rdN;mC3X7`3R57y#FA!jrt*eFv1lEp1Kg3?CiR!d**b8>fVqjIsT
z$Kqbxcvtclsg6;|sp#N$nh;1>+{ZSgvAE;$6Ao|aSssfUg{;X`VW&I<xGZi_e1Rv6
z8->h69P4OCAYpO;W6cyunZ+$x+$plSQOKH25q3Nn0{2g28<nTZ;+8CKk!5jv>JJW+
zvA9vlgQ1OeH6>7-v{AXD#ZBS+F&T>+g{<k+VCR_-;I+7?u0C}rVR567Ga-#_G$)X-
zxc5|)fgs4<rh~K1(FeN(I8(T|;Tu-XBf<fYK!ya)eh~xz(H3@TJYegUq}~X1*o6Zl
zA|pOPAtzzML*o$e9c_hYU%3G7k+^J7Y>hrwSYTOnW!F82udo^@WLZpDs273DZQW4m
zYl6Quwkd`n?Qk@_xOmx>9aF9+Dxr`QB=D#11YSRW4VKlOgVy$Lg;+>4+jFim=64>D
zR^j9i3OShu9_vEjT1OmK{r)_>^4^!_*&hyjv&x_B1S;G8&M*2)`;Sn_{VecE2Lgvq
z-+(21n&9Hqn9}Ii*^9QHi3MCf#Tu+73RwvsmTO9&Ge%+Uz6<c%L$V8OV(cSUM}env
z_snyN0;QiQWF<0Kt{H*<{I>(VFNNWgOA)0pIt4=3NBqt$><>Godv62UqL2sRz+bc^
z(9Q0oZ94Ed{OaH(h%4V4K0%0eK{Rmp$0WcX4GNi`71mTi;Pk~v&l{u~nmUwv>1M0%
zFXxmwH`Y}XrP~%tZSfjekqmy36#~-hFSowc49~s(8AQ88***!7kE|A0*x_@XsFSUc
zz7SXB^o+1Zh6KVbF<8W|g^!(SSLlIV{|d09l#X5#_Dxc}U{+{6pcsWb00;h(EdpsR
zW<r_-LGVU=vyX(cFenN+3lOo3egcxkywu+We`RlmQu?q<iI<thygb=rR;tTejzZ=o
zh4s=BP-8Kt?L18d6ml9s_;q>$ZOmd`snTLjKT7HvDCE?9@Y^&5xGZJ?R>l0~{!|uo
znqks@jY3X~2rI}D;Ifzrylu4?czG;lxiJP)hC&_;Ev(x^fXiYQpeo{XZRNF?)uKfq
zt0g#u+H+aVgd8VeT^RK<i`kz$I4I=Yu{QNcTo$uHelcgFb5kZ3vsySPWVHnIygjeQ
zOo1+l`CavOI`Kdu>jd5m!*W^7gl;c|(QCs2br!Q)9!$v6^PaSC<A9Es2*I%86H02w
z!}b{v7|UKPbNd+im&;_(9aodzz0(S-|Bxb!S+baccp?E;U6`v!Z7UJGJNOCvXW<TQ
zhr!;}5U6;d1a^8RsOf^cEtkbiNG-FNS7g&-<_=JyqI7BT9{Uf4tN>^z6{oeB3AxN}
zr!AGsV%D3JU=eKVSrC2u1Lz$Pj-Pu1lEv)V9frq#^QmGgKD+jO!$Dw{B;wphn0`c|
z(?9FHMIb+5|ED#juZ}hHjeuk^&#wANITfEk8(4@tR$KnVcE2lSrl_85q)Q8k_+9Um
zEc$rXb%=ZyC@p92a8P{HpPs?y^Vn=L5m+9Z$X33w?62?nTA!<AF|T>`0_-}RLYssf
zwi27S(>Lq9*72zAzemVYCoR5dH`tGTH~*80@RLIVT{p+Fx$Dc>p{7FSvY3hRvxtB8
zwp>}vYEk31vT6xtxqYEs&}>d5i~0HepToCm&M2qiOBOS+xuOAQ&YqLV2Ex7-IUAi}
zAL<Eo#zgrHO_g19S<D1#SQhhUJuGIGr-xb8Y5^L(y<{<Od9#_V#Hq8Gdo1Qaxo#G-
zT8_9Pt0idQ_M8^;HfAxe)7xTJixGvamY_k~b7e6b$YNHD5rwRlpuyVnS<Db%7V}CY
zS<GrNqL9@RG*J8fC$7QMfz%si3l>-s^|}76yc4m3PG}IJppXXv%cxbkvY460Y!_f@
zyU)1poEp9;WHs~*(DpF1m@86klr34zL|Dn5k*L)&i&<|JC}h27Aj9z!S<Jf*x3H%Q
z*gZD6kCeqs>>lZP8o96YsSJf|!rA1snAb6jdAnIGX0_9RLRL#KhwXW@m<7SIAnLp4
z3<=~gIGu+=A?rK=yu<TZ%);h5WwUF{XfgA0P^yPQRw84d^0z;{0ej!Ql5(T$UW?gj
zT8mjNZq1&wQX3ey?<eqSb5udZQsS_%rId_zb=8*F_qP~&N4O%Jbk3!Wp582Gry;VK
z^~Q)RvfeY0!T1COKeL$cjs%=_88pw!Cb%LSZCV8@1ySjxMx?pdVs_@8#jJK3a79*2
zFw5-=1#4KY%bqM|0q&BXlaTv<sFyK5_%Rv*o2UL?K;gdLxX4woz^X2v>t&<GX{31Y
z(!xlyaWfW2f%TDCB)*8fy|%rW6xH5L3^rh-7!ndd0!RP}Ab~Fv_&-m>rtp^=yz&45
N002ovPDHLkV1l_TA&me4

diff --git a/data/styles/default/light/6plus/route-point-finish.png b/data/styles/default/light/6plus/route-point-finish.png
deleted file mode 100644
index 59882e9f2dbe90eeb06204eb5beeb7458e47368a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6227
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

diff --git a/data/styles/default/light/6plus/route-point-start.png b/data/styles/default/light/6plus/route-point-start.png
deleted file mode 100644
index 5301e70999aa88e8daffb1d484c61398b8ba1bff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3641
zcmV-94#x3`P)<h;3K|Lk000e1NJLTq002V(002V>1^@s6$I7^K00001b5ch_0Itp)
z=>Px?^GQTORCoc^TM2NL)fK*P%lZO=utb57ASDP`Kw1Qghz6xt3U0_CGnLY59j!$X
zZ5>23%-FGNOIwSRK{A8LQb`@Q!7Yp(1>D#y3KXFUOJoZK0@+^jUS7ZNC+Fq<OTx<&
zvYeUw?!D)pd;fF3d+zez|2~(xdgQV+t>^W$Ma;;CHKv{>+nU!zzhBb({i@q)Ta9F1
zc-Ay4OPMsJ8_Klg^|Z(`mU5jJbNWhwp&KPe+v486d%M=GS<@FZ!0-28=XSf(JRXnV
z<#Hv5!{KU#iclz2UQ<(3bo%t^Z*y~V|5s2@5QKI04TcLSP9Qk(Vg@Fbin_sWG~huX
zz;Oui2#H&^Y#DIw+_|}dKwv|Cef>EY+!Cs)tE>Cy;>C;4A2@JeB-%@8XxoRF&*3u}
zL=PlepXA|;1q3Qc5E7<No!YsywDdQ%wY8tX^7@uo-<&MGX3vES7oJ(QYE@4>hhXcV
z=sKaObx0m6Ac!X<%$YN%Ygt*@(@?skIis#XS$S1e)ywPFt?L7m1r&N^t9pqQ2=)wJ
zH~HAHWA_1s;wxZi)J<^Mfu0yKVnh;jpjXP!5j`14O)U`?S;p)E!!zd1o7ZW<f(47?
z<KyqU+*2`L)b3Lu^>t}T6`ikF-&NGB%G$81!W0>ge)aoYsz<U*^-J}rfnD8dR4*_1
z^4O+Z4+eufKL7ml8MoYW%MnO%vehSCR*Y(Lz5J8R%bx&2m-KAdupw*W#EJj(dc8yV
zL?@~VhSk=Rp!%@5PHjFCRA;NB(#vQn3H>}S!>jJd@~ND@KGiwCX?5XFr;Cb;ruXmP
z|5H>BA+#8frdw~cOk~6x7<<3@=9@8t1`T=(%VPIN(Z*C|U05yoDxlu@Pe4`HHS%Lk
z(LwId_Nga-oS@SERKbw~XU?2?ynFZV%TY=|7>K^~fW%<gNes1@T;fQ%0AVbhCr+IB
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
LNkvXXu0mjfHbV7-

diff --git a/data/styles/default/light/6plus/search-result.png b/data/styles/default/light/6plus/search-result.png
deleted file mode 100644
index 233defbf202ff5aef894b596b4229a906a5b1131..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1190
zcmV;X1X=ruP)<h;3K|Lk000e1NJLTq001Tc001Tk1^@s6s6FYf00001b5ch_0Itp)
z=>Px(U`a$lR9Fe^SW8G$Q5ZgVoOBw;qLk8-YM`RGK@=`}EHVoh3T`S|w5UZvtxU^s
zRTR`Fh#*?jGC_LKLn(WRLX;H+5%eNVu`EbTZN^c@xqaVp&h^fnTh6F=R{ijE&iT)O
z|Noo+p2v4bi2ssY1+?VcW4(1<Uk1xc=)9;-N81(EcC=45O&db%yZ}rA^eprPbUf*U
zLmhM%)a?j51olI(LL<-^356qiNAHOKp*yVq3dKz;U;dEtM8PHWDiQElB%+^mxitB!
z`-gP#xP4eOwuQx$uVK*>(qr;vqzSP+J53b(-D10cnpivwhB0YDcPC!)_c2p^@1MW`
z$kW#!ygnn#Tf#>}VO?B)Gbk>;9u)matekC&+~R1VM=Tiw*okmu0QV{$(x~OHzzFJh
zF!a*r^>A^E7hPd-=s{3?55!jIZ-K3L7cw1Kn<1(SJvzF~8-$hsT(i}eV>;MMZ(pEZ
zRjTg&kT~8vAciBhu1OiUE_93YMPA`cm#Kf^;SB)SW({Hs4ArWJ<7qk*RAtkE^|?un
zH{_*>+ESnHcFDrLMX*AE3z&nt%melT%8!M9f_=U|R%)u{dDn=jX$h*LtU~-MYmPWz
za5%-?$A!){H5ISVnv~<(cf+FL^RSw#KtXcVfNcygOcublixb>^6J6+hJ`p+78WK1H
z>6!_xF+URn3=?~x8qX;n2~NwG-U!yPQ8nHU#(`%ARz@&9Jd-)6Ci4SseKHQjY{c25
zVi~}ImKX9;PVhuem2e~Ugp6~jROK~*!NA=ih1X1~giEaT+lWeMU@!yA<Luyw9(VVt
zr<`iL0!GD1pQM<9N#l<RUO6h@L|Ri$SscbN10%_k7d6{d3eU`_cvZ&?Owy3KnP!u6
zbGDu1RhNKdzcQH_#Wz}JW@v(ZDwSd?hQz?!W?=0K3`t%pWkrsWuS4ZE1A7KzKPSjM
zQziLXnq<4teD_se0~lxr@1T2}ARSJXm~!zjyQ}gVz@mm5Y{}6{hn<#mWZ$<YL#1g!
zak|yO3hWvtK5~*Aopjhq*}FPj%+E3)NMfq;8CDvAn0HY%`}}YqM|VmV%y5ar>pUua
zBXU1f1Gcs`!G+$8xy?BC^nDEh?NR&G-km-y;hW_?v2?cFjieXr0qhL{DT%3=GNRoH
z?F4F#9}eW`QzZm-X-B34#jpphplGxO21nik<YqyB&G5rv_wvc_RK7k|YGb~!vCbja
z6#}t}?W<Hyc%@s==Z46ktsWfxEa)(qXEMUw$A!){#hWE6=g=MjFxy~;m-4o@0OyD8
zHdJyYa&*#RGEb7cQOa(8YIMxQvlwUMejEv=-N!Y>*JoQP6=_^xbObnlEbtSn0?NJ=
zGEb5`@+ndmvIJhpy!&{~*j#Omc(4+nVitNd+{7CI%!OWnc0&`DFdUnpMag7NsAATD
zNWyK(4+nB|zT$aNRe#)(C3HYpp*yIMaiU}VUmU5xA7cXmG`Y*vB>(^b07*qoM6N<$
Eg2*l^3jhEB

diff --git a/data/styles/default/light/6plus/track_marker_deselected.png b/data/styles/default/light/6plus/track_marker_deselected.png
deleted file mode 100644
index 3bc12a5cd48dc0a823a8f0f2867db80754df45a7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1014
zcmV<S0}1?zP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px&ut`KgRA>d&nm<nzQ541B?t+0e#1IRj7%8Nnu`p2~#sU(d(84c3j22*TX|yu2
z;0qXSO#A}ILJKf~!Wa}23mXb7Fp8ltL<oNr*zx>^oz1fB&fHmc2j?VbXJ_WUd+&Mg
z&CI)RCgU0a&-2=4W>_2&`@~+cQ|u7Inz$k^i1XsKIF-p{Hnlw(DCkb{w)j$97vq9D
z)Wrs3lYyM&#RuZ5*eGBNoB5`xknx;2E-s190=DsyYp4(z>=x(5q=2vPhKP`%ezBRY
zUaL{?*?%YzGB7G`*7A_RaeR-~C4!0x1ZZ_pQ$(hkI$5RbX2iB?=a1mnmV6HCx$&XW
z_W=P4o{MKrJXKlPvS08#xA?o@mNz`Nyk79DbREySu6)MzoXEOt=739!S<3trFG<9Y
z@(TN`DR^#Qv*N|_LYDtC-?rVGuiNhJ;*R^Z=~b<AvOVLj^|ZL_=UUz1+19FMA`X7i
z`2mU84a!vt7}trX!AZ;Z<I;|MJiFySFPCgus<{hYId^}c&0Rj-Vk%!&=&l4j3-(I_
z)cQOHnX8zF&TheTkKS*&=U@H?w(8p6Ie*MOywc`!*-|J`b{I;%60t$SY+31h`fmz;
z^^fOnz1}!<@c5<yu!T({h>=)*__EddOr{paVD`9ow#qLpkHdH0cdDGN|IpPlE$+pQ
zytOBo-S(&#R)QY5sRNP06CT5+(ZOREo7gsjSc$nbg#4YT%3QFA9rIy6u#FER_5^77
zkc^C2Dsi`IHe&b~A$EoknN;LFocny-TV*|B@qsS`h<O+RLx#fsL&{RF5oLHF8Zm?b
za@bHXJ>UtO6!3*l1Nsm^0v-zHHnpY)p%v>qi7$K_(2Ib`gqn$2(lGk$L_p;IKbTb}
zDZ=Qp0|BW90(dNkg86*XF#230vX!XdNJf%|(WgHbVhSA!GAWXgq<}Ac8n8eq)+$3m
z8b~IU6!2wCJ?9ZHZ3&DtFe$|FHI0BN(a&ze0wjke4Qw{>Va%6_c}hLyFL6&=0wafQ
zHe&dgB=+D+d1VQV1e_eUS-^ITB;SwOzqO=3r6jjht4>&2meqqNBY8&-+bCcQn=w`<
zCW<k;(#>7HkjiD1k^ov$BGS9CRTPl!rNyF%^e*lq0B9(sW_dk$4(vr<{M8lCI{eta
zgGakFR*WfL6zYlezG4cbGMvP8zT_(tk>1y=Wg^o1qB{`5R>LWspBj{lC<^&6KK9r*
km8cBTy02b2vd?Y)0j1OK$6cM2{r~^~07*qoM6N<$f@~1#GXMYp

diff --git a/data/styles/default/light/6plus/track_marker_selected.png b/data/styles/default/light/6plus/track_marker_selected.png
deleted file mode 100644
index 9524b924a8020af54e7693d8dd6c6a2ce2213ad9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3634
zcmV-24$bk2P)<h;3K|Lk000e1NJLTq002z@002!01^@s6;|b}o00001b5ch_0Itp)
z=>Px?>`6pHRCod19BGhL#ksrRn`;l)1D4Ze7Zny2JQgB&L{T&--U^m@fuhI}j~_|J
z(v+J&Ni3tekfX#TXhbC#Q*xLJmLjl}fJh<A4SR4cyE}XD+^;*|H#l3fZ{N)8d2ePw
z`p<ja{ayV{zwWQU{=T8)EEFLG9r@?R5~?^#G)4yqg%%S|iU<{M%BhnO?h=fuOwf>^
zB18xa5-$9d3NIzX%Y~y^P_3bUenIP55TDR&F}>(7-hNyWqa#!;BZ8C@B695VW|Xvn
zvTG<4HNsPPuy!^L*rh3hpHZb<x=J{GEp1~oja*I`D<_<1j31>eB8WJk^6>7;k}r<@
zYsL&sMgdk}GBSv9?=<AL`P>s3CqLmrxU2|f2ZvJ9K^0bAO!|GZb1n_rp=E@dR;5)g
zJDKAZxj%(9t5U$iW5h6<ZIse(LD|-k75UpXPNtD`@lK1<aA6;@r2Q%oY6=m;lP=-X
zMu(9W2M@15vY_N}I%wKf+C_is92oLz_rStFEFA)6l!oAY3;f}A-~M87w;evVlveg;
z>lLv0P7{Ql^-ob&36zmerjgY(3k&OHarAJOlvcS+IJ{chG%m;$dV)WSIwL|6;`5sM
zMVqb2o3he|zj4f?c=8?+oRnH&crM{Eh3uNuP_U+|it<$CN=a#GpoX35BSPaPsW3U0
zVVS}X6w`jIQ!!1L?0`^V5tTi0J}C^x&NV*T8)<v^#xH~_s|!U25I;%b_B;-@SFsHI
zj}1l;Qqb=8mpnhgvv=dhjZjTqOg~Rt^qYCxqvyjKmRuFsD|Xf|C|Y9%XR5Ta#jW>b
zdY3HkujE`aOeq;XKrJ5Vq4{o=INb_W{hA2-!z6gJi?{FfYThl!!;MYd==I24VM6<~
zcHw|+$v7lc8ros7t$^X0{&M|rb-;ZUuF+QyRVs$%F*J;m%7PMTTxd1zqNe&pWdHkn
zg9r9CYhCG<j54P2Na*cjKOcB95$%M6qNN`WYEP&04Cz!Defe5f<((HgCKh>^-Str%
z@8l=m{Vuq9>8{|xL<6+g-pX>?metNKH*_@_Dh<z)WlP$hgy(RJO#7fcJKi;B_E^`=
zX;4-l+I8)`?v1Yl8~$@3bfQnE)dnWMuAf)5)(G8DX{C$XD&gRLrx8M`ZTK1fesa#;
z!}D3%et<+W>}ibboxj1qw!U5SCxVe~XH2+Bc=^G31N!_BeM}B?@A!n{As}x1Jo(fW
z?u%ZX?0KZf&5ERjwE;LNmkqpcwDXdEUU8(ZUGv!>1skaVUy?H9g$eFmdNZVtaf|-2
zbhvk3zbR+ZOOsqPT?);r6SBZX3zy%PGiUCV?u%_H4UvTyx}xOS%k*@5DGfcY=s?s1
zrCNXguH0!4R5))1C!pcypDMjn;hhR`y*SbJP}OxF+hgHGxgOW}co}*rt*y&F$?k56
zGwhn-j`8tK&c-|bV6(=$Zhw57yW9?cA^5-%%UZ_7)96teUV=bnLVRbc@3@BDKiY9i
zs(6`#hk4Fkn&h57ahPgvO%=+u@iO*IyYi*2m&2{mz44u?yyGtU_O#qNR@SgaA19yH
zM##qcFag_(obDE+Jt#=AhZ0!a$%O@sOeu4a8!k{up0h_}Y4MtUy!npRoy$*kiJ&x+
z4$#4Zi;v73+=$IR5|qB#`WVzl>R_d-)sOajGF7u;zgHu#eia~}*UQ~`IN(#5Ug0Fq
zk9S3tDJ>iTRv!=VnE6Tf`c!aw!3thozp!`%wna@2bo*$kavN^5y#OUEXt+)t>6|19
zP6BX4`O+podGX5tscDz@|G^oU>}k@-yWfY10+Nm&tPt6~W_Z3bc-yJScQBJJ*>IH6
zf)^%uwxRhEUDNR9+v-Iw9*xk_msQxQE>7<MxQl$SFANv$)=B^-=BwL+Wd8qr#2=QU
z0=MzX%ah#Fa_S`$g7jNCXyFiSk18!9Xt^FpwvJ~>*`pCE?5>Zx$al^1vn!b#>yJjr
z%r)K7nVSqQ);G39z2vS@&Y`h-s?Pw2C;=!eYJ*UvEL8$AcszW^-jhA?lbrKuH)-_A
z&5UHU;`_cit&v}Cl>g%9jB`rK8_%QXot>Fn45N3z^tBX>f;*<{EPG{(KW#ItXAnQU
ze0(TO-uqr|W2`7vFLtSCzA!x<vpVIXbo#1QupoIHmM=-rA7;h~`*D~25Z16vme+R#
zNms~x7P}PUesGMd%!({{zq_Y#Y5~(Cbbu8Ch=UG98C*0g%!eaGDKU)KFUVWF<!0N|
za#c!hBW^(!9KfOhbw<4=ZRn!@!Q+|~5)D^bJ1i+7iOvuA$$7#rD^V>U=DBbcvuFgO
zgg|-_^yx#Jsa=PbezwXfI7y%#XIA<<X~Cde1tKm}FJPn<F$~#E9hDHg1d+kRqfs`C
zEWZgu6l=>8<!*K+#x?a};jNJj*0GNC*km%i5C+e#GG%x^&69!C!%&U8z_{g>oP;?J
z3@A1)>9)(vIO1VnrsTVrl>B;HaBOojjH1?e$kf4)B!!3Gifon+Nq%s*DkZ;Oc1|Jc
z9K+7_9Wr&i$d!RZ_f9rTkt9D~m`KU5mz{AD2Ax^EvBsNkJwc;7`opqWWck62l#;)X
z><SCQh#;}SLcvf088mbtX0yohJK7rQup$?n)k9#X3Hj4*92bnOh^r=iMUQJXiwr*)
zxY*vnrR47;yP!UXsWW{#BpNUn1!F7BK+#2w9@lJ?QDAnK_A_VJ<P%MuL2fF$k<65b
zTfjGGO=%dtgTW|9gyY-Lr;je`Y!q;YO0n5>T00;GXaJ--)MnTW9L)xOQcW1WBLj#&
zec0kNT5v6UutIJr_~dX{N^T>8IpNK)duk0voic40?gVhAh8XT>&sECJ0vWzWFt1$e
zCgA8Y>gv_j84?|94~I_nYLu-o>O1muVF$zXzi2j_EMgoS#)qBg;wR#o628v6(nW3`
znVISK%d1`FhElm%w!2ZYJj>t~suoTJXD(JS{V(BYO*-D$6WnY9679xYqc?8KAy*9o
z)@dv=;FDZ%m7LE3H?G&W2ew*e59jo#o}ya~=1W>7gaLIJA0~tEaZmzr9^~GO<z|H$
zO`Kt`O_ul6Z$1{;@l8WS%Dyz>t*UWK!vs^zmox&DX~Tdz890P-tCaj{N)Gw$Pu<ZQ
zbXmN3I9&AKnU*6x!w@&9k-)FF1UALfN#z|<AsY|Q?HAoNqcaUNaxuX)6(aGl7=efZ
zb@6Rx?+;(<BAaIBM{moA<eD$wNDu9>-`(IL8y?J)Uc+K?tUD6kVkg)S?$LM0X!S@t
za#7PLNR^%$>qzxk+F$Xkc_8m8j1Nl{7va(4Y8J~OW4IdeKHRDu`Pr(@_ad74PH%({
zS<%87j{NcPv&GS)SC7*0YHEA)EzjXivLT{G<BcQKfp1OCdlKWrB*3!*(&FddJ63nU
zb)r+VbjC&@Vd*+pH^2YNn7}<}4$S$+6y{immFLE~NYfv-2R_2HofZ6a<G=-VV8I68
z`*swDGAW9-C0@23rC}rHe1mCVD}i*`uE3#x><O&{waNLN<E2UCJ1Xoq)&38*9*<Z$
zTgOBJ1=Sv%TT~yb<Fl92FcS@PzT*L`yjN}U?|h{?@K4yWEO}6@@Qla7PjdG9?&T}L
z4@sFq@wobT@YHV7xAjsQc4Cq|sIo;5m}-5+w}G0+)^;t&fVxz1?ZD%rk87CS8HO^z
z`oAAeOh@(d^idlAs{kg+>jACQzd8|V!3abQsDs!tORgAMzG#R2`(XGp+$HU<VaOA_
zKVcG}|25*@vwP}0OBZ=(5Xvsmw_B}a+$+Y1VYri38b)|{G(t-s4OcsMSYO)WGswv6
zwE@In5-M%nYYn;Wd9G(5WidYnoQ@~Phhex=G<pYuQLNGgZ$&2@zW3o-($3Myh(9<m
z>Si?-tVoomolt2=tb9@H2u&fgU>{5hXT;d74a1!<dIy71Ft!3i1(M;Q8G{~IbReQX
z%(8nY8Ix!q^*J?dY0Qu{0ykAg`Qn!AH9>DSLQZEJ##Ugc0N#A#MXrYtN4G{o9RVIX
z+NQOmPv5GGT3Sw6`BfTRdGwi*L&<PVm4?V=OIz;-kNTC#2%Qgo3S;YQ=JnrhHkLlS
zrx61F4FmqGfKlK1(gxAnn`9J*<CU6e2pIhX6W;bP=cEkl=TiY^?2fwmMeAh8B&{?g
zh=0RSyTA1T_#3neSqA4i9L})1c?F-RBB#{n86${>@2t~>tKcqWXRPf<`-DXw*RWI-
zhT~0Xro}6$Y*F*oLUG(GI8U$BKb}d(-l<PjLLZy$l8M+`RvHq#;IB<XDO0Dzt0l){
zBB3(bj)tom;U6Wl!_4^GQW_F3`+JR>2l`I|uT!PfR3S4V)6tJ-NpSLg`9xFU)<l-R
zEFarSi!mCtq<L6CsM9coIo5WrJkeW$hws`K3fs~lQ`(e<!c<jNu@!@#8_PMn4l{Do
zA)p-^u*=n=Kg`IzV~1{9l@=2Oj)^py!i*WYJj;K32-AuRatK}2dXH;NKD*D1C@o&7
z3zsyMgf++I@OLz0?OfW#(=>X=dr7=zbB4ov>@4y|wDoNnS6YlAe!7@18BPC#Y&J~J
zvh`n*5R3x0PA!HC;LUgJA~(h_lh3RvO+N^{GQ{L8%r$~*Fi3<@3kf7PV4OaNokydn
zAt)F^fr9Y4hX_O<Vn7|nhedqCTl0KDI|ifZ>1Lz;e|yebP=dJ46#xJL07*qoM6N<$
Eg2-_80{{R3

diff --git a/data/styles/default/light/hdpi-ad/keep.png b/data/styles/default/light/hdpi-ad/keep.png
deleted file mode 100644
index ce7b6f20e5ba507cfda191ac9e712ca89db4a767..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 126
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k8}bl&H|6fVg?4j!ywFfJby(BP*AeO
zHKHUqKdq!Zu_%?Hyu4g5GcUV1Ik6yBFTW^#_B$IXpdxNh7sn8enaK$ZObiUH42(&k
RMjb$522WQ%mvv4FO#rSW9sB?Q

diff --git a/data/styles/default/light/hdpi/coloredmark-bg-l.png b/data/styles/default/light/hdpi/coloredmark-bg-l.png
deleted file mode 100644
index 2c1fcae9262d2d6571d4e0350554e0655223c410..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 765
zcmV<Z0s{SsP)<h;3K|Lk000e1NJLTq002Ay001fo1^@s6?{hfx00001b5ch_0Itp)
z=>Px%w@E}nRA>e5nz2qBK@>%Cj4Zn&O^Qgta$`HcV3Lv|3Jnc^5v4%lBakR8{(^=E
zlw#AF_!qF<SOzJPXrQxY5t)0Xv9Q2GbKmT;E3+f5*4~-fch9^T@7p(CTgyv60xLBF
zg`{alqtW~Ec>KLkC~VJWvrX9h=nk6x%L8>+sEaC<%6YX~y=6sGB{ATBzrPEJ9}xZ(
z$GRuLJ=%3J0LP6+<J7Z{)GT)3Uaz+W1&26Vl9K0*ySQ}FY&QQqud-i>4H(`m!mCG+
z^3yJ7Y0oyiy$`SdUs@|(j0Jc&9Bxdf(-S~%i}t;m12!s^N_(|h?ar&i3yp$-9c&k{
zpI@*OTm|S$K(|7n--RgQG<Kd%6qXt}pw3n?L~{@@*KAVLco`IJx!;Lp)n3=kQ`-F+
zUwB!GztI=#uXl)t`RGZjm~ESY8B~BY^f?<cSS_bPzK01IYl#t5s>P~7Uc)Xnz5%Uo
zxR}(y+#~k>pvK;^hbNQCP6l8(i0e*^G@vpt?w&|AC8>UFENhX0v35Q^+DrG7MT-m!
zM83~vrN~-xU=P>LJlecg6IqMJ!~b53#>0-R#RAMcR91?tMFz%u=~Y%}Em~w?!2Zq(
zFdj>hsznAam&<1`!t7$&g`wrSDnbT!v1>;)ltBBA8b?!u49regJI6eyS*#l5x1~8G
zG9Jtqr}a+UMaF~qZ@HK}?5rHf*5d16wrvJ>Ii+@d4BmHYTk~18V4l+KjK@N8Fc|#8
zS$<7pf3;xUM)i9A8_wok2(yPNmWH__fb*p)UTses&XyULHiLk91MUQHM*xE4Ab|aS
z3hy1qt^;iaP3c9koZc=;zWSSKi{Ni&yL1tnpP4s?*H?c-{3$rox-PrOzdSG>#<a{l
vH8cOq!!@o&jMFXQ;!~UX_k0B2&<H#Lzt8B86C_|@00000NkvXXu0mjfN|$7i

diff --git a/data/styles/default/light/hdpi/coloredmark-bg-s.png b/data/styles/default/light/hdpi/coloredmark-bg-s.png
deleted file mode 100644
index 4303e3f8c75a2694902b141cae38cd76cd7d5529..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 357
zcmV-r0h<1aP)<h;3K|Lk000e1NJLTq001ul000*V1^@s6n+_Ii00001b5ch_0Itp)
z=>Px$A4x<(R9Fe^mLU$pPz;9mKml$Jy%X#PvxJ1(V7bC}0W9Gr0|OpIf<k~K$nn>b
z_R+1RGi&mTwSBMOnzz>_$zVeV`t3l|G;?SJ9ia#GhOW>KTJ=j8sSda`^nzk`KroAJ
z;~xUhHb(pvd*V6wr(`MuggV~VZdi~q+xfWwKxh2dQITG(^dn^|fr>uPu0}6CVYXGf
zM(RvHaml+?-YK#QRi=<+g}2@uruA0%na~ui+qB*af7en9d8YMN_*#I{x=rh?@Ov#K
zlXngwTo}Kf3)dZu{4TceqZBHEI)iBBx3Nmt&fg8{9HNo0u?k6Jf67Qj0Hsg~Nxusx
z#Qu6zLWHMN2!J&53y1~~-Q#o}*1dn6fEaA(06Opi!5s;aGS(W$00000NkvXXu0mjf
D=pvY>

diff --git a/data/styles/default/light/hdpi/coloredmark-default-l.png b/data/styles/default/light/hdpi/coloredmark-default-l.png
deleted file mode 100644
index 268105c93ad1058de368c32a7b36c2bc7fd2453a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 847
zcmV-V1F-ywP)<h;3K|Lk000e1NJLTq002Ay001fo1^@s6?{hfx00001b5ch_0Itp)
z=>Px&2}wjjRA>d|nz3%wKoEvwgi?hv1r#ZfKq3#2Dv_Yg8<00Zd5uurGlcY!K<S_(
zPXH2hCj=5@C{jQXbbSBeJ^glZx3+iBPCU|oo?Y+G{A2sPyR$AfGRtf>dxncc@Dw~U
zpl<v$d_jL#6vbzqxK*Mc!30b}Q&AuF)rA_iKynA1g1?}v$cAj~3@&O&ZGsc<2h`<?
ziZgHo_Q7MY1s;^T>U2(R)V40asgUi>K?DwwZSWD)<(!HGa6gu)+LnFPw=VLr9cwE~
zI|%H8Z#8C@l=r$ilno$TF7mb8)po1?atyAG%?<i-D`QJK$tIBPAo981pmC_j*zfEw
z$}g7i?sQ7FfqVp!@AW+1IMNHs|Fa_Uq*Fu@o#g{~(BhE)MTV2tAc!8dY<ISP9pnr6
z<9$+ZleCO8jk7-VB>&H@B8>lI5JW>(zHu7kng|5BTtzO|c?kI1`!tImoM^h}GpNo(
zPg|n!(2x~GoYGH2F**qzIG(p9o2s8U7@tWhy9+xQpPGY%#fhF2xM&s^WSW!)RyD~8
za)lB-T}(>EjEMsfmmpD-k$YxinR;j^FIcnQSh*Lq<ZxlmougG()!2Z2V)4FeqSw*~
z^X?q2x~j$otV~6aA3+(w@w;(wj#gb&+XSq%%uvL+L<Jm0oVS9ningLUt)UUTlt>72
z9pf_g4!f<w3q9+Nxx@zSkIuuMgLL=K#W{MLiryyRbpMqKl~x7kk}cqTtCQw2JC~#Z
ze>E=8P48RvwYU=bX@u9{ZJ1i7T`>{#omf1?zO?kHytU`$mFaz{&cV5*;lmvsR{}tn
zjiASq;wb|jR}!xbdOT^`GT?C~;>)1Nv(=)2CFNwqmyLIKGwpxKi=cf|jq5N^lJA8!
zZI9R))^=$K1Y+aa5VxRLee&>z3-c1}gYe0NvK7)*cLdbN)2<ZfGOSM?LeM%wPvf*E
zC%z>!XWimQHe}0}fbMQMIwS}C*;3=2P}9pw@Y)ejl3aOXWheqrD<7t5&8-j9KIud*
Z`3L=T<-5;?NLl~@002ovPDHLkV1lq5lS}{r

diff --git a/data/styles/default/light/hdpi/coloredmark-default-s.png b/data/styles/default/light/hdpi/coloredmark-default-s.png
deleted file mode 100644
index 097bf7868248990bb695434ccddc3b798c71a41e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 620
zcmV-y0+aoTP)<h;3K|Lk000e1NJLTq001ul000*V1^@s6n+_Ii00001b5ch_0Itp)
z=>Px%CP_p=R9Fekm%U2^K@i0~2`Vun#72c+8pT!=gZ>3V3e#F>z%G?`)@jpeX=4#<
z!NQL+ptbgXKvYnhfPzK~P5ceGFoY!D?w!#GkDc3_nKygcyPbGlA)#Kc_mXM>X5cg&
zh5hgmmf<nn^E~g8@qd7#J(z_z@F&!8*oDbIubv`ea39*@nSk`4EdX&T{H&qsd#>|v
z77oEan1oBPagm?QEq8nYh{{%JET+I*v|TaWPr)l_@QyLpE++JQ2xg7?_qgg;1pheH
zzt{!W5x?<){1EDex6q(qn~=Z+te6ChIoljg{s=89QQ6~dw@ND!;?`B3^HzSL&Lg;^
zMDwo6$q|KBm21p4SGR2d{xd4(K-pF%hgFq;k_wW8%?d8Xk0^y}WxJR<UQT2yxD+2#
z3a`p`F?GDO5>{|2{y`}WE8E4?@zMiX!KL`JQV4p$=y;u1NrY(fb=Xi}h<(@8<d{-<
zq}S<j&E-1|k#Q*9p+U-buyQ2$&?I0is$0KnA|`FEf%GbI8%6xrOfcgIoV1A#<cpYe
zit<w%NUxIclN3KGTnaYW^b;4V56WpMZLNXyDstpEZ5NoAJ$?i=PPlO1>t2u*A-qET
zHk7}B25%T8C<l;y$K`V<UzG`{amq!8leVHKJ8H9lc_?kIU&xl(g3eDo)CE#V1m@s5
zYz28oiZHa7Gtjna_5>(yka_8U2B19M7x)D4*djH?(C`HknZS+qOQL%K0000<MNUMn
GLSTY*<r~5P

diff --git a/data/styles/default/light/hdpi/compass-image.png b/data/styles/default/light/hdpi/compass-image.png
deleted file mode 100644
index 3d47184412466db0bfa6809760aaa32d57d4121f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1880
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
SJR|1-0000<MNUMnLSTYc@2#Bx

diff --git a/data/styles/default/light/hdpi/cross_geoposition.png b/data/styles/default/light/hdpi/cross_geoposition.png
deleted file mode 100644
index 1e8c404c054c575a11ff3315c46973fbfbc63448..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 575
zcmeAS@N?(olHy`uVBq!ia0vp^mLSZ*1|)kVnp=SsV{wqX6T`Z5GB1JbpPnv`AsMW1
zqc?gnI|}TbY$7(vibYXu(k1&3%9m~|-C{a->D{ZEIa_?vWj`?MTwco4B>3*o)q{uJ
zEbd$9T~InHc5e;OnL`HKi%;*V{Cq-4O~qGf?W$F54ZE7YCQ9E3p0(`#hgYvXWEmM0
zZnVx8aV?yc8aaL5Z#B8aEVVoncDC4lsoHD4AoR-}<8}S>R05~42x`rol3Mxgw)Y&v
zv!dNg)Y=pB)FpE!PGnxUL~vnK>aIx##Uw2scu5IrMJ&@MMxv~OX|bc<Wxa&2A-x-?
zT`%z8r?}z!o?pck-8|kr8@9_f@NAfQpf7RbbxVfKsBD(H;8hi~pa0y;Q`dOx+AQ-=
ziu#`(AH6*PY?`{!kE>akZ}vQKj(g%hY4*p8Ka9^_-)PNvG?Bk@Vmz0n<*xmWE9=z?
zIb*mDAK0DRyy(BnyG-^2*$np*7uW87w<{s8ad(i?&*I%e4cB$<bPGx7n=iZPTEzNh
zr`WnDU-NA)alXDcb<4U1SKfPhsjsOHzqG3<Xur1R+zszyJzsNq{av@D<j}5i)wS9h
zUw2PJQ5^MQ4x5_M0kQr7*?h(S2SvWFk7D=V^0}zfWbx6Yk7q8{8sGfq)KmC%>MCUu
kh8cVLKK#)C&;66_t<v6~7e8eE2BruGPgg&ebxsLQ09;xMhX4Qo

diff --git a/data/styles/default/light/hdpi/current-position.png b/data/styles/default/light/hdpi/current-position.png
deleted file mode 100644
index fce58393314bb5770c7a398f9b06cc5d83543000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 890
zcmV-=1BLvFP)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00001b5ch_0Itp)
z=>Px&G)Y83R7efIm(ObxQ4q)Hy-m`jm1vu^T8dT_N-0JE0;S+V6fb%cf8jyUlb*bI
zRS#aolLrMsk(`PLK`Dy%5AdM1h?Tb3N<eDcG}1I_y8G7oPMamsU21hV151{do%y`?
zcHYc)75$y5)UoS5sh)wOI=O8~TZ#Qj={~r+uK8k|>XfN0kCyYFM#?Ym<T1QiShdLm
zI(z>9aow@|9%;RgND+fc#aj4Eh^uQ?$+cIB!RtI@rp@BFtMiYqyx;*76h9E$e)85}
ze9wU#S=OL#Z6_<;MY?qdDQ)@2a*ab~Wr>`hbNpK%a-8wC*|F1wXE(<E9Q?p4bMe6$
ztG(xmZfT=fb}#AFc0b?1F;gy*J^z)=YKfde{@lW&OHcXXhVB1-`YLldchgFD-nG&@
zDc;>rI-U#!1pT4dN3%aUYs9bURPx}7c=_G%+xq7lz`WA4fW|Vt6wmgOQhpm!?;d;)
zU#qQy(?S#3l|#w?p~>?5=VLVw4~%yj>+X9cD`jX{rc-H7zN)M|v1?$s^7+jiV)Jyw
zG!jYPX(uOd$QI+6h%L#w!4xo#46+xA^gr7hG+)F-Y%qky4+5-kPH|+mn!Q0Fzj4GC
z25JJBs7NRdIHysYFqj3VMj7M@NO6c7i~<A}m@%onD1!kNDa^@$fs(7Mr6DZ^pKEWk
z40Rq%jV@Cw_|1TW1!nCWH-qUhT&0XgKb6Yj4M%$;EaOaSG;#FPW|{PEW@;!0G;#FP
zs7-n{vrMHpsv%d<D$&HFwsnR}<^05m7LCMm1<E0669%)uL{_`dNRTT~4pA9m3xio;
z%5f55#u^E7#dRALN+|O{OvHu`+Yo_XKQ<6%&`9===}=(xK@bzM!QgRGo}L1MGGKW!
z1&su`0_6~f*@ZkgOMJ2DTg+X1U5n{~F~FMWBZL_=5)L~0=f4UA*<N0$Kv#;l7am?f
zANH&Pj8UjT2s5nQ<%Cm-6hSp^#YEnIpO9n{dAkm6NS;5y0%tV{VaEOQu(LehC0_}=
z{qh9?)#zhV97+XFq8YLmXUVNr#@A*(9I4;ldbiE=Yx6&0>SxFIp?|df0y3SK$}9-i
Q<NyEw07*qoM6N<$f@R~QlK=n!

diff --git a/data/styles/default/light/hdpi/infosign.png b/data/styles/default/light/hdpi/infosign.png
deleted file mode 100644
index 95887cf9f84fb6849959500cd3a31ac52bfae5ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2178
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
Ef|uPL@c;k-

diff --git a/data/styles/default/light/hdpi/non-found-search-result.png b/data/styles/default/light/hdpi/non-found-search-result.png
deleted file mode 100644
index ee78acb4434fb9fe4e2f87a452393b13f46de7ee..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 506
zcmV<W0R{evP)<h;3K|Lk000e1NJLTq000*N000*V1^@s6;40Lh0005ONkl<Zc-p0v
zze@sP7{?33mbP|tQCe(`T%1Kra1ZCeF>uuXAZpOjAvY&yhYQ*h3L09n8oR+uO67ih
z`@Zl957Kex`GL>q*O&KwzR&H10brk2X^%cpo6hMQwP=%OcQygQF0IpdL=(_H&BO^l
zphIkqL(5UYk5KquU*7!s8na3T&dCX;*({tw0Y8lf+|eiiQTX&C>?(#(EV^Axb2&`Y
z=}>3q=LkMOUHvn9wjN%G;^*p00-|;Dd3Y}`9*FQt_w-bJs1wHu)jFrA2pmWM!R0Ev
z3L&s<SFU1Xf7@*+#;foi1U_DZV3CKya;Z;$WWt{za4M3AQ`fTe1l3Hq4T0mfRrsRU
zgQ8)=7Z5nd+l6;JP&7^W8w3_)tMKJu07cz|TM*d1t-}4uL_cWJgf}6WN+%8eE|u1I
zP0EC4X#jzhPBtm`_r40h)AjE|FuQ`4-mE~a78D*m*5MiIKrp+4m5v=8_`aU+oBuXr
znfegSu3)82^Fr@fu0r!bQ(-&(f-az8rA_l#5HrVS-1Jne2Oma#jSBP?@$u-boH!Z)
wd-RfyBR*|+@_5NG+l|&}Lpo8X#W*MZ1FJ$Iso;3Dh5!Hn07*qoM6N<$f>5sOcmMzZ

diff --git a/data/styles/default/light/hdpi/route-arrow.png b/data/styles/default/light/hdpi/route-arrow.png
deleted file mode 100644
index 9a0c14bb1abf84e1df2fdf061818436736f28cfc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1893
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

diff --git a/data/styles/default/light/hdpi/route-point-finish.png b/data/styles/default/light/hdpi/route-point-finish.png
deleted file mode 100644
index 6209ce956a238056cb8c386a7e57274e9c0f40b8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3494
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
U0phclrvLx|07*qoM6N<$g7h`Aga7~l

diff --git a/data/styles/default/light/hdpi/route-point-start.png b/data/styles/default/light/hdpi/route-point-start.png
deleted file mode 100644
index f928ba045dda36ae41b982a46785962f19396eed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1826
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
QKmY&$07*qoM6N<$f@*7nI{*Lx

diff --git a/data/styles/default/light/hdpi/search-result.png b/data/styles/default/light/hdpi/search-result.png
deleted file mode 100644
index 9d09a464a93b73f5601e43a1ff46e81e43889f81..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 617
zcmV-v0+#)WP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px%BS}O-R7efARXa-qK@i^E6N4ry5hOkv(I$<BMGC>fQWP6I+f-tw;GeJ-Z2Sem
zLIthFMj?%0W8<Uo5jB+<ACcUx^DQ^W8I#<dF$2fkGBe+|JGb+l5G^(t248EPro0Jy
z2HpGz^5;^@3wIse5onB_Rol_m<ZGH6Tcu#E9z)F&P(kMH<Le;a(VjfLujt*&FPSgc
z;<4lyoc@FonE^}8kGJcop*BfGcb1ZibfSDU(Jz9BVlms7?A^M3b=3OtrvPvx1JTAz
zr#;f8Y$?SOk>vdOKM1h%itU`9J=rRI_#s}(+MiqZy(cEc_H5jlOj#8onf9N=BS0Ui
zErsW@N-pfYhX!X>knAre?4g7#P`k#6q>Py21oA8BIoc9-=e}A~vv%}u5%@5$IOY*J
zS}fy(2KAf^YkAb35C*U~ZV0G7X(h!dZVLzg>h}l(Sil4Zp8!J?cw>+gWWEj<OeQcB
z%J)17q*2_5VKAAXQB9;6UDF@N1ke_N32oL=aSy{_^6DJGn963&hhZ=c0S(0kU9B5v
zOS1&P02VNT#U~JSwKgGKz8ys7LM<?W#l_wyfmDzxUfq}Uz+A3mMV;nAsepDsa!0zA
z4dFsTSYxq6tt;C`hfwde2n!;~6YSDtzg2;7g=rUZkZY8bYJmYPwwl|dc4eqtIS3cD
z1>=ti<spjl!(pOd9^ZtX*8DQ7*@)=>fBMxVe_ekA<CHl#q9xUO00000NkvXXu0mjf
DiU$-N

diff --git a/data/styles/default/light/hdpi/track_marker_deselected.png b/data/styles/default/light/hdpi/track_marker_deselected.png
deleted file mode 100644
index c5312a8ab6ee84642d4db5d23ebffce3405b5f4d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 614
zcmV-s0-61ZP)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I00001b5ch_0Itp)
z=>Px%AW1|)R7efQm(5BXK@^3nNAV{Lx-uC_76I`ETnK{;msto7>T|f%Cvf4yH^>8I
zVMM_Pa3KSVzJLgUL}oNA1%p3~j^~@q3}sb!In%A<fkRbS-Fr_}b@i?4$h3i4t(KEn
zK`e?>;&_89Ou4~hmD^$|ilRrA=^?=ZaYeik+Xc4x45U()<D&RmObdJ$+ZLB`B(9}Z
zi}52?6dV8s;*S{TtWCsB7FXwM&eR?3nmy~*C}hR^*t9#{`u<tf?4I76gUW+Bzy7~*
zKMm*1biT*TP4t<W&%LgT`@Ezb|C7eLuteE`C*l_xUHrOyFspkvbwRh!er5pcvxDaA
zXph}&*Z=5YQsTFKpI}*x6+J9h&HUEC7exueN??mm0?<Iqu$d6Ah+{O^V5S7Rx~tjE
zFV;u;BeSzGlr;0d3XpGRBu|v+EN`cx_~C<Z0?;ZTOd9mSMq=sG0$*YzpolQJ*8{sZ
zD*`d55GLV!$THhzut1FQMB(Ol+6<DW48*7lr-|8?Pt;0Jo_YOK;ym?0M#_qhLy0je
z^u!92g|Z?Lql_>&2M^@ltO&$7LYV7{2NHf@#Gbv|fN$W?*g?1?lEyrc@JWB20v~)6
zfL1BjxR`Ck8F9*d|MsCHaYXS6oKPERzT2_bTE}i*1fH$1#JhI&afRRKvd1Vi>+WA~
z?dkK*#qM3`9q~8&g=y_-ThOg*<|LYe_-a3GPhNx4u;7n7#{d8T07*qoM6N<$f+(^i
A_W%F@

diff --git a/data/styles/default/light/hdpi/track_marker_selected.png b/data/styles/default/light/hdpi/track_marker_selected.png
deleted file mode 100644
index 5d571cdc2c55ee92cac3110c878a17d7ce3e289b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1641
zcmV-v2A27WP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px*BS}O-RA>d&T3c*XMHrr$y_99QRBfqR+r-i)U?6IgKm<vMFH{5Z0x>)q1@y%}
z=!0)&<C`x&lotiOBtB@2U<^b{Obkh_27}@S!X>mdX)UHuWa*Z*d-j}hzG-K3&gsm#
zbX)6A(#)BE{>%5z&gK7SO35OWN8jVA$?{|uNu}<09MVE4xr=a~p_Hbfo^xI%l$Ho5
zHy9(=iDmuKoNgZa>1ArwYMw4sLHj$SnM5YHjuN((6W+xgo{FQ3GHOvmhd6OA*`?ye
zvDZ3EapV<mYzNlo&!?wb+a433w{ku^!b;gfYf5=pI5U`?82{mXetkKPp2!a5^PIik
zeEku|QriXiTpS}&d4&^2$FWYmG}-cVK2Mz}a*-V9?wedyPA2w>$=nu2Y0W&8j;Aa3
zr&oHLZ-wa!b)ft3WV=;P>|Lr+Hvz=2kxC0E_BW52ct8(yp!40oA95VFi*qL#q-3f3
zC}kDKoZ};}-1)1?hS33lw{7yQN$|g<ClcfflM_q_1k(m1uj^Y58n6J9&i1@t01MVi
zBo4%#^GuvjyVoW=o?4S$*V)9{ni@!BE=?O@v{>d-g&8t6QgFt<8ZKWvdZ{w%h!ZbP
zk!!-X5BV3i#{q1WAG8+s#o28d8(8A4ZJEtIoyjdLQ#2a|)NPAT_m5P*e{-O8dTPe8
zqsT}eu{*su(R9SU#d;j*ICyO%WyzgU74~jycwqm-D|W0()2660ZoXS(UO4>AKPUUn
z%v^BOgTA>_IWhX`>NAR`>HtpI;_CZ)qfVVeJ=rIAtVwNCifXA(4qF2U`lr8*q61SY
zckRzUbz)Z+@mzQi>4ZJLC%1dCzymaNL1z>PFu=g7c%=gf%tXglMGUGj@(;EqHw5u4
zqz^iwJBlo@0yB8!0fnfNJ4A-QK?*SE!$$tQu?jhHrA$s=waH(_*`4N|93z|WO^}`4
zY4Uix`AmdvVdHApnm`Z<%mV9KsckkS4&K(V+hD<(92~i6lQ&M4Byc~^@J)x{?~@Cb
zbmZ;r8Pa)2!p|n#u<_yV*5$C>37CbzS%zdp{3KmkZ7w3VO4Dxh<9LNUeQa6_-lal*
z;+Fw0WOM~KU`yBMrU5gsGh|X>$p{W9?DK8~>Kh}!um3hF%y2~tt-%W!$m$Ag!Ddha
zW?*MX1A`dRhZELxNMYK<0k3R92C}*WTd=9?^Uwr#CUaO1b$$ck!F(zqSg@E93oVd^
z4qY+Xbn^l`lL@$+s`*B2qan-PMn{iB!;YmZCYv5!ae2USd*C5z8VJlZ<eElb=`;O;
zCYwr5)&e_IS0A1ZUqeNeK5})R_tWFF)mh<}G1+wU0ekRLcXKb%H?2lvegibpw#MY8
zlV8@?Mm+B$$tF(NTFc#8y^dnpDTe6=cCm=Xjaf)RGNNNacu;FG=`h*!*b~^rA|^LH
zL`?&kl!h#08y!6k4e^n#3>R#zO%JcUs>EGoNI@E?V?khM8bKYup9Wb|aQF4FrM2nS
zfqPbli&i&L_l+DDX`rqTfmu_7aV6?RBn>i<)fL!+O<kXdCa^Qy662!P)8T6%0Y?t&
zBg-bD$|F51V>tovkTFH1uoaf{12eEQTycvuZAb^sO+x~X9M(-!-<#T!<jd!>k){)-
z4R|4=E3g4ux;{4zn1Nkt!4<dY)W$nX2=O@*@YgqGo>w$?jnVw<nVgJm7MjpNA8dr>
z0^pm&Je!f>em=1x`()U4IWnaUEy;nPtPG3Nv@l^fs35ry%f=v&>v+2~Ef={wMew*F
zev-i;<*E<22fs~J&Z+id)zBH^W@1o1h*Xb3JTBnMA_|~gpBIl}w4(4v;ejsbjKT|y
zz^ZsX`(Hg?Y*l{&c!ZY`F~P!5z&ZCZU$=Zbb@13_>l@QKp+?GGgBLQ8jWXw}vI3jL
zSS4uQ2kQEAS2-qMWvt{2%k{9KaHtv&9jR31Bi(C_X9_6+FyduIwU@gF79Dut@+@LM
z(7JwNQqI)%BVW~t|M4@cb`2=ts>ZVpUPkb^5cRNAvT<tYh7H*AKP8#;1g-&{P~HBk
nf!~?B{bvuqBWN$@zuWu^drLBdK%1D@00000NkvXXu0mjf1UUqT

diff --git a/data/styles/default/light/mdpi-ad/keep.png b/data/styles/default/light/mdpi-ad/keep.png
deleted file mode 100644
index ce7b6f20e5ba507cfda191ac9e712ca89db4a767..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 126
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k8}bl&H|6fVg?4j!ywFfJby(BP*AeO
zHKHUqKdq!Zu_%?Hyu4g5GcUV1Ik6yBFTW^#_B$IXpdxNh7sn8enaK$ZObiUH42(&k
RMjb$522WQ%mvv4FO#rSW9sB?Q

diff --git a/data/styles/default/light/mdpi/coloredmark-bg-l.png b/data/styles/default/light/mdpi/coloredmark-bg-l.png
deleted file mode 100644
index 8997c45f0dc2ca21065dbab17ac0892f1ce504a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 538
zcmV+#0_FXQP)<h;3K|Lk000e1NJLTq001Ze000~a1^@s66BYf|00001b5ch_0Itp)
z=>Px$)Ja4^R9Fe^SIbJnKorem)j)rsND(C9zZ4YrZu|kkFA)Dj=*GQN=)XvcAVvBE
zfn=4`b6^URl$<+h0xmjGW-@c{xo6J2ZiC=lPE#N}#eK8cT-0@a3yj5nzrR8~b9lQj
z48PD`M^Us&)AYyndsn>(ZnxW6S(Yz|_5fmWS5y$KFut5jCeQQveAi`rY|NV=RJ*CF
z>J4DiV}Kofc^t?0Q1he1rZp6`dOA9?EPKR~zQe?q98stAB}PYx){t32D#rj=Qm;uh
zBVx&G?8`f=k|u)Ob45{nQiW!~p5J+rB-fTbX;Q--h@r@FPE&^|=O-0(SIM_Jtuj)>
zfTtTveW|V>sUYvUp~;aeF^S#a-TIUS;jw6W4c8&DB|*%TFT^Otf-MPx+2Q#bgQUc^
z5FCS;8Ph`0`~5UW4+4oT3A(JrBc|Qdf-MOm+}a+}+frgng3RZ5sd|SN4(_5}39~>F
zbT|D{0rePPs#k=Vk|2$kY@*899;oCFQ^J`DGV5TniDjuJqA(x^u`HPkp-cp6$ovi9
zPp6QiFENNkOiPj3OcUf^r~D+#*)!RM60i8l(@h)N(#J=+gD~C-9voS_TyfODoqyw<
c+kF)H1x)ax_1wsqpa1{>07*qoM6N<$g6^mG-~a#s

diff --git a/data/styles/default/light/mdpi/coloredmark-bg-s.png b/data/styles/default/light/mdpi/coloredmark-bg-s.png
deleted file mode 100644
index 2a76753bd773ec1c62f1dd6c0dc47d7e3fc7538d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 230
zcmeAS@N?(olHy`uVBq!ia0vp^@<7bb!3HE{Dnu3mDaPU;cPEB*=VV?2ISV{p978Mw
z-%c^)Yf#{E?cSUxbNrxkk%qhe1KvBO$K#oOr0kA)B;{Oc`1B{YK4hZ32m7AyVlO8M
z7xAu+iw=4u*T%$L<T$VOp8Pw_^m$Di{Axli%oaaCZ_N<6bsFdNnaZ-}nbYroseGak
z;m4z?AyLVCTj)<(&r1$JFSYrSjs`m6AvG%9n`JcFdA41zzP;7gB;dJqzZ@(3z5j=g
dve|8X*Vgh^M_%#A2cTOSJYD@<);T3K0RT82Qyu^S

diff --git a/data/styles/default/light/mdpi/coloredmark-default-l.png b/data/styles/default/light/mdpi/coloredmark-default-l.png
deleted file mode 100644
index df07f262246f63e246d0ae17c8d3c2fc335e3e2f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 532
zcmV+v0_**WP)<h;3K|Lk000e1NJLTq001Ze000~a1^@s66BYf|00001b5ch_0Itp)
z=>Px$&PhZ;R9Fekm_JU#Fc`%Ntl<JMRY>eT0P2ib7<z<W2*g3?zzI5ZWbML)S{Al$
zNGSYX?N6!*apELKe$umz>+gL}iT{P-WB{tFni75wZ{Q`ofWi)L;R-$%Me$1gf56xr
zZeUkv>^!+cl1$+G$kjXTCwL35Vd<&1`t+N|7!*56Vie&S{Di_5F5p>PGL7+L6(dMv
z))p7_y9D7E6qfKjN`S$N@v&3~t#M2urq^mu?t%7ctT`L6SojD9X%2tgh}fLdlk08n
zmq}>}YwPb-BcRnPX#PaM)~2M=@|siwRyV=6l`NW)_3cMni%i(`(jahp2zT2=>uQZn
zg0@z-Z9&@b|3qj`>4XrLoCM#lIbP{CmtN6w)e?jZ>i7~~T$Q9WZOc_l5;CZ>Rd{n%
zlG3y-SN9~$kG-FRW%sDKk?5B`$G#~t^aPt?QuJ3%q9KF2G6{Bta(|6mn)XMNY{;PQ
zbHbIYl9Z-xxoSy523LOcT`g+74%4<=-IbZVS!~on$C%9bsFQOH=6zZ4CiA^+d4qXh
zSiQ*^uRG5xzYGc(lu5h#=k?L#EFMhe``KwG{nOOywk?QeD|&yp7srWX+t^C}ua6({
WxZ6$HkmZvA0000<MNUMnLSTZ2$NoA1

diff --git a/data/styles/default/light/mdpi/coloredmark-default-s.png b/data/styles/default/light/mdpi/coloredmark-default-s.png
deleted file mode 100644
index 779399bc0f4c58c9691110e6a077204abc41a845..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 322
zcmV-I0lof-P)<h;3K|Lk000e1NJLTq0018V000jN1^@s69C#F>00001b5ch_0Itp)
z=>Px#{7FPXR5%gEmAwtZKn#UZ>QGasfdSGoNVdpsEWiS=1_g)#QXTILwon9I9EcQ4
zPv*|g&-ddTtJMTcDHTE^9E6L|nP<#=F+na)m2f4Tg`5$u;;I2Ag2L6R-sD@M7E1Gs
znaAMGvj7Qk)V|}Res4almwACW2LJynkO+5)v9phbeKEw1Czl$Z|Jh4~X2RNt2)v%H
zya+$bkq}*t)mfqi;q`3gMfh2cg!r7WGE00FUq9)o8{<cs;%*|lF)@p8&3oS0v`F!j
zW$(YL3<J*dykT_8NJqG6w=egdb4uF%GB2E8kuAVqI&0`RM|_^A)eF0q@T~u854OIw
UDAA5c)c^nh07*qoM6N<$g5^Gqga7~l

diff --git a/data/styles/default/light/mdpi/compass-image.png b/data/styles/default/light/mdpi/compass-image.png
deleted file mode 100644
index 1961ae4ef7203506de1442c8fdfa4441daba5d7e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1207
zcmV;o1W5adP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700009a7bBm000Cx
z000Cx0gzh_N&o-=8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11Vl+h
zK~z|U&6vw?8$}$)Kbu|Kb?_$kZbi~oqzOW(qC~)r0%zcWAaf}E1Lca4!b1YVp~pfm
zAWl#YTtG!=L<&t45-@_6NFZK`LIo0e*;N`sl{n?$tT)RcYqNIz*qH<Ld+~V2^ZkAN
zo1NL2F-As4xRKTMe*<)qrQ1<TIRG33?gj>dKEMu}w}7j_BJdqBBZOGiiDRe?v6RvT
z9s-^Kjw;5Q1I_{yLI^)@r`SU*rF;PR063`u2XJTD_kAhleQ`T=%%GGq4LlD#q5;)T
zW56jP#NX|H)HZ`sN*6doOt@feH4&_>CSn3U3cMwybhH3NxHo~@V+O?gc+By}$Jz#L
z&=ER7HU$ia^>tuCAsGJWpSb??q^r^=jPaV3a$jsfcAvS}nFH9FpY7f$ET?y_tfY75
z=hBLhM}TKz0ZJ*4p)n!63+HOX<V~DY%_6{KQp)=qE9(Hmb?!N3>q^D&FXn52{uiG*
zR4RrB<Y>sy91wUIxJA{~|1#ebY;M+OZ%`^F{EPV>4Zs25!FGU;Ynb9qo!>JHy{U1P
z+1!$$1{l6umERD-^^)m-`*pUl-v4GM8*FZv&H8lEu#~bkiqQ<le*HvMx$ser?d`p*
zfmi9OOpWJsJb`<wg{bjeI!^v)t=Bz&dQx|o@2M7|fJ3S-L1887|9m;qs@?zPCp%bP
zNU8d=yL|)d0sB;4yz|l}2mmmT4wt&$es3;)=G{5-j^PpjK~T3oDyY91V7HP*5a8#h
zYr~rweR0_s7%F!izO|ejeWA8F_4CuUKcS$Tss-&GHHHxsPoB>EzP}$}sQ=LKNpJzY
z{zJvW8}F0>Ow(My%`jX*XW_2P;Ge39wr&4b{Zc3tw#w!5dbwO)FBXe`RO`dvsKV9y
zM>BYpf6o-L<Ty^>#>Pef7@p@1E-o%soA!sFK`xiOSrHCkwOWW~@K;rrL?YoN5{Z>o
z?UrS&B$G*<jl)8<5C!}}!-(GA-oIM4WwY6qZ5{M|wGajTO2;Xi%^n7}8|w|jsDy2*
z3Zg7E!0_BUr|M>!=Dt)awbWRjN~IP|(`>p+?x0yAL}3qLsIwY|xURcrQ{cL;?h;nV
z&<HpIDBl3swmoPVMk!LYmC0muhIa{=j8@bEh9~}08pd6jOy)}Ui*4J*M(>z9Eri%<
z2?!vBm|^!&tt8iVd#mMKF4x=cw=E=v5SJP&Tm8#Zz-1NpR4R4AvaD6pG}qGU^Z`Y<
zdEnJ%4NU>V>xidNd>(Dv-stJ+xuyuW3_LA_D8~i_5JFr7PN0xU$8ioij&o1}ZXP%h
z#%ijz4{`+Z!#L3_%j&T#EADAd0#CMs1BLs+@XG8N6t6>?XbE^FoQxe6dnpKK*m2-x
zU{(X{N8lykcw9J8ykU(hJQ_x?fct^!`Q$pgTc$;JuYfNJA&NS2v;qGs-SD^k{{YA@
VN>bzZYp(zR002ovPDHLkV1f}tHYNZ7

diff --git a/data/styles/default/light/mdpi/cross_geoposition.png b/data/styles/default/light/mdpi/cross_geoposition.png
deleted file mode 100644
index 81edc0a79e0bc9b64b3eceedd45380f843a5987b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 306
zcmeAS@N?(olHy`uVBq!ia0vp^Y9P$P1|(P5zFY^S7>k44ofy`glX(f`yzz8#42j@;
zJL4elAp;)Q>?@2CEvx~Xyw<Ndz|+HUJ&#GY(Q%jK2mQdS-0Y`U3N6fE*{f|C|E`-q
ze&RZZB~$#gj8j$yy4;Jqc~5)7cYecT#-B20ZHW1}O3v%eI$sqV%ku9f1=?>^4jfyP
z;MsFz4a=IZa}0$x3vIYoeC%Ia#D2p{_t)`%SCvQ2k1TbUSP{+faHV|r{8f7wiGR8B
z=mT?r`qI9j+JCG~tG*w2)$u;iisjncTRdyOdMysS^yq`W&W#zRDjq1tnp-C?U1ybE
vI!}Ko(`0u0r+kIlD-ImXaawoc=?8XO-{h^_J)2$t{mtO%>gTe~DWM4fNwtHc

diff --git a/data/styles/default/light/mdpi/current-position.png b/data/styles/default/light/mdpi/current-position.png
deleted file mode 100644
index be357744042613f400fae14fcb041954e7bafded..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 580
zcmV-K0=xZ*P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px${z*hZR5%f>l}$?<Q51&Hxi>ROOe~s|2nvD`v>3GAxGG(WtCEGkK+`|ab)k!v
z{)+~;E*clQQWx&cLZK8|m9*A{U>d&|wPu{T-uLQANR2d(FN8a}Ip@j!IPV#zyT#p8
zpGIY7U`p7@31%^bFs1xWzwWGf`#(#ErFUO3)tt`F6Uo;fa*6DVSx%<MWim}1e?lCI
znlN>FLF)X3Jf}v=sg+MF8`I9>`)`emMj)pOpQo*KwrFLtBs#hp<NkT}&yL95uaH}-
z6b_1SW_5sBtqdYHY{u>xF4}!L64693-Ew3rMzZrMv7)>^^z!%l`ocPb4G`Om^*>(%
zjHT5Q()<GpNg|OVa@{<q2EWudSF1t?G0qIzYzG#=k%L??z>@kl$0EHWA0z4hAg1jR
z+xIV=J}WagFHjn|&9DN)l$ohBT^eD9@&ZesXoETn0|f&tT*~7}U7JS0PH;e2DX(s<
zDd0`mDXhQ%OTg&xW>|p%mO$5l(c#U93b|l_g-cQB8Zf%@+_ss>K`t0z885?w(PyuA
zVRU#C9{nE~*xq+?tJ{U+xwp&6xy{twVgp?RMi+LRV5j?J+SlF>1G{NoCj1tNZ)id2
z8dCB&yh+L@68cnFe{`KG_b>VS@GomS<o)?oKHXZI3|1EWd1HeO<}g0^6>tSWtMrcx
S-Lpaf0000<MNUMnLSTYbx(7S}

diff --git a/data/styles/default/light/mdpi/infosign.png b/data/styles/default/light/mdpi/infosign.png
deleted file mode 100644
index fa1b1b4cee5800168c662859620b8f9e4cda8409..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1413
zcmV;01$z34P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px)KS@MER9FecS8Hq(RTRE6JF|~=m%bl7Tcoz6wGU849<7jAFo<GeMbX5V2)|6!
zU&cpb6a-Tf5+g?cl!S;j0c?zfLP9JO5+F2{mr|ED#ip^gwDdu@+kMT$?@V_#x7*oW
zv}ruaH}~FizI)GiZ||JhGWI{4@Ne?#x?T(ZHeel40%QX!FaY!e7l2bhhad<#+PNE&
ziohE{HxO?c9E5ly?k*tZ29px7z;bNiN1&RvqUx;o=U%1zr|yX7%7C(TG@xZ;0X4@Z
z-hF(bbgyBhJW{t*s;~*Hi1@JUz{@y|+s4S^kx&4VuLA!xP#DqJolh<X`;OiU*D_tV
zS**jk1m*Qgd)r4FoMjMFjKF>1RfuTiNU^S^03@#mqXqB`P3aeFzniEGs%$}Q)&q1L
z67#h-xGz1NW!nn620UjaVwM0TuL8LpaCk@5v)fMipHy|-f$@JZL2KHUcBZ~adIpny
zz&ePy#V<5N0Fv7gyatqajjC<+$NZZa(?xy)-<J{DQ{(*2VPpC?*FzP-h}EA*(0+Nv
zbMB!G;VI0e<kb*CZ;oN{0^Wr8D`2?hh%Yi0&=yV8te>Y}bazzb+8(3mpkMoa?YF*1
zteAEi^Lh7V4B<|!Kzug@95#8e-C_51x!$M1*VjTFsge_~JjYf{Em>i@Sb>uWOpj(h
z!z%L}xE#C_^?n@9Wej5iFv4-O#kld^pI-^laiz4LarLT6@<&)lNM$Z_9N#wG2ye#P
zJ@799)|+u&zz%Yr?^EtTp==V8wND?PTywBJ^h0xJ<k+J}?kD|o;Vwz-f2$;b%*aI@
zi5^j-_nx(MMKVoCsunxS`tsLcLn@vbKiU~yuwjXDNL0!V<4>TBJXZ%5I-&=%;tY|k
zDwGs)##K%{)jO&cM57B$7JmZi<QxxaS!OU%``#1I9#p$bmn7tXBXx~xo%P3j<%#&F
ze_%q%i}qsz_!BT<A`_C9TD($$?JMLCB&RQ-VaqcGkJ(Sw%93cV9Wi;lfWOGOEJM6!
z2CZ7WQm&27lRI_YsPP76c#8dL#f|qBx`gqlFP4KB&_%&@i{#<>iSgr=+2XJuu-Ij7
z>y22x|MBzcmdS%r-%T^d3uq(f3uQLN3?^!~mq>kltff1W%a0TFpD&f^qeOObx?zkL
za1u_vGFPg|bcjhsY$>wy_da~{u4-9=%_P)jI7GE7Po#@VB2JKxEG7W;nTkX!j@I>Q
zo%6O4P4Fnr6!W=|{roQXP?{u!INz-9zB=b0a8eOCi(I`XAtoT|*o#(swnQ%9Qk?iM
zj0JT1Vv+^$E9pYBH*#i5Vdf2=j&RS_1-8i@C2}cTwEGXZ5aW;1@S_ZWfzI2C#>O{(
z?{g1KYJ9Djo-45a{B)sh*w6Ct%X1BWB_+HArCGM{nVs%{B(e-lK7`%BHNA+r6hA^A
z0-R{*LarYV>H{yGoXYc#D6>Vx&9fRVa*NuzUG7oT3=()5*aQJ#o;&LVC<qZ$;m!i9
zvBS{5OF{qP8=+X?Ax<)*(!9IcIsWciyDW<WRap9JZbkCg`)|&-6hOh~NgP6VH;ug`
z+F;|AVBYz@h)shkE5i>Cwy8)~KC5$%6{L%1**yg={V1KVnv+m~NrsTu&_4hyCLg}}
zQ&;aQzRr7^qu-~ciz3tWU1FdrUkujd+dNK5NFyF>2>1|*n~c$19uOe|^p8e6kjid?
z@D5-KnM>-~bFuKjBnl4Bo-q#|2xznr(KrvO5-$k>`#BN&6Eo*A0s(sob4l?JKFd-v
T&?O4L00000NkvXXu0mjfQ@5aN

diff --git a/data/styles/default/light/mdpi/non-found-search-result.png b/data/styles/default/light/mdpi/non-found-search-result.png
deleted file mode 100644
index 0c20465af8a19ab6c56cf55c7175e5e3cae350fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 228
zcmV<A02}{_P)<h;3K|Lk000e1NJLTq000jF000jN1^@s6JJyv-00021Nkl<ZcmbtT
zg$=_n5PW%$k}we~Yh;0plbO6nvqe!*X88J|D|7xN<1@)ERMmx*h2_KQhPC18`S0Wr
z6l{gn)(;@P^-6FE>T$7HuJZgiOH&<3k>bP~|5Pxf0=i0z`=Xdnl0?V#`qRQc=r<lX
zK`dvB?*wlZ+<1@)lTo@xrjHAJ6!yYwma+XJ3_hYOEC-VFlkhl>mDrdpn_@O)+f-*;
ehuM1DFjXfjB44m7cEIES0000<MNUMnLSTZq>tL$@

diff --git a/data/styles/default/light/mdpi/route-arrow.png b/data/styles/default/light/mdpi/route-arrow.png
deleted file mode 100644
index 3c52b070de5fd0bf95e48cb538e3eb0e740b6fc4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1146
zcmV-=1cm#FP)<h;3K|Lk000e1NJLTq002q=001lq1^@s6!hJ3_00001b5ch_0Itp)
z=>Px(G)Y83RA>e5noDRCK^VusZ<B6nRD3^Z6)UxB2|gM{@O{vW2TvZvgKcfqibVvi
zSW!w8d?140#abUN2x<?42dO#eLB)#JrmYeLrP}%k)M9PbM6)Itzln{un#U%aSSRZo
zc9Yp}W_N!3&6n>#697TVn62%jEH<Y+RF5kS)s5r5uUqMBeg4w>!c^i|6K~sO*b4)S
zF_y!CWe5DMA*0w)J*lE?crpN}?L!z)p#jN8iFmQH58b}DVMQ%VL-naX3kT}K!Pz)}
zni&{Ct`FHAx!7^+Z^SO)Kv}Xgp|NT<RIZ&2^zcYiaxcZMCV6x7+*Ep%aG*F0qXFR1
zx-7VJU>4?0&Lr<*bJ;g+BJZlS*;q=(l#)(U`DO?9y(rfVj}GO-wp9~&bq0CY(Zd}r
zcTHQL<PNk;#%G~HaR9?)gi{-*Lc^XJm^E7FfqqHA`>oAX?AVqJK%qW_2NfE~YRgDy
zJCctZ7LTPWHax)CX_|^R%q5Pjkd2lz@&u0gp@v??6fGV7t+q;?HRi3ZHuXYz-7D7P
z_8}nlAV4{_yArcu6a$ot9Ir)z#K)lq6u0Z@^Fdi{Cp5J7@vp=S>oX0e?H|uudV&>k
z9x$V*nNkw<4-jYnLvDWl_Is$f^oF^;eqx0#1Xk*;TVRj(!O|v1MH+bN%5l(gI3JhI
z8bNWMWd#`ANJIjqJtz(^XS@uzDrds6^-~~G38V{992QbU-?e5UBr1V)1B%1qB~b~a
zJ5U@}A`(cKpg1gE21_6&N0UIh2E}3hl0bP7O#<m26o<tNmq4viBv9HXoIfzccN{2z
zj0Ws8%hHbj9;JpMrSnELc6zbt_4r}u#n*88eozi_$z!MVtMvWp`L6$<`n}+$^Al`7
z+sRzL3b8@AgiztFvsNqp*L4r-i^5=U{Tryh)y<LcWtn@DoKfVhnbY3SD0tF!jC$Da
zfrV91`yru1Q*Gb=oPrg<L*k@#=}|sEZBATs!SU-|j8;NP2I6B{ao?z%TkzNx^q)Tu
zx&!5W`xQ3TbU<sThbv{Ggvax8OjS;sB@~YSq(n8k0mW!}@}&J8R9$s3#TVd<3GD{N
z!Y{Q2jn1%W23P6=)XQ!KO3rq`y=R~K=y||CGiJPDch`w|?!h=Be@lB%;g^D~_O8fG
z!d^kSxcL>i<<ziO|G`QPn+sQHbD=!Z%>^S$SOx-ZSE+e-1GO4WvmT1s+m%{tebi_j
zqhpF`ViYyIMZZZ9VuW_11f`w}R+rXMrcI2BB|&r#DvShaBneU&F1ywOOK1rbL4qt#
zHY5&M$f=iz1kvJ6LV`+Ef@lRL+^-(r>HR4|Bq=CCv_eqRUbq;=Aq6GK1mire)6@(y
z88*ViD9VXC=+Bx)N*=e+%46ITL@O*|K$!sxvZu?QSj!<=fkbNm9YbRJom9zp-T(jq
M07*qoM6N<$f<+S&NdN!<

diff --git a/data/styles/default/light/mdpi/route-point-finish.png b/data/styles/default/light/mdpi/route-point-finish.png
deleted file mode 100644
index af72712af076c1441ad8976a082df96aeda52cf7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2009
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

diff --git a/data/styles/default/light/mdpi/route-point-start.png b/data/styles/default/light/mdpi/route-point-start.png
deleted file mode 100644
index f464ec835473d1f06dc100b4da0e859e9a40ae52..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 990
zcmV<410np0P)<h;3K|Lk000e1NJLTq000~S000~a1^@s6at+^<00001b5ch_0Itp)
z=>Px&m`OxIR7ef2md{I6Q547Do9C22vT<RPKd7AkfYFT$p^!k(c1CS#8Hf-mwdn_K
z+JqG?LLv|%+O_EyLa3p+Q3N3zTM0ptGHR2HnHpy%otfA9+<AAH@drB2960ZuckVsk
z?>qP0ciuCNy~T8vFy`90ZD)=#*LK{64Vu7OSXl5yqtP218ylZesnj>yw*R8o_?Tmj
zz+0j^t{^sothu?lrg%L5O2Ct%dr6YD#1JbA#x~i>smMa1(1qIC+Lxwj9!aJRd+f)i
zDQbKTrHo(eX$5q=%4PVymeJ{Rqjs6gFy*PDYiny)y<YEoS(FmhTdiWY5^`S_4u@}e
zJf4SQyGFln8V_a?#^Rq0iHh3ca`LFlxYt&0be(oHn~p>xcWP>Co{F6m&64I4s?37H
z;Khc9hS#hZn2DQ1feo?tFTE{?jJs_Wwt(5o%ga|98ynwBbT(6$0|l9DVq)S{eSQ54
zvCV^!fyDz73m#ZtVvFKa1|w3|+S+=bnz4<AW|o1-T!{q(EHJ^=^P1T;GBVOsU0r>d
z147M;6)?a86Kug#TzX3_zu(_2PK(pH*8$nj!+-%6m>Qcnone`r%1#^{{Zfg>a<JJ}
zGfU`pyPF{5Ju8)HEC)MF2);|4UJU(GV;3tL%fVLV(;2EGTP(rWcrzcBJGG^1oiyR!
z7__TWiMKL?rLn=qLsPL6iNqofdSj_XV>#H0N2ilsSy}lE5skQ1qOlxo)r@t9$>HJQ
zk3y89>(hvf6)?a8)4^6vToqEBq~(z(d0tmncZs&tI~FU7bEvaYeK}TFSKmlay(VB0
z(M_ESFJEGCaPUbwonGe?L)Sm35DNxaV1g~GUhupVGBq_7Yj1B4`h33gXHK|{c+xh%
ztQOV?az9U#lan`ldU~dXjP1&9so3h%LAK?hHGx3jdUJF0EwK;$0iK_qf85g2@=P$o
zqGZUS;X9cXY%;D8^^A^=c6W4iJhCjSvXEa4`LT+PkB{H(>gxI+IMgjJ$~JL;wh5#h
zplZ>^zP`S*OG``d<UeI!KT)hDhFAv!tlXsJcDt~EMq4F%Ow`xk-+yj)c6LC1j;3R=
z*iXq~9mU4S9BWwX#1N~RwTyYP8#{h#N)X4D+8%ZkpFZ8xg~RaAQEJ6c5I$8i8S`W}
zLKf*cz^N@nnoQ487flKYwc;MxwPu;=-LD#)G1n$SgEHpY%<U-u0Ui_U;9EunoB#j-
M07*qoM6N<$f(+BukpKVy

diff --git a/data/styles/default/light/mdpi/search-result.png b/data/styles/default/light/mdpi/search-result.png
deleted file mode 100644
index df4578131951511d36850f21eafa9e7f931e7c0d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 395
zcmV;60d)R}P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00001b5ch_0Itp)
z=>Px$MM*?KR5%f1V4ybm|NlSl_uv0pKm7Q2_t)S5KR_7728n^>(CuSH7PxWmNtlSJ
z$ih93{;@B+{+IFAyT4#*H6dn(7#+4B-pXvBxL6n>85tS(!Sulm0BIH$6<v|L?-%2-
zrx1-WMKIb*nwepS2lrQgHby^~Az%YQPJ8?1=c}B3zd3MeMmA)w7tbr8OH_b{d}abk
z{P@FA0dh7W%^<ZPHCylg;sfac@xccC{QEx=<Y$loF<{A+UmQR^5g@f-1GrcjrC<R@
zi~%6EKt0lM1BlUtOAXis-+upp28t?T0Z1)S&r^_kumSAMjLSjsOsoMQwLm>9;0AE8
zFm!+t2`HWk0gxJyT96*N0igH<r7%z;!Dk38Awg5)XOICXQ3p&=PT&48EC<CiD5_vF
pgD)v#xELuj-6JM5VHiNF000(QuMSs)dVT-^002ovPDHLkV1nL^p5Xuh

diff --git a/data/styles/default/light/mdpi/track_marker_deselected.png b/data/styles/default/light/mdpi/track_marker_deselected.png
deleted file mode 100644
index 2434ad6f8314a176cd61e2b55ce53f4e36e28208..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 401
zcmV;C0dD?@P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px$OG!jQR5%f>m9b94Fcd|fTa^Je7NjyFA!YBx$`7<Gh`-=FI`J2X1^NT5Ox+_P
z7^%d<1_Kp@d(zmXtwW-aE4|u!xjA<1XV+OoS(Xiy9v3lEJ1lGqwR6RcaLz4@e03w(
zMDe7k6P`&WNe_F9X&oi<oOgO#;Fd7YpL(F9qbyUu^~oY<*Xh!3(ocJQ`^q03@AvII
z*|CdcU|PSjo&K3}cTO-iAXOZZMX&GQc6t9{4=*dwD*O9;a@e=4(_K5*Tl>;yITAAL
zW`JpcKVe`Qhyn4I1Y_)hA<t)4%`BMI!Gm{0IgmOFV$GT=;vF$VU$i;LZ$J}h#5-JD
z)h3WS4?vDn5T(&n5$^&ZXETU8YpRHM4v>Q$MA1@bb;5&pL$l5cyYr(LW~{1jbJOUx
vT;Xyk1G~MxJXz!Y>w?|7g8&QK`Y+%ID_7894s8;A00000NkvXXu0mjfMA@ql

diff --git a/data/styles/default/light/mdpi/track_marker_selected.png b/data/styles/default/light/mdpi/track_marker_selected.png
deleted file mode 100644
index a4e58164373bb8735f5db8db0c81782c6b8a0006..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1098
zcmV-Q1hxB#P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px(1W80eR9FecSKV(^MHD|XcW-xrEo~|d%2z=Mv;l)b#7Gmq4I%nsd?11v6VeCN
zfPa7wjeh|_3J(p5A*kWi2tH8xXu?Mb)DRw8e1VEcO0{8kk=^a?&Uk;fp5=6Ud)pdd
z=V8ysoH@TUbI+VPt7w{IOXvB-z2<dG%ZgShWtxrE^@?mgmRnLetxV2ZJ)E#~d+~7J
z-3y&t%hPeKrZQS}e7HV8>TT9mzh<mWPGygItyIw{b8A*z<>Kvq&AGTWlLoNmyiMF0
z$ZR5G-VS!?$2pm7E;ykQX?<l`YeVmatt#?FA_Ks#3q^mowRX{D&S#=mO8t>amQF>T
z#)JTtc0GLADu0i)G<PN-Q`ss-S?&AZ-RVdVNn0%i?EHCv0|Of}rP5wtNX+U9gx|bB
z^J(0%CljPUTQ{q9^J1^HWv*V3u2Z42$D=kkm^FW1yjK}G+Ls?FmdQvE$>Vb@YiszH
zbD|nR%dtn>tg)M<vE;vaBiY)qHuX+pN;OHn%RegEk?xy?vqx?e2i!T9l~%oj`y0<e
z4g(02uHYSr%66?ab?=(JV@FG(ogGYv_6(LUb^QFK$C!zSf!mQvRSqL5!yLdpj{*nK
z{{hE31dO%d-2p6MLhqr%W#%k+-x4KULmd0ZtCPE=KFAUJp}$05_2%j8OL^+*E7IA!
z<)9i8t(m7O_{LT9R~z+`vav(g9#sCSD*t0N>6c!AbLUmHyeqS!MCK#c010>PlZMab
zHy`@P(3ihFq09Fxu6ZbLT<FoE?XzkAoTrxyIkDkHrYkBjebOg2YI~G7WV-~%&f~!0
z1A)N?wmjeizF3wN*g@Gg%~Huct{U^8IQGeQF703gTRB``JO^xzSB({t;+{+SRR5?H
zV|mxs^~H;Ut@%l1B~vakEdMqV{oQ$9QrFh?#kRnHnk}q-q12EL?quY9jq)mES=r=C
zF_w32U0=M|l9$uyWLP07YP*zox7A58mUnGkU%VLD8f_FSB*nub<qz9@!abjAzy`K*
zxW0G}*cv??D<s9Mh9bf`R5%owxFEO?$!Z86@Wp;41-7?#!_I6b{mNTzDXti@2~FAd
zMgAII6l61fu+k4J-QRgj*`g&sNaNM>JUX~OMV;*_O4p6g>u+upe!OzOGU1fbH?|D_
zdL}H~OOB1aM@Fq@AW4tEo1XDY$m{VU?mPXshvjip+v~sYZ~7?=7u{>vK#sE*6Y!+M
zQN&cNil5^sBVYj&bJeG-rVR-qsd-C=AjaD9L`U$LJ=2aDzA?}lr;_Dv*`AL}SxhKf
z`W}X3OP<{?e4;Iv;9*cv5Mw7%qdz7bP)+}uaS)(5jhg&9l|g`iUVqR31<T$Q2>(Fy
Q%>V!Z07*qoM6N<$f;ATrQvd(}

diff --git a/data/styles/default/light/symbols/coloredmark-bg-l.svg b/data/styles/default/light/symbols/coloredmark-bg-l.svg
new file mode 100644
index 000000000..9bd5baf3c
--- /dev/null
+++ b/data/styles/default/light/symbols/coloredmark-bg-l.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="40" height="28" version="1.1" viewBox="0 0 40 28" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="19.98" cy="13.98" r="12" fill="#d8d8d8"/>
+</svg>
diff --git a/data/styles/default/light/symbols/coloredmark-bg-s.svg b/data/styles/default/light/symbols/coloredmark-bg-s.svg
new file mode 100644
index 000000000..f755b4466
--- /dev/null
+++ b/data/styles/default/light/symbols/coloredmark-bg-s.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="31" height="15" version="1.1" viewBox="0 0 31 15" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="15.5" cy="7.5" r="5.5" fill="#fff"/>
+</svg>
diff --git a/data/styles/default/light/symbols/coloredmark-default-l.svg b/data/styles/default/light/symbols/coloredmark-default-l.svg
new file mode 100644
index 000000000..504bc32a0
--- /dev/null
+++ b/data/styles/default/light/symbols/coloredmark-default-l.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="40" height="28" version="1.1" viewBox="0 0 40 28" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="20" cy="14" r="13" fill="none" stroke="#fff" stroke-width="2"/>
+</svg>
diff --git a/data/styles/default/light/symbols/coloredmark-default-s.svg b/data/styles/default/light/symbols/coloredmark-default-s.svg
new file mode 100644
index 000000000..804691c61
--- /dev/null
+++ b/data/styles/default/light/symbols/coloredmark-default-s.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="31" height="15" version="1.1" viewBox="0 0 31 15" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="15.5" cy="7.5" r="6.5" fill="none" stroke="#fff" stroke-width="2"/>
+</svg>
diff --git a/data/styles/default/light/symbols/compass.svg b/data/styles/default/light/symbols/compass.svg
new file mode 100644
index 000000000..8b98c59a0
--- /dev/null
+++ b/data/styles/default/light/symbols/compass.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="40" height="40" version="1.1" viewBox="0 0 40 40" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m20 1.9866a18.013 18.013 0 0 0-18.013 18.013 18.013 18.013 0 0 0 18.013 18.013 18.013 18.013 0 0 0 18.013-18.013 18.013 18.013 0 0 0-18.013-18.013zm-5.0402 18.013h3.0653c-1.42e-4 1.0908 0.88413 1.975 1.9749 1.9749 1.0908 1.41e-4 1.975-0.88413 1.9749-1.9749h3.0653l-5.0402 13.727z" fill="#fff" opacity=".8"/>
+ <path d="m20 6.2729-5.0402 13.727h3.0653c-1.42e-4 -1.0908 0.88413-1.975 1.9749-1.9749 1.0908-1.42e-4 1.975 0.88413 1.9749 1.9749h3.0653z" fill="#f44336"/>
+ <path d="m14.96 20 5.0402 13.727 5.0402-13.727m-3.0653 0c1.41e-4 1.0908-0.88413 1.975-1.9749 1.9749-1.0908 1.41e-4 -1.975-0.88413-1.9749-1.9749" fill="#d8d8d8" opacity=".8"/>
+</svg>
diff --git a/data/styles/default/light/symbols/cross_geoposition.svg b/data/styles/default/light/symbols/cross_geoposition.svg
new file mode 100644
index 000000000..30613aa5c
--- /dev/null
+++ b/data/styles/default/light/symbols/cross_geoposition.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="38" height="38" version="1.1" viewBox="0 0 38 38" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m19 0a2 2 0 0 0-2 2v15h-15a2 2 0 0 0-2 2 2 2 0 0 0 2 2h15v15a2 2 0 0 0 2 2 2 2 0 0 0 2-2v-15h15a2 2 0 0 0 2-2 2 2 0 0 0-2-2h-15v-15a2 2 0 0 0-2-2z" fill="#fff" opacity=".35"/>
+ <path d="m19 2v34" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+ <path d="m2 19h34" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/data/styles/default/light/symbols/current-position.svg b/data/styles/default/light/symbols/current-position.svg
new file mode 100644
index 000000000..61a5a0745
--- /dev/null
+++ b/data/styles/default/light/symbols/current-position.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20" height="20" version="1.1" viewBox="0 0 20 20" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="10" cy="10" r="9.5" fill="#1e96f0" stroke="#1672b6"/>
+</svg>
diff --git a/data/styles/default/light/symbols/infosign.svg b/data/styles/default/light/symbols/infosign.svg
new file mode 100644
index 000000000..bdb927c39
--- /dev/null
+++ b/data/styles/default/light/symbols/infosign.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32" height="32" version="1.1" viewBox="0 0 32 32" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m21.328 26.672h-10.656l5.3281 5.3281z" fill="#fff"/>
+ <circle cx="16" cy="14.678" r="12.9" fill="#1e96f0" stroke="#fff" stroke-width="1.8"/>
+ <circle cx="17.044" cy="9.4531" r="2" fill="#fff"/>
+ <path d="m13.2 21.639c-0.74683-1.2936 0.69865-4.3137 0.73895-4.5659 0.05859-0.36648 0.19758-0.78092 0.03175-1.1129-0.08142-0.16302-0.1064-0.28119-0.44623-0.31578s-0.72948-0.37292-0.57448-0.69542 0.9925-0.85746 1.9-1.025 2.1216-0.35165 2.7616 0.14826 0.12674 2.4886-0.14606 3.601-0.31324 1.2519-0.40097 1.5782c-0.08772 0.32637-0.1317 0.69472-0.0267 0.80472 0.17476 0.18308 1.2421 0.20553 1.2421 0.68774 0 0.94-3.0351 1.4781-3.6715 1.4818-0.63634 0.0037-0.9794 0.02192-1.4085-0.58683z" fill="#fff"/>
+</svg>
diff --git a/data/styles/default/light/symbols/route-arrow.svg b/data/styles/default/light/symbols/route-arrow.svg
new file mode 100644
index 000000000..9a307597d
--- /dev/null
+++ b/data/styles/default/light/symbols/route-arrow.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="74" height="44" version="1.1" viewBox="0 0 74 44" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path d="m43 42v-9h-42v-22h42v-9l29 20z" fill="#fff" stroke="#055fcd" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.8"/>
+</svg>
diff --git a/data/styles/default/light/symbols/route-point-finish.svg b/data/styles/default/light/symbols/route-point-finish.svg
new file mode 100644
index 000000000..25d6b7290
--- /dev/null
+++ b/data/styles/default/light/symbols/route-point-finish.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="40" height="38" version="1.1" viewBox="0 0 40 38" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <filter id="filter1" x="-.051392" y="-.045028" width="1.1028" height="1.0901" color-interpolation-filters="sRGB">
+   <feGaussianBlur stdDeviation="0.63706076"/>
+  </filter>
+ </defs>
+ <path d="m35.164 1.5803c-0.12292-0.00508-0.23005-0.00103-0.30664 0.00391-0.52686 0.033944-1.0338 0.21302-1.4648 0.51367-1.6134 1.1222-2.5018 1.4234-3.0742 1.4687-0.58405 0.046261-1.2411-0.10396-2.627-0.78321-1.1869-0.58171-2.4576-0.94149-3.748-1.0938-3.4378-0.40561-7.077 0.66202-9.9277 3.0215-0.47681-0.29919-1.0435-0.45995-1.6367-0.43945-0.25278 0.00861-0.50333 0.050314-0.74805 0.125l-1.4082 0.43164c-1.5254 0.46958-2.3784 2.0801-1.9121 3.6055 0.22846 0.74879 0.73886 1.3472 1.3906 1.6992l6.3477 17.65v8e-3c-0.0014 0.0078-0.0036 0.01738-0.0059 0.02734-0.03322 0.14953-0.19798 0.51965-0.41602 0.87109-0.42552 0.68591-0.67383 1.4882-0.67383 2.3535 0 2.4688 2.0214 4.4902 4.4902 4.4902s4.4902-2.0214 4.4902-4.4902c0-0.94666-0.29762-1.8391-0.80469-2.5742-0.19103-0.27695-0.91926-1.179-1.0547-1.3633-0.18057-0.24571-0.28418-0.45506-0.2793-0.44141-0.43149-1.2081-0.86514-2.4155-1.2988-3.623 0.40711-0.13286 0.79581-0.36187 1.1328-0.69336 0.86369-0.84844 1.7346-1.4668 2.4844-1.7422 0.39507-0.14509 0.74245-0.21491 1.1289-0.2168 0.38646-0.0019 0.82419 0.06463 1.3887 0.26953 3.0509 1.1075 6.372 1.1013 9.6992-0.56055 0.98315-0.48904 1.6047-1.4918 1.6035-2.5879v-13.035c0.003127-1.5646-1.2189-2.8305-2.7695-2.8945z" filter="url(#filter1)" opacity=".3"/>
+ <path d="m19.603 19.688-4.5433-12.62c3.1385-3.1728 7.8503-4.0076 11.358-2.2882 3.1372 1.5376 4.9933 1.6163 8.6237-0.90889l1e-6 13.041c-2.6179 1.3076-5.0292 1.3024-7.4253 0.43256-3.3809-1.2273-5.9472 0.31419-8.0134 2.3439z" fill="#fff"/>
+ <path d="m35.164 0.98047c-0.12292-0.005075-0.23005-0.001032-0.30664 0.003906-0.52686 0.033944-1.0338 0.21302-1.4648 0.51367-1.6134 1.1222-2.5018 1.4234-3.0742 1.4688-0.58405 0.046265-1.2411-0.10395-2.627-0.7832-1.1869-0.58171-2.4576-0.94149-3.748-1.0938-3.4378-0.40561-7.077 0.66202-9.9277 3.0215-0.47681-0.29919-1.0435-0.45995-1.6367-0.43945-0.25278 0.00861-0.50333 0.050314-0.74805 0.125l-1.4082 0.43164c-1.5254 0.46958-2.3784 2.0801-1.9121 3.6055 0.22846 0.74879 0.73886 1.3472 1.3906 1.6992l6.3477 17.65v8e-3c-0.0014 0.0078-0.0036 0.01738-0.0059 0.02734-0.03322 0.14953-0.19798 0.51965-0.41602 0.87109-0.42552 0.68591-0.67383 1.4882-0.67383 2.3535 0 2.4688 2.0214 4.4902 4.4902 4.4902s4.4902-2.0214 4.4902-4.4902c0-0.94666-0.29762-1.8391-0.80469-2.5742-0.19103-0.27695-0.91926-1.179-1.0547-1.3633-0.18057-0.24571-0.28418-0.45506-0.2793-0.44141-0.43149-1.2081-0.86514-2.4155-1.2988-3.623 0.40711-0.13286 0.79581-0.36187 1.1328-0.69336 0.86369-0.84844 1.7346-1.4668 2.4844-1.7422 0.39507-0.14509 0.74245-0.21491 1.1289-0.2168 0.38646-0.0019 0.82419 0.06463 1.3887 0.26953 3.0509 1.1075 6.372 1.1013 9.6992-0.56055 0.98315-0.48904 1.6047-1.4918 1.6035-2.5879v-13.035c0.003127-1.5646-1.2189-2.8305-2.7695-2.8945z" fill="#fff"/>
+ <path d="m12.443 5.5605c-0.08745 0.00298-0.17412 0.017429-0.25781 0.042969l-1.4062 0.43164c-0.5271 0.16226-0.82332 0.72063-0.66211 1.248 0.13692 0.44876 0.56742 0.742 1.0352 0.70508l6.7007 18.631c0.28934 0.80452-0.17658 1.7496-0.62087 2.4657-0.24593 0.39641-0.38843 0.86215-0.38843 1.3582 0 1.4241 1.1755 2.5996 2.5996 2.5996s2.5996-1.1755 2.5996-2.5996c0-0.5518-0.1733-1.0725-0.4693-1.5016-0.44089-0.63918-1.2934-1.5013-1.5579-2.2418-2.3038-6.4506-4.6403-12.878-6.9572-19.327 0.35026-0.25 0.5013-0.69605 0.375-1.1074-0.13295-0.4317-0.5388-0.72068-0.99024-0.70508zm22.535-2.6895a1.0001 1.0001 0 0 0-0.50781 0.17773c-1.7456 1.2142-2.9475 1.7191-4.0039 1.8027s-2.1028-0.23324-3.6074-0.9707c-0.98516-0.48285-2.0471-0.78551-3.1367-0.91406-3.2688-0.38567-6.8015 0.79683-9.373 3.3965a1.0001 1.0001 0 0 0-0.23047 1.043l4.543 12.619a1.0001 1.0001 0 0 0 1.6426 0.375c0.97573-0.95849 2.0287-1.7539 3.1562-2.168 1.1275-0.41408 2.3265-0.48934 3.8145 0.05078 2.5972 0.94278 5.3745 0.94118 8.2129-0.47656a1.0001 1.0001 0 0 0 0.55469-0.89648v-13.039a1.0001 1.0001 0 0 0-1.0645-1zm-12.424 2.041c0.31284-8.35e-4 0.62442 0.016044 0.93164 0.050781 0.12021 0.013592 0.24054 0.030022 0.35938 0.048828l0.85547 3.1836c0.65528 0.11347 1.33 0.33096 2.0234 0.68164 0.51761 0.26175 0.99506 0.47158 1.4395 0.63477l-0.73047-3.1953c1.0749 0.40441 2.1062 0.61526 3.1914 0.5293 0.30778-0.02438 0.61787-0.079449 0.93164-0.16211l0.26758 3.1445c0.78262-0.20575 1.4801-0.58403 2.2188-1.0039v4.1621c-0.60903 0.2756-1.2143 0.51379-1.8945 0.6543l0.25977 3.0703c-0.87307 0.2015-1.7194 0.24895-2.5645 0.15039l-0.75-3.2793c-0.48346-0.10035-1.0075-0.24278-1.582-0.43555-0.55238-0.18534-1.0808-0.31354-1.5859-0.39258l0.89258 3.3242c-1.355-0.28515-2.6292-0.18587-3.7695 0.18164l-1.1836-3.0918c-1.2554 0.48142-2.2225 1.2107-2.8984 1.7969l-1.6406-4.5586c0.86856-0.51588 1.834-1.0983 2.8867-1.5488l-1.2207-3.1895c1.1568-0.49526 2.374-0.75269 3.5625-0.75586zm6.5391 8.6699c1.2347 0.25629 2.2035 0.23441 3.0547 0.05859l-0.32422-3.8125c-0.99625 0.26191-2.1303 0.24535-3.6602-0.31641zm-4.3926-5.3867c-1.6252-0.28142-3.1297 0.080632-4.4883 0.66211l1.6504 4.3105h2e-3c1.1214-0.42976 2.4749-0.66218 4.0605-0.41406z"/>
+</svg>
diff --git a/data/styles/default/light/symbols/route-point-start.svg b/data/styles/default/light/symbols/route-point-start.svg
new file mode 100644
index 000000000..bc81e65a4
--- /dev/null
+++ b/data/styles/default/light/symbols/route-point-start.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="28" height="28" version="1.1" viewBox="0 0 28 28" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <filter id="filter1" x="-.17373" y="-.17373" width="1.3475" height="1.3475" color-interpolation-filters="sRGB">
+   <feGaussianBlur stdDeviation="1.5925"/>
+  </filter>
+ </defs>
+ <circle cx="14" cy="14" r="11" filter="url(#filter1)" opacity=".35"/>
+ <circle cx="14" cy="13" r="11" fill="#1e96f0" stroke="#fff" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
+</svg>
diff --git a/data/styles/default/light/symbols/search-result-non-found.svg b/data/styles/default/light/symbols/search-result-non-found.svg
new file mode 100644
index 000000000..1815b32bf
--- /dev/null
+++ b/data/styles/default/light/symbols/search-result-non-found.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="8" cy="8" r="6.5" fill="#f01e1e" stroke="#fff"/>
+</svg>
diff --git a/data/styles/default/light/symbols/search-result.svg b/data/styles/default/light/symbols/search-result.svg
new file mode 100644
index 000000000..f7f76fa1b
--- /dev/null
+++ b/data/styles/default/light/symbols/search-result.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="8" cy="8" r="6.5" fill="#1e96f0" stroke="#fff"/>
+</svg>
diff --git a/data/styles/default/light/symbols/track_marker_deselected.svg b/data/styles/default/light/symbols/track_marker_deselected.svg
new file mode 100644
index 000000000..2d0d4ead0
--- /dev/null
+++ b/data/styles/default/light/symbols/track_marker_deselected.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="20" height="20" version="1.1" viewBox="0 0 20 20" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="10" cy="10" r="8" fill="none" stroke="#fff" stroke-width="4"/>
+ <circle cx="10" cy="10" r="6" fill="#1e96f0"/>
+</svg>
diff --git a/data/styles/default/light/symbols/track_marker_selected.svg b/data/styles/default/light/symbols/track_marker_selected.svg
new file mode 100644
index 000000000..964702029
--- /dev/null
+++ b/data/styles/default/light/symbols/track_marker_selected.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="32" height="32" version="1.1" viewBox="0 0 32 32" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <circle cx="16" cy="16" r="13" fill="none" opacity=".5" stroke="#1e95ef" stroke-width="6"/>
+ <circle cx="16" cy="16" r="8" fill="none" stroke="#fff" stroke-width="4"/>
+ <circle cx="16" cy="16" r="6" fill="#1e96f0"/>
+</svg>
diff --git a/data/styles/default/light/vector-icons/compass-image.svg b/data/styles/default/light/vector-icons/compass-image.svg
deleted file mode 100644
index 59126b8cb..000000000
--- a/data/styles/default/light/vector-icons/compass-image.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg version="1.1" viewBox="0 0 140 140" xmlns="http://www.w3.org/2000/svg">
-    <path d="M 70,6.953125 A 63.047096,63.047096 0 0 0 6.953125,70 63.047096,63.047096 0 0 0 70,133.04688 63.047096,63.047096 0 0 0 133.04688,70 63.047096,63.047096 0 0 0 70,6.953125 Z M 52.359375,70 H 63.087891 C 63.087395,73.817654 66.182346,76.912605 70,76.912109 73.817654,76.912605 76.912605,73.817654 76.912109,70 H 87.640625 L 70,118.04492 Z" style="fill-opacity:.8;fill:#ffffff;paint-order:stroke fill markers"/>
-    <path d="m70 21.955078-17.640625 48.044922h10.728516c-.000496-3.817654 3.094455-6.912605 6.912109-6.912109 3.817654-.000496 6.912605 3.094455 6.912109 6.912109h10.728516z" style="fill:#f44336;paint-order:stroke fill markers;stroke-linecap:square;stroke-width:7.18517"/>
-    <path d="M 52.359375,70 70,118.04492 87.640625,70 M 76.912109,70 C 76.912605,73.817658 73.817658,76.912605 70,76.912109 66.182342,76.912605 63.087395,73.817658 63.087891,70" style="fill-opacity:.80000001;fill:#d8d8d8;paint-order:stroke fill markers"/>
-</svg>
diff --git a/data/styles/default/light/vector-icons/readme.md b/data/styles/default/light/vector-icons/readme.md
deleted file mode 100644
index aaeed7d9e..000000000
--- a/data/styles/default/light/vector-icons/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-please put SVG recreations of icons in xHDPI here
\ No newline at end of file
diff --git a/data/styles/default/light/xhdpi-ad/keep.png b/data/styles/default/light/xhdpi-ad/keep.png
deleted file mode 100644
index ce7b6f20e5ba507cfda191ac9e712ca89db4a767..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 126
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k8}bl&H|6fVg?4j!ywFfJby(BP*AeO
zHKHUqKdq!Zu_%?Hyu4g5GcUV1Ik6yBFTW^#_B$IXpdxNh7sn8enaK$ZObiUH42(&k
RMjb$522WQ%mvv4FO#rSW9sB?Q

diff --git a/data/styles/default/light/xhdpi/coloredmark-bg-l.png b/data/styles/default/light/xhdpi/coloredmark-bg-l.png
deleted file mode 100644
index 447f41f0a5923f6062e9914955a4cd9bb5d6d82d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1052
zcmV+%1mpXOP)<h;3K|Lk000e1NJLTq002+`001}$1^@s6YPNrx00001b5ch_0Itp)
z=>Px&)=5M`RCodHo4alkK@^5#r|>nFBGJUia^u?rID(QCq{Zn;g?Ir9>eLjx0TuMb
zZ77lwL>|DoG?s<kAR*a_F9kOL4`azeiIwp=dl_X%TFrXBGxMKs&g^C8?AltCA_5VC
zh`_@o5DSCpolYk;9*>{TX0sh^HE1d!-$cG)^bKOM*e~o~B5z?kP9~FI3WdVR{2y2r
z7{GSBy*ZgoUH}xgT@XlHQWyf{5w>O`k!Ti+MFRFc`3|t#?WV7;uHH<i)3>m8?qO2H
z2l06PT{fG2pU>xq(#mYg`vwqRwtjJO@e1G$AaKh@q{X>CfIKLd%OBvGzb(qGe5x-1
z&(6*s1K=T4)>l?)SMU@78`Wy{hg~uIv*Y$f>`I)UpFaV-?<nOLJPNF{O}1^P*8Xfy
z0k&GLmoVf6vb-9y%Pihv+tje^B<X*i4Phhvqg0?$`Tbh0_DQL(8`XFM&<xuXctG+-
zYXSYh^>B>sS*23>rY%7opt)i2nis^dUB;&eh}+sX7S(GYJZ>Eu@3vusN3gsm9#Z2n
z%C`Th0_1ZZ1o(NkwY9fyG}@NC^L(`-%r}gFzki9A!svaA0D8GxuB7$GqUM2oJ#zpa
zL2enXi%?hISMfkj42(vjHdJW6+pcWTJqr#}sTAfP<P#7o9>`f0hv1R%hS7Xa-glp-
z0uXmL0(2^AX%-J*PKI7zU;hL>+xfhpfe$m8%p>Wftk?rNlk6Zoc3#?O7j>i<Acn$@
zNI`&wHMDC0<Qj&P2>`{~#Q;IB<Rra+qQ%<90MUzFJ##W?Xcq$nIaeN@Z|h{Sb`5~H
z341WdGyo19rX|)c28c<@Ko+z$I!!~n7$6Mc6qc(=tX&Kcz1VV<o`!Y}fX5C46l)g)
zWRw&D`Wla-)L}!TT~wVIAZIf$6plnH0w_$)(wP{_76W7@5YuGtQqt0_0+8`}fG2*Y
z^05O3Mzgp{6@Xk@V0@lfjZYO&tHyc=<*EQ=MGS64*5iK2Q_pBsk*Nld>#PiJR8i$&
zCDf?3CQO;)HIYSIF+H@7*qE<47S`y5Q^dwR#SKI)dR5H>|MmuiL0kj-VI0Z~E^27P
zqs^)SSs|mJFiiF!bj;sjNYp}2+L2kbO&uUBWgH%c^K0&hAyJDLv4OPB6M(GPM1<}K
z>4~Oo&!SUlr|M0F75<+Xt%^?@KI6FGQCs}vVb3eio7?G`2hJOy0q}%v{63u@^C9PF
z4%=SCqaB`m;2ahoaiR}x<}?I(^r@Es-eS?{W5Y!n!hM%NcNLl*6^{r+1R?@X6ZiuR
WA!`3fl#8bT0000<MNUMnLSTXv@Z3`X

diff --git a/data/styles/default/light/xhdpi/coloredmark-bg-s.png b/data/styles/default/light/xhdpi/coloredmark-bg-s.png
deleted file mode 100644
index c16c09845fb7c9de048e3aba025b441627700224..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 376
zcmV-;0f+vHP)<h;3K|Lk000e1NJLTq002G!0015c1^@s6bZxD200001b5ch_0Itp)
z=>Px$GD$>1R9Fe^m@y8*FbqW-rf!IpPOMyp^YjQk4qSs7Ru;qxoS^)VQYmynt-dQ<
zV#x}i_SerzgPo$tmNSquFy{<}so>hSUEx`~=v$2I`0N|TGki}EA>8Bdz6Su8@EZPr
ze=}agYfIPE0I1+c_)z0Ll}mUA4!;g1POj&@zTgosm-m>NPPpG6so`hYBUrwtDyuD)
zynI&&EqCt=d?^a}37w64w_k{YOJ(?%rGlm|wWujID{yI$5OV>};zVt7O^X@tDl#R!
zT+;$v32dfi0nXZ6ZE{Tua5fxjJE;XNz}aP~?VuLS1&k`AvBGLpdeCXqRhuxjPbrkG
z|JkH44S@f@wzQl72tTGh^?MMJ!2jgYlYCe2fcs-?SJ`aP=YQDPPeA^jGmtYdX$D>v
WUVk$$)XNJ10000<MNUMnLSTY4fTV-~

diff --git a/data/styles/default/light/xhdpi/coloredmark-default-l.png b/data/styles/default/light/xhdpi/coloredmark-default-l.png
deleted file mode 100644
index 821eb56716d8c62f9187625ce65c5d00d1716904..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1223
zcmV;&1UUPNP)<h;3K|Lk000e1NJLTq002+`001}$1^@s6YPNrx00001b5ch_0Itp)
z=>Px(fk{L`RCodHoIOt!K@^6$5)v_JVrgMQVd6)rVx@(J1r_`Nt@sNz)Hihg0V)bg
zEu^x*#6k-jElm7M?4U6*N;G04!RIAQ7*A%uhMB#)+&#&gy*s;m&U;>V_G9KOgNYH_
z{{H?X6t06i;7W#zEYD_OG4U(I7Ryf=Ub1{U7!3AUj+Y_Y6j%U{!43#D9V;L5HFe@u
zB*|&848DQbCZF;>ed2^9sY$Q|wn1uB48_u=A-N4wM<9`TVmt!Z3S#|X+a`DcbdCE0
zegIwjWV#-n2bX}ZlXt;AP;|C^VEaR^k<VCm&k$|^RzRM8XTus;1ZV1IsAIBY*I3F|
zo{2;96QwTy!u=sU1D@t&^qck}&{-A5<SX+j-#!zUnJB?hJAvpdc<0IDFKw&fLMjgO
zoyAZrYvMGUDs~jVA_%@(=B(?&eltpt3QiO&i^<|Y6Svt4E}Gv3V(PZOGw(I+$<DgG
zOcfI-wl#5VS9gYxZWz96-a754^O8*6uGl~vtch!TZY+@T-EG%X3sluV{Cpy=R6RcF
zevq37*3@-IcIMfH#Rd4fvz}2$XONl%?}2N&VKjctD^o$7fPE7Z_eS1Wy!;5h1YFbO
zLt}SaFR6k?aRc@dXQ|+jbekZefdTs$T}>A;j%PUQS=2S<Q1nU|C$RNG&}Ekezx5W-
zx~}Wtt*&g}SeEU6N!KBu@jN>uHB1^bqI0+pfosa8x$#7TX#mqTz05~@w~eTk*A-mP
z0XqP(;N7{T@l?t7yv+~Hh7E>|4u_u1ruMDE^(U-0472-YJ<TeAIX$}U0M{1NL`&xt
z@{4W){8mosA8813%LLwKz4mxsI%%qT7H1&tuFX|D`e?6^E`0mw@Pl8QbctQl*80_q
zvqr&P)68Hk3lZ?DiJ)QluA1d;b1Tg&M8M0&tL8AeYL>grtu(I?0X6CEnkIm{YL>gr
ztu(I?0qygiX3x56mb=ZZG_M!}cINrdqlV?)h=3j*<J%N+1|Ivb)*`v>8E11Vr5Zy(
zRSb01EcZqP+%jsZ+@h;yx!c@I^9nfwKO3*ARq3i(?)JH`G_Mc=KN_zp^y#Wu?zIK1
zoj7mabMD(WzsGtoAw<A_ILlG3b{A$8V~^vXJ3jO?Xf)UOXnNIh)~J$lOK)`Bt`F&}
z94^X`evsM(?<bXllyeS3#C}@S(WCZH1nei)YpZ4sK*YYZ!)Q`#6#?}~qXHe*`r@KG
zDxzFp-d0C2-@b_07g+j)soI8seTi>XvGVpq#J<QpPn@dlh}eJTP*tqF{W1}KpF8v)
z+T@95+q3ShPYHac;>IDc^AXlf<#qYWeA>cEnh#7|+VyQnS#}T}i;oSHe{6z~`jnvm
z+_mhCE832TdSlURpDjwKDY_|!Vx_P3D@r=WHj>f+ghp{}eKk$THu;qA<}2<~h*jj1
zBsHF>LD?rjm7$@gW94IH|8yexHLyrXZ6kSgwHrW%o2t)KiJ7XTbeBH7Q)|Lo(7dgt
lRW&pC3cP7-7@lB0`v<m`bZmPVcRBz7002ovPDHLkV1gW?QF;IX

diff --git a/data/styles/default/light/xhdpi/coloredmark-default-s.png b/data/styles/default/light/xhdpi/coloredmark-default-s.png
deleted file mode 100644
index 6219cc41be3c24bea4b10a4054275adc18faabf0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 603
zcmV-h0;K(kP)<h;3K|Lk000e1NJLTq002G!0015c1^@s6bZxD200001b5ch_0Itp)
z=>Px%6-h)vR9Fe+nY~WKFcgJJrw)~vft>+Hn5sSl6!l&D2JLHfWu!a=6O8Zx2!U9T
zPzN^3cZ5@2T?O(}w@s8I9ode3ukUdZ$99svEnvA^cIc)Lhwuy@29oT(20oD9z`G<#
zzDb)41b5*WzQdwWTiJ9Qshq$^@EKNxY)6d|Pp}D`R8^Z{Ctpde2S5SB>x|%a=>yK-
z5FW!`pz>F62Gu4D@>yT;1ebNEzqmey`+0XwZ9-ewcuex_cT!K3dZ#^JxNu%JAlX3K
zderNkCpyjEej-!gM`cB)?PUwSc=b`A*`8qZ`LWQWTKZ0>qSI79pnvSgY5h)90_#Bk
zou0-D3g4O^EYz14M7sq+3~W^7H8bZ<WJRNvui%qpg+WpKzuLtZIW0pi<}5is?S*yn
z!PngR@O`@K{9+8@T6<ggAZ=aM{H-(eeY)!WVhrKha9BLqLZtko^W*z;)mtd?)-6_V
z-fyNCyIb69m1nV7w~rWieBBs|*!$(`vWU@tZDI)5e%fLakKuvsfc%>)mo9EX_(|y~
z@(oU16F=ClI=>i0xK2(iE^Q%F{=)gWcjfIDnQ<DqfLVK_5Z=xut40p-?c1aT;qBa(
z2J!7Xh>&oBN4|YWPeFLq!$uuI&R{bS8;$s^JCCkPsQ>Y@gr`7ayM8F7!j&Rkvwbap
pA^Ba8jXPQ%@md=9VQqdI{s8%#_`zJ;d%FMt002ovPDHLkV1hkh9s~dY

diff --git a/data/styles/default/light/xhdpi/compass-image.png b/data/styles/default/light/xhdpi/compass-image.png
deleted file mode 100644
index 53dff3b09e4ea6ab45377ea629e3d742826fbd23..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2601
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
LNkvXXu0mjfDjE8I

diff --git a/data/styles/default/light/xhdpi/cross_geoposition.png b/data/styles/default/light/xhdpi/cross_geoposition.png
deleted file mode 100644
index fc2b748ef65bd90cdcdcaf2b9dbe138b365efe5b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 717
zcmeAS@N?(olHy`uVBq!ia0vp^J|N7&1|*M957Y)yjKx9jP7LeL$-HD>U~2btaSW+o
ze0#^xk10@qE#X?gMFHlydwaJo-|&UYEkDumC2P;Id8ba@I3T!(ach}?bMi~8|Gy0Q
zKlLZhx;y>D<Tbmkjnm}iA3GTaedVgUQd*mHdgqq6Cc4>)zn`yKWp}yq`R-MpMVGLu
ztckXkeY57}>2vB!7s$TVS$8_P<XVE={QCamkGXR!+|HOi`Er7F&Ea=B)e^mK@5R<{
zd?;b~<kKy^e(zTs6cxf&Up>jDVx3nsyJGt9Ne6b7-1vQq>Gteb+XE7qxVczPUrnS1
z<+#D_Rqh;(`G2(2g4F8uB&tuHkG6@sz4f1(;&0Aw-+x<oEL)`C%4W6w?U^-dFV<=A
zsoH$=jh%ej=BBh2Z!df|Xyoll2))Vg^PSgFX(sQ6NRR&BhK02{(@%$6$G={-Kk#NT
zzrmdgRhM6WVVzX{@7}>F2U*Nsa_WCj?<_x&l=sUlu5Rvrscrj?|Jif+aoV518fW+W
z=P2fHd#D@IpUXJoz_Oq5jn9fBoT_iF%l>}G>gE0Ok=u^VE(<@he%Wlh^1{VT#hDdO
z33rb6a-CWFkh8H+++53GdYd}SvDiB+4#Y^!6Of>>q9~yV<E*LtUsI1C?Ma-<vdxrp
zr}fY0`=02ke>u9{@k7#q4ew0sqP~P{|7X~A>&}i2i+jI->65|J)z4*}Q$iB}n50C!

diff --git a/data/styles/default/light/xhdpi/current-position.png b/data/styles/default/light/xhdpi/current-position.png
deleted file mode 100644
index e9a80ee279ee6f1f2d2a1b6a4479745294898ddc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1151
zcmV-_1c3XAP)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700001b5ch_0Itp)
z=>Px(IY~r8R9FeknN3U+K@`W|%x)LNw$cJ(P@@q)Vt@lj6B6Z)@qidT`4RQt$s-4^
zCLT2=9?<Af6Xamz=m!TA4<5KE#t)1}#gA%1P|#&}*7u)w8f+V=K-+yu_hY&<@7K4x
zGw=T@Xt~z5FPiM^>yoj=9<rQm(sEjbkUKG45U7{RcgM+h->8|%$LZ0*NAzsu=W<+$
z|Lo)>j$iM!W64v(cDnzkZ{WEPy_xjY$r~qzxSv~U-%<gsrV|6bGTw3}kg@@T3u%*F
zn;^Mn9Wg8se}r9w@KNBif6pa`A~pAe)UQbjl&6`5Qs33|#F^Cf(*X5#<06|S0h7HK
z+U(8kcSy=sjAN}$lC^FF34n<uyKC10pc&Nv@tOQz=?soi<KFwH2hv0R&oT|gw~KiY
z9JM}Czv(7-m9jQQcEc8qSiJa1CAO-$Y4X0mBlUX*JybCD;Rr`_kdK36Ls-Qcxy@=i
zbL+f_HeKRlVK;82$olOhB76&1Xc)taH}g-nNX<?OQ5)~8>)c;6`{ecr4_yFR3{Yse
z+IYVZ7C9}u$%-|t5Ua2|?g&2WC*N}0>0(HSAs^&lSpdkl^$;QlxX9)XJxG41)jAiE
zT9VNusp(V(a`)b`+0ncIJd^(b;)Sp_?6}VW0+GWnEVl_O!hWLU&!mWNcW+Hg$I#sK
zdrX`$X%2XA>9>`i4m@+Ru71H+<voNi_+*n=hFsusfSBhnmFTy%zNNfGMMk&Tr@mv%
zpjool7(fS;FxoJcRLhL-EDO*698zo&$F3d33V}&@rSlxdTdu)37{G!h72{|?JKlH_
zCs-k>ZH58sJy>kwtON@`)>bTE)i%9^G7FP+gH0l30u&bhQrFgU{s=ID1*X$EozL+J
zvXZcvVF8;&vI#JqGKGXN$AUx{nXu+UP8Sx-vVcvRG+if~AptZjV3UCmN^@~i85+y7
zfK8I}Ujt01=^-J^u`rv|>I-13A3|eU7O+W3Lx4fxgvD|!%qF2*0S5II7BehhlUh^*
z5YjLNFA5mI0t1_b;)ke)ZiO_gwt+#jFca8xHUq^EFzD85n_)0aMi)EHXNM<{hdCSD
ztCkZ&GrJ$35~>ehF7_a;cXb4DfN}()2T@%uGrqGddRj3N1e3M??C=Zd5(pS*gi4w>
zH9_9DxBRxM@vj$qcCl|=w=od}i;r3f?-ed&)sMD{7<_3s_|7ooib@Ls356WgN<cOL
z=>;iww(NlL0belq&MzkA^rs<VWj}^m3Ca;r{1DZs0F=WJx%rP{JpcL>{GPs$8aR46
z-%kM`E<hm%wGu!=@uSeQ+EoTTbMs$bu{SQw0q)A-b9|D?tN@X<g)fO|Gy71K-xdSZ
zpkXdxnn+?_dI^{>4!l2=D*-R0<YNa_2nc;>>Ade2J;i!o&LVoD^9ub9@fReX2WeUC
R1sDJT002ovPDHLkV1nE;5HtV)

diff --git a/data/styles/default/light/xhdpi/infosign.png b/data/styles/default/light/xhdpi/infosign.png
deleted file mode 100644
index f2664be31f643ac7140337779986f547f140bf82..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2917
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
P00000NkvXXu0mjf?XQkN

diff --git a/data/styles/default/light/xhdpi/non-found-search-result.png b/data/styles/default/light/xhdpi/non-found-search-result.png
deleted file mode 100644
index f73b714b3f0cba2ad7ef3931d61498668e22e234..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 395
zcmV;60d)R}P)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I0003}Nkl<Zc-qBR
zF|NWe424ddf*I7Atr7=d<O*<w-hk<M<PeBU^c-C~!PZhFV2QuqSBA*)M<t5zlb%$$
zv7eIKjyo9xBFdNrvtriFhB<gP-d6cF*(3r|aK<c|R~nD2_nF0tZka8`qeYBQ1gFdc
zrNaR+$B3Rtf$MwsI-lvj+tF>krf#tS|DNyrJ>ebJkdD(^adoH9r+XZa)a5yK^Z8q1
z4c5X(+xh?BRKQ&>ZrE%P^drItzKZx(%idOs_Nx^FMG?M=cnhsixD>~$?KEcR+Od~m
za|r7c-wBQ>h*(;kXAmxA_WDFh!#vlry?}5P7*G~)NJ_*Ms32Si2GnVCVbr-m4dEs*
zpdlm|MofVQ!b4y{H%cyym;%FhgqKSaxS1WbS#nvG(~nsLF>9G7mxS51Xfg<xj6SJ{
pJ=h|KJ%jPqVxYJGg)#eS`vtNw;MeOnDp3Fc002ovPDHLkV1gM;vH$=8

diff --git a/data/styles/default/light/xhdpi/route-arrow.png b/data/styles/default/light/xhdpi/route-arrow.png
deleted file mode 100644
index da9afb4c42f7c22072d21fbada048fe7c269c470..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2219
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

diff --git a/data/styles/default/light/xhdpi/route-point-finish.png b/data/styles/default/light/xhdpi/route-point-finish.png
deleted file mode 100644
index 4268304df26daf17350f38e39501c2adbb470b1a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4842
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
Qa{vGU07*qoM6N<$g7<G__W%F@

diff --git a/data/styles/default/light/xhdpi/route-point-start.png b/data/styles/default/light/xhdpi/route-point-start.png
deleted file mode 100644
index a6bb8caef63b89cf05bbd337e5c3c4fda0686695..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2484
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

diff --git a/data/styles/default/light/xhdpi/search-result.png b/data/styles/default/light/xhdpi/search-result.png
deleted file mode 100644
index 3e2add11cf177fbafa5ef481b955dd80c1a5fd6d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 779
zcmV+m1N8ifP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%#Ysd#R9Fe+mp^C}Q4q#wS8sDBf`y=HK)FgA5ep@vA{Zi;g25u4g|&sPD2T0s
zwP0x>iYY84K|w?~v`{Q0se*zAg%pChzq0H6o^O}8n_DjzcTdoPx%X$^e&6?Ici+s3
z{O{%s5`ZX*4(a-{>L=94)px67pVdF9zfhm`JnxOR#hDUMt1qap*H}Bf9tFRRfP&Q8
zozA0?AUFuv^7l~Ymb&un;}7}pEtD^-q2bs$=F8q~zMR^#Sx(m~vTLg!bJw*qqY+t(
zC$ep>fM&BhDSr648U$5{ZoO{F{e`ZCQ5GUS_7(B`{)${avL)Iv>VdzaeojR^Pp|wn
z>L~#7AlNkL`<_3qJHGU^A*<b9x987|RYY!2j>?oqM2)+rdWl#gfUvhZo%ihg?z^^J
zf7y~go6c1M__gCzxo}{FHALcY_HnEc&}z5e^32)!#V3solf#HXaOX@CiMk3nYA)EH
z<ZWThn+rM5oUm_n=Pm&lV0~>wbSJW3M@oP$xWUc5aDzT`?#nZ<ZoX>9(Ka0M+C+dV
z<B-|Mr^ee}w1EjW9G1&aBm#8A31`0ZexI7TbHE=kIYX=&F8Zzjj#qQY(3W8wVAc#5
zeOJIZ6P$2mnS*V(;Bf_*#1bE`Wr%RF<0O_6PzGlnX7Yu*5g?@siKQ%au$N;FmyLXG
zvRZtx=$4FW&2Z6AX0%T+VNxn>8AiIcX1M6P0%n;YpOaFHHZZ}qX1M4l0yIfbMlDiI
zkk5-YFm0i-Xt@kUBES+}p{1B0pBH6dfobs!M~s~kpvoTTg*ufC#Y7QL0t~QhbwoOb
zBe9eKJ3FK83YE;&W7R(r0XYSUt%@i}z)o4uO=`9}sjKGID?=~IVtH1?Lmh9Ym>{1I
zttfRw)U<z3eS*0%%5re~nnvUA{4vQYvy}|R#Bl$bWrh4x<DY{(Zg#OC8V3LX002ov
JPDHLkV1l94Znyvd

diff --git a/data/styles/default/light/xhdpi/track_marker_deselected.png b/data/styles/default/light/xhdpi/track_marker_deselected.png
deleted file mode 100644
index 0de10b08a03e96e8cf20c3bec90eb4d4ed4d878a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 834
zcmV-I1HJr-P)<h;3K|Lk000e1NJLTq001Ze001Zm1^@s6jQ+T700001b5ch_0Itp)
z=>Px%{7FPXR9FeknZIikK@`Vl7ejs>*d>@kkyuznn_y?7g4jia*lVo_`Ufn=HVD>&
ztrA4J)}WPEl12ksD56Eq*hvyOiQM`9thc(m$?nW;b}##dm)+T!_nq&)*_nGY@k~K<
zyWMHI&dFwFQ!&%6S&P|<?wg+HeWIdLNYsRELH178FYv*4qI8iWZO8)IhHS5ZBak&p
z5h|j2**96)fOEdENI845K-Q5}1-Jv5*OyQ^jLMc|g93exI*C+6A~#5JQ4r|U9!WI{
zB9DEz2I(j!6iW~v?GstzdD<x|w>CTG`R8r(^6PK&<wwV?Z*{_|$#LHtIp~|ShYy(Z
zM~BRzh99}uu3a^_tTpp#)bO7WiDTM-lubsJSyzPId($>cAGS>g${hIW;mYwLbL-TI
zLAV3f)#jK)ZqhdHaa(1pxMfA`%%ctS_`O{m9q<CQ#Rp#ppaCr*!U!sQtnU02<u0BN
z-~KWSuiM5Fw7<-|{H3$t^oY57VtAL@#3Q0NttftvB6vd&a>eoXdl5(Xyx5&rZI?)*
z<vKo*z>5^Jz&CgE#m~Z#i}NB9u4qEV>r(fZDEk^-vXYrpWunN0*mC-O5^k9VxZt#4
z25m%;lqnM|CCt{c0VmuR%ps6`E)%SCwxuM~Ii~_nxGk7PAjxJXScI#B1NW3wAioe*
z!GYT@&|$U}*6+X_3M{(r78cfrW0xUr<vBS1e&$hR);Vyu5XcTJ6J#Y-!GU|tDv*?^
zDmZY50@=4_f_#pYscgUrw*@Oiu$kA0WRrZZY{2P|$Tt1nj(;^z0LkWfi5lU8(}GpB
zMKj=8USnq4{c~e(`+z(m)$z5!<uHRoP2ty7`-GLuRWG(^d3kf~<gj^gVXV+_GpzVJ
zWYfr4>}mQxYKkIRZ0$Bpi3LO=Yq#y(F{%<7$o31t4ngS$QdaMy4+KkOeGiYKi1s2G
z=vu$yw@73!n)N)uOo^=T5pYT<hv;`@13N@dtb=hewtI;j$iE@}00@enexE!7@c;k-
M07*qoM6N<$f}~cG0{{R3

diff --git a/data/styles/default/light/xhdpi/track_marker_selected.png b/data/styles/default/light/xhdpi/track_marker_selected.png
deleted file mode 100644
index 3753a1637a0dff9f37944ed63a944eeb3df8ffb9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2125
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
DrpW|S

diff --git a/data/styles/default/light/xxhdpi-ad/keep.png b/data/styles/default/light/xxhdpi-ad/keep.png
deleted file mode 100644
index ce7b6f20e5ba507cfda191ac9e712ca89db4a767..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 126
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k8}bl&H|6fVg?4j!ywFfJby(BP*AeO
zHKHUqKdq!Zu_%?Hyu4g5GcUV1Ik6yBFTW^#_B$IXpdxNh7sn8enaK$ZObiUH42(&k
RMjb$522WQ%mvv4FO#rSW9sB?Q

diff --git a/data/styles/default/light/xxhdpi/coloredmark-bg-l.png b/data/styles/default/light/xxhdpi/coloredmark-bg-l.png
deleted file mode 100644
index a4b69091eb323566a1b5ccef86b63d36786e7429..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1738
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

diff --git a/data/styles/default/light/xxhdpi/coloredmark-bg-s.png b/data/styles/default/light/xxhdpi/coloredmark-bg-s.png
deleted file mode 100644
index 676fe3e60e8f00a67b541576d17688819e62d87f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 581
zcmV-L0=oT)P)<h;3K|Lk000e1NJLTq003P8001or1^@s6%u{Cq00001b5ch_0Itp)
z=>Px$|4BqaRCodHnlVnpFcgN9R)VP$8_Y0(#0@w>2d+?wJM<7m;w}uFfEysC1I(~-
z0FY4l|Ed`xRU&Cpe=T`WdIY4{zy0}PJI~Itupkfwf<O=m0zn`M91?;25E@&S<+<8<
zE5DJS$xr1c@=y7P{9XPmf6VjzP0z4x2nh68ekU*FZOrex+;|(^!IlxQsk|+06{(ra
zPX`OJX~zX=Bwy6fb^pWljheP$Q11!MME=yB@x~fl?_^Lw|LUxOIKp=Yycz}99}!;-
zhG5)RWOn>qRGNc+3bGf?l!h;^=ssPfy{&tZUnY#arL?ZKpZ`gyS(BpYxS3j$61Y2W
zy_tWZjE?j|9ZwD2te1-PtHD9n)Z$P3SE}REy`WMC<n-cP3Tc==3Ejyn(lC7zy0e9(
zVfrL=r)NpS^s(KG7Sb;fKLV+LYau-*^vOu~0R(B7J_+3?KBQs#By=CKk%sA$(0!&!
z8m3P!r13?XI^@=$;Li9F=G+T*Yk-_y4Euo~4(hJDi%l<9k9_)S4ATD4zqk()=4n;4
z`C2!z?4HRf;`_dKp(;1pV$ZtHHAi^jHUNQN;N#v41l|$f_jL@{NAJ=Iob5CP$=5Op
zc^7ke{JKTEp2Keo*uTBCi|*5#j;jX1DTBD5-V|887X*Sp5C{T6AP5A3UJ3jHEcoRJ
T{>GnY00000NkvXXu0mjfNe>SY

diff --git a/data/styles/default/light/xxhdpi/coloredmark-default-l.png b/data/styles/default/light/xxhdpi/coloredmark-default-l.png
deleted file mode 100644
index 1da307fc3a39be297a44719b4421d7018ff0494a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1979
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
N002ovPDHLkV1gE0(98e;

diff --git a/data/styles/default/light/xxhdpi/coloredmark-default-s.png b/data/styles/default/light/xxhdpi/coloredmark-default-s.png
deleted file mode 100644
index 2362fb5571741b5023bb7244c956b07b13f9b61d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 973
zcmV;;12X)HP)<h;3K|Lk000e1NJLTq003P8001or1^@s6%u{Cq00001b5ch_0Itp)
z=>Px&he<?1RCodHoV{+;Koo^B1r~Lh08%;{%52RGAOS585|rg7@&tJRT9Uj0Qc}^<
zq(uBQNQeTI2w1*@yppw=YwzIsaqKzL(JuD*{v1!n<2$odw?>ZDYPCy<PvHXIZ*hn3
zU*V?~-|_vls;V!17WgQD(0lL@p2I)T2WqeDbp4)>-&wXrq#bw!uV4tsj_m2LqM)q+
zqSSB+zrh%gUD>bOerNj~A$H*fOab}PGh)6#fPMHOh1xA2^0%K;^(vQh5`Tv8*YNHZ
zF<jE-4SWkfLd{q-bJ19>8O;Ou7(Ry&VIO|d;03dslfH(NIgj8A_ycy~7blP5BcH_8
zzPV1<cR~KM_IRJX2DK$ojp2Pm${B6E#NG@_*F)Lqg5sF=7*B$lrF1<se{=rjrhr5K
zEqhRQEhwJp&T2^Rm6bWizr!a(1h%e~-Nrs2PAsi!Z}f3e)r*fc4_8l&BKTS~*@sq-
zS6tJ3fg&lr8Cp14ixcw`=Nf7(9L4mV+%{RNmSVlypQQ|lIIM@O;+sybhGbNHazWF&
zL9-O!8zz6ynob`2+8b?qlC)+l$2o!~9?kz<xX2MtaGzwRdAU`dP1?)X$q|owy9<gl
z`n>)2I*^E;dfj)G8!mYbe;?7WX}a;N(!wSbr{ax@6rwMT3{*?W3Cq6~Z?ITXh<?wA
zR>iBFu>4!`28%U?=&Ay`plV@GSpKbegT<Otbd_gw!tx(obk_qes1VEst}uAVVYKFf
zcI`Nx<PdQwCdIaiYvPJp087!+wb<Z7?plZC--_3j!+#x1A$qny;~qt<VZ@5J$K3X(
zbBeAdww$p1Pg-=XY379Ge-ff=tD6g2M9vAzzZGxJSp9sfmH|uc#ZR{3tr7jER2k2Q
zXFC!Lh+gXHsqY1%mzAT`qRSt`cdd~I-F9K+M-1~>BW*-4y8*1;5c4=at?YY=DX_~n
zqSw%x$#Cl5zLcQbF|c{i*p+=36i?IwmrIMJ$4Id3WlXAg;|$?vy=ymmJ>9yg2w(Q6
zTjIn#-t_psZPPRh3i*q^_#9KW!L|`VV|>@cHKgM56MbLHU{O*SK!_SHp|z`*Q-e@`
zU1!}$WYr5)`5mbxP|V{9uUd_YWEu{vvM{HdP<vfB+Fwj(o4ss%(-2Q%ux2`X_-P}M
v);2{gENc;2D?Q?8s0D}<R`W;we*^plFDR8!#k6#U00000NkvXXu0mjfej?f6

diff --git a/data/styles/default/light/xxhdpi/compass-image.png b/data/styles/default/light/xxhdpi/compass-image.png
deleted file mode 100644
index 4beae9191b7ef3251d0af7cd32ff83f6e5278958..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4018
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
Y0iISQdz9g=zW@LL07*qoM6N<$g7kph+yDRo

diff --git a/data/styles/default/light/xxhdpi/cross_geoposition.png b/data/styles/default/light/xxhdpi/cross_geoposition.png
deleted file mode 100644
index 559a3f089b80c3b6cbe81d3ffaec5987ab6be760..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1152
zcmeAS@N?(olHy`uVBq!ia0vp^MIg+<1|<9Mw$=hE#^NA%Cx&(BWL`2buvmGzIEGX(
zzMX5EciTar)mPKul*_87l9e@0AwMmh{1%*Z2=Z*$b;rrUO1faVnr3l}id~C-!jef3
zF10Q=Be0vrak7wF?|r+ytYR^G$4~D0o~hz>bc2<$%<sSZj3VFX?%Vv+%5%@=$GvCm
zLqp$QmOFcpHJG>g$03&38#eL+W!b;4vwg06P&M)PVx`S;9#)}`6g&P+=lh{_l<$xC
z)7;=jliz>eZdrHaZr=8I9WnjomtU&S-}h~A%ZX&0Fy@Plt2eDT)2}`E{PX*1i<`5T
zy?^>zu6xD9`r<{udQ2?tpXqp>*B1V;Y<KNdvoxcbf9~d(*<ZfbT<fQI>$-Q`=Dl05
z3CMbgC!LQIjy5_l$6ETtn%7VIm^_<e6j&!6VHA>F<<Y28*x=Hp6{O%PqcCw{mxzZD
zyGP0jrGb||zlrblnj5+DzE?~1U+2j0eVYDz&xEhdPk*jhTh4olMK)VLw&U1jkIUR|
zd}rnN#@@YFJw@wd#P1iA3syKxd_JxC?zP=U6Xf5dJX6{e`lV>+oHf^9_t*aQvvqr%
zDf{8s!Ob_{T+iBitMB;ZI~J9-X$t(?`nPSF9d;?|amB^l*Kb8DH`IQ)yzk$a{rr{}
za$m1~KhfDwblZD{zhT?t{@t5>-73lYLSpIjc>6zw&UMz+&*T@B{a83#ww$?mOMaQo
z;hN3GkLORU+qC87_Dv>-<yb%N^zV7O_tkCviu3Y<Tcwt=*TvrM%+Hwew88kZJj=JQ
z`qtZaY!82R%Ivm(#p3^+>vYn5w;i^>Sn09q%>8X&BA;v!f1IjPc=?a2P`}LT_3|f5
zn09ie9ME|Z(CD&E_=K+lbDCm1mx|F`hdd@p18&O@g^4d&iiA%zM4nj4)aj!>VYUO?
z87Dqbj})uMJ1j;CVnr()lrD2VQJcWHd4e;m&`duC^G2Q-tuk5@2DQ-|(jM>UMDXVa
z%)b8f#?9=c&tE6?=K!Pb>$`3JdXh2b-=9tNy35@<@B6l|Wx78jCAa0=au;8<(fqB>
zs_#jevm3YF+rBJ!YSoo#YMagDS8cz>@+=}czdd4m|GUy97kpQBo#6>e-FCa`_fmKN
fiqju?j@QctWcl8j_T&q&NMZ1F^>bP0l+XkKU4jF0

diff --git a/data/styles/default/light/xxhdpi/current-position.png b/data/styles/default/light/xxhdpi/current-position.png
deleted file mode 100644
index ebf3fd27dec4fad74b23b92dc2ce1fa7fff730fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1722
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
Q2mk;807*qoM6N<$f~d7X{Qv*}

diff --git a/data/styles/default/light/xxhdpi/infosign.png b/data/styles/default/light/xxhdpi/infosign.png
deleted file mode 100644
index 6d392a24f31ca707ec0d8c5f20765ddfa7476f61..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4410
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
AApigX

diff --git a/data/styles/default/light/xxhdpi/non-found-search-result.png b/data/styles/default/light/xxhdpi/non-found-search-result.png
deleted file mode 100644
index 4a5a8d5d0e215594fb2b05b76c8a69b4464a8d24..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 572
zcmeAS@N?(olHy`uVBq!ia0vp^x**KK3=%mav;s)g1^9%x0_p!$0-v0nKgh}bT)zBE
zQqs59)*mxweD?PKXkr31{)4jeuRVMIeg6FK&!0c{?tN=%`S<tlm-u+ijqASvT_9N!
z<QL2!as20*P36z}*egEBJ^m*AFV$#<pYgGoX)7ZVG#D5dLp)s^Ln`8?PQ5<qumX=O
z<M&BP)_zRy{Qm!!zZ3h;%IA@pmHwVNi7hHB-+29vj(^iRU$&`bvuo1#9q)O5FP1*P
z%liJSeH;JWT_W8QXznV)mOQgNkI%5n{%*<VoJ;;cH`H=}-<5M~U+$@2|E_Ik&rpzm
z60JDZQEa=TfA5)g1HA&?Pev@C`)maY=1-Lhwq4lW&?xZf>(XTvu?yQLlndsy*(`kg
zjU)9_;aBIgfsP+a^CK!2%wqT7`mgGk>#HYCx)VLVUw3oj+UnA{#o*Y*MMW2<Wh9(C
zr?EYX&3D3v$#$<rcV7!TCR002yKJRy`^{fDVQ<``%|3s*x$ef=Z8mMUzG#>A|GMyQ
z*-_s!o^GegomQ%@_1CbiSn}2U<NF!)k!$~XKbpV%ys+`=Wo<_epV4|H!=jmZEa;i}
z3Gs4gzkAkS=DOXV-gZM&es@HI`1!-<m;bk|mwNwG-eBJPD=%NwECNOXgQu&X%Q~lo
FCIHZ}JsSW3

diff --git a/data/styles/default/light/xxhdpi/route-arrow.png b/data/styles/default/light/xxhdpi/route-arrow.png
deleted file mode 100644
index 997a21da11a7b2ba757670cf3b4c7aa996a57889..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3396
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

diff --git a/data/styles/default/light/xxhdpi/route-point-finish.png b/data/styles/default/light/xxhdpi/route-point-finish.png
deleted file mode 100644
index abbae5688b42d931ec87b524269f777f44dad0bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8133
zcmV;$A3ETPP)<h;3K|Lk000e1NJLTq004LZ0043b1^@s6nEw^D00001b5ch_0Itp)
z=>Py9e@R3^RCodHoeS7r!?nkE5+p*1TZlwNu1JWx)}<mGj%skU9@W;PuC3eYLA6?a
zR3E)*k+zhBqaJlBr5B+tDe4;3{aO`7-4mB2NFvvL{=c1fZL{~DdEfngdB5*_w|?t+
z=AGHI*UYS$wP(%Dnl<zGi2i+`N0X}>H#xud(ASWL_GH@RdUaTKzPh<_Znz8)ZezM(
z(&nGb<Yzc}I^1VB?3Uq%>z40kU<Fpy_tnMX8u^XtYz>O<hDm47mPh{C;`6@IM7)LZ
zePM9&Wm`Gs8xDR7mRTB6!9cza_Kfd3s@CH#fBDNA+itt<R{i?*+qze;UL$(+=&`0;
z|DHX2_SgF)EPn;LIdL4nFE?lD(xuZEFJAoUym|8;eN3?X?z_*@duwp>6;+zqE{&u!
zI(rg+_uY4Q5q%R^SYd_nqHVC^7Ko17qT$x}-+%x5wbx$zUd1hyv$E?lS$LHLYY_8k
z7+fzon6skXN^-r$kC7jK_~A(l7cRV7jGCr~S}M0Zpmtt-$K1JdkDWSo>Y!RVlt;Og
zpD;<j(S~o}#<}z+v_AFJQ=2SWwCKi0#HsvSo_OMkjg+aCn=jMKtEBI1BpNnl>P<J@
zH28xLKKO4n#C>Y4<z;BS_FfD_)Z_M0`Mqm2xQxy>JhZ!vh34M-?6Xfl^~`Uppn3HQ
z%e|ZR#v5<!tn_>wl$kF}QPlz;W8L1`XU2>f|D^`MMGdhi*BBlCxMazaC&i>APe1+i
zRn@FCy7ewTKGzw|d=M*7pFVw0rG2_R1WF>k^~fWSjHs2DXR@NJ0eQyqrCKA=kT7;X
z_11^l(@4!uqeg#2L&7OnU3Jykq75cOqw5mJzWVB`|EZ60%JP=4JnmBdE7!`%4-x5%
zP47D$U|d-+TznHnJ>Poktvxm2I8~FSZOdlViFogS^wCFG&zUpl#;2ct`kBWcfBgOZ
z_S<jty6djHSKq#UCu&l+d9!GF{`u#39zA;W!^&@o9Fs2`5L?47d+hk%e0lD(8_rY0
zJ99lBe)!>`<Hn6USF_CB^N3}hr%js{-FM%8k;Gf{uYdh3Qg4c8&YT%(mK<sF6zPMB
z)>&trNFPr$V8DQAi!HW@cG_vDXvZCQjMi9VjWR_nHx6{1b=FzY#TQ>3&7VI%I{x_M
zBZ+@+zWR_ZTY2S`kI~D;a>ihrVSCdwGtwAiK0OeJI6>5!xJ@QWd+oJXZ=B+JPU7Sz
zqImrH@vGJ*BOkU!wCM|v&ph+Yc;9{Zjm0>tc$<AKSz<9dzUZQh;@Pujw}pf@;og1s
z-SLPKBMS7La>^;*e6&J%L~Ybhu1~GaOv>r8W5Jk;?=saG*ZYru{Nn)4LJts;7is)@
zTs2_L2YkqKK;zlTfBy5IH_*&@xW*f1#ialSz=$1o*rCu+qGh?``t<1&AAb1Z@w3l9
zTZ*1CNSaH;M;viP%!lNoajmu1@@AuUdr$bQ%k`C`Gthag?G<c3Sms{FPMS2SzZh_Y
z7{;2<80saSNLAonxtT!(=f#UJz8D{R=%KMhmbZ~q)uzV7jL&`UbMZa*+~ZKuw&1K;
zv*I88;0N()tF6|MwouNh7h}gNa!5a<Vu$u(W3bz6R~kBWXdg{FP7sl^LWH(AUSnx|
z<dH|l8kZY3k}BUJI2xnltFOK~mNY6=4SN5HC!QFuzWVB==?P`5I;|yVV!A^aoM$fL
zxc5;<9kqI`$A)NZSG*=5@pr!Sop_~{Rw~^{9mQbFS2N{A)Lwh-wefS$Js0bvjx}kD
zHMxtYOqr6<yY<#vw~O9TBdP3l<W`f*jKeUanPB<lncQo^f(2KJ3Hvm&Fp0%Ty*B#i
zKmXaLY_+6_G&V>0BS(&mh7TVe_3z(5T6NV`6Q@Ru-g)Pp=oi2EMRfMrXSXTujz)$y
zA84ppSMeXoEs|q4&63HFtQYMCV=RMw(sSjnq9w?&p)b!DFU^iGI*rrhD`rL+nvAH-
zOz)s~GlQ1$A%64CH`9C?1s-_dflNO6e7oW~M6+laAjd=tr3Y=_A!9HMCS%3`W^;W%
z{pnAyDTcisB8+&6uO-)9bIp=3fBDPtz<~o3#%b*t)4+LPrn&2`yOwTvt!ZP%=k@>}
zQkjX5>RFne<;4xvL;2E!Z6*zaZ6>W?^8f~0@8wJCr#0x8LPS0I;DfQ&yutBPVl&pb
z&9+?vue|cge2LRGH>Q*YmPMO=Z3MKrJk`6y(u69YGF=9{OC`N(4!FISsX9~k{_nl_
z-g!Qvq`E7$lzH;WCzEb0DKLBe_1Aw}dA7Onw%>kx9|@)6e)-E^mMZUOKl@pH*kOmY
zX-3?hx`c>UUND$F?aW#jaoTLKaX48bY5W`RE8y3^{&k{)^SyK9l%D*eKm6ejPicD$
z1%8`Bk|L5mxXtNEu-k6Cl}fkbiYrE!TyjaIAp}~Z<BmHn((n`w8Z;=9?m6n+yLYtS
zdh10}u|{9{%2y)krAy`8N=SL}%y=+BnyA}-U)=!*9MG_5Y_P!w&r89Ps3pJmz3)A)
z{2HbS;e6v8-|&%9Do%`PST6Nx3rK_4Fi&4yLS+cIQ+u$@;CgC#gjg-W9((Ljh|5P@
zaKQxwG*d>@qvZEWf_$3L^A%TI5s8-2>$>q1CQPXNo|jXnPHl+eBCwg!8PE|T+UQP1
z_1ka1{ftGpzVx_}v^Wu>Ed*NUqGL@!`138?9$)(I=udz8Q+tw@64S50{(7=ARki?j
zs;UMiqM5<b>(Gr3Jn5v9wv|{3T3Bd_v_P8z(}Y_PS!#rjB%;%_yX>;dYd*ZPaWa+*
zNw_3l+l8@a>M;|*JMOq6)>s<faKjC;K8#q~h6Vca<+9E$3sR&s%rBom&mqt|uZUKB
z)4<2z^_2TiO+2m(5k|b2JWoB@TVZLb9<#K!-g+yW+Frae@hC=Kdg-MkJ5-#v-F932
z{qKK2S*mHgubVGwMwBF%U3OW#=bn4U+ORL+Yhq=jHuO>EutqOKw~G_XSU8=^V5aI!
z*(r30c6YYd`1e|fIO0R=O{pTEv2;>Ayt_P`323ymiJp|z*4?J_&p+SDNc`7cdoBL)
zkAEBw8#XLu(pFn-mBDHB5ZaqwbImo=Jk@@ga464OTNjo|if<ZN4`xtB$${dVfd;$Y
z;TmsuljXrHAp%j%3$Ng`@48f9JNC&5eDRB4eBOswFAi-K8xk_{iD688dd~j)?{6ez
ze0t*b*Iyrh<};s3^3|##^S<80rkie>sjrq(37za^hw2l`PxzhEgPF9UrbN+!bs^($
zBBte!{@T~Rwws85#786|Gqi1X@4ff_-O@bz=%bG*uV4eX?-2WlP3giddE$Tev!5-M
z-pxz1_!wr^gZuBlKfd$MI~(Fz9()v(p}9t^Wne~6?w0L_Ep6TxPKPsCWh8oNRFzD$
z=*6ssSr5>QhskZS`R1E%uZEhNCy-~&l)Vivb>@qPuSwTD?fS4|;>ERi^wo@;K4|Y6
z6xC`YfKiO+nq0=W+;U4C>d{(V#6SAck76X3BwHa{t4H21Al4#;*C`A}O#6CqG8XII
zNVzduQcU&{%Ga;=1;^w_V|cm^Bys<w50AK2R#_!J@4WM{0`V1*#7Vy$vu7L1BNPuq
z8o|vs-<-*p;XvA~SjS~zX~h!X%GNqRm|cj5Py*q1Due08HWp)LfVIIuxuJ5Sue<KL
zBYlLzl+bKeUwXQ=^zzFuqj$_Sq&*`h%fPq3^(}9D%g5&<6&eBKr*DSs%MUZ15cu$k
z3xVEs8iU<ljHqTt?TYH*60u{{i)Q$UWimuX@=iM3v<EBQVr?san8)GySHJp|FWW+#
zmS2T3eEGR?(kCaD8HLPp5o5=WEtPk@WtCg58_pG#J_^Un;EvK{Q9-lM#j*g0l|f={
zpmAxDX0tcxxd7S|F2oU`!&d9b^yP)x%U<97<~N`7AzpdqmA>dg+^A8bqMdi%xe#A3
z0#zqgB#i+3=`x^kxD48I;WV4UFxJ4nVi;`<Hh;0ks_PBW^~a1E6K%QWmTpuUmXaY=
zU21L3ny&!t9KG;@eFuftnFyJvW}eGDNIB9Ftt^8vwy!E6rt_j2^`$94HdJ`DmPXH~
zGR6s<bIv*Tab$e$2ebK~u2m!oXDFWx4$o+($^fd#(9+D8FL79!Gy;8K1)6;MA<9GG
z!zV5Tdgm3<itjLRnQRlTjPm1|XP!CRN3iyNgUSf$il4AFzx&<q9u)P3#^h8$S@`<b
zzg|f1%hTeR(dXCIzOrnlZ0USHI3e)i6Bh!#>vRUI%uFvfE01IoLhm*@;e-=*5y5GX
zbcxq?qPO9-zI@d1Bmv%_!If9R`RutYo$KqIQz5M{KQ~SvmYan)jONQt;|sHd3N7b+
z_{4=k@4O7Amvtmq{*3i3olFS=vvC;0UoKVR_6lc!{o8{NJ~$J{gJ$3hb-0@e8?*CB
zAHwv%{`IdL5q1HKigV9B*NqB>8S}M+6iHks=Cm^LiI@v$rk)%&lOcOzeWDWxi8(FS
z8JO70wmGrV@MVm-ttNuLSD84>b9E#o6UT!-+(H}?Vz4(}_-G8-@LniK`!L_JQ-%t5
z96+flKQPL+b@3pDhiOuDs_&~r1BB8-I0dI`8B*2d-~RTuzx!}d<fG7N1dPKN<#F@`
zE6Os!mZFu(aKL#Y&E6ATx20!2ZaDS)fBfSgmL%~xc=pw=el?gjgX}!03~vuse20TE
z*m|$+6(>4sZM|(JF*V<zH4Vyk$y?C_4?OT`Lz3EamUPa1tp!|NxMFApUs51G<BT(s
z(}qKa3<-+LLc&^vmRW`J7%rrWO^%~Xo;*3$q_BXKr<46=HY<)j_ShIY^6&G{A$o+@
zr3{A2FxVzrruf)EaU(Tpx!FfJx?H_4IBgj&Rd0L8(j0QgAy4`64m#){L&^BR|NZad
z!Gi~9@|Bp+;52$T=9ptL>3!wX8)a3R*mrYgi7iLelZ@d=4EC4HjMZ-5A-aUqWeir?
zg~=8>O$<Ei%MH^;{?R_d5t$)_H>H_sX>>cyBg&`H;B3FqQw>n?hxVPn^rfKrwk6N_
zWi~8+`qQ6g()b>9W~)HAuPzqn%Y!(*?{WrPFE*2&bWJQKZYpNJ=ObP-ZEpkUY|(TF
zf4(M2^Q;kE9}5hC9vb>sz~{U#dgQXek<Ui^${Z_g1mFGccfIv<>)?h%`3a{b7|dkL
z#58MS+e#dvYZR{Z5wB|&f(@Vv(#w|S)KgFOn)6_XMNewP3>vZC?v9n?`WV!cF66Mx
z2rYvwpO8`~l&7W3`@-*12CICpm|j!y>@sbno_1iKXnWpdlTEyh_?zGSCKc1tZF|RI
z<?T)Di{Ea$?X1XBzCNmkc{jQN;PT5aZ<vQmYltx6v;>1)G0i&G#Pkq_M``0b?U8Op
zuzhkXX<;o<*paf0-zC~=eAnK!*VhRMx9Gaz(EhbscB6Aq`Tb)ztuGuRNVr}GH+!=|
z<pcpH0mdxbgs=tq5{c;>mZ4;SH39N2{H609;MiUF)REF@*_3U6y7baZODE!J3dd6F
z0k`?ogDTob*Q<}MiSu?_iI~;~_<w}HP}xM=hmrBMmQ8o~YukyL_adfE&*+CWD~~U{
z@WPmNIAU8@Pb5kgEIM^bXkrbr*=C!?*ml*kfTV04Fb`EJiPuecZK5xfnac9^;CjsH
zh<7kJFQ!=&b9gxs(^}S~cF=BR5Ou;SI5jX9m+3_=GF^Sehu4*HoM{dL%ec1C7RpC?
zcp2Q8B3d*g3^JdJA*RhCs+Z`NoXH^M;R|2*LUKYcA1_5hKZ$B=v=Wff+v^r?6<;=D
ziLRUDGw8K7*NCL#h_ulW$$ZH>{IrvH+O*5T71OpRPR(njhWwPiQtvf2VzT#ZmvMY*
zii>exXopEP_olB(d}td~OR?Fi13egN$fSU!D4Ijsy3@fG)3zoyF`cL`^`+nL6GgfZ
z&C4L|?krLz)2o^G-h1z7RVy!UmE+N!`#=)mG1ZG<j&{UcnRZ1wcL{@4Ze~sF?l2{)
zOYIQ-kFO%?oxw?sj&I&)X%v1yWqe{7%#oXVRw~+Zyi)ar!6=Vfiow1erVXXo7^__(
zCQk)8`sky*jFWMEdWK19=cre+FY3iD6VFzqhKpolK--fss!1+5!{_)5M(~^_MA<Q6
z!h{&TcbR<Kg2RbMZWE%sdLYTRr}9NB2!k{CWa+s}z$d0Ns!N&eT<5El)|K9dWZYE`
zPg_DteD4N?YU@pJ@od@YdWo2Q;<f;%6VP{KZ_OdJ_Ra%1#=?Fu+l^)Rvo#C9SG2RY
z&gKn!?J$^SXqSp;m7fvQSa-0)gz7R8(>j}baHxUZ6Me!@8KxbcyDg1w_wnkcU3@o;
z@trI{N?${0<%E3B|FSK~RfXIn#CjMb1Z=AjxiFF&gE;NL)+2gw*58eE*KT>*pqU{F
zvYqO|-Z~Ri_S$L7mSHeG*~GM~y4+9=F<L$H4YxuTKJB#AQl=_>8rEjJtLj{!HS!$y
zeJG45=Hy|Ofc<doG4HQBF)_6X7H!DN#AeW4HpvnVNe_kqM2XF&5z}_$bc7CTU*v0a
z?td1Z*Xcg#)CNYHvHL@K#B;0^Wq;K`^MHG_G~7XT7%GPr5XooaxyxtJq9p}mu&cU+
z*hF<H!?oasYG|uYM^{oYEe%p|he<|tF&|2mK>O7X-FV}T$EbZamK!F=*vsU~*1z=L
zmJrXPBLNtU^NHz1b*bwe(%G@g48}{PD>zv~av0dG=ay<ecxE0?>*S23hnsIMyh!Fm
zcWP`uQRC<Y_4sXN_`ajY%!%5nJnEr`9y&*&{Wgiq^fta+`sIEkZ%MK%B#rh}J;un5
zmV>#2<q*w`z06;1_S_QUS@fh}y%^B~k%$_^G+*a%ZQptAUNAlnUFV?Fhuj>WfK-`t
z?7%lm8IFLe(d>257vrXANw$}07$>*6+-8pB8MlSpmYSe#BYUeuwD)_FdfAi8w6Qs7
zpkz(57AcR%btvFMeME=qgWXzXjFqF;j+7fJN81>4X)o5kHul==nRZQj4}Mnygcy_g
z`VcV?%WSZZmOF#Bvva4yyvxAEi4!A<tV|pa8lT?O%{_?u6tv{1du5X$YPmCAv)>=e
zknbVIp(jU2Zj!>#@LjsCQ4?QhllrNbkJT_RMr+xTvY{R*lc05FRnk{SOZ$kokr+8o
zAKHAat>2M}@N1eoys8i6sh|AhCl5<9%vJsw9lf5hb<Vp*ic56(4nDL3iJx$J*>jiu
z8VxiKOvD+36DDg?aj7mQ-7!z0Zm5lPXGcCdl9B=g^(AW5!bed+b|TbkZ`4O~hBg5{
zP_(b%tnpmt5{7oyS)AeF1LhO9yzpITjJ1!;=)gAyTO7|WzU8UtW%)x?SA!9S53%M`
ziKLSHvM2k9l!auZak219<94J2<E5Fa9<@M*>ZeH@ep}2%alfGEK9XP0&2RAD@+s?w
z%Chum=jgTOtc|SQ^eO>s)8wnO$X4);x%O2i6*&3ilc$IY^YR4hDx~Q1pZ|P5I(g>k
zOBs-uocY_|{`PQLX<jRQ8qgY(#wKjO#pit=Q!HJ*55RCNy$?5EmNB?t&lTM*1t!Yq
zb+#sE>dz8j138T2C;R3lx8Hs{A4S1oMTuc~J<z!KfUW@EN$E$)4U?m+_2ii3F*`*(
zFhfOwz(mG%#GyIjJrf=1B@N3w(nC92csTMLSaa*k$JsOQzyY6hq$eNpBVWp(Tqd9l
zU9^uag^<A3cCPqWbn5{GLNLTL_R?@`$<Y|Ybj0IGAG5TvP&lO^{Dk3JNBfeX4xFp&
z2@et;v(n*m8_ErmV`fSN!&qxrXt9Q+am^8jOXdmkVS>wW@_<Pg7Q!%NKKUCHiQ_$Z
z;KNYrZDqq$E1!0u1JFjL84F@7LB1y<q7x?t{Jj#V@8pTqtTe(X&j%qft&M=b8mAd+
z8Os(r&Ytn}6PlD3z4L{^C!Oouya^+6^Km@8X)K&C-^N*MBPB~E7vYu%6E%Ev^b&dm
zUp1m@u-pj!_rkJc3b}r%Tj8zJ1z+pQ9QLwDX}SKlmamCqdJ?_IM4{Vbj5eQdJ&N9i
zBONZ^)7>6#Ve<{w(pp}YcfMR@Uk+NS2g4i#!tO*X=`o>uJ!IjS+@x-aT|d-|wVSh#
z9Qj&LG2eQpm2Y$vKAu`R7H|0GlMi9b&wR?Uu=$2(Y0bC1Dayk5l?D4!`GWbnnaI$y
zn1l?G8>LhIFZjCT&wu`Nw*k^{y`!PJ7Lh49<6&KGklvRCqrVw`*)l7KN8^~7MqJYP
z%q|hr!}U*MlY9)8(R^@|of8N?&}RA7%9Du>qM6AIB9gL=K?+tIT1iCbTQcp1dXb7U
z>1QYFxge%=-Z!~YA)g7)Au%nD*WNO2=Ogk#p$s2VcU;?Bz<Q4>rddX?gh|A-dR}@F
zi`z4?IuuU9@&8Mh)c8O>|8S+T$(7rK6<vL3#U5-u2j3<e_|}V;=#Grrd`+*vuk%Gm
z+MS8Cj`qIOMC(Ak@QGzUw8}#(GT3cYFO#)DJH<t^Ftcf$Fto>v9}?5rkl0nbRV>AP
zOwQ!d{m{G?aK*H(i4oH<0uGK0&8BtrQb9xuKQVNZLA_5(bFtaCh4YCN)2-TrT`_IF
zI2F-i#u6PHy-R)p#*ZIgh$DhCLE7i_zSC{)hv@}lJ|C9#WN<4lrdyT4G%n!wMjMY4
zMr*lr|1y;9Z-~KQ$-pj)Tzisb$S7&a_S2&=*(3-Um1lCTnl0y9Bl8iOm_~J(tchiY
z!>yoR+naj#M55O8fi^8(J@d>nS!<&rMakkaTaVq)5iJ0dVKB=V6cLP*Xr9<=+ek|v
zuUVw-fp&X-Cd@yChCun<q<;lRvGR#jdZ=D42iA+}O?lPjhBD>x-d@I?SHkx?4D}@5
zLp+YPM|_sjq9V0kY-4gIMRgU%V6}Au1%}Cx?mc_y`dE5|KwFN{@y8z@iNjtLUD0r&
zY_lfnC2dn_=6WmGf{`Ys-Envw{ax(l8aKV`o-%)3%O5|7Kn4M`b*<ANwMDn6?t~8_
z&)`IDsb$jtg&4H)#v2!UyXefs@uyk*0c8jzs?SjxpQ!GHD*yWw;T?lzD?MDj?Bh!)
z9WLE<*IgM#<{9fgb3=~q1aVSlf^#QLn#5#|%?PANx42d#G#jk<+AJDdr8RWv%5fQ1
zI1i!gmXyxRc+T=-*X08pygo$fx_fc6x$5NSGT8Qp*V5*}H9m&ul!KRvA?8|q=!$+F
z0>4T)EY0#`v7)L0tv-vU6-`VVvwP``(Kui8%D&kb-7rp9F?eybq#COiEYT_}o~yuM
z8sC@;y**{~%%(#DWMEf_D-*$eRX$KTm<lCj%7+F6H*9e&>9;bW(1xRd=|xO*P(E;Y
z>*d<BypMtPue4DgN0bcdN`*+b3HY!V%EXq5mYKGq2S+DvLxC?%OT|^C2h(WA@E)2J
z&GNOPc7=S=4dZ<OdO{-2)F~$|w_!#th)@*<)5t*5*wSFlT=tm#-DaC@vJoYpLg}RS
znxQPL?2@^)7FtypoM|<kN_Zg?QF{oTaPZ-}aiMfFDwrlb>%nf4?r;-YfQID*WDRUf
zq-3jb>eQ*;bujB$*0sVf?dq+AwY7MZ@}f+3n4sYkXOyQpbs4w}W*tf+a~N%q?%mi-
z<D>V#mUN#*avzoO8Zw!CtHAdG`Ri!v$Xc1*3|2!l8}bZB;b42g!*mbF#XiOm2h$q$
zWZs9EOCGvu?*f&#eyz+(D?6Iam}cc?W1n{~Sf~59(IhDNKRAeMG*r5hA=b(L#OMy6
zXW~QZNtnwlU4K-)nJU6Mn5j7`QkH1YVst6k4a?gCG^VYA3#Scr_?ug4?N2%2O*3Gr
z#`t4ZF6KKZR4@~wY}Vn%U<JFO87)vxOb=B7qh+0Oelxggd1xc!T;;ow910GGgl_Sy
zM(8Lo2D@UK{a|_)J#4tNP@C46yu3Ym>9lFn&LhuS-W-*otnS?;H9|)L3^pbsB3Y`?
zqZk)CxIILUneG_<k>yGC#$@ZEKA&`m`&wQb$|rB@y_8AWEZK}61-qeHEnp0`UTkAA
zOD4o941vj;YWcL2?w`Cgw1mnt7d&nFU!rRYKUK?vyvUQhZS1wll`&Yassl7$tAo+#
zG8$&ntIWX!3$LL6I$BkCJMJ`Y+_+t2L^n)V6R)GKztz=K=V(*mZJkbhNp~~fdHU(6
z->v(xK2Tb_7X#lm76{vE3fo{%RI<LtuLM}*wK}mzC%woVS|wb{*jku4J^-Ar*P#G`
zVaB}03gcWRTO4@CT+-nx1vEyLz?cKgFafYQV+M>f=Gw=QAl81sw{1UsV<rqHY;l$!
z__#_!RTxYI(~GU4X?y^N7z2ni=G0@bG0yNwW9ckxIF`3i(y|Fx2CBkf8q~*RV}LOP
zpI&PW=A$sDV9F%JhoOW+j3s}-{AEuS`n9pGLL?^)gI=TE##s}`?z1u1aP5P@hq2}x
z!`=6U0rQtVRqWR)UNN#$=0dm2L^o`VHXM9o7QQi<aNdCn82+-S3jS7=!8CQAc4Mx+
zv-jp3dyHwuRN~!m9?zaD>E|n7#Y*Js;6A%yw{FH{;@q(B*-cluaHs()SCJaQ?X6Fq
f$yKd?f$skYSir}RukQ1(00000NkvXXu0mjf-N9e|

diff --git a/data/styles/default/light/xxhdpi/route-point-start.png b/data/styles/default/light/xxhdpi/route-point-start.png
deleted file mode 100644
index 996abdd1988b7553d7f31ce3d8204c9fedfe48e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4137
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

diff --git a/data/styles/default/light/xxhdpi/search-result.png b/data/styles/default/light/xxhdpi/search-result.png
deleted file mode 100644
index c2c88568bd0317a4ba0e59f33da752ea39ce0067..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1189
zcmV;W1X}xvP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px(Ur9tkRA>e5Sxrb(Q4~J&=a>q$QBg`Wf+)~UC{(sGA_xpzyQr3}+O{x67cIk0
z%l>dJBrT$Hr4%S_G72IzEfi@}V5QBB)Av2!ecgB8o9B$<_+Bs{oVoA*p6}dy-ko>P
z6{(^+17*!XtgPNz=X^fjiEKaQ6r@!XJj#kD@9{hti^b+y5h_R;au>1yDHZI)zBGJ)
z0i|t_N01z(TyPAI)wUZeN^&76sezIa$W2IESNLNyFH=hynf{WMmGv!I`<aJqNemjA
z>f+K|ACuOGxST(dl)m<q987yuZ(zJJ$ZfdSAARhgXU`~w8iRaeCX;=dN+o;rHqRC^
z@^F4rW><5P%j-3TpA*p9(~^*@ooTsrEM+#FLBRlw_-0o4<%==^<hwRAnHT9)s!0tp
zx0;nZuQ%k)T22-1Dm~qtkXvVJrMo4m_g_M$A4a^@3;mvVG=Su@x!i0rk+57Qx0RRC
zR~zzRzUWo<)9Wd_)>$J%XKN)9cPOo+(Yc+Ba9VptL;>9fGyhJ_JpKH}^ItOaHS5>B
z?6Tg&Nx65iPJchR65T=WRL}sBuYu1`E1xI%fr)kb^nI&rqCo>3KNOdVfd<_Oz7u^g
z!gtBz0fUVy@^l-{e5J{g3w2Nzb=v4f%AL;_zAJ#)=bro#V)^~>%<nz-d0#eKA>WDN
z-UF(HTkHv}!m=t*X`vMuMFWdGcbmO_VU_Zrlsc)~MlDiu^1x#NW}koUgQ_LB%CKPQ
z9<;f+=y(i3?RAJ%&OfPg_j#AL5;N3I4mQY%++47Tx=KW@s678+!-m1Z;ih=G48Rg~
zp`wG8+&1}n5H`qxTx@jM994eXRh-=R_q>&T`8iYcw~f|+&mZ}HMJ^h6=5XLz0hFFp
zHI@3eRpXbE8eANX9K$rARSnEf;;6vj;&3Ftf(Gz=J}NM{6l*|qR)7a14S@zY?Rb)k
z3WB(pF2v}81s(&V0)vagk^D@SP9@K<QGvn5;TUKD58zRO!6ndu4~jHTM^OPI85$TE
zb6`&Mq^h}aG$o84gbi|F7)FD`k!3Ce>;v>7D;T$7=p$^9gBC+t1V>j$(q({6_K70R
zxJ}qFI5^xCFFynBqtg24V9<$io3KFLTHuSE$jt?h0rnD&t5ys;g#|<RxamIR<uSk}
zJA~9a%`jrd1NMG{I<;sW&$Z;_fv*9ubQvufXtltI*?w-T)J2^d#%xYn(e`7(jS?px
zPWu#uaT)7W6ve<+K?6t{Ml>RsgS0ar#n7U!3y~~=Wn+k&M>qyrt^N4%<+_Tz6ZCnG
zt?l{L$q02|m_2X>NSd$@()<UsR)S^!O?aJT3EQ0}@MyggRv~`=iwh1#)_$=^koUb}
zV)TFqaQ%vjeVgn5T`_To;dhqiDr)#$T`{T7C8aPVGM9WM5jPvdkkGGLi+YJo;(mD;
z!>As2EXHkk@K%CH*F`ta9K7h>@&1b)tEkREg=gR|)j_tDum;&r00000NkvXXu0mjf
Dwb(UT

diff --git a/data/styles/default/light/xxhdpi/track_marker_deselected.png b/data/styles/default/light/xxhdpi/track_marker_deselected.png
deleted file mode 100644
index 8c0c8f9f71c8f8659a8d0d66f0744c70fa16e696..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1367
zcmV-d1*rOoP)<h;3K|Lk000e1NJLTq002Ay002A)1^@s6I{evk00001b5ch_0Itp)
z=>Px)5lKWrRA>d|TQO)9K@^?4B%Z{GHs(B06cK`jRnQQLCWj&sg+My3wADsX3kz*5
zEbIj<qebijqF@k3NrFKom4yUE6vY^A5)y-Fayj2ycH(C5a<_kSyF1A}_&2+=GxOiO
z*`3+@GnY^yp-?C^qUjD;E3Cz}?MOGfhD6P{_5<m-Yhy@95{bkdQo8|>&9F<bAy^J(
z3f5&CY^&Ki)gW~g_82w~t2Wps+ddk*aFEEthG9{GzPch84yPGde^e?<_@VDiB*Nk7
zBy6e#iKw&4;bf?y;oveXAGNYF{>bHW)kUMx6s)g|<G3%8TPld~M5RJ#XdB8rg0)vF
z8}s#1`0v5|{i__0vVz@j?IjwpU98qf(OHPj=?s6G^k?|a@8W!|h$VG$C1*L%yBwg_
zDpnlGO5V~?$>IJ9tkNA&@td5^71WC_^J@6(g8DwYs3w0GV2dgN&&`cVmEM$4JDQT}
z$gX;IY<Gj&k}655q90#@MVz0;t^L%OuZmiS*bEANfNk*?mYffMnpb`AbL#CxUgZnH
zYSw|xp-i1RcOa#@_cjEpv~sCwT-p!O6W$`F1oxxB8E+xU@w<ryb!+sG8k@{Zsuh)O
zP1mVw?Hkp>OnuQcLB>M}KI<*NOfY)43l}*mi;-U}sGG0<sC)1KitCoEaQ?ssb^Y*0
zRhL{wwOkedwJb!x(wWOzf#6|W;BQzF_?%vNHm63uEr{v`E!?rQUfns-X!?BfxAhV2
zYe_J~b|UkYz7RB}*xrFz^>K>hM0nV@HK_)An@mM_Li7;Xc}L+ZQo6j2*|TAbB`^B8
z2w(JRfUCNWBN)A#Mn<>J44U$p4eK^8#bFqa41F4)8ycO+iSA*J%A(<rqj9wds31b<
zlfH$ZHfOZff_sGxI8%?bPPNK&+B1NoF^R5bbg@m+0ADIrJI_k|`ODHbISA24t?Xe=
zLmMQO`34m?3^-6@2L&^392lI2__`Q3$bnphXr<s5Nu}qX=L5eROWKu|<@-6g2+<-I
z9OX1rNsIv(M=+N^0)s#CY=Hrn?d)N$^#lfg&)Nb5E}IPm+tb4gBnaUM7S&;-!WNit
zVGnc3GB6mHu>}TPX2gOSgR%t%TpYn%j1CM2+-!jXmmg$5E)l@!gDqgBQ;2b~;NyE5
z6r+oAgB%#v6~YnBJr#k$xG_Viaf2KTV%THs;Src9)X2DT+%VukjU!0}x42v8jYI&0
z<cu4~1^PA!)W4xtJ>(8Z$umeE7Yuzn8nxhuATJ6OaYcYZ@~A<d2CEU&)=#dEV085)
zjt7|`0apZ~oTliDJ`FGkjXzmW_b`ud^FsnIe{e;BLGrLcAM|Co<g%n~i7CE;A&};X
zEdr+ot_XzL(`<Vcs}5Xhp*9Cgg5C2QZYoMB`oXEjP@ZW%vuxX7&ea;O>jS1m?@S0~
z^5L$H<x+kF5S&3$I}75j=&EjcV04iIH}94Q`bls4zvY3?Dc{pqaqF^44TeHWZh6oJ
zic<9Sy4=)KB-EP$(KheC1HF>y^J?%P7Y$n80%(rE5?;dEz4;a&kAhnk(@<_Dj{a$B
zSvj|24>H-1?I1^PJzP;N1(X%c0%(AH7qhVYJhv3&mUX#Sk0NgI+Soqq{mLM^b~cD>
z;SgOre*w^<nL>CMZ2kYq!z<bq-U;E4VPXD_r_=8@_HzhM!>s<JR@oPi)qH~xZslL`
Z{s9T?_}mj#0T2KH002ovPDHLkV1h;pgJ%E$

diff --git a/data/styles/default/light/xxhdpi/track_marker_selected.png b/data/styles/default/light/xxhdpi/track_marker_selected.png
deleted file mode 100644
index 5130ff73c831ab58b8e382d69e710c1a2fa371da..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3671
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

diff --git a/data/styles/default/light/xxxhdpi-ad/keep.png b/data/styles/default/light/xxxhdpi-ad/keep.png
deleted file mode 100644
index ce7b6f20e5ba507cfda191ac9e712ca89db4a767..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 126
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k8}bl&H|6fVg?4j!ywFfJby(BP*AeO
zHKHUqKdq!Zu_%?Hyu4g5GcUV1Ik6yBFTW^#_B$IXpdxNh7sn8enaK$ZObiUH42(&k
RMjb$522WQ%mvv4FO#rSW9sB?Q

diff --git a/data/styles/default/light/xxxhdpi/coloredmark-bg-l.png b/data/styles/default/light/xxxhdpi/coloredmark-bg-l.png
deleted file mode 100644
index 93a499a39f1442edda3f9951fdf2995eabed2c42..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2092
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
Wd7jzAX0H(d0000<MNUMnLSTYW%EQC}

diff --git a/data/styles/default/light/xxxhdpi/coloredmark-bg-s.png b/data/styles/default/light/xxxhdpi/coloredmark-bg-s.png
deleted file mode 100644
index 5e57bc2548d601c5ea26ee81411eb2bdfd22c016..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 838
zcmV-M1G)T(P)<h;3K|Lk000e1NJLTq003<O001=z1^@s6OC@E@00001b5ch_0Itp)
z=>Px&07*naRCodHoIPt4Q51%ERJ0I95W$aVWuv7Mt!xwvn`jy>waLGTjg1i@V66NF
zmN6iRZ5o?23R(pe6eCDdD1HXAK1XI?i-CCEduHFAIR{>5+1xpE&hyU9PG;_IuNM&n
zf<O=m0zn`M1c4wB1cE?|2^8brTfg7mM-NxfWpo@JEwz{BC-f1mp_gc>D2i7sBbp|F
zQ3bkzo}phTCEhZ49!)e|cW1W;>`Q0`4I4j5FozCw7N&ROz}=4)QSMkL;k0-Coy!l@
zlju!uw+8ZU@p`s%V7(d!<^{Ad0NC^8W0LRm>ZKET0cb~9Q-)PL!$K$EdNc_^`wa6u
zB~~WYEoVG>YJE;fdR%nW8C3V)Z{D12J>;AX0?aP!M;*&Kd&-$>N6ut9a^aNSrMZ_Q
z*N{2v0%&T;94@QNnMRk_(OH*n)05sUccSz)9oJAa?UrM|si{x1!nxFyyvIwK#$IhV
ze=mABotXbx;&}JrQl`<Z-L2p4-gVjruBHw5AFXDZJzi0ZQ=9>gDHWw=+6g5%1GPxi
zrDocZ0Z>XWrRq{M&7L|dhE!c@rr8t$#gM8?%`}_Sp%_wishMVza1=wTE;Z9^)|6sM
z)um>d;`Fxf>_w|edy<-IPn6)4wLE98<WHr#q)aO(lD<;{L@i5V_4K4nE8#2(LE5C2
zr$Y7oEk)6^c`8#m9X;acUk}r^ApoQg40*84uqOWem5tnKVneChP(0GChdH#7+Dzv0
z_t}9yXU^H~bUY53MmF<z6!C(M?rAq+r|tkZI|9evv(3X!Ep;O;0Bx#vQ}K-ro#_Ty
z$1Z`m3oSI@njK+bSWYhiI)iNHuSeKtSez1b8dl{3>?B&w=-L-@-9~ZIQ9<@v0(lC(
zM*kaj#6CoaylRZRH3R@|-@87KY!>jpe7nXjGVDtoH_^eGlw<SO*#EjgMH(Y)nw!m<
zvPn2Lr=$9H1A7)`4>4EyXIbU;80AC+fglhBf<O=m0zn`M1c4wB1ZoNV0V7@@u=pv^
QDF6Tf07*qoM6N<$f}=fiDgXcg

diff --git a/data/styles/default/light/xxxhdpi/coloredmark-default-l.png b/data/styles/default/light/xxxhdpi/coloredmark-default-l.png
deleted file mode 100644
index 943a221ab2560175021e2f2a81dff488122ab6d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2449
zcmV;C32yd@P)<h;3K|Lk000e1NJLTq004{t003eL1^@s6f{r`P00001b5ch_0Itp)
z=>Px;OG!jQRCodHox5)pM-;|!EMzCbiV-xSFs_nFX<Q*H1m+)bfsi7I1QJcsq#?AH
z+fY&<SC){XRM1lxsDKK&i9{%n6)7QwjZ6|LO~Cnm$*yen`ksB<nY%l)bEHrEoSAdJ
zIXk<v^O`u+GuhqU{TP!!+lSBD{{+kwz~P}k3wXuxbMSMHiHV6f?Ds|{Vz(3rIgX8I
z!6G;Z<RC6Z4)hQ_0FQ8>Etip}xW>Q$PI3ZV2hYGeFfLJAN>gc{7=x)PiKYyYLDS$8
zxDVcfwnaKf7wI(J)UFiHF#}}A5pV<i4!SDRO*$TNY<`NaDg%&z6fA>n5Q<3GWpK2r
zo$0<28G!5wa1CsMP(`}ShTtk4K`9Ku3;5e@aC$_)+a&x?Ag><3V1FCzuSRqDURC=T
z$De|{O8y1=^I#NtLf~(xS#69GNeWwF07p3tZi0V66Zw@ucfb`eSBSpxq2kKoRNP9V
ziO43|cDS)3Dc~Lh5P1?j1$E^Q0<3{W;JqYO8d+LvY?XFhk&P$!EKhs28Gyhg@VX}R
z&$<69_^5V*jshs{Ob6*wM`Y`gBQ^RJ4aBX~VVZk4z(w#uSD2D6nNHHJj;wUWhR*8&
ztCL{02D|#lak<Nep`Tt?mw|MxD&k<W%XYP{8w5>(dlebg$KoxZ#>5~*x@I~{_bMVT
zrh+hT+)9cVuwI2l?s*ALjax@o=}Gs@1~#Q4PLk8?Cm%xe8md~d+~wZc{ozC0mkmI+
zR1tBLUQc;OLq?Tv78T>)=3!#l$|g|d6}1|R%_G?XSygI7e{)~7)lJz3WMi51yY>V-
zBC1SwxZ%u5UKv1O*$8B7nMC{GnArp?^Wb#}J0ftwj3}auvK5p$jX3MqA7Knu+fdo>
zeihNtmn=npm(8H;^(5~4)Aoe1YHYJaAA$WWdhsCH4$3}+Zx)>`%43L7v0Fw)bhV+n
znF&X#Jy{|S<9=OZpnj1*u~^{R-MZw)dcU|R;p#Ehy|=`-#xKUHmzgE{gFD-rf*ng(
zTmW%m$+eED?M59eRv%oeTcwKFV1M_!VQDZHaRRJYxHyfkk1$3p150iV(v{AL0Z3CL
zt0l`(F@>cwVB4@*&Hll(I*&VZ#0{{zMu^*ZhOl6a#^hMi>HaL^c94V8gS^WYfn2+B
zP`KdEVaPPFo{o*+jA}_?c-#QPL>z}d!V)7iRMe7-E%6^*vXH1QsFqv`&ZwfoSf}yD
z!$h5=JJScZsC(Cr#TBqRmf!E1&b9QxIL)G94UE59E5dZMYD`zbFcH_`&KiO8-wm^j
z^BTL;+E9>CeNUWa+_5=Ou7_%yo`z=!n)Lt4wO|cvS#juFGkAU0vU<&u$Drfjone?}
zgi6wY0XWrY&S4_XHS1Pbg3=d;S;TpbLyou6%yU-3oj!i8vD_DYso=AQVwE84%viAN
z%c$7ng}ZmyxNg{Kac=}Gzton)JSbN!-BH4T#o@V<u-&>$aj9l`OXj+zad_H5?wmz1
z*SvHS@m0cT;+<i#Ns;=?u#4$@H3l*cH;uckJTQXUmwY*lH5aaCeoEqo0gFq`l;vD}
zIgF*OrU^^ph5?I9>!EF&dUBY?)O8}D<uKMm+gN#D4r8@vXad3{ZWyq*wDO>F>b@Mt
z>iwnJDwDWjz~a)%gT|@*a+n!IBTa3Z#0>)$msTD$PCYqHW9m8)FgZ*ovLPHLqH&mT
zC{LQ!V!+ocY3!a~%j$S;w!TxWJZQ{7a+t={bs}JLm`-FvI7;-wVUC59AD!3K;xedL
z(kp{%FRiFXdNE(JxU}-1F(<yhVaDFZ(U^g-16u7xTJ6@kB!_WM=~yGQ9L9QR8!PF{
zVJz>~N@hviFko@%#bMm2U5G{9153IOrY@QV&gve*Z&?>jFVm-ZDPib7xB~%}hcDJ8
zDBVB6fW_f+^5D%t2nQ#;I83IO)vMhy)`3~Qh{EFVp)Us7a+vcJsc9fv!(7d{J8uNH
z9#$h*i<dAe4VCr8Kisx9RMuMw!#i{fzO31$zVgIpAELFm+sL>Nj|ZNFG~I{eY=hIN
zr~60~3b}WfcqbGRS3D7E$}&ez1DA16S(Z6WniSEU!}MZO#5C=yJBNvX+SRO-NfSGd
z=rp{J`Z2L{<}gPvI87bj&}rbVUsK0tPP2^RmfUK{XY|1!tzU~%WDb*-ziHswILj%}
zzvXW-r%4NJ)o>adMcqVR0!!jtU@LQ&w1i(hhq-Hc3fHt8V%&|m7`OneB9_a$X_3&h
zNa)_9g+ruei1+9i*n^)XQ1(!LKM*k16OfS>Iv<j`aB~Kvh0croK*~IL4J_H=;zBWO
ztjDqy$Yx8#*?g=Vn08^firz92foIH!BDg3UL7B6NtEC9cZEgYttcZmYQ4t+2QL+t`
zy@o{5N^_<o3JDRbVxvU#5g1+VNj8D94_r~R8c~*yW(s6Xf_q}6g6QAG>}V;rA6hnm
zvi~eO9pYxPeXTpB0fbC}^_-!St^R(V>X7=iRFUqW><?~EfjF6}l|Wx^7BQe|Nuy$1
zjdET_`1#;mx@J08c?EIne_SMIu`&aa^m?lDO(Q}jTCchD3#CiPOjkCQL>#2okmW4<
zuR&Io+S7jKH#kriMsGuB_Ul(=U%F&ENw+$ZYC}~BF5Uyfs&48>RUOf~&gxm;+KRPG
zJJZ2hW13qAM7Boz`=FS=UXCG9e}tb7P+NXN%N(x(jS}?UqN_BrwAR=v?Ybfx=e>~F
zw@4vUZBJ^jtopIYt?!8z)Vu?(fH_zEDXuI|#ceIx$>pIUn`GNzS9<x3$NQ7#Qh7*S
zAimq+^oa3p5?+f_X-X17tAcC;O(d9u-9wtCGRHCYHK&|reG)X8&pa4Ko)Y+LhPG~u
z5=jbcFo4sj=vU9ZEfA_mci9ls18ZbU_b)-V`Uo!rYcv9vJ0;R}8653C!;xwT`7=P{
zp7cMat0LW`qcst8q&d`4v&f7OfrjO3EcaW`wnzu*BAuo?N?UEUqI`#vL0Z1<68IA6
zLwQ_w?vj>1V1EQZ@G<)v+o)t*M7Bm6&U2i^&w|Aas^Pd4)v_LBcoghpJ{1{>-eHP7
z;6SsSQ}tNO^yXD$l}K76F|R`B-x_%pTid^YN{qZJuDOU`;2=9}dn5k>dK5{HH2`0%
P00000NkvXXu0mjf5d5VT

diff --git a/data/styles/default/light/xxxhdpi/coloredmark-default-s.png b/data/styles/default/light/xxxhdpi/coloredmark-default-s.png
deleted file mode 100644
index 549b40b83d97e7ecb3058acefc7f32eea7eef703..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1483
zcmV;+1vL7JP)<h;3K|Lk000e1NJLTq003<O001=z1^@s6OC@E@00001b5ch_0Itp)
z=>Px)g-Jv~RCodHoJ(jGR~W~8W0Kl{g0Tw~g_LSEf_CAi8z~CXAT2&XaOpx^RUs=|
z+*Mq;sJnvM=%V7PXra2OG!R5;up1Xvks?G?P(iH<no6#}zot+wIp54=<~(lZ{^6gS
zJLmDe=5gkn@7%@*ZH#8KxeWEUz)f&1TmzTDMX(3HfY0GQcnjWu<M3Le(RjmW2O&H_
zpjN@};B`1x{6oXDa69Y{p?581;M`B(PjDJmiAg%!2fJ$NSRY2?%%$)L_!|0zuH5ZD
zY^YVAIPnmC<}*^W^gYJ0fm%7b3S)8FhwwCvg@*{<T!k&Q=mTdhgI8ij>wj{m_<w(j
zPH&{76i(WJJ{RE10(xmke-Zu$@51{te95O?30A=6@H4mrZiGc}g4ctQA`NO&mw@RC
zy9@I`BS;O|hhc9KCsBU@j=;RKsM<VIL`E&@;uJl@^4=0JQCBb1r9dAG;bHg$W<e*(
z&Qb#BTVouOXV9ThWaW;d&wltb%))aj==R+Kj?l0^3%98-<jY(1-GE24l%V_$T<lAa
zw&)iJd<?VR!^Wwj`9$wP&R+NiS~%uik(34CnG=?GDAN@dBw+vf33&%Ibb3j-Mx^xv
zhHEa-nwruT=<Swhc^tVXp@mVa{k$#1BWEnHP*(Y%Bd;@&-2*2K{d5bBazf>`q4Ihd
ztmPGJw*FG(LJM|?ew(3%dR=XJLhE5JD43<+!wSY|*6QeS-lZhRpTdQ+Hk^+KG1gkZ
zJe!Km=(!$RcZA)k=;~DuoS^9{3&UO&DA+lQ{$VKlW5Mn!sUBmsRyiFmX!7@WS7D^%
z=M1@9jWTaVF@k12uP!p9KIP5YxpjQrXg0`Is3fAGh!HepO}U`um88H)^cM;#o6Chk
zSAnnNF@m<nFlN#yi&<ppW!d9J=NLh=rllTuv9f%pmR^=U<t5M3LyVwV&j77DrwB_g
z%N{Sb#0XlCVTn=%QiP?KWsetIVgya8+Ab)kBSlzxS@w9bB}UNnF6Kh2OCFY9mOU;z
zOC669w0nle%9=_MmR^=UUTldGH0@q-L1}JDftTk#6k2U4W!Ymin|o1=plQ323(8AO
z4PT;=Yc^j4l*!Nv#|YZEVdO^6>;a=ZMv-+QU1r8)I<!(Tf_4oft%vun&`xm4;{?)h
z{wr5G$5Wf!HdHNHgfo;K?1D0XUALo>l8ZG*k8fN`&KzG?tj9L4jltT1Y2k2e^H6RP
z)b1G<CSvOtR6btlhT4JYf>O2ngDTY`4Ef)?l$$wzpry(D|BB(-GHXGp+EI4(Aop|l
z%1}=En8By7qMsEQ-36^&5&7(BXho5^5<ZY{1A9X2m5e-`lJ#tp-}Z)57+HPrPYE?}
zHIzQd%E38fhJ#e}FFfem0A%P2%L*7(nqT<VCHekwf;RbCqck~6P^z|<=Lr4k8J2ZR
zq)PL6@(vB9AkI)Wul6`+VS);kZD6M_4eK>Zv<4j%zr(NmjWHP!Dh$Qt;E?_AeUt02
zGJn?>m-4;^ZI!F97w0@zIMtdrV7>RHxtxt-^dm2Mq0C<;l70&_H$zZIgN$A96nqTx
z;t>@;b?F@Ac$D`b%TOGoP3aoy7u8McT9Z&oILhhJ47^sHwHBsDOf9bzogP#A+}BJB
z|IKFymInyjPN+T3F`;Kz=ay&%s<jM<ZGd-R3>-&jXVB3alsw;Y++uhPYRha0Tt!Id
zJuFXfvg+W-6>t=0ZDOa&oS?bH`c6${1)xkhjvayuo;LJV0loJffL>nO%h+nQEjmK8
z`U+NtlQjy|Z!>O#Tj3zg1C1yzL#;Uf!l>|Oo<^zFY0IFsI*}mua%?Ho8r(-v-xok_
ln|ckE-td?pJ>#?O@fOber3NS&O|}34002ovPDHLkV1gSm#P9$B

diff --git a/data/styles/default/light/xxxhdpi/compass-image.png b/data/styles/default/light/xxxhdpi/compass-image.png
deleted file mode 100644
index 72aebb7a475de87f220be6b8e9d7893b9ab69773..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4753
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

diff --git a/data/styles/default/light/xxxhdpi/cross_geoposition.png b/data/styles/default/light/xxxhdpi/cross_geoposition.png
deleted file mode 100644
index 13ed4d3ba589f5bd36d3c98b8eb52abd94e78c79..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1626
zcmds2|34E50NoZ&i?y=8m|WDStnS1<SYj^oB^BASq_cCQbE#};r_DaotQ%Tc*K(n{
zN@LZ9NL$!yGewOGA!BB?>P$6jidjpW<KO6q_ug;s{qjEVoyNt-xPswe007{+V|!G>
zoEFZ**=dfcL!sz70cIz}L;&i#R=ooNoM1bmFnj1g<JG&Fgbdi@bxkE+QaS>5-#uBO
z^9H%S{rhIh^`K5@ToN99wU^aK;8aS^d2hJKZ4k$E9M0&d{)0DlzR-5v<5Np-4d*Un
z@-h<RH|Zh9Eo1q9CK=YkJlbWAW|W;&A6dfVa=Dk+&(?J&UVet^CYKKlXEmu6wCk(L
z+xneaUHfdMo!#2X*(%v|o9?s0H|U&S4<;>KtT&PK;M=F#4%1xDaKnA$I%fQLzK&?F
z?}eZ0NbiM1IOnUYLo`Qnh7IO2Qi(=6-e#~o1+^A~i&TmyvZdp6v^_UFdr~A22nfHE
znM@n6=irpI@11lr;X#Ha?6)r~t7c<i_!gc$)r#p6%Vai+n={dpN%RY%O)=!W1NE4X
zX#pyYMx*XD{L!3h>t)`6nA@ESXZv^aL?RLIJ@-im+Z<~N+Ubo|@lUuQ2_^h?8Z31y
z1_<5X=zu9UB3km;Ag?ykLiQT<?h`f#$M93Cr4G@J0>I2d@Cm4BopTW>1~}~o19%^Z
zg~C*4LE}CMK*aMhFNDz3aS)3G6kPPh;L=0E_1E|SXC#6BO$8LN8u(Wl4o!VvjKsOt
z=9F37WnKFMh;`Xomi2qn^RG|!ACKpD!ohCFt4tZP#$vp!4jhtft1+Lxq;sQ48^>9w
zG<j)!CmwOY1ktJ%Q8S29=H7cRfUE`d)X6f+M7}(;B%^4i5#hC*u}$=Lb!``>hJ5Vv
zWNV~+;#F<AEdS1CQp$^Kle>!THf?CVQ20rxHLZ4W%3tx<@{zhsMa5@j{QbPqPTgh{
z>PUAJV|pOa-*aN*1Bb);E;e>FQjlm>9WD-C1@Qq@iXT#@q+ynmLy4UIk{|aZ_HP&q
z`4sGbVMZ89`Srh?2O7$jfnvp<lHqR8qP{iq0fVnKBTk}Rq6K!Vv$GIkX0A=BTkIj|
zd23ZFm45bP$x3QlcFUysN|@<M<jqAIOBRway`p`9CVn#(*V=r`s^2Knckq&APEz|z
zw6#h~Mx!cxTK2CqY9MqwR!RaFvKkJJg`!rgj+62EiuoMvCCZCx7F6Uo>wdI*1a(c-
zBOi^jl}?3hCD{(;@nz?mXOa@!!aM_#y=Fm3UCJ9OKNv~OW4?jf<)fEC#46ZHPbe&{
zh7NXg#46Knu-A~5VJrB$j*#1Xa0RumH^5-%pE;%AqWVO1A)D=Es87HwX)O8|hnq<E
z+`AF+XzxcD7+ik4b*E$W;KuR@%)|54eN}vC!ecxFK^H=PSoTerlW_Ea2F5S_=W-r?
zxiRzJH5@z0r}sa<J6Ep2JI}21qfr|2a;*nUu{>RqL-k)Ny=XFi7-$}G9yZv1`UgqQ
z+$B&JBzrvdGfwaimdCBHeRVXrs=B(*NK=fs<keX$Ycsb>lHR+YJ%bbLIj8{;FgHKh
zG#*Mm2*1TaROCOxi*mRgG;!ACSt1dc*JM_R^s=Oq)J^z^-IamCQl=&4at-PNxm=BI
jkYxGe!eTD!8DAF+TNk&&UDhk-&H}I_IzFl{B9;9==*9(N

diff --git a/data/styles/default/light/xxxhdpi/current-position.png b/data/styles/default/light/xxxhdpi/current-position.png
deleted file mode 100644
index d5d46c5d9d03a43344c88b2a3db438b2a57f30d9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2170
zcmV-=2!;2FP)<h;3K|Lk000e1NJLTq002e+002e^1^@s6aW3M700001b5ch_0Itp)
z=>Px-G)Y83RCodHTw81uRTw^V*=<WN6j}-`#gG=|qFhY$p+R2|6BW?_F<xRw#77B|
zD2nlc@L<F=CQ9%X6^%#;5JZWI(I*UvVh~~!!X-pogqB^()?T)|JLCVIoilsR>}*-u
zE#2MeAG&icb2;C~nREUA(b(NHjXm;GeZxHu-OH-#7HZ+zWqPP$8Pkj=O=k^^8T1EB
zMQn>jn4Rje67jS4NdH+j6gwaJ`_u(?;;TM7!RDt;@Q*gZ_cv!g*ZHv4(E7AdS^EOh
z^|o<6&$2G3hWo#^BVFG{4{rOF?v)(Z{YJTXB8buIp4r}BF?abUy|Qkzt!cHRJb%nt
znr-)6!?8W_?lXI1-|V_XH!5gNDkL#l{f75fgy$~mWM;)<w?nL%l}roMpAlm8!!%vz
zm)Mp?5L5Io!R(P?W+#VlcPpwl@gGOJ&u!~F^v>^vBB&t5Oy97*t)jJKA2UKL{ZMEC
zURB5RY10|iA|hm(ON8I~avF%TM+O<y4rUGBV)jss*+iVLr4m2KyH0Mrb!gXR-~2mB
z93L^Q9aXcQ-MT}osC_&8nHmvM&y3nxOs}4qHxb$QQBy#aH4tT~{$3*Lrkd%*?0EkN
zy+=RV$+}Js`JRwR;+Tn<vF^PGLi3mZK#1qa&(Wxh(d%Y2v%ZCCp$a*x;9)xvXUV>+
z%!*y7T12m)Y_@eRaplb8H;=sghn$>mcr3)|4VylF&8VNf+xrj$gv^}BG&AhYn$WnN
z9AU}mKP*KAc`em<eM@BTE1yuhhdJ+=YWz-#F`G6Y-p9g~FUq&ksm(B(+Nu4RkPb+G
z)Tm)=xSu6^E-{PRB*jLC_xJ2szmd}N?%wk!X2F7rrl&f;^Y%DKZ4)zRwH2%lQ2>o0
zf;K4Gdzspx9`$PKxq6OoTf;71jH?;`vHXbPq<nainV|>e+n9~>d0Qf<6-yXxPx8hU
zwK&Pd>7L_nbmT)$KE#+!TaJ7$*A#TWq2`6W*HNEbTrq2~k0t&+uXgXKIlI?AK_wma
zwMvhwa^ul?n<5R^Ffa?vTUzv_01}1^C@aeB8e!p>DBDf*2^c<UZW8rAoAv7Yw?qQ3
zDXsT2G`6K;7+GUrX~lY}$j+?6Fqc*?UL6@aee{=HIC2t$af;cz;Fx@2xMlIA_dIfW
z@(puxDr@+lP+X%|);t-Wv*gh5xt~0(bovbc>O>=2K6n#%p(7evRLxQ~lpPpk;}{96
zoF>A)#5AsbeWyI4<y|t3WJ}#J8V45FXw=TJx(S&;)~kdGVW{!G1L734C!yv=Ow;n|
zz{FL>dqmB#X|9FYJB+3+E6tX9U&Q}9p-jBIHAdsJWC<5Wv|>p>N-o(TumF>64rb+l
zULgkSDe}?*=01}>%$ETaDhy1(<{B-RaO`e^+Lvp5k;%!#EEyBRay35LC5*xx>~5`b
zbFdsKk8ZJaaJOg4qL6pv2yDRU8V&q72Tp=Z4AyAflbBYtbD&Ha#~(s3C7aBFAjZVP
zwKxea_e3u;iDymb5g7GpGu$FL9GFPp#9)g<Ud_jHWKc}T3J$=9ON`Ojx>gW@`4HA<
zgJOI=nlK9!T%g8iw3z+8$iQlTIgMKcu3Sf81!iFm7t~+TwyC^Bh?!{6Ou>xZQsPAC
zd&v?L*!KyVc`<_%9UJU25!eh1nq^@oPIRaa1QC4O)Y&Q(X+b#hc1Bv|<4O!J#c<GL
zFFB|tV+SYHBpdDm1>ax~C^HIn;zXx@$r0=jBT|1JIDRDT;Dp98LditD1h9P(6+p#q
zfS4)sV}OWBMMMS{?TARgjw<$4MCU?4K|(G;j>s?Pql6ut=uk%rykdb^#DjEHuoEXb
zB%^`=Xx@TqGInsHa~-Y2284j>yA}+ZfLRtnf)gF$Vi`V!fI+h?%*2V#71t6IP)7#M
zyqLj>&SmJNxE5qUG8!~fFoO${=3{_oLxwKM;5u4*=YnFqeIf0zFoz49k9?uc7a0&2
zLq{7F16Em3Ex6#sz+nN}d_e}p#X&I{D>!hRH(a?@5)KQ33~1LNE-rTiMp<3%aKN>B
zyvBe4cyVNiu({$o6EDvYl%2B49Js`A*A`MViW9jEofOyQYEY8{qiclSaqr<tE-@6d
z;o2fjgf<^C^l~*|ll>1I?5@v~Obp}xKIGaW$bdE<GW2pYU{d@J2(#ns<U&=5p;R0G
zK5i}rpv^C*`4g}JlWY!Vx3(ZJvuW#`2`yUHinZ0yrXh(>$LW1EYRY3jn>%3)!RIt>
z@NJ5IzV)Dpi(?is$QZoVeWH5Fqp#Agb`9e8$N=dgXtRHky-QG*@fdocR9|=I7Ua{^
zd$@Bwi*;qm=e@5|`XcfSgA-Kd4)jWq!ve-PrD`a<*Xe>|%;5#+TVntoifNLSN1>n=
zWLW=2nNF{ivIiqFi}(otr9}6iRKiR%0tc_?{w?lQ$Xk3@jOWd8;&8I~Qg+<pP8KbT
zO2(gnlXCT(vJl16j$JPk#+<X|+YtkP0_m2M^Hp+c3=Y;n<hKLW?W@;N1KgZWx6=*_
zMcg2xp-o)BK*i0xK8!nZy}61-qiI=q8jSC6KEyD(QEDJ^>a*(hRUJ$>+r*v3WRr^-
zi$qc{#wkkgg93BcKO&`|u783FyjD}rq8T<kp(*!b4<Sl)${}5$!xJGVDERy6Rdw#H
zJafk6eZs&Rign&N_VJEM`Gi4+0LG?1dLgrs9iIA3N;W4-%G8H-6gvDP{8LPjp>xG`
w0Y1e<%LE5fH@c3M;-{GWDIz6XDSf=_f5{Na>)hnksQ>@~07*qoM6N<$g7H-sS^xk5

diff --git a/data/styles/default/light/xxxhdpi/infosign.png b/data/styles/default/light/xxxhdpi/infosign.png
deleted file mode 100644
index c482a099c3cc4ccd2f1b9d1a0dee6b5b2226efc6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5226
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

diff --git a/data/styles/default/light/xxxhdpi/non-found-search-result.png b/data/styles/default/light/xxxhdpi/non-found-search-result.png
deleted file mode 100644
index 4a5a8d5d0e215594fb2b05b76c8a69b4464a8d24..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 572
zcmeAS@N?(olHy`uVBq!ia0vp^x**KK3=%mav;s)g1^9%x0_p!$0-v0nKgh}bT)zBE
zQqs59)*mxweD?PKXkr31{)4jeuRVMIeg6FK&!0c{?tN=%`S<tlm-u+ijqASvT_9N!
z<QL2!as20*P36z}*egEBJ^m*AFV$#<pYgGoX)7ZVG#D5dLp)s^Ln`8?PQ5<qumX=O
z<M&BP)_zRy{Qm!!zZ3h;%IA@pmHwVNi7hHB-+29vj(^iRU$&`bvuo1#9q)O5FP1*P
z%liJSeH;JWT_W8QXznV)mOQgNkI%5n{%*<VoJ;;cH`H=}-<5M~U+$@2|E_Ik&rpzm
z60JDZQEa=TfA5)g1HA&?Pev@C`)maY=1-Lhwq4lW&?xZf>(XTvu?yQLlndsy*(`kg
zjU)9_;aBIgfsP+a^CK!2%wqT7`mgGk>#HYCx)VLVUw3oj+UnA{#o*Y*MMW2<Wh9(C
zr?EYX&3D3v$#$<rcV7!TCR002yKJRy`^{fDVQ<``%|3s*x$ef=Z8mMUzG#>A|GMyQ
z*-_s!o^GegomQ%@_1CbiSn}2U<NF!)k!$~XKbpV%ys+`=Wo<_epV4|H!=jmZEa;i}
z3Gs4gzkAkS=DOXV-gZM&es@HI`1!-<m;bk|mwNwG-eBJPD=%NwECNOXgQu&X%Q~lo
FCIHZ}JsSW3

diff --git a/data/styles/default/light/xxxhdpi/route-arrow.png b/data/styles/default/light/xxxhdpi/route-arrow.png
deleted file mode 100644
index 997a21da11a7b2ba757670cf3b4c7aa996a57889..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3396
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

diff --git a/data/styles/default/light/xxxhdpi/route-point-finish.png b/data/styles/default/light/xxxhdpi/route-point-finish.png
deleted file mode 100644
index 54b39db0da634503872a5c0ee76ebf2bcc71e6e7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9962
zcmV<GCKcI<P)<h;3K|Lk000e1NJLTq004{t004yu1^@s6iO&%B00001b5ch_0Itp)
z=>PyGq)9|URCodHod>uawYA5`1~+U>2ixF|ZLsOR1#Adl2!sHkgcd>x<v~a&AzuhJ
zguD=XFQJ5BS|~5HK<E%m2ZKWm7_b4;I|kh5{r<x}gLYP$oxOE;x##<|(x@IuM@Q1p
zk+w_J2}N3<OOZ&KIC18?BR=!+ZWexd8FoYkJF?75ZBZ%Q#XYYx^1|Fas&!YwPvMoy
zt`r_sDx_MZ>nVPy?ykS<R^77SzWTb29&)?s+&Hd(5w{N?*Uxol^RsfzcEf#sNqAm{
zZU&9w_SM(*Gk1x7%rVDw+j-}m`!BM{BK^B{>o%Zk*RBh9>C&awJoC)clZNRL$MF|)
z=FItI?%cVF`Q(#N-q?EUtzUfNi6_)<*7zaYZCi`u`i0zvqlN3+{1P{K&vVd02d&Yo
zSFe=_n**L-gXgphF1X<SgAYD<7JgP<)>fY8C--*>tRY>yD=i>1Pm`G!yPM4JyYJrf
zt+(D<^@}gQ*k|U<nHNF?PtwpcG1bDSq<w%q&iL%J&vv}#nrjwlDnn&ixrT>}o7{Pj
zjcfI=I&^>i_1DMDo;~||5dJKH^hbnGc<;UUR-+)*+i+4|ZvJ_AG+dZlak;H?th3Sv
zo;r2va$kS__3<>~L>l;uKqI%*`wQ~FHb6XvTNdYRr?}ykM)gsrcb_m}!a`qt_0>rr
z`gK8MXHxHDfAy<h^&<UumT25Y%@RsVBu_v6^w1eIW*pwcK?=5St3~?+&U5-Jue>s%
zsk7bA%8v3%_32I?J>Gry-OZ@W%gw<MLcZ_MfBtjtCR{{-Ssd_cJn%Ja2{-xq&woDO
zr=Nbhry7Wc)tuhZ04lR@U}_jgcc|mD(}Qsl*H)d3@Ow<0IC1G&vu0h}(uzR9myvIe
zCL9`?XncgC2DXOn-b5&SGXkfyv|-ySJ-9u>bhYi6F=Jf95n;GS1SQkskw+dG%Jg#z
z_<Y`4II&p&ALZRtMwV#su77Ze#YSODDBEqfT`xGwUUbGQt<|V)oe#Laz*Kp_O*h@N
zDBYvZ69FaDjtKvqci!0;Zg44h6kVqjMwzl-9XobxpQdu%Y0}y`-G&jTCP0W)3zo(z
zCA;f~AAY#)f(tHq9NXXF)n@3658*{DjuXRrA)-?g!zhmySYUx@vBegP7F~4F#2z_v
zWW-k1mrXT(U$F&#nofKc^C?^SA@j~V?^rTeu$oMm@}e7WyfJ#|rI#Y%wdIyuMu-N2
zSx~oKmRMqm>xnQ2Gq=gu7TfG#`t}HLJKEgFEnHiiBV^J!{qe^iAI_Y9OW|SViO9|&
ze(0fx;*(E4Io@WQZQ_3Y`l+D`8#*LjYpu27!wx$vhEv24m8X=p_hMlmFTecqC3vsA
z^2+fCAAArj{L3%Dyqdad0qjmq)-QN>3>X5gZNy<jVRLu4RaafL+naB`If}*MDsR92
z_VSlqcA2f{HB=IIJ!Hs`o}YjI`9ZYAr@_|933%<b*W%y*{`c{E>#Y~}?Af!Vktw4^
z-*CE^=_LO5zyF<sLF)yH;Ey}*xVU@w?q0l+H3bV}usu$F=f{Xes%_N|>KpY{yMs$0
za{GuR5uUyO{`+fE@uOhJ_fxy90BQ#Qw=*pqhCpmF%#u{}wqPp+0wA#XuYdh(JZ{{$
zn5oO#xZv2T{>v@5Tzu)Jm&WSUwt(Ajzdc@d*=2KaUU=b!gGJM>A5v#cd&Xs4f@xQx
zaf!tx6q`=E!$HQfpgW7&Obga16F>#0V_wgA=YEQtXvFvF(<irKTbo$i{00md5TAJB
zi7{)VTwIF=KKkgR@n)NCR=7TS`GV)d7%hHv^dT-Tu5bN^v+cnOlPzKq0x6+<{PD-z
z)9KIURiZV*-gx7Uc>n$P53*`-D%{|$6<5>MZ-4vSc-pkWV<c?~7R9kR%J}i)tHwLc
z#N(iDi(vX<Y+6!(wcE55B9`uFoN-29rjlzsIJc@7@`V`jcdM^WXvC^JDwKv@P`uSv
zTgBI2du_}B3f7<YiYHE-7$14$k@4WcgPUD`umA$UaWRa}zUIS}tYg%fZ3%AvMmPzj
z{_&50?9DFXIvQ$RTOyz>C0r$9(cGe9SU^U@hYyd24I38q?b|n+fByL+rnG3j`R0ot
z$cQyp^uPlTL~yYdm7~OLpCcCf(a@noBX(%XHhB8<=}8@Q0<JB7OW_;3@aMvMZV5tW
zVsxTC8)I8+5mTFjOC(}znh&*I>&2q)k~}JJX&CZ^c!wQ!Xx0eSXkTr$)#5`BJv4^k
z;we+6#A5%I;G~mIYF2r)N4uxXs|)yuU>3r-LcBJglCs32HH+9=F9cv)<ss|~)8g>?
z=bw++R{MfW{O-Bup16Pi{#A7XIxg||zyJOC;)^eiKl<pSlKhH(JoVI5Rh3CwbXfen
zI)PU|OotLoN-QAKhk3Y=K;pmu{qL+l{NWFC)>&trSfgGItnIHj2l^`BI-h##scBrr
zFKSRU^5$2KCkyu&X>Z{&i{jQ6@$%|Lc_J8hr=<RC7Y?IBY%0<gt@r)+-@is4vK+uA
zLZ_vdUOKno*%rU&=0j)A)eeX<nq?4&$68Rf6t>@f`(~BjT)dl`F0Y>CnI#x4CEAT(
zjJs&X-IvANAt7WDOUJ9PzIveshvUqFM$(ho!w)}P`jCavhT>g+y_D2i2IrrDeqkII
zT4<qU_g3xn8N$CB|GZj~Pk)TdVcLygT<)R;)IzL9E(;-h?z!g{ZfrFU9N{hH#X;k9
z`fjP&eDlpis1^2q`Q?|Z!b6L5EvWCf<BnJ&dk!%xrq@|j@7}#D#>;Duyb6&nNH7}x
zZ2`96Ro><nOY6!SL?UM|Jow;)UVon_GKlGHKgBwu^Uga@;_Ma!La=1(y5y2eHajnE
zy}>O)ueMMg$W$WaFA)pw#3+$Y#V1Xg6e0PJ7z_~v6~T=nMEc2zGot?pxl(k_Ip-8A
zqctP76~P#eA{IePG*Gq(#|u&qC<5Bi+;GDU9}!n0L2`*fMbcG@qmH@cl1rlB{qA>_
zqUMHgw9!TpyRF<f7N|iYf^lKcph1yL9u#e>ygZr{7VNy{WEM!15)0v7Iq;hjh!^d-
z=bnksDim)12+uy}n0~Z<ue<KLl1#P=sG}k37Ud;^DGK5+%>n7(G!lqNM2uQ2X?K*Y
zU$FZ<{P4qj<jtQFlrbe#oS)fpzhn8p8D?@OWA|(-rUj4OI9gA%1X$ST=I@p-Rf^`E
zTwit7RfWrN%QJUg{fHA>!?Xv7q5K4r>1p46_kDof&Bx}MwWSfJ(_{p6A1t%XGBdK_
z_DzFLH#bvMxBd3p?*;pAsr{F~{H1Ufn#Oc2AdNQkY$Fu7A_yQFJvwE8xp_%r@5v{h
z%#Gs<?5HWphf8bt`8bTWX<DQXW<hvf9)(*N$NxGs@s6a$7hhazY^mUcGo0r`ajW(3
z(W6HU5f~bYt=){cAM2a=M?d;eJZjXaSSQUPJsKSoKtwUbmuT%N&k!DpTP;YNE|gyp
z|Ge@@ALKBEwFwx(Xi=@RBb$<RMltAn-}~MQwk6I(oZW&Bz=91!hdk}1pUXn=v%L7#
zgh^t|f;3UH%&IvS$>#?@_<@63vh|P8KKtzCj4GR6YM|8uhpEAK$>#6-&MS}j9ZoRX
zN=u7tam-Sf;ar^B5~3-Q*7_<Tl}X}z4bxkR4$YZoo+;k$ja$@TTtm9J|N7UzT9l8J
zvrq=}RVjYvnP=j?_ue~3Q9LO_I>Xh1);*y*>3Bi}9}1U$9uVH41fv7TM9Pb;ee(d!
zP|T=fk3Duv8ui^g<dLxiD^7#!L?Bh)M33Y(@(sq%3q$ii=G-cl?u@~jYp&U>ysRA5
z9V{!ajhrRs!hCZ6q!aOKK{#7kvPGmv9C1Wi2RAJ1&MS+!?M^V1ne39Xl3uN2l4%Kh
zY0PLw^X7E4F1&jI!Bwt?9NW^z-Gu0oyi2|%4Vm{XMQI&8X4fpr^TG=+ES!(8jH8Y^
z%0(^c)<G(I$uT>>U>sinLc#<;6yRg6gR+WOKAg<Ym!J6&r$Y!PyN=PcBrPrp5K=CK
zd%0iy;un(1&ozXzHcw{+J8p|DwkR2zoCiHlp27HT*!t_QpW8`Nsc4A^UZ?Cu0jX`W
zfL0oDI>Zk#cZ!0^UwrY!<d(x-cik1#)p6^Zbq6yhfVdq>Fyb<a9t^g-_#MdiaLh88
z6_^TwTt<h2#PJ$QeVNu$nGD<1cjXs~FMqV;;?qt$EoM5)Yqun9k3IIt%`2}QjxGu-
zdHZ%f+F7A>7bBQV)HkKCv(ic{rONBtwdFw`ZWYpX7{Q3kh+u5DWNR5I84Ibwm=T!K
zjHu&6mC!{nEk=pwH4xMzZd!IIuZH3-wbW9{cGr!c=Vr?DmKn-F>tCr;t!(5uF{+<c
zm8C6v9%ONGzbm8*5=?st?yM2!g0PJALuI5ZYGw|X$Zn$&lGc_1BP~MDq|DzuVBv$!
zEgLQT;9(@U{t`V|H-4Ub?X}k~EQIsrgVfmPUFHW@jJPdX=AY-G!^!rB_9Pe)j!QH~
zEQx)~Ew_Bc0{8w<1MIr%uA!g^#poqiZ=`2bH2g?J?kcMc(7B1=NM-(c9y;S{F5G$N
zorRM!^%Rb)h>b=tA`pWtv3R)*BJ!IoLDp7dvKz>Hr{7$kO}PrAwa;$5?G`*Lxcu_V
z({x1~<Q3`GKyv^+<cKHG3MFO1TPU7ILi%jZhO)Jeu^p4vGwy+;E6f{)xP1k72Hy%o
zG83(245arOq`XR(s`kI|!V6D_;%ZS$CuVZb|K#ZqZ@Hl|Tz_51Edo+cHQi-5eaOA(
zrkmzw8%ihtJRrQo*D&Bv($Vf(#<<NKwu)cz{>g2M?1No)*~RCb_;HNTm-D3OECR&0
z46j~(W#6vN?kKwQ$}3&3itfGk+N)xmP=uoE7~OMPVTBb!*_8P=+LYv0P@_{I+tx8=
z8^I(*bl-jV1*auWuOsdYB^mjC&N}NXchTJazyl9#wP{Hjanht~4j?NjoUEE@sZpmS
zYpm?lWU`sQL`aVe*b$B5oaBuV%RK$`(}Pn3+fqG=FvHTKmm-1*#((zNXDw<WTVnjY
z{PM#7^Pm3|D&vYPt|(lF<TQDZhfjrc!6`|d*q&hJX?G@LG8(OGL_j*(?!oJl2cuQD
zFYYp6%8I0OD?Jn+aIp6{r_08MV#Mbkb55g6S!KZXJ7P;-<{$Eqt}TMJNK=}Dw!_kW
z(G^;>{}a7i4pk%Rxv+CfbaI6=+%C%7=~;d%qZ&@8GIVX%2dG~7yc0hNCKyIKN#ei8
z%*1FHYqLN&5s}&gTrMMFo`^)kJUcR23imMdU~<*>^PaWXX{Vh^*aqi8kCLZ%)Y379
zq`mHF)JqARS0$I>@4ox)SPRu6aO<tN#w^U^ZMWSvkuvL+q=a=oD57y_b<!;bA5>C*
z@TD<7@(yws!rC1~G{#+QTG9|P>F*HSqtN{g^6)&i%@vHfbVT|l7x}zKeqMr+KNst)
zopNnSn|X3QKK}UQbK`{q^>~r4hq$=tUXpZSbdKa6JXUiVPEV^Dh<J5~sp~S8c3YOl
zXM<zS5sVRyrlPEZ)j<4~=4|BzUuEQ{(_J0qyN&O<*_Ax(rbUo9%?)?m`|Pui8@0^M
z^pbD{yKJUT7V$I(P#g>5ES$vg*p0=geZ*_5u|{qk6<^0Cx(oiNKm94z7F%l?w{Cgv
zJp4&lQv?G(sa(c4EiFm-u%G?xXFBRlRWP#^M3@$A98RHMb>rWB^UaTtr#HR`Af$vX
z?xQEhvT50pyV)0Z>)p9*UcPTlc?Oaf={!r1E9&i-+itrpMzS4CmqyUs!%@rMXM<Bs
z5{$Tv3G(#Pk)|c-%Lv)Qn324qpclKnAkBW_1Pw<3Q!Sx1`|?;ccbqJ0V)J%hj8b_p
z?@cz@q$GaPkD>>eI_1_BRs??i>t6@)%xj;#yh&HH1f#W#xQwPHSB*27mUwmY&``y+
zVAMNtr1Kh%3MRT~S!@Qk*jk7hXfaypQ9((H+09sz!nUTjq9@YQb14FPCoj|ndH#8M
zldk3n2AtAqNnFNuOD2=iv^129`71#f{&zj7u^#*(p4ae*ajGMu#^KSx$3k&6_e)!i
zTaSgGHEZtTSI?4#@NoS#eH8(%Vcc{@-FbPFN6iw9J1yCTxAZy+h>zrc(*K1j$Nl5n
z#zO5f-C`p<`5eV5$rZe5v~CE6`TV6G*&IMoy-+!o&WWsS>D&15tK?_teKu)>1fwaT
zqaj=2k|P5yhus)LaK#l@j98S0f+M!UpIIQnsNU>Ap0)3+-SqEiS?}OC!o`S1aWFg-
zpd*GNfI?Y`fH0J%(Jr)w>S_MAy|!sdi(i|TByAju6muEo{*vj%9TnPA63=UBOg(~|
z-u0l9CxzlR$3O2yZ5PL^TUvib%9Gk=CD3KLB6(%w<mF4;n&&X!n09({2+4P1BaE7Z
z)bbWZ@BxzDNaA@PFeS~;vA{DHhWLIAHzq%~@0Qws|NGw~b~9CHQ<TdTdH$rmIgG!h
zt8Ri8C-99DonIu=6Jqt?w8UtQHrQZ;AOc*NbL%+oA%`52sz3x26%0Ut7$I3r-gB8S
zVM2ruFxqg#4I|F7BA!4?UZT*mtf*N;!c!;hT(gZ(<0w=@5rRQ@SLnryLIu`Iq|mff
za#Vm^<)siC&D$xUsyT}VZ>p39*J-so*tBn%xL<y)Wpv-D2*5R~E;BD*@UQ793H-_$
z*%rR3&D3&}BKiP1N(5o}f^=#;?_-ZWmM(S~?Wol(^Nu%iGdx*eH6vBAB)no#NWD`W
zti3>^yB0ur7^l$`B4M7XJS1ulzx?Gd2XSBcF8tjohR<(c#~pW!uD<$e`z*0}LgYEN
zpQFtao!*C0HCW5OYuVOI;MxgFtwJx5>yNvn(ts2^c@_<wo=7(#ssX(;o<rz!*ilMr
zKq80^S8oW_%LpcWRNziaBf0EWa;WICRh_kvx!2GD=>v*NgXn*1DDHQ`Uw^U{0xku<
zP8;;YNFJt(hhp6tyc(!oyrY$Xjsoj&O+|9sl$0!hQS1&*O9;A>ztHm`PUA!@oL{jp
zM(IEn$}ijZcgfb&jVK~mWe8?UQ=r=4z;&BnhubzKWlylBzL}h0bLh7!3)nA1qvL=B
z4lsf%vl&$-|Ea{`<wN9K7O#>0w1~ckXZ7;{5yly`fgVg~_ow42vnt3=OJap~f-M#~
z7&8*Z=YNJOtPAYK2^!}9bf?92miL*<#kqp<s|nL-I9uu%Mf9XoUVZh|<b4?F?&$R@
zee3xT{TrM9ABl$(V}z2eQg$Ug^+y|j``h1&ymUV6gcD9!ll+WebRevQVGZJBO2V!g
zFoF?cLeO`DJ)F06_X`n>{6~x!5$pss+e-f9;3q%%iG+H=_(j6>7?7UY5K&YMdYwTU
zb4MS2bgZ{%bP8Ui%p!3RQpU)f;v&*w!<&V)rhF}U_3)GKjEP{h>8MG90k3qYWJd+k
z_boXp7&vg?ay0aZR>`a_Z8g$(4Z5<@I!YC3Y0O7LaVz;t_MwABJ$K()Af+g&pGpf5
z#qx@3mM)Ic12%nOy>L}6(5COATce$$rhhF1)b4735sdmH;V>H2wFHKbkdqOjwx&t8
z*L-*9@9vI4a=H`lGSHzQe{50aZyso{J%zgE%KD~JztptAw4sJ61UiP0L>JZ_Ny^%m
zpw~F{Iw$(R$u?TsX-StQJ=PXm|Cg=pHkbB-HwTK~M?1{om}3|ICFW7$e~ods)U)}v
z%}0^!+BHt4X-VvII9E@1$QwbtxZve5q>X>`o8Nq^HBBbGfK`~wNTtD5y3WI)Ucz*+
zi^k#ZYFErajICeFw$y~#fW}!nAf$}Dh^zF%h&@UsGXOIbGYSdrYoSh&7Cv#j296@#
z$5bf`ZuL|suIsOp>7rLkLU`4hKU3fxKmPHL*P)&xF+(tF-|Tc$v+EadO+W-Aqv=Qj
zBU7x>Hc!+)2r~jUeP*Zw^j=-|N(X6D0zx|Ks&CF_ih9otciqy))Af=Df>~UwyOYNz
zccGqACK`nqhOx!2ZKq9Om#$xkQ<Go>BQ9g>7p*Z$F1vAUHCGcmPZe_Kop*l1C4lR$
zyY6Z7PYKH0`YW1=XzW)5tTCpb4tg3>-L@=@*XHuty4+&ekg0GxjwB95QR}Sf)2H9V
zA~XEgvDFk<FfJT<`sB%z&!O&{P`?#1V=zW6nu<)i>n?U(?xKFFSrBsBX{qe88&kwn
zq4r`CS4IHjnfM`pp}%IkPkqnfEUF~F9w!XlD)g1ff^;&RXm83`6|+i{(c;>S`6+xg
zq|Iw^HnuxEn)A^oo=l$M7Z7~~7Vv{e-lPs!vgX@|g|f;Op)8MC7NcosD8`6IQ@#eJ
zw$eWCk`PR-QjOsy+gPHeCmF44WP0!b(QZg^kHlRD+F?j1MSl_O1Gvhw+&a`KOF{n=
zAYB#xQ^>{}Zya$3m4<~JB0O$4oP`wnCKiykn=s<bCR2u9!zH&q$W2z~pm7zHqDHgU
z8pV!G9ajiMaBT6XaS%BfA>m|h9Xy31`Ku%rE{4|}+%nqvn62Y>eY<`ZU$)W<61#GX
zd=t4Neyw4}X>58bAsDuSi}NQH_Y*GvGT^oCh=&8q{N*9(Cu$EZsz1WIyV3YNhR*qv
zEY-N`1Z!k9ur)T$lu+bWeN?vDS$7w<&GT?suiq-GtkRzwk^SIEeOOQRWNp@s^PaEa
z9y4SR<$r+Q^E9Trx8ZUs-^w*SWE*aVpGzFB+rlla<wX|tK`=s8jVh!0R7S)hDR9DN
z7*Xf)Ph}hOT?V{06OA1^w#?r=ka5gKGOWC-0!H&J)*`2J4dx0Gs*$as&2}5y@;2gB
zd2$<(*mu^p_!iglacv_=>sYgmNc3&QVz%LHwg|?;+;o<g%9A^RsvFA^wxex`TV+Zr
z#~R?K5H2h>bN|_l%WhTIpV9p`=S4q-ST3hrv2z&-x+L&wuCerHTR!^E8Y?gBZ{M!q
z&CSR4x47<fWbJG1oe~K+q)>H(r77Fq;Uer-!YY;!4p&<5;spCMA39otuq*HdC4Lho
zOpvrU7@iG4;d>H)h_N#-mro|lI?g&GWLxLB;aRu7U1Movo4@(FY29#(7qTtAY?n}6
zuBbM(w#J!2Ndp<%v%p%j4L=dKj26I}mePeU?jDHyPe7KkE$%XS?z!ipF=I;Bwk2^m
zL5}#xloCJR2Liq;kszPQnn4|+MiwhKW8W?@TSJ>|b+IW%^~t(@end;+xwhPvuWZ*?
zr@OY{rFiDHa5t^oE@Z!xPH-dCsykaLt8_9Cqg{Vv2ywj*#lkTZ994RPmA8Zc$)iNu
zAWu0CV)>GcjI+2S)<&(u+|e6yi_k2t>}+28Hcnw~v&}zbXY;ahtW4QOxJntZkS?WM
zxoZ_{6v`Hdktx|Nv3uyw4&ff&((Ui71oDpP;DZnL1tov)%XQq~JG{J2cLdi)u4zgv
zLbV2$ZN}FDN|J4K)j{CeZvA|2H-3^h^WzRC1-aiY7s-YhZf0Ay*>CetY_Y(40IP&-
z88w7;(i~(ia~b_Nhbn^JON4@xH(1Klyh82`lP3p`TVbgz;{;}FB+G3?V}#^#KXaR%
z;!HZLgZyONeB?IHkY^hXhKI$qyex0GEW^dxlA;pGew%-Z?Qg}BC>{P`qfv<12(-Cg
zcEWX-GCpLDv6By5y?;A#;>1X*4?d6vJu)3%P=wfH05XxQ`G>ZTiC`V;+H$KCtijFp
z=GPQYVQxIR1?Fe@xt(inpRIIm8u#1swESfoD6Antgkr>@1+RO8t!ZcoW)$Z*>1z#H
z$+=V%iQ_doV1(0Tlce8pum2^j&RTSmyAVdl6guCMJV?`{h}MYMh+4J}+;G>e^k$Ml
zz_)CZKZR^JuHj+%xcQsghf`rcWn3?i?d-CVhDbapli^RgBK|DPTUQ+;=$>>4I4anN
zFe^_S#f<qGZk9#%+x%r)nAsL)-?H6&%^kAc_=@A^<ICIpnq}7u!Ke`ovJIq0N;;4~
z&C+5-?lKUu{P2fAEb})HIFLEZY^J3VJnf-FJ1g7m6mwfTeOCjPK5HwFtY7H6Qrv3r
zX_&aiQpI*P4QN`*o?z=;yb?w4bY8*1&B#!LCx4%(KUfa|C(7qho^&!@O*G+Rc*$;f
zs22|7c7%1hv0r1=;w*FXF1zs{ba49&p+u7WhJe%Kt+|se0ttce>Vz6=0gYl2xk-CX
zu}X{4B{9ReN4+|opFSd#<rsPjjCfw7#}M;?!%9h$#nr^!Y_V$`2Cq)2wHC0>v1v*A
zBI>|}G1|op#^?_AgQ1Sk)AuE9j804_scsiYfEUt8BdGDA9;YPripwEvN=g^M?3V5d
zb)D{D=Rw|40a|ODa~)S}7$aOaEBSRo4Yq(fMuaXd<H}?-Ee*g7MSpf|kWCQ4WjL4M
zO5AAa<^EqZf8w<-WpqwUG(x?Ajc#{Z(x{g}ExlEc_hJ?Q>{db~q$~N>^Xwr&ALcRQ
zOZQdlClRdHQzBr)3uog(y-rE$5x0}wX(^eSxO4MRsN3?i@RX*4OlCDyCe|aG+U`3;
zC~B8_2H&()B9lSSW&aSD&|l3^`JiE~5~J1-O0HKKCZR(kj`p48GWAF}#{M<JwY}Au
zjyo+4+;h)8*9i4E8hSBG)j@(Gub9_2L&+0=c48+tm8qSYZLvE!4vkTZ;1Wz$CbJj_
zCo&nXfCS&*@cpd~=~5!n<I5FZW|%vD`t;pN6XG($vEe`?q8>pVD@Z%I$z8IR;Tp!&
zB$nrgTZtauZ@t(JMQ5CG#<w2jt}eU{b2is*mm|pKEDcF0<<+l0AD7E$O3>6`(~^XE
zgE;>Q{)bH7|3;EFAw)d|f=nlOYU1Bkrd)K<McU4XR2>NFgj#3;mtZt4sl%kdkZiBH
zY`#8gmEeEvv1rY5C-1lZc8{qomuOIrm_WHYF8I!Ev#E34KrX>>CFIV$UgkQgmq4g}
znLpP`^0HFc9IoxIM%vB=a1E1>k6@B1iF?!Q(us3Jz0B3tGNSMiitBg&`R9kSOZ?$7
zHxOSOPMl60Pl83m5oafKbPHH#WF@`}qZ4ycUhnd6B2^O%N>nk|S@N=-#Ugnr8pWn2
z;pHxdJG#BT^W}?R)FJ8^_e^OK)*K~o^18i@GI!O)LjFk_-jd5*&!GFe2XS34(@8Ki
zNUeYojJx1nfVWVB@1jd!r)SftK(mcrxeNhM(qBd1b}%U-cDYQgv|Eet&<LnU5U~hs
zS~9yUm*kiKCaC<EOKB1R8e1Mvh0pcZUmuLkLq$syXk10{49{SidJCvmg2}dXN-(^o
zAC$=Plvp-h)!)1+6HLQpIh~fPO^s+=f^pr!JZe3lo(aZ?#O$P_xMQ?PsL^=<C=^uK
zU)O3wz>85jmdFxILlBD9xt<Be>R<$u*lcgVuz;+M<TmS7^|x+OhJZEF48ltAX^Pu0
zMAHZaqdrMHi7j=IjSLwwq^bX!Z{_8|F@e}mic3=|4MQxdPrVb2bxu>?L|u3*CP*++
zoMOtdxXrT1j~^dQhn|ee&f*k|-x<(;Euc;jvAc(k$<2Xr<Hn6*Y6$*ggkJO}U9*gY
zcT&Cz0mOO=dAt7vVp3n>+EAQ^`qUNp2u6pF$yF0hsqYAN>eQ)IoBcmU2OV@!DBHyU
z+H0@f6dYWF$sR`5RU<bNvPLi_v@^AaL<xM-q)CV8_3S_X@sFzin@A5mv!D)U%ab8*
z(7-wx5W$3$#2cv(>Z&eTf{{30_nt*C0}<Yhp#!G}dzSzajr3iJU(sx_#TGFyT;*jK
z^C0xm<Rwi%ZLM8`X*g*w^{YE@2}W#xK8!j^ouyGe90A)AxjjsvrYEgw^gaw}%8bsA
zCQO(R>qsFF;5@JM4`?IELyA<A1L=08dk86fW$GU4wG!3=vNeKbv;daTLbC_lqX$B^
z>$m|hn(tgdcP6^`-g_hcvAF)gO8*tjOX0b%Z@L-kh5~N_--@3eDxBG5W@9H01Yk>b
zR3M`4gbru{BN!u;p5S2Xm_$93?-4wNxDiv+2YK9~rC|`+1(Y=$W9t`9jlL6WygQ+z
zTEGZK+f`fms*`M5N^TACy$r8?@5+=CUahu(Vz|3>H=Jw~<qW~-=``PT)VZamVQK+H
zH0lg-8LeZqW{~XPUUC?OTc^jPFTVKVpSCuqLFRG;>lU4i55pLD(bis^P8?6uqi{3g
z#@PuS*#g!PHZ5uGlI1c(@EeI4v;Y44kLUlDo^Js|v7|HkH`)`)Q)?p;<Y0`;U9<of
z0gLk)cM-0g(7`QW1moi}$;|=q)5sSG(6q4}3*eP`tL|9+!G!gG6}B#}-FEolhi^t+
zA{On6hG4Wa((cUnoS6{}!Hog+PWgtvb&R-;j7GPNrUi|5*)sB*ho{GSa}8xY&&qGW
z?SVD<6AMitUf}lQ>s)HP7rD)?{4L+}MAFV@md9vUB;)RkY*%D9!SxN+;PqMy!(X<H
z2uH>U#)!sj5seX45|=-&n2+gd1P?>=y6R$!@%(%*?oGcBH+hfOsNOi`lvAdW#)!a(
zLbef&xfREZ2*eD|#@S9=gR4^Y3RVY~U_=Z?7)CrPhapUU3O52%TFVD#+S%%KyM8NT
za0w>sHlkAeh9nm1l{B2}MgbF$x%IKmv(6WxsB>k@7@_46j1hwoiAy|kTX>dO2x=_Q
zNUL`cA*i!mJ4-l5H1an>F)k!q>0N^1Gs#c!%@|>rE#gs_5sQ@}+rV|3UtQacKrre6
zb&L^>b%;9CI#EO+w{@_H#-^j91Y>DkTW&K}7G4SHyWyZw2*&Lg>nPdAHLNq$xgrp8
z1tS>aE*6)d1l%-o8)3*+dh@e*vJG6f`89-{ZKQgyRJJ}YG01J)#O!RiTYr}j<QAd0
zb~fD7%D-VD+rW)dQMX>^&JsuVJ6m___$*<#-%4ZgvhHkt4e@P_*$|b<R3ck9`!+&R
zbk{GFJoz+YFd~ts>*uC1f7h?!+}2<XS23qTzB-zp*%sZt-OdlWEsYy)ehq6|12t>~
oor>kv)fbjW2zg;nk&Wm4f7LWz3Qy4SF8}}l07*qoM6N<$f?wm6JOBUy

diff --git a/data/styles/default/light/xxxhdpi/route-point-start.png b/data/styles/default/light/xxxhdpi/route-point-start.png
deleted file mode 100644
index 9e7b58294a8bb89363e8cb0eefe2f561b0ccaece..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5188
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

diff --git a/data/styles/default/light/xxxhdpi/search-result.png b/data/styles/default/light/xxxhdpi/search-result.png
deleted file mode 100644
index 51bfeaec58f5dea835c75fc52f55b3b3b2fec975..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1410
zcmV-|1%3L7P)<h;3K|Lk000e1NJLTq001}u001}$1^@s6sD?Wp00001b5ch_0Itp)
z=>Px)JV``BRA>e5T1jXWK@_b?CdL>C5`q{Ff@0htC}QGK^dN|W8;H!+fZ$aWkD_?g
zcoc;3=pcd{xIhHKlei!*;EsaE1rdcwj7cUL-y6G{s_N>_%%mq)LO%TIuKm5L>Z+Rm
zONben=>eyEAW=<pg+iej^{;@oLz|!}C?yB|1$_&Bl}IFh;_1GCPy*TsJpp|NEmfG8
zWmvYVonBEd0#qyXH1rd6qQW{@S8GLJ;w%IZDd=%%KQwM(ovd3<>x!UPJRQ*R0kn7w
zI?vYf%O9hn_rr*I^K(pm8=w}7Pv)K9SOZNIpUawS#OB3yVr5IMts2IChaSaudL}GG
zRD9V4L9784W}s=aVv@S>a#-}f9}ypO1v5D^yeO3ro0rsyy(?#hk<FrlZV(-etjI_#
ziy+7?9LeWz)+Ljx)q47JW8&ofKjQN15m6p3wU&SH1hi{;ojA09wrES$m>C`-Vh2cm
zHWR|aB@+a>wfX#LZ!%fiA}bpnEr^~6L*m@iAu%*6W8-<&W5(`VT`vxH)r(oR8q6<f
zVH-$3E~O={WLN=?9LPOY$^94{6Z>!d77xG1%*+7M*;*^kZkZ!m8nn?Q$<9(na$JJ^
z<}fYqsnhZWzP0Wf1EQ~gq7%|!6B2Bjn-H0;jbfF)5OKP081I|Zx+SFkj7e_yrT$4H
zM@;NUw#klFq!aI4>>?$SAV!Z{fxlXET5{xm=OgQ^N+R22+r*$q+QX<s>93(v6a~4#
zzJnI`IW8#aYXepP=5%<$5WmUn_C|H#;Xb((Q<dl2fJBYpVdVBV@l)6as=c5D&{-mg
zfh)Hn#7L}Gv5p`{kLN(1^cz`<``o5%F7~Z}byp(XLhhtf>OMJudfG9HU(Nc$M(_wS
z7Rj*yH}SalITJ`ZVPYXBMTnJ{0}>#J(c`G@kvVz%;t9nyAtqu|WRHhki4r0}5UE^#
z+hi`DEhlHUlP#9^Bqm~0gqYVU;o_@};0`qt56-TN1=~&&Ya~H#tmXbIFdL|5nAnWX
zUmF~@tr5f=rVXV-g0l3GOmgOV8~-^K>F_xCQ5r$S(m>?P+h5wL!H;+8g@33G(Kwg{
zY5nqr|HNGv3r3BDNsy*JUub4<T`U+i4kkg(z+>qh=lEJMY8*_0&Jma>Ad{eWBB%As
zb+KU7IG7A*PWOeTJ=ev8QR83|<Ua^sEWP8Wx$<JcsBtg}zEXkHDC@ddFlrn$2KYZk
zFVAyHiWX<r#lZO7<KV;A2zs$sWh%|-v^cve#AcZMee4pmjo=lT$S2L|u8IYlhMl-=
z1Ro*3Pm-dqz{N2nCSp^Bn2BAJ071-Qp3g4IT$}>*6}TqEWK7SC9(E0?b#U;PBVcse
zcs?hF9XWeX*yx0wpmnN8b_KmW-D~P)@V`IllrcO{Js#!&HtPs77e<kX*6C~bMUU`I
zca&r)bYaoULr2K}61GhYhC7YkU+w&<;tMP?Y9b2KZJd>HbYaoUGbbryChy5M*|y<E
z%X%0?fs8vGn5uMH--XhgSd^*cJ{y-H8G+<NJm`;Gz%XUnI6(i=DUw`^_v=ufq;z3t
zo(#plg-ogoTOrAj<ay7Zu1uR2mk>yV;(e1Dyrzp0%FmR)Mxt;b(a4KHT!?5mrfrpm
zp|FcU?M=7{gaf_de^;COjzGm1fz*o1eg{eCuX2@5%2ohGr{`rnlPrkxI%OBM((9Bg
zThi8LwjCCZwKB62fNe$`eFZe9H$kOQmPadEzi1$uIu~LAc1C7;Am$$U3$tU<_%E4t
QkN^Mx07*qoM6N<$f@{r`XaE2J

diff --git a/data/styles/default/light/xxxhdpi/track_marker_deselected.png b/data/styles/default/light/xxxhdpi/track_marker_deselected.png
deleted file mode 100644
index a62d25ab7d8f083974f383d7f1ae79e514bf4eb1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1735
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

diff --git a/data/styles/default/light/xxxhdpi/track_marker_selected.png b/data/styles/default/light/xxxhdpi/track_marker_selected.png
deleted file mode 100644
index a07520a3b754bc9b29ab4dd46eaeb783afd175bd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4445
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

diff --git a/libs/drape_frontend/gui/compass.cpp b/libs/drape_frontend/gui/compass.cpp
index f09ef9876..68e9f44ac 100644
--- a/libs/drape_frontend/gui/compass.cpp
+++ b/libs/drape_frontend/gui/compass.cpp
@@ -92,7 +92,7 @@ drape_ptr<ShapeRenderer> Compass::Draw(ref_ptr<dp::GraphicsContext> context, ref
                                        TTapHandler const & tapHandler) const
 {
   dp::TextureManager::SymbolRegion region;
-  tex->GetSymbolRegion("compass-image", region);
+  tex->GetSymbolRegion("compass", region);
   auto const halfSize = glsl::ToVec2(region.GetPixelSize() * 0.5f);
   auto const texRect = region.GetTexRect();
 
diff --git a/libs/map/search_mark.cpp b/libs/map/search_mark.cpp
index 7c34e107e..db3002543 100644
--- a/libs/map/search_mark.cpp
+++ b/libs/map/search_mark.cpp
@@ -148,7 +148,7 @@ std::array<std::string, SearchMarkType::Count> const kSymbols = {
     "search-result-bicycle_parking-covered",  // BicycleParkingCovered.
     "search-result-bicycle_rental",           // BicycleRental.
 
-    "non-found-search-result",  // NotFound.
+    "search-result-non-found",  // NotFound.
 };
 
 std::string const & GetSymbol(SearchMarkType searchMarkType)
diff --git a/libs/map/user_mark.cpp b/libs/map/user_mark.cpp
index acf3575cf..37f878816 100644
--- a/libs/map/user_mark.cpp
+++ b/libs/map/user_mark.cpp
@@ -50,7 +50,7 @@ DebugMarkPoint::DebugMarkPoint(m2::PointD const & ptOrg) : UserMark(ptOrg, UserM
 drape_ptr<df::UserPointMark::SymbolNameZoomInfo> DebugMarkPoint::GetSymbolNames() const
 {
   auto symbol = make_unique_dp<SymbolNameZoomInfo>();
-  symbol->insert(std::make_pair(1 /* zoomLevel */, "non-found-search-result"));
+  symbol->insert(std::make_pair(1 /* zoomLevel */, "search-result-non-found"));
   return symbol;
 }
 

From 4fe21ec6eba87011900bf8b84a17663958fc62b1 Mon Sep 17 00:00:00 2001
From: Yannik Bloscheck <git@yannikbloscheck.com>
Date: Fri, 22 Aug 2025 12:36:42 +0200
Subject: [PATCH 149/302] [styles] Move light animal shelter icon to the
 correct location

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
---
 data/styles/default/light/{ => symbols}/animal_shelter-m.svg | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename data/styles/default/light/{ => symbols}/animal_shelter-m.svg (100%)

diff --git a/data/styles/default/light/animal_shelter-m.svg b/data/styles/default/light/symbols/animal_shelter-m.svg
similarity index 100%
rename from data/styles/default/light/animal_shelter-m.svg
rename to data/styles/default/light/symbols/animal_shelter-m.svg

From 9aa86fc7030dd0bd3aecea73d93c301e9746d009 Mon Sep 17 00:00:00 2001
From: Osyotr <Osyotr@users.noreply.github.com>
Date: Tue, 29 Jul 2025 00:37:30 +0300
Subject: [PATCH 150/302] Remove android include from public interface of
 VulkanContextFactory

Signed-off-by: Osyotr <Osyotr@users.noreply.github.com>
---
 libs/drape/vulkan/vulkan_context_factory.hpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libs/drape/vulkan/vulkan_context_factory.hpp b/libs/drape/vulkan/vulkan_context_factory.hpp
index 65da7b7f3..d00d2fe89 100644
--- a/libs/drape/vulkan/vulkan_context_factory.hpp
+++ b/libs/drape/vulkan/vulkan_context_factory.hpp
@@ -6,8 +6,6 @@
 #include "drape/vulkan/vulkan_layers.hpp"
 #include "drape/vulkan/vulkan_object_manager.hpp"
 
-#include <vulkan/vulkan_android.h>
-
 namespace dp
 {
 namespace vulkan

From 826b56cabce60b1a4fbf6e936966dc9838cf753e Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Mon, 11 Aug 2025 20:48:13 +0200
Subject: [PATCH 151/302] [drape] Fix gui text alignment

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 libs/drape_frontend/gui/gui_text.cpp | 40 +++++++++++++++++++---------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/libs/drape_frontend/gui/gui_text.cpp b/libs/drape_frontend/gui/gui_text.cpp
index a71c4e93a..adcc660e9 100644
--- a/libs/drape_frontend/gui/gui_text.cpp
+++ b/libs/drape_frontend/gui/gui_text.cpp
@@ -370,7 +370,10 @@ void MutableLabel::SetText(LabelResult & result, std::string text, ref_ptr<dp::T
   // float length = m_shapedText.m_lineWidthInPixels;
 
   float maxHeight = 0.0f;
-  float length = 0.0f;
+
+  std::pair minMaxXPos = {std::numeric_limits<float>::max(), std::numeric_limits<float>::lowest()};
+  float offsetLeft = 0;
+
   glsl::vec2 pen = glsl::vec2(0.0, 0.0);
 
   ASSERT_EQUAL(m_glyphRegions.size(), m_shapedText.m_glyphs.size(), ());
@@ -384,17 +387,30 @@ void MutableLabel::SetText(LabelResult & result, std::string text, ref_ptr<dp::T
 
     ASSERT_EQUAL(normals.size(), maskTex.size(), ());
 
-    for (size_t i = 0; i < normals.size(); ++i)
-      result.m_buffer.emplace_back(pen + normals[i], maskTex[i]);
+    for (size_t j = 0; j < normals.size(); ++j)
+    {
+      result.m_buffer.emplace_back(pen + normals[j], maskTex[j]);
+      auto const & back = result.m_buffer.back();
+      if (back.m_normal.x < minMaxXPos.first)
+      {
+        minMaxXPos.first = back.m_normal.x;
+        offsetLeft = offsets.x;
+      }
+      minMaxXPos.second = std::max(minMaxXPos.second, back.m_normal.x);
+    }
 
-    float const advance = metrics.m_xAdvance * m_textRatio;
-    length += advance + offsets.x;
     // TODO(AB): yAdvance is always zero for horizontal layouts.
-    pen += glsl::vec2(advance, metrics.m_yAdvance * m_textRatio);
+    pen += glsl::vec2(metrics.m_xAdvance * m_textRatio, metrics.m_yAdvance * m_textRatio);
     maxHeight = std::max(maxHeight, offsets.y + glyph.GetPixelHeight() * m_textRatio);
   }
 
-  glsl::vec2 anchorModifier = glsl::vec2(-length / 2.0f, maxHeight / 2.0f);
+  float const length = minMaxXPos.second - minMaxXPos.first;
+  // "- offset_left" is an approximation
+  // A correct version should be
+  // "- (offset_first_symbol_from_left + offset_last_symbol_from_right) / 2"
+  // But there is no possibility to determine the offset of the last symbol from the right.
+  // We only have x_offset which is "offset from left"
+  glsl::vec2 anchorModifier = glsl::vec2(-length / 2.0f - offsetLeft, maxHeight / 2.0f);
   if (m_anchor & dp::Right)
     anchorModifier.x = -length;
   else if (m_anchor & dp::Left)
@@ -421,12 +437,10 @@ MutableLabelHandle::MutableLabelHandle(uint32_t id, dp::Anchor anchor, m2::Point
 
 MutableLabelHandle::MutableLabelHandle(uint32_t id, dp::Anchor anchor, m2::PointF const & pivot,
                                        ref_ptr<dp::TextureManager> textures)
-  : TBase(id, anchor, pivot)
-  , m_textView(make_unique_dp<MutableLabel>(anchor))
-  , m_isContentDirty(true)
-  , m_textureManager(std::move(textures))
-  , m_glyphsReady(false)
-{}
+  : MutableLabelHandle(id, anchor, pivot)
+{
+  m_textureManager = std::move(textures);
+}
 
 void MutableLabelHandle::GetAttributeMutation(ref_ptr<dp::AttributeBufferMutator> mutator) const
 {

From 55dc1e17e6c2bfff4365bf24cc68c2a40d96d5ed Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Wed, 13 Aug 2025 17:19:28 +0300
Subject: [PATCH 152/302] Correct is_space fix for Windows compatibility

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 generator/maxspeeds_parser.cpp       |  2 +-
 libs/base/string_utils.cpp           | 12 ++++--------
 libs/base/string_utils.hpp           | 22 ++++++++++++++++++----
 libs/indexer/road_shields_parser.cpp |  2 +-
 libs/platform/measurement_utils.cpp  |  2 +-
 libs/routing/turns.cpp               |  3 ++-
 libs/search/processor.cpp            |  2 +-
 7 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/generator/maxspeeds_parser.cpp b/generator/maxspeeds_parser.cpp
index 072777117..94a9ae3a0 100644
--- a/generator/maxspeeds_parser.cpp
+++ b/generator/maxspeeds_parser.cpp
@@ -173,7 +173,7 @@ bool ParseMaxspeedTag(std::string const & maxspeedValue, routing::SpeedInUnits &
     speedStr += maxspeedValue[i];
   }
 
-  while (i < maxspeedValue.size() && isspace(maxspeedValue[i]))
+  while (i < maxspeedValue.size() && strings::IsASCIISpace(maxspeedValue[i]))
     ++i;
 
   if (maxspeedValue.size() == i || maxspeedValue.substr(i).starts_with("kmh"))
diff --git a/libs/base/string_utils.cpp b/libs/base/string_utils.cpp
index b6369f034..24ccc63a1 100644
--- a/libs/base/string_utils.cpp
+++ b/libs/base/string_utils.cpp
@@ -11,6 +11,7 @@
 
 #include <fast_double_parser.h>
 #include <boost/algorithm/string/trim.hpp>
+#include <string>
 
 namespace strings
 {
@@ -227,15 +228,15 @@ void AsciiToUpper(std::string & s)
 
 void Trim(std::string & s)
 {
-  boost::trim_if(s, ::isspace);
+  boost::trim_if(s, IsASCIISpace<std::string::value_type>);
 }
 
 void Trim(std::string_view & sv)
 {
-  auto const beg = std::find_if(sv.cbegin(), sv.cend(), [](auto c) { return !std::isspace(c); });
+  auto const beg = std::find_if(sv.cbegin(), sv.cend(), [](auto c) { return !IsASCIISpace(c); });
   if (beg != sv.end())
   {
-    auto const end = std::find_if(sv.crbegin(), sv.crend(), [](auto c) { return !std::isspace(c); }).base();
+    auto const end = std::find_if(sv.crbegin(), sv.crend(), [](auto c) { return !IsASCIISpace(c); }).base();
     sv = std::string_view(sv.data() + std::distance(sv.begin(), beg), std::distance(beg, end));
   }
   else
@@ -355,11 +356,6 @@ bool IsASCIIDigit(UniChar c)
   return c >= '0' && c <= '9';
 }
 
-bool IsASCIISpace(UniChar c)
-{
-  return c == ' ' || c == '\f' || c == '\n' || c == '\r' || c == '\t' || c == '\v';
-}
-
 bool IsASCIILatin(UniChar c)
 {
   return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z');
diff --git a/libs/base/string_utils.hpp b/libs/base/string_utils.hpp
index 6bb77b17d..3bcd603f5 100644
--- a/libs/base/string_utils.hpp
+++ b/libs/base/string_utils.hpp
@@ -105,9 +105,7 @@ size_t CountNormLowerSymbols(UniString const & s, UniString const & lowStr);
 void AsciiToLower(std::string & s);
 void AsciiToUpper(std::string & s);
 
-// All triming functions return a reference on an input string.
-// They do in-place trimming. In general, it does not work for any unicode whitespace except
-// ASCII U+0020 one.
+// All trimming functions do in-place trimming. Only ASCII whitespaces are trimmed.
 void Trim(std::string & s);
 void Trim(std::string_view & sv);
 /// Remove any characters that contain in "anyOf" on left and right side of string s
@@ -156,7 +154,23 @@ inline bool IsASCIINumeric(char const * s)
 {
   return IsASCIINumeric(std::string_view(s));
 }
-bool IsASCIISpace(UniChar c);
+
+// std::isspace is locale-dependent and fails for trailing UTF-8 characters.
+template <std::integral T>
+inline constexpr bool IsASCIISpace(T c)
+{
+  switch (c)
+  {
+  case ' ':
+  case '\f':
+  case '\n':
+  case '\r':
+  case '\t':
+  case '\v': return true;
+  default: return false;
+  }
+}
+
 bool IsASCIILatin(UniChar c);
 
 inline std::string DebugPrint(UniString const & s)
diff --git a/libs/indexer/road_shields_parser.cpp b/libs/indexer/road_shields_parser.cpp
index 660fd10d2..d9a7e2d9d 100644
--- a/libs/indexer/road_shields_parser.cpp
+++ b/libs/indexer/road_shields_parser.cpp
@@ -240,7 +240,7 @@ public:
   {
     std::string shieldText(rawText);
 
-    std::erase_if(shieldText, [](char c) { return c == '-' || ::isspace(c); });
+    std::erase_if(shieldText, [](char c) { return c == '-' || strings::IsASCIISpace(c); });
 
     if (shieldText.size() <= 2)
       return RoadShield(RoadShieldType::Default, rawText);
diff --git a/libs/platform/measurement_utils.cpp b/libs/platform/measurement_utils.cpp
index 25f155259..94000e157 100644
--- a/libs/platform/measurement_utils.cpp
+++ b/libs/platform/measurement_utils.cpp
@@ -279,7 +279,7 @@ bool OSMDistanceToMeters(std::string const & osmRawValue, double & outMeters)
   case ';': return false;
   }
 
-  while (*stop && isspace(*stop))
+  while (*stop && strings::IsASCIISpace(*stop))
     ++stop;
 
   // Default units - meters.
diff --git a/libs/routing/turns.cpp b/libs/routing/turns.cpp
index 012512555..21b82a0ab 100644
--- a/libs/routing/turns.cpp
+++ b/libs/routing/turns.cpp
@@ -11,6 +11,7 @@
 #include <algorithm>
 #include <array>
 #include <sstream>
+#include <string>
 #include <utility>
 
 namespace routing
@@ -312,7 +313,7 @@ bool ParseLanes(string lanesString, vector<SingleLaneInfo> & lanes)
     return false;
   lanes.clear();
   strings::AsciiToLower(lanesString);
-  base::EraseIf(lanesString, [](char c) { return isspace(c); });
+  base::EraseIf(lanesString, strings::IsASCIISpace<std::string::value_type>);
 
   vector<string> SplitLanesStrings;
   SingleLaneInfo lane;
diff --git a/libs/search/processor.cpp b/libs/search/processor.cpp
index b8665219d..b0273f097 100644
--- a/libs/search/processor.cpp
+++ b/libs/search/processor.cpp
@@ -86,7 +86,7 @@ void RemoveStopWordsIfNeeded(QueryTokens & tokens, strings::UniString & prefix)
 
 void TrimLeadingSpaces(string & s)
 {
-  while (!s.empty() && isspace(s.front()))
+  while (!s.empty() && strings::IsASCIISpace(s.front()))
     s = s.substr(1);
 }
 

From a28d5d15ce43c2bf8f5e48a7bf4b66fefc7656e0 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Fri, 1 Aug 2025 13:01:16 +0200
Subject: [PATCH 153/302] [drape] Fixed signed/unsigned comparison warning by
 changing Resize interface to uint32_t

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 iphone/Maps/Classes/MetalContextFactory.mm   | 14 +++++++-------
 iphone/Maps/Classes/iosOGLContext.h          |  2 +-
 iphone/Maps/Classes/iosOGLContext.mm         |  4 ++--
 libs/drape/graphics_context.hpp              |  2 +-
 libs/drape/metal/metal_base_context.hpp      |  2 +-
 libs/drape/metal/metal_base_context.mm       |  4 ++--
 libs/drape/vulkan/vulkan_base_context.cpp    | 10 +++++-----
 libs/drape/vulkan/vulkan_base_context.hpp    |  2 +-
 libs/drape/vulkan/vulkan_context_factory.cpp |  2 +-
 qt/qt_common/qtoglcontext.cpp                | 12 +++++-------
 qt/qt_common/qtoglcontext.hpp                |  2 +-
 11 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/iphone/Maps/Classes/MetalContextFactory.mm b/iphone/Maps/Classes/MetalContextFactory.mm
index 6fc5d7fd9..619430ffa 100644
--- a/iphone/Maps/Classes/MetalContextFactory.mm
+++ b/iphone/Maps/Classes/MetalContextFactory.mm
@@ -11,34 +11,34 @@ public:
     : dp::metal::MetalBaseContext(metalLayer.device, screenSize, [this]{ return [m_metalLayer nextDrawable]; })
     , m_metalLayer(metalLayer)
   {}
-  
-  void Resize(int w, int h) override
+
+  void Resize(uint32_t w, uint32_t h) override
   {
     m_metalLayer.drawableSize = CGSize{static_cast<float>(w), static_cast<float>(h)};
     ResetFrameDrawable();
     dp::metal::MetalBaseContext::Resize(w, h);
   }
-  
+
 private:
   CAMetalLayer * m_metalLayer;
 };
-  
+
 class UploadMetalContext : public dp::metal::MetalBaseContext
 {
 public:
   explicit UploadMetalContext(id<MTLDevice> device)
     : dp::metal::MetalBaseContext(device, {}, nullptr)
   {}
-  
+
   void Present() override {}
   void MakeCurrent() override {}
-  void Resize(int w, int h) override {}
+  void Resize(uint32_t w, uint32_t h) override {}
   void SetFramebuffer(ref_ptr<dp::BaseFramebuffer> framebuffer) override {}
   void Init(dp::ApiVersion apiVersion) override
   {
     CHECK_EQUAL(apiVersion, dp::ApiVersion::Metal, ());
   }
-  
+
   void SetClearColor(dp::Color const & color) override {}
   void Clear(uint32_t clearBits, uint32_t storeBits) override {}
   void Flush() override {}
diff --git a/iphone/Maps/Classes/iosOGLContext.h b/iphone/Maps/Classes/iosOGLContext.h
index 553d946ab..68b4e1bbb 100644
--- a/iphone/Maps/Classes/iosOGLContext.h
+++ b/iphone/Maps/Classes/iosOGLContext.h
@@ -18,7 +18,7 @@ public:
   void MakeCurrent() override;
   void Present() override;
   void SetFramebuffer(ref_ptr<dp::BaseFramebuffer> framebuffer) override;
-  void Resize(int w, int h) override;
+  void Resize(uint32_t w, uint32_t h) override;
   void SetPresentAvailable(bool available) override;
 
 private:
diff --git a/iphone/Maps/Classes/iosOGLContext.mm b/iphone/Maps/Classes/iosOGLContext.mm
index 04b86cb0d..5ef0ad2de 100644
--- a/iphone/Maps/Classes/iosOGLContext.mm
+++ b/iphone/Maps/Classes/iosOGLContext.mm
@@ -81,7 +81,7 @@ void iosOGLContext::SetFramebuffer(ref_ptr<dp::BaseFramebuffer> framebuffer)
   }
 }
 
-void iosOGLContext::Resize(int w, int h)
+void iosOGLContext::Resize(uint32_t w, uint32_t h)
 {
   if (m_needBuffers && m_hasBuffers)
   {
@@ -89,7 +89,7 @@ void iosOGLContext::Resize(int w, int h)
     GLint height = 0;
     glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_WIDTH, &width);
     glGetRenderbufferParameteriv(GL_RENDERBUFFER, GL_RENDERBUFFER_HEIGHT, &height);
-    if (width == w && height == h)
+    if (width == static_cast<GLint>(w) && height == static_cast<GLint>(h))
       return;
 
     DestroyBuffers();
diff --git a/libs/drape/graphics_context.hpp b/libs/drape/graphics_context.hpp
index 2165a3e57..a5ac6ba7c 100644
--- a/libs/drape/graphics_context.hpp
+++ b/libs/drape/graphics_context.hpp
@@ -61,7 +61,7 @@ public:
   virtual void ForgetFramebuffer(ref_ptr<BaseFramebuffer> framebuffer) = 0;
   virtual void ApplyFramebuffer(std::string const & framebufferLabel) = 0;
   // w, h - pixel size of render target (logical size * visual scale).
-  virtual void Resize(int /* w */, int /* h */) {}
+  virtual void Resize(uint32_t /* w */, uint32_t /* h */) {}
   virtual void SetRenderingEnabled(bool /* enabled */) {}
   virtual void SetPresentAvailable(bool /* available */) {}
   virtual bool Validate() { return true; }
diff --git a/libs/drape/metal/metal_base_context.hpp b/libs/drape/metal/metal_base_context.hpp
index 3f023b3b0..be1183a55 100644
--- a/libs/drape/metal/metal_base_context.hpp
+++ b/libs/drape/metal/metal_base_context.hpp
@@ -31,7 +31,7 @@ public:
   void MakeCurrent() override {}
   void DoneCurrent() override {}
   bool Validate() override { return true; }
-  void Resize(int w, int h) override;
+  void Resize(uint32_t w, uint32_t h) override;
   void SetFramebuffer(ref_ptr<dp::BaseFramebuffer> framebuffer) override;
   void ForgetFramebuffer(ref_ptr<dp::BaseFramebuffer> framebuffer) override {}
   void ApplyFramebuffer(std::string const & framebufferLabel) override;
diff --git a/libs/drape/metal/metal_base_context.mm b/libs/drape/metal/metal_base_context.mm
index 32bca956f..a15cf1bf0 100644
--- a/libs/drape/metal/metal_base_context.mm
+++ b/libs/drape/metal/metal_base_context.mm
@@ -130,12 +130,12 @@ void MetalBaseContext::PopDebugLabel()
   [m_currentCommandEncoder popDebugGroup];
 }
 
-void MetalBaseContext::Resize(int w, int h)
+void MetalBaseContext::Resize(uint32_t w, uint32_t h)
 {
   if (m_depthTexture && m_depthTexture->GetWidth() == w && m_depthTexture->GetHeight() == h)
     return;
 
-  RecreateDepthTexture(m2::PointU(w, h));
+  RecreateDepthTexture({w, h});
 }
 
 void MetalBaseContext::SetFramebuffer(ref_ptr<dp::BaseFramebuffer> framebuffer)
diff --git a/libs/drape/vulkan/vulkan_base_context.cpp b/libs/drape/vulkan/vulkan_base_context.cpp
index b40780b86..30c25564e 100644
--- a/libs/drape/vulkan/vulkan_base_context.cpp
+++ b/libs/drape/vulkan/vulkan_base_context.cpp
@@ -142,15 +142,15 @@ void VulkanBaseContext::SetRenderingQueue(VkQueue queue)
   m_queue = queue;
 }
 
-void VulkanBaseContext::Resize(int w, int h)
+void VulkanBaseContext::Resize(uint32_t w, uint32_t h)
 {
-  if (m_swapchain != VK_NULL_HANDLE && m_surfaceCapabilities.currentExtent.width == static_cast<uint32_t>(w) &&
-      m_surfaceCapabilities.currentExtent.height == static_cast<uint32_t>(h))
+  if (m_swapchain != VK_NULL_HANDLE && m_surfaceCapabilities.currentExtent.width == w &&
+      m_surfaceCapabilities.currentExtent.height == h)
   {
     return;
   }
-  m_surfaceCapabilities.currentExtent.width = static_cast<uint32_t>(w);
-  m_surfaceCapabilities.currentExtent.height = static_cast<uint32_t>(h);
+  m_surfaceCapabilities.currentExtent.width = w;
+  m_surfaceCapabilities.currentExtent.height = h;
   RecreateSwapchainAndDependencies();
 }
 
diff --git a/libs/drape/vulkan/vulkan_base_context.hpp b/libs/drape/vulkan/vulkan_base_context.hpp
index 783037026..1aa732c93 100644
--- a/libs/drape/vulkan/vulkan_base_context.hpp
+++ b/libs/drape/vulkan/vulkan_base_context.hpp
@@ -40,7 +40,7 @@ public:
   void CollectMemory() override;
   void DoneCurrent() override {}
   bool Validate() override { return true; }
-  void Resize(int w, int h) override;
+  void Resize(uint32_t w, uint32_t h) override;
   void SetFramebuffer(ref_ptr<dp::BaseFramebuffer> framebuffer) override;
   void ForgetFramebuffer(ref_ptr<dp::BaseFramebuffer> framebuffer) override;
   void ApplyFramebuffer(std::string const & framebufferLabel) override;
diff --git a/libs/drape/vulkan/vulkan_context_factory.cpp b/libs/drape/vulkan/vulkan_context_factory.cpp
index af55e1a13..36d9e4f24 100644
--- a/libs/drape/vulkan/vulkan_context_factory.cpp
+++ b/libs/drape/vulkan/vulkan_context_factory.cpp
@@ -50,7 +50,7 @@ public:
 
   void Present() override {}
 
-  void Resize(int w, int h) override {}
+  void Resize(uint32_t w, uint32_t h) override {}
   void SetFramebuffer(ref_ptr<dp::BaseFramebuffer> framebuffer) override {}
   void Init(dp::ApiVersion apiVersion) override { CHECK_EQUAL(apiVersion, dp::ApiVersion::Vulkan, ()); }
 
diff --git a/qt/qt_common/qtoglcontext.cpp b/qt/qt_common/qtoglcontext.cpp
index d56d9ab6d..f651725c3 100644
--- a/qt/qt_common/qtoglcontext.cpp
+++ b/qt/qt_common/qtoglcontext.cpp
@@ -53,17 +53,15 @@ void QtRenderOGLContext::SetFramebuffer(ref_ptr<dp::BaseFramebuffer> framebuffer
     m_backFrame->bind();
 }
 
-void QtRenderOGLContext::Resize(int w, int h)
+void QtRenderOGLContext::Resize(uint32_t w, uint32_t h)
 {
   CHECK(m_isContextAvailable, ());
-  CHECK_GREATER_OR_EQUAL(w, 0, ());
-  CHECK_GREATER_OR_EQUAL(h, 0, ());
 
   // This function can't be called inside BeginRendering - EndRendering.
-  std::lock_guard<std::mutex> lock(m_frameMutex);
+  std::lock_guard lock(m_frameMutex);
 
-  auto const nw = static_cast<int>(math::NextPowOf2(static_cast<uint32_t>(w)));
-  auto const nh = static_cast<int>(math::NextPowOf2(static_cast<uint32_t>(h)));
+  auto const nw = static_cast<int>(math::NextPowOf2(w));
+  auto const nh = static_cast<int>(math::NextPowOf2(h));
 
   if (nw <= m_width && nh <= m_height && m_backFrame != nullptr)
   {
@@ -86,7 +84,7 @@ bool QtRenderOGLContext::AcquireFrame()
   if (!m_isContextAvailable)
     return false;
 
-  std::lock_guard<std::mutex> lock(m_frameMutex);
+  std::lock_guard lock(m_frameMutex);
   // Render current acquired frame.
   if (!m_frameUpdated)
     return true;
diff --git a/qt/qt_common/qtoglcontext.hpp b/qt/qt_common/qtoglcontext.hpp
index 7249180a3..2431b68eb 100644
--- a/qt/qt_common/qtoglcontext.hpp
+++ b/qt/qt_common/qtoglcontext.hpp
@@ -24,7 +24,7 @@ public:
   void MakeCurrent() override;
   void DoneCurrent() override;
   void SetFramebuffer(ref_ptr<dp::BaseFramebuffer> framebuffer) override;
-  void Resize(int w, int h) override;
+  void Resize(uint32_t w, uint32_t h) override;
 
   bool AcquireFrame();
   GLuint GetTextureHandle() const;

From 2aaf37e9eeeb3ce4bf9ec0e0e578af2beacf9597 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Fri, 1 Aug 2025 13:33:12 +0200
Subject: [PATCH 154/302] C++ warning fixes

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 libs/drape/glyph_manager.cpp                  |  4 ++--
 libs/drape/harfbuzz_shaping.cpp               |  4 ++--
 libs/drape/mesh_object.cpp                    |  6 ++++--
 libs/drape/metal/metal_base_context.mm        | 19 +++++++++++--------
 libs/drape/vulkan/vulkan_mesh_object_impl.cpp |  5 +++--
 libs/drape_frontend/gui/ruler_helper.cpp      |  2 +-
 libs/drape_frontend/traffic_renderer.cpp      |  2 +-
 libs/drape_frontend/visual_params.cpp         |  2 +-
 libs/ge0/url_generator.cpp                    |  2 +-
 libs/geometry/screenbase.cpp                  |  4 ++--
 libs/indexer/scales.cpp                       |  4 ++--
 libs/platform/measurement_utils.cpp           |  6 +++---
 libs/platform/measurement_utils.hpp           |  2 +-
 libs/routing/turns_tts_text_i18n.cpp          |  2 +-
 libs/search/ranking_info.cpp                  |  5 -----
 15 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/libs/drape/glyph_manager.cpp b/libs/drape/glyph_manager.cpp
index c475677f9..e939a52b1 100644
--- a/libs/drape/glyph_manager.cpp
+++ b/libs/drape/glyph_manager.cpp
@@ -240,9 +240,9 @@ FreetypeError constexpr g_FT_Errors[] =
         auto const & currPos = glyphPos[i];
 
         auto const & metrics = m_fontFace->glyph->metrics;
-        auto const xOffset = (currPos.x_offset + static_cast<int32_t>(metrics.horiBearingX)) >> 6;
+        auto const xOffset = static_cast<int32_t>((currPos.x_offset + metrics.horiBearingX) >> 6);
         // The original Drape code expects a bottom, not a top offset in its calculations.
-        auto const yOffset = (currPos.y_offset + static_cast<int32_t>(metrics.horiBearingY) - metrics.height) >> 6;
+        auto const yOffset = static_cast<int32_t>((currPos.y_offset + metrics.horiBearingY - metrics.height) >> 6);
         int32_t const xAdvance = currPos.x_advance >> 6;
         // yAdvance is always zero for horizontal text layouts.
 
diff --git a/libs/drape/harfbuzz_shaping.cpp b/libs/drape/harfbuzz_shaping.cpp
index 153a8088c..b3211a52e 100644
--- a/libs/drape/harfbuzz_shaping.cpp
+++ b/libs/drape/harfbuzz_shaping.cpp
@@ -25,8 +25,8 @@ size_t GetScriptExtensions(char32_t codepoint, TScriptsArray & scripts)
 {
   // Fill scripts with the script extensions.
   UErrorCode icu_error = U_ZERO_ERROR;
-  size_t const count =
-      uscript_getScriptExtensions(static_cast<UChar32>(codepoint), scripts.data(), scripts.max_size(), &icu_error);
+  size_t const count = uscript_getScriptExtensions(static_cast<UChar32>(codepoint), scripts.data(),
+                                                   static_cast<int32_t>(scripts.max_size()), &icu_error);
   if (U_FAILURE(icu_error))
   {
     LOG(LWARNING, ("uscript_getScriptExtensions failed with error", icu_error));
diff --git a/libs/drape/mesh_object.cpp b/libs/drape/mesh_object.cpp
index 9211a0d43..554075b30 100644
--- a/libs/drape/mesh_object.cpp
+++ b/libs/drape/mesh_object.cpp
@@ -52,7 +52,8 @@ public:
       {
         m_indexBuffer = GLFunctions::glGenBuffer();
         GLFunctions::glBindBuffer(m_indexBuffer, gl_const::GLElementArrayBuffer);
-        GLFunctions::glBufferData(gl_const::GLElementArrayBuffer, m_mesh->m_indices.size() * sizeof(uint16_t),
+        GLFunctions::glBufferData(gl_const::GLElementArrayBuffer,
+                                  static_cast<uint32_t>(m_mesh->m_indices.size() * sizeof(uint16_t)),
                                   m_mesh->m_indices.data(), gl_const::GLStaticDraw);
       }
 
@@ -113,7 +114,8 @@ public:
     CHECK(!m_mesh->m_indices.empty(), ());
     CHECK(m_indexBuffer, ("Index buffer was not created"));
     GLFunctions::glBindBuffer(m_indexBuffer, gl_const::GLElementArrayBuffer);
-    GLFunctions::glBufferData(gl_const::GLElementArrayBuffer, m_mesh->m_indices.size() * sizeof(uint16_t),
+    GLFunctions::glBufferData(gl_const::GLElementArrayBuffer,
+                              static_cast<uint32_t>(m_mesh->m_indices.size() * sizeof(uint16_t)),
                               m_mesh->m_indices.data(), gl_const::GLStaticDraw);
     GLFunctions::glBindBuffer(0, gl_const::GLElementArrayBuffer);
   }
diff --git a/libs/drape/metal/metal_base_context.mm b/libs/drape/metal/metal_base_context.mm
index a15cf1bf0..e89bd97a3 100644
--- a/libs/drape/metal/metal_base_context.mm
+++ b/libs/drape/metal/metal_base_context.mm
@@ -259,8 +259,7 @@ void MetalBaseContext::Clear(uint32_t clearBits, uint32_t storeBits)
 void MetalBaseContext::SetViewport(uint32_t x, uint32_t y, uint32_t w, uint32_t h)
 {
   id<MTLRenderCommandEncoder> encoder = GetCommandEncoder();
-  [encoder setViewport:{static_cast<double>(x), static_cast<double>(y), static_cast<double>(w), static_cast<double>(h),
-                        0.0, 1.0}];
+  [encoder setViewport:MTLViewport(x, y, w, h, 0.0, 1.0)];
   [encoder setScissorRect:{x, y, w, h}];
 }
 
@@ -269,12 +268,16 @@ void MetalBaseContext::SetScissor(uint32_t x, uint32_t y, uint32_t w, uint32_t h
   id<MTLRenderCommandEncoder> encoder = GetCommandEncoder();
   if (m_renderPassDescriptor.colorAttachments[0].texture != nil)
   {
-    uint32_t const rpWidth = m_renderPassDescriptor.colorAttachments[0].texture.width;
-    uint32_t const rpHeight = m_renderPassDescriptor.colorAttachments[0].texture.height;
-    if (x < 0) x = 0;
-    if (y < 0) y = 0;
-    if (x + w > rpWidth) w = rpWidth - x;
-    if (y + h > rpHeight) h = rpHeight - y;
+    auto const rpWidth = static_cast<uint32_t>(m_renderPassDescriptor.colorAttachments[0].texture.width);
+    auto const rpHeight = static_cast<uint32_t>(m_renderPassDescriptor.colorAttachments[0].texture.height);
+    if (x < 0)
+      x = 0;
+    if (y < 0)
+      y = 0;
+    if (x + w > rpWidth)
+      w = rpWidth - x;
+    if (y + h > rpHeight)
+      h = rpHeight - y;
 
     [encoder setScissorRect:{x, y, w, h}];
   }
diff --git a/libs/drape/vulkan/vulkan_mesh_object_impl.cpp b/libs/drape/vulkan/vulkan_mesh_object_impl.cpp
index cd2955a88..c137d686e 100644
--- a/libs/drape/vulkan/vulkan_mesh_object_impl.cpp
+++ b/libs/drape/vulkan/vulkan_mesh_object_impl.cpp
@@ -110,7 +110,7 @@ public:
   void UpdateIndexBuffer(ref_ptr<dp::GraphicsContext> context) override
   {
     CHECK(!m_mesh->m_indices.empty(), ());
-    auto const sizeInBytes = m_mesh->m_indices.size() * sizeof(uint16_t);
+    auto const sizeInBytes = static_cast<uint32_t>(m_mesh->m_indices.size() * sizeof(uint16_t));
     CHECK(m_indexBuffer.m_buffer != VK_NULL_HANDLE, ());
 
     UpdateBufferInternal(context, m_indexBuffer.m_buffer, VK_ACCESS_INDEX_READ_BIT, m_mesh->m_indices.data(),
@@ -169,7 +169,8 @@ private:
       buffers.emplace_back(m_geometryBuffers[i].m_buffer);
       offsets.emplace_back(0);
     }
-    vkCmdBindVertexBuffers(commandBuffer, 0, m_geometryBuffers.size(), buffers.data(), offsets.data());
+    vkCmdBindVertexBuffers(commandBuffer, 0, static_cast<uint32_t>(m_geometryBuffers.size()), buffers.data(),
+                           offsets.data());
   }
 
   void UpdateBufferInternal(ref_ptr<dp::GraphicsContext> context, VkBuffer buffer, VkAccessFlagBits bufferAccessMask,
diff --git a/libs/drape_frontend/gui/ruler_helper.cpp b/libs/drape_frontend/gui/ruler_helper.cpp
index a4235fb76..a5c515a41 100644
--- a/libs/drape_frontend/gui/ruler_helper.cpp
+++ b/libs/drape_frontend/gui/ruler_helper.cpp
@@ -72,7 +72,7 @@ RulerHelper::RulerHelper()
 void RulerHelper::Update(ScreenBase const & screen)
 {
   m2::PointD pivot = screen.PixelRect().Center();
-  int const minPxWidth = std::lround(kMinPixelWidth * df::VisualParams::Instance().GetVisualScale());
+  long const minPxWidth = std::lround(kMinPixelWidth * df::VisualParams::Instance().GetVisualScale());
   m2::PointD pt1 = screen.PtoG(pivot);
   m2::PointD pt0 = screen.PtoG(pivot - m2::PointD(minPxWidth, 0));
 
diff --git a/libs/drape_frontend/traffic_renderer.cpp b/libs/drape_frontend/traffic_renderer.cpp
index 4fb566921..40edb4e8b 100644
--- a/libs/drape_frontend/traffic_renderer.cpp
+++ b/libs/drape_frontend/traffic_renderer.cpp
@@ -306,7 +306,7 @@ bool TrafficRenderer::CanBeRenderedAsLine(RoadClass const & roadClass, int zoomL
   if (it == lineDrawerEnd)
     return false;
 
-  width = std::max(1l, std::lround(TrafficRenderer::GetPixelWidthInternal(roadClass, zoomLevel)));
+  width = std::max(1, static_cast<int>(std::lround(TrafficRenderer::GetPixelWidthInternal(roadClass, zoomLevel))));
   return width <= dp::SupportManager::Instance().GetMaxLineWidth();
 }
 }  // namespace df
diff --git a/libs/drape_frontend/visual_params.cpp b/libs/drape_frontend/visual_params.cpp
index 2c00cb2bc..250c795d8 100644
--- a/libs/drape_frontend/visual_params.cpp
+++ b/libs/drape_frontend/visual_params.cpp
@@ -180,7 +180,7 @@ int GetTileScaleBase(m2::RectD const & r)
 {
   double const sz = std::max(r.SizeX(), r.SizeY());
   ASSERT_GREATER(sz, 0., ("Rect should not be a point:", r));
-  return std::max(1l, std::lround(std::log2(mercator::Bounds::kRangeX / sz)));
+  return std::max(1, static_cast<int>(std::lround(std::log2(mercator::Bounds::kRangeX / sz))));
 }
 
 double GetTileScaleBase(double drawScale)
diff --git a/libs/ge0/url_generator.cpp b/libs/ge0/url_generator.cpp
index c2e1d31f9..52e8d6de2 100644
--- a/libs/ge0/url_generator.cpp
+++ b/libs/ge0/url_generator.cpp
@@ -158,7 +158,7 @@ int LatToInt(double lat, int maxValue)
   //       000111111222222...LLLLLMMMM
 
   double const x = (lat + 90.0) / 180.0 * maxValue;
-  return x < 0 ? 0 : (x > maxValue ? maxValue : std::lround(x));
+  return x < 0 ? 0 : (x > maxValue ? maxValue : static_cast<int>(std::lround(x)));
 }
 
 // Make lon in [-180, 180)
diff --git a/libs/geometry/screenbase.cpp b/libs/geometry/screenbase.cpp
index a9db15944..d5b6673a6 100644
--- a/libs/geometry/screenbase.cpp
+++ b/libs/geometry/screenbase.cpp
@@ -230,12 +230,12 @@ void ScreenBase::SetAngle(double angle)
 
 int ScreenBase::GetWidth() const
 {
-  return std::lround(m_PixelRect.SizeX());
+  return static_cast<int>(std::lround(m_PixelRect.SizeX()));
 }
 
 int ScreenBase::GetHeight() const
 {
-  return std::lround(m_PixelRect.SizeY());
+  return static_cast<int>(std::lround(m_PixelRect.SizeY()));
 }
 
 ScreenBase::MatrixT ScreenBase::CalcTransform(m2::PointD const & oldPt1, m2::PointD const & oldPt2,
diff --git a/libs/indexer/scales.cpp b/libs/indexer/scales.cpp
index 9c89c69a7..25bcbb4e9 100644
--- a/libs/indexer/scales.cpp
+++ b/libs/indexer/scales.cpp
@@ -33,12 +33,12 @@ double GetScaleLevelD(m2::RectD const & r)
 
 int GetScaleLevel(double ratio)
 {
-  return std::lround(GetScaleLevelD(ratio));
+  return static_cast<int>(std::lround(GetScaleLevelD(ratio)));
 }
 
 int GetScaleLevel(m2::RectD const & r)
 {
-  return std::lround(GetScaleLevelD(r));
+  return static_cast<int>(std::lround(GetScaleLevelD(r)));
 }
 
 namespace
diff --git a/libs/platform/measurement_utils.cpp b/libs/platform/measurement_utils.cpp
index 94000e157..f0b1474ee 100644
--- a/libs/platform/measurement_utils.cpp
+++ b/libs/platform/measurement_utils.cpp
@@ -198,7 +198,7 @@ double MpsToUnits(double metersPerSecond, Units units)
   UNREACHABLE();
 }
 
-int FormatSpeed(double metersPerSecond, Units units)
+long FormatSpeed(double metersPerSecond, Units units)
 {
   return std::lround(MpsToUnits(metersPerSecond, units));
 }
@@ -214,8 +214,8 @@ std::string FormatOsmLink(double lat, double lon, int zoom)
 
   // Same as (lon + 180) / 360 * 1UL << 32, but without warnings.
   double constexpr factor = (1 << 30) / 90.0;
-  uint32_t const x = std::lround((lon + 180.0) * factor);
-  uint32_t const y = std::lround((lat + 90.0) * factor * 2.0);
+  auto const x = static_cast<uint32_t>(std::lround((lon + 180.0) * factor));
+  auto const y = static_cast<uint32_t>(std::lround((lat + 90.0) * factor * 2.0));
   uint64_t const code = bits::BitwiseMerge(y, x);
   std::string osmUrl = "https://osm.org/go/";
 
diff --git a/libs/platform/measurement_utils.hpp b/libs/platform/measurement_utils.hpp
index 6c512df46..9334ae6b3 100644
--- a/libs/platform/measurement_utils.hpp
+++ b/libs/platform/measurement_utils.hpp
@@ -70,7 +70,7 @@ double ToSpeedKmPH(double speed, Units units);
 double MpsToUnits(double metersPerSecond, Units units);
 
 /// @return Speed value in km/h for Metric and in mph for Imperial.
-int FormatSpeed(double metersPerSecond, Units units);
+long FormatSpeed(double metersPerSecond, Units units);
 /// @return Speed value string (without suffix) in km/h for Metric and in mph for Imperial.
 std::string FormatSpeedNumeric(double metersPerSecond, Units units);
 
diff --git a/libs/routing/turns_tts_text_i18n.cpp b/libs/routing/turns_tts_text_i18n.cpp
index cf4966e16..e5ec839f2 100644
--- a/libs/routing/turns_tts_text_i18n.cpp
+++ b/libs/routing/turns_tts_text_i18n.cpp
@@ -35,7 +35,7 @@ bool EndsInAcronymOrNum(strings::UniString const & myUniStr)
 
   bool allUppercaseNum = true;
   strings::UniString lowerStr = strings::MakeLowerCase(myUniStr);
-  for (int i = myUniStr.size() - 1; i > 0; i--)
+  for (long i = myUniStr.size() - 1; i > 0; i--)
   {
     // if we've reached a space, we're done here
     if (myUniStr[i] == ' ')
diff --git a/libs/search/ranking_info.cpp b/libs/search/ranking_info.cpp
index 60492cbc0..e8c75f6fc 100644
--- a/libs/search/ranking_info.cpp
+++ b/libs/search/ranking_info.cpp
@@ -29,11 +29,6 @@ double constexpr kCategoriesFalseCats = -1.0000000;
 double constexpr kDistanceToPivot = -0.48;
 double constexpr kWalkingDistanceM = 5000.0;
 
-double constexpr AbsPenaltyPerKm()
-{
-  return -kDistanceToPivot * 1000.0 / RankingInfo::kMaxDistMeters;
-}
-
 // These constants are very important and checked in Famous_Cities_Rank test.
 double constexpr kRank = 0.23;
 double constexpr kPopularity = 0.42;

From 778152826322ade3089b0fe030703b6de0e2fd14 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Fri, 1 Aug 2025 20:14:17 +0200
Subject: [PATCH 155/302] Fixed C++20 deprecation warning for
 std::rel_ops::operator<=

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 libs/base/buffer_vector.hpp            | 11 +++++++++++
 libs/indexer/succinct_trie_builder.hpp |  2 +-
 libs/indexer/trie_builder.hpp          |  1 -
 libs/search/search_index_values.hpp    |  4 +---
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/libs/base/buffer_vector.hpp b/libs/base/buffer_vector.hpp
index 5eb864a82..556012a83 100644
--- a/libs/base/buffer_vector.hpp
+++ b/libs/base/buffer_vector.hpp
@@ -451,6 +451,17 @@ bool operator>(buffer_vector<T, N1> const & v1, buffer_vector<T, N2> const & v2)
 {
   return v2 < v1;
 }
+// TODO(AB): Use <=> operator.
+// Used in:
+// TrieChar const * const keyData = entry.GetKeyData();
+// TTrieString key(keyData, keyData + entry.GetKeySize());
+// using namespace std::rel_ops;  // ">=" for keys.
+// CHECK_GREATER_OR_EQUAL(key, prevKey, (key, prevKey));
+template <typename T, size_t N1, size_t N2>
+bool operator>=(buffer_vector<T, N1> const & v1, buffer_vector<T, N2> const & v2)
+{
+  return !(v1 < v2);
+}
 
 namespace std
 {
diff --git a/libs/indexer/succinct_trie_builder.hpp b/libs/indexer/succinct_trie_builder.hpp
index 94dba6820..f068e2896 100644
--- a/libs/indexer/succinct_trie_builder.hpp
+++ b/libs/indexer/succinct_trie_builder.hpp
@@ -115,7 +115,7 @@ void BuildSuccinctTrie(TWriter & writer, TIter const beg, TIter const end)
       continue;
     TrieChar const * const keyData = entry.GetKeyData();
     TTrieString key(keyData, keyData + entry.GetKeySize());
-    using namespace std::rel_ops;  // ">=" for keys.
+
     CHECK_GREATER_OR_EQUAL(key, prevKey, (key, prevKey));
     entries.push_back(entry);
     entryStrings.push_back(strings::UniString(keyData, keyData + entry.GetKeySize()));
diff --git a/libs/indexer/trie_builder.hpp b/libs/indexer/trie_builder.hpp
index bd3e1c275..8ea33c666 100644
--- a/libs/indexer/trie_builder.hpp
+++ b/libs/indexer/trie_builder.hpp
@@ -214,7 +214,6 @@ void AppendValue(NodeInfo & node, Value const & value)
   // order so the values are supposed to be accumulated in the
   // sorted order and we can avoid sorting them before doing
   // further operations such as ValueList construction.
-  using namespace std::rel_ops;
   ASSERT(node.m_temporaryValueList.empty() || node.m_temporaryValueList.back() <= value,
          (node.m_temporaryValueList.size()));
   if (!node.m_temporaryValueList.empty() && node.m_temporaryValueList.back() == value)
diff --git a/libs/search/search_index_values.hpp b/libs/search/search_index_values.hpp
index c4f8ef709..340224c11 100644
--- a/libs/search/search_index_values.hpp
+++ b/libs/search/search_index_values.hpp
@@ -23,9 +23,7 @@ struct Uint64IndexValue
 
   explicit Uint64IndexValue(uint64_t featureId) : m_featureId(featureId) {}
 
-  bool operator<(Uint64IndexValue const & o) const { return m_featureId < o.m_featureId; }
-
-  bool operator==(Uint64IndexValue const & o) const { return m_featureId == o.m_featureId; }
+  auto operator<=>(Uint64IndexValue const &) const = default;
 
   void Swap(Uint64IndexValue & o) { std::swap(m_featureId, o.m_featureId); }
 

From 836c39ff646caf989aa1d0746452343a9b053af2 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Thu, 14 Aug 2025 22:54:56 +0300
Subject: [PATCH 156/302] math::iround

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 libs/base/base_tests/math_test.cpp           | 16 ++++++++++++++++
 libs/base/math.hpp                           |  8 ++++++++
 libs/drape_frontend/traffic_renderer.cpp     |  3 ++-
 libs/drape_frontend/visual_params.cpp        |  6 +++---
 libs/ge0/url_generator.cpp                   |  4 ++--
 libs/geometry/geometry_tests/screen_test.cpp | 12 +++++-------
 libs/geometry/screenbase.cpp                 |  7 +++----
 libs/indexer/scales.cpp                      |  6 +++---
 8 files changed, 42 insertions(+), 20 deletions(-)

diff --git a/libs/base/base_tests/math_test.cpp b/libs/base/base_tests/math_test.cpp
index 469140754..5ec026816 100644
--- a/libs/base/base_tests/math_test.cpp
+++ b/libs/base/base_tests/math_test.cpp
@@ -209,4 +209,20 @@ UNIT_TEST(is_finite)
   TEST(is_finite(DBL_MIN / 2.0), ("As in cppreference example"));
 }
 
+UNIT_TEST(iround)
+{
+  TEST_EQUAL(iround(0.0), 0, ());
+  TEST_EQUAL(iround(1.0), 1, ());
+  TEST_EQUAL(iround(1.5), 2, ());
+  TEST_EQUAL(iround(-1.5), -2, ());
+  TEST_EQUAL(iround(2.5), 3, ());
+  TEST_EQUAL(iround(-2.5), -3, ());
+
+  TEST_EQUAL(iround(2.5f), 3, ());
+  TEST_EQUAL(iround(-2.5f), -3, ());
+
+  TEST_EQUAL(iround(double(std::numeric_limits<int>::max()) - 0.5), std::numeric_limits<int>::max(), ());
+  TEST_EQUAL(iround(double(std::numeric_limits<int>::min()) + 0.5), std::numeric_limits<int>::min(), ());
+}
+
 }  // namespace math_test
diff --git a/libs/base/math.hpp b/libs/base/math.hpp
index b813a5089..937c36217 100644
--- a/libs/base/math.hpp
+++ b/libs/base/math.hpp
@@ -1,9 +1,11 @@
 #pragma once
 
 #include "base/assert.hpp"
+#include "base/checked_cast.hpp"
 
 #include <algorithm>  // std::max
 #include <cmath>
+#include <concepts>
 #include <functional>  // std::hash
 #include <type_traits>
 
@@ -18,6 +20,12 @@ double Nan();
 double Infinity();
 bool is_finite(double d);
 
+template <std::floating_point T>
+int iround(T x)
+{
+  return base::checked_cast<int>(std::lround(x));
+}
+
 template <typename T>
 T Abs(T x)
 {
diff --git a/libs/drape_frontend/traffic_renderer.cpp b/libs/drape_frontend/traffic_renderer.cpp
index 40edb4e8b..594c5d861 100644
--- a/libs/drape_frontend/traffic_renderer.cpp
+++ b/libs/drape_frontend/traffic_renderer.cpp
@@ -12,6 +12,7 @@
 #include "indexer/scales.hpp"
 
 #include "base/logging.hpp"
+#include "base/math.hpp"
 
 #include <algorithm>
 #include <array>
@@ -306,7 +307,7 @@ bool TrafficRenderer::CanBeRenderedAsLine(RoadClass const & roadClass, int zoomL
   if (it == lineDrawerEnd)
     return false;
 
-  width = std::max(1, static_cast<int>(std::lround(TrafficRenderer::GetPixelWidthInternal(roadClass, zoomLevel))));
+  width = std::max(1, math::iround(TrafficRenderer::GetPixelWidthInternal(roadClass, zoomLevel)));
   return width <= dp::SupportManager::Instance().GetMaxLineWidth();
 }
 }  // namespace df
diff --git a/libs/drape_frontend/visual_params.cpp b/libs/drape_frontend/visual_params.cpp
index 250c795d8..9182520d7 100644
--- a/libs/drape_frontend/visual_params.cpp
+++ b/libs/drape_frontend/visual_params.cpp
@@ -180,7 +180,7 @@ int GetTileScaleBase(m2::RectD const & r)
 {
   double const sz = std::max(r.SizeX(), r.SizeY());
   ASSERT_GREATER(sz, 0., ("Rect should not be a point:", r));
-  return std::max(1, static_cast<int>(std::lround(std::log2(mercator::Bounds::kRangeX / sz))));
+  return std::max(1, math::iround(std::log2(mercator::Bounds::kRangeX / sz)));
 }
 
 double GetTileScaleBase(double drawScale)
@@ -218,12 +218,12 @@ m2::RectD GetRectForDrawScale(int drawScale, m2::PointD const & center)
 
 m2::RectD GetRectForDrawScale(double drawScale, m2::PointD const & center, uint32_t tileSize, double visualScale)
 {
-  return GetRectForDrawScale(static_cast<int>(std::lround(drawScale)), center, tileSize, visualScale);
+  return GetRectForDrawScale(math::iround(drawScale), center, tileSize, visualScale);
 }
 
 m2::RectD GetRectForDrawScale(double drawScale, m2::PointD const & center)
 {
-  return GetRectForDrawScale(static_cast<int>(std::lround(drawScale)), center);
+  return GetRectForDrawScale(math::iround(drawScale), center);
 }
 
 uint32_t CalculateTileSize(uint32_t screenWidth, uint32_t screenHeight)
diff --git a/libs/ge0/url_generator.cpp b/libs/ge0/url_generator.cpp
index 52e8d6de2..76c6a39ae 100644
--- a/libs/ge0/url_generator.cpp
+++ b/libs/ge0/url_generator.cpp
@@ -1,9 +1,9 @@
 #include "ge0/url_generator.hpp"
 
 #include "base/assert.hpp"
+#include "base/math.hpp"
 #include "coding/url.hpp"
 
-#include <cmath>
 #include <iomanip>
 #include <sstream>
 
@@ -158,7 +158,7 @@ int LatToInt(double lat, int maxValue)
   //       000111111222222...LLLLLMMMM
 
   double const x = (lat + 90.0) / 180.0 * maxValue;
-  return x < 0 ? 0 : (x > maxValue ? maxValue : static_cast<int>(std::lround(x)));
+  return x < 0 ? 0 : (x > maxValue ? maxValue : math::iround(x));
 }
 
 // Make lon in [-180, 180)
diff --git a/libs/geometry/geometry_tests/screen_test.cpp b/libs/geometry/geometry_tests/screen_test.cpp
index 977c8f2a1..af7cfa5ee 100644
--- a/libs/geometry/geometry_tests/screen_test.cpp
+++ b/libs/geometry/geometry_tests/screen_test.cpp
@@ -1,12 +1,10 @@
 #include "geometry/geometry_tests/equality.hpp"
 
+#include "base/math.hpp"
 #include "geometry/screenbase.hpp"
 #include "geometry/transformations.hpp"
-
 #include "testing/testing.hpp"
 
-#include <cmath>
-
 namespace screen_test
 {
 using test::is_equal;
@@ -23,10 +21,10 @@ static void check_set_from_rect(ScreenBase & screen, int width, int height)
   b2 = screen.GtoP(b2);
 
   // check that we are in boundaries.
-  TEST(math::Between(0, width, static_cast<int>(std::lround(b1.x))), ());
-  TEST(math::Between(0, width, static_cast<int>(std::lround(b2.x))), ());
-  TEST(math::Between(0, height, static_cast<int>(std::lround(b1.y))), ());
-  TEST(math::Between(0, height, static_cast<int>(std::lround(b2.y))), ());
+  TEST(math::Between(0, width, math::iround(b1.x)), ());
+  TEST(math::Between(0, width, math::iround(b2.x)), ());
+  TEST(math::Between(0, height, math::iround(b1.y)), ());
+  TEST(math::Between(0, height, math::iround(b2.y)), ());
 }
 
 UNIT_TEST(ScreenBase_P2G2P)
diff --git a/libs/geometry/screenbase.cpp b/libs/geometry/screenbase.cpp
index d5b6673a6..6c5235ec5 100644
--- a/libs/geometry/screenbase.cpp
+++ b/libs/geometry/screenbase.cpp
@@ -3,8 +3,7 @@
 #include "geometry/transformations.hpp"
 
 #include "base/assert.hpp"
-
-#include <cmath>
+#include "base/math.hpp"
 
 double constexpr kPerspectiveAngleFOV = math::pi / 3.0;
 double constexpr kMaxPerspectiveAngle1 = math::pi4;
@@ -230,12 +229,12 @@ void ScreenBase::SetAngle(double angle)
 
 int ScreenBase::GetWidth() const
 {
-  return static_cast<int>(std::lround(m_PixelRect.SizeX()));
+  return math::iround(m_PixelRect.SizeX());
 }
 
 int ScreenBase::GetHeight() const
 {
-  return static_cast<int>(std::lround(m_PixelRect.SizeY()));
+  return math::iround(m_PixelRect.SizeY());
 }
 
 ScreenBase::MatrixT ScreenBase::CalcTransform(m2::PointD const & oldPt1, m2::PointD const & oldPt2,
diff --git a/libs/indexer/scales.cpp b/libs/indexer/scales.cpp
index 25bcbb4e9..78a39737b 100644
--- a/libs/indexer/scales.cpp
+++ b/libs/indexer/scales.cpp
@@ -1,10 +1,10 @@
 #include "indexer/scales.hpp"
 
+#include "base/math.hpp"
 #include "geometry/mercator.hpp"
 #include "indexer/feature_algo.hpp"
 
 #include <algorithm>
-#include <cmath>
 
 namespace scales
 {
@@ -33,12 +33,12 @@ double GetScaleLevelD(m2::RectD const & r)
 
 int GetScaleLevel(double ratio)
 {
-  return static_cast<int>(std::lround(GetScaleLevelD(ratio)));
+  return math::iround(GetScaleLevelD(ratio));
 }
 
 int GetScaleLevel(m2::RectD const & r)
 {
-  return static_cast<int>(std::lround(GetScaleLevelD(r)));
+  return math::iround(GetScaleLevelD(r));
 }
 
 namespace

From 1a6bbd756a678aa6225a834d1ffff6aca94375aa Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Sun, 17 Aug 2025 09:52:36 -0300
Subject: [PATCH 157/302] [routing] Simplify notifications on roundabout.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 .../routing_tests/turns_sound_test.cpp        |  5 ++--
 libs/routing/turns_notification_manager.cpp   | 24 ++++++++++---------
 libs/routing/turns_sound_settings.hpp         | 20 ----------------
 3 files changed, 16 insertions(+), 33 deletions(-)

diff --git a/libs/routing/routing_tests/turns_sound_test.cpp b/libs/routing/routing_tests/turns_sound_test.cpp
index 7c80ad212..12ecfc314 100644
--- a/libs/routing/routing_tests/turns_sound_test.cpp
+++ b/libs/routing/routing_tests/turns_sound_test.cpp
@@ -487,10 +487,11 @@ UNIT_TEST(TurnsSound_RoundaboutTurnTest)
   // 620 meters till the 4th turn.
   vector<TurnItemDist> const turns9 = {
       {{25 /* idx */, CarDirection::EnterRoundAbout, 4 /* m_exitNum */}, 620. /* m_distMeters */},
-      {{30 /* idx */, CarDirection::LeaveRoundAbout, 4 /* m_exitNum */}, 665. /* m_distMeters */}};
+      {{30 /* idx */, CarDirection::LeaveRoundAbout, 4 /* m_exitNum */}, 1000. /* m_distMeters */}};
   vector<string> const expectedNotification9 = {{"In 600 meters. Enter the roundabout."},
                                                 {"Then. Take the fourth exit."}};
-  notificationManager.GenerateTurnNotifications(turns9, turnNotifications);
+  notificationManager.GenerateTurnNotifications(turns9, turnNotifications,
+                                                routing::RouteSegment::RoadNameInfo("Main street"));
   TEST_EQUAL(turnNotifications, expectedNotification9, ());
   TEST_EQUAL(notificationManager.GetSecondTurnNotification(), CarDirection::LeaveRoundAbout, ());
 }
diff --git a/libs/routing/turns_notification_manager.cpp b/libs/routing/turns_notification_manager.cpp
index 97a8e7234..a7e785234 100644
--- a/libs/routing/turns_notification_manager.cpp
+++ b/libs/routing/turns_notification_manager.cpp
@@ -75,15 +75,15 @@ std::string NotificationManager::GenerateTurnText(uint32_t distanceUnits, uint8_
 {
   auto const lengthUnits = m_settings.GetLengthUnits();
 
-  if (turn.m_turn != CarDirection::None && turn.m_turn != CarDirection::EnterRoundAbout)
-    return m_getTtsText.GetTurnNotification(
-        {distanceUnits, exitNum, useThenInsteadOfDistance, turn.m_turn, lengthUnits, nextStreetInfo});
-  else if (turn.m_turn == CarDirection::EnterRoundAbout)  // Don't include roundabout street name in TTS
-    return m_getTtsText.GetTurnNotification(
-        {distanceUnits, exitNum, useThenInsteadOfDistance, turn.m_turn, lengthUnits});
+  Notification notif{distanceUnits, exitNum, useThenInsteadOfDistance, turn.m_turn, lengthUnits};
+  if (turn.m_turn == CarDirection::None)
+    notif.m_turnDirPedestrian = turn.m_pedestrianTurn;
 
-  return m_getTtsText.GetTurnNotification(
-      {distanceUnits, exitNum, useThenInsteadOfDistance, turn.m_pedestrianTurn, lengthUnits, nextStreetInfo});
+  // https://github.com/organicmaps/organicmaps/issues/6146
+  if (turn.m_turn != CarDirection::EnterRoundAbout)
+    notif.m_nextStreetInfo = nextStreetInfo;
+
+  return m_getTtsText.GetTurnNotification(notif);
 }
 
 std::string NotificationManager::GenerateRecalculatingText() const
@@ -129,12 +129,14 @@ void NotificationManager::GenerateTurnNotifications(std::vector<TurnItemDist> co
 
   double distBetweenTurnsMeters = secondTurn.m_distMeters - firstTurn.m_distMeters;
   ASSERT_GREATER_OR_EQUAL(distBetweenTurnsMeters, 0, ());
-  if (distBetweenTurnsMeters > kSecondTurnThresholdDistM && !IsClassicEntranceToRoundabout(firstTurn, secondTurn))
+  bool const isRoundabout = IsClassicEntranceToRoundabout(firstTurn, secondTurn);
+  if (!isRoundabout && distBetweenTurnsMeters > kSecondTurnThresholdDistM)
     return;
 
-  if ((distBetweenTurnsMeters < kDistanceNotifyThresholdM) || IsClassicEntranceToRoundabout(firstTurn, secondTurn))
+  if (distBetweenTurnsMeters < kDistanceNotifyThresholdM ||
+      (isRoundabout && distBetweenTurnsMeters < kSecondTurnThresholdDistM))
   {
-    // distanceUnits is not used because "Then" is used
+    // Don't pronounce distance because of immediate "Then".
     distBetweenTurnsMeters = 0;
   }
 
diff --git a/libs/routing/turns_sound_settings.hpp b/libs/routing/turns_sound_settings.hpp
index b08d7ec53..68dbd13ca 100644
--- a/libs/routing/turns_sound_settings.hpp
+++ b/libs/routing/turns_sound_settings.hpp
@@ -167,26 +167,6 @@ struct Notification
     , m_lengthUnits(lengthUnits)
   {}
 
-  Notification(uint32_t distanceUnits, uint8_t exitNum, bool useThenInsteadOfDistance,
-               PedestrianDirection turnDirPedestrian, measurement_utils::Units lengthUnits,
-               RouteSegment::RoadNameInfo const & nextStreetInfo)
-    : m_distanceUnits(distanceUnits)
-    , m_exitNum(exitNum)
-    , m_useThenInsteadOfDistance(useThenInsteadOfDistance)
-    , m_turnDirPedestrian(turnDirPedestrian)
-    , m_lengthUnits(lengthUnits)
-    , m_nextStreetInfo(nextStreetInfo)
-  {}
-
-  Notification(uint32_t distanceUnits, uint8_t exitNum, bool useThenInsteadOfDistance,
-               PedestrianDirection turnDirPedestrian, measurement_utils::Units lengthUnits)
-    : m_distanceUnits(distanceUnits)
-    , m_exitNum(exitNum)
-    , m_useThenInsteadOfDistance(useThenInsteadOfDistance)
-    , m_turnDirPedestrian(turnDirPedestrian)
-    , m_lengthUnits(lengthUnits)
-  {}
-
   bool operator==(Notification const & rhv) const
   {
     return m_distanceUnits == rhv.m_distanceUnits && m_exitNum == rhv.m_exitNum &&

From 1b04524d6813147563d265490a46faab536838e8 Mon Sep 17 00:00:00 2001
From: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>
Date: Sun, 17 Aug 2025 23:24:51 +0200
Subject: [PATCH 158/302] [routing] Log all turn notifications TTS

Signed-off-by: David Martinez <47610359+dvdmrtnz@users.noreply.github.com>
---
 libs/routing/turns_notification_manager.cpp | 5 +++++
 libs/routing/turns_tts_text.cpp             | 4 +---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/libs/routing/turns_notification_manager.cpp b/libs/routing/turns_notification_manager.cpp
index a7e785234..d5551b1a6 100644
--- a/libs/routing/turns_notification_manager.cpp
+++ b/libs/routing/turns_notification_manager.cpp
@@ -147,6 +147,11 @@ void NotificationManager::GenerateTurnNotifications(std::vector<TurnItemDist> co
     return;
   turnNotifications.emplace_back(std::move(secondNotification));
 
+  // Log turn notifications TTS
+  if (!turnNotifications.empty())
+    for (auto const & notification : turnNotifications)
+      LOG(LINFO, ("TTS:", notification));
+
   // Turn notification with word "Then" (about the second turn) will be pronounced.
   // When this second turn become the first one the first notification about the turn
   // shall be skipped.
diff --git a/libs/routing/turns_tts_text.cpp b/libs/routing/turns_tts_text.cpp
index 04f05509b..e8bbb004b 100644
--- a/libs/routing/turns_tts_text.cpp
+++ b/libs/routing/turns_tts_text.cpp
@@ -229,8 +229,6 @@ std::string GetTtsText::GetTurnNotification(Notification const & notification) c
     // trim leading spaces
     strings::Trim(cleanOut);
 
-    LOG(LINFO, ("TTSn", thenStr + cleanOut));
-
     return thenStr + cleanOut;
   }
 
@@ -247,7 +245,7 @@ std::string GetTtsText::GetTurnNotification(Notification const & notification) c
   {
     out = thenStr + dirStr;
   }
-  LOG(LINFO, ("TTS", out));
+
   return out;
 }
 

From 6cccd3216665d3863c126b656f3a184c4d894016 Mon Sep 17 00:00:00 2001
From: Kiryl Kaveryn <kirylkaveryn@gmail.com>
Date: Tue, 19 Aug 2025 14:27:16 +0400
Subject: [PATCH 159/302] [ios] Fix place page memory leaks

Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
---
 .../ElevationProfilePresenter.swift           |  7 +--
 iphone/Maps/UI/PlacePage/PlacePage.storyboard |  8 ++--
 .../Layouts/PlacePageCommonLayout.swift       | 47 +++++++++----------
 .../Layouts/PlacePageTrackLayout.swift        | 12 ++---
 .../PlacePageTrackRecordingLayout.swift       | 16 +++----
 .../PlacePage/PlacePageViewController.swift   | 15 ++++--
 6 files changed, 55 insertions(+), 50 deletions(-)

diff --git a/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfilePresenter.swift b/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfilePresenter.swift
index f705307c8..ae74fdf48 100644
--- a/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfilePresenter.swift
+++ b/iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfilePresenter.swift
@@ -26,8 +26,8 @@ fileprivate struct DescriptionsViewModel {
 
 final class ElevationProfilePresenter: NSObject {
   private weak var view: ElevationProfileViewProtocol?
-  private var trackData: PlacePageTrackData
-  private let delegate: ElevationProfileViewControllerDelegate?
+  private weak var trackData: PlacePageTrackData?
+  private weak var delegate: ElevationProfileViewControllerDelegate?
   private let bookmarkManager: BookmarksManager = .shared()
 
   private let cellSpacing: CGFloat = 8
@@ -85,7 +85,8 @@ extension ElevationProfilePresenter: ElevationProfilePresenterProtocol {
     view?.isChartViewHidden = false
 
     let kMinPointsToDraw = 2
-    guard let profileData = trackData.elevationProfileData,
+    guard let trackData = trackData,
+          let profileData = trackData.elevationProfileData,
           let chartData,
           chartData.points.count >= kMinPointsToDraw else {
       view?.userInteractionEnabled = false
diff --git a/iphone/Maps/UI/PlacePage/PlacePage.storyboard b/iphone/Maps/UI/PlacePage/PlacePage.storyboard
index d82778b6e..fb1963bfe 100644
--- a/iphone/Maps/UI/PlacePage/PlacePage.storyboard
+++ b/iphone/Maps/UI/PlacePage/PlacePage.storyboard
@@ -1270,7 +1270,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="72"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="spW-XI-KSY" customClass="PlacePageHeaderView" customModule="CoMaps" customModuleProvider="target">
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="spW-XI-KSY">
                                 <rect key="frame" x="0.0" y="62" width="375" height="10"/>
                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <constraints>
@@ -1280,7 +1280,7 @@
                                     <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="PPNavigationShadowView"/>
                                 </userDefinedRuntimeAttributes>
                             </view>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fqh-H3-eji" customClass="PlacePageHeaderView" customModule="CoMaps" customModuleProvider="target">
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fqh-H3-eji">
                                 <rect key="frame" x="0.0" y="20" width="375" height="52"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Gdy-g5-gbM">
@@ -1405,13 +1405,13 @@
         <image name="ic_arrow_gray_down" width="28" height="28"/>
         <image name="ic_placepage_open_hours" width="28" height="28"/>
         <systemColor name="separatorColor">
-            <color red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.28999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.28999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
         <systemColor name="systemRedColor">
-            <color red="1" green="0.23137254900000001" blue="0.18823529410000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="1" green="0.23137254901960785" blue="0.18823529411764706" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
     </resources>
 </document>
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageCommonLayout.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageCommonLayout.swift
index b9f72bb55..151ba5054 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageCommonLayout.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageCommonLayout.swift
@@ -1,81 +1,81 @@
 class PlacePageCommonLayout: NSObject, IPlacePageLayout {
-  
+
   private let distanceFormatter = DistanceFormatter.self
   private let altitudeFormatter = AltitudeFormatter.self
 
   private var placePageData: PlacePageData
   private var interactor: PlacePageInteractor
   private let storyboard: UIStoryboard
+  private var lastLocation: CLLocation?
+
   weak var presenter: PlacePagePresenterProtocol?
 
-  fileprivate var lastLocation: CLLocation?
-
-  lazy var headerViewControllers: [UIViewController] = {
+  var headerViewControllers: [UIViewController] {
     [headerViewController, previewViewController]
-  }()
+  }
 
   lazy var bodyViewControllers: [UIViewController] = {
-    return configureViewControllers()
+    configureViewControllers()
   }()
 
   var actionBar: ActionBarViewController? {
-    return actionBarViewController
+    actionBarViewController
   }
 
   var navigationBar: UIViewController? {
-    return placePageNavigationViewController
+    placePageNavigationViewController
   }
-  
+
   lazy var headerViewController: PlacePageHeaderViewController = {
     PlacePageHeaderBuilder.build(data: placePageData, delegate: interactor, headerType: .flexible)
   }()
 
-  lazy var previewViewController: PlacePagePreviewViewController = {
+  private lazy var previewViewController: PlacePagePreviewViewController = {
     let vc = storyboard.instantiateViewController(ofType: PlacePagePreviewViewController.self)
     vc.placePagePreviewData = placePageData.previewData
     return vc
-  } ()
+  }()
 
-  lazy var wikiDescriptionViewController: WikiDescriptionViewController = {
+  private lazy var wikiDescriptionViewController: WikiDescriptionViewController = {
     let vc = storyboard.instantiateViewController(ofType: WikiDescriptionViewController.self)
     vc.view.isHidden = true
     vc.delegate = interactor
     return vc
-  } ()
+  }()
 
-  lazy var editBookmarkViewController: PlacePageEditBookmarkOrTrackViewController = {
+  private lazy var editBookmarkViewController: PlacePageEditBookmarkOrTrackViewController = {
     let vc = storyboard.instantiateViewController(ofType: PlacePageEditBookmarkOrTrackViewController.self)
     vc.view.isHidden = true
     vc.delegate = interactor
     return vc
-  } ()
+  }()
 
-  lazy var infoViewController: PlacePageInfoViewController = {
+  private lazy var infoViewController: PlacePageInfoViewController = {
     let vc = storyboard.instantiateViewController(ofType: PlacePageInfoViewController.self)
     vc.placePageInfoData = placePageData.infoData
     vc.delegate = interactor
     return vc
-  } ()
+  }()
 
-  lazy var buttonsViewController: PlacePageButtonsViewController = {
+  private lazy var buttonsViewController: PlacePageButtonsViewController = {
     let vc = storyboard.instantiateViewController(ofType: PlacePageButtonsViewController.self)
     vc.buttonsData = placePageData.buttonsData!
     vc.delegate = interactor
     return vc
-  } ()
+  }()
 
-  lazy var actionBarViewController: ActionBarViewController = {
+  private lazy var actionBarViewController: ActionBarViewController = {
     let vc = storyboard.instantiateViewController(ofType: ActionBarViewController.self)
     vc.placePageData = placePageData
     vc.canAddStop = MWMRouter.canAddIntermediatePoint()
     vc.isRoutePlanning = MWMNavigationDashboardManager.shared().state != .hidden
     vc.delegate = interactor
     return vc
-  } ()
+  }()
 
-  lazy var placePageNavigationViewController: PlacePageHeaderViewController = {
+  private lazy var placePageNavigationViewController: PlacePageHeaderViewController = {
     return PlacePageHeaderBuilder.build(data: placePageData, delegate: interactor, headerType: .fixed)
-  } ()
+  }()
 
   init(interactor: PlacePageInteractor, storyboard: UIStoryboard, data: PlacePageData) {
     self.interactor = interactor
@@ -163,7 +163,6 @@ class PlacePageCommonLayout: NSObject, IPlacePageLayout {
   }
 }
 
-
 // MARK: - PlacePageData async callbacks for loaders
 
 extension PlacePageCommonLayout {
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageTrackLayout.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageTrackLayout.swift
index 918eab891..1126dc04c 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageTrackLayout.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageTrackLayout.swift
@@ -17,25 +17,25 @@ class PlacePageTrackLayout: IPlacePageLayout {
     placePageNavigationViewController
   }
 
-  lazy var headerViewControllers: [UIViewController] = {
+  var headerViewControllers: [UIViewController] {
     [headerViewController, previewViewController]
-  }()
+  }
 
   lazy var headerViewController: PlacePageHeaderViewController = {
     PlacePageHeaderBuilder.build(data: placePageData, delegate: interactor, headerType: .flexible)
   }()
 
-  lazy var previewViewController: PlacePagePreviewViewController = {
+  private lazy var previewViewController: PlacePagePreviewViewController = {
     let vc = storyboard.instantiateViewController(ofType: PlacePagePreviewViewController.self)
     vc.placePagePreviewData = placePageData.previewData
     return vc
   }()
 
-  lazy var placePageNavigationViewController: PlacePageHeaderViewController = {
+  private lazy var placePageNavigationViewController: PlacePageHeaderViewController = {
     return PlacePageHeaderBuilder.build(data: placePageData, delegate: interactor, headerType: .fixed)
   }()
 
-  lazy var editTrackViewController: PlacePageEditBookmarkOrTrackViewController = {
+  private lazy var editTrackViewController: PlacePageEditBookmarkOrTrackViewController = {
     let vc = storyboard.instantiateViewController(ofType: PlacePageEditBookmarkOrTrackViewController.self)
     vc.view.isHidden = true
     vc.delegate = interactor
@@ -49,7 +49,7 @@ class PlacePageTrackLayout: IPlacePageLayout {
     return ElevationProfileBuilder.build(trackData: trackData, delegate: interactor)
   }()
 
-  lazy var actionBarViewController: ActionBarViewController = {
+  private lazy var actionBarViewController: ActionBarViewController = {
     let vc = storyboard.instantiateViewController(ofType: ActionBarViewController.self)
     vc.placePageData = placePageData
     vc.canAddStop = MWMRouter.canAddIntermediatePoint()
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageTrackRecordingLayout.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageTrackRecordingLayout.swift
index 3dc4c6d5f..3c8f00d0d 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageTrackRecordingLayout.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageTrackRecordingLayout.swift
@@ -5,7 +5,7 @@ final class PlacePageTrackRecordingLayout: IPlacePageLayout {
   weak var presenter: PlacePagePresenterProtocol?
 
   lazy var bodyViewControllers: [UIViewController] = {
-    return configureViewControllers()
+    configureViewControllers()
   }()
 
   var actionBar: ActionBarViewController? {
@@ -16,19 +16,19 @@ final class PlacePageTrackRecordingLayout: IPlacePageLayout {
     placePageNavigationViewController
   }
 
-  lazy var headerViewControllers: [UIViewController] = {
+  var headerViewControllers: [UIViewController] {
     [headerViewController]
-  }()
+  }
 
   lazy var headerViewController: PlacePageHeaderViewController = {
-    return PlacePageHeaderBuilder.build(data: placePageData, delegate: interactor, headerType: .flexible)
+    PlacePageHeaderBuilder.build(data: placePageData, delegate: interactor, headerType: .flexible)
   }()
 
-  lazy var placePageNavigationViewController: PlacePageHeaderViewController = {
-    return PlacePageHeaderBuilder.build(data: placePageData, delegate: interactor, headerType: .fixed)
+  private lazy var placePageNavigationViewController: PlacePageHeaderViewController = {
+    PlacePageHeaderBuilder.build(data: placePageData, delegate: interactor, headerType: .fixed)
   }()
 
-  lazy var elevationProfileViewController: ElevationProfileViewController? = {
+  private lazy var elevationProfileViewController: ElevationProfileViewController? = {
     guard let trackData = placePageData.trackData else {
       return nil
     }
@@ -36,7 +36,7 @@ final class PlacePageTrackRecordingLayout: IPlacePageLayout {
                                          delegate: interactor)
   }()
 
-  lazy var actionBarViewController: ActionBarViewController = {
+  private lazy var actionBarViewController: ActionBarViewController = {
     let vc = storyboard.instantiateViewController(ofType: ActionBarViewController.self)
     vc.placePageData = placePageData
     vc.canAddStop = MWMRouter.canAddIntermediatePoint()
diff --git a/iphone/Maps/UI/PlacePage/PlacePageViewController.swift b/iphone/Maps/UI/PlacePage/PlacePageViewController.swift
index 37965519a..623825ddd 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageViewController.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePageViewController.swift
@@ -1,5 +1,5 @@
 protocol PlacePageViewProtocol: AnyObject {
-  var interactor: PlacePageInteractorProtocol! { get set }
+  var interactor: PlacePageInteractorProtocol? { get set }
 
   func setLayout(_ layout: IPlacePageLayout)
   func closeAnimated(completion: (() -> Void)?)
@@ -35,7 +35,7 @@ final class PlacePageScrollView: UIScrollView {
     stackView.distribution = .fill
     return stackView
   }()
-  var interactor: PlacePageInteractorProtocol!
+  var interactor: PlacePageInteractorProtocol?
   var beginDragging = false
   var rootViewController: MapViewController {
     MapViewController.shared()!
@@ -220,8 +220,13 @@ final class PlacePageScrollView: UIScrollView {
   }
 
   private func cleanupLayout() {
-    layout?.actionBar?.view.removeFromSuperview()
-    layout?.navigationBar?.view.removeFromSuperview()
+    guard let layout else { return }
+    let childViewControllers = [layout.actionBar, layout.navigationBar] + layout.headerViewControllers + layout.bodyViewControllers
+    childViewControllers.forEach {
+      $0?.willMove(toParent: nil)
+      $0?.view.removeFromSuperview()
+      $0?.removeFromParent()
+    }
     headerStackView.arrangedSubviews.forEach { $0.removeFromSuperview() }
     stackView.arrangedSubviews.forEach { $0.removeFromSuperview() }
   }
@@ -293,7 +298,7 @@ final class PlacePageScrollView: UIScrollView {
 
   private func updateTopBound(_ bound: CGFloat, duration: TimeInterval) {
     alternativeSizeClass(iPhone: {
-      interactor.updateTopBound(bound, duration: duration)
+      interactor?.updateTopBound(bound, duration: duration)
     }, iPad: {})
   }
 }

From 98689fbbf800c52116e25b16e8bc278c3840023b Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Mon, 4 Nov 2024 19:27:18 -0300
Subject: [PATCH 160/302] [android] Hack to suppress most frequent crash on
 startup.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 .../cpp/app/organicmaps/sdk/OrganicMaps.cpp   |  2 +-
 .../app/organicmaps/sdk/core/jni_helper.cpp   | 26 +++++++++++++++++--
 .../app/organicmaps/sdk/core/jni_helper.hpp   |  2 ++
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp
index 2c628ba25..62d5b8b05 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp
@@ -29,7 +29,7 @@ JNIEXPORT void JNICALL Java_app_organicmaps_sdk_OrganicMaps_nativeInitFramework(
 {
   if (!g_framework)
   {
-    g_framework = std::make_unique<android::Framework>([onComplete = jni::make_global_ref(onComplete)]()
+    g_framework = std::make_unique<android::Framework>([onComplete = jni::make_global_ref_safe(onComplete)]()
     {
       JNIEnv * env = jni::GetEnv();
       jmethodID const methodId = jni::GetMethodID(env, *onComplete, "run", "()V");
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.cpp
index 62ef0ddc4..9d3e3990a 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.cpp
@@ -98,18 +98,26 @@ JNIEXPORT void JNICALL JNI_OnUnload(JavaVM *, void *)
 
 namespace jni
 {
-JNIEnv * GetEnv()
+JNIEnv * GetEnvSafe()
 {
   JNIEnv * env;
   auto const res = g_jvm->GetEnv((void **)&env, JNI_VERSION_1_6);
   if (res != JNI_OK)
   {
     LOG(LERROR, ("Can't get JNIEnv. Is the thread attached to JVM?", res));
-    MYTHROW(RootException, ("Can't get JNIEnv. Is the thread attached to JVM?", res));
+    env = nullptr;
   }
   return env;
 }
 
+JNIEnv * GetEnv()
+{
+  JNIEnv * env = GetEnvSafe();
+  if (env == nullptr)
+    MYTHROW(RootException, ("Can't get JNIEnv. Is the thread attached to JVM?"));
+  return env;
+}
+
 JavaVM * GetJVM()
 {
   ASSERT(g_jvm, ("JVM is not initialized"));
@@ -218,6 +226,20 @@ std::shared_ptr<jobject> make_global_ref(jobject obj)
   });
 }
 
+// https://github.com/organicmaps/organicmaps/issues/9397
+/// @todo There are no other ideas, let's try a safe version with a forever global ref ..
+std::shared_ptr<jobject> make_global_ref_safe(jobject obj)
+{
+  jobject * ref = new jobject(GetEnv()->NewGlobalRef(obj));
+  return std::shared_ptr<jobject>(ref, [](jobject * ref)
+  {
+    JNIEnv * env = GetEnvSafe();
+    if (env)
+      env->DeleteGlobalRef(*ref);
+    delete ref;
+  });
+}
+
 std::string ToNativeString(JNIEnv * env, jthrowable const & e)
 {
   jni::TScopedLocalClassRef logClassRef(env, env->FindClass("android/util/Log"));
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.hpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.hpp
index 4da33cbd5..2775d9f9a 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.hpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.hpp
@@ -66,6 +66,8 @@ bool HandleJavaException(JNIEnv * env);
 base::LogLevel GetLogLevelForException(JNIEnv * env, jthrowable const & e);
 
 std::shared_ptr<jobject> make_global_ref(jobject obj);
+std::shared_ptr<jobject> make_global_ref_safe(jobject obj);
+
 using TScopedLocalRef = ScopedLocalRef<jobject>;
 using TScopedLocalClassRef = ScopedLocalRef<jclass>;
 using TScopedLocalObjectArrayRef = ScopedLocalRef<jobjectArray>;

From e8e94744f0195cbc836923d0ca56febd83c4dd4f Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Wed, 20 Aug 2025 14:53:24 -0300
Subject: [PATCH 161/302] [map] Fixed invalid route saving.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 libs/map/framework.cpp       | 3 ++-
 libs/map/routing_manager.cpp | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libs/map/framework.cpp b/libs/map/framework.cpp
index f717e2831..2c9a4333d 100644
--- a/libs/map/framework.cpp
+++ b/libs/map/framework.cpp
@@ -1704,7 +1704,8 @@ bool Framework::IsTrackRecordingEnabled() const
 void Framework::SaveRoute()
 {
   auto const trackId = m_routingManager.SaveRoute();
-  ShowTrack(trackId);
+  if (trackId != kml::kInvalidTrackId)
+    ShowTrack(trackId);
 }
 
 void Framework::OnUpdateGpsTrackPointsCallback(vector<pair<size_t, location::GpsInfo>> && toAdd,
diff --git a/libs/map/routing_manager.cpp b/libs/map/routing_manager.cpp
index 95e679086..b40e65f53 100644
--- a/libs/map/routing_manager.cpp
+++ b/libs/map/routing_manager.cpp
@@ -1091,7 +1091,8 @@ static std::string GetNameFromPoint(RouteMarkData const & rmd)
 kml::TrackId RoutingManager::SaveRoute()
 {
   std::vector<geometry::PointWithAltitude> junctions;
-  RoutingSession().GetRouteJunctionPoints(junctions);
+  if (!RoutingSession().GetRouteJunctionPoints(junctions))
+    return kml::kInvalidTrackId;
 
   base::Unique(junctions, [](geometry::PointWithAltitude const & p1, geometry::PointWithAltitude const & p2)
   { return AlmostEqualAbs(p1, p2, kMwmPointAccuracy); });

From b26deb3bb25104be9690abc8fe13d498d9404a83 Mon Sep 17 00:00:00 2001
From: x7z4w <x7z4w@noreply.codeberg.org>
Date: Wed, 20 Aug 2025 11:47:16 +0200
Subject: [PATCH 162/302] [ci] Use self-hosted runner for DCO

Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>
---
 .forgejo/workflows/dco.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.forgejo/workflows/dco.yml b/.forgejo/workflows/dco.yml
index 13e796fcb..19910aa4c 100644
--- a/.forgejo/workflows/dco.yml
+++ b/.forgejo/workflows/dco.yml
@@ -3,6 +3,6 @@ on: [pull_request]
 
 jobs:
   check:
-    runs-on: codeberg-tiny
+    runs-on: ubuntu-latest
     steps:
       - uses: https://github.com/KineticCafe/actions-dco@v1

From 8e1c723b414347437043d0a12a008a052da141cd Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Sun, 10 Aug 2025 17:44:50 +0200
Subject: [PATCH 163/302] [android] Migrate about screen to Material Components

Signed-off-by: Jean-Baptiste Charron <jeanbaptiste.charron@outlook.fr>
---
 .../app/organicmaps/help/HelpFragment.java    | 27 ++++++---
 .../app/src/main/res/layout-land/about.xml    | 56 +++++++++----------
 android/app/src/main/res/layout/about.xml     | 56 +++++++++----------
 3 files changed, 75 insertions(+), 64 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/help/HelpFragment.java b/android/app/src/main/java/app/organicmaps/help/HelpFragment.java
index d40673623..0a6f58a4b 100644
--- a/android/app/src/main/java/app/organicmaps/help/HelpFragment.java
+++ b/android/app/src/main/java/app/organicmaps/help/HelpFragment.java
@@ -7,12 +7,15 @@ import android.text.util.Linkify;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.view.ViewCompat;
+
+import com.google.android.material.button.MaterialButton;
+import com.google.android.material.textview.MaterialTextView;
+
 import app.organicmaps.BuildConfig;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmFragment;
@@ -32,7 +35,15 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene
 
   private void setupItem(@IdRes int id, boolean tint, @NonNull View frame)
   {
-    final TextView view = frame.findViewById(id);
+    final MaterialTextView view = frame.findViewById(id);
+    view.setOnClickListener(this);
+    if (tint)
+      Graphics.tint(view);
+  }
+
+  private void setupButton(@IdRes int id, boolean tint, @NonNull View frame)
+  {
+    final MaterialButton view = frame.findViewById(id);
     view.setOnClickListener(this);
     if (tint)
       Graphics.tint(view);
@@ -44,12 +55,12 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene
     mDonateUrl = Config.getDonateUrl(requireContext());
     View root = inflater.inflate(R.layout.about, container, false);
 
-    ((TextView) root.findViewById(R.id.version)).setText(BuildConfig.VERSION_NAME);
+    ((MaterialTextView) root.findViewById(R.id.version)).setText(BuildConfig.VERSION_NAME);
 
     final boolean isLandscape = getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE;
 
     final String dataVersion = DateUtils.getShortDateFormatter().format(Framework.getDataVersion());
-    final TextView osmPresentationView = root.findViewById(R.id.osm_presentation);
+    final MaterialTextView osmPresentationView = root.findViewById(R.id.osm_presentation);
     if (osmPresentationView != null)
     {
       osmPresentationView.setText(getString(R.string.osm_presentation, dataVersion));
@@ -68,23 +79,23 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene
     setupItem(R.id.mastodon, false, root);
     setupItem(R.id.openstreetmap, true, root);
     setupItem(R.id.faq, true, root);
-    setupItem(R.id.report, isLandscape, root);
+    setupButton(R.id.report, isLandscape, root);
     setupItem(R.id.copyright, false, root);
 
-    final TextView supportUsView = root.findViewById(R.id.support_us);
+    final MaterialTextView supportUsView = root.findViewById(R.id.support_us);
     if (BuildConfig.FLAVOR.equals("google") && !TextUtils.isEmpty(mDonateUrl))
       supportUsView.setVisibility(View.GONE);
     else
       setupItem(R.id.support_us, true, root);
 
-    final TextView donateView = root.findViewById(R.id.donate);
+    final MaterialButton donateView = root.findViewById(R.id.donate);
     if (TextUtils.isEmpty(mDonateUrl))
       donateView.setVisibility(View.GONE);
     else
     {
       /*donateView.setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.ic_donate, 0,
                 R.drawable.ic_donate, 0);*/
-      setupItem(R.id.donate, isLandscape, root);
+      setupButton(R.id.donate, isLandscape, root);
     }
 
     if (BuildConfig.REVIEW_URL.isEmpty())
diff --git a/android/app/src/main/res/layout-land/about.xml b/android/app/src/main/res/layout-land/about.xml
index 04051ab15..d4500d316 100644
--- a/android/app/src/main/res/layout-land/about.xml
+++ b/android/app/src/main/res/layout-land/about.xml
@@ -33,7 +33,7 @@
           app:layout_constraintTop_toTopOf="parent"
           app:layout_constraintVertical_bias="0.5">
 
-          <TextView
+          <com.google.android.material.textview.MaterialTextView
             android:id="@+id/version"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -43,7 +43,7 @@
             android:textIsSelectable="true"
             tools:text="2025.04.16-FDroid" />
 
-          <TextView
+          <com.google.android.material.textview.MaterialTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/about_headline"
@@ -53,7 +53,7 @@
             app:layout_constraintTop_toTopOf="@id/version" />
         </LinearLayout>
 
-        <ImageView
+        <com.google.android.material.imageview.ShapeableImageView
           android:id="@+id/imageView3"
           android:layout_width="@dimen/about_logo"
           android:layout_height="@dimen/about_logo"
@@ -85,7 +85,7 @@
             android:orientation="vertical"
             android:layout_gravity="center">
 
-          <TextView
+          <com.google.android.material.textview.MaterialTextView
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_marginBottom="@dimen/margin_half"
@@ -93,7 +93,7 @@
             android:textAppearance="@style/MwmTextAppearance.Body1"
             android:textColor="?android:textColorPrimary" />
 
-          <TextView
+          <com.google.android.material.textview.MaterialTextView
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_marginBottom="@dimen/margin_half"
@@ -101,7 +101,7 @@
             android:textAppearance="@style/MwmTextAppearance.Body1"
             android:textColor="?android:textColorPrimary" />
 
-          <TextView
+          <com.google.android.material.textview.MaterialTextView
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_marginBottom="@dimen/margin_half"
@@ -112,7 +112,7 @@
         </LinearLayout>
       </androidx.constraintlayout.widget.ConstraintLayout>
 
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
@@ -130,7 +130,7 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/margin_half">
 
-        <ImageView
+        <com.google.android.material.imageview.ShapeableImageView
           android:id="@+id/osm_logo"
           android:layout_width="@dimen/osm_logo"
           android:layout_height="@dimen/osm_logo"
@@ -142,7 +142,7 @@
           app:layout_constraintStart_toStartOf="parent"
           app:layout_constraintTop_toTopOf="parent" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
           android:id="@+id/osm_presentation"
           android:layout_width="0dp"
           android:layout_height="wrap_content"
@@ -165,7 +165,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/margin_half"
         android:orientation="horizontal">
-        <Button
+        <com.google.android.material.button.MaterialButton
           android:id="@+id/donate"
           style="@style/MwmWidget.Button.Accent"
           android:layout_width="0dp"
@@ -182,7 +182,7 @@
           app:layout_constraintStart_toStartOf="parent"
           app:layout_constraintTop_toTopOf="parent"
           app:layout_constraintVertical_bias="0.5" />
-        <Button
+        <com.google.android.material.button.MaterialButton
           android:id="@+id/report"
           style="@style/MwmWidget.Button"
           android:layout_width="0dp"
@@ -201,98 +201,98 @@
           app:layout_constraintVertical_bias="0.5" />
       </androidx.constraintlayout.widget.ConstraintLayout>
 
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/faq"
         style="@style/MwmWidget.TextView.Item"
         android:textAlignment="viewStart"
         android:text="@string/faq"
         app:drawableStartCompat="@drawable/ic_question_mark" />
 
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/support_us"
         android:textAlignment="viewStart"
         style="@style/MwmWidget.TextView.Item"
         android:text="@string/how_to_support_us"
         app:drawableStartCompat="@drawable/ic_donate" />
 
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/news"
         android:textAlignment="viewStart"
         style="@style/MwmWidget.TextView.Item"
         android:text="@string/news"
         app:drawableStartCompat="@drawable/ic_news" />
 
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/rate"
         android:textAlignment="viewStart"
         style="@style/MwmWidget.TextView.Item"
         android:text="@string/rate_the_app"
         app:drawableStartCompat="@drawable/ic_rate" />
 
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/telegram"
         android:textAlignment="viewStart"
         style="@style/MwmWidget.TextView.Item"
         android:text="@string/telegram"
         app:drawableStartCompat="@drawable/ic_telegram" />
 
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/code_repo"
         android:textAlignment="viewStart"
         style="@style/MwmWidget.TextView.Item"
         android:text="@string/codeberg"
         app:drawableStartCompat="@drawable/ic_codeberg" />
 
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/web"
         android:textAlignment="viewStart"
         style="@style/MwmWidget.TextView.Item"
         android:text="@string/website"
         app:drawableStartCompat="@drawable/ic_website" />
 
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/email"
         android:textAlignment="viewStart"
         style="@style/MwmWidget.TextView.Item"
         android:text="@string/email"
         app:drawableStartCompat="@drawable/ic_email" />
 
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/matrix"
         android:textAlignment="viewStart"
         style="@style/MwmWidget.TextView.Item"
         android:text="@string/matrix"
         app:drawableStartCompat="@drawable/ic_matrix" />
 
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/mastodon"
         android:textAlignment="viewStart"
         style="@style/MwmWidget.TextView.Item"
         android:text="@string/mastodon"
         app:drawableStartCompat="@drawable/ic_mastodon" />
 
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/facebook"
         android:textAlignment="viewStart"
         style="@style/MwmWidget.TextView.Item"
         android:text="@string/facebook"
         app:drawableStartCompat="@drawable/ic_facebook" />
 <!--
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/twitter"
         android:textAlignment="viewStart"
         style="@style/MwmWidget.TextView.Item"
         android:text="@string/twitter"
         app:drawableStartCompat="@drawable/ic_twitterx" />
 -->
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/instagram"
         android:textAlignment="viewStart"
         style="@style/MwmWidget.TextView.Item"
         android:text="@string/instagram"
         app:drawableStartCompat="@drawable/ic_instagram" />
 
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/openstreetmap"
         android:textAlignment="viewStart"
         style="@style/MwmWidget.TextView.Item"
@@ -306,19 +306,19 @@
         android:layout_marginTop="@dimen/margin_quarter"
         android:background="?dividerHorizontal" />
 
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/privacy_policy"
         android:textAlignment="viewStart"
         style="@style/MwmWidget.TextView.Item"
         android:text="@string/privacy_policy" />
 
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/term_of_use_link"
         android:textAlignment="viewStart"
         style="@style/MwmWidget.TextView.Item"
         android:text="@string/terms_of_use" />
 
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/copyright"
         android:textAlignment="viewStart"
         style="@style/MwmWidget.TextView.Item"
diff --git a/android/app/src/main/res/layout/about.xml b/android/app/src/main/res/layout/about.xml
index 2537b06f5..cd96892e0 100644
--- a/android/app/src/main/res/layout/about.xml
+++ b/android/app/src/main/res/layout/about.xml
@@ -17,7 +17,7 @@
       android:orientation="vertical"
       android:padding="@dimen/margin_base">
 
-    <ImageView
+    <com.google.android.material.imageview.ShapeableImageView
         android:layout_width="@dimen/about_logo"
         android:layout_height="@dimen/about_logo"
         android:layout_gravity="center_horizontal"
@@ -26,7 +26,7 @@
         app:srcCompat="@drawable/ic_logo_monochrome"
         app:tint="?attr/colorLogo"/>
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/version"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -37,7 +37,7 @@
         android:textIsSelectable="true"
         tools:text="2025.04.16-FDroid" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/margin_base"
@@ -46,7 +46,7 @@
         android:textAppearance="@style/MwmTextAppearance.Headline"
         android:textColor="?android:textColorPrimary" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_marginBottom="@dimen/margin_half"
@@ -54,7 +54,7 @@
         android:textAppearance="@style/MwmTextAppearance.Body1"
         android:textColor="?android:textColorPrimary" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/margin_half"
@@ -62,7 +62,7 @@
         android:textAppearance="@style/MwmTextAppearance.Body1"
         android:textColor="?android:textColorPrimary" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/margin_half"
@@ -70,7 +70,7 @@
         android:textAppearance="@style/MwmTextAppearance.Body1"
         android:textColor="?android:textColorPrimary" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/margin_half"
@@ -84,7 +84,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-      <ImageView
+      <com.google.android.material.imageview.ShapeableImageView
           android:id="@+id/osm_logo"
           android:layout_width="@dimen/osm_logo"
           android:layout_height="@dimen/osm_logo"
@@ -95,7 +95,7 @@
           app:layout_constraintStart_toStartOf="parent"
           app:layout_constraintTop_toTopOf="parent" />
 
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
           android:id="@+id/osm_presentation"
           android:layout_width="0dp"
           android:layout_height="wrap_content"
@@ -112,7 +112,7 @@
           app:layout_constraintTop_toTopOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/donate"
         style="@style/MwmWidget.Button.Accent"
         android:layout_width="match_parent"
@@ -122,7 +122,7 @@
         android:padding="@dimen/margin_quarter"
         android:text="@string/donate" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/report"
         style="@style/MwmWidget.Button"
         android:layout_width="match_parent"
@@ -133,98 +133,98 @@
         android:text="@string/report_a_bug"
         android:textColor="@color/text_dark" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
       android:id="@+id/faq"
       style="@style/MwmWidget.TextView.Item"
       android:text="@string/faq"
       android:textAlignment="viewStart"
       app:drawableStartCompat="@drawable/ic_question_mark" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/support_us"
         style="@style/MwmWidget.TextView.Item"
         android:text="@string/how_to_support_us"
         android:textAlignment="viewStart"
         app:drawableStartCompat="@drawable/ic_donate" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/news"
         style="@style/MwmWidget.TextView.Item"
         android:text="@string/news"
         android:textAlignment="viewStart"
         app:drawableStartCompat="@drawable/ic_news" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/rate"
         style="@style/MwmWidget.TextView.Item"
         android:text="@string/rate_the_app"
         android:textAlignment="viewStart"
         app:drawableStartCompat="@drawable/ic_rate" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/telegram"
         style="@style/MwmWidget.TextView.Item"
         android:text="@string/telegram"
         android:textAlignment="viewStart"
         app:drawableStartCompat="@drawable/ic_telegram" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/code_repo"
         style="@style/MwmWidget.TextView.Item"
         android:text="@string/codeberg"
         android:textAlignment="viewStart"
         app:drawableStartCompat="@drawable/ic_codeberg" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/web"
         style="@style/MwmWidget.TextView.Item"
         android:text="@string/website"
         android:textAlignment="viewStart"
         app:drawableStartCompat="@drawable/ic_website" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/email"
         style="@style/MwmWidget.TextView.Item"
         android:text="@string/email"
         android:textAlignment="viewStart"
         app:drawableStartCompat="@drawable/ic_email" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/matrix"
         style="@style/MwmWidget.TextView.Item"
         android:text="@string/matrix"
         android:textAlignment="viewStart"
         app:drawableStartCompat="@drawable/ic_matrix" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/mastodon"
         style="@style/MwmWidget.TextView.Item"
         android:text="@string/mastodon"
         android:textAlignment="viewStart"
         app:drawableStartCompat="@drawable/ic_mastodon" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/facebook"
         style="@style/MwmWidget.TextView.Item"
         android:text="@string/facebook"
         android:textAlignment="viewStart"
         app:drawableStartCompat="@drawable/ic_facebook" />
 <!--
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/twitter"
         style="@style/MwmWidget.TextView.Item"
         android:text="@string/twitter"
         android:textAlignment="viewStart"
         app:drawableStartCompat="@drawable/ic_twitterx" />
 -->
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/instagram"
         style="@style/MwmWidget.TextView.Item"
         android:text="@string/instagram"
         android:textAlignment="viewStart"
         app:drawableStartCompat="@drawable/ic_instagram" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/openstreetmap"
         style="@style/MwmWidget.TextView.Item"
         android:text="@string/openstreetmap"
@@ -238,19 +238,19 @@
         android:layout_marginTop="@dimen/margin_quarter"
         android:background="?dividerHorizontal" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/privacy_policy"
         style="@style/MwmWidget.TextView.Item"
         android:textAlignment="viewStart"
         android:text="@string/privacy_policy" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/term_of_use_link"
         style="@style/MwmWidget.TextView.Item"
         android:textAlignment="viewStart"
         android:text="@string/terms_of_use" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/copyright"
         style="@style/MwmWidget.TextView.Item"
         android:textAlignment="viewStart"

From 72520310e8ca1084add1e1b3c1211c82b874ffea Mon Sep 17 00:00:00 2001
From: hb0nd <me@hbond.xyz>
Date: Fri, 22 Aug 2025 16:29:42 +0200
Subject: [PATCH 164/302] [ci] Use latest version of DCO validator

Signed-off-by: Harry Bond <me@hbond.xyz>
---
 .forgejo/workflows/dco.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.forgejo/workflows/dco.yml b/.forgejo/workflows/dco.yml
index 19910aa4c..fbee4e38e 100644
--- a/.forgejo/workflows/dco.yml
+++ b/.forgejo/workflows/dco.yml
@@ -1,8 +1,9 @@
-name: dco
+name: DCO
 on: [pull_request]
 
 jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-      - uses: https://github.com/KineticCafe/actions-dco@v1
+      - name: Check for Developer Certificate of Origin (DCO) compliance
+        uses: https://github.com/KineticCafe/actions-dco@fb284c903a7673a3d4b0bdd104479a6f0d46dae7 # v1.3.6

From ef77314d7a45a2417e32ee141ed7d04595f1bac4 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Tue, 19 Aug 2025 20:53:31 +0200
Subject: [PATCH 165/302] [android] Move styles for button search frame
 components

Signed-off-by: jeanbaptisteC <jeanbaptiste.charron@outlook.fr>
---
 .../res/layout-h400dp/map_buttons_search_frame.xml    | 10 +++++-----
 .../src/main/res/layout/map_buttons_search_frame.xml  | 10 +++++-----
 android/app/src/main/res/values/styles.xml            | 11 ++++++++++-
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/android/app/src/main/res/layout-h400dp/map_buttons_search_frame.xml b/android/app/src/main/res/layout-h400dp/map_buttons_search_frame.xml
index f730693c3..c81214477 100644
--- a/android/app/src/main/res/layout-h400dp/map_buttons_search_frame.xml
+++ b/android/app/src/main/res/layout-h400dp/map_buttons_search_frame.xml
@@ -20,7 +20,7 @@
     tools:visibility="visible">
     <com.google.android.material.floatingactionbutton.FloatingActionButton
       android:id="@+id/search_fuel"
-      style="@style/MwmWidget.MapButton.Search"
+      style="@style/MwmWidget.Components.SearchWheel"
       android:layout_alignParentTop="true"
       android:layout_centerHorizontal="true"
       android:layout_marginStart="@dimen/margin_half_plus"
@@ -29,14 +29,14 @@
       app:srcCompat="@drawable/ic_routing_fuel_on" />
     <com.google.android.material.floatingactionbutton.FloatingActionButton
       android:id="@+id/search_parking"
-      style="@style/MwmWidget.MapButton.Search"
+      style="@style/MwmWidget.Components.SearchWheel"
       android:layout_marginTop="@dimen/margin_base_plus"
       android:layout_toEndOf="@id/search_fuel"
       android:contentDescription="@string/category_parking"
       app:srcCompat="@drawable/ic_routing_parking_on" />
     <com.google.android.material.floatingactionbutton.FloatingActionButton
       android:id="@+id/search_eat"
-      style="@style/MwmWidget.MapButton.Search"
+      style="@style/MwmWidget.Components.SearchWheel"
       android:layout_alignParentEnd="true"
       android:layout_centerVertical="true"
       android:layout_marginEnd="@dimen/margin_half"
@@ -44,7 +44,7 @@
       app:srcCompat="@drawable/ic_routing_eat_on" />
     <com.google.android.material.floatingactionbutton.FloatingActionButton
       android:id="@+id/search_food"
-      style="@style/MwmWidget.MapButton.Search"
+      style="@style/MwmWidget.Components.SearchWheel"
       android:layout_alignParentBottom="true"
       android:layout_marginBottom="@dimen/margin_base_plus"
       android:layout_toEndOf="@id/search_fuel"
@@ -52,7 +52,7 @@
       app:srcCompat="@drawable/ic_routing_food_on" />
     <com.google.android.material.floatingactionbutton.FloatingActionButton
       android:id="@+id/search_atm"
-      style="@style/MwmWidget.MapButton.Search"
+      style="@style/MwmWidget.Components.SearchWheel"
       android:layout_alignParentBottom="true"
       android:layout_centerHorizontal="true"
       android:layout_marginStart="@dimen/margin_half_plus"
diff --git a/android/app/src/main/res/layout/map_buttons_search_frame.xml b/android/app/src/main/res/layout/map_buttons_search_frame.xml
index bb5b4a255..b2a4c10ee 100644
--- a/android/app/src/main/res/layout/map_buttons_search_frame.xml
+++ b/android/app/src/main/res/layout/map_buttons_search_frame.xml
@@ -21,35 +21,35 @@
     tools:visibility="visible">
     <com.google.android.material.floatingactionbutton.FloatingActionButton
       android:id="@+id/search_fuel"
-      style="@style/MwmWidget.MapButton.Search"
+      style="@style/MwmWidget.Components.SearchWheel"
       android:layout_gravity="center_vertical"
       android:layout_marginStart="50dp"
       android:contentDescription="@string/category_fuel"
       app:srcCompat="@drawable/ic_routing_fuel_on" />
     <com.google.android.material.floatingactionbutton.FloatingActionButton
       android:id="@+id/search_parking"
-      style="@style/MwmWidget.MapButton.Search"
+      style="@style/MwmWidget.Components.SearchWheel"
       android:layout_gravity="center_vertical"
       android:layout_marginStart="@dimen/margin_half"
       android:contentDescription="@string/category_parking"
       app:srcCompat="@drawable/ic_routing_parking_on" />
     <com.google.android.material.floatingactionbutton.FloatingActionButton
       android:id="@+id/search_eat"
-      style="@style/MwmWidget.MapButton.Search"
+      style="@style/MwmWidget.Components.SearchWheel"
       android:layout_gravity="center_vertical"
       android:layout_marginStart="@dimen/margin_half"
       android:contentDescription="@string/category_eat"
       app:srcCompat="@drawable/ic_routing_eat_on" />
     <com.google.android.material.floatingactionbutton.FloatingActionButton
       android:id="@+id/search_food"
-      style="@style/MwmWidget.MapButton.Search"
+      style="@style/MwmWidget.Components.SearchWheel"
       android:layout_gravity="center_vertical"
       android:layout_marginStart="@dimen/margin_half"
       android:contentDescription="@string/category_shopping"
       app:srcCompat="@drawable/ic_routing_food_on" />
     <com.google.android.material.floatingactionbutton.FloatingActionButton
       android:id="@+id/search_atm"
-      style="@style/MwmWidget.MapButton.Search"
+      style="@style/MwmWidget.Components.SearchWheel"
       android:layout_gravity="center_vertical"
       android:layout_marginStart="@dimen/margin_half"
       android:contentDescription="@string/category_atm"
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index ae6bc4e1d..a2af6c49f 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -31,7 +31,16 @@
     <item name="maxImageSize">34dp</item>
   </style>
 
-  <style name="MwmWidget.MapButton.Search">
+  <style name="MwmWidget.Components.SearchWheel" parent="Theme.Material3.Dark">
+    <item name="android:layout_width">wrap_content</item>
+    <item name="android:layout_height">wrap_content</item>
+    <item name="android:backgroundTint">?menuBackground</item>
+    <item name="elevation">0dp</item>
+    <item name="hoveredFocusedTranslationZ">0dp</item>
+    <item name="pressedTranslationZ">0dp</item>
+    <item name="android:tint">?iconTint</item>
+    <item name="maxImageSize">@dimen/map_button_icon_size</item>
+    <item name="borderWidth">0dp</item>
     <item name="fabCustomSize">38dp</item>
   </style>
 

From ebb7c45d1acde581b4c276830ebc4fa66698baea Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Wed, 20 Aug 2025 18:59:23 +0200
Subject: [PATCH 166/302] [android] Improve button to add new phone number

Signed-off-by: jeanbaptisteC <jeanbaptiste.charron@outlook.fr>
---
 .../src/main/res/layout/fragment_phone.xml    | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/android/app/src/main/res/layout/fragment_phone.xml b/android/app/src/main/res/layout/fragment_phone.xml
index 13ae40581..070b00e99 100644
--- a/android/app/src/main/res/layout/fragment_phone.xml
+++ b/android/app/src/main/res/layout/fragment_phone.xml
@@ -21,23 +21,20 @@
 
     </FrameLayout>
 
-    <com.google.android.material.textview.MaterialTextView
+    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
         android:id="@+id/tv__append_phone"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:background="?clickableBackground"
-        android:gravity="center_vertical"
-        android:padding="@dimen/margin_base"
+        android:layout_margin="@dimen/margin_base"
+        android:clickable="true"
+        android:contentDescription="@string/editor_add_phone"
+        android:focusable="true"
         android:text="@string/editor_add_phone"
-        android:textAllCaps="true"
-        android:textAppearance="@style/MwmTextAppearance.Body3"
-        android:textColor="?colorSecondary"
-        app:layout_constraintBottom_toBottomOf="@+id/frameLayout" />
-
-    <include
-        layout="@layout/shadow_bottom"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/tv__mode_switch"/>
+        android:textColor="?accentButtonTextColor"
+        app:fabSize="normal"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:icon="@drawable/ic_plus"
+        app:iconTint="?accentButtonTextColor" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

From f1628c70bc46c5b5c095af1f0db873d6ce7d66ce Mon Sep 17 00:00:00 2001
From: kavikhalique <kavikhalique3@gmail.com>
Date: Fri, 25 Jul 2025 22:45:32 +0530
Subject: [PATCH 167/302] Implement Track Selection and elevation info display
 on PP

Signed-off-by: kavikhalique <kavikhalique3@gmail.com>
---
 .../java/app/organicmaps/ChartController.java |  38 +-
 .../sdk/bookmarks/data/Bookmark.java          |   9 +
 .../sdk/bookmarks/data/BookmarkManager.java   |  28 +-
 .../sdk/bookmarks/data/ElevationInfo.java     |  86 +----
 .../sdk/bookmarks/data/MapObject.java         |   8 +-
 .../organicmaps/sdk/bookmarks/data/Track.java |  66 +++-
 .../sdk/bookmarks/data/TrackStatistics.java   |  57 +++
 .../widget/placepage/AxisValueFormatter.java  |   4 +-
 .../ElevationProfileViewRenderer.java         |  63 ++--
 .../widget/placepage/FloatingMarkerView.java  |   7 +-
 .../placepage/PlacePageButtonFactory.java     |   5 +
 .../widget/placepage/PlacePageButtons.java    |   1 +
 .../widget/placepage/PlacePageController.java |  78 +++-
 .../widget/placepage/PlacePageView.java       | 294 ++++++++++++++-
 .../widget/placepage/PlacePageViewModel.java  |  36 ++
 .../sections/PlacePageBookmarkFragment.java   |  26 +-
 .../sections/PlacePageTrackFragment.java      | 115 ++++++
 .../res/drawable/ic_distance_travelled.xml    |  10 +
 .../elevation_profile_bottom_sheet.xml        |   2 +-
 .../src/main/res/layout/elevation_profile.xml |   4 +-
 .../layout/elevation_profile_bottom_sheet.xml |  21 +-
 .../res/layout/elevation_profile_internal.xml | 353 ++++++++++--------
 .../main/res/layout/floating_marker_view.xml  |  30 +-
 .../layout/place_page_bookmark_fragment.xml   |  10 -
 .../main/res/layout/place_page_details.xml    |   1 -
 .../main/res/layout/place_page_preview.xml    |  63 +++-
 .../main/res/layout/place_page_shadow_gap.xml |   7 +
 .../res/layout/placepage_track_fragment.xml   |  12 +
 android/app/src/main/res/values/dimens.xml    |   9 +-
 .../app/src/main/res/values/font_sizes.xml    |   1 +
 android/app/src/main/res/values/strings.xml   |   1 +
 .../app/src/main/res/values/styles-text.xml   |   5 +
 .../app/src/main/res/values/themes-attrs.xml  |   1 +
 .../cpp/app/organicmaps/sdk/Framework.cpp     |  12 +-
 .../app/organicmaps/sdk/UserMarkHelper.cpp    |  73 +++-
 .../app/organicmaps/sdk/UserMarkHelper.hpp    |   4 +
 .../sdk/bookmarks/data/BookmarkManager.cpp    |  57 ++-
 .../app/organicmaps/sdk/core/jni_helper.cpp   |   6 +
 .../app/organicmaps/sdk/core/jni_helper.hpp   |   2 +
 libs/map/bookmark_manager.cpp                 |   2 +-
 libs/map/framework.cpp                        |  10 +-
 41 files changed, 1181 insertions(+), 436 deletions(-)
 create mode 100644 android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/TrackStatistics.java
 create mode 100644 android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageTrackFragment.java
 create mode 100644 android/app/src/main/res/drawable/ic_distance_travelled.xml
 create mode 100644 android/app/src/main/res/layout/place_page_shadow_gap.xml
 create mode 100644 android/app/src/main/res/layout/placepage_track_fragment.xml

diff --git a/android/app/src/main/java/app/organicmaps/ChartController.java b/android/app/src/main/java/app/organicmaps/ChartController.java
index acfbb704f..c6fad3ad8 100644
--- a/android/app/src/main/java/app/organicmaps/ChartController.java
+++ b/android/app/src/main/java/app/organicmaps/ChartController.java
@@ -10,6 +10,8 @@ import androidx.core.content.ContextCompat;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
 import app.organicmaps.sdk.bookmarks.data.ElevationInfo;
+import app.organicmaps.sdk.bookmarks.data.Track;
+import app.organicmaps.sdk.bookmarks.data.TrackStatistics;
 import app.organicmaps.util.ThemeUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.widget.placepage.AxisValueFormatter;
@@ -31,9 +33,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-public class ChartController implements OnChartValueSelectedListener,
-                                        BookmarkManager.OnElevationActivePointChangedListener,
-                                        BookmarkManager.OnElevationCurrentPositionChangedListener
+public class ChartController implements OnChartValueSelectedListener
 {
   private static final int CHART_Y_LABEL_COUNT = 3;
   private static final int CHART_X_LABEL_COUNT = 6;
@@ -42,6 +42,7 @@ public class ChartController implements OnChartValueSelectedListener,
   private static final int CHART_AXIS_GRANULARITY = 100;
   private static final float CUBIC_INTENSITY = 0.2f;
   private static final int CURRENT_POSITION_OUT_OF_TRACK = -1;
+  private static final String ELEVATION_PROFILE_POINTS = "ELEVATION_PROFILE_POINTS";
 
   @SuppressWarnings("NullableProblems")
   @NonNull
@@ -62,6 +63,7 @@ public class ChartController implements OnChartValueSelectedListener,
   private final Context mContext;
   private long mTrackId = Utils.INVALID_ID;
   private boolean mCurrentPositionOutOfTrack = true;
+  private boolean mInformSelectedActivePointToCore = true;
 
   public ChartController(@NonNull Context context)
   {
@@ -70,8 +72,6 @@ public class ChartController implements OnChartValueSelectedListener,
 
   public void initialize(@NonNull View view)
   {
-    BookmarkManager.INSTANCE.setElevationActivePointChangedListener(this);
-    BookmarkManager.INSTANCE.setElevationCurrentPositionChangedListener(this);
     final Resources resources = mContext.getResources();
     mChart = view.findViewById(R.id.elevation_profile_chart);
 
@@ -101,13 +101,6 @@ public class ChartController implements OnChartValueSelectedListener,
     initAxises();
   }
 
-  @SuppressWarnings("unused")
-  public void destroy()
-  {
-    BookmarkManager.INSTANCE.setElevationActivePointChangedListener(null);
-    BookmarkManager.INSTANCE.setElevationCurrentPositionChangedListener(null);
-  }
-
   private void highlightChartCurrentLocation()
   {
     mChart.highlightValues(Collections.singletonList(getCurrentPosHighlight()),
@@ -142,15 +135,17 @@ public class ChartController implements OnChartValueSelectedListener,
     mChart.getAxisRight().setEnabled(false);
   }
 
-  public void setData(@NonNull ElevationInfo info)
+  public void setData(Track track)
   {
-    mTrackId = info.getId();
+    mTrackId = track.getTrackId();
+    ElevationInfo info = track.getElevationInfo();
+    TrackStatistics stats = track.getTrackStatistics();
     List<Entry> values = new ArrayList<>();
 
     for (ElevationInfo.Point point : info.getPoints())
-      values.add(new Entry((float) point.getDistance(), point.getAltitude()));
+      values.add(new Entry((float) point.getDistance(), point.getAltitude(), point));
 
-    LineDataSet set = new LineDataSet(values, "Elevation_profile_points");
+    LineDataSet set = new LineDataSet(values, ELEVATION_PROFILE_POINTS);
     set.setMode(LineDataSet.Mode.CUBIC_BEZIER);
     set.setCubicIntensity(CUBIC_INTENSITY);
     set.setDrawFilled(true);
@@ -173,8 +168,8 @@ public class ChartController implements OnChartValueSelectedListener,
     mChart.setData(data);
     mChart.animateX(CHART_ANIMATION_DURATION);
 
-    mMinAltitude.setText(Framework.nativeFormatAltitude(info.getMinAltitude()));
-    mMaxAltitude.setText(Framework.nativeFormatAltitude(info.getMaxAltitude()));
+    mMinAltitude.setText(Framework.nativeFormatAltitude(stats.getMinElevation()));
+    mMaxAltitude.setText(Framework.nativeFormatAltitude(stats.getMaxElevation()));
 
     highlightActivePointManually();
   }
@@ -192,7 +187,9 @@ public class ChartController implements OnChartValueSelectedListener,
     if (mTrackId == Utils.INVALID_ID)
       return;
 
-    BookmarkManager.INSTANCE.setElevationActivePoint(mTrackId, e.getX());
+    if (mInformSelectedActivePointToCore)
+      BookmarkManager.INSTANCE.setElevationActivePoint(mTrackId, e.getX(), (ElevationInfo.Point) e.getData());
+    mInformSelectedActivePointToCore = true;
   }
 
   @NonNull
@@ -211,7 +208,6 @@ public class ChartController implements OnChartValueSelectedListener,
     highlightChartCurrentLocation();
   }
 
-  @Override
   public void onCurrentPositionChanged()
   {
     if (mTrackId == Utils.INVALID_ID)
@@ -222,7 +218,6 @@ public class ChartController implements OnChartValueSelectedListener,
     highlightActivePointManually();
   }
 
-  @Override
   public void onElevationActivePointChanged()
   {
     if (mTrackId == Utils.INVALID_ID)
@@ -234,6 +229,7 @@ public class ChartController implements OnChartValueSelectedListener,
   private void highlightActivePointManually()
   {
     Highlight highlight = getActivePoint();
+    mInformSelectedActivePointToCore = false;
     mChart.highlightValue(highlight, true);
   }
 
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Bookmark.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Bookmark.java
index 8b8a4705a..93f55e7e9 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Bookmark.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Bookmark.java
@@ -2,6 +2,7 @@ package app.organicmaps.sdk.bookmarks.data;
 
 import android.annotation.SuppressLint;
 import android.os.Parcel;
+import androidx.annotation.ColorInt;
 import androidx.annotation.IntRange;
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
@@ -110,6 +111,14 @@ public class Bookmark extends MapObject
     mCategoryId = catId;
   }
 
+  public void setIconColor(@ColorInt int color)
+  {
+    Icon icon = new Icon(PredefinedColors.getPredefinedColorIndex(color),
+                         BookmarkManager.INSTANCE.getBookmarkIcon(mBookmarkId));
+    BookmarkManager.INSTANCE.notifyParametersUpdating(this, getName(), icon, getBookmarkDescription());
+    mIcon = icon;
+  }
+
   public void setParams(@NonNull String title, @Nullable Icon icon, @NonNull String description)
   {
     BookmarkManager.INSTANCE.notifyParametersUpdating(this, title, icon, description);
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkManager.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkManager.java
index e683d4a56..128a90ef2 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkManager.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkManager.java
@@ -263,6 +263,12 @@ public enum BookmarkManager {
     return nativeUpdateBookmarkPlacePage(bmkId);
   }
 
+  @Nullable
+  public void updateTrackPlacePage(long trackId)
+  {
+    nativeUpdateTrackPlacePage(trackId);
+  }
+
   @Nullable
   public BookmarkInfo getBookmarkInfo(long bmkId)
   {
@@ -729,9 +735,9 @@ public enum BookmarkManager {
     return nativeGetElevationCurPositionDistance(trackId);
   }
 
-  public void setElevationActivePoint(long trackId, double distance)
+  public void setElevationActivePoint(long trackId, double distance, ElevationInfo.Point point)
   {
-    nativeSetElevationActivePoint(trackId, distance);
+    nativeSetElevationActivePoint(trackId, distance, point.getLatitude(), point.getLongitude());
   }
 
   public double getElevationActivePointDistance(long trackId)
@@ -739,9 +745,14 @@ public enum BookmarkManager {
     return nativeGetElevationActivePointDistance(trackId);
   }
 
+  private static native ElevationInfo.Point nativeGetElevationActivePointCoordinates(long trackId);
+
   @Nullable
   private native Bookmark nativeUpdateBookmarkPlacePage(long bmkId);
 
+  @Nullable
+  private native void nativeUpdateTrackPlacePage(long trackId);
+
   @Nullable
   private native BookmarkInfo nativeGetBookmarkInfo(long bmkId);
 
@@ -892,14 +903,25 @@ public enum BookmarkManager {
 
   public static native void nativeRemoveElevationCurrentPositionChangedListener();
 
-  private static native void nativeSetElevationActivePoint(long trackId, double distanceInMeters);
+  private static native void nativeSetElevationActivePoint(long trackId, double distanceInMeters, double latitude,
+                                                           double longitude);
 
   private static native double nativeGetElevationActivePointDistance(long trackId);
 
+  public ElevationInfo.Point getElevationActivePointCoordinates(long trackId)
+  {
+    return nativeGetElevationActivePointCoordinates(trackId);
+  }
+
   private static native void nativeSetElevationActiveChangedListener();
 
   public static native void nativeRemoveElevationActiveChangedListener();
 
+  public static native ElevationInfo nativeGetTrackElevationInfo(long trackId);
+
+  public static native boolean nativeIsElevationInfoHasValue(long trackId);
+
+  public static native TrackStatistics nativeGetTrackStatistics(long trackId);
   public interface BookmarksLoadingListener
   {
     default void onBookmarksLoadingStarted() {}
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/ElevationInfo.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/ElevationInfo.java
index c16b78df3..f501c25f5 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/ElevationInfo.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/ElevationInfo.java
@@ -15,42 +15,19 @@ import java.util.List;
 @SuppressWarnings("unused")
 public class ElevationInfo implements PlacePageData
 {
-  private final long mId;
-  @NonNull
-  private final String mName;
   @NonNull
   private final List<Point> mPoints;
-  private final int mAscent;
-  private final int mDescent;
-  private final int mMinAltitude;
-  private final int mMaxAltitude;
   private final int mDifficulty;
-  private final long mDuration;
 
-  public ElevationInfo(long trackId, @NonNull String name, @NonNull Point[] points, int ascent, int descent,
-                       int minAltitude, int maxAltitude, int difficulty, long duration)
+  public ElevationInfo(@NonNull Point[] points, int difficulty)
   {
-    mId = trackId;
-    mName = name;
     mPoints = Arrays.asList(points);
-    mAscent = ascent;
-    mDescent = descent;
-    mMinAltitude = minAltitude;
-    mMaxAltitude = maxAltitude;
     mDifficulty = difficulty;
-    mDuration = duration;
   }
 
   protected ElevationInfo(Parcel in)
   {
-    mId = in.readLong();
-    mName = in.readString();
-    mAscent = in.readInt();
-    mDescent = in.readInt();
-    mMinAltitude = in.readInt();
-    mMaxAltitude = in.readInt();
     mDifficulty = in.readInt();
-    mDuration = in.readLong();
     mPoints = readPoints(in);
   }
 
@@ -62,53 +39,17 @@ public class ElevationInfo implements PlacePageData
     return points;
   }
 
-  public long getId()
-  {
-    return mId;
-  }
-
-  @NonNull
-  public String getName()
-  {
-    return mName;
-  }
-
   @NonNull
   public List<Point> getPoints()
   {
     return Collections.unmodifiableList(mPoints);
   }
 
-  public int getAscent()
-  {
-    return mAscent;
-  }
-
-  public int getDescent()
-  {
-    return mDescent;
-  }
-
-  public int getMinAltitude()
-  {
-    return mMinAltitude;
-  }
-
-  public int getMaxAltitude()
-  {
-    return mMaxAltitude;
-  }
-
   public int getDifficulty()
   {
     return mDifficulty;
   }
 
-  public long getDuration()
-  {
-    return mDuration;
-  }
-
   @Override
   public int describeContents()
   {
@@ -118,14 +59,7 @@ public class ElevationInfo implements PlacePageData
   @Override
   public void writeToParcel(Parcel dest, int flags)
   {
-    dest.writeLong(mId);
-    dest.writeString(mName);
-    dest.writeInt(mAscent);
-    dest.writeInt(mDescent);
-    dest.writeInt(mMinAltitude);
-    dest.writeInt(mMaxAltitude);
     dest.writeInt(mDifficulty);
-    dest.writeLong(mDuration);
     // All collections are deserialized AFTER non-collection and primitive type objects,
     // so collections must be always serialized at the end.
     dest.writeTypedList(mPoints);
@@ -138,17 +72,23 @@ public class ElevationInfo implements PlacePageData
   {
     private final double mDistance;
     private final int mAltitude;
+    private final double mLatitude;
+    private final double mLongitude;
 
-    public Point(double distance, int altitude)
+    public Point(double distance, int altitude, double latitude, double longitude)
     {
       mDistance = distance;
       mAltitude = altitude;
+      mLatitude = latitude;
+      mLongitude = longitude;
     }
 
     protected Point(Parcel in)
     {
       mDistance = in.readDouble();
       mAltitude = in.readInt();
+      mLatitude = in.readDouble();
+      mLongitude = in.readDouble();
     }
 
     public static final Creator<Point> CREATOR = new Creator<>() {
@@ -175,6 +115,16 @@ public class ElevationInfo implements PlacePageData
       return mAltitude;
     }
 
+    public double getLatitude()
+    {
+      return mLatitude;
+    }
+
+    public double getLongitude()
+    {
+      return mLongitude;
+    }
+
     @Override
     public int describeContents()
     {
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/MapObject.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/MapObject.java
index 70e12cef7..fc097fe23 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/MapObject.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/MapObject.java
@@ -25,7 +25,7 @@ import java.util.Objects;
 public class MapObject implements PlacePageData
 {
   @Retention(RetentionPolicy.SOURCE)
-  @IntDef({POI, API_POINT, BOOKMARK, MY_POSITION, SEARCH})
+  @IntDef({POI, API_POINT, BOOKMARK, MY_POSITION, SEARCH, TRACK})
   public @interface MapObjectType
   {}
 
@@ -34,6 +34,7 @@ public class MapObject implements PlacePageData
   public static final int BOOKMARK = 2;
   public static final int MY_POSITION = 3;
   public static final int SEARCH = 4;
+  public static final int TRACK = 5;
 
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({OPENING_MODE_PREVIEW, OPENING_MODE_PREVIEW_PLUS, OPENING_MODE_DETAILS, OPENING_MODE_FULL})
@@ -315,6 +316,11 @@ public class MapObject implements PlacePageData
     return mMapObjectType == BOOKMARK;
   }
 
+  public final boolean isTrack()
+  {
+    return mMapObjectType == TRACK;
+  }
+
   @Nullable
   public RoutePointInfo getRoutePointInfo()
   {
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Track.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Track.java
index 1e713ad20..db73f6440 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Track.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Track.java
@@ -1,21 +1,32 @@
 package app.organicmaps.sdk.bookmarks.data;
 
+import androidx.annotation.IntRange;
 import androidx.annotation.Keep;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import app.organicmaps.sdk.routing.RoutePointInfo;
+import app.organicmaps.sdk.search.Popularity;
 import app.organicmaps.sdk.util.Distance;
 
 // Called from JNI.
 @Keep
 @SuppressWarnings("unused")
-public class Track
+public class Track extends MapObject
 {
   private final long mTrackId;
-  private final long mCategoryId;
+  private long mCategoryId;
   private final String mName;
   private final Distance mLength;
-  private final int mColor;
+  private int mColor;
+  @Nullable
+  private ElevationInfo mElevationInfo;
+  @Nullable
+  private TrackStatistics mTrackStatistics;
 
   Track(long trackId, long categoryId, String name, Distance length, int color)
   {
+    super(FeatureId.fromFeatureIdString("1:2:3"), TRACK, name, "", "", "", 0, 0, "", null, OPENING_MODE_PREVIEW_PLUS,
+          null, "", RoadWarningMarkType.UNKNOWN.ordinal(), null);
     mTrackId = trackId;
     mCategoryId = categoryId;
     mName = name;
@@ -23,6 +34,34 @@ public class Track
     mColor = color;
   }
 
+  // used by JNI
+  Track(@NonNull FeatureId featureId, @IntRange(from = 0) long categoryId, @IntRange(from = 0) long trackId,
+        String title, @Nullable String secondaryTitle, @Nullable String subtitle, @Nullable String address,
+        @Nullable RoutePointInfo routePointInfo, @OpeningMode int openingMode, @NonNull Popularity popularity,
+        @NonNull String description, @Nullable String[] rawTypes, int color, Distance length, double lat, double lon)
+  {
+    super(featureId, TRACK, title, secondaryTitle, subtitle, address, lat, lon, "", routePointInfo, openingMode,
+          popularity, description, RoadWarningMarkType.UNKNOWN.ordinal(), rawTypes);
+    mTrackId = trackId;
+    mCategoryId = categoryId;
+    mColor = color;
+    mName = title;
+    mLength = length;
+  }
+
+  // modifying this categoryId will not change the core data
+  // its just for temporary changes
+  public void setCategoryId(@NonNull long categoryId)
+  {
+    mCategoryId = categoryId;
+  }
+
+  public void setColor(@NonNull int color)
+  {
+    mColor = color;
+    BookmarkManager.INSTANCE.changeTrackColor(getTrackId(), color);
+  }
+
   public String getName()
   {
     return mName;
@@ -52,4 +91,25 @@ public class Track
   {
     return BookmarkManager.INSTANCE.getTrackDescription(mTrackId);
   }
+
+  public ElevationInfo getElevationInfo()
+  {
+    if (mElevationInfo != null)
+      return mElevationInfo;
+    mElevationInfo = BookmarkManager.nativeGetTrackElevationInfo(mTrackId);
+    return mElevationInfo;
+  }
+
+  public boolean isElevationInfoHasValue()
+  {
+    return BookmarkManager.nativeIsElevationInfoHasValue(mTrackId);
+  }
+
+  public TrackStatistics getTrackStatistics()
+  {
+    if (mTrackStatistics != null)
+      return mTrackStatistics;
+    mTrackStatistics = BookmarkManager.nativeGetTrackStatistics(mTrackId);
+    return mTrackStatistics;
+  }
 }
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/TrackStatistics.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/TrackStatistics.java
new file mode 100644
index 000000000..bfee37e89
--- /dev/null
+++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/TrackStatistics.java
@@ -0,0 +1,57 @@
+package app.organicmaps.sdk.bookmarks.data;
+
+import androidx.annotation.Keep;
+
+// Used by JNI
+@Keep
+public class TrackStatistics
+{
+  private final double m_length;
+  private final double m_duration;
+  private final double m_ascent;
+  private final double m_descent;
+  private final int m_minElevation;
+  private final int m_maxElevation;
+
+  @Keep
+  public TrackStatistics(double length, double duration, double ascent, double descent, int minElevation,
+                         int maxElevation)
+  {
+    m_length = length;
+    m_duration = duration;
+    m_ascent = ascent;
+    m_descent = descent;
+    m_minElevation = minElevation;
+    m_maxElevation = maxElevation;
+  }
+
+  public double getLength()
+  {
+    return m_length;
+  }
+
+  public double getDuration()
+  {
+    return m_duration;
+  }
+
+  public double getAscent()
+  {
+    return m_ascent;
+  }
+
+  public double getDescent()
+  {
+    return m_descent;
+  }
+
+  public int getMinElevation()
+  {
+    return m_minElevation;
+  }
+
+  public int getMaxElevation()
+  {
+    return m_maxElevation;
+  }
+}
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/AxisValueFormatter.java b/android/app/src/main/java/app/organicmaps/widget/placepage/AxisValueFormatter.java
index d3542f370..0543be12b 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/AxisValueFormatter.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/AxisValueFormatter.java
@@ -1,7 +1,7 @@
 package app.organicmaps.widget.placepage;
 
 import androidx.annotation.NonNull;
-import app.organicmaps.sdk.Framework;
+import app.organicmaps.sdk.util.StringUtils;
 import com.github.mikephil.charting.charts.BarLineChartBase;
 import com.github.mikephil.charting.formatter.DefaultValueFormatter;
 
@@ -20,6 +20,6 @@ public class AxisValueFormatter extends DefaultValueFormatter
   @Override
   public String getFormattedValue(float value)
   {
-    return Framework.nativeFormatAltitude(value);
+    return StringUtils.nativeFormatDistance(value).toString(mChart.getContext());
   }
 }
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java b/android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java
index d6a808555..bce8db144 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java
@@ -1,7 +1,6 @@
 package app.organicmaps.widget.placepage;
 
 import android.content.Context;
-import android.os.Bundle;
 import android.view.View;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -12,18 +11,19 @@ import app.organicmaps.ChartController;
 import app.organicmaps.R;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.bookmarks.data.ElevationInfo;
+import app.organicmaps.sdk.bookmarks.data.Track;
+import app.organicmaps.sdk.bookmarks.data.TrackStatistics;
 import app.organicmaps.sdk.util.UiUtils;
-import app.organicmaps.sdk.widget.placepage.PlacePageData;
 import app.organicmaps.util.Utils;
 import java.util.Objects;
 
-@SuppressWarnings("unused") // https://github.com/organicmaps/organicmaps/issues/2829
 public class ElevationProfileViewRenderer implements PlacePageStateListener
 {
   // Must be correspond to map/elevation_info.hpp constants.
   private static final int MAX_DIFFICULTY_LEVEL = 3;
   private static final int UNKNOWN_DIFFICULTY = 0;
-
+  @NonNull
+  private final View[] mDifficultyLevels = new View[MAX_DIFFICULTY_LEVEL];
   @SuppressWarnings("NullableProblems")
   @NonNull
   private NestedScrollView mScrollView;
@@ -45,8 +45,6 @@ public class ElevationProfileViewRenderer implements PlacePageStateListener
   @SuppressWarnings("NullableProblems")
   @NonNull
   private TextView mTime;
-  @NonNull
-  private final View[] mDifficultyLevels = new View[MAX_DIFFICULTY_LEVEL];
   @SuppressWarnings("NullableProblems")
   @NonNull
   private ChartController mChartController;
@@ -58,23 +56,7 @@ public class ElevationProfileViewRenderer implements PlacePageStateListener
   @SuppressWarnings("NullableProblems")
   @NonNull
   private View mTimeContainer;
-
-  public void render(@NonNull PlacePageData data)
-  {
-    final Context context = mAscent.getContext();
-
-    mElevationInfo = (ElevationInfo) data;
-    mChartController.setData(mElevationInfo);
-    mTitle.setText(mElevationInfo.getName());
-    setDifficulty(mElevationInfo.getDifficulty());
-    mAscent.setText(formatDistance(context, mElevationInfo.getAscent()));
-    mDescent.setText(formatDistance(context, mElevationInfo.getDescent()));
-    mMaxAltitude.setText(formatDistance(context, mElevationInfo.getMaxAltitude()));
-    mMinAltitude.setText(formatDistance(context, mElevationInfo.getMinAltitude()));
-    UiUtils.hideIf(mElevationInfo.getDuration() == 0, mTimeContainer);
-    mTime.setText(
-        Utils.formatRoutingTime(mTitle.getContext(), (int) mElevationInfo.getDuration(), R.dimen.text_size_body_2));
-  }
+  private View mTitleContainer;
 
   @NonNull
   private static String formatDistance(final Context context, int distance)
@@ -82,6 +64,24 @@ public class ElevationProfileViewRenderer implements PlacePageStateListener
     return Framework.nativeFormatAltitude(distance);
   }
 
+  public void render(@NonNull Track track)
+  {
+    final Context context = mAscent.getContext();
+    TrackStatistics stats = track.getTrackStatistics();
+
+    mElevationInfo = track.getElevationInfo();
+    mChartController.setData(track);
+    UiUtils.hide(mTitleContainer);
+    mTitle.setText(track.getName());
+    setDifficulty(mElevationInfo.getDifficulty());
+    mAscent.setText(formatDistance(context, (int) stats.getAscent()));
+    mDescent.setText(formatDistance(context, (int) stats.getDescent()));
+    mMaxAltitude.setText(formatDistance(context, stats.getMaxElevation()));
+    mMinAltitude.setText(formatDistance(context, stats.getMinElevation()));
+    UiUtils.hide(mTimeContainer);
+    mTime.setText(Utils.formatRoutingTime(mAscent.getContext(), (int) stats.getDuration(), R.dimen.text_size_body_2));
+  }
+
   public void initialize(@Nullable View view)
   {
     Objects.requireNonNull(view);
@@ -89,6 +89,7 @@ public class ElevationProfileViewRenderer implements PlacePageStateListener
     mChartController.initialize(view);
     mScrollView = (NestedScrollView) view;
     mTitle = view.findViewById(R.id.title);
+    mTitleContainer = view.findViewById(R.id.title_container);
     mAscent = view.findViewById(R.id.ascent);
     mDescent = view.findViewById(R.id.descent);
     mMaxAltitude = view.findViewById(R.id.max_altitude);
@@ -123,21 +124,13 @@ public class ElevationProfileViewRenderer implements PlacePageStateListener
       mDifficultyLevels[i].setEnabled(true);
   }
 
-  public void onSave(@NonNull Bundle outState)
+  public void onChartElevationActivePointChanged()
   {
-    //    outState.putParcelable(PlacePageUtils.EXTRA_PLACE_PAGE_DATA, mElevationInfo);
+    mChartController.onElevationActivePointChanged();
   }
 
-  public void onRestore(@NonNull Bundle inState)
+  public void onChartCurrentPositionChanged()
   {
-    //    mElevationInfo = BundleCompat.getParcelable(inState, PlacePageUtils.EXTRA_PLACE_PAGE_DATA,
-    //    ElevationInfo.class); if (mElevationInfo != null)
-    //      render(mElevationInfo);
-  }
-
-  public void onHide()
-  {
-    mScrollView.scrollTo(0, 0);
-    mChartController.onHide();
+    mChartController.onCurrentPositionChanged();
   }
 }
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/FloatingMarkerView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/FloatingMarkerView.java
index a58ab35b1..d31e70030 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/FloatingMarkerView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/FloatingMarkerView.java
@@ -37,9 +37,6 @@ public class FloatingMarkerView extends RelativeLayout implements IMarker
   private TextView mAltitudeView;
   @SuppressWarnings("NullableProblems")
   @NonNull
-  private TextView mDistanceTextView;
-  @SuppressWarnings("NullableProblems")
-  @NonNull
   private TextView mDistanceValueView;
   @SuppressWarnings("NullableProblems")
   @NonNull
@@ -93,7 +90,6 @@ public class FloatingMarkerView extends RelativeLayout implements IMarker
     mTextContentContainer = findViewById(R.id.floating_text_container);
     mFloatingTriangle = findViewById(R.id.floating_triangle);
     mImage = findViewById(R.id.image);
-    mDistanceTextView = findViewById(R.id.distance_text);
     mAltitudeView = findViewById(R.id.altitude);
     mDistanceValueView = findViewById(R.id.distance_value);
   }
@@ -125,7 +121,7 @@ public class FloatingMarkerView extends RelativeLayout implements IMarker
   public void updateOffsets(@NonNull Entry entry, @NonNull Highlight highlight)
   {
     updateVertical(entry);
-    final float halfImg = Math.abs(mImage.getWidth()) / 2f;
+    final float halfImg = mImage.getResources().getDimensionPixelSize(R.dimen.elevation_profile_marker_width) / 2f;
     boolean isLeftToRightDirection = isInvertedOrder(highlight);
     mOffset = isLeftToRightDirection ? -getWidth() + halfImg : -halfImg;
     updateHorizontal(highlight);
@@ -184,7 +180,6 @@ public class FloatingMarkerView extends RelativeLayout implements IMarker
 
   private void updatePointValues(@NonNull Entry entry)
   {
-    mDistanceTextView.setText(R.string.elevation_profile_distance);
     mDistanceValueView.setText(
         StringUtils.nativeFormatDistance(entry.getX()).toString(mDistanceValueView.getContext()));
     mAltitudeView.setText(Framework.nativeFormatAltitude(entry.getY()));
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageButtonFactory.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageButtonFactory.java
index 5f3978a0a..8d4898b3c 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageButtonFactory.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageButtonFactory.java
@@ -34,6 +34,11 @@ public class PlacePageButtonFactory
         titleId = R.string.delete;
         yield R.drawable.ic_bookmarks_on;
       }
+      case TRACK_DELETE ->
+      {
+        titleId = R.string.delete;
+        yield R.drawable.ic_delete;
+      }
       case ROUTE_FROM ->
       {
         titleId = R.string.p2p_from_here;
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageButtons.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageButtons.java
index cc98ca6c4..5664f5933 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageButtons.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageButtons.java
@@ -136,6 +136,7 @@ public final class PlacePageButtons extends Fragment implements Observer<List<Pl
     BACK,
     BOOKMARK_SAVE,
     BOOKMARK_DELETE,
+    TRACK_DELETE,
     ROUTE_FROM,
     ROUTE_TO,
     ROUTE_ADD,
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
index a7751ebf3..db21996f2 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
@@ -2,6 +2,7 @@ package app.organicmaps.widget.placepage;
 
 import android.animation.ValueAnimator;
 import android.app.Activity;
+import android.app.Dialog;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
@@ -30,6 +31,7 @@ import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
 import app.organicmaps.sdk.bookmarks.data.RoadWarningMarkType;
+import app.organicmaps.sdk.bookmarks.data.Track;
 import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.settings.RoadType;
 import app.organicmaps.sdk.util.UiUtils;
@@ -38,6 +40,7 @@ import app.organicmaps.util.ThemeUtils;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetItem;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.shape.MaterialShapeDrawable;
 import java.util.ArrayList;
 import java.util.List;
@@ -74,6 +77,7 @@ public class PlacePageController
 
   private ValueAnimator mCustomPeekHeightAnimator;
   private PlacePageRouteSettingsListener mPlacePageRouteSettingsListener;
+  private Dialog mAlertDialog;
 
   private final Observer<Integer> mPlacePageDistanceToTopObserver = new Observer<>() {
     private float mPlacePageCornerRadius;
@@ -120,7 +124,6 @@ public class PlacePageController
       bg.setCornerSize(mPlacePageCornerRadius);
     }
   };
-
   private final BottomSheetBehavior.BottomSheetCallback mDefaultBottomSheetCallback =
       new BottomSheetBehavior.BottomSheetCallback() {
         @Override
@@ -145,6 +148,18 @@ public class PlacePageController
         }
       };
 
+  @NonNull
+  private static PlacePageButtons.ButtonType toPlacePageButton(@NonNull RoadWarningMarkType type)
+  {
+    return switch (type)
+    {
+      case DIRTY -> PlacePageButtons.ButtonType.ROUTE_AVOID_UNPAVED;
+      case FERRY -> PlacePageButtons.ButtonType.ROUTE_AVOID_FERRY;
+      case TOLL -> PlacePageButtons.ButtonType.ROUTE_AVOID_TOLL;
+      default -> throw new AssertionError("Unsupported road warning type: " + type);
+    };
+  }
+
   @Nullable
   @Override
   public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
@@ -202,18 +217,6 @@ public class PlacePageController
     ViewCompat.requestApplyInsets(mPlacePage);
   }
 
-  @NonNull
-  private static PlacePageButtons.ButtonType toPlacePageButton(@NonNull RoadWarningMarkType type)
-  {
-    return switch (type)
-    {
-      case DIRTY -> PlacePageButtons.ButtonType.ROUTE_AVOID_UNPAVED;
-      case FERRY -> PlacePageButtons.ButtonType.ROUTE_AVOID_FERRY;
-      case TOLL -> PlacePageButtons.ButtonType.ROUTE_AVOID_TOLL;
-      default -> throw new AssertionError("Unsupported road warning type: " + type);
-    };
-  }
-
   private void stopCustomPeekHeightAnimation()
   {
     if (mCustomPeekHeightAnimator != null && mCustomPeekHeightAnimator.isStarted())
@@ -415,6 +418,7 @@ public class PlacePageController
     switch (item)
     {
     case BOOKMARK_SAVE, BOOKMARK_DELETE -> onBookmarkBtnClicked();
+    case TRACK_DELETE -> onTrackRemoveClicked();
     case BACK -> onBackBtnClicked();
     case ROUTE_FROM -> onRouteFromBtnClicked();
     case ROUTE_TO -> onRouteToBtnClicked();
@@ -439,6 +443,48 @@ public class PlacePageController
       BookmarkManager.INSTANCE.addNewBookmark(mMapObject.getLat(), mMapObject.getLon());
   }
 
+  private void onTrackRemoveClicked()
+  {
+    // mMapObject is set to null when the place page closes
+    // We don't want users to interact with the buttons when the PP is closing
+    if (mMapObject == null)
+      return;
+    showTrackDeleteAlertDialog();
+  }
+
+  void showTrackDeleteAlertDialog()
+  {
+    if (mMapObject == null)
+      return;
+    if (mAlertDialog != null)
+    {
+      mAlertDialog.dismiss();
+      mAlertDialog.show();
+      mViewModel.isAlertDialogShowing = true;
+      return;
+    }
+    mViewModel.isAlertDialogShowing = true;
+    mAlertDialog = new MaterialAlertDialogBuilder(requireContext(), R.style.MwmTheme_AlertDialog)
+                       .setTitle("Would you like to delete " + mMapObject.getTitle() + "?")
+                       .setCancelable(true)
+                       .setNegativeButton(R.string.cancel, null)
+                       .setPositiveButton("delete",
+                                          (dialog, which) -> {
+                                            BookmarkManager.INSTANCE.deleteTrack(((Track) mMapObject).getTrackId());
+                                            close();
+                                          })
+                       .setOnDismissListener(dialog -> dismissAlertDialog())
+                       .show();
+  }
+
+  void dismissAlertDialog()
+  {
+    if (mAlertDialog == null)
+      return;
+    mAlertDialog.dismiss();
+    mViewModel.isAlertDialogShowing = false;
+  }
+
   private void onBackBtnClicked()
   {
     if (mMapObject == null)
@@ -577,8 +623,12 @@ public class PlacePageController
       if (needToShowRoutingButtons && RoutingController.get().isStopPointAllowed())
         buttons.add(PlacePageButtons.ButtonType.ROUTE_ADD);
       else
+      {
         buttons.add(mapObject.isBookmark() ? PlacePageButtons.ButtonType.BOOKMARK_DELETE
                                            : PlacePageButtons.ButtonType.BOOKMARK_SAVE);
+        if (mapObject.isTrack())
+          buttons.add(PlacePageButtons.ButtonType.TRACK_DELETE);
+      }
 
       if (needToShowRoutingButtons)
       {
@@ -610,6 +660,8 @@ public class PlacePageController
       // Place page will automatically open when the bottom sheet content is loaded so we can compute the peek height
       createPlacePageFragments();
       updateButtons(mapObject, showBackButton, !mMapObject.isMyPosition());
+      if (mViewModel.isAlertDialogShowing)
+        showTrackDeleteAlertDialog();
     }
     else
       close();
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
index 6d0091334..edc150685 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
@@ -6,6 +6,7 @@ import static app.organicmaps.sdk.util.Utils.getLocalizedFeatureType;
 import static app.organicmaps.sdk.util.Utils.getTagValueLocalized;
 
 import android.content.Context;
+import android.graphics.drawable.Drawable;
 import android.location.Location;
 import android.net.Uri;
 import android.os.Bundle;
@@ -16,25 +17,39 @@ import android.text.style.ForegroundColorSpan;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
+import androidx.activity.result.ActivityResultLauncher;
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentFactory;
 import androidx.fragment.app.FragmentManager;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import app.organicmaps.MwmActivity;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
+import app.organicmaps.bookmarks.BookmarksSharingHelper;
+import app.organicmaps.bookmarks.ChooseBookmarkCategoryFragment;
 import app.organicmaps.downloader.DownloaderStatusIcon;
 import app.organicmaps.editor.OhState;
 import app.organicmaps.sdk.Framework;
+import app.organicmaps.sdk.bookmarks.data.Bookmark;
+import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
+import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
+import app.organicmaps.sdk.bookmarks.data.BookmarkSharingResult;
 import app.organicmaps.sdk.bookmarks.data.DistanceAndAzimut;
+import app.organicmaps.sdk.bookmarks.data.Icon;
+import app.organicmaps.sdk.bookmarks.data.KmlFileType;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
 import app.organicmaps.sdk.bookmarks.data.Metadata;
+import app.organicmaps.sdk.bookmarks.data.PredefinedColors;
+import app.organicmaps.sdk.bookmarks.data.Track;
 import app.organicmaps.sdk.downloader.CountryItem;
 import app.organicmaps.sdk.downloader.MapManager;
 import app.organicmaps.sdk.editor.Editor;
@@ -49,13 +64,17 @@ import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.sdk.util.concurrency.UiThread;
 import app.organicmaps.sdk.widget.placepage.CoordinatesFormat;
+import app.organicmaps.util.Graphics;
 import app.organicmaps.util.SharingUtils;
 import app.organicmaps.util.Utils;
+import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
+import app.organicmaps.util.bottomsheet.MenuBottomSheetItem;
 import app.organicmaps.widget.ArrowView;
 import app.organicmaps.widget.placepage.sections.PlacePageBookmarkFragment;
 import app.organicmaps.widget.placepage.sections.PlacePageLinksFragment;
 import app.organicmaps.widget.placepage.sections.PlacePageOpeningHoursFragment;
 import app.organicmaps.widget.placepage.sections.PlacePagePhoneFragment;
+import app.organicmaps.widget.placepage.sections.PlacePageTrackFragment;
 import app.organicmaps.widget.placepage.sections.PlacePageWikipediaFragment;
 import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.button.MaterialButton;
@@ -68,15 +87,19 @@ import java.util.Arrays;
 import java.util.List;
 
 public class PlacePageView extends Fragment
-    implements View.OnClickListener, View.OnLongClickListener, LocationListener, SensorListener, Observer<MapObject>
+    implements View.OnClickListener, View.OnLongClickListener, LocationListener, SensorListener, Observer<MapObject>,
+               ChooseBookmarkCategoryFragment.Listener, EditBookmarkFragment.EditBookmarkListener,
+               MenuBottomSheetFragment.MenuBottomSheetInterface, BookmarkManager.BookmarksSharingListener
 
 {
   private static final String PREF_COORDINATES_FORMAT = "coordinates_format";
   private static final String BOOKMARK_FRAGMENT_TAG = "BOOKMARK_FRAGMENT_TAG";
+  private static final String TRACK_FRAGMENT_TAG = "TRACK_FRAGMENT_TAG";
   private static final String WIKIPEDIA_FRAGMENT_TAG = "WIKIPEDIA_FRAGMENT_TAG";
   private static final String PHONE_FRAGMENT_TAG = "PHONE_FRAGMENT_TAG";
   private static final String OPENING_HOURS_FRAGMENT_TAG = "OPENING_HOURS_FRAGMENT_TAG";
   private static final String LINKS_FRAGMENT_TAG = "LINKS_FRAGMENT_TAG";
+  private static final String TRACK_SHARE_MENU_ID = "TRACK_SHARE_MENU_ID";
 
   private static final List<CoordinatesFormat> visibleCoordsFormat =
       Arrays.asList(CoordinatesFormat.LatLonDMS, CoordinatesFormat.LatLonDecimal, CoordinatesFormat.OLCFull,
@@ -124,12 +147,16 @@ public class PlacePageView extends Fragment
   private View mAddOrganisation;
   private View mAddPlace;
   private View mEditTopSpace;
+  private ImageView mColorIcon;
+  private TextView mTvCategory;
+  private ImageView mEditBookmark;
 
   // Data
   private CoordinatesFormat mCoordsFormat = CoordinatesFormat.LatLonDecimal;
   // Downloader`s stuff
   private DownloaderStatusIcon mDownloaderIcon;
   private MaterialTextView mDownloaderInfo;
+  private ActivityResultLauncher<SharingUtils.SharingIntent> shareLauncher;
   private int mStorageCallbackSlot;
   @Nullable
   private CountryItem mCurrentCountry;
@@ -185,6 +212,7 @@ public class PlacePageView extends Fragment
                            @Nullable Bundle savedInstanceState)
   {
     mViewModel = new ViewModelProvider(requireActivity()).get(PlacePageViewModel.class);
+    shareLauncher = SharingUtils.RegisterLauncher(this);
     return inflater.inflate(R.layout.place_page, container, false);
   }
 
@@ -232,8 +260,12 @@ public class PlacePageView extends Fragment
     mTvAddress.setOnLongClickListener(this);
     mTvAddress.setOnClickListener(this);
 
+    mColorIcon = mFrame.findViewById(R.id.item_icon);
+    mTvCategory = mFrame.findViewById(R.id.tv__category);
+    mEditBookmark = mFrame.findViewById(R.id.edit_Bookmark);
+
     MaterialButton shareButton = mPreview.findViewById(R.id.share_button);
-    shareButton.setOnClickListener((v) -> SharingUtils.shareMapObject(requireContext(), mMapObject));
+    shareButton.setOnClickListener(this::shareClickListener);
 
     final MaterialButton closeButton = mPreview.findViewById(R.id.close_button);
     closeButton.setOnClickListener((v) -> mPlacePageViewListener.onPlacePageRequestClose());
@@ -301,6 +333,7 @@ public class PlacePageView extends Fragment
   {
     super.onStart();
     mViewModel.getMapObject().observe(requireActivity(), this);
+    BookmarkManager.INSTANCE.addSharingListener(this);
     MwmApplication.from(requireContext()).getLocationHelper().addListener(this);
     MwmApplication.from(requireContext()).getSensorHelper().addListener(this);
   }
@@ -310,6 +343,7 @@ public class PlacePageView extends Fragment
   {
     super.onStop();
     mViewModel.getMapObject().removeObserver(this);
+    BookmarkManager.INSTANCE.removeSharingListener(this);
     MwmApplication.from(requireContext()).getLocationHelper().removeListener(this);
     MwmApplication.from(requireContext()).getSensorHelper().removeListener(this);
     UiThread.cancelDelayedTasks(updateOpenState);
@@ -334,6 +368,10 @@ public class PlacePageView extends Fragment
       refreshMyPosition(loc);
     else
       refreshDistanceToObject(loc);
+    UiUtils.hideIf(mMapObject.isTrack(), mFrame.findViewById(R.id.ll__place_latlon),
+                   mFrame.findViewById(R.id.ll__place_open_in), mFrame.findViewById(R.id.ll__place_add), mEditTopSpace,
+                   mTvAzimuth, mTvDistance, mAvDirection);
+    UiUtils.hideIf(MapObjectType.getMapObjectType(mMapObject) != MapObjectType.OTHER, mTvSubtitle);
   }
 
   private <T extends Fragment> void updateViewFragment(Class<T> controllerClass, String fragmentTag,
@@ -375,6 +413,12 @@ public class PlacePageView extends Fragment
                        mMapObject.isBookmark());
   }
 
+  private void updateTrackView()
+  {
+    updateViewFragment(PlacePageTrackFragment.class, TRACK_FRAGMENT_TAG, R.id.place_page_track_fragment,
+                       mMapObject.isTrack());
+  }
+
   private boolean hasWikipediaEntry()
   {
     final String wikipediaLink = mMapObject.getMetadata(Metadata.MetadataType.FMD_WIKIPEDIA);
@@ -416,6 +460,180 @@ public class PlacePageView extends Fragment
       mToolbar.setTitle(mMapObject.getTitle());
     setTextAndColorizeSubtitle();
     UiUtils.setTextAndHideIfEmpty(mTvAddress, mMapObject.getAddress());
+    refreshCategoryPreview();
+  }
+
+  void refreshCategoryPreview()
+  {
+    View categoryContainer = mFrame.findViewById(R.id.category_container);
+    switch (MapObjectType.getMapObjectType(mMapObject))
+    {
+    case TRACK ->
+    {
+      Track track = (Track) mMapObject;
+      Drawable circle =
+          Graphics.drawCircle(track.getColor(), R.dimen.place_page_icon_size, requireContext().getResources());
+      mColorIcon.setImageDrawable(circle);
+      mTvCategory.setText(BookmarkManager.INSTANCE.getCategoryById(track.getCategoryId()).getName());
+      UiUtils.show(mColorIcon, mTvCategory, categoryContainer);
+    }
+    case BOOKMARK ->
+    {
+      Bookmark bookmark = (Bookmark) mMapObject;
+      Icon icon = bookmark.getIcon();
+      if (icon != null)
+      {
+        Drawable circle = Graphics.drawCircleAndImage(icon.argb(), R.dimen.place_page_icon_size,
+                                                      app.organicmaps.sdk.R.drawable.ic_bookmark_none,
+                                                      R.dimen.place_page_icon_mark_size, requireContext());
+        mColorIcon.setImageDrawable(circle);
+        mTvCategory.setText(BookmarkManager.INSTANCE.getCategoryById(bookmark.getCategoryId()).getName());
+        UiUtils.show(mColorIcon, mTvCategory, categoryContainer);
+      }
+    }
+    case OTHER -> UiUtils.hide(mColorIcon, mTvCategory, categoryContainer);
+    }
+    mColorIcon.setOnClickListener(this::onClick);
+    mTvCategory.setOnClickListener(this::onClick);
+    mEditBookmark.setOnClickListener(this::onClick);
+  }
+
+  void showColorDialog()
+  {
+    final Bundle args = new Bundle();
+    final FragmentManager manager = getChildFragmentManager();
+    String className = BookmarkColorDialogFragment.class.getName();
+    final FragmentFactory factory = manager.getFragmentFactory();
+    final BookmarkColorDialogFragment dialogFragment =
+        (BookmarkColorDialogFragment) factory.instantiate(getContext().getClassLoader(), className);
+    dialogFragment.setArguments(args);
+
+    switch (MapObjectType.getMapObjectType(mMapObject))
+    {
+    case TRACK ->
+    {
+      final Track mTrack = (Track) mMapObject;
+      args.putInt(BookmarkColorDialogFragment.ICON_COLOR, PredefinedColors.getPredefinedColorIndex(mTrack.getColor()));
+      dialogFragment.setOnColorSetListener((colorPos) -> {
+        int from = mTrack.getColor();
+        int to = PredefinedColors.getColor(colorPos);
+        if (from == to)
+          return;
+        mViewModel.modifyMapObjectColorSilently(to);
+        Drawable circle = Graphics.drawCircle(to, R.dimen.place_page_icon_size, requireContext().getResources());
+        mColorIcon.setImageDrawable(circle);
+      });
+      dialogFragment.show(requireActivity().getSupportFragmentManager(), null);
+    }
+    case BOOKMARK ->
+    {
+      final Bookmark bookmark = (Bookmark) mMapObject;
+      args.putInt(BookmarkColorDialogFragment.ICON_COLOR, bookmark.getIcon().getColor());
+      args.putInt(BookmarkColorDialogFragment.ICON_RES, bookmark.getIcon().getResId());
+      dialogFragment.setOnColorSetListener((colorPos) -> {
+        int from = bookmark.getIcon().argb();
+        int to = PredefinedColors.getColor(colorPos);
+        if (from == to)
+          return;
+        mViewModel.modifyMapObjectColorSilently(to);
+        Drawable circle = Graphics.drawCircleAndImage(to, R.dimen.place_page_icon_size,
+                                                      app.organicmaps.sdk.R.drawable.ic_bookmark_none,
+                                                      R.dimen.place_page_icon_mark_size, requireContext());
+        mColorIcon.setImageDrawable(circle);
+      });
+      dialogFragment.show(requireActivity().getSupportFragmentManager(), null);
+    }
+    }
+  }
+
+  private void showCategoryList()
+  {
+    final Bundle args = new Bundle();
+    final List<BookmarkCategory> categories = BookmarkManager.INSTANCE.getCategories();
+    final FragmentManager manager = getChildFragmentManager();
+    String className = ChooseBookmarkCategoryFragment.class.getName();
+    final FragmentFactory factory = manager.getFragmentFactory();
+    final ChooseBookmarkCategoryFragment frag =
+        (ChooseBookmarkCategoryFragment) factory.instantiate(getContext().getClassLoader(), className);
+    switch (MapObjectType.getMapObjectType(mMapObject))
+    {
+    case TRACK ->
+    {
+      Track track = (Track) mMapObject;
+      BookmarkCategory currentCategory = BookmarkManager.INSTANCE.getCategoryById(track.getCategoryId());
+      final int index = categories.indexOf(currentCategory);
+      args.putInt(ChooseBookmarkCategoryFragment.CATEGORY_POSITION, index);
+      frag.setArguments(args);
+      frag.show(manager, null);
+    }
+    case BOOKMARK ->
+    {
+      Bookmark bookmark = (Bookmark) mMapObject;
+      BookmarkCategory currentCategory = BookmarkManager.INSTANCE.getCategoryById(bookmark.getCategoryId());
+      final int index = categories.indexOf(currentCategory);
+      args.putInt(ChooseBookmarkCategoryFragment.CATEGORY_POSITION, index);
+      frag.setArguments(args);
+      frag.show(manager, null);
+    }
+    }
+  }
+
+  @Override
+  public void onCategoryChanged(@NonNull BookmarkCategory newCategory)
+  {
+    switch (MapObjectType.getMapObjectType(mMapObject))
+    {
+    case TRACK ->
+    {
+      Track track = (Track) mMapObject;
+      BookmarkCategory previousCategory = BookmarkManager.INSTANCE.getCategoryById(track.getCategoryId());
+      if (previousCategory == newCategory)
+        return;
+      BookmarkManager.INSTANCE.notifyCategoryChanging(track, newCategory.getId());
+      mTvCategory.setText(newCategory.getName());
+      mViewModel.modifyMapObjectCategoryIdSilently(newCategory.getId());
+    }
+    case BOOKMARK ->
+    {
+      Bookmark bookmark = (Bookmark) mMapObject;
+      BookmarkCategory previousCategory = BookmarkManager.INSTANCE.getCategoryById(bookmark.getCategoryId());
+      if (previousCategory == newCategory)
+        return;
+      mTvCategory.setText(newCategory.getName());
+      mViewModel.modifyMapObjectCategoryIdSilently(newCategory.getId());
+    }
+    }
+  }
+
+  void showBookmarkEditFragment()
+  {
+    switch (MapObjectType.getMapObjectType(mMapObject))
+    {
+    case TRACK ->
+    {
+      Track track = (Track) mMapObject;
+      final FragmentActivity activity = requireActivity();
+      EditBookmarkFragment.editTrack(track.getCategoryId(), track.getTrackId(), activity, getChildFragmentManager(),
+                                     PlacePageView.this);
+    }
+    case BOOKMARK ->
+    {
+      Bookmark bookmark = (Bookmark) mMapObject;
+      final FragmentActivity activity = requireActivity();
+      EditBookmarkFragment.editBookmark(bookmark.getCategoryId(), bookmark.getBookmarkId(), activity,
+                                        getChildFragmentManager(), PlacePageView.this);
+    }
+    }
+  }
+
+  @Override
+  public void onBookmarkSaved(long bookmarkId, boolean movedFromCategory)
+  {
+    switch (MapObjectType.getMapObjectType(mMapObject))
+    {
+    case TRACK -> BookmarkManager.INSTANCE.updateTrackPlacePage(bookmarkId);
+    case BOOKMARK -> BookmarkManager.INSTANCE.updateBookmarkPlacePage(bookmarkId);
+    }
   }
 
   private void refreshDetails()
@@ -494,6 +712,7 @@ public class PlacePageView extends Fragment
     updateWikipediaView();
     updateBookmarkView();
     updatePhoneView();
+    updateTrackView();
   }
 
   private void refreshWiFi()
@@ -532,6 +751,8 @@ public class PlacePageView extends Fragment
 
   private void refreshDistanceToObject(Location l)
   {
+    if (mMapObject.isTrack())
+      return;
     UiUtils.showIf(l != null, mTvDistance);
     if (l == null)
       return;
@@ -660,6 +881,12 @@ public class PlacePageView extends Fragment
     }
     else if (id == R.id.direction_frame)
       showBigDirection();
+    else if (id == R.id.item_icon)
+      showColorDialog();
+    else if (id == R.id.edit_Bookmark)
+      showBookmarkEditFragment();
+    else if (id == R.id.tv__category)
+      showCategoryList();
   }
 
   private void showBigDirection()
@@ -818,7 +1045,7 @@ public class PlacePageView extends Fragment
   @Override
   public void onCompassUpdated(double north)
   {
-    if (mMapObject == null || mMapObject.isMyPosition())
+    if (mMapObject == null || mMapObject.isMyPosition() || mMapObject.isTrack())
       return;
 
     final Location location = MwmApplication.from(requireContext()).getLocationHelper().getSavedLocation();
@@ -840,6 +1067,50 @@ public class PlacePageView extends Fragment
     }
   }
 
+  void shareClickListener(View v)
+  {
+    if (mMapObject.isTrack())
+    {
+      MenuBottomSheetFragment.newInstance(TRACK_SHARE_MENU_ID, getString(R.string.PP_track_bottom_sheet_title))
+          .show(getChildFragmentManager(), TRACK_SHARE_MENU_ID);
+    }
+    else
+      SharingUtils.shareMapObject(requireContext(), mMapObject);
+  }
+
+  private void onShareTrackSelected(long trackId, KmlFileType kmlFileType)
+  {
+    BookmarksSharingHelper.INSTANCE.prepareTrackForSharing(requireActivity(), trackId, kmlFileType);
+  }
+
+  @Nullable
+  @Override
+  public ArrayList<MenuBottomSheetItem> getMenuBottomSheetItems(String id)
+  {
+    return switch (id)
+    {
+      case TRACK_SHARE_MENU_ID -> getTrackShareMenuItems();
+      default -> null;
+    };
+  }
+
+  public ArrayList<MenuBottomSheetItem> getTrackShareMenuItems()
+  {
+    Track track = (Track) mMapObject;
+    ArrayList<MenuBottomSheetItem> items = new ArrayList<>();
+    items.add(new MenuBottomSheetItem(R.string.export_file, R.drawable.ic_file_kmz,
+                                      () -> onShareTrackSelected(track.getTrackId(), KmlFileType.Text)));
+    items.add(new MenuBottomSheetItem(R.string.export_file_gpx, R.drawable.ic_file_gpx,
+                                      () -> onShareTrackSelected(track.getTrackId(), KmlFileType.Gpx)));
+    return items;
+  }
+
+  @Override
+  public void onPreparedFileForSharing(@NonNull BookmarkSharingResult result)
+  {
+    BookmarksSharingHelper.INSTANCE.onPreparedFileForSharing(requireActivity(), shareLauncher, result);
+  }
+
   public interface PlacePageViewListener
   {
     // Called when the content has actually changed and we are ready to compute the peek height
@@ -848,4 +1119,21 @@ public class PlacePageView extends Fragment
     void onPlacePageRequestToggleState();
     void onPlacePageRequestClose();
   }
+
+  public enum MapObjectType
+  {
+    TRACK,
+    BOOKMARK,
+    OTHER;
+
+    public static MapObjectType getMapObjectType(MapObject mapObject)
+    {
+      if (mapObject.isTrack())
+        return TRACK;
+      else if (mapObject.isBookmark())
+        return BOOKMARK;
+      else
+        return OTHER;
+    }
+  }
 }
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageViewModel.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageViewModel.java
index 57ca04eb3..a8f4b852d 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageViewModel.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageViewModel.java
@@ -3,7 +3,10 @@ package app.organicmaps.widget.placepage;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.MutableLiveData;
 import androidx.lifecycle.ViewModel;
+import app.organicmaps.sdk.bookmarks.data.Bookmark;
+import app.organicmaps.sdk.bookmarks.data.ElevationInfo;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
+import app.organicmaps.sdk.bookmarks.data.Track;
 import java.util.List;
 
 public class PlacePageViewModel extends ViewModel
@@ -12,6 +15,7 @@ public class PlacePageViewModel extends ViewModel
   private final MutableLiveData<MapObject> mMapObject = new MutableLiveData<>();
   private final MutableLiveData<Integer> mPlacePageWidth = new MutableLiveData<>();
   private final MutableLiveData<Integer> mPlacePageDistanceToTop = new MutableLiveData<>();
+  public boolean isAlertDialogShowing = false;
 
   public LiveData<List<PlacePageButtons.ButtonType>> getCurrentButtons()
   {
@@ -33,6 +37,38 @@ public class PlacePageViewModel extends ViewModel
     mMapObject.setValue(mapObject);
   }
 
+  // These silent method are used to update data of map object silently without triggering
+  // the observer which refreshes everything and puts extra load  on device in calculation
+  // which is not required
+  public void modifyMapObjectPointSilently(ElevationInfo.Point point)
+  {
+    if (mMapObject.getValue() == null)
+      return;
+    mMapObject.getValue().setLat(point.getLatitude());
+    mMapObject.getValue().setLon(point.getLongitude());
+  }
+
+  public void modifyMapObjectCategoryIdSilently(long categoryId)
+  {
+    if (mMapObject.getValue() == null)
+      return;
+    switch (PlacePageView.MapObjectType.getMapObjectType(mMapObject.getValue()))
+    {
+    case TRACK -> ((Track) mMapObject.getValue()).setCategoryId(categoryId);
+    case BOOKMARK -> ((Bookmark) mMapObject.getValue()).setCategoryId(categoryId);
+    }
+  }
+
+  public void modifyMapObjectColorSilently(int color)
+  {
+    if (mMapObject.getValue() == null)
+      return;
+    switch (PlacePageView.MapObjectType.getMapObjectType(mMapObject.getValue()))
+    {
+    case TRACK -> ((Track) mMapObject.getValue()).setColor(color);
+    case BOOKMARK -> ((Bookmark) mMapObject.getValue()).setIconColor(color);
+    }
+  }
   public MutableLiveData<Integer> getPlacePageWidth()
   {
     return mPlacePageWidth;
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java
index f200c0621..4411201a2 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java
@@ -16,23 +16,18 @@ import android.widget.LinearLayout;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import app.organicmaps.R;
 import app.organicmaps.sdk.bookmarks.data.Bookmark;
-import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
 import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.Utils;
-import app.organicmaps.widget.placepage.EditBookmarkFragment;
 import app.organicmaps.widget.placepage.PlacePageViewModel;
 import com.google.android.material.textview.MaterialTextView;
 
-public class PlacePageBookmarkFragment extends Fragment implements View.OnClickListener, View.OnLongClickListener,
-                                                                   Observer<MapObject>,
-                                                                   EditBookmarkFragment.EditBookmarkListener
+public class PlacePageBookmarkFragment extends Fragment implements View.OnLongClickListener, Observer<MapObject>
 {
   private View mFrame;
   private MaterialTextView mTvBookmarkNote;
@@ -60,8 +55,6 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
     mFrame = view;
     mTvBookmarkNote = mFrame.findViewById(R.id.tv__bookmark_notes);
     mTvBookmarkNote.setOnLongClickListener(this);
-    final View editBookmarkBtn = mFrame.findViewById(R.id.tv__bookmark_edit);
-    editBookmarkBtn.setOnClickListener(this);
   }
 
   private void initWebView()
@@ -119,14 +112,6 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
     }
   }
 
-  @Override
-  public void onClick(View v)
-  {
-    final FragmentActivity activity = requireActivity();
-    EditBookmarkFragment.editBookmark(currentBookmark.getCategoryId(), currentBookmark.getBookmarkId(), activity,
-                                      getChildFragmentManager(), PlacePageBookmarkFragment.this);
-  }
-
   @Override
   public boolean onLongClick(View v)
   {
@@ -156,13 +141,4 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnClickL
       updateBookmarkDetails();
     }
   }
-
-  @Override
-  public void onBookmarkSaved(long bookmarkId, boolean movedFromCategory)
-  {
-    Bookmark updatedBookmark = BookmarkManager.INSTANCE.updateBookmarkPlacePage(bookmarkId);
-    if (updatedBookmark == null)
-      return;
-    mViewModel.setMapObject(updatedBookmark);
-  }
 }
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageTrackFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageTrackFragment.java
new file mode 100644
index 000000000..708110553
--- /dev/null
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageTrackFragment.java
@@ -0,0 +1,115 @@
+package app.organicmaps.widget.placepage.sections;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProvider;
+import app.organicmaps.R;
+import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
+import app.organicmaps.sdk.bookmarks.data.ElevationInfo;
+import app.organicmaps.sdk.bookmarks.data.MapObject;
+import app.organicmaps.sdk.bookmarks.data.Track;
+import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.widget.placepage.ElevationProfileViewRenderer;
+import app.organicmaps.widget.placepage.PlacePageStateListener;
+import app.organicmaps.widget.placepage.PlacePageViewModel;
+
+public class PlacePageTrackFragment extends Fragment
+    implements PlacePageStateListener, Observer<MapObject>, BookmarkManager.OnElevationActivePointChangedListener,
+               BookmarkManager.OnElevationCurrentPositionChangedListener
+{
+  private PlacePageViewModel mViewModel;
+  @Nullable
+  private Track mTrack;
+  private ElevationProfileViewRenderer mElevationProfileViewRenderer;
+  private View mFrame;
+  private View mElevationProfileView;
+
+  @Nullable
+  @Override
+  public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+                           @Nullable Bundle savedInstanceState)
+  {
+    mViewModel = new ViewModelProvider(requireActivity()).get(PlacePageViewModel.class);
+    return inflater.inflate(R.layout.placepage_track_fragment, container, false);
+  }
+
+  @Override
+  public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState)
+  {
+    super.onViewCreated(view, savedInstanceState);
+    mElevationProfileViewRenderer = new ElevationProfileViewRenderer();
+
+    mFrame = view;
+    mElevationProfileView = mFrame.findViewById(R.id.elevation_profile);
+    mElevationProfileViewRenderer.initialize(mElevationProfileView);
+  }
+
+  @Override
+  public void onStart()
+  {
+    super.onStart();
+    BookmarkManager.INSTANCE.setElevationActivePointChangedListener(this);
+    BookmarkManager.INSTANCE.setElevationCurrentPositionChangedListener(this);
+    mViewModel.getMapObject().observe(requireActivity(), this);
+  }
+
+  @Override
+  public void onStop()
+  {
+    super.onStop();
+    mViewModel.getMapObject().removeObserver(this);
+  }
+
+  @Override
+  public void onDestroy()
+  {
+    BookmarkManager.INSTANCE.setElevationActivePointChangedListener(null);
+    BookmarkManager.INSTANCE.setElevationCurrentPositionChangedListener(null);
+    super.onDestroy();
+  }
+
+  @Override
+  public void onChanged(@Nullable MapObject mapObject)
+  {
+    // MapObject could be something else than a Track if the user already has the place page
+    // opened and clicks on a non-Track POI.
+    // This callback would be called before the fragment had time to be destroyed
+    if (mapObject != null && mapObject.isTrack())
+    {
+      Track track = (Track) mapObject;
+      if (track.isElevationInfoHasValue())
+      {
+        if (mTrack == null || mTrack.getTrackId() != track.getTrackId())
+        {
+          mElevationProfileViewRenderer.render(track);
+          UiUtils.show(mElevationProfileView);
+        }
+      }
+      else
+        UiUtils.hide(mElevationProfileView);
+      mTrack = track;
+    }
+  }
+
+  @Override
+  public void onElevationActivePointChanged()
+  {
+    if (mTrack == null)
+      return;
+    mElevationProfileViewRenderer.onChartElevationActivePointChanged();
+    ElevationInfo.Point point = BookmarkManager.INSTANCE.getElevationActivePointCoordinates(mTrack.getTrackId());
+    mViewModel.modifyMapObjectPointSilently(point);
+  }
+
+  @Override
+  public void onCurrentPositionChanged()
+  {
+    mElevationProfileViewRenderer.onChartCurrentPositionChanged();
+  }
+}
diff --git a/android/app/src/main/res/drawable/ic_distance_travelled.xml b/android/app/src/main/res/drawable/ic_distance_travelled.xml
new file mode 100644
index 000000000..286e357bf
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_distance_travelled.xml
@@ -0,0 +1,10 @@
+<vector
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:height="24dp"
+  android:viewportHeight="590.91"
+  android:viewportWidth="590.91"
+  android:width="24dp">
+  <path
+    android:fillColor="#000000"
+    android:pathData="M541.67,295.45l-86.21,-86.21l0,71.21l-320,0l0,-71.21l-86.21,86.21l86.21,86.21l0,-71.21l320,0l0,71.21z" />
+</vector>
diff --git a/android/app/src/main/res/layout-land/elevation_profile_bottom_sheet.xml b/android/app/src/main/res/layout-land/elevation_profile_bottom_sheet.xml
index 1c522066f..561143c09 100644
--- a/android/app/src/main/res/layout-land/elevation_profile_bottom_sheet.xml
+++ b/android/app/src/main/res/layout-land/elevation_profile_bottom_sheet.xml
@@ -3,7 +3,7 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:android="http://schemas.android.com/apk/res/android"
   android:id="@+id/elevation_profile"
-  android:layout_width="@dimen/place_page_width"
+  android:layout_width="match_parent"
   android:layout_height="wrap_content"
   android:paddingTop="@dimen/margin_base"
   android:paddingBottom="@dimen/margin_base"
diff --git a/android/app/src/main/res/layout/elevation_profile.xml b/android/app/src/main/res/layout/elevation_profile.xml
index e8caa071e..a8f7b67cf 100644
--- a/android/app/src/main/res/layout/elevation_profile.xml
+++ b/android/app/src/main/res/layout/elevation_profile.xml
@@ -8,7 +8,9 @@
   <app.organicmaps.widget.placepage.ElevationProfileChart
     android:id="@+id/elevation_profile_chart"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" />
+    android:layout_height="match_parent"
+    android:layout_alignParentStart="true"
+    android:layout_alignParentEnd="true" />
   <app.organicmaps.widget.placepage.FloatingMarkerView
     android:id="@+id/floating_marker"
     android:visibility="gone"
diff --git a/android/app/src/main/res/layout/elevation_profile_bottom_sheet.xml b/android/app/src/main/res/layout/elevation_profile_bottom_sheet.xml
index b252b064b..6814f8bd2 100644
--- a/android/app/src/main/res/layout/elevation_profile_bottom_sheet.xml
+++ b/android/app/src/main/res/layout/elevation_profile_bottom_sheet.xml
@@ -1,37 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.core.widget.NestedScrollView
-  xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:id="@+id/elevation_profile"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:paddingTop="@dimen/margin_half_plus"
-  android:paddingBottom="@dimen/margin_base"
   android:background="?cardBackground"
   android:clickable="true"
-  android:focusable="true"
   android:fillViewport="true"
+  android:focusable="true"
   app:behavior_peekHeight="@dimen/elevation_profile_peek_height"
   app:layout_behavior="@string/placepage_behavior">
   <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical">
-    <LinearLayout
-      android:id="@+id/pull_icon_container"
-      android:layout_width="wrap_content"
-      android:layout_height="@dimen/margin_half"
-      android:layout_gravity="center_horizontal"
-      android:layout_marginStart="@dimen/margin_base"
-      android:layout_marginEnd="@dimen/margin_base"
-      android:layout_marginBottom="@dimen/margin_eighth"
-      android:gravity="center"
-      android:orientation="vertical">
-      <ImageView
-        android:id="@+id/pull_icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
-    </LinearLayout>
     <include layout="@layout/elevation_profile_internal" />
   </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/android/app/src/main/res/layout/elevation_profile_internal.xml b/android/app/src/main/res/layout/elevation_profile_internal.xml
index e093d172c..174fbbcd4 100644
--- a/android/app/src/main/res/layout/elevation_profile_internal.xml
+++ b/android/app/src/main/res/layout/elevation_profile_internal.xml
@@ -4,22 +4,188 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
   tools:showIn="@layout/elevation_profile_bottom_sheet">
-  <TextView
-    android:id="@+id/title"
+  <LinearLayout
+    android:id="@+id/title_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="@dimen/margin_half"
-    android:layout_marginStart="@dimen/margin_base"
-    android:layout_marginEnd="@dimen/margin_base"
-    android:paddingBottom="@dimen/margin_base"
-    android:textAppearance="?fontHeadline6"
-    tools:text="Xindian Shitoushan Trail" />
-  <include
+    android:orientation="vertical">
+    <TextView
+      android:id="@+id/title"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_marginStart="@dimen/margin_base"
+      android:layout_marginEnd="@dimen/margin_base"
+      android:paddingTop="@dimen/margin_half"
+      android:paddingBottom="@dimen/margin_base"
+      android:textAppearance="?fontHeadline6"
+      tools:text="Xindian Shitoushan Trail" />
+    <include
+      layout="@layout/list_divider"
+      android:layout_width="match_parent"
+      android:layout_height="@dimen/divider_height"
+      android:layout_marginStart="@dimen/margin_base"
+      android:layout_marginEnd="@dimen/margin_base" />
+  </LinearLayout>
+  <LinearLayout
     android:layout_width="match_parent"
-    android:layout_height="@dimen/divider_height"
-    android:layout_marginStart="@dimen/margin_base"
-    android:layout_marginEnd="@dimen/margin_base"
-    layout="@layout/list_divider" />
+    android:layout_height="wrap_content"
+    android:layout_marginStart="@dimen/margin_half"
+    android:layout_marginTop="@dimen/margin_quarter"
+    android:layout_marginEnd="@dimen/margin_half"
+    android:layout_marginBottom="@dimen/margin_half_plus_eight"
+    android:baselineAligned="false"
+    android:orientation="horizontal">
+    <!--card one-->
+    <RelativeLayout
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:layout_marginEnd="@dimen/margin_half"
+      android:layout_weight="1"
+      android:gravity="center">
+      <LinearLayout
+        android:id="@+id/ascent_container"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+        <ImageView
+          android:layout_width="@dimen/margin_base_plus_quarter"
+          android:layout_height="wrap_content"
+          android:layout_marginEnd="@dimen/margin_quarter"
+          app:srcCompat="@drawable/ic_ascent"
+          app:tint="?elevationProfilePropIconTint" />
+        <TextView
+          android:id="@+id/ascent"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:fontFamily="@string/robotoMedium"
+          android:textAppearance="@style/MwmTextAppearance.Body3"
+          tools:text="10000 m" />
+      </LinearLayout>
+      <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/ascent_container"
+        android:layout_alignStart="@+id/ascent_container"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:text="@string/elevation_profile_ascent"
+        android:textAppearance="@style/MwmTextAppearance.Body5" />
+    </RelativeLayout>
+    <!--card two-->
+    <RelativeLayout
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:layout_marginEnd="@dimen/margin_half"
+      android:layout_weight="1"
+      android:gravity="center">
+      <LinearLayout
+        android:id="@+id/descent_container"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+        <ImageView
+          android:layout_width="@dimen/margin_base_plus_quarter"
+          android:layout_height="wrap_content"
+          android:layout_marginEnd="@dimen/margin_quarter"
+          app:srcCompat="@drawable/ic_descent"
+          app:tint="?elevationProfilePropIconTint" />
+        <TextView
+          android:id="@+id/descent"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:fontFamily="@string/robotoMedium"
+          android:textAppearance="@style/MwmTextAppearance.Body3"
+          tools:text="10000 m" />
+      </LinearLayout>
+      <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/descent_container"
+        android:layout_alignStart="@+id/descent_container"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:text="@string/elevation_profile_descent"
+        android:textAppearance="@style/MwmTextAppearance.Body5" />
+    </RelativeLayout>
+    <!--card three-->
+    <RelativeLayout
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:layout_marginEnd="@dimen/margin_half"
+      android:layout_weight="1"
+      android:gravity="center"
+      android:orientation="vertical">
+      <LinearLayout
+        android:id="@+id/max_height_container"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+        <ImageView
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginEnd="@dimen/margin_quarter"
+          app:srcCompat="@drawable/ic_maxalt"
+          app:tint="?elevationProfilePropIconTint" />
+        <TextView
+          android:id="@+id/max_altitude"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:fontFamily="@string/robotoMedium"
+          android:textAppearance="@style/MwmTextAppearance.Body3"
+          tools:text="10000 m" />
+      </LinearLayout>
+      <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/max_height_container"
+        android:layout_alignStart="@+id/max_height_container"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:text="@string/elevation_profile_max_elevation"
+        android:textAppearance="@style/MwmTextAppearance.Body5" />
+    </RelativeLayout>
+    <!--card four-->
+    <RelativeLayout
+      android:layout_width="0dp"
+      android:layout_height="wrap_content"
+      android:layout_marginEnd="@dimen/margin_half"
+      android:layout_weight="1"
+      android:gravity="center"
+      android:orientation="vertical">
+      <LinearLayout
+        android:id="@+id/min_elevation_container"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+        <ImageView
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_marginEnd="@dimen/margin_half"
+          app:srcCompat="@drawable/ic_minalt"
+          app:tint="?elevationProfilePropIconTint" />
+        <TextView
+          android:id="@+id/min_altitude"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:fontFamily="@string/robotoMedium"
+          android:textAppearance="@style/MwmTextAppearance.Body3"
+          tools:text="10000 m" />
+      </LinearLayout>
+      <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/min_elevation_container"
+        android:layout_alignStart="@+id/min_elevation_container"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:text="@string/elevation_profile_min_elevation"
+        android:textAppearance="@style/MwmTextAppearance.Body5" />
+    </RelativeLayout>
+  </LinearLayout>
   <LinearLayout
     android:id="@+id/chart_container"
     android:layout_width="match_parent"
@@ -27,142 +193,13 @@
     android:gravity="center"
     android:minHeight="@dimen/elevation_profile_chart_min_height"
     android:orientation="vertical">
-    <include layout="@layout/elevation_profile"/>
-  </LinearLayout>
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/margin_base"
-    android:layout_marginStart="@dimen/margin_base"
-    android:layout_marginEnd="@dimen/margin_base"
-    android:minHeight="@dimen/elevation_profile_chart_info_min_height"
-    android:orientation="horizontal"
-    android:baselineAligned="false">
-    <LinearLayout
-      android:layout_width="0dp"
-      android:layout_height="match_parent"
-      android:layout_marginEnd="@dimen/margin_quarter"
-      android:layout_weight="1"
-      android:background="?elevationProfilePropertyBg"
-      android:gravity="center_horizontal"
-      android:orientation="vertical"
-      android:padding="@dimen/margin_quarter_plus">
-      <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:srcCompat="@drawable/ic_ascent"
-        app:tint="?elevationProfilePropIconTint" />
-      <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_eighth"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:text="@string/elevation_profile_ascent"
-        android:textAppearance="@style/MwmTextAppearance.Body5" />
-      <TextView
-        android:id="@+id/ascent"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:textAppearance"
-        android:fontFamily="@string/robotoMedium"
-        tools:text="10000 m" />
-    </LinearLayout>
-    <LinearLayout
-      android:layout_width="0dp"
-      android:layout_height="match_parent"
-      android:layout_marginEnd="@dimen/margin_quarter"
-      android:layout_weight="1"
-      android:background="?elevationProfilePropertyBg"
-      android:gravity="center_horizontal"
-      android:orientation="vertical"
-      android:padding="@dimen/margin_quarter_plus">
-      <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:srcCompat="@drawable/ic_descent"
-        app:tint="?elevationProfilePropIconTint" />
-      <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_eighth"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:text="@string/elevation_profile_descent"
-        android:textAppearance="@style/MwmTextAppearance.Body5" />
-      <TextView
-        android:id="@+id/descent"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:textAppearance"
-        android:fontFamily="@string/robotoMedium"
-        tools:text="10000 m" />
-    </LinearLayout>
-    <LinearLayout
-      android:layout_width="0dp"
-      android:layout_height="match_parent"
-      android:layout_marginEnd="@dimen/margin_quarter"
-      android:layout_weight="1"
-      android:background="?elevationProfilePropertyBg"
-      android:gravity="center_horizontal"
-      android:orientation="vertical"
-      android:padding="@dimen/margin_quarter_plus">
-      <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:srcCompat="@drawable/ic_maxalt"
-        app:tint="?elevationProfilePropIconTint" />
-      <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_eighth"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:text="@string/elevation_profile_max_elevation"
-        android:textAppearance="@style/MwmTextAppearance.Body5" />
-      <TextView
-        android:id="@+id/max_altitude"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:textAppearance"
-        android:fontFamily="@string/robotoMedium"
-        tools:text="10000 m" />
-    </LinearLayout>
-    <LinearLayout
-      android:layout_width="0dp"
-      android:layout_height="match_parent"
-      android:layout_weight="1"
-      android:background="?elevationProfilePropertyBg"
-      android:gravity="center_horizontal"
-      android:orientation="vertical"
-      android:padding="@dimen/margin_quarter_plus">
-      <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:srcCompat="@drawable/ic_minalt"
-        app:tint="?elevationProfilePropIconTint" />
-      <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/margin_eighth"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:text="@string/elevation_profile_min_elevation"
-        android:textAppearance="@style/MwmTextAppearance.Body5" />
-      <TextView
-        android:id="@+id/min_altitude"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:textAppearance"
-        android:fontFamily="@string/robotoMedium"
-        tools:text="10000 m" />
-    </LinearLayout>
+    <include layout="@layout/elevation_profile" />
   </LinearLayout>
   <RelativeLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/margin_base"
     android:layout_marginStart="@dimen/margin_base"
+    android:layout_marginTop="@dimen/margin_quarter_plus"
     android:layout_marginEnd="@dimen/margin_base"
     android:orientation="horizontal">
     <LinearLayout
@@ -174,21 +211,21 @@
       <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:textAppearance"
-        android:text="@string/elevation_profile_difficulty"/>
+        android:text="@string/elevation_profile_difficulty"
+        android:textAppearance="?android:textAppearance" />
       <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:layout_marginBottom="@dimen/elevation_profile_dot_levels_margin"
         android:layout_gravity="bottom"
-        android:layout_marginStart="@dimen/margin_half_plus_eight">
+        android:layout_marginStart="@dimen/margin_half_plus_eight"
+        android:layout_marginBottom="@dimen/elevation_profile_dot_levels_margin"
+        android:orientation="horizontal">
         <TextView
           android:id="@+id/difficulty_level_1"
           android:layout_width="@dimen/elevation_profile_difficulty_dot_size"
           android:layout_height="@dimen/elevation_profile_difficulty_dot_size"
           android:background="@drawable/dot_elevation_difficulty"
-          android:enabled="false"/>
+          android:enabled="false" />
         <TextView
           android:id="@+id/difficulty_level_2"
           android:layout_width="@dimen/elevation_profile_difficulty_dot_size"
@@ -196,37 +233,37 @@
           android:layout_marginStart="@dimen/margin_quarter"
           android:layout_marginEnd="@dimen/margin_quarter"
           android:background="@drawable/dot_elevation_difficulty"
-          android:enabled="false"/>
+          android:enabled="false" />
         <TextView
           android:id="@+id/difficulty_level_3"
           android:layout_width="@dimen/elevation_profile_difficulty_dot_size"
           android:layout_height="@dimen/elevation_profile_difficulty_dot_size"
           android:background="@drawable/dot_elevation_difficulty"
-          android:enabled="false"/>
+          android:enabled="false" />
       </LinearLayout>
     </LinearLayout>
     <LinearLayout
-      android:layout_toEndOf="@id/difficulty_container"
-      android:layout_alignParentEnd="true"
       android:id="@+id/time_container"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
+      android:layout_alignParentEnd="true"
+      android:layout_toEndOf="@id/difficulty_container"
       android:gravity="end"
       android:orientation="horizontal">
       <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:textAppearance"
-        android:text="@string/elevation_profile_time" />
+        android:text="@string/elevation_profile_time"
+        android:textAppearance="?android:textAppearance" />
       <com.google.android.material.textview.MaterialTextView
         android:id="@+id/time"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/margin_half"
+        android:ellipsize="end"
+        android:singleLine="true"
         android:textAppearance="?android:textAppearanceMedium"
         android:textStyle="bold"
-        android:singleLine="true"
-        android:ellipsize="end"
         tools:text="3 h. 25 min." />
     </LinearLayout>
   </RelativeLayout>
diff --git a/android/app/src/main/res/layout/floating_marker_view.xml b/android/app/src/main/res/layout/floating_marker_view.xml
index 6cee6ebd6..aac3f4477 100644
--- a/android/app/src/main/res/layout/floating_marker_view.xml
+++ b/android/app/src/main/res/layout/floating_marker_view.xml
@@ -9,8 +9,8 @@
   tools:ignore="Overdraw">
   <ImageView
     android:id="@+id/image"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
+    android:layout_width="@dimen/elevation_profile_marker_width"
+    android:layout_height="@dimen/elevation_profile_marker_width"
     android:layout_centerVertical="true"
     app:srcCompat="@drawable/ic_graph_point" />
   <RelativeLayout
@@ -43,39 +43,41 @@
       android:maxWidth="@dimen/dialog_min_height"
       android:padding="@dimen/margin_quarter_plus"
       tools:ignore="UnusedAttribute">
-      <TextView
-        android:id="@+id/distance_text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:maxWidth="@dimen/dialog_min_height"
-        android:singleLine="true"
-        android:textSize="@dimen/margin_half_plus_eight" />
+      <ImageView
+        android:id="@+id/distance_icon"
+        android:layout_width="@dimen/margin_half_plus"
+        android:layout_height="@dimen/margin_half_plus"
+        app:srcCompat="@drawable/ic_distance_travelled"
+        app:tint="?ppFloatingMarkerIconColor" />
       <TextView
         android:id="@+id/distance_value"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@id/distance_text"
+        android:layout_marginStart="@dimen/margin_quarter"
+        android:layout_toEndOf="@+id/distance_icon"
         android:ellipsize="end"
         android:maxWidth="@dimen/dialog_min_height"
         android:singleLine="true"
-        android:textSize="@dimen/margin_half_plus_eight" />
+        android:textSize="@dimen/margin_half_plus_eight"
+        tools:text="10 km" />
       <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_alignStart="@+id/distance_icon"
         android:layout_below="@id/distance_value"
         android:layout_alignParentBottom="true"
         android:gravity="center_vertical"
         android:orientation="horizontal">
         <ImageView
           android:id="@+id/triangle"
-          android:layout_width="@dimen/margin_half_plus"
-          android:layout_height="@dimen/margin_half_plus"
+          android:layout_width="@dimen/margin_half_plus_eight"
+          android:layout_height="@dimen/margin_half_plus_eight"
           app:srcCompat="?elevationProfileSelectedPointTriangle" />
         <TextView
           android:id="@+id/altitude"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
+          tools:text="900 m"
           android:layout_marginStart="@dimen/margin_quarter"
           android:ellipsize="end"
           android:singleLine="true"
diff --git a/android/app/src/main/res/layout/place_page_bookmark_fragment.xml b/android/app/src/main/res/layout/place_page_bookmark_fragment.xml
index 62a4fd16d..58abc7138 100644
--- a/android/app/src/main/res/layout/place_page_bookmark_fragment.xml
+++ b/android/app/src/main/res/layout/place_page_bookmark_fragment.xml
@@ -18,16 +18,6 @@
     android:textAppearance="?android:attr/textAppearance"
     tools:text="Long, long text Long, long text Long, long text Long, long text Long, long text Long, long text "/>
 
-  <com.google.android.material.textview.MaterialTextView
-      android:id="@+id/tv__bookmark_edit"
-      style="@style/PlacePageMetadataText.Button"
-      android:gravity="center"
-      android:layout_height="@dimen/height_block_base"
-      android:background="?clickableBackground"
-      android:paddingEnd="@dimen/margin_base"
-      android:paddingStart="@dimen/margin_base"
-      android:text="@string/placepage_edit_bookmark_button"/>
-
   <include
     layout="@layout/divider_horizontal"/>
 </LinearLayout>
diff --git a/android/app/src/main/res/layout/place_page_details.xml b/android/app/src/main/res/layout/place_page_details.xml
index ddbe48dd1..ee6a0fa9c 100644
--- a/android/app/src/main/res/layout/place_page_details.xml
+++ b/android/app/src/main/res/layout/place_page_details.xml
@@ -21,7 +21,6 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       tools:layout="@layout/place_page_bookmark_fragment" />
-
     <androidx.fragment.app.FragmentContainerView
       android:id="@+id/place_page_wikipedia_fragment"
       android:layout_width="match_parent"
diff --git a/android/app/src/main/res/layout/place_page_preview.xml b/android/app/src/main/res/layout/place_page_preview.xml
index 91c45feb7..3978e6e80 100644
--- a/android/app/src/main/res/layout/place_page_preview.xml
+++ b/android/app/src/main/res/layout/place_page_preview.xml
@@ -5,8 +5,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
-  android:orientation="vertical"
-  android:paddingBottom="@dimen/margin_quarter">
+  android:orientation="vertical">
   <include
     android:id="@+id/pull_icon_container"
     layout="@layout/bottom_sheet_handle" />
@@ -180,4 +179,62 @@
       </LinearLayout>
     </LinearLayout>
   </LinearLayout>
-</LinearLayout>
+  <LinearLayout
+    android:id="@+id/category_container"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="@dimen/margin_half"
+    android:orientation="vertical">
+    <include layout="@layout/place_page_shadow_gap" />
+    <RelativeLayout
+      android:id="@+id/container"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:background="?ppBackground">
+      <ImageView
+        android:id="@+id/item_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentBottom="true"
+        android:background="?clickableBackground"
+        android:layout_centerVertical="true"
+        android:clickable="true"
+        android:focusable="true"
+        android:paddingHorizontal="8dp"
+        android:paddingVertical="5dp" />
+      <TextView
+        android:id="@+id/tv__category"
+        style="@style/PlacePageMetadataText.Button"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentBottom="true"
+        android:layout_centerVertical="true"
+        android:layout_toStartOf="@id/edit_Bookmark"
+        android:layout_toEndOf="@id/item_icon"
+        android:background="?clickableBackground"
+        android:paddingStart="@dimen/margin_quarter"
+        android:paddingEnd="@dimen/margin_quarter"
+        android:textAllCaps="false"
+        tools:text="@string/categories" />
+      <ImageView
+        android:id="@+id/edit_Bookmark"
+        style="@style/MwmWidget.Editor.MetadataIcon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:layout_centerVertical="true"
+        android:background="?clickableBackground"
+        android:clickable="true"
+        android:focusable="true"
+        android:src="@drawable/ic_edit" />
+    </RelativeLayout>
+  </LinearLayout>
+  <androidx.fragment.app.FragmentContainerView
+    android:id="@+id/place_page_track_fragment"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    tools:layout="@layout/placepage_track_fragment" />
+</LinearLayout>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/place_page_shadow_gap.xml b/android/app/src/main/res/layout/place_page_shadow_gap.xml
new file mode 100644
index 000000000..188fbfbd2
--- /dev/null
+++ b/android/app/src/main/res/layout/place_page_shadow_gap.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:orientation="horizontal"
+  android:background="@color/black_8"
+  android:layout_width="match_parent"
+  android:layout_height="@dimen/margin_half" />
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/placepage_track_fragment.xml b/android/app/src/main/res/layout/placepage_track_fragment.xml
new file mode 100644
index 000000000..0eb214575
--- /dev/null
+++ b/android/app/src/main/res/layout/placepage_track_fragment.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:id="@+id/place_page_track_layout"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  android:orientation="vertical">
+  <include layout="@layout/place_page_shadow_gap" />
+  <include
+    android:id="@+id/elevation_profile"
+    layout="@layout/elevation_profile_bottom_sheet" />
+</LinearLayout>
\ No newline at end of file
diff --git a/android/app/src/main/res/values/dimens.xml b/android/app/src/main/res/values/dimens.xml
index 8ee79ed8d..492beeae5 100644
--- a/android/app/src/main/res/values/dimens.xml
+++ b/android/app/src/main/res/values/dimens.xml
@@ -46,6 +46,8 @@
   <dimen name="place_page_width">320dp</dimen>
   <dimen name="place_page_buttons_height">56dp</dimen>
   <dimen name="place_page_top_button">40dp</dimen>
+  <dimen name="place_page_icon_size">32dp</dimen>
+  <dimen name="place_page_icon_mark_size">20dp</dimen>
 
   <dimen name="downloader_status_size">40dp</dimen>
   <dimen name="search_progress_size">32dp</dimen>
@@ -75,12 +77,13 @@
   <dimen name="viewport_min_width">300dp</dimen>
   <dimen name="elevation_profile_peek_height">260dp</dimen>
   <dimen name="elevation_profile_chart_min_height">144dp</dimen>
-  <dimen name="elevation_profile_chart_info_min_height">68dp</dimen>
+  <dimen name="elevation_profile_chart_info_min_height">54dp</dimen>
   <dimen name="elevation_profile_difficulty_dot_size">10dp</dimen>
   <dimen name="elevation_profile_content_height">144dp</dimen>
-  <dimen name="elevation_profile_height">108dp</dimen>
-  <dimen name="elevation_profile_half_height">54dp</dimen>
+  <dimen name="elevation_profile_height">80dp</dimen>
+  <dimen name="elevation_profile_half_height">40dp</dimen>
   <dimen name="elevation_profile_dot_levels_margin">3dp</dimen>
+  <dimen name="elevation_profile_marker_width">25dp</dimen>
   <dimen name="map_button_size">48dp</dimen>
   <dimen name="map_button_icon_size">28dp</dimen>
   <dimen name="map_button_arrow_icon_size">34dp</dimen>
diff --git a/android/app/src/main/res/values/font_sizes.xml b/android/app/src/main/res/values/font_sizes.xml
index cce2c58ee..3277b1530 100644
--- a/android/app/src/main/res/values/font_sizes.xml
+++ b/android/app/src/main/res/values/font_sizes.xml
@@ -16,6 +16,7 @@
   <dimen name="text_size_body_3">14sp</dimen>
   <dimen name="text_size_body_4">12sp</dimen>
   <dimen name="text_size_body_5">10sp</dimen>
+  <dimen name="text_size_body_6">8sp</dimen>
   <dimen name="text_size_caption">14sp</dimen>
   <dimen name="text_size_icon_title">10sp</dimen>
   <dimen name="text_size_button">16sp</dimen>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 98a93b066..e8e4a24d8 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -971,4 +971,5 @@
     <string name="closed_now">Closed now</string>
     <!-- Used in place page preview for next open/close time. eg. "closing in 30 min • at 19:30" -->
     <string name="at">at %s</string>
+    <string name="PP_track_bottom_sheet_title">Save Track As</string>
 </resources>
diff --git a/android/app/src/main/res/values/styles-text.xml b/android/app/src/main/res/values/styles-text.xml
index 07b1336da..2fb94e160 100644
--- a/android/app/src/main/res/values/styles-text.xml
+++ b/android/app/src/main/res/values/styles-text.xml
@@ -93,6 +93,11 @@
     <item name="android:textColor">?android:textColorSecondary</item>
   </style>
 
+  <style name="MwmTextAppearance.Body6">
+    <item name="android:textSize">@dimen/text_size_body_6</item>
+    <item name="android:textColor">?android:textColorSecondary</item>
+  </style>
+
   <style name="MwmTextAppearance.Button">
     <item name="android:textSize">@dimen/text_size_button</item>
     <item name="android:textColor">?colorSecondary</item>
diff --git a/android/app/src/main/res/values/themes-attrs.xml b/android/app/src/main/res/values/themes-attrs.xml
index 75a651c16..f95909e6e 100644
--- a/android/app/src/main/res/values/themes-attrs.xml
+++ b/android/app/src/main/res/values/themes-attrs.xml
@@ -17,6 +17,7 @@
     <attr name="iconTintLight" format="color" />
     <attr name="ppBackground" format="color" />
     <attr name="ppButtonsBackground" format="color" />
+    <attr name="ppFloatingMarkerIconColor" format="color" />
     <attr name="navNextTurnFrame" format="reference" />
     <attr name="navNextNextTurnFrame" format="reference" />
     <attr name="navLanesBackgroundColor" format="reference" />
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.cpp
index 9fb589b4d..fac992985 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/Framework.cpp
@@ -921,17 +921,7 @@ JNIEXPORT void JNICALL Java_app_organicmaps_sdk_Framework_nativePlacePageActivat
     JNIEnv * env = jni::GetEnv();
     auto const & info = frm()->GetCurrentPlacePageInfo();
     jni::TScopedLocalRef placePageDataRef(env, nullptr);
-    if (info.IsTrack())
-    {
-      // todo: (KK) implement elevation info handling for the proper track selection
-      auto const & track = frm()->GetBookmarkManager().GetTrack(info.GetTrackId());
-      auto const & elevationInfo = track->GetElevationInfo();
-      if (elevationInfo.has_value())
-        placePageDataRef.reset(usermark_helper::CreateElevationInfo(env, elevationInfo.value()));
-    }
-    if (!placePageDataRef)
-      placePageDataRef.reset(usermark_helper::CreateMapObject(env, info));
-
+    placePageDataRef.reset(usermark_helper::CreateMapObject(env, info));
     env->CallVoidMethod(g_placePageActivationListener, activatedId, placePageDataRef.get());
   };
   auto const closePlacePage = [deactivateId]()
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.cpp
index 455ccb557..7ac0daa98 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.cpp
@@ -88,6 +88,47 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info, int mapObje
   return mapObject;
 }
 
+jobject CreateTrack(JNIEnv * env, place_page::Info const & info, jni::TScopedLocalObjectArrayRef const & jrawTypes,
+                    jni::TScopedLocalRef const & routingPointInfo, jobject const & popularity)
+{
+  static jmethodID const ctorId =
+      jni::GetConstructorID(env, g_trackClazz,
+                            "(Lapp/organicmaps/sdk/bookmarks/data/FeatureId;JJLjava/lang/String;"
+                            "Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;"
+                            "Lapp/organicmaps/sdk/routing/RoutePointInfo;"
+                            "ILapp/organicmaps/sdk/search/Popularity;Ljava/lang/String;"
+                            "[Ljava/lang/String;ILapp/organicmaps/sdk/util/Distance;DD)V");
+  static jmethodID const featureCtorId = jni::GetConstructorID(env, g_featureIdClazz, "(Ljava/lang/String;JI)V");
+
+  auto const trackId = info.GetTrackId();
+  auto const track = frm()->GetBookmarkManager().GetTrack(trackId);
+  dp::Color nColor = track->GetColor(0);
+
+  jint androidColor =
+      shift(nColor.GetAlpha(), 24) + shift(nColor.GetRed(), 16) + shift(nColor.GetGreen(), 8) + nColor.GetBlue();
+
+  auto const categoryId = track->GetGroupId();
+  ms::LatLon const ll = info.GetLatLon();
+  jni::TScopedLocalRef jMwmName(env, jni::ToJavaString(env, info.GetID().GetMwmName()));
+  jni::TScopedLocalRef jFeatureId(env, env->NewObject(g_featureIdClazz, featureCtorId, jMwmName.get(),
+                                                      (jlong)info.GetID().GetMwmVersion(), (jint)info.GetID().m_index));
+  jni::TScopedLocalRef jTitle(env, jni::ToJavaString(env, info.GetTitle()));
+  jni::TScopedLocalRef jSecondaryTitle(env, jni::ToJavaString(env, info.GetSecondaryTitle()));
+  jni::TScopedLocalRef jSubtitle(env, jni::ToJavaString(env, info.GetSubtitle()));
+  jni::TScopedLocalRef jAddress(env, jni::ToJavaString(env, info.GetSecondarySubtitle()));
+  jni::TScopedLocalRef jWikiDescription(env, jni::ToJavaString(env, info.GetWikiDescription()));
+  jobject mapObject =
+      env->NewObject(g_trackClazz, ctorId, jFeatureId.get(), static_cast<jlong>(categoryId),
+                     static_cast<jlong>(trackId), jTitle.get(), jSecondaryTitle.get(), jSubtitle.get(), jAddress.get(),
+                     routingPointInfo.get(), info.GetOpeningMode(), popularity, jWikiDescription.get(), jrawTypes.get(),
+                     androidColor, ToJavaDistance(env, platform::Distance::CreateFormatted(track->GetLengthMeters())),
+                     static_cast<jdouble>(ll.m_lat), static_cast<jdouble>(ll.m_lon));
+
+  if (info.HasMetadata())
+    InjectMetadata(env, g_mapObjectClazz, mapObject, info);
+  return mapObject;
+}
+
 jobject CreateBookmark(JNIEnv * env, place_page::Info const & info, jni::TScopedLocalObjectArrayRef const & jrawTypes,
                        jni::TScopedLocalRef const & routingPointInfo, jobject const & popularity)
 {
@@ -129,10 +170,11 @@ jobject CreateElevationPoint(JNIEnv * env, ElevationInfo::Point const & point)
 {
   static jclass const pointClass =
       jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/ElevationInfo$Point");
-  // public Point(double distance, int altitude)
-  static jmethodID const pointCtorId = jni::GetConstructorID(env, pointClass, "(DI)V");
-  return env->NewObject(pointClass, pointCtorId, static_cast<jdouble>(point.m_distance),
-                        static_cast<jint>(point.m_point.GetAltitude()));
+  // public Point(double distance, int altitude, double latitude, double longitude)
+  static jmethodID const pointCtorId = jni::GetConstructorID(env, pointClass, "(DIDD)V");
+  return env->NewObject(
+      pointClass, pointCtorId, static_cast<jdouble>(point.m_distance), static_cast<jint>(point.m_point.GetAltitude()),
+      static_cast<jdouble>(point.m_point.GetPoint().x), static_cast<jdouble>(point.m_point.GetPoint().y));
 }
 
 jobjectArray ToElevationPointArray(JNIEnv * env, ElevationInfo::Points const & points)
@@ -146,22 +188,12 @@ jobjectArray ToElevationPointArray(JNIEnv * env, ElevationInfo::Points const & p
 
 jobject CreateElevationInfo(JNIEnv * env, ElevationInfo const & info)
 {
-  // public ElevationInfo(long trackId, @NonNull String name, @NonNull Point[] points,
-  //                      int ascent, int descent, int minAltitude, int maxAltitude, int difficulty,
-  //                      long m_duration)
-  static jmethodID const ctorId = jni::GetConstructorID(env, g_elevationInfoClazz,
-                                                        "(JLjava/lang/String;Ljava/lang/String;"
-                                                        "[Lapp/organicmaps/sdk/bookmarks/data/ElevationInfo$Point;"
-                                                        "IIIIIJ)V");
+  // public ElevationInfo(@NonNull Point[] points, int difficulty);
+  static jmethodID const ctorId =
+      jni::GetConstructorID(env, g_elevationInfoClazz, "([Lapp/organicmaps/sdk/bookmarks/data/ElevationInfo$Point;I)V");
+
   jni::TScopedLocalObjectArrayRef jPoints(env, ToElevationPointArray(env, info.GetPoints()));
-  // TODO (KK): elevation info should have only the elevation data - see the
-  // https://github.com/organicmaps/organicmaps/pull/10063
-  return env->NewObject(g_elevationInfoClazz, ctorId, jPoints.get(),
-                        //                        static_cast<jint>(info.GetAscent()),
-                        //                        static_cast<jint>(info.GetDescent()),
-                        //                        static_cast<jint>(info.GetMinAltitude()),
-                        //                        static_cast<jint>(info.GetMaxAltitude()),
-                        static_cast<jint>(info.GetDifficulty()));
+  return env->NewObject(g_elevationInfoClazz, ctorId, jPoints.get(), static_cast<jint>(info.GetDifficulty()));
 }
 
 jobject CreateMapObject(JNIEnv * env, place_page::Info const & info)
@@ -193,6 +225,9 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info)
                            routingPointInfo.get(), popularity, jrawTypes.get());
   }
 
+  if (info.IsTrack())
+    return CreateTrack(env, info, jrawTypes, routingPointInfo, popularity);
+
   return CreateMapObject(env, info, kPoi, ll.m_lat, ll.m_lon, true /* parseMeta */, false /* parseApi */,
                          routingPointInfo.get(), popularity, jrawTypes.get());
 }
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.hpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.hpp
index 242d3ef53..f81e5294b 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.hpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.hpp
@@ -26,6 +26,7 @@ static constexpr int kApiPoint = 1;
 static constexpr int kBookmark = 2;
 static constexpr int kMyPosition = 3;
 static constexpr int kSearch = 4;
+static constexpr int kTrack = 5;
 
 static constexpr int kPriceRateUndefined = -1;
 
@@ -34,6 +35,9 @@ void InjectMetadata(JNIEnv * env, jclass clazz, jobject const mapObject, feature
 
 jobject CreateMapObject(JNIEnv * env, place_page::Info const & info);
 
+jobject CreateTrack(JNIEnv * env, place_page::Info const & info, jni::TScopedLocalObjectArrayRef const & jrawTypes,
+                    jni::TScopedLocalRef const & routingPointInfo, jobject const & popularity);
+
 jobject CreateElevationInfo(JNIEnv * env, ElevationInfo const & info);
 
 jobjectArray ToRatingArray(JNIEnv * env, std::vector<std::string> const & ratingCategories);
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/BookmarkManager.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/BookmarkManager.cpp
index 15a997d6e..4cb18a061 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/BookmarkManager.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/BookmarkManager.cpp
@@ -447,6 +447,16 @@ JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManage
   return usermark_helper::CreateMapObject(env, g_framework->GetPlacePageInfo());
 }
 
+JNIEXPORT void JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeUpdateTrackPlacePage(JNIEnv * env,
+                                                                                                          jobject,
+                                                                                                          jlong trackId)
+{
+  if (!frm()->HasPlacePageInfo())
+    return;
+
+  frm()->UpdatePlacePageInfoForCurrentSelection();
+}
+
 JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkInfo(JNIEnv * env,
                                                                                                         jobject,
                                                                                                         jlong bmkId)
@@ -824,14 +834,12 @@ Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeRemoveElevationCur
 }
 
 JNIEXPORT void JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeSetElevationActivePoint(
-    JNIEnv *, jclass, jlong trackId, jdouble distanceInMeters)
+    JNIEnv *, jclass, jlong trackId, jdouble distanceInMeters, jdouble latitude, jdouble longitude)
 {
   auto & bm = frm()->GetBookmarkManager();
-  bm.SetElevationActivePoint(
-      static_cast<kml::TrackId>(trackId),
-      {0,
-       0},  // todo(KK): replace with coordinates from the elevation profile point to show selection mark on the track
-      static_cast<double>(distanceInMeters));
+  bm.SetElevationActivePoint(static_cast<kml::TrackId>(trackId),
+                             m2::PointD(static_cast<double>(latitude), static_cast<double>(longitude)),
+                             static_cast<double>(distanceInMeters));
 }
 
 JNIEXPORT jdouble JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetElevationActivePointDistance(
@@ -858,4 +866,41 @@ Java_app_organicmaps_sdk_widget_placepage_PlacePageButtonFactory_nativeHasRecent
 {
   return frm()->GetBookmarkManager().HasRecentlyDeletedBookmark();
 }
+
+JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetTrackElevationInfo(
+    JNIEnv * env, jclass clazz, jlong track_id)
+{
+  auto const & track = frm()->GetBookmarkManager().GetTrack(track_id);
+  auto const & elevationInfo = track->GetElevationInfo();
+  return usermark_helper::CreateElevationInfo(env, elevationInfo.value());
+}
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeIsElevationInfoHasValue(
+    JNIEnv * env, jclass clazz, jlong track_id)
+{
+  return static_cast<jboolean>(frm()->GetBookmarkManager().GetTrack(track_id)->GetElevationInfo().has_value());
+}
+JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetTrackStatistics(
+    JNIEnv * env, jclass clazz, jlong track_id)
+{
+  static jmethodID const cId = jni::GetConstructorID(env, g_trackStatisticsClazz, "(DDDDII)V");
+  auto const trackStats = frm()->GetBookmarkManager().GetTrack(track_id)->GetStatistics();
+  return env->NewObject(g_trackStatisticsClazz, cId, static_cast<jdouble>(trackStats.m_length),
+                        static_cast<jdouble>(trackStats.m_duration), static_cast<jdouble>(trackStats.m_ascent),
+                        static_cast<jdouble>(trackStats.m_descent), static_cast<jint>(trackStats.m_minElevation),
+                        static_cast<jint>(trackStats.m_maxElevation));
+}
+
+JNIEXPORT jobject JNICALL
+Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetElevationActivePointCoordinates(JNIEnv * env,
+                                                                                                 jclass clazz,
+                                                                                                 jlong track_id)
+{
+  static jclass const pointClass =
+      jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/ElevationInfo$Point");
+  static jmethodID const pointCtorId = jni::GetConstructorID(env, pointClass, "(DIDD)V");
+  auto const & trackInfo = frm()->GetBookmarkManager().GetTrackSelectionInfo(track_id);
+  auto const latlon = mercator::ToLatLon(trackInfo.m_trackPoint);
+  return env->NewObject(pointClass, pointCtorId, 0.0, 0, static_cast<jdouble>(latlon.m_lat),
+                        static_cast<jdouble>(latlon.m_lon));
+}
 }  // extern "C"
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.cpp
index 9d3e3990a..3b1b09f8f 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.cpp
@@ -21,6 +21,8 @@ extern JavaVM * GetJVM()
 jclass g_mapObjectClazz;
 jclass g_featureIdClazz;
 jclass g_bookmarkClazz;
+jclass g_trackClazz;
+jclass g_trackStatisticsClazz;
 jclass g_httpClientClazz;
 jclass g_httpParamsClazz;
 jclass g_platformSocketClazz;
@@ -57,6 +59,8 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM * jvm, void *)
   JNIEnv * env = jni::GetEnv();
   g_mapObjectClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/MapObject");
   g_featureIdClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/FeatureId");
+  g_trackClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/Track");
+  g_trackStatisticsClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/TrackStatistics");
   g_bookmarkClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/bookmarks/data/Bookmark");
   g_httpClientClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/HttpClient");
   g_httpParamsClazz = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/util/HttpClient$Params");
@@ -85,6 +89,8 @@ JNIEXPORT void JNICALL JNI_OnUnload(JavaVM *, void *)
   env->DeleteGlobalRef(g_mapObjectClazz);
   env->DeleteGlobalRef(g_featureIdClazz);
   env->DeleteGlobalRef(g_bookmarkClazz);
+  env->DeleteGlobalRef(g_trackClazz);
+  env->DeleteGlobalRef(g_trackStatisticsClazz);
   env->DeleteGlobalRef(g_httpClientClazz);
   env->DeleteGlobalRef(g_httpParamsClazz);
   env->DeleteGlobalRef(g_platformSocketClazz);
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.hpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.hpp
index 2775d9f9a..1387633d5 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.hpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/core/jni_helper.hpp
@@ -18,6 +18,8 @@
 extern jclass g_mapObjectClazz;
 extern jclass g_featureIdClazz;
 extern jclass g_bookmarkClazz;
+extern jclass g_trackClazz;
+extern jclass g_trackStatisticsClazz;
 extern jclass g_httpClientClazz;
 extern jclass g_httpParamsClazz;
 extern jclass g_platformSocketClazz;
diff --git a/libs/map/bookmark_manager.cpp b/libs/map/bookmark_manager.cpp
index 0a404cf80..e93fadb13 100644
--- a/libs/map/bookmark_manager.cpp
+++ b/libs/map/bookmark_manager.cpp
@@ -866,7 +866,7 @@ void BookmarkManager::SetElevationActivePoint(kml::TrackId const & trackId, m2::
   auto const track = GetTrack(trackId);
   CHECK(track != nullptr, ());
 
-  SetTrackSelectionInfo({trackId, pt, targetDistance}, false /* notifyListeners */);
+  SetTrackSelectionInfo({trackId, pt, targetDistance}, true /* notifyListeners */);
 
   m_drapeEngine.SafeCall(&df::DrapeEngine::SelectObject, df::SelectionShape::ESelectedObject::OBJECT_TRACK, pt,
                          FeatureID(), false /* isAnim */, false /* isGeometrySelectionAllowed */,
diff --git a/libs/map/framework.cpp b/libs/map/framework.cpp
index 2c9a4333d..9151b239a 100644
--- a/libs/map/framework.cpp
+++ b/libs/map/framework.cpp
@@ -2173,16 +2173,8 @@ place_page::Info Framework::BuildPlacePageInfo(place_page::BuildInfo const & bui
   FeatureID selectedFeature = buildInfo.m_featureId;
   auto const isFeatureMatchingEnabled = buildInfo.IsFeatureMatchingEnabled();
 
-// @TODO: (KK) Enable track selection.
-// The isTrackSelectionEnabled should be removed to enable the track selection when the UI will be implemented.
-#if defined(TARGET_OS_IPHONE)
-  bool constexpr isTrackSelectionEnabled = true;
-#else
-  bool constexpr isTrackSelectionEnabled = false;
-#endif
-
   // Using VisualParams inside FindTrackInTapPosition/GetDefaultTapRect requires drapeEngine.
-  if (isTrackSelectionEnabled && m_drapeEngine != nullptr && buildInfo.IsTrackMatchingEnabled() &&
+  if (m_drapeEngine != nullptr && buildInfo.IsTrackMatchingEnabled() &&
       !(isFeatureMatchingEnabled && selectedFeature.IsValid()))
   {
     Track::TrackSelectionInfo trackSelectionInfo;

From bb8886125618fcd713b50a64b2e05d1e7874c009 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Thu, 21 Aug 2025 23:03:16 +0700
Subject: [PATCH 168/302] [android] Add ppFloatingMarkerIconColor to material
 themes

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 android/app/src/main/res/values-night/themes.xml | 1 +
 android/app/src/main/res/values/themes.xml       | 1 +
 2 files changed, 2 insertions(+)

diff --git a/android/app/src/main/res/values-night/themes.xml b/android/app/src/main/res/values-night/themes.xml
index dd4c09bb6..324f332de 100644
--- a/android/app/src/main/res/values-night/themes.xml
+++ b/android/app/src/main/res/values-night/themes.xml
@@ -47,6 +47,7 @@
 
         <item name="ppBackground">@color/bg_cards_night</item>
         <item name="ppButtonsBackground">@color/bg_window_night</item>
+        <item name="ppFloatingMarkerIconColor">@color/white_54</item>
 
         <item name="navNextTurnFrame">@drawable/bg_nav_next_turn_night</item>
         <item name="navNextNextTurnFrame">@drawable/bg_nav_next_next_turn_night</item>
diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml
index 83a8b8a97..28466a35c 100644
--- a/android/app/src/main/res/values/themes.xml
+++ b/android/app/src/main/res/values/themes.xml
@@ -45,6 +45,7 @@
 
     <item name="ppBackground">@color/bg_cards</item>
     <item name="ppButtonsBackground">?panel</item>
+    <item name="ppFloatingMarkerIconColor">@color/black_54</item>
 
     <item name="navNextTurnFrame">@drawable/bg_nav_next_turn</item>
     <item name="navNextNextTurnFrame">@drawable/bg_nav_next_next_turn</item>

From 2684e2b278b2da396b99f1f753ac10d0ed871eb4 Mon Sep 17 00:00:00 2001
From: kavikhalique <kavikhalique3@gmail.com>
Date: Sat, 2 Aug 2025 19:42:27 +0530
Subject: [PATCH 169/302] Removed animated slow rendering and Nit picks

Signed-off-by: kavikhalique <kavikhalique3@gmail.com>
---
 .../java/app/organicmaps/ChartController.java |  2 +-
 .../sdk/bookmarks/data/BookmarkManager.java   |  8 +-
 .../sdk/bookmarks/data/FeatureId.java         |  2 +-
 .../organicmaps/sdk/bookmarks/data/Track.java | 22 ++---
 .../ElevationProfileViewRenderer.java         | 12 +--
 .../widget/placepage/PlacePageController.java | 35 ++++----
 .../widget/placepage/PlacePageView.java       | 90 +++++++------------
 .../widget/placepage/PlacePageViewModel.java  | 32 -------
 .../sections/PlacePageTrackFragment.java      | 29 +++---
 .../res/drawable/ic_distance_travelled.xml    | 10 +--
 android/app/src/main/res/values/strings.xml   |  4 +-
 .../app/organicmaps/sdk/UserMarkHelper.cpp    |  6 +-
 .../sdk/bookmarks/data/BookmarkManager.cpp    | 24 ++---
 libs/map/place_page_info.cpp                  |  2 +-
 14 files changed, 99 insertions(+), 179 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/ChartController.java b/android/app/src/main/java/app/organicmaps/ChartController.java
index c6fad3ad8..aa0af954b 100644
--- a/android/app/src/main/java/app/organicmaps/ChartController.java
+++ b/android/app/src/main/java/app/organicmaps/ChartController.java
@@ -37,7 +37,7 @@ public class ChartController implements OnChartValueSelectedListener
 {
   private static final int CHART_Y_LABEL_COUNT = 3;
   private static final int CHART_X_LABEL_COUNT = 6;
-  private static final int CHART_ANIMATION_DURATION = 1500;
+  private static final int CHART_ANIMATION_DURATION = 0;
   private static final int CHART_FILL_ALPHA = (int) (0.12 * 255);
   private static final int CHART_AXIS_GRANULARITY = 100;
   private static final float CUBIC_INTENSITY = 0.2f;
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkManager.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkManager.java
index 128a90ef2..271ce2f46 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkManager.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkManager.java
@@ -264,9 +264,9 @@ public enum BookmarkManager {
   }
 
   @Nullable
-  public void updateTrackPlacePage(long trackId)
+  public void updateTrackPlacePage()
   {
-    nativeUpdateTrackPlacePage(trackId);
+    nativeUpdateTrackPlacePage();
   }
 
   @Nullable
@@ -751,7 +751,7 @@ public enum BookmarkManager {
   private native Bookmark nativeUpdateBookmarkPlacePage(long bmkId);
 
   @Nullable
-  private native void nativeUpdateTrackPlacePage(long trackId);
+  private native void nativeUpdateTrackPlacePage();
 
   @Nullable
   private native BookmarkInfo nativeGetBookmarkInfo(long bmkId);
@@ -919,8 +919,6 @@ public enum BookmarkManager {
 
   public static native ElevationInfo nativeGetTrackElevationInfo(long trackId);
 
-  public static native boolean nativeIsElevationInfoHasValue(long trackId);
-
   public static native TrackStatistics nativeGetTrackStatistics(long trackId);
   public interface BookmarksLoadingListener
   {
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/FeatureId.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/FeatureId.java
index bdb653908..98d71802c 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/FeatureId.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/FeatureId.java
@@ -27,7 +27,7 @@ public class FeatureId implements Parcelable
   };
 
   @NonNull
-  public static final FeatureId EMPTY = new FeatureId("", 0L, 0);
+  public static final FeatureId EMPTY = new FeatureId("", -1L, 0);
 
   @NonNull
   private final String mMwmName;
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Track.java b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Track.java
index db73f6440..23662ba28 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Track.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Track.java
@@ -25,8 +25,8 @@ public class Track extends MapObject
 
   Track(long trackId, long categoryId, String name, Distance length, int color)
   {
-    super(FeatureId.fromFeatureIdString("1:2:3"), TRACK, name, "", "", "", 0, 0, "", null, OPENING_MODE_PREVIEW_PLUS,
-          null, "", RoadWarningMarkType.UNKNOWN.ordinal(), null);
+    super(FeatureId.EMPTY, TRACK, name, "", "", "", 0, 0, "", null, OPENING_MODE_PREVIEW_PLUS, null, "",
+          RoadWarningMarkType.UNKNOWN.ordinal(), null);
     mTrackId = trackId;
     mCategoryId = categoryId;
     mName = name;
@@ -49,8 +49,7 @@ public class Track extends MapObject
     mLength = length;
   }
 
-  // modifying this categoryId will not change the core data
-  // its just for temporary changes
+  // Change of the category in the core is done in PlacePageView::onCategoryChanged().
   public void setCategoryId(@NonNull long categoryId)
   {
     mCategoryId = categoryId;
@@ -94,22 +93,15 @@ public class Track extends MapObject
 
   public ElevationInfo getElevationInfo()
   {
-    if (mElevationInfo != null)
-      return mElevationInfo;
-    mElevationInfo = BookmarkManager.nativeGetTrackElevationInfo(mTrackId);
+    if (mElevationInfo == null)
+      mElevationInfo = BookmarkManager.nativeGetTrackElevationInfo(mTrackId);
     return mElevationInfo;
   }
 
-  public boolean isElevationInfoHasValue()
-  {
-    return BookmarkManager.nativeIsElevationInfoHasValue(mTrackId);
-  }
-
   public TrackStatistics getTrackStatistics()
   {
-    if (mTrackStatistics != null)
-      return mTrackStatistics;
-    mTrackStatistics = BookmarkManager.nativeGetTrackStatistics(mTrackId);
+    if (mTrackStatistics == null)
+      mTrackStatistics = BookmarkManager.nativeGetTrackStatistics(mTrackId);
     return mTrackStatistics;
   }
 }
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java b/android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java
index bce8db144..9e365e4f1 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java
@@ -58,12 +58,6 @@ public class ElevationProfileViewRenderer implements PlacePageStateListener
   private View mTimeContainer;
   private View mTitleContainer;
 
-  @NonNull
-  private static String formatDistance(final Context context, int distance)
-  {
-    return Framework.nativeFormatAltitude(distance);
-  }
-
   public void render(@NonNull Track track)
   {
     final Context context = mAscent.getContext();
@@ -82,6 +76,12 @@ public class ElevationProfileViewRenderer implements PlacePageStateListener
     mTime.setText(Utils.formatRoutingTime(mAscent.getContext(), (int) stats.getDuration(), R.dimen.text_size_body_2));
   }
 
+  @NonNull
+  private static String formatDistance(final Context context, int distance)
+  {
+    return Framework.nativeFormatAltitude(distance);
+  }
+
   public void initialize(@Nullable View view)
   {
     Objects.requireNonNull(view);
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
index db21996f2..75cdc17c2 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
@@ -124,6 +124,7 @@ public class PlacePageController
       bg.setCornerSize(mPlacePageCornerRadius);
     }
   };
+
   private final BottomSheetBehavior.BottomSheetCallback mDefaultBottomSheetCallback =
       new BottomSheetBehavior.BottomSheetCallback() {
         @Override
@@ -148,18 +149,6 @@ public class PlacePageController
         }
       };
 
-  @NonNull
-  private static PlacePageButtons.ButtonType toPlacePageButton(@NonNull RoadWarningMarkType type)
-  {
-    return switch (type)
-    {
-      case DIRTY -> PlacePageButtons.ButtonType.ROUTE_AVOID_UNPAVED;
-      case FERRY -> PlacePageButtons.ButtonType.ROUTE_AVOID_FERRY;
-      case TOLL -> PlacePageButtons.ButtonType.ROUTE_AVOID_TOLL;
-      default -> throw new AssertionError("Unsupported road warning type: " + type);
-    };
-  }
-
   @Nullable
   @Override
   public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
@@ -217,6 +206,18 @@ public class PlacePageController
     ViewCompat.requestApplyInsets(mPlacePage);
   }
 
+  @NonNull
+  private static PlacePageButtons.ButtonType toPlacePageButton(@NonNull RoadWarningMarkType type)
+  {
+    return switch (type)
+    {
+      case DIRTY -> PlacePageButtons.ButtonType.ROUTE_AVOID_UNPAVED;
+      case FERRY -> PlacePageButtons.ButtonType.ROUTE_AVOID_FERRY;
+      case TOLL -> PlacePageButtons.ButtonType.ROUTE_AVOID_TOLL;
+      default -> throw new AssertionError("Unsupported road warning type: " + type);
+    };
+  }
+
   private void stopCustomPeekHeightAnimation()
   {
     if (mCustomPeekHeightAnimator != null && mCustomPeekHeightAnimator.isStarted())
@@ -456,19 +457,18 @@ public class PlacePageController
   {
     if (mMapObject == null)
       return;
+    dismissAlertDialog();
+    mViewModel.isAlertDialogShowing = true;
     if (mAlertDialog != null)
     {
-      mAlertDialog.dismiss();
       mAlertDialog.show();
-      mViewModel.isAlertDialogShowing = true;
       return;
     }
-    mViewModel.isAlertDialogShowing = true;
     mAlertDialog = new MaterialAlertDialogBuilder(requireContext(), R.style.MwmTheme_AlertDialog)
-                       .setTitle("Would you like to delete " + mMapObject.getTitle() + "?")
+                       .setTitle(requireContext().getString(R.string.delete_track_dialog_title, mMapObject.getTitle()))
                        .setCancelable(true)
                        .setNegativeButton(R.string.cancel, null)
-                       .setPositiveButton("delete",
+                       .setPositiveButton(R.string.delete,
                                           (dialog, which) -> {
                                             BookmarkManager.INSTANCE.deleteTrack(((Track) mMapObject).getTrackId());
                                             close();
@@ -660,6 +660,7 @@ public class PlacePageController
       // Place page will automatically open when the bottom sheet content is loaded so we can compute the peek height
       createPlacePageFragments();
       updateButtons(mapObject, showBackButton, !mMapObject.isMyPosition());
+      mAlertDialog = null;
       if (mViewModel.isAlertDialogShowing)
         showTrackDeleteAlertDialog();
     }
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
index edc150685..979705914 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
@@ -369,9 +369,12 @@ public class PlacePageView extends Fragment
     else
       refreshDistanceToObject(loc);
     UiUtils.hideIf(mMapObject.isTrack(), mFrame.findViewById(R.id.ll__place_latlon),
-                   mFrame.findViewById(R.id.ll__place_open_in), mFrame.findViewById(R.id.ll__place_add), mEditTopSpace,
-                   mTvAzimuth, mTvDistance, mAvDirection);
-    UiUtils.hideIf(MapObjectType.getMapObjectType(mMapObject) != MapObjectType.OTHER, mTvSubtitle);
+                   mFrame.findViewById(R.id.ll__place_open_in));
+    if (mMapObject.isTrack() || mMapObject.isBookmark())
+    {
+      UiUtils.hide(mTvSubtitle);
+      UiUtils.hide(mTvAzimuth, mAvDirection, mTvDistance);
+    }
   }
 
   private <T extends Fragment> void updateViewFragment(Class<T> controllerClass, String fragmentTag,
@@ -466,9 +469,7 @@ public class PlacePageView extends Fragment
   void refreshCategoryPreview()
   {
     View categoryContainer = mFrame.findViewById(R.id.category_container);
-    switch (MapObjectType.getMapObjectType(mMapObject))
-    {
-    case TRACK ->
+    if (mMapObject.isTrack())
     {
       Track track = (Track) mMapObject;
       Drawable circle =
@@ -477,7 +478,7 @@ public class PlacePageView extends Fragment
       mTvCategory.setText(BookmarkManager.INSTANCE.getCategoryById(track.getCategoryId()).getName());
       UiUtils.show(mColorIcon, mTvCategory, categoryContainer);
     }
-    case BOOKMARK ->
+    else if (mMapObject.isBookmark())
     {
       Bookmark bookmark = (Bookmark) mMapObject;
       Icon icon = bookmark.getIcon();
@@ -491,8 +492,7 @@ public class PlacePageView extends Fragment
         UiUtils.show(mColorIcon, mTvCategory, categoryContainer);
       }
     }
-    case OTHER -> UiUtils.hide(mColorIcon, mTvCategory, categoryContainer);
-    }
+
     mColorIcon.setOnClickListener(this::onClick);
     mTvCategory.setOnClickListener(this::onClick);
     mEditBookmark.setOnClickListener(this::onClick);
@@ -508,25 +508,23 @@ public class PlacePageView extends Fragment
         (BookmarkColorDialogFragment) factory.instantiate(getContext().getClassLoader(), className);
     dialogFragment.setArguments(args);
 
-    switch (MapObjectType.getMapObjectType(mMapObject))
+    if (mMapObject.isTrack())
     {
-    case TRACK ->
-    {
-      final Track mTrack = (Track) mMapObject;
-      args.putInt(BookmarkColorDialogFragment.ICON_COLOR, PredefinedColors.getPredefinedColorIndex(mTrack.getColor()));
+      final Track track = (Track) mMapObject;
+      args.putInt(BookmarkColorDialogFragment.ICON_COLOR, PredefinedColors.getPredefinedColorIndex(track.getColor()));
       dialogFragment.setOnColorSetListener((colorPos) -> {
-        int from = mTrack.getColor();
+        int from = track.getColor();
         int to = PredefinedColors.getColor(colorPos);
         if (from == to)
           return;
-        mViewModel.modifyMapObjectColorSilently(to);
+        track.setColor(to);
         Drawable circle = Graphics.drawCircle(to, R.dimen.place_page_icon_size, requireContext().getResources());
         mColorIcon.setImageDrawable(circle);
       });
-      dialogFragment.show(requireActivity().getSupportFragmentManager(), null);
     }
-    case BOOKMARK ->
+    else if (mMapObject.isBookmark())
     {
+      dialogFragment.show(requireActivity().getSupportFragmentManager(), null);
       final Bookmark bookmark = (Bookmark) mMapObject;
       args.putInt(BookmarkColorDialogFragment.ICON_COLOR, bookmark.getIcon().getColor());
       args.putInt(BookmarkColorDialogFragment.ICON_RES, bookmark.getIcon().getResId());
@@ -535,7 +533,7 @@ public class PlacePageView extends Fragment
         int to = PredefinedColors.getColor(colorPos);
         if (from == to)
           return;
-        mViewModel.modifyMapObjectColorSilently(to);
+        bookmark.setIconColor(to);
         Drawable circle = Graphics.drawCircleAndImage(to, R.dimen.place_page_icon_size,
                                                       app.organicmaps.sdk.R.drawable.ic_bookmark_none,
                                                       R.dimen.place_page_icon_mark_size, requireContext());
@@ -543,7 +541,6 @@ public class PlacePageView extends Fragment
       });
       dialogFragment.show(requireActivity().getSupportFragmentManager(), null);
     }
-    }
   }
 
   private void showCategoryList()
@@ -555,9 +552,7 @@ public class PlacePageView extends Fragment
     final FragmentFactory factory = manager.getFragmentFactory();
     final ChooseBookmarkCategoryFragment frag =
         (ChooseBookmarkCategoryFragment) factory.instantiate(getContext().getClassLoader(), className);
-    switch (MapObjectType.getMapObjectType(mMapObject))
-    {
-    case TRACK ->
+    if (mMapObject.isTrack())
     {
       Track track = (Track) mMapObject;
       BookmarkCategory currentCategory = BookmarkManager.INSTANCE.getCategoryById(track.getCategoryId());
@@ -566,7 +561,7 @@ public class PlacePageView extends Fragment
       frag.setArguments(args);
       frag.show(manager, null);
     }
-    case BOOKMARK ->
+    else if (mMapObject.isBookmark())
     {
       Bookmark bookmark = (Bookmark) mMapObject;
       BookmarkCategory currentCategory = BookmarkManager.INSTANCE.getCategoryById(bookmark.getCategoryId());
@@ -575,15 +570,12 @@ public class PlacePageView extends Fragment
       frag.setArguments(args);
       frag.show(manager, null);
     }
-    }
   }
 
   @Override
   public void onCategoryChanged(@NonNull BookmarkCategory newCategory)
   {
-    switch (MapObjectType.getMapObjectType(mMapObject))
-    {
-    case TRACK ->
+    if (mMapObject.isTrack())
     {
       Track track = (Track) mMapObject;
       BookmarkCategory previousCategory = BookmarkManager.INSTANCE.getCategoryById(track.getCategoryId());
@@ -591,49 +583,44 @@ public class PlacePageView extends Fragment
         return;
       BookmarkManager.INSTANCE.notifyCategoryChanging(track, newCategory.getId());
       mTvCategory.setText(newCategory.getName());
-      mViewModel.modifyMapObjectCategoryIdSilently(newCategory.getId());
+      track.setCategoryId(newCategory.getId());
     }
-    case BOOKMARK ->
+    else if (mMapObject.isBookmark())
     {
       Bookmark bookmark = (Bookmark) mMapObject;
       BookmarkCategory previousCategory = BookmarkManager.INSTANCE.getCategoryById(bookmark.getCategoryId());
       if (previousCategory == newCategory)
         return;
       mTvCategory.setText(newCategory.getName());
-      mViewModel.modifyMapObjectCategoryIdSilently(newCategory.getId());
-    }
+      bookmark.setCategoryId(newCategory.getId());
     }
   }
 
   void showBookmarkEditFragment()
   {
-    switch (MapObjectType.getMapObjectType(mMapObject))
-    {
-    case TRACK ->
+    if (mMapObject.isTrack())
     {
       Track track = (Track) mMapObject;
       final FragmentActivity activity = requireActivity();
       EditBookmarkFragment.editTrack(track.getCategoryId(), track.getTrackId(), activity, getChildFragmentManager(),
                                      PlacePageView.this);
     }
-    case BOOKMARK ->
+    else if (mMapObject.isBookmark())
     {
       Bookmark bookmark = (Bookmark) mMapObject;
       final FragmentActivity activity = requireActivity();
       EditBookmarkFragment.editBookmark(bookmark.getCategoryId(), bookmark.getBookmarkId(), activity,
                                         getChildFragmentManager(), PlacePageView.this);
     }
-    }
   }
 
   @Override
   public void onBookmarkSaved(long bookmarkId, boolean movedFromCategory)
   {
-    switch (MapObjectType.getMapObjectType(mMapObject))
-    {
-    case TRACK -> BookmarkManager.INSTANCE.updateTrackPlacePage(bookmarkId);
-    case BOOKMARK -> BookmarkManager.INSTANCE.updateBookmarkPlacePage(bookmarkId);
-    }
+    if (mMapObject.isTrack())
+      BookmarkManager.INSTANCE.updateTrackPlacePage();
+    else if (mMapObject.isBookmark())
+      BookmarkManager.INSTANCE.updateBookmarkPlacePage(bookmarkId);
   }
 
   private void refreshDetails()
@@ -1071,7 +1058,7 @@ public class PlacePageView extends Fragment
   {
     if (mMapObject.isTrack())
     {
-      MenuBottomSheetFragment.newInstance(TRACK_SHARE_MENU_ID, getString(R.string.PP_track_bottom_sheet_title))
+      MenuBottomSheetFragment.newInstance(TRACK_SHARE_MENU_ID, getString(R.string.share_track))
           .show(getChildFragmentManager(), TRACK_SHARE_MENU_ID);
     }
     else
@@ -1119,21 +1106,4 @@ public class PlacePageView extends Fragment
     void onPlacePageRequestToggleState();
     void onPlacePageRequestClose();
   }
-
-  public enum MapObjectType
-  {
-    TRACK,
-    BOOKMARK,
-    OTHER;
-
-    public static MapObjectType getMapObjectType(MapObject mapObject)
-    {
-      if (mapObject.isTrack())
-        return TRACK;
-      else if (mapObject.isBookmark())
-        return BOOKMARK;
-      else
-        return OTHER;
-    }
-  }
 }
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageViewModel.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageViewModel.java
index a8f4b852d..a5e7cded0 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageViewModel.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageViewModel.java
@@ -37,38 +37,6 @@ public class PlacePageViewModel extends ViewModel
     mMapObject.setValue(mapObject);
   }
 
-  // These silent method are used to update data of map object silently without triggering
-  // the observer which refreshes everything and puts extra load  on device in calculation
-  // which is not required
-  public void modifyMapObjectPointSilently(ElevationInfo.Point point)
-  {
-    if (mMapObject.getValue() == null)
-      return;
-    mMapObject.getValue().setLat(point.getLatitude());
-    mMapObject.getValue().setLon(point.getLongitude());
-  }
-
-  public void modifyMapObjectCategoryIdSilently(long categoryId)
-  {
-    if (mMapObject.getValue() == null)
-      return;
-    switch (PlacePageView.MapObjectType.getMapObjectType(mMapObject.getValue()))
-    {
-    case TRACK -> ((Track) mMapObject.getValue()).setCategoryId(categoryId);
-    case BOOKMARK -> ((Bookmark) mMapObject.getValue()).setCategoryId(categoryId);
-    }
-  }
-
-  public void modifyMapObjectColorSilently(int color)
-  {
-    if (mMapObject.getValue() == null)
-      return;
-    switch (PlacePageView.MapObjectType.getMapObjectType(mMapObject.getValue()))
-    {
-    case TRACK -> ((Track) mMapObject.getValue()).setColor(color);
-    case BOOKMARK -> ((Bookmark) mMapObject.getValue()).setIconColor(color);
-    }
-  }
   public MutableLiveData<Integer> getPlacePageWidth()
   {
     return mPlacePageWidth;
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageTrackFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageTrackFragment.java
index 708110553..13b88cc59 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageTrackFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageTrackFragment.java
@@ -63,14 +63,14 @@ public class PlacePageTrackFragment extends Fragment
   public void onStop()
   {
     super.onStop();
+    BookmarkManager.INSTANCE.setElevationActivePointChangedListener(null);
+    BookmarkManager.INSTANCE.setElevationCurrentPositionChangedListener(null);
     mViewModel.getMapObject().removeObserver(this);
   }
 
   @Override
   public void onDestroy()
   {
-    BookmarkManager.INSTANCE.setElevationActivePointChangedListener(null);
-    BookmarkManager.INSTANCE.setElevationCurrentPositionChangedListener(null);
     super.onDestroy();
   }
 
@@ -80,21 +80,21 @@ public class PlacePageTrackFragment extends Fragment
     // MapObject could be something else than a Track if the user already has the place page
     // opened and clicks on a non-Track POI.
     // This callback would be called before the fragment had time to be destroyed
-    if (mapObject != null && mapObject.isTrack())
+    if (mapObject == null || !mapObject.isTrack())
+      return;
+
+    Track track = (Track) mapObject;
+    if (track.getElevationInfo() != null)
     {
-      Track track = (Track) mapObject;
-      if (track.isElevationInfoHasValue())
+      if (mTrack == null || mTrack.getTrackId() != track.getTrackId())
       {
-        if (mTrack == null || mTrack.getTrackId() != track.getTrackId())
-        {
-          mElevationProfileViewRenderer.render(track);
-          UiUtils.show(mElevationProfileView);
-        }
+        mElevationProfileViewRenderer.render(track);
+        UiUtils.show(mElevationProfileView);
       }
-      else
-        UiUtils.hide(mElevationProfileView);
-      mTrack = track;
     }
+    else
+      UiUtils.hide(mElevationProfileView);
+    mTrack = track;
   }
 
   @Override
@@ -104,7 +104,8 @@ public class PlacePageTrackFragment extends Fragment
       return;
     mElevationProfileViewRenderer.onChartElevationActivePointChanged();
     ElevationInfo.Point point = BookmarkManager.INSTANCE.getElevationActivePointCoordinates(mTrack.getTrackId());
-    mViewModel.modifyMapObjectPointSilently(point);
+    mTrack.setLat(point.getLatitude());
+    mTrack.setLon(point.getLongitude());
   }
 
   @Override
diff --git a/android/app/src/main/res/drawable/ic_distance_travelled.xml b/android/app/src/main/res/drawable/ic_distance_travelled.xml
index 286e357bf..ecc42eba4 100644
--- a/android/app/src/main/res/drawable/ic_distance_travelled.xml
+++ b/android/app/src/main/res/drawable/ic_distance_travelled.xml
@@ -1,10 +1,10 @@
 <vector
   xmlns:android="http://schemas.android.com/apk/res/android"
+  android:width="24dp"
   android:height="24dp"
-  android:viewportHeight="590.91"
-  android:viewportWidth="590.91"
-  android:width="24dp">
+  android:viewportWidth="960"
+  android:viewportHeight="960">
   <path
-    android:fillColor="#000000"
-    android:pathData="M541.67,295.45l-86.21,-86.21l0,71.21l-320,0l0,-71.21l-86.21,86.21l86.21,86.21l0,-71.21l320,0l0,71.21z" />
+    android:pathData="M280,680 L80,480l200,-200 56,56 -103,104h494L624,336l56,-56 200,200 -200,200 -56,-56 103,-104L233,520l103,104 -56,56Z"
+    android:fillColor="#e3e3e3" />
 </vector>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index e8e4a24d8..5dd2dc77d 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -971,5 +971,7 @@
     <string name="closed_now">Closed now</string>
     <!-- Used in place page preview for next open/close time. eg. "closing in 30 min • at 19:30" -->
     <string name="at">at %s</string>
-    <string name="PP_track_bottom_sheet_title">Save Track As</string>
+    <!-- Title of the bottom sheet when sharing the track -->
+    <string name="share_track">Share Track</string>
+    <string name="delete_track_dialog_title">Delete %s?</string>
 </resources>
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.cpp
index 7ac0daa98..04fb2b071 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.cpp
@@ -102,11 +102,7 @@ jobject CreateTrack(JNIEnv * env, place_page::Info const & info, jni::TScopedLoc
 
   auto const trackId = info.GetTrackId();
   auto const track = frm()->GetBookmarkManager().GetTrack(trackId);
-  dp::Color nColor = track->GetColor(0);
-
-  jint androidColor =
-      shift(nColor.GetAlpha(), 24) + shift(nColor.GetRed(), 16) + shift(nColor.GetGreen(), 8) + nColor.GetBlue();
-
+  jint androidColor = track->GetColor(0).GetARGB();
   auto const categoryId = track->GetGroupId();
   ms::LatLon const ll = info.GetLatLon();
   jni::TScopedLocalRef jMwmName(env, jni::ToJavaString(env, info.GetID().GetMwmName()));
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/BookmarkManager.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/BookmarkManager.cpp
index 4cb18a061..43334c6b3 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/BookmarkManager.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/BookmarkManager.cpp
@@ -448,8 +448,7 @@ JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManage
 }
 
 JNIEXPORT void JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeUpdateTrackPlacePage(JNIEnv * env,
-                                                                                                          jobject,
-                                                                                                          jlong trackId)
+                                                                                                          jobject)
 {
   if (!frm()->HasPlacePageInfo())
     return;
@@ -837,8 +836,7 @@ JNIEXPORT void JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_n
     JNIEnv *, jclass, jlong trackId, jdouble distanceInMeters, jdouble latitude, jdouble longitude)
 {
   auto & bm = frm()->GetBookmarkManager();
-  bm.SetElevationActivePoint(static_cast<kml::TrackId>(trackId),
-                             m2::PointD(static_cast<double>(latitude), static_cast<double>(longitude)),
+  bm.SetElevationActivePoint(static_cast<kml::TrackId>(trackId), {latitude, longitude},
                              static_cast<double>(distanceInMeters));
 }
 
@@ -872,22 +870,17 @@ JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManage
 {
   auto const & track = frm()->GetBookmarkManager().GetTrack(track_id);
   auto const & elevationInfo = track->GetElevationInfo();
-  return usermark_helper::CreateElevationInfo(env, elevationInfo.value());
-}
-JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeIsElevationInfoHasValue(
-    JNIEnv * env, jclass clazz, jlong track_id)
-{
-  return static_cast<jboolean>(frm()->GetBookmarkManager().GetTrack(track_id)->GetElevationInfo().has_value());
+  return track->GetElevationInfo().has_value() ? usermark_helper::CreateElevationInfo(env, elevationInfo.value())
+                                               : nullptr;
 }
+
 JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetTrackStatistics(
     JNIEnv * env, jclass clazz, jlong track_id)
 {
   static jmethodID const cId = jni::GetConstructorID(env, g_trackStatisticsClazz, "(DDDDII)V");
   auto const trackStats = frm()->GetBookmarkManager().GetTrack(track_id)->GetStatistics();
-  return env->NewObject(g_trackStatisticsClazz, cId, static_cast<jdouble>(trackStats.m_length),
-                        static_cast<jdouble>(trackStats.m_duration), static_cast<jdouble>(trackStats.m_ascent),
-                        static_cast<jdouble>(trackStats.m_descent), static_cast<jint>(trackStats.m_minElevation),
-                        static_cast<jint>(trackStats.m_maxElevation));
+  return env->NewObject(g_trackStatisticsClazz, cId, trackStats.m_length, trackStats.m_duration, trackStats.m_ascent,
+                        trackStats.m_descent, trackStats.m_minElevation, static_cast<jint>(trackStats.m_maxElevation));
 }
 
 JNIEXPORT jobject JNICALL
@@ -900,7 +893,6 @@ Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetElevationActive
   static jmethodID const pointCtorId = jni::GetConstructorID(env, pointClass, "(DIDD)V");
   auto const & trackInfo = frm()->GetBookmarkManager().GetTrackSelectionInfo(track_id);
   auto const latlon = mercator::ToLatLon(trackInfo.m_trackPoint);
-  return env->NewObject(pointClass, pointCtorId, 0.0, 0, static_cast<jdouble>(latlon.m_lat),
-                        static_cast<jdouble>(latlon.m_lon));
+  return env->NewObject(pointClass, pointCtorId, 0.0, 0, latlon.m_lat, latlon.m_lon);
 }
 }  // extern "C"
diff --git a/libs/map/place_page_info.cpp b/libs/map/place_page_info.cpp
index a315ea9ae..2b6d417bc 100644
--- a/libs/map/place_page_info.cpp
+++ b/libs/map/place_page_info.cpp
@@ -31,7 +31,7 @@ bool Info::IsBookmark() const
 bool Info::ShouldShowAddPlace() const
 {
   auto const isPointOrBuilding = IsPointType() || IsBuilding();
-  return !(IsFeature() && isPointOrBuilding);
+  return !IsTrack() && !(IsFeature() && isPointOrBuilding);
 }
 
 void Info::SetFromFeatureType(FeatureType & ft)

From 0eee3c4bf41b83d9b84c030d5e7ad15348939fa2 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Thu, 21 Aug 2025 23:17:43 +0700
Subject: [PATCH 170/302] [android] Fix unity jni build issue

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 android/sdk/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.cpp
index 04fb2b071..97bcde92a 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/UserMarkHelper.cpp
@@ -1,6 +1,7 @@
 #include "UserMarkHelper.hpp"
 
 #include "app/organicmaps/sdk/routing/RoutePointInfo.hpp"
+#include "app/organicmaps/sdk/util/Distance.hpp"
 
 #include "map/elevation_info.hpp"
 #include "map/place_page_info.hpp"

From e98ecce3752423071a78194762db7b6bf38f1783 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Thu, 21 Aug 2025 23:57:42 +0700
Subject: [PATCH 171/302] [android] Fix PlacePageView components OM mismatches

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 .../java/app/organicmaps/widget/placepage/PlacePageView.java  | 4 ++--
 android/app/src/main/res/layout/place_page_preview.xml        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
index 979705914..efcba5da3 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
@@ -148,7 +148,7 @@ public class PlacePageView extends Fragment
   private View mAddPlace;
   private View mEditTopSpace;
   private ImageView mColorIcon;
-  private TextView mTvCategory;
+  private MaterialTextView mTvCategory;
   private ImageView mEditBookmark;
 
   // Data
@@ -373,7 +373,7 @@ public class PlacePageView extends Fragment
     if (mMapObject.isTrack() || mMapObject.isBookmark())
     {
       UiUtils.hide(mTvSubtitle);
-      UiUtils.hide(mTvAzimuth, mAvDirection, mTvDistance);
+      UiUtils.hide(mAvDirection, mTvDistance);
     }
   }
 
diff --git a/android/app/src/main/res/layout/place_page_preview.xml b/android/app/src/main/res/layout/place_page_preview.xml
index 3978e6e80..5251e6a10 100644
--- a/android/app/src/main/res/layout/place_page_preview.xml
+++ b/android/app/src/main/res/layout/place_page_preview.xml
@@ -204,7 +204,7 @@
         android:focusable="true"
         android:paddingHorizontal="8dp"
         android:paddingVertical="5dp" />
-      <TextView
+      <com.google.android.material.textview.MaterialTextView
         android:id="@+id/tv__category"
         style="@style/PlacePageMetadataText.Button"
         android:layout_alignParentTop="true"

From 89d82be2b91b12557d13cc0e3786178e23f14822 Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Thu, 7 Aug 2025 18:31:11 +0200
Subject: [PATCH 172/302] [android] Fix bookmark icon in place plage

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 .../widget/placepage/PlacePageView.java       |  8 ++--
 .../main/res/layout/place_page_preview.xml    | 42 +++++++++----------
 2 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
index efcba5da3..e1c222435 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
@@ -484,8 +484,7 @@ public class PlacePageView extends Fragment
       Icon icon = bookmark.getIcon();
       if (icon != null)
       {
-        Drawable circle = Graphics.drawCircleAndImage(icon.argb(), R.dimen.place_page_icon_size,
-                                                      app.organicmaps.sdk.R.drawable.ic_bookmark_none,
+        Drawable circle = Graphics.drawCircleAndImage(icon.argb(), R.dimen.place_page_icon_size, icon.getResId(),
                                                       R.dimen.place_page_icon_mark_size, requireContext());
         mColorIcon.setImageDrawable(circle);
         mTvCategory.setText(BookmarkManager.INSTANCE.getCategoryById(bookmark.getCategoryId()).getName());
@@ -521,10 +520,10 @@ public class PlacePageView extends Fragment
         Drawable circle = Graphics.drawCircle(to, R.dimen.place_page_icon_size, requireContext().getResources());
         mColorIcon.setImageDrawable(circle);
       });
+      dialogFragment.show(requireActivity().getSupportFragmentManager(), null);
     }
     else if (mMapObject.isBookmark())
     {
-      dialogFragment.show(requireActivity().getSupportFragmentManager(), null);
       final Bookmark bookmark = (Bookmark) mMapObject;
       args.putInt(BookmarkColorDialogFragment.ICON_COLOR, bookmark.getIcon().getColor());
       args.putInt(BookmarkColorDialogFragment.ICON_RES, bookmark.getIcon().getResId());
@@ -534,8 +533,7 @@ public class PlacePageView extends Fragment
         if (from == to)
           return;
         bookmark.setIconColor(to);
-        Drawable circle = Graphics.drawCircleAndImage(to, R.dimen.place_page_icon_size,
-                                                      app.organicmaps.sdk.R.drawable.ic_bookmark_none,
+        Drawable circle = Graphics.drawCircleAndImage(to, R.dimen.place_page_icon_size, bookmark.getIcon().getResId(),
                                                       R.dimen.place_page_icon_mark_size, requireContext());
         mColorIcon.setImageDrawable(circle);
       });
diff --git a/android/app/src/main/res/layout/place_page_preview.xml b/android/app/src/main/res/layout/place_page_preview.xml
index 5251e6a10..29e6a3379 100644
--- a/android/app/src/main/res/layout/place_page_preview.xml
+++ b/android/app/src/main/res/layout/place_page_preview.xml
@@ -186,35 +186,35 @@
     android:layout_marginTop="@dimen/margin_half"
     android:orientation="vertical">
     <include layout="@layout/place_page_shadow_gap" />
-    <RelativeLayout
+    <LinearLayout
       android:id="@+id/container"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:background="?ppBackground">
+      android:background="?ppBackground"
+      android:orientation="horizontal">
       <ImageView
         android:id="@+id/item_icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentBottom="true"
+        android:layout_width="@dimen/place_page_icon_size"
+        android:layout_height="@dimen/place_page_icon_size"
+        android:layout_gravity="center"
+        android:layout_marginBottom="@dimen/margin_half_plus"
+        android:layout_marginEnd="@dimen/margin_half"
+        android:layout_marginStart="@dimen/margin_half_plus"
+        android:layout_marginTop="@dimen/margin_half_plus"
         android:background="?clickableBackground"
-        android:layout_centerVertical="true"
         android:clickable="true"
         android:focusable="true"
-        android:paddingHorizontal="8dp"
-        android:paddingVertical="5dp" />
+        tools:src="@drawable/ic_bookmark_none"
+        tools:tint="@color/base_red" />
       <com.google.android.material.textview.MaterialTextView
         android:id="@+id/tv__category"
         style="@style/PlacePageMetadataText.Button"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentBottom="true"
-        android:layout_centerVertical="true"
-        android:layout_toStartOf="@id/edit_Bookmark"
-        android:layout_toEndOf="@id/item_icon"
+        android:layout_width="0dp"
+        android:layout_gravity="center"
+        android:layout_marginEnd="@dimen/margin_quarter"
+        android:layout_marginStart="@dimen/margin_quarter"
+        android:layout_weight="1"
         android:background="?clickableBackground"
-        android:paddingStart="@dimen/margin_quarter"
-        android:paddingEnd="@dimen/margin_quarter"
         android:textAllCaps="false"
         tools:text="@string/categories" />
       <ImageView
@@ -222,15 +222,13 @@
         style="@style/MwmWidget.Editor.MetadataIcon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentBottom="true"
-        android:layout_centerVertical="true"
+        android:layout_gravity="center"
+        android:layout_margin="@dimen/margin_base"
         android:background="?clickableBackground"
         android:clickable="true"
         android:focusable="true"
         android:src="@drawable/ic_edit" />
-    </RelativeLayout>
+    </LinearLayout>
   </LinearLayout>
   <androidx.fragment.app.FragmentContainerView
     android:id="@+id/place_page_track_fragment"

From 4052f0481e1a702fbd959f1bc8750f714a578425 Mon Sep 17 00:00:00 2001
From: kavikhalique <kavikhalique3@gmail.com>
Date: Thu, 7 Aug 2025 23:55:17 +0530
Subject: [PATCH 173/302] Hide PP category for other map objects other than
 track and bookmark

Signed-off-by: kavikhalique <kavikhalique3@gmail.com>
---
 .../organicmaps/widget/placepage/PlacePageView.java    | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
index e1c222435..c12539743 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
@@ -263,6 +263,9 @@ public class PlacePageView extends Fragment
     mColorIcon = mFrame.findViewById(R.id.item_icon);
     mTvCategory = mFrame.findViewById(R.id.tv__category);
     mEditBookmark = mFrame.findViewById(R.id.edit_Bookmark);
+    mColorIcon.setOnClickListener(this);
+    mTvCategory.setOnClickListener(this);
+    mEditBookmark.setOnClickListener(this);
 
     MaterialButton shareButton = mPreview.findViewById(R.id.share_button);
     shareButton.setOnClickListener(this::shareClickListener);
@@ -476,7 +479,6 @@ public class PlacePageView extends Fragment
           Graphics.drawCircle(track.getColor(), R.dimen.place_page_icon_size, requireContext().getResources());
       mColorIcon.setImageDrawable(circle);
       mTvCategory.setText(BookmarkManager.INSTANCE.getCategoryById(track.getCategoryId()).getName());
-      UiUtils.show(mColorIcon, mTvCategory, categoryContainer);
     }
     else if (mMapObject.isBookmark())
     {
@@ -488,13 +490,9 @@ public class PlacePageView extends Fragment
                                                       R.dimen.place_page_icon_mark_size, requireContext());
         mColorIcon.setImageDrawable(circle);
         mTvCategory.setText(BookmarkManager.INSTANCE.getCategoryById(bookmark.getCategoryId()).getName());
-        UiUtils.show(mColorIcon, mTvCategory, categoryContainer);
       }
     }
-
-    mColorIcon.setOnClickListener(this::onClick);
-    mTvCategory.setOnClickListener(this::onClick);
-    mEditBookmark.setOnClickListener(this::onClick);
+    UiUtils.showIf(mMapObject.isTrack() || mMapObject.isBookmark(), categoryContainer);
   }
 
   void showColorDialog()

From ac453e36ac79e366a216b681598f09b21909ef95 Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Mon, 18 Aug 2025 19:45:02 +0200
Subject: [PATCH 174/302] [android] Fix predefined colors again

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 .../sdk/bookmarks/data/BookmarkManager.cpp        |  6 +++---
 libs/kml/types.hpp                                | 15 +++++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/BookmarkManager.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/BookmarkManager.cpp
index 43334c6b3..cf81d5d57 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/BookmarkManager.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/bookmarks/data/BookmarkManager.cpp
@@ -360,7 +360,7 @@ JNIEXPORT jlong JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_
 JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetLastEditedColor(JNIEnv *,
                                                                                                         jobject)
 {
-  return static_cast<jint>(frm()->LastEditedBMColor());
+  return static_cast<jint>(kml::kColorIndexMap[E2I(frm()->LastEditedBMColor())]);
 }
 
 JNIEXPORT void JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeLoadBookmarksFile(
@@ -705,7 +705,7 @@ JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_n
                                                                                                       jlong bmk)
 {
   auto const * mark = getBookmark(bmk);
-  return static_cast<jint>(mark != nullptr ? mark->GetColor() : frm()->LastEditedBMColor());
+  return static_cast<jint>(kml::kColorIndexMap[E2I(mark != nullptr ? mark->GetColor() : frm()->LastEditedBMColor())]);
 }
 
 JNIEXPORT jint JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_nativeGetBookmarkIcon(JNIEnv *, jclass,
@@ -727,7 +727,7 @@ JNIEXPORT void JNICALL Java_app_organicmaps_sdk_bookmarks_data_BookmarkManager_n
     kml::SetDefaultStr(bmData.m_customName, bmName);
   if (descr)
     kml::SetDefaultStr(bmData.m_description, jni::ToNativeString(env, descr));
-  bmData.m_color.m_predefinedColor = static_cast<kml::PredefinedColor>(color);
+  bmData.m_color.m_predefinedColor = kml::kOrderedPredefinedColors[color];
 
   g_framework->ReplaceBookmark(static_cast<kml::MarkId>(bmk), bmData);
 }
diff --git a/libs/kml/types.hpp b/libs/kml/types.hpp
index dbe1c91f2..9d24b477f 100644
--- a/libs/kml/types.hpp
+++ b/libs/kml/types.hpp
@@ -66,6 +66,21 @@ static_assert(kOrderedPredefinedColors.size() == static_cast<size_t>(PredefinedC
               "kOrderedPredefinedColors size must match PredefinedColor::Count");
 static_assert(base::HasUniqueElements(kOrderedPredefinedColors), "All values must be unique");
 
+/**
+ * @brief Maps PredefinedColor to its index in kOrderedPredefinedColors.
+ *
+ * @code
+ * kOrderedPredefinedColors[kColorIndexMap[base::E2I(PredefinedColor::Red)]] == PredefinedColor::Red
+ * @endcode
+ */
+std::array constexpr kColorIndexMap = [] consteval
+{
+  std::array<int, static_cast<std::size_t>(PredefinedColor::Count)> map{};
+  for (std::size_t i = 0; i < kOrderedPredefinedColors.size(); ++i)
+    map[static_cast<std::size_t>(kOrderedPredefinedColors[i])] = static_cast<int>(i);
+  return map;
+}();
+
 inline std::string DebugPrint(PredefinedColor color)
 {
   switch (color)

From 339eca0bca491de18a0464b29f960c13e02f42c6 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Sat, 23 Aug 2025 00:26:23 +0200
Subject: [PATCH 175/302] [android] Simplify logic to change items color on the
 about screen

Signed-off-by: jeanbaptisteC <jeanbaptiste.charron@outlook.fr>
---
 .../java/app/organicmaps/help/HelpFragment.java   | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/help/HelpFragment.java b/android/app/src/main/java/app/organicmaps/help/HelpFragment.java
index 0a6f58a4b..f5535e6d6 100644
--- a/android/app/src/main/java/app/organicmaps/help/HelpFragment.java
+++ b/android/app/src/main/java/app/organicmaps/help/HelpFragment.java
@@ -7,6 +7,7 @@ import android.text.util.Linkify;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
@@ -35,15 +36,7 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene
 
   private void setupItem(@IdRes int id, boolean tint, @NonNull View frame)
   {
-    final MaterialTextView view = frame.findViewById(id);
-    view.setOnClickListener(this);
-    if (tint)
-      Graphics.tint(view);
-  }
-
-  private void setupButton(@IdRes int id, boolean tint, @NonNull View frame)
-  {
-    final MaterialButton view = frame.findViewById(id);
+    final TextView view = frame.findViewById(id);
     view.setOnClickListener(this);
     if (tint)
       Graphics.tint(view);
@@ -79,7 +72,7 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene
     setupItem(R.id.mastodon, false, root);
     setupItem(R.id.openstreetmap, true, root);
     setupItem(R.id.faq, true, root);
-    setupButton(R.id.report, isLandscape, root);
+    setupItem(R.id.report, isLandscape, root);
     setupItem(R.id.copyright, false, root);
 
     final MaterialTextView supportUsView = root.findViewById(R.id.support_us);
@@ -95,7 +88,7 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene
     {
       /*donateView.setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.ic_donate, 0,
                 R.drawable.ic_donate, 0);*/
-      setupButton(R.id.donate, isLandscape, root);
+      setupItem(R.id.donate, isLandscape, root);
     }
 
     if (BuildConfig.REVIEW_URL.isEmpty())

From 1e729e980df9df88d5d071a6fa84c794838e54a6 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Sat, 23 Aug 2025 00:06:52 +0200
Subject: [PATCH 176/302] [android] Add default value for progress bar

Signed-off-by: jeanbaptisteC <jeanbaptiste.charron@outlook.fr>
---
 android/app/src/main/res/layout/button_with_progress.xml | 1 +
 android/app/src/main/res/layout/layout_nav_bottom.xml    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/android/app/src/main/res/layout/button_with_progress.xml b/android/app/src/main/res/layout/button_with_progress.xml
index a2c3968a1..32efecb77 100644
--- a/android/app/src/main/res/layout/button_with_progress.xml
+++ b/android/app/src/main/res/layout/button_with_progress.xml
@@ -26,6 +26,7 @@
     android:layout_marginEnd="@dimen/margin_base_plus"
     android:layout_marginBottom="@dimen/margin_base"
     android:indeterminate="false"
+    android:progress="1"
     app:indicatorColor="?colorSecondary"
     app:trackColor="@color/bg_routing_progress"/>
   <com.google.android.material.button.MaterialButton
diff --git a/android/app/src/main/res/layout/layout_nav_bottom.xml b/android/app/src/main/res/layout/layout_nav_bottom.xml
index d2bed5c4e..13886a3f7 100644
--- a/android/app/src/main/res/layout/layout_nav_bottom.xml
+++ b/android/app/src/main/res/layout/layout_nav_bottom.xml
@@ -26,6 +26,7 @@
       style="@style/Widget.Material3.LinearProgressIndicator"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
+      android:progress="1"
       app:indicatorColor="?colorSecondary"
       app:trackCornerRadius="@dimen/nav_progress_head"
       app:trackThickness="@dimen/nav_progress"

From 632d9c0d1de3fdd1242457aa0ac4483b90522060 Mon Sep 17 00:00:00 2001
From: map-per <map-per@gmx.de>
Date: Fri, 22 Aug 2025 13:45:36 +0200
Subject: [PATCH 177/302] New icon and text for 'Volunteer and improve CoMaps'

Signed-off-by: map-per <map-per@gmx.de>
---
 android/app/src/main/res/drawable/ic_volunteer.xml     | 10 ++++++++++
 android/app/src/main/res/layout-land/about.xml         |  2 +-
 android/app/src/main/res/layout/about.xml              |  2 +-
 android/app/src/main/res/values/strings.xml            |  2 +-
 .../Maps/LocalizedStrings/en.lproj/Localizable.strings |  2 +-
 5 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 android/app/src/main/res/drawable/ic_volunteer.xml

diff --git a/android/app/src/main/res/drawable/ic_volunteer.xml b/android/app/src/main/res/drawable/ic_volunteer.xml
new file mode 100644
index 000000000..f81cf8acc
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_volunteer.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:pathData="M80,920v-80h800v80L80,920ZM160,800v-240q-33,-54 -51,-114.5T91,322q0,-61 15.5,-120T143,86q8,-21 26,-33.5t40,-12.5q31,0 53,21t18,50l-11,91q-6,48 8.5,91t43.5,75.5q29,32.5 70,52t89,19.5q60,0 120.5,12.5T706,488q45,23 69.5,58.5T800,634v166L160,800ZM240,720h480v-86q0,-24 -12,-42.5T674,562q-41,-20 -95,-31t-99,-11q-66,0 -122.5,-27t-96,-72.5Q222,375 202,315.5T190,192q-10,30 -14.5,64t-4.5,66q0,58 20.5,111.5T240,538v182ZM480,400q-66,0 -113,-47t-47,-113q0,-66 47,-113t113,-47q66,0 113,47t47,113q0,66 -47,113t-113,47ZM480,320q33,0 56.5,-23.5T560,240q0,-33 -23.5,-56.5T480,160q-33,0 -56.5,23.5T400,240q0,33 23.5,56.5T480,320ZM320,800v-37q0,-67 46.5,-115T480,600h160v80L480,680q-34,0 -57,24.5T400,763v37h-80ZM480,720ZM480,240Z"
+      android:fillColor="#000000"/>
+</vector>
diff --git a/android/app/src/main/res/layout-land/about.xml b/android/app/src/main/res/layout-land/about.xml
index d4500d316..2fc55d29c 100644
--- a/android/app/src/main/res/layout-land/about.xml
+++ b/android/app/src/main/res/layout-land/about.xml
@@ -213,7 +213,7 @@
         android:textAlignment="viewStart"
         style="@style/MwmWidget.TextView.Item"
         android:text="@string/how_to_support_us"
-        app:drawableStartCompat="@drawable/ic_donate" />
+        app:drawableStartCompat="@drawable/ic_volunteer" />
 
       <com.google.android.material.textview.MaterialTextView
         android:id="@+id/news"
diff --git a/android/app/src/main/res/layout/about.xml b/android/app/src/main/res/layout/about.xml
index cd96892e0..19080c264 100644
--- a/android/app/src/main/res/layout/about.xml
+++ b/android/app/src/main/res/layout/about.xml
@@ -145,7 +145,7 @@
         style="@style/MwmWidget.TextView.Item"
         android:text="@string/how_to_support_us"
         android:textAlignment="viewStart"
-        app:drawableStartCompat="@drawable/ic_donate" />
+        app:drawableStartCompat="@drawable/ic_volunteer" />
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/news"
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 5dd2dc77d..929ecd1da 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -308,7 +308,7 @@
     <!-- Button in the main menu -->
     <string name="donate">Donate</string>
     <!-- Button in the main Help dialog -->
-    <string name="how_to_support_us">Support the project</string>
+    <string name="how_to_support_us">Volunteer and improve CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="copyright">Copyright</string>
     <!-- Text in menu + Button in the main Help dialog -->
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
index 494788128..2887d8397 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@@ -346,7 +346,7 @@
 "report_incorrect_map_bug" = "Report or fix incorrect map data";
 
 /* Button in the About screen */
-"volunteer" = "Volunteer";
+"volunteer" = "Volunteer and improve CoMaps";
 
 /* "Social media" section header in the About screen */
 "follow_us" = "Connect with us";

From 111e91347858f3ac539cfd4d1b8a7b155eea2986 Mon Sep 17 00:00:00 2001
From: Codeberg Translate <translate@codeberg.org>
Date: Tue, 19 Aug 2025 07:09:35 +0000
Subject: [PATCH 178/302] [strings] Update from Codeberg Translate

Co-authored-by: Codeberg Translate <translate@codeberg.org>
Co-authored-by: giopera <giopera@noreply.codeberg.org>
Translation: CoMaps/Android - Map Feature Types
Translation: CoMaps/Android UI Strings
Translation: CoMaps/Countries and regions names
Translation: CoMaps/Voice announcements for navigation (TTS)
Translation: CoMaps/iOS - Map Feature Types
Translation: CoMaps/iOS Plist
Translation: CoMaps/iOS Plurals
Translation: CoMaps/iOS UI Strings
---
 android/app/src/main/res/values-it/strings.xml                | 2 +-
 android/app/src/main/res/values-it/types_strings.xml          | 4 ++--
 data/countries-strings/it.json/localize.json                  | 2 +-
 data/sound-strings/it.json/localize.json                      | 2 +-
 iphone/Maps/LocalizedStrings/it.lproj/InfoPlist.strings       | 2 +-
 iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings     | 2 +-
 iphone/Maps/LocalizedStrings/it.lproj/Localizable.stringsdict | 2 ++
 .../Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings   | 4 ++--
 8 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml
index 52a59e254..26dc87861 100644
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -21,7 +21,7 @@
     <!-- Update maps later button text -->
     <string name="later">Più tardi</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
-    <string name="search">Cerca</string>
+    <string name="search">Ricerca</string>
     <!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
     <string name="search_map">Cerca sulla mappa</string>
     <!-- Location services are disabled by user alert - message -->
diff --git a/android/app/src/main/res/values-it/types_strings.xml b/android/app/src/main/res/values-it/types_strings.xml
index 95f5dc6c5..e77c1393c 100644
--- a/android/app/src/main/res/values-it/types_strings.xml
+++ b/android/app/src/main/res/values-it/types_strings.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- SECTION: Types -->
-    <string name="type.addr_interpolation">Indirizzo/Blocco</string>
-    <string name="type.addr_interpolation.even">Indirizzo/Blocco</string>
+    <string name="type.addr_interpolation">Indirizzo/Quartiere</string>
+    <string name="type.addr_interpolation.even">Indirizzo/Quartiere</string>
     <string name="type.addr_interpolation.odd">Indirizzo/Blocco</string>
     <string name="type.aerialway">Impianto a fune</string>
     <string name="type.aerialway.cable_car">Teleferica</string>
diff --git a/data/countries-strings/it.json/localize.json b/data/countries-strings/it.json/localize.json
index 9cc51fc63..e066294fb 100644
--- a/data/countries-strings/it.json/localize.json
+++ b/data/countries-strings/it.json/localize.json
@@ -1,5 +1,5 @@
 {
-"Abkhazia":"Abcasia",
+"Abkhazia":"Abkhazia",
 "Afghanistan":"Afghanistan",
 "Alabama":"Alabama",
 "Albania":"Albania",
diff --git a/data/sound-strings/it.json/localize.json b/data/sound-strings/it.json/localize.json
index 236994dd8..fa6b401a2 100644
--- a/data/sound-strings/it.json/localize.json
+++ b/data/sound-strings/it.json/localize.json
@@ -1,5 +1,5 @@
 {
-"make_a_slight_right_turn":"Rimani sulla destra.",
+"make_a_slight_right_turn":"Tenere la destra.",
 "make_a_slight_right_turn_street":"NULL",
 "make_a_slight_right_turn_street_verb":"NULL",
 "make_a_right_turn":"Gira a destra.",
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/it.lproj/InfoPlist.strings
index 0727bac45..b4b56aa09 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/InfoPlist.strings
@@ -1,6 +1,6 @@
 
 /* Used in home screen quick actions. */
-"search" = "Cerca";
+"search" = "Ricerca";
 
 /* Used in home screen quick actions. */
 "bookmarks_and_tracks" = "Luoghi preferiti e tracce";
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index 90d4b6f9d..5b64867b7 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -28,7 +28,7 @@
 "later" = "Più tardi";
 
 /* View and button titles for accessibility, please also edit it in iphone/plist.txt */
-"search" = "Cerca";
+"search" = "Ricerca";
 
 /* Settings/Downloader - 3G download warning dialog confirm button */
 "use_cellular_data" = "Sì";
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.stringsdict
index 587215fb3..9b19b8f6f 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.stringsdict
@@ -16,6 +16,8 @@
 			<string>Nessun preferito</string>
 			<key>one</key>
 			<string>%d preferito</string>
+			<key>many</key>
+			<string>%d preferiti</string>
 			<key>other</key>
 			<string>%d preferiti</string>
 		</dict>
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings
index 38bcb8c5d..75906a9ac 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings
@@ -1,5 +1,5 @@
-"type.addr_interpolation" = "Indirizzo/Blocco";
-"type.addr_interpolation.even" = "Indirizzo/Blocco";
+"type.addr_interpolation" = "Indirizzo/Quartiere";
+"type.addr_interpolation.even" = "Indirizzo/Quartiere";
 "type.addr_interpolation.odd" = "Indirizzo/Blocco";
 "type.aerialway" = "Impianto a fune";
 "type.aerialway.cable_car" = "Teleferica";

From 25a4a3b76f6b53114aab2150cf9a60094608f6aa Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Sat, 5 Jul 2025 11:19:30 -0300
Subject: [PATCH 179/302] [coding] Added varint short arrays ser/des.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>

# Conflicts:
#	libs/coding/coding_tests/varint_test.cpp
---
 libs/coding/coding_tests/varint_test.cpp | 29 ++++++++++++-
 libs/coding/varint.hpp                   | 54 +++++++++++++++++++++---
 2 files changed, 77 insertions(+), 6 deletions(-)

diff --git a/libs/coding/coding_tests/varint_test.cpp b/libs/coding/coding_tests/varint_test.cpp
index f18278347..4f28e18ac 100644
--- a/libs/coding/coding_tests/varint_test.cpp
+++ b/libs/coding/coding_tests/varint_test.cpp
@@ -1,7 +1,8 @@
-#include "coding/varint.hpp"
 #include "testing/testing.hpp"
 
 #include "coding/byte_stream.hpp"
+#include "coding/reader.hpp"
+#include "coding/varint.hpp"
 
 #include "base/macros.hpp"
 #include "base/stl_helpers.hpp"
@@ -185,3 +186,29 @@ UNIT_TEST(ReadVarInt64Array)
     }
   }
 }
+
+UNIT_TEST(VarInt_ShortSortedArray)
+{
+  uint32_t constexpr maxVal = (uint32_t(1) << 30) - 1;
+  std::vector<uint32_t> samples[] = {
+      {0},
+      {10, 10000},
+      {maxVal - 2, maxVal - 1, maxVal},
+  };
+
+  for (auto const & s : samples)
+  {
+    std::vector<uint8_t> buffer;
+    PushBackByteSink sink(buffer);
+
+    WriteVarUInt32SortedShortArray(s, sink);
+
+    MemReader reader(buffer.data(), buffer.size());
+    ReaderSource src(reader);
+
+    std::vector<uint32_t> actual;
+    ReadVarUInt32SortedShortArray(src, actual);
+
+    TEST_EQUAL(s, actual, ());
+  }
+}
diff --git a/libs/coding/varint.hpp b/libs/coding/varint.hpp
index b34430118..e401f7494 100644
--- a/libs/coding/varint.hpp
+++ b/libs/coding/varint.hpp
@@ -3,13 +3,10 @@
 #include "coding/write_to_sink.hpp"
 
 #include "base/assert.hpp"
-#include "base/base.hpp"
 #include "base/bits.hpp"
 #include "base/exception.hpp"
 #include "base/stl_helpers.hpp"
 
-#include <cstddef>
-#include <cstdint>
 #include <type_traits>
 
 // Writes any unsigned integer type using optimal bytes count, platform-independent.
@@ -296,6 +293,53 @@ void const * ReadVarUint64Array(void const * pBeg, size_t count, F f)
 template <class Cont, class Sink>
 void WriteVarUintArray(Cont const & v, Sink & sink)
 {
-  for (size_t i = 0; i != v.size(); ++i)
-    WriteVarUint(sink, v[i]);
+  for (auto e : v)
+    WriteVarUint(sink, e);
 }
+
+/// @name Special functions to read/write varint array when each value stores a control bit "has next".
+/// Useful for short (>90% have 1 value) arrays.
+/// @{
+template <class Sink>
+void WriteVarUInt32SortedShortArray(std::vector<uint32_t> const & cont, Sink & sink)
+{
+  CHECK(!cont.empty(), ());
+  CHECK(base::IsSortedAndUnique(cont), ());
+
+  uint32_t prev = 0;
+  size_t const sz = cont.size();
+  for (size_t i = 0; i < sz; ++i)
+  {
+    uint32_t v = cont[i] - prev;
+    prev = cont[i];
+
+    CHECK((v & (uint32_t(3) << 30)) == 0, ());  // leading 2 bits are zeros
+    v <<= 1;
+    // set 1-bit if have a next value
+    if (i + 1 < sz)
+      v |= 0x1;
+
+    WriteVarUint(sink, v);
+  }
+}
+
+/// @todo Refactor on raw pointers (same as ReadXXX functions above).
+/// ArrayByteSource isn't as fast as pointers :)
+template <class Source, class ContT>
+void ReadVarUInt32SortedShortArray(Source & src, ContT & cont)
+{
+  cont.clear();
+
+  bool hasNext = false;
+  uint32_t prev = 0;
+  do
+  {
+    uint32_t const v = ReadVarUint<uint32_t>(src);
+    hasNext = (v & 0x1) != 0;
+
+    prev += (v >> 1);
+    cont.push_back(prev);
+  }
+  while (hasNext);
+}
+/// @}

From 6beabb2fe115f0088e030cfdf8d9000bb66737f7 Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Tue, 24 Jun 2025 21:23:22 -0300
Subject: [PATCH 180/302] [feature] Removed IndexFactory class.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>

^ Conflicts:
^	libs/indexer/data_source.cpp
^	libs/indexer/feature.cpp
^	libs/indexer/features_vector.cpp
^	libs/indexer/mwm_set.hpp
---
 generator/statistics.cpp                      |   1 -
 libs/indexer/CMakeLists.txt                   |   2 -
 libs/indexer/data_factory.cpp                 |  20 ----
 libs/indexer/data_factory.hpp                 |  31 ------
 libs/indexer/data_source.cpp                  | 103 +++++++++---------
 libs/indexer/feature.cpp                      |   3 +-
 libs/indexer/features_vector.cpp              |   1 -
 .../scale_index_reading_tests.cpp             |   8 +-
 libs/indexer/mwm_set.cpp                      |   6 +-
 libs/indexer/mwm_set.hpp                      |  15 ++-
 libs/indexer/scale_index.hpp                  |  17 ++-
 libs/search/mwm_context.cpp                   |   2 +-
 .../indexer/indexer.xcodeproj/project.pbxproj |   8 --
 13 files changed, 76 insertions(+), 141 deletions(-)
 delete mode 100644 libs/indexer/data_factory.cpp
 delete mode 100644 libs/indexer/data_factory.hpp

diff --git a/generator/statistics.cpp b/generator/statistics.cpp
index c0a58d9fc..157657561 100644
--- a/generator/statistics.cpp
+++ b/generator/statistics.cpp
@@ -1,7 +1,6 @@
 #include "statistics.hpp"
 
 #include "indexer/classificator.hpp"
-#include "indexer/data_factory.hpp"
 #include "indexer/feature_processor.hpp"
 
 #include "geometry/mercator.hpp"
diff --git a/libs/indexer/CMakeLists.txt b/libs/indexer/CMakeLists.txt
index 80f49941f..48af2c680 100644
--- a/libs/indexer/CMakeLists.txt
+++ b/libs/indexer/CMakeLists.txt
@@ -31,8 +31,6 @@ set(SRC
   cuisines.hpp
   custom_keyvalue.cpp
   custom_keyvalue.hpp
-  data_factory.cpp
-  data_factory.hpp
   data_header.cpp
   data_header.hpp
   data_source.cpp
diff --git a/libs/indexer/data_factory.cpp b/libs/indexer/data_factory.cpp
deleted file mode 100644
index 651209f22..000000000
--- a/libs/indexer/data_factory.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "indexer/data_factory.hpp"
-
-#include "coding/files_container.hpp"
-
-#include "defines.hpp"
-
-void IndexFactory::Load(FilesContainerR const & cont)
-{
-  m_version = version::MwmVersion::Read(cont);
-  if (m_version.GetFormat() < version::Format::v11)
-    MYTHROW(CorruptedMwmFile, (cont.GetFileName()));
-
-  m_header.Load(cont);
-
-  if (cont.IsExist(REGION_INFO_FILE_TAG))
-  {
-    ReaderSource<FilesContainerR::TReader> src(cont.GetReader(REGION_INFO_FILE_TAG));
-    m_regionData.Deserialize(src);
-  }
-}
diff --git a/libs/indexer/data_factory.hpp b/libs/indexer/data_factory.hpp
deleted file mode 100644
index 5d1d289e7..000000000
--- a/libs/indexer/data_factory.hpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma once
-#include "indexer/data_header.hpp"
-#include "indexer/feature_meta.hpp"
-#include "indexer/interval_index.hpp"
-
-#include "platform/mwm_version.hpp"
-
-#include <memory>
-
-class FilesContainerR;
-
-class IndexFactory
-{
-  version::MwmVersion m_version;
-  feature::DataHeader m_header;
-  feature::RegionData m_regionData;
-
-public:
-  void Load(FilesContainerR const & cont);
-
-  inline version::MwmVersion const & GetMwmVersion() const { return m_version; }
-  inline feature::DataHeader const & GetHeader() const { return m_header; }
-  inline feature::RegionData const & GetRegionData() const { return m_regionData; }
-  inline void MoveRegionData(feature::RegionData & data) { data = std::move(m_regionData); }
-
-  template <typename Reader>
-  std::unique_ptr<IntervalIndex<Reader, uint32_t>> CreateIndex(Reader const & reader) const
-  {
-    return std::make_unique<IntervalIndex<Reader, uint32_t>>(reader);
-  }
-};
diff --git a/libs/indexer/data_source.cpp b/libs/indexer/data_source.cpp
index a6205afe7..c3ac51f67 100644
--- a/libs/indexer/data_source.cpp
+++ b/libs/indexer/data_source.cpp
@@ -5,7 +5,6 @@
 #include "platform/mwm_version.hpp"
 
 #include <algorithm>
-#include <limits>
 
 using platform::CountryFile;
 using platform::LocalCountryFile;
@@ -15,19 +14,19 @@ namespace
 class ReadMWMFunctor
 {
 public:
-  using Fn = std::function<void(uint32_t, FeatureSource & src)>;
-
-  ReadMWMFunctor(FeatureSourceFactory const & factory, Fn const & fn) : m_factory(factory), m_fn(fn)
-  {
-    m_stop = []() { return false; };
-  }
-
-  ReadMWMFunctor(FeatureSourceFactory const & factory, Fn const & fn, DataSource::StopSearchCallback const & stop)
-    : m_factory(factory)
-    , m_fn(fn)
-    , m_stop(stop)
+  template <class FnT>
+  ReadMWMFunctor(FeatureSourceFactory const & factory, FnT && fn) : m_factory(factory)
+                                                                  , m_fn(std::forward<FnT>(fn))
   {}
 
+  ReadMWMFunctor(FeatureSourceFactory const & factory, DataSource::FeatureCallback const & fn,
+                 DataSource::StopSearchCallback stop = {})
+    : m_factory(factory)
+    , m_stop(std::move(stop))
+  {
+    m_fn = [&fn](uint32_t index, FeatureSource & src) { ReadFeatureType(fn, src, index); };
+  }
+
   // Reads features visible at |scale| covered by |cov| from mwm and applies |m_fn| to them.
   // Feature reading process consists of two steps: untouched (original) features reading and
   // touched (created, edited etc.) features reading.
@@ -51,7 +50,7 @@ public:
 
       // Use last coding scale for covering (see index_builder.cpp).
       covering::Intervals const & intervals = cov.Get<RectId::DEPTH_LEVELS>(lastScale);
-      ScaleIndex<ModelReaderPtr> index(mwmValue->m_cont.GetReader(INDEX_FILE_TAG), mwmValue->m_factory);
+      ScaleIndex<ModelReaderPtr> index(mwmValue->m_cont.GetReader(INDEX_FILE_TAG));
 
       // iterate through intervals
       for (auto const & i : intervals)
@@ -61,7 +60,8 @@ public:
           if (checkUnique(value))
             m_fn(value, *src);
         });
-        if (m_stop())
+
+        if (m_stop && m_stop())
           break;
       }
     }
@@ -75,33 +75,36 @@ public:
 
 private:
   FeatureSourceFactory const & m_factory;
-  Fn m_fn;
+  std::function<void(uint32_t, FeatureSource & src)> m_fn;
   DataSource::StopSearchCallback m_stop;
+
+private:
+  static void ReadFeatureType(DataSource::FeatureCallback const & fn, FeatureSource & src, uint32_t index)
+  {
+    std::unique_ptr<FeatureType> ft;
+    switch (src.GetFeatureStatus(index))
+    {
+    case FeatureStatus::Deleted:
+    case FeatureStatus::Obsolete: return;
+    case FeatureStatus::Created:
+    case FeatureStatus::Modified:
+    {
+      ft = src.GetModifiedFeature(index);
+      break;
+    }
+    case FeatureStatus::Untouched:
+    {
+      ft = src.GetOriginalFeature(index);
+      break;
+    }
+    }
+
+    CHECK(ft, ());
+    fn(*ft);
+  }
 };
 
-void ReadFeatureType(std::function<void(FeatureType &)> const & fn, FeatureSource & src, uint32_t index)
-{
-  std::unique_ptr<FeatureType> ft;
-  switch (src.GetFeatureStatus(index))
-  {
-  case FeatureStatus::Deleted:
-  case FeatureStatus::Obsolete: return;
-  case FeatureStatus::Created:
-  case FeatureStatus::Modified:
-  {
-    ft = src.GetModifiedFeature(index);
-    break;
-  }
-  case FeatureStatus::Untouched:
-  {
-    ft = src.GetOriginalFeature(index);
-    break;
-  }
-  }
-  CHECK(ft, ());
-  fn(*ft);
-}
-}  //  namespace
+}  // namespace
 
 // FeaturesLoaderGuard ---------------------------------------------------------------------
 std::string FeaturesLoaderGuard::GetCountryFileName() const
@@ -161,7 +164,12 @@ std::unique_ptr<MwmInfo> DataSource::CreateInfo(platform::LocalCountryFile const
   info->m_minScale = static_cast<uint8_t>(scaleR.first);
   info->m_maxScale = static_cast<uint8_t>(scaleR.second);
   info->m_version = value.GetMwmVersion();
-  value.m_factory.MoveRegionData(info->m_data);
+
+  if (value.m_cont.IsExist(REGION_INFO_FILE_TAG))
+  {
+    ReaderSource<FilesContainerR::TReader> src(value.m_cont.GetReader(REGION_INFO_FILE_TAG));
+    info->m_data.Deserialize(src);
+  }
 
   return info;
 }
@@ -234,9 +242,7 @@ void DataSource::ForEachFeatureIDInRect(FeatureIdCallback const & f, m2::RectD c
 
 void DataSource::ForEachInRect(FeatureCallback const & f, m2::RectD const & rect, int scale) const
 {
-  auto readFeatureType = [&f](uint32_t index, FeatureSource & src) { ReadFeatureType(f, src, index); };
-
-  ReadMWMFunctor readFunctor(*m_factory, readFeatureType);
+  ReadMWMFunctor readFunctor(*m_factory, f);
   ForEachInIntervals(readFunctor, covering::ViewportWithLowLevels, rect, scale);
 }
 
@@ -244,17 +250,13 @@ void DataSource::ForClosestToPoint(FeatureCallback const & f, StopSearchCallback
                                    m2::PointD const & center, double sizeM, int scale) const
 {
   auto const rect = mercator::RectByCenterXYAndSizeInMeters(center, sizeM);
-
-  auto readFeatureType = [&f](uint32_t index, FeatureSource & src) { ReadFeatureType(f, src, index); };
-  ReadMWMFunctor readFunctor(*m_factory, readFeatureType, stop);
+  ReadMWMFunctor readFunctor(*m_factory, f, stop);
   ForEachInIntervals(readFunctor, covering::CoveringMode::Spiral, rect, scale);
 }
 
 void DataSource::ForEachInScale(FeatureCallback const & f, int scale) const
 {
-  auto readFeatureType = [&f](uint32_t index, FeatureSource & src) { ReadFeatureType(f, src, index); };
-
-  ReadMWMFunctor readFunctor(*m_factory, readFeatureType);
+  ReadMWMFunctor readFunctor(*m_factory, f);
   ForEachInIntervals(readFunctor, covering::FullCover, m2::RectD::GetInfiniteRect(), scale);
 }
 
@@ -265,10 +267,7 @@ void DataSource::ForEachInRectForMWM(FeatureCallback const & f, m2::RectD const
   if (handle.IsAlive())
   {
     covering::CoveringGetter cov(rect, covering::ViewportWithLowLevels);
-    auto readFeatureType = [&f](uint32_t index, FeatureSource & src) { ReadFeatureType(f, src, index); };
-
-    ReadMWMFunctor readFunctor(*m_factory, readFeatureType);
-    readFunctor(handle, cov, scale);
+    ReadMWMFunctor(*m_factory, f)(handle, cov, scale);
   }
 }
 
diff --git a/libs/indexer/feature.cpp b/libs/indexer/feature.cpp
index 06e24f3bd..96964f16e 100644
--- a/libs/indexer/feature.cpp
+++ b/libs/indexer/feature.cpp
@@ -358,8 +358,6 @@ void FeatureType::ParseHeader2()
     // For inner geometry remaining 4 bits are not used.
     if (elemsCount == 0)
       geomScalesMask = bitSource.Read(4);
-    else
-      ASSERT(headerGeomType == HeaderGeomType::Area || elemsCount > 1, ());
   }
 
   ArrayByteSource src(bitSource.RoundPtr());
@@ -414,6 +412,7 @@ void FeatureType::ParseHeader2()
       ReadOffsets(*m_loadInfo, src, geomScalesMask, m_offsets.m_trg);
     }
   }
+
   // Size of the whole header incl. inner geometry / triangles.
   m_innerStats.m_size = CalcOffset(src, m_data.data());
   m_parsed.m_header2 = true;
diff --git a/libs/indexer/features_vector.cpp b/libs/indexer/features_vector.cpp
index 3e170424b..656fd9036 100644
--- a/libs/indexer/features_vector.cpp
+++ b/libs/indexer/features_vector.cpp
@@ -1,6 +1,5 @@
 #include "features_vector.hpp"
 #include "dat_section_header.hpp"
-#include "data_factory.hpp"
 #include "features_offsets_table.hpp"
 
 #include "platform/constants.hpp"
diff --git a/libs/indexer/indexer_tests/scale_index_reading_tests.cpp b/libs/indexer/indexer_tests/scale_index_reading_tests.cpp
index 2853b30cd..e3640520d 100644
--- a/libs/indexer/indexer_tests/scale_index_reading_tests.cpp
+++ b/libs/indexer/indexer_tests/scale_index_reading_tests.cpp
@@ -5,7 +5,6 @@
 #include "generator/generator_tests_support/test_with_custom_mwms.hpp"
 
 #include "indexer/cell_id.hpp"
-#include "indexer/data_factory.hpp"
 #include "indexer/data_header.hpp"
 #include "indexer/data_source.hpp"
 #include "indexer/feature.hpp"
@@ -26,9 +25,7 @@
 #include "defines.hpp"
 
 #include <algorithm>
-#include <cstdint>
 #include <string>
-#include <utility>
 #include <vector>
 
 namespace scale_index_reading_tests
@@ -95,15 +92,12 @@ UNIT_CLASS_TEST(ScaleIndexReadingTest, Mmap)
   FilesContainerR cont(path);
   feature::DataHeader header(cont);
 
-  IndexFactory factory;
-  factory.Load(cont);
-
   auto const offsetSize = cont.GetAbsoluteOffsetAndSize(INDEX_FILE_TAG);
 
   MmapReader reader(path);
   ReaderPtr<Reader> subReader(reader.CreateSubReader(offsetSize.first, offsetSize.second));
 
-  ScaleIndex<ReaderPtr<Reader>> index(subReader, factory);
+  ScaleIndex<ReaderPtr<Reader>> index(subReader);
 
   auto collectNames = [&](m2::RectD const & rect)
   { return CollectNames(id, index, header.GetLastScale(), header.GetLastScale(), rect); };
diff --git a/libs/indexer/mwm_set.cpp b/libs/indexer/mwm_set.cpp
index 8a29ec3b1..e9203c4a0 100644
--- a/libs/indexer/mwm_set.cpp
+++ b/libs/indexer/mwm_set.cpp
@@ -384,7 +384,11 @@ MwmValue::MwmValue(LocalCountryFile const & localFile)
   : m_cont(platform::GetCountryReader(localFile, MapFileType::Map))
   , m_file(localFile)
 {
-  m_factory.Load(m_cont);
+  m_version = version::MwmVersion::Read(m_cont);
+  if (m_version.GetFormat() < version::Format::v11)
+    MYTHROW(CorruptedMwmFile, (m_cont.GetFileName()));
+
+  m_header.Load(m_cont);
 }
 
 void MwmValue::SetTable(MwmInfoEx & info)
diff --git a/libs/indexer/mwm_set.hpp b/libs/indexer/mwm_set.hpp
index d16cd6448..9454e1f7b 100644
--- a/libs/indexer/mwm_set.hpp
+++ b/libs/indexer/mwm_set.hpp
@@ -1,5 +1,6 @@
 #pragma once
-#include "indexer/data_factory.hpp"
+#include "indexer/data_header.hpp"
+#include "indexer/feature_meta.hpp"
 #include "indexer/house_to_street_iface.hpp"
 
 #include "platform/local_country_file.hpp"
@@ -373,19 +374,23 @@ class MwmValue
 {
 public:
   FilesContainerR const m_cont;
-  IndexFactory m_factory;
   platform::LocalCountryFile const m_file;
 
+private:
+  version::MwmVersion m_version;
+  feature::DataHeader m_header;
+
+public:
   std::shared_ptr<feature::FeaturesOffsetsTable> m_table;
   std::unique_ptr<indexer::MetadataDeserializer> m_metaDeserializer;
   std::unique_ptr<HouseToStreetTable> m_house2street, m_house2place;
 
+public:
   explicit MwmValue(platform::LocalCountryFile const & localFile);
   void SetTable(MwmInfoEx & info);
 
-  feature::DataHeader const & GetHeader() const { return m_factory.GetHeader(); }
-  feature::RegionData const & GetRegionData() const { return m_factory.GetRegionData(); }
-  version::MwmVersion const & GetMwmVersion() const { return m_factory.GetMwmVersion(); }
+  feature::DataHeader const & GetHeader() const { return m_header; }
+  version::MwmVersion const & GetMwmVersion() const { return m_version; }
   std::string const & GetCountryFileName() const { return m_file.GetCountryName(); }
 
   bool HasSearchIndex() const { return m_cont.IsExist(SEARCH_INDEX_FILE_TAG); }
diff --git a/libs/indexer/scale_index.hpp b/libs/indexer/scale_index.hpp
index 60f8e226a..617453c2a 100644
--- a/libs/indexer/scale_index.hpp
+++ b/libs/indexer/scale_index.hpp
@@ -1,11 +1,9 @@
 #pragma once
 
-#include "indexer/data_factory.hpp"
 #include "indexer/interval_index.hpp"
 
 #include "coding/var_serial_vector.hpp"
 
-#include <cstdint>
 #include <memory>
 #include <vector>
 
@@ -24,26 +22,24 @@ template <class Reader>
 class ScaleIndex : public ScaleIndexBase
 {
 public:
-  ScaleIndex() = default;
-
-  ScaleIndex(Reader const & reader, IndexFactory const & factory) { Attach(reader, factory); }
+  explicit ScaleIndex(Reader const & reader) { Attach(reader); }
 
   ~ScaleIndex() { Clear(); }
 
   void Clear() { m_IndexForScale.clear(); }
 
-  void Attach(Reader const & reader, IndexFactory const & factory)
+  void Attach(Reader const & reader)
   {
     Clear();
 
     ReaderSource<Reader> source(reader);
     VarSerialVectorReader<Reader> treesReader(source);
     for (uint32_t i = 0; i < treesReader.Size(); ++i)
-      m_IndexForScale.push_back(factory.CreateIndex(treesReader.SubReader(i)));
+      m_IndexForScale.push_back(std::make_unique<IndexT>(treesReader.SubReader(i)));
   }
 
-  void ForEachInIntervalAndScale(uint64_t beg, uint64_t end, int scale,
-                                 std::function<void(uint64_t, uint32_t)> const & fn) const
+  template <class FnT>
+  void ForEachInIntervalAndScale(uint64_t beg, uint64_t end, int scale, FnT && fn) const
   {
     auto const scaleBucket = BucketByScale(scale);
     if (scaleBucket < m_IndexForScale.size())
@@ -52,5 +48,6 @@ public:
   }
 
 private:
-  std::vector<std::unique_ptr<IntervalIndex<Reader, uint32_t>>> m_IndexForScale;
+  using IndexT = IntervalIndex<Reader, uint32_t>;
+  std::vector<std::unique_ptr<IndexT>> m_IndexForScale;
 };
diff --git a/libs/search/mwm_context.cpp b/libs/search/mwm_context.cpp
index fc2924c7b..d70b37bc6 100644
--- a/libs/search/mwm_context.cpp
+++ b/libs/search/mwm_context.cpp
@@ -18,7 +18,7 @@ MwmContext::MwmContext(MwmSet::MwmHandle handle)
   : m_handle(std::move(handle))
   , m_value(*m_handle.GetValue())
   , m_vector(m_value.m_cont, m_value.GetHeader(), m_value.m_table.get(), m_value.m_metaDeserializer.get())
-  , m_index(m_value.m_cont.GetReader(INDEX_FILE_TAG), m_value.m_factory)
+  , m_index(m_value.m_cont.GetReader(INDEX_FILE_TAG))
   , m_centers(m_value)
   , m_editableSource(m_handle)
 {}
diff --git a/xcode/indexer/indexer.xcodeproj/project.pbxproj b/xcode/indexer/indexer.xcodeproj/project.pbxproj
index 367f6cf60..56e4114f2 100644
--- a/xcode/indexer/indexer.xcodeproj/project.pbxproj
+++ b/xcode/indexer/indexer.xcodeproj/project.pbxproj
@@ -112,8 +112,6 @@
 		675341021A3F540F00A0A8C3 /* classificator_loader.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340AD1A3F540F00A0A8C3 /* classificator_loader.hpp */; };
 		675341031A3F540F00A0A8C3 /* classificator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675340AE1A3F540F00A0A8C3 /* classificator.cpp */; };
 		675341041A3F540F00A0A8C3 /* classificator.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340AF1A3F540F00A0A8C3 /* classificator.hpp */; };
-		675341071A3F540F00A0A8C3 /* data_factory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675340B21A3F540F00A0A8C3 /* data_factory.cpp */; };
-		675341081A3F540F00A0A8C3 /* data_factory.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340B31A3F540F00A0A8C3 /* data_factory.hpp */; };
 		675341091A3F540F00A0A8C3 /* data_header.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675340B41A3F540F00A0A8C3 /* data_header.cpp */; };
 		6753410A1A3F540F00A0A8C3 /* data_header.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 675340B51A3F540F00A0A8C3 /* data_header.hpp */; };
 		6753410B1A3F540F00A0A8C3 /* drawing_rule_def.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 675340B61A3F540F00A0A8C3 /* drawing_rule_def.cpp */; };
@@ -345,8 +343,6 @@
 		675340AD1A3F540F00A0A8C3 /* classificator_loader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = classificator_loader.hpp; sourceTree = "<group>"; };
 		675340AE1A3F540F00A0A8C3 /* classificator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = classificator.cpp; sourceTree = "<group>"; };
 		675340AF1A3F540F00A0A8C3 /* classificator.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = classificator.hpp; sourceTree = "<group>"; };
-		675340B21A3F540F00A0A8C3 /* data_factory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = data_factory.cpp; sourceTree = "<group>"; };
-		675340B31A3F540F00A0A8C3 /* data_factory.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = data_factory.hpp; sourceTree = "<group>"; };
 		675340B41A3F540F00A0A8C3 /* data_header.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = data_header.cpp; sourceTree = "<group>"; };
 		675340B51A3F540F00A0A8C3 /* data_header.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = data_header.hpp; sourceTree = "<group>"; };
 		675340B61A3F540F00A0A8C3 /* drawing_rule_def.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = drawing_rule_def.cpp; sourceTree = "<group>"; };
@@ -629,8 +625,6 @@
 				AC7C68A82A5040AC004BB71C /* custom_keyvalue.cpp */,
 				AC7C68A72A5040AC004BB71C /* custom_keyvalue.hpp */,
 				40D62CEE23F2E8BE009A20F5 /* dat_section_header.hpp */,
-				675340B21A3F540F00A0A8C3 /* data_factory.cpp */,
-				675340B31A3F540F00A0A8C3 /* data_factory.hpp */,
 				675340B41A3F540F00A0A8C3 /* data_header.cpp */,
 				675340B51A3F540F00A0A8C3 /* data_header.hpp */,
 				3D928F651D50F9FE001670E0 /* data_source_helpers.cpp */,
@@ -834,7 +828,6 @@
 				34583BCC1C88552100F94664 /* map_object.hpp in Headers */,
 				456E1B1B1F90E5B7009C32E1 /* city_boundary.hpp in Headers */,
 				34664CF41D49FEC1003D7096 /* altitude_loader.hpp in Headers */,
-				675341081A3F540F00A0A8C3 /* data_factory.hpp in Headers */,
 				6753410A1A3F540F00A0A8C3 /* data_header.hpp in Headers */,
 				BBB7061023E46E0100A7F29A /* isolines_info.hpp in Headers */,
 				6753411B1A3F540F00A0A8C3 /* feature_impl.hpp in Headers */,
@@ -1023,7 +1016,6 @@
 				6753411C1A3F540F00A0A8C3 /* shared_load_info.cpp in Sources */,
 				67BC92F41D21476500A4A378 /* string_slice.cpp in Sources */,
 				BBB7060F23E46E0100A7F29A /* isolines_info.cpp in Sources */,
-				675341071A3F540F00A0A8C3 /* data_factory.cpp in Sources */,
 				408FE47724FEB95600F5D06D /* metadata_serdes.cpp in Sources */,
 				34583BCB1C88552100F94664 /* map_object.cpp in Sources */,
 				675B562320D25C9800A521D2 /* feature_source.cpp in Sources */,

From 588028c9eb521a030b5a031a049bba899fc6b816 Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Tue, 24 Jun 2025 23:53:01 -0300
Subject: [PATCH 181/302] [feature] Put m_metaDeserializer into SharedLoadInfo.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 libs/drape/overlay_handle.hpp       |  2 +-
 libs/drape_frontend/tile_key.cpp    |  2 ++
 libs/indexer/dat_section_header.hpp |  4 +--
 libs/indexer/feature.cpp            | 14 +++++-----
 libs/indexer/feature.hpp            |  7 ++---
 libs/indexer/feature_meta.cpp       | 28 ++++++++++++++++++++
 libs/indexer/feature_meta.hpp       | 41 +++--------------------------
 libs/indexer/features_vector.cpp    | 15 ++++++-----
 libs/indexer/features_vector.hpp    |  7 ++---
 libs/indexer/mwm_set.cpp            |  5 ++--
 libs/indexer/mwm_set.hpp            |  8 ++++++
 libs/indexer/shared_load_info.cpp   |  6 ++++-
 libs/indexer/shared_load_info.hpp   | 11 +++++++-
 13 files changed, 80 insertions(+), 70 deletions(-)

diff --git a/libs/drape/overlay_handle.hpp b/libs/drape/overlay_handle.hpp
index 873715128..c6f0c613e 100644
--- a/libs/drape/overlay_handle.hpp
+++ b/libs/drape/overlay_handle.hpp
@@ -15,7 +15,7 @@
 #include "geometry/rect2d.hpp"
 #include "geometry/screenbase.hpp"
 
-#include "base/buffer_vector.hpp"
+#include "base/string_utils.hpp"
 
 #include <set>
 #include <string>
diff --git a/libs/drape_frontend/tile_key.cpp b/libs/drape_frontend/tile_key.cpp
index 5b97b7739..add1a7356 100644
--- a/libs/drape_frontend/tile_key.cpp
+++ b/libs/drape_frontend/tile_key.cpp
@@ -5,6 +5,8 @@
 
 #include "geometry/mercator.hpp"
 
+#include "base/string_utils.hpp"
+
 #include <sstream>
 
 namespace df
diff --git a/libs/indexer/dat_section_header.hpp b/libs/indexer/dat_section_header.hpp
index 66bc218d6..07e5e6a29 100644
--- a/libs/indexer/dat_section_header.hpp
+++ b/libs/indexer/dat_section_header.hpp
@@ -22,9 +22,9 @@ public:
     WriteToSink(sink, m_featuresSize);
   }
 
-  void Read(Reader & reader)
+  template <typename Source>
+  void Read(Source & source)
   {
-    NonOwningReaderSource source(reader);
     m_version = static_cast<Version>(ReadPrimitiveFromSource<uint8_t>(source));
     CHECK_EQUAL(static_cast<uint8_t>(m_version), static_cast<uint8_t>(Version::V0), ());
     m_featuresOffset = ReadPrimitiveFromSource<uint32_t>(source);
diff --git a/libs/indexer/feature.cpp b/libs/indexer/feature.cpp
index 96964f16e..8361e8395 100644
--- a/libs/indexer/feature.cpp
+++ b/libs/indexer/feature.cpp
@@ -184,11 +184,9 @@ uint8_t ReadByte(TSource & src)
 }
 }  // namespace
 
-FeatureType::FeatureType(SharedLoadInfo const * loadInfo, vector<uint8_t> && buffer,
-                         indexer::MetadataDeserializer * metadataDeserializer)
+FeatureType::FeatureType(SharedLoadInfo const * loadInfo, vector<uint8_t> && buffer)
   : m_loadInfo(loadInfo)
   , m_data(std::move(buffer))
-  , m_metadataDeserializer(metadataDeserializer)
 {
   CHECK(m_loadInfo, ());
 
@@ -608,10 +606,10 @@ void FeatureType::ParseMetadata()
   if (m_parsed.m_metadata)
     return;
 
-  CHECK(m_metadataDeserializer, ());
+  CHECK(m_loadInfo->m_metaDeserializer, ());
   try
   {
-    UNUSED_VALUE(m_metadataDeserializer->Get(m_id.m_index, m_metadata));
+    UNUSED_VALUE(m_loadInfo->m_metaDeserializer->Get(m_id.m_index, m_metadata));
   }
   catch (Reader::OpenException const &)
   {
@@ -626,10 +624,10 @@ void FeatureType::ParseMetaIds()
   if (m_parsed.m_metaIds)
     return;
 
-  CHECK(m_metadataDeserializer, ());
+  CHECK(m_loadInfo->m_metaDeserializer, ());
   try
   {
-    UNUSED_VALUE(m_metadataDeserializer->GetIds(m_id.m_index, m_metaIds));
+    UNUSED_VALUE(m_loadInfo->m_metaDeserializer->GetIds(m_id.m_index, m_metaIds));
   }
   catch (Reader::OpenException const &)
   {
@@ -845,7 +843,7 @@ std::string_view FeatureType::GetMetadata(feature::Metadata::EType type)
   {
     auto const it = base::FindIf(m_metaIds, [&type](auto const & v) { return v.first == type; });
     if (it != m_metaIds.end())
-      meta = m_metadata.Set(type, m_metadataDeserializer->GetMetaById(it->second));
+      meta = m_metadata.Set(type, m_loadInfo->m_metaDeserializer->GetMetaById(it->second));
   }
   return meta;
 }
diff --git a/libs/indexer/feature.hpp b/libs/indexer/feature.hpp
index 1824e0fb3..c2b4ce582 100644
--- a/libs/indexer/feature.hpp
+++ b/libs/indexer/feature.hpp
@@ -1,5 +1,6 @@
 #pragma once
 #include "indexer/feature_data.hpp"
+#include "indexer/metadata_serdes.hpp"
 
 #include "geometry/point2d.hpp"
 #include "geometry/rect2d.hpp"
@@ -34,8 +35,7 @@ class FeatureType
 public:
   using GeometryOffsets = buffer_vector<uint32_t, feature::DataHeader::kMaxScalesCount>;
 
-  FeatureType(feature::SharedLoadInfo const * loadInfo, std::vector<uint8_t> && buffer,
-              indexer::MetadataDeserializer * metadataDeserializer);
+  FeatureType(feature::SharedLoadInfo const * loadInfo, std::vector<uint8_t> && buffer);
 
   static std::unique_ptr<FeatureType> CreateFromMapObject(osm::MapObject const & emo);
 
@@ -248,9 +248,6 @@ private:
   feature::SharedLoadInfo const * m_loadInfo = nullptr;
   std::vector<uint8_t> m_data;
 
-  // Pointer to shared metedata deserializer. Must be set for mwm format >= Format::v11
-  indexer::MetadataDeserializer * m_metadataDeserializer = nullptr;
-
   ParsedFlags m_parsed;
   Offsets m_offsets;
   uint32_t m_ptsSimpMask = 0;
diff --git a/libs/indexer/feature_meta.cpp b/libs/indexer/feature_meta.cpp
index ca06fadb0..ca3476a85 100644
--- a/libs/indexer/feature_meta.cpp
+++ b/libs/indexer/feature_meta.cpp
@@ -24,6 +24,34 @@ char constexpr const * kBaseCommonsUrl =
 #endif
 }  // namespace
 
+std::string_view MetadataBase::Get(uint8_t type) const
+{
+  std::string_view sv;
+  auto const it = m_metadata.find(type);
+  if (it != m_metadata.end())
+  {
+    sv = it->second;
+    ASSERT(!sv.empty(), ());
+  }
+  return sv;
+}
+
+std::string_view MetadataBase::Set(uint8_t type, std::string value)
+{
+  std::string_view sv;
+
+  if (value.empty())
+    m_metadata.erase(type);
+  else
+  {
+    auto & res = m_metadata[type];
+    res = std::move(value);
+    sv = res;
+  }
+
+  return sv;
+}
+
 string Metadata::ToWikiURL(std::string v)
 {
   auto const colon = v.find(':');
diff --git a/libs/indexer/feature_meta.hpp b/libs/indexer/feature_meta.hpp
index 94c8badb0..b286c4de9 100644
--- a/libs/indexer/feature_meta.hpp
+++ b/libs/indexer/feature_meta.hpp
@@ -1,13 +1,9 @@
 #pragma once
 
-#include "indexer/metadata_serdes.hpp"
-
-#include "coding/reader.hpp"
 #include "coding/string_utf8_multilang.hpp"
 
 #include "base/stl_helpers.hpp"
 
-#include <algorithm>
 #include <map>
 #include <string>
 #include <vector>
@@ -17,23 +13,10 @@ namespace feature
 class MetadataBase
 {
 public:
-  bool Has(uint8_t type) const
-  {
-    auto const it = m_metadata.find(type);
-    return it != m_metadata.end();
-  }
+  bool Has(uint8_t type) const { return m_metadata.find(type) != m_metadata.end(); }
 
-  std::string_view Get(uint8_t type) const
-  {
-    std::string_view sv;
-    auto const it = m_metadata.find(type);
-    if (it != m_metadata.end())
-    {
-      sv = it->second;
-      ASSERT(!sv.empty(), ());
-    }
-    return sv;
-  }
+  std::string_view Get(uint8_t type) const;
+  std::string_view Set(uint8_t type, std::string value);
 
   inline bool Empty() const { return m_metadata.empty(); }
   inline size_t Size() const { return m_metadata.size(); }
@@ -66,24 +49,6 @@ public:
   void Clear() { m_metadata.clear(); }
 
 protected:
-  friend bool indexer::MetadataDeserializer::Get(uint32_t id, MetadataBase & meta);
-
-  std::string_view Set(uint8_t type, std::string value)
-  {
-    std::string_view sv;
-
-    if (value.empty())
-      m_metadata.erase(type);
-    else
-    {
-      auto & res = m_metadata[type];
-      res = std::move(value);
-      sv = res;
-    }
-
-    return sv;
-  }
-
   /// @todo Change uint8_t to appropriate type when FMD_COUNT reaches 256.
   std::map<uint8_t, std::string> m_metadata;
 };
diff --git a/libs/indexer/features_vector.cpp b/libs/indexer/features_vector.cpp
index 656fd9036..af2bd5dd6 100644
--- a/libs/indexer/features_vector.cpp
+++ b/libs/indexer/features_vector.cpp
@@ -7,9 +7,8 @@
 FeaturesVector::FeaturesVector(FilesContainerR const & cont, feature::DataHeader const & header,
                                feature::FeaturesOffsetsTable const * table,
                                indexer::MetadataDeserializer * metaDeserializer)
-  : m_loadInfo(cont, header)
+  : m_loadInfo(cont, header, metaDeserializer)
   , m_table(table)
-  , m_metaDeserializer(metaDeserializer)
 {
   InitRecordsReader();
 }
@@ -17,17 +16,19 @@ FeaturesVector::FeaturesVector(FilesContainerR const & cont, feature::DataHeader
 void FeaturesVector::InitRecordsReader()
 {
   FilesContainerR::TReader reader = m_loadInfo.GetDataReader();
+  ReaderSource src(reader);
 
   feature::DatSectionHeader header;
-  header.Read(*reader.GetPtr());
-  CHECK(header.m_version == feature::DatSectionHeader::Version::V0, (base::Underlying(header.m_version)));
+  header.Read(src);
+
+  CHECK_EQUAL(header.m_version, feature::DatSectionHeader::Version::V0, ());
   m_recordReader = std::make_unique<RecordReader>(reader.SubReader(header.m_featuresOffset, header.m_featuresSize));
 }
 
 std::unique_ptr<FeatureType> FeaturesVector::GetByIndex(uint32_t index) const
 {
   auto const ftOffset = m_table ? m_table->GetFeatureOffset(index) : index;
-  return std::make_unique<FeatureType>(&m_loadInfo, m_recordReader->ReadRecord(ftOffset), m_metaDeserializer);
+  return std::make_unique<FeatureType>(&m_loadInfo, m_recordReader->ReadRecord(ftOffset));
 }
 
 size_t FeaturesVector::GetNumFeatures() const
@@ -47,11 +48,11 @@ FeaturesVectorTest::FeaturesVectorTest(FilesContainerR const & cont)
   m_vector.m_table = feature::FeaturesOffsetsTable::Load(m_cont).release();
 
   if (m_cont.IsExist(METADATA_FILE_TAG))
-    m_vector.m_metaDeserializer = indexer::MetadataDeserializer::Load(m_cont).release();
+    m_vector.m_loadInfo.m_metaDeserializer = indexer::MetadataDeserializer::Load(m_cont).release();
 }
 
 FeaturesVectorTest::~FeaturesVectorTest()
 {
   delete m_vector.m_table;
-  delete m_vector.m_metaDeserializer;
+  delete m_vector.m_loadInfo.m_metaDeserializer;
 }
diff --git a/libs/indexer/features_vector.hpp b/libs/indexer/features_vector.hpp
index 60728572e..b7280c4c4 100644
--- a/libs/indexer/features_vector.hpp
+++ b/libs/indexer/features_vector.hpp
@@ -1,12 +1,10 @@
 #pragma once
 
 #include "indexer/feature.hpp"
-#include "indexer/metadata_serdes.hpp"
 #include "indexer/shared_load_info.hpp"
 
 #include "coding/var_record_reader.hpp"
 
-#include <cstdint>
 #include <memory>
 #include <vector>
 
@@ -35,7 +33,7 @@ public:
     uint32_t index = 0;
     m_recordReader->ForEachRecord([&](uint32_t pos, std::vector<uint8_t> && data)
     {
-      FeatureType ft(&m_loadInfo, std::move(data), m_metaDeserializer);
+      FeatureType ft(&m_loadInfo, std::move(data));
 
       // We can't properly set MwmId here, because FeaturesVector
       // works with FileContainerR, not with MwmId/MwmHandle/MwmValue.
@@ -57,7 +55,7 @@ public:
 private:
   /// Actually, this ctor is needed only for ForEachOffset call.
   /// Didn't find a better solution without big refactoring.
-  FeaturesVector(FilesContainerR const & cont, feature::DataHeader const & header) : m_loadInfo(cont, header)
+  FeaturesVector(FilesContainerR const & cont, feature::DataHeader const & header) : m_loadInfo(cont, header, nullptr)
   {
     InitRecordsReader();
   }
@@ -70,7 +68,6 @@ private:
   feature::SharedLoadInfo m_loadInfo;
   std::unique_ptr<RecordReader> m_recordReader;
   feature::FeaturesOffsetsTable const * m_table;
-  indexer::MetadataDeserializer * m_metaDeserializer;
 };
 
 /// Test features vector (reader) that combines all the needed data for stand-alone work.
diff --git a/libs/indexer/mwm_set.cpp b/libs/indexer/mwm_set.cpp
index e9203c4a0..b16191f1a 100644
--- a/libs/indexer/mwm_set.cpp
+++ b/libs/indexer/mwm_set.cpp
@@ -1,10 +1,9 @@
 #include "indexer/mwm_set.hpp"
 
 #include "indexer/features_offsets_table.hpp"
+#include "indexer/metadata_serdes.hpp"  // needed for MwmValue dtor
 #include "indexer/scales.hpp"
 
-#include "coding/reader.hpp"
-
 #include "platform/local_country_file_utils.hpp"
 
 #include "base/assert.hpp"
@@ -391,6 +390,8 @@ MwmValue::MwmValue(LocalCountryFile const & localFile)
   m_header.Load(m_cont);
 }
 
+MwmValue::~MwmValue() {}
+
 void MwmValue::SetTable(MwmInfoEx & info)
 {
   m_table = info.m_table.lock();
diff --git a/libs/indexer/mwm_set.hpp b/libs/indexer/mwm_set.hpp
index 9454e1f7b..5d309f21a 100644
--- a/libs/indexer/mwm_set.hpp
+++ b/libs/indexer/mwm_set.hpp
@@ -6,6 +6,8 @@
 #include "platform/local_country_file.hpp"
 #include "platform/mwm_version.hpp"
 
+#include "coding/files_container.hpp"
+
 #include "geometry/rect2d.hpp"
 
 #include "base/macros.hpp"
@@ -26,6 +28,10 @@ namespace feature
 {
 class FeaturesOffsetsTable;
 }
+namespace indexer
+{
+class MetadataDeserializer;
+}
 
 /// Information about stored mwm.
 class MwmInfo
@@ -387,6 +393,8 @@ public:
 
 public:
   explicit MwmValue(platform::LocalCountryFile const & localFile);
+  ~MwmValue();
+
   void SetTable(MwmInfoEx & info);
 
   feature::DataHeader const & GetHeader() const { return m_header; }
diff --git a/libs/indexer/shared_load_info.cpp b/libs/indexer/shared_load_info.cpp
index fc399effe..638fa7a53 100644
--- a/libs/indexer/shared_load_info.cpp
+++ b/libs/indexer/shared_load_info.cpp
@@ -6,7 +6,11 @@
 
 namespace feature
 {
-SharedLoadInfo::SharedLoadInfo(FilesContainerR const & cont, DataHeader const & header) : m_cont(cont), m_header(header)
+SharedLoadInfo::SharedLoadInfo(FilesContainerR const & cont, DataHeader const & header,
+                               indexer::MetadataDeserializer * metaDeserializer)
+  : m_cont(cont)
+  , m_header(header)
+  , m_metaDeserializer(metaDeserializer)
 {}
 
 SharedLoadInfo::Reader SharedLoadInfo::GetDataReader() const
diff --git a/libs/indexer/shared_load_info.hpp b/libs/indexer/shared_load_info.hpp
index 89aa841ca..157a3ea04 100644
--- a/libs/indexer/shared_load_info.hpp
+++ b/libs/indexer/shared_load_info.hpp
@@ -7,6 +7,11 @@
 
 #include "base/macros.hpp"
 
+namespace indexer
+{
+class MetadataDeserializer;
+}
+
 namespace feature
 {
 // This info is created once per FeaturesVector.
@@ -15,7 +20,8 @@ class SharedLoadInfo
 public:
   using Reader = FilesContainerR::TReader;
 
-  SharedLoadInfo(FilesContainerR const & cont, DataHeader const & header);
+  SharedLoadInfo(FilesContainerR const & cont, DataHeader const & header,
+                 indexer::MetadataDeserializer * metaDeserializer);
 
   Reader GetDataReader() const;
   Reader GetGeometryReader(size_t ind) const;
@@ -39,6 +45,9 @@ private:
   FilesContainerR const & m_cont;
   DataHeader const & m_header;
 
+public:
+  indexer::MetadataDeserializer * m_metaDeserializer;
+
   DISALLOW_COPY_AND_MOVE(SharedLoadInfo);
 };
 }  // namespace feature

From 550455a14a1bcbe968c807bd05afc5032c8c8c24 Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Wed, 25 Jun 2025 22:04:39 -0300
Subject: [PATCH 182/302] [feature] Added Feature V1 version with free Header2
 bits.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 generator/feature_builder.cpp       | 31 ++++++++++++-------------
 libs/indexer/dat_section_header.hpp | 14 +++++++----
 libs/indexer/feature.cpp            | 36 +++++++++++++++++++----------
 libs/indexer/features_vector.cpp    |  3 ++-
 libs/indexer/shared_load_info.hpp   |  2 ++
 5 files changed, 52 insertions(+), 34 deletions(-)

diff --git a/generator/feature_builder.cpp b/generator/feature_builder.cpp
index 47e7880b2..dba90fd59 100644
--- a/generator/feature_builder.cpp
+++ b/generator/feature_builder.cpp
@@ -11,16 +11,13 @@
 #include "coding/byte_stream.hpp"
 #include "coding/geometry_coding.hpp"
 #include "coding/read_write_utils.hpp"
-#include "coding/reader.hpp"
 
 #include "geometry/region2d.hpp"
 
 #include "base/logging.hpp"
 #include "base/math.hpp"
-#include "base/string_utils.hpp"
 
 #include <algorithm>
-#include <cstring>
 #include <vector>
 
 namespace feature
@@ -630,7 +627,9 @@ void FeatureBuilder::SerializeForMwm(SupportingData & data, serial::GeometryCodi
   PushBackByteSink<Buffer> sink(data.m_buffer);
   FeatureParams(m_params).Write(sink);
 
-  if (m_params.GetGeomType() == GeomType::Point)
+  GeomType const type = m_params.GetGeomType();
+  CHECK(type != GeomType::Undefined, ());
+  if (type == GeomType::Point)
   {
     serial::SavePoint(sink, m_center, params);
     return;
@@ -640,26 +639,23 @@ void FeatureBuilder::SerializeForMwm(SupportingData & data, serial::GeometryCodi
   uint8_t trgCount = base::asserted_cast<uint8_t>(data.m_innerTrg.size());
   if (trgCount > 0)
   {
-    ASSERT_GREATER(trgCount, 2, ());
+    CHECK_GREATER(trgCount, 2, ());
     trgCount -= 2;
   }
 
-  GeomType const type = m_params.GetGeomType();
-
   {
     BitWriter<PushBackByteSink<Buffer>> bitSink(sink);
 
     if (type == GeomType::Line)
     {
-      bitSink.Write(ptsCount, 4);
-      if (ptsCount == 0)
-        bitSink.Write(data.m_ptsMask, 4);
+      bitSink.Write(ptsCount != 0 ? ptsCount : data.m_ptsMask, 4);
+      bitSink.Write(ptsCount == 0 ? 1 : 0, 1);
     }
-    else if (type == GeomType::Area)
+    else
     {
-      bitSink.Write(trgCount, 4);
-      if (trgCount == 0)
-        bitSink.Write(data.m_trgMask, 4);
+      CHECK_EQUAL(type, GeomType::Area, ());
+      bitSink.Write(trgCount != 0 ? trgCount : data.m_trgMask, 4);
+      bitSink.Write(trgCount == 0 ? 1 : 0, 1);
     }
   }
 
@@ -671,6 +667,7 @@ void FeatureBuilder::SerializeForMwm(SupportingData & data, serial::GeometryCodi
       {
         uint32_t v = data.m_ptsSimpMask;
         int const count = (ptsCount - 2 + 3) / 4;
+        CHECK_LESS(count, 4, ());
         for (int i = 0; i < count; ++i)
         {
           WriteToSink(sink, static_cast<uint8_t>(v));
@@ -683,7 +680,7 @@ void FeatureBuilder::SerializeForMwm(SupportingData & data, serial::GeometryCodi
     else
     {
       auto const & poly = GetOuterGeometry();
-      ASSERT_GREATER(poly.size(), 2, ());
+      CHECK_GREATER(poly.size(), 2, ());
 
       // Store first point once for outer linear features.
       serial::SavePoint(sink, poly[0], params);
@@ -693,8 +690,10 @@ void FeatureBuilder::SerializeForMwm(SupportingData & data, serial::GeometryCodi
       WriteVarUintArray(data.m_ptsOffset, sink);
     }
   }
-  else if (type == GeomType::Area)
+  else
   {
+    CHECK_EQUAL(type, GeomType::Area, ());
+
     if (trgCount > 0)
       serial::SaveInnerTriangles(data.m_innerTrg, params, sink);
     else
diff --git a/libs/indexer/dat_section_header.hpp b/libs/indexer/dat_section_header.hpp
index 07e5e6a29..6ff8d714c 100644
--- a/libs/indexer/dat_section_header.hpp
+++ b/libs/indexer/dat_section_header.hpp
@@ -10,13 +10,13 @@ public:
   enum class Version : uint8_t
   {
     V0 = 0,
-    Latest = V0
+    V1,  // 2025.06, get some free bits in Feature::Header2
+    Latest = V1
   };
 
   template <typename Sink>
   void Serialize(Sink & sink) const
   {
-    CHECK_EQUAL(m_version, Version::V0, ());
     WriteToSink(sink, static_cast<uint8_t>(m_version));
     WriteToSink(sink, m_featuresOffset);
     WriteToSink(sink, m_featuresSize);
@@ -26,7 +26,8 @@ public:
   void Read(Source & source)
   {
     m_version = static_cast<Version>(ReadPrimitiveFromSource<uint8_t>(source));
-    CHECK_EQUAL(static_cast<uint8_t>(m_version), static_cast<uint8_t>(Version::V0), ());
+    CHECK(Version::V0 <= m_version && m_version <= Version::Latest, (m_version));
+
     m_featuresOffset = ReadPrimitiveFromSource<uint32_t>(source);
     m_featuresSize = ReadPrimitiveFromSource<uint32_t>(source);
   }
@@ -39,7 +40,10 @@ public:
 
 inline std::string DebugPrint(DatSectionHeader::Version v)
 {
-  CHECK(v == DatSectionHeader::Version::V0, ());
-  return "V0";
+  switch (v)
+  {
+  case DatSectionHeader::Version::V0: return "V0";
+  default: return "Latest(V1)";
+  }
 }
 }  // namespace feature
diff --git a/libs/indexer/feature.cpp b/libs/indexer/feature.cpp
index 8361e8395..c534e6e16 100644
--- a/libs/indexer/feature.cpp
+++ b/libs/indexer/feature.cpp
@@ -297,7 +297,6 @@ void FeatureType::ParseCommon()
   if (m_parsed.m_common)
     return;
 
-  CHECK(m_loadInfo, ());
   ParseTypes();
 
   ArrayByteSource source(m_data.data() + m_offsets.m_common);
@@ -342,21 +341,35 @@ void FeatureType::ParseHeader2()
   if (m_parsed.m_header2)
     return;
 
-  CHECK(m_loadInfo, ());
   ParseCommon();
 
-  uint8_t elemsCount = 0, geomScalesMask = 0;
-  BitSource bitSource(m_data.data() + m_offsets.m_header2);
-  auto const headerGeomType = static_cast<HeaderGeomType>(Header(m_data) & HEADER_MASK_GEOMTYPE);
+  m_parsed.m_header2 = true;
 
-  if (headerGeomType == HeaderGeomType::Line || headerGeomType == HeaderGeomType::Area)
+  auto const headerGeomType = static_cast<HeaderGeomType>(Header(m_data) & HEADER_MASK_GEOMTYPE);
+  if (headerGeomType != HeaderGeomType::Line && headerGeomType != HeaderGeomType::Area)
+    return;
+
+  BitSource bitSource(m_data.data() + m_offsets.m_header2);
+  uint8_t elemsCount = bitSource.Read(4);
+  uint8_t geomScalesMask = 0;
+
+  if (m_loadInfo->m_version == DatSectionHeader::Version::V0)
   {
-    elemsCount = bitSource.Read(4);
     // For outer geometry read the geom scales (offsets) mask.
     // For inner geometry remaining 4 bits are not used.
     if (elemsCount == 0)
       geomScalesMask = bitSource.Read(4);
   }
+  else
+  {
+    ASSERT_EQUAL(m_loadInfo->m_version, DatSectionHeader::Version::V1, ());
+    bool const isOuter = (bitSource.Read(1) == 1);
+    if (isOuter)
+    {
+      geomScalesMask = elemsCount;
+      elemsCount = 0;
+    }
+  }
 
   ArrayByteSource src(bitSource.RoundPtr());
   serial::GeometryCodingParams const & cp = m_loadInfo->GetDefGeometryCodingParams();
@@ -370,7 +383,8 @@ void FeatureType::ParseHeader2()
       // first and last points are never simplified/discarded,
       // 2 bits are used per each other point, i.e.
       // 3-6 pts - 1 byte, 7-10 pts - 2b, 11-14 pts - 3b.
-      int const count = ((elemsCount - 2) + 4 - 1) / 4;
+      /// @see FeatureBuilder::SerializeForMwm
+      int const count = (elemsCount - 2 + 3) / 4;
       ASSERT_LESS(count, 4, ());
 
       for (int i = 0; i < count; ++i)
@@ -393,8 +407,9 @@ void FeatureType::ParseHeader2()
       ReadOffsets(*m_loadInfo, src, geomScalesMask, m_offsets.m_pts);
     }
   }
-  else if (headerGeomType == HeaderGeomType::Area)
+  else
   {
+    ASSERT(headerGeomType == HeaderGeomType::Area, ());
     if (elemsCount > 0)
     {
       // Inner geometry (strips).
@@ -413,7 +428,6 @@ void FeatureType::ParseHeader2()
 
   // Size of the whole header incl. inner geometry / triangles.
   m_innerStats.m_size = CalcOffset(src, m_data.data());
-  m_parsed.m_header2 = true;
 }
 
 void FeatureType::ResetGeometry()
@@ -438,7 +452,6 @@ void FeatureType::ParseGeometry(int scale)
 {
   if (!m_parsed.m_points)
   {
-    CHECK(m_loadInfo, ());
     ParseHeader2();
 
     auto const headerGeomType = static_cast<HeaderGeomType>(Header(m_data) & HEADER_MASK_GEOMTYPE);
@@ -539,7 +552,6 @@ void FeatureType::ParseTriangles(int scale)
 {
   if (!m_parsed.m_triangles)
   {
-    CHECK(m_loadInfo, ());
     ParseHeader2();
 
     auto const headerGeomType = static_cast<HeaderGeomType>(Header(m_data) & HEADER_MASK_GEOMTYPE);
diff --git a/libs/indexer/features_vector.cpp b/libs/indexer/features_vector.cpp
index af2bd5dd6..b7c45d0a6 100644
--- a/libs/indexer/features_vector.cpp
+++ b/libs/indexer/features_vector.cpp
@@ -21,7 +21,8 @@ void FeaturesVector::InitRecordsReader()
   feature::DatSectionHeader header;
   header.Read(src);
 
-  CHECK_EQUAL(header.m_version, feature::DatSectionHeader::Version::V0, ());
+  m_loadInfo.m_version = header.m_version;
+
   m_recordReader = std::make_unique<RecordReader>(reader.SubReader(header.m_featuresOffset, header.m_featuresSize));
 }
 
diff --git a/libs/indexer/shared_load_info.hpp b/libs/indexer/shared_load_info.hpp
index 157a3ea04..e16927f1e 100644
--- a/libs/indexer/shared_load_info.hpp
+++ b/libs/indexer/shared_load_info.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "indexer/dat_section_header.hpp"
 #include "indexer/data_header.hpp"
 
 #include "coding/files_container.hpp"
@@ -47,6 +48,7 @@ private:
 
 public:
   indexer::MetadataDeserializer * m_metaDeserializer;
+  feature::DatSectionHeader::Version m_version;
 
   DISALLOW_COPY_AND_MOVE(SharedLoadInfo);
 };

From 315bba2a226193ede4faf4ee89988cb047d41c79 Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Sun, 6 Jul 2025 16:09:05 -0300
Subject: [PATCH 183/302] Include fix.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 libs/editor/editor_config.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libs/editor/editor_config.cpp b/libs/editor/editor_config.cpp
index e5ad6a2e0..53b6c6fc0 100644
--- a/libs/editor/editor_config.cpp
+++ b/libs/editor/editor_config.cpp
@@ -3,6 +3,7 @@
 #include "base/stl_helpers.hpp"
 
 #include <algorithm>
+#include <cstring>
 #include <string>
 #include <unordered_map>
 

From b85c11ea5a67e8f8faee92bc8c902d200e876377 Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Wed, 25 Jun 2025 23:58:19 -0300
Subject: [PATCH 184/302] [feature] Added RouteRelation and linked it with
 FeatureType.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 defines.hpp                                   |   7 +-
 generator/centers_table_builder.cpp           |   4 +-
 generator/feature_builder.cpp                 |   8 +-
 .../feature_segments_checker.cpp              |   3 +-
 generator/statistics.cpp                      |   2 +-
 libs/drape/color.hpp                          |   5 +
 libs/indexer/CMakeLists.txt                   |   5 +-
 libs/indexer/feature.cpp                      |  69 ++++++--
 libs/indexer/feature.hpp                      |  20 ++-
 libs/indexer/feature_source.cpp               |   4 +-
 libs/indexer/features_offsets_table.cpp       |  20 +--
 libs/indexer/features_offsets_table.hpp       |   2 +-
 libs/indexer/features_vector.cpp              |  15 +-
 libs/indexer/features_vector.hpp              |   6 +-
 .../features_offsets_table_test.cpp           |   2 +-
 .../indexer_tests/features_vector_test.cpp    |   3 +-
 libs/indexer/mwm_set.cpp                      |  17 +-
 libs/indexer/mwm_set.hpp                      |   5 +-
 libs/indexer/rank_table.cpp                   |   2 +-
 libs/indexer/route_relation.hpp               | 167 ++++++++++++++++++
 libs/indexer/shared_load_info.cpp             |  14 ++
 libs/indexer/shared_load_info.hpp             |   8 +-
 libs/map/mwm_tests/multithread_mwm_test.cpp   |   3 +-
 .../concurrent_feature_parsing_test.cpp       |   2 +-
 libs/search/mwm_context.cpp                   |   3 +-
 tools/feature_list/feature_list.cpp           |   3 +-
 26 files changed, 336 insertions(+), 63 deletions(-)
 create mode 100644 libs/indexer/route_relation.hpp

diff --git a/defines.hpp b/defines.hpp
index 71d18a375..b16b76dc0 100644
--- a/defines.hpp
+++ b/defines.hpp
@@ -4,6 +4,7 @@
 
 #define DATA_FILE_EXTENSION ".mwm"
 #define DATA_FILE_EXTENSION_TMP ".mwm.tmp"
+#define RELATIONS_FILE_EXTENSION_TMP ".rels.tmp"
 #define DIFF_FILE_EXTENSION ".mwmdiff"
 #define DIFF_APPLYING_FILE_EXTENSION ".diff.applying"
 #define FONT_FILE_EXTENSION ".ttf"
@@ -22,8 +23,11 @@
 #define OFFSET_EXT ".offs"
 #define ID2REL_EXT ".id2rel"
 
+auto constexpr TMP_OFFSETS_EXT = OFFSET_EXT EXTENSION_TMP;
+
 #define CENTERS_FILE_TAG "centers"
 #define FEATURES_FILE_TAG "features"
+#define RELATIONS_FILE_TAG "relations"
 #define GEOMETRY_FILE_TAG "geom"
 #define TRIANGLE_FILE_TAG "trg"
 #define INDEX_FILE_TAG "idx"
@@ -36,7 +40,7 @@
 #define POSTCODE_POINTS_FILE_TAG "postcode_points"
 #define POSTCODES_FILE_TAG "postcodes"
 #define CITIES_BOUNDARIES_FILE_TAG "cities_boundaries"
-#define FEATURE_TO_OSM_FILE_TAG "feature_to_osm"
+#define FEATURE_TO_OSM_FILE_TAG "feature_to_osm"  // not used in prod
 #define HEADER_FILE_TAG "header"
 #define VERSION_FILE_TAG "version"
 #define METADATA_FILE_TAG "meta"
@@ -47,6 +51,7 @@
 #define ROUTING_FILE_TAG "routing"
 #define CROSS_MWM_FILE_TAG "cross_mwm"
 #define FEATURE_OFFSETS_FILE_TAG "offs"
+#define RELATION_OFFSETS_FILE_TAG "rel_offs"
 #define SEARCH_RANKS_FILE_TAG "ranks"
 #define POPULARITY_RANKS_FILE_TAG "popularity"
 #define REGION_INFO_FILE_TAG "rgninfo"
diff --git a/generator/centers_table_builder.cpp b/generator/centers_table_builder.cpp
index 88ef1f6fd..dd05d3796 100644
--- a/generator/centers_table_builder.cpp
+++ b/generator/centers_table_builder.cpp
@@ -24,7 +24,7 @@ bool BuildCentersTableFromDataFile(std::string const & filename, bool forceRebui
       if (!forceRebuild && rcont.IsExist(CENTERS_FILE_TAG))
         return true;
 
-      auto const table = feature::FeaturesOffsetsTable::Load(rcont);
+      auto const table = feature::FeaturesOffsetsTable::Load(rcont, FEATURE_OFFSETS_FILE_TAG);
       if (!table)
       {
         LOG(LERROR, ("Can't load offsets table from:", filename));
@@ -32,7 +32,7 @@ bool BuildCentersTableFromDataFile(std::string const & filename, bool forceRebui
       }
 
       feature::DataHeader const header(rcont);
-      FeaturesVector const features(rcont, header, table.get(), nullptr);
+      FeaturesVector const features(rcont, header, table.get(), nullptr, nullptr);
 
       builder.SetGeometryParams(header.GetBounds());
       features.ForEach([&](FeatureType & ft, uint32_t featureId) { builder.Put(featureId, feature::GetCenter(ft)); });
diff --git a/generator/feature_builder.cpp b/generator/feature_builder.cpp
index dba90fd59..805413f0c 100644
--- a/generator/feature_builder.cpp
+++ b/generator/feature_builder.cpp
@@ -631,7 +631,10 @@ void FeatureBuilder::SerializeForMwm(SupportingData & data, serial::GeometryCodi
   CHECK(type != GeomType::Undefined, ());
   if (type == GeomType::Point)
   {
-    serial::SavePoint(sink, m_center, params);
+    uint64_t const encoded =
+        coding::EncodePointDeltaAsUint(PointDToPointU(m_center, params.GetCoordBits()), params.GetBasePoint());
+    CHECK_GREATER(bits::NumHiZeroBits64(encoded), 1, ());
+    WriteVarUint(sink, encoded << 1);  // Relations control bit
     return;
   }
 
@@ -657,6 +660,9 @@ void FeatureBuilder::SerializeForMwm(SupportingData & data, serial::GeometryCodi
       bitSink.Write(trgCount != 0 ? trgCount : data.m_trgMask, 4);
       bitSink.Write(trgCount == 0 ? 1 : 0, 1);
     }
+
+    // Relations control bit
+    bitSink.Write(0, 1);
   }
 
   if (type == GeomType::Line)
diff --git a/generator/feature_segments_checker/feature_segments_checker.cpp b/generator/feature_segments_checker/feature_segments_checker.cpp
index ce8e79a75..aea1ef913 100644
--- a/generator/feature_segments_checker/feature_segments_checker.cpp
+++ b/generator/feature_segments_checker/feature_segments_checker.cpp
@@ -156,7 +156,8 @@ public:
 
   void operator()(FeatureType & f, uint32_t const & id)
   {
-    f.ParseHeader2();
+    f.ParseAllBeforeGeometry();
+
     if (!GetBicycleModel().IsRoad(feature::TypesHolder(f)))
     {
       ++m_notRoadCount;
diff --git a/generator/statistics.cpp b/generator/statistics.cpp
index 157657561..d58c72409 100644
--- a/generator/statistics.cpp
+++ b/generator/statistics.cpp
@@ -50,7 +50,7 @@ public:
 
   void operator()(FeatureType & f, uint32_t)
   {
-    f.ParseHeader2();
+    f.ParseAllBeforeGeometry();
 
     FeatureType::InnerGeomStat const innerStats = f.GetInnerStats();
 
diff --git a/libs/drape/color.hpp b/libs/drape/color.hpp
index 719d65203..5fc447e6f 100644
--- a/libs/drape/color.hpp
+++ b/libs/drape/color.hpp
@@ -15,6 +15,7 @@ struct Color
   constexpr Color(uint8_t red, uint8_t green, uint8_t blue, uint8_t alpha)
     : Color(red << 24 | green << 16 | blue << 8 | alpha)
   {}
+  constexpr Color(uint8_t red, uint8_t green, uint8_t blue) : Color(red, green, blue, 255) {}
   constexpr Color(uint32_t rgb, uint8_t alpha)
     : Color(ExtractByte(rgb, 2), ExtractByte(rgb, 1), ExtractByte(rgb, 0), alpha)
   {}
@@ -58,6 +59,10 @@ struct Color
   {
     return {ExtractByte(argb, 2), ExtractByte(argb, 1), ExtractByte(argb, 0), ExtractByte(argb, 3)};
   }
+  constexpr static Color FromRGBA(uint32_t rgba)
+  {
+    return {ExtractByte(rgba, 3), ExtractByte(rgba, 2), ExtractByte(rgba, 1), ExtractByte(rgba, 0)};
+  }
 
 private:
   constexpr static uint8_t ExtractByte(uint32_t number, uint8_t byteIdx) { return (number >> (8 * byteIdx)) & 0xFF; }
diff --git a/libs/indexer/CMakeLists.txt b/libs/indexer/CMakeLists.txt
index 48af2c680..feccdb2c9 100644
--- a/libs/indexer/CMakeLists.txt
+++ b/libs/indexer/CMakeLists.txt
@@ -103,10 +103,11 @@ set(SRC
   metadata_serdes.hpp
   mwm_set.cpp
   mwm_set.hpp
-  postcodes_matcher.cpp  # it's in indexer due to editor which is in indexer and depends on postcodes_marcher
-  postcodes_matcher.hpp  # it's in indexer due to editor which is in indexer and depends on postcodes_marcher
+  postcodes_matcher.cpp  # it's in indexer EditableMapObject depends on postcodes_matcher
+  postcodes_matcher.hpp  # it's in indexer EditableMapObject depends on postcodes_matcher
   rank_table.cpp
   rank_table.hpp
+  route_relation.hpp
   road_shields_parser.cpp
   road_shields_parser.hpp
   scale_index.hpp
diff --git a/libs/indexer/feature.cpp b/libs/indexer/feature.cpp
index c534e6e16..610b76f2e 100644
--- a/libs/indexer/feature.cpp
+++ b/libs/indexer/feature.cpp
@@ -244,6 +244,7 @@ std::unique_ptr<FeatureType> FeatureType::CreateFromMapObject(osm::MapObject con
   ft->m_parsed.m_types = true;
   ft->m_header = CalculateHeader(emo.GetTypes().Size(), headerGeomType, ft->m_params);
   ft->m_parsed.m_header2 = true;
+  ft->m_parsed.m_relations = true;
 
   ft->m_id = emo.GetID();
   return ft;
@@ -305,7 +306,17 @@ void FeatureType::ParseCommon()
 
   if (GetGeomType() == GeomType::Point)
   {
-    m_center = serial::LoadPoint(source, m_loadInfo->GetDefGeometryCodingParams());
+    uint64_t decoded = ReadVarUint<uint64_t>(source);
+
+    if (m_loadInfo->m_version >= DatSectionHeader::Version::V1)
+    {
+      m_hasRelations = (decoded & 0x1) == 1;
+      decoded >>= 1;
+    }
+
+    auto const & cp = m_loadInfo->GetDefGeometryCodingParams();
+    m_center = PointUToPointD(coding::DecodePointDeltaFromUint(decoded, cp.GetBasePoint()), cp.GetCoordBits());
+
     m_limitRect.Add(m_center);
   }
 
@@ -329,13 +340,7 @@ int8_t FeatureType::GetLayer()
   return m_params.layer;
 }
 
-// TODO: there is a room to store more information in Header2 (geometry header),
-// but it needs a mwm version change.
-// 1st bit - inner / outer flag
-// 4 more bits - inner points/triangles count or outer geom offsets mask
-//   (but actually its enough to store number of the first existing geom level only - 2 bits)
-// 3-5 more bits are spare
-// One of them could be used for a closed line flag to avoid storing identical first + last points.
+// TODO: One of the free bits could be used for a closed line flag to avoid storing identical first + last points.
 void FeatureType::ParseHeader2()
 {
   if (m_parsed.m_header2)
@@ -347,7 +352,10 @@ void FeatureType::ParseHeader2()
 
   auto const headerGeomType = static_cast<HeaderGeomType>(Header(m_data) & HEADER_MASK_GEOMTYPE);
   if (headerGeomType != HeaderGeomType::Line && headerGeomType != HeaderGeomType::Area)
+  {
+    m_offsets.m_relations = m_offsets.m_header2;
     return;
+  }
 
   BitSource bitSource(m_data.data() + m_offsets.m_header2);
   uint8_t elemsCount = bitSource.Read(4);
@@ -362,13 +370,15 @@ void FeatureType::ParseHeader2()
   }
   else
   {
-    ASSERT_EQUAL(m_loadInfo->m_version, DatSectionHeader::Version::V1, ());
+    ASSERT(m_loadInfo->m_version >= DatSectionHeader::Version::V1, ());
     bool const isOuter = (bitSource.Read(1) == 1);
     if (isOuter)
     {
       geomScalesMask = elemsCount;
       elemsCount = 0;
     }
+
+    m_hasRelations = (bitSource.Read(1) == 1);
   }
 
   ArrayByteSource src(bitSource.RoundPtr());
@@ -426,6 +436,23 @@ void FeatureType::ParseHeader2()
     }
   }
 
+  m_offsets.m_relations = CalcOffset(src, m_data.data());
+}
+
+void FeatureType::ParseRelations()
+{
+  if (m_parsed.m_relations)
+    return;
+
+  ParseHeader2();
+
+  ArrayByteSource src(m_data.data() + m_offsets.m_relations);
+
+  if (m_hasRelations)
+    ReadVarUInt32SortedShortArray(src, m_relationIDs);
+
+  m_parsed.m_relations = true;
+
   // Size of the whole header incl. inner geometry / triangles.
   m_innerStats.m_size = CalcOffset(src, m_data.data());
 }
@@ -442,7 +469,7 @@ void FeatureType::ResetGeometry()
   if (GetGeomType() != GeomType::Point)
     m_limitRect = m2::RectD();
 
-  m_parsed.m_header2 = m_parsed.m_points = m_parsed.m_triangles = false;
+  m_parsed.m_relations = m_parsed.m_header2 = m_parsed.m_points = m_parsed.m_triangles = false;
   m_offsets.m_pts.clear();
   m_offsets.m_trg.clear();
   m_ptsSimpMask = 0;
@@ -501,9 +528,9 @@ void FeatureType::ParseGeometry(int scale)
 
 FeatureType::GeomStat FeatureType::GetOuterGeometryStats()
 {
-  CHECK(m_loadInfo && m_parsed.m_header2 && !m_parsed.m_points, ("Call geometry stats first and once!"));
+  CHECK(m_loadInfo && m_parsed.m_relations && !m_parsed.m_points, ());
   size_t const scalesCount = m_loadInfo->GetScalesCount();
-  ASSERT_LESS_OR_EQUAL(scalesCount, DataHeader::kMaxScalesCount, ("MWM has too many geometry scales!"));
+  ASSERT_LESS_OR_EQUAL(scalesCount, DataHeader::kMaxScalesCount, ());
   FeatureType::GeomStat res;
 
   auto const headerGeomType = static_cast<HeaderGeomType>(Header(m_data) & HEADER_MASK_GEOMTYPE);
@@ -576,10 +603,9 @@ void FeatureType::ParseTriangles(int scale)
 
 FeatureType::GeomStat FeatureType::GetOuterTrianglesStats()
 {
-  CHECK(m_loadInfo && m_parsed.m_header2 && !m_parsed.m_triangles, ("Call geometry stats first and once!"));
+  CHECK(m_loadInfo && m_parsed.m_relations && !m_parsed.m_triangles, ());
   int const scalesCount = m_loadInfo->GetScalesCount();
-  ASSERT_LESS_OR_EQUAL(scalesCount, static_cast<int>(DataHeader::kMaxScalesCount),
-                       ("MWM has too many geometry scales!"));
+  ASSERT_LESS_OR_EQUAL(scalesCount, static_cast<int>(DataHeader::kMaxScalesCount), ());
   FeatureType::GeomStat res;
 
   auto const headerGeomType = static_cast<HeaderGeomType>(Header(m_data) & HEADER_MASK_GEOMTYPE);
@@ -868,3 +894,16 @@ bool FeatureType::HasMetadata(feature::Metadata::EType type)
 
   return base::FindIf(m_metaIds, [&type](auto const & v) { return v.first == type; }) != m_metaIds.end();
 }
+
+FeatureType::RelationIDsV const & FeatureType::GetRelations()
+{
+  ParseRelations();
+  return m_relationIDs;
+}
+
+/// @pre id is from m_relationIDs.
+feature::RouteRelationBase FeatureType::ReadRelation(uint32_t id)
+{
+  ParseRelations();
+  return m_loadInfo->ReadRelation(id);
+}
diff --git a/libs/indexer/feature.hpp b/libs/indexer/feature.hpp
index c2b4ce582..7ae3a2422 100644
--- a/libs/indexer/feature.hpp
+++ b/libs/indexer/feature.hpp
@@ -1,6 +1,7 @@
 #pragma once
 #include "indexer/feature_data.hpp"
 #include "indexer/metadata_serdes.hpp"
+#include "indexer/route_relation.hpp"
 
 #include "geometry/point2d.hpp"
 #include "geometry/rect2d.hpp"
@@ -82,6 +83,8 @@ public:
   FeatureID const & GetID() const { return m_id; }
 
   void ParseHeader2();
+  void ParseRelations();
+  void ParseAllBeforeGeometry() { ParseRelations(); }
   void ResetGeometry();
   void ParseGeometry(int scale);
   void ParseTriangles(int scale);
@@ -195,31 +198,41 @@ public:
   GeomStat GetOuterTrianglesStats();
   //@}
 
+  using RelationIDsV = feature::ShortArray;
+  RelationIDsV const & GetRelations();
+
+  feature::RouteRelationBase ReadRelation(uint32_t id);
+
 private:
   struct ParsedFlags
   {
     bool m_types : 1;
     bool m_common : 1;
     bool m_header2 : 1;
+    bool m_relations : 1;
     bool m_points : 1;
     bool m_triangles : 1;
     bool m_metadata : 1;
     bool m_metaIds : 1;
 
     ParsedFlags() { Reset(); }
-    void Reset() { m_types = m_common = m_header2 = m_points = m_triangles = m_metadata = m_metaIds = false; }
+    void Reset()
+    {
+      m_types = m_common = m_header2 = m_relations = m_points = m_triangles = m_metadata = m_metaIds = false;
+    }
   };
 
   struct Offsets
   {
     uint32_t m_common = 0;
     uint32_t m_header2 = 0;
+    uint32_t m_relations = 0;
     GeometryOffsets m_pts;
     GeometryOffsets m_trg;
 
     void Reset()
     {
-      m_common = m_header2 = 0;
+      m_common = m_header2 = m_relations = 0;
       m_pts.clear();
       m_trg.clear();
     }
@@ -252,6 +265,9 @@ private:
   Offsets m_offsets;
   uint32_t m_ptsSimpMask = 0;
 
+  RelationIDsV m_relationIDs;
+  bool m_hasRelations = false;
+
   InnerGeomStat m_innerStats;
 
   DISALLOW_COPY_AND_MOVE(FeatureType);
diff --git a/libs/indexer/feature_source.cpp b/libs/indexer/feature_source.cpp
index da75bb095..5d42ccb6f 100644
--- a/libs/indexer/feature_source.cpp
+++ b/libs/indexer/feature_source.cpp
@@ -19,8 +19,8 @@ FeatureSource::FeatureSource(MwmSet::MwmHandle const & handle) : m_handle(handle
     return;
 
   auto const & value = *m_handle.GetValue();
-  m_vector = std::make_unique<FeaturesVector>(value.m_cont, value.GetHeader(), value.m_table.get(),
-                                              value.m_metaDeserializer.get());
+  m_vector = std::make_unique<FeaturesVector>(value.m_cont, value.GetHeader(), value.m_ftTable.get(),
+                                              value.m_relTable.get(), value.m_metaDeserializer.get());
 }
 
 size_t FeatureSource::GetNumFeatures() const
diff --git a/libs/indexer/features_offsets_table.cpp b/libs/indexer/features_offsets_table.cpp
index 392b319f3..865fad811 100644
--- a/libs/indexer/features_offsets_table.cpp
+++ b/libs/indexer/features_offsets_table.cpp
@@ -1,10 +1,7 @@
 #include "indexer/features_offsets_table.hpp"
 
-#include "indexer/dat_section_header.hpp"
 #include "indexer/features_vector.hpp"
 
-#include "platform/local_country_file.hpp"
-#include "platform/local_country_file_utils.hpp"
 #include "platform/platform.hpp"
 
 #include "coding/files_container.hpp"
@@ -14,11 +11,11 @@
 #include "base/logging.hpp"
 #include "base/scope_guard.hpp"
 
+namespace feature
+{
 using namespace platform;
 using namespace std;
 
-namespace feature
-{
 void FeaturesOffsetsTable::Builder::PushOffset(uint32_t const offset)
 {
   ASSERT(m_offsets.empty() || m_offsets.back() < offset, ());
@@ -63,14 +60,14 @@ unique_ptr<FeaturesOffsetsTable> FeaturesOffsetsTable::Load(string const & fileP
 }
 
 // static
-unique_ptr<FeaturesOffsetsTable> FeaturesOffsetsTable::Load(FilesContainerR const & cont)
+unique_ptr<FeaturesOffsetsTable> FeaturesOffsetsTable::Load(FilesContainerR const & cont, std::string const & tag)
 {
   unique_ptr<FeaturesOffsetsTable> table(new FeaturesOffsetsTable());
 
   table->m_file.Open(cont.GetFileName());
-  auto p = cont.GetAbsoluteOffsetAndSize(FEATURE_OFFSETS_FILE_TAG);
+  auto p = cont.GetAbsoluteOffsetAndSize(tag);
   ASSERT(p.first % 4 == 0, (p.first));  // will get troubles in succinct otherwise
-  table->m_handle.Assign(table->m_file.Map(p.first, p.second, FEATURE_OFFSETS_FILE_TAG));
+  table->m_handle.Assign(table->m_file.Map(p.first, p.second, tag));
 
   succinct::mapper::map(table->m_table, table->m_handle.GetData<char>());
   return table;
@@ -80,9 +77,7 @@ void FeaturesOffsetsTable::Build(FilesContainerR const & cont, string const & st
 {
   Builder builder;
   FeaturesVector::ForEachOffset(cont, [&builder](uint32_t offset) { builder.PushOffset(offset); });
-
-  unique_ptr<FeaturesOffsetsTable> table(Build(builder));
-  table->Save(storePath);
+  Build(builder)->Save(storePath);
 }
 
 void FeaturesOffsetsTable::Save(string const & filePath)
@@ -123,7 +118,7 @@ bool BuildOffsetsTable(string const & filePath)
 {
   try
   {
-    string const destPath = filePath + ".offsets";
+    string const destPath = filePath + TMP_OFFSETS_EXT;
     SCOPE_GUARD(fileDeleter, bind(FileWriter::DeleteFileX, destPath));
 
     {
@@ -140,5 +135,4 @@ bool BuildOffsetsTable(string const & filePath)
     return false;
   }
 }
-
 }  // namespace feature
diff --git a/libs/indexer/features_offsets_table.hpp b/libs/indexer/features_offsets_table.hpp
index 8be075f64..c050981b1 100644
--- a/libs/indexer/features_offsets_table.hpp
+++ b/libs/indexer/features_offsets_table.hpp
@@ -66,7 +66,7 @@ public:
   /// Load table by full path to the table file.
   static std::unique_ptr<FeaturesOffsetsTable> Load(std::string const & filePath);
 
-  static std::unique_ptr<FeaturesOffsetsTable> Load(FilesContainerR const & cont);
+  static std::unique_ptr<FeaturesOffsetsTable> Load(FilesContainerR const & cont, std::string const & tag);
   static void Build(FilesContainerR const & cont, std::string const & storePath);
 
   FeaturesOffsetsTable(FeaturesOffsetsTable const &) = delete;
diff --git a/libs/indexer/features_vector.cpp b/libs/indexer/features_vector.cpp
index b7c45d0a6..c1d4d8f73 100644
--- a/libs/indexer/features_vector.cpp
+++ b/libs/indexer/features_vector.cpp
@@ -5,10 +5,11 @@
 #include "platform/constants.hpp"
 
 FeaturesVector::FeaturesVector(FilesContainerR const & cont, feature::DataHeader const & header,
-                               feature::FeaturesOffsetsTable const * table,
+                               feature::FeaturesOffsetsTable const * ftTable,
+                               feature::FeaturesOffsetsTable const * relTable,
                                indexer::MetadataDeserializer * metaDeserializer)
-  : m_loadInfo(cont, header, metaDeserializer)
-  , m_table(table)
+  : m_loadInfo(cont, header, relTable, metaDeserializer)
+  , m_table(ftTable)
 {
   InitRecordsReader();
 }
@@ -44,9 +45,12 @@ FeaturesVectorTest::FeaturesVectorTest(std::string const & filePath)
 FeaturesVectorTest::FeaturesVectorTest(FilesContainerR const & cont)
   : m_cont(cont)
   , m_header(m_cont)
-  , m_vector(m_cont, m_header, nullptr, nullptr)
+  , m_vector(m_cont, m_header, nullptr, nullptr, nullptr)
 {
-  m_vector.m_table = feature::FeaturesOffsetsTable::Load(m_cont).release();
+  m_vector.m_table = feature::FeaturesOffsetsTable::Load(m_cont, FEATURE_OFFSETS_FILE_TAG).release();
+
+  if (m_cont.IsExist(RELATION_OFFSETS_FILE_TAG))
+    m_vector.m_loadInfo.m_relTable = feature::FeaturesOffsetsTable::Load(m_cont, RELATION_OFFSETS_FILE_TAG).release();
 
   if (m_cont.IsExist(METADATA_FILE_TAG))
     m_vector.m_loadInfo.m_metaDeserializer = indexer::MetadataDeserializer::Load(m_cont).release();
@@ -56,4 +60,5 @@ FeaturesVectorTest::~FeaturesVectorTest()
 {
   delete m_vector.m_table;
   delete m_vector.m_loadInfo.m_metaDeserializer;
+  delete m_vector.m_loadInfo.m_relTable;
 }
diff --git a/libs/indexer/features_vector.hpp b/libs/indexer/features_vector.hpp
index b7280c4c4..a9037a1c0 100644
--- a/libs/indexer/features_vector.hpp
+++ b/libs/indexer/features_vector.hpp
@@ -21,7 +21,8 @@ class FeaturesVector
 
 public:
   FeaturesVector(FilesContainerR const & cont, feature::DataHeader const & header,
-                 feature::FeaturesOffsetsTable const * table, indexer::MetadataDeserializer * metaDeserializer);
+                 feature::FeaturesOffsetsTable const * ftTable, feature::FeaturesOffsetsTable const * relTable,
+                 indexer::MetadataDeserializer * metaDeserializer);
 
   std::unique_ptr<FeatureType> GetByIndex(uint32_t index) const;
 
@@ -55,7 +56,8 @@ public:
 private:
   /// Actually, this ctor is needed only for ForEachOffset call.
   /// Didn't find a better solution without big refactoring.
-  FeaturesVector(FilesContainerR const & cont, feature::DataHeader const & header) : m_loadInfo(cont, header, nullptr)
+  FeaturesVector(FilesContainerR const & cont, feature::DataHeader const & header)
+    : m_loadInfo(cont, header, nullptr, nullptr)
   {
     InitRecordsReader();
   }
diff --git a/libs/indexer/indexer_tests/features_offsets_table_test.cpp b/libs/indexer/indexer_tests/features_offsets_table_test.cpp
index 2752cf1ec..305d78429 100644
--- a/libs/indexer/indexer_tests/features_offsets_table_test.cpp
+++ b/libs/indexer/indexer_tests/features_offsets_table_test.cpp
@@ -81,7 +81,7 @@ UNIT_TEST(FeaturesOffsetsTable_ReadWrite)
 
   FeaturesOffsetsTable::Build(baseContainer, indexFile);
 
-  unique_ptr<FeaturesOffsetsTable> table(FeaturesOffsetsTable::Load(baseContainer));
+  unique_ptr<FeaturesOffsetsTable> table(FeaturesOffsetsTable::Load(baseContainer, FEATURE_OFFSETS_FILE_TAG));
   TEST(table.get() && table->size() > minFeaturesCount, ());
 
   unique_ptr<FeaturesOffsetsTable> loadedTable(FeaturesOffsetsTable::Load(indexFile));
diff --git a/libs/indexer/indexer_tests/features_vector_test.cpp b/libs/indexer/indexer_tests/features_vector_test.cpp
index e5a6c02f9..7d12eeba0 100644
--- a/libs/indexer/indexer_tests/features_vector_test.cpp
+++ b/libs/indexer/indexer_tests/features_vector_test.cpp
@@ -48,7 +48,8 @@ UNIT_TEST(FeaturesVectorTest_ParseMetadata)
   TEST(handle.IsAlive(), ());
 
   auto const * value = handle.GetValue();
-  FeaturesVector fv(value->m_cont, value->GetHeader(), value->m_table.get(), value->m_metaDeserializer.get());
+  FeaturesVector fv(value->m_cont, value->GetHeader(), value->m_ftTable.get(), value->m_relTable.get(),
+                    value->m_metaDeserializer.get());
 
   map<string, int> actual;
   fv.ForEach([&](FeatureType & ft, uint32_t index)
diff --git a/libs/indexer/mwm_set.cpp b/libs/indexer/mwm_set.cpp
index b16191f1a..58d762e9e 100644
--- a/libs/indexer/mwm_set.cpp
+++ b/libs/indexer/mwm_set.cpp
@@ -394,12 +394,19 @@ MwmValue::~MwmValue() {}
 
 void MwmValue::SetTable(MwmInfoEx & info)
 {
-  m_table = info.m_table.lock();
-  if (m_table)
-    return;
+  m_ftTable = info.m_ftTable.lock();
+  if (!m_ftTable)
+  {
+    m_ftTable = feature::FeaturesOffsetsTable::Load(m_cont, FEATURE_OFFSETS_FILE_TAG);
+    info.m_ftTable = m_ftTable;
+  }
 
-  m_table = feature::FeaturesOffsetsTable::Load(m_cont);
-  info.m_table = m_table;
+  m_relTable = info.m_relTable.lock();
+  if (!m_relTable && m_cont.IsExist(RELATION_OFFSETS_FILE_TAG))
+  {
+    m_relTable = feature::FeaturesOffsetsTable::Load(m_cont, RELATION_OFFSETS_FILE_TAG);
+    info.m_relTable = m_relTable;
+  }
 }
 
 string DebugPrint(MwmSet::RegResult result)
diff --git a/libs/indexer/mwm_set.hpp b/libs/indexer/mwm_set.hpp
index 5d309f21a..0c7fda49c 100644
--- a/libs/indexer/mwm_set.hpp
+++ b/libs/indexer/mwm_set.hpp
@@ -115,7 +115,7 @@ private:
   // only in MwmValue::SetTable() method, which, in turn, is called
   // only in the MwmSet critical section, protected by a lock.  So,
   // there's an implicit synchronization on this field.
-  std::weak_ptr<feature::FeaturesOffsetsTable> m_table;
+  std::weak_ptr<feature::FeaturesOffsetsTable> m_ftTable, m_relTable;
 };
 
 class MwmValue;
@@ -387,7 +387,8 @@ private:
   feature::DataHeader m_header;
 
 public:
-  std::shared_ptr<feature::FeaturesOffsetsTable> m_table;
+  // m_ftTable should always present, m_relTable maybe nullptr.
+  std::shared_ptr<feature::FeaturesOffsetsTable> m_ftTable, m_relTable;
   std::unique_ptr<indexer::MetadataDeserializer> m_metaDeserializer;
   std::unique_ptr<HouseToStreetTable> m_house2street, m_house2place;
 
diff --git a/libs/indexer/rank_table.cpp b/libs/indexer/rank_table.cpp
index 90bcece6d..8016a430c 100644
--- a/libs/indexer/rank_table.cpp
+++ b/libs/indexer/rank_table.cpp
@@ -182,7 +182,7 @@ unique_ptr<RankTable> RankTable::Load(FilesMappingContainer const & mcont, strin
 void SearchRankTableBuilder::CalcSearchRanks(FilesContainerR & rcont, vector<uint8_t> & ranks)
 {
   feature::DataHeader header(rcont);
-  FeaturesVector featuresVector(rcont, header, nullptr, nullptr);
+  FeaturesVector featuresVector(rcont, header, nullptr, nullptr, nullptr);
 
   featuresVector.ForEach([&ranks](FeatureType & ft, uint32_t /* index */) { ranks.push_back(CalcSearchRank(ft)); });
 }
diff --git a/libs/indexer/route_relation.hpp b/libs/indexer/route_relation.hpp
new file mode 100644
index 000000000..979717e24
--- /dev/null
+++ b/libs/indexer/route_relation.hpp
@@ -0,0 +1,167 @@
+#pragma once
+
+#include "coding/read_write_utils.hpp"
+#include "coding/string_utf8_multilang.hpp"
+
+#include "base/buffer_vector.hpp"
+
+#include "drape/color.hpp"
+
+#include <array>
+#include <string>
+
+namespace feature
+{
+
+class RouteRelationBase  // like RelationType (FeatureType)
+{
+public:
+  enum class Type : uint8_t
+  {
+    Foot = 0,
+    Hiking,
+
+    Bicycle,
+    MTB,
+
+    Bus,
+    Train,
+    Tram,
+    Trolleybus,
+  };
+  enum IdxAndFlags : uint8_t
+  {
+    CycleNetworkIdx = 0,
+    OperatorIdx = 1,
+    OfficialRefIdx = 2,
+    FromIdx = 3,
+    ToIdx = 4,
+    WikipediaIdx = 5,
+    CountIdx = 6,
+
+    HasColor = 0x40,
+    HasName = 0x80,
+  };
+
+  static constexpr dp::Color kEmptyColor = dp::Color::Transparent();
+
+  void SetParam(std::string_view s, IdxAndFlags idx) { m_params[idx] = s; }
+  std::string_view GetParam(IdxAndFlags idx) const { return m_params[idx]; }
+
+  Type GetType() const { return m_type; }
+  dp::Color GetColor() const { return m_color; }
+  std::string const & GetRef() const { return m_ref; }
+  std::string const & GetNetwork() const { return m_network; }
+
+  RouteRelationBase() = default;
+
+  /// @todo Can optimize by storing color as an index in a palette (1 byte).
+
+  template <class TSink>
+  void Write(TSink & sink) const
+  {
+    WriteToSink(sink, uint8_t(m_type));
+
+    uint8_t flags = 0;
+
+    if (m_color != kEmptyColor)
+      flags |= HasColor;
+    if (!m_name.IsEmpty())
+      flags |= HasName;
+
+    for (int i = 0; i < CountIdx; ++i)
+      if (!m_params[i].empty())
+        flags |= (1 << i);
+
+    WriteToSink(sink, flags);
+
+    if (flags & HasColor)
+      WriteToSink(sink, m_color.GetRGBA());
+
+    if (flags & HasName)
+      m_name.WriteNonEmpty(sink);
+
+    rw::Write(sink, m_network);
+    rw::Write(sink, m_ref);
+
+    for (int i = 0; i < CountIdx; ++i)
+      if (!m_params[i].empty())
+        rw::WriteNonEmpty(sink, m_params[i]);
+  }
+
+  template <class TSource>
+  void Read(TSource & src)
+  {
+    m_type = static_cast<Type>(ReadPrimitiveFromSource<uint8_t>(src));
+
+    uint8_t const flags = ReadPrimitiveFromSource<uint8_t>(src);
+
+    if (flags & HasColor)
+      m_color = dp::Color::FromRGBA(ReadPrimitiveFromSource<uint32_t>(src));
+
+    if (flags & HasName)
+      m_name.ReadNonEmpty(src);
+
+    rw::Read(src, m_network);
+    rw::Read(src, m_ref);
+
+    for (int i = 0; i < CountIdx; ++i)
+      if (flags & (1 << i))
+        rw::ReadNonEmpty(src, m_params[i]);
+  }
+
+protected:
+  StringUtf8Multilang m_name;
+  std::string m_network, m_ref;
+  std::array<std::string, CountIdx> m_params;
+
+  dp::Color m_color = kEmptyColor;
+  Type m_type;  // from route or route_master tag
+
+  friend class RelationBuilder;
+};
+
+using ShortArray = buffer_vector<uint32_t, 2>;
+
+class RouteRelation : public RouteRelationBase
+{
+public:
+  enum Flags : uint8_t
+  {
+    HasRelationMembers = 0x1,
+    HasParents = 0x2,
+  };
+
+  RouteRelation() = default;
+
+  /// @todo Use RecordReader + buffers?
+  template <class TSource>
+  void Read(TSource & src)
+  {
+    RouteRelationBase::Read(src);
+
+    uint32_t const sz = ReadVarUint<uint32_t>(src);
+    m_ftMembers.reserve(sz);
+    uint32_t prev = 0;
+    for (size_t i = 0; i < sz; ++i)
+    {
+      m_ftMembers.push_back(prev + ReadVarUint<uint32_t>(src));
+      prev = m_ftMembers.back();
+    }
+
+    uint8_t const flags = ReadPrimitiveFromSource<uint8_t>(src);
+
+    if (flags & HasRelationMembers)
+      ReadVarUInt32SortedShortArray(src, m_relMembers);
+
+    if (flags & HasParents)
+      ReadVarUInt32SortedShortArray(src, m_relParents);
+  }
+
+private:
+  std::vector<uint32_t> m_ftMembers;
+  ShortArray m_relMembers;
+  ShortArray m_relParents;
+};
+
+}  // namespace feature
diff --git a/libs/indexer/shared_load_info.cpp b/libs/indexer/shared_load_info.cpp
index 638fa7a53..d0735e371 100644
--- a/libs/indexer/shared_load_info.cpp
+++ b/libs/indexer/shared_load_info.cpp
@@ -1,15 +1,18 @@
 #include "indexer/shared_load_info.hpp"
 
 #include "indexer/feature_impl.hpp"
+#include "indexer/features_offsets_table.hpp"
 
 #include "defines.hpp"
 
 namespace feature
 {
 SharedLoadInfo::SharedLoadInfo(FilesContainerR const & cont, DataHeader const & header,
+                               feature::FeaturesOffsetsTable const * relTable,
                                indexer::MetadataDeserializer * metaDeserializer)
   : m_cont(cont)
   , m_header(header)
+  , m_relTable(relTable)
   , m_metaDeserializer(metaDeserializer)
 {}
 
@@ -28,4 +31,15 @@ SharedLoadInfo::Reader SharedLoadInfo::GetTrianglesReader(size_t ind) const
   return m_cont.GetReader(GetTagForIndex(TRIANGLE_FILE_TAG, ind));
 }
 
+RouteRelationBase SharedLoadInfo::ReadRelation(uint32_t id) const
+{
+  auto reader = m_cont.GetReader(RELATIONS_FILE_TAG);
+  ReaderSource src(reader);
+  src.Skip(m_relTable->GetFeatureOffset(id));
+
+  RouteRelationBase res;
+  res.Read(src);
+  return res;
+}
+
 }  // namespace feature
diff --git a/libs/indexer/shared_load_info.hpp b/libs/indexer/shared_load_info.hpp
index e16927f1e..e0c00620b 100644
--- a/libs/indexer/shared_load_info.hpp
+++ b/libs/indexer/shared_load_info.hpp
@@ -2,6 +2,7 @@
 
 #include "indexer/dat_section_header.hpp"
 #include "indexer/data_header.hpp"
+#include "indexer/route_relation.hpp"
 
 #include "coding/files_container.hpp"
 #include "coding/geometry_coding.hpp"
@@ -15,6 +16,8 @@ class MetadataDeserializer;
 
 namespace feature
 {
+class FeaturesOffsetsTable;
+
 // This info is created once per FeaturesVector.
 class SharedLoadInfo
 {
@@ -22,12 +25,14 @@ public:
   using Reader = FilesContainerR::TReader;
 
   SharedLoadInfo(FilesContainerR const & cont, DataHeader const & header,
-                 indexer::MetadataDeserializer * metaDeserializer);
+                 feature::FeaturesOffsetsTable const * relTable, indexer::MetadataDeserializer * metaDeserializer);
 
   Reader GetDataReader() const;
   Reader GetGeometryReader(size_t ind) const;
   Reader GetTrianglesReader(size_t ind) const;
 
+  RouteRelationBase ReadRelation(uint32_t id) const;
+
   serial::GeometryCodingParams const & GetDefGeometryCodingParams() const
   {
     return m_header.GetDefGeometryCodingParams();
@@ -47,6 +52,7 @@ private:
   DataHeader const & m_header;
 
 public:
+  feature::FeaturesOffsetsTable const * m_relTable;
   indexer::MetadataDeserializer * m_metaDeserializer;
   feature::DatSectionHeader::Version m_version;
 
diff --git a/libs/map/mwm_tests/multithread_mwm_test.cpp b/libs/map/mwm_tests/multithread_mwm_test.cpp
index 3c441425b..59427f711 100644
--- a/libs/map/mwm_tests/multithread_mwm_test.cpp
+++ b/libs/map/mwm_tests/multithread_mwm_test.cpp
@@ -29,7 +29,8 @@ public:
 
       m_src.ForEachFeature(r, [this](FeatureType & ft)
       {
-        ft.ParseHeader2();
+        ft.ParseAllBeforeGeometry();
+
         (void)ft.GetOuterGeometryStats();
         (void)ft.GetOuterTrianglesStats();
 
diff --git a/libs/routing/routing_integration_tests/concurrent_feature_parsing_test.cpp b/libs/routing/routing_integration_tests/concurrent_feature_parsing_test.cpp
index 7ccde102e..04606cac4 100644
--- a/libs/routing/routing_integration_tests/concurrent_feature_parsing_test.cpp
+++ b/libs/routing/routing_integration_tests/concurrent_feature_parsing_test.cpp
@@ -42,7 +42,7 @@ void TestConcurrentAccessToFeatures(string const & mwm)
   auto const handle = dataSource.GetMwmHandleByCountryFile(countryFile);
   TEST(handle.IsAlive(), (local));
 
-  auto const featureNumber = handle.GetValue()->m_table->size();
+  auto const featureNumber = handle.GetValue()->m_ftTable->size();
   // Note. If hardware_concurrency() returns 0 it means that number of core is not defined.
   // If hardware_concurrency() returns 1 it means that only one core is available.
   // In the both cases 2 threads should be used for this test.
diff --git a/libs/search/mwm_context.cpp b/libs/search/mwm_context.cpp
index d70b37bc6..add1f7700 100644
--- a/libs/search/mwm_context.cpp
+++ b/libs/search/mwm_context.cpp
@@ -17,7 +17,8 @@ void CoverRect(m2::RectD const & rect, int scale, covering::Intervals & result)
 MwmContext::MwmContext(MwmSet::MwmHandle handle)
   : m_handle(std::move(handle))
   , m_value(*m_handle.GetValue())
-  , m_vector(m_value.m_cont, m_value.GetHeader(), m_value.m_table.get(), m_value.m_metaDeserializer.get())
+  , m_vector(m_value.m_cont, m_value.GetHeader(), m_value.m_ftTable.get(), m_value.m_relTable.get(),
+             m_value.m_metaDeserializer.get())
   , m_index(m_value.m_cont.GetReader(INDEX_FILE_TAG))
   , m_centers(m_value)
   , m_editableSource(m_handle)
diff --git a/tools/feature_list/feature_list.cpp b/tools/feature_list/feature_list.cpp
index eec415ca3..079888876 100644
--- a/tools/feature_list/feature_list.cpp
+++ b/tools/feature_list/feature_list.cpp
@@ -194,7 +194,8 @@ public:
 
   void Process(FeatureType & f, map<uint32_t, base::GeoObjectId> const & ft2osm)
   {
-    f.ParseHeader2();
+    f.ParseAllBeforeGeometry();
+
     string const & category = GetReadableType(f);
     auto const & meta = f.GetMetadata();
 

From 729808fd14adb732f2ccdc02947873c607032c8e Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Fri, 22 Aug 2025 22:36:37 +0700
Subject: [PATCH 185/302] [core] Re-add MwmValue::GetRegionData()

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 libs/indexer/mwm_set.cpp | 6 ++++++
 libs/indexer/mwm_set.hpp | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/libs/indexer/mwm_set.cpp b/libs/indexer/mwm_set.cpp
index 58d762e9e..3202fb988 100644
--- a/libs/indexer/mwm_set.cpp
+++ b/libs/indexer/mwm_set.cpp
@@ -388,6 +388,12 @@ MwmValue::MwmValue(LocalCountryFile const & localFile)
     MYTHROW(CorruptedMwmFile, (m_cont.GetFileName()));
 
   m_header.Load(m_cont);
+
+  if (m_cont.IsExist(REGION_INFO_FILE_TAG))
+  {
+    ReaderSource<FilesContainerR::TReader> src(m_cont.GetReader(REGION_INFO_FILE_TAG));
+    m_regionData.Deserialize(src);
+  }
 }
 
 MwmValue::~MwmValue() {}
diff --git a/libs/indexer/mwm_set.hpp b/libs/indexer/mwm_set.hpp
index 0c7fda49c..4f6d07e14 100644
--- a/libs/indexer/mwm_set.hpp
+++ b/libs/indexer/mwm_set.hpp
@@ -385,6 +385,7 @@ public:
 private:
   version::MwmVersion m_version;
   feature::DataHeader m_header;
+  feature::RegionData m_regionData;
 
 public:
   // m_ftTable should always present, m_relTable maybe nullptr.
@@ -399,6 +400,7 @@ public:
   void SetTable(MwmInfoEx & info);
 
   feature::DataHeader const & GetHeader() const { return m_header; }
+  feature::RegionData const & GetRegionData() const { return m_regionData; }
   version::MwmVersion const & GetMwmVersion() const { return m_version; }
   std::string const & GetCountryFileName() const { return m_file.GetCountryName(); }
 

From debea8390879db1d7a99e108f4e965073f9351f8 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Thu, 21 Aug 2025 18:09:59 +0200
Subject: [PATCH 186/302] [android] Keep AppCompat theme for radio button

Signed-off-by: jeanbaptisteC <jeanbaptiste.charron@outlook.fr>
---
 android/app/src/main/res/layout/routing_plan.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/android/app/src/main/res/layout/routing_plan.xml b/android/app/src/main/res/layout/routing_plan.xml
index 86f975c72..d79b19110 100644
--- a/android/app/src/main/res/layout/routing_plan.xml
+++ b/android/app/src/main/res/layout/routing_plan.xml
@@ -43,6 +43,7 @@
 
           <app.organicmaps.widget.RoutingToolbarButton
               android:id="@+id/vehicle"
+              style="@style/Widget.AppCompat.CompoundButton.RadioButton"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:layout_marginStart="@dimen/routing_selector_wheel_margin"
@@ -52,6 +53,7 @@
 
           <app.organicmaps.widget.RoutingToolbarButton
               android:id="@+id/pedestrian"
+              style="@style/Widget.AppCompat.CompoundButton.RadioButton"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:layout_marginStart="12dp"
@@ -62,6 +64,7 @@
 
           <app.organicmaps.widget.RoutingToolbarButton
               android:id="@+id/transit"
+              style="@style/Widget.AppCompat.CompoundButton.RadioButton"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:layout_marginEnd="@dimen/margin_half_plus"
@@ -71,6 +74,7 @@
 
           <app.organicmaps.widget.RoutingToolbarButton
               android:id="@+id/bicycle"
+              style="@style/Widget.AppCompat.CompoundButton.RadioButton"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:layout_marginEnd="12dp"
@@ -80,6 +84,7 @@
 
           <app.organicmaps.widget.RoutingToolbarButton
               android:id="@+id/ruler"
+              style="@style/Widget.AppCompat.CompoundButton.RadioButton"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:layout_marginEnd="12dp"

From f485830c51a7dfb5e926cd6d0775b5a09a86c094 Mon Sep 17 00:00:00 2001
From: Codeberg Translate <translate@codeberg.org>
Date: Tue, 19 Aug 2025 10:50:55 +0000
Subject: [PATCH 187/302] [strings] Update from Codeberg Translate

Co-authored-by: Codeberg Translate <translate@codeberg.org>
Co-authored-by: Weblate <noreply-mt-weblate@weblate.org>
Co-authored-by: alexgabi <alexgabi@noreply.codeberg.org>
Co-authored-by: aoxa <aoxa@noreply.codeberg.org>
Co-authored-by: giopera <giopera@noreply.codeberg.org>
Co-authored-by: loscati <loscati@noreply.codeberg.org>
Translation: CoMaps/Android - Map Feature Types
Translation: CoMaps/Android UI Strings
Translation: CoMaps/Apple AppStore description
Translation: CoMaps/Countries and regions names
Translation: CoMaps/F-Droid app description
Translation: CoMaps/Voice announcements for navigation (TTS)
Translation: CoMaps/iOS - Map Feature Types
Translation: CoMaps/iOS Plist
Translation: CoMaps/iOS Plurals
Translation: CoMaps/iOS UI Strings
---
 .../play/listings/it-IT/full-description.txt  |  4 +-
 .../play/listings/it-IT/short-description.txt |  2 +-
 .../app/src/main/res/values-eu/strings.xml    | 62 ++++++++--------
 .../app/src/main/res/values-it/strings.xml    |  4 +-
 .../src/main/res/values-it/types_strings.xml  | 18 ++---
 data/countries-strings/eu.json/localize.json  |  6 +-
 data/countries-strings/it.json/localize.json  | 48 ++++++-------
 data/sound-strings/fa.json/localize.json      | 10 +--
 data/sound-strings/it.json/localize.json      |  4 +-
 .../eu.lproj/Localizable.strings              | 14 ++--
 .../it.lproj/InfoPlist.strings                |  6 +-
 .../it.lproj/Localizable.strings              |  8 +--
 .../it.lproj/Localizable.stringsdict          |  2 +
 .../it.lproj/LocalizableTypes.strings         | 72 +++++++++----------
 iphone/metadata/it/description.txt            | 10 +--
 iphone/metadata/it/keywords.txt               |  2 +-
 16 files changed, 139 insertions(+), 133 deletions(-)

diff --git a/android/app/src/fdroid/play/listings/it-IT/full-description.txt b/android/app/src/fdroid/play/listings/it-IT/full-description.txt
index 780d8ab24..9bcdb7ae9 100644
--- a/android/app/src/fdroid/play/listings/it-IT/full-description.txt
+++ b/android/app/src/fdroid/play/listings/it-IT/full-description.txt
@@ -1,4 +1,4 @@
-Una app sviluppata dalla comunità, gratuita e open-source, basata su OpenStreetMap e sull'impegno alla trasparenza, al rispetto della Privacy senza scopo di lucro. CoMaps è uno spin-off di Organic Maps, che a sua volta deriva da Maps.ME.
+Una app realizzata dalla community gratuita e open-source, basata su OpenStreetMap e sull'impegno alla trasparenza, al rispetto della Privacy e senza scopo di lucro. CoMaps è uno spin-off di Organic Maps, che a sua volta deriva da Maps.ME.
 
 Leggi delle ragioni del progetto e della sua direzione futura su <b><i>codeberg.org/comaps</i></b>.
 Unisciti alla nostra comunità e aiutaci a creare la migliore app di mappe.
@@ -15,7 +15,7 @@ Unisciti alla nostra comunità e aiutaci a creare la migliore app di mappe.
 
 <b>Funzionalità principali</b>:
 • Scarica mappe dettagliate di luoghi che non sono disponibili su Google Maps
-• Modalità Outdoor con percorsi escursionistici, campeggi, sorgenti d'acqua, picchi, dislivelli ed altro evidenziati
+• Modalità Outdoor con percorsi escursionistici, campeggi, sorgenti d'acqua, picchi, dislivelli ed altri punti d'interesse evidenziati
 • Strade pedonali e piste ciclabili
 • Punti d'interesse come ristoranti, stazioni di benzina, hotel, negozi, luoghi turistici e molto altro
 • Cerca per nome, indirizzo o categoria
diff --git a/android/app/src/fdroid/play/listings/it-IT/short-description.txt b/android/app/src/fdroid/play/listings/it-IT/short-description.txt
index c368e5606..ac9d7e2f7 100644
--- a/android/app/src/fdroid/play/listings/it-IT/short-description.txt
+++ b/android/app/src/fdroid/play/listings/it-IT/short-description.txt
@@ -1 +1 @@
-Navigazione semplice - Immergiti nella tua avventura - Sviluppato dalla comunità
+Navigazione semplice - Immergiti nella tua avventura - Realizzato dalla comunità
diff --git a/android/app/src/main/res/values-eu/strings.xml b/android/app/src/main/res/values-eu/strings.xml
index a1e4a72b6..4dba9e39d 100644
--- a/android/app/src/main/res/values-eu/strings.xml
+++ b/android/app/src/main/res/values-eu/strings.xml
@@ -40,13 +40,13 @@
     <!-- Text in About screen -->
     <string name="about_headline">Proiektu irekia, auzolanean egina</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_1">• Ez iragarkirik, ez jarraipenik, ez datu-bilketarik</string>
+    <string name="about_proposition_1">• Erabiltzeko erraza eta leundua</string>
     <!-- Text in About screen -->
     <string name="about_proposition_2">• Pribatutasunean zentratua eta iragarkirik gabea</string>
     <!-- Text in About screen -->
     <string name="about_proposition_3">• Offline, azkarra eta minimalista</string>
     <!-- Text in About screen -->
-    <string name="about_developed_by_enthusiasts">Zale eta bolondresek sortutako kode irekiko aplikazioa.</string>
+    <string name="about_developed_by_enthusiasts">Guztiz kode irekikoa, irabazi asmorik gabea, erabaki eta finantza gardenak.</string>
     <!-- The button that opens system location settings -->
     <string name="location_settings">Kokapen ezarpenak</string>
     <string name="close">Itxi</string>
@@ -88,7 +88,7 @@
     <!-- Header of settings activity where user defines storage path -->
     <string name="maps_storage">Mapak gordetzeko tokia</string>
     <!-- Detailed description of Maps Storage settings button -->
-    <string name="maps_storage_summary">Hautatu mapak non deskargatu behar diren.</string>
+    <string name="maps_storage_summary">Hautatu mapak zein karpetan deskargatu behar diren.</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Deskargatutako mapak</string>
     <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
@@ -179,9 +179,9 @@
     <!-- Warning message when doing search around current position -->
     <string name="unknown_current_position">Zure kokapena ez da oraindik zehaztu</string>
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
-    <string name="cant_change_this_setting">Barkatu, mapa biltegiratzeko ezarpena desgaituta dago.</string>
+    <string name="cant_change_this_setting">Barkatu, mapa biltegiratzeko ezarpena desgaituta dago</string>
     <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">Mapak deskargatzen ari dira.</string>
+    <string name="downloading_is_active">Mapak deskargatzen ari dira</string>
     <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
     <string name="my_position_share_sms">Ikusi nire uneko kokapena CoMaps-en! %1$s edo %2$s Ez al duzu lineaz kanpoko maparik? Deskargatu hemendik: https://www.comaps.app/download/</string>
     <!-- Subject for emailed bookmark -->
@@ -237,9 +237,9 @@
     <!-- Settings «Route» category: «Tts language» title -->
     <string name="pref_tts_language_title">Ahots hizkuntza</string>
     <!-- Settings «Route» category: «Test Voice Directions» title -->
-    <string name="pref_tts_test_voice_title">Probatu ahots bidezko jarraibideak (TTS, Text-To-Speech)</string>
+    <string name="pref_tts_test_voice_title">Probatu ahots bidezko jarraibideak</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
-    <string name="pref_tts_playing_test_voice">Egiaztatu bolumena edo sistemaren testu-ahotsaren ezarpenak ahotsa entzuten ez baduzu.</string>
+    <string name="pref_tts_playing_test_voice">Egiaztatu bolumena edo sistemaren testu-ahotsaren ezarpenak ahotsa entzuten ez baduzu</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
     <string name="pref_tts_unavailable">Ez dago erabilgarri</string>
     <string name="pref_map_auto_zoom">Zoom automatikoa</string>
@@ -287,7 +287,7 @@
     <string name="downloader_download_all_button">Deskargatu guztiak</string>
     <string name="downloader_downloading">Deskargatzen:</string>
     <!-- Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode -->
-    <string name="downloader_delete_map_while_routing_dialog">Mapa ezabatzeko, gelditu nabigazioa.</string>
+    <string name="downloader_delete_map_while_routing_dialog">Mapa ezabatzeko, gelditu nabigazioa</string>
     <!-- PointsInDifferentMWM -->
     <string name="routing_failed_cross_mwm_building">Eskualde bakarreko mapa batean guztiz bilduta dauden arrastoak soilik sor daitezke.</string>
     <!-- Context menu item for downloader. -->
@@ -299,9 +299,9 @@
     <!-- Item in context menu. -->
     <string name="downloader_update_map">Eguneratu mapa</string>
     <!-- Preference title -->
-    <string name="google_play_services">Google Play Kokapen Zerbitzuak</string>
+    <string name="google_play_services">Google Fused Kokapen Zerbitzuak</string>
     <!-- Preference text -->
-    <string name="pref_use_google_play">Zehaztu azkar zure gutxi gorabeherako kokapena Bluetooth, WiFi edo sare mugikorra erabiliz</string>
+    <string name="pref_use_google_play">GPSa, WiFi-a, sare zelularrak eta abar konbinatzen dituen zerbitzu partikularra. zure kokapena zehatzago zehazteko. Google-ren zerbitzariekin konekta daiteke.</string>
     <!-- Preference title -->
     <!-- Preference description -->
     <!-- Text for routing error dialog -->
@@ -359,18 +359,18 @@
     <string name="dialog_routing_location_turn_on">Aktibatu kokapen zerbitzuak</string>
     <string name="dialog_routing_location_unknown_turn_on">Ezin dira GPS koordenatuak aurkitu. Aktibatu kokapen zerbitzuak arrastoa kalkulatzeko.</string>
     <string name="dialog_routing_unable_locate_route">Ezin da ibilbiderik aurkitu</string>
-    <string name="dialog_routing_cant_build_route">Ezin da ibilbidea sortu.</string>
+    <string name="dialog_routing_cant_build_route">Ezin da ibilbidea sortu</string>
     <string name="dialog_routing_change_start_or_end">Ezarri zure abiapuntua edota helmuga.</string>
     <string name="dialog_routing_change_start">Ezarri abiapuntua</string>
     <string name="dialog_routing_start_not_determined">Ibilbidea ez da sortu. Abiapuntua ezin izan da aurkitu.</string>
     <string name="dialog_routing_select_closer_start">Hautatu errepide batetik gertuko abiapuntua.</string>
     <string name="dialog_routing_change_end">Zehaztu helmuga</string>
     <string name="dialog_routing_end_not_determined">Ibilbidea ez da sortu. Ezin izan da helmuga aurkitu.</string>
-    <string name="dialog_routing_select_closer_end">Hautatu helmuga puntu bat errepide batetik gertu.</string>
-    <string name="dialog_routing_change_intermediate">Ezin izan da tarteko puntua kokatu.</string>
-    <string name="dialog_routing_intermediate_not_determined">Mesedez, zehaztu tarteko puntua.</string>
+    <string name="dialog_routing_select_closer_end">Hautatu helmuga puntu bat errepide batetik gertu</string>
+    <string name="dialog_routing_change_intermediate">Ezin izan da tarteko puntua kokatu</string>
+    <string name="dialog_routing_intermediate_not_determined">Mesedez, zehaztu tarteko puntua</string>
     <string name="dialog_routing_system_error">Sistemaren errorea</string>
-    <string name="dialog_routing_application_error">Ibilbidea ezin izan da sortu aplikazioaren errore baten ondorioz.</string>
+    <string name="dialog_routing_application_error">Ibilbidea ezin izan da sortu aplikazioaren errore baten ondorioz</string>
     <string name="dialog_routing_try_again">Saiatu berriro</string>
     <string name="not_now">Orain ez</string>
     <string name="dialog_routing_download_and_build_cross_route">Mapa deskargatu eta mapa bat baino gehiago hartzen duen ibilbide hobe bat sortu nahi duzu?</string>
@@ -384,17 +384,17 @@
     <string name="hide">Ezkutatu</string>
     <string name="categories">Kategoriak</string>
     <string name="history">Historiala</string>
-    <string name="search_not_found">Barkatu, ez dut ezer aurkitu.</string>
+    <string name="search_not_found">Barkatu, ez da ezer aurkitu</string>
     <!-- The message when user did not find anything in the search. -->
     <string name="search_not_found_query">Deskargatu bilatzen ari zaren eskualdea edo saiatu inguruko herri/hiri izena gehitzen.</string>
     <string name="search_history_title">Bilaketa historia</string>
-    <string name="search_history_text">Ikusi azken bilaketak.</string>
+    <string name="search_history_text">Ikusi azken bilaketak</string>
     <string name="clear_search">Garbitu bilaketa historia</string>
     <string name="p2p_your_location">Zure kokapena</string>
     <string name="p2p_start">Hasi</string>
     <string name="p2p_from_here">Abiapuntua</string>
     <string name="p2p_to_here">Helmuga</string>
-    <string name="p2p_only_from_current">Nabigazioa zure uneko kokapenetik soilik dago erabilgarri.</string>
+    <string name="p2p_only_from_current">Nabigazioa zure uneko kokapenetik soilik dago erabilgarri</string>
     <string name="p2p_reroute_from_current">Zure uneko kokapenetik ibilbide bat antolatzea nahi duzu?</string>
     <!-- Edit open hours/set time and minutes dialog -->
     <string name="next_button">Hurrengoa</string>
@@ -464,14 +464,14 @@
     <string name="email_or_username">Posta elektronikoa edo erabiltzailea</string>
     <string name="editor_add_phone">Gehitu telefonoa</string>
     <string name="level">Solairua</string>
-    <string name="downloader_delete_map_dialog">Mapan egin dituzun aldaketa guztiak maparekin batera ezabatuko dira.</string>
+    <string name="downloader_delete_map_dialog">Mapan egin dituzun aldaketa guztiak maparekin batera ezabatuko dira</string>
     <string name="downloader_update_maps">Eguneratu mapak</string>
     <string name="downloader_mwm_migration_dialog">Ibilbide bat sortzeko, beharrezkoa da mapa guztiak eguneratzea eta ibilbidea berriro planifikatzea.</string>
     <string name="downloader_search_field_hint">Bilatu mapa</string>
-    <string name="common_check_internet_connection_dialog">Mesedez, egiaztatu ezarpenak eta ziurtatu zure gailua Internetera konektatuta dagoela.</string>
+    <string name="common_check_internet_connection_dialog">Mesedez, egiaztatu ezarpenak eta ziurtatu zure gailua Internetera konektatuta dagoela</string>
     <string name="downloader_no_space_title">Leku nahikorik ez</string>
     <string name="downloader_no_space_message">Ezabatu beharrezkoak ez diren datuak</string>
-    <string name="editor_login_error_dialog">Saioa hasteko errorea.</string>
+    <string name="editor_login_error_dialog">Saioa hasteko errorea</string>
     <string name="editor_profile_changes">Egiaztatutako aldaketak</string>
     <string name="editor_focus_map_on_location">Arrastatu mapa gurutzea tokiaren edo negozioaren kokalekuan kokatzeko.</string>
     <string name="editor_edit_place_title">Editatzen</string>
@@ -488,11 +488,11 @@
     <string name="osm_presentation">Komunitateak sortutako OpenStreetMap datuak %s-tik aurrera. Lortu informazio gehiago mapa editatu eta eguneratzeari buruz OpenStreetMap.org helbidean</string>
     <!-- OSM explanation on Android login screen -->
     <string name="login_osm_presentation">OpenStreetMap.org (OSM) mapa libre eta irekia eraikitzeko komunitateko proiektu bat da. CoMaps-en mapen datuen iturri nagusia da eta Wikipediaren antzera funtzionatzen du. Tokiak gehitu edo edita ditzakezu eta mundu osoko milioika erabiltzailerentzat eskuragarri egongo dira. \nSartu komunitatean eta lagundu mapa hobea egiten guztiontzat!</string>
-    <string name="login_to_make_edits_visible">Sortu OpenStreetMap kontu bat edo hasi saioa zure maparen aldaketak munduan argitaratzeko.</string>
+    <string name="login_to_make_edits_visible">Sortu OpenStreetMap kontu bat edo hasi saioa zure maparen aldaketak munduan argitaratzeko</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d/%2$d</string>
     <string name="download_over_mobile_header">Deskargatu sare mugikorreko konexioarekin?</string>
-    <string name="download_over_mobile_message">Oso garestia izan daiteke roaming plan batzuekin edo datu-ibiltaritzarekin.</string>
+    <string name="download_over_mobile_message">Oso garestia izan daiteke roaming plan batzuekin edo datu-ibiltaritzarekin</string>
     <string name="error_enter_correct_house_number">Sartu etxeko zenbaki baliozkoa</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Solairu kopurua ez da %d-tik gorakoa izan behar</string>
@@ -515,8 +515,8 @@
     <string name="editor_category_unsuitable_title">Ezin duzu kategoria egokirik aurkitu?</string>
     <string name="editor_category_unsuitable_text">CoMaps-ek puntu kategoria soilak gehitzeko aukera ematen du, hau da, ez da herririk, errepiderik, lakurik, eraikinen eskemarik, etab. Gehitu kategoria horiek zuzenean <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Begiratu gure <a href="https://www.comaps.app/support/advanced-map-editing/">gida</a> urratsez urrats argibide zehatzak lortzeko.</string>
     <string name="downloader_no_downloaded_maps_title">Ez duzu maparik deskargatu</string>
-    <string name="downloader_no_downloaded_maps_message">Deskargatu mapak kokapena aurkitzeko eta lineaz kanpo nabigatzeko.</string>
-    <string name="current_location_unknown_error_title">Uneko kokapena ezezaguna da.</string>
+    <string name="downloader_no_downloaded_maps_message">Deskargatu mapak kokapena aurkitzeko eta lineaz kanpo nabigatzeko</string>
+    <string name="current_location_unknown_error_title">Uneko kokapena ezezaguna da</string>
     <!-- abbreviation for meters -->
     <string name="m">m</string>
     <!-- abbreviation for kilometers -->
@@ -555,8 +555,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Erabiltzaile guztiei bidali nahi diezu?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Ziurtatu ez duzula datu pertsonalik sartu.</string>
-    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap editoreek aldaketak egiaztatuko dituzte eta zurekin harremanetan jarriko dira zalantzaren bat izanez gero.</string>
+    <string name="editor_share_to_all_dialog_message_1">Ziurtatu ez duzula datu pertsonalik sartu</string>
+    <string name="editor_share_to_all_dialog_message_2">OpenStreetMap editoreek aldaketak egiaztatuko dituzte eta zurekin harremanetan jarriko dira zalantzaren bat izanez gero</string>
     <string name="navigation_stop_button">Gelditu</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Arrastoa grabatzea</string>
@@ -570,10 +570,10 @@
     <string name="mobile_data_option_not_today">Ez erabili gaur</string>
     <string name="mobile_data">Internet mugikorra</string>
     <!-- NOTE to translators: please synchronize your translation with the English one. -->
-    <string name="mobile_data_description">Internet mugikorra behar da tokiei buruzko informazio zehatza bistaratzeko, hala nola argazkiak, prezioak eta iritziak.</string>
+    <string name="mobile_data_description">Internet mugikorra beharrezkoa da mapak eguneratzeko jakinarazpenetarako eta edizioak igotzeko</string>
     <string name="mobile_data_option_never">Ez erabili inoiz</string>
     <string name="mobile_data_option_ask">Galdetu beti</string>
-    <string name="traffic_update_maps_text">Trafiko datuak bistaratzeko, mapak eguneratu behar dira.</string>
+    <string name="traffic_update_maps_text">Trafiko datuak bistaratzeko, mapak eguneratu behar dira</string>
     <string name="big_font">Handitu letra tamaina mapan</string>
     <string name="traffic_update_app">Eguneratu CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
@@ -583,7 +583,7 @@
     <string name="feedback_general">Iritzi orokorra</string>
     <string name="prefs_languages_information">TTS sistema erabiltzen dugu ahots argibideetarako. Android gailu askok Google TTS erabiltzen dute. Google Play-tik deskargatu edo egunera dezakezu (https://play.google.com/store/apps/details?idu003dcom.google.android.tts)</string>
     <string name="prefs_languages_information_off">Zenbait hizkuntzatan, beste ahots-sintetizadore bat edo hizkuntza-pakete gehigarri bat instalatu behar duzu aplikazio-dendatik (Google Play, Galaxy Store, App Gallery, FDroid). \nIreki zure gailuaren Ezarpenak &gt; Hizkuntza eta sarrera &gt; Hizkera &gt; Hizketarako testurako aukerak. \nHemen ahots-sintesiaren ezarpenak kudea ditzakezu (adibidez, hizkuntza pakete bat deskargatu, konexiorik gabe erabiltzeko) edo testu-hizketarako beste motor bat hauta dezakezu.</string>
-    <string name="prefs_languages_information_off_link">Informazio gehiago lortzeko, ikusi gida hau.</string>
+    <string name="prefs_languages_information_off_link">Informazio gehiago lortzeko, ikusi gida hau</string>
     <string name="transliteration_title">Latinezko transliterazioa</string>
     <string name="learn_more">Irakurri gehiago</string>
     <!-- Subway exits for public transport marks on the map -->
@@ -660,7 +660,7 @@
     <!-- Speed camera settings menu option - Never warn (about speedcams) -->
     <string name="pref_tts_speedcams_never">Inoiz ez abisatu</string>
     <string name="power_managment_title">Energia aurrezteko modua</string>
-    <string name="power_managment_description">Energia aurrezteko modua aktibatuta badago, aplikazioak energia kontsumitzen duten funtzioak itzaliko ditu, telefonoaren uneko kargaren arabera.</string>
+    <string name="power_managment_description">Saiatu energiaren erabilera murrizten, funtzionalitateren baten kontura</string>
     <string name="power_managment_setting_never">Inoiz ez</string>
     <string name="power_managment_setting_auto">Automatikoa</string>
     <string name="power_managment_setting_manual_max">Energia aurrezpen handiena</string>
diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml
index 26dc87861..af0c06718 100644
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -6,7 +6,7 @@
     <!-- Button text (should be short) -->
     <string name="cancel">Annulla</string>
     <!-- Button which deletes downloaded country -->
-    <string name="delete">Cancella</string>
+    <string name="delete">Elimina</string>
     <string name="download_maps">Scarica mappe</string>
     <!-- Settings/Downloader - info for country when download fails -->
     <string name="download_has_failed">Download fallito, tocca per riprovare</string>
@@ -914,4 +914,6 @@
     <string name="open_now">Aperto adesso</string>
     <string name="closed_now">Chiuso adesso</string>
     <string name="at">alle %s</string>
+    <string name="osm_note_hint">In alternativa lascia una nota per la community di OpenStreetMap, così un altro utente potrà aggiungere o sistemare questo posto.</string>
+    <string name="osm_note_toast">La nota verrà mandata a OpenStreetMap</string>
 </resources>
diff --git a/android/app/src/main/res/values-it/types_strings.xml b/android/app/src/main/res/values-it/types_strings.xml
index e77c1393c..a4c894c0a 100644
--- a/android/app/src/main/res/values-it/types_strings.xml
+++ b/android/app/src/main/res/values-it/types_strings.xml
@@ -3,9 +3,9 @@
     <!-- SECTION: Types -->
     <string name="type.addr_interpolation">Indirizzo/Quartiere</string>
     <string name="type.addr_interpolation.even">Indirizzo/Quartiere</string>
-    <string name="type.addr_interpolation.odd">Indirizzo/Blocco</string>
+    <string name="type.addr_interpolation.odd">Indirizzo/Quartiere</string>
     <string name="type.aerialway">Impianto a fune</string>
-    <string name="type.aerialway.cable_car">Teleferica</string>
+    <string name="type.aerialway.cable_car">Funivia</string>
     <string name="type.aerialway.chair_lift">Seggiovia</string>
     <string name="type.aerialway.drag_lift">Ski-lift</string>
     <string name="type.aerialway.gondola">Cabinovia</string>
@@ -13,7 +13,7 @@
     <string name="type.aerialway.station">Stazione</string>
     <string name="type.aeroway">Infrastruttura aeroportuale</string>
     <string name="type.aeroway.aerodrome">Aeroporto</string>
-    <string name="type.aeroway.aerodrome.international">Aeroporto</string>
+    <string name="type.aeroway.aerodrome.international">Aeroporto Internazionale</string>
     <string name="type.aeroway.apron">Area di stazionamento per aeromobili</string>
     <string name="type.aeroway.gate">Cancello aeroportuale</string>
     <string name="type.aeroway.helipad">Piattaforma per elicotteri</string>
@@ -900,12 +900,12 @@
     <string name="type.railway.station.subway.montreal">Stazione metropolitana</string>
     <string name="type.railway.station.subway.moscow">Stazione metropolitana</string>
     <string name="type.railway.station.subway.munchen">Stazione metropolitana</string>
-    <string name="type.railway.station.subway.nagoya">Stazione metropolitana di Nagoya</string>
-    <string name="type.railway.station.subway.newyork">Stazione metropolitana di New York</string>
+    <string name="type.railway.station.subway.nagoya">Stazione metropolitana</string>
+    <string name="type.railway.station.subway.newyork">Stazione metropolitana</string>
     <string name="type.railway.station.subway.nnov">Stazione metropolitana</string>
-    <string name="type.railway.station.subway.novosibirsk">Stazione metropolitana di Novosibirsk</string>
-    <string name="type.railway.station.subway.osaka">Stazione metropolitana di Osaka</string>
-    <string name="type.railway.station.subway.oslo">Stazione metropolitana di Oslo</string>
+    <string name="type.railway.station.subway.novosibirsk">Stazione metropolitana</string>
+    <string name="type.railway.station.subway.osaka">Stazione metropolitana</string>
+    <string name="type.railway.station.subway.oslo">Stazione metropolitana</string>
     <string name="type.railway.station.subway.palma">Stazione metropolitana</string>
     <string name="type.railway.station.subway.panama">Stazione metropolitana</string>
     <string name="type.railway.station.subway.paris">Stazione metropolitana</string>
@@ -1389,4 +1389,6 @@
     <string name="type.natural.wetland.tidalflat">Piana di Marea</string>
     <string name="type.natural.wetland.fen">Palude</string>
     <string name="type.leisure.escape_game">Escape Room</string>
+    <string name="type.amenity.ranger_station">Stazione delle guardie forestali</string>
+    <string name="type.landuse.religious">Terreno Religioso</string>
 </resources>
diff --git a/data/countries-strings/eu.json/localize.json b/data/countries-strings/eu.json/localize.json
index 39cc8619c..28dcdfbda 100644
--- a/data/countries-strings/eu.json/localize.json
+++ b/data/countries-strings/eu.json/localize.json
@@ -34,7 +34,7 @@
 "Austria_Burgenland":"Burgenland",
 "Austria_Carinthia":"Carinthia",
 "Austria_Lower Austria_West":"Lower Austria — West",
-"Austria_Lower Austria_Wien":"Viena",
+"Austria_Lower Austria_Wien":"Viena eta Austria Beherea — Ekialdea",
 "Austria_Salzburg":"Salzburgo",
 "Austria_Styria":"Styria",
 "Austria_Tyrol":"Tirol",
@@ -568,8 +568,8 @@
 "Italy_Sardinia":"Sardinia",
 "Italy_Sicily":"Sicily",
 "Italy_Trentino-Alto Adige Sudtirol":"Trentino-South Tyrol",
-"Italy_Tuscany_Grosseto":"Tuscany — Province of Grosseto",
-"Italy_Tuscany_Massa e Carrara":"Tuscany — Province of Massa and Carrara",
+"Italy_Tuscany_Grosseto":"Toskana —Hego Ekialdea",
+"Italy_Tuscany_Massa e Carrara":"Toskana — Ipar Mendebaldea",
 "Italy_Umbria":"Umbria",
 "Italy_Veneto":"Veneto",
 "Italy_Veneto_Belluno":"Province of Belluno",
diff --git a/data/countries-strings/it.json/localize.json b/data/countries-strings/it.json/localize.json
index e066294fb..26fb09372 100644
--- a/data/countries-strings/it.json/localize.json
+++ b/data/countries-strings/it.json/localize.json
@@ -1244,8 +1244,8 @@
 "Mexico_Chihuahua":"Chihuahua",
 "Mexico_Sonora":"Sonora",
 "Nepal_Kathmandu":"Katmandu",
-"Nepal_Madhyamanchal":"regione di Sviluppo Centrale",
-"Nepal_Purwanchal":"regione di Sviluppo Orientale",
+"Nepal_Madhyamanchal":"Regione di Sviluppo Centrale",
+"Nepal_Purwanchal":"Regione di Sviluppo Orientale",
 "Nigeria_North":"Nigeria — Nord",
 "Nigeria_South":"Nigeria — Sud",
 "Norway_Hordaland":"Hordaland",
@@ -1514,7 +1514,7 @@
 "China_Chongqing Description":"Chongqing, Changshou, Kai",
 "China_Fujian Description":"Longyan, Sanming, Shaowu",
 "China_Gansu Description":"Lanzhou, Hongliuwan, Dangchengwan",
-"China_Guangdong Description":"Guangzhou, Shenzhen, Jiāngmén",
+"China_Guangdong Description":"Guangzhou, Shenzhen, Jiangmen",
 "China_Guangxi Description":"Guigang, Dongxing, Wuzhou",
 "China_Guizhou Description":"Guiyang, Liupanshui, Weining",
 "China_Hebei Description":"Pechino",
@@ -1582,7 +1582,7 @@
 "Egypt Description":"Il Cairo",
 "El Salvador Description":"San Salvador, Ahuachapan, Sonsonate",
 "Equatorial Guinea Description":"Malabo, Mongomo, Bata",
-"Eritrea Description":"Asmara, Cheren",
+"Eritrea Description":"Asmara, Cheren, Omhajer",
 "Estonia_East Description":"Põltsamaa linn, Võru, Tartu",
 "Estonia_West Description":"Tallinn, Pärnu, Maardu",
 "Ethiopia Description":"Addis Abeba",
@@ -1781,7 +1781,7 @@
 "India_Karnataka_North Description":"Belagavi, Hubballi, Mangaluru",
 "India_Karnataka_South Description":"Bengaluru, Mysuru, Kolar Gold Fields",
 "India_Kerala Description":"Thiruvananthapuram, Ernakulam, Thrissur",
-"India_Lakshadweep Description":"Kavaratti, Minicoy, agatti village center",
+"India_Lakshadweep Description":"Kavaratti, Minicoy, Agatti",
 "India_Madhya Pradesh Description":"Indore, Bhopal, Gwalior",
 "India_Maharashtra Description":"Mumbai, Pune, Nagpur",
 "India_Manipur Description":"Imphal, Imphal, Jiribam",
@@ -1817,7 +1817,7 @@
 "Isle of Man Description":"Douglas, Onchan",
 "Israel Description":"Tel Aviv-Yafo, Herzliya, Modiin-Maccabim-Reut",
 "Italy_Abruzzo Description":"Pescara, Rosciolo, Pineto",
-"Italy_Aosta Valley Description":"Aosta, Aosta",
+"Italy_Aosta Valley Description":"Quart, Aosta",
 "Italy_Apulia Description":"Foggia",
 "Italy_Basilicata Description":"Potenza, Matera, Melfi",
 "Italy_Calabria Description":"Reggio di Calabria",
@@ -1839,15 +1839,15 @@
 "Italy_Liguria Description":"Genova, La Spezia, La Spezia",
 "Italy_Lombardy_Bergamo Description":"Bergamo",
 "Italy_Lombardy_Brescia Description":"Brescia",
-"Italy_Lombardy_Como Description":"Como, Como",
-"Italy_Lombardy_Cremona Description":"Cremona, Cremona",
+"Italy_Lombardy_Como Description":"Como, Cantù",
+"Italy_Lombardy_Cremona Description":"Cremona",
 "Italy_Lombardy_Lecco Description":"Lecco",
 "Italy_Lombardy_Lodi Description":"Lodi",
-"Italy_Lombardy_Mantua Description":"Mantova, Mantova",
+"Italy_Lombardy_Mantua Description":"Mantova",
 "Italy_Lombardy_Milan Description":"Milano",
 "Italy_Lombardy_Monza and Brianza Description":"Monza",
 "Italy_Lombardy_Pavia Description":"Pavia",
-"Italy_Lombardy_Sondrio Description":"Sondrio, Sondrio",
+"Italy_Lombardy_Sondrio Description":"Sondrio",
 "Italy_Lombardy_Varese Description":"Varese",
 "Italy_Marche Description":"Ancona",
 "Italy_Molise Description":"Campobasso",
@@ -1975,9 +1975,9 @@
 "Nagorno-Karabakh Description":"Khankendi, Shusha, Lachin",
 "Namibia Description":"Windhoek, Opuwo, Eenhana",
 "Nauru Description":"Yaren, Buada, Orro",
-"Nepal_Kathmandu Description":"Katmandu, Katmandu",
+"Nepal_Kathmandu Description":"Katmandu, Patan",
 "Nepal_Madhyamanchal Description":"Bharatpur, Birganj",
-"Nepal_Purwanchal Description":"sarang pada, campa bazzar, Kerkha bajar",
+"Nepal_Purwanchal Description":"Sarang Pada, Campa Bazzar, Kerkha Bajar",
 "Nepal_West Description":"Butwal, Pokhara, Nepalgunj Sub Metropolitan City",
 "Netherlands_Drenthe Description":"Assen, Emmen, Hoogeveen",
 "Netherlands_Flevoland Description":"Almere, Lelystad, Dronten",
@@ -2079,8 +2079,8 @@
 "Russia_Astrakhan Oblast Description":"Astrachan'",
 "Russia_Bashkortostan Description":"Ufa, Sterlitamak, Salavat",
 "Russia_Belgorod Oblast Description":"Belgorod, Stary Oskol, Gubkin",
-"Russia_Bryansk Oblast Description":"Bryansk, Novozybkov, Клинцы",
-"Russia_Buryatia Description":"Ulan-Udė",
+"Russia_Bryansk Oblast Description":"Bryansk, Novozybkov, Klintsy",
+"Russia_Buryatia Description":"Ulan-Ude, Selenduma, Dzhida",
 "Russia_Chechen Republic Description":"Grozny, Urus-Martan, Shali",
 "Russia_Chelyabinsk Oblast Description":"Čeljabinsk, Zlatoust",
 "Russia_Chukotka Autonomous Okrug Description":"Anadyr, Bilibino, Pevek",
@@ -2088,7 +2088,7 @@
 "Russia_Ingushetia Description":"Karabulak",
 "Russia_Irkutsk Oblast Description":"Irkutsk, Bratsk, Angarsk",
 "Russia_Ivanovo Oblast Description":"Ivanovo, Kineshma, Shuya",
-"Russia_Jewish Autonomous Oblast Description":"Birobidžan",
+"Russia_Jewish Autonomous Oblast Description":"Birobidzhan, Obluchye, Nikolayevka",
 "Russia_Kabardino-Balkaria Description":"Nal'čik, Baksan",
 "Russia_Kaliningrad Oblast Description":"Kaliningrad, Sovetsk, Chernyakhovsk",
 "Russia_Kaluga Oblast Description":"Obninsk",
@@ -2102,9 +2102,9 @@
 "Russia_Kostroma Oblast Description":"Kostroma, Buy, Sharya",
 "Russia_Krasnodar Krai Description":"Krasnodar",
 "Russia_Krasnodar Krai_Adygeya Description":"Gelendžik",
-"Russia_Krasnoyarsk Krai_North Description":"Norilsk, Dudinka, Северо-Енисейский",
+"Russia_Krasnoyarsk Krai_North Description":"Norilsk, Dudinka, Severo-Yeniseyskiy",
 "Russia_Krasnoyarsk Krai_South Description":"Krasnoyarsk, Achinsk, Kansk",
-"Russia_Kurgan Oblast Description":"Kurgan, Shadrinsk, Варгаши",
+"Russia_Kurgan Oblast Description":"Kurgan, Shadrinsk, Vargashi",
 "Russia_Kursk Oblast Description":"Kursk, Железногорск, Kurchatov",
 "Russia_Leningradskaya Oblast_Karelsky Description":"Vyborg, Vsevolozhsk, Sertolovo",
 "Russia_Leningradskaya Oblast_Southeast Description":"Gatchina, Sosnoviy Bor, Tikhvin",
@@ -2120,7 +2120,7 @@
 "Russia_North Ossetia-Alania Description":"Vladikavkaz, Mozdok",
 "Russia_Novgorod Oblast Description":"Veliky Novgorod, Borovichi, Staraya Russa",
 "Russia_Novosibirsk Oblast Description":"Novosibirsk, Berdsk, Iskitim",
-"Russia_Omsk Oblast Description":"Omsk, Tara, Исилькуль",
+"Russia_Omsk Oblast Description":"Omsk, Tara, Isilkul",
 "Russia_Orenburg Oblast Description":"Orenburg, Orsk, Novotroitsk",
 "Russia_Oryol Oblast Description":"Oryol, Livny, Mtsensk",
 "Russia_Penza Oblast Description":"Penza, Kuznetsk, Zarecnyy",
@@ -2140,7 +2140,7 @@
 "Russia_Sakhalin Oblast Description":"Yuzhno-Sakhalinsk, Korsakov, Kholmsk",
 "Russia_Samara Oblast Description":"Samara, Tolyatti, Syzran",
 "Russia_Saratov Oblast Description":"Saratov, Engels, Balakovo",
-"Russia_Smolensk Oblast Description":"Smolensk, Вязьма, Roslavl",
+"Russia_Smolensk Oblast Description":"Smolensk, Vyazma, Roslavl",
 "Russia_Stavropol Krai Description":"Stavropol, Pyatigorsk, Kislovodsk",
 "Russia_Sverdlovsk Oblast_Ekaterinburg Description":"Yekaterinburg, Kamensk-Uralsky, Pervouralsk",
 "Russia_Sverdlovsk Oblast_North Description":"Nizhny Tagil, Serov, Novouralsk",
@@ -2300,7 +2300,7 @@
 "US_Alabama_Montgomery Description":"Creola, Centreville, Valley",
 "US_Alaska Description":"Scammon Bay, McGrath, Fort Wainright",
 "US_Arizona_Flagstaff Description":"Cottonwood, Holbrook, Show Low",
-"US_Arizona_Phoenix Description":"Phoenix, Mesa, Mesa",
+"US_Arizona_Phoenix Description":"Phoenix, Mesa",
 "US_Arizona_Tucson Description":"Tucson, South Tucson, Bisbee",
 "US_Arkansas_North Description":"Ward, Cabot, Des Arc",
 "US_Arkansas_South Description":"Stamps, Rockport",
@@ -2330,7 +2330,7 @@
 "US_Georgia_Macon Description":"Grovetown, Perry, Byron",
 "US_Georgia_North Description":"Emerson, Jefferson, Cartersville",
 "US_Georgia_South Description":"De Soto, Santa Claus, Pearson",
-"US_Guam Description":"Dededo Flea (Market), Tumon Golf Driving Range, San José",
+"US_Guam Description":"Dededo Flea Market, Tumon Golf Driving Range, San José",
 "US_Hawaii Description":"Hilo, Kailua-Kona, Kahului",
 "US_Idaho_North Description":"Huetter, Peck, Hayden",
 "US_Idaho_South Description":"Arco, Middleton, Greenleaf",
@@ -2470,13 +2470,13 @@
 "Ukraine_Rivne Oblast Description":"Rivne, Varash (Kuznetsovsk), Dubno",
 "Ukraine_Sumy Oblast Description":"Sumy, Konotop, Shostka",
 "Ukraine_Ternopil Oblast Description":"Ternopil, Chortkiv, Kremenets",
-"Ukraine_Vinnytsia Oblast Description":"Vinnycja",
+"Ukraine_Vinnytsia Oblast Description":"Vinnytsia, Voroshylivka, Zhmerynka",
 "Ukraine_Volyn Oblast Description":"Lutsk, Kovel, Novovolynsk",
 "Ukraine_Zakarpattia Oblast Description":"Užhorod",
 "Ukraine_Zaporizhia Oblast Description":"Melitopol'",
 "Ukraine_Zhytomyr Oblast Description":"Zhytomyr, Berdychiv, Korosten",
 "United Arab Emirates Description":"Abu Dhabi, Dubai, Ajman",
-"United States Virgin Islands Description":"Frederiksted, Christiansted, Christiansted",
+"United States Virgin Islands Description":"Frederiksted, Christiansted",
 "Uruguay Description":"Montevideo, Ciudad de la Costa, Salto",
 "Uzbekistan Description":"Tashkent",
 "Vanuatu Description":"Port Vila, Vao Mainland, Saratamata",
@@ -2484,7 +2484,7 @@
 "Venezuela_South Description":"Maracaibo, Ciudad Guayana, San Cristóbal",
 "Vietnam Description":"Hanoi, Ho Chi Minh City, Vung Tau",
 "Wallis and Futuna Description":"Mata-Utu, Fiua, Tavai",
-"Yemen Description":"San’a",
+"Yemen Description":"Sana'a, Aden",
 "Zambia Description":"Lusaka, Kitwe, Ndola",
 "Zimbabwe Description":"Harare, Hwange, Masvingo",
 "United States of America Short":"USA",
diff --git a/data/sound-strings/fa.json/localize.json b/data/sound-strings/fa.json/localize.json
index fa4e18b89..27d5a9730 100644
--- a/data/sound-strings/fa.json/localize.json
+++ b/data/sound-strings/fa.json/localize.json
@@ -1,15 +1,15 @@
 {
-"make_a_slight_right_turn":"با زاویه کم به راست گردش کنید.",
+"make_a_slight_right_turn":"از راست ادامه دهید.",
 "make_a_slight_right_turn_street":"NULL",
 "make_a_slight_right_turn_street_verb":"NULL",
-"make_a_right_turn":"به راست گردش کنید.",
+"make_a_right_turn":"به راست بگردید.",
 "make_a_right_turn_street":"NULL",
-"make_a_sharp_right_turn":"با زاویه تند به راست گردش کنید.",
+"make_a_sharp_right_turn":"به سوی راست تیز بچرخید.",
 "make_a_sharp_right_turn_street":"NULL",
-"enter_the_roundabout":"به میدان وارد شوید.",
+"enter_the_roundabout":"به میدان اَندر آیید.",
 "enter_the_roundabout_street":"NULL",
 "enter_the_roundabout_street_verb":"NULL",
-"leave_the_roundabout":"از میدان خارج شوید.",
+"leave_the_roundabout":"از میدان بیاُوزید.",
 "leave_the_roundabout_street":"NULL",
 "leave_the_roundabout_street_verb":"NULL",
 "make_a_slight_left_turn":"با زاویه کم به چپ گردش کنید.",
diff --git a/data/sound-strings/it.json/localize.json b/data/sound-strings/it.json/localize.json
index fa6b401a2..05f879762 100644
--- a/data/sound-strings/it.json/localize.json
+++ b/data/sound-strings/it.json/localize.json
@@ -6,10 +6,10 @@
 "make_a_right_turn_street":"NULL",
 "make_a_sharp_right_turn":"Svoltare a destra.",
 "make_a_sharp_right_turn_street":"NULL",
-"enter_the_roundabout":"Entra nella rotonda.",
+"enter_the_roundabout":"Entrare nella rotonda.",
 "enter_the_roundabout_street":"NULL",
 "enter_the_roundabout_street_verb":"NULL",
-"leave_the_roundabout":"Esci dalla rotonda.",
+"leave_the_roundabout":"Uscire dalla rotonda.",
 "leave_the_roundabout_street":"NULL",
 "leave_the_roundabout_street_verb":"NULL",
 "make_a_slight_left_turn":"Rimani sulla sinistra.",
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
index 894851360..9dd24203d 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
@@ -250,7 +250,7 @@
 "pref_tts_language_title" = "Ahots hizkuntza";
 
 /* Settings «Route» category: «Test Voice Directions» title */
-"pref_tts_test_voice_title" = "Probatu ahots bidezko jarraibideak (TTS, Text-To-Speech)";
+"pref_tts_test_voice_title" = "Probatu ahots bidezko jarraibideak";
 
 /* Title for "Other" section in TTS settings. */
 "pref_tts_other_section_title" = "Beste batzuk";
@@ -325,7 +325,7 @@
 "volunteer" = "Boluntario izateko";
 
 /* "Social media" section header in the About screen */
-"follow_us" = "Jarraitu eta jarri gurekin harremanetan";
+"follow_us" = "Jarri gurekin harremanetan";
 
 /* Alert text */
 "email_error_body" = "Posta elektronikoko bezeroa ez da konfiguratu. Mesedez, konfigura ezazu edo erabili beste moduren bat gurekin harremanetan jartzeko %@ helbidean";
@@ -1089,8 +1089,8 @@
 "edit_track" = "Editatu arrastoa";
 "osm_profile_view_notes" = "Oharrak ikusi";
 "osm_profile_view_edit_history" = "Aldaketen historia ikusi";
-"about_proposition_3" = "Transparent and not for profit";
-"pref_mapappearance_title" = "Map Appearance";
-"pref_maplanguage_title" = "Map Language";
-"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
-"pref_maplanguage_local" = "Local Language";
+"about_proposition_3" = "Gardena eta irabazi asmorik gabekoa";
+"pref_mapappearance_title" = "Mapen itxura";
+"pref_maplanguage_title" = "Mapen hizkuntza";
+"transliteration_title_disabled_summary" = "Desgaituta maparako hizkuntza lokala beti erabiltzean";
+"pref_maplanguage_local" = "Hizkuntza lokala";
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/it.lproj/InfoPlist.strings
index b4b56aa09..0aecf51f4 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/InfoPlist.strings
@@ -6,10 +6,10 @@
 "bookmarks_and_tracks" = "Luoghi preferiti e tracce";
 
 /* Used in home screen quick actions. */
-"route" = "Linea";
+"route" = "Percorso";
 
 /* Needed to explain why we always require access to GPS coordinates, and not only when the app is active. */
-"NSLocationAlwaysUsageDescription" = "Il rilevamento della posizione corrente in background è necessario per godere appieno delle funzionalità dell'app. Viene utilizzato per la navigazione e il salvataggio della traccia percorsa di recente.";
+"NSLocationAlwaysUsageDescription" = "Il rilevamento della posizione corrente in background è necessario per godere appieno delle funzionalità dell'app. Viene utilizzata per la navigazione e il salvataggio delle traccie percorse di recente.";
 
 /* Needed to explain why we require access to GPS coordinates when the app is active. */
-"NSLocationWhenInUseUsageDescription" = "La definizione della posizione corrente viene utilizzata nelle opzioni di tracciamento del percorso e salvataggio del percorso effettuato di recente.";
+"NSLocationWhenInUseUsageDescription" = "La posizione corrente viene utilizzata durante la navigazione e per il salvataggio dei percorsi.";
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index 5b64867b7..6f3e92aed 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -6,7 +6,7 @@
 "cancel_download" = "Annulla il download";
 
 /* Button which deletes downloaded country */
-"delete" = "Cancella";
+"delete" = "Elimina";
 "download_maps" = "Scarica mappe";
 
 /* Settings/Downloader - info for country which started downloading */
@@ -1093,6 +1093,6 @@
 "osm_profile_reauthorize" = "Riconnettiti a OpenStreetMap";
 "osm_profile_view_notes" = "Visualizza note";
 "pref_mapappearance_title" = "Aspetto della mappa";
-"pref_maplanguage_title" = "Map Language";
-"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
-"pref_maplanguage_local" = "Local Language";
+"pref_maplanguage_title" = "Lingua della mappa";
+"transliteration_title_disabled_summary" = "Disabilitato quando si usa la lingua locale sulla mappa";
+"pref_maplanguage_local" = "Lingua Locale";
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.stringsdict
index 9b19b8f6f..d374bc7a6 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.stringsdict
@@ -34,6 +34,8 @@
 			<string>d</string>
 			<key>one</key>
 			<string>%d file è stato trovato. Lo vedrai dopo la conversione.</string>
+			<key>many</key>
+			<string>%d file sono stati trovati. Li vedrai dopo la conversione.</string>
 			<key>other</key>
 			<string>%d file sono stati trovati. Li vedrai dopo la conversione.</string>
 		</dict>
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings
index 75906a9ac..72fa12789 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings
@@ -1,8 +1,8 @@
 "type.addr_interpolation" = "Indirizzo/Quartiere";
 "type.addr_interpolation.even" = "Indirizzo/Quartiere";
-"type.addr_interpolation.odd" = "Indirizzo/Blocco";
+"type.addr_interpolation.odd" = "Indirizzo/Quartiere";
 "type.aerialway" = "Impianto a fune";
-"type.aerialway.cable_car" = "Teleferica";
+"type.aerialway.cable_car" = "Funivia";
 "type.aerialway.chair_lift" = "Seggiovia";
 "type.aerialway.drag_lift" = "Ski-lift";
 "type.aerialway.gondola" = "Cabinovia";
@@ -10,7 +10,7 @@
 "type.aerialway.station" = "Stazione";
 "type.aeroway" = "Infrastruttura aeroportuale";
 "type.aeroway.aerodrome" = "Aeroporto";
-"type.aeroway.aerodrome.international" = "Aeroporto";
+"type.aeroway.aerodrome.international" = "Aeroporto Internazionale";
 "type.aeroway.apron" = "Area di stazionamento per aeromobili";
 "type.aeroway.gate" = "Cancello aeroportuale";
 "type.aeroway.helipad" = "Piattaforma per elicotteri";
@@ -1017,50 +1017,50 @@
 "type.railway.station.subway.montreal" = "Stazione metropolitana";
 "type.railway.station.subway.moscow" = "Stazione metropolitana";
 "type.railway.station.subway.munchen" = "Stazione metropolitana";
-"type.railway.station.subway.nagoya" = "Stazione metropolitana di Nagoya";
-"type.railway.station.subway.newyork" = "Stazione metropolitana di New York";
+"type.railway.station.subway.nagoya" = "Stazione metropolitana";
+"type.railway.station.subway.newyork" = "Stazione metropolitana";
 "type.railway.station.subway.nnov" = "Stazione metropolitana";
-"type.railway.station.subway.novosibirsk" = "Stazione metropolitana di Novosibirsk";
-"type.railway.station.subway.osaka" = "Stazione metropolitana di Osaka";
-"type.railway.station.subway.oslo" = "Stazione metropolitana di Oslo";
+"type.railway.station.subway.novosibirsk" = "Stazione metropolitana";
+"type.railway.station.subway.osaka" = "Stazione metropolitana";
+"type.railway.station.subway.oslo" = "Stazione metropolitana";
 "type.railway.station.subway.palma" = "Stazione metropolitana";
-"type.railway.station.subway.panama" = "Stazione metropolitana di Panama";
-"type.railway.station.subway.paris" = "Stazione metropolitana di Parigi";
-"type.railway.station.subway.philadelphia" = "Stazione metropolitana di Filadelfia";
-"type.railway.station.subway.pyongyang" = "Stazione metropolitana di Pyongyang";
+"type.railway.station.subway.panama" = "Stazione metropolitana";
+"type.railway.station.subway.paris" = "Stazione metropolitana";
+"type.railway.station.subway.philadelphia" = "Stazione metropolitana";
+"type.railway.station.subway.pyongyang" = "Stazione metropolitana";
 "type.railway.station.subway.rennes" = "Stazione metropolitana";
 "type.railway.station.subway.rio" = "Stazione metropolitana";
 "type.railway.station.subway.roma" = "Stazione metropolitana";
-"type.railway.station.subway.rotterdam" = "Stazione metropolitana di Rotterdam";
+"type.railway.station.subway.rotterdam" = "Stazione metropolitana";
 "type.railway.station.subway.samara" = "Stazione metropolitana";
 "type.railway.station.subway.santiago" = "Stazione metropolitana";
-"type.railway.station.subway.santo_domingo" = "Stazione metropolitana di Santo Domingo";
+"type.railway.station.subway.santo_domingo" = "Stazione metropolitana";
 "type.railway.station.subway.saopaulo" = "Stazione metropolitana";
-"type.railway.station.subway.sapporo" = "Stazione metropolitana di Sapporo";
-"type.railway.station.subway.sendai" = "Stazione metropolitana di Sendai";
+"type.railway.station.subway.sapporo" = "Stazione metropolitana";
+"type.railway.station.subway.sendai" = "Stazione metropolitana";
 "type.railway.station.subway.sf" = "Stazione metropolitana";
-"type.railway.station.subway.shanghai" = "Stazione metropolitana di Shanghai";
-"type.railway.station.subway.shenzhen" = "Stazione metropolitana di Shenzhen";
+"type.railway.station.subway.shanghai" = "Stazione metropolitana";
+"type.railway.station.subway.shenzhen" = "Stazione metropolitana";
 "type.railway.station.subway.shiraz" = "Stazione metropolitana";
-"type.railway.station.subway.singapore" = "Stazione metropolitana di Singapore";
+"type.railway.station.subway.singapore" = "Stazione metropolitana";
 "type.railway.station.subway.sofia" = "Stazione metropolitana";
 "type.railway.station.subway.spb" = "Stazione metropolitana";
-"type.railway.station.subway.stockholm" = "Stazione metropolitana di Stoccolma";
+"type.railway.station.subway.stockholm" = "Stazione metropolitana";
 "type.railway.station.subway.tabriz" = "Stazione metropolitana";
-"type.railway.station.subway.taipei" = "Stazione metropolitana di Taipei";
-"type.railway.station.subway.taoyuan" = "Stazione metropolitana di Taoyuan";
+"type.railway.station.subway.taipei" = "Stazione metropolitana";
+"type.railway.station.subway.taoyuan" = "Stazione metropolitana";
 "type.railway.station.subway.tashkent" = "Stazione metropolitana";
-"type.railway.station.subway.tbilisi" = "Stazione metropolitana di Tibilisi";
-"type.railway.station.subway.tehran" = "Stazione metropolitana di Teheran";
-"type.railway.station.subway.tianjin" = "Stazione metropolitana di Tientsin";
-"type.railway.station.subway.tokyo" = "Stazione metropolitana di Tokyo";
-"type.railway.station.subway.valencia" = "Stazione metropolitana di Valencia";
-"type.railway.station.subway.vienna" = "Stazione metropolitana di Vienna";
-"type.railway.station.subway.warszawa" = "Stazione metropolitana di Varsavia";
-"type.railway.station.subway.washington" = "Stazione metropolitana di Washington";
-"type.railway.station.subway.wuhan" = "Stazione metropolitana di Wuhan";
-"type.railway.station.subway.yerevan" = "Stazione metropolitana di Erevan";
-"type.railway.station.subway.yokohama" = "Stazione metropolitana di Yokohama";
+"type.railway.station.subway.tbilisi" = "Stazione metropolitana";
+"type.railway.station.subway.tehran" = "Stazione metropolitana";
+"type.railway.station.subway.tianjin" = "Stazione metropolitana";
+"type.railway.station.subway.tokyo" = "Stazione metropolitana";
+"type.railway.station.subway.valencia" = "Stazione metropolitana";
+"type.railway.station.subway.vienna" = "Stazione metropolitana";
+"type.railway.station.subway.warszawa" = "Stazione metropolitana";
+"type.railway.station.subway.washington" = "Stazione metropolitana";
+"type.railway.station.subway.wuhan" = "Stazione metropolitana";
+"type.railway.station.subway.yerevan" = "Stazione metropolitana";
+"type.railway.station.subway.yokohama" = "Stazione metropolitana";
 "type.railway.subway" = "Binari metropolitana";
 "type.railway.subway.bridge" = "Ponte della metropolitana";
 "type.railway.subway.tunnel" = "Tunnel della metropolitana";
@@ -1468,7 +1468,7 @@
 "type.amenity.studio" = "Studio";
 "type.highway.ladder" = "Scala a pioli";
 "type.man_made.crane" = "Gru permanente";
-"type.railway.station.subway.qingdao" = "Stazione metropolitana di Qingdao";
+"type.railway.station.subway.qingdao" = "Stazione metropolitana";
 "type.natural.wetland.swamp" = "Palude";
 "type.natural.wetland.mangrove" = "Mangrovie";
 "type.natural.wetland.tidalflat" = "Piana di Marea";
@@ -1478,7 +1478,7 @@
 "type.natural.wetland.reedbed" = "Giunco";
 "type.leisure.escape_game" = "Escape Room";
 "type.amenity.luggage_locker" = "Deposito Bagagli";
-"type.amenity.ranger_station" = "Ranger Station";
+"type.amenity.ranger_station" = "Stazione delle guardie forestali";
 "type.amenity.bicycle_parking.covered" = "Parcheggio Biciclette Coperto";
 "type.post_office.post_partner" = "Partner Postale";
-"type.landuse.religious" = "Religious Land";
+"type.landuse.religious" = "Terreno Religioso";
diff --git a/iphone/metadata/it/description.txt b/iphone/metadata/it/description.txt
index 09754b9a3..335f29648 100644
--- a/iphone/metadata/it/description.txt
+++ b/iphone/metadata/it/description.txt
@@ -1,22 +1,22 @@
-Una app sviluppata dalla comunità, gratuita e open-source, basata su OpenStreetMap e sull'impegno alla trasparenza, al rispetto della Privacy senza scopo di lucro. CoMaps è uno spin-off di CoMaps, che a sua volta deriva da Maps.ME.
+Una app sviluppata dalla comunità, gratuita e open-source, basata su OpenStreetMap e sull'impegno alla trasparenza, al rispetto della Privacy e senza scopo di lucro. CoMaps è uno spin-off di OrganicMaps, che a sua volta deriva da Maps.ME.
 
 ‣ Semplice ed Elegante: funzionalità semplici e affidabili.
 ‣ Offline: Pianifica e percorri il tuo viaggio senza necessità di essere connesso alla rete, cerca tappe mentre sei in una escursione etc. Tutte le funzionalità dell'app sono pensate per operare senza rete.
 ‣ Rispetta la Privacy: L'app è pensata per rispettare la tua Privacy, non identifica le persone e non registra o colleziona i tuoi dati personali. Senza pubblicità.
 ‣ Preserva la Batteria e lo Spazio in Memoria: Non consuma batteria come altre app di navigazione. Le mappe compatte salvano il prezioso spazio del tuo telefono.
-‣ Gratis e Sviluppata dalla Comunità: Persone come te posso aiutare a migliorare l'app aggiungendo luoghi su OpenStreetMap, testando e dando opinioni sulle funzionalità dell'app e contribuendo al loro sviluppo e sostentamento economico.
+‣ Gratis e Sviluppata dalla Community: Persone come te posso aiutare a migliorare l'app aggiungendo luoghi su OpenStreetMap, testando e dando opinioni sulle funzionalità dell'app e contribuendo al loro sviluppo e sostentamento economico.
 ‣ Aperta e Trasparente nel Processo Decisionale e Finanziario, Senza Scopo di Lucro e Completamente Open Source
 
 Funzionalità principali:
 • Scarica mappe dettagliate di luoghi che non sono disponibili su Google Maps
-• Modalità Outdoor con percorsi escursionistici, campeggi, sorgenti d'acqua, picchi, dislivelli ed altro evidenziati
+• Modalità Outdoor con percorsi escursionistici, campeggi, sorgenti d'acqua, picchi, dislivelli ed altri punti d'interesse evidenziati
 • Strade pedonali e piste ciclabili
 • Punti d'interesse come ristoranti, stazioni di benzina, hotel, negozi, luoghi turistici e molto altro
 • Cerca per nome, indirizzo o categoria
 • Navigazione con assistente vocale a piedi, in bici o in macchina
 • Salva i tuoi luoghi preferiti con un tocco
 • Sincronizzazione iCloud per i preferiti e percorsi
-• Leggi gli articoli Wikipedia Offline
+• Leggi gli articoli di Wikipedia offline
 • Cartina delle metropolitane con direzioni
 • Registrazione del percorso
 • Esporta ed importa i tuoi luoghi preferiti e percorsi nei formati KML, KMZ o GPX
@@ -25,4 +25,4 @@ Funzionalità principali:
 • Supporto CarPlay
 
 La Libertà è Qui
-Esplora la tua nuova avventura, naviga il mondo con Privacy e la comunità in prima linea!
+Esplora la tua nuova avventura, naviga il mondo con Privacy e la community in prima linea!
diff --git a/iphone/metadata/it/keywords.txt b/iphone/metadata/it/keywords.txt
index 3b081c3c9..edcb25ae7 100644
--- a/iphone/metadata/it/keywords.txt
+++ b/iphone/metadata/it/keywords.txt
@@ -1 +1 @@
-mappe,open street maps,osm,viaggio,escursione,bicicletta,guida,offline,privacy,navigazione,gps
+comaps,mappe,open street maps,osm,viaggi,escursione,guida,offline,privacy,navigazione,gps

From 053855bd9743afacd3840f006ade36d12905dd3f Mon Sep 17 00:00:00 2001
From: aoxa <aoxa@noreply.codeberg.org>
Date: Tue, 19 Aug 2025 11:06:33 +0000
Subject: [PATCH 188/302] Translated using Weblate (Persian)

Currently translated at 100.0% (106 of 106 strings)

Translation: CoMaps/Voice announcements for navigation (TTS)
---
 data/sound-strings/fa.json/localize.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/data/sound-strings/fa.json/localize.json b/data/sound-strings/fa.json/localize.json
index 27d5a9730..c9cdd1218 100644
--- a/data/sound-strings/fa.json/localize.json
+++ b/data/sound-strings/fa.json/localize.json
@@ -12,20 +12,20 @@
 "leave_the_roundabout":"از میدان بیاُوزید.",
 "leave_the_roundabout_street":"NULL",
 "leave_the_roundabout_street_verb":"NULL",
-"make_a_slight_left_turn":"با زاویه کم به چپ گردش کنید.",
+"make_a_slight_left_turn":"از چپ ادامه دهید.",
 "make_a_slight_left_turn_street":"NULL",
 "make_a_slight_left_turn_street_verb":"NULL",
-"make_a_left_turn":"به چپ گردش کنید.",
+"make_a_left_turn":"به چپ بگردید.",
 "make_a_left_turn_street":"NULL",
-"make_a_sharp_left_turn":"با زاویه تند به چپ گردش کنید.",
+"make_a_sharp_left_turn":"به سوی چپ تیز بچرخید.",
 "make_a_sharp_left_turn_street":"NULL",
 "make_a_u_turn":"دور بزنید.",
 "make_a_u_turn_street":"NULL",
 "make_a_u_turn_street_verb":"NULL",
-"go_straight":"مستقیم بروید.",
-"exit":"خروج.",
-"onto":"ﺐﻫ",
-"take_exit_number":"خروجﺐﻫ",
+"go_straight":"سر‌راست بروید.",
+"exit":"اوزین.",
+"onto":"به",
+"take_exit_number":"اوزیدن به",
 "take_exit_number_street_verb":"NULL",
 "route_recalculating":"محاسبه مجدد مسیر",
 "destination":"به مقصد خواهيد رسيد.",

From ea588e7ece954fffb8dac5c46ed940f87f503edc Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Sat, 23 Aug 2025 14:22:57 +0700
Subject: [PATCH 189/302] [strings] Fix Wicket gate to upper case

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
index cee9b71b1..60047a9bd 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
@@ -224,7 +224,7 @@
 "type.barrier.retaining_wall" = "Retaining Wall";
 "type.barrier.stile" = "Stile";
 "type.barrier.turnstile" = "Turnstile";
-"type.barrier.wicket_gate" = "Wicket gate";
+"type.barrier.wicket_gate" = "Wicket Gate";
 "type.barrier.swing_gate" = "Swing Gate";
 "type.barrier.toll_booth" = "Toll Booth";
 "type.barrier.wall" = "Wall";

From 795fe0ee0964d07b24f6514d8233a34925b49e1d Mon Sep 17 00:00:00 2001
From: Codeberg Translate <translate@codeberg.org>
Date: Sat, 23 Aug 2025 08:24:09 +0000
Subject: [PATCH 190/302] [strings] Update from Codeberg Translate

Co-authored-by: Anonymous <anonymous@noreply.codeberg.org>
Co-authored-by: Codeberg Translate <translate@codeberg.org>
Co-authored-by: N4ta <codeberg@n4ta.anonaddy.me>
Co-authored-by: Prefill add-on <noreply-addon-prefill@weblate.org>
Co-authored-by: lihaisapossu <lihaisapossu@noreply.codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/comaps/ios/
Translation: CoMaps/Android - Map Feature Types
Translation: CoMaps/Android UI Strings
Translation: CoMaps/iOS - Map Feature Types
Translation: CoMaps/iOS UI Strings
---
 android/app/src/main/res/values-fi/strings.xml   |  4 +++-
 .../app/src/main/res/values-fi/types_strings.xml | 16 +++++++++-------
 android/app/src/main/res/values-pt/strings.xml   |  4 +++-
 .../app/src/main/res/values-pt/types_strings.xml |  2 ++
 .../af.lproj/Localizable.strings                 |  1 -
 .../af.lproj/LocalizableTypes.strings            |  2 ++
 .../ar.lproj/Localizable.strings                 |  1 -
 .../ar.lproj/LocalizableTypes.strings            |  2 ++
 .../ast.lproj/LocalizableTypes.strings           |  2 ++
 .../az.lproj/Localizable.strings                 |  1 -
 .../az.lproj/LocalizableTypes.strings            |  2 ++
 .../be.lproj/Localizable.strings                 |  1 -
 .../be.lproj/LocalizableTypes.strings            |  2 ++
 .../bg.lproj/Localizable.strings                 |  1 -
 .../bg.lproj/LocalizableTypes.strings            |  2 ++
 .../bn.lproj/LocalizableTypes.strings            |  2 ++
 .../ca.lproj/Localizable.strings                 |  1 -
 .../ca.lproj/LocalizableTypes.strings            |  2 ++
 .../cs.lproj/Localizable.strings                 |  1 -
 .../cs.lproj/LocalizableTypes.strings            |  2 ++
 .../cy.lproj/LocalizableTypes.strings            |  2 ++
 .../da.lproj/Localizable.strings                 |  1 -
 .../da.lproj/LocalizableTypes.strings            |  2 ++
 .../de.lproj/Localizable.strings                 |  1 -
 .../de.lproj/LocalizableTypes.strings            |  2 ++
 .../el.lproj/Localizable.strings                 |  1 -
 .../el.lproj/LocalizableTypes.strings            |  2 ++
 .../en-GB.lproj/Localizable.strings              |  1 -
 .../en-GB.lproj/LocalizableTypes.strings         |  2 ++
 .../es-MX.lproj/Localizable.strings              |  1 -
 .../es-MX.lproj/LocalizableTypes.strings         |  2 ++
 .../es.lproj/Localizable.strings                 |  1 -
 .../es.lproj/LocalizableTypes.strings            |  2 ++
 .../et.lproj/Localizable.strings                 |  1 -
 .../et.lproj/LocalizableTypes.strings            |  2 ++
 .../eu.lproj/Localizable.strings                 |  1 -
 .../eu.lproj/LocalizableTypes.strings            |  2 ++
 .../fa.lproj/Localizable.strings                 |  1 -
 .../fa.lproj/LocalizableTypes.strings            |  2 ++
 .../fi.lproj/Localizable.strings                 |  1 -
 .../fi.lproj/LocalizableTypes.strings            | 16 +++++++++-------
 .../fr.lproj/Localizable.strings                 |  1 -
 .../fr.lproj/LocalizableTypes.strings            |  2 ++
 .../gl.lproj/LocalizableTypes.strings            |  2 ++
 .../gsw.lproj/LocalizableTypes.strings           |  2 ++
 .../he.lproj/Localizable.strings                 |  1 -
 .../he.lproj/LocalizableTypes.strings            |  2 ++
 .../hi.lproj/Localizable.strings                 |  1 -
 .../hi.lproj/LocalizableTypes.strings            |  2 ++
 .../hr.lproj/LocalizableTypes.strings            |  2 ++
 .../hu.lproj/Localizable.strings                 |  1 -
 .../hu.lproj/LocalizableTypes.strings            |  2 ++
 .../ia.lproj/LocalizableTypes.strings            |  2 ++
 .../id.lproj/Localizable.strings                 |  1 -
 .../id.lproj/LocalizableTypes.strings            |  2 ++
 .../is.lproj/LocalizableTypes.strings            |  2 ++
 .../it.lproj/Localizable.strings                 |  1 -
 .../it.lproj/LocalizableTypes.strings            |  2 ++
 .../ja.lproj/Localizable.strings                 |  1 -
 .../ja.lproj/LocalizableTypes.strings            |  2 ++
 .../kab.lproj/LocalizableTypes.strings           |  2 ++
 .../ko.lproj/Localizable.strings                 |  1 -
 .../ko.lproj/LocalizableTypes.strings            |  2 ++
 .../lt.lproj/Localizable.strings                 |  1 -
 .../lt.lproj/LocalizableTypes.strings            |  2 ++
 .../lv.lproj/Localizable.strings                 |  1 -
 .../lv.lproj/LocalizableTypes.strings            |  2 ++
 .../ml.lproj/LocalizableTypes.strings            |  2 ++
 .../mr.lproj/Localizable.strings                 |  1 -
 .../mr.lproj/LocalizableTypes.strings            |  2 ++
 .../mt.lproj/Localizable.strings                 |  1 -
 .../mt.lproj/LocalizableTypes.strings            |  2 ++
 .../nb.lproj/Localizable.strings                 |  1 -
 .../nb.lproj/LocalizableTypes.strings            |  2 ++
 .../nl.lproj/Localizable.strings                 |  1 -
 .../nl.lproj/LocalizableTypes.strings            |  2 ++
 .../pl.lproj/Localizable.strings                 |  1 -
 .../pl.lproj/LocalizableTypes.strings            |  2 ++
 .../pt-BR.lproj/Localizable.strings              |  1 -
 .../pt-BR.lproj/LocalizableTypes.strings         |  2 ++
 .../pt.lproj/Localizable.strings                 |  3 +--
 .../pt.lproj/LocalizableTypes.strings            |  2 ++
 .../ro.lproj/Localizable.strings                 |  1 -
 .../ro.lproj/LocalizableTypes.strings            |  2 ++
 .../ru.lproj/Localizable.strings                 |  1 -
 .../sk.lproj/Localizable.strings                 |  1 -
 .../sk.lproj/LocalizableTypes.strings            |  2 ++
 .../sq.lproj/Localizable.strings                 |  2 --
 .../sq.lproj/LocalizableTypes.strings            |  2 ++
 .../sr.lproj/Localizable.strings                 |  1 -
 .../sr.lproj/LocalizableTypes.strings            |  2 ++
 .../sv.lproj/Localizable.strings                 |  1 -
 .../sv.lproj/LocalizableTypes.strings            |  2 ++
 .../sw.lproj/Localizable.strings                 |  1 -
 .../sw.lproj/LocalizableTypes.strings            |  2 ++
 .../th.lproj/Localizable.strings                 |  1 -
 .../th.lproj/LocalizableTypes.strings            |  2 ++
 .../tr.lproj/Localizable.strings                 |  1 -
 .../tr.lproj/LocalizableTypes.strings            |  2 ++
 .../uk.lproj/Localizable.strings                 |  1 -
 .../uk.lproj/LocalizableTypes.strings            |  2 ++
 .../vi.lproj/Localizable.strings                 |  1 -
 .../vi.lproj/LocalizableTypes.strings            |  2 ++
 .../zh-Hans.lproj/Localizable.strings            |  1 -
 .../zh-Hans.lproj/LocalizableTypes.strings       |  2 ++
 .../zh-Hant.lproj/Localizable.strings            |  1 -
 .../zh-Hant.lproj/LocalizableTypes.strings       |  2 ++
 107 files changed, 137 insertions(+), 65 deletions(-)

diff --git a/android/app/src/main/res/values-fi/strings.xml b/android/app/src/main/res/values-fi/strings.xml
index e3c3bc4f2..398ede0d8 100644
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -264,7 +264,7 @@
     <!-- Button in the main menu -->
     <string name="donate">Lahjoita</string>
     <!-- Button in the main Help dialog -->
-    <string name="how_to_support_us">Tue projektia</string>
+    <string name="how_to_support_us">Auta ja paranna CoMapsiä</string>
     <!-- Button in the main Help dialog -->
     <string name="copyright">Tekijänoikeudet</string>
     <!-- Text in menu + Button in the main Help dialog -->
@@ -921,4 +921,6 @@
     <string name="at">kello %s</string>
     <string name="osm_note_toast">Huomio lähetetään OpenStreetMap:iin</string>
     <string name="osm_note_hint">Vaihtoehtoisesti voit jättää huomion OpenStreetMap yhteisölle, jotta joku muu voi lisätä tai korjata paikan tiedot.</string>
+    <string name="delete_track_dialog_title">Poista %s?</string>
+    <string name="share_track">Jaa Reitti</string>
 </resources>
diff --git a/android/app/src/main/res/values-fi/types_strings.xml b/android/app/src/main/res/values-fi/types_strings.xml
index 0ea0b179b..5f4ef46d3 100644
--- a/android/app/src/main/res/values-fi/types_strings.xml
+++ b/android/app/src/main/res/values-fi/types_strings.xml
@@ -706,7 +706,7 @@
     <string name="type.natural.water">Vettä</string>
     <string name="type.natural.wetland">Soistuva maa</string>
     <string name="type.natural.wetland.bog">Suo</string>
-    <string name="type.natural.wetland.marsh">Marsh</string>
+    <string name="type.natural.wetland.marsh">Suo</string>
     <string name="type.office">Toimisto</string>
     <string name="type.office.company">Yhtiön toimisto</string>
     <string name="type.office.estate_agent">Kiinteistönvälittäjä</string>
@@ -1130,7 +1130,7 @@
     <string name="type.shop.baby_goods">Lasten kauppa</string>
     <string name="type.shop.bag">Laukkukauppa</string>
     <string name="type.shop.bed">Sänkykauppa</string>
-    <string name="type.shop.boutique">Boutique</string>
+    <string name="type.shop.boutique">Putiikki</string>
     <string name="type.shop.charity">Hyväntekeväisyysmyymälä</string>
     <string name="type.shop.cheese">Juustokauppa</string>
     <string name="type.shop.craft">Käsityöt</string>
@@ -1269,10 +1269,10 @@
     <string name="type.piste_type.nordic">Latu</string>
     <string name="type.piste_type.sled">Kelkkarata</string>
     <string name="type.piste_type.sled.area">Kelkkarata</string>
-    <string name="type.piste_type.snow_park">Snow Park</string>
+    <string name="type.piste_type.snow_park">Lumipuisto</string>
     <string name="type.piste_type.hike">Lumi vaellusreitti</string>
     <string name="type.piste_type.connection">Pisteen yhteys</string>
-    <string name="type.piste_type.skitour">Skitour Trail</string>
+    <string name="type.piste_type.skitour">Hiihtovaellusreitti</string>
     <string name="type.amenity.events_venue">Tapahtumakeskus</string>
     <string name="type.shop.auction">Huutokauppa</string>
     <string name="type.shop.collector">Keräilyesineet</string>
@@ -1311,7 +1311,7 @@
     <string name="type.route">Reitti</string>
     <string name="type.boundary.administrative.3">Alueellinen raja</string>
     <string name="type.boundary.administrative.4">Alueellinen raja</string>
-    <string name="type.aeroway">Airspace Infrastructure</string>
+    <string name="type.aeroway">Ilmatilan Infrastruktuuri</string>
     <string name="type.aeroway.apron">Lentokentän asemataso</string>
     <string name="type.amenity.vending_machine.excrement_bags">Koirankakkapussiautomaatti</string>
     <string name="type.amenity.biergarten">Olutpuutarha</string>
@@ -1321,7 +1321,7 @@
     <string name="type.amenity.studio">Studio</string>
     <string name="type.barrier.guard_rail">Tiekaide</string>
     <string name="type.leisure.firepit">Tulentekopaikka</string>
-    <string name="type.leisure">Leisure</string>
+    <string name="type.leisure">Vapaa-aika</string>
     <string name="type.internet_access">Internet</string>
     <string name="type.landuse.vineyard">Viinitarha</string>
     <string name="type.landuse.village_green">Maa</string>
@@ -1334,7 +1334,7 @@
     <string name="type.man_made.breakwater">Aallonmurtaja</string>
     <string name="type.leisure.recreation_ground">Virkistysalue</string>
     <string name="type.internet_access.wlan">Internet</string>
-    <string name="type.man_made">Man Made</string>
+    <string name="type.man_made">Ihmisen Tekemä</string>
     <string name="type.fee.yes">$</string>
     <string name="type.organic.yes">Luomu</string>
     <string name="type.leisure.common">Julkinen paikka</string>
@@ -1390,4 +1390,6 @@
     <string name="type.amenity.luggage_locker">Matkatavarasäilytys</string>
     <string name="type.post_office.post_partner">Postikumppani</string>
     <string name="type.amenity.ranger_station">Vartioasema</string>
+    <string name="type.amenity.animal_shelter">Eläinsuoja</string>
+    <string name="type.barrier.wicket_gate">Käyntiovi</string>
 </resources>
diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index 9293383d2..93835e3ae 100644
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -248,7 +248,7 @@
     <!-- Button in the main menu -->
     <string name="donate">Doar</string>
     <!-- Button in the main Help dialog -->
-    <string name="how_to_support_us">Apoie o projeto</string>
+    <string name="how_to_support_us">Voluntarie e melhore CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="copyright">Direitos de autor</string>
     <!-- Text in menu + Button in the main Help dialog -->
@@ -909,4 +909,6 @@
     <string name="at">às %s</string>
     <string name="osm_note_toast">Nota será enviada para o OpenStreetMap</string>
     <string name="osm_note_hint">Ou, em vez disso, deixe uma nota para a comunidade do OpenStreetMap de tal maneira que outra pessoa possa adicionar ou consertar um local aqui.</string>
+    <string name="share_track">Partilhar Trajeto</string>
+    <string name="delete_track_dialog_title">Apagar %s?</string>
 </resources>
diff --git a/android/app/src/main/res/values-pt/types_strings.xml b/android/app/src/main/res/values-pt/types_strings.xml
index 985932f83..d81868aac 100644
--- a/android/app/src/main/res/values-pt/types_strings.xml
+++ b/android/app/src/main/res/values-pt/types_strings.xml
@@ -1392,4 +1392,6 @@
     <string name="type.amenity.ranger_station">Posto de Guardas Florestais</string>
     <string name="type.post_office.post_partner">Parceiro Postal</string>
     <string name="type.natural.wetland.tidalflat">Planície de maré</string>
+    <string name="type.amenity.animal_shelter">Abrigo de Animais</string>
+    <string name="type.barrier.wicket_gate">Postigo</string>
 </resources>
diff --git a/iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings
index ef7902f6b..81d1437ce 100644
--- a/iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings
@@ -750,7 +750,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Gestoor";
-
 "core_entrance" = "Ingang";
 "error_enter_correct_name" = "Voer asb. ’n korrekte naam in";
 "bookmark_lists" = "Lyste";
diff --git a/iphone/Maps/LocalizedStrings/af.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/af.lproj/LocalizableTypes.strings
index c8eb1ea8e..bbcab4832 100644
--- a/iphone/Maps/LocalizedStrings/af.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/af.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.post_office.post_partner" = "Post Partner";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index c577d42d6..960f675c5 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -750,7 +750,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "تم الحفظ";
-
 "core_entrance" = "المدخل";
 "error_enter_correct_name" = "الرجاء إدخال اسم صحيح";
 "bookmark_lists" = "قوائم";
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ar.lproj/LocalizableTypes.strings
index 2bdf234d0..fd7193074 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.post_office.post_partner" = "Post Partner";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/ast.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ast.lproj/LocalizableTypes.strings
index b2d3ed8ae..32ee3695a 100644
--- a/iphone/Maps/LocalizedStrings/ast.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ast.lproj/LocalizableTypes.strings
@@ -1296,3 +1296,5 @@
 "type.post_office.post_partner" = "Post Partner";
 "type.amenity.luggage_locker" = "Luggage Locker";
 "type.amenity.ranger_station" = "Ranger Station";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings
index eab8ca4c6..81a046c23 100644
--- a/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings
@@ -754,7 +754,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Saxlandı";
-
 "core_entrance" = "Giriş";
 "error_enter_correct_name" = "Düzgün ad daxil edin";
 "bookmark_lists" = "Siyahılar";
diff --git a/iphone/Maps/LocalizedStrings/az.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/az.lproj/LocalizableTypes.strings
index aa7940735..ae1c3bb94 100644
--- a/iphone/Maps/LocalizedStrings/az.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/az.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.post_office.post_partner" = "Post Partner";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
index 70608d393..331f9e454 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
@@ -751,7 +751,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Захавана";
-
 "core_entrance" = "Уваход";
 "error_enter_correct_name" = "Увядзіце правільную назву";
 "bookmark_lists" = "Спісы";
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/be.lproj/LocalizableTypes.strings
index a12e7fba8..241ceb35c 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.post_office.post_partner" = "Post Partner";
+"type.amenity.animal_shelter" = "Animal Shelter";
+"type.barrier.wicket_gate" = "Wicket gate";
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
index 17b056fe5..d8a332a15 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
@@ -751,7 +751,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Запазено";
-
 "core_entrance" = "Вход";
 "error_enter_correct_name" = "Моля, въведете правилно име";
 "bookmark_lists" = "Списъци";
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings
index 10a830a94..6c269c83a 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "Станция за рейнджъри";
 "type.amenity.luggage_locker" = "Шкафче за багаж";
 "type.amenity.bicycle_parking.covered" = "Покрит паркинг за колела";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/bn.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/bn.lproj/LocalizableTypes.strings
index d207294ea..861db250d 100644
--- a/iphone/Maps/LocalizedStrings/bn.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/bn.lproj/LocalizableTypes.strings
@@ -1296,3 +1296,5 @@
 "type.post_office.post_partner" = "Post Partner";
 "type.amenity.luggage_locker" = "Luggage Locker";
 "type.amenity.ranger_station" = "Ranger Station";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
index 3fe50164e..ea4d1c7e6 100644
--- a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
@@ -751,7 +751,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "S'ha desat";
-
 "core_entrance" = "Entrada";
 "error_enter_correct_name" = "Introduïu un nom correcte";
 "bookmark_lists" = "Llistes";
diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings
index b102cfb81..b20c2e964 100644
--- a/iphone/Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ca.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.post_office.post_partner" = "Post Partner";
+"type.amenity.animal_shelter" = "Animal Shelter";
+"type.barrier.wicket_gate" = "Wicket gate";
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index 4636899f6..9cf04bf10 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -757,7 +757,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Uloženo";
-
 "core_entrance" = "Vstup";
 "error_enter_correct_name" = "Zadejte prosím správný název";
 "bookmark_lists" = "Seznamy";
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings
index 52c89807d..c945c6a5e 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "Správci parku";
 "type.amenity.bicycle_parking.covered" = "Kryté parkování kol";
 "type.post_office.post_partner" = "Poštovní partner";
+"type.amenity.animal_shelter" = "Animal Shelter";
+"type.barrier.wicket_gate" = "Wicket gate";
diff --git a/iphone/Maps/LocalizedStrings/cy.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/cy.lproj/LocalizableTypes.strings
index 715307cf3..44ee5d8af 100644
--- a/iphone/Maps/LocalizedStrings/cy.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/cy.lproj/LocalizableTypes.strings
@@ -1296,3 +1296,5 @@
 "type.place.city" = "City";
 "type.amenity.parking_entrance.permissive" = "Parking Entrance";
 "type.cuisine.italian_pizza" = "Italian, Pizza";
+"type.amenity.animal_shelter" = "Animal Shelter";
+"type.barrier.wicket_gate" = "Wicket gate";
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
index 70b44b560..08c189ca4 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -754,7 +754,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Gemt";
-
 "core_entrance" = "Indgang";
 "error_enter_correct_name" = "Angiv et korrekt navn";
 "bookmark_lists" = "Lister";
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings
index da54b93c7..6798a37c5 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.post_office.post_partner" = "Postpartner";
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "Overdækket cykelparkering";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
index 0e85295d3..cb60c5417 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -759,7 +759,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Gespeichert";
-
 "core_entrance" = "Eingang";
 "error_enter_correct_name" = "Bitte geben Sie einen korrekten Namen ein";
 "bookmark_lists" = "Listen";
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
index c16f9dc43..f26b984c3 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "Försterstation";
 "type.amenity.bicycle_parking.covered" = "Überdachter Fahrradparkplatz";
 "type.post_office.post_partner" = "Postpartner";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
index acf52facb..497ba2f7f 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -751,7 +751,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Αποθηκεύτηκε";
-
 "core_entrance" = "Είσοδος";
 "error_enter_correct_name" = "Εισάγετε ένα σωστό όνομα";
 "bookmark_lists" = "Λίστες";
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings
index f1578a46d..f468fd15c 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.post_office.post_partner" = "Post Partner";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
index 33b8c12a0..6493bbf29 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -770,7 +770,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Saved";
-
 "core_entrance" = "Entrance";
 "error_enter_correct_name" = "Please enter a correct name";
 "bookmark_lists" = "Lists";
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
index 6c0279c08..e9c10c813 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.post_office.post_partner" = "Post Partner";
+"type.amenity.animal_shelter" = "Animal Shelter";
+"type.barrier.wicket_gate" = "Wicket gate";
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
index a576dbc9c..ecc057664 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -754,7 +754,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Guardado";
-
 "core_entrance" = "Entrada";
 "error_enter_correct_name" = "Introduzca el nombre correcto";
 "bookmark_lists" = "Listas";
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/LocalizableTypes.strings
index 0500944f9..7795a92f5 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.post_office.post_partner" = "Post Partner";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index ae2df2408..be1c79739 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -757,7 +757,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Guardado";
-
 "core_entrance" = "Entrada";
 "error_enter_correct_name" = "Por favor, introduce un nombre válido";
 "bookmark_lists" = "Listas";
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
index 85d3908c7..e16cd3297 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.luggage_locker" = "Casillero de maletas";
 "type.amenity.ranger_station" = "Estación de guardabosques";
 "type.amenity.bicycle_parking.covered" = "Parking de bici cubierto";
+"type.amenity.animal_shelter" = "Animal Shelter";
+"type.barrier.wicket_gate" = "Wicket gate";
diff --git a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
index 48f213853..2183b3109 100644
--- a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
@@ -755,7 +755,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Salvestatud";
-
 "core_entrance" = "Sissepääs";
 "error_enter_correct_name" = "Palun sisesta korrektne nimi";
 "bookmark_lists" = "Loendid";
diff --git a/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings
index 44fed980c..d1b722098 100644
--- a/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "Pargivahi maja";
 "type.amenity.luggage_locker" = "Pagasihoid";
 "type.post_office.post_partner" = "Postiteenused partneri juures";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
index 9dd24203d..3d56befd7 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
@@ -754,7 +754,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Gordeta";
-
 "core_entrance" = "Sarrera";
 "error_enter_correct_name" = "Mesedez, idatzi baliozko izen bat";
 "bookmark_lists" = "Zerrendak";
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings
index 63c0be2b6..43b84f7d6 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "Txirrinduen aparkaleku estalia";
 "type.post_office.post_partner" = "Post Partner";
+"type.amenity.animal_shelter" = "Animal Shelter";
+"type.barrier.wicket_gate" = "Wicket gate";
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
index 979ef3b24..58f1c8a35 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -751,7 +751,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "ذخیره شد";
-
 "core_entrance" = "ورودی";
 "error_enter_correct_name" = "لطفا نام صحیح را وارد کنید";
 "bookmark_lists" = "لیست‌ها";
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings
index 0f269b417..bee1c08cb 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "ایستگاه پوشیده‌ی دوچرخه";
 "type.post_office.post_partner" = "Post Partner";
+"type.amenity.animal_shelter" = "Animal Shelter";
+"type.barrier.wicket_gate" = "Wicket gate";
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index e44345c63..318671360 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -757,7 +757,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Tallennettu";
-
 "core_entrance" = "Sisäänkäynti";
 "error_enter_correct_name" = "Anna oikea nimi";
 "bookmark_lists" = "Luettelot";
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings
index 78b1e0223..51b982167 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings
@@ -8,7 +8,7 @@
 "type.aerialway.gondola" = "Gondolihissi";
 "type.aerialway.mixed_lift" = "Köysirata";
 "type.aerialway.station" = "Köysirata-asema";
-"type.aeroway" = "Airspace Infrastructure";
+"type.aeroway" = "Ilmatilan Infrastruktuuri";
 "type.aeroway.aerodrome" = "Lentokenttä";
 "type.aeroway.aerodrome.international" = "Kansainvälinen lentokenttä";
 "type.aeroway.apron" = "Lentokentän asemataso";
@@ -688,7 +688,7 @@
 "type.landuse.salt_pond" = "Suolalampi";
 "type.landuse.village_green" = "Maa";
 "type.landuse.vineyard" = "Viinitarha";
-"type.leisure" = "Leisure";
+"type.leisure" = "Vapaa-aika";
 "type.leisure.common" = "Julkinen paikka";
 "type.leisure.dog_park" = "Koirien ulkoilupaikka";
 "type.leisure.fitness_centre" = "Kuntosali";
@@ -723,7 +723,7 @@
 "type.leisure.track.area" = "Juoksurata";
 "type.leisure.water_park" = "Vesipuisto";
 "type.leisure.beach_resort" = "Rantalomakohde";
-"type.man_made" = "Man Made";
+"type.man_made" = "Ihmisen Tekemä";
 "type.man_made.breakwater" = "Aallonmurtaja";
 "type.man_made.cairn" = "Kiviröykkiö";
 "type.man_made.chimney" = "Tehtaan piippu";
@@ -810,7 +810,7 @@
 "type.natural.water" = "Vettä";
 "type.natural.wetland" = "Soistuva maa";
 "type.natural.wetland.bog" = "Suo";
-"type.natural.wetland.marsh" = "Marsh";
+"type.natural.wetland.marsh" = "Suo";
 "type.noexit" = "Umpikuja";
 "type.office" = "Toimisto";
 "type.office.company" = "Yhtiön toimisto";
@@ -1286,7 +1286,7 @@
 "type.shop.baby_goods" = "Lasten kauppa";
 "type.shop.bag" = "Laukkukauppa";
 "type.shop.bed" = "Sänkykauppa";
-"type.shop.boutique" = "Boutique";
+"type.shop.boutique" = "Putiikki";
 "type.shop.charity" = "Hyväntekeväisyysmyymälä";
 "type.shop.cheese" = "Juustokauppa";
 "type.shop.craft" = "Käsityöt";
@@ -1438,10 +1438,10 @@
 "type.piste_type.nordic" = "Latu";
 "type.piste_type.sled" = "Kelkkarata";
 "type.piste_type.sled.area" = "Kelkkarata";
-"type.piste_type.snow_park" = "Snow Park";
+"type.piste_type.snow_park" = "Lumipuisto";
 "type.piste_type.hike" = "Lumi vaellusreitti";
 "type.piste_type.connection" = "Pisteen yhteys";
-"type.piste_type.skitour" = "Skitour Trail";
+"type.piste_type.skitour" = "Hiihtovaellusreitti";
 "type.amenity.events_venue" = "Tapahtumakeskus";
 "type.shop.auction" = "Huutokauppa";
 "type.shop.collector" = "Keräilyesineet";
@@ -1482,3 +1482,5 @@
 "type.post_office.post_partner" = "Postikumppani";
 "type.amenity.ranger_station" = "Vartioasema";
 "type.amenity.bicycle_parking.covered" = "Pyöräkatos";
+"type.amenity.animal_shelter" = "Eläinsuoja";
+"type.barrier.wicket_gate" = "Wicket gate";
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index b77364fce..6389af1f1 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -757,7 +757,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Enregistré";
-
 "core_entrance" = "Entrée";
 "error_enter_correct_name" = "Veuillez entrer un nom correct";
 "bookmark_lists" = "Listes";
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings
index d3fbe71fd..d2ee5d93a 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.post_office.post_partner" = "Partenaire de publication";
 "type.amenity.ranger_station" = "Poste de garde forestier";
 "type.amenity.bicycle_parking.covered" = "Parking vélo couvert";
+"type.amenity.animal_shelter" = "Animal Shelter";
+"type.barrier.wicket_gate" = "Wicket gate";
diff --git a/iphone/Maps/LocalizedStrings/gl.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/gl.lproj/LocalizableTypes.strings
index b355684de..3e0de82dc 100644
--- a/iphone/Maps/LocalizedStrings/gl.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/gl.lproj/LocalizableTypes.strings
@@ -1296,3 +1296,5 @@
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.post_office.post_partner" = "Post Partner";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/gsw.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/gsw.lproj/LocalizableTypes.strings
index 036004db0..82d055a3e 100644
--- a/iphone/Maps/LocalizedStrings/gsw.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/gsw.lproj/LocalizableTypes.strings
@@ -1296,3 +1296,5 @@
 "type.amenity.luggage_locker" = "Gepäckschlüüssfach";
 "type.amenity.ranger_station" = "Förschterstation";
 "type.post_office.post_partner" = "Postpartner";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
index e183a9a1f..225f01e6e 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
@@ -751,7 +751,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "נשמר";
-
 "core_entrance" = "כניסה";
 "error_enter_correct_name" = "נא להזין שם תקין";
 "bookmark_lists" = "רשימות";
diff --git a/iphone/Maps/LocalizedStrings/he.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/he.lproj/LocalizableTypes.strings
index adb93d16f..85255e530 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.post_office.post_partner" = "Post Partner";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings
index 11d63e9e7..cd3c3ec9b 100644
--- a/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings
@@ -751,7 +751,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "सहेजी हुई";
-
 "core_entrance" = "Entrance";
 "error_enter_correct_name" = "Please enter a correct name";
 "bookmark_lists" = "सूचियों";
diff --git a/iphone/Maps/LocalizedStrings/hi.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/hi.lproj/LocalizableTypes.strings
index 0e097063f..c70fd01a1 100644
--- a/iphone/Maps/LocalizedStrings/hi.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/hi.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.post_office.post_partner" = "Post Partner";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/hr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/hr.lproj/LocalizableTypes.strings
index 6d397abbd..34cb1ef3b 100644
--- a/iphone/Maps/LocalizedStrings/hr.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/hr.lproj/LocalizableTypes.strings
@@ -1296,3 +1296,5 @@
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.post_office.post_partner" = "Post Partner";
+"type.amenity.animal_shelter" = "Animal Shelter";
+"type.barrier.wicket_gate" = "Wicket gate";
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index 18aa32fa9..103f86ac7 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -751,7 +751,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Mentett";
-
 "core_entrance" = "Bejárat";
 "error_enter_correct_name" = "Adjon meg egy érvényes nevet";
 "bookmark_lists" = "Listák";
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings
index d4d8d7e5f..528efdb8d 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings
@@ -1478,3 +1478,5 @@
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.post_office.post_partner" = "Post Partner";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/ia.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ia.lproj/LocalizableTypes.strings
index 4dc4b8ca2..92fbf6e7a 100644
--- a/iphone/Maps/LocalizedStrings/ia.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ia.lproj/LocalizableTypes.strings
@@ -1296,3 +1296,5 @@
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.post_office.post_partner" = "Post Partner";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
index 6d47552e7..a0f1c6850 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@@ -751,7 +751,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Disimpan";
-
 "core_entrance" = "Tempat masuk";
 "error_enter_correct_name" = "Harap masukkan nama yang benar";
 "bookmark_lists" = "Daftar";
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/id.lproj/LocalizableTypes.strings
index ca7a24d8e..8eaec5c2b 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.luggage_locker" = "Luggage Locker";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.post_office.post_partner" = "Post Partner";
+"type.amenity.animal_shelter" = "Animal Shelter";
+"type.barrier.wicket_gate" = "Wicket gate";
diff --git a/iphone/Maps/LocalizedStrings/is.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/is.lproj/LocalizableTypes.strings
index 0cbad4247..22edd9007 100644
--- a/iphone/Maps/LocalizedStrings/is.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/is.lproj/LocalizableTypes.strings
@@ -1296,3 +1296,5 @@
 "type.amenity.luggage_locker" = "Luggage Locker";
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
+"type.amenity.animal_shelter" = "Animal Shelter";
+"type.barrier.wicket_gate" = "Wicket gate";
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index 6f3e92aed..41ecee610 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -750,7 +750,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Salvato";
-
 "core_entrance" = "Ingresso";
 "error_enter_correct_name" = "Inserire un nome corretto";
 "bookmark_lists" = "Elenchi";
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings
index 72fa12789..60af4f2f8 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.bicycle_parking.covered" = "Parcheggio Biciclette Coperto";
 "type.post_office.post_partner" = "Partner Postale";
 "type.landuse.religious" = "Terreno Religioso";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
index bd26f857c..42bc18cf3 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@@ -757,7 +757,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "保存しました";
-
 "core_entrance" = "入口";
 "error_enter_correct_name" = "正しい名前を入力してください";
 "bookmark_lists" = "リスト";
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings
index 982756411..932298632 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.post_office.post_partner" = "Post Partner";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/kab.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/kab.lproj/LocalizableTypes.strings
index 30626c99e..30bc12496 100644
--- a/iphone/Maps/LocalizedStrings/kab.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/kab.lproj/LocalizableTypes.strings
@@ -1296,3 +1296,5 @@
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.post_office.post_partner" = "Post Partner";
+"type.amenity.animal_shelter" = "Animal Shelter";
+"type.barrier.wicket_gate" = "Wicket gate";
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
index 4fc35dc08..2893a66e0 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@@ -750,7 +750,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "저장됨";
-
 "core_entrance" = "입구";
 "error_enter_correct_name" = "올바른 이름을 입력하세요.";
 "bookmark_lists" = "목록";
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ko.lproj/LocalizableTypes.strings
index 3753e9714..281f33aaf 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.post_office.post_partner" = "Post Partner";
+"type.amenity.animal_shelter" = "Animal Shelter";
+"type.barrier.wicket_gate" = "Wicket gate";
diff --git a/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings
index 669d5e325..6aa6fdea6 100644
--- a/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings
@@ -754,7 +754,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Išsaugota";
-
 "core_entrance" = "Įėjimas";
 "error_enter_correct_name" = "Įveskite teisingą pavadinimą";
 "bookmark_lists" = "Sąrašai";
diff --git a/iphone/Maps/LocalizedStrings/lt.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/lt.lproj/LocalizableTypes.strings
index 274d6c91b..88f514297 100644
--- a/iphone/Maps/LocalizedStrings/lt.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/lt.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.post_office.post_partner" = "Post Partner";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings
index cf0bc47c5..dfbf227e9 100644
--- a/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings
@@ -751,7 +751,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Saglabāts";
-
 "core_entrance" = "Ieeja";
 "error_enter_correct_name" = "Ierakstiet pareizu nosaukumu";
 "bookmark_lists" = "Saraksti";
diff --git a/iphone/Maps/LocalizedStrings/lv.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/lv.lproj/LocalizableTypes.strings
index 5ca15cf76..9bff446ac 100644
--- a/iphone/Maps/LocalizedStrings/lv.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/lv.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.post_office.post_partner" = "Post Partner";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/ml.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ml.lproj/LocalizableTypes.strings
index 1e9e51d92..3189fbb45 100644
--- a/iphone/Maps/LocalizedStrings/ml.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ml.lproj/LocalizableTypes.strings
@@ -1296,3 +1296,5 @@
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.post_office.post_partner" = "Post Partner";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
index 6587155fb..9e1c977a4 100644
--- a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
@@ -748,7 +748,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "जतन केले";
-
 "core_entrance" = "प्रवेशद्वार";
 "error_enter_correct_name" = "कृपया योग्य नाव प्रविष्ट करा";
 "bookmark_lists" = "याद्या";
diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/mr.lproj/LocalizableTypes.strings
index b6c1ed020..ccacfc88c 100644
--- a/iphone/Maps/LocalizedStrings/mr.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/mr.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.post_office.post_partner" = "Post Partner";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings
index 48511c7ea..d4a29bb61 100644
--- a/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings
@@ -750,7 +750,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Salvat";
-
 "core_entrance" = "Daħla";
 "error_enter_correct_name" = "Daħħal isem korrett";
 "bookmark_lists" = "Listi";
diff --git a/iphone/Maps/LocalizedStrings/mt.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/mt.lproj/LocalizableTypes.strings
index 9eeed88c0..fd3b4ef9c 100644
--- a/iphone/Maps/LocalizedStrings/mt.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/mt.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.post_office.post_partner" = "Post Partner";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index 2007281f1..37aa3880a 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -754,7 +754,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Lagret";
-
 "core_entrance" = "Inngang";
 "error_enter_correct_name" = "Skriv inn korrekt navn";
 "bookmark_lists" = "Lister";
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings
index 0e77fa28a..86094b39f 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.post_office.post_partner" = "Post Partner";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index 0bb54bda2..26cbfed30 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -757,7 +757,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Opgeslagen";
-
 "core_entrance" = "Ingang";
 "error_enter_correct_name" = "Voer een geldige naam in";
 "bookmark_lists" = "Lijsten";
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings
index dfa914e42..c01638d24 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "Boswachterkantoor";
 "type.amenity.bicycle_parking.covered" = "Overdekte fietsenstalling";
 "type.post_office.post_partner" = "Post partner";
+"type.amenity.animal_shelter" = "Animal Shelter";
+"type.barrier.wicket_gate" = "Wicket gate";
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index 6d73795a2..febc96684 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -754,7 +754,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Zapisano";
-
 "core_entrance" = "Wejście";
 "error_enter_correct_name" = "Wprowadź poprawną nazwę";
 "bookmark_lists" = "Listy";
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings
index b0f7e10df..358534de6 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.bicycle_parking.covered" = "Zadaszony parking dla rowerów";
 "type.post_office.post_partner" = "Post Partner";
 "type.amenity.ranger_station" = "Ranger Station";
+"type.amenity.animal_shelter" = "Animal Shelter";
+"type.barrier.wicket_gate" = "Wicket gate";
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index ed5fff207..29e450f17 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -757,7 +757,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Salvo";
-
 "core_entrance" = "Entrada";
 "error_enter_correct_name" = "Por favor, digite um nome correto";
 "bookmark_lists" = "Listas";
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings
index 417d1ed9a..988a5e744 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.bicycle_parking.covered" = "Bicicletário coberto";
 "type.post_office.post_partner" = "Parceiro postal";
 "type.amenity.ranger_station" = "Posto de guardas florestais";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index ca6b42121..a241e97de 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -322,7 +322,7 @@
 "report_incorrect_map_bug" = "Comunica ou corrige dados incorretos do mapa";
 
 /* Button in the About screen */
-"volunteer" = "Voluntaria-te";
+"volunteer" = "Voluntaria-te e melhora CoMaps";
 
 /* "Social media" section header in the About screen */
 "follow_us" = "Entra em contacto connosco";
@@ -754,7 +754,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Guardado";
-
 "core_entrance" = "Entrada";
 "error_enter_correct_name" = "Introduza um nome correto";
 "bookmark_lists" = "Listas";
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings
index 28d231015..d11331a40 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "Posto de Guardas Florestais";
 "type.amenity.bicycle_parking.covered" = "Estacionamento de Bicicletas Coberto";
 "type.post_office.post_partner" = "Parceiro Postal";
+"type.barrier.wicket_gate" = "Postigo";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index 68711c3a5..86067e5bf 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -751,7 +751,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Salvat";
-
 "core_entrance" = "Intrare";
 "error_enter_correct_name" = "Introdu un nume corect";
 "bookmark_lists" = "Liste";
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ro.lproj/LocalizableTypes.strings
index 86ac07ab4..630bc2b7b 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.post_office.post_partner" = "Post Partner";
+"type.amenity.animal_shelter" = "Animal Shelter";
+"type.barrier.wicket_gate" = "Wicket gate";
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index b5555b414..670d74c75 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -757,7 +757,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Сохранено";
-
 "core_entrance" = "Вход";
 "error_enter_correct_name" = "Пожалуйста, введите название правильно";
 "bookmark_lists" = "Списки";
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
index 329a8305c..4ec6c719b 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@@ -751,7 +751,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Uložené";
-
 "core_entrance" = "Vchod | vjazd";
 "error_enter_correct_name" = "Prosím, zadajte správne meno";
 "bookmark_lists" = "Zoznamy";
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sk.lproj/LocalizableTypes.strings
index 5bcf32f5d..90b4add9d 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.post_office.post_partner" = "Post Partner";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.amenity.luggage_locker" = "Luggage Locker";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/sq.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sq.lproj/Localizable.strings
index 5f95cc83b..22e129842 100644
--- a/iphone/Maps/LocalizedStrings/sq.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sq.lproj/Localizable.strings
@@ -112,7 +112,6 @@
 "planning_route_manage_route" = "Manage Route";
 "routing_add_finish_point" = "Use search or tap on the map to add a destination point";
 "placepage_add_stop" = "Add Stop";
-"alert_reauth_message_ios" = "Please login to OpenStreetMap to automatically upload all your map edits. Learn more";
 "bookmark_lists" = "Lists";
 "bookmarks_create_new_group" = "Create a new list";
 "error_enter_correct_name" = "Please enter a correct name";
@@ -120,7 +119,6 @@
 "bookmark_lists_show_all" = "Show all";
 "core_entrance" = "Entrance";
 "bookmark_lists_hide_all" = "Hide all";
-"alert_reauth_link_text_ios" = "here";
 "isolines_toast_zooms_1_10" = "Zoom in to explore isolines";
 "copied_to_clipboard" = "Copied to clipboard: %@";
 "placepage_distance" = "Distance";
diff --git a/iphone/Maps/LocalizedStrings/sq.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sq.lproj/LocalizableTypes.strings
index 7331906bf..1e3c46573 100644
--- a/iphone/Maps/LocalizedStrings/sq.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/sq.lproj/LocalizableTypes.strings
@@ -1296,3 +1296,5 @@
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.post_office.post_partner" = "Post Partner";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings
index 925a27aa0..be23078b3 100644
--- a/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings
@@ -754,7 +754,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Сачувано";
-
 "core_entrance" = "Улаз";
 "error_enter_correct_name" = "Молим Вас да унесете исправан назив";
 "bookmark_lists" = "Листе";
diff --git a/iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings
index 10fc06f23..04045e8f2 100644
--- a/iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "Станица за ренџер";
 "type.amenity.bicycle_parking.covered" = "Покривени паркинг за бицикле";
 "type.post_office.post_partner" = "Поштански партнер";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
index 96bb0a6e0..13c92517e 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@@ -751,7 +751,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Sparad";
-
 "core_entrance" = "Ingång";
 "error_enter_correct_name" = "Ange ett korrekt namn";
 "bookmark_lists" = "Listor";
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings
index 1ab2b89ab..3fceac23b 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.post_office.post_partner" = "Post Partner";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
index e8ae307bb..ab6d6a2d9 100644
--- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
@@ -741,7 +741,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Imehifadhiwa";
-
 "core_entrance" = "Kiingilio";
 "error_enter_correct_name" = "Tafadhali, weka jina sahihi";
 "bookmark_lists" = "Orodha";
diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sw.lproj/LocalizableTypes.strings
index 56ae9e617..4fec655ff 100644
--- a/iphone/Maps/LocalizedStrings/sw.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.post_office.post_partner" = "Post Partner";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
index f4aef565f..2b3f8c0fa 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@@ -751,7 +751,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "บันทึกแล้ว";
-
 "core_entrance" = "ทางเข้า";
 "error_enter_correct_name" = "กรุณาใส่ชื่อที่ถูกต้อง";
 "bookmark_lists" = "รายการ";
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/th.lproj/LocalizableTypes.strings
index c6e78504c..a8458b507 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.post_office.post_partner" = "Post Partner";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index a3cf2eaa6..eeb4caa1e 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -757,7 +757,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Kaydedildi";
-
 "core_entrance" = "Giriş";
 "error_enter_correct_name" = "Lütfen doğru ad girin";
 "bookmark_lists" = "Listeler";
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings
index f8e703245..9d95d1563 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.post_office.post_partner" = "Post Partner";
 "type.amenity.ranger_station" = "Ranger Station";
 "type.natural.wetland.tidalflat" = "Tidal Flat";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
index 936cd1c5f..6d4e929a7 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -754,7 +754,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Збережено";
-
 "core_entrance" = "Вхід";
 "error_enter_correct_name" = "Будь ласка, введіть коректне ім'я";
 "bookmark_lists" = "Списки";
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings
index 3aa9d1928..d0bfe2855 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "Лісництво";
 "type.amenity.bicycle_parking.covered" = "Критий велосипедний паркінг";
 "type.post_office.post_partner" = "Поштовий партнер";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
index c813b8ba1..67f09d42d 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@@ -750,7 +750,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "Đã lưu";
-
 "core_entrance" = "Lối vào";
 "error_enter_correct_name" = "Vui lòng nhập một tên chính xác";
 "bookmark_lists" = "Danh sách";
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/vi.lproj/LocalizableTypes.strings
index 06ff20875..489173acd 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "Ranger Station";
 "type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
 "type.post_office.post_partner" = "Post Partner";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index 54886764a..783516a83 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -757,7 +757,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "已保存";
-
 "core_entrance" = "入口";
 "error_enter_correct_name" = "请输入正确的名称";
 "bookmark_lists" = "列表";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings
index eb652b1f6..c5a7abfa6 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "护林站";
 "type.amenity.bicycle_parking.covered" = "有顶棚自行车停车处";
 "type.post_office.post_partner" = "邮政合作点";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
index 7b44b6e12..89869a8ea 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@@ -756,7 +756,6 @@
 
 /* Title for button when a route was saved. */
 "saved" = "已儲存";
-
 "core_entrance" = "入口";
 "error_enter_correct_name" = "請輸入正確的名稱";
 "bookmark_lists" = "列表";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings
index 13065619a..d6c899463 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/LocalizableTypes.strings
@@ -1482,3 +1482,5 @@
 "type.amenity.ranger_station" = "巡警站";
 "type.amenity.bicycle_parking.covered" = "有遮蓋單車停車場";
 "type.post_office.post_partner" = "郵政代辦所";
+"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Animal Shelter";

From d1f9806901895e318f1ffb213e8a334b5ae684ff Mon Sep 17 00:00:00 2001
From: Eivind Samseth <eisa01@gmail.com>
Date: Fri, 8 Aug 2025 19:19:03 +0200
Subject: [PATCH 191/302] [iOS] Add Existence and Opening Hour confirmation to
 Place Page

Signed-off-by: eisa01 <your.email@example.com>
---
 .../PlacePageData/Common/PlacePageInfoData.h  |  4 ++
 .../PlacePageData/Common/PlacePageInfoData.mm | 39 +++++++++++++++++++
 iphone/Maps/Categories/Date+TimeAgo.swift     | 13 +++++++
 .../en.lproj/Localizable.strings              |  6 +++
 iphone/Maps/Maps.xcodeproj/project.pbxproj    |  4 ++
 .../PlacePageHeaderBuilder.swift              |  3 +-
 .../PlacePageHeaderPresenter.swift            | 18 ++++++---
 .../PlacePageHeaderViewController.swift       | 16 +++++++-
 .../PlacePagePreviewViewController.swift      | 15 +++++++
 .../Layouts/PlacePageCommonLayout.swift       |  2 +
 .../Layouts/PlacePageTrackLayout.swift        |  3 ++
 11 files changed, 114 insertions(+), 9 deletions(-)
 create mode 100644 iphone/Maps/Categories/Date+TimeAgo.swift

diff --git a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageInfoData.h b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageInfoData.h
index 06fd51117..2e835b0e3 100644
--- a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageInfoData.h
+++ b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageInfoData.h
@@ -8,6 +8,8 @@ NS_ASSUME_NONNULL_BEGIN
 @interface PlacePageInfoData : NSObject
 
 @property(nonatomic, readonly, nullable) NSString *openingHoursString;
+@property(nonatomic, readonly, nullable) NSDate *checkDate;
+@property(nonatomic, readonly, nullable) NSDate *checkDateOpeningHours;
 @property(nonatomic, readonly, nullable) OpeningHours *openingHours;
 @property(nonatomic, readonly) NSArray<PlacePagePhone *> *phones;
 @property(nonatomic, readonly, nullable) NSString *website;
@@ -38,6 +40,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic, readonly, nullable) NSString *outdoorSeating;
 @property(nonatomic, readonly, nullable) NSString *network;
 
+- (NSDate * _Nullable)getMostRecentCheckDate;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageInfoData.mm b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageInfoData.mm
index 12d0c9025..520402756 100644
--- a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageInfoData.mm
+++ b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageInfoData.mm
@@ -20,8 +20,41 @@ NSString * GetLocalizedMetadataValueString(MapObject::MetadataID metaID, std::st
   return ToNSString(platform::GetLocalizedTypeName(feature::ToString(metaID) + "." + value));
 }
 
+/// Parse date string in YYYY-MM-DD format to NSDate
+NSDate * _Nullable ParseDateString(NSString * _Nullable dateString) {
+  if (!dateString || dateString.length == 0) {
+    return nil;
+  }
+  
+  static NSDateFormatter *dateFormatter = nil;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    dateFormatter = [[NSDateFormatter alloc] init];
+    dateFormatter.dateFormat = @"yyyy-MM-dd";
+    dateFormatter.locale = [[NSLocale alloc] initWithLocaleIdentifier:@"en_US_POSIX"];
+    dateFormatter.timeZone = [NSTimeZone timeZoneWithAbbreviation:@"UTC"];
+  });
+  
+  return [dateFormatter dateFromString:dateString];
+}
+
 @implementation PlacePageInfoData
 
+- (NSDate * _Nullable)getMostRecentCheckDate {
+  // CheckDate can utilize checkDateOpeningHours if that is available
+  // As surveying opening hours would confirm presence
+  if (_checkDate && _checkDateOpeningHours) {
+    // Both available - return the more recent date
+    return [_checkDate compare:_checkDateOpeningHours] == NSOrderedDescending ? _checkDate : _checkDateOpeningHours;
+  } else if (_checkDate) {
+    return _checkDate;
+  } else if (_checkDateOpeningHours) {
+    return _checkDateOpeningHours;
+  } else {
+    return nil;
+  }
+}
+
 @end
 
 @implementation PlacePageInfoData (Core)
@@ -45,6 +78,12 @@ NSString * GetLocalizedMetadataValueString(MapObject::MetadataID metaID, std::st
           _openingHours = [[OpeningHours alloc] initWithRawString:_openingHoursString
                                                      localization:localization];
           break;
+        case MetadataID::FMD_CHECK_DATE:
+          _checkDate = ParseDateString(ToNSString(value));
+          break;
+        case MetadataID::FMD_CHECK_DATE_OPEN_HOURS:
+          _checkDateOpeningHours = ParseDateString(ToNSString(value));
+          break;
         case MetadataID::FMD_PHONE_NUMBER:
         {
           NSArray<NSString *> *phones = [ToNSString(value) componentsSeparatedByString:@";"];
diff --git a/iphone/Maps/Categories/Date+TimeAgo.swift b/iphone/Maps/Categories/Date+TimeAgo.swift
new file mode 100644
index 000000000..be1e60ad5
--- /dev/null
+++ b/iphone/Maps/Categories/Date+TimeAgo.swift
@@ -0,0 +1,13 @@
+import Foundation
+
+extension Date {
+  func formatTimeAgo() -> String {
+    return Self.relativeFormatter.localizedString(for: self, relativeTo: Date())
+  }
+  
+  private static let relativeFormatter: RelativeDateTimeFormatter = {
+    let formatter = RelativeDateTimeFormatter()
+    formatter.unitsStyle = .full
+    return formatter
+  }()
+}
\ No newline at end of file
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
index 2887d8397..aac15f835 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/Localizable.strings
@@ -552,6 +552,12 @@
 "editor_report_problem_send_button" = "Send";
 "autodownload" = "Auto-download maps";
 
+
+
+/* Place page confirmation messages and time ago formatting */
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
+
 /* Place Page opening hours text */
 "closed_now" = "Closed now";
 
diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index 0fbc548b7..8cf5747b1 100644
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -321,6 +321,7 @@
 		676507601C10559800830BB3 /* patterns.txt in Resources */ = {isa = PBXBuildFile; fileRef = 451950391B7A3E070085DA05 /* patterns.txt */; };
 		676507611C10559B00830BB3 /* colors.txt in Resources */ = {isa = PBXBuildFile; fileRef = 452FCA3A1B6A3DF7007019AB /* colors.txt */; };
 		6B9978361C89A316003B8AA0 /* editor.config in Resources */ = {isa = PBXBuildFile; fileRef = 6B9978341C89A316003B8AA0 /* editor.config */; };
+		8325C4E12E45519600457516 /* Date+TimeAgo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8325C4E02E45519600457516 /* Date+TimeAgo.swift */; };
 		8C4FB9C72BEFEFF400D44877 /* CarPlayWindowScaleAdjuster.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C4FB9C62BEFEFF400D44877 /* CarPlayWindowScaleAdjuster.swift */; };
 		8CB13C3B2BF1276A004288F2 /* CarplayPlaceholderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CB13C3A2BF1276A004288F2 /* CarplayPlaceholderView.swift */; };
 		99012847243F0D6900C72B10 /* UIViewController+alternative.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99012846243F0D6900C72B10 /* UIViewController+alternative.swift */; };
@@ -1208,6 +1209,7 @@
 		5605022E1B6211E100169CAD /* sound-strings */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "sound-strings"; path = "../../data/sound-strings"; sourceTree = "<group>"; };
 		6741AA5D1BF340DE002C974C /* CoMaps (Debug).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "CoMaps (Debug).app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		6B9978341C89A316003B8AA0 /* editor.config */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = editor.config; path = ../../data/editor.config; sourceTree = "<group>"; };
+		8325C4E02E45519600457516 /* Date+TimeAgo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Date+TimeAgo.swift"; sourceTree = "<group>"; };
 		8C4FB9C62BEFEFF400D44877 /* CarPlayWindowScaleAdjuster.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarPlayWindowScaleAdjuster.swift; sourceTree = "<group>"; };
 		8CB13C3A2BF1276A004288F2 /* CarplayPlaceholderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarplayPlaceholderView.swift; sourceTree = "<group>"; };
 		8D1107310486CEB800E47090 /* CoMaps.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = CoMaps.plist; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
@@ -2285,6 +2287,7 @@
 		3454D7981E07F045004AF2AD /* Categories */ = {
 			isa = PBXGroup;
 			children = (
+				8325C4E02E45519600457516 /* Date+TimeAgo.swift */,
 				ED83880E2D54DEA4002A0536 /* UIImage+FilledWithColor.swift */,
 				99A614E223CDD1D900D8D8D0 /* UIButton+RuntimeAttributes.h */,
 				99A614E323CDD1D900D8D8D0 /* UIButton+RuntimeAttributes.m */,
@@ -4637,6 +4640,7 @@
 				998927382449E60200260CE2 /* BottomMenuPresenter.swift in Sources */,
 				27697F832E254AA100FBD913 /* EmbeddedSafariView.swift in Sources */,
 				F6E2FE821E097BA00083EBEC /* MWMPlacePageOpeningHoursDayView.m in Sources */,
+				8325C4E12E45519600457516 /* Date+TimeAgo.swift in Sources */,
 				F6E2FD6B1E097BA00083EBEC /* MWMMapDownloaderSubplaceTableViewCell.m in Sources */,
 				CDCA27842245090900167D87 /* ListenerContainer.swift in Sources */,
 				27AF18582E1DB63A00CD41E2 /* Appearance.swift in Sources */,
diff --git a/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderBuilder.swift b/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderBuilder.swift
index 73d52a8e5..389a2da89 100644
--- a/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderBuilder.swift
+++ b/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderBuilder.swift
@@ -5,8 +5,7 @@ class PlacePageHeaderBuilder {
     let storyboard = UIStoryboard.instance(.placePage)
     let viewController = storyboard.instantiateViewController(ofType: PlacePageHeaderViewController.self);
     let presenter = PlacePageHeaderPresenter(view: viewController,
-                                             placePagePreviewData: data.previewData,
-                                             objectType: data.objectType,
+                                             placePageData: data,
                                              delegate: delegate,
                                              headerType: headerType)
 
diff --git a/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderPresenter.swift b/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderPresenter.swift
index daf2b7f32..169dfd25f 100644
--- a/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderPresenter.swift
+++ b/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderPresenter.swift
@@ -23,26 +23,28 @@ class PlacePageHeaderPresenter {
 
   private weak var view: PlacePageHeaderViewProtocol?
   private let placePagePreviewData: PlacePagePreviewData
+  private let placePageData: PlacePageData
   let objectType: PlacePageObjectType
   private weak var delegate: PlacePageHeaderViewControllerDelegate?
   private let headerType: HeaderType
 
   init(view: PlacePageHeaderViewProtocol,
-       placePagePreviewData: PlacePagePreviewData,
-       objectType: PlacePageObjectType,
+       placePageData: PlacePageData,
        delegate: PlacePageHeaderViewControllerDelegate?,
        headerType: HeaderType) {
     self.view = view
     self.delegate = delegate
-    self.placePagePreviewData = placePagePreviewData
-    self.objectType = objectType
+    self.placePageData = placePageData
+    self.placePagePreviewData = placePageData.previewData
+    self.objectType = placePageData.objectType
     self.headerType = headerType
   }
 }
 
 extension PlacePageHeaderPresenter: PlacePageHeaderPresenterProtocol {
   func configure() {
-    view?.setTitle(placePagePreviewData.title, secondaryTitle: placePagePreviewData.secondaryTitle)
+    let existenceConfirmation = getExistenceConfirmationText()
+    view?.setTitle(placePagePreviewData.title, secondaryTitle: placePagePreviewData.secondaryTitle, existenceConfirmation: existenceConfirmation)
     switch headerType {
     case .flexible:
       view?.isExpandViewHidden = false
@@ -68,4 +70,10 @@ extension PlacePageHeaderPresenter: PlacePageHeaderPresenterProtocol {
   func onExportTrackButtonPress(_ type: KmlFileType, from sourceView: UIView) {
     delegate?.previewDidPressExportTrack(type, from: sourceView)
   }
+  
+  private func getExistenceConfirmationText() -> String? {
+    guard let mostRecentDate = placePageData.infoData?.getMostRecentCheckDate() else { return nil }
+    let timeAgoText = mostRecentDate.formatTimeAgo()
+    return String(format: L("existence_confirmed_time_ago"), timeAgoText)
+  }
 }
diff --git a/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderViewController.swift b/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderViewController.swift
index b77bfda01..f04804a03 100644
--- a/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderViewController.swift
+++ b/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderViewController.swift
@@ -3,7 +3,7 @@ protocol PlacePageHeaderViewProtocol: AnyObject {
   var isExpandViewHidden: Bool { get set }
   var isShadowViewHidden: Bool { get set }
 
-  func setTitle(_ title: String?, secondaryTitle: String?)
+  func setTitle(_ title: String?, secondaryTitle: String?, existenceConfirmation: String?)
   func showShareTrackMenu()
 }
 
@@ -77,7 +77,7 @@ extension PlacePageHeaderViewController: PlacePageHeaderViewProtocol {
     }
   }
 
-  func setTitle(_ title: String?, secondaryTitle: String?) {
+  func setTitle(_ title: String?, secondaryTitle: String?, existenceConfirmation: String? = nil) {
     titleText = title
     secondaryText = secondaryTitle
     // XCode 13 is not smart enough to detect that title is used below, and requires explicit unwrapped variable.
@@ -93,6 +93,18 @@ extension PlacePageHeaderViewController: PlacePageHeaderViewProtocol {
 
     let attributedText = NSMutableAttributedString(string: unwrappedTitle, attributes: titleAttributes)
 
+    // Add existence confirmation if available
+    if let existenceText = existenceConfirmation {
+      let existenceParagraphStyle = NSMutableParagraphStyle()
+      existenceParagraphStyle.paragraphSpacingBefore = 1
+      let existenceAttributes: [NSAttributedString.Key: Any] = [
+        .font: UIFont.systemFont(ofSize: 11),
+        .foregroundColor: UIColor.blackSecondaryText(),
+        .paragraphStyle: existenceParagraphStyle
+      ]
+      attributedText.append(NSAttributedString(string: "\n" + existenceText, attributes: existenceAttributes))
+    }
+
     guard let unwrappedSecondaryTitle = secondaryTitle else {
       titleLabel?.attributedText = attributedText
       return
diff --git a/iphone/Maps/UI/PlacePage/Components/PlacePagePreviewViewController.swift b/iphone/Maps/UI/PlacePage/Components/PlacePagePreviewViewController.swift
index 589efd375..638d6b533 100644
--- a/iphone/Maps/UI/PlacePage/Components/PlacePagePreviewViewController.swift
+++ b/iphone/Maps/UI/PlacePage/Components/PlacePagePreviewViewController.swift
@@ -40,6 +40,8 @@ final class PlacePagePreviewViewController: UIViewController {
     }
   }
   
+  var placePageData: PlacePageData?
+  
   private var distance: String? = nil
   private var speedAndAltitude: String? = nil
   private var heading: CGFloat? = nil
@@ -84,6 +86,9 @@ final class PlacePagePreviewViewController: UIViewController {
         subtitleString.append(NSAttributedString(string: !subtitleString.string.isEmpty ? " • " + subtitle : subtitle,
                                                  attributes: [.foregroundColor : UIColor.blackSecondaryText(),
                                                               .font : UIFont.regular14()]))
+      }
+      
+      if !subtitleString.string.isEmpty {
         subtitleLabel.attributedText = subtitleString
         subtitleContainerView.isHidden = false
       } else {
@@ -254,6 +259,16 @@ final class PlacePagePreviewViewController: UIViewController {
                                                           NSAttributedString.Key.foregroundColor: UIColor.blackSecondaryText()])
       attributedString.append(detailsString)
     }
+    
+    if let openingHoursDate = placePageData?.infoData?.checkDateOpeningHours {
+      let timeAgoText = openingHoursDate.formatTimeAgo()
+      let openingHoursDateString = NSAttributedString(string: " • " + String(format: L("hours_confirmed_time_ago"), timeAgoText),
+                                             attributes: [NSAttributedString.Key.font: UIFont.regular12(),
+                                                          NSAttributedString.Key.foregroundColor: UIColor.blackSecondaryText()])
+      attributedString.append(openingHoursDateString)
+    }
+    
     scheduleLabel.attributedText = attributedString
   }
+  
 }
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageCommonLayout.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageCommonLayout.swift
index 151ba5054..e72bf933a 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageCommonLayout.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageCommonLayout.swift
@@ -33,6 +33,7 @@ class PlacePageCommonLayout: NSObject, IPlacePageLayout {
   private lazy var previewViewController: PlacePagePreviewViewController = {
     let vc = storyboard.instantiateViewController(ofType: PlacePagePreviewViewController.self)
     vc.placePagePreviewData = placePageData.previewData
+    vc.placePageData = placePageData
     return vc
   }()
 
@@ -110,6 +111,7 @@ class PlacePageCommonLayout: NSObject, IPlacePageLayout {
       guard let self = self else { return }
       self.actionBarViewController.updateBookmarkButtonState(isSelected: self.placePageData.bookmarkData != nil)
       self.previewViewController.placePagePreviewData = self.placePageData.previewData
+      self.previewViewController.placePageData = self.placePageData
       self.updateBookmarkRelatedSections()
     }
 
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageTrackLayout.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageTrackLayout.swift
index 1126dc04c..3759de22e 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageTrackLayout.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageTrackLayout.swift
@@ -28,6 +28,7 @@ class PlacePageTrackLayout: IPlacePageLayout {
   private lazy var previewViewController: PlacePagePreviewViewController = {
     let vc = storyboard.instantiateViewController(ofType: PlacePagePreviewViewController.self)
     vc.placePagePreviewData = placePageData.previewData
+    vc.placePageData = placePageData
     return vc
   }()
 
@@ -80,6 +81,7 @@ class PlacePageTrackLayout: IPlacePageLayout {
     placePageData.onBookmarkStatusUpdate = { [weak self] in
       guard let self = self else { return }
       self.previewViewController.placePagePreviewData = self.placePageData.previewData
+      self.previewViewController.placePageData = self.placePageData
       self.updateTrackRelatedSections()
     }
 
@@ -113,6 +115,7 @@ private extension PlacePageTrackLayout {
     }
     if let previewViewController = headerViewControllers.compactMap({ $0 as? PlacePagePreviewViewController }).first {
       previewViewController.placePagePreviewData = previewData
+      previewViewController.placePageData = self.placePageData
       previewViewController.updateViews()
     }
     presenter?.layoutIfNeeded()

From c616e235a1704fc2839f16a048d96b8f13163cee Mon Sep 17 00:00:00 2001
From: Yannik Bloscheck <git@yannikbloscheck.com>
Date: Fri, 22 Aug 2025 20:22:43 +0200
Subject: [PATCH 192/302] [ios] Update design of existence and opening hour
 confirmation for place page

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
---
 iphone/Maps/Categories/Date+TimeAgo.swift     | 13 ----
 .../Contents.json                             | 38 +++++++++++
 .../en-GB.lproj/Localizable.strings           |  4 ++
 iphone/Maps/Maps.xcodeproj/project.pbxproj    |  4 --
 .../OpeningHoursViewController.swift          | 21 ++++++
 .../PlacePageHeaderBuilder.swift              |  3 +-
 .../PlacePageHeaderPresenter.swift            | 18 ++---
 .../PlacePageHeaderViewController.swift       | 16 +----
 .../PlacePageInfoViewController.swift         | 25 +++++--
 .../PlacePagePreviewViewController.swift      | 14 ----
 iphone/Maps/UI/PlacePage/PlacePage.storyboard | 66 +++++++++++++++++--
 .../Layouts/PlacePageCommonLayout.swift       |  2 -
 .../Layouts/PlacePageTrackLayout.swift        |  3 -
 .../PlacePage/PlacePageViewController.swift   |  4 +-
 14 files changed, 152 insertions(+), 79 deletions(-)
 delete mode 100644 iphone/Maps/Categories/Date+TimeAgo.swift
 create mode 100644 iphone/Maps/Images.xcassets/Place Page/Press Background Color.colorset/Contents.json

diff --git a/iphone/Maps/Categories/Date+TimeAgo.swift b/iphone/Maps/Categories/Date+TimeAgo.swift
deleted file mode 100644
index be1e60ad5..000000000
--- a/iphone/Maps/Categories/Date+TimeAgo.swift
+++ /dev/null
@@ -1,13 +0,0 @@
-import Foundation
-
-extension Date {
-  func formatTimeAgo() -> String {
-    return Self.relativeFormatter.localizedString(for: self, relativeTo: Date())
-  }
-  
-  private static let relativeFormatter: RelativeDateTimeFormatter = {
-    let formatter = RelativeDateTimeFormatter()
-    formatter.unitsStyle = .full
-    return formatter
-  }()
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/Place Page/Press Background Color.colorset/Contents.json b/iphone/Maps/Images.xcassets/Place Page/Press Background Color.colorset/Contents.json
new file mode 100644
index 000000000..87b87e8a0
--- /dev/null
+++ b/iphone/Maps/Images.xcassets/Place Page/Press Background Color.colorset/Contents.json	
@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.961",
+          "green" : "0.961",
+          "red" : "0.961"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.118",
+          "green" : "0.110",
+          "red" : "0.110"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
index 6493bbf29..ef24a760a 100644
--- a/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/en-GB.lproj/Localizable.strings
@@ -533,6 +533,10 @@
 "editor_report_problem_send_button" = "Send";
 "autodownload" = "Auto-download maps";
 
+/* Place page confirmation messages and time ago formatting */
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
+
 /* Place Page opening hours text */
 "closed_now" = "Closed now";
 
diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index 8cf5747b1..0fbc548b7 100644
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -321,7 +321,6 @@
 		676507601C10559800830BB3 /* patterns.txt in Resources */ = {isa = PBXBuildFile; fileRef = 451950391B7A3E070085DA05 /* patterns.txt */; };
 		676507611C10559B00830BB3 /* colors.txt in Resources */ = {isa = PBXBuildFile; fileRef = 452FCA3A1B6A3DF7007019AB /* colors.txt */; };
 		6B9978361C89A316003B8AA0 /* editor.config in Resources */ = {isa = PBXBuildFile; fileRef = 6B9978341C89A316003B8AA0 /* editor.config */; };
-		8325C4E12E45519600457516 /* Date+TimeAgo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8325C4E02E45519600457516 /* Date+TimeAgo.swift */; };
 		8C4FB9C72BEFEFF400D44877 /* CarPlayWindowScaleAdjuster.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8C4FB9C62BEFEFF400D44877 /* CarPlayWindowScaleAdjuster.swift */; };
 		8CB13C3B2BF1276A004288F2 /* CarplayPlaceholderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CB13C3A2BF1276A004288F2 /* CarplayPlaceholderView.swift */; };
 		99012847243F0D6900C72B10 /* UIViewController+alternative.swift in Sources */ = {isa = PBXBuildFile; fileRef = 99012846243F0D6900C72B10 /* UIViewController+alternative.swift */; };
@@ -1209,7 +1208,6 @@
 		5605022E1B6211E100169CAD /* sound-strings */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "sound-strings"; path = "../../data/sound-strings"; sourceTree = "<group>"; };
 		6741AA5D1BF340DE002C974C /* CoMaps (Debug).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "CoMaps (Debug).app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		6B9978341C89A316003B8AA0 /* editor.config */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = editor.config; path = ../../data/editor.config; sourceTree = "<group>"; };
-		8325C4E02E45519600457516 /* Date+TimeAgo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Date+TimeAgo.swift"; sourceTree = "<group>"; };
 		8C4FB9C62BEFEFF400D44877 /* CarPlayWindowScaleAdjuster.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarPlayWindowScaleAdjuster.swift; sourceTree = "<group>"; };
 		8CB13C3A2BF1276A004288F2 /* CarplayPlaceholderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarplayPlaceholderView.swift; sourceTree = "<group>"; };
 		8D1107310486CEB800E47090 /* CoMaps.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = CoMaps.plist; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
@@ -2287,7 +2285,6 @@
 		3454D7981E07F045004AF2AD /* Categories */ = {
 			isa = PBXGroup;
 			children = (
-				8325C4E02E45519600457516 /* Date+TimeAgo.swift */,
 				ED83880E2D54DEA4002A0536 /* UIImage+FilledWithColor.swift */,
 				99A614E223CDD1D900D8D8D0 /* UIButton+RuntimeAttributes.h */,
 				99A614E323CDD1D900D8D8D0 /* UIButton+RuntimeAttributes.m */,
@@ -4640,7 +4637,6 @@
 				998927382449E60200260CE2 /* BottomMenuPresenter.swift in Sources */,
 				27697F832E254AA100FBD913 /* EmbeddedSafariView.swift in Sources */,
 				F6E2FE821E097BA00083EBEC /* MWMPlacePageOpeningHoursDayView.m in Sources */,
-				8325C4E12E45519600457516 /* Date+TimeAgo.swift in Sources */,
 				F6E2FD6B1E097BA00083EBEC /* MWMMapDownloaderSubplaceTableViewCell.m in Sources */,
 				CDCA27842245090900167D87 /* ListenerContainer.swift in Sources */,
 				27AF18582E1DB63A00CD41E2 /* Appearance.swift in Sources */,
diff --git a/iphone/Maps/UI/PlacePage/Components/OpeningHoursViewController.swift b/iphone/Maps/UI/PlacePage/Components/OpeningHoursViewController.swift
index 835055edf..8e5b0e769 100644
--- a/iphone/Maps/UI/PlacePage/Components/OpeningHoursViewController.swift
+++ b/iphone/Maps/UI/PlacePage/Components/OpeningHoursViewController.swift
@@ -43,6 +43,9 @@ class OpeningHoursDayViewController: UIViewController {
 
 class OpeningHoursViewController: UIViewController {
   @IBOutlet var stackView: UIStackView!
+  @IBOutlet var checkDateLabel: UILabel!
+  @IBOutlet var checkDateLabelTopLayoutConstraint: NSLayoutConstraint!
+  @IBOutlet var checkDateLabelBottomLayoutConstraint: NSLayoutConstraint!
 
   private var otherDaysViews: [OpeningHoursDayViewController] = []
 
@@ -56,6 +59,7 @@ class OpeningHoursViewController: UIViewController {
   private var expanded = false
 
   var openingHours: OpeningHours!
+  var openingHoursCheckDate: Date?
 
   override func viewDidLoad() {
     super.viewDidLoad()
@@ -79,6 +83,23 @@ class OpeningHoursViewController: UIViewController {
         self.otherDaysViews.forEach { vc in
           vc.view.isHidden = !self.expanded
         }
+
+        if let checkDate = self.openingHoursCheckDate, self.expanded {
+          let checkDateFormatter = RelativeDateTimeFormatter()
+          checkDateFormatter.unitsStyle = .spellOut
+          checkDateFormatter.localizedString(for: checkDate, relativeTo: Date.now)
+          self.checkDateLabel.text = String(format: L("hours_confirmed_time_ago"),  checkDateFormatter.localizedString(for: checkDate, relativeTo: Date.now))
+
+          NSLayoutConstraint.activate([self.checkDateLabelTopLayoutConstraint])
+          NSLayoutConstraint.activate([self.checkDateLabelBottomLayoutConstraint])
+        } else {
+          self.checkDateLabel.text = String()
+
+          NSLayoutConstraint.deactivate([self.checkDateLabelTopLayoutConstraint])
+          NSLayoutConstraint.deactivate([self.checkDateLabelBottomLayoutConstraint])
+        }
+        self.checkDateLabel.isHidden = !self.expanded
+
         self.todayView.arrowImageView.transform = self.expanded ? CGAffineTransform(rotationAngle: -CGFloat.pi + 0.01)
                                                                 : CGAffineTransform.identity
         self.view.layoutIfNeeded()
diff --git a/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderBuilder.swift b/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderBuilder.swift
index 389a2da89..73d52a8e5 100644
--- a/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderBuilder.swift
+++ b/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderBuilder.swift
@@ -5,7 +5,8 @@ class PlacePageHeaderBuilder {
     let storyboard = UIStoryboard.instance(.placePage)
     let viewController = storyboard.instantiateViewController(ofType: PlacePageHeaderViewController.self);
     let presenter = PlacePageHeaderPresenter(view: viewController,
-                                             placePageData: data,
+                                             placePagePreviewData: data.previewData,
+                                             objectType: data.objectType,
                                              delegate: delegate,
                                              headerType: headerType)
 
diff --git a/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderPresenter.swift b/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderPresenter.swift
index 169dfd25f..daf2b7f32 100644
--- a/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderPresenter.swift
+++ b/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderPresenter.swift
@@ -23,28 +23,26 @@ class PlacePageHeaderPresenter {
 
   private weak var view: PlacePageHeaderViewProtocol?
   private let placePagePreviewData: PlacePagePreviewData
-  private let placePageData: PlacePageData
   let objectType: PlacePageObjectType
   private weak var delegate: PlacePageHeaderViewControllerDelegate?
   private let headerType: HeaderType
 
   init(view: PlacePageHeaderViewProtocol,
-       placePageData: PlacePageData,
+       placePagePreviewData: PlacePagePreviewData,
+       objectType: PlacePageObjectType,
        delegate: PlacePageHeaderViewControllerDelegate?,
        headerType: HeaderType) {
     self.view = view
     self.delegate = delegate
-    self.placePageData = placePageData
-    self.placePagePreviewData = placePageData.previewData
-    self.objectType = placePageData.objectType
+    self.placePagePreviewData = placePagePreviewData
+    self.objectType = objectType
     self.headerType = headerType
   }
 }
 
 extension PlacePageHeaderPresenter: PlacePageHeaderPresenterProtocol {
   func configure() {
-    let existenceConfirmation = getExistenceConfirmationText()
-    view?.setTitle(placePagePreviewData.title, secondaryTitle: placePagePreviewData.secondaryTitle, existenceConfirmation: existenceConfirmation)
+    view?.setTitle(placePagePreviewData.title, secondaryTitle: placePagePreviewData.secondaryTitle)
     switch headerType {
     case .flexible:
       view?.isExpandViewHidden = false
@@ -70,10 +68,4 @@ extension PlacePageHeaderPresenter: PlacePageHeaderPresenterProtocol {
   func onExportTrackButtonPress(_ type: KmlFileType, from sourceView: UIView) {
     delegate?.previewDidPressExportTrack(type, from: sourceView)
   }
-  
-  private func getExistenceConfirmationText() -> String? {
-    guard let mostRecentDate = placePageData.infoData?.getMostRecentCheckDate() else { return nil }
-    let timeAgoText = mostRecentDate.formatTimeAgo()
-    return String(format: L("existence_confirmed_time_ago"), timeAgoText)
-  }
 }
diff --git a/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderViewController.swift b/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderViewController.swift
index f04804a03..b77bfda01 100644
--- a/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderViewController.swift
+++ b/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderViewController.swift
@@ -3,7 +3,7 @@ protocol PlacePageHeaderViewProtocol: AnyObject {
   var isExpandViewHidden: Bool { get set }
   var isShadowViewHidden: Bool { get set }
 
-  func setTitle(_ title: String?, secondaryTitle: String?, existenceConfirmation: String?)
+  func setTitle(_ title: String?, secondaryTitle: String?)
   func showShareTrackMenu()
 }
 
@@ -77,7 +77,7 @@ extension PlacePageHeaderViewController: PlacePageHeaderViewProtocol {
     }
   }
 
-  func setTitle(_ title: String?, secondaryTitle: String?, existenceConfirmation: String? = nil) {
+  func setTitle(_ title: String?, secondaryTitle: String?) {
     titleText = title
     secondaryText = secondaryTitle
     // XCode 13 is not smart enough to detect that title is used below, and requires explicit unwrapped variable.
@@ -93,18 +93,6 @@ extension PlacePageHeaderViewController: PlacePageHeaderViewProtocol {
 
     let attributedText = NSMutableAttributedString(string: unwrappedTitle, attributes: titleAttributes)
 
-    // Add existence confirmation if available
-    if let existenceText = existenceConfirmation {
-      let existenceParagraphStyle = NSMutableParagraphStyle()
-      existenceParagraphStyle.paragraphSpacingBefore = 1
-      let existenceAttributes: [NSAttributedString.Key: Any] = [
-        .font: UIFont.systemFont(ofSize: 11),
-        .foregroundColor: UIColor.blackSecondaryText(),
-        .paragraphStyle: existenceParagraphStyle
-      ]
-      attributedText.append(NSAttributedString(string: "\n" + existenceText, attributes: existenceAttributes))
-    }
-
     guard let unwrappedSecondaryTitle = secondaryTitle else {
       titleLabel?.attributedText = attributedText
       return
diff --git a/iphone/Maps/UI/PlacePage/Components/PlacePageInfoViewController.swift b/iphone/Maps/UI/PlacePage/Components/PlacePageInfoViewController.swift
index b04e0938b..d148e3586 100644
--- a/iphone/Maps/UI/PlacePage/Components/PlacePageInfoViewController.swift
+++ b/iphone/Maps/UI/PlacePage/Components/PlacePageInfoViewController.swift
@@ -159,6 +159,8 @@ class PlacePageInfoViewController: UIViewController {
   private typealias Style = InfoItemView.Style
 
   @IBOutlet var stackView: UIStackView!
+  @IBOutlet var checkDateLabel: UILabel!
+  @IBOutlet var checkDateLabelLayoutConstraint: NSLayoutConstraint!
 
   private lazy var openingHoursViewController: OpeningHoursViewController = {
     storyboard!.instantiateViewController(ofType: OpeningHoursViewController.self)
@@ -207,13 +209,8 @@ class PlacePageInfoViewController: UIViewController {
     stackView.alignment = .fill
     stackView.spacing = 0
     stackView.translatesAutoresizingMaskIntoConstraints = false
+    stackView.addSeparator(.bottom)
     view.addSubview(stackView)
-    NSLayoutConstraint.activate([
-      stackView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
-      stackView.trailingAnchor.constraint(equalTo: view.trailingAnchor),
-      stackView.topAnchor.constraint(equalTo: view.topAnchor),
-      stackView.bottomAnchor.constraint(equalTo: view.bottomAnchor)
-    ])
     setupViews()
   }
 
@@ -221,6 +218,7 @@ class PlacePageInfoViewController: UIViewController {
   private func setupViews() {
     if let openingHours = placePageInfoData.openingHours {
       openingHoursViewController.openingHours = openingHours
+      openingHoursViewController.openingHoursCheckDate = placePageInfoData.checkDateOpeningHours
       addChild(openingHoursViewController)
       addToStack(openingHoursViewController.view)
       openingHoursViewController.didMove(toParent: self)
@@ -436,7 +434,7 @@ class PlacePageInfoViewController: UIViewController {
       })
     }
 	
-	  if let panoramax = placePageInfoData.panoramax {
+    if let panoramax = placePageInfoData.panoramax {
       panoramaxView = createInfoItem(L("panoramax_picture"),
                                 icon: UIImage(named: "ic_placepage_panoramax"),
                                 style: .link,
@@ -458,6 +456,19 @@ class PlacePageInfoViewController: UIViewController {
 
     setupCoordinatesView()
     setupOpenWithAppView()
+
+    if let checkDate = placePageInfoData.checkDate {
+      let checkDateFormatter = RelativeDateTimeFormatter()
+      checkDateFormatter.unitsStyle = .spellOut
+      checkDateFormatter.localizedString(for: checkDate, relativeTo: Date.now)
+      self.checkDateLabel.text = String(format: L("existence_confirmed_time_ago"),  checkDateFormatter.localizedString(for: checkDate, relativeTo: Date.now))
+        checkDateLabel.isHidden = false
+      NSLayoutConstraint.activate([checkDateLabelLayoutConstraint])
+    } else {
+      checkDateLabel.text = String()
+      checkDateLabel.isHidden = true
+      NSLayoutConstraint.deactivate([checkDateLabelLayoutConstraint])
+    }
   }
 
   private func setupCoordinatesView() {
diff --git a/iphone/Maps/UI/PlacePage/Components/PlacePagePreviewViewController.swift b/iphone/Maps/UI/PlacePage/Components/PlacePagePreviewViewController.swift
index 638d6b533..77a564457 100644
--- a/iphone/Maps/UI/PlacePage/Components/PlacePagePreviewViewController.swift
+++ b/iphone/Maps/UI/PlacePage/Components/PlacePagePreviewViewController.swift
@@ -40,8 +40,6 @@ final class PlacePagePreviewViewController: UIViewController {
     }
   }
   
-  var placePageData: PlacePageData?
-  
   private var distance: String? = nil
   private var speedAndAltitude: String? = nil
   private var heading: CGFloat? = nil
@@ -86,9 +84,6 @@ final class PlacePagePreviewViewController: UIViewController {
         subtitleString.append(NSAttributedString(string: !subtitleString.string.isEmpty ? " • " + subtitle : subtitle,
                                                  attributes: [.foregroundColor : UIColor.blackSecondaryText(),
                                                               .font : UIFont.regular14()]))
-      }
-      
-      if !subtitleString.string.isEmpty {
         subtitleLabel.attributedText = subtitleString
         subtitleContainerView.isHidden = false
       } else {
@@ -260,15 +255,6 @@ final class PlacePagePreviewViewController: UIViewController {
       attributedString.append(detailsString)
     }
     
-    if let openingHoursDate = placePageData?.infoData?.checkDateOpeningHours {
-      let timeAgoText = openingHoursDate.formatTimeAgo()
-      let openingHoursDateString = NSAttributedString(string: " • " + String(format: L("hours_confirmed_time_ago"), timeAgoText),
-                                             attributes: [NSAttributedString.Key.font: UIFont.regular12(),
-                                                          NSAttributedString.Key.foregroundColor: UIColor.blackSecondaryText()])
-      attributedString.append(openingHoursDateString)
-    }
-    
     scheduleLabel.attributedText = attributedString
   }
-  
 }
diff --git a/iphone/Maps/UI/PlacePage/PlacePage.storyboard b/iphone/Maps/UI/PlacePage/PlacePage.storyboard
index fb1963bfe..891a528e3 100644
--- a/iphone/Maps/UI/PlacePage/PlacePage.storyboard
+++ b/iphone/Maps/UI/PlacePage/PlacePage.storyboard
@@ -4,6 +4,7 @@
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23721"/>
+        <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="Stack View standard spacing" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -391,16 +392,39 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="pmL-HT-I1N">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="100"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="96"/>
                             </stackView>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NMf-TU-1P1">
+                                <rect key="frame" x="0.0" y="96" width="375" height="4"/>
+                                <subviews>
+                                    <label userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="1000" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WIw-cD-4aR">
+                                        <rect key="frame" x="18" y="4" width="339" height="0.0"/>
+                                        <color key="backgroundColor" name="Press Background Color"/>
+                                        <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
+                                        <color key="textColor" systemColor="secondaryLabelColor"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                </subviews>
+                                <color key="backgroundColor" name="Press Background Color"/>
+                                <constraints>
+                                    <constraint firstItem="WIw-cD-4aR" firstAttribute="leading" secondItem="NMf-TU-1P1" secondAttribute="leading" constant="18" id="1c4-qC-r5Q"/>
+                                    <constraint firstItem="WIw-cD-4aR" firstAttribute="top" secondItem="NMf-TU-1P1" secondAttribute="top" constant="4" id="4a9-bg-siG"/>
+                                    <constraint firstItem="WIw-cD-4aR" firstAttribute="top" secondItem="NMf-TU-1P1" secondAttribute="top" priority="750" id="btT-aI-fBS"/>
+                                    <constraint firstAttribute="trailing" secondItem="WIw-cD-4aR" secondAttribute="trailing" constant="18" id="hLS-Zu-Egy"/>
+                                    <constraint firstAttribute="bottom" secondItem="WIw-cD-4aR" secondAttribute="bottom" id="myR-Jq-0zU"/>
+                                </constraints>
+                            </view>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="g60-e9-U8G"/>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
-                            <constraint firstAttribute="bottom" secondItem="pmL-HT-I1N" secondAttribute="bottom" id="0Xe-Gp-10C"/>
+                            <constraint firstItem="NMf-TU-1P1" firstAttribute="top" secondItem="pmL-HT-I1N" secondAttribute="bottom" id="7CD-wN-QBE"/>
+                            <constraint firstItem="g60-e9-U8G" firstAttribute="trailing" secondItem="NMf-TU-1P1" secondAttribute="trailing" id="HLm-Xn-oJO"/>
+                            <constraint firstItem="NMf-TU-1P1" firstAttribute="leading" secondItem="g60-e9-U8G" secondAttribute="leading" id="R7d-jc-rKk"/>
                             <constraint firstAttribute="top" secondItem="pmL-HT-I1N" secondAttribute="top" id="THV-MF-4pC"/>
                             <constraint firstItem="pmL-HT-I1N" firstAttribute="leading" secondItem="uyH-Qn-86F" secondAttribute="leading" id="VNA-7u-TMS"/>
                             <constraint firstAttribute="trailing" secondItem="pmL-HT-I1N" secondAttribute="trailing" id="sUb-Fg-UED"/>
+                            <constraint firstAttribute="bottom" secondItem="NMf-TU-1P1" secondAttribute="bottom" id="tde-KC-gmp"/>
                         </constraints>
                         <userDefinedRuntimeAttributes>
                             <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/>
@@ -409,6 +433,8 @@
                     <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
                     <size key="freeformSize" width="375" height="100"/>
                     <connections>
+                        <outlet property="checkDateLabel" destination="WIw-cD-4aR" id="pKw-Wb-XVW"/>
+                        <outlet property="checkDateLabelLayoutConstraint" destination="4a9-bg-siG" id="wIH-MS-2Ic"/>
                         <outlet property="stackView" destination="pmL-HT-I1N" id="33x-d6-3Lw"/>
                     </connections>
                 </viewController>
@@ -526,18 +552,38 @@
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="mrt-5g-RRn">
                                 <rect key="frame" x="0.0" y="0.0" width="375" height="100"/>
                             </stackView>
+                            <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="1000" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lv7-Ig-hWB">
+                                <rect key="frame" x="56" y="100" width="303" height="0.0"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <fontDescription key="fontDescription" style="UICTFontTextStyleFootnote"/>
+                                <color key="textColor" systemColor="secondaryLabelColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="lM2-J8-T6c"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
-                            <constraint firstAttribute="bottom" secondItem="mrt-5g-RRn" secondAttribute="bottom" id="5wi-9V-R6Z"/>
+                            <constraint firstItem="lv7-Ig-hWB" firstAttribute="top" secondItem="mrt-5g-RRn" secondAttribute="bottom" constant="12" id="5wi-9V-R6Z"/>
+                            <constraint firstAttribute="trailing" secondItem="lv7-Ig-hWB" secondAttribute="trailing" constant="16" id="Kit-DZ-e0h"/>
                             <constraint firstItem="mrt-5g-RRn" firstAttribute="leading" secondItem="QE6-Lg-X0g" secondAttribute="leading" id="NO1-zN-EiJ"/>
+                            <constraint firstItem="lv7-Ig-hWB" firstAttribute="top" secondItem="mrt-5g-RRn" secondAttribute="bottom" priority="750" id="hGX-Xp-WTY"/>
+                            <constraint firstAttribute="bottom" secondItem="lv7-Ig-hWB" secondAttribute="bottom" constant="12" id="iva-mv-Z6T"/>
                             <constraint firstAttribute="top" secondItem="mrt-5g-RRn" secondAttribute="top" id="oq2-uJ-EhG"/>
+                            <constraint firstAttribute="bottom" secondItem="lv7-Ig-hWB" secondAttribute="bottom" priority="750" id="vV4-fA-p7B"/>
                             <constraint firstAttribute="trailing" secondItem="mrt-5g-RRn" secondAttribute="trailing" id="wG7-Td-jWS"/>
+                            <constraint firstItem="lv7-Ig-hWB" firstAttribute="leading" secondItem="QE6-Lg-X0g" secondAttribute="leading" constant="56" id="wr7-Os-puB"/>
                         </constraints>
+                        <variation key="default">
+                            <mask key="constraints">
+                                <exclude reference="iva-mv-Z6T"/>
+                                <exclude reference="5wi-9V-R6Z"/>
+                            </mask>
+                        </variation>
                     </view>
                     <size key="freeformSize" width="375" height="100"/>
                     <connections>
+                        <outlet property="checkDateLabel" destination="lv7-Ig-hWB" id="d36-WZ-S1Y"/>
+                        <outlet property="checkDateLabelBottomLayoutConstraint" destination="iva-mv-Z6T" id="zmV-xd-yXQ"/>
+                        <outlet property="checkDateLabelTopLayoutConstraint" destination="5wi-9V-R6Z" id="EG8-a3-s5L"/>
                         <outlet property="stackView" destination="mrt-5g-RRn" id="0xW-H9-lLi"/>
                     </connections>
                 </viewController>
@@ -1243,7 +1289,7 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
                             <constraint firstItem="lIJ-bh-coX" firstAttribute="leading" secondItem="Bn7-Ag-wuu" secondAttribute="leading" constant="56" id="WXv-gZ-ygJ"/>
-                            <constraint firstAttribute="bottom" secondItem="lIJ-bh-coX" secondAttribute="bottom" constant="12" id="Wcq-WA-Qd8"/>
+                            <constraint firstAttribute="bottom" secondItem="lIJ-bh-coX" secondAttribute="bottom" constant="12" id="g7V-FG-sWe"/>
                             <constraint firstAttribute="trailing" secondItem="lIJ-bh-coX" secondAttribute="trailing" constant="16" id="hw3-UC-uCp"/>
                             <constraint firstItem="lIJ-bh-coX" firstAttribute="top" secondItem="Bn7-Ag-wuu" secondAttribute="top" constant="12" id="tpq-hf-4gG"/>
                         </constraints>
@@ -1404,14 +1450,20 @@
         <image name="dialog_btn_press" width="280" height="44"/>
         <image name="ic_arrow_gray_down" width="28" height="28"/>
         <image name="ic_placepage_open_hours" width="28" height="28"/>
+        <namedColor name="Press Background Color">
+            <color red="0.96078431372549022" green="0.96078431372549022" blue="0.96078431372549022" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
+        <systemColor name="secondaryLabelColor">
+            <color red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
         <systemColor name="separatorColor">
-            <color red="0.23529411764705882" green="0.23529411764705882" blue="0.2627450980392157" alpha="0.28999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.23529411759999999" green="0.23529411759999999" blue="0.26274509800000001" alpha="0.28999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
         <systemColor name="systemRedColor">
-            <color red="1" green="0.23137254901960785" blue="0.18823529411764706" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="1" green="0.23137254900000001" blue="0.18823529410000001" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
     </resources>
 </document>
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageCommonLayout.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageCommonLayout.swift
index e72bf933a..151ba5054 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageCommonLayout.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageCommonLayout.swift
@@ -33,7 +33,6 @@ class PlacePageCommonLayout: NSObject, IPlacePageLayout {
   private lazy var previewViewController: PlacePagePreviewViewController = {
     let vc = storyboard.instantiateViewController(ofType: PlacePagePreviewViewController.self)
     vc.placePagePreviewData = placePageData.previewData
-    vc.placePageData = placePageData
     return vc
   }()
 
@@ -111,7 +110,6 @@ class PlacePageCommonLayout: NSObject, IPlacePageLayout {
       guard let self = self else { return }
       self.actionBarViewController.updateBookmarkButtonState(isSelected: self.placePageData.bookmarkData != nil)
       self.previewViewController.placePagePreviewData = self.placePageData.previewData
-      self.previewViewController.placePageData = self.placePageData
       self.updateBookmarkRelatedSections()
     }
 
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageTrackLayout.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageTrackLayout.swift
index 3759de22e..1126dc04c 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageTrackLayout.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Layouts/PlacePageTrackLayout.swift
@@ -28,7 +28,6 @@ class PlacePageTrackLayout: IPlacePageLayout {
   private lazy var previewViewController: PlacePagePreviewViewController = {
     let vc = storyboard.instantiateViewController(ofType: PlacePagePreviewViewController.self)
     vc.placePagePreviewData = placePageData.previewData
-    vc.placePageData = placePageData
     return vc
   }()
 
@@ -81,7 +80,6 @@ class PlacePageTrackLayout: IPlacePageLayout {
     placePageData.onBookmarkStatusUpdate = { [weak self] in
       guard let self = self else { return }
       self.previewViewController.placePagePreviewData = self.placePageData.previewData
-      self.previewViewController.placePageData = self.placePageData
       self.updateTrackRelatedSections()
     }
 
@@ -115,7 +113,6 @@ private extension PlacePageTrackLayout {
     }
     if let previewViewController = headerViewControllers.compactMap({ $0 as? PlacePagePreviewViewController }).first {
       previewViewController.placePagePreviewData = previewData
-      previewViewController.placePageData = self.placePageData
       previewViewController.updateViews()
     }
     presenter?.layoutIfNeeded()
diff --git a/iphone/Maps/UI/PlacePage/PlacePageViewController.swift b/iphone/Maps/UI/PlacePage/PlacePageViewController.swift
index 623825ddd..ad642e1f6 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageViewController.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePageViewController.swift
@@ -214,7 +214,9 @@ final class PlacePageScrollView: UIScrollView {
       viewController.didMove(toParent: self)
       if showSeparator {
         viewController.view.addSeparator(.top)
-        viewController.view.addSeparator(.bottom)
+        if !(viewController is PlacePageInfoViewController) {
+          viewController.view.addSeparator(.bottom)
+        }
       }
     }
   }

From 661445a0531374cf2fa4392826f66bc24793c971 Mon Sep 17 00:00:00 2001
From: eisa01 <eisa01@gmail.com>
Date: Fri, 22 Aug 2025 22:37:10 +0200
Subject: [PATCH 193/302] [ios] Fix shift+scroll wheel zooming out

When you press shift on macOS, the normal scroll wheel action on a mouse is changed to horizontal scroll instead of vertical

That meant this check never entered, and since translation.y = 0 you always zoom out

Signed-off-by: eisa01 <eisa01@gmail.com>
---
 iphone/Maps/Classes/MapViewController.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm
index d840bd0fa..00842cfea 100644
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@@ -938,7 +938,7 @@ NSString *const kAboutSegue = @"Map2About";
     case UIGestureRecognizerStateChanged:
     {
       CGPoint translation = [recognizer translationInView:self.view];
-      if (translation.x == 0 && CGPointEqualToPoint(translation, CGPointZero))
+      if (translation.y == 0)
         return;
       self.userTouchesAction = UserTouchesActionScale;
       static const CGFloat kScaleFactor = 0.9;

From ca720d771214e79e4081aaaec9b3202208db26ec Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Fri, 22 Aug 2025 18:03:44 +0200
Subject: [PATCH 194/302] [android] Move hint property to TextInputLayout

Signed-off-by: jeanbaptisteC <jeanbaptiste.charron@outlook.fr>
---
 android/app/src/main/res/layout/edit_bookmark_common.xml    | 4 ++--
 .../main/res/layout/fragment_bookmark_category_settings.xml | 2 +-
 android/app/src/main/res/layout/fragment_osm_login.xml      | 6 +++---
 android/app/src/main/res/layout/item_localized_name.xml     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/android/app/src/main/res/layout/edit_bookmark_common.xml b/android/app/src/main/res/layout/edit_bookmark_common.xml
index 47f58f170..4bd13c7d8 100644
--- a/android/app/src/main/res/layout/edit_bookmark_common.xml
+++ b/android/app/src/main/res/layout/edit_bookmark_common.xml
@@ -20,6 +20,7 @@
       style="?fontBody1"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
+      android:hint="@string/name"
       android:textColorHint="?android:textColorSecondary"
       app:endIconMode="custom"
       app:endIconCheckable="false"
@@ -31,7 +32,6 @@
         style="@style/MwmWidget.Editor.CustomTextInput"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="@string/name"
         android:padding="@dimen/margin_half_double_plus"
         android:textAlignment="viewStart"
         android:inputType="textCapSentences"
@@ -94,6 +94,7 @@
     android:layout_height="wrap_content"
     android:layout_below="@id/rl__bookmark_set"
     android:layout_margin="@dimen/margin_half"
+    android:hint="@string/placepage_personal_notes_hint"
     android:textColorHint="?android:textColorSecondary">
 
     <com.google.android.material.textfield.TextInputEditText
@@ -102,7 +103,6 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:padding="@dimen/margin_half_double_plus"
-      android:hint="@string/placepage_personal_notes_hint"
       android:inputType="textMultiLine"
       android:textAlignment="viewStart" />
   </com.google.android.material.textfield.TextInputLayout>
diff --git a/android/app/src/main/res/layout/fragment_bookmark_category_settings.xml b/android/app/src/main/res/layout/fragment_bookmark_category_settings.xml
index feb312ca8..c7668793b 100644
--- a/android/app/src/main/res/layout/fragment_bookmark_category_settings.xml
+++ b/android/app/src/main/res/layout/fragment_bookmark_category_settings.xml
@@ -33,6 +33,7 @@
           android:id="@+id/edit_list_name_input"
           app:hintAnimationEnabled="false"
           style="@style/MwmWidget.Editor.CustomTextInput"
+          android:hint="@string/list"
           android:textColorHint="?android:textColorSecondary"
           app:endIconMode="custom"
           app:endIconDrawable="@drawable/ic_clear_rounded"
@@ -40,7 +41,6 @@
         <com.google.android.material.textfield.TextInputEditText
           android:id="@+id/edit_list_name_view"
           style="@style/MwmWidget.Editor.CustomTextInput"
-          android:hint="@string/list"
           android:layout_width="match_parent"
           android:layout_height="wrap_content" />
         </com.google.android.material.textfield.TextInputLayout>
diff --git a/android/app/src/main/res/layout/fragment_osm_login.xml b/android/app/src/main/res/layout/fragment_osm_login.xml
index bd56f5c66..792973a98 100644
--- a/android/app/src/main/res/layout/fragment_osm_login.xml
+++ b/android/app/src/main/res/layout/fragment_osm_login.xml
@@ -66,18 +66,19 @@
       <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/osm_username_container"
         style="@style/MwmWidget.Editor.CustomTextInput"
+        android:hint="@string/email_or_username"
         android:textColorHint="?android:textColorSecondary"
         app:endIconMode="custom">
         <com.google.android.material.textfield.TextInputEditText
           android:id="@+id/osm_username"
           style="@style/MwmWidget.Editor.FieldLayout.EditText"
-          android:autofillHints="emailAddress"
-          android:hint="@string/email_or_username" />
+          android:autofillHints="emailAddress" />
       </com.google.android.material.textfield.TextInputLayout>
       <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/osm_password_container"
         style="@style/MwmWidget.Editor.CustomTextInput"
         android:layout_marginTop="@dimen/margin_base"
+        android:hint="@string/password"
         android:textColorHint="?android:textColorSecondary"
         app:endIconMode="password_toggle"
         app:endIconTint="?android:textColorSecondary">
@@ -85,7 +86,6 @@
           android:id="@+id/osm_password"
           style="@style/MwmWidget.Editor.FieldLayout.EditText"
           android:autofillHints="password"
-          android:hint="@string/password"
           android:inputType="textPassword" />
       </com.google.android.material.textfield.TextInputLayout>
       <FrameLayout
diff --git a/android/app/src/main/res/layout/item_localized_name.xml b/android/app/src/main/res/layout/item_localized_name.xml
index 66b869bdf..dd9d3dd20 100644
--- a/android/app/src/main/res/layout/item_localized_name.xml
+++ b/android/app/src/main/res/layout/item_localized_name.xml
@@ -14,11 +14,11 @@
     android:layout_width="0dp"
     android:layout_height="wrap_content"
     android:layout_weight="1"
+    android:hint="@string/editor_edit_place_name_hint"
     android:textColorHint="?android:textColorSecondary">
     <com.google.android.material.textfield.TextInputEditText
       android:id="@+id/input"
       style="@style/MwmWidget.Editor.FieldLayout.EditText"
-      android:hint="@string/editor_edit_place_name_hint"
       android:inputType="textCapSentences"
       android:padding="@dimen/margin_base"
       android:singleLine="true"

From 06b6c3f794d5bc9e2c5c0292d6bd14212f263d27 Mon Sep 17 00:00:00 2001
From: mvglasow <michael -at- vonglasow.com>
Date: Tue, 19 Aug 2025 00:26:26 +0300
Subject: [PATCH 195/302] [drape] Replace newline with space in
 StraightTextLayout and PathTextLayout

Signed-off-by: mvglasow <michael -at- vonglasow.com>
---
 libs/drape_frontend/text_layout.cpp | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/libs/drape_frontend/text_layout.cpp b/libs/drape_frontend/text_layout.cpp
index 9b50080eb..5d9c705fc 100644
--- a/libs/drape_frontend/text_layout.cpp
+++ b/libs/drape_frontend/text_layout.cpp
@@ -281,10 +281,18 @@ dp::TGlyphs TextLayout::GetGlyphs() const
 StraightTextLayout::StraightTextLayout(std::string const & text, float fontSize, ref_ptr<dp::TextureManager> textures,
                                        dp::Anchor anchor, bool forceNoWrap)
 {
-  ASSERT_EQUAL(std::string::npos, text.find('\n'), ("Multiline text is not expected", text));
+  /*
+   * TODO Temporary workaround: If the string contains newlines, replace them with whitespaces.
+   * On the long run, this should be fixed in the map generator and this workaround removed after
+   * a few months, when maps with buggy data can be expected to have been phased out.
+   */
+  std::string stext = text;
+  while (stext.find('\n') != std::string::npos)
+    stext[stext.find('\n')] = ' ';
+  ASSERT_EQUAL(std::string::npos, stext.find('\n'), ("Multiline text is not expected", stext));
 
   m_textSizeRatio = fontSize * static_cast<float>(VisualParams::Instance().GetFontScale()) / dp::kBaseFontSizePixels;
-  m_shapedGlyphs = textures->ShapeSingleTextLine(dp::kBaseFontSizePixels, text, &m_glyphRegions);
+  m_shapedGlyphs = textures->ShapeSingleTextLine(dp::kBaseFontSizePixels, stext, &m_glyphRegions);
 
   // TODO(AB): Use ICU's BreakIterator to split text properly in different languages without spaces.
   // TODO(AB): Implement SplitText for RTL languages.
@@ -378,13 +386,21 @@ PathTextLayout::PathTextLayout(m2::PointD const & tileCenter, std::string const
                                ref_ptr<dp::TextureManager> textureManager)
   : m_tileCenter(tileCenter)
 {
-  ASSERT_EQUAL(std::string::npos, text.find('\n'), ("Multiline text is not expected", text));
+  /*
+   * TODO Temporary workaround: If the string contains newlines, replace them with whitespaces.
+   * On the long run, this should be fixed in the map generator and this workaround removed after
+   * a few months, when maps with buggy data can be expected to have been phased out.
+   */
+  std::string stext = text;
+  while (stext.find('\n') != std::string::npos)
+    stext[stext.find('\n')] = ' ';
+  ASSERT_EQUAL(std::string::npos, stext.find('\n'), ("Multiline text is not expected", stext));
 
   auto const fontScale = static_cast<float>(VisualParams::Instance().GetFontScale());
   m_textSizeRatio = fontSize * fontScale / dp::kBaseFontSizePixels;
 
   // TODO(AB): StraightTextLayout used a logic to split a longer string into two strings.
-  m_shapedGlyphs = textureManager->ShapeSingleTextLine(dp::kBaseFontSizePixels, text, &m_glyphRegions);
+  m_shapedGlyphs = textureManager->ShapeSingleTextLine(dp::kBaseFontSizePixels, stext, &m_glyphRegions);
 }
 
 void PathTextLayout::CacheStaticGeometry(dp::TextureManager::ColorRegion const & colorRegion,

From e367fa679278ff6c6106a5b8dc0edb8a34aefe78 Mon Sep 17 00:00:00 2001
From: Harry Bond <me@hbond.xyz>
Date: Sat, 23 Aug 2025 13:57:46 +0100
Subject: [PATCH 196/302] [android] Start LinearProgressBars at 1% to show
 initial dot see
 https://m3.material.io/components/progress-indicators/guidelines#817a3dbd-9dd5-471f-a7d0-50eae6270ee0

Signed-off-by: Harry Bond <me@hbond.xyz>
---
 .../organicmaps/DownloadResourcesLegacyActivity.java   | 10 ++++++----
 .../sdk/DownloadResourcesLegacyActivity.java           |  2 +-
 .../main/java/app/organicmaps/widget/menu/NavMenu.java |  4 +++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java b/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java
index 55038a5ec..989d5a8cf 100644
--- a/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java
+++ b/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java
@@ -116,10 +116,10 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
   private final app.organicmaps.sdk.DownloadResourcesLegacyActivity.Listener mResourcesDownloadListener =
       new app.organicmaps.sdk.DownloadResourcesLegacyActivity.Listener() {
         @Override
-        public void onProgress(final int percent)
+        public void onProgress(final int bytesDownloaded)
         {
           if (!isFinishing())
-            mProgress.setProgressCompat(percent, true);
+            mProgress.setProgressCompat(bytesDownloaded, true);
         }
 
         @Override
@@ -250,7 +250,8 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
       setDownloadMessage(bytes);
 
       mProgress.setMax(bytes);
-      mProgress.setProgressCompat(0, true);
+      // Start progress at 1% according to M3 guidelines
+      mProgress.setProgressCompat(bytes/100, true);
     }
     else
       finishFilesDownload(bytes);
@@ -368,7 +369,8 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
         String fileSizeString = StringUtils.getFileSizeString(this, item.totalSize);
         mTvMessage.setText(getString(R.string.downloading_country_can_proceed, item.name, fileSizeString));
         mProgress.setMax((int) item.totalSize);
-        mProgress.setProgressCompat(0, true);
+        // Start progress at 1% according to M3 guidelines
+        mProgress.setProgressCompat((int) (item.totalSize/100), true);
 
         mCountryDownloadListenerSlot = MapManager.nativeSubscribe(mCountryDownloadListener);
         MapManager.startDownload(mCurrentCountry);
diff --git a/android/app/src/main/java/app/organicmaps/sdk/DownloadResourcesLegacyActivity.java b/android/app/src/main/java/app/organicmaps/sdk/DownloadResourcesLegacyActivity.java
index 58c2558c2..ffc0f3af3 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/DownloadResourcesLegacyActivity.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/DownloadResourcesLegacyActivity.java
@@ -17,7 +17,7 @@ public class DownloadResourcesLegacyActivity
   {
     // Called by JNI.
     @Keep
-    void onProgress(int percent);
+    void onProgress(int bytesDownloaded);
 
     // Called by JNI.
     @Keep
diff --git a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
index 6f96fd355..b0a14e383 100644
--- a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
+++ b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
@@ -231,7 +231,9 @@ public class NavMenu
     updateTime(info.totalTimeInSeconds);
     mDistanceValue.setText(info.distToTarget.mDistanceStr);
     mDistanceUnits.setText(info.distToTarget.getUnitsStr(mActivity.getApplicationContext()));
-    mRouteProgress.setProgressCompat((int) info.completionPercent, true);
+    // Start progress at 1% according to M3 guidelines
+    final int completionPercent = (info.completionPercent < 1) ? 1 : (int) info.completionPercent;
+    mRouteProgress.setProgressCompat(completionPercent, true);
   }
 
   public interface NavMenuListener

From c27b0dc6fbad620619fd8444dc2e472dd0929837 Mon Sep 17 00:00:00 2001
From: Codeberg Translate <translate@codeberg.org>
Date: Sat, 23 Aug 2025 16:40:23 +0000
Subject: [PATCH 197/302] [strings] Update from Codeberg Translate

Co-authored-by: B o d o <timtrek@noreply.codeberg.org>
Co-authored-by: Codeberg Translate <translate@codeberg.org>
Co-authored-by: Fjuro <fjuro@alius.cz>
Co-authored-by: Prefill add-on <noreply-addon-prefill@weblate.org>
Co-authored-by: Weblate <noreply-mt-weblate@weblate.org>
Co-authored-by: Weblate Translation Memory <noreply-mt-weblate-translation-memory@weblate.org>
Co-authored-by: matheusgomesms <matheusgomesms@noreply.codeberg.org>
Co-authored-by: yannikbloscheck <yannikbloscheck@noreply.codeberg.org>
Translation: CoMaps/Android - Map Feature Types
Translation: CoMaps/Android UI Strings
Translation: CoMaps/iOS - Map Feature Types
Translation: CoMaps/iOS UI Strings
---
 android/app/src/main/res/values-cs/strings.xml              | 4 +++-
 android/app/src/main/res/values-cs/types_strings.xml        | 2 ++
 android/app/src/main/res/values-de/strings.xml              | 4 +++-
 android/app/src/main/res/values-de/types_strings.xml        | 2 ++
 android/app/src/main/res/values-pt-rBR/strings.xml          | 4 +++-
 android/app/src/main/res/values-pt-rBR/types_strings.xml    | 4 +++-
 iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/ast.lproj/Localizable.strings  | 2 ++
 iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/bn.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings   | 4 +++-
 .../Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings | 4 ++--
 iphone/Maps/LocalizedStrings/cy.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings   | 4 +++-
 .../Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings | 4 ++--
 iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings   | 2 ++
 .../Maps/LocalizedStrings/es-MX.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/gl.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/gsw.lproj/Localizable.strings  | 2 ++
 iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/hr.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/ia.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/is.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/kab.lproj/Localizable.strings  | 2 ++
 iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/ml.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings   | 2 ++
 .../Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings   | 4 +++-
 .../LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings   | 6 +++---
 iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/sq.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings   | 2 ++
 iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings   | 2 ++
 .../Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings | 2 ++
 .../Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings | 2 ++
 65 files changed, 138 insertions(+), 14 deletions(-)

diff --git a/android/app/src/main/res/values-cs/strings.xml b/android/app/src/main/res/values-cs/strings.xml
index cbcba8d59..2d488e88d 100644
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -247,7 +247,7 @@
     <!-- Button in the main menu -->
     <string name="donate">Darovat</string>
     <!-- Button in the main Help dialog -->
-    <string name="how_to_support_us">Podpořte projekt</string>
+    <string name="how_to_support_us">Staňte se dobrovolníkem a vylepšete CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="copyright">Autorská práva</string>
     <!-- Text in menu + Button in the main Help dialog -->
@@ -912,4 +912,6 @@
     <string name="at">v %s</string>
     <string name="osm_note_toast">Poznámka bude odeslána do OpenStreetMap</string>
     <string name="osm_note_hint">Případně můžete zanechat poznámku komunitě OpenStreetMap, aby zde někdo jiný mohl místo přidat nebo opravit.</string>
+    <string name="share_track">Sdílet stopu</string>
+    <string name="delete_track_dialog_title">Odstranit %s?</string>
 </resources>
diff --git a/android/app/src/main/res/values-cs/types_strings.xml b/android/app/src/main/res/values-cs/types_strings.xml
index 4a65aa5e1..28d299390 100644
--- a/android/app/src/main/res/values-cs/types_strings.xml
+++ b/android/app/src/main/res/values-cs/types_strings.xml
@@ -1388,4 +1388,6 @@
     <string name="type.amenity.bicycle_parking.covered">Kryté parkování kol</string>
     <string name="type.amenity.luggage_locker">Úschovná skříňka</string>
     <string name="type.amenity.ranger_station">Správci parku</string>
+    <string name="type.amenity.animal_shelter">Útulek pro zvířata</string>
+    <string name="type.barrier.wicket_gate">Branka</string>
 </resources>
diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
index 1783211ad..2650594a5 100644
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -260,7 +260,7 @@
     <!-- Button in the main menu -->
     <string name="donate">Spenden</string>
     <!-- Button in the main Help dialog -->
-    <string name="how_to_support_us">Unterstütze das Projekt</string>
+    <string name="how_to_support_us">Freiwillig helfen und CoMaps verbessern</string>
     <!-- Button in the main Help dialog -->
     <string name="copyright">Copyright</string>
     <!-- Text in menu + Button in the main Help dialog -->
@@ -921,4 +921,6 @@
     <string name="closed_now">Jetzt geschlossen</string>
     <string name="osm_note_hint">Oder hinterlasse alternativ einen Hinweis für die OpenStreetMap Community, sodass jemand anders einen Ort hinzufügen oder korrigieren kann.</string>
     <string name="osm_note_toast">Ein Hinweis wird zu OpenStreetMap geschickt</string>
+    <string name="share_track">Strecke teilen</string>
+    <string name="delete_track_dialog_title">%s löschen?</string>
 </resources>
diff --git a/android/app/src/main/res/values-de/types_strings.xml b/android/app/src/main/res/values-de/types_strings.xml
index d760ac496..a90e2bab8 100644
--- a/android/app/src/main/res/values-de/types_strings.xml
+++ b/android/app/src/main/res/values-de/types_strings.xml
@@ -1389,4 +1389,6 @@
     <string name="type.amenity.bicycle_parking.covered">Überdachter Fahrradparkplatz</string>
     <string name="type.post_office.post_partner">Postpartner</string>
     <string name="type.amenity.ranger_station">Försterstation</string>
+    <string name="type.amenity.animal_shelter">Tierheim</string>
+    <string name="type.barrier.wicket_gate">Schlupfpforte</string>
 </resources>
diff --git a/android/app/src/main/res/values-pt-rBR/strings.xml b/android/app/src/main/res/values-pt-rBR/strings.xml
index d012a8eb5..8e4451225 100644
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -845,7 +845,7 @@
     <string name="social_media">Redes sociais</string>
     <string name="tts_info_link">https://www.comaps.app/support/tts-configuration-guide-for-android/</string>
     <string name="editor_add_phone">Adicionar telefone</string>
-    <string name="outdoor_seating">Assentos ao ar livre</string>
+    <string name="outdoor_seating">Mesas externas</string>
     <string name="capacity">Capacidade: %s</string>
     <string name="editor_correct_mistake">Corrigir erro</string>
     <string name="editor_add_select_location">Selecione a localização</string>
@@ -897,4 +897,6 @@
     <string name="at">às %s</string>
     <string name="osm_note_hint">Ou, em vez disso, deixe uma nota para a comunidade do OpenStreetMap para que outra pessoa possa adicionar ou corrigir um lugar aqui.</string>
     <string name="osm_note_toast">A nota será enviada ao OpenStreetMap</string>
+    <string name="delete_track_dialog_title">Apagar %s?</string>
+    <string name="share_track">Compartilhar trilha</string>
 </resources>
diff --git a/android/app/src/main/res/values-pt-rBR/types_strings.xml b/android/app/src/main/res/values-pt-rBR/types_strings.xml
index 3cfe93396..f2954647a 100644
--- a/android/app/src/main/res/values-pt-rBR/types_strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/types_strings.xml
@@ -1213,7 +1213,7 @@
     <string name="type.place.country">País</string>
     <string name="type.sport.beachvolleyball">Vôlei de praia</string>
     <string name="type.historic.wayside_cross">Cruz à beira da estrada</string>
-    <string name="type.leisure.outdoor_seating">Assentos ao ar livre</string>
+    <string name="type.leisure.outdoor_seating">Mesas externas</string>
     <string name="type.place.island">Ilha</string>
     <string name="type.natural.heath">Charneca</string>
     <string name="type.natural.wetland">Zona úmida</string>
@@ -1380,4 +1380,6 @@
     <string name="type.amenity.bicycle_parking.covered">Bicicletário coberto</string>
     <string name="type.post_office.post_partner">Parceiro postal</string>
     <string name="type.amenity.ranger_station">Posto de guardas florestais</string>
+    <string name="type.barrier.wicket_gate">Postigo</string>
+    <string name="type.amenity.animal_shelter">Abrigo para animais</string>
 </resources>
diff --git a/iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings
index 81d1437ce..286dc3595 100644
--- a/iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/af.lproj/Localizable.strings
@@ -1091,3 +1091,5 @@
 "pref_maplanguage_title" = "Map Language";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_local" = "Local Language";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
index 960f675c5..2a1fe56ff 100644
--- a/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ar.lproj/Localizable.strings
@@ -1091,3 +1091,5 @@
 "pref_maplanguage_title" = "Map Language";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_local" = "Local Language";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/ast.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ast.lproj/Localizable.strings
index 842f9035f..e274b6098 100644
--- a/iphone/Maps/LocalizedStrings/ast.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ast.lproj/Localizable.strings
@@ -587,3 +587,5 @@
 "pref_maplanguage_title" = "Map Language";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_local" = "Local Language";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings
index 81a046c23..898c47883 100644
--- a/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/az.lproj/Localizable.strings
@@ -1077,3 +1077,5 @@
 "pref_maplanguage_title" = "Map Language";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_local" = "Local Language";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
index 331f9e454..9683ce9a1 100644
--- a/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/be.lproj/Localizable.strings
@@ -1091,3 +1091,5 @@
 "pref_maplanguage_title" = "Map Language";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_local" = "Local Language";
+"hours_confirmed_time_ago" = "Confirmed %@";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
index d8a332a15..de8236fbc 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
@@ -1091,3 +1091,5 @@
 "pref_maplanguage_title" = "Map Language";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_local" = "Local Language";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/bn.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bn.lproj/Localizable.strings
index 96e614d15..d83870812 100644
--- a/iphone/Maps/LocalizedStrings/bn.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bn.lproj/Localizable.strings
@@ -587,3 +587,5 @@
 "pref_maplanguage_title" = "Map Language";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_local" = "Local Language";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
index ea4d1c7e6..b6cd90c8d 100644
--- a/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ca.lproj/Localizable.strings
@@ -1091,3 +1091,5 @@
 "pref_maplanguage_title" = "Map Language";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_local" = "Local Language";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
index 9cf04bf10..9ec54cccd 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/Localizable.strings
@@ -325,7 +325,7 @@
 "report_incorrect_map_bug" = "Nahlášení nebo oprava nesprávných mapových dat";
 
 /* Button in the About screen */
-"volunteer" = "Dobrovolnictví";
+"volunteer" = "Staňte se dobrovolníkem a vylepšete CoMaps";
 
 /* "Social media" section header in the About screen */
 "follow_us" = "Spojte se s námi";
@@ -1095,3 +1095,5 @@
 "pref_maplanguage_title" = "Jazyk mapy";
 "transliteration_title_disabled_summary" = "Neaktivní, pokud se pro mapu vždy používá místní jazyk";
 "pref_maplanguage_local" = "Místní jazyk";
+"existence_confirmed_time_ago" = "Existence potvrzena %@";
+"hours_confirmed_time_ago" = "Potvrzeno %@";
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings
index c945c6a5e..dba8d7f20 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings
@@ -1482,5 +1482,5 @@
 "type.amenity.ranger_station" = "Správci parku";
 "type.amenity.bicycle_parking.covered" = "Kryté parkování kol";
 "type.post_office.post_partner" = "Poštovní partner";
-"type.amenity.animal_shelter" = "Animal Shelter";
-"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Útulek pro zvířata";
+"type.barrier.wicket_gate" = "Branka";
diff --git a/iphone/Maps/LocalizedStrings/cy.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/cy.lproj/Localizable.strings
index 2f648e822..3a443be31 100644
--- a/iphone/Maps/LocalizedStrings/cy.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/cy.lproj/Localizable.strings
@@ -587,3 +587,5 @@
 "thank_you" = "Diolch";
 "yes_available" = "Ie";
 "osm_profile_reauthorize" = "Reconnect with OpenStreetMap";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
index 08c189ca4..755550e1b 100644
--- a/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/da.lproj/Localizable.strings
@@ -1093,3 +1093,5 @@
 "pref_maplanguage_title" = "Kortsprog";
 "transliteration_title_disabled_summary" = "Deaktiveret, når det lokale sprog altid bruges til kortet";
 "pref_maplanguage_local" = "Lokalt sprog";
+"hours_confirmed_time_ago" = "Confirmed %@";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
index cb60c5417..675db78e2 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/Localizable.strings
@@ -325,7 +325,7 @@
 "report_incorrect_map_bug" = "Falsche Kartendaten melden oder korrigieren";
 
 /* Button in the About screen */
-"volunteer" = "Freiwillig helfen";
+"volunteer" = "Freiwillig helfen und CoMaps verbessern";
 
 /* "Social media" section header in the About screen */
 "follow_us" = "Bleib in Kontakt";
@@ -1095,3 +1095,5 @@
 "pref_maplanguage_title" = "Kartensprache";
 "transliteration_title_disabled_summary" = "Bei der Nutzung der lokalen Sprache für die Karte ausgeschaltet";
 "pref_maplanguage_local" = "Lokale Sprache";
+"existence_confirmed_time_ago" = "Existenz bestätigt %@";
+"hours_confirmed_time_ago" = "Bestätigt %@";
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
index f26b984c3..0a4dd6d9f 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
@@ -1482,5 +1482,5 @@
 "type.amenity.ranger_station" = "Försterstation";
 "type.amenity.bicycle_parking.covered" = "Überdachter Fahrradparkplatz";
 "type.post_office.post_partner" = "Postpartner";
-"type.barrier.wicket_gate" = "Wicket gate";
-"type.amenity.animal_shelter" = "Animal Shelter";
+"type.barrier.wicket_gate" = "Schlupfpforte";
+"type.amenity.animal_shelter" = "Tierheim";
diff --git a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
index 497ba2f7f..8d656c9f3 100644
--- a/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/el.lproj/Localizable.strings
@@ -1091,3 +1091,5 @@
 "pref_maplanguage_title" = "Γλώσσα χάρτη";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_local" = "Τοπική γλώσσα";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
index ecc057664..943dadfa8 100644
--- a/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es-MX.lproj/Localizable.strings
@@ -1095,3 +1095,5 @@
 "pref_maplanguage_title" = "Map Language";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_local" = "Local Language";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index be1c79739..e55c411be 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -1095,3 +1095,5 @@
 "pref_maplanguage_title" = "Idioma del mapa";
 "transliteration_title_disabled_summary" = "Deshabilitado cuando siempre se usa el idioma local para el mapa";
 "pref_maplanguage_local" = "Idioma local";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
index 2183b3109..ed5475817 100644
--- a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
@@ -1093,3 +1093,5 @@
 "pref_maplanguage_title" = "Kaardi keel";
 "transliteration_title_disabled_summary" = "Kui kaardil on alati kasutusel kohalik keel, siis see eelistus on välja lülitatud";
 "pref_maplanguage_local" = "Kohalik keel";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
index 3d56befd7..4733ba075 100644
--- a/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/eu.lproj/Localizable.strings
@@ -1093,3 +1093,5 @@
 "pref_maplanguage_title" = "Mapen hizkuntza";
 "transliteration_title_disabled_summary" = "Desgaituta maparako hizkuntza lokala beti erabiltzean";
 "pref_maplanguage_local" = "Hizkuntza lokala";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
index 58f1c8a35..654574b32 100644
--- a/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fa.lproj/Localizable.strings
@@ -1091,3 +1091,5 @@
 "pref_maplanguage_title" = "زبان نقشه";
 "transliteration_title_disabled_summary" = "زمانی که همیشه از زبان محلی برای نقشه استفاده می کنید غیرفعال است";
 "pref_maplanguage_local" = "زبان محلی";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index 318671360..a51ad7fd6 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -1095,3 +1095,5 @@
 "pref_maplanguage_title" = "Karttakieli";
 "transliteration_title_disabled_summary" = "Kytke pois käytöstä, jos käytät aina paikallista kieltä kartalle";
 "pref_maplanguage_local" = "Paikallinen kieli";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index 6389af1f1..2c0c5f11b 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -1095,3 +1095,5 @@
 "pref_maplanguage_title" = "Langue de la carte";
 "transliteration_title_disabled_summary" = "Désactivé lorsque la langue locale est toujours utilisée pour la carte";
 "pref_maplanguage_local" = "Langue locale";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/gl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/gl.lproj/Localizable.strings
index 666d1e7f8..1c738538e 100644
--- a/iphone/Maps/LocalizedStrings/gl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/gl.lproj/Localizable.strings
@@ -587,3 +587,5 @@
 "pref_maplanguage_title" = "Map Language";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_local" = "Local Language";
+"hours_confirmed_time_ago" = "Confirmed %@";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/gsw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/gsw.lproj/Localizable.strings
index 8a3fc8414..21690809c 100644
--- a/iphone/Maps/LocalizedStrings/gsw.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/gsw.lproj/Localizable.strings
@@ -587,3 +587,5 @@
 "pref_maplanguage_title" = "Charte-Spraach";
 "transliteration_title_disabled_summary" = "Bi de Nutzig vo de lokale Spraach für d Charte uusgschaltet";
 "pref_maplanguage_local" = "Lokali Spraach";
+"hours_confirmed_time_ago" = "Confirmed %@";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
index 225f01e6e..811c1d573 100644
--- a/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/he.lproj/Localizable.strings
@@ -1091,3 +1091,5 @@
 "pref_maplanguage_title" = "Map Language";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_local" = "Local Language";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings
index cd3c3ec9b..fcb2f9c4b 100644
--- a/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hi.lproj/Localizable.strings
@@ -1091,3 +1091,5 @@
 "pref_maplanguage_title" = "Map Language";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_local" = "Local Language";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/hr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hr.lproj/Localizable.strings
index 5efcb4eb8..b4a37fb60 100644
--- a/iphone/Maps/LocalizedStrings/hr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hr.lproj/Localizable.strings
@@ -587,3 +587,5 @@
 "pref_maplanguage_title" = "Map Language";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_local" = "Local Language";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index 103f86ac7..92986cf6e 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -1091,3 +1091,5 @@
 "pref_maplanguage_title" = "Map Language";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_local" = "Local Language";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/ia.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ia.lproj/Localizable.strings
index fbce548d0..6c8b88afe 100644
--- a/iphone/Maps/LocalizedStrings/ia.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ia.lproj/Localizable.strings
@@ -587,3 +587,5 @@
 "pref_maplanguage_title" = "Map Language";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_local" = "Local Language";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
index a0f1c6850..3c5b79c7e 100644
--- a/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/id.lproj/Localizable.strings
@@ -1091,3 +1091,5 @@
 "pref_maplanguage_title" = "Map Language";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_local" = "Local Language";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/is.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/is.lproj/Localizable.strings
index aa91439fd..ae4ff0cc8 100644
--- a/iphone/Maps/LocalizedStrings/is.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/is.lproj/Localizable.strings
@@ -587,3 +587,5 @@
 "pref_maplanguage_title" = "Map Language";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_local" = "Local Language";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index 41ecee610..5cbd927cd 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -1095,3 +1095,5 @@
 "pref_maplanguage_title" = "Lingua della mappa";
 "transliteration_title_disabled_summary" = "Disabilitato quando si usa la lingua locale sulla mappa";
 "pref_maplanguage_local" = "Lingua Locale";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
index 42bc18cf3..d4c0301dd 100644
--- a/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ja.lproj/Localizable.strings
@@ -1095,3 +1095,5 @@
 "pref_maplanguage_title" = "Map Language";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_local" = "Local Language";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/kab.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/kab.lproj/Localizable.strings
index 9339bfab0..01218b5ec 100644
--- a/iphone/Maps/LocalizedStrings/kab.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/kab.lproj/Localizable.strings
@@ -587,3 +587,5 @@
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_title" = "Map Language";
 "pref_maplanguage_local" = "Local Language";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
index 2893a66e0..505d10271 100644
--- a/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ko.lproj/Localizable.strings
@@ -1091,3 +1091,5 @@
 "pref_maplanguage_title" = "Map Language";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_local" = "Local Language";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings
index 6aa6fdea6..a05b4fc7b 100644
--- a/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/lt.lproj/Localizable.strings
@@ -1093,3 +1093,5 @@
 "pref_maplanguage_title" = "Žemėlapio kalba";
 "transliteration_title_disabled_summary" = "Negalima, kai žemėlapyje visuomet naudojama vietos kalba";
 "pref_maplanguage_local" = "Vietos kalba";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings
index dfbf227e9..04f062e32 100644
--- a/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/lv.lproj/Localizable.strings
@@ -1091,3 +1091,5 @@
 "pref_maplanguage_title" = "Map Language";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_local" = "Local Language";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/ml.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ml.lproj/Localizable.strings
index c427a6b17..b013c63ac 100644
--- a/iphone/Maps/LocalizedStrings/ml.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ml.lproj/Localizable.strings
@@ -587,3 +587,5 @@
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_title" = "Map Language";
 "pref_maplanguage_local" = "Local Language";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
index 9e1c977a4..b55602cb4 100644
--- a/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/mr.lproj/Localizable.strings
@@ -1089,3 +1089,5 @@
 "pref_maplanguage_title" = "Map Language";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_local" = "Local Language";
+"hours_confirmed_time_ago" = "Confirmed %@";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings
index d4a29bb61..89a7f278a 100644
--- a/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/mt.lproj/Localizable.strings
@@ -1091,3 +1091,5 @@
 "pref_maplanguage_title" = "Map Language";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_local" = "Local Language";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
index 37aa3880a..23939cf36 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.strings
@@ -1093,3 +1093,5 @@
 "pref_maplanguage_title" = "Kart Språk";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_local" = "Lokalt Språk";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index 26cbfed30..702669df0 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -1095,3 +1095,5 @@
 "pref_maplanguage_title" = "Kaarttaal";
 "transliteration_title_disabled_summary" = "Uitgeschakeld wanneer altijd de lokale taal voor de kaart wordt gebruikt";
 "pref_maplanguage_local" = "Lokale Taal";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
index febc96684..a9972a147 100644
--- a/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pl.lproj/Localizable.strings
@@ -1093,3 +1093,5 @@
 "pref_maplanguage_local" = "Local Language";
 "pref_maplanguage_title" = "Map Language";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index 29e450f17..49048a4de 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -1054,7 +1054,7 @@
 "self_service" = "Autoatendimento";
 
 /* To indicate if restaurant or other place has outdoor seating */
-"outdoor_seating" = "Assentos ao ar livre";
+"outdoor_seating" = "Mesas externas";
 
 /* Title for the "Recently Deleted Lists" button on the Bookmarks and Lists screen. */
 "bookmarks_recently_deleted" = "Listas excluídas recentemente";
@@ -1095,3 +1095,5 @@
 "pref_maplanguage_title" = "Idioma do mapa";
 "transliteration_title_disabled_summary" = "Desativado quando sempre se utiliza o idioma local para o mapa";
 "pref_maplanguage_local" = "Idioma local";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings
index 988a5e744..59e2c315b 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings
@@ -702,7 +702,7 @@
 "type.leisure.ice_rink" = "Rinque de patinação";
 "type.leisure.marina" = "Marina";
 "type.leisure.nature_reserve" = "Reserva natural";
-"type.leisure.outdoor_seating" = "Assentos ao ar livre";
+"type.leisure.outdoor_seating" = "Mesas externas";
 "type.leisure.park" = "Parque";
 "type.leisure.park.no.access" = "Parque";
 "type.leisure.park.permissive" = "Parque";
@@ -1482,5 +1482,5 @@
 "type.amenity.bicycle_parking.covered" = "Bicicletário coberto";
 "type.post_office.post_partner" = "Parceiro postal";
 "type.amenity.ranger_station" = "Posto de guardas florestais";
-"type.barrier.wicket_gate" = "Wicket gate";
-"type.amenity.animal_shelter" = "Animal Shelter";
+"type.barrier.wicket_gate" = "Postigo";
+"type.amenity.animal_shelter" = "Abrigo para animais";
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index a241e97de..afcf164fe 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -1093,3 +1093,5 @@
 "pref_maplanguage_title" = "Idioma do Mapa";
 "transliteration_title_disabled_summary" = "Desativado ao usar sempre o idioma local do mapa";
 "pref_maplanguage_local" = "Idioma Local";
+"hours_confirmed_time_ago" = "Confirmed %@";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
index 86067e5bf..6bae23490 100644
--- a/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ro.lproj/Localizable.strings
@@ -1091,3 +1091,5 @@
 "pref_maplanguage_title" = "Map Language";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_local" = "Local Language";
+"hours_confirmed_time_ago" = "Confirmed %@";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index 670d74c75..84a8eb170 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -1095,3 +1095,5 @@
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_title" = "Язык карты";
 "pref_maplanguage_local" = "Местный язык";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
index 4ec6c719b..b36265b76 100644
--- a/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sk.lproj/Localizable.strings
@@ -1091,3 +1091,5 @@
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_title" = "Map Language";
 "pref_maplanguage_local" = "Local Language";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/sq.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sq.lproj/Localizable.strings
index 22e129842..d955f7215 100644
--- a/iphone/Maps/LocalizedStrings/sq.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sq.lproj/Localizable.strings
@@ -587,3 +587,5 @@
 "pref_maplanguage_title" = "Map Language";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_local" = "Local Language";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings
index be23078b3..5bf94e839 100644
--- a/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings
@@ -1093,3 +1093,5 @@
 "pref_maplanguage_title" = "Језик мапе";
 "transliteration_title_disabled_summary" = "Онемогућено када увек користите локални језик за мапу";
 "pref_maplanguage_local" = "Локални језик";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
index 13c92517e..466d25f6b 100644
--- a/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sv.lproj/Localizable.strings
@@ -1091,3 +1091,5 @@
 "pref_maplanguage_title" = "Map Language";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_local" = "Local Language";
+"hours_confirmed_time_ago" = "Confirmed %@";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
index ab6d6a2d9..a7ba363a2 100644
--- a/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sw.lproj/Localizable.strings
@@ -1085,3 +1085,5 @@
 "pref_maplanguage_title" = "Map Language";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_local" = "Local Language";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
index 2b3f8c0fa..e1db44428 100644
--- a/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/th.lproj/Localizable.strings
@@ -1091,3 +1091,5 @@
 "pref_maplanguage_title" = "Map Language";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_local" = "Local Language";
+"hours_confirmed_time_ago" = "Confirmed %@";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
index eeb4caa1e..9ab903373 100644
--- a/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/tr.lproj/Localizable.strings
@@ -1095,3 +1095,5 @@
 "pref_maplanguage_title" = "Harita Dili";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_local" = "Uygulama Dili";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
index 6d4e929a7..1dd6479f4 100644
--- a/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/uk.lproj/Localizable.strings
@@ -1093,3 +1093,5 @@
 "pref_maplanguage_title" = "Map Language";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_local" = "Local Language";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
index 67f09d42d..7efee459e 100644
--- a/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/vi.lproj/Localizable.strings
@@ -1091,3 +1091,5 @@
 "pref_maplanguage_title" = "Map Language";
 "transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
 "pref_maplanguage_local" = "Local Language";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index 783516a83..acbab970b 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -1095,3 +1095,5 @@
 "pref_maplanguage_title" = "地图语言";
 "transliteration_title_disabled_summary" = "地图始终使用本地语言时禁用";
 "pref_maplanguage_local" = "本地语言";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmed %@";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
index 89869a8ea..2c117482f 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hant.lproj/Localizable.strings
@@ -1095,3 +1095,5 @@
 "pref_maplanguage_title" = "地圖語言";
 "transliteration_title_disabled_summary" = "當在地圖總是使用在地語言時不啟用";
 "pref_maplanguage_local" = "在地語言";
+"hours_confirmed_time_ago" = "Confirmed %@";
+"existence_confirmed_time_ago" = "Existence confirmed %@";

From 977a3b6734a33c2d53f629a112db03691fbbf6b9 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Fri, 22 Aug 2025 19:56:34 +0200
Subject: [PATCH 198/302] [android] Remove useless fontFamily property

Signed-off-by: jeanbaptisteC <jeanbaptiste.charron@outlook.fr>
---
 android/app/src/main/res/layout-land/about.xml              | 3 ---
 android/app/src/main/res/layout-land/fragment_osm_login.xml | 1 -
 android/app/src/main/res/layout/about.xml                   | 4 ----
 android/app/src/main/res/layout/fragment_osm_login.xml      | 2 --
 4 files changed, 10 deletions(-)

diff --git a/android/app/src/main/res/layout-land/about.xml b/android/app/src/main/res/layout-land/about.xml
index 2fc55d29c..9f2e4fd3b 100644
--- a/android/app/src/main/res/layout-land/about.xml
+++ b/android/app/src/main/res/layout-land/about.xml
@@ -148,7 +148,6 @@
           android:layout_height="wrap_content"
           android:layout_marginStart="@dimen/margin_half"
           android:layout_marginEnd="@dimen/margin_base"
-          android:fontFamily="@string/robotoRegular"
           android:includeFontPadding="false"
           android:text="@string/osm_presentation"
           android:textAppearance="@style/MwmTextAppearance.Body2"
@@ -170,7 +169,6 @@
           style="@style/MwmWidget.Button.Accent"
           android:layout_width="0dp"
           android:layout_height="wrap_content"
-          android:fontFamily="@string/robotoMedium"
           android:padding="@dimen/margin_quarter"
           android:text="@string/donate"
           android:textAlignment="center"
@@ -188,7 +186,6 @@
           android:layout_width="0dp"
           android:layout_height="wrap_content"
           android:background="@color/light_gray"
-          android:fontFamily="@string/robotoMedium"
           android:text="@string/report_a_bug"
           android:textAlignment="center"
           android:textColor="@color/text_dark"
diff --git a/android/app/src/main/res/layout-land/fragment_osm_login.xml b/android/app/src/main/res/layout-land/fragment_osm_login.xml
index fadc08b4d..793b746ad 100644
--- a/android/app/src/main/res/layout-land/fragment_osm_login.xml
+++ b/android/app/src/main/res/layout-land/fragment_osm_login.xml
@@ -152,7 +152,6 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/margin_base"
             android:background="@drawable/button_editor_light"
-            android:fontFamily="@string/robotoMedium"
             android:padding="@dimen/margin_quarter"
             android:text="@string/register_at_openstreetmap"
             android:textAppearance="@style/MwmTextAppearance.Body2"
diff --git a/android/app/src/main/res/layout/about.xml b/android/app/src/main/res/layout/about.xml
index 19080c264..4654a7479 100644
--- a/android/app/src/main/res/layout/about.xml
+++ b/android/app/src/main/res/layout/about.xml
@@ -74,7 +74,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/margin_half"
-        android:fontFamily="@string/robotoRegular"
         android:text="@string/about_developed_by_enthusiasts"
         android:textAppearance="@style/MwmTextAppearance.Body2"
         android:textColor="?android:textColorPrimary"
@@ -100,7 +99,6 @@
           android:layout_width="0dp"
           android:layout_height="wrap_content"
           android:layout_marginStart="@dimen/margin_half"
-          android:fontFamily="@string/robotoRegular"
           android:includeFontPadding="false"
           android:text="@string/osm_presentation"
           android:textAppearance="@style/MwmTextAppearance.Body2"
@@ -118,7 +116,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_base"
-        android:fontFamily="@string/robotoMedium"
         android:padding="@dimen/margin_quarter"
         android:text="@string/donate" />
 
@@ -129,7 +126,6 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_base"
         android:background="@color/light_gray"
-        android:fontFamily="@string/robotoMedium"
         android:text="@string/report_a_bug"
         android:textColor="@color/text_dark" />
 
diff --git a/android/app/src/main/res/layout/fragment_osm_login.xml b/android/app/src/main/res/layout/fragment_osm_login.xml
index 792973a98..d811004eb 100644
--- a/android/app/src/main/res/layout/fragment_osm_login.xml
+++ b/android/app/src/main/res/layout/fragment_osm_login.xml
@@ -125,7 +125,6 @@
       <com.google.android.material.textview.MaterialTextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fontFamily="@string/robotoRegular"
         android:text="@string/no_osm_account"
         android:textAppearance="@style/MwmTextAppearance.Body2"
         android:textColor="?android:textColorPrimary" />
@@ -136,7 +135,6 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_base"
         android:background="@drawable/button_editor_light"
-        android:fontFamily="@string/robotoMedium"
         android:padding="@dimen/margin_quarter"
         android:text="@string/register_at_openstreetmap"
         android:textAppearance="@style/MwmTextAppearance.Body2"

From c11f0070120a161e43217bec94167e515674ba58 Mon Sep 17 00:00:00 2001
From: Yannik Bloscheck <git@yannikbloscheck.com>
Date: Sat, 23 Aug 2025 10:33:51 +0200
Subject: [PATCH 199/302] [ios] Fix issue with opening urls

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
---
 iphone/Maps/Categories/UIKitCategories.m | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/iphone/Maps/Categories/UIKitCategories.m b/iphone/Maps/Categories/UIKitCategories.m
index f94e58ed7..d832f170c 100644
--- a/iphone/Maps/Categories/UIKitCategories.m
+++ b/iphone/Maps/Categories/UIKitCategories.m
@@ -181,11 +181,8 @@
 
 - (BOOL)openUrl:(NSString *)urlString externally:(BOOL)externally skipEncoding:(BOOL)skipEncoding
 {
-  NSString * encoded;
-  if (skipEncoding) {
-    encoded = urlString;
-  } else if (![urlString canBeConvertedToEncoding:NSASCIIStringEncoding])
-  {
+  NSString * encoded = urlString;
+  if (!skipEncoding && ![urlString canBeConvertedToEncoding:NSASCIIStringEncoding]) {
     // TODO: This is a temporary workaround to open cyrillic/non-ASCII URLs.
     // URLs in OSM are stored in UTF-8. NSURL constructor documentation says:
     // > Must be a URL that conforms to RFC 2396. This method parses URLString according to RFCs 1738 and 1808.

From 96a7b31f4bff5dcd3bad5bc3a5976fab519e86b5 Mon Sep 17 00:00:00 2001
From: Yannik Bloscheck <git@yannikbloscheck.com>
Date: Tue, 19 Aug 2025 21:53:00 +0200
Subject: [PATCH 200/302] [ios] Replaced some CarPlay images with system
 versions

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
---
 .../Template Builders/ListTemplateBuilder.swift  |   4 ++--
 .../Template Builders/MapTemplateBuilder.swift   |   2 +-
 .../Maps/Images.xcassets/CarPlay/Contents.json   |   6 +++---
 .../ic_carplay_bookmark.imageset/Contents.json   |  15 ---------------
 .../ic_carplay_bookmark.pdf                      | Bin 5958 -> 0 bytes
 .../ic_carplay_keyboard.imageset/Contents.json   |  15 ---------------
 .../ic_carplay_keyboard.pdf                      | Bin 4169 -> 0 bytes
 .../ic_carplay_settings.imageset/Contents.json   |  15 ---------------
 .../ic_carplay_settings.pdf                      | Bin 6867 -> 0 bytes
 9 files changed, 6 insertions(+), 51 deletions(-)
 delete mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_bookmark.imageset/Contents.json
 delete mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_bookmark.imageset/ic_carplay_bookmark.pdf
 delete mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_keyboard.imageset/Contents.json
 delete mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_keyboard.imageset/ic_carplay_keyboard.pdf
 delete mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_settings.imageset/Contents.json
 delete mode 100644 iphone/Maps/Images.xcassets/CarPlay/ic_carplay_settings.imageset/ic_carplay_settings.pdf

diff --git a/iphone/Maps/Classes/CarPlay/Template Builders/ListTemplateBuilder.swift b/iphone/Maps/Classes/CarPlay/Template Builders/ListTemplateBuilder.swift
index d0121aee1..5f48557e4 100644
--- a/iphone/Maps/Classes/CarPlay/Template Builders/ListTemplateBuilder.swift	
+++ b/iphone/Maps/Classes/CarPlay/Template Builders/ListTemplateBuilder.swift	
@@ -125,9 +125,9 @@ final class ListTemplateBuilder {
   private class func buildBarButton(type: BarButtonType, action: ((CPBarButton) -> Void)?) -> CPBarButton {
     switch type {
     case .bookmarks:
-      return CPBarButton(image: UIImage(named: "ic_carplay_bookmark")!, handler: action)
+      return CPBarButton(image: UIImage(systemName: "list.star")!, handler: action)
     case .search:
-      return CPBarButton(image: UIImage(named: "ic_carplay_keyboard")!, handler: action)
+      return CPBarButton(image: UIImage(systemName: "keyboard.fill")!, handler: action)
     }
   }
 }
diff --git a/iphone/Maps/Classes/CarPlay/Template Builders/MapTemplateBuilder.swift b/iphone/Maps/Classes/CarPlay/Template Builders/MapTemplateBuilder.swift
index 2267a3548..dc9110e7d 100644
--- a/iphone/Maps/Classes/CarPlay/Template Builders/MapTemplateBuilder.swift	
+++ b/iphone/Maps/Classes/CarPlay/Template Builders/MapTemplateBuilder.swift	
@@ -172,7 +172,7 @@ final class MapTemplateBuilder {
     case .recenter:
       return CPBarButton(title: L("follow_my_position"), handler: action)
     case .settings:
-      return CPBarButton(image: UIImage(named: "ic_carplay_settings")!, handler: action)
+      return CPBarButton(image: UIImage(systemName: "gearshape.fill")!, handler: action)
     case .mute:
       return CPBarButton(image: UIImage(named: "ic_carplay_unmuted")!, handler: action)
     case .unmute:
diff --git a/iphone/Maps/Images.xcassets/CarPlay/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/Contents.json
index da4a164c9..73c00596a 100644
--- a/iphone/Maps/Images.xcassets/CarPlay/Contents.json
+++ b/iphone/Maps/Images.xcassets/CarPlay/Contents.json
@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
\ No newline at end of file
+}
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_bookmark.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_bookmark.imageset/Contents.json
deleted file mode 100644
index 9f6082e3a..000000000
--- a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_bookmark.imageset/Contents.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "ic_carplay_bookmark.pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  },
-  "properties" : {
-    "template-rendering-intent" : "template"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_bookmark.imageset/ic_carplay_bookmark.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_bookmark.imageset/ic_carplay_bookmark.pdf
deleted file mode 100644
index 668b1bacbc70e8d538e188f2a16772e8fc3e5261..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5958
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

diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_keyboard.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_keyboard.imageset/Contents.json
deleted file mode 100644
index 857b5622e..000000000
--- a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_keyboard.imageset/Contents.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "ic_carplay_keyboard.pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  },
-  "properties" : {
-    "template-rendering-intent" : "template"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_keyboard.imageset/ic_carplay_keyboard.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_keyboard.imageset/ic_carplay_keyboard.pdf
deleted file mode 100644
index cb32fd4f9f38c385c5b7e98c3ebdcd0f3fe62732..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4169
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
JXkxU${|6rH6ea)w

diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_settings.imageset/Contents.json b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_settings.imageset/Contents.json
deleted file mode 100644
index 779364e35..000000000
--- a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_settings.imageset/Contents.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "ic_carplay_settings.pdf"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  },
-  "properties" : {
-    "template-rendering-intent" : "template"
-  }
-}
\ No newline at end of file
diff --git a/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_settings.imageset/ic_carplay_settings.pdf b/iphone/Maps/Images.xcassets/CarPlay/ic_carplay_settings.imageset/ic_carplay_settings.pdf
deleted file mode 100644
index 476ea9b0e8cc1b8921f13f44c530d0d92b98bd2e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6867
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
V#fIefKoAoV0g`fZDrzc`{vUcf?HK?7


From 0b65c2ebff7f3522af152d6ebadf998ce248f66a Mon Sep 17 00:00:00 2001
From: Yannik Bloscheck <git@yannikbloscheck.com>
Date: Tue, 19 Aug 2025 21:42:02 +0200
Subject: [PATCH 201/302] [ios] Fixed CarPlay panning not working

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
---
 .../Maps/Classes/CarPlay/CarPlayService.swift | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/iphone/Maps/Classes/CarPlay/CarPlayService.swift b/iphone/Maps/Classes/CarPlay/CarPlayService.swift
index 86b471c31..9fde1621b 100644
--- a/iphone/Maps/Classes/CarPlay/CarPlayService.swift
+++ b/iphone/Maps/Classes/CarPlay/CarPlayService.swift
@@ -399,24 +399,29 @@ extension CarPlayService: CPMapTemplateDelegate {
     FrameworkHelper.switchMyPositionMode()
   }
 
-  func mapTemplate(_ mapTemplate: CPMapTemplate, panEndedWith direction: CPMapTemplate.PanDirection) {
+  @objc(mapTemplate:panEndedWithDirection:)
+  func mapTemplate(_ mapTemplate: CPMapTemplate, panEndedWith direction: Int) {
     var offset = UIOffset(horizontal: 0.0, vertical: 0.0)
     let offsetStep: CGFloat = 0.25
-    if direction.contains(.up) { offset.vertical -= offsetStep }
-    if direction.contains(.down) { offset.vertical += offsetStep }
-    if direction.contains(.left) { offset.horizontal += offsetStep }
-    if direction.contains(.right) { offset.horizontal -= offsetStep }
+    let panDirection = CPMapTemplate.PanDirection(rawValue: direction)
+    if panDirection.contains(.up) { offset.vertical -= offsetStep }
+    if panDirection.contains(.down) { offset.vertical += offsetStep }
+    if panDirection.contains(.left) { offset.horizontal += offsetStep }
+    if panDirection.contains(.right) { offset.horizontal -= offsetStep }
     FrameworkHelper.moveMap(offset)
     isUserPanMap = true
   }
 
-  func mapTemplate(_ mapTemplate: CPMapTemplate, panWith direction: CPMapTemplate.PanDirection) {
+  
+  @objc(mapTemplate:panWithDirection:)
+  func mapTemplate(_ mapTemplate: CPMapTemplate, panWith direction: Int) {
     var offset = UIOffset(horizontal: 0.0, vertical: 0.0)
     let offsetStep: CGFloat = 0.1
-    if direction.contains(.up) { offset.vertical -= offsetStep }
-    if direction.contains(.down) { offset.vertical += offsetStep }
-    if direction.contains(.left) { offset.horizontal += offsetStep }
-    if direction.contains(.right) { offset.horizontal -= offsetStep }
+    let panDirection = CPMapTemplate.PanDirection(rawValue: direction)
+    if panDirection.contains(.up) { offset.vertical -= offsetStep }
+    if panDirection.contains(.down) { offset.vertical += offsetStep }
+    if panDirection.contains(.left) { offset.horizontal += offsetStep }
+    if panDirection.contains(.right) { offset.horizontal -= offsetStep }
     FrameworkHelper.moveMap(offset)
     isUserPanMap = true
   }

From 2e3efc0597f9705ea151f5c37ea2377213e9b77e Mon Sep 17 00:00:00 2001
From: x7z4w <x7z4w@noreply.codeberg.org>
Date: Sun, 24 Aug 2025 09:24:50 +0200
Subject: [PATCH 202/302] [generator] Add toll booth penalty

Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>
---
 generator/road_penalty_generator.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/generator/road_penalty_generator.cpp b/generator/road_penalty_generator.cpp
index 91de5b2d1..15a315ed2 100644
--- a/generator/road_penalty_generator.cpp
+++ b/generator/road_penalty_generator.cpp
@@ -51,6 +51,7 @@ std::map<OsmElement::Tag, RoadPenalty::Type> const kUnifiedPenaltyMapping = {
     {OsmElement::Tag("barrier", "gate"), RoadPenalty::Type::Gate},
     {OsmElement::Tag("barrier", "lift_gate"), RoadPenalty::Type::Gate},
     {OsmElement::Tag("barrier", "swing_gate"), RoadPenalty::Type::Gate},
+    {OsmElement::Tag("barrier", "toll_booth"), RoadPenalty::Type::Gate},
 
     // Junction penalties
     {OsmElement::Tag("highway", "stop"), RoadPenalty::Type::UncontrolledJunction},

From 46c9a015e5853af9d984e56de42c4149a15d9617 Mon Sep 17 00:00:00 2001
From: Codeberg Translate <translate@codeberg.org>
Date: Sat, 23 Aug 2025 21:21:57 +0000
Subject: [PATCH 203/302] [strings] Update from Codeberg Translate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Codeberg Translate <translate@codeberg.org>
Co-authored-by: Priit Jõerüüt <jrtcdbrg@noreply.codeberg.org>
Co-authored-by: phama <phama@noreply.codeberg.org>
Co-authored-by: sziatomi <sziatomi@noreply.codeberg.org>
Translation: CoMaps/Android - Map Feature Types
Translation: CoMaps/Android UI Strings
Translation: CoMaps/Apple AppStore description
Translation: CoMaps/iOS - Map Feature Types
Translation: CoMaps/iOS Plurals
Translation: CoMaps/iOS UI Strings
---
 .../app/src/main/res/values-et/strings.xml    |  4 ++-
 .../src/main/res/values-et/types_strings.xml  |  2 ++
 .../src/main/res/values-fi/types_strings.xml  |  2 +-
 .../app/src/main/res/values-hu/strings.xml    | 16 +++++----
 .../src/main/res/values-hu/types_strings.xml  |  4 +++
 .../et.lproj/Localizable.strings              |  6 ++--
 .../et.lproj/LocalizableTypes.strings         |  4 +--
 .../fi.lproj/Localizable.strings              |  6 ++--
 .../fi.lproj/LocalizableTypes.strings         |  2 +-
 .../hu.lproj/Localizable.strings              | 34 +++++++++----------
 .../hu.lproj/Localizable.stringsdict          |  4 +--
 .../hu.lproj/LocalizableTypes.strings         |  8 ++---
 iphone/metadata/hu/keywords.txt               |  1 +
 iphone/metadata/hu/support_url.txt            |  1 +
 14 files changed, 53 insertions(+), 41 deletions(-)
 create mode 100644 iphone/metadata/hu/keywords.txt
 create mode 100644 iphone/metadata/hu/support_url.txt

diff --git a/android/app/src/main/res/values-et/strings.xml b/android/app/src/main/res/values-et/strings.xml
index 0129b7de1..51aa8d465 100644
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -254,7 +254,7 @@
     <!-- Button in the main menu -->
     <string name="donate">Anneta</string>
     <!-- Button in the main Help dialog -->
-    <string name="how_to_support_us">Toeta meie projekti</string>
+    <string name="how_to_support_us">Osale ühistöös CoMapsi täiendamisel</string>
     <!-- Button in the main Help dialog -->
     <string name="copyright">Autoriõigused</string>
     <!-- Text in menu + Button in the main Help dialog -->
@@ -916,4 +916,6 @@
     <string name="closed_now">Praegu suletud</string>
     <string name="osm_note_toast">Märge salvestatakse OpenStreetMapi andmebaasi</string>
     <string name="osm_note_hint">Või alternatiivina jäta märge OpenStreetMapi kogukonnale ja keegi teine saab selle koha andmed parandada või uue lisada.</string>
+    <string name="share_track">Jaga rada</string>
+    <string name="delete_track_dialog_title">Kas kustutame: %s?</string>
 </resources>
diff --git a/android/app/src/main/res/values-et/types_strings.xml b/android/app/src/main/res/values-et/types_strings.xml
index a70667406..9fbc225f4 100644
--- a/android/app/src/main/res/values-et/types_strings.xml
+++ b/android/app/src/main/res/values-et/types_strings.xml
@@ -1391,4 +1391,6 @@
     <string name="type.amenity.bicycle_parking.covered">Kaetud jalgrattaparkla</string>
     <string name="type.post_office.post_partner">Postiteenused partneri juures</string>
     <string name="type.amenity.ranger_station">Pargivahi maja</string>
+    <string name="type.amenity.animal_shelter">Loomade varjupaik</string>
+    <string name="type.barrier.wicket_gate">Jalgvärav</string>
 </resources>
diff --git a/android/app/src/main/res/values-fi/types_strings.xml b/android/app/src/main/res/values-fi/types_strings.xml
index 5f4ef46d3..03e93a37c 100644
--- a/android/app/src/main/res/values-fi/types_strings.xml
+++ b/android/app/src/main/res/values-fi/types_strings.xml
@@ -1391,5 +1391,5 @@
     <string name="type.post_office.post_partner">Postikumppani</string>
     <string name="type.amenity.ranger_station">Vartioasema</string>
     <string name="type.amenity.animal_shelter">Eläinsuoja</string>
-    <string name="type.barrier.wicket_gate">Käyntiovi</string>
+    <string name="type.barrier.wicket_gate">Käyntiportti</string>
 </resources>
diff --git a/android/app/src/main/res/values-hu/strings.xml b/android/app/src/main/res/values-hu/strings.xml
index 51dee8297..78f17f113 100644
--- a/android/app/src/main/res/values-hu/strings.xml
+++ b/android/app/src/main/res/values-hu/strings.xml
@@ -36,22 +36,22 @@
     <string name="country_status_download_failed">Sikertelen letöltés</string>
     <!-- Button text for the button under the country_status_download_failed message -->
     <string name="try_again">Újrapróbálkozás</string>
-    <string name="about_menu_title">Az CoMaps névjegye</string>
+    <string name="about_menu_title">A CoMaps névjegye</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_1">• Nincs hirdetés, nyomon követés és adatgyűjtés</string>
+    <string name="about_proposition_1">• Könnyen használható és szép grafikus felülettel rendelkezik</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_2">• Nem merül le az akkumulátor – offline is működik</string>
+    <string name="about_proposition_2">• Az adatvédelemre összpontosít és nincs hirdetés</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_3">• Offline, gyors és kompakt</string>
+    <string name="about_proposition_3">• Offline, kis méretű, gyors és jól összeállított</string>
     <!-- Text in About screen -->
-    <string name="about_developed_by_enthusiasts">A rajongók és az önkéntesek által létrehozott nyílt forráskódú alkalmazás.</string>
+    <string name="about_developed_by_enthusiasts">Átlátható döntéshozatal és pénzügyek, nem profitorientált és teljesen nyílt forráskódú.</string>
     <!-- The button that opens system location settings -->
     <string name="location_settings">Helymeghatározási beállítások</string>
     <string name="close">Bezár</string>
     <string name="unsupported_phone">Hardveres gyorsítású OpenGL szükséges. Sajnos az Ön eszköze nem támogatott.</string>
     <string name="download">Letöltés</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Bontsa az USB-kapcsolatot vagy helyezzen be egy memóriakártyát az CoMaps használatához</string>
+    <string name="disconnect_usb_cable">A CoMaps használatához húzza ki az USB-kábelt, vagy helyezze be a memóriakártyát</string>
     <!-- Used in DownloadResources startup screen -->
     <string name="not_enough_free_space_on_sdcard">Az alkalmazás használatához először szabadítson fel némi helyet az SD-kártyán/USB-tárolón</string>
     <string name="download_resources">Mielőtt elkezdené használni az alkalmazást, töltse le az áttekintő világtérképet az eszközre. \nEz %s tárhelyet fog igénybe venni.</string>
@@ -232,7 +232,7 @@
     <!-- Settings «Route» category: «Tts language» title -->
     <string name="pref_tts_language_title">A hangutasítások nyelve</string>
     <!-- Settings «Route» category: «Test Voice Directions» title -->
-    <string name="pref_tts_test_voice_title">Hangutasítások tesztelése (TTS)</string>
+    <string name="pref_tts_test_voice_title">Hangutasítások tesztelése</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
     <string name="pref_tts_playing_test_voice">Ellenőrizze a hangerőt vagy a rendszer TTS-beállításait, ha most nem hallja a hangot.</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
@@ -870,4 +870,6 @@
     <string name="panoramax">Panoramax kép</string>
     <string name="app_site_url">https://comaps.app/hu/</string>
     <string name="saved">Mentett</string>
+    <string name="about_headline">Közösség által működtetett nyílt projekt</string>
+    <string name="bluesky">Bluesky</string>
 </resources>
diff --git a/android/app/src/main/res/values-hu/types_strings.xml b/android/app/src/main/res/values-hu/types_strings.xml
index 6f956264e..13dc08493 100644
--- a/android/app/src/main/res/values-hu/types_strings.xml
+++ b/android/app/src/main/res/values-hu/types_strings.xml
@@ -1366,4 +1366,8 @@
     <string name="type.piste_type.downhill.intermediate.area">Sípálya középhaladóknak</string>
     <string name="type.piste_type.downhill.easy.area">Sípálya újoncoknak</string>
     <string name="type.piste_type.downhill.freeride">Természetes eredetű sípálya</string>
+    <string name="type.amenity.luggage_locker">Poggyászmegőrző</string>
+    <string name="type.amenity.love_hotel">Szálloda szerelmeseknek</string>
+    <string name="type.amenity.studio">Stúdió</string>
+    <string name="type.amenity.bicycle_parking.covered">Fedett kerékpár tároló</string>
 </resources>
diff --git a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
index ed5475817..031c1c1ec 100644
--- a/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/et.lproj/Localizable.strings
@@ -322,7 +322,7 @@
 "report_incorrect_map_bug" = "Paranda vigaseid kaardiandmeid või teata neist";
 
 /* Button in the About screen */
-"volunteer" = "Vabatahtlik kaastöö";
+"volunteer" = "Osale ühistöös CoMapsi täiendamisel";
 
 /* "Social media" section header in the About screen */
 "follow_us" = "Suhtle meiega";
@@ -1093,5 +1093,5 @@
 "pref_maplanguage_title" = "Kaardi keel";
 "transliteration_title_disabled_summary" = "Kui kaardil on alati kasutusel kohalik keel, siis see eelistus on välja lülitatud";
 "pref_maplanguage_local" = "Kohalik keel";
-"existence_confirmed_time_ago" = "Existence confirmed %@";
-"hours_confirmed_time_ago" = "Confirmed %@";
+"existence_confirmed_time_ago" = "Olemasolu on kontrollitud %@";
+"hours_confirmed_time_ago" = "Kontrollitud %@";
diff --git a/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings
index d1b722098..65f28f709 100644
--- a/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings
@@ -1482,5 +1482,5 @@
 "type.amenity.ranger_station" = "Pargivahi maja";
 "type.amenity.luggage_locker" = "Pagasihoid";
 "type.post_office.post_partner" = "Postiteenused partneri juures";
-"type.barrier.wicket_gate" = "Wicket gate";
-"type.amenity.animal_shelter" = "Animal Shelter";
+"type.barrier.wicket_gate" = "Jalgvärav";
+"type.amenity.animal_shelter" = "Loomade varjupaik";
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
index a51ad7fd6..a979832b3 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/Localizable.strings
@@ -325,7 +325,7 @@
 "report_incorrect_map_bug" = "Ilmoita tai korjaa virheelliset karttatiedot";
 
 /* Button in the About screen */
-"volunteer" = "Vapaaehtoiseksi";
+"volunteer" = "Ryhdy vapaaehtoiseksi ja auta parantamaan CoMapsia";
 
 /* "Social media" section header in the About screen */
 "follow_us" = "Ota yhteyttä";
@@ -1095,5 +1095,5 @@
 "pref_maplanguage_title" = "Karttakieli";
 "transliteration_title_disabled_summary" = "Kytke pois käytöstä, jos käytät aina paikallista kieltä kartalle";
 "pref_maplanguage_local" = "Paikallinen kieli";
-"existence_confirmed_time_ago" = "Existence confirmed %@";
-"hours_confirmed_time_ago" = "Confirmed %@";
+"existence_confirmed_time_ago" = "Olemassaolo varmistettu %@";
+"hours_confirmed_time_ago" = "Varmistettu %@";
diff --git a/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings
index 51b982167..1e3e1f370 100644
--- a/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/fi.lproj/LocalizableTypes.strings
@@ -1483,4 +1483,4 @@
 "type.amenity.ranger_station" = "Vartioasema";
 "type.amenity.bicycle_parking.covered" = "Pyöräkatos";
 "type.amenity.animal_shelter" = "Eläinsuoja";
-"type.barrier.wicket_gate" = "Wicket gate";
+"type.barrier.wicket_gate" = "Käyntiportti";
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index 92986cf6e..406696675 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -46,7 +46,7 @@
 "about_proposition_1" = "Offline, gyors és könnyen használható";
 
 /* Text in About screen */
-"about_proposition_2" = "Adatvédelem-központú és hirdetésmentes";
+"about_proposition_2" = "Az adatvédelemre összpontosít és nincs hirdetés";
 "close" = "Bezár";
 "download" = "Letöltés";
 
@@ -199,7 +199,7 @@
 "share_my_location" = "Saját helyzet megosztása";
 "prefs_group_route" = "Navigáció";
 "pref_zoom_title" = "Nagyítás/kicsinyítés gombok";
-"pref_left_button_type" = "Left Main Button";
+"pref_left_button_type" = "Bal oldali főgomb";
 
 /* Settings «Map» category: «Appearance» title */
 "pref_appearance_title" = "Megjelenés";
@@ -211,7 +211,7 @@
 "pref_appearance_dark" = "Sötét";
 
 /* Generic «Disabled» string */
-"disabled" = "Disabled";
+"disabled" = "Letiltva";
 
 /* Generic «Off» string */
 "off" = "Ki";
@@ -235,7 +235,7 @@
 "pref_tts_title" = "Hangutasítások";
 
 /* Settings «Route» category: «Tts enable» title */
-"pref_tts_enable_title" = "Enable Voice Instructions";
+"pref_tts_enable_title" = "Hangutasítások engedélyezése";
 
 /* Settings «Route» category: «Tts announce street names» title */
 "pref_tts_street_names_title" = "Utcanevek felolvasása";
@@ -247,7 +247,7 @@
 "pref_tts_language_title" = "A hangutasítások nyelve";
 
 /* Settings «Route» category: «Test Voice Directions» title */
-"pref_tts_test_voice_title" = "Hangutasítások tesztelése (TTS)";
+"pref_tts_test_voice_title" = "Hangutasítások tesztelése";
 
 /* Title for "Other" section in TTS settings. */
 "pref_tts_other_section_title" = "Egyéb";
@@ -268,7 +268,7 @@
 "social_matrix" = "Matrix";
 "social_bluesky" = "Bluesky";
 "social_pixelfed" = "Pixelfed";
-"social_email" = "E-Mail";
+"social_email" = "E-mail";
 
 /* Text in the editor */
 "fediverse" = "Mastodon";
@@ -319,7 +319,7 @@
 "report_incorrect_map_bug" = "Hibás térképadatok jelentése vagy javítása";
 
 /* Button in the About screen */
-"volunteer" = "Önkéntes";
+"volunteer" = "Önkéntes munka és a CoMaps fejlesztése";
 
 /* "Social media" section header in the About screen */
 "follow_us" = "Csatlakozzon hozzánk";
@@ -747,7 +747,7 @@
 "placepage_remove_stop" = "Megálló eltávolítása";
 "planning_route_remove_title" = "Húzza ide az eltávolításhoz";
 "placepage_add_stop" = "Köztes célpont hozzáadása";
-"start_from_my_position" = "Kiindulás innen:";
+"start_from_my_position" = "Kiindulás innen";
 
 /* Title for button when a route was saved. */
 "saved" = "Mentett";
@@ -1009,7 +1009,7 @@
 "bugreport_alert_message" = "Szeretne hibajelentést küldeni a fejlesztőknek?\nA felhasználóinkra támaszkodunk, mivel az CoMaps nem gyűjt automatikusan hibainformációkat. Előre is köszönjük, hogy támogatja az CoMaps csapatát!";
 
 /* Title for the iCloud syncronization setting */
-"icloud_sync" = "iCloud Syncronization (Beta)";
+"icloud_sync" = "iCloud-szinkronizálás (Béta)";
 
 /* Title for the "Enable iCloud Syncronization" alert. */
 "enable_icloud_synchronization_title" = "iCloud-szinkronizálás engedélyezése";
@@ -1085,11 +1085,11 @@
 "edit_track" = "Nyomvonal szerkesztése";
 "osm_profile_view_notes" = "Jegyzetek megtekintése";
 "osm_profile_view_edit_history" = "Szerkesztési előzmények megtekintése";
-"about_proposition_3" = "Transparent and not for profit";
-"about_headline" = "Open project powered by the community";
-"pref_mapappearance_title" = "Map Appearance";
-"pref_maplanguage_title" = "Map Language";
-"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
-"pref_maplanguage_local" = "Local Language";
-"existence_confirmed_time_ago" = "Existence confirmed %@";
-"hours_confirmed_time_ago" = "Confirmed %@";
+"about_proposition_3" = "Átlátható és nem profitorientált";
+"about_headline" = "Közösség által működtetett nyílt projekt";
+"pref_mapappearance_title" = "A térkép megjelenése";
+"pref_maplanguage_title" = "A térkép nyelve";
+"transliteration_title_disabled_summary" = "Letiltva, ha mindig a helyi nyelvet használja a térképen";
+"pref_maplanguage_local" = "A helyi nyelv";
+"existence_confirmed_time_ago" = "A létezés megerősítve %@";
+"hours_confirmed_time_ago" = "Megerősítve %@";
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.stringsdict
index ad46cdd48..5af4b723c 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.stringsdict
@@ -33,9 +33,9 @@
 			<key>zero</key>
 			<string>%d fájl található. Látni fogja a konvertálás után.</string>
 			<key>one</key>
-			<string>%d fájl található. Látni fogja azt a konvertálás után.</string>
+			<string>%d fájl található. Ezt a konvertálás után fogja látni.</string>
 			<key>other</key>
-			<string>%d fájl található. Látni fogja azokat a konvertálás után.</string>
+			<string>%d fájl található. Ezeket a konvertálás után fogja látni.</string>
 		</dict>
 	</dict>
 	<key>tracks</key>
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings
index 528efdb8d..06f812ee4 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings
@@ -1467,16 +1467,16 @@
 "type.natural.wetland.swamp" = "Swamp";
 "type.natural.wetland.saltmarsh" = "Salt Marsh";
 "type.natural.wetland.mangrove" = "Mangrove";
-"type.amenity.studio" = "Studio";
+"type.amenity.studio" = "Stúdió";
 "type.natural.wetland.fen" = "Fen";
 "type.natural.wetland.saltmarsh.tidal" = "Tidal Salt Marsh";
 "type.natural.wetland.reedbed" = "Reed Bed";
 "type.railway.station.subway.qingdao" = "Subway Station";
-"type.amenity.love_hotel" = "Love Hotel";
+"type.amenity.love_hotel" = "Szálloda szerelmeseknek";
 "type.leisure.escape_game" = "Escape Room";
-"type.amenity.luggage_locker" = "Luggage Locker";
+"type.amenity.luggage_locker" = "Poggyászmegőrző";
 "type.amenity.ranger_station" = "Ranger Station";
-"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
+"type.amenity.bicycle_parking.covered" = "Fedett kerékpár tároló";
 "type.post_office.post_partner" = "Post Partner";
 "type.barrier.wicket_gate" = "Wicket gate";
 "type.amenity.animal_shelter" = "Animal Shelter";
diff --git a/iphone/metadata/hu/keywords.txt b/iphone/metadata/hu/keywords.txt
new file mode 100644
index 000000000..3df54ef38
--- /dev/null
+++ b/iphone/metadata/hu/keywords.txt
@@ -0,0 +1 @@
+comaps,open street maps,osm,térképek,utazás,túrázás,kerékpározás,vezetés,magánélet,navigáció,gps
diff --git a/iphone/metadata/hu/support_url.txt b/iphone/metadata/hu/support_url.txt
new file mode 100644
index 000000000..f93b754b6
--- /dev/null
+++ b/iphone/metadata/hu/support_url.txt
@@ -0,0 +1 @@
+https://codeberg.org/comaps/comaps/issues

From 4d6cecd9bab3d197a67b4bbae9d59135abc8d123 Mon Sep 17 00:00:00 2001
From: Codeberg Translate <translate@codeberg.org>
Date: Sun, 24 Aug 2025 07:25:12 +0000
Subject: [PATCH 204/302] [strings] Update from Codeberg Translate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Codeberg Translate <translate@codeberg.org>
Co-authored-by: Priit Jõerüüt <jrtcdbrg@noreply.codeberg.org>
Co-authored-by: Stephan-P <stephan-p@noreply.codeberg.org>
Co-authored-by: Weblate <noreply-mt-weblate@weblate.org>
Co-authored-by: phama <phama@noreply.codeberg.org>
Co-authored-by: sziatomi <sziatomi@noreply.codeberg.org>
Translation: CoMaps/Android - Map Feature Types
Translation: CoMaps/Android UI Strings
Translation: CoMaps/Apple AppStore description
Translation: CoMaps/iOS - Map Feature Types
Translation: CoMaps/iOS Plist
Translation: CoMaps/iOS Plurals
Translation: CoMaps/iOS UI Strings
---
 .../src/main/res/values-hu/types_strings.xml  | 36 +++++++++---
 .../app/src/main/res/values-nl/strings.xml    | 32 ++++++-----
 .../src/main/res/values-nl/types_strings.xml  |  2 +
 .../hu.lproj/Localizable.stringsdict          |  4 +-
 .../hu.lproj/LocalizableTypes.strings         | 56 +++++++++----------
 .../nl.lproj/InfoPlist.strings                |  2 +-
 .../nl.lproj/Localizable.strings              | 26 ++++-----
 .../nl.lproj/LocalizableTypes.strings         |  4 +-
 8 files changed, 93 insertions(+), 69 deletions(-)

diff --git a/android/app/src/main/res/values-hu/types_strings.xml b/android/app/src/main/res/values-hu/types_strings.xml
index 13dc08493..58c726ec7 100644
--- a/android/app/src/main/res/values-hu/types_strings.xml
+++ b/android/app/src/main/res/values-hu/types_strings.xml
@@ -164,7 +164,7 @@
     <string name="type.barrier.entrance">Bejárat</string>
     <string name="type.barrier.gate">Kapu</string>
     <string name="type.barrier.kissing_gate">Lengőkapu</string>
-    <string name="type.barrier.lift_gate">Emelkedő sorompó</string>
+    <string name="type.barrier.lift_gate">Felnyitható sorompó</string>
     <string name="type.barrier.stile">Kerítésátjáró</string>
     <string name="type.barrier.turnstile">Forgókapu</string>
     <string name="type.barrier.swing_gate">Elforduló sorompó</string>
@@ -775,7 +775,7 @@
     <string name="type.railway.station.subway.lille">Metróállomás</string>
     <string name="type.railway.station.subway.lima">Metróállomás</string>
     <string name="type.railway.station.subway.lisboa">Metróállomás</string>
-    <string name="type.railway.station.subway.london">Metróállomás</string>
+    <string name="type.railway.station.subway.london">Földalatti állomás</string>
     <string name="type.railway.station.subway.lyon">Metróállomás</string>
     <string name="type.railway.station.subway.madrid">Metróállomás</string>
     <string name="type.railway.station.subway.malaga">Metróállomás</string>
@@ -1005,7 +1005,7 @@
     <string name="type.shop.laundry">Mosoda</string>
     <string name="type.shop.mall">Bevásárlóközpont</string>
     <string name="type.shop.massage">Masszázsszalon</string>
-    <string name="type.shop.mobile_phone">Mobiltelefon-üzlet</string>
+    <string name="type.shop.mobile_phone">Mobiltelefon bolt</string>
     <string name="type.shop.money_lender">Pénzkölcsönző</string>
     <string name="type.shop.motorcycle">Motorkerékpár-szaküzlet</string>
     <string name="type.shop.motorcycle_repair">Motorkerékpár-szerviz</string>
@@ -1304,7 +1304,7 @@
     <string name="type.aerialway.mixed_lift">Vegyes sífelvonó</string>
     <string name="type.boundary.administrative.3">Tartományhatár</string>
     <string name="type.boundary.administrative.4">Regionális határ</string>
-    <string name="type.leisure.hackerspace">Hackerspace</string>
+    <string name="type.leisure.hackerspace">Hacker-tér (hackerspace)</string>
     <string name="type.leisure.marina">Kishajókikötő</string>
     <string name="type.man_made.cairn">Kőhalom (mesterséges)</string>
     <string name="type.railway.light_rail">Könnyűvasút, HÉV</string>
@@ -1361,13 +1361,33 @@
     <string name="type.piste_type.downhill.intermediate">Sípálya középhaladóknak</string>
     <string name="type.piste_type.downhill.area">Sípálya</string>
     <string name="type.piste_type.downhill.advanced">Sípálya tapasztaltaknak</string>
-    <string name="type.piste_type.downhill.easy">Sípálya újoncoknak</string>
+    <string name="type.piste_type.downhill.easy">Könnyű sípálya</string>
     <string name="type.piste_type.downhill.expert.area">Sípálya szakértőknek</string>
     <string name="type.piste_type.downhill.intermediate.area">Sípálya középhaladóknak</string>
-    <string name="type.piste_type.downhill.easy.area">Sípálya újoncoknak</string>
-    <string name="type.piste_type.downhill.freeride">Természetes eredetű sípálya</string>
+    <string name="type.piste_type.downhill.easy.area">Könnyű sípálya</string>
+    <string name="type.piste_type.downhill.freeride">Természetes eredetű sípálya (ingyenes)</string>
     <string name="type.amenity.luggage_locker">Poggyászmegőrző</string>
     <string name="type.amenity.love_hotel">Szálloda szerelmeseknek</string>
     <string name="type.amenity.studio">Stúdió</string>
-    <string name="type.amenity.bicycle_parking.covered">Fedett kerékpár tároló</string>
+    <string name="type.amenity.bicycle_parking.covered">Fedett kerékpártároló</string>
+    <string name="type.post_office.post_partner">Posta partner</string>
+    <string name="type.amenity.animal_shelter">Állatmenhely</string>
+    <string name="type.barrier.guard_rail">Védőkorlát</string>
+    <string name="type.barrier.wicket_gate">Útelzáró sorompó</string>
+    <string name="type.highway.ladder">Létra</string>
+    <string name="type.landuse.plant_nursery">Faiskola</string>
+    <string name="type.leisure.firepit">Tűzrakóhely</string>
+    <string name="type.man_made.crane">Daru</string>
+    <string name="type.natural.wetland.saltmarsh.tidal">Dagályos sós mocsár</string>
+    <string name="type.natural.wetland.fen">Láp (mocsaras rét)</string>
+    <string name="type.natural.wetland.reedbed">Nádas</string>
+    <string name="type.natural.wetland.swamp">Ingovány</string>
+    <string name="type.natural.wetland.mangrove">Mangrove mocsár</string>
+    <string name="type.natural.wetland.tidalflat">Árapály</string>
+    <string name="type.railway.station.subway.qingdao">Metróállomás</string>
+    <string name="type.sport.diving">Légzőkészülék nélküli búvárkodás</string>
+    <string name="type.landuse.religious">Vallási föld</string>
+    <string name="type.natural.wetland.saltmarsh">Sós mocsár</string>
+    <string name="type.amenity.ranger_station">Erdészház</string>
+    <string name="type.leisure.escape_game">Szabadulószoba</string>
 </resources>
diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml
index e4c3656d1..f62876483 100644
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -74,7 +74,7 @@
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
     <string name="bookmarks">Bladwijzers</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Bladwijzers en tracks</string>
+    <string name="bookmarks_and_tracks">Bladwijzers en sporen</string>
     <!-- Default bookmark list name -->
     <string name="core_my_places">Mijn plaatsen</string>
     <!-- Add bookmark dialog - bookmark name -->
@@ -203,7 +203,7 @@
     <!-- Confirmation for OpenStreetMap log out. -->
     <string name="osm_log_out_confirmation">Weet u zeker dat u wilt uitloggen uit uw OpenStreetMap account?</string>
     <!-- Title for tracks category in bookmarks manager -->
-    <string name="tracks_title">Tracks</string>
+    <string name="tracks_title">Sporen</string>
     <!-- Length of track in cell that describes route -->
     <string name="length">Lengte</string>
     <string name="share_my_location">Mijn locatie delen</string>
@@ -260,7 +260,7 @@
     <!-- Button in the main menu -->
     <string name="donate">Doneren</string>
     <!-- Button in the main Help dialog -->
-    <string name="how_to_support_us">Steun het project</string>
+    <string name="how_to_support_us">Draag bij en verbeter CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="copyright">Auteursrechten</string>
     <!-- Text in menu + Button in the main Help dialog -->
@@ -557,7 +557,7 @@
     <string name="editor_share_to_all_dialog_message_2">OpenStreetMap-editors zullen de wijzigingen controleren en contact met u opnemen als ze vragen hebben</string>
     <string name="navigation_stop_button">Stop</string>
     <!-- Shown as toast when starting the recent track recording -->
-    <string name="track_recording">Het spoor opnemen</string>
+    <string name="track_recording">Spoor opnemen</string>
     <!-- For the first routing -->
     <string name="accept">Accepteer</string>
     <!-- For the first routing -->
@@ -609,7 +609,7 @@
     </plurals>
     <string name="bookmarks_create_new_group">Maak een nieuwe lijst</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Importeer bladwijzers en tracks</string>
+    <string name="bookmarks_import">Bladwijzers en sporen importeren</string>
     <string name="bookmarks_error_message_share_general">Delen is onmogelijk wegens een toepassingsfout</string>
     <string name="bookmarks_error_title_share_empty">Deelfout</string>
     <string name="bookmarks_error_message_share_empty">Een lege lijst kan niet gedeeld worden</string>
@@ -627,8 +627,8 @@
     </plurals>
     <string name="restore">Zet terug</string>
     <plurals name="tracks">
-        <item quantity="one">%d track</item>
-        <item quantity="other">%d tracks</item>
+        <item quantity="one">%d spoor</item>
+        <item quantity="other">%d sporen</item>
     </plurals>
     <!-- Settings privacy group in settings screen -->
     <string name="privacy">Privacy</string>
@@ -814,7 +814,7 @@
     <string name="browser_not_available">Webbrowser is niet beschikbaar</string>
     <string name="volume">Volume</string>
     <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Exporteer alle bladwijzers en tracks</string>
+    <string name="bookmarks_export">Alle bladwijzers en sporen exporteren</string>
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
     <string name="pref_tts_open_system_settings">Instellingen spraaksynthesesysteem</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -838,21 +838,21 @@
     <!-- Disclaimer summary shown when Power Saving Mode is enabled -->
     <string name="power_save_dialog_summary">Voor de meest nauwkeurige navigatie raden we aan om de energiebesparende modus uit te schakelen in de batterij-instellingen van de telefoon.</string>
     <!-- Prompt to start recording a track. -->
-    <string name="start_track_recording">Route opnemen</string>
+    <string name="start_track_recording">Spoor opnemen</string>
     <!-- Prompt for stopping a track recording. -->
-    <string name="stop_track_recording">Stop opname van route</string>
+    <string name="stop_track_recording">Stop spoor opnemen</string>
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="stop_without_saving">Stoppen zonder op te slaan</string>
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="continue_recording">Opname voortzetten</string>
     <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Opname opslaan in bladwijzers en tracks?</string>
+    <string name="track_recording_alert_title">Opslaan in bladwijzers en sporen?</string>
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
-    <string name="track_recording_toast_nothing_to_save">Route is leeg - niets om op te slaan</string>
+    <string name="track_recording_toast_nothing_to_save">Spoor is leeg - niets op te slaan</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
     <string name="error_no_file_manager_app">Kan het mappen-selecteerscherm niet weergeven omdat er geen geschikte app op uw apparaat is geïnstalleerd. Installeer een app voor bestandsbeheer en probeer het opnieuw.</string>
     <string name="choose_color">Kies een kleur</string>
-    <string name="edit_track">Route bewerken</string>
+    <string name="edit_track">Spoor bewerken</string>
     <string name="uri_open_location_failed">Geen app geïnstalleerd die de locatie kan openen</string>
     <!-- preference string for using auto theme only in navigation mode -->
     <string name="nav_auto">Auto in navigatie</string>
@@ -896,13 +896,13 @@
     <string name="bookmark_color">Bladwijzer kleur</string>
     <string name="backup_interval_every_day">Dagelijks</string>
     <string name="backup_interval_manual_only">Uit (alleen handmatig)</string>
-    <string name="pref_backup_title">Back-up van bladwijzers en tracks</string>
+    <string name="pref_backup_title">Back-up van bladwijzers en sporen</string>
     <string name="pref_backup_summary">Automatisch back-up maken naar een map op je apparaat</string>
     <string name="pref_backup_now_title">Nu back-uppen</string>
     <string name="pref_backup_now_summary">Maak onmiddellijk een back-up</string>
     <string name="pref_backup_now_summary_progress">Bezig met het maken van back-up…</string>
     <string name="pref_backup_now_summary_ok">Back-up succesvol voltooid</string>
-    <string name="pref_backup_now_summary_empty_lists">Geen bladwijzers en tracks om een back-up van te maken</string>
+    <string name="pref_backup_now_summary_empty_lists">Geen bladwijzers en sporen voor een back-up</string>
     <string name="pref_backup_status_summary_success">Laatste succesvolle back-up</string>
     <string name="pref_backup_interval_title">Automatische back-up</string>
     <string name="pref_backup_location_title">Back-up locatie</string>
@@ -920,4 +920,6 @@
     <string name="dialog_report_error_with_logs">Stuur ons een foutenrapport:\n - stel \"Logboek inschakelen\" in bij de Instellingen\n - reproduceer het probleem\n - druk in het scherm \"Over &amp; Hulp\" op de knop \"Meld een fout\" en verzend via e-mail of chat\n - logboek uitschakelen</string>
     <string name="osm_note_toast">Opmerking wordt verzonden naar OpenStreetMap</string>
     <string name="osm_note_hint">Of laat een opmerking achter bij de OpenStreetMap-gemeenschap, zodat iemand anders hier een plaats kan toevoegen of verbeteren.</string>
+    <string name="share_track">Spoor delen</string>
+    <string name="delete_track_dialog_title">%s verwijderen?</string>
 </resources>
diff --git a/android/app/src/main/res/values-nl/types_strings.xml b/android/app/src/main/res/values-nl/types_strings.xml
index eaae470f3..1ec5cb7e5 100644
--- a/android/app/src/main/res/values-nl/types_strings.xml
+++ b/android/app/src/main/res/values-nl/types_strings.xml
@@ -1391,4 +1391,6 @@
     <string name="type.post_office.post_partner">Post partner</string>
     <string name="type.leisure.escape_game">Escaperoom</string>
     <string name="type.amenity.ranger_station">Boswachterkantoor</string>
+    <string name="type.amenity.animal_shelter">Dierenasiel</string>
+    <string name="type.barrier.wicket_gate">Klinket</string>
 </resources>
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.stringsdict
index 5af4b723c..f0dbf4dd6 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.stringsdict
@@ -31,7 +31,7 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>zero</key>
-			<string>%d fájl található. Látni fogja a konvertálás után.</string>
+			<string>Nem található fájl.</string>
 			<key>one</key>
 			<string>%d fájl található. Ezt a konvertálás után fogja látni.</string>
 			<key>other</key>
@@ -49,7 +49,7 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>zero</key>
-			<string>%d nyomvonal</string>
+			<string>Nincs nyomvonal</string>
 			<key>one</key>
 			<string>%d nyomvonal</string>
 			<key>other</key>
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings
index 06f812ee4..e6adbbe1c 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings
@@ -203,7 +203,7 @@
 "type.barrier.gate" = "Kapu";
 "type.barrier.hedge" = "Sövény";
 "type.barrier.kissing_gate" = "Lengőkapu";
-"type.barrier.lift_gate" = "Emelkedő sorompó";
+"type.barrier.lift_gate" = "Felnyitható sorompó";
 "type.barrier.retaining_wall" = "Támfal";
 "type.barrier.stile" = "Kerítésátjáró";
 "type.barrier.turnstile" = "Forgókapu";
@@ -650,7 +650,7 @@
 
 /* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.landuse.cemetery.christian" = "Keresztény temető";
-"type.landuse.religious" = "Religious Land";
+"type.landuse.religious" = "Vallási föld";
 "type.landuse.commercial" = "Üzleti terület";
 "type.landuse.construction" = "Építési terület";
 "type.landuse.education" = "Oktatási létesítmény";
@@ -690,7 +690,7 @@
 "type.leisure.garden.residential" = "Házikert";
 "type.leisure.golf_course" = "Golfpálya";
 "type.leisure.miniature_golf" = "Minigolf";
-"type.leisure.hackerspace" = "Hackerspace";
+"type.leisure.hackerspace" = "Hacker-tér (hackerspace)";
 "type.leisure.ice_rink" = "Jégpálya";
 "type.leisure.nature_reserve" = "Természetvédelmi terület";
 "type.leisure.outdoor_seating" = "Kiülős helyek";
@@ -994,7 +994,7 @@
 "type.railway.station.subway.lille" = "Metróállomás";
 "type.railway.station.subway.lima" = "Metróállomás";
 "type.railway.station.subway.lisboa" = "Metróállomás";
-"type.railway.station.subway.london" = "Metróállomás";
+"type.railway.station.subway.london" = "Földalatti állomás";
 "type.railway.station.subway.lyon" = "Metróállomás";
 "type.railway.station.subway.madrid" = "Metróállomás";
 "type.railway.station.subway.malaga" = "Metróállomás";
@@ -1233,7 +1233,7 @@
 "type.shop.laundry" = "Mosoda";
 "type.shop.mall" = "Bevásárlóközpont";
 "type.shop.massage" = "Masszázsszalon";
-"type.shop.mobile_phone" = "Mobiltelefon-üzlet";
+"type.shop.mobile_phone" = "Mobiltelefon bolt";
 "type.shop.money_lender" = "Pénzkölcsönző";
 "type.shop.motorcycle" = "Motorkerékpár-szaküzlet";
 "type.shop.motorcycle_repair" = "Motorkerékpár-szerviz";
@@ -1416,11 +1416,11 @@
 "type.piste_type.downhill.area" = "Sípálya";
 "type.piste_type.downhill.advanced" = "Sípálya tapasztaltaknak";
 "type.piste_type.downhill.advanced.area" = "Sípálya tapasztaltaknak";
-"type.piste_type.downhill.easy" = "Sípálya újoncoknak";
-"type.piste_type.downhill.easy.area" = "Sípálya újoncoknak";
+"type.piste_type.downhill.easy" = "Könnyű sípálya";
+"type.piste_type.downhill.easy.area" = "Könnyű sípálya";
 "type.piste_type.downhill.expert" = "Sípálya szakértőknek";
 "type.piste_type.downhill.expert.area" = "Sípálya szakértőknek";
-"type.piste_type.downhill.freeride" = "Természetes eredetű sípálya";
+"type.piste_type.downhill.freeride" = "Természetes eredetű sípálya (ingyenes)";
 "type.piste_type.downhill.intermediate" = "Sípálya középhaladóknak";
 "type.piste_type.downhill.intermediate.area" = "Sípálya középhaladóknak";
 "type.piste_type.downhill.novice" = "Sípálya kezdőknek";
@@ -1457,26 +1457,26 @@
 "type.boundary.administrative.4" = "Regionális határ";
 "type.leisure.marina" = "Kishajókikötő";
 "type.man_made.cairn" = "Kőhalom (mesterséges)";
-"type.barrier.guard_rail" = "Guard Rail";
-"type.highway.ladder" = "Ladder";
-"type.landuse.plant_nursery" = "Plant Nursery";
-"type.man_made.crane" = "Crane";
-"type.leisure.firepit" = "Firepit";
-"type.natural.wetland.tidalflat" = "Tidal Flat";
-"type.sport.diving" = "High Diving";
-"type.natural.wetland.swamp" = "Swamp";
-"type.natural.wetland.saltmarsh" = "Salt Marsh";
-"type.natural.wetland.mangrove" = "Mangrove";
+"type.barrier.guard_rail" = "Védőkorlát";
+"type.highway.ladder" = "Létra";
+"type.landuse.plant_nursery" = "Faiskola";
+"type.man_made.crane" = "Daru";
+"type.leisure.firepit" = "Tűzrakóhely";
+"type.natural.wetland.tidalflat" = "Árapály";
+"type.sport.diving" = "Légzőkészülék nélküli búvárkodás";
+"type.natural.wetland.swamp" = "Ingovány";
+"type.natural.wetland.saltmarsh" = "Sós mocsár";
+"type.natural.wetland.mangrove" = "Mangrove mocsár";
 "type.amenity.studio" = "Stúdió";
-"type.natural.wetland.fen" = "Fen";
-"type.natural.wetland.saltmarsh.tidal" = "Tidal Salt Marsh";
-"type.natural.wetland.reedbed" = "Reed Bed";
-"type.railway.station.subway.qingdao" = "Subway Station";
+"type.natural.wetland.fen" = "Láp (mocsaras rét)";
+"type.natural.wetland.saltmarsh.tidal" = "Dagályos sós mocsár";
+"type.natural.wetland.reedbed" = "Nádas";
+"type.railway.station.subway.qingdao" = "Metróállomás";
 "type.amenity.love_hotel" = "Szálloda szerelmeseknek";
-"type.leisure.escape_game" = "Escape Room";
+"type.leisure.escape_game" = "Szabadulószoba";
 "type.amenity.luggage_locker" = "Poggyászmegőrző";
-"type.amenity.ranger_station" = "Ranger Station";
-"type.amenity.bicycle_parking.covered" = "Fedett kerékpár tároló";
-"type.post_office.post_partner" = "Post Partner";
-"type.barrier.wicket_gate" = "Wicket gate";
-"type.amenity.animal_shelter" = "Animal Shelter";
+"type.amenity.ranger_station" = "Erdészház";
+"type.amenity.bicycle_parking.covered" = "Fedett kerékpártároló";
+"type.post_office.post_partner" = "Posta partner";
+"type.barrier.wicket_gate" = "Útelzáró sorompó";
+"type.amenity.animal_shelter" = "Állatmenhely";
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/nl.lproj/InfoPlist.strings
index f47bbdff2..f866c2d89 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/InfoPlist.strings
@@ -3,7 +3,7 @@
 "search" = "Zoeken";
 
 /* Used in home screen quick actions. */
-"bookmarks_and_tracks" = "Bladwijzers en tracks";
+"bookmarks_and_tracks" = "Bladwijzers en sporen";
 
 /* Used in home screen quick actions. */
 "route" = "Route";
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
index 702669df0..d61876b19 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/Localizable.strings
@@ -72,7 +72,7 @@
 "bookmarks" = "Bladwijzers";
 
 /* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
-"bookmarks_and_tracks" = "Bladwijzers en tracks";
+"bookmarks_and_tracks" = "Bladwijzers en sporen";
 
 /* Default bookmark list name */
 "core_my_places" = "Mijn plaatsen";
@@ -198,14 +198,14 @@
 "version: %@ (%@)\nmap data: %@" = "Versie: %@ (%@)\nKaartgegevens: %@";
 
 /* Title for tracks category in bookmarks manager */
-"tracks_title" = "Tracks";
+"tracks_title" = "Sporen";
 
 /* Length of track in cell that describes route */
 "length" = "Lengte";
 "share_my_location" = "Mijn locatie delen";
 "prefs_group_route" = "Navigatie";
 "pref_zoom_title" = "Zoomknoppen";
-"pref_left_button_type" = "Left Main Button";
+"pref_left_button_type" = "Linker hoofdknop";
 
 /* Settings «Map» category: «Appearance» title */
 "pref_appearance_title" = "Weergave";
@@ -325,7 +325,7 @@
 "report_incorrect_map_bug" = "Rapporteer of repareer onjuiste kaartgegevens";
 
 /* Button in the About screen */
-"volunteer" = "Vrijwilligerswerk";
+"volunteer" = "Draag bij en verbeter CoMaps";
 
 /* "Social media" section header in the About screen */
 "follow_us" = "Verbind met ons";
@@ -767,7 +767,7 @@
 "bookmarks_create_new_group" = "Maak een nieuwe lijst";
 
 /* Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files */
-"bookmarks_import" = "Importeer bladwijzers en tracks";
+"bookmarks_import" = "Bladwijzers en sporen importeren";
 "downloader_hide_screen" = "Verberg scherm";
 "downloader_percent" = "%@ (%@ van %@)";
 "downloader_process" = "%@ downloaden…";
@@ -999,7 +999,7 @@
 "button_layer_outdoor" = "Wandelen";
 
 /* Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks */
-"bookmarks_export" = "Exporteer alle bladwijzers en tracks";
+"bookmarks_export" = "Alle bladwijzers en sporen exporteren";
 
 /* Text for the editing the Track's color button. */
 "change_color" = "Verander kleur";
@@ -1072,10 +1072,10 @@
 "recover_all" = "Alles herstellen";
 
 /* Prompt to start recording a track. */
-"start_track_recording" = "Route opnemen";
+"start_track_recording" = "Spoor opnemen";
 
 /* Prompt for stopping a track recording. */
-"stop_track_recording" = "Stop opname van route";
+"stop_track_recording" = "Stop spoor opnemen";
 
 /* Title for the "Stop Without Saving" action for the alert when saving a track recording. */
 "stop_without_saving" = "Stoppen zonder op te slaan";
@@ -1084,16 +1084,16 @@
 "continue_recording" = "Opname voortzetten";
 
 /* Title for the alert when saving a track recording. */
-"track_recording_alert_title" = "Opname opslaan in bladwijzers en tracks?";
+"track_recording_alert_title" = "Opslaan in bladwijzers en sporen?";
 
 /* Message for the toast when saving the track recording is finished but nothing to save. */
-"track_recording_toast_nothing_to_save" = "Route is leeg - niets om op te slaan";
-"edit_track" = "Route bewerken";
+"track_recording_toast_nothing_to_save" = "Spoor is leeg - niets op te slaan";
+"edit_track" = "Spoor bewerken";
 "osm_profile_view_edit_history" = "Bewerkingsgeschiedenis bekijken";
 "osm_profile_view_notes" = "Opmerkingen bekijken";
 "pref_mapappearance_title" = "Kaart uiterlijk";
 "pref_maplanguage_title" = "Kaarttaal";
 "transliteration_title_disabled_summary" = "Uitgeschakeld wanneer altijd de lokale taal voor de kaart wordt gebruikt";
 "pref_maplanguage_local" = "Lokale Taal";
-"existence_confirmed_time_ago" = "Existence confirmed %@";
-"hours_confirmed_time_ago" = "Confirmed %@";
+"existence_confirmed_time_ago" = "Bestaan bevestigd %@";
+"hours_confirmed_time_ago" = "Bevestigd %@";
diff --git a/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings
index c01638d24..76344a355 100644
--- a/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/nl.lproj/LocalizableTypes.strings
@@ -1482,5 +1482,5 @@
 "type.amenity.ranger_station" = "Boswachterkantoor";
 "type.amenity.bicycle_parking.covered" = "Overdekte fietsenstalling";
 "type.post_office.post_partner" = "Post partner";
-"type.amenity.animal_shelter" = "Animal Shelter";
-"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Dierenasiel";
+"type.barrier.wicket_gate" = "Klinket";

From 265e94edc3a5a3c8486da278c6007a98585cf54f Mon Sep 17 00:00:00 2001
From: gekeleda <git@davidgekeler.eu>
Date: Sun, 24 Aug 2025 14:48:19 +0200
Subject: [PATCH 205/302] [core] Fix remove passed points

Signed-off-by: gekeleda <git@davidgekeler.eu>
---
 libs/map/bookmark_manager.cpp | 1 +
 libs/map/routing_mark.cpp     | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/libs/map/bookmark_manager.cpp b/libs/map/bookmark_manager.cpp
index e93fadb13..1fa35fbf0 100644
--- a/libs/map/bookmark_manager.cpp
+++ b/libs/map/bookmark_manager.cpp
@@ -296,6 +296,7 @@ void BookmarkManager::DeleteUserMark(kml::MarkId markId)
   CHECK_THREAD_CHECKER(m_threadChecker, ());
   ASSERT(!IsBookmark(markId), ());
   auto it = m_userMarks.find(markId);
+  ASSERT(it != m_userMarks.end(), ());
   auto const groupId = it->second->GetGroupId();
   GetGroup(groupId)->DetachUserMark(markId);
   m_changesTracker.OnDeleteMark(markId);
diff --git a/libs/map/routing_mark.cpp b/libs/map/routing_mark.cpp
index 1e1f62baf..594975d74 100644
--- a/libs/map/routing_mark.cpp
+++ b/libs/map/routing_mark.cpp
@@ -349,9 +349,11 @@ void RoutePointsLayout::SetFollowingMode(bool enabled)
 
 void RoutePointsLayout::RemovePassedPoints()
 {
-    for (auto markId : m_manager.GetUserMarkIds(UserMark::Type::ROUTING)) {
+    // Prevent recalculation of markIds at every iteration, since we are removing elements
+    auto markIds = m_manager.GetUserMarkIds(UserMark::Type::ROUTING);
+    for (auto markId : markIds) {
         auto * mark = m_editSession.GetMarkForEdit<RouteMarkPoint>(markId);
-        if (mark->IsPassed())
+        if (mark && mark->IsPassed() && mark->GetRoutePointType() == RouteMarkType::Intermediate)
             m_editSession.DeleteUserMark(mark->GetId());
     }
 }

From 66d5306717670cf4fc7d10663f3563176a26a209 Mon Sep 17 00:00:00 2001
From: map-per <map-per@gmx.de>
Date: Sun, 24 Aug 2025 14:31:44 +0200
Subject: [PATCH 206/302] Move bookmark description text view to bookmark
 section

Signed-off-by: map-per <map-per@gmx.de>
---
 .../src/main/res/layout/place_page_bookmark_fragment.xml    | 6 +-----
 android/app/src/main/res/layout/place_page_details.xml      | 5 -----
 android/app/src/main/res/layout/place_page_preview.xml      | 5 +++++
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/android/app/src/main/res/layout/place_page_bookmark_fragment.xml b/android/app/src/main/res/layout/place_page_bookmark_fragment.xml
index 58abc7138..bfb54f8bc 100644
--- a/android/app/src/main/res/layout/place_page_bookmark_fragment.xml
+++ b/android/app/src/main/res/layout/place_page_bookmark_fragment.xml
@@ -11,13 +11,9 @@
     android:id="@+id/tv__bookmark_notes"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="@dimen/margin_half"
+    android:layout_marginBottom="@dimen/margin_base"
     android:layout_marginEnd="@dimen/margin_base"
     android:layout_marginStart="@dimen/margin_base"
-    android:layout_marginTop="@dimen/margin_base"
     android:textAppearance="?android:attr/textAppearance"
     tools:text="Long, long text Long, long text Long, long text Long, long text Long, long text Long, long text "/>
-
-  <include
-    layout="@layout/divider_horizontal"/>
 </LinearLayout>
diff --git a/android/app/src/main/res/layout/place_page_details.xml b/android/app/src/main/res/layout/place_page_details.xml
index ee6a0fa9c..6df9ea63a 100644
--- a/android/app/src/main/res/layout/place_page_details.xml
+++ b/android/app/src/main/res/layout/place_page_details.xml
@@ -16,11 +16,6 @@
     android:background="?ppBackground"
     android:orientation="vertical">
 
-    <androidx.fragment.app.FragmentContainerView
-      android:id="@+id/place_page_bookmark_fragment"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      tools:layout="@layout/place_page_bookmark_fragment" />
     <androidx.fragment.app.FragmentContainerView
       android:id="@+id/place_page_wikipedia_fragment"
       android:layout_width="match_parent"
diff --git a/android/app/src/main/res/layout/place_page_preview.xml b/android/app/src/main/res/layout/place_page_preview.xml
index 29e6a3379..9ac1d640a 100644
--- a/android/app/src/main/res/layout/place_page_preview.xml
+++ b/android/app/src/main/res/layout/place_page_preview.xml
@@ -229,6 +229,11 @@
         android:focusable="true"
         android:src="@drawable/ic_edit" />
     </LinearLayout>
+    <androidx.fragment.app.FragmentContainerView
+      android:id="@+id/place_page_bookmark_fragment"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      tools:layout="@layout/place_page_bookmark_fragment" />
   </LinearLayout>
   <androidx.fragment.app.FragmentContainerView
     android:id="@+id/place_page_track_fragment"

From 512475ec5c6935952334f470d23218772514fcd9 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Sun, 24 Aug 2025 16:06:12 +0200
Subject: [PATCH 207/302] [android] Switch add phone button to FAB

Signed-off-by: jeanbaptisteC <jeanbaptiste.charron@outlook.fr>
---
 android/app/src/main/res/layout/fragment_phone.xml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/android/app/src/main/res/layout/fragment_phone.xml b/android/app/src/main/res/layout/fragment_phone.xml
index 070b00e99..03ac9c343 100644
--- a/android/app/src/main/res/layout/fragment_phone.xml
+++ b/android/app/src/main/res/layout/fragment_phone.xml
@@ -21,7 +21,7 @@
 
     </FrameLayout>
 
-    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/tv__append_phone"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -29,12 +29,10 @@
         android:clickable="true"
         android:contentDescription="@string/editor_add_phone"
         android:focusable="true"
-        android:text="@string/editor_add_phone"
-        android:textColor="?accentButtonTextColor"
         app:fabSize="normal"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:icon="@drawable/ic_plus"
-        app:iconTint="?accentButtonTextColor" />
+        app:srcCompat="@drawable/ic_plus"
+        app:iconTint="?android:textColorPrimaryInverse" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

From 0f5125c61ca74f57b66b8a6370b594e51bd0e47a Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Thu, 24 Jul 2025 18:18:40 +0200
Subject: [PATCH 208/302] [android][sdk] Move UiUtils outside sdk package

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 .../DownloadResourcesLegacyActivity.java      |  2 +-
 .../java/app/organicmaps/MwmActivity.java     | 15 ++++++------
 .../java/app/organicmaps/PanelAnimator.java   |  5 ++--
 .../app/organicmaps/WebContainerDelegate.java |  2 +-
 .../base/BaseMwmRecyclerFragment.java         |  2 +-
 .../organicmaps/base/BaseToolbarActivity.java |  2 +-
 .../bookmarks/BookmarkCollectionAdapter.java  |  2 +-
 .../bookmarks/BookmarksListFragment.java      |  3 +--
 .../ChooseBookmarksSortingTypeFragment.java   |  2 +-
 .../app/organicmaps/bookmarks/Holders.java    |  2 +-
 .../organicmaps/downloader/BottomPanel.java   |  2 +-
 .../downloader/CountrySuggestFragment.java    |  2 +-
 .../downloader/DownloaderAdapter.java         |  2 +-
 .../downloader/DownloaderInsetsListener.java  |  5 ++--
 .../downloader/DownloaderStatusIcon.java      |  2 +-
 .../DownloaderToolbarController.java          |  2 +-
 .../downloader/OnmapDownloader.java           |  2 +-
 .../editor/AdvancedTimetableFragment.java     |  2 +-
 .../organicmaps/editor/EditorFragment.java    |  2 +-
 .../editor/EditorHostFragment.java            |  3 +--
 .../editor/FeatureCategoryAdapter.java        |  2 +-
 .../editor/MultilanguageAdapter.java          |  2 +-
 .../organicmaps/editor/OsmLoginFragment.java  |  3 ++-
 .../organicmaps/editor/PhoneListAdapter.java  |  2 +-
 .../organicmaps/editor/ProfileFragment.java   |  2 +-
 .../organicmaps/editor/ReportFragment.java    |  2 +-
 .../editor/SimpleTimetableAdapter.java        |  5 ++--
 .../app/organicmaps/editor/StreetAdapter.java |  2 +-
 .../editor/TimetableContainerFragment.java    |  2 +-
 .../organicmaps/maplayer/LayersAdapter.java   |  2 +-
 .../maplayer/MapButtonsController.java        |  2 +-
 .../app/organicmaps/maplayer/SearchWheel.java |  2 +-
 .../traffic/widget/TrafficButton.java         |  2 +-
 .../BaseRoutingErrorDialogFragment.java       |  5 ++--
 .../routing/ManageRouteAdapter.java           |  2 +-
 .../routing/ManageRouteBottomSheet.java       |  2 +-
 .../routing/NavigationController.java         |  6 +++--
 .../routing/RoutingBottomMenuController.java  |  8 ++++---
 .../routing/RoutingErrorDialogFragment.java   |  2 +-
 .../routing/RoutingMapsDownloadFragment.java  |  2 +-
 .../routing/RoutingPlanController.java        |  2 +-
 .../routing/RoutingPlanInplaceController.java |  2 +-
 .../main/java/app/organicmaps/sdk/Map.java    | 24 +++++++++----------
 .../java/app/organicmaps/sdk/OrganicMaps.java |  4 ++--
 .../java/app/organicmaps/sdk/util/Utils.java  |  7 ++++++
 .../FloatingSearchToolbarController.java      |  2 +-
 .../app/organicmaps/search/SearchAdapter.java |  2 +-
 .../organicmaps/search/SearchFragment.java    |  2 +-
 .../search/SearchHistoryFragment.java         |  2 +-
 .../settings/StoragePathAdapter.java          |  6 ++---
 .../VoiceInstructionsSettingsFragment.java    |  2 +-
 .../app/organicmaps/util/SharingUtils.java    |  1 -
 .../organicmaps/{sdk => }/util/UiUtils.java   | 15 +-----------
 .../main/java/app/organicmaps/util/Utils.java | 11 ++++-----
 .../organicmaps/util/WindowInsetUtils.java    |  4 ++--
 .../bottomsheet/MenuBottomSheetFragment.java  |  2 +-
 .../organicmaps/widget/PlaceholderView.java   |  2 +-
 .../widget/SearchToolbarController.java       |  2 +-
 .../widget/StackedButtonsDialog.java          |  2 +-
 .../organicmaps/widget/ToolbarController.java |  2 +-
 .../app/organicmaps/widget/menu/MainMenu.java |  2 +-
 .../widget/menu/MyPositionButton.java         |  2 +-
 .../app/organicmaps/widget/menu/NavMenu.java  |  2 +-
 .../widget/placepage/DirectionFragment.java   |  2 +-
 .../placepage/EditBookmarkFragment.java       |  2 +-
 .../ElevationProfileViewRenderer.java         |  2 +-
 .../widget/placepage/PlacePageController.java |  2 +-
 .../widget/placepage/PlacePageView.java       |  2 +-
 .../sections/PlaceOpeningHoursAdapter.java    |  2 +-
 .../sections/PlacePageBookmarkFragment.java   |  2 +-
 .../PlacePageOpeningHoursFragment.java        |  2 +-
 .../sections/PlacePageTrackFragment.java      |  2 +-
 .../sections/PlacePageWikipediaFragment.java  |  2 +-
 .../app/src/main/res/values-sw600dp/attrs.xml |  4 ----
 android/app/src/main/res/values/attrs.xml     |  1 -
 75 files changed, 120 insertions(+), 125 deletions(-)
 rename android/app/src/main/java/app/organicmaps/{sdk => }/util/UiUtils.java (96%)
 delete mode 100644 android/app/src/main/res/values-sw600dp/attrs.xml

diff --git a/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java b/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java
index 989d5a8cf..648a00947 100644
--- a/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java
+++ b/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java
@@ -35,7 +35,7 @@ import app.organicmaps.sdk.location.LocationListener;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.ConnectionState;
 import app.organicmaps.sdk.util.StringUtils;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
 import com.google.android.material.button.MaterialButton;
diff --git a/android/app/src/main/java/app/organicmaps/MwmActivity.java b/android/app/src/main/java/app/organicmaps/MwmActivity.java
index aa5d898dd..a96b47db8 100644
--- a/android/app/src/main/java/app/organicmaps/MwmActivity.java
+++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java
@@ -12,6 +12,7 @@ import static app.organicmaps.sdk.location.LocationState.FOLLOW;
 import static app.organicmaps.sdk.location.LocationState.FOLLOW_AND_ROTATE;
 import static app.organicmaps.sdk.location.LocationState.LOCATION_TAG;
 import static app.organicmaps.sdk.util.PowerManagment.POWER_MANAGEMENT_TAG;
+import static app.organicmaps.sdk.util.Utils.dimen;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
@@ -111,7 +112,6 @@ import app.organicmaps.sdk.settings.UnitLocale;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.LocationUtils;
 import app.organicmaps.sdk.util.PowerManagment;
-import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.sdk.util.log.Logger;
 import app.organicmaps.sdk.widget.placepage.PlacePageData;
 import app.organicmaps.search.FloatingSearchToolbarController;
@@ -122,6 +122,7 @@ import app.organicmaps.settings.SettingsActivity;
 import app.organicmaps.util.SharingUtils;
 import app.organicmaps.util.ThemeSwitcher;
 import app.organicmaps.util.ThemeUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetItem;
@@ -594,7 +595,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
       UiUtils.setViewInsetsPaddingBottom(mPointChooser, windowInsets);
       UiUtils.setViewInsetsPaddingNoBottom(mPointChooserToolbar, windowInsets);
       final int trackRecorderOffset =
-          TrackRecorder.nativeIsTrackRecordingEnabled() ? UiUtils.dimen(this, R.dimen.map_button_size) : 0;
+          TrackRecorder.nativeIsTrackRecordingEnabled() ? dimen(this, R.dimen.map_button_size) : 0;
       mNavBarHeight = isFullscreen() ? 0 : windowInsets.getInsets(WindowInsetsCompat.Type.systemBars()).bottom;
       // For the first loading, set compass top margin to status bar size
       // The top inset will be then be updated by the routing controller
@@ -1648,17 +1649,17 @@ public class MwmActivity extends BaseMwmFragmentActivity
     final int orientation = getResources().getConfiguration().orientation;
     final boolean isTrackRecordingEnabled = TrackRecorder.nativeIsTrackRecordingEnabled();
     if (isTrackRecordingEnabled && (orientation != Configuration.ORIENTATION_LANDSCAPE))
-      offsetY += UiUtils.dimen(this, R.dimen.map_button_size);
+      offsetY += dimen(this, R.dimen.map_button_size);
     if (orientation == Configuration.ORIENTATION_LANDSCAPE)
     {
       if (show)
       {
-        final boolean isSmallScreen = UiUtils.getDisplayTotalHeight(this) < UiUtils.dimen(this, R.dimen.dp_400);
+        final boolean isSmallScreen = UiUtils.getDisplayTotalHeight(this) < dimen(this, R.dimen.dp_400);
         if (!isSmallScreen || TrackRecorder.nativeIsTrackRecordingEnabled())
-          offsetX += UiUtils.dimen(this, R.dimen.map_button_size);
+          offsetX += dimen(this, R.dimen.map_button_size);
       }
       else if (isTrackRecordingEnabled)
-        offsetY += UiUtils.dimen(this, R.dimen.map_button_size);
+        offsetY += dimen(this, R.dimen.map_button_size);
     }
     updateCompassOffset(offsetY, offsetX);
   }
@@ -2457,7 +2458,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
     if (mCurrentWindowInsets != null)
     {
       final int offset = mCurrentWindowInsets.getInsets(WindowInsetsCompat.Type.systemBars()).top;
-      updateCompassOffset(offset + UiUtils.dimen(this, R.dimen.map_button_size));
+      updateCompassOffset(offset + dimen(this, R.dimen.map_button_size));
     }
     Toast.makeText(this, R.string.track_recording, Toast.LENGTH_SHORT).show();
     TrackRecordingService.startForegroundService(getApplicationContext());
diff --git a/android/app/src/main/java/app/organicmaps/PanelAnimator.java b/android/app/src/main/java/app/organicmaps/PanelAnimator.java
index d040d5861..5c67c9a6b 100644
--- a/android/app/src/main/java/app/organicmaps/PanelAnimator.java
+++ b/android/app/src/main/java/app/organicmaps/PanelAnimator.java
@@ -9,7 +9,8 @@ import androidx.annotation.IntegerRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.sdk.util.Utils;
+import app.organicmaps.util.UiUtils;
 import org.chromium.base.ObserverList;
 
 class PanelAnimator
@@ -26,7 +27,7 @@ class PanelAnimator
   PanelAnimator(MwmActivity activity)
   {
     mActivity = activity;
-    mWidth = UiUtils.dimen(activity.getApplicationContext(), R.dimen.panel_width);
+    mWidth = Utils.dimen(activity.getApplicationContext(), R.dimen.panel_width);
     mPanel = mActivity.findViewById(R.id.fragment_container);
     mDuration = mActivity.getResources().getInteger(R.integer.anim_panel);
   }
diff --git a/android/app/src/main/java/app/organicmaps/WebContainerDelegate.java b/android/app/src/main/java/app/organicmaps/WebContainerDelegate.java
index a0b3bbd2f..671aeb97e 100644
--- a/android/app/src/main/java/app/organicmaps/WebContainerDelegate.java
+++ b/android/app/src/main/java/app/organicmaps/WebContainerDelegate.java
@@ -9,7 +9,7 @@ import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import androidx.annotation.NonNull;
 import app.organicmaps.base.OnBackPressListener;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 
 public abstract class WebContainerDelegate implements OnBackPressListener
 {
diff --git a/android/app/src/main/java/app/organicmaps/base/BaseMwmRecyclerFragment.java b/android/app/src/main/java/app/organicmaps/base/BaseMwmRecyclerFragment.java
index 18d821455..cce25376b 100644
--- a/android/app/src/main/java/app/organicmaps/base/BaseMwmRecyclerFragment.java
+++ b/android/app/src/main/java/app/organicmaps/base/BaseMwmRecyclerFragment.java
@@ -14,7 +14,7 @@ import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.R;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils.ScrollableContentInsetsListener;
 import app.organicmaps.widget.PlaceholderView;
diff --git a/android/app/src/main/java/app/organicmaps/base/BaseToolbarActivity.java b/android/app/src/main/java/app/organicmaps/base/BaseToolbarActivity.java
index 11d56fe76..34ddb9e1e 100644
--- a/android/app/src/main/java/app/organicmaps/base/BaseToolbarActivity.java
+++ b/android/app/src/main/java/app/organicmaps/base/BaseToolbarActivity.java
@@ -10,7 +10,7 @@ import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentFactory;
 import androidx.fragment.app.FragmentManager;
 import app.organicmaps.R;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
 import com.google.android.material.appbar.MaterialToolbar;
 
diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCollectionAdapter.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCollectionAdapter.java
index f33d48898..1ba7be546 100644
--- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCollectionAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCollectionAdapter.java
@@ -11,7 +11,7 @@ import app.organicmaps.R;
 import app.organicmaps.adapter.OnItemClickListener;
 import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
 import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.List;
diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java
index db7e3eda0..2122f9b8d 100644
--- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarksListFragment.java
@@ -33,16 +33,15 @@ import app.organicmaps.sdk.bookmarks.data.BookmarkInfo;
 import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
 import app.organicmaps.sdk.bookmarks.data.BookmarkSharingResult;
 import app.organicmaps.sdk.bookmarks.data.CategoryDataSource;
-import app.organicmaps.sdk.bookmarks.data.Icon;
 import app.organicmaps.sdk.bookmarks.data.KmlFileType;
 import app.organicmaps.sdk.bookmarks.data.PredefinedColors;
 import app.organicmaps.sdk.bookmarks.data.SortedBlock;
 import app.organicmaps.sdk.bookmarks.data.Track;
 import app.organicmaps.sdk.search.BookmarkSearchListener;
 import app.organicmaps.sdk.search.SearchEngine;
-import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.util.SharingUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarksSortingTypeFragment.java b/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarksSortingTypeFragment.java
index cf8904d17..bc145e1e4 100644
--- a/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarksSortingTypeFragment.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/ChooseBookmarksSortingTypeFragment.java
@@ -13,7 +13,7 @@ import androidx.fragment.app.FragmentManager;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmDialogFragment;
 import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 
 public class ChooseBookmarksSortingTypeFragment
     extends BaseMwmDialogFragment implements RadioGroup.OnCheckedChangeListener
diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/Holders.java b/android/app/src/main/java/app/organicmaps/bookmarks/Holders.java
index 16b494b1a..749c71e78 100644
--- a/android/app/src/main/java/app/organicmaps/bookmarks/Holders.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/Holders.java
@@ -18,8 +18,8 @@ import app.organicmaps.sdk.bookmarks.data.BookmarkInfo;
 import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
 import app.organicmaps.sdk.bookmarks.data.IconClickListener;
 import app.organicmaps.sdk.bookmarks.data.Track;
-import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.Graphics;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.widget.recycler.RecyclerClickListener;
 import app.organicmaps.widget.recycler.RecyclerLongClickListener;
diff --git a/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java b/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java
index 2cf9b99e8..6403556df 100644
--- a/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java
@@ -15,7 +15,7 @@ import app.organicmaps.sdk.downloader.CountryItem;
 import app.organicmaps.sdk.downloader.MapManager;
 import app.organicmaps.sdk.downloader.UpdateInfo;
 import app.organicmaps.sdk.util.StringUtils;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
diff --git a/android/app/src/main/java/app/organicmaps/downloader/CountrySuggestFragment.java b/android/app/src/main/java/app/organicmaps/downloader/CountrySuggestFragment.java
index a128e275e..78a068464 100644
--- a/android/app/src/main/java/app/organicmaps/downloader/CountrySuggestFragment.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/CountrySuggestFragment.java
@@ -16,7 +16,7 @@ import app.organicmaps.base.BaseMwmFragmentActivity;
 import app.organicmaps.sdk.downloader.CountryItem;
 import app.organicmaps.sdk.downloader.MapManager;
 import app.organicmaps.sdk.util.StringUtils;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.widget.WheelProgressView;
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.textview.MaterialTextView;
diff --git a/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java b/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java
index e41f45a7e..197bb3ce4 100644
--- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java
@@ -24,7 +24,7 @@ import app.organicmaps.sdk.downloader.CountryItem;
 import app.organicmaps.sdk.downloader.MapManager;
 import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.util.StringUtils;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetItem;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
diff --git a/android/app/src/main/java/app/organicmaps/downloader/DownloaderInsetsListener.java b/android/app/src/main/java/app/organicmaps/downloader/DownloaderInsetsListener.java
index b4ba4994c..183bd54b8 100644
--- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderInsetsListener.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderInsetsListener.java
@@ -9,7 +9,8 @@ import androidx.core.view.OnApplyWindowInsetsListener;
 import androidx.core.view.WindowInsetsCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.R;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.sdk.util.Utils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.WindowInsetUtils;
 
 final class DownloaderInsetsListener implements OnApplyWindowInsetsListener
@@ -55,7 +56,7 @@ final class DownloaderInsetsListener implements OnApplyWindowInsetsListener
 
   private void applyInsetsToButtons(Insets insets)
   {
-    int baseMargin = UiUtils.dimen(mContext, R.dimen.margin_base);
+    int baseMargin = Utils.dimen(mContext, R.dimen.margin_base);
 
     ViewGroup.MarginLayoutParams fabParams = (ViewGroup.MarginLayoutParams) mFab.getLayoutParams();
     ViewGroup.MarginLayoutParams buttonParams = (ViewGroup.MarginLayoutParams) mButton.getLayoutParams();
diff --git a/android/app/src/main/java/app/organicmaps/downloader/DownloaderStatusIcon.java b/android/app/src/main/java/app/organicmaps/downloader/DownloaderStatusIcon.java
index 4fabcca82..709b15624 100644
--- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderStatusIcon.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderStatusIcon.java
@@ -6,8 +6,8 @@ import androidx.annotation.AttrRes;
 import androidx.annotation.DrawableRes;
 import app.organicmaps.R;
 import app.organicmaps.sdk.downloader.CountryItem;
-import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.ThemeUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.widget.WheelProgressView;
 import com.google.android.material.imageview.ShapeableImageView;
 
diff --git a/android/app/src/main/java/app/organicmaps/downloader/DownloaderToolbarController.java b/android/app/src/main/java/app/organicmaps/downloader/DownloaderToolbarController.java
index e6b593b92..2ad0a7a29 100644
--- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderToolbarController.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderToolbarController.java
@@ -5,7 +5,7 @@ import android.content.Intent;
 import android.text.TextUtils;
 import android.view.View;
 import app.organicmaps.R;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.widget.SearchToolbarController;
 
 class DownloaderToolbarController extends SearchToolbarController
diff --git a/android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java b/android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java
index 648b382dc..d54ba531c 100644
--- a/android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java
@@ -15,7 +15,7 @@ import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.ConnectionState;
 import app.organicmaps.sdk.util.StringUtils;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
 import app.organicmaps.widget.WheelProgressView;
 import com.google.android.material.button.MaterialButton;
diff --git a/android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java b/android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java
index ffba644c7..2043ab2f9 100644
--- a/android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/AdvancedTimetableFragment.java
@@ -14,9 +14,9 @@ import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmFragment;
 import app.organicmaps.sdk.editor.OpeningHours;
 import app.organicmaps.sdk.util.Constants;
-import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.util.InputUtils;
+import app.organicmaps.util.UiUtils;
 import com.google.android.material.imageview.ShapeableImageView;
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textview.MaterialTextView;
diff --git a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
index fe5bed6cc..ed2ded212 100644
--- a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
@@ -29,10 +29,10 @@ import app.organicmaps.sdk.editor.data.LocalizedName;
 import app.organicmaps.sdk.editor.data.LocalizedStreet;
 import app.organicmaps.sdk.editor.data.Timetable;
 import app.organicmaps.sdk.util.StringUtils;
-import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.sdk.util.Utils;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.util.InputUtils;
+import app.organicmaps.util.UiUtils;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.imageview.ShapeableImageView;
 import com.google.android.material.textfield.TextInputEditText;
diff --git a/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java b/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
index fe102c12e..72ffc99b0 100644
--- a/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorHostFragment.java
@@ -1,6 +1,5 @@
 package app.organicmaps.editor;
 
-import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.text.TextUtils;
@@ -25,7 +24,7 @@ import app.organicmaps.sdk.editor.data.Language;
 import app.organicmaps.sdk.editor.data.LocalizedName;
 import app.organicmaps.sdk.editor.data.LocalizedStreet;
 import app.organicmaps.sdk.editor.data.NamesDataSource;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
 import app.organicmaps.widget.SearchToolbarController;
diff --git a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryAdapter.java b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryAdapter.java
index 9264ec1e9..d6d3f2867 100644
--- a/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/editor/FeatureCategoryAdapter.java
@@ -10,7 +10,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.R;
 import app.organicmaps.sdk.editor.data.FeatureCategory;
 import app.organicmaps.sdk.util.StringUtils;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textview.MaterialTextView;
 
diff --git a/android/app/src/main/java/app/organicmaps/editor/MultilanguageAdapter.java b/android/app/src/main/java/app/organicmaps/editor/MultilanguageAdapter.java
index c4f226af0..88cc34522 100644
--- a/android/app/src/main/java/app/organicmaps/editor/MultilanguageAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/editor/MultilanguageAdapter.java
@@ -10,7 +10,7 @@ import app.organicmaps.sdk.editor.Editor;
 import app.organicmaps.sdk.editor.data.Language;
 import app.organicmaps.sdk.editor.data.LocalizedName;
 import app.organicmaps.sdk.util.StringUtils;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textfield.TextInputLayout;
diff --git a/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java b/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java
index f99bfa254..782f149e6 100644
--- a/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/OsmLoginFragment.java
@@ -15,10 +15,11 @@ import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmToolbarFragment;
 import app.organicmaps.sdk.editor.OsmOAuth;
 import app.organicmaps.sdk.util.Constants;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.sdk.util.DateUtils;
 import app.organicmaps.sdk.util.concurrency.ThreadPool;
 import app.organicmaps.sdk.util.concurrency.UiThread;
 import app.organicmaps.util.InputUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils.ScrollableContentInsetsListener;
 import com.google.android.material.button.MaterialButton;
diff --git a/android/app/src/main/java/app/organicmaps/editor/PhoneListAdapter.java b/android/app/src/main/java/app/organicmaps/editor/PhoneListAdapter.java
index b4e22b1c2..cab90f3b4 100644
--- a/android/app/src/main/java/app/organicmaps/editor/PhoneListAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/editor/PhoneListAdapter.java
@@ -9,7 +9,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.R;
 import app.organicmaps.sdk.editor.Editor;
 import app.organicmaps.sdk.util.StringUtils;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import com.google.android.material.imageview.ShapeableImageView;
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textfield.TextInputLayout;
diff --git a/android/app/src/main/java/app/organicmaps/editor/ProfileFragment.java b/android/app/src/main/java/app/organicmaps/editor/ProfileFragment.java
index 13d38d882..4ce820fe0 100644
--- a/android/app/src/main/java/app/organicmaps/editor/ProfileFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/ProfileFragment.java
@@ -14,9 +14,9 @@ import androidx.core.view.WindowInsetsCompat;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmToolbarFragment;
 import app.organicmaps.sdk.editor.OsmOAuth;
-import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.sdk.util.concurrency.ThreadPool;
 import app.organicmaps.sdk.util.concurrency.UiThread;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
diff --git a/android/app/src/main/java/app/organicmaps/editor/ReportFragment.java b/android/app/src/main/java/app/organicmaps/editor/ReportFragment.java
index a041ea44d..4a8b1f5b6 100644
--- a/android/app/src/main/java/app/organicmaps/editor/ReportFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/ReportFragment.java
@@ -11,7 +11,7 @@ import androidx.core.view.ViewCompat;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmToolbarFragment;
 import app.organicmaps.sdk.editor.Editor;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.WindowInsetUtils.ScrollableContentInsetsListener;
 import com.google.android.material.textfield.TextInputEditText;
 
diff --git a/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java b/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java
index 8e37fc3d1..1b3497073 100644
--- a/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/editor/SimpleTimetableAdapter.java
@@ -18,7 +18,8 @@ import app.organicmaps.sdk.editor.OpeningHours;
 import app.organicmaps.sdk.editor.data.HoursMinutes;
 import app.organicmaps.sdk.editor.data.Timespan;
 import app.organicmaps.sdk.editor.data.Timetable;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.sdk.util.Utils;
+import app.organicmaps.util.UiUtils;
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.checkbox.MaterialCheckBox;
 import com.google.android.material.textview.MaterialTextView;
@@ -224,7 +225,7 @@ class SimpleTimetableAdapter extends RecyclerView.Adapter<SimpleTimetableAdapter
             LayoutInflater.from(itemView.getContext()).inflate(R.layout.item_timetable_closed_hours, closedHost, false);
         closedHost.addView(
             span, new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-                                                UiUtils.dimen(closedHost.getContext(), R.dimen.editor_height_closed)));
+                                                Utils.dimen(closedHost.getContext(), R.dimen.editor_height_closed)));
         closedHours[i] = span;
         final int finalI = i;
         span.findViewById(R.id.iv__remove_closed)
diff --git a/android/app/src/main/java/app/organicmaps/editor/StreetAdapter.java b/android/app/src/main/java/app/organicmaps/editor/StreetAdapter.java
index 931e21dc7..65cea97ae 100644
--- a/android/app/src/main/java/app/organicmaps/editor/StreetAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/editor/StreetAdapter.java
@@ -10,7 +10,7 @@ import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.dialog.EditTextDialogFragment;
 import app.organicmaps.sdk.editor.data.LocalizedStreet;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import com.google.android.material.radiobutton.MaterialRadioButton;
 import com.google.android.material.textview.MaterialTextView;
 
diff --git a/android/app/src/main/java/app/organicmaps/editor/TimetableContainerFragment.java b/android/app/src/main/java/app/organicmaps/editor/TimetableContainerFragment.java
index 307919667..c9055b11d 100644
--- a/android/app/src/main/java/app/organicmaps/editor/TimetableContainerFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/TimetableContainerFragment.java
@@ -15,7 +15,7 @@ import androidx.fragment.app.FragmentActivity;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmFragment;
 import app.organicmaps.sdk.editor.OpeningHours;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.textview.MaterialTextView;
 
diff --git a/android/app/src/main/java/app/organicmaps/maplayer/LayersAdapter.java b/android/app/src/main/java/app/organicmaps/maplayer/LayersAdapter.java
index 2d5e20ea8..fc8021cc7 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/LayersAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/LayersAdapter.java
@@ -8,7 +8,7 @@ import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.R;
 import app.organicmaps.sdk.util.SharedPropertiesUtils;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import java.util.List;
 
 public class LayersAdapter extends RecyclerView.Adapter<LayerHolder>
diff --git a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
index 7f4e8ba34..fb368af39 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
@@ -36,8 +36,8 @@ import app.organicmaps.sdk.maplayer.subway.SubwayManager;
 import app.organicmaps.sdk.maplayer.traffic.TrafficManager;
 import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.util.Config;
-import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.ThemeUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.WindowInsetUtils;
 import app.organicmaps.widget.menu.MyPositionButton;
 import app.organicmaps.widget.placepage.PlacePageViewModel;
diff --git a/android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java b/android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java
index cc837d506..80bc75e93 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/SearchWheel.java
@@ -16,9 +16,9 @@ import androidx.annotation.StringRes;
 import app.organicmaps.R;
 import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.search.SearchEngine;
-import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.sdk.util.concurrency.UiThread;
 import app.organicmaps.util.Graphics;
+import app.organicmaps.util.UiUtils;
 
 public class SearchWheel implements View.OnClickListener
 {
diff --git a/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButton.java b/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButton.java
index f2bda4035..aedc3e45b 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButton.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButton.java
@@ -10,8 +10,8 @@ import android.widget.RelativeLayout;
 import androidx.annotation.NonNull;
 import androidx.core.content.res.ResourcesCompat;
 import app.organicmaps.R;
-import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.ThemeUtils;
+import app.organicmaps.util.UiUtils;
 import java.util.Objects;
 
 @SuppressWarnings("unused")
diff --git a/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java b/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java
index a97de9aa6..5332bb323 100644
--- a/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java
@@ -19,7 +19,8 @@ import app.organicmaps.base.BaseMwmDialogFragment;
 import app.organicmaps.sdk.downloader.CountryItem;
 import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.util.StringUtils;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.sdk.util.Utils;
+import app.organicmaps.util.UiUtils;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.textview.MaterialTextView;
 import java.util.ArrayList;
@@ -128,7 +129,7 @@ abstract class BaseRoutingErrorDialogFragment extends BaseMwmDialogFragment
 
     UiUtils.waitLayout(listView, () -> {
       final int width = listView.getWidth();
-      final int indicatorWidth = UiUtils.dimen(requireContext(), R.dimen.margin_quadruple);
+      final int indicatorWidth = Utils.dimen(requireContext(), R.dimen.margin_quadruple);
       listView.setIndicatorBounds(width - indicatorWidth, width);
       listView.setIndicatorBoundsRelative(width - indicatorWidth, width);
     });
diff --git a/android/app/src/main/java/app/organicmaps/routing/ManageRouteAdapter.java b/android/app/src/main/java/app/organicmaps/routing/ManageRouteAdapter.java
index b86032375..198443f28 100644
--- a/android/app/src/main/java/app/organicmaps/routing/ManageRouteAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/routing/ManageRouteAdapter.java
@@ -16,7 +16,7 @@ import app.organicmaps.sdk.bookmarks.data.MapObject;
 import app.organicmaps.sdk.routing.RouteMarkData;
 import app.organicmaps.sdk.routing.RouteMarkType;
 import app.organicmaps.sdk.util.StringUtils;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import com.google.android.material.imageview.ShapeableImageView;
 import com.google.android.material.textview.MaterialTextView;
 import java.util.ArrayList;
diff --git a/android/app/src/main/java/app/organicmaps/routing/ManageRouteBottomSheet.java b/android/app/src/main/java/app/organicmaps/routing/ManageRouteBottomSheet.java
index 9e158fa1a..8e7349a04 100644
--- a/android/app/src/main/java/app/organicmaps/routing/ManageRouteBottomSheet.java
+++ b/android/app/src/main/java/app/organicmaps/routing/ManageRouteBottomSheet.java
@@ -23,7 +23,7 @@ import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
 import app.organicmaps.sdk.routing.RouteMarkData;
 import app.organicmaps.sdk.routing.RoutingController;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
diff --git a/android/app/src/main/java/app/organicmaps/routing/NavigationController.java b/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
index 283365f3e..22fe42c53 100644
--- a/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
@@ -1,5 +1,7 @@
 package app.organicmaps.routing;
 
+import static app.organicmaps.sdk.util.Utils.dimen;
+
 import android.location.Location;
 import android.text.TextUtils;
 import android.view.View;
@@ -21,7 +23,7 @@ import app.organicmaps.sdk.routing.CarDirection;
 import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.routing.RoutingInfo;
 import app.organicmaps.sdk.util.StringUtils;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils;
 import app.organicmaps.widget.LanesView;
@@ -166,7 +168,7 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
     UiUtils.visibleIf(hasStreet, mStreetFrame);
     if (!TextUtils.isEmpty(info.nextStreet))
       mNextStreet.setText(info.nextStreet);
-    int margin = UiUtils.dimen(mFrame.getContext(), R.dimen.nav_frame_padding);
+    int margin = dimen(mFrame.getContext(), R.dimen.nav_frame_padding);
     if (hasStreet)
       margin += mStreetFrame.getHeight();
     mMapButtonsViewModel.setTopButtonsMarginTop(margin);
diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java b/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
index d9b4b3019..c2af19324 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
@@ -1,5 +1,7 @@
 package app.organicmaps.routing;
 
+import static app.organicmaps.sdk.util.Utils.dimen;
+
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
@@ -37,9 +39,9 @@ import app.organicmaps.sdk.routing.RoutingInfo;
 import app.organicmaps.sdk.routing.TransitRouteInfo;
 import app.organicmaps.sdk.routing.TransitStepInfo;
 import app.organicmaps.sdk.util.Distance;
-import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.util.ThemeUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.widget.recycler.DotDividerItemDecoration;
 import app.organicmaps.widget.recycler.MultilineLayoutManager;
@@ -345,8 +347,8 @@ final class RoutingBottomMenuController implements View.OnClickListener
 
     UiUtils.hide(mTimeVehicle);
 
-    int chartWidth = UiUtils.dimen(mContext, R.dimen.altitude_chart_image_width);
-    int chartHeight = UiUtils.dimen(mContext, R.dimen.altitude_chart_image_height);
+    int chartWidth = dimen(mContext, R.dimen.altitude_chart_image_width);
+    int chartHeight = dimen(mContext, R.dimen.altitude_chart_image_height);
     Framework.RouteAltitudeLimits limits = new Framework.RouteAltitudeLimits();
     Bitmap bm = Framework.generateRouteAltitudeChart(chartWidth, chartHeight, limits);
     if (bm != null)
diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingErrorDialogFragment.java b/android/app/src/main/java/app/organicmaps/routing/RoutingErrorDialogFragment.java
index 2e1b7eebe..bb521d424 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingErrorDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingErrorDialogFragment.java
@@ -16,7 +16,7 @@ import androidx.fragment.app.FragmentManager;
 import app.organicmaps.R;
 import app.organicmaps.sdk.downloader.CountryItem;
 import app.organicmaps.sdk.downloader.MapManager;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import com.google.android.material.textview.MaterialTextView;
 
 public class RoutingErrorDialogFragment extends BaseRoutingErrorDialogFragment
diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingMapsDownloadFragment.java b/android/app/src/main/java/app/organicmaps/routing/RoutingMapsDownloadFragment.java
index 239ea14e3..c5150c9d0 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingMapsDownloadFragment.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingMapsDownloadFragment.java
@@ -12,7 +12,7 @@ import app.organicmaps.R;
 import app.organicmaps.sdk.downloader.CountryItem;
 import app.organicmaps.sdk.downloader.MapManager;
 import app.organicmaps.sdk.routing.RoutingController;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.widget.WheelProgressView;
 import java.util.HashSet;
 import java.util.List;
diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java
index a49d32a57..66bd33ca4 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java
@@ -21,8 +21,8 @@ import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.routing.RoutingInfo;
 import app.organicmaps.sdk.routing.RoutingOptions;
 import app.organicmaps.sdk.routing.TransitRouteInfo;
-import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.settings.DrivingOptionsActivity;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
 import app.organicmaps.widget.RoutingToolbarButton;
 import app.organicmaps.widget.ToolbarController;
diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanInplaceController.java b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanInplaceController.java
index 06e766475..7528ed618 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanInplaceController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanInplaceController.java
@@ -9,7 +9,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import app.organicmaps.MwmActivity;
 import app.organicmaps.R;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 
 public class RoutingPlanInplaceController extends RoutingPlanController
 {
diff --git a/android/app/src/main/java/app/organicmaps/sdk/Map.java b/android/app/src/main/java/app/organicmaps/sdk/Map.java
index cc3e3fdac..cc386ddd1 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/Map.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/Map.java
@@ -12,7 +12,7 @@ import app.organicmaps.sdk.display.DisplayType;
 import app.organicmaps.sdk.location.LocationHelper;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.ROMUtils;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.sdk.util.Utils;
 import app.organicmaps.sdk.util.concurrency.UiThread;
 import app.organicmaps.sdk.util.log.Logger;
 
@@ -102,9 +102,9 @@ public final class Map
   {
     final int x = offsetX < 0 ? mCurrentCompassOffsetX : offsetX;
     final int y = offsetY < 0 ? mCurrentCompassOffsetY : offsetY;
-    final int navPadding = UiUtils.dimen(context, R.dimen.nav_frame_padding);
-    final int marginX = UiUtils.dimen(context, R.dimen.margin_compass) + navPadding;
-    final int marginY = UiUtils.dimen(context, R.dimen.margin_compass_top) + navPadding;
+    final int navPadding = Utils.dimen(context, R.dimen.nav_frame_padding);
+    final int marginX = Utils.dimen(context, R.dimen.margin_compass) + navPadding;
+    final int marginY = Utils.dimen(context, R.dimen.margin_compass_top) + navPadding;
     nativeSetupWidget(WIDGET_COMPASS, mWidth - x - marginX, y + marginY, ANCHOR_CENTER);
     if (forceRedraw && mSurfaceCreated)
       nativeApplyWidgets();
@@ -342,30 +342,30 @@ public final class Map
     updateBottomWidgetsOffset(context, mBottomWidgetOffsetX, mBottomWidgetOffsetY);
     if (mDisplayType == DisplayType.Device)
     {
-      nativeSetupWidget(WIDGET_SCALE_FPS_LABEL, UiUtils.dimen(context, R.dimen.margin_base),
-                        UiUtils.dimen(context, R.dimen.margin_base) * 2, ANCHOR_LEFT_TOP);
+      nativeSetupWidget(WIDGET_SCALE_FPS_LABEL, Utils.dimen(context, R.dimen.margin_base),
+                        Utils.dimen(context, R.dimen.margin_base) * 2, ANCHOR_LEFT_TOP);
       updateCompassOffset(context, mCurrentCompassOffsetX, mCurrentCompassOffsetY, false);
     }
     else
     {
-      nativeSetupWidget(WIDGET_SCALE_FPS_LABEL, (float) mWidth / 2 + UiUtils.dimen(context, R.dimen.margin_base) * 2,
-                        UiUtils.dimen(context, R.dimen.margin_base), ANCHOR_LEFT_TOP);
+      nativeSetupWidget(WIDGET_SCALE_FPS_LABEL, (float) mWidth / 2 + Utils.dimen(context, R.dimen.margin_base) * 2,
+                        Utils.dimen(context, R.dimen.margin_base), ANCHOR_LEFT_TOP);
       updateCompassOffset(context, mWidth, mCurrentCompassOffsetY, true);
     }
   }
 
   private void updateRulerOffset(final Context context, int offsetX, int offsetY)
   {
-    nativeSetupWidget(WIDGET_RULER, UiUtils.dimen(context, R.dimen.margin_ruler) + offsetX,
-                      mHeight - UiUtils.dimen(context, R.dimen.margin_ruler) - offsetY, ANCHOR_LEFT_BOTTOM);
+    nativeSetupWidget(WIDGET_RULER, Utils.dimen(context, R.dimen.margin_ruler) + offsetX,
+                      mHeight - Utils.dimen(context, R.dimen.margin_ruler) - offsetY, ANCHOR_LEFT_BOTTOM);
     if (mSurfaceCreated)
       nativeApplyWidgets();
   }
 
   private void updateAttributionOffset(final Context context, int offsetX, int offsetY)
   {
-    nativeSetupWidget(WIDGET_COPYRIGHT, UiUtils.dimen(context, R.dimen.margin_ruler) + offsetX,
-                      mHeight - UiUtils.dimen(context, R.dimen.margin_ruler) - offsetY, ANCHOR_LEFT_BOTTOM);
+    nativeSetupWidget(WIDGET_COPYRIGHT, Utils.dimen(context, R.dimen.margin_ruler) + offsetX,
+                      mHeight - Utils.dimen(context, R.dimen.margin_ruler) - offsetY, ANCHOR_LEFT_BOTTOM);
     if (mSurfaceCreated)
       nativeApplyWidgets();
   }
diff --git a/android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java b/android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java
index 1b55c231d..5c322e0f6 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java
@@ -23,7 +23,6 @@ import app.organicmaps.sdk.sound.TtsPlayer;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.SharedPropertiesUtils;
 import app.organicmaps.sdk.util.StorageUtils;
-import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.sdk.util.log.Logger;
 import app.organicmaps.sdk.util.log.LogsManager;
 import java.io.IOException;
@@ -160,7 +159,8 @@ public final class OrganicMaps implements DefaultLifecycleObserver
     createPlatformDirectories(writablePath, privatePath, tempPath);
 
     nativeInitPlatform(mContext, apkPath, writablePath, privatePath, tempPath, app.organicmaps.BuildConfig.FLAVOR,
-                       app.organicmaps.BuildConfig.BUILD_TYPE, UiUtils.isTablet(mContext));
+                       app.organicmaps.BuildConfig.BUILD_TYPE,
+                       /* isTablet */ false);
     Config.setStoragePath(writablePath);
     Config.setStatisticsEnabled(SharedPropertiesUtils.isStatisticsEnabled());
 
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/Utils.java b/android/app/src/main/java/app/organicmaps/sdk/util/Utils.java
index 481db78b6..56dbae3eb 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/util/Utils.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/util/Utils.java
@@ -12,11 +12,13 @@ import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.view.View;
 import android.widget.Toast;
+import androidx.annotation.DimenRes;
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import app.organicmaps.BuildConfig;
+import app.organicmaps.R;
 import app.organicmaps.sdk.util.log.Logger;
 import java.io.Closeable;
 import java.io.IOException;
@@ -340,4 +342,9 @@ public class Utils
       return getApplicationInfoOld(manager, packageName, flags);
     return manager.getApplicationInfo(packageName, PackageManager.ApplicationInfoFlags.of(flags));
   }
+
+  public static int dimen(@NonNull Context context, @DimenRes int id)
+  {
+    return context.getResources().getDimensionPixelSize(id);
+  }
 }
diff --git a/android/app/src/main/java/app/organicmaps/search/FloatingSearchToolbarController.java b/android/app/src/main/java/app/organicmaps/search/FloatingSearchToolbarController.java
index a7d608294..4d5dabbd3 100644
--- a/android/app/src/main/java/app/organicmaps/search/FloatingSearchToolbarController.java
+++ b/android/app/src/main/java/app/organicmaps/search/FloatingSearchToolbarController.java
@@ -5,7 +5,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.view.ViewCompat;
 import app.organicmaps.sdk.search.SearchEngine;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
 import app.organicmaps.widget.SearchToolbarController;
 
diff --git a/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java b/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java
index 34b13b89f..a55de0e82 100644
--- a/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/search/SearchAdapter.java
@@ -13,9 +13,9 @@ import androidx.core.content.ContextCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.R;
 import app.organicmaps.sdk.search.SearchResult;
-import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.util.ThemeUtils;
+import app.organicmaps.util.UiUtils;
 
 class SearchAdapter extends RecyclerView.Adapter<SearchAdapter.SearchDataViewHolder>
 {
diff --git a/android/app/src/main/java/app/organicmaps/search/SearchFragment.java b/android/app/src/main/java/app/organicmaps/search/SearchFragment.java
index 7f8bf0d7b..945547c76 100644
--- a/android/app/src/main/java/app/organicmaps/search/SearchFragment.java
+++ b/android/app/src/main/java/app/organicmaps/search/SearchFragment.java
@@ -39,7 +39,7 @@ import app.organicmaps.sdk.search.SearchResult;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.Language;
 import app.organicmaps.sdk.util.SharedPropertiesUtils;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils;
 import app.organicmaps.widget.PlaceholderView;
diff --git a/android/app/src/main/java/app/organicmaps/search/SearchHistoryFragment.java b/android/app/src/main/java/app/organicmaps/search/SearchHistoryFragment.java
index 45770d6ac..b4b6b9512 100644
--- a/android/app/src/main/java/app/organicmaps/search/SearchHistoryFragment.java
+++ b/android/app/src/main/java/app/organicmaps/search/SearchHistoryFragment.java
@@ -11,7 +11,7 @@ import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmRecyclerFragment;
 import app.organicmaps.sdk.routing.RoutingController;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.widget.PlaceholderView;
 import app.organicmaps.widget.SearchToolbarController;
 
diff --git a/android/app/src/main/java/app/organicmaps/settings/StoragePathAdapter.java b/android/app/src/main/java/app/organicmaps/settings/StoragePathAdapter.java
index d9f64b88f..f15c48722 100644
--- a/android/app/src/main/java/app/organicmaps/settings/StoragePathAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/settings/StoragePathAdapter.java
@@ -13,7 +13,7 @@ import android.widget.CheckedTextView;
 import app.organicmaps.R;
 import app.organicmaps.sdk.settings.StorageItem;
 import app.organicmaps.sdk.settings.StoragePathManager;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.sdk.util.Utils;
 import app.organicmaps.util.ThemeUtils;
 
 class StoragePathAdapter extends BaseAdapter
@@ -65,14 +65,14 @@ class StoragePathAdapter extends BaseAdapter
     SpannableStringBuilder sb = new SpannableStringBuilder(item.mLabel + "\n" + size);
     sb.setSpan(new ForegroundColorSpan(ThemeUtils.getColor(mActivity, android.R.attr.textColorSecondary)),
                sb.length() - size.length(), sb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-    sb.setSpan(new AbsoluteSizeSpan(UiUtils.dimen(mActivity, R.dimen.text_size_body_3)), sb.length() - size.length(),
+    sb.setSpan(new AbsoluteSizeSpan(Utils.dimen(mActivity, R.dimen.text_size_body_3)), sb.length() - size.length(),
                sb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
 
     final String path = item.mPath + (item.mIsReadonly ? " (read-only)" : "");
     sb.append("\n").append(path);
     sb.setSpan(new ForegroundColorSpan(ThemeUtils.getColor(mActivity, android.R.attr.textColorSecondary)),
                sb.length() - path.length(), sb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-    sb.setSpan(new AbsoluteSizeSpan(UiUtils.dimen(mActivity, R.dimen.text_size_body_4)), sb.length() - path.length(),
+    sb.setSpan(new AbsoluteSizeSpan(Utils.dimen(mActivity, R.dimen.text_size_body_4)), sb.length() - path.length(),
                sb.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
 
     checkedView.setText(sb);
diff --git a/android/app/src/main/java/app/organicmaps/settings/VoiceInstructionsSettingsFragment.java b/android/app/src/main/java/app/organicmaps/settings/VoiceInstructionsSettingsFragment.java
index e0e00d130..2a9292153 100644
--- a/android/app/src/main/java/app/organicmaps/settings/VoiceInstructionsSettingsFragment.java
+++ b/android/app/src/main/java/app/organicmaps/settings/VoiceInstructionsSettingsFragment.java
@@ -26,7 +26,7 @@ import app.organicmaps.sdk.settings.SpeedCameraMode;
 import app.organicmaps.sdk.sound.LanguageData;
 import app.organicmaps.sdk.sound.TtsPlayer;
 import app.organicmaps.sdk.util.Config;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/android/app/src/main/java/app/organicmaps/util/SharingUtils.java b/android/app/src/main/java/app/organicmaps/util/SharingUtils.java
index ec0056330..623027d80 100644
--- a/android/app/src/main/java/app/organicmaps/util/SharingUtils.java
+++ b/android/app/src/main/java/app/organicmaps/util/SharingUtils.java
@@ -22,7 +22,6 @@ import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.bookmarks.data.BookmarkInfo;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
 import app.organicmaps.sdk.util.StorageUtils;
-import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.sdk.util.log.Logger;
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/UiUtils.java b/android/app/src/main/java/app/organicmaps/util/UiUtils.java
similarity index 96%
rename from android/app/src/main/java/app/organicmaps/sdk/util/UiUtils.java
rename to android/app/src/main/java/app/organicmaps/util/UiUtils.java
index a38891899..50c57194a 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/util/UiUtils.java
+++ b/android/app/src/main/java/app/organicmaps/util/UiUtils.java
@@ -1,4 +1,4 @@
-package app.organicmaps.sdk.util;
+package app.organicmaps.util;
 
 import android.animation.Animator;
 import android.app.Activity;
@@ -22,7 +22,6 @@ import androidx.activity.result.ActivityResultLauncher;
 import androidx.annotation.AnyRes;
 import androidx.annotation.AttrRes;
 import androidx.annotation.ColorInt;
-import androidx.annotation.DimenRes;
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
@@ -34,8 +33,6 @@ import androidx.core.view.WindowInsetsCompat;
 import androidx.core.view.WindowInsetsControllerCompat;
 import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.R;
-import app.organicmaps.util.ThemeUtils;
-import app.organicmaps.util.WindowInsetUtils;
 import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.textfield.TextInputLayout;
 import java.util.Objects;
@@ -203,16 +200,6 @@ public final class UiUtils
         ThemeUtils.getResource(toolbar.getContext(), androidx.appcompat.R.attr.homeAsUpIndicator));
   }
 
-  public static boolean isTablet(@NonNull Context context)
-  {
-    return context.getResources().getBoolean(R.bool.tabletLayout);
-  }
-
-  public static int dimen(@NonNull Context context, @DimenRes int id)
-  {
-    return context.getResources().getDimensionPixelSize(id);
-  }
-
   // this method returns the total height of the display (in pixels) including notch and other touchable areas
   public static int getDisplayTotalHeight(Context context)
   {
diff --git a/android/app/src/main/java/app/organicmaps/util/Utils.java b/android/app/src/main/java/app/organicmaps/util/Utils.java
index 430b3eb74..73b06f202 100644
--- a/android/app/src/main/java/app/organicmaps/util/Utils.java
+++ b/android/app/src/main/java/app/organicmaps/util/Utils.java
@@ -1,5 +1,6 @@
 package app.organicmaps.util;
 
+import static app.organicmaps.sdk.util.Utils.dimen;
 import static app.organicmaps.sdk.util.Utils.isIntentSupported;
 
 import android.app.Activity;
@@ -7,7 +8,6 @@ import android.content.ActivityNotFoundException;
 import android.content.ClipData;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.net.Uri;
@@ -42,7 +42,6 @@ import app.organicmaps.R;
 import app.organicmaps.sdk.util.Constants;
 import app.organicmaps.sdk.util.Distance;
 import app.organicmaps.sdk.util.StringUtils;
-import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.sdk.util.concurrency.UiThread;
 import app.organicmaps.sdk.util.log.Logger;
 import app.organicmaps.sdk.util.log.LogsManager;
@@ -286,9 +285,9 @@ public class Utils
                                                   String dimension, String unitText)
   {
     final SpannableStringBuilder res = new SpannableStringBuilder(dimension).append("\u00A0").append(unitText);
-    res.setSpan(new AbsoluteSizeSpan(UiUtils.dimen(context, size), false), 0, dimension.length(),
+    res.setSpan(new AbsoluteSizeSpan(dimen(context, size), false), 0, dimension.length(),
                 Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-    res.setSpan(new AbsoluteSizeSpan(UiUtils.dimen(context, units), false), dimension.length(), res.length(),
+    res.setSpan(new AbsoluteSizeSpan(dimen(context, units), false), dimension.length(), res.length(),
                 Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
     return res;
   }
@@ -297,9 +296,9 @@ public class Utils
   public static Spannable formatDistance(Context context, @NonNull Distance distance)
   {
     final SpannableStringBuilder res = new SpannableStringBuilder(distance.toString(context));
-    res.setSpan(new AbsoluteSizeSpan(UiUtils.dimen(context, R.dimen.text_size_nav_number), false), 0,
+    res.setSpan(new AbsoluteSizeSpan(dimen(context, R.dimen.text_size_nav_number), false), 0,
                 distance.mDistanceStr.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-    res.setSpan(new AbsoluteSizeSpan(UiUtils.dimen(context, R.dimen.text_size_nav_dimension), false),
+    res.setSpan(new AbsoluteSizeSpan(dimen(context, R.dimen.text_size_nav_dimension), false),
                 distance.mDistanceStr.length(), res.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
     return res;
   }
diff --git a/android/app/src/main/java/app/organicmaps/util/WindowInsetUtils.java b/android/app/src/main/java/app/organicmaps/util/WindowInsetUtils.java
index 8655ead24..7870a0dcd 100644
--- a/android/app/src/main/java/app/organicmaps/util/WindowInsetUtils.java
+++ b/android/app/src/main/java/app/organicmaps/util/WindowInsetUtils.java
@@ -8,7 +8,7 @@ import androidx.core.graphics.Insets;
 import androidx.core.view.OnApplyWindowInsetsListener;
 import androidx.core.view.WindowInsetsCompat;
 import app.organicmaps.R;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.sdk.util.Utils;
 
 public final class WindowInsetUtils
 {
@@ -79,7 +79,7 @@ public final class WindowInsetUtils
 
       if (mFloatingActionButton != null)
       {
-        int spacing = UiUtils.dimen(v.getContext(), R.dimen.margin_base);
+        int spacing = Utils.dimen(v.getContext(), R.dimen.margin_base);
         int buttonMarginBottom = insets.bottom + spacing;
 
         ViewGroup.MarginLayoutParams buttonLayoutParams =
diff --git a/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java b/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java
index 7b38d5be0..aadc44847 100644
--- a/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java
+++ b/android/app/src/main/java/app/organicmaps/util/bottomsheet/MenuBottomSheetFragment.java
@@ -15,7 +15,7 @@ import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.R;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
diff --git a/android/app/src/main/java/app/organicmaps/widget/PlaceholderView.java b/android/app/src/main/java/app/organicmaps/widget/PlaceholderView.java
index 9dd3a09ba..0655bec5a 100644
--- a/android/app/src/main/java/app/organicmaps/widget/PlaceholderView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/PlaceholderView.java
@@ -14,7 +14,7 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import app.organicmaps.R;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 
 public class PlaceholderView extends LinearLayout
 {
diff --git a/android/app/src/main/java/app/organicmaps/widget/SearchToolbarController.java b/android/app/src/main/java/app/organicmaps/widget/SearchToolbarController.java
index 2060dd4e2..ea57be923 100644
--- a/android/app/src/main/java/app/organicmaps/widget/SearchToolbarController.java
+++ b/android/app/src/main/java/app/organicmaps/widget/SearchToolbarController.java
@@ -16,8 +16,8 @@ import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import app.organicmaps.R;
 import app.organicmaps.sdk.util.StringUtils;
-import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.InputUtils;
+import app.organicmaps.util.UiUtils;
 import com.google.android.material.textfield.TextInputEditText;
 
 public class SearchToolbarController extends ToolbarController implements View.OnClickListener
diff --git a/android/app/src/main/java/app/organicmaps/widget/StackedButtonsDialog.java b/android/app/src/main/java/app/organicmaps/widget/StackedButtonsDialog.java
index f8fc1db04..945bba16e 100644
--- a/android/app/src/main/java/app/organicmaps/widget/StackedButtonsDialog.java
+++ b/android/app/src/main/java/app/organicmaps/widget/StackedButtonsDialog.java
@@ -10,7 +10,7 @@ import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.appcompat.app.AppCompatDialog;
 import app.organicmaps.R;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 
 public class StackedButtonsDialog extends AppCompatDialog implements View.OnClickListener
 {
diff --git a/android/app/src/main/java/app/organicmaps/widget/ToolbarController.java b/android/app/src/main/java/app/organicmaps/widget/ToolbarController.java
index 4dd6de14a..e59c9b9f6 100644
--- a/android/app/src/main/java/app/organicmaps/widget/ToolbarController.java
+++ b/android/app/src/main/java/app/organicmaps/widget/ToolbarController.java
@@ -10,7 +10,7 @@ import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.view.ViewCompat;
 import app.organicmaps.R;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils;
 import com.google.android.material.appbar.MaterialToolbar;
diff --git a/android/app/src/main/java/app/organicmaps/widget/menu/MainMenu.java b/android/app/src/main/java/app/organicmaps/widget/menu/MainMenu.java
index e5c978820..90e15433b 100644
--- a/android/app/src/main/java/app/organicmaps/widget/menu/MainMenu.java
+++ b/android/app/src/main/java/app/organicmaps/widget/menu/MainMenu.java
@@ -1,7 +1,7 @@
 package app.organicmaps.widget.menu;
 
 import android.view.View;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 
 public class MainMenu
 {
diff --git a/android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java b/android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java
index 12030791f..56ace762f 100644
--- a/android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java
+++ b/android/app/src/main/java/app/organicmaps/widget/menu/MyPositionButton.java
@@ -18,8 +18,8 @@ import androidx.core.widget.ImageViewCompat;
 import app.organicmaps.R;
 import app.organicmaps.sdk.Map;
 import app.organicmaps.sdk.location.LocationState;
-import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.ThemeUtils;
+import app.organicmaps.util.UiUtils;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 
 public class MyPositionButton
diff --git a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
index b0a14e383..d876d2628 100644
--- a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
+++ b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
@@ -13,9 +13,9 @@ import app.organicmaps.R;
 import app.organicmaps.sdk.routing.RoutingInfo;
 import app.organicmaps.sdk.sound.TtsPlayer;
 import app.organicmaps.sdk.util.StringUtils;
-import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.util.ThemeUtils;
+import app.organicmaps.util.UiUtils;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.progressindicator.LinearProgressIndicator;
 import com.google.android.material.textview.MaterialTextView;
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/DirectionFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/DirectionFragment.java
index 2062281ee..258701ea2 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/DirectionFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/DirectionFragment.java
@@ -17,7 +17,7 @@ import app.organicmaps.sdk.bookmarks.data.MapObject;
 import app.organicmaps.sdk.location.LocationListener;
 import app.organicmaps.sdk.location.SensorListener;
 import app.organicmaps.sdk.util.StringUtils;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.widget.ArrowView;
 import com.google.android.material.textview.MaterialTextView;
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
index ac43efb83..39eadea8f 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
@@ -26,9 +26,9 @@ import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
 import app.organicmaps.sdk.bookmarks.data.Icon;
 import app.organicmaps.sdk.bookmarks.data.PredefinedColors;
 import app.organicmaps.sdk.bookmarks.data.Track;
-import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.util.InputUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.WindowInsetUtils.PaddingInsetsListener;
 import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.imageview.ShapeableImageView;
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java b/android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java
index 9e365e4f1..fb25738b7 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/ElevationProfileViewRenderer.java
@@ -13,7 +13,7 @@ import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.bookmarks.data.ElevationInfo;
 import app.organicmaps.sdk.bookmarks.data.Track;
 import app.organicmaps.sdk.bookmarks.data.TrackStatistics;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import java.util.Objects;
 
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
index 75cdc17c2..788445aa3 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageController.java
@@ -34,9 +34,9 @@ import app.organicmaps.sdk.bookmarks.data.RoadWarningMarkType;
 import app.organicmaps.sdk.bookmarks.data.Track;
 import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.settings.RoadType;
-import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.sdk.util.log.Logger;
 import app.organicmaps.util.ThemeUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetItem;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
index c12539743..f89300846 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
@@ -61,11 +61,11 @@ import app.organicmaps.sdk.location.SensorListener;
 import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.util.DateUtils;
 import app.organicmaps.sdk.util.StringUtils;
-import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.sdk.util.concurrency.UiThread;
 import app.organicmaps.sdk.widget.placepage.CoordinatesFormat;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.util.SharingUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetFragment;
 import app.organicmaps.util.bottomsheet.MenuBottomSheetItem;
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapter.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapter.java
index b1b5297f9..80550753c 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlaceOpeningHoursAdapter.java
@@ -11,7 +11,7 @@ import androidx.recyclerview.widget.RecyclerView;
 import app.organicmaps.R;
 import app.organicmaps.sdk.editor.data.Timespan;
 import app.organicmaps.sdk.editor.data.Timetable;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import com.google.android.material.textview.MaterialTextView;
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java
index 4411201a2..f480e38c4 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java
@@ -22,7 +22,7 @@ import app.organicmaps.R;
 import app.organicmaps.sdk.bookmarks.data.Bookmark;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
 import app.organicmaps.sdk.util.StringUtils;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.widget.placepage.PlacePageViewModel;
 import com.google.android.material.textview.MaterialTextView;
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java
index e227ff2dd..4cc4898d3 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java
@@ -20,8 +20,8 @@ import app.organicmaps.sdk.bookmarks.data.Metadata;
 import app.organicmaps.sdk.editor.OpeningHours;
 import app.organicmaps.sdk.editor.data.Timespan;
 import app.organicmaps.sdk.editor.data.Timetable;
-import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.ThemeUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.widget.placepage.PlacePageUtils;
 import app.organicmaps.widget.placepage.PlacePageViewModel;
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageTrackFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageTrackFragment.java
index 13b88cc59..c74c4b650 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageTrackFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageTrackFragment.java
@@ -14,7 +14,7 @@ import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
 import app.organicmaps.sdk.bookmarks.data.ElevationInfo;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
 import app.organicmaps.sdk.bookmarks.data.Track;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.widget.placepage.ElevationProfileViewRenderer;
 import app.organicmaps.widget.placepage.PlacePageStateListener;
 import app.organicmaps.widget.placepage.PlacePageViewModel;
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageWikipediaFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageWikipediaFragment.java
index b44fe919c..ef9fc45cc 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageWikipediaFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageWikipediaFragment.java
@@ -15,7 +15,7 @@ import androidx.lifecycle.ViewModelProvider;
 import app.organicmaps.R;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
 import app.organicmaps.sdk.bookmarks.data.Metadata;
-import app.organicmaps.sdk.util.UiUtils;
+import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.widget.placepage.PlaceDescriptionActivity;
 import app.organicmaps.widget.placepage.PlacePageUtils;
diff --git a/android/app/src/main/res/values-sw600dp/attrs.xml b/android/app/src/main/res/values-sw600dp/attrs.xml
deleted file mode 100644
index 2e5b1a495..000000000
--- a/android/app/src/main/res/values-sw600dp/attrs.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <bool name="isTablet">true</bool>
-</resources>
\ No newline at end of file
diff --git a/android/app/src/main/res/values/attrs.xml b/android/app/src/main/res/values/attrs.xml
index 5ed44bb51..e13d5392e 100644
--- a/android/app/src/main/res/values/attrs.xml
+++ b/android/app/src/main/res/values/attrs.xml
@@ -47,7 +47,6 @@
     <attr name="android:drawable"/>
   </declare-styleable>
 
-  <bool name="isTablet">false</bool>
   <bool name="tabletLayout">false</bool>
 
   <declare-styleable name="PlaceholderView">

From c6040d8ce6f617e3bd28f90d649727545835338a Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Sat, 9 Aug 2025 17:22:21 -0300
Subject: [PATCH 209/302] [android] setSound(null, null) for the Downloader
 notification channel.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 .../downloader/DownloaderNotifier.java        | 48 +++++++++++--------
 .../downloader/DownloaderService.java         |  5 +-
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/downloader/DownloaderNotifier.java b/android/app/src/main/java/app/organicmaps/downloader/DownloaderNotifier.java
index b8ae6f983..a1bb0ba41 100644
--- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderNotifier.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderNotifier.java
@@ -20,6 +20,7 @@ import app.organicmaps.R;
 import app.organicmaps.sdk.downloader.MapManager;
 import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.sdk.util.log.Logger;
+import java.util.Objects;
 
 public class DownloaderNotifier
 {
@@ -29,7 +30,8 @@ public class DownloaderNotifier
   public static final int NOTIFICATION_ID = 1;
 
   private final Context mContext;
-  private NotificationCompat.Builder mProgressNotificationBuilder;
+  private NotificationCompat.Builder mProgressNotificationBuilder = null;
+  private String mNotificationCountryId = null;
 
   public DownloaderNotifier(Context context)
   {
@@ -45,6 +47,7 @@ public class DownloaderNotifier
             .setShowBadge(true)
             .setVibrationEnabled(false)
             .setLightsEnabled(false)
+            .setSound(null, null)
             .build();
     notificationManager.createNotificationChannel(channel);
   }
@@ -62,8 +65,6 @@ public class DownloaderNotifier
     final String countryName = MapManager.nativeGetName(countryId);
     final String content = mContext.getString(R.string.download_country_failed, countryName);
 
-    var contentPendingIntent = getNotificationPendingIntent(countryId);
-
     final Notification notification = new NotificationCompat.Builder(mContext, CHANNEL_ID)
                                           .setAutoCancel(true)
                                           .setCategory(NotificationCompat.CATEGORY_ERROR)
@@ -74,7 +75,7 @@ public class DownloaderNotifier
                                           .setContentText(content)
                                           .setShowWhen(true)
                                           .setTicker(getTicker(mContext, title, content))
-                                          .setContentIntent(contentPendingIntent)
+                                          .setContentIntent(getNotificationPendingIntent(countryId))
                                           .setOnlyAlertOnce(true)
                                           .build();
 
@@ -110,32 +111,41 @@ public class DownloaderNotifier
   @NonNull
   public Notification buildProgressNotification(@Nullable String countryId, int maxProgress, int progress)
   {
-    var builder = startNotification(countryId);
-
-    builder.setProgress(maxProgress, progress, maxProgress == 0);
-    builder.setContentText("Download in progress");
-
+    var builder = getNotificationBuilder(countryId);
+    ///  @todo Doesn't work properly .. Bad input sizes?
+    // builder.setProgress(maxProgress, progress, maxProgress == 0);
+    builder.setProgress(maxProgress, progress, true);
     return builder.build();
   }
 
   @NonNull
-  private NotificationCompat.Builder startNotification(@Nullable String countryId)
+  private NotificationCompat.Builder getNotificationBuilder(@Nullable String countryId)
   {
-    final String title = mContext.getString(R.string.app_name);
+    if (mProgressNotificationBuilder == null || !Objects.equals(countryId, mNotificationCountryId))
+    {
+      mNotificationCountryId = countryId;
+      final String countryName = countryId != null ? MapManager.nativeGetName(countryId) : "";
 
-    return new NotificationCompat.Builder(mContext, CHANNEL_ID)
-        .setAutoCancel(true)
-        .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-        .setSmallIcon(R.drawable.ic_logo_small)
-        .setColor(ContextCompat.getColor(mContext, R.color.notification))
-        .setShowWhen(true)
-        .setContentTitle(title)
-        .setContentIntent(getNotificationPendingIntent(countryId));
+      mProgressNotificationBuilder =
+          new NotificationCompat.Builder(mContext, CHANNEL_ID)
+              .setAutoCancel(true)
+              .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+              .setSmallIcon(R.drawable.ic_logo_small)
+              .setColor(ContextCompat.getColor(mContext, R.color.notification))
+              .setShowWhen(true)
+              .setContentTitle(mContext.getString(R.string.app_name))
+              .setContentIntent(getNotificationPendingIntent(countryId))
+              .setContentText(mContext.getString(R.string.downloader_downloading) + " " + countryName)
+              .setSound(null);
+    }
+    return mProgressNotificationBuilder;
   }
 
   @NonNull
   private PendingIntent getNotificationPendingIntent(@Nullable String countryId)
   {
+    /// @todo Zooming to the countryId when tapping on the notification?
+    /// Shows very low zoom level, need z=9/10, I suppose ...
     final int FLAG_IMMUTABLE = Build.VERSION.SDK_INT < Build.VERSION_CODES.M ? 0 : PendingIntent.FLAG_IMMUTABLE;
     final Intent contentIntent = MwmActivity.createShowMapIntent(mContext, countryId);
     contentIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
diff --git a/android/app/src/main/java/app/organicmaps/downloader/DownloaderService.java b/android/app/src/main/java/app/organicmaps/downloader/DownloaderService.java
index 4cf297587..d9924f58b 100644
--- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderService.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderService.java
@@ -97,7 +97,7 @@ public class DownloaderService extends Service implements MapManager.StorageCall
   }
 
   @Override
-  public void onProgress(String countryId, long localSize, long remoteSize)
+  public void onProgress(String countryId, long bytesDownloaded, long bytesTotal)
   {
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
         && ContextCompat.checkSelfPermission(this, POST_NOTIFICATIONS) != PERMISSION_GRANTED)
@@ -106,8 +106,7 @@ public class DownloaderService extends Service implements MapManager.StorageCall
       return;
     }
 
-    // TODO: How to calculate progress?
-    mNotifier.notifyProgress();
+    mNotifier.notifyProgress(countryId, (int) bytesTotal, (int) bytesDownloaded);
   }
 
   @Override

From c6cd23fb241726cecfeb9bcbebf1be60b9ec1e1d Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Sat, 9 Aug 2025 18:43:02 -0300
Subject: [PATCH 210/302] [android] openUri, failMessage may be null.

pastk: includes changes from OM 33c4e22246 and 10be769f62

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 .../main/java/app/organicmaps/util/Utils.java | 42 ++++++++-----------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/util/Utils.java b/android/app/src/main/java/app/organicmaps/util/Utils.java
index 73b06f202..8a13d4e73 100644
--- a/android/app/src/main/java/app/organicmaps/util/Utils.java
+++ b/android/app/src/main/java/app/organicmaps/util/Utils.java
@@ -202,17 +202,33 @@ public class Utils
     if (TextUtils.isEmpty(url))
       return;
 
-    final Intent intent = new Intent(Intent.ACTION_VIEW);
     Uri uri =
         isHttpOrHttpsScheme(url) ? Uri.parse(url) : new Uri.Builder().scheme("http").appendEncodedPath(url).build();
+
+    Utils.openUri(context, uri, R.string.browser_not_available);
+  }
+
+  /**
+   * Attempts to open a URI in another app via the system app chooser.
+   * @param context the app context
+   * @param uri the URI to open.
+   * @param failMessage string id: message to show in a toast when the system can't find an app to open with.
+   */
+  public static void openUri(@NonNull Context context, @NonNull Uri uri, @Nullable Integer failMessage)
+  {
+    final Intent intent = new Intent(Intent.ACTION_VIEW);
     intent.setData(uri);
+    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+    intent.addCategory(Intent.CATEGORY_BROWSABLE);
+
     try
     {
       context.startActivity(intent);
     }
     catch (ActivityNotFoundException e)
     {
-      Toast.makeText(context, context.getString(R.string.browser_not_available), Toast.LENGTH_LONG).show();
+      if (failMessage != null)
+        Toast.makeText(context, context.getString(failMessage), Toast.LENGTH_LONG).show();
       Logger.e(TAG, "ActivityNotFoundException", e);
     }
     catch (AndroidRuntimeException e)
@@ -223,28 +239,6 @@ public class Utils
     }
   }
 
-  /**
-   * Attempts to open a URI in another app via the system app chooser.
-   * @param context the app context
-   * @param uri the URI to open.
-   * @param failMessage string id: message to show in a toast when the system can't find an app to open with.
-   * @param action (optional) the Intent action to use. If none is provided, defaults to Intent.ACTION_VIEW.
-   */
-  public static void openUri(@NonNull Context context, @NonNull Uri uri, Integer failMessage, @NonNull String... action)
-  {
-    final String act = (action != null && action.length > 0 && action[0] != null) ? action[0] : Intent.ACTION_VIEW;
-    final Intent intent = new Intent(act);
-    intent.setData(uri);
-    intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-
-    // https://developer.android.com/guide/components/intents-common
-    // check that an app exists to open with, otherwise it'll crash
-    if (intent.resolveActivity(context.getPackageManager()) != null)
-      context.startActivity(intent);
-    else
-      Toast.makeText(context, failMessage, Toast.LENGTH_SHORT).show();
-  }
-
   private static boolean isHttpOrHttpsScheme(@NonNull String url)
   {
     return url.startsWith("http://") || url.startsWith("https://");

From 886d5698955660c730ab3bfde1f568d1ceda6dfa Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Fri, 8 Aug 2025 17:47:02 +0200
Subject: [PATCH 211/302] [android][sdk] Fix StackedButtonDialogFragment usage
 in sdk

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 .../organicmaps/editor/ProfileFragment.java   | 23 ++++-
 .../app/organicmaps/sdk/editor/OsmOAuth.java  |  5 +-
 .../organicmaps/sdk/util/NetworkPolicy.java   | 86 +++++++------------
 .../widget/StackedButtonDialogFragment.java   | 29 ++++++-
 4 files changed, 86 insertions(+), 57 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/editor/ProfileFragment.java b/android/app/src/main/java/app/organicmaps/editor/ProfileFragment.java
index 4ce820fe0..4a952124c 100644
--- a/android/app/src/main/java/app/organicmaps/editor/ProfileFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/ProfileFragment.java
@@ -11,14 +11,17 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.view.ViewCompat;
 import androidx.core.view.WindowInsetsCompat;
+import androidx.fragment.app.FragmentManager;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmToolbarFragment;
 import app.organicmaps.sdk.editor.OsmOAuth;
+import app.organicmaps.sdk.util.NetworkPolicy;
 import app.organicmaps.sdk.util.concurrency.ThreadPool;
 import app.organicmaps.sdk.util.concurrency.UiThread;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils;
+import app.organicmaps.widget.StackedButtonDialogFragment;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.imageview.ShapeableImageView;
 import com.google.android.material.textview.MaterialTextView;
@@ -26,6 +29,24 @@ import java.text.NumberFormat;
 
 public class ProfileFragment extends BaseMwmToolbarFragment
 {
+  @NonNull
+  private static final NetworkPolicy.DialogPresenter mDialogPresenter = new NetworkPolicy.DialogPresenter() {
+    @Override
+    public void showDialogIfNeeded(@NonNull FragmentManager fragmentManager,
+                                   @NonNull NetworkPolicy.NetworkPolicyListener listener, @NonNull NetworkPolicy policy,
+                                   boolean isToday)
+    {
+      StackedButtonDialogFragment.showDialogIfNeeded(fragmentManager, listener, policy, isToday);
+    }
+
+    @Override
+    public void showDialog(@NonNull FragmentManager fragmentManager,
+                           @NonNull NetworkPolicy.NetworkPolicyListener listener)
+    {
+      StackedButtonDialogFragment.showDialog(fragmentManager, listener);
+    }
+  };
+
   private View mUserInfoBlock;
   private MaterialTextView mEditsSent;
   private MaterialTextView mProfileName;
@@ -84,7 +105,7 @@ public class ProfileFragment extends BaseMwmToolbarFragment
           UiUtils.show(mProfileInfoLoading);
           UiUtils.hide(mUserInfoBlock);
         }
-        final int profileEditCount = OsmOAuth.getOsmChangesetsCount(getParentFragmentManager());
+        final int profileEditCount = OsmOAuth.getOsmChangesetsCount(mDialogPresenter, getParentFragmentManager());
         final String profileUsername = OsmOAuth.getUsername();
         final Bitmap profilePicture = OsmOAuth.getProfilePicture();
 
diff --git a/android/app/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java b/android/app/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java
index 88b9d8da8..da79f6b3e 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java
@@ -130,10 +130,11 @@ public final class OsmOAuth
   private static native int nativeGetOsmChangesetsCount(String oauthToken);
 
   @WorkerThread
-  public static int getOsmChangesetsCount(@NonNull FragmentManager fm)
+  public static int getOsmChangesetsCount(@NonNull NetworkPolicy.DialogPresenter dialogPresenter,
+                                          @NonNull FragmentManager fm)
   {
     final int[] editsCount = {-1};
-    NetworkPolicy.checkNetworkPolicy(fm, policy -> {
+    NetworkPolicy.checkNetworkPolicy(dialogPresenter, fm, policy -> {
       if (!policy.canUseNetwork())
         return;
 
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/NetworkPolicy.java b/android/app/src/main/java/app/organicmaps/sdk/util/NetworkPolicy.java
index fc0f4ac0c..7fc0a043d 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/util/NetworkPolicy.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/util/NetworkPolicy.java
@@ -3,7 +3,6 @@ package app.organicmaps.sdk.util;
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 import androidx.fragment.app.FragmentManager;
-import app.organicmaps.widget.StackedButtonDialogFragment;
 import java.util.concurrent.TimeUnit;
 
 @Keep
@@ -15,14 +14,14 @@ public final class NetworkPolicy
 
     ALWAYS() {
       @Override
-      public void check(@NonNull FragmentManager fragmentManager, @NonNull NetworkPolicyListener listener,
-                        boolean isDialogAllowed)
+      public void check(@NonNull DialogPresenter dialogPresenter, @NonNull FragmentManager fragmentManager,
+                        @NonNull NetworkPolicyListener listener, boolean isDialogAllowed)
       {
         boolean nowInRoaming = ConnectionState.INSTANCE.isInRoaming();
         boolean acceptedInRoaming = Config.getMobileDataRoaming();
 
         if (nowInRoaming && !acceptedInRoaming)
-          showDialog(fragmentManager, listener);
+          dialogPresenter.showDialog(fragmentManager, listener);
         else
           listener.onResult(new NetworkPolicy(true));
       }
@@ -30,11 +29,11 @@ public final class NetworkPolicy
 
     NEVER() {
       @Override
-      public void check(@NonNull FragmentManager fragmentManager, @NonNull NetworkPolicyListener listener,
-                        boolean isDialogAllowed)
+      public void check(@NonNull DialogPresenter dialogPresenter, @NonNull FragmentManager fragmentManager,
+                        @NonNull NetworkPolicyListener listener, boolean isDialogAllowed)
       {
         if (isDialogAllowed)
-          showDialog(fragmentManager, listener);
+          dialogPresenter.showDialog(fragmentManager, listener);
         else
           listener.onResult(new NetworkPolicy(false));
       }
@@ -42,43 +41,42 @@ public final class NetworkPolicy
 
     NOT_TODAY() {
       @Override
-      public void check(@NonNull FragmentManager fragmentManager, @NonNull NetworkPolicyListener listener,
-                        boolean isDialogAllowed)
+      public void check(@NonNull DialogPresenter dialogPresenter, @NonNull FragmentManager fragmentManager,
+                        @NonNull NetworkPolicyListener listener, boolean isDialogAllowed)
       {
         if (isDialogAllowed)
-          showDialog(fragmentManager, listener);
+          dialogPresenter.showDialog(fragmentManager, listener);
         else
-          showDialogIfNeeded(fragmentManager, listener, new NetworkPolicy(false));
+          dialogPresenter.showDialogIfNeeded(fragmentManager, listener, new NetworkPolicy(false), isToday());
       }
     },
 
     TODAY() {
       @Override
-      public void check(@NonNull FragmentManager fragmentManager, @NonNull NetworkPolicyListener listener,
-                        boolean isDialogAllowed)
+      public void check(@NonNull DialogPresenter dialogPresenter, @NonNull FragmentManager fragmentManager,
+                        @NonNull NetworkPolicyListener listener, boolean isDialogAllowed)
       {
         boolean nowInRoaming = ConnectionState.INSTANCE.isInRoaming();
         boolean acceptedInRoaming = Config.getMobileDataRoaming();
 
         if (nowInRoaming && !acceptedInRoaming)
-          showDialog(fragmentManager, listener);
+          dialogPresenter.showDialog(fragmentManager, listener);
         else
-          showDialogIfNeeded(fragmentManager, listener, new NetworkPolicy(true));
+          dialogPresenter.showDialogIfNeeded(fragmentManager, listener, new NetworkPolicy(true), isToday());
       }
     };
 
-    public void check(@NonNull FragmentManager fragmentManager, @NonNull final NetworkPolicyListener listener,
-                      boolean isDialogAllowed)
+    public void check(@NonNull DialogPresenter dialogPresenter, @NonNull FragmentManager fragmentManager,
+                      @NonNull final NetworkPolicyListener listener, boolean isDialogAllowed)
     {
-      showDialog(fragmentManager, listener);
+      dialogPresenter.showDialog(fragmentManager, listener);
     }
   }
 
   public static final int NONE = -1;
 
-  private static final String TAG_NETWORK_POLICY = "network_policy";
-
-  public static void checkNetworkPolicy(@NonNull FragmentManager fragmentManager,
+  public static void checkNetworkPolicy(@NonNull DialogPresenter dialogPresenter,
+                                        @NonNull FragmentManager fragmentManager,
                                         @NonNull final NetworkPolicyListener listener, boolean isDialogAllowed)
   {
     if (ConnectionState.INSTANCE.isWifiConnected())
@@ -94,13 +92,14 @@ public final class NetworkPolicy
     }
 
     Type type = Config.getUseMobileDataSettings();
-    type.check(fragmentManager, listener, isDialogAllowed);
+    type.check(dialogPresenter, fragmentManager, listener, isDialogAllowed);
   }
 
-  public static void checkNetworkPolicy(@NonNull FragmentManager fragmentManager,
+  public static void checkNetworkPolicy(@NonNull DialogPresenter dialogPresenter,
+                                        @NonNull FragmentManager fragmentManager,
                                         @NonNull final NetworkPolicyListener listener)
   {
-    checkNetworkPolicy(fragmentManager, listener, false);
+    checkNetworkPolicy(dialogPresenter, fragmentManager, listener, false);
   }
 
   // Called from JNI.
@@ -129,37 +128,9 @@ public final class NetworkPolicy
     return TimeUnit.MILLISECONDS.toDays(System.currentTimeMillis() - timestamp) < 1;
   }
 
-  private static void showDialogIfNeeded(@NonNull FragmentManager fragmentManager,
-                                         @NonNull NetworkPolicyListener listener, @NonNull NetworkPolicy policy)
-  {
-    if (isToday())
-    {
-      listener.onResult(policy);
-      return;
-    }
-    showDialog(fragmentManager, listener);
-  }
-
-  private static void showDialog(@NonNull FragmentManager fragmentManager, @NonNull NetworkPolicyListener listener)
-  {
-    StackedButtonDialogFragment dialog =
-        (StackedButtonDialogFragment) fragmentManager.findFragmentByTag(TAG_NETWORK_POLICY);
-    if (dialog != null)
-      dialog.dismiss();
-
-    dialog = new StackedButtonDialogFragment();
-    dialog.setListener(listener);
-    dialog.show(fragmentManager, TAG_NETWORK_POLICY);
-  }
-
-  public static NetworkPolicy newInstance(boolean canUse)
-  {
-    return new NetworkPolicy(canUse);
-  }
-
   private final boolean mCanUseNetwork;
 
-  private NetworkPolicy(boolean canUse)
+  public NetworkPolicy(boolean canUse)
   {
     mCanUseNetwork = canUse;
   }
@@ -176,4 +147,13 @@ public final class NetworkPolicy
   {
     void onResult(@NonNull NetworkPolicy policy);
   }
+
+  public interface DialogPresenter
+  {
+    void showDialogIfNeeded(@NonNull FragmentManager fragmentManager,
+                            @NonNull NetworkPolicy.NetworkPolicyListener listener, @NonNull NetworkPolicy policy,
+                            boolean isToday);
+
+    void showDialog(@NonNull FragmentManager fragmentManager, @NonNull NetworkPolicy.NetworkPolicyListener listener);
+  }
 }
diff --git a/android/app/src/main/java/app/organicmaps/widget/StackedButtonDialogFragment.java b/android/app/src/main/java/app/organicmaps/widget/StackedButtonDialogFragment.java
index 544d154c4..0c8f46870 100644
--- a/android/app/src/main/java/app/organicmaps/widget/StackedButtonDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/StackedButtonDialogFragment.java
@@ -13,6 +13,8 @@ import app.organicmaps.sdk.util.NetworkPolicy;
 
 public class StackedButtonDialogFragment extends DialogFragment
 {
+  private static final String TAG_NETWORK_POLICY = "network_policy";
+
   @Nullable
   private NetworkPolicy.NetworkPolicyListener mListener;
 
@@ -43,7 +45,7 @@ public class StackedButtonDialogFragment extends DialogFragment
   {
     Config.setUseMobileDataSettings(type);
     if (mListener != null)
-      mListener.onResult(NetworkPolicy.newInstance(canUse));
+      mListener.onResult(new NetworkPolicy(canUse));
   }
 
   @Override
@@ -58,4 +60,29 @@ public class StackedButtonDialogFragment extends DialogFragment
   {
     mListener = listener;
   }
+
+  public static void showDialogIfNeeded(@NonNull FragmentManager fragmentManager,
+                                        @NonNull NetworkPolicy.NetworkPolicyListener listener,
+                                        @NonNull NetworkPolicy policy, boolean isToday)
+  {
+    if (isToday)
+    {
+      listener.onResult(policy);
+      return;
+    }
+    showDialog(fragmentManager, listener);
+  }
+
+  public static void showDialog(@NonNull FragmentManager fragmentManager,
+                                @NonNull NetworkPolicy.NetworkPolicyListener listener)
+  {
+    StackedButtonDialogFragment dialog =
+        (StackedButtonDialogFragment) fragmentManager.findFragmentByTag(TAG_NETWORK_POLICY);
+    if (dialog != null)
+      dialog.dismiss();
+
+    dialog = new StackedButtonDialogFragment();
+    dialog.setListener(listener);
+    dialog.show(fragmentManager, TAG_NETWORK_POLICY);
+  }
 }

From 447266c3282a7a7cbbc26233a951b8c9dd62c278 Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Fri, 8 Aug 2025 17:48:12 +0200
Subject: [PATCH 212/302] [android][sdk] Fix ThemeUtils usage in sdk

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 .../java/app/organicmaps/MwmActivity.java     |  8 +-
 .../java/app/organicmaps/SplashActivity.java  |  7 +-
 .../base/BaseMwmDialogFragment.java           |  2 +-
 .../base/BaseMwmFragmentActivity.java         | 12 +--
 .../bookmarks/BookmarkCategoriesActivity.java |  2 +-
 .../bookmarks/BookmarkListActivity.java       |  2 +-
 .../app/organicmaps/car/util/ThemeUtils.java  | 34 +++----
 .../editor/HoursMinutesPickerFragment.java    |  8 +-
 .../maplayer/MapButtonsController.java        |  2 +-
 .../traffic/widget/TrafficButton.java         | 10 +-
 .../organicmaps/routing/TransitStepView.java  |  2 +-
 .../main/java/app/organicmaps/sdk/Map.java    | 10 +-
 .../java/app/organicmaps/sdk/util/Config.java | 97 ++++++++++++-------
 .../organicmaps/search/CategoriesAdapter.java |  2 +-
 .../organicmaps/search/SearchActivity.java    |  2 +-
 .../settings/BaseXmlSettingsFragment.java     |  2 +-
 .../settings/SettingsPrefsFragment.java       | 33 +++----
 .../app/organicmaps/util/ThemeSwitcher.java   | 33 ++++---
 .../java/app/organicmaps/util/ThemeUtils.java | 62 +++---------
 .../widget/RoutingToolbarButton.java          |  7 +-
 .../src/main/res/values/donottranslate.xml    |  6 --
 .../app/src/main/res/values/string-arrays.xml |  8 --
 android/app/src/main/res/xml/prefs_main.xml   |  1 -
 23 files changed, 162 insertions(+), 190 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/MwmActivity.java b/android/app/src/main/java/app/organicmaps/MwmActivity.java
index a96b47db8..e6b651be9 100644
--- a/android/app/src/main/java/app/organicmaps/MwmActivity.java
+++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java
@@ -458,12 +458,10 @@ public class MwmActivity extends BaseMwmFragmentActivity
   @StyleRes
   protected int getThemeResourceId(@NonNull String theme)
   {
-    Context context = getApplicationContext();
-
-    if (ThemeUtils.isDefaultTheme(context, theme))
+    if (Config.UiTheme.isDefault(theme))
       return R.style.MwmTheme_MainActivity;
 
-    if (ThemeUtils.isNightTheme(context, theme))
+    if (Config.UiTheme.isNight(theme))
       return R.style.MwmTheme_Night_MainActivity;
 
     return super.getThemeResourceId(theme);
@@ -585,7 +583,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
   private void refreshLightStatusBar()
   {
-    UiUtils.setLightStatusBar(this, !(ThemeUtils.isNightTheme(this) || RoutingController.get().isPlanning()
+    UiUtils.setLightStatusBar(this, !(ThemeUtils.isNightTheme() || RoutingController.get().isPlanning()
                                       || ChoosePositionMode.get() != ChoosePositionMode.None));
   }
 
diff --git a/android/app/src/main/java/app/organicmaps/SplashActivity.java b/android/app/src/main/java/app/organicmaps/SplashActivity.java
index 620f6d500..2771538ff 100644
--- a/android/app/src/main/java/app/organicmaps/SplashActivity.java
+++ b/android/app/src/main/java/app/organicmaps/SplashActivity.java
@@ -60,11 +60,10 @@ public class SplashActivity extends AppCompatActivity
   {
     super.onCreate(savedInstanceState);
 
-    final Context context = getApplicationContext();
-    final String theme = Config.getCurrentUiTheme(context);
-    if (ThemeUtils.isDefaultTheme(context, theme))
+    final String theme = Config.UiTheme.getCurrent();
+    if (Config.UiTheme.isDefault(theme))
       setTheme(R.style.MwmTheme_Splash);
-    else if (ThemeUtils.isNightTheme(context, theme))
+    else if (Config.UiTheme.isNight(theme))
       setTheme(R.style.MwmTheme_Night_Splash);
     else
       throw new IllegalArgumentException("Attempt to apply unsupported theme: " + theme);
diff --git a/android/app/src/main/java/app/organicmaps/base/BaseMwmDialogFragment.java b/android/app/src/main/java/app/organicmaps/base/BaseMwmDialogFragment.java
index 0cd943754..1f513dac2 100644
--- a/android/app/src/main/java/app/organicmaps/base/BaseMwmDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/base/BaseMwmDialogFragment.java
@@ -15,7 +15,7 @@ public class BaseMwmDialogFragment extends DialogFragment
   @StyleRes
   protected final int getFullscreenTheme()
   {
-    return ThemeUtils.isNightTheme(requireContext()) ? getFullscreenDarkTheme() : getFullscreenLightTheme();
+    return ThemeUtils.isNightTheme() ? getFullscreenDarkTheme() : getFullscreenLightTheme();
   }
 
   protected int getStyle()
diff --git a/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java b/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java
index 4b72a84f0..518373f8f 100644
--- a/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java
+++ b/android/app/src/main/java/app/organicmaps/base/BaseMwmFragmentActivity.java
@@ -1,7 +1,6 @@
 package app.organicmaps.base;
 
 import android.content.ComponentName;
-import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.media.AudioManager;
@@ -24,7 +23,6 @@ import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.concurrency.UiThread;
 import app.organicmaps.sdk.util.log.Logger;
 import app.organicmaps.util.RtlUtils;
-import app.organicmaps.util.ThemeUtils;
 import com.google.android.material.appbar.MaterialToolbar;
 import java.util.Objects;
 
@@ -40,12 +38,10 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
   @StyleRes
   protected int getThemeResourceId(@NonNull String theme)
   {
-    Context context = getApplicationContext();
-
-    if (ThemeUtils.isDefaultTheme(context, theme))
+    if (Config.UiTheme.isDefault(theme))
       return R.style.MwmTheme;
 
-    if (ThemeUtils.isNightTheme(context, theme))
+    if (Config.UiTheme.isNight(theme))
       return R.style.MwmTheme_Night;
 
     throw new IllegalArgumentException("Attempt to apply unsupported theme: " + theme);
@@ -62,7 +58,7 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
   protected final void onCreate(@Nullable Bundle savedInstanceState)
   {
     super.onCreate(savedInstanceState);
-    mThemeName = Config.getCurrentUiTheme(getApplicationContext());
+    mThemeName = Config.UiTheme.getCurrent();
     setTheme(getThemeResourceId(mThemeName));
     EdgeToEdge.enable(this, SystemBarStyle.dark(Color.TRANSPARENT));
     RtlUtils.manageRtl(this);
@@ -122,7 +118,7 @@ public abstract class BaseMwmFragmentActivity extends AppCompatActivity
   public void onPostResume()
   {
     super.onPostResume();
-    if (!mThemeName.equals(Config.getCurrentUiTheme(getApplicationContext())))
+    if (!mThemeName.equals(Config.UiTheme.getCurrent()))
     {
       // Workaround described in https://code.google.com/p/android/issues/detail?id=93731
       UiThread.runLater(this::recreate);
diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesActivity.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesActivity.java
index ea54ae664..a3f8c28f2 100644
--- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesActivity.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkCategoriesActivity.java
@@ -42,7 +42,7 @@ public class BookmarkCategoriesActivity extends BaseToolbarActivity
   @StyleRes
   public int getThemeResourceId(@NonNull String theme)
   {
-    return ThemeUtils.getWindowBgThemeResourceId(getApplicationContext(), theme);
+    return ThemeUtils.getWindowBgThemeResourceId(theme);
   }
 
   @Override
diff --git a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListActivity.java b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListActivity.java
index c0451773e..8dd111fac 100644
--- a/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListActivity.java
+++ b/android/app/src/main/java/app/organicmaps/bookmarks/BookmarkListActivity.java
@@ -41,7 +41,7 @@ public class BookmarkListActivity extends BaseToolbarActivity
   @StyleRes
   public int getThemeResourceId(@NonNull String theme)
   {
-    return ThemeUtils.getCardBgThemeResourceId(getApplicationContext(), theme);
+    return ThemeUtils.getCardBgThemeResourceId(theme);
   }
 
   @Override
diff --git a/android/app/src/main/java/app/organicmaps/car/util/ThemeUtils.java b/android/app/src/main/java/app/organicmaps/car/util/ThemeUtils.java
index 4f087e207..5ade7fda6 100644
--- a/android/app/src/main/java/app/organicmaps/car/util/ThemeUtils.java
+++ b/android/app/src/main/java/app/organicmaps/car/util/ThemeUtils.java
@@ -10,19 +10,20 @@ import androidx.car.app.CarContext;
 import app.organicmaps.R;
 import app.organicmaps.sdk.MapStyle;
 import app.organicmaps.sdk.routing.RoutingController;
+import app.organicmaps.sdk.util.Config;
 
 public final class ThemeUtils
 {
   public enum ThemeMode
   {
-    AUTO(R.string.auto, R.string.theme_auto),
-    LIGHT(R.string.off, R.string.theme_default),
-    NIGHT(R.string.on, R.string.theme_night);
+    AUTO(R.string.auto, Config.UiTheme.AUTO),
+    LIGHT(R.string.off, Config.UiTheme.DEFAULT),
+    NIGHT(R.string.on, Config.UiTheme.NIGHT);
 
-    ThemeMode(@StringRes int titleId, @StringRes int prefsKeyId)
+    ThemeMode(@StringRes int titleId, @NonNull String config)
     {
       mTitleId = titleId;
-      mPrefsKeyId = prefsKeyId;
+      mConfig = config;
     }
 
     @StringRes
@@ -31,16 +32,16 @@ public final class ThemeUtils
       return mTitleId;
     }
 
-    @StringRes
-    public int getPrefsKeyId()
+    @NonNull
+    public String getConfig()
     {
-      return mPrefsKeyId;
+      return mConfig;
     }
 
     @StringRes
     private final int mTitleId;
-    @StringRes
-    private final int mPrefsKeyId;
+    @NonNull
+    private final String mConfig;
   }
 
   private static final String ANDROID_AUTO_PREFERENCES_FILE_KEY = "ANDROID_AUTO_PREFERENCES_FILE_KEY";
@@ -79,23 +80,20 @@ public final class ThemeUtils
   @UiThread
   public static void setThemeMode(@NonNull CarContext context, @NonNull ThemeMode themeMode)
   {
-    getSharedPreferences(context).edit().putString(THEME_KEY, context.getString(themeMode.getPrefsKeyId())).commit();
+    getSharedPreferences(context).edit().putString(THEME_KEY, themeMode.getConfig()).commit();
     update(context, themeMode);
   }
 
   @NonNull
   public static ThemeMode getThemeMode(@NonNull CarContext context)
   {
-    final String autoTheme = context.getString(R.string.theme_auto);
-    final String lightTheme = context.getString(R.string.theme_default);
-    final String nightTheme = context.getString(R.string.theme_night);
-    final String themeMode = getSharedPreferences(context).getString(THEME_KEY, autoTheme);
+    final String themeMode = getSharedPreferences(context).getString(THEME_KEY, ThemeMode.AUTO.getConfig());
 
-    if (themeMode.equals(autoTheme))
+    if (themeMode.equals(ThemeMode.AUTO.getConfig()))
       return ThemeMode.AUTO;
-    else if (themeMode.equals(lightTheme))
+    else if (themeMode.equals(ThemeMode.LIGHT.getConfig()))
       return ThemeMode.LIGHT;
-    else if (themeMode.equals(nightTheme))
+    else if (themeMode.equals(ThemeMode.NIGHT.getConfig()))
       return ThemeMode.NIGHT;
     else
       throw new IllegalArgumentException("Unsupported value");
diff --git a/android/app/src/main/java/app/organicmaps/editor/HoursMinutesPickerFragment.java b/android/app/src/main/java/app/organicmaps/editor/HoursMinutesPickerFragment.java
index b1566c407..20a70d7f4 100644
--- a/android/app/src/main/java/app/organicmaps/editor/HoursMinutesPickerFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/HoursMinutesPickerFragment.java
@@ -79,8 +79,8 @@ public class HoursMinutesPickerFragment extends BaseMwmDialogFragment
     mTabs.getTabAt(mSelectedTab).select();
 
     @StyleRes
-    final int theme = ThemeUtils.isNightTheme(requireContext()) ? R.style.MwmMain_DialogFragment_TimePicker_Night
-                                                                : R.style.MwmMain_DialogFragment_TimePicker;
+    final int theme = ThemeUtils.isNightTheme() ? R.style.MwmMain_DialogFragment_TimePicker_Night
+                                                : R.style.MwmMain_DialogFragment_TimePicker;
     final AlertDialog dialog = new MaterialAlertDialogBuilder(requireActivity(), theme)
                                    .setView(root)
                                    .setNegativeButton(R.string.cancel, null)
@@ -141,8 +141,8 @@ public class HoursMinutesPickerFragment extends BaseMwmDialogFragment
     MaterialTextView tabView = (MaterialTextView) inflater.inflate(R.layout.tab_timepicker, mTabs, false);
     tabView.setText(getResources().getString(R.string.editor_time_from));
     final ColorStateList textColor = AppCompatResources.getColorStateList(
-        requireContext(), ThemeUtils.isNightTheme(requireContext()) ? R.color.accent_color_selector_night
-                                                                    : R.color.accent_color_selector);
+        requireContext(),
+        ThemeUtils.isNightTheme() ? R.color.accent_color_selector_night : R.color.accent_color_selector);
     tabView.setTextColor(textColor);
     mTabs.addTab(mTabs.newTab().setCustomView(tabView), true);
     tabView = (MaterialTextView) inflater.inflate(R.layout.tab_timepicker, mTabs, false);
diff --git a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
index fb368af39..28e760076 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
@@ -214,7 +214,7 @@ public class MapButtonsController extends Fragment
       //        helpButton.setImageResource(R.drawable.ic_launcher);
       //      }
       //      // Keep this button colorful in normal theme.
-      //      if (!ThemeUtils.isNightTheme(requireContext()))
+      //      if (!ThemeUtils.isNightTheme())
       //        helpButton.getDrawable().setTintList(null);
     }
     else if (leftButtonView != null)
diff --git a/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButton.java b/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButton.java
index aedc3e45b..ccf986ab1 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButton.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/traffic/widget/TrafficButton.java
@@ -43,22 +43,20 @@ public class TrafficButton
   void turnOff()
   {
     stopWaitingAnimation();
-    mButton.setImageResource(ThemeUtils.isNightTheme(mButton.getContext()) ? R.drawable.ic_traffic_on_night
-                                                                           : R.drawable.ic_traffic_on);
+    mButton.setImageResource(ThemeUtils.isNightTheme() ? R.drawable.ic_traffic_on_night : R.drawable.ic_traffic_on);
   }
 
   void turnOn()
   {
     stopWaitingAnimation();
-    mButton.setImageResource(ThemeUtils.isNightTheme(mButton.getContext()) ? R.drawable.ic_traffic_on_night
-                                                                           : R.drawable.ic_traffic_on);
+    mButton.setImageResource(ThemeUtils.isNightTheme() ? R.drawable.ic_traffic_on_night : R.drawable.ic_traffic_on);
   }
 
   void markAsOutdated()
   {
     stopWaitingAnimation();
-    mButton.setImageResource(ThemeUtils.isNightTheme(mButton.getContext()) ? R.drawable.ic_traffic_outdated_night
-                                                                           : R.drawable.ic_traffic_outdated);
+    mButton.setImageResource(ThemeUtils.isNightTheme() ? R.drawable.ic_traffic_outdated_night
+                                                       : R.drawable.ic_traffic_outdated);
   }
 
   void startWaitingAnimation()
diff --git a/android/app/src/main/java/app/organicmaps/routing/TransitStepView.java b/android/app/src/main/java/app/organicmaps/routing/TransitStepView.java
index ed6ed4944..352ed3d0c 100644
--- a/android/app/src/main/java/app/organicmaps/routing/TransitStepView.java
+++ b/android/app/src/main/java/app/organicmaps/routing/TransitStepView.java
@@ -90,7 +90,7 @@ public class TransitStepView extends View implements MultilineLayoutManager.Sque
     {
       mDrawable = null;
       mText = info.getDistance() + " " + info.getDistanceUnits();
-      mTextPaint.setColor(ThemeUtils.isDefaultTheme(getContext()) ? Color.BLACK : Color.WHITE);
+      mTextPaint.setColor(ThemeUtils.isDefaultTheme() ? Color.BLACK : Color.WHITE);
     }
     else
     {
diff --git a/android/app/src/main/java/app/organicmaps/sdk/Map.java b/android/app/src/main/java/app/organicmaps/sdk/Map.java
index cc386ddd1..c2524340b 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/Map.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/Map.java
@@ -148,7 +148,7 @@ public final class Map
   {
     assert mLocationHelper != null : "LocationHelper must be initialized before calling onSurfaceCreated";
 
-    if (isThemeChangingProcess(context))
+    if (isThemeChangingProcess())
     {
       Logger.d(TAG, "Theme changing process, skip 'onSurfaceCreated' callback");
       return;
@@ -203,7 +203,7 @@ public final class Map
   public void onSurfaceChanged(final Context context, final Surface surface, Rect surfaceFrame,
                                boolean isSurfaceCreating)
   {
-    if (isThemeChangingProcess(context))
+    if (isThemeChangingProcess())
     {
       Logger.d(TAG, "Theme changing process, skip 'onSurfaceChanged' callback");
       return;
@@ -265,7 +265,7 @@ public final class Map
 
   public void onPause(final Context context)
   {
-    mUiThemeOnPause = Config.getCurrentUiTheme(context);
+    mUiThemeOnPause = Config.UiTheme.getCurrent();
 
     // Pause/Resume can be called without surface creation/destroy.
     if (mSurfaceAttached)
@@ -370,9 +370,9 @@ public final class Map
       nativeApplyWidgets();
   }
 
-  private boolean isThemeChangingProcess(final Context context)
+  private boolean isThemeChangingProcess()
   {
-    return mUiThemeOnPause != null && !mUiThemeOnPause.equals(Config.getCurrentUiTheme(context));
+    return mUiThemeOnPause != null && !mUiThemeOnPause.equals(Config.UiTheme.getCurrent());
   }
 
   // Engine
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/Config.java b/android/app/src/main/java/app/organicmaps/sdk/util/Config.java
index fbdf46154..8396ed6f6 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/util/Config.java
+++ b/android/app/src/main/java/app/organicmaps/sdk/util/Config.java
@@ -7,7 +7,6 @@ import androidx.annotation.NonNull;
 import androidx.preference.PreferenceManager;
 import app.organicmaps.BuildConfig;
 import app.organicmaps.R;
-import app.organicmaps.util.ThemeUtils;
 
 public final class Config
 {
@@ -24,8 +23,6 @@ public final class Config
 
   private static final String KEY_MISC_DISCLAIMER_ACCEPTED = "IsDisclaimerApproved";
   private static final String KEY_MISC_LOCATION_REQUESTED = "LocationRequested";
-  private static final String KEY_MISC_UI_THEME = "UiTheme";
-  private static final String KEY_MISC_UI_THEME_SETTINGS = "UiThemeSettings";
   private static final String KEY_MISC_USE_MOBILE_DATA = "UseMobileData";
   private static final String KEY_MISC_USE_MOBILE_DATA_TIMESTAMP = "UseMobileDataTimestamp";
   private static final String KEY_MISC_USE_MOBILE_DATA_ROAMING = "UseMobileDataRoaming";
@@ -218,47 +215,77 @@ public final class Config
     setBool(KEY_MISC_LOCATION_REQUESTED);
   }
 
-  @NonNull
-  public static String getCurrentUiTheme(@NonNull Context context)
+  public static class UiTheme
   {
-    // This is the actual map theme, only set to theme_default/night
-    final String defaultTheme = context.getString(R.string.theme_default);
-    final String res = getString(KEY_MISC_UI_THEME, defaultTheme);
+    private static final String KEY_UI_THEME = "UiTheme";
+    private static final String KEY_UI_THEME_SETTINGS = "UiThemeSettings";
 
-    if (ThemeUtils.isValidTheme(context, res))
-      return res;
+    public static final String AUTO = "auto";
+    public static final String NIGHT = "night";
+    public static final String NAV_AUTO = "nav_auto";
+    public static final String DEFAULT = "default";
 
-    return defaultTheme;
-  }
+    public static boolean isAuto(@NonNull String theme)
+    {
+      return AUTO.equals(theme);
+    }
 
-  public static void setCurrentUiTheme(@NonNull Context context, @NonNull String theme)
-  {
-    if (getCurrentUiTheme(context).equals(theme))
-      return;
+    public static boolean isNavAuto(@NonNull String theme)
+    {
+      return NAV_AUTO.equals(theme);
+    }
 
-    setString(KEY_MISC_UI_THEME, theme);
-  }
+    public static boolean isNight(@NonNull String theme)
+    {
+      return NIGHT.equals(theme);
+    }
 
-  @NonNull
-  public static String getUiThemeSettings(@NonNull Context context)
-  {
-    // This is the default theme *mode*, eg. auto/dark/nav_auto/light.
-    final String defaultSetting = context.getString(R.string.theme_nav_auto);
-    final String res = getString(KEY_MISC_UI_THEME_SETTINGS, defaultSetting);
-    if (ThemeUtils.isValidTheme(context, res) || ThemeUtils.isAutoTheme(context, res)
-        || ThemeUtils.isNavAutoTheme(context, res))
-      return res;
+    public static boolean isDefault(@NonNull String theme)
+    {
+      return DEFAULT.equals(theme);
+    }
 
-    return defaultSetting;
-  }
+    @NonNull
+    public static String getCurrent()
+    {
+      final String res = getString(KEY_UI_THEME, DEFAULT);
+      if (isValid(res))
+        return res;
 
-  public static boolean setUiThemeSettings(@NonNull Context context, String theme)
-  {
-    if (getUiThemeSettings(context).equals(theme))
-      return false;
+      return DEFAULT;
+    }
 
-    setString(KEY_MISC_UI_THEME_SETTINGS, theme);
-    return true;
+    public static void setCurrent(@NonNull String theme)
+    {
+      if (getCurrent().equals(theme))
+        return;
+
+      setString(KEY_UI_THEME, theme);
+    }
+
+    @NonNull
+    public static String getUiThemeSettings()
+    {
+      final String res = getString(KEY_UI_THEME_SETTINGS, DEFAULT);
+      if (isValid(res) || isAuto(res) || isNavAuto(res))
+        return res;
+
+      return DEFAULT;
+    }
+
+    public static boolean setUiThemeSettings(String theme)
+    {
+      if (getUiThemeSettings().equals(theme))
+        return false;
+
+      setString(KEY_UI_THEME_SETTINGS, theme);
+      return true;
+    }
+
+    private static boolean isValid(@NonNull String theme)
+    {
+      return DEFAULT.equals(theme) || NIGHT.equals(theme);
+    }
   }
 
   public static boolean isLargeFontsSize()
diff --git a/android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java b/android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java
index fe509cacb..658d6d53d 100644
--- a/android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/search/CategoriesAdapter.java
@@ -89,7 +89,7 @@ class CategoriesAdapter extends RecyclerView.Adapter<CategoriesAdapter.ViewHolde
   @DrawableRes
   private static int getDrawableResIdByKey(@NonNull Context context, @NonNull String packageName, @NonNull String key)
   {
-    final boolean isNightTheme = ThemeUtils.isNightTheme(context);
+    final boolean isNightTheme = ThemeUtils.isNightTheme();
     String iconId = "ic_" + key;
     if (isNightTheme)
       iconId = iconId + "_night";
diff --git a/android/app/src/main/java/app/organicmaps/search/SearchActivity.java b/android/app/src/main/java/app/organicmaps/search/SearchActivity.java
index a6d48893c..320a7fd40 100644
--- a/android/app/src/main/java/app/organicmaps/search/SearchActivity.java
+++ b/android/app/src/main/java/app/organicmaps/search/SearchActivity.java
@@ -37,7 +37,7 @@ public class SearchActivity extends BaseMwmFragmentActivity
   @StyleRes
   public int getThemeResourceId(@NonNull String theme)
   {
-    return ThemeUtils.getCardBgThemeResourceId(getApplicationContext(), theme);
+    return ThemeUtils.getCardBgThemeResourceId(theme);
   }
 
   @Override
diff --git a/android/app/src/main/java/app/organicmaps/settings/BaseXmlSettingsFragment.java b/android/app/src/main/java/app/organicmaps/settings/BaseXmlSettingsFragment.java
index 0b8eec6bf..ddc63a6ea 100644
--- a/android/app/src/main/java/app/organicmaps/settings/BaseXmlSettingsFragment.java
+++ b/android/app/src/main/java/app/organicmaps/settings/BaseXmlSettingsFragment.java
@@ -47,7 +47,7 @@ abstract class BaseXmlSettingsFragment extends PreferenceFragmentCompat
     super.onViewCreated(view, savedInstanceState);
 
     int color;
-    if (ThemeUtils.isDefaultTheme(requireContext()))
+    if (ThemeUtils.isDefaultTheme())
       color = ContextCompat.getColor(requireContext(), R.color.bg_cards);
     else
       color = ContextCompat.getColor(requireContext(), R.color.bg_cards_night);
diff --git a/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java b/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
index aaf98b69e..d63401bea 100644
--- a/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
+++ b/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
@@ -3,13 +3,11 @@ package app.organicmaps.settings;
 import static app.organicmaps.leftbutton.LeftButtonsHolder.DISABLE_BUTTON_CODE;
 
 import android.annotation.SuppressLint;
-import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.view.View;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
 import androidx.preference.ListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
@@ -441,19 +439,19 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
   private void initMapStylePrefsCallbacks()
   {
     final ListPreference pref = getPreference(getString(R.string.pref_map_style));
-
-    String curTheme = Config.getUiThemeSettings(requireContext());
-    pref.setValue(curTheme);
+    pref.setEntryValues(new CharSequence[] {Config.UiTheme.DEFAULT, Config.UiTheme.NIGHT, Config.UiTheme.AUTO,
+                                            Config.UiTheme.NAV_AUTO});
+    pref.setValue(Config.UiTheme.getUiThemeSettings());
     pref.setSummary(pref.getEntry());
     pref.setOnPreferenceChangeListener((preference, newValue) -> {
       final String themeName = (String) newValue;
-      if (!Config.setUiThemeSettings(requireContext(), themeName))
+      if (!Config.UiTheme.setUiThemeSettings(themeName))
         return true;
 
       ThemeSwitcher.INSTANCE.restart(false);
 
-      ThemeMode mode = ThemeMode.getInstance(requireContext().getApplicationContext(), themeName);
-      CharSequence summary = pref.getEntries()[mode.ordinal()];
+      final ThemeMode mode = ThemeMode.getInstance(themeName);
+      final CharSequence summary = pref.getEntries()[mode.ordinal()];
       pref.setSummary(summary);
       return true;
     });
@@ -552,24 +550,25 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
 
   enum ThemeMode
   {
-    DEFAULT(R.string.theme_default),
-    NIGHT(R.string.theme_night),
-    AUTO(R.string.theme_auto),
-    NAV_AUTO(R.string.theme_nav_auto);
+    DEFAULT(Config.UiTheme.DEFAULT),
+    NIGHT(Config.UiTheme.NIGHT),
+    AUTO(Config.UiTheme.AUTO),
+    NAV_AUTO(Config.UiTheme.NAV_AUTO);
 
-    private final int mModeStringId;
+    @NonNull
+    private final String mMode;
 
-    ThemeMode(@StringRes int modeStringId)
+    ThemeMode(@NonNull String mode)
     {
-      mModeStringId = modeStringId;
+      mMode = mode;
     }
 
     @NonNull
-    public static ThemeMode getInstance(@NonNull Context context, @NonNull String src)
+    public static ThemeMode getInstance(@NonNull String src)
     {
       for (ThemeMode each : values())
       {
-        if (context.getResources().getString(each.mModeStringId).equals(src))
+        if (each.mMode.equals(src))
           return each;
       }
       return AUTO;
diff --git a/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java b/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java
index 14a40d9da..c82c0d5ed 100644
--- a/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java
+++ b/android/app/src/main/java/app/organicmaps/util/ThemeSwitcher.java
@@ -8,7 +8,6 @@ import android.os.Build;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatDelegate;
 import app.organicmaps.MwmApplication;
-import app.organicmaps.R;
 import app.organicmaps.downloader.DownloaderStatusIcon;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.MapStyle;
@@ -28,17 +27,23 @@ public enum ThemeSwitcher
     @Override
     public void run()
     {
-      boolean isNavAuto = RoutingController.get().isNavigating() && ThemeUtils.isNavAutoTheme(mContext);
+      boolean navAuto = RoutingController.get().isNavigating() && ThemeUtils.isNavAutoTheme();
       // Cancel old checker
       UiThread.cancelDelayedTasks(mAutoThemeChecker);
 
-      if (isNavAuto || ThemeUtils.isAutoTheme(mContext))
+      String theme;
+      if (navAuto || ThemeUtils.isAutoTheme())
       {
         UiThread.runLater(mAutoThemeChecker, CHECK_INTERVAL_MS);
-        setThemeAndMapStyle(calcAutoTheme());
+        theme = calcAutoTheme();
       }
-      else // Only reached when an auto mode should be light
-        setThemeAndMapStyle(mContext.getResources().getString(R.string.theme_default));
+      else
+      {
+        // Happens when exiting the Navigation mode. Should restore the light.
+        theme = Config.UiTheme.DEFAULT;
+      }
+
+      setThemeAndMapStyle(theme);
     }
   };
 
@@ -64,8 +69,8 @@ public enum ThemeSwitcher
   public void restart(boolean isRendererActive)
   {
     mRendererActive = isRendererActive;
-    String theme = Config.getUiThemeSettings(mContext);
-    if (ThemeUtils.isAutoTheme(mContext, theme) || ThemeUtils.isNavAutoTheme(mContext, theme))
+    String theme = Config.UiTheme.getUiThemeSettings();
+    if (ThemeUtils.isAutoTheme() || ThemeUtils.isNavAutoTheme())
     {
       mAutoThemeChecker.run();
       return;
@@ -78,10 +83,10 @@ public enum ThemeSwitcher
   private void setThemeAndMapStyle(@NonNull String theme)
   {
     UiModeManager uiModeManager = (UiModeManager) mContext.getSystemService(Context.UI_MODE_SERVICE);
-    String oldTheme = Config.getCurrentUiTheme(mContext);
+    String oldTheme = Config.UiTheme.getCurrent();
 
     MapStyle style;
-    if (ThemeUtils.isNightTheme(mContext, theme))
+    if (ThemeUtils.isNightTheme())
     {
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S)
         uiModeManager.setApplicationNightMode(UiModeManager.MODE_NIGHT_YES);
@@ -112,7 +117,7 @@ public enum ThemeSwitcher
 
     if (!theme.equals(oldTheme))
     {
-      Config.setCurrentUiTheme(mContext, theme);
+      Config.UiTheme.setCurrent(theme);
       DownloaderStatusIcon.clearCache();
 
       final Activity a = MwmApplication.from(mContext).getTopActivity();
@@ -152,9 +157,7 @@ public enum ThemeSwitcher
   @NonNull
   private String calcAutoTheme()
   {
-    String defaultTheme = mContext.getResources().getString(R.string.theme_default);
-    String nightTheme = mContext.getResources().getString(R.string.theme_night);
-    Location last = MwmApplication.from(mContext).getLocationHelper().getSavedLocation();
+    final Location last = MwmApplication.from(mContext).getLocationHelper().getSavedLocation();
     boolean day;
 
     if (last != null)
@@ -168,6 +171,6 @@ public enum ThemeSwitcher
       day = (currentHour < 18 && currentHour > 6);
     }
 
-    return (day ? defaultTheme : nightTheme);
+    return (day ? Config.UiTheme.DEFAULT : Config.UiTheme.NIGHT);
   }
 }
diff --git a/android/app/src/main/java/app/organicmaps/util/ThemeUtils.java b/android/app/src/main/java/app/organicmaps/util/ThemeUtils.java
index bd866ca0c..8f44e5654 100644
--- a/android/app/src/main/java/app/organicmaps/util/ThemeUtils.java
+++ b/android/app/src/main/java/app/organicmaps/util/ThemeUtils.java
@@ -16,7 +16,8 @@ public final class ThemeUtils
 
   private ThemeUtils() {}
 
-  public static @ColorInt int getColor(@NonNull Context context, @AttrRes int attr)
+  @ColorInt
+  public static int getColor(@NonNull Context context, @AttrRes int attr)
   {
     if (!context.getTheme().resolveAttribute(attr, VALUE_BUFFER, true))
       throw new IllegalArgumentException("Failed to resolve color theme attribute");
@@ -44,76 +45,45 @@ public final class ThemeUtils
     return VALUE_BUFFER.resourceId;
   }
 
-  public static boolean isDefaultTheme(@NonNull Context context)
+  public static boolean isDefaultTheme()
   {
-    return isDefaultTheme(context, Config.getCurrentUiTheme(context));
+    return Config.UiTheme.isDefault(Config.UiTheme.getCurrent());
   }
 
-  public static boolean isDefaultTheme(@NonNull Context context, String theme)
+  public static boolean isNightTheme()
   {
-    String defaultTheme = context.getString(R.string.theme_default);
-    return defaultTheme.equals(theme);
+    return Config.UiTheme.isNight(Config.UiTheme.getCurrent());
   }
 
-  public static boolean isNightTheme(@NonNull Context context)
+  public static boolean isAutoTheme()
   {
-    return isNightTheme(context, Config.getCurrentUiTheme(context));
+    return Config.UiTheme.isAuto(Config.UiTheme.getUiThemeSettings());
   }
 
-  public static boolean isNightTheme(@NonNull Context context, String theme)
+  public static boolean isNavAutoTheme()
   {
-    String nightTheme = context.getString(R.string.theme_night);
-    return nightTheme.equals(theme);
-  }
-
-  public static boolean isAutoTheme(@NonNull Context context)
-  {
-    return isAutoTheme(context, Config.getUiThemeSettings(context));
-  }
-
-  public static boolean isAutoTheme(@NonNull Context context, String theme)
-  {
-    String autoTheme = context.getString(R.string.theme_auto);
-    return autoTheme.equals(theme);
-  }
-
-  public static boolean isNavAutoTheme(@NonNull Context context)
-  {
-    return isNavAutoTheme(context, Config.getUiThemeSettings(context));
-  }
-
-  public static boolean isNavAutoTheme(@NonNull Context context, String theme)
-  {
-    String navAutoTheme = context.getString(R.string.theme_nav_auto);
-    return navAutoTheme.equals(theme);
-  }
-
-  public static boolean isValidTheme(@NonNull Context context, String theme)
-  {
-    String defaultTheme = context.getString(R.string.theme_default);
-    String nightTheme = context.getString(R.string.theme_night);
-    return (defaultTheme.equals(theme) || nightTheme.equals(theme));
+    return Config.UiTheme.isNavAuto(Config.UiTheme.getUiThemeSettings());
   }
 
   @StyleRes
-  public static int getCardBgThemeResourceId(@NonNull Context context, @NonNull String theme)
+  public static int getCardBgThemeResourceId(@NonNull String theme)
   {
-    if (isDefaultTheme(context, theme))
+    if (Config.UiTheme.isDefault(theme))
       return R.style.MwmTheme_CardBg;
 
-    if (isNightTheme(context, theme))
+    if (Config.UiTheme.isNight(theme))
       return R.style.MwmTheme_Night_CardBg;
 
     throw new IllegalArgumentException("Attempt to apply unsupported theme: " + theme);
   }
 
   @StyleRes
-  public static int getWindowBgThemeResourceId(@NonNull Context context, @NonNull String theme)
+  public static int getWindowBgThemeResourceId(@NonNull String theme)
   {
-    if (isDefaultTheme(context, theme))
+    if (Config.UiTheme.isDefault(theme))
       return R.style.MwmTheme_WindowBg;
 
-    if (isNightTheme(context, theme))
+    if (Config.UiTheme.isNight(theme))
       return R.style.MwmTheme_Night_WindowBg;
 
     throw new IllegalArgumentException("Attempt to apply unsupported theme: " + theme);
diff --git a/android/app/src/main/java/app/organicmaps/widget/RoutingToolbarButton.java b/android/app/src/main/java/app/organicmaps/widget/RoutingToolbarButton.java
index c98423a74..e51e84105 100644
--- a/android/app/src/main/java/app/organicmaps/widget/RoutingToolbarButton.java
+++ b/android/app/src/main/java/app/organicmaps/widget/RoutingToolbarButton.java
@@ -35,10 +35,9 @@ public class RoutingToolbarButton extends AppCompatRadioButton
 
   private void initView()
   {
-    setBackgroundResource(ThemeUtils.isNightTheme(getContext()) ? R.drawable.routing_toolbar_button_night
-                                                                : R.drawable.routing_toolbar_button);
-    setButtonTintList(ThemeUtils.isNightTheme(getContext()) ? R.color.routing_toolbar_icon_tint_night
-                                                            : R.color.routing_toolbar_icon_tint);
+    final boolean isNightTheme = ThemeUtils.isNightTheme();
+    setBackgroundResource(isNightTheme ? R.drawable.routing_toolbar_button_night : R.drawable.routing_toolbar_button);
+    setButtonTintList(isNightTheme ? R.color.routing_toolbar_icon_tint_night : R.color.routing_toolbar_icon_tint);
   }
 
   public void progress()
diff --git a/android/app/src/main/res/values/donottranslate.xml b/android/app/src/main/res/values/donottranslate.xml
index bf33acb4a..b6c52881a 100644
--- a/android/app/src/main/res/values/donottranslate.xml
+++ b/android/app/src/main/res/values/donottranslate.xml
@@ -48,12 +48,6 @@
   <!-- "Report a problem" predefined texts -->
   <string name="problem_does_not_exist" translatable="false">The amenity has gone or never existed. This is an auto-generated note from CoMaps application: a user reports a POI that is visible on a map (which can be a month old), but cannot be found on the ground.</string>
 
-  <!-- UI themes -->
-  <string name="theme_default" translatable="false">default</string>
-  <string name="theme_night" translatable="false">night</string>
-  <string name="theme_auto" translatable="false">auto</string>
-  <string name="theme_nav_auto" translatable="false">nav-auto</string>
-
   <!-- Tags -->
   <string name="tag_menu_collapse" translatable="false">collapse</string>
   <string name="tag_height_limited" translatable="false">height limited</string>
diff --git a/android/app/src/main/res/values/string-arrays.xml b/android/app/src/main/res/values/string-arrays.xml
index c8678622b..9af6c10d3 100644
--- a/android/app/src/main/res/values/string-arrays.xml
+++ b/android/app/src/main/res/values/string-arrays.xml
@@ -53,14 +53,6 @@
     <item>@string/nav_auto</item>
   </string-array>
 
-  <string-array name="map_style_values"
-                translatable="false">
-    <item>@string/theme_default</item>
-    <item>@string/theme_night</item>
-    <item>@string/theme_auto</item>
-    <item>@string/theme_nav_auto</item>
-  </string-array>
-
   <string-array name="speed_cameras">
     <item>@string/pref_tts_speedcams_auto</item>
     <item>@string/pref_tts_speedcams_always</item>
diff --git a/android/app/src/main/res/xml/prefs_main.xml b/android/app/src/main/res/xml/prefs_main.xml
index 81d1e9a79..32964f38b 100644
--- a/android/app/src/main/res/xml/prefs_main.xml
+++ b/android/app/src/main/res/xml/prefs_main.xml
@@ -130,7 +130,6 @@
       android:title="@string/pref_map_style_title"
       app:singleLineTitle="false"
       android:entries="@array/map_style"
-      android:entryValues="@array/map_style_values"
       android:order="1"/>
     <SwitchPreferenceCompat
       android:key="@string/pref_3d"

From 6a85526ac99b5db160eff26c6e4e1a4398e16c9d Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Fri, 15 Aug 2025 12:59:03 +0200
Subject: [PATCH 213/302] [android][sdk] Move java files into sdk module

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 .../src/main/java/app/organicmaps/sdk/ChoosePositionMode.java     | 0
 .../java/app/organicmaps/sdk/DownloadResourcesLegacyActivity.java | 0
 .../{app => sdk}/src/main/java/app/organicmaps/sdk/Framework.java | 0
 android/{app => sdk}/src/main/java/app/organicmaps/sdk/Map.java   | 0
 .../src/main/java/app/organicmaps/sdk/MapRenderingListener.java   | 0
 .../{app => sdk}/src/main/java/app/organicmaps/sdk/MapStyle.java  | 0
 .../src/main/java/app/organicmaps/sdk/OrganicMaps.java            | 0
 .../java/app/organicmaps/sdk/PlacePageActivationListener.java     | 0
 .../{app => sdk}/src/main/java/app/organicmaps/sdk/Router.java    | 0
 .../src/main/java/app/organicmaps/sdk/api/ParsedRoutingData.java  | 0
 .../main/java/app/organicmaps/sdk/api/ParsedSearchRequest.java    | 0
 .../src/main/java/app/organicmaps/sdk/api/RequestType.java        | 0
 .../src/main/java/app/organicmaps/sdk/api/RoutePoint.java         | 0
 .../main/java/app/organicmaps/sdk/bookmarks/data/Bookmark.java    | 0
 .../sdk/bookmarks/data/BookmarkCategoriesDataProvider.java        | 0
 .../java/app/organicmaps/sdk/bookmarks/data/BookmarkCategory.java | 0
 .../java/app/organicmaps/sdk/bookmarks/data/BookmarkInfo.java     | 0
 .../java/app/organicmaps/sdk/bookmarks/data/BookmarkManager.java  | 0
 .../app/organicmaps/sdk/bookmarks/data/BookmarkSharingResult.java | 0
 .../sdk/bookmarks/data/CacheBookmarkCategoriesDataProvider.java   | 0
 .../app/organicmaps/sdk/bookmarks/data/CategoryDataSource.java    | 0
 .../sdk/bookmarks/data/CoreBookmarkCategoriesDataProvider.java    | 0
 .../app/organicmaps/sdk/bookmarks/data/DataChangedListener.java   | 0
 .../app/organicmaps/sdk/bookmarks/data/DistanceAndAzimut.java     | 0
 .../java/app/organicmaps/sdk/bookmarks/data/ElevationInfo.java    | 0
 .../src/main/java/app/organicmaps/sdk/bookmarks/data/Error.java   | 0
 .../main/java/app/organicmaps/sdk/bookmarks/data/FeatureId.java   | 0
 .../src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java    | 0
 .../app/organicmaps/sdk/bookmarks/data/IconClickListener.java     | 0
 .../main/java/app/organicmaps/sdk/bookmarks/data/KmlFileType.java | 0
 .../main/java/app/organicmaps/sdk/bookmarks/data/MapObject.java   | 0
 .../main/java/app/organicmaps/sdk/bookmarks/data/Metadata.java    | 0
 .../java/app/organicmaps/sdk/bookmarks/data/ParcelablePointD.java | 0
 .../java/app/organicmaps/sdk/bookmarks/data/PredefinedColors.java | 0
 .../src/main/java/app/organicmaps/sdk/bookmarks/data/Result.java  | 0
 .../app/organicmaps/sdk/bookmarks/data/RoadWarningMarkType.java   | 0
 .../main/java/app/organicmaps/sdk/bookmarks/data/SortedBlock.java | 0
 .../src/main/java/app/organicmaps/sdk/bookmarks/data/Track.java   | 0
 .../java/app/organicmaps/sdk/bookmarks/data/TrackStatistics.java  | 0
 .../src/main/java/app/organicmaps/sdk/content/DataSource.java     | 0
 .../java/app/organicmaps/sdk/display/DisplayChangedListener.java  | 0
 .../src/main/java/app/organicmaps/sdk/display/DisplayManager.java | 0
 .../src/main/java/app/organicmaps/sdk/display/DisplayType.java    | 0
 .../sdk/downloader/Android7RootCertificateWorkaround.java         | 0
 .../src/main/java/app/organicmaps/sdk/downloader/ChunkTask.java   | 0
 .../src/main/java/app/organicmaps/sdk/downloader/CountryItem.java | 0
 .../sdk/downloader/ExpandRetryConfirmationListener.java           | 0
 .../src/main/java/app/organicmaps/sdk/downloader/UpdateInfo.java  | 0
 .../src/main/java/app/organicmaps/sdk/editor/Editor.java          | 0
 .../src/main/java/app/organicmaps/sdk/editor/OpeningHours.java    | 0
 .../src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java        | 0
 .../java/app/organicmaps/sdk/editor/data/FeatureCategory.java     | 0
 .../main/java/app/organicmaps/sdk/editor/data/HoursMinutes.java   | 0
 .../src/main/java/app/organicmaps/sdk/editor/data/Language.java   | 0
 .../main/java/app/organicmaps/sdk/editor/data/LocalizedName.java  | 0
 .../java/app/organicmaps/sdk/editor/data/LocalizedStreet.java     | 0
 .../java/app/organicmaps/sdk/editor/data/NamesDataSource.java     | 0
 .../src/main/java/app/organicmaps/sdk/editor/data/Timespan.java   | 0
 .../src/main/java/app/organicmaps/sdk/editor/data/Timetable.java  | 0
 .../java/app/organicmaps/sdk/location/AndroidNativeProvider.java  | 0
 .../java/app/organicmaps/sdk/location/BaseLocationProvider.java   | 0
 .../main/java/app/organicmaps/sdk/location/LocationHelper.java    | 0
 .../main/java/app/organicmaps/sdk/location/LocationListener.java  | 0
 .../src/main/java/app/organicmaps/sdk/location/LocationState.java | 0
 .../main/java/app/organicmaps/sdk/location/PlatformSocket.java    | 0
 .../app/organicmaps/sdk/location/RouteSimulationProvider.java     | 0
 .../src/main/java/app/organicmaps/sdk/location/SensorHelper.java  | 0
 .../main/java/app/organicmaps/sdk/location/SensorListener.java    | 0
 .../src/main/java/app/organicmaps/sdk/location/TrackRecorder.java | 0
 .../src/main/java/app/organicmaps/sdk/maplayer/Mode.java          | 0
 .../sdk/maplayer/isolines/IsolinesErrorDialogListener.java        | 0
 .../app/organicmaps/sdk/maplayer/isolines/IsolinesManager.java    | 0
 .../java/app/organicmaps/sdk/maplayer/isolines/IsolinesState.java | 0
 .../sdk/maplayer/isolines/OnIsolinesChangedListener.java          | 0
 .../sdk/maplayer/subway/OnTransitSchemeChangedListener.java       | 0
 .../java/app/organicmaps/sdk/maplayer/subway/SubwayManager.java   | 0
 .../app/organicmaps/sdk/maplayer/subway/TransitSchemeState.java   | 0
 .../java/app/organicmaps/sdk/maplayer/traffic/TrafficManager.java | 0
 .../java/app/organicmaps/sdk/maplayer/traffic/TrafficState.java   | 0
 .../src/main/java/app/organicmaps/sdk/routing/CarDirection.java   | 0
 .../src/main/java/app/organicmaps/sdk/routing/JunctionInfo.java   | 0
 .../src/main/java/app/organicmaps/sdk/routing/LaneWay.java        | 0
 .../java/app/organicmaps/sdk/routing/PedestrianTurnDirection.java | 0
 .../src/main/java/app/organicmaps/sdk/routing/ResultCodes.java    | 0
 .../src/main/java/app/organicmaps/sdk/routing/RouteMarkData.java  | 0
 .../src/main/java/app/organicmaps/sdk/routing/RouteMarkType.java  | 0
 .../src/main/java/app/organicmaps/sdk/routing/RoutePointInfo.java | 0
 .../java/app/organicmaps/sdk/routing/RouteRecommendationType.java | 0
 .../main/java/app/organicmaps/sdk/routing/RoutingController.java  | 0
 .../src/main/java/app/organicmaps/sdk/routing/RoutingInfo.java    | 0
 .../main/java/app/organicmaps/sdk/routing/RoutingListener.java    | 0
 .../app/organicmaps/sdk/routing/RoutingLoadPointsListener.java    | 0
 .../src/main/java/app/organicmaps/sdk/routing/RoutingOptions.java | 0
 .../java/app/organicmaps/sdk/routing/RoutingProgressListener.java | 0
 .../organicmaps/sdk/routing/RoutingRecommendationListener.java    | 0
 .../src/main/java/app/organicmaps/sdk/routing/SingleLaneInfo.java | 0
 .../main/java/app/organicmaps/sdk/routing/TransitRouteInfo.java   | 0
 .../main/java/app/organicmaps/sdk/routing/TransitStepInfo.java    | 0
 .../main/java/app/organicmaps/sdk/routing/TransitStepType.java    | 0
 .../java/app/organicmaps/sdk/search/BookmarkSearchListener.java   | 0
 .../main/java/app/organicmaps/sdk/search/DisplayedCategories.java | 0
 .../main/java/app/organicmaps/sdk/search/MapSearchListener.java   | 0
 .../src/main/java/app/organicmaps/sdk/search/Popularity.java      | 0
 .../src/main/java/app/organicmaps/sdk/search/SearchEngine.java    | 0
 .../src/main/java/app/organicmaps/sdk/search/SearchListener.java  | 0
 .../src/main/java/app/organicmaps/sdk/search/SearchRecents.java   | 0
 .../src/main/java/app/organicmaps/sdk/search/SearchResult.java    | 0
 .../main/java/app/organicmaps/sdk/settings/MapLanguageCode.java   | 0
 .../src/main/java/app/organicmaps/sdk/settings/RoadType.java      | 0
 .../main/java/app/organicmaps/sdk/settings/SpeedCameraMode.java   | 0
 .../src/main/java/app/organicmaps/sdk/settings/StorageItem.java   | 0
 .../java/app/organicmaps/sdk/settings/StoragePathManager.java     | 0
 .../src/main/java/app/organicmaps/sdk/settings/UnitLocale.java    | 0
 .../main/java/app/organicmaps/sdk/sound/AudioFocusManager.java    | 0
 .../src/main/java/app/organicmaps/sdk/sound/LanguageData.java     | 0
 .../main/java/app/organicmaps/sdk/sound/MediaPlayerWrapper.java   | 0
 .../src/main/java/app/organicmaps/sdk/sound/TtsPlayer.java        | 0
 .../src/main/java/app/organicmaps/sdk/util/BatteryState.java      | 0
 .../java/app/organicmaps/sdk/util/ClientCertTLSSocketFactory.java | 0
 .../src/main/java/app/organicmaps/sdk/util/Config.java            | 0
 .../src/main/java/app/organicmaps/sdk/util/ConnectionState.java   | 0
 .../src/main/java/app/organicmaps/sdk/util/Constants.java         | 0
 .../src/main/java/app/organicmaps/sdk/util/DateUtils.java         | 0
 .../src/main/java/app/organicmaps/sdk/util/Distance.java          | 0
 .../src/main/java/app/organicmaps/sdk/util/GeoUtils.java          | 0
 .../src/main/java/app/organicmaps/sdk/util/HttpClient.java        | 0
 .../src/main/java/app/organicmaps/sdk/util/KeyValue.java          | 0
 .../src/main/java/app/organicmaps/sdk/util/Language.java          | 0
 .../src/main/java/app/organicmaps/sdk/util/LocationUtils.java     | 0
 .../src/main/java/app/organicmaps/sdk/util/NetworkPolicy.java     | 0
 .../src/main/java/app/organicmaps/sdk/util/PowerManagment.java    | 0
 .../src/main/java/app/organicmaps/sdk/util/ROMUtils.java          | 0
 .../src/main/java/app/organicmaps/sdk/util/SecureStorage.java     | 0
 .../main/java/app/organicmaps/sdk/util/SharedPropertiesUtils.java | 0
 .../src/main/java/app/organicmaps/sdk/util/StorageUtils.java      | 0
 .../src/main/java/app/organicmaps/sdk/util/StringUtils.java       | 0
 .../src/main/java/app/organicmaps/sdk/util/Utils.java             | 0
 .../java/app/organicmaps/sdk/util/concurrency/ThreadPool.java     | 0
 .../main/java/app/organicmaps/sdk/util/concurrency/UiThread.java  | 0
 .../src/main/java/app/organicmaps/sdk/util/log/Logger.java        | 0
 .../src/main/java/app/organicmaps/sdk/util/log/LogsManager.java   | 0
 .../src/main/java/app/organicmaps/sdk/util/log/ZipLogsTask.java   | 0
 .../app/organicmaps/sdk/widget/placepage/CoordinatesFormat.java   | 0
 .../organicmaps/sdk/widget/placepage/PlacePageButtonFactory.java  | 0
 .../java/app/organicmaps/sdk/widget/placepage/PlacePageData.java  | 0
 .../src/main/java/org/chromium/base/ObserverList.java             | 0
 .../src/test/java/org/chromium/base/ObserverListTest.java         | 0
 147 files changed, 0 insertions(+), 0 deletions(-)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/ChoosePositionMode.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/DownloadResourcesLegacyActivity.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/Framework.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/Map.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/MapRenderingListener.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/MapStyle.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/OrganicMaps.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/PlacePageActivationListener.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/Router.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/api/ParsedRoutingData.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/api/ParsedSearchRequest.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/api/RequestType.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/api/RoutePoint.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/bookmarks/data/Bookmark.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategoriesDataProvider.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategory.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkInfo.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkManager.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkSharingResult.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/bookmarks/data/CacheBookmarkCategoriesDataProvider.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/bookmarks/data/CategoryDataSource.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/bookmarks/data/CoreBookmarkCategoriesDataProvider.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/bookmarks/data/DataChangedListener.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/bookmarks/data/DistanceAndAzimut.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/bookmarks/data/ElevationInfo.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/bookmarks/data/Error.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/bookmarks/data/FeatureId.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/bookmarks/data/IconClickListener.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/bookmarks/data/KmlFileType.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/bookmarks/data/MapObject.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/bookmarks/data/Metadata.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/bookmarks/data/ParcelablePointD.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/bookmarks/data/PredefinedColors.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/bookmarks/data/Result.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/bookmarks/data/RoadWarningMarkType.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/bookmarks/data/SortedBlock.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/bookmarks/data/Track.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/bookmarks/data/TrackStatistics.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/content/DataSource.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/display/DisplayChangedListener.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/display/DisplayManager.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/display/DisplayType.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/downloader/Android7RootCertificateWorkaround.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/downloader/ChunkTask.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/downloader/CountryItem.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/downloader/ExpandRetryConfirmationListener.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/downloader/UpdateInfo.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/editor/Editor.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/editor/data/FeatureCategory.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/editor/data/HoursMinutes.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/editor/data/Language.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/editor/data/LocalizedName.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/editor/data/LocalizedStreet.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/editor/data/NamesDataSource.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/editor/data/Timespan.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/editor/data/Timetable.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/location/AndroidNativeProvider.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/location/BaseLocationProvider.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/location/LocationHelper.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/location/LocationListener.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/location/LocationState.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/location/PlatformSocket.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/location/RouteSimulationProvider.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/location/SensorHelper.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/location/SensorListener.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/location/TrackRecorder.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/maplayer/Mode.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesErrorDialogListener.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesManager.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesState.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/maplayer/isolines/OnIsolinesChangedListener.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/maplayer/subway/OnTransitSchemeChangedListener.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/maplayer/subway/SubwayManager.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/maplayer/subway/TransitSchemeState.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/maplayer/traffic/TrafficManager.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/maplayer/traffic/TrafficState.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/routing/CarDirection.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/routing/JunctionInfo.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/routing/LaneWay.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/routing/PedestrianTurnDirection.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/routing/ResultCodes.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/routing/RouteMarkData.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/routing/RouteMarkType.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/routing/RoutePointInfo.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/routing/RouteRecommendationType.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/routing/RoutingController.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/routing/RoutingInfo.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/routing/RoutingListener.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/routing/RoutingLoadPointsListener.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/routing/RoutingOptions.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/routing/RoutingProgressListener.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/routing/RoutingRecommendationListener.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/routing/SingleLaneInfo.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/routing/TransitRouteInfo.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/routing/TransitStepInfo.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/routing/TransitStepType.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/search/BookmarkSearchListener.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/search/DisplayedCategories.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/search/MapSearchListener.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/search/Popularity.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/search/SearchEngine.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/search/SearchListener.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/search/SearchRecents.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/search/SearchResult.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/settings/MapLanguageCode.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/settings/RoadType.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/settings/SpeedCameraMode.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/settings/StorageItem.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/settings/StoragePathManager.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/settings/UnitLocale.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/sound/AudioFocusManager.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/sound/LanguageData.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/sound/MediaPlayerWrapper.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/sound/TtsPlayer.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/util/BatteryState.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/util/ClientCertTLSSocketFactory.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/util/Config.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/util/ConnectionState.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/util/Constants.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/util/DateUtils.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/util/Distance.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/util/GeoUtils.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/util/HttpClient.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/util/KeyValue.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/util/Language.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/util/LocationUtils.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/util/NetworkPolicy.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/util/PowerManagment.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/util/ROMUtils.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/util/SecureStorage.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/util/SharedPropertiesUtils.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/util/StorageUtils.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/util/StringUtils.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/util/Utils.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/util/concurrency/ThreadPool.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/util/concurrency/UiThread.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/util/log/Logger.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/util/log/ZipLogsTask.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/widget/placepage/CoordinatesFormat.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/widget/placepage/PlacePageButtonFactory.java (100%)
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/widget/placepage/PlacePageData.java (100%)
 rename android/{app => sdk}/src/main/java/org/chromium/base/ObserverList.java (100%)
 rename android/{app => sdk}/src/test/java/org/chromium/base/ObserverListTest.java (100%)

diff --git a/android/app/src/main/java/app/organicmaps/sdk/ChoosePositionMode.java b/android/sdk/src/main/java/app/organicmaps/sdk/ChoosePositionMode.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/ChoosePositionMode.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/ChoosePositionMode.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/DownloadResourcesLegacyActivity.java b/android/sdk/src/main/java/app/organicmaps/sdk/DownloadResourcesLegacyActivity.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/DownloadResourcesLegacyActivity.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/DownloadResourcesLegacyActivity.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/Framework.java b/android/sdk/src/main/java/app/organicmaps/sdk/Framework.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/Framework.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/Framework.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/Map.java b/android/sdk/src/main/java/app/organicmaps/sdk/Map.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/Map.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/Map.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/MapRenderingListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/MapRenderingListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/MapRenderingListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/MapRenderingListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/MapStyle.java b/android/sdk/src/main/java/app/organicmaps/sdk/MapStyle.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/MapStyle.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/MapStyle.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java b/android/sdk/src/main/java/app/organicmaps/sdk/OrganicMaps.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/OrganicMaps.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/OrganicMaps.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/PlacePageActivationListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/PlacePageActivationListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/PlacePageActivationListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/PlacePageActivationListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/Router.java b/android/sdk/src/main/java/app/organicmaps/sdk/Router.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/Router.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/Router.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/api/ParsedRoutingData.java b/android/sdk/src/main/java/app/organicmaps/sdk/api/ParsedRoutingData.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/api/ParsedRoutingData.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/api/ParsedRoutingData.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/api/ParsedSearchRequest.java b/android/sdk/src/main/java/app/organicmaps/sdk/api/ParsedSearchRequest.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/api/ParsedSearchRequest.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/api/ParsedSearchRequest.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/api/RequestType.java b/android/sdk/src/main/java/app/organicmaps/sdk/api/RequestType.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/api/RequestType.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/api/RequestType.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/api/RoutePoint.java b/android/sdk/src/main/java/app/organicmaps/sdk/api/RoutePoint.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/api/RoutePoint.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/api/RoutePoint.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Bookmark.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Bookmark.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Bookmark.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Bookmark.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategoriesDataProvider.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategoriesDataProvider.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategoriesDataProvider.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategoriesDataProvider.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategory.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategory.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategory.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategory.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkInfo.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkInfo.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkInfo.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkInfo.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkManager.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkManager.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkManager.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkManager.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkSharingResult.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkSharingResult.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkSharingResult.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkSharingResult.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/CacheBookmarkCategoriesDataProvider.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/CacheBookmarkCategoriesDataProvider.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/CacheBookmarkCategoriesDataProvider.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/CacheBookmarkCategoriesDataProvider.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/CategoryDataSource.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/CategoryDataSource.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/CategoryDataSource.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/CategoryDataSource.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/CoreBookmarkCategoriesDataProvider.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/CoreBookmarkCategoriesDataProvider.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/CoreBookmarkCategoriesDataProvider.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/CoreBookmarkCategoriesDataProvider.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/DataChangedListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/DataChangedListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/DataChangedListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/DataChangedListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/DistanceAndAzimut.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/DistanceAndAzimut.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/DistanceAndAzimut.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/DistanceAndAzimut.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/ElevationInfo.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/ElevationInfo.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/ElevationInfo.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/ElevationInfo.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Error.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Error.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Error.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Error.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/FeatureId.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/FeatureId.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/FeatureId.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/FeatureId.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/IconClickListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/IconClickListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/IconClickListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/IconClickListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/KmlFileType.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/KmlFileType.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/KmlFileType.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/KmlFileType.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/MapObject.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/MapObject.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/MapObject.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/MapObject.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Metadata.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Metadata.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Metadata.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Metadata.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/ParcelablePointD.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/ParcelablePointD.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/ParcelablePointD.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/ParcelablePointD.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/PredefinedColors.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/PredefinedColors.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/PredefinedColors.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/PredefinedColors.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Result.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Result.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Result.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Result.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/RoadWarningMarkType.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/RoadWarningMarkType.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/RoadWarningMarkType.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/RoadWarningMarkType.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/SortedBlock.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/SortedBlock.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/SortedBlock.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/SortedBlock.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Track.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Track.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/Track.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Track.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/TrackStatistics.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/TrackStatistics.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/bookmarks/data/TrackStatistics.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/TrackStatistics.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/content/DataSource.java b/android/sdk/src/main/java/app/organicmaps/sdk/content/DataSource.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/content/DataSource.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/content/DataSource.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/display/DisplayChangedListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/display/DisplayChangedListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/display/DisplayChangedListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/display/DisplayChangedListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/display/DisplayManager.java b/android/sdk/src/main/java/app/organicmaps/sdk/display/DisplayManager.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/display/DisplayManager.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/display/DisplayManager.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/display/DisplayType.java b/android/sdk/src/main/java/app/organicmaps/sdk/display/DisplayType.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/display/DisplayType.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/display/DisplayType.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/downloader/Android7RootCertificateWorkaround.java b/android/sdk/src/main/java/app/organicmaps/sdk/downloader/Android7RootCertificateWorkaround.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/downloader/Android7RootCertificateWorkaround.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/downloader/Android7RootCertificateWorkaround.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/downloader/ChunkTask.java b/android/sdk/src/main/java/app/organicmaps/sdk/downloader/ChunkTask.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/downloader/ChunkTask.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/downloader/ChunkTask.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/downloader/CountryItem.java b/android/sdk/src/main/java/app/organicmaps/sdk/downloader/CountryItem.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/downloader/CountryItem.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/downloader/CountryItem.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/downloader/ExpandRetryConfirmationListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/downloader/ExpandRetryConfirmationListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/downloader/ExpandRetryConfirmationListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/downloader/ExpandRetryConfirmationListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/downloader/UpdateInfo.java b/android/sdk/src/main/java/app/organicmaps/sdk/downloader/UpdateInfo.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/downloader/UpdateInfo.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/downloader/UpdateInfo.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/editor/Editor.java b/android/sdk/src/main/java/app/organicmaps/sdk/editor/Editor.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/editor/Editor.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/editor/Editor.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java b/android/sdk/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java b/android/sdk/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/editor/data/FeatureCategory.java b/android/sdk/src/main/java/app/organicmaps/sdk/editor/data/FeatureCategory.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/editor/data/FeatureCategory.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/editor/data/FeatureCategory.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/editor/data/HoursMinutes.java b/android/sdk/src/main/java/app/organicmaps/sdk/editor/data/HoursMinutes.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/editor/data/HoursMinutes.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/editor/data/HoursMinutes.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/editor/data/Language.java b/android/sdk/src/main/java/app/organicmaps/sdk/editor/data/Language.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/editor/data/Language.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/editor/data/Language.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/editor/data/LocalizedName.java b/android/sdk/src/main/java/app/organicmaps/sdk/editor/data/LocalizedName.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/editor/data/LocalizedName.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/editor/data/LocalizedName.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/editor/data/LocalizedStreet.java b/android/sdk/src/main/java/app/organicmaps/sdk/editor/data/LocalizedStreet.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/editor/data/LocalizedStreet.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/editor/data/LocalizedStreet.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/editor/data/NamesDataSource.java b/android/sdk/src/main/java/app/organicmaps/sdk/editor/data/NamesDataSource.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/editor/data/NamesDataSource.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/editor/data/NamesDataSource.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/editor/data/Timespan.java b/android/sdk/src/main/java/app/organicmaps/sdk/editor/data/Timespan.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/editor/data/Timespan.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/editor/data/Timespan.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/editor/data/Timetable.java b/android/sdk/src/main/java/app/organicmaps/sdk/editor/data/Timetable.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/editor/data/Timetable.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/editor/data/Timetable.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/location/AndroidNativeProvider.java b/android/sdk/src/main/java/app/organicmaps/sdk/location/AndroidNativeProvider.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/location/AndroidNativeProvider.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/location/AndroidNativeProvider.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/location/BaseLocationProvider.java b/android/sdk/src/main/java/app/organicmaps/sdk/location/BaseLocationProvider.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/location/BaseLocationProvider.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/location/BaseLocationProvider.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/location/LocationHelper.java b/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationHelper.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/location/LocationHelper.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/location/LocationHelper.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/location/LocationListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/location/LocationListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/location/LocationListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/location/LocationState.java b/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationState.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/location/LocationState.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/location/LocationState.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/location/PlatformSocket.java b/android/sdk/src/main/java/app/organicmaps/sdk/location/PlatformSocket.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/location/PlatformSocket.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/location/PlatformSocket.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/location/RouteSimulationProvider.java b/android/sdk/src/main/java/app/organicmaps/sdk/location/RouteSimulationProvider.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/location/RouteSimulationProvider.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/location/RouteSimulationProvider.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/location/SensorHelper.java b/android/sdk/src/main/java/app/organicmaps/sdk/location/SensorHelper.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/location/SensorHelper.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/location/SensorHelper.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/location/SensorListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/location/SensorListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/location/SensorListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/location/SensorListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/location/TrackRecorder.java b/android/sdk/src/main/java/app/organicmaps/sdk/location/TrackRecorder.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/location/TrackRecorder.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/location/TrackRecorder.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/maplayer/Mode.java b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/Mode.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/maplayer/Mode.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/maplayer/Mode.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesErrorDialogListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesErrorDialogListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesErrorDialogListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesErrorDialogListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesManager.java b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesManager.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesManager.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesManager.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesState.java b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesState.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesState.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/maplayer/isolines/IsolinesState.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/OnIsolinesChangedListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/isolines/OnIsolinesChangedListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/maplayer/isolines/OnIsolinesChangedListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/maplayer/isolines/OnIsolinesChangedListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/maplayer/subway/OnTransitSchemeChangedListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/subway/OnTransitSchemeChangedListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/maplayer/subway/OnTransitSchemeChangedListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/maplayer/subway/OnTransitSchemeChangedListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/maplayer/subway/SubwayManager.java b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/subway/SubwayManager.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/maplayer/subway/SubwayManager.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/maplayer/subway/SubwayManager.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/maplayer/subway/TransitSchemeState.java b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/subway/TransitSchemeState.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/maplayer/subway/TransitSchemeState.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/maplayer/subway/TransitSchemeState.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/maplayer/traffic/TrafficManager.java b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/traffic/TrafficManager.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/maplayer/traffic/TrafficManager.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/maplayer/traffic/TrafficManager.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/maplayer/traffic/TrafficState.java b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/traffic/TrafficState.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/maplayer/traffic/TrafficState.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/maplayer/traffic/TrafficState.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/CarDirection.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/CarDirection.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/CarDirection.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/CarDirection.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/JunctionInfo.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/JunctionInfo.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/JunctionInfo.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/JunctionInfo.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/LaneWay.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/LaneWay.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/LaneWay.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/LaneWay.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/PedestrianTurnDirection.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/PedestrianTurnDirection.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/PedestrianTurnDirection.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/PedestrianTurnDirection.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/ResultCodes.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/ResultCodes.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/ResultCodes.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/ResultCodes.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/RouteMarkData.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/RouteMarkData.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/RouteMarkData.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/RouteMarkData.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/RouteMarkType.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/RouteMarkType.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/RouteMarkType.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/RouteMarkType.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/RoutePointInfo.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutePointInfo.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/RoutePointInfo.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutePointInfo.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/RouteRecommendationType.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/RouteRecommendationType.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/RouteRecommendationType.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/RouteRecommendationType.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/RoutingController.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutingController.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/RoutingController.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutingController.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/RoutingInfo.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutingInfo.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/RoutingInfo.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutingInfo.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/RoutingListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutingListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/RoutingListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutingListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/RoutingLoadPointsListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutingLoadPointsListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/RoutingLoadPointsListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutingLoadPointsListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/RoutingOptions.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutingOptions.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/RoutingOptions.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutingOptions.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/RoutingProgressListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutingProgressListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/RoutingProgressListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutingProgressListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/RoutingRecommendationListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutingRecommendationListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/RoutingRecommendationListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/RoutingRecommendationListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/SingleLaneInfo.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/SingleLaneInfo.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/SingleLaneInfo.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/SingleLaneInfo.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/TransitRouteInfo.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/TransitRouteInfo.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/TransitRouteInfo.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/TransitRouteInfo.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/TransitStepInfo.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/TransitStepInfo.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/TransitStepInfo.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/TransitStepInfo.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/routing/TransitStepType.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/TransitStepType.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/routing/TransitStepType.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/routing/TransitStepType.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/search/BookmarkSearchListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/search/BookmarkSearchListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/search/BookmarkSearchListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/search/BookmarkSearchListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/search/DisplayedCategories.java b/android/sdk/src/main/java/app/organicmaps/sdk/search/DisplayedCategories.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/search/DisplayedCategories.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/search/DisplayedCategories.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/search/MapSearchListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/search/MapSearchListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/search/MapSearchListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/search/MapSearchListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/search/Popularity.java b/android/sdk/src/main/java/app/organicmaps/sdk/search/Popularity.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/search/Popularity.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/search/Popularity.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/search/SearchEngine.java b/android/sdk/src/main/java/app/organicmaps/sdk/search/SearchEngine.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/search/SearchEngine.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/search/SearchEngine.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/search/SearchListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/search/SearchListener.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/search/SearchListener.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/search/SearchListener.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/search/SearchRecents.java b/android/sdk/src/main/java/app/organicmaps/sdk/search/SearchRecents.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/search/SearchRecents.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/search/SearchRecents.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/search/SearchResult.java b/android/sdk/src/main/java/app/organicmaps/sdk/search/SearchResult.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/search/SearchResult.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/search/SearchResult.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/settings/MapLanguageCode.java b/android/sdk/src/main/java/app/organicmaps/sdk/settings/MapLanguageCode.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/settings/MapLanguageCode.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/settings/MapLanguageCode.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/settings/RoadType.java b/android/sdk/src/main/java/app/organicmaps/sdk/settings/RoadType.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/settings/RoadType.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/settings/RoadType.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/settings/SpeedCameraMode.java b/android/sdk/src/main/java/app/organicmaps/sdk/settings/SpeedCameraMode.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/settings/SpeedCameraMode.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/settings/SpeedCameraMode.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/settings/StorageItem.java b/android/sdk/src/main/java/app/organicmaps/sdk/settings/StorageItem.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/settings/StorageItem.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/settings/StorageItem.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/settings/StoragePathManager.java b/android/sdk/src/main/java/app/organicmaps/sdk/settings/StoragePathManager.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/settings/StoragePathManager.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/settings/StoragePathManager.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/settings/UnitLocale.java b/android/sdk/src/main/java/app/organicmaps/sdk/settings/UnitLocale.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/settings/UnitLocale.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/settings/UnitLocale.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/sound/AudioFocusManager.java b/android/sdk/src/main/java/app/organicmaps/sdk/sound/AudioFocusManager.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/sound/AudioFocusManager.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/sound/AudioFocusManager.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/sound/LanguageData.java b/android/sdk/src/main/java/app/organicmaps/sdk/sound/LanguageData.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/sound/LanguageData.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/sound/LanguageData.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/sound/MediaPlayerWrapper.java b/android/sdk/src/main/java/app/organicmaps/sdk/sound/MediaPlayerWrapper.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/sound/MediaPlayerWrapper.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/sound/MediaPlayerWrapper.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/sound/TtsPlayer.java b/android/sdk/src/main/java/app/organicmaps/sdk/sound/TtsPlayer.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/sound/TtsPlayer.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/sound/TtsPlayer.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/BatteryState.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/BatteryState.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/BatteryState.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/BatteryState.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/ClientCertTLSSocketFactory.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/ClientCertTLSSocketFactory.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/ClientCertTLSSocketFactory.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/ClientCertTLSSocketFactory.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/Config.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/Config.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/ConnectionState.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/ConnectionState.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/ConnectionState.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/ConnectionState.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/Constants.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/Constants.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/Constants.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/Constants.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/DateUtils.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/DateUtils.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/DateUtils.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/DateUtils.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/Distance.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/Distance.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/Distance.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/Distance.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/GeoUtils.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/GeoUtils.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/GeoUtils.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/GeoUtils.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/HttpClient.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/HttpClient.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/HttpClient.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/HttpClient.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/KeyValue.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/KeyValue.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/KeyValue.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/KeyValue.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/Language.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/Language.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/Language.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/Language.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/LocationUtils.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/LocationUtils.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/LocationUtils.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/LocationUtils.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/NetworkPolicy.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/NetworkPolicy.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/NetworkPolicy.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/NetworkPolicy.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/PowerManagment.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/PowerManagment.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/PowerManagment.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/PowerManagment.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/ROMUtils.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/ROMUtils.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/ROMUtils.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/ROMUtils.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/SecureStorage.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/SecureStorage.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/SecureStorage.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/SecureStorage.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/SharedPropertiesUtils.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/SharedPropertiesUtils.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/SharedPropertiesUtils.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/SharedPropertiesUtils.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/StorageUtils.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/StorageUtils.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/StorageUtils.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/StorageUtils.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/StringUtils.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/StringUtils.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/StringUtils.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/StringUtils.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/Utils.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/Utils.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/Utils.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/Utils.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/concurrency/ThreadPool.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/concurrency/ThreadPool.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/concurrency/ThreadPool.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/concurrency/ThreadPool.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/concurrency/UiThread.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/concurrency/UiThread.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/concurrency/UiThread.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/concurrency/UiThread.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/log/Logger.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/log/Logger.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/log/Logger.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/log/Logger.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/util/log/ZipLogsTask.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/log/ZipLogsTask.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/util/log/ZipLogsTask.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/util/log/ZipLogsTask.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/widget/placepage/CoordinatesFormat.java b/android/sdk/src/main/java/app/organicmaps/sdk/widget/placepage/CoordinatesFormat.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/widget/placepage/CoordinatesFormat.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/widget/placepage/CoordinatesFormat.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/widget/placepage/PlacePageButtonFactory.java b/android/sdk/src/main/java/app/organicmaps/sdk/widget/placepage/PlacePageButtonFactory.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/widget/placepage/PlacePageButtonFactory.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/widget/placepage/PlacePageButtonFactory.java
diff --git a/android/app/src/main/java/app/organicmaps/sdk/widget/placepage/PlacePageData.java b/android/sdk/src/main/java/app/organicmaps/sdk/widget/placepage/PlacePageData.java
similarity index 100%
rename from android/app/src/main/java/app/organicmaps/sdk/widget/placepage/PlacePageData.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/widget/placepage/PlacePageData.java
diff --git a/android/app/src/main/java/org/chromium/base/ObserverList.java b/android/sdk/src/main/java/org/chromium/base/ObserverList.java
similarity index 100%
rename from android/app/src/main/java/org/chromium/base/ObserverList.java
rename to android/sdk/src/main/java/org/chromium/base/ObserverList.java
diff --git a/android/app/src/test/java/org/chromium/base/ObserverListTest.java b/android/sdk/src/test/java/org/chromium/base/ObserverListTest.java
similarity index 100%
rename from android/app/src/test/java/org/chromium/base/ObserverListTest.java
rename to android/sdk/src/test/java/org/chromium/base/ObserverListTest.java

From dc8d4e7da9d4a4493b28716336ed00e46f077b08 Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Fri, 15 Aug 2025 13:39:55 +0200
Subject: [PATCH 214/302] [android][sdk] add missing dependencies

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 android/sdk/build.gradle                                    | 6 ++++++
 .../main/java/app/organicmaps/sdk/bookmarks/data/Icon.java  | 4 ++--
 .../sdk/src/main/java/app/organicmaps/sdk/util/Utils.java   | 1 -
 .../src/main/java/app/organicmaps/sdk/util/log/Logger.java  | 3 +--
 .../main/java/app/organicmaps/sdk/util/log/LogsManager.java | 4 ++--
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index fa387860e..a556f0937 100644
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -98,7 +98,13 @@ android {
 }
 
 dependencies {
+  implementation 'androidx.annotation:annotation:1.9.1'
+  implementation 'androidx.core:core:1.17.0'
+  implementation 'androidx.recyclerview:recyclerview:1.4.0'
+  implementation 'androidx.fragment:fragment:1.8.9'
+  implementation 'androidx.lifecycle:lifecycle-process:2.9.2'
 
+  testImplementation 'junit:junit:4.13.2'
 }
 
 // TODO: Running lint task triggers native build. Find a better solution.
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java
index 0ac0c513b..e09ea7cd7 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java
@@ -9,8 +9,8 @@ import androidx.annotation.NonNull;
 import app.organicmaps.BuildConfig;
 import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.sdk.util.log.Logger;
-import com.google.common.base.Objects;
 import dalvik.annotation.optimization.FastNative;
+import java.util.Arrays;
 
 public class Icon implements Parcelable
 {
@@ -86,7 +86,7 @@ public class Icon implements Parcelable
   @Override
   public int hashCode()
   {
-    return Objects.hashCode(mColor, mType);
+    return Arrays.hashCode(new int[] {mColor, mType});
   }
 
   public static final Parcelable.Creator<Icon> CREATOR = new Parcelable.Creator<>() {
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/util/Utils.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/Utils.java
index 56dbae3eb..a6ddf728c 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/util/Utils.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/Utils.java
@@ -18,7 +18,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import app.organicmaps.BuildConfig;
-import app.organicmaps.R;
 import app.organicmaps.sdk.util.log.Logger;
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/util/log/Logger.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/log/Logger.java
index edc0c28b9..63baea6d7 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/util/log/Logger.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/log/Logger.java
@@ -12,9 +12,8 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
-import net.jcip.annotations.ThreadSafe;
 
-@ThreadSafe
+/// Thread-safe
 public final class Logger
 {
   private static final String TAG = Logger.class.getSimpleName();
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java
index fbcf1155b..ec1e871fa 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java
@@ -27,16 +27,16 @@ import java.util.Date;
 import java.util.Locale;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
-import net.jcip.annotations.ThreadSafe;
 
 /**
+ * Thread-safe
+ * <p>
  * By default uses Android's system logger.
  * After an initFileLogging() call can use a custom file logging implementation.
  * <p>
  * Its important to have only system logging here to avoid infinite loop
  * (Logger calls getEnabledLogsFolder() in preparation to write).
  */
-@ThreadSafe
 public final class LogsManager
 {
   public interface OnZipCompletedListener

From a8353a6a800dff24d2ce1704e4f56027eb0c595d Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Sat, 23 Aug 2025 16:29:31 +0700
Subject: [PATCH 215/302] [android] Replace direct SDK deps with libs refs

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 android/sdk/build.gradle | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index a556f0937..9b8116ea7 100644
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -98,13 +98,14 @@ android {
 }
 
 dependencies {
-  implementation 'androidx.annotation:annotation:1.9.1'
-  implementation 'androidx.core:core:1.17.0'
-  implementation 'androidx.recyclerview:recyclerview:1.4.0'
-  implementation 'androidx.fragment:fragment:1.8.9'
-  implementation 'androidx.lifecycle:lifecycle-process:2.9.2'
+  implementation libs.androidx.core
+  implementation libs.androidx.annotation
+  implementation libs.androidx.fragment
+  implementation libs.androidx.lifecycle.process
+  implementation libs.androidx.recyclerview
+  implementation libs.android.material
 
-  testImplementation 'junit:junit:4.13.2'
+  testImplementation libs.junit
 }
 
 // TODO: Running lint task triggers native build. Find a better solution.

From 3a90f9783d08de4678b1080aa92a839e2687d13e Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Fri, 15 Aug 2025 14:55:52 +0200
Subject: [PATCH 216/302] [android][sdk] Add build config to sdk module

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 .../java/app/organicmaps/MwmApplication.java  |  4 +-
 android/sdk/build.gradle                      |  5 +-
 .../main/java/app/organicmaps/sdk/Map.java    |  3 +-
 .../java/app/organicmaps/sdk/OrganicMaps.java | 12 ++--
 .../organicmaps/sdk/bookmarks/data/Icon.java  |  2 +-
 .../app/organicmaps/sdk/editor/Editor.java    |  4 +-
 .../sdk/location/PlatformSocket.java          |  2 +-
 .../java/app/organicmaps/sdk/util/Config.java | 58 +++++++++++++++++--
 .../organicmaps/sdk/util/StorageUtils.java    |  5 +-
 .../java/app/organicmaps/sdk/util/Utils.java  |  6 +-
 .../app/organicmaps/sdk/util/log/Logger.java  |  2 +-
 .../organicmaps/sdk/util/log/LogsManager.java |  7 ++-
 12 files changed, 82 insertions(+), 28 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/MwmApplication.java b/android/app/src/main/java/app/organicmaps/MwmApplication.java
index 6268e51e1..2c9527c45 100644
--- a/android/app/src/main/java/app/organicmaps/MwmApplication.java
+++ b/android/app/src/main/java/app/organicmaps/MwmApplication.java
@@ -119,7 +119,9 @@ public class MwmApplication extends Application implements Application.ActivityL
 
     sInstance = this;
 
-    mOrganicMaps = new OrganicMaps(getApplicationContext());
+    mOrganicMaps =
+        new OrganicMaps(getApplicationContext(), BuildConfig.FLAVOR, BuildConfig.APPLICATION_ID,
+                        BuildConfig.VERSION_CODE, BuildConfig.VERSION_NAME, BuildConfig.FILE_PROVIDER_AUTHORITY);
 
     ConnectionState.INSTANCE.initialize(this);
 
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index 9b8116ea7..1b33195ff 100644
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -8,8 +8,11 @@ android {
 
   ndkVersion = '28.2.13676358'
 
-  defaultConfig {
+  buildFeatures {
+    buildConfig = true
+  }
 
+  defaultConfig {
     minSdk = propMinSdkVersion.toInteger()
     targetSdk = propTargetSdkVersion.toInteger()
 
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/Map.java b/android/sdk/src/main/java/app/organicmaps/sdk/Map.java
index c2524340b..b31eb00b0 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/Map.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/Map.java
@@ -6,7 +6,6 @@ import android.view.MotionEvent;
 import android.view.Surface;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import app.organicmaps.BuildConfig;
 import app.organicmaps.R;
 import app.organicmaps.sdk.display.DisplayType;
 import app.organicmaps.sdk.location.LocationHelper;
@@ -181,7 +180,7 @@ public final class Map
     setupWidgets(context, surfaceFrame.width(), surfaceFrame.height());
 
     final boolean firstStart = mLocationHelper.isInFirstRun();
-    if (!nativeCreateEngine(surface, surfaceDpi, firstStart, mLaunchByDeepLink, BuildConfig.VERSION_CODE,
+    if (!nativeCreateEngine(surface, surfaceDpi, firstStart, mLaunchByDeepLink, Config.getVersionCode(),
                             ROMUtils.isCustomROM()))
     {
       if (mCallbackUnsupported != null)
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/OrganicMaps.java b/android/sdk/src/main/java/app/organicmaps/sdk/OrganicMaps.java
index 5c322e0f6..14b3f730c 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/OrganicMaps.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/OrganicMaps.java
@@ -31,6 +31,9 @@ public final class OrganicMaps implements DefaultLifecycleObserver
 {
   private static final String TAG = OrganicMaps.class.getSimpleName();
 
+  @NonNull
+  private final String mFlavor;
+
   @NonNull
   private final Context mContext;
 
@@ -74,8 +77,10 @@ public final class OrganicMaps implements DefaultLifecycleObserver
     return mIsolinesManager;
   }
 
-  public OrganicMaps(@NonNull Context context)
+  public OrganicMaps(@NonNull Context context, @NonNull String flavor, @NonNull String applicationId, int versionCode,
+                     @NonNull String versionName, @NonNull String fileProviderAuthority)
   {
+    mFlavor = flavor;
     mContext = context.getApplicationContext();
     mPreferences = mContext.getSharedPreferences(context.getString(app.organicmaps.sdk.R.string.pref_file_name),
                                                  Context.MODE_PRIVATE);
@@ -88,7 +93,7 @@ public final class OrganicMaps implements DefaultLifecycleObserver
     Logger.d(TAG, "Settings path = " + settingsPath);
     nativeSetSettingsDir(settingsPath);
 
-    Config.init(mContext, mPreferences);
+    Config.init(mContext, mPreferences, flavor, applicationId, versionCode, versionName, fileProviderAuthority);
     OsmOAuth.init(mPreferences);
     SharedPropertiesUtils.init(mPreferences);
     LogsManager.INSTANCE.initFileLogging(mContext, mPreferences);
@@ -158,8 +163,7 @@ public final class OrganicMaps implements DefaultLifecycleObserver
     // external storage is damaged or not available (read-only).
     createPlatformDirectories(writablePath, privatePath, tempPath);
 
-    nativeInitPlatform(mContext, apkPath, writablePath, privatePath, tempPath, app.organicmaps.BuildConfig.FLAVOR,
-                       app.organicmaps.BuildConfig.BUILD_TYPE,
+    nativeInitPlatform(mContext, apkPath, writablePath, privatePath, tempPath, mFlavor, BuildConfig.BUILD_TYPE,
                        /* isTablet */ false);
     Config.setStoragePath(writablePath);
     Config.setStatisticsEnabled(SharedPropertiesUtils.isStatisticsEnabled());
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java
index e09ea7cd7..04f1667f8 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java
@@ -6,7 +6,7 @@ import android.os.Parcelable;
 import androidx.annotation.ColorInt;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
-import app.organicmaps.BuildConfig;
+import app.organicmaps.sdk.BuildConfig;
 import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.sdk.util.log.Logger;
 import dalvik.annotation.optimization.FastNative;
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/editor/Editor.java b/android/sdk/src/main/java/app/organicmaps/sdk/editor/Editor.java
index cc420d9ff..f736fbb6e 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/editor/Editor.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/editor/Editor.java
@@ -4,7 +4,6 @@ import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
 import androidx.annotation.Size;
 import androidx.annotation.WorkerThread;
-import app.organicmaps.BuildConfig;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.bookmarks.data.Metadata;
 import app.organicmaps.sdk.editor.data.FeatureCategory;
@@ -12,6 +11,7 @@ import app.organicmaps.sdk.editor.data.Language;
 import app.organicmaps.sdk.editor.data.LocalizedName;
 import app.organicmaps.sdk.editor.data.LocalizedStreet;
 import app.organicmaps.sdk.editor.data.NamesDataSource;
+import app.organicmaps.sdk.util.Config;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
@@ -45,7 +45,7 @@ public final class Editor
   public static void uploadChanges()
   {
     if (nativeHasSomethingToUpload() && OsmOAuth.isAuthorized())
-      nativeUploadChanges(OsmOAuth.getAuthToken(), BuildConfig.VERSION_NAME, BuildConfig.APPLICATION_ID);
+      nativeUploadChanges(OsmOAuth.getAuthToken(), Config.getVersionName(), Config.getApplicationId());
   }
 
   public static native boolean nativeShouldShowEditPlace();
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/location/PlatformSocket.java b/android/sdk/src/main/java/app/organicmaps/sdk/location/PlatformSocket.java
index 019b0b1cf..fe00322c9 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/location/PlatformSocket.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/location/PlatformSocket.java
@@ -6,7 +6,7 @@ import android.os.SystemClock;
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import app.organicmaps.BuildConfig;
+import app.organicmaps.sdk.BuildConfig;
 import app.organicmaps.sdk.util.log.Logger;
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java
index 8396ed6f6..44326e4c1 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java
@@ -5,7 +5,6 @@ import android.content.SharedPreferences;
 import android.os.Build;
 import androidx.annotation.NonNull;
 import androidx.preference.PreferenceManager;
-import app.organicmaps.BuildConfig;
 import app.organicmaps.R;
 
 public final class Config
@@ -14,6 +13,24 @@ public final class Config
   @NonNull
   private static SharedPreferences mPrefs;
 
+  @SuppressWarnings("NotNullFieldNotInitialized")
+  @NonNull
+  private static String mFlavor;
+
+  @SuppressWarnings("NotNullFieldNotInitialized")
+  @NonNull
+  private static String mApplicationId;
+
+  private static int mVersionCode;
+
+  @SuppressWarnings("NotNullFieldNotInitialized")
+  @NonNull
+  private static String mVersionName;
+
+  @SuppressWarnings("NotNullFieldNotInitialized")
+  @NonNull
+  private static String mFileProviderAuthority;
+
   private static final String KEY_APP_STORAGE = "StoragePath";
 
   private static final String KEY_DOWNLOADER_AUTO = "AutoDownloadEnabled";
@@ -125,6 +142,29 @@ public final class Config
     nativeSetBoolean(key, value);
   }
 
+  @NonNull
+  public static String getApplicationId()
+  {
+    return mApplicationId;
+  }
+
+  public static int getVersionCode()
+  {
+    return mVersionCode;
+  }
+
+  @NonNull
+  public static String getVersionName()
+  {
+    return mVersionName;
+  }
+
+  @NonNull
+  public static String getFileProviderAuthority()
+  {
+    return mFileProviderAuthority;
+  }
+
   public static String getStoragePath()
   {
     return getString(KEY_APP_STORAGE);
@@ -351,31 +391,37 @@ public final class Config
   }
 
   @NonNull
-  @SuppressWarnings("ConstantConditions") // BuildConfig
   public static String getDonateUrl(@NonNull Context context)
   {
     final String url = getString(KEY_DONATE_URL);
     // Enable donations by default if not Google or Huawei. Replace comaps.app/donate/ with localized page.
-    if ((url.isEmpty() && !BuildConfig.FLAVOR.equals("google") && !BuildConfig.FLAVOR.equals("huawei"))
+    if ((url.isEmpty() && !mFlavor.equals("google") && !mFlavor.equals("huawei"))
         || url.endsWith("comaps.app/donate/"))
       return context.getString(R.string.app_site_url) + "donate/";
     return url;
   }
 
-  public static void init(@NonNull Context context, @NonNull SharedPreferences prefs)
+  public static void init(@NonNull Context context, @NonNull SharedPreferences prefs, @NonNull String flavor,
+                          @NonNull String applicationId, int versionCode, @NonNull String versionName,
+                          @NonNull String fileProviderAuthority)
   {
     PreferenceManager.setDefaultValues(context, R.xml.prefs_main, false);
 
     mPrefs = prefs;
+    mFlavor = flavor;
+    mApplicationId = applicationId;
+    mVersionCode = versionCode;
+    mVersionName = versionName;
+    mFileProviderAuthority = fileProviderAuthority;
     final SharedPreferences.Editor editor = mPrefs.edit();
 
     // Update counters.
     final int launchNumber = mPrefs.getInt(KEY_APP_LAUNCH_NUMBER, 0);
     editor.putInt(KEY_APP_LAUNCH_NUMBER, launchNumber + 1);
     editor.putLong(KEY_APP_LAST_SESSION_TIMESTAMP, System.currentTimeMillis());
-    editor.putInt(KEY_APP_LAST_INSTALL_VERSION_CODE, BuildConfig.VERSION_CODE);
+    editor.putInt(KEY_APP_LAST_INSTALL_VERSION_CODE, mVersionCode);
     if (launchNumber == 0 || mPrefs.getInt(KEY_APP_FIRST_INSTALL_VERSION_CODE, 0) == 0)
-      editor.putInt(KEY_APP_FIRST_INSTALL_VERSION_CODE, BuildConfig.VERSION_CODE);
+      editor.putInt(KEY_APP_FIRST_INSTALL_VERSION_CODE, mVersionCode);
 
     // Clean up legacy counters.
     editor.remove("FirstInstallFlavor");
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/util/StorageUtils.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/StorageUtils.java
index 15eb6fbbc..77c02ae70 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/util/StorageUtils.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/StorageUtils.java
@@ -11,7 +11,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.FileProvider;
 import androidx.documentfile.provider.DocumentFile;
-import app.organicmaps.BuildConfig;
 import app.organicmaps.sdk.util.log.Logger;
 import java.io.File;
 import java.io.FileInputStream;
@@ -94,7 +93,7 @@ public class StorageUtils
   {
     try
     {
-      return Utils.getApplicationInfo(context.getPackageManager(), BuildConfig.APPLICATION_ID, 0).sourceDir;
+      return Utils.getApplicationInfo(context.getPackageManager(), Config.getApplicationId(), 0).sourceDir;
     }
     catch (final PackageManager.NameNotFoundException e)
     {
@@ -150,7 +149,7 @@ public class StorageUtils
   @NonNull
   public static Uri getUriForFilePath(@NonNull Context context, @NonNull String path)
   {
-    return FileProvider.getUriForFile(context.getApplicationContext(), BuildConfig.FILE_PROVIDER_AUTHORITY,
+    return FileProvider.getUriForFile(context.getApplicationContext(), Config.getFileProviderAuthority(),
                                       new File(path));
   }
 
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/util/Utils.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/Utils.java
index a6ddf728c..2f5cfdbad 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/util/Utils.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/Utils.java
@@ -17,7 +17,7 @@ import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
-import app.organicmaps.BuildConfig;
+import app.organicmaps.sdk.BuildConfig;
 import app.organicmaps.sdk.util.log.Logger;
 import java.io.Closeable;
 import java.io.IOException;
@@ -211,7 +211,7 @@ public class Utils
   @SuppressWarnings("unused")
   public static String getVersion()
   {
-    return BuildConfig.VERSION_NAME;
+    return Config.getVersionName();
   }
 
   // Called from JNI.
@@ -222,7 +222,7 @@ public class Utils
     // Please sync with getVersion() in build.gradle
     // - % 100000000 removes prefix for special markets, e.g Huawei.
     // - / 100 removes the number of commits in the current day.
-    return (BuildConfig.VERSION_CODE % 1_00_00_00_00) / 100;
+    return (Config.getVersionCode() % 1_00_00_00_00) / 100;
   }
 
   @NonNull
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/util/log/Logger.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/log/Logger.java
index 63baea6d7..6b37f58d4 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/util/log/Logger.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/log/Logger.java
@@ -4,7 +4,7 @@ import android.util.Log;
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import app.organicmaps.BuildConfig;
+import app.organicmaps.sdk.BuildConfig;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java
index ec1e871fa..50b915ecb 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java
@@ -16,8 +16,9 @@ import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
-import app.organicmaps.BuildConfig;
 import app.organicmaps.R;
+import app.organicmaps.sdk.BuildConfig;
+import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.ROMUtils;
 import app.organicmaps.sdk.util.StringUtils;
 import java.io.File;
@@ -246,9 +247,9 @@ public final class LogsManager
     for (String abi : Build.SUPPORTED_ABIS)
       sb.append(' ').append(abi);
     sb.append("\nApp version: ")
-        .append(BuildConfig.APPLICATION_ID)
+        .append(Config.getApplicationId())
         .append(' ')
-        .append(BuildConfig.VERSION_NAME)
+        .append(Config.getVersionName())
         .append("\nLocale: ")
         .append(Locale.getDefault())
         .append("\nNetworks: ");

From abcc95710df01e1620d7d85057bd05fb024426b1 Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Fri, 15 Aug 2025 15:19:29 +0200
Subject: [PATCH 217/302] [android][sdk] Replace app.organicmaps.R with
 app.organicmaps.sdk.R

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 android/sdk/src/main/java/app/organicmaps/sdk/Map.java    | 1 -
 .../src/main/java/app/organicmaps/sdk/OrganicMaps.java    | 3 +--
 .../organicmaps/sdk/bookmarks/data/BookmarkCategory.java  | 8 ++++----
 .../java/app/organicmaps/sdk/bookmarks/data/Icon.java     | 3 ++-
 .../src/main/java/app/organicmaps/sdk/maplayer/Mode.java  | 1 +
 .../sdk/maplayer/subway/TransitSchemeState.java           | 2 +-
 .../app/organicmaps/sdk/settings/StoragePathManager.java  | 2 +-
 .../src/main/java/app/organicmaps/sdk/util/Config.java    | 2 +-
 .../src/main/java/app/organicmaps/sdk/util/Distance.java  | 2 +-
 .../app/organicmaps/sdk/util/SharedPropertiesUtils.java   | 2 +-
 .../main/java/app/organicmaps/sdk/util/StringUtils.java   | 2 +-
 .../java/app/organicmaps/sdk/util/log/LogsManager.java    | 2 +-
 12 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/Map.java b/android/sdk/src/main/java/app/organicmaps/sdk/Map.java
index b31eb00b0..a60c3976e 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/Map.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/Map.java
@@ -6,7 +6,6 @@ import android.view.MotionEvent;
 import android.view.Surface;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import app.organicmaps.R;
 import app.organicmaps.sdk.display.DisplayType;
 import app.organicmaps.sdk.location.LocationHelper;
 import app.organicmaps.sdk.util.Config;
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/OrganicMaps.java b/android/sdk/src/main/java/app/organicmaps/sdk/OrganicMaps.java
index 14b3f730c..dfa0cbc36 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/OrganicMaps.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/OrganicMaps.java
@@ -6,7 +6,6 @@ import androidx.annotation.NonNull;
 import androidx.lifecycle.DefaultLifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.ProcessLifecycleOwner;
-import app.organicmaps.R;
 import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
 import app.organicmaps.sdk.bookmarks.data.Icon;
 import app.organicmaps.sdk.downloader.Android7RootCertificateWorkaround;
@@ -82,7 +81,7 @@ public final class OrganicMaps implements DefaultLifecycleObserver
   {
     mFlavor = flavor;
     mContext = context.getApplicationContext();
-    mPreferences = mContext.getSharedPreferences(context.getString(app.organicmaps.sdk.R.string.pref_file_name),
+    mPreferences = mContext.getSharedPreferences(context.getString(R.string.pref_file_name),
                                                  Context.MODE_PRIVATE);
 
     // Set configuration directory as early as possible.
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategory.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategory.java
index d4fe68208..8c8eb89c3 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategory.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/BookmarkCategory.java
@@ -162,10 +162,10 @@ public class BookmarkCategory implements Parcelable
 
   public enum AccessRules
   {
-    ACCESS_RULES_LOCAL(app.organicmaps.R.string.not_shared, R.drawable.ic_lock),
-    ACCESS_RULES_PUBLIC(app.organicmaps.R.string.public_access, R.drawable.ic_public_inline),
-    ACCESS_RULES_DIRECT_LINK(app.organicmaps.R.string.limited_access, R.drawable.ic_link_inline),
-    ACCESS_RULES_AUTHOR_ONLY(app.organicmaps.R.string.access_rules_author_only, R.drawable.ic_lock);
+    ACCESS_RULES_LOCAL(R.string.not_shared, R.drawable.ic_lock),
+    ACCESS_RULES_PUBLIC(R.string.public_access, R.drawable.ic_public_inline),
+    ACCESS_RULES_DIRECT_LINK(R.string.limited_access, R.drawable.ic_link_inline),
+    ACCESS_RULES_AUTHOR_ONLY(R.string.access_rules_author_only, R.drawable.ic_lock);
 
     private final int mResId;
     private final int mDrawableResId;
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java
index 04f1667f8..28b2c8506 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Icon.java
@@ -7,6 +7,7 @@ import androidx.annotation.ColorInt;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
 import app.organicmaps.sdk.BuildConfig;
+import app.organicmaps.sdk.R;
 import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.sdk.util.log.Logger;
 import dalvik.annotation.optimization.FastNative;
@@ -115,7 +116,7 @@ public class Icon implements Parcelable
         // Force devs to add an icon for each bookmark type.
         if (BuildConfig.DEBUG)
           throw new RuntimeException("Error getting icon for " + name);
-        icons[i] = app.organicmaps.sdk.R.drawable.ic_bookmark_none; // Fallback icon
+        icons[i] = R.drawable.ic_bookmark_none; // Fallback icon
       }
     }
 
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/Mode.java b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/Mode.java
index 3ed242cff..77023479a 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/Mode.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/Mode.java
@@ -2,6 +2,7 @@ package app.organicmaps.sdk.maplayer;
 
 import android.content.Context;
 import androidx.annotation.NonNull;
+import app.organicmaps.sdk.R;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.maplayer.isolines.IsolinesManager;
 import app.organicmaps.sdk.maplayer.subway.SubwayManager;
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/subway/TransitSchemeState.java b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/subway/TransitSchemeState.java
index 08bbc95a7..cc78c01fa 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/subway/TransitSchemeState.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/subway/TransitSchemeState.java
@@ -3,7 +3,7 @@ package app.organicmaps.sdk.maplayer.subway;
 import android.content.Context;
 import android.widget.Toast;
 import androidx.annotation.NonNull;
-import app.organicmaps.R;
+import app.organicmaps.sdk.R;
 
 enum TransitSchemeState
 {
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/settings/StoragePathManager.java b/android/sdk/src/main/java/app/organicmaps/sdk/settings/StoragePathManager.java
index 5164f1088..0eb5bf3bf 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/settings/StoragePathManager.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/settings/StoragePathManager.java
@@ -11,7 +11,7 @@ import android.os.storage.StorageVolume;
 import android.text.TextUtils;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import app.organicmaps.R;
+import app.organicmaps.sdk.R;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.downloader.MapManager;
 import app.organicmaps.sdk.util.Config;
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java
index 44326e4c1..9187b7988 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java
@@ -5,7 +5,7 @@ import android.content.SharedPreferences;
 import android.os.Build;
 import androidx.annotation.NonNull;
 import androidx.preference.PreferenceManager;
-import app.organicmaps.R;
+import app.organicmaps.sdk.R;
 
 public final class Config
 {
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/util/Distance.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/Distance.java
index a846e16ff..bb1b4ee39 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/util/Distance.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/Distance.java
@@ -4,7 +4,7 @@ import android.content.Context;
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 import androidx.annotation.StringRes;
-import app.organicmaps.R;
+import app.organicmaps.sdk.R;
 
 // Used by JNI.
 @Keep
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/util/SharedPropertiesUtils.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/SharedPropertiesUtils.java
index 6a28b6163..6de3845c0 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/util/SharedPropertiesUtils.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/SharedPropertiesUtils.java
@@ -5,7 +5,7 @@ import static app.organicmaps.sdk.util.Config.KEY_PREF_STATISTICS;
 import android.content.Context;
 import android.content.SharedPreferences;
 import androidx.annotation.NonNull;
-import app.organicmaps.R;
+import app.organicmaps.sdk.R;
 import app.organicmaps.sdk.maplayer.Mode;
 import java.io.IOException;
 import java.util.Locale;
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/util/StringUtils.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/StringUtils.java
index ca0ce167b..0c60b0731 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/util/StringUtils.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/StringUtils.java
@@ -5,7 +5,7 @@ import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Pair;
 import androidx.annotation.NonNull;
-import app.organicmaps.R;
+import app.organicmaps.sdk.R;
 import java.text.NumberFormat;
 import java.util.Locale;
 
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java
index 50b915ecb..64a1e1c0a 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java
@@ -16,7 +16,7 @@ import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
-import app.organicmaps.R;
+import app.organicmaps.sdk.R;
 import app.organicmaps.sdk.BuildConfig;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.ROMUtils;

From c004f2ed7e8e7c4c0a48be26ad8a787ab8eaf129 Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Fri, 15 Aug 2025 15:33:30 +0200
Subject: [PATCH 218/302] [android][sdk] Add missing dimens

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 android/app/src/main/res/values-land/dimens.xml |  1 -
 android/app/src/main/res/values/dimens.xml      |  3 ---
 android/sdk/src/main/res/values-land/dimens.xml |  5 +++++
 android/sdk/src/main/res/values/dimens.xml      | 11 +++++++++++
 4 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 android/sdk/src/main/res/values-land/dimens.xml
 create mode 100644 android/sdk/src/main/res/values/dimens.xml

diff --git a/android/app/src/main/res/values-land/dimens.xml b/android/app/src/main/res/values-land/dimens.xml
index a016eca29..cdbbfc936 100644
--- a/android/app/src/main/res/values-land/dimens.xml
+++ b/android/app/src/main/res/values-land/dimens.xml
@@ -3,7 +3,6 @@
   <dimen name="tabs_height">48dp</dimen>
 
   <dimen name="map_buttons_bottom_margin">100dp</dimen>
-  <dimen name="margin_compass_top">20dp</dimen>
 
   <!-- Nav menu -->
   <dimen name="nav_menu_content_height">48dp</dimen>
diff --git a/android/app/src/main/res/values/dimens.xml b/android/app/src/main/res/values/dimens.xml
index 492beeae5..651149954 100644
--- a/android/app/src/main/res/values/dimens.xml
+++ b/android/app/src/main/res/values/dimens.xml
@@ -69,9 +69,6 @@
   <dimen name="margin_direction_around_center">40dp</dimen>
 
   <!-- map widgets -->
-  <dimen name="margin_compass">24dp</dimen>
-  <dimen name="margin_compass_top">26dp</dimen>
-  <dimen name="margin_ruler">10dp</dimen>
   <dimen name="button_small_corner_radius">2dp</dimen>
   <dimen name="viewport_min_height">100dp</dimen>
   <dimen name="viewport_min_width">300dp</dimen>
diff --git a/android/sdk/src/main/res/values-land/dimens.xml b/android/sdk/src/main/res/values-land/dimens.xml
new file mode 100644
index 000000000..b13177f21
--- /dev/null
+++ b/android/sdk/src/main/res/values-land/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!-- map widgets -->
+  <dimen name="margin_compass_top">20dp</dimen>
+</resources>
diff --git a/android/sdk/src/main/res/values/dimens.xml b/android/sdk/src/main/res/values/dimens.xml
new file mode 100644
index 000000000..00d237e55
--- /dev/null
+++ b/android/sdk/src/main/res/values/dimens.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <dimen name="margin_base">16dp</dimen>
+  <dimen name="margin_half">8dp</dimen>
+  <dimen name="nav_frame_padding">@dimen/margin_half</dimen>
+
+  <!-- map widgets -->
+  <dimen name="margin_compass">24dp</dimen>
+  <dimen name="margin_compass_top">26dp</dimen>
+  <dimen name="margin_ruler">10dp</dimen>
+</resources>

From b2743ab2ad040047c034011769dceccf22c663db Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Fri, 15 Aug 2025 16:07:40 +0200
Subject: [PATCH 219/302] [android][sdk] Add prefs strings

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 android/sdk/src/main/res/values/donottranslate.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/android/sdk/src/main/res/values/donottranslate.xml b/android/sdk/src/main/res/values/donottranslate.xml
index 3998fc654..8f677d6ec 100644
--- a/android/sdk/src/main/res/values/donottranslate.xml
+++ b/android/sdk/src/main/res/values/donottranslate.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
   <string name="pref_file_name" translatable="false">OrganicMapsPrefs</string>
+  <string name="pref_enable_logging" translatable="false">EnableLogging</string>
+  <string name="pref_emulate_bad_external_storage" translatable="false">EmulateBadExternalStorage</string>
 </resources>

From 06c35e729fbcceb4f8f91d34c2fb62bb002ad611 Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Fri, 15 Aug 2025 16:09:08 +0200
Subject: [PATCH 220/302] [android][sdk] Move types strings

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 android/{app => sdk}/src/main/res/values-af/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-ar/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-ast/types_strings.xml    | 0
 android/{app => sdk}/src/main/res/values-az/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-be/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-bg/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-ca/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-cs/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-da/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-de/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-el/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-en-rGB/types_strings.xml | 0
 android/{app => sdk}/src/main/res/values-es-rMX/types_strings.xml | 0
 android/{app => sdk}/src/main/res/values-es/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-et/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-eu/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-fa/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-fi/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-fr/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-gl/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-hi/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-hu/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-ia/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-in/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-is/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-it/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-iw/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-ja/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-ko/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-lt/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-lv/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-mr/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-nb/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-nl/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-pl/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-pt-rBR/types_strings.xml | 0
 android/{app => sdk}/src/main/res/values-pt/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-ro/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-ru/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-sk/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-sr/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-sv/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-sw/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-th/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-tr/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-uk/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-vi/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values-zh-rHK/types_strings.xml | 0
 android/{app => sdk}/src/main/res/values-zh-rTW/types_strings.xml | 0
 android/{app => sdk}/src/main/res/values-zh/types_strings.xml     | 0
 android/{app => sdk}/src/main/res/values/types_strings.xml        | 0
 51 files changed, 0 insertions(+), 0 deletions(-)
 rename android/{app => sdk}/src/main/res/values-af/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-ar/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-ast/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-az/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-be/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-bg/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-ca/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-cs/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-da/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-de/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-el/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-en-rGB/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-es-rMX/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-es/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-et/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-eu/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-fa/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-fi/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-fr/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-gl/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-hi/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-hu/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-ia/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-in/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-is/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-it/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-iw/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-ja/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-ko/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-lt/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-lv/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-mr/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-nb/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-nl/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-pl/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-pt-rBR/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-pt/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-ro/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-ru/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-sk/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-sr/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-sv/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-sw/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-th/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-tr/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-uk/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-vi/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-zh-rHK/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-zh-rTW/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-zh/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values/types_strings.xml (100%)

diff --git a/android/app/src/main/res/values-af/types_strings.xml b/android/sdk/src/main/res/values-af/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-af/types_strings.xml
rename to android/sdk/src/main/res/values-af/types_strings.xml
diff --git a/android/app/src/main/res/values-ar/types_strings.xml b/android/sdk/src/main/res/values-ar/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-ar/types_strings.xml
rename to android/sdk/src/main/res/values-ar/types_strings.xml
diff --git a/android/app/src/main/res/values-ast/types_strings.xml b/android/sdk/src/main/res/values-ast/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-ast/types_strings.xml
rename to android/sdk/src/main/res/values-ast/types_strings.xml
diff --git a/android/app/src/main/res/values-az/types_strings.xml b/android/sdk/src/main/res/values-az/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-az/types_strings.xml
rename to android/sdk/src/main/res/values-az/types_strings.xml
diff --git a/android/app/src/main/res/values-be/types_strings.xml b/android/sdk/src/main/res/values-be/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-be/types_strings.xml
rename to android/sdk/src/main/res/values-be/types_strings.xml
diff --git a/android/app/src/main/res/values-bg/types_strings.xml b/android/sdk/src/main/res/values-bg/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-bg/types_strings.xml
rename to android/sdk/src/main/res/values-bg/types_strings.xml
diff --git a/android/app/src/main/res/values-ca/types_strings.xml b/android/sdk/src/main/res/values-ca/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-ca/types_strings.xml
rename to android/sdk/src/main/res/values-ca/types_strings.xml
diff --git a/android/app/src/main/res/values-cs/types_strings.xml b/android/sdk/src/main/res/values-cs/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-cs/types_strings.xml
rename to android/sdk/src/main/res/values-cs/types_strings.xml
diff --git a/android/app/src/main/res/values-da/types_strings.xml b/android/sdk/src/main/res/values-da/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-da/types_strings.xml
rename to android/sdk/src/main/res/values-da/types_strings.xml
diff --git a/android/app/src/main/res/values-de/types_strings.xml b/android/sdk/src/main/res/values-de/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-de/types_strings.xml
rename to android/sdk/src/main/res/values-de/types_strings.xml
diff --git a/android/app/src/main/res/values-el/types_strings.xml b/android/sdk/src/main/res/values-el/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-el/types_strings.xml
rename to android/sdk/src/main/res/values-el/types_strings.xml
diff --git a/android/app/src/main/res/values-en-rGB/types_strings.xml b/android/sdk/src/main/res/values-en-rGB/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-en-rGB/types_strings.xml
rename to android/sdk/src/main/res/values-en-rGB/types_strings.xml
diff --git a/android/app/src/main/res/values-es-rMX/types_strings.xml b/android/sdk/src/main/res/values-es-rMX/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-es-rMX/types_strings.xml
rename to android/sdk/src/main/res/values-es-rMX/types_strings.xml
diff --git a/android/app/src/main/res/values-es/types_strings.xml b/android/sdk/src/main/res/values-es/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-es/types_strings.xml
rename to android/sdk/src/main/res/values-es/types_strings.xml
diff --git a/android/app/src/main/res/values-et/types_strings.xml b/android/sdk/src/main/res/values-et/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-et/types_strings.xml
rename to android/sdk/src/main/res/values-et/types_strings.xml
diff --git a/android/app/src/main/res/values-eu/types_strings.xml b/android/sdk/src/main/res/values-eu/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-eu/types_strings.xml
rename to android/sdk/src/main/res/values-eu/types_strings.xml
diff --git a/android/app/src/main/res/values-fa/types_strings.xml b/android/sdk/src/main/res/values-fa/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-fa/types_strings.xml
rename to android/sdk/src/main/res/values-fa/types_strings.xml
diff --git a/android/app/src/main/res/values-fi/types_strings.xml b/android/sdk/src/main/res/values-fi/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-fi/types_strings.xml
rename to android/sdk/src/main/res/values-fi/types_strings.xml
diff --git a/android/app/src/main/res/values-fr/types_strings.xml b/android/sdk/src/main/res/values-fr/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-fr/types_strings.xml
rename to android/sdk/src/main/res/values-fr/types_strings.xml
diff --git a/android/app/src/main/res/values-gl/types_strings.xml b/android/sdk/src/main/res/values-gl/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-gl/types_strings.xml
rename to android/sdk/src/main/res/values-gl/types_strings.xml
diff --git a/android/app/src/main/res/values-hi/types_strings.xml b/android/sdk/src/main/res/values-hi/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-hi/types_strings.xml
rename to android/sdk/src/main/res/values-hi/types_strings.xml
diff --git a/android/app/src/main/res/values-hu/types_strings.xml b/android/sdk/src/main/res/values-hu/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-hu/types_strings.xml
rename to android/sdk/src/main/res/values-hu/types_strings.xml
diff --git a/android/app/src/main/res/values-ia/types_strings.xml b/android/sdk/src/main/res/values-ia/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-ia/types_strings.xml
rename to android/sdk/src/main/res/values-ia/types_strings.xml
diff --git a/android/app/src/main/res/values-in/types_strings.xml b/android/sdk/src/main/res/values-in/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-in/types_strings.xml
rename to android/sdk/src/main/res/values-in/types_strings.xml
diff --git a/android/app/src/main/res/values-is/types_strings.xml b/android/sdk/src/main/res/values-is/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-is/types_strings.xml
rename to android/sdk/src/main/res/values-is/types_strings.xml
diff --git a/android/app/src/main/res/values-it/types_strings.xml b/android/sdk/src/main/res/values-it/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-it/types_strings.xml
rename to android/sdk/src/main/res/values-it/types_strings.xml
diff --git a/android/app/src/main/res/values-iw/types_strings.xml b/android/sdk/src/main/res/values-iw/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-iw/types_strings.xml
rename to android/sdk/src/main/res/values-iw/types_strings.xml
diff --git a/android/app/src/main/res/values-ja/types_strings.xml b/android/sdk/src/main/res/values-ja/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-ja/types_strings.xml
rename to android/sdk/src/main/res/values-ja/types_strings.xml
diff --git a/android/app/src/main/res/values-ko/types_strings.xml b/android/sdk/src/main/res/values-ko/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-ko/types_strings.xml
rename to android/sdk/src/main/res/values-ko/types_strings.xml
diff --git a/android/app/src/main/res/values-lt/types_strings.xml b/android/sdk/src/main/res/values-lt/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-lt/types_strings.xml
rename to android/sdk/src/main/res/values-lt/types_strings.xml
diff --git a/android/app/src/main/res/values-lv/types_strings.xml b/android/sdk/src/main/res/values-lv/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-lv/types_strings.xml
rename to android/sdk/src/main/res/values-lv/types_strings.xml
diff --git a/android/app/src/main/res/values-mr/types_strings.xml b/android/sdk/src/main/res/values-mr/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-mr/types_strings.xml
rename to android/sdk/src/main/res/values-mr/types_strings.xml
diff --git a/android/app/src/main/res/values-nb/types_strings.xml b/android/sdk/src/main/res/values-nb/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-nb/types_strings.xml
rename to android/sdk/src/main/res/values-nb/types_strings.xml
diff --git a/android/app/src/main/res/values-nl/types_strings.xml b/android/sdk/src/main/res/values-nl/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-nl/types_strings.xml
rename to android/sdk/src/main/res/values-nl/types_strings.xml
diff --git a/android/app/src/main/res/values-pl/types_strings.xml b/android/sdk/src/main/res/values-pl/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-pl/types_strings.xml
rename to android/sdk/src/main/res/values-pl/types_strings.xml
diff --git a/android/app/src/main/res/values-pt-rBR/types_strings.xml b/android/sdk/src/main/res/values-pt-rBR/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-pt-rBR/types_strings.xml
rename to android/sdk/src/main/res/values-pt-rBR/types_strings.xml
diff --git a/android/app/src/main/res/values-pt/types_strings.xml b/android/sdk/src/main/res/values-pt/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-pt/types_strings.xml
rename to android/sdk/src/main/res/values-pt/types_strings.xml
diff --git a/android/app/src/main/res/values-ro/types_strings.xml b/android/sdk/src/main/res/values-ro/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-ro/types_strings.xml
rename to android/sdk/src/main/res/values-ro/types_strings.xml
diff --git a/android/app/src/main/res/values-ru/types_strings.xml b/android/sdk/src/main/res/values-ru/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-ru/types_strings.xml
rename to android/sdk/src/main/res/values-ru/types_strings.xml
diff --git a/android/app/src/main/res/values-sk/types_strings.xml b/android/sdk/src/main/res/values-sk/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-sk/types_strings.xml
rename to android/sdk/src/main/res/values-sk/types_strings.xml
diff --git a/android/app/src/main/res/values-sr/types_strings.xml b/android/sdk/src/main/res/values-sr/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-sr/types_strings.xml
rename to android/sdk/src/main/res/values-sr/types_strings.xml
diff --git a/android/app/src/main/res/values-sv/types_strings.xml b/android/sdk/src/main/res/values-sv/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-sv/types_strings.xml
rename to android/sdk/src/main/res/values-sv/types_strings.xml
diff --git a/android/app/src/main/res/values-sw/types_strings.xml b/android/sdk/src/main/res/values-sw/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-sw/types_strings.xml
rename to android/sdk/src/main/res/values-sw/types_strings.xml
diff --git a/android/app/src/main/res/values-th/types_strings.xml b/android/sdk/src/main/res/values-th/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-th/types_strings.xml
rename to android/sdk/src/main/res/values-th/types_strings.xml
diff --git a/android/app/src/main/res/values-tr/types_strings.xml b/android/sdk/src/main/res/values-tr/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-tr/types_strings.xml
rename to android/sdk/src/main/res/values-tr/types_strings.xml
diff --git a/android/app/src/main/res/values-uk/types_strings.xml b/android/sdk/src/main/res/values-uk/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-uk/types_strings.xml
rename to android/sdk/src/main/res/values-uk/types_strings.xml
diff --git a/android/app/src/main/res/values-vi/types_strings.xml b/android/sdk/src/main/res/values-vi/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-vi/types_strings.xml
rename to android/sdk/src/main/res/values-vi/types_strings.xml
diff --git a/android/app/src/main/res/values-zh-rHK/types_strings.xml b/android/sdk/src/main/res/values-zh-rHK/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-zh-rHK/types_strings.xml
rename to android/sdk/src/main/res/values-zh-rHK/types_strings.xml
diff --git a/android/app/src/main/res/values-zh-rTW/types_strings.xml b/android/sdk/src/main/res/values-zh-rTW/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-zh-rTW/types_strings.xml
rename to android/sdk/src/main/res/values-zh-rTW/types_strings.xml
diff --git a/android/app/src/main/res/values-zh/types_strings.xml b/android/sdk/src/main/res/values-zh/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-zh/types_strings.xml
rename to android/sdk/src/main/res/values-zh/types_strings.xml
diff --git a/android/app/src/main/res/values/types_strings.xml b/android/sdk/src/main/res/values/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values/types_strings.xml
rename to android/sdk/src/main/res/values/types_strings.xml

From d3c64a262b1faaa822e8369c2fbceffbb46152e5 Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Fri, 15 Aug 2025 16:41:36 +0200
Subject: [PATCH 221/302] [android][sdk] Move PrefsManager call outside sdk

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 android/app/src/main/java/app/organicmaps/MwmApplication.java  | 2 ++
 android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/MwmApplication.java b/android/app/src/main/java/app/organicmaps/MwmApplication.java
index 2c9527c45..8b94a74e4 100644
--- a/android/app/src/main/java/app/organicmaps/MwmApplication.java
+++ b/android/app/src/main/java/app/organicmaps/MwmApplication.java
@@ -14,6 +14,7 @@ import androidx.lifecycle.DefaultLifecycleObserver;
 import androidx.lifecycle.LifecycleObserver;
 import androidx.lifecycle.LifecycleOwner;
 import androidx.lifecycle.ProcessLifecycleOwner;
+import androidx.preference.PreferenceManager;
 import app.organicmaps.background.OsmUploadWork;
 import app.organicmaps.downloader.DownloaderNotifier;
 import app.organicmaps.location.TrackRecordingService;
@@ -119,6 +120,7 @@ public class MwmApplication extends Application implements Application.ActivityL
 
     sInstance = this;
 
+    PreferenceManager.setDefaultValues(this, R.xml.prefs_main, false);
     mOrganicMaps =
         new OrganicMaps(getApplicationContext(), BuildConfig.FLAVOR, BuildConfig.APPLICATION_ID,
                         BuildConfig.VERSION_CODE, BuildConfig.VERSION_NAME, BuildConfig.FILE_PROVIDER_AUTHORITY);
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java
index 9187b7988..73f6112c5 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java
@@ -4,7 +4,6 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Build;
 import androidx.annotation.NonNull;
-import androidx.preference.PreferenceManager;
 import app.organicmaps.sdk.R;
 
 public final class Config
@@ -405,8 +404,6 @@ public final class Config
                           @NonNull String applicationId, int versionCode, @NonNull String versionName,
                           @NonNull String fileProviderAuthority)
   {
-    PreferenceManager.setDefaultValues(context, R.xml.prefs_main, false);
-
     mPrefs = prefs;
     mFlavor = flavor;
     mApplicationId = applicationId;

From 431e305a48f58deffc43cc1faaae193bd628dc06 Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Fri, 15 Aug 2025 17:25:39 +0200
Subject: [PATCH 222/302] [android][sdk] Move getDonateUrl outside sdk

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 .../src/main/java/app/organicmaps/MwmActivity.java   |  2 +-
 .../main/java/app/organicmaps/help/HelpFragment.java |  2 +-
 .../organicmaps/maplayer/MapButtonsController.java   |  1 +
 .../src/main/java/app/organicmaps/util/Utils.java    | 12 ++++++++++++
 .../main/java/app/organicmaps/sdk/util/Config.java   |  9 ++-------
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/MwmActivity.java b/android/app/src/main/java/app/organicmaps/MwmActivity.java
index e6b651be9..27c07690f 100644
--- a/android/app/src/main/java/app/organicmaps/MwmActivity.java
+++ b/android/app/src/main/java/app/organicmaps/MwmActivity.java
@@ -2549,7 +2549,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
       items.add(new MenuBottomSheetItem(R.string.download_maps, R.drawable.ic_download, getDownloadMapsCounter(),
                                         this::onDownloadMapsOptionSelected));
 
-      mDonatesUrl = Config.getDonateUrl(getApplicationContext());
+      mDonatesUrl = Utils.getDonateUrl(getApplicationContext());
       if (!mDonatesUrl.isEmpty())
         items.add(new MenuBottomSheetItem(R.string.donate, R.drawable.ic_donate, this::onDonateOptionSelected));
 
diff --git a/android/app/src/main/java/app/organicmaps/help/HelpFragment.java b/android/app/src/main/java/app/organicmaps/help/HelpFragment.java
index f5535e6d6..4b43c0155 100644
--- a/android/app/src/main/java/app/organicmaps/help/HelpFragment.java
+++ b/android/app/src/main/java/app/organicmaps/help/HelpFragment.java
@@ -45,7 +45,7 @@ public class HelpFragment extends BaseMwmFragment implements View.OnClickListene
   @Override
   public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState)
   {
-    mDonateUrl = Config.getDonateUrl(requireContext());
+    mDonateUrl = Utils.getDonateUrl(requireContext());
     View root = inflater.inflate(R.layout.about, container, false);
 
     ((MaterialTextView) root.findViewById(R.id.version)).setText(BuildConfig.VERSION_NAME);
diff --git a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
index 28e760076..02ed48520 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/MapButtonsController.java
@@ -38,6 +38,7 @@ import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.util.ThemeUtils;
 import app.organicmaps.util.UiUtils;
+import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils;
 import app.organicmaps.widget.menu.MyPositionButton;
 import app.organicmaps.widget.placepage.PlacePageViewModel;
diff --git a/android/app/src/main/java/app/organicmaps/util/Utils.java b/android/app/src/main/java/app/organicmaps/util/Utils.java
index 8a13d4e73..ea3dd9ec1 100644
--- a/android/app/src/main/java/app/organicmaps/util/Utils.java
+++ b/android/app/src/main/java/app/organicmaps/util/Utils.java
@@ -39,6 +39,7 @@ import app.organicmaps.BuildConfig;
 import app.organicmaps.MwmActivity;
 import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
+import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.Constants;
 import app.organicmaps.sdk.util.Distance;
 import app.organicmaps.sdk.util.StringUtils;
@@ -482,4 +483,15 @@ public class Utils
     final LocalTime time = LocalTime.now().plusSeconds(seconds);
     return StringUtils.formatUsingUsLocale("%d:%02d", time.getHour(), time.getMinute());
   }
+
+  @NonNull
+  public static String getDonateUrl(@NonNull Context context)
+  {
+    final String url = Config.getDonateUrl();
+    // Enable donations by default if not Google or Huawei. Replace comaps.app/donate/ with localized page.
+    if ((url.isEmpty() && !BuildConfig.FLAVOR.equals("google") && !BuildConfig.FLAVOR.equals("huawei"))
+        || url.endsWith("comaps.app/donate/"))
+      return context.getString(R.string.app_site_url) + "donate/";
+    return url;
+  }
 }
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java
index 73f6112c5..a954f169b 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/Config.java
@@ -390,14 +390,9 @@ public final class Config
   }
 
   @NonNull
-  public static String getDonateUrl(@NonNull Context context)
+  public static String getDonateUrl()
   {
-    final String url = getString(KEY_DONATE_URL);
-    // Enable donations by default if not Google or Huawei. Replace comaps.app/donate/ with localized page.
-    if ((url.isEmpty() && !mFlavor.equals("google") && !mFlavor.equals("huawei"))
-        || url.endsWith("comaps.app/donate/"))
-      return context.getString(R.string.app_site_url) + "donate/";
-    return url;
+    return getString(KEY_DONATE_URL);
   }
 
   public static void init(@NonNull Context context, @NonNull SharedPreferences prefs, @NonNull String flavor,

From d4863643f72277118cfd47a7cbb4b5041b463e2a Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Fri, 15 Aug 2025 17:57:42 +0200
Subject: [PATCH 223/302] [android][sdk] Fix MapManager

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 .../DownloadResourcesLegacyActivity.java      |   7 +-
 .../screens/download/DownloaderScreen.java    |   3 +-
 .../organicmaps/downloader/BottomPanel.java   |   9 +-
 .../downloader/CountrySuggestFragment.java    |   3 +-
 .../downloader/DownloaderAdapter.java         |  13 +-
 .../downloader/MapManagerHelper.java          | 223 ++++++++++++++++++
 .../downloader/OnmapDownloader.java           |  10 +-
 .../routing/RoutingErrorDialogFragment.java   |   3 +-
 .../routing/RoutingMapsDownloadFragment.java  |   3 +-
 .../widget/placepage/PlacePageView.java       |   3 +-
 .../ExpandRetryConfirmationListener.java      |   4 +-
 .../sdk/downloader/MapManager.java            | 179 --------------
 12 files changed, 259 insertions(+), 201 deletions(-)
 create mode 100644 android/app/src/main/java/app/organicmaps/downloader/MapManagerHelper.java
 rename android/{app => sdk}/src/main/java/app/organicmaps/sdk/downloader/MapManager.java (53%)

diff --git a/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java b/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java
index 648a00947..4feaf55b1 100644
--- a/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java
+++ b/android/app/src/main/java/app/organicmaps/DownloadResourcesLegacyActivity.java
@@ -27,6 +27,7 @@ import androidx.annotation.StringRes;
 import androidx.annotation.StyleRes;
 import androidx.core.view.ViewCompat;
 import app.organicmaps.base.BaseMwmFragmentActivity;
+import app.organicmaps.downloader.MapManagerHelper;
 import app.organicmaps.intent.Factory;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.downloader.CountryItem;
@@ -155,7 +156,9 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
           showMap();
           return;
 
-        case CountryItem.STATUS_FAILED: MapManager.showError(DownloadResourcesLegacyActivity.this, item, null); return;
+        case CountryItem.STATUS_FAILED:
+          MapManagerHelper.showError(DownloadResourcesLegacyActivity.this, item, null);
+          return;
         }
       }
     }
@@ -373,7 +376,7 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
         mProgress.setProgressCompat((int) (item.totalSize/100), true);
 
         mCountryDownloadListenerSlot = MapManager.nativeSubscribe(mCountryDownloadListener);
-        MapManager.startDownload(mCurrentCountry);
+        MapManagerHelper.startDownload(mCurrentCountry);
         setAction(PROCEED_TO_MAP);
       }
       else
diff --git a/android/app/src/main/java/app/organicmaps/car/screens/download/DownloaderScreen.java b/android/app/src/main/java/app/organicmaps/car/screens/download/DownloaderScreen.java
index deed7766a..117e6fedc 100644
--- a/android/app/src/main/java/app/organicmaps/car/screens/download/DownloaderScreen.java
+++ b/android/app/src/main/java/app/organicmaps/car/screens/download/DownloaderScreen.java
@@ -12,6 +12,7 @@ import androidx.lifecycle.LifecycleOwner;
 import app.organicmaps.R;
 import app.organicmaps.car.screens.ErrorScreen;
 import app.organicmaps.car.screens.base.BaseScreen;
+import app.organicmaps.downloader.MapManagerHelper;
 import app.organicmaps.sdk.downloader.CountryItem;
 import app.organicmaps.sdk.downloader.MapManager;
 import app.organicmaps.sdk.util.StringUtils;
@@ -169,7 +170,7 @@ class DownloaderScreen extends BaseScreen
     mIsDownloadFailed = true;
     final ErrorScreen.Builder builder = new ErrorScreen.Builder(getCarContext())
                                             .setTitle(R.string.country_status_download_failed)
-                                            .setErrorMessage(MapManager.getErrorCodeStrRes(data.errorCode))
+                                            .setErrorMessage(MapManagerHelper.getErrorCodeStrRes(data.errorCode))
                                             .setPositiveButton(R.string.downloader_retry, null);
     if (!mIsCancelActionDisabled)
       builder.setNegativeButton(R.string.cancel, this::finish);
diff --git a/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java b/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java
index 6403556df..732f15058 100644
--- a/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/BottomPanel.java
@@ -29,7 +29,7 @@ class BottomPanel
     @Override
     public void onClick(View v)
     {
-      MapManager.warn3gAndDownload(mFragment.requireActivity(), mFragment.getCurrentRoot(), null);
+      MapManagerHelper.warn3gAndDownload(mFragment.requireActivity(), mFragment.getCurrentRoot(), null);
     }
   };
 
@@ -38,7 +38,10 @@ class BottomPanel
     public void onClick(View v)
     {
       final String country = mFragment.getCurrentRoot();
-      MapManager.warnOn3gUpdate(mFragment.requireActivity(), country, () -> MapManager.startUpdate(country));
+      MapManagerHelper.warnOn3gUpdate(mFragment.requireActivity(), country, () -> {
+        DownloaderService.startForegroundService();
+        MapManagerHelper.startUpdate(country);
+      });
     }
   };
 
@@ -55,7 +58,7 @@ class BottomPanel
     @Override
     public void onClick(View v)
     {
-      MapManager.warn3gAndRetry(mFragment.requireActivity(), mFragment.getCurrentRoot(), null);
+      MapManagerHelper.warn3gAndRetry(mFragment.requireActivity(), mFragment.getCurrentRoot(), null);
     }
   };
 
diff --git a/android/app/src/main/java/app/organicmaps/downloader/CountrySuggestFragment.java b/android/app/src/main/java/app/organicmaps/downloader/CountrySuggestFragment.java
index 78a068464..9c0c7c7e0 100644
--- a/android/app/src/main/java/app/organicmaps/downloader/CountrySuggestFragment.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/CountrySuggestFragment.java
@@ -198,7 +198,8 @@ public class CountrySuggestFragment extends BaseMwmFragment implements View.OnCl
     final int id = v.getId();
     if (id == R.id.btn__download_map)
     {
-      MapManager.warn3gAndDownload(requireActivity(), mCurrentCountry.id, () -> mDownloadingCountry = mCurrentCountry);
+      MapManagerHelper.warn3gAndDownload(requireActivity(), mCurrentCountry.id,
+                                         () -> mDownloadingCountry = mCurrentCountry);
     }
     else if (id == R.id.btn__select_map)
     {
diff --git a/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java b/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java
index 197bb3ce4..e96b86338 100644
--- a/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/DownloaderAdapter.java
@@ -93,7 +93,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
 
   private void onDownloadActionSelected(final CountryItem item, DownloaderAdapter adapter)
   {
-    MapManager.warn3gAndDownload(adapter.mActivity, item.id, null);
+    MapManagerHelper.warn3gAndDownload(adapter.mActivity, item.id, null);
   }
 
   private void onUpdateActionSelected(final CountryItem item, DownloaderAdapter adapter)
@@ -101,7 +101,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
     item.update();
     if (item.status != CountryItem.STATUS_UPDATABLE)
       return;
-    MapManager.warnOn3gUpdate(adapter.mActivity, item.id, () -> MapManager.startUpdate(item.id));
+    MapManagerHelper.warnOn3gUpdate(adapter.mActivity, item.id, () -> MapManagerHelper.startUpdate(item.id));
   }
 
   private void onExploreActionSelected(CountryItem item, DownloaderAdapter adapter)
@@ -206,7 +206,7 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
       {
         if (item.isLeafNode && item.newStatus == CountryItem.STATUS_FAILED)
         {
-          MapManager.showError(mActivity, item, null);
+          MapManagerHelper.showError(mActivity, item, null);
           break;
         }
       }
@@ -382,9 +382,12 @@ class DownloaderAdapter extends RecyclerView.Adapter<DownloaderAdapter.ViewHolde
         else
           processLongClick();
       }
-      case CountryItem.STATUS_FAILED -> MapManager.warn3gAndRetry(mActivity, mItem.id, null);
+      case CountryItem.STATUS_FAILED ->
+      {
+        MapManagerHelper.warn3gAndRetry(mActivity, mItem.id, null);
+      }
       case CountryItem.STATUS_UPDATABLE ->
-        MapManager.warnOn3gUpdate(mActivity, mItem.id, () -> MapManager.startUpdate(mItem.id));
+        MapManagerHelper.warnOn3gUpdate(mActivity, mItem.id, () -> MapManagerHelper.startUpdate(mItem.id));
       default -> throw new IllegalArgumentException("Inappropriate item status: " + mItem.status);
       }
     }
diff --git a/android/app/src/main/java/app/organicmaps/downloader/MapManagerHelper.java b/android/app/src/main/java/app/organicmaps/downloader/MapManagerHelper.java
new file mode 100644
index 000000000..66fcb2314
--- /dev/null
+++ b/android/app/src/main/java/app/organicmaps/downloader/MapManagerHelper.java
@@ -0,0 +1,223 @@
+package app.organicmaps.downloader;
+
+import android.app.Activity;
+import android.text.TextUtils;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.appcompat.app.AlertDialog;
+import androidx.core.util.Consumer;
+import app.organicmaps.R;
+import app.organicmaps.sdk.downloader.CountryItem;
+import app.organicmaps.sdk.downloader.ExpandRetryConfirmationListener;
+import app.organicmaps.sdk.downloader.MapManager;
+import app.organicmaps.sdk.util.ConnectionState;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import java.lang.ref.WeakReference;
+
+public class MapManagerHelper
+{
+  private static WeakReference<AlertDialog> sCurrentErrorDialog;
+
+  @StringRes
+  public static int getErrorCodeStrRes(final int errorCode)
+  {
+    return switch (errorCode)
+    {
+      case CountryItem.ERROR_NO_INTERNET -> R.string.common_check_internet_connection_dialog;
+      case CountryItem.ERROR_OOM -> R.string.downloader_no_space_title;
+      default -> throw new IllegalArgumentException("Given error can not be displayed: " + errorCode);
+    };
+  }
+
+  public static void showError(final Activity activity, final MapManager.StorageCallbackData errorData,
+                               @Nullable final Consumer<Boolean> dialogClickListener)
+  {
+    if (!MapManager.nativeIsAutoretryFailed())
+      return;
+
+    showErrorDialog(activity, errorData, dialogClickListener);
+  }
+
+  public static void showErrorDialog(final Activity activity, final MapManager.StorageCallbackData errorData,
+                                     @Nullable final Consumer<Boolean> dialogClickListener)
+  {
+    if (sCurrentErrorDialog != null)
+    {
+      AlertDialog dlg = sCurrentErrorDialog.get();
+      if (dlg != null && dlg.isShowing())
+        return;
+    }
+
+    final AlertDialog dlg = new MaterialAlertDialogBuilder(activity, R.style.MwmTheme_AlertDialog)
+                                .setTitle(R.string.country_status_download_failed)
+                                .setMessage(getErrorCodeStrRes(errorData.errorCode))
+                                .setNegativeButton(R.string.cancel,
+                                                   (dialog, which) -> {
+                                                     sCurrentErrorDialog = null;
+                                                     if (dialogClickListener != null)
+                                                       dialogClickListener.accept(false);
+                                                   })
+                                .setPositiveButton(R.string.downloader_retry,
+                                                   (dialog, which) -> {
+                                                     ExpandRetryConfirmationListener listener =
+                                                         new ExpandRetryConfirmationListener(dialogClickListener);
+                                                     warn3gAndRetry(activity, errorData.countryId, listener);
+                                                   })
+                                .create();
+    dlg.setCanceledOnTouchOutside(false);
+    dlg.show();
+    sCurrentErrorDialog = new WeakReference<>(dlg);
+  }
+
+  private static void notifyNoSpaceInternal(Activity activity)
+  {
+    new MaterialAlertDialogBuilder(activity, R.style.MwmTheme_AlertDialog)
+        .setTitle(R.string.downloader_no_space_title)
+        .setMessage(R.string.downloader_no_space_message)
+        .setPositiveButton(android.R.string.ok, null)
+        .show();
+  }
+
+  /**
+   * @return true if there is no space to update the given {@code root}, so the alert dialog will be shown.
+   */
+  private static boolean notifyNoSpaceToUpdate(Activity activity, String root)
+  {
+    if (MapManager.nativeHasSpaceToUpdate(root))
+      return false;
+
+    notifyNoSpaceInternal(activity);
+    return true;
+  }
+
+  /**
+   * @return true if there is no space to download the given {@code root}, so the alert dialog will be shown.
+   */
+  private static boolean notifyNoSpace(Activity activity, String root)
+  {
+    if (MapManager.nativeHasSpaceToDownloadCountry(root))
+      return false;
+
+    notifyNoSpaceInternal(activity);
+    return true;
+  }
+
+  /**
+   * @return true if there is no space to download {@code size} bytes, so the alert dialog will be shown.
+   */
+  private static boolean notifyNoSpace(Activity activity, long size)
+  {
+    if (MapManager.nativeHasSpaceToDownloadAmount(size))
+      return false;
+
+    notifyNoSpaceInternal(activity);
+    return true;
+  }
+
+  private static boolean warnOn3gInternal(Activity activity, @NonNull final Runnable onAcceptListener)
+  {
+    if (MapManager.nativeIsDownloadOn3gEnabled() || !ConnectionState.INSTANCE.isMobileConnected())
+    {
+      onAcceptListener.run();
+      return false;
+    }
+
+    new MaterialAlertDialogBuilder(activity, R.style.MwmTheme_AlertDialog)
+        .setTitle(R.string.download_over_mobile_header)
+        .setMessage(R.string.download_over_mobile_message)
+        .setNegativeButton(R.string.cancel, null)
+        .setPositiveButton(R.string.ok,
+                           (dlg, which) -> {
+                             MapManager.nativeEnableDownloadOn3g();
+                             onAcceptListener.run();
+                           })
+        .show();
+
+    return true;
+  }
+
+  public static boolean warnOn3gUpdate(Activity activity, @Nullable String countryId,
+                                       @NonNull final Runnable onAcceptListener)
+  {
+    // noinspection SimplifiableIfStatement
+    if (TextUtils.isEmpty(countryId) || !notifyNoSpaceToUpdate(activity, countryId))
+      return warnOn3gInternal(activity, onAcceptListener);
+
+    return true;
+  }
+
+  public static boolean warnOn3g(Activity activity, @Nullable String countryId,
+                                 @NonNull final Runnable onAcceptListener)
+  {
+    // noinspection SimplifiableIfStatement
+    if (TextUtils.isEmpty(countryId) || !notifyNoSpace(activity, countryId))
+      return warnOn3gInternal(activity, onAcceptListener);
+
+    return true;
+  }
+
+  public static boolean warnOn3g(Activity activity, long size, @NonNull Runnable onAcceptListener)
+  {
+    return !notifyNoSpace(activity, size) && warnOn3gInternal(activity, onAcceptListener);
+  }
+
+  public static boolean warn3gAndDownload(Activity activity, final String countryId,
+                                          @Nullable final Runnable onAcceptListener)
+  {
+    return warnOn3g(activity, countryId, () -> {
+      if (onAcceptListener != null)
+        onAcceptListener.run();
+      startDownload(countryId);
+    });
+  }
+
+  public static boolean warn3gAndRetry(Activity activity, final String countryId,
+                                       @Nullable final Runnable onAcceptListener)
+  {
+    return warnOn3g(activity, countryId, () -> {
+      if (onAcceptListener != null)
+        onAcceptListener.run();
+      retryDownload(countryId);
+    });
+  }
+
+  /**
+   * Enqueues failed items under given {@code root} node in downloader.
+   */
+  public static void retryDownload(@NonNull String countryId)
+  {
+    DownloaderService.startForegroundService();
+    MapManager.retryDownload(countryId);
+  }
+
+  /**
+   * Enqueues given {@code root} node with its children in downloader.
+   */
+  public static void startUpdate(@NonNull String root)
+  {
+    DownloaderService.startForegroundService();
+    MapManager.startUpdate(root);
+  }
+
+  /**
+   * Enqueues the given list of nodes and its children in downloader.
+   */
+  public static void startDownload(String... countries)
+  {
+    DownloaderService.startForegroundService();
+    for (var countryId : countries)
+    {
+      MapManager.startDownload(countryId);
+    }
+  }
+
+  /**
+   * Enqueues given {@code root} node and its children in downloader.
+   */
+  public static void startDownload(@NonNull String countryId)
+  {
+    DownloaderService.startForegroundService();
+    MapManager.startDownload(countryId);
+  }
+}
diff --git a/android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java b/android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java
index d54ba531c..a08f20e71 100644
--- a/android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java
+++ b/android/app/src/main/java/app/organicmaps/downloader/OnmapDownloader.java
@@ -52,7 +52,7 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
           continue;
 
         if (item.newStatus == CountryItem.STATUS_FAILED)
-          MapManager.showError(mActivity, item, null);
+          MapManagerHelper.showError(mActivity, item, null);
 
         if (mCurrentCountry.id.equals(item.countryId))
         {
@@ -163,7 +163,7 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
                 if (TextUtils.equals(mCurrentCountry.id, country)
                     && MapManager.nativeHasSpaceToDownloadCountry(country))
                 {
-                  MapManager.startDownload(mCurrentCountry.id);
+                  MapManagerHelper.startDownload(mCurrentCountry.id);
                 }
               }
             }
@@ -199,18 +199,18 @@ public class OnmapDownloader implements MwmActivity.LeftAnimationTrackListener
       setAutodownloadLocked(true);
     });
     mButton.setOnClickListener(
-        v -> MapManager.warnOn3g(mActivity, mCurrentCountry == null ? null : mCurrentCountry.id, () -> {
+        v -> MapManagerHelper.warnOn3g(mActivity, mCurrentCountry == null ? null : mCurrentCountry.id, () -> {
           if (mCurrentCountry == null)
             return;
 
           boolean retry = (mCurrentCountry.status == CountryItem.STATUS_FAILED);
           if (retry)
           {
-            MapManager.retryDownload(mCurrentCountry.id);
+            MapManagerHelper.retryDownload(mCurrentCountry.id);
           }
           else
           {
-            MapManager.startDownload(mCurrentCountry.id);
+            MapManagerHelper.startDownload(mCurrentCountry.id);
             mActivity.requestPostNotificationsPermission();
           }
         }));
diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingErrorDialogFragment.java b/android/app/src/main/java/app/organicmaps/routing/RoutingErrorDialogFragment.java
index bb521d424..66c4f5bc1 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingErrorDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingErrorDialogFragment.java
@@ -14,6 +14,7 @@ import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.FragmentFactory;
 import androidx.fragment.app.FragmentManager;
 import app.organicmaps.R;
+import app.organicmaps.downloader.MapManagerHelper;
 import app.organicmaps.sdk.downloader.CountryItem;
 import app.organicmaps.sdk.downloader.MapManager;
 import app.organicmaps.util.UiUtils;
@@ -108,7 +109,7 @@ public class RoutingErrorDialogFragment extends BaseRoutingErrorDialogFragment
       }
     }
 
-    MapManager.warnOn3g(requireActivity(), size, () -> {
+    MapManagerHelper.warnOn3g(requireActivity(), size, () -> {
       final FragmentManager manager = requireActivity().getSupportFragmentManager();
       RoutingMapsDownloadFragment downloader =
           RoutingMapsDownloadFragment.create(manager.getFragmentFactory(), getAppContextOrThrow(), mMapsArray);
diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingMapsDownloadFragment.java b/android/app/src/main/java/app/organicmaps/routing/RoutingMapsDownloadFragment.java
index c5150c9d0..fd8a225f2 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingMapsDownloadFragment.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingMapsDownloadFragment.java
@@ -9,6 +9,7 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.FragmentFactory;
 import app.organicmaps.R;
+import app.organicmaps.downloader.MapManagerHelper;
 import app.organicmaps.sdk.downloader.CountryItem;
 import app.organicmaps.sdk.downloader.MapManager;
 import app.organicmaps.sdk.routing.RoutingController;
@@ -40,7 +41,7 @@ public class RoutingMapsDownloadFragment extends BaseRoutingErrorDialogFragment
       mMapsArray[i] = item.id;
     }
 
-    MapManager.startDownload(mMapsArray);
+    MapManagerHelper.startDownload(mMapsArray);
   }
 
   private View setupFrame(View frame)
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
index f89300846..f0a186d67 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
@@ -37,6 +37,7 @@ import app.organicmaps.R;
 import app.organicmaps.bookmarks.BookmarksSharingHelper;
 import app.organicmaps.bookmarks.ChooseBookmarkCategoryFragment;
 import app.organicmaps.downloader.DownloaderStatusIcon;
+import app.organicmaps.downloader.MapManagerHelper;
 import app.organicmaps.editor.OhState;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.bookmarks.data.Bookmark;
@@ -974,7 +975,7 @@ public class PlacePageView extends Fragment
       mStorageCallbackSlot = MapManager.nativeSubscribe(mStorageCallback);
 
     mDownloaderIcon
-        .setOnIconClickListener((v) -> MapManager.warn3gAndDownload(requireActivity(), mCurrentCountry.id, null))
+        .setOnIconClickListener((v) -> MapManagerHelper.warn3gAndDownload(requireActivity(), mCurrentCountry.id, null))
         .setOnCancelClickListener((v) -> MapManager.nativeCancel(mCurrentCountry.id));
     mDownloaderIcon.show(true);
     UiUtils.show(mDownloaderInfo);
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/downloader/ExpandRetryConfirmationListener.java b/android/sdk/src/main/java/app/organicmaps/sdk/downloader/ExpandRetryConfirmationListener.java
index 29e05694b..be9f407c7 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/downloader/ExpandRetryConfirmationListener.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/downloader/ExpandRetryConfirmationListener.java
@@ -3,12 +3,12 @@ package app.organicmaps.sdk.downloader;
 import androidx.annotation.Nullable;
 import androidx.core.util.Consumer;
 
-class ExpandRetryConfirmationListener implements Runnable
+public class ExpandRetryConfirmationListener implements Runnable
 {
   @Nullable
   private final Consumer<Boolean> mDialogClickListener;
 
-  ExpandRetryConfirmationListener(@Nullable Consumer<Boolean> dialogClickListener)
+  public ExpandRetryConfirmationListener(@Nullable Consumer<Boolean> dialogClickListener)
   {
     mDialogClickListener = dialogClickListener;
   }
diff --git a/android/app/src/main/java/app/organicmaps/sdk/downloader/MapManager.java b/android/sdk/src/main/java/app/organicmaps/sdk/downloader/MapManager.java
similarity index 53%
rename from android/app/src/main/java/app/organicmaps/sdk/downloader/MapManager.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/downloader/MapManager.java
index d98778132..e879d1f26 100644
--- a/android/app/src/main/java/app/organicmaps/sdk/downloader/MapManager.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/downloader/MapManager.java
@@ -1,19 +1,9 @@
 package app.organicmaps.sdk.downloader;
 
-import android.app.Activity;
-import android.text.TextUtils;
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.StringRes;
 import androidx.annotation.UiThread;
-import androidx.appcompat.app.AlertDialog;
-import androidx.core.util.Consumer;
-import app.organicmaps.R;
-import app.organicmaps.downloader.DownloaderService;
-import app.organicmaps.sdk.util.ConnectionState;
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import java.lang.ref.WeakReference;
 import java.util.List;
 
 @UiThread
@@ -56,179 +46,13 @@ public final class MapManager
     void onCurrentCountryChanged(String countryId);
   }
 
-  private static WeakReference<AlertDialog> sCurrentErrorDialog;
-
   private MapManager() {}
 
-  @StringRes
-  public static int getErrorCodeStrRes(final int errorCode)
-  {
-    return switch (errorCode)
-    {
-      case CountryItem.ERROR_NO_INTERNET -> R.string.common_check_internet_connection_dialog;
-      case CountryItem.ERROR_OOM -> R.string.downloader_no_space_title;
-      default -> throw new IllegalArgumentException("Given error can not be displayed: " + errorCode);
-    };
-  }
-
-  public static void showError(final Activity activity, final StorageCallbackData errorData,
-                               @Nullable final Consumer<Boolean> dialogClickListener)
-  {
-    if (!nativeIsAutoretryFailed())
-      return;
-
-    showErrorDialog(activity, errorData, dialogClickListener);
-  }
-
-  public static void showErrorDialog(final Activity activity, final StorageCallbackData errorData,
-                                     @Nullable final Consumer<Boolean> dialogClickListener)
-  {
-    if (sCurrentErrorDialog != null)
-    {
-      AlertDialog dlg = sCurrentErrorDialog.get();
-      if (dlg != null && dlg.isShowing())
-        return;
-    }
-
-    final AlertDialog dlg = new MaterialAlertDialogBuilder(activity, R.style.MwmTheme_AlertDialog)
-                                .setTitle(R.string.country_status_download_failed)
-                                .setMessage(getErrorCodeStrRes(errorData.errorCode))
-                                .setNegativeButton(R.string.cancel,
-                                                   (dialog, which) -> {
-                                                     sCurrentErrorDialog = null;
-                                                     if (dialogClickListener != null)
-                                                       dialogClickListener.accept(false);
-                                                   })
-                                .setPositiveButton(R.string.downloader_retry,
-                                                   (dialog, which) -> {
-                                                     ExpandRetryConfirmationListener listener =
-                                                         new ExpandRetryConfirmationListener(dialogClickListener);
-                                                     warn3gAndRetry(activity, errorData.countryId, listener);
-                                                   })
-                                .create();
-    dlg.setCanceledOnTouchOutside(false);
-    dlg.show();
-    sCurrentErrorDialog = new WeakReference<>(dlg);
-  }
-
-  private static void notifyNoSpaceInternal(Activity activity)
-  {
-    new MaterialAlertDialogBuilder(activity, R.style.MwmTheme_AlertDialog)
-        .setTitle(R.string.downloader_no_space_title)
-        .setMessage(R.string.downloader_no_space_message)
-        .setPositiveButton(android.R.string.ok, null)
-        .show();
-  }
-
-  /**
-   * @return true if there is no space to update the given {@code root}, so the alert dialog will be shown.
-   */
-  private static boolean notifyNoSpaceToUpdate(Activity activity, String root)
-  {
-    if (nativeHasSpaceToUpdate(root))
-      return false;
-
-    notifyNoSpaceInternal(activity);
-    return true;
-  }
-
-  /**
-   * @return true if there is no space to download the given {@code root}, so the alert dialog will be shown.
-   */
-  private static boolean notifyNoSpace(Activity activity, String root)
-  {
-    if (nativeHasSpaceToDownloadCountry(root))
-      return false;
-
-    notifyNoSpaceInternal(activity);
-    return true;
-  }
-
-  /**
-   * @return true if there is no space to download {@code size} bytes, so the alert dialog will be shown.
-   */
-  private static boolean notifyNoSpace(Activity activity, long size)
-  {
-    if (nativeHasSpaceToDownloadAmount(size))
-      return false;
-
-    notifyNoSpaceInternal(activity);
-    return true;
-  }
-
-  private static boolean warnOn3gInternal(Activity activity, @NonNull final Runnable onAcceptListener)
-  {
-    if (nativeIsDownloadOn3gEnabled() || !ConnectionState.INSTANCE.isMobileConnected())
-    {
-      onAcceptListener.run();
-      return false;
-    }
-
-    new MaterialAlertDialogBuilder(activity, R.style.MwmTheme_AlertDialog)
-        .setTitle(R.string.download_over_mobile_header)
-        .setMessage(R.string.download_over_mobile_message)
-        .setNegativeButton(R.string.cancel, null)
-        .setPositiveButton(R.string.ok,
-                           (dlg, which) -> {
-                             nativeEnableDownloadOn3g();
-                             onAcceptListener.run();
-                           })
-        .show();
-
-    return true;
-  }
-
-  public static boolean warnOn3gUpdate(Activity activity, @Nullable String countryId,
-                                       @NonNull final Runnable onAcceptListener)
-  {
-    // noinspection SimplifiableIfStatement
-    if (TextUtils.isEmpty(countryId) || !notifyNoSpaceToUpdate(activity, countryId))
-      return warnOn3gInternal(activity, onAcceptListener);
-
-    return true;
-  }
-
-  public static boolean warnOn3g(Activity activity, @Nullable String countryId,
-                                 @NonNull final Runnable onAcceptListener)
-  {
-    // noinspection SimplifiableIfStatement
-    if (TextUtils.isEmpty(countryId) || !notifyNoSpace(activity, countryId))
-      return warnOn3gInternal(activity, onAcceptListener);
-
-    return true;
-  }
-
-  public static boolean warnOn3g(Activity activity, long size, @NonNull Runnable onAcceptListener)
-  {
-    return !notifyNoSpace(activity, size) && warnOn3gInternal(activity, onAcceptListener);
-  }
-
-  public static boolean warn3gAndDownload(Activity activity, final String countryId,
-                                          @Nullable final Runnable onAcceptListener)
-  {
-    return warnOn3g(activity, countryId, () -> {
-      if (onAcceptListener != null)
-        onAcceptListener.run();
-      startDownload(countryId);
-    });
-  }
-
-  public static boolean warn3gAndRetry(Activity activity, final String countryId,
-                                       @Nullable final Runnable onAcceptListener)
-  {
-    return warnOn3g(activity, countryId, () -> {
-      if (onAcceptListener != null)
-        onAcceptListener.run();
-      retryDownload(countryId);
-    });
-  }
-
   /**
    * Enqueues failed items under given {@code root} node in downloader.
    */
   public static void retryDownload(@NonNull String countryId)
   {
-    DownloaderService.startForegroundService();
     nativeRetry(countryId);
   }
 
@@ -237,7 +61,6 @@ public final class MapManager
    */
   public static void startUpdate(@NonNull String root)
   {
-    DownloaderService.startForegroundService();
     nativeUpdate(root);
   }
 
@@ -246,7 +69,6 @@ public final class MapManager
    */
   public static void startDownload(String... countries)
   {
-    DownloaderService.startForegroundService();
     for (var countryId : countries)
     {
       nativeDownload(countryId);
@@ -258,7 +80,6 @@ public final class MapManager
    */
   public static void startDownload(@NonNull String countryId)
   {
-    DownloaderService.startForegroundService();
     nativeDownload(countryId);
   }
 

From 802f54494a677943e0b8068b19a028cf5b92376f Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Fri, 15 Aug 2025 18:27:28 +0200
Subject: [PATCH 224/302] [android][sdk] Fix location provider

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 .../app/src/fdroid/java/app/organicmaps/location |  1 +
 .../src/fdroid/java/app/organicmaps/sdk/location |  1 -
 .../location/GoogleFusedLocationProvider.java    |  3 ++-
 .../LocationProviderFactoryImpl.java}            | 14 ++++++++------
 .../app/src/huawei/java/app/organicmaps/location |  1 +
 .../src/huawei/java/app/organicmaps/sdk/location |  1 -
 .../java/app/organicmaps/MwmApplication.java     | 16 +++++++++++++---
 .../settings/SettingsPrefsFragment.java          |  5 +++--
 .../app/src/web/java/app/organicmaps/location    |  1 +
 .../src/web/java/app/organicmaps/sdk/location    |  1 -
 .../java/app/organicmaps/sdk/OrganicMaps.java    |  9 +++++----
 .../sdk/location/AndroidNativeProvider.java      |  4 ++--
 .../sdk/location/BaseLocationProvider.java       |  4 ++--
 .../organicmaps/sdk/location/LocationHelper.java |  4 ++--
 .../sdk/location/LocationProviderFactory.java    | 11 +++++++++++
 15 files changed, 51 insertions(+), 25 deletions(-)
 create mode 120000 android/app/src/fdroid/java/app/organicmaps/location
 delete mode 120000 android/app/src/fdroid/java/app/organicmaps/sdk/location
 rename android/app/src/google/java/app/organicmaps/{sdk => }/location/GoogleFusedLocationProvider.java (98%)
 rename android/app/src/google/java/app/organicmaps/{sdk/location/LocationProviderFactory.java => location/LocationProviderFactoryImpl.java} (56%)
 create mode 120000 android/app/src/huawei/java/app/organicmaps/location
 delete mode 120000 android/app/src/huawei/java/app/organicmaps/sdk/location
 create mode 120000 android/app/src/web/java/app/organicmaps/location
 delete mode 120000 android/app/src/web/java/app/organicmaps/sdk/location
 create mode 100644 android/sdk/src/main/java/app/organicmaps/sdk/location/LocationProviderFactory.java

diff --git a/android/app/src/fdroid/java/app/organicmaps/location b/android/app/src/fdroid/java/app/organicmaps/location
new file mode 120000
index 000000000..c3bacf635
--- /dev/null
+++ b/android/app/src/fdroid/java/app/organicmaps/location
@@ -0,0 +1 @@
+../../../../google/java/app/organicmaps/location
\ No newline at end of file
diff --git a/android/app/src/fdroid/java/app/organicmaps/sdk/location b/android/app/src/fdroid/java/app/organicmaps/sdk/location
deleted file mode 120000
index f41d2255b..000000000
--- a/android/app/src/fdroid/java/app/organicmaps/sdk/location
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../google/java/app/organicmaps/sdk/location
\ No newline at end of file
diff --git a/android/app/src/google/java/app/organicmaps/sdk/location/GoogleFusedLocationProvider.java b/android/app/src/google/java/app/organicmaps/location/GoogleFusedLocationProvider.java
similarity index 98%
rename from android/app/src/google/java/app/organicmaps/sdk/location/GoogleFusedLocationProvider.java
rename to android/app/src/google/java/app/organicmaps/location/GoogleFusedLocationProvider.java
index 22182ceb8..fdcf24964 100644
--- a/android/app/src/google/java/app/organicmaps/sdk/location/GoogleFusedLocationProvider.java
+++ b/android/app/src/google/java/app/organicmaps/location/GoogleFusedLocationProvider.java
@@ -1,4 +1,4 @@
-package app.organicmaps.sdk.location;
+package app.organicmaps.location;
 
 import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
 import static android.Manifest.permission.ACCESS_FINE_LOCATION;
@@ -10,6 +10,7 @@ import android.location.Location;
 import android.os.Looper;
 import androidx.annotation.NonNull;
 import androidx.annotation.RequiresPermission;
+import app.organicmaps.sdk.location.BaseLocationProvider;
 import app.organicmaps.sdk.util.LocationUtils;
 import app.organicmaps.sdk.util.log.Logger;
 import com.google.android.gms.common.api.ApiException;
diff --git a/android/app/src/google/java/app/organicmaps/sdk/location/LocationProviderFactory.java b/android/app/src/google/java/app/organicmaps/location/LocationProviderFactoryImpl.java
similarity index 56%
rename from android/app/src/google/java/app/organicmaps/sdk/location/LocationProviderFactory.java
rename to android/app/src/google/java/app/organicmaps/location/LocationProviderFactoryImpl.java
index eea7c1207..f5afff6dd 100644
--- a/android/app/src/google/java/app/organicmaps/sdk/location/LocationProviderFactory.java
+++ b/android/app/src/google/java/app/organicmaps/location/LocationProviderFactoryImpl.java
@@ -1,23 +1,25 @@
-package app.organicmaps.sdk.location;
+package app.organicmaps.location;
 
 import android.content.Context;
 import androidx.annotation.NonNull;
+import app.organicmaps.sdk.location.AndroidNativeProvider;
+import app.organicmaps.sdk.location.BaseLocationProvider;
+import app.organicmaps.sdk.location.LocationProviderFactory;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.log.Logger;
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.GoogleApiAvailability;
 
-public class LocationProviderFactory
+public class LocationProviderFactoryImpl implements LocationProviderFactory
 {
-  private static final String TAG = LocationProviderFactory.class.getSimpleName();
+  private static final String TAG = LocationProviderFactoryImpl.class.getSimpleName();
 
-  public static boolean isGoogleLocationAvailable(@NonNull Context context)
+  public boolean isGoogleLocationAvailable(@NonNull Context context)
   {
     return GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(context) == ConnectionResult.SUCCESS;
   }
 
-  public static BaseLocationProvider getProvider(@NonNull Context context,
-                                                 @NonNull BaseLocationProvider.Listener listener)
+  public BaseLocationProvider getProvider(@NonNull Context context, @NonNull BaseLocationProvider.Listener listener)
   {
     if (isGoogleLocationAvailable(context) && Config.useGoogleServices())
     {
diff --git a/android/app/src/huawei/java/app/organicmaps/location b/android/app/src/huawei/java/app/organicmaps/location
new file mode 120000
index 000000000..c3bacf635
--- /dev/null
+++ b/android/app/src/huawei/java/app/organicmaps/location
@@ -0,0 +1 @@
+../../../../google/java/app/organicmaps/location
\ No newline at end of file
diff --git a/android/app/src/huawei/java/app/organicmaps/sdk/location b/android/app/src/huawei/java/app/organicmaps/sdk/location
deleted file mode 120000
index f41d2255b..000000000
--- a/android/app/src/huawei/java/app/organicmaps/sdk/location
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../google/java/app/organicmaps/sdk/location
\ No newline at end of file
diff --git a/android/app/src/main/java/app/organicmaps/MwmApplication.java b/android/app/src/main/java/app/organicmaps/MwmApplication.java
index 8b94a74e4..5104468dc 100644
--- a/android/app/src/main/java/app/organicmaps/MwmApplication.java
+++ b/android/app/src/main/java/app/organicmaps/MwmApplication.java
@@ -17,6 +17,7 @@ import androidx.lifecycle.ProcessLifecycleOwner;
 import androidx.preference.PreferenceManager;
 import app.organicmaps.background.OsmUploadWork;
 import app.organicmaps.downloader.DownloaderNotifier;
+import app.organicmaps.location.LocationProviderFactoryImpl;
 import app.organicmaps.location.TrackRecordingService;
 import app.organicmaps.routing.NavigationService;
 import app.organicmaps.sdk.Map;
@@ -42,6 +43,9 @@ public class MwmApplication extends Application implements Application.ActivityL
   @NonNull
   private static final String TAG = MwmApplication.class.getSimpleName();
 
+  @NonNull
+  private final LocationProviderFactoryImpl mLocationProviderFactory = new LocationProviderFactoryImpl();
+
   @SuppressWarnings("NotNullFieldNotInitialized")
   @NonNull
   private OrganicMaps mOrganicMaps;
@@ -100,6 +104,12 @@ public class MwmApplication extends Application implements Application.ActivityL
     return mOrganicMaps;
   }
 
+  @NonNull
+  public LocationProviderFactoryImpl getLocationProviderFactory()
+  {
+    return mLocationProviderFactory;
+  }
+
   @NonNull
   public static MwmApplication from(@NonNull Context context)
   {
@@ -121,9 +131,9 @@ public class MwmApplication extends Application implements Application.ActivityL
     sInstance = this;
 
     PreferenceManager.setDefaultValues(this, R.xml.prefs_main, false);
-    mOrganicMaps =
-        new OrganicMaps(getApplicationContext(), BuildConfig.FLAVOR, BuildConfig.APPLICATION_ID,
-                        BuildConfig.VERSION_CODE, BuildConfig.VERSION_NAME, BuildConfig.FILE_PROVIDER_AUTHORITY);
+    mOrganicMaps = new OrganicMaps(getApplicationContext(), BuildConfig.FLAVOR, BuildConfig.APPLICATION_ID,
+                                   BuildConfig.VERSION_CODE, BuildConfig.VERSION_NAME,
+                                   BuildConfig.FILE_PROVIDER_AUTHORITY, mLocationProviderFactory);
 
     ConnectionState.INSTANCE.initialize(this);
 
diff --git a/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java b/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
index d63401bea..9fd2b0a67 100644
--- a/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
+++ b/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
@@ -24,7 +24,6 @@ import app.organicmaps.sdk.downloader.MapManager;
 import app.organicmaps.sdk.editor.OsmOAuth;
 import app.organicmaps.sdk.editor.data.Language;
 import app.organicmaps.sdk.location.LocationHelper;
-import app.organicmaps.sdk.location.LocationProviderFactory;
 import app.organicmaps.sdk.routing.RoutingOptions;
 import app.organicmaps.sdk.search.SearchRecents;
 import app.organicmaps.sdk.settings.MapLanguageCode;
@@ -307,7 +306,9 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
     if (pref == null)
       return;
 
-    if (!LocationProviderFactory.isGoogleLocationAvailable(requireActivity().getApplicationContext()))
+    if (!MwmApplication.from(requireContext())
+             .getLocationProviderFactory()
+             .isGoogleLocationAvailable(requireActivity().getApplicationContext()))
       removePreference(getString(R.string.pref_privacy), pref);
     else
     {
diff --git a/android/app/src/web/java/app/organicmaps/location b/android/app/src/web/java/app/organicmaps/location
new file mode 120000
index 000000000..c3bacf635
--- /dev/null
+++ b/android/app/src/web/java/app/organicmaps/location
@@ -0,0 +1 @@
+../../../../google/java/app/organicmaps/location
\ No newline at end of file
diff --git a/android/app/src/web/java/app/organicmaps/sdk/location b/android/app/src/web/java/app/organicmaps/sdk/location
deleted file mode 120000
index f41d2255b..000000000
--- a/android/app/src/web/java/app/organicmaps/sdk/location
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../google/java/app/organicmaps/sdk/location
\ No newline at end of file
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/OrganicMaps.java b/android/sdk/src/main/java/app/organicmaps/sdk/OrganicMaps.java
index dfa0cbc36..094625442 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/OrganicMaps.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/OrganicMaps.java
@@ -11,6 +11,7 @@ import app.organicmaps.sdk.bookmarks.data.Icon;
 import app.organicmaps.sdk.downloader.Android7RootCertificateWorkaround;
 import app.organicmaps.sdk.editor.OsmOAuth;
 import app.organicmaps.sdk.location.LocationHelper;
+import app.organicmaps.sdk.location.LocationProviderFactory;
 import app.organicmaps.sdk.location.SensorHelper;
 import app.organicmaps.sdk.maplayer.isolines.IsolinesManager;
 import app.organicmaps.sdk.maplayer.subway.SubwayManager;
@@ -77,12 +78,12 @@ public final class OrganicMaps implements DefaultLifecycleObserver
   }
 
   public OrganicMaps(@NonNull Context context, @NonNull String flavor, @NonNull String applicationId, int versionCode,
-                     @NonNull String versionName, @NonNull String fileProviderAuthority)
+                     @NonNull String versionName, @NonNull String fileProviderAuthority,
+                     @NonNull LocationProviderFactory locationProviderFactory)
   {
     mFlavor = flavor;
     mContext = context.getApplicationContext();
-    mPreferences = mContext.getSharedPreferences(context.getString(R.string.pref_file_name),
-                                                 Context.MODE_PRIVATE);
+    mPreferences = mContext.getSharedPreferences(context.getString(R.string.pref_file_name), Context.MODE_PRIVATE);
 
     // Set configuration directory as early as possible.
     // Other methods may explicitly use Config, which requires settingsDir to be set.
@@ -102,7 +103,7 @@ public final class OrganicMaps implements DefaultLifecycleObserver
     Icon.loadDefaultIcons(mContext.getResources(), mContext.getPackageName());
 
     mSensorHelper = new SensorHelper(mContext);
-    mLocationHelper = new LocationHelper(mContext, mSensorHelper);
+    mLocationHelper = new LocationHelper(mContext, mSensorHelper, locationProviderFactory);
     mIsolinesManager = new IsolinesManager();
     mSubwayManager = new SubwayManager(mContext);
   }
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/location/AndroidNativeProvider.java b/android/sdk/src/main/java/app/organicmaps/sdk/location/AndroidNativeProvider.java
index de938d03d..516cb0683 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/location/AndroidNativeProvider.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/location/AndroidNativeProvider.java
@@ -18,7 +18,7 @@ import app.organicmaps.sdk.util.log.Logger;
 import java.util.HashSet;
 import java.util.Set;
 
-class AndroidNativeProvider extends BaseLocationProvider
+public class AndroidNativeProvider extends BaseLocationProvider
 {
   private static final String TAG = AndroidNativeProvider.class.getSimpleName();
 
@@ -60,7 +60,7 @@ class AndroidNativeProvider extends BaseLocationProvider
   @NonNull
   final private NativeLocationListener mNativeLocationListener = new NativeLocationListener();
 
-  AndroidNativeProvider(@NonNull Context context, @NonNull BaseLocationProvider.Listener listener)
+  public AndroidNativeProvider(@NonNull Context context, @NonNull BaseLocationProvider.Listener listener)
   {
     super(listener);
     mLocationManager = (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/location/BaseLocationProvider.java b/android/sdk/src/main/java/app/organicmaps/sdk/location/BaseLocationProvider.java
index 1a7ce73ed..fe0772b0f 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/location/BaseLocationProvider.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/location/BaseLocationProvider.java
@@ -9,9 +9,9 @@ import androidx.annotation.NonNull;
 import androidx.annotation.RequiresPermission;
 import androidx.annotation.UiThread;
 
-abstract class BaseLocationProvider
+public abstract class BaseLocationProvider
 {
-  interface Listener
+  public interface Listener
   {
     @UiThread
     void onLocationChanged(@NonNull Location location);
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationHelper.java b/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationHelper.java
index 4e384ba8d..ac47b448e 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationHelper.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationHelper.java
@@ -96,11 +96,11 @@ public class LocationHelper implements BaseLocationProvider.Listener
     }
   };
 
-  public LocationHelper(@NonNull Context context, @NonNull SensorHelper sensorHelper)
+  public LocationHelper(@NonNull Context context, @NonNull SensorHelper sensorHelper, @NonNull LocationProviderFactory locationProviderFactory)
   {
     mContext = context;
     mSensorHelper = sensorHelper;
-    mLocationProvider = LocationProviderFactory.getProvider(mContext, this);
+    mLocationProvider = locationProviderFactory.getProvider(mContext, this);
     mHandler = new Handler();
   }
 
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationProviderFactory.java b/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationProviderFactory.java
new file mode 100644
index 000000000..04968b562
--- /dev/null
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationProviderFactory.java
@@ -0,0 +1,11 @@
+package app.organicmaps.sdk.location;
+
+import android.content.Context;
+import androidx.annotation.NonNull;
+
+public interface LocationProviderFactory
+{
+  boolean isGoogleLocationAvailable(@NonNull Context context);
+
+  BaseLocationProvider getProvider(@NonNull Context context, @NonNull BaseLocationProvider.Listener listener);
+}

From f5037a5ee213e7caa3e81c2209d92ca5b172224c Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Fri, 15 Aug 2025 19:08:30 +0200
Subject: [PATCH 225/302] [android][sdk] Fix lint

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 .../src/main/res/values-kab/types_strings.xml |  3 --
 .../src/main/res/values-mt/types_strings.xml  |  3 --
 android/sdk/build.gradle                      | 17 +++++++++++
 android/sdk/src/main/AndroidManifest.xml      | 30 +++++++++++++++++++
 4 files changed, 47 insertions(+), 6 deletions(-)
 delete mode 100644 android/app/src/main/res/values-kab/types_strings.xml
 delete mode 100644 android/app/src/main/res/values-mt/types_strings.xml
 create mode 100644 android/sdk/src/main/AndroidManifest.xml

diff --git a/android/app/src/main/res/values-kab/types_strings.xml b/android/app/src/main/res/values-kab/types_strings.xml
deleted file mode 100644
index 045e125f3..000000000
--- a/android/app/src/main/res/values-kab/types_strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-</resources>
diff --git a/android/app/src/main/res/values-mt/types_strings.xml b/android/app/src/main/res/values-mt/types_strings.xml
deleted file mode 100644
index 045e125f3..000000000
--- a/android/app/src/main/res/values-mt/types_strings.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-</resources>
diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index 1b33195ff..fbdb1358a 100644
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -95,12 +95,29 @@ android {
   }
 
   compileOptions {
+    coreLibraryDesugaringEnabled true
+
     sourceCompatibility JavaVersion.VERSION_17
     targetCompatibility JavaVersion.VERSION_17
   }
+
+  lint {
+    disable 'MissingTranslation'
+    // https://github.com/organicmaps/organicmaps/issues/3551
+    disable 'MissingQuantity', 'UnusedQuantity'
+    // https://github.com/organicmaps/organicmaps/issues/3550
+    disable 'ByteOrderMark'
+    // https://github.com/organicmaps/organicmaps/issues/1077
+    disable 'CustomSplashScreen'
+    // https://github.com/organicmaps/organicmaps/issues/3610
+    disable 'InsecureBaseConfiguration'
+    abortOnError = true
+  }
 }
 
 dependencies {
+  coreLibraryDesugaring libs.android.tools.desugar
+
   implementation libs.androidx.core
   implementation libs.androidx.annotation
   implementation libs.androidx.fragment
diff --git a/android/sdk/src/main/AndroidManifest.xml b/android/sdk/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..108faa46a
--- /dev/null
+++ b/android/sdk/src/main/AndroidManifest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    android:installLocation="auto">
+
+  <!-- Requiring "android.hardware.touchscreen" here breaks DeX mode -->
+  <uses-feature
+      android:glEsVersion="0x00030000"
+      android:required="true" />
+  <uses-feature
+      android:name="android.hardware.wifi"
+      android:required="false" />
+  <uses-feature
+      android:name="android.hardware.location"
+      android:required="false" />
+  <uses-feature
+      android:name="android.hardware.location.network"
+      android:required="false" />
+  <uses-feature
+      android:name="android.hardware.location.gps"
+      android:required="false" />
+
+  <uses-permission
+      android:name="android.permission.READ_EXTERNAL_STORAGE"
+      android:maxSdkVersion="22" />
+  <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+  <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
+  <uses-permission android:name="android.permission.INTERNET" />
+  <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+</manifest>

From 4dca45f74a1eca8f5b2cce5eca56b9647a382de5 Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Sat, 16 Aug 2025 01:58:09 +0200
Subject: [PATCH 226/302] [android][sdk] Disable proguard

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 android/sdk/build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/android/sdk/build.gradle b/android/sdk/build.gradle
index fbdb1358a..4d2a0e0f9 100644
--- a/android/sdk/build.gradle
+++ b/android/sdk/build.gradle
@@ -76,12 +76,12 @@ android {
       jniDebuggable true // Enable jni debug build
     }
     release {
-      minifyEnabled true
-      proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+//      minifyEnabled true
+//      proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
     }
     beta {
-      minifyEnabled true
-      proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+//      minifyEnabled true
+//      proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
       matchingFallbacks = ['release']
     }
   }

From 80b616daf2b01732e3d580886252b8b43e4ad0bc Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Fri, 15 Aug 2025 17:31:33 +0200
Subject: [PATCH 227/302] [android][sdk] Move required strings to sdk

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 .../java/app/organicmaps/routing/ManageRouteAdapter.java     | 2 +-
 .../app/organicmaps/routing/RoutingBottomMenuController.java | 5 +++--
 .../organicmaps/widget/placepage/EditBookmarkFragment.java   | 3 ++-
 .../java/app/organicmaps/widget/placepage/PlacePageView.java | 3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/routing/ManageRouteAdapter.java b/android/app/src/main/java/app/organicmaps/routing/ManageRouteAdapter.java
index 198443f28..0404c544f 100644
--- a/android/app/src/main/java/app/organicmaps/routing/ManageRouteAdapter.java
+++ b/android/app/src/main/java/app/organicmaps/routing/ManageRouteAdapter.java
@@ -94,7 +94,7 @@ public class ManageRouteAdapter extends RecyclerView.Adapter<ManageRouteAdapter.
     if (mRoutePoints.get(position).mIsMyPosition)
     {
       // My position point.
-      title = mContext.getString(R.string.core_my_position);
+      title = mContext.getString(app.organicmaps.sdk.R.string.core_my_position);
 
       if (mRoutePoints.get(position).mPointType != RouteMarkType.Start)
         subtitle = mRoutePoints.get(position).mTitle;
diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java b/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
index c2af19324..6ff7b45bf 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
@@ -355,8 +355,9 @@ final class RoutingBottomMenuController implements View.OnClickListener
     {
       mAltitudeChart.setImageBitmap(bm);
       UiUtils.show(mAltitudeChart);
-      final String unit = limits.isMetricUnits ? mAltitudeDifference.getResources().getString(R.string.m)
-                                               : mAltitudeDifference.getResources().getString(R.string.ft);
+      final String unit = limits.isMetricUnits
+                            ? mAltitudeDifference.getResources().getString(app.organicmaps.sdk.R.string.m)
+                            : mAltitudeDifference.getResources().getString(app.organicmaps.sdk.R.string.ft);
       mAltitudeDifference.setText("↗ " + limits.totalAscentString + " " + unit + " ↘ " + limits.totalDescentString + " "
                                   + unit);
       UiUtils.show(mAltitudeDifference);
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
index 39eadea8f..f8bb3302e 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/EditBookmarkFragment.java
@@ -183,7 +183,8 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
     super.onStart();
 
     // Focus name and show keyboard for "Unknown Place" bookmarks
-    if (mBookmark != null && mBookmark.getName().equals(getString(R.string.core_placepage_unknown_place)))
+    if (mBookmark != null
+        && mBookmark.getName().equals(getString(app.organicmaps.sdk.R.string.core_placepage_unknown_place)))
     {
       mEtName.requestFocus();
       mEtName.selectAll();
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
index f0a186d67..9c546637a 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
@@ -643,7 +643,8 @@ public class PlacePageView extends Fragment
     final String cap = mMapObject.getMetadata(Metadata.MetadataType.FMD_CAPACITY);
     refreshMetadataOrHide(!TextUtils.isEmpty(cap) ? getString(R.string.capacity, cap) : "", mCapacity, mTvCapacity);
 
-    refreshMetadataOrHide(mMapObject.hasAtm() ? getString(R.string.type_amenity_atm) : "", mAtm, mTvAtm);
+    refreshMetadataOrHide(mMapObject.hasAtm() ? getString(app.organicmaps.sdk.R.string.type_amenity_atm) : "", mAtm,
+                          mTvAtm);
 
     final String wheelchair =
         getLocalizedFeatureType(getContext(), mMapObject.getMetadata(Metadata.MetadataType.FMD_WHEELCHAIR));

From d609876c2d4817a80557c4d41d625b3b2a1bdaf2 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Sat, 23 Aug 2025 19:31:34 +0700
Subject: [PATCH 228/302] [android][sdk] Move strings to sdk follow-up

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 .../app/src/main/res/values-af/strings.xml    | 36 -----------------
 .../app/src/main/res/values-ar/strings.xml    | 36 -----------------
 .../app/src/main/res/values-ast/strings.xml   |  9 -----
 .../app/src/main/res/values-az/strings.xml    | 35 -----------------
 .../app/src/main/res/values-be/strings.xml    | 36 -----------------
 .../app/src/main/res/values-bg/strings.xml    | 31 ---------------
 .../app/src/main/res/values-bn/strings.xml    | 10 -----
 .../app/src/main/res/values-ca/strings.xml    | 35 -----------------
 .../app/src/main/res/values-cs/strings.xml    | 31 ---------------
 .../app/src/main/res/values-cy/strings.xml    | 18 ---------
 .../app/src/main/res/values-da/strings.xml    | 31 ---------------
 .../app/src/main/res/values-de/strings.xml    | 35 -----------------
 .../app/src/main/res/values-el/strings.xml    | 34 ----------------
 .../src/main/res/values-en-rGB/strings.xml    |  2 -
 .../src/main/res/values-es-rMX/strings.xml    |  6 ---
 .../app/src/main/res/values-es/strings.xml    | 35 -----------------
 .../app/src/main/res/values-et/strings.xml    | 35 -----------------
 .../app/src/main/res/values-eu/strings.xml    | 35 -----------------
 .../app/src/main/res/values-fa/strings.xml    | 28 -------------
 .../app/src/main/res/values-fi/strings.xml    | 36 -----------------
 .../app/src/main/res/values-fr/strings.xml    | 36 -----------------
 .../app/src/main/res/values-gl/strings.xml    | 22 -----------
 .../app/src/main/res/values-gsw/strings.xml   | 22 -----------
 .../app/src/main/res/values-hi/strings.xml    | 23 -----------
 .../app/src/main/res/values-hr/strings.xml    |  7 ----
 .../app/src/main/res/values-hu/strings.xml    | 35 -----------------
 .../app/src/main/res/values-in/strings.xml    | 27 -------------
 .../app/src/main/res/values-is/strings.xml    | 22 -----------
 .../app/src/main/res/values-it/strings.xml    | 30 --------------
 .../app/src/main/res/values-iw/strings.xml    | 33 ----------------
 .../app/src/main/res/values-ja/strings.xml    | 35 -----------------
 .../app/src/main/res/values-ko/strings.xml    | 27 -------------
 .../app/src/main/res/values-lt/strings.xml    | 36 -----------------
 .../app/src/main/res/values-lv/strings.xml    | 34 ----------------
 .../app/src/main/res/values-mr/strings.xml    | 25 ------------
 .../app/src/main/res/values-mt/strings.xml    | 23 -----------
 .../app/src/main/res/values-nb/strings.xml    | 36 -----------------
 .../app/src/main/res/values-nl/strings.xml    | 37 +-----------------
 .../app/src/main/res/values-pl/strings.xml    | 35 -----------------
 .../src/main/res/values-pt-rBR/strings.xml    | 35 -----------------
 .../app/src/main/res/values-pt/strings.xml    | 31 ---------------
 .../app/src/main/res/values-ro/strings.xml    | 23 -----------
 .../app/src/main/res/values-ru/strings.xml    | 36 -----------------
 .../app/src/main/res/values-sk/strings.xml    | 33 ----------------
 .../app/src/main/res/values-sr/strings.xml    | 34 ----------------
 .../app/src/main/res/values-sv/strings.xml    | 30 --------------
 .../app/src/main/res/values-sw/strings.xml    | 10 -----
 .../app/src/main/res/values-th/strings.xml    | 28 -------------
 .../app/src/main/res/values-tr/strings.xml    | 36 -----------------
 .../app/src/main/res/values-uk/strings.xml    | 36 -----------------
 .../app/src/main/res/values-vi/strings.xml    | 27 -------------
 .../src/main/res/values-zh-rTW/strings.xml    | 36 -----------------
 .../app/src/main/res/values-zh/strings.xml    | 36 -----------------
 android/app/src/main/res/values/strings.xml   | 36 -----------------
 .../sdk/src/main/res/values-af/strings.xml    | 39 +++++++++++++++++++
 .../sdk/src/main/res/values-ar/strings.xml    | 39 +++++++++++++++++++
 .../sdk/src/main/res/values-ast/strings.xml   | 12 ++++++
 .../sdk/src/main/res/values-az/strings.xml    | 38 ++++++++++++++++++
 .../sdk/src/main/res/values-be/strings.xml    | 39 +++++++++++++++++++
 .../sdk/src/main/res/values-bg/strings.xml    | 34 ++++++++++++++++
 .../sdk/src/main/res/values-bn/strings.xml    | 13 +++++++
 .../sdk/src/main/res/values-ca/strings.xml    | 38 ++++++++++++++++++
 .../sdk/src/main/res/values-cs/strings.xml    | 34 ++++++++++++++++
 .../sdk/src/main/res/values-cy/strings.xml    | 21 ++++++++++
 .../sdk/src/main/res/values-da/strings.xml    | 34 ++++++++++++++++
 .../sdk/src/main/res/values-de/strings.xml    | 38 ++++++++++++++++++
 .../sdk/src/main/res/values-el/strings.xml    | 37 ++++++++++++++++++
 .../src/main/res/values-en-rGB/strings.xml    |  5 +++
 .../src/main/res/values-es-rMX/strings.xml    |  9 +++++
 .../sdk/src/main/res/values-es/strings.xml    | 38 ++++++++++++++++++
 .../sdk/src/main/res/values-et/strings.xml    | 38 ++++++++++++++++++
 .../sdk/src/main/res/values-eu/strings.xml    | 38 ++++++++++++++++++
 .../sdk/src/main/res/values-fa/strings.xml    | 31 +++++++++++++++
 .../sdk/src/main/res/values-fi/strings.xml    | 39 +++++++++++++++++++
 .../sdk/src/main/res/values-fr/strings.xml    | 39 +++++++++++++++++++
 .../sdk/src/main/res/values-gl/strings.xml    | 25 ++++++++++++
 .../sdk/src/main/res/values-gsw/strings.xml   | 25 ++++++++++++
 .../sdk/src/main/res/values-hi/strings.xml    | 26 +++++++++++++
 .../sdk/src/main/res/values-hr/strings.xml    | 10 +++++
 .../sdk/src/main/res/values-hu/strings.xml    | 38 ++++++++++++++++++
 .../sdk/src/main/res/values-in/strings.xml    | 30 ++++++++++++++
 .../sdk/src/main/res/values-is/strings.xml    | 25 ++++++++++++
 .../sdk/src/main/res/values-it/strings.xml    | 33 ++++++++++++++++
 .../sdk/src/main/res/values-iw/strings.xml    | 36 +++++++++++++++++
 .../sdk/src/main/res/values-ja/strings.xml    | 38 ++++++++++++++++++
 .../sdk/src/main/res/values-ko/strings.xml    | 30 ++++++++++++++
 .../sdk/src/main/res/values-lt/strings.xml    | 39 +++++++++++++++++++
 .../sdk/src/main/res/values-lv/strings.xml    | 37 ++++++++++++++++++
 .../sdk/src/main/res/values-mr/strings.xml    | 28 +++++++++++++
 .../sdk/src/main/res/values-mt/strings.xml    | 26 +++++++++++++
 .../sdk/src/main/res/values-nb/strings.xml    | 39 +++++++++++++++++++
 .../sdk/src/main/res/values-nl/strings.xml    | 38 ++++++++++++++++++
 .../sdk/src/main/res/values-pl/strings.xml    | 38 ++++++++++++++++++
 .../src/main/res/values-pt-rBR/strings.xml    | 38 ++++++++++++++++++
 .../sdk/src/main/res/values-pt/strings.xml    | 34 ++++++++++++++++
 .../sdk/src/main/res/values-ro/strings.xml    | 26 +++++++++++++
 .../sdk/src/main/res/values-ru/strings.xml    | 39 +++++++++++++++++++
 .../sdk/src/main/res/values-sk/strings.xml    | 36 +++++++++++++++++
 .../sdk/src/main/res/values-sr/strings.xml    | 37 ++++++++++++++++++
 .../sdk/src/main/res/values-sv/strings.xml    | 33 ++++++++++++++++
 .../sdk/src/main/res/values-sw/strings.xml    | 13 +++++++
 .../sdk/src/main/res/values-th/strings.xml    | 31 +++++++++++++++
 .../sdk/src/main/res/values-tr/strings.xml    | 39 +++++++++++++++++++
 .../sdk/src/main/res/values-uk/strings.xml    | 39 +++++++++++++++++++
 .../sdk/src/main/res/values-vi/strings.xml    | 30 ++++++++++++++
 .../src/main/res/values-zh-rHK/strings.xml    |  3 ++
 .../src/main/res/values-zh-rMO/strings.xml    |  3 ++
 .../src/main/res/values-zh-rTW/strings.xml    | 39 +++++++++++++++++++
 .../sdk/src/main/res/values-zh/strings.xml    | 39 +++++++++++++++++++
 android/sdk/src/main/res/values/strings.xml   | 39 +++++++++++++++++++
 110 files changed, 1733 insertions(+), 1565 deletions(-)
 create mode 100644 android/sdk/src/main/res/values-af/strings.xml
 create mode 100644 android/sdk/src/main/res/values-ar/strings.xml
 create mode 100644 android/sdk/src/main/res/values-ast/strings.xml
 create mode 100644 android/sdk/src/main/res/values-az/strings.xml
 create mode 100644 android/sdk/src/main/res/values-be/strings.xml
 create mode 100644 android/sdk/src/main/res/values-bg/strings.xml
 create mode 100644 android/sdk/src/main/res/values-bn/strings.xml
 create mode 100644 android/sdk/src/main/res/values-ca/strings.xml
 create mode 100644 android/sdk/src/main/res/values-cs/strings.xml
 create mode 100644 android/sdk/src/main/res/values-cy/strings.xml
 create mode 100644 android/sdk/src/main/res/values-da/strings.xml
 create mode 100644 android/sdk/src/main/res/values-de/strings.xml
 create mode 100644 android/sdk/src/main/res/values-el/strings.xml
 create mode 100644 android/sdk/src/main/res/values-en-rGB/strings.xml
 create mode 100644 android/sdk/src/main/res/values-es-rMX/strings.xml
 create mode 100644 android/sdk/src/main/res/values-es/strings.xml
 create mode 100644 android/sdk/src/main/res/values-et/strings.xml
 create mode 100644 android/sdk/src/main/res/values-eu/strings.xml
 create mode 100644 android/sdk/src/main/res/values-fa/strings.xml
 create mode 100644 android/sdk/src/main/res/values-fi/strings.xml
 create mode 100644 android/sdk/src/main/res/values-fr/strings.xml
 create mode 100644 android/sdk/src/main/res/values-gl/strings.xml
 create mode 100644 android/sdk/src/main/res/values-gsw/strings.xml
 create mode 100644 android/sdk/src/main/res/values-hi/strings.xml
 create mode 100644 android/sdk/src/main/res/values-hr/strings.xml
 create mode 100644 android/sdk/src/main/res/values-hu/strings.xml
 create mode 100644 android/sdk/src/main/res/values-in/strings.xml
 create mode 100644 android/sdk/src/main/res/values-is/strings.xml
 create mode 100644 android/sdk/src/main/res/values-it/strings.xml
 create mode 100644 android/sdk/src/main/res/values-iw/strings.xml
 create mode 100644 android/sdk/src/main/res/values-ja/strings.xml
 create mode 100644 android/sdk/src/main/res/values-ko/strings.xml
 create mode 100644 android/sdk/src/main/res/values-lt/strings.xml
 create mode 100644 android/sdk/src/main/res/values-lv/strings.xml
 create mode 100644 android/sdk/src/main/res/values-mr/strings.xml
 create mode 100644 android/sdk/src/main/res/values-mt/strings.xml
 create mode 100644 android/sdk/src/main/res/values-nb/strings.xml
 create mode 100644 android/sdk/src/main/res/values-nl/strings.xml
 create mode 100644 android/sdk/src/main/res/values-pl/strings.xml
 create mode 100644 android/sdk/src/main/res/values-pt-rBR/strings.xml
 create mode 100644 android/sdk/src/main/res/values-pt/strings.xml
 create mode 100644 android/sdk/src/main/res/values-ro/strings.xml
 create mode 100644 android/sdk/src/main/res/values-ru/strings.xml
 create mode 100644 android/sdk/src/main/res/values-sk/strings.xml
 create mode 100644 android/sdk/src/main/res/values-sr/strings.xml
 create mode 100644 android/sdk/src/main/res/values-sv/strings.xml
 create mode 100644 android/sdk/src/main/res/values-sw/strings.xml
 create mode 100644 android/sdk/src/main/res/values-th/strings.xml
 create mode 100644 android/sdk/src/main/res/values-tr/strings.xml
 create mode 100644 android/sdk/src/main/res/values-uk/strings.xml
 create mode 100644 android/sdk/src/main/res/values-vi/strings.xml
 create mode 100644 android/sdk/src/main/res/values-zh-rHK/strings.xml
 create mode 100644 android/sdk/src/main/res/values-zh-rMO/strings.xml
 create mode 100644 android/sdk/src/main/res/values-zh-rTW/strings.xml
 create mode 100644 android/sdk/src/main/res/values-zh/strings.xml
 create mode 100644 android/sdk/src/main/res/values/strings.xml

diff --git a/android/app/src/main/res/values-af/strings.xml b/android/app/src/main/res/values-af/strings.xml
index dd6f1453b..5c3de3c02 100644
--- a/android/app/src/main/res/values-af/strings.xml
+++ b/android/app/src/main/res/values-af/strings.xml
@@ -14,13 +14,8 @@
     <string name="downloading">Laai tans af…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
     <string name="kilometres">Kilometers</string>
-    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
-    <string name="mb">MB</string>
-    <string name="gb">GB</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Myle</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">My posisie</string>
     <!-- Update maps later button text -->
     <string name="later">Later</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -74,8 +69,6 @@
     <string name="bookmarks">Boekmerke</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Boekmerke en paaie</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">My plekke</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Adres</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -90,14 +83,6 @@
     <string name="maps_storage_summary">Kies die vouer om kaarte na af te laai.</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Afgelaaide kaarte</string>
-    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">Interne privaat berging</string>
-    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">Interne gedeelde berging</string>
-    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
-    <string name="maps_storage_removable">SD-kaart</string>
-    <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">Eksterne gedeelde berging</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
     <string name="maps_storage_free_size">%1$s van %2$s beskikbaar</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -147,8 +132,6 @@
     <string name="category_post">Pos</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Polisie</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">Wi-Fi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Herwinning</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -442,7 +425,6 @@
     <string name="empty_street_name_error">Voer asb. ’n straatnaam in</string>
     <string name="choose_language">Kies ’n taal</string>
     <string name="choose_street">Kies ’n straat</string>
-    <string name="postal_code">Poskode</string>
     <string name="cuisine">Kookkuns</string>
     <string name="select_cuisine">Kies kookkuns</string>
     <!-- login text field -->
@@ -483,8 +465,6 @@
     <string name="error_enter_correct_storey_number">Die aantal verdiepings mag nie %d oorskry nie</string>
     <string name="editor_zip_code">Poskode</string>
     <string name="error_enter_correct_zip_code">Voer ’n geldige poskode in</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">Kaartpunt</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Nota aan OpenStreetMap-vrywilligers (opsioneel)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -502,16 +482,8 @@
     <string name="downloader_no_downloaded_maps_title">U het geen kaarte afgelaai nie</string>
     <string name="downloader_no_downloaded_maps_message">Laai kaarte af om die ligging te soek en vanlyn te navigeer.</string>
     <string name="current_location_unknown_error_title">Huidige ligging is onbekend.</string>
-    <!-- abbreviation for meters -->
-    <string name="m">m</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">km</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/h</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">myl</string>
-    <!-- A unit of measure -->
-    <string name="ft">vt.</string>
     <string name="miles_per_hour">mph</string>
     <string name="hour">h</string>
     <string name="minute">min</string>
@@ -570,8 +542,6 @@
     <string name="prefs_languages_information_off_link">Sien hierdie gids vir meer inligting</string>
     <string name="transliteration_title">Transliterasie in Latynse alfabet</string>
     <string name="learn_more">Meer inligting</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Uitgang</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Gebruik soek of tik op die kaart om \'n roetebeginpunt by te voeg</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -583,7 +553,6 @@
     <string name="dialog_error_storage_title">Bergtoegangprobleem</string>
     <string name="dialog_error_storage_message">Eksterne bergspasie is nie toeganklik nie. Die SD-kaart is dalk verwyder, beskadig, of die lêerstelsel is leesalleen. Gaan u SD-kaart na of kontak ons by support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emuleer slegte bergspasie</string>
-    <string name="core_entrance">Ingang</string>
     <string name="error_enter_correct_name">Voer asb. ’n korrekte naam in</string>
     <string name="bookmark_lists">Lyste</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -611,16 +580,12 @@
     <string name="button_layer_traffic">Verkeer</string>
     <string name="subway">Moltrein</string>
     <string name="layers_title">Kaartstyle en -lae</string>
-    <string name="subway_data_unavailable">Moltreinkaart is onbeskikbaar</string>
     <string name="bookmarks_empty_list_title">Hierdie lys is leeg</string>
     <string name="bookmarks_empty_list_message">Tik op ’n plek op die kaart en dan op die sterikoon om ’n boekmerk toe te voeg</string>
     <string name="category_desc_more">…nog</string>
     <string name="export_file">Voer KMZ uit</string>
     <string name="export_file_gpx">Voer GPX uit</string>
     <string name="delete_list">Skrap lys</string>
-    <string name="public_access">Openbare toegang</string>
-    <string name="limited_access">Beperkte toegang</string>
-    <string name="not_shared">Privaat</string>
     <string name="speedcams_alert_title">Spoedkameras</string>
     <string name="place_description_title">Plekbeskrywing</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -637,7 +602,6 @@
     <string name="power_managment_setting_auto">Wanneer battery laag as</string>
     <string name="power_managment_setting_manual_max">Altyd</string>
     <string name="enable_logging_warning_message">Aktiveer hierdie opsie tydelik om ’n gedetailleerde diagnosestaat van u probleem op te neem en handmatig na ons te stuur d.m.v. die “Rapporteer ’n fout” in die Help-dialoog. Sulke state kan liggingsinligting bevat.</string>
-    <string name="access_rules_author_only">Aanlyn wysiging</string>
     <string name="driving_options_title">Ompadopsies</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_unpaved">Vermy grondpaaie</string>
diff --git a/android/app/src/main/res/values-ar/strings.xml b/android/app/src/main/res/values-ar/strings.xml
index a8203ac36..739abe09f 100644
--- a/android/app/src/main/res/values-ar/strings.xml
+++ b/android/app/src/main/res/values-ar/strings.xml
@@ -14,13 +14,8 @@
     <string name="downloading">جاري التنزيل…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
     <string name="kilometres">الكيلومترات</string>
-    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
-    <string name="mb">ميغابايت</string>
-    <string name="gb">غيغابايت</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">الأميال</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">موقعي</string>
     <!-- Update maps later button text -->
     <string name="later">ًلاحقا</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -76,8 +71,6 @@
     <string name="bookmarks">الإشارات المرجعية</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">الإشارات المرجعية والمسارات</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">أماكني</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">الاسم</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -92,14 +85,6 @@
     <string name="maps_storage_summary">اختر المكان الذي ينبغي تنزيل الخرائط إليه.</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">الخرائط المنزلة</string>
-    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">وحدة التخزين الداخلية الخاصة</string>
-    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">وحدة التخزين الداخلية المشتركة</string>
-    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
-    <string name="maps_storage_removable">بطاقة الذاكرة</string>
-    <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">وحدة تخزين خارجية مشتركة</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
     <string name="maps_storage_free_size">%1$s فارغ من %2$s</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -151,8 +136,6 @@
     <string name="category_post">بريد</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">شرطة</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">إنترنت لا سلكي</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">إعادة تدوير</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -468,7 +451,6 @@
     <string name="empty_street_name_error">الرجاء إدخال اسم الشارع</string>
     <string name="choose_language">اختر اللغة</string>
     <string name="choose_street">اختر الشارع</string>
-    <string name="postal_code">الرمز البريدي</string>
     <string name="cuisine">المطبخ</string>
     <string name="select_cuisine">اختر المطبخ</string>
     <!-- login text field -->
@@ -509,8 +491,6 @@
     <string name="error_enter_correct_storey_number">يجب ألا يتجاوز عدد طوابق المبنى %d</string>
     <string name="editor_zip_code">الرمز البريدي</string>
     <string name="error_enter_correct_zip_code">أدخل الرمز البريدي صالح</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">نقطة الخريطة</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">ملاحظة لمتطوعي OpenStreetMap (اختياري)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -528,16 +508,8 @@
     <string name="downloader_no_downloaded_maps_title">لم تقم بتنزيل أية خرائط</string>
     <string name="downloader_no_downloaded_maps_message">قم بتنزيل خرائط للبحث عن مكان واستخدام الملاحة بدون اتصال بالإنترنت.</string>
     <string name="current_location_unknown_error_title">الموقع الحالي غير معروف.</string>
-    <!-- abbreviation for meters -->
-    <string name="m">متر</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">كم</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">كم/ساعة</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">ميل</string>
-    <!-- A unit of measure -->
-    <string name="ft">قدم</string>
     <string name="miles_per_hour">ميل/ساعة</string>
     <string name="hour">س</string>
     <string name="minute">د</string>
@@ -597,8 +569,6 @@
     <string name="prefs_languages_information_off_link">لمزيد من المعلومات الرجاء مراجعة هذا الدليل.</string>
     <string name="transliteration_title">كتابة جميع الاسماء بالحروف اللاتينية بشكل حرفي</string>
     <string name="learn_more">معرفة المزيد</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">خروج</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">استخدام البحث أو النقر على الخريطة لإضافة نقطة بداية الطريق</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -610,7 +580,6 @@
     <string name="dialog_error_storage_title">مشكلة الوصول للتخزين</string>
     <string name="dialog_error_storage_message">التخزين الخارجي غير متوفر، ربما تمت إزالة بطاقة SD، أو أنها تالفة أو نظام الملفات للقراءة فقط. افحصه أو راسلنا على support@comaps.app</string>
     <string name="setting_emulate_bad_storage">محاكاة التخزين السيء</string>
-    <string name="core_entrance">المدخل</string>
     <string name="error_enter_correct_name">الرجاء إدخال اسم صحيح</string>
     <string name="bookmark_lists">قوائم</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -662,16 +631,12 @@
     <string name="button_layer_traffic">حركة مرور</string>
     <string name="subway">مترو الانفاق</string>
     <string name="layers_title">أنماط الخريطة وطبقاتها</string>
-    <string name="subway_data_unavailable">خريطة مترو الانفاق غير متوفرة</string>
     <string name="bookmarks_empty_list_title">هذه اللائحة فارغة</string>
     <string name="bookmarks_empty_list_message">لإضافة إشارة مرجعية ، اضغط على مكان على الخريطة ثم انقر على رمز النجمة</string>
     <string name="category_desc_more">…المزيد</string>
     <string name="export_file">تصدير KMZ</string>
     <string name="export_file_gpx">تصدير GPX</string>
     <string name="delete_list">حذف القائمة</string>
-    <string name="public_access">مسموح الوصول لعامة الشعب</string>
-    <string name="limited_access">مسموح الوصول بشكل محدود</string>
-    <string name="not_shared">خاص</string>
     <string name="speedcams_alert_title">تحذيرات كاميرات السرعة</string>
     <string name="place_description_title">وصف المكان</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -688,7 +653,6 @@
     <string name="power_managment_setting_auto">تلقائي</string>
     <string name="power_managment_setting_manual_max">توفير الطاقة الأقصى</string>
     <string name="enable_logging_warning_message">هذا الخيار يقوم ببدأ تسجيل سجلات التطبيق لإغراض التشخيصة. يمكن أن يكون مفيدًا لفريق الدعم الخاص بنا لحل المشاكل التي تواجهكم داخل التطبيق. قم بتفعيل هذا الخيار بشكل مؤقت فقط في حالة طلب الدعم من CoMaps.</string>
-    <string name="access_rules_author_only">التعديل باستخدام الإنترنت</string>
     <string name="driving_options_title">خيارات رسم المسار</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">تجنب الطرق ذات الرسوم</string>
diff --git a/android/app/src/main/res/values-ast/strings.xml b/android/app/src/main/res/values-ast/strings.xml
index 1d4b0bab8..8b2dfbfdc 100644
--- a/android/app/src/main/res/values-ast/strings.xml
+++ b/android/app/src/main/res/values-ast/strings.xml
@@ -43,7 +43,6 @@
     <string name="openstreetmap">OpenStreetMap</string>
     <string name="edit">Editar</string>
     <string name="vk">VK</string>
-    <string name="postal_code">Códigu postal</string>
     <string name="downloader_update_map">Anovar mapa</string>
     <string name="editor_zip_code">Códigu postal</string>
     <string name="editor_line_social_network">LINE</string>
@@ -52,7 +51,6 @@
     <string name="elevation_profile_difficulty">Dificultá</string>
     <string name="delete">Desaniciar</string>
     <string name="kilometres">Quilómetros</string>
-    <string name="core_my_position">La mio posición</string>
     <string name="search">Guetar</string>
     <string name="search_map">Guetar nel mapa</string>
     <string name="zoom_to_country">Amosar nel mapa</string>
@@ -70,7 +68,6 @@
     <string name="editor_report_problem_no_place_title">Esti llugar nun esiste</string>
     <string name="next_button">Siguiente</string>
     <string name="self_service">Autoserviciu</string>
-    <string name="core_my_places">Los mios llugares</string>
     <string name="parkings">Aparcaderu</string>
     <string name="later">Más sero</string>
     <string name="museums">Museos</string>
@@ -85,10 +82,8 @@
     <string name="placepage_remove_stop">Desaniciar parada</string>
     <string name="privacy">Privacidá</string>
     <string name="layers_title">Estilos y capes del mapa</string>
-    <string name="subway_data_unavailable">El mapa del metro nun ta disponible</string>
     <string name="subway">Metro</string>
     <string name="delete_list">Desaniciar llista</string>
-    <string name="public_access">Accesu públicu</string>
     <string name="bookmarks_empty_list_title">Esta llista ta balera</string>
     <string name="place_description_title">Descripción del llugar</string>
     <string name="power_managment_title">Mou d’aforru d’enerxía</string>
@@ -122,7 +117,6 @@
     <string name="placepage_personal_notes_hint">Notes personales (testu o HTML)</string>
     <string name="download_maps">Baxar mapes</string>
     <string name="downloading">Baxando…</string>
-    <string name="mb">MB</string>
     <string name="download">Baxar</string>
     <string name="category_transport">Tresporte</string>
     <string name="category_atm">Caxeru automáticu</string>
@@ -132,9 +126,7 @@
     <string name="website">Sitiu web</string>
     <string name="faq">Entrugues frecuentes</string>
     <string name="hide">Anubrir</string>
-    <string name="km">km</string>
     <string name="kilometers_per_hour">km/h</string>
-    <string name="gb">GB</string>
     <string name="continue_button">Siguir</string>
     <string name="maps_storage_downloaded">Mapes baxaos</string>
     <string name="copied_to_clipboard">Copióse nel cartafueyu: %s</string>
@@ -146,7 +138,6 @@
     <string name="stop_track_recording">Parar grabación del trayeutu</string>
     <string name="downloader_no_space_message">Desanicia los datos imprecisos</string>
     <string name="editor_osm_history">El to historial d’ediciones</string>
-    <string name="m">m</string>
     <string name="download_resources_continue">Dir al mapa</string>
     <string name="maps_storage_summary">Esbilla la carpeta onde tienen de baxase los mapes.</string>
     <string name="download_country_ask">¿Quies baxar %1$s? (%2$s)</string>
diff --git a/android/app/src/main/res/values-az/strings.xml b/android/app/src/main/res/values-az/strings.xml
index 56ff37098..fdd3e568a 100644
--- a/android/app/src/main/res/values-az/strings.xml
+++ b/android/app/src/main/res/values-az/strings.xml
@@ -14,12 +14,8 @@
     <string name="downloading">Endirilir…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
     <string name="kilometres">Kilometr</string>
-    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
-    <string name="mb">MB</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Mil</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">Ünvanım</string>
     <!-- Update maps later button text -->
     <string name="later">Daha sonra</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -77,8 +73,6 @@
     <string name="bookmarks">Əlfəcinlər</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Əlfəcinlər və Qeydlər</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">Yerlərim</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Ad</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -93,14 +87,6 @@
     <string name="maps_storage_summary">Xəritələrin yüklənəcəyi qovluğu seçin</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Xəritələr</string>
-    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">Daxili xüsusi saxlama</string>
-    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">Daxili paylaşılan yaddaş</string>
-    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
-    <string name="maps_storage_removable">SD kart</string>
-    <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">Xarici paylaşılan yaddaş</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
     <string name="maps_storage_free_size">%2$s-nin %1$s-i boşdur</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -152,8 +138,6 @@
     <string name="category_post">Poçt</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Polis</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">WiFi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Təkrar emal</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -459,7 +443,6 @@
     <string name="empty_street_name_error">Küçə adını daxil edin</string>
     <string name="choose_language">Dil seçin</string>
     <string name="choose_street">Küçə seçin</string>
-    <string name="postal_code">Poçt kodu</string>
     <string name="cuisine">Mətbəx</string>
     <string name="select_cuisine">Mətbəx seçin</string>
     <!-- login text field -->
@@ -500,8 +483,6 @@
     <string name="error_enter_correct_storey_number">Mərtəbələrin sayı %d-dən çox olmamalıdır</string>
     <string name="editor_zip_code">Poçt kodu</string>
     <string name="error_enter_correct_zip_code">Etibarlı poçt kodu daxil edin</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">Xəritə Nöqtəsi</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">OpenStreetMap könüllüləri üçün qeyd (isteğe bağlı)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -519,16 +500,8 @@
     <string name="downloader_no_downloaded_maps_title">Siz heç bir xəritə endirməmisiniz</string>
     <string name="downloader_no_downloaded_maps_message">Ünvanları tapmaq və oflayn naviqasiya etmək üçün xəritələri endirin.</string>
     <string name="current_location_unknown_error_title">Cari yer məlum deyil.</string>
-    <!-- abbreviation for meters -->
-    <string name="m">m</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">km</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/saat</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">mil</string>
-    <!-- A unit of measure -->
-    <string name="ft">Addım</string>
     <string name="miles_per_hour">mil/saat</string>
     <string name="hour">saat</string>
     <string name="minute">dəq</string>
@@ -588,8 +561,6 @@
     <string name="prefs_languages_information_off_link">Əlavə məlumat üçün bu təlimatı nəzərdən keçirin.</string>
     <string name="transliteration_title">Latın transliterasiyası</string>
     <string name="learn_more">Daha ətraflı</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Çıx</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Marşrutun başlanğıc nöqtəsi əlavə etmək üçün axtarışdan istifadə edin və ya xəritədə klikləyin</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -601,7 +572,6 @@
     <string name="dialog_error_storage_title">Yaddaş giriş problemi</string>
     <string name="dialog_error_storage_message">Xarici yaddaş mövcud deyil, ola bilsin ki, SD Kart çıxarılıb, zədələnib və ya fayl sistemi yalnız oxunur. Zəhmət olmasa yoxlayın və ya support@comaps.app ünvanında bizimlə əlaqə saxlayın</string>
     <string name="setting_emulate_bad_storage">Zədələnmiş yaddaşı təqlid edin</string>
-    <string name="core_entrance">Giriş</string>
     <string name="error_enter_correct_name">Düzgün ad daxil edin</string>
     <string name="bookmark_lists">Siyahılar</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -641,16 +611,12 @@
     <string name="button_layer_traffic">Nəqliyyat</string>
     <string name="subway">Metro</string>
     <string name="layers_title">Xəritə Üslubları və Qatları</string>
-    <string name="subway_data_unavailable">Metro xəritəsi mövcud deyil</string>
     <string name="bookmarks_empty_list_title">Bu siyahı boşdur</string>
     <string name="bookmarks_empty_list_message">Əlfəcin əlavə etmək üçün xəritədə yerə və sonra ulduz işarəsinə toxunun</string>
     <string name="category_desc_more">…daha çox</string>
     <string name="export_file">KMZ ixrac edin</string>
     <string name="export_file_gpx">GPX ixrac edin</string>
     <string name="delete_list">Siyahını silin</string>
-    <string name="public_access">Ictimai çıxış</string>
-    <string name="limited_access">Məhdud giriş</string>
-    <string name="not_shared">Gizli</string>
     <string name="speedcams_alert_title">Sürət kameraları</string>
     <string name="place_description_title">Məkan Təsviri</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -667,7 +633,6 @@
     <string name="power_managment_setting_auto">Avtomatik</string>
     <string name="power_managment_setting_manual_max">Maksimum enerji qənaəti</string>
     <string name="enable_logging_warning_message">Yardım dialoq qutusunda “Problemi bildir” istifadə etməklə probleminizlə bağlı ətraflı diaqnostik jurnalları qeyd etmək və bizə göndərmək üçün bu seçimi müvəqqəti aktivləşdirin. Qeydlərə məkan məlumatı daxil ola bilər.</string>
-    <string name="access_rules_author_only">Onlayn redaktə</string>
     <string name="driving_options_title">Marşrutlaşdırma seçimləri</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Rüsumlardan çəkinin</string>
diff --git a/android/app/src/main/res/values-be/strings.xml b/android/app/src/main/res/values-be/strings.xml
index 1da7e0fa9..a63aee166 100644
--- a/android/app/src/main/res/values-be/strings.xml
+++ b/android/app/src/main/res/values-be/strings.xml
@@ -14,13 +14,8 @@
     <string name="downloading">Спампоўванне…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
     <string name="kilometres">Кіламетры</string>
-    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
-    <string name="mb">МБ</string>
-    <string name="gb">ГБ</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Мілі</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">Маё месцазнаходжанне</string>
     <!-- Update maps later button text -->
     <string name="later">Потым</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -76,8 +71,6 @@
     <string name="bookmarks">Закладкі</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Закладкі і маршруты</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">Мае месцы</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Назва</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -92,14 +85,6 @@
     <string name="maps_storage_summary">Выбар папкі для захоўвання спампаваных карт.</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Спампаваныя карты</string>
-    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">Унутранае прыватнае сховішча</string>
-    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">Унутранае агульнае сховішча</string>
-    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
-    <string name="maps_storage_removable">SD-карта</string>
-    <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">Знешняе агульнае сховішча</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
     <string name="maps_storage_free_size">%1$s вольна з %2$s</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -149,8 +134,6 @@
     <string name="category_post">Пошта</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Паліцыя</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">WiFi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Перапрацоўка адходаў</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -454,7 +437,6 @@
     <string name="empty_street_name_error">Увядзіце назву вуліцы</string>
     <string name="choose_language">Выбраць мову</string>
     <string name="choose_street">Выбраць вуліцу</string>
-    <string name="postal_code">Паштовы індэкс</string>
     <string name="cuisine">Кухня</string>
     <string name="select_cuisine">Выбраць кухню</string>
     <!-- login text field -->
@@ -494,8 +476,6 @@
     <string name="error_enter_correct_storey_number">Колькасць паверхаў павінна быць не больш за %d</string>
     <string name="editor_zip_code">Паштовы індэкс</string>
     <string name="error_enter_correct_zip_code">Увядзіце правільны паштовы індэкс</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">Месца на карце</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Заўвага для валанцёраў OpenStreetMap (неабавязкова)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -513,16 +493,8 @@
     <string name="downloader_no_downloaded_maps_title">Вы не спампавалі ніводнай карты</string>
     <string name="downloader_no_downloaded_maps_message">Спампуйце карты, каб шукаць месцы і карыстацца навігацыяй без інтэрнэту.</string>
     <string name="current_location_unknown_error_title">Месцазнаходжанне невядома.</string>
-    <!-- abbreviation for meters -->
-    <string name="m">м</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">км</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">км/г</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">міля</string>
-    <!-- A unit of measure -->
-    <string name="ft">фут</string>
     <string name="miles_per_hour">міль/г</string>
     <string name="hour">г</string>
     <string name="minute">хв</string>
@@ -578,8 +550,6 @@
     <string name="prefs_languages_information_off_link">Больш падрабязная інфармацыя знаходзіцца ў гэтым кіраўніцтве.</string>
     <string name="transliteration_title">Транслітарацыя лацінкай</string>
     <string name="learn_more">Даведацца больш</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Выхад</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Скарыстайцеся пошукам або націсніце на карце, каб дадаць пачатак маршруту</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -591,7 +561,6 @@
     <string name="dialog_error_storage_title">Праблема з доступам да сховішча</string>
     <string name="dialog_error_storage_message">Знешняе сховішча недаступна. Магчыма, SD-карта была вынята або пашкоджана ці файлавая сістэма даступна толькі для чытання. Праверце SD-карту або зважыцеся з намі праз support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Эмуляваць дрэннае сховішча</string>
-    <string name="core_entrance">Уваход</string>
     <string name="error_enter_correct_name">Увядзіце правільную назву</string>
     <string name="bookmark_lists">Спісы</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -631,16 +600,12 @@
     <string name="button_layer_traffic">Рух</string>
     <string name="subway">Метро</string>
     <string name="layers_title">Стылі і слаі карты</string>
-    <string name="subway_data_unavailable">Карта метро недаступная</string>
     <string name="bookmarks_empty_list_title">Гэты спіс пусты</string>
     <string name="bookmarks_empty_list_message">Каб дадаць закладку, дакраніцеся да месца на карце, а затым націсніце значок зорачкі</string>
     <string name="category_desc_more">…яшчэ</string>
     <string name="export_file">Экспарт KMZ</string>
     <string name="export_file_gpx">Экспарт GPX</string>
     <string name="delete_list">Выдаліць спіс</string>
-    <string name="public_access">Публічны доступ</string>
-    <string name="limited_access">Абмежаваны доступ</string>
-    <string name="not_shared">Прыватны</string>
     <string name="speedcams_alert_title">Камеры хуткасці</string>
     <string name="place_description_title">Апісанне месца</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -657,7 +622,6 @@
     <string name="power_managment_setting_auto">Аўтаматычна</string>
     <string name="power_managment_setting_manual_max">Заўсёды</string>
     <string name="enable_logging_warning_message">Часова ўключыце гэты параметр , каб запісаць і ўручную адправіць нам падрабязную інфармацыю пра знойдзеную праблему праз кнопку «Паведаміць аб памылцы» ў акне «Даведка». Журнал падзей можа змяшчаць даныя пра месцазнаходжанне.</string>
-    <string name="access_rules_author_only">Рэдагаванне анлайн</string>
     <string name="driving_options_title">Налады пракладвання маршрутаў</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Пазбягаць платных дарог</string>
diff --git a/android/app/src/main/res/values-bg/strings.xml b/android/app/src/main/res/values-bg/strings.xml
index 1bed3680c..8aa446325 100644
--- a/android/app/src/main/res/values-bg/strings.xml
+++ b/android/app/src/main/res/values-bg/strings.xml
@@ -14,13 +14,8 @@
     <string name="downloading">Теглене…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
     <string name="kilometres">Километри</string>
-    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
-    <string name="mb">МБ</string>
-    <string name="gb">ГБ</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Мили</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">Мое местоположение</string>
     <!-- Update maps later button text -->
     <string name="later">По-късно</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -76,8 +71,6 @@
     <string name="bookmarks">Отметки</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Отметки и пътеки</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">Мои места</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Име</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -139,8 +132,6 @@
     <string name="category_post">Поща</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Полиция</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">WiFi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Рециклиране</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -424,7 +415,6 @@
     <string name="empty_street_name_error">Въведете име на улица</string>
     <string name="choose_language">Избор на език</string>
     <string name="choose_street">Избор на улица</string>
-    <string name="postal_code">Пощенски код</string>
     <string name="cuisine">Кухня</string>
     <string name="select_cuisine">Избор на кухня</string>
     <!-- login text field -->
@@ -464,8 +454,6 @@
     <string name="error_enter_correct_storey_number">Броят на етажите не трябва да надвишава %d</string>
     <string name="editor_zip_code">Пощенски код</string>
     <string name="error_enter_correct_zip_code">Въведете валиден пощенски код</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">Точка на картата</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Забележка към доброволците на OpenStreetMap (по избор)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -483,14 +471,6 @@
     <string name="downloader_no_downloaded_maps_title">Не сте изтеглили никакви карти</string>
     <string name="downloader_no_downloaded_maps_message">Изтеглете картите, от които се нуждаете, за да намирате места и да навигирате без интернет.</string>
     <string name="current_location_unknown_error_title">Настоящото местоположение е неизвестно.</string>
-    <!-- abbreviation for meters -->
-    <string name="m">м</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">км</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">ми</string>
-    <!-- A unit of measure -->
-    <string name="ft">фут</string>
     <string name="hour">ч</string>
     <string name="minute">мин</string>
     <string name="day">д</string>
@@ -541,8 +521,6 @@
     <string name="prefs_languages_information_off_link">За повече информация вижте това ръководство.</string>
     <string name="transliteration_title">Изпиши на латиница</string>
     <string name="learn_more">Научете повече</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Изход</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Използвайте търсене или докоснете картата, за да добавите начална точка на маршрута</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -554,7 +532,6 @@
     <string name="dialog_error_storage_title">Проблем с достъпа до хранилището</string>
     <string name="dialog_error_storage_message">Външната памет на устройството не е налична, SD картата може да е била извадена, повредена или файловата система е само за четене. Проверете това и се свържете с нас support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Емулация на грешки с външна памет</string>
-    <string name="core_entrance">Вход</string>
     <string name="error_enter_correct_name">Моля, въведете правилно име</string>
     <string name="bookmark_lists">Списъци</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -589,16 +566,12 @@
     <string name="button_layer_traffic">Трафик</string>
     <string name="subway">Метро</string>
     <string name="layers_title">Стилове и слоеве на картата</string>
-    <string name="subway_data_unavailable">Картата на метрото не е налична</string>
     <string name="bookmarks_empty_list_title">Този списък е празен</string>
     <string name="bookmarks_empty_list_message">За да добавите отметка, докоснете място на картата, след което докоснете звездообразната икона.</string>
     <string name="category_desc_more">…още</string>
     <string name="export_file">Експорт на KMZ</string>
     <string name="export_file_gpx">Експортиране на GPX</string>
     <string name="delete_list">Изтриване на списък</string>
-    <string name="public_access">Публичен достъп</string>
-    <string name="limited_access">Ограничен достъп</string>
-    <string name="not_shared">Лично</string>
     <string name="speedcams_alert_title">Камери за скорост</string>
     <string name="place_description_title">Описание на мястото</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -615,7 +588,6 @@
     <string name="power_managment_setting_auto">Автоматично</string>
     <string name="power_managment_setting_manual_max">Максимално пестене на енергия</string>
     <string name="enable_logging_warning_message">Тази настройка е разрешена, за да се записват действия за диагностични цели, които помагат на нашия екип да идентифицира проблеми с приложението. Временно активирайте тази настройка само за изпращане на подробна информация за проблема, който сте открили с приложението.</string>
-    <string name="access_rules_author_only">Онлайн редактиране</string>
     <string name="driving_options_title">Опции за маршрутизация</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Избягвайте платените пътища</string>
@@ -773,7 +745,6 @@
     <string name="parks">Паркове</string>
     <string name="deep_purple">Тъмно Лилаво</string>
     <string name="tts_info_link">https://www.comaps.app/support/tts-configuration-guide-for-android/</string>
-    <string name="maps_storage_removable">Карта памет</string>
     <string name="placepage_distance">Разстояние</string>
     <string name="menu">Меню</string>
     <string name="github">GitHub</string>
@@ -795,9 +766,7 @@
     <string name="telegram_url">https://t.me/CoMapsApp/</string>
     <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
     <string name="moreyear_ago_sorttype">Преди повече от година</string>
-    <string name="maps_storage_external">Външно споделено хранилище</string>
     <string name="deep_orange">Тъмно Оранжево</string>
-    <string name="maps_storage_shared">Вътрешно споделено хранилище</string>
     <string name="maps_storage_free_size">%1$s свободни от %2$s</string>
     <string name="telegram">Telegram</string>
     <string name="shops">Магазини</string>
diff --git a/android/app/src/main/res/values-bn/strings.xml b/android/app/src/main/res/values-bn/strings.xml
index cc28f4a49..3c8850785 100644
--- a/android/app/src/main/res/values-bn/strings.xml
+++ b/android/app/src/main/res/values-bn/strings.xml
@@ -6,12 +6,9 @@
     <string name="cancel">বাতিল</string>
     <string name="miles">মাইল</string>
     <string name="later">পরে</string>
-    <string name="core_my_position">আমার অবস্থান</string>
     <string name="search">খুঁজুন</string>
     <string name="download_has_failed">ডাউনলোড ব্যর্থ। আবার চেষ্টা করতে টিপ দাও।</string>
-    <string name="mb">এমবি</string>
     <string name="search_map">ম্যাপ অনুসন্ধান</string>
-    <string name="gb">জিবি</string>
     <string name="kilometres">কিলোমিটার</string>
     <string name="downloading">ডাউনলোডরত…</string>
     <string name="telegram_url">https://t.me/CoMapsApp/</string>
@@ -53,14 +50,10 @@
     <string name="bookmark_set_name">বুকমার্ক তালিকার নাম</string>
     <string name="bookmarks">বুকমার্কসমূহ</string>
     <string name="bookmarks_and_tracks">বুকমার্ক ও ট্র্যাকসমূহ</string>
-    <string name="core_my_places">আমার স্থানগুলি</string>
     <string name="name">নাম</string>
     <string name="address">ঠিকানা</string>
     <string name="list">তালিকা</string>
     <string name="maps_storage_downloaded">ডাউনলোড করা মানচিত্রসমূহ</string>
-    <string name="maps_storage_internal">অভ্যন্তরীণ প্রাইভেট স্টোরেজ</string>
-    <string name="maps_storage_removable">SD কার্ড</string>
-    <string name="maps_storage_external">বহিরাগত শেয়ার্ড স্টোরেজ</string>
     <string name="maps_storage_free_size">%1$s মধ্যে %2$s ফাঁকা</string>
     <string name="move_maps">মানচিত্রের স্থান সরাবেন?</string>
     <string name="move_maps_error">মানচিত্রের স্থান সরানোর সময়ে সমস্যা হলো</string>
@@ -83,7 +76,6 @@
     <string name="category_toilet">শৌচালয়</string>
     <string name="category_post">ডাক</string>
     <string name="category_police">পুলিশ</string>
-    <string name="category_wifi">ওয়াইফাই</string>
     <string name="category_recycling">রিসাইক্লিং</string>
     <string name="category_water">জল</string>
     <string name="category_rv">আর ভি সুযোগ-সুবিধা</string>
@@ -120,7 +112,6 @@
     <string name="unsupported_phone">এই অ্যাপ চালানোর জন্য হার্ডওয়্যার দ্বারা ত্বরিত OpenGL জরুরি। দুর্ভাগ্যবশত, আপনার ডিভাইস এটি সমর্থন করে না।</string>
     <string name="maps_storage">মানচিত্রগুলি রাখার যায়গা বেছে নিন</string>
     <string name="maps_storage_summary">ফোল্ডার বেছে মানচিত্রগুলি ডাউনলোড করুন</string>
-    <string name="maps_storage_shared">অভ্যন্তরীণ শেয়ার্ড স্টোরেজ</string>
     <string name="share_bookmarks_email_subject">CoMaps-এর বুকমার্কগুলি আপনার দ্বারা শেয়ার করা হলো</string>
     <string name="share_bookmarks_email_body">নমস্কার!\n\nআমি আমার CoMaps-এর বুকমার্কগুলি এখানে দিচ্ছি। যদি আপনার কাছে ইনস্টল না করা থাকি, তাহলে আপনি এখান থেকে ডাউনলোড করতে পারেন: https://www.comaps.app/download/\n\nCoMaps-এর সঙ্গে ভ্রমণ উপভোগ করুন!</string>
     <string name="my_position_share_sms">আমার বর্তমান অবস্থানটি CoMaps-এ দেখুন! %1$s বা %2$s আপনার কাছে অফলাইন মানচিত্র নেই? এইখান থেকে ডাউনলোড করুন: https://www.comaps.app/download/</string>
@@ -314,7 +305,6 @@
     <string name="empty_street_name_error">অনুগ্রহ করে রাস্তার নামটি লিখুন</string>
     <string name="choose_language">একটি ভাষা বেছে নিন</string>
     <string name="choose_street">একটি রাস্তা বেছে নিন</string>
-    <string name="postal_code">ডাক কোড</string>
     <string name="cuisine">রন্ধনপ্রণালী</string>
     <string name="select_cuisine">রন্ধনপ্রণালী নির্বাচন করুন</string>
     <string name="email_or_username">ইমাইল বা ইউইজারনেম</string>
diff --git a/android/app/src/main/res/values-ca/strings.xml b/android/app/src/main/res/values-ca/strings.xml
index 5d28afd04..c64b5e8da 100644
--- a/android/app/src/main/res/values-ca/strings.xml
+++ b/android/app/src/main/res/values-ca/strings.xml
@@ -16,8 +16,6 @@
     <string name="kilometres">Quilòmetres</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Milles</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">La meva posició</string>
     <!-- Update maps later button text -->
     <string name="later">Més tard</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -73,8 +71,6 @@
     <string name="bookmarks">Marcadors</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Marcadors i recorreguts</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">Els meus llocs</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Nom</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -89,14 +85,6 @@
     <string name="maps_storage_summary">Indiqueu la carpeta on s’han de baixar els mapes.</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Mapes baixats</string>
-    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">Emmagatzematge privat intern</string>
-    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">Emmagatzematge compartit intern</string>
-    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
-    <string name="maps_storage_removable">Targeta SD</string>
-    <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">Emmagatzematge compartit extern</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
     <string name="maps_storage_free_size">%1$s lliures de %2$s</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -148,8 +136,6 @@
     <string name="category_post">Oficina postal</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Policia</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">WiFi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Reciclatge</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -456,7 +442,6 @@
     <string name="empty_street_name_error">Introduïu un nom de carrer</string>
     <string name="choose_language">Trieu una llengua</string>
     <string name="choose_street">Trieu un carrer</string>
-    <string name="postal_code">Codi postal</string>
     <string name="cuisine">Cuina</string>
     <string name="select_cuisine">Trieu una cuina</string>
     <!-- login text field -->
@@ -497,8 +482,6 @@
     <string name="error_enter_correct_storey_number">El nombre de plantes no pot excedir de %d</string>
     <string name="editor_zip_code">Codi postal</string>
     <string name="error_enter_correct_zip_code">Introduïu un codi postal vàlid</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">Punt del mapa</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Nota per als voluntaris d\'OpenStreetMap (opcional)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -516,16 +499,8 @@
     <string name="downloader_no_downloaded_maps_title">No heu baixat cap mapa</string>
     <string name="downloader_no_downloaded_maps_message">Baixeu mapes per a cercar una ubicacio i usar la navegació sense connexió.</string>
     <string name="current_location_unknown_error_title">Es desconeix la ubicació actual.</string>
-    <!-- abbreviation for meters -->
-    <string name="m">m</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">km</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/h</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">mi</string>
-    <!-- A unit of measure -->
-    <string name="ft">ft</string>
     <string name="miles_per_hour">mph</string>
     <string name="hour">h</string>
     <string name="minute">min</string>
@@ -585,8 +560,6 @@
     <string name="prefs_languages_information_off_link">Per a més informació, vegeu aquesta guia.</string>
     <string name="transliteration_title">Transliteració a l’alfabet llatí</string>
     <string name="learn_more">Més informació</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Sortida</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Utilitzeu la cerca o toqueu el mapa per afegir un punt de partida de la ruta</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -598,7 +571,6 @@
     <string name="dialog_error_storage_title">S\'ha produït un problema en l\'accés a l\'emmagatzematge</string>
     <string name="dialog_error_storage_message">L\'emmagatzematg extern no és accessible. La targeta SD potser s\'ha retirat, malmès, o el sistema de fitxer és de només lectura. Comproveu la targeta SD o contacteu amb nosaltres a support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emula un emmagatzematge malmès</string>
-    <string name="core_entrance">Entrada</string>
     <string name="error_enter_correct_name">Introduïu un nom correcte</string>
     <string name="bookmark_lists">Llistes</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -641,16 +613,12 @@
     <string name="button_layer_traffic">Trànsit</string>
     <string name="subway">Metro</string>
     <string name="layers_title">Estils i capes del mapa</string>
-    <string name="subway_data_unavailable">El mapa del metro no està disponible</string>
     <string name="bookmarks_empty_list_title">Aquesta llista és buida</string>
     <string name="bookmarks_empty_list_message">Per a afegir un marcador, toqueu un lloc en el mapa i després toqueu la icona d\'estrella</string>
     <string name="category_desc_more">…més</string>
     <string name="export_file">Exporta KMZ</string>
     <string name="export_file_gpx">Exporta GPX</string>
     <string name="delete_list">Suprimeix la llista</string>
-    <string name="public_access">Accés públic</string>
-    <string name="limited_access">Accés limitat</string>
-    <string name="not_shared">Privat</string>
     <string name="speedcams_alert_title">Radars</string>
     <string name="place_description_title">Descripció del lloc</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -667,7 +635,6 @@
     <string name="power_managment_setting_auto">Automàtic</string>
     <string name="power_managment_setting_manual_max">Sempre</string>
     <string name="enable_logging_warning_message">Activeu aquesta opció temporalment per a registrar i enviar manualment registres de diagnòstic detallats sobre el vostre problema utilitzant «Informeu d’un error» al diàleg Ajuda. Els registres poden incloure informació d’ubicació.</string>
-    <string name="access_rules_author_only">Edició en línia</string>
     <string name="driving_options_title">Opcions d’encaminament</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Evita peatges</string>
@@ -869,8 +836,6 @@
     <string name="github">GitHub</string>
     <string name="level_value_generic">Nivell: %s</string>
     <string name="instagram">Instagram</string>
-    <string name="mb">MB</string>
-    <string name="gb">GB</string>
     <string name="login_osm">Inicia sessió a l’OpenStreetMap</string>
     <string name="twitter">X (Twitter)</string>
     <string name="wikimedia_commons">Wikimedia Commons</string>
diff --git a/android/app/src/main/res/values-cs/strings.xml b/android/app/src/main/res/values-cs/strings.xml
index 2d488e88d..255d2837d 100644
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -16,8 +16,6 @@
     <string name="kilometres">Kilometry</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Míle</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">Moje poloha</string>
     <!-- Update maps later button text -->
     <string name="later">Později</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -75,8 +73,6 @@
     <string name="bookmarks">Záložky</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Záložky a stopy</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">Moje místa</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Název</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -138,8 +134,6 @@
     <string name="category_post">Pošta</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Policie</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">Wi-Fi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Recyklace</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -440,7 +434,6 @@
     <string name="empty_street_name_error">Zadejte název ulice</string>
     <string name="choose_language">Zvolit jazyk</string>
     <string name="choose_street">Zvolit ulici</string>
-    <string name="postal_code">PSČ</string>
     <string name="cuisine">Kuchyně</string>
     <string name="select_cuisine">Vybrat kuchyni</string>
     <!-- login text field -->
@@ -480,8 +473,6 @@
     <string name="error_enter_correct_storey_number">Opravte počet poschodí, max. %d</string>
     <string name="editor_zip_code">PSČ</string>
     <string name="error_enter_correct_zip_code">Zadejte správné poštovní směrovací číslo</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">Bod na mapě</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Poznámka pro dobrovolníky OpenStreetMap (nepovinné)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -499,16 +490,8 @@
     <string name="downloader_no_downloaded_maps_title">Nemáte stažené žádné mapy</string>
     <string name="downloader_no_downloaded_maps_message">Stáhněte si mapy a hledejte cestu a její cíl, i když jste offline</string>
     <string name="current_location_unknown_error_title">Aktuální poloha je neznámá</string>
-    <!-- abbreviation for meters -->
-    <string name="m">m</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">km</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/h</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">mil</string>
-    <!-- A unit of measure -->
-    <string name="ft">stopa</string>
     <string name="miles_per_hour">mil/h</string>
     <string name="hour">hod</string>
     <string name="minute">min</string>
@@ -560,8 +543,6 @@
     <string name="prefs_languages_information_off_link">Více informací najdete v tomto návodu</string>
     <string name="transliteration_title">Přepis do latinky</string>
     <string name="learn_more">Zjistit více</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Ukončit</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Pomocí vyhledávání nebo klepnutím na mapu přidejte výchozí bod trasy</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -573,7 +554,6 @@
     <string name="dialog_error_storage_title">Problém s přístupem k úložišti</string>
     <string name="dialog_error_storage_message">Externí úložiště není k dispozici, pravděpodobně byla vyjmuta nebo poškozena SD karta, nebo je systém souborů pouze pro čtení. Zkontrolujte to prosím a kontaktujte nás na support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emulovat špatné úložiště</string>
-    <string name="core_entrance">Vstup</string>
     <string name="error_enter_correct_name">Zadejte prosím správný název</string>
     <string name="bookmark_lists">Seznamy</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -616,16 +596,12 @@
     <string name="button_layer_traffic">Zácpy</string>
     <string name="subway">Metro</string>
     <string name="layers_title">Styly a vrstvy mapy</string>
-    <string name="subway_data_unavailable">Mapa metra není dostupná</string>
     <string name="bookmarks_empty_list_title">Seznam je prázdný</string>
     <string name="bookmarks_empty_list_message">Pro přidání nové značky klikněte na symbol hvězdičky na obrázku objektu</string>
     <string name="category_desc_more">…ještě</string>
     <string name="export_file">Exportovat KMZ</string>
     <string name="export_file_gpx">Export GPX</string>
     <string name="delete_list">Smazat seznam</string>
-    <string name="public_access">Veřejně přístupné</string>
-    <string name="limited_access">Soukromé</string>
-    <string name="not_shared">Osobní účet</string>
     <string name="speedcams_alert_title">Radary</string>
     <string name="place_description_title">Popis místa</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -642,7 +618,6 @@
     <string name="power_managment_setting_auto">Při vybité baterii</string>
     <string name="power_managment_setting_manual_max">Vždy</string>
     <string name="enable_logging_warning_message">Dočasně zapněte, abyste mohli zaznamenat a ručně nám poslat podrobná diagnostická data o vašem problému pomocí tlačítka „Nahlásit chybu“ v okně nápovědy. Protokoly mohou zahrnovat informace o poloze.</string>
-    <string name="access_rules_author_only">Upravujte on-line</string>
     <string name="driving_options_title">Možnosti trasy</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Vyhnout se mýtnému</string>
@@ -827,9 +802,7 @@
     <string name="uri_open_location_failed">Není nainstalována žádná aplikace, která by mohla otevřít umístění</string>
     <!-- preference string for using auto theme only in navigation mode -->
     <string name="nav_auto">Automaticky v navigaci</string>
-    <string name="maps_storage_removable">SD karta</string>
     <string name="closes_in">Zavírá za %s</string>
-    <string name="gb">GB</string>
     <string name="github">GitHub</string>
     <string name="menu">Nabídka</string>
     <string name="wikimedia_commons">Wikimedia Commons</string>
@@ -846,16 +819,12 @@
     <string name="disk_error">Nepodařilo se vytvořit složku a přesunout soubory v interní paměti zařízení nebo na SD kartě</string>
     <string name="comma_separated_pair">%1$s, %2$s</string>
     <string name="error_enter_correct_vk_page">Zadejte platné uživatelské jméno nebo webovou adresu VK</string>
-    <string name="mb">MB</string>
     <string name="disconnect_usb_cable_title">Odpojte kabel USB</string>
     <string name="connection_failure">Chyba připojení</string>
     <string name="opens_in">Otevírá za %s</string>
-    <string name="maps_storage_shared">Interní sdílené úložiště</string>
     <string name="mastodon">Mastodon</string>
     <string name="facebook">Facebook</string>
     <string name="level_value_generic">Podlaží: %s</string>
-    <string name="maps_storage_internal">Interní soukromé úložiště</string>
-    <string name="maps_storage_external">Externí sdílené úložiště</string>
     <string name="telegram">Telegram</string>
     <string name="error_enter_correct_facebook_page">Zadejte platnou webovou adresu, účet nebo název stránky na Facebooku</string>
     <string name="tts_info_link">https://www.comaps.app/support/tts-configuration-guide-for-android/</string>
diff --git a/android/app/src/main/res/values-cy/strings.xml b/android/app/src/main/res/values-cy/strings.xml
index 3a084195e..168f247ab 100644
--- a/android/app/src/main/res/values-cy/strings.xml
+++ b/android/app/src/main/res/values-cy/strings.xml
@@ -6,10 +6,7 @@
     <string name="download_maps">Lawrlwytho Mapiau</string>
     <string name="download_has_failed">Methwyd lawrlwytho, tapiwch i geisio eto</string>
     <string name="kilometres">Cilometrau</string>
-    <string name="mb">MB</string>
-    <string name="gb">GB</string>
     <string name="miles">Milltiroedd</string>
-    <string name="core_my_position">Fy Lleoliad</string>
     <string name="later">Nes ymlaen</string>
     <string name="search">Chwilio</string>
     <string name="location_is_disabled_long_text">Mae\'r holl Wasanaethau Lleoliad ar gyfer y ddyfais neu\'r rhaglen hon wedi\'u analluogi. Rhowch nhw ar waith yn y Gosodiadau.</string>
@@ -55,7 +52,6 @@
     <string name="category_toilet">Toiled</string>
     <string name="category_post">Post</string>
     <string name="category_police">Heddlu</string>
-    <string name="category_wifi">WiFi</string>
     <string name="category_recycling">Ailgylchu</string>
     <string name="category_water">Dŵr</string>
     <string name="description">Nodiadau</string>
@@ -124,10 +120,7 @@
     <string name="editor_edit_place_title">Golygu</string>
     <string name="editor_add_place_title">Ychwanegu</string>
     <string name="editor_edit_place_category_title">Categori</string>
-    <string name="m">m</string>
     <string name="kilometers_per_hour">km/h</string>
-    <string name="mi">mi</string>
-    <string name="ft">ft</string>
     <string name="miles_per_hour">mya</string>
     <string name="hour">h</string>
     <string name="minute">min</string>
@@ -138,15 +131,12 @@
     <string name="editor_remove_place_button">Dileu</string>
     <string name="navigation_stop_button">Stopio</string>
     <string name="accept">Derbyn</string>
-    <string name="core_exit">Allanfa</string>
     <string name="saved">Cadwyd</string>
-    <string name="core_entrance">Mynedfa</string>
     <string name="bookmark_lists">Rhestrau</string>
     <string name="restore">Adfer</string>
     <string name="privacy">Preifatrwydd</string>
     <string name="button_layer_traffic">Traffig</string>
     <string name="category_desc_more">...mwy</string>
-    <string name="not_shared">Preifat</string>
     <string name="power_managment_setting_manual_max">Bob amser</string>
     <string name="yes">Ie</string>
     <string name="no">Na</string>
@@ -182,15 +172,12 @@
     <string name="backup_interval_every_day">Dyddiol</string>
     <string name="backup_interval_every_week">Wythnosol</string>
     <string name="editor_report_problem_send_button">Anfon</string>
-    <string name="km">km</string>
     <string name="elevation_profile_descent">Disgyniad</string>
     <string name="yes_available">Ie</string>
     <string name="try_again">Ceisio Eto</string>
     <string name="about_menu_title">CoMaps</string>
     <string name="location_settings">Gosodiadau Lleoliad</string>
-    <string name="core_my_places">Fy Lleoliadau</string>
     <string name="maps_storage_downloaded">Mapiau wedi\'u lawrlwytho</string>
-    <string name="maps_storage_removable">Cerdyn SD</string>
     <string name="move_maps">Symud mapiau?</string>
     <string name="measurement_units">Unedau mesur</string>
     <string name="category_secondhand">Ail Law</string>
@@ -242,7 +229,6 @@
     <string name="edit_place">Golygu Lle</string>
     <string name="house_number">Rhif adeilad</string>
     <string name="social_media">Cyfryngau Cymdeithasol</string>
-    <string name="postal_code">Cod Post</string>
     <string name="select_cuisine">Dewis bwyd</string>
     <string name="editor_add_phone">Ychwanegu Rhif Ffôn</string>
     <string name="level_value_generic">Lefel: %s</string>
@@ -253,7 +239,6 @@
     <string name="editor_report_problem_other_title">Problem arall</string>
     <string name="placepage_add_business_button">Ychwanegu busnes</string>
     <string name="editor_zip_code">Cod ZIP</string>
-    <string name="core_placepage_unknown_place">Pwynt Map</string>
     <string name="operator">Gweithredwr: %s</string>
     <string name="placepage_edit_bookmark_button">Golygu Nod Tudalen</string>
     <string name="mobile_data_option_always">Defnyddio Bob Amser</string>
@@ -276,14 +261,11 @@
     <string name="export_file">Allforio KMZ</string>
     <string name="export_file_gpx">Allforio GPX</string>
     <string name="delete_list">Dileu rhestr</string>
-    <string name="public_access">Mynediad cyhoeddus</string>
-    <string name="limited_access">Mynediad cyfyngedig</string>
     <string name="speedcams_alert_title">Camerâu cyflymder</string>
     <string name="place_description_title">Disgrifiad Lleoliad</string>
     <string name="notification_channel_downloader">Lawrlwythwr Map</string>
     <string name="pref_tts_speedcams_always">Rhybuddio bob amser</string>
     <string name="pref_tts_speedcams_never">Byth</string>
-    <string name="access_rules_author_only">Golygu ar-lein</string>
     <string name="clear">Clirio</string>
     <string name="vehicle">Cerbyd</string>
     <string name="pedestrian">Cerddwyr</string>
diff --git a/android/app/src/main/res/values-da/strings.xml b/android/app/src/main/res/values-da/strings.xml
index dcf43ffc3..8a53b1d73 100644
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -16,8 +16,6 @@
     <string name="kilometres">Kilometer</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Mil</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">Min position</string>
     <!-- Update maps later button text -->
     <string name="later">Senere</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -75,8 +73,6 @@
     <string name="bookmarks">Bogmærker</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Bogmærker og spor</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">Mine steder</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Navn</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -138,8 +134,6 @@
     <string name="category_post">Post</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Politi</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">WiFi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Recirkulering</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -436,7 +430,6 @@
     <string name="empty_street_name_error">Indtast et gadenavn</string>
     <string name="choose_language">Vælg et sprog</string>
     <string name="choose_street">Vælg en gade</string>
-    <string name="postal_code">Postnummer</string>
     <string name="cuisine">Køkken</string>
     <string name="select_cuisine">Vælg køkken</string>
     <!-- login text field -->
@@ -476,8 +469,6 @@
     <string name="error_enter_correct_storey_number">Antallet af etager må ikke overstige %d etager</string>
     <string name="editor_zip_code">Postnummer</string>
     <string name="error_enter_correct_zip_code">Indtast et gyldigt postnummer</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">Kortpunkt</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Note til OpenStreetMap-frivillige (valgfrit)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -495,16 +486,8 @@
     <string name="downloader_no_downloaded_maps_title">Du har ikke downloadet nogen kort</string>
     <string name="downloader_no_downloaded_maps_message">Download kort for at søge og navigere offline</string>
     <string name="current_location_unknown_error_title">Aktuel placering er ukendt</string>
-    <!-- abbreviation for meters -->
-    <string name="m">m</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">km</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/t</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">mil</string>
-    <!-- A unit of measure -->
-    <string name="ft">fod</string>
     <string name="miles_per_hour">mph</string>
     <string name="hour">time</string>
     <string name="minute">min</string>
@@ -556,8 +539,6 @@
     <string name="prefs_languages_information_off_link">Se denne vejledning for flere oplysninger</string>
     <string name="transliteration_title">Translitterer til det latinske alfabet</string>
     <string name="learn_more">Flere oplysninger</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Udgang</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Brug søgning eller tryk på kortet for at tilføje et startpunkt for en rute</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -569,7 +550,6 @@
     <string name="dialog_error_storage_title">Problem med lageradgang</string>
     <string name="dialog_error_storage_message">Eksternt lager er ikke tilgængeligt. SD-kortet kan være blevet fjernet eller beskadiget, eller filsystemet er skrivebeskyttet. Kontroller dit SD-kort eller kontakt os på support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emulér beskadiget lager</string>
-    <string name="core_entrance">Indgang</string>
     <string name="error_enter_correct_name">Angiv et korrekt navn</string>
     <string name="bookmark_lists">Lister</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -609,16 +589,12 @@
     <string name="button_layer_traffic">Trafik</string>
     <string name="subway">Undergrundsbane</string>
     <string name="layers_title">Kortstile og -lag</string>
-    <string name="subway_data_unavailable">Kort over undergrundsbaner er ikke tilgængeligt</string>
     <string name="bookmarks_empty_list_title">Listen er tom</string>
     <string name="bookmarks_empty_list_message">For at tilføje et bogmærke, så tryk et sted på kort og så på stjerneikonet</string>
     <string name="category_desc_more">…mere</string>
     <string name="export_file">Eksporter KMZ</string>
     <string name="export_file_gpx">Eksporter GPX</string>
     <string name="delete_list">Slet liste</string>
-    <string name="public_access">Offentlig adgang</string>
-    <string name="limited_access">Begrænset adgang</string>
-    <string name="not_shared">Privat</string>
     <string name="speedcams_alert_title">Fartkameraer</string>
     <string name="place_description_title">Beskrivelse af sted</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -635,7 +611,6 @@
     <string name="power_managment_setting_auto">Når batteriniveauet er lavt</string>
     <string name="power_managment_setting_manual_max">Altid</string>
     <string name="enable_logging_warning_message">Aktivér denne mulighed midlertidigt for at registrere og manuelt sende detaljerede diagnostiske logfiler om dit problem til os ved hjælp af \"Rapportér en fejl\" i Hjælp-dialogen. Logfiler kan indeholde placeringsoplysninger.</string>
-    <string name="access_rules_author_only">Online redigering</string>
     <string name="driving_options_title">Indstillinger for ruteberegning</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Undgå betalingsveje</string>
@@ -820,7 +795,6 @@
     <string name="facebook">Facebook</string>
     <string name="error_enter_correct_facebook_page">Indtast en gyldig Facebook-webadresse, -konto eller -sidenavn</string>
     <string name="connection_failure">Forbindelsesfejl</string>
-    <string name="mb">MB</string>
     <string name="twitter">X (Twitter)</string>
     <string name="error_enter_correct_twitter_page">Indtast et gyldigt Twitter-brugernavn eller en webadresse</string>
     <string name="share_bookmarks_email_body">Hej! \n \nVedhæftet er mine bogmærker; åbn dem venligst i CoMaps. Hvis du ikke har den installeret, kan du downloade den her: https://www.comaps.app/download/\n \nGod rejse med CoMaps!</string>
@@ -830,12 +804,7 @@
     <string name="translated_om_site_url">https://comaps.app/</string>
     <string name="navigation_stop_button">Stop</string>
     <string name="error_enter_correct_vk_page">Indtast et gyldigt VK-brugernavn eller en webadresse</string>
-    <string name="gb">GB</string>
     <string name="error_enter_correct_line_page">Indtast et gyldigt LINE ID eller en webadresse</string>
-    <string name="maps_storage_internal">Intern privat lagerplads</string>
-    <string name="maps_storage_shared">Intern delt lagerplads</string>
-    <string name="maps_storage_removable">SD-kort</string>
-    <string name="maps_storage_external">Ekstern delt lagerplads</string>
     <string name="tts_info_link">https://www.comaps.app/support/tts-configuration-guide-for-android/</string>
     <string name="level_value_generic">Etage: %s</string>
     <string name="closes_in">Lukker om %s</string>
diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
index 2650594a5..f4bf5b4ae 100644
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -16,8 +16,6 @@
     <string name="kilometres">Kilometer</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Meilen</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">Mein Standort</string>
     <!-- Update maps later button text -->
     <string name="later">Später</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -75,8 +73,6 @@
     <string name="bookmarks">Lesezeichen</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Lesezeichen und Tracks</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">Meine Orte</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Name</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -91,14 +87,6 @@
     <string name="maps_storage_summary">Wählen Sie den Speicherort für die herunterzuladenden Karten</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Heruntergeladene Karten</string>
-    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">Interner persönlicher Speicher</string>
-    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">Interner gemeinsamer Speicher</string>
-    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
-    <string name="maps_storage_removable">SD-Karte</string>
-    <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">Externer gemeinsamer Speicher</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
     <string name="maps_storage_free_size">%1$s frei von %2$s</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -150,8 +138,6 @@
     <string name="category_post">Post</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Polizeistation</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">WLAN</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Recycling</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -455,7 +441,6 @@
     <string name="empty_street_name_error">Geben Sie einen Straßennamen ein</string>
     <string name="choose_language">Eine Sprache wählen</string>
     <string name="choose_street">Eine Straße wählen</string>
-    <string name="postal_code">Postleitzahl</string>
     <string name="cuisine">Küche</string>
     <string name="select_cuisine">Küche auswählen</string>
     <!-- login text field -->
@@ -498,8 +483,6 @@
     <string name="error_enter_correct_storey_number">Das Gebäude kann nicht mehr als %d Etagen haben</string>
     <string name="editor_zip_code">Postleitzahl</string>
     <string name="error_enter_correct_zip_code">Geben Sie eine gültige Postleitzahl ein</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">Kartenpunkt</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Hinweis an Freiwillige von OpenStreetMap (optional)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -517,16 +500,8 @@
     <string name="downloader_no_downloaded_maps_title">Keine Karten heruntergeladen</string>
     <string name="downloader_no_downloaded_maps_message">Laden Sie Karten für die Offline-Suche und Navigation herunter</string>
     <string name="current_location_unknown_error_title">Aktueller Standort ist unbekannt</string>
-    <!-- abbreviation for meters -->
-    <string name="m">m</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">km</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/h</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">mi</string>
-    <!-- A unit of measure -->
-    <string name="ft">ft</string>
     <string name="miles_per_hour">mph</string>
     <string name="hour">h</string>
     <string name="minute">min</string>
@@ -586,8 +561,6 @@
     <string name="prefs_languages_information_off_link">Weitere Informationen finden Sie in dieser Anleitung</string>
     <string name="transliteration_title">Transliteration ins Lateinische alphabet</string>
     <string name="learn_more">Weitere Informationen</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Ausgang</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Verwende die Suche oder tippe auf die Karte, um einen Routenstartpunkt hinzuzufügen</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -599,7 +572,6 @@
     <string name="dialog_error_storage_title">Problem mit dem Zugriff auf den Speicher</string>
     <string name="dialog_error_storage_message">Der externe Speicher ist nicht verfügbar, möglicherweise wurde die SD-Karte entfernt oder sie ist beschädigt oder das Dateisystem ist schreibgeschützt. Überprüfen Sie das bitte oder kontaktieren Sie uns unter support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Fehlerhaften Speicher emulieren</string>
-    <string name="core_entrance">Eingang</string>
     <string name="error_enter_correct_name">Bitte geben Sie einen korrekten Namen ein</string>
     <string name="bookmark_lists">Listen</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -639,16 +611,12 @@
     <string name="button_layer_traffic">Verkehr</string>
     <string name="subway">U-Bahn</string>
     <string name="layers_title">Kartenstile und Ebenen</string>
-    <string name="subway_data_unavailable">Die U-Bahnkarte steht nicht zur Verfügung</string>
     <string name="bookmarks_empty_list_title">Die Liste ist leer</string>
     <string name="bookmarks_empty_list_message">Zum Hinzufügen eines Lesezeichens tippen Sie in der Karte auf den Ort und dann unten auf das Sternchen</string>
     <string name="category_desc_more">…mehr</string>
     <string name="export_file">KMZ exportieren</string>
     <string name="export_file_gpx">GPX exportieren</string>
     <string name="delete_list">Liste löschen</string>
-    <string name="public_access">Öffentlicher Zugriff</string>
-    <string name="limited_access">Privater Zugriff</string>
-    <string name="not_shared">Privat</string>
     <string name="speedcams_alert_title">Blitzer</string>
     <string name="place_description_title">Ortsbeschreibung</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -665,7 +633,6 @@
     <string name="power_managment_setting_auto">Bei niedrigem Akkustand</string>
     <string name="power_managment_setting_manual_max">Immer</string>
     <string name="enable_logging_warning_message">Aktivieren Sie diese Option zeitweise, um manuell Aktivitäten zwecks Diagnostik aufzuzeichnen und zu senden. Das hilft unserem Team, Probleme mit der App zu erkennen. Aktivieren Sie diese Option, reproduzieren Sie das Problem und senden Sie die Protokolle über die Schaltfläche \"Fehler melden\" an uns.</string>
-    <string name="access_rules_author_only">Online bearbeiten</string>
     <string name="driving_options_title">Routenoptionen</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Mautstraßen vermeiden</string>
@@ -866,10 +833,8 @@
     <string name="vk">VK</string>
     <string name="twitter">X (Twitter)</string>
     <string name="openstreetmap">OpenStreetMap</string>
-    <string name="gb">GB</string>
     <string name="github">GitHub</string>
     <string name="telegram">Telegram</string>
-    <string name="mb">MB</string>
     <string name="instagram">Instagram</string>
     <string name="mastodon">Mastodon</string>
     <string name="tts_info_link">https://www.comaps.app/support/tts-configuration-guide-for-android/</string>
diff --git a/android/app/src/main/res/values-el/strings.xml b/android/app/src/main/res/values-el/strings.xml
index f8fa5a2bb..856590065 100644
--- a/android/app/src/main/res/values-el/strings.xml
+++ b/android/app/src/main/res/values-el/strings.xml
@@ -14,11 +14,8 @@
     <string name="downloading">Λήψη…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
     <string name="kilometres">Χιλιόμετρα</string>
-    <string name="gb">GB</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Μίλια</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">Η θέση μου</string>
     <!-- Update maps later button text -->
     <string name="later">Αργότερα</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -74,8 +71,6 @@
     <string name="bookmarks">Αγαπημένα</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Αγαπημένα και διαδρομές</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">Οι τοποθεσίες μου</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Όνομα</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -90,14 +85,6 @@
     <string name="maps_storage_summary">Επιλέξτε την τοποθεσία λήψης των χαρτών.</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Κατεβασμένοι Χάρτες</string>
-    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">Εσωτερικός κρυφός αποθηκευτικός χώρος</string>
-    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">Εσωτερικός κοινός αποθηκευτικός χώρος</string>
-    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
-    <string name="maps_storage_removable">Κάρτα SD</string>
-    <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">Εξωτερικός κοινός αποθηκευτικός χώρος</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
     <string name="maps_storage_free_size">%1$s ελεύθερα από τα %2$s</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -149,8 +136,6 @@
     <string name="category_post">Ταχυδρομείο</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Αστυνομία</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">WiFi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Ανακύκλωση</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -458,7 +443,6 @@
     <string name="empty_street_name_error">Εισαγάγετε όνομα οδού</string>
     <string name="choose_language">Επιλέξτε μια γλώσσα</string>
     <string name="choose_street">Επιλέξτε μια οδό</string>
-    <string name="postal_code">Ταχυδρομικός Κώδικας</string>
     <string name="cuisine">Κουζίνα</string>
     <string name="select_cuisine">Επιλέξτε κουζίνα</string>
     <!-- login text field -->
@@ -499,8 +483,6 @@
     <string name="error_enter_correct_storey_number">Ο αριθμός των ορόφων δεν πρέπει να υπερβαίνει τους %d</string>
     <string name="editor_zip_code">Ταχυδρομικός κώδικας</string>
     <string name="error_enter_correct_zip_code">Εισάγετε έναν έγκυρο ταχυδρομικό κώδικα</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">Σημείο χάρτη</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Σημείωση για τους εθελοντές του OpenStreetMap (προαιρετική)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -518,14 +500,8 @@
     <string name="downloader_no_downloaded_maps_title">Δεν έχετε κατεβάσει χάρτες</string>
     <string name="downloader_no_downloaded_maps_message">Κατεβάστε χάρτες για να αναζητήσετε μια τοποθεσία και να χρησιμοποιήσετε την πλοήγησης χωρίς σύνδεση.</string>
     <string name="current_location_unknown_error_title">Η τρέχουσα τοποθεσία είναι άγνωστη.</string>
-    <!-- abbreviation for meters -->
-    <string name="m">μ</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">χμ</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">χμ/ω</string>
-    <!-- A unit of measure -->
-    <string name="ft">πόδια</string>
     <string name="placepage_more_button">Περισσότερα</string>
     <string name="placepage_edit_bookmark_button">Επεξεργασία αγαπημένου</string>
     <string name="placepage_personal_notes_hint">Προσωπικές σημειώσεις (κείμενο ή html)</string>
@@ -581,8 +557,6 @@
     <string name="prefs_languages_information_off_link">Για περισσότερες πληροφορίες δείτε αυτό τον οδηγό.</string>
     <string name="transliteration_title">Μεταγραφή στο λατινικό αλφάβητο</string>
     <string name="learn_more">Μάθετε περισσότερα</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Έξοδος</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Χρησιμοποιήστε την αναζήτηση ή πατήστε στο χάρτη για να προσθέσετε ένα σημείο εκκίνησης της διαδρομής</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -594,7 +568,6 @@
     <string name="dialog_error_storage_title">Πρόβλημα πρόσβασης στον αποθηκευτικό χώρο</string>
     <string name="dialog_error_storage_message">Ο εξωτερικός απθηκευτικός χώρος δεν είναι διαθέσιμος, πιθανότατα έχει αφαιρεθεί η κάρτα SD, είναι κατεστραμμένη ή το σύστημα αρχείων είναι μόνο για ανάγνωση. Ελέγξτε το και επικοινωνήστε μαζί μας στη διεύθυνση support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Εξομείωση κακού αποθηκευτικού χώρου</string>
-    <string name="core_entrance">Είσοδος</string>
     <string name="error_enter_correct_name">Εισάγετε ένα σωστό όνομα</string>
     <string name="bookmark_lists">Λίστες</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -634,16 +607,12 @@
     <string name="button_layer_traffic">Κίνηση</string>
     <string name="subway">Μετρό</string>
     <string name="layers_title">Στυλ χάρτη και επίπεδα</string>
-    <string name="subway_data_unavailable">Ο χάρτης μετρό δεν είναι διαθέσιμος</string>
     <string name="bookmarks_empty_list_title">Η λίστα είναι άδεια</string>
     <string name="bookmarks_empty_list_message">Για να προσθέσετε σελιδοδείκτη, πατήστε ένα μέρος στο χάρτη και μετά πατήστε το αστεράκι</string>
     <string name="category_desc_more">…περισσότερα</string>
     <string name="export_file">Εξαγωγή KMZ</string>
     <string name="export_file_gpx">Εξαγωγή GPX</string>
     <string name="delete_list">Διαγραφή λίστας</string>
-    <string name="public_access">Δημόσια πρόσβαση</string>
-    <string name="limited_access">Περιορισμένη πρόσβαση</string>
-    <string name="not_shared">Ιδιωτικό</string>
     <string name="speedcams_alert_title">Κάμερες Ταχύτητας</string>
     <string name="place_description_title">Περιγραφή μέρους</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -660,7 +629,6 @@
     <string name="power_managment_setting_auto">Αυτόματα</string>
     <string name="power_managment_setting_manual_max">Πάντα</string>
     <string name="enable_logging_warning_message">Αυτή η λειτουργία είναι ενεργοποιημένη για την καταγραφή ενεργειών για διαγνωστικούς σκοπούς. Αυτό βοηθά την ομάδα να εντοπίζει προβλήματα με την εφαρμογή. Να ενεργοποιείτε τη λειτουργία μόνο κατόπιν αιτήματος της υποστήριξης του CoMaps.</string>
-    <string name="access_rules_author_only">Online επεξεργασία</string>
     <string name="driving_options_title">Ρυθμίσεις δρομολόγησης</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Αποφυγή διοδίων</string>
@@ -862,8 +830,6 @@
     <string name="editor_line_social_network">LINE</string>
     <string name="tts_info_link">https://www.comaps.app/support/tts-configuration-guide-for-android/</string>
     <string name="level_value_generic">Όροφος: %s</string>
-    <string name="mb">MB</string>
-    <string name="mi">μι</string>
     <string name="miles_per_hour">mph</string>
     <string name="openstreetmap">OpenStreetMap</string>
     <string name="minute">λπτ</string>
diff --git a/android/app/src/main/res/values-en-rGB/strings.xml b/android/app/src/main/res/values-en-rGB/strings.xml
index 2e4d88d20..42f3488d2 100644
--- a/android/app/src/main/res/values-en-rGB/strings.xml
+++ b/android/app/src/main/res/values-en-rGB/strings.xml
@@ -16,7 +16,6 @@
     <!-- SECTION: Routing dialogs strings -->
     <string name="dialog_routing_disclaimer_borders">— Exercise caution with routes in border zones: the routes created by our app may sometimes cross country borders in unauthorised places.</string>
     <!-- SECTION: Strings for downloading map from search -->
-    <string name="postal_code">Postcode</string>
     <string name="editor_zip_code">Postcode</string>
     <string name="error_enter_correct_zip_code">Enter a valid postcode</string>
     <plurals name="bookmarks_places">
@@ -32,7 +31,6 @@
         <item quantity="other">%d tracks</item>
     </plurals>
     <string name="subway">Metro</string>
-    <string name="subway_data_unavailable">Metro map is unavailable</string>
     <string name="avoid_motorways">Avoid motorways</string>
     <!-- SECTION: Bookmark types used for sorting -->
     <string name="fuel_places">Petrol Stations</string>
diff --git a/android/app/src/main/res/values-es-rMX/strings.xml b/android/app/src/main/res/values-es-rMX/strings.xml
index dc55003bc..fea890ac6 100644
--- a/android/app/src/main/res/values-es-rMX/strings.xml
+++ b/android/app/src/main/res/values-es-rMX/strings.xml
@@ -63,7 +63,6 @@
     <string name="dialog_error_storage_title">Problema de acceso al almacenamiento</string>
     <string name="dialog_error_storage_message">El almacenamiento externo no está disponible. Es posible que se haya quitado o dañado la tarjeta SD, o que el sistema de archivos solo permita la lectura. Revíselo y escríbanos a support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emular el almacenamiento dañado</string>
-    <string name="core_entrance">Entrada</string>
     <string name="error_enter_correct_name">Introduzca el nombre correcto</string>
     <string name="bookmark_lists">Listas</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -101,14 +100,10 @@
     <string name="button_layer_traffic">Tráfico</string>
     <string name="subway">Metro</string>
     <string name="layers_title">Estilos y capas de mapas</string>
-    <string name="subway_data_unavailable">El mapa del metro no está disponible</string>
     <string name="bookmarks_empty_list_title">Esta lista está vacía</string>
     <string name="bookmarks_empty_list_message">Para añadir un marcador, toque un lugar en el mapa y después toque el ícono de estrella</string>
     <string name="category_desc_more">…más</string>
     <string name="delete_list">Eliminar lista</string>
-    <string name="public_access">Acceso público</string>
-    <string name="limited_access">Acceso limitado</string>
-    <string name="not_shared">Privado</string>
     <string name="speedcams_alert_title">Cámaras de velocidad</string>
     <string name="place_description_title">Descripción de lugares</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -125,7 +120,6 @@
     <string name="power_managment_setting_auto">Automático</string>
     <string name="power_managment_setting_manual_max">Máximo ahorro de energía</string>
     <string name="enable_logging_warning_message">Esta opción está habilitada para las acciones de registro con fines de diagnóstico. Esto ayuda a nuestro equipo a identificar problemas con la aplicación. Habilite la opción solo a petición del apoyo de CoMaps.</string>
-    <string name="access_rules_author_only">Se edita en línea</string>
     <string name="driving_options_title">Ajustes de desvío</string>
     <string name="unable_to_calc_alert_title">No se puede construir una ruta</string>
     <string name="unable_to_calc_alert_subtitle">Desafortunadamente, no pudimos construir una ruta con las opciones seleccionadas. Cambie la configuración y vuelva a intentarlo</string>
diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml
index dcbe6bf96..33446615f 100644
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -16,8 +16,6 @@
     <string name="kilometres">Kilómetros</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Millas</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">Mi posición</string>
     <!-- Update maps later button text -->
     <string name="later">Luego</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -75,8 +73,6 @@
     <string name="bookmarks">Marcadores</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Marcadores y trazas</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">Mis lugares</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Nombre</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -91,14 +87,6 @@
     <string name="maps_storage_summary">Seleccione la carpeta donde descargar los mapas</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Mapas descargados</string>
-    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">Almacenamiento interno privado</string>
-    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">Almacenamiento interno compartido</string>
-    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
-    <string name="maps_storage_removable">Tarjeta SD</string>
-    <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">Almacenamiento externo compartido</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
     <string name="maps_storage_free_size">%1$s libres de %2$s</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -150,8 +138,6 @@
     <string name="category_post">Oficina de correos</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Policía</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">Wifi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Reciclaje</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -459,7 +445,6 @@
     <string name="empty_street_name_error">Ingrese un nombre de calle</string>
     <string name="choose_language">Elegir un idioma</string>
     <string name="choose_street">Elije una calle</string>
-    <string name="postal_code">Código postal</string>
     <string name="cuisine">Cocina</string>
     <string name="select_cuisine">Seleccionar cocina</string>
     <!-- login text field -->
@@ -500,8 +485,6 @@
     <string name="error_enter_correct_storey_number">El número de niveles no debe superar %d</string>
     <string name="editor_zip_code">Código postal</string>
     <string name="error_enter_correct_zip_code">Introduzca un código postal válido</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">Punto del mapa</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Nota para los voluntarios de OpenStreetMap (opcional)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -519,16 +502,8 @@
     <string name="downloader_no_downloaded_maps_title">No has descargado ningún mapa</string>
     <string name="downloader_no_downloaded_maps_message">Descargue mapas para encontrar la ubicación y navegar sin conexión</string>
     <string name="current_location_unknown_error_title">Se desconoce la ubicación actual</string>
-    <!-- abbreviation for meters -->
-    <string name="m">m</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">km</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/h</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">mi</string>
-    <!-- A unit of measure -->
-    <string name="ft">pie</string>
     <string name="miles_per_hour">mph</string>
     <string name="hour">h</string>
     <string name="minute">min</string>
@@ -588,8 +563,6 @@
     <string name="prefs_languages_information_off_link">Para obtener más información, consulta esta guía</string>
     <string name="transliteration_title">Transliteración al alfabeto latino</string>
     <string name="learn_more">Conocer más</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Salida</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Busca o toca en el mapa para añadir el origen de la ruta</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -601,7 +574,6 @@
     <string name="dialog_error_storage_title">Error de acceso al almacenamiento</string>
     <string name="dialog_error_storage_message">El almacenamiento externo no está disponible; puede que se haya quitado o dañado la tarjeta SD, o el sistema de archivos solo permite lectura. Por favor, compruébalo ó escríbenos a support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emular almacenamiento dañado</string>
-    <string name="core_entrance">Entrada</string>
     <string name="error_enter_correct_name">Por favor, introduce un nombre válido</string>
     <string name="bookmark_lists">Listas</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -644,16 +616,12 @@
     <string name="button_layer_traffic">Tráfico</string>
     <string name="subway">Metro</string>
     <string name="layers_title">Estilos y capas del mapa</string>
-    <string name="subway_data_unavailable">El mapa del metro no está disponible</string>
     <string name="bookmarks_empty_list_title">Esta lista está vacía</string>
     <string name="bookmarks_empty_list_message">Para agregar un marcador, toca un lugar en el mapa y después toca el icono de la estrella</string>
     <string name="category_desc_more">…más</string>
     <string name="export_file">Exportar KMZ</string>
     <string name="export_file_gpx">Exportar GPX</string>
     <string name="delete_list">Eliminar lista</string>
-    <string name="public_access">Acceso público</string>
-    <string name="limited_access">Acceso limitado</string>
-    <string name="not_shared">Privado</string>
     <string name="speedcams_alert_title">Radares de velocidad</string>
     <string name="place_description_title">Descripción del lugar</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -670,7 +638,6 @@
     <string name="power_managment_setting_auto">Cuando queda poca energía</string>
     <string name="power_managment_setting_manual_max">Siempre</string>
     <string name="enable_logging_warning_message">Activa esta opción temporalmente para grabar y enviar de forma manual registros para diagnosticar defectos mediante la opción «Informar de un fallo» en el diálogo Ayuda. Los registros pueden incluir ubicaciones.</string>
-    <string name="access_rules_author_only">Edición en línea</string>
     <string name="driving_options_title">Opciones de enrutamiento</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Evitar peajes</string>
@@ -873,8 +840,6 @@
     <string name="github">GitHub</string>
     <string name="twitter">X (Twitter)</string>
     <string name="facebook">Facebook</string>
-    <string name="mb">MB</string>
-    <string name="gb">GB</string>
     <string name="vk">VK</string>
     <string name="wikimedia_commons">Wikimedia Commons</string>
     <string name="comma_separated_pair">%1$s, %2$s</string>
diff --git a/android/app/src/main/res/values-et/strings.xml b/android/app/src/main/res/values-et/strings.xml
index 51aa8d465..841855021 100644
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -16,8 +16,6 @@
     <string name="kilometres">Kilomeetrid</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Miilid</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">Minu asukoht</string>
     <!-- Update maps later button text -->
     <string name="later">Hiljem</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -69,8 +67,6 @@
     <string name="bookmarks">Järjehoidjad</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Järjehoidjad ja rajad</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">Minu kohad</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Nimi</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -85,14 +81,6 @@
     <string name="maps_storage_summary">Vali kaust, kuhu laadime kaardid</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Allalaaditud kaardid</string>
-    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">Sisemine privaatne andmeruum</string>
-    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">Sisemine jagatud andmeruum</string>
-    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
-    <string name="maps_storage_removable">SD-kaart</string>
-    <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">Väline jagatud andmeruum</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
     <string name="maps_storage_free_size">%1$s vaba ruumist %2$s</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -144,8 +132,6 @@
     <string name="category_post">Post</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Politsei</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">WiFi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Jäätmekäitlus</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -451,7 +437,6 @@
     <string name="empty_street_name_error">Palun sisesta tänava nimi</string>
     <string name="choose_language">Vali keel</string>
     <string name="choose_street">Vali tänav</string>
-    <string name="postal_code">Postiindeks</string>
     <string name="cuisine">Köök</string>
     <string name="select_cuisine">Vali köök</string>
     <!-- login text field -->
@@ -492,8 +477,6 @@
     <string name="error_enter_correct_storey_number">Korruste arv ei või olla üle %d</string>
     <string name="editor_zip_code">Postiindeks</string>
     <string name="error_enter_correct_zip_code">Sisesta korrektne postiindeks</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">Kaardipunkt</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Märkus OpenStreetMapi vabatahtlikele (valikuline)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -511,16 +494,8 @@
     <string name="downloader_no_downloaded_maps_title">Sa ei ole kaarte alla laadinud</string>
     <string name="downloader_no_downloaded_maps_message">Laadi alla kaardid asukoha otsimiseks ja võrguühenduseta tee juhatamiseks</string>
     <string name="current_location_unknown_error_title">Praegune asukoht pole teada</string>
-    <!-- abbreviation for meters -->
-    <string name="m">m</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">km</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/h</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">mi</string>
-    <!-- A unit of measure -->
-    <string name="ft">jalga</string>
     <string name="miles_per_hour">mph</string>
     <string name="hour">h</string>
     <string name="minute">min</string>
@@ -580,8 +555,6 @@
     <string name="prefs_languages_information_off_link">Lisainfo saamiseks palun vaata seda juhendit</string>
     <string name="transliteration_title">Transliteratsioon ladina tähestikku</string>
     <string name="learn_more">Lisateave</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Välju</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Teekonna alguspunkti lisamiseks kasuta otsingut või puuduta soovitud kohta kaardil</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -593,7 +566,6 @@
     <string name="dialog_error_storage_title">Andmeruumi ligipääsu probleem</string>
     <string name="dialog_error_storage_message">Väline andmeruum pole juurdepääsetav. SD-kaart võib olla eemaldatud, kahjustatud või failisüsteem on kirjutuskaitstud. Palun kontrolli oma SD-kaarti või võta meiega ühendust aadressil support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Imiteeri vigast andmeruumi</string>
-    <string name="core_entrance">Sissepääs</string>
     <string name="error_enter_correct_name">Palun sisesta korrektne nimi</string>
     <string name="bookmark_lists">Loendid</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -633,16 +605,12 @@
     <string name="button_layer_traffic">Liiklus</string>
     <string name="subway">Metroo</string>
     <string name="layers_title">Kaardi stiilid ja kihid</string>
-    <string name="subway_data_unavailable">Metrookaart ei ole saadaval</string>
     <string name="bookmarks_empty_list_title">See loend on tühi</string>
     <string name="bookmarks_empty_list_message">Järjehoidja lisamiseks puuduta kohta kaardil ja seejärel puuduta tähekese ikooni</string>
     <string name="category_desc_more">…veel</string>
     <string name="export_file">Ekspordi KMZ-failina</string>
     <string name="export_file_gpx">Ekspordi GPX-failina</string>
     <string name="delete_list">Kustuta loend</string>
-    <string name="public_access">Avalik ligipääs</string>
-    <string name="limited_access">Piiratud ligipääs</string>
-    <string name="not_shared">Privaatne</string>
     <string name="speedcams_alert_title">Kiiruskaamerad</string>
     <string name="place_description_title">Koha kirjeldus</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -659,7 +627,6 @@
     <string name="power_managment_setting_auto">Madala akutäituvuse korral</string>
     <string name="power_managment_setting_manual_max">Alati</string>
     <string name="enable_logging_warning_message">Kasuta seda võimalust üksikasjaliku logi ajutiseks salvestamiseks ja meile käsitsi saatmiseks Abiteabe „Teata veast“ vaatest. Andmed võivad sisaldada sinu asukoha teavet.</string>
-    <string name="access_rules_author_only">Võrgupõhine muutmine</string>
     <string name="driving_options_title">Tee juhatamise valikud</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Väldi tasulisi teid</string>
@@ -850,8 +817,6 @@
     <string name="nav_auto">Automaatne tee juhatamine</string>
     <string name="about_headline">Avatud projekt, mida toetab toimekas kogukond</string>
     <string name="about_proposition_1">• Viimistletud ja lihtsaltkasutatav</string>
-    <string name="mb">MB</string>
-    <string name="gb">GB</string>
     <string name="openstreetmap">OpenStreetMap</string>
     <string name="matrix">[Matrix]</string>
     <string name="wikimedia_commons">Wikimedia Commons</string>
diff --git a/android/app/src/main/res/values-eu/strings.xml b/android/app/src/main/res/values-eu/strings.xml
index 4dba9e39d..3f57059a3 100644
--- a/android/app/src/main/res/values-eu/strings.xml
+++ b/android/app/src/main/res/values-eu/strings.xml
@@ -16,8 +16,6 @@
     <string name="kilometres">Kilometro</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Miliak</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">Nire kokapena</string>
     <!-- Update maps later button text -->
     <string name="later">Geroago</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -75,8 +73,6 @@
     <string name="bookmarks">Markagailuak</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Markagailuak eta arrastoak</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">Nire tokiak</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Izena</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -91,14 +87,6 @@
     <string name="maps_storage_summary">Hautatu mapak zein karpetan deskargatu behar diren.</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Deskargatutako mapak</string>
-    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">Barne biltegiratze pribatua</string>
-    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">Barne biltegiratze partekatua</string>
-    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
-    <string name="maps_storage_removable">SD txartela</string>
-    <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">Kanpoko biltegiratze partekatua</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
     <string name="maps_storage_free_size">%2$s-tik %1$s libre</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -150,8 +138,6 @@
     <string name="category_post">Posta bulegoa</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Polizia</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">WiFi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Birziklapena</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -457,7 +443,6 @@
     <string name="empty_street_name_error">Sartu kalearen izena</string>
     <string name="choose_language">Aukeratu hizkuntza bat</string>
     <string name="choose_street">Aukeratu kale bat</string>
-    <string name="postal_code">Posta kodea</string>
     <string name="cuisine">Sukaldea</string>
     <string name="select_cuisine">Aukeratu sukaldea</string>
     <!-- login text field -->
@@ -498,8 +483,6 @@
     <string name="error_enter_correct_storey_number">Solairu kopurua ez da %d-tik gorakoa izan behar</string>
     <string name="editor_zip_code">Posta kodea</string>
     <string name="error_enter_correct_zip_code">Sartu baliozko posta-kodea</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">Maparen puntua</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">OpenStreetMap-eko boluntarioentzako oharra (aukerakoa)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -517,16 +500,8 @@
     <string name="downloader_no_downloaded_maps_title">Ez duzu maparik deskargatu</string>
     <string name="downloader_no_downloaded_maps_message">Deskargatu mapak kokapena aurkitzeko eta lineaz kanpo nabigatzeko</string>
     <string name="current_location_unknown_error_title">Uneko kokapena ezezaguna da</string>
-    <!-- abbreviation for meters -->
-    <string name="m">m</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">km</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/h</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">mi</string>
-    <!-- A unit of measure -->
-    <string name="ft">oin</string>
     <string name="miles_per_hour">mph</string>
     <string name="hour">h</string>
     <string name="minute">min</string>
@@ -586,8 +561,6 @@
     <string name="prefs_languages_information_off_link">Informazio gehiago lortzeko, ikusi gida hau</string>
     <string name="transliteration_title">Latinezko transliterazioa</string>
     <string name="learn_more">Irakurri gehiago</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Irten</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Erabili bilaketa edo sakatu mapan ibilbidearen abiapuntua gehitzeko</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -599,7 +572,6 @@
     <string name="dialog_error_storage_title">Biltegiratze sarbidearen arazoa</string>
     <string name="dialog_error_storage_message">Kanpoko biltegiratzea ez dago erabilgarri; Baliteke SD txartela kendu edo hondatuta egotea, edo fitxategi sistema irakurtzeko soilik izatea. Mesedez, begiratu edo idatzi iezaguzu support@comaps.app helbidera</string>
     <string name="setting_emulate_bad_storage">Emulatu kaltetutako biltegiratzea</string>
-    <string name="core_entrance">Sarrera</string>
     <string name="error_enter_correct_name">Mesedez, idatzi baliozko izen bat</string>
     <string name="bookmark_lists">Zerrendak</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -639,16 +611,12 @@
     <string name="button_layer_traffic">Trafikoa</string>
     <string name="subway">Metroa</string>
     <string name="layers_title">Maparen estiloak eta geruzak</string>
-    <string name="subway_data_unavailable">Metroaren mapa ez dago erabilgarri</string>
     <string name="bookmarks_empty_list_title">Zerrenda hau hutsik dago</string>
     <string name="bookmarks_empty_list_message">Markagailu bat gehitzeko, ukitu mapako toki bat eta, ondoren, ukitu izarraren ikonoa</string>
     <string name="category_desc_more">…gehiago</string>
     <string name="export_file">Esportatu KMZ</string>
     <string name="export_file_gpx">Esportatu GPX</string>
     <string name="delete_list">Ezabatu zerrenda</string>
-    <string name="public_access">Sarbide publikoa</string>
-    <string name="limited_access">Sarbide mugatua</string>
-    <string name="not_shared">Pribatua</string>
     <string name="speedcams_alert_title">Abiadura kamerak</string>
     <string name="place_description_title">Tokiaren deskribapena</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -665,7 +633,6 @@
     <string name="power_managment_setting_auto">Automatikoa</string>
     <string name="power_managment_setting_manual_max">Energia aurrezpen handiena</string>
     <string name="enable_logging_warning_message">Aukera hau diagnostiko helburua duten erregistro ekintzetarako gaituta dago. Honek gure taldeari aplikazioarekin arazoak identifikatzen laguntzen dio. Gaitu aukera CoMaps laguntzari eskatuta soilik.</string>
-    <string name="access_rules_author_only">Sarean editatzen</string>
     <string name="driving_options_title">Bideratzeko aukerak</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Bidesariak saihestea</string>
@@ -867,8 +834,6 @@
     <string name="openstreetmap">OpenStreetMap</string>
     <string name="read_in_wikipedia">Wikipedia</string>
     <string name="level_value_generic">Maila: %s</string>
-    <string name="mb">MB</string>
-    <string name="gb">GB</string>
     <string name="github">GitHub</string>
     <string name="telegram_url">https://t.me/CoMapsApp/</string>
     <string name="facebook">Facebook</string>
diff --git a/android/app/src/main/res/values-fa/strings.xml b/android/app/src/main/res/values-fa/strings.xml
index 77aeb6904..954451d3e 100644
--- a/android/app/src/main/res/values-fa/strings.xml
+++ b/android/app/src/main/res/values-fa/strings.xml
@@ -14,13 +14,8 @@
     <string name="downloading">درحال دانلود…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
     <string name="kilometres">کیلومتر</string>
-    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
-    <string name="mb">مگابایت</string>
-    <string name="gb">گیگابایت</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">مایل</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">مکان من</string>
     <!-- Update maps later button text -->
     <string name="later">بعدًا</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -72,8 +67,6 @@
     <string name="bookmarks">نشانه‌ها</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">نشانه‌ها و مسیر ها</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">مکان من</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">نام</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -135,8 +128,6 @@
     <string name="category_post">صندوق پست</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">پلیس</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">وای فای</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">بازیافت</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -429,7 +420,6 @@
     <string name="empty_street_name_error">نام خیابان را وارد کنید</string>
     <string name="choose_language">انتخاب یک زبان</string>
     <string name="choose_street">انتخاب یک خیابان</string>
-    <string name="postal_code">کد پستی</string>
     <string name="cuisine">غذا‌خوری</string>
     <string name="select_cuisine">انتخاب غذاخوری</string>
     <!-- login text field -->
@@ -469,8 +459,6 @@
     <string name="error_enter_correct_storey_number">تعداد طبقات نباید بیش از %d باشد</string>
     <string name="editor_zip_code">کد پستی</string>
     <string name="error_enter_correct_zip_code">یک کد‌ پستی معتبر وارد کنید</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">نقطه نقشه</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">توجه به داوطلبان OpenStreetMap (اختیاری)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -488,16 +476,8 @@
     <string name="downloader_no_downloaded_maps_title">شما هیچ نقشه دانلود شده ای ندارید</string>
     <string name="downloader_no_downloaded_maps_message">برای جست وجو یک مکان و استفاده از قابلیت ناوبری، نقشه‌ها را دانلود کنید</string>
     <string name="current_location_unknown_error_title">مکان فعلیتان ناشناس است</string>
-    <!-- abbreviation for meters -->
-    <string name="m">متر</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">کیلومتر</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">کیلومتربرساعت (km/h)</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">مایل</string>
-    <!-- A unit of measure -->
-    <string name="ft">فوت</string>
     <string name="miles_per_hour">مایل بر ساعت (mph)</string>
     <string name="hour">ساعت</string>
     <string name="minute">دقیقه</string>
@@ -550,8 +530,6 @@
     <string name="prefs_languages_information_off_link">برای اطلاعات بیشتر لطفا این راهنما را بررسی کنید</string>
     <string name="transliteration_title">ترجمه به لاتین</string>
     <string name="learn_more">بیشتر بدانید</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">خروج</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">برای افزودن نقطه شروع مسیر، از جستجو استفاده کنید یا روی نقشه ضربه بزنید</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -563,7 +541,6 @@
     <string name="dialog_error_storage_title">مشکل دسترسی به ذخیره‌سازی</string>
     <string name="dialog_error_storage_message">ذخیره سازی خارجی در دسترس نیست کارت SD ممکن است برداشته شده باشد، آسیب دیده باشد یا سیستم فایل فقط خواندنی باشد. لطفا کارت SD خود را بررسی کنید یا با ما در support@comaps.app تماس بگیرید</string>
     <string name="setting_emulate_bad_storage">شبیه سازی ذخیره سازی بد</string>
-    <string name="core_entrance">ورودی</string>
     <string name="error_enter_correct_name">لطفا نام صحیح را وارد کنید</string>
     <string name="bookmark_lists">لیست‌ها</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -603,16 +580,12 @@
     <string name="button_layer_traffic">ترافیک</string>
     <string name="subway">مترو</string>
     <string name="layers_title">سبک ها و لایه های نقشه</string>
-    <string name="subway_data_unavailable">نقشه مترو موجود نیست</string>
     <string name="bookmarks_empty_list_title">این لیست خالی است</string>
     <string name="bookmarks_empty_list_message">برای افزودن یک نشانه، روی یک مکان روی نقشه ضربه بزنید و سپس روی نماد ستاره ضربه بزنید</string>
     <string name="category_desc_more">بیشتر…</string>
     <string name="export_file">صادرات KMZ</string>
     <string name="export_file_gpx">صادرات GPX</string>
     <string name="delete_list">حذف لیست</string>
-    <string name="public_access">دسترسی عمومی</string>
-    <string name="limited_access">دسترسی محدود</string>
-    <string name="not_shared">خصوصی</string>
     <string name="speedcams_alert_title">دوربین‌های سرعت</string>
     <string name="place_description_title">توضیحات محل</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -629,7 +602,6 @@
     <string name="power_managment_setting_auto">خودکار</string>
     <string name="power_managment_setting_manual_max">حداکثر ذخیره انرژی</string>
     <string name="enable_logging_warning_message">این گزینه ثبت گزارش را برای اهداف تشخیصی فعال می‌کند. برای کارکنان بخش پشتیبانی که مشکلات برنامه را عیب یابی می‌کنند، مفید باشد. این گزینه را تنها در صورت درخواست پشتیبانی CoMaps فعال کنید.</string>
-    <string name="access_rules_author_only">ویرایش آنلاین</string>
     <string name="driving_options_title">گزینه‌های رانندگی</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">از جاده های عوارضی خودداری کنید</string>
diff --git a/android/app/src/main/res/values-fi/strings.xml b/android/app/src/main/res/values-fi/strings.xml
index 398ede0d8..9012dc848 100644
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -14,13 +14,8 @@
     <string name="downloading">Ladataan…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
     <string name="kilometres">Kilometrit</string>
-    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
-    <string name="mb">Mt</string>
-    <string name="gb">Gt</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Mailit</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">Sijaintini</string>
     <!-- Update maps later button text -->
     <string name="later">Myöhemmin</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -78,8 +73,6 @@
     <string name="bookmarks">Kirjanmerkit</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Kirjanmerkit ja reitit</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">Paikkani</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Nimi</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -94,14 +87,6 @@
     <string name="maps_storage_summary">Valitse karttojen latauskohde</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Ladatut kartat</string>
-    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">Sisäinen yksityinen tallennustila</string>
-    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">Sisäinen jaettu tallennustila</string>
-    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
-    <string name="maps_storage_removable">SD-kortti</string>
-    <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">Ulkoinen jaettu tallennustila</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
     <string name="maps_storage_free_size">%1$s/%2$s vapaana</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -153,8 +138,6 @@
     <string name="category_post">Posti</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Poliisi</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">WiFi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Jätteiden kierrätys</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -461,7 +444,6 @@
     <string name="empty_street_name_error">Lisää kadun nimi</string>
     <string name="choose_language">Valitse kieli</string>
     <string name="choose_street">Valitse katu</string>
-    <string name="postal_code">Postinumero</string>
     <string name="cuisine">Ruokalaji</string>
     <string name="select_cuisine">Valitse ruokalaji</string>
     <!-- login text field -->
@@ -502,8 +484,6 @@
     <string name="error_enter_correct_storey_number">Kerrosten määrä saa olla korkeintaan %d</string>
     <string name="editor_zip_code">Postinumero</string>
     <string name="error_enter_correct_zip_code">Anna kelvollinen postinumero</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">Karttapiste</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Huomautus OpenStreetMapin vapaaehtoisille (valinnainen)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -521,16 +501,8 @@
     <string name="downloader_no_downloaded_maps_title">Et ole ladannut yhtään karttaa</string>
     <string name="downloader_no_downloaded_maps_message">Lataa karttoja löytääksesi paikkoja ja navigoidaksesi offline-tilassa</string>
     <string name="current_location_unknown_error_title">Nykyinen sijainti on tuntematon</string>
-    <!-- abbreviation for meters -->
-    <string name="m">m</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">km</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/h</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">mi</string>
-    <!-- A unit of measure -->
-    <string name="ft">ft</string>
     <string name="miles_per_hour">mph</string>
     <string name="hour">t</string>
     <string name="minute">min</string>
@@ -590,8 +562,6 @@
     <string name="prefs_languages_information_off_link">Lisätietoja saat tästä oppaasta</string>
     <string name="transliteration_title">Translitterointi latinalaisiksi aakkosiksi</string>
     <string name="learn_more">Lisätietoja</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Poistu</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Käytä hakua tai napauta karttaa lisätäksesi reitin lähtöpisteen</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -603,7 +573,6 @@
     <string name="dialog_error_storage_title">Ongelma tallennustilan käyttämisessä</string>
     <string name="dialog_error_storage_message">Ulkoinen tallennustila ei ole käytettävissä, SD-kortti on luultavasti poistettu tai vahingoittunut tai tiedostojärjestelmä on vain luku -tilassa. Tarkista SD-kortin toiminta tai ota yhteyttä osoitteeseen support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Jäljittele virheellistä tallennustilaa</string>
-    <string name="core_entrance">Sisäänkäynti</string>
     <string name="error_enter_correct_name">Anna oikea nimi</string>
     <string name="bookmark_lists">Luettelot</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -643,16 +612,12 @@
     <string name="button_layer_traffic">Liikenne</string>
     <string name="subway">Metro</string>
     <string name="layers_title">Karttatyylit ja tasot</string>
-    <string name="subway_data_unavailable">Metrokartta ei ole saatavilla</string>
     <string name="bookmarks_empty_list_title">Luettelo on tyhjä</string>
     <string name="bookmarks_empty_list_message">Lisätäksesi kirjanmerkin, paina kartasta ja sitten paina tähden kuvaa</string>
     <string name="category_desc_more">…lisää</string>
     <string name="export_file">Vie KMZ</string>
     <string name="export_file_gpx">Vie GPX</string>
     <string name="delete_list">Poista luettelo</string>
-    <string name="public_access">Julkinen pääsy</string>
-    <string name="limited_access">Rajoitettu pääsy</string>
-    <string name="not_shared">Yksityinen</string>
     <string name="speedcams_alert_title">Nopeuskamerat</string>
     <string name="place_description_title">Paikan kuvaus</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -669,7 +634,6 @@
     <string name="power_managment_setting_auto">Automaattinen</string>
     <string name="power_managment_setting_manual_max">Täysi virransäästö</string>
     <string name="enable_logging_warning_message">Valinta ottaa käyttöön lokikirjaukset diagnostiikkaa varten. Se voi auttaa tukihenkilöstöämme, kun he korjaavat sovelluksen ongelmia. Ota tämä ominaisuus käyttöön vain, jos CoMaps:n tuki pyytää.</string>
-    <string name="access_rules_author_only">Nettimuokkaus</string>
     <string name="driving_options_title">Reititysvalinnat</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Vältä maksullisia teitä</string>
diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml
index cd89ac02e..fdc6e91ee 100644
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -14,13 +14,8 @@
     <string name="downloading">Téléchargement…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
     <string name="kilometres">Kilomètres</string>
-    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
-    <string name="mb">Mo</string>
-    <string name="gb">Go</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Miles</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">Ma position</string>
     <!-- Update maps later button text -->
     <string name="later">Plus tard</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -78,8 +73,6 @@
     <string name="bookmarks">Signets</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Signets et traces</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">Mes endroits</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Nom</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -94,14 +87,6 @@
     <string name="maps_storage_summary">Sélectionnez le dossier dans lequel télécharger les cartes</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Cartes téléchargées</string>
-    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">Stockage interne privé</string>
-    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">Stockage interne partagé</string>
-    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
-    <string name="maps_storage_removable">Carte SD</string>
-    <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">Stockage externe partagé</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
     <string name="maps_storage_free_size">%1$s libres sur %2$s</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -153,8 +138,6 @@
     <string name="category_post">Poste</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Police</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">WiFi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Recyclage</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -462,7 +445,6 @@
     <string name="empty_street_name_error">Veuillez entrer un nom de rue</string>
     <string name="choose_language">Choisir une langue</string>
     <string name="choose_street">Choisir une rue</string>
-    <string name="postal_code">Code postal</string>
     <string name="cuisine">Cuisine</string>
     <string name="select_cuisine">Sélectionner un type de cuisine</string>
     <!-- login text field -->
@@ -505,8 +487,6 @@
     <string name="error_enter_correct_storey_number">Le nombre d\'étages ne doit pas dépasser %d</string>
     <string name="editor_zip_code">Code postal</string>
     <string name="error_enter_correct_zip_code">Saisissez un code postal valide</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">Point sur la carte</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Note aux volontaires OpenStreetMap (facultatif)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -524,16 +504,8 @@
     <string name="downloader_no_downloaded_maps_title">Vous n\'avez téléchargé aucune carte</string>
     <string name="downloader_no_downloaded_maps_message">Téléchargez des cartes pour rechercher un lieu et utiliser la navigation hors ligne</string>
     <string name="current_location_unknown_error_title">L\'emplacement actuel est inconnu</string>
-    <!-- abbreviation for meters -->
-    <string name="m">m</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">km</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/h</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">mi</string>
-    <!-- A unit of measure -->
-    <string name="ft">ft</string>
     <string name="miles_per_hour">mph</string>
     <string name="hour">h</string>
     <string name="minute">min</string>
@@ -592,8 +564,6 @@
     <string name="prefs_languages_information_off_link">Pour plus d’informations, veuillez consulter ce guide</string>
     <string name="transliteration_title">Translittératisé en alphabet latin</string>
     <string name="learn_more">En savoir plus</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Sortie</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Utilise la recherche ou tape sur la carte pour ajouter un point de départ d\'itinéraire</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -605,7 +575,6 @@
     <string name="dialog_error_storage_title">Problème d\'accès au stockage</string>
     <string name="dialog_error_storage_message">Le stockage externe n\'est pas disponible. La carte SD a probablement été enlevée, endommagée ou le système est en lecture seule. Veuillez vérifier votre carte SD ou nous contacter via support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Émuler le mauvais stockage</string>
-    <string name="core_entrance">Entrée</string>
     <string name="error_enter_correct_name">Veuillez entrer un nom correct</string>
     <string name="bookmark_lists">Listes</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -648,16 +617,12 @@
     <string name="button_layer_traffic">Trafic</string>
     <string name="subway">Métro</string>
     <string name="layers_title">Styles et couches de cartes</string>
-    <string name="subway_data_unavailable">La carte du métro n\'est pas disponible</string>
     <string name="bookmarks_empty_list_title">Cette liste est vide</string>
     <string name="bookmarks_empty_list_message">Pour ajouter un signet, appuyez sur un lieu sur la carte, puis appuyez sur l\'icône étoile</string>
     <string name="category_desc_more">…plus</string>
     <string name="export_file">Exporter KMZ</string>
     <string name="export_file_gpx">Exporter GPX</string>
     <string name="delete_list">Supprimer la liste</string>
-    <string name="public_access">Accès publique</string>
-    <string name="limited_access">Accès limité</string>
-    <string name="not_shared">Privé</string>
     <string name="speedcams_alert_title">Radars de vitesse</string>
     <string name="place_description_title">Description d\'endroit</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -674,7 +639,6 @@
     <string name="power_managment_setting_auto">Automatique</string>
     <string name="power_managment_setting_manual_max">Économie d\'énergie maximale</string>
     <string name="enable_logging_warning_message">Cette option est activée pour l\'identification des actions à des fins de diagnostic. Cela aide l’équipe à identifier les problèmes liés à l’application. Activez cette option uniquement à la demande du support CoMaps.</string>
-    <string name="access_rules_author_only">Édition en ligne</string>
     <string name="driving_options_title">Paramètres des itinéraires</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Éviter les routes à péage</string>
diff --git a/android/app/src/main/res/values-gl/strings.xml b/android/app/src/main/res/values-gl/strings.xml
index cb73f674f..853476776 100644
--- a/android/app/src/main/res/values-gl/strings.xml
+++ b/android/app/src/main/res/values-gl/strings.xml
@@ -29,7 +29,6 @@
     <string name="red">Vermello</string>
     <string name="editor_time_close">Pechado</string>
     <string name="purple">Morado</string>
-    <string name="core_exit">Saída</string>
     <string name="cyan">Cian</string>
     <string name="minute">min</string>
     <string name="editor_time_from">De</string>
@@ -41,7 +40,6 @@
     <string name="tts_info_link">https://www.comaps.app/support/tts-configuration-guide-for-android/</string>
     <string name="select_cuisine">Seleccionar cociña</string>
     <string name="comma_separated_pair">%1$s, %2$s</string>
-    <string name="maps_storage_internal">Almacenamento interno privado</string>
     <string name="menu">Menú</string>
     <string name="editor_time_open">Aberto</string>
     <string name="category_hospital">Hospital</string>
@@ -52,10 +50,8 @@
     <string name="buildings">Edificios</string>
     <string name="mountains">Montañas</string>
     <string name="back">Atrás</string>
-    <string name="km">km</string>
     <string name="location_settings">Axustes de localización</string>
     <string name="close">Pechar</string>
-    <string name="core_my_places">Os meus lugares</string>
     <string name="category_food">Tendas de comestibles</string>
     <string name="load_kmz_title">Cargando marcadores</string>
     <string name="email">Correo electrónico</string>
@@ -72,20 +68,15 @@
     <string name="big_font">Aumentar tamaño do texto no mapa</string>
     <string name="traffic_update_app">Por favor, actualice CoMaps</string>
     <string name="prefs_languages_information_off_link">Para obter máis información, consulte esta guía</string>
-    <string name="core_entrance">Entrada</string>
     <string name="privacy">Privacidade</string>
     <string name="privacy_policy">Normativa de privacidade</string>
     <string name="terms_of_use">Condiciones de uso</string>
     <string name="button_layer_traffic">Tráfico</string>
     <string name="subway">Metro</string>
     <string name="layers_title">Estilos e capas do mapa</string>
-    <string name="subway_data_unavailable">O mapa do metro non está dispoñible</string>
     <string name="export_file">Exportar KMZ</string>
     <string name="export_file_gpx">Exportar GPX</string>
     <string name="delete_list">Eliminar lista</string>
-    <string name="public_access">Acceso público</string>
-    <string name="limited_access">Acceso limitado</string>
-    <string name="not_shared">Privado</string>
     <string name="speedcams_alert_title">Cámaras de velocidade</string>
     <string name="sort">Ordenar…</string>
     <string name="sort_bookmarks">Ordenar marcadores</string>
@@ -135,7 +126,6 @@
     <string name="kilometres">Quilómetros</string>
     <string name="save">Gardar</string>
     <string name="search">Buscar</string>
-    <string name="gb">GB</string>
     <string name="list">Lista</string>
     <string name="category_recycling">Reciclaxe</string>
     <string name="blue">Azul</string>
@@ -150,7 +140,6 @@
     <string name="try_again">Tentar de novo</string>
     <string name="history">Historial</string>
     <string name="dialog_routing_location_turn_on">Activar servizos de localización</string>
-    <string name="m">m</string>
     <string name="prefs_group_information">Información</string>
     <string name="password">Contrasinal</string>
     <string name="placepage_add_business_button">Engadir organización</string>
@@ -164,7 +153,6 @@
     <string name="show">Amosar</string>
     <string name="download_maps">Descargar mapas</string>
     <string name="download_has_failed">Erro durante a descarga, toque para volver a intentalo.</string>
-    <string name="core_my_position">A miña posición</string>
     <string name="search_map">Buscar no mapa</string>
     <string name="location_is_disabled_long_text">Non se pode acceder aos servizos de localización neste dispositivo ou aplicación. Actíveos na configuración.</string>
     <string name="precise_location_is_disabled_long_text">Para garantir unha navegación máis precisa, active a Precisión da localización nos axustes.</string>
@@ -192,8 +180,6 @@
     <string name="maps_storage_summary">Seleccione o cartafol onde deben descargarse os mapas</string>
     <string name="maps_storage_downloaded">Mapas descargados</string>
     <string name="maps_storage">Gardar mapas en</string>
-    <string name="maps_storage_shared">Almacenamento interno compartido</string>
-    <string name="maps_storage_external">Almacenamento externo compartido</string>
     <string name="maps_storage_free_size">%1$s libres de %2$s</string>
     <string name="move_maps_error">Erro ao mover os arquivos de mapas</string>
     <string name="wait_several_minutes">Isto podería tardar varios minutos. \nAgarde un momento…</string>
@@ -327,7 +313,6 @@
     <string name="street">Rúa</string>
     <string name="empty_street_name_error">Por favor, introduza un nome de rúa</string>
     <string name="choose_language">Elixir un idioma</string>
-    <string name="postal_code">Código postal</string>
     <string name="email_or_username">Correo electrónico ou usuario</string>
     <string name="level_value_generic">Nivel: %s</string>
     <string name="downloader_delete_map_dialog">Todas as edicións feitas ao mapa eliminaranse xunto con este</string>
@@ -365,7 +350,6 @@
     <string name="downloader_no_downloaded_maps_message">Descargue mapas para atopar a localización e navegar sen conexión</string>
     <string name="current_location_unknown_error_title">Descoñécese a localización actual</string>
     <string name="miles_per_hour">mph</string>
-    <string name="ft">pé</string>
     <string name="placepage_more_button">Más</string>
     <string name="placepage_edit_bookmark_button">Editar marcador</string>
     <string name="placepage_personal_notes_hint">Notas persoais (texto ou html)</string>
@@ -425,7 +409,6 @@
     <string name="power_managment_description">Tratarase de reducir o consumo de enerxía a expensas de certas funcións</string>
     <string name="power_managment_setting_auto">Cando queda pouca enerxía</string>
     <string name="enable_logging_warning_message">Active esta opción temporalmente para gravar e enviar de forma manual rexistros para diagnosticar defectos enviados mediante a opción «Informar dun fallo» no diálogo Axuda. Os rexistros poden incluír localizacións.</string>
-    <string name="access_rules_author_only">Edición en liña</string>
     <string name="driving_options_title">Opcións de encamiñamento</string>
     <string name="avoid_unpaved">Evitar camiños sen pavimentar</string>
     <string name="avoid_motorways">Evitar autoestradas</string>
@@ -494,16 +477,13 @@
     <string name="cancel">Cancelar</string>
     <string name="downloader_retry">Reintentar</string>
     <string name="delete">Eliminar</string>
-    <string name="mi">o meu</string>
     <string name="downloading">A descargar…</string>
     <string name="read_in_wikipedia">Wikipedia</string>
     <string name="limited_accuracy">Precisión limitada</string>
     <string name="dialog_routing_change_end">Axustar destino</string>
     <string name="bookmarks_new_list_hint">Lista nova</string>
-    <string name="mb">MB</string>
     <string name="edit">Editar</string>
     <string name="settings">Configuración</string>
-    <string name="category_wifi">Wifi</string>
     <string name="next_button">Seguinte</string>
     <string name="editor_report_problem_send_button">Enviar</string>
     <string name="translated_om_site_url">https://comaps.app/gl/</string>
@@ -547,9 +527,7 @@
     <string name="view_menu">Ver menú</string>
     <string name="volume">Volume</string>
     <string name="self_service">Autoservizo</string>
-    <string name="maps_storage_removable">Tarxeta SD</string>
     <string name="downloader_delete_map">Eliminar mapa</string>
-    <string name="core_placepage_unknown_place">Punto do mapa</string>
     <string name="bookmarks_error_title_share_empty">Erro ao compartir</string>
     <string name="pref_tts_speedcams_never">Non alertar nunca</string>
     <string name="avoid_ferry">Evitar ferris</string>
diff --git a/android/app/src/main/res/values-gsw/strings.xml b/android/app/src/main/res/values-gsw/strings.xml
index 27d8432f9..920883e3e 100644
--- a/android/app/src/main/res/values-gsw/strings.xml
+++ b/android/app/src/main/res/values-gsw/strings.xml
@@ -9,10 +9,7 @@
     <string name="download_has_failed">S Abelade isch fehlgschlage, Tippe zum nomal versueche</string>
     <string name="downloading">Wird abeglade…</string>
     <string name="kilometres">Kilometer</string>
-    <string name="mb">MB</string>
-    <string name="gb">GB</string>
     <string name="miles">Meile</string>
-    <string name="core_my_position">Min Standort</string>
     <string name="later">Spöter</string>
     <string name="search">Suechi</string>
     <string name="search_map">Uf de Charte sueche</string>
@@ -36,14 +33,10 @@
     <string name="login_osm_presentation">OpenStreetMap.org (OSM) isch es Gmeinschaftsprojekt zum Erstelle vonere freie und offene Charte. Es isch d Hauptquelle für Chartedate in CoMaps und funktioniert ähnlich wie Wikipedia. Du chasch Ort hinzuefüege oder bearbeite, wo denn Millione vo Nutzende uf de ganze Welt zur Verfüegig stönd. \nTritt de Gmeinschaft bii und hilf mit, d Charte für alli besser z mache!</string>
     <string name="editor_building_levels">Etage (inkl. Erdgschoss, ohni Dach)</string>
     <string name="error_enter_correct_storey_number">S Gebäude cha nöd meh als %d Etage ha</string>
-    <string name="core_placepage_unknown_place">Chartepunkt</string>
     <string name="editor_osm_history">Din Bearbeitigsverlauf</string>
     <string name="editor_osm_notes">Dini Hiiwiis zu de Chartedate</string>
     <string name="downloader_no_downloaded_maps_message">Lad Charte für d Offline-Suechi und Navigation abe</string>
-    <string name="m">m</string>
-    <string name="km">km</string>
     <string name="kilometers_per_hour">km/h</string>
-    <string name="mi">mi</string>
     <string name="placepage_more_button">Meh</string>
     <string name="error_enter_correct_twitter_page">Gib e gültigi Twitter-Webadresse oder en Benutzername ii</string>
     <string name="feedback_general">Allgemeins Feedback</string>
@@ -53,7 +46,6 @@
     <string name="placepage_add_stop">Stopp hinzuefüege</string>
     <string name="dialog_error_storage_message">De externi Speicher isch nöd verfüegbar, eventuell isch d SD-Charte entfernt worde oder sie isch beschädigt oder s Dateisystem isch schriibgschützt. Überprüef das bitte oder kontaktier eus under support@comaps.app</string>
     <string name="bookmarks_error_title_list_name_already_taken">De Name isch scho vergeh</string>
-    <string name="subway_data_unavailable">D U-Bahncharte staht nöd zur Verfüegig</string>
     <string name="define_to_avoid_btn">Routeoptione iistelle</string>
     <string name="no">Nei</string>
     <string name="by_name">Nach Name</string>
@@ -62,14 +54,12 @@
     <string name="app_tip_03">Wenn du en Softwareentwickler kennsch, chasch du ihn oder sie bitte, e Funktion z implementiere, wo du bruuchsch.</string>
     <string name="continue_recording">Uufnahm fortsetze</string>
     <string name="uri_open_location_failed">Kei App installiert, wo de Speicherort öffne cha</string>
-    <string name="core_exit">Uusgang</string>
     <string name="phone_number">Telefonnummere</string>
     <string name="terms_of_use">Nutzigsbedingige</string>
     <string name="button_layer_traffic">Verchehr</string>
     <string name="export_file">KMZ exportiere</string>
     <string name="export_file_gpx">GPX exportiere</string>
     <string name="delete_list">Lischte lösche</string>
-    <string name="access_rules_author_only">Online bearbeite</string>
     <string name="ferry_crossing">Fährstell</string>
     <string name="by_type">Nach Typ</string>
     <string name="month_ago_sorttype">Vor eim Monet</string>
@@ -166,7 +156,6 @@
     <string name="bookmark_set_name">Name vo de Lesezeichelischte</string>
     <string name="bookmarks">Lesezeiche</string>
     <string name="bookmarks_and_tracks">Lesezeiche und Tracks</string>
-    <string name="core_my_places">Miini Ort</string>
     <string name="name">Name</string>
     <string name="address">Adresse</string>
     <string name="list">Lischte</string>
@@ -174,10 +163,6 @@
     <string name="maps_storage">Charte speichere uf</string>
     <string name="maps_storage_summary">Wähl de Speicherot für di abegladne Charte</string>
     <string name="maps_storage_downloaded">Abegladni Charte</string>
-    <string name="maps_storage_internal">Interne persönliche Speicher</string>
-    <string name="maps_storage_shared">Interne gmeinsame Speicher</string>
-    <string name="maps_storage_removable">SD-Charte</string>
-    <string name="maps_storage_external">Externe gmeinsame Speicher</string>
     <string name="move_maps">Charte verschiebe?</string>
     <string name="move_maps_error">Fehler bim Verschiebe vo de Charte</string>
     <string name="wait_several_minutes">Das chan es paar Minute duure. \nBitte warte…</string>
@@ -200,7 +185,6 @@
     <string name="category_pharmacy">Apothek</string>
     <string name="category_hospital">Spital</string>
     <string name="category_police">Polizeistation</string>
-    <string name="category_wifi">WLAN</string>
     <string name="category_recycling">Recycling</string>
     <string name="category_rv">Iirichtige für Wohnmobil</string>
     <string name="description">Notize</string>
@@ -398,7 +382,6 @@
     <string name="empty_street_name_error">Gib en Strassename ii</string>
     <string name="choose_language">E Spraach wähle</string>
     <string name="choose_street">E Strass wähle</string>
-    <string name="postal_code">Postleitzahl</string>
     <string name="cuisine">Chuchi</string>
     <string name="select_cuisine">Chuchi uuswähle</string>
     <string name="editor_add_phone">Telefon hinzuefüege</string>
@@ -483,8 +466,6 @@
         <item quantity="other">%d Tracks</item>
     </plurals>
     <string name="bookmarks_empty_list_title">D Lischte isch leer</string>
-    <string name="limited_access">Limitierte Zuegriff</string>
-    <string name="not_shared">Privat</string>
     <string name="speedcams_alert_title">Blitzer</string>
     <string name="power_managment_title">Stromsparmodus</string>
     <string name="power_managment_description">Versuech, de Stromverbruuch uf Choschte wo einige Funktione z reduziere</string>
@@ -579,7 +560,6 @@
     <string name="downloader_mwm_migration_dialog">Zum e Route erstelle, muesch alli Charte aktualisiere und denn d Route nomal plane.</string>
     <string name="osm_presentation">Vo de Community erstellti OpenStreetMap-Date (Stand: %s). Erfahr meh drüber, wie du d Charte bearbeite und aktualisiere chasch under OpenStreetMap.org</string>
     <string name="editor_zip_code">Postleitzahl</string>
-    <string name="ft">ft</string>
     <string name="miles_per_hour">mph</string>
     <string name="traffic_data_unavailable">Verchehrsdate sind nöd verfüegbar</string>
     <string name="saved">Gspeicheret</string>
@@ -611,7 +591,6 @@
     <string name="mobile_data_dialog">Mobils Internet verwende, zum genaueri Informatione aazzeige?</string>
     <string name="mobile_data_description">Für Benachrichtigunge über Charteaktualisierige und s Ufelade vo Änderige isch e mobili Internetverbindig erforderlich</string>
     <string name="prefs_languages_information_off_link">Wiiteri Informatione findsch i dere Aaleitig</string>
-    <string name="core_entrance">Iigang</string>
     <string name="privacy_policy">Dateschutzerchlärig</string>
     <string name="notification_channel_downloader">Charte-Downloader</string>
     <string name="unable_to_calc_alert_subtitle">Es het kei Route chönne gfunde werde. Das chan a dine Routingoptione oder a unvollständige OpenStreetMap-Date ligge. Bitte änder dini Routingoptione und versuechs nomal.</string>
@@ -627,7 +606,6 @@
     <string name="delete_place_empty_comment_error">Gib bitte de Grund für d Löschig aa</string>
     <string name="prefs_languages_information">Mir verwendet Text-To-Speech-System für Sprachaawiisige. Vieli Android-Grät nutzed Google-TTS, wo du bi Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts) abelade oder aktualisiere chasch</string>
     <string name="transliteration_title">Transliteration is latiinische Alphabet</string>
-    <string name="public_access">Öffentliche Zuegriff</string>
     <string name="pref_tts_speedcams_always">Immer warne</string>
     <string name="avoid_unpaved">Unbefestigti Strasse miide</string>
     <string name="avoid_motorways">Autobahne miide</string>
diff --git a/android/app/src/main/res/values-hi/strings.xml b/android/app/src/main/res/values-hi/strings.xml
index 6a697a749..16bed83ed 100644
--- a/android/app/src/main/res/values-hi/strings.xml
+++ b/android/app/src/main/res/values-hi/strings.xml
@@ -14,13 +14,8 @@
     <string name="downloading">डाउनलोड हो रहा है…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
     <string name="kilometres">किलोमीटर</string>
-    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
-    <string name="mb">मेगाबाइट</string>
-    <string name="gb">गीगाबाइट</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">मील</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">मेरा स्थान</string>
     <!-- Update maps later button text -->
     <string name="later">बाद में</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -76,8 +71,6 @@
     <string name="bookmarks">बुकमार्क</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">बुकमार्क और ट्रैक</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">मेरे स्थान</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">नाम</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -92,14 +85,6 @@
     <string name="maps_storage_summary">मानचित्र डाउनलोड करने के लिए फ़ोल्डर का चयन करें.</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">मानचित्र डाउनलोड किए गए</string>
-    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">आंतरिक निजी भंडारण</string>
-    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">आंतरिक साझा भंडारण</string>
-    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
-    <string name="maps_storage_removable">एसडी कार्ड</string>
-    <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">बाह्य साझा भंडारण</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
     <string name="maps_storage_free_size">%2$s में से %1$s मुफ्त</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -151,8 +136,6 @@
     <string name="category_post">डाकघर</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">थाना</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">वाईफ़ाई</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">पुनर्चक्रण</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -374,8 +357,6 @@
     <string name="login_to_make_edits_visible">अपने मानचित्र संपादनों को दुनिया भर में प्रकाशित करने के लिए एक OpenStreetMap खाता बनाएं या लॉग इन करें।</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%2$d में से %1$d</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">मानचित्र बिंदु</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">OpenStreetMap स्वयंसेवकों के लिए नोट (वैकल्पिक)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -390,10 +371,6 @@
     <string name="operator">ऑपरेटर: %s</string>
     <string name="editor_category_unsuitable_title">कोई उपयुक्त श्रेणी नहीं मिल रही?</string>
     <string name="editor_category_unsuitable_text">CoMaps केवल सरल बिंदु श्रेणियां जोड़ने की अनुमति देता है, जिसका अर्थ है कि शहर, सड़कें, झीलें, भवन की रूपरेखा आदि नहीं। कृपया ऐसी श्रेणियां सीधे <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> पर जोड़ें।. विस्तृत चरण-दर-चरण निर्देशों के लिए हमारी <a href="https://www.comaps.app/support/advanced-map-editing/">मार्गदर्शिका</a> देखें।</string>
-    <!-- abbreviation for meters -->
-    <string name="m">मी</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">किमी</string>
     <string name="hour">घंटे</string>
     <string name="minute">मिनट</string>
     <string name="day">दिन</string>
diff --git a/android/app/src/main/res/values-hr/strings.xml b/android/app/src/main/res/values-hr/strings.xml
index d0a2f4243..d7b36e5fe 100644
--- a/android/app/src/main/res/values-hr/strings.xml
+++ b/android/app/src/main/res/values-hr/strings.xml
@@ -8,7 +8,6 @@
     <string name="downloading">Preuzimanje…</string>
     <string name="download_maps">Preuzmi Karte</string>
     <string name="miles">Milje</string>
-    <string name="core_my_position">Moja lokacija</string>
     <string name="later">Kasnije</string>
     <string name="search">Traži</string>
     <string name="search_map">Pretraži kartu</string>
@@ -90,21 +89,18 @@
     <string name="editor_report_problem_send_button">Pošalji</string>
     <string name="daily">Dnevno</string>
     <string name="category_desc_more">…više</string>
-    <string name="m">m</string>
     <string name="accept">Prihvati</string>
     <string name="closed">Zatvoreno</string>
     <string name="login">Prijavi se</string>
     <string name="logout">Odjavi se</string>
     <string name="social_media">Društvene mreže</string>
     <string name="editor_edit_place_title">Uređivanje</string>
-    <string name="km">km</string>
     <string name="kilometers_per_hour">km/h</string>
     <string name="minute">min</string>
     <string name="bookmark_lists_show_all">Prikaži sve</string>
     <string name="please_wait">Molim pričekajte…</string>
     <string name="bookmark_lists">Liste</string>
     <string name="privacy">Privatnost</string>
-    <string name="core_exit">Izlaz</string>
     <string name="power_managment_setting_never">Nikada</string>
     <string name="editor_reset_edits_button">Odbaci</string>
     <string name="today">Danas</string>
@@ -115,7 +111,6 @@
     <string name="editor_remove_place_button">Obriši</string>
     <string name="phone_number">Broj telefona</string>
     <string name="delete_list">Izbriši listu</string>
-    <string name="not_shared">Privatno</string>
     <string name="power_managment_setting_manual_max">Uvijek</string>
     <string name="mobile_data_option_ask">Uvijek pitaj</string>
     <string name="yes">Da</string>
@@ -126,8 +121,6 @@
     <string name="sort">Sortiraj…</string>
     <string name="money">Novac</string>
     <string name="app_site_url">https://comaps.app/hr/</string>
-    <string name="mb">MB</string>
-    <string name="gb">GB</string>
     <string name="location_is_disabled_long_text">Trenutno su vam onemogućene sve usluge lokacije za ovaj uređaj ili aplikaciju. Molim omogućite ih u Postavkama.</string>
     <string name="precise_location_is_disabled_long_text">Kako biste osigurali točnu navigaciju, omogućite Preciznu lokaciju u postavkama.</string>
     <string name="about_menu_title">O CoMaps aplikaciji</string>
diff --git a/android/app/src/main/res/values-hu/strings.xml b/android/app/src/main/res/values-hu/strings.xml
index 78f17f113..5388d2a9c 100644
--- a/android/app/src/main/res/values-hu/strings.xml
+++ b/android/app/src/main/res/values-hu/strings.xml
@@ -16,8 +16,6 @@
     <string name="kilometres">Kilométer</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Mérföld</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">Saját helyzet</string>
     <!-- Update maps later button text -->
     <string name="later">Később</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -73,8 +71,6 @@
     <string name="bookmarks">Könyvjelzők</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Könyvjelzők és nyomvonalak</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">Saját helyek</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Név</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -89,14 +85,6 @@
     <string name="maps_storage_summary">Válassza ki a mappát a térképek letöltéséhez.</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Letöltött térképek</string>
-    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">Belső privát tárhely</string>
-    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">Belső közös tárhely</string>
-    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
-    <string name="maps_storage_removable">SD-kártya</string>
-    <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">Külső közös tárhely</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
     <string name="maps_storage_free_size">%1$s szabad terület ennyiből: %2$s</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -148,8 +136,6 @@
     <string name="category_post">Posta</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Rendőrség</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">Wi-Fi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Újrahasznosítás</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -446,7 +432,6 @@
     <string name="add_street">Utca hozzáadása</string>
     <string name="choose_language">Válasszon nyelvet</string>
     <string name="choose_street">Válasszon utcát</string>
-    <string name="postal_code">Irányítószám</string>
     <string name="cuisine">Konyha</string>
     <string name="select_cuisine">Konyha kiválasztása</string>
     <!-- login text field -->
@@ -486,8 +471,6 @@
     <string name="error_enter_correct_storey_number">Ez az épület legfeljebb %d emeletes lehet</string>
     <string name="editor_zip_code">Irányítószám</string>
     <string name="error_enter_correct_zip_code">Adjon meg egy érvényes irányítószámot</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">Térképpont</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Megjegyzés az OpenStreetMap önkénteseinek (nem kötelező)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -504,16 +487,8 @@
     <string name="editor_category_unsuitable_text">Az CoMaps csak egyszerű pontkategóriák hozzáadását teszi lehetővé, azaz nem tartalmaz városokat, utakat, tavakat, épületek körvonalait stb., az ilyen kategóriákat közvetlenül az <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> oldalon adhatja hozzá. A részletes, lépésről lépésre történő útmutatásért tekintse meg az <a href="https://www.comaps.app/support/advanced-map-editing/">útmutatónkat</a>.</string>
     <string name="downloader_no_downloaded_maps_title">Még nem töltött le térképet</string>
     <string name="downloader_no_downloaded_maps_message">Térkép letöltése offline kereséshez és navigáláshoz.</string>
-    <!-- abbreviation for meters -->
-    <string name="m">m</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">km</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/h</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">mf</string>
-    <!-- A unit of measure -->
-    <string name="ft">láb</string>
     <string name="miles_per_hour">mf/h</string>
     <string name="hour">ó</string>
     <string name="minute">p</string>
@@ -566,8 +541,6 @@
     <string name="prefs_languages_information_off_link">További tájékoztatást találhat még ebben az útmutatóban.</string>
     <string name="transliteration_title">Átírás latin betűkre</string>
     <string name="learn_more">Tudjon meg többet</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Kijárat</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Használja a keresést vagy koppintson a térképre az útvonal kiindulópontjának hozzáadásához</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -579,7 +552,6 @@
     <string name="dialog_error_storage_title">Tárhelyhozzáférési probléma</string>
     <string name="dialog_error_storage_message">Külső tárhely nem áll rendelkezésre, valószínűleg az SD-kártyát eltávolították vagy sérült, vagy rendszerfájl csak olvasható. Ellenőrizze, és lépjen kapcsolatba velünk a support@comaps.app címen</string>
     <string name="setting_emulate_bad_storage">Sérült tároló emulálása</string>
-    <string name="core_entrance">Bejárat</string>
     <string name="error_enter_correct_name">Adjon meg egy érvényes nevet</string>
     <string name="bookmark_lists">Listák</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -619,16 +591,12 @@
     <string name="button_layer_traffic">Forgalom</string>
     <string name="subway">Metró</string>
     <string name="layers_title">Térképstílusok és rétegek</string>
-    <string name="subway_data_unavailable">A metrótérkép nem érhető el</string>
     <string name="bookmarks_empty_list_title">Ez a lista üres</string>
     <string name="bookmarks_empty_list_message">Egy könyvjelző hozzáadásához érintsen meg a térképen egy helyet, majd érintse meg a csillag ikont</string>
     <string name="category_desc_more">…több</string>
     <string name="export_file">Exportálás KMZ fájlba</string>
     <string name="export_file_gpx">Exportálás GPX fájlba</string>
     <string name="delete_list">Lista törlése</string>
-    <string name="public_access">Nyilvános hozzáférés</string>
-    <string name="limited_access">Korlátozott hozzáférés</string>
-    <string name="not_shared">Privát</string>
     <string name="speedcams_alert_title">Sebességmérő kamerák</string>
     <string name="place_description_title">A hely ismertetése</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -645,7 +613,6 @@
     <string name="power_managment_setting_auto">Amikor az akkumulátor lemerül</string>
     <string name="power_managment_setting_manual_max">Mindig</string>
     <string name="enable_logging_warning_message">Ha ideiglenesen engedélyezi ezt az opciót, akkor a „Súgó” párbeszédpanel „Hibajelentés” menüpontjának használatával rögzítheti és kézzel küldheti el nekünk a problémával kapcsolatos részletes diagnosztikai naplókat. A naplók tartalmazhatnak helyadatokat.</string>
-    <string name="access_rules_author_only">Szerkesztés online</string>
     <string name="driving_options_title">Útvonaltervezési beállítások</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Díjköteles utak elkerülése</string>
@@ -844,8 +811,6 @@
     <string name="facebook">Facebook</string>
     <string name="closes_in">Bezár %s múlva</string>
     <string name="opens_in">Kinyit %s múlva</string>
-    <string name="mb">MB</string>
-    <string name="gb">GB</string>
     <string name="current_location_unknown_error_title">A jelenlegi helyzet ismeretlen.</string>
     <string name="disk_error">Nem lehet mappát létrehozni és fájlokat áthelyezni az eszköz belső memóriájában vagy az SD-kártyán</string>
     <string name="disk_error_title">Lemezhiba</string>
diff --git a/android/app/src/main/res/values-in/strings.xml b/android/app/src/main/res/values-in/strings.xml
index 51946e9ef..68acb114d 100644
--- a/android/app/src/main/res/values-in/strings.xml
+++ b/android/app/src/main/res/values-in/strings.xml
@@ -14,12 +14,8 @@
     <string name="downloading">Sedang mengunduh…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
     <string name="kilometres">Kilometer</string>
-    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
-    <string name="mb">MB</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Mil</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">Posisi Saya</string>
     <!-- Update maps later button text -->
     <string name="later">Nanti</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -75,8 +71,6 @@
     <string name="bookmarks">Penanda</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Penanda dan jalur</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">Tempat-tempat Saya</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Nama</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -138,8 +132,6 @@
     <string name="category_post">Pos</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Polisi</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">WiFi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Mendaur ulang</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -434,7 +426,6 @@
     <string name="add_street">Tambahkan jalan</string>
     <string name="choose_language">Pilih bahasa</string>
     <string name="choose_street">Pilih jalan</string>
-    <string name="postal_code">Kode Pos</string>
     <string name="cuisine">Masakan</string>
     <string name="select_cuisine">Pilih Masakan</string>
     <!-- login text field -->
@@ -474,8 +465,6 @@
     <string name="error_enter_correct_storey_number">Edit bangunan dengan maksimum %d lantai</string>
     <string name="editor_zip_code">Kode Pos</string>
     <string name="error_enter_correct_zip_code">Masukkan Kode Pos yang benar</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">Titik Peta</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Catatan untuk relawan OpenStreetMap (opsional)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -493,16 +482,8 @@
     <string name="downloader_no_downloaded_maps_title">Tidak ada peta apa pun yang diunduh</string>
     <string name="downloader_no_downloaded_maps_message">Unduh peta untuk menemukan lokasi dan bernavigasi secara offline.</string>
     <string name="current_location_unknown_error_title">Lokasi saat ini tidak diketahui.</string>
-    <!-- abbreviation for meters -->
-    <string name="m">m</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">km</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/j</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">mil</string>
-    <!-- A unit of measure -->
-    <string name="ft">kaki</string>
     <string name="miles_per_hour">mpj</string>
     <string name="hour">j</string>
     <string name="minute">mnt</string>
@@ -555,8 +536,6 @@
     <string name="prefs_languages_information_off_link">Untuk informasi selengkapnya, bacalah panduan ini.</string>
     <string name="transliteration_title">Transliterasi ke dalam bahasa Latin</string>
     <string name="learn_more">Pelajari selengkapnya</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Keluar</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Gunakan pencarian atau ketuk pada peta untuk menambahkan titik awal rute</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -568,7 +547,6 @@
     <string name="dialog_error_storage_title">Masalah akses penyimpanan</string>
     <string name="dialog_error_storage_message">Penyimpanan eksternal tidak tersedia, mungkin Kartu SD sudah dilepaskan, rusak, atau sistem berkasnya hanya dapat dibaca. Silakan periksa dan beri tahu kami di alamat support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emulasi penyimpanan yang buruk</string>
-    <string name="core_entrance">Tempat masuk</string>
     <string name="error_enter_correct_name">Harap masukkan nama yang benar</string>
     <string name="bookmark_lists">Daftar</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -605,16 +583,12 @@
     <string name="button_layer_traffic">Lalu lintas</string>
     <string name="subway">Kereta bawah tanah</string>
     <string name="layers_title">Gaya dan Lapisan Peta</string>
-    <string name="subway_data_unavailable">Peta bawah tanah tidak tersedia</string>
     <string name="bookmarks_empty_list_title">Daftar ini kosong</string>
     <string name="bookmarks_empty_list_message">Untuk menambahkan bookmark, ketuk satu tempat di peta lalu ketuk ikon bintang</string>
     <string name="category_desc_more">…selengkapnya</string>
     <string name="export_file">Ekspor KMZ</string>
     <string name="export_file_gpx">Ekspor GPX</string>
     <string name="delete_list">Hapus Daftar</string>
-    <string name="public_access">Akses umum</string>
-    <string name="limited_access">Akses terbatas</string>
-    <string name="not_shared">Pribadi</string>
     <string name="speedcams_alert_title">Kamera cepat</string>
     <string name="place_description_title">Deskripsi Tempat</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -631,7 +605,6 @@
     <string name="power_managment_setting_auto">Otomatis</string>
     <string name="power_managment_setting_manual_max">Hemat daya maksimum</string>
     <string name="enable_logging_warning_message">Opsi ini mengaktifkan pencatatan untuk tujuan diagnostik. Bisa amat membantu bagi staf dukungan kami yang memecahkan masalah dalam aplikasi. Aktifkan opsi ini hanya saat diminta oleh dukungan CoMaps.</string>
-    <string name="access_rules_author_only">Pengeditan online</string>
     <string name="driving_options_title">Pilihan berkendara</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Hindari jalan tol</string>
diff --git a/android/app/src/main/res/values-is/strings.xml b/android/app/src/main/res/values-is/strings.xml
index b932c9b94..94094887d 100644
--- a/android/app/src/main/res/values-is/strings.xml
+++ b/android/app/src/main/res/values-is/strings.xml
@@ -9,7 +9,6 @@
     <string name="category_pharmacy">Lyfjabúð</string>
     <string name="category_hospital">Sjúkrahús</string>
     <string name="category_police">Lögreglustöð</string>
-    <string name="category_wifi">WiFi</string>
     <string name="category_recycling">Endurvinnsla</string>
     <string name="category_water">Vatn</string>
     <string name="edit">Breyta</string>
@@ -60,11 +59,7 @@
     <string name="editor_edit_place_category_title">Flokkur</string>
     <string name="downloader_of">%1$d af %2$d</string>
     <string name="editor_operator">Rekstraraðili</string>
-    <string name="m">m</string>
-    <string name="km">km</string>
     <string name="kilometers_per_hour">km/klst</string>
-    <string name="mi">míl</string>
-    <string name="ft">ft</string>
     <string name="miles_per_hour">mi/klst</string>
     <string name="hour">klst</string>
     <string name="minute">mín</string>
@@ -95,19 +90,15 @@
     <string name="elevation_profile_time">Tími:</string>
     <string name="change_map_locale">Tungumál korts</string>
     <string name="outdoor_seating">Sæti utandyra</string>
-    <string name="gb">GB</string>
     <string name="miles">Mílur</string>
-    <string name="core_my_position">Staðsetning mín</string>
     <string name="delete">Eyða</string>
     <string name="later">Seinna</string>
     <string name="downloading">Sæki…</string>
     <string name="kilometres">Kílómetrar</string>
-    <string name="mb">MB</string>
     <string name="close">Loka</string>
     <string name="download">Sækja</string>
     <string name="pause">Bið</string>
     <string name="continue_button">Halda áfram</string>
-    <string name="core_my_places">Staðirnir mínir</string>
     <string name="back">Til baka</string>
     <string name="cancel">Hætta við</string>
     <string name="search">Leita</string>
@@ -132,13 +123,10 @@
     <string name="brown">Brúnt</string>
     <string name="show">Sýna</string>
     <string name="day">d</string>
-    <string name="core_exit">Útgangur</string>
-    <string name="core_entrance">Inngangur</string>
     <string name="bookmark_lists_hide_all">Fela allt</string>
     <string name="bookmark_lists_show_all">Sýna allt</string>
     <string name="button_layer_traffic">Umferð</string>
     <string name="subway">Neðanjarðarlest</string>
-    <string name="not_shared">Einka</string>
     <string name="yes_available">Já</string>
     <string name="by_type">Eftir gerð</string>
     <string name="by_date">Eftir dagsetningu</string>
@@ -194,7 +182,6 @@
     <string name="forgot_password">Gleymdirðu lykilorðinu?</string>
     <string name="logout">Skrá út</string>
     <string name="edit_place">Breyta stað</string>
-    <string name="postal_code">Póstnúmer</string>
     <string name="email_or_username">Tölvupóstur eða notandanafn</string>
     <string name="editor_add_phone">Bæta við símanúmeri</string>
     <string name="level">Hæð</string>
@@ -248,8 +235,6 @@
     <string name="please_wait">Bíddu aðeins…</string>
     <string name="category_desc_more">…meira</string>
     <string name="delete_list">Eyða lista</string>
-    <string name="public_access">Opinber aðgangur</string>
-    <string name="limited_access">Takmarkaður aðgangur</string>
     <string name="place_description_title">Lýsing á stað</string>
     <string name="unable_to_calc_alert_title">Tókst ekki að reikna leið</string>
     <string name="near_me_sorttype">Nálægt mér</string>
@@ -355,8 +340,6 @@
     <string name="move_maps">Færa landakort?</string>
     <string name="category_shopping">Verslun</string>
     <string name="maps_storage_downloaded">Sótt kort</string>
-    <string name="maps_storage_internal">Innbyggð einkageymsla</string>
-    <string name="maps_storage_external">Ytri sameiginleg geymsla</string>
     <string name="move_maps_error">Villa kom upp við flutning á landakortaskrám</string>
     <string name="error_enter_correct_phone">Settu inn gilt símanúmer</string>
     <string name="error_enter_correct_web">Settu inn gilt veffang</string>
@@ -365,8 +348,6 @@
     <string name="download_country_failed">Mistókst að sækja %s</string>
     <string name="bookmarks_and_tracks">Bókamerki og ferlar</string>
     <string name="maps_storage_summary">Veldu möppu til að vista kort inn í.</string>
-    <string name="maps_storage_shared">Innbyggð sameiginleg geymsla</string>
-    <string name="maps_storage_removable">SD-minniskort</string>
     <string name="maps_storage_free_size">%1$s laust af %2$s</string>
     <string name="wait_several_minutes">Þetta gæti tekið nokkrar mínútur.\nHinkraðu við.…</string>
     <string name="measurement_units_summary">Veldu á milli kílómetra og mílna</string>
@@ -384,7 +365,6 @@
     <string name="downloader_no_space_title">Ekki nægilegt pláss</string>
     <string name="downloader_search_field_hint">Finna kort</string>
     <string name="editor_edit_place_title">Breytingar</string>
-    <string name="core_placepage_unknown_place">Punktur á korti</string>
     <string name="editor_more_about_osm">Meira um OpenStreetMap</string>
     <string name="editor_osm_history">Breytingaferillinn þinn</string>
     <string name="placepage_edit_bookmark_button">Breyta bókamerki</string>
@@ -493,7 +473,6 @@
     <string name="bookmarks_error_title_empty_list_name">Heitið má ekki vera autt</string>
     <string name="bookmarks_error_message_empty_list_name">Settu inn heiti listans</string>
     <string name="profile">OpenStreetMap-notandasnið</string>
-    <string name="subway_data_unavailable">Kort fyrir neðanjarðarlest er ekki tiltækt</string>
     <string name="notification_channel_downloader">Niðurhal landakorta</string>
     <string name="isolines_location_error_dialog">Hæðarlínur eru ennþá ekki tiltækar á þessu svæði</string>
     <string name="app_tip_03">Ef þú þekkir einhvern hforritara/ugbúnaðarhönnuð, þá geturðu beðið hana/hann um að búa til einhvern eiginleika sem þér finnst vanta.</string>
@@ -556,7 +535,6 @@
         <item quantity="other">%d skrár fundust. Þú getur skoðað þær eftir umbreytingu.</item>
     </plurals>
     <string name="bookmarks_empty_list_message">Til að bæta við bókamerki, skaltu ýta á stað á kortinu og ýta síðan á stjörnutáknið</string>
-    <string name="access_rules_author_only">Breytingar á netinu</string>
     <string name="power_managment_description">Prófaðu að minnka orkunotkun á kostnað einhverra eiginleika.</string>
     <string name="unable_to_calc_alert_subtitle">Leið fannst ekki. Það gæti stafað af stillingum þínum fyrir leiðagerð eða ófullkomnum gögnum í OpenStreetMap. Breyttu stillingum þínum fyrir leiðagerð og prófaðu aftur.</string>
     <string name="dialog_pedestrian_route_is_long_header">Engin neðanjarðarlestarleið fannst</string>
diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml
index af0c06718..6cdb510b7 100644
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -16,8 +16,6 @@
     <string name="kilometres">Chilometri</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Miglia</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">La mia posizione</string>
     <!-- Update maps later button text -->
     <string name="later">Più tardi</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -75,8 +73,6 @@
     <string name="bookmarks">Luoghi preferiti</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Luoghi preferiti e tracce</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">I miei luoghi</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Nome</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -138,8 +134,6 @@
     <string name="category_post">Posta</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Polizia</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">Wi-Fi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Riciclo</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -445,7 +439,6 @@
     <string name="empty_street_name_error">Inserisci il nome della via</string>
     <string name="choose_language">Scegli una lingua</string>
     <string name="choose_street">Scegli una via</string>
-    <string name="postal_code">Codice postale</string>
     <string name="cuisine">Cucina</string>
     <string name="select_cuisine">Seleziona la cucina</string>
     <!-- login text field -->
@@ -486,8 +479,6 @@
     <string name="error_enter_correct_storey_number">Il numero di piani non deve superare %d</string>
     <string name="editor_zip_code">Codice postale</string>
     <string name="error_enter_correct_zip_code">Inserire un codice postale valido</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">Punto della mappa</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Nota per i volontari di OpenStreetMap (opzionale)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -505,14 +496,8 @@
     <string name="downloader_no_downloaded_maps_title">Non hai scaricato mappe</string>
     <string name="downloader_no_downloaded_maps_message">Scarica delle mappe per trovare luoghi e navigare offline</string>
     <string name="current_location_unknown_error_title">Posizione attuale sconosciuta</string>
-    <!-- abbreviation for meters -->
-    <string name="m">m</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">km</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/h</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">mi</string>
     <string name="miles_per_hour">mph</string>
     <string name="minute">min</string>
     <string name="day">g</string>
@@ -571,8 +556,6 @@
     <string name="prefs_languages_information_off_link">Per maggiori informazioni, consulta questa guida</string>
     <string name="transliteration_title">Traslittera in caratteri latini</string>
     <string name="learn_more">Scopri di più</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Uscita</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Utilizza l\'opzione \"Cerca\" oppure tocca un qualsiasi punto sulla mappa per aggiungere un punto di partenza per il tuo percorso</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -584,7 +567,6 @@
     <string name="dialog_error_storage_title">Problema di accesso alla memoria</string>
     <string name="dialog_error_storage_message">Memoria esterna non disponibile. Probabilmente la scheda SD è stata rimossa, danneggiata o il file system è di sola lettura. Controlla la tua scheda SD o contattaci a support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Simula memoria danneggiata</string>
-    <string name="core_entrance">Ingresso</string>
     <string name="error_enter_correct_name">Inserire un nome corretto</string>
     <string name="bookmark_lists">Elenchi</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -627,16 +609,12 @@
     <string name="button_layer_traffic">Traffico</string>
     <string name="subway">Metropolitana</string>
     <string name="layers_title">Stili e livelli della mappa</string>
-    <string name="subway_data_unavailable">La mappa della metropolitana non è disponibile</string>
     <string name="bookmarks_empty_list_title">Questo elenco è vuoto</string>
     <string name="bookmarks_empty_list_message">Per aggiungere un luogo preferito, tocca un punto sulla mappa e poi tocca l\'icona a forma di stella</string>
     <string name="category_desc_more">…altro</string>
     <string name="export_file">Esporta KMZ</string>
     <string name="export_file_gpx">Esporta GPX</string>
     <string name="delete_list">Cancella elenco</string>
-    <string name="public_access">Accesso pubblico</string>
-    <string name="limited_access">Accesso privato</string>
-    <string name="not_shared">Personale</string>
     <string name="speedcams_alert_title">Autovelox</string>
     <string name="place_description_title">Descrizione luogo</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -653,7 +631,6 @@
     <string name="power_managment_setting_auto">Quando c\'è poca batteria</string>
     <string name="power_managment_setting_manual_max">Sempre</string>
     <string name="enable_logging_warning_message">Attiva questa opzione temporaneamente per registrare e inviarci manualmente dei log diagnostici riguardo al tuo problema usando \"Segnala un bug\" nella sezione Aiuto. I log potrebbero contenere informazioni sulla posizione.</string>
-    <string name="access_rules_author_only">Modifica online</string>
     <string name="driving_options_title">Impostazioni del percorso</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Evita le strade a pedaggio</string>
@@ -847,9 +824,7 @@
     <string name="disk_error_title">Errore di memoria</string>
     <string name="mastodon">Mastodon</string>
     <string name="wikimedia_commons">Wikimedia Commons</string>
-    <string name="ft">ft</string>
     <string name="openstreetmap">OpenStreetMap</string>
-    <string name="maps_storage_external">Memoria esterna condivisa</string>
     <string name="maps_storage_free_size">%1$s liberi su %2$s</string>
     <string name="disk_error">Impossibile creare la cartella e spostare i file nella memoria interna del dispositivo o sulla scheda SD</string>
     <string name="menu">Menu</string>
@@ -859,17 +834,12 @@
     <string name="instagram">Instagram</string>
     <string name="editor_line_social_network">LINE</string>
     <string name="level_value_generic">Piano: %s</string>
-    <string name="maps_storage_internal">Memoria interna privata</string>
-    <string name="maps_storage_shared">Memoria interna condivisa</string>
-    <string name="maps_storage_removable">Scheda SD</string>
     <string name="move_maps_error">Errore durante lo spostamento dei file delle mappe</string>
     <string name="matrix">[Matrix]</string>
     <string name="github">GitHub</string>
     <string name="hour">h</string>
     <string name="vk">VK</string>
     <string name="comma_separated_pair">%1$s, %2$s</string>
-    <string name="mb">MB</string>
-    <string name="gb">GB</string>
     <string name="codeberg">Codeberg</string>
     <string name="app_site_url">https://comaps.app/it/</string>
     <string name="error_enter_correct_fediverse_page">Inserisci un nome utente o un indirizzo web Mastodon valido</string>
diff --git a/android/app/src/main/res/values-iw/strings.xml b/android/app/src/main/res/values-iw/strings.xml
index a75151656..70e971821 100644
--- a/android/app/src/main/res/values-iw/strings.xml
+++ b/android/app/src/main/res/values-iw/strings.xml
@@ -16,8 +16,6 @@
     <string name="kilometres">ק\"מ</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">מייל</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">המיקום שלי</string>
     <!-- Update maps later button text -->
     <string name="later">מאוחר יותר</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -73,8 +71,6 @@
     <string name="bookmarks">סימניות</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">סימניות ומסלולים</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">המקומות שלי</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">שם</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -89,14 +85,6 @@
     <string name="maps_storage_summary">בחר מיקום במחשבך לשמירת המפות שתוריד.</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">מפות שהורדו</string>
-    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">אחסון פנימי פרטי</string>
-    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">אחסון פנימי משותף</string>
-    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
-    <string name="maps_storage_removable">כרטיס זיכרון</string>
-    <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">אחסון חיצוני משותף</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
     <string name="maps_storage_free_size">%1$s פנוי מתוך %2$s</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -449,7 +437,6 @@
     <string name="empty_street_name_error">יש להזין שם רחוב</string>
     <string name="choose_language">בחר שפה</string>
     <string name="choose_street">בחר רחוב</string>
-    <string name="postal_code">מיקוד</string>
     <string name="cuisine">סגנון בישול</string>
     <string name="select_cuisine">בחר סיגנון בישול</string>
     <!-- login text field -->
@@ -490,8 +477,6 @@
     <string name="error_enter_correct_storey_number">מספר הקומות לא יכול להיות גבוה מ-%d</string>
     <string name="editor_zip_code">מיקוד</string>
     <string name="error_enter_correct_zip_code">יש להזין מיקוד תקין</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">נקודת מפה</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">הערה למתנדבי OpenStreetMap (אופציונלי)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -509,16 +494,8 @@
     <string name="downloader_no_downloaded_maps_title">לא הורדת אף מפה</string>
     <string name="downloader_no_downloaded_maps_message">הורד מפה כדי לחפש ולנווט ללא חיבור לאינטרנט.</string>
     <string name="current_location_unknown_error_title">המיקום הנוכחי לא ידוע.</string>
-    <!-- abbreviation for meters -->
-    <string name="m">מ׳</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">ק״מ</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">קמ״ש</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">מייל</string>
-    <!-- A unit of measure -->
-    <string name="ft">רגל</string>
     <string name="miles_per_hour">מייל לשעה</string>
     <string name="hour">ש׳</string>
     <string name="minute">ד׳</string>
@@ -577,8 +554,6 @@
     <string name="prefs_languages_information_off_link">למידע נוסף ניתן לקרוא את המדריך הזה.</string>
     <string name="transliteration_title">תעתיק לאותיות לטיניות</string>
     <string name="learn_more">למידע נוסף</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">יציאה</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">יש להוסיף נקודת התחלה למסלול באמצעות חיפוש או בלחיצה על המפה</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -590,7 +565,6 @@
     <string name="dialog_error_storage_title">בעיית גישה לאחסון</string>
     <string name="dialog_error_storage_message">לא ניתן לגשת לאחסון החיצוני. ייתכן כי כרטיס הזיכרון הוסר, נפגם, או שמערכת הקבצים היא לקריאה בלבד. נא לבדוק את כרטיס הזיכרון או ליצור איתנו קשר בכתובת support@comaps.app</string>
     <string name="setting_emulate_bad_storage">בצע אמולציה לאחסון רע</string>
-    <string name="core_entrance">כניסה</string>
     <string name="error_enter_correct_name">נא להזין שם תקין</string>
     <string name="bookmark_lists">רשימות</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -633,16 +607,12 @@
     <string name="button_layer_traffic">תעבורה</string>
     <string name="subway">רכבת תחתית</string>
     <string name="layers_title">סגנונות ושכבות מפה</string>
-    <string name="subway_data_unavailable">מפת רכבת תחתית לא זמינה</string>
     <string name="bookmarks_empty_list_title">רשימה זו ריקה</string>
     <string name="bookmarks_empty_list_message">כדי להוסיף סימניה, לחץ על מקום במפה ואז לחץ על סימן הכוכב</string>
     <string name="category_desc_more">…עוד</string>
     <string name="export_file">ייצא KMZ</string>
     <string name="export_file_gpx">ייצוא GPX</string>
     <string name="delete_list">מחק רשימה</string>
-    <string name="public_access">גישה ציבורית</string>
-    <string name="limited_access">גישה מוגבלת</string>
-    <string name="not_shared">פרטי</string>
     <string name="speedcams_alert_title">מצלמות מהירות</string>
     <string name="place_description_title">תיאור מיקום</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -659,7 +629,6 @@
     <string name="power_managment_setting_auto">כשהסוללה חלשה</string>
     <string name="power_managment_setting_manual_max">תמיד</string>
     <string name="enable_logging_warning_message">הפעל אפשרות זו כדי לתעד ובאופן ידני לשלוח אלינו פרטים דיאגנוסטיים על הבעיה שלך בעזרת הכפתור \"דווח על באג\" בתפריט עזרה. הפרטים עשויים לכלול מידע על מיקום.</string>
-    <string name="access_rules_author_only">עריכה אונליין</string>
     <string name="driving_options_title">אפשרויות מסלול</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">הימנע מכבישי אגרה</string>
@@ -848,8 +817,6 @@
     <string name="uri_open_location_failed">לא מותקנת אפליקציה שיכולה לפתוח את המיקום</string>
     <!-- preference string for using auto theme only in navigation mode -->
     <string name="nav_auto">אוטומטי בניווט</string>
-    <string name="gb">GB</string>
-    <string name="mb">MB</string>
     <string name="telegram_url">https://t.me/CoMapsApp</string>
     <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/About_OpenStreetMap</string>
     <string name="translated_om_site_url">https://comaps.app</string>
diff --git a/android/app/src/main/res/values-ja/strings.xml b/android/app/src/main/res/values-ja/strings.xml
index e08eec6cb..4f3ef943e 100644
--- a/android/app/src/main/res/values-ja/strings.xml
+++ b/android/app/src/main/res/values-ja/strings.xml
@@ -16,8 +16,6 @@
     <string name="kilometres">キロメートル</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">マイル</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">現在地</string>
     <!-- Update maps later button text -->
     <string name="later">後で</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -75,8 +73,6 @@
     <string name="bookmarks">ブックマーク</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">ブックマークとトラック</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">マイロケーション</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">名称</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -91,14 +87,6 @@
     <string name="maps_storage_summary">マップのダウンロード先を選択してください。</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">マップ</string>
-    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">アプリ固有のストレージ</string>
-    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">共有ストレージ</string>
-    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
-    <string name="maps_storage_removable">SDカード</string>
-    <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">外部ストレージ</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
     <string name="maps_storage_free_size">%2$s のうち %1$s の空き容量</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -150,8 +138,6 @@
     <string name="category_post">郵便局</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">警察</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">無線LAN</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">リサイクル</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -461,7 +447,6 @@
     <string name="empty_street_name_error">通りの名前を入力してください</string>
     <string name="choose_language">言語を選択</string>
     <string name="choose_street">通りを選択</string>
-    <string name="postal_code">郵便番号</string>
     <string name="cuisine">料理</string>
     <string name="select_cuisine">料理を選択</string>
     <!-- login text field -->
@@ -502,8 +487,6 @@
     <string name="error_enter_correct_storey_number">最高%d階までのビルを編集</string>
     <string name="editor_zip_code">郵便番号</string>
     <string name="error_enter_correct_zip_code">正しい郵便番号を入力してください</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">マップポイント</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">OpenStreetMapボランティアへの注意（オプション）</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -521,16 +504,8 @@
     <string name="downloader_no_downloaded_maps_title">マップをダウンロードしていません</string>
     <string name="downloader_no_downloaded_maps_message">ロケーションの検索とオフラインナビゲートのためにマップをダウンロードしてください。</string>
     <string name="current_location_unknown_error_title">現在地は不明です。</string>
-    <!-- abbreviation for meters -->
-    <string name="m">m</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">km</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/h</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">mi</string>
-    <!-- A unit of measure -->
-    <string name="ft">ft</string>
     <string name="miles_per_hour">mph</string>
     <string name="hour">時間</string>
     <string name="minute">分</string>
@@ -590,8 +565,6 @@
     <string name="prefs_languages_information_off_link">詳細については、このガイドをご確認ください。</string>
     <string name="transliteration_title">ラテン文字への翻字</string>
     <string name="learn_more">詳細情報</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">出口</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">検索を使うか、地図上をタップしてルートの出発点を追加する</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -603,7 +576,6 @@
     <string name="dialog_error_storage_title">ストレージアクセスの問題</string>
     <string name="dialog_error_storage_message">外部ストレージは使用できません。おそらく SD カードが取り外されたか、破損しているか、あるいはファイルシステムが読み取り専用になっています。SD カードを確認するか、support@comaps.app までご連絡ください</string>
     <string name="setting_emulate_bad_storage">壊れたストレージをシミュレートする</string>
-    <string name="core_entrance">入口</string>
     <string name="error_enter_correct_name">正しい名前を入力してください</string>
     <string name="bookmark_lists">リスト</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -640,16 +612,12 @@
     <string name="button_layer_traffic">交通状況</string>
     <string name="subway">地下鉄</string>
     <string name="layers_title">マップのスタイルとレイヤー</string>
-    <string name="subway_data_unavailable">地下鉄路線図はご利用いただけません</string>
     <string name="bookmarks_empty_list_title">このリストは空です</string>
     <string name="bookmarks_empty_list_message">ブックマークを追加するには、地図上の場所をタップし、星のアイコンをタップしてください</string>
     <string name="category_desc_more">詳細</string>
     <string name="export_file">KMZをエクスポートする</string>
     <string name="export_file_gpx">GPXをエクスポートする</string>
     <string name="delete_list">リストを削除</string>
-    <string name="public_access">パブリック・アクセス</string>
-    <string name="limited_access">制限されたアクセス</string>
-    <string name="not_shared">非公開</string>
     <string name="speedcams_alert_title">自動速度違反取締装置</string>
     <string name="place_description_title">場所の説明</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -666,7 +634,6 @@
     <string name="power_managment_setting_auto">自動</string>
     <string name="power_managment_setting_manual_max">最大電力節約</string>
     <string name="enable_logging_warning_message">このオプションは診断目的でのデータ記録を有効にします。これはこのアプリケーションのトラブルシューティングを担当する当社のサポートスタッフの助けになります。このオプションはCoMapsにリクエストされた場合にのみ有効にしてください。</string>
-    <string name="access_rules_author_only">オンライン編集</string>
     <string name="driving_options_title">経路オプション</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">有料道路を避ける</string>
@@ -867,8 +834,6 @@
     <string name="github">GitHub</string>
     <string name="editor_line_social_network">LINE</string>
     <string name="openstreetmap">OpenStreetMap</string>
-    <string name="gb">GB</string>
-    <string name="mb">MB</string>
     <string name="level_value_generic">階層：%s</string>
     <string name="telegram_url">https://t.me/CoMapsApp/</string>
     <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
diff --git a/android/app/src/main/res/values-ko/strings.xml b/android/app/src/main/res/values-ko/strings.xml
index 152d2dc37..3c8efe7b8 100644
--- a/android/app/src/main/res/values-ko/strings.xml
+++ b/android/app/src/main/res/values-ko/strings.xml
@@ -16,8 +16,6 @@
     <string name="kilometres">킬로미터</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">마일</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">나의 위치</string>
     <!-- Update maps later button text -->
     <string name="later">나중에</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -73,8 +71,6 @@
     <string name="bookmarks">북마크</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">북마크 및 트랙</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">내 장소</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">이름</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -136,8 +132,6 @@
     <string name="category_post">우편</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">치안대</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">WiFi 인터넷</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">재활용</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -432,7 +426,6 @@
     <string name="add_street">거리 추가</string>
     <string name="choose_language">언어 선택</string>
     <string name="choose_street">거리 선택</string>
-    <string name="postal_code">우편 번호</string>
     <string name="cuisine">요리</string>
     <string name="select_cuisine">요리 선택</string>
     <!-- login text field -->
@@ -472,8 +465,6 @@
     <string name="error_enter_correct_storey_number">최대 %d층까지 입력하세요</string>
     <string name="editor_zip_code">우편번호</string>
     <string name="error_enter_correct_zip_code">올바른 우편번호를 입력하세요</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">지도 지점</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">OpenStreetMap 자원 봉사자 참고 사항(선택 사항)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -491,16 +482,8 @@
     <string name="downloader_no_downloaded_maps_title">지도를 다운로드하지 않았습니다</string>
     <string name="downloader_no_downloaded_maps_message">오프라인으로 위치를 검색하려면 지도를 다운로드하세요.</string>
     <string name="current_location_unknown_error_title">현재 위치를 알 수 없습니다.</string>
-    <!-- abbreviation for meters -->
-    <string name="m">m</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">km</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/시</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">mi</string>
-    <!-- A unit of measure -->
-    <string name="ft">풋</string>
     <string name="miles_per_hour">mph</string>
     <string name="hour">t</string>
     <string name="minute">min</string>
@@ -553,8 +536,6 @@
     <string name="prefs_languages_information_off_link">자세한 내용을 보려면 이 가이드를 확인하세요.</string>
     <string name="transliteration_title">라틴어로 음역</string>
     <string name="learn_more">자세히 알아보기</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">끝내기</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">검색을 사용하거나 지도를 탭하여 경로 시작점을 추가합니다</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -566,7 +547,6 @@
     <string name="dialog_error_storage_title">저장소 액세스 문제</string>
     <string name="dialog_error_storage_message">외부 저장소를 사용할 수 없습니다. SD 카드가 제거되었거나 손상되었거나 파일 시스템이 읽기 전용일 수 있습니다. 확인 후 support@comaps.app로 문의하세요.</string>
     <string name="setting_emulate_bad_storage">불량 저장소 에뮬레이션</string>
-    <string name="core_entrance">입구</string>
     <string name="error_enter_correct_name">올바른 이름을 입력하세요.</string>
     <string name="bookmark_lists">목록</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -603,16 +583,12 @@
     <string name="button_layer_traffic">트래픽</string>
     <string name="subway">지하철</string>
     <string name="layers_title">맵 스타일 및 레이어</string>
-    <string name="subway_data_unavailable">지하철 지도가 가용하지 않습니다.</string>
     <string name="bookmarks_empty_list_title">이 목록은 비어있습니다.</string>
     <string name="bookmarks_empty_list_message">북마크를 추가하려면 맵에서 장소를 탭하고 별 모양 아이콘을 탭하세요.</string>
     <string name="category_desc_more">…기타 정보</string>
     <string name="export_file">KMZ 내보내기</string>
     <string name="export_file_gpx">GPX 내보내기</string>
     <string name="delete_list">리스트 삭제</string>
-    <string name="public_access">일반 접근</string>
-    <string name="limited_access">제한 접근</string>
-    <string name="not_shared">개인</string>
     <string name="speedcams_alert_title">속도 감시 카메라</string>
     <string name="place_description_title">장소 묘사</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -629,7 +605,6 @@
     <string name="power_managment_setting_auto">자동</string>
     <string name="power_managment_setting_manual_max">최대 전력 절약</string>
     <string name="enable_logging_warning_message">이 옵션은 진단을 목적으로 로그를 엽니다 이를 통해 앱에 대한 문제를 분석하는 우리의 스탭을 도울 수 있습니다 이 옵션은 오직 CoMaps 지원 요청에서만 가능합니다.</string>
-    <string name="access_rules_author_only">온라인 수정</string>
     <string name="driving_options_title">운전 옵션</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">유료 도로 피하기</string>
@@ -809,9 +784,7 @@
     <string name="comma_separated_pair">%1$s, %2$s</string>
     <string name="translated_om_site_url">https://comaps.app/</string>
     <string name="app_site_url">https://comaps.app/</string>
-    <string name="gb">GB</string>
     <string name="telegram_url">https://t.me/CoMapsApp/</string>
-    <string name="mb">MB</string>
     <string name="openstreetmap">OpenStreetMap</string>
     <string name="tts_info_link">https://www.comaps.app/support/tts-configuration-guide-for-android/</string>
     <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
diff --git a/android/app/src/main/res/values-lt/strings.xml b/android/app/src/main/res/values-lt/strings.xml
index c45935424..93cc47a5a 100644
--- a/android/app/src/main/res/values-lt/strings.xml
+++ b/android/app/src/main/res/values-lt/strings.xml
@@ -14,13 +14,8 @@
     <string name="downloading">Atsiunčiama…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
     <string name="kilometres">Kilometrai</string>
-    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
-    <string name="mb">MB</string>
-    <string name="gb">GB</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Mylios</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">Mano vieta</string>
     <!-- Update maps later button text -->
     <string name="later">Vėliau</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -74,8 +69,6 @@
     <string name="bookmark_set_name">Žymių sąrašo pavadinimas</string>
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
     <string name="bookmarks">Žymės</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">Mano vietos</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Pavadinimas</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -88,14 +81,6 @@
     <string name="maps_storage">Žemėlapius saugyklos vieta</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Atsiųsti žemėlapiai</string>
-    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">Vidinė privati saugykla</string>
-    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">Vidinė bendroji saugykla</string>
-    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
-    <string name="maps_storage_removable">SD kortelė</string>
-    <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">Išorinė bendroji saugykla</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
     <string name="maps_storage_free_size">Laisva %1$s iš %2$s</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -145,8 +130,6 @@
     <string name="category_post">Paštas</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Policija</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">Belaidis ryšys</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Antrinės žaliavos</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -448,7 +431,6 @@
     <string name="empty_street_name_error">Įveskite gatvės pavadinimą</string>
     <string name="choose_language">Pasirinkite kalbą</string>
     <string name="choose_street">Pasirinkite gatvę</string>
-    <string name="postal_code">Pašto kodas</string>
     <string name="cuisine">Virtuvė</string>
     <string name="select_cuisine">Pasirinkite virtuvę</string>
     <!-- login text field -->
@@ -489,8 +471,6 @@
     <string name="error_enter_correct_storey_number">Aukštų skaičius negali viršyti %d</string>
     <string name="editor_zip_code">Pašto kodas</string>
     <string name="error_enter_correct_zip_code">Įveskite galiojantį pašto kodą</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">Žemėlapio taškas</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Pastaba „OpenStreetMap“ talkininkams (neprivaloma)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -508,16 +488,8 @@
     <string name="downloader_no_downloaded_maps_title">Nesate atsiuntę jokių žemėlapių</string>
     <string name="downloader_no_downloaded_maps_message">Atsiųskite žemėlapius, kad galėtumėte ieškoti vietų ir keliauti neprisijungę prie tinklo</string>
     <string name="current_location_unknown_error_title">Dabartinė vieta nežinoma</string>
-    <!-- abbreviation for meters -->
-    <string name="m">m</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">km</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/h</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">myl.</string>
-    <!-- A unit of measure -->
-    <string name="ft">pėd.</string>
     <string name="miles_per_hour">myl./h</string>
     <string name="hour">h</string>
     <string name="minute">min</string>
@@ -577,8 +549,6 @@
     <string name="prefs_languages_information_off_link">Jei norite išsamesnės informacijos, žvilgtelėkite į šią instrukciją</string>
     <string name="transliteration_title">Transliteruoti užrašus lotyniškais rašmenimis</string>
     <string name="learn_more">Išsamesnė informacija</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Išėjimas</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Pasinaudokite paieška arba bakstelėkite žemėlapyje, kad pridėtumėte maršruto pradžios tašką</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -590,7 +560,6 @@
     <string name="dialog_error_storage_title">Prieigos prie saugyklos problema</string>
     <string name="dialog_error_storage_message">Išorinė saugykla yra nepasiekiama. SD kortelė galimai yra pašalinta, pažeista, arba failų sistema joje yra nustatyta tik skaitymui. Patikrinkite SD kortelę arba susisiekite su mumis adresu support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emuliuoti blogą saugyklą</string>
-    <string name="core_entrance">Įėjimas</string>
     <string name="error_enter_correct_name">Įveskite teisingą pavadinimą</string>
     <string name="bookmark_lists">Sąrašai</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -618,16 +587,12 @@
     <string name="button_layer_traffic">Eismas</string>
     <string name="subway">Metro</string>
     <string name="layers_title">Žemėlapio stiliai ir sluoksniai</string>
-    <string name="subway_data_unavailable">Metro žemėlapis neprieinamas</string>
     <string name="bookmarks_empty_list_title">Sąrašas tuščias</string>
     <string name="bookmarks_empty_list_message">Jeigu norite pridėti žymę, bakstelėkite vietą žemėlapyje, o tada – žvaigždutės piktogramą</string>
     <string name="category_desc_more">…daugiau</string>
     <string name="export_file">Eksportuoti KMZ</string>
     <string name="export_file_gpx">Eksportuoti GPX</string>
     <string name="delete_list">Šalinti sąrašą</string>
-    <string name="public_access">Vieša prieiga</string>
-    <string name="limited_access">Ribota prieiga</string>
-    <string name="not_shared">Privatus</string>
     <string name="speedcams_alert_title">Greičio matuokliai</string>
     <string name="place_description_title">Vietos aprašymas</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -644,7 +609,6 @@
     <string name="power_managment_setting_auto">Esant žemai įkrovai</string>
     <string name="power_managment_setting_manual_max">Visada</string>
     <string name="enable_logging_warning_message">Įjunkite šią parinktį, jei norite kurį laiką rašyti derinimo žurnalą. Pasinaudodami mygtuku „Pranešti apie klaidą“, esančiu žinyno dialogo lange, galėsite pranešti apie problemą, pridėdami sukauptą žurnalą. Žurnaluose gali būti vietos duomenų.</string>
-    <string name="access_rules_author_only">Taisymas internete</string>
     <string name="driving_options_title">Maršruto apskaičiavimo parinktys</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_unpaved">Vengti negrįstų kelių</string>
diff --git a/android/app/src/main/res/values-lv/strings.xml b/android/app/src/main/res/values-lv/strings.xml
index e9c62cfd0..b8c8f057f 100644
--- a/android/app/src/main/res/values-lv/strings.xml
+++ b/android/app/src/main/res/values-lv/strings.xml
@@ -16,8 +16,6 @@
     <string name="kilometres">Kilometri</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Jūdzes</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">Mana atrašanās vieta</string>
     <!-- Update maps later button text -->
     <string name="later">Vēlāk</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -73,8 +71,6 @@
     <string name="bookmarks">Grāmatzīmes</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Grāmatzīmes un ceļi</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">Manas vietas</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Nosaukums</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -89,14 +85,6 @@
     <string name="maps_storage_summary">Norādiet mapi, kurā lejupielādēt kartes.</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Lejupielādētās kartes</string>
-    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">Iekšējā privātā krātuve</string>
-    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">Iekšējā kopīgā krātuve</string>
-    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
-    <string name="maps_storage_removable">Atmiņas karte</string>
-    <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">Ārējā kopīgā krātuve</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
     <string name="maps_storage_free_size">%1$s brīva vieta no %2$s</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -148,8 +136,6 @@
     <string name="category_post">Pasts</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Policija</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">WiFi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Pārstrāde</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -457,7 +443,6 @@
     <string name="empty_street_name_error">Ierakstiet ielas nosaukumu</string>
     <string name="choose_language">Izvēlieties valodu</string>
     <string name="choose_street">Izvēlieties ielu</string>
-    <string name="postal_code">Pasta indekss</string>
     <string name="cuisine">Virtuve</string>
     <string name="select_cuisine">Atlasiet virtuvi</string>
     <!-- login text field -->
@@ -511,16 +496,8 @@
     <string name="downloader_no_downloaded_maps_title">Ierīcē nav lejupielādētu karšu</string>
     <string name="downloader_no_downloaded_maps_message">Lai darbotos nesaistes navigācija un meklēšana, lejupielādējiet kartes.</string>
     <string name="current_location_unknown_error_title">Pašreizējā vieta nav zināma.</string>
-    <!-- abbreviation for meters -->
-    <string name="m">m</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">km</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/h</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">mi</string>
-    <!-- A unit of measure -->
-    <string name="ft">ft</string>
     <string name="miles_per_hour">mph</string>
     <string name="hour">st.</string>
     <string name="minute">min.</string>
@@ -580,8 +557,6 @@
     <string name="prefs_languages_information_off_link">Vairāk informācijas atradīsiet šajā pamācībā</string>
     <string name="transliteration_title">Transliterācija uz latīņu alfabētu</string>
     <string name="learn_more">Uzzināt vairāk</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Izeja</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Lietojiet meklēšanu vai pieskarieties kartei, lai pievienotu galamērķi</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -593,7 +568,6 @@
     <string name="dialog_error_storage_title">Krātuves pieejas problēma</string>
     <string name="dialog_error_storage_message">Ārējā krātuve nav pieejama. Iespējams, ir izņemta vai bojāta SD karte, vai arī datņu sistēma ir tikai lasāma. Pārbaudiet savu SD karti vai sazinieties ar mums, rakstot uz support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Simulēt bojātu krātuvi</string>
-    <string name="core_entrance">Ieeja</string>
     <string name="error_enter_correct_name">Ierakstiet pareizu nosaukumu</string>
     <string name="bookmark_lists">Saraksti</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -636,16 +610,12 @@
     <string name="button_layer_traffic">Satiksme</string>
     <string name="subway">Metro</string>
     <string name="layers_title">Kartes stili un slāņi</string>
-    <string name="subway_data_unavailable">Metro karte nav pieejama</string>
     <string name="bookmarks_empty_list_title">Saraksts ir tukšs</string>
     <string name="bookmarks_empty_list_message">Lai pievienotu grāmatzīmi, sākumā spiediet uz vietas kartē, bet tad uz zvaigznītes ikonas</string>
     <string name="category_desc_more">…vairāk</string>
     <string name="export_file">Izgūt KMZ formātā</string>
     <string name="export_file_gpx">Izgūt GPX formātā</string>
     <string name="delete_list">Dzēst sarakstu</string>
-    <string name="public_access">Publiska pieeja</string>
-    <string name="limited_access">Ierobežota pieeja</string>
-    <string name="not_shared">Privāts</string>
     <string name="speedcams_alert_title">Fotoradari</string>
     <string name="place_description_title">Vietas apraksts</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -662,7 +632,6 @@
     <string name="power_managment_setting_auto">Kad ir zems uzlādes līmenis</string>
     <string name="power_managment_setting_manual_max">Vienmēr</string>
     <string name="enable_logging_warning_message">Uz laiku ieslēdziet šo opciju, lai reģistrētu un manuāli nosūtītu sīkākus žurnālus problēmu diagnostikai, izmantojot „Ziņot par kļūdu“ funkciju palīdzības lodziņā. Žurnāli var saturēt informāciju par atrašanās vietu.</string>
-    <string name="access_rules_author_only">Tiešsaistes rediģēšana</string>
     <string name="driving_options_title">Maršruta opcijas</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Izvairīties no maksas ceļiem</string>
@@ -827,7 +796,6 @@
     <string name="openstreetmap">OpenStreetMap</string>
     <string name="change_map_locale">Kartes valoda</string>
     <string name="wikimedia_commons">Vikikrātuve</string>
-    <string name="core_placepage_unknown_place">Punkts kartē</string>
     <string name="nav_auto">Automātisks navigācijas laikā</string>
     <string name="start_track_recording">Ierakstīt ceļu</string>
     <string name="stop_track_recording">Apstādināt ierakstīšanu</string>
@@ -843,10 +811,8 @@
     <string name="uri_open_location_failed">Nav uzstādīta neviena lietotne, kas varētu atvērt atrašanās vietu</string>
     <string name="aa_request_permission_notification">Šai lietotnei ir nepieciešama jūsu atļauja</string>
     <string name="editor_about_osm">Jūsu labojumi tiek augšupielādēti sabiedriskajā <a href="https://wiki.openstreetmap.org/wiki/About_OpenStreetMap">OpenStreetMap</a> datubāzē. Lūdzu, nepievienojiet personisku vai ar autortiesībām aizsargātu informāciju.</string>
-    <string name="gb">GB</string>
     <string name="aa_location_permissions_request">CoMaps lietotnes darbībai ir nepieciešama piekļuve jūsu atrašanās vietai. Kad tas ir droši, pārbaudiet paziņojumu savā tālrunī.</string>
     <string name="editor_note_hint">Aprakstiet kļūdas kartē vai lietas, ko nevar rediģēt, izmantojot CoMaps</string>
-    <string name="mb">MB</string>
     <string name="aa_request_permission_activity_text">CoMaps lietotnei ir nepieciešama atrašanās vietas atļauja sekmīgai Android Auto darbībai</string>
     <string name="telegram_url">https://t.me/CoMapsApp/</string>
     <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
diff --git a/android/app/src/main/res/values-mr/strings.xml b/android/app/src/main/res/values-mr/strings.xml
index 83333f296..39e3a60e6 100644
--- a/android/app/src/main/res/values-mr/strings.xml
+++ b/android/app/src/main/res/values-mr/strings.xml
@@ -16,8 +16,6 @@
     <string name="kilometres">किलोमीटर</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">मैल</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">माझे स्थान</string>
     <!-- Update maps later button text -->
     <string name="later">नंतर</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -69,8 +67,6 @@
     <string name="bookmarks">खूणपत्रे</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">खूणपत्रे आणि ट्रॅक</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">माझी ठिकाणे</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">नाव</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -130,8 +126,6 @@
     <string name="category_post">टपाल</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">पोलीस</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">वायफाय इंटरनेट</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">भंगारवाला</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -426,7 +420,6 @@
     <string name="empty_street_name_error">कृपया रस्त्याचे नाव जोडा</string>
     <string name="choose_language">भाषा निवडा</string>
     <string name="choose_street">रस्ता निवडा</string>
-    <string name="postal_code">पिनकोड</string>
     <string name="cuisine">पाककृती</string>
     <string name="select_cuisine">पाककृती निवडा</string>
     <!-- login text field -->
@@ -467,8 +460,6 @@
     <string name="error_enter_correct_storey_number">मजल्यांची संख्या %d पेक्षा जास्त नसावी</string>
     <string name="editor_zip_code">पिनकोड</string>
     <string name="error_enter_correct_zip_code">वैध पिनकोड प्रविष्ट करा</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">नकाशा बिंदू</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">OpenStreetMap स्वयंसेवकांसाठी टीप (पर्यायी)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -486,16 +477,8 @@
     <string name="downloader_no_downloaded_maps_title">तुम्ही कोणतेही नकाशे डाउनलोड केलेले नाहीत</string>
     <string name="downloader_no_downloaded_maps_message">स्थान शोधण्यासाठी नकाशे डाउनलोड करा आणि ऑफलाइन मार्गनिर्देशन वापरा.</string>
     <string name="current_location_unknown_error_title">वर्तमान स्थान अज्ञात आहे.</string>
-    <!-- abbreviation for meters -->
-    <string name="m">m</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">किमी</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/h</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">mi</string>
-    <!-- A unit of measure -->
-    <string name="ft">फूट</string>
     <string name="miles_per_hour">mph</string>
     <string name="hour">तास</string>
     <string name="minute">मिनिट</string>
@@ -552,8 +535,6 @@
     <string name="prefs_languages_information_off_link">अधिक माहितीसाठी कृपया ही मार्गदर्शिका पहा.</string>
     <string name="transliteration_title">रोमन लिपीत लिप्यंतरण</string>
     <string name="learn_more">अधिक जाणून घ्या</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">बाहेर पडा</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">मार्ग प्रारंभ बिंदू जोडण्यासाठी नकाशावर शोध वापरा किंवा टॅप करा</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -565,7 +546,6 @@
     <string name="dialog_error_storage_title">स्टोरेज प्रवेश समस्या</string>
     <string name="dialog_error_storage_message">बाह्य साठ्याचा प्रवेश अपयशी. SD कार्ड कदाचित काढले गेले असेल, खराब झाले असेल किंवा फाइल सिस्टम ही केवळ-वाचनीय असावी. कृपया, तुमचे SD कार्ड तपासा किंवा support@comaps.app वर आमच्याशी संपर्क साधा</string>
     <string name="setting_emulate_bad_storage">खराब साठ्याचे अनुकरण करा</string>
-    <string name="core_entrance">प्रवेशद्वार</string>
     <string name="error_enter_correct_name">कृपया योग्य नाव प्रविष्ट करा</string>
     <string name="bookmark_lists">याद्या</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -605,16 +585,12 @@
     <string name="button_layer_traffic">ट्रॅफिक</string>
     <string name="subway">मेट्रो/भुयारी मार्ग</string>
     <string name="layers_title">नकाशा शैली आणि स्तर</string>
-    <string name="subway_data_unavailable">मेट्रो नकाशा अनुपलब्ध आहे</string>
     <string name="bookmarks_empty_list_title">ही यादी रिकामी आहे</string>
     <string name="bookmarks_empty_list_message">खूणपत्र जोडण्यासाठी, नकाशातील ठिकाणाला स्पर्श करा आणि नंतर तारा चिन्हाला स्पर्श करा</string>
     <string name="category_desc_more">…अधिक</string>
     <string name="export_file">KMZ निर्यात करा</string>
     <string name="export_file_gpx">GPX निर्यात करा</string>
     <string name="delete_list">यादी मिटवा</string>
-    <string name="public_access">सार्वजनिक प्रवेश</string>
-    <string name="limited_access">मर्यादित प्रवेश</string>
-    <string name="not_shared">खाजगी</string>
     <string name="speedcams_alert_title">वेग कॅमेरे</string>
     <string name="place_description_title">ठिकाणाचे वर्णन</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -631,7 +607,6 @@
     <string name="power_managment_setting_auto">स्वयंचलित</string>
     <string name="power_managment_setting_manual_max">कमाल वीज बचत</string>
     <string name="enable_logging_warning_message">निदान करण्याकरिता हा पर्याय लॉगिंग चालू करतो. ह्याने ऍपच्या समस्यांचे निवारण करणे आम्हाला उपयुक्त ठरू शकते. तुमच्या समस्येबद्दल तपशीलवार नोंदी रेकॉर्ड करण्यासाठी आणि आम्हाला पाठवण्यासाठी हा पर्याय तात्पुरता चालू करा.</string>
-    <string name="access_rules_author_only">ऑनलाइन संपादन</string>
     <string name="driving_options_title">मार्गशोधी पर्याय</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">टोल रस्ते टाळा</string>
diff --git a/android/app/src/main/res/values-mt/strings.xml b/android/app/src/main/res/values-mt/strings.xml
index 71e2c80a4..ef9c45127 100644
--- a/android/app/src/main/res/values-mt/strings.xml
+++ b/android/app/src/main/res/values-mt/strings.xml
@@ -16,8 +16,6 @@
     <string name="kilometres">Kilometri</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Mili</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">Il-Pożizzjoni Kurrenti</string>
     <!-- Update maps later button text -->
     <string name="later">Aktar tard</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -67,8 +65,6 @@
     <string name="bookmark_set_name">Isem tal-lista tal-Bookmark</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Werrejja u Korsiji</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">Il-Postijiet Tiegħi</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Isem</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -81,14 +77,6 @@
     <string name="maps_storage_summary">Għażel il-post fejn tixtieq tniżżel il-mapep.</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Mapep imniżżla</string>
-    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">Ħażna internali privata</string>
-    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">Ħażna internali maqsuma</string>
-    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
-    <string name="maps_storage_removable">Karta SD</string>
-    <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">Ħażna esterna maqsuma</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
     <string name="maps_storage_free_size">%1$s b\' xejn min %2$s</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -136,8 +124,6 @@
     <string name="category_post">Uffiċċju postali</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Puliżija</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">WiFi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Riċiklaġġ</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -341,7 +327,6 @@
     <string name="error_enter_correct_storey_number">In-numru ta’ sulari m’ għandux jaqbeż il-%d</string>
     <string name="editor_zip_code">Kodiċi ZIP</string>
     <string name="error_enter_correct_zip_code">Daħħal kodiċi ZIP validu</string>
-    <string name="core_placepage_unknown_place">Il-Punt tal-Mappa</string>
     <string name="editor_other_info">Nota lill-voluntiera ta’ OpenStreetMap (fakultattiva)</string>
     <string name="editor_more_about_osm">Aktar dwar OpenStreetMap</string>
     <string name="editor_osm_history">Il-kronoloġija tal-editjar tiegħek</string>
@@ -377,14 +362,12 @@
     <string name="traffic_update_app">Aġġorna CoMaps</string>
     <string name="enable_logging">Attiva l-illoggjar</string>
     <string name="prefs_languages_information_off_link">Għal aktar informazzjoni jekk jogħġbok iċċekkja din il-gwida.</string>
-    <string name="core_exit">Oħroġ</string>
     <string name="routing_add_finish_point">Uża t-tiftixa jew għafas fuq il-mappa biex iżżid punt tad-destinazzjoni</string>
     <string name="planning_route_manage_route">Immaniġġja r-Rotta</string>
     <string name="button_plan">Pjan</string>
     <string name="placepage_add_stop">Żid Waqfa</string>
     <string name="dialog_error_storage_title">Problema tal-aċċess għall-ħażna</string>
     <string name="dialog_error_storage_message">Il-ħżin estern mhuwiex aċċessibbli. Il-kard tal-SD setgħet tneħħiet, saritilha l-ħsara, jew is-sistema tal-fajl tinqara biss. Jekk jogħġbok, iċċekkja l-karta tal-SD tiegħek jew ikkuntattjana fuq support@comaps.app</string>
-    <string name="core_entrance">Daħla</string>
     <string name="error_enter_correct_name">Daħħal isem korrett</string>
     <string name="bookmark_lists">Listi</string>
     <string name="bookmark_lists_hide_all">Aħbi kollox</string>
@@ -406,7 +389,6 @@
         <item quantity="other">%d Trekks</item>
     </plurals>
     <string name="button_layer_traffic">Traffiku</string>
-    <string name="subway_data_unavailable">Il-mappa tas-subway mhix disponibbli</string>
     <string name="bookmarks_empty_list_title">Din il-lista hija vojta</string>
     <string name="bookmarks_empty_list_message">Biex iżżid bookmark, għafas post fuq il-mappa u mbagħad għafas is-simbolu tal-istilla</string>
     <string name="export_file_gpx">Esporta GPX</string>
@@ -495,7 +477,6 @@
     <string name="today">Illum</string>
     <string name="social_media">Midja Soċjali</string>
     <string name="downloader_update_maps">Aġġorna l-Mapep</string>
-    <string name="postal_code">Kodiċi Postali</string>
     <string name="error_enter_correct_facebook_page">Daħħal indirizz tal-web, kont, jew isem tal-paġna validu ta ’Facebook</string>
     <string name="no_available">Le</string>
     <string name="downloader_search_field_hint">Sib mappa</string>
@@ -575,15 +556,11 @@
     <string name="traffic_data_unavailable">L-Informazzjoni dwar it-traffiku mhijiex disponibbli</string>
     <string name="routing_add_start_point">Uża t-tiftix jew għafas fuq il-mappa biex iżżid punt tal-bidu tar-rotta</string>
     <string name="elevation_profile_difficulty">Diffikulta’</string>
-    <string name="limited_access">Aċċess limitat</string>
     <string name="setting_emulate_bad_storage">Imita ħażna ħażina</string>
-    <string name="not_shared">Privat</string>
     <string name="bookmark_lists_show_all">Uri kollox</string>
-    <string name="access_rules_author_only">Editjar onlajn</string>
     <string name="bookmarks_error_message_share_general">Ma jistax jixxerja minħabba żball fl-applikazzjoni</string>
     <string name="bookmarks_error_title_share_empty">Żball fl-ixxerjar</string>
     <string name="bookmarks_error_message_list_name_already_taken">Agħżel isem ieħor</string>
-    <string name="public_access">Aċċess pubbliku</string>
     <plurals name="bookmarks_detect_message">
         <item quantity="one">Instab fajl %d. Tista’ tarah wara l-konverżjoni.</item>
         <item quantity="two">Instabu %d fajls. Tista ’tarahom wara l-konverżjoni.</item>
diff --git a/android/app/src/main/res/values-nb/strings.xml b/android/app/src/main/res/values-nb/strings.xml
index 6f96cb2bc..5d5de11c6 100644
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
@@ -14,12 +14,8 @@
     <string name="downloading">Laster ned …</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
     <string name="kilometres">Kilometer</string>
-    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
-    <string name="mb">MB</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Miles</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">Min posisjon</string>
     <!-- Update maps later button text -->
     <string name="later">Senere</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -77,8 +73,6 @@
     <string name="bookmarks">Bokmerker</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Bokmerker og ruter</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">Mine steder</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Navn</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -93,14 +87,6 @@
     <string name="maps_storage_summary">Velg mappen hvor kartene skal lastes ned.</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Kart</string>
-    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">Intern privat lagring</string>
-    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">Intern delt lagring</string>
-    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
-    <string name="maps_storage_removable">SD-kort</string>
-    <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">Ekstern delt lagring</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
     <string name="maps_storage_free_size">%1$s ledig av %2$s</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -152,8 +138,6 @@
     <string name="category_post">Post</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Politi</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">WiFi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Resirkulering</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -459,7 +443,6 @@
     <string name="empty_street_name_error">Legg til en gateadresse</string>
     <string name="choose_language">Velg et språk</string>
     <string name="choose_street">Velg en gate</string>
-    <string name="postal_code">Postnummer</string>
     <string name="cuisine">Matrett</string>
     <string name="select_cuisine">Velg matrett</string>
     <!-- login text field -->
@@ -500,8 +483,6 @@
     <string name="error_enter_correct_storey_number">Rediger bygningen med maks. %d etasjer</string>
     <string name="editor_zip_code">Postnummer</string>
     <string name="error_enter_correct_zip_code">Angi riktig postnummer</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">Kartpunkt</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Merknad til OpenStreetMap-frivillige (valgfritt)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -519,16 +500,8 @@
     <string name="downloader_no_downloaded_maps_title">Du har ikke lastet ned noen kart</string>
     <string name="downloader_no_downloaded_maps_message">Last ned kart for å finne plasseringen og navigere frakoblet.</string>
     <string name="current_location_unknown_error_title">Gjeldende plassering er ukjent.</string>
-    <!-- abbreviation for meters -->
-    <string name="m">m</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">km</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/t</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">mi</string>
-    <!-- A unit of measure -->
-    <string name="ft">fot</string>
     <string name="miles_per_hour">mph</string>
     <string name="hour">t</string>
     <string name="minute">min</string>
@@ -588,8 +561,6 @@
     <string name="prefs_languages_information_off_link">Les denne veiledningen for mer informasjon.</string>
     <string name="transliteration_title">Omskrivning til latin</string>
     <string name="learn_more">Finn ut mer</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Avslutt</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Bruk søk eller trykk på kartet for å legge til et startpunkt for ruten</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -601,7 +572,6 @@
     <string name="dialog_error_storage_title">Problemer med tilgang til lagring</string>
     <string name="dialog_error_storage_message">Ekstern lagring er ikke tilgjengelig. Sannsynligvis er SD-kortet fjernet eller skadet eller så er filsystemet skrivebeskyttet. Undersøk og kontakt oss på support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emulere skadet lagring</string>
-    <string name="core_entrance">Inngang</string>
     <string name="error_enter_correct_name">Skriv inn korrekt navn</string>
     <string name="bookmark_lists">Lister</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -641,16 +611,12 @@
     <string name="button_layer_traffic">Trafikk</string>
     <string name="subway">T-bane</string>
     <string name="layers_title">Kartstiler og -lag</string>
-    <string name="subway_data_unavailable">T-banekart er utilgjengelig</string>
     <string name="bookmarks_empty_list_title">Denne listen er tom</string>
     <string name="bookmarks_empty_list_message">For å legge til et bokmerke, trykk et sted på kartet og trykk så stjerneikonet</string>
     <string name="category_desc_more">…mer</string>
     <string name="export_file">Eksporter KMZ</string>
     <string name="export_file_gpx">Eksporter GPX</string>
     <string name="delete_list">Slett liste</string>
-    <string name="public_access">Offentlig tilgang</string>
-    <string name="limited_access">Begrenset adgang</string>
-    <string name="not_shared">Privat</string>
     <string name="speedcams_alert_title">Fartskamera</string>
     <string name="place_description_title">Plasser beskrivelse</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -667,7 +633,6 @@
     <string name="power_managment_setting_auto">Automatisk</string>
     <string name="power_managment_setting_manual_max">Maksimum strømsparing</string>
     <string name="enable_logging_warning_message">Alternativet slår på logging for diagnostiske formål. Det kan være nyttig for våre supportpersonale som feilsøker problemer med appen. Aktiver dette alternativet bare på forespørsel fra CoMaps-brukerstøtte.</string>
-    <string name="access_rules_author_only">Redigering på nett</string>
     <string name="driving_options_title">Kjørealternativer</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Unngå bompenger</string>
@@ -856,7 +821,6 @@
     <string name="uri_open_location_failed">Ingen app installert som kan åpne stedet</string>
     <!-- preference string for using auto theme only in navigation mode -->
     <string name="nav_auto">Auto i navigasjon</string>
-    <string name="gb">GB</string>
     <string name="error_enter_correct_level">Angi et gyldig etasjenummer</string>
     <string name="editor_level">Etasje (0 er nederste etasje)</string>
     <string name="pref_left_button_disable">Deaktiver</string>
diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml
index f62876483..c35efd3c3 100644
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -16,8 +16,6 @@
     <string name="kilometres">Kilometers</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Mijlen</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">Mijn locatie</string>
     <!-- Update maps later button text -->
     <string name="later">Later</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -74,9 +72,7 @@
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
     <string name="bookmarks">Bladwijzers</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Bladwijzers en sporen</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">Mijn plaatsen</string>
+    <string name="bookmarks_and_tracks">Bladwijzers en tracks</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Naam</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -91,14 +87,6 @@
     <string name="maps_storage_summary">Selecteer de map om kaarten naar te downloaden</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Gedownloade kaarten</string>
-    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">Interne persoonlijke opslag</string>
-    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">Interne gedeelde opslag</string>
-    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
-    <string name="maps_storage_removable">SD-kaart</string>
-    <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">Externe gedeelde opslag</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
     <string name="maps_storage_free_size">%1$s van %2$s beschikbaar</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -150,8 +138,6 @@
     <string name="category_post">Post</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Politie</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">WiFi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Recycling</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -455,7 +441,6 @@
     <string name="empty_street_name_error">Voer een straatnaam in</string>
     <string name="choose_language">Kies een taal</string>
     <string name="choose_street">Kies een straat</string>
-    <string name="postal_code">Postcode</string>
     <string name="cuisine">Keuken</string>
     <string name="select_cuisine">Selecteer keuken</string>
     <!-- login text field -->
@@ -496,8 +481,6 @@
     <string name="error_enter_correct_storey_number">Het gebouw mag niet meer dan %d verdiepingen hebben</string>
     <string name="editor_zip_code">Postcode</string>
     <string name="error_enter_correct_zip_code">Voer een geldige postcode in</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">Kaartpunt</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Opmerking voor OpenStreetMap vrijwilligers (optioneel)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -515,16 +498,8 @@
     <string name="downloader_no_downloaded_maps_title">U hebt geen kaarten gedownload</string>
     <string name="downloader_no_downloaded_maps_message">Download kaarten om een locatie te zoeken en offline te navigeren</string>
     <string name="current_location_unknown_error_title">Huidige locatie is onbekend</string>
-    <!-- abbreviation for meters -->
-    <string name="m">m</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">km</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/h</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">mi</string>
-    <!-- A unit of measure -->
-    <string name="ft">ft</string>
     <string name="miles_per_hour">mph</string>
     <string name="hour">u</string>
     <string name="minute">min</string>
@@ -584,8 +559,6 @@
     <string name="prefs_languages_information_off_link">Gelieve deze handleiding te lezen voor meer informatie</string>
     <string name="transliteration_title">Transliteratie in het Latijnse alfabet</string>
     <string name="learn_more">Meer informatie</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Uitgang</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Gebruik zoeken of tik op de kaart om een startpunt voor de route toe te voegen</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -597,7 +570,6 @@
     <string name="dialog_error_storage_title">Probleem met opslagtoegang</string>
     <string name="dialog_error_storage_message">Externe opslag is niet beschikbaar, wellicht is de SD-kaart verwijderd, beschadigd of is het bestandssysteem alleen-lezen. Gelieve dit te controleren en ons te contacteren via support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Slechte opslag emuleren</string>
-    <string name="core_entrance">Ingang</string>
     <string name="error_enter_correct_name">Voer een geldige naam in</string>
     <string name="bookmark_lists">Lijsten</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -637,16 +609,12 @@
     <string name="button_layer_traffic">Verkeer</string>
     <string name="subway">Metro</string>
     <string name="layers_title">Kaartstijlen en -lagen</string>
-    <string name="subway_data_unavailable">Metrokaart is niet beschikbaar</string>
     <string name="bookmarks_empty_list_title">Deze lijst is leeg</string>
     <string name="bookmarks_empty_list_message">Om een bladwijzer toe te voegen, tikt u op een plaats op de kaart en vervolgens op het sterpictogram</string>
     <string name="category_desc_more">…meer</string>
     <string name="export_file">Exporteer KMZ</string>
     <string name="export_file_gpx">Exporteer GPX</string>
     <string name="delete_list">Verwijder lijst</string>
-    <string name="public_access">Publieke toegang</string>
-    <string name="limited_access">Beperkte toegang</string>
-    <string name="not_shared">Privé</string>
     <string name="speedcams_alert_title">Snelheidscamera\'s</string>
     <string name="place_description_title">Plaatsbeschrijving</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -663,7 +631,6 @@
     <string name="power_managment_setting_auto">Wanneer batterij bijna leeg is</string>
     <string name="power_managment_setting_manual_max">Maximale energiebesparing</string>
     <string name="enable_logging_warning_message">Deze optie is ingeschakeld voor logboekregistraties voor diagnostische doeleinden. Het helpt bij het identificeren van problemen met de applicatie. Schakel de optie alleen in op verzoek van CoMaps-ondersteuning.</string>
-    <string name="access_rules_author_only">Wordt online bewerkt</string>
     <string name="driving_options_title">Route-instellingen</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Vermijd tolwegen</string>
@@ -858,7 +825,6 @@
     <string name="nav_auto">Auto in navigatie</string>
     <string name="menu">Menu</string>
     <string name="github">GitHub</string>
-    <string name="gb">GB</string>
     <string name="telegram">Telegram</string>
     <string name="matrix">[Matrix]</string>
     <string name="mastodon">Mastodon</string>
@@ -874,7 +840,6 @@
     <string name="level_value_generic">Niveau: %s</string>
     <string name="openstreetmap">OpenStreetMap</string>
     <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
-    <string name="mb">MB</string>
     <string name="tts_info_link">https://www.comaps.app/support/tts-configuration-guide-for-android/</string>
     <string name="app_site_url">https://comaps.app/nl/</string>
     <string name="bluesky">Bluesky</string>
diff --git a/android/app/src/main/res/values-pl/strings.xml b/android/app/src/main/res/values-pl/strings.xml
index 2cf0ad3b0..1d990e3b2 100644
--- a/android/app/src/main/res/values-pl/strings.xml
+++ b/android/app/src/main/res/values-pl/strings.xml
@@ -16,8 +16,6 @@
     <string name="kilometres">Kilometry</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Mile</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">Moje położenie</string>
     <!-- Update maps later button text -->
     <string name="later">Później</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -75,8 +73,6 @@
     <string name="bookmarks">Zakładki</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Zakładki i trasy</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">Moje miejsca</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Nazwa</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -91,14 +87,6 @@
     <string name="maps_storage_summary">Wybierz folder, do którego pobrać mapy.</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Mapy</string>
-    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">Wewnętrzna pamięć prywatna</string>
-    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">Wewnętrzna pamięć współdzielona</string>
-    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
-    <string name="maps_storage_removable">Karta SD</string>
-    <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">Zewnętrzna pamięć współdzielona</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
     <string name="maps_storage_free_size">%1$s wolne z %2$s</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -150,8 +138,6 @@
     <string name="category_post">Poczta</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Policja</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">WiFi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Recykling</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -459,7 +445,6 @@
     <string name="empty_street_name_error">Proszę wpisz nazwę ulicy</string>
     <string name="choose_language">Wybierz język</string>
     <string name="choose_street">Wybierz ulicę</string>
-    <string name="postal_code">Kod pocztowy</string>
     <string name="cuisine">Kuchnia</string>
     <string name="select_cuisine">Wybierz kuchnię</string>
     <!-- login text field -->
@@ -500,8 +485,6 @@
     <string name="error_enter_correct_storey_number">Liczba kondygnacji nie może przekraczać %d</string>
     <string name="editor_zip_code">Kod pocztowy</string>
     <string name="error_enter_correct_zip_code">Podaj prawidłowy kod pocztowy</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">Punkt mapy</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Uwaga dla wolontariuszy OpenStreetMap (opcjonalnie)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -519,16 +502,8 @@
     <string name="downloader_no_downloaded_maps_title">Nie pobrano żadnych map</string>
     <string name="downloader_no_downloaded_maps_message">Aby znajdować miejsca i nawigować bez połączenia z internetem, musisz pobrać mapy.</string>
     <string name="current_location_unknown_error_title">Aktualna lokalizacja jest nieznana.</string>
-    <!-- abbreviation for meters -->
-    <string name="m">m</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">km</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/h</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">mi</string>
-    <!-- A unit of measure -->
-    <string name="ft">ft</string>
     <string name="miles_per_hour">mph</string>
     <string name="hour">godz</string>
     <string name="minute">min</string>
@@ -587,8 +562,6 @@
     <string name="prefs_languages_information_off_link">Aby uzyskać więcej informacji, spójrz na ten poradnik.</string>
     <string name="transliteration_title">Transkrypcja na alfabet łaciński</string>
     <string name="learn_more">Dowiedz się więcej</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Wyjście</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Użyj funkcji wyszukiwania lub dotknij mapy, aby dodać punkt początkowy trasy</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -600,7 +573,6 @@
     <string name="dialog_error_storage_title">Problem z dostępem do pamięci masowej</string>
     <string name="dialog_error_storage_message">Zewnętrzny nośnik pamięci masowej jest niedostępny. Prawdopodobnie usunięto lub uszkodzono kartę SD bądź jej system plików służy tylko do odczytu. Zweryfikuj to i skontaktuj się z nami pod adresem support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emuluj wadliwą pamięć masową</string>
-    <string name="core_entrance">Wejście</string>
     <string name="error_enter_correct_name">Wprowadź poprawną nazwę</string>
     <string name="bookmark_lists">Listy</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -646,16 +618,12 @@
     <string name="button_layer_traffic">Ruch drogowy</string>
     <string name="subway">Metro</string>
     <string name="layers_title">Style i warstwy mapy</string>
-    <string name="subway_data_unavailable">Mapa metra jest niedostępna</string>
     <string name="bookmarks_empty_list_title">Lista jest pusta</string>
     <string name="bookmarks_empty_list_message">Aby dodać zakładkę, stuknij miejsce na mapie, a następnie ikonę gwiazdki</string>
     <string name="category_desc_more">…więcej</string>
     <string name="export_file">Eksportuj KMZ</string>
     <string name="export_file_gpx">Eksport GPX</string>
     <string name="delete_list">Usuń listę</string>
-    <string name="public_access">Dostęp publiczny</string>
-    <string name="limited_access">Dostęp prywatny</string>
-    <string name="not_shared">Osobisty</string>
     <string name="speedcams_alert_title">Fotoradary</string>
     <string name="place_description_title">Opis miejsca</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -672,7 +640,6 @@
     <string name="power_managment_setting_auto">Automatycznie</string>
     <string name="power_managment_setting_manual_max">Maksymalna oszczędność energii</string>
     <string name="enable_logging_warning_message">Ta opcja zostaje włączona do zbierania danych działań w celach diagnostycznych. Pomaga to zespołowi zidentyfikować problemy z aplikacją. Włączaj opcję tylko na żądanie wsparcia technicznego CoMaps.</string>
-    <string name="access_rules_author_only">Edytowane online</string>
     <string name="driving_options_title">Ustawienia nawigacji</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Unikaj płatnych dróg</string>
@@ -868,7 +835,6 @@
     <string name="level_value_generic">Piętro: %s</string>
     <string name="github">GitHub</string>
     <string name="editor_line_social_network">LINE</string>
-    <string name="mb">MB</string>
     <string name="mastodon">Mastodon</string>
     <string name="facebook">Facebook</string>
     <string name="instagram">Instagram</string>
@@ -876,7 +842,6 @@
     <string name="openstreetmap">OpenStreetMap</string>
     <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
     <string name="comma_separated_pair">%1$s, %2$s</string>
-    <string name="gb">GB</string>
     <string name="wikimedia_commons">Wikimedia Commons</string>
     <string name="telegram_url">https://t.me/CoMapsApp/</string>
     <string name="matrix">[Matrix]</string>
diff --git a/android/app/src/main/res/values-pt-rBR/strings.xml b/android/app/src/main/res/values-pt-rBR/strings.xml
index 8e4451225..48618d48b 100644
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -16,8 +16,6 @@
     <string name="kilometres">Quilômetros</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Milhas</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">Minha posição</string>
     <!-- Update maps later button text -->
     <string name="later">Mais tarde</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -69,8 +67,6 @@
     <string name="bookmarks">Favoritos</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Favoritos e trilhas</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">Meus locais</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Nome</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -85,14 +81,6 @@
     <string name="maps_storage_summary">Selecione o local para onde os mapas devem ser baixados</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Mapas</string>
-    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">Armazenamento interno privado</string>
-    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">Armazenamento interno compartilhado</string>
-    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
-    <string name="maps_storage_removable">Cartão SD</string>
-    <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">Armazenamento externo compartilhado</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
     <string name="maps_storage_free_size">%1$s livre de %2$s</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -144,8 +132,6 @@
     <string name="category_post">Correios</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Polícia</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">WiFi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Reciclagem</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -414,7 +400,6 @@
     <string name="empty_street_name_error">Por favor, digite o nome da rua</string>
     <string name="choose_language">Escolher um idioma</string>
     <string name="choose_street">Escolher uma rua</string>
-    <string name="postal_code">CEP</string>
     <string name="cuisine">Culinária</string>
     <string name="select_cuisine">Selecione a culinária</string>
     <!-- login text field -->
@@ -450,8 +435,6 @@
     <string name="error_enter_correct_storey_number">O número de andares não pode ser maior que %d</string>
     <string name="editor_zip_code">CEP</string>
     <string name="error_enter_correct_zip_code">Insira um CEP válido</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">Ponto do mapa</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">As suas edições são enviadas à base de dados pública <a href="https://wiki.openstreetmap.org/wiki/Pt:Sobre_o_OpenStreetMap">OpenStreetMap</a>. Não adicione informações pessoais ou protegidas por direitos autorais.</string>
     <string name="editor_more_about_osm">Mais sobre OpenStreetMap</string>
@@ -462,16 +445,8 @@
     <string name="downloader_no_downloaded_maps_title">Você não fez o download de nenhum mapa</string>
     <string name="downloader_no_downloaded_maps_message">Baixe mapas para pesquisar e navegar offline</string>
     <string name="current_location_unknown_error_title">A localização atual é desconhecida</string>
-    <!-- abbreviation for meters -->
-    <string name="m">m</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">km</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/h</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">mi</string>
-    <!-- A unit of measure -->
-    <string name="ft">ft</string>
     <string name="miles_per_hour">mph</string>
     <string name="hour">h</string>
     <string name="minute">min</string>
@@ -524,8 +499,6 @@
     <string name="prefs_languages_information_off_link">Para obter mais informações, consulte este guia</string>
     <string name="transliteration_title">Transliterar para alfabeto latino</string>
     <string name="learn_more">Saber mais</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Saída</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Use a busca ou toque no mapa para adicionar um ponto de partida da rota</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -537,7 +510,6 @@
     <string name="dialog_error_storage_title">Problema de acesso ao armazenamento</string>
     <string name="dialog_error_storage_message">O armazenamento externo não está disponível, é provável que o cartão SD tenha sido removido, danificado ou o sistema de arquivo seja apenas para leitura. Verifique e entre em contato conosco em support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emular memória ruim</string>
-    <string name="core_entrance">Entrada</string>
     <string name="error_enter_correct_name">Por favor, digite um nome correto</string>
     <string name="bookmark_lists">Listas</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -577,14 +549,10 @@
     <string name="terms_of_use">Termos de uso</string>
     <string name="button_layer_traffic">Tráfego</string>
     <string name="subway">Metrô</string>
-    <string name="subway_data_unavailable">Mapa de metrô está indisponível</string>
     <string name="bookmarks_empty_list_title">Esta lista está vazia</string>
     <string name="bookmarks_empty_list_message">Para adicionar um favorito, toque no mapa e então toque no ícone de estrela</string>
     <string name="category_desc_more">…mais</string>
     <string name="delete_list">Deletar lista</string>
-    <string name="public_access">Acesso público</string>
-    <string name="limited_access">Acesso limitado</string>
-    <string name="not_shared">Privado</string>
     <string name="speedcams_alert_title">Câmeras de trânsito</string>
     <string name="place_description_title">Descrição do lugar</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -599,7 +567,6 @@
     <string name="power_managment_setting_auto">Automático</string>
     <string name="power_managment_setting_manual_max">Máxima economia de energia</string>
     <string name="enable_logging_warning_message">Ative esta opção temporariamente para criar registros de execução e manualmente nos enviar registros diagnósticos detalhados sobre seu problema usando \"Relatar um problema\" no diálogo de Ajuda. Registros de execução podem conter dados de localização.</string>
-    <string name="access_rules_author_only">Edição online</string>
     <string name="driving_options_title">Opções de trajeto</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Evitar pedágios</string>
@@ -778,8 +745,6 @@
     <string name="about_proposition_3">• Não precisa de conexão à internet, rápido e leve</string>
     <string name="drive_through">Drive-through</string>
     <string name="editor_operator">Operador</string>
-    <string name="mb">MB</string>
-    <string name="gb">GB</string>
     <string name="editor_line_social_network">LINE</string>
     <string name="pref_map_style_title">Modo noturno</string>
     <string name="off">Desativado</string>
diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index 93835e3ae..22f02faae 100644
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -16,8 +16,6 @@
     <string name="kilometres">Quilómetros</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Milhas</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">A minha posição</string>
     <!-- Update maps later button text -->
     <string name="later">Mais tarde</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -75,8 +73,6 @@
     <string name="bookmarks">Favoritos</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Favoritos e trajetos</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">Os meus locais</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Nome</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -138,8 +134,6 @@
     <string name="category_post">Correios</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Polícia</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">WiFi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Reciclagem</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -441,7 +435,6 @@
     <string name="add_street">Adicionar uma rua</string>
     <string name="choose_language">Escolher um idioma</string>
     <string name="choose_street">Escolher uma rua</string>
-    <string name="postal_code">Código postal</string>
     <string name="cuisine">Culinária</string>
     <string name="select_cuisine">Selecione a culinária</string>
     <!-- login text field -->
@@ -481,8 +474,6 @@
     <string name="error_enter_correct_storey_number">O número de pisos não pode ser maior que %d</string>
     <string name="editor_zip_code">Código Postal</string>
     <string name="error_enter_correct_zip_code">Introduza um código postal correto</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">Ponto do mapa</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Nota para os voluntários do OpenStreetMap (opcional)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -500,16 +491,8 @@
     <string name="downloader_no_downloaded_maps_title">Não descarregou quaisquer mapas</string>
     <string name="downloader_no_downloaded_maps_message">Descarregar mapas para encontrar a localização e navegar offline</string>
     <string name="current_location_unknown_error_title">A localização atual é desconhecida</string>
-    <!-- abbreviation for meters -->
-    <string name="m">m</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">Km</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/h</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">mi</string>
-    <!-- A unit of measure -->
-    <string name="ft">ft</string>
     <string name="miles_per_hour">mph</string>
     <string name="hour">h</string>
     <string name="minute">min</string>
@@ -562,8 +545,6 @@
     <string name="prefs_languages_information_off_link">Para obter mais informações, consulte este guia</string>
     <string name="transliteration_title">Transliteração para o latim</string>
     <string name="learn_more">Saber mais</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Saída</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Use a busca ou toque no mapa para adicionar um ponto de partida do percurso</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -575,7 +556,6 @@
     <string name="dialog_error_storage_title">Problema de acesso ao armazenamento</string>
     <string name="dialog_error_storage_message">O armazenamento externo não está disponível. Provavelmente porque o cartão SD foi removido, danificado ou o sistema de ficheiros é apenas para leitura. Verifique e contacte-nos através do email support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emular o armazenamento defeituoso</string>
-    <string name="core_entrance">Entrada</string>
     <string name="error_enter_correct_name">Introduza um nome correto</string>
     <string name="bookmark_lists">Listas</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -618,16 +598,12 @@
     <string name="button_layer_traffic">Tráfego</string>
     <string name="subway">Metropolitano</string>
     <string name="layers_title">Estilos e camadas de mapas</string>
-    <string name="subway_data_unavailable">O mapa de metropolitano não está disponível</string>
     <string name="bookmarks_empty_list_title">Esta lista está vazia</string>
     <string name="bookmarks_empty_list_message">Para adicionar um favorito, toque num lugar do mapa e em seguida toque no ícone da estrela</string>
     <string name="category_desc_more">…mais</string>
     <string name="export_file">Exportar KMZ</string>
     <string name="export_file_gpx">Exportar GPX</string>
     <string name="delete_list">Eliminar lista</string>
-    <string name="public_access">Acesso público</string>
-    <string name="limited_access">Acesso limitado</string>
-    <string name="not_shared">Privado</string>
     <string name="speedcams_alert_title">Radares de velocidade</string>
     <string name="place_description_title">Descrição do local</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -644,7 +620,6 @@
     <string name="power_managment_setting_auto">Automático</string>
     <string name="power_managment_setting_manual_max">Máxima economia de energia</string>
     <string name="enable_logging_warning_message">Esta opção ativa o registo das ações para diagnóstico. Pode ser útil para os programadores descobrirem o problema na aplicação. Ative esta opção apenas a pedido dos programadores do CoMaps.</string>
-    <string name="access_rules_author_only">Edição online</string>
     <string name="driving_options_title">Configurações de direção</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Evitar portagens</string>
@@ -825,14 +800,8 @@
     <string name="nav_auto">Auto na navegação</string>
     <string name="menu">Menu</string>
     <string name="app_site_url">https://comaps.app/pt/</string>
-    <string name="maps_storage_external">Armazenamento externo partilhado</string>
-    <string name="mb">MB</string>
     <string name="editor_level">Piso (0 é o rés de chão)</string>
-    <string name="maps_storage_internal">Armazenamento interno privado</string>
     <string name="instagram">Instagram</string>
-    <string name="gb">GB</string>
-    <string name="maps_storage_shared">Armazenamento interno partilhado</string>
-    <string name="maps_storage_removable">Cartão SD</string>
     <string name="maps_storage_free_size">%1$s disponíveis de %2$s</string>
     <string name="move_maps_error">Erro ao mover os ficheiros dos mapas</string>
     <string name="github">GitHub</string>
diff --git a/android/app/src/main/res/values-ro/strings.xml b/android/app/src/main/res/values-ro/strings.xml
index e3a34c66e..fe4592c64 100644
--- a/android/app/src/main/res/values-ro/strings.xml
+++ b/android/app/src/main/res/values-ro/strings.xml
@@ -16,8 +16,6 @@
     <string name="kilometres">Kilometri</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Mile</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">Poziția mea</string>
     <!-- Update maps later button text -->
     <string name="later">Mai târziu</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -73,8 +71,6 @@
     <string name="bookmarks">Locuri preferate</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Locuri preferate și trasee</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">Locurile mele</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Denumire</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -136,8 +132,6 @@
     <string name="category_post">Poștă</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Poliția</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">Wi-Fi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Reciclare</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -443,7 +437,6 @@
     <string name="empty_street_name_error">Introdu numele străzii</string>
     <string name="choose_language">Alege o limbă</string>
     <string name="choose_street">Alege o stradă</string>
-    <string name="postal_code">Cod poștal</string>
     <string name="cuisine">Bucătărie</string>
     <string name="select_cuisine">Alege bucătăria</string>
     <!-- login text field -->
@@ -484,8 +477,6 @@
     <string name="error_enter_correct_storey_number">Numărul de etaje nu trebuie să depășească %d</string>
     <string name="editor_zip_code">Cod poștal</string>
     <string name="error_enter_correct_zip_code">Introdu codul poștal corect</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">Punct Hartă</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Notă pentru voluntarii OpenStreetMap (opțional)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -503,14 +494,8 @@
     <string name="downloader_no_downloaded_maps_title">Nu ai descărcat nicio hartă</string>
     <string name="downloader_no_downloaded_maps_message">Descarcă hărți pentru a căuta un loc și a naviga fără conectare la internet.</string>
     <string name="current_location_unknown_error_title">Poziția actuală este necunoscută.</string>
-    <!-- abbreviation for meters -->
-    <string name="m">m</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">km</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/h</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">mi</string>
     <string name="miles_per_hour">mph</string>
     <string name="hour">h</string>
     <string name="minute">min</string>
@@ -570,8 +555,6 @@
     <string name="prefs_languages_information_off_link">Consultă acest ghid pentru informații suplimentare.</string>
     <string name="transliteration_title">Transcrie în alfabet latin</string>
     <string name="learn_more">Mai multe</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Ieșire</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Utilizați funcția de căutare sau atingeți ușor pe hartă pentru a adăuga un punct de plecare</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -583,7 +566,6 @@
     <string name="dialog_error_storage_title">Problemă de acces la spațiul de stocare</string>
     <string name="dialog_error_storage_message">Spațiul de stocare extern nu este disponibil. Probabil cardul SD nu este introdus, este deteriorat sau sistemul de fișiere este doar pentru citire. Verifică sau contactează-ne la support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Simulare arhivă deteriorată</string>
-    <string name="core_entrance">Intrare</string>
     <string name="error_enter_correct_name">Introdu un nume corect</string>
     <string name="bookmark_lists">Liste</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -626,16 +608,12 @@
     <string name="button_layer_traffic">Trafic</string>
     <string name="subway">Metrou</string>
     <string name="layers_title">Stiluri și straturi de hartă</string>
-    <string name="subway_data_unavailable">Harta de metrou nu este disponibilă</string>
     <string name="bookmarks_empty_list_title">Lista este goală</string>
     <string name="bookmarks_empty_list_message">Pentru a adăuga un loc preferat, ține apăsat un loc pe hartă și după aceea atinge simbolul în formă de stea</string>
     <string name="category_desc_more">…mai mult</string>
     <string name="export_file">Export KMZ</string>
     <string name="export_file_gpx">Exportați GPX</string>
     <string name="delete_list">Șterge lista</string>
-    <string name="public_access">Acces public</string>
-    <string name="limited_access">Acces privat</string>
-    <string name="not_shared">Personal</string>
     <string name="speedcams_alert_title">Radare</string>
     <string name="place_description_title">Descrierea locului</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -652,7 +630,6 @@
     <string name="power_managment_setting_auto">Automat</string>
     <string name="power_managment_setting_manual_max">Economisire maximă a energiei</string>
     <string name="enable_logging_warning_message">Opțiunea activează jurnalizarea în scopuri de diagnosticare. Aceasta poate fi utilă echipei noastre pentru a rezolva problemele cu aplicația. Activează temporar această opțiune pentru a înregistra și a ne trimite jurnale detaliate despre problema ta.</string>
-    <string name="access_rules_author_only">Modifică online</string>
     <string name="driving_options_title">Opțiuni de ocolire</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Evitați drumurile cu taxă</string>
diff --git a/android/app/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml
index b6213ca1c..b2aef9705 100644
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
@@ -14,13 +14,8 @@
     <string name="downloading">Загружается…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
     <string name="kilometres">Километры</string>
-    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
-    <string name="mb">МБ</string>
-    <string name="gb">ГБ</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Мили</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">Мое местоположение</string>
     <!-- Update maps later button text -->
     <string name="later">Не сейчас</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -78,8 +73,6 @@
     <string name="bookmarks">Метки</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Метки и треки</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">Мои метки</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Название</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -94,14 +87,6 @@
     <string name="maps_storage_summary">Выберите место размещения карт</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Загруженные карты</string>
-    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">Внутренний скрытый накопитель</string>
-    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">Внутренний общий накопитель</string>
-    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
-    <string name="maps_storage_removable">SD-карта</string>
-    <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">Внешний общий накопитель</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
     <string name="maps_storage_free_size">%1$s свободно из %2$s</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -153,8 +138,6 @@
     <string name="category_post">Почта</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Полиция</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">Wi-Fi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Переработка</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -462,7 +445,6 @@
     <string name="empty_street_name_error">Введите название улицы</string>
     <string name="choose_language">Выбрать язык</string>
     <string name="choose_street">Выбрать улицу</string>
-    <string name="postal_code">Почтовый индекс</string>
     <string name="cuisine">Кухня</string>
     <string name="select_cuisine">Выбрать кухню</string>
     <!-- login text field -->
@@ -505,8 +487,6 @@
     <string name="error_enter_correct_storey_number">Количество этажей не должно превышать %d</string>
     <string name="editor_zip_code">Почтовый индекс</string>
     <string name="error_enter_correct_zip_code">Введите валидный почтовый индекс</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">Точка на карте</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Примечание для волонтеров OpenStreetMap (необязательно)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -524,16 +504,8 @@
     <string name="downloader_no_downloaded_maps_title">У вас нет загруженных карт</string>
     <string name="downloader_no_downloaded_maps_message">Загрузите необходимые карты, чтобы находить места и пользоваться навигацией без интернета.</string>
     <string name="current_location_unknown_error_title">Текущее местоположение неизвестно</string>
-    <!-- abbreviation for meters -->
-    <string name="m">м</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">км</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">км/ч</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">ми</string>
-    <!-- A unit of measure -->
-    <string name="ft">фут</string>
     <string name="miles_per_hour">ми/ч</string>
     <string name="hour">ч</string>
     <string name="minute">мин</string>
@@ -593,8 +565,6 @@
     <string name="prefs_languages_information_off_link">Ознакомьтесь с подробностями в этом руководстве</string>
     <string name="transliteration_title">Транслитерация в латиницу</string>
     <string name="learn_more">Узнать больше</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Выход</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Используйте поиск или коснитесь карты, чтобы добавить начальную точку маршрута</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -606,7 +576,6 @@
     <string name="dialog_error_storage_title">Проблема с доступом к хранилищу</string>
     <string name="dialog_error_storage_message">Внешняя память устройства недоступна, возможно SD карта была удалена, повреждена или файловая система доступна только для чтения. Проверьте это и свяжитесь, пожалуйста, с нами support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Эмуляция ошибки с внешней памятью</string>
-    <string name="core_entrance">Вход</string>
     <string name="error_enter_correct_name">Пожалуйста, введите название правильно</string>
     <string name="bookmark_lists">Списки</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -652,16 +621,12 @@
     <string name="button_layer_traffic">Пробки</string>
     <string name="subway">Метро</string>
     <string name="layers_title">Стили и слои карты</string>
-    <string name="subway_data_unavailable">Карта метро недоступна</string>
     <string name="bookmarks_empty_list_title">Список пустой</string>
     <string name="bookmarks_empty_list_message">Чтобы добавить метку, нажмите на место на карте, а затем на иконку звёздочки</string>
     <string name="category_desc_more">…ещё</string>
     <string name="export_file">Экспорт KMZ</string>
     <string name="export_file_gpx">Экспорт GPX</string>
     <string name="delete_list">Удалить список</string>
-    <string name="public_access">Публичный доступ</string>
-    <string name="limited_access">Ограниченный доступ</string>
-    <string name="not_shared">Личный</string>
     <string name="speedcams_alert_title">Камеры скорости</string>
     <string name="place_description_title">Описание места</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -678,7 +643,6 @@
     <string name="power_managment_setting_auto">Авто</string>
     <string name="power_managment_setting_manual_max">Максимальное энергосбережение</string>
     <string name="enable_logging_warning_message">Эта настройка включается для записи действий в целях диагностики, чтобы помочь нашей команде выявить проблемы с приложением. Включайте ее только на время для отправки детальной информации о неполадках, обнаруженных в приложении, через кнопку «Сообщить о проблеме». Логи могут включать данные о местоположении.</string>
-    <string name="access_rules_author_only">Редактируется онлайн</string>
     <string name="driving_options_title">Настройки объезда</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Избегать платных дорог</string>
diff --git a/android/app/src/main/res/values-sk/strings.xml b/android/app/src/main/res/values-sk/strings.xml
index dfdb20108..658ad713e 100644
--- a/android/app/src/main/res/values-sk/strings.xml
+++ b/android/app/src/main/res/values-sk/strings.xml
@@ -16,8 +16,6 @@
     <string name="kilometres">Kilometre</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Míle</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">Moja poloha</string>
     <!-- Update maps later button text -->
     <string name="later">Neskôr</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -73,8 +71,6 @@
     <string name="bookmarks">Záložky</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Záložky a stopy</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">Moje miesta</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Názov</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -89,14 +85,6 @@
     <string name="maps_storage_summary">Vyberte miesto, kam sa majú sťahovať mapy</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Mapy</string>
-    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">Interné privátne úložisko</string>
-    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">Interné zdieľané úložisko</string>
-    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
-    <string name="maps_storage_removable">SD karta</string>
-    <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">Externé zdieľané úložisko</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
     <string name="maps_storage_free_size">Voľných %1$s z %2$s</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -148,8 +136,6 @@
     <string name="category_post">Pošta</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Polícia</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">WiFi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Recyklácia</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -455,7 +441,6 @@
     <string name="empty_street_name_error">Zadajte názov ulice</string>
     <string name="choose_language">Vybrať jazyk</string>
     <string name="choose_street">Vybrať ulicu</string>
-    <string name="postal_code">PSČ</string>
     <string name="cuisine">Kuchyňa</string>
     <string name="select_cuisine">Vyberte si kuchyňu</string>
     <!-- login text field -->
@@ -496,8 +481,6 @@
     <string name="error_enter_correct_storey_number">Počet poschodí nesmie byť väčší ako %d</string>
     <string name="editor_zip_code">PSČ</string>
     <string name="error_enter_correct_zip_code">Zadajte správne PSČ</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">Bod na mape</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Poznámka pre dobrovoľníkov OpenStreetMap (nepovinné)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -515,16 +498,8 @@
     <string name="downloader_no_downloaded_maps_title">Neprevzali ste žiadne mapy</string>
     <string name="downloader_no_downloaded_maps_message">Prevziať mapy na nájdenie pozície a navigovanie off-line.</string>
     <string name="current_location_unknown_error_title">Súčasná pozícia je neznáma.</string>
-    <!-- abbreviation for meters -->
-    <string name="m">m</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">km</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/h</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">mi</string>
-    <!-- A unit of measure -->
-    <string name="ft">stopa</string>
     <string name="miles_per_hour">mph</string>
     <string name="hour">hod</string>
     <string name="minute">min</string>
@@ -583,8 +558,6 @@
     <string name="prefs_languages_information_off_link">Viac informácií nájdete v tomto návode.</string>
     <string name="transliteration_title">Prepis do latinky</string>
     <string name="learn_more">Zistiť viac</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Ukončiť</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Pomocou vyhľadávania alebo ťuknutím na mapu môžete pridať východiskový bod trasy</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -596,7 +569,6 @@
     <string name="dialog_error_storage_title">Problém s prístupom k úložisku</string>
     <string name="dialog_error_storage_message">Externý úložný priestor nie je dostupný, pravdepodobne je vytiahnutá alebo poškodená SD karta alebo je systém súborov určený iba na čítanie. Skontrolujte to, prosím, a kontaktujte nás na support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Imitovať poškodené úložisko</string>
-    <string name="core_entrance">Vchod | vjazd</string>
     <string name="error_enter_correct_name">Prosím, zadajte správne meno</string>
     <string name="bookmark_lists">Zoznamy</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -639,16 +611,12 @@
     <string name="button_layer_traffic">Dopravné informácie</string>
     <string name="subway">Metro</string>
     <string name="layers_title">Štýly a vrstvy mapy</string>
-    <string name="subway_data_unavailable">Mapa metra nie je dostupná</string>
     <string name="bookmarks_empty_list_title">Tento zoznam je prázdny</string>
     <string name="bookmarks_empty_list_message">Pre pridanie záložky kliknite na miesto na mape a potom na ikonu hviezdičky</string>
     <string name="category_desc_more">…viac</string>
     <string name="export_file">Exportovať KMZ</string>
     <string name="export_file_gpx">Export GPX</string>
     <string name="delete_list">Vymazať zoznam</string>
-    <string name="public_access">Verejne prístupné</string>
-    <string name="limited_access">Obmedzený prístup</string>
-    <string name="not_shared">Súkromné</string>
     <string name="speedcams_alert_title">Rýchlostné kamery</string>
     <string name="place_description_title">Popis miesta</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -665,7 +633,6 @@
     <string name="power_managment_setting_auto">Automaticky</string>
     <string name="power_managment_setting_manual_max">Maximálna úspora batérie</string>
     <string name="enable_logging_warning_message">Týmto zapnete záznamenávanie diagnostických informácií, ktoré môžete poslať našej technickej podpore v prípade problémov s aplikáciou. Záznam môže obsahovať údaje o vašej polohe.</string>
-    <string name="access_rules_author_only">Online úprava</string>
     <string name="driving_options_title">Možnosti trasy</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Vyhnúť sa spoplatneným cestám</string>
diff --git a/android/app/src/main/res/values-sr/strings.xml b/android/app/src/main/res/values-sr/strings.xml
index b66b8a551..38a75c194 100644
--- a/android/app/src/main/res/values-sr/strings.xml
+++ b/android/app/src/main/res/values-sr/strings.xml
@@ -16,8 +16,6 @@
     <string name="kilometres">Колиметри</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Миље</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">Моја позиција</string>
     <!-- Update maps later button text -->
     <string name="later">Касније</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -69,8 +67,6 @@
     <string name="bookmarks">Маркери</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Маркери и путање</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">Моја места</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Назив</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -85,14 +81,6 @@
     <string name="maps_storage_summary">Изаберите фолдер у ком се чувају мапе</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Преузете мапе</string>
-    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">Интерна приватна меморија</string>
-    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">Интерна дељена меморија</string>
-    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
-    <string name="maps_storage_removable">СД картица</string>
-    <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">Екстерна дељена меморија</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
     <string name="maps_storage_free_size">слободно %1$s од %2$s</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -144,8 +132,6 @@
     <string name="category_post">Пошта</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Полиција</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">WiFi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Рециклажа</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -450,7 +436,6 @@
     <string name="empty_street_name_error">Молим Вас, унесите назив улице</string>
     <string name="choose_language">Изаберите језик</string>
     <string name="choose_street">Изаберите улицу</string>
-    <string name="postal_code">Поштански број</string>
     <string name="cuisine">Кухиња</string>
     <string name="select_cuisine">Изаберите кухињу</string>
     <!-- login text field -->
@@ -507,16 +492,8 @@
     <string name="downloader_no_downloaded_maps_title">Нисте преузели ни једну мапу</string>
     <string name="downloader_no_downloaded_maps_message">Преузмите мапе да бисте претраживали и користили навигацију без интернета</string>
     <string name="current_location_unknown_error_title">Тренутна локација није позната</string>
-    <!-- abbreviation for meters -->
-    <string name="m">м</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">км</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">км/ч</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">ми</string>
-    <!-- A unit of measure -->
-    <string name="ft">стопа</string>
     <string name="miles_per_hour">ми/ч</string>
     <string name="hour">ч</string>
     <string name="minute">мин</string>
@@ -575,8 +552,6 @@
     <string name="prefs_languages_information_off_link">За више информација погледајте ово упутство</string>
     <string name="transliteration_title">Транслитерација у латиницу</string>
     <string name="learn_more">Сазнај више</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Излаз</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Користите претрагу или кратко додирните мапу да бисте додали почетну тачку руте</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -588,7 +563,6 @@
     <string name="dialog_error_storage_title">Проблем са приступом меморији</string>
     <string name="dialog_error_storage_message">Екстерна меморија није доступна. SD картица је можда уклоњена, оштећена, или је фајл систем само за читање. Молим Вас, проверите Вашу SD картицу или нас контактирајте на support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Симулирај неисправну меморију</string>
-    <string name="core_entrance">Улаз</string>
     <string name="error_enter_correct_name">Молим Вас да унесете исправан назив</string>
     <string name="bookmark_lists">Листе</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -631,16 +605,12 @@
     <string name="button_layer_traffic">Саобраћај</string>
     <string name="subway">Метро</string>
     <string name="layers_title">Стилови мапе и слојеви</string>
-    <string name="subway_data_unavailable">Мапа метроа не постоји</string>
     <string name="bookmarks_empty_list_title">Ова листа је празна</string>
     <string name="bookmarks_empty_list_message">Да бисте додали маркер, кратко додирните место на мапи, а онда додирните иконицу са звездом</string>
     <string name="category_desc_more">…више</string>
     <string name="export_file">Експортуј KMZ</string>
     <string name="export_file_gpx">Експортуј GPX</string>
     <string name="delete_list">Обриши листу</string>
-    <string name="public_access">Јавни приступ</string>
-    <string name="limited_access">Ограничен приступ</string>
-    <string name="not_shared">Приватно</string>
     <string name="speedcams_alert_title">Прекршајне камере</string>
     <string name="place_description_title">Опис места</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -657,7 +627,6 @@
     <string name="power_managment_setting_auto">Када је батерија при крају</string>
     <string name="power_managment_setting_manual_max">Увек</string>
     <string name="enable_logging_warning_message">Привремено укључите ову опцију да бисте сачували детаљне дијагностичке логове уколико имате неки проблем. Логове можете да нам пошаљете коришћењем опције \"Пријавите проблем\" у прозору Помоћ. Напомена: Логови могу да садрже информације о вашој локацији.</string>
-    <string name="access_rules_author_only">Online измене</string>
     <string name="driving_options_title">Опције рутирања</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Избегавај путарине</string>
@@ -838,7 +807,6 @@
     <string name="uri_open_location_failed">Нема инсталираних апликација које могу да отворе локацију.</string>
     <!-- preference string for using auto theme only in navigation mode -->
     <string name="nav_auto">Аутоматски у навигацији</string>
-    <string name="gb">ГБ</string>
     <string name="telegram">Telegram</string>
     <string name="matrix">[Matrix]</string>
     <string name="mastodon">Mastodon</string>
@@ -859,7 +827,6 @@
     <string name="openstreetmap">OpenStreetMap</string>
     <string name="editor_focus_map_on_location">Превуците мапу да поставите крст на локацију места или посла.</string>
     <string name="precise_location_is_disabled_long_text">Да би се осигурала тачна навигација омогућите прецизну локацију у подешавањима</string>
-    <string name="mb">МБ</string>
     <string name="translated_om_site_url">https://comaps.app/</string>
     <string name="tts_info_link">https://www.comaps.app/support/tts-configuration-guide-for-android/</string>
     <string name="editor_osm_history">Ваша историја уређивања</string>
@@ -869,7 +836,6 @@
     <string name="comma_separated_pair">%1$s, %2$s</string>
     <string name="social_media">Друштвени медији</string>
     <string name="building">Зграда</string>
-    <string name="core_placepage_unknown_place">Тачка на мапи</string>
     <string name="codeberg">Codeberg</string>
     <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
     <string name="app_site_url">https://comaps.app/</string>
diff --git a/android/app/src/main/res/values-sv/strings.xml b/android/app/src/main/res/values-sv/strings.xml
index bcf064908..ae7bd0680 100644
--- a/android/app/src/main/res/values-sv/strings.xml
+++ b/android/app/src/main/res/values-sv/strings.xml
@@ -16,8 +16,6 @@
     <string name="kilometres">Kilometer</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Mile</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">Min position</string>
     <!-- Update maps later button text -->
     <string name="later">Senare</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -73,8 +71,6 @@
     <string name="bookmarks">Bokmärken</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Bokmärken och rutter</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">Mina Platser</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Namn</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -430,7 +426,6 @@
     <string name="add_street">Lägg till en gata</string>
     <string name="choose_language">Välj ett språk</string>
     <string name="choose_street">Välj en gata</string>
-    <string name="postal_code">Postkod</string>
     <string name="cuisine">Mat</string>
     <string name="select_cuisine">Välj mat</string>
     <!-- login text field -->
@@ -470,8 +465,6 @@
     <string name="error_enter_correct_storey_number">Redigera byggnaden med max %d våningar</string>
     <string name="editor_zip_code">Postnr</string>
     <string name="error_enter_correct_zip_code">Ange korrekt postnr</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">Kartpunkt</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Meddelande till OpenStreetMap-volontärer (valfritt)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -489,16 +482,8 @@
     <string name="downloader_no_downloaded_maps_title">Du har inte laddat ner några kartor</string>
     <string name="downloader_no_downloaded_maps_message">Ladda ner kartor för att hitta platsen och navigera offline.</string>
     <string name="current_location_unknown_error_title">Den nuvarande platsen är okänd.</string>
-    <!-- abbreviation for meters -->
-    <string name="m">m</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">km</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/tim</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">mile</string>
-    <!-- A unit of measure -->
-    <string name="ft">fot</string>
     <string name="miles_per_hour">mi/tim</string>
     <string name="hour">tim</string>
     <string name="minute">min</string>
@@ -551,8 +536,6 @@
     <string name="prefs_languages_information_off_link">Kolla in den här guiden för mer information.</string>
     <string name="transliteration_title">Translitterera till latinska alfabetet</string>
     <string name="learn_more">Läs mer</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Avsluta</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Använd sökfunktionen eller tryck på kartan för att lägga till en startpunkt för rutten</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -564,7 +547,6 @@
     <string name="dialog_error_storage_title">Lagringsåtkomstproblem</string>
     <string name="dialog_error_storage_message">Extern lagring är inte tillgänglig. SD-kortet är borttaget, skadat eller så är filsystemet skrivskyddat. Kontrollera det och kontakta oss på support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emulera dålig lagring</string>
-    <string name="core_entrance">Ingång</string>
     <string name="error_enter_correct_name">Ange ett korrekt namn</string>
     <string name="bookmark_lists">Listor</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -604,16 +586,12 @@
     <string name="button_layer_traffic">Trafik</string>
     <string name="subway">Tunnelbana</string>
     <string name="layers_title">Kartstilar och lager</string>
-    <string name="subway_data_unavailable">Tunnelbanekartan är otillgänglig</string>
     <string name="bookmarks_empty_list_title">Listan är tom</string>
     <string name="bookmarks_empty_list_message">För att lägga till bokmärken, tryck på kartan och sedan på stjärnikonen</string>
     <string name="category_desc_more">…mer</string>
     <string name="export_file">Exportera KMZ</string>
     <string name="export_file_gpx">Exportera GPX</string>
     <string name="delete_list">Radera listan</string>
-    <string name="public_access">Allmän åtkomst</string>
-    <string name="limited_access">Privat åtkomst</string>
-    <string name="not_shared">Privat</string>
     <string name="speedcams_alert_title">Hastighetskameror</string>
     <string name="place_description_title">Beskrivning av platsen</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -630,7 +608,6 @@
     <string name="power_managment_setting_auto">Vid lågt batteri</string>
     <string name="power_managment_setting_manual_max">Alltid</string>
     <string name="enable_logging_warning_message">Aktivera denna funktion för att logga detaljer för diagnostiska ändamål. Detta hjälper utvecklarna att identifiera problem med appen. Slå på funktionen endast på begäran av CoMaps supporttjänst.</string>
-    <string name="access_rules_author_only">Redigeras online</string>
     <string name="driving_options_title">Ruttinställningar</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Undvik avgiftsbelagda vägar</string>
@@ -809,7 +786,6 @@
     <string name="vk">VK</string>
     <string name="prefs_group_general">Allmänna inställningar</string>
     <string name="telegram">Telegram</string>
-    <string name="category_wifi">WiFi</string>
     <string name="prefs_group_information">Information</string>
     <string name="menu">Meny</string>
     <string name="github">GitHub</string>
@@ -819,15 +795,9 @@
     <string name="openstreetmap">OpenStreetMap</string>
     <string name="opens_in">Öppnar om %s</string>
     <string name="twitter">X (Twitter)</string>
-    <string name="maps_storage_shared">Internt, delat lagringsutrymme</string>
-    <string name="maps_storage_removable">SD-kort</string>
-    <string name="maps_storage_external">Externt, delat lagringsutrymme</string>
     <string name="maps_storage_free_size">%1$s av %2$s ledigt</string>
     <string name="read_in_wikipedia">Wikipedia</string>
-    <string name="maps_storage_internal">Internt, privat lagringsutrymme</string>
     <string name="matrix">[Matrix]</string>
-    <string name="gb">GB</string>
-    <string name="mb">MB</string>
     <string name="closes_in">Stänger om %s</string>
     <string name="mastodon">Mastodon</string>
     <string name="editor_line_social_network">LINE</string>
diff --git a/android/app/src/main/res/values-sw/strings.xml b/android/app/src/main/res/values-sw/strings.xml
index c29a149bb..085a91471 100644
--- a/android/app/src/main/res/values-sw/strings.xml
+++ b/android/app/src/main/res/values-sw/strings.xml
@@ -139,8 +139,6 @@
     <string name="prefs_languages_information_off_link">Kwa maelezo zaidi tafadhali tazama mwongozo huu.</string>
     <string name="transliteration_title">Tafsiri kwa lugha ya Kilatini</string>
     <string name="learn_more">Jua mengi zaidi</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Toka</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Tumia utafutaji au uguse kwenye ramani ili kuongeza mahali pa kuanzia</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -152,7 +150,6 @@
     <string name="dialog_error_storage_title">Tatizo la kufikia hifadhi</string>
     <string name="dialog_error_storage_message">Hifadhi ya nje haipatikani, pengine Kadi ya SD imeondolewa, imeharibika au mfumo wa faili ni wa kusoma pekee. Tafadhali ikague na uwasiliane nasi kwa kutumia support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Onyeshana hifadhi mbaya</string>
-    <string name="core_entrance">Kiingilio</string>
     <string name="error_enter_correct_name">Tafadhali, weka jina sahihi</string>
     <string name="bookmark_lists">Orodha</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -191,16 +188,12 @@
     <string name="button_layer_traffic">Trafiki</string>
     <string name="subway">Njia ya chini</string>
     <string name="layers_title">Mitindo ya Ramani na Tabaka</string>
-    <string name="subway_data_unavailable">Ramani ya njia ya chini haipatikani</string>
     <string name="bookmarks_empty_list_title">Orodha hii ni tupu</string>
     <string name="bookmarks_empty_list_message">Ili kuongeza ramani, gusa mahali kwenye ramani na kisha gusa ikoni ya nyota</string>
     <string name="category_desc_more">…zaidi</string>
     <string name="export_file">Hamisha KMZ</string>
     <string name="export_file_gpx">Hamisha GPX</string>
     <string name="delete_list">Futa Orodha</string>
-    <string name="public_access">Matumizi ya umma</string>
-    <string name="limited_access">Matumizi yenye ukomo</string>
-    <string name="not_shared">Faragha</string>
     <string name="speedcams_alert_title">Kamera za mwendo-kasi</string>
     <string name="place_description_title">Maelezo ya Eneo</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -217,7 +210,6 @@
     <string name="power_managment_setting_auto">Kiotomatiki</string>
     <string name="power_managment_setting_manual_max">Upeo wa kuhifadhi nishati</string>
     <string name="enable_logging_warning_message">Chaguo huwasha data kwa madhumuni ya uchunguzi. Itakuwa muhimu kwa wafanyakazi wetu ambao wanatatua matatizo ya programu. Washa chaguo hili kwa maombi ya mhudumu wa CoMaps tu.</string>
-    <string name="access_rules_author_only">Uhariri mtandaoni</string>
     <string name="driving_options_title">Machaguo ya njia</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Epuka barabara za ushuru</string>
@@ -391,8 +383,6 @@
     <string name="uri_open_location_failed">Hakuna Programu iliyosakinishwa inayoweza kufungua eneo</string>
     <!-- preference string for using auto theme only in navigation mode -->
     <string name="nav_auto">Urambazaji otomatiki</string>
-    <string name="gb">GB</string>
-    <string name="mb">MB</string>
     <string name="telegram_url">https://t.me/CoMapsApp/</string>
     <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
     <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/About_OpenStreetMap</string>
diff --git a/android/app/src/main/res/values-th/strings.xml b/android/app/src/main/res/values-th/strings.xml
index 24ad93dfd..177d0563f 100644
--- a/android/app/src/main/res/values-th/strings.xml
+++ b/android/app/src/main/res/values-th/strings.xml
@@ -14,12 +14,8 @@
     <string name="downloading">กำลังดาวน์โหลด…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
     <string name="kilometres">กิโลเมตร</string>
-    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
-    <string name="mb">MB</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">ไมล์</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">ตำแหน่งของฉัน</string>
     <!-- Update maps later button text -->
     <string name="later">ภายหลัง</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -75,8 +71,6 @@
     <string name="bookmarks">บุ๊กมาร์ก</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">บุ๊กมาร์กและการติดตาม</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">สถานที่ของฉัน</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">ชื่อ</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -138,8 +132,6 @@
     <string name="category_post">ไปรษณีย์</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">ตำรวจ</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">WiFi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">การรีไซเคิล</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -434,7 +426,6 @@
     <string name="add_street">เพิ่มถนน</string>
     <string name="choose_language">เลือกภาษา</string>
     <string name="choose_street">เลือกถนน</string>
-    <string name="postal_code">รหัสไปรษณีย์</string>
     <string name="cuisine">ประเภทอาหาร</string>
     <string name="select_cuisine">เลือกประเภทอาหาร</string>
     <!-- login text field -->
@@ -474,8 +465,6 @@
     <string name="error_enter_correct_storey_number">แก้ไขอาคารที่มีจำนวนชั้นมากกว่า %d</string>
     <string name="editor_zip_code">รหัสไปรษณีย์</string>
     <string name="error_enter_correct_zip_code">กรุณาใส่รหัสไปรษณีย์ที่ถูกต้อง</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">จุดแผนที่</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">หมายเหตุถึงอาสาสมัคร OpenStreetMap (ไม่บังคับ)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -493,16 +482,8 @@
     <string name="downloader_no_downloaded_maps_title">คุณยังไม่ได้ดาวน์โหลดแผนที่</string>
     <string name="downloader_no_downloaded_maps_message">ดาวน์โหลดแผนที่เพื่อค้นหาสถานที่ และนำทางแบบออฟไลน์</string>
     <string name="current_location_unknown_error_title">ไม่ทราบชื่อของที่ตั้งปัจจุบัน</string>
-    <!-- abbreviation for meters -->
-    <string name="m">ม.</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">กม.</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">กม./ชม.</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">ไมล์</string>
-    <!-- A unit of measure -->
-    <string name="ft">ฟุต</string>
     <string name="miles_per_hour">ไมล์/ชม.</string>
     <string name="hour">ชม.</string>
     <string name="minute">น.</string>
@@ -555,8 +536,6 @@
     <string name="prefs_languages_information_off_link">สำหรับข้อมูลเพิ่มเติม กรุณาเข้าชมคำแนะนำนี้</string>
     <string name="transliteration_title">การทับศัพท์เป็นภาษาละติน</string>
     <string name="learn_more">ศึกษาเพิ่มเติม</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">ออก</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">ใช้การค้นหาหรือแตะบนแผนที่เพื่อเพิ่มจุดเริ่มต้นเส้นทาง</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -568,7 +547,6 @@
     <string name="dialog_error_storage_title">ปัญหาการเข้าถึงที่เก็บข้อมูล</string>
     <string name="dialog_error_storage_message">ที่เก็บข้อมูลภายนอกไม่พร้อมใช้งาน อาจเป็นเพราะการ์ด SD ถูกถอดออกไป ได้รับความเสียหาย หรือระบบไฟล์ให้เขียนได้อย่างเดียว กรุณาตรวจสอบและติดต่อเราได้ที่ support@comaps.app</string>
     <string name="setting_emulate_bad_storage">จำลองแบบที่เก็บข้อมูลที่ไม่ดี</string>
-    <string name="core_entrance">ทางเข้า</string>
     <string name="error_enter_correct_name">กรุณาใส่ชื่อที่ถูกต้อง</string>
     <string name="bookmark_lists">รายการ</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -605,16 +583,12 @@
     <string name="button_layer_traffic">การจราจร</string>
     <string name="subway">รถไฟใต้ดิน</string>
     <string name="layers_title">รูปแบบและเลเยอร์ของแผนที่</string>
-    <string name="subway_data_unavailable">แผนที่รถไฟใต้ดินไม่พร้อมใช้งาน</string>
     <string name="bookmarks_empty_list_title">รายการนี้ว่างเปล่า</string>
     <string name="bookmarks_empty_list_message">เพื่อเพิ่มบุ๊กมาร์ก โปรดแตะที่สถานที่บนแผนที่ แล้วจากนั้นแตะที่ไอคอนรูปดาว</string>
     <string name="category_desc_more">…เพิ่มเติม</string>
     <string name="export_file">ส่งออก KMZ</string>
     <string name="export_file_gpx">ส่งออก GPX</string>
     <string name="delete_list">ลบรายการ</string>
-    <string name="public_access">เข้าถึงได้โดยสาธารณะ</string>
-    <string name="limited_access">จำกัดการเข้าถึง</string>
-    <string name="not_shared">ส่วนตัว</string>
     <string name="speedcams_alert_title">กล้องตรวจจับความเร็ว</string>
     <string name="place_description_title">รายละเอียดของสถานที่</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -631,7 +605,6 @@
     <string name="power_managment_setting_auto">อัตโนมัติ</string>
     <string name="power_managment_setting_manual_max">ประหยัดพลังงานสูงสุด</string>
     <string name="enable_logging_warning_message">ออปชันเพื่อเปิดการบันทึกประวัติการทำงานเพื่อการวินิจฉัย ประวัติดังกล่าวอาจเป็นประโยชน์กับทีมงานช่วยเหลือของเราที่คอยจัดการกับปัญหาที่เจอระหว่างแอปทำงาน โปรดเปิดออปชันดังกล่าวจากการร้องข้อการสนับสนุนจาก CoMaps เท่านั้น</string>
-    <string name="access_rules_author_only">การแก้ไขทางออนไลน์</string>
     <string name="driving_options_title">ทางเลือกเส้นทางขับขี่</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">หลีกเลี่ยงถนนที่เก็บค่าผ่านทาง</string>
@@ -806,7 +779,6 @@
     <!-- preference string for using auto theme only in navigation mode -->
     <string name="nav_auto">อัตโนมัติในการนำทาง</string>
     <string name="openstreetmap">OpenStreetMap</string>
-    <string name="gb">GB</string>
     <string name="telegram_url">https://t.me/CoMapsApp/</string>
     <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/Th:เกี่ยวกับ_OpenStreetMap</string>
     <string name="translated_om_site_url">https://comaps.app/</string>
diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml
index dfb86fded..8ff60ee43 100644
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -14,12 +14,8 @@
     <string name="downloading">İndiriliyor…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
     <string name="kilometres">Kilometre</string>
-    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
-    <string name="mb">MB</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Mil</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">Konumum</string>
     <!-- Update maps later button text -->
     <string name="later">Sonra</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -77,8 +73,6 @@
     <string name="bookmarks">Yer İmleri</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Yer İmleri ve Kayıtlı Rotalar</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">Yerlerim</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Adı</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -93,14 +87,6 @@
     <string name="maps_storage_summary">Haritaların indirileceği klasörü seçin</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Haritalar</string>
-    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">Dahili özel depolama</string>
-    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">Dahili paylaşılan depolama</string>
-    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
-    <string name="maps_storage_removable">SD kart</string>
-    <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">Harici paylaşılan depolama</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
     <string name="maps_storage_free_size">%2$s\'ın %1$s\'ı boş</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -152,8 +138,6 @@
     <string name="category_post">Posta</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Polis</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">WiFi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Geri dönüşüm</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -457,7 +441,6 @@
     <string name="empty_street_name_error">Lütfen bir sokak adı girin</string>
     <string name="choose_language">Dil seç</string>
     <string name="choose_street">Sokak seç</string>
-    <string name="postal_code">Posta kodu</string>
     <string name="cuisine">Mutfak</string>
     <string name="select_cuisine">Mutfak Seç</string>
     <!-- login text field -->
@@ -500,8 +483,6 @@
     <string name="error_enter_correct_storey_number">Kat sayısı %d\'i geçmemelidir</string>
     <string name="editor_zip_code">Posta Kodu</string>
     <string name="error_enter_correct_zip_code">Geçerli bir posta kodu girin</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">Harita Noktası</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">OpenStreetMap gönüllülerine not (isteğe bağlı)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -519,16 +500,8 @@
     <string name="downloader_no_downloaded_maps_title">Hiç harita indirmediniz</string>
     <string name="downloader_no_downloaded_maps_message">İnternetsiz olarak biyerleri bulmak ve gezinmek için haritaları indirin.</string>
     <string name="current_location_unknown_error_title">Mevcut konum bilinmiyor.</string>
-    <!-- abbreviation for meters -->
-    <string name="m">m</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">km</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/sa</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">mil</string>
-    <!-- A unit of measure -->
-    <string name="ft">fit</string>
     <string name="miles_per_hour">saatte mil</string>
     <string name="hour">sa</string>
     <string name="minute">dk</string>
@@ -588,8 +561,6 @@
     <string name="prefs_languages_information_off_link">Daha fazla bilgi için lütfen bu kılavuzu inceleyin</string>
     <string name="transliteration_title">Latin alfabesine çevir</string>
     <string name="learn_more">Daha fazla bilgi edinin</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Çık</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Bir rota başlangıç noktası eklemek için aramayı kullanın veya haritaya dokunun</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -601,7 +572,6 @@
     <string name="dialog_error_storage_title">Depolama alanı erişim sorunu</string>
     <string name="dialog_error_storage_message">Harici bellek kullanılamıyor, muhtemelen SD Kart çıkarılmış, hasarlı veya dosya sistemi salt okunur. Lütfen kontrol edin veya support@comaps.app adresinden bizimle iletişime geçin</string>
     <string name="setting_emulate_bad_storage">Bozuk depolama alanını taklit et</string>
-    <string name="core_entrance">Giriş</string>
     <string name="error_enter_correct_name">Lütfen doğru ad girin</string>
     <string name="bookmark_lists">Listeler</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -641,16 +611,12 @@
     <string name="button_layer_traffic">Trafik</string>
     <string name="subway">Metro</string>
     <string name="layers_title">Harita Stilleri ve Katmanlar</string>
-    <string name="subway_data_unavailable">Metro haritası yok</string>
     <string name="bookmarks_empty_list_title">Bu liste boş</string>
     <string name="bookmarks_empty_list_message">Yer imi eklemek için önce haritadaki bir yere sonrasında ise yıldız simgesine dokunun</string>
     <string name="category_desc_more">…daha fazla</string>
     <string name="export_file">KMZ Olarak Dışa Aktar</string>
     <string name="export_file_gpx">GPX Olarak Dışa Aktar</string>
     <string name="delete_list">Listeyi sil</string>
-    <string name="public_access">Genel erişim</string>
-    <string name="limited_access">Sınırlı erişim</string>
-    <string name="not_shared">Gizli</string>
     <string name="speedcams_alert_title">Hız kameraları</string>
     <string name="place_description_title">Yer Açıklaması</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -667,7 +633,6 @@
     <string name="power_managment_setting_auto">Pil düşükken</string>
     <string name="power_managment_setting_manual_max">Her zaman</string>
     <string name="enable_logging_warning_message">Bu seçenek tanılama amacıyla günlüğe kaydetmeyi açar. Ekibimizin uygulamayla ilgili sorunları gidermesine yardımcı olabilir. Sorununuzla ilgili ayrıntılı günlükleri kaydetmek ve bize göndermek için bu seçeneği geçici olarak etkinleştirin.</string>
-    <string name="access_rules_author_only">Çevrimiçi düzenleme</string>
     <string name="driving_options_title">Yönlendirme seçenekleri</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Ücretli yollardan kaçın</string>
@@ -876,7 +841,6 @@
     <string name="matrix">[Matrix]</string>
     <string name="vk">VK</string>
     <string name="tts_info_link">https://www.comaps.app/support/tts-configuration-guide-for-android/</string>
-    <string name="gb">GB</string>
     <string name="app_site_url">https://comaps.app/tr/</string>
     <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
     <string name="codeberg">Codeberg</string>
diff --git a/android/app/src/main/res/values-uk/strings.xml b/android/app/src/main/res/values-uk/strings.xml
index 11c0535e5..4c64c8a2b 100644
--- a/android/app/src/main/res/values-uk/strings.xml
+++ b/android/app/src/main/res/values-uk/strings.xml
@@ -14,13 +14,8 @@
     <string name="downloading">Завантажується…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
     <string name="kilometres">Кілометри</string>
-    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
-    <string name="mb">МБ</string>
-    <string name="gb">ГБ</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Милі</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">Моє місцезнаходження</string>
     <!-- Update maps later button text -->
     <string name="later">Не зараз</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -78,8 +73,6 @@
     <string name="bookmarks">Мітки</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Мітки та маршрути</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">Мої Мітки</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Iм\'я</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -94,14 +87,6 @@
     <string name="maps_storage_summary">Виберіть місце, куди повинні бути завантажені мапи.</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Завантаженнi мапи</string>
-    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">Внутрішнє приватне сховище</string>
-    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">Внутрішнє спільне сховище</string>
-    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
-    <string name="maps_storage_removable">SD-карта</string>
-    <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">Зовнiшне спільне сховище</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
     <string name="maps_storage_free_size">%1$s вільно з %2$s</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -153,8 +138,6 @@
     <string name="category_post">Пошта</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Поліція</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">WiFi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Переробка відходів</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -462,7 +445,6 @@
     <string name="empty_street_name_error">Введіть назву вулиці</string>
     <string name="choose_language">Вибрати мову</string>
     <string name="choose_street">Вибрати вулицю</string>
-    <string name="postal_code">Поштовий індекс</string>
     <string name="cuisine">Кухня</string>
     <string name="select_cuisine">Вибрати кухню</string>
     <!-- login text field -->
@@ -502,8 +484,6 @@
     <string name="error_enter_correct_storey_number">Редагуйте будівлі висотою максимум %d поверхів</string>
     <string name="editor_zip_code">Поштовий індекс</string>
     <string name="error_enter_correct_zip_code">Введіть коректний поштовий індекс</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">Точка на карті</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Примітка для волонтерів OpenStreetMap (необов\'язково)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -521,16 +501,8 @@
     <string name="downloader_no_downloaded_maps_title">Ви не маєте завантажених мап</string>
     <string name="downloader_no_downloaded_maps_message">Завантажте необхідні мапи, щоб знаходити місця та користуватися навігацією без iнтернету.</string>
     <string name="current_location_unknown_error_title">Місцезнаходження не знайдено.</string>
-    <!-- abbreviation for meters -->
-    <string name="m">м</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">км</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">км/год</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">ми</string>
-    <!-- A unit of measure -->
-    <string name="ft">фут</string>
     <string name="miles_per_hour">ми/год</string>
     <string name="hour">год</string>
     <string name="minute">хв</string>
@@ -590,8 +562,6 @@
     <string name="prefs_languages_information_off_link">Додаткову інформацію див. у цьому керівництві.</string>
     <string name="transliteration_title">Транслітерувати латиницею</string>
     <string name="learn_more">Докладніше</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Вихід</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Скористайтеся пошуком або торкніться мапи, щоб додати початкову точку маршруту</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -603,7 +573,6 @@
     <string name="dialog_error_storage_title">Не вдалося отримати доступ до сховища</string>
     <string name="dialog_error_storage_message">Зовнішнє сховище не доступно. Ймовірно, SD-картку пам\'яті було вилучено, пошкоджено, або система файлів доступна тільки для читання. Перевірте та зв\'яжіться з нами, написавши на поштову адресу support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Емулювати проблемне сховище</string>
-    <string name="core_entrance">Вхід</string>
     <string name="error_enter_correct_name">Будь ласка, введіть коректне ім\'я</string>
     <string name="bookmark_lists">Списки</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -649,16 +618,12 @@
     <string name="button_layer_traffic">Затор</string>
     <string name="subway">Метрополітен</string>
     <string name="layers_title">Стилі та шари мапи</string>
-    <string name="subway_data_unavailable">Мапа метрополітену недоступна</string>
     <string name="bookmarks_empty_list_title">Список порожній</string>
     <string name="bookmarks_empty_list_message">Щоб додати нову мітку, натисніть на значок зірочки в картці об’єкта</string>
     <string name="category_desc_more">…ще</string>
     <string name="export_file">Експорт KMZ</string>
     <string name="export_file_gpx">Експорт GPX</string>
     <string name="delete_list">Видалити список</string>
-    <string name="public_access">Публічний доступ</string>
-    <string name="limited_access">Приватний доступ</string>
-    <string name="not_shared">Особистий</string>
     <string name="speedcams_alert_title">Камери швидкості</string>
     <string name="place_description_title">Опис місця</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -675,7 +640,6 @@
     <string name="power_managment_setting_auto">Автоматично</string>
     <string name="power_managment_setting_manual_max">Максимальне енергозбереження</string>
     <string name="enable_logging_warning_message">Дана опція вмикається для логування дій з метою діагностики. Це допомагає команді виявити проблеми з додатком. Тимчасово включайте цю настройку тільки для відправки детальної інформації про знайдену вами проблему в додатку через кнопку \"Сповістити про помилку\".</string>
-    <string name="access_rules_author_only">Редагується онлайн</string>
     <string name="driving_options_title">Налаштування об’їзду</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Уникати платних доріг</string>
diff --git a/android/app/src/main/res/values-vi/strings.xml b/android/app/src/main/res/values-vi/strings.xml
index 606dbdacc..3e66e9800 100644
--- a/android/app/src/main/res/values-vi/strings.xml
+++ b/android/app/src/main/res/values-vi/strings.xml
@@ -16,8 +16,6 @@
     <string name="kilometres">Kilômét</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Dặm</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">Vị trí của Tôi</string>
     <!-- Update maps later button text -->
     <string name="later">Để sau</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -73,8 +71,6 @@
     <string name="bookmarks">Đánh dấu</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Đánh dấu và dấu vết</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">Các Địa chỉ của Tôi</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Tên</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -136,8 +132,6 @@
     <string name="category_post">Bưu điện</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Cảnh sát</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">WiFi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Tái chế rác thải</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -432,7 +426,6 @@
     <string name="add_street">Thêm con đường</string>
     <string name="choose_language">Đã chọn ngôn ngữ</string>
     <string name="choose_street">Đã chọn con đường</string>
-    <string name="postal_code">Mã bưu chính</string>
     <string name="cuisine">Ẩm thực</string>
     <string name="select_cuisine">Chọn Ẩm thực</string>
     <!-- login text field -->
@@ -472,8 +465,6 @@
     <string name="error_enter_correct_storey_number">Sửa tòa nhà có tối đa %d tầng</string>
     <string name="editor_zip_code">Mã ZIP</string>
     <string name="error_enter_correct_zip_code">Nhập Mã ZIP chính xác</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">Điểm bản đồ</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Lưu ý dành cho tình nguyện viên OpenStreetMap (tùy chọn)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -491,16 +482,8 @@
     <string name="downloader_no_downloaded_maps_title">Bạn chưa tải về bất kỳ bản đồ nào</string>
     <string name="downloader_no_downloaded_maps_message">Tải về bản đồ để tìm địa điểm và định hướng ngoại tuyến.</string>
     <string name="current_location_unknown_error_title">Chưa biết địa điểm hiện tại.</string>
-    <!-- abbreviation for meters -->
-    <string name="m">m</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">km</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/giờ</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">dặm</string>
-    <!-- A unit of measure -->
-    <string name="ft">ft</string>
     <string name="miles_per_hour">mph</string>
     <string name="hour">giờ</string>
     <string name="minute">phút</string>
@@ -553,8 +536,6 @@
     <string name="prefs_languages_information_off_link">Để biết thêm thông tin, vui lòng kiểm tra bài hướng dẫn này.</string>
     <string name="transliteration_title">Chuyển ngữ sang chữ Latinh</string>
     <string name="learn_more">Tìm hiểu thêm</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Lối ra</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Sử dụng tìm kiếm hoặc nhấn vào bản đồ để thêm điểm bắt đầu tuyến đường</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -566,7 +547,6 @@
     <string name="dialog_error_storage_title">Vấn đề truy cập ổ lưu trữ</string>
     <string name="dialog_error_storage_message">Ổ lưu trữ bên ngoài không khả dụng, có thể Thẻ SD đã bị tháo, bị hỏng hoặc hệ thống tập tin được thiết lập chỉ đọc. Hãy kiểm tra và liên hệ với chúng tôi qua support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Giả lập ổ lưu trữ hỏng</string>
-    <string name="core_entrance">Lối vào</string>
     <string name="error_enter_correct_name">Vui lòng nhập một tên chính xác</string>
     <string name="bookmark_lists">Danh sách</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -600,16 +580,12 @@
     <string name="button_layer_traffic">Giao thông</string>
     <string name="subway">Xe điện ngầm</string>
     <string name="layers_title">Kiểu và lớp bản đồ</string>
-    <string name="subway_data_unavailable">Bản đồ tàu điện ngầm không khả dụng</string>
     <string name="bookmarks_empty_list_title">Danh sách trống</string>
     <string name="bookmarks_empty_list_message">Để thêm dấu trang, hãy nhấn vào một địa điểm trên bản đồ và sau đó nhấn vào biểu tượng dấu sao</string>
     <string name="category_desc_more">…thêm</string>
     <string name="export_file">Xuất KMZ</string>
     <string name="export_file_gpx">Xuất GPX</string>
     <string name="delete_list">Xóa danh sách</string>
-    <string name="public_access">Truy cập công khai</string>
-    <string name="limited_access">Truy cập hạn chế</string>
-    <string name="not_shared">Riêng tư</string>
     <string name="speedcams_alert_title">Tăn tốc độ máy ảnh</string>
     <string name="place_description_title">Mô tả Địa điểm</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -626,7 +602,6 @@
     <string name="power_managment_setting_auto">Tự động</string>
     <string name="power_managment_setting_manual_max">Tiết kiệm năng lượng tối đa</string>
     <string name="enable_logging_warning_message">Tùy chọn này được kích hoạt để ghi nhật ký đăng nhập cho mục đích chẩn đoán. Điều này sẽ giúp nhóm chúng tôi làm rõ các vấn đề liên quan đến ứng dụng. Hãy bật tùy chọn này chỉ khi nào có yêu cầu hỗ trợ từ CoMaps.</string>
-    <string name="access_rules_author_only">Chỉnh sửa trực tuyến</string>
     <string name="driving_options_title">Thiết lập đi vòng</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Tránh đường thu phí</string>
@@ -801,10 +776,8 @@
     <!-- preference string for using auto theme only in navigation mode -->
     <string name="nav_auto">Tự động điều hướng</string>
     <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
-    <string name="gb">GB</string>
     <string name="app_site_url">https://comaps.app/</string>
     <string name="openstreetmap">OpenStreetMap</string>
-    <string name="mb">MB</string>
     <string name="telegram_url">https://t.me/CoMapsApp/</string>
     <string name="osm_wiki_about_url">https://wiki.openstreetmap.org/wiki/About_OpenStreetMap</string>
     <string name="translated_om_site_url">https://comaps.app/</string>
diff --git a/android/app/src/main/res/values-zh-rTW/strings.xml b/android/app/src/main/res/values-zh-rTW/strings.xml
index cc3d8445c..706e6571e 100644
--- a/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -14,13 +14,8 @@
     <string name="downloading">下載中…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
     <string name="kilometres">公里</string>
-    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
-    <string name="mb">MB</string>
-    <string name="gb">GB</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">英哩</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">我的位置</string>
     <!-- Update maps later button text -->
     <string name="later">以後再說</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -78,8 +73,6 @@
     <string name="bookmarks">書籤</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">書籤和軌跡</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">我的地點</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">名稱</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -94,14 +87,6 @@
     <string name="maps_storage_summary">選擇下載地圖的資料夾</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">已下載的地圖</string>
-    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">內部私人儲存</string>
-    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">內部共享儲存</string>
-    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
-    <string name="maps_storage_removable">SD 卡</string>
-    <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">外部共享儲存</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
     <string name="maps_storage_free_size">剩餘 %1$s / 總計 %2$s</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -153,8 +138,6 @@
     <string name="category_post">郵局</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">警察局</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">無線網路</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">回收</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -468,7 +451,6 @@
     <string name="empty_street_name_error">請輸入街道名稱</string>
     <string name="choose_language">選擇語言</string>
     <string name="choose_street">選擇街道</string>
-    <string name="postal_code">郵遞區號</string>
     <string name="cuisine">料理</string>
     <string name="select_cuisine">選擇料理</string>
     <!-- login text field -->
@@ -511,8 +493,6 @@
     <string name="error_enter_correct_storey_number">最多可編輯 %d 層的建築</string>
     <string name="editor_zip_code">郵遞區號</string>
     <string name="error_enter_correct_zip_code">輸入正確的郵遞區號</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">地圖點</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">OpenStreetMap 志工注意事項（可選）</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -530,16 +510,8 @@
     <string name="downloader_no_downloaded_maps_title">您尚未下載任何地圖</string>
     <string name="downloader_no_downloaded_maps_message">下載地圖來尋找位置和離線瀏覽</string>
     <string name="current_location_unknown_error_title">目前位置未知</string>
-    <!-- abbreviation for meters -->
-    <string name="m">公尺</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">公里</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">公里每小時</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">英哩</string>
-    <!-- A unit of measure -->
-    <string name="ft">英尺</string>
     <string name="miles_per_hour">英哩每小時</string>
     <string name="hour">小時</string>
     <string name="minute">分鐘</string>
@@ -599,8 +571,6 @@
     <string name="prefs_languages_information_off_link">如需瞭解更多資訊，請參閱此指南</string>
     <string name="transliteration_title">拉丁字母音譯</string>
     <string name="learn_more">瞭解更多資訊</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">退出</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">請搜尋地點或點擊地圖以新增路線起點</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -612,7 +582,6 @@
     <string name="dialog_error_storage_title">儲存空間存儲問題</string>
     <string name="dialog_error_storage_message">外部儲存空間不可用，很可能是因為 SD 卡已移除、毀損，或檔案系統處於唯讀狀態。請進行檢查，然後透過 support@comaps.app 聯絡我們</string>
     <string name="setting_emulate_bad_storage">模擬不良儲存空間</string>
-    <string name="core_entrance">入口</string>
     <string name="error_enter_correct_name">請輸入正確的名稱</string>
     <string name="bookmark_lists">列表</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -649,16 +618,12 @@
     <string name="button_layer_traffic">路況</string>
     <string name="subway">捷運</string>
     <string name="layers_title">地圖樣式和圖層</string>
-    <string name="subway_data_unavailable">捷運圖層不可用</string>
     <string name="bookmarks_empty_list_title">該列表為空</string>
     <string name="bookmarks_empty_list_message">要增加新書籤，請點擊對象卡片中的星型圖標</string>
     <string name="category_desc_more">…更多</string>
     <string name="export_file">導出為 KMZ</string>
     <string name="export_file_gpx">導出為 GPX</string>
     <string name="delete_list">刪除列表</string>
-    <string name="public_access">允許大眾進入</string>
-    <string name="limited_access">不允許進入的私人空間</string>
-    <string name="not_shared">私人</string>
     <string name="speedcams_alert_title">測速照相</string>
     <string name="place_description_title">地點說明</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -675,7 +640,6 @@
     <string name="power_managment_setting_auto">當電量低時</string>
     <string name="power_managment_setting_manual_max">最大程度省電</string>
     <string name="enable_logging_warning_message">暫時啟用此選項，以便使用“報告問題”功能在幫助對話框中記錄並手動發送詳細的診斷日誌給我們。日誌可能包含位置資訊。</string>
-    <string name="access_rules_author_only">線上編輯</string>
     <string name="driving_options_title">繞行設定</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">避開收費公路</string>
diff --git a/android/app/src/main/res/values-zh/strings.xml b/android/app/src/main/res/values-zh/strings.xml
index d918fb1b5..d85827400 100644
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -14,13 +14,8 @@
     <string name="downloading">正在下载…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
     <string name="kilometres">公里</string>
-    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
-    <string name="mb">MB</string>
-    <string name="gb">GB</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">英里</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">我的位置</string>
     <!-- Update maps later button text -->
     <string name="later">以后再说</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -78,8 +73,6 @@
     <string name="bookmarks">书签</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">书签和轨迹</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">我的地点</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">名字</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -94,14 +87,6 @@
     <string name="maps_storage_summary">选择要下载地图的文件夹</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">已下载的地图</string>
-    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">内部私人存储</string>
-    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">内部共享存储</string>
-    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
-    <string name="maps_storage_removable">SD 卡</string>
-    <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">外部共享存储</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
     <string name="maps_storage_free_size">剩余 %1$s / 总计 %2$s</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -153,8 +138,6 @@
     <string name="category_post">邮局</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">警察局</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">无线网络</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">回收</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -468,7 +451,6 @@
     <string name="empty_street_name_error">请输入街道名称</string>
     <string name="choose_language">选择语言</string>
     <string name="choose_street">选择街道</string>
-    <string name="postal_code">邮政编码</string>
     <string name="cuisine">菜肴</string>
     <string name="select_cuisine">选择菜肴</string>
     <!-- login text field -->
@@ -511,8 +493,6 @@
     <string name="error_enter_correct_storey_number">最多可编辑 %d 层的建筑</string>
     <string name="editor_zip_code">邮政编码</string>
     <string name="error_enter_correct_zip_code">输入有效的邮政编码</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">地图点</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">OpenStreetMap 志愿者须知（可选）</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -530,16 +510,8 @@
     <string name="downloader_no_downloaded_maps_title">您尚未下载任何地图</string>
     <string name="downloader_no_downloaded_maps_message">下载地图以离线搜索和导航</string>
     <string name="current_location_unknown_error_title">当前位置未知</string>
-    <!-- abbreviation for meters -->
-    <string name="m">米</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">公里</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">公里每小时</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">英里</string>
-    <!-- A unit of measure -->
-    <string name="ft">英尺</string>
     <string name="miles_per_hour">英里每小时</string>
     <string name="hour">小时</string>
     <string name="minute">分钟</string>
@@ -599,8 +571,6 @@
     <string name="prefs_languages_information_off_link">如需了解详情，请查阅此指南</string>
     <string name="transliteration_title">拉丁字母音译</string>
     <string name="learn_more">了解更多信息</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">退出</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">请搜索地点或点击地图以添加路线起点</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -612,7 +582,6 @@
     <string name="dialog_error_storage_title">存储空间访问问题</string>
     <string name="dialog_error_storage_message">外部存储空间不可用，很可能是因为 SD 卡已移除、损毁，或者文件系统为只读状态。请进行检查，然后通过 support@comaps.app 联系我们</string>
     <string name="setting_emulate_bad_storage">模拟不良存储空间</string>
-    <string name="core_entrance">入口</string>
     <string name="error_enter_correct_name">请输入正确的名称</string>
     <string name="bookmark_lists">列表</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -649,16 +618,12 @@
     <string name="button_layer_traffic">路况</string>
     <string name="subway">地铁</string>
     <string name="layers_title">地图样式和图层</string>
-    <string name="subway_data_unavailable">地铁地图不可用</string>
     <string name="bookmarks_empty_list_title">该列表为空</string>
     <string name="bookmarks_empty_list_message">要添加新书签，请点击对象卡片中的星形图标</string>
     <string name="category_desc_more">…更多</string>
     <string name="export_file">导出为 KMZ</string>
     <string name="export_file_gpx">导出为 GPX</string>
     <string name="delete_list">删除列表</string>
-    <string name="public_access">允许公众访问</string>
-    <string name="limited_access">不允许访问的私人空间</string>
-    <string name="not_shared">私人</string>
     <string name="speedcams_alert_title">限速拍照</string>
     <string name="place_description_title">地点说明</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -675,7 +640,6 @@
     <string name="power_managment_setting_auto">当电量低时</string>
     <string name="power_managment_setting_manual_max">最大程度省电</string>
     <string name="enable_logging_warning_message">临时启用此选项，以便使用“报告错误”功能在帮助对话框中记录并手动发送详细诊断日志给我们。日志可能包含位置信息。</string>
-    <string name="access_rules_author_only">在线编辑</string>
     <string name="driving_options_title">绕行设置</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">避开收费公路</string>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index 929ecd1da..fada3a08f 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -17,13 +17,8 @@
     <string name="downloading">Downloading…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
     <string name="kilometres">Kilometers</string>
-    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
-    <string name="mb">MB</string>
-    <string name="gb">GB</string>
     <!-- Choose measurement on first launch alert - choose imperial system button -->
     <string name="miles">Miles</string>
-    <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">My Position</string>
     <!-- Update maps later button text -->
     <string name="later">Later</string>
     <!-- View and button titles for accessibility, please also edit it in iphone/plist.txt -->
@@ -83,8 +78,6 @@
     <string name="bookmarks">Bookmarks</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
     <string name="bookmarks_and_tracks">Bookmarks and Tracks</string>
-    <!-- Default bookmark list name -->
-    <string name="core_my_places">My Places</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Name</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -99,14 +92,6 @@
     <string name="maps_storage_summary">Select the folder to download maps to</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Downloaded maps</string>
-    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
-    <string name="maps_storage_internal">Internal private storage</string>
-    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">Internal shared storage</string>
-    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
-    <string name="maps_storage_removable">SD card</string>
-    <!-- Generic external storage type in Maps Storage settings -->
-    <string name="maps_storage_external">External shared storage</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
     <string name="maps_storage_free_size">%1$s free of %2$s</string>
     <!-- Question dialog for transferring maps from one storage to another -->
@@ -160,8 +145,6 @@
     <string name="category_post">Post</string>
     <!-- Search category for police; any changes should be duplicated in categories.txt @category_police! -->
     <string name="category_police">Police</string>
-    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
-    <string name="category_wifi">WiFi</string>
     <!-- Search category for recycling; any changes should be duplicated in categories.txt @category_recycling! -->
     <string name="category_recycling">Recycling</string>
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
@@ -507,7 +490,6 @@
     <string name="empty_street_name_error">Please enter a street name</string>
     <string name="choose_language">Choose a language</string>
     <string name="choose_street">Choose a street</string>
-    <string name="postal_code">Postal Code</string>
     <string name="cuisine">Cuisine</string>
     <string name="select_cuisine">Select cuisine</string>
     <!-- login text field -->
@@ -552,8 +534,6 @@
     <string name="error_enter_correct_storey_number">The number of floors must non exceed %d</string>
     <string name="editor_zip_code">Postal Code</string>
     <string name="error_enter_correct_zip_code">Enter a valid postal code</string>
-    <!-- Place Page title for long tap -->
-    <string name="core_placepage_unknown_place">Map Point</string>
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Note to OpenStreetMap volunteers (optional)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
@@ -571,16 +551,8 @@
     <string name="downloader_no_downloaded_maps_title">You haven\'t downloaded any maps</string>
     <string name="downloader_no_downloaded_maps_message">Download maps to search and navigate offline</string>
     <string name="current_location_unknown_error_title">Current location is unknown</string>
-    <!-- abbreviation for meters -->
-    <string name="m">m</string>
-    <!-- abbreviation for kilometers -->
-    <string name="km">km</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/h</string>
-    <!-- abbreviation for mile(s) -->
-    <string name="mi">mi</string>
-    <!-- A unit of measure -->
-    <string name="ft">ft</string>
     <string name="miles_per_hour">mph</string>
     <string name="hour">h</string>
     <string name="minute">min</string>
@@ -648,8 +620,6 @@
     <string name="prefs_languages_information_off_link">For more information please check this guide</string>
     <string name="transliteration_title">Transliterate into Latin alphabet</string>
     <string name="learn_more">Learn more</string>
-    <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">Exit</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
     <string name="routing_add_start_point">Use search or tap on the map to add a route starting point</string>
     <!-- User selected the start of a route by pressing Route From. Now the destination of a route should be selected using search or by tapping on the map and then pressing "Route To". -->
@@ -662,7 +632,6 @@
     <string name="dialog_error_storage_title">Storage access problem</string>
     <string name="dialog_error_storage_message">External storage is not accessible. The SD card may have been removed, damaged, or the file system is read-only. Please, check your SD card or contact us at support@comaps.app</string>
     <string name="setting_emulate_bad_storage">Emulate bad storage</string>
-    <string name="core_entrance">Entrance</string>
     <string name="error_enter_correct_name">Please enter a correct name</string>
     <string name="bookmark_lists">Lists</string>
     <!-- Do not display all bookmark lists on the map -->
@@ -702,16 +671,12 @@
     <string name="button_layer_traffic">Traffic</string>
     <string name="subway">Subway</string>
     <string name="layers_title">Map Styles and Layers</string>
-    <string name="subway_data_unavailable">Subway map is unavailable</string>
     <string name="bookmarks_empty_list_title">This list is empty</string>
     <string name="bookmarks_empty_list_message">To add a bookmark, tap a place on the map and then tap the star icon</string>
     <string name="category_desc_more">…more</string>
     <string name="export_file">Export KMZ</string>
     <string name="export_file_gpx">Export GPX</string>
     <string name="delete_list">Delete list</string>
-    <string name="public_access">Public access</string>
-    <string name="limited_access">Limited access</string>
-    <string name="not_shared">Private</string>
     <string name="speedcams_alert_title">Speed cameras</string>
     <string name="place_description_title">Place Description</string>
     <!-- this text will be shown in application notification preferences opposite checkbox which enable/disable downloader notifications. Devices on Android 8+ are affected. -->
@@ -728,7 +693,6 @@
     <string name="power_managment_setting_auto">When battery is low</string>
     <string name="power_managment_setting_manual_max">Always</string>
     <string name="enable_logging_warning_message">Enable this option temporarily to record and manually send detailed diagnostic logs about your issue to us using \"Report a bug\" in the Help dialog. Logs may include location info.</string>
-    <string name="access_rules_author_only">Online editing</string>
     <string name="driving_options_title">Routing options</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Avoid tolls</string>
diff --git a/android/sdk/src/main/res/values-af/strings.xml b/android/sdk/src/main/res/values-af/strings.xml
new file mode 100644
index 000000000..999ba058f
--- /dev/null
+++ b/android/sdk/src/main/res/values-af/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">My posisie</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">My plekke</string>
+    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+    <string name="maps_storage_internal">Interne privaat berging</string>
+    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+    <string name="maps_storage_shared">Interne gedeelde berging</string>
+    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+    <string name="maps_storage_removable">SD-kaart</string>
+    <!-- Generic external storage type in Maps Storage settings -->
+    <string name="maps_storage_external">Eksterne gedeelde berging</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">Wi-Fi</string>
+    <string name="postal_code">Poskode</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">Kaartpunt</string>
+    <!-- abbreviation for meters -->
+    <string name="m">m</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">km</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">myl</string>
+    <!-- A unit of measure -->
+    <string name="ft">vt.</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Uitgang</string>
+    <string name="core_entrance">Ingang</string>
+    <string name="subway_data_unavailable">Moltreinkaart is onbeskikbaar</string>
+    <string name="public_access">Openbare toegang</string>
+    <string name="limited_access">Beperkte toegang</string>
+    <string name="not_shared">Privaat</string>
+    <string name="access_rules_author_only">Aanlyn wysiging</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-ar/strings.xml b/android/sdk/src/main/res/values-ar/strings.xml
new file mode 100644
index 000000000..5cf3964e6
--- /dev/null
+++ b/android/sdk/src/main/res/values-ar/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
+    <string name="mb">ميغابايت</string>
+    <string name="gb">غيغابايت</string>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">موقعي</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">أماكني</string>
+    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+    <string name="maps_storage_internal">وحدة التخزين الداخلية الخاصة</string>
+    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+    <string name="maps_storage_shared">وحدة التخزين الداخلية المشتركة</string>
+    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+    <string name="maps_storage_removable">بطاقة الذاكرة</string>
+    <!-- Generic external storage type in Maps Storage settings -->
+    <string name="maps_storage_external">وحدة تخزين خارجية مشتركة</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">إنترنت لا سلكي</string>
+    <string name="postal_code">الرمز البريدي</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">نقطة الخريطة</string>
+    <!-- abbreviation for meters -->
+    <string name="m">متر</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">كم</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">ميل</string>
+    <!-- A unit of measure -->
+    <string name="ft">قدم</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">خروج</string>
+    <string name="core_entrance">المدخل</string>
+    <string name="subway_data_unavailable">خريطة مترو الانفاق غير متوفرة</string>
+    <string name="public_access">مسموح الوصول لعامة الشعب</string>
+    <string name="limited_access">مسموح الوصول بشكل محدود</string>
+    <string name="not_shared">خاص</string>
+    <string name="access_rules_author_only">التعديل باستخدام الإنترنت</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-ast/strings.xml b/android/sdk/src/main/res/values-ast/strings.xml
new file mode 100644
index 000000000..fedc5670a
--- /dev/null
+++ b/android/sdk/src/main/res/values-ast/strings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="postal_code">Códigu postal</string>
+    <string name="core_my_position">La mio posición</string>
+    <string name="core_my_places">Los mios llugares</string>
+    <string name="subway_data_unavailable">El mapa del metro nun ta disponible</string>
+    <string name="public_access">Accesu públicu</string>
+    <string name="mb">MB</string>
+    <string name="km">km</string>
+    <string name="gb">GB</string>
+    <string name="m">m</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-az/strings.xml b/android/sdk/src/main/res/values-az/strings.xml
new file mode 100644
index 000000000..842bda15a
--- /dev/null
+++ b/android/sdk/src/main/res/values-az/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
+    <string name="mb">MB</string>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">Ünvanım</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">Yerlərim</string>
+    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+    <string name="maps_storage_internal">Daxili xüsusi saxlama</string>
+    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+    <string name="maps_storage_shared">Daxili paylaşılan yaddaş</string>
+    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+    <string name="maps_storage_removable">SD kart</string>
+    <!-- Generic external storage type in Maps Storage settings -->
+    <string name="maps_storage_external">Xarici paylaşılan yaddaş</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">WiFi</string>
+    <string name="postal_code">Poçt kodu</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">Xəritə Nöqtəsi</string>
+    <!-- abbreviation for meters -->
+    <string name="m">m</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">km</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">mil</string>
+    <!-- A unit of measure -->
+    <string name="ft">Addım</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Çıx</string>
+    <string name="core_entrance">Giriş</string>
+    <string name="subway_data_unavailable">Metro xəritəsi mövcud deyil</string>
+    <string name="public_access">Ictimai çıxış</string>
+    <string name="limited_access">Məhdud giriş</string>
+    <string name="not_shared">Gizli</string>
+    <string name="access_rules_author_only">Onlayn redaktə</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-be/strings.xml b/android/sdk/src/main/res/values-be/strings.xml
new file mode 100644
index 000000000..a021045bd
--- /dev/null
+++ b/android/sdk/src/main/res/values-be/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
+    <string name="mb">МБ</string>
+    <string name="gb">ГБ</string>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">Маё месцазнаходжанне</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">Мае месцы</string>
+    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+    <string name="maps_storage_internal">Унутранае прыватнае сховішча</string>
+    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+    <string name="maps_storage_shared">Унутранае агульнае сховішча</string>
+    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+    <string name="maps_storage_removable">SD-карта</string>
+    <!-- Generic external storage type in Maps Storage settings -->
+    <string name="maps_storage_external">Знешняе агульнае сховішча</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">WiFi</string>
+    <string name="postal_code">Паштовы індэкс</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">Месца на карце</string>
+    <!-- abbreviation for meters -->
+    <string name="m">м</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">км</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">міля</string>
+    <!-- A unit of measure -->
+    <string name="ft">фут</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Выхад</string>
+    <string name="core_entrance">Уваход</string>
+    <string name="subway_data_unavailable">Карта метро недаступная</string>
+    <string name="public_access">Публічны доступ</string>
+    <string name="limited_access">Абмежаваны доступ</string>
+    <string name="not_shared">Прыватны</string>
+    <string name="access_rules_author_only">Рэдагаванне анлайн</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-bg/strings.xml b/android/sdk/src/main/res/values-bg/strings.xml
new file mode 100644
index 000000000..3df9166a8
--- /dev/null
+++ b/android/sdk/src/main/res/values-bg/strings.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
+    <string name="mb">МБ</string>
+    <string name="gb">ГБ</string>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">Мое местоположение</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">Мои места</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">WiFi</string>
+    <string name="postal_code">Пощенски код</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">Точка на картата</string>
+    <!-- abbreviation for meters -->
+    <string name="m">м</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">км</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">ми</string>
+    <!-- A unit of measure -->
+    <string name="ft">фут</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Изход</string>
+    <string name="core_entrance">Вход</string>
+    <string name="subway_data_unavailable">Картата на метрото не е налична</string>
+    <string name="public_access">Публичен достъп</string>
+    <string name="limited_access">Ограничен достъп</string>
+    <string name="not_shared">Лично</string>
+    <string name="access_rules_author_only">Онлайн редактиране</string>
+    <string name="maps_storage_removable">Карта памет</string>
+    <string name="maps_storage_external">Външно споделено хранилище</string>
+    <string name="maps_storage_shared">Вътрешно споделено хранилище</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-bn/strings.xml b/android/sdk/src/main/res/values-bn/strings.xml
new file mode 100644
index 000000000..e12b2381a
--- /dev/null
+++ b/android/sdk/src/main/res/values-bn/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="core_my_position">আমার অবস্থান</string>
+    <string name="mb">এমবি</string>
+    <string name="gb">জিবি</string>
+    <string name="core_my_places">আমার স্থানগুলি</string>
+    <string name="maps_storage_internal">অভ্যন্তরীণ প্রাইভেট স্টোরেজ</string>
+    <string name="maps_storage_removable">SD কার্ড</string>
+    <string name="maps_storage_external">বহিরাগত শেয়ার্ড স্টোরেজ</string>
+    <string name="category_wifi">ওয়াইফাই</string>
+    <string name="maps_storage_shared">অভ্যন্তরীণ শেয়ার্ড স্টোরেজ</string>
+    <string name="postal_code">ডাক কোড</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-ca/strings.xml b/android/sdk/src/main/res/values-ca/strings.xml
new file mode 100644
index 000000000..ddfa3ca0b
--- /dev/null
+++ b/android/sdk/src/main/res/values-ca/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">La meva posició</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">Els meus llocs</string>
+    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+    <string name="maps_storage_internal">Emmagatzematge privat intern</string>
+    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+    <string name="maps_storage_shared">Emmagatzematge compartit intern</string>
+    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+    <string name="maps_storage_removable">Targeta SD</string>
+    <!-- Generic external storage type in Maps Storage settings -->
+    <string name="maps_storage_external">Emmagatzematge compartit extern</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">WiFi</string>
+    <string name="postal_code">Codi postal</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">Punt del mapa</string>
+    <!-- abbreviation for meters -->
+    <string name="m">m</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">km</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">mi</string>
+    <!-- A unit of measure -->
+    <string name="ft">ft</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Sortida</string>
+    <string name="core_entrance">Entrada</string>
+    <string name="subway_data_unavailable">El mapa del metro no està disponible</string>
+    <string name="public_access">Accés públic</string>
+    <string name="limited_access">Accés limitat</string>
+    <string name="not_shared">Privat</string>
+    <string name="access_rules_author_only">Edició en línia</string>
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-cs/strings.xml b/android/sdk/src/main/res/values-cs/strings.xml
new file mode 100644
index 000000000..3af3648a9
--- /dev/null
+++ b/android/sdk/src/main/res/values-cs/strings.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">Moje poloha</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">Moje místa</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">Wi-Fi</string>
+    <string name="postal_code">PSČ</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">Bod na mapě</string>
+    <!-- abbreviation for meters -->
+    <string name="m">m</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">km</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">mil</string>
+    <!-- A unit of measure -->
+    <string name="ft">stopa</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Ukončit</string>
+    <string name="core_entrance">Vstup</string>
+    <string name="subway_data_unavailable">Mapa metra není dostupná</string>
+    <string name="public_access">Veřejně přístupné</string>
+    <string name="limited_access">Soukromé</string>
+    <string name="not_shared">Osobní účet</string>
+    <string name="access_rules_author_only">Upravujte on-line</string>
+    <string name="maps_storage_removable">SD karta</string>
+    <string name="gb">GB</string>
+    <string name="mb">MB</string>
+    <string name="maps_storage_shared">Interní sdílené úložiště</string>
+    <string name="maps_storage_internal">Interní soukromé úložiště</string>
+    <string name="maps_storage_external">Externí sdílené úložiště</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-cy/strings.xml b/android/sdk/src/main/res/values-cy/strings.xml
new file mode 100644
index 000000000..d474df213
--- /dev/null
+++ b/android/sdk/src/main/res/values-cy/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+    <string name="core_my_position">Fy Lleoliad</string>
+    <string name="category_wifi">WiFi</string>
+    <string name="m">m</string>
+    <string name="mi">mi</string>
+    <string name="ft">ft</string>
+    <string name="core_exit">Allanfa</string>
+    <string name="core_entrance">Mynedfa</string>
+    <string name="not_shared">Preifat</string>
+    <string name="km">km</string>
+    <string name="core_my_places">Fy Lleoliadau</string>
+    <string name="maps_storage_removable">Cerdyn SD</string>
+    <string name="postal_code">Cod Post</string>
+    <string name="core_placepage_unknown_place">Pwynt Map</string>
+    <string name="public_access">Mynediad cyhoeddus</string>
+    <string name="limited_access">Mynediad cyfyngedig</string>
+    <string name="access_rules_author_only">Golygu ar-lein</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-da/strings.xml b/android/sdk/src/main/res/values-da/strings.xml
new file mode 100644
index 000000000..5c09ff0b4
--- /dev/null
+++ b/android/sdk/src/main/res/values-da/strings.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">Min position</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">Mine steder</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">WiFi</string>
+    <string name="postal_code">Postnummer</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">Kortpunkt</string>
+    <!-- abbreviation for meters -->
+    <string name="m">m</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">km</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">mil</string>
+    <!-- A unit of measure -->
+    <string name="ft">fod</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Udgang</string>
+    <string name="core_entrance">Indgang</string>
+    <string name="subway_data_unavailable">Kort over undergrundsbaner er ikke tilgængeligt</string>
+    <string name="public_access">Offentlig adgang</string>
+    <string name="limited_access">Begrænset adgang</string>
+    <string name="not_shared">Privat</string>
+    <string name="access_rules_author_only">Online redigering</string>
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+    <string name="maps_storage_internal">Intern privat lagerplads</string>
+    <string name="maps_storage_shared">Intern delt lagerplads</string>
+    <string name="maps_storage_removable">SD-kort</string>
+    <string name="maps_storage_external">Ekstern delt lagerplads</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-de/strings.xml b/android/sdk/src/main/res/values-de/strings.xml
new file mode 100644
index 000000000..bab1077b0
--- /dev/null
+++ b/android/sdk/src/main/res/values-de/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">Mein Standort</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">Meine Orte</string>
+    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+    <string name="maps_storage_internal">Interner persönlicher Speicher</string>
+    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+    <string name="maps_storage_shared">Interner gemeinsamer Speicher</string>
+    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+    <string name="maps_storage_removable">SD-Karte</string>
+    <!-- Generic external storage type in Maps Storage settings -->
+    <string name="maps_storage_external">Externer gemeinsamer Speicher</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">WLAN</string>
+    <string name="postal_code">Postleitzahl</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">Kartenpunkt</string>
+    <!-- abbreviation for meters -->
+    <string name="m">m</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">km</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">mi</string>
+    <!-- A unit of measure -->
+    <string name="ft">ft</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Ausgang</string>
+    <string name="core_entrance">Eingang</string>
+    <string name="subway_data_unavailable">Die U-Bahnkarte steht nicht zur Verfügung</string>
+    <string name="public_access">Öffentlicher Zugriff</string>
+    <string name="limited_access">Privater Zugriff</string>
+    <string name="not_shared">Privat</string>
+    <string name="access_rules_author_only">Online bearbeiten</string>
+    <string name="gb">GB</string>
+    <string name="mb">MB</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-el/strings.xml b/android/sdk/src/main/res/values-el/strings.xml
new file mode 100644
index 000000000..2ecc52de4
--- /dev/null
+++ b/android/sdk/src/main/res/values-el/strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="gb">GB</string>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">Η θέση μου</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">Οι τοποθεσίες μου</string>
+    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+    <string name="maps_storage_internal">Εσωτερικός κρυφός αποθηκευτικός χώρος</string>
+    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+    <string name="maps_storage_shared">Εσωτερικός κοινός αποθηκευτικός χώρος</string>
+    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+    <string name="maps_storage_removable">Κάρτα SD</string>
+    <!-- Generic external storage type in Maps Storage settings -->
+    <string name="maps_storage_external">Εξωτερικός κοινός αποθηκευτικός χώρος</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">WiFi</string>
+    <string name="postal_code">Ταχυδρομικός Κώδικας</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">Σημείο χάρτη</string>
+    <!-- abbreviation for meters -->
+    <string name="m">μ</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">χμ</string>
+    <!-- A unit of measure -->
+    <string name="ft">πόδια</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Έξοδος</string>
+    <string name="core_entrance">Είσοδος</string>
+    <string name="subway_data_unavailable">Ο χάρτης μετρό δεν είναι διαθέσιμος</string>
+    <string name="public_access">Δημόσια πρόσβαση</string>
+    <string name="limited_access">Περιορισμένη πρόσβαση</string>
+    <string name="not_shared">Ιδιωτικό</string>
+    <string name="access_rules_author_only">Online επεξεργασία</string>
+    <string name="mb">MB</string>
+    <string name="mi">μι</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-en-rGB/strings.xml b/android/sdk/src/main/res/values-en-rGB/strings.xml
new file mode 100644
index 000000000..d2544ef26
--- /dev/null
+++ b/android/sdk/src/main/res/values-en-rGB/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="postal_code">Postcode</string>
+    <string name="subway_data_unavailable">Metro map is unavailable</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-es-rMX/strings.xml b/android/sdk/src/main/res/values-es-rMX/strings.xml
new file mode 100644
index 000000000..c85b1a754
--- /dev/null
+++ b/android/sdk/src/main/res/values-es-rMX/strings.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="core_entrance">Entrada</string>
+    <string name="subway_data_unavailable">El mapa del metro no está disponible</string>
+    <string name="public_access">Acceso público</string>
+    <string name="limited_access">Acceso limitado</string>
+    <string name="not_shared">Privado</string>
+    <string name="access_rules_author_only">Se edita en línea</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-es/strings.xml b/android/sdk/src/main/res/values-es/strings.xml
new file mode 100644
index 000000000..5fd9a4e39
--- /dev/null
+++ b/android/sdk/src/main/res/values-es/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">Mi posición</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">Mis lugares</string>
+    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+    <string name="maps_storage_internal">Almacenamiento interno privado</string>
+    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+    <string name="maps_storage_shared">Almacenamiento interno compartido</string>
+    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+    <string name="maps_storage_removable">Tarjeta SD</string>
+    <!-- Generic external storage type in Maps Storage settings -->
+    <string name="maps_storage_external">Almacenamiento externo compartido</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">Wifi</string>
+    <string name="postal_code">Código postal</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">Punto del mapa</string>
+    <!-- abbreviation for meters -->
+    <string name="m">m</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">km</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">mi</string>
+    <!-- A unit of measure -->
+    <string name="ft">pie</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Salida</string>
+    <string name="core_entrance">Entrada</string>
+    <string name="subway_data_unavailable">El mapa del metro no está disponible</string>
+    <string name="public_access">Acceso público</string>
+    <string name="limited_access">Acceso limitado</string>
+    <string name="not_shared">Privado</string>
+    <string name="access_rules_author_only">Edición en línea</string>
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-et/strings.xml b/android/sdk/src/main/res/values-et/strings.xml
new file mode 100644
index 000000000..8d52680e9
--- /dev/null
+++ b/android/sdk/src/main/res/values-et/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">Minu asukoht</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">Minu kohad</string>
+    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+    <string name="maps_storage_internal">Sisemine privaatne andmeruum</string>
+    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+    <string name="maps_storage_shared">Sisemine jagatud andmeruum</string>
+    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+    <string name="maps_storage_removable">SD-kaart</string>
+    <!-- Generic external storage type in Maps Storage settings -->
+    <string name="maps_storage_external">Väline jagatud andmeruum</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">WiFi</string>
+    <string name="postal_code">Postiindeks</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">Kaardipunkt</string>
+    <!-- abbreviation for meters -->
+    <string name="m">m</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">km</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">mi</string>
+    <!-- A unit of measure -->
+    <string name="ft">jalga</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Välju</string>
+    <string name="core_entrance">Sissepääs</string>
+    <string name="subway_data_unavailable">Metrookaart ei ole saadaval</string>
+    <string name="public_access">Avalik ligipääs</string>
+    <string name="limited_access">Piiratud ligipääs</string>
+    <string name="not_shared">Privaatne</string>
+    <string name="access_rules_author_only">Võrgupõhine muutmine</string>
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-eu/strings.xml b/android/sdk/src/main/res/values-eu/strings.xml
new file mode 100644
index 000000000..633403bdc
--- /dev/null
+++ b/android/sdk/src/main/res/values-eu/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">Nire kokapena</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">Nire tokiak</string>
+    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+    <string name="maps_storage_internal">Barne biltegiratze pribatua</string>
+    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+    <string name="maps_storage_shared">Barne biltegiratze partekatua</string>
+    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+    <string name="maps_storage_removable">SD txartela</string>
+    <!-- Generic external storage type in Maps Storage settings -->
+    <string name="maps_storage_external">Kanpoko biltegiratze partekatua</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">WiFi</string>
+    <string name="postal_code">Posta kodea</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">Maparen puntua</string>
+    <!-- abbreviation for meters -->
+    <string name="m">m</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">km</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">mi</string>
+    <!-- A unit of measure -->
+    <string name="ft">oin</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Irten</string>
+    <string name="core_entrance">Sarrera</string>
+    <string name="subway_data_unavailable">Metroaren mapa ez dago erabilgarri</string>
+    <string name="public_access">Sarbide publikoa</string>
+    <string name="limited_access">Sarbide mugatua</string>
+    <string name="not_shared">Pribatua</string>
+    <string name="access_rules_author_only">Sarean editatzen</string>
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-fa/strings.xml b/android/sdk/src/main/res/values-fa/strings.xml
new file mode 100644
index 000000000..a757016f4
--- /dev/null
+++ b/android/sdk/src/main/res/values-fa/strings.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
+    <string name="mb">مگابایت</string>
+    <string name="gb">گیگابایت</string>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">مکان من</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">مکان من</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">وای فای</string>
+    <string name="postal_code">کد پستی</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">نقطه نقشه</string>
+    <!-- abbreviation for meters -->
+    <string name="m">متر</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">کیلومتر</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">مایل</string>
+    <!-- A unit of measure -->
+    <string name="ft">فوت</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">خروج</string>
+    <string name="core_entrance">ورودی</string>
+    <string name="subway_data_unavailable">نقشه مترو موجود نیست</string>
+    <string name="public_access">دسترسی عمومی</string>
+    <string name="limited_access">دسترسی محدود</string>
+    <string name="not_shared">خصوصی</string>
+    <string name="access_rules_author_only">ویرایش آنلاین</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-fi/strings.xml b/android/sdk/src/main/res/values-fi/strings.xml
new file mode 100644
index 000000000..b353b0d80
--- /dev/null
+++ b/android/sdk/src/main/res/values-fi/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
+    <string name="mb">Mt</string>
+    <string name="gb">Gt</string>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">Sijaintini</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">Paikkani</string>
+    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+    <string name="maps_storage_internal">Sisäinen yksityinen tallennustila</string>
+    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+    <string name="maps_storage_shared">Sisäinen jaettu tallennustila</string>
+    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+    <string name="maps_storage_removable">SD-kortti</string>
+    <!-- Generic external storage type in Maps Storage settings -->
+    <string name="maps_storage_external">Ulkoinen jaettu tallennustila</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">WiFi</string>
+    <string name="postal_code">Postinumero</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">Karttapiste</string>
+    <!-- abbreviation for meters -->
+    <string name="m">m</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">km</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">mi</string>
+    <!-- A unit of measure -->
+    <string name="ft">ft</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Poistu</string>
+    <string name="core_entrance">Sisäänkäynti</string>
+    <string name="subway_data_unavailable">Metrokartta ei ole saatavilla</string>
+    <string name="public_access">Julkinen pääsy</string>
+    <string name="limited_access">Rajoitettu pääsy</string>
+    <string name="not_shared">Yksityinen</string>
+    <string name="access_rules_author_only">Nettimuokkaus</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-fr/strings.xml b/android/sdk/src/main/res/values-fr/strings.xml
new file mode 100644
index 000000000..1ab32bf83
--- /dev/null
+++ b/android/sdk/src/main/res/values-fr/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
+    <string name="mb">Mo</string>
+    <string name="gb">Go</string>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">Ma position</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">Mes endroits</string>
+    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+    <string name="maps_storage_internal">Stockage interne privé</string>
+    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+    <string name="maps_storage_shared">Stockage interne partagé</string>
+    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+    <string name="maps_storage_removable">Carte SD</string>
+    <!-- Generic external storage type in Maps Storage settings -->
+    <string name="maps_storage_external">Stockage externe partagé</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">WiFi</string>
+    <string name="postal_code">Code postal</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">Point sur la carte</string>
+    <!-- abbreviation for meters -->
+    <string name="m">m</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">km</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">mi</string>
+    <!-- A unit of measure -->
+    <string name="ft">ft</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Sortie</string>
+    <string name="core_entrance">Entrée</string>
+    <string name="subway_data_unavailable">La carte du métro n\'est pas disponible</string>
+    <string name="public_access">Accès publique</string>
+    <string name="limited_access">Accès limité</string>
+    <string name="not_shared">Privé</string>
+    <string name="access_rules_author_only">Édition en ligne</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-gl/strings.xml b/android/sdk/src/main/res/values-gl/strings.xml
new file mode 100644
index 000000000..96b0d6013
--- /dev/null
+++ b/android/sdk/src/main/res/values-gl/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="core_exit">Saída</string>
+    <string name="maps_storage_internal">Almacenamento interno privado</string>
+    <string name="km">km</string>
+    <string name="core_my_places">Os meus lugares</string>
+    <string name="core_entrance">Entrada</string>
+    <string name="subway_data_unavailable">O mapa do metro non está dispoñible</string>
+    <string name="public_access">Acceso público</string>
+    <string name="limited_access">Acceso limitado</string>
+    <string name="not_shared">Privado</string>
+    <string name="gb">GB</string>
+    <string name="m">m</string>
+    <string name="core_my_position">A miña posición</string>
+    <string name="maps_storage_shared">Almacenamento interno compartido</string>
+    <string name="maps_storage_external">Almacenamento externo compartido</string>
+    <string name="postal_code">Código postal</string>
+    <string name="ft">pé</string>
+    <string name="access_rules_author_only">Edición en liña</string>
+    <string name="mi">o meu</string>
+    <string name="mb">MB</string>
+    <string name="category_wifi">Wifi</string>
+    <string name="maps_storage_removable">Tarxeta SD</string>
+    <string name="core_placepage_unknown_place">Punto do mapa</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-gsw/strings.xml b/android/sdk/src/main/res/values-gsw/strings.xml
new file mode 100644
index 000000000..970677800
--- /dev/null
+++ b/android/sdk/src/main/res/values-gsw/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+    <string name="core_my_position">Min Standort</string>
+    <string name="core_placepage_unknown_place">Chartepunkt</string>
+    <string name="m">m</string>
+    <string name="km">km</string>
+    <string name="mi">mi</string>
+    <string name="subway_data_unavailable">D U-Bahncharte staht nöd zur Verfüegig</string>
+    <string name="core_exit">Uusgang</string>
+    <string name="access_rules_author_only">Online bearbeite</string>
+    <string name="core_my_places">Miini Ort</string>
+    <string name="maps_storage_internal">Interne persönliche Speicher</string>
+    <string name="maps_storage_shared">Interne gmeinsame Speicher</string>
+    <string name="maps_storage_removable">SD-Charte</string>
+    <string name="maps_storage_external">Externe gmeinsame Speicher</string>
+    <string name="category_wifi">WLAN</string>
+    <string name="postal_code">Postleitzahl</string>
+    <string name="limited_access">Limitierte Zuegriff</string>
+    <string name="not_shared">Privat</string>
+    <string name="ft">ft</string>
+    <string name="core_entrance">Iigang</string>
+    <string name="public_access">Öffentliche Zuegriff</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-hi/strings.xml b/android/sdk/src/main/res/values-hi/strings.xml
new file mode 100644
index 000000000..c8a0fa82f
--- /dev/null
+++ b/android/sdk/src/main/res/values-hi/strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
+    <string name="mb">मेगाबाइट</string>
+    <string name="gb">गीगाबाइट</string>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">मेरा स्थान</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">मेरे स्थान</string>
+    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+    <string name="maps_storage_internal">आंतरिक निजी भंडारण</string>
+    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+    <string name="maps_storage_shared">आंतरिक साझा भंडारण</string>
+    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+    <string name="maps_storage_removable">एसडी कार्ड</string>
+    <!-- Generic external storage type in Maps Storage settings -->
+    <string name="maps_storage_external">बाह्य साझा भंडारण</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">वाईफ़ाई</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">मानचित्र बिंदु</string>
+    <!-- abbreviation for meters -->
+    <string name="m">मी</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">किमी</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-hr/strings.xml b/android/sdk/src/main/res/values-hr/strings.xml
new file mode 100644
index 000000000..a9240fa1c
--- /dev/null
+++ b/android/sdk/src/main/res/values-hr/strings.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="core_my_position">Moja lokacija</string>
+    <string name="m">m</string>
+    <string name="km">km</string>
+    <string name="core_exit">Izlaz</string>
+    <string name="not_shared">Privatno</string>
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-hu/strings.xml b/android/sdk/src/main/res/values-hu/strings.xml
new file mode 100644
index 000000000..2c9c5ab4e
--- /dev/null
+++ b/android/sdk/src/main/res/values-hu/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">Saját helyzet</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">Saját helyek</string>
+    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+    <string name="maps_storage_internal">Belső privát tárhely</string>
+    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+    <string name="maps_storage_shared">Belső közös tárhely</string>
+    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+    <string name="maps_storage_removable">SD-kártya</string>
+    <!-- Generic external storage type in Maps Storage settings -->
+    <string name="maps_storage_external">Külső közös tárhely</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">Wi-Fi</string>
+    <string name="postal_code">Irányítószám</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">Térképpont</string>
+    <!-- abbreviation for meters -->
+    <string name="m">m</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">km</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">mf</string>
+    <!-- A unit of measure -->
+    <string name="ft">láb</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Kijárat</string>
+    <string name="core_entrance">Bejárat</string>
+    <string name="subway_data_unavailable">A metrótérkép nem érhető el</string>
+    <string name="public_access">Nyilvános hozzáférés</string>
+    <string name="limited_access">Korlátozott hozzáférés</string>
+    <string name="not_shared">Privát</string>
+    <string name="access_rules_author_only">Szerkesztés online</string>
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-in/strings.xml b/android/sdk/src/main/res/values-in/strings.xml
new file mode 100644
index 000000000..0a5197af9
--- /dev/null
+++ b/android/sdk/src/main/res/values-in/strings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
+    <string name="mb">MB</string>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">Posisi Saya</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">Tempat-tempat Saya</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">WiFi</string>
+    <string name="postal_code">Kode Pos</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">Titik Peta</string>
+    <!-- abbreviation for meters -->
+    <string name="m">m</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">km</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">mil</string>
+    <!-- A unit of measure -->
+    <string name="ft">kaki</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Keluar</string>
+    <string name="core_entrance">Tempat masuk</string>
+    <string name="subway_data_unavailable">Peta bawah tanah tidak tersedia</string>
+    <string name="public_access">Akses umum</string>
+    <string name="limited_access">Akses terbatas</string>
+    <string name="not_shared">Pribadi</string>
+    <string name="access_rules_author_only">Pengeditan online</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-is/strings.xml b/android/sdk/src/main/res/values-is/strings.xml
new file mode 100644
index 000000000..f4dd81318
--- /dev/null
+++ b/android/sdk/src/main/res/values-is/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="category_wifi">WiFi</string>
+    <string name="m">m</string>
+    <string name="km">km</string>
+    <string name="mi">míl</string>
+    <string name="ft">ft</string>
+    <string name="gb">GB</string>
+    <string name="core_my_position">Staðsetning mín</string>
+    <string name="mb">MB</string>
+    <string name="core_my_places">Staðirnir mínir</string>
+    <string name="core_exit">Útgangur</string>
+    <string name="core_entrance">Inngangur</string>
+    <string name="not_shared">Einka</string>
+    <string name="postal_code">Póstnúmer</string>
+    <string name="public_access">Opinber aðgangur</string>
+    <string name="limited_access">Takmarkaður aðgangur</string>
+    <string name="maps_storage_internal">Innbyggð einkageymsla</string>
+    <string name="maps_storage_external">Ytri sameiginleg geymsla</string>
+    <string name="maps_storage_shared">Innbyggð sameiginleg geymsla</string>
+    <string name="maps_storage_removable">SD-minniskort</string>
+    <string name="core_placepage_unknown_place">Punktur á korti</string>
+    <string name="subway_data_unavailable">Kort fyrir neðanjarðarlest er ekki tiltækt</string>
+    <string name="access_rules_author_only">Breytingar á netinu</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-it/strings.xml b/android/sdk/src/main/res/values-it/strings.xml
new file mode 100644
index 000000000..dafb6afc3
--- /dev/null
+++ b/android/sdk/src/main/res/values-it/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">La mia posizione</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">I miei luoghi</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">Wi-Fi</string>
+    <string name="postal_code">Codice postale</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">Punto della mappa</string>
+    <!-- abbreviation for meters -->
+    <string name="m">m</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">km</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">mi</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Uscita</string>
+    <string name="core_entrance">Ingresso</string>
+    <string name="subway_data_unavailable">La mappa della metropolitana non è disponibile</string>
+    <string name="public_access">Accesso pubblico</string>
+    <string name="limited_access">Accesso privato</string>
+    <string name="not_shared">Personale</string>
+    <string name="access_rules_author_only">Modifica online</string>
+    <string name="ft">ft</string>
+    <string name="maps_storage_external">Memoria esterna condivisa</string>
+    <string name="maps_storage_internal">Memoria interna privata</string>
+    <string name="maps_storage_shared">Memoria interna condivisa</string>
+    <string name="maps_storage_removable">Scheda SD</string>
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-iw/strings.xml b/android/sdk/src/main/res/values-iw/strings.xml
new file mode 100644
index 000000000..3e934ab01
--- /dev/null
+++ b/android/sdk/src/main/res/values-iw/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">המיקום שלי</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">המקומות שלי</string>
+    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+    <string name="maps_storage_internal">אחסון פנימי פרטי</string>
+    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+    <string name="maps_storage_shared">אחסון פנימי משותף</string>
+    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+    <string name="maps_storage_removable">כרטיס זיכרון</string>
+    <!-- Generic external storage type in Maps Storage settings -->
+    <string name="maps_storage_external">אחסון חיצוני משותף</string>
+    <string name="postal_code">מיקוד</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">נקודת מפה</string>
+    <!-- abbreviation for meters -->
+    <string name="m">מ׳</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">ק״מ</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">מייל</string>
+    <!-- A unit of measure -->
+    <string name="ft">רגל</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">יציאה</string>
+    <string name="core_entrance">כניסה</string>
+    <string name="subway_data_unavailable">מפת רכבת תחתית לא זמינה</string>
+    <string name="public_access">גישה ציבורית</string>
+    <string name="limited_access">גישה מוגבלת</string>
+    <string name="not_shared">פרטי</string>
+    <string name="access_rules_author_only">עריכה אונליין</string>
+    <string name="gb">GB</string>
+    <string name="mb">MB</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-ja/strings.xml b/android/sdk/src/main/res/values-ja/strings.xml
new file mode 100644
index 000000000..63399ce22
--- /dev/null
+++ b/android/sdk/src/main/res/values-ja/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">現在地</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">マイロケーション</string>
+    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+    <string name="maps_storage_internal">アプリ固有のストレージ</string>
+    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+    <string name="maps_storage_shared">共有ストレージ</string>
+    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+    <string name="maps_storage_removable">SDカード</string>
+    <!-- Generic external storage type in Maps Storage settings -->
+    <string name="maps_storage_external">外部ストレージ</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">無線LAN</string>
+    <string name="postal_code">郵便番号</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">マップポイント</string>
+    <!-- abbreviation for meters -->
+    <string name="m">m</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">km</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">mi</string>
+    <!-- A unit of measure -->
+    <string name="ft">ft</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">出口</string>
+    <string name="core_entrance">入口</string>
+    <string name="subway_data_unavailable">地下鉄路線図はご利用いただけません</string>
+    <string name="public_access">パブリック・アクセス</string>
+    <string name="limited_access">制限されたアクセス</string>
+    <string name="not_shared">非公開</string>
+    <string name="access_rules_author_only">オンライン編集</string>
+    <string name="gb">GB</string>
+    <string name="mb">MB</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-ko/strings.xml b/android/sdk/src/main/res/values-ko/strings.xml
new file mode 100644
index 000000000..3b5c1dff3
--- /dev/null
+++ b/android/sdk/src/main/res/values-ko/strings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">나의 위치</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">내 장소</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">WiFi 인터넷</string>
+    <string name="postal_code">우편 번호</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">지도 지점</string>
+    <!-- abbreviation for meters -->
+    <string name="m">m</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">km</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">mi</string>
+    <!-- A unit of measure -->
+    <string name="ft">풋</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">끝내기</string>
+    <string name="core_entrance">입구</string>
+    <string name="subway_data_unavailable">지하철 지도가 가용하지 않습니다.</string>
+    <string name="public_access">일반 접근</string>
+    <string name="limited_access">제한 접근</string>
+    <string name="not_shared">개인</string>
+    <string name="access_rules_author_only">온라인 수정</string>
+    <string name="gb">GB</string>
+    <string name="mb">MB</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-lt/strings.xml b/android/sdk/src/main/res/values-lt/strings.xml
new file mode 100644
index 000000000..8028092bf
--- /dev/null
+++ b/android/sdk/src/main/res/values-lt/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">Mano vieta</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">Mano vietos</string>
+    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+    <string name="maps_storage_internal">Vidinė privati saugykla</string>
+    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+    <string name="maps_storage_shared">Vidinė bendroji saugykla</string>
+    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+    <string name="maps_storage_removable">SD kortelė</string>
+    <!-- Generic external storage type in Maps Storage settings -->
+    <string name="maps_storage_external">Išorinė bendroji saugykla</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">Belaidis ryšys</string>
+    <string name="postal_code">Pašto kodas</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">Žemėlapio taškas</string>
+    <!-- abbreviation for meters -->
+    <string name="m">m</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">km</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">myl.</string>
+    <!-- A unit of measure -->
+    <string name="ft">pėd.</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Išėjimas</string>
+    <string name="core_entrance">Įėjimas</string>
+    <string name="subway_data_unavailable">Metro žemėlapis neprieinamas</string>
+    <string name="public_access">Vieša prieiga</string>
+    <string name="limited_access">Ribota prieiga</string>
+    <string name="not_shared">Privatus</string>
+    <string name="access_rules_author_only">Taisymas internete</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-lv/strings.xml b/android/sdk/src/main/res/values-lv/strings.xml
new file mode 100644
index 000000000..eb4d41475
--- /dev/null
+++ b/android/sdk/src/main/res/values-lv/strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">Mana atrašanās vieta</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">Manas vietas</string>
+    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+    <string name="maps_storage_internal">Iekšējā privātā krātuve</string>
+    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+    <string name="maps_storage_shared">Iekšējā kopīgā krātuve</string>
+    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+    <string name="maps_storage_removable">Atmiņas karte</string>
+    <!-- Generic external storage type in Maps Storage settings -->
+    <string name="maps_storage_external">Ārējā kopīgā krātuve</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">WiFi</string>
+    <string name="postal_code">Pasta indekss</string>
+    <!-- abbreviation for meters -->
+    <string name="m">m</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">km</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">mi</string>
+    <!-- A unit of measure -->
+    <string name="ft">ft</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Izeja</string>
+    <string name="core_entrance">Ieeja</string>
+    <string name="subway_data_unavailable">Metro karte nav pieejama</string>
+    <string name="public_access">Publiska pieeja</string>
+    <string name="limited_access">Ierobežota pieeja</string>
+    <string name="not_shared">Privāts</string>
+    <string name="access_rules_author_only">Tiešsaistes rediģēšana</string>
+    <string name="core_placepage_unknown_place">Punkts kartē</string>
+    <string name="gb">GB</string>
+    <string name="mb">MB</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-mr/strings.xml b/android/sdk/src/main/res/values-mr/strings.xml
new file mode 100644
index 000000000..259f8f8af
--- /dev/null
+++ b/android/sdk/src/main/res/values-mr/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">माझे स्थान</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">माझी ठिकाणे</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">वायफाय इंटरनेट</string>
+    <string name="postal_code">पिनकोड</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">नकाशा बिंदू</string>
+    <!-- abbreviation for meters -->
+    <string name="m">m</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">किमी</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">mi</string>
+    <!-- A unit of measure -->
+    <string name="ft">फूट</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">बाहेर पडा</string>
+    <string name="core_entrance">प्रवेशद्वार</string>
+    <string name="subway_data_unavailable">मेट्रो नकाशा अनुपलब्ध आहे</string>
+    <string name="public_access">सार्वजनिक प्रवेश</string>
+    <string name="limited_access">मर्यादित प्रवेश</string>
+    <string name="not_shared">खाजगी</string>
+    <string name="access_rules_author_only">ऑनलाइन संपादन</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-mt/strings.xml b/android/sdk/src/main/res/values-mt/strings.xml
new file mode 100644
index 000000000..679f717ad
--- /dev/null
+++ b/android/sdk/src/main/res/values-mt/strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">Il-Pożizzjoni Kurrenti</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">Il-Postijiet Tiegħi</string>
+    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+    <string name="maps_storage_internal">Ħażna internali privata</string>
+    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+    <string name="maps_storage_shared">Ħażna internali maqsuma</string>
+    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+    <string name="maps_storage_removable">Karta SD</string>
+    <!-- Generic external storage type in Maps Storage settings -->
+    <string name="maps_storage_external">Ħażna esterna maqsuma</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">WiFi</string>
+    <string name="core_placepage_unknown_place">Il-Punt tal-Mappa</string>
+    <string name="core_exit">Oħroġ</string>
+    <string name="core_entrance">Daħla</string>
+    <string name="subway_data_unavailable">Il-mappa tas-subway mhix disponibbli</string>
+    <string name="postal_code">Kodiċi Postali</string>
+    <string name="limited_access">Aċċess limitat</string>
+    <string name="not_shared">Privat</string>
+    <string name="access_rules_author_only">Editjar onlajn</string>
+    <string name="public_access">Aċċess pubbliku</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-nb/strings.xml b/android/sdk/src/main/res/values-nb/strings.xml
new file mode 100644
index 000000000..b914a090e
--- /dev/null
+++ b/android/sdk/src/main/res/values-nb/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
+    <string name="mb">MB</string>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">Min posisjon</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">Mine steder</string>
+    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+    <string name="maps_storage_internal">Intern privat lagring</string>
+    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+    <string name="maps_storage_shared">Intern delt lagring</string>
+    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+    <string name="maps_storage_removable">SD-kort</string>
+    <!-- Generic external storage type in Maps Storage settings -->
+    <string name="maps_storage_external">Ekstern delt lagring</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">WiFi</string>
+    <string name="postal_code">Postnummer</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">Kartpunkt</string>
+    <!-- abbreviation for meters -->
+    <string name="m">m</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">km</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">mi</string>
+    <!-- A unit of measure -->
+    <string name="ft">fot</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Avslutt</string>
+    <string name="core_entrance">Inngang</string>
+    <string name="subway_data_unavailable">T-banekart er utilgjengelig</string>
+    <string name="public_access">Offentlig tilgang</string>
+    <string name="limited_access">Begrenset adgang</string>
+    <string name="not_shared">Privat</string>
+    <string name="access_rules_author_only">Redigering på nett</string>
+    <string name="gb">GB</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-nl/strings.xml b/android/sdk/src/main/res/values-nl/strings.xml
new file mode 100644
index 000000000..7adda9261
--- /dev/null
+++ b/android/sdk/src/main/res/values-nl/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">Mijn locatie</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">Mijn plaatsen</string>
+    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+    <string name="maps_storage_internal">Interne persoonlijke opslag</string>
+    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+    <string name="maps_storage_shared">Interne gedeelde opslag</string>
+    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+    <string name="maps_storage_removable">SD-kaart</string>
+    <!-- Generic external storage type in Maps Storage settings -->
+    <string name="maps_storage_external">Externe gedeelde opslag</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">WiFi</string>
+    <string name="postal_code">Postcode</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">Kaartpunt</string>
+    <!-- abbreviation for meters -->
+    <string name="m">m</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">km</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">mi</string>
+    <!-- A unit of measure -->
+    <string name="ft">ft</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Uitgang</string>
+    <string name="core_entrance">Ingang</string>
+    <string name="subway_data_unavailable">Metrokaart is niet beschikbaar</string>
+    <string name="public_access">Publieke toegang</string>
+    <string name="limited_access">Beperkte toegang</string>
+    <string name="not_shared">Privé</string>
+    <string name="access_rules_author_only">Wordt online bewerkt</string>
+    <string name="gb">GB</string>
+    <string name="mb">MB</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-pl/strings.xml b/android/sdk/src/main/res/values-pl/strings.xml
new file mode 100644
index 000000000..2b4fac4b8
--- /dev/null
+++ b/android/sdk/src/main/res/values-pl/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">Moje położenie</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">Moje miejsca</string>
+    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+    <string name="maps_storage_internal">Wewnętrzna pamięć prywatna</string>
+    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+    <string name="maps_storage_shared">Wewnętrzna pamięć współdzielona</string>
+    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+    <string name="maps_storage_removable">Karta SD</string>
+    <!-- Generic external storage type in Maps Storage settings -->
+    <string name="maps_storage_external">Zewnętrzna pamięć współdzielona</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">WiFi</string>
+    <string name="postal_code">Kod pocztowy</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">Punkt mapy</string>
+    <!-- abbreviation for meters -->
+    <string name="m">m</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">km</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">mi</string>
+    <!-- A unit of measure -->
+    <string name="ft">ft</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Wyjście</string>
+    <string name="core_entrance">Wejście</string>
+    <string name="subway_data_unavailable">Mapa metra jest niedostępna</string>
+    <string name="public_access">Dostęp publiczny</string>
+    <string name="limited_access">Dostęp prywatny</string>
+    <string name="not_shared">Osobisty</string>
+    <string name="access_rules_author_only">Edytowane online</string>
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-pt-rBR/strings.xml b/android/sdk/src/main/res/values-pt-rBR/strings.xml
new file mode 100644
index 000000000..29dffc7fd
--- /dev/null
+++ b/android/sdk/src/main/res/values-pt-rBR/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">Minha posição</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">Meus locais</string>
+    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+    <string name="maps_storage_internal">Armazenamento interno privado</string>
+    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+    <string name="maps_storage_shared">Armazenamento interno compartilhado</string>
+    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+    <string name="maps_storage_removable">Cartão SD</string>
+    <!-- Generic external storage type in Maps Storage settings -->
+    <string name="maps_storage_external">Armazenamento externo compartilhado</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">WiFi</string>
+    <string name="postal_code">CEP</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">Ponto do mapa</string>
+    <!-- abbreviation for meters -->
+    <string name="m">m</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">km</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">mi</string>
+    <!-- A unit of measure -->
+    <string name="ft">ft</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Saída</string>
+    <string name="core_entrance">Entrada</string>
+    <string name="subway_data_unavailable">Mapa de metrô está indisponível</string>
+    <string name="public_access">Acesso público</string>
+    <string name="limited_access">Acesso limitado</string>
+    <string name="not_shared">Privado</string>
+    <string name="access_rules_author_only">Edição online</string>
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-pt/strings.xml b/android/sdk/src/main/res/values-pt/strings.xml
new file mode 100644
index 000000000..fe83d9824
--- /dev/null
+++ b/android/sdk/src/main/res/values-pt/strings.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">A minha posição</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">Os meus locais</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">WiFi</string>
+    <string name="postal_code">Código postal</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">Ponto do mapa</string>
+    <!-- abbreviation for meters -->
+    <string name="m">m</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">Km</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">mi</string>
+    <!-- A unit of measure -->
+    <string name="ft">ft</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Saída</string>
+    <string name="core_entrance">Entrada</string>
+    <string name="subway_data_unavailable">O mapa de metropolitano não está disponível</string>
+    <string name="public_access">Acesso público</string>
+    <string name="limited_access">Acesso limitado</string>
+    <string name="not_shared">Privado</string>
+    <string name="access_rules_author_only">Edição online</string>
+    <string name="maps_storage_external">Armazenamento externo partilhado</string>
+    <string name="mb">MB</string>
+    <string name="maps_storage_internal">Armazenamento interno privado</string>
+    <string name="gb">GB</string>
+    <string name="maps_storage_shared">Armazenamento interno partilhado</string>
+    <string name="maps_storage_removable">Cartão SD</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-ro/strings.xml b/android/sdk/src/main/res/values-ro/strings.xml
new file mode 100644
index 000000000..8870784d0
--- /dev/null
+++ b/android/sdk/src/main/res/values-ro/strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">Poziția mea</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">Locurile mele</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">Wi-Fi</string>
+    <string name="postal_code">Cod poștal</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">Punct Hartă</string>
+    <!-- abbreviation for meters -->
+    <string name="m">m</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">km</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">mi</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Ieșire</string>
+    <string name="core_entrance">Intrare</string>
+    <string name="subway_data_unavailable">Harta de metrou nu este disponibilă</string>
+    <string name="public_access">Acces public</string>
+    <string name="limited_access">Acces privat</string>
+    <string name="not_shared">Personal</string>
+    <string name="access_rules_author_only">Modifică online</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-ru/strings.xml b/android/sdk/src/main/res/values-ru/strings.xml
new file mode 100644
index 000000000..cd20064d9
--- /dev/null
+++ b/android/sdk/src/main/res/values-ru/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
+    <string name="mb">МБ</string>
+    <string name="gb">ГБ</string>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">Мое местоположение</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">Мои метки</string>
+    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+    <string name="maps_storage_internal">Внутренний скрытый накопитель</string>
+    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+    <string name="maps_storage_shared">Внутренний общий накопитель</string>
+    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+    <string name="maps_storage_removable">SD-карта</string>
+    <!-- Generic external storage type in Maps Storage settings -->
+    <string name="maps_storage_external">Внешний общий накопитель</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">Wi-Fi</string>
+    <string name="postal_code">Почтовый индекс</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">Точка на карте</string>
+    <!-- abbreviation for meters -->
+    <string name="m">м</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">км</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">ми</string>
+    <!-- A unit of measure -->
+    <string name="ft">фут</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Выход</string>
+    <string name="core_entrance">Вход</string>
+    <string name="subway_data_unavailable">Карта метро недоступна</string>
+    <string name="public_access">Публичный доступ</string>
+    <string name="limited_access">Ограниченный доступ</string>
+    <string name="not_shared">Личный</string>
+    <string name="access_rules_author_only">Редактируется онлайн</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-sk/strings.xml b/android/sdk/src/main/res/values-sk/strings.xml
new file mode 100644
index 000000000..e3c5d3784
--- /dev/null
+++ b/android/sdk/src/main/res/values-sk/strings.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">Moja poloha</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">Moje miesta</string>
+    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+    <string name="maps_storage_internal">Interné privátne úložisko</string>
+    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+    <string name="maps_storage_shared">Interné zdieľané úložisko</string>
+    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+    <string name="maps_storage_removable">SD karta</string>
+    <!-- Generic external storage type in Maps Storage settings -->
+    <string name="maps_storage_external">Externé zdieľané úložisko</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">WiFi</string>
+    <string name="postal_code">PSČ</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">Bod na mape</string>
+    <!-- abbreviation for meters -->
+    <string name="m">m</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">km</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">mi</string>
+    <!-- A unit of measure -->
+    <string name="ft">stopa</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Ukončiť</string>
+    <string name="core_entrance">Vchod | vjazd</string>
+    <string name="subway_data_unavailable">Mapa metra nie je dostupná</string>
+    <string name="public_access">Verejne prístupné</string>
+    <string name="limited_access">Obmedzený prístup</string>
+    <string name="not_shared">Súkromné</string>
+    <string name="access_rules_author_only">Online úprava</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-sr/strings.xml b/android/sdk/src/main/res/values-sr/strings.xml
new file mode 100644
index 000000000..a09c3e9a9
--- /dev/null
+++ b/android/sdk/src/main/res/values-sr/strings.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">Моја позиција</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">Моја места</string>
+    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+    <string name="maps_storage_internal">Интерна приватна меморија</string>
+    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+    <string name="maps_storage_shared">Интерна дељена меморија</string>
+    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+    <string name="maps_storage_removable">СД картица</string>
+    <!-- Generic external storage type in Maps Storage settings -->
+    <string name="maps_storage_external">Екстерна дељена меморија</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">WiFi</string>
+    <string name="postal_code">Поштански број</string>
+    <!-- abbreviation for meters -->
+    <string name="m">м</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">км</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">ми</string>
+    <!-- A unit of measure -->
+    <string name="ft">стопа</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Излаз</string>
+    <string name="core_entrance">Улаз</string>
+    <string name="subway_data_unavailable">Мапа метроа не постоји</string>
+    <string name="public_access">Јавни приступ</string>
+    <string name="limited_access">Ограничен приступ</string>
+    <string name="not_shared">Приватно</string>
+    <string name="access_rules_author_only">Online измене</string>
+    <string name="gb">ГБ</string>
+    <string name="mb">МБ</string>
+    <string name="core_placepage_unknown_place">Тачка на мапи</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-sv/strings.xml b/android/sdk/src/main/res/values-sv/strings.xml
new file mode 100644
index 000000000..15c863d21
--- /dev/null
+++ b/android/sdk/src/main/res/values-sv/strings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">Min position</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">Mina Platser</string>
+    <string name="postal_code">Postkod</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">Kartpunkt</string>
+    <!-- abbreviation for meters -->
+    <string name="m">m</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">km</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">mile</string>
+    <!-- A unit of measure -->
+    <string name="ft">fot</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Avsluta</string>
+    <string name="core_entrance">Ingång</string>
+    <string name="subway_data_unavailable">Tunnelbanekartan är otillgänglig</string>
+    <string name="public_access">Allmän åtkomst</string>
+    <string name="limited_access">Privat åtkomst</string>
+    <string name="not_shared">Privat</string>
+    <string name="access_rules_author_only">Redigeras online</string>
+    <string name="category_wifi">WiFi</string>
+    <string name="maps_storage_shared">Internt, delat lagringsutrymme</string>
+    <string name="maps_storage_removable">SD-kort</string>
+    <string name="maps_storage_external">Externt, delat lagringsutrymme</string>
+    <string name="maps_storage_internal">Internt, privat lagringsutrymme</string>
+    <string name="gb">GB</string>
+    <string name="mb">MB</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-sw/strings.xml b/android/sdk/src/main/res/values-sw/strings.xml
new file mode 100644
index 000000000..618de4610
--- /dev/null
+++ b/android/sdk/src/main/res/values-sw/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Toka</string>
+    <string name="core_entrance">Kiingilio</string>
+    <string name="subway_data_unavailable">Ramani ya njia ya chini haipatikani</string>
+    <string name="public_access">Matumizi ya umma</string>
+    <string name="limited_access">Matumizi yenye ukomo</string>
+    <string name="not_shared">Faragha</string>
+    <string name="access_rules_author_only">Uhariri mtandaoni</string>
+    <string name="gb">GB</string>
+    <string name="mb">MB</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-th/strings.xml b/android/sdk/src/main/res/values-th/strings.xml
new file mode 100644
index 000000000..d27ea69a2
--- /dev/null
+++ b/android/sdk/src/main/res/values-th/strings.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
+    <string name="mb">MB</string>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">ตำแหน่งของฉัน</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">สถานที่ของฉัน</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">WiFi</string>
+    <string name="postal_code">รหัสไปรษณีย์</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">จุดแผนที่</string>
+    <!-- abbreviation for meters -->
+    <string name="m">ม.</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">กม.</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">ไมล์</string>
+    <!-- A unit of measure -->
+    <string name="ft">ฟุต</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">ออก</string>
+    <string name="core_entrance">ทางเข้า</string>
+    <string name="subway_data_unavailable">แผนที่รถไฟใต้ดินไม่พร้อมใช้งาน</string>
+    <string name="public_access">เข้าถึงได้โดยสาธารณะ</string>
+    <string name="limited_access">จำกัดการเข้าถึง</string>
+    <string name="not_shared">ส่วนตัว</string>
+    <string name="access_rules_author_only">การแก้ไขทางออนไลน์</string>
+    <string name="gb">GB</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-tr/strings.xml b/android/sdk/src/main/res/values-tr/strings.xml
new file mode 100644
index 000000000..b7c1dcc42
--- /dev/null
+++ b/android/sdk/src/main/res/values-tr/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
+    <string name="mb">MB</string>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">Konumum</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">Yerlerim</string>
+    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+    <string name="maps_storage_internal">Dahili özel depolama</string>
+    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+    <string name="maps_storage_shared">Dahili paylaşılan depolama</string>
+    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+    <string name="maps_storage_removable">SD kart</string>
+    <!-- Generic external storage type in Maps Storage settings -->
+    <string name="maps_storage_external">Harici paylaşılan depolama</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">WiFi</string>
+    <string name="postal_code">Posta kodu</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">Harita Noktası</string>
+    <!-- abbreviation for meters -->
+    <string name="m">m</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">km</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">mil</string>
+    <!-- A unit of measure -->
+    <string name="ft">fit</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Çık</string>
+    <string name="core_entrance">Giriş</string>
+    <string name="subway_data_unavailable">Metro haritası yok</string>
+    <string name="public_access">Genel erişim</string>
+    <string name="limited_access">Sınırlı erişim</string>
+    <string name="not_shared">Gizli</string>
+    <string name="access_rules_author_only">Çevrimiçi düzenleme</string>
+    <string name="gb">GB</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-uk/strings.xml b/android/sdk/src/main/res/values-uk/strings.xml
new file mode 100644
index 000000000..33ea53430
--- /dev/null
+++ b/android/sdk/src/main/res/values-uk/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
+    <string name="mb">МБ</string>
+    <string name="gb">ГБ</string>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">Моє місцезнаходження</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">Мої Мітки</string>
+    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+    <string name="maps_storage_internal">Внутрішнє приватне сховище</string>
+    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+    <string name="maps_storage_shared">Внутрішнє спільне сховище</string>
+    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+    <string name="maps_storage_removable">SD-карта</string>
+    <!-- Generic external storage type in Maps Storage settings -->
+    <string name="maps_storage_external">Зовнiшне спільне сховище</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">WiFi</string>
+    <string name="postal_code">Поштовий індекс</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">Точка на карті</string>
+    <!-- abbreviation for meters -->
+    <string name="m">м</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">км</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">ми</string>
+    <!-- A unit of measure -->
+    <string name="ft">фут</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Вихід</string>
+    <string name="core_entrance">Вхід</string>
+    <string name="subway_data_unavailable">Мапа метрополітену недоступна</string>
+    <string name="public_access">Публічний доступ</string>
+    <string name="limited_access">Приватний доступ</string>
+    <string name="not_shared">Особистий</string>
+    <string name="access_rules_author_only">Редагується онлайн</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-vi/strings.xml b/android/sdk/src/main/res/values-vi/strings.xml
new file mode 100644
index 000000000..e4aa269bd
--- /dev/null
+++ b/android/sdk/src/main/res/values-vi/strings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">Vị trí của Tôi</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">Các Địa chỉ của Tôi</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">WiFi</string>
+    <string name="postal_code">Mã bưu chính</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">Điểm bản đồ</string>
+    <!-- abbreviation for meters -->
+    <string name="m">m</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">km</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">dặm</string>
+    <!-- A unit of measure -->
+    <string name="ft">ft</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Lối ra</string>
+    <string name="core_entrance">Lối vào</string>
+    <string name="subway_data_unavailable">Bản đồ tàu điện ngầm không khả dụng</string>
+    <string name="public_access">Truy cập công khai</string>
+    <string name="limited_access">Truy cập hạn chế</string>
+    <string name="not_shared">Riêng tư</string>
+    <string name="access_rules_author_only">Chỉnh sửa trực tuyến</string>
+    <string name="gb">GB</string>
+    <string name="mb">MB</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-zh-rHK/strings.xml b/android/sdk/src/main/res/values-zh-rHK/strings.xml
new file mode 100644
index 000000000..045e125f3
--- /dev/null
+++ b/android/sdk/src/main/res/values-zh-rHK/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/android/sdk/src/main/res/values-zh-rMO/strings.xml b/android/sdk/src/main/res/values-zh-rMO/strings.xml
new file mode 100644
index 000000000..045e125f3
--- /dev/null
+++ b/android/sdk/src/main/res/values-zh-rMO/strings.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
diff --git a/android/sdk/src/main/res/values-zh-rTW/strings.xml b/android/sdk/src/main/res/values-zh-rTW/strings.xml
new file mode 100644
index 000000000..688a7a72f
--- /dev/null
+++ b/android/sdk/src/main/res/values-zh-rTW/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">我的位置</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">我的地點</string>
+    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+    <string name="maps_storage_internal">內部私人儲存</string>
+    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+    <string name="maps_storage_shared">內部共享儲存</string>
+    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+    <string name="maps_storage_removable">SD 卡</string>
+    <!-- Generic external storage type in Maps Storage settings -->
+    <string name="maps_storage_external">外部共享儲存</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">無線網路</string>
+    <string name="postal_code">郵遞區號</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">地圖點</string>
+    <!-- abbreviation for meters -->
+    <string name="m">公尺</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">公里</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">英哩</string>
+    <!-- A unit of measure -->
+    <string name="ft">英尺</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">退出</string>
+    <string name="core_entrance">入口</string>
+    <string name="subway_data_unavailable">捷運圖層不可用</string>
+    <string name="public_access">允許大眾進入</string>
+    <string name="limited_access">不允許進入的私人空間</string>
+    <string name="not_shared">私人</string>
+    <string name="access_rules_author_only">線上編輯</string>
+</resources>
diff --git a/android/sdk/src/main/res/values-zh/strings.xml b/android/sdk/src/main/res/values-zh/strings.xml
new file mode 100644
index 000000000..278b32f73
--- /dev/null
+++ b/android/sdk/src/main/res/values-zh/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">我的位置</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">我的地点</string>
+    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+    <string name="maps_storage_internal">内部私人存储</string>
+    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+    <string name="maps_storage_shared">内部共享存储</string>
+    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+    <string name="maps_storage_removable">SD 卡</string>
+    <!-- Generic external storage type in Maps Storage settings -->
+    <string name="maps_storage_external">外部共享存储</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">无线网络</string>
+    <string name="postal_code">邮政编码</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">地图点</string>
+    <!-- abbreviation for meters -->
+    <string name="m">米</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">公里</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">英里</string>
+    <!-- A unit of measure -->
+    <string name="ft">英尺</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">退出</string>
+    <string name="core_entrance">入口</string>
+    <string name="subway_data_unavailable">地铁地图不可用</string>
+    <string name="public_access">允许公众访问</string>
+    <string name="limited_access">不允许访问的私人空间</string>
+    <string name="not_shared">私人</string>
+    <string name="access_rules_author_only">在线编辑</string>
+</resources>
diff --git a/android/sdk/src/main/res/values/strings.xml b/android/sdk/src/main/res/values/strings.xml
new file mode 100644
index 000000000..0f0dd45ff
--- /dev/null
+++ b/android/sdk/src/main/res/values/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Settings/Downloader - size string, only strings different from English should be translated -->
+    <string name="mb">MB</string>
+    <string name="gb">GB</string>
+    <!-- A text for current gps location point/arrow selected on the map -->
+    <string name="core_my_position">My Position</string>
+    <!-- Default bookmark list name -->
+    <string name="core_my_places">My Places</string>
+    <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
+    <string name="maps_storage_internal">Internal private storage</string>
+    <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
+    <string name="maps_storage_shared">Internal shared storage</string>
+    <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
+    <string name="maps_storage_removable">SD card</string>
+    <!-- Generic external storage type in Maps Storage settings -->
+    <string name="maps_storage_external">External shared storage</string>
+    <!-- Search category for WiFi access; any changes should be duplicated in categories.txt @category_wifi! -->
+    <string name="category_wifi">WiFi</string>
+    <string name="postal_code">Postal Code</string>
+    <!-- Place Page title for long tap -->
+    <string name="core_placepage_unknown_place">Map Point</string>
+    <!-- abbreviation for meters -->
+    <string name="m">m</string>
+    <!-- abbreviation for kilometers -->
+    <string name="km">km</string>
+    <!-- abbreviation for mile(s) -->
+    <string name="mi">mi</string>
+    <!-- A unit of measure -->
+    <string name="ft">ft</string>
+    <!-- Subway exits for public transport marks on the map -->
+    <string name="core_exit">Exit</string>
+    <string name="core_entrance">Entrance</string>
+    <string name="subway_data_unavailable">Subway map is unavailable</string>
+    <string name="public_access">Public access</string>
+    <string name="limited_access">Limited access</string>
+    <string name="not_shared">Private</string>
+    <string name="access_rules_author_only">Online editing</string>
+</resources>

From c9a261dee5d7a61f73234ec77cf4001d6c9c34ff Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Sat, 23 Aug 2025 20:49:49 +0700
Subject: [PATCH 229/302] [android][sdk] Move OhState to SDK

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 .../app/organicmaps/widget/placepage/PlacePageView.java   | 2 +-
 .../main/cpp/app/organicmaps/sdk/editor/OpeningHours.cpp  | 8 ++++----
 .../main/java/app/organicmaps/sdk}/editor/OhState.java    | 2 +-
 .../java/app/organicmaps/sdk/editor/OpeningHours.java     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename android/{app/src/main/java/app/organicmaps => sdk/src/main/java/app/organicmaps/sdk}/editor/OhState.java (93%)

diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
index 9c546637a..8a26b4cd1 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
@@ -38,7 +38,6 @@ import app.organicmaps.bookmarks.BookmarksSharingHelper;
 import app.organicmaps.bookmarks.ChooseBookmarkCategoryFragment;
 import app.organicmaps.downloader.DownloaderStatusIcon;
 import app.organicmaps.downloader.MapManagerHelper;
-import app.organicmaps.editor.OhState;
 import app.organicmaps.sdk.Framework;
 import app.organicmaps.sdk.bookmarks.data.Bookmark;
 import app.organicmaps.sdk.bookmarks.data.BookmarkCategory;
@@ -54,6 +53,7 @@ import app.organicmaps.sdk.bookmarks.data.Track;
 import app.organicmaps.sdk.downloader.CountryItem;
 import app.organicmaps.sdk.downloader.MapManager;
 import app.organicmaps.sdk.editor.Editor;
+import app.organicmaps.sdk.editor.OhState;
 import app.organicmaps.sdk.editor.OpeningHours;
 import app.organicmaps.sdk.editor.data.HoursMinutes;
 import app.organicmaps.sdk.editor.data.Timetable;
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/OpeningHours.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/OpeningHours.cpp
index c06d332d8..c6b5f98b3 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/OpeningHours.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/OpeningHours.cpp
@@ -317,16 +317,16 @@ JNIEXPORT jobject JNICALL Java_app_organicmaps_sdk_editor_OpeningHours_nativeCur
 
   /// @todo We should check closed/open time for specific feature's timezone.
   OpeningHours::InfoT ohInfo = MakeOpeningHours(tts).GetInfo(now);
-  jclass ohStateClass = jni::GetGlobalClassRef(env, "app/organicmaps/editor/OhState");
-  jclass ruleStateClass = jni::GetGlobalClassRef(env, "app/organicmaps/editor/OhState$State");
+  jclass ohStateClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/editor/OhState");
+  jclass ruleStateClass = jni::GetGlobalClassRef(env, "app/organicmaps/sdk/editor/OhState$State");
 
   static std::unordered_map<RuleState, char const *> const ruleState = {
       {RuleState::Open, "Open"}, {RuleState::Closed, "Closed"}, {RuleState::Unknown, "Unknown"}};
 
   jfieldID stateField =
-      env->GetStaticFieldID(ruleStateClass, ruleState.at(ohInfo.state), "Lapp/organicmaps/editor/OhState$State;");
+      env->GetStaticFieldID(ruleStateClass, ruleState.at(ohInfo.state), "Lapp/organicmaps/sdk/editor/OhState$State;");
   jobject stateObj = env->GetStaticObjectField(ruleStateClass, stateField);
-  jmethodID constructor = env->GetMethodID(ohStateClass, "<init>", "(Lapp/organicmaps/editor/OhState$State;JJ)V");
+  jmethodID constructor = env->GetMethodID(ohStateClass, "<init>", "(Lapp/organicmaps/sdk/editor/OhState$State;JJ)V");
   jobject javaOhState =
       env->NewObject(ohStateClass, constructor, stateObj, (jlong)ohInfo.nextTimeOpen, (jlong)ohInfo.nextTimeClosed);
 
diff --git a/android/app/src/main/java/app/organicmaps/editor/OhState.java b/android/sdk/src/main/java/app/organicmaps/sdk/editor/OhState.java
similarity index 93%
rename from android/app/src/main/java/app/organicmaps/editor/OhState.java
rename to android/sdk/src/main/java/app/organicmaps/sdk/editor/OhState.java
index e957d9523..9059ba265 100644
--- a/android/app/src/main/java/app/organicmaps/editor/OhState.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/editor/OhState.java
@@ -1,4 +1,4 @@
-package app.organicmaps.editor;
+package app.organicmaps.sdk.editor;
 
 import androidx.annotation.Keep;
 
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java b/android/sdk/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java
index 511839c48..528d2fb82 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/editor/OpeningHours.java
@@ -3,7 +3,7 @@ package app.organicmaps.sdk.editor;
 import androidx.annotation.IntRange;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import app.organicmaps.editor.OhState;
+import app.organicmaps.sdk.editor.OhState;
 import app.organicmaps.sdk.editor.data.Timespan;
 import app.organicmaps.sdk.editor.data.Timetable;
 

From 3e9b507acdfcb15d2be142546997e242f591311e Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Sat, 23 Aug 2025 20:51:24 +0700
Subject: [PATCH 230/302] [android][sdk] Move transport type drawables to SDK

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 .../app/organicmaps/routing/RoutingPlanController.java    | 2 +-
 .../java/app/organicmaps/sdk/routing/TransitStepType.java | 8 ++++----
 .../src/main/res/drawable/ic_route_planning_metro.xml     | 0
 .../main/res/drawable/ic_route_planning_metro_40px.xml    | 0
 .../src/main/res/drawable/ic_route_planning_monorail.xml  | 0
 .../src/main/res/drawable/ic_route_planning_train.xml     | 0
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename android/{app => sdk}/src/main/res/drawable/ic_route_planning_metro.xml (100%)
 rename android/{app => sdk}/src/main/res/drawable/ic_route_planning_metro_40px.xml (100%)
 rename android/{app => sdk}/src/main/res/drawable/ic_route_planning_monorail.xml (100%)
 rename android/{app => sdk}/src/main/res/drawable/ic_route_planning_train.xml (100%)

diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java
index 66bd33ca4..377bbd33b 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java
@@ -141,7 +141,7 @@ public class RoutingPlanController extends ToolbarController
     setupRouterButton(R.id.vehicle, R.drawable.ic_car, this::onVehicleModeSelected);
     setupRouterButton(R.id.pedestrian, R.drawable.ic_pedestrian, this::onPedestrianModeSelected);
     //    setupRouterButton(R.id.taxi, R.drawable.ic_taxi, this::onTaxiModeSelected);
-    setupRouterButton(R.id.transit, R.drawable.ic_route_planning_metro_40px, this::onTransitModeSelected);
+    setupRouterButton(R.id.transit, app.organicmaps.sdk.R.drawable.ic_route_planning_metro_40px, this::onTransitModeSelected);
     setupRouterButton(R.id.bicycle, R.drawable.ic_bike, this::onBicycleModeSelected);
     setupRouterButton(R.id.ruler, app.organicmaps.sdk.R.drawable.ic_ruler_route, this::onRulerModeSelected);
   }
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/routing/TransitStepType.java b/android/sdk/src/main/java/app/organicmaps/sdk/routing/TransitStepType.java
index fb5b41b82..521adfabf 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/routing/TransitStepType.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/routing/TransitStepType.java
@@ -8,10 +8,10 @@ public enum TransitStepType
   // A specific icon for different intermediate points is calculated dynamically in TransitStepView.
   INTERMEDIATE_POINT(R.drawable.ic_20px_route_planning_walk),
   PEDESTRIAN(R.drawable.ic_20px_route_planning_walk),
-  SUBWAY(app.organicmaps.R.drawable.ic_route_planning_metro),
-  TRAIN(app.organicmaps.R.drawable.ic_route_planning_train),
-  LIGHT_RAIL(app.organicmaps.R.drawable.ic_route_planning_train),
-  MONORAIL(app.organicmaps.R.drawable.ic_route_planning_monorail),
+  SUBWAY(R.drawable.ic_route_planning_metro),
+  TRAIN(R.drawable.ic_route_planning_train),
+  LIGHT_RAIL(R.drawable.ic_route_planning_train),
+  MONORAIL(R.drawable.ic_route_planning_monorail),
   RULER(R.drawable.ic_ruler_route);
 
   @DrawableRes
diff --git a/android/app/src/main/res/drawable/ic_route_planning_metro.xml b/android/sdk/src/main/res/drawable/ic_route_planning_metro.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_route_planning_metro.xml
rename to android/sdk/src/main/res/drawable/ic_route_planning_metro.xml
diff --git a/android/app/src/main/res/drawable/ic_route_planning_metro_40px.xml b/android/sdk/src/main/res/drawable/ic_route_planning_metro_40px.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_route_planning_metro_40px.xml
rename to android/sdk/src/main/res/drawable/ic_route_planning_metro_40px.xml
diff --git a/android/app/src/main/res/drawable/ic_route_planning_monorail.xml b/android/sdk/src/main/res/drawable/ic_route_planning_monorail.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_route_planning_monorail.xml
rename to android/sdk/src/main/res/drawable/ic_route_planning_monorail.xml
diff --git a/android/app/src/main/res/drawable/ic_route_planning_train.xml b/android/sdk/src/main/res/drawable/ic_route_planning_train.xml
similarity index 100%
rename from android/app/src/main/res/drawable/ic_route_planning_train.xml
rename to android/sdk/src/main/res/drawable/ic_route_planning_train.xml

From 58cb8ecd9d1bcf693777d7a0a00a32526a86e040 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Sat, 23 Aug 2025 20:52:30 +0700
Subject: [PATCH 231/302] [android] Fix BackupUtils deps

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 .../main/java/app/organicmaps/backup/BackupUtils.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/backup/BackupUtils.java b/android/app/src/main/java/app/organicmaps/backup/BackupUtils.java
index 91e814e81..5da04b826 100644
--- a/android/app/src/main/java/app/organicmaps/backup/BackupUtils.java
+++ b/android/app/src/main/java/app/organicmaps/backup/BackupUtils.java
@@ -1,6 +1,7 @@
 package app.organicmaps.backup;
 
 import static app.organicmaps.sdk.util.StorageUtils.isFolderWritable;
+import static app.organicmaps.sdk.util.Utils.dimen;
 import static app.organicmaps.settings.BackupSettingsFragment.MAX_BACKUPS_DEFAULT_COUNT;
 import static app.organicmaps.settings.BackupSettingsFragment.MAX_BACKUPS_KEY;
 
@@ -15,8 +16,8 @@ import android.text.style.AbsoluteSizeSpan;
 import androidx.annotation.NonNull;
 import androidx.documentfile.provider.DocumentFile;
 import app.organicmaps.R;
-import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.sdk.util.log.Logger;
+import app.organicmaps.util.UiUtils;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -50,14 +51,14 @@ public class BackupUtils
 
     String volumeName;
     if ("primary".equalsIgnoreCase(volumeId))
-      volumeName = context.getString(R.string.maps_storage_shared);
+      volumeName = context.getString(app.organicmaps.sdk.R.string.maps_storage_shared);
     else
-      volumeName = context.getString(R.string.maps_storage_removable);
+      volumeName = context.getString(app.organicmaps.sdk.R.string.maps_storage_removable);
 
     SpannableStringBuilder sb = new SpannableStringBuilder();
-    sb.append(volumeName + ": \n", new AbsoluteSizeSpan(UiUtils.dimen(context, R.dimen.text_size_body_3)),
+    sb.append(volumeName + ": \n", new AbsoluteSizeSpan(dimen(context, R.dimen.text_size_body_3)),
               Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-    sb.append("/" + subPath, new AbsoluteSizeSpan(UiUtils.dimen(context, R.dimen.text_size_body_4)),
+    sb.append("/" + subPath, new AbsoluteSizeSpan(dimen(context, R.dimen.text_size_body_4)),
               Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
     return sb;
   }

From 3d450433e7df7e8d694fa69a3771325b71b05595 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Sat, 23 Aug 2025 21:01:23 +0700
Subject: [PATCH 232/302] [android][sdk] Move rest of types_strings.xml

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 android/{app => sdk}/src/main/res/values-bn/types_strings.xml  | 0
 android/{app => sdk}/src/main/res/values-gsw/types_strings.xml | 0
 android/{app => sdk}/src/main/res/values-hr/types_strings.xml  | 0
 android/{app => sdk}/src/main/res/values-ml/types_strings.xml  | 0
 android/{app => sdk}/src/main/res/values-sq/types_strings.xml  | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename android/{app => sdk}/src/main/res/values-bn/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-gsw/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-hr/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-ml/types_strings.xml (100%)
 rename android/{app => sdk}/src/main/res/values-sq/types_strings.xml (100%)

diff --git a/android/app/src/main/res/values-bn/types_strings.xml b/android/sdk/src/main/res/values-bn/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-bn/types_strings.xml
rename to android/sdk/src/main/res/values-bn/types_strings.xml
diff --git a/android/app/src/main/res/values-gsw/types_strings.xml b/android/sdk/src/main/res/values-gsw/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-gsw/types_strings.xml
rename to android/sdk/src/main/res/values-gsw/types_strings.xml
diff --git a/android/app/src/main/res/values-hr/types_strings.xml b/android/sdk/src/main/res/values-hr/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-hr/types_strings.xml
rename to android/sdk/src/main/res/values-hr/types_strings.xml
diff --git a/android/app/src/main/res/values-ml/types_strings.xml b/android/sdk/src/main/res/values-ml/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-ml/types_strings.xml
rename to android/sdk/src/main/res/values-ml/types_strings.xml
diff --git a/android/app/src/main/res/values-sq/types_strings.xml b/android/sdk/src/main/res/values-sq/types_strings.xml
similarity index 100%
rename from android/app/src/main/res/values-sq/types_strings.xml
rename to android/sdk/src/main/res/values-sq/types_strings.xml

From 008387b0cfa51bff1eac741eb3e1d76e9f62d46c Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Sat, 23 Aug 2025 21:54:20 +0700
Subject: [PATCH 233/302] [android] Reformat code with clang-format

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 .../main/java/app/organicmaps/editor/EditorFragment.java    | 3 ++-
 .../src/main/java/app/organicmaps/help/HelpFragment.java    | 6 ++----
 .../organicmaps/routing/BaseRoutingErrorDialogFragment.java | 1 -
 .../java/app/organicmaps/routing/RoutingPlanController.java | 3 ++-
 .../sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp  | 4 ++--
 .../src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java  | 5 +----
 .../java/app/organicmaps/sdk/location/LocationHelper.java   | 3 ++-
 .../src/main/java/app/organicmaps/sdk/maplayer/Mode.java    | 2 +-
 .../app/organicmaps/sdk/settings/StoragePathManager.java    | 2 +-
 .../main/java/app/organicmaps/sdk/util/log/LogsManager.java | 2 +-
 10 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
index ed2ded212..5fdad226d 100644
--- a/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
+++ b/android/app/src/main/java/app/organicmaps/editor/EditorFragment.java
@@ -287,7 +287,8 @@ public class EditorFragment extends BaseMwmFragment implements View.OnClickListe
     return validateNames();
   }
 
-  private boolean beforeSavingValidation() {
+  private boolean beforeSavingValidation()
+  {
     // Validation to make sure address features have a house number
     if (!Editor.nativeCheckHouseNumberWhenIsAddress())
     {
diff --git a/android/app/src/main/java/app/organicmaps/help/HelpFragment.java b/android/app/src/main/java/app/organicmaps/help/HelpFragment.java
index 4b43c0155..c66075277 100644
--- a/android/app/src/main/java/app/organicmaps/help/HelpFragment.java
+++ b/android/app/src/main/java/app/organicmaps/help/HelpFragment.java
@@ -13,10 +13,6 @@ import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.view.ViewCompat;
-
-import com.google.android.material.button.MaterialButton;
-import com.google.android.material.textview.MaterialTextView;
-
 import app.organicmaps.BuildConfig;
 import app.organicmaps.R;
 import app.organicmaps.base.BaseMwmFragment;
@@ -28,6 +24,8 @@ import app.organicmaps.util.Graphics;
 import app.organicmaps.util.SharingUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils.ScrollableContentInsetsListener;
+import com.google.android.material.button.MaterialButton;
+import com.google.android.material.textview.MaterialTextView;
 
 public class HelpFragment extends BaseMwmFragment implements View.OnClickListener
 {
diff --git a/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java b/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java
index 5332bb323..2dce832a6 100644
--- a/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java
+++ b/android/app/src/main/java/app/organicmaps/routing/BaseRoutingErrorDialogFragment.java
@@ -12,7 +12,6 @@ import android.widget.ExpandableListView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AlertDialog;
 import androidx.core.content.ContextCompat;
-
 import app.organicmaps.R;
 import app.organicmaps.adapter.DisabledChildSimpleExpandableListAdapter;
 import app.organicmaps.base.BaseMwmDialogFragment;
diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java
index 377bbd33b..926bb34ae 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingPlanController.java
@@ -141,7 +141,8 @@ public class RoutingPlanController extends ToolbarController
     setupRouterButton(R.id.vehicle, R.drawable.ic_car, this::onVehicleModeSelected);
     setupRouterButton(R.id.pedestrian, R.drawable.ic_pedestrian, this::onPedestrianModeSelected);
     //    setupRouterButton(R.id.taxi, R.drawable.ic_taxi, this::onTaxiModeSelected);
-    setupRouterButton(R.id.transit, app.organicmaps.sdk.R.drawable.ic_route_planning_metro_40px, this::onTransitModeSelected);
+    setupRouterButton(R.id.transit, app.organicmaps.sdk.R.drawable.ic_route_planning_metro_40px,
+                      this::onTransitModeSelected);
     setupRouterButton(R.id.bicycle, R.drawable.ic_bike, this::onBicycleModeSelected);
     setupRouterButton(R.id.ruler, app.organicmaps.sdk.R.drawable.ic_ruler_route, this::onRulerModeSelected);
   }
diff --git a/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp b/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp
index e3c938785..6c3f573b4 100644
--- a/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp
+++ b/android/sdk/src/main/cpp/app/organicmaps/sdk/editor/Editor.cpp
@@ -493,8 +493,8 @@ JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeIsHouseV
   return osm::EditableMapObject::ValidateHouseNumber(jni::ToNativeString(env, houseNumber));
 }
 
-JNIEXPORT jboolean JNICALL
-Java_app_organicmaps_sdk_editor_Editor_nativeCheckHouseNumberWhenIsAddress(JNIEnv * env, jclass clazz)
+JNIEXPORT jboolean JNICALL Java_app_organicmaps_sdk_editor_Editor_nativeCheckHouseNumberWhenIsAddress(JNIEnv * env,
+                                                                                                      jclass clazz)
 {
   return g_editableMapObject.CheckHouseNumberWhenIsAddress();
 }
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java b/android/sdk/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java
index da79f6b3e..6e582bd9c 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/editor/OsmOAuth.java
@@ -68,10 +68,7 @@ public final class OsmOAuth
 
   public static void clearAuthorization()
   {
-    mPrefs.edit()
-        .remove(PREF_OSM_USERNAME)
-        .remove(PREF_OSM_OAUTH2_TOKEN)
-        .apply();
+    mPrefs.edit().remove(PREF_OSM_USERNAME).remove(PREF_OSM_OAUTH2_TOKEN).apply();
   }
 
   @NonNull
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationHelper.java b/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationHelper.java
index ac47b448e..01328eed8 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationHelper.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationHelper.java
@@ -96,7 +96,8 @@ public class LocationHelper implements BaseLocationProvider.Listener
     }
   };
 
-  public LocationHelper(@NonNull Context context, @NonNull SensorHelper sensorHelper, @NonNull LocationProviderFactory locationProviderFactory)
+  public LocationHelper(@NonNull Context context, @NonNull SensorHelper sensorHelper,
+                        @NonNull LocationProviderFactory locationProviderFactory)
   {
     mContext = context;
     mSensorHelper = sensorHelper;
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/Mode.java b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/Mode.java
index 77023479a..53a7b9446 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/Mode.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/maplayer/Mode.java
@@ -2,8 +2,8 @@ package app.organicmaps.sdk.maplayer;
 
 import android.content.Context;
 import androidx.annotation.NonNull;
-import app.organicmaps.sdk.R;
 import app.organicmaps.sdk.Framework;
+import app.organicmaps.sdk.R;
 import app.organicmaps.sdk.maplayer.isolines.IsolinesManager;
 import app.organicmaps.sdk.maplayer.subway.SubwayManager;
 import app.organicmaps.sdk.maplayer.traffic.TrafficManager;
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/settings/StoragePathManager.java b/android/sdk/src/main/java/app/organicmaps/sdk/settings/StoragePathManager.java
index 0eb5bf3bf..99b926330 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/settings/StoragePathManager.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/settings/StoragePathManager.java
@@ -11,8 +11,8 @@ import android.os.storage.StorageVolume;
 import android.text.TextUtils;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import app.organicmaps.sdk.R;
 import app.organicmaps.sdk.Framework;
+import app.organicmaps.sdk.R;
 import app.organicmaps.sdk.downloader.MapManager;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.StorageUtils;
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java
index 64a1e1c0a..065feec5a 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/log/LogsManager.java
@@ -16,8 +16,8 @@ import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.content.ContextCompat;
-import app.organicmaps.sdk.R;
 import app.organicmaps.sdk.BuildConfig;
+import app.organicmaps.sdk.R;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.ROMUtils;
 import app.organicmaps.sdk.util.StringUtils;

From c3d8f948ce16486680acd5c1717ee991400804bd Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Fri, 22 Aug 2025 20:16:49 +0200
Subject: [PATCH 234/302] [android] Migrate NavMenu to Material components

Signed-off-by: jeanbaptisteC <jeanbaptiste.charron@outlook.fr>
---
 .../src/main/java/app/organicmaps/util/UiUtils.java  |  8 --------
 .../java/app/organicmaps/widget/menu/NavMenu.java    | 11 +++++------
 android/app/src/main/res/drawable/button_red.xml     | 10 ----------
 .../src/main/res/drawable/button_red_disabled.xml    |  6 ------
 .../app/src/main/res/drawable/button_red_normal.xml  |  6 ------
 .../app/src/main/res/drawable/button_red_pressed.xml |  6 ------
 .../app/src/main/res/layout/layout_nav_bottom.xml    | 12 ++++++------
 android/app/src/main/res/values-night/themes.xml     |  4 ----
 android/app/src/main/res/values/colors.xml           |  6 +-----
 android/app/src/main/res/values/dimens.xml           |  2 +-
 android/app/src/main/res/values/themes-attrs.xml     |  3 ---
 android/app/src/main/res/values/themes.xml           |  4 ----
 12 files changed, 13 insertions(+), 65 deletions(-)
 delete mode 100644 android/app/src/main/res/drawable/button_red.xml
 delete mode 100644 android/app/src/main/res/drawable/button_red_disabled.xml
 delete mode 100644 android/app/src/main/res/drawable/button_red_normal.xml
 delete mode 100644 android/app/src/main/res/drawable/button_red_pressed.xml

diff --git a/android/app/src/main/java/app/organicmaps/util/UiUtils.java b/android/app/src/main/java/app/organicmaps/util/UiUtils.java
index 50c57194a..762973c37 100644
--- a/android/app/src/main/java/app/organicmaps/util/UiUtils.java
+++ b/android/app/src/main/java/app/organicmaps/util/UiUtils.java
@@ -16,7 +16,6 @@ import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.view.Window;
 import android.view.WindowManager;
-import android.widget.Button;
 import android.widget.TextView;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.annotation.AnyRes;
@@ -208,13 +207,6 @@ public final class UiUtils
     windowManager.getDefaultDisplay().getRealMetrics(metrics);
     return metrics.heightPixels;
   }
-
-  public static void updateRedButton(Button button)
-  {
-    button.setTextColor(ThemeUtils.getColor(
-        button.getContext(), button.isEnabled() ? R.attr.redButtonTextColor : R.attr.redButtonTextColorDisabled));
-  }
-
   public static void setInputError(@NonNull TextInputLayout layout, @StringRes int error)
   {
     setInputError(layout, error == 0 ? null : layout.getContext().getString(error));
diff --git a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
index d876d2628..ac0fff620 100644
--- a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
+++ b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
@@ -3,8 +3,6 @@ package app.organicmaps.widget.menu;
 import android.location.Location;
 import android.util.Pair;
 import android.view.View;
-import android.widget.Button;
-import android.widget.ImageView;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.ContextCompat;
@@ -17,6 +15,8 @@ import app.organicmaps.util.Graphics;
 import app.organicmaps.util.ThemeUtils;
 import app.organicmaps.util.UiUtils;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
+import com.google.android.material.button.MaterialButton;
+import com.google.android.material.imageview.ShapeableImageView;
 import com.google.android.material.progressindicator.LinearProgressIndicator;
 import com.google.android.material.textview.MaterialTextView;
 import java.time.LocalTime;
@@ -29,7 +29,7 @@ public class NavMenu
   private final View mBottomSheetBackground;
   private final View mHeaderFrame;
 
-  private final ImageView mTts;
+  private final ShapeableImageView mTts;
   private final View mSpeedViewContainer;
   private final MaterialTextView mSpeedValue;
   private final MaterialTextView mSpeedUnits;
@@ -105,13 +105,12 @@ public class NavMenu
     mRouteProgress = bottomFrame.findViewById(R.id.navigation_progress);
 
     // Bottom frame buttons
-    ImageView mSettings = bottomFrame.findViewById(R.id.settings);
+    ShapeableImageView mSettings = bottomFrame.findViewById(R.id.settings);
     mSettings.setOnClickListener(v -> onSettingsClicked());
     mTts = bottomFrame.findViewById(R.id.tts_volume);
     mTts.setOnClickListener(v -> onTtsClicked());
-    Button stop = bottomFrame.findViewById(R.id.stop);
+    MaterialButton stop = bottomFrame.findViewById(R.id.stop);
     stop.setOnClickListener(v -> onStopClicked());
-    UiUtils.updateRedButton(stop);
   }
 
   private void onStopClicked()
diff --git a/android/app/src/main/res/drawable/button_red.xml b/android/app/src/main/res/drawable/button_red.xml
deleted file mode 100644
index f8132991f..000000000
--- a/android/app/src/main/res/drawable/button_red.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="@color/button_pressed">
-  <item>
-    <shape android:shape="rectangle">
-      <solid android:color="@color/button_red"/>
-      <corners android:radius="2dp"/>
-    </shape>
-  </item>
-</ripple>
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable/button_red_disabled.xml b/android/app/src/main/res/drawable/button_red_disabled.xml
deleted file mode 100644
index 62a50d357..000000000
--- a/android/app/src/main/res/drawable/button_red_disabled.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-  <solid android:color="@color/button_red_disabled"/>
-  <corners android:radius="2dp"/>
-</shape>
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable/button_red_normal.xml b/android/app/src/main/res/drawable/button_red_normal.xml
deleted file mode 100644
index 9657730b0..000000000
--- a/android/app/src/main/res/drawable/button_red_normal.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-  <solid android:color="@color/button_red"/>
-  <corners android:radius="2dp"/>
-</shape>
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable/button_red_pressed.xml b/android/app/src/main/res/drawable/button_red_pressed.xml
deleted file mode 100644
index 2015701bf..000000000
--- a/android/app/src/main/res/drawable/button_red_pressed.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-  <solid android:color="@color/button_red_pressed"/>
-  <corners android:radius="2dp"/>
-</shape>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/layout_nav_bottom.xml b/android/app/src/main/res/layout/layout_nav_bottom.xml
index 13886a3f7..652b01e16 100644
--- a/android/app/src/main/res/layout/layout_nav_bottom.xml
+++ b/android/app/src/main/res/layout/layout_nav_bottom.xml
@@ -43,7 +43,7 @@
     android:paddingEnd="@dimen/nav_bottom_gap"
     tools:background="#300000FF">
 
-    <ImageView
+    <com.google.android.material.imageview.ShapeableImageView
       android:id="@+id/tts_volume"
       android:layout_width="0dp"
       android:layout_height="@dimen/nav_icon_size"
@@ -52,7 +52,7 @@
       android:scaleType="center"
       app:srcCompat="@drawable/ic_voice_on" />
 
-    <ImageView
+    <com.google.android.material.imageview.ShapeableImageView
       android:id="@+id/settings"
       android:layout_width="0dp"
       android:layout_height="@dimen/nav_icon_size"
@@ -63,16 +63,16 @@
       app:srcCompat="@drawable/ic_menu_settings"
       app:tint="?iconTint" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
       android:id="@+id/stop"
       android:layout_width="0dp"
       android:layout_height="@dimen/nav_button_height"
       android:layout_weight="0.4"
-      android:background="?redButtonBackground"
-      android:fontFamily="@string/robotoMedium"
       android:minWidth="@dimen/start_button_width"
       android:text="@string/navigation_stop_button"
-      android:textAppearance="@style/MwmTextAppearance.Button.Red"
+      android:textColor="@color/button_red_text"
+      android:textStyle="bold"
+      app:backgroundTint="@color/base_red"
       tools:ignore="UnusedAttribute" />
   </LinearLayout>
 </LinearLayout>
diff --git a/android/app/src/main/res/values-night/themes.xml b/android/app/src/main/res/values-night/themes.xml
index 324f332de..5438c7341 100644
--- a/android/app/src/main/res/values-night/themes.xml
+++ b/android/app/src/main/res/values-night/themes.xml
@@ -66,10 +66,6 @@
                    accentButtonTextColor selector -->
         <item name="accentButtonTextColorDisabled">@color/button_accent_text_disabled_night</item>
 
-        <item name="redButtonBackground">@drawable/button_red</item>
-        <item name="redButtonTextColor">@color/button_red_text</item>
-        <item name="redButtonTextColorDisabled">@color/button_red_text_disabled</item>
-
         <item name="primaryButtonBackground">@drawable/button_accent_night</item>
 
         <item name="menuBackground">@color/bg_menu_night</item>
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
index 0d7bb8621..b06e8e94f 100644
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -108,12 +108,8 @@
   <color name="button_accent_text_disabled">#42000000</color>
   <color name="button_accent_text_disabled_night">#4CFFFFFF</color>
 
-  <color name="button_red">@color/button_red_normal</color>
-  <color name="button_red_normal">@color/base_red</color>
-  <color name="button_red_pressed">#FFC22219</color>
-  <color name="button_red_disabled">#FFB9332B</color>
+  <color name="button_red">@color/base_red</color>
   <color name="button_red_text">#FFFFFFFF</color>
-  <color name="button_red_text_disabled">#FF606060</color>
 
   <!-- Routing-->
   <color name="bg_routing_progress">#1F000000</color>
diff --git a/android/app/src/main/res/values/dimens.xml b/android/app/src/main/res/values/dimens.xml
index 651149954..06191ee46 100644
--- a/android/app/src/main/res/values/dimens.xml
+++ b/android/app/src/main/res/values/dimens.xml
@@ -111,7 +111,7 @@
   <dimen name="nav_numbers_side_min_width">90dp</dimen>
   <dimen name="nav_progress">4sp</dimen>
   <dimen name="nav_progress_head">2dp</dimen>
-  <dimen name="nav_button_height">@dimen/primary_button_min_height</dimen>
+  <dimen name="nav_button_height">44dp</dimen>
   <dimen name="nav_icon_size">48dp</dimen>
   <dimen name="nav_bottom_gap">12dp</dimen>
   <dimen name="nav_menu_height">80sp</dimen>
diff --git a/android/app/src/main/res/values/themes-attrs.xml b/android/app/src/main/res/values/themes-attrs.xml
index f95909e6e..97207c3a4 100644
--- a/android/app/src/main/res/values/themes-attrs.xml
+++ b/android/app/src/main/res/values/themes-attrs.xml
@@ -30,9 +30,6 @@
     <attr name="accentButtonBackground" format="reference" />
     <attr name="accentButtonTextColor" format="color" />
     <attr name="accentButtonTextColorDisabled" format="color" />
-    <attr name="redButtonBackground" format="reference" />
-    <attr name="redButtonTextColor" format="color" />
-    <attr name="redButtonTextColorDisabled" format="color" />
     <attr name="primaryButtonBackground" format="reference" />
     <attr name="menuBackground" format="color" />
     <attr name="myPositionButtonAnimation" format="reference" />
diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml
index 28466a35c..c248f16e8 100644
--- a/android/app/src/main/res/values/themes.xml
+++ b/android/app/src/main/res/values/themes.xml
@@ -64,10 +64,6 @@
                accentButtonTextColor selector -->
     <item name="accentButtonTextColorDisabled">@color/button_accent_text_disabled</item>
 
-    <item name="redButtonBackground">@drawable/button_red</item>
-    <item name="redButtonTextColor">@color/button_red_text</item>
-    <item name="redButtonTextColorDisabled">@color/button_red_text_disabled</item>
-
     <item name="primaryButtonBackground">@drawable/button_accent</item>
 
     <item name="menuBackground">@color/bg_menu</item>

From c4491563b7f33ca88c2aa4141b9962ebe8a65c12 Mon Sep 17 00:00:00 2001
From: map-per <map-per@gmx.de>
Date: Sun, 24 Aug 2025 16:16:22 +0200
Subject: [PATCH 235/302] fix padding in place page

Signed-off-by: map-per <map-per@gmx.de>
---
 android/app/src/main/res/layout/place_page_preview.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/app/src/main/res/layout/place_page_preview.xml b/android/app/src/main/res/layout/place_page_preview.xml
index 9ac1d640a..3f02ba131 100644
--- a/android/app/src/main/res/layout/place_page_preview.xml
+++ b/android/app/src/main/res/layout/place_page_preview.xml
@@ -14,7 +14,8 @@
     android:layout_height="wrap_content"
     android:baselineAligned="false"
     android:layoutDirection="ltr"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    android:paddingBottom="@dimen/margin_quarter">
     <include
       android:id="@+id/downloader_status_frame"
       layout="@layout/downloader_status"
@@ -183,7 +184,6 @@
     android:id="@+id/category_container"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="@dimen/margin_half"
     android:orientation="vertical">
     <include layout="@layout/place_page_shadow_gap" />
     <LinearLayout

From 5edaa05129444ce7c9fff1c89aead17505688bf2 Mon Sep 17 00:00:00 2001
From: map-per <map-per@gmx.de>
Date: Sun, 24 Aug 2025 15:10:22 +0200
Subject: [PATCH 236/302] Keep category list and direction arrow on bookmark
 place page

Signed-off-by: map-per <map-per@gmx.de>
---
 .../java/app/organicmaps/widget/placepage/PlacePageView.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
index 8a26b4cd1..26832ee96 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
@@ -374,7 +374,7 @@ public class PlacePageView extends Fragment
       refreshDistanceToObject(loc);
     UiUtils.hideIf(mMapObject.isTrack(), mFrame.findViewById(R.id.ll__place_latlon),
                    mFrame.findViewById(R.id.ll__place_open_in));
-    if (mMapObject.isTrack() || mMapObject.isBookmark())
+    if (mMapObject.isTrack())
     {
       UiUtils.hide(mTvSubtitle);
       UiUtils.hide(mAvDirection, mTvDistance);

From 6c75604c38fd846a52fed684bf71c8be0900705b Mon Sep 17 00:00:00 2001
From: map-per <map-per@gmx.de>
Date: Sun, 24 Aug 2025 18:18:04 +0200
Subject: [PATCH 237/302] Remove bookmark category from subtitle

Signed-off-by: map-per <map-per@gmx.de>
---
 libs/map/place_page_info.cpp | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/libs/map/place_page_info.cpp b/libs/map/place_page_info.cpp
index 2b6d417bc..5874debff 100644
--- a/libs/map/place_page_info.cpp
+++ b/libs/map/place_page_info.cpp
@@ -117,13 +117,6 @@ std::string Info::FormatSubtitle(bool withTypes, bool withMainType) const
     result += sv;
   };
 
-/// @todo(KK): Remove, when the category name will be displayed in the "Edit cell" on the Place Page on the specific
-/// platform.
-#if !defined(TARGET_OS_IPHONE)
-  if (IsBookmark())
-    append(m_bookmarkCategoryName);
-#endif
-
   if (!withTypes)
     return result;
 
@@ -239,11 +232,7 @@ void Info::SetTitlesForBookmark()
   m_uiTitle = GetBookmarkName();
 
   std::vector<std::string> subtitle;
-/// @todo(KK): Remove, when the category name will be displayed in the "edit" of the cell on the Place Page on the
-/// specific platform.
-#if !defined(TARGET_OS_IPHONE)
-  subtitle.push_back(m_bookmarkCategoryName);
-#endif
+
   if (!m_bookmarkData.m_featureTypes.empty())
     subtitle.push_back(GetLocalizedFeatureType(m_bookmarkData.m_featureTypes));
   m_uiSubtitle = strings::JoinStrings(subtitle, feature::kFieldsSeparator);
@@ -262,11 +251,6 @@ void Info::SetCustomName(std::string const & name)
 void Info::SetTitlesForTrack(Track const & track)
 {
   m_uiTitle = track.GetName();
-/// @todo(KK): Remove, when the category name will be displayed in the "Edit cell" on the Place Page on the specific
-/// platform.
-#if !defined(TARGET_OS_IPHONE)
-  m_uiSubtitle = m_bookmarkCategoryName;
-#endif
 
   std::vector<std::string> statistics;
   auto const length = track.GetLengthMeters();

From ef9f4ceb1ee037543dca6e664976945f4cd28a95 Mon Sep 17 00:00:00 2001
From: Harry Bond <me@hbond.xyz>
Date: Sat, 23 Aug 2025 22:40:39 +0100
Subject: [PATCH 238/302] [android] fix preview in android studio for
 opening_hours fragment

Signed-off-by: Harry Bond <me@hbond.xyz>
---
 .../src/main/res/layout/place_page_opening_hours_fragment.xml  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/android/app/src/main/res/layout/place_page_opening_hours_fragment.xml b/android/app/src/main/res/layout/place_page_opening_hours_fragment.xml
index 8ed68a58d..31031b661 100644
--- a/android/app/src/main/res/layout/place_page_opening_hours_fragment.xml
+++ b/android/app/src/main/res/layout/place_page_opening_hours_fragment.xml
@@ -3,6 +3,7 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
+  tools:visibility="visible"
   style="@style/PlacePageItemFrame">
 
   <com.google.android.material.imageview.ShapeableImageView
@@ -58,6 +59,8 @@
     android:layout_alignStart="@id/oh_nonbusiness_time"
     android:layout_below="@id/oh_nonbusiness_time"
     app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+    tools:itemCount="3"
+    tools:listitem="@layout/place_page_opening_hours_item"
     android:layout_marginTop="8dp"/>
 
 </RelativeLayout>
\ No newline at end of file

From 08abddc7fc035921f1e2ee311ac6ae7226a44034 Mon Sep 17 00:00:00 2001
From: Harry Bond <me@hbond.xyz>
Date: Sat, 23 Aug 2025 22:44:42 +0100
Subject: [PATCH 239/302] [android] Add support for check_date &
 check_date:opening_hours

Signed-off-by: Harry Bond <me@hbond.xyz>
---
 .../widget/placepage/PlacePageView.java       | 12 +++++--
 .../PlacePageOpeningHoursFragment.java        | 21 ++++++++++++-
 .../main/res/layout/place_page_details.xml    |  9 ++++++
 .../place_page_opening_hours_fragment.xml     | 13 ++++++++
 android/app/src/main/res/values/strings.xml   | 12 +++++++
 .../sdk/bookmarks/data/Metadata.java          |  4 ++-
 .../app/organicmaps/sdk/util/DateUtils.java   | 31 +++++++++++++++++++
 7 files changed, 98 insertions(+), 4 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
index 26832ee96..bd29be8e0 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/PlacePageView.java
@@ -106,7 +106,6 @@ public class PlacePageView extends Fragment
       Arrays.asList(CoordinatesFormat.LatLonDMS, CoordinatesFormat.LatLonDecimal, CoordinatesFormat.OLCFull,
                     CoordinatesFormat.UTM, CoordinatesFormat.MGRS, CoordinatesFormat.OSMLink);
   private View mFrame;
-  private Context mContext;
 
   // Preview.
   private ViewGroup mPreview;
@@ -144,6 +143,7 @@ public class PlacePageView extends Fragment
   private MaterialTextView mTvOutdoorSeating;
   private View mEntrance;
   private MaterialTextView mTvEntrance;
+  private MaterialTextView mTvLastChecked;
   private View mEditPlace;
   private View mAddOrganisation;
   private View mAddPlace;
@@ -308,6 +308,7 @@ public class PlacePageView extends Fragment
     mTvCuisine = mFrame.findViewById(R.id.tv__place_cuisine);
     mEntrance = mFrame.findViewById(R.id.ll__place_entrance);
     mTvEntrance = mEntrance.findViewById(R.id.tv__place_entrance);
+    mTvLastChecked = mFrame.findViewById(R.id.place_page_last_checked);
     mEditPlace = mFrame.findViewById(R.id.ll__place_editor);
     mEditPlace.setOnClickListener(this);
     mAddOrganisation = mFrame.findViewById(R.id.ll__add_organisation);
@@ -662,7 +663,14 @@ public class PlacePageView extends Fragment
     refreshMetadataOrHide(outdoorSeating.equals("yes") ? getString(R.string.outdoor_seating) : "", mOutdoorSeating,
                           mTvOutdoorSeating);
 
-    //    showTaxiOffer(mapObject);
+    final String lastChecked = mMapObject.getMetadata(Metadata.MetadataType.FMD_CHECK_DATE);
+    if (!lastChecked.isEmpty())
+    {
+      String periodSinceCheck = DateUtils.getRelativePeriodString(getResources(), lastChecked);
+      UiUtils.setTextAndShow(mTvLastChecked, requireContext().getString(R.string.existence_confirmed_time_ago, periodSinceCheck));
+    }
+    else
+      UiUtils.hide(mTvLastChecked);
 
     if (RoutingController.get().isNavigating() || RoutingController.get().isPlanning())
     {
diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java
index 4cc4898d3..feba8b7ee 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java
@@ -5,6 +5,7 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.TextView;
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -20,6 +21,8 @@ import app.organicmaps.sdk.bookmarks.data.Metadata;
 import app.organicmaps.sdk.editor.OpeningHours;
 import app.organicmaps.sdk.editor.data.Timespan;
 import app.organicmaps.sdk.editor.data.Timetable;
+import app.organicmaps.sdk.util.DateUtils;
+import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.ThemeUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
@@ -36,6 +39,7 @@ public class PlacePageOpeningHoursFragment extends Fragment implements Observer<
   private MaterialTextView mTodayOpenTime;
   private MaterialTextView mTodayNonBusinessTime;
   private RecyclerView mFullWeekOpeningHours;
+  private MaterialTextView mLastCheckedDate;
   private PlaceOpeningHoursAdapter mOpeningHoursAdapter;
 
   private PlacePageViewModel mViewModel;
@@ -58,10 +62,23 @@ public class PlacePageOpeningHoursFragment extends Fragment implements Observer<
     mTodayOpenTime = view.findViewById(R.id.oh_today_open_time);
     mTodayNonBusinessTime = view.findViewById(R.id.oh_nonbusiness_time);
     mFullWeekOpeningHours = view.findViewById(R.id.rw__full_opening_hours);
+    mLastCheckedDate = view.findViewById(R.id.oh_check_date);
     mOpeningHoursAdapter = new PlaceOpeningHoursAdapter();
     mFullWeekOpeningHours.setAdapter(mOpeningHoursAdapter);
   }
 
+  private static void setOrHideLastCheckedDate(MapObject mapObject, Resources resources, TextView checkDateView)
+  {
+    final String checkDate = mapObject.getMetadata(Metadata.MetadataType.FMD_CHECK_DATE_OPEN_HOURS);
+    if (!checkDate.isEmpty())
+    {
+      String periodSinceCheck = DateUtils.getRelativePeriodString(resources, checkDate);
+      UiUtils.setTextAndShow(checkDateView, resources.getString(R.string.hours_confirmed_time_ago, periodSinceCheck));
+    }
+    else
+      UiUtils.hide(checkDateView);
+  }
+
   private void refreshTodayNonBusinessTime(Timespan[] closedTimespans)
   {
     final String hoursClosedLabel = getResources().getString(R.string.editor_hours_closed);
@@ -102,6 +119,9 @@ public class PlacePageOpeningHoursFragment extends Fragment implements Observer<
 
     final boolean isEmptyTT = (timetables == null || timetables.length == 0);
     final int color = ThemeUtils.getColor(requireContext(), android.R.attr.textColorPrimary);
+    final Resources resources = getResources();
+
+    setOrHideLastCheckedDate(mapObject, resources, mLastCheckedDate);
 
     if (isEmptyTT)
     {
@@ -119,7 +139,6 @@ public class PlacePageOpeningHoursFragment extends Fragment implements Observer<
     else
     {
       UiUtils.show(mFrame);
-      final Resources resources = getResources();
       if (timetables[0].isFullWeek())
       {
         final Timetable tt = timetables[0];
diff --git a/android/app/src/main/res/layout/place_page_details.xml b/android/app/src/main/res/layout/place_page_details.xml
index 6df9ea63a..a3d1e9e88 100644
--- a/android/app/src/main/res/layout/place_page_details.xml
+++ b/android/app/src/main/res/layout/place_page_details.xml
@@ -74,6 +74,15 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"/>
 
+  <com.google.android.material.textview.MaterialTextView
+    android:id="@+id/place_page_last_checked"
+    style="?fontCaption"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingBottom="@dimen/margin_half"
+    android:paddingHorizontal="@dimen/margin_base"
+    tools:text="Existence confirmed 1 month ago"/>
+
   <include android:visibility="gone" layout="@layout/place_page_editor"/>
 
   <include android:visibility="gone" layout="@layout/place_page_add_business"/>
diff --git a/android/app/src/main/res/layout/place_page_opening_hours_fragment.xml b/android/app/src/main/res/layout/place_page_opening_hours_fragment.xml
index 31031b661..79bac0a53 100644
--- a/android/app/src/main/res/layout/place_page_opening_hours_fragment.xml
+++ b/android/app/src/main/res/layout/place_page_opening_hours_fragment.xml
@@ -63,4 +63,17 @@
     tools:listitem="@layout/place_page_opening_hours_item"
     android:layout_marginTop="8dp"/>
 
+  <com.google.android.material.textview.MaterialTextView
+    android:id="@+id/oh_check_date"
+    style="?fontCaption"
+    android:layout_height="wrap_content"
+    android:layout_width="wrap_content"
+    android:layout_alignParentEnd="true"
+    android:layout_alignStart="@id/oh_today_label"
+    android:layout_below="@id/rw__full_opening_hours"
+    android:textAppearance="@style/MwmTextAppearance.Body4"
+    android:textAlignment="viewStart"
+    android:visibility="gone"
+    tools:visibility="visible"
+    tools:text="Confirmed 2 months ago"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index fada3a08f..baf8593c8 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -466,6 +466,18 @@
     <string name="opens_in">Opens in %s</string>
     <string name="closes_in">Closes in %s</string>
     <string name="closed">Closed</string>
+    <!-- Used in the opening_hours fragment for the last checked date, eg. "Confirmed two weeks ago" -->
+    <string name="hours_confirmed_time_ago">Confirmed %s</string>
+    <!-- Used on the place page for the last checked date, eg. "Existence confirmed two weeks ago" -->
+    <string name="existence_confirmed_time_ago">Existence confirmed %s</string>
+    <string name="yesterday">Yesterday</string>
+    <string name="days_ago">%s days ago</string>
+    <string name="week_ago">%s week ago</string>
+    <string name="weeks_ago">%s weeks ago</string>
+    <string name="month_ago">%s month ago</string>
+    <string name="months_ago">%s months ago</string>
+    <string name="year_ago">%s year ago</string>
+    <string name="years_ago">%s years ago</string>
     <string name="edit_opening_hours">Edit business hours</string>
     <string name="no_osm_account">Don\'t have an OpenStreetMap account?</string>
     <string name="register_at_openstreetmap">Register at OpenStreetMap</string>
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Metadata.java b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Metadata.java
index 6ba2c3354..84d607478 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Metadata.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/bookmarks/data/Metadata.java
@@ -68,7 +68,9 @@ public class Metadata implements Parcelable
     FMD_NETWORK(49),
     FMD_CONTACT_FEDIVERSE(50),
     FMD_CONTACT_BLUESKY(51),
-    FMD_PANORAMAX(52);
+    FMD_PANORAMAX(52),
+    FMD_CHECK_DATE(53),
+    FMD_CHECK_DATE_OPEN_HOURS(54);
     private final int mMetaType;
 
     MetadataType(int metadataType)
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/util/DateUtils.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/DateUtils.java
index 028c9015f..bc445cb63 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/util/DateUtils.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/DateUtils.java
@@ -1,11 +1,17 @@
 package app.organicmaps.sdk.util;
 
 import android.content.Context;
+import android.content.res.Resources;
+
 import androidx.annotation.Keep;
 import androidx.annotation.NonNull;
 import java.text.DateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.Locale;
 
+import app.organicmaps.R;
+
 public final class DateUtils
 {
   private DateUtils() {}
@@ -23,4 +29,29 @@ public final class DateUtils
   {
     return android.text.format.DateFormat.is24HourFormat(context);
   }
+
+  /***
+   * @param dateString Date string in the yyyy-MM-dd format
+   * @return Human-readable string of the time that's passed since the date
+   */
+  public static String getRelativePeriodString(Resources resources, String dateString)
+  {
+    DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+    int days = (int) (LocalDate.now().toEpochDay() - LocalDate.parse(dateString, formatter).toEpochDay());
+
+    if (days == 0)
+      return resources.getString(R.string.today);
+    if (days == 1)
+      return resources.getString(R.string.yesterday);
+    if (days < 7)
+      return  resources.getString(R.string.days_ago, Integer.toString(days));
+    if (days < 30)
+      return resources.getString(days < 14 ? R.string.week_ago : R.string.weeks_ago, Integer.toString(days / 7));
+    if (days < 365)
+      return resources.getString(days < 60 ? R.string.month_ago : R.string.months_ago, Integer.toString(days / 30));
+    if (days > 365)
+      return resources.getString(days < 730 ? R.string.year_ago : R.string.years_ago, Integer.toString(days / 365));
+    else
+      return "";
+  }
 }

From 5e7bc37fb5eda474e674ec75fd7b06360aeb280f Mon Sep 17 00:00:00 2001
From: x7z4w <x7z4w@noreply.codeberg.org>
Date: Sun, 24 Aug 2025 19:12:32 +0200
Subject: [PATCH 240/302] Fix crash

Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>
---
 tools/python/check_store_metadata.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/python/check_store_metadata.py b/tools/python/check_store_metadata.py
index 644176538..13157a9ac 100755
--- a/tools/python/check_store_metadata.py
+++ b/tools/python/check_store_metadata.py
@@ -125,7 +125,9 @@ def check_raw(path, max_length):
     ok = True
     with open(path, 'r') as f:
         text = f.read()
-        if text[-1] == os.linesep:
+        if not text:
+            ok = error(path, "empty")
+        elif text[-1] == os.linesep:
             text = text[:-1]
         else:
             ok = error(path, "missing new line")

From 234f13abcc5e03d8b51f4a82b41c173a2fc959ed Mon Sep 17 00:00:00 2001
From: Codeberg Translate <translate@codeberg.org>
Date: Sun, 24 Aug 2025 16:50:10 +0000
Subject: [PATCH 241/302] [strings] Update from Codeberg Translate

Co-authored-by: Codeberg Translate <translate@codeberg.org>
Co-authored-by: sziatomi <sziatomi@noreply.codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/comaps/appstore-description/
Translation: CoMaps/Android - Map Feature Types
Translation: CoMaps/Android UI Strings
Translation: CoMaps/Apple AppStore description
Translation: CoMaps/F-Droid app description
Translation: CoMaps/iOS - Map Feature Types
Translation: CoMaps/iOS UI Strings
---
 .../play/listings/hu-HU/full-description.txt  | 32 +++++++++++++++++++
 .../app/src/main/res/values-hu/strings.xml    |  6 ++--
 .../src/main/res/values-hu/types_strings.xml  | 10 +++---
 .../hu.lproj/Localizable.strings              |  2 +-
 .../hu.lproj/LocalizableTypes.strings         | 10 +++---
 iphone/metadata/hu/description.txt            | 28 ++++++++++++++++
 iphone/metadata/hu/privacy_url.txt            |  1 +
 7 files changed, 75 insertions(+), 14 deletions(-)
 create mode 100644 android/app/src/fdroid/play/listings/hu-HU/full-description.txt
 create mode 100644 iphone/metadata/hu/description.txt
 create mode 100644 iphone/metadata/hu/privacy_url.txt

diff --git a/android/app/src/fdroid/play/listings/hu-HU/full-description.txt b/android/app/src/fdroid/play/listings/hu-HU/full-description.txt
new file mode 100644
index 000000000..92ffe381a
--- /dev/null
+++ b/android/app/src/fdroid/play/listings/hu-HU/full-description.txt
@@ -0,0 +1,32 @@
+A CoMaps egy közösség által létrehozott, ingyenes és nyílt forráskódú térképalkalmazás, amely az OpenStreetMap térképadatain alapul, és amelyet az átláthatóság, a magánélet védelme és a nonprofit jelleg iránti elkötelezettség erősít. A CoMaps az Organic Maps villája, amely viszont a Maps.ME villája.
+
+A projekt előzményeiről és az irányáról a <b><i>codeberg.org/comaps</i></b> oldalon olvashatsz.
+Csatlakozz ott a közösséghez, és segíts a legjobb térképalkalmazás elkészítésében.
+• Használd az alkalmazást és terjeszd a hírét
+• Adj visszajelzést és jelentsd a problémákat
+• Frissítsd és javítsd a térképadatokat az alkalmazásban vagy az OpenStreetMap weboldalán.
+
+‣ <b>Offline-fókuszú:</b> Tervezd meg és navigáld külföldi útad mobilszolgáltatás nélkül, keress útpontokat egy távoli túra során stb. Az alkalmazás minden funkcióját úgy terveztük, hogy internetkapcsolat nélkül is működjön.
+‣ <b>A magánélet tiszteletben tartása:</b> Az alkalmazás az adatvédelem szem előtt tartásával készült, nem azonosítja az embereket, nem követi nyomon és nem gyűjt személyes adatokat, és reklámmentes.
+‣ <b>Takarékosdik az akkumulátorral és a tárhellyel:</b> Nem meríti le az akkumulátort, mint más navigációs alkalmazások. A jól összeállítot kis méretű térképek értékes helyet takarítanak meg a telefonon.
+‣ <b>Egyszerű és szép grafikus felület,</b> nagyszerű és könnyen használható funkciók, amelyek egyszerűen működnek.
+‣ <b>Ingyenes és a közösség által készített:</b> A hozzád hasonló emberek segítettek az alkalmazás létrehozásában azáltal, hogy hozzáadtak helyeket az OpenStreetMap térképhez, tesztelték és visszajelzést adtak a funkciókról, valamint hozzájárultak a fejlesztői képességeikkel és a pénzükkel.
+‣ <b>Nyílt és átlátható döntéshozatal és pénzügyek, nonprofit és teljesen nyílt forráskódú.</b>
+
+<b>Főbb jellemzők:</b>
+• Letölthető részletes térképek olyan helyekkel, amelyek sok kereskedelmi térképen nem állnak rendelkezésre.
+• Szabadtéri üzemmód kiemelt túraútvonalakkal, táborhelyekkel, vízforrásokkal, csúcsokkal, szintvonalakkal stb.
+• Sétaútvonalak és kerékpárutak
+• Érdekes pontok, mint például éttermek, benzinkutak, szállodák, üzletek, látnivalók és még sok minden más
+• Keresés név, cím vagy az érdekes pontok kategóriája alapján
+• Navigáció hangutasításokkal gyalogláshoz, kerékpározáshoz vagy vezetéshez
+• Kedvenc helyeid könyvjelzővel láthatod el egyetlen érintéssel
+• Wikipedia szócikkek internetkapcsolat nélkül
+• Metró tranzit réteg és irányok
+• Útvonal mentése
+• Könyvjelzők és nyomvonalak exportálása és importálása KML, KMZ, GPX formátumokban
+• Sötét üzemmód az éjszakai használathoz
+• Térképadatok javítása mindenki számára egy alapvető beépített szerkesztő segítségével
+
+<b>Itt van a szabadság</b>
+Fedezd fel az utadat, navigálj a világban úgy, hogy a magánélet és a közösség kerüljön előtérbe!
diff --git a/android/app/src/main/res/values-hu/strings.xml b/android/app/src/main/res/values-hu/strings.xml
index 5388d2a9c..7003916b5 100644
--- a/android/app/src/main/res/values-hu/strings.xml
+++ b/android/app/src/main/res/values-hu/strings.xml
@@ -9,7 +9,7 @@
     <string name="delete">Törlés</string>
     <string name="download_maps">Térképek letöltése</string>
     <!-- Settings/Downloader - info for country when download fails -->
-    <string name="download_has_failed">Nem sikerült letölteni. Próbálja meg újra.</string>
+    <string name="download_has_failed">Nem sikerült letölteni, próbáld meg újra</string>
     <!-- Settings/Downloader - info for country which started downloading -->
     <string name="downloading">Letöltés…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
@@ -27,7 +27,7 @@
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
     <string name="limited_accuracy">Korlátozott pontosság</string>
     <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">A pontos navigáció érdekében engedélyezze a beállításokban a Pontos helymeghatározás opciót.</string>
+    <string name="precise_location_is_disabled_long_text">A pontos navigáció érdekében meg kell adni a beállításokban a pontos helymeghatározási engedélyt</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Megjelenítés a térképen</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -237,7 +237,7 @@
     <!-- Text in menu -->
     <string name="help">Súgó</string>
     <!-- Button in the main Help dialog -->
-    <string name="faq">GYIK</string>
+    <string name="faq">Gyakran ismételt kérdések</string>
     <!-- Button in the main menu -->
     <string name="donate">Adományozás</string>
     <!-- Button in the main Help dialog -->
diff --git a/android/sdk/src/main/res/values-hu/types_strings.xml b/android/sdk/src/main/res/values-hu/types_strings.xml
index 58c726ec7..7f8f2ea0c 100644
--- a/android/sdk/src/main/res/values-hu/types_strings.xml
+++ b/android/sdk/src/main/res/values-hu/types_strings.xml
@@ -5,8 +5,8 @@
     <string name="type.addr_interpolation.even">Cím/blokk</string>
     <string name="type.addr_interpolation.odd">Cím/blokk</string>
     <string name="type.aerialway.station">Felvonóállomás</string>
-    <string name="type.aeroway.aerodrome">Kis repülőtér</string>
-    <string name="type.aeroway.aerodrome.international">Repülőtér</string>
+    <string name="type.aeroway.aerodrome">Repülőtér</string>
+    <string name="type.aeroway.aerodrome.international">Nemzetközi repülőtér</string>
     <string name="type.aeroway.helipad">Helikopterleszálló</string>
     <string name="type.amenity">Létesítmény</string>
     <string name="type.amenity.arts_centre">Művészeti központ</string>
@@ -20,7 +20,7 @@
     <string name="type.amenity.biergarten">Sörkert</string>
     <string name="type.amenity.brothel">Bordélyház</string>
     <string name="type.amenity.bureau_de_change">Pénzváltó</string>
-    <string name="type.amenity.bus_station">Buszállomás</string>
+    <string name="type.amenity.bus_station">Autóbuszállomás</string>
     <string name="type.amenity.cafe">Kávézó</string>
     <string name="type.amenity.car_rental">Autókölcsönző</string>
     <string name="type.amenity.motorcycle_rental">Motorkerékpár-bérlés</string>
@@ -1179,7 +1179,7 @@
     <string name="type.aeroway.runway">Kifutópálya</string>
     <string name="type.aeroway.terminal">Terminál</string>
     <string name="type.recycling.cans">Fémdoboz</string>
-    <string name="type.recycling.green_waste">Szerves hulladék</string>
+    <string name="type.recycling.green_waste">Zöld/szerves hulladék</string>
     <string name="type.recycling.cartons">Italos karton</string>
     <string name="type.amenity.sanitary_dump_station">Szennyvízürítőhely</string>
     <string name="type.amenity.shelter.lean_to">Háromoldalú fészer</string>
@@ -1251,7 +1251,7 @@
     <string name="type.landuse.meadow">Rét</string>
     <string name="type.landuse.orchard">Gyümölcsös</string>
     <string name="type.aerialway">Drótkötélpályás felvonó</string>
-    <string name="type.barrier.chain">Lánc</string>
+    <string name="type.barrier.chain">Lánckorlát</string>
     <string name="type.boundary.administrative">Közigazgatási határ</string>
     <string name="type.landuse.education">Oktatási létesítmény</string>
     <string name="type.landuse.farmyard">Tanyaudvar</string>
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index 406696675..436034d96 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -304,7 +304,7 @@
 "help" = "Súgó";
 
 /* Button in the main Help dialog */
-"faq" = "GYIK";
+"faq" = "Gyakran ismételt kérdések";
 
 /* Button in the main menu */
 "donate" = "Adományozás";
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings
index e6adbbe1c..7d839b226 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings
@@ -7,8 +7,8 @@
 "type.aerialway.gondola" = "Gondolakabinos felvonó";
 "type.aerialway.station" = "Felvonóállomás";
 "type.aeroway" = "Légi közlekedési infrastruktúra";
-"type.aeroway.aerodrome" = "Kis repülőtér";
-"type.aeroway.aerodrome.international" = "Repülőtér";
+"type.aeroway.aerodrome" = "Repülőtér";
+"type.aeroway.aerodrome.international" = "Nemzetközi repülőtér";
 "type.aeroway.apron" = "Forgalmi előtér";
 "type.aeroway.gate" = "Beszállókapu";
 "type.aeroway.helipad" = "Helikopterleszálló";
@@ -28,7 +28,7 @@
 "type.amenity.biergarten" = "Sörkert";
 "type.amenity.brothel" = "Bordélyház";
 "type.amenity.bureau_de_change" = "Pénzváltó";
-"type.amenity.bus_station" = "Buszállomás";
+"type.amenity.bus_station" = "Autóbuszállomás";
 "type.amenity.cafe" = "Kávézó";
 "type.amenity.car_rental" = "Autókölcsönző";
 "type.amenity.motorcycle_rental" = "Motorkerékpár-bérlés";
@@ -140,7 +140,7 @@
 "type.recycling.cardboard" = "Kartonpapír";
 "type.recycling.cans" = "Fémdoboz";
 "type.recycling.shoes" = "Cipő";
-"type.recycling.green_waste" = "Szerves hulladék";
+"type.recycling.green_waste" = "Zöld/szerves hulladék";
 "type.recycling.cartons" = "Italos karton";
 "type.amenity.restaurant" = "Étterem";
 "type.amenity.sanitary_dump_station" = "Szennyvízürítőhely";
@@ -192,7 +192,7 @@
 "type.barrier.block" = "Blokk";
 "type.barrier.bollard" = "Terelőoszlop";
 "type.barrier.border_control" = "Határátkelő";
-"type.barrier.chain" = "Lánc";
+"type.barrier.chain" = "Lánckorlát";
 "type.barrier.city_wall" = "Városfal";
 "type.barrier.cycle_barrier" = "Kerékpárakadály";
 "type.waterway.ditch" = "Vízelvezető árok";
diff --git a/iphone/metadata/hu/description.txt b/iphone/metadata/hu/description.txt
new file mode 100644
index 000000000..bd49c2ca5
--- /dev/null
+++ b/iphone/metadata/hu/description.txt
@@ -0,0 +1,28 @@
+Közösség által létrehozott, ingyenes és nyílt forráskódú térképalkalmazás, amely az OpenStreetMap térképadatain alapul, és amelyet az átláthatóság, a magánélet védelme és a nonprofit jelleg iránti elkötelezettség erősít.
+
+‣ Egyszerű és szép grafikus felülettel rendelkezik, nagyszerű és könnyen használható funkciók, amelyek egyszerűen működnek.
+‣ Offline-fókuszú: Tervezd meg és navigáld külföldi útad mobilszolgáltatás nélkül, keress útpontokat egy távoli túra során stb. Az alkalmazás minden funkcióját úgy terveztük, hogy internetkapcsolat nélkül is működjön.
+‣ A magánélet tiszteletben tartása: Az alkalmazás az adatvédelem szem előtt tartásával készült, nem azonosítja az embereket, nem követi nyomon és nem gyűjt személyes adatokat, és reklámmentes.
+‣ Takarékosdik az akkumulátorral és a tárhellyel: Nem meríti le az akkumulátort, mint más navigációs alkalmazások. A jól összeállítot kis méretű térképek értékes helyet takarítanak meg a telefonon.
+‣ Ingyenes és a közösség által készített: A hozzád hasonló emberek segítettek az alkalmazás létrehozásában azáltal, hogy hozzáadtak helyeket az OpenStreetMap térképhez, tesztelték és visszajelzést adtak a funkciókról, valamint hozzájárultak a fejlesztői képességeikkel és a pénzükkel.
+‣ Nyílt és átlátható döntéshozatal és pénzügyek, nonprofit és teljesen nyílt forráskódú.
+
+Főbb jellemzők:
+• Letölthető részletes térképek olyan helyekkel, amelyek sok kereskedelmi térképen nem állnak rendelkezésre.
+• Szabadtéri üzemmód kiemelt túraútvonalakkal, táborhelyekkel, vízforrásokkal, csúcsokkal, szintvonalakkal stb.
+• Sétaútvonalak és kerékpárutak
+• Érdekes pontok, mint például éttermek, benzinkutak, szállodák, üzletek, látnivalók és még sok minden más
+• Keresés név, cím vagy az érdekes pontok kategóriája alapján
+• Navigáció hangutasításokkal gyalogláshoz, kerékpározáshoz vagy vezetéshez
+• Kedvenc helyeid könyvjelzővel láthatod el egyetlen érintéssel
+• A könyvjelzők és nyomvonalak szinkronizálása iCloud használatával
+• Wikipedia szócikkek internetkapcsolat nélkül
+• Metró tranzit réteg és irányok
+• Útvonal mentése
+• Könyvjelzők és nyomvonalak exportálása és importálása KML, KMZ, GPX formátumokban
+• Sötét üzemmód az éjszakai használathoz
+• Térképadatok javítása mindenki számára egy alapvető beépített szerkesztő segítségével
+• CarPlay-támogatás
+
+Itt van a szabadság
+Fedezd fel az utadat, navigálj a világban úgy, hogy a magánélet és a közösség kerüljön előtérbe!
diff --git a/iphone/metadata/hu/privacy_url.txt b/iphone/metadata/hu/privacy_url.txt
new file mode 100644
index 000000000..effff312a
--- /dev/null
+++ b/iphone/metadata/hu/privacy_url.txt
@@ -0,0 +1 @@
+https://comaps.app/privacy

From 33ad35206fda10e1028eaf02ac69a017331864e6 Mon Sep 17 00:00:00 2001
From: eisa01 <eisa01@gmail.com>
Date: Sat, 23 Aug 2025 19:43:31 +0200
Subject: [PATCH 242/302] [drape] Enable shift+swipe to zoom on macOS Catalyst
 app\ \ Matches functionality in Apple Maps. Discovered while discussing issue
 #1509\ \ Tested that pinch to zoom still work in iPad Simulator

Signed-off-by: eisa01 <eisa01@gmail.com>
---
 iphone/Maps/Classes/MapViewController.mm | 34 +++++++++++++++---------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm
index 00842cfea..b84aba98f 100644
--- a/iphone/Maps/Classes/MapViewController.mm
+++ b/iphone/Maps/Classes/MapViewController.mm
@@ -908,19 +908,29 @@ NSString *const kAboutSegue = @"Map2About";
       CGPoint translation = [recognizer translationInView:self.view];
       if (translation.x == 0 && translation.y == 0 && CGPointEqualToPoint(translation, CGPointZero))
         return;
-      self.userTouchesAction = UserTouchesActionDrag;
-      CGPoint velocity = [recognizer velocityInView:self.view];
-      CGFloat velocityX = ABS(velocity.x * 0.001);
-      velocityX = MAX(1, velocityX);
-      if (velocityX > 2.5) {
-        velocityX = 2.5;
+      
+      BOOL isShiftPressed = [recognizer modifierFlags] & UIKeyModifierShift;
+      
+      if (isShiftPressed) {
+        self.userTouchesAction = UserTouchesActionScale;
+        static const CGFloat kScaleFactor = 0.9;
+        const CGFloat factor = translation.y > 0 ? kScaleFactor : 1 / kScaleFactor;
+        GetFramework().Scale(factor, [self getZoomPoint], false);
+      } else {
+        self.userTouchesAction = UserTouchesActionDrag;
+        CGPoint velocity = [recognizer velocityInView:self.view];
+        CGFloat velocityX = ABS(velocity.x * 0.001);
+        velocityX = MAX(1, velocityX);
+        if (velocityX > 2.5) {
+          velocityX = 2.5;
+        }
+        CGFloat velocityY = ABS(velocity.y * 0.001);
+        velocityY = MAX(1, velocityY);
+        if (velocityY > 2.5) {
+          velocityY = 2.5;
+        }
+        GetFramework().Scroll((translation.x * velocityX) * -1, (translation.y * velocityY) * -1);
       }
-      CGFloat velocityY = ABS(velocity.y * 0.001);
-      velocityY = MAX(1, velocityY);
-      if (velocityY > 2.5) {
-        velocityY = 2.5;
-      }
-      GetFramework().Scroll((translation.x * velocityX) * -1, (translation.y * velocityY) * -1);
       [recognizer setTranslation:CGPointZero inView:self.view];
       break;
     }

From beac6aa7bc84395c660bb9092f1b6d9ef324b62c Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Sun, 24 Aug 2025 11:55:14 +0200
Subject: [PATCH 243/302] [android] Revert changes about night themes

Signed-off-by: jeanbaptisteC <jeanbaptiste.charron@outlook.fr>
---
 .../src/main/res/values-night-v27/themes.xml  |  11 -
 .../app/src/main/res/values-night/themes.xml  | 218 ------------------
 .../app/src/main/res/values-v27/themes.xml    |   8 +
 android/app/src/main/res/values/themes.xml    | 215 +++++++++++++++++
 4 files changed, 223 insertions(+), 229 deletions(-)
 delete mode 100644 android/app/src/main/res/values-night-v27/themes.xml
 delete mode 100644 android/app/src/main/res/values-night/themes.xml

diff --git a/android/app/src/main/res/values-night-v27/themes.xml b/android/app/src/main/res/values-night-v27/themes.xml
deleted file mode 100644
index e2b160af1..000000000
--- a/android/app/src/main/res/values-night-v27/themes.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="MwmTheme.Night.MainActivity">
-        <item name="android:colorPrimaryDark">@android:color/black</item>
-        <item name="colorPrimaryVariant">@android:color/black</item>
-        <item name="android:windowBackground">@null</item>
-        <item name="android:windowTranslucentNavigation">false</item>
-        <!-- Allows to show the app behind the camera notch in landscape and when hiding the status bar -->
-        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
-    </style>
-</resources>
diff --git a/android/app/src/main/res/values-night/themes.xml b/android/app/src/main/res/values-night/themes.xml
deleted file mode 100644
index 5438c7341..000000000
--- a/android/app/src/main/res/values-night/themes.xml
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Night theme -->
-    <style name="MwmTheme.Night.Base" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge">
-        <item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item>
-        <item name="materialCalendarFullscreenTheme">@style/MwmWidget.MaterialCalendar.Theme.FullScreen.Dark</item>
-        <item name="materialCalendarTheme">@style/MwmWidget.MaterialCalendar.Theme.Dark</item>
-        <item name="android:listViewStyle">@style/MwmWidget.ListView</item>
-        <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
-        <item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
-
-        <item name="android:textColorPrimary">@color/text_light</item>
-        <item name="android:textColorPrimaryInverse">@color/text_dark</item>
-        <item name="android:textColorSecondary">@color/text_light_subtitle</item>
-        <item name="android:windowBackground">?windowBackgroundForced</item>
-        <item name="android:colorPrimaryDark">@color/bg_primary_dark_night</item>
-        <item name="colorPrimaryVariant">@color/bg_primary_dark_night</item>
-        <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
-        <item name="android:fontFamily">@string/robotoRegular</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        <item name="android:windowActionBarOverlay">true</item>
-        <item name="clickableBackground">?selectableItemBackground</item>
-        <item name="android:statusBarColor">?colorPrimary</item>
-        <item name="android:windowTranslucentNavigation">false</item>
-
-        <item name="alertDialogTheme">@style/MwmTheme.Night.AlertDialog</item>
-        <item name="windowBackgroundForced">@color/bg_window_night</item>
-        <item name="cardBackground">@color/bg_cards_night</item>
-        <item name="titleDialogTheme">@color/white_primary</item>
-        <item name="textDialogTheme">@color/white_secondary</item>
-        <item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen.Night</item>
-        <item name="colorPrimary">@color/bg_primary_night</item>
-        <item name="colorControlNormal">?secondary</item>
-        <item name="colorAccent">@color/base_accent_night</item>
-        <item name="colorSecondary">@color/base_accent_night</item>
-        <item name="colorAccentTransparent">@color/base_accent_transparent</item>
-        <item name="colorBtnHighlight">@color/white_24</item>
-        <item name="panel">@color/bg_panel_night</item>
-        <item name="colorLogo">@color/base_accent_night</item>
-        <item name="iconTint">@color/white_secondary</item>
-        <item name="iconTintDisabled">@color/white_12</item>
-        <item name="iconTintActive">@color/yellow</item>
-        <item name="iconTintLight">@color/icon_tint_light_night</item>
-
-        <item name="secondary">@color/text_light_hint</item>
-        <item name="dividerHorizontal">@color/divider_night</item>
-
-        <item name="ppBackground">@color/bg_cards_night</item>
-        <item name="ppButtonsBackground">@color/bg_window_night</item>
-        <item name="ppFloatingMarkerIconColor">@color/white_54</item>
-
-        <item name="navNextTurnFrame">@drawable/bg_nav_next_turn_night</item>
-        <item name="navNextNextTurnFrame">@drawable/bg_nav_next_next_turn_night</item>
-        <item name="navLanesBackgroundColor">@color/base_accent_night</item>
-        <item name="navLaneArrowActiveColor">@color/nav_lane_arrow_active_night</item>
-        <item name="navLaneArrowInactiveColor">@color/nav_lane_arrow_inactive_night</item>
-
-        <item name="buttonBackground">@drawable/button_night</item>
-        <item name="buttonTextColor">@color/button_text_night</item>
-        <item name="buttonTextColorDisabled">@color/button_text_disabled_night</item>
-        <item name="buttonDialogTextColor">@color/base_accent_night</item>
-
-        <item name="accentButtonBackground">@drawable/button_accent_night</item>
-        <item name="accentButtonTextColor">@color/button_accent_text_night</item>
-        <!-- TODO: remove accentButtonTextColorDisabled attribute and use everywhere
-                   accentButtonTextColor selector -->
-        <item name="accentButtonTextColorDisabled">@color/button_accent_text_disabled_night</item>
-
-        <item name="primaryButtonBackground">@drawable/button_accent_night</item>
-
-        <item name="menuBackground">@color/bg_menu_night</item>
-
-        <item name="myPositionButtonAnimation">@drawable/ic_menu_location_pending_night</item>
-        <item name="wheelPendingAnimation">@drawable/anim_spinner_pending</item>
-        <item name="trafficLoadingAnimation">@drawable/anim_traffic_loading_night</item>
-
-        <item name="navButtonsThemeRect">@style/MwmTheme.NavButtonsRect.Night</item>
-        <item name="navButtonsThemeRound">@style/MwmTheme.NavButtonsRound.Night</item>
-        <item name="downloaderTheme">@style/MwmTheme.Downloader.Night</item>
-        <item name="navigationTheme">@style/MwmTheme.Navigation.Night</item>
-
-        <item name="routingButtonHint">@color/routing_button_tint</item>
-
-        <item name="android:listDivider">@drawable/list_divider_night</item>
-
-        <item name="transitPedestrianBackground">@color/white_4</item>
-        <item name="transitRulerBackground">@color/white_4</item>
-        <item name="transitStepDivider">@drawable/dot_divider_night</item>
-        <item name="accentColorSelector">@color/accent_color_selector_night</item>
-        <item name="android:textAppearance">@style/TextAppearance</item>
-        <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
-        <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
-        <item name="android:textAppearanceLarge">@style/TextAppearance.Large</item>
-        <item name="fontHeadline1">@style/TextAppearance.MdcTypographyStyles.Headline1</item>
-        <item name="fontHeadline2">@style/TextAppearance.MdcTypographyStyles.Headline2</item>
-        <item name="fontHeadline3">@style/TextAppearance.MdcTypographyStyles.Headline3</item>
-        <item name="fontHeadline4">@style/TextAppearance.MdcTypographyStyles.Headline4</item>
-        <item name="fontHeadline5">@style/TextAppearance.MaterialComponents.Headline5</item>
-        <item name="fontHeadline6">@style/TextAppearance.MdcTypographyStyles.Headline6</item>
-        <item name="fontSubtitle1">@style/TextAppearance.MdcTypographyStyles.Subtitle1</item>
-        <item name="fontSubtitle2">@style/TextAppearance.MdcTypographyStyles.Subtitle2</item>
-        <item name="fontBody1">@style/TextAppearance.MdcTypographyStyles.Body1</item>
-        <item name="fontBody2">@style/TextAppearance.MdcTypographyStyles.Body2</item>
-        <item name="fontButton">@style/TextAppearance.MdcTypographyStyles.Button</item>
-        <item name="fontCaption">@style/TextAppearance.MdcTypographyStyles.Caption</item>
-        <item name="fontOverline">@style/TextAppearance.MdcTypographyStyles.Overline</item>
-        <item name="drivingOptionsViewBg">@color/bg_primary_dark_night</item>
-        <item name="elevationProfilePropertyBg">@drawable/bg_rounded_rect_night</item>
-        <item name="elevationProfilePropIconTint">@color/white_secondary</item>
-        <item name="altitudeBg">@drawable/bg_altitude_night</item>
-        <item name="elevationProfileAxisLabelColor">@color/white_54</item>
-        <item name="elevationProfileYourLocationPinBg">@drawable/bg_your_location_pin_night</item>
-        <item name="elevationProfileSelectedPointBg">@drawable/bg_point_desc_night</item>
-        <item name="elevationProfileSelectedPointTriangle">@drawable/ic_triangle_night</item>
-        <item name="elevationProfileFloatingTriangle">@drawable/ic_triangle_elevation_night</item>
-        <item name="elevationProfileColor">@color/elevation_profile_dark</item>
-        <item name="android:popupMenuStyle">@style/PopupMenu.Dark</item>
-
-        <item name="bottomSheetStyle">@style/MwmWidget.BottomSheet</item>
-        <item name="bottomSheetDialogTheme">@style/MwmTheme.BottomSheetDialog</item>
-    </style>
-
-    <style name="MwmTheme.Night" parent="MwmTheme.Night.Base"/>
-
-    <style name="MwmTheme.Night.Splash">
-        <item name="android:windowBackground">@color/bg_primary_night</item>
-        <item name="android:textColorPrimary">@color/white_primary</item>
-        <item name="android:navigationBarColor">@color/bg_primary_night</item>
-        <item name="android:statusBarColor">@color/bg_primary_night</item>
-    </style>
-
-    <!-- Theme is overridden in v27 folder to handle cutouts -->
-    <style name="MwmTheme.Night.MainActivity">
-        <item name="android:colorPrimaryDark">@android:color/black</item>
-        <item name="colorPrimaryVariant">@android:color/black</item>
-        <item name="android:windowBackground">@null</item>
-        <item name="android:windowTranslucentNavigation">false</item>
-    </style>
-
-    <style name="MwmTheme.Night.CardBg">
-        <item name="android:windowBackground">@color/bg_cards_night</item>
-    </style>
-
-
-    <style name="MwmTheme.Night.WindowBg">
-        <item name="android:windowBackground">@color/bg_window_night</item>
-    </style>
-
-    <style name="MwmTheme.Night.AlertDialog" parent="Theme.MaterialComponents.Dialog.Alert">
-        <item name="colorAccent">?buttonDialogTextColor</item>
-        <item name="colorSecondary">?buttonDialogTextColor</item>
-        <item name="colorPrimary">?buttonDialogTextColor</item>
-        <item name="android:background">?cardBackground</item>
-        <!-- Used for the message in the dialog -->
-        <item name="android:textColorPrimary">?textDialogTheme</item>
-        <item name="android:textSize">@dimen/text_size_body_1</item>
-        <!-- Used for the title in the dialog -->
-        <item name="android:windowTitleStyle">@style/MwmTheme.DialogTitleStyle.Night</item>
-    </style>
-
-    <style name="MwmTheme.DialogTitleStyle.Night" parent="MwmTheme.DialogTitleBase">
-        <item name="android:textColor">?titleDialogTheme</item>
-    </style>
-
-    <style name="MwmTheme.DialogFragment.Fullscreen.Night" parent="Theme.AppCompat">
-        <item name="android:colorPrimaryDark">?statusBar</item>
-        <item name="colorAccent">@color/base_accent_night</item>
-        <item name="colorPrimary">@color/bg_primary_night</item>
-        <item name="colorPrimaryVariant">?statusBar</item>
-        <item name="colorSecondary">@color/base_accent_night</item>
-        <item name="clickableBackground">?selectableItemBackground</item>
-        <item name="colorControlNormal">@color/text_dark_hint</item>
-        <item name="android:windowIsFloating">false</item>
-        <item name="android:textColorHint">@color/text_light_hint</item>
-        <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
-        <item name="android:colorBackgroundCacheHint">@null</item>
-        <item name="android:fontFamily">@string/robotoRegular</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-    </style>
-
-    <style name="MwmTheme.DialogFragment.NoFullscreen.Night" parent="MwmTheme.DialogFragment.Fullscreen.Night">
-        <item name="android:windowTranslucentStatus">false</item>
-        <item name="android:statusBarColor">@color/bg_dialog_translucent</item>
-    </style>
-
-    <style name="MwmMain.DialogFragment.TimePicker.Night" parent="Theme.MaterialComponents.Dialog.Alert">
-        <item name="colorAccent">@color/base_accent_night</item>
-        <item name="colorSecondary">@color/base_accent_night</item>
-        <item name="colorPrimary">?buttonDialogTextColor</item>
-        <item name="android:fontFamily">@string/robotoMedium</item>
-        <item name="android:windowBackground">@color/bg_cards_night</item>
-        <item name="android:background">@color/bg_cards_night</item>
-    </style>
-
-    <style name="MwmTheme.Downloader.Night">
-        <item name="status_done">@drawable/downloader_done_night</item>
-        <item name="status_downloadable">@drawable/downloader_download_night</item>
-        <item name="status_folder">@drawable/downloader_folder_night</item>
-        <item name="status_folder_done">@drawable/downloader_folder_done_night</item>
-    </style>
-
-    <style name="MwmTheme.NavButtonsRound.Night" parent="MwmTheme.Night">
-        <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_round_night</item>
-    </style>
-
-    <style name="MwmTheme.NavButtonsRect.Night" parent="MwmTheme.Night">
-        <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_rect_night</item>
-    </style>
-
-    <style name="MwmTheme.Navigation.Night" parent="MwmTheme.Night">
-        <item name="iconTint">@color/black_primary</item>
-    </style>
-
-    <style name="PopupMenu.Dark" parent="ThemeOverlay.MaterialComponents.Dark">
-        <item name="android:popupBackground">?windowBackgroundForced</item>
-    </style>
-</resources>
diff --git a/android/app/src/main/res/values-v27/themes.xml b/android/app/src/main/res/values-v27/themes.xml
index 1f4882c4d..be189822b 100644
--- a/android/app/src/main/res/values-v27/themes.xml
+++ b/android/app/src/main/res/values-v27/themes.xml
@@ -9,4 +9,12 @@
     <!-- Allows to show the app behind the camera notch in landscape and when hiding the status bar -->
     <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
   </style>
+  <style name="MwmTheme.Night.MainActivity">
+    <item name="android:colorPrimaryDark">@android:color/black</item>
+    <item name="colorPrimaryVariant">@android:color/black</item>
+    <item name="android:windowBackground">@null</item>
+    <item name="android:windowTranslucentNavigation">false</item>
+    <!-- Allows to show the app behind the camera notch in landscape and when hiding the status bar -->
+    <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+  </style>
 </resources>
diff --git a/android/app/src/main/res/values/themes.xml b/android/app/src/main/res/values/themes.xml
index c248f16e8..24d351b77 100644
--- a/android/app/src/main/res/values/themes.xml
+++ b/android/app/src/main/res/values/themes.xml
@@ -134,7 +134,128 @@
     <item name="bottomSheetDialogTheme">@style/MwmTheme.BottomSheetDialog</item>
   </style>
 
+    <!-- Night theme -->
+    <style name="MwmTheme.Night.Base" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge">
+      <item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item>
+      <item name="materialCalendarFullscreenTheme">@style/MwmWidget.MaterialCalendar.Theme.FullScreen.Dark</item>
+      <item name="materialCalendarTheme">@style/MwmWidget.MaterialCalendar.Theme.Dark</item>
+      <item name="android:listViewStyle">@style/MwmWidget.ListView</item>
+      <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
+      <item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
+
+      <item name="android:textColorPrimary">@color/text_light</item>
+      <item name="android:textColorPrimaryInverse">@color/text_dark</item>
+      <item name="android:textColorSecondary">@color/text_light_subtitle</item>
+      <item name="android:windowBackground">?windowBackgroundForced</item>
+      <item name="android:colorPrimaryDark">@color/bg_primary_dark_night</item>
+      <item name="colorPrimaryVariant">@color/bg_primary_dark_night</item>
+      <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
+      <item name="android:fontFamily">@string/robotoRegular</item>
+      <item name="android:colorBackgroundCacheHint">@null</item>
+      <item name="android:windowActionBarOverlay">true</item>
+      <item name="clickableBackground">?selectableItemBackground</item>
+      <item name="android:statusBarColor">?colorPrimary</item>
+      <item name="android:windowTranslucentNavigation">false</item>
+
+      <item name="alertDialogTheme">@style/MwmTheme.Night.AlertDialog</item>
+      <item name="windowBackgroundForced">@color/bg_window_night</item>
+      <item name="cardBackground">@color/bg_cards_night</item>
+      <item name="titleDialogTheme">@color/white_primary</item>
+      <item name="textDialogTheme">@color/white_secondary</item>
+      <item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen.Night</item>
+      <item name="colorPrimary">@color/bg_primary_night</item>
+      <item name="colorControlNormal">?secondary</item>
+      <item name="colorAccent">@color/base_accent_night</item>
+      <item name="colorSecondary">@color/base_accent_night</item>
+      <item name="colorAccentTransparent">@color/base_accent_transparent</item>
+      <item name="colorBtnHighlight">@color/white_24</item>
+      <item name="panel">@color/bg_panel_night</item>
+      <item name="colorLogo">@color/base_accent_night</item>
+      <item name="iconTint">@color/white_secondary</item>
+      <item name="iconTintDisabled">@color/white_12</item>
+      <item name="iconTintActive">@color/yellow</item>
+      <item name="iconTintLight">@color/icon_tint_light_night</item>
+
+      <item name="secondary">@color/text_light_hint</item>
+      <item name="dividerHorizontal">@color/divider_night</item>
+
+      <item name="ppBackground">@color/bg_cards_night</item>
+      <item name="ppButtonsBackground">@color/bg_window_night</item>
+      <item name="ppFloatingMarkerIconColor">@color/white_54</item>
+
+      <item name="navNextTurnFrame">@drawable/bg_nav_next_turn_night</item>
+      <item name="navNextNextTurnFrame">@drawable/bg_nav_next_next_turn_night</item>
+      <item name="navLanesBackgroundColor">@color/base_accent_night</item>
+      <item name="navLaneArrowActiveColor">@color/nav_lane_arrow_active_night</item>
+      <item name="navLaneArrowInactiveColor">@color/nav_lane_arrow_inactive_night</item>
+
+      <item name="buttonBackground">@drawable/button_night</item>
+      <item name="buttonTextColor">@color/button_text_night</item>
+      <item name="buttonTextColorDisabled">@color/button_text_disabled_night</item>
+      <item name="buttonDialogTextColor">@color/base_accent_night</item>
+
+      <item name="accentButtonBackground">@drawable/button_accent_night</item>
+      <item name="accentButtonTextColor">@color/button_accent_text_night</item>
+      <!-- TODO: remove accentButtonTextColorDisabled attribute and use everywhere
+                 accentButtonTextColor selector -->
+      <item name="accentButtonTextColorDisabled">@color/button_accent_text_disabled_night</item>
+
+      <item name="primaryButtonBackground">@drawable/button_accent_night</item>
+
+      <item name="menuBackground">@color/bg_menu_night</item>
+
+      <item name="myPositionButtonAnimation">@drawable/ic_menu_location_pending_night</item>
+      <item name="wheelPendingAnimation">@drawable/anim_spinner_pending</item>
+      <item name="trafficLoadingAnimation">@drawable/anim_traffic_loading_night</item>
+
+      <item name="navButtonsThemeRect">@style/MwmTheme.NavButtonsRect.Night</item>
+      <item name="navButtonsThemeRound">@style/MwmTheme.NavButtonsRound.Night</item>
+      <item name="downloaderTheme">@style/MwmTheme.Downloader.Night</item>
+      <item name="navigationTheme">@style/MwmTheme.Navigation.Night</item>
+
+      <item name="routingButtonHint">@color/routing_button_tint</item>
+
+      <item name="android:listDivider">@drawable/list_divider_night</item>
+
+      <item name="transitPedestrianBackground">@color/white_4</item>
+      <item name="transitRulerBackground">@color/white_4</item>
+      <item name="transitStepDivider">@drawable/dot_divider_night</item>
+      <item name="accentColorSelector">@color/accent_color_selector_night</item>
+      <item name="android:textAppearance">@style/TextAppearance</item>
+      <item name="android:textAppearanceSmall">@style/TextAppearance.Small</item>
+      <item name="android:textAppearanceMedium">@style/TextAppearance.Medium</item>
+      <item name="android:textAppearanceLarge">@style/TextAppearance.Large</item>
+      <item name="fontHeadline1">@style/TextAppearance.MdcTypographyStyles.Headline1</item>
+      <item name="fontHeadline2">@style/TextAppearance.MdcTypographyStyles.Headline2</item>
+      <item name="fontHeadline3">@style/TextAppearance.MdcTypographyStyles.Headline3</item>
+      <item name="fontHeadline4">@style/TextAppearance.MdcTypographyStyles.Headline4</item>
+      <item name="fontHeadline5">@style/TextAppearance.MaterialComponents.Headline5</item>
+      <item name="fontHeadline6">@style/TextAppearance.MdcTypographyStyles.Headline6</item>
+      <item name="fontSubtitle1">@style/TextAppearance.MdcTypographyStyles.Subtitle1</item>
+      <item name="fontSubtitle2">@style/TextAppearance.MdcTypographyStyles.Subtitle2</item>
+      <item name="fontBody1">@style/TextAppearance.MdcTypographyStyles.Body1</item>
+      <item name="fontBody2">@style/TextAppearance.MdcTypographyStyles.Body2</item>
+      <item name="fontButton">@style/TextAppearance.MdcTypographyStyles.Button</item>
+      <item name="fontCaption">@style/TextAppearance.MdcTypographyStyles.Caption</item>
+      <item name="fontOverline">@style/TextAppearance.MdcTypographyStyles.Overline</item>
+      <item name="drivingOptionsViewBg">@color/bg_primary_dark_night</item>
+      <item name="elevationProfilePropertyBg">@drawable/bg_rounded_rect_night</item>
+      <item name="elevationProfilePropIconTint">@color/white_secondary</item>
+      <item name="altitudeBg">@drawable/bg_altitude_night</item>
+      <item name="elevationProfileAxisLabelColor">@color/white_54</item>
+      <item name="elevationProfileYourLocationPinBg">@drawable/bg_your_location_pin_night</item>
+      <item name="elevationProfileSelectedPointBg">@drawable/bg_point_desc_night</item>
+      <item name="elevationProfileSelectedPointTriangle">@drawable/ic_triangle_night</item>
+      <item name="elevationProfileFloatingTriangle">@drawable/ic_triangle_elevation_night</item>
+      <item name="elevationProfileColor">@color/elevation_profile_dark</item>
+      <item name="android:popupMenuStyle">@style/PopupMenu.Dark</item>
+
+      <item name="bottomSheetStyle">@style/MwmWidget.BottomSheet</item>
+      <item name="bottomSheetDialogTheme">@style/MwmTheme.BottomSheetDialog</item>
+    </style>
+
   <style name="MwmTheme" parent="MwmTheme.Base"/>
+  <style name="MwmTheme.Night" parent="MwmTheme.Night.Base"/>
 
   <style name="MwmTheme.Splash">
     <item name="android:windowBackground">@color/bg_primary</item>
@@ -143,6 +264,13 @@
     <item name="android:statusBarColor">@color/bg_primary</item>
   </style>
 
+  <style name="MwmTheme.Night.Splash">
+    <item name="android:windowBackground">@color/bg_primary_night</item>
+    <item name="android:textColorPrimary">@color/white_primary</item>
+    <item name="android:navigationBarColor">@color/bg_primary_night</item>
+    <item name="android:statusBarColor">@color/bg_primary_night</item>
+  </style>
+
   <!-- Theme is overridden in v27 folder to handle cutouts -->
   <style name="MwmTheme.MainActivity">
     <item name="android:colorPrimaryDark">@android:color/black</item>
@@ -151,6 +279,14 @@
     <item name="android:windowTranslucentNavigation">false</item>
   </style>
 
+  <!-- Theme is overridden in v27 folder to handle cutouts -->
+  <style name="MwmTheme.Night.MainActivity">
+    <item name="android:colorPrimaryDark">@android:color/black</item>
+    <item name="colorPrimaryVariant">@android:color/black</item>
+    <item name="android:windowBackground">@null</item>
+    <item name="android:windowTranslucentNavigation">false</item>
+  </style>
+
   <style name="MwmTheme.DownloadResourcesLegacy">
     <item name="android:statusBarColor">@android:color/white</item>
     <item name="android:navigationBarColor">@android:color/transparent</item>
@@ -160,10 +296,18 @@
     <item name="android:windowBackground">@color/bg_cards</item>
   </style>
 
+  <style name="MwmTheme.Night.CardBg">
+    <item name="android:windowBackground">@color/bg_cards_night</item>
+  </style>
+
   <style name="MwmTheme.WindowBg">
     <item name="android:windowBackground">@color/bg_window</item>
   </style>
 
+  <style name="MwmTheme.Night.WindowBg">
+    <item name="android:windowBackground">@color/bg_window_night</item>
+  </style>
+
   <style name="MwmTheme.AlertDialog" parent="Theme.MaterialComponents.Light.Dialog.Alert">
     <item name="colorAccent">?buttonDialogTextColor</item>
     <item name="colorSecondary">?buttonDialogTextColor</item>
@@ -174,6 +318,18 @@
     <item name="android:windowTitleStyle">@style/MwmTheme.DialogTitleStyle.Light</item>
   </style>
 
+  <style name="MwmTheme.Night.AlertDialog" parent="Theme.MaterialComponents.Dialog.Alert">
+    <item name="colorAccent">?buttonDialogTextColor</item>
+    <item name="colorSecondary">?buttonDialogTextColor</item>
+    <item name="colorPrimary">?buttonDialogTextColor</item>
+    <item name="android:background">?cardBackground</item>
+    <!-- Used for the message in the dialog -->
+    <item name="android:textColorPrimary">?textDialogTheme</item>
+    <item name="android:textSize">@dimen/text_size_body_1</item>
+    <!-- Used for the title in the dialog -->
+    <item name="android:windowTitleStyle">@style/MwmTheme.DialogTitleStyle.Night</item>
+  </style>
+
   <style name="MwmTheme.DialogTitleBase">
     <item name="android:textSize">@dimen/text_size_alert_dialog_title</item>
     <item name="android:fontFamily">@string/robotoMedium</item>
@@ -183,6 +339,10 @@
     <item name="android:textColor">?titleDialogTheme</item>
   </style>
 
+  <style name="MwmTheme.DialogTitleStyle.Night" parent="MwmTheme.DialogTitleBase">
+    <item name="android:textColor">?titleDialogTheme</item>
+  </style>
+
   <style name="MwmTheme.DialogFragment.Fullscreen" parent="Theme.AppCompat.Light">
     <item name="android:colorPrimaryDark">?statusBar</item>
     <item name="colorAccent">@color/base_accent</item>
@@ -200,11 +360,33 @@
     <item name="android:statusBarColor">@android:color/transparent</item>
   </style>
 
+  <style name="MwmTheme.DialogFragment.Fullscreen.Night" parent="Theme.AppCompat">
+    <item name="android:colorPrimaryDark">?statusBar</item>
+    <item name="colorAccent">@color/base_accent_night</item>
+    <item name="colorPrimary">@color/bg_primary_night</item>
+    <item name="colorPrimaryVariant">?statusBar</item>
+    <item name="colorSecondary">@color/base_accent_night</item>
+    <item name="clickableBackground">?selectableItemBackground</item>
+    <item name="colorControlNormal">@color/text_dark_hint</item>
+    <item name="android:windowIsFloating">false</item>
+    <item name="android:textColorHint">@color/text_light_hint</item>
+    <item name="android:textViewStyle">@style/MwmWidget.TextView</item>
+    <item name="android:colorBackgroundCacheHint">@null</item>
+    <item name="android:fontFamily">@string/robotoRegular</item>
+    <item name="android:windowTranslucentStatus">true</item>
+    <item name="android:statusBarColor">@android:color/transparent</item>
+  </style>
+
   <style name="MwmTheme.DialogFragment.NoFullscreen" parent="MwmTheme.DialogFragment.Fullscreen">
     <item name="android:windowTranslucentStatus">false</item>
     <item name="android:statusBarColor">@color/bg_dialog_translucent</item>
   </style>
 
+  <style name="MwmTheme.DialogFragment.NoFullscreen.Night" parent="MwmTheme.DialogFragment.Fullscreen.Night">
+    <item name="android:windowTranslucentStatus">false</item>
+    <item name="android:statusBarColor">@color/bg_dialog_translucent</item>
+  </style>
+
   <style name="MwmTheme.DialogFragment.Fullscreen.Translucent">
     <item name="android:colorPrimaryDark">@android:color/black</item>
     <item name="colorPrimaryVariant">@android:color/black</item>
@@ -222,6 +404,15 @@
     <item name="android:background">@color/bg_cards</item>
   </style>
 
+  <style name="MwmMain.DialogFragment.TimePicker.Night" parent="Theme.MaterialComponents.Dialog.Alert">
+    <item name="colorAccent">@color/base_accent_night</item>
+    <item name="colorSecondary">@color/base_accent_night</item>
+    <item name="colorPrimary">?buttonDialogTextColor</item>
+    <item name="android:fontFamily">@string/robotoMedium</item>
+    <item name="android:windowBackground">@color/bg_cards_night</item>
+    <item name="android:background">@color/bg_cards_night</item>
+  </style>
+
   <style name="MwmTheme.ProgressDialog" parent="MwmTheme.AlertDialog">
     <item name="android:textColor">?textDialogTheme</item>
   </style>
@@ -235,19 +426,43 @@
     <item name="status_folder_done">@drawable/downloader_folder_done</item>
   </style>
 
+  <style name="MwmTheme.Downloader.Night">
+    <item name="status_done">@drawable/downloader_done_night</item>
+    <item name="status_downloadable">@drawable/downloader_download_night</item>
+    <item name="status_folder">@drawable/downloader_folder_night</item>
+    <item name="status_folder_done">@drawable/downloader_folder_done_night</item>
+  </style>
+
   <style name="MwmTheme.NavButtonsRound">
     <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_round</item>
   </style>
 
+  <style name="MwmTheme.NavButtonsRound.Night" parent="MwmTheme.Night">
+    <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_round_night</item>
+  </style>
+
   <style name="MwmTheme.NavButtonsRect">
     <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_rect</item>
   </style>
 
+  <style name="MwmTheme.NavButtonsRect.Night" parent="MwmTheme.Night">
+    <item name="searchLayoutBackground">@drawable/bg_search_wheel_background_rect_night</item>
+  </style>
+
+
   <style name="MwmTheme.Navigation">
     <item name="iconTint">@color/white_primary</item>
   </style>
 
+  <style name="MwmTheme.Navigation.Night" parent="MwmTheme.Night">
+    <item name="iconTint">@color/black_primary</item>
+  </style>
+
   <style name="PopupMenu" parent="ThemeOverlay.MaterialComponents">
     <item name="android:popupBackground">?windowBackgroundForced</item>
   </style>
+
+  <style name="PopupMenu.Dark" parent="ThemeOverlay.MaterialComponents.Dark">
+    <item name="android:popupBackground">?windowBackgroundForced</item>
+  </style>
 </resources>

From 94251387824e9ee9cfb321e50c858e9e12d00ebb Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Sat, 23 Aug 2025 10:46:32 +0200
Subject: [PATCH 244/302] [android] Migrate Manage route and save buttons to
 Material Components

Signed-off-by: jeanbaptisteC <jeanbaptiste.charron@outlook.fr>
---
 .../routing/RoutingBottomMenuController.java      |  8 +++++---
 .../main/res/layout-land/altitude_chart_panel.xml | 14 +++++++++-----
 .../layout-w1020dp-land/altitude_chart_panel.xml  | 14 +++++++++-----
 .../src/main/res/layout/altitude_chart_panel.xml  | 15 ++++++++++-----
 4 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java b/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
index 6ff7b45bf..a9de92638 100644
--- a/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/RoutingBottomMenuController.java
@@ -45,6 +45,8 @@ import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.widget.recycler.DotDividerItemDecoration;
 import app.organicmaps.widget.recycler.MultilineLayoutManager;
+
+import com.google.android.material.button.MaterialButton;
 import com.google.android.material.imageview.ShapeableImageView;
 import com.google.android.material.textview.MaterialTextView;
 import java.util.LinkedList;
@@ -153,10 +155,10 @@ final class RoutingBottomMenuController implements View.OnClickListener
     mTransitViewDecorator =
         new DotDividerItemDecoration(dividerDrawable, res.getDimensionPixelSize(R.dimen.margin_base),
                                      res.getDimensionPixelSize(R.dimen.margin_half));
-    Button manageRouteButton = altitudeChartFrame.findViewById(R.id.btn__manage_route);
+    MaterialButton manageRouteButton = altitudeChartFrame.findViewById(R.id.btn__manage_route);
     manageRouteButton.setOnClickListener(this);
 
-    Button saveButton = altitudeChartFrame.findViewById(R.id.btn__save);
+    MaterialButton saveButton = altitudeChartFrame.findViewById(R.id.btn__save);
     saveButton.setOnClickListener(this);
   }
 
@@ -168,7 +170,7 @@ final class RoutingBottomMenuController implements View.OnClickListener
       showRouteAltitudeChart();
     showRoutingDetails();
     UiUtils.show(mAltitudeChartFrame);
-    Button saveButton = mAltitudeChartFrame.findViewById(R.id.btn__save);
+    MaterialButton saveButton = mAltitudeChartFrame.findViewById(R.id.btn__save);
     saveButton.setText(R.string.save);
     saveButton.setEnabled(true);
   }
diff --git a/android/app/src/main/res/layout-land/altitude_chart_panel.xml b/android/app/src/main/res/layout-land/altitude_chart_panel.xml
index f5fcb7822..4938d5ea3 100644
--- a/android/app/src/main/res/layout-land/altitude_chart_panel.xml
+++ b/android/app/src/main/res/layout-land/altitude_chart_panel.xml
@@ -3,6 +3,7 @@
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:id="@+id/altitude_chart_panel"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
@@ -63,17 +64,19 @@
       tools:text="5 h 55 min • 1555km"
       tools:visibility="visible" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
       android:id="@+id/btn__manage_route"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginStart="6dp"
       style="@style/MwmWidget.Button"
       android:text="@string/planning_route_manage_route"
-      android:drawableStart="@drawable/ic_manage_route"
-      android:drawablePadding="6dp"/>
+      android:textColor="?android:textColorPrimary"
+      app:icon="@drawable/ic_manage_route"
+      app:iconTint="?android:textColorPrimary"
+      app:iconPadding="6dp"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btn__save"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -82,7 +85,8 @@
         android:layout_marginStart="@dimen/margin_base"
         android:minHeight="@dimen/primary_button_min_height"
         style="@style/MwmWidget.Button"
-        android:text="@string/save"/>
+        android:text="@string/save"
+        android:textColor="?android:textColorPrimary"/>
 
     <Button
       android:id="@+id/start"
diff --git a/android/app/src/main/res/layout-w1020dp-land/altitude_chart_panel.xml b/android/app/src/main/res/layout-w1020dp-land/altitude_chart_panel.xml
index 414abd3bb..48f90a6e5 100644
--- a/android/app/src/main/res/layout-w1020dp-land/altitude_chart_panel.xml
+++ b/android/app/src/main/res/layout-w1020dp-land/altitude_chart_panel.xml
@@ -3,6 +3,7 @@
 <LinearLayout
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
   android:id="@+id/altitude_chart_panel"
   android:layout_width="match_parent"
   android:layout_height="wrap_content"
@@ -82,24 +83,27 @@
       android:layout_weight="10"
       android:layout_gravity="center_vertical" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
       android:id="@+id/btn__manage_route"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginStart="6dp"
       style="@style/MwmWidget.Button"
       android:text="@string/planning_route_manage_route"
-      android:drawableStart="@drawable/ic_manage_route"
-      android:drawablePadding="6dp"/>
+      android:textColor="?android:textColorPrimary"
+      app:icon="@drawable/ic_manage_route"
+      app:iconTint="?android:textColorPrimary"
+      app:iconPadding="6dp"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/btn__save"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/margin_base"
         style="@style/MwmWidget.Button"
         android:minHeight="@dimen/primary_button_min_height"
-        android:text="@string/save"/>
+        android:text="@string/save"
+        android:textColor="?android:textColorPrimary"/>
 
     <Button
       android:id="@+id/start"
diff --git a/android/app/src/main/res/layout/altitude_chart_panel.xml b/android/app/src/main/res/layout/altitude_chart_panel.xml
index cb9e66d79..8a6cd89ce 100644
--- a/android/app/src/main/res/layout/altitude_chart_panel.xml
+++ b/android/app/src/main/res/layout/altitude_chart_panel.xml
@@ -3,6 +3,7 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/altitude_chart_panel"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -88,17 +89,20 @@
         android:layout_height="wrap_content"
         android:orientation="horizontal"
         android:gravity="center_vertical" >
-        <Button
+        <com.google.android.material.button.MaterialButton
           android:layout_weight="1"
           android:id="@+id/btn__manage_route"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           style="@style/MwmWidget.Button"
           android:text="@string/planning_route_manage_route"
-          android:drawableStart="@drawable/ic_manage_route"
-          android:drawablePadding="@dimen/margin_quarter_plus"/>
+          android:textColor="?android:textColorPrimary"
+          android:textAlignment="viewStart"
+          app:icon="@drawable/ic_manage_route"
+          app:iconTint="?android:textColorPrimary"
+          app:iconPadding="@dimen/margin_quarter_plus"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
           android:layout_weight="0"
           android:id="@+id/btn__save"
           android:layout_width="wrap_content"
@@ -106,7 +110,8 @@
           style="@style/MwmWidget.Button"
           android:layout_marginStart="@dimen/margin_base"
           android:minHeight="@dimen/primary_button_min_height"
-          android:text="@string/save"/>
+          android:text="@string/save"
+          android:textColor="?android:textColorPrimary"/>
     </LinearLayout>
 
 </LinearLayout>

From 4861ae7e67d667f104dc8926683656e1840fafff Mon Sep 17 00:00:00 2001
From: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
Date: Fri, 22 Aug 2025 18:35:06 +0200
Subject: [PATCH 245/302] [android] Add new custom switch for preference

Signed-off-by: jeanbaptisteC <jeanbaptiste.charron@outlook.fr>
---
 android/app/src/main/res/layout/preference_switch.xml | 9 +++++++++
 android/app/src/main/res/values/styles.xml            | 7 +++++++
 2 files changed, 16 insertions(+)
 create mode 100644 android/app/src/main/res/layout/preference_switch.xml

diff --git a/android/app/src/main/res/layout/preference_switch.xml b/android/app/src/main/res/layout/preference_switch.xml
new file mode 100644
index 000000000..87ded4583
--- /dev/null
+++ b/android/app/src/main/res/layout/preference_switch.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Derived from https://github.com/androidx/androidx/blob/8cb282cc/preference/preference/res/layout/preference_widget_switch_compat.xml -->
+<com.google.android.material.materialswitch.MaterialSwitch xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/switchWidget"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@null"
+    android:clickable="false"
+    android:focusable="false" />
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index a2af6c49f..042316a80 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -379,4 +379,11 @@
     <item name="android:textAllCaps">false</item>
   </style>
 
+  <style name="MwmWidget.Preference">
+    <item name="switchPreferenceCompatStyle">@style/MwmWidget.SwitchPreferenceCompat</item>
+  </style>
+
+  <style name="MwmWidget.SwitchPreferenceCompat" parent="Preference.SwitchPreferenceCompat.Material">
+    <item name="android:widgetLayout">@layout/preference_switch</item>
+  </style>
 </resources>

From 5a603ebfae7c1bd990b7782b052883ed88dfcab4 Mon Sep 17 00:00:00 2001
From: x7z4w <x7z4w@noreply.codeberg.org>
Date: Fri, 8 Aug 2025 10:20:41 +0000
Subject: [PATCH 246/302] [styles] Night mode bookmarks

Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>
---
 data/styles/default/dark/style.mapcss              |  4 ++--
 .../default/dark/symbols/bookmark-animals-m.svg    |  8 ++++----
 .../styles/default/dark/symbols/bookmark-art-m.svg |  8 ++++----
 .../default/dark/symbols/bookmark-bank-m.svg       |  8 ++++----
 .../styles/default/dark/symbols/bookmark-bar-m.svg |  8 ++++----
 .../dark/symbols/bookmark-bicycle_parking-m.svg    |  8 ++++----
 .../symbols/bookmark-bicycle_parking_covered-m.svg | 10 +++++-----
 .../dark/symbols/bookmark-bicycle_rental-m.svg     | 14 +++++++-------
 .../default/dark/symbols/bookmark-buddhism-m.svg   |  8 ++++----
 .../default/dark/symbols/bookmark-building-m.svg   |  8 ++++----
 .../default/dark/symbols/bookmark-cafe-m.svg       |  8 ++++----
 .../dark/symbols/bookmark-charging_station-m.svg   |  8 ++++----
 .../dark/symbols/bookmark-christianity-m.svg       |  8 ++++----
 .../default/dark/symbols/bookmark-default-m.svg    |  8 ++++----
 .../default/dark/symbols/bookmark-default-s.svg    |  8 ++++----
 .../default/dark/symbols/bookmark-default-xs.svg   |  8 ++++----
 .../dark/symbols/bookmark-entertainment-m.svg      |  8 ++++----
 .../default/dark/symbols/bookmark-exchange-m.svg   |  8 ++++----
 .../default/dark/symbols/bookmark-fast_food-m.svg  |  8 ++++----
 .../styles/default/dark/symbols/bookmark-gas-m.svg |  8 ++++----
 .../default/dark/symbols/bookmark-hotel-m.svg      |  8 ++++----
 .../dark/symbols/bookmark-information-m.svg        |  8 ++++----
 .../default/dark/symbols/bookmark-islam-m.svg      |  8 ++++----
 .../default/dark/symbols/bookmark-judaism-m.svg    |  8 ++++----
 .../default/dark/symbols/bookmark-medicine-m.svg   |  8 ++++----
 .../default/dark/symbols/bookmark-mountain-m.svg   |  8 ++++----
 .../default/dark/symbols/bookmark-museum-m.svg     |  8 ++++----
 .../default/dark/symbols/bookmark-park-m.svg       |  8 ++++----
 .../default/dark/symbols/bookmark-parking-m.svg    |  8 ++++----
 .../default/dark/symbols/bookmark-pharmacy-m.svg   |  8 ++++----
 .../styles/default/dark/symbols/bookmark-pub-m.svg |  8 ++++----
 .../default/dark/symbols/bookmark-restaurant-m.svg |  8 ++++----
 .../default/dark/symbols/bookmark-shop-m.svg       |  8 ++++----
 .../default/dark/symbols/bookmark-sights-m.svg     |  8 ++++----
 .../default/dark/symbols/bookmark-sport-m.svg      |  8 ++++----
 .../default/dark/symbols/bookmark-stadium-m.svg    |  8 ++++----
 .../default/dark/symbols/bookmark-swim-m.svg       |  8 ++++----
 .../default/dark/symbols/bookmark-theatre-m.svg    |  8 ++++----
 .../default/dark/symbols/bookmark-transport-m.svg  |  2 +-
 .../default/dark/symbols/bookmark-viewpoint-m.svg  |  8 ++++----
 .../default/dark/symbols/bookmark-water-m.svg      |  8 ++++----
 data/styles/vehicle/dark/style.mapcss              |  4 ++--
 42 files changed, 165 insertions(+), 165 deletions(-)

diff --git a/data/styles/default/dark/style.mapcss b/data/styles/default/dark/style.mapcss
index 051ece6d5..3f8b3ec20 100644
--- a/data/styles/default/dark/style.mapcss
+++ b/data/styles/default/dark/style.mapcss
@@ -112,8 +112,8 @@ colors
   BookmarkYellow-color: #FFC800;
   BookmarkOrange-color: #FF9600;
   BookmarkDeepOrange-color: #F06432;
-  BookmarkBrown-color: #804633;
-  BookmarkGray-color: #737373;
+  BookmarkBrown-color: #8C4E39;
+  BookmarkGray-color: #808080;
   BookmarkBlueGray-color: #597380;
   SearchmarkPreparing-color: #597380;
   SearchmarkNotAvailable-color: #597380;
diff --git a/data/styles/default/dark/symbols/bookmark-animals-m.svg b/data/styles/default/dark/symbols/bookmark-animals-m.svg
index 568c7a616..b2be1d746 100644
--- a/data/styles/default/dark/symbols/bookmark-animals-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-animals-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m15.788 6.6222h-1.41l-0.15773-0.31527c-0.1194-0.23884-0.36352-0.38972-0.63052-0.38973h-1.1814l-0.60098-0.60101c-0.2223-0.22207-0.60188-0.06477-0.60188 0.24917v3.3011l2.82 1.007v-0.7839h0.70492c0.7788 0 1.41-0.63119 1.41-1.41v-0.70499c0-0.19476-0.15772-0.3525-0.3525-0.3525zm-2.4675 1.0575c-0.19478 0-0.3525-0.15774-0.3525-0.3525 0-0.19475 0.15772-0.3525 0.3525-0.3525s0.3525 0.15775 0.3525 0.3525c0 0.19476-0.15772 0.3525-0.3525 0.3525zm-6.345 1.7625c-0.38863 0-0.705-0.31636-0.705-0.70498 0-0.38929-0.3157-0.70499-0.70499-0.70499-0.38929 0-0.705 0.3157-0.705 0.70499 0 0.91778 0.5911 1.6931 1.41 1.985v4.7125c0 0.1947 0.15774 0.3525 0.3525 0.3525h1.41c0.19475 0 0.3525-0.1578 0.3525-0.3525v-2.4675h3.525v2.4675c0 0.1947 0.15772 0.3525 0.3525 0.3525h1.41c0.19477 0 0.3525-0.1578 0.3525-0.3525v-4.8127l-3.3036-1.1798z" fill="#fff"/>
+ <path d="m15.788 6.6222h-1.41l-0.15773-0.31527c-0.1194-0.23884-0.36352-0.38972-0.63052-0.38973h-1.1814l-0.60098-0.60101c-0.2223-0.22207-0.60188-0.06477-0.60188 0.24917v3.3011l2.82 1.007v-0.7839h0.70492c0.7788 0 1.41-0.63119 1.41-1.41v-0.70499c0-0.19476-0.15772-0.3525-0.3525-0.3525zm-2.4675 1.0575c-0.19478 0-0.3525-0.15774-0.3525-0.3525 0-0.19475 0.15772-0.3525 0.3525-0.3525s0.3525 0.15775 0.3525 0.3525c0 0.19476-0.15772 0.3525-0.3525 0.3525zm-6.345 1.7625c-0.38863 0-0.705-0.31636-0.705-0.70498 0-0.38929-0.3157-0.70499-0.70499-0.70499-0.38929 0-0.705 0.3157-0.705 0.70499 0 0.91778 0.5911 1.6931 1.41 1.985v4.7125c0 0.1947 0.15774 0.3525 0.3525 0.3525h1.41c0.19475 0 0.3525-0.1578 0.3525-0.3525v-2.4675h3.525v2.4675c0 0.1947 0.15772 0.3525 0.3525 0.3525h1.41c0.19477 0 0.3525-0.1578 0.3525-0.3525v-4.8127l-3.3036-1.1798z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-art-m.svg b/data/styles/default/dark/symbols/bookmark-art-m.svg
index 89a565e65..a1fb6443c 100644
--- a/data/styles/default/dark/symbols/bookmark-art-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-art-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m10.5 5.2499c-2.8992 0-5.25 2.3508-5.25 5.25 0 2.8992 2.3508 5.25 5.25 5.25 0.48417 0 0.8745-0.39034 0.8745-0.8745 0-0.2275-0.08413-0.43282-0.22705-0.5874-0.13708-0.15458-0.21826-0.35549-0.21826-0.58008 0-0.48417 0.39034-0.8745 0.8745-0.8745h1.0298c1.61 0 2.9165-1.3065 2.9165-2.9165 0-2.5784-2.3508-4.667-5.25-4.667zm1.4502 0.97852a1.0419 1.0419 0 0 1 1.0415 1.0415 1.0419 1.0419 0 0 1-1.0415 1.043 1.0419 1.0419 0 0 1-1.0415-1.043 1.0419 1.0419 0 0 1 1.0415-1.0415zm-2.9209 0.014648a1.0419 1.0419 0 0 1 1.0429 1.043 1.0419 1.0419 0 0 1-1.0429 1.0415 1.0419 1.0419 0 0 1-1.0415-1.0415 1.0419 1.0419 0 0 1 1.0415-1.043zm-1.749 2.3423a1.0419 1.0419 0 0 1 1.0415 1.0429 1.0419 1.0419 0 0 1-1.0415 1.0415 1.0419 1.0419 0 0 1-1.0415-1.0415 1.0419 1.0419 0 0 1 1.0415-1.0429zm6.4189 0a1.0419 1.0419 0 0 1 1.0415 1.0429 1.0419 1.0419 0 0 1-1.0415 1.0415 1.0419 1.0419 0 0 1-1.0415-1.0415 1.0419 1.0419 0 0 1 1.0415-1.0429z" fill="#fff"/>
+ <path d="m10.5 5.2499c-2.8992 0-5.25 2.3508-5.25 5.25 0 2.8992 2.3508 5.25 5.25 5.25 0.48417 0 0.8745-0.39034 0.8745-0.8745 0-0.2275-0.08413-0.43282-0.22705-0.5874-0.13708-0.15458-0.21826-0.35549-0.21826-0.58008 0-0.48417 0.39034-0.8745 0.8745-0.8745h1.0298c1.61 0 2.9165-1.3065 2.9165-2.9165 0-2.5784-2.3508-4.667-5.25-4.667zm1.4502 0.97852a1.0419 1.0419 0 0 1 1.0415 1.0415 1.0419 1.0419 0 0 1-1.0415 1.043 1.0419 1.0419 0 0 1-1.0415-1.043 1.0419 1.0419 0 0 1 1.0415-1.0415zm-2.9209 0.014648a1.0419 1.0419 0 0 1 1.0429 1.043 1.0419 1.0419 0 0 1-1.0429 1.0415 1.0419 1.0419 0 0 1-1.0415-1.0415 1.0419 1.0419 0 0 1 1.0415-1.043zm-1.749 2.3423a1.0419 1.0419 0 0 1 1.0415 1.0429 1.0419 1.0419 0 0 1-1.0415 1.0415 1.0419 1.0419 0 0 1-1.0415-1.0415 1.0419 1.0419 0 0 1 1.0415-1.0429zm6.4189 0a1.0419 1.0419 0 0 1 1.0415 1.0429 1.0419 1.0419 0 0 1-1.0415 1.0415 1.0419 1.0419 0 0 1-1.0415-1.0415 1.0419 1.0419 0 0 1 1.0415-1.0429z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-bank-m.svg b/data/styles/default/dark/symbols/bookmark-bank-m.svg
index a6c375e2f..61be81b4e 100644
--- a/data/styles/default/dark/symbols/bookmark-bank-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-bank-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m6 8.0768 4.5-2.0769 4.5 2.0769v0.69231h-0.69231v5.1923h0.69231v1.0384h-9v-1.0384h0.69231v-5.1923h-0.69231zm6.2308 3.6932c0-0.76522-0.77842-1.3852-1.7323-1.3852-0.31692 0-0.57846-0.20668-0.57846-0.46256s0.25846-0.46256 0.57846-0.46256c0.32 0 0.57846 0.20914 0.57846 0.46256h1.1539c0-0.60034-0.48308-1.1072-1.1539-1.2992v-0.54622h-1.1539v0.54622c-0.67077 0.19192-1.1539 0.69877-1.1539 1.2992 0 0.76522 0.77842 1.3852 1.7323 1.3852 0.32 0 0.57846 0.20668 0.57846 0.46256s-0.25846 0.46256-0.57846 0.46256c-0.32 0-0.57846-0.20914-0.57846-0.46256h-1.1539c0 0.60034 0.48308 1.1072 1.1539 1.2992v0.54622h1.1539v-0.54622c0.67077-0.19192 1.1539-0.69877 1.1539-1.2992z" fill="#fff"/>
+ <path d="m6 8.0768 4.5-2.0769 4.5 2.0769v0.69231h-0.69231v5.1923h0.69231v1.0384h-9v-1.0384h0.69231v-5.1923h-0.69231zm6.2308 3.6932c0-0.76522-0.77842-1.3852-1.7323-1.3852-0.31692 0-0.57846-0.20668-0.57846-0.46256s0.25846-0.46256 0.57846-0.46256c0.32 0 0.57846 0.20914 0.57846 0.46256h1.1539c0-0.60034-0.48308-1.1072-1.1539-1.2992v-0.54622h-1.1539v0.54622c-0.67077 0.19192-1.1539 0.69877-1.1539 1.2992 0 0.76522 0.77842 1.3852 1.7323 1.3852 0.32 0 0.57846 0.20668 0.57846 0.46256s-0.25846 0.46256-0.57846 0.46256c-0.32 0-0.57846-0.20914-0.57846-0.46256h-1.1539c0 0.60034 0.48308 1.1072 1.1539 1.2992v0.54622h1.1539v-0.54622c0.67077-0.19192 1.1539-0.69877 1.1539-1.2992z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-bar-m.svg b/data/styles/default/dark/symbols/bookmark-bar-m.svg
index e2dd2a786..47b0b196a 100644
--- a/data/styles/default/dark/symbols/bookmark-bar-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-bar-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m15 6.725c0-0.4-0.325-0.725-0.725-0.725h-7.5503c-0.4 0-0.725 0.325-0.725 0.725 0 0.175 0.065 0.35 0.185 0.48l3.815 4.295v2.5h-2c-0.275 0-0.5 0.225-0.5 0.5s0.225 0.5 0.5 0.5h5c0.275 0 0.5-0.225 0.5-0.5s-0.225-0.5-0.5-0.5h-2v-2.5l3.815-4.295c0.12-0.13 0.185-0.305 0.185-0.48zm-6.785 1.275-0.885-0.99998h6.345l-0.89002 0.99998z" fill="#fff"/>
+ <path d="m15 6.725c0-0.4-0.325-0.725-0.725-0.725h-7.5503c-0.4 0-0.725 0.325-0.725 0.725 0 0.175 0.065 0.35 0.185 0.48l3.815 4.295v2.5h-2c-0.275 0-0.5 0.225-0.5 0.5s0.225 0.5 0.5 0.5h5c0.275 0 0.5-0.225 0.5-0.5s-0.225-0.5-0.5-0.5h-2v-2.5l3.815-4.295c0.12-0.13 0.185-0.305 0.185-0.48zm-6.785 1.275-0.885-0.99998h6.345l-0.89002 0.99998z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-bicycle_parking-m.svg b/data/styles/default/dark/symbols/bookmark-bicycle_parking-m.svg
index 92867fe82..08b56ffb2 100644
--- a/data/styles/default/dark/symbols/bookmark-bicycle_parking-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-bicycle_parking-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m10.5 5.2674c-0.58277-0.0086-0.58277 0.87346 0 0.86515h1.293v1.0949l-2.4158 2.0192-0.84008-2.249h0.23911c0.58277 0.0086 0.58277-0.87346 0-0.86515h-1.724c-0.58277-0.0086-0.58277 0.87346 0 0.86515h0.56225l0.76778 2.0547c-0.40322-0.20123-0.85085-0.32443-1.33-0.32443-1.6611 0-3.0169 1.3607-3.0169 3.0279s1.3558 3.0279 3.0169 3.0279 3.0169-1.3607 3.0169-3.0279c0-0.57955-0.17264-1.1169-0.45623-1.5782l2.431-2.0327 0.399 1.0038c-0.89861 0.5254-1.5118 1.4922-1.5118 2.6072 0 1.6672 1.3558 3.0279 3.0169 3.0279 1.6611 0 3.0169-1.3607 3.0169-3.0279s-1.3558-3.0279-3.0169-3.0279c-0.24402 0-0.47787 0.03754-0.70547 0.09292l-0.58751-1.4751v-1.6457c0-0.23886-0.193-0.43256-0.43098-0.43256zm-3.4478 4.3256c0.51054 0 0.97192 0.18332 1.3401 0.47816l-1.6162 1.3518c-0.44038 0.36967 0.11015 1.0334 0.55217 0.66572l1.6162-1.3518c0.16222 0.30436 0.26264 0.64786 0.26264 1.0189 0 1.1996-0.95969 2.1629-2.1549 2.1629-1.1952 0-2.1549-0.96323-2.1549-2.1629 0-1.1996 0.95954-2.1628 2.1549-2.1628zm6.8956 0c1.1952 0 2.1549 0.96323 2.1549 2.1629 0 1.1996-0.95969 2.1628-2.1549 2.1628-1.1952 0-2.1549-0.96323-2.1549-2.1628 0-0.7587 0.38512-1.4206 0.96969-1.8063l0.78461 1.9668c0.21204 0.53906 1.0174 0.21637 0.80146-0.32105l-0.78277-1.9634c0.1243-0.02215 0.25118-0.03885 0.3821-0.03885z" fill="#fff"/>
+ <path d="m10.5 5.2674c-0.58277-0.0086-0.58277 0.87346 0 0.86515h1.293v1.0949l-2.4158 2.0192-0.84008-2.249h0.23911c0.58277 0.0086 0.58277-0.87346 0-0.86515h-1.724c-0.58277-0.0086-0.58277 0.87346 0 0.86515h0.56225l0.76778 2.0547c-0.40322-0.20123-0.85085-0.32443-1.33-0.32443-1.6611 0-3.0169 1.3607-3.0169 3.0279s1.3558 3.0279 3.0169 3.0279 3.0169-1.3607 3.0169-3.0279c0-0.57955-0.17264-1.1169-0.45623-1.5782l2.431-2.0327 0.399 1.0038c-0.89861 0.5254-1.5118 1.4922-1.5118 2.6072 0 1.6672 1.3558 3.0279 3.0169 3.0279 1.6611 0 3.0169-1.3607 3.0169-3.0279s-1.3558-3.0279-3.0169-3.0279c-0.24402 0-0.47787 0.03754-0.70547 0.09292l-0.58751-1.4751v-1.6457c0-0.23886-0.193-0.43256-0.43098-0.43256zm-3.4478 4.3256c0.51054 0 0.97192 0.18332 1.3401 0.47816l-1.6162 1.3518c-0.44038 0.36967 0.11015 1.0334 0.55217 0.66572l1.6162-1.3518c0.16222 0.30436 0.26264 0.64786 0.26264 1.0189 0 1.1996-0.95969 2.1629-2.1549 2.1629-1.1952 0-2.1549-0.96323-2.1549-2.1629 0-1.1996 0.95954-2.1628 2.1549-2.1628zm6.8956 0c1.1952 0 2.1549 0.96323 2.1549 2.1629 0 1.1996-0.95969 2.1628-2.1549 2.1628-1.1952 0-2.1549-0.96323-2.1549-2.1628 0-0.7587 0.38512-1.4206 0.96969-1.8063l0.78461 1.9668c0.21204 0.53906 1.0174 0.21637 0.80146-0.32105l-0.78277-1.9634c0.1243-0.02215 0.25118-0.03885 0.3821-0.03885z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-bicycle_parking_covered-m.svg b/data/styles/default/dark/symbols/bookmark-bicycle_parking_covered-m.svg
index cc117e50d..aea24971e 100644
--- a/data/styles/default/dark/symbols/bookmark-bicycle_parking_covered-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-bicycle_parking_covered-m.svg
@@ -2,12 +2,12 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m10.501 6.8646c-0.58277-0.00865-0.58277 0.87346 0 0.86515h1.293v1.0949l-2.4158 2.0192-0.84008-2.249h0.23911c0.58277 0.00865 0.58277-0.87346 0-0.86515h-1.724c-0.58277-0.00865-0.58277 0.87346 0 0.86515h0.56225l0.76778 2.0547c-0.40322-0.20123-0.85085-0.32443-1.33-0.32443-1.6611 0-3.0169 1.3607-3.0169 3.0279s1.3558 3.0279 3.0169 3.0279 3.0169-1.3607 3.0169-3.0279c0-0.57955-0.17264-1.1169-0.45623-1.5782l2.431-2.0327 0.399 1.0038c-0.89861 0.5254-1.5118 1.4922-1.5118 2.6072 0 1.6672 1.3558 3.0279 3.0169 3.0279 1.6612 0 3.0169-1.3607 3.0169-3.0279s-1.3558-3.0279-3.0169-3.0279c-0.24402 0-0.47787 0.03754-0.70547 0.09291l-0.58751-1.4751v-1.6457c0-0.23886-0.193-0.43256-0.43098-0.43256zm-3.4478 4.3256c0.51054 0 0.97192 0.18332 1.3401 0.47816l-1.6162 1.3518c-0.44038 0.36967 0.11015 1.0334 0.55217 0.66572l1.6162-1.3518c0.16222 0.30436 0.26264 0.64786 0.26264 1.0189 0 1.1996-0.95969 2.1629-2.1549 2.1629s-2.1549-0.96323-2.1549-2.1629c0-1.1996 0.95954-2.1628 2.1549-2.1628zm6.8956 0c1.1952 0 2.1549 0.96323 2.1549 2.1629 0 1.1996-0.95969 2.1628-2.1549 2.1628s-2.1549-0.96323-2.1549-2.1628c0-0.7587 0.38512-1.4206 0.96969-1.8063l0.78462 1.9668c0.21204 0.53906 1.0174 0.21637 0.80146-0.32105l-0.78277-1.9634c0.1243-0.02215 0.25118-0.03885 0.3821-0.03885z" fill="#fff" stroke-width=".76923"/>
- <path d="m4.5 7.2292 6-3 6 3" fill="none" stroke="#fff" stroke-linecap="round"/>
+ <path d="m10.501 6.8646c-0.58277-0.00865-0.58277 0.87346 0 0.86515h1.293v1.0949l-2.4158 2.0192-0.84008-2.249h0.23911c0.58277 0.00865 0.58277-0.87346 0-0.86515h-1.724c-0.58277-0.00865-0.58277 0.87346 0 0.86515h0.56225l0.76778 2.0547c-0.40322-0.20123-0.85085-0.32443-1.33-0.32443-1.6611 0-3.0169 1.3607-3.0169 3.0279s1.3558 3.0279 3.0169 3.0279 3.0169-1.3607 3.0169-3.0279c0-0.57955-0.17264-1.1169-0.45623-1.5782l2.431-2.0327 0.399 1.0038c-0.89861 0.5254-1.5118 1.4922-1.5118 2.6072 0 1.6672 1.3558 3.0279 3.0169 3.0279 1.6612 0 3.0169-1.3607 3.0169-3.0279s-1.3558-3.0279-3.0169-3.0279c-0.24402 0-0.47787 0.03754-0.70547 0.09291l-0.58751-1.4751v-1.6457c0-0.23886-0.193-0.43256-0.43098-0.43256zm-3.4478 4.3256c0.51054 0 0.97192 0.18332 1.3401 0.47816l-1.6162 1.3518c-0.44038 0.36967 0.11015 1.0334 0.55217 0.66572l1.6162-1.3518c0.16222 0.30436 0.26264 0.64786 0.26264 1.0189 0 1.1996-0.95969 2.1629-2.1549 2.1629s-2.1549-0.96323-2.1549-2.1629c0-1.1996 0.95954-2.1628 2.1549-2.1628zm6.8956 0c1.1952 0 2.1549 0.96323 2.1549 2.1629 0 1.1996-0.95969 2.1628-2.1549 2.1628s-2.1549-0.96323-2.1549-2.1628c0-0.7587 0.38512-1.4206 0.96969-1.8063l0.78462 1.9668c0.21204 0.53906 1.0174 0.21637 0.80146-0.32105l-0.78277-1.9634c0.1243-0.02215 0.25118-0.03885 0.3821-0.03885z" fill="#000" stroke-width=".76923"/>
+ <path d="m4.5 7.2292 6-3 6 3" fill="none" stroke="#000" stroke-linecap="round"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-bicycle_rental-m.svg b/data/styles/default/dark/symbols/bookmark-bicycle_rental-m.svg
index 5ef6fca04..a882bcadb 100644
--- a/data/styles/default/dark/symbols/bookmark-bicycle_rental-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-bicycle_rental-m.svg
@@ -2,14 +2,14 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m10.5 7.5219c-0.58277-0.0087-0.58277 0.87346 0 0.86515h1.293v1.0949l-2.4158 2.0192-0.84008-2.249h0.23911c0.58277 0.0086 0.58277-0.87346 0-0.86515h-1.724c-0.58277-0.0087-0.58277 0.87346 0 0.86515h0.56225l0.76778 2.0547c-0.40322-0.20123-0.85085-0.32443-1.33-0.32443-1.6611 0-3.0169 1.3607-3.0169 3.0279s1.3558 3.0279 3.0169 3.0279 3.0169-1.3607 3.0169-3.0279c0-0.57955-0.17264-1.1169-0.45623-1.5782l2.431-2.0327 0.399 1.0038c-0.89862 0.5254-1.5118 1.4922-1.5118 2.6072 0 1.6672 1.3558 3.0279 3.0169 3.0279 1.6611 0 3.0169-1.3607 3.0169-3.0279s-1.3558-3.0279-3.0169-3.0279c-0.24402 0-0.47787 0.03754-0.70547 0.09291l-0.58751-1.4751v-1.6457c0-0.23886-0.193-0.43256-0.43098-0.43256zm-3.4478 4.3256c0.51054 0 0.97192 0.18332 1.3401 0.47816l-1.6162 1.3518c-0.44038 0.36967 0.11015 1.0334 0.55217 0.66572l1.6162-1.3518c0.16222 0.30436 0.26264 0.64786 0.26264 1.0189 0 1.1996-0.95969 2.1629-2.1549 2.1629-1.1952 0-2.1549-0.96323-2.1549-2.1629 0-1.1996 0.95954-2.1628 2.1549-2.1628zm6.8956 0c1.1952 0 2.1549 0.96323 2.1549 2.1629 0 1.1996-0.95969 2.1628-2.1549 2.1628-1.1952 0-2.1549-0.96323-2.1549-2.1628 0-0.7587 0.38512-1.4206 0.96969-1.8063l0.78462 1.9668c0.21204 0.53906 1.0174 0.21637 0.80146-0.32104l-0.78277-1.9634c0.1243-0.02215 0.25118-0.03885 0.3821-0.03885z" fill="#fff"/>
- <circle cx="7.6313" cy="4.9757" r="1.4625" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round"/>
- <path d="m9.1237 4.9642h5.8105" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round"/>
- <path d="m14.037 4.9642v1.6478" fill="none" stroke="#fff" stroke-linecap="round" stroke-linejoin="round"/>
+ <path d="m10.5 7.5219c-0.58277-0.0087-0.58277 0.87346 0 0.86515h1.293v1.0949l-2.4158 2.0192-0.84008-2.249h0.23911c0.58277 0.0086 0.58277-0.87346 0-0.86515h-1.724c-0.58277-0.0087-0.58277 0.87346 0 0.86515h0.56225l0.76778 2.0547c-0.40322-0.20123-0.85085-0.32443-1.33-0.32443-1.6611 0-3.0169 1.3607-3.0169 3.0279s1.3558 3.0279 3.0169 3.0279 3.0169-1.3607 3.0169-3.0279c0-0.57955-0.17264-1.1169-0.45623-1.5782l2.431-2.0327 0.399 1.0038c-0.89862 0.5254-1.5118 1.4922-1.5118 2.6072 0 1.6672 1.3558 3.0279 3.0169 3.0279 1.6611 0 3.0169-1.3607 3.0169-3.0279s-1.3558-3.0279-3.0169-3.0279c-0.24402 0-0.47787 0.03754-0.70547 0.09291l-0.58751-1.4751v-1.6457c0-0.23886-0.193-0.43256-0.43098-0.43256zm-3.4478 4.3256c0.51054 0 0.97192 0.18332 1.3401 0.47816l-1.6162 1.3518c-0.44038 0.36967 0.11015 1.0334 0.55217 0.66572l1.6162-1.3518c0.16222 0.30436 0.26264 0.64786 0.26264 1.0189 0 1.1996-0.95969 2.1629-2.1549 2.1629-1.1952 0-2.1549-0.96323-2.1549-2.1629 0-1.1996 0.95954-2.1628 2.1549-2.1628zm6.8956 0c1.1952 0 2.1549 0.96323 2.1549 2.1629 0 1.1996-0.95969 2.1628-2.1549 2.1628-1.1952 0-2.1549-0.96323-2.1549-2.1628 0-0.7587 0.38512-1.4206 0.96969-1.8063l0.78462 1.9668c0.21204 0.53906 1.0174 0.21637 0.80146-0.32104l-0.78277-1.9634c0.1243-0.02215 0.25118-0.03885 0.3821-0.03885z" fill="#000"/>
+ <circle cx="7.6313" cy="4.9757" r="1.4625" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round"/>
+ <path d="m9.1237 4.9642h5.8105" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round"/>
+ <path d="m14.037 4.9642v1.6478" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-buddhism-m.svg b/data/styles/default/dark/symbols/bookmark-buddhism-m.svg
index f1223290b..a9e8598ed 100644
--- a/data/styles/default/dark/symbols/bookmark-buddhism-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-buddhism-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m9.975 5.2498v0.525c-0.90825 0.105-1.7378 0.4725-2.415 1.0185l-0.399-0.399-0.7455 0.7455 0.4095 0.39375c-0.5775 0.69825-0.93975 1.5488-1.05 2.4412h-0.525v1.05h0.525c0.11025 0.882 0.4725 1.7115 1.05 2.394l-0.4095 0.399 0.7455 0.7455 0.39375-0.3885c0.693 0.56175 1.5278 0.92925 2.4203 1.05v0.525h1.05v-0.525c0.88725-0.12075 1.7272-0.48825 2.415-1.05l0.399 0.3885 0.7455-0.7455-0.4095-0.39375c0.5775-0.6825 0.93975-1.5172 1.05-2.3992h0.525v-1.05h-0.525c-0.11025-0.8925-0.4725-1.7378-1.05-2.436l0.4095-0.399-0.7455-0.7455-0.39375 0.399c-0.693-0.56175-1.533-0.9135-2.4202-1.0185v-0.525h-1.05m0 1.575v1.575l-0.525 0.2625-1.1498-1.1288c0.47775-0.357 1.05-0.6195 1.6748-0.70875m1.05 0c0.609 0.0945 1.1865 0.336 1.68 0.70875l-1.155 1.1288-0.525-0.2625v-1.575m-3.465 1.449 1.1025 1.176-0.2625 0.525h-1.575c0.084-0.609 0.3675-1.2075 0.72975-1.7062l0.00525 0.00525m5.88 0c0.38325 0.49875 0.63525 1.0815 0.735 1.701h-1.575l-0.2625-0.525 1.1078-1.176h-0.00525m-2.94 1.176c0.588 0 1.05 0.462 1.05 1.05s-0.462 1.05-1.05 1.05c-0.588 0-1.05-0.462-1.05-1.05s0.462-1.05 1.05-1.05m-3.675 1.575h1.575l0.29925 0.525-1.1445 1.1288c-0.378-0.47775-0.63-1.0448-0.72975-1.6538m5.775 0h1.575c-0.09975 0.60375-0.35175 1.176-0.72975 1.659l-1.1078-1.134 0.2625-0.525m-3.15 1.3125 0.525 0.2625v1.575c-0.61425-0.105-1.1918-0.36225-1.68-0.75075l1.155-1.0868m2.1 0 1.1498 1.0868c-0.47775 0.357-1.05 0.6615-1.6748 0.75075v-1.575z" fill="#fff"/>
+ <path d="m9.975 5.2498v0.525c-0.90825 0.105-1.7378 0.4725-2.415 1.0185l-0.399-0.399-0.7455 0.7455 0.4095 0.39375c-0.5775 0.69825-0.93975 1.5488-1.05 2.4412h-0.525v1.05h0.525c0.11025 0.882 0.4725 1.7115 1.05 2.394l-0.4095 0.399 0.7455 0.7455 0.39375-0.3885c0.693 0.56175 1.5278 0.92925 2.4203 1.05v0.525h1.05v-0.525c0.88725-0.12075 1.7272-0.48825 2.415-1.05l0.399 0.3885 0.7455-0.7455-0.4095-0.39375c0.5775-0.6825 0.93975-1.5172 1.05-2.3992h0.525v-1.05h-0.525c-0.11025-0.8925-0.4725-1.7378-1.05-2.436l0.4095-0.399-0.7455-0.7455-0.39375 0.399c-0.693-0.56175-1.533-0.9135-2.4202-1.0185v-0.525h-1.05m0 1.575v1.575l-0.525 0.2625-1.1498-1.1288c0.47775-0.357 1.05-0.6195 1.6748-0.70875m1.05 0c0.609 0.0945 1.1865 0.336 1.68 0.70875l-1.155 1.1288-0.525-0.2625v-1.575m-3.465 1.449 1.1025 1.176-0.2625 0.525h-1.575c0.084-0.609 0.3675-1.2075 0.72975-1.7062l0.00525 0.00525m5.88 0c0.38325 0.49875 0.63525 1.0815 0.735 1.701h-1.575l-0.2625-0.525 1.1078-1.176h-0.00525m-2.94 1.176c0.588 0 1.05 0.462 1.05 1.05s-0.462 1.05-1.05 1.05c-0.588 0-1.05-0.462-1.05-1.05s0.462-1.05 1.05-1.05m-3.675 1.575h1.575l0.29925 0.525-1.1445 1.1288c-0.378-0.47775-0.63-1.0448-0.72975-1.6538m5.775 0h1.575c-0.09975 0.60375-0.35175 1.176-0.72975 1.659l-1.1078-1.134 0.2625-0.525m-3.15 1.3125 0.525 0.2625v1.575c-0.61425-0.105-1.1918-0.36225-1.68-0.75075l1.155-1.0868m2.1 0 1.1498 1.0868c-0.47775 0.357-1.05 0.6615-1.6748 0.75075v-1.575z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-building-m.svg b/data/styles/default/dark/symbols/bookmark-building-m.svg
index 5ba867720..d24c93699 100644
--- a/data/styles/default/dark/symbols/bookmark-building-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-building-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m12 15.375v-3.4822h-3v3.4822h-3v-6.2678l4.5-3.4822 4.5 3.4822v6.2678z" fill="#fff"/>
+ <path d="m12 15.375v-3.4822h-3v3.4822h-3v-6.2678l4.5-3.4822 4.5 3.4822v6.2678z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-cafe-m.svg b/data/styles/default/dark/symbols/bookmark-cafe-m.svg
index 1429b65cf..e0a19d903 100644
--- a/data/styles/default/dark/symbols/bookmark-cafe-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-cafe-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m13.417 6.7498h-6.6667v4.1667c0 0.92085 0.74583 1.6666 1.6666 1.6666h2.5c0.92085 0 1.6666-0.74583 1.6666-1.6666v-1.25h0.83332c0.4625 0 0.83332-0.375 0.83332-0.83332v-1.25c-1e-6 -0.4625-0.37083-0.83332-0.83332-0.83332zm0 2.0834h-0.83333v-1.25h0.83333zm-6.6667 4.5833h6.6667v0.83332h-6.6667z" fill="#fff"/>
+ <path d="m13.417 6.7498h-6.6667v4.1667c0 0.92085 0.74583 1.6666 1.6666 1.6666h2.5c0.92085 0 1.6666-0.74583 1.6666-1.6666v-1.25h0.83332c0.4625 0 0.83332-0.375 0.83332-0.83332v-1.25c-1e-6 -0.4625-0.37083-0.83332-0.83332-0.83332zm0 2.0834h-0.83333v-1.25h0.83333zm-6.6667 4.5833h6.6667v0.83332h-6.6667z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-charging_station-m.svg b/data/styles/default/dark/symbols/bookmark-charging_station-m.svg
index 8bce2d92b..3d9c0aad0 100644
--- a/data/styles/default/dark/symbols/bookmark-charging_station-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-charging_station-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m5.5005 5.4995a0.9975 0.9975 0 0 0-1.0005 1.0005v7.9995a0.9975 0.9975 0 0 0 1.0005 1.0005h3.9998a0.9975 0.9975 0 0 0 0.99975-1.0005v-1.9995h0.50025c0.282 0 0.50025 0.2175 0.50025 0.4995v1.0005c0 0.822 0.67725 1.5 1.5 1.5 0.822 0 1.5-0.678 1.5-1.5v-3.5002a0.51 0.51 0 0 0-0.0075-0.084 1.5172 1.5172 0 0 0 0.9195-0.91575h0.08775a0.9975 0.9975 0 0 0 0.99975-1.0005h-0.99975v-1.9995a0.50025 0.50025 0 1 0-0.99975 0v1.9995h-1.0005v-1.9995a0.50025 0.50025 0 1 0-0.99975 0v1.9995h-0.99975a0.9975 0.9975 0 0 0 0.99975 1.0005h0.08775a1.5165 1.5165 0 0 0 0.92025 0.91575 0.5115 0.5115 0 0 0-0.0075 0.084v3.5003a0.49275 0.49275 0 0 1-0.50025 0.4995 0.49275 0.49275 0 0 1-0.50025-0.4995v-1.0005c0-0.822-0.67725-1.5-1.5-1.5h-0.50025v-4.9995a0.9975 0.9975 0 0 0-0.99975-1.0005zm0.4995 1.0005h3c0.2775 0 0.50025 0.22275 0.50025 0.4995v2.5005h-3.9998v-2.5005c0-0.27675 0.22275-0.4995 0.4995-0.4995zm2.6408 3.75a0.24 0.24 0 0 1 0.1545 0.06c0.07725 0.078 0.078 0.195 0.0015 0.27375l-1.197 1.3845 0.9 0.9045a0.1785 0.1785 0 0 1-0.01725 0.2715l-1.965 1.5548a0.24675 0.24675 0 0 1-0.312-0.0098 0.19125 0.19125 0 0 1-0.00225-0.27375l1.1978-1.3822-0.90075-0.90675a0.1785 0.1785 0 0 1 0.01725-0.2715l1.965-1.5548a0.24225 0.24225 0 0 1 0.15825-0.05025z" fill="#fff"/>
+ <path d="m5.5005 5.4995a0.9975 0.9975 0 0 0-1.0005 1.0005v7.9995a0.9975 0.9975 0 0 0 1.0005 1.0005h3.9998a0.9975 0.9975 0 0 0 0.99975-1.0005v-1.9995h0.50025c0.282 0 0.50025 0.2175 0.50025 0.4995v1.0005c0 0.822 0.67725 1.5 1.5 1.5 0.822 0 1.5-0.678 1.5-1.5v-3.5002a0.51 0.51 0 0 0-0.0075-0.084 1.5172 1.5172 0 0 0 0.9195-0.91575h0.08775a0.9975 0.9975 0 0 0 0.99975-1.0005h-0.99975v-1.9995a0.50025 0.50025 0 1 0-0.99975 0v1.9995h-1.0005v-1.9995a0.50025 0.50025 0 1 0-0.99975 0v1.9995h-0.99975a0.9975 0.9975 0 0 0 0.99975 1.0005h0.08775a1.5165 1.5165 0 0 0 0.92025 0.91575 0.5115 0.5115 0 0 0-0.0075 0.084v3.5003a0.49275 0.49275 0 0 1-0.50025 0.4995 0.49275 0.49275 0 0 1-0.50025-0.4995v-1.0005c0-0.822-0.67725-1.5-1.5-1.5h-0.50025v-4.9995a0.9975 0.9975 0 0 0-0.99975-1.0005zm0.4995 1.0005h3c0.2775 0 0.50025 0.22275 0.50025 0.4995v2.5005h-3.9998v-2.5005c0-0.27675 0.22275-0.4995 0.4995-0.4995zm2.6408 3.75a0.24 0.24 0 0 1 0.1545 0.06c0.07725 0.078 0.078 0.195 0.0015 0.27375l-1.197 1.3845 0.9 0.9045a0.1785 0.1785 0 0 1-0.01725 0.2715l-1.965 1.5548a0.24675 0.24675 0 0 1-0.312-0.0098 0.19125 0.19125 0 0 1-0.00225-0.27375l1.1978-1.3822-0.90075-0.90675a0.1785 0.1785 0 0 1 0.01725-0.2715l1.965-1.5548a0.24225 0.24225 0 0 1 0.15825-0.05025z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-christianity-m.svg b/data/styles/default/dark/symbols/bookmark-christianity-m.svg
index 47c8d6d56..f96e99f14 100644
--- a/data/styles/default/dark/symbols/bookmark-christianity-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-christianity-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m6.75 9.2886v-1.6156h2.9168v-2.4231h1.6665v2.4231h2.9168v1.6156h-2.9168v6.4612h-1.6665v-6.4612z" fill="#fff"/>
+ <path d="m6.75 9.2886v-1.6156h2.9168v-2.4231h1.6665v2.4231h2.9168v1.6156h-2.9168v6.4612h-1.6665v-6.4612z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-default-m.svg b/data/styles/default/dark/symbols/bookmark-default-m.svg
index 8f92a0380..67171d5e6 100644
--- a/data/styles/default/dark/symbols/bookmark-default-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-default-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <circle cx="10.5" cy="10.5" r="4.5" fill="#fff"/>
+ <circle cx="10.5" cy="10.5" r="4.5" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-default-s.svg b/data/styles/default/dark/symbols/bookmark-default-s.svg
index fbf4d055e..7de5e3c25 100644
--- a/data/styles/default/dark/symbols/bookmark-default-s.svg
+++ b/data/styles/default/dark/symbols/bookmark-default-s.svg
@@ -2,11 +2,11 @@
 <svg width="14" height="20" version="1.1" viewBox="0 0 14 20" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="7" x2="7" y1="4" y2="19" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m7 0.19922c-3.7539 0-6.8007 3.0484-6.8008 6.7852v0.0019531c0.005892 1.8437 0.76379 3.6067 2.0957 4.8809 0.98197 0.94735 2.1383 1.7244 2.7578 2.457 0.30977 0.36633 0.47245 0.68922 0.51172 0.99609 0.03927 0.30687-0.017324 0.65397-0.35547 1.1758-0.22374 0.3448-0.34563 0.74896-0.3457 1.1641 0 1.1695 0.96441 2.1406 2.1367 2.1406 1.1723 0 2.1367-0.97112 2.1367-2.1406-8.04e-5 -0.41508-0.12193-0.81924-0.3457-1.1641-0.33814-0.52178-0.39474-0.86892-0.35547-1.1758 0.039275-0.30686 0.20389-0.62975 0.51367-0.99609 0.6191-0.73213 1.7724-1.5087 2.7539-2.4551 1.3331-1.2744 2.0918-3.0382 2.0977-4.8828v-0.0019531c-1.13e-4 -3.7367-3.0469-6.7852-6.8008-6.7852zm0 0.80078c3.324 0 6 2.6792 6.0001 5.984-0.0052 1.6272-0.67289 3.182-1.8491 4.3064-1.8067 1.743-4.6837 3.0902-3.0308 5.6409 0.14086 0.21706 0.21583 0.47028 0.21588 0.72904-3.51e-5 0.73984-0.5961 1.3396-1.3359 1.3397-0.73984-3.6e-5 -1.3359-0.5998-1.3359-1.3397 4.37e-5 -0.25876 0.075017-0.51197 0.21588-0.72904 1.6529-2.5507-1.2242-3.8978-3.0309-5.6409-1.1762-1.1243-1.8439-2.6792-1.8491-4.3064 3.514e-5 -3.3049 2.6761-5.984 6.0001-5.984z" fill="#fff" opacity=".6"/>
+ <path d="m7 0.19922c-3.7539 0-6.8007 3.0484-6.8008 6.7852v0.0019531c0.005892 1.8437 0.76379 3.6067 2.0957 4.8809 0.98197 0.94735 2.1383 1.7244 2.7578 2.457 0.30977 0.36633 0.47245 0.68922 0.51172 0.99609 0.03927 0.30687-0.017324 0.65397-0.35547 1.1758-0.22374 0.3448-0.34563 0.74896-0.3457 1.1641 0 1.1695 0.96441 2.1406 2.1367 2.1406 1.1723 0 2.1367-0.97112 2.1367-2.1406-8.04e-5 -0.41508-0.12193-0.81924-0.3457-1.1641-0.33814-0.52178-0.39474-0.86892-0.35547-1.1758 0.039275-0.30686 0.20389-0.62975 0.51367-0.99609 0.6191-0.73213 1.7724-1.5087 2.7539-2.4551 1.3331-1.2744 2.0918-3.0382 2.0977-4.8828v-0.0019531c-1.13e-4 -3.7367-3.0469-6.7852-6.8008-6.7852zm0 0.80078c3.324 0 6 2.6792 6.0001 5.984-0.0052 1.6272-0.67289 3.182-1.8491 4.3064-1.8067 1.743-4.6837 3.0902-3.0308 5.6409 0.14086 0.21706 0.21583 0.47028 0.21588 0.72904-3.51e-5 0.73984-0.5961 1.3396-1.3359 1.3397-0.73984-3.6e-5 -1.3359-0.5998-1.3359-1.3397 4.37e-5 -0.25876 0.075017-0.51197 0.21588-0.72904 1.6529-2.5507-1.2242-3.8978-3.0309-5.6409-1.1762-1.1243-1.8439-2.6792-1.8491-4.3064 3.514e-5 -3.3049 2.6761-5.984 6.0001-5.984z" fill="#000" opacity=".6"/>
  <path d="m7 1c3.324 0 6 2.6792 6.0001 5.984-0.0052 1.6272-0.67289 3.182-1.8491 4.3064-1.8067 1.743-4.6837 3.0902-3.0308 5.6409 0.14086 0.21706 0.21583 0.47028 0.21588 0.72904-3.51e-5 0.73984-0.5961 1.3396-1.3359 1.3397-0.73984-3.6e-5 -1.3359-0.5998-1.3359-1.3397 4.37e-5 -0.25876 0.075017-0.51197 0.21588-0.72904 1.6529-2.5507-1.2242-3.8978-3.0309-5.6409-1.1762-1.1243-1.8439-2.6792-1.8491-4.3064 3.514e-5 -3.3049 2.6761-5.984 6.0001-5.984z" fill="url(#linearGradient1)"/>
- <circle cx="7" cy="7" r="3" fill="#fff"/>
+ <circle cx="7" cy="7" r="3" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-default-xs.svg b/data/styles/default/dark/symbols/bookmark-default-xs.svg
index c0dedbb9b..e1f9db1a8 100644
--- a/data/styles/default/dark/symbols/bookmark-default-xs.svg
+++ b/data/styles/default/dark/symbols/bookmark-default-xs.svg
@@ -2,11 +2,11 @@
 <svg width="10" height="14" version="1.1" viewBox="0 0 10 14" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="5" x2="5" y1="3" y2="13" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m5 0.5c-2.4793 0-4.5 2.0207-4.5 4.5v0.0019531c0.003933 1.4952 0.75073 2.8916 1.9922 3.7246h0.0019531v0.0019531c0.50481 0.34197 1.0508 0.7827 1.3242 1.2012 0.13694 0.20956 0.2055 0.40137 0.21094 0.57812 0.00544 0.17676-0.0394 0.35797-0.2168 0.5957-0.20161 0.25207-0.3125 0.56994-0.3125 0.89648 0 0.8225 0.67749 1.5 1.5 1.5s1.5-0.6775 1.5-1.5c0-0.32601-0.11148-0.6445-0.3125-0.89648l-0.0019531-0.003907c-0.175-0.2358-0.22026-0.41405-0.21484-0.58984 0.0054415-0.17675 0.073996-0.37051 0.21094-0.58008 0.27346-0.41849 0.81941-0.85916 1.3242-1.2012l0.0019531-0.0019531c1.2415-0.83295 1.9882-2.2294 1.9922-3.7246v-0.0019531c0-2.4793-2.0207-4.5-4.5-4.5zm0 0.5c2.2091 3.32e-5 4 1.7909 4 4-0.00351 1.3304-0.66822 2.572-1.7734 3.3125-1.0535 0.71328-2.3706 1.842-1.4395 3.0898 0.13845 0.16684 0.21289 0.37329 0.21289 0.59766 0 0.55228-0.44772 1-1 1s-1-0.44772-1-1c0-0.22437 0.074445-0.43081 0.21289-0.59766 0.93117-1.2479-0.386-2.3766-1.4395-3.0898-1.1052-0.74055-1.7699-1.9821-1.7734-3.3125 3.32e-5 -2.2091 1.7909-4 4-4z" fill="#fff" opacity=".6"/>
+ <path d="m5 0.5c-2.4793 0-4.5 2.0207-4.5 4.5v0.0019531c0.003933 1.4952 0.75073 2.8916 1.9922 3.7246h0.0019531v0.0019531c0.50481 0.34197 1.0508 0.7827 1.3242 1.2012 0.13694 0.20956 0.2055 0.40137 0.21094 0.57812 0.00544 0.17676-0.0394 0.35797-0.2168 0.5957-0.20161 0.25207-0.3125 0.56994-0.3125 0.89648 0 0.8225 0.67749 1.5 1.5 1.5s1.5-0.6775 1.5-1.5c0-0.32601-0.11148-0.6445-0.3125-0.89648l-0.0019531-0.003907c-0.175-0.2358-0.22026-0.41405-0.21484-0.58984 0.0054415-0.17675 0.073996-0.37051 0.21094-0.58008 0.27346-0.41849 0.81941-0.85916 1.3242-1.2012l0.0019531-0.0019531c1.2415-0.83295 1.9882-2.2294 1.9922-3.7246v-0.0019531c0-2.4793-2.0207-4.5-4.5-4.5zm0 0.5c2.2091 3.32e-5 4 1.7909 4 4-0.00351 1.3304-0.66822 2.572-1.7734 3.3125-1.0535 0.71328-2.3706 1.842-1.4395 3.0898 0.13845 0.16684 0.21289 0.37329 0.21289 0.59766 0 0.55228-0.44772 1-1 1s-1-0.44772-1-1c0-0.22437 0.074445-0.43081 0.21289-0.59766 0.93117-1.2479-0.386-2.3766-1.4395-3.0898-1.1052-0.74055-1.7699-1.9821-1.7734-3.3125 3.32e-5 -2.2091 1.7909-4 4-4z" fill="#000" opacity=".6"/>
  <path d="m5 1c2.2091 3.32e-5 4 1.7909 4 4-0.00351 1.3304-0.66822 2.572-1.7734 3.3125-1.0535 0.71328-2.3706 1.842-1.4395 3.0898 0.13845 0.16684 0.21289 0.37329 0.21289 0.59766 0 0.55228-0.44772 1-1 1s-1-0.44772-1-1c0-0.22437 0.074445-0.43081 0.21289-0.59766 0.93117-1.2479-0.386-2.3766-1.4395-3.0898-1.1052-0.74055-1.7699-1.9821-1.7734-3.3125 3.32e-5 -2.2091 1.7909-4 4-4z" fill="url(#linearGradient1)"/>
- <circle cx="5" cy="5" r="1.5" fill="#fff"/>
+ <circle cx="5" cy="5" r="1.5" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-entertainment-m.svg b/data/styles/default/dark/symbols/bookmark-entertainment-m.svg
index f9881af40..c4d762f33 100644
--- a/data/styles/default/dark/symbols/bookmark-entertainment-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-entertainment-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m13.5 6.4996v0.5h-0.99998v-0.5c0-0.275-0.225-0.5-0.5-0.5h-3c-0.275 0-0.5 0.225-0.5 0.5v0.5h-0.99998v-0.5c0-0.275-0.225-0.5-0.5-0.5-0.275 0-0.5 0.225-0.5 0.5v8.0003c0 0.275 0.225 0.5 0.5 0.5 0.275 0 0.5-0.225 0.5-0.5v-0.5h0.99998v0.5c0 0.275 0.225 0.5 0.5 0.5h3c0.275 0 0.5-0.225 0.5-0.5v-0.5h0.99998v0.5c0 0.275 0.225 0.5 0.5 0.5 0.275 0 0.5-0.225 0.5-0.5v-8.0003c1e-6 -0.275-0.225-0.5-0.5-0.5-0.275 0-0.5 0.225-0.5 0.5zm-5 6.5h-0.99998v-0.99998h0.99998zm0-2h-0.99998v-0.99997h0.99998zm0-2h-0.99998v-0.99998h0.99998zm5 4h-0.99998v-0.99998h0.99998zm0-2h-0.99998v-0.99998h0.99998zm0-2h-0.99998v-0.99998h0.99998z" fill="#fff"/>
+ <path d="m13.5 6.4996v0.5h-0.99998v-0.5c0-0.275-0.225-0.5-0.5-0.5h-3c-0.275 0-0.5 0.225-0.5 0.5v0.5h-0.99998v-0.5c0-0.275-0.225-0.5-0.5-0.5-0.275 0-0.5 0.225-0.5 0.5v8.0003c0 0.275 0.225 0.5 0.5 0.5 0.275 0 0.5-0.225 0.5-0.5v-0.5h0.99998v0.5c0 0.275 0.225 0.5 0.5 0.5h3c0.275 0 0.5-0.225 0.5-0.5v-0.5h0.99998v0.5c0 0.275 0.225 0.5 0.5 0.5 0.275 0 0.5-0.225 0.5-0.5v-8.0003c1e-6 -0.275-0.225-0.5-0.5-0.5-0.275 0-0.5 0.225-0.5 0.5zm-5 6.5h-0.99998v-0.99998h0.99998zm0-2h-0.99998v-0.99997h0.99998zm0-2h-0.99998v-0.99998h0.99998zm5 4h-0.99998v-0.99998h0.99998zm0-2h-0.99998v-0.99998h0.99998zm0-2h-0.99998v-0.99998h0.99998z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-exchange-m.svg b/data/styles/default/dark/symbols/bookmark-exchange-m.svg
index 8a28ac5b4..457ce23a2 100644
--- a/data/styles/default/dark/symbols/bookmark-exchange-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-exchange-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m15.214 8.3568h-0.61457l-1.161-1.935c-0.06172-0.102-0.16286-0.17443-0.27986-0.19886-0.11614-0.024-0.23914 0.00172-0.33643 0.070715l-2.8882 2.0632h1.4747l1.5338-1.0954 0.65743 1.0954h-1.8146v0.85718h3v3.4285h-5.1428v-0.85718h-0.85718v1.2857c0 0.237 0.192 0.42857 0.42857 0.42857h2.9494l-0.096 0.192c-0.07285 0.14614-0.21943 0.23657-0.38272 0.23657h-2.7218l-1.0346-1.0346v-2.2162l1.0346-1.035h1.5368v0.42857c0 0.23614-0.192 0.42857-0.42857 0.42857h-0.85717v0.85718h0.85717c0.70886 0 1.2857-0.57686 1.2857-1.2857v-0.85718c0-0.23657-0.19157-0.42857-0.42857-0.42857h-2.1428c-0.11357 0-0.22286 0.044572-0.303 0.126l-0.78555 0.78518c-0.06-0.031282-0.12472-0.054-0.19714-0.054h-1.7143c-0.23657 0-0.42857 0.192-0.42857 0.42857v3.4286c0 0.237 0.192 0.42857 0.42857 0.42857h1.7143c0.072428 0 0.13714-0.02228 0.19714-0.054l0.78555 0.786c0.08014 0.07972 0.18943 0.12514 0.303 0.12514h2.8993c0.49028 0 0.93083-0.27214 1.1498-0.711l0.28715-0.57472h2.0923c0.237 0 0.42857-0.19157 0.42857-0.42857v-4.2857c0-0.23657-0.19157-0.42857-0.42857-0.42857zm-8.1428 4.7143h-0.85718v-2.5714h0.85718z" fill="#fff"/>
+ <path d="m15.214 8.3568h-0.61457l-1.161-1.935c-0.06172-0.102-0.16286-0.17443-0.27986-0.19886-0.11614-0.024-0.23914 0.00172-0.33643 0.070715l-2.8882 2.0632h1.4747l1.5338-1.0954 0.65743 1.0954h-1.8146v0.85718h3v3.4285h-5.1428v-0.85718h-0.85718v1.2857c0 0.237 0.192 0.42857 0.42857 0.42857h2.9494l-0.096 0.192c-0.07285 0.14614-0.21943 0.23657-0.38272 0.23657h-2.7218l-1.0346-1.0346v-2.2162l1.0346-1.035h1.5368v0.42857c0 0.23614-0.192 0.42857-0.42857 0.42857h-0.85717v0.85718h0.85717c0.70886 0 1.2857-0.57686 1.2857-1.2857v-0.85718c0-0.23657-0.19157-0.42857-0.42857-0.42857h-2.1428c-0.11357 0-0.22286 0.044572-0.303 0.126l-0.78555 0.78518c-0.06-0.031282-0.12472-0.054-0.19714-0.054h-1.7143c-0.23657 0-0.42857 0.192-0.42857 0.42857v3.4286c0 0.237 0.192 0.42857 0.42857 0.42857h1.7143c0.072428 0 0.13714-0.02228 0.19714-0.054l0.78555 0.786c0.08014 0.07972 0.18943 0.12514 0.303 0.12514h2.8993c0.49028 0 0.93083-0.27214 1.1498-0.711l0.28715-0.57472h2.0923c0.237 0 0.42857-0.19157 0.42857-0.42857v-4.2857c0-0.23657-0.19157-0.42857-0.42857-0.42857zm-8.1428 4.7143h-0.85718v-2.5714h0.85718z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-fast_food-m.svg b/data/styles/default/dark/symbols/bookmark-fast_food-m.svg
index 183bb960b..9546f9f47 100644
--- a/data/styles/default/dark/symbols/bookmark-fast_food-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-fast_food-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m15.75 8.4508c0.01046-2.1-2.247-3.15-5.25-3.15-2.9977 0-5.25 1.05-5.25 3.15 0 0.28875 0.23625 0.525 0.525 0.525h9.45c0.28875 0 0.52504-0.23625 0.52504-0.525zm-10.5 5.25c0 0.5775 0.4725 1.05 1.05 1.05h8.4c0.5775 0 1.05-0.4725 1.05-1.05v-0.525c0-0.5775-0.4725-1.05-1.05-1.05h-8.4c-0.5775 0-1.05 0.4725-1.05 1.05zm0.71925-2.478c0.41475-0.15225 0.61425-0.4095 1.0448-0.4095 0.62475 0 0.7455 0.525 1.7482 0.525 1.0238 0 1.0972-0.525 1.7482-0.525 0.62475 0 0.7455 0.525 1.7482 0.525 1.0238 0 1.0972-0.525 1.7482-0.525 0.42525 0 0.61425 0.2415 1.0132 0.399 0.35175 0.1365 0.72975-0.13125 0.72975-0.504 0-0.22575-0.147-0.42525-0.36225-0.504-0.50925-0.18375-0.6405-0.43575-1.3912-0.43575-1.0238 0-1.0972 0.525-1.7482 0.525-0.62475 0-0.7455-0.525-1.7482-0.525-1.0237 0-1.0972 0.525-1.7482 0.525-0.62475 0-0.7455-0.525-1.7482-0.525-0.81375 0-1.029 0.33075-1.407 0.46725-0.20475 0.0735-0.34125 0.273-0.34125 0.4935 0 0.36225 0.3675 0.6195 0.714 0.4935z" fill="#fff"/>
+ <path d="m15.75 8.4508c0.01046-2.1-2.247-3.15-5.25-3.15-2.9977 0-5.25 1.05-5.25 3.15 0 0.28875 0.23625 0.525 0.525 0.525h9.45c0.28875 0 0.52504-0.23625 0.52504-0.525zm-10.5 5.25c0 0.5775 0.4725 1.05 1.05 1.05h8.4c0.5775 0 1.05-0.4725 1.05-1.05v-0.525c0-0.5775-0.4725-1.05-1.05-1.05h-8.4c-0.5775 0-1.05 0.4725-1.05 1.05zm0.71925-2.478c0.41475-0.15225 0.61425-0.4095 1.0448-0.4095 0.62475 0 0.7455 0.525 1.7482 0.525 1.0238 0 1.0972-0.525 1.7482-0.525 0.62475 0 0.7455 0.525 1.7482 0.525 1.0238 0 1.0972-0.525 1.7482-0.525 0.42525 0 0.61425 0.2415 1.0132 0.399 0.35175 0.1365 0.72975-0.13125 0.72975-0.504 0-0.22575-0.147-0.42525-0.36225-0.504-0.50925-0.18375-0.6405-0.43575-1.3912-0.43575-1.0238 0-1.0972 0.525-1.7482 0.525-0.62475 0-0.7455-0.525-1.7482-0.525-1.0237 0-1.0972 0.525-1.7482 0.525-0.62475 0-0.7455-0.525-1.7482-0.525-0.81375 0-1.029 0.33075-1.407 0.46725-0.20475 0.0735-0.34125 0.273-0.34125 0.4935 0 0.36225 0.3675 0.6195 0.714 0.4935z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-gas-m.svg b/data/styles/default/dark/symbols/bookmark-gas-m.svg
index b4aa10e5a..cd6057efe 100644
--- a/data/styles/default/dark/symbols/bookmark-gas-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-gas-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m12.922 5.0057a0.50025 0.50025 0 0 0-0.276 0.8475l1.293 1.293c0.2385 0.2385 0.40725 0.53325 0.49425 0.8535h-0.4335c-0.82275 0-1.5 0.67725-1.5 1.5 0 0.82275 0.67725 1.5 1.5 1.5h0.4995v3.5002c0 0.282-0.2175 0.4995-0.4995 0.4995a0.49275 0.49275 0 0 1-0.50025-0.4995v-1.0005c0-0.822-0.67725-1.5-1.5-1.5h-0.50025v-4.9995a0.9975 0.9975 0 0 0-0.99975-1.0005h-3.9997a0.9975 0.9975 0 0 0-1.0005 1.0005v7.9995a0.9975 0.9975 0 0 0 1.0005 1.0005h3.9997a0.9975 0.9975 0 0 0 0.99975-1.0005v-1.9995h0.50025c0.282 0 0.50025 0.2175 0.50025 0.4995v1.0005c0 0.822 0.67725 1.5 1.5 1.5 0.822 0 1.5-0.678 1.5-1.5v-6a2.913 2.913 0 0 0-0.8535-2.0602l-1.293-1.2938a0.50025 0.50025 0 0 0-0.432-0.14025zm-5.9235 1.9942h3c0.2775 0 0.50025 0.22275 0.50025 0.4995v2.5005h-3.999v-2.5005c0-0.27675 0.22275-0.4995 0.4995-0.4995zm7.0012 1.7498a0.75 0.75 0 1 1 0 1.5 0.75 0.75 0 0 1 0-1.5z" fill="#fff"/>
+ <path d="m12.922 5.0057a0.50025 0.50025 0 0 0-0.276 0.8475l1.293 1.293c0.2385 0.2385 0.40725 0.53325 0.49425 0.8535h-0.4335c-0.82275 0-1.5 0.67725-1.5 1.5 0 0.82275 0.67725 1.5 1.5 1.5h0.4995v3.5002c0 0.282-0.2175 0.4995-0.4995 0.4995a0.49275 0.49275 0 0 1-0.50025-0.4995v-1.0005c0-0.822-0.67725-1.5-1.5-1.5h-0.50025v-4.9995a0.9975 0.9975 0 0 0-0.99975-1.0005h-3.9997a0.9975 0.9975 0 0 0-1.0005 1.0005v7.9995a0.9975 0.9975 0 0 0 1.0005 1.0005h3.9997a0.9975 0.9975 0 0 0 0.99975-1.0005v-1.9995h0.50025c0.282 0 0.50025 0.2175 0.50025 0.4995v1.0005c0 0.822 0.67725 1.5 1.5 1.5 0.822 0 1.5-0.678 1.5-1.5v-6a2.913 2.913 0 0 0-0.8535-2.0602l-1.293-1.2938a0.50025 0.50025 0 0 0-0.432-0.14025zm-5.9235 1.9942h3c0.2775 0 0.50025 0.22275 0.50025 0.4995v2.5005h-3.999v-2.5005c0-0.27675 0.22275-0.4995 0.4995-0.4995zm7.0012 1.7498a0.75 0.75 0 1 1 0 1.5 0.75 0.75 0 0 1 0-1.5z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-hotel-m.svg b/data/styles/default/dark/symbols/bookmark-hotel-m.svg
index d730f0436..5d615ee00 100644
--- a/data/styles/default/dark/symbols/bookmark-hotel-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-hotel-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m8.1134 10.738c0.7923 0 1.4318-0.63955 1.4318-1.4318 0-0.7923-0.63955-1.4318-1.4318-1.4318-0.7923 0-1.4318 0.63955-1.4318 1.4318 0 0.7923 0.63955 1.4318 1.4318 1.4318zm5.7273-2.8636h-2.8636c-0.525 0-0.95452 0.42955-0.95452 0.95452v2.3863h-3.8182v-3.8182c0-0.2625-0.21477-0.47727-0.47727-0.47727s-0.47727 0.21477-0.47727 0.47727v6.2045c0 0.2625 0.21477 0.47727 0.47727 0.47727s0.47727-0.21477 0.47727-0.47727v-0.95452h8.5913v0.95452c0 0.2625 0.21477 0.47727 0.47727 0.47727s0.47727-0.21477 0.47727-0.47727v-3.8182c0-1.0548-0.85432-1.9091-1.9091-1.9091z" fill="#fff"/>
+ <path d="m8.1134 10.738c0.7923 0 1.4318-0.63955 1.4318-1.4318 0-0.7923-0.63955-1.4318-1.4318-1.4318-0.7923 0-1.4318 0.63955-1.4318 1.4318 0 0.7923 0.63955 1.4318 1.4318 1.4318zm5.7273-2.8636h-2.8636c-0.525 0-0.95452 0.42955-0.95452 0.95452v2.3863h-3.8182v-3.8182c0-0.2625-0.21477-0.47727-0.47727-0.47727s-0.47727 0.21477-0.47727 0.47727v6.2045c0 0.2625 0.21477 0.47727 0.47727 0.47727s0.47727-0.21477 0.47727-0.47727v-0.95452h8.5913v0.95452c0 0.2625 0.21477 0.47727 0.47727 0.47727s0.47727-0.21477 0.47727-0.47727v-3.8182c0-1.0548-0.85432-1.9091-1.9091-1.9091z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-information-m.svg b/data/styles/default/dark/symbols/bookmark-information-m.svg
index 245649f2a..493f622dc 100644
--- a/data/styles/default/dark/symbols/bookmark-information-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-information-m.svg
@@ -2,13 +2,13 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <g fill="#fff">
+ <g fill="#000">
   <circle cx="10.5" cy="7" r="1.5"/>
   <rect x="8.5" y="9" width="3" height="1.5" rx=".5" ry=".5"/>
   <rect x="9.5" y="10" width="2" height="5"/>
diff --git a/data/styles/default/dark/symbols/bookmark-islam-m.svg b/data/styles/default/dark/symbols/bookmark-islam-m.svg
index 8bf96029c..a5e7747ae 100644
--- a/data/styles/default/dark/symbols/bookmark-islam-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-islam-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path id="Shape" d="m13.018 10.4725-0.6886-0.4648h0.88042l0.30476-0.73847 0.30476 0.73847h0.88042l-0.6886 0.4648 0.3923 0.95058-0.88643-0.61538-0.89135 0.61538 0.3923-0.95058zm-0.039886-3.1121c-0.3826-0.1579-0.80179-0.24497-1.2413-0.24497-1.7964 0-3.2593 1.4621-3.2593 3.2656v0.23794c0 1.8052 1.4592 3.2656 3.2593 3.2656 0.43964 0 0.8593-0.087573 1.2424-0.24629-0.66309 0.53873-1.5084 0.86168-2.4276 0.86168-2.1273 0-3.8519-1.726-3.8519-3.8477v-0.30462c0-2.125 1.7289-3.8477 3.8519-3.8477 0.91972 0 1.7642 0.32262 2.4265 0.86036z" fill="#fff"/>
+ <path id="Shape" d="m13.018 10.4725-0.6886-0.4648h0.88042l0.30476-0.73847 0.30476 0.73847h0.88042l-0.6886 0.4648 0.3923 0.95058-0.88643-0.61538-0.89135 0.61538 0.3923-0.95058zm-0.039886-3.1121c-0.3826-0.1579-0.80179-0.24497-1.2413-0.24497-1.7964 0-3.2593 1.4621-3.2593 3.2656v0.23794c0 1.8052 1.4592 3.2656 3.2593 3.2656 0.43964 0 0.8593-0.087573 1.2424-0.24629-0.66309 0.53873-1.5084 0.86168-2.4276 0.86168-2.1273 0-3.8519-1.726-3.8519-3.8477v-0.30462c0-2.125 1.7289-3.8477 3.8519-3.8477 0.91972 0 1.7642 0.32262 2.4265 0.86036z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-judaism-m.svg b/data/styles/default/dark/symbols/bookmark-judaism-m.svg
index 500b64479..c9027ab61 100644
--- a/data/styles/default/dark/symbols/bookmark-judaism-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-judaism-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m13.48 10.41 1.5118-2.5942c0.02191-0.02236 0-0.06709-0.04381-0.06709h-2.9139c-0.02191 0-0.02191 0-0.04382-0.02236l-1.3365-2.4601c-0.02191-0.02236-0.06573-0.02236-0.06573 0l-1.4241 2.4601c0 0.02236-0.02191 0.02236-0.04382 0.02236h-3.0454c-0.04382 0-0.04382 0.04473-0.04382 0.06709l1.4898 2.7284v0.04473l-1.5118 2.5942c-0.02191 0.02236 0 0.06709 0.04382 0.06709h2.9139c0.02191 0 0.02191 0 0.04382 0.02237l1.3365 2.4601c0.02191 0.02237 0.06573 0.02237 0.06573 0l1.4241-2.4601c0-0.02237 0.02191-0.02237 0.04382-0.02237h3.0454c0.04381 0 0.04381-0.04473 0.04381-0.06709l-1.4898-2.7284zm0.482-1.9904-0.7668 1.3418c-0.02191 0.02237-0.06573 0.02237-0.06573 0l-0.72301-1.3418c-0.02191-0.02236 0-0.06709 0.04382-0.06709h1.5118c-0.02191 0 0 0.04473 0 0.06709zm-1.1831 2.0351-1.2488 2.1693c0 0.02237-0.02191 0.02237-0.04381 0.02237h-2.1252c-0.02191 0-0.02191 0-0.04382-0.02237l-1.0954-2.0351v-0.04473l1.2488-2.1693c0-0.02236 0.02191-0.02236 0.04382-0.02236h2.1252c0.02191 0 0.02191 0 0.04382 0.02236l1.0954 2.0351c0.02191 0 0.02191 0.02237 0 0.04473zm-2.1471-3.9808 0.65728 1.2076c0.02191 0.02236 0 0.06709-0.04382 0.06709h-1.3584c-0.04382 0-0.06573-0.04473-0.04382-0.06709l0.723-1.2076c0.02191-0.02236 0.06573-0.02236 0.06573 0zm-3.5712 1.8786h1.6651c0.04382 0 0.06573 0.04473 0.04382 0.06709l-0.85448 1.4761c-0.02191 0.02237-0.06573 0.02237-0.06573 0l-0.81068-1.4761c-0.02191-0.02236 0-0.06709 0.02191-0.06709zm-0.02191 4.2268 0.7668-1.3418c0.02191-0.02236 0.06573-0.02236 0.06573 0l0.72301 1.3418c0.02191 0.02237 0 0.0671-0.04382 0.0671h-1.4679c-0.02191 0-0.04382-0.04473-0.04382-0.0671zm3.3302 1.9456-0.65728-1.2076c-0.02191-0.02237 0-0.0671 0.04382-0.0671h1.3584c0.04382 0 0.06573 0.04473 0.04382 0.0671l-0.72301 1.2076c-0.02191 0.02237-0.06573 0.02237-0.06573 0zm2.8044-3.4217 0.81068 1.4761c0.02191 0.02237 0 0.0671-0.04382 0.0671h-1.6651c-0.04382 0-0.06573-0.04473-0.04382-0.0671l0.85448-1.4761c0.02191-0.02237 0.06573-0.02237 0.08764 0z" fill="#fff"/>
+ <path d="m13.48 10.41 1.5118-2.5942c0.02191-0.02236 0-0.06709-0.04381-0.06709h-2.9139c-0.02191 0-0.02191 0-0.04382-0.02236l-1.3365-2.4601c-0.02191-0.02236-0.06573-0.02236-0.06573 0l-1.4241 2.4601c0 0.02236-0.02191 0.02236-0.04382 0.02236h-3.0454c-0.04382 0-0.04382 0.04473-0.04382 0.06709l1.4898 2.7284v0.04473l-1.5118 2.5942c-0.02191 0.02236 0 0.06709 0.04382 0.06709h2.9139c0.02191 0 0.02191 0 0.04382 0.02237l1.3365 2.4601c0.02191 0.02237 0.06573 0.02237 0.06573 0l1.4241-2.4601c0-0.02237 0.02191-0.02237 0.04382-0.02237h3.0454c0.04381 0 0.04381-0.04473 0.04381-0.06709l-1.4898-2.7284zm0.482-1.9904-0.7668 1.3418c-0.02191 0.02237-0.06573 0.02237-0.06573 0l-0.72301-1.3418c-0.02191-0.02236 0-0.06709 0.04382-0.06709h1.5118c-0.02191 0 0 0.04473 0 0.06709zm-1.1831 2.0351-1.2488 2.1693c0 0.02237-0.02191 0.02237-0.04381 0.02237h-2.1252c-0.02191 0-0.02191 0-0.04382-0.02237l-1.0954-2.0351v-0.04473l1.2488-2.1693c0-0.02236 0.02191-0.02236 0.04382-0.02236h2.1252c0.02191 0 0.02191 0 0.04382 0.02236l1.0954 2.0351c0.02191 0 0.02191 0.02237 0 0.04473zm-2.1471-3.9808 0.65728 1.2076c0.02191 0.02236 0 0.06709-0.04382 0.06709h-1.3584c-0.04382 0-0.06573-0.04473-0.04382-0.06709l0.723-1.2076c0.02191-0.02236 0.06573-0.02236 0.06573 0zm-3.5712 1.8786h1.6651c0.04382 0 0.06573 0.04473 0.04382 0.06709l-0.85448 1.4761c-0.02191 0.02237-0.06573 0.02237-0.06573 0l-0.81068-1.4761c-0.02191-0.02236 0-0.06709 0.02191-0.06709zm-0.02191 4.2268 0.7668-1.3418c0.02191-0.02236 0.06573-0.02236 0.06573 0l0.72301 1.3418c0.02191 0.02237 0 0.0671-0.04382 0.0671h-1.4679c-0.02191 0-0.04382-0.04473-0.04382-0.0671zm3.3302 1.9456-0.65728-1.2076c-0.02191-0.02237 0-0.0671 0.04382-0.0671h1.3584c0.04382 0 0.06573 0.04473 0.04382 0.0671l-0.72301 1.2076c-0.02191 0.02237-0.06573 0.02237-0.06573 0zm2.8044-3.4217 0.81068 1.4761c0.02191 0.02237 0 0.0671-0.04382 0.0671h-1.6651c-0.04382 0-0.06573-0.04473-0.04382-0.0671l0.85448-1.4761c0.02191-0.02237 0.06573-0.02237 0.08764 0z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-medicine-m.svg b/data/styles/default/dark/symbols/bookmark-medicine-m.svg
index 1e62e382e..f7944641b 100644
--- a/data/styles/default/dark/symbols/bookmark-medicine-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-medicine-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m15.083 12.5h-2.5833v2.5833c0 0.50417-0.4125 0.91667-0.91667 0.91667h-2.1667c-0.50417 0-0.91667-0.4125-0.91667-0.91667v-2.5833h-2.5834c-0.50417 0-0.91665-0.4125-0.91665-0.91667v-2.1667c0-0.50417 0.4125-0.91667 0.91665-0.91667h2.5834v-2.5833c0-0.50417 0.4125-0.91667 0.91667-0.91667h2.1667c0.50417 0 0.91667 0.4125 0.91667 0.91667v2.5833h2.5833c0.50417 0 0.91667 0.4125 0.91667 0.91667v2.1667c0 0.50417-0.4125 0.91667-0.91667 0.91667z" fill="#fff"/>
+ <path d="m15.083 12.5h-2.5833v2.5833c0 0.50417-0.4125 0.91667-0.91667 0.91667h-2.1667c-0.50417 0-0.91667-0.4125-0.91667-0.91667v-2.5833h-2.5834c-0.50417 0-0.91665-0.4125-0.91665-0.91667v-2.1667c0-0.50417 0.4125-0.91667 0.91665-0.91667h2.5834v-2.5833c0-0.50417 0.4125-0.91667 0.91667-0.91667h2.1667c0.50417 0 0.91667 0.4125 0.91667 0.91667v2.5833h2.5833c0.50417 0 0.91667 0.4125 0.91667 0.91667v2.1667c0 0.50417-0.4125 0.91667-0.91667 0.91667z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-mountain-m.svg b/data/styles/default/dark/symbols/bookmark-mountain-m.svg
index 48f0037fd..72afbb99b 100644
--- a/data/styles/default/dark/symbols/bookmark-mountain-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-mountain-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m10.5 7.4998c-0.1875 0-0.27228 0.08977-0.32812 0.1875l-3 5.25c-0.033038 0.05775-0.046875 0.12278-0.046875 0.1875 0 0.28125 0.1875 0.37508 0.375 0.375h6c0.1875 7.5e-5 0.375-0.09375 0.375-0.375 0-0.0645-0.01384-0.1296-0.04687-0.1875l-3-5.25c-0.05585-0.097725-0.14063-0.1875-0.32813-0.1875z" fill="#fff"/>
+ <path d="m10.5 7.4998c-0.1875 0-0.27228 0.08977-0.32812 0.1875l-3 5.25c-0.033038 0.05775-0.046875 0.12278-0.046875 0.1875 0 0.28125 0.1875 0.37508 0.375 0.375h6c0.1875 7.5e-5 0.375-0.09375 0.375-0.375 0-0.0645-0.01384-0.1296-0.04687-0.1875l-3-5.25c-0.05585-0.097725-0.14063-0.1875-0.32813-0.1875z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-museum-m.svg b/data/styles/default/dark/symbols/bookmark-museum-m.svg
index 54db3023c..31b93287a 100644
--- a/data/styles/default/dark/symbols/bookmark-museum-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-museum-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m5.3975 7.665 5.1026-2.2678 5.1026 2.2678v1.1339h-1.1339v5.6695h1.1339v1.1339h-10.205v-1.1339h1.1339v-5.6695h-1.1339zm2.7214 1.1339v5.6695h1.5875v-5.6695zm3.2883 0v5.6695h1.5875v-5.6695z" fill="#fff"/>
+ <path d="m5.3975 7.665 5.1026-2.2678 5.1026 2.2678v1.1339h-1.1339v5.6695h1.1339v1.1339h-10.205v-1.1339h1.1339v-5.6695h-1.1339zm2.7214 1.1339v5.6695h1.5875v-5.6695zm3.2883 0v5.6695h1.5875v-5.6695z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-park-m.svg b/data/styles/default/dark/symbols/bookmark-park-m.svg
index 03d3431e9..00eb8f6b7 100644
--- a/data/styles/default/dark/symbols/bookmark-park-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-park-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m9.625 15.75v-2.4828c-0.2737 0.09677-0.56817 0.14939-0.875 0.14939-1.4498 0-2.625-1.1753-2.625-2.625 0-0.73815 0.30466-1.4051 0.79509-1.882-0.13629-0.31748-0.21176-0.66724-0.21176-1.0346 0-1.4498 1.1753-2.625 2.625-2.625 0.91158 0 1.7146 0.46465 2.1852 1.17 0.04906-0.00224 0.09847-0.00336 0.14811-0.00336 1.772 0 3.2084 1.4364 3.2084 3.2084 0 1.772-1.4364 3.2084-3.2084 3.2084-0.30333 0-0.59687-0.04212-0.875-0.12075v3.0374h-1.1666z" fill="#fff"/>
+ <path d="m9.625 15.75v-2.4828c-0.2737 0.09677-0.56817 0.14939-0.875 0.14939-1.4498 0-2.625-1.1753-2.625-2.625 0-0.73815 0.30466-1.4051 0.79509-1.882-0.13629-0.31748-0.21176-0.66724-0.21176-1.0346 0-1.4498 1.1753-2.625 2.625-2.625 0.91158 0 1.7146 0.46465 2.1852 1.17 0.04906-0.00224 0.09847-0.00336 0.14811-0.00336 1.772 0 3.2084 1.4364 3.2084 3.2084 0 1.772-1.4364 3.2084-3.2084 3.2084-0.30333 0-0.59687-0.04212-0.875-0.12075v3.0374h-1.1666z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-parking-m.svg b/data/styles/default/dark/symbols/bookmark-parking-m.svg
index 2a341230a..22a3a9d8c 100644
--- a/data/styles/default/dark/symbols/bookmark-parking-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-parking-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m6 17h3.0005v-4.6364h0.98977c1.6017 0 2.8526-0.35745 3.7136-1.0886 0.8796-0.74002 1.2961-1.8177 1.2961-3.2087 0-1.3464-0.38958-2.3729-1.2044-3.0506-0.82402-0.68656-2.0361-1.016-3.61-1.016l-4.1854 2.25e-4zm3.0005-10.726h1.0742c0.7407 0 1.2686 0.14282 1.6113 0.44597 0.35182 0.31208 0.52672 0.77535 0.52672 1.4263 0 0.63306-0.18515 1.1231-0.61106 1.4619-0.41664 0.3299-1.0557 0.52576-1.8983 0.52576h-0.70278z" fill="#fff"/>
+ <path d="m6 17h3.0005v-4.6364h0.98977c1.6017 0 2.8526-0.35745 3.7136-1.0886 0.8796-0.74002 1.2961-1.8177 1.2961-3.2087 0-1.3464-0.38958-2.3729-1.2044-3.0506-0.82402-0.68656-2.0361-1.016-3.61-1.016l-4.1854 2.25e-4zm3.0005-10.726h1.0742c0.7407 0 1.2686 0.14282 1.6113 0.44597 0.35182 0.31208 0.52672 0.77535 0.52672 1.4263 0 0.63306-0.18515 1.1231-0.61106 1.4619-0.41664 0.3299-1.0557 0.52576-1.8983 0.52576h-0.70278z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-pharmacy-m.svg b/data/styles/default/dark/symbols/bookmark-pharmacy-m.svg
index 42add645b..543a303b1 100644
--- a/data/styles/default/dark/symbols/bookmark-pharmacy-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-pharmacy-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m12.403 5.9998c-0.68034 0-1.3579 0.26403-1.8568 0.7584l-3.7561 3.7357c-0.77438 0.76725-0.98475 1.8812-0.60947 2.8088 0 0 0.28064 0.65726 0.55278 0.92692 0.25618 0.25384 0.56548 0.43259 0.87878 0.56176 0.086498 0.04462 0.15183 0.06089 0.22678 0.08426 0.010062 0.0031 0.018258 0.01106 0.028348 0.01404 0.90172 0.26648 1.9078 0.05056 2.5938-0.66007l2.2678-2.2471 1.4882-1.4887c1.0432-1.0337 1.0432-2.6909 0-3.6795-0.45356-0.53929-1.1339-0.81458-1.8142-0.81458zm0 0.8988c0.45356 0 0.9156 0.17696 1.2331 0.49154s0.49608 0.77242 0.49608 1.2218c0 0.44941-0.17859 0.89318-0.49608 1.2078l-1.5449 1.5308-2.4494-2.4431 1.4998-1.4752c0.36285-0.35953 0.76252-0.53367 1.2615-0.53367z" fill="#fff"/>
+ <path d="m12.403 5.9998c-0.68034 0-1.3579 0.26403-1.8568 0.7584l-3.7561 3.7357c-0.77438 0.76725-0.98475 1.8812-0.60947 2.8088 0 0 0.28064 0.65726 0.55278 0.92692 0.25618 0.25384 0.56548 0.43259 0.87878 0.56176 0.086498 0.04462 0.15183 0.06089 0.22678 0.08426 0.010062 0.0031 0.018258 0.01106 0.028348 0.01404 0.90172 0.26648 1.9078 0.05056 2.5938-0.66007l2.2678-2.2471 1.4882-1.4887c1.0432-1.0337 1.0432-2.6909 0-3.6795-0.45356-0.53929-1.1339-0.81458-1.8142-0.81458zm0 0.8988c0.45356 0 0.9156 0.17696 1.2331 0.49154s0.49608 0.77242 0.49608 1.2218c0 0.44941-0.17859 0.89318-0.49608 1.2078l-1.5449 1.5308-2.4494-2.4431 1.4998-1.4752c0.36285-0.35953 0.76252-0.53367 1.2615-0.53367z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-pub-m.svg b/data/styles/default/dark/symbols/bookmark-pub-m.svg
index 70cf09e6d..705a7ab84 100644
--- a/data/styles/default/dark/symbols/bookmark-pub-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-pub-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m13.819 9.3098h-0.73972c0.16597-0.27976 0.26554-0.60221 0.26554-0.94838 0-1.048-0.84878-1.8968-1.8968-1.8968-0.16122 0-0.31296 0.02371-0.4647 0.06164-0.38883-0.32244-0.882-0.52634-1.432-0.52634-0.89618 0-1.6644 0.52634-2.0248 1.285-0.74921 0.25132-1.2945 0.9531-1.2945 1.7877 0 0.882 0.60695 1.617 1.4225 1.8304v4.097h5.216v-0.94838h0.94838c0.5216 0 0.94838-0.42676 0.94838-0.94838v-2.8451c0-0.5216-0.42676-0.94838-0.94838-0.94838zm-5.6902 0.71128c-0.5216 0-0.94838-0.42677-0.94838-0.94838 0-0.40306 0.2608-0.7587 0.64963-0.89145l0.37935-0.12803 0.17071-0.36038c0.22286-0.45996 0.6686-0.74446 1.1712-0.74446 0.3746 0 0.65911 0.16597 0.82507 0.30822l0.36986 0.30822s0.30348-0.15174 0.69705-0.15174c0.5216 0 0.94838 0.42676 0.94838 0.94838h-1.4225c-1.5743 0-1.8208 1.6597-2.8403 1.6597zm5.6902 3.0822h-0.94838v-2.8451h0.94838z" fill="#fff"/>
+ <path d="m13.819 9.3098h-0.73972c0.16597-0.27976 0.26554-0.60221 0.26554-0.94838 0-1.048-0.84878-1.8968-1.8968-1.8968-0.16122 0-0.31296 0.02371-0.4647 0.06164-0.38883-0.32244-0.882-0.52634-1.432-0.52634-0.89618 0-1.6644 0.52634-2.0248 1.285-0.74921 0.25132-1.2945 0.9531-1.2945 1.7877 0 0.882 0.60695 1.617 1.4225 1.8304v4.097h5.216v-0.94838h0.94838c0.5216 0 0.94838-0.42676 0.94838-0.94838v-2.8451c0-0.5216-0.42676-0.94838-0.94838-0.94838zm-5.6902 0.71128c-0.5216 0-0.94838-0.42677-0.94838-0.94838 0-0.40306 0.2608-0.7587 0.64963-0.89145l0.37935-0.12803 0.17071-0.36038c0.22286-0.45996 0.6686-0.74446 1.1712-0.74446 0.3746 0 0.65911 0.16597 0.82507 0.30822l0.36986 0.30822s0.30348-0.15174 0.69705-0.15174c0.5216 0 0.94838 0.42676 0.94838 0.94838h-1.4225c-1.5743 0-1.8208 1.6597-2.8403 1.6597zm5.6902 3.0822h-0.94838v-2.8451h0.94838z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-restaurant-m.svg b/data/styles/default/dark/symbols/bookmark-restaurant-m.svg
index f92dc5946..41ed31ba8 100644
--- a/data/styles/default/dark/symbols/bookmark-restaurant-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-restaurant-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m9.5623 8.6625v-2.2108c0-0.24944-0.19882-0.45166-0.44678-0.45166h-0.04393c-0.24675 0-0.44678 0.20892-0.44678 0.45166v2.2108h-0.9375v-2.2108c0-0.24944-0.19882-0.45166-0.44678-0.45166h-0.04393c-0.24676 0-0.44679 0.20892-0.44679 0.45166v2.2108c0 1.0335 0.9375 1.8375 1.8281 1.8375l-0.12166 3.8931c-0.010475 0.33518 0.24664 0.60689 0.57584 0.60689h0.12289c0.3285 0 0.58364-0.26802 0.56952-0.60689l-0.16221-3.8931c0.9375 0 2.0625-0.804 1.875-1.8375v-2.2108c0-0.24944-0.19882-0.45166-0.44678-0.45166h-0.04394c-0.24675 0-0.44678 0.20892-0.44678 0.45166v2.2108h-0.9375zm2.4375 2.4375h1.125v3.3412c0 0.3086 0.24968 0.55877 0.5625 0.55877 0.31066 0 0.5625-0.2501 0.5625-0.56299v-8.4368c-1.5705 0-2.2875 1.092-2.25 1.95v3.15z" fill="#fff"/>
+ <path d="m9.5623 8.6625v-2.2108c0-0.24944-0.19882-0.45166-0.44678-0.45166h-0.04393c-0.24675 0-0.44678 0.20892-0.44678 0.45166v2.2108h-0.9375v-2.2108c0-0.24944-0.19882-0.45166-0.44678-0.45166h-0.04393c-0.24676 0-0.44679 0.20892-0.44679 0.45166v2.2108c0 1.0335 0.9375 1.8375 1.8281 1.8375l-0.12166 3.8931c-0.010475 0.33518 0.24664 0.60689 0.57584 0.60689h0.12289c0.3285 0 0.58364-0.26802 0.56952-0.60689l-0.16221-3.8931c0.9375 0 2.0625-0.804 1.875-1.8375v-2.2108c0-0.24944-0.19882-0.45166-0.44678-0.45166h-0.04394c-0.24675 0-0.44678 0.20892-0.44678 0.45166v2.2108h-0.9375zm2.4375 2.4375h1.125v3.3412c0 0.3086 0.24968 0.55877 0.5625 0.55877 0.31066 0 0.5625-0.2501 0.5625-0.56299v-8.4368c-1.5705 0-2.2875 1.092-2.25 1.95v3.15z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-shop-m.svg b/data/styles/default/dark/symbols/bookmark-shop-m.svg
index 6c454b6df..fa83cb3cb 100644
--- a/data/styles/default/dark/symbols/bookmark-shop-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-shop-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m14 7.7498h-0.99998c0-1.38-1.12-2.5-2.5-2.5-1.38 0-2.5 1.12-2.5 2.5h-0.99998c-0.55 0-0.99502 0.45-0.99502 0.99998l-5e-3 6c0 0.55 0.45 0.99998 0.99998 0.99998h7c0.55 0 0.99997-0.45 0.99997-0.99998v-6c0-0.55-0.45-0.99998-0.99997-0.99998zm-3.5-1.5c0.83002 0 1.5 0.67 1.5 1.5h-3c0-0.83002 0.67-1.5 1.5-1.5zm0 5c-1.38 0-2.5-1.12-2.5-2.5h0.99998c0 0.83002 0.67 1.5 1.5 1.5 0.83 0 1.5-0.67 1.5-1.5h0.99998c0 1.38-1.12 2.5-2.5 2.5z" fill="#fff"/>
+ <path d="m14 7.7498h-0.99998c0-1.38-1.12-2.5-2.5-2.5-1.38 0-2.5 1.12-2.5 2.5h-0.99998c-0.55 0-0.99502 0.45-0.99502 0.99998l-5e-3 6c0 0.55 0.45 0.99998 0.99998 0.99998h7c0.55 0 0.99997-0.45 0.99997-0.99998v-6c0-0.55-0.45-0.99998-0.99997-0.99998zm-3.5-1.5c0.83002 0 1.5 0.67 1.5 1.5h-3c0-0.83002 0.67-1.5 1.5-1.5zm0 5c-1.38 0-2.5-1.12-2.5-2.5h0.99998c0 0.83002 0.67 1.5 1.5 1.5 0.83 0 1.5-0.67 1.5-1.5h0.99998c0 1.38-1.12 2.5-2.5 2.5z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-sights-m.svg b/data/styles/default/dark/symbols/bookmark-sights-m.svg
index 85dcebcd5..861b467e1 100644
--- a/data/styles/default/dark/symbols/bookmark-sights-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-sights-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m13.65 15.74-0.525-3.6712 2.625-2.6228-3.675-0.52425-1.575-3.672-1.575 3.672-3.675 0.52425 2.625 2.6228-0.525 3.681 3.15-1.5832z" fill="#fff"/>
+ <path d="m13.65 15.74-0.525-3.6712 2.625-2.6228-3.675-0.52425-1.575-3.672-1.575 3.672-3.675 0.52425 2.625 2.6228-0.525 3.681 3.15-1.5832z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-sport-m.svg b/data/styles/default/dark/symbols/bookmark-sport-m.svg
index b2b9da9eb..c937db8cf 100644
--- a/data/styles/default/dark/symbols/bookmark-sport-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-sport-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m10.196 3.7498c-0.83175 0-1.506 0.63616-1.506 1.421 0 0.78488 0.67424 1.421 1.506 1.421 0.83175 0 1.506-0.63616 1.506-1.421 0-0.78488-0.67424-1.421-1.506-1.421zm-4.3297 2.842 0.3765 1.4211c0.18824 0.71051 0.6379 0.71051 1.2001 0.71051h1.2471c0.44709 0.71051 0.23694 1.8656 0.3765 2.9514h-0.6824c-0.753 0-1.9531 0.71051-1.2001 2.1316l1.1295 2.1316c0.753 1.421 1.8824 0.35526 1.506-0.35526l-1.1295-2.1316c-0.18824-0.35526 0.19902-0.35526 0.3765-0.35526h1.8584s0.89138 1.7577 1.9413 3.0373c0.38758 0.47229 0.8169 1.1165 1.3543 1.1165 0.37648 0 1.0216-0.54904 0.33501-1.3222-1.2859-1.448-2.1004-2.9409-2.1004-3.6514 0-0.82643-0.15386-2.5669-0.37648-3.5526h1.1295c0.36746 0.69494 1.0124 1.7763 1.0124 1.7763 0.4162 0.6803 1.1006 0.62889 1.1006 0 0-0.08619-0.011-0.27176-0.1051-0.48092l-1.0666-2.3611c-0.06966-0.15411-0.19082-0.35526-0.753-0.35526h-5.8357l-0.56474-1.7764c-0.22589-0.71051-1.3178-0.71051-1.3178 0 0 0.35526 0.1334 0.7866 0.18824 1.0658z" fill="#fff"/>
+ <path d="m10.196 3.7498c-0.83175 0-1.506 0.63616-1.506 1.421 0 0.78488 0.67424 1.421 1.506 1.421 0.83175 0 1.506-0.63616 1.506-1.421 0-0.78488-0.67424-1.421-1.506-1.421zm-4.3297 2.842 0.3765 1.4211c0.18824 0.71051 0.6379 0.71051 1.2001 0.71051h1.2471c0.44709 0.71051 0.23694 1.8656 0.3765 2.9514h-0.6824c-0.753 0-1.9531 0.71051-1.2001 2.1316l1.1295 2.1316c0.753 1.421 1.8824 0.35526 1.506-0.35526l-1.1295-2.1316c-0.18824-0.35526 0.19902-0.35526 0.3765-0.35526h1.8584s0.89138 1.7577 1.9413 3.0373c0.38758 0.47229 0.8169 1.1165 1.3543 1.1165 0.37648 0 1.0216-0.54904 0.33501-1.3222-1.2859-1.448-2.1004-2.9409-2.1004-3.6514 0-0.82643-0.15386-2.5669-0.37648-3.5526h1.1295c0.36746 0.69494 1.0124 1.7763 1.0124 1.7763 0.4162 0.6803 1.1006 0.62889 1.1006 0 0-0.08619-0.011-0.27176-0.1051-0.48092l-1.0666-2.3611c-0.06966-0.15411-0.19082-0.35526-0.753-0.35526h-5.8357l-0.56474-1.7764c-0.22589-0.71051-1.3178-0.71051-1.3178 0 0 0.35526 0.1334 0.7866 0.18824 1.0658z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-stadium-m.svg b/data/styles/default/dark/symbols/bookmark-stadium-m.svg
index b592189d7..85996afc1 100644
--- a/data/styles/default/dark/symbols/bookmark-stadium-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-stadium-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m6.825 5.7748h1.05l1.575 1.05-1.575 1.05v0.70059c0.7722-0.11168 1.6688-0.17559 2.625-0.17559 0.95625 0 1.8528 0.063913 2.625 0.17559v-2.8006h1.05l1.575 1.05-1.575 1.05v0.90015c0.972 0.23821 1.575 0.57016 1.575 0.93735 0 0.72487-2.3505 1.3125-5.25 1.3125-2.8995 0-5.25-0.58763-5.25-1.3125 0-0.36716 0.60304-0.6991 1.575-0.93735v-3.0002zm3.675 3.4125c-1.7397 0-2.625 0.090075-2.625 0.52499 0 0.43491 0.8853 0.525 2.625 0.525 1.7397 0 2.625-0.09009 2.625-0.525 0-0.43492-0.8853-0.52499-2.625-0.52499zm0 2.7562c1.9994 0 3.7811-0.34923 4.9353-0.89392l-0.73526 4.1752h-2.625v-1.05c0-0.57992-0.47008-1.05-1.05-1.05h-1.05c-0.57991 0-1.05 0.47008-1.05 1.05v1.05h-2.625l-0.73526-4.1752c1.1541 0.54469 2.936 0.89392 4.9353 0.89392z" fill="#fff"/>
+ <path d="m6.825 5.7748h1.05l1.575 1.05-1.575 1.05v0.70059c0.7722-0.11168 1.6688-0.17559 2.625-0.17559 0.95625 0 1.8528 0.063913 2.625 0.17559v-2.8006h1.05l1.575 1.05-1.575 1.05v0.90015c0.972 0.23821 1.575 0.57016 1.575 0.93735 0 0.72487-2.3505 1.3125-5.25 1.3125-2.8995 0-5.25-0.58763-5.25-1.3125 0-0.36716 0.60304-0.6991 1.575-0.93735v-3.0002zm3.675 3.4125c-1.7397 0-2.625 0.090075-2.625 0.52499 0 0.43491 0.8853 0.525 2.625 0.525 1.7397 0 2.625-0.09009 2.625-0.525 0-0.43492-0.8853-0.52499-2.625-0.52499zm0 2.7562c1.9994 0 3.7811-0.34923 4.9353-0.89392l-0.73526 4.1752h-2.625v-1.05c0-0.57992-0.47008-1.05-1.05-1.05h-1.05c-0.57991 0-1.05 0.47008-1.05 1.05v1.05h-2.625l-0.73526-4.1752c1.1541 0.54469 2.936 0.89392 4.9353 0.89392z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-swim-m.svg b/data/styles/default/dark/symbols/bookmark-swim-m.svg
index b00f0f0b3..1c108895f 100644
--- a/data/styles/default/dark/symbols/bookmark-swim-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-swim-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m12.837 4.8748c-0.11862 0-0.32538 0.0576-0.42188 0.1128l-2.9856 1.6876c-0.39932 0.2184-0.55542 0.90255-0.29206 1.3124l0.90863 1.425-3.8618 2.5876 2.0769 0.975 2.2392-1.05 2.2392 1.05 0.87622-1.05-2.6935-4.1626 2.2716-1.35c0.45148-0.26088 0.43622-0.70824 0.38942-0.975-0.04434-0.25284-0.3341-0.56244-0.74639-0.56244zm1.8173 2.85c-0.86032 0-1.5577 0.80595-1.5577 1.8 0 0.99405 0.6974 1.8 1.5577 1.8 0.86032 0 1.5577-0.80595 1.5577-1.8 0-0.99405-0.6974-1.8-1.5577-1.8zm-4.1539 5.4-2.0769 1.2-2.5961-1.125-2.0769 1.125v1.8l2.0769-1.2 2.5961 1.2 2.0769-1.275 2.0769 1.275 2.0769-1.275 2.5961 1.275v-1.8l-2.5961-1.2-2.0769 1.2z" fill="#fff"/>
+ <path d="m12.837 4.8748c-0.11862 0-0.32538 0.0576-0.42188 0.1128l-2.9856 1.6876c-0.39932 0.2184-0.55542 0.90255-0.29206 1.3124l0.90863 1.425-3.8618 2.5876 2.0769 0.975 2.2392-1.05 2.2392 1.05 0.87622-1.05-2.6935-4.1626 2.2716-1.35c0.45148-0.26088 0.43622-0.70824 0.38942-0.975-0.04434-0.25284-0.3341-0.56244-0.74639-0.56244zm1.8173 2.85c-0.86032 0-1.5577 0.80595-1.5577 1.8 0 0.99405 0.6974 1.8 1.5577 1.8 0.86032 0 1.5577-0.80595 1.5577-1.8 0-0.99405-0.6974-1.8-1.5577-1.8zm-4.1539 5.4-2.0769 1.2-2.5961-1.125-2.0769 1.125v1.8l2.0769-1.2 2.5961 1.2 2.0769-1.275 2.0769 1.275 2.0769-1.275 2.5961 1.275v-1.8l-2.5961-1.2-2.0769 1.2z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-theatre-m.svg b/data/styles/default/dark/symbols/bookmark-theatre-m.svg
index 472a2248e..32c5aa5b2 100644
--- a/data/styles/default/dark/symbols/bookmark-theatre-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-theatre-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m9.975 5.5123v3.15h1.575v1.3125c0-0.43575 0.588-0.7875 1.3125-0.7875s1.3125 0.35175 1.3125 0.7875h-2.625v1.5172c0.39375 0.1995 0.84 0.32025 1.3125 0.32025 1.596 0 2.8875-1.2915 2.8875-2.8875v-3.4125zm1.575 2.667c-0.28875 0-0.525-0.23625-0.525-0.525 0-0.28875 0.23625-0.525 0.525-0.525s0.525 0.23625 0.525 0.525c0 0.294-0.23625 0.525-0.525 0.525zm2.625 0c-0.28875 0-0.525-0.23625-0.525-0.525 0-0.28875 0.23625-0.525 0.525-0.525s0.525 0.23625 0.525 0.525c0 0.294-0.23625 0.525-0.525 0.525zm-8.925 4.4205c0 1.596 1.2915 2.8875 2.8875 2.8875s2.8875-1.2915 2.8875-2.8875v-3.4125h-5.775zm2.8875 1.05c-0.7245 0-1.3125-0.35175-1.3125-0.7875h2.625c0 0.43575-0.588 0.7875-1.3125 0.7875zm1.3125-2.8875c0.28875 0 0.525 0.23625 0.525 0.525s-0.23625 0.525-0.525 0.525-0.525-0.23625-0.525-0.525 0.23625-0.525 0.525-0.525zm-2.625 0c0.28875 0 0.525 0.23625 0.525 0.525s-0.23625 0.525-0.525 0.525-0.525-0.23625-0.525-0.525 0.23625-0.525 0.525-0.525z" fill="#fff"/>
+ <path d="m9.975 5.5123v3.15h1.575v1.3125c0-0.43575 0.588-0.7875 1.3125-0.7875s1.3125 0.35175 1.3125 0.7875h-2.625v1.5172c0.39375 0.1995 0.84 0.32025 1.3125 0.32025 1.596 0 2.8875-1.2915 2.8875-2.8875v-3.4125zm1.575 2.667c-0.28875 0-0.525-0.23625-0.525-0.525 0-0.28875 0.23625-0.525 0.525-0.525s0.525 0.23625 0.525 0.525c0 0.294-0.23625 0.525-0.525 0.525zm2.625 0c-0.28875 0-0.525-0.23625-0.525-0.525 0-0.28875 0.23625-0.525 0.525-0.525s0.525 0.23625 0.525 0.525c0 0.294-0.23625 0.525-0.525 0.525zm-8.925 4.4205c0 1.596 1.2915 2.8875 2.8875 2.8875s2.8875-1.2915 2.8875-2.8875v-3.4125h-5.775zm2.8875 1.05c-0.7245 0-1.3125-0.35175-1.3125-0.7875h2.625c0 0.43575-0.588 0.7875-1.3125 0.7875zm1.3125-2.8875c0.28875 0 0.525 0.23625 0.525 0.525s-0.23625 0.525-0.525 0.525-0.525-0.23625-0.525-0.525 0.23625-0.525 0.525-0.525zm-2.625 0c0.28875 0 0.525 0.23625 0.525 0.525s-0.23625 0.525-0.525 0.525-0.525-0.23625-0.525-0.525 0.23625-0.525 0.525-0.525z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-transport-m.svg b/data/styles/default/dark/symbols/bookmark-transport-m.svg
index b6ab2b135..ebe55b746 100644
--- a/data/styles/default/dark/symbols/bookmark-transport-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-transport-m.svg
@@ -1 +1 @@
-<svg height="30" viewBox="0 0 21 30" width="21" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" x1="49.999474%" x2="49.999474%" y1="14.285714%" y2="100%"><stop offset="0" stop-color="#545454" stop-opacity=".298"/><stop offset="1" stop-opacity=".298"/></linearGradient><g fill="none" fill-rule="nonzero"><path d="m10.5-.0001c-5.8002 0-10.5 4.7023-10.5 10.4751v.004c.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992.50399.54229.7772 1.0253.84375 1.5156.066551.49028-.037971 1.0824-.60352 1.9551-.32744.50519-.50381 1.0951-.50391 1.6973.0000805 1.7081 1.4034 3.121 3.1152 3.121s3.1152-1.4128 3.1152-3.1211c-.0001-.60213-.17647-1.192-.50391-1.6973v-.002c-.56419-.8714-.67001-1.4633-.60352-1.9531.06655-.49028.33976-.97334.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-.004c0-5.7721-4.6998-10.475-10.5-10.475zm0 1.0001c5.2629 0 9.5 4.242 9.5 9.4746-.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316.22302.34368.34173.7446.3418 1.1543-.000055 1.1714-.94381 2.1211-2.1152 2.1211-1.1714 0-2.1152-.94967-2.1152-2.1211.0000683-.4097.11878-.81061.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 0-5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/><path d="m10.5 1c5.2629 0 9.5 4.242 9.5 9.4746-.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316.22302.34368.34173.7446.3418 1.1543-.000055 1.1714-.94381 2.1211-2.1152 2.1211-1.1714 0-2.1152-.94967-2.1152-2.1211.0000683-.4097.11878-.81061.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 0-5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#a)"/><path d="m12.7719997 5.5c.9384703 0 1.7108896.7381294 1.7534555 1.67560807l.2792505 6.14354523c.0408751.899227-.6023521 1.6711688-1.4698111 1.8121336l-.2437955.0224581-5.14260304.0004527c-.9002049 0-1.64209799-.6776154-1.74348983-1.5505937l-.01135611-.2445674.28060828-6.18338649c.04261163-.937505.81505536-1.67565011 1.75345557-1.67565011zm-4.72952056 7.0211946c-.38777179 0-.70211945.3143476-.70211945.7021194s.31434766.7021195.70211945.7021195c.3877718 0 .70211945-.3143477.70211945-.7021195s-.31434765-.7021194-.70211945-.7021194zm4.91483616 0c-.3877718 0-.7021194.3143476-.7021194.7021194s.3143476.7021195.7021194.7021195.7021195-.3143477.7021195-.7021195-.3143477-.7021194-.7021195-.7021194zm-.4884778-5.70472063h-3.93792475c-.4695466 0-.85592293.3695869-.8767671.83868169l-.09838115 2.2330918c0 .48470824.39294115.87764934.87764931.87764934l4.17190689-.0008655c.4842342-.0215218.8593329-.4315139.8378129-.91573935l-.0975157-2.19412329c-.0208485-.46909478-.4072293-.83869469-.8767804-.83869469z" fill="#fff"/></g></svg>
\ No newline at end of file
+<svg height="30" viewBox="0 0 21 30" width="21" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><linearGradient id="a" x1="49.999474%" x2="49.999474%" y1="14.285714%" y2="100%"><stop offset="0" stop-color="#545454" stop-opacity=".2"/><stop offset="1" stop-opacity=".2"/></linearGradient><g fill="none" fill-rule="nonzero"><path d="m10.5-.0001c-5.8002 0-10.5 4.7023-10.5 10.4751v.004c.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992.50399.54229.7772 1.0253.84375 1.5156.066551.49028-.037971 1.0824-.60352 1.9551-.32744.50519-.50381 1.0951-.50391 1.6973.0000805 1.7081 1.4034 3.121 3.1152 3.121s3.1152-1.4128 3.1152-3.1211c-.0001-.60213-.17647-1.192-.50391-1.6973v-.002c-.56419-.8714-.67001-1.4633-.60352-1.9531.06655-.49028.33976-.97334.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-.004c0-5.7721-4.6998-10.475-10.5-10.475zm0 1.0001c5.2629 0 9.5 4.242 9.5 9.4746-.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316.22302.34368.34173.7446.3418 1.1543-.000055 1.1714-.94381 2.1211-2.1152 2.1211-1.1714 0-2.1152-.94967-2.1152-2.1211.0000683-.4097.11878-.81061.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 0-5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/><path d="m10.5 1c5.2629 0 9.5 4.242 9.5 9.4746-.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316.22302.34368.34173.7446.3418 1.1543-.000055 1.1714-.94381 2.1211-2.1152 2.1211-1.1714 0-2.1152-.94967-2.1152-2.1211.0000683-.4097.11878-.81061.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 0-5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#a)"/><path d="m12.7719997 5.5c.9384703 0 1.7108896.7381294 1.7534555 1.67560807l.2792505 6.14354523c.0408751.899227-.6023521 1.6711688-1.4698111 1.8121336l-.2437955.0224581-5.14260304.0004527c-.9002049 0-1.64209799-.6776154-1.74348983-1.5505937l-.01135611-.2445674.28060828-6.18338649c.04261163-.937505.81505536-1.67565011 1.75345557-1.67565011zm-4.72952056 7.0211946c-.38777179 0-.70211945.3143476-.70211945.7021194s.31434766.7021195.70211945.7021195c.3877718 0 .70211945-.3143477.70211945-.7021195s-.31434765-.7021194-.70211945-.7021194zm4.91483616 0c-.3877718 0-.7021194.3143476-.7021194.7021194s.3143476.7021195.7021194.7021195.7021195-.3143477.7021195-.7021195-.3143477-.7021194-.7021195-.7021194zm-.4884778-5.70472063h-3.93792475c-.4695466 0-.85592293.3695869-.8767671.83868169l-.09838115 2.2330918c0 .48470824.39294115.87764934.87764931.87764934l4.17190689-.0008655c.4842342-.0215218.8593329-.4315139.8378129-.91573935l-.0975157-2.19412329c-.0208485-.46909478-.4072293-.83869469-.8767804-.83869469z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/bookmark-viewpoint-m.svg b/data/styles/default/dark/symbols/bookmark-viewpoint-m.svg
index 3fd5fb989..02a6ca34d 100644
--- a/data/styles/default/dark/symbols/bookmark-viewpoint-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-viewpoint-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m8.4068 5.5657c-0.73525 0-1.3326 0.51856-1.4578 1.1973-0.32614 0.074115-0.6325 0.27618-0.82238 0.59862l-1.9624 4.0088h0.01869c-0.1626 0.35708-0.26165 0.7473-0.26165 1.161 0 1.5962 1.3459 2.9024 2.9903 2.9024 1.2888 0 2.3857-0.80752 2.8035-1.9229 0.23797 0.11392 0.50377 0.18135 0.78502 0.18135 0.28118 0 0.54705-0.06743 0.78495-0.18135 0.41783 1.1154 1.5146 1.9229 2.8035 1.9229 1.6444 0 2.9903-1.3065 2.9903-2.9024 0-0.4137-0.09907-0.80392-0.2616-1.161h0.01868l-1.9625-4.0088c-0.18983-0.32244-0.4962-0.5245-0.82238-0.59862-0.12518-0.67868-0.72255-1.1973-1.4578-1.1973-0.72255 0-1.3184 0.49968-1.4578 1.161h-1.2709c-0.13942-0.66129-0.7353-1.161-1.4578-1.161zm-1.4951 5.2243c0.99802 0 1.7942 0.7728 1.7942 1.7414 0 0.96855-0.7962 1.7414-1.7942 1.7414s-1.7942-0.7728-1.7942-1.7414c0-0.96862 0.7962-1.7414 1.7942-1.7414zm7.1768 0c0.99802 0 1.7942 0.7728 1.7942 1.7414 0 0.96855-0.79612 1.7414-1.7942 1.7414-0.99795 0-1.7942-0.7728-1.7942-1.7414 0-0.96862 0.7962-1.7414 1.7942-1.7414zm-3.5884 0.58042c0.33165 0 0.59805 0.2586 0.59805 0.58058 0 0.32182-0.2664 0.58042-0.59805 0.58042s-0.59805-0.2586-0.59805-0.58042c0-0.32198 0.2664-0.58058 0.59805-0.58058z" fill="#fff"/>
+ <path d="m8.4068 5.5657c-0.73525 0-1.3326 0.51856-1.4578 1.1973-0.32614 0.074115-0.6325 0.27618-0.82238 0.59862l-1.9624 4.0088h0.01869c-0.1626 0.35708-0.26165 0.7473-0.26165 1.161 0 1.5962 1.3459 2.9024 2.9903 2.9024 1.2888 0 2.3857-0.80752 2.8035-1.9229 0.23797 0.11392 0.50377 0.18135 0.78502 0.18135 0.28118 0 0.54705-0.06743 0.78495-0.18135 0.41783 1.1154 1.5146 1.9229 2.8035 1.9229 1.6444 0 2.9903-1.3065 2.9903-2.9024 0-0.4137-0.09907-0.80392-0.2616-1.161h0.01868l-1.9625-4.0088c-0.18983-0.32244-0.4962-0.5245-0.82238-0.59862-0.12518-0.67868-0.72255-1.1973-1.4578-1.1973-0.72255 0-1.3184 0.49968-1.4578 1.161h-1.2709c-0.13942-0.66129-0.7353-1.161-1.4578-1.161zm-1.4951 5.2243c0.99802 0 1.7942 0.7728 1.7942 1.7414 0 0.96855-0.7962 1.7414-1.7942 1.7414s-1.7942-0.7728-1.7942-1.7414c0-0.96862 0.7962-1.7414 1.7942-1.7414zm7.1768 0c0.99802 0 1.7942 0.7728 1.7942 1.7414 0 0.96855-0.79612 1.7414-1.7942 1.7414-0.99795 0-1.7942-0.7728-1.7942-1.7414 0-0.96862 0.7962-1.7414 1.7942-1.7414zm-3.5884 0.58042c0.33165 0 0.59805 0.2586 0.59805 0.58058 0 0.32182-0.2664 0.58042-0.59805 0.58042s-0.59805-0.2586-0.59805-0.58042c0-0.32198 0.2664-0.58058 0.59805-0.58058z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmark-water-m.svg b/data/styles/default/dark/symbols/bookmark-water-m.svg
index 2eff7f365..302f62c1c 100644
--- a/data/styles/default/dark/symbols/bookmark-water-m.svg
+++ b/data/styles/default/dark/symbols/bookmark-water-m.svg
@@ -2,11 +2,11 @@
 <svg width="21" height="30" version="1.1" viewBox="0 0 21 30" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <defs>
   <linearGradient id="linearGradient1" x1="10.5" x2="10.5" y1="5" y2="29" gradientUnits="userSpaceOnUse">
-   <stop stop-color="#545454" stop-opacity=".298" offset="0"/>
-   <stop stop-color="#000" stop-opacity=".298" offset="1"/>
+   <stop stop-color="#545454" stop-opacity=".2" offset="0"/>
+   <stop stop-color="#000" stop-opacity=".2" offset="1"/>
   </linearGradient>
  </defs>
- <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#fff" opacity=".6"/>
+ <path d="m10.5 0c-5.8002 0-10.5 4.7022-10.5 10.475v4e-3c0.0091588 2.8463 1.1778 5.5656 3.2344 7.5332 1.5502 1.4956 3.4061 2.6146 4.4141 3.6992 0.50399 0.54229 0.7772 1.0253 0.84375 1.5156 0.066551 0.49028-0.037971 1.0824-0.60352 1.9551-0.32744 0.50519-0.50381 1.0951-0.50391 1.6973 8.05e-5 1.7081 1.4034 3.1209 3.1152 3.121 1.7118-8e-5 3.1152-1.4128 3.1152-3.1211-1e-4 -0.60213-0.17647-1.192-0.50391-1.6973v-2e-3c-0.56419-0.8714-0.67001-1.4633-0.60352-1.9531 0.06655-0.49028 0.33976-0.97334 0.84375-1.5156 1.008-1.0846 2.8638-2.2036 4.4141-3.6992 2.0566-1.9674 3.2252-4.6868 3.2344-7.5332v-4e-3c-6.1e-5 -5.7721-4.6998-10.475-10.5-10.475zm0 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="#000" opacity=".6"/>
  <path d="m10.5 1c5.2629 0 9.4999 4.242 9.5 9.4746-0.0083 2.5763-1.0654 5.0381-2.9277 6.8184-2.8606 2.7598-7.4159 4.3931-4.7988 8.4316 0.22302 0.34368 0.34173 0.7446 0.3418 1.1543-5.5e-5 1.1714-0.94381 2.121-2.1152 2.1211-1.1714-5.5e-5 -2.1152-0.94967-2.1152-2.1211 6.83e-5 -0.4097 0.11878-0.81061 0.3418-1.1543 2.6171-4.0385-1.9382-5.6718-4.7988-8.4316-1.8623-1.7802-2.9194-4.242-2.9277-6.8184 5.52e-5 -5.2327 4.2371-9.4746 9.5-9.4746z" fill="url(#linearGradient1)"/>
- <path d="m10.5 17c-2.3319 0-4.4999-2-4.4999-4.4999 0-2.5278 3.4166-7.0558 4.4999-8.5001 1.0833 1.4444 4.4999 5.9721 4.4999 8.5001 0 2.5-2.1681 4.4999-4.4999 4.4999z" fill="#fff"/>
+ <path d="m10.5 17c-2.3319 0-4.4999-2-4.4999-4.4999 0-2.5278 3.4166-7.0558 4.4999-8.5001 1.0833 1.4444 4.4999 5.9721 4.4999 8.5001 0 2.5-2.1681 4.4999-4.4999 4.4999z" fill="#000"/>
 </svg>
diff --git a/data/styles/vehicle/dark/style.mapcss b/data/styles/vehicle/dark/style.mapcss
index 6548bc041..78c6c35cd 100644
--- a/data/styles/vehicle/dark/style.mapcss
+++ b/data/styles/vehicle/dark/style.mapcss
@@ -113,8 +113,8 @@ colors
   BookmarkYellow-color: #FFC800;
   BookmarkOrange-color: #FF9600;
   BookmarkDeepOrange-color: #F06432;
-  BookmarkBrown-color: #804633;
-  BookmarkGray-color: #737373;
+  BookmarkBrown-color: #737373;
+  BookmarkGray-color: #808080;
   BookmarkBlueGray-color: #597380;
   SearchmarkPreparing-color: #597380;
   SearchmarkNotAvailable-color: #597380;

From dae2ce0cafdbe0c6e8448b37bf3f602e4f3be0ba Mon Sep 17 00:00:00 2001
From: Bastian Greshake Tzovaras <bgreshake@googlemail.com>
Date: Fri, 8 Aug 2025 16:00:12 -0300
Subject: [PATCH 247/302] [docs] add guidance for first-timeer review &
 template

Signed-off-by: Bastian Greshake Tzovaras <bgreshake@googlemail.com>
---
 docs/CONTRIBUTING.md |  2 +-
 docs/PR_GUIDE.md     | 39 ++++++++++++++++++++++++++++++++++-----
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index 7c9358727..19abaf657 100644
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -53,7 +53,7 @@ Sometimes it's better to discuss and confirm your vision of the fix or implement
 
 Please [learn how to use `git rebase`](https://git-scm.com/book/en/v2/Git-Branching-Rebasing) (or rebase via any git tool with a graphical interface, e.g. [Fork for Mac](https://git-fork.com/) is quite good) to amend your commits in the PR and maintain a clean logical commit history for your changes/branches.
 
-While we strive to help onboard new developers we don't have enough time to guide everyone step-by-step and explain in detail how everything works (in many cases we have to study the code ourselves). You'll need to be largely self-sufficient, expect to read a lot of code and documentation.
+We strive to help onboard new developers but we don't always have enough time to guide newcomers step-by-step and explain everything in detail. For that reason we might ask you to read lots of the documentation and study the existing code.
 
 - [Pull Request Guide](PR_GUIDE.md).
 - [Directories structure](STRUCTURE.md)
diff --git a/docs/PR_GUIDE.md b/docs/PR_GUIDE.md
index 60bc9d0cf..cc331a9d6 100644
--- a/docs/PR_GUIDE.md
+++ b/docs/PR_GUIDE.md
@@ -4,10 +4,10 @@ This document gives some guidelines to write and review PR with essential elemen
 
 ## Writing a Pull Request (PR):
 
-- A PR should have a reasonable size and reflect only one idea, a feature, a bugfix, or a refactoring, to help review and limit regression in the app
-- If a PR implements two different features, refactoring, or bug fixes, we prefer you to split it into several PRs
+- A PR should have a reasonable size and reflect only one idea, a feature, a bugfix, or a refactoring. This helps to review and limit regressions in the app
+- If you want to work on more than one feature/bug/refactoring at once, please separate PRs for these.
 - New functionality and unit or integration tests for it should be developed in the same PR
-- Every commit of all PRs should be compilable under all platforms. All tests should pass. So if changing of code breaks unit or integration tests these tests should be fixed
+- Every commit of all PRs should be compilable under all platforms and all tests should pass. If changes break unit or integration tests, then these tests should be fixed, ideally before opening a PR. 
 - Every commit should reflect a completed idea and have an understandable comment. Review fixes should be merged into one commit
 - All commits and PR captions should be written in English.
 - We suggest PRs should have prefixes in square brackets depending on the changed subsystem. For example, [routing], [generator], or [android]. Commits may have several prefixes (See `git log --oneline|egrep -o '\[[0-9a-z]*\]'|sort|uniq -c|sort -nr|less` for ideas.)
@@ -20,7 +20,7 @@ This document gives some guidelines to write and review PR with essential elemen
 
 ## Review a Pull Request (PR):
 
-- All comments in PR should be polite and concern the PR
+- All review comments should be polite and concern the PR
 - It's better to ask the developer to make the code simpler or add comments to the codebase than to understand the code through the developer's explanation
 - If a developer changes the PR significantly, the reviewers who have already approved the PR should be informed about these changes
 - A reviewer should pay attention not only to the code base but also to the description of the PR and commits
@@ -29,7 +29,36 @@ This document gives some guidelines to write and review PR with essential elemen
 - If a reviewer and a developer cannot find a compromise, a third opinion should be sought
 - A PR which should not be merged after review should be marked as a draft.
 
-## Recommendations:
+### Reviewing pull requests of first-time contributors
+
+First-time contributors are likely to be less familiar with both the project code but also the way CoMaps as a community operates.
+Some of them might also not be too familiar with using git (e.g. for rebasing branches or signing DCOs).
+
+For those reasons they might require more effort from reviewers. 
+At the same time, new contributors are the lifeblood that keeps CoMaps sustainable by ensuring that enough people are contributing code. For that reason, it's important to help those newcomers in their on-boarding.
+
+To help newcomers in feeling welcome and getting onboarded, some suggestions for what to include in :
+
+- Thank the contributor for opening a PR (they volunteered time to help the project! And offering code to a new community can be nerve-wrecking.)
+- Where applicable:
+    * Notes on how to sign the DCO/rebase commits
+    * The necessary constructive feedback if there are things that need to be improved before a PR can be merged
+- Give the contributor another thank you for their effort, signal that the community is open for helping further (e.g. on Codeberg and link to Matrix/TG/Zulip)
+
+Here's a small template that can help writing feedback to first-time contributors:
+
+> Thank you so much for this contribution - and welcome to CoMaps!
+> 
+> For CoMaps, we use the [_Developers Certficate of Origin_](https://codeberg.org/comaps/comaps/src/branch/main/docs/DCO.md) for contributors to certify that they wrote/have the right to submit their code to our project. This helps ensure that CoMaps can remain open source as it gives us some legal protection. You can sign it by signing your commit. The easiest way is to amend your existing commit with `git commit -s -m 'your commit message'`. If you are using the Codeberg interface you can also sign your commit by selection _"Add a Signed-off-by trailer by the committer at the end of the commit log message."_. 
+> 
+> There are a few things that could help improve your PR/would need to be fixed / I have a few questions about… (the actual PR feedback)
+> 
+> I hope that helps! If anything is unclear, please don't hesitate to get in touch on here, or reach out via our chat channels. You can find most of us [on different Matrix/Telegram channels](https://codeberg.org/comaps/Governance/wiki/Chat-rooms) or [on our contributor Zulip](https://comaps.zulipchat.com/join/e5e3c4zurmfxykrtbiiq6qrw/).
+> 
+> Thanks again for putting this PR together!
+   
+
+## Recommendations for making PRs:
 
 - Functions and methods should not be long. In most cases, it's good if the whole body of a function or method fits on the monitor. It's good to write a function or a method shorter than 60 lines
 - If you are solving a big task it's worth splitting it into subtasks and developing one or several PRs for every subtask.

From 0fa12070e0bbf1e9eb1b01a2300abe444ecf97ea Mon Sep 17 00:00:00 2001
From: Bastian Greshake Tzovaras <bgreshake@googlemail.com>
Date: Fri, 8 Aug 2025 16:17:36 -0300
Subject: [PATCH 248/302] [docs] add sentence on adding to CONTRIB file

Signed-off-by: Bastian Greshake Tzovaras <bgreshake@googlemail.com>
---
 docs/PR_GUIDE.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/PR_GUIDE.md b/docs/PR_GUIDE.md
index cc331a9d6..41e944755 100644
--- a/docs/PR_GUIDE.md
+++ b/docs/PR_GUIDE.md
@@ -51,6 +51,8 @@ Here's a small template that can help writing feedback to first-time contributor
 > 
 > For CoMaps, we use the [_Developers Certficate of Origin_](https://codeberg.org/comaps/comaps/src/branch/main/docs/DCO.md) for contributors to certify that they wrote/have the right to submit their code to our project. This helps ensure that CoMaps can remain open source as it gives us some legal protection. You can sign it by signing your commit. The easiest way is to amend your existing commit with `git commit -s -m 'your commit message'`. If you are using the Codeberg interface you can also sign your commit by selection _"Add a Signed-off-by trailer by the committer at the end of the commit log message."_. 
 > 
+> If you haven't yet, you could also add yourself to our [CONTRIBUTOR](https://codeberg.org/comaps/comaps/src/branch/main/CONTRIBUTORS) file with your name or pseudonym if you want (that would also give you a chance to sign the commit if needed).
+
 > There are a few things that could help improve your PR/would need to be fixed / I have a few questions about… (the actual PR feedback)
 > 
 > I hope that helps! If anything is unclear, please don't hesitate to get in touch on here, or reach out via our chat channels. You can find most of us [on different Matrix/Telegram channels](https://codeberg.org/comaps/Governance/wiki/Chat-rooms) or [on our contributor Zulip](https://comaps.zulipchat.com/join/e5e3c4zurmfxykrtbiiq6qrw/).

From 5a4f10a584fdf703e95f669d17737453dee09b1a Mon Sep 17 00:00:00 2001
From: Bastian Greshake Tzovaras <bgreshake@googlemail.com>
Date: Sat, 9 Aug 2025 11:22:06 -0300
Subject: [PATCH 249/302] [docs] clarify politeness

Signed-off-by: Bastian Greshake Tzovaras <bgreshake@googlemail.com>
---
 docs/PR_GUIDE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/PR_GUIDE.md b/docs/PR_GUIDE.md
index 41e944755..95a722f07 100644
--- a/docs/PR_GUIDE.md
+++ b/docs/PR_GUIDE.md
@@ -20,7 +20,7 @@ This document gives some guidelines to write and review PR with essential elemen
 
 ## Review a Pull Request (PR):
 
-- All review comments should be polite and concern the PR
+- We expect all comments to be polite, including for PR reviews. For PRs feedback should also only concern the PR
 - It's better to ask the developer to make the code simpler or add comments to the codebase than to understand the code through the developer's explanation
 - If a developer changes the PR significantly, the reviewers who have already approved the PR should be informed about these changes
 - A reviewer should pay attention not only to the code base but also to the description of the PR and commits

From fbc844b19e3dc2153faadd93f3402c7708264230 Mon Sep 17 00:00:00 2001
From: Bastian Greshake Tzovaras <bgreshake@googlemail.com>
Date: Mon, 25 Aug 2025 11:00:01 -0300
Subject: [PATCH 250/302] add suggestions from harry

Signed-off-by: Bastian Greshake Tzovaras <bgreshake@googlemail.com>
---
 docs/PR_GUIDE.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/PR_GUIDE.md b/docs/PR_GUIDE.md
index 95a722f07..5158cda73 100644
--- a/docs/PR_GUIDE.md
+++ b/docs/PR_GUIDE.md
@@ -5,7 +5,7 @@ This document gives some guidelines to write and review PR with essential elemen
 ## Writing a Pull Request (PR):
 
 - A PR should have a reasonable size and reflect only one idea, a feature, a bugfix, or a refactoring. This helps to review and limit regressions in the app
-- If you want to work on more than one feature/bug/refactoring at once, please separate PRs for these.
+- If you want to work on more than one feature/bug/refactoring at once, please create separate PRs for these.
 - New functionality and unit or integration tests for it should be developed in the same PR
 - Every commit of all PRs should be compilable under all platforms and all tests should pass. If changes break unit or integration tests, then these tests should be fixed, ideally before opening a PR. 
 - Every commit should reflect a completed idea and have an understandable comment. Review fixes should be merged into one commit
@@ -37,7 +37,7 @@ Some of them might also not be too familiar with using git (e.g. for rebasing br
 For those reasons they might require more effort from reviewers. 
 At the same time, new contributors are the lifeblood that keeps CoMaps sustainable by ensuring that enough people are contributing code. For that reason, it's important to help those newcomers in their on-boarding.
 
-To help newcomers in feeling welcome and getting onboarded, some suggestions for what to include in :
+To help newcomers in feeling welcome and getting onboarded, some suggestions for what to include:
 
 - Thank the contributor for opening a PR (they volunteered time to help the project! And offering code to a new community can be nerve-wrecking.)
 - Where applicable:

From 7088489814a43c629bb5ab3f0907598b22433bd2 Mon Sep 17 00:00:00 2001
From: eisa01 <eisa01@gmail.com>
Date: Sun, 24 Aug 2025 21:53:00 +0200
Subject: [PATCH 251/302] [core] Better check whether showing brand is
 redundant in subtitle

Previous implementation checked if brand was equal to name, better to check if it's located in name

Signed-off-by: eisa01 <eisa01@gmail.com>
---
 libs/map/place_page_info.cpp        | 2 +-
 libs/search/intermediate_result.cpp | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/libs/map/place_page_info.cpp b/libs/map/place_page_info.cpp
index 5874debff..d56661c78 100644
--- a/libs/map/place_page_info.cpp
+++ b/libs/map/place_page_info.cpp
@@ -165,7 +165,7 @@ std::string Info::FormatSubtitle(bool withTypes, bool withMainType) const
     auto const locBrand = platform::GetLocalizedBrandName(std::string(brand));
 
     // Do not duplicate for commonly used titles like McDonald's, Starbucks, etc.
-    if (locBrand != m_uiTitle && locBrand != m_uiSecondaryTitle)
+    if (m_uiTitle.find(locBrand) == std::string::npos && m_uiSecondaryTitle.find(locBrand) == std::string::npos)
       append(locBrand);
   }
 
diff --git a/libs/search/intermediate_result.cpp b/libs/search/intermediate_result.cpp
index 1c06e1e94..cdedcfb7b 100644
--- a/libs/search/intermediate_result.cpp
+++ b/libs/search/intermediate_result.cpp
@@ -250,10 +250,12 @@ void FillDetails(FeatureType & ft, std::string const & name, Result::Details & d
 
   std::string brand{ft.GetMetadata(feature::Metadata::FMD_BRAND)};
   if (!brand.empty())
+  {
     brand = platform::GetLocalizedBrandName(brand);
 
-  if (name == brand)
-    brand.clear();
+    if (name.find(brand) != std::string::npos)
+      brand.clear();
+  }
 
   /// @todo Avoid temporary string when OpeningHours (boost::spirit) will allow string_view.
   std::string const openHours(ft.GetMetadata(feature::Metadata::FMD_OPEN_HOURS));

From 74a36bc49a9d723dcbd0bb5f52cd19a1b423c064 Mon Sep 17 00:00:00 2001
From: Harry Bond <me@hbond.xyz>
Date: Mon, 25 Aug 2025 20:56:21 +0100
Subject: [PATCH 252/302] [android] Fix navigation notification style

Signed-off-by: Harry Bond <me@hbond.xyz>
---
 android/app/src/main/res/values/colors.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
index b06e8e94f..44e3f2729 100644
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -128,7 +128,7 @@
   <color name="bg_editor_light">#FFF2F6F6</color>
   <color name="bg_editor_light_pressed">#3D000000</color>
 
-  <color name="notification">@color/bg_primary</color>
+  <color name="notification">@color/base_accent</color>
   <color name="yellow">#FFC800</color>
 
   <color name="elevation_profile_dot_enabled">#FF9600</color>

From 73238a6e3c5996542eaeddf1c2095e41941020f3 Mon Sep 17 00:00:00 2001
From: Harry Bond <me@hbond.xyz>
Date: Sat, 23 Aug 2025 20:03:37 +0100
Subject: [PATCH 253/302] [android] increase location update freq from 1s to
 0.5s, don't take 3s to update when not following position

supersedes #1022
I don't think there's much point in mode-dependent update frequencies, AFAIK it's from earlier maps.me days when phones were weaker.

Signed-off-by: Harry Bond <me@hbond.xyz>
---
 .../sdk/location/LocationHelper.java           | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationHelper.java b/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationHelper.java
index 01328eed8..21ca52cc6 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationHelper.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/location/LocationHelper.java
@@ -21,7 +21,6 @@ import app.organicmaps.sdk.Map;
 import app.organicmaps.sdk.bookmarks.data.FeatureId;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
 import app.organicmaps.sdk.routing.JunctionInfo;
-import app.organicmaps.sdk.routing.RoutingController;
 import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.LocationUtils;
 import app.organicmaps.sdk.util.NetworkPolicy;
@@ -30,10 +29,8 @@ import org.chromium.base.ObserverList;
 
 public class LocationHelper implements BaseLocationProvider.Listener
 {
-  private static final long INTERVAL_FOLLOW_MS = 0;
-  private static final long INTERVAL_NOT_FOLLOW_MS = 3000;
-  private static final long INTERVAL_NAVIGATION_MS = 1000;
-  private static final long INTERVAL_TRACK_RECORDING = 0;
+  private static final long INTERVAL_MS = 500;
+  private static final long INTERVAL_TRACK_RECORDING = 1000;
 
   private static final long AGPS_EXPIRATION_TIME_MS = 16 * 60 * 60 * 1000; // 16 hours
   private static final long LOCATION_UPDATE_TIMEOUT_MS = 30 * 1000; // 30 seconds
@@ -311,19 +308,10 @@ public class LocationHelper implements BaseLocationProvider.Listener
 
   private long calcLocationUpdatesInterval()
   {
-    if (RoutingController.get().isNavigating())
-      return INTERVAL_NAVIGATION_MS;
-
     if (TrackRecorder.nativeIsTrackRecordingEnabled())
       return INTERVAL_TRACK_RECORDING;
 
-    final int mode = Map.isEngineCreated() ? LocationState.getMode() : LocationState.NOT_FOLLOW_NO_POSITION;
-    return switch (mode)
-    {
-      case LocationState.PENDING_POSITION, LocationState.FOLLOW, LocationState.FOLLOW_AND_ROTATE -> INTERVAL_FOLLOW_MS;
-      case LocationState.NOT_FOLLOW, LocationState.NOT_FOLLOW_NO_POSITION -> INTERVAL_NOT_FOLLOW_MS;
-      default -> throw new IllegalArgumentException("Unsupported location mode: " + mode);
-    };
+    return INTERVAL_MS;
   }
 
   /**

From 47936df79cb56f113c8188b55015ab2856cf4024 Mon Sep 17 00:00:00 2001
From: Harry Bond <me@hbond.xyz>
Date: Sat, 23 Aug 2025 22:44:42 +0100
Subject: [PATCH 254/302] [android] Rebase fixes for Add support for check_date
 & check_date:opening_hours

Following from https://codeberg.org/comaps/comaps/pulls/1572
Also add script for easy transfer of strings across modules

Signed-off-by: Harry Bond <me@hbond.xyz>
---
 .../PlacePageOpeningHoursFragment.java        |  3 +-
 .../app/src/main/res/values-af/strings.xml    |  1 -
 .../app/src/main/res/values-ar/strings.xml    |  1 -
 .../app/src/main/res/values-ast/strings.xml   |  1 -
 .../app/src/main/res/values-az/strings.xml    |  1 -
 .../app/src/main/res/values-be/strings.xml    |  1 -
 .../app/src/main/res/values-bg/strings.xml    |  1 -
 .../app/src/main/res/values-bn/strings.xml    |  1 -
 .../app/src/main/res/values-ca/strings.xml    |  1 -
 .../app/src/main/res/values-cs/strings.xml    |  1 -
 .../app/src/main/res/values-cy/strings.xml    |  1 -
 .../app/src/main/res/values-da/strings.xml    |  1 -
 .../app/src/main/res/values-de/strings.xml    |  1 -
 .../app/src/main/res/values-el/strings.xml    |  1 -
 .../app/src/main/res/values-es/strings.xml    |  1 -
 .../app/src/main/res/values-et/strings.xml    |  1 -
 .../app/src/main/res/values-eu/strings.xml    |  1 -
 .../app/src/main/res/values-fa/strings.xml    |  1 -
 .../app/src/main/res/values-fi/strings.xml    |  1 -
 .../app/src/main/res/values-fr/strings.xml    |  1 -
 .../app/src/main/res/values-gl/strings.xml    |  1 -
 .../app/src/main/res/values-gsw/strings.xml   |  1 -
 .../app/src/main/res/values-hr/strings.xml    |  1 -
 .../app/src/main/res/values-hu/strings.xml    |  1 -
 .../app/src/main/res/values-in/strings.xml    |  1 -
 .../app/src/main/res/values-is/strings.xml    |  1 -
 .../app/src/main/res/values-it/strings.xml    |  1 -
 .../app/src/main/res/values-iw/strings.xml    |  1 -
 .../app/src/main/res/values-ja/strings.xml    |  1 -
 .../app/src/main/res/values-ko/strings.xml    |  1 -
 .../app/src/main/res/values-lt/strings.xml    |  1 -
 .../app/src/main/res/values-lv/strings.xml    |  1 -
 .../app/src/main/res/values-mr/strings.xml    |  1 -
 .../app/src/main/res/values-mt/strings.xml    |  1 -
 .../app/src/main/res/values-nb/strings.xml    |  1 -
 .../app/src/main/res/values-nl/strings.xml    |  1 -
 .../app/src/main/res/values-pl/strings.xml    |  1 -
 .../src/main/res/values-pt-rBR/strings.xml    |  1 -
 .../app/src/main/res/values-pt/strings.xml    |  1 -
 .../app/src/main/res/values-ro/strings.xml    |  1 -
 .../app/src/main/res/values-ru/strings.xml    |  1 -
 .../app/src/main/res/values-sk/strings.xml    |  1 -
 .../app/src/main/res/values-sr/strings.xml    |  1 -
 .../app/src/main/res/values-sv/strings.xml    |  1 -
 .../app/src/main/res/values-th/strings.xml    |  1 -
 .../app/src/main/res/values-tr/strings.xml    |  1 -
 .../app/src/main/res/values-uk/strings.xml    |  1 -
 .../app/src/main/res/values-vi/strings.xml    |  1 -
 .../src/main/res/values-zh-rTW/strings.xml    |  1 -
 .../app/src/main/res/values-zh/strings.xml    |  1 -
 android/app/src/main/res/values/strings.xml   |  9 ----
 .../app/organicmaps/sdk/util/DateUtils.java   |  6 +--
 .../sdk/src/main/res/values-af/strings.xml    |  1 +
 .../sdk/src/main/res/values-ar/strings.xml    |  1 +
 .../sdk/src/main/res/values-ast/strings.xml   |  1 +
 .../sdk/src/main/res/values-az/strings.xml    |  1 +
 .../sdk/src/main/res/values-be/strings.xml    |  1 +
 .../sdk/src/main/res/values-bg/strings.xml    |  1 +
 .../sdk/src/main/res/values-bn/strings.xml    |  1 +
 .../sdk/src/main/res/values-ca/strings.xml    |  1 +
 .../sdk/src/main/res/values-cs/strings.xml    |  1 +
 .../sdk/src/main/res/values-cy/strings.xml    |  1 +
 .../sdk/src/main/res/values-da/strings.xml    |  1 +
 .../sdk/src/main/res/values-de/strings.xml    |  1 +
 .../sdk/src/main/res/values-el/strings.xml    |  1 +
 .../sdk/src/main/res/values-es/strings.xml    |  1 +
 .../sdk/src/main/res/values-et/strings.xml    |  1 +
 .../sdk/src/main/res/values-eu/strings.xml    |  1 +
 .../sdk/src/main/res/values-fa/strings.xml    |  1 +
 .../sdk/src/main/res/values-fi/strings.xml    |  1 +
 .../sdk/src/main/res/values-fr/strings.xml    |  1 +
 .../sdk/src/main/res/values-gl/strings.xml    |  1 +
 .../sdk/src/main/res/values-gsw/strings.xml   |  1 +
 .../sdk/src/main/res/values-hr/strings.xml    |  1 +
 .../sdk/src/main/res/values-hu/strings.xml    |  1 +
 .../sdk/src/main/res/values-in/strings.xml    |  1 +
 .../sdk/src/main/res/values-is/strings.xml    |  1 +
 .../sdk/src/main/res/values-it/strings.xml    |  1 +
 .../sdk/src/main/res/values-iw/strings.xml    |  1 +
 .../sdk/src/main/res/values-ja/strings.xml    |  1 +
 .../sdk/src/main/res/values-ko/strings.xml    |  1 +
 .../sdk/src/main/res/values-lt/strings.xml    |  1 +
 .../sdk/src/main/res/values-lv/strings.xml    |  1 +
 .../sdk/src/main/res/values-mr/strings.xml    |  1 +
 .../sdk/src/main/res/values-mt/strings.xml    |  1 +
 .../sdk/src/main/res/values-nb/strings.xml    |  1 +
 .../sdk/src/main/res/values-nl/strings.xml    |  1 +
 .../sdk/src/main/res/values-pl/strings.xml    |  1 +
 .../src/main/res/values-pt-rBR/strings.xml    |  1 +
 .../sdk/src/main/res/values-pt/strings.xml    |  1 +
 .../sdk/src/main/res/values-ro/strings.xml    |  1 +
 .../sdk/src/main/res/values-ru/strings.xml    |  1 +
 .../sdk/src/main/res/values-sk/strings.xml    |  1 +
 .../sdk/src/main/res/values-sr/strings.xml    |  1 +
 .../sdk/src/main/res/values-sv/strings.xml    |  1 +
 .../sdk/src/main/res/values-th/strings.xml    |  1 +
 .../sdk/src/main/res/values-tr/strings.xml    |  1 +
 .../sdk/src/main/res/values-uk/strings.xml    |  1 +
 .../sdk/src/main/res/values-vi/strings.xml    |  1 +
 .../src/main/res/values-zh-rTW/strings.xml    |  1 +
 .../sdk/src/main/res/values-zh/strings.xml    |  1 +
 android/sdk/src/main/res/values/strings.xml   |  9 ++++
 tools/unix/android_transfer_string.sh         | 54 +++++++++++++++++++
 103 files changed, 116 insertions(+), 63 deletions(-)
 create mode 100755 tools/unix/android_transfer_string.sh

diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java
index feba8b7ee..7165a1e10 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageOpeningHoursFragment.java
@@ -22,7 +22,6 @@ import app.organicmaps.sdk.editor.OpeningHours;
 import app.organicmaps.sdk.editor.data.Timespan;
 import app.organicmaps.sdk.editor.data.Timetable;
 import app.organicmaps.sdk.util.DateUtils;
-import app.organicmaps.sdk.util.UiUtils;
 import app.organicmaps.util.ThemeUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
@@ -180,7 +179,7 @@ public class PlacePageOpeningHoursFragment extends Fragment implements Observer<
             else
               openTime = tt.workingTimespan.toWideString();
 
-            refreshTodayOpeningHours(resources.getString(R.string.today), openTime, color);
+            refreshTodayOpeningHours(resources.getString(app.organicmaps.sdk.R.string.today), openTime, color);
             refreshTodayNonBusinessTime(tt.closedTimespans);
 
             break;
diff --git a/android/app/src/main/res/values-af/strings.xml b/android/app/src/main/res/values-af/strings.xml
index 5c3de3c02..5615a257e 100644
--- a/android/app/src/main/res/values-af/strings.xml
+++ b/android/app/src/main/res/values-af/strings.xml
@@ -397,7 +397,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Vandag gesluit</string>
     <string name="day_off">Gesluit</string>
-    <string name="today">Vandag</string>
     <string name="opens_in">Open oor %s</string>
     <string name="closes_in">Sluit oor %s</string>
     <string name="closed">Gesluit</string>
diff --git a/android/app/src/main/res/values-ar/strings.xml b/android/app/src/main/res/values-ar/strings.xml
index 739abe09f..f08610d20 100644
--- a/android/app/src/main/res/values-ar/strings.xml
+++ b/android/app/src/main/res/values-ar/strings.xml
@@ -423,7 +423,6 @@
     <string name="twentyfour_seven">٢٤/٧(ليلاً ونهاراً)</string>
     <string name="day_off_today">مغلق اليوم</string>
     <string name="day_off">مغلق</string>
-    <string name="today">اليوم</string>
     <string name="opens_in">يفتح بعد %s</string>
     <string name="closes_in">يغلق في غضون %s</string>
     <string name="closed">مغلق</string>
diff --git a/android/app/src/main/res/values-ast/strings.xml b/android/app/src/main/res/values-ast/strings.xml
index 8b2dfbfdc..37c4e795d 100644
--- a/android/app/src/main/res/values-ast/strings.xml
+++ b/android/app/src/main/res/values-ast/strings.xml
@@ -31,7 +31,6 @@
     <string name="no_available">Non</string>
     <string name="yes">Sí</string>
     <string name="yes_available">Sí</string>
-    <string name="today">Güei</string>
     <string name="export_file">Esportar KMZ</string>
     <string name="no">Non</string>
     <string name="network">Rede: %s</string>
diff --git a/android/app/src/main/res/values-az/strings.xml b/android/app/src/main/res/values-az/strings.xml
index fdd3e568a..904e776c9 100644
--- a/android/app/src/main/res/values-az/strings.xml
+++ b/android/app/src/main/res/values-az/strings.xml
@@ -415,7 +415,6 @@
     <string name="twentyfour_seven">7/24</string>
     <string name="day_off_today">Bu gün bağlıdır</string>
     <string name="day_off">Bağlı</string>
-    <string name="today">Bu gün</string>
     <string name="opens_in">%s sonra açılır</string>
     <string name="closes_in">%s sonra bağlanır</string>
     <string name="closed">Bağlı</string>
diff --git a/android/app/src/main/res/values-be/strings.xml b/android/app/src/main/res/values-be/strings.xml
index a63aee166..2f5d4dd60 100644
--- a/android/app/src/main/res/values-be/strings.xml
+++ b/android/app/src/main/res/values-be/strings.xml
@@ -409,7 +409,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Сёння закрыта</string>
     <string name="day_off">Закрыта</string>
-    <string name="today">Сёння</string>
     <string name="opens_in">Адчыняецца праз %s</string>
     <string name="closes_in">Зачыняецца праз %s</string>
     <string name="closed">Закрыта</string>
diff --git a/android/app/src/main/res/values-bg/strings.xml b/android/app/src/main/res/values-bg/strings.xml
index 8aa446325..e497822fc 100644
--- a/android/app/src/main/res/values-bg/strings.xml
+++ b/android/app/src/main/res/values-bg/strings.xml
@@ -389,7 +389,6 @@
     <string name="twentyfour_seven">24 часа</string>
     <string name="day_off_today">Затворено днес</string>
     <string name="day_off">Затворено</string>
-    <string name="today">Днес</string>
     <string name="closed">Затворено</string>
     <string name="edit_opening_hours">Редакция на работното време</string>
     <string name="no_osm_account">Нямате акаунт в OpenStreetMap?</string>
diff --git a/android/app/src/main/res/values-bn/strings.xml b/android/app/src/main/res/values-bn/strings.xml
index 3c8850785..b83caf8f7 100644
--- a/android/app/src/main/res/values-bn/strings.xml
+++ b/android/app/src/main/res/values-bn/strings.xml
@@ -240,7 +240,6 @@
     <string name="editor_report_problem_under_construction_title">রক্ষণাবেক্ষণের জন্য বন্ধ</string>
     <string name="editor_report_problem_duplicate_place_title">ডুপ্লিকেট জায়গা</string>
     <string name="day_off_today">আজকে বন্ধ</string>
-    <string name="today">আজকে</string>
     <string name="opens_in">%s-এর মধ্যে খুলবে</string>
     <string name="closes_in">%s-এর মধ্যে বন্ধ হবে</string>
     <string name="no_osm_account">আপনার ওপেনস্ট্রিটম্যাপ অ্যাকাউন্ট নেই?</string>
diff --git a/android/app/src/main/res/values-ca/strings.xml b/android/app/src/main/res/values-ca/strings.xml
index c64b5e8da..b7da16bf8 100644
--- a/android/app/src/main/res/values-ca/strings.xml
+++ b/android/app/src/main/res/values-ca/strings.xml
@@ -415,7 +415,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Avui és tancat</string>
     <string name="day_off">Tancat</string>
-    <string name="today">Avui</string>
     <string name="opens_in">Obre en %s</string>
     <string name="closes_in">Tanca en %s</string>
     <string name="closed">Tancat</string>
diff --git a/android/app/src/main/res/values-cs/strings.xml b/android/app/src/main/res/values-cs/strings.xml
index 255d2837d..c4fb65397 100644
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -408,7 +408,6 @@
     <string name="twentyfour_seven">Nonstop</string>
     <string name="day_off_today">Dnes zavřeno</string>
     <string name="day_off">Zavřeno</string>
-    <string name="today">Dnes</string>
     <string name="closed">Zavřeno</string>
     <string name="edit_opening_hours">Upravit otevírací dobu</string>
     <string name="no_osm_account">Nemáte účet u OpenStreetMap?</string>
diff --git a/android/app/src/main/res/values-cy/strings.xml b/android/app/src/main/res/values-cy/strings.xml
index 168f247ab..b6d469521 100644
--- a/android/app/src/main/res/values-cy/strings.xml
+++ b/android/app/src/main/res/values-cy/strings.xml
@@ -32,7 +32,6 @@
     <string name="editor_time_close">Ar gau</string>
     <string name="subway">Tanlwybr</string>
     <string name="downloader_retry">Ailgeisio</string>
-    <string name="today">Heddiw</string>
     <string name="button_plan">Cynllunio</string>
     <string name="translated_om_site_url">https://comaps.app/</string>
     <string name="list">Rhestr</string>
diff --git a/android/app/src/main/res/values-da/strings.xml b/android/app/src/main/res/values-da/strings.xml
index 8a53b1d73..2ad5c2d31 100644
--- a/android/app/src/main/res/values-da/strings.xml
+++ b/android/app/src/main/res/values-da/strings.xml
@@ -404,7 +404,6 @@
     <string name="twentyfour_seven">Døgnet rundt</string>
     <string name="day_off_today">Lukket i dag</string>
     <string name="day_off">Lukket</string>
-    <string name="today">I dag</string>
     <string name="closed">Lukket</string>
     <string name="edit_opening_hours">Rediger åbningstid</string>
     <string name="no_osm_account">Har du ikke OpenStreetMap-konto?</string>
diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
index f4bf5b4ae..417a875e0 100644
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -413,7 +413,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Heute geschlossen</string>
     <string name="day_off">Geschlossen</string>
-    <string name="today">Heute</string>
     <string name="opens_in">Öffnet in %s</string>
     <string name="closes_in">Schließt in %s</string>
     <string name="closed">Geschlossen</string>
diff --git a/android/app/src/main/res/values-el/strings.xml b/android/app/src/main/res/values-el/strings.xml
index 856590065..8ce93e6dc 100644
--- a/android/app/src/main/res/values-el/strings.xml
+++ b/android/app/src/main/res/values-el/strings.xml
@@ -415,7 +415,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Κλειστό σήμερα</string>
     <string name="day_off">Κλειστό</string>
-    <string name="today">Σήμερα</string>
     <string name="opens_in">Ανοίγει σε %s</string>
     <string name="closes_in">Κλείνει σε %s</string>
     <string name="closed">Κλειστό</string>
diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml
index 33446615f..ca71e7439 100644
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -417,7 +417,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Cerrado hoy</string>
     <string name="day_off">Cerrado</string>
-    <string name="today">Hoy</string>
     <string name="opens_in">Abre en %s</string>
     <string name="closes_in">Cierra en %s</string>
     <string name="closed">Cerrado</string>
diff --git a/android/app/src/main/res/values-et/strings.xml b/android/app/src/main/res/values-et/strings.xml
index 841855021..08992cfb6 100644
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -409,7 +409,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Täna suletud</string>
     <string name="day_off">Suletud</string>
-    <string name="today">Täna</string>
     <string name="opens_in">Avatakse %s möödumisel</string>
     <string name="closes_in">Suletakse %s möödumisel</string>
     <string name="closed">Suletud</string>
diff --git a/android/app/src/main/res/values-eu/strings.xml b/android/app/src/main/res/values-eu/strings.xml
index 3f57059a3..90bafcc4a 100644
--- a/android/app/src/main/res/values-eu/strings.xml
+++ b/android/app/src/main/res/values-eu/strings.xml
@@ -415,7 +415,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Gaur atseden eguna</string>
     <string name="day_off">Itxita</string>
-    <string name="today">Gaur</string>
     <string name="opens_in">%s barru irekiko da</string>
     <string name="closes_in">%s barru itxiko da</string>
     <string name="closed">Itxita</string>
diff --git a/android/app/src/main/res/values-fa/strings.xml b/android/app/src/main/res/values-fa/strings.xml
index 954451d3e..c8912f5ae 100644
--- a/android/app/src/main/res/values-fa/strings.xml
+++ b/android/app/src/main/res/values-fa/strings.xml
@@ -394,7 +394,6 @@
     <string name="twentyfour_seven">شبانه روزی</string>
     <string name="day_off_today">امروز تعطیل است</string>
     <string name="day_off">تعطیل است</string>
-    <string name="today">امروز</string>
     <string name="closed">تعطیل</string>
     <string name="edit_opening_hours">ویرایش ساعت کاری</string>
     <string name="no_osm_account">آیا حساب OpenStreetMap ندارید؟</string>
diff --git a/android/app/src/main/res/values-fi/strings.xml b/android/app/src/main/res/values-fi/strings.xml
index 9012dc848..ee71cebd4 100644
--- a/android/app/src/main/res/values-fi/strings.xml
+++ b/android/app/src/main/res/values-fi/strings.xml
@@ -416,7 +416,6 @@
     <string name="twentyfour_seven">Päivin ja öin</string>
     <string name="day_off_today">Suljettu tänään</string>
     <string name="day_off">Suljettu</string>
-    <string name="today">Tänään</string>
     <string name="opens_in">Avautuu %s kuluttua</string>
     <string name="closes_in">Sulkeutuu %s kuluttua</string>
     <string name="closed">Suljettu</string>
diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml
index fdc6e91ee..6c25774a4 100644
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -417,7 +417,6 @@
     <string name="twentyfour_seven">24/24 et 7/7</string>
     <string name="day_off_today">Fermé aujourd\'hui</string>
     <string name="day_off">Fermé</string>
-    <string name="today">Aujourd\'hui</string>
     <string name="opens_in">Ouvert dans %s</string>
     <string name="closes_in">Ferme dans %s</string>
     <string name="closed">Fermé</string>
diff --git a/android/app/src/main/res/values-gl/strings.xml b/android/app/src/main/res/values-gl/strings.xml
index 853476776..7ff6a329c 100644
--- a/android/app/src/main/res/values-gl/strings.xml
+++ b/android/app/src/main/res/values-gl/strings.xml
@@ -489,7 +489,6 @@
     <string name="translated_om_site_url">https://comaps.app/gl/</string>
     <string name="category_shopping">Compras</string>
     <string name="placepage_distance">Distancia</string>
-    <string name="today">Hoxe</string>
     <string name="category_toilet">Baño</string>
     <string name="off">Desactivado</string>
     <string name="cuisine">Cociña</string>
diff --git a/android/app/src/main/res/values-gsw/strings.xml b/android/app/src/main/res/values-gsw/strings.xml
index 920883e3e..056a54f70 100644
--- a/android/app/src/main/res/values-gsw/strings.xml
+++ b/android/app/src/main/res/values-gsw/strings.xml
@@ -360,7 +360,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Hüt zue</string>
     <string name="day_off">Zue</string>
-    <string name="today">Hüt</string>
     <string name="opens_in">Öffnet i %s</string>
     <string name="closes_in">Schlüüst i %s</string>
     <string name="closed">Zue</string>
diff --git a/android/app/src/main/res/values-hr/strings.xml b/android/app/src/main/res/values-hr/strings.xml
index d7b36e5fe..62e773e15 100644
--- a/android/app/src/main/res/values-hr/strings.xml
+++ b/android/app/src/main/res/values-hr/strings.xml
@@ -103,7 +103,6 @@
     <string name="privacy">Privatnost</string>
     <string name="power_managment_setting_never">Nikada</string>
     <string name="editor_reset_edits_button">Odbaci</string>
-    <string name="today">Danas</string>
     <string name="password">Lozinka</string>
     <string name="details">Detalji</string>
     <string name="privacy_policy">Politika privatnosti</string>
diff --git a/android/app/src/main/res/values-hu/strings.xml b/android/app/src/main/res/values-hu/strings.xml
index 7003916b5..7ec9f63d7 100644
--- a/android/app/src/main/res/values-hu/strings.xml
+++ b/android/app/src/main/res/values-hu/strings.xml
@@ -408,7 +408,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Ma zárva</string>
     <string name="day_off">Zárva</string>
-    <string name="today">Ma</string>
     <string name="closed">Zárva</string>
     <string name="edit_opening_hours">Nyitvatartás szerkesztése</string>
     <string name="no_osm_account">Nem rendelkezik még felhasználói fiókkal az OpenStreetMapen?</string>
diff --git a/android/app/src/main/res/values-in/strings.xml b/android/app/src/main/res/values-in/strings.xml
index 68acb114d..7d04267f5 100644
--- a/android/app/src/main/res/values-in/strings.xml
+++ b/android/app/src/main/res/values-in/strings.xml
@@ -402,7 +402,6 @@
     <string name="twentyfour_seven">siang dan malam</string>
     <string name="day_off_today">Tutup hari ini</string>
     <string name="day_off">Tutup</string>
-    <string name="today">Hari ini</string>
     <string name="closed">Tutup</string>
     <string name="edit_opening_hours">Sunting jam kerja</string>
     <string name="no_osm_account">Tidak ada akun di OpenStreetMap?</string>
diff --git a/android/app/src/main/res/values-is/strings.xml b/android/app/src/main/res/values-is/strings.xml
index 94094887d..58cb72ec9 100644
--- a/android/app/src/main/res/values-is/strings.xml
+++ b/android/app/src/main/res/values-is/strings.xml
@@ -45,7 +45,6 @@
     <string name="daily">Daglega</string>
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Lokað í dag</string>
-    <string name="today">Í dag</string>
     <string name="opens_in">Opnar eftir %s</string>
     <string name="closes_in">Lokar eftir %s</string>
     <string name="closed">Lokað</string>
diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml
index 6cdb510b7..d4d436925 100644
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -411,7 +411,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Oggi chiuso</string>
     <string name="day_off">Chiuso</string>
-    <string name="today">Oggi</string>
     <string name="opens_in">Apre tra %s</string>
     <string name="closes_in">Chiude tra %s</string>
     <string name="closed">Chiuso</string>
diff --git a/android/app/src/main/res/values-iw/strings.xml b/android/app/src/main/res/values-iw/strings.xml
index 70e971821..756477e92 100644
--- a/android/app/src/main/res/values-iw/strings.xml
+++ b/android/app/src/main/res/values-iw/strings.xml
@@ -409,7 +409,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">סגור היום</string>
     <string name="day_off">סגור</string>
-    <string name="today">היום</string>
     <string name="opens_in">נפתח עוד %s</string>
     <string name="closes_in">נסגר עוד %s</string>
     <string name="closed">סגור</string>
diff --git a/android/app/src/main/res/values-ja/strings.xml b/android/app/src/main/res/values-ja/strings.xml
index 4f3ef943e..962f59e21 100644
--- a/android/app/src/main/res/values-ja/strings.xml
+++ b/android/app/src/main/res/values-ja/strings.xml
@@ -419,7 +419,6 @@
     <string name="twentyfour_seven">昼と夜</string>
     <string name="day_off_today">本日終業</string>
     <string name="day_off">終業</string>
-    <string name="today">今日は</string>
     <string name="opens_in">あと %s に営業</string>
     <string name="closes_in">あと %s に閉店</string>
     <string name="closed">閉店</string>
diff --git a/android/app/src/main/res/values-ko/strings.xml b/android/app/src/main/res/values-ko/strings.xml
index 3c8efe7b8..867693ea9 100644
--- a/android/app/src/main/res/values-ko/strings.xml
+++ b/android/app/src/main/res/values-ko/strings.xml
@@ -402,7 +402,6 @@
     <string name="twentyfour_seven">24 시간</string>
     <string name="day_off_today">오늘 영업 종료됨</string>
     <string name="day_off">종료됨</string>
-    <string name="today">오늘</string>
     <string name="closed">닫음</string>
     <string name="edit_opening_hours">영업일 편집</string>
     <string name="no_osm_account">OpenStreetMap에서 계정이 없습니까?</string>
diff --git a/android/app/src/main/res/values-lt/strings.xml b/android/app/src/main/res/values-lt/strings.xml
index 93cc47a5a..500f12265 100644
--- a/android/app/src/main/res/values-lt/strings.xml
+++ b/android/app/src/main/res/values-lt/strings.xml
@@ -403,7 +403,6 @@
     <string name="twentyfour_seven">24×7</string>
     <string name="day_off_today">Šiandien uždaryta</string>
     <string name="day_off">Uždaryta</string>
-    <string name="today">Šiandien</string>
     <string name="opens_in">Atsidaro už %s</string>
     <string name="closes_in">Užsidaro už %s</string>
     <string name="closed">Uždaryta</string>
diff --git a/android/app/src/main/res/values-lv/strings.xml b/android/app/src/main/res/values-lv/strings.xml
index b8c8f057f..dfb69af04 100644
--- a/android/app/src/main/res/values-lv/strings.xml
+++ b/android/app/src/main/res/values-lv/strings.xml
@@ -415,7 +415,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Šodien slēgts</string>
     <string name="day_off">Slēgts</string>
-    <string name="today">Šodien</string>
     <string name="opens_in">Atveras pēc %s</string>
     <string name="closes_in">Slēgts pēc %s</string>
     <string name="closed">Slēgts</string>
diff --git a/android/app/src/main/res/values-mr/strings.xml b/android/app/src/main/res/values-mr/strings.xml
index 39e3a60e6..e1429f8b9 100644
--- a/android/app/src/main/res/values-mr/strings.xml
+++ b/android/app/src/main/res/values-mr/strings.xml
@@ -395,7 +395,6 @@
     <string name="twentyfour_seven">२४/७</string>
     <string name="day_off_today">आज बंद</string>
     <string name="day_off">बंद</string>
-    <string name="today">आज</string>
     <string name="closed">बंद</string>
     <string name="edit_opening_hours">व्यवसायाची वेळ संपादित करा</string>
     <string name="no_osm_account">OpenStreetMap खाते नाही?</string>
diff --git a/android/app/src/main/res/values-mt/strings.xml b/android/app/src/main/res/values-mt/strings.xml
index ef9c45127..0f71f36fe 100644
--- a/android/app/src/main/res/values-mt/strings.xml
+++ b/android/app/src/main/res/values-mt/strings.xml
@@ -474,7 +474,6 @@
     <string name="yes">Iva</string>
     <string name="no">Le</string>
     <string name="editor_osm_notes">In-noti tad-dejta tal-mappa tiegħek</string>
-    <string name="today">Illum</string>
     <string name="social_media">Midja Soċjali</string>
     <string name="downloader_update_maps">Aġġorna l-Mapep</string>
     <string name="error_enter_correct_facebook_page">Daħħal indirizz tal-web, kont, jew isem tal-paġna validu ta ’Facebook</string>
diff --git a/android/app/src/main/res/values-nb/strings.xml b/android/app/src/main/res/values-nb/strings.xml
index 5d5de11c6..dc1210df0 100644
--- a/android/app/src/main/res/values-nb/strings.xml
+++ b/android/app/src/main/res/values-nb/strings.xml
@@ -415,7 +415,6 @@
     <string name="twentyfour_seven">Dag og natt</string>
     <string name="day_off_today">Fridag i dag</string>
     <string name="day_off">Fridag</string>
-    <string name="today">I dag</string>
     <string name="opens_in">Åpner om %s</string>
     <string name="closes_in">Stenger om %s</string>
     <string name="closed">Stengt</string>
diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml
index c35efd3c3..7b8fd0d16 100644
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -413,7 +413,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Vandaag gesloten</string>
     <string name="day_off">Gesloten</string>
-    <string name="today">Vandaag</string>
     <string name="opens_in">Opent over %s</string>
     <string name="closes_in">Sluit over %s</string>
     <string name="closed">Gesloten</string>
diff --git a/android/app/src/main/res/values-pl/strings.xml b/android/app/src/main/res/values-pl/strings.xml
index 1d990e3b2..153f5906b 100644
--- a/android/app/src/main/res/values-pl/strings.xml
+++ b/android/app/src/main/res/values-pl/strings.xml
@@ -417,7 +417,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Dziś nieczynne</string>
     <string name="day_off">Nieczynne</string>
-    <string name="today">Dzisiaj</string>
     <string name="opens_in">Otwarcie za %s</string>
     <string name="closes_in">Zamknięcie za %s</string>
     <string name="closed">Zamknięte</string>
diff --git a/android/app/src/main/res/values-pt-rBR/strings.xml b/android/app/src/main/res/values-pt-rBR/strings.xml
index 48618d48b..26098d376 100644
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -376,7 +376,6 @@
     <string name="twentyfour_seven">24 horas por dia</string>
     <string name="day_off_today">Fechado hoje</string>
     <string name="day_off">Fechado</string>
-    <string name="today">Hoje</string>
     <string name="opens_in">Abre em %s</string>
     <string name="closes_in">Fecha em %s</string>
     <string name="closed">Fechado</string>
diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index 22f02faae..8819a3302 100644
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -411,7 +411,6 @@
     <string name="twentyfour_seven">24 horas por dia</string>
     <string name="day_off_today">Fechado hoje</string>
     <string name="day_off">Fechado</string>
-    <string name="today">Hoje</string>
     <string name="closed">Fechado</string>
     <string name="edit_opening_hours">Editar horário de funcionamento</string>
     <string name="no_osm_account">Não tem uma conta no OpenStreetMap?</string>
diff --git a/android/app/src/main/res/values-ro/strings.xml b/android/app/src/main/res/values-ro/strings.xml
index fe4592c64..dfb5f2d87 100644
--- a/android/app/src/main/res/values-ro/strings.xml
+++ b/android/app/src/main/res/values-ro/strings.xml
@@ -409,7 +409,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Închis astăzi</string>
     <string name="day_off">Închis</string>
-    <string name="today">Azi</string>
     <string name="opens_in">Deschide în %s</string>
     <string name="closes_in">Închide în %s</string>
     <string name="closed">Închis</string>
diff --git a/android/app/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml
index b2aef9705..bc8bc3003 100644
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
@@ -417,7 +417,6 @@
     <string name="twentyfour_seven">Круглосуточно</string>
     <string name="day_off_today">Сегодня закрыто</string>
     <string name="day_off">Закрыто</string>
-    <string name="today">Сегодня</string>
     <string name="opens_in">Открывается через %s</string>
     <string name="closes_in">Закроется через %s</string>
     <string name="closed">Закрыто</string>
diff --git a/android/app/src/main/res/values-sk/strings.xml b/android/app/src/main/res/values-sk/strings.xml
index 658ad713e..dfad87cbb 100644
--- a/android/app/src/main/res/values-sk/strings.xml
+++ b/android/app/src/main/res/values-sk/strings.xml
@@ -413,7 +413,6 @@
     <string name="twentyfour_seven">Deň a noc</string>
     <string name="day_off_today">Dnes deň voľna</string>
     <string name="day_off">Zatvorené</string>
-    <string name="today">Dnes</string>
     <string name="opens_in">Otvoria o %s</string>
     <string name="closes_in">Zatvoria o %s</string>
     <string name="closed">Zatvorené</string>
diff --git a/android/app/src/main/res/values-sr/strings.xml b/android/app/src/main/res/values-sr/strings.xml
index 38a75c194..d31ed4b6e 100644
--- a/android/app/src/main/res/values-sr/strings.xml
+++ b/android/app/src/main/res/values-sr/strings.xml
@@ -410,7 +410,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Данас не ради</string>
     <string name="day_off">Затворено</string>
-    <string name="today">Данас</string>
     <string name="opens_in">Отвара се за %s</string>
     <string name="closes_in">Затвара се за %s</string>
     <string name="closed">Затворено</string>
diff --git a/android/app/src/main/res/values-sv/strings.xml b/android/app/src/main/res/values-sv/strings.xml
index ae7bd0680..ee2b18d4a 100644
--- a/android/app/src/main/res/values-sv/strings.xml
+++ b/android/app/src/main/res/values-sv/strings.xml
@@ -402,7 +402,6 @@
     <string name="twentyfour_seven">Dygnet runt</string>
     <string name="day_off_today">Stängt idag</string>
     <string name="day_off">Stängt</string>
-    <string name="today">Idag</string>
     <string name="closed">Stängt</string>
     <string name="edit_opening_hours">Redigera öppettider</string>
     <string name="no_osm_account">Inget konto hos OpenStreetMap?</string>
diff --git a/android/app/src/main/res/values-th/strings.xml b/android/app/src/main/res/values-th/strings.xml
index 177d0563f..b85723d35 100644
--- a/android/app/src/main/res/values-th/strings.xml
+++ b/android/app/src/main/res/values-th/strings.xml
@@ -402,7 +402,6 @@
     <string name="twentyfour_seven">ทั้งกลางวันและกลางคืน</string>
     <string name="day_off_today">วันนี้ปิด</string>
     <string name="day_off">ปิด</string>
-    <string name="today">วันนี้</string>
     <string name="closed">ปิด</string>
     <string name="edit_opening_hours">แก้ไขชั่วโมงทำการ</string>
     <string name="no_osm_account">ไม่มีบัญชีใน OpenStreetMap?</string>
diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml
index 8ff60ee43..8deda4940 100644
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -413,7 +413,6 @@
     <string name="twentyfour_seven">7/24</string>
     <string name="day_off_today">Bugün kapalı</string>
     <string name="day_off">Kapalı</string>
-    <string name="today">Bugün</string>
     <string name="opens_in">%s sonra açılıyor</string>
     <string name="closes_in">%s sonra kapanıyor</string>
     <string name="closed">Kapalı</string>
diff --git a/android/app/src/main/res/values-uk/strings.xml b/android/app/src/main/res/values-uk/strings.xml
index 4c64c8a2b..b4ca03c34 100644
--- a/android/app/src/main/res/values-uk/strings.xml
+++ b/android/app/src/main/res/values-uk/strings.xml
@@ -417,7 +417,6 @@
     <string name="twentyfour_seven">Цілодобово</string>
     <string name="day_off_today">Сьогодні зачинено</string>
     <string name="day_off">Зачинено</string>
-    <string name="today">Сьогодні</string>
     <string name="opens_in">Відкривається через %s</string>
     <string name="closes_in">Зачиняється через %s</string>
     <string name="closed">Зачинено</string>
diff --git a/android/app/src/main/res/values-vi/strings.xml b/android/app/src/main/res/values-vi/strings.xml
index 3e66e9800..65175ab80 100644
--- a/android/app/src/main/res/values-vi/strings.xml
+++ b/android/app/src/main/res/values-vi/strings.xml
@@ -402,7 +402,6 @@
     <string name="twentyfour_seven">ngày và đêm</string>
     <string name="day_off_today">Nghỉ hôm nay</string>
     <string name="day_off">Ngày nghỉ</string>
-    <string name="today">Hôm nay</string>
     <string name="closed">Đã đóng</string>
     <string name="edit_opening_hours">Sửa giờ làm việc</string>
     <string name="no_osm_account">Bạn chưa có tài khoản tại OpenStreetMap ư?</string>
diff --git a/android/app/src/main/res/values-zh-rTW/strings.xml b/android/app/src/main/res/values-zh-rTW/strings.xml
index 706e6571e..e5a78a871 100644
--- a/android/app/src/main/res/values-zh-rTW/strings.xml
+++ b/android/app/src/main/res/values-zh-rTW/strings.xml
@@ -423,7 +423,6 @@
     <string name="twentyfour_seven">24/7 全天候營業</string>
     <string name="day_off_today">今天不營業</string>
     <string name="day_off">不營業</string>
-    <string name="today">今天</string>
     <string name="opens_in">將於 %s 後開業</string>
     <string name="closes_in">將於 %s 後歇業</string>
     <string name="closed">已停止營業</string>
diff --git a/android/app/src/main/res/values-zh/strings.xml b/android/app/src/main/res/values-zh/strings.xml
index d85827400..55541a6da 100644
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -423,7 +423,6 @@
     <string name="twentyfour_seven">24/7 全天候营业</string>
     <string name="day_off_today">今天不营业</string>
     <string name="day_off">不营业</string>
-    <string name="today">今天</string>
     <string name="opens_in">将于 %s 后开业</string>
     <string name="closes_in">将于 %s 后歇业</string>
     <string name="closed">已停止营业</string>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index baf8593c8..eba896155 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -462,7 +462,6 @@
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Closed today</string>
     <string name="day_off">Closed</string>
-    <string name="today">Today</string>
     <string name="opens_in">Opens in %s</string>
     <string name="closes_in">Closes in %s</string>
     <string name="closed">Closed</string>
@@ -470,14 +469,6 @@
     <string name="hours_confirmed_time_ago">Confirmed %s</string>
     <!-- Used on the place page for the last checked date, eg. "Existence confirmed two weeks ago" -->
     <string name="existence_confirmed_time_ago">Existence confirmed %s</string>
-    <string name="yesterday">Yesterday</string>
-    <string name="days_ago">%s days ago</string>
-    <string name="week_ago">%s week ago</string>
-    <string name="weeks_ago">%s weeks ago</string>
-    <string name="month_ago">%s month ago</string>
-    <string name="months_ago">%s months ago</string>
-    <string name="year_ago">%s year ago</string>
-    <string name="years_ago">%s years ago</string>
     <string name="edit_opening_hours">Edit business hours</string>
     <string name="no_osm_account">Don\'t have an OpenStreetMap account?</string>
     <string name="register_at_openstreetmap">Register at OpenStreetMap</string>
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/util/DateUtils.java b/android/sdk/src/main/java/app/organicmaps/sdk/util/DateUtils.java
index bc445cb63..0f561a517 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/util/DateUtils.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/util/DateUtils.java
@@ -10,7 +10,7 @@ import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.Locale;
 
-import app.organicmaps.R;
+import app.organicmaps.sdk.R;
 
 public final class DateUtils
 {
@@ -40,9 +40,9 @@ public final class DateUtils
     int days = (int) (LocalDate.now().toEpochDay() - LocalDate.parse(dateString, formatter).toEpochDay());
 
     if (days == 0)
-      return resources.getString(R.string.today);
+      return resources.getString(R.string.today).toLowerCase();
     if (days == 1)
-      return resources.getString(R.string.yesterday);
+      return resources.getString(R.string.yesterday).toLowerCase();
     if (days < 7)
       return  resources.getString(R.string.days_ago, Integer.toString(days));
     if (days < 30)
diff --git a/android/sdk/src/main/res/values-af/strings.xml b/android/sdk/src/main/res/values-af/strings.xml
index 999ba058f..a1047d469 100644
--- a/android/sdk/src/main/res/values-af/strings.xml
+++ b/android/sdk/src/main/res/values-af/strings.xml
@@ -36,4 +36,5 @@
     <string name="limited_access">Beperkte toegang</string>
     <string name="not_shared">Privaat</string>
     <string name="access_rules_author_only">Aanlyn wysiging</string>
+    <string name="today">Vandag</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-ar/strings.xml b/android/sdk/src/main/res/values-ar/strings.xml
index 5cf3964e6..56ea72d29 100644
--- a/android/sdk/src/main/res/values-ar/strings.xml
+++ b/android/sdk/src/main/res/values-ar/strings.xml
@@ -36,4 +36,5 @@
     <string name="limited_access">مسموح الوصول بشكل محدود</string>
     <string name="not_shared">خاص</string>
     <string name="access_rules_author_only">التعديل باستخدام الإنترنت</string>
+    <string name="today">اليوم</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-ast/strings.xml b/android/sdk/src/main/res/values-ast/strings.xml
index fedc5670a..b9ddfa263 100644
--- a/android/sdk/src/main/res/values-ast/strings.xml
+++ b/android/sdk/src/main/res/values-ast/strings.xml
@@ -9,4 +9,5 @@
     <string name="km">km</string>
     <string name="gb">GB</string>
     <string name="m">m</string>
+    <string name="today">Güei</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-az/strings.xml b/android/sdk/src/main/res/values-az/strings.xml
index 842bda15a..c2ea48fa9 100644
--- a/android/sdk/src/main/res/values-az/strings.xml
+++ b/android/sdk/src/main/res/values-az/strings.xml
@@ -35,4 +35,5 @@
     <string name="limited_access">Məhdud giriş</string>
     <string name="not_shared">Gizli</string>
     <string name="access_rules_author_only">Onlayn redaktə</string>
+    <string name="today">Bu gün</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-be/strings.xml b/android/sdk/src/main/res/values-be/strings.xml
index a021045bd..762416816 100644
--- a/android/sdk/src/main/res/values-be/strings.xml
+++ b/android/sdk/src/main/res/values-be/strings.xml
@@ -36,4 +36,5 @@
     <string name="limited_access">Абмежаваны доступ</string>
     <string name="not_shared">Прыватны</string>
     <string name="access_rules_author_only">Рэдагаванне анлайн</string>
+    <string name="today">Сёння</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-bg/strings.xml b/android/sdk/src/main/res/values-bg/strings.xml
index 3df9166a8..c81b12023 100644
--- a/android/sdk/src/main/res/values-bg/strings.xml
+++ b/android/sdk/src/main/res/values-bg/strings.xml
@@ -31,4 +31,5 @@
     <string name="maps_storage_removable">Карта памет</string>
     <string name="maps_storage_external">Външно споделено хранилище</string>
     <string name="maps_storage_shared">Вътрешно споделено хранилище</string>
+    <string name="today">Днес</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-bn/strings.xml b/android/sdk/src/main/res/values-bn/strings.xml
index e12b2381a..8275283e5 100644
--- a/android/sdk/src/main/res/values-bn/strings.xml
+++ b/android/sdk/src/main/res/values-bn/strings.xml
@@ -10,4 +10,5 @@
     <string name="category_wifi">ওয়াইফাই</string>
     <string name="maps_storage_shared">অভ্যন্তরীণ শেয়ার্ড স্টোরেজ</string>
     <string name="postal_code">ডাক কোড</string>
+    <string name="today">আজকে</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-ca/strings.xml b/android/sdk/src/main/res/values-ca/strings.xml
index ddfa3ca0b..f8982d919 100644
--- a/android/sdk/src/main/res/values-ca/strings.xml
+++ b/android/sdk/src/main/res/values-ca/strings.xml
@@ -35,4 +35,5 @@
     <string name="access_rules_author_only">Edició en línia</string>
     <string name="mb">MB</string>
     <string name="gb">GB</string>
+    <string name="today">Avui</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-cs/strings.xml b/android/sdk/src/main/res/values-cs/strings.xml
index 3af3648a9..93f03ac2d 100644
--- a/android/sdk/src/main/res/values-cs/strings.xml
+++ b/android/sdk/src/main/res/values-cs/strings.xml
@@ -31,4 +31,5 @@
     <string name="maps_storage_shared">Interní sdílené úložiště</string>
     <string name="maps_storage_internal">Interní soukromé úložiště</string>
     <string name="maps_storage_external">Externí sdílené úložiště</string>
+    <string name="today">Dnes</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-cy/strings.xml b/android/sdk/src/main/res/values-cy/strings.xml
index d474df213..e63a76610 100644
--- a/android/sdk/src/main/res/values-cy/strings.xml
+++ b/android/sdk/src/main/res/values-cy/strings.xml
@@ -18,4 +18,5 @@
     <string name="public_access">Mynediad cyhoeddus</string>
     <string name="limited_access">Mynediad cyfyngedig</string>
     <string name="access_rules_author_only">Golygu ar-lein</string>
+    <string name="today">Heddiw</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-da/strings.xml b/android/sdk/src/main/res/values-da/strings.xml
index 5c09ff0b4..6b9d4c7a1 100644
--- a/android/sdk/src/main/res/values-da/strings.xml
+++ b/android/sdk/src/main/res/values-da/strings.xml
@@ -31,4 +31,5 @@
     <string name="maps_storage_shared">Intern delt lagerplads</string>
     <string name="maps_storage_removable">SD-kort</string>
     <string name="maps_storage_external">Ekstern delt lagerplads</string>
+    <string name="today">I dag</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-de/strings.xml b/android/sdk/src/main/res/values-de/strings.xml
index bab1077b0..938aa7cc9 100644
--- a/android/sdk/src/main/res/values-de/strings.xml
+++ b/android/sdk/src/main/res/values-de/strings.xml
@@ -35,4 +35,5 @@
     <string name="access_rules_author_only">Online bearbeiten</string>
     <string name="gb">GB</string>
     <string name="mb">MB</string>
+    <string name="today">Heute</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-el/strings.xml b/android/sdk/src/main/res/values-el/strings.xml
index 2ecc52de4..52e4b22a1 100644
--- a/android/sdk/src/main/res/values-el/strings.xml
+++ b/android/sdk/src/main/res/values-el/strings.xml
@@ -34,4 +34,5 @@
     <string name="access_rules_author_only">Online επεξεργασία</string>
     <string name="mb">MB</string>
     <string name="mi">μι</string>
+    <string name="today">Σήμερα</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-es/strings.xml b/android/sdk/src/main/res/values-es/strings.xml
index 5fd9a4e39..a8e43e5c7 100644
--- a/android/sdk/src/main/res/values-es/strings.xml
+++ b/android/sdk/src/main/res/values-es/strings.xml
@@ -35,4 +35,5 @@
     <string name="access_rules_author_only">Edición en línea</string>
     <string name="mb">MB</string>
     <string name="gb">GB</string>
+    <string name="today">Hoy</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-et/strings.xml b/android/sdk/src/main/res/values-et/strings.xml
index 8d52680e9..408e974fa 100644
--- a/android/sdk/src/main/res/values-et/strings.xml
+++ b/android/sdk/src/main/res/values-et/strings.xml
@@ -35,4 +35,5 @@
     <string name="access_rules_author_only">Võrgupõhine muutmine</string>
     <string name="mb">MB</string>
     <string name="gb">GB</string>
+    <string name="today">Täna</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-eu/strings.xml b/android/sdk/src/main/res/values-eu/strings.xml
index 633403bdc..c03a1f2de 100644
--- a/android/sdk/src/main/res/values-eu/strings.xml
+++ b/android/sdk/src/main/res/values-eu/strings.xml
@@ -35,4 +35,5 @@
     <string name="access_rules_author_only">Sarean editatzen</string>
     <string name="mb">MB</string>
     <string name="gb">GB</string>
+    <string name="today">Gaur</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-fa/strings.xml b/android/sdk/src/main/res/values-fa/strings.xml
index a757016f4..c3df06136 100644
--- a/android/sdk/src/main/res/values-fa/strings.xml
+++ b/android/sdk/src/main/res/values-fa/strings.xml
@@ -28,4 +28,5 @@
     <string name="limited_access">دسترسی محدود</string>
     <string name="not_shared">خصوصی</string>
     <string name="access_rules_author_only">ویرایش آنلاین</string>
+    <string name="today">امروز</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-fi/strings.xml b/android/sdk/src/main/res/values-fi/strings.xml
index b353b0d80..b3722ce12 100644
--- a/android/sdk/src/main/res/values-fi/strings.xml
+++ b/android/sdk/src/main/res/values-fi/strings.xml
@@ -36,4 +36,5 @@
     <string name="limited_access">Rajoitettu pääsy</string>
     <string name="not_shared">Yksityinen</string>
     <string name="access_rules_author_only">Nettimuokkaus</string>
+    <string name="today">Tänään</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-fr/strings.xml b/android/sdk/src/main/res/values-fr/strings.xml
index 1ab32bf83..a4b6c8b43 100644
--- a/android/sdk/src/main/res/values-fr/strings.xml
+++ b/android/sdk/src/main/res/values-fr/strings.xml
@@ -36,4 +36,5 @@
     <string name="limited_access">Accès limité</string>
     <string name="not_shared">Privé</string>
     <string name="access_rules_author_only">Édition en ligne</string>
+    <string name="today">Aujourd\'hui</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-gl/strings.xml b/android/sdk/src/main/res/values-gl/strings.xml
index 96b0d6013..2f36d2e52 100644
--- a/android/sdk/src/main/res/values-gl/strings.xml
+++ b/android/sdk/src/main/res/values-gl/strings.xml
@@ -22,4 +22,5 @@
     <string name="category_wifi">Wifi</string>
     <string name="maps_storage_removable">Tarxeta SD</string>
     <string name="core_placepage_unknown_place">Punto do mapa</string>
+    <string name="today">Hoxe</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-gsw/strings.xml b/android/sdk/src/main/res/values-gsw/strings.xml
index 970677800..aa413426e 100644
--- a/android/sdk/src/main/res/values-gsw/strings.xml
+++ b/android/sdk/src/main/res/values-gsw/strings.xml
@@ -22,4 +22,5 @@
     <string name="ft">ft</string>
     <string name="core_entrance">Iigang</string>
     <string name="public_access">Öffentliche Zuegriff</string>
+    <string name="today">Hüt</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-hr/strings.xml b/android/sdk/src/main/res/values-hr/strings.xml
index a9240fa1c..161838bcb 100644
--- a/android/sdk/src/main/res/values-hr/strings.xml
+++ b/android/sdk/src/main/res/values-hr/strings.xml
@@ -7,4 +7,5 @@
     <string name="not_shared">Privatno</string>
     <string name="mb">MB</string>
     <string name="gb">GB</string>
+    <string name="today">Danas</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-hu/strings.xml b/android/sdk/src/main/res/values-hu/strings.xml
index 2c9c5ab4e..15b30dab6 100644
--- a/android/sdk/src/main/res/values-hu/strings.xml
+++ b/android/sdk/src/main/res/values-hu/strings.xml
@@ -35,4 +35,5 @@
     <string name="access_rules_author_only">Szerkesztés online</string>
     <string name="mb">MB</string>
     <string name="gb">GB</string>
+    <string name="today">Ma</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-in/strings.xml b/android/sdk/src/main/res/values-in/strings.xml
index 0a5197af9..23956eadd 100644
--- a/android/sdk/src/main/res/values-in/strings.xml
+++ b/android/sdk/src/main/res/values-in/strings.xml
@@ -27,4 +27,5 @@
     <string name="limited_access">Akses terbatas</string>
     <string name="not_shared">Pribadi</string>
     <string name="access_rules_author_only">Pengeditan online</string>
+    <string name="today">Hari ini</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-is/strings.xml b/android/sdk/src/main/res/values-is/strings.xml
index f4dd81318..640efdc02 100644
--- a/android/sdk/src/main/res/values-is/strings.xml
+++ b/android/sdk/src/main/res/values-is/strings.xml
@@ -22,4 +22,5 @@
     <string name="core_placepage_unknown_place">Punktur á korti</string>
     <string name="subway_data_unavailable">Kort fyrir neðanjarðarlest er ekki tiltækt</string>
     <string name="access_rules_author_only">Breytingar á netinu</string>
+    <string name="today">Í dag</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-it/strings.xml b/android/sdk/src/main/res/values-it/strings.xml
index dafb6afc3..eaf7b5237 100644
--- a/android/sdk/src/main/res/values-it/strings.xml
+++ b/android/sdk/src/main/res/values-it/strings.xml
@@ -30,4 +30,5 @@
     <string name="maps_storage_removable">Scheda SD</string>
     <string name="mb">MB</string>
     <string name="gb">GB</string>
+    <string name="today">Oggi</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-iw/strings.xml b/android/sdk/src/main/res/values-iw/strings.xml
index 3e934ab01..24e4c70fa 100644
--- a/android/sdk/src/main/res/values-iw/strings.xml
+++ b/android/sdk/src/main/res/values-iw/strings.xml
@@ -33,4 +33,5 @@
     <string name="access_rules_author_only">עריכה אונליין</string>
     <string name="gb">GB</string>
     <string name="mb">MB</string>
+    <string name="today">היום</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-ja/strings.xml b/android/sdk/src/main/res/values-ja/strings.xml
index 63399ce22..e4c754cb5 100644
--- a/android/sdk/src/main/res/values-ja/strings.xml
+++ b/android/sdk/src/main/res/values-ja/strings.xml
@@ -35,4 +35,5 @@
     <string name="access_rules_author_only">オンライン編集</string>
     <string name="gb">GB</string>
     <string name="mb">MB</string>
+    <string name="today">今日は</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-ko/strings.xml b/android/sdk/src/main/res/values-ko/strings.xml
index 3b5c1dff3..25f91ce08 100644
--- a/android/sdk/src/main/res/values-ko/strings.xml
+++ b/android/sdk/src/main/res/values-ko/strings.xml
@@ -27,4 +27,5 @@
     <string name="access_rules_author_only">온라인 수정</string>
     <string name="gb">GB</string>
     <string name="mb">MB</string>
+    <string name="today">오늘</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-lt/strings.xml b/android/sdk/src/main/res/values-lt/strings.xml
index 8028092bf..5af60bb01 100644
--- a/android/sdk/src/main/res/values-lt/strings.xml
+++ b/android/sdk/src/main/res/values-lt/strings.xml
@@ -36,4 +36,5 @@
     <string name="limited_access">Ribota prieiga</string>
     <string name="not_shared">Privatus</string>
     <string name="access_rules_author_only">Taisymas internete</string>
+    <string name="today">Šiandien</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-lv/strings.xml b/android/sdk/src/main/res/values-lv/strings.xml
index eb4d41475..286444044 100644
--- a/android/sdk/src/main/res/values-lv/strings.xml
+++ b/android/sdk/src/main/res/values-lv/strings.xml
@@ -34,4 +34,5 @@
     <string name="core_placepage_unknown_place">Punkts kartē</string>
     <string name="gb">GB</string>
     <string name="mb">MB</string>
+    <string name="today">Šodien</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-mr/strings.xml b/android/sdk/src/main/res/values-mr/strings.xml
index 259f8f8af..501b93dba 100644
--- a/android/sdk/src/main/res/values-mr/strings.xml
+++ b/android/sdk/src/main/res/values-mr/strings.xml
@@ -25,4 +25,5 @@
     <string name="limited_access">मर्यादित प्रवेश</string>
     <string name="not_shared">खाजगी</string>
     <string name="access_rules_author_only">ऑनलाइन संपादन</string>
+    <string name="today">आज</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-mt/strings.xml b/android/sdk/src/main/res/values-mt/strings.xml
index 679f717ad..465d7e600 100644
--- a/android/sdk/src/main/res/values-mt/strings.xml
+++ b/android/sdk/src/main/res/values-mt/strings.xml
@@ -23,4 +23,5 @@
     <string name="not_shared">Privat</string>
     <string name="access_rules_author_only">Editjar onlajn</string>
     <string name="public_access">Aċċess pubbliku</string>
+    <string name="today">Illum</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-nb/strings.xml b/android/sdk/src/main/res/values-nb/strings.xml
index b914a090e..956e623c3 100644
--- a/android/sdk/src/main/res/values-nb/strings.xml
+++ b/android/sdk/src/main/res/values-nb/strings.xml
@@ -36,4 +36,5 @@
     <string name="not_shared">Privat</string>
     <string name="access_rules_author_only">Redigering på nett</string>
     <string name="gb">GB</string>
+    <string name="today">I dag</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-nl/strings.xml b/android/sdk/src/main/res/values-nl/strings.xml
index 7adda9261..8a29a1297 100644
--- a/android/sdk/src/main/res/values-nl/strings.xml
+++ b/android/sdk/src/main/res/values-nl/strings.xml
@@ -35,4 +35,5 @@
     <string name="access_rules_author_only">Wordt online bewerkt</string>
     <string name="gb">GB</string>
     <string name="mb">MB</string>
+    <string name="today">Vandaag</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-pl/strings.xml b/android/sdk/src/main/res/values-pl/strings.xml
index 2b4fac4b8..1f922993a 100644
--- a/android/sdk/src/main/res/values-pl/strings.xml
+++ b/android/sdk/src/main/res/values-pl/strings.xml
@@ -35,4 +35,5 @@
     <string name="access_rules_author_only">Edytowane online</string>
     <string name="mb">MB</string>
     <string name="gb">GB</string>
+    <string name="today">Dzisiaj</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-pt-rBR/strings.xml b/android/sdk/src/main/res/values-pt-rBR/strings.xml
index 29dffc7fd..f1ba6ec63 100644
--- a/android/sdk/src/main/res/values-pt-rBR/strings.xml
+++ b/android/sdk/src/main/res/values-pt-rBR/strings.xml
@@ -35,4 +35,5 @@
     <string name="access_rules_author_only">Edição online</string>
     <string name="mb">MB</string>
     <string name="gb">GB</string>
+    <string name="today">Hoje</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-pt/strings.xml b/android/sdk/src/main/res/values-pt/strings.xml
index fe83d9824..fb33442c5 100644
--- a/android/sdk/src/main/res/values-pt/strings.xml
+++ b/android/sdk/src/main/res/values-pt/strings.xml
@@ -31,4 +31,5 @@
     <string name="gb">GB</string>
     <string name="maps_storage_shared">Armazenamento interno partilhado</string>
     <string name="maps_storage_removable">Cartão SD</string>
+    <string name="today">Hoje</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-ro/strings.xml b/android/sdk/src/main/res/values-ro/strings.xml
index 8870784d0..61e86a712 100644
--- a/android/sdk/src/main/res/values-ro/strings.xml
+++ b/android/sdk/src/main/res/values-ro/strings.xml
@@ -23,4 +23,5 @@
     <string name="limited_access">Acces privat</string>
     <string name="not_shared">Personal</string>
     <string name="access_rules_author_only">Modifică online</string>
+    <string name="today">Azi</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-ru/strings.xml b/android/sdk/src/main/res/values-ru/strings.xml
index cd20064d9..b2d44b730 100644
--- a/android/sdk/src/main/res/values-ru/strings.xml
+++ b/android/sdk/src/main/res/values-ru/strings.xml
@@ -36,4 +36,5 @@
     <string name="limited_access">Ограниченный доступ</string>
     <string name="not_shared">Личный</string>
     <string name="access_rules_author_only">Редактируется онлайн</string>
+    <string name="today">Сегодня</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-sk/strings.xml b/android/sdk/src/main/res/values-sk/strings.xml
index e3c5d3784..7bfe71f0d 100644
--- a/android/sdk/src/main/res/values-sk/strings.xml
+++ b/android/sdk/src/main/res/values-sk/strings.xml
@@ -33,4 +33,5 @@
     <string name="limited_access">Obmedzený prístup</string>
     <string name="not_shared">Súkromné</string>
     <string name="access_rules_author_only">Online úprava</string>
+    <string name="today">Dnes</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-sr/strings.xml b/android/sdk/src/main/res/values-sr/strings.xml
index a09c3e9a9..86eccf5ab 100644
--- a/android/sdk/src/main/res/values-sr/strings.xml
+++ b/android/sdk/src/main/res/values-sr/strings.xml
@@ -34,4 +34,5 @@
     <string name="gb">ГБ</string>
     <string name="mb">МБ</string>
     <string name="core_placepage_unknown_place">Тачка на мапи</string>
+    <string name="today">Данас</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-sv/strings.xml b/android/sdk/src/main/res/values-sv/strings.xml
index 15c863d21..aaef84b6f 100644
--- a/android/sdk/src/main/res/values-sv/strings.xml
+++ b/android/sdk/src/main/res/values-sv/strings.xml
@@ -30,4 +30,5 @@
     <string name="maps_storage_internal">Internt, privat lagringsutrymme</string>
     <string name="gb">GB</string>
     <string name="mb">MB</string>
+    <string name="today">Idag</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-th/strings.xml b/android/sdk/src/main/res/values-th/strings.xml
index d27ea69a2..516772b98 100644
--- a/android/sdk/src/main/res/values-th/strings.xml
+++ b/android/sdk/src/main/res/values-th/strings.xml
@@ -28,4 +28,5 @@
     <string name="not_shared">ส่วนตัว</string>
     <string name="access_rules_author_only">การแก้ไขทางออนไลน์</string>
     <string name="gb">GB</string>
+    <string name="today">วันนี้</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-tr/strings.xml b/android/sdk/src/main/res/values-tr/strings.xml
index b7c1dcc42..184079b2c 100644
--- a/android/sdk/src/main/res/values-tr/strings.xml
+++ b/android/sdk/src/main/res/values-tr/strings.xml
@@ -36,4 +36,5 @@
     <string name="not_shared">Gizli</string>
     <string name="access_rules_author_only">Çevrimiçi düzenleme</string>
     <string name="gb">GB</string>
+    <string name="today">Bugün</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-uk/strings.xml b/android/sdk/src/main/res/values-uk/strings.xml
index 33ea53430..ef9993029 100644
--- a/android/sdk/src/main/res/values-uk/strings.xml
+++ b/android/sdk/src/main/res/values-uk/strings.xml
@@ -36,4 +36,5 @@
     <string name="limited_access">Приватний доступ</string>
     <string name="not_shared">Особистий</string>
     <string name="access_rules_author_only">Редагується онлайн</string>
+    <string name="today">Сьогодні</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-vi/strings.xml b/android/sdk/src/main/res/values-vi/strings.xml
index e4aa269bd..4fc6d0bcf 100644
--- a/android/sdk/src/main/res/values-vi/strings.xml
+++ b/android/sdk/src/main/res/values-vi/strings.xml
@@ -27,4 +27,5 @@
     <string name="access_rules_author_only">Chỉnh sửa trực tuyến</string>
     <string name="gb">GB</string>
     <string name="mb">MB</string>
+    <string name="today">Hôm nay</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-zh-rTW/strings.xml b/android/sdk/src/main/res/values-zh-rTW/strings.xml
index 688a7a72f..59dd03b97 100644
--- a/android/sdk/src/main/res/values-zh-rTW/strings.xml
+++ b/android/sdk/src/main/res/values-zh-rTW/strings.xml
@@ -36,4 +36,5 @@
     <string name="limited_access">不允許進入的私人空間</string>
     <string name="not_shared">私人</string>
     <string name="access_rules_author_only">線上編輯</string>
+    <string name="today">今天</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-zh/strings.xml b/android/sdk/src/main/res/values-zh/strings.xml
index 278b32f73..216e6e599 100644
--- a/android/sdk/src/main/res/values-zh/strings.xml
+++ b/android/sdk/src/main/res/values-zh/strings.xml
@@ -36,4 +36,5 @@
     <string name="limited_access">不允许访问的私人空间</string>
     <string name="not_shared">私人</string>
     <string name="access_rules_author_only">在线编辑</string>
+    <string name="today">今天</string>
 </resources>
diff --git a/android/sdk/src/main/res/values/strings.xml b/android/sdk/src/main/res/values/strings.xml
index 0f0dd45ff..037ea6dc5 100644
--- a/android/sdk/src/main/res/values/strings.xml
+++ b/android/sdk/src/main/res/values/strings.xml
@@ -36,4 +36,13 @@
     <string name="limited_access">Limited access</string>
     <string name="not_shared">Private</string>
     <string name="access_rules_author_only">Online editing</string>
+    <string name="today">Today</string>
+    <string name="yesterday">Yesterday</string>
+    <string name="days_ago">%s days ago</string>
+    <string name="week_ago">%s week ago</string>
+    <string name="weeks_ago">%s weeks ago</string>
+    <string name="month_ago">%s month ago</string>
+    <string name="months_ago">%s months ago</string>
+    <string name="year_ago">%s year ago</string>
+    <string name="years_ago">%s years ago</string>
 </resources>
diff --git a/tools/unix/android_transfer_string.sh b/tools/unix/android_transfer_string.sh
new file mode 100755
index 000000000..ee1c9391b
--- /dev/null
+++ b/tools/unix/android_transfer_string.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+# Prompt for input
+read -p "From module: " from_module
+read -p "To module: " to_module
+read -p "String resource name: " string_name
+
+# Find all strings.xml files in the from module
+strings_files=$(find "$from_module/src/main/res" -type f -name "strings.xml")
+
+# Loop through each strings.xml file
+for from_file in $strings_files; do
+    # Extract the exact <string> line (preserves backslashes)
+    string_line=$(grep -oP "<string name=\"$string_name\">.*?</string>" "$from_file")
+
+    # Skip if string not found
+    if [[ -z "$string_line" ]]; then
+        continue
+    fi
+
+    # Determine the value folder path
+    relative_path="${from_file#$from_module/src/main/res/}"  # e.g., values-de/strings.xml
+    to_file="$to_module/src/main/res/$relative_path"
+
+    # Ensure the destination directory exists
+    to_dir=$(dirname "$to_file")
+    mkdir -p "$to_dir"
+
+    # Add or create the string in the destination file
+    if [[ -f "$to_file" ]]; then
+        # Add string if not already present
+        if ! grep -q "name=\"$string_name\"" "$to_file"; then
+            # Safely insert the raw string line
+            sed -i.bak "/<\/resources>/i \ \ \ \ $string_line" "$to_file"
+            echo "Added '$string_name' to $to_file"
+        else
+            echo "'$string_name' already exists in $to_file"
+        fi
+    else
+        # Create a new strings.xml
+        cat > "$to_file" <<EOF
+<resources>
+    $string_line
+</resources>
+EOF
+        echo "Created $to_file with '$string_name'"
+    fi
+
+    # Remove the string from the source file
+    sed -i.bak "/<string name=\"$string_name\">.*<\/string>/d" "$from_file"
+
+    # Cleanup backup files
+    rm -f "$from_file.bak" "$to_file.bak"
+done

From 31219ded290d9b93d9c0327c98f2419e95b80c49 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Tue, 26 Aug 2025 20:15:35 +0700
Subject: [PATCH 255/302] Revert "[android] Display overlay layer state with
 icon"

This reverts commit d44f0ae7da47e60bf56261c7ae070e6bc5a245c4.
---
 .../app/organicmaps/maplayer/LayersButton.java    |  2 +-
 .../src/main/res/color/accent_color_selector.xml  |  2 +-
 .../res/color/accent_color_selector_night.xml     |  2 +-
 android/app/src/main/res/drawable/ic_layers.xml   | 15 +++++----------
 .../src/main/res/drawable/ic_layers_default.xml   |  5 -----
 android/app/src/main/res/values/attrs.xml         |  2 +-
 6 files changed, 9 insertions(+), 19 deletions(-)
 delete mode 100644 android/app/src/main/res/drawable/ic_layers_default.xml

diff --git a/android/app/src/main/java/app/organicmaps/maplayer/LayersButton.java b/android/app/src/main/java/app/organicmaps/maplayer/LayersButton.java
index a3f31c88c..2530b3c84 100644
--- a/android/app/src/main/java/app/organicmaps/maplayer/LayersButton.java
+++ b/android/app/src/main/java/app/organicmaps/maplayer/LayersButton.java
@@ -29,7 +29,7 @@ public class LayersButton extends FloatingActionButton
   {
     final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);
     if (mAreLayersActive)
-      mergeDrawableStates(drawableState, new int[] {R.attr.state_layers_enabled});
+      mergeDrawableStates(drawableState, new int[] {R.attr.layers_enabled});
     return drawableState;
   }
 
diff --git a/android/app/src/main/res/color/accent_color_selector.xml b/android/app/src/main/res/color/accent_color_selector.xml
index d151c84fe..9ae6d9e14 100644
--- a/android/app/src/main/res/color/accent_color_selector.xml
+++ b/android/app/src/main/res/color/accent_color_selector.xml
@@ -9,7 +9,7 @@
       android:state_checked="true"/>
 
   <item android:color="@color/base_accent"
-      app:state_layers_enabled="true"/>
+      app:layers_enabled="true"/>
 
   <item android:color="@color/icon_tint"/>
 </selector>
diff --git a/android/app/src/main/res/color/accent_color_selector_night.xml b/android/app/src/main/res/color/accent_color_selector_night.xml
index 54c03571d..5ac5acec9 100644
--- a/android/app/src/main/res/color/accent_color_selector_night.xml
+++ b/android/app/src/main/res/color/accent_color_selector_night.xml
@@ -9,7 +9,7 @@
         android:state_checked="true"/>
 
   <item android:color="@color/base_accent_night"
-        app:state_layers_enabled="true"/>
+        app:layers_enabled="true"/>
 
   <item android:color="@color/white_secondary"/>
 </selector>
diff --git a/android/app/src/main/res/drawable/ic_layers.xml b/android/app/src/main/res/drawable/ic_layers.xml
index e23c8e3d3..90dd2540f 100644
--- a/android/app/src/main/res/drawable/ic_layers.xml
+++ b/android/app/src/main/res/drawable/ic_layers.xml
@@ -1,10 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        app:state_layers_enabled="true"
-        android:drawable="@drawable/ic_layers_clear"/>
-    <item
-        app:state_layers_enabled="false"
-        android:drawable="@drawable/ic_layers_default"/>
-</selector>
\ No newline at end of file
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M11.99,18.54l-7.37,-5.73L3,14.07l9,7 9,-7 -1.63,-1.27 -7.38,5.74zM12,16l7.36,-5.73L21,9l-9,-7 -9,7 1.63,1.27L12,16z"/>
+</vector>
diff --git a/android/app/src/main/res/drawable/ic_layers_default.xml b/android/app/src/main/res/drawable/ic_layers_default.xml
deleted file mode 100644
index 90dd2540f..000000000
--- a/android/app/src/main/res/drawable/ic_layers_default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M11.99,18.54l-7.37,-5.73L3,14.07l9,7 9,-7 -1.63,-1.27 -7.38,5.74zM12,16l7.36,-5.73L21,9l-9,-7 -9,7 1.63,1.27L12,16z"/>
-</vector>
diff --git a/android/app/src/main/res/values/attrs.xml b/android/app/src/main/res/values/attrs.xml
index e13d5392e..b69c40559 100644
--- a/android/app/src/main/res/values/attrs.xml
+++ b/android/app/src/main/res/values/attrs.xml
@@ -28,7 +28,7 @@
   </declare-styleable>
 
   <declare-styleable name="layersButton">
-    <attr name="state_layers_enabled" format="boolean"/>
+    <attr name="layers_enabled" format="boolean"/>
   </declare-styleable>
 
   <declare-styleable name="PlacePageView">

From 83d483eabba7cddd48935afb6b4bfd770bee5d7c Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Tue, 26 Aug 2025 17:15:36 +0700
Subject: [PATCH 256/302] [styles] Make power substations icons visible earlier

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 data/styles/default/include/Icons.mapcss                      | 4 ++--
 data/styles/default/include/priorities_1_BG-by-size.prio.txt  | 2 +-
 data/styles/default/include/priorities_4_overlays.prio.txt    | 4 ++--
 data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt | 2 +-
 data/styles/outdoors/include/priorities_4_overlays.prio.txt   | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index 58a2118c4..57be4e31d 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -841,7 +841,7 @@ node|z18-[amenity=brothel],
 node|z18-[amenity=stripclub],
 node|z18-[amenity=love_hotel],
 node|z18-[amenity=public_bookcase],
-node|z19-[power=substation],
+node|z18-[power=substation],
 node|z18-[man_made=survey_point],
 node|z18-[man_made=petroleum_well],
 node|z18-[man_made=flare],
@@ -1345,7 +1345,7 @@ node|z17-[amenity=waste_transfer_station],
 node|z17-[power=plant],
 /* Skip individual solar generators, because there are a lot of mapped panels */
 node|z17-[power=generator][generator:source!=solar],
-node|z19-[power=substation],
+node|z17-[power=substation],
 {icon-image: power-m.svg;font-size: 11;}
 
 
diff --git a/data/styles/default/include/priorities_1_BG-by-size.prio.txt b/data/styles/default/include/priorities_1_BG-by-size.prio.txt
index b16c5c5dd..c979f29d7 100644
--- a/data/styles/default/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/default/include/priorities_1_BG-by-size.prio.txt
@@ -184,7 +184,7 @@ power-plant-gas                                     # area z13- (also has icon z
 power-plant-hydro                                   # area z13- (also has icon z17-)
 power-plant-solar                                   # area z13- (also has icon z17-)
 power-plant-wind                                    # area z13- (also has icon z15-, caption(optional) z16-)
-power-substation                                    # area z13- (also has icon z19-, caption(optional) z19-)
+power-substation                                    # area z13- (also has icon z17-, caption(optional) z18-)
 === 50
 
 amenity-childcare                                   # area z13- (also has icon z17-, caption(optional) z17-)
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index aa7ee84b5..5e097785b 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -2236,7 +2236,7 @@ emergency-phone                                     # icon z17-
 
 amenity-waste_basket                                # icon z18- (also has caption(optional) z19-)
 emergency-fire_hydrant                              # icon z19- (also has caption(optional) z19-)
-power-substation                                    # icon z19- (also has caption(optional) z19-, area z13-)
+power-substation                                    # icon z17- (also has caption(optional) z18-, area z13-)
 === -9990
 
 # amenity-bench                                     # caption(optional) z19- (also has icon z18-)
@@ -2263,7 +2263,7 @@ entrance-exit                                       # icon z17- (also has captio
 # entrance-exit                                     # caption(optional) z19- (also has icon z17-)
 # man_made-cairn                                    # caption(optional) z19- (also has icon z19-)
 # man_made-survey_point                             # caption(optional) z18- (also has icon z18-)
-# power-substation                                  # caption(optional) z19- (also has icon z19-, area z13-)
+# power-substation                                  # caption(optional) z18- (also has icon z17-, area z13-)
 # tourism-information                               # caption(optional) z16- (also has icon z16-)
 # tourism-information-board                         # caption(optional) z16- (also has icon z16-)
 # tourism-information-guidepost                     # caption(optional) z16- (also has icon z16-)
diff --git a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
index 390e15000..a9f948e6f 100644
--- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
@@ -184,7 +184,7 @@ power-plant-gas                                     # area z13- (also has icon z
 power-plant-hydro                                   # area z13- (also has icon z17-)
 power-plant-solar                                   # area z13- (also has icon z17-)
 power-plant-wind                                    # area z13- (also has icon z13-, caption(optional) z16-)
-power-substation                                    # area z13- (also has icon z19-, caption(optional) z19-)
+power-substation                                    # area z13- (also has icon z17-, caption(optional) z18-)
 === 50
 
 amenity-childcare                                   # area z13- (also has icon z17-, caption(optional) z17-)
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 01fd40b15..ee43dcc7e 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -2241,7 +2241,7 @@ emergency-phone                                     # icon z17-
 
 amenity-waste_basket                                # icon z18- (also has caption(optional) z19-)
 emergency-fire_hydrant                              # icon z19- (also has caption(optional) z19-)
-power-substation                                    # icon z19- (also has caption(optional) z19-, area z13-)
+power-substation                                    # icon z17- (also has caption(optional) z18-, area z13-)
 === -9990
 
 # amenity-bench                                     # caption(optional) z19- (also has icon z18-)
@@ -2268,7 +2268,7 @@ entrance-exit                                       # icon z17- (also has captio
 # entrance-exit                                     # caption(optional) z19- (also has icon z17-)
 # man_made-cairn                                    # caption(optional) z17- (also has icon z17-)
 # man_made-survey_point                             # caption(optional) z15- (also has icon z14-)
-# power-substation                                  # caption(optional) z19- (also has icon z19-, area z13-)
+# power-substation                                  # caption(optional) z18- (also has icon z17-, area z13-)
 # tourism-information                               # caption(optional) z15- (also has icon z15-)
 # tourism-information-board                         # caption(optional) z15- (also has icon z15-)
 # tourism-information-guidepost                     # caption(optional) z15- (also has icon z15-)

From 405025879eca8930612c920aeb890025bd18504c Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Tue, 26 Aug 2025 17:29:33 +0700
Subject: [PATCH 257/302] [styles] Display labels earlier for most amenities
 which were z19-

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 data/styles/default/include/Icons.mapcss      |  6 ++++
 .../include/priorities_1_BG-by-size.prio.txt  |  4 +--
 .../include/priorities_4_overlays.prio.txt    | 32 +++++++++----------
 .../include/priorities_1_BG-by-size.prio.txt  |  4 +--
 .../include/priorities_4_overlays.prio.txt    | 32 +++++++++----------
 5 files changed, 42 insertions(+), 36 deletions(-)

diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index 57be4e31d..69c83f6e4 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -792,6 +792,9 @@ node|z17-[amenity=animal_shelter],
 node|z17-[amenity=kindergarten],
 node|z17-[amenity=childcare],
 node|z17-[amenity=school],
+node|z17-[amenity=driving_school],
+node|z17-[amenity=language_school],
+node|z17-[amenity=music_school],
 node|z17-[amenity=cinema],
 node|z17-[amenity=ice_cream],
 node|z17-[leisure=bowling_alley],
@@ -817,6 +820,7 @@ node|z17-[highway=ladder],
 node|z18-[amenity=dojo],
 node|z18-[amenity=vending_machine],
 node|z18-[amenity=fire_station],
+node|z18-[amenity=internet_cafe],
 node|z18-[emergency=defibrillator],
 node|z18-[emergency=assembly_point],
 node|z18-[emergency=lifeguard],
@@ -826,6 +830,8 @@ node|z18-[amenity=bureau_de_change],
 node|z18-[amenity=money_transfer],
 node|z18-[amenity=library],
 node|z18-[amenity=waste_disposal],
+node|z18-[amenity=recycling],
+node|z18-[amenity=waste_transfer_station],
 node|z18-[amenity=hunting_stand],
 node|z18-[shop=lottery],
 node|z18-[shop=hearing_aids],
diff --git a/data/styles/default/include/priorities_1_BG-by-size.prio.txt b/data/styles/default/include/priorities_1_BG-by-size.prio.txt
index c979f29d7..568b7423f 100644
--- a/data/styles/default/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/default/include/priorities_1_BG-by-size.prio.txt
@@ -59,7 +59,7 @@ amenity-fuel                                        # area z15- (also has icon z
 amenity-marketplace                                 # area z15- (also has icon z16-, caption(optional) z16-)
 amenity-police                                      # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-ranger_station                              # area z13- (also has icon z15-, caption(optional) z15-)
-amenity-recycling-centre                            # area z15- (also has icon z17-, caption(optional) z19-)
+amenity-recycling-centre                            # area z15- (also has icon z17-, caption(optional) z18-)
 amenity-social_facility                             # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-vehicle_inspection                          # area z15- (also has icon z16-, caption(optional) z16-)
 emergency-mountain_rescue                           # area z13- (also has icon z16-, caption(optional) z16-)
@@ -166,7 +166,7 @@ landuse-forest-deciduous                            # area z10- (also has icon z
 landuse-forest-mixed                                # area z10- (also has icon z13-, caption(optional) z14-)
 === 60
 
-amenity-waste_transfer_station                      # area z13- (also has icon z17-, caption(optional) z19-)
+amenity-waste_transfer_station                      # area z13- (also has icon z17-, caption(optional) z18-)
 landuse-construction                                # area z13- (also has caption z15-)
 landuse-industrial                                  # area z13- (also has caption z15-)
 landuse-industrial-mine                             # area z13- (also has icon z15-, caption(optional) z15-)
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index 5e097785b..ac66869ad 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -920,11 +920,11 @@ amenity-animal_shelter                              # icon z17- (also has captio
 amenity-car_wash                                    # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-childcare                                   # icon z17- (also has caption(optional) z17-, area z13-)
 amenity-doctors                                     # icon z17- (also has caption(optional) z17-, area z15-)
-amenity-driving_school                              # icon z17- (also has caption(optional) z19-)
-amenity-language_school                             # icon z17- (also has caption(optional) z19-)
+amenity-driving_school                              # icon z17- (also has caption(optional) z17-)
+amenity-language_school                             # icon z17- (also has caption(optional) z17-)
 amenity-money_transfer                              # icon z17- (also has caption(optional) z18-)
-amenity-music_school                                # icon z17- (also has caption(optional) z19-)
-amenity-recycling-centre                            # icon z17- (also has caption(optional) z19-, area z15-)
+amenity-music_school                                # icon z17- (also has caption(optional) z17-)
+amenity-recycling-centre                            # icon z17- (also has caption(optional) z18-, area z15-)
 amenity-veterinary                                  # icon z16- (also has caption(optional) z16-)
 craft-electrician                                   # icon z17- (also has caption(optional) z18-)
 craft-electronics_repair                            # icon z17- (also has caption(optional) z18-)
@@ -1077,7 +1077,7 @@ leisure-sports_hall                                 # icon z17- (also has captio
 amenity-compressed_air                              # icon z18- (also has caption(optional) z19-)
 amenity-parcel_locker                               # icon z17- (also has caption(optional) z17-)
 amenity-payment_terminal                            # icon z17- (also has caption(optional) z17-)
-amenity-recycling                                   # icon z17- (also has caption(optional) z19-)
+amenity-recycling                                   # icon z17- (also has caption(optional) z18-)
 amenity-vending_machine-fuel                        # icon z18- (also has caption(optional) z18-)
 amenity-vending_machine-parking_tickets             # icon z17- (also has caption(optional) z17-)
 amenity-vending_machine-public_transport_tickets    # icon z17- (also has caption(optional) z17-)
@@ -1098,7 +1098,7 @@ amenity-grave_yard-christian                        # icon z17- (also has captio
 amenity-nursing_home                                # icon z17- (also has caption(optional) z17-)
 amenity-prison                                      # icon z17- (also has caption(optional) z17-, area z12-)
 amenity-social_facility                             # icon z17- (also has caption(optional) z17-, area z15-)
-amenity-waste_transfer_station                      # icon z17- (also has caption(optional) z19-, area z13-)
+amenity-waste_transfer_station                      # icon z17- (also has caption(optional) z18-, area z13-)
 highway-ladder                                      # icon z17- and pathtext z17- (also has line z15-)
 historic-ruins                                      # icon z17- (also has caption(optional) z17-)
 landuse-farmland                                    # caption z15- (also has area z10-)
@@ -1129,7 +1129,7 @@ amenity-brothel                                     # icon z18- (also has captio
 amenity-casino                                      # icon z17- (also has caption(optional) z17-)
 amenity-fire_station                                # icon z18- (also has caption(optional) z18-, area z15-)
 amenity-gambling                                    # icon z17- (also has caption(optional) z17-)
-amenity-internet_cafe                               # icon z18- (also has caption(optional) z19-)
+amenity-internet_cafe                               # icon z18- (also has caption(optional) z18-)
 amenity-love_hotel                                  # icon z18- (also has caption(optional) z18-)
 amenity-police                                      # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-stripclub                                   # icon z18- (also has caption(optional) z18-)
@@ -1245,7 +1245,7 @@ historic-stone                                      # icon z18- (also has captio
 === 210
 
 amenity-post_box                                    # icon z18-
-amenity-recycling-container                         # icon z17- (also has caption(optional) z19-)
+amenity-recycling-container                         # icon z17- (also has caption(optional) z18-)
 historic-memorial-stolperstein                      # icon z19- (also has caption(optional) z19-)
 === 200
 
@@ -1882,11 +1882,11 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-car_wash                                  # caption(optional) z17- (also has icon z17-, area z15-)
 # amenity-childcare                                 # caption(optional) z17- (also has icon z17-, area z13-)
 # amenity-doctors                                   # caption(optional) z17- (also has icon z17-, area z15-)
-# amenity-driving_school                            # caption(optional) z19- (also has icon z17-)
-# amenity-language_school                           # caption(optional) z19- (also has icon z17-)
+# amenity-driving_school                            # caption(optional) z17- (also has icon z17-)
+# amenity-language_school                           # caption(optional) z17- (also has icon z17-)
 # amenity-money_transfer                            # caption(optional) z18- (also has icon z17-)
-# amenity-music_school                              # caption(optional) z19- (also has icon z17-)
-# amenity-recycling-centre                          # caption(optional) z19- (also has icon z17-, area z15-)
+# amenity-music_school                              # caption(optional) z17- (also has icon z17-)
+# amenity-recycling-centre                          # caption(optional) z18- (also has icon z17-, area z15-)
 # amenity-veterinary                                # caption(optional) z16- (also has icon z16-)
 # craft-electrician                                 # caption(optional) z18- (also has icon z17-)
 # craft-electronics_repair                          # caption(optional) z18- (also has icon z17-)
@@ -2035,7 +2035,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-compressed_air                            # caption(optional) z19- (also has icon z18-)
 # amenity-parcel_locker                             # caption(optional) z17- (also has icon z17-)
 # amenity-payment_terminal                          # caption(optional) z17- (also has icon z17-)
-# amenity-recycling                                 # caption(optional) z19- (also has icon z17-)
+# amenity-recycling                                 # caption(optional) z18- (also has icon z17-)
 # amenity-vending_machine-fuel                      # caption(optional) z18- (also has icon z18-)
 # amenity-vending_machine-parking_tickets           # caption(optional) z17- (also has icon z17-)
 # amenity-vending_machine-public_transport_tickets  # caption(optional) z17- (also has icon z17-)
@@ -2051,7 +2051,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-nursing_home                              # caption(optional) z17- (also has icon z17-)
 # amenity-prison                                    # caption(optional) z17- (also has icon z17-, area z12-)
 # amenity-social_facility                           # caption(optional) z17- (also has icon z17-, area z15-)
-# amenity-waste_transfer_station                    # caption(optional) z19- (also has icon z17-, area z13-)
+# amenity-waste_transfer_station                    # caption(optional) z18- (also has icon z17-, area z13-)
 # historic-ruins                                    # caption(optional) z17- (also has icon z17-)
 # leisure-ice_rink                                  # caption(optional) z17- (also has icon z17-)
 # leisure-pitch                                     # caption(optional) z17- (also has icon z17-, area z15-)
@@ -2069,7 +2069,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-casino                                    # caption(optional) z17- (also has icon z17-)
 # amenity-fire_station                              # caption(optional) z18- (also has icon z18-, area z15-)
 # amenity-gambling                                  # caption(optional) z17- (also has icon z17-)
-# amenity-internet_cafe                             # caption(optional) z19- (also has icon z18-)
+# amenity-internet_cafe                             # caption(optional) z18- (also has icon z18-)
 # amenity-love_hotel                                # caption(optional) z18- (also has icon z18-)
 # amenity-police                                    # caption(optional) z17- (also has icon z17-, area z15-)
 # amenity-stripclub                                 # caption(optional) z18- (also has icon z18-)
@@ -2169,7 +2169,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # historic-stone                                    # caption(optional) z18- (also has icon z18-)
 # === -9790
 
-# amenity-recycling-container                       # caption(optional) z19- (also has icon z17-)
+# amenity-recycling-container                       # caption(optional) z18- (also has icon z17-)
 # historic-memorial-stolperstein                    # caption(optional) z19- (also has icon z19-)
 # === -9800
 
diff --git a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
index a9f948e6f..9e4f0b4df 100644
--- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
@@ -59,7 +59,7 @@ amenity-fuel                                        # area z15- (also has icon z
 amenity-marketplace                                 # area z15- (also has icon z16-, caption(optional) z16-)
 amenity-police                                      # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-ranger_station                              # area z13- (also has icon z13-, caption(optional) z14-)
-amenity-recycling-centre                            # area z15- (also has icon z17-, caption(optional) z19-)
+amenity-recycling-centre                            # area z15- (also has icon z17-, caption(optional) z18-)
 amenity-social_facility                             # area z15- (also has icon z17-, caption(optional) z17-)
 amenity-vehicle_inspection                          # area z15- (also has icon z16-, caption(optional) z16-)
 emergency-mountain_rescue                           # area z13- (also has icon z12-, caption(optional) z12-)
@@ -166,7 +166,7 @@ landuse-forest-deciduous                            # area z10- (also has icon z
 landuse-forest-mixed                                # area z10- (also has icon z12-, caption(optional) z13-)
 === 60
 
-amenity-waste_transfer_station                      # area z13- (also has icon z17-, caption(optional) z19-)
+amenity-waste_transfer_station                      # area z13- (also has icon z17-, caption(optional) z18-)
 landuse-construction                                # area z13- (also has caption z15-)
 landuse-industrial                                  # area z13- (also has caption z15-)
 landuse-industrial-mine                             # area z13- (also has icon z15-, caption(optional) z15-)
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index ee43dcc7e..183f516d1 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -920,11 +920,11 @@ amenity-animal_shelter                              # icon z17- (also has captio
 amenity-car_wash                                    # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-childcare                                   # icon z17- (also has caption(optional) z17-, area z13-)
 amenity-doctors                                     # icon z17- (also has caption(optional) z17-, area z15-)
-amenity-driving_school                              # icon z17- (also has caption(optional) z19-)
-amenity-language_school                             # icon z17- (also has caption(optional) z19-)
+amenity-driving_school                              # icon z17- (also has caption(optional) z17-)
+amenity-language_school                             # icon z17- (also has caption(optional) z17-)
 amenity-money_transfer                              # icon z17- (also has caption(optional) z18-)
-amenity-music_school                                # icon z17- (also has caption(optional) z19-)
-amenity-recycling-centre                            # icon z17- (also has caption(optional) z19-, area z15-)
+amenity-music_school                                # icon z17- (also has caption(optional) z17-)
+amenity-recycling-centre                            # icon z17- (also has caption(optional) z18-, area z15-)
 amenity-veterinary                                  # icon z16- (also has caption(optional) z16-)
 craft-electrician                                   # icon z17- (also has caption(optional) z18-)
 craft-electronics_repair                            # icon z17- (also has caption(optional) z18-)
@@ -1077,7 +1077,7 @@ leisure-sports_hall                                 # icon z17- (also has captio
 amenity-compressed_air                              # icon z18- (also has caption(optional) z19-)
 amenity-parcel_locker                               # icon z17- (also has caption(optional) z17-)
 amenity-payment_terminal                            # icon z17- (also has caption(optional) z17-)
-amenity-recycling                                   # icon z17- (also has caption(optional) z19-)
+amenity-recycling                                   # icon z17- (also has caption(optional) z18-)
 amenity-vending_machine-fuel                        # icon z18- (also has caption(optional) z18-)
 amenity-vending_machine-parking_tickets             # icon z17- (also has caption(optional) z17-)
 amenity-vending_machine-public_transport_tickets    # icon z17- (also has caption(optional) z17-)
@@ -1099,7 +1099,7 @@ amenity-grave_yard-christian                        # icon z17- (also has captio
 amenity-nursing_home                                # icon z17- (also has caption(optional) z17-)
 amenity-prison                                      # icon z17- (also has caption(optional) z17-, area z12-)
 amenity-social_facility                             # icon z17- (also has caption(optional) z17-, area z15-)
-amenity-waste_transfer_station                      # icon z17- (also has caption(optional) z19-, area z13-)
+amenity-waste_transfer_station                      # icon z17- (also has caption(optional) z18-, area z13-)
 highway-ladder                                      # icon z16- and pathtext z17- (also has line z12-)
 historic-ruins                                      # icon z17- (also has caption(optional) z17-)
 landuse-farmland                                    # caption z15- (also has area z10-)
@@ -1130,7 +1130,7 @@ amenity-brothel                                     # icon z18- (also has captio
 amenity-casino                                      # icon z17- (also has caption(optional) z17-)
 amenity-fire_station                                # icon z18- (also has caption(optional) z18-, area z15-)
 amenity-gambling                                    # icon z17- (also has caption(optional) z17-)
-amenity-internet_cafe                               # icon z18- (also has caption(optional) z19-)
+amenity-internet_cafe                               # icon z18- (also has caption(optional) z18-)
 amenity-love_hotel                                  # icon z18- (also has caption(optional) z18-)
 amenity-police                                      # icon z17- (also has caption(optional) z17-, area z15-)
 amenity-stripclub                                   # icon z18- (also has caption(optional) z18-)
@@ -1248,7 +1248,7 @@ historic-stone                                      # icon z18- (also has captio
 === 210
 
 amenity-post_box                                    # icon z18-
-amenity-recycling-container                         # icon z17- (also has caption(optional) z19-)
+amenity-recycling-container                         # icon z17- (also has caption(optional) z18-)
 historic-memorial-stolperstein                      # icon z19- (also has caption(optional) z19-)
 === 200
 
@@ -1885,11 +1885,11 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-car_wash                                  # caption(optional) z17- (also has icon z17-, area z15-)
 # amenity-childcare                                 # caption(optional) z17- (also has icon z17-, area z13-)
 # amenity-doctors                                   # caption(optional) z17- (also has icon z17-, area z15-)
-# amenity-driving_school                            # caption(optional) z19- (also has icon z17-)
-# amenity-language_school                           # caption(optional) z19- (also has icon z17-)
+# amenity-driving_school                            # caption(optional) z17- (also has icon z17-)
+# amenity-language_school                           # caption(optional) z17- (also has icon z17-)
 # amenity-money_transfer                            # caption(optional) z18- (also has icon z17-)
-# amenity-music_school                              # caption(optional) z19- (also has icon z17-)
-# amenity-recycling-centre                          # caption(optional) z19- (also has icon z17-, area z15-)
+# amenity-music_school                              # caption(optional) z17- (also has icon z17-)
+# amenity-recycling-centre                          # caption(optional) z18- (also has icon z17-, area z15-)
 # amenity-veterinary                                # caption(optional) z16- (also has icon z16-)
 # craft-electrician                                 # caption(optional) z18- (also has icon z17-)
 # craft-electronics_repair                          # caption(optional) z18- (also has icon z17-)
@@ -2038,7 +2038,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-compressed_air                            # caption(optional) z19- (also has icon z18-)
 # amenity-parcel_locker                             # caption(optional) z17- (also has icon z17-)
 # amenity-payment_terminal                          # caption(optional) z17- (also has icon z17-)
-# amenity-recycling                                 # caption(optional) z19- (also has icon z17-)
+# amenity-recycling                                 # caption(optional) z18- (also has icon z17-)
 # amenity-vending_machine-fuel                      # caption(optional) z18- (also has icon z18-)
 # amenity-vending_machine-parking_tickets           # caption(optional) z17- (also has icon z17-)
 # amenity-vending_machine-public_transport_tickets  # caption(optional) z17- (also has icon z17-)
@@ -2054,7 +2054,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-nursing_home                              # caption(optional) z17- (also has icon z17-)
 # amenity-prison                                    # caption(optional) z17- (also has icon z17-, area z12-)
 # amenity-social_facility                           # caption(optional) z17- (also has icon z17-, area z15-)
-# amenity-waste_transfer_station                    # caption(optional) z19- (also has icon z17-, area z13-)
+# amenity-waste_transfer_station                    # caption(optional) z18- (also has icon z17-, area z13-)
 # historic-ruins                                    # caption(optional) z17- (also has icon z17-)
 # leisure-ice_rink                                  # caption(optional) z17- (also has icon z17-)
 # leisure-pitch                                     # caption(optional) z17- (also has icon z17-, area z15-)
@@ -2073,7 +2073,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-casino                                    # caption(optional) z17- (also has icon z17-)
 # amenity-fire_station                              # caption(optional) z18- (also has icon z18-, area z15-)
 # amenity-gambling                                  # caption(optional) z17- (also has icon z17-)
-# amenity-internet_cafe                             # caption(optional) z19- (also has icon z18-)
+# amenity-internet_cafe                             # caption(optional) z18- (also has icon z18-)
 # amenity-love_hotel                                # caption(optional) z18- (also has icon z18-)
 # amenity-police                                    # caption(optional) z17- (also has icon z17-, area z15-)
 # amenity-stripclub                                 # caption(optional) z18- (also has icon z18-)
@@ -2174,7 +2174,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # historic-stone                                    # caption(optional) z18- (also has icon z18-)
 # === -9790
 
-# amenity-recycling-container                       # caption(optional) z19- (also has icon z17-)
+# amenity-recycling-container                       # caption(optional) z18- (also has icon z17-)
 # historic-memorial-stolperstein                    # caption(optional) z19- (also has icon z19-)
 # === -9800
 

From dd2458d1b1da6f00b5ac0b7e205e9508e8ef906b Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Tue, 26 Aug 2025 18:03:28 +0700
Subject: [PATCH 258/302] [styles][outdoor] Make waterways bolder

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 data/styles/outdoors/include/Basemap.mapcss | 88 +++++++++++++++++++--
 1 file changed, 81 insertions(+), 7 deletions(-)

diff --git a/data/styles/outdoors/include/Basemap.mapcss b/data/styles/outdoors/include/Basemap.mapcss
index 61c53ce8a..3cf53e82f 100644
--- a/data/styles/outdoors/include/Basemap.mapcss
+++ b/data/styles/outdoors/include/Basemap.mapcss
@@ -11,10 +11,6 @@ line|z12-[waterway=stream],
 line|z13-[waterway=fish_pass],
 {opacity: 1; color: @water;}
 
-line|z15-[waterway=ditch],
-line|z15-[waterway=drain],
-{opacity: 1; color: @water_bad;}
-
 /* 6.2 Line water(river,canal etc.) */
 
 line|z10-[waterway=river],
@@ -23,20 +19,98 @@ line|z12-[waterway=stream],
 line|z12-[waterway=canal],
 {text-color: @water_label; text-halo-opacity: 0.5; text-halo-radius: 1; text-halo-color: @label_halo_light;}
 
-line|z11-12[natural=strait],
-{width: 2.1;}
 
+line|z10[waterway=river],
+{width: 2.0;}
+
+line|z11-12[waterway=river],
+line|z11-12[natural=strait],
+{width: 2.7;}
 line|z12[waterway=stream],
 line|z12[waterway=canal],
-{width: 1.5;}
+{width: 1.9;}
 line|z11-12[waterway=stream][intermittent],
 {width: 0; text: none;}
 
+line|z13[waterway=river],
+line|z13[natural=strait],
+{width: 3.6;}
+line|z13[waterway=stream],
+line|z13[waterway=canal],
+line|z13[waterway=fish_pass],
+{width: 2.2;}
+line|z13[waterway=stream][intermittent=yes]
+{dashes: 6,2;}
+
+line|z14[waterway=river],
+line|z14[natural=strait],
+{width: 4.7;}
+line|z14[waterway=stream],
+line|z14[waterway=canal],
+line|z14[waterway=fish_pass],
+{width: 2.6;}
+line|z14[waterway=stream][intermittent=yes]
+{dashes: 9,3;}
+
+line|z15[waterway=river],
+line|z15[natural=strait],
+{width: 5.8;}
+line|z15[waterway=stream],
+line|z15[waterway=canal],
+line|z15[waterway=fish_pass],
+{width: 3.1;}
+line|z15[waterway=stream][intermittent=yes]
+{dashes: 12,4;}
+
+line|z16[waterway=river],
+line|z16[natural=strait],
+{width: 7.0;}
+line|z16[waterway=stream],
+line|z16[waterway=canal],
+line|z16[waterway=fish_pass],
+{width: 3.7;}
+line|z16[waterway=stream][intermittent=yes]
+{dashes: 14,5;}
+
+line|z17[waterway=river],
+line|z17[natural=strait],
+{width: 8.4;}
+line|z17[waterway=stream],
+line|z17[waterway=canal],
+line|z17[waterway=fish_pass],
+{width: 4.5;}
+line|z17-[waterway=stream][intermittent=yes]
+{dashes: 18,6;}
+
+line|z18-[waterway=river],
+line|z18-[natural=strait],
+{width: 9.8}
+line|z18-[waterway=stream],
+line|z18-[waterway=canal],
+line|z18-[waterway=fish_pass],
+{width: 5.2;}
+
+
+line|z13-[waterway=ditch],
+line|z13-[waterway=drain],
+{opacity: 1; color: @water_bad; width: 1.9; dashes: 2.5,2;}
+line|z14[waterway=ditch],
+line|z14[waterway=drain],
+{width: 2.3; dashes: 4.5,3;}
+line|z15[waterway=ditch],
+line|z15[waterway=drain],
+{width: 2.7; dashes: 6,4;}
+line|z16-[waterway=ditch],
+line|z16-[waterway=drain],
+{width: 3.2; dashes: 8,5.5;}
+
+
 /* Do not draw tunnel waterways */
 line[waterway][tunnel]
 {width: 0;}
 
 
+
 line|z13-[man_made=cutline],
 {width: 1.7; color: @grass;}
 line|z14[man_made=cutline],

From bd97cb4ceb5796ea046b7bdc82d8f01b3b9c1031 Mon Sep 17 00:00:00 2001
From: Alexander Borsuk <me@alex.bio>
Date: Fri, 15 Aug 2025 20:38:14 +0300
Subject: [PATCH 259/302] Do not autozoom to show the full route when adding
 stops

This should simplify route planning and avoid unnecessary zoom in back and back again

Signed-off-by: Alexander Borsuk <me@alex.bio>
---
 libs/map/routing_manager.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/map/routing_manager.cpp b/libs/map/routing_manager.cpp
index b40e65f53..65c2753e0 100644
--- a/libs/map/routing_manager.cpp
+++ b/libs/map/routing_manager.cpp
@@ -408,7 +408,8 @@ void RoutingManager::OnBuildRouteReady(Route const & route, RouterResultCode cod
 
   // Validate route (in case of bicycle routing it can be invalid).
   ASSERT(route.IsValid(), ());
-  if (route.IsValid() && m_currentRouterType != routing::RouterType::Ruler)
+  // Do not show the full route if one or more stops were added, for easier multi-stop trip planning.
+  if (route.IsValid() && route.GetSubrouteCount() < 2 && m_currentRouterType != routing::RouterType::Ruler)
   {
     m2::RectD routeRect = route.GetPoly().GetLimitRect();
     routeRect.Scale(kRouteScaleMultiplier);

From 9fd80ecf88a32f7014f403418911846d5976a50f Mon Sep 17 00:00:00 2001
From: Andrei Shkrob <github@shkrob.dev>
Date: Sat, 23 Aug 2025 22:19:10 +0200
Subject: [PATCH 260/302] [android-auto] Fix theme issues

Signed-off-by: Andrei Shkrob <github@shkrob.dev>
---
 .../java/app/organicmaps/car/screens/NavigationScreen.java     | 3 +--
 android/app/src/main/java/app/organicmaps/car/util/Colors.java | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/car/screens/NavigationScreen.java b/android/app/src/main/java/app/organicmaps/car/screens/NavigationScreen.java
index c9fae2b53..968b2d86f 100644
--- a/android/app/src/main/java/app/organicmaps/car/screens/NavigationScreen.java
+++ b/android/app/src/main/java/app/organicmaps/car/screens/NavigationScreen.java
@@ -73,8 +73,7 @@ public class NavigationScreen extends BaseMapScreen implements RoutingController
   public Template onGetTemplate()
   {
     final NavigationTemplate.Builder builder = new NavigationTemplate.Builder();
-    builder.setBackgroundColor(ThemeUtils.isNightMode(getCarContext()) ? Colors.NAVIGATION_TEMPLATE_BACKGROUND_NIGHT
-                                                                       : Colors.NAVIGATION_TEMPLATE_BACKGROUND_DAY);
+    builder.setBackgroundColor(Colors.NAVIGATION_TEMPLATE_BACKGROUND);
     builder.setActionStrip(createActionStrip());
     builder.setMapActionStrip(UiHelpers.createMapActionStrip(getCarContext(), getSurfaceRenderer()));
 
diff --git a/android/app/src/main/java/app/organicmaps/car/util/Colors.java b/android/app/src/main/java/app/organicmaps/car/util/Colors.java
index b4b9deca9..50d98cfd4 100644
--- a/android/app/src/main/java/app/organicmaps/car/util/Colors.java
+++ b/android/app/src/main/java/app/organicmaps/car/util/Colors.java
@@ -11,8 +11,7 @@ public final class Colors
   public static final CarColor OPENING_HOURS_CLOSES_SOON = CarColor.YELLOW;
   public static final CarColor OPENING_HOURS_CLOSED = CarColor.RED;
   public static final CarColor START_NAVIGATION = CarColor.GREEN;
-  public static final CarColor NAVIGATION_TEMPLATE_BACKGROUND_DAY = CarColor.GREEN;
-  public static final CarColor NAVIGATION_TEMPLATE_BACKGROUND_NIGHT = CarColor.DEFAULT;
+  public static final CarColor NAVIGATION_TEMPLATE_BACKGROUND = CarColor.GREEN;
   public static final CarColor BUTTON_ACCEPT = CarColor.GREEN;
 
   private Colors() {}

From 20208cf89255802acdfe80ed671b4c044cbf7aad Mon Sep 17 00:00:00 2001
From: eisa01 <eisa01@gmail.com>
Date: Sun, 24 Aug 2025 19:24:58 +0200
Subject: [PATCH 261/302] [generator] Add branch key to map generator

Signed-off-by: eisa01 <eisa01@gmail.com>
---
 generator/osm2meta.cpp              | 6 ++++++
 generator/osm2meta.hpp              | 1 +
 libs/indexer/feature_meta.cpp       | 3 +++
 libs/indexer/feature_meta.hpp       | 1 +
 tools/feature_list/feature_list.cpp | 3 +++
 5 files changed, 14 insertions(+)

diff --git a/generator/osm2meta.cpp b/generator/osm2meta.cpp
index e225cbe90..ed2023e51 100644
--- a/generator/osm2meta.cpp
+++ b/generator/osm2meta.cpp
@@ -136,6 +136,11 @@ std::string MetadataTagProcessorImpl::ValidateAndFormat_url(std::string const &
   return v;
 }
 
+std::string MetadataTagProcessorImpl::ValidateAndFormat_text(std::string const & v)
+{
+  return v;
+}
+
 std::string MetadataTagProcessorImpl::ValidateAndFormat_phone(std::string const & v)
 {
   return v;
@@ -617,6 +622,7 @@ void MetadataTagProcessor::operator()(std::string const & k, std::string const &
       return;
     valid = ValidateAndFormat_brand(v);
     break;
+  case Metadata::FMD_BRANCH: valid = ValidateAndFormat_text(v); break;
   case Metadata::FMD_DURATION: valid = ValidateAndFormat_duration(v); break;
   case Metadata::FMD_CAPACITY: valid = ValidateAndFormat_capacity(v); break;
   case Metadata::FMD_LOCAL_REF: valid = ValidateAndFormat_local_ref(v); break;
diff --git a/generator/osm2meta.hpp b/generator/osm2meta.hpp
index 6c29019cb..f543c5cde 100644
--- a/generator/osm2meta.hpp
+++ b/generator/osm2meta.hpp
@@ -12,6 +12,7 @@ struct MetadataTagProcessorImpl
   std::string ValidateAndFormat_maxspeed(std::string const & v) const;
   static std::string ValidateAndFormat_stars(std::string const & v);
   std::string ValidateAndFormat_operator(std::string const & v) const;
+  static std::string ValidateAndFormat_text(std::string const & v);
   static std::string ValidateAndFormat_url(std::string const & v);
   static std::string ValidateAndFormat_phone(std::string const & v);
   static std::string ValidateAndFormat_opening_hours(std::string const & v);
diff --git a/libs/indexer/feature_meta.cpp b/libs/indexer/feature_meta.cpp
index ca3476a85..31a3b35ff 100644
--- a/libs/indexer/feature_meta.cpp
+++ b/libs/indexer/feature_meta.cpp
@@ -176,6 +176,8 @@ bool Metadata::TypeFromString(string_view k, Metadata::EType & outType)
     outType = Metadata::FMD_AIRPORT_IATA;
   else if (k.starts_with("brand"))
     outType = Metadata::FMD_BRAND;
+  else if (k == "branch")
+    outType = Metadata::FMD_BRANCH;
   else if (k == "duration")
     outType = Metadata::FMD_DURATION;
   else if (k == "capacity")
@@ -290,6 +292,7 @@ string ToString(Metadata::EType type)
   case Metadata::FMD_LEVEL: return "level";
   case Metadata::FMD_AIRPORT_IATA: return "iata";
   case Metadata::FMD_BRAND: return "brand";
+  case Metadata::FMD_BRANCH: return "branch";
   case Metadata::FMD_DURATION: return "duration";
   case Metadata::FMD_CONTACT_FACEBOOK: return "contact:facebook";
   case Metadata::FMD_CONTACT_INSTAGRAM: return "contact:instagram";
diff --git a/libs/indexer/feature_meta.hpp b/libs/indexer/feature_meta.hpp
index b286c4de9..652e7e947 100644
--- a/libs/indexer/feature_meta.hpp
+++ b/libs/indexer/feature_meta.hpp
@@ -123,6 +123,7 @@ public:
     FMD_PANORAMAX = 52,
     FMD_CHECK_DATE = 53,
     FMD_CHECK_DATE_OPEN_HOURS = 54,
+    FMD_BRANCH = 55,
     FMD_COUNT
   };
 
diff --git a/tools/feature_list/feature_list.cpp b/tools/feature_list/feature_list.cpp
index 079888876..cfd1588f4 100644
--- a/tools/feature_list/feature_list.cpp
+++ b/tools/feature_list/feature_list.cpp
@@ -257,6 +257,7 @@ public:
     string const contact_fediverse(meta.Get(feature::Metadata::FMD_CONTACT_FEDIVERSE));
     string const contact_bluesky(meta.Get(feature::Metadata::FMD_CONTACT_BLUESKY));
     string const stars(meta.Get(feature::Metadata::FMD_STARS));
+    string const branch(meta.Get(feature::Metadata::FMD_BRANCH));
     string const internet(meta.Get(feature::Metadata::FMD_INTERNET));
     string const denomination(meta.Get(feature::Metadata::FMD_DENOMINATION));
     string const wheelchair(GetWheelchairType(f));
@@ -284,6 +285,7 @@ public:
                               website,
                               stars,
                               std::string(metaOperator),
+                              branch,
                               internet,
                               denomination,
                               wheelchair,
@@ -326,6 +328,7 @@ void PrintHeader()
                             "cuisines",
                             "stars",
                             "operator",
+                            "branch",
                             "internet",
                             "denomination",
                             "wheelchair",

From 7be3164db7832792e0a1e76070ed5df29f46aec9 Mon Sep 17 00:00:00 2001
From: Codeberg Translate <translate@codeberg.org>
Date: Wed, 27 Aug 2025 08:12:02 +0000
Subject: [PATCH 262/302] [strings] Update from Codeberg Translate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: B o d o <timtrek@noreply.codeberg.org>
Co-authored-by: Codeberg Translate <translate@codeberg.org>
Co-authored-by: Frz <frz@noreply.codeberg.org>
Co-authored-by: Mickael81 <mickael81@noreply.codeberg.org>
Co-authored-by: N4ta <codeberg@n4ta.anonaddy.me>
Co-authored-by: Outbreak2096 <outbreak2096@noreply.codeberg.org>
Co-authored-by: Priit Jõerüüt <jrtcdbrg@noreply.codeberg.org>
Co-authored-by: Stephan-P <stephan-p@noreply.codeberg.org>
Co-authored-by: Weblate <noreply-mt-weblate@weblate.org>
Co-authored-by: Weblate Translation Memory <noreply-mt-weblate-translation-memory@weblate.org>
Co-authored-by: ZeljkoBG <zeljkobg@noreply.codeberg.org>
Co-authored-by: and4po <and4po@noreply.codeberg.org>
Co-authored-by: ghose <ghose@noreply.codeberg.org>
Co-authored-by: hectodium <hectodium@noreply.codeberg.org>
Co-authored-by: ikanakova <ikanakova@noreply.codeberg.org>
Co-authored-by: ldmpub <ldmpub@noreply.codeberg.org>
Co-authored-by: matheusgomesms <matheusgomesms@noreply.codeberg.org>
Co-authored-by: patepelo <patepelo@noreply.codeberg.org>
Co-authored-by: stefanlinden <stefanlinden@noreply.codeberg.org>
Co-authored-by: sziatomi <sziatomi@noreply.codeberg.org>
Co-authored-by: xerini <xerini@noreply.codeberg.org>
Translate-URL: https://translate.codeberg.org/projects/comaps/android/
Translate-URL: https://translate.codeberg.org/projects/comaps/appstore-description/
Translate-URL: https://translate.codeberg.org/projects/comaps/tts/
Translation: CoMaps/Android - Map Feature Types
Translation: CoMaps/Android UI Strings
Translation: CoMaps/Android UI Strings (SDK)
Translation: CoMaps/Apple AppStore description
Translation: CoMaps/Countries and regions names
Translation: CoMaps/F-Droid app description
Translation: CoMaps/Voice announcements for navigation (TTS)
Translation: CoMaps/iOS - Map Feature Types
Translation: CoMaps/iOS Plist
Translation: CoMaps/iOS UI Strings
---
 .../src/fdroid/play/listings/nl-NL/title.txt  |  2 +-
 .../app/src/main/res/values-cs/strings.xml    |  2 +
 .../app/src/main/res/values-de/strings.xml    |  2 +
 .../app/src/main/res/values-es/strings.xml    |  6 +-
 .../app/src/main/res/values-et/strings.xml    |  2 +
 .../app/src/main/res/values-fr/strings.xml    | 66 +++++++------
 .../app/src/main/res/values-gl/strings.xml    |  6 +-
 .../app/src/main/res/values-hu/strings.xml    | 47 ++++-----
 .../app/src/main/res/values-nl/strings.xml    |  4 +-
 .../src/main/res/values-pt-rBR/strings.xml    |  4 +-
 .../app/src/main/res/values-pt/strings.xml    |  2 +
 .../app/src/main/res/values-zh/strings.xml    |  6 +-
 .../sdk/src/main/res/values-ca/strings.xml    | 10 +-
 .../sdk/src/main/res/values-de/strings.xml    |  8 ++
 .../src/main/res/values-de/types_strings.xml  |  8 +-
 .../sdk/src/main/res/values-es/strings.xml    |  8 ++
 .../src/main/res/values-es/types_strings.xml  |  3 +-
 .../sdk/src/main/res/values-et/strings.xml    |  8 ++
 .../src/main/res/values-et/types_strings.xml  |  6 +-
 .../src/main/res/values-fr/types_strings.xml  |  4 +-
 .../sdk/src/main/res/values-gl/strings.xml    |  8 ++
 .../src/main/res/values-hu/types_strings.xml  |  6 +-
 .../sdk/src/main/res/values-nl/strings.xml    | 10 +-
 .../src/main/res/values-pt/types_strings.xml  |  2 +-
 .../src/main/res/values-sr/types_strings.xml  |  2 +
 .../sdk/src/main/res/values-zh/strings.xml    | 10 +-
 .../src/main/res/values-zh/types_strings.xml  |  2 +
 data/countries-strings/es.json/localize.json  |  2 +-
 data/countries-strings/hu.json/localize.json  | 96 +++++++++----------
 data/countries-strings/nl.json/localize.json  |  6 +-
 data/sound-strings/nl.json/localize.json      |  8 +-
 .../de.lproj/LocalizableTypes.strings         |  8 +-
 .../es.lproj/Localizable.strings              |  4 +-
 .../es.lproj/LocalizableTypes.strings         |  4 +-
 .../et.lproj/LocalizableTypes.strings         |  6 +-
 .../fr.lproj/Localizable.strings              | 28 +++---
 .../fr.lproj/LocalizableTypes.strings         |  6 +-
 .../hu.lproj/InfoPlist.strings                |  4 +-
 .../hu.lproj/Localizable.strings              | 18 ++--
 .../hu.lproj/LocalizableTypes.strings         |  6 +-
 .../pt-BR.lproj/Localizable.strings           |  6 +-
 .../pt.lproj/Localizable.strings              |  4 +-
 .../pt.lproj/LocalizableTypes.strings         |  2 +-
 .../sr.lproj/Localizable.strings              |  4 +-
 .../sr.lproj/LocalizableTypes.strings         |  4 +-
 .../zh-Hans.lproj/Localizable.strings         | 12 +--
 .../zh-Hans.lproj/LocalizableTypes.strings    |  4 +-
 47 files changed, 284 insertions(+), 192 deletions(-)

diff --git a/android/app/src/fdroid/play/listings/nl-NL/title.txt b/android/app/src/fdroid/play/listings/nl-NL/title.txt
index 43c1a8662..ca1d19158 100644
--- a/android/app/src/fdroid/play/listings/nl-NL/title.txt
+++ b/android/app/src/fdroid/play/listings/nl-NL/title.txt
@@ -1 +1 @@
-CoMaps - Wandel, fiets, rijdt offline met privacy
+CoMaps - Wandel, fiets, rijd offline met privacy
diff --git a/android/app/src/main/res/values-cs/strings.xml b/android/app/src/main/res/values-cs/strings.xml
index c4fb65397..9bae38aef 100644
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -882,4 +882,6 @@
     <string name="osm_note_hint">Případně můžete zanechat poznámku komunitě OpenStreetMap, aby zde někdo jiný mohl místo přidat nebo opravit.</string>
     <string name="share_track">Sdílet stopu</string>
     <string name="delete_track_dialog_title">Odstranit %s?</string>
+    <string name="hours_confirmed_time_ago">Potvrzeno %s</string>
+    <string name="existence_confirmed_time_ago">Existence potvrzena %s</string>
 </resources>
diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
index 417a875e0..a6a6c5f44 100644
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -887,4 +887,6 @@
     <string name="osm_note_toast">Ein Hinweis wird zu OpenStreetMap geschickt</string>
     <string name="share_track">Strecke teilen</string>
     <string name="delete_track_dialog_title">%s löschen?</string>
+    <string name="existence_confirmed_time_ago">Existenz bestätigt %s</string>
+    <string name="hours_confirmed_time_ago">Bestätigt %s</string>
 </resources>
diff --git a/android/app/src/main/res/values-es/strings.xml b/android/app/src/main/res/values-es/strings.xml
index ca71e7439..f91e2c6c7 100644
--- a/android/app/src/main/res/values-es/strings.xml
+++ b/android/app/src/main/res/values-es/strings.xml
@@ -413,7 +413,7 @@
     <string name="editor_report_problem_duplicate_place_title">Lugar duplicado</string>
     <string name="autodownload">Descarga automática</string>
     <!-- Place Page opening hours text -->
-    <string name="daily">Diario</string>
+    <string name="daily">Diariamente</string>
     <string name="twentyfour_seven">24/7</string>
     <string name="day_off_today">Cerrado hoy</string>
     <string name="day_off">Cerrado</string>
@@ -539,7 +539,7 @@
     <!-- For the first routing -->
     <string name="accept">Aceptar</string>
     <!-- For the first routing -->
-    <string name="decline">Declinar</string>
+    <string name="decline">Rechazar</string>
     <string name="mobile_data_dialog">¿Usar Internet móvil para mostrar información detallada?</string>
     <string name="mobile_data_option_always">Usar siempre</string>
     <string name="mobile_data_option_today">Sólo hoy</string>
@@ -890,4 +890,6 @@
     <string name="at">a las %s</string>
     <string name="osm_note_hint">O, como alternativa, deja una nota a la comunidad de OpenStreetMap para que alguien lo agregue o arregle.</string>
     <string name="osm_note_toast">Una nota será enviada a OpenStreetMap</string>
+    <string name="delete_track_dialog_title">Eliminar %s?</string>
+    <string name="existence_confirmed_time_ago">Existencia confirmada %s</string>
 </resources>
diff --git a/android/app/src/main/res/values-et/strings.xml b/android/app/src/main/res/values-et/strings.xml
index 08992cfb6..25ae41abd 100644
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -882,4 +882,6 @@
     <string name="osm_note_hint">Või alternatiivina jäta märge OpenStreetMapi kogukonnale ja keegi teine saab selle koha andmed parandada või uue lisada.</string>
     <string name="share_track">Jaga rada</string>
     <string name="delete_track_dialog_title">Kas kustutame: %s?</string>
+    <string name="existence_confirmed_time_ago">Olemasolu on kontrollitud %s</string>
+    <string name="hours_confirmed_time_ago">Kontrollitud %s</string>
 </resources>
diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml
index 6c25774a4..c6435077c 100644
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -101,7 +101,7 @@
     <string name="measurement_units_summary">Choisir entre miles et kilomètres</string>
     <!-- SECTION: Search categories -->
     <!-- Search category for cafes, bars, restaurants; any changes should be duplicated in categories.txt @category_eat! -->
-    <string name="category_eat">Un endroit pour manger</string>
+    <string name="category_eat">Où manger</string>
     <!-- Search category for grocery stores; any changes should be duplicated in categories.txt @category_food! -->
     <string name="category_food">Épiceries</string>
     <!-- Search category for public transport; any changes should be duplicated in categories.txt @category_transport! -->
@@ -165,13 +165,13 @@
     <!-- Warning message when doing search around current position -->
     <string name="unknown_current_position">Votre position n\'a pas encore été déterminée</string>
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
-    <string name="cant_change_this_setting">Désolé, les paramètres de stockage de carte sont actuellement désactivés.</string>
+    <string name="cant_change_this_setting">Désolé, les paramètres de stockage dee cartes sont actuellement désactivés.</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Le téléchargement de la carte est en cours</string>
     <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
     <string name="my_position_share_sms">Hé, regardez ma position actuelle sur CoMaps ! %1$s ou %2$s. Les cartes hors ligne ne sont pas installées ? Téléchargez-les ici : https://www.comaps.app/download/</string>
     <!-- Subject for emailed bookmark -->
-    <string name="bookmark_share_email_subject">Hé, regardez mon signet sur la carte CoMaps !</string>
+    <string name="bookmark_share_email_subject">Hé, regardez ce lieu dans CoMaps !</string>
     <!-- Subject for emailed position -->
     <string name="my_position_share_email_subject">Hé, regardez ma position actuelle sur la carte CoMaps !</string>
     <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
@@ -187,7 +187,7 @@
     <!-- Data version in «About» screen, %@ is replaced by a local, human readable date. -->
     <string name="data_version">Données OpenStreetMap : %s</string>
     <!-- Confirmation for OpenStreetMap log out. -->
-    <string name="osm_log_out_confirmation">Êtes-vous sûr de vouloir vous déconnecter de votre compte OpenStreetMap ?</string>
+    <string name="osm_log_out_confirmation">Êtes-vous certain de vouloir vous déconnecter de votre compte OpenStreetMap ?</string>
     <!-- Title for tracks category in bookmarks manager -->
     <string name="tracks_title">Traces</string>
     <!-- Length of track in cell that describes route -->
@@ -221,7 +221,7 @@
     <!-- Settings «Route» category: «Tts announce street names» description -->
     <string name="pref_tts_street_names_description">Quand activé, le nom de la rue ou de la sortie à prendre sera prononcé à haute voix.</string>
     <!-- Settings «Route» category: «Tts language» title -->
-    <string name="pref_tts_language_title">Langue vocale</string>
+    <string name="pref_tts_language_title">Langue des annonces vocales</string>
     <!-- Settings «Route» category: «Test Voice Directions» title -->
     <string name="pref_tts_test_voice_title">Tester les instructions vocales</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
@@ -234,11 +234,11 @@
     <!-- Menu button -->
     <string name="menu">Menu</string>
     <!-- Text in menu -->
-    <string name="website">Site internet</string>
+    <string name="website">Site web</string>
     <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Nouvelles</string>
     <!-- Settings: Send feedback button and dialog title -->
-    <string name="feedback">Feedback</string>
+    <string name="feedback">Suggestions</string>
     <!-- Text in menu -->
     <string name="rate_the_app">Évaluer l\'appli</string>
     <!-- Text in menu -->
@@ -248,7 +248,7 @@
     <!-- Button in the main menu -->
     <string name="donate">Faire un don</string>
     <!-- Button in the main Help dialog -->
-    <string name="how_to_support_us">Soutenir le projet</string>
+    <string name="how_to_support_us">Devenez contributeur et améliorez CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="copyright">Tous droits réservés</string>
     <!-- Text in menu + Button in the main Help dialog -->
@@ -283,11 +283,11 @@
     <!-- Item in context menu. -->
     <string name="downloader_delete_map">Supprimer carte</string>
     <!-- Item in context menu. -->
-    <string name="downloader_update_map">Mise à jour carte</string>
+    <string name="downloader_update_map">Mettre à jour carte</string>
     <!-- Preference title -->
     <string name="google_play_services">Service de localisation Google Fused</string>
     <!-- Preference text -->
-    <string name="pref_use_google_play">Un service propriétaire qui combine le GPS, le Wi-Fi, les réseaux cellulaires… pour déterminer votre position plus précisément. Il peut se connecter aux serveurs de Google.</string>
+    <string name="pref_use_google_play">Un service propriétaire qui combine GPS, Wi-Fi, réseaux cellulaires… pour déterminer votre position plus précisément. Il peut se connecter aux serveurs Google.</string>
     <!-- Preference title -->
     <!-- Preference description -->
     <!-- Text for routing error dialog -->
@@ -334,10 +334,10 @@
     <string name="blue_gray">Gris-bleu</string>
     <!-- SECTION: Routing dialogs strings -->
     <string name="dialog_routing_disclaimer_title">Lorsque vous suivez l\'itinéraire, gardez à l\'esprit les points suivants :</string>
-    <string name="dialog_routing_disclaimer_priority">— Les conditions de circulation, le code de la route et les panneaux de signalisation ont la priorité sur l\'appareil de navigation ;</string>
-    <string name="dialog_routing_disclaimer_precision">— La carte peut être imprécise et l\'itinéraire proposé n\'est pas forcément le plus direct pour arriver à destination ;</string>
+    <string name="dialog_routing_disclaimer_priority">— Les conditions de circulation, le code de la route et les panneaux de signalisation ont la priorité sur les conseils de navigation ;</string>
+    <string name="dialog_routing_disclaimer_precision">— La carte peut être erronée et l\'itinéraire proposé n\'est pas forcément optimal pour arriver à destination ;</string>
     <string name="dialog_routing_disclaimer_recommendations">— L\'itinéraire proposé doit être considéré comme une simple recommandation ;</string>
-    <string name="dialog_routing_disclaimer_borders">— Faites attention aux itinéraires traversant des zones frontalières : les itinéraires générés par l\'application peuvent parfois franchir des frontières étatiques dans des zones interdites ;</string>
+    <string name="dialog_routing_disclaimer_borders">— Soyez vigilants à proximité des zones frontalières : les itinéraires générés par l\'application peuvent parfois franchir les frontières entre états dans des zones interdites ;</string>
     <string name="dialog_routing_disclaimer_beware">Restez vigilants et soyez prudents sur la route !</string>
     <string name="dialog_routing_check_gps">Vérifiez le signal GPS</string>
     <string name="dialog_routing_error_location_not_found">Impossible de créer l\'itinéraire. Les coordonnées GPS actuelles n\'ont pas pu être déterminées.</string>
@@ -360,10 +360,10 @@
     <string name="dialog_routing_try_again">Veuillez réessayer</string>
     <string name="not_now">Pas maintenant</string>
     <string name="dialog_routing_download_and_build_cross_route">Voulez-vous télécharger la carte et créer un itinéraire plus direct s\'étendant sur plus d\'une carte ?</string>
-    <string name="dialog_routing_download_cross_route">Téléchargez des cartes supplémentaires pour créer un itinéraire plus direct sortant des limites de cette carte.</string>
+    <string name="dialog_routing_download_cross_route">Téléchargez des cartes supplémentaires pour calculer un meilleur itinéraire sortant des limites de la carte courante.</string>
     <!-- SECTION: Strings for downloading map from search -->
-    <string name="search_without_internet_advertisement">Pour commencer à rechercher et à créer des itinéraires, veuillez télécharger la carte. Après cela, vous n\'aurez plus besoin d\'une connexion Internet.</string>
-    <string name="search_select_map">Sélectionner la carte</string>
+    <string name="search_without_internet_advertisement">Commencez par télécharger une carte pour effectuer des recherches et créer des itinéraires. Ensuite vous pourrez utilisez CoMaps sans connexion Internet.</string>
+    <string name="search_select_map">Sélectionnez une carte</string>
     <!-- «Show» context menu -->
     <string name="show">Afficher</string>
     <!-- «Hide» context menu -->
@@ -374,7 +374,7 @@
     <!-- The message when user did not find anything in the search. -->
     <string name="search_not_found_query">Téléchargez la région dans laquelle vous effectuez votre recherche ou essayez d\'ajouter le nom d\'une ville ou d\'un village proche</string>
     <string name="search_history_title">Historique de recherche</string>
-    <string name="search_history_text">Accédez à vos dernières recherches</string>
+    <string name="search_history_text">Affichez vos dernières recherches</string>
     <string name="clear_search">Effacer l\'historique de recherche</string>
     <!-- Place Page link to Wikipedia article (if map object has it). -->
     <string name="read_in_wikipedia">Wikipédia</string>
@@ -402,14 +402,14 @@
     <string name="editor_time_simple">Mode simplifié</string>
     <string name="editor_hours_closed">Heures de fermeture</string>
     <string name="editor_example_values">Exemple de valeurs</string>
-    <string name="editor_correct_mistake">Corriger l\'erreur</string>
+    <string name="editor_correct_mistake">Corriger une erreur</string>
     <string name="editor_add_select_location">Sélectionnez un emplacement</string>
     <string name="editor_report_problem_desription_1">Veuillez décrire le problème en détail pour permettre à la communauté OpenStreetMap de le résoudre.</string>
     <string name="editor_report_problem_desription_2">Ou faites-le vous-même sur https://www.openstreetmap.org/</string>
     <string name="editor_report_problem_send_button">Envoyer</string>
     <string name="editor_report_problem_title">Problème</string>
     <string name="editor_report_problem_no_place_title">Ce lieu n\'existe pas</string>
-    <string name="editor_report_problem_under_construction_title">Fermé pour cause de maintenance</string>
+    <string name="editor_report_problem_under_construction_title">Fermé pour travaux</string>
     <string name="editor_report_problem_duplicate_place_title">Lieu en doublon</string>
     <string name="autodownload">Téléchargement automatique des cartes</string>
     <!-- Place Page opening hours text -->
@@ -452,11 +452,11 @@
     <string name="level">Étage</string>
     <!-- Building level -->
     <string name="level_value_generic">Niveau : %s</string>
-    <string name="downloader_delete_map_dialog">Toutes vos modifications de la carte seront supprimées avec elle</string>
+    <string name="downloader_delete_map_dialog">Toutes vos modifications de la carte seront supprimées en même temps qu\'elle</string>
     <string name="downloader_update_maps">Mettre à jour les cartes</string>
-    <string name="downloader_mwm_migration_dialog">Pour créer un itinéraire, vous devez mettre à jour toutes les cartes puis reprogrammer l\'itinéraire.</string>
+    <string name="downloader_mwm_migration_dialog">Pour créer un itinéraire, vous devez mettre à jour toutes les cartes puis replanifier l\'itinéraire.</string>
     <string name="downloader_search_field_hint">Trouver une carte</string>
-    <string name="common_check_internet_connection_dialog">Veuillez vous assurer que votre appareil est connecté à Internet</string>
+    <string name="common_check_internet_connection_dialog">Veuillez vérifier que votre appareil est connecté à Internet</string>
     <string name="downloader_no_space_title">Espace insuffisant</string>
     <string name="downloader_no_space_message">Veuillez supprimer les données inutiles</string>
     <string name="editor_login_error_dialog">Erreur de connexion</string>
@@ -514,7 +514,7 @@
     <string name="placepage_personal_notes_hint">Notes personnelles (texte ou html)</string>
     <string name="editor_comment_hint">Commentaire…</string>
     <string name="editor_reset_edits_message">Abandonner toutes les modifications locales ?</string>
-    <string name="editor_reset_edits_button">Réinitialiser</string>
+    <string name="editor_reset_edits_button">Ignorer</string>
     <string name="editor_remove_place_message">Supprimer le lieu ajouté ?</string>
     <string name="editor_remove_place_button">Supprimer</string>
     <string name="editor_place_doesnt_exist">Ce lieu n\'existe pas</string>
@@ -523,7 +523,7 @@
     <!-- Phone number error message -->
     <string name="error_enter_correct_phone">Saisissez un numéro de téléphone valide</string>
     <string name="error_enter_correct_web">Saisissez une adresse Internet valide</string>
-    <string name="error_enter_correct_email">Saisissez un email valide</string>
+    <string name="error_enter_correct_email">Saisissez une adresse de courriel valide</string>
     <string name="error_enter_correct_facebook_page">Saisissez une adresse web, un compte ou un nom de page Facebook valide</string>
     <string name="error_enter_correct_instagram_page">Saisissez une adresse web, un nom de compte Instagram valide</string>
     <string name="error_enter_correct_twitter_page">Saisissez une adresse web, un nom de compte Twitter valide</string>
@@ -547,7 +547,7 @@
     <string name="mobile_data_option_not_today">Ne pas utiliser aujourd\'hui</string>
     <string name="mobile_data">Internet mobile</string>
     <!-- NOTE to translators: please synchronize your translation with the English one. -->
-    <string name="mobile_data_description">L\'Internet mobile est requis pour les notifications de mise à jour de carte et le téléchargement des modifications.</string>
+    <string name="mobile_data_description">Une connexion Internet est nécessaire pour recevoir les mises à jour de cartes et pour envoyer vos modifications</string>
     <string name="mobile_data_option_never">Ne jamais utiliser</string>
     <string name="mobile_data_option_ask">Toujours demander</string>
     <string name="traffic_update_maps_text">Pour afficher les données de circulation, les cartes doivent être mises à jour.</string>
@@ -775,9 +775,9 @@
     <!-- Displayed on the Android Auto or CarPlay screen. Button to display maps on the car screen instead of a phone. Must be no more than 18 symbols! -->
     <string name="car_continue_in_the_car">Afficher dans la voiture</string>
     <!-- Ask user to grant location permissions -->
-    <string name="aa_location_permissions_request">CoMaps a besoin d\'un accès à la localisation. Lorsque c\'est sûr, vérifie la notification sur ton téléphone.</string>
+    <string name="aa_location_permissions_request">CoMaps a besoin d\'accéder à votre position. Vérifiez la notification affichée sur le téléphone.</string>
     <!-- Notification title for permission request from AA. -->
-    <string name="aa_request_permission_notification">Cette application a besoin de ta permission</string>
+    <string name="aa_request_permission_notification">Cette application a besoin de vôtre permission</string>
     <!-- The text in the activity for location permission request. -->
     <string name="aa_request_permission_activity_text">CoMaps dans Android Auto a besoin des permissions de localisation pour fonctionner efficacement</string>
     <!-- Grant Permissions button. -->
@@ -810,7 +810,7 @@
     <!-- To indicate if restaurant or other place has outdoor seating -->
     <string name="outdoor_seating">Places en terrasse</string>
     <!-- Disclaimer summary shown when Power Saving Mode is enabled -->
-    <string name="power_save_dialog_summary">Pour une navigation plus précise, nous te recommandons de désactiver le mode d\'économie d\'énergie dans les paramètres de la batterie du téléphone.</string>
+    <string name="power_save_dialog_summary">Pour une navigation plus précise, nous vous recommandons de désactiver le mode d\'économie d\'énergie dans les paramètres de la batterie du téléphone.</string>
     <!-- Prompt to start recording a track. -->
     <string name="start_track_recording">Enregistrer la trace</string>
     <!-- Prompt for stopping a track recording. -->
@@ -826,7 +826,7 @@
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
     <string name="error_no_file_manager_app">Impossible d\'afficher la boîte de dialogue de sélection des dossiers car aucune application appropriée n\'est installée sur votre appareil. Veuillez installer une application de gestion de fichiers et réessayer</string>
     <string name="choose_color">Choisir la couleur</string>
-    <string name="edit_track">Modifier le trace</string>
+    <string name="edit_track">Modifier la trace</string>
     <string name="uri_open_location_failed">Aucune application installée ne permet d\'ouvrir l\'emplacement</string>
     <!-- preference string for using auto theme only in navigation mode -->
     <string name="nav_auto">Auto dans la navigation</string>
@@ -844,7 +844,7 @@
     <string name="comma_separated_pair">%1$s, %2$s</string>
     <string name="openstreetmap">OpenStreetMap</string>
     <string name="navigation_stop_button">Stop</string>
-    <string name="telegram_url">https://t.me/CoMapsApp/</string>
+    <string name="telegram_url">https://t.me/CoMapsApp</string>
     <string name="app_site_url">https://comaps.app/fr/</string>
     <string name="codeberg">Codeberg</string>
     <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
@@ -861,7 +861,7 @@
     <string name="vehicle">Véhicule</string>
     <string name="clear">Effacer</string>
     <string name="pedestrian">À pied</string>
-    <string name="bicycle">Vélo</string>
+    <string name="bicycle">À vélo</string>
     <string name="ruler">Règle</string>
     <string name="bookmark_color">Couleur du marque-page</string>
     <string name="panoramax">Image Panoramax</string>
@@ -890,4 +890,8 @@
     <string name="at">à %s</string>
     <string name="osm_note_hint">Sinon, laissez une note à la communauté OpenStreetMap pour que quelqu\'un d\'autre puisse ajouter ou corriger ce lieu.</string>
     <string name="osm_note_toast">La note va être envoyée à OpenStreetMap</string>
+    <string name="share_track">Partager la trace</string>
+    <string name="delete_track_dialog_title">Supprimer %s ?</string>
+    <string name="existence_confirmed_time_ago">Existance confirmée %s</string>
+    <string name="hours_confirmed_time_ago">Confirmé %s</string>
 </resources>
diff --git a/android/app/src/main/res/values-gl/strings.xml b/android/app/src/main/res/values-gl/strings.xml
index 7ff6a329c..fa7a19a7f 100644
--- a/android/app/src/main/res/values-gl/strings.xml
+++ b/android/app/src/main/res/values-gl/strings.xml
@@ -228,7 +228,7 @@
     <string name="rate_the_app">Valore a aplicación</string>
     <string name="faq">Preguntas frecuentes</string>
     <string name="donate">Doar</string>
-    <string name="how_to_support_us">Apoie o proxecto</string>
+    <string name="how_to_support_us">Voluntariado para mellorar CoMaps</string>
     <string name="copyright">Dereitos de autor</string>
     <string name="report_a_bug">Informar dun fallo</string>
     <string name="compass_calibration_recommended">Mellore a dirección da frecha movendo o teléfono en forma de oito para calibrar o compás.</string>
@@ -617,4 +617,8 @@
     <string name="at">ás %s</string>
     <string name="osm_note_hint">Ou, de xeito alternativo, deixarlle unha nota á comunidade OpenStreetMap para que alguén poida engadir ou arranxar a localización.</string>
     <string name="osm_note_toast">Enviarase unha nota a OpenStreetMap</string>
+    <string name="delete_track_dialog_title">Eliminar %s?</string>
+    <string name="hours_confirmed_time_ago">Confirmado %s</string>
+    <string name="existence_confirmed_time_ago">Existencia confirmada %s</string>
+    <string name="share_track">Compartir ruta</string>
 </resources>
diff --git a/android/app/src/main/res/values-hu/strings.xml b/android/app/src/main/res/values-hu/strings.xml
index 7ec9f63d7..6e46bac22 100644
--- a/android/app/src/main/res/values-hu/strings.xml
+++ b/android/app/src/main/res/values-hu/strings.xml
@@ -82,7 +82,7 @@
     <!-- Header of settings activity where user defines storage path -->
     <string name="maps_storage">Térképek mentési helye</string>
     <!-- Detailed description of Maps Storage settings button -->
-    <string name="maps_storage_summary">Válassza ki a mappát a térképek letöltéséhez.</string>
+    <string name="maps_storage_summary">A térképek letöltéséhez válassza ki a mappát</string>
     <!-- E.g. "Downloaded maps: 500Mb" in Maps Storage settings -->
     <string name="maps_storage_downloaded">Letöltött térképek</string>
     <!-- Free space out of total storage size in Maps Storage settings, e.g. "300 MB free of 2 GB" -->
@@ -162,9 +162,9 @@
     <!-- Warning message when doing search around current position -->
     <string name="unknown_current_position">Az Ön tartózkodási helye még nincs meghatározva</string>
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
-    <string name="cant_change_this_setting">A térképek tárolása jelenleg ki van kapcsolva.</string>
+    <string name="cant_change_this_setting">Sajnos a térképtárolás beállítása jelenleg le van tiltva</string>
     <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">A térkép letöltése folyamatban van.</string>
+    <string name="downloading_is_active">A térkép letöltése folyamatban van</string>
     <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
     <string name="my_position_share_sms">Tekintse meg a helyzetemet az CoMaps alkalmazásban! %1$s vagy %2$s. Nincs offline térképe? Töltse le innen: https://www.comaps.app/download/</string>
     <!-- Subject for emailed bookmark -->
@@ -172,7 +172,7 @@
     <!-- Subject for emailed position -->
     <string name="my_position_share_email_subject">Tekintse meg a helyzetemet az CoMaps alkalmazásban!</string>
     <!-- Share my position using EMail, %1$@ is om:// and %2$@ is https://comaps.app link WITHOUT NAME -->
-    <string name="my_position_share_email">Üdvözlöm!\n\nJelenleg itt tartózkodom: %1$s. Kattintson a következő hivatkozásra: %2$s, vagy ide: %3$s, hogy megtekintse a helyzetemet a térképen.\n\nKöszönöm!</string>
+    <string name="my_position_share_email">Üdvözlöm.\n\nJelenleg itt vagyok: %1$s. Kattintson erre a hivatkozásra %2$s, vagy erre %3$s, hogy megtekintse a helyet a térképen.\n\nKöszönöm.</string>
     <!-- Share button text which opens menu with more buttons, like Message, EMail, Facebook etc. -->
     <string name="share">Megosztás</string>
     <!-- Share by email button text, also used in editor and About. -->
@@ -220,7 +220,7 @@
     <!-- Settings «Route» category: «Test Voice Directions» title -->
     <string name="pref_tts_test_voice_title">Hangutasítások tesztelése</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
-    <string name="pref_tts_playing_test_voice">Ellenőrizze a hangerőt vagy a rendszer TTS-beállításait, ha most nem hallja a hangot.</string>
+    <string name="pref_tts_playing_test_voice">Ellenőrizze a hangerőt vagy a rendszer TTS-beállításait, ha most nem hallja a hangot</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
     <string name="pref_tts_unavailable">Nem érhető el</string>
     <string name="pref_map_auto_zoom">Automatikus nagyítás</string>
@@ -241,7 +241,7 @@
     <!-- Button in the main menu -->
     <string name="donate">Adományozás</string>
     <!-- Button in the main Help dialog -->
-    <string name="how_to_support_us">A projekt támogatása</string>
+    <string name="how_to_support_us">Önkéntes munka és a CoMaps fejlesztése</string>
     <!-- Button in the main Help dialog -->
     <string name="copyright">Szerzői jogok</string>
     <!-- Text in menu + Button in the main Help dialog -->
@@ -266,7 +266,7 @@
     <string name="downloader_download_all_button">Összes letöltése</string>
     <string name="downloader_downloading">Letöltés:</string>
     <!-- Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode -->
-    <string name="downloader_delete_map_while_routing_dialog">Állítsa le a navigációt a térkép törléséhez.</string>
+    <string name="downloader_delete_map_while_routing_dialog">A térkép törléséhez állítsa le a navigációt</string>
     <!-- PointsInDifferentMWM -->
     <string name="routing_failed_cross_mwm_building">Útvonalakat csak akkor lehet készíteni, ha teljesen rajta vannak egy térképen.</string>
     <!-- Context menu item for downloader. -->
@@ -278,9 +278,9 @@
     <!-- Item in context menu. -->
     <string name="downloader_update_map">Térkép frissítése</string>
     <!-- Preference title -->
-    <string name="google_play_services">Google Play helymeghatározási szolgáltatások</string>
+    <string name="google_play_services">Google helymeghatározási szolgáltatás</string>
     <!-- Preference text -->
-    <string name="pref_use_google_play">Bluetooth, Wi-Fi vagy mobilhálózat segítségével gyorsan meghatározhatja hozzávetőleges tartózkodási helyét</string>
+    <string name="pref_use_google_play">A Google szolgáltatása, amely a GPS, a Wi-Fi, a mobilhálózatok stb. kombinálásával határozza meg az Ön tartózkodási helyét. Ez csatlakozik a Google szervereihez, és adatokat gyűjt Önről.</string>
     <!-- Preference title -->
     <!-- Preference description -->
     <!-- Text for routing error dialog -->
@@ -338,18 +338,18 @@
     <string name="dialog_routing_location_turn_on">Engedélyezze a helymeghatározási szolgáltatásokat</string>
     <string name="dialog_routing_location_unknown_turn_on">A jelenlegi GPS-koordináták nem találhatók. Engedélyezze a helymeghatározási szolgáltatásokat az útvonal kiszámításához.</string>
     <string name="dialog_routing_unable_locate_route">Nem sikerült meghatározni az útvonalat</string>
-    <string name="dialog_routing_cant_build_route">Nem lehet létrehozni az útvonalat.</string>
+    <string name="dialog_routing_cant_build_route">Nem lehet létrehozni az útvonalat</string>
     <string name="dialog_routing_change_start_or_end">Pontosítsa a kiindulópontot vagy a célállomást.</string>
     <string name="dialog_routing_change_start">Pontosítsa a kiindulópontot</string>
     <string name="dialog_routing_start_not_determined">Az útvonal nem lett létrehozva. Nem sikerült meghatározni a kiindulópontot.</string>
     <string name="dialog_routing_select_closer_start">Válasszon egy, az úthoz közelebb eső kiindulópontot.</string>
     <string name="dialog_routing_change_end">Pontosítsa célállomását</string>
     <string name="dialog_routing_end_not_determined">Az útvonal nem lett létrehozva. Nem sikerült meghatározni a célállomást.</string>
-    <string name="dialog_routing_select_closer_end">Válasszon egy, az úthoz közelebb eső célállomást.</string>
-    <string name="dialog_routing_change_intermediate">Nem sikerült meghatározni a köztes helyet.</string>
-    <string name="dialog_routing_intermediate_not_determined">Módosítsa a köztes helyet.</string>
+    <string name="dialog_routing_select_closer_end">Válasszon egy, az úthoz közelebb eső célállomást</string>
+    <string name="dialog_routing_change_intermediate">Nem sikerült meghatározni a köztes helyet</string>
+    <string name="dialog_routing_intermediate_not_determined">Kérem, állítsa be a köztes helyet</string>
     <string name="dialog_routing_system_error">Rendszerhiba</string>
-    <string name="dialog_routing_application_error">Nem lehet létrehozni az útvonalat egy alkalmazáshiba miatt.</string>
+    <string name="dialog_routing_application_error">Az alkalmazás hibája miatt nem lehet létrehozni az útvonalat</string>
     <string name="dialog_routing_try_again">Próbálja meg újra</string>
     <string name="not_now">Most nem</string>
     <string name="dialog_routing_download_and_build_cross_route">Szeretné letölteni a térképet, és egynél több térképen átívelő, optimálisabb útvonalat létrehozni?</string>
@@ -363,17 +363,17 @@
     <string name="hide">Elrejtés</string>
     <string name="categories">Kategóriák</string>
     <string name="history">Előzmények</string>
-    <string name="search_not_found">Nincs eredmény.</string>
+    <string name="search_not_found">Hoppá, nincs találat</string>
     <!-- The message when user did not find anything in the search. -->
-    <string name="search_not_found_query">Töltse le a keresett régiót, vagy próbálja meg hozzáadni egy közeli város vagy település nevét.</string>
+    <string name="search_not_found_query">Töltse le a keresett régiót, vagy próbálja meg egy közeli város vagy település nevét hozzáadni.</string>
     <string name="search_history_title">Keresési előzmények</string>
-    <string name="search_history_text">Legutóbbi keresések megtekintése.</string>
+    <string name="search_history_text">Legutóbbi keresések megtekintése</string>
     <string name="clear_search">A keresési előzmények törlése</string>
     <string name="p2p_your_location">Saját tartózkodási hely</string>
     <string name="p2p_start">Indítás</string>
     <string name="p2p_from_here">Kiindulópont</string>
     <string name="p2p_to_here">Célpont</string>
-    <string name="p2p_only_from_current">A navigáció csak a jelenlegi tartózkodási helyétől érhető el.</string>
+    <string name="p2p_only_from_current">Navigáció csak a jelenlegi tartózkodási helyétől indítható</string>
     <string name="p2p_reroute_from_current">Szeretne útvonalat tervezni a jelenlegi tartózkodási helyétől?</string>
     <!-- Edit open hours/set time and minutes dialog -->
     <string name="next_button">Következő</string>
@@ -436,14 +436,14 @@
     <!-- login text field -->
     <string name="email_or_username">E-mail-cím vagy felhasználónév</string>
     <string name="level">Szint</string>
-    <string name="downloader_delete_map_dialog">Az összes térképszerkesztés törlődik a térképpel együtt.</string>
+    <string name="downloader_delete_map_dialog">A térképpel együtt az Ön összes térképszerkesztése törlődik</string>
     <string name="downloader_update_maps">Térképek frissítése</string>
     <string name="downloader_mwm_migration_dialog">Az útvonal létrehozásához frissítenie kell az összes térképet, majd újra meg kell terveznie az útvonalat.</string>
     <string name="downloader_search_field_hint">Térkép keresése</string>
-    <string name="common_check_internet_connection_dialog">Győződjön meg arról, hogy az eszköz csatlakozik az internethez.</string>
+    <string name="common_check_internet_connection_dialog">Győződjön meg arról, hogy az Ön készüléke csatlakozik az internethez</string>
     <string name="downloader_no_space_title">Nincs elegendő tárhely</string>
     <string name="downloader_no_space_message">Törölje a felesleges adatokat</string>
-    <string name="editor_login_error_dialog">Bejelentkezési hiba.</string>
+    <string name="editor_login_error_dialog">Bejelentkezési hiba</string>
     <string name="editor_profile_changes">Jóváhagyott módosítások</string>
     <string name="editor_focus_map_on_location">Húzza a térképet, hogy a keresztet a hely vagy üzlet helyére helyezze.</string>
     <string name="editor_edit_place_title">Szerkesztés</string>
@@ -460,7 +460,7 @@
     <string name="osm_presentation">A közösségi OpenStreetMap adatok frissítésének időpontja: %s. Tudjon meg többet a térkép szerkesztéséről és frissítéséről az OpenStreetMap.org oldalon</string>
     <!-- OSM explanation on Android login screen -->
     <string name="login_osm_presentation">Az OpenStreetMap.org (OSM) egy közösségi projekt, amelynek célja egy ingyenes és nyílt térkép létrehozása. Ez az CoMaps alkalmazás térképadatainak fő forrása, és a Wikipédiához hasonlóan működik. Helyeket adhat hozzá vagy szerkeszthet, és azok világszerte felhasználók milliói számára válnak elérhetővé. \nCsatlakozzon a közösséghez, és segítsen egy jobb térképet készíteni mindenki számára!</string>
-    <string name="login_to_make_edits_visible">Hozzon létre egy fiókot az OpenStreetMapen, vagy jelentkezzen be, hogy közzétehesse térképszerkesztéseit a világ számára.</string>
+    <string name="login_to_make_edits_visible">Hozzon létre egy OpenStreetMap-fiókot, vagy jelentkezzen be, hogy a világ számára közzétehesse az Ön térképszerkesztéseit</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d / %2$d</string>
     <string name="download_over_mobile_header">Biztosan letölti mobilhálózati kapcsolaton keresztül?</string>
@@ -836,4 +836,7 @@
     <string name="saved">Mentett</string>
     <string name="about_headline">Közösség által működtetett nyílt projekt</string>
     <string name="bluesky">Bluesky</string>
+    <string name="closed_now">Most zárva van</string>
+    <string name="existence_confirmed_time_ago">A létezése ellenőrizve és megerősítve %s</string>
+    <string name="hours_confirmed_time_ago">Ellenőrizve és megerősítve %s</string>
 </resources>
diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml
index 7b8fd0d16..889a9dfa1 100644
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -72,7 +72,7 @@
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
     <string name="bookmarks">Bladwijzers</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Bladwijzers en tracks</string>
+    <string name="bookmarks_and_tracks">Bladwijzers en sporen</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Naam</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -886,4 +886,6 @@
     <string name="osm_note_hint">Of laat een opmerking achter bij de OpenStreetMap-gemeenschap, zodat iemand anders hier een plaats kan toevoegen of verbeteren.</string>
     <string name="share_track">Spoor delen</string>
     <string name="delete_track_dialog_title">%s verwijderen?</string>
+    <string name="existence_confirmed_time_ago">Bestaan bevestigd %s</string>
+    <string name="hours_confirmed_time_ago">Bevestigd %s</string>
 </resources>
diff --git a/android/app/src/main/res/values-pt-rBR/strings.xml b/android/app/src/main/res/values-pt-rBR/strings.xml
index 26098d376..109f0e68c 100644
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -767,7 +767,7 @@
     <string name="app_site_url">https://comaps.app/pt-BR/</string>
     <string name="dialog_routing_change_intermediate">Não foi possível localizar o ponto intermediário</string>
     <string name="editor_time_from">De</string>
-    <string name="how_to_support_us">Apoie o projeto</string>
+    <string name="how_to_support_us">Voluntarie-se e melhore o CoMaps</string>
     <string name="google_play_services">Serviço de localização integrada do Google</string>
     <string name="editor_time_title">Horário de funcionamento</string>
     <string name="long_tap_toast">Dê um toque longo no mapa novamente para ver a interface</string>
@@ -863,4 +863,6 @@
     <string name="osm_note_toast">A nota será enviada ao OpenStreetMap</string>
     <string name="delete_track_dialog_title">Apagar %s?</string>
     <string name="share_track">Compartilhar trilha</string>
+    <string name="existence_confirmed_time_ago">Existência confirmada %s</string>
+    <string name="hours_confirmed_time_ago">Confirmado %s</string>
 </resources>
diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index 8819a3302..dab41999d 100644
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -879,4 +879,6 @@
     <string name="osm_note_hint">Ou, em vez disso, deixe uma nota para a comunidade do OpenStreetMap de tal maneira que outra pessoa possa adicionar ou consertar um local aqui.</string>
     <string name="share_track">Partilhar Trajeto</string>
     <string name="delete_track_dialog_title">Apagar %s?</string>
+    <string name="existence_confirmed_time_ago">Existência confirmada %s</string>
+    <string name="hours_confirmed_time_ago">Confirmado %s</string>
 </resources>
diff --git a/android/app/src/main/res/values-zh/strings.xml b/android/app/src/main/res/values-zh/strings.xml
index 55541a6da..f062e010c 100644
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -252,7 +252,7 @@
     <!-- Button in the main menu -->
     <string name="donate">捐助我们</string>
     <!-- Button in the main Help dialog -->
-    <string name="how_to_support_us">支持本项目</string>
+    <string name="how_to_support_us">志愿改进 CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="copyright">版权</string>
     <!-- Text in menu + Button in the main Help dialog -->
@@ -887,4 +887,8 @@
     <string name="at">%s</string>
     <string name="osm_note_hint">或者，也可以给 OpenStreetMap 社区留言，以便其他人可以在此添加或修复地点。</string>
     <string name="osm_note_toast">注释将发送至 OpenStreetMap</string>
+    <string name="existence_confirmed_time_ago">已于%s确认地点存在</string>
+    <string name="delete_track_dialog_title">是否删除%s？</string>
+    <string name="hours_confirmed_time_ago">已于%s确认</string>
+    <string name="share_track">分享轨迹</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-ca/strings.xml b/android/sdk/src/main/res/values-ca/strings.xml
index f8982d919..e33f0ff4c 100644
--- a/android/sdk/src/main/res/values-ca/strings.xml
+++ b/android/sdk/src/main/res/values-ca/strings.xml
@@ -7,7 +7,7 @@
     <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
     <string name="maps_storage_internal">Emmagatzematge privat intern</string>
     <!-- Shared storage type in Maps Storage settings (a primary storage usually) -->
-    <string name="maps_storage_shared">Emmagatzematge compartit intern</string>
+    <string name="maps_storage_shared">Emmagatzematge intern compartit</string>
     <!-- Removable external storage type in Maps Storage settings, e.g. an SD card -->
     <string name="maps_storage_removable">Targeta SD</string>
     <!-- Generic external storage type in Maps Storage settings -->
@@ -36,4 +36,12 @@
     <string name="mb">MB</string>
     <string name="gb">GB</string>
     <string name="today">Avui</string>
+    <string name="days_ago">Fa %s dies</string>
+    <string name="week_ago">Fa %s setmana</string>
+    <string name="month_ago">Fa %s mes</string>
+    <string name="months_ago">Fa %s mesos</string>
+    <string name="year_ago">Fa %s any</string>
+    <string name="years_ago">Fa %s anys</string>
+    <string name="yesterday">Ahir</string>
+    <string name="weeks_ago">Fa %s setmanes</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-de/strings.xml b/android/sdk/src/main/res/values-de/strings.xml
index 938aa7cc9..960393343 100644
--- a/android/sdk/src/main/res/values-de/strings.xml
+++ b/android/sdk/src/main/res/values-de/strings.xml
@@ -36,4 +36,12 @@
     <string name="gb">GB</string>
     <string name="mb">MB</string>
     <string name="today">Heute</string>
+    <string name="days_ago">vor %s Tagen</string>
+    <string name="week_ago">vor %s Woche</string>
+    <string name="yesterday">Gestern</string>
+    <string name="weeks_ago">vor %s Wochen</string>
+    <string name="month_ago">vor %s Monat</string>
+    <string name="months_ago">vor %s Monaten</string>
+    <string name="year_ago">vor %s Jahr</string>
+    <string name="years_ago">vor %s Jahren</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-de/types_strings.xml b/android/sdk/src/main/res/values-de/types_strings.xml
index a90e2bab8..76490fb60 100644
--- a/android/sdk/src/main/res/values-de/types_strings.xml
+++ b/android/sdk/src/main/res/values-de/types_strings.xml
@@ -697,7 +697,7 @@
     <string name="type.natural.water.lake">See</string>
     <string name="type.natural.water.lock">Schleusenkammer</string>
     <string name="type.natural.water.pond">Teich</string>
-    <string name="type.natural.water.reservoir">Reservoir</string>
+    <string name="type.natural.water.reservoir">Stausee</string>
     <string name="type.natural.water.basin">Wasserbecken</string>
     <string name="type.natural.water.river">Fluss</string>
     <string name="type.natural.land">Land</string>
@@ -1222,7 +1222,7 @@
     <string name="type.sport.tennis">Tennisplatz</string>
     <string name="type.sport.volleyball">Volleyball</string>
     <string name="type.sport.10pin">Bowling</string>
-    <string name="type.sport.9pin">Bowling</string>
+    <string name="type.sport.9pin">Kegeln</string>
     <string name="type.sport.padel">Padel</string>
     <string name="type.sport.futsal">Futsal</string>
     <string name="type.sport.ice_hockey">Eishockey</string>
@@ -1267,7 +1267,7 @@
     <string name="type.tourism.motel">Motel</string>
     <string name="type.tourism.museum">Museum</string>
     <string name="type.tourism.picnic_site">Picknickplatz</string>
-    <string name="type.leisure.resort">Resort</string>
+    <string name="type.leisure.resort">Freizeitanlage</string>
     <string name="type.tourism.theme_park">Freizeitpark</string>
     <string name="type.tourism.viewpoint">Aussichtspunkt</string>
     <!-- Typically more basic, not staffed and free (compared to alpine_hut). -->
@@ -1355,7 +1355,7 @@
     <string name="type.building.garage">Garage</string>
     <string name="type.cuisine.fish_and_chips">Fisch und Chips</string>
     <string name="type.leisure.beach_resort">Badestrand</string>
-    <string name="type.amenity.food_court">Food Court</string>
+    <string name="type.amenity.food_court">Gastronomiebereich</string>
     <string name="type.fee.yes">$</string>
     <string name="type.man_made.utility_pole">Versorgungsmast</string>
     <string name="type.cuisine.bubble_tea">Bubble Tea</string>
diff --git a/android/sdk/src/main/res/values-es/strings.xml b/android/sdk/src/main/res/values-es/strings.xml
index a8e43e5c7..7cc06cbf1 100644
--- a/android/sdk/src/main/res/values-es/strings.xml
+++ b/android/sdk/src/main/res/values-es/strings.xml
@@ -36,4 +36,12 @@
     <string name="mb">MB</string>
     <string name="gb">GB</string>
     <string name="today">Hoy</string>
+    <string name="yesterday">Ayer</string>
+    <string name="days_ago">Hace %s días</string>
+    <string name="week_ago">Hace %s semana</string>
+    <string name="weeks_ago">Hace %s semanas</string>
+    <string name="month_ago">Hace %s mes</string>
+    <string name="months_ago">Hace %s meses</string>
+    <string name="year_ago">Hace %s año</string>
+    <string name="years_ago">Hace %s años</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-es/types_strings.xml b/android/sdk/src/main/res/values-es/types_strings.xml
index 10f74b733..806e61317 100644
--- a/android/sdk/src/main/res/values-es/types_strings.xml
+++ b/android/sdk/src/main/res/values-es/types_strings.xml
@@ -600,7 +600,7 @@
     <string name="type.landuse.education">Instalaciones educativas</string>
     <string name="type.landuse.farmland">Tierras agrícolas</string>
     <string name="type.landuse.farmyard">Granja</string>
-    <string name="type.landuse.flowerbed">Cama de flores</string>
+    <string name="type.landuse.flowerbed">Parterre</string>
     <string name="type.landuse.forest">Bosque</string>
     <string name="type.landuse.forest.coniferous">Bosque de coníferas</string>
     <string name="type.landuse.forest.deciduous">Bosque caducifolio</string>
@@ -1392,4 +1392,5 @@
     <string name="type.natural.wetland.reedbed">Juncal</string>
     <string name="type.railway.station.subway.qingdao">Estación de Metro</string>
     <string name="type.leisure.escape_game">Sala de Escape</string>
+    <string name="type.amenity.animal_shelter">Refugio de animales</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-et/strings.xml b/android/sdk/src/main/res/values-et/strings.xml
index 408e974fa..015e75b0a 100644
--- a/android/sdk/src/main/res/values-et/strings.xml
+++ b/android/sdk/src/main/res/values-et/strings.xml
@@ -36,4 +36,12 @@
     <string name="mb">MB</string>
     <string name="gb">GB</string>
     <string name="today">Täna</string>
+    <string name="days_ago">%s päeva tagasi</string>
+    <string name="month_ago">%s kuu eest</string>
+    <string name="months_ago">%s kuud tagasi</string>
+    <string name="year_ago">%s aasta eest</string>
+    <string name="years_ago">%s aastat tagasi</string>
+    <string name="yesterday">Eile</string>
+    <string name="week_ago">%s nädala eest</string>
+    <string name="weeks_ago">%s nädalat tagasi</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-et/types_strings.xml b/android/sdk/src/main/res/values-et/types_strings.xml
index 9fbc225f4..09304fce7 100644
--- a/android/sdk/src/main/res/values-et/types_strings.xml
+++ b/android/sdk/src/main/res/values-et/types_strings.xml
@@ -296,10 +296,10 @@
     <string name="type.cuisine.georgian">Gruusia</string>
     <string name="type.cuisine.german">Saksa</string>
     <string name="type.cuisine.greek">Kreeka</string>
-    <string name="type.cuisine.grill">Grill</string>
+    <string name="type.cuisine.grill">Grillroad</string>
     <string name="type.cuisine.heuriger">Austria hooajaline veinikõrts (heuriger)</string>
     <string name="type.cuisine.hotdog">Viinersai</string>
-    <string name="type.cuisine.hungarian">Ungari</string>
+    <string name="type.cuisine.hungarian">Ungari köök</string>
     <string name="type.cuisine.ice_cream">Jäätis</string>
     <string name="type.cuisine.indian">India</string>
     <string name="type.cuisine.indonesian">Indoneesia</string>
@@ -321,7 +321,7 @@
     <string name="type.cuisine.noodles">Nuudliroad</string>
     <string name="type.cuisine.oriental">Kaug-Ida</string>
     <string name="type.cuisine.pancake">Pannkoogid</string>
-    <string name="type.cuisine.pasta">Pasta</string>
+    <string name="type.cuisine.pasta">Pastaroad</string>
     <string name="type.cuisine.persian">Pärsia</string>
     <string name="type.cuisine.peruvian">Peruu köök</string>
     <string name="type.cuisine.pizza">Pitsa</string>
diff --git a/android/sdk/src/main/res/values-fr/types_strings.xml b/android/sdk/src/main/res/values-fr/types_strings.xml
index 8db7b2402..e2b660044 100644
--- a/android/sdk/src/main/res/values-fr/types_strings.xml
+++ b/android/sdk/src/main/res/values-fr/types_strings.xml
@@ -196,7 +196,7 @@
     <string name="type.barrier.retaining_wall">Mur de soutènement</string>
     <string name="type.barrier.stile">Échalier</string>
     <string name="type.barrier.turnstile">Tourniquet</string>
-    <string name="type.barrier.swing_gate">Barrière tournante</string>
+    <string name="type.barrier.swing_gate">Portail Battant</string>
     <string name="type.barrier.toll_booth">Poste de péage</string>
     <string name="type.barrier.wall">Mur</string>
     <string name="type.boundary">Frontière</string>
@@ -1391,4 +1391,6 @@
     <string name="type.post_office.post_partner">Partenaire de publication</string>
     <string name="type.amenity.ranger_station">Poste de garde forestier</string>
     <string name="type.leisure.escape_game">Escape Room</string>
+    <string name="type.amenity.animal_shelter">Abri pour animaux</string>
+    <string name="type.barrier.wicket_gate">Portillon</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-gl/strings.xml b/android/sdk/src/main/res/values-gl/strings.xml
index 2f36d2e52..265145ea7 100644
--- a/android/sdk/src/main/res/values-gl/strings.xml
+++ b/android/sdk/src/main/res/values-gl/strings.xml
@@ -23,4 +23,12 @@
     <string name="maps_storage_removable">Tarxeta SD</string>
     <string name="core_placepage_unknown_place">Punto do mapa</string>
     <string name="today">Hoxe</string>
+    <string name="yesterday">Onte</string>
+    <string name="days_ago">hai %s días</string>
+    <string name="week_ago">hai %s semana</string>
+    <string name="weeks_ago">hai %s semanas</string>
+    <string name="month_ago">hai %s mes</string>
+    <string name="months_ago">hai %s meses</string>
+    <string name="year_ago">hai %s ano</string>
+    <string name="years_ago">hai %s anos</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-hu/types_strings.xml b/android/sdk/src/main/res/values-hu/types_strings.xml
index 7f8f2ea0c..f471daf2a 100644
--- a/android/sdk/src/main/res/values-hu/types_strings.xml
+++ b/android/sdk/src/main/res/values-hu/types_strings.xml
@@ -718,7 +718,7 @@
     <string name="type.railway.station.light_rail">HÉV-állomás</string>
     <string name="type.railway.station.light_rail.berlin">S-Bahn-állomás</string>
     <string name="type.railway.station.light_rail.london">DLR-állomás</string>
-    <string name="type.railway.station.light_rail.porto">Porto Metro</string>
+    <string name="type.railway.station.light_rail.porto">Portói metró</string>
     <string name="type.railway.station.monorail">Egysínűvasút-állomás</string>
     <string name="type.railway.station.subway">Metróállomás</string>
     <string name="type.railway.station.subway.adana">Metróállomás</string>
@@ -1173,7 +1173,7 @@
     <!-- https://wiki.openstreetmap.org/wiki/Tag:emergency=emergency_ward_entrance -->
     <string name="type.emergency.emergency_ward_entrance">Sürgősségi kórterem bejárata</string>
     <!-- https://wiki.openstreetmap.org/wiki/Tag:amenity=dojo -->
-    <string name="type.amenity.dojo">Dodzso</string>
+    <string name="type.amenity.dojo">Dodzsó</string>
     <!-- https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall -->
     <string name="type.leisure.sports_hall">Sportcsarnok</string>
     <string name="type.aeroway.runway">Kifutópálya</string>
@@ -1373,7 +1373,7 @@
     <string name="type.post_office.post_partner">Posta partner</string>
     <string name="type.amenity.animal_shelter">Állatmenhely</string>
     <string name="type.barrier.guard_rail">Védőkorlát</string>
-    <string name="type.barrier.wicket_gate">Útelzáró sorompó</string>
+    <string name="type.barrier.wicket_gate">Kiskapu</string>
     <string name="type.highway.ladder">Létra</string>
     <string name="type.landuse.plant_nursery">Faiskola</string>
     <string name="type.leisure.firepit">Tűzrakóhely</string>
diff --git a/android/sdk/src/main/res/values-nl/strings.xml b/android/sdk/src/main/res/values-nl/strings.xml
index 8a29a1297..a110f3b3e 100644
--- a/android/sdk/src/main/res/values-nl/strings.xml
+++ b/android/sdk/src/main/res/values-nl/strings.xml
@@ -33,7 +33,15 @@
     <string name="limited_access">Beperkte toegang</string>
     <string name="not_shared">Privé</string>
     <string name="access_rules_author_only">Wordt online bewerkt</string>
-    <string name="gb">GB</string>
+    <string name="gb">VK</string>
     <string name="mb">MB</string>
     <string name="today">Vandaag</string>
+    <string name="yesterday">Gisteren</string>
+    <string name="days_ago">%s dagen geleden</string>
+    <string name="week_ago">%s week geleden</string>
+    <string name="weeks_ago">%s weken geleden</string>
+    <string name="month_ago">%s maand geleden</string>
+    <string name="year_ago">%s jaar geleden</string>
+    <string name="years_ago">%s jaar geleden</string>
+    <string name="months_ago">%s maanden geleden</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-pt/types_strings.xml b/android/sdk/src/main/res/values-pt/types_strings.xml
index d81868aac..727aef71a 100644
--- a/android/sdk/src/main/res/values-pt/types_strings.xml
+++ b/android/sdk/src/main/res/values-pt/types_strings.xml
@@ -1392,6 +1392,6 @@
     <string name="type.amenity.ranger_station">Posto de Guardas Florestais</string>
     <string name="type.post_office.post_partner">Parceiro Postal</string>
     <string name="type.natural.wetland.tidalflat">Planície de maré</string>
-    <string name="type.amenity.animal_shelter">Abrigo de Animais</string>
+    <string name="type.amenity.animal_shelter">Abrigo Animal</string>
     <string name="type.barrier.wicket_gate">Postigo</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-sr/types_strings.xml b/android/sdk/src/main/res/values-sr/types_strings.xml
index f63a4bac7..60c2bb904 100644
--- a/android/sdk/src/main/res/values-sr/types_strings.xml
+++ b/android/sdk/src/main/res/values-sr/types_strings.xml
@@ -1391,4 +1391,6 @@
     <string name="type.amenity.bicycle_parking.covered">Покривени паркинг за бицикле</string>
     <string name="type.amenity.ranger_station">Станица за ренџер</string>
     <string name="type.leisure.escape_game">Escape Room</string>
+    <string name="type.barrier.wicket_gate">Вратница</string>
+    <string name="type.amenity.animal_shelter">Волонтирајте и побољшајте CoMaps</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-zh/strings.xml b/android/sdk/src/main/res/values-zh/strings.xml
index 216e6e599..1f8b2ffad 100644
--- a/android/sdk/src/main/res/values-zh/strings.xml
+++ b/android/sdk/src/main/res/values-zh/strings.xml
@@ -29,7 +29,7 @@
     <!-- A unit of measure -->
     <string name="ft">英尺</string>
     <!-- Subway exits for public transport marks on the map -->
-    <string name="core_exit">退出</string>
+    <string name="core_exit">出口</string>
     <string name="core_entrance">入口</string>
     <string name="subway_data_unavailable">地铁地图不可用</string>
     <string name="public_access">允许公众访问</string>
@@ -37,4 +37,12 @@
     <string name="not_shared">私人</string>
     <string name="access_rules_author_only">在线编辑</string>
     <string name="today">今天</string>
+    <string name="yesterday">昨天</string>
+    <string name="days_ago">%s 天前</string>
+    <string name="week_ago">%s 周前</string>
+    <string name="weeks_ago">%s 周前</string>
+    <string name="month_ago">%s 个月前</string>
+    <string name="months_ago">%s 个月前</string>
+    <string name="year_ago">%s 年前</string>
+    <string name="years_ago">%s 年前</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-zh/types_strings.xml b/android/sdk/src/main/res/values-zh/types_strings.xml
index 0044105fc..562f836d7 100644
--- a/android/sdk/src/main/res/values-zh/types_strings.xml
+++ b/android/sdk/src/main/res/values-zh/types_strings.xml
@@ -1392,4 +1392,6 @@
     <string name="type.natural.wetland.tidalflat">潮汐平原</string>
     <string name="type.amenity.ranger_station">护林站</string>
     <string name="type.post_office.post_partner">邮政合作点</string>
+    <string name="type.barrier.wicket_gate">旁门</string>
+    <string name="type.amenity.animal_shelter">动物收容所</string>
 </resources>
diff --git a/data/countries-strings/es.json/localize.json b/data/countries-strings/es.json/localize.json
index 0dada1ca0..38381935f 100644
--- a/data/countries-strings/es.json/localize.json
+++ b/data/countries-strings/es.json/localize.json
@@ -15,7 +15,7 @@
 "Argentina_Buenos Aires_North":"Provincia de Buenos Aires — Norte",
 "Argentina_Buenos Aires_South":"Provincia de Buenos Aires — Sur",
 "Argentina_Cuyo":"Cuyo",
-"Argentina_Mesopotamia":"Mesopotamia argentina",
+"Argentina_Mesopotamia":"Mesopotamia Argentina",
 "Argentina_Northwest":"Noroeste argentino",
 "Argentina_Pampas":"Región pampeana",
 "Argentina_Patagonia":"Patagonia",
diff --git a/data/countries-strings/hu.json/localize.json b/data/countries-strings/hu.json/localize.json
index 47f3b430d..6c2b7f871 100644
--- a/data/countries-strings/hu.json/localize.json
+++ b/data/countries-strings/hu.json/localize.json
@@ -4,19 +4,19 @@
 "Alabama":"Alabama",
 "Albania":"Albánia",
 "Algeria":"Algéria",
-"Algeria_Central":"Algéria — Középpont",
-"Algeria_Coast":"Algéria — Észak",
+"Algeria_Central":"Algéria centrum",
+"Algeria_Coast":"Algéria észak",
 "Andorra":"Andorra",
 "Angola":"Angola",
 "Anguilla":"Anguilla",
 "Antarctica":"Antarktika",
 "Antigua and Barbuda":"Antigua és Barbuda",
 "Argentina":"Argentína",
-"Argentina_Buenos Aires_North":"Buenos Aires tartomány — Észak",
-"Argentina_Buenos Aires_South":"Buenos Aires tartomány — Dél",
+"Argentina_Buenos Aires_North":"Buenos Aires északi tartomány",
+"Argentina_Buenos Aires_South":"Buenos Aires déli tartomány",
 "Argentina_Cuyo":"Cuyo",
-"Argentina_Mesopotamia":"Mesopotamia",
-"Argentina_Northwest":"Argentína - Észak-nyugat",
+"Argentina_Mesopotamia":"Mezopotámia",
+"Argentina_Northwest":"Argentína északnyugat",
 "Argentina_Pampas":"Pampas",
 "Argentina_Patagonia":"Patagónia",
 "Arizona":"Arizona",
@@ -33,8 +33,8 @@
 "Austria":"Ausztria",
 "Austria_Burgenland":"Burgenland",
 "Austria_Carinthia":"Karintia",
-"Austria_Lower Austria_West":"Alsó-Ausztria — Nyugat",
-"Austria_Lower Austria_Wien":"Bécs",
+"Austria_Lower Austria_West":"Alsó-Ausztria nyugat",
+"Austria_Lower Austria_Wien":"Bécs és alsó-Ausztria kelet",
 "Austria_Salzburg":"Salzburg",
 "Austria_Styria":"Stájerország",
 "Austria_Tyrol":"Tirol",
@@ -68,8 +68,8 @@
 "Bermuda":"Bermuda",
 "Bhutan":"Bhután",
 "Bolivia":"Bolívia",
-"Bolivia_North":"Bolívia – Észak",
-"Bolivia_South":"Bolívia – Dél",
+"Bolivia_North":"Bolívia észak",
+"Bolivia_South":"Bolívia dél",
 "Bosnia and Herzegovina":"Bosznia-Hercegovina",
 "Bosnia and Herzegovina_Brcko district of Bosnia and Herzegowina":"Brčkói Körzet",
 "Bosnia and Herzegovina_Entity Federation of Bosnia and Herzegovina":"Bosznia-hercegovinai Föderáció",
@@ -152,7 +152,7 @@
 "Canada_Ontario_Northeastern_North":"Moose Factory",
 "Canada_Ontario_Northeastern_S":"Greater Sudbury",
 "Canada_Ontario_Northeastern_SE":"North Bay",
-"Canada_Ontario_Northeastern_SW":"Sault Ste.  Marie",
+"Canada_Ontario_Northeastern_SW":"Sault Ste. Marie",
 "Canada_Ontario_Northeastern_Wawa":"Wawa",
 "Canada_Ontario_Northern":"Thunder Bay",
 "Canada_Ontario_Northwestern":"Ontario — Észak",
@@ -568,8 +568,8 @@
 "Italy_Sardinia":"Szardínia",
 "Italy_Sicily":"Szicília",
 "Italy_Trentino-Alto Adige Sudtirol":"Trentino-Alto Adige",
-"Italy_Tuscany_Grosseto":"Toszkána — Grosseto megye",
-"Italy_Tuscany_Massa e Carrara":"Toszkána — Massa-Carrara megye",
+"Italy_Tuscany_Grosseto":"Toszkána délkelet",
+"Italy_Tuscany_Massa e Carrara":"Toszkána északnyugat",
 "Italy_Umbria":"Umbria",
 "Italy_Veneto":"Veneto",
 "Italy_Veneto_Belluno":"Belluno megye",
@@ -923,9 +923,9 @@
 "South Africa_KwaZulu-Natal":"KwaZulu-Natal",
 "South Africa_Limpopo":"Limpopo",
 "South Africa_Mpumalanga":"Mpumalanga",
-"South Africa_North West":"North West",
+"South Africa_North West":"Északnyugat",
 "South Africa_Northern Cape":"Észak-Fokföld",
-"South Africa_Western Cape":"Western Cape",
+"South Africa_Western Cape":"Nyugat-fokföld",
 "South Carolina":"Dél-Karolina",
 "South Georgia and the South Sandwich Islands":"Déli-Georgia és Déli-Sandwich-szigetek",
 "South Korea":"Dél-Korea",
@@ -1002,7 +1002,7 @@
 "Turkmenistan":"Türkmenisztán",
 "Turks and Caicos Islands":"Turks- és Caicos-szigetek",
 "Tuvalu":"Tuvalu",
-"UK_England_East Midlands":"East Midlands",
+"UK_England_East Midlands":"Midlands kelet",
 "UK_England_East of England_Essex":"Kelet-Anglia — Essex",
 "UK_England_East of England_Norfolk":"Kelet-Anglia — Norfolk",
 "UK_England_Greater London":"Nagy-London",
@@ -1012,7 +1012,7 @@
 "UK_England_South East_Oxford":"Dél-kelet-Anglia — Oxford",
 "UK_England_South West England_Bristol":"Dél-kelet-Anglia — Bristol",
 "UK_England_South West England_Cornwall":"Dél-kelet-Anglia — Cornwall",
-"UK_England_West Midlands":"West Midlands",
+"UK_England_West Midlands":"Midlands nyugat",
 "UK_England_Yorkshire and the Humber":"Yorkshire és a Humber",
 "UK_Northern Ireland":"Észak-Írország",
 "UK_Scotland_North":"Észak-Skócia",
@@ -1072,7 +1072,7 @@
 "US_Louisiana_New Orleans":"New Orleans",
 "US_Maine":"Maine",
 "US_Maryland_Baltimore":"Baltimore",
-"US_Maryland_and_DC":"Nyugat, Washington",
+"US_Maryland_and_DC":"Nyugat, Washington D.C.",
 "US_Massachusetts_Boston":"Boston",
 "US_Massachusetts_Central":"Worcester",
 "US_Massachusetts_Plymouth":"Plymouth",
@@ -1244,10 +1244,10 @@
 "Mexico_Chihuahua":"Chihuahua",
 "Mexico_Sonora":"Sonora",
 "Nepal_Kathmandu":"Katmandu",
-"Nepal_Madhyamanchal":"Középső régió",
-"Nepal_Purwanchal":"Keleti régió",
-"Nigeria_North":"Nigéria — Észak",
-"Nigeria_South":"Nigéria — Dél",
+"Nepal_Madhyamanchal":"Központi fejlesztési térség",
+"Nepal_Purwanchal":"Keleti fejlesztési térség",
+"Nigeria_North":"Nigéria észak",
+"Nigeria_South":"Nigéria dél",
 "Norway_Hordaland":"Hordaland megye",
 "Norway_Nordland":"Nordland megye",
 "Norway_North Trondelag":"Nord-Trøndelag megye",
@@ -1350,7 +1350,7 @@
 "Andorra Description":"Andorra la Vella",
 "Angola Description":"Luanda",
 "Anguilla Description":"The Valley",
-"Antarctica Description":"McMurdo Station, Chilean research station „Villa Las Estrellas”, Rocky Cove",
+"Antarctica Description":"McMurdo állomás, chilei kutatóállomás „Villa Las Estrellas”, Rocky Cove",
 "Antigua and Barbuda Description":"St. John's",
 "Argentina_Buenos Aires_Buenos Aires Description":"Buenos Aires",
 "Argentina_Buenos Aires_North Description":"Dolores, Pinamar, Villa Gesell",
@@ -1375,7 +1375,7 @@
 "Austria_Burgenland Description":"Felsőpulya, Kismarton, Nagymarton",
 "Austria_Carinthia Description":"Klagenfurt, Villach, Wolfsberg",
 "Austria_Lower Austria_West Description":"Mostviertel, Waldviertel",
-"Austria_Lower Austria_Wien Description":"Bécs, Bécsújhely",
+"Austria_Lower Austria_Wien Description":"Bécs, Iparvidék, Bécsújhely",
 "Austria_Salzburg Description":"Salzburg",
 "Austria_Styria_Graz Description":"Grác, Voitsberg",
 "Austria_Styria_Leoben Description":"Knittelfeld",
@@ -1514,7 +1514,7 @@
 "China_Chongqing Description":"Chongqing, Changshou, Kai",
 "China_Fujian Description":"Longyan, Sanming, Shaowu",
 "China_Gansu Description":"Lanzhou, Hongliuwan, Dangchengwan",
-"China_Guangdong Description":"Guangzhou, Shenzhen, Jiāngmén",
+"China_Guangdong Description":"Guangzhou, Shenzhen, Jiangmen",
 "China_Guangxi Description":"Guigang, Dongxing, Wuzhou",
 "China_Guizhou Description":"Guiyang, Liupanshui, Weining",
 "China_Hebei Description":"Beijing, Tianjin, Shijiazhuang",
@@ -1582,7 +1582,7 @@
 "Egypt Description":"Kairó, Alexandria, Gíza",
 "El Salvador Description":"San Salvador, Ahuachapán, Sonsonate",
 "Equatorial Guinea Description":"Bata",
-"Eritrea Description":"Aszmara",
+"Eritrea Description":"Asmara, Keren, Omhajer",
 "Estonia_East Description":"Põltsamaa linn, Võru, Tartu",
 "Estonia_West Description":"Tallin",
 "Ethiopia Description":"Addisz-Abeba, Asella, Bahir Dar",
@@ -1781,7 +1781,7 @@
 "India_Karnataka_North Description":"Belagavi, Hubballi, Mangaluru",
 "India_Karnataka_South Description":"Bengaluru, Mysuru, Kolar Gold Fields",
 "India_Kerala Description":"Thiruvananthapuram, Ernakulam, Thrissur",
-"India_Lakshadweep Description":"Kavaratti, Minicoy, agatti village center",
+"India_Lakshadweep Description":"Kavaratti, Minicoy, Agatti",
 "India_Madhya Pradesh Description":"Indore, Bhopal, Gwalior",
 "India_Maharashtra Description":"Mumbai, Pune, Nagpur",
 "India_Manipur Description":"Imphal, Imphal, Jiribam",
@@ -1817,7 +1817,7 @@
 "Isle of Man Description":"Douglas, Onchan",
 "Israel Description":"Tel Aviv-Yafo, Herzliya, Modiin-Maccabim-Reut",
 "Italy_Abruzzo Description":"Pescara, Rosciolo, Pineto",
-"Italy_Aosta Valley Description":"Quart, Aosta, Aosta",
+"Italy_Aosta Valley Description":"Quart, Aosta",
 "Italy_Apulia Description":"Bari, Taranto, Foggia",
 "Italy_Basilicata Description":"Potenza, Matera, Melfi",
 "Italy_Calabria Description":"Reggio di Calabria, Catanzaro, Cosenza",
@@ -1839,21 +1839,21 @@
 "Italy_Liguria Description":"Genoa, La Spezia, La Spezia",
 "Italy_Lombardy_Bergamo Description":"Bergamo",
 "Italy_Lombardy_Brescia Description":"Brescia, Bossotti, Lumezzane",
-"Italy_Lombardy_Como Description":"Como, Como, Cantù",
-"Italy_Lombardy_Cremona Description":"Cremona, Cremona, Trescore Cremasco",
+"Italy_Lombardy_Como Description":"Como, Cantú",
+"Italy_Lombardy_Cremona Description":"Cremona, Trescore Cremasco",
 "Italy_Lombardy_Lecco Description":"Lecco, Merate, Calolziocorte",
 "Italy_Lombardy_Lodi Description":"Lodi, Codogno, Casalpusterlengo",
-"Italy_Lombardy_Mantua Description":"Mantua, Mantua, Suzzara",
+"Italy_Lombardy_Mantua Description":"Mantova, Suzzara",
 "Italy_Lombardy_Milan Description":"Milánó",
 "Italy_Lombardy_Monza and Brianza Description":"Monza, Besana in Brianza, Seregno",
 "Italy_Lombardy_Pavia Description":"Pavia, Vigevano, Buscarella",
-"Italy_Lombardy_Sondrio Description":"Sondrio, Sondrio, Morbegno",
+"Italy_Lombardy_Sondrio Description":"Sondrio, Morbegno",
 "Italy_Lombardy_Varese Description":"Busto Arsizio, Varese, Gallarate",
 "Italy_Marche Description":"Ancona, Pesaro",
 "Italy_Molise Description":"Campobasso, Termoli, Isernia",
 "Italy_Piemont_Alessandria Description":"Alessandria, Casale Monferrato, Novi Ligure",
 "Italy_Piemont_Asti Description":"Asti, Canelli, Nizza Monferrato",
-"Italy_Piemont_Biella Description":"Biella, Biella, Cossato",
+"Italy_Piemont_Biella Description":"Biella, Cossato",
 "Italy_Piemont_Cuneo Description":"Cuneo, Verduno, Bergolo",
 "Italy_Piemont_Novara Description":"Novara, Borgomanero, Trecate",
 "Italy_Piemont_Torino Description":"Turin, Moncalieri, Rivoli",
@@ -1862,8 +1862,8 @@
 "Italy_Sardinia Description":"Sassari",
 "Italy_Sicily Description":"Palermo, Catania, Messina",
 "Italy_Trentino-Alto Adige Sudtirol Description":"Trento, Bolzano, Rovereto",
-"Italy_Tuscany_Grosseto Description":"Arezzo, Monteriggioni, Grosseto",
-"Italy_Tuscany_Massa e Carrara Description":"Lucca",
+"Italy_Tuscany_Grosseto Description":"Arezzo, Grosseto, Siena",
+"Italy_Tuscany_Massa e Carrara Description":"Florence, Livorno, Lucca, Pisa, Prato, Pistoia, Carrara, Massa",
 "Italy_Umbria Description":"Perugia, Terni, Foligno",
 "Italy_Veneto_Belluno Description":"Belluno, Feltre, Sedico",
 "Italy_Veneto_Padova Description":"Padua, Cittadella, Selvazzano Dentro",
@@ -1975,9 +1975,9 @@
 "Nagorno-Karabakh Description":"Xankəndi, Şuşa, Laçın",
 "Namibia Description":"Windhoek",
 "Nauru Description":"Yaren, Buada, Orro",
-"Nepal_Kathmandu Description":"Katmandu, Katmandu",
+"Nepal_Kathmandu Description":"Kathmandu, Patan",
 "Nepal_Madhyamanchal Description":"Bharatpur, Birganj",
-"Nepal_Purwanchal Description":"sarang pada, campa bazzar, Kerkha bajar",
+"Nepal_Purwanchal Description":"Sarang Pada, Campa Bazzar, Kerkha Bazar",
 "Nepal_West Description":"Butwal, Pokhara, Nepalgunj Sub Metropolitan City",
 "Netherlands_Drenthe Description":"Assen, Emmen, Hoogeveen",
 "Netherlands_Flevoland Description":"Almere, Lelystad, Dronten",
@@ -2079,8 +2079,8 @@
 "Russia_Astrakhan Oblast Description":"Asztrahán",
 "Russia_Bashkortostan Description":"Ufa",
 "Russia_Belgorod Oblast Description":"Belgorod, Sztarij Oszkol, Gubkin",
-"Russia_Bryansk Oblast Description":"Brjanszk",
-"Russia_Buryatia Description":"Ulan-Ude, Selenduma, Джида",
+"Russia_Bryansk Oblast Description":"Bryansk, Novozybkov, Klintsy",
+"Russia_Buryatia Description":"Ulan-Ude, Selenduma, Dzhida",
 "Russia_Chechen Republic Description":"Grozny, Urus-Martan, Shali",
 "Russia_Chelyabinsk Oblast Description":"Cseljabinszk",
 "Russia_Chukotka Autonomous Okrug Description":"Anadyr, Bilibino, Pevek",
@@ -2088,7 +2088,7 @@
 "Russia_Ingushetia Description":"Nazran, Ordzhonikidzevskaya, Karabulak",
 "Russia_Irkutsk Oblast Description":"Irkutszk",
 "Russia_Ivanovo Oblast Description":"Ivanovo",
-"Russia_Jewish Autonomous Oblast Description":"Birobidzsan",
+"Russia_Jewish Autonomous Oblast Description":"Birobidzhan, Obluchye, Nikolayevka",
 "Russia_Kabardino-Balkaria Description":"Nalcsik",
 "Russia_Kaliningrad Oblast Description":"Kalinyingrád",
 "Russia_Kaluga Oblast Description":"Kaluga",
@@ -2102,9 +2102,9 @@
 "Russia_Kostroma Oblast Description":"Kosztroma",
 "Russia_Krasnodar Krai Description":"Krasznodar",
 "Russia_Krasnodar Krai_Adygeya Description":"Szocsi, Majkop",
-"Russia_Krasnoyarsk Krai_North Description":"Norilsk, Dudinka, Северо-Енисейский",
+"Russia_Krasnoyarsk Krai_North Description":"Norilsk, Dudinka, Severo-Yeniseyskiy",
 "Russia_Krasnoyarsk Krai_South Description":"Krasznojarszk",
-"Russia_Kurgan Oblast Description":"Kurgan",
+"Russia_Kurgan Oblast Description":"Kurgan, Shadrinsk, Vargashi",
 "Russia_Kursk Oblast Description":"Kurszk",
 "Russia_Leningradskaya Oblast_Karelsky Description":"Vyborg, Vsevolozhsk, Sertolovo",
 "Russia_Leningradskaya Oblast_Southeast Description":"Gatchina, Sosnoviy Bor, Tikhvin",
@@ -2120,7 +2120,7 @@
 "Russia_North Ossetia-Alania Description":"Vladikavkaz, Mozdok, Beslan",
 "Russia_Novgorod Oblast Description":"Velikij Novgorod",
 "Russia_Novosibirsk Oblast Description":"Novosibirsk, Berdsk, Iskitim",
-"Russia_Omsk Oblast Description":"Omsk, Tara, Исилькуль",
+"Russia_Omsk Oblast Description":"Omsk, Tara, Isilkul",
 "Russia_Orenburg Oblast Description":"Orenburg",
 "Russia_Oryol Oblast Description":"Orjol",
 "Russia_Penza Oblast Description":"Penza",
@@ -2140,7 +2140,7 @@
 "Russia_Sakhalin Oblast Description":"Yuzhno-Sakhalinsk, Korsakov, Kholmsk",
 "Russia_Samara Oblast Description":"Szamara, Togliatti",
 "Russia_Saratov Oblast Description":"Szaratov",
-"Russia_Smolensk Oblast Description":"Szmolenszk",
+"Russia_Smolensk Oblast Description":"Szmolenszk, Vyazma, Roslavl",
 "Russia_Stavropol Krai Description":"Stravlopol",
 "Russia_Sverdlovsk Oblast_Ekaterinburg Description":"Jekatyerinburg",
 "Russia_Sverdlovsk Oblast_North Description":"Nizhny Tagil, Serov, Novouralsk",
@@ -2300,7 +2300,7 @@
 "US_Alabama_Montgomery Description":"Creola, Centreville, Valley",
 "US_Alaska Description":"Scammon Bay, McGrath, Fort Wainright",
 "US_Arizona_Flagstaff Description":"Cottonwood, Holbrook, Show Low",
-"US_Arizona_Phoenix Description":"Phoenix, Mesa, Mesa",
+"US_Arizona_Phoenix Description":"Phoenix, Mesa",
 "US_Arizona_Tucson Description":"Tucson, South Tucson, Bisbee",
 "US_Arkansas_North Description":"Ward, Cabot, Des Arc",
 "US_Arkansas_South Description":"Stamps, Rockport",
@@ -2330,7 +2330,7 @@
 "US_Georgia_Macon Description":"Grovetown, Perry, Byron",
 "US_Georgia_North Description":"Emerson, Jefferson, Cartersville",
 "US_Georgia_South Description":"De Soto, Santa Claus, Pearson",
-"US_Guam Description":"Dededo Flea (Market), Tumon Golf Driving Range, San José",
+"US_Guam Description":"Dededo Flea Market, Tumon Golf Driving Range, San José",
 "US_Hawaii Description":"Hilo, Kailua-Kona, Kahului",
 "US_Idaho_North Description":"Huetter, Peck, Hayden",
 "US_Idaho_South Description":"Arco, Middleton, Greenleaf",
@@ -2470,7 +2470,7 @@
 "Ukraine_Rivne Oblast Description":"Rivne, Varash (Kuznetsovsk), Dubno",
 "Ukraine_Sumy Oblast Description":"Szumi, Konotop, Sosztka",
 "Ukraine_Ternopil Oblast Description":"Ternopil",
-"Ukraine_Vinnytsia Oblast Description":"Vinnicja, Zhmerynka",
+"Ukraine_Vinnytsia Oblast Description":"Vinnytsia, Voroshylivka, Zhmerynka",
 "Ukraine_Volyn Oblast Description":"Luck, Kovel, Novovolinszk",
 "Ukraine_Zakarpattia Oblast Description":"Ungvár, Munkács, Huszt",
 "Ukraine_Zaporizhia Oblast Description":"Zaporizzsja, Melitopol, Bergyanszk",
@@ -2484,7 +2484,7 @@
 "Venezuela_South Description":"Maracaibo, Ciudad Guayana, San Cristóbal",
 "Vietnam Description":"Ho Si Minh-város",
 "Wallis and Futuna Description":"Mata-Utu, Fiua, Tavai",
-"Yemen Description":"Szanaa",
+"Yemen Description":"Sana'a, Aden",
 "Zambia Description":"Lusaka",
 "Zimbabwe Description":"Harare",
 "United States of America Short":"USA",
diff --git a/data/countries-strings/nl.json/localize.json b/data/countries-strings/nl.json/localize.json
index aad117a59..8cbd92c21 100644
--- a/data/countries-strings/nl.json/localize.json
+++ b/data/countries-strings/nl.json/localize.json
@@ -1010,10 +1010,10 @@
 "UK_England_North West England":"North West England",
 "UK_England_South East_Brighton":"South East England — Brighton",
 "UK_England_South East_Oxford":"South East England — Oxford",
-"UK_England_South West England_Bristol":"South West England — Bristol",
-"UK_England_South West England_Cornwall":"South West England — Cornwall",
+"UK_England_South West England_Bristol":"Zuidwest Engeland — Bristol",
+"UK_England_South West England_Cornwall":"Zuidwest Engeland — Cornwall",
 "UK_England_West Midlands":"West Midlands",
-"UK_England_Yorkshire and the Humber":"Yorkshire and the Humber",
+"UK_England_Yorkshire and the Humber":"Yorkshire en de Humber",
 "UK_Northern Ireland":"Noord-Ierland",
 "UK_Scotland_North":"Noord-Schotland",
 "UK_Scotland_South":"Zuid-Schotland",
diff --git a/data/sound-strings/nl.json/localize.json b/data/sound-strings/nl.json/localize.json
index ba86d292e..927c0ccac 100644
--- a/data/sound-strings/nl.json/localize.json
+++ b/data/sound-strings/nl.json/localize.json
@@ -1,9 +1,8 @@
 {
 "make_a_slight_right_turn":"Rechts aanhouden.",
-"make_a_slight_right_turn_street":"de flauwe bocht naar rechts",
-"make_a_slight_right_turn_street_verb":"Neem",
+"make_a_slight_right_turn_street":"flauwe bocht naar rechts",
 "make_a_right_turn":"Sla rechtsaf.",
-"make_a_right_turn_street":"naar rechts afslaan",
+"make_a_right_turn_street":"Sla rechtsaf",
 "make_a_sharp_right_turn":"Scherp rechtsaf.",
 "make_a_sharp_right_turn_street":"scherp naar rechts afslaan",
 "enter_the_roundabout":"Rij de rotonde op.",
@@ -104,5 +103,6 @@
 "in_1_mile":"Over één mijl",
 "in_1_5_miles":"Over anderhalve mijl",
 "in_2_miles":"Over twee mijl",
-"unknown_camera":"Camera in zicht"
+"unknown_camera":"Camera in zicht",
+"make_a_slight_right_turn_street_verb":"NULL"
 }
diff --git a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
index 0a4dd6d9f..63adf2897 100644
--- a/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/de.lproj/LocalizableTypes.strings
@@ -65,7 +65,7 @@
 "type.amenity.fast_food" = "Fast-Food";
 "type.amenity.ferry_terminal" = "Fähranleger";
 "type.amenity.fire_station" = "Feuerwehr";
-"type.amenity.food_court" = "Food Court";
+"type.amenity.food_court" = "Gastronomiebereich";
 "type.amenity.fountain" = "Springbrunnen";
 "type.amenity.fuel" = "Tankstelle";
 
@@ -791,7 +791,7 @@
 "type.natural.water.lake" = "See";
 "type.natural.water.lock" = "Schleusenkammer";
 "type.natural.water.pond" = "Teich";
-"type.natural.water.reservoir" = "Reservoir";
+"type.natural.water.reservoir" = "Stausee";
 "type.natural.water.basin" = "Wasserbecken";
 "type.natural.water.river" = "Fluss";
 "type.natural.land" = "Land";
@@ -1334,7 +1334,7 @@
 "type.sport.tennis" = "Tennisplatz";
 "type.sport.volleyball" = "Volleyball";
 "type.sport.10pin" = "Bowling";
-"type.sport.9pin" = "Bowling";
+"type.sport.9pin" = "Kegeln";
 "type.sport.padel" = "Padel";
 "type.sport.futsal" = "Futsal";
 "type.sport.ice_hockey" = "Eishockey";
@@ -1381,7 +1381,7 @@
 "type.tourism.motel" = "Motel";
 "type.tourism.museum" = "Museum";
 "type.tourism.picnic_site" = "Picknickplatz";
-"type.leisure.resort" = "Resort";
+"type.leisure.resort" = "Freizeitanlage";
 "type.tourism.theme_park" = "Freizeitpark";
 "type.tourism.viewpoint" = "Aussichtspunkt";
 
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
index e55c411be..9052ff3e2 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/Localizable.strings
@@ -527,7 +527,7 @@
 "closed_now" = "Cerrado ahora";
 
 /* Place Page opening hours text */
-"daily" = "Diario";
+"daily" = "Diariamente";
 "twentyfour_seven" = "24/7";
 "day_off_today" = "Cerrado hoy";
 "day_off" = "Cerrado";
@@ -717,7 +717,7 @@
 "accept" = "Aceptar";
 
 /* For the first routing */
-"decline" = "Declinar";
+"decline" = "Rechazar";
 "mobile_data_dialog" = "¿Usar Internet móvil para mostrar información detallada?";
 "mobile_data_option_always" = "Usar siempre";
 "mobile_data_option_today" = "Sólo hoy";
diff --git a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
index e16cd3297..9b6dfa5e6 100644
--- a/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/es.lproj/LocalizableTypes.strings
@@ -665,7 +665,7 @@
 "type.landuse.farmland" = "Tierras agrícolas";
 "type.landuse.farmyard" = "Granja";
 "type.landuse.field" = "Campo";
-"type.landuse.flowerbed" = "Cama de flores";
+"type.landuse.flowerbed" = "Parterre";
 "type.landuse.forest" = "Bosque";
 "type.landuse.forest.coniferous" = "Bosque de coníferas";
 "type.landuse.forest.deciduous" = "Bosque caducifolio";
@@ -1482,5 +1482,5 @@
 "type.amenity.luggage_locker" = "Casillero de maletas";
 "type.amenity.ranger_station" = "Estación de guardabosques";
 "type.amenity.bicycle_parking.covered" = "Parking de bici cubierto";
-"type.amenity.animal_shelter" = "Animal Shelter";
+"type.amenity.animal_shelter" = "Refugio de animales";
 "type.barrier.wicket_gate" = "Wicket gate";
diff --git a/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings
index 65f28f709..8eaaaa33a 100644
--- a/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/et.lproj/LocalizableTypes.strings
@@ -305,10 +305,10 @@
 "type.cuisine.georgian" = "Gruusia";
 "type.cuisine.german" = "Saksa";
 "type.cuisine.greek" = "Kreeka";
-"type.cuisine.grill" = "Grill";
+"type.cuisine.grill" = "Grillroad";
 "type.cuisine.heuriger" = "Austria hooajaline veinikõrts (heuriger)";
 "type.cuisine.hotdog" = "Viinersai";
-"type.cuisine.hungarian" = "Ungari";
+"type.cuisine.hungarian" = "Ungari köök";
 "type.cuisine.ice_cream" = "Jäätis";
 "type.cuisine.indian" = "India";
 "type.cuisine.indonesian" = "Indoneesia";
@@ -330,7 +330,7 @@
 "type.cuisine.noodles" = "Nuudliroad";
 "type.cuisine.oriental" = "Kaug-Ida";
 "type.cuisine.pancake" = "Pannkoogid";
-"type.cuisine.pasta" = "Pasta";
+"type.cuisine.pasta" = "Pastaroad";
 "type.cuisine.persian" = "Pärsia";
 "type.cuisine.peruvian" = "Peruu köök";
 "type.cuisine.pizza" = "Pitsa";
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index 2c0c5f11b..07c6f9663 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -87,7 +87,7 @@
 "measurement_units" = "Unités de mesure";
 
 /* Search category for cafes, bars, restaurants; any changes should be duplicated in categories.txt @category_eat! */
-"category_eat" = "Un endroit pour manger";
+"category_eat" = "Où manger";
 
 /* Search category for grocery stores; any changes should be duplicated in categories.txt @category_food! */
 "category_food" = "Épiceries";
@@ -172,7 +172,7 @@
 "unknown_current_position" = "Votre position n'a pas encore été déterminée";
 
 /* Subject for emailed bookmark */
-"bookmark_share_email_subject" = "Hé, regardez mon signet sur la carte CoMaps !";
+"bookmark_share_email_subject" = "Hé, regardez ce lieu dans CoMaps !";
 
 /* Subject for emailed position */
 "my_position_share_email_subject" = "Hé, regardez ma position actuelle sur la carte CoMaps !";
@@ -250,7 +250,7 @@
 "pref_tts_street_names_description" = "Quand activé, le nom de la rue ou de la sortie à prendre sera prononcé à haute voix.";
 
 /* Settings «Route» category: «Tts language» title */
-"pref_tts_language_title" = "Langue vocale";
+"pref_tts_language_title" = "Langue des annonces vocales";
 
 /* Settings «Route» category: «Test Voice Directions» title */
 "pref_tts_test_voice_title" = "Tester les instructions vocales";
@@ -262,7 +262,7 @@
 "search_show_on_map" = "Voir sur la carte";
 
 /* Text in menu */
-"website" = "Site internet";
+"website" = "Site web";
 
 /* Text in About menu, opens CoMaps news website */
 "news" = "Nouvelles";
@@ -325,7 +325,7 @@
 "report_incorrect_map_bug" = "Signaler ou corriger des données cartographiques incorrectes";
 
 /* Button in the About screen */
-"volunteer" = "Se porter volontaire";
+"volunteer" = "Contribuer à CoMaps";
 
 /* "Social media" section header in the About screen */
 "follow_us" = "Rentrez en contact avec nous";
@@ -441,10 +441,10 @@
 /* blue gray color */
 "blue_gray" = "Gris-bleu";
 "dialog_routing_disclaimer_title" = "Lorsque vous suivez l'itinéraire, gardez à l'esprit les points suivants :";
-"dialog_routing_disclaimer_priority" = "— Les conditions de circulation, le code de la route et les panneaux de signalisation ont la priorité sur l'appareil de navigation ;";
-"dialog_routing_disclaimer_precision" = "— La carte peut être imprécise et l'itinéraire proposé n'est pas forcément le plus direct pour arriver à destination ;";
+"dialog_routing_disclaimer_priority" = "— Les conditions de circulation, le code de la route et les panneaux de signalisation ont la priorité sur les conseils de navigation ;";
+"dialog_routing_disclaimer_precision" = "— La carte peut être erronée et l'itinéraire proposé n'est pas forcément optimal pour arriver à destination ;";
 "dialog_routing_disclaimer_recommendations" = "— L'itinéraire proposé doit être considéré comme une simple recommandation ;";
-"dialog_routing_disclaimer_borders" = "— Faites attention aux itinéraires traversant des zones frontalières : les itinéraires générés par l'application peuvent parfois franchir des frontières étatiques dans des zones interdites ;";
+"dialog_routing_disclaimer_borders" = "— Soyez vigilants à proximité des zones frontalières : les itinéraires générés par l'application peuvent parfois franchir les frontières entre états dans des zones interdites ;";
 "dialog_routing_disclaimer_beware" = "Restez vigilants et soyez prudents sur la route !";
 "dialog_routing_check_gps" = "Vérifiez le signal GPS";
 "dialog_routing_error_location_not_found" = "Impossible de créer l'itinéraire. Les coordonnées GPS actuelles n'ont pas pu être déterminées.";
@@ -467,7 +467,7 @@
 "dialog_routing_application_error" = "Impossible de créer l'itinéraire à cause d'une erreur dans l'application.";
 "dialog_routing_try_again" = "Veuillez réessayer";
 "dialog_routing_download_and_build_cross_route" = "Voulez-vous télécharger la carte et créer un itinéraire plus direct s'étendant sur plus d'une carte ?";
-"dialog_routing_download_cross_route" = "Téléchargez des cartes supplémentaires pour créer un itinéraire plus direct sortant des limites de cette carte.";
+"dialog_routing_download_cross_route" = "Téléchargez des cartes supplémentaires pour calculer un meilleur itinéraire sortant des limites de la carte courante.";
 
 /* «Show» context menu */
 "show" = "Afficher";
@@ -683,7 +683,7 @@
 "editor_edits_sent_message" = "Ta note sera envoyée à OpenStreetMap";
 "editor_comment_hint" = "Commentaire…";
 "editor_reset_edits_message" = "Abandonner toutes les modifications locales ?";
-"editor_reset_edits_button" = "Réinitialiser";
+"editor_reset_edits_button" = "Ignorer";
 "editor_remove_place_message" = "Supprimer le lieu ajouté ?";
 "editor_remove_place_button" = "Supprimer";
 "editor_place_doesnt_exist" = "Ce lieu n'existe pas";
@@ -692,7 +692,7 @@
 /* Phone number error message */
 "error_enter_correct_phone" = "Saisissez un numéro de téléphone valide";
 "error_enter_correct_web" = "Saisissez une adresse Internet valide";
-"error_enter_correct_email" = "Saisissez un email valide";
+"error_enter_correct_email" = "Saisissez une adresse de courriel valide";
 "refresh" = "Mettre à jour";
 "placepage_add_place_button" = "Ajouter un lieu sur OpenStreetMap";
 
@@ -1088,12 +1088,12 @@
 
 /* Message for the toast when saving the track recording is finished but nothing to save. */
 "track_recording_toast_nothing_to_save" = "L'itinéraire est vide - il n'y a rien à sauvegarder";
-"edit_track" = "Modifier le trace";
+"edit_track" = "Modifier la trace";
 "osm_profile_view_notes" = "Afficher les notes";
 "osm_profile_view_edit_history" = "Afficher l'historique des modifications";
 "pref_mapappearance_title" = "Apparence de la carte";
 "pref_maplanguage_title" = "Langue de la carte";
 "transliteration_title_disabled_summary" = "Désactivé lorsque la langue locale est toujours utilisée pour la carte";
 "pref_maplanguage_local" = "Langue locale";
-"existence_confirmed_time_ago" = "Existence confirmed %@";
-"hours_confirmed_time_ago" = "Confirmed %@";
+"existence_confirmed_time_ago" = "Existance confirmée %@";
+"hours_confirmed_time_ago" = "Confirmées %@";
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings
index d2ee5d93a..1041976bc 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/LocalizableTypes.strings
@@ -209,7 +209,7 @@
 "type.barrier.retaining_wall" = "Mur de soutènement";
 "type.barrier.stile" = "Échalier";
 "type.barrier.turnstile" = "Tourniquet";
-"type.barrier.swing_gate" = "Barrière tournante";
+"type.barrier.swing_gate" = "Portail Battant";
 "type.barrier.toll_booth" = "Poste de péage";
 "type.barrier.wall" = "Mur";
 "type.boundary" = "Frontière";
@@ -1482,5 +1482,5 @@
 "type.post_office.post_partner" = "Partenaire de publication";
 "type.amenity.ranger_station" = "Poste de garde forestier";
 "type.amenity.bicycle_parking.covered" = "Parking vélo couvert";
-"type.amenity.animal_shelter" = "Animal Shelter";
-"type.barrier.wicket_gate" = "Wicket gate";
+"type.amenity.animal_shelter" = "Abri pour animaux";
+"type.barrier.wicket_gate" = "Portillon";
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/hu.lproj/InfoPlist.strings
index 2b692a720..4e3403e29 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/InfoPlist.strings
@@ -9,7 +9,7 @@
 "route" = "Útvonal";
 
 /* Needed to explain why we always require access to GPS coordinates, and not only when the app is active. */
-"NSLocationAlwaysUsageDescription" = "A helymeghatározás a háttérben szükséges ahhoz, hogy teljes mértékben élvezhesse az alkalmazás funkcióit. A navigációhoz és a nemrég megtett útvonal mentéséhez használatos.";
+"NSLocationAlwaysUsageDescription" = "A háttérben történő helymeghatározás szükséges ahhoz, hogy teljes mértékben élvezhesse az alkalmazás funkcióit. A navigációhoz és a nemrég megtett útvonal mentéséhez használatos.";
 
 /* Needed to explain why we require access to GPS coordinates when the app is active. */
-"NSLocationWhenInUseUsageDescription" = "A navigációhoz és a legutóbb megtett útvonal mentéséhez szükséges a helymeghatározás.";
+"NSLocationWhenInUseUsageDescription" = "A helymeghatározás a navigációhoz és a legutóbb megtett útvonal mentéséhez szükséges.";
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index 436034d96..d7d1d099e 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -479,10 +479,10 @@
 "dialog_routing_download_and_update_maps" = "Töltse le és frissítse az összes térképet a tervezett útvonal mentén az útvonal kiszámításához.";
 "categories" = "Kategóriák";
 "history" = "Előzmények";
-"search_not_found" = "Nincs eredmény.";
+"search_not_found" = "Hoppá, nincs találat.";
 
 /* The message when user did not find anything in the search. */
-"search_not_found_query" = "Töltse le a keresett régiót, vagy próbálja meg hozzáadni egy közeli város vagy település nevét.";
+"search_not_found_query" = "Töltse le a keresett régiót, vagy próbálja meg egy közeli város vagy település nevét hozzáadni.";
 "search_history_title" = "Keresési előzmények";
 "search_history_text" = "Legutóbbi keresések megtekintése.";
 "clear_search" = "A keresési előzmények törlése";
@@ -496,7 +496,7 @@
 "p2p_start" = "Indítás";
 "p2p_from_here" = "Kiindulópont";
 "p2p_to_here" = "Célpont";
-"p2p_only_from_current" = "A navigáció csak a jelenlegi tartózkodási helyétől érhető el.";
+"p2p_only_from_current" = "Navigáció csak a jelenlegi tartózkodási helyétől indítható.";
 "p2p_reroute_from_current" = "Szeretne útvonalat tervezni a jelenlegi tartózkodási helyétől?";
 "editor_time_add" = "Ütemterv hozzáadása";
 "editor_time_delete" = "Ütemterv törlése";
@@ -518,7 +518,7 @@
 "autodownload" = "Automatikus térképletöltés";
 
 /* Place Page opening hours text */
-"closed_now" = "Most zárva";
+"closed_now" = "Most zárva van";
 
 /* Place Page opening hours text */
 "daily" = "Naponta";
@@ -543,7 +543,7 @@
 
 /* OpenStreetMap Profile */
 "osm_profile" = "OpenStreetMap profil";
-"osm_profile_promt" = "Hozzon létre egy fiókot az OpenStreetMapen, vagy jelentkezzen be, hogy közzétehesse térképszerkesztéseit a világ számára.";
+"osm_profile_promt" = "Hozzon létre egy OpenStreetMap-fiókot, vagy jelentkezzen be, hogy a világ számára közzétehesse az Ön térképszerkesztéseit.";
 "osm_profile_explanation" = "Az [OpenStreetMap.org](https://openstreetmap.org) (OSM) egy közösségi projekt, amelynek célja egy ingyenes és nyílt térkép létrehozása. Ez az CoMaps alkalmazás térképadatainak fő forrása, és a Wikipédiához hasonlóan működik. Helyeket adhat hozzá vagy szerkeszthet, és azok világszerte felhasználók milliói számára válnak elérhetővé. \nCsatlakozzon a közösséghez, és segítsen egy jobb térképet készíteni mindenki számára!";
 "osm_profile_login" = "Bejelentkezés az OpenStreetMap fiókba";
 "osm_profile_reauthorize_promt" = "Az OpenStreetMap fiókot leválasztották erről az alkalmazásról";
@@ -580,11 +580,11 @@
 "phone" = "Telefonszám";
 "level" = "Szint";
 "please_note" = "Megjegyzés";
-"downloader_delete_map_dialog" = "Az összes térképszerkesztés törlődik a térképpel együtt.";
+"downloader_delete_map_dialog" = "A térképpel együtt az Ön összes térképszerkesztése törlődik.";
 "downloader_update_maps" = "Térképek frissítése";
 "downloader_search_field_hint" = "Térkép keresése";
 "migration_download_error_dialog" = "Letöltési hiba";
-"common_check_internet_connection_dialog" = "Győződjön meg arról, hogy az eszköz csatlakozik az internethez.";
+"common_check_internet_connection_dialog" = "Győződjön meg arról, hogy az Ön készüléke csatlakozik az internethez.";
 "downloader_no_space_title" = "Nincs elegendő tárhely";
 "downloader_no_space_message" = "Törölje a felesleges adatokat";
 "editor_profile_changes" = "Jóváhagyott módosítások";
@@ -1091,5 +1091,5 @@
 "pref_maplanguage_title" = "A térkép nyelve";
 "transliteration_title_disabled_summary" = "Letiltva, ha mindig a helyi nyelvet használja a térképen";
 "pref_maplanguage_local" = "A helyi nyelv";
-"existence_confirmed_time_ago" = "A létezés megerősítve %@";
-"hours_confirmed_time_ago" = "Megerősítve %@";
+"existence_confirmed_time_ago" = "A létezése ellenőrizve és megerősítve %@";
+"hours_confirmed_time_ago" = "Ellenőrizve és megerősítve %@";
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings
index 7d839b226..f65429223 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/LocalizableTypes.strings
@@ -937,7 +937,7 @@
 "type.railway.station.light_rail" = "HÉV-állomás";
 "type.railway.station.light_rail.berlin" = "S-Bahn-állomás";
 "type.railway.station.light_rail.london" = "DLR-állomás";
-"type.railway.station.light_rail.porto" = "Porto Metro";
+"type.railway.station.light_rail.porto" = "Portói metró";
 "type.railway.station.monorail" = "Egysínűvasút-állomás";
 "type.railway.station.subway" = "Metróállomás";
 "type.railway.station.subway.adana" = "Metróállomás";
@@ -1447,7 +1447,7 @@
 "type.emergency.emergency_ward_entrance" = "Sürgősségi kórterem bejárata";
 
 /* https://wiki.openstreetmap.org/wiki/Tag:amenity=dojo */
-"type.amenity.dojo" = "Dodzso";
+"type.amenity.dojo" = "Dodzsó";
 
 /* https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall */
 "type.leisure.sports_hall" = "Sportcsarnok";
@@ -1478,5 +1478,5 @@
 "type.amenity.ranger_station" = "Erdészház";
 "type.amenity.bicycle_parking.covered" = "Fedett kerékpártároló";
 "type.post_office.post_partner" = "Posta partner";
-"type.barrier.wicket_gate" = "Útelzáró sorompó";
+"type.barrier.wicket_gate" = "Kiskapu";
 "type.amenity.animal_shelter" = "Állatmenhely";
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index 49048a4de..6f3c12a10 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -325,7 +325,7 @@
 "report_incorrect_map_bug" = "Relatar ou corrigir dados incorretos do mapa";
 
 /* Button in the About screen */
-"volunteer" = "Voluntarie-se";
+"volunteer" = "Voluntarie-se e melhore o CoMaps";
 
 /* "Social media" section header in the About screen */
 "follow_us" = "Conecte-se conosco";
@@ -1095,5 +1095,5 @@
 "pref_maplanguage_title" = "Idioma do mapa";
 "transliteration_title_disabled_summary" = "Desativado quando sempre se utiliza o idioma local para o mapa";
 "pref_maplanguage_local" = "Idioma local";
-"existence_confirmed_time_ago" = "Existence confirmed %@";
-"hours_confirmed_time_ago" = "Confirmed %@";
+"existence_confirmed_time_ago" = "Existência confirmada %@";
+"hours_confirmed_time_ago" = "Confirmado %@";
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
index afcf164fe..672ab88ac 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/Localizable.strings
@@ -1093,5 +1093,5 @@
 "pref_maplanguage_title" = "Idioma do Mapa";
 "transliteration_title_disabled_summary" = "Desativado ao usar sempre o idioma local do mapa";
 "pref_maplanguage_local" = "Idioma Local";
-"hours_confirmed_time_ago" = "Confirmed %@";
-"existence_confirmed_time_ago" = "Existence confirmed %@";
+"hours_confirmed_time_ago" = "Confirmada %@";
+"existence_confirmed_time_ago" = "Existência confirmada %@";
diff --git a/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings
index d11331a40..ae202f462 100644
--- a/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/pt.lproj/LocalizableTypes.strings
@@ -1483,4 +1483,4 @@
 "type.amenity.bicycle_parking.covered" = "Estacionamento de Bicicletas Coberto";
 "type.post_office.post_partner" = "Parceiro Postal";
 "type.barrier.wicket_gate" = "Postigo";
-"type.amenity.animal_shelter" = "Animal Shelter";
+"type.amenity.animal_shelter" = "Abrigo Animal";
diff --git a/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings
index 5bf94e839..c99571de0 100644
--- a/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/sr.lproj/Localizable.strings
@@ -322,7 +322,7 @@
 "report_incorrect_map_bug" = "Пријавите или поправите нетачне податке на мапи";
 
 /* Button in the About screen */
-"volunteer" = "Волонтирајте";
+"volunteer" = "Волонтирајте и побољшајте CoMaps";
 
 /* "Social media" section header in the About screen */
 "follow_us" = "Повежите се с нама";
@@ -1094,4 +1094,4 @@
 "transliteration_title_disabled_summary" = "Онемогућено када увек користите локални језик за мапу";
 "pref_maplanguage_local" = "Локални језик";
 "existence_confirmed_time_ago" = "Existence confirmed %@";
-"hours_confirmed_time_ago" = "Confirmed %@";
+"hours_confirmed_time_ago" = "Потврђено %@";
diff --git a/iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings
index 04045e8f2..dca5daf26 100644
--- a/iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/sr.lproj/LocalizableTypes.strings
@@ -1482,5 +1482,5 @@
 "type.amenity.ranger_station" = "Станица за ренџер";
 "type.amenity.bicycle_parking.covered" = "Покривени паркинг за бицикле";
 "type.post_office.post_partner" = "Поштански партнер";
-"type.barrier.wicket_gate" = "Wicket gate";
-"type.amenity.animal_shelter" = "Animal Shelter";
+"type.barrier.wicket_gate" = "Вратница";
+"type.amenity.animal_shelter" = "Волонтирајте и побољшајте CoMaps";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
index acbab970b..277a1cd0c 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/Localizable.strings
@@ -217,7 +217,7 @@
 "pref_appearance_dark" = "深色";
 
 /* Generic «Disabled» string */
-"disabled" = "Disabled";
+"disabled" = "已禁用";
 
 /* Generic «Off» string */
 "off" = "关闭";
@@ -325,7 +325,7 @@
 "report_incorrect_map_bug" = "报告或修复不正确的地图数据";
 
 /* Button in the About screen */
-"volunteer" = "志愿者";
+"volunteer" = "志愿改进 CoMaps";
 
 /* "Social media" section header in the About screen */
 "follow_us" = "联系我们";
@@ -741,7 +741,7 @@
 "transliteration_title" = "拉丁字母音译";
 
 /* Subway exits for public transport marks on the map */
-"core_exit" = "退出";
+"core_exit" = "出口";
 
 /* User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". */
 "routing_add_start_point" = "请搜索地点或点击地图以添加路线起点";
@@ -1015,7 +1015,7 @@
 "bugreport_alert_message" = "您想向开发人员发送错误报告吗？\n由于 CoMaps 不会自动收集任何错误信息，因此我们只能依靠我们的用户。感谢您对 CoMaps 的支持！";
 
 /* Title for the iCloud syncronization setting */
-"icloud_sync" = "iCloud Syncronization (Beta)";
+"icloud_sync" = "iCloud 同步（Beta）";
 
 /* Title for the "Enable iCloud Syncronization" alert. */
 "enable_icloud_synchronization_title" = "启用 iCloud 同步";
@@ -1095,5 +1095,5 @@
 "pref_maplanguage_title" = "地图语言";
 "transliteration_title_disabled_summary" = "地图始终使用本地语言时禁用";
 "pref_maplanguage_local" = "本地语言";
-"existence_confirmed_time_ago" = "Existence confirmed %@";
-"hours_confirmed_time_ago" = "Confirmed %@";
+"existence_confirmed_time_ago" = "已于%@确认存在";
+"hours_confirmed_time_ago" = "已于%@确认";
diff --git a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings
index c5a7abfa6..b9da92e94 100644
--- a/iphone/Maps/LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/zh-Hans.lproj/LocalizableTypes.strings
@@ -1482,5 +1482,5 @@
 "type.amenity.ranger_station" = "护林站";
 "type.amenity.bicycle_parking.covered" = "有顶棚自行车停车处";
 "type.post_office.post_partner" = "邮政合作点";
-"type.barrier.wicket_gate" = "Wicket gate";
-"type.amenity.animal_shelter" = "Animal Shelter";
+"type.barrier.wicket_gate" = "旁门";
+"type.amenity.animal_shelter" = "动物收容所";

From 7a95d15bef8702f708c97bc76666727ce49001ec Mon Sep 17 00:00:00 2001
From: Harry Bond <me@hbond.xyz>
Date: Wed, 27 Aug 2025 09:51:04 +0100
Subject: [PATCH 263/302] [Drape] Adjust compass hidden angle to match removed
 screen angle snapping
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The screen snapping was removed a while ago (https://github.com/organicmaps/organicmaps/pull/8838) but the compass is still hidden within 5° of north.
This adjusts the angle to 0.1 degrees off north, which should be enough.
fixes #1097

Signed-off-by: Harry Bond <me@hbond.xyz>
---
 libs/drape_frontend/gui/compass.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libs/drape_frontend/gui/compass.cpp b/libs/drape_frontend/gui/compass.cpp
index 68e9f44ac..7e14afe3d 100644
--- a/libs/drape_frontend/gui/compass.cpp
+++ b/libs/drape_frontend/gui/compass.cpp
@@ -48,8 +48,9 @@ public:
 
   bool Update(ScreenBase const & screen) override
   {
-    static double const kVisibleStartAngle = math::DegToRad(5.0);
-    static double const kVisibleEndAngle = math::DegToRad(355.0);
+    static double const kVisibleTolerance = 0.1;
+    static double const kVisibleStartAngle = math::DegToRad(0.0 + kVisibleTolerance);
+    static double const kVisibleEndAngle = math::DegToRad(360.0 - kVisibleTolerance);
 
     auto const angle = static_cast<float>(ang::AngleIn2PI(screen.GetAngle()));
 

From eaeae8f31da8150118b528532a3763e4110a925d Mon Sep 17 00:00:00 2001
From: Matheus Gomes <matheus.gomes03@hotmail.com>
Date: Wed, 20 Aug 2025 20:57:20 +0200
Subject: [PATCH 264/302] [styles] Add pedestrian and square areas

Render areas with the combination of highway=pedestrian and place=square tags.

Signed-off-by: Matheus Gomes <matheusgomesms@noreply.codeberg.org>
---
 data/mapcss-mapping.csv                                       | 2 +-
 data/styles/default/include/Basemap.mapcss                    | 1 +
 data/styles/default/include/priorities_1_BG-by-size.prio.txt  | 1 +
 data/styles/default/include/priorities_3_FG.prio.txt          | 1 +
 data/styles/default/include/priorities_4_overlays.prio.txt    | 1 +
 data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt | 1 +
 data/styles/outdoors/include/priorities_3_FG.prio.txt         | 1 +
 data/styles/outdoors/include/priorities_4_overlays.prio.txt   | 1 +
 data/styles/vehicle/include/priorities_3_FG.prio.txt          | 1 +
 9 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index aafa9e027..f87d9f0c3 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -304,7 +304,7 @@ waterway|dam;200;
 amenity|charging_station|motorcar;[amenity=charging_station][motorcar?];;name;int_name;201;
 leisure|golf_course;202;
 highway|service|bridge;[highway=service][bridge?];;name;int_name;203;
-deprecated:power|minor_line:01.2017;204;x
+highway|pedestrian|square;[highway=pedestrian][place=square];;name;int_name;204;
 # Marsh 500K usages, wet_meadow 160K
 natural|wetland|marsh;[natural=wetland][wetland=marsh],[natural=wetland][wetland=wet_meadow],[natural=wetland][wetland=dambo];;;;205;
 leisure|stadium;206;
diff --git a/data/styles/default/include/Basemap.mapcss b/data/styles/default/include/Basemap.mapcss
index 1aba7acf3..436dccc31 100644
--- a/data/styles/default/include/Basemap.mapcss
+++ b/data/styles/default/include/Basemap.mapcss
@@ -487,6 +487,7 @@ area|z14-[amenity=grave_yard]
 
 area|z14-[highway=pedestrian][area?],
 area|z14-[area:highway=pedestrian],
+area|z14-[highway=pedestrian][place=square],
 area|z14-[highway=footway][area?],
 area|z14-[area:highway=footway],
 area|z14-[area:highway=living_street],
diff --git a/data/styles/default/include/priorities_1_BG-by-size.prio.txt b/data/styles/default/include/priorities_1_BG-by-size.prio.txt
index 568b7423f..430bd5262 100644
--- a/data/styles/default/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/default/include/priorities_1_BG-by-size.prio.txt
@@ -64,6 +64,7 @@ amenity-social_facility                             # area z15- (also has icon z
 amenity-vehicle_inspection                          # area z15- (also has icon z16-, caption(optional) z16-)
 emergency-mountain_rescue                           # area z13- (also has icon z16-, caption(optional) z16-)
 highway-pedestrian-area                             # area z14- (also has line z13-, pathtext z14-)
+highway-pedestrian-square                           # area z14- (also has line z13-, pathtext z14-)
 highway-rest_area                                   # area z13- (also has icon z15-, caption(optional) z15-)
 highway-services                                    # area z13- (also has icon z14-, caption(optional) z14-)
 landuse-garages                                     # area z13- (also has caption z15-)
diff --git a/data/styles/default/include/priorities_3_FG.prio.txt b/data/styles/default/include/priorities_3_FG.prio.txt
index 12ade7c81..afc1c32b9 100644
--- a/data/styles/default/include/priorities_3_FG.prio.txt
+++ b/data/styles/default/include/priorities_3_FG.prio.txt
@@ -266,6 +266,7 @@ highway-ford                                        # line z13- (also has icon z
 highway-pedestrian                                  # line z13- (also has pathtext z14-)
 highway-pedestrian-area                             # line z13- and area z14- (also has pathtext z14-)
 highway-pedestrian-bridge                           # line z13- (also has line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
+highway-pedestrian-square                           # line z13- and area z14- (also has pathtext z14-)
 highway-pedestrian-tunnel                           # line z13- (also has line(casing) z16-, pathtext z14-)
 === 200
 
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index ac66869ad..2c2526500 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -577,6 +577,7 @@ area:highway-pedestrian                             # caption z15- (also has are
 highway-pedestrian                                  # pathtext z14- (also has line z13-)
 highway-pedestrian-area                             # pathtext z14- (also has line z13-, area z14-)
 highway-pedestrian-bridge                           # pathtext z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-)
+highway-pedestrian-square                           # pathtext z14- (also has line z13-, area z14-)
 highway-pedestrian-tunnel                           # pathtext z14- (also has line z13-, line(casing) z16-)
 highway-tertiary                                    # pathtext z12- (also has shield::shield z13-, line z11-)
 highway-tertiary-bridge                             # pathtext z12- (also has shield::shield z13-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
diff --git a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
index 9e4f0b4df..e077879db 100644
--- a/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
+++ b/data/styles/outdoors/include/priorities_1_BG-by-size.prio.txt
@@ -64,6 +64,7 @@ amenity-social_facility                             # area z15- (also has icon z
 amenity-vehicle_inspection                          # area z15- (also has icon z16-, caption(optional) z16-)
 emergency-mountain_rescue                           # area z13- (also has icon z12-, caption(optional) z12-)
 highway-pedestrian-area                             # area z14- (also has line z13-, pathtext z14-)
+highway-pedestrian-square                           # area z14- (also has line z13-, pathtext z14-)
 highway-rest_area                                   # area z13- (also has icon z14-, caption(optional) z15-)
 highway-services                                    # area z13- (also has icon z14-, caption(optional) z14-)
 landuse-garages                                     # area z13- (also has caption z15-)
diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt
index c7720d1c9..153f71e3a 100644
--- a/data/styles/outdoors/include/priorities_3_FG.prio.txt
+++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt
@@ -268,6 +268,7 @@ highway-ford                                        # line z13- (also has icon z
 highway-pedestrian                                  # line z13- (also has pathtext z14-)
 highway-pedestrian-area                             # line z13- and area z14- (also has pathtext z14-)
 highway-pedestrian-bridge                           # line z13- (also has line::bridgeblack z14-, line::bridgewhite z13-, pathtext z14-)
+highway-pedestrian-square                           # line z13- and area z14- (also has pathtext z14-)
 highway-pedestrian-tunnel                           # line z13- (also has line(casing) z16-, pathtext z14-)
 === 200
 
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 183f516d1..02462b5df 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -577,6 +577,7 @@ area:highway-pedestrian                             # caption z15- (also has are
 highway-pedestrian                                  # pathtext z14- (also has line z13-)
 highway-pedestrian-area                             # pathtext z14- (also has line z13-, area z14-)
 highway-pedestrian-bridge                           # pathtext z14- (also has line z13-, line::bridgeblack z14-, line::bridgewhite z13-)
+highway-pedestrian-square                           # pathtext z14- (also has line z13-, area z14-)
 highway-pedestrian-tunnel                           # pathtext z14- (also has line z13-, line(casing) z16-)
 highway-tertiary                                    # pathtext z12- (also has shield::shield z13-, line z11-)
 highway-tertiary-bridge                             # pathtext z12- (also has shield::shield z13-, line z11-, line::bridgeblack z14-, line::bridgewhite z14-)
diff --git a/data/styles/vehicle/include/priorities_3_FG.prio.txt b/data/styles/vehicle/include/priorities_3_FG.prio.txt
index fdb565d1c..546d1f92c 100644
--- a/data/styles/vehicle/include/priorities_3_FG.prio.txt
+++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt
@@ -263,6 +263,7 @@ highway-path-horse                                  # line z17-
 highway-pedestrian                                  # line z18-
 highway-pedestrian-area                             # line z18-
 highway-pedestrian-bridge                           # line z18-
+highway-pedestrian-square                           # line z18-
 highway-track                                       # line z16-
 highway-track-area                                  # line z16-
 highway-track-bridge                                # line z16-

From a338a18590bf74f19bd20f9d782ea7e9b381b719 Mon Sep 17 00:00:00 2001
From: Harry Bond <me@hbond.xyz>
Date: Sat, 23 Aug 2025 18:13:57 +0100
Subject: [PATCH 265/302] [android] Explain why the TTS button doesn't work
 when no engine installed

Signed-off-by: Harry Bond <me@hbond.xyz>
---
 .../src/main/java/app/organicmaps/widget/menu/NavMenu.java    | 4 ++++
 android/app/src/main/res/values/strings.xml                   | 1 +
 .../src/main/java/app/organicmaps/sdk/sound/TtsPlayer.java    | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
index ac0fff620..8b781d660 100644
--- a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
+++ b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
@@ -3,6 +3,7 @@ package app.organicmaps.widget.menu;
 import android.location.Location;
 import android.util.Pair;
 import android.view.View;
+import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.ContextCompat;
@@ -10,6 +11,7 @@ import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.sdk.routing.RoutingInfo;
 import app.organicmaps.sdk.sound.TtsPlayer;
+import app.organicmaps.sdk.util.Config;
 import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.util.Graphics;
 import app.organicmaps.util.ThemeUtils;
@@ -125,6 +127,8 @@ public class NavMenu
 
   private void onTtsClicked()
   {
+    if (!TtsPlayer.isReady())
+      Toast.makeText(mActivity, R.string.pref_tts_no_system_tts_short, Toast.LENGTH_SHORT).show();
     TtsPlayer.setEnabled(!TtsPlayer.isEnabled());
     refreshTts();
   }
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index eba896155..a138b279e 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -941,4 +941,5 @@
     <!-- Title of the bottom sheet when sharing the track -->
     <string name="share_track">Share Track</string>
     <string name="delete_track_dialog_title">Delete %s?</string>
+    <string name="pref_tts_no_system_tts_short">No text-to-speech engine found, check the app settings</string>
 </resources>
diff --git a/android/sdk/src/main/java/app/organicmaps/sdk/sound/TtsPlayer.java b/android/sdk/src/main/java/app/organicmaps/sdk/sound/TtsPlayer.java
index 2be401958..1f4327de4 100644
--- a/android/sdk/src/main/java/app/organicmaps/sdk/sound/TtsPlayer.java
+++ b/android/sdk/src/main/java/app/organicmaps/sdk/sound/TtsPlayer.java
@@ -220,7 +220,7 @@ public enum TtsPlayer
     }
   }
 
-  private static boolean isReady()
+  public static boolean isReady()
   {
     return (INSTANCE.mTts != null && !INSTANCE.mUnavailable && !INSTANCE.mInitializing);
   }

From c9de67762c94e58f0f3304e00452fdbcdeb9232c Mon Sep 17 00:00:00 2001
From: Matheus Gomes <matheus.gomes03@hotmail.com>
Date: Wed, 27 Aug 2025 18:54:48 +0200
Subject: [PATCH 266/302] [iOS] Add yellow color opening in up to 15 min

Fixes #1631.

Signed-off-by: Matheus Gomes <matheusgomesms@noreply.codeberg.org>
---
 iphone/Maps/Core/Search/SearchResult.mm           | 13 ++++++++++---
 .../PlacePagePreviewViewController.swift          | 15 ++++++++++++---
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/iphone/Maps/Core/Search/SearchResult.mm b/iphone/Maps/Core/Search/SearchResult.mm
index 2702453de..64c656276 100644
--- a/iphone/Maps/Core/Search/SearchResult.mm
+++ b/iphone/Maps/Core/Search/SearchResult.mm
@@ -66,13 +66,20 @@
       }
       case osm::No: {
         const int minutes = result.GetMinutesUntilOpen();
-        if (minutes < 60) { // less than 1 hour
+        if (minutes < 15) { // less than 15 minutes
+          _openStatusColor = [UIColor colorNamed:@"Base Colors/Yellow Color"];
           NSString * time = [NSString stringWithFormat:@"%d %@", minutes, L(@"minute")];
           _openStatusText = [NSString stringWithFormat:L(@"opens_in"), time];
-        } else {
+        }
+        else if (minutes < 60) { // less than an hour (but more than 15 mins)
+          _openStatusColor = [UIColor colorNamed:@"Base Colors/Red Color"];
+          NSString * time = [NSString stringWithFormat:@"%d %@", minutes, L(@"minute")];
+          _openStatusText = [NSString stringWithFormat:L(@"opens_in"), time];
+        }
+        else { // opens later or schedule is unknown
+          _openStatusColor = [UIColor colorNamed:@"Base Colors/Red Color"];
           _openStatusText = L(@"closed");
         }
-        _openStatusColor = [UIColor colorNamed:@"Base Colors/Red Color"];
         break;
       }
       case osm::Unknown: {
diff --git a/iphone/Maps/UI/PlacePage/Components/PlacePagePreviewViewController.swift b/iphone/Maps/UI/PlacePage/Components/PlacePagePreviewViewController.swift
index 77a564457..66deed606 100644
--- a/iphone/Maps/UI/PlacePage/Components/PlacePagePreviewViewController.swift
+++ b/iphone/Maps/UI/PlacePage/Components/PlacePagePreviewViewController.swift
@@ -199,8 +199,17 @@ final class PlacePagePreviewViewController: UIViewController {
       let stringTimeInterval = getTimeIntervalString(minutes: minutesUntilOpen)
       let stringTime = stringFromTime(nextTimeOpen)
 
+      var state: String = L("closed_now")
+      var stateColor = UIColor.BaseColors.red
+      
       let details: String?
-      if (minutesUntilOpen < 3 * 60)  // Less than 3 hours
+
+      if (minutesUntilOpen < 15) { // Less than 15 min
+        state = String(format: L("opens_in"), stringTimeInterval)
+        stateColor = UIColor.BaseColors.yellow
+        details = stringTime
+      }
+      else if (minutesUntilOpen < 3 * 60)  // Less than 3 hours
       {
         details = String(format: L("opens_in"), stringTimeInterval) + " • " + stringTime
       }
@@ -222,8 +231,8 @@ final class PlacePagePreviewViewController: UIViewController {
         details = nil
       }
       
-      setScheduleLabel(state: L("closed_now"),
-                       stateColor: UIColor.BaseColors.red,
+      setScheduleLabel(state: state,
+                       stateColor: stateColor,
                        details: details)
       
     @unknown default:

From f84461bff8361847c4a0e6c1c589ce40bed79478 Mon Sep 17 00:00:00 2001
From: Yannik Bloscheck <git@yannikbloscheck.com>
Date: Sat, 23 Aug 2025 19:20:43 +0200
Subject: [PATCH 267/302] [ios] Stop overlap between last search results and
 home indicator

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
---
 .../Tabs/CategoriesTab/SearchCategoriesViewController.swift    | 2 ++
 .../Search/Tabs/HistoryTab/SearchHistoryViewController.swift   | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoriesViewController.swift b/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoriesViewController.swift
index 64c569526..3fc409e99 100644
--- a/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoriesViewController.swift
+++ b/iphone/Maps/UI/Search/Tabs/CategoriesTab/SearchCategoriesViewController.swift
@@ -23,6 +23,8 @@ final class SearchCategoriesViewController: MWMTableViewController {
     tableView.setStyle(.background)
     tableView.register(cell: SearchCategoryCell.self)
     tableView.keyboardDismissMode = .onDrag
+    let footerHeight = (UIApplication.shared.connectedScenes.filter { $0.activationState == .foregroundActive }.first(where: { $0 is UIWindowScene }) as? UIWindowScene)?.keyWindow?.safeAreaInsets.bottom ?? 1
+    tableView.tableFooterView = UIView(frame: CGRect(x: 0, y: 0, width: 400, height: footerHeight))
   }
 
   override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
diff --git a/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryViewController.swift b/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryViewController.swift
index 7283376d0..325b20a8d 100644
--- a/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryViewController.swift
+++ b/iphone/Maps/UI/Search/Tabs/HistoryTab/SearchHistoryViewController.swift
@@ -43,7 +43,8 @@ final class SearchHistoryViewController: MWMViewController {
     tableView.keyboardDismissMode = .onDrag
     tableView.delegate = self
     tableView.dataSource = self
-    tableView.tableFooterView = UIView(frame: CGRect(x: 0, y: 0, width: 400, height: 1))
+    let footerHeight = (UIApplication.shared.connectedScenes.filter { $0.activationState == .foregroundActive }.first(where: { $0 is UIWindowScene }) as? UIWindowScene)?.keyWindow?.safeAreaInsets.bottom ?? 1
+    tableView.tableFooterView = UIView(frame: CGRect(x: 0, y: 0, width: 400, height: footerHeight))
 
     view.addSubview(tableView)
     tableView.translatesAutoresizingMaskIntoConstraints = false

From b761a602467c976b660482f84725065448754fff Mon Sep 17 00:00:00 2001
From: Yannik Bloscheck <git@yannikbloscheck.com>
Date: Thu, 28 Aug 2025 14:28:03 +0200
Subject: [PATCH 268/302] [ios] Reduced turn style shadow in dark mode

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
---
 iphone/Maps/Core/Theme/MapStyleSheet.swift | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/iphone/Maps/Core/Theme/MapStyleSheet.swift b/iphone/Maps/Core/Theme/MapStyleSheet.swift
index 57ff96ee5..1bb4b98bc 100644
--- a/iphone/Maps/Core/Theme/MapStyleSheet.swift
+++ b/iphone/Maps/Core/Theme/MapStyleSheet.swift
@@ -92,13 +92,14 @@ extension MapStyleSheet: IStyleSheet {
         s.backgroundColor = colors.linkBlue
         s.cornerRadius = .buttonSmall
         s.shadowRadius = 2
-        s.shadowColor = colors.blackHintText
-        s.shadowOpacity = 1
+        s.shadowColor = colors.shadow
+        s.shadowOpacity = 0.2
         s.shadowOffset = CGSize(width: 0, height: 2)
       }
     case .mapSecondTurnView:
       return .addFrom(Self.mapFirstTurnView) { s in
         s.backgroundColor = colors.white
+        s.shadowColor = colors.blackPrimaryText
       }
     case .mapAutoupdateView:
       return .add { s in

From 718d0f726b9096f847d4fa2bda47b8fa3f996283 Mon Sep 17 00:00:00 2001
From: Henry Sternberg <henry@bluelightmaps.com>
Date: Sat, 23 Aug 2025 16:34:45 +0100
Subject: [PATCH 269/302] [routing] Support conditional routing

Signed-off-by: Henry Sternberg <henry@bluelightmaps.com>
---
 libs/routing/road_access_serialization.hpp    |   8 +-
 .../routing_tests/road_access_test.cpp        | 499 +++++++++---------
 2 files changed, 249 insertions(+), 258 deletions(-)

diff --git a/libs/routing/road_access_serialization.hpp b/libs/routing/road_access_serialization.hpp
index 38c59b184..abbeadeac 100644
--- a/libs/routing/road_access_serialization.hpp
+++ b/libs/routing/road_access_serialization.hpp
@@ -64,13 +64,7 @@ public:
     case Header::WithoutAccessConditional: DeserializeAccess(src, vehicleType, roadAccess); break;
     case Header::WithAccessConditional:
       DeserializeAccess(src, vehicleType, roadAccess);
-
-      /// @todo By VNG: WTF?
-      // access:conditional should be switch off for release 10.0 and probably for the next one.
-      // It means that they should be switch off for cross_mwm section generation and for runtime.
-      // To switch on access:conditional the line below should be uncommented.
-      // Also tests in routing/routing_tests/road_access_test.cpp should be uncommented.
-      // DeserializeAccessConditional(src, vehicleType, roadAccess);
+      DeserializeAccessConditional(src, vehicleType, roadAccess);
       break;
     }
   }
diff --git a/libs/routing/routing_tests/road_access_test.cpp b/libs/routing/routing_tests/road_access_test.cpp
index 629f8334f..622a61590 100644
--- a/libs/routing/routing_tests/road_access_test.cpp
+++ b/libs/routing/routing_tests/road_access_test.cpp
@@ -53,77 +53,77 @@ void FillRoadAccessBySample_2(RoadAccess & roadAccess)
   roadAccess.SetAccess(std::move(wayToAccess), std::move(pointToAccess));
 }
 
-// void FillRoadAccessBySampleConditional_1(RoadAccess & roadAccess)
-//{
-//   std::vector<std::string> const openingHoursStrings = {
-//       "Mo-Su", "10:00-18:00", "Mo-Fr 10:00-14:00", "09:00-13:00", "Apr - May", "2010 - 2100"};
-//
-//   std::vector<osmoh::OpeningHours> openingHours;
-//   for (auto const & oh : openingHoursStrings)
-//   {
-//     openingHours.emplace_back(oh);
-//     TEST(openingHours.back().IsValid(), ());
-//   }
-//
-//   RoadAccess::Conditional conditional_1;
-//   conditional_1.Insert(RoadAccess::Type::No, std::move(openingHours[0]));
-//   conditional_1.Insert(RoadAccess::Type::Private, std::move(openingHours[1]));
-//
-//   RoadAccess::Conditional conditional_2;
-//   conditional_2.Insert(RoadAccess::Type::Destination, std::move(openingHours[2]));
-//
-//   RoadAccess::Conditional conditional_3;
-//   conditional_3.Insert(RoadAccess::Type::No, std::move(openingHours[4]));
-//   conditional_3.Insert(RoadAccess::Type::Destination, std::move(openingHours[3]));
-//
-//   RoadAccess::Conditional conditional_4;
-//   conditional_4.Insert(RoadAccess::Type::Destination, std::move(openingHours[5]));
-//
-//   RoadAccess::WayToAccessConditional wayToAccessConditional = {{1 /* featureId */, conditional_1},
-//                                                                {2 /* featureId */, conditional_2}};
-//
-//   RoadAccess::PointToAccessConditional pointToAccessConditional = {
-//       {RoadPoint(3 /* featureId */, 0 /* pointId */), conditional_3},
-//       {RoadPoint(4 /* featureId */, 7 /* pointId */), conditional_4}};
-//
-//   roadAccess.SetAccessConditional(std::move(wayToAccessConditional), std::move(pointToAccessConditional));
-// }
-//
-// void FillRoadAccessBySampleConditional_2(RoadAccess & roadAccess)
-//{
-//   std::vector<std::string> const openingHoursStrings = {
-//       "Mo", "Apr-May 03:00-04:25", "Mo-Sa 12:00-13:00", "2010-2098", "Nov-Apr", "19:00-21:00"};
-//
-//   std::vector<osmoh::OpeningHours> openingHours;
-//   for (auto const & oh : openingHoursStrings)
-//   {
-//     openingHours.emplace_back(oh);
-//     TEST(openingHours.back().IsValid(), (oh));
-//   }
-//
-//   RoadAccess::Conditional conditional_1;
-//   conditional_1.Insert(RoadAccess::Type::Private, std::move(openingHours[0]));
-//
-//   RoadAccess::Conditional conditional_2;
-//   conditional_2.Insert(RoadAccess::Type::No, std::move(openingHours[1]));
-//   conditional_2.Insert(RoadAccess::Type::Private, std::move(openingHours[2]));
-//
-//   RoadAccess::Conditional conditional_3;
-//   conditional_3.Insert(RoadAccess::Type::Destination, std::move(openingHours[3]));
-//
-//   RoadAccess::Conditional conditional_4;
-//   conditional_4.Insert(RoadAccess::Type::No, std::move(openingHours[4]));
-//   conditional_4.Insert(RoadAccess::Type::No, std::move(openingHours[5]));
-//
-//   RoadAccess::WayToAccessConditional wayToAccessConditional = {{1 /* featureId */, conditional_1},
-//                                                                {2 /* featureId */, conditional_2}};
-//
-//   RoadAccess::PointToAccessConditional pointToAccessConditional = {
-//       {RoadPoint(3 /* featureId */, 10 /* pointId */), conditional_3},
-//       {RoadPoint(4 /* featureId */, 2 /* pointId */), conditional_4}};
-//
-//   roadAccess.SetAccessConditional(std::move(wayToAccessConditional), std::move(pointToAccessConditional));
-// }
+void FillRoadAccessBySampleConditional_1(RoadAccess & roadAccess)
+{
+  std::vector<std::string> const openingHoursStrings = {
+      "Mo-Su", "10:00-18:00", "Mo-Fr 10:00-14:00", "09:00-13:00", "Apr - May", "2010 - 2100"};
+
+  std::vector<osmoh::OpeningHours> openingHours;
+  for (auto const & oh : openingHoursStrings)
+  {
+    openingHours.emplace_back(oh);
+    TEST(openingHours.back().IsValid(), ());
+  }
+
+  RoadAccess::Conditional conditional_1;
+  conditional_1.Insert(RoadAccess::Type::No, std::move(openingHours[0]));
+  conditional_1.Insert(RoadAccess::Type::Private, std::move(openingHours[1]));
+
+  RoadAccess::Conditional conditional_2;
+  conditional_2.Insert(RoadAccess::Type::Destination, std::move(openingHours[2]));
+
+  RoadAccess::Conditional conditional_3;
+  conditional_3.Insert(RoadAccess::Type::No, std::move(openingHours[4]));
+  conditional_3.Insert(RoadAccess::Type::Destination, std::move(openingHours[3]));
+
+  RoadAccess::Conditional conditional_4;
+  conditional_4.Insert(RoadAccess::Type::Destination, std::move(openingHours[5]));
+
+  RoadAccess::WayToAccessConditional wayToAccessConditional = {{1 /* featureId */, conditional_1},
+                                                               {2 /* featureId */, conditional_2}};
+
+  RoadAccess::PointToAccessConditional pointToAccessConditional = {
+      {RoadPoint(3 /* featureId */, 0 /* pointId */), conditional_3},
+      {RoadPoint(4 /* featureId */, 7 /* pointId */), conditional_4}};
+
+  roadAccess.SetAccessConditional(std::move(wayToAccessConditional), std::move(pointToAccessConditional));
+}
+
+void FillRoadAccessBySampleConditional_2(RoadAccess & roadAccess)
+{
+  std::vector<std::string> const openingHoursStrings = {
+      "Mo", "Apr-May 03:00-04:25", "Mo-Sa 12:00-13:00", "2010-2098", "Nov-Apr", "19:00-21:00"};
+
+  std::vector<osmoh::OpeningHours> openingHours;
+  for (auto const & oh : openingHoursStrings)
+  {
+    openingHours.emplace_back(oh);
+    TEST(openingHours.back().IsValid(), (oh));
+  }
+
+  RoadAccess::Conditional conditional_1;
+  conditional_1.Insert(RoadAccess::Type::Private, std::move(openingHours[0]));
+
+  RoadAccess::Conditional conditional_2;
+  conditional_2.Insert(RoadAccess::Type::No, std::move(openingHours[1]));
+  conditional_2.Insert(RoadAccess::Type::Private, std::move(openingHours[2]));
+
+  RoadAccess::Conditional conditional_3;
+  conditional_3.Insert(RoadAccess::Type::Destination, std::move(openingHours[3]));
+
+  RoadAccess::Conditional conditional_4;
+  conditional_4.Insert(RoadAccess::Type::No, std::move(openingHours[4]));
+  conditional_4.Insert(RoadAccess::Type::No, std::move(openingHours[5]));
+
+  RoadAccess::WayToAccessConditional wayToAccessConditional = {{1 /* featureId */, conditional_1},
+                                                               {2 /* featureId */, conditional_2}};
+
+  RoadAccess::PointToAccessConditional pointToAccessConditional = {
+      {RoadPoint(3 /* featureId */, 10 /* pointId */), conditional_3},
+      {RoadPoint(4 /* featureId */, 2 /* pointId */), conditional_4}};
+
+  roadAccess.SetAccessConditional(std::move(wayToAccessConditional), std::move(pointToAccessConditional));
+}
 
 class RoadAccessSerDesTest
 {
@@ -167,61 +167,58 @@ UNIT_CLASS_TEST(RoadAccessSerDesTest, RoadAccess_Serdes)
   TestDeserialize(VehicleType::Pedestrian, roadAccessPedestrian);
 }
 
-// @TODO Tests below and functions FillRoadAccessBySampleConditional_1 and
-// FillRoadAccessBySampleConditional_2 should be uncommented when access:conditional is
-// switched on.
-// UNIT_CLASS_TEST(RoadAccessSerDesTest, RoadAccess_Serdes_Conditional_One_Vehicle)
-//{
-//  auto constexpr kVehicleTypeCount = static_cast<size_t>(VehicleType::Count);
-//  for (size_t vehicleTypeId = 0; vehicleTypeId < kVehicleTypeCount; ++vehicleTypeId)
-//  {
-//    RoadAccess roadAccess;
-//    FillRoadAccessBySampleConditional_1(roadAccess);
-//
-//    RoadAccessSerializer::RoadAccessByVehicleType roadAccessAllTypes;
-//    roadAccessAllTypes[vehicleTypeId] = roadAccess;
-//
-//    Serialize(roadAccessAllTypes);
-//    TestDeserialize(static_cast<VehicleType>(vehicleTypeId), roadAccess);
-//    ClearBuffer();
-//  }
-//}
-//
-// UNIT_CLASS_TEST(RoadAccessSerDesTest, RoadAccess_Serdes_Conditional_Several_Vehicles)
-//{
-//  RoadAccess roadAccessCar;
-//  FillRoadAccessBySampleConditional_1(roadAccessCar);
-//
-//  RoadAccess roadAccessPedestrian;
-//  FillRoadAccessBySampleConditional_2(roadAccessPedestrian);
-//
-//  RoadAccessSerializer::RoadAccessByVehicleType roadAccessAllTypes;
-//  roadAccessAllTypes[static_cast<size_t>(VehicleType::Car)] = roadAccessCar;
-//  roadAccessAllTypes[static_cast<size_t>(VehicleType::Pedestrian)] = roadAccessPedestrian;
-//
-//  Serialize(roadAccessAllTypes);
-//  TestDeserialize(VehicleType::Car, roadAccessCar);
-//  TestDeserialize(VehicleType::Pedestrian, roadAccessPedestrian);
-//}
-//
-// UNIT_CLASS_TEST(RoadAccessSerDesTest, RoadAccess_Serdes_Conditional_Mixed_Several_Vehicles)
-//{
-//  RoadAccess roadAccessCar;
-//  FillRoadAccessBySampleConditional_1(roadAccessCar);
-//  FillRoadAccessBySample_1(roadAccessCar);
-//
-//  RoadAccess roadAccessPedestrian;
-//  FillRoadAccessBySampleConditional_2(roadAccessPedestrian);
-//  FillRoadAccessBySample_2(roadAccessPedestrian);
-//
-//  RoadAccessSerializer::RoadAccessByVehicleType roadAccessAllTypes;
-//  roadAccessAllTypes[static_cast<size_t>(VehicleType::Car)] = roadAccessCar;
-//  roadAccessAllTypes[static_cast<size_t>(VehicleType::Pedestrian)] = roadAccessPedestrian;
-//
-//  Serialize(roadAccessAllTypes);
-//  TestDeserialize(VehicleType::Car, roadAccessCar);
-//  TestDeserialize(VehicleType::Pedestrian, roadAccessPedestrian);
-//}
+UNIT_CLASS_TEST(RoadAccessSerDesTest, RoadAccess_Serdes_Conditional_One_Vehicle)
+{
+ auto constexpr kVehicleTypeCount = static_cast<size_t>(VehicleType::Count);
+ for (size_t vehicleTypeId = 0; vehicleTypeId < kVehicleTypeCount; ++vehicleTypeId)
+ {
+   RoadAccess roadAccess;
+   FillRoadAccessBySampleConditional_1(roadAccess);
+
+   RoadAccessSerializer::RoadAccessByVehicleType roadAccessAllTypes;
+   roadAccessAllTypes[vehicleTypeId] = roadAccess;
+
+   Serialize(roadAccessAllTypes);
+   TestDeserialize(static_cast<VehicleType>(vehicleTypeId), roadAccess);
+   ClearBuffer();
+ }
+}
+
+UNIT_CLASS_TEST(RoadAccessSerDesTest, RoadAccess_Serdes_Conditional_Several_Vehicles)
+{
+ RoadAccess roadAccessCar;
+ FillRoadAccessBySampleConditional_1(roadAccessCar);
+
+ RoadAccess roadAccessPedestrian;
+ FillRoadAccessBySampleConditional_2(roadAccessPedestrian);
+
+ RoadAccessSerializer::RoadAccessByVehicleType roadAccessAllTypes;
+ roadAccessAllTypes[static_cast<size_t>(VehicleType::Car)] = roadAccessCar;
+ roadAccessAllTypes[static_cast<size_t>(VehicleType::Pedestrian)] = roadAccessPedestrian;
+
+ Serialize(roadAccessAllTypes);
+ TestDeserialize(VehicleType::Car, roadAccessCar);
+ TestDeserialize(VehicleType::Pedestrian, roadAccessPedestrian);
+}
+
+UNIT_CLASS_TEST(RoadAccessSerDesTest, RoadAccess_Serdes_Conditional_Mixed_Several_Vehicles)
+{
+ RoadAccess roadAccessCar;
+ FillRoadAccessBySampleConditional_1(roadAccessCar);
+ FillRoadAccessBySample_1(roadAccessCar);
+
+ RoadAccess roadAccessPedestrian;
+ FillRoadAccessBySampleConditional_2(roadAccessPedestrian);
+ FillRoadAccessBySample_2(roadAccessPedestrian);
+
+ RoadAccessSerializer::RoadAccessByVehicleType roadAccessAllTypes;
+ roadAccessAllTypes[static_cast<size_t>(VehicleType::Car)] = roadAccessCar;
+ roadAccessAllTypes[static_cast<size_t>(VehicleType::Pedestrian)] = roadAccessPedestrian;
+
+ Serialize(roadAccessAllTypes);
+ TestDeserialize(VehicleType::Car, roadAccessCar);
+ TestDeserialize(VehicleType::Pedestrian, roadAccessPedestrian);
+}
 
 UNIT_TEST(RoadAccess_WayBlocked)
 {
@@ -369,42 +366,42 @@ UNIT_TEST(RoadAccess_WayBlockedConditional)
   TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight, expectedEdges);
 }
 
-// UNIT_TEST(RoadAccess_PointBlockedConditional)
-//{
-//   uint32_t const numVertices = 4;
-//   TestIndexGraphTopology graph(numVertices);
-//
-//   graph.AddDirectedEdge(0, 1, 1.0);
-//   graph.AddDirectedEdge(1, 2, 1.0);
-//   graph.AddDirectedEdge(2, 3, 1.0);
-//
-//   double expectedWeight = 3.0;
-//   vector<TestEdge> expectedEdges = {{0, 1}, {1, 2}, {2, 3}};
-//   TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
-//                     expectedEdges);
-//
-//   graph.SetVertexAccessConditional(1, RoadAccess::Type::No, "Jan - Jul");
-//
-//   auto const april = []() {
-//     return GetUnixtimeByDate(2020, Month::Apr, 1, 12 /* hh */, 00 /* mm */);
-//   };
-//
-//   graph.SetCurrentTimeGetter(april);
-//   expectedWeight = 0;
-//   expectedEdges = {};
-//   TestTopologyGraph(graph, 0 /* from */, 3 /* to */, false /* pathFound */, expectedWeight,
-//                     expectedEdges);
-//
-//   auto const november = []() {
-//     return GetUnixtimeByDate(2020, Month::Nov, 1, 12 /* hh */, 00 /* mm */);
-//   };
-//
-//   graph.SetCurrentTimeGetter(november);
-//   expectedWeight = 3.0;
-//   expectedEdges = {{0, 1}, {1, 2}, {2, 3}};
-//   TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
-//                     expectedEdges);
-// }
+UNIT_TEST(RoadAccess_PointBlockedConditional)
+{
+  uint32_t const numVertices = 4;
+  TestIndexGraphTopology graph(numVertices);
+
+  graph.AddDirectedEdge(0, 1, 1.0);
+  graph.AddDirectedEdge(1, 2, 1.0);
+  graph.AddDirectedEdge(2, 3, 1.0);
+
+  double expectedWeight = 3.0;
+  vector<TestEdge> expectedEdges = {{0, 1}, {1, 2}, {2, 3}};
+  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
+                    expectedEdges);
+
+  graph.SetVertexAccessConditional(1, RoadAccess::Type::No, "Jan - Jul");
+
+  auto const april = []() {
+    return GetUnixtimeByDate(2020, Month::Apr, 1, 12 /* hh */, 00 /* mm */);
+  };
+
+  graph.SetCurrentTimeGetter(april);
+  expectedWeight = 0;
+  expectedEdges = {};
+  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, false /* pathFound */, expectedWeight,
+                    expectedEdges);
+
+  auto const november = []() {
+    return GetUnixtimeByDate(2020, Month::Nov, 1, 12 /* hh */, 00 /* mm */);
+  };
+
+  graph.SetCurrentTimeGetter(november);
+  expectedWeight = 3.0;
+  expectedEdges = {{0, 1}, {1, 2}, {2, 3}};
+  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
+                    expectedEdges);
+}
 
 UNIT_TEST(RoadAccess_WayBlockedAvoidConditional)
 {
@@ -451,56 +448,56 @@ UNIT_TEST(RoadAccess_WayBlockedAvoidConditional)
   TestTopologyGraph(graph, 0 /* from */, 3 /* to */, false /* pathFound */, expectedWeight, expectedEdges);
 }
 
-// UNIT_TEST(RoadAccess_PointBlockedAvoidConditional)
-//{
-//   uint32_t const numVertices = 4;
-//   TestIndexGraphTopology graph(numVertices);
-//
-//   graph.AddDirectedEdge(0, 1, 1.0);
-//   graph.AddDirectedEdge(0, 2, 10.0);
-//   graph.AddDirectedEdge(1, 3, 1.0);
-//   graph.AddDirectedEdge(2, 3, 10.0);
-//
-//   double expectedWeight = 2.0;
-//   vector<TestEdge> expectedEdges = {{0, 1}, {1, 3}};
-//   TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
-//                     expectedEdges);
-//
-//   graph.SetVertexAccessConditional(1, RoadAccess::Type::No, "Mo-Fr 10:00 - 19:00");
-//
-//   auto const mondayAlmostTenHours = []() {
-//     return GetUnixtimeByDate(2020, Month::Apr, Weekday::Monday, 9 /* hh */, 50 /* mm */);
-//   };
-//
-//   // In this time we probably will able to pass vertex: 1, but we are not sure, so we should avoid
-//   // such edges.
-//   graph.SetCurrentTimeGetter(mondayAlmostTenHours);
-//   expectedWeight = 20.0;
-//   expectedEdges = {{0, 2}, {2, 3}};
-//   TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
-//                     expectedEdges);
-//
-//   graph.SetEdgeAccess(0, 2, RoadAccess::Type::No);
-//
-//   // But if this is the only path (we blocked 0->2 above), we should pass through vertex: 1 anyway.
-//   graph.SetCurrentTimeGetter(mondayAlmostTenHours);
-//   expectedWeight = 2.0;
-//   expectedEdges = {{0, 1}, {1, 3}};
-//   TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
-//                     expectedEdges);
-//
-//   auto const mondayTwelveHours = []() {
-//     return GetUnixtimeByDate(2020, Month::Apr, Weekday::Monday, 12 /* hh */, 00 /* mm */);
-//   };
-//
-//   // But if we sure that in this time vertex: 1 will be blocked, we definitely should not pass
-//   // through vertex: 1. In this case no way will be found.
-//   graph.SetCurrentTimeGetter(mondayTwelveHours);
-//   expectedWeight = 0.0;
-//   expectedEdges = {};
-//   TestTopologyGraph(graph, 0 /* from */, 3 /* to */, false /* pathFound */, expectedWeight,
-//                     expectedEdges);
-// }
+UNIT_TEST(RoadAccess_PointBlockedAvoidConditional)
+{
+  uint32_t const numVertices = 4;
+  TestIndexGraphTopology graph(numVertices);
+
+  graph.AddDirectedEdge(0, 1, 1.0);
+  graph.AddDirectedEdge(0, 2, 10.0);
+  graph.AddDirectedEdge(1, 3, 1.0);
+  graph.AddDirectedEdge(2, 3, 10.0);
+
+  double expectedWeight = 2.0;
+  vector<TestEdge> expectedEdges = {{0, 1}, {1, 3}};
+  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
+                    expectedEdges);
+
+  graph.SetVertexAccessConditional(1, RoadAccess::Type::No, "Mo-Fr 10:00 - 19:00");
+
+  auto const mondayAlmostTenHours = []() {
+    return GetUnixtimeByDate(2020, Month::Apr, Weekday::Monday, 9 /* hh */, 50 /* mm */);
+  };
+
+  // In this time we probably will able to pass vertex: 1, but we are not sure, so we should avoid
+  // such edges.
+  graph.SetCurrentTimeGetter(mondayAlmostTenHours);
+  expectedWeight = 20.0;
+  expectedEdges = {{0, 2}, {2, 3}};
+  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
+                    expectedEdges);
+
+  graph.SetEdgeAccess(0, 2, RoadAccess::Type::No);
+
+  // But if this is the only path (we blocked 0->2 above), we should pass through vertex: 1 anyway.
+  graph.SetCurrentTimeGetter(mondayAlmostTenHours);
+  expectedWeight = 2.0;
+  expectedEdges = {{0, 1}, {1, 3}};
+  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
+                    expectedEdges);
+
+  auto const mondayTwelveHours = []() {
+    return GetUnixtimeByDate(2020, Month::Apr, Weekday::Monday, 12 /* hh */, 00 /* mm */);
+  };
+
+  // But if we sure that in this time vertex: 1 will be blocked, we definitely should not pass
+  // through vertex: 1. In this case no way will be found.
+  graph.SetCurrentTimeGetter(mondayTwelveHours);
+  expectedWeight = 0.0;
+  expectedEdges = {};
+  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, false /* pathFound */, expectedWeight,
+                    expectedEdges);
+}
 
 UNIT_TEST(RoadAccess_WayBlockedConditional_Yes_No)
 {
@@ -536,45 +533,45 @@ UNIT_TEST(RoadAccess_WayBlockedConditional_Yes_No)
   TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight, expectedEdges);
 }
 
-// UNIT_TEST(RoadAccess_PointBlockedConditional_Yes_No)
-//{
-//   uint32_t const numVertices = 4;
-//   TestIndexGraphTopology graph(numVertices);
-//
-//   graph.AddDirectedEdge(0, 1, 1.0);
-//   graph.AddDirectedEdge(1, 2, 1.0);
-//   graph.AddDirectedEdge(2, 3, 1.0);
-//
-//   double expectedWeight = 3.0;
-//   vector<TestEdge> expectedEdges = {{0, 1}, {1, 2}, {2, 3}};
-//   TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
-//                     expectedEdges);
-//
-//   graph.SetVertexAccessConditional(1, RoadAccess::Type::No, "Mo-Fr");
-//   graph.SetVertexAccessConditional(1, RoadAccess::Type::Yes, "Sa-Su");
-//
-//   auto const tuesday = []() {
-//     return GetUnixtimeByDate(2020, Month::Apr, Weekday::Tuesday, 10 /* hh */, 00 /* mm */);
-//   };
-//
-//   // Way is blocked from Monday to Friday
-//   graph.SetCurrentTimeGetter(tuesday);
-//   expectedWeight = 0;
-//   expectedEdges = {};
-//   TestTopologyGraph(graph, 0 /* from */, 3 /* to */, false /* pathFound */, expectedWeight,
-//                     expectedEdges);
-//
-//   auto const saturday = []() {
-//     return GetUnixtimeByDate(2020, Month::Nov, Weekday::Saturday, 10 /* hh */, 00 /* mm */);
-//   };
-//
-//   // And open from Saturday to Sunday
-//   graph.SetCurrentTimeGetter(saturday);
-//   expectedWeight = 3.0;
-//   expectedEdges = {{0, 1}, {1, 2}, {2, 3}};
-//   TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
-//                     expectedEdges);
-// }
+UNIT_TEST(RoadAccess_PointBlockedConditional_Yes_No)
+{
+  uint32_t const numVertices = 4;
+  TestIndexGraphTopology graph(numVertices);
+
+  graph.AddDirectedEdge(0, 1, 1.0);
+  graph.AddDirectedEdge(1, 2, 1.0);
+  graph.AddDirectedEdge(2, 3, 1.0);
+
+  double expectedWeight = 3.0;
+  vector<TestEdge> expectedEdges = {{0, 1}, {1, 2}, {2, 3}};
+  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
+                    expectedEdges);
+
+  graph.SetVertexAccessConditional(1, RoadAccess::Type::No, "Mo-Fr");
+  graph.SetVertexAccessConditional(1, RoadAccess::Type::Yes, "Sa-Su");
+
+  auto const tuesday = []() {
+    return GetUnixtimeByDate(2020, Month::Apr, Weekday::Tuesday, 10 /* hh */, 00 /* mm */);
+  };
+
+  // Way is blocked from Monday to Friday
+  graph.SetCurrentTimeGetter(tuesday);
+  expectedWeight = 0;
+  expectedEdges = {};
+  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, false /* pathFound */, expectedWeight,
+                    expectedEdges);
+
+  auto const saturday = []() {
+    return GetUnixtimeByDate(2020, Month::Nov, Weekday::Saturday, 10 /* hh */, 00 /* mm */);
+  };
+
+  // And open from Saturday to Sunday
+  graph.SetCurrentTimeGetter(saturday);
+  expectedWeight = 3.0;
+  expectedEdges = {{0, 1}, {1, 2}, {2, 3}};
+  TestTopologyGraph(graph, 0 /* from */, 3 /* to */, true /* pathFound */, expectedWeight,
+                    expectedEdges);
+}
 
 UNIT_TEST(RoadAccess_WayBlockedAvoidPrivateConditional)
 {

From 6b86fd0d2ed6a5fbe660951c9ee4f750779e1b64 Mon Sep 17 00:00:00 2001
From: Yannik Bloscheck <git@yannikbloscheck.com>
Date: Thu, 28 Aug 2025 16:03:05 +0200
Subject: [PATCH 270/302] [ios] Fix wrong position location after switching
 back from CarPlay

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
---
 .../UI/CarPlay/CarPlayMapViewController.swift  | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/iphone/Maps/UI/CarPlay/CarPlayMapViewController.swift b/iphone/Maps/UI/CarPlay/CarPlayMapViewController.swift
index 13d5b6ef5..65881c05c 100644
--- a/iphone/Maps/UI/CarPlay/CarPlayMapViewController.swift
+++ b/iphone/Maps/UI/CarPlay/CarPlayMapViewController.swift
@@ -159,14 +159,16 @@ final class CarPlayMapViewController: MWMViewController {
   }
 
   func updateVisibleViewPortState(_ state: CPViewPortState) {
-    viewPortState = state
-    switch viewPortState {
-    case .default:
-      updateVisibleViewPortToDefaultState()
-    case .preview:
-      updateVisibleViewPortToPreviewState()
-    case .navigation:
-      updateVisibleViewPortToNavigationState()
+    if CarPlayService.shared.isCarplayActivated {
+      viewPortState = state
+      switch viewPortState {
+        case .default:
+          updateVisibleViewPortToDefaultState()
+        case .preview:
+          updateVisibleViewPortToPreviewState()
+        case .navigation:
+          updateVisibleViewPortToNavigationState()
+      }
     }
   }
 

From 0fccf66b2743d3d3a1056b67d93e6e754f5c0d77 Mon Sep 17 00:00:00 2001
From: Yannik Bloscheck <git@yannikbloscheck.com>
Date: Thu, 28 Aug 2025 18:22:58 +0200
Subject: [PATCH 271/302] [ios] Removing conditionals for unsupported iOS
 versions

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
---
 .../DatePicker/Cells/RangeFirstCell.swift     |  4 +-
 .../DatePicker/Cells/RangeLastCell.swift      |  4 +-
 .../DatePicker/Cells/RangeSingleCell.swift    |  4 +-
 .../DatePicker/Cells/SelectedSingleCell.swift |  4 +-
 .../Maps/Categories/CALayer+SetCorner.swift   |  4 +-
 .../Maps/Classes/CarPlay/CarPlayService.swift |  4 +-
 .../ListTemplateBuilder.swift                 | 14 ++--
 .../Classes/Components/CopyableLabel.swift    |  7 +-
 .../LoadingOverlayViewController.swift        |  6 +-
 iphone/Maps/Common/Common.swift               |  2 +-
 .../Maps/Core/Theme/Core/StyleManager.swift   |  4 --
 .../Maps/Core/Theme/Core/ThemeManager.swift   | 20 ++----
 .../Renderers/UINavigationBarRenderer.swift   | 30 +++------
 .../Theme/Renderers/UISearchBarRenderer.swift | 65 ++++++++-----------
 .../Core/Theme/Renderers/UIViewRenderer.swift |  4 +-
 iphone/Maps/UI/ColorPicker/ColorPicker.swift  |  2 +-
 .../UI/DocumentPicker/DocumentPicker.swift    |  6 +-
 ...ageEditBookmarkOrTrackViewController.swift |  2 +-
 .../PlacePageHeader/CircleImageButton.swift   |  2 +-
 .../PlacePageHeaderViewController.swift       | 41 ++++--------
 .../PlacePageInfoViewController.swift         | 17 +++--
 .../PlacePage/PlacePageViewController.swift   | 10 +--
 .../Search/SearchOnMap/PlaceholderView.swift  |  6 +-
 .../SearchOnMap/SearchOnMapHeaderView.swift   |  8 +--
 .../SearchOnMapViewController.swift           |  2 +-
 25 files changed, 87 insertions(+), 185 deletions(-)

diff --git a/iphone/DatePicker/DatePicker/Cells/RangeFirstCell.swift b/iphone/DatePicker/DatePicker/Cells/RangeFirstCell.swift
index be85de66c..daf5aaa81 100644
--- a/iphone/DatePicker/DatePicker/Cells/RangeFirstCell.swift
+++ b/iphone/DatePicker/DatePicker/Cells/RangeFirstCell.swift
@@ -7,9 +7,7 @@ final class RangeFirstCell: Cell {
     contentView.addSubview(rangeBgView)
     rangeBgView.alignToSuperview(UIEdgeInsets(top: 4, left: 4, bottom: -4, right: 0))
     rangeBgView.layer.cornerRadius = 8
-    if #available(iOS 13.0, *) {
-      rangeBgView.layer.cornerCurve = .continuous
-    }
+    rangeBgView.layer.cornerCurve = .continuous
     rangeBgView.layer.maskedCorners = [.layerMinXMinYCorner, .layerMinXMaxYCorner]
     super.addSubviews()
   }
diff --git a/iphone/DatePicker/DatePicker/Cells/RangeLastCell.swift b/iphone/DatePicker/DatePicker/Cells/RangeLastCell.swift
index 5aa7d902d..dcd949564 100644
--- a/iphone/DatePicker/DatePicker/Cells/RangeLastCell.swift
+++ b/iphone/DatePicker/DatePicker/Cells/RangeLastCell.swift
@@ -7,9 +7,7 @@ final class RangeLastCell: Cell {
     contentView.addSubview(rangeBgView)
     rangeBgView.alignToSuperview(UIEdgeInsets(top: 4, left: 0, bottom: -4, right: -4))
     rangeBgView.layer.cornerRadius = 8
-    if #available(iOS 13.0, *) {
-      rangeBgView.layer.cornerCurve = .continuous
-    }
+    rangeBgView.layer.cornerCurve = .continuous
     rangeBgView.layer.maskedCorners = [.layerMaxXMinYCorner, .layerMaxXMaxYCorner]
     super.addSubviews()
   }
diff --git a/iphone/DatePicker/DatePicker/Cells/RangeSingleCell.swift b/iphone/DatePicker/DatePicker/Cells/RangeSingleCell.swift
index f36ecc46a..7c48da018 100644
--- a/iphone/DatePicker/DatePicker/Cells/RangeSingleCell.swift
+++ b/iphone/DatePicker/DatePicker/Cells/RangeSingleCell.swift
@@ -7,9 +7,7 @@ final class RangeSingleCell: Cell {
     contentView.addSubview(rangeBgView)
     rangeBgView.alignToSuperview(UIEdgeInsets(top: 4, left: 4, bottom: -4, right: -4))
     rangeBgView.layer.cornerRadius = 8
-    if #available(iOS 13.0, *) {
-      rangeBgView.layer.cornerCurve = .continuous
-    }
+    rangeBgView.layer.cornerCurve = .continuous
     super.addSubviews()
   }
 
diff --git a/iphone/DatePicker/DatePicker/Cells/SelectedSingleCell.swift b/iphone/DatePicker/DatePicker/Cells/SelectedSingleCell.swift
index 332c7fe45..9a7eecafa 100644
--- a/iphone/DatePicker/DatePicker/Cells/SelectedSingleCell.swift
+++ b/iphone/DatePicker/DatePicker/Cells/SelectedSingleCell.swift
@@ -7,9 +7,7 @@ class SelectedSingleCell: Cell {
     contentView.addSubview(selectedBgView)
     selectedBgView.alignToSuperview(UIEdgeInsets(top: 4, left: 4, bottom: -4, right: -4))
     selectedBgView.layer.cornerRadius = 8
-    if #available(iOS 13.0, *) {
-      selectedBgView.layer.cornerCurve = .continuous
-    }
+    selectedBgView.layer.cornerCurve = .continuous
     super.addSubviews()
   }
 
diff --git a/iphone/Maps/Categories/CALayer+SetCorner.swift b/iphone/Maps/Categories/CALayer+SetCorner.swift
index 7b49343a8..e56b53ff2 100644
--- a/iphone/Maps/Categories/CALayer+SetCorner.swift
+++ b/iphone/Maps/Categories/CALayer+SetCorner.swift
@@ -5,9 +5,7 @@ extension CALayer {
     if let maskedCorners {
       self.maskedCorners = maskedCorners
     }
-    if #available(iOS 13.0, *) {
-      cornerCurve = .continuous
-    }
+    cornerCurve = .continuous
   }
 }
 
diff --git a/iphone/Maps/Classes/CarPlay/CarPlayService.swift b/iphone/Maps/Classes/CarPlay/CarPlayService.swift
index 9fde1621b..9b32ea950 100644
--- a/iphone/Maps/Classes/CarPlay/CarPlayService.swift
+++ b/iphone/Maps/Classes/CarPlay/CarPlayService.swift
@@ -54,9 +54,7 @@ final class CarPlayService: NSObject {
       applyBaseRootTemplate()
       router.restoreTripPreviewOnCarplay(beforeRootTemplateDidAppear: true)
     }
-    if #available(iOS 13.0, *) {
-      updateContentStyle(configuration.contentStyle)
-    }
+    updateContentStyle(configuration.contentStyle)
     FrameworkHelper.updatePositionArrowOffset(false, offset: 5)
 
     CarPlayWindowScaleAdjuster.updateAppearance(
diff --git a/iphone/Maps/Classes/CarPlay/Template Builders/ListTemplateBuilder.swift b/iphone/Maps/Classes/CarPlay/Template Builders/ListTemplateBuilder.swift
index 5f48557e4..65098f05c 100644
--- a/iphone/Maps/Classes/CarPlay/Template Builders/ListTemplateBuilder.swift	
+++ b/iphone/Maps/Classes/CarPlay/Template Builders/ListTemplateBuilder.swift	
@@ -96,14 +96,12 @@ final class ListTemplateBuilder {
                                                           bookmarkId: bookmark.bookmarkId))
       return item
     })
-    if #available(iOS 15.0, *) {
-      let maxItemCount = CPListTemplate.maximumItemCount - 1
-      if items.count >= maxItemCount {
-        items = Array(items.prefix(maxItemCount))
-        let cropWarning = CPListItem(text: L("not_all_shown_bookmarks_carplay"), detailText: L("switch_to_phone_bookmarks_carplay"))
-        cropWarning.isEnabled = false
-        items.append(cropWarning)
-      }
+    let maxItemCount = CPListTemplate.maximumItemCount - 1
+    if items.count >= maxItemCount {
+      items = Array(items.prefix(maxItemCount))
+      let cropWarning = CPListItem(text: L("not_all_shown_bookmarks_carplay"), detailText: L("switch_to_phone_bookmarks_carplay"))
+      cropWarning.isEnabled = false
+      items.append(cropWarning)
     }
     let section = CPListSection(items: items)
     template.updateSections([section])
diff --git a/iphone/Maps/Classes/Components/CopyableLabel.swift b/iphone/Maps/Classes/Components/CopyableLabel.swift
index 3f90df4c1..1bf77b40c 100644
--- a/iphone/Maps/Classes/Components/CopyableLabel.swift
+++ b/iphone/Maps/Classes/Components/CopyableLabel.swift
@@ -29,12 +29,7 @@ class CopyableLabel: UILabel {
       var rect = bounds
       rect.origin = locationOfTouchInLabel
       rect.size = CGSize(width: 1, height: 1)
-      if #available(iOS 13, *) {
-        menu.showMenu(from: self, rect: rect)
-      } else {
-        menu.setTargetRect(rect, in: self)
-        menu.setMenuVisible(true, animated: false)
-      }
+      menu.showMenu(from: self, rect: rect)
     }
   }
 
diff --git a/iphone/Maps/Classes/LoadingOverlay/LoadingOverlayViewController.swift b/iphone/Maps/Classes/LoadingOverlay/LoadingOverlayViewController.swift
index 6ed26097d..3d6439efc 100644
--- a/iphone/Maps/Classes/LoadingOverlay/LoadingOverlayViewController.swift
+++ b/iphone/Maps/Classes/LoadingOverlay/LoadingOverlayViewController.swift
@@ -1,11 +1,7 @@
 final class LoadingOverlayViewController: UIViewController {
   private var activityIndicator: UIActivityIndicatorView = {
     let indicator: UIActivityIndicatorView
-    if #available(iOS 13.0, *) {
-      indicator = UIActivityIndicatorView(style: .large)
-    } else {
-      indicator = UIActivityIndicatorView(style: .whiteLarge)
-    }
+    indicator = UIActivityIndicatorView(style: .large)
     indicator.color = .white
     indicator.startAnimating()
     indicator.translatesAutoresizingMaskIntoConstraints = false
diff --git a/iphone/Maps/Common/Common.swift b/iphone/Maps/Common/Common.swift
index a54a7bcce..241eb5b6a 100644
--- a/iphone/Maps/Common/Common.swift
+++ b/iphone/Maps/Common/Common.swift
@@ -1,7 +1,7 @@
 import Foundation
 
 var isiPad: Bool {
-  if #available(iOS 14.0, *), ProcessInfo.processInfo.isiOSAppOnMac {
+  if ProcessInfo.processInfo.isiOSAppOnMac {
     return true
   }
   return UIDevice.current.userInterfaceIdiom == .pad
diff --git a/iphone/Maps/Core/Theme/Core/StyleManager.swift b/iphone/Maps/Core/Theme/Core/StyleManager.swift
index 3ab8a2485..3394f6809 100644
--- a/iphone/Maps/Core/Theme/Core/StyleManager.swift
+++ b/iphone/Maps/Core/Theme/Core/StyleManager.swift
@@ -45,10 +45,6 @@
         listener.applyTheme()
       }
     }
-
-    if #available(iOS 13, *) {} else {
-      UISearchBarRenderer.setAppearance()
-    }
   }
 
   private func updateView(_ view: UIView?) {
diff --git a/iphone/Maps/Core/Theme/Core/ThemeManager.swift b/iphone/Maps/Core/Theme/Core/ThemeManager.swift
index f00d5bba7..f520ec011 100644
--- a/iphone/Maps/Core/Theme/Core/ThemeManager.swift
+++ b/iphone/Maps/Core/Theme/Core/ThemeManager.swift
@@ -10,9 +10,7 @@ final class ThemeManager: NSObject {
   }
 
   private func update(theme: MWMTheme) {
-    if #available(iOS 13.0, *) {
-      updateSystemUserInterfaceStyle(theme)
-    }
+    updateSystemUserInterfaceStyle(theme)
 
     let actualTheme: MWMTheme = { theme in
       let isVehicleRouting = MWMRouter.isRoutingActive() && (MWMRouter.type() == .vehicle)
@@ -22,19 +20,9 @@ final class ThemeManager: NSObject {
       case .night: fallthrough
       case .vehicleNight: return isVehicleRouting ? .vehicleNight : .night
       case .auto:
-        if #available(iOS 13.0, *) {
-          let isDarkModeEnabled = UIScreen.main.traitCollection.userInterfaceStyle == .dark
-          guard isVehicleRouting else { return isDarkModeEnabled ? .night : .day }
-          return isDarkModeEnabled ? .vehicleNight : .vehicleDay
-        } else {
-          guard isVehicleRouting else { return .day }
-          switch FrameworkHelper.daytime(at: LocationManager.lastLocation()) {
-          case .day: return .vehicleDay
-          case .night: return .vehicleNight
-          @unknown default:
-            fatalError()
-          }
-        }
+        let isDarkModeEnabled = UIScreen.main.traitCollection.userInterfaceStyle == .dark
+        guard isVehicleRouting else { return isDarkModeEnabled ? .night : .day }
+        return isDarkModeEnabled ? .vehicleNight : .vehicleDay
       @unknown default:
         fatalError()
       }
diff --git a/iphone/Maps/Core/Theme/Renderers/UINavigationBarRenderer.swift b/iphone/Maps/Core/Theme/Renderers/UINavigationBarRenderer.swift
index 8c9091f6a..0cbfcaa5a 100644
--- a/iphone/Maps/Core/Theme/Renderers/UINavigationBarRenderer.swift
+++ b/iphone/Maps/Core/Theme/Renderers/UINavigationBarRenderer.swift
@@ -15,23 +15,15 @@ class UINavigationBarRenderer: UIViewRenderer {
   class func render(_ control: UINavigationBar, style: Style) {
     super.render(control, style: style)
     if let barTintColor = style.barTintColor {
-      if #available(iOS 13.0, *) {
-        let appearance = UINavigationBarAppearance()
-        appearance.configureWithOpaqueBackground()
-        appearance.backgroundColor = barTintColor
-        control.standardAppearance = appearance
-        control.scrollEdgeAppearance = appearance
-      } else {
-        control.barTintColor = barTintColor
-      }
+      let appearance = UINavigationBarAppearance()
+      appearance.configureWithOpaqueBackground()
+      appearance.backgroundColor = barTintColor
+      control.standardAppearance = appearance
+      control.scrollEdgeAppearance = appearance
     }
     if let shadowImage = style.shadowImage {
-      if #available(iOS 13.0, *) {
-        control.standardAppearance.shadowImage = shadowImage
-        control.scrollEdgeAppearance!.shadowImage = shadowImage
-      } else {
-        control.shadowImage = shadowImage
-      }
+      control.standardAppearance.shadowImage = shadowImage
+      control.scrollEdgeAppearance!.shadowImage = shadowImage
     }
 
     var attributes = [NSAttributedString.Key: Any]()
@@ -41,11 +33,7 @@ class UINavigationBarRenderer: UIViewRenderer {
     if let fontColor = style.fontColor {
       attributes[NSAttributedString.Key.foregroundColor] = fontColor
     }
-    if #available(iOS 13.0, *) {
-      control.standardAppearance.titleTextAttributes = attributes
-      control.scrollEdgeAppearance!.titleTextAttributes = attributes
-    } else {
-      control.titleTextAttributes = attributes
-    }
+    control.standardAppearance.titleTextAttributes = attributes
+    control.scrollEdgeAppearance!.titleTextAttributes = attributes
   }
 }
diff --git a/iphone/Maps/Core/Theme/Renderers/UISearchBarRenderer.swift b/iphone/Maps/Core/Theme/Renderers/UISearchBarRenderer.swift
index 25394df32..1cd18d3ce 100644
--- a/iphone/Maps/Core/Theme/Renderers/UISearchBarRenderer.swift
+++ b/iphone/Maps/Core/Theme/Renderers/UISearchBarRenderer.swift
@@ -24,43 +24,34 @@ extension UISearchBar {
 class UISearchBarRenderer: UIViewRenderer {
   class func render(_ control: UISearchBar, style: Style) {
     super.render(control, style: style)
-    if #available(iOS 13, *) {
-      let searchTextField = control.searchTextField
-      // Default search bar implementation adds the grey transparent image for background. This code removes it and updates the corner radius. This is not working on iPad designed for mac.
-      if #available(iOS 14.0, *), ProcessInfo.processInfo.isiOSAppOnMac {
-      } else {
-        control.setSearchFieldBackgroundImage(UIImage(), for: .normal)
-      }
-      searchTextField.layer.setCornerRadius(.buttonDefault)
-      searchTextField.layer.masksToBounds = true
-      // Placeholder color
-      if let placeholder = searchTextField.placeholder {
-        searchTextField.attributedPlaceholder = NSAttributedString(string: placeholder, attributes: [.foregroundColor: UIColor.gray])
-      }
-      if let backgroundColor = style.backgroundColor {
-        searchTextField.backgroundColor = backgroundColor
-      }
-      if let font = style.font {
-        searchTextField.font = font
-      }
-      if let fontColor = style.fontColor {
-        searchTextField.textColor = fontColor
-      }
-      if let tintColor = style.tintColor {
-        searchTextField.leftView?.tintColor = tintColor
-        // Placeholder indicator color
-        searchTextField.tintColor = tintColor
-        // Clear button image
-        let clearButtonImage = UIImage(named: "ic_clear")?.withRenderingMode(.alwaysTemplate).withTintColor(tintColor)
-        control.setImage(clearButtonImage, for: .clear, state: .normal)
-      }
-    } else {
-      // Default search bar implementation for iOS12 adds the dark grey transparent image for background. This code removes it and replace with the custom image accordingly to the documentation - see 'setSearchFieldBackgroundImage'.
-      if let backgroundColor = style.backgroundColor {
-        let image = getSearchBarBackgroundImage(color: backgroundColor)
-        control.setSearchFieldBackgroundImage(image, for: .normal)
-        control.searchTextPositionAdjustment = UIOffset(horizontal: 6.0, vertical: 0.0)
-      }
+
+    let searchTextField = control.searchTextField
+    // Default search bar implementation adds the grey transparent image for background. This code removes it and updates the corner radius. This is not working on iPad designed for mac.
+    if !ProcessInfo.processInfo.isiOSAppOnMac {
+      control.setSearchFieldBackgroundImage(UIImage(), for: .normal)
+    }
+    searchTextField.layer.setCornerRadius(.buttonDefault)
+    searchTextField.layer.masksToBounds = true
+    // Placeholder color
+    if let placeholder = searchTextField.placeholder {
+      searchTextField.attributedPlaceholder = NSAttributedString(string: placeholder, attributes: [.foregroundColor: UIColor.gray])
+    }
+    if let backgroundColor = style.backgroundColor {
+      searchTextField.backgroundColor = backgroundColor
+    }
+    if let font = style.font {
+      searchTextField.font = font
+    }
+    if let fontColor = style.fontColor {
+      searchTextField.textColor = fontColor
+    }
+    if let tintColor = style.tintColor {
+      searchTextField.leftView?.tintColor = tintColor
+      // Placeholder indicator color
+      searchTextField.tintColor = tintColor
+      // Clear button image
+      let clearButtonImage = UIImage(named: "ic_clear")?.withRenderingMode(.alwaysTemplate).withTintColor(tintColor)
+      control.setImage(clearButtonImage, for: .clear, state: .normal)
     }
     if let barTintColor = style.barTintColor {
       let position = control.delegate?.position?(for: control) ?? control.barPosition
diff --git a/iphone/Maps/Core/Theme/Renderers/UIViewRenderer.swift b/iphone/Maps/Core/Theme/Renderers/UIViewRenderer.swift
index a9de58e08..3b86e5e79 100644
--- a/iphone/Maps/Core/Theme/Renderers/UIViewRenderer.swift
+++ b/iphone/Maps/Core/Theme/Renderers/UIViewRenderer.swift
@@ -57,8 +57,6 @@ class UIViewRenderer {
     if let round = style.round, round == true {
       control.layer.cornerRadius = control.size.height / 2
     }
-    if #available(iOS 13.0, *) {
-      control.layer.cornerCurve = .continuous
-    }
+    control.layer.cornerCurve = .continuous
   }
 }
diff --git a/iphone/Maps/UI/ColorPicker/ColorPicker.swift b/iphone/Maps/UI/ColorPicker/ColorPicker.swift
index b13cb4781..24ce4bf0e 100644
--- a/iphone/Maps/UI/ColorPicker/ColorPicker.swift
+++ b/iphone/Maps/UI/ColorPicker/ColorPicker.swift
@@ -21,7 +21,7 @@ final class ColorPicker: NSObject {
 
     switch pickerType {
     case .defaultColorPicker(let color):
-      if #available(iOS 14.0, *), !ProcessInfo.processInfo.isiOSAppOnMac {
+      if !ProcessInfo.processInfo.isiOSAppOnMac {
         colorPickerViewController = defaultColorPickerViewController(with: color)
       } else {
         colorPickerViewController = bookmarksColorPickerViewController(with: BookmarkColor.bookmarkColor(from: color) ?? .none)
diff --git a/iphone/Maps/UI/DocumentPicker/DocumentPicker.swift b/iphone/Maps/UI/DocumentPicker/DocumentPicker.swift
index ab65e61fe..91d797ce9 100644
--- a/iphone/Maps/UI/DocumentPicker/DocumentPicker.swift
+++ b/iphone/Maps/UI/DocumentPicker/DocumentPicker.swift
@@ -9,11 +9,7 @@ final class DocumentPicker: NSObject {
                completionHandler: @escaping URLsCompletionHandler) {
     self.completionHandler = completionHandler
     let documentPickerViewController: UIDocumentPickerViewController
-    if #available(iOS 14.0, *) {
-      documentPickerViewController = UIDocumentPickerViewController(forOpeningContentTypes: fileTypes.map(\.utType), asCopy: true)
-    } else {
-      documentPickerViewController = UIDocumentPickerViewController(documentTypes: fileTypes.map(\.typeIdentifier), in: .import)
-    }
+    documentPickerViewController = UIDocumentPickerViewController(forOpeningContentTypes: fileTypes.map(\.utType), asCopy: true)
     documentPickerViewController.delegate = self
     // TODO: Enable multiple selection when the multiple files parsing support will be added to the bookmark_manager.
     documentPickerViewController.allowsMultipleSelection = false
diff --git a/iphone/Maps/UI/PlacePage/Components/PlacePageEditBookmarkOrTrackViewController.swift b/iphone/Maps/UI/PlacePage/Components/PlacePageEditBookmarkOrTrackViewController.swift
index 07005f20a..93cd0d915 100644
--- a/iphone/Maps/UI/PlacePage/Components/PlacePageEditBookmarkOrTrackViewController.swift
+++ b/iphone/Maps/UI/PlacePage/Components/PlacePageEditBookmarkOrTrackViewController.swift
@@ -39,7 +39,7 @@ final class PlacePageEditBookmarkOrTrackViewController: UIViewController {
 
   override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
     super.traitCollectionDidChange(previousTraitCollection)
-    if #available(iOS 13.0, *), traitCollection.hasDifferentColorAppearance(comparedTo: previousTraitCollection) {
+    if traitCollection.hasDifferentColorAppearance(comparedTo: previousTraitCollection) {
       applyTheme()
     }
   }
diff --git a/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/CircleImageButton.swift b/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/CircleImageButton.swift
index 1fafa0309..ca365a879 100644
--- a/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/CircleImageButton.swift
+++ b/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/CircleImageButton.swift
@@ -17,7 +17,7 @@ final class CircleImageButton: UIButton {
 
   override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
     super.traitCollectionDidChange(previousTraitCollection)
-    if #available(iOS 13.0, *), traitCollection.hasDifferentColorAppearance(comparedTo: previousTraitCollection) {
+    if traitCollection.hasDifferentColorAppearance(comparedTo: previousTraitCollection) {
       circleImageView.applyTheme()
     }
   }
diff --git a/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderViewController.swift b/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderViewController.swift
index b77bfda01..2681d73b7 100644
--- a/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderViewController.swift
+++ b/iphone/Maps/UI/PlacePage/Components/PlacePageHeader/PlacePageHeaderViewController.swift
@@ -111,38 +111,21 @@ extension PlacePageHeaderViewController: PlacePageHeaderViewProtocol {
   }
 
   func showShareTrackMenu() {
-    if #available(iOS 14.0, *) {
       // The menu will be shown by the shareButton itself
-    } else {
-      let alert = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)
-      let kmlAction = UIAlertAction(title: L("export_file"), style: .default) { [weak self] _ in
-        guard let self else { return }
-        self.presenter?.onExportTrackButtonPress(.text, from: self.shareButton)
-      }
-      let gpxAction = UIAlertAction(title: L("export_file_gpx"), style: .default) { [weak self] _ in
-        guard let self else { return }
-        self.presenter?.onExportTrackButtonPress(.gpx, from: self.shareButton)
-      }
-      alert.addAction(kmlAction)
-      alert.addAction(gpxAction)
-      present(alert, animated: true, completion: nil)
-    }
   }
 
   private func configureTrackSharingMenu() {
-    if #available(iOS 14.0, *) {
-      let menu = UIMenu(title: "", image: nil, children: [
-        UIAction(title: L("export_file"), image: nil, handler: { [weak self] _ in
-          guard let self else { return }
-          self.presenter?.onExportTrackButtonPress(.text, from: self.shareButton)
-        }),
-        UIAction(title: L("export_file_gpx"), image: nil, handler: { [weak self] _ in
-          guard let self else { return }
-          self.presenter?.onExportTrackButtonPress(.gpx, from: self.shareButton)
-        }),
-      ])
-      shareButton.menu = menu
-      shareButton.showsMenuAsPrimaryAction = true
-    }
+    let menu = UIMenu(title: "", image: nil, children: [
+      UIAction(title: L("export_file"), image: nil, handler: { [weak self] _ in
+        guard let self else { return }
+        self.presenter?.onExportTrackButtonPress(.text, from: self.shareButton)
+      }),
+      UIAction(title: L("export_file_gpx"), image: nil, handler: { [weak self] _ in
+        guard let self else { return }
+        self.presenter?.onExportTrackButtonPress(.gpx, from: self.shareButton)
+      }),
+    ])
+    shareButton.menu = menu
+    shareButton.showsMenuAsPrimaryAction = true
   }
 }
diff --git a/iphone/Maps/UI/PlacePage/Components/PlacePageInfoViewController.swift b/iphone/Maps/UI/PlacePage/Components/PlacePageInfoViewController.swift
index d148e3586..f025dd373 100644
--- a/iphone/Maps/UI/PlacePage/Components/PlacePageInfoViewController.swift
+++ b/iphone/Maps/UI/PlacePage/Components/PlacePageInfoViewController.swift
@@ -488,16 +488,15 @@ class PlacePageInfoViewController: UIViewController {
                                      longPressHandler: { [weak self] in
       self?.copyCoordinatesToPasteboard()
     })
-    if #available(iOS 14.0, *) {
-      let menu = UIMenu(children: coordFormats.enumerated().map { (index, format) in
-        UIAction(title: format, handler: { [weak self] _ in
-          self?.setCoordinatesSelected(formatId: index)
-          self?.copyCoordinatesToPasteboard()
-        })
+    
+    let menu = UIMenu(children: coordFormats.enumerated().map { (index, format) in
+      UIAction(title: format, handler: { [weak self] _ in
+        self?.setCoordinatesSelected(formatId: index)
+        self?.copyCoordinatesToPasteboard()
       })
-      coordinatesView?.accessoryButton.menu = menu
-      coordinatesView?.accessoryButton.showsMenuAsPrimaryAction = true
-    }
+    })
+    coordinatesView?.accessoryButton.menu = menu
+    coordinatesView?.accessoryButton.showsMenuAsPrimaryAction = true
   }
 
   private func setCoordinatesSelected(formatId: Int) {
diff --git a/iphone/Maps/UI/PlacePage/PlacePageViewController.swift b/iphone/Maps/UI/PlacePage/PlacePageViewController.swift
index ad642e1f6..a2750209a 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageViewController.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePageViewController.swift
@@ -58,13 +58,6 @@ final class PlacePageScrollView: UIScrollView {
 
   override func viewDidLayoutSubviews() {
     super.viewDidLayoutSubviews()
-    if #available(iOS 13.0, *) {
-      // See https://github.com/organicmaps/organicmaps/issues/6917 for the details.
-    } else if previousTraitCollection == nil {
-      scrollView.contentInset = alternativeSizeClass(iPhone: UIEdgeInsets(top: scrollView.height, left: 0, bottom: 0, right: 0),
-                                                     iPad: UIEdgeInsets.zero)
-      updateSteps()
-    }
     panGesture.isEnabled = alternativeSizeClass(iPhone: false, iPad: true)
     previousTraitCollection = traitCollection
   }
@@ -170,8 +163,7 @@ final class PlacePageScrollView: UIScrollView {
     actionBarContainerView.layer.setCornerRadius(.modalSheet, maskedCorners: cornersToMask)
     actionBarContainerView.layer.masksToBounds = true
 
-    // See https://github.com/organicmaps/organicmaps/issues/6917 for the details.
-    if #available(iOS 13.0, *), previousTraitCollection == nil {
+    if previousTraitCollection == nil {
       scrollView.contentInset = alternativeSizeClass(iPhone: UIEdgeInsets(top: view.height, left: 0, bottom: 0, right: 0),
                                                      iPad: UIEdgeInsets.zero)
       scrollView.layoutIfNeeded()
diff --git a/iphone/Maps/UI/Search/SearchOnMap/PlaceholderView.swift b/iphone/Maps/UI/Search/SearchOnMap/PlaceholderView.swift
index d8a44a304..0568c76b0 100644
--- a/iphone/Maps/UI/Search/SearchOnMap/PlaceholderView.swift
+++ b/iphone/Maps/UI/Search/SearchOnMap/PlaceholderView.swift
@@ -61,11 +61,7 @@ final class PlaceholderView: UIView {
     if let activityIndicator = activityIndicator {
       activityIndicator.hidesWhenStopped = true
       activityIndicator.startAnimating()
-      if #available(iOS 13.0, *) {
-        activityIndicator.style = .medium
-      } else {
-        activityIndicator.style = .gray
-      }
+      activityIndicator.style = .medium
     }
 
     titleLabel.text = title
diff --git a/iphone/Maps/UI/Search/SearchOnMap/SearchOnMapHeaderView.swift b/iphone/Maps/UI/Search/SearchOnMap/SearchOnMapHeaderView.swift
index 5f006045b..de11d0772 100644
--- a/iphone/Maps/UI/Search/SearchOnMap/SearchOnMapHeaderView.swift
+++ b/iphone/Maps/UI/Search/SearchOnMap/SearchOnMapHeaderView.swift
@@ -65,11 +65,9 @@ final class SearchOnMapHeaderView: UIView {
     searchBar.setStyle(.defaultSearchBar)
     searchBar.placeholder = L("search")
     searchBar.showsCancelButton = false
-    if #available(iOS 13.0, *) {
-      searchBar.searchTextField.clearButtonMode = .always
-      searchBar.returnKeyType = .search
-      searchBar.searchTextField.enablesReturnKeyAutomatically = true
-    }
+    searchBar.searchTextField.clearButtonMode = .always
+    searchBar.returnKeyType = .search
+    searchBar.searchTextField.enablesReturnKeyAutomatically = true
   }
 
   private func setupCancelButton() {
diff --git a/iphone/Maps/UI/Search/SearchOnMap/SearchOnMapViewController.swift b/iphone/Maps/UI/Search/SearchOnMap/SearchOnMapViewController.swift
index f524f2d61..ff223501a 100644
--- a/iphone/Maps/UI/Search/SearchOnMap/SearchOnMapViewController.swift
+++ b/iphone/Maps/UI/Search/SearchOnMap/SearchOnMapViewController.swift
@@ -99,7 +99,7 @@ final class SearchOnMapViewController: UIViewController {
 
   override func viewWillTransition(to size: CGSize, with coordinator: any UIViewControllerTransitionCoordinator) {
     super.viewWillTransition(to: size, with: coordinator)
-    if #available(iOS 14.0, *), ProcessInfo.processInfo.isiOSAppOnMac {
+    if ProcessInfo.processInfo.isiOSAppOnMac {
       updateFrameOfPresentedViewInContainerView()
     }
   }

From fd63e77396cda6a63ed433729f2157f0a5dccfd7 Mon Sep 17 00:00:00 2001
From: Bastian Greshake Tzovaras <bgreshake@googlemail.com>
Date: Wed, 27 Aug 2025 11:19:25 -0300
Subject: [PATCH 272/302] [docs] add translation conflict resolution details

Signed-off-by: Bastian Greshake Tzovaras <bgreshake@googlemail.com>
---
 docs/TRANSLATIONS.md | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/docs/TRANSLATIONS.md b/docs/TRANSLATIONS.md
index 3dc7276a2..48cc57e96 100644
--- a/docs/TRANSLATIONS.md
+++ b/docs/TRANSLATIONS.md
@@ -76,15 +76,19 @@ It is recommended to add comments directly on Codeberg Translate, as translators
 
 The recommended approach for resolving conflicts is as follows:
 
-1. Commit all changes from the internal database to the internal Git repository:  
-   _Manage → Repository Maintenance → Commit (button)_.
-2. Update the `weblate-comaps-<component>` branch of the Translate's forked Git repository on Codeberg:  
-   _Manage → Repository Maintenance → Push (button)_.
-3. Locally checkout the `weblate-comaps-<component>` branch.
-4. Rebase it onto `main` of the main repository, resolving any conflicts during the process.
-5. Push the branch to Codeberg to update the pull request, then merge the branch or PR into `main`.
-6. Reset Codeberg Translate to sync changes from Codeberg:  
-   _Manage → Repository Maintenance → Reset (button)_.
+1. Make sure [the translations on Weblate are actually locked](https://translate.codeberg.org/projects/comaps/#repository), this ensures that no more changes are done on Weblate while the conflict is being fixed. You will need to have the right Weblate permissions to do this.
+2. Commit all changes from the _Weblate_ internal database to the Weblate-internal Git repository, the steps in the UI are: _Manage → Repository Maintenance → Commit (button)_. This ensures that all existing translations are in the Weblate-internal _Git_ repo. (this also requires the right Weblate permissions)
+3. Now you can add the weblate-internal Git repo as a remote for your local repo: `git remote add weblate https://translate.codeberg.org/git/comaps/android/`. This step only needs to be done the first time you have to resolve a conflict
+4. Make sure that your local main branch is at the latest remote state, e.g. by running `git checkout main; git pull`
+5. Now you can fetch the current state of the _Weblate_ remote: `git fetch weblate`
+6. To be able to rebase the Codeberg `main` into the Weblate one, you need to have an editable branch. You can create it using `git checkout -b resolve_translate weblate/main`. This creates a branch called `resolve_translate` off the Weblate remote, and also switches you to this newly created branch.
+7. You can now run `git rebase main`, to rebase the branch and resolve any conflicts that are between the two. (**Note: Make sure to run this command from your `resolve_translate` branch**)
+8. Once you have resolved the conflicts, you can push the `resolve_translate` branch to Codeberg: `git push` 
+9. Make a PR for merging your conflict-resolution-branch into `main` on Codeberg, and get it reviewed as usual
+10. Once the PR is merged into `main` on Codeberg and the merge conflict is gone, you can now unlock the translations on Weblate again. 
+11. **Optionally if necessary**: If the conflict hasn't resolved through the steps, you can optionally reset the Weblate from the admin backend for the `website` component, this forces the current state from the Codeberg git repo into Weblate: _Manage → Repository Maintenance → Reset (button)_.
+
+Using these steps all existing translations can still be kept and rebased into the repo, without losing work. The important bit is that you need to ensure that all translations are in the Weblate-internal git repository before you rebase, so that they get into the _actual_ Codeberg repo. 
 
 [codeberg_translate]: https://translate.codeberg.org/projects/comaps/
 [contribute]: https://docs.weblate.org/en/latest/workflows.html

From ae85b79c331f8631b927d965c03ebcc89ca0ab1e Mon Sep 17 00:00:00 2001
From: Yannik Bloscheck <git@yannikbloscheck.com>
Date: Thu, 28 Aug 2025 16:44:46 +0200
Subject: [PATCH 273/302] [ios] Stop unwanted map style changes when switching
 away from the app during route planing

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
---
 iphone/Maps/Core/Theme/Core/ThemeManager.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/iphone/Maps/Core/Theme/Core/ThemeManager.swift b/iphone/Maps/Core/Theme/Core/ThemeManager.swift
index f520ec011..6b0005a47 100644
--- a/iphone/Maps/Core/Theme/Core/ThemeManager.swift
+++ b/iphone/Maps/Core/Theme/Core/ThemeManager.swift
@@ -13,7 +13,7 @@ final class ThemeManager: NSObject {
     updateSystemUserInterfaceStyle(theme)
 
     let actualTheme: MWMTheme = { theme in
-      let isVehicleRouting = MWMRouter.isRoutingActive() && (MWMRouter.type() == .vehicle)
+      let isVehicleRouting = MWMRouter.isRoutingActive() && (MWMRouter.type() == .vehicle) && MWMRouter.hasSavedRoute()
       switch theme {
       case .day: fallthrough
       case .vehicleDay: return isVehicleRouting ? .vehicleDay : .day

From ca4b75dc51e8e51a1482cb0fc7bd55fa529f1c17 Mon Sep 17 00:00:00 2001
From: x7z4w <x7z4w@noreply.codeberg.org>
Date: Thu, 7 Aug 2025 11:43:39 +0000
Subject: [PATCH 274/302] [styles] Colored labels

Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>
---
 data/styles/default/dark/colors.mapcss   |   7 +
 data/styles/default/include/Icons.mapcss | 241 +++++++++++++++++++++--
 data/styles/default/light/colors.mapcss  |   7 +
 3 files changed, 244 insertions(+), 11 deletions(-)

diff --git a/data/styles/default/dark/colors.mapcss b/data/styles/default/dark/colors.mapcss
index 9ce96d6bd..f1f2e60b0 100644
--- a/data/styles/default/dark/colors.mapcss
+++ b/data/styles/default/dark/colors.mapcss
@@ -226,6 +226,13 @@
 @poi_label: #8C8C8C;
 @subway_label: #9E9E9E;
 @indigenous_label: #6A512F;
+@shop_label: #8C5F93;
+@food_label: #BB9342;
+@culture_label: #7F5933;
+@hotel_label: #6D544C;
+@healthcare_label: #C15746;
+@industry_label: #717065;
+@public_transport_label: #2F6499;
 
 /* 6.4 Road labels */
 
diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index 69c83f6e4..693755f9c 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -22,6 +22,7 @@
  6.1 Craft
 7.CAR
  7.1 Parking
+8. COLORED LABELS
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
 
@@ -43,7 +44,7 @@ node|z18-[office],
 {icon-image: office-m.svg;}
 
 node|z18-[craft],
-{icon-image: craft-m.svg;}
+{text-color: @shop_label;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;icon-image: craft-m.svg;}
 
 node|z16-[shop],
 {icon-min-distance: 10;}
@@ -204,30 +205,30 @@ node|z19-[amenity=water_point][drinking_water=not],
 
 node|z12-[railway=station],
 node|z13-[railway=halt],
-{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;}
+{text: name;text-color: @public_transport_label;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;}
 node|z12-[railway=station]::int_name,
 node|z13-[railway=halt]::int_name,
-{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;}
+{text: int_name;text-color: @public_transport_label;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;}
 
 node|z17-[railway=tram_stop],
-{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
+{text: name;text-color: @public_transport_label;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
 node|z17-[railway=tram_stop]::int_name,
-{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
+{text: int_name;text-color: @public_transport_label;text-halo-radius: 1;text-halo-opacity: 1;text-halo-color: @label_halo_light;}
 node|z17-[highway=bus_stop],
 node|z14-[amenity=bus_station],
-{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;text-position: center;}
+{text: name;text-color: @public_transport_label;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;text-position: center;}
 node|z17-[highway=bus_stop]::int_name,
 node|z14-[amenity=bus_station]::int_name,
-{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;text-position: center;}
+{text: int_name;text-color: @public_transport_label;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;text-position: center;}
 
 node|z10-[aeroway=aerodrome][aerodrome=international],
 node|z14-[aeroway=aerodrome],
 node|z15-[aerialway=station],
 node|z16-[amenity=ferry_terminal]
-{text: name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;}
+{text: name;text-color: @public_transport_label;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;}
 node|z12-[aeroway=aerodrome][aerodrome=international]::int_name,
 node|z14-[aeroway=aerodrome]::int_name,
-{text: int_name;text-color: @label_dark;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;}
+{text: int_name;text-color: @public_transport_label;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;text-position: center;}
 
 /* 3.1 Train Station */
 
@@ -347,7 +348,10 @@ node|z14-[aeroway=aerodrome]::int_name,
 {font-size: 11;}
 
 node|z16-[aeroway=helipad],
-{icon-image: helipad-m.svg;text-offset: 1;font-size: 10;text: name;text-color: @poi_label;}
+{icon-image: helipad-m.svg;text-offset: 1;font-size: 10;text: name;text-color: @public_transport_label;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;}
+
+node[aerialway=station]
+{text-color: @public_transport_label;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light;}
 
 /* 3.7 Aerialway */
 
@@ -1363,7 +1367,7 @@ node|z18-[power=generator][generator:source=wind],
 node|z15-[power=plant][plant:source=wind],
 {icon-image: power_plant_wind-m.svg;}
 node|z16-[power=plant][plant:source=wind],
-{text: name;text-color: @poi_label; text-offset: 1; font-size: 10;}
+{text: name;text-color: @industry_label;text-halo-radius: 1;text-halo-opacity: 0.9;text-halo-color: @label_halo_light; text-offset: 1; font-size: 10;}
 
 node|z17-[amenity=shower],
 {icon-image: shower-m.svg;}
@@ -2063,3 +2067,218 @@ node|z17-[amenity=motorcycle_parking],
 
 node|z18-[amenity=parking_space][parking_space=disabled],
 {icon-image: parking-disabled-m.svg;}
+
+/* 8. Colored Labels */
+
+node[shop=mall],
+node[shop=car_repair][service=tyres],
+node[amenity=studio],
+node[shop=alcohol],
+node[shop=antiques],
+node[shop=art],
+node[shop=bakery],
+node[shop=beauty],
+node[shop=beverages],
+node[shop=bicycle],
+node[shop=bookmaker],
+node[shop=books],
+node[shop=butcher],
+node[shop=camera],
+node[shop=car],
+node[shop=caravan],
+node[shop=charity],
+node[shop=cheese],
+node[shop=chemist],
+node[shop=chocolate],
+node[shop=clothes],
+node[shop=computer],
+node[shop=confectionery],
+node[shop=convenience],
+node[shop=copyshop],
+node[shop=cosmetics],
+node[shop=deli],
+node[shop=department_store],
+node[shop=doityourself],
+node[shop=dry_cleaning],
+node[shop=electronics],
+node[shop=erotic],
+node[shop=farm],
+node[shop=florist],
+node[shop=furniture],
+node[shop=garden_centre],
+node[shop=gift],
+node[shop=greengrocer],
+node[shop=grocery],
+node[shop=hairdresser],
+node[shop=hardware],
+node[shop=health_food],
+node[shop=houseware],
+node[shop=interior_decoration],
+node[shop=jewelry],
+node[shop=kiosk],
+node[shop=kitchen],
+node[shop=laundry],
+node[amenity=marketplace],
+node[shop=mobile_phone],
+node[shop=motorcycle],
+node[shop=music],
+node[shop=musical_instrument],
+node[shop=optician],
+node[shop=outdoor],
+node[shop=pasta],
+node[shop=pastry],
+node[shop=pet],
+node[shop=photo],
+node[shop=rental],
+node[shop=rental][rental=bike],
+node[shop=seafood],
+node[shop=second_hand],
+node[shop=sewing],
+node[shop=shoes],
+node[shop=sports],
+node[shop=stationery],
+node[shop=supermarket],
+node[shop=tattoo],
+node[shop=ticket],
+node[shop=toys],
+node[shop=tyres],
+node[shop=video],
+node[shop=video_games],
+node[shop=wine],
+node[leisure=bowling_alley],
+node[shop=variety_store],
+node[amenity=internet_cafe],
+node[shop],
+node[shop=auction],
+node[shop=collector],
+node[shop=fabric],
+node[shop=funeral_directors],
+node[shop=hearing_aids],
+node[shop=lottery],
+node[shop=tobacco],
+node[shop=wholesale],
+{text-color: @shop_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[amenity=bar],
+node[amenity=biergarten],
+node[amenity=cafe],
+node[amenity=fast_food],
+node[amenity=food_court],
+node[amenity=pub],
+node[amenity=restaurant],
+node[amenity=ice_cream],
+node[amenity=nightclub],
+node[amenity=stripclub],
+{text-color: @food_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[amenity=arts_centre],
+node[amenity=cinema],
+node[amenity=community_centre],
+node[amenity=place_of_worship]
+node[amenity=social_facility],
+node[amenity=theatre],
+node[attraction=amusement_ride],
+node[attraction=animal],
+node[attraction=big_wheel],
+node[attraction=bumper_car],
+node[attraction=carousel],
+node[attraction=historic],
+node[attraction=maze],
+node[attraction=roller_coaster],
+node[leisure=escape_game],
+node[leisure=stadium],
+node[tourism=aquarium],
+node[tourism=attraction],
+node[tourism=gallery],
+node[tourism=museum],
+node[tourism=theme_park],
+node[tourism=zoo]
+node[tourism=zoo],
+node[historic=ship],
+node[amenity=conference_centre],
+node[amenity=events_venue],
+node[amenity=exhibition_centre],
+node[leisure=marina],
+node[amenity=casino],
+node[amenity=gambling],
+node[amenity=public_bath],
+node[leisure=adult_gaming_centre],
+node[leisure=amusement_arcade],
+node[shop=massage],
+{text-color: @culture_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[tourism=alpine_hut],
+node[leisure=resort],
+node[tourism=apartment],
+node[tourism=chalet],
+node[tourism=guest_house],
+node[tourism=hostel],
+node[tourism=hotel],
+node[tourism=motel],
+node[tourism=wilderness_hut],
+{text-color: @hotel_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+area[amenity=hospital],
+node[amenity=clinic],
+node[amenity=dentist],
+node[amenity=doctors],
+node[amenity=hospital],
+node[amenity=pharmacy],
+node[amenity=veterinary],
+node[healthcare],
+{text-color: @healthcare_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+area[amenity=university][name]
+node[aeroway=gate],
+node[amenity=atm],
+node[amenity=bank],
+node[amenity=bureau_de_change],
+node[amenity=charging_station][motorcar?],
+node[amenity=childcare],
+node[amenity=college],
+node[amenity=courthouse],
+node[amenity=driving_school],
+node[amenity=kindergarten],
+node[amenity=language_school],
+node[amenity=library],
+node[amenity=money_transfer],
+node[amenity=music_school],
+node[amenity=nursing_home],
+node[amenity=police],
+node[amenity=post_office],
+node[amenity=prison],
+node[amenity=school],
+node[amenity=townhall],
+node[amenity=university][name],
+node[barrier=border_control],
+node[leisure=beach_resort],
+node[leisure=hackerspace],
+node[office],
+node[amenity=fuel],
+node[landuse=industrial][industrial=mine],
+node[landuse=quarry],
+node[tourism=information][information=office],
+node[amenity=vehicle_inspection],
+node[shop=car_parts],
+node[shop=car_repair],
+node[shop=dry_cleaning],
+node[shop=laundry],
+node[shop=motorcycle_repair],
+node[amenity=car_wash],
+node[amenity=motorcycle_rental],
+node[leisure=dance],
+node[leisure=fitness_centre],
+node[leisure=sports_centre],
+node[leisure=sports_hall],
+node[man_made=works],
+node[shop=money_lender],
+node[shop=pawnbroker],
+node[sport=yoga],
+node[amenity=car_rental],
+node[amenity=car_sharing],
+node[amenity=fire_station],
+{text-color: @industry_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
+
+node[amenity=bicycle_rental],
+node[amenity=taxi],
+{text-color: @public_transport_label;text-halo-radius: 0.1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
diff --git a/data/styles/default/light/colors.mapcss b/data/styles/default/light/colors.mapcss
index 5fafc2074..d3ad00d03 100644
--- a/data/styles/default/light/colors.mapcss
+++ b/data/styles/default/light/colors.mapcss
@@ -224,6 +224,13 @@
 @poi_label: #444444;
 @subway_label: #333333;
 @indigenous_label: #6A512F;
+@shop_label: #8C5678;
+@food_label: #BA7141;
+@culture_label: #82512D;
+@hotel_label: #54413B;
+@healthcare_label: #A6454B;
+@industry_label: #494F54;
+@public_transport_label: #1F4366;
 
 /* 6.4 Road labels */
 

From 88e52b34217f81f03cfc408448bc14766d73a302 Mon Sep 17 00:00:00 2001
From: Yannik Bloscheck <git@yannikbloscheck.com>
Date: Tue, 26 Aug 2025 21:43:21 +0200
Subject: [PATCH 275/302] [styles] Changed light transport label to a lighter
 color

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
---
 data/styles/default/light/colors.mapcss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/styles/default/light/colors.mapcss b/data/styles/default/light/colors.mapcss
index d3ad00d03..7b4ee0647 100644
--- a/data/styles/default/light/colors.mapcss
+++ b/data/styles/default/light/colors.mapcss
@@ -230,7 +230,7 @@
 @hotel_label: #54413B;
 @healthcare_label: #A6454B;
 @industry_label: #494F54;
-@public_transport_label: #1F4366;
+@public_transport_label: #234B73;
 
 /* 6.4 Road labels */
 

From 0d978e4b71efed5b3a64475ce5cd541b72f57d13 Mon Sep 17 00:00:00 2001
From: Yannik Bloscheck <git@yannikbloscheck.com>
Date: Fri, 22 Aug 2025 13:10:03 +0200
Subject: [PATCH 276/302] [styles] Improved dark map style

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
---
 data/styles/default/dark/colors.mapcss        | 200 +++++++++---------
 data/styles/default/dark/symbols/garden-m.svg |   2 +-
 .../default/dark/symbols/garden-outline-m.svg |   2 +-
 data/styles/default/dark/symbols/npark-m.svg  |   2 +-
 data/styles/default/dark/symbols/nparkf-m.svg |   2 +-
 .../default/dark/symbols/nparkf-outline-m.svg |   2 +-
 .../default/dark/symbols/nparkf-outline-s.svg |   2 +-
 data/styles/default/dark/symbols/nparkf-s.svg |   2 +-
 data/styles/default/dark/symbols/park-m.svg   |   2 +-
 .../default/dark/symbols/park-outline-m.svg   |   2 +-
 .../default/dark/symbols/park-outline-s.svg   |   2 +-
 data/styles/default/dark/symbols/park-s.svg   |   2 +-
 .../default/dark/symbols/plant_nursery-m.svg  |   2 +-
 13 files changed, 112 insertions(+), 112 deletions(-)

diff --git a/data/styles/default/dark/colors.mapcss b/data/styles/default/dark/colors.mapcss
index f1f2e60b0..849edcbf7 100644
--- a/data/styles/default/dark/colors.mapcss
+++ b/data/styles/default/dark/colors.mapcss
@@ -26,8 +26,8 @@
 
 /* 1.BASEMAP */
 
-@background0: #000000;
-@background1: #000000;
+@background0: #181715;
+@background1: #181715;
 
 /* 2.BOUNDARY */
 
@@ -38,121 +38,121 @@
 /* 3.NATURAL */
 /* 3.1 Main natural */
 
-@glacier: #111111;
-@water: #002222;
-@water_bad: #00261e;
-@wetland_tidal: #001919;
-@wetland_tidal_saltmarsh: #001919;
-@wetland_saltmarsh: #001919;
-@wetland_marsh: #001919;
-@wetland_fen: #001919;
-@wetland_bog: #001919;
-@wetland_reedbed: #001919;
-@wetland_swamp: #001919;
-@wetland_mangrove: #001919;
-@beach: #28281A;
-@barerock: #302A2A;
-@scree: #242020;
-@desert: #191007;
+@glacier: #333333;
+@water: #344E54;
+@water_bad: #364D4F;
+@wetland_tidal: #3C5053;
+@wetland_tidal_saltmarsh: #3D5350;
+@wetland_saltmarsh: #41544B;
+@wetland_marsh: #41544A;
+@wetland_fen: #45544B;
+@wetland_bog: #455348;
+@wetland_reedbed: #4A5550;
+@wetland_swamp: #3D5045;
+@wetland_mangrove: #3E5143;
+@beach: #322C20;
+@barerock: #2B2A26;
+@scree: #292825;
+@desert: #312E28;
 
 /*3.2 Vegetation*/
 
-@residential_garden: #000000;
-@residential_garden_13: #000000;
-@residential_garden_12: #000000;
-@park: #000000;
-@park_13: #000000;
-@park_12: #000000;
-@park_11: #000000;
-@park_10: #000000;
-@heath: #141C00;
-@heath_13: #141C00;
-@heath_12: #141C00;
-@heath_11: #141C00;
-@grass: #141C00;
-@grass_13: #141C00;
-@grass_12: #141C00;
-@grass_11: #141C00;
-@flowers: #141C00;
-@golf: #141C00;
-@golf_13: #141C00;
-@golf_12: #141C00;
-@allotments: #141C00;
-@allotments_13: #141C00;
-@allotments_12: #141C00;
-@scrubs: #141C00;
-@scrubs_13: #141C00;
-@scrubs_12: #141C00;
-@scrubs_11: #141C00;
-@woods: #161F00;
-@woods_13: #161F00;
-@woods_12: #161F00;
-@woods_11: #161F00;
-@woods_10: #161F00;
+@residential_garden: #171614;
+@residential_garden_13: #171614;
+@residential_garden_12: #171614;
+@park: #2B2C1D;
+@park_13: #2A2B1D;
+@park_12: #292A1C;
+@park_11: #29281C;
+@park_10: #27281B;
+@heath: #292B1E;
+@heath_13: #282A1D;
+@heath_12: #27291D;
+@heath_11: #27281D;
+@grass: #272A1A;
+@grass_13: #26291A;
+@grass_12: #252819;
+@grass_11: #252719;
+@flowers: #262918;
+@golf: #252816;
+@golf_13: #242716;
+@golf_12: #232616;
+@allotments: #2B2A1E;
+@allotments_13: #2A291D;
+@allotments_12: #29281D;
+@scrubs: #222713;
+@scrubs_13: #212613;
+@scrubs_12: #212513;
+@scrubs_11: #212413;
+@woods: #202510;
+@woods_13: #1F2410;
+@woods_12: #1F2310;
+@woods_11: #1F2211;
+@woods_10: #1F2311;
 
-@protected_nature: #2F4000;
+@protected_nature: #191D0B;
 
 
 /* 4.LANDUSE */
 /*4.1 Main landuse*/
 
-@general_area: #000000;
-@pedestrian_area: #262222;
-@railway_platform: #262222;
-@university: #261F13;
-@hospital: #261916;
-@industrial: #191419;
-@construction_area: #191419;
-@sport0: #21211B;
-@sport1: #262620;
-@sport2: #2A2A24;
-@playground: #2A2A24;
-@parking: #1F1B1B;
+@general_area: #1B1A19;
+@pedestrian_area: #32312E;
+@railway_platform: #232220;
+@university: #1D1A16;
+@hospital: #1E1A19;
+@industrial: #1C1C1C;
+@construction_area: #1C1C1C;
+@sport0: #31302A;
+@sport1: #2E2E27;
+@sport2: #2A2E1E;
+@playground: #2E2E20;
+@parking: #1E1F1F;
 @military: #B71C1C;
 @prison: #7f7f7f;
-@farmland: #151500;
-@farmyard: #212106;
+@farmland: #2D2C22;
+@farmyard: #2E2B23;
 
 /*4.2 Aerodrome*/
 
- @aerodrome0: #382D45;
- @aerodrome1: #342A40;
- @aerodrome2: #30263B;
- @aerodrome3: #30263B;
- @aerodrome4: #2B2336;
- @aerodrome5: #292133;
+@aerodrome0: #2D373D;
+@aerodrome1: #2C363C;
+@aerodrome2: #2C363B;
+@aerodrome3: #2B353A;
+@aerodrome4: #293339;
+@aerodrome5: #273137;
 
 /* 4.3 Barriers */
-@fence: #444444;
-@hedge: #183218;
-@cliff: #7D4F23;
+@fence: #292929;
+@hedge: #2C3218;
+@cliff: #273137;
 
 /* 4.4 Buildings */
 
-@building0: #3B3B3B;
-@building1: #424242;
-@building_border0: #616161;
-@building_border1: #696969;
-@historic_wall: #696969;
+@building0: #2B2B2A;
+@building1: #2A2A29;
+@building_border0: #20201E;
+@building_border1: #1F1F1D;
+@historic_wall: #232320;
 
 /* 5.ROADS */
 /* 5.1 All roads */
 
-@motorway0: #3B2015;
-@motorway1: #3B2015;
-@trunk0: #49291B;
-@trunk1: #49291B;
-@primary0: #593323;
-@primary1: #593323;
-@primary2: #593323;
-@secondary0: #573E33;
-@secondary1: #573E33;
-@tertiary: #4F4A47;
-@residential: #4B4643;
-@pedestrian: #4D4744;
-@footway: #4B4643;
-@cycleway: #6E3D47;
-@construction: #332F2D;
+@motorway0: #7A4006;
+@motorway1: #784606;
+@trunk0: #794D11;
+@trunk1: #79511D;
+@primary0: #7A5C2A;
+@primary1: #7C5E24;
+@primary2: #7C622F;
+@secondary0: #7F6730;
+@secondary1: #7F6B3C;
+@tertiary: #4C4B4B;
+@residential: #4C4C4C;
+@pedestrian: #4C4B4B;
+@footway: #4C4B4B;
+@cycleway: #48477F;
+@construction: #5A5D65;
 @track: #5F532D;
 @path: #944A12;
 @path_expert: #523E33;
@@ -198,7 +198,7 @@
 @aerialway: #4E4E3D;
 @powerline: #333333;
 @tram: #5C5C51;
-@ferry: #2A4541;
+@ferry: #4F686E;
 
 /* 6.LABELS COLORS */
 /* 6.1 Main labels */
@@ -211,16 +211,16 @@
 
 /* 6.2 Natural labels */
 
-@water_label: #004A59;
-@park_label: #2B4918;
+@water_label: #58747A;
+@park_label: #4A6141;
 @halo_park_label: #111;
 
 /* 6.3 Place labels */
 
 @city_label: #999999;
-@country_label: #444444;
-@state_label: #444444;
-@district_label: #555555;
+@country_label: #555555;
+@state_label: #555555;
+@district_label: #7A7A7A;
 @housenumber: #747474;
 @building_label: #767676;
 @poi_label: #8C8C8C;
diff --git a/data/styles/default/dark/symbols/garden-m.svg b/data/styles/default/dark/symbols/garden-m.svg
index a9568113e..a27471a21 100644
--- a/data/styles/default/dark/symbols/garden-m.svg
+++ b/data/styles/default/dark/symbols/garden-m.svg
@@ -1,7 +1,7 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
   <title>garden-m.svg</title>
   <g id="garden-m.svg" opacity="0.6">
-    <path id="Shape" fill="#507F34"
+    <path id="Shape" fill="#3C612E"
       d="m13.54 15.446c-0.91906 0.94448-1.2536 2.2585-1.0072 3.4737 1.1827 0.25292 2.4636-0.091461 3.3835-1.0341 0.91815-0.94354 1.2518-2.2576 1.0054-3.4727-1.1818-0.25198-2.4626 0.091461-3.3817 1.0331zm-6.4616-1.0331c-0.24636 1.2151 0.089088 2.5292 1.0063 3.4727 0.91906 0.94354 2.2008 1.287 3.3826 1.0341 0.24636-1.2151-0.089088-2.5292-1.0063-3.4737-0.91906-0.94168-2.2008-1.2851-3.3826-1.0331zm6.0144-1.1255c0-0.23052-0.033635-0.45077-0.084543-0.66636 0.11272 0.18572 0.2409 0.36678 0.39817 0.52823 0.43908 0.45077 0.98633 0.72142 1.5545 0.81568 0.43453 0.069996 0.84906-0.35465 0.77816-0.79982-0.090906-0.58423-0.35544-1.1451-0.79361-1.594-0.15909-0.16426-0.33544-0.29492-0.51726-0.41064 0.20818 0.049464 0.42271 0.084928 0.64543 0.084928 0.61998 0 1.1927-0.20532 1.659-0.55063 0.35635-0.26598 0.35635-0.86795 0-1.1311-0.46635-0.34811-1.04-0.55157-1.6599-0.55157-0.22454 0-0.43908 0.034531-0.64816 0.084928 0.17999-0.11573 0.35726-0.24639 0.51362-0.40784 0.43908-0.45077 0.7027-1.0117 0.79452-1.595 0.067271-0.44704-0.34544-0.87168-0.77998-0.79982-0.56816 0.093328-1.1145 0.36584-1.5536 0.81568-0.15909 0.16332-0.28635 0.34438-0.39999 0.53197 0.049998-0.21372 0.084543-0.43397 0.084543-0.66356 0-0.63836-0.2009-1.2245-0.53907-1.7032-0.25636-0.36678-0.8427-0.36678-1.1 0-0.33817 0.47877-0.53726 1.0658-0.53726 1.7032 0 0.22959 0.034544 0.45077 0.083634 0.66729-0.11272-0.18666-0.23999-0.36678-0.39726-0.5273-0.43908-0.45077-0.98542-0.72142-1.5536-0.81568-0.43544-0.071862-0.84906 0.35371-0.77998 0.79702 0.091815 0.58516 0.35453 1.1461 0.79543 1.5959 0.15818 0.16332 0.33453 0.29585 0.51817 0.41158-0.20908-0.050397-0.42362-0.084928-0.64634-0.084928-0.6218 0-1.1927 0.20532-1.6599 0.55063-0.35635 0.26412-0.35635 0.86608 0 1.1302 0.46726 0.34811 1.0391 0.5525 1.6599 0.5525 0.22363 0 0.43908-0.035464 0.64816-0.085862-0.1809 0.11573-0.35726 0.24545-0.51362 0.40691-0.43908 0.45077-0.7027 1.0126-0.79361 1.5968-0.06818 0.44704 0.34453 0.87075 0.77816 0.79795 0.56907-0.093328 1.1154-0.36398 1.5536-0.81382 0.15909-0.16332 0.28817-0.34438 0.4009-0.53197-0.049089 0.21372-0.082725 0.43397-0.082725 0.66263-0.0018181 0.63743 0.19908 1.2245 0.53726 1.7023 0.25636 0.36678 0.8427 0.36678 1.1 0 0.33817-0.47784 0.53726-1.0658 0.53726-1.7032zm-1.0927-1.6612c-0.80361 0-1.4545-0.66729-1.4545-1.4932 0-0.82502 0.65089-1.4932 1.4545-1.4932 0.80452 0 1.4545 0.66823 1.4545 1.4932 0 0.82595-0.64998 1.4932-1.4545 1.4932z" />
   </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/garden-outline-m.svg b/data/styles/default/dark/symbols/garden-outline-m.svg
index 8a6f8917b..7930aff4a 100644
--- a/data/styles/default/dark/symbols/garden-outline-m.svg
+++ b/data/styles/default/dark/symbols/garden-outline-m.svg
@@ -7,6 +7,6 @@
       fill="#111" />
     <path
       d="m13.54 15.446c-0.91906 0.94448-1.2536 2.2585-1.0072 3.4737 1.1827 0.25292 2.4636-0.09146 3.3835-1.0341 0.91815-0.94354 1.2518-2.2576 1.0054-3.4727-1.1818-0.25198-2.4626 0.09146-3.3817 1.0331zm-6.4616-1.0331c-0.24636 1.2151 0.089088 2.5292 1.0063 3.4727 0.91906 0.94354 2.2008 1.287 3.3826 1.0341 0.24636-1.2151-0.089088-2.5292-1.0063-3.4737-0.91906-0.94168-2.2008-1.2851-3.3826-1.0331zm6.0144-1.1255c0-0.23052-0.03364-0.45077-0.08454-0.66636 0.11272 0.18572 0.2409 0.36678 0.39817 0.52823 0.43908 0.45077 0.98633 0.72142 1.5545 0.81568 0.43453 0.07 0.84906-0.35465 0.77816-0.79982-0.09091-0.58423-0.35544-1.1451-0.79361-1.594-0.15909-0.16426-0.33544-0.29492-0.51726-0.41064 0.20818 0.04946 0.42271 0.08493 0.64543 0.08493 0.61998 0 1.1927-0.20532 1.659-0.55063 0.35635-0.26598 0.35635-0.86795 0-1.1311-0.46635-0.34811-1.04-0.55157-1.6599-0.55157-0.22454 0-0.43908 0.034531-0.64816 0.084928 0.17999-0.11573 0.35726-0.24639 0.51362-0.40784 0.43908-0.45077 0.7027-1.0117 0.79452-1.595 0.06727-0.44704-0.34544-0.87168-0.77998-0.79982-0.56816 0.093328-1.1145 0.36584-1.5536 0.81568-0.15909 0.16332-0.28635 0.34438-0.39999 0.53197 0.05-0.21372 0.08454-0.43397 0.08454-0.66356 0-0.63836-0.2009-1.2245-0.53907-1.7032-0.25636-0.36678-0.8427-0.36678-1.1 0-0.33817 0.47877-0.53726 1.0658-0.53726 1.7032 0 0.22959 0.03454 0.45077 0.08363 0.66729-0.11272-0.18666-0.23999-0.36678-0.39726-0.5273-0.43908-0.45077-0.98542-0.72142-1.5536-0.81568-0.43544-0.071862-0.84906 0.35371-0.77998 0.79702 0.091815 0.58516 0.35453 1.1461 0.79543 1.5959 0.15818 0.16332 0.33453 0.29585 0.51817 0.41158-0.20908-0.050397-0.42362-0.084928-0.64634-0.084928-0.6218 0-1.1927 0.20532-1.6599 0.55063-0.35635 0.26412-0.35635 0.86608 0 1.1302 0.46726 0.34811 1.0391 0.5525 1.6599 0.5525 0.22363 0 0.43908-0.03546 0.64816-0.08586-0.1809 0.11573-0.35726 0.24545-0.51362 0.40691-0.43908 0.45077-0.7027 1.0126-0.79361 1.5968-0.06818 0.44704 0.34453 0.87075 0.77816 0.79795 0.56907-0.09333 1.1154-0.36398 1.5536-0.81382 0.15909-0.16332 0.28817-0.34438 0.4009-0.53197-0.04909 0.21372-0.08272 0.43397-0.08272 0.66263-0.0018 0.63743 0.19908 1.2245 0.53726 1.7023 0.25636 0.36678 0.8427 0.36678 1.1 0 0.33817-0.47784 0.53726-1.0658 0.53726-1.7032zm-1.0927-1.6612c-0.80361 0-1.4545-0.66729-1.4545-1.4932 0-0.82502 0.65089-1.4932 1.4545-1.4932 0.80452 0 1.4545 0.66823 1.4545 1.4932 0 0.82595-0.64998 1.4932-1.4545 1.4932z"
-      fill="#507f34" />
+      fill="#3C612E" />
   </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/npark-m.svg b/data/styles/default/dark/symbols/npark-m.svg
index 3801d4b36..f11ca8c14 100644
--- a/data/styles/default/dark/symbols/npark-m.svg
+++ b/data/styles/default/dark/symbols/npark-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
   <g id="npark-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#fff"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#507F34"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#3C612E"/>
    <path id="Shape" d="m13.306 6c-1.8056 0-3.25 1.4444-3.25 3.25 0 4.0444-1.95 5.2722-5.0556 4.6944 0 0 1.7799 2.5489 5.3941 2.8663-0.20684 0.23582-0.2934 0.47396-0.2934 0.47396l1.3542 0.54167s-0.027683 0.011787 0.067708-0.067708c0.095393-0.079494 0.27234-0.20312 0.69965-0.20312 0.85463 0 1.7378 0.58681 1.7378 0.58681l0.85764-1.1736s-0.59695-0.4277-1.467-0.67708c1.82-0.98427 3.0407-3.2602 3.1823-6.4323l1.467-0.97049-1.6701-0.78993c-0.46434-1.2247-1.6294-2.099-3.0243-2.099zm1.0833 2.1667c0.43333 0 0.72222 0.28889 0.72222 0.72222s-0.28889 0.72222-0.72222 0.72222-0.72222-0.28889-0.72222-0.72222 0.28889-0.72222 0.72222-0.72222z" fill="#fff"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/nparkf-m.svg b/data/styles/default/dark/symbols/nparkf-m.svg
index babc59135..08528f864 100644
--- a/data/styles/default/dark/symbols/nparkf-m.svg
+++ b/data/styles/default/dark/symbols/nparkf-m.svg
@@ -3,6 +3,6 @@
   <g id="nparkF-s" transform="scale(1.5)" opacity="0.6">
     <path id="Path"
       d="m10.332 7.8176h0.038793c0.39278 0 0.62069-0.44127 0.39763-0.76131l-2.4634-3.5156c-0.19396-0.2764-0.60129-0.2764-0.79525 0l-2.444 3.5156c-0.22306 0.32004 0.0096982 0.76131 0.40248 0.76131h0.019396l-1.4062 2.1627c-0.21336 0.32004 0.019396 0.74676 0.40733 0.74676h2.4634v0.97952c0 0.52855 0.43157 0.96012 0.96012 0.96012 0.52855 0 0.96012-0.43157 0.96012-0.96012v-0.97952h2.4973c0.38793 0 0.62069-0.43157 0.40248-0.75161l-1.4402-2.1579z"
-      fill="#507F34" />
+      fill="#3C612E" />
   </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/nparkf-outline-m.svg b/data/styles/default/dark/symbols/nparkf-outline-m.svg
index 79aab0354..cbffbaa8c 100644
--- a/data/styles/default/dark/symbols/nparkf-outline-m.svg
+++ b/data/styles/default/dark/symbols/nparkf-outline-m.svg
@@ -7,6 +7,6 @@
       fill="#111" />
     <path
       d="m10.332 7.8176h0.03879c0.39278 0 0.62069-0.44127 0.39763-0.76131l-2.4634-3.5156c-0.19396-0.2764-0.60129-0.2764-0.79525 0l-2.444 3.5156c-0.22306 0.32004 0.0097 0.76131 0.40248 0.76131h0.019396l-1.4062 2.1627c-0.21336 0.32004 0.019396 0.74676 0.40733 0.74676h2.4634v0.97952c0 0.52855 0.43157 0.96012 0.96012 0.96012s0.96012-0.43157 0.96012-0.96012v-0.97952h2.4973c0.38793 0 0.62069-0.43157 0.40248-0.75161l-1.4402-2.1579z"
-      fill="#507f34" />
+      fill="#3C612E" />
   </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/nparkf-outline-s.svg b/data/styles/default/dark/symbols/nparkf-outline-s.svg
index da6bb66a5..80064239d 100644
--- a/data/styles/default/dark/symbols/nparkf-outline-s.svg
+++ b/data/styles/default/dark/symbols/nparkf-outline-s.svg
@@ -7,6 +7,6 @@
       fill="#111" />
     <path
       d="m10.332 7.8176h0.03879c0.39278 0 0.62069-0.44127 0.39763-0.76131l-2.4634-3.5156c-0.19396-0.2764-0.60129-0.2764-0.79525 0l-2.444 3.5156c-0.22306 0.32004 0.0097 0.76131 0.40248 0.76131h0.019396l-1.4062 2.1627c-0.21336 0.32004 0.019396 0.74676 0.40733 0.74676h2.4634v0.97952c0 0.52855 0.43157 0.96012 0.96012 0.96012s0.96012-0.43157 0.96012-0.96012v-0.97952h2.4973c0.38793 0 0.62069-0.43157 0.40248-0.75161l-1.4402-2.1579z"
-      fill="#507f34" />
+      fill="#3C612E" />
   </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/nparkf-s.svg b/data/styles/default/dark/symbols/nparkf-s.svg
index d4b1b1b5c..5d288059f 100644
--- a/data/styles/default/dark/symbols/nparkf-s.svg
+++ b/data/styles/default/dark/symbols/nparkf-s.svg
@@ -3,6 +3,6 @@
   <g id="nparkF-s" opacity="0.6">
     <path id="Path"
       d="m10.332 7.8176h0.038793c0.39278 0 0.62069-0.44127 0.39763-0.76131l-2.4634-3.5156c-0.19396-0.2764-0.60129-0.2764-0.79525 0l-2.444 3.5156c-0.22306 0.32004 0.0096982 0.76131 0.40248 0.76131h0.019396l-1.4062 2.1627c-0.21336 0.32004 0.019396 0.74676 0.40733 0.74676h2.4634v0.97952c0 0.52855 0.43157 0.96012 0.96012 0.96012 0.52855 0 0.96012-0.43157 0.96012-0.96012v-0.97952h2.4973c0.38793 0 0.62069-0.43157 0.40248-0.75161l-1.4402-2.1579z"
-      fill="#507F34" />
+      fill="#3C612E" />
   </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/park-m.svg b/data/styles/default/dark/symbols/park-m.svg
index 3d6b5b8bb..09d23b1e5 100644
--- a/data/styles/default/dark/symbols/park-m.svg
+++ b/data/styles/default/dark/symbols/park-m.svg
@@ -3,6 +3,6 @@
   <g id="park-s.svg" transform="scale(1.5)" opacity=".6">
     <path id="Path"
       d="m7.1111 12.667v-2.2069c-0.24329 0.086022-0.50504 0.13279-0.77778 0.13279-1.2887 0-2.3333-1.0447-2.3333-2.3333 0-0.65613 0.27081-1.249 0.70675-1.6729-0.12115-0.2822-0.18823-0.5931-0.18823-0.91967 0-1.2887 1.0447-2.3333 2.3333-2.3333 0.81029 0 1.5241 0.41302 1.9424 1.04 0.043607-0.0019859 0.087526-0.0029867 0.13165-0.0029867 1.5751 0 2.8519 1.2768 2.8519 2.8519 0 1.5751-1.2768 2.8519-2.8519 2.8519-0.26963 0-0.53055-0.037437-0.77778-0.10733v2.6999h-1.037z"
-      fill="#507F34" />
+      fill="#3C612E" />
   </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/park-outline-m.svg b/data/styles/default/dark/symbols/park-outline-m.svg
index 02e10e8f1..38c39cbf0 100644
--- a/data/styles/default/dark/symbols/park-outline-m.svg
+++ b/data/styles/default/dark/symbols/park-outline-m.svg
@@ -7,6 +7,6 @@
       fill="#111" />
     <path
       d="m7.1111 12.667v-2.2069c-0.24329 0.08602-0.50504 0.13279-0.77778 0.13279-1.2887 0-2.3333-1.0447-2.3333-2.3333 0-0.65613 0.27081-1.249 0.70675-1.6729-0.12115-0.2822-0.18823-0.5931-0.18823-0.91967 0-1.2887 1.0447-2.3333 2.3333-2.3333 0.81029 0 1.5241 0.41302 1.9424 1.04 0.043607-0.00199 0.087526-0.00299 0.13165-0.00299 1.5751 0 2.8519 1.2768 2.8519 2.8519s-1.2768 2.8519-2.8519 2.8519c-0.26963 0-0.53055-0.03744-0.77778-0.10733v2.6999h-1.037z"
-      fill="#507f34" />
+      fill="#3C612E" />
   </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/park-outline-s.svg b/data/styles/default/dark/symbols/park-outline-s.svg
index 3ea30ba49..c91297770 100644
--- a/data/styles/default/dark/symbols/park-outline-s.svg
+++ b/data/styles/default/dark/symbols/park-outline-s.svg
@@ -7,6 +7,6 @@
       fill="#111" />
     <path
       d="m7.1111 12.667v-2.2069c-0.24329 0.08602-0.50504 0.13279-0.77778 0.13279-1.2887 0-2.3333-1.0447-2.3333-2.3333 0-0.65613 0.27081-1.249 0.70675-1.6729-0.12115-0.2822-0.18823-0.5931-0.18823-0.91967 0-1.2887 1.0447-2.3333 2.3333-2.3333 0.81029 0 1.5241 0.41302 1.9424 1.04 0.043607-0.00199 0.087526-0.00299 0.13165-0.00299 1.5751 0 2.8519 1.2768 2.8519 2.8519s-1.2768 2.8519-2.8519 2.8519c-0.26963 0-0.53055-0.03744-0.77778-0.10733v2.6999h-1.037z"
-      fill="#507f34" />
+      fill="#3C612E" />
   </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/park-s.svg b/data/styles/default/dark/symbols/park-s.svg
index 5690849a5..3d494c1b4 100644
--- a/data/styles/default/dark/symbols/park-s.svg
+++ b/data/styles/default/dark/symbols/park-s.svg
@@ -3,6 +3,6 @@
   <g id="park-s.svg" opacity=".6">
     <path id="Path"
       d="m7.1111 12.667v-2.2069c-0.24329 0.086022-0.50504 0.13279-0.77778 0.13279-1.2887 0-2.3333-1.0447-2.3333-2.3333 0-0.65613 0.27081-1.249 0.70675-1.6729-0.12115-0.2822-0.18823-0.5931-0.18823-0.91967 0-1.2887 1.0447-2.3333 2.3333-2.3333 0.81029 0 1.5241 0.41302 1.9424 1.04 0.043607-0.0019859 0.087526-0.0029867 0.13165-0.0029867 1.5751 0 2.8519 1.2768 2.8519 2.8519 0 1.5751-1.2768 2.8519-2.8519 2.8519-0.26963 0-0.53055-0.037437-0.77778-0.10733v2.6999h-1.037z"
-      fill="#507F34" />
+      fill="#3C612E" />
   </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/plant_nursery-m.svg b/data/styles/default/dark/symbols/plant_nursery-m.svg
index 8dddc48f5..e0545756b 100644
--- a/data/styles/default/dark/symbols/plant_nursery-m.svg
+++ b/data/styles/default/dark/symbols/plant_nursery-m.svg
@@ -3,7 +3,7 @@
 <svg version="1.0" xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 512 512"
     preserveAspectRatio="xMidYMid meet">
 
-  <g id="plant_nursery-m.svg" opacity="0.6" transform="translate(0.000000,512.000000) scale(0.100000,-0.100000)" fill="#507F34" stroke="none" >
+  <g id="plant_nursery-m.svg" opacity="0.6" transform="translate(0.000000,512.000000) scale(0.100000,-0.100000)" fill="#3C612E" stroke="none" >
     <path d="M2340 4773 c-376 -39 -726 -154 -1033 -341 -581 -353 -987 -928
 -1121 -1585 -45 -218 -46 -263 -46 -1412 l0 -1095 150 0 150 0 0 1084 c0 1192
 0 1199 61 1446 97 393 296 733 600 1025 745 714 1906 781 2737 158 96 -72 274

From 395c8d77871df70ac08aa74fcd772698c2c2056c Mon Sep 17 00:00:00 2001
From: Yannik Bloscheck <git@yannikbloscheck.com>
Date: Fri, 22 Aug 2025 13:10:11 +0200
Subject: [PATCH 277/302] [styles] Improved dark map style icons

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
---
 data/styles/default/dark/symbols/aircraft-m.svg    |  2 +-
 .../styles/default/dark/symbols/airport_gate-m.svg |  2 +-
 data/styles/default/dark/symbols/alcohol-m.svg     |  2 +-
 data/styles/default/dark/symbols/alpine_hut-m.svg  |  2 +-
 data/styles/default/dark/symbols/alpine_hut-s.svg  |  2 +-
 data/styles/default/dark/symbols/alternative-m.svg |  2 +-
 data/styles/default/dark/symbols/anchor-m.svg      |  2 +-
 data/styles/default/dark/symbols/animal-m.svg      |  2 +-
 .../default/dark/symbols/animal_shelter-m.svg      |  2 +-
 data/styles/default/dark/symbols/antiques-m.svg    |  2 +-
 data/styles/default/dark/symbols/apartment-m.svg   |  2 +-
 data/styles/default/dark/symbols/aquarium-m.svg    |  2 +-
 data/styles/default/dark/symbols/arcade-m.svg      |  2 +-
 .../default/dark/symbols/archaeological-site-m.svg |  2 +-
 data/styles/default/dark/symbols/art-m.svg         |  2 +-
 data/styles/default/dark/symbols/artwork-m.svg     | 10 +++++-----
 .../default/dark/symbols/assembly_point-m.svg      | 10 +++++-----
 data/styles/default/dark/symbols/atm-m.svg         |  2 +-
 data/styles/default/dark/symbols/auction-m.svg     |  2 +-
 data/styles/default/dark/symbols/audiologist-m.svg |  2 +-
 data/styles/default/dark/symbols/bakery-m.svg      |  2 +-
 data/styles/default/dark/symbols/bank-m.svg        |  2 +-
 data/styles/default/dark/symbols/banknote-m.svg    |  2 +-
 data/styles/default/dark/symbols/bar-m.svg         |  2 +-
 data/styles/default/dark/symbols/bcontrol-m.svg    |  2 +-
 data/styles/default/dark/symbols/bcontrol-s.svg    |  2 +-
 data/styles/default/dark/symbols/beach-m.svg       |  2 +-
 data/styles/default/dark/symbols/beauty-m.svg      |  2 +-
 data/styles/default/dark/symbols/beekeeper-m.svg   |  2 +-
 .../dark/symbols/bicycle-parking-covered-m.svg     |  4 ++--
 .../default/dark/symbols/bicycle-parking-m.svg     |  2 +-
 data/styles/default/dark/symbols/blacksmith-m.svg  |  2 +-
 .../default/dark/symbols/blood_donation-m.svg      |  2 +-
 data/styles/default/dark/symbols/book-shop-m.svg   |  2 +-
 data/styles/default/dark/symbols/bookmaker-m.svg   |  2 +-
 .../default/dark/symbols/bowling_alley-m.svg       |  2 +-
 data/styles/default/dark/symbols/brewery-m.svg     |  2 +-
 data/styles/default/dark/symbols/buddhist-m.svg    |  2 +-
 data/styles/default/dark/symbols/buddhist-s.svg    |  2 +-
 data/styles/default/dark/symbols/butcher-m.svg     |  2 +-
 data/styles/default/dark/symbols/cafe-m.svg        |  2 +-
 data/styles/default/dark/symbols/campsite-m.svg    |  2 +-
 data/styles/default/dark/symbols/campsite-s.svg    |  2 +-
 data/styles/default/dark/symbols/cannon-m.svg      |  2 +-
 data/styles/default/dark/symbols/car-part-m.svg    |  2 +-
 data/styles/default/dark/symbols/car-repair-m.svg  |  2 +-
 data/styles/default/dark/symbols/car-repair-s.svg  |  2 +-
 data/styles/default/dark/symbols/car-wash-m.svg    |  2 +-
 data/styles/default/dark/symbols/car_sharing-m.svg |  2 +-
 data/styles/default/dark/symbols/car_shop-m.svg    |  2 +-
 .../styles/default/dark/symbols/caravan-shop-m.svg |  2 +-
 .../styles/default/dark/symbols/caravan_site-m.svg |  2 +-
 .../styles/default/dark/symbols/caravan_site-s.svg |  2 +-
 data/styles/default/dark/symbols/carpenter-m.svg   |  2 +-
 data/styles/default/dark/symbols/casino-m.svg      |  2 +-
 data/styles/default/dark/symbols/caterer-m.svg     |  6 +++---
 .../default/dark/symbols/charging-station-s.svg    |  2 +-
 .../styles/default/dark/symbols/charity_shop-m.svg |  2 +-
 data/styles/default/dark/symbols/cheese-m.svg      |  2 +-
 data/styles/default/dark/symbols/chemist-m.svg     |  2 +-
 data/styles/default/dark/symbols/chess-m.svg       |  2 +-
 data/styles/default/dark/symbols/christian-m.svg   |  2 +-
 data/styles/default/dark/symbols/christian-s.svg   |  2 +-
 data/styles/default/dark/symbols/cinema-m.svg      |  2 +-
 data/styles/default/dark/symbols/clinic-m.svg      |  4 ++--
 data/styles/default/dark/symbols/clothes-m.svg     |  2 +-
 data/styles/default/dark/symbols/college-m.svg     |  2 +-
 data/styles/default/dark/symbols/college-s.svg     |  2 +-
 data/styles/default/dark/symbols/community-m.svg   |  2 +-
 data/styles/default/dark/symbols/computer-m.svg    |  2 +-
 .../default/dark/symbols/confectionery-m.svg       |  2 +-
 data/styles/default/dark/symbols/convenience-m.svg |  4 ++--
 data/styles/default/dark/symbols/copyshop-m.svg    |  2 +-
 data/styles/default/dark/symbols/craft-m.svg       |  2 +-
 data/styles/default/dark/symbols/dance-m.svg       |  2 +-
 .../default/dark/symbols/defibrillator-m.svg       |  2 +-
 data/styles/default/dark/symbols/dentist-m.svg     |  2 +-
 .../default/dark/symbols/department_store-m.svg    |  2 +-
 .../styles/default/dark/symbols/doityourself-m.svg |  2 +-
 .../default/dark/symbols/driving_school-m.svg      |  4 ++--
 .../styles/default/dark/symbols/dry_cleaning-m.svg |  2 +-
 data/styles/default/dark/symbols/electrician-m.svg |  2 +-
 data/styles/default/dark/symbols/electronics-m.svg |  2 +-
 data/styles/default/dark/symbols/embassy-m.svg     |  2 +-
 .../default/dark/symbols/emergency-phone-m.svg     |  2 +-
 .../default/dark/symbols/entrance-emergency-s.svg  |  6 +++---
 data/styles/default/dark/symbols/erotic-m.svg      |  2 +-
 data/styles/default/dark/symbols/escape_game.svg   |  2 +-
 data/styles/default/dark/symbols/factory-m.svg     |  2 +-
 data/styles/default/dark/symbols/fastfood-m.svg    |  2 +-
 .../styles/default/dark/symbols/fire_station-m.svg |  2 +-
 data/styles/default/dark/symbols/firehydrant-m.svg |  2 +-
 .../default/dark/symbols/fitness_centre-m.svg      |  2 +-
 data/styles/default/dark/symbols/florist-m.svg     |  2 +-
 data/styles/default/dark/symbols/fuel-m.svg        |  2 +-
 data/styles/default/dark/symbols/fuel-s.svg        |  2 +-
 .../default/dark/symbols/funeral_directors-m.svg   |  2 +-
 data/styles/default/dark/symbols/furniture-m.svg   |  2 +-
 data/styles/default/dark/symbols/gallery-m.svg     |  2 +-
 data/styles/default/dark/symbols/gambling-m.svg    |  4 ++--
 .../default/dark/symbols/garden_center-m.svg       |  2 +-
 data/styles/default/dark/symbols/gift-m.svg        |  2 +-
 data/styles/default/dark/symbols/greengrocer-m.svg |  2 +-
 .../default/dark/symbols/grinding_mill-m.svg       |  6 +++---
 data/styles/default/dark/symbols/hackerspace-m.svg |  2 +-
 data/styles/default/dark/symbols/hairdresser-m.svg |  2 +-
 data/styles/default/dark/symbols/handicraft-m.svg  |  6 +++---
 .../styles/default/dark/symbols/hearing_aids-m.svg |  2 +-
 data/styles/default/dark/symbols/hindu-m.svg       |  2 +-
 data/styles/default/dark/symbols/hindu-s.svg       |  2 +-
 .../default/dark/symbols/historic-ship-m.svg       |  2 +-
 data/styles/default/dark/symbols/home-m.svg        |  2 +-
 data/styles/default/dark/symbols/hospital-m.svg    |  2 +-
 data/styles/default/dark/symbols/hospital-s.svg    |  2 +-
 data/styles/default/dark/symbols/hostel-m.svg      |  2 +-
 data/styles/default/dark/symbols/hotel-m.svg       |  2 +-
 data/styles/default/dark/symbols/hotel-s.svg       |  2 +-
 data/styles/default/dark/symbols/ice_cream-m.svg   |  2 +-
 .../default/dark/symbols/information-office-m.svg  |  2 +-
 .../default/dark/symbols/interior_decoration-m.svg |  2 +-
 .../default/dark/symbols/internet_cafe-m.svg       |  2 +-
 data/styles/default/dark/symbols/jewelry-m.svg     |  2 +-
 data/styles/default/dark/symbols/jewish-m.svg      |  2 +-
 data/styles/default/dark/symbols/jewish-s.svg      |  2 +-
 data/styles/default/dark/symbols/key_cutter-m.svg  |  2 +-
 .../styles/default/dark/symbols/kindergarten-m.svg |  4 ++--
 data/styles/default/dark/symbols/kiosk-m.svg       |  2 +-
 .../default/dark/symbols/language_school-m.svg     |  4 ++--
 data/styles/default/dark/symbols/laundry-m.svg     |  8 ++++----
 data/styles/default/dark/symbols/lawyer-m.svg      |  2 +-
 data/styles/default/dark/symbols/library-m.svg     |  2 +-
 data/styles/default/dark/symbols/lifeguard-m.svg   |  2 +-
 data/styles/default/dark/symbols/locomotive-m.svg  |  2 +-
 data/styles/default/dark/symbols/lottery-m.svg     |  2 +-
 data/styles/default/dark/symbols/mail-m.svg        |  2 +-
 data/styles/default/dark/symbols/marina-m.svg      |  2 +-
 data/styles/default/dark/symbols/marketplace-m.svg |  2 +-
 data/styles/default/dark/symbols/media-m.svg       |  2 +-
 .../default/dark/symbols/metal_construction-m.svg  |  2 +-
 data/styles/default/dark/symbols/mine-m.svg        |  2 +-
 .../styles/default/dark/symbols/mobile_phone-m.svg |  2 +-
 data/styles/default/dark/symbols/monument-m.svg    |  6 +++---
 data/styles/default/dark/symbols/monument-s.svg    |  2 +-
 data/styles/default/dark/symbols/mormon-m.svg      |  2 +-
 data/styles/default/dark/symbols/mormon-s.svg      |  2 +-
 .../default/dark/symbols/motorcycle-parking-m.svg  |  2 +-
 .../default/dark/symbols/motorcycle_rental-m.svg   |  2 +-
 .../default/dark/symbols/motorcycle_repair-m.svg   |  2 +-
 .../default/dark/symbols/motorcycle_shop-m.svg     |  2 +-
 data/styles/default/dark/symbols/museum-m.svg      |  2 +-
 data/styles/default/dark/symbols/museum-s.svg      |  2 +-
 data/styles/default/dark/symbols/music-m.svg       |  2 +-
 .../styles/default/dark/symbols/music_school-m.svg |  2 +-
 .../default/dark/symbols/musical-instrument-m.svg  |  2 +-
 data/styles/default/dark/symbols/muslim-m.svg      |  2 +-
 data/styles/default/dark/symbols/muslim-s.svg      |  2 +-
 .../default/dark/symbols/needle_and_thread-m.svg   |  2 +-
 .../default/dark/symbols/newsagent_shop-m.svg      |  2 +-
 data/styles/default/dark/symbols/nightclub-m.svg   |  2 +-
 data/styles/default/dark/symbols/office-m.svg      |  2 +-
 data/styles/default/dark/symbols/optician-m.svg    |  2 +-
 data/styles/default/dark/symbols/optometrist-m.svg |  2 +-
 .../styles/default/dark/symbols/outdoor-shop-m.svg |  2 +-
 data/styles/default/dark/symbols/painter-m.svg     |  2 +-
 .../default/dark/symbols/parking-disabled-m.svg    |  2 +-
 data/styles/default/dark/symbols/parking-m.svg     |  2 +-
 data/styles/default/dark/symbols/parking-s.svg     |  2 +-
 .../default/dark/symbols/parking_entrance-m.svg    |  4 ++--
 data/styles/default/dark/symbols/parking_pay-m.svg |  4 ++--
 data/styles/default/dark/symbols/parking_pay-s.svg |  4 ++--
 .../default/dark/symbols/parking_underground-m.svg |  2 +-
 .../dark/symbols/parking_underground_pay-m.svg     |  4 ++--
 data/styles/default/dark/symbols/petshop-m.svg     |  2 +-
 data/styles/default/dark/symbols/petting_zoo-m.svg |  2 +-
 data/styles/default/dark/symbols/pharmacy-m.svg    |  2 +-
 data/styles/default/dark/symbols/photo-shop-m.svg  |  2 +-
 .../default/dark/symbols/physiotherapist-m.svg     |  2 +-
 .../default/dark/symbols/place-of-worship-m.svg    |  2 +-
 .../default/dark/symbols/place-of-worship-s.svg    |  2 +-
 data/styles/default/dark/symbols/plaque.svg        |  2 +-
 data/styles/default/dark/symbols/plumber-m.svg     |  2 +-
 data/styles/default/dark/symbols/podiatrist-m.svg  |  2 +-
 data/styles/default/dark/symbols/police-m.svg      |  2 +-
 .../default/dark/symbols/power_plant_wind-m.svg    |  2 +-
 data/styles/default/dark/symbols/prison-m.svg      |  2 +-
 .../default/dark/symbols/psychotherapist-m.svg     |  2 +-
 data/styles/default/dark/symbols/pub-m.svg         |  2 +-
 .../default/dark/symbols/public-building-m.svg     |  2 +-
 data/styles/default/dark/symbols/public_bath-m.svg |  2 +-
 data/styles/default/dark/symbols/remains-m.svg     |  2 +-
 data/styles/default/dark/symbols/remains-s.svg     |  2 +-
 data/styles/default/dark/symbols/rental-m.svg      |  2 +-
 data/styles/default/dark/symbols/restaurant-m.svg  |  2 +-
 .../default/dark/symbols/sample_collection-m.svg   |  2 +-
 data/styles/default/dark/symbols/sawmill-m.svg     |  2 +-
 data/styles/default/dark/symbols/school-m.svg      |  2 +-
 .../styles/default/dark/symbols/seafood-shop-m.svg |  2 +-
 .../default/dark/symbols/second_hand_shop-m.svg    |  2 +-
 data/styles/default/dark/symbols/shinto-m.svg      |  2 +-
 data/styles/default/dark/symbols/shinto-s.svg      |  2 +-
 data/styles/default/dark/symbols/shoes-m.svg       |  2 +-
 .../styles/default/dark/symbols/shop-bicycle-m.svg |  2 +-
 data/styles/default/dark/symbols/shop-m.svg        |  2 +-
 .../default/dark/symbols/shop-rental-bicycle-m.svg |  2 +-
 data/styles/default/dark/symbols/shop-s.svg        |  2 +-
 data/styles/default/dark/symbols/slots-m.svg       |  2 +-
 .../default/dark/symbols/social_facility-m.svg     |  2 +-
 .../default/dark/symbols/speech_therapist-m.svg    |  2 +-
 data/styles/default/dark/symbols/sports-m.svg      |  2 +-
 .../default/dark/symbols/sports_centre-m.svg       |  2 +-
 data/styles/default/dark/symbols/stadium-m.svg     |  2 +-
 data/styles/default/dark/symbols/stadium-s.svg     |  2 +-
 .../default/dark/symbols/stationery_shop-m.svg     |  2 +-
 data/styles/default/dark/symbols/statue-m.svg      |  6 +++---
 data/styles/default/dark/symbols/stone-m.svg       |  2 +-
 data/styles/default/dark/symbols/stripclub-m.svg   |  2 +-
 data/styles/default/dark/symbols/studio-m.svg      |  2 +-
 data/styles/default/dark/symbols/supermarket-m.svg |  2 +-
 data/styles/default/dark/symbols/tank-m.svg        |  2 +-
 data/styles/default/dark/symbols/taoist-m.svg      |  2 +-
 data/styles/default/dark/symbols/taoist-s.svg      |  2 +-
 data/styles/default/dark/symbols/theatre-m.svg     |  2 +-
 data/styles/default/dark/symbols/theatre-s.svg     |  2 +-
 data/styles/default/dark/symbols/theme_park-m.svg  |  2 +-
 data/styles/default/dark/symbols/theme_park-s.svg  |  2 +-
 data/styles/default/dark/symbols/ticket-shop-m.svg |  2 +-
 data/styles/default/dark/symbols/tire-repair-m.svg |  2 +-
 data/styles/default/dark/symbols/tobacco-m.svg     |  2 +-
 data/styles/default/dark/symbols/toilets-m.svg     |  2 +-
 data/styles/default/dark/symbols/toll_booth-m.svg  |  2 +-
 data/styles/default/dark/symbols/toll_booth-s.svg  |  2 +-
 data/styles/default/dark/symbols/tourism-m.svg     |  2 +-
 data/styles/default/dark/symbols/tourism-s.svg     |  2 +-
 data/styles/default/dark/symbols/toys-m.svg        |  2 +-
 .../default/dark/symbols/travel_agency_shop-m.svg  |  2 +-
 .../default/dark/symbols/vehicle_inspection-m.svg  |  6 +++---
 data/styles/default/dark/symbols/veterinary-m.svg  |  2 +-
 data/styles/default/dark/symbols/video-games-m.svg |  2 +-
 .../default/dark/symbols/wayside_cross-m.svg       |  2 +-
 .../default/dark/symbols/wayside_shrine-m.svg      |  2 +-
 data/styles/default/dark/symbols/wholesale-m.svg   | 10 +++++-----
 data/styles/default/dark/symbols/winery-m.svg      | 14 +++++++-------
 data/styles/default/dark/symbols/wreck-m.svg       |  2 +-
 data/styles/default/dark/symbols/yoga-m.svg        |  2 +-
 data/styles/default/dark/symbols/zoo-m.svg         |  2 +-
 data/styles/default/dark/symbols/zoo-s.svg         |  2 +-
 246 files changed, 292 insertions(+), 292 deletions(-)

diff --git a/data/styles/default/dark/symbols/aircraft-m.svg b/data/styles/default/dark/symbols/aircraft-m.svg
index da37dc31f..4fe71eddf 100644
--- a/data/styles/default/dark/symbols/aircraft-m.svg
+++ b/data/styles/default/dark/symbols/aircraft-m.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <title>aircraft-m</title>
- <path fill="#717065" opacity=".6" d="m19 15.1v-1.3l-5.4737-3.25v-3.575c0-0.5395-0.45842-0.975-1.0263-0.975s-1.0263 0.4355-1.0263 0.975v3.575l-5.4737 3.25v1.3l5.4737-1.625v3.575l-1.3684 0.975v0.975l2.3947-0.65 2.3947 0.65v-0.975l-1.3684-0.975v-3.575l5.4737 1.625z"/>
+ <path fill="#51585E" opacity=".6" d="m19 15.1v-1.3l-5.4737-3.25v-3.575c0-0.5395-0.45842-0.975-1.0263-0.975s-1.0263 0.4355-1.0263 0.975v3.575l-5.4737 3.25v1.3l5.4737-1.625v3.575l-1.3684 0.975v0.975l2.3947-0.65 2.3947 0.65v-0.975l-1.3684-0.975v-3.575l5.4737 1.625z"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/airport_gate-m.svg b/data/styles/default/dark/symbols/airport_gate-m.svg
index 38a4ea3dd..868069ae1 100644
--- a/data/styles/default/dark/symbols/airport_gate-m.svg
+++ b/data/styles/default/dark/symbols/airport_gate-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="gate-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#51585E"/>
    <path id="Shape" d="m18.263 17.295h-12.526c-0.40526 0-0.73684 0.33158-0.73684 0.73684 0 0.40526 0.33158 0.73684 0.73684 0.73684h12.526c0.40526 0 0.73684-0.33158 0.73684-0.73684 0-0.40526-0.33158-0.73684-0.73684-0.73684zm-12.519-5.4453 11.664 3.1242c0.58947 0.15474 1.1937-0.19158 1.3558-0.78105 0.15474-0.58947-0.19158-1.1937-0.78105-1.3558l-3.9126-1.0463-1.9011-6.2263c-0.081053-0.26526-0.28737-0.46421-0.55263-0.53789-0.50105-0.13263-0.99474 0.24316-0.99474 0.76632v5.0695l-3.6695-0.97263-0.55263-1.3705c-0.088421-0.21368-0.26526-0.37579-0.49368-0.43474l-0.24316-0.066316c-0.23579-0.066316-0.46421 0.11053-0.46421 0.35368v2.7632c0 0.33895 0.22105 0.62632 0.54526 0.71474z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/alcohol-m.svg b/data/styles/default/dark/symbols/alcohol-m.svg
index 89e4aee7c..5c4214acd 100644
--- a/data/styles/default/dark/symbols/alcohol-m.svg
+++ b/data/styles/default/dark/symbols/alcohol-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="alcohol-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <g id="Group" transform="translate(6 6)" fill="#000">
     <path id="Shape" d="m0 7.2c0 0.78 0.53053 1.44 1.2632 1.692v1.908h-1.2632v1.2h3.7895v-1.2h-1.2632v-1.908c0.73263-0.252 1.2632-0.912 1.2632-1.692v-4.8h-3.7895v4.8zm1.2632-3.6h1.2632v1.8h-1.2632v-1.8z"/>
     <path id="Shape" d="m11.135 3.924-0.6-0.192c-0.25263-0.078-0.42947-0.306-0.42947-0.564v-2.568c0-0.33-0.28421-0.6-0.63158-0.6h-1.8947c-0.34737 0-0.63158 0.27-0.63158 0.6v2.568c0 0.258-0.17684 0.486-0.42947 0.57l-0.6 0.192c-0.51789 0.162-0.86526 0.618-0.86526 1.134v5.736c0 0.66 0.56842 1.2 1.2632 1.2h4.4211c0.69474 0 1.2632-0.54 1.2632-1.2v-5.736c0-0.516-0.34737-0.972-0.86526-1.14zm-2.9242-2.724h0.63158v0.6h-0.63158v-0.6zm-1.8947 3.864 0.6-0.192c0.77684-0.24 1.2947-0.93 1.2947-1.704v-0.168h0.63158v0.168c0 0.774 0.51789 1.464 1.2947 1.71l0.6 0.186v0.936h-4.4211v-0.936zm4.4211 5.736h-4.4211v-1.2h4.4211v1.2z"/>
diff --git a/data/styles/default/dark/symbols/alpine_hut-m.svg b/data/styles/default/dark/symbols/alpine_hut-m.svg
index 557abc719..6aae4cb9d 100644
--- a/data/styles/default/dark/symbols/alpine_hut-m.svg
+++ b/data/styles/default/dark/symbols/alpine_hut-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="alpine_hut-m">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6" fill-rule="nonzero"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#664E42" fill-rule="nonzero"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#614A43" fill-rule="nonzero"/>
    <polygon id="Path" points="10 13.357 10 18 6 18 6 9.6429 12 5 18 9.6429 18 18 14 18 14 13.357" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/alpine_hut-s.svg b/data/styles/default/dark/symbols/alpine_hut-s.svg
index 19cda3753..c94cb4dfc 100644
--- a/data/styles/default/dark/symbols/alpine_hut-s.svg
+++ b/data/styles/default/dark/symbols/alpine_hut-s.svg
@@ -3,7 +3,7 @@
  <g transform="scale(.66667)" id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="alpine_hut-s">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6" fill-rule="nonzero"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#664E42" fill-rule="nonzero"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#614A43" fill-rule="nonzero"/>
    <polygon id="Path" points="10 13.357 10 18 6 18 6 9.6429 12 5 18 9.6429 18 18 14 18 14 13.357" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/alternative-m.svg b/data/styles/default/dark/symbols/alternative-m.svg
index 5738b293a..c83888549 100644
--- a/data/styles/default/dark/symbols/alternative-m.svg
+++ b/data/styles/default/dark/symbols/alternative-m.svg
@@ -2,7 +2,7 @@
   <title>alternative-m</title>
   <g>
     <circle id="outer" r="12" cx="12" cy="12" fill="#000" opacity=".6"/>
-    <circle id="inner" r="11" cx="12" cy="12" fill="#c15746"/>
+    <circle id="inner" r="11" cx="12" cy="12" fill="#983E44"/>
     <g fill="#000">
       <path id="leaf_left" d="M 7.38389,13.5905 C 7.49978,12.4415 7.20637,11.2481 6.47407,10.2397 5.74178,9.23122 4.69389,8.58276 3.56463,8.33373 3.44874,9.48518 3.74215,10.6761 4.47445,11.6845 c 0.72982,1.0085 1.77772,1.6545 2.90944,1.906 z"/>
       <path id="leaf_center" d="M 6.90802,9.92407 C 7.09541,10.183 7.25814,10.4566 7.39622,10.7427 7.53676,10.4566 7.69703,10.183 7.88441,9.92407 8.09892,9.62819 8.34302,9.3619 8.60931,9.1178 8.49342,8.08717 8.06194,7.1527 7.40608,6.41547 6.74776,7.15516 6.31381,8.09457 6.20285,9.1326 6.46174,9.37176 6.69845,9.63559 6.90802,9.92407 Z"/>
diff --git a/data/styles/default/dark/symbols/anchor-m.svg b/data/styles/default/dark/symbols/anchor-m.svg
index 9fb0d1ef2..d15cd2488 100644
--- a/data/styles/default/dark/symbols/anchor-m.svg
+++ b/data/styles/default/dark/symbols/anchor-m.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 20 20" width="15" height="15" xmlns="http://www.w3.org/2000/svg">
-	<path d="m10 18.127q-1.2393 0-2.5396-0.44697-1.3003-0.44696-2.3567-1.219t-1.7371-1.8082-0.68061-2.2145v-2.438l3.2507 2.438-1.2596 1.2596q0.58918 1.0362 1.8691 1.7879 1.2799 0.75172 2.6412 0.95488v-7.253h-2.438v-1.6253h2.438v-0.95488q-0.71108-0.26411-1.1682-0.88377t-0.45712-1.412q0-1.0158 0.71108-1.7269 0.71108-0.71108 1.7269-0.71108 1.0158 0 1.7269 0.71108 0.71108 0.71109 0.71108 1.7269 0 0.79234-0.45712 1.412t-1.1682 0.88377v0.95488h2.438v1.6253h-2.438v7.253q1.3612-0.20316 2.6412-0.95488 1.2799-0.75171 1.8691-1.7879l-1.2596-1.2596 3.2507-2.438v2.438q0 1.1784-0.68061 2.2145t-1.7371 1.8082-2.3567 1.219q-1.3003 0.44697-2.5396 0.44697zm0-13.003q0.34538 0 0.57902-0.23364t0.23364-0.57902-0.23364-0.57902-0.57902-0.23364-0.57902 0.23364-0.23364 0.57902 0.23364 0.57902 0.57902 0.23364z" fill="#717065" opacity=".6"/>
+	<path d="m10 18.127q-1.2393 0-2.5396-0.44697-1.3003-0.44696-2.3567-1.219t-1.7371-1.8082-0.68061-2.2145v-2.438l3.2507 2.438-1.2596 1.2596q0.58918 1.0362 1.8691 1.7879 1.2799 0.75172 2.6412 0.95488v-7.253h-2.438v-1.6253h2.438v-0.95488q-0.71108-0.26411-1.1682-0.88377t-0.45712-1.412q0-1.0158 0.71108-1.7269 0.71108-0.71108 1.7269-0.71108 1.0158 0 1.7269 0.71108 0.71108 0.71109 0.71108 1.7269 0 0.79234-0.45712 1.412t-1.1682 0.88377v0.95488h2.438v1.6253h-2.438v7.253q1.3612-0.20316 2.6412-0.95488 1.2799-0.75171 1.8691-1.7879l-1.2596-1.2596 3.2507-2.438v2.438q0 1.1784-0.68061 2.2145t-1.7371 1.8082-2.3567 1.219q-1.3003 0.44697-2.5396 0.44697zm0-13.003q0.34538 0 0.57902-0.23364t0.23364-0.57902-0.23364-0.57902-0.57902-0.23364-0.57902 0.23364-0.23364 0.57902 0.23364 0.57902 0.57902 0.23364z" fill="#51585E" opacity=".6"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/animal-m.svg b/data/styles/default/dark/symbols/animal-m.svg
index 26c75c052..2b1046560 100644
--- a/data/styles/default/dark/symbols/animal-m.svg
+++ b/data/styles/default/dark/symbols/animal-m.svg
@@ -14,7 +14,7 @@
   <path
      id="Path"
      d="M 16.069622,1.670709 C 13.882633,4.8501398 13.571882,7.5052255 11.149025,9.6194413 8.8344727,11.63888 4.5882073,10.945616 4.5882073,13.858771 v 1.059733 c 0,1.059883 1.0934782,2.068306 1.0934782,3.179442 v 1.059883 c 0,1.589704 -0.5467534,1.589704 -1.0934782,3.179426 h 1.0934782 l 2.1869842,-3.179426 v 3.179426 h 1.640192 v -6.359018 h 1.6402033 v 6.359018 h 1.640205 v -4.769297 l 1.640205,4.769297 h 1.093492 l -1.674454,-6.657053 c 0.644611,-0.381233 0.58092,-1.085969 0.58092,-1.821488 v -3.179419 l 2.460359,-5.8292145 2.460373,0.7948732 c 0,-0.074715 -8.44e-4,-0.734467 0,-0.7948732 0,0 -0.399405,-0.3871019 -0.546738,-0.5298655 L 16.069669,1.670589 Z"
-     fill="#717065" 
+     fill="#51585E" 
      opacity=".6"
      style="stroke-width:1.47601" />
 </svg>
diff --git a/data/styles/default/dark/symbols/animal_shelter-m.svg b/data/styles/default/dark/symbols/animal_shelter-m.svg
index 1f03c4bbd..f83c6e820 100644
--- a/data/styles/default/dark/symbols/animal_shelter-m.svg
+++ b/data/styles/default/dark/symbols/animal_shelter-m.svg
@@ -1 +1 @@
-<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#717065" r="8.25"/><path d="m14.1563206 5.31996974h-1.37501l-.153811-.29514695c-.116437-.22359297-.3545039-.36484026-.6148782-.3648543h-1.1520829l-.5860614-.56265107c-.2167835-.20789337-.58693916-.06063586-.58693916.23326832v3.09042073l2.75002016.94274859v-.73386521h.6874318c.7594737 0 1.3750101-.59090474 1.3750101-1.3200025v-.65999423c0-.18232885-.153811-.33000062-.3437525-.33000062zm-2.4062676.99000187c-.1899415 0-.3437525-.14767177-.3437525-.33000063 0-.18232183.153811-.33000062.3437525-.33000062.1899416 0 .3437525.14767879.3437525.33000062 0 .18232886-.1538109.33000063-.3437525.33000063zm-6.18754523 1.65000312c-.37898349 0-.68750503-.29616503-.68750503-.65998721 0-.36444005-.3078706-.65999423-.68749771-.65999423s-.68750503.29555418-.68750503.65999423c0 .85919524.57642908 1.58505619 1.37501006 1.85832479v4.41168709c0 .1822727.15382559.3300006.34375251.3300006h1.37501006c.1899196 0 .34375251-.1477279.34375251-.3300006v-2.3100044h3.43752516v2.3100044c0 .1822727.1538109.3300006.3437525.3300006h1.3750101c.1899415 0 .3437525-.1477279.3437525-.3300006v-4.50549152l-3.22161934-1.10451911z" fill="#000"/></g></svg>
\ No newline at end of file
+<svg height="18" viewBox="0 0 18 18" width="18" xmlns="http://www.w3.org/2000/svg"><g fill="none"><circle cx="9" cy="9" fill="#000" opacity=".6" r="9"/><circle cx="9" cy="9" fill="#51585E" r="8.25"/><path d="m14.1563206 5.31996974h-1.37501l-.153811-.29514695c-.116437-.22359297-.3545039-.36484026-.6148782-.3648543h-1.1520829l-.5860614-.56265107c-.2167835-.20789337-.58693916-.06063586-.58693916.23326832v3.09042073l2.75002016.94274859v-.73386521h.6874318c.7594737 0 1.3750101-.59090474 1.3750101-1.3200025v-.65999423c0-.18232885-.153811-.33000062-.3437525-.33000062zm-2.4062676.99000187c-.1899415 0-.3437525-.14767177-.3437525-.33000063 0-.18232183.153811-.33000062.3437525-.33000062.1899416 0 .3437525.14767879.3437525.33000062 0 .18232886-.1538109.33000063-.3437525.33000063zm-6.18754523 1.65000312c-.37898349 0-.68750503-.29616503-.68750503-.65998721 0-.36444005-.3078706-.65999423-.68749771-.65999423s-.68750503.29555418-.68750503.65999423c0 .85919524.57642908 1.58505619 1.37501006 1.85832479v4.41168709c0 .1822727.15382559.3300006.34375251.3300006h1.37501006c.1899196 0 .34375251-.1477279.34375251-.3300006v-2.3100044h3.43752516v2.3100044c0 .1822727.1538109.3300006.3437525.3300006h1.3750101c.1899415 0 .3437525-.1477279.3437525-.3300006v-4.50549152l-3.22161934-1.10451911z" fill="#000"/></g></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/antiques-m.svg b/data/styles/default/dark/symbols/antiques-m.svg
index e15c99929..8f299e212 100644
--- a/data/styles/default/dark/symbols/antiques-m.svg
+++ b/data/styles/default/dark/symbols/antiques-m.svg
@@ -3,7 +3,7 @@
 <title>antiques-m</title>
     <g id="alcohol-m" fill-rule="nonzero">
         <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-        <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+        <circle cx="12" cy="12" r="11" fill="#6B425C"/>
         <path d="m9.054 3.7417c-0.53095 0-0.79495 0.64599-0.41591 1.0147l0.48376 0.48376c-0.41444 0.5752-0.66221 1.2787-0.66221 2.0383 0 0.76693 0.24778 1.4704 0.66221 2.0456l-0.32742 0.32889c-0.41444 0.35692-0.32889 0.62829-0.32889 1.1696v7.513c-0.2935 0.2522-0.68581 0.61059-0.88197 0.93211-0.2581 0.38052-0.23008 0.57667-0.3053 0.99111h1.4011s0.51178-0.44393 0.68581-0.83477c0.033922-0.09292 0.067844-0.22565 0.10324-0.34659h5.0691c0.0354 0.12094 0.06342 0.25368 0.10472 0.34659 0.17256 0.39084 0.67991 0.83477 0.67991 0.83477h1.3996c-0.07522-0.41444-0.04572-0.61059-0.3053-0.99111-0.19616-0.32152-0.58847-0.67991-0.88197-0.93211v-7.513c0-0.54128 0.08702-0.81265-0.32889-1.1696l-0.32742-0.32889c0.41444-0.5752 0.66221-1.2787 0.66221-2.0456 0-0.75955-0.24778-1.4631-0.66221-2.0383l0.48376-0.48376c0.38641-0.37462 0.10914-1.0324-0.42624-1.0147h-0.0059c-0.15044 0.0059-0.2935 0.069319-0.40264 0.17846l-0.48523 0.48376c-0.5752-0.41444-1.2787-0.66221-2.0383-0.66221-0.76693 0-1.4704 0.24778-2.0456 0.66221l-0.48376-0.48376c-0.10914-0.11504-0.26548-0.17846-0.42034-0.17846zm2.9497 1.0147c1.3996 0 2.5235 1.1224 2.5235 2.522 0 1.407-1.1238 2.5294-2.5235 2.5294-1.407 0-2.5294-1.1224-2.5294-2.5294 0-1.3996 1.1224-2.522 2.5294-2.522zm-0.12684 0.61059c-0.0295 0.00442-0.05752 0.010324-0.08112 0.016224-0.17846 0.041296-0.3053 0.20206-0.2994 0.38051v1.7049l0.15486 0.11061 1.0147 0.75955c0.41444 0.44983 0.99701-0.33332 0.44393-0.59879l-0.85394-0.64599v-1.3303c0.0059-0.21238-0.16666-0.39674-0.37904-0.39674zm-0.66811 6.1871h0.49408v2.8686c-0.49998 0.13274-0.88049 0.57077-0.88049 1.1179 0 0.65042 0.52948 1.1814 1.1814 1.1814 0.65042 0 1.174-0.53095 1.174-1.1814 0-0.54717-0.37904-0.98521-0.88049-1.1179v-2.8686h0.49555c1.9807 0 1.8259 4.3037 1.2035 5.6281-0.18436 0.36282-0.60469 0.59437-0.99701 0.72121-0.63272 0.20058-1.3642 0.20058-1.9984 0-0.39231-0.12684-0.81265-0.35839-0.99701-0.72121-0.60469-2.1887-0.75513-5.6281 1.205-5.6281z" fill="#000" fill-rule="nonzero"/>
         </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/apartment-m.svg b/data/styles/default/dark/symbols/apartment-m.svg
index a7b70d81b..791766071 100644
--- a/data/styles/default/dark/symbols/apartment-m.svg
+++ b/data/styles/default/dark/symbols/apartment-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="apartment-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#664E42"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#614A43"/>
    <path id="Shape" d="m15.333 11.333v-5.3333h-6.6667v2.6667h-2.6667v9.3333h5.3333v-2.6667h1.3333v2.6667h5.3333v-6.6667h-2.6667zm-6.6667 5.3333h-1.3333v-1.3333h1.3333v1.3333zm0-2.6667h-1.3333v-1.3333h1.3333v1.3333zm0-2.6667h-1.3333v-1.3333h1.3333v1.3333zm2.6667 2.6667h-1.3333v-1.3333h1.3333v1.3333zm0-2.6667h-1.3333v-1.3333h1.3333v1.3333zm0-2.6667h-1.3333v-1.3333h1.3333v1.3333zm2.6667 5.3333h-1.3333v-1.3333h1.3333v1.3333zm0-2.6667h-1.3333v-1.3333h1.3333v1.3333zm0-2.6667h-1.3333v-1.3333h1.3333v1.3333zm2.6667 8h-1.3333v-1.3333h1.3333v1.3333zm0-2.6667h-1.3333v-1.3333h1.3333v1.3333z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/aquarium-m.svg b/data/styles/default/dark/symbols/aquarium-m.svg
index 0444d0e2a..c46ae89ce 100644
--- a/data/styles/default/dark/symbols/aquarium-m.svg
+++ b/data/styles/default/dark/symbols/aquarium-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#7f5933"/>
+ <circle cx="12" cy="12" r="11" fill="#6E4426"/>
  <path d="m12.95 8c-2.1868 0-4.0964 1.3312-5.1593 2.4702l-2.1226-1.6054c-0.29483-0.22312-0.735 0.014583-0.65965 0.35632l0.58771 2.6678-0.58795 2.668c-0.075347 0.34174 0.36483 0.5792 0.65965 0.35632l2.1226-1.6054c1.0629 1.1387 2.9728 2.4699 5.1596 2.4699 3.341 0 6.0496-3.1111 6.0496-3.8889s-2.7086-3.8889-6.0496-3.8889zm2.125 4.4722c-0.32205 0-0.58333-0.26128-0.58333-0.58333 0-0.32229 0.26128-0.58333 0.58333-0.58333 0.32229 0 0.58333 0.26104 0.58333 0.58333 0 0.32205-0.26128 0.58333-0.58333 0.58333z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/arcade-m.svg b/data/styles/default/dark/symbols/arcade-m.svg
index 64672d4b3..b1132ee88 100644
--- a/data/styles/default/dark/symbols/arcade-m.svg
+++ b/data/styles/default/dark/symbols/arcade-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#7f5933"/>
+ <circle cx="12" cy="12" r="11" fill="#6E4426"/>
  <path d="m4.4472 4.9836v2.158h4.3159v-2.158zm10.79 0v2.158h4.3159v-2.158zm-6.4738 2.1622v2.1579h2.1579v-2.1579zm4.3159 0v2.1579h2.1579v-2.1579zm-6.4738 2.16v2.1579h-2.1579v7.5528h2.1579v-2.1579h2.1579v2.1579h2.1579v-2.1579h2.1579v2.1579h2.1579v-2.1579h2.1579v2.1579h2.1579v-7.5528h-2.1579v-2.1579zm2.1579 2.1579h2.1579v2.1579h-2.1579zm4.3159 0h2.1579v2.1579h-2.1579z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/archaeological-site-m.svg b/data/styles/default/dark/symbols/archaeological-site-m.svg
index b68725093..79cdabf58 100644
--- a/data/styles/default/dark/symbols/archaeological-site-m.svg
+++ b/data/styles/default/dark/symbols/archaeological-site-m.svg
@@ -1,6 +1,6 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <title>wayside_shrine-m</title>
  <g transform="matrix(1.1429 0 0 1.1429 2.8815 2.8583)">
-  <path id="archaeological-site" d="m3.4787 0.12402v1.125h1.125c0.67373 0 0.94628 1.1735 1.0547 2.1445-1.0938-0.85089-2.1516-1.155-3.0586-0.98438-1.1591 0.21803-1.9336 1.2859-1.9336 2.4961 0 0.94716 0.35113 1.7762 0.94922 2.6367 0.5227 0.75204 1.2598 1.6201 2.1797 2.6719 0.41226 1.5289 1.1712 2.929 1.9336 3.6914v0.84375l-1.125 0.5625v0.5625h6.75v-0.5625l-1.125-0.5625v-0.84375c0.76241-0.76241 1.5213-2.1625 1.9336-3.6914 0.91986-1.0518 1.657-1.9198 2.1797-2.6719 0.59809-0.86051 0.94922-1.6896 0.94922-2.6367 0-1.2102-0.7745-2.2781-1.9336-2.4961-0.90701-0.17061-1.9648 0.13348-3.0586 0.98438 0.1084-0.97108 0.38096-2.1445 1.0547-2.1445h1.125v-1.125zm-0.70312 3.4102c0.57357-0.10789 1.5305 0.1139 2.6367 1.125-1.2544 0.15568-1.9336 1.2581-1.9336 3.3398 0 0.035096-5.431e-4 0.070242 0 0.10547-0.38309-0.4451-0.70179-0.83932-0.94922-1.1953-0.52691-0.7581-0.73828-1.3145-0.73828-2.0039 0-0.78786 0.34979-1.2517 0.98438-1.3711zm9.8438 0c0.21162-0.030504 0.40385-0.029842 0.5625 0 0.63458 0.11937 0.98437 0.58323 0.98437 1.3711 0 0.68937-0.21137 1.2458-0.73828 2.0039-0.24743 0.35599-0.56613 0.75021-0.94922 1.1953 5.44e-4 -0.035226 0-0.070374 0-0.10547 0-2.0817-0.67921-3.1842-1.9336-3.3398 0.80028-0.73143 1.5207-1.0452 2.0742-1.125z" fill="#717065" fill-opacity=".6"/>
+  <path id="archaeological-site" d="m3.4787 0.12402v1.125h1.125c0.67373 0 0.94628 1.1735 1.0547 2.1445-1.0938-0.85089-2.1516-1.155-3.0586-0.98438-1.1591 0.21803-1.9336 1.2859-1.9336 2.4961 0 0.94716 0.35113 1.7762 0.94922 2.6367 0.5227 0.75204 1.2598 1.6201 2.1797 2.6719 0.41226 1.5289 1.1712 2.929 1.9336 3.6914v0.84375l-1.125 0.5625v0.5625h6.75v-0.5625l-1.125-0.5625v-0.84375c0.76241-0.76241 1.5213-2.1625 1.9336-3.6914 0.91986-1.0518 1.657-1.9198 2.1797-2.6719 0.59809-0.86051 0.94922-1.6896 0.94922-2.6367 0-1.2102-0.7745-2.2781-1.9336-2.4961-0.90701-0.17061-1.9648 0.13348-3.0586 0.98438 0.1084-0.97108 0.38096-2.1445 1.0547-2.1445h1.125v-1.125zm-0.70312 3.4102c0.57357-0.10789 1.5305 0.1139 2.6367 1.125-1.2544 0.15568-1.9336 1.2581-1.9336 3.3398 0 0.035096-5.431e-4 0.070242 0 0.10547-0.38309-0.4451-0.70179-0.83932-0.94922-1.1953-0.52691-0.7581-0.73828-1.3145-0.73828-2.0039 0-0.78786 0.34979-1.2517 0.98438-1.3711zm9.8438 0c0.21162-0.030504 0.40385-0.029842 0.5625 0 0.63458 0.11937 0.98437 0.58323 0.98437 1.3711 0 0.68937-0.21137 1.2458-0.73828 2.0039-0.24743 0.35599-0.56613 0.75021-0.94922 1.1953 5.44e-4 -0.035226 0-0.070374 0-0.10547 0-2.0817-0.67921-3.1842-1.9336-3.3398 0.80028-0.73143 1.5207-1.0452 2.0742-1.125z" fill="#51585E" fill-opacity=".6"/>
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/art-m.svg b/data/styles/default/dark/symbols/art-m.svg
index 75e49870c..7b4362ec6 100644
--- a/data/styles/default/dark/symbols/art-m.svg
+++ b/data/styles/default/dark/symbols/art-m.svg
@@ -3,7 +3,7 @@
     <title>art-m</title>
     <g id="alcohol-m" fill-rule="nonzero">
         <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-        <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+        <circle cx="12" cy="12" r="11" fill="#6B425C"/>
         <path d="m12 5c-3.8656 0-7 3.1344-7 7 0 3.8656 3.1344 7 7 7 0.64556 0 1.166-0.52046 1.166-1.166 0-0.30333-0.11218-0.57709-0.30273-0.7832-0.18278-0.20611-0.29102-0.47399-0.29102-0.77344 0-0.64556 0.52046-1.166 1.166-1.166h1.373c2.1467 0 3.8887-1.742 3.8887-3.8887 0-3.4378-3.1344-6.2227-7-6.2227zm1.9336 1.3047a1.3892 1.3892 0 0 1 1.3887 1.3887 1.3892 1.3892 0 0 1-1.3887 1.3906 1.3892 1.3892 0 0 1-1.3887-1.3906 1.3892 1.3892 0 0 1 1.3887-1.3887zm-3.8945 0.019531a1.3892 1.3892 0 0 1 1.3906 1.3906 1.3892 1.3892 0 0 1-1.3906 1.3887 1.3892 1.3892 0 0 1-1.3887-1.3887 1.3892 1.3892 0 0 1 1.3887-1.3906zm-2.332 3.123a1.3892 1.3892 0 0 1 1.3887 1.3906 1.3892 1.3892 0 0 1-1.3887 1.3887 1.3892 1.3892 0 0 1-1.3887-1.3887 1.3892 1.3892 0 0 1 1.3887-1.3906zm8.5586 0a1.3892 1.3892 0 0 1 1.3887 1.3906 1.3892 1.3892 0 0 1-1.3887 1.3887 1.3892 1.3892 0 0 1-1.3887-1.3887 1.3892 1.3892 0 0 1 1.3887-1.3906z" fill="#000"/>
     </g>
  </svg>
diff --git a/data/styles/default/dark/symbols/artwork-m.svg b/data/styles/default/dark/symbols/artwork-m.svg
index 09210c0f7..5ffb5c2c5 100644
--- a/data/styles/default/dark/symbols/artwork-m.svg
+++ b/data/styles/default/dark/symbols/artwork-m.svg
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <path d="m7.9987 18h8.0023" stroke-linecap="round" stroke-width="1.333" stroke="#717065" opacity=".6"/>
- <path d="m9.332 20.666h5.3357" stroke-linecap="round" stroke-width="1.333" stroke="#717065" opacity=".6"/>
- <path d="m10.84 3.3379-1.1621 1.9961 1.1621 1.9961h2.3203l1.1621-1.9961-1.1621-1.9961z" fill="#717065" opacity=".6"/>
- <path d="m10.844 8.004-1.1621 1.9961 1.1621 1.9961h2.3203l1.1621-1.9961-1.1621-1.9961z" fill="#717065" opacity=".6"/>
- <path d="m10.844 12.671-1.1621 1.9961 1.1621 1.9961h2.3203l1.1621-1.9961-1.1621-1.9961z" fill="#717065" opacity=".6"/>
+ <path d="m7.9987 18h8.0023" stroke-linecap="round" stroke-width="1.333" stroke="#51585E" opacity=".6"/>
+ <path d="m9.332 20.666h5.3357" stroke-linecap="round" stroke-width="1.333" stroke="#51585E" opacity=".6"/>
+ <path d="m10.84 3.3379-1.1621 1.9961 1.1621 1.9961h2.3203l1.1621-1.9961-1.1621-1.9961z" fill="#51585E" opacity=".6"/>
+ <path d="m10.844 8.004-1.1621 1.9961 1.1621 1.9961h2.3203l1.1621-1.9961-1.1621-1.9961z" fill="#51585E" opacity=".6"/>
+ <path d="m10.844 12.671-1.1621 1.9961 1.1621 1.9961h2.3203l1.1621-1.9961-1.1621-1.9961z" fill="#51585E" opacity=".6"/>
 </svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/assembly_point-m.svg b/data/styles/default/dark/symbols/assembly_point-m.svg
index 0c296de63..da02933fc 100644
--- a/data/styles/default/dark/symbols/assembly_point-m.svg
+++ b/data/styles/default/dark/symbols/assembly_point-m.svg
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
  <g transform="scale(.5)">
-  <circle class="cls-1" cx="24" cy="24" r="5" fill="#C15746" opacity=".6"/>
-  <path class="cls-1" d="m46 22h-8.1714l1.5854-1.5859a1.9998 1.9998 0 0 0-2.8281-2.8281l-5 5a1.9821 1.9821 0 0 0-0.3161 0.42724c-0.02106 0.03711-0.04 0.07349-0.05866 0.11158a1.9901 1.9901 0 0 0-0.16907 0.47485l-0.0038 0.01269a2.0036 2.0036 0 0 0-0.02612 0.51514c0.0026 0.04126 0.0066 0.0813 0.01178 0.12256a1.9877 1.9877 0 0 0 0.12738 0.51172l1e-3 0.0039 0.0086 0.01438a1.9895 1.9895 0 0 0 0.25958 0.43164c0.02869 0.03735 0.05719 0.073 0.08832 0.10815 0.02716 0.03052 0.04767 0.06495 0.077 0.09424l5 5a1.9998 1.9998 0 0 0 2.8281-2.8281l-1.5858-1.5859h8.1719a2 2 0 0 0 0-4z" fill="#C15746" opacity=".6"/>
-  <path class="cls-1" d="m16.988 24.127a2.0036 2.0036 0 0 0-0.02612-0.51514l-0.0038-0.01269a1.9901 1.9901 0 0 0-0.16907-0.47485c-0.01862-0.03809-0.0376-0.07447-0.05866-0.11158a1.9821 1.9821 0 0 0-0.3161-0.42724l-5-5a1.9998 1.9998 0 0 0-2.8281 2.8281l1.5854 1.5859h-8.1714a2 2 0 0 0 0 4h8.1719l-1.5859 1.5859a1.9998 1.9998 0 1 0 2.8281 2.8281l5-5c0.02936-0.02929 0.04987-0.06372 0.077-0.09424 0.03113-0.03515 0.05963-0.0708 0.08832-0.10815a1.9895 1.9895 0 0 0 0.25962-0.43167l0.0087-0.01441 1e-3 -0.0039a1.9877 1.9877 0 0 0 0.1273-0.51169c0.0052-0.04126 0.0092-0.0813 0.01179-0.12256z" fill="#C15746" opacity=".6"/>
-  <path class="cls-1" d="m22.586 16.414a1.9961 1.9961 0 0 0 0.31036 0.25366 1.9473 1.9473 0 0 0 0.28021 0.14844c0.02259 0.01026 0.043 0.02539 0.06586 0.03467a1.9767 1.9767 0 0 0 0.31549 0.09473c0.01929 0.0044 0.03742 0.01294 0.05683 0.01684a2.0057 2.0057 0 0 0 0.38531 0.0376h4.9e-4c0.0087 0 0.01733-0.0024 0.026-0.0024a2.0124 2.0124 0 0 0 0.3587-0.03516c0.01593-0.0032 0.03107-0.0105 0.047-0.01391a1.9972 1.9972 0 0 0 0.32971-0.09986l0.0032-1e-3 0.0097-0.0059a1.987 1.987 0 0 0 0.43829-0.26343c0.03644-0.02808 0.07111-0.05591 0.10535-0.08618 0.03107-0.02735 0.06586-0.04834 0.09558-0.07813l5-5a1.9998 1.9998 0 0 0-2.8281-2.8281l-1.5859 1.586v-8.1719a2 2 0 0 0-4 0v8.1719l-1.5859-1.5859a1.9998 1.9998 0 0 0-2.8281 2.8281z" fill="#C15746" opacity=".6"/>
-  <path class="cls-1" d="m25.414 31.586c-0.02972-0.02979-0.06451-0.05078-0.09564-0.07813-0.03418-0.03027-0.06885-0.0581-0.10516-0.08593a1.9838 1.9838 0 0 0-0.43921-0.26417l-0.0089-0.0054-0.0024-4.8e-4a1.9829 1.9829 0 0 0-0.50971-0.12769c-0.04358-0.0056-0.08587-0.0095-0.12958-0.01245a2.0145 2.0145 0 0 0-0.50836 0.02588c-0.0093 0.0017-0.01788 0.0059-0.02722 0.0078a1.9933 1.9933 0 0 0-0.46 0.16406c-0.0401 0.01953-0.07843 0.03931-0.11725 0.06153a1.9789 1.9789 0 0 0-0.42468 0.31494l-5 5a1.9998 1.9998 0 0 0 2.8281 2.8281l1.5859-1.5859v8.1719a2 2 0 0 0 4 0v-8.1719l1.5859 1.5859a1.9998 1.9998 0 0 0 2.8281-2.8281z" fill="#C15746" opacity=".6"/>
+  <circle class="cls-1" cx="24" cy="24" r="5" fill="#983E44" opacity=".6"/>
+  <path class="cls-1" d="m46 22h-8.1714l1.5854-1.5859a1.9998 1.9998 0 0 0-2.8281-2.8281l-5 5a1.9821 1.9821 0 0 0-0.3161 0.42724c-0.02106 0.03711-0.04 0.07349-0.05866 0.11158a1.9901 1.9901 0 0 0-0.16907 0.47485l-0.0038 0.01269a2.0036 2.0036 0 0 0-0.02612 0.51514c0.0026 0.04126 0.0066 0.0813 0.01178 0.12256a1.9877 1.9877 0 0 0 0.12738 0.51172l1e-3 0.0039 0.0086 0.01438a1.9895 1.9895 0 0 0 0.25958 0.43164c0.02869 0.03735 0.05719 0.073 0.08832 0.10815 0.02716 0.03052 0.04767 0.06495 0.077 0.09424l5 5a1.9998 1.9998 0 0 0 2.8281-2.8281l-1.5858-1.5859h8.1719a2 2 0 0 0 0-4z" fill="#983E44" opacity=".6"/>
+  <path class="cls-1" d="m16.988 24.127a2.0036 2.0036 0 0 0-0.02612-0.51514l-0.0038-0.01269a1.9901 1.9901 0 0 0-0.16907-0.47485c-0.01862-0.03809-0.0376-0.07447-0.05866-0.11158a1.9821 1.9821 0 0 0-0.3161-0.42724l-5-5a1.9998 1.9998 0 0 0-2.8281 2.8281l1.5854 1.5859h-8.1714a2 2 0 0 0 0 4h8.1719l-1.5859 1.5859a1.9998 1.9998 0 1 0 2.8281 2.8281l5-5c0.02936-0.02929 0.04987-0.06372 0.077-0.09424 0.03113-0.03515 0.05963-0.0708 0.08832-0.10815a1.9895 1.9895 0 0 0 0.25962-0.43167l0.0087-0.01441 1e-3 -0.0039a1.9877 1.9877 0 0 0 0.1273-0.51169c0.0052-0.04126 0.0092-0.0813 0.01179-0.12256z" fill="#983E44" opacity=".6"/>
+  <path class="cls-1" d="m22.586 16.414a1.9961 1.9961 0 0 0 0.31036 0.25366 1.9473 1.9473 0 0 0 0.28021 0.14844c0.02259 0.01026 0.043 0.02539 0.06586 0.03467a1.9767 1.9767 0 0 0 0.31549 0.09473c0.01929 0.0044 0.03742 0.01294 0.05683 0.01684a2.0057 2.0057 0 0 0 0.38531 0.0376h4.9e-4c0.0087 0 0.01733-0.0024 0.026-0.0024a2.0124 2.0124 0 0 0 0.3587-0.03516c0.01593-0.0032 0.03107-0.0105 0.047-0.01391a1.9972 1.9972 0 0 0 0.32971-0.09986l0.0032-1e-3 0.0097-0.0059a1.987 1.987 0 0 0 0.43829-0.26343c0.03644-0.02808 0.07111-0.05591 0.10535-0.08618 0.03107-0.02735 0.06586-0.04834 0.09558-0.07813l5-5a1.9998 1.9998 0 0 0-2.8281-2.8281l-1.5859 1.586v-8.1719a2 2 0 0 0-4 0v8.1719l-1.5859-1.5859a1.9998 1.9998 0 0 0-2.8281 2.8281z" fill="#983E44" opacity=".6"/>
+  <path class="cls-1" d="m25.414 31.586c-0.02972-0.02979-0.06451-0.05078-0.09564-0.07813-0.03418-0.03027-0.06885-0.0581-0.10516-0.08593a1.9838 1.9838 0 0 0-0.43921-0.26417l-0.0089-0.0054-0.0024-4.8e-4a1.9829 1.9829 0 0 0-0.50971-0.12769c-0.04358-0.0056-0.08587-0.0095-0.12958-0.01245a2.0145 2.0145 0 0 0-0.50836 0.02588c-0.0093 0.0017-0.01788 0.0059-0.02722 0.0078a1.9933 1.9933 0 0 0-0.46 0.16406c-0.0401 0.01953-0.07843 0.03931-0.11725 0.06153a1.9789 1.9789 0 0 0-0.42468 0.31494l-5 5a1.9998 1.9998 0 0 0 2.8281 2.8281l1.5859-1.5859v8.1719a2 2 0 0 0 4 0v-8.1719l1.5859 1.5859a1.9998 1.9998 0 0 0 2.8281-2.8281z" fill="#983E44" opacity=".6"/>
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/atm-m.svg b/data/styles/default/dark/symbols/atm-m.svg
index 68c3d28e8..673324e83 100644
--- a/data/styles/default/dark/symbols/atm-m.svg
+++ b/data/styles/default/dark/symbols/atm-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="atm-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#51585E"/>
    <g id="bx-credit-card" transform="translate(7 8)" fill="#000">
     <path id="Shape" d="m9 0h-8c-0.5515 0-1 0.4485-1 1v6c0 0.5515 0.4485 1 1 1h8c0.5515 0 1-0.4485 1-1v-6c0-0.5515-0.4485-1-1-1zm-8 1h8v1h-8v-1zm0 6v-3h8.0005l5e-4 3h-8.001z"/>
     <polygon id="Path" points="2 5 5 5 5 6 2 6"/>
diff --git a/data/styles/default/dark/symbols/auction-m.svg b/data/styles/default/dark/symbols/auction-m.svg
index 0c9d50784..bb15ae5e6 100644
--- a/data/styles/default/dark/symbols/auction-m.svg
+++ b/data/styles/default/dark/symbols/auction-m.svg
@@ -3,7 +3,7 @@
  <g fill="none" fill-rule="evenodd">
   <g id="auction-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <path id="Shape" d="m5.6868 17.168h6.8678c0.37773 0 0.68678 0.30905 0.68678 0.68678 0 0.37773-0.30905 0.68678-0.68678 0.68678h-6.8678c-0.37773 0-0.68678-0.30905-0.68678-0.68678 0-0.37773 0.30905-0.68678 0.68678-0.68678zm2.2252-8.8801 1.9436-1.9436 8.7427 8.7427c0.53569 0.53569 0.53569 1.4079 0 1.9436s-1.4079 0.53569-1.9436 0l-8.7427-8.7427zm5.8308-3.8872 1.9436 1.9436c0.53569 0.53569 0.53569 1.4079 0 1.9436l-0.97523 0.97523-3.8803-3.8872 0.96836-0.96836c0.53569-0.54256 1.4079-0.54256 1.9436-0.0068678zm-6.7991 4.8555 3.8872 3.8872-0.96836 0.96836c-0.53569 0.53569-1.4079 0.53569-1.9436 0l-1.9436-1.9436c-0.53569-0.53569-0.53569-1.4079 0-1.9436l0.96836-0.96836z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/audiologist-m.svg b/data/styles/default/dark/symbols/audiologist-m.svg
index 1d56ec143..dcc0c83e2 100644
--- a/data/styles/default/dark/symbols/audiologist-m.svg
+++ b/data/styles/default/dark/symbols/audiologist-m.svg
@@ -2,7 +2,7 @@
   <title>audiologist-m</title>
   <g>
     <circle id="outer" r="12" cx="12" cy="12" fill="#000" opacity=".6"/>
-    <circle id="inner" r="11" cx="12" cy="12" fill="#c15746"/>
+    <circle id="inner" r="11" cx="12" cy="12" fill="#983E44"/>
     <g stroke="#000" stroke-linecap="round" fill="none">
       <path d="M 15.729487,14.689004 C 17.3844,13.564632 18.61704,11.832386 18.61704,9.6980126 a 5.7549639,5.7549639 0 0 0 -11.5099277,0 V 17.12803 c 0,1.591967 1.2855145,2.928919 2.8774816,2.928919 v 0 c 1.5919681,0 2.4037781,-0.933024 2.7800081,-1.43874 0.531255,-0.712537 1.500246,-2.933594 2.964885,-3.929205 z"/>
       <path d="M 9.4090978,13.726488 V 9.4102656 c 0,-1.7408758 1.5538392,-3.1652311 3.4529782,-3.1652311 v 0 c 1.89914,0 3.452978,1.4243553 3.452978,3.1652311"/>
diff --git a/data/styles/default/dark/symbols/bakery-m.svg b/data/styles/default/dark/symbols/bakery-m.svg
index 5f96a39c7..4d3621978 100644
--- a/data/styles/default/dark/symbols/bakery-m.svg
+++ b/data/styles/default/dark/symbols/bakery-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="bakery-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <path id="Shape" d="m18.48 16.308c-1.0762-0.79162-1.6188-1.1919-1.6188-1.1919s0.28463-0.52478 0.85388-1.5832c0.33799-0.52478 1.0851-0.52478 1.4231 0l0.72046 1.1207c0.169 0.26684 0.18679 0.60483 0.053367 0.88946l-0.19568 0.41804c-0.22236 0.48031-0.8094 0.64041-1.2363 0.34689zm-12.95 0c-0.42694 0.29352-1.0051 0.13342-1.2363-0.33799l-0.20457-0.41804c-0.13342-0.28463-0.11563-0.62262 0.053367-0.88946l0.72046-1.1207c0.33799-0.52478 1.0851-0.52478 1.4231 0 0.57815 1.0496 0.86277 1.5743 0.86277 1.5743s-0.54257 0.40026-1.6188 1.1919zm9.4638-6.1995c0.080051-0.60483 0.6493-0.94282 1.1296-0.66709l1.4142 0.80051c0.40915 0.23126 0.56036 0.8094 0.3202 1.2541l-1.8501 3.6201h-1.601l0.58704-5.0076zm-5.986 0 0.59594 5.0076h-1.601l-1.859-3.629c-0.24015-0.44473-0.088946-1.0229 0.3202-1.2541l1.4142-0.80051c0.47141-0.26684 1.0496 0.071156 1.1296 0.67599zm4.5985 5.0076h-3.202l-0.6582-6.1195c-0.062262-0.52478 0.31131-0.99619 0.78272-0.99619h2.9352c0.47141 0 0.83609 0.47141 0.78272 0.99619l-0.64041 6.1195z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/bank-m.svg b/data/styles/default/dark/symbols/bank-m.svg
index 6f61028cc..4d962e452 100644
--- a/data/styles/default/dark/symbols/bank-m.svg
+++ b/data/styles/default/dark/symbols/bank-m.svg
@@ -1,7 +1,7 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <g fill-rule="evenodd" opacity="1">
   <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#717065"/>
+  <circle cx="12" cy="12" r="11" fill="#51585E"/>
   <path d="m6 7.7692 6-2.7692 6 2.7692v0.92308h-0.92308v6.9231h0.92308v1.3846h-12v-1.3846h0.92308v-6.9231h-0.92308zm8.3077 4.9242c0-1.0203-1.0379-1.847-2.3097-1.847-0.42256 0-0.77128-0.27557-0.77128-0.61675s0.34462-0.61675 0.77128-0.61675c0.42667 0 0.77128 0.27885 0.77128 0.61675h1.5385c0-0.80046-0.6441-1.4763-1.5385-1.7322v-0.72829h-1.5385v0.72829c-0.89436 0.25589-1.5385 0.93169-1.5385 1.7322 0 1.0203 1.0379 1.847 2.3097 1.847 0.42667 0 0.77128 0.27557 0.77128 0.61675s-0.34462 0.61675-0.77128 0.61675c-0.42667 0-0.77128-0.27885-0.77128-0.61675h-1.5385c0 0.80046 0.6441 1.4763 1.5385 1.7322v0.72829h1.5385v-0.72829c0.89436-0.25589 1.5385-0.93169 1.5385-1.7322z" fill="#000"/>
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/banknote-m.svg b/data/styles/default/dark/symbols/banknote-m.svg
index 59923063f..1286f953d 100644
--- a/data/styles/default/dark/symbols/banknote-m.svg
+++ b/data/styles/default/dark/symbols/banknote-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="banknote-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11.143" fill="#717065"/>
+   <circle id="Oval" cx="12" cy="12" r="11.143" fill="#51585E"/>
    <path id="Shape" d="m18.286 8.8571h-0.81943l-1.548-2.58c-0.082286-0.136-0.21714-0.23257-0.37314-0.26514-0.15486-0.032-0.31886 0.0022857-0.44857 0.094286l-3.8509 2.7509h1.9663l2.0451-1.4606 0.87657 1.4606h-2.4194v1.1429h4v4.5714h-6.8571v-1.1429h-1.1429v1.7143c0 0.316 0.256 0.57143 0.57143 0.57143h3.9326l-0.128 0.256c-0.097143 0.19486-0.29257 0.31543-0.51029 0.31543h-3.6291l-1.3794-1.3794v-2.9549l1.3794-1.38h2.0491v0.57143c0 0.31486-0.256 0.57143-0.57143 0.57143h-1.1429v1.1429h1.1429c0.94514 0 1.7143-0.76914 1.7143-1.7143v-1.1429c0-0.31543-0.25543-0.57143-0.57143-0.57143h-2.8571c-0.15143 0-0.29714 0.059429-0.404 0.168l-1.0474 1.0469c-0.08-0.041714-0.16629-0.072-0.26286-0.072h-2.2857c-0.31543 0-0.57143 0.256-0.57143 0.57143v4.5714c0 0.316 0.256 0.57143 0.57143 0.57143h2.2857c0.096571 0 0.18286-0.029714 0.26286-0.072l1.0474 1.048c0.10686 0.10629 0.25257 0.16686 0.404 0.16686h3.8657c0.65371 0 1.2411-0.36286 1.5331-0.948l0.38286-0.76629h2.7897c0.316 0 0.57143-0.25543 0.57143-0.57143v-5.7143c0-0.31543-0.25543-0.57143-0.57143-0.57143zm-10.857 6.2857h-1.1429v-3.4286h1.1429v3.4286z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/bar-m.svg b/data/styles/default/dark/symbols/bar-m.svg
index af7e33224..9fce37284 100644
--- a/data/styles/default/dark/symbols/bar-m.svg
+++ b/data/styles/default/dark/symbols/bar-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="bar-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#BB9342"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C491C"/>
    <path id="🔹-Icon-Color" d="m18 6.9667c0-0.53333-0.43333-0.96667-0.96667-0.96667h-10.067c-0.53333 0-0.96667 0.43333-0.96667 0.96667 0 0.23333 0.086667 0.46667 0.24667 0.64l5.0867 5.7267v3.3333h-2.6667c-0.36667 0-0.66667 0.3-0.66667 0.66667 0 0.36667 0.3 0.66667 0.66667 0.66667h6.6667c0.36667 0 0.66667-0.3 0.66667-0.66667 0-0.36667-0.3-0.66667-0.66667-0.66667h-2.6667v-3.3333l5.0867-5.7267c0.16-0.17333 0.24667-0.40667 0.24667-0.64zm-9.0467 1.7-1.18-1.3333h8.46l-1.1867 1.3333h-6.0933z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/bcontrol-m.svg b/data/styles/default/dark/symbols/bcontrol-m.svg
index 71b3095e0..42bf7bcdd 100644
--- a/data/styles/default/dark/symbols/bcontrol-m.svg
+++ b/data/styles/default/dark/symbols/bcontrol-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="bcontrol-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#51585E"/>
    <path id="Shape" d="m10.286 17.133v0.93333h3.4286v-11.2h-3.4286v10.267 0.93333l1.7143-0.93333 1.7143 0.93333v-1.8667l-1.7143-0.93333-1.7143 0.93333v0.93333zm4.5714 0.93333 1.1429 0.93333h-8l1.1429-0.93333v-11.2l2.8571-1.8667 2.8571 1.8667v11.2zm-4.5714-9.3333 1.7143-0.93333 1.7143 0.93333v1.8667l-1.7143-0.93333-1.7143 0.93333v-1.8667zm0 3.7333 1.7143-0.93333 1.7143 0.93333v1.8667l-1.7143-0.93333-1.7143 0.93333v-1.8667z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/bcontrol-s.svg b/data/styles/default/dark/symbols/bcontrol-s.svg
index 493d525fe..7548485e5 100644
--- a/data/styles/default/dark/symbols/bcontrol-s.svg
+++ b/data/styles/default/dark/symbols/bcontrol-s.svg
@@ -1,7 +1,7 @@
 <svg viewBox="0 0 16 16" width="12" height="12" fill="none" xmlns="http://www.w3.org/2000/svg">
 <g>
   <circle id="Oval" cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
-  <circle id="Oval" cx="8" cy="8" r="7" fill="#717065"/>
+  <circle id="Oval" cx="8" cy="8" r="7" fill="#51585E"/>
   <path d="M6.8573 11.4219V12.0441H9.14303V4.57747H6.8573V11.4219V12.0441L8.00016 11.4221L9.14303 12.0441V10.7999L8.00016 10.1777L6.8573 10.7999V11.4219ZM9.9049 12.0441L10.6668 12.6664H5.3335L6.09543 12.0441V4.57747L8.00016 3.33301L9.9049 4.57747V12.0441ZM6.8573 5.82194L8.00016 5.19972L9.14303 5.82194V7.06641L8.00016 6.44419L6.8573 7.06641V5.82194ZM6.8573 8.31081L8.00016 7.68859L9.14303 8.31081V9.55527L8.00016 8.93305L6.8573 9.55527V8.31081Z" fill="#000"/>
 </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/beach-m.svg b/data/styles/default/dark/symbols/beach-m.svg
index c53e218f7..5af72a4f6 100644
--- a/data/styles/default/dark/symbols/beach-m.svg
+++ b/data/styles/default/dark/symbols/beach-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="2">
   <g id="beach-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#51585E"/>
    <path id="Shape" d="m12.877 13.991 1.1125-1.1123 5.0101 5.0116-1.1102 1.11-5.0124-5.0092zm3.3398-4.457 2.225-2.2246c-3.0729-3.0724-8.0519-3.0802-11.125-0.015557 3.0574-1.0112 6.4649-0.19446 8.8999 2.2402zm-8.9232-2.2168c-3.0652 3.0724-3.0574 8.0506 0.015559 11.123l2.225-2.2246c-2.435-2.4346-3.2519-5.8415-2.2405-8.8984zm0.015559-0.015557-0.0077796 0.0077783c-0.29563 2.3413 0.91021 5.3515 3.3452 7.7939l4.4577-4.457c-2.435-2.4346-5.4535-3.6403-7.7952-3.3447z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/beauty-m.svg b/data/styles/default/dark/symbols/beauty-m.svg
index d48b2aa87..8ef5e0274 100644
--- a/data/styles/default/dark/symbols/beauty-m.svg
+++ b/data/styles/default/dark/symbols/beauty-m.svg
@@ -2,7 +2,7 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <g opacity="1">
   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+  <circle cx="12" cy="12" r="11" fill="#6B425C"/>
   <path d="m13.469 4.3867c-0.092224 0.0013998-0.18374 0.03451-0.26562 0.099609l-2.6504 2.0996c-0.16006 0.1267-0.25781 0.35587-0.25781 0.60156v4.3125h3.7109v-6.4121c0-0.25199-0.10364-0.48479-0.26953-0.60938-0.082946-0.0623-0.17535-0.093197-0.26758-0.091797zm-4.7031 8.1133v4h6.7676v-4h-6.7676zm0 5v0.43945c0 0.91944 0.67451 1.668 1.5039 1.668h3.7598c0.82936 0 1.5039-0.74848 1.5039-1.668v-0.43945h-6.7676z" fill="#000"/>
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/beekeeper-m.svg b/data/styles/default/dark/symbols/beekeeper-m.svg
index d5ace5c1e..df46b8afe 100644
--- a/data/styles/default/dark/symbols/beekeeper-m.svg
+++ b/data/styles/default/dark/symbols/beekeeper-m.svg
@@ -2,7 +2,7 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <g opacity="1">
   <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+  <circle cx="12" cy="12" r="11" fill="#6B425C"/>
   <path d="m8.7793 3.5527-0.42383 0.42383-0.42578 0.42383 1.7461 1.75c-0.30791 0.35129-0.54092 0.75567-0.69922 1.2168-0.19425 0.56584-0.17202 1.1453 0.058594 1.7383l0.095703 0.24414 2.8613-1.0078 2.9023 0.9707 0.072266-0.27734c0.17553-0.65417 0.17628-1.2439-0.029297-1.7578-0.15692-0.39225-0.3816-0.75007-0.66406-1.0762l1.7969-1.8008-0.42578-0.42383-0.42383-0.42383-1.8809 1.8848c-0.41314-0.21581-0.87309-0.32422-1.3867-0.32422-0.48309 1e-7 -0.92392 0.10036-1.3223 0.29492l-1.8516-1.8555zm3.0527 5.9258s-3.4697 1.1955-4.4687 1.666c-0.99908 0.47052-1.4656 1.0767-1.6582 1.7129-0.24708 0.63952 0.012657 1.2548 0.38477 1.627 0.36513 0.3651 1.0132 0.70427 1.7793 0.53711 0.76007-0.16583 1.4524-0.56602 2.1113-1.2285 0.52525-0.52518 0.94732-1.355 1.2422-2.2012 0.28737-0.82465 0.46828-1.4059 0.5332-1.7305l0.076172-0.38281zm0.33594 0 0.076172 0.38281c0.06492 0.32459 0.24584 0.90582 0.5332 1.7305 0.29486 0.84615 0.71694 1.676 1.2422 2.2012 0.65896 0.6625 1.3513 1.0627 2.1113 1.2285 0.76614 0.16716 1.4142-0.17201 1.7793-0.53711 0.37211-0.37213 0.63184-0.98743 0.38477-1.627-0.19263-0.63623-0.65912-1.2424-1.6582-1.7129-0.99908-0.47052-4.4688-1.666-4.4688-1.666zm-0.16797 2.6465c-0.20461 0.67674-0.39347 1.1835-0.82031 1.7852-0.28707 0.37547-0.59242 0.76378-0.96484 1.0625-0.14229 0.11958-0.28868 0.22136-0.4375 0.3125h4.5195c-0.16494-0.092973-0.3145-0.19036-0.46484-0.30859-0.33436-0.28315-0.69887-0.69528-0.96289-1.0938-0.29132-0.5025-0.62864-1.1279-0.86914-1.7578zm-3.9512 4.1602c0.19439 0.39663 0.41526 0.75984 0.65625 1.0898h6.5898c0.24102-0.32994 0.46192-0.69335 0.65625-1.0898h-7.9023zm1.5762 2.0898c0.53884 0.45196 1.1388 0.75512 1.7754 0.87695v1.7559h0.59961 0.59961v-1.7559c0.63593-0.12187 1.2345-0.425 1.7734-0.87695h-4.748z" fill="#000"/>
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/bicycle-parking-covered-m.svg b/data/styles/default/dark/symbols/bicycle-parking-covered-m.svg
index fc8e11840..495977606 100644
--- a/data/styles/default/dark/symbols/bicycle-parking-covered-m.svg
+++ b/data/styles/default/dark/symbols/bicycle-parking-covered-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="15" height="15" version="1.1" viewBox="0 0 15 15" xmlns="http://www.w3.org/2000/svg">
  <path d="m7.5 0.20117c-0.067041 6.653e-5 -0.13434 0.005093-0.20117 0.015625-0.13244 0.020495-0.26091 0.061342-0.38086 0.12109l-6 3c-0.64169 0.32156-0.90136 1.1023-0.58008 1.7441 0.32156 0.64169 1.1023 0.90136 1.7441 0.58008l0.73242-0.36719c-0.00846 0.059424-0.013678 0.11964-0.013672 0.17969 0 0.29698 0.099843 0.61113 0.32812 0.86523 0.22641 0.25293 0.5683 0.39267 0.91797 0.40039l0.00977 0.025391c-2.0956 0.015212-3.8086 1.738-3.8086 3.8359 0 2.1083 1.7275 3.8359 3.8359 3.8359 1.5285 0 2.8046-0.93676 3.416-2.2402 0.61082 1.3042 1.8856 2.2402 3.416 2.2402 2.1072 0 3.8359-1.7275 3.8359-3.8359 0-2.1072-1.7287-3.8379-3.8359-3.8379-0.07133 0-0.10639 0.010462-0.1543 0.019531l-0.27735-0.70117v-1.4629c-7.01e-4 -0.061321-0.007944-0.12113-0.017578-0.18164l2.4512 1.2246c0.64183 0.32128 1.4226 0.061608 1.7441-0.58008 0.32128-0.64183 0.06161-1.4226-0.58008-1.7441l-6-3c-0.18158-0.090666-0.38091-0.13692-0.58203-0.13672z" fill="#111" opacity=".6" stroke-linecap="round" stroke-linejoin="round"/>
- <path d="m7.5008 4.135c-0.58277-0.00865-0.58277 0.87345 0 0.86512h1.293v1.0949l-2.4158 2.0192-0.84008-2.249h0.23911c0.58277 0.00865 0.58277-0.87345 0-0.86512h-1.724c-0.58277-0.00865-0.58277 0.87345 0 0.86512h0.56225l0.76778 2.0547c-0.40322-0.20123-0.85088-0.32443-1.33-0.32443-1.6611 0-3.0169 1.3607-3.0169 3.0279s1.3558 3.0279 3.0169 3.0279 3.0169-1.3607 3.0169-3.0279c0-0.57955-0.17264-1.1169-0.45623-1.5782l2.431-2.0327 0.399 1.0038c-0.89865 0.5254-1.5118 1.4922-1.5118 2.6072 0 1.6672 1.3558 3.0279 3.0169 3.0279s3.0169-1.3607 3.0169-3.0279-1.3558-3.0279-3.0169-3.0279c-0.24402 0-0.47787 0.037541-0.70547 0.092917l-0.58751-1.4751v-1.6457c0-0.23886-0.193-0.43256-0.43098-0.43256zm-3.4478 4.3256c0.51054 0 0.97192 0.18332 1.3401 0.47816l-1.6162 1.3518c-0.44038 0.36967 0.11015 1.0334 0.55217 0.66572l1.6162-1.3518c0.16222 0.30436 0.26264 0.64786 0.26264 1.0189 0 1.1996-0.9597 2.1629-2.1549 2.1629s-2.1549-0.96322-2.1549-2.1629c0-1.1996 0.95955-2.1628 2.1549-2.1628zm6.8956 0c1.1952 0 2.1549 0.96322 2.1549 2.1629 0 1.1996-0.9597 2.1628-2.1549 2.1628s-2.1549-0.96322-2.1549-2.1628c0-0.7587 0.38512-1.4206 0.96968-1.8063l0.78458 1.9668c0.21204 0.53906 1.0174 0.21637 0.80145-0.32105l-0.78278-1.9634c0.1243-0.02215 0.25118-0.03885 0.3821-0.03885z" fill="#2e89b0"/>
- <path d="m1.5 4.5 6-3 6 3" fill="none" stroke="#2e89b0" stroke-linecap="round"/>
+ <path d="m7.5008 4.135c-0.58277-0.00865-0.58277 0.87345 0 0.86512h1.293v1.0949l-2.4158 2.0192-0.84008-2.249h0.23911c0.58277 0.00865 0.58277-0.87345 0-0.86512h-1.724c-0.58277-0.00865-0.58277 0.87345 0 0.86512h0.56225l0.76778 2.0547c-0.40322-0.20123-0.85088-0.32443-1.33-0.32443-1.6611 0-3.0169 1.3607-3.0169 3.0279s1.3558 3.0279 3.0169 3.0279 3.0169-1.3607 3.0169-3.0279c0-0.57955-0.17264-1.1169-0.45623-1.5782l2.431-2.0327 0.399 1.0038c-0.89865 0.5254-1.5118 1.4922-1.5118 2.6072 0 1.6672 1.3558 3.0279 3.0169 3.0279s3.0169-1.3607 3.0169-3.0279-1.3558-3.0279-3.0169-3.0279c-0.24402 0-0.47787 0.037541-0.70547 0.092917l-0.58751-1.4751v-1.6457c0-0.23886-0.193-0.43256-0.43098-0.43256zm-3.4478 4.3256c0.51054 0 0.97192 0.18332 1.3401 0.47816l-1.6162 1.3518c-0.44038 0.36967 0.11015 1.0334 0.55217 0.66572l1.6162-1.3518c0.16222 0.30436 0.26264 0.64786 0.26264 1.0189 0 1.1996-0.9597 2.1629-2.1549 2.1629s-2.1549-0.96322-2.1549-2.1629c0-1.1996 0.95955-2.1628 2.1549-2.1628zm6.8956 0c1.1952 0 2.1549 0.96322 2.1549 2.1629 0 1.1996-0.9597 2.1628-2.1549 2.1628s-2.1549-0.96322-2.1549-2.1628c0-0.7587 0.38512-1.4206 0.96968-1.8063l0.78458 1.9668c0.21204 0.53906 1.0174 0.21637 0.80145-0.32105l-0.78278-1.9634c0.1243-0.02215 0.25118-0.03885 0.3821-0.03885z" fill="#20607C"/>
+ <path d="m1.5 4.5 6-3 6 3" fill="none" stroke="#20607C" stroke-linecap="round"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bicycle-parking-m.svg b/data/styles/default/dark/symbols/bicycle-parking-m.svg
index a6cb06be5..af8fb9d1e 100644
--- a/data/styles/default/dark/symbols/bicycle-parking-m.svg
+++ b/data/styles/default/dark/symbols/bicycle-parking-m.svg
@@ -1,4 +1,4 @@
 <svg version="1.1" viewBox="0 0 20 20" width="15" height="15" xmlns="http://www.w3.org/2000/svg">
 	<path d="m10.013 2.6065c-0.48169-0.00339-0.94969 0.19599-1.281 0.54562-0.00154 0.00156-0.00317 0.00315-0.00481 0.00474-0.14997 0.16568-0.23099 0.37754-0.30519 0.58832h-2.9638c-0.4818-0.00392-0.95078 0.19497-1.2826 0.54404-0.00215 0.00208-0.00425 0.00418-0.00633 0.00633-0.27762 0.31236-0.43496 0.72869-0.43492 1.1466 0 0.39598 0.13213 0.81411 0.4365 1.1529 0.30188 0.33724 0.75948 0.52425 1.2257 0.53455l0.012652 0.034794c-2.7942 0.020283-5.0798 2.3159-5.0798 5.113 0 2.8111 2.3051 5.1162 5.1162 5.1162 2.038 0 3.7379-1.2511 4.5531-2.9891 0.81442 1.739 2.5159 2.9891 4.5564 2.9891 2.8096 0 5.1146-2.3051 5.1146-5.1162 0-2.8096-2.305-5.1162-5.1146-5.1162-0.09511 0-0.14172 0.013218-0.2056 0.025305l-0.37164-0.93465v-1.9468c6e-6 -0.00105 6e-6 -0.00212 0-0.00316-0.0051-0.44292-0.18954-0.88099-0.50292-1.194-0.31338-0.31303-0.75112-0.49679-1.194-0.50134-9.97e-4 -6.3e-6 -0.0022-6.3e-6 -0.0032 0h-2.2631zm3.9395 3.5853c0.05019 0.096919-0.03147-0.083775 0.0095 0.017395 0.0124 0.030624 0.0031 0.012334 0.0015 0.00633-0.0033-0.00809-7e-3 -0.016001-0.01107-0.023724z" fill="#111" opacity=".6"/>
-	<path d="m10.001 3.6558c-0.77703-0.011535-0.77703 1.1646 0 1.1535h1.724v1.4599l-3.2211 2.6922-1.1201-2.9987h0.31881c0.77703 0.011534 0.77703-1.1646 0-1.1535h-2.2986c-0.77703-0.011535-0.77703 1.1646 0 1.1535h0.74967l1.0237 2.7396c-0.53763-0.26831-1.1345-0.43257-1.7733-0.43257-2.2148 0-4.0225 1.8143-4.0225 4.0372 0 2.2229 1.8077 4.0372 4.0225 4.0372s4.0225-1.8143 4.0225-4.0372c0-0.77273-0.23019-1.4892-0.60831-2.1043l3.2413-2.7103 0.532 1.3384c-1.1982 0.70053-2.0157 1.9896-2.0157 3.4762 0 2.2229 1.8077 4.0372 4.0225 4.0372 2.2148 0 4.0225-1.8143 4.0225-4.0372 0-2.2229-1.8077-4.0372-4.0225-4.0372-0.32536 0-0.63716 0.050055-0.94063 0.12389l-0.78335-1.9668v-2.1943c0-0.31848-0.25733-0.57675-0.57464-0.57675zm-4.5971 5.7675c0.68072 0 1.2959 0.24443 1.7868 0.63754l-2.155 1.8024c-0.58717 0.49289 0.14687 1.3778 0.73623 0.88763l2.155-1.8024c0.21629 0.40581 0.35019 0.86382 0.35019 1.3586 0 1.5995-1.2796 2.8838-2.8732 2.8838-1.5936 0-2.8732-1.2843-2.8732-2.8838s1.2794-2.8838 2.8732-2.8838zm9.1941 0c1.5936 0 2.8732 1.2843 2.8732 2.8838s-1.2796 2.8838-2.8732 2.8838-2.8732-1.2843-2.8732-2.8838c0-1.0116 0.5135-1.8941 1.2929-2.4084l1.0461 2.6224c0.28272 0.71875 1.3566 0.28849 1.0686-0.42806l-1.0437-2.6179c0.16573-0.02953 0.3349-0.0518 0.50947-0.0518z" fill="#2e89b0"/>
+	<path d="m10.001 3.6558c-0.77703-0.011535-0.77703 1.1646 0 1.1535h1.724v1.4599l-3.2211 2.6922-1.1201-2.9987h0.31881c0.77703 0.011534 0.77703-1.1646 0-1.1535h-2.2986c-0.77703-0.011535-0.77703 1.1646 0 1.1535h0.74967l1.0237 2.7396c-0.53763-0.26831-1.1345-0.43257-1.7733-0.43257-2.2148 0-4.0225 1.8143-4.0225 4.0372 0 2.2229 1.8077 4.0372 4.0225 4.0372s4.0225-1.8143 4.0225-4.0372c0-0.77273-0.23019-1.4892-0.60831-2.1043l3.2413-2.7103 0.532 1.3384c-1.1982 0.70053-2.0157 1.9896-2.0157 3.4762 0 2.2229 1.8077 4.0372 4.0225 4.0372 2.2148 0 4.0225-1.8143 4.0225-4.0372 0-2.2229-1.8077-4.0372-4.0225-4.0372-0.32536 0-0.63716 0.050055-0.94063 0.12389l-0.78335-1.9668v-2.1943c0-0.31848-0.25733-0.57675-0.57464-0.57675zm-4.5971 5.7675c0.68072 0 1.2959 0.24443 1.7868 0.63754l-2.155 1.8024c-0.58717 0.49289 0.14687 1.3778 0.73623 0.88763l2.155-1.8024c0.21629 0.40581 0.35019 0.86382 0.35019 1.3586 0 1.5995-1.2796 2.8838-2.8732 2.8838-1.5936 0-2.8732-1.2843-2.8732-2.8838s1.2794-2.8838 2.8732-2.8838zm9.1941 0c1.5936 0 2.8732 1.2843 2.8732 2.8838s-1.2796 2.8838-2.8732 2.8838-2.8732-1.2843-2.8732-2.8838c0-1.0116 0.5135-1.8941 1.2929-2.4084l1.0461 2.6224c0.28272 0.71875 1.3566 0.28849 1.0686-0.42806l-1.0437-2.6179c0.16573-0.02953 0.3349-0.0518 0.50947-0.0518z" fill="#20607C"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/blacksmith-m.svg b/data/styles/default/dark/symbols/blacksmith-m.svg
index fee2fea4d..2cda989c0 100644
--- a/data/styles/default/dark/symbols/blacksmith-m.svg
+++ b/data/styles/default/dark/symbols/blacksmith-m.svg
@@ -2,7 +2,7 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <g opacity="1">
   <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+  <circle cx="12" cy="12" r="11" fill="#6B425C"/>
   <path d="m8.1094 4.2692-0.93172 3.4792a0.39995 0.39995 59.988 0 0 0.28292 0.48981l2.3503 0.62909a0.40048 0.40048 150.02 0 0 0.49029-0.28285l0.17307-0.64347a0.40037 0.40037 150.03 0 1 0.49026-0.28274l5.153 1.3808a0.39587 0.39587 149.7 0 0 0.48589-0.28389l0.1662-0.64703a0.40416 0.40416 59.702 0 0-0.28686-0.49094l-5.1394-1.3769a0.40013 0.40013 59.99 0 1-0.28298-0.48992l0.17211-0.64321a0.40026 0.40026 59.999 0 0-0.28294-0.49006l-2.3504-0.63059a0.39982 0.39982 150.01 0 0-0.48981 0.28273zm1.5586 6.9218v0.09258a0.4 0.4 135 0 1-0.4 0.4h-3.7957c-0.22091 0-0.40013 0.17995-0.36889 0.39847 0.1296 0.90626 0.68265 2.3106 2.0042 2.5892 0.21573 0.04548 0.57545 0.04748 0.79636 0.04748h2.0789c0.22091 0 0.40047 0.17909 0.39908 0.4-0.01175 1.8714-0.1716 2.6553-2.2986 2.7373-0.22064 0.0085-0.39974 0.18634-0.39974 0.40725v1.4539a0.4 0.4 45 0 0 0.4 0.4h2.4559a0.4 0.4 135 0 0 0.4-0.4 0.36954 0.36954 139.94 0 1 0.4-0.33633h2.3465a0.4 0.4 45 0 1 0.4 0.4 0.36954 0.36954 40.058 0 0 0.4 0.33633h2.3016a0.4 0.4 135 0 0 0.4-0.4v-1.409a0.4 0.4 45 0 0-0.4-0.4h-0.07109c-0.22091 0-0.58149 0.0054-0.79726-0.04008-1.8741-0.39502-1.8741-3.5854-1.7e-5 -3.9804 0.21578-0.04548 0.57637-0.04008 0.79728-0.04008h1.8113a0.4 0.4 135 0 0 0.4-0.4v-1.2977a0.55355 0.55355 54.148 0 0-0.37978-0.52557l-2.1408-0.70784a2.484 2.484 9.148 0 0-0.77978-0.12557h-5.5594a0.4 0.4 135 0 0-0.4 0.4z" fill="#000"/>
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/blood_donation-m.svg b/data/styles/default/dark/symbols/blood_donation-m.svg
index f998061fc..b194f52d9 100644
--- a/data/styles/default/dark/symbols/blood_donation-m.svg
+++ b/data/styles/default/dark/symbols/blood_donation-m.svg
@@ -2,7 +2,7 @@
   <title>blood_donation-m</title>
   <g>
     <circle id="outer" r="12" cx="12" cy="12" fill="#000" opacity=".6"/>
-    <circle id="inner" r="11" cx="12" cy="12" fill="#c15746"/>
+    <circle id="inner" r="11" cx="12" cy="12" fill="#983E44"/>
     <path id="drop" fill="#000" d="m 12.00141,4.6031315 4.36204,6.8276635 c 0.532573,0.834086 0.814358,1.80061 0.814358,2.786859 0,1.375112 -0.546663,2.69105 -1.516005,3.663211 -0.972158,0.969342 -2.288098,1.516003 -3.660393,1.516003 -1.375113,0 -2.6910517,-0.546661 -3.6632112,-1.516003 -0.9693424,-0.972161 -1.5160067,-2.288099 -1.5160067,-3.660395 0,-0.989065 0.2817863,-1.95559 0.8143607,-2.789676 z"/>
   </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/book-shop-m.svg b/data/styles/default/dark/symbols/book-shop-m.svg
index 37a81bc93..cf8f50d58 100644
--- a/data/styles/default/dark/symbols/book-shop-m.svg
+++ b/data/styles/default/dark/symbols/book-shop-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+ <circle cx="12" cy="12" r="11" fill="#6B425C"/>
  <path d="m12 8.2813s-3-2.5714-6-0.42857v9.4286c3-2.1429 6 0 6 0s3-2.1429 6 0v-9.4286c-3-2.1429-6 0.42857-6 0.42857zm0 0v9" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/bookmaker-m.svg b/data/styles/default/dark/symbols/bookmaker-m.svg
index 2969288d9..3d57c3b04 100644
--- a/data/styles/default/dark/symbols/bookmaker-m.svg
+++ b/data/styles/default/dark/symbols/bookmaker-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="bookmaker-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#51585E"/>
    <path id="Shape" d="m15.8 5h-8.4c-0.77 0-1.4 0.63-1.4 1.4v11.2c0 0.77 0.63 1.4 1.4 1.4h8.4c0.77 0 1.4-0.63 1.4-1.4v-11.2c0-0.77-0.63-1.4-1.4-1.4zm-8.4 1.4h3.5v5.6l-1.75-1.05-1.75 1.05v-5.6z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/bowling_alley-m.svg b/data/styles/default/dark/symbols/bowling_alley-m.svg
index 25aeac371..0bd625875 100644
--- a/data/styles/default/dark/symbols/bowling_alley-m.svg
+++ b/data/styles/default/dark/symbols/bowling_alley-m.svg
@@ -1,5 +1,5 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#8c5f93"/>
+ <circle cx="12" cy="12" r="11" fill="#6B425C"/>
  <path d="m17.814453 3.8535156c-.603341-.0348572-1.292607.2159125-1.726562.7011719-1.070067 1.1965695-.839929 1.9874104-.775391 3.5136719.02518.16606.05859.5019531.05859.5019531l3.320312.6835937s.165185-.2948914.253906-.4375c.662226-1.3766255 1.18416-2.0131914.673833-3.5351562-.236532-.7053955-.89885-1.2598998-1.552735-1.3945312-.081735-.016829-.165761-.0282236-.251953-.0332032zm-7.400391 3.3710938c-2.8975029-.0408224-5.6930185 1.8219273-6.7910151 4.4999996-1.146727 2.630925-.5519058 5.899022 1.4570312 7.951172 1.6254447 1.748763 4.1338307 2.557928 6.4765629 2.195313-.321854-.982015-.590771-2.383672-.416016-3.56836.366972-2.487752 2.212752-5.362092 3-6.921875.353016-.702272.721364-1.5366287.652344-2.7128902-.323073-.2396476-.663199-.4562423-1.025391-.6367188-1.032783-.5308062-2.19257-.8082401-3.353516-.8066406zm-2.0839839 2.5585937c.8368725-.078164 1.3385167 1.0530239.75 1.6308589-.5026045.609137-1.6070395.269157-1.6796875-.517578-.0940179-.556561.3641095-1.107381.9296875-1.1132809zm6.9941409.1191407-.208985.8750002 2.941407.605468.152343-.884765zm-.867188 2.0820312s-2.464867 4.071428-2.732422 6.365234c-.155335 1.331731.148701 2.916223.69336 3.962891 2.507839-.246004 4.359101-1.105793 5.849609-2.160156.904451-2.336395-.083984-7.402344-.083984-7.402344zm-8.4824216.621094c.8360984-.07468 1.338813 1.054191.75 1.632812-.5020198.608577-1.6071071.2708-1.6796875-.515625-.093664-.555925.364611-1.108905.9296875-1.117187zm3.0117187.160156c.8367309-.07827 1.3388649 1.053328.75 1.630859-.5032491.607309-1.6068595.266135-1.6796875-.519531-.094269-.556267.3644171-1.105487.9296875-1.111328z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/brewery-m.svg b/data/styles/default/dark/symbols/brewery-m.svg
index d3e3606cb..b5b321848 100644
--- a/data/styles/default/dark/symbols/brewery-m.svg
+++ b/data/styles/default/dark/symbols/brewery-m.svg
@@ -2,7 +2,7 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <g opacity="1">
   <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+  <circle cx="12" cy="12" r="11" fill="#6B425C"/>
   <path d="m7.3403 4.5911c-0.33792 0.52218-0.62345 1.2577-0.88003 2.0534h1.1658c0.17111-0.70659 0.33873-1.4156 0.57729-2.0534zm1.8579 0c-0.24683 0.61583-0.39422 1.3518-0.57165 2.0534h1.2411c0.07024-0.69344 0.11314-1.3791 0.23129-2.0534zm1.8673 0c-0.12095 0.66044-0.15715 1.3586-0.22941 2.0534h2.328c-0.072254-0.69479-0.10846-1.393-0.22941-2.0534h-0.93456zm2.8357 0c0.11815 0.67436 0.16105 1.36 0.23129 2.0534h1.2317c-0.17743-0.70166-0.3248-1.4376-0.57165-2.0534zm1.886 0c0.23857 0.63777 0.40617 1.3468 0.5773 2.0534h1.1753c-0.2566-0.79572-0.54212-1.5312-0.88004-2.0534zm-9.6089 3.0163c-0.37652 1.4728-0.61302 3.0844-0.61302 4.3926 0 1.3084 0.23651 2.9197 0.61302 4.3926h1.2298c-0.56317-2.9406-0.5744-6.0256-0.052646-8.7852zm2.1813 0c-0.53578 2.7358-0.53401 5.8486 0.047012 8.7852h1.352c-0.12955-1.7041-0.18992-3.3179-0.18992-4.3926 0-1.0747 0.060375-2.6886 0.18992-4.3926zm2.3675 0c-0.13169 1.693-0.19556 3.3125-0.19556 4.3926 0 1.0802 0.06388 2.6996 0.19556 4.3926h2.5461c0.13168-1.693 0.19556-3.3125 0.19556-4.3926 0-1.0802-0.06387-2.6996-0.19556-4.3926h-1.2731zm3.5145 0c0.12957 1.7041 0.18992 3.3179 0.18992 4.3926 0 1.0747-0.06035 2.6886-0.18992 4.3926h1.3407c0.58105-2.9366 0.58466-6.0494 0.04889-8.7852zm2.3938 0c0.52177 2.7598 0.50866 5.8446-0.05454 8.7852h1.2411c0.37652-1.4728 0.61302-3.0844 0.61302-4.3926 0-1.3084-0.23651-2.9197-0.61302-4.3926zm-10.175 9.7481c0.2566 0.79572 0.54211 1.5313 0.88003 2.0534h0.86875c-0.2356-0.6592-0.37887-1.3604-0.54532-2.0534zm2.2001 0c0.17256 0.69046 0.29443 1.4066 0.53968 2.0534h0.89883c-0.11815-0.67436-0.16105-1.36-0.23129-2.0534zm2.1756 0c0.07226 0.69479 0.10846 1.393 0.22941 2.0534h1.8691c0.12096-0.66043 0.15715-1.3586 0.22941-2.0534h-1.164zm3.2964 0c-0.07024 0.69344-0.11314 1.3791-0.23129 2.0534h0.88943c0.24527-0.64691 0.36709-1.3628 0.53968-2.0534zm2.1926 0c-0.16645 0.69301-0.30971 1.3942-0.54532 2.0534h0.88004c0.33792-0.52217 0.62345-1.2577 0.88004-2.0534z" fill="#000"/>
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/buddhist-m.svg b/data/styles/default/dark/symbols/buddhist-m.svg
index de5a65947..f80259354 100644
--- a/data/styles/default/dark/symbols/buddhist-m.svg
+++ b/data/styles/default/dark/symbols/buddhist-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="buddhist-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#7F5933"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6E4426"/>
    <path id="Shape" d="m11.3 5v0.7c-1.211 0.14-2.317 0.63-3.22 1.358l-0.532-0.532-0.994 0.994 0.546 0.525c-0.77 0.931-1.253 2.065-1.4 3.255h-0.7v1.4h0.7c0.147 1.176 0.63 2.282 1.4 3.192l-0.546 0.532 0.994 0.994 0.525-0.518c0.924 0.749 2.037 1.239 3.227 1.4v0.7h1.4v-0.7c1.183-0.161 2.303-0.651 3.22-1.4l0.532 0.518 0.994-0.994-0.546-0.525c0.77-0.91 1.253-2.023 1.4-3.199h0.7v-1.4h-0.7c-0.147-1.19-0.63-2.317-1.4-3.248l0.546-0.532-0.994-0.994-0.525 0.532c-0.924-0.749-2.044-1.218-3.227-1.358v-0.7h-1.4m0 2.1v2.1l-0.7 0.35-1.533-1.505c0.637-0.476 1.4-0.826 2.233-0.945m1.4 0c0.812 0.126 1.582 0.448 2.24 0.945l-1.54 1.505-0.7-0.35v-2.1m-4.62 1.932 1.47 1.568-0.35 0.7h-2.1c0.112-0.812 0.49-1.61 0.973-2.275l7e-3 7e-3m7.84 0c0.511 0.665 0.847 1.442 0.98 2.268h-2.1l-0.35-0.7 1.477-1.568h-7e-3m-3.92 1.568c0.784 0 1.4 0.616 1.4 1.4s-0.616 1.4-1.4 1.4-1.4-0.616-1.4-1.4 0.616-1.4 1.4-1.4m-4.9 2.1h2.1l0.399 0.7-1.526 1.505c-0.504-0.637-0.84-1.393-0.973-2.205m7.7 0h2.1c-0.133 0.805-0.469 1.568-0.973 2.212l-1.477-1.512 0.35-0.7m-4.2 1.75 0.7 0.35v2.1c-0.819-0.14-1.589-0.483-2.24-1.001l1.54-1.449m2.8 0 1.533 1.449c-0.637 0.476-1.4 0.882-2.233 1.001v-2.1l0.7-0.35z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/buddhist-s.svg b/data/styles/default/dark/symbols/buddhist-s.svg
index be385a076..3352fba8f 100644
--- a/data/styles/default/dark/symbols/buddhist-s.svg
+++ b/data/styles/default/dark/symbols/buddhist-s.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="buddhist-s" fill-rule="nonzero">
    <circle id="Oval" cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="8" cy="8" r="7.3333" fill="#7F5933"/>
+   <circle id="Oval" cx="8" cy="8" r="7.3333" fill="#6E4426"/>
    <path id="Shape" d="m7.5333 3.3333v0.46667c-0.80733 0.093333-1.5447 0.42-2.1467 0.90533l-0.35467-0.35467-0.66267 0.66267 0.364 0.35c-0.51333 0.62067-0.83533 1.3767-0.93333 2.17h-0.46667v0.93333h0.46667c0.098 0.784 0.42 1.5213 0.93333 2.128l-0.364 0.35467 0.66267 0.66267 0.35-0.34533c0.616 0.49933 1.358 0.826 2.1513 0.93333v0.46667h0.93333v-0.46667c0.78867-0.10733 1.5353-0.434 2.1467-0.93333l0.35467 0.34533 0.66267-0.66267-0.364-0.35c0.51333-0.60667 0.83533-1.3487 0.93333-2.1327h0.46667v-0.93333h-0.46667c-0.098-0.79333-0.42-1.5447-0.93333-2.1653l0.364-0.35467-0.66267-0.66267-0.35 0.35467c-0.616-0.49933-1.3627-0.812-2.1513-0.90533v-0.46667h-0.93333m0 1.4v1.4l-0.46667 0.23333-1.022-1.0033c0.42467-0.31733 0.93333-0.55067 1.4887-0.63m0.93333 0c0.54133 0.084 1.0547 0.29867 1.4933 0.63l-1.0267 1.0033-0.46667-0.23333v-1.4m-3.08 1.288 0.98 1.0453-0.23333 0.46667h-1.4c0.074667-0.54133 0.32667-1.0733 0.64867-1.5167l0.0046667 0.0046667m5.2267 0c0.34067 0.44333 0.56467 0.96133 0.65333 1.512h-1.4l-0.23333-0.46667 0.98467-1.0453h-0.0046667m-2.6133 1.0453c0.52267 0 0.93333 0.41067 0.93333 0.93333s-0.41067 0.93333-0.93333 0.93333-0.93333-0.41067-0.93333-0.93333 0.41067-0.93333 0.93333-0.93333m-3.2667 1.4h1.4l0.266 0.46667-1.0173 1.0033c-0.336-0.42467-0.56-0.92867-0.64867-1.47m5.1333 0h1.4c-0.088667 0.53667-0.31267 1.0453-0.64867 1.4747l-0.98467-1.008 0.23333-0.46667m-2.8 1.1667 0.46667 0.23333v1.4c-0.546-0.093333-1.0593-0.322-1.4933-0.66733l1.0267-0.966m1.8667 0 1.022 0.966c-0.42467 0.31733-0.93333 0.588-1.4887 0.66733v-1.4l0.46667-0.23333z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/butcher-m.svg b/data/styles/default/dark/symbols/butcher-m.svg
index a21a70007..a11b344bb 100644
--- a/data/styles/default/dark/symbols/butcher-m.svg
+++ b/data/styles/default/dark/symbols/butcher-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="butcher-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <g id="cleaver" transform="translate(6 5)" fill="#000">
     <path id="Shape" d="m11.03 9.1439-5.59-5.5905-3.165 3.165c0.58609 1.003 1.8368 2.5884 2.9784 3.73 0.7732 0.7732 1.5949 1.452 2.4424 2.0297l-0.37843 0.37843c-0.84593-0.58398-1.665-1.2634-2.4366-2.0355-0.974-0.974-2.2664-2.4904-2.9932-3.7152l-0.55447 0.55447c0.65197 1.1179 1.9074 2.6395 2.9884 3.72 1.0805 1.0805 2.2295 1.9633 3.3474 2.6158l3.3611-3.3611c0.41216-0.41216 0.41216-1.0794 0-1.491zm-1.1179 1.1179c-0.20608 0.20608-0.53971 0.20608-0.74526 0-0.20608-0.20608-0.20608-0.53971 0-0.74526 0.20608-0.20608 0.53971-0.20608 0.74526 0 0.20608 0.20608 0.20608 0.53971 0 0.74526z"/>
     <path id="Shape" d="m2.2715 0.38581c-0.51441-0.51441-1.3487-0.51441-1.8637 0-0.51441 0.51441-0.51441 1.3487 0 1.8637 0.30411 0.30359 0.71944 0.42323 1.1142 0.36841l2.054 2.0539 1.4905-1.4905-2.795-2.7955zm-0.65197 1.2064c-0.15443 0.15443-0.40478 0.15443-0.55921 0-0.15443-0.15443-0.15443-0.40478 0-0.55921 0.15443-0.15443 0.40478-0.15443 0.55921 0 0.15443 0.15443 0.15443 0.40478 0 0.55921z"/>
diff --git a/data/styles/default/dark/symbols/cafe-m.svg b/data/styles/default/dark/symbols/cafe-m.svg
index 6b2493264..77a97fa01 100644
--- a/data/styles/default/dark/symbols/cafe-m.svg
+++ b/data/styles/default/dark/symbols/cafe-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="cafe-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#BB9342"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C491C"/>
    <path id="Shape" d="m15.889 7h-8.8889v5.5556c0 1.2278 0.99444 2.2222 2.2222 2.2222h3.3333c1.2278 0 2.2222-0.99444 2.2222-2.2222v-1.6667h1.1111c0.61667 0 1.1111-0.5 1.1111-1.1111v-1.6667c0-0.61667-0.49444-1.1111-1.1111-1.1111zm0 2.7778h-1.1111v-1.6667h1.1111v1.6667zm-8.8889 6.1111h8.8889v1.1111h-8.8889v-1.1111z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/campsite-m.svg b/data/styles/default/dark/symbols/campsite-m.svg
index 0178a3de3..198e2d680 100644
--- a/data/styles/default/dark/symbols/campsite-m.svg
+++ b/data/styles/default/dark/symbols/campsite-m.svg
@@ -2,7 +2,7 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <g opacity="1">
   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#664e42"/>
+  <circle cx="12" cy="12" r="11" fill="#614A43"/>
   <path id="Shape" d="m10.828 5.7196-1.0508 0.64258 1.3418 2.1934-4.8496 7.9355h-1.1523a0.615 0.615 0 0 0-0.61523 0.61328 0.615 0.615 0 0 0 0.61523 0.61523h13.461a0.615 0.615 0 0 0 0.61523-0.61523 0.615 0.615 0 0 0-0.61523-0.61328h-1.168l-4.8496-7.9355 1.3398-2.1934-1.0488-0.64062-1.0117 1.6543zm1.0117 7.6973c1.1863 0 2.1523 0.96339 2.1523 2.1504v0.92383h-4.3027v-0.92383c0-1.1869 0.96405-2.1504 2.1504-2.1504z" fill="#000"/>
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/campsite-s.svg b/data/styles/default/dark/symbols/campsite-s.svg
index e351550b1..9068b9bb8 100644
--- a/data/styles/default/dark/symbols/campsite-s.svg
+++ b/data/styles/default/dark/symbols/campsite-s.svg
@@ -1,7 +1,7 @@
 <svg viewBox="0 0 16 16" width="12" height="12" version="1.1" xmlns="http://www.w3.org/2000/svg">
  <g>
   <circle cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
-  <circle cx="8" cy="8" r="7" fill="#664e42"/>
+  <circle cx="8" cy="8" r="7" fill="#614A43"/>
   <path transform="scale(.667)" d="m10.828 5.7196-1.0508 0.64258 1.3418 2.1934-4.8496 7.9355h-1.1523a0.615 0.615 0 0 0-0.61523 0.61328 0.615 0.615 0 0 0 0.61523 0.61523h13.461a0.615 0.615 0 0 0 0.61523-0.61523 0.615 0.615 0 0 0-0.61523-0.61328h-1.168l-4.8496-7.9355 1.3398-2.1934-1.0488-0.64062-1.0117 1.6543zm1.0117 7.6973c1.1863 0 2.1523 0.96339 2.1523 2.1504v0.92383h-4.3027v-0.92383c0-1.1869 0.96405-2.1504 2.1504-2.1504z" fill="#000"/>
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/cannon-m.svg b/data/styles/default/dark/symbols/cannon-m.svg
index f999e4293..e0cec0668 100644
--- a/data/styles/default/dark/symbols/cannon-m.svg
+++ b/data/styles/default/dark/symbols/cannon-m.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
 	<title>cannon-m</title>
-	<g transform="translate(.00041566 .58395)" fill="#717065" opacity=".6">
+	<g transform="translate(.00041566 .58395)" fill="#51585E" opacity=".6">
 		<ellipse cx="11.493" cy="13.12" rx="1.0525" ry="1.0607"/>
 		<path d="m17.293 12.638c0.01044 0.61735 0.02409 1.2722 0.20874 1.8246 0.33567 1.0041 0.95552 1.9565 1.8216 2.6018 0.86605 0.64534 1.935 1.0008 3.0151 1.0032l0.0028-0.88087c-0.88661-0.0019-1.7795-0.2995-2.4904-0.82921-1.3441-1.2032-1.7147-2.2038-1.0302-3.6409z"/>
 		<path d="m2.5233 4.5994-0.86524 3.1113 5.3476 1.6856a5.8211 5.8664 0 0 1 4.4863-2.1426 5.8211 5.8664 0 0 1 5.8007 5.3848l1.2207 0.38476c1.1721 0.36946 2.4033-0.35891 2.7324-1.543 0.32915-1.184-0.36088-2.4033-1.545-2.7324z"/>
diff --git a/data/styles/default/dark/symbols/car-part-m.svg b/data/styles/default/dark/symbols/car-part-m.svg
index de72fa494..18061ece3 100644
--- a/data/styles/default/dark/symbols/car-part-m.svg
+++ b/data/styles/default/dark/symbols/car-part-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="car-part-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#51585E"/>
    <path id="Shape" d="m12 5c-3.85 0-7 3.15-7 7s3.15 7 7 7 7-3.15 7-7-3.15-7-7-7zm0 1.4c2.87 0 5.25 2.17 5.6 4.9h-2.1c-0.35-0.77-1.82-1.4-3.5-1.4s-3.15 0.63-3.5 1.4h-2.1c0.35-2.73 2.73-4.9 5.6-4.9zm-5.6 6.3h2.1c0.14 0.91 0.84 2.52 2.8 2.8v2.1c-2.52-0.28-4.62-2.38-4.9-4.9zm6.3 4.9v-2.1c1.96-0.28 2.59-1.89 2.8-2.8h2.1c-0.28 2.52-2.38 4.62-4.9 4.9z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/car-repair-m.svg b/data/styles/default/dark/symbols/car-repair-m.svg
index 54fc767fe..95b0dd4b2 100644
--- a/data/styles/default/dark/symbols/car-repair-m.svg
+++ b/data/styles/default/dark/symbols/car-repair-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" transform="scale(1.5)" fill="none" fill-rule="evenodd" opacity="1">
   <g id="car-repair-m" fill-rule="nonzero">
    <circle id="Oval" cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
-   <circle cx="8" cy="8" r="7.3333" fill="#717065"/>
+   <circle cx="8" cy="8" r="7.3333" fill="#51585E"/>
    <g id="Group" transform="translate(4 3.3333)" fill="#000">
     <path id="Shape" d="m1.4737 5.8947v-0.49123h4.9123v0.49123c0 0.27018 0.22105 0.49123 0.49123 0.49123 0.27018 0 0.49123-0.22105 0.49123-0.49123v-3.0996s-0.65825-1.9796-0.76632-2.3039c-0.024561-0.078596-0.058947-0.14246-0.093333-0.19649-0.00982-0.009825-0.014737-0.019649-0.024561-0.034386-0.18667-0.25544-0.45193-0.26035-0.45193-0.26035h-4.2049s-0.26526 0.0049123-0.45193 0.26526c-0.00982 0.009825-0.014737 0.019649-0.024561 0.029474-0.034386 0.054035-0.068772 0.11789-0.093333 0.19649-0.10807 0.32421-0.76632 2.3039-0.76632 2.3039v3.0996c0 0.27018 0.22105 0.49123 0.49123 0.49123 0.27018 0 0.49123-0.22105 0.49123-0.49123zm0.98246-1.7193c-0.27018 0-0.49123-0.22105-0.49123-0.49123 0-0.27018 0.22105-0.49123 0.49123-0.49123 0.27018 0 0.49123 0.22105 0.49123 0.49123 0 0.27018-0.22105 0.49123-0.49123 0.49123zm2.9474 0c-0.27018 0-0.49123-0.22105-0.49123-0.49123 0-0.27018 0.22105-0.49123 0.49123-0.49123 0.27018 0 0.49123 0.22105 0.49123 0.49123 0 0.27018-0.22105 0.49123-0.49123 0.49123zm-3.2765-3.193h3.6056l0.11298 0.33895 0.21123 0.64351h-4.254z"/>
     <path id="Path" d="m0 7.3733c0 0.26526 0.22105 0.48632 0.48632 0.48632h2.9523v0.98737c0 0.27018 0.22105 0.48632 0.48632 0.48632h0.00491c0.27018 0 0.48632-0.22105 0.48632-0.48632v-0.98737h2.9523c0.27018 0 0.48632-0.22105 0.48632-0.48632 0-0.27018-0.22105-0.48632-0.48632-0.48632h-6.8821c-0.26526-0.0049122-0.48632 0.21614-0.48632 0.48632z"/>
diff --git a/data/styles/default/dark/symbols/car-repair-s.svg b/data/styles/default/dark/symbols/car-repair-s.svg
index 4db732d46..1893451b3 100644
--- a/data/styles/default/dark/symbols/car-repair-s.svg
+++ b/data/styles/default/dark/symbols/car-repair-s.svg
@@ -1,7 +1,7 @@
 <svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
  <g fill-rule="evenodd" opacity="1">
   <circle cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
-  <circle cx="8" cy="8" r="7" fill="#717065"/>
+  <circle cx="8" cy="8" r="7" fill="#51585E"/>
   <path d="m5.1625 4-0.1625 0.8h-0.075c-0.52 0-0.925 0.405-0.925 0.925v1.475 0.4 0.525c0 0.16 0.115 0.275 0.275 0.275h1.05c0.16 0 0.275-0.115 0.275-0.275v-0.525h4.8v0.525c0 0.16 0.115 0.275 0.275 0.275h1.05c0.16 0 0.275-0.115 0.275-0.275v-0.525-0.4-1.475c0-0.52-0.405-0.925-0.925-0.925h-0.075l-0.1625-0.8h-5.675zm-0.0875 1.6h0.6875c0.12 0 0.2375 0.115 0.2375 0.275v0.25c0 0.16-0.115 0.275-0.275 0.275h-0.65c-0.16 0-0.275-0.115-0.275-0.275v-0.25c0-0.16 0.115-0.275 0.275-0.275zm5.2 0h0.6875c0.12 0 0.2375 0.115 0.2375 0.275v0.25c0 0.16-0.115 0.275-0.275 0.275h-0.6875c-0.12 0-0.2375-0.115-0.2375-0.275v-0.25c0-0.16 0.115-0.275 0.275-0.275zm-6.275 3.4v1h1v1h1v-1h4.0012v1h0.99882v-1h1v-1h-8z" fill="#000" />
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/car-wash-m.svg b/data/styles/default/dark/symbols/car-wash-m.svg
index 7180f19e3..d8da69897 100644
--- a/data/styles/default/dark/symbols/car-wash-m.svg
+++ b/data/styles/default/dark/symbols/car-wash-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="car-wash-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#51585E"/>
    <path id="Shape" d="m14.944 7.501c0.53023 0 0.95825-0.42802 0.95825-0.95825 0-0.42163-0.42163-1.0477-0.7091-1.4182-0.12777-0.1661-0.37691-0.1661-0.50468 0-0.28109 0.37052-0.70272 0.99658-0.70272 1.4182 0 0.53023 0.42802 0.95825 0.95825 0.95825zm-3.1942 0c0.53023 0 0.95825-0.42802 0.95825-0.95825 0-0.42163-0.42163-1.0477-0.7091-1.4182-0.12777-0.1661-0.37691-0.1661-0.50468 0-0.28109 0.37052-0.70272 0.99658-0.70272 1.4182 0 0.53023 0.42802 0.95825 0.95825 0.95825zm-3.1942 0c0.53023 0 0.95825-0.42802 0.95825-0.95825 0-0.42163-0.42163-1.0477-0.7091-1.4182-0.12777-0.1661-0.37691-0.1661-0.50468 0-0.28109 0.37052-0.70272 0.99658-0.70272 1.4182 0 0.53023 0.42802 0.95825 0.95825 0.95825zm7.6149 1.9229c-0.12777-0.37691-0.48551-0.64522-0.90714-0.64522h-7.0272c-0.42163 0-0.77299 0.26831-0.90714 0.64522l-1.2585 3.6222c-0.044718 0.13415-0.070272 0.2747-0.070272 0.42163v4.574c0 0.53023 0.42802 0.95825 0.95825 0.95825 0.53023 0 0.95825-0.42802 0.95825-0.95825v-0.31942h7.666v0.31942c0 0.52384 0.42802 0.95825 0.95825 0.95825 0.52384 0 0.95825-0.42802 0.95825-0.95825v-4.574c0-0.14054-0.025553-0.28747-0.070272-0.42163l-1.2585-3.6222zm-7.9343 6.3819c-0.53023 0-0.95825-0.42802-0.95825-0.95825 0-0.53023 0.42802-0.95825 0.95825-0.95825 0.53023 0 0.95825 0.42802 0.95825 0.95825 0 0.53023-0.42802 0.95825-0.95825 0.95825zm7.0272 0c-0.53023 0-0.95825-0.42802-0.95825-0.95825 0-0.53023 0.42802-0.95825 0.95825-0.95825 0.53023 0 0.95825 0.42802 0.95825 0.95825 0 0.53023-0.42802 0.95825-0.95825 0.95825zm-7.9854-3.1942 0.81132-2.4403c0.089436-0.25553 0.33219-0.43441 0.60689-0.43441h6.1072c0.2747 0 0.51745 0.17887 0.60689 0.43441l0.81132 2.4403h-8.9436z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/car_sharing-m.svg b/data/styles/default/dark/symbols/car_sharing-m.svg
index ec3d81145..d85831f08 100644
--- a/data/styles/default/dark/symbols/car_sharing-m.svg
+++ b/data/styles/default/dark/symbols/car_sharing-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="car_sharing-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#51585E"/>
    <path id="Shape" d="m9.9298 8.8554c0.83557 0 1.549-0.53991 1.819-1.2855h3.323v0.64275c0 0.35351 0.28924 0.64275 0.64275 0.64275 0.35351 0 0.64275-0.28924 0.64275-0.64275v-0.64275c0.35351 0 0.64275-0.28924 0.64275-0.64275 0-0.35351-0.28924-0.64275-0.64275-0.64275h-4.6085c-0.30852-0.86771-1.2084-1.4398-2.2046-1.2469-0.75201 0.14783-1.3626 0.76487-1.5105 1.5169-0.22496 1.2212 0.70702 2.301 1.8961 2.301zm0-2.571c0.35351 0 0.64275 0.28924 0.64275 0.64275 0 0.35351-0.28924 0.64275-0.64275 0.64275-0.35351 0-0.64275-0.28924-0.64275-0.64275 0-0.35351 0.28924-0.64275 0.64275-0.64275zm5.3926 3.8565h-5.6433c-0.27638 0-0.52062 0.17997-0.61061 0.43707l-1.067 3.2202v4.0557c0 0.35351 0.28924 0.64275 0.64275 0.64275 0.35351 0 0.64275-0.28924 0.64275-0.64275v-0.64275h6.4275v0.64275c0 0.35351 0.28924 0.64275 0.64275 0.64275 0.35351 0 0.64275-0.28924 0.64275-0.64275v-4.0557l-1.067-3.2202c-0.089984-0.2571-0.33423-0.43707-0.61061-0.43707zm-4.7499 5.4633c-0.35351 0-0.64275-0.28924-0.64275-0.64275 0-0.35351 0.28924-0.64275 0.64275-0.64275 0.35351 0 0.64275 0.28924 0.64275 0.64275 0 0.35351-0.28924 0.64275-0.64275 0.64275zm3.8565 0c-0.35351 0-0.64275-0.28924-0.64275-0.64275 0-0.35351 0.28924-0.64275 0.64275-0.64275s0.64275 0.28924 0.64275 0.64275c0 0.35351-0.28924 0.64275-0.64275 0.64275zm-4.7113-2.8924 0.42421-1.2855h4.7178l0.42421 1.2855h-5.5662z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/car_shop-m.svg b/data/styles/default/dark/symbols/car_shop-m.svg
index 9eacc4455..af0e6e7e5 100644
--- a/data/styles/default/dark/symbols/car_shop-m.svg
+++ b/data/styles/default/dark/symbols/car_shop-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="car_shop-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <path id="Shape" d="m16.613 7.6733c-0.13333-0.39333-0.50667-0.67333-0.94667-0.67333h-7.3333c-0.44 0-0.80667 0.28-0.94667 0.67333l-1.3133 3.78c-0.046667 0.14-0.073333 0.28667-0.073333 0.44v4.7733c0 0.55333 0.44667 1 1 1s1-0.44667 1-1v-0.33333h8v0.33333c0 0.54667 0.44667 1 1 1 0.54667 0 1-0.44667 1-1v-4.7733c0-0.14667-0.026667-0.3-0.073333-0.44l-1.3133-3.78zm-8.28 6.66c-0.55333 0-1-0.44667-1-1 0-0.55333 0.44667-1 1-1 0.55333 0 1 0.44667 1 1 0 0.55333-0.44667 1-1 1zm7.3333 0c-0.55333 0-1-0.44667-1-1 0-0.55333 0.44667-1 1-1 0.55333 0 1 0.44667 1 1 0 0.55333-0.44667 1-1 1zm-8.3333-3.3333 0.84667-2.5467c0.093333-0.26667 0.34667-0.45333 0.63333-0.45333h6.3733c0.28667 0 0.54 0.18667 0.63333 0.45333l0.84667 2.5467h-9.3333z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/caravan-shop-m.svg b/data/styles/default/dark/symbols/caravan-shop-m.svg
index 72702ea10..e1f2c8602 100644
--- a/data/styles/default/dark/symbols/caravan-shop-m.svg
+++ b/data/styles/default/dark/symbols/caravan-shop-m.svg
@@ -2,7 +2,7 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <g opacity="1">
   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+  <circle cx="12" cy="12" r="11" fill="#6B425C"/>
   <path d="m7.1465 6.377c-1.1838 0-2.1465 0.98593-2.1465 2.1993v5.9435c0 0.95125 0.59187 1.7639 1.418 2.0703a2.5496 2.6133 0 0 1-0.04492-0.41212 2.5496 2.6133 0 0 1 2.5508-2.6134 2.5496 2.6133 0 0 1 2.5489 2.6134 2.5496 2.6133 0 0 1-0.06055 0.54298h8.586c0.28857 0 0.52344-0.24134 0.52344-0.53712s-0.23488-0.53516-0.52344-0.53516h-1.5918c0.19356-0.33038 0.30469-0.71635 0.30469-1.1289v-3.0606c0-2.8034-2.224-5.0821-4.959-5.0821h-6.6055zm0.46875 1.8535h1.8086c0.28861 0 0.52345 0.2394 0.52345 0.53517v1.8555c0 0.29578-0.23488 0.53516-0.52345 0.53516h-1.8086c-0.28857 0-0.52345-0.2394-0.52345-0.53516v-1.8555c0-0.29578 0.23488-0.53517 0.52345-0.53517zm6.6544 0.92775h0.13867c1.2481 0 2.2618 1.0411 2.2618 2.3203v4.17h-1.0449v-4.17c0-0.68852-0.54504-1.25-1.2168-1.25h-0.13867c-0.67173 0-1.2168 0.56148-1.2168 1.25v4.17h-1.0469v-4.17c0-1.2792 1.0156-2.3203 2.2637-2.3203zm-5.3458 5.463a1.5187 1.5566 0 0 0-1.5196 1.5567 1.5187 1.5566 0 0 0 1.5196 1.5567 1.5187 1.5566 0 0 0 1.5176-1.5567 1.5187 1.5566 0 0 0-1.5176-1.5567z" fill="#000"/>
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/caravan_site-m.svg b/data/styles/default/dark/symbols/caravan_site-m.svg
index 6b41cc6a6..9a335ce9c 100644
--- a/data/styles/default/dark/symbols/caravan_site-m.svg
+++ b/data/styles/default/dark/symbols/caravan_site-m.svg
@@ -2,7 +2,7 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <g opacity="1">
   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#664e42"/>
+  <circle cx="12" cy="12" r="11" fill="#614A43"/>
   <path d="m7.1465 6.377c-1.1838 0-2.1465 0.98593-2.1465 2.1993v5.9435c0 0.95125 0.59187 1.7639 1.418 2.0703a2.5496 2.6133 0 0 1-0.04492-0.41212 2.5496 2.6133 0 0 1 2.5508-2.6134 2.5496 2.6133 0 0 1 2.5489 2.6134 2.5496 2.6133 0 0 1-0.06055 0.54298h8.586c0.28857 0 0.52344-0.24134 0.52344-0.53712s-0.23488-0.53516-0.52344-0.53516h-1.5918c0.19356-0.33038 0.30469-0.71635 0.30469-1.1289v-3.0606c0-2.8034-2.224-5.0821-4.959-5.0821h-6.6055zm0.46875 1.8535h1.8086c0.28861 0 0.52345 0.2394 0.52345 0.53517v1.8555c0 0.29578-0.23488 0.53516-0.52345 0.53516h-1.8086c-0.28857 0-0.52345-0.2394-0.52345-0.53516v-1.8555c0-0.29578 0.23488-0.53517 0.52345-0.53517zm6.6544 0.92775h0.13867c1.2481 0 2.2618 1.0411 2.2618 2.3203v4.17h-1.0449v-4.17c0-0.68852-0.54504-1.25-1.2168-1.25h-0.13867c-0.67173 0-1.2168 0.56148-1.2168 1.25v4.17h-1.0469v-4.17c0-1.2792 1.0156-2.3203 2.2637-2.3203zm-5.3458 5.463a1.5187 1.5566 0 0 0-1.5196 1.5567 1.5187 1.5566 0 0 0 1.5196 1.5567 1.5187 1.5566 0 0 0 1.5176-1.5567 1.5187 1.5566 0 0 0-1.5176-1.5567z" fill="#000"/>
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/caravan_site-s.svg b/data/styles/default/dark/symbols/caravan_site-s.svg
index f361702b4..ae8dfc153 100644
--- a/data/styles/default/dark/symbols/caravan_site-s.svg
+++ b/data/styles/default/dark/symbols/caravan_site-s.svg
@@ -1,5 +1,5 @@
 <svg viewBox="0 0 16 16" width="12" height="12" version="1.1" xmlns="http://www.w3.org/2000/svg">
   <circle cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
-  <circle cx="8" cy="8" r="7" fill="#664e42"/>
+  <circle cx="8" cy="8" r="7" fill="#614A43"/>
   <path transform="scale(.667)" d="m7.1465 6.377c-1.1838 0-2.1465 0.98593-2.1465 2.1993v5.9435c0 0.95125 0.59187 1.7639 1.418 2.0703a2.5496 2.6133 0 0 1-0.04492-0.41212 2.5496 2.6133 0 0 1 2.5508-2.6134 2.5496 2.6133 0 0 1 2.5489 2.6134 2.5496 2.6133 0 0 1-0.06055 0.54298h8.586c0.28857 0 0.52344-0.24134 0.52344-0.53712s-0.23488-0.53516-0.52344-0.53516h-1.5918c0.19356-0.33038 0.30469-0.71635 0.30469-1.1289v-3.0606c0-2.8034-2.224-5.0821-4.959-5.0821h-6.6055zm0.46875 1.8535h1.8086c0.28861 0 0.52345 0.2394 0.52345 0.53517v1.8555c0 0.29578-0.23488 0.53516-0.52345 0.53516h-1.8086c-0.28857 0-0.52345-0.2394-0.52345-0.53516v-1.8555c0-0.29578 0.23488-0.53517 0.52345-0.53517zm6.6544 0.92775h0.13867c1.2481 0 2.2618 1.0411 2.2618 2.3203v4.17h-1.0449v-4.17c0-0.68852-0.54504-1.25-1.2168-1.25h-0.13867c-0.67173 0-1.2168 0.56148-1.2168 1.25v4.17h-1.0469v-4.17c0-1.2792 1.0156-2.3203 2.2637-2.3203zm-5.3458 5.463a1.5187 1.5566 0 0 0-1.5196 1.5567 1.5187 1.5566 0 0 0 1.5196 1.5567 1.5187 1.5566 0 0 0 1.5176-1.5567 1.5187 1.5566 0 0 0-1.5176-1.5567z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/carpenter-m.svg b/data/styles/default/dark/symbols/carpenter-m.svg
index fca0bc922..79498ca5c 100644
--- a/data/styles/default/dark/symbols/carpenter-m.svg
+++ b/data/styles/default/dark/symbols/carpenter-m.svg
@@ -2,7 +2,7 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <g opacity="1">
   <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+  <circle cx="12" cy="12" r="11" fill="#6B425C"/>
   <path d="m8.0041 4.7771a1.8905 1.8905 0 0 0-1.3379 0.55472l-1.95 1.95a1.8905 1.8905 0 0 0 3.381e-4 2.6737l1.8869 1.8869 2.0503-0.29964 3.4484-3.4506-2.762-2.7604a1.8905 1.8905 0 0 0-1.3359-0.55505zm0.57393 1.992 1.1497 1.1497-2.2237 2.2237-1.1497-1.1497zm4.0813 1.8978-3.4906 3.4906 2.2642 0.40984 0.62677 1.9912 1.7174-0.13698 0.62748 1.9364 1.7174-0.13698 0.76439 2.0179 1.6879-0.05738 1.7988-1.7988-7.714-7.7155z" fill="#000"/>
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/casino-m.svg b/data/styles/default/dark/symbols/casino-m.svg
index 0b91eec13..9acbf622b 100644
--- a/data/styles/default/dark/symbols/casino-m.svg
+++ b/data/styles/default/dark/symbols/casino-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="casino-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#7F5933"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6E4426"/>
    <path id="Shape" d="m16.667 6h-9.3333c-0.73333 0-1.3333 0.6-1.3333 1.3333v9.3333c0 0.73333 0.6 1.3333 1.3333 1.3333h9.3333c0.73333 0 1.3333-0.6 1.3333-1.3333v-9.3333c0-0.73333-0.6-1.3333-1.3333-1.3333zm-7.6667 10c-0.55333 0-1-0.44667-1-1s0.44667-1 1-1 1 0.44667 1 1-0.44667 1-1 1zm0-6c-0.55333 0-1-0.44667-1-1s0.44667-1 1-1 1 0.44667 1 1-0.44667 1-1 1zm3 3c-0.55333 0-1-0.44667-1-1s0.44667-1 1-1 1 0.44667 1 1-0.44667 1-1 1zm3 3c-0.55333 0-1-0.44667-1-1s0.44667-1 1-1 1 0.44667 1 1-0.44667 1-1 1zm0-6c-0.55333 0-1-0.44667-1-1s0.44667-1 1-1 1 0.44667 1 1-0.44667 1-1 1z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/caterer-m.svg b/data/styles/default/dark/symbols/caterer-m.svg
index 8af0fe676..ddfc46a75 100644
--- a/data/styles/default/dark/symbols/caterer-m.svg
+++ b/data/styles/default/dark/symbols/caterer-m.svg
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+ <circle cx="12" cy="12" r="11" fill="#6B425C"/>
  <path d="m12 6.668c-3.1385 0-5.5288 2.7084-5.9375 5.998h11.875c-0.40868-3.2897-2.799-5.998-5.9375-5.998z" fill="#000"/>
- <rect x="3.9999" y="12.666" width="16" height=".66675" fill="#8c5f93"/>
+ <rect x="3.9999" y="12.666" width="16" height=".66675" fill="#6B425C"/>
  <path d="m12 9.2229v-2.5564" stroke="#000" stroke-width="2.667" stroke-linecap="round"/>
  <path d="m5.3333 14h13.333" stroke="#000" stroke-width="1.333" stroke-linecap="round"/>
- <path d="m8.1773 11.312a4.3334 5 0 0 1 3.8226-2.645" fill="none" stroke="#8c5f93" stroke-linecap="round" stroke-width="1.333"/>
+ <path d="m8.1773 11.312a4.3334 5 0 0 1 3.8226-2.645" fill="none" stroke="#6B425C" stroke-linecap="round" stroke-width="1.333"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/charging-station-s.svg b/data/styles/default/dark/symbols/charging-station-s.svg
index 86d54db9a..d0337a288 100644
--- a/data/styles/default/dark/symbols/charging-station-s.svg
+++ b/data/styles/default/dark/symbols/charging-station-s.svg
@@ -1,7 +1,7 @@
 <svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
  <g fill-rule="evenodd" opacity="1">
   <circle cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
-  <circle cx="8" cy="8" r="7" fill="#717065"/>
+  <circle cx="8" cy="8" r="7" fill="#51585E"/>
   <path d="m4.9543 4h3.4248c0.29547 0 0.50983 0.22388 0.50983 0.50004v6.6111h0.44444v0.88889h-5.3333v-0.88889h0.44444v-6.6111c0-0.27942 0.22826-0.50004 0.50983-0.50004zm6.5584 4.0394 0.45533 2.0732c0.079682 0.33803 0.011383 0.70986-0.21628 1.0141-0.22766 0.29296-0.56916 0.4507-0.93342 0.4507-0.66022 0-1.1839-0.51831-1.1839-1.1718v-0.033803l0.18213-1.6789c0-0.22535-0.18213-0.40563-0.40979-0.40563h-0.51793v-0.48451h0.51793c0.48948 0 0.89927 0.42817 0.89927 0.91268v0.033803l-0.19351 1.6563c0.022766 0.37183 0.31873 0.66479 0.69437 0.66479 0.21628 0 0.40979-0.10141 0.54639-0.25915 0.12522-0.16901 0.15936-0.37183 0.11383-0.58592l-0.44394-2.0732c-0.045533-0.14648-0.079682-0.32676-0.079682-0.48451v-0.50704l-0.22766-0.32676c0.011383-0.84507-0.92204-1.7014-0.92204-1.7014l0.25043-0.39437c1.9124 0.72113 1.7758 2.0169 1.7758 2.0169l-0.3415 0.40563h-0.03415v0.50704c0 0.12394 0.03415 0.23662 0.068299 0.37183zm-5.1794 2.1828 1.6667-2.6843h-1.3333l0.33333-1.7602-1.6667 2.6843h1.3l-0.3 1.7602z" fill="#000"/>
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/charity_shop-m.svg b/data/styles/default/dark/symbols/charity_shop-m.svg
index 54462f6df..d3f2fa9b4 100644
--- a/data/styles/default/dark/symbols/charity_shop-m.svg
+++ b/data/styles/default/dark/symbols/charity_shop-m.svg
@@ -2,7 +2,7 @@
  <title>shop-m</title>
  <g id="charity-shop-m" opacity="1">
   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle id="Oval" cx="12" cy="12" r="11" fill="#8c5f93"/>
+  <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
   <path d="m12 17.787-3.359-3.359c-2.1213-2.1213 1.0607-5.3033 3.182-3.182l0.177 0.177 0.177-0.177c2.1213-2.1213 5.3033 1.0607 3.182 3.182zm4.6667-9.4534h-1.3333c0-1.84-1.4933-3.3333-3.3333-3.3333s-3.3333 1.4933-3.3333 3.3333h-1.3333c-0.73333 0-1.3267 0.6-1.3267 1.3333l-0.0066667 8c0 0.73333 0.6 1.3333 1.3333 1.3333h9.3333c0.73333 0 1.3333-0.6 1.3333-1.3333v-8c0-0.73333-0.6-1.3333-1.3333-1.3333zm-4.6667-2c1.1067 0 2 0.89333 2 2h-4c0-1.1067 0.89333-2 2-2z" fill="#000"/>
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/cheese-m.svg b/data/styles/default/dark/symbols/cheese-m.svg
index 50dc6b26a..02a9e5e56 100644
--- a/data/styles/default/dark/symbols/cheese-m.svg
+++ b/data/styles/default/dark/symbols/cheese-m.svg
@@ -4,7 +4,7 @@
  <g fill="none" fill-rule="evenodd">
   <g id="alcohol-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle cx="12" cy="12" r="11" fill="#6B425C"/>
    <path d="m13.053 5.1621c-1.1318-0.012343-2.2129 0.089844-2.2129 0.089844l-5.127 5.9316 12.574-3.9336s-2.124-1.5543-3.3652-1.8965c-0.49204-0.13566-1.1901-0.184-1.8691-0.19141zm1.8516 1.1484a0.51126 0.9813 71.912 0 1 0.56641 0.54883 0.51126 0.9813 71.912 0 1-1.2129 0.59766 0.51126 0.9813 71.912 0 1-0.56641-0.54883 0.51126 0.9813 71.912 0 1 1.2129-0.59766zm-3.9375 0.76953a0.51126 0.9813 71.912 0 1 0.56836 0.54883 0.51126 0.9813 71.912 0 1-1.2129 0.59766 0.51126 0.9813 71.912 0 1-0.56641-0.54688 0.51126 0.9813 71.912 0 1 1.2109-0.59961zm7.3203 0.97266-12.574 3.7832v7.3594l12.574-3.9336v-7.209zm-1.3008 1.7734a0.78667 1.2141 19.086 0 1 0.61719 0.87305 0.78667 1.2141 19.086 0 1-0.85156 1.4395 0.78667 1.2141 19.086 0 1-0.83398-0.83398 0.78667 1.2141 19.086 0 1 0.84961-1.4395 0.78667 1.2141 19.086 0 1 0.21875-0.039062zm-3.5645 0.66797a0.52909 0.76697 23.373 0 1 0.41992 0.54492 0.52909 0.76697 23.373 0 1-0.57812 0.89844 0.52909 0.76697 23.373 0 1-0.56836-0.51953 0.52909 0.76697 23.373 0 1 0.58008-0.90039 0.52909 0.76697 23.373 0 1 0.14648-0.023437zm-3.5098 1.9395a0.75222 1.3337 13.619 0 1 0.58203 0.97266 0.75222 1.3337 13.619 0 1-0.80273 1.5996 0.75222 1.3337 13.619 0 1-0.78906-0.92578 0.75222 1.3337 13.619 0 1 0.80469-1.6016 0.75222 1.3337 13.619 0 1 0.20508-0.044922zm-2.6484 0.037109a0.52909 0.76697 23.373 0 1 0.41992 0.54492 0.52909 0.76697 23.373 0 1-0.57812 0.90039 0.52909 0.76697 23.373 0 1-0.56836-0.52148 0.52909 0.76697 23.373 0 1 0.57812-0.89844 0.52909 0.76697 23.373 0 1 0.14844-0.025391zm5.6836 0.875a0.85989 1.2083 26.467 0 1 0.6875 0.85352 0.85989 1.2083 26.467 0 1-0.94727 1.4023 0.85989 1.2083 26.467 0 1-0.93164-0.8125 0.85989 1.2083 26.467 0 1 0.94922-1.4043 0.85989 1.2083 26.467 0 1 0.24219-0.039063zm2.9355 0.61328a0.52909 0.76697 23.373 0 1 0.41992 0.54688 0.52909 0.76697 23.373 0 1-0.57812 0.89844 0.52909 0.76697 23.373 0 1-0.56836-0.52148 0.52909 0.76697 23.373 0 1 0.57812-0.89844 0.52909 0.76697 23.373 0 1 0.14844-0.025391zm-8.0449 2.1914a0.52909 0.76697 23.373 0 1 0.41797 0.54492 0.52909 0.76697 23.373 0 1-0.57812 0.89844 0.52909 0.76697 23.373 0 1-0.56836-0.51953 0.52909 0.76697 23.373 0 1 0.58008-0.90039 0.52909 0.76697 23.373 0 1 0.14844-0.023437z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/chemist-m.svg b/data/styles/default/dark/symbols/chemist-m.svg
index 0cc3dc771..9d802f6bb 100644
--- a/data/styles/default/dark/symbols/chemist-m.svg
+++ b/data/styles/default/dark/symbols/chemist-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="chemist-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <path id="Path" d="m17.693 15.82-3.6933-4.4867v-4h0.66667c0.36667 0 0.66667-0.3 0.66667-0.66667 0-0.36667-0.3-0.66667-0.66667-0.66667h-5.3333c-0.36667 0-0.66667 0.3-0.66667 0.66667 0 0.36667 0.3 0.66667 0.66667 0.66667h0.66667v4l-3.6933 4.4867c-0.21333 0.26-0.30667 0.55333-0.30667 0.84667 0.0066667 0.68667 0.54667 1.3333 1.3333 1.3333h9.3333c0.79333 0 1.3333-0.64667 1.3333-1.3333 0-0.29333-0.093333-0.58667-0.30667-0.84667z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/chess-m.svg b/data/styles/default/dark/symbols/chess-m.svg
index 20f3f27b6..23ca71182 100644
--- a/data/styles/default/dark/symbols/chess-m.svg
+++ b/data/styles/default/dark/symbols/chess-m.svg
@@ -1 +1 @@
-<svg id="SVGRoot" version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><g fill="#717065"><g fill="#777777"><path d="m5.6019 10.312h-0.35156c-0.31201 0-0.5625 0.25049-0.5625 0.5625v0.5625c0 0.31201 0.25038 0.5625 0.53086 0.5625h0.5625c-0.00879 1.5163-0.19336 3.028-0.5625 4.5h4.5c-0.36914-1.4723-0.55371-2.9841-0.5625-4.5h0.53086c0.31201 0 0.5625-0.25049 0.5625-0.5625l0.06293-0.5625c0-0.31201-0.25038-0.5625-0.53086-0.5625h-0.35156l1.1911-3.1774c-0.0063-0.063985 0.0042-0.15891 0.0042-0.19406 0-0.31641-0.26016-0.56602-0.5625-0.56602h-2.0004v-1.125h0.5625c0.31092 0 0.5625-0.25158 0.5625-0.5625 0-0.31092-0.24961-0.5625-0.5625-0.5625h-0.5625l1.077e-4 -0.5625c8.2e-6 -0.31092-0.25171-0.5625-0.56249-0.5625s-0.5625 0.25158-0.5625 0.5625v0.5625h-0.56225c-0.31092 0-0.5625 0.25158-0.5625 0.5625 0 0.31092 0.25137 0.5625 0.5625 0.5625h0.5625v1.125h-1.9997c-0.29883 0-0.56461 0.23906-0.56461 0.55898 0 0.067851 0.012364 0.13588 0.037304 0.20078zm9.3477 3.2977-0.11602 2.8898h4.4578l-0.11426-2.8916 0.86133-0.72949c0.25488-0.21445 0.39902-0.52734 0.39902-0.86133v-2.0566c0-0.11953-0.09141-0.21094-0.24258-0.21094h-0.92707c-0.11865 0-0.21094 0.092285-0.21094 0.21094v0.91406h-0.87012v-0.91406c0.03235-0.11953-0.05906-0.21094-0.17859-0.21094h-1.8896c-0.11865 0-0.21094 0.092285-0.21094 0.21094v0.91406h-0.87012v-0.91406c0-0.11953-0.09141-0.21094-0.21094-0.21094h-0.92742c-0.12023 0-0.21164 0.091406-0.21164 0.21094v2.0609c0 0.32959 0.14502 0.6416 0.40008 0.85711zm1.5504 0.077344c0-0.31289 0.24961-0.5625 0.5625-0.5625 0.31289 0 0.5625 0.24961 0.5625 0.5625v1.125h-1.125zm-4.8129 5.4703-0.81211-0.40781v-0.5625c0-0.31289-0.24961-0.5625-0.5625-0.5625h-5.625c-0.31184 0-0.5625 0.24961-0.5625 0.5625v0.5625l-0.81281 0.40852c-0.19353 0.094218-0.31219 0.29109-0.31219 0.50203v0.77695c0 0.31289 0.25049 0.5625 0.5625 0.5625h7.875c0.31201 0 0.5625-0.25049 0.5625-0.5625v-0.77766c0-0.21023-0.11953-0.40711-0.31289-0.50203zm9 0-0.81211-0.40781v-0.5625c0-0.31201-0.25049-0.5625-0.5625-0.5625h-4.5c-0.31201 0-0.5625 0.25049-0.5625 0.5625v0.5625l-0.81281 0.40852c-0.19266 0.094218-0.31219 0.29109-0.31219 0.50203v0.77695c0 0.31201 0.25049 0.5625 0.5625 0.5625h6.75c0.31201 0 0.5625-0.25049 0.5625-0.5625v-0.77766c0-0.21023-0.11953-0.40711-0.31289-0.50203z" stroke-width=".035156"/></g></g></svg>
+<svg id="SVGRoot" version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><g fill="#51585E"><g fill="#777777"><path d="m5.6019 10.312h-0.35156c-0.31201 0-0.5625 0.25049-0.5625 0.5625v0.5625c0 0.31201 0.25038 0.5625 0.53086 0.5625h0.5625c-0.00879 1.5163-0.19336 3.028-0.5625 4.5h4.5c-0.36914-1.4723-0.55371-2.9841-0.5625-4.5h0.53086c0.31201 0 0.5625-0.25049 0.5625-0.5625l0.06293-0.5625c0-0.31201-0.25038-0.5625-0.53086-0.5625h-0.35156l1.1911-3.1774c-0.0063-0.063985 0.0042-0.15891 0.0042-0.19406 0-0.31641-0.26016-0.56602-0.5625-0.56602h-2.0004v-1.125h0.5625c0.31092 0 0.5625-0.25158 0.5625-0.5625 0-0.31092-0.24961-0.5625-0.5625-0.5625h-0.5625l1.077e-4 -0.5625c8.2e-6 -0.31092-0.25171-0.5625-0.56249-0.5625s-0.5625 0.25158-0.5625 0.5625v0.5625h-0.56225c-0.31092 0-0.5625 0.25158-0.5625 0.5625 0 0.31092 0.25137 0.5625 0.5625 0.5625h0.5625v1.125h-1.9997c-0.29883 0-0.56461 0.23906-0.56461 0.55898 0 0.067851 0.012364 0.13588 0.037304 0.20078zm9.3477 3.2977-0.11602 2.8898h4.4578l-0.11426-2.8916 0.86133-0.72949c0.25488-0.21445 0.39902-0.52734 0.39902-0.86133v-2.0566c0-0.11953-0.09141-0.21094-0.24258-0.21094h-0.92707c-0.11865 0-0.21094 0.092285-0.21094 0.21094v0.91406h-0.87012v-0.91406c0.03235-0.11953-0.05906-0.21094-0.17859-0.21094h-1.8896c-0.11865 0-0.21094 0.092285-0.21094 0.21094v0.91406h-0.87012v-0.91406c0-0.11953-0.09141-0.21094-0.21094-0.21094h-0.92742c-0.12023 0-0.21164 0.091406-0.21164 0.21094v2.0609c0 0.32959 0.14502 0.6416 0.40008 0.85711zm1.5504 0.077344c0-0.31289 0.24961-0.5625 0.5625-0.5625 0.31289 0 0.5625 0.24961 0.5625 0.5625v1.125h-1.125zm-4.8129 5.4703-0.81211-0.40781v-0.5625c0-0.31289-0.24961-0.5625-0.5625-0.5625h-5.625c-0.31184 0-0.5625 0.24961-0.5625 0.5625v0.5625l-0.81281 0.40852c-0.19353 0.094218-0.31219 0.29109-0.31219 0.50203v0.77695c0 0.31289 0.25049 0.5625 0.5625 0.5625h7.875c0.31201 0 0.5625-0.25049 0.5625-0.5625v-0.77766c0-0.21023-0.11953-0.40711-0.31289-0.50203zm9 0-0.81211-0.40781v-0.5625c0-0.31201-0.25049-0.5625-0.5625-0.5625h-4.5c-0.31201 0-0.5625 0.25049-0.5625 0.5625v0.5625l-0.81281 0.40852c-0.19266 0.094218-0.31219 0.29109-0.31219 0.50203v0.77695c0 0.31201 0.25049 0.5625 0.5625 0.5625h6.75c0.31201 0 0.5625-0.25049 0.5625-0.5625v-0.77766c0-0.21023-0.11953-0.40711-0.31289-0.50203z" stroke-width=".035156"/></g></g></svg>
diff --git a/data/styles/default/dark/symbols/christian-m.svg b/data/styles/default/dark/symbols/christian-m.svg
index 882bc0967..be97abc69 100644
--- a/data/styles/default/dark/symbols/christian-m.svg
+++ b/data/styles/default/dark/symbols/christian-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="christian-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#7F5933"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6E4426"/>
    <polygon id="Path" points="13.111 8.2308 17 8.2308 17 10.385 13.111 10.385 13.111 19 10.889 19 10.889 10.385 7 10.385 7 8.2308 10.889 8.2308 10.889 5 13.111 5" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/christian-s.svg b/data/styles/default/dark/symbols/christian-s.svg
index 192a17245..cb8378e01 100644
--- a/data/styles/default/dark/symbols/christian-s.svg
+++ b/data/styles/default/dark/symbols/christian-s.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="christian-s" fill-rule="nonzero">
    <circle id="Oval" cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="8" cy="8" r="7" fill="#7F5933"/>
+   <circle id="Oval" cx="8" cy="8" r="7" fill="#6E4426"/>
    <polygon id="Path" points="9.0015 5 9.0015 3 7.0015 3 7.0015 5 5 5 5 6.9302 7.0015 6.9535 7.0015 13 9.0015 13 9.0015 6.9767 11 7 11 5" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/cinema-m.svg b/data/styles/default/dark/symbols/cinema-m.svg
index 6384bed12..d9e424791 100644
--- a/data/styles/default/dark/symbols/cinema-m.svg
+++ b/data/styles/default/dark/symbols/cinema-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="cinema-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#7F5933"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6E4426"/>
    <path id="Shape" d="m16.333 6.6667v0.66667h-1.3333v-0.66667c0-0.36667-0.3-0.66667-0.66667-0.66667h-4c-0.36667 0-0.66667 0.3-0.66667 0.66667v0.66667h-1.3333v-0.66667c0-0.36667-0.3-0.66667-0.66667-0.66667-0.36667 0-0.66667 0.3-0.66667 0.66667v10.667c0 0.36667 0.3 0.66667 0.66667 0.66667 0.36667 0 0.66667-0.3 0.66667-0.66667v-0.66667h1.3333v0.66667c0 0.36667 0.3 0.66667 0.66667 0.66667h4c0.36667 0 0.66667-0.3 0.66667-0.66667v-0.66667h1.3333v0.66667c0 0.36667 0.3 0.66667 0.66667 0.66667s0.66667-0.3 0.66667-0.66667v-10.667c0-0.36667-0.3-0.66667-0.66667-0.66667s-0.66667 0.3-0.66667 0.66667zm-6.6667 8.6667h-1.3333v-1.3333h1.3333v1.3333zm0-2.6667h-1.3333v-1.3333h1.3333v1.3333zm0-2.6667h-1.3333v-1.3333h1.3333v1.3333zm6.6667 5.3333h-1.3333v-1.3333h1.3333v1.3333zm0-2.6667h-1.3333v-1.3333h1.3333v1.3333zm0-2.6667h-1.3333v-1.3333h1.3333v1.3333z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/clinic-m.svg b/data/styles/default/dark/symbols/clinic-m.svg
index a1a800f1f..ef895093b 100644
--- a/data/styles/default/dark/symbols/clinic-m.svg
+++ b/data/styles/default/dark/symbols/clinic-m.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="9" cy="9" r="9" opacity=".6"/>
- <circle cx="9" cy="9" r="8.25" fill="#c15746"/>
+ <circle cx="9" cy="9" r="8.25" fill="#983E44"/>
  <path d="m12.889 4h-7.7777c-0.6111 0-1.1055 0.49999-1.1055 1.1111l-0.00556 7.7778c0 0.6111 0.49999 1.1111 1.1111 1.1111h7.7778c0.6111 0 1.1111-0.49999 1.1111-1.1111v-7.7778c0-0.6111-0.49999-1.1111-1.1111-1.1111z"/>
- <path d="m11.916 10h-1.916v1.9166c0 0.32084-0.2625 0.58334-0.58334 0.58334h-0.83332c-0.32084 0-0.58334-0.2625-0.58334-0.58334v-1.9166h-1.9174c-0.32084 0-0.58333-0.2625-0.58333-0.58334v-0.83332c0-0.32084 0.2625-0.58334 0.58333-0.58334h1.9174v-1.9168c0-0.32084 0.2625-0.58334 0.58334-0.58334h0.83332c0.32084 0 0.58334 0.2625 0.58334 0.58334v1.9168h1.916c0.32084 0 0.58334 0.2625 0.58334 0.58334v0.83332c0 0.32084-0.2625 0.58334-0.58334 0.58334z" fill="#c15746"/>
+ <path d="m11.916 10h-1.916v1.9166c0 0.32084-0.2625 0.58334-0.58334 0.58334h-0.83332c-0.32084 0-0.58334-0.2625-0.58334-0.58334v-1.9166h-1.9174c-0.32084 0-0.58333-0.2625-0.58333-0.58334v-0.83332c0-0.32084 0.2625-0.58334 0.58333-0.58334h1.9174v-1.9168c0-0.32084 0.2625-0.58334 0.58334-0.58334h0.83332c0.32084 0 0.58334 0.2625 0.58334 0.58334v1.9168h1.916c0.32084 0 0.58334 0.2625 0.58334 0.58334v0.83332c0 0.32084-0.2625 0.58334-0.58334 0.58334z" fill="#983E44"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/clothes-m.svg b/data/styles/default/dark/symbols/clothes-m.svg
index 6e0c207fa..0c652178c 100644
--- a/data/styles/default/dark/symbols/clothes-m.svg
+++ b/data/styles/default/dark/symbols/clothes-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="clothes-m">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" fill-rule="nonzero" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93" fill-rule="nonzero"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C" fill-rule="nonzero"/>
    <path id="Path" d="m14 7 4 1.3333v3.3333h-2v5.3333c0 0.36819-0.29848 0.66667-0.66667 0.66667h-6.6667c-0.36819 0-0.66667-0.29848-0.66667-0.66667v-5.3333h-2v-3.3333l4-1.3333c0 1.1046 0.89543 2 2 2s2-0.89543 2-2" fill="#000" stroke="#000" stroke-linecap="round" stroke-linejoin="round"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/college-m.svg b/data/styles/default/dark/symbols/college-m.svg
index 6ed6d57f4..0154082bf 100644
--- a/data/styles/default/dark/symbols/college-m.svg
+++ b/data/styles/default/dark/symbols/college-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="college-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#51585E"/>
    <path id="Shape" d="m7.6688 12.682v1.6128c0 0.41899 0.22958 0.80928 0.59691 1.0102l2.8698 1.5669c0.34437 0.18941 0.75762 0.18941 1.102 0l2.8698-1.5669c0.36733-0.20088 0.59691-0.59118 0.59691-1.0102v-1.6128l-3.4667 1.8941c-0.34437 0.18941-0.75762 0.18941-1.102 0l-3.4667-1.8941zm3.4667-5.5444-4.8385 2.6402c-0.39603 0.2181-0.39603 0.79206 0 1.0102l4.8385 2.6402c0.34437 0.18941 0.75762 0.18941 1.102 0l4.6146-2.5197v3.3921c0 0.31568 0.25828 0.57396 0.57396 0.57396s0.57396-0.25828 0.57396-0.57396v-3.6791c0-0.21236-0.11479-0.40177-0.29846-0.50508l-5.4641-2.9788c-0.34437-0.18367-0.75762-0.18367-1.102 0z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/college-s.svg b/data/styles/default/dark/symbols/college-s.svg
index b9fba5010..11d0082d4 100644
--- a/data/styles/default/dark/symbols/college-s.svg
+++ b/data/styles/default/dark/symbols/college-s.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="college-s" fill-rule="nonzero">
    <circle id="Oval" cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="8" cy="8" r="7.3333" fill="#717065"/>
+   <circle id="Oval" cx="8" cy="8" r="7.3333" fill="#51585E"/>
    <path id="Shape" d="m5.1125 8.4548v1.0752c0 0.27933 0.15306 0.53952 0.39794 0.67344l1.9132 1.0446c0.22958 0.12627 0.50508 0.12627 0.73466 0l1.9132-1.0446c0.24489-0.13392 0.39794-0.39412 0.39794-0.67344v-1.0752l-2.3111 1.2627c-0.22958 0.12627-0.50508 0.12627-0.73466 0l-2.3111-1.2627zm2.3111-3.6963-3.2256 1.7601c-0.26402 0.1454-0.26402 0.52804 0 0.67344l3.2256 1.7601c0.22958 0.12627 0.50508 0.12627 0.73466 0l3.0764-1.6798v2.2614c0 0.21045 0.17219 0.38264 0.38264 0.38264s0.38264-0.17219 0.38264-0.38264v-2.4527c0-0.14158-0.076528-0.26785-0.19897-0.33672l-3.6427-1.9859c-0.22958-0.12244-0.50508-0.12244-0.73466 0z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/community-m.svg b/data/styles/default/dark/symbols/community-m.svg
index b6c6818f2..fc9faae4d 100644
--- a/data/styles/default/dark/symbols/community-m.svg
+++ b/data/styles/default/dark/symbols/community-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
   <circle cx="9" cy="9" r="9" fill="#000" opacity=".6"/>
-  <circle cx="9" cy="9" r="8.25" fill="#7f5933"/>
+  <circle cx="9" cy="9" r="8.25" fill="#6E4426"/>
   <path d="m6.525 4.05c-0.672 0-1.215 0.555-1.215 1.2375s0.543 1.2375 1.215 1.2375c0.6705 0 1.215-0.5535 1.215-1.2375s-0.5445-1.2375-1.215-1.2375zm4.95 0c-0.6705 0-1.215 0.555-1.215 1.2375s0.5445 1.2375 1.215 1.2375c0.672 0 1.215-0.5535 1.215-1.2375s-0.543-1.2375-1.215-1.2375zm-8.25 3.3v0.825h2.475v2.475l-1.65 3.3h0.825l1.65-3.3 1.65 3.3h0.825l-1.65-3.3v-2.475h3.3v2.475l-1.65 3.3h0.825l1.65-3.3 1.65 3.3h0.825l-1.65-3.3v-2.475h2.475v-0.825z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/computer-m.svg b/data/styles/default/dark/symbols/computer-m.svg
index 9a76d187b..729e70178 100644
--- a/data/styles/default/dark/symbols/computer-m.svg
+++ b/data/styles/default/dark/symbols/computer-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+ <circle cx="12" cy="12" r="11" fill="#6B425C"/>
  <path d="m16.667 15.167c0.64167 0 1.1608-0.525 1.1608-1.1667l0.0058333-5.8333c0-0.64167-0.525-1.1667-1.1667-1.1667h-9.3333c-0.64167 0-1.1667 0.525-1.1667 1.1667v5.8333c0 0.64167 0.525 1.1667 1.1667 1.1667h-1.75c-0.32083 0-0.58333 0.2625-0.58333 0.58333s0.2625 0.58333 0.58333 0.58333h12.833c0.32083 0 0.58333-0.2625 0.58333-0.58333s-0.2625-0.58333-0.58333-0.58333h-1.75zm-8.75-7h8.1667c0.32083 0 0.58333 0.2625 0.58333 0.58333v4.6667c0 0.32083-0.2625 0.58333-0.58333 0.58333h-8.1667c-0.32083 0-0.58333-0.2625-0.58333-0.58333v-4.6667c0-0.32083 0.2625-0.58333 0.58333-0.58333z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/confectionery-m.svg b/data/styles/default/dark/symbols/confectionery-m.svg
index bb671c557..30a450c8c 100644
--- a/data/styles/default/dark/symbols/confectionery-m.svg
+++ b/data/styles/default/dark/symbols/confectionery-m.svg
@@ -2,7 +2,7 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <g opacity="1">
   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+  <circle cx="12" cy="12" r="11" fill="#6B425C"/>
   <path d="m15.272 4.8672c-0.10049 0-0.19896 0.038791-0.27148 0.11133-0.53584 0.53581-0.83008 1.248-0.83008 2.0058 0 0.20881 0.02274 0.41409 0.06641 0.61328 0.33276 1.1422 1.0033 1.8734 2.1562 2.1582 0.19916 0.043669 0.40448 0.06641 0.61328 0.06641 0.75779 0 1.47-0.29619 2.0058-0.83203 0.09114-0.091141 0.13155-0.22142 0.10547-0.34766-0.02611-0.12621-0.11454-0.22981-0.23437-0.27734l-1.1719-0.46484-0.21875-1.1015c-0.03017-0.15207-0.14871-0.27062-0.30078-0.30078l-1.0996-0.21875-0.46484-1.1699c-0.0475-0.11981-0.15308-0.20826-0.27929-0.23437-0.02578-0.00537-0.05038-0.00777-0.07617-0.00777zm-3.3398 3.0429c-1.0196 0.019048-2.0344 0.4172-2.8105 1.1933-1.1241 1.1241-1.4537 2.7454-0.99027 4.1621 1.2894 0.43385 2.1113 1.3082 2.5839 2.5957 0.41892 0.13924 0.85582 0.21094 1.2929 0.21094 1.0456 0 2.0926-0.39932 2.8886-1.1953 1.1177-1.1177 1.4481-2.7259 0.9961-4.1367-1.314-0.43339-2.1481-1.3207-2.6231-2.6309-0.36882-0.11913-0.75082-0.18544-1.1348-0.19727-0.06796-0.00213-0.13515-0.00324-0.20313-0.00194zm-4.9414 6.2617c-0.75779 0-1.47 0.29424-2.0058 0.83008-0.09114 0.09114-0.1296 0.22142-0.10352 0.34766 0.02611 0.12621 0.11259 0.23176 0.23242 0.27929l1.1719 0.46484 0.21875 1.0996c0.03016 0.15207 0.14871 0.27062 0.30078 0.30078l1.1015 0.21875 0.46289 1.1719c0.0475 0.11981 0.15308 0.20826 0.27929 0.23437 0.02578 0.0054 0.05232 0.0078 0.07813 0.0078 0.10049 0 0.19701-0.04074 0.26953-0.11328 0.53584-0.53581 0.83203-1.248 0.83203-2.0058 0-0.20881-0.02274-0.41409-0.06641-0.61328-0.33276-1.1422-1.0053-1.8734-2.1582-2.1582-0.19916-0.04367-0.40448-0.06446-0.61328-0.06446z" fill="#000" />
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/convenience-m.svg b/data/styles/default/dark/symbols/convenience-m.svg
index 64667eaf4..7176e9118 100644
--- a/data/styles/default/dark/symbols/convenience-m.svg
+++ b/data/styles/default/dark/symbols/convenience-m.svg
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+ <circle cx="12" cy="12" r="11" fill="#6B425C"/>
  <path d="m6.6666 18h10.667l1.3333-7.9999h-13.333z" fill="#000" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333"/>
- <g stroke="#8c5f93" stroke-width="2" fill="none">
+ <g stroke="#6B425C" stroke-width="2" fill="none">
   <path d="m16.666 9.9999-1.3338 8.0004"/>
   <path d="m7.3333 9.9999 1.3333 7.9999"/>
   <path d="M 12,9.9999 12.00022,18"/>
diff --git a/data/styles/default/dark/symbols/copyshop-m.svg b/data/styles/default/dark/symbols/copyshop-m.svg
index 09eaf6849..36226763b 100644
--- a/data/styles/default/dark/symbols/copyshop-m.svg
+++ b/data/styles/default/dark/symbols/copyshop-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="copyshop-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <path id="Shape" d="m14.4 17.6h-7v-9.1c0-0.385-0.315-0.7-0.7-0.7s-0.7 0.315-0.7 0.7v9.1c0 0.77 0.63 1.4 1.4 1.4h7c0.385 0 0.7-0.315 0.7-0.7s-0.315-0.7-0.7-0.7zm3.5-2.8v-8.4c0-0.77-0.63-1.4-1.4-1.4h-6.3c-0.77 0-1.4 0.63-1.4 1.4v8.4c0 0.77 0.63 1.4 1.4 1.4h6.3c0.77 0 1.4-0.63 1.4-1.4zm-1.4 0h-6.3v-8.4h6.3v8.4z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/craft-m.svg b/data/styles/default/dark/symbols/craft-m.svg
index 91a7fdcf4..2b6ee4ecc 100644
--- a/data/styles/default/dark/symbols/craft-m.svg
+++ b/data/styles/default/dark/symbols/craft-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="9" cy="9" r="9" fill="#000" opacity=".6"/>
- <circle cx="9" cy="9" r="8.25" fill="#8c5f93"/>
+ <circle cx="9" cy="9" r="8.25" fill="#6B425C"/>
  <path d="m12.5 12.44c0-0.36313-0.29312-0.65625-0.65625-0.65625h-2.1875c-0.1225 0-0.21875-0.09625-0.21875-0.21875 0-0.1225 0.096248-0.21875 0.21875-0.21875h3.5c0.36313 0 0.65625-0.29312 0.65625-0.65625s-0.29312-0.65625-0.65625-0.65625h-3.5c-0.1225 0-0.21875-0.096248-0.21875-0.21875 0-0.1225 0.096248-0.21875 0.21875-0.21875h3.9375c0.36313 0 0.65625-0.29312 0.65625-0.65625s-0.29312-0.65625-0.65625-0.65625h-3.9332c-0.1225 0-0.21875-0.096247-0.21875-0.21875 0-0.1225 0.096248-0.21875 0.21875-0.21875h2.6206c0.36313 0 0.65625-0.29312 0.65625-0.65625s-0.29312-0.65625-0.65625-0.65625h-4.9918l1.0281-1.8025c0.14438-0.25375 0.105-0.56875-0.096248-0.77872-0.25375-0.2625-0.67375-0.27125-0.93188-0.013125l-3.0144 2.9662c-0.33688 0.32812-0.525 0.77438-0.525 1.2469v3.1937c0 0.9669 0.78315 1.75 1.75 1.75h6.3437c0.36313 0 0.65625-0.29312 0.65625-0.65625z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/dance-m.svg b/data/styles/default/dark/symbols/dance-m.svg
index 8f51ecb89..f0c214906 100644
--- a/data/styles/default/dark/symbols/dance-m.svg
+++ b/data/styles/default/dark/symbols/dance-m.svg
@@ -1,7 +1,7 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
     <title>dance-m</title>
     <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-    <circle cx="12" cy="12" r="11" fill="#717065"/>
+    <circle cx="12" cy="12" r="11" fill="#51585E"/>
     <g id="dance-m" fill-rule="nonzero">
       <path
 	  style="fill:#000;stroke:none;stroke-width:1.29048" id="Shape"
diff --git a/data/styles/default/dark/symbols/defibrillator-m.svg b/data/styles/default/dark/symbols/defibrillator-m.svg
index a8f545cb0..5ff7fdfa2 100644
--- a/data/styles/default/dark/symbols/defibrillator-m.svg
+++ b/data/styles/default/dark/symbols/defibrillator-m.svg
@@ -2,7 +2,7 @@
  <title>defibrillator-m</title>
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
   <g id="defibrillator-m" fill-rule="nonzero">
-   <g id="defibrillator" transform="translate(5 5)" fill="#C15746">
+   <g id="defibrillator" transform="translate(5 5)" fill="#983E44">
     <path id="Shape" d="m9.5476 0.89855c-0.93747 0-1.8267 0.3139-2.5476 0.89211-0.72089-0.57821-1.6101-0.89211-2.5476-0.89211-1.0901 0-2.1151 0.42456-2.886 1.1954-1.5913 1.5914-1.5913 4.1808 0 5.7721l5.0953 5.0952c0.093335 0.09346 0.21583 0.14019 0.33833 0.14019s0.24487-0.04673 0.33833-0.14019l5.0952-5.0952c1.5914-1.5914 1.5914-4.1808 0-5.7721-0.77086-0.77086-1.7957-1.1954-2.8859-1.1954zm2.2093 6.2907-4.7569 4.7569-4.7569-4.7569c-1.2182-1.2182-1.2182-3.2003 0-4.4185 0.59017-0.59017 1.3747-0.91516 2.2093-0.91516 0.83466 0 1.6192 0.32512 2.2093 0.91516 0.089722 0.089722 0.21147 0.14019 0.33833 0.14019s0.2486-0.050468 0.33833-0.14019c0.59017-0.59017 1.3747-0.91516 2.2093-0.91516 0.83454 0 1.6191 0.32512 2.2093 0.91516 1.2182 1.2181 1.2182 3.2003 0 4.4185z"/>
     <path id="Shape" d="m9.3128 5.6781h-0.93959l0.77958-1.601c0.072151-0.14829 0.06293-0.32337-0.024549-0.46319-0.087479-0.13982-0.24075-0.2248-0.40574-0.2248h-2.2287c-0.20511 0-0.3873 0.13059-0.45322 0.32487l-1.1685 3.4454c-0.049845 0.14667-0.025546 0.30829 0.065173 0.4339 0.089971 0.12461 0.23427 0.19838 0.38792 0.19838h0.0033646l1.1499-0.0079753-0.45384 2.2543c-0.044612 0.22156 0.071902 0.444 0.27938 0.53372 0.061434 0.026418 0.12586 0.039129 0.18954 0.039129 0.15141 0 0.29857-0.071902 0.39054-0.20175l2.819-3.9757c0.10355-0.14592 0.11701-0.33745 0.034767-0.49646-0.08212-0.15888-0.24611-0.25882-0.42506-0.25882zm-1.9048 2.3377 0.12486-0.6202c0.028412-0.14119-0.0083491-0.28773-0.09994-0.39889-0.090968-0.11028-0.22642-0.17409-0.36923-0.17409h-0.00324l-1.0661 0.0073522 0.84239-2.4838h1.1206l-0.77958 1.601c-0.072151 0.14829-0.06293 0.32337 0.024549 0.46319 0.087479 0.13982 0.24075 0.2248 0.40574 0.2248h0.77883l-0.97896 1.3806z"/>
    </g>
diff --git a/data/styles/default/dark/symbols/dentist-m.svg b/data/styles/default/dark/symbols/dentist-m.svg
index 9894d13cf..25a9aff5f 100644
--- a/data/styles/default/dark/symbols/dentist-m.svg
+++ b/data/styles/default/dark/symbols/dentist-m.svg
@@ -2,7 +2,7 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <g opacity="1">
   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#c15746"/>
+  <circle cx="12" cy="12" r="11" fill="#983E44"/>
   <path id="Shape" d="m8.5 6.4c1.4 0 2.1 0.7 3.5 0.7s2.1-0.7 3.5-0.7c1.1667 0 2.1 1.4 2.1 2.8 0 1.2266-0.60221 2.8772-1.2688 3.5438-0.59857 0.59857-1.4885 4.8125-1.8812 4.8125-0.14917 0-0.34048-0.74046-0.35-1.6407-0.01512-1.429-0.40131-3.2156-2.1-3.2156-1.6987 0-2.0849 1.7865-2.1 3.2156-0.00951 0.9002-0.20082 1.6407-0.35 1.6407-0.39276 0-1.2827-4.214-1.8812-4.8125-0.66653-0.66654-1.2688-2.3171-1.2688-3.5438 0-1.4 0.93333-2.8 2.1-2.8z" fill="#000"/>
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/department_store-m.svg b/data/styles/default/dark/symbols/department_store-m.svg
index 43250d8a9..cbfafa4e1 100644
--- a/data/styles/default/dark/symbols/department_store-m.svg
+++ b/data/styles/default/dark/symbols/department_store-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="department_store-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <path id="Shape" d="m10.636 6.3197 0.37636-0.3864h1.9745l0.37636 0.3864v1.4803h0.90909v-2.2531l-0.53273-0.54693h-3.48l-0.53273 0.54693v2.2531h0.90909v-1.4803zm3.6364 3.3469v3.1864l-0.53273 0.54693h-3.48l-0.53273-0.54693v-3.1864h-2.7273v7.4667c0 1.0304 0.81455 1.8667 1.8182 1.8667h6.3636c1.0036 0 1.8182-0.83627 1.8182-1.8667v-7.4667h-2.7273zm-3.6364 2.4136 0.37636 0.3864h1.9745l0.37636-0.3864v-2.4136h-2.7273v2.4136z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/doityourself-m.svg b/data/styles/default/dark/symbols/doityourself-m.svg
index 7b616ebae..c68c9a167 100644
--- a/data/styles/default/dark/symbols/doityourself-m.svg
+++ b/data/styles/default/dark/symbols/doityourself-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="doityourself-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <g id="Group" transform="translate(6 5)" fill="#000">
     <path id="Path" d="m10.57 0.31889-2.0144 2.0144v-0.77778c0-0.85556-0.7-1.5556-1.5556-1.5556h-3.1111c-2.1467 0-3.8889 1.7422-3.8889 3.8889h3.8889v2.3333h4.6667v-2.3333l2.0144 2.0144c0.20222 0.20222 0.48222 0.31889 0.77778 0.31889h0.0077778c0.59889 0 1.0889-0.49 1.0889-1.0967v-4.0289c0-0.60667-0.49-1.0967-1.0967-1.0967h-0.0077778c-0.28778 0-0.56778 0.11667-0.77 0.31889z"/>
     <path id="Path" d="m3.8889 7.7778v5.4444c0 0.42778 0.35 0.77778 0.77778 0.77778h3.1111c0.42778 0 0.77778-0.35 0.77778-0.77778v-5.4444h-4.6667z"/>
diff --git a/data/styles/default/dark/symbols/driving_school-m.svg b/data/styles/default/dark/symbols/driving_school-m.svg
index 6b0897cb8..d26ab956a 100644
--- a/data/styles/default/dark/symbols/driving_school-m.svg
+++ b/data/styles/default/dark/symbols/driving_school-m.svg
@@ -1,8 +1,8 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <g opacity="1">
   <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#717065"/>
+  <circle cx="12" cy="12" r="11" fill="#51585E"/>
   <path d="m17.158 6.5565c-0.14906-0.43974-0.56644-0.75278-1.0584-0.75278h-8.1985c-0.49191 0-0.90184 0.31304-1.0584 0.75278l-1.4683 4.226c-0.052172 0.15652-0.081986 0.32049-0.081986 0.49191v5.3365c0 0.61862 0.49937 1.118 1.118 1.118 0.61862 0 1.118-0.49936 1.118-1.118v-0.37266h8.9439v0.37266c0 0.61116 0.49936 1.118 1.118 1.118 0.61117 0 1.118-0.49936 1.118-1.118v-5.3365c0-0.16397-0.02981-0.3354-0.08198-0.49191z" fill="#000"/>
-  <path d="m10.269 7.8739h1.284v5.0402h3.0433v1.1048h-4.3273z" fill="#717065" stroke="#717065" stroke-width=".5"/>
+  <path d="m10.269 7.8739h1.284v5.0402h3.0433v1.1048h-4.3273z" fill="#51585E" stroke="#51585E" stroke-width=".5"/>
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/dry_cleaning-m.svg b/data/styles/default/dark/symbols/dry_cleaning-m.svg
index 95388cd7c..1fd56b4cc 100644
--- a/data/styles/default/dark/symbols/dry_cleaning-m.svg
+++ b/data/styles/default/dark/symbols/dry_cleaning-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="9" cy="9" r="9" fill="#000" opacity=".6"/>
- <circle cx="9" cy="9" r="8.25" fill="#717065"/>
+ <circle cx="9" cy="9" r="8.25" fill="#51585E"/>
  <path d="m7.5 4.9758c0-1.875 2.25-1.2638 2.25-0.37502 0 0.88875-0.75 2.0104-0.75 2.8992l-5.5 4h11l-5.5-4" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/electrician-m.svg b/data/styles/default/dark/symbols/electrician-m.svg
index 7dc5249d4..17346b564 100644
--- a/data/styles/default/dark/symbols/electrician-m.svg
+++ b/data/styles/default/dark/symbols/electrician-m.svg
@@ -2,7 +2,7 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <g opacity="1">
   <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+  <circle cx="12" cy="12" r="11" fill="#6B425C"/>
   <path d="m16.694 14.397v-1.1984h1.8975q0.25966 0 0.42943 0.16978 0.16978 0.16978 0.16978 0.42943 0 0.23968-0.16978 0.41945-0.16978 0.17976-0.42943 0.17976zm0 3.1958v-1.1984h1.8975q0.25966 0 0.42943 0.16978 0.16978 0.16978 0.16978 0.42943 0 0.23968-0.16978 0.41945-0.16978 0.17976-0.42943 0.17976zm-3.0959 0.79894q-0.57924 0-0.9887-0.46938-0.40946-0.46938-0.40946-1.1285h-1.8975v-2.7963h1.8975q0-0.65913 0.40946-1.1285 0.40946-0.46938 0.9887-0.46938h2.4967v5.9921zm-5.6925-2.3968q-1.3382 0-2.2171-0.86885-0.87884-0.86885-0.87884-2.2271t0.87884-2.2271q0.87884-0.86885 2.2171-0.86885h1.2983q0.65913 0 1.0786-0.41945 0.41945-0.41945 0.41945-1.0786 0-0.65913-0.41945-1.0786-0.41945-0.41945-1.0786-0.41945h-2.996q-0.23968 0-0.41945-0.17976-0.17976-0.17976-0.17976-0.41945 0-0.25966 0.17976-0.42943 0.17976-0.16978 0.41945-0.16978h2.996q1.1585 0 1.9275 0.76899t0.76898 1.9275q0 1.1585-0.76898 1.9275-0.76898 0.76898-1.9275 0.76898h-1.2983q-0.83889 0-1.3682 0.51932-0.5293 0.51931-0.5293 1.3782 0 0.85887 0.5293 1.3782 0.5293 0.51931 1.3682 0.51931h1.7976v1.1984z" fill="#000"/>
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/electronics-m.svg b/data/styles/default/dark/symbols/electronics-m.svg
index 4f3dc8949..feb4fd363 100644
--- a/data/styles/default/dark/symbols/electronics-m.svg
+++ b/data/styles/default/dark/symbols/electronics-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="electronics-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <path id="Path" d="m11.346 5.0124c-3.0419 0.19728-5.3456 2.8637-5.3456 5.912v4.2574c0 1.0564 0.85275 1.9091 1.9091 1.9091h0.63638c0.70002 0 1.2728-0.57274 1.2728-1.2728v-2.5455c0-0.70002-0.57274-1.2728-1.2728-1.2728h-1.2728v-1.0882c0-2.4437 1.8837-4.5692 4.321-4.6392 2.5264-0.070002 4.5883 1.9473 4.5883 4.4546v1.2728h-1.2728c-0.70002 0-1.2728 0.57274-1.2728 1.2728v2.5455c0 0.70002 0.57274 1.2728 1.2728 1.2728h1.2728v0.63638h-3.8183c-0.35001 0-0.63638 0.28637-0.63638 0.63638 0 0.35001 0.28637 0.63638 0.63638 0.63638h3.1819c1.0564 0 1.9091-0.85275 1.9091-1.9091v-6.3638c0-3.2901-2.7746-5.931-6.1092-5.7147z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/embassy-m.svg b/data/styles/default/dark/symbols/embassy-m.svg
index 99e68d80d..0ab0a73c5 100644
--- a/data/styles/default/dark/symbols/embassy-m.svg
+++ b/data/styles/default/dark/symbols/embassy-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="embassy-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#51585E"/>
    <g id="embassy" transform="translate(5 5)" fill="#000">
     <path id="Shape" d="m13.417 7.5833h-1.1667v-1.4583c0-0.322-0.26133-0.58333-0.58333-0.58333h-9.3333c-0.322 0-0.58333 0.26133-0.58333 0.58333v1.4583h-1.1667c-0.322 0-0.58333 0.26133-0.58333 0.58333v5.25c0 0.322 0.26133 0.58333 0.58333 0.58333h12.833c0.322 0 0.58333-0.26133 0.58333-0.58333v-5.25c0-0.322-0.26133-0.58333-0.58333-0.58333zm-10.5-0.875h8.1667v0.875h-8.1667v-0.875zm9.9167 6.125h-11.667v-4.0833h11.667v4.0833z"/>
     <path id="Path" d="m3.5 9.625c-0.322 0-0.58333 0.26133-0.58333 0.58333v1.1667c0 0.322 0.26133 0.58333 0.58333 0.58333s0.58333-0.26133 0.58333-0.58333v-1.1667c0-0.322-0.26133-0.58333-0.58333-0.58333z"/>
diff --git a/data/styles/default/dark/symbols/emergency-phone-m.svg b/data/styles/default/dark/symbols/emergency-phone-m.svg
index a8fb64dae..664d8673f 100644
--- a/data/styles/default/dark/symbols/emergency-phone-m.svg
+++ b/data/styles/default/dark/symbols/emergency-phone-m.svg
@@ -1,4 +1,4 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <title>emergency-phone-m</title>
-   <path d="m18.23 14.629c-0.95667 0-1.8822-0.15556-2.7456-0.43556-0.27222-0.093333-0.57556-0.023333-0.78556 0.18667l-1.2211 1.5322c-2.2011-1.05-4.2622-3.0333-5.3589-5.3122l1.5167-1.2911c0.21-0.21778 0.27222-0.52111 0.18667-0.79333-0.28778-0.86333-0.43556-1.7889-0.43556-2.7456 0-0.42-0.35-0.77-0.77-0.77h-2.6911c-0.42 0-0.92556 0.18667-0.92556 0.77 0 7.2256 6.0122 13.23 13.23 13.23 0.55222 0 0.77-0.49 0.77-0.91778v-2.6833c0-0.42-0.35-0.77-0.77-0.77z" opacity=".6" fill="#C15746"/>
+   <path d="m18.23 14.629c-0.95667 0-1.8822-0.15556-2.7456-0.43556-0.27222-0.093333-0.57556-0.023333-0.78556 0.18667l-1.2211 1.5322c-2.2011-1.05-4.2622-3.0333-5.3589-5.3122l1.5167-1.2911c0.21-0.21778 0.27222-0.52111 0.18667-0.79333-0.28778-0.86333-0.43556-1.7889-0.43556-2.7456 0-0.42-0.35-0.77-0.77-0.77h-2.6911c-0.42 0-0.92556 0.18667-0.92556 0.77 0 7.2256 6.0122 13.23 13.23 13.23 0.55222 0 0.77-0.49 0.77-0.91778v-2.6833c0-0.42-0.35-0.77-0.77-0.77z" opacity=".6" fill="#983E44"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/entrance-emergency-s.svg b/data/styles/default/dark/symbols/entrance-emergency-s.svg
index bea61139a..72029679b 100644
--- a/data/styles/default/dark/symbols/entrance-emergency-s.svg
+++ b/data/styles/default/dark/symbols/entrance-emergency-s.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="11" height="9" version="1.1" viewBox="0 0 11 9" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
- <path d="m0.5 0.5v8h10v-8z" fill="none" stroke="#c15746" opacity=".6" stroke-width=".75"/>
- <path d="m5.5 0.5v8" fill="none" stroke="#c15746" opacity=".6" stroke-width=".75"/>
- <path d="m7.5834 5.3334h-1.25v1.25c0 0.22916-0.18749 0.41667-0.41667 0.41667h-0.83337c-0.22916 0-0.41667-0.18749-0.41667-0.41667v-1.25h-1.25c-0.22916 0-0.41667-0.18749-0.41667-0.41667v-0.83337c0-0.22917 0.18749-0.41667 0.41667-0.41667h1.25v-1.25c0-0.22916 0.18749-0.41667 0.41667-0.41667h0.83337c0.22917 0 0.41667 0.18749 0.41667 0.41667v1.25h1.25c0.22916 0 0.41667 0.1875 0.41667 0.41667v0.83337c0 0.22916-0.18749 0.41667-0.41667 0.41667z" fill="#c15746" opacity=".6"/>
+ <path d="m0.5 0.5v8h10v-8z" fill="none" stroke="#983E44" opacity=".6" stroke-width=".75"/>
+ <path d="m5.5 0.5v8" fill="none" stroke="#983E44" opacity=".6" stroke-width=".75"/>
+ <path d="m7.5834 5.3334h-1.25v1.25c0 0.22916-0.18749 0.41667-0.41667 0.41667h-0.83337c-0.22916 0-0.41667-0.18749-0.41667-0.41667v-1.25h-1.25c-0.22916 0-0.41667-0.18749-0.41667-0.41667v-0.83337c0-0.22917 0.18749-0.41667 0.41667-0.41667h1.25v-1.25c0-0.22916 0.18749-0.41667 0.41667-0.41667h0.83337c0.22917 0 0.41667 0.18749 0.41667 0.41667v1.25h1.25c0.22916 0 0.41667 0.1875 0.41667 0.41667v0.83337c0 0.22916-0.18749 0.41667-0.41667 0.41667z" fill="#983E44" opacity=".6"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/erotic-m.svg b/data/styles/default/dark/symbols/erotic-m.svg
index 5d645ff1f..447ec9e90 100644
--- a/data/styles/default/dark/symbols/erotic-m.svg
+++ b/data/styles/default/dark/symbols/erotic-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="erotic-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <path id="Shape" d="m12.6 6v1.8h2.4l-2.4938 2.4938c-0.66327-0.43835-1.4517-0.69375-2.3062-0.69375-2.3196 0-4.2 1.8804-4.2 4.2s1.8804 4.2 4.2 4.2 4.2-1.8804 4.2-4.2c0-0.85454-0.2554-1.643-0.69375-2.3062l2.4938-2.4938v2.4h1.8v-3.6-1.8h-1.8-3.6zm-2.4 5.4c1.3254 0 2.4 1.0746 2.4 2.4s-1.0746 2.4-2.4 2.4-2.4-1.0746-2.4-2.4 1.0746-2.4 2.4-2.4z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/escape_game.svg b/data/styles/default/dark/symbols/escape_game.svg
index 8236751e4..ea897ec9b 100644
--- a/data/styles/default/dark/symbols/escape_game.svg
+++ b/data/styles/default/dark/symbols/escape_game.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18"><circle cx="9" cy="9" r="9" opacity=".6"/><circle cx="9" cy="9" r="8.25" fill="#7f5933"/><path fill="#fff" fill-rule="evenodd" d="M5.194 4.525h1.35v5.4h-1.35z" style="fill:#000;fill-opacity:1;stroke-width:.9"/><path fill="#fff" fill-rule="evenodd" d="M5.194 5.2h2.7v1.35h-2.7z" style="fill:#000;fill-opacity:1;stroke-width:.9"/><circle cx="5.869" cy="11.613" r="1.688" fill="none" stroke="#000" stroke-width="1.35" style="stroke:#000;stroke-opacity:1"/><path fill="#fff" fill-rule="evenodd" d="M12.506 11.275h-1.575l-.006-.407q0-.754.25-1.24c.166-.324.458-.735.957-1.141q.748-.608.894-.796.225-.297.225-.657 0-.497-.402-.85-.396-.359-1.07-.359-.65 0-1.087.371c-.292.247-.446.624-.555 1.13l-1.568-.194q.067-1.088.923-1.847c.576-.507 1.283-.76 2.214-.76.981 0 1.715.257 2.293.772q.87.765.87 1.787 0 .564-.322 1.069a5.7 5.7 0 0 1-1.251 1.42q-.54.45-.675.724-.126.272-.115.978m-1.687 2.25v-1.8h1.8v1.8z" style="fill:#000;fill-opacity:1;stroke-width:.9"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18"><circle cx="9" cy="9" r="9" opacity=".6"/><circle cx="9" cy="9" r="8.25" fill="#6E4426"/><path fill="#fff" fill-rule="evenodd" d="M5.194 4.525h1.35v5.4h-1.35z" style="fill:#000;fill-opacity:1;stroke-width:.9"/><path fill="#fff" fill-rule="evenodd" d="M5.194 5.2h2.7v1.35h-2.7z" style="fill:#000;fill-opacity:1;stroke-width:.9"/><circle cx="5.869" cy="11.613" r="1.688" fill="none" stroke="#000" stroke-width="1.35" style="stroke:#000;stroke-opacity:1"/><path fill="#fff" fill-rule="evenodd" d="M12.506 11.275h-1.575l-.006-.407q0-.754.25-1.24c.166-.324.458-.735.957-1.141q.748-.608.894-.796.225-.297.225-.657 0-.497-.402-.85-.396-.359-1.07-.359-.65 0-1.087.371c-.292.247-.446.624-.555 1.13l-1.568-.194q.067-1.088.923-1.847c.576-.507 1.283-.76 2.214-.76.981 0 1.715.257 2.293.772q.87.765.87 1.787 0 .564-.322 1.069a5.7 5.7 0 0 1-1.251 1.42q-.54.45-.675.724-.126.272-.115.978m-1.687 2.25v-1.8h1.8v1.8z" style="fill:#000;fill-opacity:1;stroke-width:.9"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/factory-m.svg b/data/styles/default/dark/symbols/factory-m.svg
index 625259fb5..12153e7fa 100644
--- a/data/styles/default/dark/symbols/factory-m.svg
+++ b/data/styles/default/dark/symbols/factory-m.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
   <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#717065"/>
+  <circle cx="12" cy="12" r="11" fill="#51585E"/>
   <path d="m5.3333 18.667v-8l5.3333 3.9996v-4l4.6666 4.0003 0.66666-7.3333h2l0.6668 11.333h-13.333" fill="#000"/>
   <path d="m17 5.9999c-0.12806-1.2135-1.9115-2.6077-4.3303-0.94099-0.91058 0.50118-2.7961 1.205-4.1425-0.55673" fill="none" stroke="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/fastfood-m.svg b/data/styles/default/dark/symbols/fastfood-m.svg
index 1449cccd0..841226c9b 100644
--- a/data/styles/default/dark/symbols/fastfood-m.svg
+++ b/data/styles/default/dark/symbols/fastfood-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="fastfood-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000"  opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#BB9342"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C491C"/>
    <g id="Group" transform="translate(5 6)" fill="#000">
     <path id="Path" d="m0.959 7.896c0.553-0.203 0.819-0.546 1.393-0.546 0.833 0 0.994 0.7 2.331 0.7 1.365 0 1.463-0.7 2.331-0.7 0.833 0 0.994 0.7 2.331 0.7 1.365 0 1.463-0.7 2.331-0.7 0.567 0 0.819 0.322 1.351 0.532 0.469 0.182 0.973-0.175 0.973-0.672 0-0.301-0.196-0.567-0.483-0.672-0.679-0.245-0.854-0.581-1.855-0.581-1.365 0-1.463 0.7-2.331 0.7-0.833 0-0.994-0.7-2.331-0.7-1.365 0-1.463 0.7-2.331 0.7-0.833 0-0.994-0.7-2.331-0.7-1.085 0-1.372 0.441-1.876 0.623-0.273 0.098-0.455 0.364-0.455 0.658 0 0.483 0.49 0.826 0.952 0.658z"/>
     <path id="Path" d="m0 11.2c0 0.77 0.63 1.4 1.4 1.4h11.2c0.77 0 1.4-0.63 1.4-1.4v-0.7c0-0.77-0.63-1.4-1.4-1.4h-11.2c-0.77 0-1.4 0.63-1.4 1.4v0.7z"/>
diff --git a/data/styles/default/dark/symbols/fire_station-m.svg b/data/styles/default/dark/symbols/fire_station-m.svg
index b67f6432b..98a519739 100644
--- a/data/styles/default/dark/symbols/fire_station-m.svg
+++ b/data/styles/default/dark/symbols/fire_station-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="fire_station-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#51585E"/>
    <g id="Group" transform="translate(7 5)" fill="#000">
     <path id="Shape" d="m10.32 7.5667c-1.0467-2.72-4.7733-2.8667-3.8733-6.82 0.066667-0.29333-0.24667-0.52-0.5-0.36667-2.42 1.4267-4.16 4.2867-2.7 8.0333 0.12 0.30667-0.24 0.59333-0.5 0.39333-1.2067-0.91333-1.3333-2.2267-1.2267-3.1667 0.04-0.34667-0.41333-0.51333-0.60667-0.22667-0.45333 0.69333-0.91333 1.8133-0.91333 3.5 0.25333 3.7333 3.4067 4.88 4.54 5.0267 1.62 0.20667 3.3733-0.093333 4.6333-1.2467 1.3867-1.2867 1.8933-3.34 1.1467-5.1267zm-6.1867 3.3533c0.96-0.23333 1.4533-0.92667 1.5867-1.54 0.22-0.95333-0.64-1.8867-0.06-3.3933 0.22 1.2467 2.18 2.0267 2.18 3.3867 0.053333 1.6867-1.7733 3.1333-3.7067 1.5467z"/>
     <path id="Shape" d="m10.32 7.5667c-1.0467-2.72-4.7733-2.8667-3.8733-6.82 0.066667-0.29333-0.24667-0.52-0.5-0.36667-2.42 1.4267-4.16 4.2867-2.7 8.0333 0.12 0.30667-0.24 0.59333-0.5 0.39333-1.2067-0.91333-1.3333-2.2267-1.2267-3.1667 0.04-0.34667-0.41333-0.51333-0.60667-0.22667-0.45333 0.69333-0.91333 1.8133-0.91333 3.5 0.25333 3.7333 3.4067 4.88 4.54 5.0267 1.62 0.20667 3.3733-0.093333 4.6333-1.2467 1.3867-1.2867 1.8933-3.34 1.1467-5.1267zm-6.1867 3.3533c0.96-0.23333 1.4533-0.92667 1.5867-1.54 0.22-0.95333-0.64-1.8867-0.06-3.3933 0.22 1.2467 2.18 2.0267 2.18 3.3867 0.053333 1.6867-1.7733 3.1333-3.7067 1.5467z"/>
diff --git a/data/styles/default/dark/symbols/firehydrant-m.svg b/data/styles/default/dark/symbols/firehydrant-m.svg
index f504ca31a..8cab1d4b5 100644
--- a/data/styles/default/dark/symbols/firehydrant-m.svg
+++ b/data/styles/default/dark/symbols/firehydrant-m.svg
@@ -2,7 +2,7 @@
  <title>firehydrant-m</title>
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
   <g id="firehydrant-m" fill-rule="nonzero">
-   <g id="fire-hydrant" transform="translate(6 5)" fill="#C15746">
+   <g id="fire-hydrant" transform="translate(6 5)" fill="#983E44">
     <path id="Shape" d="m5.7422 5.8857c-1.2062 0-2.1875 0.98131-2.1875 2.1875s0.98131 2.1875 2.1875 2.1875 2.1875-0.98131 2.1875-2.1875-0.98131-2.1875-2.1875-2.1875zm0 3.5547c-0.75387 0-1.3672-0.61332-1.3672-1.3672 0-0.75387 0.61332-1.3672 1.3672-1.3672s1.3672 0.61332 1.3672 1.3672c0 0.75387-0.61332 1.3672-1.3672 1.3672z"/>
     <polygon id="Path" points="5.332 7.6631 6.1523 7.6631 6.1523 8.4834 5.332 8.4834"/>
     <path id="Shape" d="m11.484 7.6631h-0.51953v-1.333h-1.7773v-1.5859h0.65458v-0.82031h-0.68764c-0.17522-1.0818-1.0316-1.9382-2.1134-2.1134v-0.51157c0-0.71616-0.58267-1.2988-1.2988-1.2988s-1.2988 0.58267-1.2988 1.2988v0.51157c-1.0818 0.17522-1.9382 1.0316-2.1134 2.1134h-0.68764v0.82031h0.65458v1.5859h-1.7773v1.333h-0.51953v0.82031h0.51953v1.333h1.7773v1.5859c-0.71616 0-1.2988 0.58267-1.2988 1.2988v1.2988h9.4883v-1.2988c0-0.71616-0.58267-1.2988-1.2988-1.2988v-1.5859h1.7773v-1.333h0.51953v-0.82031zm-6.2207-6.3643c0-0.26384 0.21468-0.47852 0.47852-0.47852s0.47852 0.21468 0.47852 0.47852v0.47852h-0.95703v-0.47852zm-0.41016 1.2988h1.7773c0.81613 0 1.5021 0.56612 1.6869 1.3262h-5.1512c0.18482-0.76005 0.87082-1.3262 1.6869-1.3262zm-3.5137 6.3984v-1.8457h0.95703v1.8457h-0.95703zm8.3262 3.7051v0.47852h-7.8477v-0.47852c0-0.26384 0.21468-0.47852 0.47852-0.47852h6.8906c0.26384 0 0.47852 0.21468 0.47852 0.47852zm-1.2988-1.2988h-5.25v-6.6582h5.25v6.6582zm1.7773-2.4063h-0.95703v-1.8457h0.95703v1.8457z"/>
diff --git a/data/styles/default/dark/symbols/fitness_centre-m.svg b/data/styles/default/dark/symbols/fitness_centre-m.svg
index 5600201e9..c9d949dbc 100644
--- a/data/styles/default/dark/symbols/fitness_centre-m.svg
+++ b/data/styles/default/dark/symbols/fitness_centre-m.svg
@@ -2,6 +2,6 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
 	<title>fitness_centre-m</title>
 	<circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-	<circle cx="12" cy="12" r="11" fill="#717065"/>
+	<circle cx="12" cy="12" r="11" fill="#51585E"/>
 	<path id="Path" d="m17.964 13.99 0.50109-0.50109c0.27142-0.27142 0.27142-0.70987 0-0.98133l-0.01392-0.01392c-0.27142-0.27142-0.70987-0.27142-0.98133 0l-1.9904 1.9904-5.9643-5.9643 1.9904-1.9904c0.27142-0.27142 0.27142-0.70987 0-0.98133l-0.01391-0.013919c-0.27142-0.27142-0.70987-0.27142-0.98133 0l-0.5011 0.50109-0.50109-0.50109c-0.27142-0.27142-0.71683-0.27142-0.98822 0l-0.99521 0.99521-0.50109-0.50109c-0.27142-0.27142-0.72379-0.27142-0.99521 0s-0.27142 0.72379 0 0.99521l0.50109 0.50109-0.99521 0.99521c-0.27142 0.27142-0.27142 0.70987 0 0.98133l0.50109 0.50109-0.50109 0.50804c-0.27142 0.27142-0.27142 0.70987 0 0.98133l0.013919 0.01391c0.27142 0.27142 0.70987 0.27142 0.98133 0l1.9904-1.9904 5.9643 5.9643-1.9904 1.9904c-0.27142 0.27142-0.27142 0.70987 0 0.98133l0.01391 0.01392c0.27142 0.27142 0.70987 0.27142 0.98133 0l0.50109-0.50109 0.50108 0.50109c0.27142 0.27142 0.70988 0.27142 0.98133 0l0.99521-0.99521 0.50109 0.50109c0.27142 0.27142 0.72379 0.27142 0.99521 0s0.27142-0.72379 0-0.99521l-0.50109-0.50109 1.0022-0.99521c0.27142-0.27142 0.27142-0.70987 0-0.98133z" fill="#000" stroke-width="1.2664"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/florist-m.svg b/data/styles/default/dark/symbols/florist-m.svg
index 8f7b8b6cd..d4fbf3559 100644
--- a/data/styles/default/dark/symbols/florist-m.svg
+++ b/data/styles/default/dark/symbols/florist-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="florist-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <path id="Shape" d="m13.54 15.446c-0.91906 0.94448-1.2536 2.2585-1.0072 3.4737 1.1827 0.25292 2.4636-0.091461 3.3835-1.0341 0.91815-0.94354 1.2518-2.2576 1.0054-3.4727-1.1818-0.25198-2.4626 0.091461-3.3817 1.0331zm-6.4616-1.0331c-0.24636 1.2151 0.089088 2.5292 1.0063 3.4727 0.91906 0.94354 2.2008 1.287 3.3826 1.0341 0.24636-1.2151-0.089088-2.5292-1.0063-3.4737-0.91906-0.94168-2.2008-1.2851-3.3826-1.0331zm6.0144-1.1255c0-0.23052-0.033635-0.45077-0.084543-0.66636 0.11272 0.18572 0.2409 0.36678 0.39817 0.52823 0.43908 0.45077 0.98633 0.72142 1.5545 0.81568 0.43453 0.069996 0.84906-0.35465 0.77816-0.79982-0.090906-0.58423-0.35544-1.1451-0.79361-1.594-0.15909-0.16426-0.33544-0.29492-0.51726-0.41064 0.20818 0.049464 0.42271 0.084928 0.64543 0.084928 0.61998 0 1.1927-0.20532 1.659-0.55063 0.35635-0.26598 0.35635-0.86795 0-1.1311-0.46635-0.34811-1.04-0.55157-1.6599-0.55157-0.22454 0-0.43908 0.034531-0.64816 0.084928 0.17999-0.11573 0.35726-0.24639 0.51362-0.40784 0.43908-0.45077 0.7027-1.0117 0.79452-1.595 0.067271-0.44704-0.34544-0.87168-0.77998-0.79982-0.56816 0.093328-1.1145 0.36584-1.5536 0.81568-0.15909 0.16332-0.28635 0.34438-0.39999 0.53197 0.049998-0.21372 0.084543-0.43397 0.084543-0.66356 0-0.63836-0.2009-1.2245-0.53907-1.7032-0.25636-0.36678-0.8427-0.36678-1.1 0-0.33817 0.47877-0.53726 1.0658-0.53726 1.7032 0 0.22959 0.034544 0.45077 0.083634 0.66729-0.11272-0.18666-0.23999-0.36678-0.39726-0.5273-0.43908-0.45077-0.98542-0.72142-1.5536-0.81568-0.43544-0.071862-0.84906 0.35371-0.77998 0.79702 0.091815 0.58516 0.35453 1.1461 0.79543 1.5959 0.15818 0.16332 0.33453 0.29585 0.51817 0.41158-0.20908-0.050397-0.42362-0.084928-0.64634-0.084928-0.6218 0-1.1927 0.20532-1.6599 0.55063-0.35635 0.26412-0.35635 0.86608 0 1.1302 0.46726 0.34811 1.0391 0.5525 1.6599 0.5525 0.22363 0 0.43908-0.035464 0.64816-0.085862-0.1809 0.11573-0.35726 0.24545-0.51362 0.40691-0.43908 0.45077-0.7027 1.0126-0.79361 1.5968-0.06818 0.44704 0.34453 0.87075 0.77816 0.79795 0.56907-0.093328 1.1154-0.36398 1.5536-0.81382 0.15909-0.16332 0.28817-0.34438 0.4009-0.53197-0.049089 0.21372-0.082725 0.43397-0.082725 0.66263-0.0018181 0.63743 0.19908 1.2245 0.53726 1.7023 0.25636 0.36678 0.8427 0.36678 1.1 0 0.33817-0.47784 0.53726-1.0658 0.53726-1.7032zm-1.0927-1.6612c-0.80361 0-1.4545-0.66729-1.4545-1.4932 0-0.82502 0.65089-1.4932 1.4545-1.4932 0.80452 0 1.4545 0.66823 1.4545 1.4932 0 0.82595-0.64998 1.4932-1.4545 1.4932z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/fuel-m.svg b/data/styles/default/dark/symbols/fuel-m.svg
index 323c0825a..e2b9d2773 100644
--- a/data/styles/default/dark/symbols/fuel-m.svg
+++ b/data/styles/default/dark/symbols/fuel-m.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24"><circle cx="12" cy="12" r="12" fill="#fff" opacity=".6" style="fill-rule:nonzero;fill:#000;fill-opacity:1"/><circle cx="12" cy="12" r="11" fill="#717065" style="fill-rule:nonzero"/><path d="M15.23 4.008a.667.667 0 0 0-.368 1.13l1.724 1.724c.318.318.543.711.659 1.138h-.578c-1.097 0-2 .903-2 2s.903 2 2 2h.666v4.667c0 .376-.29.666-.666.666a.657.657 0 0 1-.667-.666v-1.334c0-1.096-.903-2-2-2h-.667V6.667A1.33 1.33 0 0 0 12 5.333H6.667a1.33 1.33 0 0 0-1.334 1.334v10.666a1.33 1.33 0 0 0 1.334 1.334H12a1.33 1.33 0 0 0 1.333-1.334v-2.666H14c.376 0 .667.29.667.666v1.334c0 1.096.903 2 2 2 1.096 0 2-.904 2-2v-8a3.884 3.884 0 0 0-1.138-2.747l-1.724-1.725a.667.667 0 0 0-.576-.187ZM7.332 6.667h4c.37 0 .667.297.667.666v3.334H6.667V7.333c0-.369.297-.666.666-.666zM16.667 9a1 1 0 1 1 0 2 1 1 0 0 1 0-2z" style="fill:#000;stroke-width:.133333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:.133333,.133333;paint-order:fill markers stroke;fill-opacity:1"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24"><circle cx="12" cy="12" r="12" fill="#fff" opacity=".6" style="fill-rule:nonzero;fill:#000;fill-opacity:1"/><circle cx="12" cy="12" r="11" fill="#51585E" style="fill-rule:nonzero"/><path d="M15.23 4.008a.667.667 0 0 0-.368 1.13l1.724 1.724c.318.318.543.711.659 1.138h-.578c-1.097 0-2 .903-2 2s.903 2 2 2h.666v4.667c0 .376-.29.666-.666.666a.657.657 0 0 1-.667-.666v-1.334c0-1.096-.903-2-2-2h-.667V6.667A1.33 1.33 0 0 0 12 5.333H6.667a1.33 1.33 0 0 0-1.334 1.334v10.666a1.33 1.33 0 0 0 1.334 1.334H12a1.33 1.33 0 0 0 1.333-1.334v-2.666H14c.376 0 .667.29.667.666v1.334c0 1.096.903 2 2 2 1.096 0 2-.904 2-2v-8a3.884 3.884 0 0 0-1.138-2.747l-1.724-1.725a.667.667 0 0 0-.576-.187ZM7.332 6.667h4c.37 0 .667.297.667.666v3.334H6.667V7.333c0-.369.297-.666.666-.666zM16.667 9a1 1 0 1 1 0 2 1 1 0 0 1 0-2z" style="fill:#000;stroke-width:.133333;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:.133333,.133333;paint-order:fill markers stroke;fill-opacity:1"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/fuel-s.svg b/data/styles/default/dark/symbols/fuel-s.svg
index c86d00b65..49aa6af65 100644
--- a/data/styles/default/dark/symbols/fuel-s.svg
+++ b/data/styles/default/dark/symbols/fuel-s.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 16 16"><circle cx="8" cy="8" r="8" fill="#fff" opacity=".6" style="fill-rule:nonzero;stroke-width:.666667;fill:#000;fill-opacity:1"/><circle cx="8" cy="8" r="7.333" fill="#717065" style="fill-rule:nonzero;stroke-width:.666667"/><path d="M10.375 2.005a.444.444 0 0 0-.245.754l1.15 1.149a1.7 1.7 0 0 1 .439.759h-.386A1.34 1.34 0 0 0 10 6a1.34 1.34 0 0 0 1.333 1.333h.445v4.445c0 .25-.194.444-.445.444a.438.438 0 0 1-.444-.444v-.89a1.34 1.34 0 0 0-1.333-1.332H9v-5.55a.887.887 0 0 0-.888-.89h-2.89a.887.887 0 0 0-.888.89L4.333 12c0 .492.397.889.89.889H8.11A.887.887 0 0 0 9 12l.001-1.556h.555c.25 0 .444.194.444.445v.889a1.34 1.34 0 0 0 1.333 1.333 1.34 1.34 0 0 0 1.334-1.333V5.11l-.002-.036a2.59 2.59 0 0 0-.757-1.795l-1.15-1.15a.444.444 0 0 0-.383-.125Zm-4.707 2h2c.246 0 .445.199.445.445v2.222h-2.89V4.45c0-.246.199-.445.445-.445zm5.665 1.328a.667.667 0 1 1 0 1.334.667.667 0 0 1 0-1.334z" style="fill:#000;stroke-width:.0888887;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:.0888887,.0888887;paint-order:fill markers stroke;fill-opacity:1"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 16 16"><circle cx="8" cy="8" r="8" fill="#fff" opacity=".6" style="fill-rule:nonzero;stroke-width:.666667;fill:#000;fill-opacity:1"/><circle cx="8" cy="8" r="7.333" fill="#51585E" style="fill-rule:nonzero;stroke-width:.666667"/><path d="M10.375 2.005a.444.444 0 0 0-.245.754l1.15 1.149a1.7 1.7 0 0 1 .439.759h-.386A1.34 1.34 0 0 0 10 6a1.34 1.34 0 0 0 1.333 1.333h.445v4.445c0 .25-.194.444-.445.444a.438.438 0 0 1-.444-.444v-.89a1.34 1.34 0 0 0-1.333-1.332H9v-5.55a.887.887 0 0 0-.888-.89h-2.89a.887.887 0 0 0-.888.89L4.333 12c0 .492.397.889.89.889H8.11A.887.887 0 0 0 9 12l.001-1.556h.555c.25 0 .444.194.444.445v.889a1.34 1.34 0 0 0 1.333 1.333 1.34 1.34 0 0 0 1.334-1.333V5.11l-.002-.036a2.59 2.59 0 0 0-.757-1.795l-1.15-1.15a.444.444 0 0 0-.383-.125Zm-4.707 2h2c.246 0 .445.199.445.445v2.222h-2.89V4.45c0-.246.199-.445.445-.445zm5.665 1.328a.667.667 0 1 1 0 1.334.667.667 0 0 1 0-1.334z" style="fill:#000;stroke-width:.0888887;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:.0888887,.0888887;paint-order:fill markers stroke;fill-opacity:1"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/funeral_directors-m.svg b/data/styles/default/dark/symbols/funeral_directors-m.svg
index 8ea10aa90..a3c28186f 100644
--- a/data/styles/default/dark/symbols/funeral_directors-m.svg
+++ b/data/styles/default/dark/symbols/funeral_directors-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="funeral_directors-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <g id="tomb" transform="translate(6 6)" fill="#000">
     <path id="Shape" d="m6.2293 0.0015h-0.46085c-2.06 0-3.73 1.67-3.73 3.73v4.1207h7.9208v-4.1207c0-2.06-1.6699-3.73-3.73-3.73zm1.2105 6.7177h-2.8818c-0.19416 0-0.35156-0.15741-0.35156-0.35156s0.15741-0.35156 0.35156-0.35156h2.8818c0.19416 0 0.35156 0.15741 0.35156 0.35156s-0.15738 0.35156-0.35156 0.35156zm0-1.4062h-2.8818c-0.19416 0-0.35156-0.15741-0.35156-0.35156s0.15741-0.35156 0.35156-0.35156h2.8818c0.19416 0 0.35156 0.15741 0.35156 0.35156s-0.15738 0.35156-0.35156 0.35156zm0-1.4062h-2.8818c-0.19416 0-0.35156-0.15741-0.35156-0.35156s0.15741-0.35156 0.35156-0.35156h2.8818c0.19416 0 0.35156 0.15741 0.35156 0.35156s-0.15738 0.35156-0.35156 0.35156z"/>
     <path id="Path" d="m11.254 9.8099v-0.90302c0-0.19416-0.15741-0.35156-0.35156-0.35156h-9.8078c-0.19416 0-0.35156 0.15741-0.35156 0.35156v0.90302h10.511z"/>
diff --git a/data/styles/default/dark/symbols/furniture-m.svg b/data/styles/default/dark/symbols/furniture-m.svg
index 4db0617f3..663d2fb32 100644
--- a/data/styles/default/dark/symbols/furniture-m.svg
+++ b/data/styles/default/dark/symbols/furniture-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="furniture-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <path id="Shape" d="m17.727 11.182c-0.7 0-1.2727 0.57273-1.2727 1.2727v1.9091h-8.9091v-1.9091c0-0.7-0.57273-1.2727-1.2727-1.2727s-1.2727 0.57273-1.2727 1.2727v3.1818c0 0.7 0.57273 1.2727 1.2727 1.2727h11.455c0.7 0 1.2727-0.57273 1.2727-1.2727v-3.1818c0-0.7-0.57273-1.2727-1.2727-1.2727zm-1.9091-3.1818h-7.6364c-0.7 0-1.2727 0.57273-1.2727 1.2727v1.3682c0.73818 0.26091 1.2727 0.96091 1.2727 1.7945v1.2918h7.6364v-1.2918c0-0.82727 0.53455-1.5273 1.2727-1.7945v-1.3682c0-0.7-0.57273-1.2727-1.2727-1.2727z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/gallery-m.svg b/data/styles/default/dark/symbols/gallery-m.svg
index 7e987a0c7..30d6a370d 100644
--- a/data/styles/default/dark/symbols/gallery-m.svg
+++ b/data/styles/default/dark/symbols/gallery-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="gallery-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#7F5933"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6E4426"/>
    <path id="Shape" d="m12 5c-3.857 0-7 3.143-7 7s3.143 7 7 7c0.966 0 1.75-0.784 1.75-1.75 0-0.427-0.161-0.84-0.448-1.169-0.056-0.07-0.091-0.147-0.091-0.231 0-0.196 0.154-0.35 0.35-0.35h1.239c2.317 0 4.2-1.883 4.2-4.2 0-3.472-3.143-6.3-7-6.3zm3.85 7.7c-0.581 0-1.05-0.469-1.05-1.05s0.469-1.05 1.05-1.05 1.05 0.469 1.05 1.05-0.469 1.05-1.05 1.05zm-2.1-2.8c-0.581 0-1.05-0.469-1.05-1.05s0.469-1.05 1.05-1.05 1.05 0.469 1.05 1.05-0.469 1.05-1.05 1.05zm-6.65 1.75c0-0.581 0.469-1.05 1.05-1.05s1.05 0.469 1.05 1.05-0.469 1.05-1.05 1.05-1.05-0.469-1.05-1.05zm4.2-2.8c0 0.581-0.469 1.05-1.05 1.05s-1.05-0.469-1.05-1.05 0.469-1.05 1.05-1.05 1.05 0.469 1.05 1.05z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/gambling-m.svg b/data/styles/default/dark/symbols/gambling-m.svg
index 04076f444..145507cf9 100644
--- a/data/styles/default/dark/symbols/gambling-m.svg
+++ b/data/styles/default/dark/symbols/gambling-m.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#7f5933"/>
+ <circle cx="12" cy="12" r="11" fill="#6E4426"/>
  <path d="m9.5 6.4h7v9.1c0 0.385 0.315 0.7 0.7 0.7s0.7-0.315 0.7-0.7v-9.1c0-0.77-0.63-1.4-1.4-1.4h-7c-0.385 0-0.7 0.315-0.7 0.7s0.315 0.7 0.7 0.7zm-3.5 2.8v8.4c0 0.77 0.63 1.4 1.4 1.4h6.3c0.77 0 1.4-0.63 1.4-1.4v-8.4c0-0.77-0.63-1.4-1.4-1.4h-6.3c-0.77 0-1.4 0.63-1.4 1.4z" fill="#000"/>
- <path d="m10.55 9.0831c-1.2696 2.116-3.3856 2.9624-3.3856 5.0784 0 0.8464 0.8464 1.6928 1.6928 1.6928 0.4232 0 0.8464 0 1.2696-0.4232 0 0 0.13542 0.8464-0.8464 2.116h2.5392c-0.8464-1.2696-0.8464-2.116-0.8464-2.116 0.4232 0.4232 0.8464 0.4232 1.2696 0.4232 0.8464 0 1.6928-0.8464 1.6928-1.6928 0-2.116-2.116-2.9624-3.3856-5.0784z" fill="#7f5933"/>
+ <path d="m10.55 9.0831c-1.2696 2.116-3.3856 2.9624-3.3856 5.0784 0 0.8464 0.8464 1.6928 1.6928 1.6928 0.4232 0 0.8464 0 1.2696-0.4232 0 0 0.13542 0.8464-0.8464 2.116h2.5392c-0.8464-1.2696-0.8464-2.116-0.8464-2.116 0.4232 0.4232 0.8464 0.4232 1.2696 0.4232 0.8464 0 1.6928-0.8464 1.6928-1.6928 0-2.116-2.116-2.9624-3.3856-5.0784z" fill="#6E4426"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/garden_center-m.svg b/data/styles/default/dark/symbols/garden_center-m.svg
index 4a218910d..3e8fb8c6e 100644
--- a/data/styles/default/dark/symbols/garden_center-m.svg
+++ b/data/styles/default/dark/symbols/garden_center-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="garden_center-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <g id="Group" transform="translate(5 5)" fill="#000">
     <path id="Shape" d="m12.6 0h-11.2c-0.77 0-1.4 0.63-1.4 1.4v11.2c0 0.77 0.63 1.4 1.4 1.4h11.2c0.77 0 1.4-0.63 1.4-1.4v-11.2c0-0.77-0.63-1.4-1.4-1.4zm-8.4 4.354c0-0.602 0.49-1.092 1.092-1.092 0.231 0 0.448 0.07 0.623 0.196l-7e-3 -0.084c0-0.602 0.49-1.092 1.092-1.092s1.092 0.49 1.092 1.092l-7e-3 0.084c0.182-0.126 0.392-0.196 0.623-0.196 0.602 0 1.092 0.49 1.092 1.092 0 0.434-0.259 0.812-0.623 0.98 0.364 0.175 0.623 0.553 0.623 0.987 0 0.602-0.49 1.092-1.092 1.092-0.231 0-0.448-0.077-0.623-0.196l7e-3 0.084c0 0.602-0.49 1.092-1.092 1.092s-1.092-0.49-1.092-1.092l7e-3 -0.084c-0.182 0.126-0.392 0.196-0.623 0.196-0.602 0-1.092-0.49-1.092-1.092 0-0.434 0.259-0.812 0.623-0.98-0.364-0.175-0.623-0.553-0.623-0.987zm2.8 7.546c-1.981 0-3.647-1.379-4.088-3.227-0.126-0.518 0.343-0.98 0.861-0.861 1.848 0.441 3.227 2.107 3.227 4.088 0-1.981 1.379-3.647 3.227-4.088 0.518-0.126 0.98 0.343 0.861 0.861-0.441 1.848-2.107 3.227-4.088 3.227z"/>
     <circle id="Oval" cx="7" cy="5.334" r="1.092"/>
diff --git a/data/styles/default/dark/symbols/gift-m.svg b/data/styles/default/dark/symbols/gift-m.svg
index 2ba225dd9..9c0301e18 100644
--- a/data/styles/default/dark/symbols/gift-m.svg
+++ b/data/styles/default/dark/symbols/gift-m.svg
@@ -2,7 +2,7 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <g opacity="1">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle cx="12" cy="12" r="11" fill="#6B425C"/>
    <path d="m9.7871 4.1406c-1.1544 0-2.1055 0.95104-2.1055 2.1055 0 0.58751 0.29031 1.1106 0.66406 1.4375 0.049239 0.043069 0.09915 0.082878 0.15039 0.12109h-2.2539c-0.33366 0-0.64672 0.083462-0.91211 0.26367-0.26539 0.18021-0.50391 0.50102-0.50391 0.89453v1.1582h1.416 4.8086v-2.3164h1.8984v2.3164h4.8086 1.416v-1.1582c0-0.39352-0.23852-0.71432-0.50391-0.89453-0.26539-0.18021-0.57844-0.26367-0.91211-0.26367h-2.2539c0.051265-0.038231 0.10308-0.078004 0.15234-0.12109 0.37376-0.32692 0.66406-0.84999 0.66406-1.4375 0-1.1544-0.95104-2.1055-2.1055-2.1055-0.64295 2e-7 -1.1512 0.38355-1.4473 0.75977-0.29604 0.37621-0.46366 0.77348-0.58984 1.041-0.08357 0.17717-0.10962 0.26925-0.17773 0.41992-0.068027-0.15046-0.09235-0.24304-0.17578-0.41992-0.12619-0.26753-0.2938-0.6648-0.58984-1.041-0.29604-0.37621-0.80432-0.75977-1.4473-0.75977zm0 1.4297c0.12507 1e-7 0.18254 0.032841 0.32422 0.21289 0.14168 0.18005 0.28376 0.47892 0.41992 0.76758 0.14464 0.30664 0.18756 0.43516 0.27344 0.64062-0.24266-0.070788-0.45327-0.13034-0.80859-0.23828-0.31057-0.094349-0.57114-0.22513-0.70898-0.3457-0.13784-0.12057-0.17578-0.18082-0.17578-0.36133 0-0.38161 0.29418-0.67578 0.67578-0.67578zm4.3828 0c0.013818-0.0012497 0.029288 0 0.044922 0 0.3816 0 0.67578 0.29418 0.67578 0.67578 0 0.18051-0.03794 0.24076-0.17578 0.36133s-0.39842 0.25135-0.70898 0.3457c-0.35532 0.10794-0.56594 0.16749-0.80859 0.23828 0.08588-0.20546 0.1288-0.33398 0.27344-0.64062 0.13616-0.28866 0.27824-0.58753 0.41992-0.76758 0.12397-0.15754 0.18257-0.20414 0.2793-0.21289zm-8.5156 5.8203v1.416 2.0527 2.0547c0 0.77327 0.64275 1.416 1.416 1.416h3.9805v-6.9395h-3.9805-1.416zm7.2949 0v6.9395h3.9805c0.77327 0 1.416-0.64274 1.416-1.416v-2.0547-2.0527-1.416h-1.416-3.9805z" fill="#000" fill-rule="evenodd" />
   </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/greengrocer-m.svg b/data/styles/default/dark/symbols/greengrocer-m.svg
index 010ddb722..719dbacff 100644
--- a/data/styles/default/dark/symbols/greengrocer-m.svg
+++ b/data/styles/default/dark/symbols/greengrocer-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="greengrocer-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <g id="pear-fruit" transform="translate(8 5)" fill="#000">
     <path id="Path" d="m6.8225 6.633c-0.2224-0.68879-0.22633-1.0453-0.22633-1.615 0-1.4194-1.1507-2.57-2.57-2.57-1.4194 0-2.57 1.1506-2.57 2.57 0 0.56968-0.0039346 0.92617-0.22633 1.615-0.22247 0.68879-1.2208 1.8887-1.2208 3.3499 0 2.2186 1.7986 4.0172 4.0172 4.0172 2.2186 0 4.0171-1.7985 4.0171-4.0172 0-1.4611-0.99835-2.661-1.2208-3.3499z"/>
     <path id="Path" d="m5.9829 0.14727c-0.0013268-0.080614-0.066569-0.1457-0.14718-0.14721l-0.009951-6.8627e-5c-0.1023 0-1.0157 0.016608-1.5909 0.59173-0.30041 0.30045-0.44853 0.69012-0.52136 1.0099-0.062428-0.19325-0.16512-0.40152-0.33476-0.57121-0.4186-0.41865-1.0803-0.43073-1.1544-0.43073l-0.0078235 4.5752e-5c-0.080523 0.0015784-0.14581 0.066614-0.14714 0.14718-5.0327e-4 0.029373-0.0070458 0.72443 0.43073 1.1621 0.41872 0.4187 1.0803 0.43077 1.1544 0.43077l0.007732-4.575e-5 0.12831-6.863e-5 0.0098595 6.863e-5h4.575e-5c0.10232 0 1.0156-0.016631 1.591-0.59177 0.60115-0.60147 0.59221-1.5603 0.5915-1.6008z"/>
diff --git a/data/styles/default/dark/symbols/grinding_mill-m.svg b/data/styles/default/dark/symbols/grinding_mill-m.svg
index 925e42174..64c647879 100644
--- a/data/styles/default/dark/symbols/grinding_mill-m.svg
+++ b/data/styles/default/dark/symbols/grinding_mill-m.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+ <circle cx="12" cy="12" r="11" fill="#6B425C"/>
  <path d="m7.3333 9.9996 4.6666-5.333 4.6667 5.333v8.6669h-9.3333z" fill="#000" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333"/>
- <path d="m2.7578 17.659a5.9999 5.9582 0 0 1 2.685-6.0597 5.9999 5.9582 0 0 1 6.6652 0.14442 5.9999 5.9582 0 0 1 2.4163 6.1703 5.9999 5.9582 0 0 1-4.8158 4.5781z" fill="#8c5f93"/>
+ <path d="m2.7578 17.659a5.9999 5.9582 0 0 1 2.685-6.0597 5.9999 5.9582 0 0 1 6.6652 0.14442 5.9999 5.9582 0 0 1 2.4163 6.1703 5.9999 5.9582 0 0 1-4.8158 4.5781z" fill="#6B425C"/>
  <g fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333">
   <path d="m5.9998 14 5.3336 5.3336"/>
   <path d="m11.333 14-5.3336 5.3334"/>
   <path d="m5.2819 16.666h6.7693"/>
   <path d="m8.6666 13.233v6.8183"/>
  </g>
- <ellipse cx="8.6666" cy="16.666" rx="2.0006" ry="2.0001" fill="#8c5f93" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333"/>
+ <ellipse cx="8.6666" cy="16.666" rx="2.0006" ry="2.0001" fill="#6B425C" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/hackerspace-m.svg b/data/styles/default/dark/symbols/hackerspace-m.svg
index 0b7ce65e9..619c2ff72 100644
--- a/data/styles/default/dark/symbols/hackerspace-m.svg
+++ b/data/styles/default/dark/symbols/hackerspace-m.svg
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/><circle cx="12" cy="12" r="11" fill="#717065"/><g fill="none" stroke="#000" stroke-width="1.2"><path d="m7.2852 5.5351h9.4289l1.7502 1.7502v9.4289l-1.7502 1.7502h-9.4289l-1.7502-1.7502v-9.4289z" stroke-linecap="round"/><path d="m10.011 15.179h5.9743" stroke-linejoin="bevel"/><path d="m8.0337 8.0337 2.4494 2.4494-2.4494 2.45" stroke-linecap="square"/></g></svg>
+<svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/><circle cx="12" cy="12" r="11" fill="#51585E"/><g fill="none" stroke="#000" stroke-width="1.2"><path d="m7.2852 5.5351h9.4289l1.7502 1.7502v9.4289l-1.7502 1.7502h-9.4289l-1.7502-1.7502v-9.4289z" stroke-linecap="round"/><path d="m10.011 15.179h5.9743" stroke-linejoin="bevel"/><path d="m8.0337 8.0337 2.4494 2.4494-2.4494 2.45" stroke-linecap="square"/></g></svg>
diff --git a/data/styles/default/dark/symbols/hairdresser-m.svg b/data/styles/default/dark/symbols/hairdresser-m.svg
index a4ecc1ccf..793c2111d 100644
--- a/data/styles/default/dark/symbols/hairdresser-m.svg
+++ b/data/styles/default/dark/symbols/hairdresser-m.svg
@@ -2,7 +2,7 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <g opacity="1">
   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#8c5f93"/>
+  <circle cx="12" cy="12" r="11" fill="#6B425C"/>
   <path id="Shape" d="m10.349 8.9525c0.20298-0.43395 0.29397-0.9309 0.23797-1.4628-0.13299-1.2109-1.0779-2.2398-2.2818-2.4427-1.9388-0.33596-3.5976 1.3229-3.2616 3.2546 0.20998 1.2039 1.2319 2.1488 2.4427 2.2818 0.53194 0.055994 1.0219-0.034996 1.4628-0.23797l1.6518 1.6588-1.6518 1.6518c-0.43395-0.20298-0.9309-0.29397-1.4628-0.23797-1.2109 0.13299-2.2398 1.0779-2.4427 2.2818-0.33596 1.9388 1.3229 3.5906 3.2546 3.2546 1.2039-0.20998 2.1488-1.2319 2.2818-2.4427 0.055994-0.53194-0.034996-1.0219-0.23797-1.4628l1.6588-1.6448 5.3124 5.3124c0.62293 0.62293 1.6868 0.18198 1.6868-0.69992v-0.0069992c0-0.25897-0.10499-0.51094-0.28697-0.69992l-8.3641-8.3571zm-2.5477 0.25197c-0.76992 0-1.3998-0.62293-1.3998-1.3998 0-0.77692 0.62993-1.3998 1.3998-1.3998 0.76992 0 1.3998 0.62293 1.3998 1.3998 0 0.77692-0.62993 1.3998-1.3998 1.3998zm0 8.3991c-0.76992 0-1.3998-0.62293-1.3998-1.3998 0-0.77692 0.62993-1.3998 1.3998-1.3998 0.76992 0 1.3998 0.62293 1.3998 1.3998 0 0.77692-0.62993 1.3998-1.3998 1.3998zm4.1995-5.2494c-0.19598 0-0.34996-0.15398-0.34996-0.34996s0.15398-0.34996 0.34996-0.34996 0.34996 0.15398 0.34996 0.34996-0.15398 0.34996-0.34996 0.34996zm5.3124-7.0622-4.6125 4.6125 1.3998 1.3998 4.6125-4.6125c0.18198-0.18198 0.28697-0.43395 0.28697-0.69992v-0.0069992c0-0.8749-1.0639-1.3159-1.6868-0.69292z" fill="#000"/>
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/handicraft-m.svg b/data/styles/default/dark/symbols/handicraft-m.svg
index ffa154e28..f3b3c00c5 100644
--- a/data/styles/default/dark/symbols/handicraft-m.svg
+++ b/data/styles/default/dark/symbols/handicraft-m.svg
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+ <circle cx="12" cy="12" r="11" fill="#6B425C"/>
  <g stroke-linecap="round" stroke-linejoin="round">
   <path d="m16 18.667c2.9752-7.9831-4.4623-7.0753-1.3333-13.333h-5.3333c3.129 6.258-4.3085 5.3502-1.3333 13.333z" fill="#000" stroke="#000" stroke-width="2.667"/>
-  <path d="m6.6667 9.3333 2.6667 2.6667 2.6667-2.6667 2.6667 2.6667 2.6667-2.6667" fill="none" stroke="#8c5f93" stroke-width="1.333"/>
-  <path d="m5.3333 12 4 4 2.6667-2.6667 2.6667 2.6667 4-4" fill="none" stroke="#8c5f93" stroke-width="1.333"/>
+  <path d="m6.6667 9.3333 2.6667 2.6667 2.6667-2.6667 2.6667 2.6667 2.6667-2.6667" fill="none" stroke="#6B425C" stroke-width="1.333"/>
+  <path d="m5.3333 12 4 4 2.6667-2.6667 2.6667 2.6667 4-4" fill="none" stroke="#6B425C" stroke-width="1.333"/>
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/hearing_aids-m.svg b/data/styles/default/dark/symbols/hearing_aids-m.svg
index b3ad92cc7..0adc5ebba 100644
--- a/data/styles/default/dark/symbols/hearing_aids-m.svg
+++ b/data/styles/default/dark/symbols/hearing_aids-m.svg
@@ -2,7 +2,7 @@
   <title>audiologist-m</title>
   <g>
     <circle id="outer" r="12" cx="12" cy="12" fill="#000" opacity=".6"/>
-    <circle id="inner" r="11" cx="12" cy="12" fill="#8C5F93"/>
+    <circle id="inner" r="11" cx="12" cy="12" fill="#6B425C"/>
     <g stroke="#000" stroke-linecap="round" fill="none">
       <path d="M 15.729487,14.689004 C 17.3844,13.564632 18.61704,11.832386 18.61704,9.6980126 a 5.7549639,5.7549639 0 0 0 -11.5099277,0 V 17.12803 c 0,1.591967 1.2855145,2.928919 2.8774816,2.928919 v 0 c 1.5919681,0 2.4037781,-0.933024 2.7800081,-1.43874 0.531255,-0.712537 1.500246,-2.933594 2.964885,-3.929205 z"/>
       <path d="M 9.4090978,13.726488 V 9.4102656 c 0,-1.7408758 1.5538392,-3.1652311 3.4529782,-3.1652311 v 0 c 1.89914,0 3.452978,1.4243553 3.452978,3.1652311"/>
diff --git a/data/styles/default/dark/symbols/hindu-m.svg b/data/styles/default/dark/symbols/hindu-m.svg
index 20e057e1b..405f37343 100644
--- a/data/styles/default/dark/symbols/hindu-m.svg
+++ b/data/styles/default/dark/symbols/hindu-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="hindu-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#7F5933"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6E4426"/>
    <path id="Shape" d="m7.1626 9.4651c1.0585-0.92361 2.3574-0.98596 2.3576-0.98596 1.8494-0.16853 2.2805 0.83854 2.2805 0.83854 0.54695 0.87046 0.1483 1.8548 0.1483 1.8548-0.4032 1.0367-1.2467 1.3899-1.2467 1.3899 0.23634 0.0044709 0.63487 0.2187 0.63487 0.2187 0.12051 0.12307 0.39865 0.13214 0.39865 0.13214 0.68602 0.013661 1.0336-0.76564 1.0336-0.76564 0.70914-1.44 1.2005-1.7362 1.2005-1.7362 0.80653-0.7064 1.7521-0.4831 1.7521-0.4831 1.1078 0.19597 1.7011 1.2942 1.7011 1.2942 0.68135 1.2305 0.57007 2.5474 0.57007 2.5474 0 1.6223-0.87613 2.4472-0.87613 2.4472-0.98716 1.0436-2.1043 0.79756-2.1043 0.79756-1.5249-0.28701-1.6732-1.9595-1.6732-1.9595-0.088042-1.0618 0.14135-1.2897 0.14135-1.2897 0.12745 1.9596 2.0859 1.3945 2.0859 1.3945 1.6338-0.47168 1.6616-2.1054 1.6616-2.1054 0.11811-0.82711-0.30594-1.6406-0.30594-1.6406-0.38931-0.60146-1.0521-0.41468-1.0521-0.41468-0.55162 0.11388-0.95015 0.81569-0.95015 0.81569-0.52383 0.98894-0.91781 1.2807-0.91781 1.2807-0.744 0.6905-1.905 0.32128-1.905 0.32128 0.75082 1.2306 0.52143 2.3516 0.52143 2.3516-0.31983 2.3378-2.6583 2.2307-2.6583 2.2307-2.2062-0.0044709-3.2401-1.9979-3.2401-1.9979-1.095-1.9379-0.61617-3.7123-0.61617-3.7123 0.54682 4.3612 3.366 4.0657 3.366 4.0657 1.2315 0 1.7677-0.68802 1.7677-0.68802 0.89066-1.3046-0.20476-1.9816-0.20476-1.9816-0.79958-0.50124-1.6895-0.027322-1.6895-0.027322l-0.66291-2.0076c0.90152 0.34637 1.759 0.052409 1.759 0.052409 1.1496-0.34637 0.73301-1.1319 0.73301-1.1319-0.14438-0.37928-0.70055-0.49043-0.70055-0.49043-0.9456-0.25981-2.5307 0.90908-2.5307 0.90908l-0.77874-1.5243zm4.0539-2.8225s0.26893 1.6042 2.2805 1.8229c0 0 1.2608 0.095752 2.4196-1.203l1.0243 1.235s-1.029 1.1347-2.8275 1.2213c0 0-1.3118 0.2233-2.4335-1.1986 1.264e-4 0-0.6859-0.84301-0.46345-1.8775zm1.1123 0.52868 1.1218-1.1712 1.1774 1.0938-1.1264 1.1211-1.1728-1.0436z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/hindu-s.svg b/data/styles/default/dark/symbols/hindu-s.svg
index 616450477..2ec622ad4 100644
--- a/data/styles/default/dark/symbols/hindu-s.svg
+++ b/data/styles/default/dark/symbols/hindu-s.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="hindu-s" fill-rule="nonzero">
    <circle id="Oval" cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="8" cy="8" r="7" fill="#7F5933"/>
+   <circle id="Oval" cx="8" cy="8" r="7" fill="#6E4426"/>
    <path id="Shape" d="m4.7751 6.31c0.70569-0.61574 1.5716-0.6573 1.5717-0.6573 1.2329-0.11235 1.5203 0.55903 1.5203 0.55903 0.36463 0.5803 0.098864 1.2365 0.098864 1.2365-0.2688 0.69117-0.83116 0.92663-0.83116 0.92663 0.15756 0.0029806 0.42324 0.1458 0.42324 0.1458 0.080337 0.082049 0.26577 0.088093 0.26577 0.088093 0.45735 0.0091074 0.6891-0.51043 0.6891-0.51043 0.47276-0.96 0.80034-1.1575 0.80034-1.1575 0.53769-0.47093 1.1681-0.32207 1.1681-0.32207 0.73853 0.13065 1.1341 0.8628 1.1341 0.8628 0.45423 0.82033 0.38004 1.6983 0.38004 1.6983 0 1.0815-0.58409 1.6315-0.58409 1.6315-0.65811 0.69572-1.4029 0.5317-1.4029 0.5317-1.0166-0.19134-1.1155-1.3063-1.1155-1.3063-0.058695-0.70789 0.094232-0.85982 0.094232-0.85982 0.084969 1.3064 1.3906 0.9297 1.3906 0.9297 1.0892-0.31445 1.1077-1.4036 1.1077-1.4036 0.078737-0.55141-0.20396-1.0937-0.20396-1.0937-0.25954-0.40097-0.70139-0.27645-0.70139-0.27645-0.36775 0.075922-0.63343 0.54379-0.63343 0.54379-0.34922 0.65929-0.61188 0.85377-0.61188 0.85377-0.496 0.46034-1.27 0.21419-1.27 0.21419 0.50055 0.82041 0.34762 1.5677 0.34762 1.5677-0.21322 1.5585-1.7722 1.4872-1.7722 1.4872-1.4708-0.0029806-2.1601-1.3319-2.1601-1.3319-0.73002-1.2919-0.41078-2.4749-0.41078-2.4749 0.36455 2.9075 2.244 2.7104 2.244 2.7104 0.82097 0 1.1784-0.45868 1.1784-0.45868 0.59377-0.86975-0.13651-1.3211-0.13651-1.3211-0.53305-0.33416-1.1263-0.018215-1.1263-0.018215l-0.44194-1.3384c0.60101 0.23091 1.1726 0.034939 1.1726 0.034939 0.7664-0.23091 0.48868-0.75459 0.48868-0.75459-0.096253-0.25285-0.46703-0.32695-0.46703-0.32695-0.6304-0.17321-1.6872 0.60605-1.6872 0.60605l-0.51916-1.0162zm2.7026-1.8817s0.17928 1.0695 1.5203 1.2153c0 0 0.84051 0.063834 1.6131-0.80203l0.68287 0.82331s-0.68598 0.75649-1.885 0.8142c0 0-0.87453 0.14886-1.6223-0.79905 8.421e-5 0-0.45727-0.56201-0.30897-1.2517zm0.74156 0.35246 0.74788-0.78083 0.78493 0.72917-0.75091 0.74738-0.7819-0.69572z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/historic-ship-m.svg b/data/styles/default/dark/symbols/historic-ship-m.svg
index a7ff3e61e..5d2a15fce 100644
--- a/data/styles/default/dark/symbols/historic-ship-m.svg
+++ b/data/styles/default/dark/symbols/historic-ship-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#7f5933"/>
+ <circle cx="12" cy="12" r="11" fill="#6E4426"/>
  <path id="Shape" d="m18.344 11.344c-0.19389 0-0.36837 0.084602-0.4886 0.21875h-1.0627c-0.090452-0.99898-0.48729-1.9108-1.0958-2.6404l0.75359-0.75359c0.01184 6.2891e-4 0.02368 0.0016953 0.035519 0.0016953 0.16805 0 0.33608-0.063957 0.46399-0.19184 5.47e-5 -2.734e-5 8.2e-5 -5.469e-5 1.094e-4 -1.0937e-4 0.25577-0.25583 0.25577-0.67214-1.094e-4 -0.92807-0.25577-0.25577-0.67213-0.2558-0.92807 8.203e-5 -0.13688 0.13694-0.19977 0.31981-0.19012 0.49952l-0.75362 0.75362c-0.72961-0.60851-1.6414-1.0053-2.6404-1.0958v-1.0627c0.13415-0.12023 0.21875-0.29471 0.21875-0.48861 0-0.36184-0.29441-0.65625-0.65625-0.65625s-0.65625 0.29441-0.65625 0.65625c0 0.19389 0.084601 0.36838 0.21875 0.48861v1.0627c-0.99897 0.090453-1.9107 0.48729-2.6404 1.0958l-0.75359-0.75362c0.0096523-0.17968-0.053211-0.36258-0.19012-0.49952-2.734e-5 -2.734e-5 -5.468e-5 -5.468e-5 -1.0937e-4 -8.203e-5 -0.2558-0.25577-0.67216-0.2558-0.92807 8.203e-5 -0.25577 0.25586-0.25577 0.67216 1.0937e-4 0.9281 0.12791 0.12789 0.29588 0.19182 0.46397 0.19182 0.011867 0 0.02368-0.0010664 0.035519-0.0016953l0.75362 0.75362c-0.60853 0.72961-1.0054 1.6414-1.0958 2.6404h-1.0627c-0.12023-0.13415-0.29471-0.21875-0.4886-0.21875-0.36184 0-0.65625 0.29441-0.65625 0.65625s0.29441 0.65625 0.65625 0.65625c0.19389 0 0.36837-0.084602 0.4886-0.21875h1.0627c0.090453 0.99898 0.48729 1.9108 1.0958 2.6404l-0.75362 0.75359c-0.17967-0.0096524-0.36258 0.053238-0.49951 0.19012-5.469e-5 2.73e-5 -8.203e-5 5.47e-5 -1.0938e-4 1.093e-4 -0.25577 0.25583-0.25577 0.67214 1.0938e-4 0.92807 0.12791 0.12789 0.29588 0.19182 0.46397 0.19182 0.16805 0 0.33616-0.063984 0.46413-0.19193 0.13688-0.13694 0.19977-0.31981 0.19012-0.49949l0.75362-0.75362c0.72961 0.60851 1.6414 1.0053 2.6404 1.0958v1.0627c-0.13415 0.12023-0.21875 0.29471-0.21875 0.48861 0 0.36184 0.29441 0.65625 0.65625 0.65625s0.65625-0.29441 0.65625-0.65625c0-0.19389-0.084601-0.36838-0.21875-0.48861v-1.0627c0.99897-0.090453 1.9107-0.48729 2.6404-1.0958l0.75362 0.75362c-0.0096523 0.17968 0.053211 0.36255 0.19012 0.49952 2.73e-5 5.47e-5 5.47e-5 8.21e-5 1.094e-4 1.094e-4 0.12791 0.12789 0.29588 0.19182 0.46397 0.19182 0.16805 0 0.33616-0.063984 0.46413-0.19193 0.25577-0.25583 0.25577-0.67214-1.094e-4 -0.92807-0.13691-0.13688-0.31981-0.19977-0.49949-0.19012l-0.75362-0.75362c0.6085-0.72961 1.0053-1.6414 1.0958-2.6404h1.0627c0.12023 0.13415 0.29471 0.21875 0.4886 0.21875 0.36184 0 0.65625-0.29441 0.65625-0.65625s-0.29449-0.65625-0.65633-0.65625zm-3.736 2.6453-1.4235-1.4235c0.019906-0.041508 0.037488-0.084273 0.053019-0.12802h2.0148c-0.077382 0.5781-0.30584 1.1089-0.64427 1.5515zm-4.5968 0.61871 1.4235-1.4235c0.041508 0.019906 0.084273 0.037488 0.12802 0.05302v2.0148c-0.5781-0.077383-1.1089-0.30584-1.5515-0.64427zm-1.263-2.1702h2.0148c0.015531 0.04375 0.033113 0.086543 0.053019 0.12802l-1.4235 1.4235c-0.33843-0.44261-0.56689-0.97344-0.64427-1.5515zm0.64427-2.4265 1.4235 1.4235c-0.019906 0.041508-0.037488 0.084273-0.053019 0.12802h-2.0148c0.077382-0.5781 0.30584-1.1089 0.64427-1.5515zm4.5968-0.61871-1.4235 1.4235c-0.041508-0.019906-0.084273-0.037488-0.12802-0.05302v-2.0148c0.5781 0.077383 1.1089 0.30584 1.5515 0.64427zm1.263 2.1702h-2.0148c-0.015531-0.04375-0.033113-0.086543-0.053019-0.12802l1.4235-1.4235c0.33843 0.44261 0.56689 0.97344 0.64427 1.5515zm-2.8145 0.4375c0 0.24123-0.19627 0.4375-0.4375 0.4375s-0.4375-0.19627-0.4375-0.4375 0.19627-0.4375 0.4375-0.4375 0.4375 0.19627 0.4375 0.4375zm-0.87499-1.2372c-0.04375 0.015531-0.086542 0.033113-0.12802 0.05302l-1.4235-1.4235c0.44261-0.33841 0.97346-0.56689 1.5515-0.64425v2.0147zm0.87499 2.4745c0.04375-0.015531 0.086542-0.033113 0.12802-0.05302l1.4235 1.4235c-0.44261 0.33841-0.97346 0.56689-1.5515 0.64425v-2.0147z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/home-m.svg b/data/styles/default/dark/symbols/home-m.svg
index 57a354415..f2cfeac71 100644
--- a/data/styles/default/dark/symbols/home-m.svg
+++ b/data/styles/default/dark/symbols/home-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="home-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#51585E"/>
    <path id="Path" d="m10.477 17.911v-3.8043h3.0435v3.8043c0 0.41847 0.34239 0.76086 0.76086 0.76086h2.2826c0.41847 0 0.76086-0.34239 0.76086-0.76086v-5.326h1.2935c0.35 0 0.51739-0.43369 0.25108-0.66195l-6.3608-5.7293c-0.28913-0.25869-0.73043-0.25869-1.0196 0l-6.3608 5.7293c-0.25869 0.22826-0.098912 0.66195 0.25108 0.66195h1.2935v5.326c0 0.41847 0.34239 0.76086 0.76086 0.76086h2.2826c0.41847 0 0.76086-0.34239 0.76086-0.76086z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/hospital-m.svg b/data/styles/default/dark/symbols/hospital-m.svg
index bb10b07f2..96f3dc657 100644
--- a/data/styles/default/dark/symbols/hospital-m.svg
+++ b/data/styles/default/dark/symbols/hospital-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="9" cy="9" r="9" fill="#000" opacity=".6"/>
- <circle cx="9" cy="9" r="8.25" fill="#c15746"/>
+ <circle cx="9" cy="9" r="8.25" fill="#983E44"/>
  <path d="m13.583 11h-2.5833v2.5833c0 0.50417-0.4125 0.91667-0.91667 0.91667h-2.1667c-0.50417 0-0.91667-0.4125-0.91667-0.91667v-2.5833h-2.5834c-0.50417 0-0.91665-0.4125-0.91665-0.91667v-2.1667c0-0.50417 0.4125-0.91667 0.91665-0.91667h2.5834v-2.5833c0-0.50417 0.4125-0.91667 0.91667-0.91667h2.1667c0.50417 0 0.91667 0.4125 0.91667 0.91667v2.5833h2.5833c0.50417 0 0.91667 0.4125 0.91667 0.91667v2.1667c0 0.50417-0.4125 0.91667-0.91667 0.91667z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/hospital-s.svg b/data/styles/default/dark/symbols/hospital-s.svg
index 49fee501e..c1db19a99 100644
--- a/data/styles/default/dark/symbols/hospital-s.svg
+++ b/data/styles/default/dark/symbols/hospital-s.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="12" height="12" version="1.1" viewBox="0 0 12 12" xmlns="http://www.w3.org/2000/svg">
  <circle cx="6" cy="6" r="6" fill="#000" opacity=".6"/>
- <circle cx="6" cy="6" r="5.5" fill="#c15746"/>
+ <circle cx="6" cy="6" r="5.5" fill="#983E44"/>
  <path d="m9.3333 7.5h-1.8333v1.8333c0 0.36667-0.3 0.66667-0.66667 0.66667h-1.6667c-0.36667 0-0.66667-0.3-0.66667-0.66667v-1.8333h-1.8333c-0.36667 0-0.66666-0.3-0.66666-0.66666v-1.6667c0-0.36667 0.3-0.66666 0.66666-0.66666h1.8333v-1.8333c0-0.36667 0.3-0.66667 0.66667-0.66667h1.6667c0.36667 0 0.66667 0.3 0.66667 0.66667v1.8333h1.8333c0.36667 0 0.66667 0.3 0.66667 0.66666v1.6667c0 0.36667-0.3 0.66666-0.66667 0.66666z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/hostel-m.svg b/data/styles/default/dark/symbols/hostel-m.svg
index 478ad50c7..29597cf49 100644
--- a/data/styles/default/dark/symbols/hostel-m.svg
+++ b/data/styles/default/dark/symbols/hostel-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="hostel-m" fill-rule="nonzero">
    <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle cx="12" cy="12" r="11" fill="#664E42"/>
+   <circle cx="12" cy="12" r="11" fill="#614A43"/>
    <path id="Shape" d="m17.6 6v2.8h-0.48533c-0.11643-0.80258-0.80369-1.3985-1.6147-1.4h-4.9v1.4h-0.5964c0.083971-0.14125 0.12877-0.30234 0.12973-0.46667 0-0.51546-0.41787-0.93333-0.93333-0.93333h-1.4c-0.51546 0-0.93333 0.41787-0.93333 0.93333 9.625e-4 0.16432 0.045762 0.32541 0.12973 0.46667h-0.5964v-2.8h-1.4v12.133h1.4v-1.4h11.2v1.4h1.4v-12.133zm-2.1 7h-4.9v1.4h-0.5964c0.08397-0.14125 0.12877-0.30234 0.12973-0.46667 0-0.51546-0.41787-0.93333-0.93333-0.93333h-1.4c-0.51546 0-0.93333 0.41787-0.93333 0.93333 9.625e-4 0.16432 0.045762 0.32541 0.12973 0.46667h-0.5964v-3.2667h11.2v3.2667h-0.48533c-0.11646-0.80258-0.80369-1.3985-1.6147-1.4z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/hotel-m.svg b/data/styles/default/dark/symbols/hotel-m.svg
index 274681244..b2d401737 100644
--- a/data/styles/default/dark/symbols/hotel-m.svg
+++ b/data/styles/default/dark/symbols/hotel-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="hotel-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#664E42"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#614A43"/>
    <path id="Shape" d="m8.8182 12.091c1.0564 0 1.9091-0.85273 1.9091-1.9091 0-1.0564-0.85273-1.9091-1.9091-1.9091-1.0564 0-1.9091 0.85273-1.9091 1.9091 0 1.0564 0.85273 1.9091 1.9091 1.9091zm7.6364-3.8182h-3.8182c-0.7 0-1.2727 0.57273-1.2727 1.2727v3.1818h-5.0909v-5.0909c0-0.35-0.28636-0.63636-0.63636-0.63636s-0.63636 0.28636-0.63636 0.63636v8.2727c0 0.35 0.28636 0.63636 0.63636 0.63636s0.63636-0.28636 0.63636-0.63636v-1.2727h11.455v1.2727c0 0.35 0.28636 0.63636 0.63636 0.63636s0.63636-0.28636 0.63636-0.63636v-5.0909c0-1.4064-1.1391-2.5455-2.5455-2.5455z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/hotel-s.svg b/data/styles/default/dark/symbols/hotel-s.svg
index fa3c90d20..2235dbfb0 100644
--- a/data/styles/default/dark/symbols/hotel-s.svg
+++ b/data/styles/default/dark/symbols/hotel-s.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity=".6">
   <g id="hotel-s" fill-rule="nonzero">
    <circle id="Oval" cx="8" cy="8" r="8" fill="#fff"/>
-   <circle id="Oval" cx="8" cy="8" r="7.3333" fill="#664E42"/>
+   <circle id="Oval" cx="8" cy="8" r="7.3333" fill="#614A43"/>
    <path id="Shape" d="m5.8788 8.0606c0.70424 0 1.2727-0.56848 1.2727-1.2727 0-0.70424-0.56848-1.2727-1.2727-1.2727-0.70424 0-1.2727 0.56848-1.2727 1.2727 0 0.70424 0.56848 1.2727 1.2727 1.2727zm5.0909-2.5455h-2.5455c-0.46667 0-0.84848 0.38182-0.84848 0.84848v2.1212h-3.3939v-3.3939c0-0.23333-0.19091-0.42424-0.42424-0.42424-0.23333 0-0.42424 0.19091-0.42424 0.42424v5.5152c0 0.23333 0.19091 0.42424 0.42424 0.42424 0.23333 0 0.42424-0.19091 0.42424-0.42424v-0.84848h7.6364v0.84848c0 0.23333 0.19091 0.42424 0.42424 0.42424 0.23333 0 0.42424-0.19091 0.42424-0.42424v-3.3939c0-0.93758-0.75939-1.697-1.697-1.697z" fill="#fff"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/ice_cream-m.svg b/data/styles/default/dark/symbols/ice_cream-m.svg
index 1544959c6..45b831d1f 100644
--- a/data/styles/default/dark/symbols/ice_cream-m.svg
+++ b/data/styles/default/dark/symbols/ice_cream-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#bb9342"/>
+ <circle cx="12" cy="12" r="11" fill="#8C491C"/>
  <path d="m12.049 5.3147c-1.902 0-3.5057 1.3566-3.8631 3.1738-0.93283 0.34526-1.5879 1.2414-1.5879 2.2772 0 1.3386 1.0851 2.4218 2.4238 2.4218 0.60736 0.0071 1.0136-0.18667 1.4042-0.3496 0.50275 0.22412 1.0536 0.3496 1.623 0.3496 0.57544 0 1.1396-0.12704 1.6484-0.36327 0.32914 0.16064 0.82873 0.36216 1.3808 0.36327 1.3386 0 2.4238-1.0831 2.4238-2.4218 0-1.0358-0.65506-1.932-1.5879-2.2772-0.35738-1.8172-1.9631-3.1738-3.8651-3.1738zm1.707 8.7282c-0.52703 0.30792-1.109 0.47264-1.705 0.47264-0.58984 0-1.1609-0.16489-1.6816-0.45702-0.37309 0.19579-0.78848 0.34937-1.3437 0.36522l2.3906 4.7831c0.11234 0.22468 0.33902 0.36522 0.59177 0.36522 0.25276 0 0.47944-0.14054 0.59178-0.36522l2.4257-4.8514c-0.48744-0.03354-0.98887-0.14016-1.2695-0.31249z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/information-office-m.svg b/data/styles/default/dark/symbols/information-office-m.svg
index 329c186fe..230c3e400 100644
--- a/data/styles/default/dark/symbols/information-office-m.svg
+++ b/data/styles/default/dark/symbols/information-office-m.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="9" cy="9" r="9" fill="#000" opacity=".6"/>
- <circle cx="9" cy="9" r="8.25" fill="#717065"/>
+ <circle cx="9" cy="9" r="8.25" fill="#51585E"/>
  <g fill="#000">
   <circle cx="9" cy="5" r="1.5"/>
   <rect x="7" y="7" width="3" height="1.5" rx=".5" ry=".5"/>
diff --git a/data/styles/default/dark/symbols/interior_decoration-m.svg b/data/styles/default/dark/symbols/interior_decoration-m.svg
index 2c8a886bb..38d6b93bc 100644
--- a/data/styles/default/dark/symbols/interior_decoration-m.svg
+++ b/data/styles/default/dark/symbols/interior_decoration-m.svg
@@ -3,7 +3,7 @@
     <title>interior_decoration-m</title>
     <g id="interior_decoration-m" fill-rule="nonzero">
         <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-        <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+        <circle cx="12" cy="12" r="11" fill="#6B425C"/>
         <path d="m16.246 5.543c-0.52905 8.118e-4 -0.99393 0.35107-1.1406 0.85938-0.09265-0.023045-0.18773-0.034849-0.2832-0.035156-0.657-2.11e-4 -1.1897 0.53245-1.1895 1.1895 1e-3 0.37613 0.17992 0.7296 0.48242 0.95312-0.30305 0.22394-0.48203 0.57826-0.48242 0.95508-2.1e-4 0.657 0.53245 1.1897 1.1895 1.1895 0.10086-2.93e-4 0.20128-0.01342 0.29883-0.03906 0.11406 0.34283 0.37781 0.61521 0.7168 0.74024v4.3008h0.8125v-4.2988c0.38406-0.13857 0.67018-0.4645 0.75781-0.86328 0.12882 0.0478 0.26495 0.07291 0.40234 0.07422 0.657 2.057e-4 1.1897-0.53245 1.1895-1.1895-9.43e-4 -0.32709-0.13658-0.63935-0.375-0.86328 0.23891-0.2244 0.37459-0.53747 0.375-0.86523 2.11e-4 -0.657-0.53245-1.1897-1.1895-1.1895-0.13388 0.00117-0.26661 0.02494-0.39258 0.070312-0.0978-0.57087-0.59269-0.98822-1.1719-0.98828zm0.07031 2.0586c0.48871-1.605e-4 0.88493 0.39606 0.88477 0.88477 1.6e-4 0.48871-0.39606 0.88493-0.88477 0.88477-0.48871 1.599e-4 -0.88492-0.39606-0.88476-0.88477-1.6e-4 -0.48871 0.39606-0.88493 0.88476-0.88477z" fill="#000" fill-rule="evenodd" style="paint-order:stroke fill markers"/>
         <path d="m6.1756 5.4825-1.0446 3.8474a0.38235 0.38235 52.595 0 0 0.36899 0.48253h1.8613a0.5 0.5 45 0 1 0.5 0.5v7.0664a0.5 0.5 135 0 1-0.5 0.5h-0.3457a0.5 0.5 135 0 0-0.5 0.5v0.12109a0.5 0.5 45 0 0 0.5 0.5h2.8145a0.5 0.5 135 0 0 0.5-0.5v-0.12109a0.5 0.5 45 0 0-0.5-0.5h-0.3457a0.5 0.5 45 0 1-0.5-0.5v-7.0664a0.5 0.5 135 0 1 0.5-0.5h1.8613a0.38145 0.38145 127.34 0 0 0.3679-0.48223l-1.0541-3.848a0.65539 0.65539 37.34 0 0-0.6321-0.48223h-3.2207a0.65386 0.65386 142.6 0 0-0.63101 0.48253zm7.464 8.6643 0.85945 4.3626a0.60811 0.60811 39.428 0 0 0.59664 0.49057h2.3633a0.6068 0.6068 140.51 0 0 0.59561-0.49077l0.8498-4.3622a0.41199 0.41199 50.512 0 0-0.40439-0.49077h-4.457a0.41111 0.41111 129.43 0 0-0.40336 0.49057z" fill="#000" fill-rule="evenodd" style="paint-order:stroke fill markers"/>
     </g>
diff --git a/data/styles/default/dark/symbols/internet_cafe-m.svg b/data/styles/default/dark/symbols/internet_cafe-m.svg
index f09cb253c..e98d2ecd4 100644
--- a/data/styles/default/dark/symbols/internet_cafe-m.svg
+++ b/data/styles/default/dark/symbols/internet_cafe-m.svg
@@ -1,7 +1,7 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <g opacity="1">
   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+  <circle cx="12" cy="12" r="11" fill="#6B425C"/>
   <path d="m14.332 8.6569h1.5996l-1.0833 3.6732q-0.12695 0.44857-0.1862 0.66862-0.05078 0.21159-0.05078 0.3724 0 0.2539 0.16927 0.48242 0.16927 0.22005 0.54167 0.22005 0.72786 0 1.4557-0.94792 0.73633-0.95638 0.73633-2.5306 0-2.3275-1.9974-3.3431-1.2526-0.64323-2.8184-0.64323-2.8776 0-4.6211 1.7604-1.5742 1.5911-1.5742 3.817 0 2.4713 1.845 3.9186 1.6335 1.278 3.9863 1.278 1.6081 0 3.0046-0.59245 0.76172-0.31315 1.5742-0.88867l0.20312-0.14388 0.61784 0.94791q-1.2018 0.93099-2.6068 1.4219-1.3965 0.48242-2.903 0.48242-3.5124 0-5.442-2.1836-1.5996-1.8112-1.5996-4.291 0-2.776 1.9974-4.7057 2.099-2.0397 5.3743-2.0397 2.666 0 4.418 1.3965 1.845 1.4727 1.845 3.9101 0 1.9212-1.168 3.3008-1.168 1.3711-2.666 1.3711-0.77864 0-1.2018-0.4401-0.41471-0.4401-0.41471-0.9056 0-0.05924 0-0.12695 0.0085-0.07617 0.01693-0.16081-0.32161 0.60937-0.7194 0.97331-0.7194 0.65169-1.7266 0.65169-1.0241 0-1.7096-0.73633-0.67708-0.73633-0.67708-2.0566 0-1.5319 1.041-2.8691t2.556-1.3372q0.88867 0 1.3796 0.49088 0.3724 0.38086 0.49935 0.87174zm-3.6478 5.0781q0.2793 0.38086 0.79557 0.38086 0.9056 0 1.4811-1.3711 0.58398-1.3796 0.58398-2.1667 0-0.44857-0.27083-0.75325-0.27083-0.30469-0.72786-0.30469-0.88021 0-1.515 1.1003-0.63476 1.0918-0.63476 2.1159 0 0.61784 0.28776 0.9987z" fill="#000"/>
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/jewelry-m.svg b/data/styles/default/dark/symbols/jewelry-m.svg
index ec3b5b831..63c36e368 100644
--- a/data/styles/default/dark/symbols/jewelry-m.svg
+++ b/data/styles/default/dark/symbols/jewelry-m.svg
@@ -4,7 +4,7 @@
  <g fill="none" fill-rule="evenodd">
   <g id="jewelry-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle cx="12" cy="12" r="11" fill="#8c5f93"/>
+   <circle cx="12" cy="12" r="11" fill="#6B425C"/>
    <g id="ring" transform="translate(7,6)" fill="#000">
     <path d="m6.6516 4.0727v-1.1636c-6.754e-4 -0.076831-0.044-0.14688-0.11242-0.18182l0.89912-1.1443c0.00353-0.00457 0.00519-0.00977 0.00831-0.014545 0.00418-0.00504 0.00805-0.010312 0.011636-0.015792 0.00187-0.00353 0.00249-0.00748 0.00416-0.011221 0.00356-0.0081 0.00662-0.016442 0.00914-0.024935 0.00314-0.00951 0.00558-0.019221 0.00727-0.029091 0.00127-0.0086 0.00205-0.017273 0.00229-0.025974 7.272e-4 -0.0099 7.272e-4 -0.019818 0-0.029714-9.611e-4 -0.00875-0.00257-0.017454-0.00478-0.025974-0.00231-0.00984-0.00538-0.019507-0.00914-0.028883-0.00187-0.00436-0.00229-0.00894-0.00436-0.013091-0.00208-0.00416-0.00519-0.00727-0.00748-0.011429-0.00229-0.00416-0.00374-0.00894-0.00644-0.013091l-0.83118-1.2468c-0.004935-0.0063896-0.010208-0.012494-0.015792-0.018286-0.0051428-0.0065195-0.010623-0.012753-0.016416-0.018701-0.0085974-0.0077143-0.017844-0.014649-0.027636-0.020779-0.0047792-0.0031169-0.0091429-0.0070649-0.014338-0.0097662-0.0098182-0.0049351-0.020026-0.009039-0.030545-0.01226-0.0066494-0.0022857-0.012883-0.0051948-0.020779-0.0068571-0.0087792-0.0017403-0.017662-0.0028571-0.026597-0.0033247-0.0072207-0.0012468-0.014494-0.0020779-0.021818-0.0024935h-2.9091c-0.00727 0-0.013922 0.0020779-0.020779 0.0027013-0.00927 5.4545e-4 -0.01852 0.0017143-0.027636 0.0035325-0.00644 0.0016623-0.012468 0.0043636-0.018909 0.0064416-0.010727 0.0033507-0.021143 0.0076104-0.031169 0.012675-0.00499 0.0027013-0.00914 0.0062338-0.013922 0.0093506-0.00995 0.0060779-0.019351 0.013039-0.028052 0.020779-0.00577 0.0057662-0.011117 0.011948-0.016 0.018494-0.00579 0.0058182-0.011195 0.012-0.016208 0.018494l-0.83117 1.2468c-0.0027 0.00416-0.00395 0.00893-0.00644 0.013091-0.00249 0.00416-0.00561 0.00727-0.00748 0.011429-0.00187 0.00416-0.00249 0.00873-0.00436 0.013091-0.00377 0.00938-0.00683 0.019039-0.00914 0.028883-0.00221 0.00852-0.00382 0.017221-0.00478 0.025974-0.00106 0.00987-0.00143 0.019792-0.00104 0.029714 2.338e-4 0.0087 0.00101 0.017377 0.00229 0.025974 0.00169 0.00987 0.00413 0.019584 0.00727 0.029091 0.00252 0.00849 0.00558 0.016831 0.00914 0.024935 0.00166 0.00374 0.00229 0.00769 0.00416 0.011221 0.00358 0.00548 0.00745 0.010753 0.011636 0.015792 0.00312 0.00478 0.00478 0.00997 0.00831 0.014545l0.89911 1.1443c-0.06852 0.034857-0.11192 0.10496-0.11262 0.18182v1.1636z"/>
     <circle cx="4.9892" cy="8.0854" r="3.8307" fill="none" stroke="#000" stroke-linecap="square" stroke-width="1.5" style="paint-order:markers stroke fill"/>
diff --git a/data/styles/default/dark/symbols/jewish-m.svg b/data/styles/default/dark/symbols/jewish-m.svg
index 1cf2c03c1..3c79a3b13 100644
--- a/data/styles/default/dark/symbols/jewish-m.svg
+++ b/data/styles/default/dark/symbols/jewish-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="jewish-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#7F5933"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6E4426"/>
    <path id="Shape" d="m15.973 11.881 2.0157-3.459c0.029212-0.029819 0-0.089457-0.058425-0.089457h-3.8852c-0.029212 0-0.029212 0-0.058425-0.029819l-1.782-3.2801c-0.029212-0.029819-0.087637-0.029819-0.087637 0l-1.8988 3.2801c0 0.029819-0.029212 0.029819-0.058425 0.029819h-4.0605c-0.058425 0-0.058425 0.059638-0.058425 0.089457l1.9864 3.6379v0.059638l-2.0157 3.459c-0.029212 0.029819 0 0.089457 0.058425 0.089457h3.8852c0.029212 0 0.029212 0 0.058425 0.029819l1.782 3.2801c0.029212 0.029819 0.087637 0.029819 0.087637 0l1.8988-3.2801c0-0.029819 0.029212-0.029819 0.058425-0.029819h4.0605c0.058425 0 0.058425-0.059638 0.058425-0.089457l-1.9864-3.6379v-0.059638zm0.64267-2.6539-1.0224 1.7891c-0.029212 0.029819-0.087637 0.029819-0.087637 0l-0.96401-1.7891c-0.029212-0.029819 0-0.089457 0.058425-0.089457h2.0157c-0.029212 0 0 0.059638 0 0.089457zm-1.5775 2.7135-1.6651 2.8924c0 0.029819-0.029212 0.029819-0.058425 0.029819h-2.8336c-0.029212 0-0.029212 0-0.058425-0.029819l-1.4606-2.7135v-0.059638l1.6651-2.8924c0-0.029819 0.029212-0.029819 0.058425-0.029819h2.8336c0.029212 0 0.029212 0 0.058425 0.029819l1.4606 2.7135c0.029212 0 0.029212 0.029819 0 0.059638zm-2.8628-5.3078 0.87637 1.6102c0.029212 0.029819 0 0.089457-0.058425 0.089457h-1.8112c-0.058425 0-0.087637-0.059638-0.058425-0.089457l0.96401-1.6102c0.029212-0.029819 0.087637-0.029819 0.087637 0zm-4.7616 2.5048h2.2201c0.058425 0 0.087637 0.059638 0.058425 0.089457l-1.1393 1.9681c-0.029212 0.029819-0.087637 0.029819-0.087637 0l-1.0809-1.9681c-0.029212-0.029819 0-0.089457 0.029212-0.089457zm-0.029212 5.6358 1.0224-1.7891c0.029212-0.029819 0.087637-0.029819 0.087637 0l0.96401 1.7891c0.029212 0.029819 0 0.089457-0.058425 0.089457h-1.9572c-0.029212 0-0.058425-0.059638-0.058425-0.089457zm4.4403 2.5942-0.87637-1.6102c-0.029212-0.029819 0-0.089457 0.058425-0.089457h1.8112c0.058425 0 0.087637 0.059638 0.058425 0.089457l-0.96401 1.6102c-0.029212 0.029819-0.087637 0.029819-0.087637 0zm3.7392-4.5623 1.0809 1.9681c0.029212 0.029819 0 0.089457-0.058425 0.089457h-2.2201c-0.058425 0-0.087637-0.059638-0.058425-0.089457l1.1393-1.9681c0.029212-0.029819 0.087637-0.029819 0.11685 0z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/jewish-s.svg b/data/styles/default/dark/symbols/jewish-s.svg
index b4859dbca..1658509d1 100644
--- a/data/styles/default/dark/symbols/jewish-s.svg
+++ b/data/styles/default/dark/symbols/jewish-s.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="jewish-s" fill-rule="nonzero">
    <circle id="Oval" cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="8" cy="8" r="7" fill="#7F5933"/>
+   <circle id="Oval" cx="8" cy="8" r="7" fill="#6E4426"/>
    <path id="Shape" d="m10.649 7.4233 1.3438-2.2236c0.019475-0.019169 0-0.057508-0.03895-0.057508h-2.5902c-0.019475 0-0.019475 0-0.03895-0.019169l-1.188-2.1086c-0.019475-0.019169-0.058425-0.019169-0.058425 0l-1.2659 2.1086c0 0.019169-0.019475 0.019169-0.03895 0.019169h-2.707c-0.03895 0-0.03895 0.038339-0.03895 0.057508l1.3243 2.3387v0.038339l-1.3438 2.2236c-0.019475 0.019169 0 0.057508 0.03895 0.057508h2.5902c0.019475 0 0.019475 0 0.03895 0.019169l1.188 2.1086c0.019475 0.019169 0.058425 0.019169 0.058425 0l1.2659-2.1086c0-0.019169 0.019475-0.019169 0.03895-0.019169h2.707c0.03895 0 0.03895-0.038339 0.03895-0.057508l-1.3243-2.3387v-0.038339zm0.42845-1.7061-0.68162 1.1502c-0.019475 0.019169-0.058425 0.019169-0.058425 0l-0.64267-1.1502c-0.019475-0.019169 0-0.057508 0.03895-0.057508h1.3438c-0.019475 0 0 0.038339 0 0.057508zm-1.0516 1.7444-1.1101 1.8594c0 0.019169-0.019475 0.019169-0.03895 0.019169h-1.8891c-0.019475 0-0.019475 0-0.03895-0.019169l-0.97375-1.7444v-0.038339l1.1101-1.8594c0-0.019169 0.019475-0.019169 0.03895-0.019169h1.8891c0.019475 0 0.019475 0 0.03895 0.019169l0.97375 1.7444c0.019475 0 0.019475 0.019169 0 0.038339zm-1.9085-3.4121 0.58425 1.0351c0.019475 0.019169 0 0.057508-0.03895 0.057508h-1.2074c-0.03895 0-0.058425-0.038339-0.03895-0.057508l0.64267-1.0351c0.019475-0.019169 0.058425-0.019169 0.058425 0zm-3.1744 1.6102h1.4801c0.03895 0 0.058425 0.038339 0.03895 0.057508l-0.75952 1.2652c-0.019475 0.019169-0.058425 0.019169-0.058425 0l-0.72057-1.2652c-0.019475-0.019169 0-0.057508 0.019475-0.057508zm-0.019475 3.623 0.68162-1.1502c0.019475-0.019169 0.058425-0.019169 0.058425 0l0.64267 1.1502c0.019475 0.019169 0 0.057508-0.03895 0.057508h-1.3048c-0.019475 0-0.03895-0.038339-0.03895-0.057508zm2.9602 1.6677-0.58425-1.0351c-0.019475-0.019169 0-0.057508 0.03895-0.057508h1.2074c0.03895 0 0.058425 0.038339 0.03895 0.057508l-0.64267 1.0351c-0.019475 0.019169-0.058425 0.019169-0.058425 0zm2.4928-2.9329 0.72057 1.2652c0.019475 0.019169 0 0.057508-0.03895 0.057508h-1.4801c-0.03895 0-0.058425-0.038339-0.03895-0.057508l0.75952-1.2652c0.019475-0.019169 0.058425-0.019169 0.0779 0z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/key_cutter-m.svg b/data/styles/default/dark/symbols/key_cutter-m.svg
index 4330b9277..be8e03f50 100644
--- a/data/styles/default/dark/symbols/key_cutter-m.svg
+++ b/data/styles/default/dark/symbols/key_cutter-m.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+ <circle cx="12" cy="12" r="11" fill="#6B425C"/>
  <circle cx="7.3333" cy="12" r="3.3332" fill="none" stroke="#000" stroke-width="2.667"/>
  <rect x="10.667" y="10.667" width="10.667" height="2.6667" fill="#000"/>
  <rect x="17.333" y="10.667" width="2.6667" height="5.3333" fill="#000"/>
diff --git a/data/styles/default/dark/symbols/kindergarten-m.svg b/data/styles/default/dark/symbols/kindergarten-m.svg
index 16fba1214..83c5ba463 100644
--- a/data/styles/default/dark/symbols/kindergarten-m.svg
+++ b/data/styles/default/dark/symbols/kindergarten-m.svg
@@ -3,10 +3,10 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="kindergarten-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle cx="12" cy="12" r="11" fill="#717065"/>
+   <circle cx="12" cy="12" r="11" fill="#51585E"/>
    <g id="rocking-horse" transform="translate(5 5)" fill="#000">
     <path id="Shape" d="m13.8626 3.04888-1.2195-1.80504.188399-.734152c.02507-.0978633.0081-.20177-.04692-.286562-.05502-.084793-.14298-.142652-.242621-.159578-.971498-.165211-1.8013-.0080664-2.46624.468918-1.24584.89373-1.53759 2.66831-1.64743 3.35502h-3.62742c-.219953 0-.443488.033496-.662949.09893-.186566-.601235-.742137-1.03863-1.39683-1.03863h-.451774c-.817058 0-1.4697.666777-1.4697 1.48386v3.30701c0 .138906.0735273.265508.19868.325691.049848.024008.100324.035738.153562.035738.080527 0 .15884-.026879.224109-.079051l1.04696-.952792c.261488 1.29968.659777 2.56479 1.02137 3.56792-.681543-.248774-1.24972-.573508-1.63775-.941746-.364574-.345707-.933051-.389512-1.35166-.104262-.273246.18632-.445102.482289-.471434.812055-.0260586.326074.0946094.641511.330914.865238.605117.573727 1.39918 1.04382 2.36012 1.39727 1.20332.44223 2.60879.675992 4.06451.675992 1.45548 0 2.86084-.233762 4.06421-.675992.960586-.353145 1.75459-.823184 2.3599-1.39705.236524-.223891.357192-.539356.331133-.86543-.02636-.329766-.19816-.625734-.471324-.812-.181289-.123648-.393203-.189-.612828-.189-.276719 0-.539028.104098-.738828.293262-.384235.36441-.944618.686519-1.61645.934308.55073-1.37189 1.10909-2.78819 1.10909-4.17968 0-1.58561.365039-1.96465.521965-2.05406.224082-.127613.540832.021383.71009.121762.297582.176094.673695.141395.935949-.08657l.371793-.323723c.306004-.266109.36586-.720644.138906-1.05766zm-7.13992 5.32314h.088867c.866004 0 .838934.809266.838934.875547v1.88962c-.578266.04613-1.19271.0458-1.77097-.00082v-1.8888c0-.03675-.024144-.875547.843172-.875547z"/>
-    <circle cx="11.372" cy="2.2748" r=".8" fill="#717065"/>
+    <circle cx="11.372" cy="2.2748" r=".8" fill="#51585E"/>
    </g>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/kiosk-m.svg b/data/styles/default/dark/symbols/kiosk-m.svg
index afa509458..b0579ec54 100644
--- a/data/styles/default/dark/symbols/kiosk-m.svg
+++ b/data/styles/default/dark/symbols/kiosk-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="kiosk-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <path id="Shape" d="m5 6v1.8462h14v-1.8462h-14zm1.8667 12h10.267v-8.3077h-10.267v8.3077zm5.6-6.4615h2.8v4.6154h-2.8v-4.6154zm-3.7333 0h2.8v4.6154h-2.8v-4.6154z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/language_school-m.svg b/data/styles/default/dark/symbols/language_school-m.svg
index 36c11290c..81787b2db 100644
--- a/data/styles/default/dark/symbols/language_school-m.svg
+++ b/data/styles/default/dark/symbols/language_school-m.svg
@@ -1,9 +1,9 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <g opacity="1">
   <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#717065"/>
+  <circle cx="12" cy="12" r="11" fill="#51585E"/>
   <path d="m9.571 8.8354h8c0.55 0 1 0.45 1 1v9l-2-2h-7c-0.55 0-1-0.45-1-1v-6c0-0.55 0.45-1 1-1zm0 7h7l1 1v-7h-8z" fill="#000" stroke-width=".50055"/>
-  <g fill="#000" stroke="#717065">
+  <g fill="#000" stroke="#51585E">
     <path d="m14.877 5.889h-8.4c-0.5775 0-1.05 0.47324-1.05 1.0516v9.4648l2.1-2.1033h7.35c0.5775 0 1.05-0.47324 1.05-1.0516v-6.3099c0-0.57841-0.4725-1.0516-1.05-1.0516z" stroke-width=".5"/>
     <path d="m7.787 8.74h5.3749" stroke-linecap="round"/>
     <path d="m7.787 10.894h2.8113" stroke-linecap="round" stroke-linejoin="round"/>
diff --git a/data/styles/default/dark/symbols/laundry-m.svg b/data/styles/default/dark/symbols/laundry-m.svg
index 364f11b1c..93798e975 100644
--- a/data/styles/default/dark/symbols/laundry-m.svg
+++ b/data/styles/default/dark/symbols/laundry-m.svg
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="9" cy="9" r="9" fill="#000" opacity=".6"/>
- <circle cx="9" cy="9" r="8.25" fill="#717065"/>
+ <circle cx="9" cy="9" r="8.25" fill="#51585E"/>
  <rect x="5" y="4" width="8" height="10" rx="1" ry="1" fill="#000"/>
- <circle cx="9" cy="10" r="3" fill="#717065"/>
+ <circle cx="9" cy="10" r="3" fill="#51585E"/>
  <path d="m7.584 11.416c0.78 0.78 2.052 0.78 2.832 0s0.78-2.052 0-2.832z" fill="#000"/>
- <circle cx="6.5" cy="5.5" r=".75" fill="#717065"/>
- <circle cx="8.5" cy="5.5" r=".75" fill="#717065"/>
+ <circle cx="6.5" cy="5.5" r=".75" fill="#51585E"/>
+ <circle cx="8.5" cy="5.5" r=".75" fill="#51585E"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/lawyer-m.svg b/data/styles/default/dark/symbols/lawyer-m.svg
index 405b1c6de..4f509880a 100644
--- a/data/styles/default/dark/symbols/lawyer-m.svg
+++ b/data/styles/default/dark/symbols/lawyer-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="lawyer-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#51585E"/>
    <path id="Shape" d="m5.6868 17.168h6.8678c0.37773 0 0.68678 0.30905 0.68678 0.68678 0 0.37773-0.30905 0.68678-0.68678 0.68678h-6.8678c-0.37773 0-0.68678-0.30905-0.68678-0.68678 0-0.37773 0.30905-0.68678 0.68678-0.68678zm2.2252-8.8801 1.9436-1.9436 8.7427 8.7427c0.53569 0.53569 0.53569 1.4079 0 1.9436s-1.4079 0.53569-1.9436 0l-8.7427-8.7427zm5.8308-3.8872 1.9436 1.9436c0.53569 0.53569 0.53569 1.4079 0 1.9436l-0.97523 0.97523-3.8803-3.8872 0.96836-0.96836c0.53569-0.54256 1.4079-0.54256 1.9436-0.0068678zm-6.7991 4.8555 3.8872 3.8872-0.96836 0.96836c-0.53569 0.53569-1.4079 0.53569-1.9436 0l-1.9436-1.9436c-0.53569-0.53569-0.53569-1.4079 0-1.9436l0.96836-0.96836z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/library-m.svg b/data/styles/default/dark/symbols/library-m.svg
index d3307ccaf..801f179c6 100644
--- a/data/styles/default/dark/symbols/library-m.svg
+++ b/data/styles/default/dark/symbols/library-m.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#717065"/>
+ <circle cx="12" cy="12" r="11" fill="#51585E"/>
  <circle cx="12" cy="5.0178" r="2.0777" fill="#000"/>
  <path d="m11.998 9.3405s-3-2.5714-6-0.42857v9.4286c3-2.1429 6 0 6 0s3-2.1429 6 0v-9.4286c-3-2.1429-6 0.42857-6 0.42857zm0 0v9" fill="none" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/lifeguard-m.svg b/data/styles/default/dark/symbols/lifeguard-m.svg
index 6c7df7619..92255fe5e 100644
--- a/data/styles/default/dark/symbols/lifeguard-m.svg
+++ b/data/styles/default/dark/symbols/lifeguard-m.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <path d="m6.6667 2.6667v1.6667l10.667 2.6667v-1.6667zm1.3333 3.3333v6h8v-4zm-1.3333 7.3333v1.3333h1.3333l-1.3333 6.6667h2l1.3333-6.6667h4l1.375 6.6667h2l-1.375-6.6667h1.3333v-1.3333z" fill="#C15746" opacity=".6"/>
+ <path d="m6.6667 2.6667v1.6667l10.667 2.6667v-1.6667zm1.3333 3.3333v6h8v-4zm-1.3333 7.3333v1.3333h1.3333l-1.3333 6.6667h2l1.3333-6.6667h4l1.375 6.6667h2l-1.375-6.6667h1.3333v-1.3333z" fill="#983E44" opacity=".6"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/locomotive-m.svg b/data/styles/default/dark/symbols/locomotive-m.svg
index d335b1f75..e936432e7 100644
--- a/data/styles/default/dark/symbols/locomotive-m.svg
+++ b/data/styles/default/dark/symbols/locomotive-m.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
 	<title>locomotive-m</title>
-	<path d="m13.789 8.0953h5.6461v7.5849h-0.99317q-0.19047-0.67345-0.75508-1.1156-0.56461-0.44216-1.2857-0.44216-0.63264 0-1.1768 0.36054-0.5442 0.36053-0.7959 0.99317h0.13605q0.21769-0.5238 0.71427-0.87073 0.49658-0.34694 1.1224-0.34694 0.72787 0 1.2857 0.47618 0.55781 0.47618 0.66665 1.1905h1.0816v1.1768h-1.2449q-0.2517 0.51699-0.73468 0.82311-0.48298 0.30612-1.0544 0.30612-0.58502 0-1.0646-0.30612-0.47958-0.30612-0.73128-0.82311h-0.38774q-0.2517 0.51699-0.73468 0.82311-0.48298 0.30612-1.0544 0.30612-0.57822 0-1.0578-0.30952-0.47957-0.30952-0.73126-0.8197h-0.40816q-0.09528 0.48298-0.48298 0.8061-0.38775 0.32312-0.89114 0.32312-0.50339 0-0.89114-0.31972-0.38774-0.31972-0.48299-0.8095h-0.027208v1.0952h-3.6666v-0.76188h0.51019l1.1836-1.7551h0.36734q0.32653-0.2381 0.54421-0.88773 0.21767-0.64965 0.21767-1.5204 0-0.82311-0.21087-1.483-0.21089-0.65985-0.55102-0.92515h0.60543l-1.0272-3.3196h3.9183l-1.0204 3.3196q0.38094 0.35373 0.59182 0.95576 0.21088 0.60202 0.21088 1.4387 0 0.72787-0.16326 1.2959-0.16326 0.56801-0.44216 0.91494l0.16326-0.02721q0.081624-0.01365 0.17006-0.01365h0.013654q0.23809-0.33332 0.38094-0.89454 0.14286-0.56121 0.14286-1.2551 0-0.87073-0.21768-1.5204-0.21768-0.64965-0.5442-0.88773h0.70066v-0.81631q0-0.2721 0.23129-0.45917 0.23129-0.18707 0.5374-0.18707 0.31292 0 0.5442 0.18707 0.23129 0.18707 0.23129 0.45917v0.81631h0.39454v-1.2925q0-0.2585 0.23129-0.44557 0.23129-0.18706 0.5374-0.18706 0.34013 0 0.55441 0.19387 0.21428 0.19387 0.21428 0.43876v1.2925h0.97957t0-2.7754zm2.6258 3.8162q0 0.15646 0.10544 0.2585 0.10544 0.10204 0.2551 0.10204h1.6122q0.15646 0 0.2585-0.10204 0.10204-0.10204 0.10204-0.2585v-2.7822q0-0.14966-0.10204-0.2551-0.10204-0.10544-0.2585-0.10544h-1.6122q-0.14965 0-0.2551 0.10544-0.10544 0.10544-0.10544 0.2551 0 0 0 2.7822zm3.7958-4.9727v0.89113h-7.1903v-0.89113h7.1903zm-14.728 4.0611q0.31973 0 0.58843 0.67006 0.26871 0.67005 0.26871 1.602 0 0.94555-0.26871 1.6122-0.2687 0.66665-0.58843 0.66665-0.31972 0-0.58843-0.66665-0.2687-0.66666-0.2687-1.6122 0-0.93195 0.2687-1.602 0.26871-0.67006 0.58843-0.67006zm8.1699 5.3536h-0.7823q-0.13605 0-0.23468-0.09859-0.09864-0.09869-0.09864-0.23469 0-0.13605 0.09864-0.23128 0.09863-0.09528 0.23468-0.09528h0.65305q-0.15646-0.30612-0.44217-0.49319-0.28571-0.18707-0.65305-0.18707-0.51019 0-0.87073 0.36393-0.36053 0.36394-0.36053 0.86733 0 0.51018 0.36053 0.87073 0.36054 0.36053 0.87073 0.36053 0.46938 0 0.82651-0.32652 0.35714-0.32653 0.39795-0.7959zm1.6598-0.65985h0.84352q0.13605 0 0.23129 0.09528 0.09524 0.09528 0.09524 0.23128 0 0.13605-0.09524 0.23469-0.09524 0.09859-0.23129 0.09859h-0.97277q0.04081 0.48298 0.39794 0.8027 0.35714 0.31972 0.82651 0.31972 0.51019 0 0.86733-0.36393 0.35713-0.36393 0.35713-0.86732 0-0.50339-0.35713-0.86733-0.35714-0.36393-0.86733-0.36393-0.36734 0-0.65304 0.18707-0.28571 0.18707-0.44217 0.49319zm-6.0203-9.0202h-3.8162l0.38776-0.90474h3.0271s0.40134 0.90474 0.40134 0.90474zm-4.1632 0.2653h4.5237v0.34012h-4.5237v-0.34012zm9.2719 8.5372q-0.24488-0.61904-0.78909-0.98638-0.54421-0.36734-1.1836-0.36734-0.73468 0-1.2993 0.44897-0.56461 0.44897-0.74147 1.1088h-0.73468q0.0748 0.05442 0.13945 0.11224 0.06466 0.05783 0.12584 0.13266h0.55102q0.12244-0.72107 0.67345-1.1938 0.551-0.47279 1.2857-0.47279 0.60543 0 1.0986 0.33333 0.49319 0.33332 0.73128 0.88433 0 0 0.14285 0zm-6.6053 0.44897q0.10884-0.13605 0.2585-0.24489h-0.59863v0.24489t0.34013 0z" fill="#717065" opacity=".6"/>
+	<path d="m13.789 8.0953h5.6461v7.5849h-0.99317q-0.19047-0.67345-0.75508-1.1156-0.56461-0.44216-1.2857-0.44216-0.63264 0-1.1768 0.36054-0.5442 0.36053-0.7959 0.99317h0.13605q0.21769-0.5238 0.71427-0.87073 0.49658-0.34694 1.1224-0.34694 0.72787 0 1.2857 0.47618 0.55781 0.47618 0.66665 1.1905h1.0816v1.1768h-1.2449q-0.2517 0.51699-0.73468 0.82311-0.48298 0.30612-1.0544 0.30612-0.58502 0-1.0646-0.30612-0.47958-0.30612-0.73128-0.82311h-0.38774q-0.2517 0.51699-0.73468 0.82311-0.48298 0.30612-1.0544 0.30612-0.57822 0-1.0578-0.30952-0.47957-0.30952-0.73126-0.8197h-0.40816q-0.09528 0.48298-0.48298 0.8061-0.38775 0.32312-0.89114 0.32312-0.50339 0-0.89114-0.31972-0.38774-0.31972-0.48299-0.8095h-0.027208v1.0952h-3.6666v-0.76188h0.51019l1.1836-1.7551h0.36734q0.32653-0.2381 0.54421-0.88773 0.21767-0.64965 0.21767-1.5204 0-0.82311-0.21087-1.483-0.21089-0.65985-0.55102-0.92515h0.60543l-1.0272-3.3196h3.9183l-1.0204 3.3196q0.38094 0.35373 0.59182 0.95576 0.21088 0.60202 0.21088 1.4387 0 0.72787-0.16326 1.2959-0.16326 0.56801-0.44216 0.91494l0.16326-0.02721q0.081624-0.01365 0.17006-0.01365h0.013654q0.23809-0.33332 0.38094-0.89454 0.14286-0.56121 0.14286-1.2551 0-0.87073-0.21768-1.5204-0.21768-0.64965-0.5442-0.88773h0.70066v-0.81631q0-0.2721 0.23129-0.45917 0.23129-0.18707 0.5374-0.18707 0.31292 0 0.5442 0.18707 0.23129 0.18707 0.23129 0.45917v0.81631h0.39454v-1.2925q0-0.2585 0.23129-0.44557 0.23129-0.18706 0.5374-0.18706 0.34013 0 0.55441 0.19387 0.21428 0.19387 0.21428 0.43876v1.2925h0.97957t0-2.7754zm2.6258 3.8162q0 0.15646 0.10544 0.2585 0.10544 0.10204 0.2551 0.10204h1.6122q0.15646 0 0.2585-0.10204 0.10204-0.10204 0.10204-0.2585v-2.7822q0-0.14966-0.10204-0.2551-0.10204-0.10544-0.2585-0.10544h-1.6122q-0.14965 0-0.2551 0.10544-0.10544 0.10544-0.10544 0.2551 0 0 0 2.7822zm3.7958-4.9727v0.89113h-7.1903v-0.89113h7.1903zm-14.728 4.0611q0.31973 0 0.58843 0.67006 0.26871 0.67005 0.26871 1.602 0 0.94555-0.26871 1.6122-0.2687 0.66665-0.58843 0.66665-0.31972 0-0.58843-0.66665-0.2687-0.66666-0.2687-1.6122 0-0.93195 0.2687-1.602 0.26871-0.67006 0.58843-0.67006zm8.1699 5.3536h-0.7823q-0.13605 0-0.23468-0.09859-0.09864-0.09869-0.09864-0.23469 0-0.13605 0.09864-0.23128 0.09863-0.09528 0.23468-0.09528h0.65305q-0.15646-0.30612-0.44217-0.49319-0.28571-0.18707-0.65305-0.18707-0.51019 0-0.87073 0.36393-0.36053 0.36394-0.36053 0.86733 0 0.51018 0.36053 0.87073 0.36054 0.36053 0.87073 0.36053 0.46938 0 0.82651-0.32652 0.35714-0.32653 0.39795-0.7959zm1.6598-0.65985h0.84352q0.13605 0 0.23129 0.09528 0.09524 0.09528 0.09524 0.23128 0 0.13605-0.09524 0.23469-0.09524 0.09859-0.23129 0.09859h-0.97277q0.04081 0.48298 0.39794 0.8027 0.35714 0.31972 0.82651 0.31972 0.51019 0 0.86733-0.36393 0.35713-0.36393 0.35713-0.86732 0-0.50339-0.35713-0.86733-0.35714-0.36393-0.86733-0.36393-0.36734 0-0.65304 0.18707-0.28571 0.18707-0.44217 0.49319zm-6.0203-9.0202h-3.8162l0.38776-0.90474h3.0271s0.40134 0.90474 0.40134 0.90474zm-4.1632 0.2653h4.5237v0.34012h-4.5237v-0.34012zm9.2719 8.5372q-0.24488-0.61904-0.78909-0.98638-0.54421-0.36734-1.1836-0.36734-0.73468 0-1.2993 0.44897-0.56461 0.44897-0.74147 1.1088h-0.73468q0.0748 0.05442 0.13945 0.11224 0.06466 0.05783 0.12584 0.13266h0.55102q0.12244-0.72107 0.67345-1.1938 0.551-0.47279 1.2857-0.47279 0.60543 0 1.0986 0.33333 0.49319 0.33332 0.73128 0.88433 0 0 0.14285 0zm-6.6053 0.44897q0.10884-0.13605 0.2585-0.24489h-0.59863v0.24489t0.34013 0z" fill="#51585E" opacity=".6"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/lottery-m.svg b/data/styles/default/dark/symbols/lottery-m.svg
index 46b7f9344..da2dff1c2 100644
--- a/data/styles/default/dark/symbols/lottery-m.svg
+++ b/data/styles/default/dark/symbols/lottery-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#8c5f93"/>
+ <circle cx="12" cy="12" r="11" fill="#6B425C"/>
  <path d="m12 3.9193a3.9424 3.9424 0 0 0-3.9423 3.9423 3.9424 3.9424 0 0 0 1.0463 2.6652c-0.34982-0.10167-0.71931-0.1574-1.1019-0.1574-2.1773 0-3.9423 1.7652-3.9423 3.9425 0 2.1773 1.765 3.9423 3.9423 3.9423 1.4688 0 2.7491-0.80382 3.4274-1.995-0.0032 0.06694-0.0081 0.13356-0.01438 0.19963-0.0067 0.07098-0.01495 0.14145-0.0249 0.21135-0.0099 0.0699-0.02167 0.13932-0.03479 0.20805-0.02623 0.13745-0.05862 0.27247-0.09701 0.40471-0.0384 0.13224-0.08277 0.26157-0.13265 0.38788-0.04987 0.12631-0.10528 0.24956-0.16598 0.36924-0.0607 0.11968-0.12664 0.23579-0.19749 0.34812-0.0635 0.10069-0.13227 0.19727-0.20342 0.29153-0.0082 0.0109-0.01527 0.02288-0.02357 0.03365-0.08033 0.10429-0.16523 0.20442-0.2544 0.29994-0.08918 0.09553-0.18263 0.18649-0.27998 0.27256-0.08994 0.07952-0.18393 0.15369-0.28031 0.22455l-3.29e-4 0.0019 5e-4 0.0013c-0.0038 0.0038-0.0086 0.0063-0.01235 0.01007-0.01477 0.01477-0.02801 0.03099-0.03973 0.04835-0.01172 0.01737-0.02173 0.03594-0.03003 0.05544-0.0082 0.01952-0.01477 0.03999-0.01913 0.06121-0.0044 0.02123-0.0066 0.04328-0.0066 0.06583 0 0.02256 0.0026 0.04461 0.0066 0.06583 0.0044 0.02123 0.0109 0.0417 0.01913 0.06121 0.0082 0.01952 0.01831 0.03808 0.03003 0.05544s0.02503 0.03358 0.03973 0.04835c0.01477 0.01477 0.03098 0.02801 0.04835 0.03973 0.01736 0.01172 0.03593 0.02193 0.05545 0.03022 0.01952 0.0082 0.03999 0.01464 0.06121 0.01895 0.02123 0.0044 0.04328 0.0066 0.06583 0.0066h4.1217c0.02256 0 0.04461-0.0026 0.06583-0.0066 0.02123-0.0044 0.0417-0.01071 0.06121-0.01895 0.01952-0.0082 0.03809-0.01844 0.05544-0.03022 0.01736-0.01172 0.03358-0.02496 0.04835-0.03973 0.01477-0.01476 0.0282-0.03098 0.03993-0.04835 0.01172-0.01737 0.02173-0.03593 0.03003-0.05544 0.0082-0.01952 0.01464-0.03999 0.01895-0.06121 0.0044-0.02123 0.0066-0.04328 0.0066-0.06583 0-0.02256-0.0026-0.04461-0.0066-0.06583-0.0044-0.02123-0.01071-0.0417-0.01895-0.06121-0.0082-0.01952-0.01831-0.03808-0.03003-0.05544s-0.02515-0.03358-0.03993-0.04835c-0.0038-0.0038-0.0083-0.0065-0.01223-0.01007l5.07e-4 -0.0013v-0.0019c-0.09648-0.07092-0.19076-0.14511-0.2808-0.22471-0.09735-0.08606-0.1908-0.17703-0.27998-0.27255-0.04771-0.05113-0.09088-0.10686-0.13612-0.16053-0.03928-0.04664-0.08094-0.09093-0.11829-0.13942-0.08034-0.10428-0.15601-0.21285-0.22686-0.32518-0.07085-0.11234-0.13679-0.22844-0.19749-0.34812-0.06071-0.11968-0.1161-0.24293-0.16597-0.36924-0.04987-0.12631-0.09426-0.25564-0.13265-0.38788-0.03841-0.13224-0.07092-0.26726-0.09718-0.40472-0.01311-0.06872-0.02465-0.13814-0.03466-0.20804-0.0099-0.0699-0.01838-0.14036-0.02509-0.21135-0.0063-0.06602-0.01084-0.13259-0.01419-0.19947 0.67831 1.1911 1.9587 1.9948 3.4274 1.9948 2.1773 0 3.9423-1.765 3.9423-3.9423s-1.765-3.9425-3.9423-3.9425c-0.38269 0-0.75224 0.0557-1.1021 0.1574a3.9424 3.9424 0 0 0 1.0465-2.6652 3.9424 3.9424 0 0 0-3.9425-3.9423z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/mail-m.svg b/data/styles/default/dark/symbols/mail-m.svg
index afb4171d9..621d1008b 100644
--- a/data/styles/default/dark/symbols/mail-m.svg
+++ b/data/styles/default/dark/symbols/mail-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="mail-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#51585E"/>
    <path id="Shape" d="m17.6 6h-11.2c-0.77 0-1.393 0.63-1.393 1.4l-7e-3 8.4c0 0.77 0.63 1.4 1.4 1.4h11.2c0.77 0 1.4-0.63 1.4-1.4v-8.4c0-0.77-0.63-1.4-1.4-1.4zm-0.28 2.975-4.949 3.094c-0.224 0.14-0.518 0.14-0.742 0l-4.949-3.094c-0.175-0.112-0.28-0.301-0.28-0.504 0-0.469 0.511-0.749 0.91-0.504l4.69 2.933 4.69-2.933c0.399-0.245 0.91 0.035 0.91 0.504 0 0.203-0.105 0.392-0.28 0.504z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/marina-m.svg b/data/styles/default/dark/symbols/marina-m.svg
index 16af65a1d..16ae7f5bf 100644
--- a/data/styles/default/dark/symbols/marina-m.svg
+++ b/data/styles/default/dark/symbols/marina-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="viewpoint-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#7F5933"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6E4426"/>
    <path id="Shape" d="m5.5116 12.152 5.7601-8.2584v8.2584h-5.7601m6.8401 0c0.97201-2.7 0.84241-6.3288 0-9 3.4272 1.1088 6.0481 5.328 6.0913 9h-6.0913m6.1921 2.5776c-0.2952 0.4608-0.64081 0.8568-1.044 1.1952-0.46801-0.2088-0.88561-0.5328-1.2168-0.8928-1.0728 1.3896-3.24 1.3896-4.3129 0-1.0584 1.3896-3.24 1.3896-4.2985 0-0.36 0.36-0.75601 0.684-1.224 0.8928-0.82081-0.6768-1.44-1.6416-1.656-2.6928h14.357c-0.1152 0.54-0.3168 1.0368-0.60481 1.4976m-0.1008 4.2624c-0.76321 0-1.4832-0.18-2.16-0.54-1.3248 0.72-2.988 0.72-4.3129 0-1.3248 0.72-2.988 0.72-4.2985 0-0.88561 0.4968-1.9008 0.576-2.88 0.54v-1.44c1.0152 0.036 1.9944-0.072 2.88-0.72 1.2528 0.9 3.0312 0.9 4.2985 0 1.2744 0.9 3.0456 0.9 4.3129 0 0.87121 0.648 1.8576 0.756 2.8656 0.72v1.44z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/marketplace-m.svg b/data/styles/default/dark/symbols/marketplace-m.svg
index d74d5ed23..76a397a27 100644
--- a/data/styles/default/dark/symbols/marketplace-m.svg
+++ b/data/styles/default/dark/symbols/marketplace-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="marketplace-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <path id="Shape" d="m6.6616 7.5253h10.677c0.41945 0 0.76263-0.34318 0.76263-0.76263s-0.34318-0.76263-0.76263-0.76263h-10.677c-0.41945 0-0.76263 0.34318-0.76263 0.76263s0.34318 0.76263 0.76263 0.76263zm11.561 1.3727c-0.068636-0.35081-0.38131-0.6101-0.74738-0.6101h-10.951c-0.36606 0-0.67874 0.25929-0.74738 0.6101l-0.76263 3.8131c-0.091515 0.47283 0.26692 0.91515 0.74738 0.91515h0.13727v3.8131c0 0.41945 0.34318 0.76263 0.76263 0.76263h6.101c0.41945 0 0.76263-0.34318 0.76263-0.76263v-3.8131h3.0505v3.8131c0 0.41945 0.34318 0.76263 0.76263 0.76263s0.76263-0.34318 0.76263-0.76263v-3.8131h0.13727c0.48046 0 0.83889-0.44232 0.74738-0.91515l-0.76263-3.8131zm-6.223 7.7788h-4.5758v-3.0505h4.5758v3.0505z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/media-m.svg b/data/styles/default/dark/symbols/media-m.svg
index dbd72bbbc..002387463 100644
--- a/data/styles/default/dark/symbols/media-m.svg
+++ b/data/styles/default/dark/symbols/media-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="media-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <path id="Shape" d="m16.333 6.6667v0.66667h-1.3333v-0.66667c0-0.36667-0.3-0.66667-0.66667-0.66667h-4c-0.36667 0-0.66667 0.3-0.66667 0.66667v0.66667h-1.3333v-0.66667c0-0.36667-0.3-0.66667-0.66667-0.66667-0.36667 0-0.66667 0.3-0.66667 0.66667v10.667c0 0.36667 0.3 0.66667 0.66667 0.66667 0.36667 0 0.66667-0.3 0.66667-0.66667v-0.66667h1.3333v0.66667c0 0.36667 0.3 0.66667 0.66667 0.66667h4c0.36667 0 0.66667-0.3 0.66667-0.66667v-0.66667h1.3333v0.66667c0 0.36667 0.3 0.66667 0.66667 0.66667s0.66667-0.3 0.66667-0.66667v-10.667c0-0.36667-0.3-0.66667-0.66667-0.66667s-0.66667 0.3-0.66667 0.66667zm-6.6667 8.6667h-1.3333v-1.3333h1.3333v1.3333zm0-2.6667h-1.3333v-1.3333h1.3333v1.3333zm0-2.6667h-1.3333v-1.3333h1.3333v1.3333zm6.6667 5.3333h-1.3333v-1.3333h1.3333v1.3333zm0-2.6667h-1.3333v-1.3333h1.3333v1.3333zm0-2.6667h-1.3333v-1.3333h1.3333v1.3333z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/metal_construction-m.svg b/data/styles/default/dark/symbols/metal_construction-m.svg
index 553648caa..47978b225 100644
--- a/data/styles/default/dark/symbols/metal_construction-m.svg
+++ b/data/styles/default/dark/symbols/metal_construction-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="metal_construction_night-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
 <path
          id="path1575"
          style="fill:#000000;stroke-width:1.08707"
diff --git a/data/styles/default/dark/symbols/mine-m.svg b/data/styles/default/dark/symbols/mine-m.svg
index d396f89f1..0d8e6427d 100644
--- a/data/styles/default/dark/symbols/mine-m.svg
+++ b/data/styles/default/dark/symbols/mine-m.svg
@@ -4,7 +4,7 @@
 	<g fill="none" fill-rule="evenodd">
 		<g id="lighthouse-m" fill-rule="nonzero">
 			<circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-			<circle cx="12" cy="12" r="11" fill="#717065"/>
+			<circle cx="12" cy="12" r="11" fill="#51585E"/>
 			<path d="m5.7595 17.085 1.3497 1.3666 4.9051-4.8838 4.8909 4.9205 1.4221-1.4347-4.9323-4.9148 2.5567-2.5098 2.5256 2.6017 0.36018-3.7884-0.85764-0.87215 0.2239-0.23261-1.3817-1.3775-0.26713 0.28171-1.6405-1.6448-2.129 2.1178 1.6472 1.6551-2.3981 2.4121-2.2711-2.2099 1.8381-1.8308-2.0878-2.0729-1.8191 1.8128-0.19464-0.2148-1.4079 1.4073 0.19381 0.20055-1.7855 1.7692 2.1041 2.0949 1.8021-1.806 2.2164 2.2599z" fill="#000" fill-rule="evenodd"/>
 		</g>
 	</g>
diff --git a/data/styles/default/dark/symbols/mobile_phone-m.svg b/data/styles/default/dark/symbols/mobile_phone-m.svg
index e626d10f9..1e7da6c19 100644
--- a/data/styles/default/dark/symbols/mobile_phone-m.svg
+++ b/data/styles/default/dark/symbols/mobile_phone-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="mobile_phone-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <path id="Shape" d="m14.286 6h-4.5714c-0.94857 0-1.7143 0.76571-1.7143 1.7143v9.1429c0 0.94857 0.76571 1.7143 1.7143 1.7143h4.5714c0.94857 0 1.7143-0.76571 1.7143-1.7143v-9.1429c0-0.94857-0.76571-1.7143-1.7143-1.7143zm-1.4286 11.429h-1.7143c-0.16 0-0.28571-0.12571-0.28571-0.28571s0.12571-0.28571 0.28571-0.28571h1.7143c0.16 0 0.28571 0.12571 0.28571 0.28571s-0.12571 0.28571-0.28571 0.28571zm2-1.7143h-5.7143v-8h5.7143v8z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/monument-m.svg b/data/styles/default/dark/symbols/monument-m.svg
index e9e7382ce..4c5be3f22 100644
--- a/data/styles/default/dark/symbols/monument-m.svg
+++ b/data/styles/default/dark/symbols/monument-m.svg
@@ -1,8 +1,8 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <title>monument-m</title>
- <g fill="#717065" fill-rule="evenodd">
-  <g id="monument-m" fill="#7f5933" fill-rule="nonzero">
-   <path id="Shape" d="m18.188 18.75h-12.375c-0.31078 0-0.5625 0.25172-0.5625 0.5625v1.125c0 0.31078 0.25172 0.5625 0.5625 0.5625h12.375c0.31078 0 0.5625-0.25172 0.5625-0.5625v-1.125c0-0.31078-0.25172-0.5625-0.5625-0.5625zm-2.7724-12.208c-0.025746-0.25838-0.14016-0.49987-0.32379-0.68344l-2.6937-2.6933c-0.21973-0.21973-0.57586-0.21973-0.79559 0l-2.693 2.6933c-0.18363 0.18357-0.29804 0.42507-0.32379 0.68344l-1.0853 11.083h9zm-1.7276 7.2584c0 0.225-0.225 0.45-0.45 0.45h-2.475c-0.225 0-0.45-0.225-0.45-0.45v-1.35c0-0.225 0.225-0.45 0.45-0.45h2.475c0.225 0 0.45 0.225 0.45 0.45z" fill="#717065" opacity=".6"/>
+ <g fill="#51585E" fill-rule="evenodd">
+  <g id="monument-m" fill="#6E4426" fill-rule="nonzero">
+   <path id="Shape" d="m18.188 18.75h-12.375c-0.31078 0-0.5625 0.25172-0.5625 0.5625v1.125c0 0.31078 0.25172 0.5625 0.5625 0.5625h12.375c0.31078 0 0.5625-0.25172 0.5625-0.5625v-1.125c0-0.31078-0.25172-0.5625-0.5625-0.5625zm-2.7724-12.208c-0.025746-0.25838-0.14016-0.49987-0.32379-0.68344l-2.6937-2.6933c-0.21973-0.21973-0.57586-0.21973-0.79559 0l-2.693 2.6933c-0.18363 0.18357-0.29804 0.42507-0.32379 0.68344l-1.0853 11.083h9zm-1.7276 7.2584c0 0.225-0.225 0.45-0.45 0.45h-2.475c-0.225 0-0.45-0.225-0.45-0.45v-1.35c0-0.225 0.225-0.45 0.45-0.45h2.475c0.225 0 0.45 0.225 0.45 0.45z" fill="#51585E" opacity=".6"/>
   </g>
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/monument-s.svg b/data/styles/default/dark/symbols/monument-s.svg
index 0390f3617..0343d4da3 100644
--- a/data/styles/default/dark/symbols/monument-s.svg
+++ b/data/styles/default/dark/symbols/monument-s.svg
@@ -2,7 +2,7 @@
  <title>monument-s</title>
  <g fill="none" fill-rule="evenodd">
   <g id="monument-s" fill-rule="nonzero">
-   <path id="Shape" d="m12.125 12.5h-8.25c-0.20719 0-0.375 0.16781-0.375 0.375v0.75c1e-7 0.20719 0.16781 0.375 0.375 0.375h8.25c0.20719 0 0.375-0.16781 0.375-0.375v-0.75c0-0.20719-0.16781-0.375-0.375-0.375zm-1.8483-8.1389c-0.017164-0.17225-0.093438-0.33324-0.21586-0.45563l-1.7958-1.7956c-0.14649-0.14648-0.38391-0.14648-0.53039 0l-1.7953 1.7956c-0.12242 0.12238-0.1987 0.28338-0.21586 0.45563l-0.72352 7.3889h6zm-1.1517 4.8389c0 0.15-0.15 0.3-0.3 0.3h-1.65c-0.15 0-0.3-0.15-0.3-0.3v-0.9c0-0.15 0.15-0.3 0.3-0.3h1.65c0.15 0 0.3 0.15 0.3 0.3z" fill="#717065" opacity=".6"/>
+   <path id="Shape" d="m12.125 12.5h-8.25c-0.20719 0-0.375 0.16781-0.375 0.375v0.75c1e-7 0.20719 0.16781 0.375 0.375 0.375h8.25c0.20719 0 0.375-0.16781 0.375-0.375v-0.75c0-0.20719-0.16781-0.375-0.375-0.375zm-1.8483-8.1389c-0.017164-0.17225-0.093438-0.33324-0.21586-0.45563l-1.7958-1.7956c-0.14649-0.14648-0.38391-0.14648-0.53039 0l-1.7953 1.7956c-0.12242 0.12238-0.1987 0.28338-0.21586 0.45563l-0.72352 7.3889h6zm-1.1517 4.8389c0 0.15-0.15 0.3-0.3 0.3h-1.65c-0.15 0-0.3-0.15-0.3-0.3v-0.9c0-0.15 0.15-0.3 0.3-0.3h1.65c0.15 0 0.3 0.15 0.3 0.3z" fill="#51585E" opacity=".6"/>
   </g>
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/mormon-m.svg b/data/styles/default/dark/symbols/mormon-m.svg
index 3c5d1458e..1c3fbbc26 100644
--- a/data/styles/default/dark/symbols/mormon-m.svg
+++ b/data/styles/default/dark/symbols/mormon-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#7F5933"/>
+ <circle cx="12" cy="12" r="11" fill="#6E4426"/>
  <path d="m6.5098 4.3652c-2.1517 1.2785-2.844 3.0927-2.8438 3.1777 6.883e-4 0.26114 2.0723 0.011719 2.0723 0.011719l3.2344 2.6758c0.018435 0.097823 0.036182 0.1918 0.050781 0.27539-0.32733 0.52842-0.87545 1.4154-1.7988 2.9062-1.7982 2.9031-1.839 3.5787-1.7402 3.9355 0.30387 1.098 1.675 1.5112 2.6113 2.0684 0.18125 1.0535 0.55812 2.3041 0.91602 3.1621a11 11 0 0 0 2.9883 0.42188 11 11 0 0 0 9.1777-4.9512c-0.79074-0.51771-1.5547-0.87109-1.5547-0.87109s-0.27422-0.27461-0.13672-0.41211 1.3203-0.68732 1.3203-1.0723 0.56776-1.1047 0-3.0508c-0.20398-0.69932-0.64682-1.1947-1.1699-1.5449-0.96244-0.64431-2.1993-0.7989-2.7324-0.83594-0.166-0.011548-0.26367-0.011719-0.26367-0.011719l-0.26758 0.3125c-0.23285 0.84251-0.78572 1.3438-0.80469 1.3477-0.85513 0.17466-1.031 0.16798-1.1172 0.21289-0.24402 0.12715-0.30357 0.32147-0.15234 0.47266 0.2187 0.24625 0.023459 0.47658-0.039062 0.41406-0.03753-0.03757-0.79621-0.70834-1.1172-0.98242l-1.1094-0.99024c-0.017733-0.15329-0.055517-0.31351-0.11523-0.47852-0.35055-0.96916-1.5879-1.5879-1.5879-1.5879-0.2401-0.14047-0.23424-0.019358-0.55859 0.046875l-2.9609-2.6445-0.30078-2.0078zm3.5488 7.8008c0.21136 0.11424 0.45408 0.1875 0.72656 0.1875 0.23314 0 0.4333-0.037448 0.60156-0.10352 0.12005 0.091678 0.24399 0.18795 0.37109 0.28516 0.71689 0.54817 1.5046 1.1529 1.8887 1.457-0.11494 0.18418-0.23633 0.40434-0.23633 0.51953 0 0.18426 0.59846 1.1211 1.5039 1.7598h-0.81641c-4.1e-5 0-3.599-0.064282-4.9414-0.080078-0.12706-0.12022-0.15178-0.30414-0.0078125-0.58008 0.65985-1.2647 0.91016-3.4434 0.91016-3.4434v-0.001953z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/mormon-s.svg b/data/styles/default/dark/symbols/mormon-s.svg
index 9b11e093e..a87841643 100644
--- a/data/styles/default/dark/symbols/mormon-s.svg
+++ b/data/styles/default/dark/symbols/mormon-s.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
  <circle cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
- <circle cx="8" cy="8" r="7" fill="#7F5933"/>
+ <circle cx="8" cy="8" r="7" fill="#6E4426"/>
  <path d="m4.5062 3.1415c-1.3693 0.81359-1.8098 1.9681-1.8097 2.0222 4.38e-4 0.16618 1.3187 0.0075 1.3187 0.0075l2.0583 1.7028c0.011735 0.06225 0.023024 0.12206 0.032315 0.17525-0.2083 0.33627-0.5571 0.90071-1.1447 1.8494-1.1443 1.8474-1.1703 2.2774-1.1074 2.5044 0.19337 0.69873 1.0659 0.96167 1.6617 1.3163 0.11534 0.67041 0.35517 1.4662 0.58292 2.0122a7 7 0 0 0 1.9016 0.26847 7 7 0 0 0 5.8404-3.1508c-0.5032-0.32945-0.98935-0.55433-0.98935-0.55433s-0.1745-0.17475-0.087-0.26225c0.0875-0.0875 0.84019-0.43738 0.84019-0.68237 0-0.24499 0.3613-0.70299 0-1.9414-0.1298-0.44502-0.41161-0.76026-0.74448-0.98312-0.61246-0.41002-1.3996-0.50839-1.7388-0.53196-0.10564-0.0074-0.16779-0.0075-0.16779-0.0075l-0.17028 0.19886c-0.14818 0.53614-0.5 0.85515-0.51208 0.85763-0.54417 0.11115-0.65609 0.1069-0.71095 0.13548-0.15528 0.080914-0.19318 0.20457-0.09694 0.30078 0.13917 0.1567 0.01493 0.30328-0.02486 0.26349-0.02388-0.023908-0.50668-0.45076-0.71094-0.62518l-0.70598-0.63015c-0.01128-0.097548-0.03533-0.19951-0.07333-0.30451-0.22308-0.61674-1.0105-1.0105-1.0105-1.0105-0.15279-0.08939-0.14906-0.01232-0.35547 0.02983l-1.8842-1.6829-0.19141-1.2777zm2.2583 4.9641c0.1345 0.072698 0.28896 0.11932 0.46236 0.11932 0.14836 0 0.27574-0.023832 0.38281-0.065876 0.07639 0.058342 0.15527 0.1196 0.23615 0.18147 0.4562 0.34884 0.95747 0.73366 1.2019 0.92718-0.07314 0.11721-0.15039 0.25731-0.15039 0.33061 0 0.11726 0.38084 0.71343 0.95703 1.1199h-0.51953c-2.6e-5 0-2.2903-0.04091-3.1445-0.05096-0.080856-0.0765-0.096587-0.19354-0.00496-0.36914 0.4199-0.80481 0.57919-2.1913 0.57919-2.1913v-0.00127z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/motorcycle-parking-m.svg b/data/styles/default/dark/symbols/motorcycle-parking-m.svg
index 55931928c..3d137a7df 100644
--- a/data/styles/default/dark/symbols/motorcycle-parking-m.svg
+++ b/data/styles/default/dark/symbols/motorcycle-parking-m.svg
@@ -1 +1 @@
-<svg viewBox="0 0 26 26" width="18" height="18" xmlns="http://www.w3.org/2000/svg"><path d="M11.131 4.85a2.557 2.557 0 0 0-2.54 2.54c0 .944.617 1.62 1.394 2.057l-1.337.666-.796-.798-.015-.013a2.52 2.52 0 0 0-1.766-.71H2.714a2.555 2.555 0 0 0-2.54 2.536c0 .77.391 1.405.943 1.873-.742 1.156-1.14 2.555-.799 4.042a5.268 5.268 0 0 0 3.965 3.965c2.377.544 4.586-.638 5.736-2.512.577.395 1.184.783 1.889.783h.942c1.138 0 2.166-.616 2.812-1.547.635 1.598 1.881 2.89 3.592 3.282l.003.003h.003c3.393.767 6.567-1.875 6.567-5.21 0-2.575-1.894-4.646-4.331-5.14.3-.416.589-.862.589-1.409v-.353c0-1.82-2.054-3.09-3.683-2.264l-1.09.544-1.556-1.556-.006-.003a2.46 2.46 0 0 0-1.813-.777z" fill="#111" opacity=".6"/><path d="M20.482 12.064c-.168 0-.337.028-.496.047l-1.926-1.917h1.487a.938.938 0 0 0 .935-.936v-.355a.933.933 0 0 0-1.356-.832l-2.132 1.066-2.404-2.404a.913.913 0 0 0-.655-.28H11.13c-.514 0-.935.42-.935.935s.421.935.935.935h2.03c.252 0 .486.103.664.271l1.599 1.6H12.29c-.15 0-.29.037-.421.102l-2.937 1.469a.925.925 0 0 1-1.075-.178l-1.122-1.122a.983.983 0 0 0-.664-.272H2.712a.938.938 0 0 0-.935.936c0 .514.42.935.935.935h2.806a3.74 3.74 0 0 0-3.638 4.62 3.704 3.704 0 0 0 2.759 2.76 3.74 3.74 0 0 0 4.62-3.639l1.319 1.319c.355.355.832.552 1.328.552h.944c.673 0 1.29-.356 1.627-.945l2.722-4.76.945.944a3.716 3.716 0 0 0-1.291 3.788 3.734 3.734 0 0 0 2.759 2.75 3.751 3.751 0 0 0 4.61-3.648 3.74 3.74 0 0 0-3.74-3.741zM5.518 17.676a1.876 1.876 0 0 1-1.87-1.871c0-1.029.841-1.87 1.87-1.87 1.029 0 1.87.841 1.87 1.87 0 1.029-.841 1.87-1.87 1.87zm14.964 0a1.876 1.876 0 0 1-1.87-1.871c0-1.029.841-1.87 1.87-1.87 1.029 0 1.87.841 1.87 1.87 0 1.029-.841 1.87-1.87 1.87z" fill="#2e89b0"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 26 26" width="18" height="18" xmlns="http://www.w3.org/2000/svg"><path d="M11.131 4.85a2.557 2.557 0 0 0-2.54 2.54c0 .944.617 1.62 1.394 2.057l-1.337.666-.796-.798-.015-.013a2.52 2.52 0 0 0-1.766-.71H2.714a2.555 2.555 0 0 0-2.54 2.536c0 .77.391 1.405.943 1.873-.742 1.156-1.14 2.555-.799 4.042a5.268 5.268 0 0 0 3.965 3.965c2.377.544 4.586-.638 5.736-2.512.577.395 1.184.783 1.889.783h.942c1.138 0 2.166-.616 2.812-1.547.635 1.598 1.881 2.89 3.592 3.282l.003.003h.003c3.393.767 6.567-1.875 6.567-5.21 0-2.575-1.894-4.646-4.331-5.14.3-.416.589-.862.589-1.409v-.353c0-1.82-2.054-3.09-3.683-2.264l-1.09.544-1.556-1.556-.006-.003a2.46 2.46 0 0 0-1.813-.777z" fill="#111" opacity=".6"/><path d="M20.482 12.064c-.168 0-.337.028-.496.047l-1.926-1.917h1.487a.938.938 0 0 0 .935-.936v-.355a.933.933 0 0 0-1.356-.832l-2.132 1.066-2.404-2.404a.913.913 0 0 0-.655-.28H11.13c-.514 0-.935.42-.935.935s.421.935.935.935h2.03c.252 0 .486.103.664.271l1.599 1.6H12.29c-.15 0-.29.037-.421.102l-2.937 1.469a.925.925 0 0 1-1.075-.178l-1.122-1.122a.983.983 0 0 0-.664-.272H2.712a.938.938 0 0 0-.935.936c0 .514.42.935.935.935h2.806a3.74 3.74 0 0 0-3.638 4.62 3.704 3.704 0 0 0 2.759 2.76 3.74 3.74 0 0 0 4.62-3.639l1.319 1.319c.355.355.832.552 1.328.552h.944c.673 0 1.29-.356 1.627-.945l2.722-4.76.945.944a3.716 3.716 0 0 0-1.291 3.788 3.734 3.734 0 0 0 2.759 2.75 3.751 3.751 0 0 0 4.61-3.648 3.74 3.74 0 0 0-3.74-3.741zM5.518 17.676a1.876 1.876 0 0 1-1.87-1.871c0-1.029.841-1.87 1.87-1.87 1.029 0 1.87.841 1.87 1.87 0 1.029-.841 1.87-1.87 1.87zm14.964 0a1.876 1.876 0 0 1-1.87-1.871c0-1.029.841-1.87 1.87-1.87 1.029 0 1.87.841 1.87 1.87 0 1.029-.841 1.87-1.87 1.87z" fill="#20607C"/></svg>
\ No newline at end of file
diff --git a/data/styles/default/dark/symbols/motorcycle_rental-m.svg b/data/styles/default/dark/symbols/motorcycle_rental-m.svg
index 26ddbf449..46596c0bd 100644
--- a/data/styles/default/dark/symbols/motorcycle_rental-m.svg
+++ b/data/styles/default/dark/symbols/motorcycle_rental-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="car_sharing-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#51585E"/>
    <path transform="translate(2,2)" d="m9.0974 3.7509c-0.324-0.90257-1.1803-1.5429-2.1831-1.5429-1.2806 0-2.3143 1.0337-2.3143 2.3143 0 1.2729 1.0337 2.3143 2.3143 2.3143 1.0029 0 1.8591-0.648 2.1831-1.5429h3.9883v1.5429h1.5429v-1.5429h0.77142v-1.5429zm-2.1831 1.5429c-0.42429 0-0.77143-0.34714-0.77143-0.77143s0.34714-0.77143 0.77143-0.77143 0.77143 0.34714 0.77143 0.77143-0.34714 0.77143-0.77143 0.77143z" fill="#000"/>
    <path transform="translate(0,2)" d="m16.667 11.5c-0.105 0-0.21 0.0175-0.30917 0.029167l-1.2017-1.1958h0.9275c0.32083 0 0.58333-0.2625 0.58333-0.58333v-0.22167c0-0.43167-0.455-0.7175-0.84583-0.51917l-1.33 0.665-1.4992-1.4992c-0.105-0.11083-0.25667-0.175-0.40833-0.175h-1.75c-0.32083 0-0.58333 0.2625-0.58333 0.58333 0 0.32083 0.2625 0.58333 0.58333 0.58333h1.2658c0.1575 0 0.30333 0.064167 0.41417 0.16917l0.9975 0.9975h-1.9542c-0.093333 0-0.18083 0.023333-0.2625 0.064167l-1.8317 0.91583c-0.22167 0.11083-0.49583 0.07-0.67083-0.11083l-0.7-0.7c-0.11083-0.105-0.2625-0.16917-0.41417-0.16917h-2.0942c-0.32083 0-0.58333 0.2625-0.58333 0.58333 0 0.32083 0.2625 0.58333 0.58333 0.58333h1.75c-1.47 0-2.6192 1.3533-2.2692 2.8817 0.1925 0.84583 0.875 1.5283 1.7208 1.7208 1.5283 0.35 2.8817-0.79917 2.8817-2.2692l0.8225 0.8225c0.22167 0.22167 0.51917 0.34417 0.82833 0.34417h0.58917c0.42 0 0.805-0.22167 1.015-0.58917l1.6975-2.9692 0.58917 0.58917c-0.65917 0.53083-1.0267 1.4058-0.805 2.3625 0.19833 0.84 0.88083 1.5225 1.7208 1.715 1.5225 0.34417 2.8758-0.81083 2.8758-2.275 0-1.2892-1.0442-2.3333-2.3333-2.3333zm-9.3333 3.5c-0.64167 0-1.1667-0.525-1.1667-1.1667 0-0.64167 0.525-1.1667 1.1667-1.1667 0.64167 0 1.1667 0.525 1.1667 1.1667 0 0.64167-0.525 1.1667-1.1667 1.1667zm9.3333 0c-0.64167 0-1.1667-0.525-1.1667-1.1667 0-0.64167 0.525-1.1667 1.1667-1.1667 0.64167 0 1.1667 0.525 1.1667 1.1667 0 0.64167-0.525 1.1667-1.1667 1.1667z" fill="#000"/>
   </g>
diff --git a/data/styles/default/dark/symbols/motorcycle_repair-m.svg b/data/styles/default/dark/symbols/motorcycle_repair-m.svg
index 1a22dfa13..5023229de 100644
--- a/data/styles/default/dark/symbols/motorcycle_repair-m.svg
+++ b/data/styles/default/dark/symbols/motorcycle_repair-m.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
 	<path d="m12 24c6.6274 0 12-5.3726 12-12 0-6.6274-5.3726-12-12-12-6.6274 0-12 5.3726-12 12 0 6.6274 5.3726 12 12 12z" fill="#000" opacity=".6"/>
-	<path d="m12 23c6.0751 0 11-4.9249 11-11s-4.9248-11-11-11c-6.0751 0-11 4.9248-11 11s4.9248 11 11 11z" fill="#717065"/>
+	<path d="m12 23c6.0751 0 11-4.9249 11-11s-4.9248-11-11-11c-6.0751 0-11 4.9248-11 11s4.9248 11 11 11z" fill="#51585E"/>
 	<path d="m5.0001 16.197c0 0.46421 0.38683 0.85108 0.85105 0.85108h5.1664v1.7278c0 0.47284 0.38686 0.85108 0.85108 0.85108h0.0086c0.47273 0 0.85108-0.38686 0.85108-0.85108v-1.7278h5.1664c0.47284 0 0.85108-0.38686 0.85108-0.85108 0-0.47285-0.38686-0.85108-0.85108-0.85108h-12.044c-0.46421-0.0085-0.85115 0.37823-0.85115 0.85108z" fill="#000"/>
 	<path d="m17.445 9.0834c-0.1225 0-0.245 0.020417-0.36073 0.034066l-1.402-1.3951h1.0821c0.37426 0 0.68051-0.30625 0.68051-0.68055v-0.25861c0-0.50361-0.53083-0.83708-0.98676-0.60569l-1.5517 0.77583-1.749-1.749c-0.1225-0.1293-0.29948-0.20416-0.47634-0.20416h-2.0416c-0.37438 0-0.68063 0.30625-0.68063 0.68055s0.30625 0.68055 0.68063 0.68055h1.4768c0.18375 0 0.35385 0.074864 0.48311 0.19736l1.1637 1.1637h-2.2799c-0.10885 0-0.21093 0.027218-0.30625 0.074864l-2.1369 1.0684c-0.25861 0.12938-0.57846 0.081666-0.78263-0.12927l-0.81666-0.81666c-0.1293-0.1225-0.30625-0.19736-0.48319-0.19736h-2.4432c-0.3743 0-0.68055 0.30625-0.68055 0.68055 0 0.37431 0.30625 0.68056 0.68055 0.68056h2.0416c-1.715 0-3.0557 1.5788-2.6474 3.362 0.22458 0.98676 1.0208 1.783 2.0076 2.0076 1.783 0.40833 3.362-0.93239 3.362-2.6474l0.95954 0.95957c0.25865 0.25865 0.60573 0.40156 0.96646 0.40156h0.68728c0.49 0 0.93916-0.25865 1.1842-0.68739l1.9804-3.464 0.68739 0.68739c-0.76906 0.61926-1.1978 1.6401-0.93916 2.7562 0.23135 0.97999 1.0276 1.7762 2.0076 2.0008 1.7762 0.40145 3.3551-0.94604 3.3551-2.6541 0-1.5041-1.2179-2.7222-2.7218-2.7222zm-10.889 4.0833c-0.74861 0-1.3611-0.61249-1.3611-1.3611s0.61249-1.3611 1.3611-1.3611c0.74861 0 1.3611 0.61249 1.3611 1.3611s-0.61249 1.3611-1.3611 1.3611zm10.889 0c-0.74864 0-1.3611-0.61249-1.3611-1.3611s0.61249-1.3611 1.3611-1.3611c0.74853 0 1.3611 0.61249 1.3611 1.3611s-0.61249 1.3611-1.3611 1.3611z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/motorcycle_shop-m.svg b/data/styles/default/dark/symbols/motorcycle_shop-m.svg
index 5210bdcea..0661d7b9f 100644
--- a/data/styles/default/dark/symbols/motorcycle_shop-m.svg
+++ b/data/styles/default/dark/symbols/motorcycle_shop-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="motorcycle_shop-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <path id="Shape" d="m16.667 11.5c-0.105 0-0.21 0.0175-0.30917 0.029167l-1.2017-1.1958h0.9275c0.32083 0 0.58333-0.2625 0.58333-0.58333v-0.22167c0-0.43167-0.455-0.7175-0.84583-0.51917l-1.33 0.665-1.4992-1.4992c-0.105-0.11083-0.25667-0.175-0.40833-0.175h-1.75c-0.32083 0-0.58333 0.2625-0.58333 0.58333 0 0.32083 0.2625 0.58333 0.58333 0.58333h1.2658c0.1575 0 0.30333 0.064167 0.41417 0.16917l0.9975 0.9975h-1.9542c-0.093333 0-0.18083 0.023333-0.2625 0.064167l-1.8317 0.91583c-0.22167 0.11083-0.49583 0.07-0.67083-0.11083l-0.7-0.7c-0.11083-0.105-0.2625-0.16917-0.41417-0.16917h-2.0942c-0.32083 0-0.58333 0.2625-0.58333 0.58333 0 0.32083 0.2625 0.58333 0.58333 0.58333h1.75c-1.47 0-2.6192 1.3533-2.2692 2.8817 0.1925 0.84583 0.875 1.5283 1.7208 1.7208 1.5283 0.35 2.8817-0.79917 2.8817-2.2692l0.8225 0.8225c0.22167 0.22167 0.51917 0.34417 0.82833 0.34417h0.58917c0.42 0 0.805-0.22167 1.015-0.58917l1.6975-2.9692 0.58917 0.58917c-0.65917 0.53083-1.0267 1.4058-0.805 2.3625 0.19833 0.84 0.88083 1.5225 1.7208 1.715 1.5225 0.34417 2.8758-0.81083 2.8758-2.275 0-1.2892-1.0442-2.3333-2.3333-2.3333zm-9.3333 3.5c-0.64167 0-1.1667-0.525-1.1667-1.1667 0-0.64167 0.525-1.1667 1.1667-1.1667 0.64167 0 1.1667 0.525 1.1667 1.1667 0 0.64167-0.525 1.1667-1.1667 1.1667zm9.3333 0c-0.64167 0-1.1667-0.525-1.1667-1.1667 0-0.64167 0.525-1.1667 1.1667-1.1667 0.64167 0 1.1667 0.525 1.1667 1.1667 0 0.64167-0.525 1.1667-1.1667 1.1667z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/museum-m.svg b/data/styles/default/dark/symbols/museum-m.svg
index 39a967ccc..ab2c0be7f 100644
--- a/data/styles/default/dark/symbols/museum-m.svg
+++ b/data/styles/default/dark/symbols/museum-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" transform="scale(1.5)" fill="none" fill-rule="evenodd" opacity="1">
   <g id="museum-m" fill-rule="nonzero">
    <circle id="Oval" cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
-   <circle cx="8" cy="8" r="7.3333" fill="#7f5933"/>
+   <circle cx="8" cy="8" r="7.3333" fill="#6E4426"/>
    <path id="Shape" d="m3.4644 5.4802 4.5356-2.0158 4.5356 2.0158v1.0079h-1.0079v5.0396h1.0079v1.0079h-9.0712v-1.0079h1.0079v-5.0396h-1.0079zm2.419 1.0079v5.0396h1.4111v-5.0396zm2.9229 0v5.0396h1.4111v-5.0396z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/museum-s.svg b/data/styles/default/dark/symbols/museum-s.svg
index f1aae8660..aa3fdbf45 100644
--- a/data/styles/default/dark/symbols/museum-s.svg
+++ b/data/styles/default/dark/symbols/museum-s.svg
@@ -1,7 +1,7 @@
 <svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
  <g fill-rule="evenodd" opacity="1">
   <circle cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
-  <circle cx="8" cy="8" r="7" fill="#7f5933"/>
+  <circle cx="8" cy="8" r="7" fill="#6E4426"/>
   <path d="m4 5.7778 4-1.7778 4 1.7778v0.88889h-0.88889v4.4444h0.88889v0.88889h-8v-0.88889h0.88889v-4.4444h-0.88889v-0.88889zm2.1333 0.88889v4.4444h1.2444v-4.4444h-1.2444zm2.5778 0v4.4444h1.2444v-4.4444h-1.2444z" fill="#000"/>
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/music-m.svg b/data/styles/default/dark/symbols/music-m.svg
index 6ae312a29..84626ca03 100644
--- a/data/styles/default/dark/symbols/music-m.svg
+++ b/data/styles/default/dark/symbols/music-m.svg
@@ -1,5 +1,5 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
   <path d="m18.289 5.5406c0.20956 0.15523 0.33374 0.40359 0.33374 0.6649v8.6928c0 1.1435-1.1125 2.0697-2.4837 2.0697s-2.4837-0.9262-2.4837-2.0697 1.1125-2.0697 2.4837-2.0697c0.28976 0 0.56917 0.04136 0.82789 0.11901v-3.7669l-6.6231 1.9869v5.3864c0 1.1435-1.1125 2.0697-2.4837 2.0697s-2.4837-0.9262-2.4837-2.0697 1.1125-2.0697 2.4837-2.0697c0.28976 0 0.56917 0.04136 0.82789 0.11901v-5.9142c0-0.36479 0.2406-0.68818 0.58987-0.79426l8.2789-2.4837c0.25095-0.075029 0.5226-0.02848 0.73216 0.12936z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/music_school-m.svg b/data/styles/default/dark/symbols/music_school-m.svg
index 58d388ef2..b2492818f 100644
--- a/data/styles/default/dark/symbols/music_school-m.svg
+++ b/data/styles/default/dark/symbols/music_school-m.svg
@@ -1,7 +1,7 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <g opacity="1">
   <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#717065"/>
+  <circle cx="12" cy="12" r="11" fill="#51585E"/>
   <path d="m18.289 5.5406c0.20956 0.15523 0.33374 0.40359 0.33374 0.6649v8.6928c0 1.1435-1.1125 2.0697-2.4837 2.0697s-2.4837-0.9262-2.4837-2.0697 1.1125-2.0697 2.4837-2.0697c0.28976 0 0.56917 0.04136 0.82789 0.11901v-3.7669l-6.6231 1.9869v5.3864c0 1.1435-1.1125 2.0697-2.4837 2.0697s-2.4837-0.9262-2.4837-2.0697 1.1125-2.0697 2.4837-2.0697c0.28976 0 0.56917 0.04136 0.82789 0.11901v-5.9142c0-0.36479 0.2406-0.68818 0.58987-0.79426l8.2789-2.4837c0.25095-0.075029 0.5226-0.02848 0.73216 0.12936z" fill="#000"/>
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/musical-instrument-m.svg b/data/styles/default/dark/symbols/musical-instrument-m.svg
index 989baf55b..e38e7d694 100644
--- a/data/styles/default/dark/symbols/musical-instrument-m.svg
+++ b/data/styles/default/dark/symbols/musical-instrument-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd">
   <g id="music-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity="0.6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <path id="Shape" d="m18.743 6.4923-1.236-1.236c-0.34181-0.34181-0.8969-0.34181-1.2387 0l-1.8567 1.8567c-0.34181 0.34181-0.34181 0.8969 0 1.2387l-1.4821 1.4793c-1.2414-0.79299-2.7454-0.79026-3.6505 0.11485-0.26524 0.26524-0.44845 0.57971-0.56056 0.92698-0.1668 0.51408-0.6426 0.90511-1.1676 0.95433-0.65627 0.062893-1.2661 0.3172-1.7336 0.78753-1.2633 1.2606-1.0364 3.5302 0.50041 5.067 1.5368 1.5368 3.8064 1.761 5.067 0.50041 0.47033-0.46759 0.72463-1.0774 0.78753-1.7364 0.04922-0.52228 0.44025-1.0008 0.95433-1.1676 0.34728-0.11211 0.66174-0.29532 0.92698-0.56056 0.90511-0.90511 0.90511-2.4091 0.11485-3.6505l1.4821-1.4821c0.34181 0.34181 0.8969 0.34181 1.2387 0l1.8567-1.8567c0.33907-0.33907 0.33907-0.89417-0.0027344-1.236zm-8.0557 8.1323c-0.72463 0-1.3125-0.58791-1.3125-1.3125 0-0.72463 0.58791-1.3125 1.3125-1.3125 0.72463 0 1.3125 0.58791 1.3125 1.3125 0 0.72463-0.58791 1.3125-1.3125 1.3125z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/muslim-m.svg b/data/styles/default/dark/symbols/muslim-m.svg
index 638776de6..2d413b347 100644
--- a/data/styles/default/dark/symbols/muslim-m.svg
+++ b/data/styles/default/dark/symbols/muslim-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="muslim-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#7F5933"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6E4426"/>
    <path id="Shape" d="m15.477 11.959-1.0329-0.6972h1.3206l0.45715-1.1077 0.45715 1.1077h1.3206l-1.0329 0.6972 0.58845 1.4259-1.3296-0.92308-1.337 0.92308 0.58845-1.4259zm-0.05983-4.6682c-0.57389-0.23685-1.2027-0.36746-1.862-0.36746-2.6946 0-4.8889 2.1931-4.8889 4.8985v0.35691c0 2.7077 2.1888 4.8985 4.8889 4.8985 0.65946 0 1.289-0.13136 1.8637-0.36944-0.99464 0.80809-2.2626 1.2925-3.6414 1.2925-3.191 0-5.7778-2.589-5.7778-5.7715v-0.45693c0-3.1875 2.5933-5.7715 5.7778-5.7715 1.3796 0 2.6462 0.48393 3.6397 1.2905z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/muslim-s.svg b/data/styles/default/dark/symbols/muslim-s.svg
index a5a00a00d..3475bdd28 100644
--- a/data/styles/default/dark/symbols/muslim-s.svg
+++ b/data/styles/default/dark/symbols/muslim-s.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="muslim-s" fill-rule="nonzero">
    <circle id="Oval" cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="8" cy="8" r="7.3333" fill="#7F5933"/>
+   <circle id="Oval" cx="8" cy="8" r="7.3333" fill="#6E4426"/>
    <path id="Shape" d="m10.318 7.9725-0.6886-0.4648h0.88042l0.30476-0.73847 0.30476 0.73847h0.88042l-0.6886 0.4648 0.3923 0.95058-0.88643-0.61538-0.89135 0.61538 0.3923-0.95058zm-0.039886-3.1121c-0.3826-0.1579-0.80179-0.24497-1.2413-0.24497-1.7964 0-3.2593 1.4621-3.2593 3.2656v0.23794c0 1.8052 1.4592 3.2656 3.2593 3.2656 0.43964 0 0.8593-0.087573 1.2424-0.24629-0.66309 0.53873-1.5084 0.86168-2.4276 0.86168-2.1273 0-3.8519-1.726-3.8519-3.8477v-0.30462c0-2.125 1.7289-3.8477 3.8519-3.8477 0.91972 0 1.7642 0.32262 2.4265 0.86036z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/needle_and_thread-m.svg b/data/styles/default/dark/symbols/needle_and_thread-m.svg
index 6fa78cba5..c6fe23696 100644
--- a/data/styles/default/dark/symbols/needle_and_thread-m.svg
+++ b/data/styles/default/dark/symbols/needle_and_thread-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#8c5f93"/>
+ <circle cx="12" cy="12" r="11" fill="#6B425C"/>
  <path d="m18.806 5.001c-0.3012-0.4062-0.9168-0.7272-1.5816-0.8382 0.1008-0.4476-0.08761-0.9264-0.5076-1.1682-0.5124-0.297-1.1706-0.1212-1.467 0.393-0.0588 0.1014-0.4446 0.855-1.0212 1.9884-0.9876-0.2124-1.9662-0.408-2.775-0.4776-0.7692-0.0666-1.8096-0.072001-1.9656 0.648-0.2124 0.9786 1.2186 2.1882 2.8878 3.4794-0.3708 0.7326-0.7578 1.4976-1.1502 2.2728-1.29-0.606-2.3424-0.975-2.808-0.4926-0.651 0.6744-0.076199 1.6524 0.588 2.7852 0.1896 0.3228 0.3846 0.6558 0.5586 0.9936-1.755 3.4704-3.2358 6.4038-3.2358 6.4038s1.629-2.487 3.6198-5.5302c0.3216 0.9216 0.3336 1.8504-0.486 2.6976-0.068395 0.0708-0.0666 0.1842 0.00423 0.2532 0.011343 0.01016 0.022804 0.0192 0.035399 0.0258 0.069596 0.0396 0.1602 0.02941 0.2178-0.03059 1.0248-1.0602 0.9138-2.2212 0.4704-3.3168 0.627-0.9588 1.2834-1.9626 1.9326-2.9568 0.01388 0.0073 0.02759 0.01388 0.04021 0.0204 1.8804 0.9294 3.6558 1.8072 4.1646 0.8946 0.5028-0.8994-0.8958-2.1096-2.5746-3.4122 0.8868-1.3584 1.6872-2.5866 2.2854-3.5058 1.47 0.2964 2.4066 0.399 2.718 0.0504 0.3216-0.3558 0.339-0.7848 0.04981-1.1772zm-9.045 9.1926c-0.1458-0.2688-0.2994-0.5322-0.447-0.783-0.5904-1.0068-1.1016-1.8762-0.6396-2.355 0.3048-0.3156 1.323 0.0678 2.3886 0.5634-0.4362 0.8634-0.8754 1.7304-1.302 2.5746zm6.2544-1.3218c-0.3432 0.615-2.2008-0.3036-3.6936-1.0404-6.01e-4 0-0.0012-5.99e-4 -0.0019-5.99e-4 0.4206-0.6438 0.8364-1.2804 1.2366-1.8936 1.4466 1.1232 2.8176 2.2926 2.4588 2.9346zm-3.4752-4.17c-1.4556-1.1298-2.868-2.3208-2.703-3.078 0.072001-0.3282 0.6048-0.4524 1.5852-0.3678 0.7632 0.0666 1.6938 0.2496 2.6376 0.4518-0.4314 0.8484-0.9534 1.8768-1.5198 2.994zm2.7942-3.0846c-0.0558-0.012595-0.1104-0.024001-0.16379-0.036-0.156-0.2772 0.4044-1.6818 0.5448-1.9248 0.14761-0.2568 0.477-0.345 0.7338-0.1968 0.234 0.1344 0.3174 0.4146 0.2226 0.6576-0.3072 0.0084-0.6096 0.0648-0.8814 0.1914-0.09 0.041401-0.1296 0.1476-0.08759 0.2376 0.04021 0.0894 0.1482 0.129 0.2376 0.087 0.1512-0.070199 0.318-0.1086 0.4878-0.1332-0.2994 0.3924-0.8112 0.9906-1.0938 1.1172zm3.1572 0.3234c-0.1932 0.2148-1.1658 0.077399-2.244-0.135 0.4614-0.7092 0.7626-1.1772 0.8424-1.3086 0.5958 0.081 1.1628 0.3594 1.4274 0.7176 0.1902 0.2568 0.1818 0.4938-0.0258 0.726z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/newsagent_shop-m.svg b/data/styles/default/dark/symbols/newsagent_shop-m.svg
index 1be7054d0..758754113 100644
--- a/data/styles/default/dark/symbols/newsagent_shop-m.svg
+++ b/data/styles/default/dark/symbols/newsagent_shop-m.svg
@@ -2,7 +2,7 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <g opacity="1">
   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+  <circle cx="12" cy="12" r="11" fill="#6B425C"/>
   <path id="Shape" d="m5 6v10.5c0 1.1598 0.93981 2.0996 2.0996 2.0996h9.8008c1.1598 0 2.0996-0.93981 2.0996-2.0996v-6.3008-0.69922h-2.8008v-3.5h-1.3984-9.8008zm2.0176 1.8223h3.582v3.582h-3.582v-3.582zm4.4785 0.89453h2.6855v1.791h-2.6855v-1.791zm4.7031 2.1836h1.4004v5.5996c0 0.3866-0.31262 0.69922-0.69922 0.69922-0.3866 0-0.70117-0.31262-0.70117-0.69922v-5.5996zm-9.1816 1.4004h7.1641v1.791h-7.1641v-1.791zm0 2.6855h7.1641v1.791h-7.1641v-1.791z" fill="#000" fill-rule="evenodd"/>
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/nightclub-m.svg b/data/styles/default/dark/symbols/nightclub-m.svg
index e6d9bbdf4..a90fb43f0 100644
--- a/data/styles/default/dark/symbols/nightclub-m.svg
+++ b/data/styles/default/dark/symbols/nightclub-m.svg
@@ -1,7 +1,7 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
   <g>
     <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-    <circle id="Oval" cx="12" cy="12" r="11" fill="#BB9342"/>
+    <circle id="Oval" cx="12" cy="12" r="11" fill="#8C491C"/>
     <path d="m18.289 5.5406c0.20956 0.15523 0.33374 0.40359 0.33374 0.6649v8.6928c0 1.1435-1.1125 2.0697-2.4837 2.0697s-2.4837-0.9262-2.4837-2.0697 1.1125-2.0697 2.4837-2.0697c0.28976 0 0.56917 0.04136 0.82789 0.11901v-3.7669l-6.6231 1.9869v5.3864c0 1.1435-1.1125 2.0697-2.4837 2.0697s-2.4837-0.9262-2.4837-2.0697 1.1125-2.0697 2.4837-2.0697c0.28976 0 0.56917 0.04136 0.82789 0.11901v-5.9142c0-0.36479 0.2406-0.68818 0.58987-0.79426l8.2789-2.4837c0.25095-0.075029 0.5226-0.02848 0.73216 0.12936z" fill="#000"/>
   </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/office-m.svg b/data/styles/default/dark/symbols/office-m.svg
index 124cc9829..c0d5677c8 100644
--- a/data/styles/default/dark/symbols/office-m.svg
+++ b/data/styles/default/dark/symbols/office-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="office-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#51585E"/>
    <path id="Shape" d="m10.6 15.1v-0.7h-4.893l-7e-3 2.8c0 0.777 0.623 1.4 1.4 1.4h9.8c0.777 0 1.4-0.623 1.4-1.4v-2.8h-4.9v0.7h-2.8zm7-6.3h-2.807v-1.4l-1.4-1.4h-2.8l-1.4 1.4v1.4h-2.793c-0.77 0-1.4 0.63-1.4 1.4v2.1c0 0.777 0.623 1.4 1.4 1.4h4.2v-1.4h2.8v1.4h4.2c0.77 0 1.4-0.63 1.4-1.4v-2.1c0-0.77-0.63-1.4-1.4-1.4zm-4.2 0h-2.8v-1.4h2.8v1.4z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/optician-m.svg b/data/styles/default/dark/symbols/optician-m.svg
index 419dfae65..c583ae650 100644
--- a/data/styles/default/dark/symbols/optician-m.svg
+++ b/data/styles/default/dark/symbols/optician-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="optician-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <path id="Shape" d="m18.964 11.679-1.4-4.2c-0.0945-0.2863-0.3619-0.4788-0.6636-0.4788h-2.1v1.4h1.5953l0.9338 2.8h-3.2291c-0.7721 0-1.4 0.6279-1.4 1.4h-1.4c0-0.7721-0.6279-1.4-1.4-1.4h-3.2291l0.9338-2.8h1.5953v-1.4h-2.1c-0.3017 0-0.5684 0.1925-0.6636 0.4788l-1.4 4.2 0.0084 0.0028c-0.0245 0.0693-0.0448 0.1407-0.0448 0.2184v2.8c0 1.1578 0.9422 2.1 2.1 2.1h2.1c1.1578 0 2.1-0.9422 2.1-2.1v-0.7h1.4v0.7c0 1.1578 0.9422 2.1 2.1 2.1h2.1c1.1578 0 2.1-0.9422 2.1-2.1v-2.8c0-0.0777-0.0203-0.1491-0.0441-0.2191l0.0077-0.0021zm-9.0636 3.0212c0 0.3857-0.3136 0.7-0.7 0.7h-2.1c-0.3864 0-0.7-0.3143-0.7-0.7v-2.1h3.5v2.1zm7.7 0c0 0.3857-0.3136 0.7-0.7 0.7h-2.1c-0.3864 0-0.7-0.3143-0.7-0.7v-2.1h3.5v2.1z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/optometrist-m.svg b/data/styles/default/dark/symbols/optometrist-m.svg
index 84fc29c6a..0cc6b1f51 100644
--- a/data/styles/default/dark/symbols/optometrist-m.svg
+++ b/data/styles/default/dark/symbols/optometrist-m.svg
@@ -2,7 +2,7 @@
   <title>optometrist-m</title>
   <g>
     <circle id="outer" r="12" cx="12" cy="12" fill="#000" opacity=".6"/>
-    <circle id="inner" r="11" cx="12" cy="12" fill="#c15746"/>
+    <circle id="inner" r="11" cx="12" cy="12" fill="#983E44"/>
     <path id="eye_outer" stroke="#000" stroke-width="1.3" fill="none" d="M 2.6894605,12 C 4.9899597,9.1519178 8.4018268,7.5026863 12.000002,7.5026863 c 3.599795,0 7.011662,1.6492315 9.312162,4.4973137 -2.3005,2.849703 -5.712367,4.497313 -9.312162,4.497313 -3.5981752,0 -7.0100423,-1.64761 -9.3105415,-4.497313 z"/>
     <circle id="eye_inner" r="2" cx="12" cy="12" fill="none" stroke-width="1.8" stroke="#000"/>
   </g>
diff --git a/data/styles/default/dark/symbols/outdoor-shop-m.svg b/data/styles/default/dark/symbols/outdoor-shop-m.svg
index 3b489d2a0..dbfb43206 100644
--- a/data/styles/default/dark/symbols/outdoor-shop-m.svg
+++ b/data/styles/default/dark/symbols/outdoor-shop-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="outdoor-shop-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <path id="Shape" d="m12.738 5c-0.78455 0-1.4205 0.6268-1.4205 1.4s0.636 1.4 1.4205 1.4c0.78455 0 1.4205-0.6268 1.4205-1.4s-0.636-1.4-1.4205-1.4zm-3.1074 2.8656c-0.95887 0.10828-1.8334 0.73938-2.153 1.6844l-0.42172 1.4c-0.21308 0.63 0.2042 1.3212 0.84345 1.5312 0.71027 0.21 1.3628-0.13125 1.5759-0.83125l1.132-3.7188c-0.31962-0.0875-0.657-0.10172-0.97663-0.065625zm1.6203 0.175-0.42172 1.3344 0.044392 0.021875-0.84345 2.8219c-0.14205 0.56 0.084345 1.1156 0.51051 1.4656l2.0864 1.6625c0.074905 0.15805 0.11098 0.33124 0.11098 0.50312v3.15h1.4205v-3.15c0-0.57556-0.19198-1.1443-0.5771-1.6188l-0.022196-0.021875-1.3762-1.575 0.68808-2.3844c0.023384 0.021654 0.04343 0.042802 0.066588 0.065625l0.5771 0.56875c0.45152 0.44499 1.1088 0.58645 1.6425 0.48125l1.132-0.21875v7.8531h0.71027v-10.5h-0.71027v1.2031l-1.4205 0.28438c-0.17655 0.0348-0.23844 0.027508-0.35514-0.0875l-0.044392-0.04375-0.51051-0.525c-0.50251-0.49524-1.12-0.83358-1.7979-1.0062h-0.022196l-0.88784-0.28438zm-1.0654 6.475-1.6425 4.4844h1.4871l1.2874-3.5-1.132-0.98438z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/painter-m.svg b/data/styles/default/dark/symbols/painter-m.svg
index aacb2f88b..d51e9bfac 100644
--- a/data/styles/default/dark/symbols/painter-m.svg
+++ b/data/styles/default/dark/symbols/painter-m.svg
@@ -2,7 +2,7 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <g opacity="1">
   <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+  <circle cx="12" cy="12" r="11" fill="#6B425C"/>
   <path d="m9.0946 5.5957c-0.80117 0-1.4527 0.65155-1.4527 1.4527v2.1791c0 0.80118 0.65155 1.4527 1.4527 1.4527h7.99c0.80117 0 1.4527-0.65155 1.4527-1.4527v-2.1791c0-0.80117-0.65155-1.4527-1.4527-1.4527zm-2.1791 2.1791c-0.80117 0-1.4527 0.65155-1.4527 1.4527v2.9054c0 0.80117 0.65155 1.4527 1.4527 1.4527h5.0845v1.4527a0.72636 0.72636 0 0 0-0.72636 0.72636v3.6318a0.72636 0.72636 0 0 0 0.72636 0.72636h1.4527a0.72636 0.72636 0 0 0 0.72636-0.72636v-3.6318a0.72636 0.72636 0 0 0-0.72636-0.72636v-1.4527c0-0.80117-0.65155-1.4527-1.4527-1.4527h-5.0845z" fill="#000"/>
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/parking-disabled-m.svg b/data/styles/default/dark/symbols/parking-disabled-m.svg
index 302f01e95..72034c82b 100644
--- a/data/styles/default/dark/symbols/parking-disabled-m.svg
+++ b/data/styles/default/dark/symbols/parking-disabled-m.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 15 15" width="11.25" height="11.25" xmlns="http://www.w3.org/2000/svg">
  <path d="m10.795 0.25c-1.0112 0-1.8603 0.65969-2.1426 1.5762-0.60706-0.35302-0.26369-0.1545-1.2715-0.74023-0.27549-0.15996-0.52108-0.21853-0.82031-0.23438-0.43458-0.023011-0.88974 0.15139-1.2148 0.44141l-1.6621 1.4824c-0.72333 0.64518-0.78193 1.7398-0.13867 2.4609 0.18802 0.21076 0.41421 0.36391 0.6582 0.46094-0.39199 0.20465-0.7535 0.45996-1.0723 0.75977l-0.027344 0.025391-0.44141 0.48438-0.023438 0.029297c-0.6392 0.81571-1.0195 1.8411-1.0195 2.9551 0 2.6545 2.1417 4.7988 4.7969 4.7988 1.1139 0 2.1405-0.37972 2.957-1.0195l0.029297-0.023438 0.48438-0.44141 0.025391-0.027344c0.15467-0.16442 0.29752-0.33872 0.42773-0.52344 0.25535 0.17526 0.56052 0.28633 0.90039 0.30078 0.96218 0.04092 1.7465-0.66771 1.8223-1.5977l0.3125-3.8398c0.0408-0.49972-0.13252-0.99435-0.48633-1.3574-0.34998-0.35909-0.84298-0.55301-1.3477-0.52539l-0.22656 0.011719c0.23862-0.34181 0.34964-0.74083 0.33398-1.1387 0.8175-0.3343 1.3906-1.1343 1.3906-2.0762 0-1.2449-1.0012-2.2422-2.2441-2.2422z" fill="#111111" opacity=".6"/>
- <path d="m10.795 1.2505c-0.68662 0-1.2437 0.55565-1.2437 1.2422 0 0.68658 0.55702 1.2437 1.2437 1.2437 0.68654 0 1.2437-0.55707 1.2437-1.2437 0-0.68654-0.55711-1.2422-1.2437-1.2422zm-4.2495 0.60205c-0.19138-0.010185-0.38489 0.05244-0.53467 0.18604l-1.6611 1.4824c-0.30608 0.27301-0.33309 0.74273-0.060059 1.0488 0.27305 0.30606 0.74277 0.33316 1.0488 0.060059l1.2598-1.1235 1.04 0.60498-1.8369 2.0918c-0.76211 0.12429-1.448 0.47657-1.9863 0.98291l0.95947 0.95947c0.43386-0.3945 1.0108-0.63574 1.6421-0.63574 1.3464 0 2.4404 1.0954 2.4404 2.4419 0 0.63125-0.23982 1.2082-0.63428 1.6421l0.95947 0.95947c0.63933-0.67964 1.0312-1.5948 1.0312-2.6016 0-0.5998-0.13912-1.167-0.38672-1.6714l1.002-0.055664-0.24316 2.9912c-0.03334 0.4088 0.27087 0.76643 0.67969 0.7998 0.02047 0.0017 0.04129 0.0029 0.06152 0.0029 0.38278 0 0.70813-0.2944 0.73975-0.68262l0.31201-3.8394c0.01747-0.21397-0.05824-0.42491-0.20801-0.57861-0.14984-0.15374-0.35881-0.23583-0.57275-0.22412l-2.5898 0.14502 1.4253-1.623c0.20301-0.23119 0.26159-0.53907 0.18311-0.81445-0.04142-0.18871-0.15696-0.36052-0.33252-0.47021-0.0054-0.00385-3.4058-1.9805-3.4058-1.9805-0.10414-0.060466-0.21769-0.092004-0.33252-0.098116zm-3.1201 5.7598c-0.50549 0.64507-0.80713 1.4563-0.80713 2.3394 0 2.0976 1.7007 3.7983 3.7983 3.7983 0.88305 0 1.6943-0.30162 2.3394-0.80713l-0.96973-0.97119c-0.3909 0.26588-0.86223 0.42188-1.3696 0.42188-1.3464 0-2.4419-1.0954-2.4419-2.4419 0-0.50744 0.15446-0.97871 0.42041-1.3696l-0.96973-0.96973z" fill="#2e89b0"/>
+ <path d="m10.795 1.2505c-0.68662 0-1.2437 0.55565-1.2437 1.2422 0 0.68658 0.55702 1.2437 1.2437 1.2437 0.68654 0 1.2437-0.55707 1.2437-1.2437 0-0.68654-0.55711-1.2422-1.2437-1.2422zm-4.2495 0.60205c-0.19138-0.010185-0.38489 0.05244-0.53467 0.18604l-1.6611 1.4824c-0.30608 0.27301-0.33309 0.74273-0.060059 1.0488 0.27305 0.30606 0.74277 0.33316 1.0488 0.060059l1.2598-1.1235 1.04 0.60498-1.8369 2.0918c-0.76211 0.12429-1.448 0.47657-1.9863 0.98291l0.95947 0.95947c0.43386-0.3945 1.0108-0.63574 1.6421-0.63574 1.3464 0 2.4404 1.0954 2.4404 2.4419 0 0.63125-0.23982 1.2082-0.63428 1.6421l0.95947 0.95947c0.63933-0.67964 1.0312-1.5948 1.0312-2.6016 0-0.5998-0.13912-1.167-0.38672-1.6714l1.002-0.055664-0.24316 2.9912c-0.03334 0.4088 0.27087 0.76643 0.67969 0.7998 0.02047 0.0017 0.04129 0.0029 0.06152 0.0029 0.38278 0 0.70813-0.2944 0.73975-0.68262l0.31201-3.8394c0.01747-0.21397-0.05824-0.42491-0.20801-0.57861-0.14984-0.15374-0.35881-0.23583-0.57275-0.22412l-2.5898 0.14502 1.4253-1.623c0.20301-0.23119 0.26159-0.53907 0.18311-0.81445-0.04142-0.18871-0.15696-0.36052-0.33252-0.47021-0.0054-0.00385-3.4058-1.9805-3.4058-1.9805-0.10414-0.060466-0.21769-0.092004-0.33252-0.098116zm-3.1201 5.7598c-0.50549 0.64507-0.80713 1.4563-0.80713 2.3394 0 2.0976 1.7007 3.7983 3.7983 3.7983 0.88305 0 1.6943-0.30162 2.3394-0.80713l-0.96973-0.97119c-0.3909 0.26588-0.86223 0.42188-1.3696 0.42188-1.3464 0-2.4419-1.0954-2.4419-2.4419 0-0.50744 0.15446-0.97871 0.42041-1.3696l-0.96973-0.96973z" fill="#20607C"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/parking-m.svg b/data/styles/default/dark/symbols/parking-m.svg
index b7baaaa61..ae04a48b8 100644
--- a/data/styles/default/dark/symbols/parking-m.svg
+++ b/data/styles/default/dark/symbols/parking-m.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <path d="m6.6651 0.66566c-1.1046 0-2 0.89543-2 2v17.334c0 1.1046 0.89543 2 2 2h4.002c1.1046 0 2-0.89543 2-2v-4.1973c2.1559-0.09596 4.0938-0.66055 5.5586-1.9043 1.7298-1.4554 2.4395-3.508 2.4395-5.8105 0-2.229-0.65387-4.2126-2.3262-5.6035-1.5815-1.3177-3.7223-1.8184-6.0918-1.8184h-5.5684z" fill="#111" opacity=".6"/>
- <path d="m6.6667 20h4.0007v-6.1819h1.3197c2.1356 0 3.8034-0.4766 4.9515-1.4514 1.1728-0.9867 1.7281-2.4236 1.7281-4.2783 0-1.7952-0.51944-3.1639-1.6058-4.0674-1.0987-0.91541-2.7148-1.3546-4.8134-1.3546l-5.5805 3e-4zm4.0007-14.301h1.4322c0.9876 0 1.6915 0.19043 2.1484 0.59463 0.4691 0.4161 0.70229 1.0338 0.70229 1.9017 0 0.84408-0.24686 1.4975-0.81474 1.9492-0.55552 0.43987-1.4076 0.70102-2.5311 0.70102h-0.93704z" fill="#2e89b0"/>
+ <path d="m6.6667 20h4.0007v-6.1819h1.3197c2.1356 0 3.8034-0.4766 4.9515-1.4514 1.1728-0.9867 1.7281-2.4236 1.7281-4.2783 0-1.7952-0.51944-3.1639-1.6058-4.0674-1.0987-0.91541-2.7148-1.3546-4.8134-1.3546l-5.5805 3e-4zm4.0007-14.301h1.4322c0.9876 0 1.6915 0.19043 2.1484 0.59463 0.4691 0.4161 0.70229 1.0338 0.70229 1.9017 0 0.84408-0.24686 1.4975-0.81474 1.9492-0.55552 0.43987-1.4076 0.70102-2.5311 0.70102h-0.93704z" fill="#20607C"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/parking-s.svg b/data/styles/default/dark/symbols/parking-s.svg
index e78bedecd..ec2d152e0 100644
--- a/data/styles/default/dark/symbols/parking-s.svg
+++ b/data/styles/default/dark/symbols/parking-s.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
  <path d="m4 0c-0.73689-3.6174e-4 -1.3343 0.5971-1.334 1.334v12c-3.617e-4 0.73689 0.5971 1.3343 1.334 1.334h2.668c0.73689 3.61e-4 1.3343-0.5971 1.334-1.334l-0.0019531-3.2461c1.4371-0.06384 2.7287-0.43853 3.7051-1.2676 1.153-0.97001 1.6289-2.337 1.6289-3.873 0-1.486-0.43588-2.8071-1.5508-3.7344-1.0553-0.87929-2.4837-1.2129-4.0625-1.2129z" fill="#111" opacity=".6"/>
- <path d="m4 13.333h2.6671l-1.998e-4 -4.5657h0.8798c1.4237 0 2.5356-0.31773 3.301-0.9676 0.78187-0.6578 1.1521-1.6157 1.1521-2.8522 0-1.1968-0.34629-2.1093-1.0705-2.7116-0.73247-0.61027-1.8099-0.90307-3.2089-0.90307l-3.7203 2e-4zm2.6669-9.9784h0.9548c0.6584 0 1.1277 0.12695 1.4323 0.39642 0.31273 0.2774 0.46819 0.6892 0.46819 1.2678 0 0.56272-0.16457 0.99833-0.54316 1.2995-0.37035 0.29325-0.9384 0.46735-1.6874 0.46735h-0.62469z" fill="#2e89b0"/>
+ <path d="m4 13.333h2.6671l-1.998e-4 -4.5657h0.8798c1.4237 0 2.5356-0.31773 3.301-0.9676 0.78187-0.6578 1.1521-1.6157 1.1521-2.8522 0-1.1968-0.34629-2.1093-1.0705-2.7116-0.73247-0.61027-1.8099-0.90307-3.2089-0.90307l-3.7203 2e-4zm2.6669-9.9784h0.9548c0.6584 0 1.1277 0.12695 1.4323 0.39642 0.31273 0.2774 0.46819 0.6892 0.46819 1.2678 0 0.56272-0.16457 0.99833-0.54316 1.2995-0.37035 0.29325-0.9384 0.46735-1.6874 0.46735h-0.62469z" fill="#20607C"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/parking_entrance-m.svg b/data/styles/default/dark/symbols/parking_entrance-m.svg
index 44e6a2ea1..38c3026aa 100644
--- a/data/styles/default/dark/symbols/parking_entrance-m.svg
+++ b/data/styles/default/dark/symbols/parking_entrance-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <path d="m15.941 10.666a2 2 0 0 0-1.0879 0.36133l-6.666 4.666a2 2 0 0 0 0 3.2773l6.666 4.668a2 2 0 0 0 3.1465-1.6387v-1.334h3.334a2 2 0 0 0 2-2v-2.666a2 2 0 0 0-2-2h-3.334v-1.334a2 2 0 0 0-2.0586-2zm-13.277-10c-1.1046 0-2 0.89543-2 2v17.334c0 1.1046 0.89543 2 2 2h4.002c1.1046 0 2-0.89543 2-2v-4.1973c2.1559-0.09596 4.0938-0.66055 5.5586-1.9043 1.7298-1.4554 2.4395-3.508 2.4395-5.8105 0-2.229-0.65387-4.2126-2.3262-5.6035-1.5815-1.3177-3.7223-1.8184-6.0918-1.8184h-5.5684z" fill="#111" opacity=".6"/>
- <path d="m16 12.667-6.6666 4.6663 6.6666 4.667 4e-5 -3.3337h5.3333v-2.6667h-5.3333z" fill="#2e89b0"/>
- <path d="m2.6664 20h4.0007v-6.1819h1.3197c2.1356 0 3.8034-0.4766 4.9515-1.4514 1.1728-0.9867 1.7281-2.4236 1.7281-4.2783 0-1.7952-0.51944-3.1639-1.6058-4.0674-1.0987-0.91541-2.7148-1.3546-4.8134-1.3546l-5.5805 3e-4zm4.0007-14.301h1.4322c0.9876 0 1.6915 0.19043 2.1484 0.59463 0.4691 0.4161 0.70229 1.0338 0.70229 1.9017 0 0.84408-0.24686 1.4975-0.81474 1.9492-0.55552 0.43987-1.4076 0.70102-2.5311 0.70102h-0.93704z" fill="#2e89b0"/>
+ <path d="m16 12.667-6.6666 4.6663 6.6666 4.667 4e-5 -3.3337h5.3333v-2.6667h-5.3333z" fill="#20607C"/>
+ <path d="m2.6664 20h4.0007v-6.1819h1.3197c2.1356 0 3.8034-0.4766 4.9515-1.4514 1.1728-0.9867 1.7281-2.4236 1.7281-4.2783 0-1.7952-0.51944-3.1639-1.6058-4.0674-1.0987-0.91541-2.7148-1.3546-4.8134-1.3546l-5.5805 3e-4zm4.0007-14.301h1.4322c0.9876 0 1.6915 0.19043 2.1484 0.59463 0.4691 0.4161 0.70229 1.0338 0.70229 1.9017 0 0.84408-0.24686 1.4975-0.81474 1.9492-0.55552 0.43987-1.4076 0.70102-2.5311 0.70102h-0.93704z" fill="#20607C"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/parking_pay-m.svg b/data/styles/default/dark/symbols/parking_pay-m.svg
index 314de7572..9cf99fdde 100644
--- a/data/styles/default/dark/symbols/parking_pay-m.svg
+++ b/data/styles/default/dark/symbols/parking_pay-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <path d="m18.013 9.3332c-2.5772 0-4.6665 2.9848-4.6665 6.6667s2.0893 6.6667 4.6665 6.6667 4.6665-2.9848 4.6665-6.6667-2.0893-6.6667-4.6665-6.6667zm-14.015-8.6672c-1.1046 1e-8 -2 0.89543-2 2v17.334c0 1.1046 0.89543 2 2 2h4.002c1.1046 0 2-0.89543 2-2v-4.1973c2.1559-0.09596 4.0938-0.66055 5.5586-1.9043 1.7298-1.4554 2.4395-3.508 2.4395-5.8105 0-2.229-0.65387-4.2126-2.3262-5.6035-1.5815-1.3177-3.7223-1.8184-6.0918-1.8184h-5.5684z" fill="#111" opacity=".6"/>
- <path d="m17.851 20.187c2.004 0 3.156-1.044 3.156-2.616 0-2.916-3.816-2.136-3.816-3.336 0-0.42 0.432-0.66 1.212-0.66 0.564 0 1.272 0.12 1.836 0.336l0.54-1.56c-0.648-0.312-1.536-0.492-2.304-0.492-1.968 0-3.312 1.08-3.312 2.652 0 2.736 3.792 2.04 3.792 3.288 0 0.396-0.324 0.624-1.104 0.624-0.648 0-1.5-0.144-2.292-0.492l-0.54 1.596c0.792 0.384 1.788 0.66 2.832 0.66zm-0.66 1.476h1.884v-2.124h-1.884zm0-9.108h1.884v-2.22h-1.884z" fill="#2e89b0"/>
- <path d="m4 20h4.0007v-6.1819h1.3197c2.1356 0 3.8034-0.4766 4.9515-1.4514 1.1728-0.9867 1.7281-2.4236 1.7281-4.2783 0-1.7952-0.51944-3.1639-1.6058-4.0674-1.0987-0.91541-2.7148-1.3546-4.8134-1.3546l-5.5805 3e-4zm4.0007-14.301h1.4322c0.9876 0 1.6915 0.19043 2.1484 0.59463 0.4691 0.4161 0.70229 1.0338 0.70229 1.9017 0 0.84408-0.24686 1.4975-0.81474 1.9492-0.55552 0.43987-1.4076 0.70102-2.5311 0.70102h-0.93704z" fill="#2e89b0"/>
+ <path d="m17.851 20.187c2.004 0 3.156-1.044 3.156-2.616 0-2.916-3.816-2.136-3.816-3.336 0-0.42 0.432-0.66 1.212-0.66 0.564 0 1.272 0.12 1.836 0.336l0.54-1.56c-0.648-0.312-1.536-0.492-2.304-0.492-1.968 0-3.312 1.08-3.312 2.652 0 2.736 3.792 2.04 3.792 3.288 0 0.396-0.324 0.624-1.104 0.624-0.648 0-1.5-0.144-2.292-0.492l-0.54 1.596c0.792 0.384 1.788 0.66 2.832 0.66zm-0.66 1.476h1.884v-2.124h-1.884zm0-9.108h1.884v-2.22h-1.884z" fill="#20607C"/>
+ <path d="m4 20h4.0007v-6.1819h1.3197c2.1356 0 3.8034-0.4766 4.9515-1.4514 1.1728-0.9867 1.7281-2.4236 1.7281-4.2783 0-1.7952-0.51944-3.1639-1.6058-4.0674-1.0987-0.91541-2.7148-1.3546-4.8134-1.3546l-5.5805 3e-4zm4.0007-14.301h1.4322c0.9876 0 1.6915 0.19043 2.1484 0.59463 0.4691 0.4161 0.70229 1.0338 0.70229 1.9017 0 0.84408-0.24686 1.4975-0.81474 1.9492-0.55552 0.43987-1.4076 0.70102-2.5311 0.70102h-0.93704z" fill="#20607C"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/parking_pay-s.svg b/data/styles/default/dark/symbols/parking_pay-s.svg
index 7b17e49a5..eea73e8f1 100644
--- a/data/styles/default/dark/symbols/parking_pay-s.svg
+++ b/data/styles/default/dark/symbols/parking_pay-s.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
  <path d="m2.6666 3.0013e-4c-0.73689-3.6173e-4 -1.3343 0.5971-1.334 1.334v12c-3.617e-4 0.73689 0.5971 1.3343 1.334 1.334h2.668c0.73689 3.61e-4 1.3343-0.5971 1.334-1.334l-0.00195-3.2461c1.4371-0.06384 2.7287-0.43853 3.7051-1.2676 1.153-0.97001 1.6289-2.337 1.6289-3.873 0-1.486-0.43588-2.8071-1.5508-3.7344-1.0553-0.87929-2.4837-1.2129-4.0625-1.2129zm13.333 10.666a3.3333 5.3333 0 0 0-3.3333-5.3333 3.3333 5.3333 0 0 0-3.3333 5.3333 3.3333 5.3333 0 0 0 3.3333 5.3333 3.3333 5.3333 0 0 0 3.3333-5.3333z" fill="#111" opacity=".6"/>
- <path d="m2.6666 13.333h2.6671l-1.998e-4 -4.5657h0.8798c1.4237 0 2.5356-0.31773 3.301-0.9676 0.78187-0.6578 1.1521-1.6157 1.1521-2.8522 0-1.1968-0.34629-2.1093-1.0705-2.7116-0.73247-0.61027-1.8099-0.90307-3.2089-0.90307l-3.7203 2e-4zm2.6669-9.9784h0.9548c0.6584 0 1.1277 0.12695 1.4323 0.39642 0.31273 0.2774 0.46819 0.6892 0.46819 1.2678 0 0.56272-0.16457 0.99833-0.54316 1.2995-0.37035 0.29325-0.9384 0.46735-1.6874 0.46735h-0.62469z" fill="#2e89b0"/>
- <path d="m11.968 6.5935v1.2183c-0.85584 0.28931-1.406 0.95593-1.406 1.8234 0 1.9856 2.6291 1.6065 2.6291 2.2781 0 0.15907-0.12028 0.28799-0.61967 0.28799-0.4306 0-1.002-0.09548-1.5322-0.32844l-0.144-0.0631-0.46596 1.3769 0.11649 0.05663c0.41166 0.19959 0.89955 0.35534 1.4221 0.42713v1.0694h1.5985v-1.1714c0.85509-0.27802 1.3381-0.93598 1.3381-1.8121 0-2.105-2.6453-1.6833-2.6453-2.3137 0-0.17142 0.18912-0.31226 0.69412-0.31226 0.37558 0 0.8463 0.079565 1.2216 0.22327l0.14076 0.05339 0.46435-1.3461-0.11649-0.055012c-0.31797-0.1531-0.70842-0.25971-1.0969-0.31388v-1.0986h-1.5985z" fill="#2e89b0"/>
+ <path d="m2.6666 13.333h2.6671l-1.998e-4 -4.5657h0.8798c1.4237 0 2.5356-0.31773 3.301-0.9676 0.78187-0.6578 1.1521-1.6157 1.1521-2.8522 0-1.1968-0.34629-2.1093-1.0705-2.7116-0.73247-0.61027-1.8099-0.90307-3.2089-0.90307l-3.7203 2e-4zm2.6669-9.9784h0.9548c0.6584 0 1.1277 0.12695 1.4323 0.39642 0.31273 0.2774 0.46819 0.6892 0.46819 1.2678 0 0.56272-0.16457 0.99833-0.54316 1.2995-0.37035 0.29325-0.9384 0.46735-1.6874 0.46735h-0.62469z" fill="#20607C"/>
+ <path d="m11.968 6.5935v1.2183c-0.85584 0.28931-1.406 0.95593-1.406 1.8234 0 1.9856 2.6291 1.6065 2.6291 2.2781 0 0.15907-0.12028 0.28799-0.61967 0.28799-0.4306 0-1.002-0.09548-1.5322-0.32844l-0.144-0.0631-0.46596 1.3769 0.11649 0.05663c0.41166 0.19959 0.89955 0.35534 1.4221 0.42713v1.0694h1.5985v-1.1714c0.85509-0.27802 1.3381-0.93598 1.3381-1.8121 0-2.105-2.6453-1.6833-2.6453-2.3137 0-0.17142 0.18912-0.31226 0.69412-0.31226 0.37558 0 0.8463 0.079565 1.2216 0.22327l0.14076 0.05339 0.46435-1.3461-0.11649-0.055012c-0.31797-0.1531-0.70842-0.25971-1.0969-0.31388v-1.0986h-1.5985z" fill="#20607C"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/parking_underground-m.svg b/data/styles/default/dark/symbols/parking_underground-m.svg
index 096596a9e..7bd96d8da 100644
--- a/data/styles/default/dark/symbols/parking_underground-m.svg
+++ b/data/styles/default/dark/symbols/parking_underground-m.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <path d="m6.6651 0.66566c-1.1046 0-2 0.89543-2 2v17.334c0 1.1046 0.89543 2 2 2h4.002c1.1046 0 2-0.89543 2-2v-4.1973c2.1559-0.09596 4.0938-0.66055 5.5586-1.9043 1.7298-1.4554 2.4395-3.508 2.4395-5.8105 0-2.229-0.65387-4.2126-2.3262-5.6035-1.5815-1.3177-3.7223-1.8184-6.0918-1.8184h-5.5684zm8.1464 15.32a2 2 0 0 0-1.4777-0.65186l-9.3346 0.0014a2 2 0 0 0-1.4142 3.414l4.6652 4.6652a2 2 0 0 0 2.8284 0l4.6694-4.6666a2 2 0 0 0 0.0635-2.7622z" fill="#111" opacity=".6"/>
- <path d="m6.6667 20h4.0007v-6.1819h1.3197c2.1356 0 3.8034-0.4766 4.9515-1.4514 1.1728-0.9867 1.7281-2.4236 1.7281-4.2783 0-1.7952-0.51944-3.1639-1.6058-4.0674-1.0987-0.91541-2.7148-1.3546-4.8134-1.3546l-5.5805 3e-4zm4.0007-14.301h1.4322c0.9876 0 1.6915 0.19043 2.1484 0.59463 0.4691 0.4161 0.70229 1.0338 0.70229 1.9017 0 0.84408-0.24686 1.4975-0.81474 1.9492-0.55552 0.43987-1.4076 0.70102-2.5311 0.70102h-0.93704zm-6.6674 11.635 4.666 4.666 4.668-4.666z" fill="#2e89b0"/>
+ <path d="m6.6667 20h4.0007v-6.1819h1.3197c2.1356 0 3.8034-0.4766 4.9515-1.4514 1.1728-0.9867 1.7281-2.4236 1.7281-4.2783 0-1.7952-0.51944-3.1639-1.6058-4.0674-1.0987-0.91541-2.7148-1.3546-4.8134-1.3546l-5.5805 3e-4zm4.0007-14.301h1.4322c0.9876 0 1.6915 0.19043 2.1484 0.59463 0.4691 0.4161 0.70229 1.0338 0.70229 1.9017 0 0.84408-0.24686 1.4975-0.81474 1.9492-0.55552 0.43987-1.4076 0.70102-2.5311 0.70102h-0.93704zm-6.6674 11.635 4.666 4.666 4.668-4.666z" fill="#20607C"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/parking_underground_pay-m.svg b/data/styles/default/dark/symbols/parking_underground_pay-m.svg
index 5c5d06f8d..e3efc91eb 100644
--- a/data/styles/default/dark/symbols/parking_underground_pay-m.svg
+++ b/data/styles/default/dark/symbols/parking_underground_pay-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <path d="m19.333 9.3332c-2.5772 0-4.6665 2.9848-4.6665 6.6667s2.0893 6.6667 4.6665 6.6667 4.6665-2.9848 4.6665-6.6667-2.0893-6.6667-4.6665-6.6667zm-14.015-8.6672c-1.1046 1e-8 -2 0.89543-2 2v17.334c0 1.1046 0.89543 2 2 2h4.002c1.1046 0 2-0.89543 2-2v-4.1973c2.1559-0.09596 4.0938-0.66055 5.5586-1.9043 1.7298-1.4554 2.4395-3.508 2.4395-5.8105 0-2.229-0.65387-4.2126-2.3262-5.6035-1.5815-1.3177-3.7223-1.8184-6.0918-1.8184h-5.5684zm8.1464 15.32a2 2 0 0 0-1.4777-0.65186l-9.3346 0.0014a2 2 0 0 0-1.4142 3.414l4.6652 4.6652a2 2 0 0 0 2.8284 0l4.6694-4.6666a2 2 0 0 0 0.0635-2.7622z" fill="#111" opacity=".6"/>
- <path d="m19.171 20.187c2.004 0 3.156-1.044 3.156-2.616 0-2.916-3.816-2.136-3.816-3.336 0-0.42 0.432-0.66 1.212-0.66 0.564 0 1.272 0.12 1.836 0.336l0.54-1.56c-0.648-0.312-1.536-0.492-2.304-0.492-1.968 0-3.312 1.08-3.312 2.652 0 2.736 3.792 2.04 3.792 3.288 0 0.396-0.324 0.624-1.104 0.624-0.648 0-1.5-0.144-2.292-0.492l-0.54 1.596c0.792 0.384 1.788 0.66 2.832 0.66zm-0.66 1.476h1.884v-2.124h-1.884zm0-9.108h1.884v-2.22h-1.884z" fill="#2e89b0" stroke-linecap="round" stroke-linejoin="round"/>
- <path d="m5.333 20h4.0007v-6.1819h1.3197c2.1356 0 3.8034-0.4766 4.9515-1.4514 1.1728-0.9867 1.7281-2.4236 1.7281-4.2783 0-1.7952-0.51944-3.1639-1.6058-4.0674-1.0987-0.91541-2.7148-1.3546-4.8134-1.3546l-5.5805 3e-4zm4.0007-14.301h1.4322c0.9876 0 1.6915 0.19043 2.1484 0.59463 0.4691 0.4161 0.70229 1.0338 0.70229 1.9017 0 0.84408-0.24686 1.4975-0.81474 1.9492-0.55552 0.43987-1.4076 0.70102-2.5311 0.70102h-0.93704zm-6.6808 11.635 4.666 4.666 4.668-4.666z" fill="#2e89b0"/>
+ <path d="m19.171 20.187c2.004 0 3.156-1.044 3.156-2.616 0-2.916-3.816-2.136-3.816-3.336 0-0.42 0.432-0.66 1.212-0.66 0.564 0 1.272 0.12 1.836 0.336l0.54-1.56c-0.648-0.312-1.536-0.492-2.304-0.492-1.968 0-3.312 1.08-3.312 2.652 0 2.736 3.792 2.04 3.792 3.288 0 0.396-0.324 0.624-1.104 0.624-0.648 0-1.5-0.144-2.292-0.492l-0.54 1.596c0.792 0.384 1.788 0.66 2.832 0.66zm-0.66 1.476h1.884v-2.124h-1.884zm0-9.108h1.884v-2.22h-1.884z" fill="#20607C" stroke-linecap="round" stroke-linejoin="round"/>
+ <path d="m5.333 20h4.0007v-6.1819h1.3197c2.1356 0 3.8034-0.4766 4.9515-1.4514 1.1728-0.9867 1.7281-2.4236 1.7281-4.2783 0-1.7952-0.51944-3.1639-1.6058-4.0674-1.0987-0.91541-2.7148-1.3546-4.8134-1.3546l-5.5805 3e-4zm4.0007-14.301h1.4322c0.9876 0 1.6915 0.19043 2.1484 0.59463 0.4691 0.4161 0.70229 1.0338 0.70229 1.9017 0 0.84408-0.24686 1.4975-0.81474 1.9492-0.55552 0.43987-1.4076 0.70102-2.5311 0.70102h-0.93704zm-6.6808 11.635 4.666 4.666 4.668-4.666z" fill="#20607C"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/petshop-m.svg b/data/styles/default/dark/symbols/petshop-m.svg
index a877fda48..d3b394ecd 100644
--- a/data/styles/default/dark/symbols/petshop-m.svg
+++ b/data/styles/default/dark/symbols/petshop-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="petshop-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <path id="Path" d="m16.791 7.2092c-0.029368-0.55449-0.24753-1.102-0.67126-1.5264-0.9104-0.9104-2.3858-0.9104-3.2955 0-0.9104 0.9104-0.9104 2.3858 0 3.2962l-3.8451 3.8458c-0.9104-0.9104-2.3858-0.9104-3.2962 0-0.9104 0.9097-0.9104 2.3851 0 3.2955 0.42373 0.42373 0.97193 0.64189 1.5264 0.67126 0.029368 0.55449 0.24753 1.102 0.67126 1.5264 0.9104 0.9104 2.3858 0.9104 3.2955 0 0.9104-0.9104 0.9104-2.3858 0-3.2962l3.8451-3.8451c0.9104 0.9104 2.3858 0.9104 3.2962 0 0.9104-0.9097 0.9104-2.3851 0-3.2955-0.42443-0.42443-0.97193-0.64259-1.5264-0.67196z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/petting_zoo-m.svg b/data/styles/default/dark/symbols/petting_zoo-m.svg
index 31eb46101..1c89767bf 100644
--- a/data/styles/default/dark/symbols/petting_zoo-m.svg
+++ b/data/styles/default/dark/symbols/petting_zoo-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
 	<circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-	<circle cx="12" cy="12" r="11" fill="#7f5933"/>
+	<circle cx="12" cy="12" r="11" fill="#6E4426"/>
 	<path d="m7.0781 5.9961c-0.10394 0-0.22223 0.00669-0.32617 0.013672-0.86615 0.083803-1.3858 0.39146-1.6699 0.62891l-0.20703 0.17383-0.26367-0.13281c-0.18016-0.090787-0.42205-0.12476-0.69922-0.089844-0.27024 0.027934-0.51357 0.097304-0.66602 0.16016-0.083151 0.027934-0.13849 0.097837-0.15234 0.18164-0.013858 0.083803 0.021621 0.16874 0.083984 0.22461 0.048505 0.041902 0.096027 0.075286 0.14453 0.11719 0.15244 0.11872 0.69427 0.50261 1.207 0.65625l0.2832 0.083984 0.068359 0.20312c0.11087 0.33521 0.29938 0.83868 0.54883 1.3555 0.27717 0.57266 0.57509 1.0111 0.87305 1.3184 0.29796 0.30728 0.59569 0.46094 0.88672 0.46094 0.020788-7e-3 0.040643-0.0059 0.068359-0.0059 0.31875-0.027893 0.61081-0.23808 0.86719-0.61519 0.23559-0.3422 0.44307-0.81572 0.60938-1.4023 0.1663-0.57964 0.25618-1.1396 0.30469-1.5098l0.027344-0.22266 0.22266-0.10547c0.45733-0.21649 0.91466-0.68449 1.0879-0.87305 0.05543-0.055869 0.10384-0.11796 0.15234-0.17383 0.05543-0.062852 0.06873-0.15448 0.04102-0.23828-0.027721-0.083803-0.096541-0.13838-0.17969-0.15234-0.22866-0.034918-0.47767-0.050248-0.68555-0.029297-0.32567 0.034918-0.58282 0.13347-0.74219 0.28711l-0.22852 0.22266-0.26367-0.16602c-0.38804-0.24443-0.86596-0.37109-1.3926-0.37109zm5.834 2.0039c-0.38804 0-0.75371 0.12696-1.0586 0.35742l-0.1875 0.13867-0.21484-0.089844c-0.21481-0.090787-0.43628-0.13281-0.67188-0.13281-0.31182 0-0.60974 0.083813-0.87305 0.23047l-0.0625 0.035156c-0.062363 0.034918-0.10528 0.09032-0.11914 0.16016-0.055434 0.29331-0.12495 0.57837-0.20117 0.84375-0.19402 0.67741-0.43465 1.2294-0.71875 1.6484-0.4019 0.58662-0.89469 0.90898-1.4629 0.96484h-0.013672c-0.083151 7e-3 -0.15285 0.05516-0.1875 0.125-0.034646 0.06984-0.034646 0.15365 0 0.23047 0.13858 0.24443 0.34039 0.4616 0.58984 0.61523l0.20703 0.125-0.013672 0.24414v0.07813c0 0.53774 0.27049 1.0317 0.70703 1.332v2.5156c0 0.26538 0.2152 0.48047 0.47852 0.48047 0.26331 0 0.47656-0.21509 0.47656-0.48047v-1.9902c0.21481 0.31426 0.52054 0.54451 0.88086 0.65625v2.4512c0 0.26538 0.2152 0.48242 0.47852 0.48242 0.26331 0 0.47852-0.21704 0.47852-0.48242v-2.3965c0.11087-0.02793 0.22028-0.06161 0.32422-0.10352l0.20898-0.0918 0.1875 0.13281c0.29796 0.20951 0.64359 0.31445 1.0039 0.31445 0.30489 0 0.60192-0.076 0.86524-0.22266l0.20117-0.11328 0.20117 0.11328c0.24252 0.13967 0.52059 0.21567 0.80469 0.22266v1.0469c0 0.26538 0.2152 0.48242 0.47852 0.48242s0.47656-0.21704 0.47656-0.48242v-1.2988c0.13166-0.07682 0.25739-0.17342 0.36133-0.28516l0.11719-0.12695h0.17383c0.04158 0 0.08928 0.0011 0.13086-0.0059v2.8145c0 0.26538 0.2152 0.48242 0.47852 0.48242s0.47852-0.21704 0.47852-0.48242v-3.1914c0.38111-0.30728 0.62305-0.76949 0.62305-1.2793 0-0.28633-0.07607-0.57281-0.22852-0.82422l-0.125-0.20898 0.125-0.20898c0.14551-0.25141 0.22852-0.53789 0.22852-0.82422 0-0.3841-0.13141-0.74072-0.38086-1.041l-0.13867-0.16797 0.02148-0.06836c0.37418 0.29331 0.81658 0.58694 1.0938 0.44727 0.09701-0.04889 0.17982-0.14744 0.24219-0.28711 0.09008-0.23046 0.09027-0.43922-0.01367-0.63476-0.20787-0.38406-0.81001-0.61615-1.3574-0.75582-0.25638-0.60059-0.87223-1.0195-1.5859-1.0195-0.09008 0-0.18815 0.00752-0.28516 0.021484l-0.17969 0.027344-0.13867-0.11719c-0.31182-0.26538-0.71315-0.40625-1.1289-0.40625-0.24945 0-0.49204 0.049543-0.7207 0.1543l-0.16797 0.076172-0.16602-0.076172c-0.22866-0.09777-0.47125-0.1543-0.7207-0.1543z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/pharmacy-m.svg b/data/styles/default/dark/symbols/pharmacy-m.svg
index d6705b5e0..f2f27c255 100644
--- a/data/styles/default/dark/symbols/pharmacy-m.svg
+++ b/data/styles/default/dark/symbols/pharmacy-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="pharmacy-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#C15746"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#983E44"/>
    <path id="Shape" d="m14.538 6c-0.90712 0-1.8105 0.35204-2.4757 1.0112l-5.0081 4.9809c-1.0325 1.023-1.313 2.5083-0.81263 3.7451 0 0 0.37419 0.87635 0.73704 1.2359 0.34157 0.33845 0.75398 0.57679 1.1717 0.74901 0.11533 0.059497 0.20244 0.081186 0.30237 0.11235 0.013416 0.0041387 0.024344 0.01475 0.037797 0.018725 1.2023 0.35531 2.5437 0.067411 3.4584-0.88009l3.0237-2.9961 1.9843-1.9849c1.3909-1.3782 1.3909-3.5878 0-4.906-0.60475-0.71905-1.5119-1.0861-2.419-1.0861zm0 1.1984c0.60475 0 1.2208 0.23594 1.6442 0.65539s0.66144 1.0299 0.66144 1.6291c0 0.59921-0.23812 1.1909-0.66144 1.6104l-2.0599 2.0411-3.2659-3.2574 1.9997-1.967c0.4838-0.47937 1.0167-0.71156 1.682-0.71156z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/photo-shop-m.svg b/data/styles/default/dark/symbols/photo-shop-m.svg
index 6a760efcd..1887aa495 100644
--- a/data/styles/default/dark/symbols/photo-shop-m.svg
+++ b/data/styles/default/dark/symbols/photo-shop-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="photo-shop-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <path id="Shape" d="m9.9 6-1.281 1.4h-2.219c-0.77 0-1.4 0.63-1.4 1.4v8.4c0 0.77 0.63 1.4 1.4 1.4h11.2c0.77 0 1.4-0.63 1.4-1.4v-8.4c0-0.77-0.63-1.4-1.4-1.4h-2.219l-1.281-1.4h-4.2zm2.1 10.5c-1.932 0-3.5-1.568-3.5-3.5s1.568-3.5 3.5-3.5 3.5 1.568 3.5 3.5-1.568 3.5-3.5 3.5z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/physiotherapist-m.svg b/data/styles/default/dark/symbols/physiotherapist-m.svg
index 71c781369..1ae9eaeaa 100644
--- a/data/styles/default/dark/symbols/physiotherapist-m.svg
+++ b/data/styles/default/dark/symbols/physiotherapist-m.svg
@@ -8,7 +8,7 @@
           0.00,5.37 5.37,0.00 12.00,0.00
           18.63,0.00 24.00,5.37 24.00,12.00 Z" />
   <path id="Inner circle"
-    fill="#C15746" stroke="none" stroke-width="0"
+    fill="#983E44" stroke="none" stroke-width="0"
     d="M 23.00,12.00
         C 23.00,18.08 18.08,23.00 12.00,23.00
           5.92,23.00 1.00,18.08 1.00,12.00
diff --git a/data/styles/default/dark/symbols/place-of-worship-m.svg b/data/styles/default/dark/symbols/place-of-worship-m.svg
index 8f87b2bdf..35405b6d6 100644
--- a/data/styles/default/dark/symbols/place-of-worship-m.svg
+++ b/data/styles/default/dark/symbols/place-of-worship-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="place-of-worship-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#7F5933"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6E4426"/>
    <path id="Shape" d="m18.576 14.018-2.3758-1.0183v4.2h2.45c0.19338 0 0.35-0.15662 0.35-0.35v-2.1884c0-0.27997-0.16684-0.53302-0.42416-0.64334zm-13.576 0.64334v2.1884c0 0.19338 0.15662 0.35 0.35 0.35h2.45v-4.2l-2.3758 1.0183c-0.25732 0.11033-0.42416 0.36337-0.42416 0.64334zm10.16-3.2655-1.0601-0.63612v-2.515c0-0.18572-0.073719-0.36356-0.20519-0.49503l-1.6474-1.6474c-0.13672-0.13672-0.35831-0.13672-0.49481 0l-1.6474 1.6474c-0.13125 0.13125-0.20519 0.30931-0.20519 0.49503v2.515l-1.0601 0.63612c-0.21089 0.12648-0.33994 0.35434-0.33994 0.60025v5.2036h2.1v-2.1c0-0.77328 0.62694-1.4 1.4-1.4s1.4 0.62672 1.4 1.4v2.1h2.1v-5.2036c0-0.24588-0.12906-0.47381-0.33994-0.60025z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/place-of-worship-s.svg b/data/styles/default/dark/symbols/place-of-worship-s.svg
index 04b849041..68f085919 100644
--- a/data/styles/default/dark/symbols/place-of-worship-s.svg
+++ b/data/styles/default/dark/symbols/place-of-worship-s.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="place-of-worship-s" fill-rule="nonzero">
    <circle id="Oval" cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="8" cy="8" r="7.3333" fill="#7F5933"/>
+   <circle id="Oval" cx="8" cy="8" r="7.3333" fill="#6E4426"/>
    <path id="Shape" d="m12.384 9.3455-1.5839-0.67885v2.8h1.6333c0.12892 0 0.23333-0.10442 0.23333-0.23333v-1.4589c0-0.18665-0.11122-0.35534-0.28277-0.4289zm-9.0506 0.4289v1.4589c0 0.12892 0.10442 0.23333 0.23333 0.23333h1.6333v-2.8l-1.5839 0.67885c-0.17155 0.073552-0.28277 0.24225-0.28277 0.4289zm6.7734-2.177-0.70671-0.42408v-1.6766c0-0.12381-0.049146-0.24238-0.13679-0.33002l-1.0983-1.0983c-0.091146-0.091146-0.23888-0.091146-0.32988 0l-1.0983 1.0983c-0.0875 0.0875-0.13679 0.20621-0.13679 0.33002v1.6766l-0.70671 0.42408c-0.14059 0.084318-0.22662 0.23623-0.22662 0.40017v3.4691h1.4v-1.4c0-0.51552 0.41796-0.93333 0.93333-0.93333s0.93333 0.41781 0.93333 0.93333v1.4h1.4v-3.4691c0-0.16392-0.086042-0.31588-0.22662-0.40017z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/plaque.svg b/data/styles/default/dark/symbols/plaque.svg
index bdfaf32e5..a42fddc51 100644
--- a/data/styles/default/dark/symbols/plaque.svg
+++ b/data/styles/default/dark/symbols/plaque.svg
@@ -1 +1 @@
-<svg version="1.1" viewBox="0 0 12 10" width="9" height="8" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><title>cinema-m</title><g transform="translate(-6 -7)" fill="none" fill-rule="evenodd"><g id="cinema-m" fill-rule="nonzero"><path d="m7.5 7a1.5 1.5 0 0 0-1.5 1.5v7a1.5 1.5 0 0 0 1.5 1.5h9a1.5 1.5 0 0 0 1.5-1.5v-7a1.5 1.5 0 0 0-1.5-1.5zm0 1a0.5 0.5 0 0 1 0 1 0.5 0.5 0 0 1 0-1zm0 7a0.5 0.5 0 0 1 0 1 0.5 0.5 0 0 1 0-1zm9 0a0.5 0.5 0 0 1 0 1 0.5 0.5 0 0 1 0-1zm0-7a0.5 0.5 0 0 1 0 1 0.5 0.5 0 0 1 0-1zm-6.5 1h1v1h-1zm2 0h2v1h-2zm-4 2h8v1h-8zm2 2h4v1h-4z" fill="#717065" opacity=".6"/></g></g></svg>
+<svg version="1.1" viewBox="0 0 12 10" width="9" height="8" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><title>cinema-m</title><g transform="translate(-6 -7)" fill="none" fill-rule="evenodd"><g id="cinema-m" fill-rule="nonzero"><path d="m7.5 7a1.5 1.5 0 0 0-1.5 1.5v7a1.5 1.5 0 0 0 1.5 1.5h9a1.5 1.5 0 0 0 1.5-1.5v-7a1.5 1.5 0 0 0-1.5-1.5zm0 1a0.5 0.5 0 0 1 0 1 0.5 0.5 0 0 1 0-1zm0 7a0.5 0.5 0 0 1 0 1 0.5 0.5 0 0 1 0-1zm9 0a0.5 0.5 0 0 1 0 1 0.5 0.5 0 0 1 0-1zm0-7a0.5 0.5 0 0 1 0 1 0.5 0.5 0 0 1 0-1zm-6.5 1h1v1h-1zm2 0h2v1h-2zm-4 2h8v1h-8zm2 2h4v1h-4z" fill="#51585E" opacity=".6"/></g></g></svg>
diff --git a/data/styles/default/dark/symbols/plumber-m.svg b/data/styles/default/dark/symbols/plumber-m.svg
index a05f74b63..3b423bd5e 100644
--- a/data/styles/default/dark/symbols/plumber-m.svg
+++ b/data/styles/default/dark/symbols/plumber-m.svg
@@ -2,7 +2,7 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <g opacity="1">
   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+  <circle cx="12" cy="12" r="11" fill="#6B425C"/>
   <path d="m9.0215 4.6055h0.17578c0.63524 0 1.1055 0.45379 1.1055 0.99414v6.3984c0 0.54035-0.47022 0.99414-1.1055 0.99414h-0.17578c-0.63524 0-1.1055-0.45379-1.1055-0.99414v-6.3984c0-0.54035 0.47022-0.99414 1.1055-0.99414zm3.0898 9.0918h6.1777c0.63524 0 1.1035 0.45379 1.1035 0.99414v0.39844c0 0.54035-0.46827 0.99414-1.1035 0.99414h-6.1777c-0.63524 0-1.1055-0.45379-1.1055-0.99414v-0.39844c0-0.54035 0.47022-0.99414 1.1055-0.99414zm-6.5117-8.0977v6.4004h1.5098v-6.4004zm5.5098 0v6.3984c0 4e-3 2.7e-5 0.0078 0 0.01172a1.0206 1.0206 0 0 1 0.87305 0.88672c0.04298-0.0028 0.08531-0.0059 0.12891-0.0059h6.1777c0.03767 0 0.07412 0.0038 0.11133 0.0059v-2.3066c0-2.7556-2.2327-4.9902-4.9883-4.9902zm0.89062 11.285v1.5156h6.4004v-1.5156c-0.03721 0.0021-0.07366 0.0059-0.11133 0.0059h-6.1777c-0.03767 0-0.07412-0.0038-0.11133-0.0059z" fill="#000"/>
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/podiatrist-m.svg b/data/styles/default/dark/symbols/podiatrist-m.svg
index 06e3966a9..95c22c721 100644
--- a/data/styles/default/dark/symbols/podiatrist-m.svg
+++ b/data/styles/default/dark/symbols/podiatrist-m.svg
@@ -2,7 +2,7 @@
   <title>podiatrist-m</title>
   <g>
     <circle id="outer" r="12" cx="12" cy="12" fill="#000" opacity=".6"/>
-    <circle id="inner" r="11" cx="12" cy="12" fill="#c15746"/>
+    <circle id="inner" r="11" cx="12" cy="12" fill="#983E44"/>
     <path id="foot" style="fill:none;stroke:#000;stroke-linecap:round" d="M 5.75312,4.63511 C 5.50295,8.03009 6.10444,9.15838 5.28585,10.7874 4.26116,12.48 1.38918,16.5018 5.31398,17.6427 c 2.83189,0.422 3.33145,-1.1134 6.24812,-1.126 3.197,-0.2327 2.3731,1.1105 4.5565,1.0513 4.8176,-0.0652 6.6909,-3.1128 3.4122,-3.1444 C 16.1296,14.467 14.3907,13.3863 12.7554,12.1964 10.8727,10.8266 10.866,9.67237 10.8667,7.04246 V 4.99275"/>
     <path id="ankle" style="fill:none;stroke:#000;stroke-linecap:round" d="m 6.50044,12.972 c -0.21527,0.4539 -0.15915,0.9867 0.1436,1.3633 0.30276,0.3767 0.79651,0.528 1.26355,0.3872"/>
   </g>
diff --git a/data/styles/default/dark/symbols/police-m.svg b/data/styles/default/dark/symbols/police-m.svg
index c1bc5895f..90240c637 100644
--- a/data/styles/default/dark/symbols/police-m.svg
+++ b/data/styles/default/dark/symbols/police-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="police-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#51585E"/>
    <path id="Shape" d="m11.727 5-5.7273 2.5455v3.8182c0 3.5318 2.4436 6.8345 5.7273 7.6364 3.2836-0.80182 5.7273-4.1045 5.7273-7.6364v-3.8182l-5.7273-2.5455zm1.5909 7.3755 0.57273 2.4691-2.1636-1.3045-2.1636 1.3045 0.57273-2.4627-1.9091-1.6482 2.52-0.21636 0.98-2.3227 0.98 2.3164 2.52 0.21636-1.9091 1.6482z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/power_plant_wind-m.svg b/data/styles/default/dark/symbols/power_plant_wind-m.svg
index 4e89acc5b..faf6bc083 100644
--- a/data/styles/default/dark/symbols/power_plant_wind-m.svg
+++ b/data/styles/default/dark/symbols/power_plant_wind-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="18" height="18" version="1.1" viewBox="0 0 24 24" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
   <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#717065"/>
+  <circle cx="12" cy="12" r="11" fill="#51585E"/>
   <path d="m17.928 3.5346c-2.9295 1.7577-3.9492 2.4263-5.3641 3.7272a2.4187 2.4187 0 0 1 1.6368 1.6368c1.3088-1.4208 1.9568-2.4135 3.7272-5.3641zm-10.015 4.4193c-1.1142 0.026812-2.3683 0.16414-4.4972 0.41808 3.1463 1.2249 4.3067 1.6261 6.1648 1.9463a2.4187 2.4187 0 0 1-0.1181-0.73694 2.4187 2.4187 0 0 1 0.55507-1.54c-0.74461-0.065094-1.423-0.1038-2.1045-0.087394zm3.9682 0.41808a1.2093 1.2093 0 0 0-1.2093 1.2093 1.2093 1.2093 0 0 0 1.2093 1.2093 1.2093 1.2093 0 0 0 1.2093-1.2093 1.2093 1.2093 0 0 0-1.2093-1.2093zm2.3219 1.8849a2.4187 2.4187 0 0 1-2.3219 1.7431 2.4187 2.4187 0 0 1-0.86213-0.16298l-0.55507 7.4191h-2.2108v1.2093h7.2561v-1.2093h-2.4187l-0.40154-7.2442c1.3757 1.2598 2.3284 1.8661 5.239 3.6162-1.7686-2.9542-2.4155-3.9476-3.7249-5.3712z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/prison-m.svg b/data/styles/default/dark/symbols/prison-m.svg
index 793c55af2..fbb67b041 100644
--- a/data/styles/default/dark/symbols/prison-m.svg
+++ b/data/styles/default/dark/symbols/prison-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="prison-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#51585E"/>
    <path id="Shape" d="m18.59 5h-13.18c-0.22665 0-0.41016 0.1835-0.41016 0.41016v13.18c0 0.22665 0.1835 0.41016 0.41016 0.41016h13.18c0.22665 0 0.41016-0.1835 0.41016-0.41016v-13.18c0-0.22665-0.1835-0.41016-0.41016-0.41016zm-0.41016 11.539h-1.668v-0.82031c0-0.45224-0.36807-0.82031-0.82031-0.82031h-0.82031c-0.45224 0-0.82031 0.36807-0.82031 0.82031s0.36807 0.82031 0.82031 0.82031h-1.4125c-0.14131-0.24225-0.22815-0.52017-0.22815-0.82031 0-0.9048 0.73582-1.6406 1.6406-1.6406h0.82031v-8.2578h2.4883v10.719zm-9.0508-10.719h2.4609v2.5738c-0.7057 0.1834-1.2305 0.81999-1.2305 1.5824 0 0.76242 0.52476 1.399 1.2305 1.5824v0.082458c-0.99527 0.11301-1.8646 0.63019-2.4609 1.3756v-7.1967zm3.2812 5.7387c0.7057-0.1834 1.2305-0.81999 1.2305-1.5824 0-0.76242-0.52476-1.399-1.2305-1.5824v-2.5738h2.4609v7.1967c-0.59633-0.74544-1.4657-1.2626-2.4609-1.3756v-0.082458zm-4.1016-5.7387v8.2578h0.82031c0.9048 0 1.6406 0.73582 1.6406 1.6406 0 0.30014-0.086838 0.57806-0.22815 0.82031h-1.4125c0.45224 0 0.82031-0.36807 0.82031-0.82031s-0.36807-0.82031-0.82031-0.82031h-0.82031c-0.45224 0-0.82031 0.36807-0.82031 0.82031v0.82031h-1.668v-10.719h2.4883z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/psychotherapist-m.svg b/data/styles/default/dark/symbols/psychotherapist-m.svg
index de2514832..8587ee252 100644
--- a/data/styles/default/dark/symbols/psychotherapist-m.svg
+++ b/data/styles/default/dark/symbols/psychotherapist-m.svg
@@ -2,7 +2,7 @@
   <title>psychotherapist-m</title>
   <g>
     <circle id="outer" r="12" cx="12" cy="12" fill="#000" opacity=".6"/>
-    <circle id="inner" r="11" cx="12" cy="12" fill="#c15746"/>
+    <circle id="inner" r="11" cx="12" cy="12" fill="#983E44"/>
     <g>
       <path id="body" style="fill:none;stroke:#000;stroke-width:1.89655;stroke-linecap:round;stroke-linejoin:round" d="m 5.97823,11.3506 4.88507,5.1778 3.8489,-2.5534 3.9605,2.6047"/>
       <circle id="head" r="1.8652495" cx="4.4898458" cy="8.5334015" style="fill:#000"/>
diff --git a/data/styles/default/dark/symbols/pub-m.svg b/data/styles/default/dark/symbols/pub-m.svg
index 574eab5ca..21c8c0af5 100644
--- a/data/styles/default/dark/symbols/pub-m.svg
+++ b/data/styles/default/dark/symbols/pub-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="beer-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#BB9342"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C491C"/>
    <path id="Shape" d="m16.116 10.413h-0.9863c0.22129-0.37302 0.35406-0.80295 0.35406-1.2645 0-1.3973-1.1317-2.529-2.529-2.529-0.21496 0-0.41728 0.031612-0.6196 0.082192-0.51844-0.42993-1.176-0.70179-1.9094-0.70179-1.1949 0-2.2192 0.70179-2.6997 1.7134-0.99895 0.33509-1.726 1.2708-1.726 2.3836 0 1.176 0.80927 2.156 1.8967 2.4405v5.4626h6.9547v-1.2645h1.2645c0.69547 0 1.2645-0.56902 1.2645-1.2645v-3.7935c0-0.69547-0.56902-1.2645-1.2645-1.2645zm-7.5869 0.94837c-0.69547 0-1.2645-0.56902-1.2645-1.2645 0-0.53741 0.34773-1.0116 0.86617-1.1886l0.5058-0.17071 0.22761-0.48051c0.29715-0.61328 0.89146-0.99262 1.5616-0.99262 0.49947 0 0.87882 0.22129 1.1001 0.41096l0.49315 0.41096s0.40464-0.20232 0.9294-0.20232c0.69547 0 1.2645 0.56902 1.2645 1.2645h-1.8967c-2.0991 0-2.4278 2.2129-3.7871 2.2129zm7.5869 4.1096h-1.2645v-3.7935h1.2645v3.7935z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/public-building-m.svg b/data/styles/default/dark/symbols/public-building-m.svg
index 6c03b8cec..607b24d60 100644
--- a/data/styles/default/dark/symbols/public-building-m.svg
+++ b/data/styles/default/dark/symbols/public-building-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="public-building-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#51585E"/>
    <path id="Shape" d="m15.692 16.143v-4.2857h-1.3846v4.2857h1.3846zm1.3846 0h0.92308v0.85714h-12v-0.85714h0.92308v-4.2857h-0.92308v-0.85714l5.5385-3.1648v-2.8352h0.92308v0.42857l1.8462-0.42857 1.8462 0.42857v1.7143l-1.8462-0.42857-1.8462 0.42857v0.69231l5.5385 3.1648v0.85714h-0.92308v4.2857zm-4.1538 0v-4.2857h-1.8462v4.2857h1.8462zm-3.2308 0v-4.2857h-1.3846v4.2857h1.3846zm2.3077-6c0.2549 0 0.46154-0.19188 0.46154-0.42857 0-0.23669-0.20664-0.42857-0.46154-0.42857s-0.46154 0.19188-0.46154 0.42857c0 0.23669 0.20664 0.42857 0.46154 0.42857z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/public_bath-m.svg b/data/styles/default/dark/symbols/public_bath-m.svg
index 467b93e68..8837f78f5 100644
--- a/data/styles/default/dark/symbols/public_bath-m.svg
+++ b/data/styles/default/dark/symbols/public_bath-m.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#7f5933"/>
+ <circle cx="12" cy="12" r="11" fill="#6E4426"/>
  <path d="m5.9316 17.09c-0.943 0-1.5048 0.5205-1.9746 0.85156-0.40228 0.28349-0.71292 0.43683-0.85742 0.47852a11 11 0 0 0 1.3828 1.5781c0.23481-0.14128 0.44324-0.29241 0.62695-0.42188 0.48213-0.33976 0.84217-0.48633 0.82227-0.48633-0.019918 0 0.3373 0.14324 0.79883 0.47656 0.46153 0.33332 1.0277 0.85742 1.9707 0.85742 0.943-1.3e-5 1.5045-0.51978 1.9727-0.84766 0.46817-0.32787 0.82081-0.48633 0.91211-0.48633 0.091299 1e-6 0.54727 0.18704 1.0938 0.52148 0.54648 0.33444 1.18 0.81299 2.1211 0.82812 0.94109 0.01509 1.5744-0.47679 2.0664-0.80078 0.49202-0.32399 0.84722-0.48242 0.94922-0.48242 0.10199 2e-6 0.55774 0.1859 1.1074 0.50977 0.18097 0.10663 0.37435 0.22728 0.58398 0.3418a11 11 0 0 0 1.3984-1.5977c-0.18907-0.060699-0.54714-0.21954-0.9668-0.4668-0.54644-0.32196-1.1865-0.7871-2.123-0.78711-0.9365 0-1.5621 0.49068-2.0508 0.8125-0.48873 0.32182-0.83618 0.47226-0.93359 0.4707-0.09733-0.0016-0.55973-0.19682-1.1094-0.5332-0.54964-0.33638-1.1895-0.81639-2.1367-0.81641-0.9472 0-1.5749 0.50889-2.0586 0.84766-0.48373 0.33877-0.84609 0.48633-0.82617 0.48633 0.019902 0-0.3373-0.1452-0.79883-0.47852-0.46152-0.33332-1.0277-0.85546-1.9707-0.85547z" fill="#000"/>
  <path d="m12 3.2847c-1.2926 0-2.3379 1.0475-2.3379 2.3398 2.482e-4 1.2913 1.0456 2.3398 2.3379 2.3398 1.2911 0 2.3379-1.0485 2.3379-2.3398 0-1.2926-1.0468-2.3398-2.3379-2.3398zm-2.584 5.2793c-1.6559 0-3.0098 1.3424-3.0098 2.9961v4.5586c1.066 0.13059 1.6293 0.67608 2.0332 0.97852v-4.8242h0.52148s0.00267 3.0451 0.00391 4.8379c0.49189-0.34641 1.2552-1.0215 2.6211-1.0215 1.3751 1.7e-5 2.1089 0.62555 2.6602 0.96289 0.25145 0.15389 0.45709 0.24341 0.58594 0.30078 0.05212-0.02549 0.11758-0.06272 0.19922-0.10938v-4.9707h0.52734v4.627c0.4514-0.30797 1.0843-0.67658 2.0352-0.73047v-4.6094c0-1.6537-1.3553-2.9961-3.0098-2.9961z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/remains-m.svg b/data/styles/default/dark/symbols/remains-m.svg
index 1b5e26a81..69440e451 100644
--- a/data/styles/default/dark/symbols/remains-m.svg
+++ b/data/styles/default/dark/symbols/remains-m.svg
@@ -2,7 +2,7 @@
  <title>remains-m</title>
  <g fill="none" fill-rule="evenodd">
   <g id="remains-m" fill-rule="nonzero">
-   <path id="Shape" d="m16.846 8.5385h-9.6923c-0.76472 0-1.3846-0.61989-1.3846-1.3846v-3.4615c0-0.38229 0.31002-0.69231 0.69231-0.69231s0.69231 0.31002 0.69231 0.69231v2.0769h1.3846v-1.3846c0-0.76472 0.61989-1.3846 1.3846-1.3846s1.3846 0.61989 1.3846 1.3846v1.3846h1.3846v-1.3846c0-0.76472 0.61989-1.3846 1.3846-1.3846 0.76472 0 1.3846 0.61989 1.3846 1.3846v1.3846h1.3846v-2.0769c0-0.38229 0.31002-0.69231 0.69231-0.69231 0.38229 0 0.69231 0.31002 0.69231 0.69231v3.4615c0 0.76472-0.61989 1.3846-1.3846 1.3846zm3.4615 12.462h-16.615c-0.38229 0-0.69231-0.31002-0.69231-0.69231 0-0.38229 0.31002-0.69231 0.69231-0.69231h0.69231c0.76472 0 1.3846-0.61989 1.3846-1.3846 0 0 1.3846-5.5385 1.3846-6.9231 0-0.76472 0.61989-1.3846 1.3846-1.3846h6.9231c0.76472 0 1.3846 0.61989 1.3846 1.3846 0 1.3846 1.3846 6.9231 1.3846 6.9231 0 0.76472 0.61989 1.3846 1.3846 1.3846h0.69231c0.37703-1.38e-4 0.68483 0.30157 0.69231 0.67846 0 0.39614-0.31002 0.70615-0.69231 0.70615zm-6.2308-4.8462c0-1.147-0.92991-2.0769-2.0769-2.0769s-2.0769 0.92991-2.0769 2.0769v3.4615h4.1538v-4.8462z" fill="#717065" opacity=".6"/>
+   <path id="Shape" d="m16.846 8.5385h-9.6923c-0.76472 0-1.3846-0.61989-1.3846-1.3846v-3.4615c0-0.38229 0.31002-0.69231 0.69231-0.69231s0.69231 0.31002 0.69231 0.69231v2.0769h1.3846v-1.3846c0-0.76472 0.61989-1.3846 1.3846-1.3846s1.3846 0.61989 1.3846 1.3846v1.3846h1.3846v-1.3846c0-0.76472 0.61989-1.3846 1.3846-1.3846 0.76472 0 1.3846 0.61989 1.3846 1.3846v1.3846h1.3846v-2.0769c0-0.38229 0.31002-0.69231 0.69231-0.69231 0.38229 0 0.69231 0.31002 0.69231 0.69231v3.4615c0 0.76472-0.61989 1.3846-1.3846 1.3846zm3.4615 12.462h-16.615c-0.38229 0-0.69231-0.31002-0.69231-0.69231 0-0.38229 0.31002-0.69231 0.69231-0.69231h0.69231c0.76472 0 1.3846-0.61989 1.3846-1.3846 0 0 1.3846-5.5385 1.3846-6.9231 0-0.76472 0.61989-1.3846 1.3846-1.3846h6.9231c0.76472 0 1.3846 0.61989 1.3846 1.3846 0 1.3846 1.3846 6.9231 1.3846 6.9231 0 0.76472 0.61989 1.3846 1.3846 1.3846h0.69231c0.37703-1.38e-4 0.68483 0.30157 0.69231 0.67846 0 0.39614-0.31002 0.70615-0.69231 0.70615zm-6.2308-4.8462c0-1.147-0.92991-2.0769-2.0769-2.0769s-2.0769 0.92991-2.0769 2.0769v3.4615h4.1538v-4.8462z" fill="#51585E" opacity=".6"/>
   </g>
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/remains-s.svg b/data/styles/default/dark/symbols/remains-s.svg
index ba0390827..12278d8e3 100644
--- a/data/styles/default/dark/symbols/remains-s.svg
+++ b/data/styles/default/dark/symbols/remains-s.svg
@@ -2,7 +2,7 @@
  <title>remains-s</title>
  <g fill="none" fill-rule="evenodd">
   <g id="remains-s" fill-rule="nonzero">
-   <path id="Shape" d="m12.159 2.4993v1.8562c0.01486 0.47771-0.38213 0.87641-0.88664 0.89045h-6.5043c-0.50462 0.0070154-0.91973-0.37475-0.92716-0.85271-9.87e-5 -0.0084-9.87e-5 -0.0168 0-0.0252v-1.8687c0-0.23892 0.20465-0.43268 0.45696-0.43268 0.25233 0 0.45696 0.19376 0.45696 0.43268v0.86537h1.2186v-0.62708c0-0.34627 0.29657-0.62708 0.66227-0.62708 0.3657 0 0.66227 0.28081 0.66227 0.62708v0.62708h1.3245v-0.62708c0-0.34627 0.29657-0.62708 0.66227-0.62708 0.3657 0 0.66227 0.28081 0.66227 0.62708v0.62708h1.3245v-0.86537c-0.04252-0.23202 0.12177-0.45275 0.36677-0.49301 0.24504-0.0402 0.47816 0.1152 0.52067 0.34728 0.0088 0.04824 0.0088 0.09756 1e-6 0.14573zm1.8411 11.062c0 0.24243-0.20756 0.43896-0.46359 0.43896h-11.073c-0.25603-1.24e-4 -0.46345-0.19678-0.46332-0.43921 2.646e-4 -0.2423 0.20755-0.43858 0.46332-0.43871h0.46359c0.49723 0.01404 0.91234-0.35618 0.92718-0.82699 5.292e-4 -0.01692 5.292e-4 -0.03396 0-0.05088 0 0 0.92717-4.0133 0.92717-4.8787-0.00741-0.47094 0.38981-0.85835 0.8873-0.86537 0.00888-1.251e-4 0.017685-1.251e-4 0.026595 0h4.6094c0.49723-0.014039 0.91234 0.35618 0.92717 0.82699 5.32e-4 0.01692 5.32e-4 0.03396 0 0.05088 0 0.87791 0.92718 4.8787 0.92718 4.8787-0.01486 0.47081 0.37616 0.86387 0.8734 0.87791 0.01782 5.05e-4 0.03592 5.05e-4 0.05374 0h0.45035c0.25604 0 0.46359 0.19653 0.46359 0.43896v-0.01248zm-4.7153-2.6714c0-0.69268-0.59299-1.2542-1.3245-1.2542-0.73154 0-1.3245 0.56149-1.3245 1.2542v2.5083h2.6491z" fill="#717065" opacity=".6"/>
+   <path id="Shape" d="m12.159 2.4993v1.8562c0.01486 0.47771-0.38213 0.87641-0.88664 0.89045h-6.5043c-0.50462 0.0070154-0.91973-0.37475-0.92716-0.85271-9.87e-5 -0.0084-9.87e-5 -0.0168 0-0.0252v-1.8687c0-0.23892 0.20465-0.43268 0.45696-0.43268 0.25233 0 0.45696 0.19376 0.45696 0.43268v0.86537h1.2186v-0.62708c0-0.34627 0.29657-0.62708 0.66227-0.62708 0.3657 0 0.66227 0.28081 0.66227 0.62708v0.62708h1.3245v-0.62708c0-0.34627 0.29657-0.62708 0.66227-0.62708 0.3657 0 0.66227 0.28081 0.66227 0.62708v0.62708h1.3245v-0.86537c-0.04252-0.23202 0.12177-0.45275 0.36677-0.49301 0.24504-0.0402 0.47816 0.1152 0.52067 0.34728 0.0088 0.04824 0.0088 0.09756 1e-6 0.14573zm1.8411 11.062c0 0.24243-0.20756 0.43896-0.46359 0.43896h-11.073c-0.25603-1.24e-4 -0.46345-0.19678-0.46332-0.43921 2.646e-4 -0.2423 0.20755-0.43858 0.46332-0.43871h0.46359c0.49723 0.01404 0.91234-0.35618 0.92718-0.82699 5.292e-4 -0.01692 5.292e-4 -0.03396 0-0.05088 0 0 0.92717-4.0133 0.92717-4.8787-0.00741-0.47094 0.38981-0.85835 0.8873-0.86537 0.00888-1.251e-4 0.017685-1.251e-4 0.026595 0h4.6094c0.49723-0.014039 0.91234 0.35618 0.92717 0.82699 5.32e-4 0.01692 5.32e-4 0.03396 0 0.05088 0 0.87791 0.92718 4.8787 0.92718 4.8787-0.01486 0.47081 0.37616 0.86387 0.8734 0.87791 0.01782 5.05e-4 0.03592 5.05e-4 0.05374 0h0.45035c0.25604 0 0.46359 0.19653 0.46359 0.43896v-0.01248zm-4.7153-2.6714c0-0.69268-0.59299-1.2542-1.3245-1.2542-0.73154 0-1.3245 0.56149-1.3245 1.2542v2.5083h2.6491z" fill="#51585E" opacity=".6"/>
   </g>
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/rental-m.svg b/data/styles/default/dark/symbols/rental-m.svg
index 184954c42..a170fa63e 100644
--- a/data/styles/default/dark/symbols/rental-m.svg
+++ b/data/styles/default/dark/symbols/rental-m.svg
@@ -2,7 +2,7 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
 	<g>
 		<circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-		<circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+		<circle cx="12" cy="12" r="11" fill="#6B425C"/>
 	</g>
 	<path d="m16.446 6.1355c-0.99735-1.7275-3.2367-2.3286-4.9642-1.3313-1.7275 0.99735-2.3265 3.2373-1.3292 4.9647 0.81698 1.415 2.4674 2.0726 3.987 1.7163l2.1528 3.7288-1.7979 1.038 1.0388 1.7992 1.7979-1.038 0.51939 0.89961 1.7992-1.0388-3.711-6.4277c1.0692-1.1378 1.3244-2.8955 0.50713-4.311zm-1.7979 1.038c0.43615 0.75544 0.18462 1.69-0.57081 2.1261-0.75544 0.43615-1.6906 0.1867-2.1267-0.56873-0.43615-0.75544-0.18538-1.6913 0.57005-2.1275 0.75544-0.43615 1.6913-0.18539 2.1275 0.57005z" fill="#000"/>
 	<path d="m9.8593 9.3548c-0.28825-0.065582-0.5878-0.063237-0.87499 0.00685l-1.4828 0.36275c-1.2472 0.3047-2.3293 1.0778-3.0218 2.159l-1.287 2.1025c-0.59609 0.92983-0.3256 2.1668 0.60418 2.763l3.054 1.9573c0.92983 0.59609 2.1668 0.3256 2.763-0.60418l1.2875-2.1044c0.69292-1.0811 0.94301-2.3875 0.69839-3.6481l-0.29016-1.4984c-0.14398-0.74223-0.71294-1.3293-1.4503-1.4964zm-3.2495 2.77 3.3642 2.0371-0.62138 1.028-3.3661-2.0376zm-1.2381 1.9987 3.3661 2.0376-0.62328 1.0275-3.3642-2.0371z" fill="#000"/>
diff --git a/data/styles/default/dark/symbols/restaurant-m.svg b/data/styles/default/dark/symbols/restaurant-m.svg
index cc7115641..5c4964d0f 100644
--- a/data/styles/default/dark/symbols/restaurant-m.svg
+++ b/data/styles/default/dark/symbols/restaurant-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="restaurant-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#BB9342"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C491C"/>
    <path id="Shape" d="m10.75 9.55v-2.9478c0-0.33259-0.26509-0.60221-0.59571-0.60221h-0.058575c-0.329 0-0.59571 0.27856-0.59571 0.60221v2.9478h-1.25v-2.9478c0-0.33259-0.26509-0.60221-0.59571-0.60221h-0.058575c-0.329 0-0.59571 0.27856-0.59571 0.60221v2.9478c0 1.378 1.25 2.45 2.4375 2.45l-0.16221 5.1908c-0.013966 0.4469 0.32885 0.80919 0.76779 0.80919h0.16385c0.438 0 0.77819-0.35736 0.75936-0.80919l-0.21628-5.1908c1.25 0 2.75-1.072 2.5-2.45v-2.9478c0-0.33259-0.26509-0.60221-0.59571-0.60221h-0.058575c-0.329 0-0.59571 0.27856-0.59571 0.60221v2.9478h-1.25zm3.25 3.25h1.5v4.455c0 0.41147 0.3329 0.74503 0.75 0.74503 0.41421 0 0.75-0.33347 0.75-0.75065v-11.249c-2.094 0-3.05 1.456-3 2.6v4.2z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/sample_collection-m.svg b/data/styles/default/dark/symbols/sample_collection-m.svg
index 8a0f1dfd1..2664d5d33 100644
--- a/data/styles/default/dark/symbols/sample_collection-m.svg
+++ b/data/styles/default/dark/symbols/sample_collection-m.svg
@@ -1,7 +1,7 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
   <g>
     <circle id="outer" r="12" cx="12" cy="12" fill="#000" opacity=".6"/>
-    <circle id="inner" r="11" cx="12" cy="12" fill="#c15746"/>
+    <circle id="inner" r="11" cx="12" cy="12" fill="#983E44"/>
     <g id="tube">
       <path style="stroke:#000;stroke-width:0.85;stroke-linecap:round;stroke-linejoin:round" d="M 13.9818,5.12063 V 16.6739"/>
       <path style="stroke:#000;stroke-width:0.4;stroke-linecap:round" d="M 10.0129,7.78034 11.9974,7.77032"/>
diff --git a/data/styles/default/dark/symbols/sawmill-m.svg b/data/styles/default/dark/symbols/sawmill-m.svg
index aef8d5666..11cd53e76 100644
--- a/data/styles/default/dark/symbols/sawmill-m.svg
+++ b/data/styles/default/dark/symbols/sawmill-m.svg
@@ -2,7 +2,7 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <g opacity="1">
   <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+  <circle cx="12" cy="12" r="11" fill="#6B425C"/>
   <path d="m11.566 2.6328-2.5312 3.543-0.0058593 0.0078126a4 4 0 0 0-0.52148 0.73828l-2.1113-0.80273 1.4844 3.2637h8.7207l-0.7832-1.7207a4 4 0 0 0-0.39258-0.875l1.7441-1.4199-4.3008-0.41797a4 4 0 0 0-0.86914-0.095703 4 4 0 0 0-0.074219 0.0058594l-0.35938-2.2266zm-6.0664 7.918c-0.554 0-1 0.446-1 1v0.89844c0 0.554 0.446 1 1 1h0.56445v5.1445c0 0.554 0.41769 1 0.93555 1s0.93555-0.446 0.93555-1v-5.1445h8.1523v5.1445c0 0.554 0.4072 1 0.91211 1s0.91211-0.446 0.91211-1v-5.1445h0.58789c0.554 0 1-0.446 1-1v-0.89844c0-0.554-0.446-1-1-1h-13z" fill="#000"/>
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/school-m.svg b/data/styles/default/dark/symbols/school-m.svg
index 73beb9615..5dcdff225 100644
--- a/data/styles/default/dark/symbols/school-m.svg
+++ b/data/styles/default/dark/symbols/school-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="school-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#51585E"/>
    <path id="Shape" d="m13.167 6c-0.64433 0-1.1667 0.51655-1.1667 1.1538 0 0.63729 0.52233 1.1538 1.1667 1.1538 0.64433 0 1.1667-0.51655 1.1667-1.1538 0-0.63729-0.52233-1.1538-1.1667-1.1538zm-5.3083 0.92307c-0.64433 0-1.1667 0.51655-1.1667 1.1538 0 0.63729 0.52233 1.1538 1.1667 1.1538 0.64433 0 1.1667-0.51655 1.1667-1.1538 0-0.63729-0.52233-1.1538-1.1667-1.1538zm6.2416 1.8461c-0.26088 0-0.69049 0.093138-1.05 0.34615l-2.275 1.6154c-0.61726 0.4344-0.050866 1.1845 0.525 0.80769l1.4875-0.98076s0.40752 0.32871 0.6125 0.98076l-0.02912 1.702-1.5167 4.0096c-0.17566 0.46329 0.15496 0.75461 0.49583 0.75005 0.22352 0 0.44463-0.14811 0.55416-0.4039l1.8958-4.2115s0.35 1.8461 1.75 1.8461c0.84129 9.23e-5 1.5167 0 1.9833 0s0.46667-0.46154 0.46667-0.46154 0-0.46154-0.46667-0.46154c-0.35 0-1.5167-9.23e-5 -1.8667 0 0 0-0.46667 0-0.46667-0.92307 0-0.64957-0.7282-2.3062-0.93333-2.7692v-0.46154l2.3333 1.2692c0.63448 0.41843 1.1986-0.32234 0.58333-0.7788l-2.45-1.4135c-0.48249-0.26806-1.0101-0.46154-1.6333-0.46154h-4.66e-5zm-6.65 0.92307c-0.35 0-0.51553 0.16375-0.7 0.34615l-1.4875 1.4712c-0.19152 0.18941-0.2625 0.35889-0.2625 0.60572 0 0.34615 0.52045 0.52366 0.81666 0.23077l1.2833-1.2692c0.29381 0 0.7 0.036 0.7 0.46154v1.9615l-1.05 2.7692c-0.29083 0.76698 0.80098 1.0029 1.05 0.34615l1.05-2.7692s0.35 0.46154 1.05 0.46154h2.0417c0.7 0 0.7-0.92307 0-0.92307h-1.8083s-0.46667 0-0.46667-0.46154v-0.6923c0-1.3846-0.46667-2.5385-1.1667-2.5385h-1.05z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/seafood-shop-m.svg b/data/styles/default/dark/symbols/seafood-shop-m.svg
index 7cc5a358e..d5c6b3fe3 100644
--- a/data/styles/default/dark/symbols/seafood-shop-m.svg
+++ b/data/styles/default/dark/symbols/seafood-shop-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="seafood-shop-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <path id="Shape" d="m12.95 8c-2.1868 0-4.0964 1.3312-5.1593 2.4702l-2.1226-1.6054c-0.29483-0.22312-0.735 0.014583-0.65965 0.35632l0.58771 2.6678-0.58795 2.668c-0.075347 0.34174 0.36483 0.5792 0.65965 0.35632l2.1226-1.6054c1.0629 1.1387 2.9728 2.4699 5.1596 2.4699 3.341 0 6.0496-3.1111 6.0496-3.8889s-2.7086-3.8889-6.0496-3.8889zm2.125 4.4722c-0.32205 0-0.58333-0.26128-0.58333-0.58333 0-0.32229 0.26128-0.58333 0.58333-0.58333 0.32229 0 0.58333 0.26104 0.58333 0.58333 0 0.32205-0.26128 0.58333-0.58333 0.58333z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/second_hand_shop-m.svg b/data/styles/default/dark/symbols/second_hand_shop-m.svg
index 3ba2cf4dc..2944a5a7a 100644
--- a/data/styles/default/dark/symbols/second_hand_shop-m.svg
+++ b/data/styles/default/dark/symbols/second_hand_shop-m.svg
@@ -2,7 +2,7 @@
     <title>second_hand-shop-m</title>
     <g id="second_hand-shop-m" opacity="1">
         <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-        <circle cx="12" cy="12" r="11" fill="#8c5f93"/>
+        <circle cx="12" cy="12" r="11" fill="#6B425C"/>
         <path d="m12 5c-1.84 0-3.334 1.494-3.334 3.334h-1.332c-0.73333 0-1.3281 0.5987-1.3281 1.332l-0.0058594 8c0 0.73333 0.60065 1.334 1.334 1.334h9.332c0.73333 0 1.334-0.60065 1.334-1.334v-8c0-0.73333-0.60065-1.332-1.334-1.332h-1.332c0-1.84-1.494-3.334-3.334-3.334zm0 1.334c1.1067 0 2 0.89333 2 2h-4c0-1.1067 0.89333-2 2-2zm-0.48438 3.3887a0.18577 0.18577 0 0 1 0.20703 0.17773l0.033203 0.95313a0.18577 0.18577 0 0 1-0.1582 0.18945c-0.53544 0.080958-1.0505 0.32679-1.4629 0.74219-0.96134 0.9683-1.0084 2.4924-0.16992 3.5371l0.9082-0.91406a0.18577 0.18577 0 0 1 0.31641 0.13086l0.005859 2.6738a0.18577 0.18577 0 0 1-0.19531 0.18555l-2.5254-0.13672a0.18577 0.18577 0 0 1-0.12305-0.31641l0.68359-0.69141c-1.346-1.5623-1.2981-3.9206 0.17188-5.4004 0.64649-0.6513 1.464-1.0284 2.3086-1.1309zm1.4883 0.21094 2.5254 0.13867a0.18577 0.18577 0 0 1 0.12109 0.31641l-0.68359 0.68945c1.3472 1.5614 1.3019 3.9213-0.16797 5.4023a0.18577 0.18577 0 0 0-0.001953 0c-0.64713 0.65097-1.4662 1.0264-2.3105 1.1289a0.18577 0.18577 0 0 1-0.20703-0.17773l-0.03125-0.95117a0.18577 0.18577 0 0 1 0.1582-0.18945c0.53505-0.080899 1.0489-0.32867 1.4609-0.74414a0.18577 0.18577 0 0 0 0.001953 0c0.96134-0.96747 1.0086-2.4897 0.16992-3.5352l-0.9082 0.91406a0.18577 0.18577 0 0 1-0.31641-0.13086l-0.005859-2.6758a0.18577 0.18577 0 0 1 0.19531-0.18555z" fill="#000"/>
     </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/shinto-m.svg b/data/styles/default/dark/symbols/shinto-m.svg
index a38746157..915427a7e 100644
--- a/data/styles/default/dark/symbols/shinto-m.svg
+++ b/data/styles/default/dark/symbols/shinto-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="shinto-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#7F5933"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6E4426"/>
    <path id="Shape" d="m16.895 7.3846h0.18176v0.92308h-1.8252l0.062937 1.3846h2.6853v0.92308h-2.6434l0.33566 7.3846h-1.3846v-7.3846h-4.6154v7.3846h-1.3846l0.33566-7.3846h-2.6434v-0.92308h2.6853l0.062937-1.3846h-1.8252v-0.92308h0.21489c-0.88208-0.23077-1.138-0.46154-1.138-0.46154v-0.92308s1.8576 0.46154 6.0262 0.46154c4.1686 0 5.9738-0.46154 5.9738-0.46154v0.92308s-0.23932 0.23077-1.1048 0.46154zm-7.2029 0.92308v1.3846h1.8462v-1.3846h-1.8462zm4.6154 0h-1.8462v1.3846h1.8462v-1.3846z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/shinto-s.svg b/data/styles/default/dark/symbols/shinto-s.svg
index cac153339..4b94f82c2 100644
--- a/data/styles/default/dark/symbols/shinto-s.svg
+++ b/data/styles/default/dark/symbols/shinto-s.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="shinto-s" fill-rule="nonzero">
    <circle id="Oval" cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="8" cy="8" r="7" fill="#7F5933"/>
+   <circle id="Oval" cx="8" cy="8" r="7" fill="#6E4426"/>
    <path id="Shape" d="m7.5556 5.3333h-0.88889v1.3333h2.6667v-1.3333h-0.88889v1.3333h-0.88889v-1.3333zm-0.88889 2.2222v4.4444h-0.88889v-4.4444h-0.88889v-0.88889h0.88889v-1.3333h-0.88889v-0.44444h6.2222v0.44444h-0.88889v1.3333h0.88889v0.88889h-0.88889v4.4444h-0.88889v-4.4444h-2.6667zm-2.6667-3.5556s2.6461 0.44444 3.9913 0.44444c1.3453 0 4.0087-0.44444 4.0087-0.44444v0.88889h-8v-0.88889z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/shoes-m.svg b/data/styles/default/dark/symbols/shoes-m.svg
index 605e8ac87..f5e0f708d 100644
--- a/data/styles/default/dark/symbols/shoes-m.svg
+++ b/data/styles/default/dark/symbols/shoes-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="shoes-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <path id="Path" d="m6 18h2.6956v-2.7326h0.74335l2.2301 2.7326h1.4867l4.8439-1.7841s0.073406-1.3235-1.7515-1.3235c-3.7549 0-4.7389-2.7318-4.5791-3.8206 0.15982-1.0888 0.74335-5.0718 0.74335-5.0718l-6.4124 1.4118v10.588z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/shop-bicycle-m.svg b/data/styles/default/dark/symbols/shop-bicycle-m.svg
index 84ff20dd1..d81769767 100644
--- a/data/styles/default/dark/symbols/shop-bicycle-m.svg
+++ b/data/styles/default/dark/symbols/shop-bicycle-m.svg
@@ -2,6 +2,6 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
 	<title>bicycle-m</title>
 	<circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-	<circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+	<circle cx="12" cy="12" r="11" fill="#6B425C"/>
 	<path d="m12 6.8323c-0.63294-0.00939-0.63294 0.94862 0 0.93961h1.4043v1.1892l-2.6238 2.193-0.91243-2.4426h0.25969c0.63294 0.00939 0.63294-0.94862 0-0.93961h-1.8723c-0.63294-0.00939-0.63294 0.94862 0 0.93961h0.61066l0.83385 2.2316c-0.43794-0.21856-0.9241-0.35236-1.4445-0.35236-1.8041 0-3.2766 1.4779-3.2766 3.2886 0 1.8107 1.4725 3.2886 3.2766 3.2886 1.8041 0 3.2766-1.4779 3.2766-3.2886 0-0.62944-0.18751-1.2131-0.49551-1.7141l2.6403-2.2077 0.43335 1.0902c-0.97602 0.57063-1.6419 1.6207-1.6419 2.8316 0 1.8107 1.4725 3.2886 3.2766 3.2886 1.8041 0 3.2766-1.4779 3.2766-3.2886 0-1.8107-1.4725-3.2886-3.2766-3.2886-0.26503 0-0.51901 0.04077-0.76621 0.10092l-0.63809-1.6021v-1.7874c0-0.25942-0.20961-0.4698-0.46808-0.4698zm-3.7446 4.698c0.55449 0 1.0556 0.1991 1.4555 0.51932l-1.7554 1.4682c-0.47829 0.40149 0.11964 1.1223 0.59971 0.72303l1.7554-1.4682c0.17619 0.33056 0.28525 0.70364 0.28525 1.1067 0 1.3029-1.0423 2.3491-2.3404 2.3491-1.2981 0-2.3404-1.0462-2.3404-2.3491s1.0422-2.3491 2.3404-2.3491zm7.4893 0c1.2981 0 2.3404 1.0462 2.3404 2.3491 0 1.3029-1.0423 2.3491-2.3404 2.3491-1.2981 0-2.3404-1.0462-2.3404-2.3491 0-0.82403 0.41828-1.5429 1.0532-1.9618l0.8521 2.1361c0.2303 0.58547 1.105 0.23499 0.87041-0.34869l-0.85018-2.1325c0.135-0.02405 0.2728-0.04219 0.415-0.04219z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/shop-m.svg b/data/styles/default/dark/symbols/shop-m.svg
index 3a0651c18..582fa7f23 100644
--- a/data/styles/default/dark/symbols/shop-m.svg
+++ b/data/styles/default/dark/symbols/shop-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="shop-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <path id="Shape" d="m16.667 8.3333h-1.3333c0-1.84-1.4933-3.3333-3.3333-3.3333s-3.3333 1.4933-3.3333 3.3333h-1.3333c-0.73333 0-1.3267 0.6-1.3267 1.3333l-0.0066667 8c0 0.73333 0.6 1.3333 1.3333 1.3333h9.3333c0.73333 0 1.3333-0.6 1.3333-1.3333v-8c0-0.73333-0.6-1.3333-1.3333-1.3333zm-4.6667-2c1.1067 0 2 0.89333 2 2h-4c0-1.1067 0.89333-2 2-2zm0 6.6667c-1.84 0-3.3333-1.4933-3.3333-3.3333h1.3333c0 1.1067 0.89333 2 2 2s2-0.89333 2-2h1.3333c0 1.84-1.4933 3.3333-3.3333 3.3333z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/shop-rental-bicycle-m.svg b/data/styles/default/dark/symbols/shop-rental-bicycle-m.svg
index 6172aa38d..cffd66d34 100644
--- a/data/styles/default/dark/symbols/shop-rental-bicycle-m.svg
+++ b/data/styles/default/dark/symbols/shop-rental-bicycle-m.svg
@@ -2,7 +2,7 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
 	<title>bicycle-m</title>
 	<circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-	<circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+	<circle cx="12" cy="12" r="11" fill="#6B425C"/>
 	<path transform="translate(2,2)" d="m9.0974 3.7509c-0.324-0.90257-1.1803-1.5429-2.1831-1.5429-1.2806 0-2.3143 1.0337-2.3143 2.3143 0 1.2729 1.0337 2.3143 2.3143 2.3143 1.0029 0 1.8591-0.648 2.1831-1.5429h3.9883v1.5429h1.5429v-1.5429h0.77142v-1.5429zm-2.1831 1.5429c-0.42429 0-0.77143-0.34714-0.77143-0.77143s0.34714-0.77143 0.77143-0.77143 0.77143 0.34714 0.77143 0.77143-0.34714 0.77143-0.77143 0.77143z" fill="#000"/>
 	<path transform="translate(2,2)" d="m9.9998 7.3147c-0.63102-0.00937-0.63102 0.94574 0 0.93675h1.4v1.1855l-2.6158 2.1863-0.90966-2.4352h0.2589c0.63102 0.00937 0.63102-0.94573 0-0.93675h-1.8667c-0.63102-0.00937-0.63102 0.94573 0 0.93675h0.6088l0.83132 2.2248c-0.43661-0.21789-0.92129-0.35129-1.4401-0.35129-1.7986 0-3.2667 1.4734-3.2667 3.2786s1.468 3.2786 3.2667 3.2786c1.7986 0 3.2667-1.4734 3.2667-3.2786 0-0.62753-0.18694-1.2094-0.49401-1.7089l2.6322-2.201 0.43204 1.0869c-0.97305 0.56889-1.6369 1.6157-1.6369 2.823 0 1.8052 1.468 3.2786 3.2667 3.2786s3.2667-1.4734 3.2667-3.2786-1.468-3.2786-3.2667-3.2786c-0.26422 0-0.51743 0.04065-0.76388 0.10061l-0.63615-1.5973v-1.782c0-0.25864-0.20898-0.46838-0.46666-0.46838zm-3.7332 4.6838c0.5528 0 1.0524 0.1985 1.451 0.51774l-1.75 1.4637c-0.47684 0.40027 0.11928 1.1189 0.59789 0.72084l1.75-1.4637c0.17565 0.32955 0.28438 0.7015 0.28438 1.1033 0 1.2989-1.0392 2.3419-2.3333 2.3419s-2.3333-1.043-2.3333-2.3419 1.039-2.3419 2.3333-2.3419zm7.4665 0c1.2941 0 2.3333 1.043 2.3333 2.3419s-1.0392 2.3419-2.3333 2.3419-2.3333-1.043-2.3333-2.3419c0-0.82153 0.41701-1.5382 1.05-1.9558l0.84951 2.1297c0.2296 0.58369 1.1017 0.23428 0.86776-0.34763l-0.84759-2.126c0.13459-0.02398 0.27197-0.04206 0.41374-0.04206z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/shop-s.svg b/data/styles/default/dark/symbols/shop-s.svg
index 2732d6413..e8eb5faba 100644
--- a/data/styles/default/dark/symbols/shop-s.svg
+++ b/data/styles/default/dark/symbols/shop-s.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="shop-s" fill-rule="nonzero">
    <circle id="Oval" cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="8" cy="8" r="7.3333" fill="#8C5F93"/>
+   <circle id="Oval" cx="8" cy="8" r="7.3333" fill="#6B425C"/>
    <path id="Shape" d="m11.111 5.5556h-0.88889c0-1.2267-0.99556-2.2222-2.2222-2.2222s-2.2222 0.99556-2.2222 2.2222h-0.88889c-0.48889 0-0.88444 0.4-0.88444 0.88889l-0.0044444 5.3333c0 0.48889 0.4 0.88889 0.88889 0.88889h6.2222c0.48889 0 0.88889-0.4 0.88889-0.88889v-5.3333c0-0.48889-0.4-0.88889-0.88889-0.88889zm-3.1111-1.3333c0.73778 0 1.3333 0.59556 1.3333 1.3333h-2.6667c0-0.73778 0.59556-1.3333 1.3333-1.3333zm0 4.4444c-1.2267 0-2.2222-0.99556-2.2222-2.2222h0.88889c0 0.73778 0.59556 1.3333 1.3333 1.3333s1.3333-0.59556 1.3333-1.3333h0.88889c0 1.2267-0.99556 2.2222-2.2222 2.2222z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/slots-m.svg b/data/styles/default/dark/symbols/slots-m.svg
index 10ed87530..fed6046db 100644
--- a/data/styles/default/dark/symbols/slots-m.svg
+++ b/data/styles/default/dark/symbols/slots-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#7f5933"/>
+ <circle cx="12" cy="12" r="11" fill="#6E4426"/>
  <path d="m2.977 8.1665q0.308 0 0.429 0.198 0.099 0.143 0.121 0.495 0.429-0.726 1.397-0.726 0.616 0 1.188 0.286l0.506 0.253q0.176 0.088 0.297 0.088 0.143 0 0.242-0.143l0.165-0.242q0.154-0.22 0.473-0.22 0.363 0 0.605 0.308 0.253 0.308 0.253 0.781 0 0.792-0.605 1.54-0.176 0.209-0.561 0.638-0.792 0.869-1.078 1.386-0.275 0.506-0.275 1.078 0 0.187 0.055 0.572 0.055 0.374 0.055 0.561 0 0.385-0.253 0.616t-0.682 0.231q-0.594 0-0.935-0.451-0.341-0.462-0.341-1.265 0-1.287 0.858-2.167 0.418-0.429 1.012-0.913 0.715-0.583 1.056-0.968-0.462 0.209-0.814 0.209-0.473 0-1.155-0.385l-0.506-0.286q-0.187-0.099-0.341-0.099-0.33 0-0.33 0.363 0 0.011 0.022 0.099l0.099 0.374q0.055 0.209 0.055 0.385 0 0.88-0.858 0.88-0.814 0-0.814-0.77 0-0.231 0.033-0.451 0.088-0.583 0.088-0.682 0-0.143-0.055-0.429-0.055-0.297-0.055-0.44 0-0.308 0.176-0.506 0.187-0.198 0.473-0.198zm6.515 0q0.308 0 0.429 0.198 0.099 0.143 0.121 0.495 0.429-0.726 1.397-0.726 0.616 0 1.188 0.286l0.506 0.253q0.176 0.088 0.297 0.088 0.143 0 0.242-0.143l0.165-0.242q0.154-0.22 0.473-0.22 0.363 0 0.605 0.308 0.253 0.308 0.253 0.781 0 0.792-0.605 1.54-0.176 0.209-0.561 0.638-0.792 0.869-1.078 1.386-0.275 0.506-0.275 1.078 0 0.187 0.055 0.572 0.055 0.374 0.055 0.561 0 0.385-0.253 0.616t-0.682 0.231q-0.594 0-0.935-0.451-0.341-0.462-0.341-1.265 0-1.287 0.858-2.167 0.418-0.429 1.012-0.913 0.715-0.583 1.056-0.968-0.462 0.209-0.814 0.209-0.473 0-1.155-0.385l-0.506-0.286q-0.187-0.099-0.341-0.099-0.33 0-0.33 0.363 0 0.011 0.022 0.099l0.099 0.374q0.055 0.209 0.055 0.385 0 0.88-0.858 0.88-0.814 0-0.814-0.77 0-0.231 0.033-0.451 0.088-0.583 0.088-0.682 0-0.143-0.055-0.429-0.055-0.297-0.055-0.44 0-0.308 0.176-0.506 0.187-0.198 0.473-0.198zm6.515 0q0.308 0 0.429 0.198 0.099 0.143 0.121 0.495 0.429-0.726 1.397-0.726 0.616 0 1.188 0.286l0.506 0.253q0.176 0.088 0.297 0.088 0.143 0 0.242-0.143l0.165-0.242q0.154-0.22 0.473-0.22 0.363 0 0.605 0.308 0.253 0.308 0.253 0.781 0 0.792-0.605 1.54-0.176 0.209-0.561 0.638-0.792 0.869-1.078 1.386-0.275 0.506-0.275 1.078 0 0.187 0.055 0.572 0.055 0.374 0.055 0.561 0 0.385-0.253 0.616t-0.682 0.231q-0.594 0-0.935-0.451-0.341-0.462-0.341-1.265 0-1.287 0.858-2.167 0.418-0.429 1.012-0.913 0.715-0.583 1.056-0.968-0.462 0.209-0.814 0.209-0.473 0-1.155-0.385l-0.506-0.286q-0.187-0.099-0.341-0.099-0.33 0-0.33 0.363 0 0.011 0.022 0.099l0.099 0.374q0.055 0.209 0.055 0.385 0 0.88-0.858 0.88-0.814 0-0.814-0.77 0-0.231 0.033-0.451 0.088-0.583 0.088-0.682 0-0.143-0.055-0.429-0.055-0.297-0.055-0.44 0-0.308 0.176-0.506 0.187-0.198 0.473-0.198z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/social_facility-m.svg b/data/styles/default/dark/symbols/social_facility-m.svg
index 781dfe8f7..e0a71ab16 100644
--- a/data/styles/default/dark/symbols/social_facility-m.svg
+++ b/data/styles/default/dark/symbols/social_facility-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="9" cy="9" r="9" fill="#000" opacity=".6"/>
- <circle cx="9" cy="9" r="8.25" fill="#7f5933"/>
+ <circle cx="9" cy="9" r="8.25" fill="#6E4426"/>
  <path d="m9.0065 3.1838c-0.69012-1e-7 -1.2497 0.54352-1.25 1.2142-5.979e-4 0.67131 0.55922 1.2158 1.25 1.2158 0.69078 2e-7 1.2506-0.54451 1.25-1.2158-3.28e-4 -0.67067-0.55988-1.2142-1.25-1.2142zm-4.5898 1.2158a0.41667 0.41667 0 0 0-0.41667 0.41667v5c0 0.83333-4.809e-4 0.83333 0.97331 1.6667 0.69288 0.83333 0.69336 0.83333 0.69336 1.6667v1.6667h2.5v-2.5c0-0.65761-0.34436-0.61448-0.83333-0.83333-1.4491-0.83333-2.5-1.6667-2.5-2.5v-4.1667a0.41667 0.41667 0 0 0-0.41667-0.41667zm9.1667 0a0.41667 0.41667 0 0 0-0.41667 0.41667v4.1667c0 0.83333-1.0509 1.6667-2.5 2.5-0.48897 0.21885-0.83333 0.17573-0.83333 0.83333v2.5h2.5v-1.6667c0-0.83333 4.81e-4 -0.83333 0.69336-1.6667 0.97379-0.83333 0.97331-0.83333 0.97331-1.6667v-5a0.41667 0.41667 0 0 0-0.41667-0.41667zm-4.5833 2.0833c-1.6667 0-1.6667 0.83333-1.6667 1.6667v2.5h3.3333v-2.5c0-0.83333 0-1.6667-1.6667-1.6667z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/speech_therapist-m.svg b/data/styles/default/dark/symbols/speech_therapist-m.svg
index adf1cf476..5af3ad9fe 100644
--- a/data/styles/default/dark/symbols/speech_therapist-m.svg
+++ b/data/styles/default/dark/symbols/speech_therapist-m.svg
@@ -2,7 +2,7 @@
   <title>speech_therapist-m</title>
   <g>
     <circle id="outer" r="12" cx="12" cy="12" fill="#000" opacity=".6"/>
-    <circle id="inner" r="11" cx="12" cy="12" fill="#c15746"/>
+    <circle id="inner" r="11" cx="12" cy="12" fill="#983E44"/>
     <path id="head" style="fill:#000" d="M 9.6757357,1.2108754 C 4.3859809,2.341679 0.84429065,6.8174867 0.96715164,12 c 0.00794,3.247954 1.34511906,6.127129 3.62920226,8.165252 0.3253747,-0.88184 0.8492059,-1.679169 2.1171875,-2.134753 1.1792361,0.101291 3.2036272,0.548712 3.5234366,-0.165921 0.394469,-0.900775 1.265967,-2.141178 0.857422,-2.287106 -2.5660364,-1.001046 -0.582402,-1.263798 0.544563,-1.739981 0.2673,-0.180661 -0.417491,-1.014652 -0.57386,-1.277707 0.21439,0.130772 2.080621,0.255118 1.931641,-0.572258 C 12.967904,11.641699 11.286983,10.186354 11.145182,8.6516018 10.853848,7.1106884 11.546427,5.4882128 11.264323,3.9347891 10.935305,2.9241434 10.374178,1.9919147 9.6757357,1.2108754 Z"/>
     <g id="audio_lines" style="fill:none;stroke:#000;stroke-linecap:round">
       <path d="m 14.4287,10.9386 c 0.5526,0.5813 0.863,1.3696 0.863,2.1916 0,0.822 -0.3104,1.6103 -0.863,2.1916"/>
diff --git a/data/styles/default/dark/symbols/sports-m.svg b/data/styles/default/dark/symbols/sports-m.svg
index b71d7ef36..3436085ec 100644
--- a/data/styles/default/dark/symbols/sports-m.svg
+++ b/data/styles/default/dark/symbols/sports-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="sports-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <path id="Shape" d="m17.444 6.5556h-1.5556v-1.5556h-7.7778v1.5556h-1.5556c-0.85556 0-1.5556 0.7-1.5556 1.5556v0.77778c0 1.9833 1.4933 3.6011 3.4144 3.8422 0.49 1.1667 1.54 2.0456 2.8078 2.3022v2.4111h-3.1111v1.5556h7.7778v-1.5556h-3.1111v-2.4111c1.2678-0.25667 2.3178-1.1356 2.8078-2.3022 1.9211-0.24111 3.4144-1.8589 3.4144-3.8422v-0.77778c0-0.85556-0.7-1.5556-1.5556-1.5556zm-10.889 2.3333v-0.77778h1.5556v2.9711c-0.90222-0.32667-1.5556-1.1822-1.5556-2.1933zm10.889 0c0 1.0111-0.65333 1.8667-1.5556 2.1933v-2.9711h1.5556v0.77778z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/sports_centre-m.svg b/data/styles/default/dark/symbols/sports_centre-m.svg
index 86a4900d3..6e9d0f4f5 100644
--- a/data/styles/default/dark/symbols/sports_centre-m.svg
+++ b/data/styles/default/dark/symbols/sports_centre-m.svg
@@ -1,7 +1,7 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
   <title>sports_centre-m</title>
   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#717065"/>
+  <circle cx="12" cy="12" r="11" fill="#51585E"/>
   <g fill="none" fill-rule="evenodd">
     <g id="pitch-m" fill-rule="nonzero">
       <path id="Shape" d="m 11.672709,4.7280561 c -0.896063,0 -1.622449,0.6853555 -1.622449,1.5309036 0,0.8455642 0.726377,1.5309036 1.622449,1.5309036 0.896064,0 1.622449,-0.6853555 1.622449,-1.5309036 0,-0.8455643 -0.726377,-1.5309036 -1.622449,-1.5309036 z M 7.0082488,7.7898633 7.4138611,9.3208476 C 7.6166592,10.086299 8.101083,10.086299 8.7067301,10.086299 H 10.05026 c 0.481661,0.765452 0.255261,2.009882 0.405612,3.179613 H 9.7207042 c -0.8112246,0 -2.1040935,0.765452 -1.2928689,2.296396 l 1.2168368,2.296476 c 0.8112249,1.530904 2.0279809,0.38273 1.6224489,-0.38273 l -1.216837,-2.296476 c -0.2027977,-0.38273 0.214409,-0.38273 0.405613,-0.38273 h 2.002044 c 0,0 0.960299,1.893611 2.091408,3.272127 0.417546,0.50881 0.880065,1.202859 1.458992,1.202859 0.405596,0 1.100648,-0.591491 0.360914,-1.424491 -1.385303,-1.559991 -2.262864,-3.168301 -2.262864,-3.933793 0,-0.890327 -0.16576,-2.765354 -0.405596,-3.827299 h 1.216837 c 0.395868,0.74867 1.090709,1.91365 1.090709,1.91365 0.448387,0.732897 1.185648,0.677518 1.185648,0 0,-0.09286 -0.01185,-0.292776 -0.113224,-0.518101 L 15.931638,8.9380773 C 15.856592,8.772051 15.726069,8.5553474 15.120414,8.5553474 H 8.8335041 L 8.2250938,6.6416169 c -0.2433593,-0.7654518 -1.419643,-0.7654518 -1.419643,0 0,0.3827299 0.1437095,0.8474226 0.202798,1.1481575 z" fill="#000"/>
diff --git a/data/styles/default/dark/symbols/stadium-m.svg b/data/styles/default/dark/symbols/stadium-m.svg
index 8356fa09d..260966068 100644
--- a/data/styles/default/dark/symbols/stadium-m.svg
+++ b/data/styles/default/dark/symbols/stadium-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#7F5933"/>
+ <circle cx="12" cy="12" r="11" fill="#6E4426"/>
  <path d="m7.1 6h1.4l2.1 1.4-2.1 1.4v0.93412c1.0296-0.1489 2.225-0.23412 3.5-0.23412s2.4704 0.085218 3.5 0.23412v-3.7341h1.4l2.1 1.4-2.1 1.4v1.2002c1.296 0.31761 2.1 0.76021 2.1 1.2498 0 0.96649-3.134 1.75-7 1.75-3.866 0-7-0.78351-7-1.75 0-0.48954 0.80405-0.93214 2.1-1.2498v-4.0002zm4.9 4.55c-2.3196 0-3.5 0.1201-3.5 0.69999 0 0.57988 1.1804 0.7 3.5 0.7 2.3196 0 3.5-0.12012 3.5-0.7 0-0.57989-1.1804-0.69999-3.5-0.69999zm0 3.675c2.6658 0 5.0415-0.46564 6.5804-1.1919l-0.98035 5.5669h-3.5v-1.4c0-0.77322-0.62678-1.4-1.4-1.4h-1.4c-0.77321 0-1.4 0.62678-1.4 1.4v1.4h-3.5l-0.98035-5.5669c1.5388 0.72625 3.9146 1.1919 6.5804 1.1919z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/stadium-s.svg b/data/styles/default/dark/symbols/stadium-s.svg
index 42fda798e..c98ece54c 100644
--- a/data/styles/default/dark/symbols/stadium-s.svg
+++ b/data/styles/default/dark/symbols/stadium-s.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
  <circle cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
- <circle cx="8" cy="8" r="7.3333" fill="#7F5933"/>
+ <circle cx="8" cy="8" r="7.3333" fill="#6E4426"/>
  <path d="m4.7333 4h0.93333l1.4 0.93333-1.4 0.93333v0.62275c0.68641-0.099269 1.4833-0.15608 2.3333-0.15608s1.6469 0.056812 2.3333 0.15608v-2.4894h0.93333l1.4 0.93333-1.4 0.93333v0.80017c0.86399 0.21174 1.4 0.5068 1.4 0.83317 0 0.64433-2.0894 1.1667-4.6667 1.1667-2.5773 0-4.6667-0.52234-4.6667-1.1667 0-0.32636 0.53603-0.62143 1.4-0.83317v-2.6668zm3.2667 3.0333c-1.5464 0-2.3333 0.080066-2.3333 0.46666 0 0.38659 0.78694 0.46667 2.3333 0.46667 1.5464 0 2.3333-0.08008 2.3333-0.46667 0-0.3866-0.78694-0.46666-2.3333-0.46666zm0 2.45c1.7772 0 3.361-0.31043 4.3869-0.79459l-0.65357 3.7113h-2.3333v-0.93333c0-0.51548-0.41785-0.93333-0.93333-0.93333h-0.93333c-0.51547 0-0.93333 0.41785-0.93333 0.93333v0.93333h-2.3333l-0.65357-3.7113c1.0259 0.48417 2.6097 0.79459 4.3869 0.79459z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/stationery_shop-m.svg b/data/styles/default/dark/symbols/stationery_shop-m.svg
index 64eb324fa..07a61cc89 100644
--- a/data/styles/default/dark/symbols/stationery_shop-m.svg
+++ b/data/styles/default/dark/symbols/stationery_shop-m.svg
@@ -2,7 +2,7 @@
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <g opacity="1">
   <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-  <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+  <circle cx="12" cy="12" r="11" fill="#6B425C"/>
   <path d="m14.861 4.8613c-1.2646-0.014877-2.3354 0.42329-3.2363 1.3242l-6.166 6.168 0.97656 0.97656 6.1816-6.1797c0.61883-0.61883 1.3737-0.92656 2.2363-0.91406 0.87307 0.012653 1.619 0.33191 2.2559 0.96875 0.62719 0.62719 0.94762 1.3731 0.96875 2.248 0.02086 0.86347-0.27659 1.6086-0.88477 2.2168l-5.9688 5.9688c-0.38041 0.38041-0.84556 0.57228-1.3672 0.56836-0.53199-0.003999-0.98371-0.19464-1.3711-0.58203-0.38739-0.38738-0.57804-0.8391-0.58203-1.3711-0.0039218-0.52163 0.18795-0.98678 0.56836-1.3672l5.457-5.457c0.13861-0.13862 0.29707-0.20571 0.49023-0.20898 0.1813-0.00307 0.34803 0.064829 0.47852 0.19531 0.12844 0.12845 0.19562 0.2973 0.18945 0.48242-0.0065 0.19618-0.07935 0.36255-0.23047 0.51367l-5.668 5.6719 0.97656 0.97656 5.6289-5.627c0.41232-0.41232 0.63359-0.91328 0.66016-1.4922 0.027234-0.59369-0.16242-1.0882-0.57812-1.5039-0.41169-0.41168-0.89023-0.61093-1.4648-0.60547-0.5639 0.00537-1.0564 0.21463-1.4609 0.61914l-5.4434 5.4434c-0.65971 0.65971-0.98633 1.4342-0.98633 2.3535 0 0.91033 0.33247 1.7016 0.98633 2.3555 0.64552 0.64553 1.4332 0.97349 2.3457 0.97852 0.92235 0.0051 1.6972-0.31243 2.3496-0.96484l5.9414-5.9414c0.90093-0.90093 1.3363-1.968 1.3164-3.2285-0.019672-1.2491-0.48027-2.3279-1.373-3.2207-0.8932-0.8932-1.973-1.3505-3.2266-1.3652z" fill="#000"/>
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/statue-m.svg b/data/styles/default/dark/symbols/statue-m.svg
index f7e7b4294..51e13a968 100644
--- a/data/styles/default/dark/symbols/statue-m.svg
+++ b/data/styles/default/dark/symbols/statue-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
- <path d="m7.9987 18h8.0023" stroke="#717065" opacity=".6" stroke-linecap="round" stroke-width="1.333"/>
- <path d="m9.332 20.666h5.3357" stroke="#717065" opacity=".6" stroke-linecap="round" stroke-width="1.333"/>
- <path d="m12 2.6666c-0.84966 0-1.5393 0.68968-1.5393 1.5393 0 0.84966 0.68968 1.5364 1.5393 1.5364s1.5393-0.68678 1.5393-1.5364c0-0.84966-0.68968-1.5393-1.5393-1.5393zm-1.5393 4.103c-0.54085 0-1.0243 0.49145-1.0243 1.0243 0 1.0256 1.794 4.121 1.794 5.1302v3.0758h1.5393v-3.0758c0-0.98918 1.794-4.1045 1.794-5.1302 0-0.56757-0.45886-1.0243-1.0243-1.0243z" fill="#717065" opacity=".6"/>
+ <path d="m7.9987 18h8.0023" stroke="#51585E" opacity=".6" stroke-linecap="round" stroke-width="1.333"/>
+ <path d="m9.332 20.666h5.3357" stroke="#51585E" opacity=".6" stroke-linecap="round" stroke-width="1.333"/>
+ <path d="m12 2.6666c-0.84966 0-1.5393 0.68968-1.5393 1.5393 0 0.84966 0.68968 1.5364 1.5393 1.5364s1.5393-0.68678 1.5393-1.5364c0-0.84966-0.68968-1.5393-1.5393-1.5393zm-1.5393 4.103c-0.54085 0-1.0243 0.49145-1.0243 1.0243 0 1.0256 1.794 4.121 1.794 5.1302v3.0758h1.5393v-3.0758c0-0.98918 1.794-4.1045 1.794-5.1302 0-0.56757-0.45886-1.0243-1.0243-1.0243z" fill="#51585E" opacity=".6"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/stone-m.svg b/data/styles/default/dark/symbols/stone-m.svg
index 0b31e2ebf..c2f512d04 100644
--- a/data/styles/default/dark/symbols/stone-m.svg
+++ b/data/styles/default/dark/symbols/stone-m.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
 	<title>stone-m</title>
-	<path d="m8.2285 0.27148c-0.7397-0.016388-1.4803 0.063849-2.1953 0.24219-3.2452 1.3467-4.4152 3.3848-4.623 7.4902-0.099199 1.8801-0.77216 3.6862-0.78125 5.5723-0.071978 0.96952 0.32468 2.0383 1.4414 2.1523h11.59c0.84246 0.039747 1.6542-0.60749 1.7188-1.4668 0.002169-4.0249-0.60695-2.9872-0.74219-7.1895-0.096741-1.8809-0.36192-3.9815-1.8379-5.3203-1.3228-0.94308-2.943-1.4444-4.5703-1.4805zm-2.7285 5.1406h1v1h-1v-1zm2 0h3v1h-3v-1zm-4 2.1738h9v1h-9v-1zm2 2h5v1h-5v-1z" fill="#717065" opacity=".6"/>
+	<path d="m8.2285 0.27148c-0.7397-0.016388-1.4803 0.063849-2.1953 0.24219-3.2452 1.3467-4.4152 3.3848-4.623 7.4902-0.099199 1.8801-0.77216 3.6862-0.78125 5.5723-0.071978 0.96952 0.32468 2.0383 1.4414 2.1523h11.59c0.84246 0.039747 1.6542-0.60749 1.7188-1.4668 0.002169-4.0249-0.60695-2.9872-0.74219-7.1895-0.096741-1.8809-0.36192-3.9815-1.8379-5.3203-1.3228-0.94308-2.943-1.4444-4.5703-1.4805zm-2.7285 5.1406h1v1h-1v-1zm2 0h3v1h-3v-1zm-4 2.1738h9v1h-9v-1zm2 2h5v1h-5v-1z" fill="#51585E" opacity=".6"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/stripclub-m.svg b/data/styles/default/dark/symbols/stripclub-m.svg
index b2bcb6d2d..ffbd0b206 100644
--- a/data/styles/default/dark/symbols/stripclub-m.svg
+++ b/data/styles/default/dark/symbols/stripclub-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#BB9342"/>
+ <circle cx="12" cy="12" r="11" fill="#8C491C"/>
  <path d="m2.0024 15.579 2.4463-3.7354-2.2168-3.4229h1.6895l1.4355 2.2998 1.4062-2.2998h1.6748l-2.2266 3.4766 2.4463 3.6816h-1.7432l-1.5869-2.4756-1.5918 2.4756zm6.6699 0 2.4463-3.7354-2.2168-3.4229h1.6895l1.4355 2.2998 1.4062-2.2998h1.6748l-2.2266 3.4766 2.4463 3.6816h-1.7432l-1.5869-2.4756-1.5918 2.4756zm6.6699 0 2.4463-3.7354-2.2168-3.4229h1.6895l1.4355 2.2998 1.4062-2.2998h1.6748l-2.2266 3.4766 2.4463 3.6816h-1.7432l-1.5869-2.4756-1.5918 2.4756z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/studio-m.svg b/data/styles/default/dark/symbols/studio-m.svg
index 374967210..77432e48b 100644
--- a/data/styles/default/dark/symbols/studio-m.svg
+++ b/data/styles/default/dark/symbols/studio-m.svg
@@ -1,6 +1,6 @@
 <svg height="18" viewBox="0 0 24 24" width="18" xmlns="http://www.w3.org/2000/svg">
   <circle cx="12" cy="12" fill="#000" id="Oval" opacity=".6" r="12" />
-  <circle cx="12" cy="12" fill="#8C5F93" r="11" />
+  <circle cx="12" cy="12" fill="#6B425C" r="11" />
   <path d="m9 17 8-5-8-5z" fill="#000" />
   <title>studio-m</title>
 </svg>
diff --git a/data/styles/default/dark/symbols/supermarket-m.svg b/data/styles/default/dark/symbols/supermarket-m.svg
index dce640e73..4167f5f4f 100644
--- a/data/styles/default/dark/symbols/supermarket-m.svg
+++ b/data/styles/default/dark/symbols/supermarket-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="grocery-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <path id="Shape" d="m9.9202 15.692c-0.63621 0-1.151 0.51923-1.151 1.1538 0 0.63462 0.51475 1.1538 1.151 1.1538 0.63621 0 1.1567-0.51923 1.1567-1.1538 0-0.63462-0.52053-1.1538-1.1567-1.1538zm-3.9202-9.274c0 0.27877 0.23137 0.50475 0.50196 0.50475h0.69804l1.8 5.5385c-0.63725 0-1.1538 0.67035-1.1538 1.4981v-0.22694c0 0.82737 0.67299 1.4981 1.4987 1.4981h6.9481c0.28004 0 0.50705-0.21409 0.50705-0.50475v0.086426c0-0.27877-0.23168-0.50475-0.50236-0.50475h-7.026c-0.27745 0-0.50236-0.21409-0.50236-0.50475v0.086426c0-0.27877 0.22904-0.50475 0.49507-0.50475h6.3888c0.98986 0 0.90107-0.25347 1.05-0.55384l1.2249-4.1428c0.048-0.084 0.072-0.186 0.072-0.288 0-0.33-0.27-0.6-0.46154-0.55385h-9.0125l-0.726-1.8462h-1.3081c-0.27165 0-0.49186 0.21409-0.49186 0.50475v-0.086426zm9.4586 9.274c-0.63621 0-1.151 0.51923-1.151 1.1538 0 0.63462 0.51475 1.1538 1.151 1.1538s1.1567-0.51923 1.1567-1.1538c0-0.63462-0.52053-1.1538-1.1567-1.1538z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/tank-m.svg b/data/styles/default/dark/symbols/tank-m.svg
index 60b91f1de..edacb37c2 100644
--- a/data/styles/default/dark/symbols/tank-m.svg
+++ b/data/styles/default/dark/symbols/tank-m.svg
@@ -3,7 +3,7 @@
     <title>tank-m</title>
     <g id="Page-2:-Night" fill="none" fill-rule="evenodd">
         <g id="tank-m" fill-rule="nonzero">
-            <g id="Group" transform="translate(5 7)" fill="#717065" opacity=".6">
+            <g id="Group" transform="translate(5 7)" fill="#51585E" opacity=".6">
                 <path id="Path"
                     d="m11.127 3.8878c-0.1183-0.2366-0.3612-0.3864-0.6265-0.3864h-7.7c-0.3213 0-0.6013 0.2184-0.679 0.5299l-0.3927 1.5701h10.255l-0.8568-1.7136z" />
                 <path id="Shape"
diff --git a/data/styles/default/dark/symbols/taoist-m.svg b/data/styles/default/dark/symbols/taoist-m.svg
index 63df6be2d..592e81e13 100644
--- a/data/styles/default/dark/symbols/taoist-m.svg
+++ b/data/styles/default/dark/symbols/taoist-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="taoist-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#7F5933"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6E4426"/>
    <path id="Shape" d="m11.716 5c-1.75 0-3.3556 0.70875-4.6156 1.9688-1.33 1.33-2.1 3.0712-2.1 5.0312 0 3.85 3.0012 7 6.7812 7h0.21875c3.85 0 7-3.15 7-7s-3.15-7-7-7h-0.28438zm0.065625 1.4c1.54 0 3.7188 0.84 3.7188 2.8 0 1.82-1.4 2.66-3.15 2.8-1.4 0.07-2.7344 0.77875-3.4344 1.9688-0.56 0.98-0.49438 1.8769-0.28438 2.6469-1.33-1.05-2.2312-2.7256-2.2312-4.6156 0-1.54 0.56438-3.0188 1.6844-4.0688 0.98-0.98 2.2269-1.5312 3.6969-1.5312zm0.21875 1.4c-0.7732 0-1.4 0.6268-1.4 1.4s0.6268 1.4 1.4 1.4 1.4-0.6268 1.4-1.4-0.6268-1.4-1.4-1.4zm0 6.3c0.77 0 1.4 0.63 1.4 1.4s-0.63 1.4-1.4 1.4-1.4-0.63-1.4-1.4 0.63-1.4 1.4-1.4z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/taoist-s.svg b/data/styles/default/dark/symbols/taoist-s.svg
index 226f3398f..155df873c 100644
--- a/data/styles/default/dark/symbols/taoist-s.svg
+++ b/data/styles/default/dark/symbols/taoist-s.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="taoist-s" fill-rule="nonzero">
    <circle id="Oval" cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="8" cy="8" r="7" fill="#7F5933"/>
+   <circle id="Oval" cx="8" cy="8" r="7" fill="#6E4426"/>
    <path id="Shape" d="m7.8375 4c-1 0-1.9175 0.405-2.6375 1.125-0.76 0.76-1.2 1.755-1.2 2.875 0 2.2 1.715 4 3.875 4h0.125c2.2 0 4-1.8 4-4s-1.8-4-4-4h-0.1625zm0.0375 0.8c0.88 0 2.125 0.48 2.125 1.6 0 1.04-0.8 1.52-1.8 1.6-0.8 0.04-1.5625 0.445-1.9625 1.125-0.32 0.56-0.2825 1.0725-0.1625 1.5125-0.76-0.6-1.275-1.5575-1.275-2.6375 0-0.88 0.3225-1.725 0.9625-2.325 0.56-0.56 1.2725-0.875 2.1125-0.875zm0.125 0.8c-0.44183 0-0.8 0.35817-0.8 0.8s0.35817 0.8 0.8 0.8 0.8-0.35817 0.8-0.8-0.35817-0.8-0.8-0.8zm0 3.6c0.44 0 0.8 0.36 0.8 0.8s-0.36 0.8-0.8 0.8-0.8-0.36-0.8-0.8 0.36-0.8 0.8-0.8z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/theatre-m.svg b/data/styles/default/dark/symbols/theatre-m.svg
index a54cd7fb0..35ed55a65 100644
--- a/data/styles/default/dark/symbols/theatre-m.svg
+++ b/data/styles/default/dark/symbols/theatre-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="theatre-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#7F5933"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6E4426"/>
    <g id="Group" transform="translate(5 5)" fill="#000">
     <path id="Shape" d="m0 9.45c0 2.128 1.722 3.85 3.85 3.85s3.85-1.722 3.85-3.85v-4.55h-7.7v4.55zm3.85 1.4c-0.966 0-1.75-0.469-1.75-1.05h3.5c0 0.581-0.784 1.05-1.75 1.05zm1.75-3.85c0.385 0 0.7 0.315 0.7 0.7s-0.315 0.7-0.7 0.7-0.7-0.315-0.7-0.7 0.315-0.7 0.7-0.7zm-3.5 0c0.385 0 0.7 0.315 0.7 0.7s-0.315 0.7-0.7 0.7-0.7-0.315-0.7-0.7 0.315-0.7 0.7-0.7z"/>
     <path id="Shape" d="m6.3 0v4.2h2.1v1.75c0-0.581 0.784-1.05 1.75-1.05s1.75 0.469 1.75 1.05h-3.5v1.75 0.273c0.525 0.266 1.12 0.427 1.75 0.427 2.128 0 3.85-1.722 3.85-3.85v-4.55h-7.7zm2.1 3.556c-0.385 0-0.7-0.315-0.7-0.7s0.315-0.7 0.7-0.7 0.7 0.315 0.7 0.7c0 0.392-0.315 0.7-0.7 0.7zm3.5 0c-0.385 0-0.7-0.315-0.7-0.7s0.315-0.7 0.7-0.7 0.7 0.315 0.7 0.7c0 0.392-0.315 0.7-0.7 0.7z"/>
diff --git a/data/styles/default/dark/symbols/theatre-s.svg b/data/styles/default/dark/symbols/theatre-s.svg
index 6a363bda3..f26d5b424 100644
--- a/data/styles/default/dark/symbols/theatre-s.svg
+++ b/data/styles/default/dark/symbols/theatre-s.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="theatre-s" fill-rule="nonzero">
    <circle id="Oval" cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="8" cy="8" r="7.3333" fill="#7F5933"/>
+   <circle id="Oval" cx="8" cy="8" r="7.3333" fill="#6E4426"/>
    <g id="Group" transform="translate(3.3333 3.3333)" fill="#000">
     <path id="Shape" d="m0 6.3c0 1.4187 1.148 2.5667 2.5667 2.5667 1.4187 0 2.5667-1.148 2.5667-2.5667v-3.0333h-5.1333v3.0333zm2.5667 0.93333c-0.644 0-1.1667-0.31267-1.1667-0.7h2.3333c0 0.38733-0.52267 0.7-1.1667 0.7zm1.1667-2.5667c0.25667 0 0.46667 0.21 0.46667 0.46667 0 0.25667-0.21 0.46667-0.46667 0.46667-0.25667 0-0.46667-0.21-0.46667-0.46667 0-0.25667 0.21-0.46667 0.46667-0.46667zm-2.3333 0c0.25667 0 0.46667 0.21 0.46667 0.46667 0 0.25667-0.21 0.46667-0.46667 0.46667s-0.46667-0.21-0.46667-0.46667c0-0.25667 0.21-0.46667 0.46667-0.46667z"/>
     <path id="Shape" d="m4.2 0v2.8h1.4v1.1667c0-0.38733 0.52267-0.7 1.1667-0.7s1.1667 0.31267 1.1667 0.7h-2.3333v1.1667 0.182c0.35 0.17733 0.74667 0.28467 1.1667 0.28467 1.4187 0 2.5667-1.148 2.5667-2.5667v-3.0333h-5.1333zm1.4 2.3707c-0.25667 0-0.46667-0.21-0.46667-0.46667s0.21-0.46667 0.46667-0.46667 0.46667 0.21 0.46667 0.46667c0 0.26133-0.21 0.46667-0.46667 0.46667zm2.3333 0c-0.25667 0-0.46667-0.21-0.46667-0.46667s0.21-0.46667 0.46667-0.46667c0.25667 0 0.46667 0.21 0.46667 0.46667 0 0.26133-0.21 0.46667-0.46667 0.46667z"/>
diff --git a/data/styles/default/dark/symbols/theme_park-m.svg b/data/styles/default/dark/symbols/theme_park-m.svg
index 7dfd4543d..349c28cf7 100644
--- a/data/styles/default/dark/symbols/theme_park-m.svg
+++ b/data/styles/default/dark/symbols/theme_park-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#7f5933"/>
+ <circle cx="12" cy="12" r="11" fill="#6E4426"/>
  <path d="m12 5v1.1429h2.4l-0.6-0.57143 0.6-0.57143h-2.4zm0 1.7143 4.2 4v1.1428s0.1464 0.57143 0.9 0.57143 0.9-0.57143 0.9-0.57143v-1.1428l-6-4zm0 0 0.6 4v1.1428s0.2976 0.57143 1.2 0.57143 1.2-0.57143 1.2-0.57143v-1.1428l-3-4zm0 0-3 4v1.1428s0.2976 0.57143 1.2 0.57143 1.2-0.57143 1.2-0.57143v-1.1428l0.6-4zm0 0-6 4v1.1428s0.1464 0.57143 0.9 0.57143 0.9-0.57143 0.9-0.57143v-1.1428l4.2-4zm-3.6 5.7143s-0.5952 0.57143-1.5 0.57143c-0.129 0-0.24645-0.01457-0.35625-0.03571l-0.54375 4.0357h4.2l0.6-2.2857h2.4l0.6 2.2857h4.2l-0.54375-4.0357c-0.1098 0.02114-0.22725 0.03571-0.35625 0.03571-1.0422 0-1.5-0.57143-1.5-0.57143s-0.6888 0.57143-1.8 0.57143c-0.9582 0-1.8-0.57143-1.8-0.57143s-0.8466 0.57143-1.8 0.57143c-1.0956 0-1.8-0.57143-1.8-0.57143z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/theme_park-s.svg b/data/styles/default/dark/symbols/theme_park-s.svg
index ff8331db4..00e1aecfa 100644
--- a/data/styles/default/dark/symbols/theme_park-s.svg
+++ b/data/styles/default/dark/symbols/theme_park-s.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 16 16" width="12" height="12" xmlns="http://www.w3.org/2000/svg">
  <circle cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
- <circle cx="8" cy="8" r="7" fill="#7f5933"/>
+ <circle cx="8" cy="8" r="7" fill="#6E4426"/>
  <path d="m8 3v0.7619h1.6l-0.4-0.38095 0.4-0.38095h-1.6zm0 1.1429 2.8 2.6667v0.7619s0.0976 0.38095 0.6 0.38095 0.6-0.38095 0.6-0.38095v-0.7619l-4-2.6667zm0 0 0.4 2.6667v0.7619s0.1984 0.38095 0.8 0.38095 0.8-0.38095 0.8-0.38095v-0.7619l-2-2.6667zm0 0-2 2.6667v0.7619s0.1984 0.38095 0.8 0.38095 0.8-0.38095 0.8-0.38095v-0.7619l0.4-2.6667zm0 0-4 2.6667v0.7619s0.0976 0.38095 0.6 0.38095 0.6-0.38095 0.6-0.38095v-0.7619l2.8-2.6667zm-2.4 3.8095s-0.3968 0.38095-1 0.38095c-0.086 0-0.1643-0.0097143-0.2375-0.02381l-0.3625 2.6905h2.8l0.4-1.5238h1.6l0.4 1.5238h2.8l-0.3625-2.6905c-0.0732 0.014095-0.1515 0.02381-0.2375 0.02381-0.6948 0-1-0.38095-1-0.38095s-0.4592 0.38095-1.2 0.38095c-0.6388 0-1.2-0.38095-1.2-0.38095s-0.5644 0.38095-1.2 0.38095c-0.7304 0-1.2-0.38095-1.2-0.38095z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/ticket-shop-m.svg b/data/styles/default/dark/symbols/ticket-shop-m.svg
index 13f70fc45..5da872d40 100644
--- a/data/styles/default/dark/symbols/ticket-shop-m.svg
+++ b/data/styles/default/dark/symbols/ticket-shop-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="ticket-shop-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <path id="Shape" d="m6 10.667v-1.6696c0-0.55064 0.45576-0.99703 1.0025-0.99703h9.9951c0.55365 0 1.0025 0.45304 1.0025 0.99703v1.6696c-0.7647 0-1.3846 0.59695-1.3846 1.3333s0.61991 1.3333 1.3846 1.3333v1.6696c0 0.55064-0.45576 0.99703-1.0025 0.99703h-9.9951c-0.55365 0-1.0025-0.45304-1.0025-0.99703v-1.6696c0.7647 0 1.3846-0.59695 1.3846-1.3333s-0.61991-1.3333-1.3846-1.3333zm7.1636 1.8072 1.0873-0.85539c0.11126-0.10731 0.049798-0.29433-0.10397-0.31642l-1.3805-0.036732c-0.053442-0.0076824-0.099596-0.040813-0.1234-0.088588l-0.47466-1.2954c-0.034494-0.068902-0.1013-0.10347-0.16834-0.10347s-0.13385 0.034571-0.16834 0.10347l-0.47466 1.2954c-0.023806 0.047775-0.06996 0.080906-0.1234 0.088588l-1.3805 0.036732c-0.15401 0.022087-0.21522 0.20911-0.10397 0.31642l1.0873 0.85539c0.038624 0.037212 0.056357 0.090749 0.047126 0.14333l-0.37871 1.2998c-0.020891 0.1198 0.075547 0.21727 0.18486 0.21727 0.028907 0 0.058786-0.0067222 0.08745-0.021607l1.1466-0.74856c0.023806-0.012484 0.050041-0.018726 0.076276-0.018726 0.026235 0 0.05247 0.006242 0.076276 0.018726l1.1466 0.74856c0.028907 0.014885 0.058543 0.021607 0.08745 0.021607 0.10931 0 0.20575-0.097471 0.18486-0.21727l-0.37871-1.2998c-0.0092308-0.052577 0.0085021-0.10611 0.047126-0.14333z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/tire-repair-m.svg b/data/styles/default/dark/symbols/tire-repair-m.svg
index df484c4d8..faa12d35e 100644
--- a/data/styles/default/dark/symbols/tire-repair-m.svg
+++ b/data/styles/default/dark/symbols/tire-repair-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="tire-repair-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#51585E"/>
    <path id="Shape" d="m12 5c-3.8661 0-7 2.9847-7 6.6667 0 2.9347 1.5094 3.4588 1.5094 4.3542 0 0.406-1.6863 0.97917 3.0625 0.97917h4.8562c4.7488 0 3.0625-0.57317 3.0625-0.97917-7e-4 -0.89533 1.5094-1.4195 1.5094-4.3542 0-3.682-3.1339-6.6667-7-6.6667zm0 2c2.7062 0 4.9 2.0893 4.9 4.6667 0 2.5773-2.1938 4.6667-4.9 4.6667s-4.9-2.0893-4.9-4.6667c0-2.5773 2.1938-4.6667 4.9-4.6667zm0 0.66667c-0.1596 0-0.32655 0.0041667-0.48125 0.020833l-0.21875 2.1042c-0.2366 0.081333-0.46795 0.20283-0.65625 0.35417l-2.0125-0.85417c-0.1869 0.24067-0.35385 0.4935-0.48125 0.77083l1.7938 1.25c-0.0217 0.116-0.04375 0.23283-0.04375 0.35417 0 0.12133 0.02205 0.23883 0.04375 0.35417l-1.7938 1.25c0.1274 0.27733 0.29435 0.53083 0.48125 0.77083l2.0125-0.85417c0.1883 0.15133 0.41965 0.27283 0.65625 0.35417l0.21875 2.1042c0.154 0.017333 0.32165 0.020833 0.48125 0.020833s0.32655-0.0041667 0.48125-0.020833l0.21875-2.1042c0.2366-0.081333 0.46795-0.20283 0.65625-0.35417l2.0125 0.85417c0.1869-0.24067 0.35385-0.4935 0.48125-0.77083l-1.7938-1.25c0.021-0.116 0.04375-0.23283 0.04375-0.35417 0-0.12133-0.02205-0.23883-0.04375-0.35417l1.7938-1.25c-0.1274-0.27733-0.29435-0.53083-0.48125-0.77083l-2.0125 0.85417c-0.1883-0.15133-0.41965-0.27283-0.65625-0.35417l-0.21875-2.1042c-0.154-0.017333-0.32165-0.020833-0.48125-0.020833zm0 3c0.5796 0 1.05 0.448 1.05 1s-0.4704 1-1.05 1-1.05-0.448-1.05-1 0.4704-1 1.05-1z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/tobacco-m.svg b/data/styles/default/dark/symbols/tobacco-m.svg
index 658c3beb1..cd9006d72 100644
--- a/data/styles/default/dark/symbols/tobacco-m.svg
+++ b/data/styles/default/dark/symbols/tobacco-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+ <circle cx="12" cy="12" r="11" fill="#6B425C"/>
  <path d="m7 14.5h1v3h-1zm-1-1c0.66667-1 2-2 2-3 0-1-3-2-3-4 0-2 2-2 4-3-0.33333 1.3333-2 2-2 3 1 1 3 2 3 4 0 2-1 2-4 3zm-1 1h1v3h-1zm14 3h-10v-3h10z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/toilets-m.svg b/data/styles/default/dark/symbols/toilets-m.svg
index 25958626f..d4a350e2d 100644
--- a/data/styles/default/dark/symbols/toilets-m.svg
+++ b/data/styles/default/dark/symbols/toilets-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="toilets-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#7F5933"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6E4426"/>
    <path id="Shape" d="m8.1818 7.6923c0.75682 0 1.3636-0.59904 1.3636-1.3462 0-0.74712-0.60682-1.3462-1.3636-1.3462s-1.3636 0.59904-1.3636 1.3462c0 0.74712 0.60682 1.3462 1.3636 1.3462zm7.6364 7.5385v3.7692h-2.1818v-3.7692h-2.1818l1.9091-5.9231s0.27273-1.0769 1.3636-1.0769 1.3636 1.0769 1.3636 1.0769l1.9091 5.9231h-2.1818zm-6.5455-1.6154v5.3846h-2.1818v-5.3846h-1.0909v-3.8847c0-0.82838 0.66274-1.4999 1.5017-1.4999h1.3602c0.82937 0 1.5017 0.67108 1.5017 1.4999v3.8847h-1.0909zm6.9584-7.2692c0 0.74712-0.62972 1.3462-1.4151 1.3462s-1.4151-0.59904-1.4151-1.3462c0-0.74712 0.62972-1.3462 1.4151-1.3462s1.4151 0.59904 1.4151 1.3462z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/toll_booth-m.svg b/data/styles/default/dark/symbols/toll_booth-m.svg
index b9d483dec..37c23c93a 100644
--- a/data/styles/default/dark/symbols/toll_booth-m.svg
+++ b/data/styles/default/dark/symbols/toll_booth-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="toll_booth-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#717065"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#51585E"/>
    <path id="Shape" d="m10.2 4-3.5 2.1v10.5h-0.7v1.4h8.4v-1.4h-0.7v-3.2156l0.98438-0.63438-0.15312-1.5312-0.83125 0.50312v-5.6219l-3.5-2.1zm-2.1 3.5h4.2v4.9h-4.2v-4.9zm11.134 0.7-0.56875 0.35 0.15312 1.5312 1.1812-0.7-0.76562-1.1812zm-1.2031 0.7-1.1812 0.76562 0.13125 1.5531 1.2031-0.7875-0.15312-1.5312zm-1.75 1.1156-1.1812 0.76562 0.13125 1.5531 1.2031-0.76562-0.15312-1.5531z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/toll_booth-s.svg b/data/styles/default/dark/symbols/toll_booth-s.svg
index c3061a354..0bb4a5c71 100644
--- a/data/styles/default/dark/symbols/toll_booth-s.svg
+++ b/data/styles/default/dark/symbols/toll_booth-s.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="toll_booth-s" fill-rule="nonzero">
    <circle id="Oval" cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="8" cy="8" r="7" fill="#717065"/>
+   <circle id="Oval" cx="8" cy="8" r="7" fill="#51585E"/>
    <polygon id="Path" points="6.501 4 5.001 5.036 5.001 11 4 11 4 12 9 12 9 11.036 8 11 8 10.096 13 7 13 6 8 9 8.089 5.036" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/tourism-m.svg b/data/styles/default/dark/symbols/tourism-m.svg
index 2665d85b6..872d1abe7 100644
--- a/data/styles/default/dark/symbols/tourism-m.svg
+++ b/data/styles/default/dark/symbols/tourism-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="tourism-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#7F5933"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6E4426"/>
    <polygon id="Path" points="19 9.595 14.1 8.896 12 4 9.9 8.896 5 9.595 8.5 13.092 7.8 18 12 15.889 16.2 17.987 15.5 13.092" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/tourism-s.svg b/data/styles/default/dark/symbols/tourism-s.svg
index 0b3bc3772..d4cc1a6eb 100644
--- a/data/styles/default/dark/symbols/tourism-s.svg
+++ b/data/styles/default/dark/symbols/tourism-s.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="tourism-s" fill-rule="nonzero">
    <circle id="Oval" cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="8" cy="8" r="7" fill="#7F5933"/>
+   <circle id="Oval" cx="8" cy="8" r="7" fill="#6E4426"/>
    <polygon id="Path" points="12 6.697 9.2 6.297 8 3.5 6.8 6.297 4 6.697 6 8.695 5.6 11.5 8 10.294 10.4 11.493 10 8.695" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/toys-m.svg b/data/styles/default/dark/symbols/toys-m.svg
index 264d95912..eea1c4718 100644
--- a/data/styles/default/dark/symbols/toys-m.svg
+++ b/data/styles/default/dark/symbols/toys-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="toys-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <path id="Shape" d="m14.8 14c-0.8832 0-1.6 0.716-1.6 1.6 0 0.8832 0.7168 1.6 1.6 1.6s1.6-0.7168 1.6-1.6c0-0.884-0.7168-1.6-1.6-1.6zm-5.6 0c-0.884 0-1.6 0.716-1.6 1.6 0 0.8832 0.716 1.6 1.6 1.6 0.8832 0 1.6-0.7168 1.6-1.6 0-0.884-0.7168-1.6-1.6-1.6zm7.5984-3.2h-2.7248c0.3816-0.4352 0.6288-0.988 0.6952-1.6024 0.0112 0 0.02 0.0032 0.0312 0.0032 0.8832 0 1.6-0.7168 1.6-1.6s-0.7168-1.6008-1.6-1.6008c-0.472 0-0.892 0.2088-1.184 0.5336-0.4568-0.3336-1.0128-0.5336-1.616-0.5336s-1.1584 0.2-1.616 0.5336c-0.2928-0.3248-0.712-0.5336-1.184-0.5336-0.884 0-1.6 0.7168-1.6 1.6008 0 0.8832 0.716 1.6 1.6 1.6 0.0112 0 0.02-0.0032 0.0312-0.0032 0.0664 0.6144 0.3144 1.1672 0.6952 1.6024h-2.7256c-0.6624 0-1.2008 0.5376-1.2008 1.2 0 0.6344 0.4936 1.1472 1.116 1.1912 0.5616-0.4864 1.284-0.7912 2.084-0.7912 1.2136 0 2.2568 0.6856 2.8 1.6832 0.5432-0.9968 1.5864-1.6832 2.8-1.6832 0.8 0 1.5224 0.3048 2.084 0.7912 0.6216-0.0448 1.116-0.5568 1.116-1.1912 0-0.6624-0.5384-1.2-1.2016-1.2zm-4.7984 0.16c-0.7624 0-1.36-0.4216-1.36-0.96s0.5976-0.96 1.36-0.96 1.36 0.4216 1.36 0.96-0.5976 0.96-1.36 0.96z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/travel_agency_shop-m.svg b/data/styles/default/dark/symbols/travel_agency_shop-m.svg
index f5ed2c4a4..6a853e97b 100644
--- a/data/styles/default/dark/symbols/travel_agency_shop-m.svg
+++ b/data/styles/default/dark/symbols/travel_agency_shop-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="travel_agency_shop-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#8C5F93"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6B425C"/>
    <path id="Shape" d="m16.248 11.233 2.717 0.33592-0.11845-0.56216c-0.15209-0.72166-0.57009-1.4031-1.1774-1.9187-0.28451-0.24155-0.60156-0.44207-0.94295-0.59855l1.3076-0.51209-0.37204-0.43796c-0.42074-0.49596-1.0305-0.84859-1.7169-0.99329-0.69647-0.14689-1.4307-0.080965-2.1236 0.19039-0.45027 0.17645-0.85433 0.42839-1.1952 0.74271-0.1893-0.52525-0.50225-1.0086-0.92053-1.4165-0.53263-0.51975-1.1834-0.86633-1.8821-1.002-0.68854-0.13377-1.3875-0.046238-1.968 0.24648l-0.51319 0.25881 1.138 1.1104c-0.44179-0.013398-0.87921 0.042957-1.2983 0.16852-0.76294 0.2287-1.4192 0.68499-1.8482 1.2849l-0.33428 0.46777 2.4363 0.72658c-0.49623 0.30311-0.91943 0.69784-1.245 1.1654-0.45492 0.65382-0.68499 1.4195-0.64723 2.1559l0.029258 0.57392 3.8864-1.5595c-0.016953 0.08698-0.025977 0.177-0.025977 0.2689 0 0.45355 0.2161 0.85734 0.55068 1.1142-0.68636 2.3329-0.82614 5.3754-0.833 5.5289l-0.01832 0.42782h2.7055l0.020234-0.38899c0.0019141-0.035574 0.16743-3.0827 0.83902-5.2838 0.042137 0.0041015 0.084793 0.0060156 0.12802 0.0060156 0.37122 0 0.70932-0.14443 0.96075-0.38079l2.7698 2.8959 0.26398-0.51045c0.33838-0.65518 0.44562-1.4474 0.30146-2.2306-0.12529-0.67897-0.42484-1.3202-0.8735-1.8739zm1.5951-0.62945-2.6694-0.3299c-0.39446-0.25003-0.82368-0.43086-1.2734-0.53454-0.080965-0.018594-0.16196-0.03448-0.2432-0.047605-0.2421-0.039676-0.48448-0.055262-0.7233-0.046785-0.016406-0.020781-0.033113-0.041043-0.050887-0.06073 0.02707-0.021328 0.054441-0.042137 0.082332-0.062371 0.41253-0.30092 0.92053-0.5017 1.4676-0.57474h5.469e-4c0.29381-0.039676 0.59855-0.04241 0.90603-0.004375 0.056082 0.0068359 0.11162 0.015039 0.16688 0.024609 1.0442 0.17921 1.9253 0.80921 2.3367 1.6364zm-3.7226-3.103c0.35727-0.13978 0.72822-0.20735 1.0877-0.20735 0.49815 0 0.97469 0.12966 1.3631 0.37559l-1.1629 0.45546c-0.82996-0.097125-1.6468 0.038309-2.3641 0.39227-0.072488 0.035848-0.14361 0.073582-0.21309 0.11353 0-0.049246-0.0010938-0.098492-0.0032813-0.14798 0.30909-0.42128 0.7569-0.77172 1.2925-0.98153zm-1.6812 3.0133c0 0.33559-0.27204 0.60766-0.60766 0.60766-0.33562 0-0.60766-0.27204-0.60766-0.60766s0.27204-0.60766 0.60766-0.60766c0.33559 0 0.60766 0.27204 0.60766 0.60766zm-1.018 1.4148c0 0.1852-0.086707 0.35044-0.22187 0.45738-0.046238 0.036941-0.097945 0.066473-0.15403 0.087801-0.064558 0.024883-0.13459 0.038309-0.20762 0.038309-0.24675 0-0.4582-0.15373-0.54329-0.3704-0.02625-0.065926-0.040496-0.13787-0.040496-0.21309 0-0.2782 0.19586-0.51182 0.45711-0.56954 0.04241 0.056082 0.088621 0.10861 0.13869 0.15758 0.15758 0.15427 0.35098 0.27163 0.56653 0.33865 0.003336 0.024062 0.0049766 0.048398 0.0049766 0.073308zm-0.28886-5.2786c0.46971 0.45793 0.76267 1.0401 0.84995 1.6216-0.039129 0.065926-0.07577 0.13322-0.1097 0.20106-0.06948-0.1015-0.1447-0.20024-0.22515-0.29572-0.44207-0.52522-1.016-0.93256-1.6753-1.1916l-1.1629-1.1347c0.78072-0.12969 1.6682 0.16029 2.3231 0.79934zm-4.7178 1.513c0.74654-0.62398 1.8818-0.83847 2.9599-0.51674 0.05034 0.015039 0.10013 0.031199 0.14935 0.048152 0.71482 0.24784 1.3098 0.7085 1.6911 1.2729-0.18493-0.076863-0.37833-0.13951-0.57802-0.18657-0.040223-0.0095703-0.080418-0.018594-0.12119-0.026797-0.62234-0.12556-1.2701-0.10232-1.9001 0.065652l-2.201-0.65658zm-0.0041016 3.8358c0.19614-0.95279 0.95143-1.8271 1.9956-2.2462 0.06948-0.027891 0.13978-0.053621 0.21008-0.07659 0.28588-0.094363 0.5772-0.15045 0.86527-0.16989h2.7344e-4c0.077137-0.0051953 0.15373-0.0079297 0.23007-0.0079297 0.35016 0 0.69128 0.054441 1.007 0.16004-0.044051 0.057176-0.083973 0.11791-0.11873 0.18164-0.065652 0.119-0.11435 0.24866-0.14279 0.38544-0.010938 0.05198-0.018867 0.10533-0.023789 0.15922l-4.0229 1.6142zm4.6535 6.18h-1.0674c0.019961-0.2908 0.053621-0.71154 0.10587-1.2059h1.0734c-0.055535 0.50064-0.091082 0.92135-0.11189 1.2059zm0.21421-2.0265h-1.0784c0.051434-0.38927 0.11353-0.80068 0.18848-1.2143h1.0844c-0.077164 0.41636-0.14142 0.82726-0.1945 1.2143zm0.36302-2.035-1.0869 2.73e-5v-2.73e-5c0.060457-0.26862 0.1272-0.5329 0.20051-0.78703 0.027344 0.0016406 0.054988 0.0024609 0.082879 0.0024609 0.3879 0 0.73943-0.15813 0.99384-0.41308 0.033113 0.033113 0.067566 0.064558 0.10369 0.09439-0.1105 0.35345-0.20789 0.72576-0.29405 1.1033zm1.7669-2.1543c-0.0090234 0.15649-0.080144 0.29654-0.18903 0.3961-0.062098 0.056902-0.1365 0.10041-0.21886 0.12611-0.055262 0.0175-0.1138 0.026797-0.17481 0.026797-0.3217 0-0.58349-0.26179-0.58349-0.58349 0-0.024883 0.0016406-0.049246 0.0049219-0.073309 0.10478-0.032566 0.20434-0.077137 0.29709-0.13185 0.014219-0.0084765 0.028164-0.016953 0.042137-0.025976 0.11627-0.074129 0.22077-0.16524 0.31049-0.26945 0.019141-0.022148 0.037762-0.045418 0.055535-0.068934 0.26124 0.057723 0.45711 0.29135 0.45711 0.56954 0 0.011484-2.735e-4 0.022969-0.0010938 0.034453zm2.8896 2.4273-2.0944-2.1896c0.0175-0.088074 0.026523-0.17918 0.026523-0.27218 0-0.38927-0.15922-0.74189-0.41582-0.9963-0.16032-0.15922-0.35891-0.27984-0.58021-0.34716 0.0013672-0.023789 0.0019141-0.047605 0.0019141-0.071394 0-0.014766-2.735e-4 -0.029559-8.203e-4 -0.044051 0.56325 0.036941 1.1375 0.24155 1.6414 0.59391 0.18875 0.13185 0.36766 0.28451 0.53236 0.45683 0.77771 0.81301 1.1041 1.9215 0.88905 2.8699z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/vehicle_inspection-m.svg b/data/styles/default/dark/symbols/vehicle_inspection-m.svg
index 855acf701..1141f5be1 100644
--- a/data/styles/default/dark/symbols/vehicle_inspection-m.svg
+++ b/data/styles/default/dark/symbols/vehicle_inspection-m.svg
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#717065"/>
+ <circle cx="12" cy="12" r="11" fill="#51585E"/>
  <g stroke="#000" stroke-linejoin="round" stroke-linecap="round" stroke-width="1.333">
   <path d="m12.668 4.666h5.1992-5.1992zm0 2.668h5.1992-5.1992zm0 2.666h5.1992-5.1992z" fill="none"/>
   <path d="m4.6666 8.6666 1.3333 2.6666 4-7.9999" fill="none"/>
   <path d="m16.666 19.333v-4l-1.3333-2.6666h-6.6666l-1.3333 2.6666v4" fill="none"/>
   <path d="m7.3333 15.333h9.3332v2.6666h-9.3332z" fill="#000"/>
  </g>
- <circle cx="8.6666" cy="16.666" r=".66666" fill="#717065"/>
- <circle cx="15.333" cy="16.666" r=".66666" fill="#717065"/>
+ <circle cx="8.6666" cy="16.666" r=".66666" fill="#51585E"/>
+ <circle cx="15.333" cy="16.666" r=".66666" fill="#51585E"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/veterinary-m.svg b/data/styles/default/dark/symbols/veterinary-m.svg
index 8b2dd7245..9f4337434 100644
--- a/data/styles/default/dark/symbols/veterinary-m.svg
+++ b/data/styles/default/dark/symbols/veterinary-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="veterinary-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#C15746"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#983E44"/>
    <path id="Shape" d="m16.52 11.874c-0.40569 0.25031-0.71084 0.56657-0.91667 0.94917-0.10092 0.2102-0.16251 0.4069-0.18476 0.59048-0.030198 0.22832-0.0039734 0.44932 0.077879 0.66376 0.12 0.26805 0.30476 0.46128 0.55509 0.5793 0.15854 0.079837 0.34052 0.13422 0.54634 0.16353 0.28966 0.025455 0.60316-0.021213 0.93892-0.13846 0.22569-0.097964 0.43866-0.22254 0.63892-0.37334 0.26701-0.21213 0.46807-0.44778 0.60277-0.70696l0.092183-0.19361c0.050462-0.10452 0.086223-0.2345 0.10649-0.38877 0.0449-0.25571 0.02384-0.49252-0.063972-0.71004-0.11046-0.25571-0.2841-0.44932-0.52171-0.57968-0.1494-0.087165-0.32224-0.14039-0.51853-0.16044-0.30476-0.036254-0.61508 0.0019285-0.93097 0.11416-0.14423 0.054767-0.28529 0.1184-0.42198 0.19091zm0.3139-4.3987c-0.19629-0.069037-0.39059-0.093721-0.5833-0.07328-0.2543 0.012342-0.50979 0.082536-0.76766 0.20943-0.26542 0.12689-0.52171 0.30932-0.76806 0.5469-0.20423 0.20866-0.37747 0.44778-0.52171 0.71814-0.069535 0.14309-0.11682 0.25648-0.14304 0.33979-0.059204 0.17047-0.099733 0.34712-0.12039 0.5307-0.027814 0.25571 0.0039735 0.50756 0.094965 0.75594 0.11046 0.29196 0.30595 0.5118 0.58608 0.65875 0.15854 0.079837 0.33297 0.13036 0.52131 0.15235 0.23205 0.017742 0.48714-0.016199 0.76528-0.10375 0.2543-0.090636 0.50383-0.23102 0.74859-0.42155 0.33853-0.26304 0.59999-0.57737 0.78475-0.94377 0.11205-0.20518 0.18516-0.41268 0.21894-0.62327 0.058012-0.27191 0.064369-0.52839 0.01947-0.76983-0.07629-0.38954-0.27734-0.67996-0.60237-0.87049l-0.011126-0.016199-0.19907-0.089864h-0.022648zm-8.5317 4.5187c-0.26344 0.074051-0.51813 0.17202-0.76488 0.29389-0.35085 0.1832-0.63773 0.38993-0.86024 0.62018-0.1494 0.14695-0.28688 0.32745-0.41204 0.54073-0.099335 0.17626-0.16887 0.35097-0.21019 0.52569-0.11602 0.48596-0.047681 0.9538 0.20463 1.4035 0.15337 0.24722 0.36158 0.44739 0.62502 0.60128l0.14026 0.073666 0.49072 0.18744c0.17205 0.043197 0.46052 0.10066 0.8662 0.17124l0.81256 0.15466 0.40092 0.12805c0.21655 0.097964 0.3735 0.17587 0.47085 0.23372 0.19231 0.11455 0.40092 0.25841 0.62502 0.43235 0.1645 0.13075 0.40569 0.32783 0.72276 0.59048 0.1947 0.14695 0.34966 0.24607 0.46568 0.29659l0.041721 0.019284 0.016688 0.016199 0.20741 0.095264h0.019867l0.075495 0.032783 0.24317 0.056696c0.23006 0.041654 0.46767 0.043582 0.71243 0.0057852 0.33814-0.06171 0.63217-0.18474 0.88289-0.36987 0.26701-0.20673 0.47005-0.47709 0.60793-0.81109 0.08066-0.18474 0.13669-0.40188 0.16847-0.65026 0.029801-0.29196 0.017483-0.57775-0.036953-0.85699-0.059204-0.33362-0.15774-0.65489-0.29403-0.96344-0.11761-0.24491-0.21099-0.50833-0.28013-0.79142-0.067548-0.28656-0.11881-0.56156-0.15417-0.82459l-0.1041-0.73974c-0.050462-0.26304-0.11245-0.49175-0.18794-0.68575-0.13827-0.32475-0.33973-0.59203-0.60515-0.80261-0.17165-0.12882-0.36913-0.24414-0.59124-0.34557-0.18317-0.072894-0.37708-0.11725-0.5829-0.13345-0.23761-0.0088708-0.50303 0.033555-0.79627 0.12805-0.19788 0.076366-0.39098 0.15967-0.57972 0.24992-0.17404 0.085622-0.42516 0.22061-0.75376 0.40535-0.33973 0.1886-0.6278 0.33555-0.86342 0.44084-0.2392 0.1211-0.47999 0.21097-0.72356 0.27114zm2.1417-5.1173c-0.058012 0.16469-0.10768 0.33439-0.149 0.50872-0.054038 0.34634-0.053244 0.65875 0.0027814 0.93837 0.0449 0.27036 0.14503 0.51875 0.29999 0.74553 0.13669 0.1886 0.29006 0.32475 0.46251 0.40844 0.20145 0.11223 0.42237 0.16314 0.66118 0.15235 0.1943-0.010799 0.39337-0.066338 0.5972-0.16584 0.29125-0.16122 0.53244-0.3826 0.72276-0.66415 0.085826-0.11069 0.16728-0.24491 0.24397-0.40265l0.12318-0.35907c0.065561-0.1994 0.10728-0.41268 0.12357-0.63908 0.0091388-0.35753-0.047284-0.69192-0.17125-1.0039-0.08225-0.20171-0.20066-0.37836-0.35602-0.5307-0.18715-0.18667-0.40251-0.30006-0.64767-0.33979-0.23523-0.048982-0.478-0.024298-0.72833 0.07328-0.21099 0.083308-0.40489 0.20943-0.58012 0.37797-0.21496 0.20326-0.39138 0.45086-0.53005 0.74283l-0.0747 0.15774zm-2.0908 0.3232c-0.24834-0.061324-0.49509-0.042425-0.73985 0.057467-0.20384 0.087165-0.38622 0.22408-0.54674 0.41075-0.069137 0.083693-0.13629 0.17857-0.20185 0.28579l-0.028211 0.030083-0.11761 0.24491-0.056025 0.18474c-0.076687 0.25031-0.10847 0.49985-0.095362 0.74823 0.0095362 0.28271 0.060793 0.53417 0.15457 0.75363 0.10649 0.26651 0.25311 0.48519 0.43986 0.65566 0.15496 0.1346 0.3286 0.23141 0.52131 0.29119 0.26542 0.070966 0.52966 0.051682 0.79309-0.057081 0.20543-0.083308 0.39059-0.2237 0.55509-0.42155 0.098938-0.11262 0.19351-0.26188 0.28251-0.44855l0.10092-0.26111c0.063575-0.19978 0.096157-0.38723 0.098143-0.5631 0.018675-0.37566-0.042913-0.72701-0.18476-1.0556-0.1049-0.22485-0.24595-0.41268-0.42317-0.56271-0.16808-0.15389-0.35165-0.25031-0.55191-0.29273z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/video-games-m.svg b/data/styles/default/dark/symbols/video-games-m.svg
index 562139272..d01c119e3 100644
--- a/data/styles/default/dark/symbols/video-games-m.svg
+++ b/data/styles/default/dark/symbols/video-games-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
+ <circle cx="12" cy="12" r="11" fill="#6B425C"/>
  <path d="m7.9375 6.2656c-0.66464 0-1.2569 0.23831-1.7773 0.71484-0.52043 0.47656-0.83132 1.0463-0.93164 1.7109l-0.90234 6.3027c-0.075247 0.56429 0.021396 1.0064 0.29102 1.3262 0.2696 0.31978 0.64261 0.47852 1.1191 0.47852 0.28843 0 0.53373-0.046572 0.73438-0.14062 0.20064-0.094053 0.36987-0.20971 0.50781-0.34766l1.9551-1.957h6.1328l1.957 1.957c0.13794 0.13795 0.30717 0.2536 0.50781 0.34766s0.444 0.14062 0.73242 0.14062c0.47651 0 0.84952-0.15874 1.1191-0.47852 0.26961-0.31975 0.36626-0.76186 0.29102-1.3262l-0.88281-6.3027c-0.10032-0.66467-0.41122-1.2344-0.93164-1.7109-0.52043-0.47653-1.1127-0.71484-1.7773-0.71484h-8.1445zm1.1465 0.94922c0.22696-1e-7 0.41223 0.072387 0.55664 0.2168 0.14441 0.14442 0.2168 0.33165 0.2168 0.55859v1.5469h1.5488c0.22695 0 0.41223 0.072387 0.55664 0.2168 0.14441 0.14442 0.2168 0.3297 0.2168 0.55664 0 0.22695-0.072389 0.41223-0.2168 0.55664-0.14442 0.14441-0.3297 0.2168-0.55664 0.2168h-1.5488v1.5469c0 0.22693-0.072387 0.41222-0.2168 0.55664-0.14442 0.14441-0.3297 0.2168-0.55664 0.2168-0.22695 0-0.41223-0.072387-0.55664-0.2168-0.14443-0.14442-0.2168-0.3297-0.2168-0.55664v-1.5469h-1.5469c-0.22695 0-0.41223-0.072388-0.55664-0.2168-0.14441-0.14442-0.2168-0.3297-0.2168-0.55664 0-0.22694 0.072387-0.41222 0.2168-0.55664 0.14442-0.14441 0.3297-0.2168 0.55664-0.2168h1.5469v-1.5469c0-0.22694 0.072372-0.41417 0.2168-0.55859 0.14442-0.14441 0.3297-0.2168 0.55664-0.2168zm5.2344 0.16992c0.36393 0 0.68212 0.1372 0.95508 0.41016 0.27295 0.27294 0.41016 0.59114 0.41016 0.95508s-0.1372 0.68212-0.41016 0.95508c-0.27295 0.27295-0.59114 0.41016-0.95508 0.41016-0.36393 0-0.68212-0.1372-0.95508-0.41016-0.27294-0.27295-0.41016-0.59114-0.41016-0.95508 0-0.36393 0.13721-0.68212 0.41016-0.95508 0.27295-0.27295 0.59114-0.41016 0.95508-0.41016zm2.041 3.1211c0.36393 0 0.68212 0.13525 0.95508 0.4082 0.27295 0.27295 0.41016 0.59114 0.41016 0.95508 0 0.36393-0.1372 0.68408-0.41016 0.95703-0.27295 0.27294-0.59115 0.4082-0.95508 0.4082s-0.68212-0.13526-0.95508-0.4082c-0.27295-0.27295-0.41016-0.5931-0.41016-0.95703 0-0.36393 0.1372-0.68212 0.41016-0.95508 0.27294-0.27295 0.59114-0.4082 0.95508-0.4082z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/wayside_cross-m.svg b/data/styles/default/dark/symbols/wayside_cross-m.svg
index c69996604..7d706f9ee 100644
--- a/data/styles/default/dark/symbols/wayside_cross-m.svg
+++ b/data/styles/default/dark/symbols/wayside_cross-m.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="18" height="18" version="1.1" viewBox="0 0 18 18" xmlns="http://www.w3.org/2000/svg">
- <path d="m9.8332 7.7888v6.4612h-1.6665v-6.4612h-2.9168v-1.6156h2.9168v-2.4231h1.6665v2.4231h2.9168v1.6156z" fill="#717065" opacity=".6"/>
+ <path d="m9.8332 7.7888v6.4612h-1.6665v-6.4612h-2.9168v-1.6156h2.9168v-2.4231h1.6665v2.4231h2.9168v1.6156z" fill="#51585E" opacity=".6"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/wayside_shrine-m.svg b/data/styles/default/dark/symbols/wayside_shrine-m.svg
index 5b2a5bce0..1bfafde4f 100644
--- a/data/styles/default/dark/symbols/wayside_shrine-m.svg
+++ b/data/styles/default/dark/symbols/wayside_shrine-m.svg
@@ -2,7 +2,7 @@
  <title>wayside_shrine-m</title>
  <g fill="none" fill-rule="evenodd">
   <g id="wayside_shrine-m" fill-rule="nonzero">
-   <path id="Shape" d="m11.999 3-7.7137 7.878 1.3299 1.3572 6.385-6.5208 6.3838 6.5208 1.3299-1.3572zm5.2337 10.482v7.518h-2.3496v-4.2c0-1.6572-1.3146-3-2.937-3-1.6224 0-2.937 1.3428-2.937 3v4.2h-2.3496v-7.4316l5.33-5.3232z" fill="#717065" opacity=".6"/>
+   <path id="Shape" d="m11.999 3-7.7137 7.878 1.3299 1.3572 6.385-6.5208 6.3838 6.5208 1.3299-1.3572zm5.2337 10.482v7.518h-2.3496v-4.2c0-1.6572-1.3146-3-2.937-3-1.6224 0-2.937 1.3428-2.937 3v4.2h-2.3496v-7.4316l5.33-5.3232z" fill="#51585E" opacity=".6"/>
   </g>
  </g>
 </svg>
diff --git a/data/styles/default/dark/symbols/wholesale-m.svg b/data/styles/default/dark/symbols/wholesale-m.svg
index 28b67fc78..c63651d70 100644
--- a/data/styles/default/dark/symbols/wholesale-m.svg
+++ b/data/styles/default/dark/symbols/wholesale-m.svg
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#8C5F93"/>
- <g fill="#000" stroke="#8c5f93" stroke-linecap="round" stroke-linejoin="round" stroke-width=".667">
+ <circle cx="12" cy="12" r="11" fill="#6B425C"/>
+ <g fill="#000" stroke="#6B425C" stroke-linecap="round" stroke-linejoin="round" stroke-width=".667">
   <ellipse cx="8.6666" cy="6.6666" rx="2.3331" ry="2.3333"/>
   <ellipse cx="12.667" cy="5.3333" rx="2.3331" ry="2.3333"/>
   <ellipse cx="11.333" cy="8.6666" rx="2.3331" ry="2.3333"/>
   <ellipse cx="15.333" cy="7.3333" rx="2.3331" ry="2.3333"/>
  </g>
- <rect x="4" y="9.3332" width="16" height="2.6668" fill="#8c5f93" stroke="#8c5f93" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333"/>
+ <rect x="4" y="9.3332" width="16" height="2.6668" fill="#6B425C" stroke="#6B425C" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333"/>
  <g fill="#000" stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.333">
   <rect x="4.6666" y="9.9999" width="14.667" height="1.3333"/>
   <rect x="4.6666" y="13.333" width="14.667" height="1.3333"/>
   <rect x="4.6666" y="16.666" width="14.667" height="1.3333"/>
  </g>
  <g stroke-linecap="round" stroke-width="1.333">
-  <rect x="5.9999" y="7.9998" width="2.6666" height="12" rx=".5" ry=".5" fill="#8c5f93" stroke="#8c5f93"/>
-  <rect x="15.333" y="7.9998" width="2.6666" height="12" rx=".5" ry=".5" fill="#8c5f93" stroke="#8c5f93"/>
+  <rect x="5.9999" y="7.9998" width="2.6666" height="12" rx=".5" ry=".5" fill="#6B425C" stroke="#6B425C"/>
+  <rect x="15.333" y="7.9998" width="2.6666" height="12" rx=".5" ry=".5" fill="#6B425C" stroke="#6B425C"/>
   <rect x="16" y="8.6665" width="1.3333" height="10.667" fill="#000" stroke="#000" stroke-linejoin="round"/>
   <rect x="6.6666" y="8.6665" width="1.3333" height="10.667" fill="#000" stroke="#000" stroke-linejoin="round"/>
  </g>
diff --git a/data/styles/default/dark/symbols/winery-m.svg b/data/styles/default/dark/symbols/winery-m.svg
index 41ba1ea50..a6ae2377c 100644
--- a/data/styles/default/dark/symbols/winery-m.svg
+++ b/data/styles/default/dark/symbols/winery-m.svg
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
  <circle cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
- <circle cx="12" cy="12" r="11" fill="#8c5f93"/>
+ <circle cx="12" cy="12" r="11" fill="#6B425C"/>
  <path d="m12.544 9.2833c-0.14094-3.0446-3.3356-5.1946-5.6898-5.3238" fill="none" stroke="#000" stroke-linecap="square" stroke-linejoin="round"/>
  <path d="m10.81 5.7883c0.27497 0.00493 1.0276 0.1875 1.5493 0.23249 0.51054 0.044027 1.3677 0.11931 1.8714 0.062461 0.04979-0.00562 0.09853-0.012486 0.14599-0.020784 0.52158-0.09119 1.1027-0.31436 1.5455-0.65513 0.45118-0.34724 0.94016-1.2404 1.1433-1.4823-0.24036-0.23562-0.81883-1.0388-1.4475-1.2824-0.59851-0.2319-1.3732-0.24339-2.0895-0.028804-0.06305 0.018885-0.12689 0.040584-0.19125 0.064925-0.77971 0.29492-1.4971 0.90979-1.9381 1.5083-0.42192 0.57249-0.51479 1.2881-0.58902 1.6013z" fill="#000"/>
- <circle cx="12" cy="18.5" r="3.5" fill="#8c5f93"/>
+ <circle cx="12" cy="18.5" r="3.5" fill="#6B425C"/>
  <circle cx="12" cy="18.5" r="2.5" fill="#000"/>
- <circle cx="9.3333" cy="14.5" r="3.5" fill="#8c5f93"/>
+ <circle cx="9.3333" cy="14.5" r="3.5" fill="#6B425C"/>
  <circle cx="9.3333" cy="14.5" r="2.5" fill="#000"/>
- <circle cx="14.667" cy="14.5" r="3.5" fill="#8c5f93"/>
+ <circle cx="14.667" cy="14.5" r="3.5" fill="#6B425C"/>
  <circle cx="14.667" cy="14.5" r="2.5" fill="#000"/>
- <circle cx="7.333" cy="10.5" r="3.5" fill="#8c5f93"/>
+ <circle cx="7.333" cy="10.5" r="3.5" fill="#6B425C"/>
  <circle cx="7.333" cy="10.5" r="2.5" fill="#000"/>
- <circle cx="16.667" cy="10.5" r="3.5" fill="#8c5f93"/>
+ <circle cx="16.667" cy="10.5" r="3.5" fill="#6B425C"/>
  <circle cx="16.667" cy="10.5" r="2.5" fill="#000"/>
- <circle cx="12" cy="10.5" r="3.5" fill="#8c5f93"/>
+ <circle cx="12" cy="10.5" r="3.5" fill="#6B425C"/>
  <circle cx="12" cy="10.5" r="2.5" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/wreck-m.svg b/data/styles/default/dark/symbols/wreck-m.svg
index 704522f1c..6682a5ac6 100644
--- a/data/styles/default/dark/symbols/wreck-m.svg
+++ b/data/styles/default/dark/symbols/wreck-m.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
 	<title>wreck-m</title>
-	<path d="m9.0641 2.8396-1.3405 0.56239 1.087 2.5907c-1.1482 0.48083-2.3457 0.98484-2.3457 0.98484l0.56524 1.3435 2.3429-0.98505 2.1682 5.1608c-4.4615 1.8708-8.8093 3.7214-8.5441 3.7214 0.54202 0 1.0606 0.12537 1.521 0.3381 0.44877 0.20108 0.9559 0.31744 1.4804 0.31744 0.52162 0 1.0285-0.11636 1.4802-0.31744 0.4546-0.21273 0.9762-0.3381 1.5182-0.3381 0.54202 0 1.0579 0.12537 1.5242 0.3381 0.44586 0.20108 0.95288 0.31744 1.4745 0.31744 0.52454 0 1.0317-0.11636 1.4804-0.31744 0.46043-0.21273 0.97916-0.3381 1.527-0.3381 0.5391 0 1.0578 0.12537 1.5182 0.3381 0.44877 0.20108 0.95568 0.31744 1.4802 0.31744 0.14862 0 0.28866-0.0291 0.43145-0.04658 0.2681-0.05828 0.53618-0.08451 0.79261-0.18651l0.01736-0.0089c0.47208-2.6605 1.5707-7.9874 1.5707-7.9874s-3.8261 1.5765-7.9292 3.29l-2.168-5.1635 2.1913-0.9209-0.56524-1.3433-1.4688 0.61775s-0.29439 0.12226-0.72276 0.30295zm-6.0657 15.448c-0.54202 0-1.0635 0.12537-1.524 0.33809-0.45169 0.20108-0.95288 0.32052-1.4745 0.32052v2.2146c0.52162 0 1.0228-0.11659 1.4745-0.31766 0.46042-0.21564 0.98191-0.34094 1.524-0.34094 0.54202 0 1.0578 0.1253 1.5182 0.34094 0.45168 0.20108 0.95881 0.31766 1.4804 0.31766 0.52454 0 1.0317-0.11659 1.4804-0.31766 0.4546-0.21564 0.97906-0.34094 1.521-0.34094 0.5391 0 1.0579 0.1253 1.5242 0.34094 0.44295 0.20108 0.94997 0.31766 1.4745 0.31766 0.52449 0 1.0285-0.11659 1.4802-0.31766 0.46042-0.21564 0.97921-0.34094 1.5242-0.34094 0.54201 0 1.0577 0.1253 1.521 0.34094 0.44877 0.20108 0.95595 0.31766 1.4776 0.31766 0.52454 0 1.0256-0.11659 1.4802-0.31766 0.4546-0.21564 0.97927-0.34094 1.5213-0.34094 0.5391 0 1.0577 0.1253 1.524 0.34094 0.44294 0.20108 0.94997 0.31766 1.4745 0.31766v-2.2146c-0.52454 0-1.0316-0.11944-1.4745-0.32052-0.46625-0.21273-0.98483-0.33809-1.524-0.33809-0.54201 0-1.0667 0.12537-1.5213 0.33809-0.4546 0.20108-0.95568 0.32052-1.4802 0.32052-0.52162 0-1.0288-0.11944-1.4776-0.32052-0.46334-0.21273-0.97906-0.33809-1.521-0.33809-0.54493 0-1.0637 0.12537-1.5242 0.33809-0.45169 0.20108-0.95568 0.32052-1.4802 0.32052-0.52451 0-1.0316-0.11944-1.4745-0.32052-0.46625-0.21273-0.98505-0.33809-1.5242-0.33809-0.54202 0-1.0665 0.12537-1.521 0.33809-0.44877 0.20108-0.9559 0.32052-1.4804 0.32052-0.52162 0-1.0287-0.11944-1.4804-0.32052-0.46042-0.21273-0.9762-0.33809-1.5182-0.33809z" fill="#717065" opacity="0.6"/>
+	<path d="m9.0641 2.8396-1.3405 0.56239 1.087 2.5907c-1.1482 0.48083-2.3457 0.98484-2.3457 0.98484l0.56524 1.3435 2.3429-0.98505 2.1682 5.1608c-4.4615 1.8708-8.8093 3.7214-8.5441 3.7214 0.54202 0 1.0606 0.12537 1.521 0.3381 0.44877 0.20108 0.9559 0.31744 1.4804 0.31744 0.52162 0 1.0285-0.11636 1.4802-0.31744 0.4546-0.21273 0.9762-0.3381 1.5182-0.3381 0.54202 0 1.0579 0.12537 1.5242 0.3381 0.44586 0.20108 0.95288 0.31744 1.4745 0.31744 0.52454 0 1.0317-0.11636 1.4804-0.31744 0.46043-0.21273 0.97916-0.3381 1.527-0.3381 0.5391 0 1.0578 0.12537 1.5182 0.3381 0.44877 0.20108 0.95568 0.31744 1.4802 0.31744 0.14862 0 0.28866-0.0291 0.43145-0.04658 0.2681-0.05828 0.53618-0.08451 0.79261-0.18651l0.01736-0.0089c0.47208-2.6605 1.5707-7.9874 1.5707-7.9874s-3.8261 1.5765-7.9292 3.29l-2.168-5.1635 2.1913-0.9209-0.56524-1.3433-1.4688 0.61775s-0.29439 0.12226-0.72276 0.30295zm-6.0657 15.448c-0.54202 0-1.0635 0.12537-1.524 0.33809-0.45169 0.20108-0.95288 0.32052-1.4745 0.32052v2.2146c0.52162 0 1.0228-0.11659 1.4745-0.31766 0.46042-0.21564 0.98191-0.34094 1.524-0.34094 0.54202 0 1.0578 0.1253 1.5182 0.34094 0.45168 0.20108 0.95881 0.31766 1.4804 0.31766 0.52454 0 1.0317-0.11659 1.4804-0.31766 0.4546-0.21564 0.97906-0.34094 1.521-0.34094 0.5391 0 1.0579 0.1253 1.5242 0.34094 0.44295 0.20108 0.94997 0.31766 1.4745 0.31766 0.52449 0 1.0285-0.11659 1.4802-0.31766 0.46042-0.21564 0.97921-0.34094 1.5242-0.34094 0.54201 0 1.0577 0.1253 1.521 0.34094 0.44877 0.20108 0.95595 0.31766 1.4776 0.31766 0.52454 0 1.0256-0.11659 1.4802-0.31766 0.4546-0.21564 0.97927-0.34094 1.5213-0.34094 0.5391 0 1.0577 0.1253 1.524 0.34094 0.44294 0.20108 0.94997 0.31766 1.4745 0.31766v-2.2146c-0.52454 0-1.0316-0.11944-1.4745-0.32052-0.46625-0.21273-0.98483-0.33809-1.524-0.33809-0.54201 0-1.0667 0.12537-1.5213 0.33809-0.4546 0.20108-0.95568 0.32052-1.4802 0.32052-0.52162 0-1.0288-0.11944-1.4776-0.32052-0.46334-0.21273-0.97906-0.33809-1.521-0.33809-0.54493 0-1.0637 0.12537-1.5242 0.33809-0.45169 0.20108-0.95568 0.32052-1.4802 0.32052-0.52451 0-1.0316-0.11944-1.4745-0.32052-0.46625-0.21273-0.98505-0.33809-1.5242-0.33809-0.54202 0-1.0665 0.12537-1.521 0.33809-0.44877 0.20108-0.9559 0.32052-1.4804 0.32052-0.52162 0-1.0287-0.11944-1.4804-0.32052-0.46042-0.21273-0.9762-0.33809-1.5182-0.33809z" fill="#51585E" opacity="0.6"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/yoga-m.svg b/data/styles/default/dark/symbols/yoga-m.svg
index 8a6249881..23414fa9d 100644
--- a/data/styles/default/dark/symbols/yoga-m.svg
+++ b/data/styles/default/dark/symbols/yoga-m.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg version="1.1" viewBox="0 0 24 24" width="18" height="18" xmlns="http://www.w3.org/2000/svg">
 	<circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-	<circle cx="12" cy="12" r="11" fill="#717065"/>
+	<circle cx="12" cy="12" r="11" fill="#51585E"/>
 	<path d="m12 5.0712a1.7322 1.7322 0 0 0-1.7322 1.7322 1.7322 1.7322 0 0 0 1.7322 1.7322 1.7322 1.7322 0 0 0 1.7322-1.7322 1.7322 1.7322 0 0 0-1.7322-1.7322zm-0.44996 4.3305c-0.511 0-0.99714 0.22579-1.3263 0.6242l-1.1604 1.3854c-1.2558 1.4897-2.9182 2.3209-4.8583 2.3209v1.7322c2.3991 0 4.4951-1.0133 6.0627-2.8148v1.9487l-3.3612 1.3431c-0.58029 0.23385-0.96925 0.80561-0.96925 1.4379 0 0.85744 0.69207 1.5495 1.5495 1.5495h1.9149v-0.43305c0-1.1952 0.97003-2.1652 2.1652-2.1652h2.5983c0.24251 0 0.43305 0.19054 0.43305 0.43305s-0.19054 0.43305-0.43305 0.43305h-2.5983c-0.71886 0-1.2992 0.58029-1.2992 1.2992v0.43305h6.2454c0.85744 0 1.5495-0.69207 1.5495-1.5495 0-0.63225-0.389-1.2041-0.96925-1.4379l-3.3612-1.3431v-1.9487c1.5676 1.8015 3.6636 2.8148 6.0627 2.8148v-1.7322c-1.9401 0-3.6026-0.83119-4.8498-2.3209l-1.1604-1.3854c-0.32912-0.39841-0.81522-0.6242-1.3262-0.6242z" fill="#000"/>
 </svg>
diff --git a/data/styles/default/dark/symbols/zoo-m.svg b/data/styles/default/dark/symbols/zoo-m.svg
index e044ee7bd..e516e5cba 100644
--- a/data/styles/default/dark/symbols/zoo-m.svg
+++ b/data/styles/default/dark/symbols/zoo-m.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="zoo-m" fill-rule="nonzero">
    <circle id="Oval" cx="12" cy="12" r="12" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="12" cy="12" r="11" fill="#7F5933"/>
+   <circle id="Oval" cx="12" cy="12" r="11" fill="#6E4426"/>
    <path id="Path" d="m14.778 5c-1.4815 2.1538-1.692 3.9524-3.3333 5.3846-1.5679 1.368-4.4444 0.89837-4.4444 2.8718v0.71788c0 0.71798 0.74074 1.4011 0.74074 2.1538v0.71798c0 1.0769-0.37038 1.0769-0.74074 2.1538h0.74074l1.4815-2.1538v2.1538h1.1111v-4.3077h1.1111v4.3077h1.1111v-3.2308l1.1111 3.2308h0.74074l-1.1343-4.5096c0.43667-0.25825 0.39352-0.73565 0.39352-1.2339v-2.1538l1.6667-3.9488 1.6667 0.53846c0-0.050615-5.778e-4 -0.49754 0-0.53846 0 0-0.27057-0.26223-0.37037-0.35894l-1.8519-1.7949z" fill="#000"/>
   </g>
  </g>
diff --git a/data/styles/default/dark/symbols/zoo-s.svg b/data/styles/default/dark/symbols/zoo-s.svg
index 15bfbad6c..54dd54cd0 100644
--- a/data/styles/default/dark/symbols/zoo-s.svg
+++ b/data/styles/default/dark/symbols/zoo-s.svg
@@ -3,7 +3,7 @@
  <g id="Page-2:-Night" fill="none" fill-rule="evenodd" opacity="1">
   <g id="zoo-s" fill-rule="nonzero">
    <circle id="Oval" cx="8" cy="8" r="8" fill="#000" opacity=".6"/>
-   <circle id="Oval" cx="8" cy="8" r="7.3333" fill="#7F5933"/>
+   <circle id="Oval" cx="8" cy="8" r="7.3333" fill="#6E4426"/>
    <path id="Path" d="m9.8519 3.3333c-0.98765 1.4359-1.128 2.6349-2.2222 3.5897-1.0453 0.91201-2.963 0.59891-2.963 1.9146v0.47858c0 0.47866 0.49383 0.93405 0.49383 1.4359v0.47866c0 0.71795-0.24692 0.71795-0.49383 1.4359h0.49383l0.98765-1.4359v1.4359h0.74074v-2.8718h0.74074v2.8718h0.74074v-2.1538l0.74074 2.1538h0.49383l-0.75618-3.0064c0.29111-0.17216 0.26235-0.49043 0.26235-0.82263v-1.4359l1.1111-2.6325 1.1111 0.35897c0-0.033744-3.852e-4 -0.33169 0-0.35897 0 0-0.18038-0.17482-0.24691-0.23929l-1.2346-1.1966z" fill="#000"/>
   </g>
  </g>

From 820a5d1e451713a9a370fa99f51d243fa7a35c19 Mon Sep 17 00:00:00 2001
From: Yannik Bloscheck <git@yannikbloscheck.com>
Date: Fri, 22 Aug 2025 21:02:59 +0200
Subject: [PATCH 278/302] [styles] Adjusting label colors to the new dark map
 style

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
---
 data/styles/default/dark/colors.mapcss | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/data/styles/default/dark/colors.mapcss b/data/styles/default/dark/colors.mapcss
index 849edcbf7..57da6adf3 100644
--- a/data/styles/default/dark/colors.mapcss
+++ b/data/styles/default/dark/colors.mapcss
@@ -226,12 +226,12 @@
 @poi_label: #8C8C8C;
 @subway_label: #9E9E9E;
 @indigenous_label: #6A512F;
-@shop_label: #8C5F93;
-@food_label: #BB9342;
-@culture_label: #7F5933;
-@hotel_label: #6D544C;
-@healthcare_label: #C15746;
-@industry_label: #717065;
+@shop_label: #6B425C;
+@food_label: #8C491C;
+@culture_label: #6E4426;
+@hotel_label: #614A43;
+@healthcare_label: #983E44;
+@industry_label: #51585E;
 @public_transport_label: #2F6499;
 
 /* 6.4 Road labels */

From fdcbafa23d888cdb7d80bdc67ce53e80348995d1 Mon Sep 17 00:00:00 2001
From: Codeberg Translate <translate@codeberg.org>
Date: Fri, 29 Aug 2025 00:02:09 +0000
Subject: [PATCH 279/302] [strings] Update from Codeberg Translate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: B o d o <timtrek@noreply.codeberg.org>
Co-authored-by: Codeberg Translate <translate@codeberg.org>
Co-authored-by: N4ta <codeberg@n4ta.anonaddy.me>
Co-authored-by: Priit Jõerüüt <jrtcdbrg@noreply.codeberg.org>
Co-authored-by: Stephan-P <stephan-p@noreply.codeberg.org>
Co-authored-by: Weblate <noreply-mt-weblate@weblate.org>
Co-authored-by: Weblate Translation Memory <noreply-mt-weblate-translation-memory@weblate.org>
Co-authored-by: dobridabar <dobridabar@noreply.codeberg.org>
Co-authored-by: ikanakova <ikanakova@noreply.codeberg.org>
Co-authored-by: jeanbaptisteC <jeanbaptistec@noreply.codeberg.org>
Co-authored-by: krlsk <krlsk@noreply.codeberg.org>
Co-authored-by: loscati <loscati@noreply.codeberg.org>
Co-authored-by: matheusgomesms <matheusgomesms@noreply.codeberg.org>
Co-authored-by: summoner <summoner@noreply.codeberg.org>
Co-authored-by: sziatomi <sziatomi@noreply.codeberg.org>
Co-authored-by: yurtpage <yurtpage@noreply.codeberg.org>
Translation: CoMaps/Android - Map Feature Types
Translation: CoMaps/Android UI Strings
Translation: CoMaps/Android UI Strings (SDK)
Translation: CoMaps/Countries and regions names
Translation: CoMaps/F-Droid app description
Translation: CoMaps/Voice announcements for navigation (TTS)
Translation: CoMaps/iOS - Map Feature Types
Translation: CoMaps/iOS Plurals
Translation: CoMaps/iOS UI Strings
---
 .../play/listings/sr/full-description.txt     | 38 ++++++-------
 .../fdroid/play/listings/sr/release-notes.txt |  2 +-
 .../app/src/main/res/values-bg/strings.xml    |  3 +-
 .../app/src/main/res/values-cs/strings.xml    |  1 +
 .../app/src/main/res/values-de/strings.xml    |  1 +
 .../app/src/main/res/values-et/strings.xml    |  1 +
 .../app/src/main/res/values-hu/strings.xml    | 56 ++++++++++++++-----
 .../app/src/main/res/values-it/strings.xml    |  8 ++-
 .../app/src/main/res/values-nl/strings.xml    |  3 +-
 .../src/main/res/values-pt-rBR/strings.xml    | 21 +++----
 .../app/src/main/res/values-pt/strings.xml    |  1 +
 .../app/src/main/res/values-ru/strings.xml    | 32 +++++------
 .../sdk/src/main/res/values-cs/strings.xml    |  8 +++
 .../src/main/res/values-cs/types_strings.xml  |  4 +-
 .../sdk/src/main/res/values-it/strings.xml    |  8 +++
 .../src/main/res/values-it/types_strings.xml  |  2 +
 .../src/main/res/values-pt-rBR/strings.xml    |  8 +++
 .../main/res/values-pt-rBR/types_strings.xml  |  2 +-
 .../sdk/src/main/res/values-pt/strings.xml    |  8 +++
 .../sdk/src/main/res/values-ru/strings.xml    |  8 +++
 .../src/main/res/values-ru/types_strings.xml  |  6 +-
 .../sdk/src/main/res/values-sr/strings.xml    |  8 +++
 data/countries-strings/it.json/localize.json  |  6 +-
 data/countries-strings/ru.json/localize.json  |  8 +--
 data/countries-strings/sr.json/localize.json  | 50 ++++++++++++++++-
 data/sound-strings/fr.json/localize.json      |  2 +-
 .../bg.lproj/Localizable.strings              | 44 +++++++--------
 .../cs.lproj/LocalizableTypes.strings         |  4 +-
 .../hu.lproj/Localizable.strings              | 18 +++---
 .../it.lproj/Localizable.strings              |  6 +-
 .../it.lproj/Localizable.stringsdict          |  4 +-
 .../it.lproj/LocalizableTypes.strings         |  4 +-
 .../pt-BR.lproj/Localizable.strings           |  8 +--
 .../pt-BR.lproj/LocalizableTypes.strings      |  2 +-
 .../ru.lproj/Localizable.strings              |  8 +--
 .../ru.lproj/Localizable.stringsdict          |  8 +--
 .../ru.lproj/LocalizableTypes.strings         | 10 ++--
 37 files changed, 276 insertions(+), 135 deletions(-)

diff --git a/android/app/src/fdroid/play/listings/sr/full-description.txt b/android/app/src/fdroid/play/listings/sr/full-description.txt
index 2f0d58a85..4b26f789a 100644
--- a/android/app/src/fdroid/play/listings/sr/full-description.txt
+++ b/android/app/src/fdroid/play/listings/sr/full-description.txt
@@ -1,32 +1,32 @@
-Бесплатна апликација отвореног кода коју је обављала заједница и заснива се на ОpenStreetMap-у подацима, усмерени транспарентност, приватност и непрофитни. CoMaps је Апликације за органске карте виљушка, које је пак форк Maps.ME.
+Бесплатна апликација отвореног кода коју одржава заједница, која се заснива на ОpenStreetMap подацима. Непрофитна, транспарентна и цени вашу приватност. CoMaps је настала од апликације Organic Maps,  које је настала од апликације Maps.ME.
 
 Прочитајте о разлозима пројекта и његовог правца на <b><i>codeberg.org/comaps</i></b>
 Придружите се отвореној заједници и помозите да направимо најбољу апликацију за мапе
 • Користите апликацију и проширите глас о томе
 • Дајте повратне информације и пријавите проблеме
-• Ажурирајте податке на мапи у апликацији или на веб локацији OpenStreetMap
+• Ажурирајте податке на мапи у апликацији или на сајту OpenStreetMap
 
-‣ <b> фокусирано на офлајн Вар </b>: Планирајте и управљајте путовањем у иностранству без потребе за мобилним услугама, тражите путне тачке док је на даљинском покрету, итд. Све апликације су дизајниране за рад ван мреже.
-‣ <b> Поштовање приватности </b>: Апликација је осмишљена задржавања у уму приватност - не идентификује људе, не прати или прикупља личне податке. Нема реклама.
-‣ <b> Једноставно и елегантно </b>: Апликација је тривијална за употребу и једноставно функционише.
-‣ <b> Чува вашу батерију и простор </b>: не конзумира батерију као остале навигационе апликације. Компактне картице сачувајте драгоцени простор на вашем телефону.
-‣ <b> Отворено и направио је заједницу </b>: Људи попут вас је помогли да додају апликацију додавањем локација на OpenStreetMap-у, тестирању и давање повратних информација о апликацији и доприносе вашим развојним вештинама и новцу.
-‣ <b> Отворено и транспарентно доношење одлука и употреба финансија, непрофитна и потпуно отворена извора. </b>
+‣ <b>Фокусирано на офлајн рад</b>: Планирајте и управљајте путовањем у иностранству без потребе за мобилним интернетом, тражите успутне тачке док сте на забаченом планинском путу, итд. Све функционалности су дизајниране за рад без интернета.
+‣ <b>Поштовање приватности</b>: Апликација је осмишљена са приватношћу корисника на уму - не идентификује људе, не прати или прикупља личне податке. Нема реклама.
+‣ <b>Једноставно и елегантно</b>: Апликација је лака за употребу и једноставно функционише.
+‣ <b>Чува вашу батерију и простор</b>: Не троши батерију као остале апликације за навигацију. Компактне мапе чувају драгоцени простор на вашем телефону.
+‣ <b>Отворено и направљено од стране заједнице</b>: Људи попут вас су допринели развоју апликације додавањем локација на OpenStreetMap, тестирањем, давањем повратних информација о апликацији и помогли су својим програмерским вештинама  и донацијама.
+‣ <b>Отворено и транспарентно доношење одлука и употреба донација, непрофитна и потпуно отвореног кода.</b>
 
 <b> Главне карактеристике </b>:
-• Преузмите детаљне мапе са локацијама које нису доступне са Гоогле мапама
-• Улазнице за излете са истакнутим планинарским стазама, камповима, изворима воде, планинске врхове, контурне линије итд.
+• Преузмимање детаљне мапе са локацијама које нису доступне са Google мапама
+• Режим за излете са истакнутим планинарским стазама, камповима, изворима воде, планинским врховима, изохипсама итд.
 • Стазе за планинарење и бицикле
-• Тачке интереса као што су ресторани, бензинске пумпе, хотели, продавнице, погледа и још много тога
-• Претражите име или адресу или по категоријама камате
-• навигација са гласовним најавама за ходање, бициклизам или аутомобил
-• Означите своја омиљена места једним додиром
+• Тачке интереса као што су ресторани, бензинске пумпе, хотели, продавнице, знаменитости и још много тога
+• Претрага по називу, адреси или категоријама
+• Навигација са гласовним инструкцијама за ходање, вожњу бицикла или аутомобила
+• Означивање омиљених места једним додиром
 • Офлајн чланци Википедије
-• транзитни слој подземне пруге са навигацијом
-• Снимање ГПС трагова
-• Ознака и увоз и увоз у KML, KMZ, GPX формате
+• Транзитни слој подземне железнице са навигацијом
+• Снимање ГПС путања
+• Увоз и увоз маркера и путања у KML, KMZ, GPX формате
 • Тамни режим за употребу током ноћи
-• Побољшајте карту за све кориснике, користећи основни уредни уредник мапе
+• Побољшајте карту за све кориснике, користећи основни едитор за мапе
 
 <b> Слобода је овде </b>
-Откријте своје путовање, крећете се са свијетом са приватношћу и заједницом на првом месту!
+Откријте своје путовање, крећете се са светом са приватношћу и заједницом на првом месту!
diff --git a/android/app/src/fdroid/play/listings/sr/release-notes.txt b/android/app/src/fdroid/play/listings/sr/release-notes.txt
index 1ff7167c5..2e2ba6dc0 100644
--- a/android/app/src/fdroid/play/listings/sr/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/sr/release-notes.txt
@@ -4,4 +4,4 @@
 • унапређене изохипсе на кораке од 20 м за популарне планинарске регионе
 • подршка за више скраћеница и алтернативних назива у претрази
 • додате иконе за претрагу и обележавање за брзу храну, бицикле и станице за пуњење
-• равномерније кретање стрелице која приказује позицију
\ No newline at end of file
+• равномерније кретање стрелице која приказује позицију
diff --git a/android/app/src/main/res/values-bg/strings.xml b/android/app/src/main/res/values-bg/strings.xml
index e497822fc..f5576d714 100644
--- a/android/app/src/main/res/values-bg/strings.xml
+++ b/android/app/src/main/res/values-bg/strings.xml
@@ -216,7 +216,7 @@
     <!-- Settings «Route» category: «Tts language» title -->
     <string name="pref_tts_language_title">Език на инструкциите</string>
     <!-- Settings «Route» category: «Test Voice Directions» title -->
-    <string name="pref_tts_test_voice_title">Тестване на гласови указания (TTS, Text-To-Speech)</string>
+    <string name="pref_tts_test_voice_title">Тестване на гласови указания</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
     <string name="pref_tts_playing_test_voice">Проверете силата на звука или системните настройки за преобразуване на текст в реч, ако сега не чувате гласа.</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
@@ -804,4 +804,5 @@
     <string name="editor_line_social_network">LINE</string>
     <string name="app_site_url">https://comaps.app/</string>
     <string name="saved">Запазено</string>
+    <string name="about_headline">Отворен проект, захранван от общността</string>
 </resources>
diff --git a/android/app/src/main/res/values-cs/strings.xml b/android/app/src/main/res/values-cs/strings.xml
index 9bae38aef..f9b807501 100644
--- a/android/app/src/main/res/values-cs/strings.xml
+++ b/android/app/src/main/res/values-cs/strings.xml
@@ -884,4 +884,5 @@
     <string name="delete_track_dialog_title">Odstranit %s?</string>
     <string name="hours_confirmed_time_ago">Potvrzeno %s</string>
     <string name="existence_confirmed_time_ago">Existence potvrzena %s</string>
+    <string name="pref_tts_no_system_tts_short">Nenalezen žádný modul pro převod textu na řeč, zkontrolujte nastavení aplikace</string>
 </resources>
diff --git a/android/app/src/main/res/values-de/strings.xml b/android/app/src/main/res/values-de/strings.xml
index a6a6c5f44..94c268571 100644
--- a/android/app/src/main/res/values-de/strings.xml
+++ b/android/app/src/main/res/values-de/strings.xml
@@ -889,4 +889,5 @@
     <string name="delete_track_dialog_title">%s löschen?</string>
     <string name="existence_confirmed_time_ago">Existenz bestätigt %s</string>
     <string name="hours_confirmed_time_ago">Bestätigt %s</string>
+    <string name="pref_tts_no_system_tts_short">Kein Text-zu-Sprache Modul gefunden, überprüfe die App-Einstellungen</string>
 </resources>
diff --git a/android/app/src/main/res/values-et/strings.xml b/android/app/src/main/res/values-et/strings.xml
index 25ae41abd..623934adc 100644
--- a/android/app/src/main/res/values-et/strings.xml
+++ b/android/app/src/main/res/values-et/strings.xml
@@ -884,4 +884,5 @@
     <string name="delete_track_dialog_title">Kas kustutame: %s?</string>
     <string name="existence_confirmed_time_ago">Olemasolu on kontrollitud %s</string>
     <string name="hours_confirmed_time_ago">Kontrollitud %s</string>
+    <string name="pref_tts_no_system_tts_short">Ühtegi kõnesünteesimootorit ei leidu, palun kontrolli rakenduse seadistusi</string>
 </resources>
diff --git a/android/app/src/main/res/values-hu/strings.xml b/android/app/src/main/res/values-hu/strings.xml
index 6e46bac22..62c06557e 100644
--- a/android/app/src/main/res/values-hu/strings.xml
+++ b/android/app/src/main/res/values-hu/strings.xml
@@ -9,7 +9,7 @@
     <string name="delete">Törlés</string>
     <string name="download_maps">Térképek letöltése</string>
     <!-- Settings/Downloader - info for country when download fails -->
-    <string name="download_has_failed">Nem sikerült letölteni, próbáld meg újra</string>
+    <string name="download_has_failed">Nem sikerült letölteni, próbálja újra</string>
     <!-- Settings/Downloader - info for country which started downloading -->
     <string name="downloading">Letöltés…</string>
     <!-- Choose measurement on first launch alert - choose metric system button -->
@@ -23,7 +23,7 @@
     <!-- Search box placeholder text; Used when searching on the map itself, not when searching for a map -->
     <string name="search_map">Keresés a térképen</string>
     <!-- Location services are disabled by user alert - message -->
-    <string name="location_is_disabled_long_text">Jelenleg az eszköz vagy alkalmazás helymeghatározási szolgáltatásai le vannak tiltva. Engedélyezze őket a Beállításokban.</string>
+    <string name="location_is_disabled_long_text">Jelenleg az eszköz vagy alkalmazás helymeghatározási szolgáltatásai le vannak tiltva. Engedélyezze őket a beállításokban.</string>
     <!-- A dialog title, that warns a user that Precise Location is disabled and suggests to turn it on -->
     <string name="limited_accuracy">Korlátozott pontosság</string>
     <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
@@ -259,7 +259,7 @@
     <!-- Downloaded maps list header -->
     <string name="downloader_downloaded_subtitle">Letöltve</string>
     <!-- Country queued for download -->
-    <string name="downloader_queued">Sorbaállítva</string>
+    <string name="downloader_queued">Várólistához adva</string>
     <string name="downloader_near_me_subtitle">A közelben</string>
     <!-- In maps downloader and country place page shows how many maps are downloaded / to download, e.g. "Maps: 3 of 10" -->
     <string name="downloader_status_maps">Térképek</string>
@@ -459,12 +459,12 @@
     <!-- Text in About and OSM Login screens. First %@ is replaced by a local, human readable date. -->
     <string name="osm_presentation">A közösségi OpenStreetMap adatok frissítésének időpontja: %s. Tudjon meg többet a térkép szerkesztéséről és frissítéséről az OpenStreetMap.org oldalon</string>
     <!-- OSM explanation on Android login screen -->
-    <string name="login_osm_presentation">Az OpenStreetMap.org (OSM) egy közösségi projekt, amelynek célja egy ingyenes és nyílt térkép létrehozása. Ez az CoMaps alkalmazás térképadatainak fő forrása, és a Wikipédiához hasonlóan működik. Helyeket adhat hozzá vagy szerkeszthet, és azok világszerte felhasználók milliói számára válnak elérhetővé. \nCsatlakozzon a közösséghez, és segítsen egy jobb térképet készíteni mindenki számára!</string>
+    <string name="login_osm_presentation">Az OpenStreetMap.org (OSM) egy közösségi projekt, amelynek célja egy ingyenes és nyílt térkép létrehozása. Ez az CoMaps alkalmazás térképadatainak fő forrása, és a Wikipédiához hasonlóan működik. Helyeket adhat hozzá vagy szerkeszthet, és azok világszerte felhasználók milliói számára válnak elérhetővé. \nCsatlakozzon a közösséghez, és segítsen jobb térképet készíteni mindenki számára!</string>
     <string name="login_to_make_edits_visible">Hozzon létre egy OpenStreetMap-fiókot, vagy jelentkezzen be, hogy a világ számára közzétehesse az Ön térképszerkesztéseit</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d / %2$d</string>
     <string name="download_over_mobile_header">Biztosan letölti mobilhálózati kapcsolaton keresztül?</string>
-    <string name="download_over_mobile_message">Ez egyes díjcsomagok vagy roaming esetén jelentős költségekkel járhat.</string>
+    <string name="download_over_mobile_message">Ez egyes díjcsomagok vagy roaming esetén jelentős költségekkel járhat</string>
     <string name="error_enter_correct_house_number">Adjon meg egy érvényes házszámot</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Ez az épület legfeljebb %d emeletes lehet</string>
@@ -473,7 +473,7 @@
     <!-- Title for OSM note section in the editor -->
     <string name="editor_other_info">Megjegyzés az OpenStreetMap önkénteseinek (nem kötelező)</string>
     <!-- Hint of the input field in the OSM note section of the editor -->
-    <string name="editor_note_hint">Írja le a térképen található hibákat vagy olyan dolgokat, amelyeket nem lehet az CoMaps segítségével szerkeszteni</string>
+    <string name="editor_note_hint">Írja le a térképen található hibákat vagy olyan dolgokat, amelyeket nem lehet a CoMaps segítségével szerkeszteni</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">A szerkesztései feltöltődnek a nyilvános <a href="https://wiki.openstreetmap.org/wiki/Hu:Névjegy">OpenStreetMap</a> adatbázisba. Ne adjon hozzá személyes vagy szerzői jogvédelem alatt álló információkat.</string>
     <string name="editor_more_about_osm">További részletek az OpenStreetMap adatbázisról</string>
@@ -485,7 +485,7 @@
     <string name="editor_category_unsuitable_title">Nem találja a megfelelő kategóriát?</string>
     <string name="editor_category_unsuitable_text">Az CoMaps csak egyszerű pontkategóriák hozzáadását teszi lehetővé, azaz nem tartalmaz városokat, utakat, tavakat, épületek körvonalait stb., az ilyen kategóriákat közvetlenül az <a href="https://www.openstreetmap.org">OpenStreetMap.org</a> oldalon adhatja hozzá. A részletes, lépésről lépésre történő útmutatásért tekintse meg az <a href="https://www.comaps.app/support/advanced-map-editing/">útmutatónkat</a>.</string>
     <string name="downloader_no_downloaded_maps_title">Még nem töltött le térképet</string>
-    <string name="downloader_no_downloaded_maps_message">Térkép letöltése offline kereséshez és navigáláshoz.</string>
+    <string name="downloader_no_downloaded_maps_message">Térképek letöltése internetkapcsolat nélküli kereséshez és navigáláshoz</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">km/h</string>
     <string name="miles_per_hour">mf/h</string>
@@ -509,8 +509,8 @@
     <!-- Displayed when saving some edits to the map to warn against publishing personal data -->
     <string name="editor_share_to_all_dialog_title">Szeretné elküldeni az összes felhasználónak?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
-    <string name="editor_share_to_all_dialog_message_1">Győződjön meg arról, hogy nem ad meg semmilyen személyes információt.</string>
-    <string name="editor_share_to_all_dialog_message_2">Az OpenStreetMap szerkesztői ellenőrzik a változásokat, és felveszik Önnel a kapcsolatot, ha kérdéseik vannak.</string>
+    <string name="editor_share_to_all_dialog_message_1">Győződjön meg arról, hogy nem ad meg semmilyen magánjellegű vagy személyes adatokat</string>
+    <string name="editor_share_to_all_dialog_message_2">Az OpenStreetMap szerkesztői ellenőrzik a változásokat, és felveszik Önnel a kapcsolatot, ha bármilyen kérdésük van</string>
     <string name="navigation_stop_button">Megállítás</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Nyomvonal rögzítése</string>
@@ -524,10 +524,10 @@
     <string name="mobile_data_option_not_today">Ma ne használja</string>
     <string name="mobile_data">Mobilinternet</string>
     <!-- NOTE to translators: please synchronize your translation with the English one. -->
-    <string name="mobile_data_description">Mobilinternet szükséges a térképfrissítési értesítésekhez, valamint a helyszínekre és könyvjelzőkre vonatkozó részletes információk megjelenítéséhez.</string>
+    <string name="mobile_data_description">A térképfrissítési értesítésekhez és a szerkesztések feltöltéséhez mobilinternetre van szükség</string>
     <string name="mobile_data_option_never">Soha ne használja</string>
     <string name="mobile_data_option_ask">Mindig kérdezzen rá</string>
-    <string name="traffic_update_maps_text">Forgalmi adatok megjelenítéséhez frissíteni kell a térképeket.</string>
+    <string name="traffic_update_maps_text">A forgalmi adatok megjelenítéséhez frissíteni kell a térképeket</string>
     <string name="big_font">Betűméret növelése a térképen</string>
     <string name="traffic_update_app">Frissítse az CoMaps alkalmazást</string>
     <!-- "traffic" as in "road congestion" -->
@@ -537,7 +537,7 @@
     <string name="feedback_general">Általános visszajelzés</string>
     <string name="prefs_languages_information">Az CoMaps TTS-rendszert használ a hangnavigációhoz. Sok androidos eszköz használja a Google TTS-t; töltse le vagy frissítse a Google Play áruházból (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
     <string name="prefs_languages_information_off">Egyes nyelveknél másik beszédszintetizátort vagy további nyelvi csomagot kell telepítenie az alkalmazás-áruházból (Google Play, Galaxy Store, App Gallery, FDroid). \nNyissa meg az eszköz beállításait → Nyelv és bevitel → Beszéd → Szöveg-beszéd átalakító kimenet. \nItt kezelheti a beszédszintézis beállításokat (például: nyelvi csomag letöltése a kapcsolat nélküli használathoz) és másik szövegfelolvasót jelölhet ki.</string>
-    <string name="prefs_languages_information_off_link">További tájékoztatást találhat még ebben az útmutatóban.</string>
+    <string name="prefs_languages_information_off_link">Ebben az útmutatóban további tájékoztatást talál</string>
     <string name="transliteration_title">Átírás latin betűkre</string>
     <string name="learn_more">Tudjon meg többet</string>
     <!-- User selected the destination by pressing Route To, but the current position is unknown. User needs to select a starting point of a route using search or by tapping on the map and then pressing "Route From". -->
@@ -607,7 +607,7 @@
     <!-- Speed camera settings menu option - Never warn (about speedcams) -->
     <string name="pref_tts_speedcams_never">Soha ne figyelmeztessen</string>
     <string name="power_managment_title">Energiatakarékos mód</string>
-    <string name="power_managment_description">Próbálja meg csökkenteni az energiafelhasználást bizonyos funkciók rovására.</string>
+    <string name="power_managment_description">Megpróbálja csökkenteni az energiafelhasználást bizonyos funkciók rovására</string>
     <string name="power_managment_setting_never">Soha</string>
     <string name="power_managment_setting_auto">Amikor az akkumulátor lemerül</string>
     <string name="power_managment_setting_manual_max">Mindig</string>
@@ -810,7 +810,7 @@
     <string name="facebook">Facebook</string>
     <string name="closes_in">Bezár %s múlva</string>
     <string name="opens_in">Kinyit %s múlva</string>
-    <string name="current_location_unknown_error_title">A jelenlegi helyzet ismeretlen.</string>
+    <string name="current_location_unknown_error_title">A jelenlegi helyzet ismeretlen</string>
     <string name="disk_error">Nem lehet mappát létrehozni és fájlokat áthelyezni az eszköz belső memóriájában vagy az SD-kártyán</string>
     <string name="disk_error_title">Lemezhiba</string>
     <string name="twitter">X (Twitter)</string>
@@ -839,4 +839,32 @@
     <string name="closed_now">Most zárva van</string>
     <string name="existence_confirmed_time_ago">A létezése ellenőrizve és megerősítve %s</string>
     <string name="hours_confirmed_time_ago">Ellenőrizve és megerősítve %s</string>
+    <string name="editor_level">Emelet (0 a földszint)</string>
+    <string name="error_enter_correct_level">Adja meg az emeletek számát</string>
+    <string name="editor_building_levels">Emeletek (beleértve a földszintet, kivéve a tetőt)</string>
+    <string name="error_enter_correct_fediverse_page">Adjon meg egy érvényes Mastodon felhasználónevet vagy webcímet</string>
+    <string name="osm_note_hint">Vagy írjon egy feljegyzést az OpenStreetMap közösségnek, hogy valaki más hozzáadhassa vagy kijavíthassa itt a helyet.</string>
+    <string name="error_enter_correct_bluesky_page">Adjon meg egy érvényes Bluesky felhasználónevet vagy webcímet</string>
+    <string name="osm_note_toast">A feljegyzés elküldésre kerül az OpenStreetMap közösséghez</string>
+    <string name="pref_left_button_disable">Letiltás</string>
+    <string name="codeberg">Codeberg</string>
+    <string name="pref_backup_now_summary_progress">A biztonsági mentés folyamatban van…</string>
+    <string name="pref_backup_now_summary">Készítsen biztonsági mentést most</string>
+    <string name="pref_backup_now_summary_ok">A biztonsági mentés sikeresen befejeződött</string>
+    <string name="pref_backup_now_summary_empty_lists">Nincsenek könyvjelzők és nyomvonalak a biztonsági mentéshez</string>
+    <string name="pref_backup_now_title">Biztonsági mentés most</string>
+    <string name="pref_backup_location_summary_initial">Válasszon ki egy mappát és adja meg az írási/olvasási engedélyt</string>
+    <string name="pref_left_button_title">A bal oldali gomb beállítása</string>
+    <string name="pref_backup_title">Könyvjelzők és nyomvonalak mentése</string>
+    <string name="pref_backup_summary">Automatikus biztonsági mentés az eszközön lévő mappába</string>
+    <string name="pref_backup_now_summary_folder_unavailable">A biztonsági mentés mappája nem elérhető</string>
+    <string name="pref_backup_status_summary_success">Az utolsó sikeres biztonsági mentés</string>
+    <string name="pref_backup_location_title">A biztonsági mentés mappája</string>
+    <string name="pref_backup_history_title">A megőrzendő biztonsági mentések száma</string>
+    <string name="backup_interval_every_week">Hetente</string>
+    <string name="pref_backup_interval_title">Automatikus biztonsági mentés</string>
+    <string name="backup_interval_every_day">Naponta</string>
+    <string name="pref_backup_now_summary_failed">Nem sikerült a biztonsági mentés</string>
+    <string name="backup_interval_manual_only">Ki (csak kézileg)</string>
+    <string name="dialog_report_error_missing_folder">A biztonsági mentés kiválasztott mappája nem elérhető, vagy nem írható. Kérjük, válasszon másik mappát.</string>
 </resources>
diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml
index d4d436925..d9ebef42e 100644
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -232,7 +232,7 @@
     <!-- Text in About menu, opens CoMaps news website -->
     <string name="news">Notizie</string>
     <!-- Settings: Send feedback button and dialog title -->
-    <string name="feedback">Feedback</string>
+    <string name="feedback">Opinioni</string>
     <!-- Text in menu -->
     <string name="rate_the_app">Vota l\'app</string>
     <!-- Text in menu -->
@@ -242,7 +242,7 @@
     <!-- Button in the main menu -->
     <string name="donate">Dona</string>
     <!-- Button in the main Help dialog -->
-    <string name="how_to_support_us">Sostieni il progetto</string>
+    <string name="how_to_support_us">Volontariato e migliorare CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="copyright">Copyright</string>
     <!-- Text in menu + Button in the main Help dialog -->
@@ -885,4 +885,8 @@
     <string name="at">alle %s</string>
     <string name="osm_note_hint">In alternativa lascia una nota per la community di OpenStreetMap, così un altro utente potrà aggiungere o sistemare questo posto.</string>
     <string name="osm_note_toast">La nota verrà mandata a OpenStreetMap</string>
+    <string name="hours_confirmed_time_ago">Confermato %s</string>
+    <string name="existence_confirmed_time_ago">Esistenza confermata %s</string>
+    <string name="share_track">Traccia condivisa</string>
+    <string name="delete_track_dialog_title">Eliminare %s?</string>
 </resources>
diff --git a/android/app/src/main/res/values-nl/strings.xml b/android/app/src/main/res/values-nl/strings.xml
index 889a9dfa1..d3b91a51e 100644
--- a/android/app/src/main/res/values-nl/strings.xml
+++ b/android/app/src/main/res/values-nl/strings.xml
@@ -554,7 +554,7 @@
     <!-- Settings: "Send general feedback" button -->
     <string name="feedback_general">Algemene feedback</string>
     <string name="prefs_languages_information">We gebruiken het TTS-systeem voor gesproken instructies. Vele Android toestellen gebruiken Google TTS, u kunt het downloaden of bijwerken in Google Play (https://play.google.com/store/apps/details?id=com.google.android.tts)</string>
-    <string name="prefs_languages_information_off">Voor sommige talen dient u een andere spraaksynthesesoftware of een aanvullende taalpakket te installeren van de app store (Google Play, Galaxy Store, App Gallery, FDroid). \nOpen de instellingen van uw toestel → Taal en invoer → Spraak → Uitvoer voor tekst-naar-spraak. \nHier kunt u instellingen voor spraaksynthese beheren (bijvoorbeeld taalpakket downloaden voor offline gebruik) en een andere tekst-naar-spraak engine selecteren.</string>
+    <string name="prefs_languages_information_off">Voor sommige talen dient u een andere spraaksynthesesoftware of een aanvullende taalpakket te installeren van de app store (Google Play, Galaxy Store, App Gallery, FDroid). \nOpen de instellingen van uw toestel → Taal en invoer → Spraak → Uitvoer voor tekst-naar-spraak. \nHier kunt u instellingen voor spraaksynthese beheren (bijvoorbeeld taalpakket downloaden voor offline gebruik) en een andere tekst-naar-spraak processor selecteren.</string>
     <string name="prefs_languages_information_off_link">Gelieve deze handleiding te lezen voor meer informatie</string>
     <string name="transliteration_title">Transliteratie in het Latijnse alfabet</string>
     <string name="learn_more">Meer informatie</string>
@@ -888,4 +888,5 @@
     <string name="delete_track_dialog_title">%s verwijderen?</string>
     <string name="existence_confirmed_time_ago">Bestaan bevestigd %s</string>
     <string name="hours_confirmed_time_ago">Bevestigd %s</string>
+    <string name="pref_tts_no_system_tts_short">Geen tekst-naar-spraak processor gevonden, controleer de app-instellingen</string>
 </resources>
diff --git a/android/app/src/main/res/values-pt-rBR/strings.xml b/android/app/src/main/res/values-pt-rBR/strings.xml
index 109f0e68c..cba781a85 100644
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -25,7 +25,7 @@
     <!-- Location services are disabled by user alert - message -->
     <string name="location_is_disabled_long_text">No momento, todos os Serviços de Localização deste dispositivo ou aplicativo estão desativados. Ative-os nas Configurações.</string>
     <!-- A dialog text, that warns a user that Precise Location is disabled and suggests to turn it on -->
-    <string name="precise_location_is_disabled_long_text">Para garantir uma navegação precisa, ative a opção \"Melhorar Precisão de local\" nas configurações</string>
+    <string name="precise_location_is_disabled_long_text">Para garantir uma navegação precisa, ative a Localização Precisa nas configurações</string>
     <!-- View and button titles for accessibility -->
     <string name="zoom_to_country">Mostrar no mapa</string>
     <!-- Message to display at the center of the screen when the country download has failed -->
@@ -159,9 +159,9 @@
     <!-- Warning message when doing search around current position -->
     <string name="unknown_current_position">A sua localização ainda não foi determinada</string>
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
-    <string name="cant_change_this_setting">Lamentamos, as configurações do armazenamento do mapa estão desativadas</string>
+    <string name="cant_change_this_setting">Desculpe, as configurações de armazenamento de mapas estão desabilitadas no momento</string>
     <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">O download do mapa está atualmente em progresso</string>
+    <string name="downloading_is_active">O download do mapa está em andamento</string>
     <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
     <string name="my_position_share_sms">Veja onde estou agora. Abra o link: %1$s ou %2$s Não tem mapas offline instalados? Baixe aqui: https://www.comaps.app/download/</string>
     <!-- Subject for emailed bookmark -->
@@ -211,7 +211,7 @@
     <!-- Settings «Route» category: «Test Voice Directions» title -->
     <string name="pref_tts_test_voice_title">Testar orientação por voz</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
-    <string name="pref_tts_playing_test_voice">Verifique o volume ou as configurações de conversão de texto em fala do sistema se você não estiver ouvindo a voz agora</string>
+    <string name="pref_tts_playing_test_voice">Verifique o volume ou as configurações do sistema de conversão de texto em fala se você não estiver ouvindo a voz agora</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
     <string name="pref_tts_unavailable">Não disponível</string>
     <string name="pref_map_auto_zoom">Zoom automático</string>
@@ -249,7 +249,7 @@
     <string name="downloader_download_all_button">Baixar tudo</string>
     <string name="downloader_downloading">Baixando:</string>
     <!-- Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode -->
-    <string name="downloader_delete_map_while_routing_dialog">Favor parar a navegação para apagar o mapa</string>
+    <string name="downloader_delete_map_while_routing_dialog">Para apagar o mapa, pare a navegação</string>
     <!-- PointsInDifferentMWM -->
     <string name="routing_failed_cross_mwm_building">Só podem ser criadas rotas que estejam completamente contidas em um único mapa.</string>
     <!-- Context menu item for downloader. -->
@@ -439,9 +439,9 @@
     <string name="editor_more_about_osm">Mais sobre OpenStreetMap</string>
     <string name="editor_osm_history">Seu histórico de edição</string>
     <string name="editor_osm_notes">Suas notas de dados do mapa</string>
-    <string name="editor_category_unsuitable_title">Você não encontra uma categoria adequada?</string>
+    <string name="editor_category_unsuitable_title">Não encontra uma categoria adequada?</string>
     <string name="editor_category_unsuitable_text">O CoMaps permite que você adicione apenas categorias de pontos simples, o que significa que não há cidades, estradas, lagos, contornos de edifícios etc. Por favor, adicione essas categorias diretamente no <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Consulte nosso <a href="https://www.comaps.app/support/advanced-map-editing/">guia</a> para obter instruções detalhadas passo a passo.</string>
-    <string name="downloader_no_downloaded_maps_title">Você não fez o download de nenhum mapa</string>
+    <string name="downloader_no_downloaded_maps_title">Você não baixou nenhum mapa</string>
     <string name="downloader_no_downloaded_maps_message">Baixe mapas para pesquisar e navegar offline</string>
     <string name="current_location_unknown_error_title">A localização atual é desconhecida</string>
     <!-- abbreviation for kilometers per hour -->
@@ -570,7 +570,7 @@
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Evitar pedágios</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
-    <string name="avoid_unpaved">Evitar não-pavimentadas</string>
+    <string name="avoid_unpaved">Evitar não pavimentadas</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_ferry">Evitar balsas</string>
     <string name="avoid_motorways">Evitar rodovias</string>
@@ -579,7 +579,7 @@
     <string name="define_to_avoid_btn">Definir as estradas a serem evitadas</string>
     <string name="change_driving_options_btn">Opções de direção ativadas</string>
     <string name="toll_road">Pedágio</string>
-    <string name="unpaved_road">Pista não pavimentada</string>
+    <string name="unpaved_road">Via não pavimentada</string>
     <string name="ferry_crossing">Balsa</string>
     <!-- A generic "Yes" button in dialogs -->
     <string name="yes">Sim</string>
@@ -855,7 +855,7 @@
     <string name="backup_interval_manual_only">Desligado (apenas manual)</string>
     <string name="dialog_report_error_missing_folder">A localização de backup selecionada está indisponível ou não permite escrita. Por favor, selecione outra localização.</string>
     <string name="dialog_report_error_with_logs">Por favor, nos envie um relatório de erro:\n - Habilite \"Ativar registros de execução\" nas configurações\n - reproduza o problema\n - na tela \"Sobre &amp; Ajuda\", pressione o botão \"Relatar um problema\" e envie via email ou chat\n - desative os registros de execução</string>
-    <string name="panoramax">Imagem Panoramax</string>
+    <string name="panoramax">Imagem do Panoramax</string>
     <string name="open_now">Aberto agora</string>
     <string name="closed_now">Fechado agora</string>
     <string name="at">às %s</string>
@@ -865,4 +865,5 @@
     <string name="share_track">Compartilhar trilha</string>
     <string name="existence_confirmed_time_ago">Existência confirmada %s</string>
     <string name="hours_confirmed_time_ago">Confirmado %s</string>
+    <string name="pref_tts_no_system_tts_short">Nenhum mecanismo de conversão de texto em voz encontrado, verifique as configurações do aplicativo</string>
 </resources>
diff --git a/android/app/src/main/res/values-pt/strings.xml b/android/app/src/main/res/values-pt/strings.xml
index dab41999d..b6ac5aef9 100644
--- a/android/app/src/main/res/values-pt/strings.xml
+++ b/android/app/src/main/res/values-pt/strings.xml
@@ -881,4 +881,5 @@
     <string name="delete_track_dialog_title">Apagar %s?</string>
     <string name="existence_confirmed_time_ago">Existência confirmada %s</string>
     <string name="hours_confirmed_time_ago">Confirmado %s</string>
+    <string name="pref_tts_no_system_tts_short">Nenhuma máquina de ‘text-to-speech’ foi encnotrada, verifique as definições da aplicação</string>
 </resources>
diff --git a/android/app/src/main/res/values-ru/strings.xml b/android/app/src/main/res/values-ru/strings.xml
index bc8bc3003..71b72dcef 100644
--- a/android/app/src/main/res/values-ru/strings.xml
+++ b/android/app/src/main/res/values-ru/strings.xml
@@ -167,7 +167,7 @@
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
     <string name="cant_change_this_setting">Извините, выбор места размещения карт сейчас недоступен</string>
     <!-- Alert message that downloading is in progress. -->
-    <string name="downloading_is_active">Идет процесс загрузки карты.</string>
+    <string name="downloading_is_active">Идет процесс скачивание карты</string>
     <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
     <string name="my_position_share_sms">Смотри где я сейчас! Жми %1$s или %2$s Нету автономных карт? Скачай тут https://www.comaps.app/download/</string>
     <!-- Subject for emailed bookmark -->
@@ -248,7 +248,7 @@
     <!-- Button in the main menu -->
     <string name="donate">Поддержать деньгами</string>
     <!-- Button in the main Help dialog -->
-    <string name="how_to_support_us">Помочь проекту</string>
+    <string name="how_to_support_us">Помочь и улучшить CoMaps</string>
     <!-- Button in the main Help dialog -->
     <string name="copyright">Копирайт</string>
     <!-- Text in menu + Button in the main Help dialog -->
@@ -273,7 +273,7 @@
     <string name="downloader_download_all_button">Загрузить все</string>
     <string name="downloader_downloading">Загружается:</string>
     <!-- Displayed in a dialog that appears when a user tries to delete a map while the app is in the follow route mode -->
-    <string name="downloader_delete_map_while_routing_dialog">Чтобы удалить карту, пожалуйста, остановите навигацию.</string>
+    <string name="downloader_delete_map_while_routing_dialog">Чтобы удалить карту, пожалуйста, остановите ведение</string>
     <!-- PointsInDifferentMWM -->
     <string name="routing_failed_cross_mwm_building">Маршрут может быть проложен только внутри карты одного региона.</string>
     <!-- Context menu item for downloader. -->
@@ -345,18 +345,18 @@
     <string name="dialog_routing_location_turn_on">Включите режим определения геопозиции</string>
     <string name="dialog_routing_location_unknown_turn_on">Текущая геопозиция не определена. Для построения маршрута включите режим определения геопозиции.</string>
     <string name="dialog_routing_unable_locate_route">Маршрут не найден</string>
-    <string name="dialog_routing_cant_build_route">Не получилось построить маршрут.</string>
+    <string name="dialog_routing_cant_build_route">Не получилось построить путь</string>
     <string name="dialog_routing_change_start_or_end">Пожалуйста, измените начальную или конечную точку маршрута.</string>
     <string name="dialog_routing_change_start">Измените начальную точку маршрута</string>
     <string name="dialog_routing_start_not_determined">Маршрут не построен. Не определена начальная точка маршрута.</string>
     <string name="dialog_routing_select_closer_start">Пожалуйста, выберите начальную точку маршрута ближе к дороге.</string>
     <string name="dialog_routing_change_end">Измените конечную точку маршрута</string>
     <string name="dialog_routing_end_not_determined">Маршрут не построен. Не определена конечная точка маршрута.</string>
-    <string name="dialog_routing_select_closer_end">Пожалуйста, выберите конечную точку маршрута ближе к дороге.</string>
-    <string name="dialog_routing_change_intermediate">Не определена промежуточная точка маршрута.</string>
-    <string name="dialog_routing_intermediate_not_determined">Пожалуйста, измените промежуточную точку маршрута.</string>
+    <string name="dialog_routing_select_closer_end">Пожалуйста, выберите конечную точку пути ближе к дороге</string>
+    <string name="dialog_routing_change_intermediate">Не определена промежуточная точка пути</string>
+    <string name="dialog_routing_intermediate_not_determined">Пожалуйста, измените промежуточную точку пути</string>
     <string name="dialog_routing_system_error">Системная ошибка</string>
-    <string name="dialog_routing_application_error">Не удалось проложить маршрут из-за ошибки приложения.</string>
+    <string name="dialog_routing_application_error">Не удалось проложить путь из-за ошибки приложения</string>
     <string name="dialog_routing_try_again">Попробуйте снова</string>
     <string name="not_now">Не сейчас</string>
     <string name="dialog_routing_download_and_build_cross_route">Загрузить карту и построить более оптимальный маршрут с пересечением границы карты?</string>
@@ -456,7 +456,7 @@
     <string name="downloader_update_maps">Обновите карты</string>
     <string name="downloader_mwm_migration_dialog">Для построения маршрутов необходимо обновить все карты и построить маршрут заново.</string>
     <string name="downloader_search_field_hint">Найти карту</string>
-    <string name="common_check_internet_connection_dialog">Проверьте настройки и убедитесь, что устройство подключено к интернету.</string>
+    <string name="common_check_internet_connection_dialog">Проверьте настройки и убедитесь, что устройство подключено к интернету</string>
     <string name="downloader_no_space_title">Недостаточно места</string>
     <string name="downloader_no_space_message">Удалите ненужные данные</string>
     <string name="editor_login_error_dialog">Не удалось войти</string>
@@ -476,11 +476,11 @@
     <string name="osm_presentation">Созданные сообществом данные OpenStreetMap по состоянию на %s. Узнайте больше о том, как редактировать и обновлять карту на сайте OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
     <string name="login_osm_presentation">OpenStreetMap.org (OSM) - это открытый проект сообщества по созданию бесплатной карты. Он является основным источником картографических данных в CoMaps и работает как Википедия. Кто угодно может добавлять или редактировать места, которые позже увидят миллионы пользователей по всему миру. \nПрисоединяйтесь к сообществу и помогите сделать лучшую карту для всех!</string>
-    <string name="login_to_make_edits_visible">Создайте учетную запись OpenStreetMap или войдите в нее, чтобы опубликовать свои правки на карте для всего мира.</string>
+    <string name="login_to_make_edits_visible">Создайте учётную запись OpenStreetMap или войдите в неё, чтобы опубликовать свои правки на карте для всего мира</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d из %2$d</string>
     <string name="download_over_mobile_header">Загрузить через сотовую связь?</string>
-    <string name="download_over_mobile_message">На некоторых тарифных планах или в роуминге это может привести к значительным расходам.</string>
+    <string name="download_over_mobile_message">На некоторых тарифных планах или в роуминге это может привести к значительным расходам</string>
     <string name="error_enter_correct_house_number">Введите корректный номер дома</string>
     <!-- Error message in Editor when a user tries to set the number of floors for a building higher than %d floors -->
     <string name="error_enter_correct_storey_number">Количество этажей не должно превышать %d</string>
@@ -501,7 +501,7 @@
     <string name="editor_category_unsuitable_title">Нет подходящей категории?</string>
     <string name="editor_category_unsuitable_text">CoMaps позволяет добавлять на карту только простые типы объектов, то есть никаких городов, дорог, озер, контуров зданий. Пожалуйста, добавляйте такие категории на сайте <a href="https://www.openstreetmap.org">OpenStreetMap.org</a>. Также рекомендуем ознакомиться с нашими <a href="https://www.comaps.app/support/advanced-map-editing/">подробными пошаговыми инструкциями и другими приложениями для редактирования карты</a>.</string>
     <string name="downloader_no_downloaded_maps_title">У вас нет загруженных карт</string>
-    <string name="downloader_no_downloaded_maps_message">Загрузите необходимые карты, чтобы находить места и пользоваться навигацией без интернета.</string>
+    <string name="downloader_no_downloaded_maps_message">Скачайте необходимые карты, чтобы находить места и пользоваться ведением без интернета</string>
     <string name="current_location_unknown_error_title">Текущее местоположение неизвестно</string>
     <!-- abbreviation for kilometers per hour -->
     <string name="kilometers_per_hour">км/ч</string>
@@ -534,7 +534,7 @@
     <string name="editor_share_to_all_dialog_title">Отправить всем пользователям?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
     <string name="editor_share_to_all_dialog_message_1">Убедитесь, что вы не указали никаких личных данных</string>
-    <string name="editor_share_to_all_dialog_message_2">Редакторы OpenStreetMap проверят изменения и свяжутся с вами, если у них возникнут вопросы.</string>
+    <string name="editor_share_to_all_dialog_message_2">Редакторы OpenStreetMap проверят изменения и свяжутся с вами, если у них возникнут вопросы</string>
     <string name="navigation_stop_button">Cтоп</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Запись трека</string>
@@ -548,10 +548,10 @@
     <string name="mobile_data_option_not_today">Не использовать сегодня</string>
     <string name="mobile_data">Мобильный интернет</string>
     <!-- NOTE to translators: please synchronize your translation with the English one. -->
-    <string name="mobile_data_description">Мобильный интернет требуется для уведомлений об обновлении карты и для отображения более подробной информации о местах и метках.</string>
+    <string name="mobile_data_description">Мобильный интернет требуется для уведомлений об обновлении карты и для отображения более подробной информации о местах и метках</string>
     <string name="mobile_data_option_never">Никогда не использовать</string>
     <string name="mobile_data_option_ask">Всегда спрашивать</string>
-    <string name="traffic_update_maps_text">Для отображения пробок необходимо обновить карты.</string>
+    <string name="traffic_update_maps_text">Для отображения пробок необходимо обновить карты</string>
     <string name="big_font">Увеличить шрифт на карте</string>
     <string name="traffic_update_app">Обновите CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
@@ -637,7 +637,7 @@
     <!-- Speed camera settings menu option - Never warn (about speedcams) -->
     <string name="pref_tts_speedcams_never">Никогда не предупреждать</string>
     <string name="power_managment_title">Режим энергосбережения</string>
-    <string name="power_managment_description">Попробовать уменьшить потребление заряда аккумулятора за счёт отключения некоторых функций.</string>
+    <string name="power_managment_description">Попробовать уменьшить потребление заряда батареи за счёт отключения некоторых возможностей</string>
     <string name="power_managment_setting_never">Никогда</string>
     <string name="power_managment_setting_auto">Авто</string>
     <string name="power_managment_setting_manual_max">Максимальное энергосбережение</string>
diff --git a/android/sdk/src/main/res/values-cs/strings.xml b/android/sdk/src/main/res/values-cs/strings.xml
index 93f03ac2d..567a56bc2 100644
--- a/android/sdk/src/main/res/values-cs/strings.xml
+++ b/android/sdk/src/main/res/values-cs/strings.xml
@@ -32,4 +32,12 @@
     <string name="maps_storage_internal">Interní soukromé úložiště</string>
     <string name="maps_storage_external">Externí sdílené úložiště</string>
     <string name="today">Dnes</string>
+    <string name="yesterday">Včera</string>
+    <string name="days_ago">před %s dny</string>
+    <string name="week_ago">před %s týdnem</string>
+    <string name="weeks_ago">před %s týdny</string>
+    <string name="month_ago">před %s měsícem</string>
+    <string name="months_ago">před %s měsíci</string>
+    <string name="year_ago">před %s rokem</string>
+    <string name="years_ago">před %s lety</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-cs/types_strings.xml b/android/sdk/src/main/res/values-cs/types_strings.xml
index 28d299390..a7c5ca66d 100644
--- a/android/sdk/src/main/res/values-cs/types_strings.xml
+++ b/android/sdk/src/main/res/values-cs/types_strings.xml
@@ -1195,7 +1195,7 @@
     <string name="type.barrier">Bariéra</string>
     <string name="type.barrier.yes">Bariéra</string>
     <string name="type.barrier.cycle_barrier">Cyklistická bariéra</string>
-    <string name="type.cuisine.bubble_tea">Bubble Tea</string>
+    <string name="type.cuisine.bubble_tea">Bublinkový čaj</string>
     <string name="type.emergency">Nouzová stanice</string>
     <string name="type.highway">Dálnice</string>
     <string name="type.highway.bridleway">Hipostezka</string>
@@ -1369,7 +1369,7 @@
     <string name="type.sport.diving">Skoky do vody z velkých výšek</string>
     <string name="type.amenity.studio">Studio</string>
     <string name="type.barrier.guard_rail">Svodidla</string>
-    <string name="type.amenity.love_hotel">Love Hotel</string>
+    <string name="type.amenity.love_hotel">Hodinový hotel</string>
     <string name="type.highway.ladder">Žebřík</string>
     <string name="type.landuse.plant_nursery">Pěstitelská školka</string>
     <string name="type.leisure.firepit">Ohniště</string>
diff --git a/android/sdk/src/main/res/values-it/strings.xml b/android/sdk/src/main/res/values-it/strings.xml
index eaf7b5237..5c8539936 100644
--- a/android/sdk/src/main/res/values-it/strings.xml
+++ b/android/sdk/src/main/res/values-it/strings.xml
@@ -31,4 +31,12 @@
     <string name="mb">MB</string>
     <string name="gb">GB</string>
     <string name="today">Oggi</string>
+    <string name="yesterday">Ieri</string>
+    <string name="week_ago">%s settimana fa</string>
+    <string name="weeks_ago">%s settimane fa</string>
+    <string name="month_ago">%s mese fa</string>
+    <string name="months_ago">%s mesi fa</string>
+    <string name="year_ago">%s anno fa</string>
+    <string name="years_ago">%s anni fa</string>
+    <string name="days_ago">%s giorni fa</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-it/types_strings.xml b/android/sdk/src/main/res/values-it/types_strings.xml
index a4c894c0a..b7edc9bc2 100644
--- a/android/sdk/src/main/res/values-it/types_strings.xml
+++ b/android/sdk/src/main/res/values-it/types_strings.xml
@@ -1391,4 +1391,6 @@
     <string name="type.leisure.escape_game">Escape Room</string>
     <string name="type.amenity.ranger_station">Stazione delle guardie forestali</string>
     <string name="type.landuse.religious">Terreno Religioso</string>
+    <string name="type.amenity.animal_shelter">Rifugio per Animali</string>
+    <string name="type.barrier.wicket_gate">Cancello pedonale</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-pt-rBR/strings.xml b/android/sdk/src/main/res/values-pt-rBR/strings.xml
index f1ba6ec63..bdb7ecf11 100644
--- a/android/sdk/src/main/res/values-pt-rBR/strings.xml
+++ b/android/sdk/src/main/res/values-pt-rBR/strings.xml
@@ -36,4 +36,12 @@
     <string name="mb">MB</string>
     <string name="gb">GB</string>
     <string name="today">Hoje</string>
+    <string name="yesterday">Ontem</string>
+    <string name="days_ago">Há %s dias</string>
+    <string name="week_ago">Há %s semana</string>
+    <string name="weeks_ago">Há %s semanas</string>
+    <string name="month_ago">Há %s mês</string>
+    <string name="months_ago">Há %s meses</string>
+    <string name="year_ago">Há %s ano</string>
+    <string name="years_ago">Há %s anos</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-pt-rBR/types_strings.xml b/android/sdk/src/main/res/values-pt-rBR/types_strings.xml
index f2954647a..c15021c3e 100644
--- a/android/sdk/src/main/res/values-pt-rBR/types_strings.xml
+++ b/android/sdk/src/main/res/values-pt-rBR/types_strings.xml
@@ -1381,5 +1381,5 @@
     <string name="type.post_office.post_partner">Parceiro postal</string>
     <string name="type.amenity.ranger_station">Posto de guardas florestais</string>
     <string name="type.barrier.wicket_gate">Postigo</string>
-    <string name="type.amenity.animal_shelter">Abrigo para animais</string>
+    <string name="type.amenity.animal_shelter">Abrigo de animais</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-pt/strings.xml b/android/sdk/src/main/res/values-pt/strings.xml
index fb33442c5..ce4c0b7e7 100644
--- a/android/sdk/src/main/res/values-pt/strings.xml
+++ b/android/sdk/src/main/res/values-pt/strings.xml
@@ -32,4 +32,12 @@
     <string name="maps_storage_shared">Armazenamento interno partilhado</string>
     <string name="maps_storage_removable">Cartão SD</string>
     <string name="today">Hoje</string>
+    <string name="yesterday">Ontem</string>
+    <string name="days_ago">à %s dias</string>
+    <string name="week_ago">à %s semana</string>
+    <string name="weeks_ago">à %s semanas</string>
+    <string name="month_ago">à %s mês</string>
+    <string name="months_ago">à %s meses</string>
+    <string name="year_ago">à %s ano</string>
+    <string name="years_ago">à %s anos</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-ru/strings.xml b/android/sdk/src/main/res/values-ru/strings.xml
index b2d44b730..93b87ff3a 100644
--- a/android/sdk/src/main/res/values-ru/strings.xml
+++ b/android/sdk/src/main/res/values-ru/strings.xml
@@ -37,4 +37,12 @@
     <string name="not_shared">Личный</string>
     <string name="access_rules_author_only">Редактируется онлайн</string>
     <string name="today">Сегодня</string>
+    <string name="yesterday">Вчера</string>
+    <string name="days_ago">%s дней тому назад</string>
+    <string name="weeks_ago">%s недель тому назад</string>
+    <string name="week_ago">%s неделю тому назад</string>
+    <string name="month_ago">%s месяц тому назад</string>
+    <string name="months_ago">%s месяцев тому назад</string>
+    <string name="year_ago">%s год тому назад</string>
+    <string name="years_ago">%s лет тому назад</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-ru/types_strings.xml b/android/sdk/src/main/res/values-ru/types_strings.xml
index f5cfb0b72..c2024c6e3 100644
--- a/android/sdk/src/main/res/values-ru/types_strings.xml
+++ b/android/sdk/src/main/res/values-ru/types_strings.xml
@@ -1167,7 +1167,7 @@
     <string name="type.shop.laundry">Прачечная</string>
     <string name="type.shop.mall">Торговый центр</string>
     <string name="type.shop.massage">Массажный салон</string>
-    <string name="type.shop.mobile_phone">Мобильные телефоны</string>
+    <string name="type.shop.mobile_phone">Магазин мобильных телефонов</string>
     <string name="type.shop.money_lender">Ростовщик</string>
     <string name="type.shop.motorcycle">Магазин мотоциклов</string>
     <string name="type.shop.motorcycle_repair">Ремонт мотоциклов</string>
@@ -1390,4 +1390,8 @@
     <string name="type.landuse.religious">Церковный двор</string>
     <string name="type.railway.station.subway.qingdao">Станция метро</string>
     <string name="type.amenity.ranger_station">Пост лесников</string>
+    <string name="type.amenity.luggage_locker">Камера хранения</string>
+    <string name="type.amenity.bicycle_parking.covered">Крытая велосипедная парковка</string>
+    <string name="type.post_office.post_partner">Почтовое отделение</string>
+    <string name="type.leisure.escape_game">Квест-комната</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-sr/strings.xml b/android/sdk/src/main/res/values-sr/strings.xml
index 86eccf5ab..0866cd802 100644
--- a/android/sdk/src/main/res/values-sr/strings.xml
+++ b/android/sdk/src/main/res/values-sr/strings.xml
@@ -35,4 +35,12 @@
     <string name="mb">МБ</string>
     <string name="core_placepage_unknown_place">Тачка на мапи</string>
     <string name="today">Данас</string>
+    <string name="yesterday">Јуче</string>
+    <string name="days_ago">Пре %s дана</string>
+    <string name="week_ago">Пре %s недеља</string>
+    <string name="month_ago">Пре %s месец</string>
+    <string name="months_ago">Пре %s месеци</string>
+    <string name="weeks_ago">Пре %s недеља</string>
+    <string name="year_ago">Пре %s године</string>
+    <string name="years_ago">Пре %s година</string>
 </resources>
diff --git a/data/countries-strings/it.json/localize.json b/data/countries-strings/it.json/localize.json
index 26fb09372..ebdfb59e9 100644
--- a/data/countries-strings/it.json/localize.json
+++ b/data/countries-strings/it.json/localize.json
@@ -1840,14 +1840,14 @@
 "Italy_Lombardy_Bergamo Description":"Bergamo",
 "Italy_Lombardy_Brescia Description":"Brescia",
 "Italy_Lombardy_Como Description":"Como, Cantù",
-"Italy_Lombardy_Cremona Description":"Cremona",
+"Italy_Lombardy_Cremona Description":"Cremona, Trescore Cremasco",
 "Italy_Lombardy_Lecco Description":"Lecco",
 "Italy_Lombardy_Lodi Description":"Lodi",
-"Italy_Lombardy_Mantua Description":"Mantova",
+"Italy_Lombardy_Mantua Description":"Mantova, Suzzara",
 "Italy_Lombardy_Milan Description":"Milano",
 "Italy_Lombardy_Monza and Brianza Description":"Monza",
 "Italy_Lombardy_Pavia Description":"Pavia",
-"Italy_Lombardy_Sondrio Description":"Sondrio",
+"Italy_Lombardy_Sondrio Description":"Sondrio, Morbegno",
 "Italy_Lombardy_Varese Description":"Varese",
 "Italy_Marche Description":"Ancona",
 "Italy_Molise Description":"Campobasso",
diff --git a/data/countries-strings/ru.json/localize.json b/data/countries-strings/ru.json/localize.json
index e74b6c2b6..c723deb73 100644
--- a/data/countries-strings/ru.json/localize.json
+++ b/data/countries-strings/ru.json/localize.json
@@ -1072,7 +1072,7 @@
 "US_Louisiana_New Orleans":"Новый Орлеан",
 "US_Maine":"Мэн",
 "US_Maryland_Baltimore":"Балтимор",
-"US_Maryland_and_DC":"Запад, Вашингтон",
+"US_Maryland_and_DC":"Запад, штат Вашингтон",
 "US_Massachusetts_Boston":"Бостон",
 "US_Massachusetts_Central":"Вустер",
 "US_Massachusetts_Plymouth":"Плимут",
@@ -1350,7 +1350,7 @@
 "Andorra Description":"Андорра-ла-Велья, Ла-Массана, Ордино",
 "Angola Description":"Луанда, Лобиту, Намибе",
 "Anguilla Description":"Валли",
-"Antarctica Description":"Мак-Мёрдо",
+"Antarctica Description":"Станция Мак-Мёрдо, чилийская исследовательская станция «Вилла-Лас-Эстреллас», Роки-Коув",
 "Antigua and Barbuda Description":"Сент-Джонс",
 "Argentina_Buenos Aires_Buenos Aires Description":"Буэнос-Айрес",
 "Argentina_Buenos Aires_North Description":"Dolores, Pinamar, Villa Gesell",
@@ -2476,7 +2476,7 @@
 "Ukraine_Zaporizhia Oblast Description":"Запорожье, Мелитополь, Бердянск",
 "Ukraine_Zhytomyr Oblast Description":"Житомир, Бердичев, Коростень",
 "United Arab Emirates Description":"Абу-Даби, Дубай",
-"United States Virgin Islands Description":"Кристианстед",
+"United States Virgin Islands Description":"Фредерикстед, Кристианстед",
 "Uruguay Description":"Монтевидео, Салту",
 "Uzbekistan Description":"Ташкент, Коканд, Наманган",
 "Vanuatu Description":"Порт-Вила",
@@ -2484,7 +2484,7 @@
 "Venezuela_South Description":"Маракайбо, Сьюдад-Гуаяна, Сан-Кристобаль",
 "Vietnam Description":"Ханой, Хошимин, Вунгтау",
 "Wallis and Futuna Description":"Мата-Уту",
-"Yemen Description":"Сана, Сана, Аден",
+"Yemen Description":"Сана, Аден",
 "Zambia Description":"Лусака, Китве-Нкана, Ндола",
 "Zimbabwe Description":"Хараре, Хванге, Масвинго",
 "United States of America Short":"США",
diff --git a/data/countries-strings/sr.json/localize.json b/data/countries-strings/sr.json/localize.json
index f7ec1ae9b..dc87f61b9 100644
--- a/data/countries-strings/sr.json/localize.json
+++ b/data/countries-strings/sr.json/localize.json
@@ -32,7 +32,7 @@
 "Armenia":"Јерменија",
 "Australia":"Аустралија",
 "Australia_Melbourne":"Мелбурн",
-"Austria_Upper Austria":"Gornja Austrija",
+"Austria_Upper Austria":"Горња Аустрија",
 "Austria_Vorarlberg":"Ворарлберг",
 "Azerbaijan Region":"Азербејџан",
 "Bahrain":"Бахреин",
@@ -57,5 +57,51 @@
 "Russia_Perm Krai_North Short":"Пермскиј крај",
 "Spain_Castile and Leon":"Кастиља и Леон",
 "People's Republic of China":"Кина",
-"Taiwan":"Тајван"
+"Taiwan":"Тајван",
+"Australia_New South Wales":"Нови Јужни Велс",
+"Australia_Northern Territory":"Северна Територија",
+"Australia_Queensland":"Квинсленд",
+"Australia_South Australia":"Јужна Аустралија",
+"Australia_Tasmania":"Тасманија",
+"Australia_Victoria":"Викторија",
+"Austria":"Аустрија",
+"Austria_Burgenland":"Бургенланд",
+"Austria_Carinthia":"Корушка",
+"Austria_Lower Austria_West":"Доња Аустрија — Запад",
+"Austria_Salzburg":"Салцбург",
+"Austria_Styria":"Штајерска",
+"Austria_Tyrol":"Тирол",
+"Belgium_Antwerp":"Антверпен",
+"Belize":"Белизе",
+"Benin":"Бенин",
+"Bhutan":"Бутан",
+"Bermuda":"Бермуди",
+"Bolivia":"Боливија",
+"Bolivia_North":"Боливија – Сервер",
+"Bolivia_South":"Боливија – Југ",
+"Bosnia and Herzegovina":"Босна и Херцеговина",
+"Bosnia and Herzegovina_Brcko district of Bosnia and Herzegowina":"Брчко",
+"Bosnia and Herzegovina_Entity Federation of Bosnia and Herzegovina":"Федерација Босне и Херцеговине",
+"Bosnia and Herzegovina_Republic of Srpska":"Република Српска",
+"Botswana":"Боцвана",
+"Brazil":"Бразил",
+"Brazil_Bahia":"Баија",
+"Brunei":"Брунеј",
+"Bulgaria":"Бугарска",
+"Burkina Faso":"Буркина Фасо",
+"Burundi":"Бурунди",
+"California":"Калифорнија",
+"Cambodia":"Камбоџа",
+"Cameroon":"Камерун",
+"Cameroon_Central":"Камерун — Центар",
+"Cameroon_West":"Камерун — Запад",
+"Canada":"Канада",
+"Canada_Alberta":"Алберта",
+"Canada_Alberta_Edmonton":"Едмонтон",
+"Canada_Alberta_North":"Алберта — Сервер",
+"Canada_British Columbia":"Британска Колумбија",
+"Australia_Western Australia":"Западна Аустралија",
+"Austria_Lower Austria_Wien":"Беч и Доња Аустрија — Исток",
+"Belgium_East Flanders":"Источна Фландрија",
+"Canada_Alberta_South":"Алберта — Југ"
 }
diff --git a/data/sound-strings/fr.json/localize.json b/data/sound-strings/fr.json/localize.json
index a37dd919b..857a746f6 100644
--- a/data/sound-strings/fr.json/localize.json
+++ b/data/sound-strings/fr.json/localize.json
@@ -104,5 +104,5 @@
 "in_1_mile":"Dans un mile",
 "in_1_5_miles":"Dans un virgule cinq mile",
 "in_2_miles":"Dans deux miles",
-"unknown_camera":"Caméra devant"
+"unknown_camera":"Radar droit devant"
 }
diff --git a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
index de8236fbc..e82d99407 100644
--- a/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/bg.lproj/Localizable.strings
@@ -60,7 +60,7 @@
 "bookmark_set_name" = "Име на група";
 
 /* "Bookmark Lists" dialog title */
-"bookmark_sets" = "Bookmark Lists";
+"bookmark_sets" = "Списък с отметки";
 
 /* Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. */
 "bookmarks" = "Отметки";
@@ -148,7 +148,7 @@
 
 /* Search category for RV facilities; any changes should be duplicated in categories.txt @category_rv! */
 "category_rv" = "За RV";
-"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks; please open them in CoMaps. If you don't have it installed you can download it here: https://www.comaps.app/download/\n\nEnjoy travelling with CoMaps!";
+"share_bookmarks_email_body" = "Здравей!\n\nПрикачени са отметките ми; моля отвори ги в CoMaps. Ако го нямаш инсталирано, можеш да го изтеглиш тук: https://www.comaps.app/download/\n\nПриятно пътуване с CoMaps!";
 
 /* message title of loading file */
 "load_kmz_title" = "Зареждане на отметки";
@@ -199,7 +199,7 @@
 "share_my_location" = "Споделяне на местоположение";
 "prefs_group_route" = "Навигация";
 "pref_zoom_title" = "Мащабни бутони";
-"pref_left_button_type" = "Left Main Button";
+"pref_left_button_type" = "Ляв главен бутон";
 
 /* Settings «Map» category: «Appearance» title */
 "pref_appearance_title" = "Изглед";
@@ -211,7 +211,7 @@
 "pref_appearance_dark" = "Тъмен";
 
 /* Generic «Disabled» string */
-"disabled" = "Disabled";
+"disabled" = "Изключено";
 
 /* Generic «Off» string */
 "off" = "Изключен";
@@ -235,7 +235,7 @@
 "pref_tts_title" = "Гласови инструкции";
 
 /* Settings «Route» category: «Tts enable» title */
-"pref_tts_enable_title" = "Enable Voice Instructions";
+"pref_tts_enable_title" = "Включи гласовите инструкции";
 
 /* Settings «Route» category: «Tts announce street names» title */
 "pref_tts_street_names_title" = "Обявете имена на улици";
@@ -247,7 +247,7 @@
 "pref_tts_language_title" = "Език на инструкциите";
 
 /* Settings «Route» category: «Test Voice Directions» title */
-"pref_tts_test_voice_title" = "Тестване на гласови указания (TTS, Text-To-Speech)";
+"pref_tts_test_voice_title" = "Тестване на гласови указания";
 
 /* Title for "Other" section in TTS settings. */
 "pref_tts_other_section_title" = "Друго";
@@ -319,10 +319,10 @@
 "report_incorrect_map_bug" = "Докладване или поправяне на неправилни данни на картата";
 
 /* Button in the About screen */
-"volunteer" = "За доброволчество";
+"volunteer" = "Доброволчество и подобряване на CoMaps";
 
 /* "Social media" section header in the About screen */
-"follow_us" = "Следвайте и се свържете с нас";
+"follow_us" = "Свържете се с нас";
 
 /* Alert text */
 "email_error_body" = "Имейл клиентът не е настроен. Моля, конфигурирайте го или използвайте друг начин, за да се свържете с нас на %@";
@@ -343,7 +343,7 @@
 "downloader_downloaded_subtitle" = "Изтеглено";
 
 /* Downloaded maps category */
-"downloader_available_maps" = "Available";
+"downloader_available_maps" = "Налично";
 
 /* Country queued for download */
 "downloader_queued" = "На опашка";
@@ -353,7 +353,7 @@
 "downloader_status_maps" = "Карти";
 "downloader_download_all_button" = "Изтегляне на всичко";
 "downloader_downloading" = "Теглене:";
-"downloader_search_results" = "Found";
+"downloader_search_results" = "Намерено";
 
 /* Status of outdated country in the list */
 "downloader_status_outdated" = "Обновление";
@@ -476,7 +476,7 @@
 "routing_arrive" = "Пристигане в %@";
 
 /* Text for routing::RouterResultCode::FileTooOld dialog. */
-"dialog_routing_download_and_update_maps" = "Download and update all map along the projected path to calculate route.";
+"dialog_routing_download_and_update_maps" = "Изтегли и обнови всичи карти заедно с планирания път за изчисляване на маршрута.";
 "categories" = "Категории";
 "history" = "История";
 "search_not_found" = "За съжаление не са намерени резултати.";
@@ -526,9 +526,9 @@
 "day_off_today" = "Затворено днес";
 "day_off" = "Затворено";
 "today" = "Днес";
-"opens_tomorrow_at" = "Opens tomorrow at %@";
-"opens_dayoftheweek_at" = "Opens %1$@ at %2$@";
-"opens_at" = "Opens at %@";
+"opens_tomorrow_at" = "Отваря утре в %@";
+"opens_dayoftheweek_at" = "Отваря %1$@ в %2$@";
+"opens_at" = "Отваря в %@";
 "opens_in" = "Opens in %@";
 "closes_at" = "Closes at %@";
 "closes_in" = "Closes in %@";
@@ -1085,11 +1085,11 @@
 "edit_track" = "Редактиране на маршрут";
 "osm_profile_view_notes" = "Преглед на бележки";
 "osm_profile_view_edit_history" = "Преглед на историята на промените";
-"about_headline" = "Open project powered by the community";
-"about_proposition_3" = "Transparent and not for profit";
-"pref_mapappearance_title" = "Map Appearance";
-"pref_maplanguage_title" = "Map Language";
-"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
-"pref_maplanguage_local" = "Local Language";
-"existence_confirmed_time_ago" = "Existence confirmed %@";
-"hours_confirmed_time_ago" = "Confirmed %@";
+"about_headline" = "Отворен проект, захранван от общността";
+"about_proposition_3" = "Прозрачен и не за печалба";
+"pref_mapappearance_title" = "Външен вид на картата";
+"pref_maplanguage_title" = "Език на Картата";
+"transliteration_title_disabled_summary" = "Изключено при постоянно използване на локален език за картата";
+"pref_maplanguage_local" = "Локален Език";
+"existence_confirmed_time_ago" = "Наличие потвърдено%@";
+"hours_confirmed_time_ago" = "Потвърдено %@";
diff --git a/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings
index dba8d7f20..ab6e7c846 100644
--- a/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/cs.lproj/LocalizableTypes.strings
@@ -281,7 +281,7 @@
 "type.cuisine.beef_bowl" = "Miska hovězího";
 "type.cuisine.brazilian" = "Brazilská kuchyně";
 "type.cuisine.breakfast" = "Snídaně";
-"type.cuisine.bubble_tea" = "Bubble Tea";
+"type.cuisine.bubble_tea" = "Bublinkový čaj";
 "type.cuisine.burger" = "Burger";
 "type.cuisine.buschenschank" = "Buschenschank";
 "type.cuisine.cake" = "Dort";
@@ -1462,7 +1462,7 @@
 /* https://wiki.openstreetmap.org/wiki/Tag:leisure=sports_hall */
 "type.leisure.sports_hall" = "Sportovní hala";
 "type.amenity.studio" = "Studio";
-"type.amenity.love_hotel" = "Love Hotel";
+"type.amenity.love_hotel" = "Hodinový hotel";
 "type.highway.ladder" = "Žebřík";
 "type.barrier.guard_rail" = "Svodidla";
 "type.landuse.plant_nursery" = "Pěstitelská školka";
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index d7d1d099e..3afde3716 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -346,7 +346,7 @@
 "downloader_available_maps" = "Elérhető";
 
 /* Country queued for download */
-"downloader_queued" = "Sorbaállítva";
+"downloader_queued" = "Várólistához adva";
 "downloader_near_me_subtitle" = "A közelben";
 
 /* In maps downloader and country place page shows how many maps are downloaded / to download, e.g. "Maps: 3 of 10" */
@@ -634,10 +634,10 @@
 "editor_category_unsuitable_title" = "Nem találja a megfelelő kategóriát?";
 "editor_category_unsuitable_text" = "Az CoMaps csak egyszerű pontkategóriák hozzáadását teszi lehetővé, azaz nem tartalmaz városokat, utakat, tavakat, épületek körvonalait stb., az ilyen kategóriákat közvetlenül az <a href=\"https://www.openstreetmap.org\">OpenStreetMap.org</a> oldalon adhatja hozzá. A részletes, lépésről lépésre történő útmutatásért tekintse meg az <a href=\"https://www.comaps.app/support/advanced-map-editing/\">útmutatónkat</a>.";
 "downloader_no_downloaded_maps_title" = "Még nem töltött le térképet";
-"downloader_no_downloaded_maps_message" = "Térkép letöltése offline kereséshez és navigáláshoz.";
+"downloader_no_downloaded_maps_message" = "Térképek letöltése internetkapcsolat nélküli kereséshez és navigáláshoz.";
 "current_location_unknown_error_title" = "A jelenlegi helyzet ismeretlen.";
-"current_location_unknown_error_message" = "Hiba történt tartózkodási helye keresésekor. Ellenőrizze készüléke működését és próbálkozzon újra.";
-"location_services_disabled_header" = "Helymeghatározás kikapcsolva";
+"current_location_unknown_error_message" = "Hiba történt tartózkodási helye keresésekor. Ellenőrizze készüléke megfelelő működését és próbálkozzon újra.";
+"location_services_disabled_header" = "A helymeghatározási szolgáltatások le vannak tiltva";
 "location_services_disabled_message" = "Engedélyezze a hozzáférést a földrajzi helymeghatározáshoz a készülék beállításaiban";
 "location_services_disabled_1" = "1. Nyissa meg a „Beállítások” menüt";
 "location_services_disabled_2" = "2. Érintse meg a „Helymeghatározás” gombot";
@@ -694,8 +694,8 @@
 "editor_share_to_all_dialog_title" = "Szeretné elküldeni az összes felhasználónak?";
 
 /* Dialog before publishing the modifications to the public map. */
-"editor_share_to_all_dialog_message_1" = "Győződjön meg arról, hogy nem ad meg semmilyen személyes információt.";
-"editor_share_to_all_dialog_message_2" = "Az OpenStreetMap szerkesztői ellenőrzik a változásokat, és felveszik Önnel a kapcsolatot, ha kérdéseik vannak.";
+"editor_share_to_all_dialog_message_1" = "Győződjön meg arról, hogy nem ad meg semmilyen magánjellegű vagy személyes adatokat.";
+"editor_share_to_all_dialog_message_2" = "Az OpenStreetMap szerkesztői ellenőrzik a változásokat, és felveszik Önnel a kapcsolatot, ha bármilyen kérdésük van.";
 "navigation_stop_button" = "Megállítás";
 
 /* iOS dialog for the case when recent track recording is on and the app comes back from background */
@@ -719,10 +719,10 @@
 "mobile_data" = "Mobilinternet";
 
 /* NOTE to translators: please synchronize your translation with the English one. */
-"mobile_data_description" = "Mobilinternet szükséges a térképfrissítési értesítésekhez, valamint a helyszínekre és könyvjelzőkre vonatkozó részletes információk megjelenítéséhez.";
+"mobile_data_description" = "A térképfrissítési értesítésekhez és a szerkesztések feltöltéséhez mobilinternetre van szükség.";
 "mobile_data_option_never" = "Soha ne használja";
 "mobile_data_option_ask" = "Mindig kérdezzen rá";
-"traffic_update_maps_text" = "Forgalmi adatok megjelenítéséhez frissíteni kell a térképeket.";
+"traffic_update_maps_text" = "A forgalmi adatok megjelenítéséhez frissíteni kell a térképeket.";
 "big_font" = "Betűméret növelése a térképen";
 
 /* "traffic" as in road congestion */
@@ -803,7 +803,7 @@
 /* Speed camera settings menu option - Never warn (about speedcams) */
 "pref_tts_speedcams_never" = "Soha ne figyelmeztessen";
 "power_managment_title" = "Energiatakarékos mód";
-"power_managment_description" = "Próbálja meg csökkenteni az energiafelhasználást bizonyos funkciók rovására.";
+"power_managment_description" = "Megpróbálja csökkenteni az energiafelhasználást bizonyos funkciók rovására.";
 "power_managment_setting_never" = "Soha";
 "power_managment_setting_auto" = "Amikor az akkumulátor lemerül";
 "power_managment_setting_manual_max" = "Mindig";
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index 5cbd927cd..5e3f2689f 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -325,7 +325,7 @@
 "report_incorrect_map_bug" = "Segnala o correggi i dati della mappa non corretti";
 
 /* Button in the About screen */
-"volunteer" = "Per fare il volontario";
+"volunteer" = "Volontariato e migliorare CoMaps";
 
 /* "Social media" section header in the About screen */
 "follow_us" = "Contattaci";
@@ -1095,5 +1095,5 @@
 "pref_maplanguage_title" = "Lingua della mappa";
 "transliteration_title_disabled_summary" = "Disabilitato quando si usa la lingua locale sulla mappa";
 "pref_maplanguage_local" = "Lingua Locale";
-"existence_confirmed_time_ago" = "Existence confirmed %@";
-"hours_confirmed_time_ago" = "Confirmed %@";
+"existence_confirmed_time_ago" = "Esistenza confermata %@";
+"hours_confirmed_time_ago" = "Confermato %@";
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.stringsdict
index d374bc7a6..7d4c3544d 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.stringsdict
@@ -32,6 +32,8 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>zero</key>
+			<string>Nessun file trovato</string>
 			<key>one</key>
 			<string>%d file è stato trovato. Lo vedrai dopo la conversione.</string>
 			<key>many</key>
@@ -51,7 +53,7 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>zero</key>
-			<string>%d tracce</string>
+			<string>Nessuna traccia</string>
 			<key>one</key>
 			<string>%d traccia</string>
 			<key>many</key>
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings
index 60af4f2f8..635baa7f6 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings
@@ -1482,5 +1482,5 @@
 "type.amenity.bicycle_parking.covered" = "Parcheggio Biciclette Coperto";
 "type.post_office.post_partner" = "Partner Postale";
 "type.landuse.religious" = "Terreno Religioso";
-"type.barrier.wicket_gate" = "Wicket gate";
-"type.amenity.animal_shelter" = "Animal Shelter";
+"type.barrier.wicket_gate" = "Cancello pedonale";
+"type.amenity.animal_shelter" = "Rifugio per Animali";
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index 6f3c12a10..b96508e63 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -637,9 +637,9 @@
 
 /* To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... */
 "operator" = "Operador: %@";
-"editor_category_unsuitable_title" = "Você não encontra uma categoria adequada?";
+"editor_category_unsuitable_title" = "Não encontra uma categoria adequada?";
 "editor_category_unsuitable_text" = "O CoMaps permite que você adicione apenas categorias de pontos simples, o que significa que não há cidades, estradas, lagos, contornos de edifícios etc. Por favor, adicione essas categorias diretamente no <a href=\"https://www.openstreetmap.org\">OpenStreetMap.org</a>. Consulte nosso <a href=\"https://www.comaps.app/support/advanced-map-editing/\">guia</a> para obter instruções detalhadas passo a passo.";
-"downloader_no_downloaded_maps_title" = "Você não fez o download de nenhum mapa";
+"downloader_no_downloaded_maps_title" = "Você não baixou nenhum mapa";
 "downloader_no_downloaded_maps_message" = "Baixe mapas para pesquisar locais e usar navegação offline.";
 "current_location_unknown_error_title" = "A localização atual é desconhecida.";
 "current_location_unknown_error_message" = "Ocorreu um erro na busca por sua localização. Verifique se o seu dispositivo está funcionando corretamente e tente novamente mais tarde.";
@@ -820,7 +820,7 @@
 "avoid_tolls" = "Evitar pedágios";
 
 /* Recommended length for CarPlay and Android Auto is around 25-27 characters */
-"avoid_unpaved" = "Evitar não-pavimentadas";
+"avoid_unpaved" = "Evitar não pavimentadas";
 
 /* Recommended length for CarPlay and Android Auto is around 25-27 characters */
 "avoid_ferry" = "Evitar balsas";
@@ -830,7 +830,7 @@
 "define_to_avoid_btn" = "Definir as estradas a serem evitadas";
 "change_driving_options_btn" = "Opções de direção ativadas";
 "toll_road" = "Pedágio";
-"unpaved_road" = "Pista não pavimentada";
+"unpaved_road" = "Via não pavimentada";
 "ferry_crossing" = "Balsa";
 "trip_start" = "Vamos";
 "pick_destination" = "Destino";
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings
index 59e2c315b..e73b256a2 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/LocalizableTypes.strings
@@ -1483,4 +1483,4 @@
 "type.post_office.post_partner" = "Parceiro postal";
 "type.amenity.ranger_station" = "Posto de guardas florestais";
 "type.barrier.wicket_gate" = "Postigo";
-"type.amenity.animal_shelter" = "Abrigo para animais";
+"type.amenity.animal_shelter" = "Abrigo de animais";
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
index 84a8eb170..89bc59504 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.strings
@@ -325,7 +325,7 @@
 "report_incorrect_map_bug" = "Сообщить или исправить неправильные данные на карте";
 
 /* Button in the About screen */
-"volunteer" = "Cтать волонтёром";
+"volunteer" = "Станьте добровольцем и улучшьте CoMaps";
 
 /* "Social media" section header in the About screen */
 "follow_us" = "Свяжитесь с нами";
@@ -1092,8 +1092,8 @@
 "osm_profile_view_edit_history" = "История правок";
 "osm_profile_view_notes" = "Заметки";
 "pref_mapappearance_title" = "Оформление карты";
-"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"transliteration_title_disabled_summary" = "Отключено при постоянном использовании местного языка для карты";
 "pref_maplanguage_title" = "Язык карты";
 "pref_maplanguage_local" = "Местный язык";
-"existence_confirmed_time_ago" = "Existence confirmed %@";
-"hours_confirmed_time_ago" = "Confirmed %@";
+"existence_confirmed_time_ago" = "Существование подтверждено %@";
+"hours_confirmed_time_ago" = "Подтверждено %@";
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.stringsdict
index 11fdb97fd..671f93493 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/Localizable.stringsdict
@@ -13,13 +13,13 @@
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
 			<key>zero</key>
-			<string>%d меток</string>
+			<string>%d закладок</string>
 			<key>one</key>
-			<string>%d метка</string>
+			<string>%d закладка</string>
 			<key>few</key>
-			<string>%d метки</string>
+			<string>%d закладки</string>
 			<key>many</key>
-			<string>%d меток</string>
+			<string>%d закладок</string>
 		</dict>
 	</dict>
 	<key>bookmarks_detect_message</key>
diff --git a/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings
index 18ddbfa26..4fde9b71d 100644
--- a/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/ru.lproj/LocalizableTypes.strings
@@ -1252,7 +1252,7 @@
 "type.shop.laundry" = "Прачечная";
 "type.shop.mall" = "Торговый центр";
 "type.shop.massage" = "Массажный салон";
-"type.shop.mobile_phone" = "Мобильные телефоны";
+"type.shop.mobile_phone" = "Магазин мобильных телефонов";
 "type.shop.money_lender" = "Ростовщик";
 "type.shop.motorcycle" = "Магазин мотоциклов";
 "type.shop.motorcycle_repair" = "Ремонт мотоциклов";
@@ -1479,8 +1479,8 @@
 "type.leisure.firepit" = "Кострище";
 "type.man_made.crane" = "Кран";
 "type.railway.station.subway.qingdao" = "Станция метро";
-"type.leisure.escape_game" = "Escape Room";
-"type.amenity.luggage_locker" = "Luggage Locker";
-"type.amenity.bicycle_parking.covered" = "Covered Bicycle Parking";
-"type.post_office.post_partner" = "Post Partner";
+"type.leisure.escape_game" = "Квест-комната";
+"type.amenity.luggage_locker" = "Камера хранения";
+"type.amenity.bicycle_parking.covered" = "Крытая велосипедная парковка";
+"type.post_office.post_partner" = "Почтовое отделение";
 "type.amenity.ranger_station" = "Пост лесников";

From 3fd5336bd3ba6d5ea76abee231e0a42efa1e14a7 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Tue, 26 Aug 2025 23:45:37 +0700
Subject: [PATCH 280/302] [core] Prefer gps bearing for location arrow

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 libs/drape_frontend/my_position_controller.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libs/drape_frontend/my_position_controller.cpp b/libs/drape_frontend/my_position_controller.cpp
index 10c8876eb..72a4683c2 100644
--- a/libs/drape_frontend/my_position_controller.cpp
+++ b/libs/drape_frontend/my_position_controller.cpp
@@ -24,7 +24,8 @@ namespace df
 namespace
 {
 int const kPositionRoutingOffsetY = 104;
-double const kMinSpeedThresholdMps = 2.8;  // 10 km/h
+// Speed threshold to switch to GPS bearing. Use compass for slow walking only.
+double const kMinSpeedThresholdMps = 0.7;  // 2.5 km/h
 double const kGpsBearingLifetimeSec = 5.0;
 double const kMaxTimeInBackgroundSec = 60.0 * 60 * 30;  // 30 hours before starting detecting position again
 double const kMaxNotFollowRoutingTimeSec = 20.0;

From 08f8fbb856ed7e72c0d75ee0edba2a7562583a9d Mon Sep 17 00:00:00 2001
From: Yannik Bloscheck <git@yannikbloscheck.com>
Date: Tue, 29 Jul 2025 15:19:01 +0200
Subject: [PATCH 281/302] [ios] Renamed Chinese translation folder correctly

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
---
 iphone/metadata/{zh-CN => zh-Hans}/description.txt   | 0
 iphone/metadata/{zh-CN => zh-Hans}/keywords.txt      | 0
 iphone/metadata/{zh-CN => zh-Hans}/marketing_url.txt | 0
 iphone/metadata/{zh-CN => zh-Hans}/privacy_url.txt   | 0
 iphone/metadata/{zh-CN => zh-Hans}/subtitle.txt      | 0
 iphone/metadata/{zh-CN => zh-Hans}/support_url.txt   | 0
 6 files changed, 0 insertions(+), 0 deletions(-)
 rename iphone/metadata/{zh-CN => zh-Hans}/description.txt (100%)
 rename iphone/metadata/{zh-CN => zh-Hans}/keywords.txt (100%)
 rename iphone/metadata/{zh-CN => zh-Hans}/marketing_url.txt (100%)
 rename iphone/metadata/{zh-CN => zh-Hans}/privacy_url.txt (100%)
 rename iphone/metadata/{zh-CN => zh-Hans}/subtitle.txt (100%)
 rename iphone/metadata/{zh-CN => zh-Hans}/support_url.txt (100%)

diff --git a/iphone/metadata/zh-CN/description.txt b/iphone/metadata/zh-Hans/description.txt
similarity index 100%
rename from iphone/metadata/zh-CN/description.txt
rename to iphone/metadata/zh-Hans/description.txt
diff --git a/iphone/metadata/zh-CN/keywords.txt b/iphone/metadata/zh-Hans/keywords.txt
similarity index 100%
rename from iphone/metadata/zh-CN/keywords.txt
rename to iphone/metadata/zh-Hans/keywords.txt
diff --git a/iphone/metadata/zh-CN/marketing_url.txt b/iphone/metadata/zh-Hans/marketing_url.txt
similarity index 100%
rename from iphone/metadata/zh-CN/marketing_url.txt
rename to iphone/metadata/zh-Hans/marketing_url.txt
diff --git a/iphone/metadata/zh-CN/privacy_url.txt b/iphone/metadata/zh-Hans/privacy_url.txt
similarity index 100%
rename from iphone/metadata/zh-CN/privacy_url.txt
rename to iphone/metadata/zh-Hans/privacy_url.txt
diff --git a/iphone/metadata/zh-CN/subtitle.txt b/iphone/metadata/zh-Hans/subtitle.txt
similarity index 100%
rename from iphone/metadata/zh-CN/subtitle.txt
rename to iphone/metadata/zh-Hans/subtitle.txt
diff --git a/iphone/metadata/zh-CN/support_url.txt b/iphone/metadata/zh-Hans/support_url.txt
similarity index 100%
rename from iphone/metadata/zh-CN/support_url.txt
rename to iphone/metadata/zh-Hans/support_url.txt

From 77e81ff4314e1913f0e0eb1e1c3d7f3b0c880ac7 Mon Sep 17 00:00:00 2001
From: Yannik Bloscheck <git@yannikbloscheck.com>
Date: Sat, 23 Aug 2025 18:08:28 +0200
Subject: [PATCH 282/302] [ios] Adjusted script for checking App Store metadata

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
---
 tools/python/check_store_metadata.py | 76 +++++++++++-----------------
 1 file changed, 30 insertions(+), 46 deletions(-)

diff --git a/tools/python/check_store_metadata.py b/tools/python/check_store_metadata.py
index 13157a9ac..0fe0531bf 100755
--- a/tools/python/check_store_metadata.py
+++ b/tools/python/check_store_metadata.py
@@ -104,11 +104,7 @@ GPLAY_LOCALES = [
 
 # From a Fastline error message and https://help.apple.com/app-store-connect/#/dev997f9cf7c
 APPSTORE_LOCALES = [
-    "ar-SA", "ca", "cs", "da", "de-DE", "el", "en-AU", "en-CA",
-    "en-GB", "en-US", "es-ES", "es-MX", "fi", "fr-CA", "fr-FR",
-    "he", "hi", "hr", "hu", "id", "it", "ja", "ko", "ms", "nl-NL",
-    "no", "pl", "pt-BR", "pt-PT", "ro", "ru", "sk", "sv", "th", "tr",
-    "uk", "vi", "zh-Hans", "zh-Hant"
+    "ar-SA", "ca", "cs", "da", "de-DE", "el", "en-AU", "en-CA", "en-GB", "en-US", "es-ES", "es-MX", "fi", "fr-CA", "fr-FR", "he", "hi", "hr", "hu", "id", "it", "ja", "ko", "ms", "nl-NL", "no", "pl", "pt-BR", "pt-PT", "ro", "ru", "sk", "sv", "th", "tr", "uk", "vi", "zh-Hans", "zh-Hant"
 ]
 
 def error(path, message, *args, **kwargs):
@@ -121,32 +117,34 @@ def done(path, ok):
         print("✅", path)
     return ok
 
-def check_raw(path, max_length):
+def check_raw(path, max_length, ignoreEmptyFilesAndNewLines=False):
     ok = True
     with open(path, 'r') as f:
         text = f.read()
-        if not text:
-            ok = error(path, "empty")
-        elif text[-1] == os.linesep:
-            text = text[:-1]
-        else:
-            ok = error(path, "missing new line")
+        if not ignoreEmptyFilesAndNewLines:
+            if not text:
+                ok = error(path, "empty")
+            elif text[-1] == os.linesep:
+                text = text[:-1]
+            else:
+                ok = error(path, "missing new line")
+        
         cur_length = len(text)
         if cur_length > max_length:
             ok = error(path, "too long: got={}, expected={}", cur_length, max_length)
         return ok, text
 
-def check_text(path, max, optional=False):
+def check_text(path, max, optional=False, ignoreEmptyFilesAndNewLines=False):
     try:
-        return done(path, check_raw(path, max)[0])
+        return done(path, check_raw(path, max, ignoreEmptyFilesAndNewLines)[0])
     except FileNotFoundError as e:
         if optional:
             return True,
         print("🚫", path)
         return False,
 
-def check_url(path,):
-    (ok, url) = check_raw(path, 500)
+def check_url(path, ignoreEmptyFilesAndNewLines=False):
+    (ok, url) = check_raw(path, 500, ignoreEmptyFilesAndNewLines)
     url = urlparse(url)
     if not url.scheme in ('https', 'http'):
         ok = error(path, "invalid URL: {}", url)
@@ -191,40 +189,26 @@ def check_android():
 
 def check_ios():
     ok = True
-    for locale in APPSTORE_LOCALES:
-        locale_dir = os.path.join('iphone', 'metadata', locale)
-        english_dir = os.path.join('iphone', 'metadata', 'en-US')
-        overlay_dir = os.path.join('keywords', 'ios', locale)
-        if not os.path.isdir(locale_dir):
-            os.mkdir(locale_dir)
-        for name in ["name.txt", "subtitle.txt", "promotional_text.txt",
-                        "description.txt", "release_notes.txt", "keywords.txt",
-                        "support_url.txt", "marketing_url.txt", "privacy_url.txt"]:
-            overlay_path = os.path.join(overlay_dir, name)
-            english_path = os.path.join(english_dir, name)
-            target_path = os.path.join(locale_dir, name)
-            if os.path.exists(overlay_path):
-                shutil.copy(overlay_path, target_path)
-            elif os.path.exists(english_path) and not os.path.exists(target_path):
-                shutil.copy(english_path, target_path)
-
     for locale in glob.glob('iphone/metadata/*/'):
         if locale.split('/')[-2] not in APPSTORE_LOCALES:
             ok = error(locale, "unsupported locale") and ok
             continue
-        ok = check_text(locale + "name.txt", 30) and ok
-        ok = check_text(locale + "subtitle.txt", 30) and ok
-        ok = check_text(locale + "promotional_text.txt", 170) and ok
-        ok = check_text(locale + "description.txt", 4000) and ok
-        ok = check_text(locale + "release_notes.txt", 4000) and ok
-        ok = check_text(locale + "keywords.txt", 100, True) and ok
-        ok = check_url(locale + "support_url.txt") and ok
-        ok = check_url(locale + "marketing_url.txt") and ok
-        ok = check_url(locale + "privacy_url.txt") and ok
-    for locale in glob.glob('keywords/ios/*/'):
-        if locale.split('/')[-2] not in APPSTORE_LOCALES:
-            ok = error(locale, "unsupported locale") and ok
-            continue
+        
+        locale_complete = True
+        for name in ["description.txt", "keywords.txt", "marketing_url.txt", "privacy_url.txt", "subtitle.txt", "support_url.txt"]:
+            name_path = os.path.join(locale, name)
+            if not os.path.exists(name_path):
+                locale_complete = False
+        
+        if locale_complete:
+            ok = check_text(locale + "subtitle.txt", 30, False, True) and ok
+            ok = check_text(locale + "description.txt", 4000, False, True) and ok
+            ok = check_text(locale + "release_notes.txt", 4000, True, True) and ok
+            ok = check_text(locale + "keywords.txt", 100, False, True) and ok
+            ok = check_url(locale + "support_url.txt", True) and ok
+            ok = check_url(locale + "marketing_url.txt", True) and ok
+            ok = check_url(locale + "privacy_url.txt", True) and ok
+        
     return ok
 
 if __name__ == "__main__":

From 3708ee74d302687e2329561b0143f4c86d34d7dc Mon Sep 17 00:00:00 2001
From: Yannik Bloscheck <git@yannikbloscheck.com>
Date: Sat, 23 Aug 2025 18:08:33 +0200
Subject: [PATCH 283/302] [ios] Removed unnecessary whitespace in App Store
 metadata

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
---
 iphone/metadata/cs/description.txt        | 2 +-
 iphone/metadata/cs/keywords.txt           | 2 +-
 iphone/metadata/cs/marketing_url.txt      | 2 +-
 iphone/metadata/cs/privacy_url.txt        | 2 +-
 iphone/metadata/cs/subtitle.txt           | 2 +-
 iphone/metadata/cs/support_url.txt        | 2 +-
 iphone/metadata/de-DE/description.txt     | 2 +-
 iphone/metadata/de-DE/keywords.txt        | 2 +-
 iphone/metadata/de-DE/marketing_url.txt   | 2 +-
 iphone/metadata/de-DE/privacy_url.txt     | 2 +-
 iphone/metadata/de-DE/subtitle.txt        | 2 +-
 iphone/metadata/de-DE/support_url.txt     | 2 +-
 iphone/metadata/en-US/description.txt     | 2 +-
 iphone/metadata/en-US/marketing_url.txt   | 2 +-
 iphone/metadata/en-US/privacy_url.txt     | 2 +-
 iphone/metadata/en-US/support_url.txt     | 2 +-
 iphone/metadata/es-ES/description.txt     | 2 +-
 iphone/metadata/es-ES/keywords.txt        | 2 +-
 iphone/metadata/es-ES/marketing_url.txt   | 2 +-
 iphone/metadata/es-ES/privacy_url.txt     | 2 +-
 iphone/metadata/es-ES/subtitle.txt        | 2 +-
 iphone/metadata/es-ES/support_url.txt     | 2 +-
 iphone/metadata/fi/description.txt        | 2 +-
 iphone/metadata/fi/keywords.txt           | 2 +-
 iphone/metadata/fi/marketing_url.txt      | 2 +-
 iphone/metadata/fi/privacy_url.txt        | 2 +-
 iphone/metadata/fi/subtitle.txt           | 2 +-
 iphone/metadata/fi/support_url.txt        | 2 +-
 iphone/metadata/fr-FR/description.txt     | 2 +-
 iphone/metadata/fr-FR/keywords.txt        | 2 +-
 iphone/metadata/fr-FR/marketing_url.txt   | 2 +-
 iphone/metadata/fr-FR/privacy_url.txt     | 2 +-
 iphone/metadata/fr-FR/subtitle.txt        | 2 +-
 iphone/metadata/fr-FR/support_url.txt     | 2 +-
 iphone/metadata/it/description.txt        | 2 +-
 iphone/metadata/it/keywords.txt           | 2 +-
 iphone/metadata/it/marketing_url.txt      | 2 +-
 iphone/metadata/it/privacy_url.txt        | 2 +-
 iphone/metadata/it/subtitle.txt           | 2 +-
 iphone/metadata/it/support_url.txt        | 2 +-
 iphone/metadata/nl-NL/description.txt     | 2 +-
 iphone/metadata/nl-NL/keywords.txt        | 2 +-
 iphone/metadata/nl-NL/marketing_url.txt   | 2 +-
 iphone/metadata/nl-NL/privacy_url.txt     | 2 +-
 iphone/metadata/nl-NL/subtitle.txt        | 2 +-
 iphone/metadata/nl-NL/support_url.txt     | 2 +-
 iphone/metadata/pt-BR/description.txt     | 2 +-
 iphone/metadata/pt-BR/keywords.txt        | 2 +-
 iphone/metadata/pt-BR/marketing_url.txt   | 2 +-
 iphone/metadata/pt-BR/privacy_url.txt     | 2 +-
 iphone/metadata/pt-BR/subtitle.txt        | 2 +-
 iphone/metadata/pt-BR/support_url.txt     | 2 +-
 iphone/metadata/ru/description.txt        | 2 +-
 iphone/metadata/ru/keywords.txt           | 2 +-
 iphone/metadata/ru/marketing_url.txt      | 2 +-
 iphone/metadata/ru/privacy_url.txt        | 2 +-
 iphone/metadata/ru/subtitle.txt           | 2 +-
 iphone/metadata/ru/support_url.txt        | 2 +-
 iphone/metadata/tr/description.txt        | 2 +-
 iphone/metadata/tr/keywords.txt           | 2 +-
 iphone/metadata/tr/marketing_url.txt      | 2 +-
 iphone/metadata/tr/privacy_url.txt        | 2 +-
 iphone/metadata/tr/subtitle.txt           | 2 +-
 iphone/metadata/tr/support_url.txt        | 2 +-
 iphone/metadata/zh-Hans/description.txt   | 2 +-
 iphone/metadata/zh-Hans/keywords.txt      | 2 +-
 iphone/metadata/zh-Hans/marketing_url.txt | 2 +-
 iphone/metadata/zh-Hans/privacy_url.txt   | 2 +-
 iphone/metadata/zh-Hans/subtitle.txt      | 2 +-
 iphone/metadata/zh-Hans/support_url.txt   | 2 +-
 iphone/metadata/zh-Hant/description.txt   | 2 +-
 iphone/metadata/zh-Hant/keywords.txt      | 2 +-
 iphone/metadata/zh-Hant/marketing_url.txt | 2 +-
 iphone/metadata/zh-Hant/privacy_url.txt   | 2 +-
 iphone/metadata/zh-Hant/subtitle.txt      | 2 +-
 iphone/metadata/zh-Hant/support_url.txt   | 2 +-
 76 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/iphone/metadata/cs/description.txt b/iphone/metadata/cs/description.txt
index f1b1d63af..e19198469 100644
--- a/iphone/metadata/cs/description.txt
+++ b/iphone/metadata/cs/description.txt
@@ -25,4 +25,4 @@ Hlavní funkce:
 • Podpora CarPlay
 
 Svoboda je tady
-Objevujte své cesty, navigujte se světem se soukromím a komunitou na prvním místě!
+Objevujte své cesty, navigujte se světem se soukromím a komunitou na prvním místě!
\ No newline at end of file
diff --git a/iphone/metadata/cs/keywords.txt b/iphone/metadata/cs/keywords.txt
index d10712f79..52aade2f1 100644
--- a/iphone/metadata/cs/keywords.txt
+++ b/iphone/metadata/cs/keywords.txt
@@ -1 +1 @@
-comaps,mapy,open street maps,osm,cestování,turistika,kolo,auto,offline,soukromí,navigace,gps
+comaps,mapy,open street maps,osm,cestování,turistika,kolo,auto,offline,soukromí,navigace,gps
\ No newline at end of file
diff --git a/iphone/metadata/cs/marketing_url.txt b/iphone/metadata/cs/marketing_url.txt
index b0152dc49..a7570faf3 100644
--- a/iphone/metadata/cs/marketing_url.txt
+++ b/iphone/metadata/cs/marketing_url.txt
@@ -1 +1 @@
-https://comaps.app/cs/
+https://comaps.app/cs/
\ No newline at end of file
diff --git a/iphone/metadata/cs/privacy_url.txt b/iphone/metadata/cs/privacy_url.txt
index e48ac1f17..be277bf82 100644
--- a/iphone/metadata/cs/privacy_url.txt
+++ b/iphone/metadata/cs/privacy_url.txt
@@ -1 +1 @@
-https://www.comaps.app/cs/privacy
+https://www.comaps.app/cs/privacy
\ No newline at end of file
diff --git a/iphone/metadata/cs/subtitle.txt b/iphone/metadata/cs/subtitle.txt
index 0e2a9a43c..16caa6584 100644
--- a/iphone/metadata/cs/subtitle.txt
+++ b/iphone/metadata/cs/subtitle.txt
@@ -1 +1 @@
-Navigace se soukromím
+Navigace se soukromím
\ No newline at end of file
diff --git a/iphone/metadata/cs/support_url.txt b/iphone/metadata/cs/support_url.txt
index f93b754b6..3b3b80f3d 100644
--- a/iphone/metadata/cs/support_url.txt
+++ b/iphone/metadata/cs/support_url.txt
@@ -1 +1 @@
-https://codeberg.org/comaps/comaps/issues
+https://codeberg.org/comaps/comaps/issues
\ No newline at end of file
diff --git a/iphone/metadata/de-DE/description.txt b/iphone/metadata/de-DE/description.txt
index 8ae8a6243..34c61cb11 100644
--- a/iphone/metadata/de-DE/description.txt
+++ b/iphone/metadata/de-DE/description.txt
@@ -25,4 +25,4 @@ Hauptfunktionen:
 • Unterstützung für CarPlay
 
 Freiheit beginnt hier
-Entdecke deine Reise – navigiere in der Welt mit Datenschutz!
+Entdecke deine Reise – navigiere in der Welt mit Datenschutz!
\ No newline at end of file
diff --git a/iphone/metadata/de-DE/keywords.txt b/iphone/metadata/de-DE/keywords.txt
index 687671134..50b3ef21a 100644
--- a/iphone/metadata/de-DE/keywords.txt
+++ b/iphone/metadata/de-DE/keywords.txt
@@ -1 +1 @@
-comaps,karten,open street maps,osm,wandern,unterwegs,fahrrad,auto,offline,datenschutz,navigieren,gps
+comaps,karten,open street maps,osm,wandern,unterwegs,fahrrad,auto,offline,datenschutz,navigieren,gps
\ No newline at end of file
diff --git a/iphone/metadata/de-DE/marketing_url.txt b/iphone/metadata/de-DE/marketing_url.txt
index 24872f898..cd347f7e8 100644
--- a/iphone/metadata/de-DE/marketing_url.txt
+++ b/iphone/metadata/de-DE/marketing_url.txt
@@ -1 +1 @@
-https://comaps.app/de/
+https://comaps.app/de/
\ No newline at end of file
diff --git a/iphone/metadata/de-DE/privacy_url.txt b/iphone/metadata/de-DE/privacy_url.txt
index 2b9b80768..43a14f534 100644
--- a/iphone/metadata/de-DE/privacy_url.txt
+++ b/iphone/metadata/de-DE/privacy_url.txt
@@ -1 +1 @@
-https://comaps.app/de/privacy
+https://comaps.app/de/privacy
\ No newline at end of file
diff --git a/iphone/metadata/de-DE/subtitle.txt b/iphone/metadata/de-DE/subtitle.txt
index e95072d62..61c93e130 100644
--- a/iphone/metadata/de-DE/subtitle.txt
+++ b/iphone/metadata/de-DE/subtitle.txt
@@ -1 +1 @@
-Navigiere mit Privatsphäre
+Navigiere mit Privatsphäre
\ No newline at end of file
diff --git a/iphone/metadata/de-DE/support_url.txt b/iphone/metadata/de-DE/support_url.txt
index f93b754b6..3b3b80f3d 100644
--- a/iphone/metadata/de-DE/support_url.txt
+++ b/iphone/metadata/de-DE/support_url.txt
@@ -1 +1 @@
-https://codeberg.org/comaps/comaps/issues
+https://codeberg.org/comaps/comaps/issues
\ No newline at end of file
diff --git a/iphone/metadata/en-US/description.txt b/iphone/metadata/en-US/description.txt
index efb43d5a1..72bfaf26b 100644
--- a/iphone/metadata/en-US/description.txt
+++ b/iphone/metadata/en-US/description.txt
@@ -25,4 +25,4 @@ Main Features:
 • CarPlay support
 
 Freedom Is Here
-Discover your journey, navigate the world with privacy and community at the forefront!
+Discover your journey, navigate the world with privacy and community at the forefront!
\ No newline at end of file
diff --git a/iphone/metadata/en-US/marketing_url.txt b/iphone/metadata/en-US/marketing_url.txt
index 744cf6ffe..d34e6bbb8 100644
--- a/iphone/metadata/en-US/marketing_url.txt
+++ b/iphone/metadata/en-US/marketing_url.txt
@@ -1 +1 @@
-https://comaps.app/
+https://comaps.app/
\ No newline at end of file
diff --git a/iphone/metadata/en-US/privacy_url.txt b/iphone/metadata/en-US/privacy_url.txt
index effff312a..a0b9bff8e 100644
--- a/iphone/metadata/en-US/privacy_url.txt
+++ b/iphone/metadata/en-US/privacy_url.txt
@@ -1 +1 @@
-https://comaps.app/privacy
+https://comaps.app/privacy
\ No newline at end of file
diff --git a/iphone/metadata/en-US/support_url.txt b/iphone/metadata/en-US/support_url.txt
index f93b754b6..3b3b80f3d 100644
--- a/iphone/metadata/en-US/support_url.txt
+++ b/iphone/metadata/en-US/support_url.txt
@@ -1 +1 @@
-https://codeberg.org/comaps/comaps/issues
+https://codeberg.org/comaps/comaps/issues
\ No newline at end of file
diff --git a/iphone/metadata/es-ES/description.txt b/iphone/metadata/es-ES/description.txt
index 88108307a..924b7c950 100644
--- a/iphone/metadata/es-ES/description.txt
+++ b/iphone/metadata/es-ES/description.txt
@@ -25,4 +25,4 @@ Características principales:
 • Compatibilidad con CarPlay
 
 La libertad está aquí
-¡Descubre tu camino y navega por el mundo priorizando la privacidad y la comunidad!
+¡Descubre tu camino y navega por el mundo priorizando la privacidad y la comunidad!
\ No newline at end of file
diff --git a/iphone/metadata/es-ES/keywords.txt b/iphone/metadata/es-ES/keywords.txt
index ff1621916..c652f203e 100644
--- a/iphone/metadata/es-ES/keywords.txt
+++ b/iphone/metadata/es-ES/keywords.txt
@@ -1 +1 @@
-comaps,mapas,openstreetmap,osm,viajes,senderismo,bicicleta,conducción,sin conexión,privacidad,gps
+comaps,mapas,openstreetmap,osm,viajes,senderismo,bicicleta,conducción,sin conexión,privacidad,gps
\ No newline at end of file
diff --git a/iphone/metadata/es-ES/marketing_url.txt b/iphone/metadata/es-ES/marketing_url.txt
index 5778d1766..45580d2f0 100644
--- a/iphone/metadata/es-ES/marketing_url.txt
+++ b/iphone/metadata/es-ES/marketing_url.txt
@@ -1 +1 @@
-https://comaps.app/es/
+https://comaps.app/es/
\ No newline at end of file
diff --git a/iphone/metadata/es-ES/privacy_url.txt b/iphone/metadata/es-ES/privacy_url.txt
index a0644a377..ef98013df 100644
--- a/iphone/metadata/es-ES/privacy_url.txt
+++ b/iphone/metadata/es-ES/privacy_url.txt
@@ -1 +1 @@
-https://comaps.app/es/privacy
+https://comaps.app/es/privacy
\ No newline at end of file
diff --git a/iphone/metadata/es-ES/subtitle.txt b/iphone/metadata/es-ES/subtitle.txt
index 40793fd86..f91b038ba 100644
--- a/iphone/metadata/es-ES/subtitle.txt
+++ b/iphone/metadata/es-ES/subtitle.txt
@@ -1 +1 @@
-Navega con privacidad
+Navega con privacidad
\ No newline at end of file
diff --git a/iphone/metadata/es-ES/support_url.txt b/iphone/metadata/es-ES/support_url.txt
index f93b754b6..3b3b80f3d 100644
--- a/iphone/metadata/es-ES/support_url.txt
+++ b/iphone/metadata/es-ES/support_url.txt
@@ -1 +1 @@
-https://codeberg.org/comaps/comaps/issues
+https://codeberg.org/comaps/comaps/issues
\ No newline at end of file
diff --git a/iphone/metadata/fi/description.txt b/iphone/metadata/fi/description.txt
index f6cb3cac7..2dfddfae0 100644
--- a/iphone/metadata/fi/description.txt
+++ b/iphone/metadata/fi/description.txt
@@ -25,4 +25,4 @@ Pääominaisuudet:
 • CarPlay-tuki
 
 Vapaus on täällä
-Lähde matkalle – navigoi maailmassa, jossa yksityisyys ja yhteisö ovat etusijalla!
+Lähde matkalle – navigoi maailmassa, jossa yksityisyys ja yhteisö ovat etusijalla!
\ No newline at end of file
diff --git a/iphone/metadata/fi/keywords.txt b/iphone/metadata/fi/keywords.txt
index 7b72ad5b7..1f80a2b0f 100644
--- a/iphone/metadata/fi/keywords.txt
+++ b/iphone/metadata/fi/keywords.txt
@@ -1 +1 @@
-comaps,maps,open street maps,osm,matkaile,patikoi,pyöräile,aja,offline,tietosuoja,navigoi,gps
+comaps,maps,open street maps,osm,matkaile,patikoi,pyöräile,aja,offline,tietosuoja,navigoi,gps
\ No newline at end of file
diff --git a/iphone/metadata/fi/marketing_url.txt b/iphone/metadata/fi/marketing_url.txt
index b4d4a583e..1508e31c3 100644
--- a/iphone/metadata/fi/marketing_url.txt
+++ b/iphone/metadata/fi/marketing_url.txt
@@ -1 +1 @@
-https://comaps.app/fi/
+https://comaps.app/fi/
\ No newline at end of file
diff --git a/iphone/metadata/fi/privacy_url.txt b/iphone/metadata/fi/privacy_url.txt
index effff312a..a0b9bff8e 100644
--- a/iphone/metadata/fi/privacy_url.txt
+++ b/iphone/metadata/fi/privacy_url.txt
@@ -1 +1 @@
-https://comaps.app/privacy
+https://comaps.app/privacy
\ No newline at end of file
diff --git a/iphone/metadata/fi/subtitle.txt b/iphone/metadata/fi/subtitle.txt
index faca29573..765f45f8f 100644
--- a/iphone/metadata/fi/subtitle.txt
+++ b/iphone/metadata/fi/subtitle.txt
@@ -1 +1 @@
-Navigoi yksityisesti
+Navigoi yksityisesti
\ No newline at end of file
diff --git a/iphone/metadata/fi/support_url.txt b/iphone/metadata/fi/support_url.txt
index f93b754b6..3b3b80f3d 100644
--- a/iphone/metadata/fi/support_url.txt
+++ b/iphone/metadata/fi/support_url.txt
@@ -1 +1 @@
-https://codeberg.org/comaps/comaps/issues
+https://codeberg.org/comaps/comaps/issues
\ No newline at end of file
diff --git a/iphone/metadata/fr-FR/description.txt b/iphone/metadata/fr-FR/description.txt
index 19ea28144..f67333e32 100644
--- a/iphone/metadata/fr-FR/description.txt
+++ b/iphone/metadata/fr-FR/description.txt
@@ -25,4 +25,4 @@ Fonctionnalités principales :
 • Support pour CarPlay
 
 La liberté est ici
-Découvrez votre voyage, naviguez dans le monde en plaçant la vie privée et la communauté au premier plan !
+Découvrez votre voyage, naviguez dans le monde en plaçant la vie privée et la communauté au premier plan !
\ No newline at end of file
diff --git a/iphone/metadata/fr-FR/keywords.txt b/iphone/metadata/fr-FR/keywords.txt
index 4cb73ff9a..ec155baff 100644
--- a/iphone/metadata/fr-FR/keywords.txt
+++ b/iphone/metadata/fr-FR/keywords.txt
@@ -1 +1 @@
-cartes routières, osm, voyage, randonnée, vélo, conduite, hors ligne, confidentialité, GPS
+cartes routières, osm, voyage, randonnée, vélo, conduite, hors ligne, confidentialité, GPS
\ No newline at end of file
diff --git a/iphone/metadata/fr-FR/marketing_url.txt b/iphone/metadata/fr-FR/marketing_url.txt
index d52b83156..33d62861a 100644
--- a/iphone/metadata/fr-FR/marketing_url.txt
+++ b/iphone/metadata/fr-FR/marketing_url.txt
@@ -1 +1 @@
-https://comaps.app/fr/
+https://comaps.app/fr/
\ No newline at end of file
diff --git a/iphone/metadata/fr-FR/privacy_url.txt b/iphone/metadata/fr-FR/privacy_url.txt
index 70d46fcf5..c698bc676 100644
--- a/iphone/metadata/fr-FR/privacy_url.txt
+++ b/iphone/metadata/fr-FR/privacy_url.txt
@@ -1 +1 @@
-https://comaps.app/fr/privacy
+https://comaps.app/fr/privacy
\ No newline at end of file
diff --git a/iphone/metadata/fr-FR/subtitle.txt b/iphone/metadata/fr-FR/subtitle.txt
index d7cda6c98..6647db647 100644
--- a/iphone/metadata/fr-FR/subtitle.txt
+++ b/iphone/metadata/fr-FR/subtitle.txt
@@ -1 +1 @@
-Naviguez avec confidentialité
+Naviguez avec confidentialité
\ No newline at end of file
diff --git a/iphone/metadata/fr-FR/support_url.txt b/iphone/metadata/fr-FR/support_url.txt
index f93b754b6..3b3b80f3d 100644
--- a/iphone/metadata/fr-FR/support_url.txt
+++ b/iphone/metadata/fr-FR/support_url.txt
@@ -1 +1 @@
-https://codeberg.org/comaps/comaps/issues
+https://codeberg.org/comaps/comaps/issues
\ No newline at end of file
diff --git a/iphone/metadata/it/description.txt b/iphone/metadata/it/description.txt
index 335f29648..bb80f3e0d 100644
--- a/iphone/metadata/it/description.txt
+++ b/iphone/metadata/it/description.txt
@@ -25,4 +25,4 @@ Funzionalità principali:
 • Supporto CarPlay
 
 La Libertà è Qui
-Esplora la tua nuova avventura, naviga il mondo con Privacy e la community in prima linea!
+Esplora la tua nuova avventura, naviga il mondo con Privacy e la community in prima linea!
\ No newline at end of file
diff --git a/iphone/metadata/it/keywords.txt b/iphone/metadata/it/keywords.txt
index edcb25ae7..de047e7be 100644
--- a/iphone/metadata/it/keywords.txt
+++ b/iphone/metadata/it/keywords.txt
@@ -1 +1 @@
-comaps,mappe,open street maps,osm,viaggi,escursione,guida,offline,privacy,navigazione,gps
+comaps,mappe,open street maps,osm,viaggi,escursione,guida,offline,privacy,navigazione,gps
\ No newline at end of file
diff --git a/iphone/metadata/it/marketing_url.txt b/iphone/metadata/it/marketing_url.txt
index 9da7e0fd8..12f132152 100644
--- a/iphone/metadata/it/marketing_url.txt
+++ b/iphone/metadata/it/marketing_url.txt
@@ -1 +1 @@
-https://comaps.app/it/
+https://comaps.app/it/
\ No newline at end of file
diff --git a/iphone/metadata/it/privacy_url.txt b/iphone/metadata/it/privacy_url.txt
index 4f155dbec..485e6b049 100644
--- a/iphone/metadata/it/privacy_url.txt
+++ b/iphone/metadata/it/privacy_url.txt
@@ -1 +1 @@
-https://comaps.app/it/privacy
+https://comaps.app/it/privacy
\ No newline at end of file
diff --git a/iphone/metadata/it/subtitle.txt b/iphone/metadata/it/subtitle.txt
index 6190b2e03..b5b315182 100644
--- a/iphone/metadata/it/subtitle.txt
+++ b/iphone/metadata/it/subtitle.txt
@@ -1 +1 @@
-Viaggia con privacy
+Viaggia con privacy
\ No newline at end of file
diff --git a/iphone/metadata/it/support_url.txt b/iphone/metadata/it/support_url.txt
index f93b754b6..3b3b80f3d 100644
--- a/iphone/metadata/it/support_url.txt
+++ b/iphone/metadata/it/support_url.txt
@@ -1 +1 @@
-https://codeberg.org/comaps/comaps/issues
+https://codeberg.org/comaps/comaps/issues
\ No newline at end of file
diff --git a/iphone/metadata/nl-NL/description.txt b/iphone/metadata/nl-NL/description.txt
index f1c4f4ebc..227c04fcc 100644
--- a/iphone/metadata/nl-NL/description.txt
+++ b/iphone/metadata/nl-NL/description.txt
@@ -24,4 +24,4 @@ Hoofdfuncties:
 • Ondersteuning voor CarPlay
 
 Vrijheid is hier
-Ontdek je reis, navigeer over de wereld met privacy en community voorop!
+Ontdek je reis, navigeer over de wereld met privacy en community voorop!
\ No newline at end of file
diff --git a/iphone/metadata/nl-NL/keywords.txt b/iphone/metadata/nl-NL/keywords.txt
index 324b28c2d..1ff5f6680 100644
--- a/iphone/metadata/nl-NL/keywords.txt
+++ b/iphone/metadata/nl-NL/keywords.txt
@@ -1 +1 @@
-comaps,kaarten,open street maps,osm,reizen,wandelen,fietsen,rijden,offline,privacy,navigeren,gps
+comaps,kaarten,open street maps,osm,reizen,wandelen,fietsen,rijden,offline,privacy,navigeren,gps
\ No newline at end of file
diff --git a/iphone/metadata/nl-NL/marketing_url.txt b/iphone/metadata/nl-NL/marketing_url.txt
index 81dd54594..ca73b9c8e 100644
--- a/iphone/metadata/nl-NL/marketing_url.txt
+++ b/iphone/metadata/nl-NL/marketing_url.txt
@@ -1 +1 @@
-https://comaps.app/nl/
+https://comaps.app/nl/
\ No newline at end of file
diff --git a/iphone/metadata/nl-NL/privacy_url.txt b/iphone/metadata/nl-NL/privacy_url.txt
index 6572b18dc..78509d35b 100644
--- a/iphone/metadata/nl-NL/privacy_url.txt
+++ b/iphone/metadata/nl-NL/privacy_url.txt
@@ -1 +1 @@
-https://comaps.app/nl/privacy
+https://comaps.app/nl/privacy
\ No newline at end of file
diff --git a/iphone/metadata/nl-NL/subtitle.txt b/iphone/metadata/nl-NL/subtitle.txt
index f9e30c854..7e67c2332 100644
--- a/iphone/metadata/nl-NL/subtitle.txt
+++ b/iphone/metadata/nl-NL/subtitle.txt
@@ -1 +1 @@
-Navigeer met privacy
+Navigeer met privacy
\ No newline at end of file
diff --git a/iphone/metadata/nl-NL/support_url.txt b/iphone/metadata/nl-NL/support_url.txt
index f93b754b6..3b3b80f3d 100644
--- a/iphone/metadata/nl-NL/support_url.txt
+++ b/iphone/metadata/nl-NL/support_url.txt
@@ -1 +1 @@
-https://codeberg.org/comaps/comaps/issues
+https://codeberg.org/comaps/comaps/issues
\ No newline at end of file
diff --git a/iphone/metadata/pt-BR/description.txt b/iphone/metadata/pt-BR/description.txt
index 4f365c49f..1757746d2 100644
--- a/iphone/metadata/pt-BR/description.txt
+++ b/iphone/metadata/pt-BR/description.txt
@@ -25,4 +25,4 @@ Principais recursos:
 • Suporte para CarPlay
 
 A Liberdade Chegou
-Descubra sua jornada, navegue pelo mundo com privacidade e comunidade em primeiro lugar!
+Descubra sua jornada, navegue pelo mundo com privacidade e comunidade em primeiro lugar!
\ No newline at end of file
diff --git a/iphone/metadata/pt-BR/keywords.txt b/iphone/metadata/pt-BR/keywords.txt
index 1cc2d3a45..e05949d63 100644
--- a/iphone/metadata/pt-BR/keywords.txt
+++ b/iphone/metadata/pt-BR/keywords.txt
@@ -1 +1 @@
-comaps,mapas,openstreetmap,osm,viagem,trilha,bicicleta,direção,offline,privacidade,navegação,gps
+comaps,mapas,openstreetmap,osm,viagem,trilha,bicicleta,direção,offline,privacidade,navegação,gps
\ No newline at end of file
diff --git a/iphone/metadata/pt-BR/marketing_url.txt b/iphone/metadata/pt-BR/marketing_url.txt
index 65f8826bb..4882aa7aa 100644
--- a/iphone/metadata/pt-BR/marketing_url.txt
+++ b/iphone/metadata/pt-BR/marketing_url.txt
@@ -1 +1 @@
-https://comaps.app/pt-BR/
+https://comaps.app/pt-BR/
\ No newline at end of file
diff --git a/iphone/metadata/pt-BR/privacy_url.txt b/iphone/metadata/pt-BR/privacy_url.txt
index 9e49c8582..15809b1a2 100644
--- a/iphone/metadata/pt-BR/privacy_url.txt
+++ b/iphone/metadata/pt-BR/privacy_url.txt
@@ -1 +1 @@
-https://www.comaps.app/pt-BR/privacy/
+https://www.comaps.app/pt-BR/privacy/
\ No newline at end of file
diff --git a/iphone/metadata/pt-BR/subtitle.txt b/iphone/metadata/pt-BR/subtitle.txt
index e6ace2707..d106ad7b8 100644
--- a/iphone/metadata/pt-BR/subtitle.txt
+++ b/iphone/metadata/pt-BR/subtitle.txt
@@ -1 +1 @@
-Navegue com Privacidade
+Navegue com Privacidade
\ No newline at end of file
diff --git a/iphone/metadata/pt-BR/support_url.txt b/iphone/metadata/pt-BR/support_url.txt
index f93b754b6..3b3b80f3d 100644
--- a/iphone/metadata/pt-BR/support_url.txt
+++ b/iphone/metadata/pt-BR/support_url.txt
@@ -1 +1 @@
-https://codeberg.org/comaps/comaps/issues
+https://codeberg.org/comaps/comaps/issues
\ No newline at end of file
diff --git a/iphone/metadata/ru/description.txt b/iphone/metadata/ru/description.txt
index 0afd34a5c..8f7dc0bfb 100644
--- a/iphone/metadata/ru/description.txt
+++ b/iphone/metadata/ru/description.txt
@@ -25,4 +25,4 @@
 • Поддержка CarPlay
 
 Свобода здесь
-Откройте для себя путешествия, навигацию по миру, ставя во главе приватность и сообщество!
+Откройте для себя путешествия, навигацию по миру, ставя во главе приватность и сообщество!
\ No newline at end of file
diff --git a/iphone/metadata/ru/keywords.txt b/iphone/metadata/ru/keywords.txt
index c9c7cb65f..4b44bdb22 100644
--- a/iphone/metadata/ru/keywords.txt
+++ b/iphone/metadata/ru/keywords.txt
@@ -1 +1 @@
-comaps,maps,open street maps,osm,travel,hike,bike,drive,offline,privacy,navigate,gps
+comaps,maps,open street maps,osm,travel,hike,bike,drive,offline,privacy,navigate,gps
\ No newline at end of file
diff --git a/iphone/metadata/ru/marketing_url.txt b/iphone/metadata/ru/marketing_url.txt
index 37fd5f7a5..1660b2938 100644
--- a/iphone/metadata/ru/marketing_url.txt
+++ b/iphone/metadata/ru/marketing_url.txt
@@ -1 +1 @@
-https://comaps.app/ru/
+https://comaps.app/ru/
\ No newline at end of file
diff --git a/iphone/metadata/ru/privacy_url.txt b/iphone/metadata/ru/privacy_url.txt
index 7be2ddd6f..427677e0a 100644
--- a/iphone/metadata/ru/privacy_url.txt
+++ b/iphone/metadata/ru/privacy_url.txt
@@ -1 +1 @@
-https://www.comaps.app/ru/privacy
+https://www.comaps.app/ru/privacy
\ No newline at end of file
diff --git a/iphone/metadata/ru/subtitle.txt b/iphone/metadata/ru/subtitle.txt
index 6c31474bc..576a0b045 100644
--- a/iphone/metadata/ru/subtitle.txt
+++ b/iphone/metadata/ru/subtitle.txt
@@ -1 +1 @@
-Приватная навигация
+Приватная навигация
\ No newline at end of file
diff --git a/iphone/metadata/ru/support_url.txt b/iphone/metadata/ru/support_url.txt
index f93b754b6..3b3b80f3d 100644
--- a/iphone/metadata/ru/support_url.txt
+++ b/iphone/metadata/ru/support_url.txt
@@ -1 +1 @@
-https://codeberg.org/comaps/comaps/issues
+https://codeberg.org/comaps/comaps/issues
\ No newline at end of file
diff --git a/iphone/metadata/tr/description.txt b/iphone/metadata/tr/description.txt
index 13673a7ad..3d6d3dd38 100644
--- a/iphone/metadata/tr/description.txt
+++ b/iphone/metadata/tr/description.txt
@@ -25,4 +25,4 @@ Ana Özellikleri:
 • CarPlay desteği
 
 Özgürlük burada
-Yolculuğunuzu keşfedin, gizlilik ve topluluk ön planda tutularak dünyayı keşfedin!
+Yolculuğunuzu keşfedin, gizlilik ve topluluk ön planda tutularak dünyayı keşfedin!
\ No newline at end of file
diff --git a/iphone/metadata/tr/keywords.txt b/iphone/metadata/tr/keywords.txt
index e4f448acb..3bcbbf624 100644
--- a/iphone/metadata/tr/keywords.txt
+++ b/iphone/metadata/tr/keywords.txt
@@ -1 +1 @@
-comaps,haritalar,open street map,osm,seyahat,yürüyüş,bisiklet,sürüş,internetsiz,mahremiyet,navigasyon,konum
+comaps,haritalar,open street map,osm,seyahat,yürüyüş,bisiklet,sürüş,internetsiz,mahremiyet,navigasyon,konum
\ No newline at end of file
diff --git a/iphone/metadata/tr/marketing_url.txt b/iphone/metadata/tr/marketing_url.txt
index aa6d39094..c1affeaed 100644
--- a/iphone/metadata/tr/marketing_url.txt
+++ b/iphone/metadata/tr/marketing_url.txt
@@ -1 +1 @@
-https://comaps.app/tr/
+https://comaps.app/tr/
\ No newline at end of file
diff --git a/iphone/metadata/tr/privacy_url.txt b/iphone/metadata/tr/privacy_url.txt
index 3e29256b9..c2bd85a97 100644
--- a/iphone/metadata/tr/privacy_url.txt
+++ b/iphone/metadata/tr/privacy_url.txt
@@ -1 +1 @@
-https://comaps.app/tr/privacy
+https://comaps.app/tr/privacy
\ No newline at end of file
diff --git a/iphone/metadata/tr/subtitle.txt b/iphone/metadata/tr/subtitle.txt
index 654576276..0cbffd2ef 100644
--- a/iphone/metadata/tr/subtitle.txt
+++ b/iphone/metadata/tr/subtitle.txt
@@ -1 +1 @@
-Mahremiyetli Yolculuk
+Mahremiyetli Yolculuk
\ No newline at end of file
diff --git a/iphone/metadata/tr/support_url.txt b/iphone/metadata/tr/support_url.txt
index f93b754b6..3b3b80f3d 100644
--- a/iphone/metadata/tr/support_url.txt
+++ b/iphone/metadata/tr/support_url.txt
@@ -1 +1 @@
-https://codeberg.org/comaps/comaps/issues
+https://codeberg.org/comaps/comaps/issues
\ No newline at end of file
diff --git a/iphone/metadata/zh-Hans/description.txt b/iphone/metadata/zh-Hans/description.txt
index 3894a83d6..bb89bac6d 100644
--- a/iphone/metadata/zh-Hans/description.txt
+++ b/iphone/metadata/zh-Hans/description.txt
@@ -25,4 +25,4 @@
 • 支持 CarPlay
 
 自由在此
-探索您的旅程，以隐私和社区为本，畅游世界！
+探索您的旅程，以隐私和社区为本，畅游世界！
\ No newline at end of file
diff --git a/iphone/metadata/zh-Hans/keywords.txt b/iphone/metadata/zh-Hans/keywords.txt
index 54549621b..fea2ce13e 100644
--- a/iphone/metadata/zh-Hans/keywords.txt
+++ b/iphone/metadata/zh-Hans/keywords.txt
@@ -1 +1 @@
-comaps,地图,open street maps,osm,环游,徒步,骑单车,驾车,离线,隐私,导航,全球定位系统
+comaps,地图,open street maps,osm,环游,徒步,骑单车,驾车,离线,隐私,导航,全球定位系统
\ No newline at end of file
diff --git a/iphone/metadata/zh-Hans/marketing_url.txt b/iphone/metadata/zh-Hans/marketing_url.txt
index af2932b3e..7a2cf964f 100644
--- a/iphone/metadata/zh-Hans/marketing_url.txt
+++ b/iphone/metadata/zh-Hans/marketing_url.txt
@@ -1 +1 @@
-https://www.comaps.app/zh-Hans/
+https://www.comaps.app/zh-Hans/
\ No newline at end of file
diff --git a/iphone/metadata/zh-Hans/privacy_url.txt b/iphone/metadata/zh-Hans/privacy_url.txt
index 34d6e92d9..421e3c7ca 100644
--- a/iphone/metadata/zh-Hans/privacy_url.txt
+++ b/iphone/metadata/zh-Hans/privacy_url.txt
@@ -1 +1 @@
-https://www.comaps.app/zh-Hans/privacy/
+https://www.comaps.app/zh-Hans/privacy/
\ No newline at end of file
diff --git a/iphone/metadata/zh-Hans/subtitle.txt b/iphone/metadata/zh-Hans/subtitle.txt
index 18320058f..09831afd3 100644
--- a/iphone/metadata/zh-Hans/subtitle.txt
+++ b/iphone/metadata/zh-Hans/subtitle.txt
@@ -1 +1 @@
-隐私导航
+隐私导航
\ No newline at end of file
diff --git a/iphone/metadata/zh-Hans/support_url.txt b/iphone/metadata/zh-Hans/support_url.txt
index f93b754b6..3b3b80f3d 100644
--- a/iphone/metadata/zh-Hans/support_url.txt
+++ b/iphone/metadata/zh-Hans/support_url.txt
@@ -1 +1 @@
-https://codeberg.org/comaps/comaps/issues
+https://codeberg.org/comaps/comaps/issues
\ No newline at end of file
diff --git a/iphone/metadata/zh-Hant/description.txt b/iphone/metadata/zh-Hant/description.txt
index 686114bd3..b75f54e55 100644
--- a/iphone/metadata/zh-Hant/description.txt
+++ b/iphone/metadata/zh-Hant/description.txt
@@ -25,4 +25,4 @@
 • 支援 CarPlay
 
 自由在此
-探索您的旅程，以隱私和社群為本，暢遊世界！
+探索您的旅程，以隱私和社群為本，暢遊世界！
\ No newline at end of file
diff --git a/iphone/metadata/zh-Hant/keywords.txt b/iphone/metadata/zh-Hant/keywords.txt
index f581b208d..b11ee1a84 100644
--- a/iphone/metadata/zh-Hant/keywords.txt
+++ b/iphone/metadata/zh-Hant/keywords.txt
@@ -1 +1 @@
-comaps,地圖,open street maps,osm,旅行,徒步,騎車,駕車,離線,隱私,導航,全球定位系統
+comaps,地圖,open street maps,osm,旅行,徒步,騎車,駕車,離線,隱私,導航,全球定位系統
\ No newline at end of file
diff --git a/iphone/metadata/zh-Hant/marketing_url.txt b/iphone/metadata/zh-Hant/marketing_url.txt
index ba8560edd..221557037 100644
--- a/iphone/metadata/zh-Hant/marketing_url.txt
+++ b/iphone/metadata/zh-Hant/marketing_url.txt
@@ -1 +1 @@
-https://comaps.app/zh-Hant/
+https://comaps.app/zh-Hant/
\ No newline at end of file
diff --git a/iphone/metadata/zh-Hant/privacy_url.txt b/iphone/metadata/zh-Hant/privacy_url.txt
index effff312a..a0b9bff8e 100644
--- a/iphone/metadata/zh-Hant/privacy_url.txt
+++ b/iphone/metadata/zh-Hant/privacy_url.txt
@@ -1 +1 @@
-https://comaps.app/privacy
+https://comaps.app/privacy
\ No newline at end of file
diff --git a/iphone/metadata/zh-Hant/subtitle.txt b/iphone/metadata/zh-Hant/subtitle.txt
index b54a03d90..410f8d7a2 100644
--- a/iphone/metadata/zh-Hant/subtitle.txt
+++ b/iphone/metadata/zh-Hant/subtitle.txt
@@ -1 +1 @@
-隱私導航
+隱私導航
\ No newline at end of file
diff --git a/iphone/metadata/zh-Hant/support_url.txt b/iphone/metadata/zh-Hant/support_url.txt
index f93b754b6..3b3b80f3d 100644
--- a/iphone/metadata/zh-Hant/support_url.txt
+++ b/iphone/metadata/zh-Hant/support_url.txt
@@ -1 +1 @@
-https://codeberg.org/comaps/comaps/issues
+https://codeberg.org/comaps/comaps/issues
\ No newline at end of file

From 9f8451596a0110303c137a7e25b3109e8c41b666 Mon Sep 17 00:00:00 2001
From: Yannik Bloscheck <git@yannikbloscheck.com>
Date: Sat, 23 Aug 2025 18:07:29 +0200
Subject: [PATCH 284/302] [ios] Removed unusable App Store metadata translation

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
---
 iphone/metadata/eu/marketing_url.txt | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 iphone/metadata/eu/marketing_url.txt

diff --git a/iphone/metadata/eu/marketing_url.txt b/iphone/metadata/eu/marketing_url.txt
deleted file mode 100644
index cc10619d1..000000000
--- a/iphone/metadata/eu/marketing_url.txt
+++ /dev/null
@@ -1 +0,0 @@
-https://comaps.app/eu/

From 4bad37a8290e08d72b9c08acffcce33496820af0 Mon Sep 17 00:00:00 2001
From: Yannik Bloscheck <git@yannikbloscheck.com>
Date: Sat, 23 Aug 2025 18:12:24 +0200
Subject: [PATCH 285/302] [ios] Shortened too long Turkish translation in App
 Store metadata

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
---
 iphone/metadata/tr/keywords.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/iphone/metadata/tr/keywords.txt b/iphone/metadata/tr/keywords.txt
index 3bcbbf624..af72a7ce9 100644
--- a/iphone/metadata/tr/keywords.txt
+++ b/iphone/metadata/tr/keywords.txt
@@ -1 +1 @@
-comaps,haritalar,open street map,osm,seyahat,yürüyüş,bisiklet,sürüş,internetsiz,mahremiyet,navigasyon,konum
\ No newline at end of file
+comaps,haritalar,open street map,osm,seyahat,yürüyüş,bisiklet,sürüş,internetsiz,navigasyon,konum
\ No newline at end of file

From ea1d0eefa283bed4062769e866f2958a6050d22e Mon Sep 17 00:00:00 2001
From: TobiPeterG <codeberg.sadness522@passmail.net>
Date: Mon, 4 Aug 2025 23:38:43 +0200
Subject: [PATCH 286/302] [android] Add current speed widget

Signed-off-by: TobiPeterG <codeberg.sadness522@passmail.net>
---
 .../routing/NavigationController.java         |  13 +-
 .../app/organicmaps/widget/BaseSignView.java  | 170 +++++++++++
 .../organicmaps/widget/CurrentSpeedView.java  |  77 +++++
 .../organicmaps/widget/SpeedLimitView.java    | 270 ++++++------------
 .../main/res/layout-land/layout_nav_top.xml   |  18 +-
 .../src/main/res/layout/layout_nav_top.xml    |  19 +-
 android/app/src/main/res/values/attrs.xml     |  10 +
 android/app/src/main/res/values/styles.xml    |   4 +
 8 files changed, 392 insertions(+), 189 deletions(-)
 create mode 100644 android/app/src/main/java/app/organicmaps/widget/BaseSignView.java
 create mode 100644 android/app/src/main/java/app/organicmaps/widget/CurrentSpeedView.java

diff --git a/android/app/src/main/java/app/organicmaps/routing/NavigationController.java b/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
index 22fe42c53..e3a6bea9a 100644
--- a/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
+++ b/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
@@ -26,6 +26,7 @@ import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.WindowInsetUtils;
+import app.organicmaps.widget.CurrentSpeedView;
 import app.organicmaps.widget.LanesView;
 import app.organicmaps.widget.SpeedLimitView;
 import app.organicmaps.widget.menu.NavMenu;
@@ -51,6 +52,8 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
   private final LanesView mLanesView;
   @NonNull
   private final SpeedLimitView mSpeedLimit;
+  @NonNull
+  private final CurrentSpeedView mCurrentSpeed;
 
   private final MapButtonsViewModel mMapButtonsViewModel;
 
@@ -94,6 +97,7 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
     mLanesView = topFrame.findViewById(R.id.lanes);
 
     mSpeedLimit = topFrame.findViewById(R.id.nav_speed_limit);
+    mCurrentSpeed = topFrame.findViewById(R.id.nav_current_speed);
 
     // Show a blank view below the navbar to hide the menu content
     final View navigationBarBackground = mFrame.findViewById(R.id.nav_bottom_sheet_nav_bar);
@@ -128,7 +132,7 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
 
     mLanesView.setLanes(info.lanes);
 
-    updateSpeedLimit(info);
+    updateSpeedWidgets(info);
   }
 
   private void updatePedestrian(@NonNull RoutingInfo info)
@@ -136,6 +140,7 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
     mNextTurnDistance.setText(Utils.formatDistance(mFrame.getContext(), info.distToTurn));
 
     info.pedestrianTurnDirection.setTurnDrawable(mNextTurnImage);
+    updateSpeedWidgets(info);
   }
 
   public void updateNorth()
@@ -261,16 +266,18 @@ public class NavigationController implements TrafficManager.TrafficCallback, Nav
     RoutingController.get().cancel();
   }
 
-  private void updateSpeedLimit(@NonNull final RoutingInfo info)
+  private void updateSpeedWidgets(@NonNull final RoutingInfo info)
   {
     final Location location = MwmApplication.from(mFrame.getContext()).getLocationHelper().getSavedLocation();
     if (location == null)
     {
-      mSpeedLimit.setSpeedLimit(0, false);
+      mSpeedLimit.setSpeedLimit(-1, false);
+      mCurrentSpeed.setCurrentSpeed(-1);
       return;
     }
     final int fSpeedLimit = StringUtils.nativeFormatSpeed(info.speedLimitMps);
     final boolean speedLimitExceeded = fSpeedLimit < StringUtils.nativeFormatSpeed(location.getSpeed());
     mSpeedLimit.setSpeedLimit(fSpeedLimit, speedLimitExceeded);
+    mCurrentSpeed.setCurrentSpeed(location.getSpeed());
   }
 }
diff --git a/android/app/src/main/java/app/organicmaps/widget/BaseSignView.java b/android/app/src/main/java/app/organicmaps/widget/BaseSignView.java
new file mode 100644
index 000000000..de87682fd
--- /dev/null
+++ b/android/app/src/main/java/app/organicmaps/widget/BaseSignView.java
@@ -0,0 +1,170 @@
+package app.organicmaps.widget;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Rect;
+import android.graphics.Typeface;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+public abstract class BaseSignView extends View
+{
+    private float mBorderWidthRatio = 0.1f;
+    protected void setBorderWidthRatio(float ratio) {
+        mBorderWidthRatio = ratio;
+    }
+
+    private float mBorderInsetRatio = 0f;
+    protected void setBorderInsetRatio(float ratio) {
+        mBorderInsetRatio = ratio;
+    }
+
+    // colors
+    protected int mBackgroundColor;
+    protected int mBorderColor;
+    protected int mAlertColor;
+    protected int mTextColor;
+    protected int mTextAlertColor;
+
+    // paints
+    protected final Paint mBackgroundPaint;
+    protected final Paint mBorderPaint;
+    protected final Paint mTextPaint;
+
+    // geometry
+    protected float mWidth;
+    protected float mHeight;
+    protected float mRadius;
+    protected float mBorderWidth;
+    protected float mBorderRadius;
+
+    public BaseSignView(Context ctx, @Nullable AttributeSet attrs)
+    {
+        super(ctx, attrs);
+        mBackgroundPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        mBorderPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        mBorderPaint.setStyle(Paint.Style.STROKE);
+        mTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+        mTextPaint.setTextAlign(Paint.Align.CENTER);
+        mTextPaint.setTypeface(Typeface.create(Typeface.DEFAULT, Typeface.BOLD));
+    }
+
+    protected void setColors(int backgroundColor,
+                             int borderColor,
+                             int alertColor,
+                             int textColor,
+                             int textAlertColor)
+    {
+        mBackgroundColor   = backgroundColor;
+        mBorderColor       = borderColor;
+        mAlertColor        = alertColor;
+        mTextColor         = textColor;
+        mTextAlertColor    = textAlertColor;
+
+        mBackgroundPaint.setColor(mBackgroundColor);
+        mBorderPaint.setColor(mBorderColor);
+        mTextPaint.setColor(mTextColor);
+    }
+
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        super.onSizeChanged(w, h, oldw, oldh);
+        float px = getPaddingLeft() + getPaddingRight();
+        float py = getPaddingTop()  + getPaddingBottom();
+        mWidth  = w - px;
+        mHeight = h - py;
+        mRadius = Math.min(mWidth, mHeight) / 2f;
+        mBorderWidth  = mRadius * mBorderWidthRatio;
+        // subtract half the stroke PLUS the extra inset
+        float gap = mRadius * mBorderInsetRatio;
+        mBorderRadius = mRadius - (mBorderWidth / 2f) - gap;
+        configureTextSize();
+    }
+
+    @Override
+    protected void onDraw(@NonNull Canvas canvas)
+    {
+        super.onDraw(canvas);
+        String str = getValueString();
+        if (str == null) return;
+
+        float cx = mWidth / 2f;
+        float cy = mHeight / 2f;
+
+        // background & border
+        boolean alert = isAlert();
+        mBackgroundPaint.setColor(alert ? mAlertColor : mBackgroundColor);
+        canvas.drawCircle(cx, cy, mRadius, mBackgroundPaint);
+        if (!alert)
+        {
+            mBorderPaint.setStrokeWidth(mBorderWidth);
+            mBorderPaint.setColor(mBorderColor);
+            canvas.drawCircle(cx, cy, mBorderRadius, mBorderPaint);
+        }
+
+        // text
+        mTextPaint.setColor(alert ? mTextAlertColor : mTextColor);
+        drawValueString(canvas, cx, cy, str);
+    }
+
+    @Override
+    public boolean onTouchEvent(@NonNull MotionEvent e)
+    {
+        float cx = mWidth / 2f, cy = mHeight / 2f;
+        float dx = e.getX() - cx, dy = e.getY() - cy;
+        if (dx*dx + dy*dy <= mRadius*mRadius)
+        {
+            performClick();
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public boolean performClick()
+    {
+        super.performClick();
+        return false;
+    }
+
+    private void drawValueString(Canvas c, float cx, float cy, String str)
+    {
+        Rect b = new Rect();
+        mTextPaint.getTextBounds(str, 0, str.length(), b);
+        float y = cy - b.exactCenterY();
+        c.drawText(str, cx, y, mTextPaint);
+    }
+
+    void configureTextSize()
+    {
+        String text = getValueString();
+        if (text == null) return;
+        float textRadius = mBorderRadius - mBorderWidth;
+        float maxSz = 2f * textRadius;
+        float maxSz2 = maxSz * maxSz;
+        float lo = 0f, hi = maxSz, sz = maxSz;
+        Rect b = new Rect();
+        while (lo <= hi)
+        {
+            sz = (lo + hi) / 2f;
+            mTextPaint.setTextSize(sz);
+            mTextPaint.getTextBounds(text, 0, text.length(), b);
+            float area = b.width()*b.width() + b.height()*b.height();
+            if (area <= maxSz2) lo = sz + 1f;
+            else hi = sz - 1f;
+        }
+        mTextPaint.setTextSize(Math.max(1f, sz));
+    }
+
+    /** child must return the string to draw, or null if nothing */
+    @Nullable
+    protected abstract String getValueString();
+
+    /** child decides if this is in “alert” state */
+    protected abstract boolean isAlert();
+}
diff --git a/android/app/src/main/java/app/organicmaps/widget/CurrentSpeedView.java b/android/app/src/main/java/app/organicmaps/widget/CurrentSpeedView.java
new file mode 100644
index 000000000..c414b371a
--- /dev/null
+++ b/android/app/src/main/java/app/organicmaps/widget/CurrentSpeedView.java
@@ -0,0 +1,77 @@
+package app.organicmaps.widget;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.util.Pair;
+
+import androidx.annotation.Nullable;
+
+import app.organicmaps.R;
+import app.organicmaps.sdk.util.StringUtils;
+
+public class CurrentSpeedView extends BaseSignView
+{
+  private double mSpeedMps = -1.0;
+  private String mSpeedStr = "--";
+
+  public CurrentSpeedView(Context ctx, @Nullable AttributeSet attrs)
+  {
+    super(ctx, attrs);
+
+    setBorderWidthRatio(0.1f);
+    setBorderInsetRatio(0.05f);
+
+    try (TypedArray a = ctx.getTheme()
+            .obtainStyledAttributes(attrs, R.styleable.CurrentSpeedView /* reuse same attrs or define new */ , 0, 0))
+    {
+      int bg   = a.getColor(R.styleable.CurrentSpeedView_currentSpeedBackgroundColor, DefaultValues.BACKGROUND_COLOR);
+      int bd   = a.getColor(R.styleable.CurrentSpeedView_currentSpeedBorderColor,     DefaultValues.BORDER_COLOR);
+      int tc   = a.getColor(R.styleable.CurrentSpeedView_currentSpeedTextColor,       DefaultValues.TEXT_COLOR);
+      setColors(bg, bd, 0, tc, 0);
+
+      if (isInEditMode())
+      {
+        mSpeedMps = a.getInt(R.styleable.CurrentSpeedView_currentSpeedEditModeCurrentSpeed,  50);
+        mSpeedStr = Integer.toString((int)mSpeedMps);
+      }
+    }
+  }
+
+  public void setCurrentSpeed(double mps)
+  {
+    mSpeedMps = mps;
+    if (mps < 0)
+    {
+      mSpeedStr = "--";
+    }
+    else
+    {
+      Pair<String,String> su = StringUtils.nativeFormatSpeedAndUnits(mps);
+      mSpeedStr = su.first;
+    }
+    requestLayout();
+    configureTextSize();
+    invalidate();
+  }
+
+  @Nullable
+  @Override
+  protected String getValueString()
+  {
+    return mSpeedStr;
+  }
+
+  @Override
+  protected boolean isAlert()
+  {
+    return false;
+  }
+
+  private interface DefaultValues
+  {
+    int BACKGROUND_COLOR    = 0xFFFFFFFF;
+    int BORDER_COLOR        = 0xFF000000;
+    int TEXT_COLOR          = 0xFF000000;
+  }
+}
diff --git a/android/app/src/main/java/app/organicmaps/widget/SpeedLimitView.java b/android/app/src/main/java/app/organicmaps/widget/SpeedLimitView.java
index 12c4f4819..6d6a0aa14 100644
--- a/android/app/src/main/java/app/organicmaps/widget/SpeedLimitView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/SpeedLimitView.java
@@ -3,225 +3,135 @@ package app.organicmaps.widget;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
-import android.graphics.Color;
 import android.graphics.Paint;
-import android.graphics.Rect;
-import android.graphics.Typeface;
 import android.util.AttributeSet;
-import android.view.MotionEvent;
-import android.view.View;
-import androidx.annotation.ColorInt;
-import androidx.annotation.NonNull;
+
 import androidx.annotation.Nullable;
+
 import app.organicmaps.R;
 
-public class SpeedLimitView extends View
+public class SpeedLimitView extends BaseSignView
 {
-  private interface DefaultValues
+  private int    mSpeedLimit = -1;
+  private boolean mAlert     = false;
+  private String mSpeedStr   = "-1";
+  private final int unlimitedBorderColor;
+  private final int unlimitedStripeColor;
+
+  public SpeedLimitView(Context ctx, @Nullable AttributeSet attrs)
   {
-    @ColorInt
-    int BACKGROUND_COLOR = Color.WHITE;
-    @ColorInt
-    int BORDER_COLOR = Color.RED;
-    @ColorInt
-    int ALERT_COLOR = Color.RED;
-    @ColorInt
-    int TEXT_COLOR = Color.BLACK;
-    @ColorInt
-    int TEXT_ALERT_COLOR = Color.WHITE;
+    super(ctx, attrs);
 
-    float BORDER_WIDTH_RATIO = 0.1f;
-  }
+    setBorderWidthRatio(0.2f);
+    setBorderInsetRatio(0.05f);
 
-  @ColorInt
-  private final int mBackgroundColor;
-
-  @ColorInt
-  private final int mBorderColor;
-
-  @ColorInt
-  private final int mAlertColor;
-
-  @ColorInt
-  private final int mTextColor;
-
-  @ColorInt
-  private final int mTextAlertColor;
-
-  @NonNull
-  private final Paint mSignBackgroundPaint;
-  @NonNull
-  private final Paint mSignBorderPaint;
-  @NonNull
-  private final Paint mTextPaint;
-
-  private float mWidth;
-  private float mHeight;
-  private float mBackgroundRadius;
-  private float mBorderRadius;
-  private float mBorderWidth;
-
-  private int mSpeedLimit = 0;
-  @NonNull
-  private String mSpeedLimitStr = "0";
-  private boolean mAlert = false;
-
-  public SpeedLimitView(Context context, @Nullable AttributeSet attrs)
-  {
-    super(context, attrs);
-
-    try (TypedArray data = context.getTheme().obtainStyledAttributes(attrs, R.styleable.SpeedLimitView, 0, 0))
+    try (TypedArray a = ctx.getTheme()
+            .obtainStyledAttributes(attrs, R.styleable.SpeedLimitView, 0, 0))
     {
-      mBackgroundColor =
-          data.getColor(R.styleable.SpeedLimitView_speedLimitBackgroundColor, DefaultValues.BACKGROUND_COLOR);
-      mBorderColor = data.getColor(R.styleable.SpeedLimitView_speedLimitBorderColor, DefaultValues.BORDER_COLOR);
-      mAlertColor = data.getColor(R.styleable.SpeedLimitView_speedLimitAlertColor, DefaultValues.ALERT_COLOR);
-      mTextColor = data.getColor(R.styleable.SpeedLimitView_speedLimitTextColor, DefaultValues.TEXT_COLOR);
-      mTextAlertColor =
-          data.getColor(R.styleable.SpeedLimitView_speedLimitTextAlertColor, DefaultValues.TEXT_ALERT_COLOR);
+      int bg   = a.getColor(R.styleable.SpeedLimitView_speedLimitBackgroundColor, DefaultValues.BACKGROUND_COLOR);
+      int bd   = a.getColor(R.styleable.SpeedLimitView_speedLimitBorderColor,     DefaultValues.BORDER_COLOR);
+      int al   = a.getColor(R.styleable.SpeedLimitView_speedLimitAlertColor,      DefaultValues.ALERT_COLOR);
+      int tc   = a.getColor(R.styleable.SpeedLimitView_speedLimitTextColor,       DefaultValues.TEXT_COLOR);
+      int tac  = a.getColor(R.styleable.SpeedLimitView_speedLimitTextAlertColor,  DefaultValues.TEXT_ALERT_COLOR);
+      setColors(bg, bd, al, tc, tac);
+
+      unlimitedBorderColor = a.getColor(R.styleable.SpeedLimitView_speedLimitUnlimitedBorderColor,  DefaultValues.UNLIMITED_BORDER_COLOR);
+      unlimitedStripeColor = a.getColor(R.styleable.SpeedLimitView_speedLimitUnlimitedStripeColor,  DefaultValues.UNLIMITED_STRIPE_COLOR);
+
       if (isInEditMode())
       {
-        mSpeedLimit = data.getInt(R.styleable.SpeedLimitView_speedLimitEditModeSpeedLimit, 60);
-        mSpeedLimitStr = Integer.toString(mSpeedLimit);
-        mAlert = data.getBoolean(R.styleable.SpeedLimitView_speedLimitEditModeAlert, false);
+        mSpeedLimit = a.getInt(R.styleable.SpeedLimitView_speedLimitEditModeSpeedLimit, 60);
+        mAlert      = a.getBoolean(R.styleable.SpeedLimitView_speedLimitEditModeAlert,   false);
+        mSpeedStr   = Integer.toString(mSpeedLimit);
       }
     }
-
-    mSignBackgroundPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-    mSignBackgroundPaint.setColor(mBackgroundColor);
-
-    mSignBorderPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-    mSignBorderPaint.setColor(mBorderColor);
-    mSignBorderPaint.setStrokeWidth(mBorderWidth);
-    mSignBorderPaint.setStyle(Paint.Style.STROKE);
-
-    mTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-    mTextPaint.setColor(mTextColor);
-    mTextPaint.setTextAlign(Paint.Align.CENTER);
-    mTextPaint.setTypeface(Typeface.create(Typeface.DEFAULT, Typeface.BOLD));
   }
 
-  public void setSpeedLimit(final int speedLimit, boolean alert)
+  public void setSpeedLimit(int limit, boolean alert)
   {
-    final boolean speedLimitChanged = mSpeedLimit != speedLimit;
-
-    mSpeedLimit = speedLimit;
-    mAlert = alert;
-
-    if (speedLimitChanged)
+    if (mSpeedLimit != limit)
     {
-      mSpeedLimitStr = Integer.toString(mSpeedLimit);
-      configureTextSize();
+      mSpeedLimit = limit;
+      mSpeedStr   = Integer.toString(limit);
+      requestLayout();
     }
-
+    mAlert = alert;
+    configureTextSize();
     invalidate();
   }
 
+  @Nullable
   @Override
-  protected void onDraw(@NonNull Canvas canvas)
+  protected String getValueString()
   {
-    super.onDraw(canvas);
-
-    final boolean validSpeedLimit = mSpeedLimit > 0;
-    if (!validSpeedLimit)
-      return;
-
-    final float cx = mWidth / 2;
-    final float cy = mHeight / 2;
-
-    drawSign(canvas, cx, cy, mAlert);
-    drawText(canvas, cx, cy, mAlert);
+    return (mSpeedLimit > 0 ? mSpeedStr : null);
   }
 
-  private void drawSign(@NonNull Canvas canvas, float cx, float cy, boolean alert)
+  @Override
+  protected boolean isAlert()
   {
-    if (alert)
-      mSignBackgroundPaint.setColor(mAlertColor);
+    return mAlert;
+  }
+
+  @Override
+  protected void onDraw(Canvas canvas)
+  {
+    float cx = mWidth/2f, cy = mHeight/2f;
+
+    if (mSpeedLimit == 0)
+    {
+      // background
+      mBackgroundPaint.setColor(mBackgroundColor);
+      canvas.drawCircle(cx, cy, mRadius, mBackgroundPaint);
+
+      // black border
+      mBorderPaint.setColor(unlimitedBorderColor);
+      mBorderPaint.setStrokeWidth(mBorderWidth);
+      canvas.drawCircle(cx, cy, mBorderRadius, mBorderPaint);
+
+      // draw 5 diagonal stripes
+      drawUnlimitedStripes(canvas, cx, cy);
+    }
     else
-      mSignBackgroundPaint.setColor(mBackgroundColor);
-
-    canvas.drawCircle(cx, cy, mBackgroundRadius, mSignBackgroundPaint);
-    if (!alert)
     {
-      mSignBorderPaint.setStrokeWidth(mBorderWidth);
-      canvas.drawCircle(cx, cy, mBorderRadius, mSignBorderPaint);
+      // delegate to BaseSignView’s onDraw
+      super.onDraw(canvas);
     }
   }
 
-  private void drawText(@NonNull Canvas canvas, float cx, float cy, boolean alert)
+  private void drawUnlimitedStripes(Canvas c, float cx, float cy)
   {
-    if (alert)
-      mTextPaint.setColor(mTextAlertColor);
-    else
-      mTextPaint.setColor(mTextColor);
+    Paint stripe = new Paint(Paint.ANTI_ALIAS_FLAG);
+    stripe.setColor(unlimitedStripeColor);
+    stripe.setStrokeWidth(mBorderWidth * 0.4f);
 
-    final Rect textBounds = new Rect();
-    mTextPaint.getTextBounds(mSpeedLimitStr, 0, mSpeedLimitStr.length(), textBounds);
-    final float textY = cy - textBounds.exactCenterY();
-    canvas.drawText(mSpeedLimitStr, cx, textY, mTextPaint);
-  }
+    float r     = mRadius * 0.8f;       // shorten to 80% of full radius
+    float diag  = (float)(1/Math.sqrt(2));
+    float dx    = -diag, dy = +diag;
+    float px    = -dy,    py = +dx;     // perpendicular
+    float step  = r * 0.15f;            // spacing
 
-  @Override
-  public boolean onTouchEvent(@NonNull MotionEvent event)
-  {
-    final float cx = mWidth / 2;
-    final float cy = mHeight / 2;
-    if (Math.pow(event.getX() - cx, 2) + Math.pow(event.getY() - cy, 2) <= Math.pow(mBackgroundRadius, 2))
+    for (int i = -2; i <= 2; i++)
     {
-      performClick();
-      return true;
+      float ox = px * step * i;
+      float oy = py * step * i;
+      float sx = cx + dx * r + ox;
+      float sy = cy + dy * r + oy;
+      float ex = cx - dx * r + ox;
+      float ey = cy - dy * r + oy;
+      c.drawLine(sx, sy, ex, ey, stripe);
     }
-    return false;
   }
 
-  @Override
-  public boolean performClick()
+
+  private interface DefaultValues
   {
-    super.performClick();
-    return false;
-  }
-
-  @Override
-  protected void onSizeChanged(int w, int h, int oldw, int oldh)
-  {
-    super.onSizeChanged(w, h, oldw, oldh);
-
-    final float paddingX = (float) (getPaddingLeft() + getPaddingRight());
-    final float paddingY = (float) (getPaddingTop() + getPaddingBottom());
-
-    mWidth = (float) w - paddingX;
-    mHeight = (float) h - paddingY;
-    mBackgroundRadius = Math.min(mWidth, mHeight) / 2;
-    mBorderWidth = mBackgroundRadius * 2 * DefaultValues.BORDER_WIDTH_RATIO;
-    mBorderRadius = mBackgroundRadius - mBorderWidth / 2;
-    configureTextSize();
-  }
-
-  // Apply binary search to determine the optimal text size that fits within the circular boundary.
-  private void configureTextSize()
-  {
-    final String text = mSpeedLimitStr;
-    final float textRadius = mBorderRadius - mBorderWidth;
-    final float textMaxSize = 2 * textRadius;
-    final float textMaxSizeSquared = (float) Math.pow(textMaxSize, 2);
-
-    float lowerBound = 0;
-    float upperBound = textMaxSize;
-    float textSize = textMaxSize;
-    final Rect textBounds = new Rect();
-
-    while (lowerBound <= upperBound)
-    {
-      textSize = (lowerBound + upperBound) / 2;
-      mTextPaint.setTextSize(textSize);
-      mTextPaint.getTextBounds(text, 0, text.length(), textBounds);
-
-      if (Math.pow(textBounds.width(), 2) + Math.pow(textBounds.height(), 2) <= textMaxSizeSquared)
-        lowerBound = textSize + 1;
-      else
-        upperBound = textSize - 1;
-    }
-
-    mTextPaint.setTextSize(Math.max(1, textSize));
+    int BACKGROUND_COLOR       = 0xFFFFFFFF;
+    int BORDER_COLOR           = 0xFFFF0000;
+    int ALERT_COLOR            = 0xFFFF0000;
+    int TEXT_COLOR             = 0xFF000000;
+    int TEXT_ALERT_COLOR       = 0xFFFFFFFF;
+    int UNLIMITED_BORDER_COLOR = 0xFF000000;
+    int UNLIMITED_STRIPE_COLOR = 0xFF000000;
   }
 }
diff --git a/android/app/src/main/res/layout-land/layout_nav_top.xml b/android/app/src/main/res/layout-land/layout_nav_top.xml
index 4636a4159..8ee90433e 100644
--- a/android/app/src/main/res/layout-land/layout_nav_top.xml
+++ b/android/app/src/main/res/layout-land/layout_nav_top.xml
@@ -123,12 +123,24 @@
       app:lanesEditModeLanesCount="10"
       tools:visibility="visible" />
 
+  <app.organicmaps.widget.CurrentSpeedView
+      android:id="@+id/nav_current_speed"
+      style="@style/MwmWidget.CurrentSpeed"
+      android:layout_width="60dp"
+      android:layout_height="60dp"
+      android:layout_margin="@dimen/margin_half"
+      app:layout_constraintStart_toEndOf="@id/nav_next_turn_container"
+      app:layout_constraintTop_toBottomOf="@id/street_frame"/>
+
   <app.organicmaps.widget.SpeedLimitView
     android:id="@+id/nav_speed_limit"
     style="@style/MwmWidget.SpeedLimit"
-    android:layout_width="60dp"
-    android:layout_height="60dp"
+    android:layout_width="50dp"
+    android:layout_height="50dp"
     android:layout_margin="@dimen/margin_half"
     app:layout_constraintStart_toEndOf="@id/nav_next_turn_container"
-    app:layout_constraintTop_toBottomOf="@id/street_frame" />
+    app:layout_constraintTop_toBottomOf="@id/nav_current_speed"
+    android:translationY="-21dp"
+    android:translationX="-12dp"
+    android:translationZ="1dp"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/android/app/src/main/res/layout/layout_nav_top.xml b/android/app/src/main/res/layout/layout_nav_top.xml
index c75d9a8f6..e71475c1e 100644
--- a/android/app/src/main/res/layout/layout_nav_top.xml
+++ b/android/app/src/main/res/layout/layout_nav_top.xml
@@ -124,13 +124,26 @@
       app:lanesEditModeLanesCount="5"
       tools:visibility="visible" />
 
+  <app.organicmaps.widget.CurrentSpeedView
+      android:id="@+id/nav_current_speed"
+      style="@style/MwmWidget.CurrentSpeed"
+      android:layout_width="60dp"
+      android:layout_height="60dp"
+      android:layout_margin="@dimen/margin_half"
+      app:layout_constraintEnd_toEndOf="@id/nav_next_turn_container"
+      app:layout_constraintStart_toStartOf="@id/nav_next_turn_container"
+      app:layout_constraintTop_toBottomOf="@id/nav_next_turn_container"/>
+
   <app.organicmaps.widget.SpeedLimitView
     android:id="@+id/nav_speed_limit"
     style="@style/MwmWidget.SpeedLimit"
-    android:layout_width="60dp"
-    android:layout_height="60dp"
+    android:layout_width="50dp"
+    android:layout_height="50dp"
     android:layout_margin="@dimen/margin_half"
     app:layout_constraintEnd_toEndOf="@id/nav_next_turn_container"
     app:layout_constraintStart_toStartOf="@id/nav_next_turn_container"
-    app:layout_constraintTop_toBottomOf="@id/nav_next_turn_container" />
+    app:layout_constraintTop_toBottomOf="@id/nav_current_speed"
+    android:translationY="-23dp"
+    android:translationX="-23dp"
+    android:translationZ="1dp"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/android/app/src/main/res/values/attrs.xml b/android/app/src/main/res/values/attrs.xml
index b69c40559..4db620a25 100644
--- a/android/app/src/main/res/values/attrs.xml
+++ b/android/app/src/main/res/values/attrs.xml
@@ -3,6 +3,8 @@
   <declare-styleable name="SpeedLimitView">
     <attr name="speedLimitBackgroundColor" format="color" />
     <attr name="speedLimitBorderColor" format="color" />
+    <attr name="speedLimitUnlimitedBorderColor" format="color" />
+    <attr name="speedLimitUnlimitedStripeColor" format="color" />
     <attr name="speedLimitAlertColor" format="color" />
     <attr name="speedLimitTextColor" format="color" />
     <attr name="speedLimitTextAlertColor" format="color" />
@@ -11,6 +13,14 @@
     <attr name="speedLimitEditModeAlert" format="boolean" />
   </declare-styleable>
 
+  <declare-styleable name="CurrentSpeedView">
+    <attr name="currentSpeedBackgroundColor" format="color" />
+    <attr name="currentSpeedBorderColor" format="color" />
+    <attr name="currentSpeedTextColor" format="color" />
+    <!-- These values are used only in edit mode -->
+    <attr name="currentSpeedEditModeCurrentSpeed" format="integer" />
+  </declare-styleable>
+
   <declare-styleable name="LanesView">
     <attr name="lanesActiveLaneTintColor" format="reference" />
     <attr name="lanesInactiveLaneTintColor" format="color" />
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 042316a80..9740cc67e 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -10,6 +10,10 @@
     <item name="speedLimitBorderColor">@color/base_red</item>
   </style>
 
+  <style name="MwmWidget.CurrentSpeed">
+    <item name="speedLimitBorderColor">@color/black_primary</item>
+  </style>
+
   <style name="MwmWidget.FrameLayout"/>
 
   <style name="MwmWidget.Downloader"/>

From 3c1b8be5ce07ea19b3fc8a5f54cda15626885946 Mon Sep 17 00:00:00 2001
From: Harry Bond <me@hbond.xyz>
Date: Sat, 30 Aug 2025 19:56:24 +0100
Subject: [PATCH 287/302] nit and style fixes

Signed-off-by: Harry Bond <me@hbond.xyz>
---
 .../app/organicmaps/widget/BaseSignView.java  | 42 ++++++++-------
 .../organicmaps/widget/SpeedLimitView.java    | 53 +++++++++----------
 2 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/widget/BaseSignView.java b/android/app/src/main/java/app/organicmaps/widget/BaseSignView.java
index de87682fd..e3b8d3bf8 100644
--- a/android/app/src/main/java/app/organicmaps/widget/BaseSignView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/BaseSignView.java
@@ -72,16 +72,16 @@ public abstract class BaseSignView extends View
     }
 
     @Override
-    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-        super.onSizeChanged(w, h, oldw, oldh);
-        float px = getPaddingLeft() + getPaddingRight();
-        float py = getPaddingTop()  + getPaddingBottom();
-        mWidth  = w - px;
-        mHeight = h - py;
+    protected void onSizeChanged(int width, int height, int oldWidth, int oldHeight) {
+        super.onSizeChanged(width, height, oldWidth, oldHeight);
+        final float paddingX = getPaddingLeft() + getPaddingRight();
+        final float paddingY = getPaddingTop()  + getPaddingBottom();
+        mWidth  = width - paddingX;
+        mHeight = height - paddingY;
         mRadius = Math.min(mWidth, mHeight) / 2f;
         mBorderWidth  = mRadius * mBorderWidthRatio;
         // subtract half the stroke PLUS the extra inset
-        float gap = mRadius * mBorderInsetRatio;
+        final float gap = mRadius * mBorderInsetRatio;
         mBorderRadius = mRadius - (mBorderWidth / 2f) - gap;
         configureTextSize();
     }
@@ -90,11 +90,11 @@ public abstract class BaseSignView extends View
     protected void onDraw(@NonNull Canvas canvas)
     {
         super.onDraw(canvas);
-        String str = getValueString();
+        final String str = getValueString();
         if (str == null) return;
 
-        float cx = mWidth / 2f;
-        float cy = mHeight / 2f;
+        final float cx = mWidth / 2f;
+        final float cy = mHeight / 2f;
 
         // background & border
         boolean alert = isAlert();
@@ -115,9 +115,9 @@ public abstract class BaseSignView extends View
     @Override
     public boolean onTouchEvent(@NonNull MotionEvent e)
     {
-        float cx = mWidth / 2f, cy = mHeight / 2f;
-        float dx = e.getX() - cx, dy = e.getY() - cy;
-        if (dx*dx + dy*dy <= mRadius*mRadius)
+        final float cx = mWidth / 2f, cy = mHeight / 2f;
+        final float dx = e.getX() - cx, dy = e.getY() - cy;
+        if ((dx * dx) + (dy * dy) <= (mRadius * mRadius))
         {
             performClick();
             return true;
@@ -136,7 +136,7 @@ public abstract class BaseSignView extends View
     {
         Rect b = new Rect();
         mTextPaint.getTextBounds(str, 0, str.length(), b);
-        float y = cy - b.exactCenterY();
+        final float y = cy - b.exactCenterY();
         c.drawText(str, cx, y, mTextPaint);
     }
 
@@ -144,10 +144,10 @@ public abstract class BaseSignView extends View
     {
         String text = getValueString();
         if (text == null) return;
-        float textRadius = mBorderRadius - mBorderWidth;
-        float maxSz = 2f * textRadius;
-        float maxSz2 = maxSz * maxSz;
-        float lo = 0f, hi = maxSz, sz = maxSz;
+        final float textRadius = mBorderRadius - mBorderWidth;
+        final float maxTextSize = 2f * textRadius;
+        final float maxTextSize2 = maxTextSize * maxTextSize;
+        float lo = 0f, hi = maxTextSize, sz = maxTextSize;
         Rect b = new Rect();
         while (lo <= hi)
         {
@@ -155,8 +155,10 @@ public abstract class BaseSignView extends View
             mTextPaint.setTextSize(sz);
             mTextPaint.getTextBounds(text, 0, text.length(), b);
             float area = b.width()*b.width() + b.height()*b.height();
-            if (area <= maxSz2) lo = sz + 1f;
-            else hi = sz - 1f;
+            if (area <= maxTextSize2)
+                lo = sz + 1f;
+            else
+                hi = sz - 1f;
         }
         mTextPaint.setTextSize(Math.max(1f, sz));
     }
diff --git a/android/app/src/main/java/app/organicmaps/widget/SpeedLimitView.java b/android/app/src/main/java/app/organicmaps/widget/SpeedLimitView.java
index 6d6a0aa14..a819da109 100644
--- a/android/app/src/main/java/app/organicmaps/widget/SpeedLimitView.java
+++ b/android/app/src/main/java/app/organicmaps/widget/SpeedLimitView.java
@@ -25,24 +25,23 @@ public class SpeedLimitView extends BaseSignView
     setBorderWidthRatio(0.2f);
     setBorderInsetRatio(0.05f);
 
-    try (TypedArray a = ctx.getTheme()
-            .obtainStyledAttributes(attrs, R.styleable.SpeedLimitView, 0, 0))
+    try (TypedArray styleAttrs = ctx.getTheme().obtainStyledAttributes(attrs, R.styleable.SpeedLimitView, 0, 0))
     {
-      int bg   = a.getColor(R.styleable.SpeedLimitView_speedLimitBackgroundColor, DefaultValues.BACKGROUND_COLOR);
-      int bd   = a.getColor(R.styleable.SpeedLimitView_speedLimitBorderColor,     DefaultValues.BORDER_COLOR);
-      int al   = a.getColor(R.styleable.SpeedLimitView_speedLimitAlertColor,      DefaultValues.ALERT_COLOR);
-      int tc   = a.getColor(R.styleable.SpeedLimitView_speedLimitTextColor,       DefaultValues.TEXT_COLOR);
-      int tac  = a.getColor(R.styleable.SpeedLimitView_speedLimitTextAlertColor,  DefaultValues.TEXT_ALERT_COLOR);
-      setColors(bg, bd, al, tc, tac);
+      final int bgColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitBackgroundColor, DefaultValues.BACKGROUND_COLOR);
+      final int borderColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitBorderColor, DefaultValues.BORDER_COLOR);
+      final int alertColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitAlertColor, DefaultValues.ALERT_COLOR);
+      final int textColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitTextColor, DefaultValues.TEXT_COLOR);
+      final int txtAlertColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitTextAlertColor, DefaultValues.TEXT_ALERT_COLOR);
+      setColors(bgColor, borderColor, alertColor, textColor, txtAlertColor);
 
-      unlimitedBorderColor = a.getColor(R.styleable.SpeedLimitView_speedLimitUnlimitedBorderColor,  DefaultValues.UNLIMITED_BORDER_COLOR);
-      unlimitedStripeColor = a.getColor(R.styleable.SpeedLimitView_speedLimitUnlimitedStripeColor,  DefaultValues.UNLIMITED_STRIPE_COLOR);
+      unlimitedBorderColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitUnlimitedBorderColor, DefaultValues.UNLIMITED_BORDER_COLOR);
+      unlimitedStripeColor = styleAttrs.getColor(R.styleable.SpeedLimitView_speedLimitUnlimitedStripeColor, DefaultValues.UNLIMITED_STRIPE_COLOR);
 
       if (isInEditMode())
       {
-        mSpeedLimit = a.getInt(R.styleable.SpeedLimitView_speedLimitEditModeSpeedLimit, 60);
-        mAlert      = a.getBoolean(R.styleable.SpeedLimitView_speedLimitEditModeAlert,   false);
-        mSpeedStr   = Integer.toString(mSpeedLimit);
+        mSpeedLimit = styleAttrs.getInt(R.styleable.SpeedLimitView_speedLimitEditModeSpeedLimit, 60);
+        mAlert = styleAttrs.getBoolean(R.styleable.SpeedLimitView_speedLimitEditModeAlert, false);
+        mSpeedStr = Integer.toString(mSpeedLimit);
       }
     }
   }
@@ -76,9 +75,9 @@ public class SpeedLimitView extends BaseSignView
   @Override
   protected void onDraw(Canvas canvas)
   {
-    float cx = mWidth/2f, cy = mHeight/2f;
+    final float cx = mWidth/2f, cy = mHeight/2f;
 
-    if (mSpeedLimit == 0)
+    if (mSpeedLimit == 0) // 0 means unlimited speed (maxspeed=none)
     {
       // background
       mBackgroundPaint.setColor(mBackgroundColor);
@@ -101,24 +100,24 @@ public class SpeedLimitView extends BaseSignView
 
   private void drawUnlimitedStripes(Canvas c, float cx, float cy)
   {
-    Paint stripe = new Paint(Paint.ANTI_ALIAS_FLAG);
+    final Paint stripe = new Paint(Paint.ANTI_ALIAS_FLAG);
     stripe.setColor(unlimitedStripeColor);
     stripe.setStrokeWidth(mBorderWidth * 0.4f);
 
-    float r     = mRadius * 0.8f;       // shorten to 80% of full radius
-    float diag  = (float)(1/Math.sqrt(2));
-    float dx    = -diag, dy = +diag;
-    float px    = -dy,    py = +dx;     // perpendicular
-    float step  = r * 0.15f;            // spacing
+    final float radius = mRadius * 0.8f; // Shorten to 80% of full radius
+    final float diag = (float) (1/Math.sqrt(2)); // 45 degrees
+    final float dx = -diag, dy = +diag;
+    final float px = -dy, py = +dx; // Perpendicular
+    final float step = radius * 0.15f; // Spacing
 
     for (int i = -2; i <= 2; i++)
     {
-      float ox = px * step * i;
-      float oy = py * step * i;
-      float sx = cx + dx * r + ox;
-      float sy = cy + dy * r + oy;
-      float ex = cx - dx * r + ox;
-      float ey = cy - dy * r + oy;
+      final float ox = px * step * i;
+      final float oy = py * step * i;
+      final float sx = cx + dx * radius + ox;
+      final float sy = cy + dy * radius + oy;
+      final float ex = cx - dx * radius + ox;
+      final float ey = cy - dy * radius + oy;
       c.drawLine(sx, sy, ex, ey, stripe);
     }
   }

From f3c30cbf853538cd8b475b07ba88559eb00b11e5 Mon Sep 17 00:00:00 2001
From: Gonzalo Pesquero <gpesquero@yahoo.es>
Date: Thu, 14 Aug 2025 12:42:28 +0200
Subject: [PATCH 288/302] [android] Remove display of speed from navigation
 panel

Signed-off-by: Gonzalo Pesquero <gpesquero@yahoo.es>
---
 .../app/organicmaps/widget/menu/NavMenu.java  | 56 +++++++------------
 .../res/layout/layout_nav_bottom_numbers.xml  | 20 +++----
 2 files changed, 31 insertions(+), 45 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
index 8b781d660..b503cf812 100644
--- a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
+++ b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
@@ -1,20 +1,14 @@
 package app.organicmaps.widget.menu;
 
-import android.location.Location;
-import android.util.Pair;
 import android.view.View;
 import android.widget.Toast;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.content.ContextCompat;
-import app.organicmaps.MwmApplication;
 import app.organicmaps.R;
 import app.organicmaps.sdk.routing.RoutingInfo;
 import app.organicmaps.sdk.sound.TtsPlayer;
-import app.organicmaps.sdk.util.Config;
-import app.organicmaps.sdk.util.StringUtils;
+import app.organicmaps.sdk.util.DateUtils;
 import app.organicmaps.util.Graphics;
-import app.organicmaps.util.ThemeUtils;
 import app.organicmaps.util.UiUtils;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.button.MaterialButton;
@@ -32,14 +26,12 @@ public class NavMenu
   private final View mHeaderFrame;
 
   private final ShapeableImageView mTts;
-  private final View mSpeedViewContainer;
-  private final MaterialTextView mSpeedValue;
-  private final MaterialTextView mSpeedUnits;
+  private final MaterialTextView mEtaValue;
+  private final MaterialTextView mEtaAmPm;
   private final MaterialTextView mTimeHourValue;
   private final MaterialTextView mTimeHourUnits;
   private final MaterialTextView mTimeMinuteValue;
   private final MaterialTextView mTimeMinuteUnits;
-  private final MaterialTextView mTimeEstimate;
   private final MaterialTextView mDistanceValue;
   private final MaterialTextView mDistanceUnits;
   private final LinearProgressIndicator mRouteProgress;
@@ -94,14 +86,12 @@ public class NavMenu
     });
 
     // Bottom frame
-    mSpeedViewContainer = bottomFrame.findViewById(R.id.speed_view_container);
-    mSpeedValue = bottomFrame.findViewById(R.id.speed_value);
-    mSpeedUnits = bottomFrame.findViewById(R.id.speed_dimen);
+    mEtaValue = bottomFrame.findViewById(R.id.eta_value);
+    mEtaAmPm = bottomFrame.findViewById(R.id.eta_am_pm);
     mTimeHourValue = bottomFrame.findViewById(R.id.time_hour_value);
     mTimeHourUnits = bottomFrame.findViewById(R.id.time_hour_dimen);
     mTimeMinuteValue = bottomFrame.findViewById(R.id.time_minute_value);
     mTimeMinuteUnits = bottomFrame.findViewById(R.id.time_minute_dimen);
-    mTimeEstimate = bottomFrame.findViewById(R.id.time_estimate);
     mDistanceValue = bottomFrame.findViewById(R.id.distance_value);
     mDistanceUnits = bottomFrame.findViewById(R.id.distance_dimen);
     mRouteProgress = bottomFrame.findViewById(R.id.navigation_progress);
@@ -199,38 +189,34 @@ public class NavMenu
 
   private void updateTimeEstimate(int seconds)
   {
-    final String format =
-        android.text.format.DateFormat.is24HourFormat(mTimeMinuteValue.getContext()) ? "HH:mm" : "h:mm a";
+    // Calculate ETA from current local time and remaining seconds.
     final LocalTime localTime = LocalTime.now().plusSeconds(seconds);
-    mTimeEstimate.setText(localTime.format(DateTimeFormatter.ofPattern(format)));
-  }
 
-  private void updateSpeedView(@NonNull RoutingInfo info)
-  {
-    final Location last = MwmApplication.from(mActivity).getLocationHelper().getSavedLocation();
-    if (last == null)
-      return;
+    // String to set the format of the ETA value (24h or AM/PM).
+    final String etaValueFormat;
 
-    Pair<String, String> speedAndUnits = StringUtils.nativeFormatSpeedAndUnits(last.getSpeed());
-    mSpeedValue.setText(speedAndUnits.first);
+    // Text of the AM/PM view.
+    final String etaAmPmText;
 
-    if (info.speedLimitMps > 0.0 && last.getSpeed() > info.speedLimitMps)
+    if (DateUtils.is24HourFormat(mTimeMinuteValue.getContext()))
     {
-      if (info.isSpeedCamLimitExceeded())
-        mSpeedValue.setTextColor(ContextCompat.getColor(mActivity, R.color.white_primary));
-      else
-        mSpeedValue.setTextColor(ContextCompat.getColor(mActivity, R.color.base_red));
+      // 24 hours time format.
+      etaValueFormat = "HH:mm";
+      etaAmPmText = "";
     }
     else
-      mSpeedValue.setTextColor(ThemeUtils.getColor(mActivity, android.R.attr.textColorPrimary));
+    {
+      // AM/PM time format.
+      etaValueFormat = "h:mm";
+      etaAmPmText = localTime.format(DateTimeFormatter.ofPattern("a"));
+    }
 
-    mSpeedUnits.setText(speedAndUnits.second);
-    mSpeedViewContainer.setActivated(info.isSpeedCamLimitExceeded());
+    mEtaValue.setText(localTime.format(DateTimeFormatter.ofPattern(etaValueFormat)));
+    mEtaAmPm.setText(etaAmPmText);
   }
 
   public void update(@NonNull RoutingInfo info)
   {
-    updateSpeedView(info);
     updateTime(info.totalTimeInSeconds);
     mDistanceValue.setText(info.distToTarget.mDistanceStr);
     mDistanceUnits.setText(info.distToTarget.getUnitsStr(mActivity.getApplicationContext()));
diff --git a/android/app/src/main/res/layout/layout_nav_bottom_numbers.xml b/android/app/src/main/res/layout/layout_nav_bottom_numbers.xml
index b89a8bbe5..eed0f1e79 100644
--- a/android/app/src/main/res/layout/layout_nav_bottom_numbers.xml
+++ b/android/app/src/main/res/layout/layout_nav_bottom_numbers.xml
@@ -13,35 +13,35 @@
     android:layout_height="match_parent"
     android:layout_weight="0.5"/>
 
-  <!-- Speed -->
+  <!-- ETA (Estimated Time of Arrival) -->
   <LinearLayout
-    android:id="@+id/speed_view_container"
+    android:id="@+id/eta_view_container"
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:background="@drawable/speed_cams_bg"
     android:gravity="center"
     android:minWidth="@dimen/nav_numbers_side_min_width">
 
+    <!-- ETA value -->
     <com.google.android.material.textview.MaterialTextView
-      android:id="@+id/speed_value"
+      android:id="@+id/eta_value"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:includeFontPadding="false"
       android:lines="1"
       android:textAppearance="@style/MwmTextAppearance.NavMenu.Number"
-      tools:text="999" />
+      tools:text="99:99" />
 
-    <!-- Speed -->
+    <!-- ETA AM/PM -->
     <com.google.android.material.textview.MaterialTextView
-      android:id="@+id/speed_dimen"
+      android:id="@+id/eta_am_pm"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:includeFontPadding="false"
       android:lines="1"
       android:textAppearance="@style/MwmTextAppearance.NavMenu.Number.Dimension"
       tools:background="#20FF0000"
-      tools:text="km/h" />
+      tools:text="AM/PM" />
   </LinearLayout>
 
   <Space
@@ -103,14 +103,14 @@
     </LinearLayout>
 
     <com.google.android.material.textview.MaterialTextView
-      android:id="@+id/time_estimate"
+      android:id="@+id/disused_text_view"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:includeFontPadding="false"
       android:lines="1"
       android:textAlignment="center"
       android:textAppearance="@style/MwmTextAppearance.NavMenu.Number.Dimension"
-      tools:text="99:99 AM" />
+      tools:text="----" />
   </LinearLayout>
 
   <Space

From de305e1a87772c574acf4b8e457282d5bf8cd972 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Sun, 31 Aug 2025 15:58:40 +0700
Subject: [PATCH 289/302] Revert "[tracks] Safe GpsTrackCollection requests
 during recording."

This reverts commit b7b87f55304f802cfb154a536b8b81d83af86c86.
---
 libs/map/gps_track.cpp   | 9 ++-------
 libs/map/gps_track.hpp   | 4 ++--
 libs/map/gps_tracker.cpp | 4 ++--
 libs/map/gps_tracker.hpp | 4 ++--
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/libs/map/gps_track.cpp b/libs/map/gps_track.cpp
index 5ecbb5e5d..b39577d89 100644
--- a/libs/map/gps_track.cpp
+++ b/libs/map/gps_track.cpp
@@ -50,20 +50,15 @@ void GpsTrack::AddPoints(vector<location::GpsInfo> const & points)
   ScheduleTask();
 }
 
-/// @note These functions are called during recording, so should be synchronized with Collection writer thread.
-/// @{
-TrackStatistics GpsTrack::GetTrackStatistics()
+TrackStatistics GpsTrack::GetTrackStatistics() const
 {
-  lock_guard<mutex> lg(m_threadGuard);
   return m_collection ? m_collection->GetTrackStatistics() : TrackStatistics();
 }
 
-ElevationInfo const & GpsTrack::GetElevationInfo()
+ElevationInfo const & GpsTrack::GetElevationInfo() const
 {
-  lock_guard<mutex> lg(m_threadGuard);
   return m_collection->UpdateAndGetElevationInfo();
 }
-/// @}
 
 void GpsTrack::Clear()
 {
diff --git a/libs/map/gps_track.hpp b/libs/map/gps_track.hpp
index edfaa5790..493ee0c14 100644
--- a/libs/map/gps_track.hpp
+++ b/libs/map/gps_track.hpp
@@ -31,8 +31,8 @@ public:
   void AddPoints(std::vector<location::GpsInfo> const & points);
 
   /// Returns track statistics
-  TrackStatistics GetTrackStatistics();
-  ElevationInfo const & GetElevationInfo();
+  TrackStatistics GetTrackStatistics() const;
+  ElevationInfo const & GetElevationInfo() const;
 
   /// Clears any previous tracking info
   /// @note Callback is called with 'toRemove' points, if some points were removed.
diff --git a/libs/map/gps_tracker.cpp b/libs/map/gps_tracker.cpp
index f1feeb03d..da29ebfdd 100644
--- a/libs/map/gps_tracker.cpp
+++ b/libs/map/gps_tracker.cpp
@@ -68,12 +68,12 @@ bool GpsTracker::IsEmpty() const
   return m_track.IsEmpty();
 }
 
-TrackStatistics GpsTracker::GetTrackStatistics()
+TrackStatistics GpsTracker::GetTrackStatistics() const
 {
   return m_track.GetTrackStatistics();
 }
 
-ElevationInfo const & GpsTracker::GetElevationInfo()
+ElevationInfo const & GpsTracker::GetElevationInfo() const
 {
   return m_track.GetElevationInfo();
 }
diff --git a/libs/map/gps_tracker.hpp b/libs/map/gps_tracker.hpp
index a72d2bd3d..f0b5cdf36 100644
--- a/libs/map/gps_tracker.hpp
+++ b/libs/map/gps_tracker.hpp
@@ -17,8 +17,8 @@ public:
 
   bool IsEmpty() const;
 
-  TrackStatistics GetTrackStatistics();
-  ElevationInfo const & GetElevationInfo();
+  TrackStatistics GetTrackStatistics() const;
+  ElevationInfo const & GetElevationInfo() const;
 
   using TGpsTrackDiffCallback =
       std::function<void(std::vector<std::pair<size_t, location::GpsInfo>> && toAdd,

From 2dce1193708243555ccdc8fc7a8140ae337d62ed Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Sun, 31 Aug 2025 15:58:44 +0700
Subject: [PATCH 290/302] Revert "[tracks] Fixed ending points."

This reverts commit 64f50d4e49e974f189b7ce0db73a2b9fe7b7805b.
---
 libs/map/bookmark_manager.cpp     |  7 ++-
 libs/map/gps_track.cpp            | 75 +++++++++++++++++--------------
 libs/map/gps_track.hpp            | 13 +++---
 libs/map/gps_track_collection.cpp |  4 ++
 libs/map/gps_track_collection.hpp |  3 +-
 libs/map/gps_track_filter.cpp     | 19 ++------
 libs/map/gps_track_filter.hpp     |  9 ++--
 libs/map/gps_track_storage.cpp    |  6 ++-
 libs/map/gps_track_storage.hpp    |  3 --
 libs/map/gps_tracker.cpp          | 19 +++++++-
 libs/map/gps_tracker.hpp          | 13 ++----
 11 files changed, 88 insertions(+), 83 deletions(-)

diff --git a/libs/map/bookmark_manager.cpp b/libs/map/bookmark_manager.cpp
index 1fa35fbf0..ab7d37faf 100644
--- a/libs/map/bookmark_manager.cpp
+++ b/libs/map/bookmark_manager.cpp
@@ -1097,7 +1097,7 @@ kml::CompilationType BookmarkManager::GetCompilationType(kml::MarkGroupId id) co
 kml::TrackId BookmarkManager::SaveTrackRecording(std::string trackName)
 {
   CHECK_THREAD_CHECKER(m_threadChecker, ());
-  auto & tracker = GpsTracker::Instance();
+  auto const & tracker = GpsTracker::Instance();
   CHECK(!tracker.IsEmpty(), ("Track recording should be not be empty"));
 
   kml::MultiGeometry geometry;
@@ -1105,12 +1105,11 @@ kml::TrackId BookmarkManager::SaveTrackRecording(std::string trackName)
   geometry.m_timestamps.emplace_back();
   auto & line = geometry.m_lines.back();
   auto & timestamps = geometry.m_timestamps.back();
-
-  auto const trackSize = tracker.Finalize();
+  auto const trackSize = tracker.GetTrackSize();
   line.reserve(trackSize);
   timestamps.reserve(trackSize);
 
-  tracker.ForEachTrackPoint([&line, &timestamps](location::GpsInfo const & pt, size_t id)
+  tracker.ForEachTrackPoint([&line, &timestamps](location::GpsInfo const & pt, size_t id) -> bool
   {
     line.emplace_back(mercator::FromLatLon(pt.m_latitude, pt.m_longitude), pt.m_altitude);
     timestamps.emplace_back(pt.m_timestamp);
diff --git a/libs/map/gps_track.cpp b/libs/map/gps_track.cpp
index b39577d89..1c13b724c 100644
--- a/libs/map/gps_track.cpp
+++ b/libs/map/gps_track.cpp
@@ -3,7 +3,36 @@
 #include "base/assert.hpp"
 #include "base/logging.hpp"
 
+#include <algorithm>
+
 using namespace std;
+using namespace std::chrono;
+
+namespace gps_track
+{
+
+inline pair<size_t, size_t> UnionRanges(pair<size_t, size_t> const & a, pair<size_t, size_t> const & b)
+{
+  if (a.first == GpsTrack::kInvalidId)
+  {
+    ASSERT_EQUAL(a.second, GpsTrack::kInvalidId, ());
+    return b;
+  }
+  if (b.first == GpsTrack::kInvalidId)
+  {
+    ASSERT_EQUAL(b.second, GpsTrack::kInvalidId, ());
+    return a;
+  }
+  ASSERT_LESS_OR_EQUAL(a.first, a.second, ());
+  ASSERT_LESS_OR_EQUAL(b.first, b.second, ());
+  return make_pair(min(a.first, b.first), max(a.second, b.second));
+}
+
+size_t constexpr kItemBlockSize = 1000;
+
+}  // namespace gps_track
+
+size_t const GpsTrack::kInvalidId = GpsTrackCollection::kInvalidId;
 
 GpsTrack::GpsTrack(string const & filePath, unique_ptr<IGpsTrackFilter> && filter)
   : m_filePath(filePath)
@@ -70,6 +99,12 @@ void GpsTrack::Clear()
   ScheduleTask();
 }
 
+size_t GpsTrack::GetSize() const
+{
+  CHECK(m_collection != nullptr, ());
+  return m_collection->GetSize();
+}
+
 bool GpsTrack::IsEmpty() const
 {
   if (!m_collection)
@@ -91,7 +126,6 @@ void GpsTrack::ScheduleTask()
 {
   lock_guard<mutex> lg(m_threadGuard);
 
-  /// @todo Replace with !m_thread.joinable() ?
   if (m_thread.get_id() == std::thread::id())
   {
     m_thread = threads::SimpleThread([this]()
@@ -99,16 +133,11 @@ void GpsTrack::ScheduleTask()
       unique_lock<mutex> ul(m_threadGuard);
       while (true)
       {
-        m_cv.wait(ul, [this]() { return m_threadExit || m_threadWakeup; });
-
-        if (m_threadWakeup)
-        {
-          m_threadWakeup = false;
-          ProcessPoints();
-        }
-
+        m_cv.wait(ul, [this]() -> bool { return m_threadExit || m_threadWakeup; });
         if (m_threadExit)
           break;
+        m_threadWakeup = false;
+        ProcessPoints();
       }
 
       m_storage.reset();
@@ -150,7 +179,7 @@ void GpsTrack::InitCollection()
     // and filtered points are inserted in the runtime collection.
 
     vector<location::GpsInfo> originPoints;
-    originPoints.reserve(GpsTrackStorage::kItemBlockSize);
+    originPoints.reserve(gps_track::kItemBlockSize);
 
     m_storage->ForEach([this, &originPoints](location::GpsInfo const & originPoint) -> bool
     {
@@ -210,35 +239,13 @@ void GpsTrack::ProcessPoints()
   vector<location::GpsInfo> points;
   m_filter->Process(originPoints, points);
 
-  pair<size_t, size_t> addedIds, evictedIds;
+  pair<size_t, size_t> addedIds;
+  pair<size_t, size_t> evictedIds;
   UpdateCollection(needClear, points, addedIds, evictedIds);
 
   NotifyCallback(addedIds, evictedIds);
 }
 
-size_t GpsTrack::Finalize()
-{
-  if (m_thread.joinable())
-  {
-    {
-      lock_guard<mutex> lg(m_threadGuard);
-      m_threadWakeup = true;
-      m_threadExit = true;
-      m_cv.notify_one();
-    }
-    m_thread.join();
-    m_thread = {};
-  }
-
-  vector<location::GpsInfo> points;
-  m_filter->Finalize(points);
-
-  if (!points.empty())
-    m_collection->Add(points);
-
-  return m_collection->GetSize();
-}
-
 bool GpsTrack::HasCallback()
 {
   lock_guard<mutex> lg(m_callbackGuard);
diff --git a/libs/map/gps_track.hpp b/libs/map/gps_track.hpp
index 493ee0c14..fb29c4ae1 100644
--- a/libs/map/gps_track.hpp
+++ b/libs/map/gps_track.hpp
@@ -11,12 +11,13 @@
 #include <memory>
 #include <mutex>
 #include <string>
+#include <utility>
 #include <vector>
 
 class GpsTrack final
 {
 public:
-  static size_t constexpr kInvalidId = GpsTrackCollection::kInvalidId;
+  static size_t const kInvalidId;  // = numeric_limits<size_t>::max();
 
   /// @param filePath - path to the file on disk to persist track
   /// @param filter - filter object used for filtering points, GpsTrackNullFilter is created by default
@@ -39,6 +40,7 @@ public:
   void Clear();
 
   bool IsEmpty() const;
+  size_t GetSize() const;
 
   /// Notification callback about a change of the gps track.
   /// @param toAdd - collection of points and ids to add.
@@ -55,13 +57,10 @@ public:
   /// next time callbacks it receives only modifications. It simplifies getter/callback model.
   void SetCallback(TGpsTrackDiffCallback callback);
 
-  size_t Finalize();
-
-  /// @pre Finalize should be called before.
-  template <class FnT>
-  void ForEachPoint(FnT && fn)
+  template <typename F>
+  void ForEachPoint(F && f) const
   {
-    m_collection->ForEach(fn);
+    m_collection->ForEach(std::move(f));
   }
 
 private:
diff --git a/libs/map/gps_track_collection.cpp b/libs/map/gps_track_collection.cpp
index b3a1efca6..461503dfc 100644
--- a/libs/map/gps_track_collection.cpp
+++ b/libs/map/gps_track_collection.cpp
@@ -2,6 +2,8 @@
 
 #include "base/assert.hpp"
 
+#include <algorithm>
+
 namespace
 {
 
@@ -25,6 +27,8 @@ private:
 
 }  // namespace
 
+size_t const GpsTrackCollection::kInvalidId = std::numeric_limits<size_t>::max();
+
 GpsTrackCollection::GpsTrackCollection() : m_lastId(0), m_elevationInfoDirty(true) {}
 
 std::pair<size_t, size_t> GpsTrackCollection::Add(std::vector<TItem> const & items)
diff --git a/libs/map/gps_track_collection.hpp b/libs/map/gps_track_collection.hpp
index f582b65fe..7026a7d9d 100644
--- a/libs/map/gps_track_collection.hpp
+++ b/libs/map/gps_track_collection.hpp
@@ -7,12 +7,13 @@
 
 #include <deque>
 #include <limits>
+#include <utility>
 #include <vector>
 
 class GpsTrackCollection final
 {
 public:
-  static size_t constexpr kInvalidId = std::numeric_limits<size_t>::max();
+  static size_t const kInvalidId;  // = numeric_limits<size_t>::max();
 
   using TItem = location::GpsInfo;
 
diff --git a/libs/map/gps_track_filter.cpp b/libs/map/gps_track_filter.cpp
index 83787f673..0e47508cb 100644
--- a/libs/map/gps_track_filter.cpp
+++ b/libs/map/gps_track_filter.cpp
@@ -9,7 +9,7 @@
 
 namespace
 {
-std::string_view constexpr kMinHorizontalAccuracyKey = "GpsTrackingMinAccuracy";
+char const kMinHorizontalAccuracyKey[] = "GpsTrackingMinAccuracy";
 
 // Minimal horizontal accuracy is required to skip 'bad' points.
 // Use 250 meters to allow points from a pure GPS + GPS through wifi.
@@ -56,7 +56,8 @@ GpsTrackFilter::GpsTrackFilter()
   settings::TryGet(kMinHorizontalAccuracyKey, m_minAccuracy);
 }
 
-void GpsTrackFilter::Process(GpsVectorT const & inPoints, GpsVectorT & outPoints)
+void GpsTrackFilter::Process(std::vector<location::GpsInfo> const & inPoints,
+                             std::vector<location::GpsInfo> & outPoints)
 {
   outPoints.reserve(inPoints.size());
 
@@ -87,20 +88,6 @@ void GpsTrackFilter::Process(GpsVectorT const & inPoints, GpsVectorT & outPoints
   }
 }
 
-void GpsTrackFilter::Finalize(GpsVectorT & outPoints)
-{
-  if (m_countLastInfo > 0)
-  {
-    // Force append the last point, if wasn't added before.
-    auto const & info = GetLastInfo();
-    if (m_countAcceptedInfo == 0 || info.m_timestamp > GetLastAcceptedInfo().m_timestamp)
-    {
-      outPoints.push_back(info);
-      AddLastAcceptedInfo(info);
-    }
-  }
-}
-
 bool GpsTrackFilter::IsGoodVector(location::GpsInfo const & info) const
 {
   ASSERT_GREATER(m_countLastInfo, 1, ());
diff --git a/libs/map/gps_track_filter.hpp b/libs/map/gps_track_filter.hpp
index 65028ab50..1308eeb6d 100644
--- a/libs/map/gps_track_filter.hpp
+++ b/libs/map/gps_track_filter.hpp
@@ -9,16 +9,14 @@ class IGpsTrackFilter
 public:
   virtual ~IGpsTrackFilter() = default;
 
-  using GpsVectorT = std::vector<location::GpsInfo>;
-  virtual void Process(GpsVectorT const & inPoints, GpsVectorT & outPoints) = 0;
-  virtual void Finalize(GpsVectorT & outPoints) {}
+  virtual void Process(std::vector<location::GpsInfo> const & inPoints, std::vector<location::GpsInfo> & outPoints) = 0;
 };
 
 class GpsTrackNullFilter : public IGpsTrackFilter
 {
 public:
   // IGpsTrackFilter overrides
-  void Process(GpsVectorT const & inPoints, GpsVectorT & outPoints) override;
+  void Process(std::vector<location::GpsInfo> const & inPoints, std::vector<location::GpsInfo> & outPoints) override;
 };
 
 class GpsTrackFilter : public IGpsTrackFilter
@@ -30,8 +28,7 @@ public:
   GpsTrackFilter();
 
   // IGpsTrackFilter overrides
-  void Process(GpsVectorT const & inPoints, GpsVectorT & outPoints) override;
-  void Finalize(GpsVectorT & outPoints) override;
+  void Process(std::vector<location::GpsInfo> const & inPoints, std::vector<location::GpsInfo> & outPoints) override;
 
 private:
   bool IsGoodPoint(location::GpsInfo const & info) const;
diff --git a/libs/map/gps_track_storage.cpp b/libs/map/gps_track_storage.cpp
index 31b92dd72..d547eebe1 100644
--- a/libs/map/gps_track_storage.cpp
+++ b/libs/map/gps_track_storage.cpp
@@ -1,12 +1,13 @@
 #include "map/gps_track_storage.hpp"
 
 #include "coding/endianness.hpp"
+#include "coding/internal/file_data.hpp"
 
 #include "base/assert.hpp"
 #include "base/logging.hpp"
 
 #include <algorithm>
-#include <cstring>  // for memcpy
+#include <cstring>
 
 using namespace std;
 
@@ -19,6 +20,9 @@ uint32_t constexpr kCurrentVersion = 1;
 // Header size in bytes, header consists of uint32_t 'version' only
 uint32_t constexpr kHeaderSize = sizeof(uint32_t);
 
+// Number of items for batch processing
+size_t constexpr kItemBlockSize = 1000;
+
 // TODO
 // Now GpsInfo written as plain values, but values can be compressed.
 
diff --git a/libs/map/gps_track_storage.hpp b/libs/map/gps_track_storage.hpp
index fd83bc266..5f3dc7896 100644
--- a/libs/map/gps_track_storage.hpp
+++ b/libs/map/gps_track_storage.hpp
@@ -17,9 +17,6 @@ public:
   DECLARE_EXCEPTION(WriteException, RootException);
   DECLARE_EXCEPTION(ReadException, RootException);
 
-  // Number of items for batch processing.
-  static size_t constexpr kItemBlockSize = 1000;
-
   using TItem = location::GpsInfo;
 
   /// Opens storage with track data.
diff --git a/libs/map/gps_tracker.cpp b/libs/map/gps_tracker.cpp
index da29ebfdd..ca7a17fa8 100644
--- a/libs/map/gps_tracker.cpp
+++ b/libs/map/gps_tracker.cpp
@@ -1,16 +1,20 @@
 #include "map/gps_tracker.hpp"
+#include "map/framework.hpp"
 
 #include "platform/platform.hpp"
-#include "platform/settings.hpp"
 
 #include "base/file_name_utils.hpp"
 
+#include <string>
+
 #include "defines.hpp"
 
+using namespace std::chrono;
+
 namespace
 {
 
-std::string_view constexpr kEnabledKey = "GpsTrackingEnabled";
+char const kEnabledKey[] = "GpsTrackingEnabled";
 
 inline std::string GetFilePath()
 {
@@ -68,6 +72,11 @@ bool GpsTracker::IsEmpty() const
   return m_track.IsEmpty();
 }
 
+size_t GpsTracker::GetTrackSize() const
+{
+  return m_track.GetSize();
+}
+
 TrackStatistics GpsTracker::GetTrackStatistics() const
 {
   return m_track.GetTrackStatistics();
@@ -94,3 +103,9 @@ void GpsTracker::OnLocationUpdated(location::GpsInfo const & info)
     return;
   m_track.AddPoint(info);
 }
+
+void GpsTracker::ForEachTrackPoint(GpsTrackCallback const & callback) const
+{
+  CHECK(callback != nullptr, ("Callback should be provided"));
+  m_track.ForEachPoint(callback);
+}
diff --git a/libs/map/gps_tracker.hpp b/libs/map/gps_tracker.hpp
index f0b5cdf36..05f98269f 100644
--- a/libs/map/gps_tracker.hpp
+++ b/libs/map/gps_tracker.hpp
@@ -4,6 +4,7 @@
 
 #include <atomic>
 #include <functional>
+#include <utility>
 #include <vector>
 
 class GpsTracker
@@ -16,7 +17,7 @@ public:
   void Clear();
 
   bool IsEmpty() const;
-
+  size_t GetTrackSize() const;
   TrackStatistics GetTrackStatistics() const;
   ElevationInfo const & GetElevationInfo() const;
 
@@ -29,14 +30,8 @@ public:
 
   void OnLocationUpdated(location::GpsInfo const & info);
 
-  size_t Finalize() { return m_track.Finalize(); }
-
-  /// @pre Finalize should be called before.
-  template <class FnT>
-  void ForEachTrackPoint(FnT && fn)
-  {
-    m_track.ForEachPoint(fn);
-  }
+  using GpsTrackCallback = std::function<bool(location::GpsInfo const &, size_t)>;
+  void ForEachTrackPoint(GpsTrackCallback const & callback) const;
 
 private:
   GpsTracker();

From 165e8443087e4dd146f4d853b5706f87314ca1bd Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Sun, 31 Aug 2025 15:58:45 +0700
Subject: [PATCH 291/302] Revert "[tracks] Fixed starting points."

This reverts commit fda1da03c8b93ab0b07cf49b917149d688b16532.
---
 libs/map/gps_track_filter.cpp | 59 +++++++++++++++++++----------------
 libs/map/gps_track_filter.hpp |  4 ++-
 2 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/libs/map/gps_track_filter.cpp b/libs/map/gps_track_filter.cpp
index 0e47508cb..16eaec3ed 100644
--- a/libs/map/gps_track_filter.cpp
+++ b/libs/map/gps_track_filter.cpp
@@ -6,6 +6,8 @@
 #include "platform/settings.hpp"
 
 #include "base/assert.hpp"
+#include "base/macros.hpp"
+#include "base/math.hpp"
 
 namespace
 {
@@ -78,34 +80,37 @@ void GpsTrackFilter::Process(std::vector<location::GpsInfo> const & inPoints,
     if (!currInfo.HasSpeed())
       continue;
 
-    if (m_countAcceptedInfo == 0 || (IsGoodPoint(currInfo) && (m_countLastInfo < 2 || IsGoodVector(currInfo))))
+    if (m_countAcceptedInfo < 2 || currInfo.m_timestamp < GetLastAcceptedInfo().m_timestamp)
     {
-      outPoints.emplace_back(currInfo);
+      AddLastInfo(currInfo);
       AddLastAcceptedInfo(currInfo);
+      continue;
+    }
+
+    if (IsGoodPoint(currInfo))
+    {
+      double const predictionDistance = GetDistance(m_lastInfo[1], m_lastInfo[0]);  // meters
+      double const realDistance = GetDistance(m_lastInfo[0], currInfo);             // meters
+
+      m2::PointD const predictionDirection = GetDirection(m_lastInfo[1], m_lastInfo[0]);
+      m2::PointD const realDirection = GetDirection(m_lastInfo[0], currInfo);
+
+      // Cosine of angle between prediction direction and real direction is
+      double const cosine = m2::DotProduct(predictionDirection, realDirection);
+
+      // Acceptable angle must be from 0 to 45 or from 0 to -45.
+      // Acceptable distance must be not great than 2x than predicted, otherwise it is jump.
+      if (cosine >= kCosine45degrees && realDistance <= std::max(kClosePointDistanceMeters, 2. * predictionDistance))
+      {
+        outPoints.emplace_back(currInfo);
+        AddLastAcceptedInfo(currInfo);
+      }
     }
 
     AddLastInfo(currInfo);
   }
 }
 
-bool GpsTrackFilter::IsGoodVector(location::GpsInfo const & info) const
-{
-  ASSERT_GREATER(m_countLastInfo, 1, ());
-
-  double const predictionDistance = GetDistance(m_lastInfo[1], m_lastInfo[0]);  // meters
-  double const realDistance = GetDistance(m_lastInfo[0], info);                 // meters
-
-  m2::PointD const predictionDirection = GetDirection(m_lastInfo[1], m_lastInfo[0]);
-  m2::PointD const realDirection = GetDirection(m_lastInfo[0], info);
-
-  // Cosine of angle between prediction direction and real direction is
-  double const cosine = m2::DotProduct(predictionDirection, realDirection);
-
-  // Acceptable angle must be from 0 to 45 or from 0 to -45.
-  // Acceptable distance must be not great than 2x than predicted, otherwise it is jump.
-  return (cosine >= kCosine45degrees && realDistance <= std::max(kClosePointDistanceMeters, 2. * predictionDistance));
-}
-
 bool GpsTrackFilter::IsGoodPoint(location::GpsInfo const & info) const
 {
   // Filter by point accuracy
@@ -115,11 +120,6 @@ bool GpsTrackFilter::IsGoodPoint(location::GpsInfo const & info) const
   auto const & lastInfo = GetLastInfo();
   auto const & lastAcceptedInfo = GetLastAcceptedInfo();
 
-  // Time spend to move from the last point to the current point, sec:
-  double const timeFromLast = info.m_timestamp - lastInfo.m_timestamp;
-  if (timeFromLast <= 0.0)
-    return false;
-
   // Distance in meters between last accepted and current point is, meters:
   double const distanceFromLastAccepted = GetDistance(lastAcceptedInfo, info);
 
@@ -135,6 +135,11 @@ bool GpsTrackFilter::IsGoodPoint(location::GpsInfo const & info) const
   // Distance in meters between last and current point is, meters:
   double const distanceFromLast = GetDistance(lastInfo, info);
 
+  // Time spend to move from the last point to the current point, sec:
+  double const timeFromLast = info.m_timestamp - lastInfo.m_timestamp;
+  if (timeFromLast <= 0.0)
+    return false;
+
   // Speed to move from the last point to the current point
   double const speedFromLast = distanceFromLast / timeFromLast;
 
@@ -162,12 +167,12 @@ void GpsTrackFilter::AddLastInfo(location::GpsInfo const & info)
 {
   m_lastInfo[1] = m_lastInfo[0];
   m_lastInfo[0] = info;
-  ++m_countLastInfo;
+  m_countLastInfo += 1;
 }
 
 void GpsTrackFilter::AddLastAcceptedInfo(location::GpsInfo const & info)
 {
   m_lastAcceptedInfo[1] = m_lastAcceptedInfo[0];
   m_lastAcceptedInfo[0] = info;
-  ++m_countAcceptedInfo;
+  m_countAcceptedInfo += 1;
 }
diff --git a/libs/map/gps_track_filter.hpp b/libs/map/gps_track_filter.hpp
index 1308eeb6d..f31109943 100644
--- a/libs/map/gps_track_filter.hpp
+++ b/libs/map/gps_track_filter.hpp
@@ -2,6 +2,9 @@
 
 #include "platform/location.hpp"
 
+#include "geometry/latlon.hpp"
+
+#include <cstddef>
 #include <vector>
 
 class IGpsTrackFilter
@@ -32,7 +35,6 @@ public:
 
 private:
   bool IsGoodPoint(location::GpsInfo const & info) const;
-  bool IsGoodVector(location::GpsInfo const & info) const;
 
   location::GpsInfo const & GetLastInfo() const;
   location::GpsInfo const & GetLastAcceptedInfo() const;

From e117be1816516887a667ac22a341c013f24a227e Mon Sep 17 00:00:00 2001
From: Matheus Gomes <matheus.gomes03@hotmail.com>
Date: Fri, 29 Aug 2025 16:44:14 +0200
Subject: [PATCH 292/302] [ios] Fix Define Roads to Avoid button

Fixes #1670

Signed-off-by: Matheus Gomes <matheusgomesms@noreply.codeberg.org>
---
 .../MWMNavigationDashboardManager.mm               | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
index 6bf6a0567..a7a4be5c0 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardManager.mm
@@ -117,10 +117,18 @@ NSString *const kNavigationControlViewXibName = @"NavigationControlView";
 - (void)onRouteReady:(BOOL)hasWarnings {
   if (self.state != MWMNavigationDashboardStateNavigation)
     self.state = MWMNavigationDashboardStateReady;
-  if ([MWMRouter hasActiveDrivingOptions]) {
-    self.routePreview.drivingOptionsState = MWMDrivingOptionsStateChange;
+
+  MWMRouterType const routerType = [MWMRouter type];
+  if (routerType == MWMRouterTypePublicTransport || routerType == MWMRouterTypeRuler) {
+    // For Public Transport and Ruler modes, there are no road restrictions, so always hide the button.
+    self.routePreview.drivingOptionsState = MWMDrivingOptionsStateNone;
   } else {
-    self.routePreview.drivingOptionsState = hasWarnings ? MWMDrivingOptionsStateDefine : MWMDrivingOptionsStateNone;
+    // For all other modes (Vehicle, Pedestrian, Bicycle), show the button.
+    if ([MWMRouter hasActiveDrivingOptions]) {
+      self.routePreview.drivingOptionsState = MWMDrivingOptionsStateChange;
+    } else {
+      self.routePreview.drivingOptionsState = MWMDrivingOptionsStateDefine;
+    }
   }
 }
 

From 728d0ad806aa50f858c994aa5f455bc59b122af7 Mon Sep 17 00:00:00 2001
From: Yannik Bloscheck <git@yannikbloscheck.com>
Date: Fri, 29 Aug 2025 17:19:53 +0200
Subject: [PATCH 293/302] [ios] Increase tapable area of driving options button

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
---
 .../Views/RoutePreview/MWMiPadRoutePreview.xib | 18 ++++++++++--------
 .../RoutePreview/MWMiPhoneRoutePreview.xib     | 13 ++++++++-----
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.xib
index 1dbddc122..acc6ac805 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.xib
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPadRoutePreview.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23727" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23721"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -37,7 +37,7 @@
                     <rect key="frame" x="0.0" y="68" width="320" height="48"/>
                     <subviews>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Opi-yT-xIZ">
-                            <rect key="frame" x="72.5" y="12" width="175" height="24"/>
+                            <rect key="frame" x="0.0" y="0.0" width="320" height="48"/>
                             <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="12"/>
                             <state key="normal" title="DEFINE ROADS TO AVOID" image="ic_options_warning"/>
                             <connections>
@@ -50,9 +50,11 @@
                     <constraints>
                         <constraint firstItem="Opi-yT-xIZ" firstAttribute="centerX" secondItem="l7E-Ns-2Nn" secondAttribute="centerX" id="5DK-9d-8qb"/>
                         <constraint firstItem="Opi-yT-xIZ" firstAttribute="centerY" secondItem="l7E-Ns-2Nn" secondAttribute="centerY" id="JFn-Vg-Wby"/>
-                        <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Opi-yT-xIZ" secondAttribute="trailing" constant="16" id="aCy-jn-U2B"/>
+                        <constraint firstItem="THL-V3-3xS" firstAttribute="bottom" secondItem="Opi-yT-xIZ" secondAttribute="bottom" id="LbO-Ze-Pwl"/>
+                        <constraint firstItem="Opi-yT-xIZ" firstAttribute="top" secondItem="THL-V3-3xS" secondAttribute="top" id="OnE-Yh-Inw"/>
+                        <constraint firstAttribute="trailing" secondItem="Opi-yT-xIZ" secondAttribute="trailing" id="aCy-jn-U2B"/>
                         <constraint firstAttribute="height" constant="48" id="mCi-1V-xX4"/>
-                        <constraint firstItem="Opi-yT-xIZ" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="l7E-Ns-2Nn" secondAttribute="leading" constant="16" id="vdk-Ef-Kk1"/>
+                        <constraint firstItem="Opi-yT-xIZ" firstAttribute="leading" secondItem="l7E-Ns-2Nn" secondAttribute="leading" id="vdk-Ef-Kk1"/>
                     </constraints>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SecondaryBackground"/>
@@ -139,10 +141,10 @@
                             </constraints>
                             <variation key="default">
                                 <mask key="constraints">
-                                    <exclude reference="BWr-hr-pwo"/>
                                     <exclude reference="Cd3-ev-uFS"/>
-                                    <exclude reference="Zs5-bj-AR6"/>
                                     <exclude reference="qTV-BL-cX4"/>
+                                    <exclude reference="BWr-hr-pwo"/>
+                                    <exclude reference="Zs5-bj-AR6"/>
                                 </mask>
                             </variation>
                         </view>
@@ -282,7 +284,7 @@
                                     </userDefinedRuntimeAttributes>
                                 </view>
                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NAs-km-8uw">
-                                    <rect key="frame" x="20" y="12" width="127" height="24"/>
+                                    <rect key="frame" x="20" y="12" width="119" height="24"/>
                                     <state key="normal" title="ManageRoute" image="ic_24px_manager"/>
                                     <userDefinedRuntimeAttributes>
                                         <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="medium14:MWMBlack"/>
diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.xib b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.xib
index e895d10db..86699c3a5 100644
--- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.xib
+++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.xib
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23727" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23721"/>
+        <capability name="Image references" minToolsVersion="12.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -25,7 +26,7 @@
                     <rect key="frame" x="0.0" y="48" width="320" height="48"/>
                     <subviews>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" adjustsImageWhenHighlighted="NO" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ZXA-Og-q2I">
-                            <rect key="frame" x="72.5" y="12" width="175" height="24"/>
+                            <rect key="frame" x="0.0" y="0.0" width="320" height="48"/>
                             <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="12"/>
                             <state key="normal" title="DEFINE ROADS TO AVOID" image="ic_options_warning"/>
                             <connections>
@@ -35,11 +36,13 @@
                     </subviews>
                     <color key="backgroundColor" red="0.12156862745098039" green="0.59999999999999998" blue="0.32156862745098036" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>
-                        <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="ZXA-Og-q2I" secondAttribute="trailing" constant="16" id="9bx-3j-h0U"/>
-                        <constraint firstItem="ZXA-Og-q2I" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Ib5-qh-Cmo" secondAttribute="leading" constant="16" id="IYq-Pa-Tai"/>
+                        <constraint firstAttribute="trailing" secondItem="ZXA-Og-q2I" secondAttribute="trailing" id="9bx-3j-h0U"/>
+                        <constraint firstItem="ZXA-Og-q2I" firstAttribute="leading" secondItem="Ib5-qh-Cmo" secondAttribute="leading" id="IYq-Pa-Tai"/>
                         <constraint firstItem="ZXA-Og-q2I" firstAttribute="centerX" secondItem="Ib5-qh-Cmo" secondAttribute="centerX" id="Uq2-QA-bWZ"/>
+                        <constraint firstAttribute="bottom" secondItem="ZXA-Og-q2I" secondAttribute="bottom" id="ga1-Mh-GwC"/>
                         <constraint firstItem="ZXA-Og-q2I" firstAttribute="centerY" secondItem="Ib5-qh-Cmo" secondAttribute="centerY" id="l5z-Dg-joz"/>
                         <constraint firstAttribute="height" constant="48" id="l8l-Ii-g5U"/>
+                        <constraint firstItem="ZXA-Og-q2I" firstAttribute="top" secondItem="Ib5-qh-Cmo" secondAttribute="top" id="oca-09-5v4"/>
                     </constraints>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="string" keyPath="styleName" value="SecondaryBackground"/>

From 19e1c4b90e9d75fdd723a869b0b2e4d642b22ac8 Mon Sep 17 00:00:00 2001
From: Yannik Bloscheck <git@yannikbloscheck.com>
Date: Sat, 30 Aug 2025 13:55:05 +0200
Subject: [PATCH 294/302] [ios] Added recalculate route on route option changes

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
---
 iphone/Maps/Core/Routing/MWMRouter.mm |  6 +++++-
 iphone/Maps/Model/Settings.swift      | 12 ++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/iphone/Maps/Core/Routing/MWMRouter.mm b/iphone/Maps/Core/Routing/MWMRouter.mm
index 8f986da84..e1acb63ef 100644
--- a/iphone/Maps/Core/Routing/MWMRouter.mm
+++ b/iphone/Maps/Core/Routing/MWMRouter.mm
@@ -146,6 +146,10 @@ char const *kRenderAltitudeImagesQueueLabel = "mapsme.mwmrouter.renderAltitudeIm
     _canAutoAddLastLocation = YES;
     _routingOptions = [MWMRoutingOptions new];
     _isRestoreProcessCompleted = NO;
+
+    [NSNotificationCenter.defaultCenter addObserverForName:@"RoutingOptionsChanged" object:nil queue:nil usingBlock:^(NSNotification * _Nonnull notification) {
+      [MWMRouter updateRoute];
+    }];
   }
   return self;
 }
@@ -570,7 +574,7 @@ char const *kRenderAltitudeImagesQueueLabel = "mapsme.mwmrouter.renderAltitudeIm
 
 + (void)updateRoute {
   MWMRoutingOptions *newOptions = [MWMRoutingOptions new];
-  if ((self.isRoutingActive && !self.isOnRoute) && ![newOptions isEqual:[self router].routingOptions]) {
+  if (self.isRoutingActive && !self.isOnRoute && ![newOptions isEqual:[self router].routingOptions]) {
     [self rebuildWithBestRouter:YES];
   }
 }
diff --git a/iphone/Maps/Model/Settings.swift b/iphone/Maps/Model/Settings.swift
index d04623fb2..ba008c58e 100644
--- a/iphone/Maps/Model/Settings.swift
+++ b/iphone/Maps/Model/Settings.swift
@@ -4,6 +4,10 @@ import Combine
 @objc class Settings: NSObject {
     // MARK: Properties
     
+    // The notification name for changed routing options
+    static let routingOptionsChangedNotificationName: Notification.Name = Notification.Name(rawValue: "RoutingOptionsChanged")
+    
+    
     /// Key for storing if the sync beta alert has been shown in the user defaults
     static private let userDefaultsKeyHasShownSyncBetaAlert = "kUDDidShowICloudSynchronizationEnablingAlert"
     
@@ -352,6 +356,8 @@ import Combine
             let routingOptions = RoutingOptions()
             routingOptions.avoidToll = newValue
             routingOptions.save()
+            
+            NotificationCenter.default.post(name: routingOptionsChangedNotificationName, object: nil)
         }
     }
     
@@ -365,6 +371,8 @@ import Combine
             let routingOptions = RoutingOptions()
             routingOptions.avoidDirty = newValue
             routingOptions.save()
+            
+            NotificationCenter.default.post(name: routingOptionsChangedNotificationName, object: nil)
         }
     }
     
@@ -378,6 +386,8 @@ import Combine
             let routingOptions = RoutingOptions()
             routingOptions.avoidFerry = newValue
             routingOptions.save()
+            
+            NotificationCenter.default.post(name: routingOptionsChangedNotificationName, object: nil)
         }
     }
     
@@ -391,6 +401,8 @@ import Combine
             let routingOptions = RoutingOptions()
             routingOptions.avoidMotorway = newValue
             routingOptions.save()
+            
+            NotificationCenter.default.post(name: routingOptionsChangedNotificationName, object: nil)
         }
     }
     

From 622b97e84c1d869dad12394c3d94219e117baef9 Mon Sep 17 00:00:00 2001
From: Harry Bond <me@hbond.xyz>
Date: Sun, 31 Aug 2025 13:14:47 +0100
Subject: [PATCH 295/302] [android] Fix metadata to pass CI check

Signed-off-by: Harry Bond <me@hbond.xyz>
---
 .../play/listings/bn-BD/short-description.txt |  1 +
 .../src/fdroid/play/listings/bn-BD/title.txt  |  1 +
 .../play/listings/bn/short-description.txt    |  1 -
 .../app/src/fdroid/play/listings/bn/title.txt |  1 -
 .../src/fdroid/play/listings/fa-IR/title.txt  |  2 +-
 .../app/src/fdroid/play/listings/hr/title.txt |  2 +-
 .../play/listings/ia/short-description.txt    |  1 -
 .../play/listings/pt/full-description.txt     | 32 -------------------
 .../play/listings/pt/short-description.txt    |  1 -
 .../app/src/fdroid/play/listings/pt/title.txt |  1 -
 .../app/src/fdroid/play/listings/ro/title.txt |  2 +-
 11 files changed, 5 insertions(+), 40 deletions(-)
 create mode 100644 android/app/src/fdroid/play/listings/bn-BD/short-description.txt
 create mode 100644 android/app/src/fdroid/play/listings/bn-BD/title.txt
 delete mode 100644 android/app/src/fdroid/play/listings/bn/short-description.txt
 delete mode 100644 android/app/src/fdroid/play/listings/bn/title.txt
 delete mode 100644 android/app/src/fdroid/play/listings/ia/short-description.txt
 delete mode 100644 android/app/src/fdroid/play/listings/pt/full-description.txt
 delete mode 100644 android/app/src/fdroid/play/listings/pt/short-description.txt
 delete mode 100644 android/app/src/fdroid/play/listings/pt/title.txt

diff --git a/android/app/src/fdroid/play/listings/bn-BD/short-description.txt b/android/app/src/fdroid/play/listings/bn-BD/short-description.txt
new file mode 100644
index 000000000..8535fd3f4
--- /dev/null
+++ b/android/app/src/fdroid/play/listings/bn-BD/short-description.txt
@@ -0,0 +1 @@
+মানচিত্র নেভিগেশন - আপনার যাত্রা সম্পর্কে আরও জানুন - সম্প্রদায় কর্তৃক পরিচালিত
diff --git a/android/app/src/fdroid/play/listings/bn-BD/title.txt b/android/app/src/fdroid/play/listings/bn-BD/title.txt
new file mode 100644
index 000000000..608379a9f
--- /dev/null
+++ b/android/app/src/fdroid/play/listings/bn-BD/title.txt
@@ -0,0 +1 @@
+কোম্যাপস - অফলাইনে হাইকিং, সাইকেলিং ও ড্রাইভিং
diff --git a/android/app/src/fdroid/play/listings/bn/short-description.txt b/android/app/src/fdroid/play/listings/bn/short-description.txt
deleted file mode 100644
index aac6a2300..000000000
--- a/android/app/src/fdroid/play/listings/bn/short-description.txt
+++ /dev/null
@@ -1 +0,0 @@
-সহজ মানচিত্র নেভিগেশন - আপনার যাত্রা সম্পর্কে আরও জানুন - সম্প্রদায় কর্তৃক পরিচালিত
diff --git a/android/app/src/fdroid/play/listings/bn/title.txt b/android/app/src/fdroid/play/listings/bn/title.txt
deleted file mode 100644
index 6123e8757..000000000
--- a/android/app/src/fdroid/play/listings/bn/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-কোম্যাপস - অফলাইনে হাইকিং, সাইকেলিং এবং ড্রাইভিং করুন গোপনীয়তা সহ
diff --git a/android/app/src/fdroid/play/listings/fa-IR/title.txt b/android/app/src/fdroid/play/listings/fa-IR/title.txt
index 4c116ac10..b9a08c074 100644
--- a/android/app/src/fdroid/play/listings/fa-IR/title.txt
+++ b/android/app/src/fdroid/play/listings/fa-IR/title.txt
@@ -1 +1 @@
-CoMaps - کوه نوردی، دوچرخه سواری و رانندگی افلاین و خصوصی
+CoMaps - کوه‌نوردی، دوچرخه‌سواری و رانندگی آفلاین
diff --git a/android/app/src/fdroid/play/listings/hr/title.txt b/android/app/src/fdroid/play/listings/hr/title.txt
index 2d3b475da..01d072b91 100644
--- a/android/app/src/fdroid/play/listings/hr/title.txt
+++ b/android/app/src/fdroid/play/listings/hr/title.txt
@@ -1 +1 @@
-CoMaps - Pješačite, biciklirajte, vozite Offline i privatno
+CoMaps - Pješačite, biciklirajte, vozite Offline
diff --git a/android/app/src/fdroid/play/listings/ia/short-description.txt b/android/app/src/fdroid/play/listings/ia/short-description.txt
deleted file mode 100644
index df5517d58..000000000
--- a/android/app/src/fdroid/play/listings/ia/short-description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Navigation facile del mappa – Discoperi tu viage – Alimentate per le communitate
diff --git a/android/app/src/fdroid/play/listings/pt/full-description.txt b/android/app/src/fdroid/play/listings/pt/full-description.txt
deleted file mode 100644
index 4e1476fbf..000000000
--- a/android/app/src/fdroid/play/listings/pt/full-description.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-Um aplicativo de mapas gratuito e de código aberto, liderado pela comunidade, baseado em dados do OpenStreetMap e reforçado pelo compromisso com a transparência, privacidade e sem fins lucrativos. O CoMaps é um fork/spin-off do Organic Maps, que por sua vez é um fork do Maps.ME.
-
-Leia mais sobre os motivos do projeto e sua direção em <b><i>codeberg.org/comaps</i></b>.
-Junte-se à comunidade e ajude a criar o melhor aplicativo de mapas.
-• Use o aplicativo e divulgue-o.
-• Envie feedback e relate problemas.
-• Atualize os dados do mapa no aplicativo ou no site do OpenStreetMap.
-
-‣ <b>Foco offline</b>: Planeje e navegue em sua viagem ao exterior sem a necessidade de sinal de celular, pesquise pontos de referência durante uma caminhada distante, etc. Todas as funções do aplicativo foram projetadas para funcionar offline.
-‣ <b>Respeitando a privacidade</b>: O aplicativo foi projetado com a privacidade em mente - não identifica pessoas, não rastreia e não coleta informações pessoais. Sem anúncios.
-‣ <b>Simples e sofisticado</b>: recursos essenciais e fáceis de usar que simplesmente funcionam.
-‣ <b>Economiza bateria e espaço</b>: Não consome muita bateria como outros aplicativos de navegação. Mapas compactos economizam espaço precioso no seu celular.
-‣ <b>Gratuito e desenvolvido pela comunidade</b>: Pessoas como você ajudaram a desenvolver o aplicativo adicionando lugares ao OpenStreetMap, testando e dando feedback sobre os recursos e contribuindo com suas habilidades de desenvolvimento e dinheiro.
-‣ <b>Tomada de decisões e finanças abertas e transparentes, sem fins lucrativos e totalmente de código aberto.</b>
-
-<b>Principais recursos</b>:
-• Mapas detalhados para download com locais não disponíveis no Google Maps
-• Modo ao ar livre com trilhas em destaque, acampamentos, fontes de água, picos, curvas de nível, etc.
-• Trilhas para caminhada e ciclovias
-• Pontos de interesse como restaurantes, postos de gasolina, hotéis, lojas, pontos turísticos e muito mais
-• Pesquise por nome, endereço ou por categoria de ponto de interesse
-• Navegação com anúncios de voz para caminhadas, ciclismo ou direção
-• Marque seus lugares favoritos com um único toque
-• Artigos offline da Wikipédia
-• Camada e direções de transporte público do metrô
-• Gravação de trilhas
-• Exporte e importe favoritos e trilhas nos formatos KML, KMZ e GPX
-• Um modo escuro para usar à noite
-• Aprimore os dados do mapa para todos usando um editor básico integrado
-
-<b>A Liberdade Chegou</b>
-Descubra sua jornada, navegue pelo mundo com privacidade e comunidade em primeiro lugar!
diff --git a/android/app/src/fdroid/play/listings/pt/short-description.txt b/android/app/src/fdroid/play/listings/pt/short-description.txt
deleted file mode 100644
index fb5a97658..000000000
--- a/android/app/src/fdroid/play/listings/pt/short-description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Navegação fácil nos mapas - Descubra mais sobre o seu percurso - Feito por todos
diff --git a/android/app/src/fdroid/play/listings/pt/title.txt b/android/app/src/fdroid/play/listings/pt/title.txt
deleted file mode 100644
index e7d14d499..000000000
--- a/android/app/src/fdroid/play/listings/pt/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-CoMaps - Mapas e Navegação - Offline e Privada
diff --git a/android/app/src/fdroid/play/listings/ro/title.txt b/android/app/src/fdroid/play/listings/ro/title.txt
index 920d58402..7d5b5ad93 100644
--- a/android/app/src/fdroid/play/listings/ro/title.txt
+++ b/android/app/src/fdroid/play/listings/ro/title.txt
@@ -1 +1 @@
-CoMaps - Drumeții, Ciclism, Condus Offline în confidențialitate
+CoMaps - călătorește offline cu confidențialitate

From 7d82c6ffaecb59f55a11d4c357e164531143b431 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Sun, 31 Aug 2025 12:25:27 +0700
Subject: [PATCH 296/302] [android] Add back the Edit Bookmark button

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 .../sections/PlacePageBookmarkFragment.java   | 25 ++++++++++++++++++-
 .../layout/place_page_bookmark_fragment.xml   | 16 +++++++++++-
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java
index f480e38c4..157bcebc0 100644
--- a/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java
+++ b/android/app/src/main/java/app/organicmaps/widget/placepage/sections/PlacePageBookmarkFragment.java
@@ -16,18 +16,22 @@ import android.widget.LinearLayout;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import app.organicmaps.R;
 import app.organicmaps.sdk.bookmarks.data.Bookmark;
+import app.organicmaps.sdk.bookmarks.data.BookmarkManager;
 import app.organicmaps.sdk.bookmarks.data.MapObject;
 import app.organicmaps.sdk.util.StringUtils;
 import app.organicmaps.util.UiUtils;
 import app.organicmaps.util.Utils;
+import app.organicmaps.widget.placepage.EditBookmarkFragment;
 import app.organicmaps.widget.placepage.PlacePageViewModel;
 import com.google.android.material.textview.MaterialTextView;
 
-public class PlacePageBookmarkFragment extends Fragment implements View.OnLongClickListener, Observer<MapObject>
+public class PlacePageBookmarkFragment extends Fragment implements View.OnClickListener, View.OnLongClickListener,
+                                                                   Observer<MapObject>, EditBookmarkFragment.EditBookmarkListener
 {
   private View mFrame;
   private MaterialTextView mTvBookmarkNote;
@@ -55,6 +59,8 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnLongCl
     mFrame = view;
     mTvBookmarkNote = mFrame.findViewById(R.id.tv__bookmark_notes);
     mTvBookmarkNote.setOnLongClickListener(this);
+    final View editBookmarkBtn = mFrame.findViewById(R.id.tv__bookmark_edit);
+    editBookmarkBtn.setOnClickListener(this);
   }
 
   private void initWebView()
@@ -112,6 +118,14 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnLongCl
     }
   }
 
+  @Override
+  public void onClick(View v)
+  {
+    final FragmentActivity activity = requireActivity();
+    EditBookmarkFragment.editBookmark(currentBookmark.getCategoryId(), currentBookmark.getBookmarkId(), activity,
+                                      getChildFragmentManager(), PlacePageBookmarkFragment.this);
+  }
+
   @Override
   public boolean onLongClick(View v)
   {
@@ -141,4 +155,13 @@ public class PlacePageBookmarkFragment extends Fragment implements View.OnLongCl
       updateBookmarkDetails();
     }
   }
+
+  @Override
+  public void onBookmarkSaved(long bookmarkId, boolean movedFromCategory)
+  {
+    Bookmark updatedBookmark = BookmarkManager.INSTANCE.updateBookmarkPlacePage(bookmarkId);
+    if (updatedBookmark == null)
+      return;
+    mViewModel.setMapObject(updatedBookmark);
+  }
 }
diff --git a/android/app/src/main/res/layout/place_page_bookmark_fragment.xml b/android/app/src/main/res/layout/place_page_bookmark_fragment.xml
index bfb54f8bc..62a4fd16d 100644
--- a/android/app/src/main/res/layout/place_page_bookmark_fragment.xml
+++ b/android/app/src/main/res/layout/place_page_bookmark_fragment.xml
@@ -11,9 +11,23 @@
     android:id="@+id/tv__bookmark_notes"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="@dimen/margin_base"
+    android:layout_marginBottom="@dimen/margin_half"
     android:layout_marginEnd="@dimen/margin_base"
     android:layout_marginStart="@dimen/margin_base"
+    android:layout_marginTop="@dimen/margin_base"
     android:textAppearance="?android:attr/textAppearance"
     tools:text="Long, long text Long, long text Long, long text Long, long text Long, long text Long, long text "/>
+
+  <com.google.android.material.textview.MaterialTextView
+      android:id="@+id/tv__bookmark_edit"
+      style="@style/PlacePageMetadataText.Button"
+      android:gravity="center"
+      android:layout_height="@dimen/height_block_base"
+      android:background="?clickableBackground"
+      android:paddingEnd="@dimen/margin_base"
+      android:paddingStart="@dimen/margin_base"
+      android:text="@string/placepage_edit_bookmark_button"/>
+
+  <include
+    layout="@layout/divider_horizontal"/>
 </LinearLayout>

From 186c326e2bc65f3731308aa2b330f6652911e58e Mon Sep 17 00:00:00 2001
From: x7z4w <x7z4w@noreply.codeberg.org>
Date: Sun, 31 Aug 2025 17:27:18 +0200
Subject: [PATCH 297/302] [docs] Update

Signed-off-by: x7z4w <x7z4w@noreply.codeberg.org>
---
 docs/CPP_STYLE.md | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/docs/CPP_STYLE.md b/docs/CPP_STYLE.md
index f0f4c4b6c..736093a4f 100644
--- a/docs/CPP_STYLE.md
+++ b/docs/CPP_STYLE.md
@@ -1,18 +1,23 @@
-# C++ Style Guide
+Most of our coding style is specified in a configuration file for [ClangFormat](http://clang.llvm.org/docs/ClangFormat.html).
+To automatically format a file, install `clang-format` and run:
+
+    clang-format -i file.cpp file.hpp other_file.cpp
+
+---
 
 In general, [Google's coding standard](https://google.github.io/styleguide/cppguide.html) is used, and we strongly encourage to read it.
 
 Below are our specific (but not all!) exceptions to the Google's coding standard:
 
-- All C++ code should conform to the C++20 standard.
+- All C++ code should conform to the C++23 standard.
 - We use `.cpp` and `.hpp` files, not `.cc` and `.h` (`.c` and `.h` are used for C code), in UTF-8 encoding.
 - File names are lowercase with underscores, like `file_reader.cpp`.
 - We use `#pragma once` instead of the `#define` Guard in header files.
 - Includes are sorted and grouped by directory, there should be newlines between different directories.
 - Order of directories in includes: "current_dir/current_file.hpp", includes from other dirs sorted by dependencies (e.g. indexer, then coding, then base), "defines.hpp", C++ standard library headers, boost headers, 3party.
 - We ARE using C++ exceptions.
-- We are using all features of C++17 and C++20 except std::filesystem, std::to_chars & std::from_chars which are not fully supported on all platforms.
-- We try to limit the usage of boost libraries which require linking (and prefer C++20 types over their boost counterparts).
+- We are using all features of C++17 and C++23 except std::filesystem, std::to_chars & std::from_chars which are not fully supported on all platforms.
+- We try to limit the usage of boost libraries which require linking (and prefer C++23 types over their boost counterparts).
 
 Naming and formatting
 
@@ -21,7 +26,7 @@ Naming and formatting
 - Doxygen-style comments can be used.
 - Underscores are allowed only in prefixes for member variables and namespace names, like `int m_countriesCount; namespace utf_parser`.
 - Use right-to-left order for variables/params: `string const & s` (reference to the const string).
-- In one line `if`, `for`, `while` we do not use brackets. If one line `for` or `while` is combined with one line `if`, do use brackets for cycle.
+- In one line `if`, `for`, `while` we do not use brackets, even if a one line `for` or `while` is combined with one line `if`.
 - Space after the keyword in conditions and loops. Space after `;` in `for` loop.
 - Space between binary operators: `x = y * y + z * z`.
 - Space after double dash.
@@ -36,13 +41,6 @@ Naming and formatting
 
 **We write code without warnings!**
 
-## ClangFormat
-
-Most of our coding style is specified in a configuration file for [ClangFormat](http://clang.llvm.org/docs/ClangFormat.html).
-To automatically format a file, install `clang-format` and run:
-
-    clang-format -i file.cpp file.hpp other_file.cpp
-
 ## Formatting Example/Guide/Reference
 
 ```cpp
@@ -154,10 +152,8 @@ for (size_t i = 0; i < size; ++i)
   foo(i);
 
 while (true)
-{
   if (condition)
     break;
-}
 
 // Space after the keyword.
 if (condition)
@@ -195,7 +191,7 @@ v = w * (x + z);
 
 - If you see outdated code which can be improved, DO IT NOW (but in a separate pull request or commit)!
 - Your code should work at least on [mac|linux|android][x86|x86_64], [ios|android][x86|armv7|arm64] architectures
-- Your code should compile with C++20 compiler
+- Your code should compile with C++23 compiler
 - Avoid using any new 3party library if it is not fully tested and supported on all our platforms
 - Cover your code with unit tests. See examples for existing libraries
 - Check Base and Coding libraries for most of the basic functions

From 4953da4ecf73c3a6edb7d54812a6add2f2cc7312 Mon Sep 17 00:00:00 2001
From: Codeberg Translate <translate@codeberg.org>
Date: Sun, 31 Aug 2025 15:24:50 +0000
Subject: [PATCH 298/302] [strings] Update from Codeberg Translate

Co-authored-by: Codeberg Translate <translate@codeberg.org>
Co-authored-by: Gunny13 <gunny13@noreply.codeberg.org>
Co-authored-by: Outbreak2096 <outbreak2096@noreply.codeberg.org>
Co-authored-by: Prefill add-on <noreply-addon-prefill@weblate.org>
Co-authored-by: Weblate Translation Memory <noreply-mt-weblate-translation-memory@weblate.org>
Co-authored-by: lejun <lejun@noreply.codeberg.org>
Co-authored-by: matheusgomesms <matheusgomesms@noreply.codeberg.org>
Co-authored-by: metehan <metehan@noreply.codeberg.org>
Co-authored-by: oleg-rswll <oleg-rswll@noreply.codeberg.org>
Co-authored-by: relet <relet@noreply.codeberg.org>
Co-authored-by: sziatomi <sziatomi@noreply.codeberg.org>
Translation: CoMaps/Android - Map Feature Types
Translation: CoMaps/Android UI Strings
Translation: CoMaps/Android UI Strings (SDK)
Translation: CoMaps/Apple AppStore description
Translation: CoMaps/Countries and regions names
Translation: CoMaps/F-Droid app description
Translation: CoMaps/Voice announcements for navigation (TTS)
Translation: CoMaps/iOS - Map Feature Types
Translation: CoMaps/iOS Plist
Translation: CoMaps/iOS Plurals
Translation: CoMaps/iOS UI Strings
---
 .../src/fdroid/play/listings/no-NO/title.txt  |   1 +
 .../app/src/main/res/values-fr/strings.xml    |  23 +-
 .../app/src/main/res/values-hu/strings.xml    |  36 +-
 .../app/src/main/res/values-it/strings.xml    |  21 +-
 .../src/main/res/values-pt-rBR/strings.xml    |   2 +-
 .../app/src/main/res/values-tr/strings.xml    |   2 +-
 .../app/src/main/res/values-zh/strings.xml    |   3 +-
 .../sdk/src/main/res/values-fr/strings.xml    |   8 +
 .../sdk/src/main/res/values-hu/strings.xml    |  10 +-
 .../src/main/res/values-it/types_strings.xml  |  20 +-
 data/countries-strings/hu.json/localize.json  |  12 +-
 data/countries-strings/it.json/localize.json  | 412 ++++++------
 data/sound-strings/it.json/localize.json      |   6 +-
 .../fr.lproj/Localizable.strings              |   4 +-
 .../hu.lproj/InfoPlist.strings                |   2 +-
 .../hu.lproj/Localizable.strings              |  14 +-
 .../it.lproj/InfoPlist.strings                |   2 +-
 .../it.lproj/Localizable.strings              |  24 +-
 .../it.lproj/LocalizableTypes.strings         |  20 +-
 .../nb.lproj/Localizable.stringsdict          |   4 +-
 .../pt-BR.lproj/Localizable.strings           |   6 +-
 .../ur.lproj/Localizable.strings              | 591 ++++++++++++++++++
 iphone/metadata/it/description.txt            |   8 +-
 iphone/metadata/it/keywords.txt               |   2 +-
 iphone/metadata/it/marketing_url.txt          |   2 +-
 iphone/metadata/it/privacy_url.txt            |   2 +-
 iphone/metadata/it/subtitle.txt               |   2 +-
 iphone/metadata/it/support_url.txt            |   2 +-
 28 files changed, 934 insertions(+), 307 deletions(-)
 create mode 100644 android/app/src/fdroid/play/listings/no-NO/title.txt
 create mode 100644 iphone/Maps/LocalizedStrings/ur.lproj/Localizable.strings

diff --git a/android/app/src/fdroid/play/listings/no-NO/title.txt b/android/app/src/fdroid/play/listings/no-NO/title.txt
new file mode 100644
index 000000000..60a12f1b1
--- /dev/null
+++ b/android/app/src/fdroid/play/listings/no-NO/title.txt
@@ -0,0 +1 @@
+CoMaps - Gå tur, sykkel, kjør - med personvern
diff --git a/android/app/src/main/res/values-fr/strings.xml b/android/app/src/main/res/values-fr/strings.xml
index c6435077c..fb4c2e528 100644
--- a/android/app/src/main/res/values-fr/strings.xml
+++ b/android/app/src/main/res/values-fr/strings.xml
@@ -165,7 +165,7 @@
     <!-- Warning message when doing search around current position -->
     <string name="unknown_current_position">Votre position n\'a pas encore été déterminée</string>
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
-    <string name="cant_change_this_setting">Désolé, les paramètres de stockage dee cartes sont actuellement désactivés.</string>
+    <string name="cant_change_this_setting">Désolé, les paramètres de stockage de cartes sont actuellement désactivés</string>
     <!-- Alert message that downloading is in progress. -->
     <string name="downloading_is_active">Le téléchargement de la carte est en cours</string>
     <!-- Share my position using SMS, %1$@ contains om:// and %2$@ https://comaps.app link WITHOUT NAME. @NOTE non-ascii symbols in the link will result in max 70 characters SMS instead of 140. -->
@@ -337,7 +337,7 @@
     <string name="dialog_routing_disclaimer_priority">— Les conditions de circulation, le code de la route et les panneaux de signalisation ont la priorité sur les conseils de navigation ;</string>
     <string name="dialog_routing_disclaimer_precision">— La carte peut être erronée et l\'itinéraire proposé n\'est pas forcément optimal pour arriver à destination ;</string>
     <string name="dialog_routing_disclaimer_recommendations">— L\'itinéraire proposé doit être considéré comme une simple recommandation ;</string>
-    <string name="dialog_routing_disclaimer_borders">— Soyez vigilants à proximité des zones frontalières : les itinéraires générés par l\'application peuvent parfois franchir les frontières entre états dans des zones interdites ;</string>
+    <string name="dialog_routing_disclaimer_borders">— Faites attention à proximité des zones frontalières : les itinéraires générés par l\'application peuvent parfois franchir les frontières entre états dans des zones interdites ;</string>
     <string name="dialog_routing_disclaimer_beware">Restez vigilants et soyez prudents sur la route !</string>
     <string name="dialog_routing_check_gps">Vérifiez le signal GPS</string>
     <string name="dialog_routing_error_location_not_found">Impossible de créer l\'itinéraire. Les coordonnées GPS actuelles n\'ont pas pu être déterminées.</string>
@@ -346,10 +346,10 @@
     <string name="dialog_routing_location_unknown_turn_on">Impossible de déterminer les coordonnées GPS actuelles. Activez les services de localisation pour calculer l\'itinéraire.</string>
     <string name="dialog_routing_unable_locate_route">Impossible de localiser l\'itinéraire</string>
     <string name="dialog_routing_cant_build_route">Impossible de créer l\'itinéraire</string>
-    <string name="dialog_routing_change_start_or_end">Veuillez ajuster votre point de départ ou votre destination</string>
+    <string name="dialog_routing_change_start_or_end">Veuillez ajuster votre point de départ ou votre destination.</string>
     <string name="dialog_routing_change_start">Modifiez votre point de départ</string>
     <string name="dialog_routing_start_not_determined">Impossible de localiser le point de départ. L\'itinéraire n\'a pas pu être créé.</string>
-    <string name="dialog_routing_select_closer_start">Choisissez un point de départ à proximité d\'une route</string>
+    <string name="dialog_routing_select_closer_start">Choisissez un point de départ à proximité d\'une route.</string>
     <string name="dialog_routing_change_end">Ajustez la destination</string>
     <string name="dialog_routing_end_not_determined">Impossible de localiser la destination. L\'itinéraire n\'a pas pu être créé.</string>
     <string name="dialog_routing_select_closer_end">Choisissez un lieu de destination à proximité d\'une route</string>
@@ -372,7 +372,7 @@
     <string name="history">Historique</string>
     <string name="search_not_found">Oups, aucun résultat trouvé</string>
     <!-- The message when user did not find anything in the search. -->
-    <string name="search_not_found_query">Téléchargez la région dans laquelle vous effectuez votre recherche ou essayez d\'ajouter le nom d\'une ville ou d\'un village proche</string>
+    <string name="search_not_found_query">Téléchargez la région dans laquelle vous effectuez votre recherche ou essayez d\'ajouter le nom d\'une ville ou d\'un village proche.</string>
     <string name="search_history_title">Historique de recherche</string>
     <string name="search_history_text">Affichez vos dernières recherches</string>
     <string name="clear_search">Effacer l\'historique de recherche</string>
@@ -461,7 +461,7 @@
     <string name="downloader_no_space_message">Veuillez supprimer les données inutiles</string>
     <string name="editor_login_error_dialog">Erreur de connexion</string>
     <string name="editor_profile_changes">Modifications vérifiées</string>
-    <string name="editor_focus_map_on_location">Déplacez la carte pour placer la croix à l\'emplacement du lieu ou de l\'entreprise</string>
+    <string name="editor_focus_map_on_location">Déplacez la carte pour placer la croix à l\'emplacement du lieu ou de l\'entreprise.</string>
     <string name="editor_edit_place_title">Modification</string>
     <string name="editor_add_place_title">Ajout</string>
     <string name="editor_edit_place_name_hint">Nom du lieu</string>
@@ -476,7 +476,7 @@
     <string name="osm_presentation">Données OpenStreetMap créées par la communauté en date du %s. Pour en savoir plus sur la façon de modifier et de mettre à jour la carte, consultez le site OpenStreetMap.org</string>
     <!-- OSM explanation on Android login screen -->
     <string name="login_osm_presentation">OpenStreetMap.org (OSM) est un projet communautaire visant à créer une carte libre et ouverte. C\'est la principale source de données cartographiques de CoMaps et son fonctionnement est similaire à celui de Wikipédia. Vous pouvez ajouter ou modifier des lieux et ils deviennent accessibles à des millions d\'utilisateurs dans le monde entier. \nRejoignez la communauté et aidez-nous à créer une meilleure carte pour tout le monde !</string>
-    <string name="login_to_make_edits_visible">Créez un compte OpenStreetMap ou connectez-vous pour publier vos modifications de carte dans le monde entier.</string>
+    <string name="login_to_make_edits_visible">Créez un compte OpenStreetMap ou connectez-vous pour publier vos modifications de carte dans le monde entier</string>
     <!-- Downloaded 10 **of** 20 <- it is that "of" -->
     <string name="downloader_of">%1$d de %2$d</string>
     <string name="download_over_mobile_header">Télécharger avec une connexion réseau cellulaire ?</string>
@@ -534,7 +534,7 @@
     <string name="editor_share_to_all_dialog_title">Souhaitez-vous l’envoyer à tous les utilisateurs ?</string>
     <!-- Dialog before publishing the modifications to the public map. -->
     <string name="editor_share_to_all_dialog_message_1">Assurez-vous de n’avoir pas saisi de données personnelles</string>
-    <string name="editor_share_to_all_dialog_message_2">Les contributeurs d\'OpenStreetMap vérifieront vos modifications et vous contacteront s\'ils ont des questions.</string>
+    <string name="editor_share_to_all_dialog_message_2">Les cartographes OpenStreetMap vérifieront vos modifications et vous contacteront en cas de questions</string>
     <!-- Shown as toast when starting the recent track recording -->
     <string name="track_recording">Enregistreur de traces</string>
     <!-- For the first routing -->
@@ -550,7 +550,7 @@
     <string name="mobile_data_description">Une connexion Internet est nécessaire pour recevoir les mises à jour de cartes et pour envoyer vos modifications</string>
     <string name="mobile_data_option_never">Ne jamais utiliser</string>
     <string name="mobile_data_option_ask">Toujours demander</string>
-    <string name="traffic_update_maps_text">Pour afficher les données de circulation, les cartes doivent être mises à jour.</string>
+    <string name="traffic_update_maps_text">Pour afficher les données de circulation, les cartes doivent être mises à jour</string>
     <string name="big_font">Augmenter la taille de police sur la carte</string>
     <string name="traffic_update_app">Veuillez mettre à jour CoMaps</string>
     <!-- "traffic" as in "road congestion" -->
@@ -647,7 +647,7 @@
     <string name="avoid_ferry">Éviter les ferries</string>
     <string name="avoid_motorways">Éviter les autoroutes</string>
     <string name="unable_to_calc_alert_title">Impossible de calculer l\'itinéraire</string>
-    <string name="unable_to_calc_alert_subtitle">Malheureusement, nous n\'avons pas pu créer l\'itinéraire avec les options sélectionnées. Modifiez les paramètres et réessayez</string>
+    <string name="unable_to_calc_alert_subtitle">Malheureusement, nous n\'avons pas pu créer l\'itinéraire avec les options sélectionnées. Modifiez les paramètres et réessayez.</string>
     <string name="define_to_avoid_btn">Définissez les routes à éviter</string>
     <string name="change_driving_options_btn">Paramètres d\'itinéraire activés</string>
     <string name="toll_road">Route à péage</string>
@@ -824,7 +824,7 @@
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
     <string name="track_recording_toast_nothing_to_save">L\'itinéraire est vide - il n\'y a rien à sauvegarder</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
-    <string name="error_no_file_manager_app">Impossible d\'afficher la boîte de dialogue de sélection des dossiers car aucune application appropriée n\'est installée sur votre appareil. Veuillez installer une application de gestion de fichiers et réessayer</string>
+    <string name="error_no_file_manager_app">Impossible d\'afficher la boîte de dialogue de sélection des dossiers car aucune application appropriée n\'est installée sur votre appareil. Veuillez installer une application de gestion de fichiers et réessayer.</string>
     <string name="choose_color">Choisir la couleur</string>
     <string name="edit_track">Modifier la trace</string>
     <string name="uri_open_location_failed">Aucune application installée ne permet d\'ouvrir l\'emplacement</string>
@@ -894,4 +894,5 @@
     <string name="delete_track_dialog_title">Supprimer %s ?</string>
     <string name="existence_confirmed_time_ago">Existance confirmée %s</string>
     <string name="hours_confirmed_time_ago">Confirmé %s</string>
+    <string name="pref_tts_no_system_tts_short">Pas de synthèse vocale disponible, vérifiez les paramètres de l\'application</string>
 </resources>
diff --git a/android/app/src/main/res/values-hu/strings.xml b/android/app/src/main/res/values-hu/strings.xml
index 62c06557e..016ef0965 100644
--- a/android/app/src/main/res/values-hu/strings.xml
+++ b/android/app/src/main/res/values-hu/strings.xml
@@ -70,7 +70,7 @@
     <!-- Should be used in the bookmarks-only context, see bookmarks_and_tracks if tracks are also implied. -->
     <string name="bookmarks">Könyvjelzők</string>
     <!-- "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt -->
-    <string name="bookmarks_and_tracks">Könyvjelzők és nyomvonalak</string>
+    <string name="bookmarks_and_tracks">Könyvjelzők és útvonalak</string>
     <!-- Add bookmark dialog - bookmark name -->
     <string name="name">Név</string>
     <!-- Editor title above street and house number, duplicates [type.building.address] in types_strings.txt -->
@@ -562,7 +562,7 @@
     </plurals>
     <string name="bookmarks_create_new_group">Új lista létrehozása</string>
     <!-- Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files -->
-    <string name="bookmarks_import">Könyvjelzők és nyomvonalak importálása</string>
+    <string name="bookmarks_import">Könyvjelzők és útvonalak importálása</string>
     <string name="bookmarks_error_message_share_general">Nem lehet megosztani egy alkalmazáshiba miatt</string>
     <string name="bookmarks_error_title_share_empty">Megosztási hiba</string>
     <string name="bookmarks_error_message_share_empty">Üres lista nem osztható meg</string>
@@ -580,8 +580,8 @@
     </plurals>
     <string name="restore">Visszaállítás</string>
     <plurals name="tracks">
-        <item quantity="one">%d nyomvonal</item>
-        <item quantity="other">%d nyomvonal</item>
+        <item quantity="one">%d útvonal</item>
+        <item quantity="other">%d útvonal</item>
     </plurals>
     <!-- Settings privacy group in settings screen -->
     <string name="privacy">Adatvédelem</string>
@@ -611,7 +611,7 @@
     <string name="power_managment_setting_never">Soha</string>
     <string name="power_managment_setting_auto">Amikor az akkumulátor lemerül</string>
     <string name="power_managment_setting_manual_max">Mindig</string>
-    <string name="enable_logging_warning_message">Ha ideiglenesen engedélyezi ezt az opciót, akkor a „Súgó” párbeszédpanel „Hibajelentés” menüpontjának használatával rögzítheti és kézzel küldheti el nekünk a problémával kapcsolatos részletes diagnosztikai naplókat. A naplók tartalmazhatnak helyadatokat.</string>
+    <string name="enable_logging_warning_message">Ha ideiglenesen engedélyezi ezt a lehetőséget, akkor rögzítheti, és a „A CoMaps névjegye” képernyőn a „HIBA JELENTÉSE” gombra katintva elküldheti nekünk a hibával, problémával kapcsolatos részletes diagnosztikai naplókat. A naplók tartalmazhatnak helyadatokat.</string>
     <string name="driving_options_title">Útvonaltervezési beállítások</string>
     <!-- Recommended length for CarPlay and Android Auto is around 25-27 characters -->
     <string name="avoid_tolls">Díjköteles utak elkerülése</string>
@@ -753,7 +753,7 @@
     <string name="browser_not_available">A webböngésző nem érhető el</string>
     <string name="volume">Hangerő</string>
     <!-- Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks -->
-    <string name="bookmarks_export">Az összes könyvjelző és nyomvonal exportálása</string>
+    <string name="bookmarks_export">Az összes könyvjelző és útvonal exportálása</string>
     <!-- button in (app) TTS settings, to open the system TTS settings. -->
     <string name="pref_tts_open_system_settings">Beszédszintézis-beállítások</string>
     <!-- toast displayed when pressing the "Speech synthesis system settings" button, and the system settings aren't found. -->
@@ -785,9 +785,9 @@
     <!-- Title for the "Stop Without Saving" action for the alert when saving a track recording. -->
     <string name="continue_recording">Rögzítés folytatása</string>
     <!-- Title for the alert when saving a track recording. -->
-    <string name="track_recording_alert_title">Elmenti a könyvjelzők és nyomvonalakba?</string>
+    <string name="track_recording_alert_title">Elmenti a könyvjelzők és útvonalak közé?</string>
     <!-- Message for the toast when saving the track recording is finished but nothing to save. -->
-    <string name="track_recording_toast_nothing_to_save">A nyomvonal üres – nincs mit menteni</string>
+    <string name="track_recording_toast_nothing_to_save">Az útvonal üres – nincs mit menteni</string>
     <!-- Error message when there are no File Manager apps installed to select a folder when importing Bookmarks and Tracks -->
     <string name="error_no_file_manager_app">Nem lehet megjeleníteni a mappaválasztó párbeszédpanelt, mert nincs megfelelő alkalmazás telepítve az eszközén. Telepítsen egy fájlkezelő alkalmazást, és próbálja meg újra.</string>
     <string name="choose_color">Válasszon színt</string>
@@ -851,11 +851,11 @@
     <string name="pref_backup_now_summary_progress">A biztonsági mentés folyamatban van…</string>
     <string name="pref_backup_now_summary">Készítsen biztonsági mentést most</string>
     <string name="pref_backup_now_summary_ok">A biztonsági mentés sikeresen befejeződött</string>
-    <string name="pref_backup_now_summary_empty_lists">Nincsenek könyvjelzők és nyomvonalak a biztonsági mentéshez</string>
+    <string name="pref_backup_now_summary_empty_lists">Nincsenek könyvjelzők és útvonalak a biztonsági mentéshez</string>
     <string name="pref_backup_now_title">Biztonsági mentés most</string>
     <string name="pref_backup_location_summary_initial">Válasszon ki egy mappát és adja meg az írási/olvasási engedélyt</string>
     <string name="pref_left_button_title">A bal oldali gomb beállítása</string>
-    <string name="pref_backup_title">Könyvjelzők és nyomvonalak mentése</string>
+    <string name="pref_backup_title">Könyvjelzők és útvonalak mentése</string>
     <string name="pref_backup_summary">Automatikus biztonsági mentés az eszközön lévő mappába</string>
     <string name="pref_backup_now_summary_folder_unavailable">A biztonsági mentés mappája nem elérhető</string>
     <string name="pref_backup_status_summary_success">Az utolsó sikeres biztonsági mentés</string>
@@ -866,5 +866,19 @@
     <string name="backup_interval_every_day">Naponta</string>
     <string name="pref_backup_now_summary_failed">Nem sikerült a biztonsági mentés</string>
     <string name="backup_interval_manual_only">Ki (csak kézileg)</string>
-    <string name="dialog_report_error_missing_folder">A biztonsági mentés kiválasztott mappája nem elérhető, vagy nem írható. Kérjük, válasszon másik mappát.</string>
+    <string name="dialog_report_error_missing_folder">A biztonsági mentés kiválasztott mappája nem érhető el, vagy nem írható. Válasszon másik mappát.</string>
+    <string name="at">ekkor: %s</string>
+    <string name="open_now">Most nyitva van</string>
+    <string name="delete_track_dialog_title">%s törlése?</string>
+    <string name="clear">Törlés</string>
+    <string name="route_type">Az útvonal típusa</string>
+    <string name="vehicle">Gépjármű</string>
+    <string name="pedestrian">Gyalogos</string>
+    <string name="bicycle">Kerékpár</string>
+    <string name="ruler">Vonalzó</string>
+    <string name="bookmark_color">A könyvjelző színe</string>
+    <string name="about_help">Névjegy és segítség</string>
+    <string name="share_track">Útvonal megosztása</string>
+    <string name="pref_tts_no_system_tts_short">Nem található szövegfelovasási szolgáltatás (TTS), ellenőrizze az alkalmazás beállításait a „Hangutasítások” müpontban</string>
+    <string name="dialog_report_error_with_logs">Kérjük, küldjön hibajelentést:\n - „Naplózás engedélyezése” a beállításokban\n - reprodukálja a hibát, problémát\n - „A CoMaps névjegye” képernyőn nyomja meg a „HIBA JELENTÉSE” gombot, és küldje el e-mailben vagy chaten keresztül.\n - naplózás kikapcsolása</string>
 </resources>
diff --git a/android/app/src/main/res/values-it/strings.xml b/android/app/src/main/res/values-it/strings.xml
index d9ebef42e..4535df7a8 100644
--- a/android/app/src/main/res/values-it/strings.xml
+++ b/android/app/src/main/res/values-it/strings.xml
@@ -36,24 +36,24 @@
     <string name="try_again">Riprova</string>
     <string name="about_menu_title">Informazioni su CoMaps</string>
     <!-- Text in About screen -->
-    <string name="about_headline">Progetto Aperto e sviluppato dalla comunità</string>
+    <string name="about_headline">Progetto aperto e sviluppato dalla comunità</string>
     <!-- Text in About screen -->
     <string name="about_proposition_1">• Facile da usare e curata</string>
     <!-- Text in About screen -->
     <string name="about_proposition_2">• Attenta alla Privacy e senza pubblicità</string>
     <!-- Text in About screen -->
-    <string name="about_proposition_3">• Usabile senza connessione, veloce e occupa poco spazio</string>
+    <string name="about_proposition_3">• Utilizzabile senza connessione, veloce e occupa poco spazio</string>
     <!-- Text in About screen -->
-    <string name="about_developed_by_enthusiasts">Applicazione open-source, senza scopo di lucro e trasparente nel processo decisionale e nelle gestione delle finanze.</string>
+    <string name="about_developed_by_enthusiasts">Applicazione open-source, senza scopo di lucro e trasparente nel processo decisionale e nella gestione delle finanze.</string>
     <!-- The button that opens system location settings -->
     <string name="location_settings">Impostazioni della posizione</string>
     <string name="close">Chiudi</string>
     <string name="unsupported_phone">L\'app necessita di OpenGL con accelerazione hardware. Purtroppo, il tuo dispositivo non è supportato.</string>
     <string name="download">Scarica</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="disconnect_usb_cable">Scollega il cavo USB o inserisci la scheda di memoria per poter utilizzare CoMaps</string>
+    <string name="disconnect_usb_cable">Scollega il cavo USB o inserisci la scheda SD per poter utilizzare CoMaps</string>
     <!-- Used in DownloadResources startup screen -->
-    <string name="not_enough_free_space_on_sdcard">Libera prima dello spazio sulla scheda SD/ memoria USB per utilizzare l\'app</string>
+    <string name="not_enough_free_space_on_sdcard">Libera prima dello spazio sulla scheda SD/memoria USB per utilizzare l\'app</string>
     <string name="download_resources">Prima di iniziare è necessario scaricare la mappa generale del mondo sul tuo dispositivo. \nLa dimensione del download è di %s.</string>
     <string name="download_resources_continue">Vai alla mappa</string>
     <string name="downloading_country_can_proceed">Sto scaricando %1$s (%2$s). Ora puoi \nprocedere con la mappa.</string>
@@ -117,11 +117,11 @@
     <!-- Search category for entertainment; any changes should be duplicated in categories.txt @category_entertainment! -->
     <string name="category_entertainment">Intrattenimento</string>
     <!-- Search category for ATMs; any changes should be duplicated in categories.txt @category_atm! -->
-    <string name="category_atm">Bancomat</string>
+    <string name="category_atm">Bancomat ATM</string>
     <!-- Search category for nightclubs/bars; any changes should be duplicated in categories.txt @category_nightlife! -->
     <string name="category_nightlife">Vita notturna</string>
     <!-- Search category for water park/disneyland/playground/toys store; any changes should be duplicated in categories.txt @category_children! -->
-    <string name="category_children">Divertimento in famiglia</string>
+    <string name="category_children">Vacanza in famiglia</string>
     <!-- Search category for banks; any changes should be duplicated in categories.txt @category_bank! -->
     <string name="category_bank">Banca</string>
     <!-- Search category for pharmacies; any changes should be duplicated in categories.txt @category_pharmacy! -->
@@ -139,7 +139,7 @@
     <!-- Search category for water; any changes should be duplicated in categories.txt @category_water! also used to sort bookmarks by type -->
     <string name="category_water">Acqua</string>
     <!-- Search category for RV facilities; any changes should be duplicated in categories.txt @category_rv! -->
-    <string name="category_rv">Per camper</string>
+    <string name="category_rv">Struttura per camper</string>
     <!-- SECTION: Other translations -->
     <!-- Notes field in Bookmarks view -->
     <string name="description">Informazioni</string>
@@ -159,7 +159,7 @@
     <!-- resource for context menu -->
     <string name="edit">Modifica</string>
     <!-- Warning message when doing search around current position -->
-    <string name="unknown_current_position">La tua posizione non è stata ancora determinata</string>
+    <string name="unknown_current_position">La tua posizione non è stata ancora stabilita</string>
     <!-- Alert message that we can't run Map Storage settings due to some reasons. -->
     <string name="cant_change_this_setting">Le impostazioni di archiviazione delle mappe sono disabilitate al momento</string>
     <!-- Alert message that downloading is in progress. -->
@@ -325,7 +325,7 @@
     <!-- gray color -->
     <string name="gray">Grigio</string>
     <!-- blue gray color -->
-    <string name="blue_gray">Grigiazzurro</string>
+    <string name="blue_gray">Grigio azzurro</string>
     <!-- SECTION: Routing dialogs strings -->
     <string name="dialog_routing_disclaimer_title">Quando segui il percorso, ricorda che:</string>
     <string name="dialog_routing_disclaimer_priority">— Le condizioni stradali, il codice della strada e la segnaletica hanno sempre la precedenza sulle indicazioni del navigatore;</string>
@@ -889,4 +889,5 @@
     <string name="existence_confirmed_time_ago">Esistenza confermata %s</string>
     <string name="share_track">Traccia condivisa</string>
     <string name="delete_track_dialog_title">Eliminare %s?</string>
+    <string name="pref_tts_no_system_tts_short">Motore testo - parlato non trovato, controlla le impostazioni dell\'app</string>
 </resources>
diff --git a/android/app/src/main/res/values-pt-rBR/strings.xml b/android/app/src/main/res/values-pt-rBR/strings.xml
index cba781a85..ddf19aab1 100644
--- a/android/app/src/main/res/values-pt-rBR/strings.xml
+++ b/android/app/src/main/res/values-pt-rBR/strings.xml
@@ -436,7 +436,7 @@
     <string name="error_enter_correct_zip_code">Insira um CEP válido</string>
     <!-- Information about OSM at the top of the editing page -->
     <string name="editor_about_osm">As suas edições são enviadas à base de dados pública <a href="https://wiki.openstreetmap.org/wiki/Pt:Sobre_o_OpenStreetMap">OpenStreetMap</a>. Não adicione informações pessoais ou protegidas por direitos autorais.</string>
-    <string name="editor_more_about_osm">Mais sobre OpenStreetMap</string>
+    <string name="editor_more_about_osm">Mais sobre o OpenStreetMap</string>
     <string name="editor_osm_history">Seu histórico de edição</string>
     <string name="editor_osm_notes">Suas notas de dados do mapa</string>
     <string name="editor_category_unsuitable_title">Não encontra uma categoria adequada?</string>
diff --git a/android/app/src/main/res/values-tr/strings.xml b/android/app/src/main/res/values-tr/strings.xml
index 8deda4940..153fa6564 100644
--- a/android/app/src/main/res/values-tr/strings.xml
+++ b/android/app/src/main/res/values-tr/strings.xml
@@ -843,7 +843,7 @@
     <string name="app_site_url">https://comaps.app/tr/</string>
     <string name="instagram_url">https://www.instagram.com/comaps.app/</string>
     <string name="codeberg">Codeberg</string>
-    <string name="telegram_url">https://t.me/CoMapsApp/</string>
+    <string name="telegram_url">https://t.me/CoMaps_TR</string>
     <string name="pref_left_button_title">Sol alt tuş ataması</string>
     <string name="pref_left_button_disable">Devre dışı</string>
     <string name="error_enter_correct_fediverse_page">Gireceğiniz Mastodon kullanıcı adı ve adresi halihazırda mevcut olmalı</string>
diff --git a/android/app/src/main/res/values-zh/strings.xml b/android/app/src/main/res/values-zh/strings.xml
index f062e010c..a0158c30f 100644
--- a/android/app/src/main/res/values-zh/strings.xml
+++ b/android/app/src/main/res/values-zh/strings.xml
@@ -225,7 +225,7 @@
     <!-- Settings «Route» category: «Test Voice Directions» title -->
     <string name="pref_tts_test_voice_title">测试语音指令</string>
     <!-- Settings «Route» category: Pop-up message when clicking «Test Voice Directions» -->
-    <string name="pref_tts_playing_test_voice">如果您现在听不到声音，请检查音量或系统文本转语音设置</string>
+    <string name="pref_tts_playing_test_voice">如果您现在听不到声音，请检查音量或系统文字转语音设置</string>
     <!-- Settings «Route» category: «Tts unavailable» subtitle -->
     <string name="pref_tts_unavailable">不可用</string>
     <string name="pref_map_auto_zoom">自动缩放</string>
@@ -891,4 +891,5 @@
     <string name="delete_track_dialog_title">是否删除%s？</string>
     <string name="hours_confirmed_time_ago">已于%s确认</string>
     <string name="share_track">分享轨迹</string>
+    <string name="pref_tts_no_system_tts_short">未找到文字转语音引擎，请检查应用设置</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-fr/strings.xml b/android/sdk/src/main/res/values-fr/strings.xml
index a4b6c8b43..6cb24ce9f 100644
--- a/android/sdk/src/main/res/values-fr/strings.xml
+++ b/android/sdk/src/main/res/values-fr/strings.xml
@@ -37,4 +37,12 @@
     <string name="not_shared">Privé</string>
     <string name="access_rules_author_only">Édition en ligne</string>
     <string name="today">Aujourd\'hui</string>
+    <string name="yesterday">Hier</string>
+    <string name="days_ago">Il y a %s jours</string>
+    <string name="week_ago">Il y a %s semaine</string>
+    <string name="weeks_ago">Il y a %s semaines</string>
+    <string name="month_ago">Il y a %s mois</string>
+    <string name="months_ago">Il y a %s mois</string>
+    <string name="year_ago">Il y a %s an</string>
+    <string name="years_ago">Il y a %s ans</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-hu/strings.xml b/android/sdk/src/main/res/values-hu/strings.xml
index 15b30dab6..57091c87b 100644
--- a/android/sdk/src/main/res/values-hu/strings.xml
+++ b/android/sdk/src/main/res/values-hu/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- A text for current gps location point/arrow selected on the map -->
-    <string name="core_my_position">Saját helyzet</string>
+    <string name="core_my_position">Saját helyzetem</string>
     <!-- Default bookmark list name -->
     <string name="core_my_places">Saját helyek</string>
     <!-- Internal storage type in Maps Storage settings (not accessible by the user) -->
@@ -36,4 +36,12 @@
     <string name="mb">MB</string>
     <string name="gb">GB</string>
     <string name="today">Ma</string>
+    <string name="yesterday">Tegnap</string>
+    <string name="days_ago">%s nappal ezelőtt</string>
+    <string name="week_ago">%s héttel ezelőtt</string>
+    <string name="weeks_ago">%s héttel ezelőtt</string>
+    <string name="months_ago">%s hónappal ezelőtt</string>
+    <string name="year_ago">%s évvel ezelőtt</string>
+    <string name="years_ago">%s évvel ezelőtt</string>
+    <string name="month_ago">%s hónappal ezelőtt</string>
 </resources>
diff --git a/android/sdk/src/main/res/values-it/types_strings.xml b/android/sdk/src/main/res/values-it/types_strings.xml
index b7edc9bc2..8aac0c88b 100644
--- a/android/sdk/src/main/res/values-it/types_strings.xml
+++ b/android/sdk/src/main/res/values-it/types_strings.xml
@@ -10,10 +10,10 @@
     <string name="type.aerialway.drag_lift">Ski-lift</string>
     <string name="type.aerialway.gondola">Cabinovia</string>
     <string name="type.aerialway.mixed_lift">Impianto misto</string>
-    <string name="type.aerialway.station">Stazione</string>
+    <string name="type.aerialway.station">Stazione aerea</string>
     <string name="type.aeroway">Infrastruttura aeroportuale</string>
     <string name="type.aeroway.aerodrome">Aeroporto</string>
-    <string name="type.aeroway.aerodrome.international">Aeroporto Internazionale</string>
+    <string name="type.aeroway.aerodrome.international">Aeroporto internazionale</string>
     <string name="type.aeroway.apron">Area di stazionamento per aeromobili</string>
     <string name="type.aeroway.gate">Cancello aeroportuale</string>
     <string name="type.aeroway.helipad">Piattaforma per elicotteri</string>
@@ -22,14 +22,14 @@
     <string name="type.aeroway.terminal">Terminal aeroportuale</string>
     <string name="type.amenity">Struttura</string>
     <string name="type.amenity.arts_centre">Centro artistico</string>
-    <string name="type.amenity.atm">Bancomat</string>
+    <string name="type.amenity.atm">Bancomat ATM</string>
     <string name="type.amenity.bank">Banca</string>
-    <string name="type.amenity.bar">Bar alcolico</string>
+    <string name="type.amenity.bar">Bar</string>
     <string name="type.amenity.bbq">Griglia per barbecue</string>
     <string name="type.amenity.bench">Panchina</string>
     <string name="type.amenity.bicycle_parking">Parcheggio biciclette</string>
     <string name="type.amenity.bicycle_rental">Noleggio biciclette</string>
-    <string name="type.amenity.bicycle_repair_station">Stazione di riparazione biciclette</string>
+    <string name="type.amenity.bicycle_repair_station">Centro di riparazione biciclette</string>
     <string name="type.amenity.biergarten">Biergarten</string>
     <string name="type.amenity.brothel">Bordello</string>
     <string name="type.amenity.bureau_de_change">Cambio valute</string>
@@ -51,7 +51,7 @@
     <string name="type.leisure.bowling_alley">Sala da bowling</string>
     <string name="type.amenity.clinic">Clinica</string>
     <string name="type.amenity.college">Collegio</string>
-    <string name="type.amenity.community_centre">Centro ricreativo</string>
+    <string name="type.amenity.community_centre">Centro comunitario</string>
     <string name="type.amenity.compressed_air">Aria compressa</string>
     <string name="type.amenity.conference_centre">Centro conferenze</string>
     <string name="type.amenity.courthouse">Tribunale</string>
@@ -70,7 +70,7 @@
     <string name="type.amenity.fire_station">Squadra antincendio</string>
     <string name="type.amenity.food_court">Area ristorazione</string>
     <string name="type.amenity.fountain">Fontana</string>
-    <string name="type.amenity.fuel">Stazione di rifornimento</string>
+    <string name="type.amenity.fuel">Distributore di carburante</string>
     <!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
     <string name="type.amenity.grave_yard">Cimitero</string>
     <!-- In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. -->
@@ -297,7 +297,7 @@
     <string name="type.cuisine.german">Cucina tedesca</string>
     <string name="type.cuisine.greek">Cucina greca</string>
     <string name="type.cuisine.grill">Cucina alla griglia</string>
-    <string name="type.cuisine.heuriger">Heuriger</string>
+    <string name="type.cuisine.heuriger">Vino Heuriger</string>
     <string name="type.cuisine.hotdog">Hot dog</string>
     <string name="type.cuisine.hungarian">Cucina ungherese</string>
     <string name="type.cuisine.ice_cream">Gelateria</string>
@@ -382,7 +382,7 @@
     <!-- These translations are used for all type.highway.*.bridge. -->
     <string name="type.highway.busway.bridge">Ponte</string>
     <!-- These translations are used for all type.highway.*.tunnel. -->
-    <string name="type.highway.busway.tunnel">Tunnel</string>
+    <string name="type.highway.busway.tunnel">Galleria</string>
     <string name="type.highway.bus_stop">Fermata dell\'autobus</string>
     <string name="type.highway.construction">Strada in costruzione</string>
     <string name="type.highway.cycleway">Pista ciclabile</string>
@@ -1381,7 +1381,7 @@
     <string name="type.natural.wetland.swamp">Palude</string>
     <string name="type.natural.wetland.mangrove">Mangrovie</string>
     <string name="type.amenity.luggage_locker">Deposito Bagagli</string>
-    <string name="type.amenity.bicycle_parking.covered">Parcheggio Biciclette Coperto</string>
+    <string name="type.amenity.bicycle_parking.covered">Parcheggio biciclette coperto</string>
     <string name="type.post_office.post_partner">Partner Postale</string>
     <string name="type.natural.wetland.saltmarsh">Palude Salmastra</string>
     <string name="type.natural.wetland.saltmarsh.tidal">Palude Salmastra di Marea</string>
diff --git a/data/countries-strings/hu.json/localize.json b/data/countries-strings/hu.json/localize.json
index 6c2b7f871..a7facde7c 100644
--- a/data/countries-strings/hu.json/localize.json
+++ b/data/countries-strings/hu.json/localize.json
@@ -971,7 +971,7 @@
 "Switzerland":"Svájc",
 "Switzerland_Central":"Közép-Svájc",
 "Switzerland_Eastern":"Kelet-Svájc",
-"Switzerland_Espace Mittelland":"Espace Mittelland",
+"Switzerland_Espace Mittelland":"Középfennsík térsége",
 "Switzerland_Lake Geneva region":"Genfi tó régió",
 "Switzerland_Northwestern":"Észak-nyugat",
 "Switzerland_Ticino":"Ticino kanton",
@@ -1281,8 +1281,8 @@
 "Sudan_East":"Szudán — Kelet",
 "Sudan_West":"Szudán — Nyugat",
 "Sweden_Stockholm":"Stockholm",
-"Switzerland_Espace Mittelland_Bern":"Espace Mittelland — Bern",
-"Switzerland_Espace Mittelland_East":"Espace Mittelland — Kelet",
+"Switzerland_Espace Mittelland_Bern":"Középfennsík térsége — Bern",
+"Switzerland_Espace Mittelland_East":"Középfennsík térsége — Kelet",
 "Taiwan_North":"Kínai Köztársaság — Észak",
 "Taiwan_South":"Kínai Köztársaság — Dél",
 "Thailand_Central":"Thaiföld — Középpont",
@@ -1356,7 +1356,7 @@
 "Argentina_Buenos Aires_North Description":"Dolores, Pinamar, Villa Gesell",
 "Argentina_Buenos Aires_South Description":"Bahía Blanca, Miramar, Tandil",
 "Argentina_Cuyo Description":"San Juan, San Rafael, San Luis",
-"Argentina_Mesopotamia Description":"Federación, Paraná, Alvear",
+"Argentina_Mesopotamia Description":"Paraná, Alvear föderáció",
 "Argentina_Northwest Description":"San Miguel de Tucumán, San Fernando del Valle de Catamarca, San Salvador de Jujuy",
 "Argentina_Pampas Description":"Córdoba, Santa Rosa, Río Cuarto",
 "Argentina_Patagonia Description":"Cutral Co, Viedma, Comodoro Rivadavia",
@@ -1393,7 +1393,7 @@
 "Belarus_Maglieu Region Description":"Mahilyow, Babruysk, Čerykaŭ",
 "Belarus_Minsk Region Description":"Minszk, Szalihorszk",
 "Belarus_Vitebsk Region Description":"Orsa",
-"Belgium_Antwerp Description":"Antwerp, Zwijndrecht, Berchem",
+"Belgium_Antwerp Description":"Antwerpen, Zwijndrecht, Berchem",
 "Belgium_East Flanders Description":"Ghent, Deinze, Sint-Martens-Latem",
 "Belgium_Flemish Brabant Description":"Brüsszel",
 "Belgium_Hainaut Description":"Charleroi",
@@ -2549,5 +2549,5 @@
 "Spain_Castile and Leon_West Short":"Kasztília és León",
 "Spain_Galicia_North Short":"Galicia",
 "Spain_Galicia_South Short":"Galicia",
-"Switzerland_Espace Mittelland_East Short":"Espace Mittelland"
+"Switzerland_Espace Mittelland_East Short":"Középfennsík térsége"
 }
diff --git a/data/countries-strings/it.json/localize.json b/data/countries-strings/it.json/localize.json
index ebdfb59e9..ba85f1d8d 100644
--- a/data/countries-strings/it.json/localize.json
+++ b/data/countries-strings/it.json/localize.json
@@ -12,11 +12,11 @@
 "Antarctica":"Antartide",
 "Antigua and Barbuda":"Antigua e Barbuda",
 "Argentina":"Argentina",
-"Argentina_Buenos Aires_North":"provincia di Buenos Aires — Nord",
-"Argentina_Buenos Aires_South":"provincia di Buenos Aires — Sud",
+"Argentina_Buenos Aires_North":"Provincia di Buenos Aires — Nord",
+"Argentina_Buenos Aires_South":"Provincia di Buenos Aires — Sud",
 "Argentina_Cuyo":"Cuyo (Argentina)",
 "Argentina_Mesopotamia":"Mesopotamia",
-"Argentina_Northwest":"Ande del nordovest",
+"Argentina_Northwest":"Argentina Nord-Ovest",
 "Argentina_Pampas":"Pampa",
 "Argentina_Patagonia":"Patagonia",
 "Arizona":"Arizona",
@@ -26,16 +26,16 @@
 "Australia_New South Wales":"Nuovo Galles del Sud",
 "Australia_Northern Territory":"Territorio del Nord",
 "Australia_Queensland":"Queensland",
-"Australia_South Australia":"Australia Meridionale",
+"Australia_South Australia":"Australia del Sud",
 "Australia_Tasmania":"Tasmania",
 "Australia_Victoria":"Victoria",
-"Australia_Western Australia":"Australia Occidentale",
+"Australia_Western Australia":"Australia Ovest",
 "Austria":"Austria",
 "Austria_Burgenland":"Burgenland",
 "Austria_Carinthia":"Carinzia",
 "Austria_Lower Austria_West":"Bassa Austria — Ovest",
 "Austria_Lower Austria_Wien":"Vienna e Bassa Austria — Est",
-"Austria_Salzburg":"Salisburghese",
+"Austria_Salzburg":"Salisburgo",
 "Austria_Styria":"Stiria",
 "Austria_Tyrol":"Tirolo",
 "Austria_Upper Austria":"Alta Austria",
@@ -51,25 +51,25 @@
 "Belarus_Hrodna Region":"Regione di Hrodna",
 "Belarus_Maglieu Region":"Regione di Mahilëŭ",
 "Belarus_Minsk Region":"Regione di Minsk",
-"Belarus_Vitebsk Region":"Regione di Vicebsk",
+"Belarus_Vitebsk Region":"Regione di Vitebsk",
 "Belgium":"Belgio",
-"Belgium_Antwerp":"provincia d'Anversa",
-"Belgium_East Flanders":"provincia delle Fiandre Orientali",
-"Belgium_Flemish Brabant":"provincia del Brabante Fiammingo",
-"Belgium_Hainaut":"provincia dell'Hainaut",
-"Belgium_Liege":"provincia di Liegi",
-"Belgium_Limburg":"Limburgo",
-"Belgium_Luxembourg":"provincia del Lussemburgo",
-"Belgium_Namur":"provincia di Namur",
-"Belgium_Walloon Brabant":"provincia del Brabante Vallone",
-"Belgium_West Flanders":"provincia delle Fiandre Occidentali",
+"Belgium_Antwerp":"Provincia d'Anversa",
+"Belgium_East Flanders":"Provincia Fiandre dell'est",
+"Belgium_Flemish Brabant":"Provincia del Brabante Fiammingo",
+"Belgium_Hainaut":"Provincia dell'Hainaut",
+"Belgium_Liege":"Provincia di Liegi",
+"Belgium_Limburg":"Provincia di Limburgo",
+"Belgium_Luxembourg":"Provincia del Lussemburgo",
+"Belgium_Namur":"Provincia di Namur",
+"Belgium_Walloon Brabant":"Provincia del Brabante Vallone",
+"Belgium_West Flanders":"Provincia Ovest delle Fiandre",
 "Belize":"Belize",
 "Benin":"Benin",
 "Bermuda":"Bermuda",
 "Bhutan":"Bhutan",
 "Bolivia":"Bolivia",
-"Bolivia_North":"Nord della Bolivia",
-"Bolivia_South":"Sud della Bolivia",
+"Bolivia_North":"Bolivia del Nord",
+"Bolivia_South":"Bolivia del Sud",
 "Bosnia and Herzegovina":"Bosnia ed Erzegovina",
 "Bosnia and Herzegovina_Brcko district of Bosnia and Herzegowina":"Distretto di Brčko",
 "Bosnia and Herzegovina_Entity Federation of Bosnia and Herzegovina":"Federazione di Bosnia ed Erzegovina",
@@ -94,7 +94,7 @@
 "Brazil_Southeast Region_Sao Paulo_Campinas":"San Paolo — Campinas",
 "Brazil_Southeast Region_Sao Paulo_City":"San Paolo — Santos",
 "Brazil_Southeast Region_Sao Paulo_West":"San Paolo — Ribeirão Preto",
-"British Indian Ocean Territory":"Territorio britannico dell'oceano Indiano",
+"British Indian Ocean Territory":"Territorio britannico dell'Oceano Indiano",
 "British Virgin Islands":"Isole Vergini britanniche",
 "Brunei":"Brunei",
 "Bulgaria":"Bulgaria",
@@ -105,7 +105,7 @@
 "Cameroon":"Camerun",
 "Cameroon_Central":"Camerun — Centro",
 "Cameroon_West":"Camerun — Ovest",
-"Campo de Hielo Sur":"Hielos Continentales",
+"Campo de Hielo Sur":"Territori ghiacciati della Patagonia del Sud",
 "Canada":"Canada",
 "Canada_Alberta":"Alberta",
 "Canada_Alberta_Edmonton":"Edmonton",
@@ -140,7 +140,7 @@
 "Canada_Northwest Territories_Yellowknife":"Yellowknife",
 "Canada_Nova Scotia":"Nuova Scozia",
 "Canada_Nova Scotia_Halifax":"Halifax",
-"Canada_Nova Scotia_Sydney":"Sydney",
+"Canada_Nova Scotia_Sydney":"Sydney - Nuova Scozia",
 "Canada_Nunavut":"Nunavut",
 "Canada_Nunavut_North":"Nunavut — Nord",
 "Canada_Nunavut_South":"Nunavut — Sud",
@@ -207,7 +207,7 @@
 "China_Shanghai":"Shanghai",
 "China_Shanxi":"Shanxi",
 "China_Sichuan":"Sichuan",
-"China_Tibet Autonomous Region":"regione autonoma del Tibet",
+"China_Tibet Autonomous Region":"Regione Autonoma del Tibet",
 "China_Xinjiang":"Sinkiang",
 "China_Yunnan":"Yunnan",
 "China_Zhejiang":"Zhejiang",
@@ -228,26 +228,26 @@
 "Cyprus":"Cipro",
 "Czech Republic":"Repubblica Ceca",
 "Czech_Jihovychod_Jihomoravsky kraj":"Moravia meridionale",
-"Czech_Jihovychod_Kraj Vysocina":"regione di Vysočina",
+"Czech_Jihovychod_Kraj Vysocina":"Regione di Vysočina",
 "Czech_Jihozapad_Jihocesky kraj":"Boemia meridionale",
-"Czech_Jihozapad_Plzensky kraj":"regione di Plzeň",
-"Czech_Karlovasky kraj":"regione di Karlovy Vary",
-"Czech_Moravskoslezsko":"regione di Moravia-Slesia",
-"Czech_Olomoucky kraj":"regione di Olomouc",
+"Czech_Jihozapad_Plzensky kraj":"Regione di Plzeň",
+"Czech_Karlovasky kraj":"Regione di Karlovy Vary",
+"Czech_Moravskoslezsko":"Regione di Moravia-Slesia",
+"Czech_Olomoucky kraj":"Regione di Olomouc",
 "Czech_Praha":"Praga",
-"Czech_Severovychod_Kralovehradecky kraj":"regione di Hradec Králové",
-"Czech_Severovychod_Liberecky kraj":"regione di Liberec",
-"Czech_Severovychod_Pardubicky kraj":"regione di Pardubice",
+"Czech_Severovychod_Kralovehradecky kraj":"Regione di Hradec Králové",
+"Czech_Severovychod_Liberecky kraj":"Regione di Liberec",
+"Czech_Severovychod_Pardubicky kraj":"Regione di Pardubice",
 "Czech_Stredni Cechy_East":"Boemia centrale — Est",
 "Czech_Stredni Cechy_West":"Boemia centrale — Ovest",
-"Czech_Ustecky kraj":"regione di Ústí nad Labem",
-"Czech_Zlinsky Kraj":"regione di Zlín",
+"Czech_Ustecky kraj":"Regione di Ústí nad Labem",
+"Czech_Zlinsky Kraj":"Regione di Zlín",
 "Denmark":"Danimarca",
 "Denmark_Capital Region of Denmark":"Hovedstaden",
-"Denmark_Central Denmark Region":"Jutland centrale",
-"Denmark_North Denmark Region":"Jutland settentrionale",
+"Denmark_Central Denmark Region":"Regione della Danimarca Centrale",
+"Denmark_North Denmark Region":"Regione della Danimarca del Nord",
 "Denmark_Region Zealand":"Selandia",
-"Denmark_Region of Southern Denmark":"Danimarca meridionale",
+"Denmark_Region of Southern Denmark":"Regione della Danimarca meridionale",
 "Djibouti":"Gibuti",
 "Dominica":"Dominica",
 "Dominican Republic":"Repubblica Dominicana",
@@ -270,7 +270,7 @@
 "Finland_Northern Finland":"Finlandia settentrionale",
 "Finland_Southern Finland_Helsinki":"Finlandia meridionale — Helsinki",
 "Finland_Southern Finland_Lappeenranta":"Finlandia meridionale — Lappeenranta",
-"Finland_Southern Finland_West":"Varsinais-Suomi",
+"Finland_Southern Finland_West":"Finlandia - Sud-Ovest (Varsinais-Suomi)",
 "Finland_Western Finland":"Finlandia occidentale",
 "Florida":"Florida",
 "France":"Francia",
@@ -298,7 +298,7 @@
 "France_Burgundy_Nievre":"Nièvre",
 "France_Burgundy_Saone-et-Loire":"Saona e Loira",
 "France_Burgundy_Yonne":"Yonne",
-"France_Centre-Val de Loire":"Centro",
+"France_Centre-Val de Loire":"Centro - Val della Loira",
 "France_Centre-Val de Loire_Cher":"Cher",
 "France_Centre-Val de Loire_Eure-et-Loir":"Eure-et-Loir",
 "France_Centre-Val de Loire_Indre":"Indre",
@@ -346,7 +346,7 @@
 "France_New Caledonia":"Nuova Caledonia",
 "France_Nord-Pas-de-Calais":"Nord-Passo di Calais",
 "France_Nord-Pas-de-Calais_Lille":"Lilla",
-"France_Nord-Pas-de-Calais_Nord":"Nord",
+"France_Nord-Pas-de-Calais_Nord":"Nord - Passo di Calais",
 "France_Nord-Pas-de-Calais_Pas-de-Calais":"Passo di Calais",
 "France_Pays de la Loire":"Paesi della Loira",
 "France_Pays de la Loire_Loire-Atlantique":"Loira Atlantica",
@@ -366,11 +366,11 @@
 "France_Provence-Alpes-Cote dAzur":"Provenza-Alpi-Costa Azzurra",
 "France_Provence-Alpes-Cote dAzur_Alpes-de-Haute-Provence":"Alpi dell'Alta Provenza",
 "France_Provence-Alpes-Cote dAzur_Bouches-du-Rhone":"Bocche del Rodano",
-"France_Provence-Alpes-Cote dAzur_Hautes-Alpes":"Alte Alpi",
-"France_Provence-Alpes-Cote dAzur_Maritime Alps":"Alpi Marittime",
+"France_Provence-Alpes-Cote dAzur_Hautes-Alpes":"Provenza - Alte Alpi",
+"France_Provence-Alpes-Cote dAzur_Maritime Alps":"Provenza - Alpi Marittime",
 "France_Provence-Alpes-Cote dAzur_Var":"Var",
 "France_Provence-Alpes-Cote dAzur_Vaucluse":"Vaucluse",
-"France_Rhone-Alpes":"Rodano-Alpi",
+"France_Rhone-Alpes":"Alpi del Rodano",
 "France_Rhone-Alpes_Ain":"Ain",
 "France_Rhone-Alpes_Ardeche":"Ardèche",
 "France_Rhone-Alpes_Drome":"Drôme",
@@ -430,7 +430,7 @@
 "Germany_Rhineland-Palatinate_Koblenz":"Renania-Palatinato — Coblenza",
 "Germany_Rhineland-Palatinate_South":"Renania-Palatinato — Magonza",
 "Germany_Saarland":"Saarland",
-"Germany_Saxony-Anhalt":"Sassonia-Anhalt",
+"Germany_Saxony-Anhalt":"Sassonia - Anhalt",
 "Germany_Saxony_Dresden":"Sassonia — Dresda",
 "Germany_Saxony_Leipzig":"Sassonia — Lipsia",
 "Germany_Schleswig-Holstein":"Schleswig-Holstein",
@@ -525,46 +525,46 @@
 "Italy_Calabria":"Calabria",
 "Italy_Campania":"Campania",
 "Italy_Emilia":"Emilia-Romagna",
-"Italy_Emilia-Romagna_Bologna":"provincia di Bologna",
-"Italy_Emilia-Romagna_Ferrara":"provincia di Ferrara",
-"Italy_Emilia-Romagna_Forli-Cesena":"provincia di Forlì-Cesena",
-"Italy_Emilia-Romagna_Modena":"provincia di Modena",
-"Italy_Emilia-Romagna_Parma":"provincia di Parma",
-"Italy_Emilia-Romagna_Piacenza":"provincia di Piacenza",
-"Italy_Emilia-Romagna_Ravenna":"provincia di Ravenna",
-"Italy_Emilia-Romagna_Reggio Emilia":"provincia di Reggio nell'Emilia",
-"Italy_Emilia-Romagna_Rimini":"provincia di Rimini",
+"Italy_Emilia-Romagna_Bologna":"Provincia di Bologna",
+"Italy_Emilia-Romagna_Ferrara":"Provincia di Ferrara",
+"Italy_Emilia-Romagna_Forli-Cesena":"Provincia di Forlì-Cesena",
+"Italy_Emilia-Romagna_Modena":"Provincia di Modena",
+"Italy_Emilia-Romagna_Parma":"Provincia di Parma",
+"Italy_Emilia-Romagna_Piacenza":"Provincia di Piacenza",
+"Italy_Emilia-Romagna_Ravenna":"Provincia di Ravenna",
+"Italy_Emilia-Romagna_Reggio Emilia":"Provincia di Reggio nell'Emilia",
+"Italy_Emilia-Romagna_Rimini":"Provincia di Rimini",
 "Italy_Friuli":"Friuli-Venezia Giulia",
-"Italy_Friuli-Venezia Giulia_Gorizia":"provincia di Gorizia",
-"Italy_Friuli-Venezia Giulia_Pordenone":"provincia di Pordenone",
-"Italy_Friuli-Venezia Giulia_Trieste":"provincia di Trieste",
-"Italy_Friuli-Venezia Giulia_Udine":"provincia di Udine",
+"Italy_Friuli-Venezia Giulia_Gorizia":"Provincia di Gorizia",
+"Italy_Friuli-Venezia Giulia_Pordenone":"Provincia di Pordenone",
+"Italy_Friuli-Venezia Giulia_Trieste":"Provincia di Trieste",
+"Italy_Friuli-Venezia Giulia_Udine":"Provincia di Udine",
 "Italy_Lazio":"Lazio",
 "Italy_Liguria":"Liguria",
 "Italy_Lombardy":"Lombardia",
-"Italy_Lombardy_Bergamo":"provincia di Bergamo",
-"Italy_Lombardy_Brescia":"provincia di Brescia",
-"Italy_Lombardy_Como":"provincia di Como",
-"Italy_Lombardy_Cremona":"provincia di Cremona",
-"Italy_Lombardy_Lecco":"provincia di Lecco",
-"Italy_Lombardy_Lodi":"provincia di Lodi",
-"Italy_Lombardy_Mantua":"provincia di Mantova",
-"Italy_Lombardy_Milan":"provincia di Milano",
-"Italy_Lombardy_Monza and Brianza":"provincia di Monza e della Brianza",
-"Italy_Lombardy_Pavia":"provincia di Pavia",
-"Italy_Lombardy_Sondrio":"provincia di Sondrio",
-"Italy_Lombardy_Varese":"provincia di Varese",
+"Italy_Lombardy_Bergamo":"Provincia di Bergamo",
+"Italy_Lombardy_Brescia":"Provincia di Brescia",
+"Italy_Lombardy_Como":"Provincia di Como",
+"Italy_Lombardy_Cremona":"Provincia di Cremona",
+"Italy_Lombardy_Lecco":"Provincia di Lecco",
+"Italy_Lombardy_Lodi":"Provincia di Lodi",
+"Italy_Lombardy_Mantua":"Provincia di Mantova",
+"Italy_Lombardy_Milan":"Provincia di Milano",
+"Italy_Lombardy_Monza and Brianza":"Provincia di Monza - Brianza",
+"Italy_Lombardy_Pavia":"Provincia di Pavia",
+"Italy_Lombardy_Sondrio":"Provincia di Sondrio",
+"Italy_Lombardy_Varese":"Provincia di Varese",
 "Italy_Marche":"Marche",
 "Italy_Molise":"Molise",
 "Italy_Piemont":"Piemonte",
-"Italy_Piemont_Alessandria":"provincia di Alessandria",
-"Italy_Piemont_Asti":"provincia di Asti",
-"Italy_Piemont_Biella":"provincia di Biella",
-"Italy_Piemont_Cuneo":"provincia di Cuneo",
-"Italy_Piemont_Novara":"provincia di Novara",
-"Italy_Piemont_Torino":"provincia di Torino",
-"Italy_Piemont_Verbano-Cusio-Ossola":"provincia del Verbano-Cusio-Ossola",
-"Italy_Piemont_Vercelli":"provincia di Vercelli",
+"Italy_Piemont_Alessandria":"Provincia di Alessandria",
+"Italy_Piemont_Asti":"Provincia di Asti",
+"Italy_Piemont_Biella":"Provincia di Biella",
+"Italy_Piemont_Cuneo":"Provincia di Cuneo",
+"Italy_Piemont_Novara":"Provincia di Novara",
+"Italy_Piemont_Torino":"Provincia di Torino",
+"Italy_Piemont_Verbano-Cusio-Ossola":"Provincia del Verbano-Cusio-Ossola",
+"Italy_Piemont_Vercelli":"Provincia di Vercelli",
 "Italy_Sardinia":"Sardegna",
 "Italy_Sicily":"Sicilia",
 "Italy_Trentino-Alto Adige Sudtirol":"Trentino-Alto Adige",
@@ -572,70 +572,70 @@
 "Italy_Tuscany_Massa e Carrara":"Toscana - Nord Ovest",
 "Italy_Umbria":"Umbria",
 "Italy_Veneto":"Veneto",
-"Italy_Veneto_Belluno":"provincia di Belluno",
-"Italy_Veneto_Padova":"provincia di Padova",
-"Italy_Veneto_Rovigo":"provincia di Rovigo",
-"Italy_Veneto_Treviso":"provincia di Treviso",
-"Italy_Veneto_Venezia":"provincia di Venezia",
-"Italy_Veneto_Verona":"provincia di Verona",
-"Italy_Veneto_Vicenza":"provincia di Vicenza",
+"Italy_Veneto_Belluno":"Provincia di Belluno",
+"Italy_Veneto_Padova":"Provincia di Padova",
+"Italy_Veneto_Rovigo":"Provincia di Rovigo",
+"Italy_Veneto_Treviso":"Provincia di Treviso",
+"Italy_Veneto_Venezia":"Provincia di Venezia",
+"Italy_Veneto_Verona":"Provincia di Verona",
+"Italy_Veneto_Vicenza":"Provincia di Vicenza",
 "Jamaica":"Giamaica",
 "Japan":"Giappone",
 "Japan_Chubu Region":"Regione di Chūbu",
-"Japan_Chubu Region_Aichi":"prefettura di Aichi",
-"Japan_Chubu Region_Fukui":"prefettura di Fukui",
-"Japan_Chubu Region_Gifu":"prefettura di Gifu",
-"Japan_Chubu Region_Ishikawa":"prefettura di Ishikawa",
-"Japan_Chubu Region_Nagano":"prefettura di Nagano",
-"Japan_Chubu Region_Niigata":"prefettura di Niigata",
-"Japan_Chubu Region_Shizuoka":"prefettura di Shizuoka",
-"Japan_Chubu Region_Toyama":"prefettura di Toyama",
-"Japan_Chubu Region_Yamanashi":"prefettura di Yamanashi",
-"Japan_Chugoku Region":"Chūgoku",
-"Japan_Chugoku Region_Hiroshima":"prefettura di Hiroshima",
-"Japan_Chugoku Region_Okayama":"prefettura di Okayama",
-"Japan_Chugoku Region_Shimane":"prefettura di Shimane",
-"Japan_Chugoku Region_Tottori":"prefettura di Tottori",
-"Japan_Chugoku Region_Yamaguchi":"prefettura di Yamaguchi",
-"Japan_Hokkaido Region":"prefettura di Hokkaidō",
-"Japan_Hokkaido Region_East":"prefettura di Hokkaidō — Est",
-"Japan_Hokkaido Region_North":"prefettura di Hokkaidō — Nord",
-"Japan_Hokkaido Region_West":"prefettura di Hokkaidō — Ovest",
-"Japan_Kanto":"Kantō",
-"Japan_Kanto_Chiba":"prefettura di Chiba",
-"Japan_Kanto_Gunma":"prefettura di Gunma",
-"Japan_Kanto_Ibaraki":"prefettura di Ibaraki",
-"Japan_Kanto_Kanagawa":"prefettura di Kanagawa",
-"Japan_Kanto_Saitama":"prefettura di Saitama",
-"Japan_Kanto_Tochigi":"prefettura di Tochigi",
-"Japan_Kanto_Tokyo":"Tokyo",
-"Japan_Kinki Region":"Kansai",
-"Japan_Kinki Region_Mie":"prefettura di Mie",
-"Japan_Kinki Region_Nara":"prefettura di Nara",
-"Japan_Kinki Region_Osaka":"prefettura di Osaka",
-"Japan_Kinki Region_Wakayama":"prefettura di Wakayama",
+"Japan_Chubu Region_Aichi":"Prefettura di Aichi",
+"Japan_Chubu Region_Fukui":"Prefettura di Fukui",
+"Japan_Chubu Region_Gifu":"Prefettura di Gifu",
+"Japan_Chubu Region_Ishikawa":"Prefettura di Ishikawa",
+"Japan_Chubu Region_Nagano":"Prefettura di Nagano",
+"Japan_Chubu Region_Niigata":"Prefettura di Niigata",
+"Japan_Chubu Region_Shizuoka":"Prefettura di Shizuoka",
+"Japan_Chubu Region_Toyama":"Prefettura di Toyama",
+"Japan_Chubu Region_Yamanashi":"Prefettura di Yamanashi",
+"Japan_Chugoku Region":"Regione di Chūgoku",
+"Japan_Chugoku Region_Hiroshima":"Prefettura di Hiroshima",
+"Japan_Chugoku Region_Okayama":"Prefettura di Okayama",
+"Japan_Chugoku Region_Shimane":"Prefettura di Shimane",
+"Japan_Chugoku Region_Tottori":"Prefettura di Tottori",
+"Japan_Chugoku Region_Yamaguchi":"Prefettura di Yamaguchi",
+"Japan_Hokkaido Region":"Prefettura di Hokkaidō",
+"Japan_Hokkaido Region_East":"Prefettura di Hokkaidō — Est",
+"Japan_Hokkaido Region_North":"Prefettura di Hokkaidō — Nord",
+"Japan_Hokkaido Region_West":"Prefettura di Hokkaidō — Ovest",
+"Japan_Kanto":"Regione di Kantō",
+"Japan_Kanto_Chiba":"Prefettura di Chiba",
+"Japan_Kanto_Gunma":"Prefettura di Gunma",
+"Japan_Kanto_Ibaraki":"Prefettura di Ibaraki",
+"Japan_Kanto_Kanagawa":"Prefettura di Kanagawa",
+"Japan_Kanto_Saitama":"Prefettura di Saitama",
+"Japan_Kanto_Tochigi":"Prefettura di Tochigi",
+"Japan_Kanto_Tokyo":"Prefettura di Tokyo",
+"Japan_Kinki Region":"Regione di Kansai",
+"Japan_Kinki Region_Mie":"Prefettura di Mie",
+"Japan_Kinki Region_Nara":"Prefettura di Nara",
+"Japan_Kinki Region_Osaka":"Prefettura di Osaka",
+"Japan_Kinki Region_Wakayama":"Prefettura di Wakayama",
 "Japan_Kyushu Region":"Kyūshū",
-"Japan_Kyushu Region_Fukuoka":"prefettura di Fukuoka",
-"Japan_Kyushu Region_Kagoshima":"prefettura di Kagoshima",
-"Japan_Kyushu Region_Kumamoto":"prefettura di Kumamoto",
-"Japan_Kyushu Region_Miyazaki":"prefettura di Miyazaki",
-"Japan_Kyushu Region_Nagasaki":"prefettura di Nagasaki",
-"Japan_Kyushu Region_Oita":"prefettura di Ōita",
-"Japan_Kyushu Region_Okinawa":"prefettura di Okinawa",
+"Japan_Kyushu Region_Fukuoka":"Prefettura di Fukuoka",
+"Japan_Kyushu Region_Kagoshima":"Prefettura di Kagoshima",
+"Japan_Kyushu Region_Kumamoto":"Prefettura di Kumamoto",
+"Japan_Kyushu Region_Miyazaki":"Prefettura di Miyazaki",
+"Japan_Kyushu Region_Nagasaki":"Prefettura di Nagasaki",
+"Japan_Kyushu Region_Oita":"Prefettura di Ōita",
+"Japan_Kyushu Region_Okinawa":"Prefettura di Okinawa",
 "Japan_Kyushu Region_Saga":"Prefettura di Saga",
 "Japan_Shikoku Region":"Shikoku",
-"Japan_Shikoku Region_Ehime":"prefettura di Ehime",
-"Japan_Shikoku Region_Kagawa":"prefettura di Kagawa",
-"Japan_Shikoku Region_Kochi":"prefettura di Kōchi",
-"Japan_Shikoku Region_Kyoto":"prefettura di Kyoto",
-"Japan_Shikoku Region_Tokushima":"prefettura di Tokushima",
+"Japan_Shikoku Region_Ehime":"Prefettura di Ehime",
+"Japan_Shikoku Region_Kagawa":"Prefettura di Kagawa",
+"Japan_Shikoku Region_Kochi":"Prefettura di Kōchi",
+"Japan_Shikoku Region_Kyoto":"Prefettura di Kyoto",
+"Japan_Shikoku Region_Tokushima":"Prefettura di Tokushima",
 "Japan_Tohoku":"Regione di Tōhoku",
-"Japan_Tohoku_Akita":"prefettura di Akita",
-"Japan_Tohoku_Aomori":"prefettura di Aomori",
-"Japan_Tohoku_Fukushima":"prefettura di Fukushima",
-"Japan_Tohoku_Iwate":"prefettura di Iwate",
-"Japan_Tohoku_Miyagi":"prefettura di Miyagi",
-"Japan_Tohoku_Yamagata":"prefettura di Yamagata",
+"Japan_Tohoku_Akita":"Prefettura di Akita",
+"Japan_Tohoku_Aomori":"Prefettura di Aomori",
+"Japan_Tohoku_Fukushima":"Prefettura di Fukushima",
+"Japan_Tohoku_Iwate":"Prefettura di Iwate",
+"Japan_Tohoku_Miyagi":"Prefettura di Miyagi",
+"Japan_Tohoku_Yamagata":"Prefettura di Yamagata",
 "Jersey":"Baliato di Jersey",
 "Jerusalem":"Gerusalemme",
 "Jordan":"Giordania",
@@ -726,10 +726,10 @@
 "New Jersey":"New Jersey",
 "New York":"New York",
 "New Zealand":"Nuova Zelanda",
-"New Zealand North_Auckland":"Nord — Auckland",
-"New Zealand North_Wellington":"Nord — Wellington",
-"New Zealand South_Canterbury":"Sud — Canterbury",
-"New Zealand South_Southland":"Sud — Southland",
+"New Zealand North_Auckland":"Auckland - Nord",
+"New Zealand North_Wellington":"Wellington - Nord",
+"New Zealand South_Canterbury":"Canterbury - Sud",
+"New Zealand South_Southland":"Southland - Sud",
 "Nicaragua":"Nicaragua",
 "Niger":"Niger",
 "Nigeria":"Nigeria",
@@ -742,12 +742,12 @@
 "Norway_Central":"Oslo",
 "Norway_Hedmark":"Hedmark",
 "Norway_Jan Mayen":"Jan Mayen",
-"Norway_Northern":"Nord-Norge",
+"Norway_Northern":"Norvegia del Nord",
 "Norway_Oppland":"Oppland",
-"Norway_Southern":"Sørlandet",
+"Norway_Southern":"Sørlandet (Norvegia del Sud)",
 "Norway_Svalbard":"Isole Svalbard",
 "Norway_Trondelag":"Trøndelag",
-"Norway_Western":"Vestlandet",
+"Norway_Western":"Vestlandet (Norvegia dell'Ovest)",
 "Ohio":"Ohio",
 "Oklahoma":"Oklahoma",
 "Oman":"Oman",
@@ -765,42 +765,42 @@
 "Peru_North":"Perù — Nord",
 "Peru_South":"Perù — Sud",
 "Philippines":"Filippine",
-"Philippines_Luzon_Manila":"Regione Capitale Nazionale",
+"Philippines_Luzon_Manila":"Regione di Manila",
 "Philippines_Luzon_North":"Luzon — Nord",
 "Philippines_Luzon_South":"Luzon — Sud",
 "Philippines_Mindanao":"Mindanao",
 "Philippines_Visayas":"Visayas",
-"Pitcairn Islands":"isole Pitcairn",
+"Pitcairn Islands":"Isole Pitcairn",
 "Poland":"Polonia",
-"Poland_Greater Poland Voivodeship":"voivodato della Grande Polonia",
-"Poland_Kuyavian-Pomeranian Voivodeship":"voivodato della Cuiavia-Pomerania",
-"Poland_Lesser Poland Voivodeship":"voivodato della Piccola Polonia",
-"Poland_Lodz Voivodeship":"voivodato di Łódź",
-"Poland_Lower Silesian Voivodeship":"voivodato della Bassa Slesia",
-"Poland_Lublin Voivodeship":"voivodato di Lublino",
-"Poland_Lubusz Voivodeship":"voivodato di Lubusz",
-"Poland_Masovian Voivodeship":"voivodato della Masovia",
-"Poland_Opole Voivodeship":"voivodato di Opole",
-"Poland_Podlaskie Voivodeship":"voivodato della Podlachia",
-"Poland_Pomeranian Voivodeship":"voivodato della Pomerania",
-"Poland_Silesian Voivodeship":"voivodato della Slesia",
-"Poland_Subcarpathian Voivodeship":"voivodato della Precarpazia",
-"Poland_Swietokrzyskie Voivodeship":"voivodato della Santacroce",
-"Poland_Warmian-Masurian Voivodeship":"voivodato della Varmia-Masuria",
-"Poland_West Pomeranian Voivodeship":"voivodato della Pomerania Occidentale",
+"Poland_Greater Poland Voivodeship":"Voivodato della Grande Polonia",
+"Poland_Kuyavian-Pomeranian Voivodeship":"Voivodato della Cuiavia-Pomerania",
+"Poland_Lesser Poland Voivodeship":"Voivodato della Piccola Polonia",
+"Poland_Lodz Voivodeship":"Voivodato di Łódź",
+"Poland_Lower Silesian Voivodeship":"Voivodato della Bassa Slesia",
+"Poland_Lublin Voivodeship":"Voivodato di Lublino",
+"Poland_Lubusz Voivodeship":"Voivodato di Lubusz",
+"Poland_Masovian Voivodeship":"Voivodato della Masovia",
+"Poland_Opole Voivodeship":"Voivodato di Opole",
+"Poland_Podlaskie Voivodeship":"Voivodato della Podlachia",
+"Poland_Pomeranian Voivodeship":"Voivodato della Pomerania",
+"Poland_Silesian Voivodeship":"Voivodato della Slesia",
+"Poland_Subcarpathian Voivodeship":"Voivodato della Precarpazia",
+"Poland_Swietokrzyskie Voivodeship":"Voivodato della Santacroce",
+"Poland_Warmian-Masurian Voivodeship":"Voivodato della Varmia-Masuria",
+"Poland_West Pomeranian Voivodeship":"Voivodato della Pomerania Occidentale",
 "Portugal":"Portogallo",
 "Portugal_North":"Portogallo — Nord",
 "Portugal_South":"Portogallo — Sud",
 "Qatar":"Qatar",
 "Republic of Kosovo":"Kosovo",
 "Romania":"Romania",
-"Romania_Centre":"Centru",
-"Romania_North_East":"Nord-Est",
-"Romania_North_West":"Nord-Ovest",
-"Romania_South":"Sud",
-"Romania_South_East":"Sud-Est",
-"Romania_South_West":"Sud-Ovest",
-"Romania_West":"Ovest",
+"Romania_Centre":"Romania - Centro",
+"Romania_North_East":"Romania - Nord-Est",
+"Romania_North_West":"Romania - Nord-Ovest",
+"Romania_South":"Romania - Sud",
+"Romania_South_East":"Romania - Sud-Est",
+"Romania_South_West":"Romania - Sud-Ovest",
+"Romania_West":"Romania - Ovest",
 "Russia_Altai Krai":"Territorio dell'Altaj",
 "Russia_Altai Republic":"Repubblica dell'Altaj",
 "Russia_Amur Oblast":"Oblast' dell'Amur",
@@ -896,7 +896,7 @@
 "Saint Martin":"Saint-Martin",
 "Saint Vincent and the Grenadines":"Saint Vincent e Grenadine",
 "Samoa":"Samoa",
-"San Marino":"San Marino",
+"San Marino":"Repubblica di San Marino",
 "Sao Tome and Principe":"São Tomé e Príncipe",
 "Saudi Arabia":"Arabia Saudita",
 "Senegal":"Senegal",
@@ -905,27 +905,27 @@
 "Sierra Leone":"Sierra Leone",
 "Singapore":"Singapore",
 "Slovakia":"Slovacchia",
-"Slovakia_Region of Banska Bystrica":"regione di Banská Bystrica",
-"Slovakia_Region of Bratislava":"regione di Bratislava",
-"Slovakia_Region of Kosice":"regione di Košice",
-"Slovakia_Region of Nitra":"regione di Nitra",
-"Slovakia_Region of Presov":"regione di Prešov",
-"Slovakia_Region of Trencin":"regione di Trenčín",
-"Slovakia_Region of Trnava":"regione di Trnava",
-"Slovakia_Region of Zilina":"regione di Žilina",
+"Slovakia_Region of Banska Bystrica":"Regione di Banská Bystrica",
+"Slovakia_Region of Bratislava":"Regione di Bratislava",
+"Slovakia_Region of Kosice":"Regione di Košice",
+"Slovakia_Region of Nitra":"Regione di Nitra",
+"Slovakia_Region of Presov":"Regione di Prešov",
+"Slovakia_Region of Trencin":"Regione di Trenčín",
+"Slovakia_Region of Trnava":"Regione di Trnava",
+"Slovakia_Region of Zilina":"Regione di Žilina",
 "Slovenia":"Slovenia",
 "Solomon Islands":"Isole Salomone",
 "Somalia":"Somalia",
 "South Africa":"Sudafrica",
-"South Africa_Eastern Cape":"provincia del Capo Orientale",
-"South Africa_Free State":"Stato libero",
+"South Africa_Eastern Cape":"Provincia del Capo Orientale",
+"South Africa_Free State":"Sudafrica - Stato libero",
 "South Africa_Gauteng":"Gauteng",
 "South Africa_KwaZulu-Natal":"KwaZulu-Natal",
-"South Africa_Limpopo":"provincia del Limpopo",
+"South Africa_Limpopo":"Provincia del Limpopo",
 "South Africa_Mpumalanga":"Mpumalanga",
-"South Africa_North West":"provincia del Nordovest",
-"South Africa_Northern Cape":"provincia del Capo Settentrionale",
-"South Africa_Western Cape":"provincia del Capo Occidentale",
+"South Africa_North West":"Sudafrica - Provincia del Nordovest",
+"South Africa_Northern Cape":"Sudafrica - Provincia del Capo Settentrionale",
+"South Africa_Western Cape":"Sudafrica - Provincia del Capo Occidentale",
 "South Carolina":"Carolina del Sud",
 "South Georgia and the South Sandwich Islands":"Georgia del Sud e isole Sandwich meridionali",
 "South Korea":"Corea del Sud",
@@ -936,9 +936,9 @@
 "Spain":"Spagna",
 "Spain_Andalusia":"Andalusia",
 "Spain_Aragon":"Aragona",
-"Spain_Balearic Islands":"isole Baleari",
+"Spain_Balearic Islands":"Isole Baleari",
 "Spain_Basque Country":"Paesi Baschi",
-"Spain_Canary Islands":"isole Canarie",
+"Spain_Canary Islands":"Isole Canarie",
 "Spain_Cantabria":"Cantabria",
 "Spain_Castile and Leon":"Castiglia e León",
 "Spain_Castile-La Mancha":"Castiglia-La Mancia",
@@ -947,15 +947,15 @@
 "Spain_Catalonia_Provincia de Lleida":"Catalogna – Provincia di Lleida",
 "Spain_Catalonia_Provincia de Tarragona":"Catalogna – Provincia di Tarragona",
 "Spain_Ceuta":"Ceuta",
-"Spain_Community of Madrid":"comunità di Madrid",
+"Spain_Community of Madrid":"Comunità di Madrid",
 "Spain_Comunidad Foral de Navarra":"Navarra",
 "Spain_Extremadura":"Estremadura",
 "Spain_Galicia":"Galizia",
 "Spain_La Rioja":"La Rioja",
 "Spain_Melilla":"Melilla",
 "Spain_Principado de Asturias":"Asturie",
-"Spain_Region de Murcia":"regione di Murcia",
-"Spain_Valencian Community":"comunità Valenzana",
+"Spain_Region de Murcia":"Regione di Murcia",
+"Spain_Valencian Community":"Comunità Valenziana",
 "Sri Lanka":"Sri Lanka",
 "Sudan":"Sudan",
 "Suriname":"Suriname",
@@ -964,7 +964,7 @@
 "Sweden_Bergslagen":"Bergslagen",
 "Sweden_Malardalen":"Mälardalen",
 "Sweden_Mellannorrland":"Mellannorrland",
-"Sweden_Norra Sverige":"Norrland",
+"Sweden_Norra Sverige":"Norrland (Svezia del Sud)",
 "Sweden_Ostra Gotaland":"Ostra Götaland",
 "Sweden_Sodra Gotaland":"Södra Götaland",
 "Sweden_Vastra Gotaland":"Västra Götaland",
@@ -972,9 +972,9 @@
 "Switzerland_Central":"Svizzera centrale",
 "Switzerland_Eastern":"Svizzera nordorientale",
 "Switzerland_Espace Mittelland":"Espace Mittelland",
-"Switzerland_Lake Geneva region":"Regione del Lemano",
+"Switzerland_Lake Geneva region":"Regione del Lemano (Lago di Ginevra)",
 "Switzerland_Northwestern":"Basilea e Argovia",
-"Switzerland_Ticino":"canton Ticino",
+"Switzerland_Ticino":"Canton Ticino",
 "Switzerland_Zurich":"Area metropolitana di Zurigo",
 "Syria":"Siria",
 "Taiwan":"Taiwan",
@@ -1000,18 +1000,18 @@
 "Turkey_Mediterranean Region":"Regione del Mar Mediterraneo",
 "Turkey_Southeastern Anatolia Region":"Regione dell'Anatolia Sud Orientale",
 "Turkmenistan":"Turkmenistan",
-"Turks and Caicos Islands":"Turks e Caicos",
+"Turks and Caicos Islands":"Turks e Isole Caicos",
 "Tuvalu":"Tuvalu",
 "UK_England_East Midlands":"Midlands Orientali",
 "UK_England_East of England_Essex":"Est dell'Inghilterra — Essex",
 "UK_England_East of England_Norfolk":"Est dell'Inghilterra — Norfolk",
 "UK_England_Greater London":"Greater London",
-"UK_England_North East England":"Nord Est",
-"UK_England_North West England":"Nord Ovest",
-"UK_England_South East_Brighton":"Sud Est — Brighton",
-"UK_England_South East_Oxford":"Sud Est — Oxford",
-"UK_England_South West England_Bristol":"Sud Ovest — Bristol",
-"UK_England_South West England_Cornwall":"Sud Ovest — Cornovaglia",
+"UK_England_North East England":"Inghilterra - Nord Est",
+"UK_England_North West England":"Inghilterra - Nord Ovest",
+"UK_England_South East_Brighton":"Inghilterra - Sud Est — Brighton",
+"UK_England_South East_Oxford":"Inghilterra - Sud Est — Oxford",
+"UK_England_South West England_Bristol":"Inghilterra - Sud Ovest — Bristol",
+"UK_England_South West England_Cornwall":"Inghilterra - Sud Ovest — Cornovaglia",
 "UK_England_West Midlands":"Midlands Occidentali",
 "UK_England_Yorkshire and the Humber":"Yorkshire e Humber",
 "UK_Northern Ireland":"Irlanda del Nord",
@@ -1072,7 +1072,7 @@
 "US_Louisiana_New Orleans":"New Orleans",
 "US_Maine":"Maine",
 "US_Maryland_Baltimore":"Baltimora",
-"US_Maryland_and_DC":"Ovest, Washington",
+"US_Maryland_and_DC":"Washington Ovest",
 "US_Massachusetts_Boston":"Boston",
 "US_Massachusetts_Central":"Worcester",
 "US_Massachusetts_Plymouth":"Plymouth",
@@ -1135,7 +1135,7 @@
 "US_Texas_Tyler":"Tyler",
 "US_Texas_Wako":"Waco",
 "US_Texas_West":"Odessa",
-"US_United States Minor Outlying Islands":"Isole minori esterne degli Stati Uniti d'America",
+"US_United States Minor Outlying Islands":"Isole minori esterne degli USA",
 "US_Utah":"Utah",
 "US_Vermont":"Vermont",
 "US_Virginia_Chesapeake":"Chesapeake",
@@ -1192,7 +1192,7 @@
 "Yemen":"Yemen",
 "Zambia":"Zambia",
 "Zimbabwe":"Zimbabwe",
-"Argentina_Santa Fe":"provincia di Santa Fe",
+"Argentina_Santa Fe":"Provincia di Santa Fe",
 "Australia_Brisbane":"Brisbane",
 "Australia_Sydney":"Sydney",
 "Austria_Styria_Graz":"Stiria — Graz",
@@ -1232,11 +1232,11 @@
 "Iran_East":"Iran — Est",
 "Iraq_North":"Iraq del Nord",
 "Iraq_South":"Iraq centrale e meridionale",
-"Japan_Chubu Region_Aichi_Nagoya":"prefettura di Aichi — Nagoya",
-"Japan_Chubu Region_Aichi_Toyohashi":"prefettura di Aichi — Toyohashi",
+"Japan_Chubu Region_Aichi_Nagoya":"Prefettura di Aichi — Nagoya",
+"Japan_Chubu Region_Aichi_Toyohashi":"Prefettura di Aichi — Toyohashi",
 "Japan_Hokkaido Region_Sapporo":"Sapporo",
 "Japan_Kinki Region_Osaka_Osaka":"Osaka",
-"Japan_Kinki Region_Osaka_West":"prefettura di Osaka — Ovest",
+"Japan_Kinki Region_Osaka_West":"Prefettura di Osaka — Ovest",
 "Kazakhstan_North":"Kazakistan — Nord",
 "Kazakhstan_South":"Kazakistan — Sud",
 "Lithuania_East":"Lituania — Est",
@@ -1244,8 +1244,8 @@
 "Mexico_Chihuahua":"Chihuahua",
 "Mexico_Sonora":"Sonora",
 "Nepal_Kathmandu":"Katmandu",
-"Nepal_Madhyamanchal":"Regione di Sviluppo Centrale",
-"Nepal_Purwanchal":"Regione di Sviluppo Orientale",
+"Nepal_Madhyamanchal":"Nepal - Regione di Sviluppo Centrale",
+"Nepal_Purwanchal":"Nepal - Regione di Sviluppo Orientale",
 "Nigeria_North":"Nigeria — Nord",
 "Nigeria_South":"Nigeria — Sud",
 "Norway_Hordaland":"Hordaland",
@@ -1337,8 +1337,8 @@
 "Germany_Schleswig-Holstein_Flensburg":"Schleswig-Holstein — Flensburgo",
 "Germany_Schleswig-Holstein_Kiel":"Schleswig-Holstein — Kiel",
 "Portugal_Porto":"Porto",
-"UK_England_North West England_Lancaster":"Nord Ovest — Lancaster",
-"UK_England_North West England_Manchester":"Nord Ovest — Manchester",
+"UK_England_North West England_Lancaster":"Inghilterra - Nord Ovest — Lancaster",
+"UK_England_North West England_Manchester":"Inghilterra - Nord Ovest — Manchester",
 "US_Florida_Gainesville":"Gainesville",
 "US_Texas_Victoria":"Victoria",
 "US_Virginia_Norfolk":"Norfolk",
@@ -1350,7 +1350,7 @@
 "Andorra Description":"Andorra la Vella, La Massana, Ordino",
 "Angola Description":"Luanda, Lobito, Namibe",
 "Anguilla Description":"The Valley, George Hill, Stoney Ground",
-"Antarctica Description":"McMurdo Station, Chilean research station „Villa Las Estrellas”, Rocky Cove",
+"Antarctica Description":"McMurdo Station, Chilean research station, Villa Las Estrellas”, Rocky Cove",
 "Antigua and Barbuda Description":"St. John's, English Harbour, Freetown",
 "Argentina_Buenos Aires_Buenos Aires Description":"Buenos Aires, José C. Paz, González Catán",
 "Argentina_Buenos Aires_North Description":"Dolores, Pinamar, Villa Gesell",
diff --git a/data/sound-strings/it.json/localize.json b/data/sound-strings/it.json/localize.json
index 05f879762..bc87912d6 100644
--- a/data/sound-strings/it.json/localize.json
+++ b/data/sound-strings/it.json/localize.json
@@ -12,7 +12,7 @@
 "leave_the_roundabout":"Uscire dalla rotonda.",
 "leave_the_roundabout_street":"NULL",
 "leave_the_roundabout_street_verb":"NULL",
-"make_a_slight_left_turn":"Rimani sulla sinistra.",
+"make_a_slight_left_turn":"Mantieni la sinistra.",
 "make_a_slight_left_turn_street":"NULL",
 "make_a_slight_left_turn_street_verb":"NULL",
 "make_a_left_turn":"Gira a sinistra.",
@@ -33,13 +33,13 @@
 "in_50_meters":"Tra cinquanta metri",
 "in_100_meters":"Tra cento metri",
 "in_200_meters":"Tra duecento metri",
-"in_250_meters":"Tra duecento cinquanta metri",
+"in_250_meters":"Tra duecentocinquanta metri",
 "in_300_meters":"Tra trecento metri",
 "in_400_meters":"Tra quattrocento metri",
 "in_500_meters":"Tra cinquecento metri",
 "in_600_meters":"Tra seicento metri",
 "in_700_meters":"Tra settecento metri",
-"in_750_meters":"Tra settecento cinquanta metri",
+"in_750_meters":"Tra settecentocinquanta metri",
 "in_800_meters":"Tra ottocento metri",
 "in_900_meters":"Tra novecento metri",
 "in_1_kilometer":"Tra un chilometro",
diff --git a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
index 07c6f9663..450cbb70c 100644
--- a/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/fr.lproj/Localizable.strings
@@ -444,7 +444,7 @@
 "dialog_routing_disclaimer_priority" = "— Les conditions de circulation, le code de la route et les panneaux de signalisation ont la priorité sur les conseils de navigation ;";
 "dialog_routing_disclaimer_precision" = "— La carte peut être erronée et l'itinéraire proposé n'est pas forcément optimal pour arriver à destination ;";
 "dialog_routing_disclaimer_recommendations" = "— L'itinéraire proposé doit être considéré comme une simple recommandation ;";
-"dialog_routing_disclaimer_borders" = "— Soyez vigilants à proximité des zones frontalières : les itinéraires générés par l'application peuvent parfois franchir les frontières entre états dans des zones interdites ;";
+"dialog_routing_disclaimer_borders" = "— Faites attention à proximité des zones frontalières : les itinéraires générés par l'application peuvent parfois franchir les frontières entre états dans des zones interdites ;";
 "dialog_routing_disclaimer_beware" = "Restez vigilants et soyez prudents sur la route !";
 "dialog_routing_check_gps" = "Vérifiez le signal GPS";
 "dialog_routing_error_location_not_found" = "Impossible de créer l'itinéraire. Les coordonnées GPS actuelles n'ont pas pu être déterminées.";
@@ -826,7 +826,7 @@
 "avoid_ferry" = "Éviter les ferries";
 "avoid_motorways" = "Éviter les autoroutes";
 "unable_to_calc_alert_title" = "Impossible de calculer l'itinéraire";
-"unable_to_calc_alert_subtitle" = "Malheureusement, nous n'avons pas pu créer l'itinéraire avec les options sélectionnées. Modifiez les paramètres et réessayez";
+"unable_to_calc_alert_subtitle" = "Malheureusement, nous n'avons pas pu créer l'itinéraire avec les options sélectionnées. Modifiez les paramètres et réessayez.";
 "define_to_avoid_btn" = "Définissez les routes à éviter";
 "change_driving_options_btn" = "Paramètres d'itinéraire activés";
 "toll_road" = "Route à péage";
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/hu.lproj/InfoPlist.strings
index 4e3403e29..882eb5fb1 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/InfoPlist.strings
@@ -3,7 +3,7 @@
 "search" = "Keresés";
 
 /* Used in home screen quick actions. */
-"bookmarks_and_tracks" = "Könyvjelzők és nyomvonalak";
+"bookmarks_and_tracks" = "Könyvjelzők és útvonalak";
 
 /* Used in home screen quick actions. */
 "route" = "Útvonal";
diff --git a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
index 3afde3716..f6feb17dd 100644
--- a/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/hu.lproj/Localizable.strings
@@ -22,7 +22,7 @@
 "miles" = "Mérföld";
 
 /* A text for current gps location point/arrow selected on the map */
-"core_my_position" = "Saját helyzet";
+"core_my_position" = "Saját helyzetem";
 
 /* Update maps later button text */
 "later" = "Később";
@@ -66,7 +66,7 @@
 "bookmarks" = "Könyvjelzők";
 
 /* "Bookmarks and Tracks" dialog title, also sync it with iphone/plist.txt */
-"bookmarks_and_tracks" = "Könyvjelzők és nyomvonalak";
+"bookmarks_and_tracks" = "Könyvjelzők és útvonalak";
 
 /* Default bookmark list name */
 "core_my_places" = "Saját helyek";
@@ -761,7 +761,7 @@
 "bookmarks_create_new_group" = "Új lista létrehozása";
 
 /* Bookmark categories screen, button that opens folder selection dialog to import KML/KMZ/GPX/KMB files */
-"bookmarks_import" = "Könyvjelzők és nyomvonalak importálása";
+"bookmarks_import" = "Könyvjelzők és útvonalak importálása";
 "downloader_hide_screen" = "Kijelző elrejtése";
 "downloader_percent" = "%@ (%@ / %@)";
 "downloader_process" = "%@ letöltése…";
@@ -807,7 +807,7 @@
 "power_managment_setting_never" = "Soha";
 "power_managment_setting_auto" = "Amikor az akkumulátor lemerül";
 "power_managment_setting_manual_max" = "Mindig";
-"enable_logging_warning_message" = "Ha ideiglenesen engedélyezi ezt az opciót, akkor a „Súgó” párbeszédpanel „Hibajelentés” menüpontjának használatával rögzítheti és kézzel küldheti el nekünk a problémával kapcsolatos részletes diagnosztikai naplókat. A naplók tartalmazhatnak helyadatokat.";
+"enable_logging_warning_message" = "Ha ideiglenesen engedélyezi ezt a lehetőséget, akkor rögzítheti, és a „A CoMaps névjegye” képernyőn a „HIBA JELENTÉSE” gombra katintva elküldheti nekünk a hibával, problémával kapcsolatos részletes diagnosztikai naplókat. A naplók tartalmazhatnak helyadatokat.";
 "driving_options_title" = "Útvonaltervezési beállítások";
 
 /* Recommended length for CarPlay and Android Auto is around 25-27 characters */
@@ -993,7 +993,7 @@
 "button_layer_outdoor" = "Szabadtéri";
 
 /* Bookmark categories screen, button that opens share dialog to export all bookmarks and tracks */
-"bookmarks_export" = "Az összes könyvjelző és nyomvonal exportálása";
+"bookmarks_export" = "Az összes könyvjelző és útvonal exportálása";
 
 /* Text for the editing the Track's color button. */
 "change_color" = "Szín módosítása";
@@ -1078,10 +1078,10 @@
 "continue_recording" = "Rögzítés folytatása";
 
 /* Title for the alert when saving a track recording. */
-"track_recording_alert_title" = "Elmenti a könyvjelzők és nyomvonalakba?";
+"track_recording_alert_title" = "Elmenti a könyvjelzők és útvonalak közé?";
 
 /* Message for the toast when saving the track recording is finished but nothing to save. */
-"track_recording_toast_nothing_to_save" = "A nyomvonal üres – nincs mit menteni";
+"track_recording_toast_nothing_to_save" = "Az útvonal üres – nincs mit menteni";
 "edit_track" = "Nyomvonal szerkesztése";
 "osm_profile_view_notes" = "Jegyzetek megtekintése";
 "osm_profile_view_edit_history" = "Szerkesztési előzmények megtekintése";
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/InfoPlist.strings b/iphone/Maps/LocalizedStrings/it.lproj/InfoPlist.strings
index 0aecf51f4..fef137070 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/InfoPlist.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/InfoPlist.strings
@@ -9,7 +9,7 @@
 "route" = "Percorso";
 
 /* Needed to explain why we always require access to GPS coordinates, and not only when the app is active. */
-"NSLocationAlwaysUsageDescription" = "Il rilevamento della posizione corrente in background è necessario per godere appieno delle funzionalità dell'app. Viene utilizzata per la navigazione e il salvataggio delle traccie percorse di recente.";
+"NSLocationAlwaysUsageDescription" = "Il rilevamento della posizione corrente in background è necessario per godere appieno delle funzionalità dell'app. Viene utilizzata per la navigazione e il salvataggio delle tracce percorse di recente.";
 
 /* Needed to explain why we require access to GPS coordinates when the app is active. */
 "NSLocationWhenInUseUsageDescription" = "La posizione corrente viene utilizzata durante la navigazione e per il salvataggio dei percorsi.";
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
index 5e3f2689f..9fdfbfa57 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/Localizable.strings
@@ -43,10 +43,10 @@
 "country_status_download_failed" = "Download fallito";
 
 /* Text in About screen */
-"about_headline" = "Progetto Aperto e sviluppato dalla comunità";
+"about_headline" = "Progetto aperto e sviluppato dalla comunità";
 
 /* Text in About screen */
-"about_proposition_1" = "Usabile senza connessione, veloce e facile da usare";
+"about_proposition_1" = "Utilizzabile senza connessione, veloce e facile da usare";
 
 /* Text in About screen */
 "about_proposition_2" = "Attenta alla privacy e senza pubblicità";
@@ -117,13 +117,13 @@
 "category_entertainment" = "Intrattenimento";
 
 /* Search category for ATMs; any changes should be duplicated in categories.txt @category_atm! */
-"category_atm" = "Bancomat";
+"category_atm" = "Bancomat ATM";
 
 /* Search category for nightclubs/bars; any changes should be duplicated in categories.txt @category_nightlife! */
 "category_nightlife" = "Vita notturna";
 
 /* Search category for water park/disneyland/playground/toys store; any changes should be duplicated in categories.txt @category_children! */
-"category_children" = "Divertimento in famiglia";
+"category_children" = "Vacanza in famiglia";
 
 /* Search category for banks; any changes should be duplicated in categories.txt @category_bank! */
 "category_bank" = "Banca";
@@ -153,7 +153,7 @@
 "category_water" = "Acqua";
 
 /* Search category for RV facilities; any changes should be duplicated in categories.txt @category_rv! */
-"category_rv" = "Per camper";
+"category_rv" = "Struttura per camper";
 "share_bookmarks_email_body" = "Ciao!\n\nIn allegato ci sono i miei luoghi preferiti. Aprili se hai installato CoMaps. Oppure, se non ce l'hai, scarica l'app per iOS o Android seguendo questo link: https://www.comaps.app/\n\nDivertiti a viaggiare con CoMaps!";
 
 /* message title of loading file */
@@ -169,7 +169,7 @@
 "edit" = "Modifica";
 
 /* Warning message when doing search around current position */
-"unknown_current_position" = "La tua posizione non è stata ancora determinata";
+"unknown_current_position" = "La tua posizione non è stata ancora stabilita";
 
 /* Subject for emailed bookmark */
 "bookmark_share_email_subject" = "Dai un'occhiata a questo posto su CoMaps!";
@@ -181,7 +181,7 @@
 "email" = "E-mail";
 
 /* Text for message to copy something */
-"copy_to_clipboard" = "Copia negli Appunti";
+"copy_to_clipboard" = "Copia negli appunti";
 
 /* Text for message when used successfully copied something */
 "copied_to_clipboard" = "Copiato negli appunti: %@";
@@ -205,7 +205,7 @@
 "share_my_location" = "Condividi la mia posizione";
 "prefs_group_route" = "Navigazione";
 "pref_zoom_title" = "Pulsanti per lo zoom";
-"pref_left_button_type" = "Left Main Button";
+"pref_left_button_type" = "Bottone principale di sinistra";
 
 /* Settings «Map» category: «Appearance» title */
 "pref_appearance_title" = "Aspetto";
@@ -217,7 +217,7 @@
 "pref_appearance_dark" = "Scuro";
 
 /* Generic «Disabled» string */
-"disabled" = "Disabled";
+"disabled" = "Disabilitato";
 
 /* Generic «Off» string */
 "off" = "Spento";
@@ -269,7 +269,7 @@
 
 /* Text in the about screen */
 "social_codeberg" = "Codeberg";
-"social_mastodon" = "Mastodon";
+"social_mastodon" = "Social Mastodon";
 "social_lemmy" = "Lemmy";
 "social_matrix" = "Matrix";
 "social_bluesky" = "Bluesky";
@@ -439,7 +439,7 @@
 "gray" = "Grigio";
 
 /* blue gray color */
-"blue_gray" = "Grigiazzurro";
+"blue_gray" = "Grigio azzurro";
 "dialog_routing_disclaimer_title" = "Quando segui il percorso, ricorda che:";
 "dialog_routing_disclaimer_priority" = "— Le condizioni stradali, il codice della strada e la segnaletica hanno sempre la precedenza sulle indicazioni del navigatore;";
 "dialog_routing_disclaimer_precision" = "— La mappa potrebbe essere imprecisa e il percorso suggerito potrebbe non essere sempre quello ottimale per raggiungere la destinazione;";
@@ -1008,7 +1008,7 @@
 "bugreport_alert_message" = "Vuoi inviare una segnalazione di bug agli sviluppatori?\nCi affidiamo ai nostri utenti perché CoMaps non raccoglie automaticamente informazioni sugli errori. Ti ringraziamo in anticipo per il supporto a CoMaps!";
 
 /* Title for the iCloud syncronization setting */
-"icloud_sync" = "iCloud Syncronization (Beta)";
+"icloud_sync" = "Sincronizzazione iCloud (Beta)";
 
 /* Title for the "Enable iCloud Syncronization" alert. */
 "enable_icloud_synchronization_title" = "Abilita la sincronizzazione con iCloud";
diff --git a/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings
index 635baa7f6..a67eb7a7c 100644
--- a/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/it.lproj/LocalizableTypes.strings
@@ -7,10 +7,10 @@
 "type.aerialway.drag_lift" = "Ski-lift";
 "type.aerialway.gondola" = "Cabinovia";
 "type.aerialway.mixed_lift" = "Impianto misto";
-"type.aerialway.station" = "Stazione";
+"type.aerialway.station" = "Stazione aerea";
 "type.aeroway" = "Infrastruttura aeroportuale";
 "type.aeroway.aerodrome" = "Aeroporto";
-"type.aeroway.aerodrome.international" = "Aeroporto Internazionale";
+"type.aeroway.aerodrome.international" = "Aeroporto internazionale";
 "type.aeroway.apron" = "Area di stazionamento per aeromobili";
 "type.aeroway.gate" = "Cancello aeroportuale";
 "type.aeroway.helipad" = "Piattaforma per elicotteri";
@@ -19,14 +19,14 @@
 "type.aeroway.terminal" = "Terminal aeroportuale";
 "type.amenity" = "Struttura";
 "type.amenity.arts_centre" = "Centro artistico";
-"type.amenity.atm" = "Bancomat";
+"type.amenity.atm" = "Bancomat ATM";
 "type.amenity.bank" = "Banca";
-"type.amenity.bar" = "Bar alcolico";
+"type.amenity.bar" = "Bar";
 "type.amenity.bbq" = "Griglia per barbecue";
 "type.amenity.bench" = "Panchina";
 "type.amenity.bicycle_parking" = "Parcheggio biciclette";
 "type.amenity.bicycle_rental" = "Noleggio biciclette";
-"type.amenity.bicycle_repair_station" = "Stazione di riparazione biciclette";
+"type.amenity.bicycle_repair_station" = "Centro di riparazione biciclette";
 "type.amenity.biergarten" = "Biergarten";
 "type.amenity.brothel" = "Bordello";
 "type.amenity.bureau_de_change" = "Cambio valute";
@@ -48,7 +48,7 @@
 "type.leisure.bowling_alley" = "Sala da bowling";
 "type.amenity.clinic" = "Clinica";
 "type.amenity.college" = "Collegio";
-"type.amenity.community_centre" = "Centro ricreativo";
+"type.amenity.community_centre" = "Centro comunitario";
 "type.amenity.compressed_air" = "Aria compressa";
 "type.amenity.conference_centre" = "Centro conferenze";
 "type.amenity.courthouse" = "Tribunale";
@@ -67,7 +67,7 @@
 "type.amenity.fire_station" = "Squadra antincendio";
 "type.amenity.food_court" = "Area ristorazione";
 "type.amenity.fountain" = "Fontana";
-"type.amenity.fuel" = "Stazione di rifornimento";
+"type.amenity.fuel" = "Distributore di carburante";
 
 /* In most (European) countries, сemeteries are usually independent of places of worship (e.g. military cemeteries), while grave yards are usually the yard of a place of worship. */
 "type.amenity.grave_yard" = "Cimitero";
@@ -306,7 +306,7 @@
 "type.cuisine.german" = "Cucina tedesca";
 "type.cuisine.greek" = "Cucina greca";
 "type.cuisine.grill" = "Cucina alla griglia";
-"type.cuisine.heuriger" = "Heuriger";
+"type.cuisine.heuriger" = "Vino Heuriger";
 "type.cuisine.hotdog" = "Hot dog";
 "type.cuisine.hungarian" = "Cucina ungherese";
 "type.cuisine.ice_cream" = "Gelateria";
@@ -399,7 +399,7 @@
 "type.highway.busway.bridge" = "Ponte";
 
 /* These translations are used for all type.highway.*.tunnel. */
-"type.highway.busway.tunnel" = "Tunnel";
+"type.highway.busway.tunnel" = "Galleria";
 "type.highway.bus_stop" = "Fermata dell'autobus";
 "type.highway.construction" = "Strada in costruzione";
 "type.highway.cycleway" = "Pista ciclabile";
@@ -1479,7 +1479,7 @@
 "type.leisure.escape_game" = "Escape Room";
 "type.amenity.luggage_locker" = "Deposito Bagagli";
 "type.amenity.ranger_station" = "Stazione delle guardie forestali";
-"type.amenity.bicycle_parking.covered" = "Parcheggio Biciclette Coperto";
+"type.amenity.bicycle_parking.covered" = "Parcheggio biciclette coperto";
 "type.post_office.post_partner" = "Partner Postale";
 "type.landuse.religious" = "Terreno Religioso";
 "type.barrier.wicket_gate" = "Cancello pedonale";
diff --git a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.stringsdict b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.stringsdict
index bd8185859..11b11f71f 100644
--- a/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.stringsdict
+++ b/iphone/Maps/LocalizedStrings/nb.lproj/Localizable.stringsdict
@@ -48,8 +48,10 @@
 			<string>NSStringPluralRuleType</string>
 			<key>NSStringFormatValueTypeKey</key>
 			<string>d</string>
+			<key>one</key>
+			<string>%d spor</string>
 			<key>other</key>
-			<string>%d spor?</string>
+			<string>%d spor</string>
 		</dict>
 	</dict>
 </dict>
diff --git a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
index b96508e63..e81926d50 100644
--- a/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
+++ b/iphone/Maps/LocalizedStrings/pt-BR.lproj/Localizable.strings
@@ -544,7 +544,7 @@
 /* OpenStreetMap */
 "osm_mapdata" = "Dados de mapa do OpenStreetMap";
 "osm_mapdata_explanation %@" = "Dados de mapas criados pela comunidade até *%@*. Saiba mais sobre como editar e atualizar o mapa em [OpenStreetMap.org](https://openstreetmap.org).";
-"osm_more_about" = "Mais sobre OpenStreetMap";
+"osm_more_about" = "Mais sobre o OpenStreetMap";
 "osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/Pt:Sobre_o_OpenStreetMap";
 
 /* OpenStreetMap Profile */
@@ -559,7 +559,7 @@
 "osm_profile_register_promt" = "Sem conta no OpenStreetMap?";
 "osm_profile_register" = "Abra uma conta no OpenStreetMap";
 "osm_profile_verfied_changes" = "Alterações verificadas";
-"osm_profile_logout" = "Desconectar conta OpenStreetMap";
+"osm_profile_logout" = "Sair da conta OpenStreetMap";
 "osm_profile_delete" = "Excluir conta OpenStreetMap";
 
 /* Information text: "Last upload 11.01.2016" */
@@ -632,7 +632,7 @@
 "editor_other_info" = "Nota para os voluntários do OpenStreetMap (opcional)";
 "editor_detailed_description_hint" = "Comentário detalhado";
 "editor_detailed_description" = "Suas sugestões de mudança serão enviadas para a comunidade OpenStreetMap. Descreva em detalhes o que não pode ser editado com o CoMaps.";
-"editor_more_about_osm" = "Mais sobre OpenStreetMap";
+"editor_more_about_osm" = "Mais sobre o OpenStreetMap";
 "editor_operator" = "Operador";
 
 /* To indicate the operator of ATMs, bicycle rentals, electric vehicle charging stations... */
diff --git a/iphone/Maps/LocalizedStrings/ur.lproj/Localizable.strings b/iphone/Maps/LocalizedStrings/ur.lproj/Localizable.strings
new file mode 100644
index 000000000..680dfeea7
--- /dev/null
+++ b/iphone/Maps/LocalizedStrings/ur.lproj/Localizable.strings
@@ -0,0 +1,591 @@
+"category_toilet" = "Toilet";
+"category_post" = "Post";
+"category_water" = "Water";
+"category_rv" = "RV Facilities";
+"share_bookmarks_email_body" = "Hello!\n\nAttached are my bookmarks; please open them in CoMaps. If you don't have it installed you can download it here: https://www.comaps.app/download/\n\nEnjoy travelling with CoMaps!";
+"instagram" = "Instagram";
+"social_matrix" = "Matrix";
+"vk" = "VK";
+"panoramax" = "Panoramax";
+"fediverse" = "Mastodon";
+"follow_us" = "Connect with us";
+"downloader_status_maps" = "Maps";
+"downloader_search_results" = "Found";
+"downloader_downloading" = "Downloading:";
+"downloader_near_me_subtitle" = "Near me";
+"downloader_retry" = "Retry";
+"downloader_download_map" = "Download map";
+"downloader_delete_map" = "Delete Map";
+"save" = "Save";
+"create" = "create";
+"bookmark" = "bookmark";
+"brown" = "Brown";
+"gray" = "Gray";
+"closes_at" = "Closes at %@";
+"p2p_from_here" = "Route from";
+"osm_more_about" = "More about OpenStreetMap";
+"phone" = "Phone";
+"editor_more_about_osm" = "More about OpenStreetMap";
+"editor_storey_number" = "Number of floors (maximum of %d)";
+"operator" = "Operator: %@";
+"location_services_disabled_2" = "2. Tap Location";
+"editor_reset_edits_button" = "Discard";
+"placepage_personal_notes_hint" = "Personal notes (text or html)";
+"hour" = "h";
+"m" = "m";
+"mi" = "mi";
+"editor_edits_sent_message" = "Your note will be sent to OpenStreetMap";
+"placepage_add_place_button" = "Add Place to OpenStreetMap";
+"editor_share_to_all_dialog_message_2" = "OpenStreetMap editors will check the changes and contact you if they have any questions.";
+"text_more_button" = "…more";
+"recent_track_background_dialog_message" = "CoMaps uses your location in the background to record your recently travelled route.";
+"off_recent_track_background_button" = "Disable";
+"general_settings" = "General settings";
+"mobile_data_dialog" = "Use mobile internet to show detailed information?";
+"mobile_data_option_always" = "Use Always";
+"decline" = "Decline";
+"mobile_data_option_not_today" = "Do Not Use Today";
+"enable_logging" = "Enable logging";
+"mobile_data" = "Mobile Internet";
+"mobile_data_option_ask" = "Always Ask";
+"mobile_data_description" = "Mobile internet is required for map update notifications and uploading edits.";
+"log_file_size" = "Log file size: %@";
+"traffic_update_app_message" = "To display traffic data, the application must be updated.";
+"big_font" = "Increase size for map labels";
+"traffic_data_unavailable" = "Traffic data is not available";
+"popular_place" = "Popular";
+"pref_tts_speedcams_always" = "Always warn";
+"pref_tts_speedcams_auto" = "Warn if speeding";
+"speedcams_alert_title_carplay_1" = "Speedсams";
+"downloader_loading_ios" = "Downloading";
+"app_tip_05" = "Did you know that your current location on the map can be selected?";
+"whats_new_auto_update_button_size" = "Update (%@)";
+"drive_through" = "Drive-through";
+"enable_icloud_synchronization_title" = "Enable iCloud Syncronization";
+"editor_category_unsuitable_text" = "CoMaps allows to add simple point categories only, that means no towns, roads, lakes, building outlines, etc. Please add such categories directly to <a href=\"https://www.openstreetmap.org\">OpenStreetMap.org</a>. Check our <a href=\"https://www.comaps.app/support/advanced-map-editing/\">guide</a> for detailed step by step instructions.";
+"dialog_routing_location_turn_on" = "Enable location services";
+"social_codeberg" = "Codeberg";
+"add_new_set" = "Add a New List";
+"cancel_download" = "Cancel Download";
+"editor_profile_changes" = "Verified Changes";
+"downloader_no_space_message" = "Please delete any unnecessary data";
+"trip_start" = "Let's go";
+"trip_finished" = "You have arrived!";
+"share_my_location" = "Share My Location";
+"dialog_routing_select_closer_end" = "Please select a destination point located closer to a road.";
+"icloud_disabled_message" = "Please enable iCloud in your device's settings to use this feature.";
+"track_recording_alert_title" = "Save into Bookmarks and Tracks?";
+"tags_loading_error_subtitle" = "An error occurred while loading tags, please try again";
+"dialog_routing_application_error" = "Unable to create route due to an application error.";
+"pref_maplanguage_title" = "Map Language";
+"categories" = "Categories";
+"close" = "Close";
+"opens_at" = "Opens at %@";
+"copy_to_clipboard" = "Copy to Clipboard";
+"routing_add_start_point" = "Use search or tap on the map to add a route starting point";
+"export_file" = "Export KMZ";
+"downloader_delete_map_while_routing_dialog" = "To delete map, please stop navigation.";
+"button_layer_outdoor" = "Outdoors";
+"power_managment_setting_never" = "Never";
+"downloader_hide_screen" = "Hide Screen";
+"my_position_share_email_subject" = "Hey, check out my current location on the CoMaps map!";
+"downloader_process" = "Downloading %@…";
+"category_shopping" = "Shopping";
+"dialog_routing_disclaimer_priority" = "— Road conditions, traffic laws, and road signs always take priority over navigation hints;";
+"hide_from_map" = "Hide from map";
+"core_entrance" = "Entrance";
+"bookmark_sets" = "Bookmark Lists";
+"money" = "Money";
+"opens_in" = "Opens in %@";
+"dialog_routing_check_gps" = "Check GPS signal";
+"copied_to_clipboard" = "Copied to clipboard: %@";
+"placepage_distance" = "Distance";
+"dialog_routing_download_cross_route" = "Download additional maps to create a better route that crosses the boundaries of this map.";
+"osm_profile_verfied_changes" = "Verified Changes";
+"dialog_routing_location_turn_wifi" = "Please check your GPS signal. Enabling Wi-Fi will improve your location accuracy.";
+"start_track_recording" = "Record Track";
+"dialog_routing_change_end_carplay" = "Unable to find a route to your destination. Please choose another end point";
+"self_service" = "Self-service";
+"rate_the_app" = "Rate the app";
+"osm_mapdata" = "Map data from OpenStreetMap";
+"editor_time_title" = "Business Hours";
+"avoid_tolls" = "Avoid tolls";
+"osm_profile_promt" = "Create an OpenStreetMap account or log in to publish your map edits to the world.";
+"editor_other_info" = "Note to OpenStreetMap volunteers (optional)";
+"track_title" = "Track";
+"car_continue_on_the_phone" = "Continue on the phone";
+"load_kmz_failed" = "Failed to load bookmarks. The file may be corrupted or defective.";
+"transit_not_found" = "Subway navigation in this region is not available yet";
+"carplay_roundabout_exit" = "%@ exit";
+"pref_tts_other_section_title" = "Other";
+"isolines_activation_error_dialog" = "Activating contour lines requires downloading map data for this area";
+"leave_a_review" = "Leave a Review";
+"pref_tts_street_names_title" = "Announce Street Names";
+"icloud_synchronization_error_alert_title" = "iCloud synchronization failure";
+"downloader_search_field_hint" = "Find map";
+"shops" = "Shops";
+"category_eat" = "Where to eat";
+"isolines_location_error_dialog" = "Contour lines are not yet available in this area";
+"bookmarks_recently_deleted" = "Recently Deleted Lists";
+"category_recycling" = "Recycling";
+"dialog_routing_disclaimer_precision" = "— The map might be inaccurate, and the suggested route might not always be the most optimal way to reach the destination;";
+"delete_list" = "Delete list";
+"kilometres" = "Kilometers";
+"move" = "Move";
+"elevation_profile_diff_level_moderate" = "Moderate";
+"version: %@ (%@)\nmap data: %@" = "Version: %@ (%@)\nMap Data: %@";
+"error_enter_correct_zip_code" = "Enter a valid postal code";
+"food_places" = "Food";
+"editor_detailed_description" = "Your suggested map changes will be sent to the OpenStreetMap community. Please describe any additional details that cannot be edited in CoMaps.";
+"downloader_delete_map_dialog" = "All of your map edits will be deleted with the map.";
+"app_tip_03" = "If you know a software developer, you can ask him or her to implement a feature that you need.";
+"bookmarks_convert_error_title" = "Error";
+"select_cuisine" = "Select cuisine";
+"terms_of_use" = "Terms of use";
+"day_off" = "Closed";
+"website" = "Website";
+"about_headline" = "Open project powered by the community";
+"saved" = "Saved";
+"pref_appearance_dark" = "Dark";
+"category_parking" = "Parking";
+"avoid_motorways" = "Avoid freeways";
+"prefs_group_route" = "Navigation";
+"editor_time_delete" = "Delete Schedule";
+"parks" = "Parks";
+"p2p_start" = "Start";
+"downloading" = "Downloading…";
+"category_children" = "Family holiday";
+"dialog_routing_unable_locate_route_carplay" = "Unable to build a route. Please specify other route points";
+"about_proposition_2" = "Privacy-focused and ads-free";
+"sort_name" = "Sort by name";
+"line" = "Line";
+"no" = "No";
+"core_exit" = "Exit";
+"news" = "News";
+"info" = "Info";
+"dialog_routing_error_location_not_found" = "Unable to create route. Current GPS coordinates could not be identified.";
+"clear" = "Clear";
+"bookmarks_import" = "Import Bookmarks and Tracks";
+"opens_tomorrow_at" = "Opens tomorrow at %@";
+"about_proposition_3" = "Transparent and not for profit";
+"closes_in" = "Closes in %@";
+"p2p_reroute_from_current" = "Do you want to plan a route from your current location?";
+"pink" = "Pink";
+"app_tip_09" = "Our main goal is to build fast, privacy-focused, easy-to-use maps that you will love.";
+"app_tip_08" = "You can easily fix and improve the map data.";
+"stop_without_saving" = "Stop Without Saving";
+"dialog_routing_change_intermediate" = "Unable to locate the intermediate point.";
+"downloader_status_outdated" = "Update";
+"pref_appearance_title" = "Appearance";
+"button_layer_subway" = "Subway";
+"unknown_current_position" = "Your location hasn't been determined yet";
+"bugreport_alert_message" = "Would you like to send a bug report to the developers?\nWe rely on our users as CoMaps doesn't collect any error information automatically. Thank you in advance for supporting CoMaps!";
+"bookmark_lists_hide_all" = "Hide all";
+"on" = "On";
+"editor_sharing_title" = "I improved the CoMaps maps";
+"transliteration_title_disabled_summary" = "Disabled when always using the local language for the map";
+"whatsnew_editor_message_1" = "Add new places to the map, and edit existing ones directly from the app.";
+"osm_profile" = "OpenStreetMap profile";
+"car_continue_in_the_car" = "To the car screen";
+"dialog_routing_change_start_carplay" = "Unable to build a route from your current location";
+"email" = "Email";
+"edit" = "Edit";
+"routing_download_maps_along" = "Download all of the maps along your route";
+"dialog_routing_check_gps_carplay" = "No GPS signal. Please move to an open area";
+"routing_planning_error" = "Route Planning Failed";
+"downloader_update_all_button" = "Update All";
+"restore" = "Restore";
+"twitter" = "X (Twitter)";
+"moremonth_ago_sorttype" = "More than a month ago";
+"downloader_applying" = "Applying %@…";
+"routing_arrive" = "Arrival at %@";
+"enable_icloud_synchronization_message" = "iCloud synchronization is an experimental feature under development. Make sure that you have made a backup of all your bookmarks and tracks.";
+"unable_to_calc_alert_subtitle" = "A route could not be found. This may be caused by your routing options or incomplete OpenStreetMap data. Please change your routing options and retry.";
+"current_location_unknown_error_message" = "An error occurred while determining your location. Check that your device is working properly and try again later.";
+"medicine" = "Medicine";
+"osm_profile_explanation" = "[OpenStreetMap.org](https://openstreetmap.org) (OSM) is a community project to build a free and open map. It's the main source of map data in CoMaps and works similar to Wikipedia. You can add or edit places and they become available to millions of users all over the World.\nJoin the community and help to make a better map for everyone!";
+"power_managment_title" = "Power saving mode";
+"opens_dayoftheweek_at" = "Opens %1$@ at %2$@";
+"category_bank" = "Bank";
+"download_map_carplay" = "Please download maps in the app on your mobile device";
+"search_show_on_map" = "View on map";
+"stop_track_recording" = "Stop Track Recording";
+"planning_route_remove_title" = "Drag here to remove";
+"p2p_your_location" = "Your Location";
+"category_transport" = "Transport";
+"downloader_of" = "%1$d of %2$d";
+"country_status_download_failed" = "Download has failed";
+"about_proposition_1" = "Offline, fast and easy to use";
+"follow_my_position" = "Re-center";
+"download_over_mobile_message" = "This could be considerably expensive with some plans or if roaming.";
+"ferry_crossing" = "Ferry crossing";
+"email_error_title" = "Error sending email";
+"add_language" = "Add a language";
+"others_sorttype" = "Others";
+"common_check_internet_connection_dialog" = "Please make sure your device is connected to the Internet.";
+"car_used_on_the_car_screen" = "You are now using CoMaps on the car screen";
+"parkings" = "Parking";
+"yes" = "Yes";
+"location_services_disabled_on_device_additional_message" = "Or continue using CoMaps without Location";
+"off" = "Off";
+"current_location_unknown_error_title" = "Current location is unknown.";
+"app_tip_07" = "Our app is developed by a few enthusiasts and the community.";
+"editor_time_advanced" = "Advanced Mode";
+"add_street" = "Add a street";
+"share_with_friends" = "Share with friends";
+"dialog_routing_download_files_carplay" = "To create a route, download missing maps on your device";
+"last_upload" = "Last upload";
+"osm_profile_register_promt" = "Don't have an OpenStreetMap account?";
+"placepage_delete_track_confirmation_alert_message" = "Are you sure you want to delete this track?";
+"help" = "Help";
+"report_incorrect_map_bug" = "Report or fix incorrect map data";
+"title_error_downloading_bookmarks" = "An error occurred";
+"editor_example_values" = "Example Values";
+"message_invalid_feature_position" = "No object can be located here";
+"dialog_routing_disclaimer_borders" = "— Exercise caution with routes in border zones: the routes created by our app may sometimes cross country borders in unauthorized places.";
+"dialog_pedestrian_route_is_long_header" = "No subway route found";
+"category_nightlife" = "Nightlife";
+"unpaved_road" = "Unpaved road";
+"whats_new_auto_update_button_later" = "Manually update later";
+"app_tip_06" = "You can help to translate our app into your language.";
+"delete" = "Delete";
+"downloader_no_downloaded_maps_title" = "You haven't downloaded any maps";
+"search_in_the_list" = "Search in the list";
+"elevation_profile_ascent" = "Ascent";
+"pref_zoom_title" = "Zoom buttons";
+"zoom_to_country" = "Show on the map";
+"p2p_only_from_current" = "Navigation is only available from your current location.";
+"dialog_routing_change_start_or_end" = "Please adjust your starting point or destination.";
+"animals" = "Animals";
+"export_file_gpx" = "Export GPX";
+"pref_map_3d_title" = "Perspective view";
+"pref_tts_title" = "Voice Instructions";
+"version" = "CoMaps version: %@";
+"add_opening_hours" = "Add opening hours";
+"bookmarks_error_title_share_empty" = "Sharing error";
+"ok" = "OK";
+"bookmarks_export" = "Export all Bookmarks and Tracks";
+"pref_appearance_light" = "Light";
+"dialog_routing_change_end" = "Adjust destination";
+"planning_route_manage_route" = "Manage Route";
+"place_name" = "Place Name";
+"navigation_stop_button" = "Stop";
+"load_kmz_successful" = "Bookmarks loaded successfully! You can find them on the map or on the Bookmarks Manager screen.";
+"power_managment_setting_manual_max" = "Always";
+"faq" = "Frequently Asked Questions";
+"icloud_synchronization_error_cloud_is_unavailable" = "Error: iCloud is not available";
+"osm_profile_delete" = "Delete OpenStreetMap account";
+"please_note" = "Please note";
+"bookmarks_detect_title" = "New files detected";
+"migration_download_error_dialog" = "Download error";
+"choose_street" = "Choose a street";
+"category_food" = "Groceries";
+"p2p_to_here" = "Route to";
+"speedcams_alert_title_carplay_2" = "Speed warnings";
+"download_button" = "Download";
+"core_my_places" = "My Places";
+"bookmark_share_email_subject" = "Hey, check out my pin in CoMaps!";
+"editor_operator" = "Operator";
+"pref_map_3d_buildings_disabled_summary" = "3D buildings are disabled in power saving mode";
+"dialog_routing_intermediate_not_determined" = "Please adjust your intermediate point.";
+"pref_map_3d_buildings_title" = "3D buildings";
+"bookmark_lists" = "Lists";
+"read_in_wikipedia" = "Wikipedia";
+"placepage_track_name_hint" = "Track Name";
+"downloader_no_space_title" = "Not enough space";
+"category_pharmacy" = "Pharmacy";
+"kilometers_per_hour" = "km/h";
+"isolines_toast_zooms_1_10" = "Zoom in to explore isolines";
+"category_secondhand" = "Second Hand";
+"editor_report_problem_send_button" = "Send";
+"elevation_profile_descent" = "Descent";
+"editor_remove_place_button" = "Delete";
+"category_police" = "Police";
+"dialog_routing_disclaimer_recommendations" = "— Suggested routes should only be understood as recommendations;";
+"translated_om_site_url" = "https://www.comaps.app/";
+"download" = "Download";
+"email_error_body" = "The email client has not been set up. Please configure it or contact us at %@";
+"editor_time_allday" = "All Day (24 hours)";
+"backup" = "Backup";
+"edit_track" = "Edit Track";
+"hotels" = "Hotels";
+"track_recording_toast_nothing_to_save" = "Track is empty - nothing to save";
+"category_atm" = "ATM";
+"pref_mapappearance_title" = "Map Appearance";
+"deep_orange" = "Deep Orange";
+"pref_tts_street_names_description" = "When enabled, the name of the street or exit to turn onto will be spoken aloud.";
+"unable_to_calc_alert_title" = "Unable to calculate route";
+"network" = "Network: %@";
+"elevation_profile_diff_level_easy" = "Easy";
+"editor_share_to_all_dialog_title" = "Do you want to send it to all users?";
+"daily" = "Daily";
+"elevation_profile_diff_level" = "Difficulty level";
+"editor_hours_closed" = "Non-Business Hours";
+"pref_maplanguage_local" = "Local Language";
+"downloader_update_maps" = "Update Maps";
+"dialog_routing_end_not_determined" = "Route was not created. Unable to locate the destination.";
+"closed_now" = "Closed now";
+"dialog_routing_download_and_update_all" = "Download or update all maps along the projected path to calculate a route.";
+"miles" = "Miles";
+"deep_purple" = "Deep Purple";
+"error_enter_correct_storey_number" = "The number of floors must non exceed %d";
+"download_over_mobile_header" = "Download over a cellular network connection?";
+"measurement_units" = "Measurement units";
+"orange" = "Orange";
+"pref_tts_test_voice_title" = "Test Voice Directions";
+"social_email" = "E-Mail";
+"error_enter_correct_web" = "Enter a valid web address";
+"editor_edit_place_title" = "Editing";
+"category_wifi" = "WiFi";
+"editor_place_doesnt_exist" = "Place does not exist";
+"subway_data_unavailable" = "Subway map is unavailable";
+"near_me_sorttype" = "Near me";
+"green" = "Green";
+"details" = "Details";
+"yellow" = "Yellow";
+"privacy_policy" = "Privacy policy";
+"editor_default_language_hint" = "As it is written in the local language";
+"search_not_found" = "Oops, no results found.";
+"editor_add_select_location" = "Select Location";
+"downloader_queued" = "Queued";
+"change_driving_options_btn" = "Routing options enabled";
+"car_used_on_the_phone_screen" = "You are now using CoMaps on the phone screen";
+"category_hospital" = "Hospital";
+"redirect_route_alert" = "Do you want to rebuild the route?";
+"light_blue" = "Light Blue";
+"social_lemmy" = "Lemmy";
+"enable_logging_warning_message" = "Enable this option temporarily to record and manually send detailed diagnostic logs about your issue to us using \"Report a bug\" in the Help dialog. Logs may include location info.";
+"dialog_routing_rebuild_from_current_location_carplay" = "The route will be rebuilt from your current location";
+"address" = "Address";
+"routing_add_finish_point" = "Use search or tap on the map to add a destination point";
+"editor_done_dialog_1" = "You’ve changed the world map! Don't keep it to yourself; tell your friends and edit it together.";
+"button_convert" = "Convert";
+"icloud_synchronization_error_quota_exceeded" = "Error: Failed to synchronize due to iCloud quota exceeded";
+"icloud_sync" = "iCloud Syncronization (Beta)";
+"dialog_routing_rebuild_for_vehicle_carplay" = "The route will be converted into an automobile one";
+"week_ago_sorttype" = "A week ago";
+"red" = "Red";
+"hide" = "Hide";
+"pref_calibration_title" = "Compass calibration";
+"elevation_profile_max_elevation" = "Max. elevation";
+"mobile_data_option_today" = "Only Today";
+"editor_detailed_description_hint" = "Detailed comment";
+"driving_options_title" = "Routing options";
+"dialog_routing_select_closer_start" = "Please select a starting point closer to a road.";
+"cancel" = "Cancel";
+"switch_to_phone_bookmarks_carplay" = "Switch to the phone to see all bookmarks";
+"lime" = "Lime";
+"website_menu" = "Menu Link";
+"app_tip_02" = "Do you like our app? Please donate to support the development! Don't like it yet? Please let us know why, and we will fix it!";
+"pick_destination" = "Destination";
+"cyan" = "Cyan";
+"teal" = "Teal";
+"level" = "Floor";
+"panoramax_picture" = "Panoramax Picture";
+"refresh" = "Update";
+"use_cellular_data" = "Yes";
+"capacity" = "Capacity: %@";
+"day_off_today" = "Closed today";
+"location_services_disabled_3" = "3. Select While Using the App";
+"osm_profile_register" = "Register at OpenStreetMap";
+"location_services_disabled_on_device_3" = "3. Select Location Services";
+"miles_per_hour" = "mph";
+"history" = "History";
+"osm_profile_remove_promt" = "If you can't or don't want to reconnect your account, you can just remove it from this app";
+"keyboard_availability_alert" = "Keyboard is not available while driving";
+"whats_new_auto_update_message" = "Updating maps keeps the information about objects up to date";
+"closed" = "Closed";
+"mountains" = "Mountains";
+"osm_profile_login" = "Login to OpenStreetMap";
+"editor_time_close" = "Closed";
+"social_mastodon" = "Mastodon";
+"editor_time_add" = "Add Schedule";
+"osm_more_about_url" = "https://wiki.openstreetmap.org/wiki/About_OpenStreetMap";
+"bluesky" = "Bluesky";
+"editor_edit_place_category_title" = "Category";
+"bookmarks_error_title_list_name_already_taken" = "This name is already taken";
+"category_entertainment" = "Entertainment";
+"placepage_add_stop" = "Add Stop";
+"avoid_unpaved" = "Avoid unpaved roads";
+"autodownload" = "Auto-download maps";
+"app_tip_04" = "Tap anywhere on the map to select anything. A long tap is used to hide and show the interface.";
+"enable" = "Enable";
+"osm_mapdata_explanation %@" = "Community-created map data as of *%@*. Learn more about how to edit and update the map at [OpenStreetMap.org](https://openstreetmap.org).";
+"then_turn" = "Then";
+"disabled" = "Disabled";
+"dialog_incorrect_feature_position" = "Change location";
+"app_tip_01" = "With your donations and support, we can create the best maps in the World!";
+"downloader_status_failed" = "Failed";
+"dialog_routing_system_error" = "System error";
+"buildings" = "Buildings";
+"dialog_routing_download_and_build_cross_route" = "Would you like to download the map and create a more optimal route spanning more than one map?";
+"dialog_routing_disclaimer_beware" = "Please stay alert and safe on the roads!";
+"bookmarks_create_new_group" = "Create a new list";
+"editor_add_select_category_all_subtitle" = "All Categories";
+"search" = "Search";
+"ft" = "ft";
+"placepage_edit_bookmark_button" = "Edit Bookmark";
+"pref_map_auto_zoom" = "Auto zoom";
+"error_enter_correct_phone" = "Enter a valid phone number";
+"pref_tts_language_title" = "Voice Language";
+"month_ago_sorttype" = "A month ago";
+"dialog_routing_start_not_determined" = "Route was not created. Unable to locate starting point.";
+"auto" = "Auto";
+"osm_profile_view_edit_history" = "View Edit History";
+"museums" = "Museums";
+"sort" = "Sort…";
+"downloader_percent" = "%@ (%@ of %@)";
+"dialog_routing_system_error_carplay" = "An error occurred. Please restart the application";
+"dialog_routing_download_and_update_maps" = "Download and update all map along the projected path to calculate route.";
+"placepage_bookmark_name_hint" = "Bookmark Name";
+"power_managment_description" = "Try to reduce power usage at the expense of some functionality.";
+"downloader_updating_ios" = "Updating";
+"error_enter_correct_name" = "Please enter a correct name";
+"dialog_routing_download_files" = "Download required files";
+"migration_no_space_message" = "To download, you need more space. Please delete any unnecessary data.";
+"icloud_disabled_title" = "iCloud Is Disabled";
+"downloader_no_downloaded_maps_message" = "Download maps to search and navigate offline.";
+"search_history_text" = "View your recent searches.";
+"location_services_disabled_on_device_2" = "2. Select Privacy";
+"dialog_routing_unable_locate_route" = "Unable to locate route";
+"bookmarks_error_title_list_name_too_long" = "This name is too long";
+"sort_type" = "Sort by type";
+"social_bluesky" = "Bluesky";
+"cuisine" = "Cuisine";
+"country_status_download_without_size" = "Download Map";
+"editor_zip_code" = "Postal Code";
+"pref_tts_speedcams_never" = "Never warn";
+"osm_profile_view_notes" = "View Notes";
+"twentyfour_seven" = "24/7";
+"donate" = "Donate";
+"settings" = "Settings";
+"delete_all" = "Delete All";
+"outdoor_seating" = "Outdoor seating";
+"place_description_title" = "Place Description";
+"editor_add_select_category_popular_subtitle" = "Popular";
+"swim_places" = "Swim";
+"editor_time_add_closed" = "Add Non-Business Hours";
+"placepage_remove_stop" = "Remove Stop";
+"search_results" = "Search results";
+"core_placepage_unknown_place" = "Map Point";
+"elevation_profile_diff_level_hard" = "Hard";
+"dialog_routing_try_again" = "Please try again";
+"no_available" = "No";
+"fuel_places" = "Gas Stations";
+"sharing_call_action_look" = "Check out";
+"volunteer" = "Volunteer and improve CoMaps";
+"clear_search" = "Clear Search History";
+"downloader_download_all_button" = "Download All";
+"category_tourism" = "Sights";
+"download_maps" = "Download Maps";
+"editor_comment_hint" = "Comment…";
+"editor_share_to_all_dialog_message_1" = "Make sure you did not enter any private or personal data.";
+"location_services_disabled_message" = "Enable access to geolocation in the device settings";
+"edit_place" = "Edit Place";
+"dialog_pedestrian_route_is_long_message" = "Please choose a start or end point closer to a subway station";
+"downloader_available_maps" = "Available";
+"existence_confirmed_time_ago" = "Existence confirmed %@";
+"editor_category_unsuitable_title" = "Can't find a suitable category?";
+"location_services_disabled_on_device_4" = "4. Turn on Location Services";
+"layers_title" = "Map Styles and Layers";
+"avoid_ferry" = "Avoid ferries";
+"elevation_profile_min_elevation" = "Min. elevation";
+"category_hotel" = "Hotel";
+"postal_code" = "Postal Code";
+"location_services_disabled_1" = "1. Open Settings";
+"osm_profile_reauthorize_promt" = "The OpenStreetMap account was disconnected from this app";
+"whats_new_auto_update_title" = "Update downloaded maps";
+"power_managment_setting_auto" = "When battery is low";
+"recover" = "Recover";
+"km" = "km";
+"search_history_title" = "Search History";
+"placepage_delete_track_button" = "Delete Track";
+"house_number" = "Building number";
+"show" = "Show";
+"dialog_routing_location_unknown_turn_on" = "Unable to locate current GPS coordinates. Enable location services to calculate route.";
+"dialog_routing_disclaimer_title" = "When following the route, please keep in mind:";
+"location_services_disabled_header" = "Location services are disabled";
+"tracks_title" = "Tracks";
+"long_tap_toast" = "Long-tap on the map again to see the interface";
+"bookmarks_error_message_empty_list_name" = "Please enter the list name";
+"start_from_my_position" = "Start from";
+"routing_failed_cross_mwm_building" = "Routes can only be created that are fully contained within a map of a single region.";
+"email_or_username" = "Email or username";
+"editor_focus_map_on_location" = "Drag the map to place the cross at the location of the place or business.";
+"error_enter_correct_email" = "Enter a valid email";
+"continue_button" = "Continue";
+"placepage_delete_bookmark_button" = "Delete Bookmark";
+"tourist_places" = "Sights";
+"hours_confirmed_time_ago" = "Confirmed %@";
+"placepage_call_button" = "Call";
+"pref_tts_enable_title" = "Enable Voice Instructions";
+"define_to_avoid_btn" = "Define roads to avoid";
+"bookmark_set_name" = "Bookmark List Name";
+"book_button" = "Book";
+"error_enter_correct_house_number" = "Enter a valid building number";
+"toll_road" = "Toll road";
+"choose_language" = "Choose a language";
+"editor_edit_place_name_hint" = "Name of the place";
+"accept" = "Accept";
+"not_all_shown_bookmarks_carplay" = "Not all bookmarks are shown";
+"icloud_synchronization_error_connection_error" = "Error: Failed to synchronize due to connection error";
+"dialog_routing_change_start" = "Adjust starting point";
+"editor_remove_place_message" = "Delete added place?";
+"blue_gray" = "Blue Gray";
+"report_a_bug" = "Report a bug";
+"wikimedia_commons" = "Wikimedia Commons";
+"recover_all" = "Recover All";
+"moreyear_ago_sorttype" = "More than a year ago";
+"editor_reset_edits_message" = "Discard all local changes?";
+"sort_distance" = "Sort by distance";
+"copyright" = "Copyright";
+"category_fuel" = "Gas";
+"editor_add_place_title" = "Adding";
+"social_pixelfed" = "Pixelfed";
+"religious_places" = "Religious places";
+"day" = "d";
+"bookmarks_error_message_share_empty" = "Cannot share an empty list";
+"sort_date" = "Sort by date";
+"facebook" = "Facebook";
+"app_tip_00" = "Thank you for using our community-built maps!";
+"search_not_found_query" = "Download the region where you are searching or try adding a nearby town/village name.";
+"load_kmz_title" = "Loading Bookmarks";
+"button_layer_isolines" = "Contour Lines";
+"later" = "Later";
+"version %@ (%@)" = "Version %@ (%@)";
+"osm_profile_remove" = "Remove OpenStreetMap account";
+"length" = "Length";
+"sort_default" = "Sort by default";
+"button_plan" = "Plan";
+"purple" = "Purple";
+"change_color" = "Change Color";
+"continue_recording" = "Continue Recording";
+"bookmarks_error_message_share_general" = "Unable to share due to an application error";
+"editor_time_simple" = "Simple Mode";
+"editor_add_select_category" = "Select category";
+"speedcams_alert_title" = "Speed cameras";
+"map" = "Map";
+"bookmarks" = "Bookmarks";
+"bookmarks_and_tracks" = "Bookmarks and Tracks";
+"downloader_downloaded_subtitle" = "Downloaded";
+"blue" = "Blue";
+"today" = "Today";
+"mobile_data_option_never" = "Never Use";
+"editor_time_open" = "Open";
+"bookmarks_convert_error_message" = "Some files were not converted.";
+"profile" = "OpenStreetMap profile";
+"transliteration_title" = "Transliterate into Latin alphabet";
+"recent_track_background_dialog_title" = "Disable recording of your recently travelled route?";
+"placepage_more_button" = "More";
+"osm_profile_logout" = "Logout of OpenStreetMap account";
+"open_in_app" = "Open in Another App";
+"done" = "Done";
+"minute" = "min";
+"core_my_position" = "My Position";
+"traffic_update_maps_text" = "To display traffic data, maps must be updated.";
+"pref_left_button_type" = "Left Main Button";
+"bookmark_lists_show_all" = "Show all";
+"routing_requires_all_map" = "In order to create a route, we need to download and update all the maps from your location to your destination.";
+"thank_you" = "Thank You";
+"yes_available" = "Yes";
+"osm_profile_reauthorize" = "Reconnect with OpenStreetMap";
diff --git a/iphone/metadata/it/description.txt b/iphone/metadata/it/description.txt
index bb80f3e0d..a2e103ea2 100644
--- a/iphone/metadata/it/description.txt
+++ b/iphone/metadata/it/description.txt
@@ -4,8 +4,8 @@ Una app sviluppata dalla comunità, gratuita e open-source, basata su OpenStreet
 ‣ Offline: Pianifica e percorri il tuo viaggio senza necessità di essere connesso alla rete, cerca tappe mentre sei in una escursione etc. Tutte le funzionalità dell'app sono pensate per operare senza rete.
 ‣ Rispetta la Privacy: L'app è pensata per rispettare la tua Privacy, non identifica le persone e non registra o colleziona i tuoi dati personali. Senza pubblicità.
 ‣ Preserva la Batteria e lo Spazio in Memoria: Non consuma batteria come altre app di navigazione. Le mappe compatte salvano il prezioso spazio del tuo telefono.
-‣ Gratis e Sviluppata dalla Community: Persone come te posso aiutare a migliorare l'app aggiungendo luoghi su OpenStreetMap, testando e dando opinioni sulle funzionalità dell'app e contribuendo al loro sviluppo e sostentamento economico.
-‣ Aperta e Trasparente nel Processo Decisionale e Finanziario, Senza Scopo di Lucro e Completamente Open Source
+‣ Gratis e sviluppata dalla Community: Persone come te possono aiutare a migliorare l'app aggiungendo luoghi su OpenStreetMap, testando e dando opinioni sulle funzionalità dell'app e contribuendo al loro sviluppo e sostentamento economico.
+‣ Aperta e trasparente nel processo decisionale e finanziario, senza scopo di lucro e completamente Open Source
 
 Funzionalità principali:
 • Scarica mappe dettagliate di luoghi che non sono disponibili su Google Maps
@@ -24,5 +24,5 @@ Funzionalità principali:
 • Migliora le mappe per tutti usando l'editor interno
 • Supporto CarPlay
 
-La Libertà è Qui
-Esplora la tua nuova avventura, naviga il mondo con Privacy e la community in prima linea!
\ No newline at end of file
+La Libertà è qui
+Esplora la tua nuova avventura, naviga il mondo con Privacy e la community in prima linea!
diff --git a/iphone/metadata/it/keywords.txt b/iphone/metadata/it/keywords.txt
index de047e7be..edcb25ae7 100644
--- a/iphone/metadata/it/keywords.txt
+++ b/iphone/metadata/it/keywords.txt
@@ -1 +1 @@
-comaps,mappe,open street maps,osm,viaggi,escursione,guida,offline,privacy,navigazione,gps
\ No newline at end of file
+comaps,mappe,open street maps,osm,viaggi,escursione,guida,offline,privacy,navigazione,gps
diff --git a/iphone/metadata/it/marketing_url.txt b/iphone/metadata/it/marketing_url.txt
index 12f132152..9da7e0fd8 100644
--- a/iphone/metadata/it/marketing_url.txt
+++ b/iphone/metadata/it/marketing_url.txt
@@ -1 +1 @@
-https://comaps.app/it/
\ No newline at end of file
+https://comaps.app/it/
diff --git a/iphone/metadata/it/privacy_url.txt b/iphone/metadata/it/privacy_url.txt
index 485e6b049..4f155dbec 100644
--- a/iphone/metadata/it/privacy_url.txt
+++ b/iphone/metadata/it/privacy_url.txt
@@ -1 +1 @@
-https://comaps.app/it/privacy
\ No newline at end of file
+https://comaps.app/it/privacy
diff --git a/iphone/metadata/it/subtitle.txt b/iphone/metadata/it/subtitle.txt
index b5b315182..1346fb7f0 100644
--- a/iphone/metadata/it/subtitle.txt
+++ b/iphone/metadata/it/subtitle.txt
@@ -1 +1 @@
-Viaggia con privacy
\ No newline at end of file
+Viaggia rispettando la privacy
diff --git a/iphone/metadata/it/support_url.txt b/iphone/metadata/it/support_url.txt
index 3b3b80f3d..f93b754b6 100644
--- a/iphone/metadata/it/support_url.txt
+++ b/iphone/metadata/it/support_url.txt
@@ -1 +1 @@
-https://codeberg.org/comaps/comaps/issues
\ No newline at end of file
+https://codeberg.org/comaps/comaps/issues

From 55639db3ec0397d355ee14a04d77dea62962801e Mon Sep 17 00:00:00 2001
From: Yannik Bloscheck <git@yannikbloscheck.com>
Date: Sun, 31 Aug 2025 10:10:37 +0200
Subject: [PATCH 299/302] [core] Dynamically add language data to world files

Signed-off-by: Yannik Bloscheck <git@yannikbloscheck.com>
---
 libs/indexer/mwm_set.hpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/libs/indexer/mwm_set.hpp b/libs/indexer/mwm_set.hpp
index 4f6d07e14..d4c2bd1f5 100644
--- a/libs/indexer/mwm_set.hpp
+++ b/libs/indexer/mwm_set.hpp
@@ -81,7 +81,13 @@ public:
 
   MwmTypeT GetType() const;
 
-  feature::RegionData const & GetRegionData() const { return m_data; }
+  feature::RegionData GetRegionData() const {
+    auto regionData = m_data;
+    if (GetType() == MwmTypeT::WORLD || GetType() == MwmTypeT::COASTS) {
+      regionData.SetLanguages({"int_name","en","default"});
+    }
+    return regionData;
+  }
 
   /// Returns the lock counter value for test needs.
   uint8_t GetNumRefs() const { return m_numRefs; }

From f0f52c1a11c2b50c027144e5a6f1088e100ecdf3 Mon Sep 17 00:00:00 2001
From: Konstantin Pastbin <konstantin.pastbin@gmail.com>
Date: Sun, 31 Aug 2025 23:31:13 +0700
Subject: [PATCH 300/302] [planet] Update map data to 250822

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
---
 data/countries.txt | 4606 ++++++++++++++++++++++----------------------
 1 file changed, 2303 insertions(+), 2303 deletions(-)

diff --git a/data/countries.txt b/data/countries.txt
index e766bb961..11cec8a31 100644
--- a/data/countries.txt
+++ b/data/countries.txt
@@ -1,16 +1,16 @@
 {
- "v": 250804,
+ "v": 250822,
  "id": "Countries",
  "g": [
   {
    "id": "World",
-   "s": 50897353,
-   "sha1_base64": "mxU4v3xRUnCg93LyxRVQLplnW68="
+   "s": 51166348,
+   "sha1_base64": "aBI9KcDuy7OEG7p5FV3EVeCL0d4="
   },
   {
    "id": "WorldCoasts",
    "s": 8524547,
-   "sha1_base64": "8qKkseRDadifsPRnXydxWIx+gVU="
+   "sha1_base64": "T4kKYGVsmcwGxv+RqmBhUfj0I94="
   },
   {
    "id": "Abkhazia",
@@ -22,8 +22,8 @@
     "აფხაზეთის ავტონომიური რესპუბლიკა - Аҧсны Автономтә Республика",
     "საქართველო"
    ],
-   "s": 15919825,
-   "sha1_base64": "kSN3HEPvbkIk+g7Rjgt+VoGwhlA="
+   "s": 15919194,
+   "sha1_base64": "LtcNm+vQncZiIpw9s4s00TDFoDo="
   },
   {
    "id": "Afghanistan",
@@ -67,8 +67,8 @@
     "ولایت غور",
     "افغانستان"
    ],
-   "s": 186337026,
-   "sha1_base64": "WhNql4nH645+h12e4SBmAp4nmwk="
+   "s": 186598685,
+   "sha1_base64": "L+Z36NWag9NZu0AY+2HLmIWQtBI="
   },
   {
    "id": "Albania",
@@ -78,8 +78,8 @@
    "affiliations": [
     "Shqipëria"
    ],
-   "s": 60510835,
-   "sha1_base64": "NnnN/NIeZekGGwgxBRjxswMdKnE="
+   "s": 60787542,
+   "sha1_base64": "bRmMIYIU7yGNnVqfEYId+250IWw="
   },
   {
    "id": "Algeria",
@@ -109,8 +109,8 @@
       "Tindouf ⵜⵉⵏⴷⵓⴼ تندوف",
       "Tébessa - تبسة"
      ],
-     "s": 174395742,
-     "sha1_base64": "x9u/8K4k7zJbbKkpy2PvJmt/lhk="
+     "s": 174572985,
+     "sha1_base64": "UQtGoDXh5xi46NI8W9ULQbrEHO8="
     },
     {
      "id": "Algeria_Coast",
@@ -151,8 +151,8 @@
       "Tizi Ouzou - ⵜⵉⵣⵉ ⵓⵣⵣⵓ - تيزي وزو",
       "Tlemcen - تلمسان"
      ],
-     "s": 193812038,
-     "sha1_base64": "+DIrLr764A3o/yFAQILsuFQEv6Y="
+     "s": 194244513,
+     "sha1_base64": "iAMT2XttZg8KyN/83v2SJo2p83k="
     }
    ]
   },
@@ -164,8 +164,8 @@
    "affiliations": [
     "Andorra"
    ],
-   "s": 4833529,
-   "sha1_base64": "24YGwnYdv/fUyBzl+TtDMu+VDus="
+   "s": 4843251,
+   "sha1_base64": "rwLA7rixpGaQQlfBw4OvHqaTPFE="
   },
   {
    "id": "Angola",
@@ -193,8 +193,8 @@
     "Namibe",
     "Zaire"
    ],
-   "s": 121396900,
-   "sha1_base64": "LkJ6YCHw8w5Qh89YOSuSTJHPGgI="
+   "s": 121560687,
+   "sha1_base64": "6QEl5BStakOIQf5/eAiB3DzxUBU="
   },
   {
    "id": "Anguilla",
@@ -204,8 +204,8 @@
    "affiliations": [
     "Anguilla"
    ],
-   "s": 832912,
-   "sha1_base64": "Akn+GmsyASXsVpyaXDNBY+Kdd3M="
+   "s": 834000,
+   "sha1_base64": "H0b/1D4FIyWpUYgsJTu/SII1juQ="
   },
   {
    "id": "Antigua and Barbuda",
@@ -216,8 +216,8 @@
     "Antigua and Barbuda",
     "Montserrat"
    ],
-   "s": 2681032,
-   "sha1_base64": "XRM2/Z+B0Ypq+UvQHtsi5ee74To="
+   "s": 2702155,
+   "sha1_base64": "X3W4SU9J3CahOLmkei2ERr/IuJI="
   },
   {
    "id": "Barbados",
@@ -227,8 +227,8 @@
    "affiliations": [
     "Barbados"
    ],
-   "s": 6638554,
-   "sha1_base64": "AxvsTHIDRBn5w1PW03IDNMoIhoc="
+   "s": 6697886,
+   "sha1_base64": "NFUVV+RIY34/TfBkTooXBUxTJsA="
   },
   {
    "id": "British Virgin Islands",
@@ -238,8 +238,8 @@
    "affiliations": [
     "British Virgin Islands"
    ],
-   "s": 1202212,
-   "sha1_base64": "B19J+M+BCImNOGUlUFngb6RXpa0="
+   "s": 1236061,
+   "sha1_base64": "l/VxcpND7A6UomfhskrBXWlR+dg="
   },
   {
    "id": "Caribisch Nederland",
@@ -257,8 +257,8 @@
     "Aruba",
     "Curacao"
    ],
-   "s": 9763477,
-   "sha1_base64": "0sbCbCQ/CfZqWFeyk1Mi5NpXR/c="
+   "s": 9999632,
+   "sha1_base64": "9rBxBAGT5afQyUbrGZpVZoQYMZg="
   },
   {
    "id": "Dominica",
@@ -278,8 +278,8 @@
     "Saint Joseph Parish",
     "Saint Peter Parish"
    ],
-   "s": 3675263,
-   "sha1_base64": "BmzJqh5Vg8AxidBa4mvnGdweBLY="
+   "s": 3675841,
+   "sha1_base64": "3BueiWphjNMAptSNcrYxPIXDUD4="
   },
   {
    "id": "Grenada",
@@ -289,8 +289,8 @@
    "affiliations": [
     "Grenada"
    ],
-   "s": 2947539,
-   "sha1_base64": "zU3HfjJdMHZaEoCoYV3f0tOG5fI="
+   "s": 2956150,
+   "sha1_base64": "abinMI0OjFGuS137VPSX/kG2JmY="
   },
   {
    "id": "Guadeloupe",
@@ -302,8 +302,8 @@
     "Guadeloupe",
     "Montserrat"
    ],
-   "s": 17575793,
-   "sha1_base64": "pF6Lz8Ht0VJewDUpogiiqkBnEjI="
+   "s": 17635052,
+   "sha1_base64": "YnSQyOratIvmBoimnaxeH8ghg2M="
   },
   {
    "id": "Martinique",
@@ -315,8 +315,8 @@
     "Martinique",
     "Saint Lucia"
    ],
-   "s": 14581910,
-   "sha1_base64": "qzzUwriyelUcO9cVYEUJ55w3TXI="
+   "s": 14635249,
+   "sha1_base64": "GLpC0vXSXINy4+6EN5XASwfjtv4="
   },
   {
    "id": "Montserrat",
@@ -326,8 +326,8 @@
    "affiliations": [
     "Montserrat"
    ],
-   "s": 616650,
-   "sha1_base64": "JGM/iBRXoOZRrU+n2bN11qkgpKE="
+   "s": 617427,
+   "sha1_base64": "P/YlM2C4RrbmipyIm++GPmHZtPk="
   },
   {
    "id": "Saint Barthelemy",
@@ -337,8 +337,8 @@
    "affiliations": [
     "France"
    ],
-   "s": 916133,
-   "sha1_base64": "Kxgci/X7k15WgcYUvlVL7D+38fQ="
+   "s": 917486,
+   "sha1_base64": "OgLkTace3ZHxz6YGTKzQo1ADa8k="
   },
   {
    "id": "Saint Kitts and Nevis",
@@ -348,8 +348,8 @@
    "affiliations": [
     "Saint Kitts and Nevis"
    ],
-   "s": 1666055,
-   "sha1_base64": "5vgVgsyISn0t/zZMtkhFlb2TS4A="
+   "s": 1711824,
+   "sha1_base64": "Yaj7tkqO9W/y2+u3fAsTz7xp8vc="
   },
   {
    "id": "Saint Lucia",
@@ -360,8 +360,8 @@
     "Saint Lucia",
     "Saint Vincent and the Grenadines"
    ],
-   "s": 4185370,
-   "sha1_base64": "kCf5jVF33z2mUtq5My+47mvyhS0="
+   "s": 4192724,
+   "sha1_base64": "yhEQ79UuD6YDYmY01QoxOK9of4k="
   },
   {
    "id": "Saint Martin",
@@ -378,8 +378,8 @@
     "Saint Martin (Dutch part)",
     "Sint Maarten (Netherlands)"
    ],
-   "s": 2356769,
-   "sha1_base64": "a/fWKW2MQ8+eN5SWUUZzLWwi9jU="
+   "s": 2370195,
+   "sha1_base64": "HnhU5ZInoSHx2Gy1z9I2u6RBucE="
   },
   {
    "id": "Saint Vincent and the Grenadines",
@@ -389,8 +389,8 @@
    "affiliations": [
     "Saint Vincent and the Grenadines"
    ],
-   "s": 3039757,
-   "sha1_base64": "a8veH/Ipqc+oSfJWfHZWKKdAGQk="
+   "s": 3041063,
+   "sha1_base64": "qORMgOBudB32mGALsRqc0qdwTtM="
   },
   {
    "id": "Trinidad and Tobago",
@@ -400,8 +400,8 @@
    "affiliations": [
     "Trinidad and Tobago"
    ],
-   "s": 17851255,
-   "sha1_base64": "ReK8b2nvdZJmw48dmBhjMLVI0Vs="
+   "s": 17906610,
+   "sha1_base64": "WDNsJ35+hCm62q1TjXuk/YzoOCk="
   },
   {
    "id": "United States Virgin Islands",
@@ -416,8 +416,8 @@
     "VI",
     "United States of America"
    ],
-   "s": 3422774,
-   "sha1_base64": "FmOxzPuGsWbt3a4ebYZMpfzyVgA="
+   "s": 3439320,
+   "sha1_base64": "y6dURdpZPK7ajR9/MTmemsxdcS8="
   },
   {
    "id": "Argentina",
@@ -427,8 +427,8 @@
      "affiliations": [
       "Acuerdo de Campos de Hielo"
      ],
-     "s": 6790672,
-     "sha1_base64": "C7ssCuF4P9sYNW5OcwZpcGkrp/A="
+     "s": 6790800,
+     "sha1_base64": "T0rSkhtGorokscCJxFfeDvSjBjI="
     },
     {
      "id": "Argentina_Buenos Aires_Buenos Aires",
@@ -440,8 +440,8 @@
       "Ciudad Autónoma de Buenos Aires",
       "Buenos Aires"
      ],
-     "s": 64960232,
-     "sha1_base64": "CcflfLB4iD/TTF1NWiteFWAw+e0="
+     "s": 66804300,
+     "sha1_base64": "X5ZQUMQJEdVzxKvwrdDm1CwYtWY="
     },
     {
      "id": "Argentina_Buenos Aires_North",
@@ -452,8 +452,8 @@
       "Argentina",
       "Buenos Aires"
      ],
-     "s": 39516545,
-     "sha1_base64": "aGe2OnoZepHXAS9687DODlAlLco="
+     "s": 39866340,
+     "sha1_base64": "tUDyOjy8rSwKS6KrbDY16+rw/W4="
     },
     {
      "id": "Argentina_Buenos Aires_South",
@@ -464,8 +464,8 @@
       "Argentina",
       "Buenos Aires"
      ],
-     "s": 57122329,
-     "sha1_base64": "h6kMG+t3zU/cqgQV0jxr6NwaDz4="
+     "s": 57599620,
+     "sha1_base64": "iWo7bLOgLgAST48y/4HLkqifWS8="
     },
     {
      "id": "Argentina_Patagonia",
@@ -480,8 +480,8 @@
       "Santa Cruz",
       "Tierra del Fuego"
      ],
-     "s": 240743231,
-     "sha1_base64": "AkzdsaiwTSpuU4gmbsA9wKfh3wo="
+     "s": 241373810,
+     "sha1_base64": "G7uJsgJDTQngdjFZxvosFbWN9s4="
     },
     {
      "id": "Argentina_Cuyo",
@@ -495,8 +495,8 @@
       "San Juan",
       "San Luis"
      ],
-     "s": 75016121,
-     "sha1_base64": "kd+63atdRMsUfMCKQrBlGaVjWLY="
+     "s": 75615140,
+     "sha1_base64": "rC5Iz71AwBcJQEPTmm7Q+wUKrQk="
     },
     {
      "id": "Argentina_Mesopotamia",
@@ -517,8 +517,8 @@
       "Itapúa",
       "Misiones"
      ],
-     "s": 80815914,
-     "sha1_base64": "8zzDewyCkACpSyLMn+kKwBo0VBM="
+     "s": 81220101,
+     "sha1_base64": "OhybLsxdve9b0QqrdRVw1+PKY+Y="
     },
     {
      "id": "Argentina_Northwest",
@@ -535,8 +535,8 @@
       "Santiago del Estero",
       "Tucumán"
      ],
-     "s": 118928421,
-     "sha1_base64": "bL90nbO8Cjh+gGlB3zOYwk2+WQo="
+     "s": 119449456,
+     "sha1_base64": "KnmTO4hbvF1aZYSPeI8ITvBy6X0="
     },
     {
      "id": "Argentina_Pampas",
@@ -548,8 +548,8 @@
       "Córdoba",
       "La Pampa"
      ],
-     "s": 77700364,
-     "sha1_base64": "Qmi/tThyAu6vbVjiuSZprl+oo3Y="
+     "s": 78314559,
+     "sha1_base64": "JNxNntVp6A6t6dAEtqmQnFOTXn8="
     },
     {
      "id": "Argentina_Santa Fe",
@@ -560,8 +560,8 @@
       "Argentina",
       "Santa Fe"
      ],
-     "s": 55017786,
-     "sha1_base64": "Irg6Q1P0dvIOs++Wc6hvLC9+Vxc="
+     "s": 55648437,
+     "sha1_base64": "mfJMw0N+hjPH70YytNdyI7v6nTk="
     }
    ]
   },
@@ -586,8 +586,8 @@
     "Արագածոտնի մարզ",
     "Գեղարքունիք"
    ],
-   "s": 62962935,
-   "sha1_base64": "xA2YDL/gkJ+zBOqUhDYlc5A5X8o="
+   "s": 63251874,
+   "sha1_base64": "x1wPioSkOwjiZYDbJiglMoAViBc="
   },
   {
    "id": "Austria",
@@ -601,8 +601,8 @@
       "Burgenland",
       "Österreich"
      ],
-     "s": 40602749,
-     "sha1_base64": "5h3JMiQ5rArTn8xouVO0+qDhpLo="
+     "s": 40714056,
+     "sha1_base64": "0jCG9omSnF2vSI4Zx4lYDG8qmFA="
     },
     {
      "id": "Austria_Carinthia",
@@ -613,8 +613,8 @@
       "Kärnten",
       "Österreich"
      ],
-     "s": 68591229,
-     "sha1_base64": "z1dc1z7+XGYUv1aieosud1UOjus="
+     "s": 68841616,
+     "sha1_base64": "UVdsWorWjDS6p3H0bF5sChRmrb8="
     },
     {
      "id": "Austria_Lower Austria_Wien",
@@ -626,8 +626,8 @@
       "Niederösterreich",
       "Wien"
      ],
-     "s": 130430992,
-     "sha1_base64": "Ny7lKhe8lckUb335T/ahUM8hkCY="
+     "s": 131522451,
+     "sha1_base64": "n6opEeKBjSsEJ71z+IjXK7q0Aw4="
     },
     {
      "id": "Austria_Styria_Graz",
@@ -638,8 +638,8 @@
       "Österreich",
       "Steiermark"
      ],
-     "s": 89968030,
-     "sha1_base64": "Mi8R+SZxIN/K+PGP205R2mssztY="
+     "s": 90437961,
+     "sha1_base64": "KlOPJP5bP3eJd/+xCYZ/qjumtVI="
     },
     {
      "id": "Austria_Styria_Leoben",
@@ -650,8 +650,8 @@
       "Österreich",
       "Steiermark"
      ],
-     "s": 60776507,
-     "sha1_base64": "CC/8qKXspu7o4ZcLEGxGU7+jac8="
+     "s": 60964118,
+     "sha1_base64": "2t8gFxSDjULUO5HJxwYiGJC2lEY="
     },
     {
      "id": "Austria_Upper Austria_Linz",
@@ -662,8 +662,8 @@
       "Österreich",
       "Oberösterreich"
      ],
-     "s": 58165330,
-     "sha1_base64": "ii7ymKPxi13wAMaMP3vp/GxgGmk="
+     "s": 58423245,
+     "sha1_base64": "TqXxQwEjArosbvE0sP51wQtWvLM="
     },
     {
      "id": "Austria_Upper Austria_Wels",
@@ -674,8 +674,8 @@
       "Österreich",
       "Oberösterreich"
      ],
-     "s": 68172308,
-     "sha1_base64": "sgQtV6V4B/FVDibCMS9xQPlZBrs="
+     "s": 68400487,
+     "sha1_base64": "cDzzmnzNDJjy/IYtrHYbrCFKQx0="
     },
     {
      "id": "Austria_Lower Austria_West",
@@ -686,8 +686,8 @@
       "Österreich",
       "Niederösterreich"
      ],
-     "s": 126268412,
-     "sha1_base64": "A+yQJ2jVln6okEgCFLBexTqWeXo="
+     "s": 126640015,
+     "sha1_base64": "mDQyHNYJVxkCjYghHU7tKKcoEVk="
     },
     {
      "id": "Austria_Tyrol",
@@ -698,8 +698,8 @@
       "Österreich",
       "Tirol"
      ],
-     "s": 90681446,
-     "sha1_base64": "LEpZNFxAXST3RUJP+3dz0ydbSn4="
+     "s": 91166921,
+     "sha1_base64": "9bciVqZds8RLJbN/2pgd131RXn8="
     },
     {
      "id": "Austria_Salzburg",
@@ -710,8 +710,8 @@
       "Österreich",
       "Salzburg"
      ],
-     "s": 63514835,
-     "sha1_base64": "hD6nR/dsnScks2apdK/ZQu7DUQk="
+     "s": 63887806,
+     "sha1_base64": "Jpm8b4kgxgugHmZxe8XJSDKg1eY="
     },
     {
      "id": "Austria_Vorarlberg",
@@ -722,8 +722,8 @@
       "Österreich",
       "Vorarlberg"
      ],
-     "s": 38901743,
-     "sha1_base64": "yXgFMPbNiemjxZ1TS3int5fjtt4="
+     "s": 39015602,
+     "sha1_base64": "IXYEvDIKGSTSFMLPX0rZNlo5qd0="
     }
    ]
   },
@@ -738,7 +738,7 @@
       "Willis Island"
      ],
      "s": 186232,
-     "sha1_base64": "P24vimYuKKVCLRWOvLZn9zookuU="
+     "sha1_base64": "nFbyN9UaE4OjwcgxOjOJ7VaYFXY="
     },
     {
      "id": "Australia_Melbourne",
@@ -749,8 +749,8 @@
       "Australia",
       "Victoria"
      ],
-     "s": 166337840,
-     "sha1_base64": "AdmOfzb9rg1PBgKwSWFX6D/YsMw="
+     "s": 167413155,
+     "sha1_base64": "aHljBbCsvMitUhH4E8rlHls0sNo="
     },
     {
      "id": "Australia_New South Wales",
@@ -764,8 +764,8 @@
       "New South Wales",
       "Norfolk Island"
      ],
-     "s": 124839119,
-     "sha1_base64": "1SXYrCU369fV2DnJ49uS16P/dqM="
+     "s": 125329818,
+     "sha1_base64": "Vc5I8Qi02p9G5AT+Vf2Lw2ztoXE="
     },
     {
      "id": "Australia_Northern Territory",
@@ -776,8 +776,8 @@
       "Australia",
       "Northern Territory"
      ],
-     "s": 38408149,
-     "sha1_base64": "zqf63eFAcGan6DLvXd5vrxm7y3M="
+     "s": 38488808,
+     "sha1_base64": "PqktG1wGiNrCwZGKp8j51YVtNxA="
     },
     {
      "id": "Australia_Queensland",
@@ -789,8 +789,8 @@
       "Coral Sea Islands Territory",
       "Queensland"
      ],
-     "s": 130604124,
-     "sha1_base64": "O0+4P1ipXWXAi49Cl/hroob22w8="
+     "s": 130566391,
+     "sha1_base64": "CgoR2fffqwF3DfHm1MISLqzIUfk="
     },
     {
      "id": "Australia_South Australia",
@@ -801,8 +801,8 @@
       "Australia",
       "South Australia"
      ],
-     "s": 94837438,
-     "sha1_base64": "kMSNKv5L/O/kXJmmYwkX1kODqBQ="
+     "s": 95442505,
+     "sha1_base64": "QmywbjV2AmxX89uA2pNQc10Cbk8="
     },
     {
      "id": "Australia_Tasmania",
@@ -813,8 +813,8 @@
       "Australia",
       "Tasmania"
      ],
-     "s": 68356624,
-     "sha1_base64": "Su2kLy8ELhLIWqH1EmZMmWsVYns="
+     "s": 69036915,
+     "sha1_base64": "5q3HIfPa9C93zQ6ANd7RYSGnG1w="
     },
     {
      "id": "Australia_Victoria",
@@ -825,8 +825,8 @@
       "Australia",
       "Victoria"
      ],
-     "s": 126732273,
-     "sha1_base64": "rdMmHd0p4RwscR6iDX+qwA3yULk="
+     "s": 127189068,
+     "sha1_base64": "QnvwHCrpNmVSEIia2wRT2KuzN8w="
     },
     {
      "id": "Australia_Western Australia",
@@ -842,8 +842,8 @@
       "Cocos (Keeling) Islands",
       "Western Australia"
      ],
-     "s": 192608159,
-     "sha1_base64": "bFWP0M7/FlhxCsK6rVGs0mXrth8="
+     "s": 194045010,
+     "sha1_base64": "WU90GUrvVD662AEUI8zyH3fruJU="
     },
     {
      "id": "Australia_Brisbane",
@@ -856,8 +856,8 @@
       "France, Nouvelle-Calédonie, Récifs de Bellone (eaux territoriales)",
       "Queensland"
      ],
-     "s": 136370577,
-     "sha1_base64": "g031Vxd65jlgvAUbXPe+9+xe12w="
+     "s": 137522188,
+     "sha1_base64": "lWK3EDx6jw15+xLD3P/bAAuX/3M="
     },
     {
      "id": "Australia_Sydney",
@@ -870,8 +870,8 @@
       "Jervis Bay Territory",
       "New South Wales"
      ],
-     "s": 184535138,
-     "sha1_base64": "SPI/s7PPlB/UHOmEtFCSkvxYwng="
+     "s": 186226749,
+     "sha1_base64": "NtUi0dlDROYfhYHbGe5ZHGU05Hk="
     }
    ]
   },
@@ -894,8 +894,8 @@
       "Մարտունու շրջան (Martuni Province)",
       "Ստեփանակերտ (Stepanakert - Khankendi)"
      ],
-     "s": 12366984,
-     "sha1_base64": "ARb17eXZi2vLK22dm22J6xTrbrs="
+     "s": 12370194,
+     "sha1_base64": "guCZZPMNOjl4PwKLBeGc//yhOW4="
     },
     {
      "id": "Azerbaijan",
@@ -975,8 +975,8 @@
       "Şəmkir rayonu",
       "Şərur rayonu"
      ],
-     "s": 48796134,
-     "sha1_base64": "66NJc5zAGHCmSddxHIUdhDcv1cA="
+     "s": 49107033,
+     "sha1_base64": "Y34XGTPwKP/pMUTlVSYsatBo/9w="
     }
    ]
   },
@@ -993,8 +993,8 @@
     "المحافظة الجنوبية",
     "المحافظة الشمالية"
    ],
-   "s": 8682576,
-   "sha1_base64": "8G1pt5Ow6Rc4eD7ryjRkvTlIw30="
+   "s": 9000707,
+   "sha1_base64": "Eh0P2EGCaLm8eyvWveyuVAIE+WY="
   },
   {
    "id": "Bangladesh",
@@ -1012,8 +1012,8 @@
     "বাংলাদেশ",
     "চট্টগ্রাম বিভাগ"
    ],
-   "s": 341364046,
-   "sha1_base64": "uVGJV+pH/7+8PfybVtUCEFZ07hI="
+   "s": 341832698,
+   "sha1_base64": "Kgf2CQEtMh1D5XxgncUeG/slWEI="
   },
   {
    "id": "Belarus",
@@ -1030,8 +1030,8 @@
       "Беларусь",
       "Витебская область"
      ],
-     "s": 79310301,
-     "sha1_base64": "Ha/Cewel/yb/gvzIV6theKiVzgE="
+     "s": 79760752,
+     "sha1_base64": "9KPG71T+lnNnrhi7UMkueXQIZL4="
     },
     {
      "id": "Belarus_Hrodna Region",
@@ -1042,8 +1042,8 @@
       "Гродненская область",
       "Беларусь"
      ],
-     "s": 55370203,
-     "sha1_base64": "JGn5LACmNgguN6Ep2LzbXzF+fEk="
+     "s": 55733526,
+     "sha1_base64": "K4BaZXBMqDsg9M4CWiO+qiY2/u8="
     },
     {
      "id": "Belarus_Brest Region",
@@ -1054,8 +1054,8 @@
       "Беларусь",
       "Брестская область"
      ],
-     "s": 65195242,
-     "sha1_base64": "fTAJQbs3ZkH2u7G6VcXYziYNnRg="
+     "s": 65757965,
+     "sha1_base64": "a93jF7F+5EHBy8HT+XalOX179ds="
     },
     {
      "id": "Belarus_Homiel Region",
@@ -1066,8 +1066,8 @@
       "Гомельская область",
       "Беларусь"
      ],
-     "s": 52079905,
-     "sha1_base64": "aUqNxILqPrX4szu+B317+QMm8tQ="
+     "s": 52287748,
+     "sha1_base64": "0G9SbNiAmWUXW+fsHFIytlT/Ioc="
     },
     {
      "id": "Belarus_Maglieu Region",
@@ -1078,8 +1078,8 @@
       "Могилёвская область",
       "Беларусь"
      ],
-     "s": 40426967,
-     "sha1_base64": "foTCakP8Y/cFD857tm7tP5pxLuE="
+     "s": 40615482,
+     "sha1_base64": "HZ/PpVlCx4jvrcfOtKw4kuS9a0Y="
     },
     {
      "id": "Belarus_Minsk Region",
@@ -1094,8 +1094,8 @@
       "Колодищи",
       "Национальный аэропорт \"Минск\""
      ],
-     "s": 97977844,
-     "sha1_base64": "G9CIV58INogRHulLUeZFvuZSy6k="
+     "s": 98931103,
+     "sha1_base64": "XkB9/ViG2WOqOg6B37E1u/5Ooxk="
     }
    ]
   },
@@ -1112,8 +1112,8 @@
       "België - Belgique - Belgien",
       "Vlaanderen"
      ],
-     "s": 72964682,
-     "sha1_base64": "eNGQxKtEk07horVDiSZ8PIQy9Cs="
+     "s": 73317565,
+     "sha1_base64": "IRMyoYtvQKx4l+UhHduoa2jA+DQ="
     },
     {
      "id": "Belgium_Antwerp",
@@ -1125,8 +1125,8 @@
       "Nederland - Belgique / België / Belgien",
       "Vlaanderen"
      ],
-     "s": 71483561,
-     "sha1_base64": "NRbpQUd0EM6TVHDI/PT66hXydnE="
+     "s": 71898060,
+     "sha1_base64": "ZRLZIUjJe7zcCjIzstOHMwszO4g="
     },
     {
      "id": "Belgium_East Flanders",
@@ -1137,8 +1137,8 @@
       "België - Belgique - Belgien",
       "Vlaanderen"
      ],
-     "s": 77013123,
-     "sha1_base64": "mkuXWdDvCxKEh3jv1Gv5PVhYOlE="
+     "s": 77434894,
+     "sha1_base64": "CnOq3DN1mgdZK27DSYX7G2O0ClA="
     },
     {
      "id": "Belgium_Hainaut",
@@ -1149,8 +1149,8 @@
       "België - Belgique - Belgien",
       "Wallonie"
      ],
-     "s": 77974443,
-     "sha1_base64": "Ym8f/F3eYehUuQqOpN5Azg2738w="
+     "s": 78406486,
+     "sha1_base64": "EaIG47jFoa0xOx3QEhva0BebYFU="
     },
     {
      "id": "Belgium_Walloon Brabant",
@@ -1161,8 +1161,8 @@
       "België - Belgique - Belgien",
       "Wallonie"
      ],
-     "s": 19579620,
-     "sha1_base64": "bA2SlOJbDbeTOgcKcG1w7AyEKhw="
+     "s": 19741647,
+     "sha1_base64": "SBZfO6G8wJgzGrHbZp6Xg25RyzY="
     },
     {
      "id": "Belgium_Namur",
@@ -1173,8 +1173,8 @@
       "België - Belgique - Belgien",
       "Wallonie"
      ],
-     "s": 31296926,
-     "sha1_base64": "RdJI8GsQDNEz7ebkgHX/UbFERXQ="
+     "s": 31484905,
+     "sha1_base64": "LeYI225MwD4dDa88C8m6bXcmm4E="
     },
     {
      "id": "Belgium_Limburg",
@@ -1185,8 +1185,8 @@
       "België - Belgique - Belgien",
       "Vlaanderen"
      ],
-     "s": 50791865,
-     "sha1_base64": "ypaGJrzmuzlssOmYuaHi69vknNQ="
+     "s": 51033844,
+     "sha1_base64": "T3KVI08NNoqMMVyur45Uq5+OBvs="
     },
     {
      "id": "Belgium_Luxembourg",
@@ -1197,8 +1197,8 @@
       "België - Belgique - Belgien",
       "Wallonie"
      ],
-     "s": 35841008,
-     "sha1_base64": "m07aGv1LbyLfPset78HAsLtTJOI="
+     "s": 35995323,
+     "sha1_base64": "1jgQ7e/xm7nv1n/4Cfylg1/5JOY="
     },
     {
      "id": "Belgium_Flemish Brabant",
@@ -1210,8 +1210,8 @@
       "Région de Bruxelles-Capitale - Brussels Hoofdstedelijk Gewest",
       "Vlaanderen"
      ],
-     "s": 81049746,
-     "sha1_base64": "dMiGt3T/KXJCMlNXdkupIFZ/xKU="
+     "s": 81677093,
+     "sha1_base64": "Cu+Kig22gjYe8OZDbreCJbXxEnQ="
     },
     {
      "id": "Belgium_Liege",
@@ -1222,8 +1222,8 @@
       "België - Belgique - Belgien",
       "Wallonie"
      ],
-     "s": 61250837,
-     "sha1_base64": "42lRmiFKFHNEQmt6o/2OjC8Iw9w="
+     "s": 61563912,
+     "sha1_base64": "mPVAWPGT5BQoU7aVfufi8rVxbQ4="
     }
    ]
   },
@@ -1243,8 +1243,8 @@
     "Stann Creek",
     "Toledo"
    ],
-   "s": 27870825,
-   "sha1_base64": "jK0kXGcaE9tjkfds/gUkb5bVq0Q="
+   "s": 27952836,
+   "sha1_base64": "bqVUXmJQU2vSuIqL2kyZoGpG9t0="
   },
   {
    "id": "Benin",
@@ -1266,8 +1266,8 @@
     "Plateau",
     "Zou"
    ],
-   "s": 51300924,
-   "sha1_base64": "oFeUmeqalBpVmdEF8B617BlOa88="
+   "s": 51389639,
+   "sha1_base64": "fcnnlxuEoy2NuKrR7tu/BeyO54g="
   },
   {
    "id": "Bermuda",
@@ -1277,8 +1277,8 @@
    "affiliations": [
     "Bermuda"
    ],
-   "s": 2075486,
-   "sha1_base64": "Vej7zK8E/kvQkmY/w9Gfzpoe17M="
+   "s": 2083951,
+   "sha1_base64": "Zy1NBvJ70xYPNDSV1bqltvSqyAk="
   },
   {
    "id": "Bhutan",
@@ -1308,8 +1308,8 @@
     "དབང་འདུས་ཕོ་བྲང་རྫོང་ཁག་",
     "བསམ་གྲུབ་ལྗོངས་མཁར་རྫོང་ཁག་"
    ],
-   "s": 34331137,
-   "sha1_base64": "kfjgZLUA2z/e0889FKAfgGVMR+o="
+   "s": 34336907,
+   "sha1_base64": "aH3ohacc4Hp13ZotPwkbao/E7cE="
   },
   {
    "id": "Bolivia",
@@ -1326,8 +1326,8 @@
       "Pando",
       "Santa Cruz"
      ],
-     "s": 112379086,
-     "sha1_base64": "Gk+g7EgrZre2tH0zBrUBjaKP5ps="
+     "s": 113155953,
+     "sha1_base64": "Fpg2AaaWwOJY3aYUr9kn9KEs3E0="
     },
     {
      "id": "Bolivia_South",
@@ -1342,8 +1342,8 @@
       "Potosí",
       "Tarija"
      ],
-     "s": 114332085,
-     "sha1_base64": "o+lTcFnu5+PJ/gd1ifa5nGorZL4="
+     "s": 114923872,
+     "sha1_base64": "W7WU5k+gcasBOAB2Lzii3MySppk="
     }
    ]
   },
@@ -1359,8 +1359,8 @@
       "Bosna i Hercegovina",
       "Federacija Bosne i Hercegovine"
      ],
-     "s": 79247820,
-     "sha1_base64": "MK5YaqdpQRBSqI9we85A9P5HO1s="
+     "s": 79361631,
+     "sha1_base64": "Zne1l3QUZAdxzd/Q32tGWSWqNrs="
     },
     {
      "id": "Bosnia and Herzegovina_Brcko district of Bosnia and Herzegowina",
@@ -1372,8 +1372,8 @@
       "Bosna i Hercegovina",
       "Republika Srpska"
      ],
-     "s": 2617901,
-     "sha1_base64": "2iwejLAsshA+noyXyNG8qQt6fME="
+     "s": 2624543,
+     "sha1_base64": "U2akJInW7GY5IROMrQHP09/Uatk="
     },
     {
      "id": "Bosnia and Herzegovina_Republic of Srpska",
@@ -1384,8 +1384,8 @@
       "Bosna i Hercegovina",
       "Republika Srpska"
      ],
-     "s": 99697154,
-     "sha1_base64": "J0VeDC8bo6jNhQ7OQySOtBvJW5I="
+     "s": 99934077,
+     "sha1_base64": "JCgnMvrNEkRQu0qlv63R6ofl06s="
     }
    ]
   },
@@ -1406,8 +1406,8 @@
     "South-East District",
     "Southern District"
    ],
-   "s": 87422927,
-   "sha1_base64": "dq28LDExY3O0SLlyHgKID9TnI18="
+   "s": 87533010,
+   "sha1_base64": "SguLx+o7k+FBGnswRe8rT/Pd5R4="
   },
   {
    "id": "Brazil",
@@ -1421,8 +1421,8 @@
       "Bahia",
       "Brasil"
      ],
-     "s": 130942102,
-     "sha1_base64": "jTtR9zFgqZXD5IkppDNPI7aV1t8="
+     "s": 131940785,
+     "sha1_base64": "l6dGoB48ukZTf4WFzVJJOqcFpfY="
     },
     {
      "id": "Brazil_Goias_North",
@@ -1433,8 +1433,8 @@
       "Brasil",
       "Goiás"
      ],
-     "s": 31777381,
-     "sha1_base64": "TXnsCt0whKAuOFovHYVFZAblsFs="
+     "s": 32224575,
+     "sha1_base64": "63cOs261VD5AL0QXcHlHBnuyaX0="
     },
     {
      "id": "Brazil_Goias_Brasilia",
@@ -1446,8 +1446,8 @@
       "Distrito Federal",
       "Goiás"
      ],
-     "s": 55116991,
-     "sha1_base64": "cMpw9G1/HAZcxfnsg3VWUDokIqk="
+     "s": 56229114,
+     "sha1_base64": "dLZjob74FQITou8GetBX/0Q9l1g="
     },
     {
      "id": "Brazil_Mato Grosso Do Sul",
@@ -1458,8 +1458,8 @@
       "Brasil",
       "Mato Grosso do Sul"
      ],
-     "s": 38112749,
-     "sha1_base64": "PG0HuDXUplDYZOmIsaI4rgRTBsE="
+     "s": 38255440,
+     "sha1_base64": "qxa5PB5BXsho+3dxZGwqtTB4ioU="
     },
     {
      "id": "Brazil_Mato Grosso",
@@ -1470,8 +1470,8 @@
       "Brasil",
       "Mato Grosso"
      ],
-     "s": 79194163,
-     "sha1_base64": "vj2nkjPo3RZn7o5Wt91gMUFFJmQ="
+     "s": 79591390,
+     "sha1_base64": "1lMMA8KYsWIDEoOwkdoqllmrExo="
     },
     {
      "id": "Brazil_North Region_East",
@@ -1484,8 +1484,8 @@
       "Pará",
       "Tocantins"
      ],
-     "s": 127364216,
-     "sha1_base64": "spDhkhU+Ko5e38sEBEH9YETaiw4="
+     "s": 127882531,
+     "sha1_base64": "Rz8yalp3U9Rbhnc0qXs/f3pWMGM="
     },
     {
      "id": "Brazil_North Region_West",
@@ -1499,8 +1499,8 @@
       "Rondônia",
       "Roraima"
      ],
-     "s": 139755916,
-     "sha1_base64": "83pReR+x8fDV5ExOfgL111e2YY4="
+     "s": 140010215,
+     "sha1_base64": "/knZdvAso7ldSaJ/a8PZTG68ews="
     },
     {
      "id": "Brazil_Northeast Region_East",
@@ -1513,8 +1513,8 @@
       "Pernambuco",
       "Sergipe"
      ],
-     "s": 91948722,
-     "sha1_base64": "bt4kIuHP0n7SvdSg+vYZuBSDMS0="
+     "s": 92465837,
+     "sha1_base64": "o1ojc4+cLtFS5OcJ7GVf4Hg43fM="
     },
     {
      "id": "Brazil_Northeast Region_West",
@@ -1528,8 +1528,8 @@
       "Pernambuco",
       "Piauí"
      ],
-     "s": 218618059,
-     "sha1_base64": "lvlui4ksCnfkeb5LiXsqsf0vy8Q="
+     "s": 219855782,
+     "sha1_base64": "a+Fbr7tbQPSTAVHOlLbJSy4zFow="
     },
     {
      "id": "Brazil_Paraiba",
@@ -1540,8 +1540,8 @@
       "Brasil",
       "Paraíba"
      ],
-     "s": 49199872,
-     "sha1_base64": "8aM+Fu7VQWFoEC9RCX50ZoZk2Ck="
+     "s": 49381683,
+     "sha1_base64": "iq0Tj/LkW9Z6Mgn2RligOQ4Xl6A="
     },
     {
      "id": "Brazil_Parana_East",
@@ -1552,8 +1552,8 @@
       "Brasil",
       "Paraná"
      ],
-     "s": 82041852,
-     "sha1_base64": "garPrz3peK0lQgRXtyOi6X/60JY="
+     "s": 82795855,
+     "sha1_base64": "bFHkiDK2c2ar6FR6GTjDXNyNwsA="
     },
     {
      "id": "Brazil_Parana_West",
@@ -1564,8 +1564,8 @@
       "Brasil",
       "Paraná"
      ],
-     "s": 103736838,
-     "sha1_base64": "7yfE6ieyKxauNryY9JEjxVb2y7Y="
+     "s": 104431473,
+     "sha1_base64": "AgPwPVh8hrwbNymJQGkF6FSzFGU="
     },
     {
      "id": "Brazil_Rio Grande do Norte",
@@ -1577,8 +1577,8 @@
       "Pernambuco",
       "Rio Grande do Norte"
      ],
-     "s": 28517692,
-     "sha1_base64": "t5gNniukHljJRjNX1CKgAQ+2itA="
+     "s": 28691599,
+     "sha1_base64": "BXx+OaxLPL16tAmpvptQVefKXLI="
     },
     {
      "id": "Brazil_Santa Catarina",
@@ -1589,8 +1589,8 @@
       "Brasil",
       "Santa Catarina"
      ],
-     "s": 152213560,
-     "sha1_base64": "SwshyqdQm8gLPikK/WjPkd8ilp0="
+     "s": 153217627,
+     "sha1_base64": "60Dm+aBXWMXXdRQzUWWO4ayvLFg="
     },
     {
      "id": "Brazil_South Region_East",
@@ -1601,8 +1601,8 @@
       "Brasil",
       "Rio Grande do Sul"
      ],
-     "s": 103775219,
-     "sha1_base64": "Z/4iENSkpPbPljwk/29Xjkfku2I="
+     "s": 104567574,
+     "sha1_base64": "qA7antRiIWMQPH9fN8XbPijXIPE="
     },
     {
      "id": "Brazil_South Region_West",
@@ -1613,8 +1613,8 @@
       "Brasil",
       "Rio Grande do Sul"
      ],
-     "s": 72053117,
-     "sha1_base64": "E8I98CMv+UbV9gjzQFzn8FmCo1s="
+     "s": 73068464,
+     "sha1_base64": "AFtNDU0ZcgT6SSCvOUsYQycPWwM="
     },
     {
      "id": "Brazil_Southeast Region_Espirito Santo",
@@ -1625,8 +1625,8 @@
       "Brasil",
       "Espírito Santo"
      ],
-     "s": 221300918,
-     "sha1_base64": "iW90Att+peNlB9M5WuJFdgLcjiI="
+     "s": 221539601,
+     "sha1_base64": "N+wURIodcEgpHIgSMQauM7sXf0A="
     },
     {
      "id": "Brazil_Southeast Region_Minas Gerais_Contagem",
@@ -1637,8 +1637,8 @@
       "Brasil",
       "Minas Gerais"
      ],
-     "s": 156809129,
-     "sha1_base64": "f/J5T7Dc3XjOfzyL2we7i8BXt+M="
+     "s": 157441324,
+     "sha1_base64": "6U86xS46p0m/J/GF5qNzaLk79Gs="
     },
     {
      "id": "Brazil_Southeast Region_Minas Gerais_North",
@@ -1649,8 +1649,8 @@
       "Brasil",
       "Minas Gerais"
      ],
-     "s": 138024687,
-     "sha1_base64": "8C0/OtWXnCweEHJxVuCZ3KNgwbI="
+     "s": 138309450,
+     "sha1_base64": "8T2OX4X3WmiwlR/io0yrNwN/8x4="
     },
     {
      "id": "Brazil_Southeast Region_Rio de Janeiro",
@@ -1661,8 +1661,8 @@
       "Brasil",
       "Rio de Janeiro"
      ],
-     "s": 95734987,
-     "sha1_base64": "fVbRqy5XMhNzHXm8F7+InrfrJQQ="
+     "s": 96641790,
+     "sha1_base64": "wRoTxJQzIFa+Mvx1MmwbbFXW4J0="
     },
     {
      "id": "Brazil_Southeast Region_Sao Paulo_Campinas",
@@ -1673,8 +1673,8 @@
       "Brasil",
       "São Paulo"
      ],
-     "s": 106014148,
-     "sha1_base64": "4JY/dEwZJqAGmXSVQSu22/Un1IQ="
+     "s": 106977223,
+     "sha1_base64": "mAhETXCRRI5Ll3PDJXB8xeNojx4="
     },
     {
      "id": "Brazil_Southeast Region_Sao Paulo_City",
@@ -1685,8 +1685,8 @@
       "Brasil",
       "São Paulo"
      ],
-     "s": 175969020,
-     "sha1_base64": "Yn24gECoFzyefCFobPZ7Q6RtcSQ="
+     "s": 178071871,
+     "sha1_base64": "qereFeztahOoVR3rwF2+riY2aoc="
     },
     {
      "id": "Brazil_Southeast Region_Sao Paulo_West",
@@ -1697,8 +1697,8 @@
       "Brasil",
       "São Paulo"
      ],
-     "s": 79861429,
-     "sha1_base64": "lAz2Tl1dan2c9+lfc9q9HlK4G1c="
+     "s": 80456688,
+     "sha1_base64": "5gm7KuAa/blCIAqvqrT/8Q8JO1A="
     }
    ]
   },
@@ -1710,8 +1710,8 @@
    "affiliations": [
     "Brunei Darussalam"
    ],
-   "s": 10549031,
-   "sha1_base64": "9+wj514ftCZwJNZQdeckoohdbV8="
+   "s": 10611106,
+   "sha1_base64": "SldaPwK3CVRz8U42HRZdErPQQns="
   },
   {
    "id": "Bulgaria",
@@ -1724,8 +1724,8 @@
      "affiliations": [
       "България"
      ],
-     "s": 68527092,
-     "sha1_base64": "2Ol3CP+uStDxKOFzAaQuuClnQj0="
+     "s": 68892951,
+     "sha1_base64": "XccghIbDvZ/S//QyVRxTNAlN1WI="
     },
     {
      "id": "Bulgaria_West",
@@ -1735,8 +1735,8 @@
      "affiliations": [
       "България"
      ],
-     "s": 124551904,
-     "sha1_base64": "4Zg2KvS4rTGDqckMAav7BvAo8Ms="
+     "s": 125113675,
+     "sha1_base64": "cyXNMN0G6Bl6CviDQlYHhg31eNc="
     }
    ]
   },
@@ -1761,8 +1761,8 @@
     "Sahel",
     "Sud-Ouest"
    ],
-   "s": 70252653,
-   "sha1_base64": "ZagP6lNAhbu92ANxTWT+D7FunSo="
+   "s": 70571488,
+   "sha1_base64": "Gk6K04dSaQxKTMxyFWn91ehuLvk="
   },
   {
    "id": "Burundi",
@@ -1789,8 +1789,8 @@
     "Rutana",
     "Ruyigi"
    ],
-   "s": 47162932,
-   "sha1_base64": "u6/jDt3fRavdesmvG9k3XETi09g="
+   "s": 47167118,
+   "sha1_base64": "ZU0olULNal6xrwtW/ymSqI6U4HA="
   },
   {
    "id": "Cambodia",
@@ -1825,8 +1825,8 @@
     "Tbong Khmum",
     "ព្រះរាជាណាចក្រកម្ពុជា (Cambodia)"
    ],
-   "s": 45397335,
-   "sha1_base64": "2iJuFUzjiTZFu7foo27xCOCc6p4="
+   "s": 46306778,
+   "sha1_base64": "LOu6dxjQN1pswCHj1eeONt+uzCs="
   },
   {
    "id": "Cameroon",
@@ -1845,8 +1845,8 @@
       "Nord",
       "Sud"
      ],
-     "s": 167507505,
-     "sha1_base64": "tq/oHXpjwr1amaIF6Xf+vkAMbpA="
+     "s": 167814803,
+     "sha1_base64": "Eea8ne3cVJaZ8csBUzM6wAYdZ50="
     },
     {
      "id": "Cameroon_West",
@@ -1860,8 +1860,8 @@
       "Ouest",
       "Sud-Ouest"
      ],
-     "s": 90511789,
-     "sha1_base64": "20uGphswWRVTATBQr7ARxw797Ug="
+     "s": 90537119,
+     "sha1_base64": "TlmG/YLkaYpLEg2CwLHNK6LGUEc="
     }
    ]
   },
@@ -1880,8 +1880,8 @@
         "Alberta",
         "Canada"
        ],
-       "s": 105932420,
-       "sha1_base64": "Rqmzs/HPCHPw9V7RTsWxozQ7K9Y="
+       "s": 106786960,
+       "sha1_base64": "WvLQVux5wexJtcKBM9FkznSTna4="
       },
       {
        "id": "Canada_Alberta_North",
@@ -1892,8 +1892,8 @@
         "Alberta",
         "Canada"
        ],
-       "s": 148511472,
-       "sha1_base64": "R9vQWyXqAHjWokE6CgTOdR1dSNk="
+       "s": 148643643,
+       "sha1_base64": "HGGA725knXRt/DnXv15YUMGBx74="
       },
       {
        "id": "Canada_Alberta_South",
@@ -1904,8 +1904,8 @@
         "Alberta",
         "Canada"
        ],
-       "s": 97807674,
-       "sha1_base64": "HDbqlfMM2uEsJb7dYkk2vKSxVos="
+       "s": 98857894,
+       "sha1_base64": "i063bR03NkUuK+yxvBP/nQVPMQU="
       }
      ]
     },
@@ -1921,8 +1921,8 @@
         "British Columbia",
         "Canada"
        ],
-       "s": 135620936,
-       "sha1_base64": "c77URc4DLIanLI+5NtfSdun9KlA="
+       "s": 135664011,
+       "sha1_base64": "TQhi1oqSZuGRZSxibZA++CUuSt0="
       },
       {
        "id": "Canada_British Columbia_Far_North",
@@ -1933,8 +1933,8 @@
         "British Columbia",
         "Canada"
        ],
-       "s": 35893937,
-       "sha1_base64": "NkIscxJaW9CvpJkURbRioGrgbao="
+       "s": 35913187,
+       "sha1_base64": "4Mw5qqJ/54w0UlKGB0Xio6im1Mg="
       },
       {
        "id": "Canada_British Columbia_Islands",
@@ -1945,8 +1945,8 @@
         "British Columbia",
         "Canada"
        ],
-       "s": 83100546,
-       "sha1_base64": "5mAo4FOuNx2DYRQ/c2McXMTxSKQ="
+       "s": 83360309,
+       "sha1_base64": "rR0a1UPNl7LUXnaOxPy9deDA8Nw="
       },
       {
        "id": "Canada_British Columbia_North",
@@ -1957,8 +1957,8 @@
         "British Columbia",
         "Canada"
        ],
-       "s": 279060616,
-       "sha1_base64": "bYa4nk1Y8vpT1fDWNP8WXbod2NY="
+       "s": 279115035,
+       "sha1_base64": "X6i4j8YsElLGkNWEJXBxS68gmkQ="
       },
       {
        "id": "Canada_British Columbia_Northeast",
@@ -1969,8 +1969,8 @@
         "British Columbia",
         "Canada"
        ],
-       "s": 113815789,
-       "sha1_base64": "ZfOTouC39iQPVWUT8cYMPNSwK4s="
+       "s": 113817767,
+       "sha1_base64": "RBNDOnVlMRRxzDi4zPCRSy2kXFI="
       },
       {
        "id": "Canada_British Columbia_Southeast",
@@ -1981,8 +1981,8 @@
         "British Columbia",
         "Canada"
        ],
-       "s": 126799003,
-       "sha1_base64": "JXwWo4uf7S7Wx+b2ayzjMJhc/3k="
+       "s": 127135055,
+       "sha1_base64": "WGilv33cP8cqNz8BXg0oSGVKToY="
       },
       {
        "id": "Canada_British Columbia_Vancouver",
@@ -1993,8 +1993,8 @@
         "British Columbia",
         "Canada"
        ],
-       "s": 114101446,
-       "sha1_base64": "KY1QteKF1NPLvpGZaRvUIi5XtS0="
+       "s": 115067650,
+       "sha1_base64": "+1RQE11vr6rpNGZN6WQf/J6rv3o="
       }
      ]
     },
@@ -2011,8 +2011,8 @@
         "Newfoundland and Labrador",
         "ᓄᓇᕗᑦ Nunavut"
        ],
-       "s": 59253350,
-       "sha1_base64": "8cg/VfAWyF58A6gk6w4QinEHPKM="
+       "s": 59253342,
+       "sha1_base64": "E2g+lSjqLZS5KbeOuenxowOPHhA="
       },
       {
        "id": "Canada_Labrador_South",
@@ -2023,8 +2023,8 @@
         "Canada",
         "Newfoundland and Labrador"
        ],
-       "s": 52693229,
-       "sha1_base64": "PEI4rko6ZeP0SdmX2QW3nTBHssA="
+       "s": 52697613,
+       "sha1_base64": "gDtLOCdPVZ2TO+xcA1dwztA7pWU="
       },
       {
        "id": "Canada_Labrador_West",
@@ -2035,8 +2035,8 @@
         "Canada",
         "Newfoundland and Labrador"
        ],
-       "s": 59291881,
-       "sha1_base64": "nHYsXFp0XdB72jc/wL3BxKcW9A8="
+       "s": 59300883,
+       "sha1_base64": "b8FeY8Vhs7MLlybEzOVqzsE4K3o="
       }
      ]
     },
@@ -2054,8 +2054,8 @@
         "Manitoba",
         "ᓄᓇᕗᑦ Nunavut"
        ],
-       "s": 92655399,
-       "sha1_base64": "goAf5booEP9zSLJWqC8yKCsn0ac="
+       "s": 92662487,
+       "sha1_base64": "Wu7udncz96y0x6p9xRhO9Ivlj+A="
       },
       {
        "id": "Canada_Manitoba_Northwest",
@@ -2066,8 +2066,8 @@
         "Canada",
         "Manitoba"
        ],
-       "s": 57900857,
-       "sha1_base64": "Z+xg82LK+U6um94QaYL+K3qv0Ks="
+       "s": 58032755,
+       "sha1_base64": "NCY+62slaGTHAhkCivqR563HeAo="
       },
       {
        "id": "Canada_Manitoba_South",
@@ -2078,8 +2078,8 @@
         "Canada",
         "Manitoba"
        ],
-       "s": 50246180,
-       "sha1_base64": "MRC/Wj0tIu7HN1KEpRMJAEEegwM="
+       "s": 50298823,
+       "sha1_base64": "53jH9tzA3LxL+1fBZ1QNXdaSYWU="
       },
       {
        "id": "Canada_Manitoba_Winnipeg",
@@ -2090,8 +2090,8 @@
         "Canada",
         "Manitoba"
        ],
-       "s": 49956350,
-       "sha1_base64": "IMG7RH7lE0zyHYfVj2/BcLOybLE="
+       "s": 50333434,
+       "sha1_base64": "Xqi2Q71QNONapU+MxhjutUyaB64="
       }
      ]
     },
@@ -2106,8 +2106,8 @@
       "New Brunswick",
       "Oromocto Indian Reserve NO. 26"
      ],
-     "s": 67709464,
-     "sha1_base64": "zChdmPO9JeRJO9FYO4qHOmH/q84="
+     "s": 67956291,
+     "sha1_base64": "cddlpVx/Thqz6Bbm40XMGwvhDJE="
     },
     {
      "id": "Canada_Newfoundland",
@@ -2121,8 +2121,8 @@
         "Canada",
         "Newfoundland and Labrador"
        ],
-       "s": 29990883,
-       "sha1_base64": "gcVYDJF5zltpmnUav1sIRzvrcIw="
+       "s": 30132494,
+       "sha1_base64": "zU5BYKtHGj3jfD5ozsTVaMFtrZE="
       },
       {
        "id": "Canada_Newfoundland_North",
@@ -2133,8 +2133,8 @@
         "Canada",
         "Newfoundland and Labrador"
        ],
-       "s": 35523073,
-       "sha1_base64": "S6yLXY9PYFmUOuIeIwxxmT7YKDE="
+       "s": 35545075,
+       "sha1_base64": "MTaMOp2Cyx1HoZ9iskf9yJ2WtlU="
       },
       {
        "id": "Canada_Newfoundland_South",
@@ -2148,8 +2148,8 @@
         "Newfoundland and Labrador",
         "Île Verte"
        ],
-       "s": 26854688,
-       "sha1_base64": "erSYvOKuC6W0IR9vNi45RdrDfjQ="
+       "s": 26857826,
+       "sha1_base64": "H+udjhzR5lTZtBRXri+bO0MAc5g="
       },
       {
        "id": "Canada_Newfoundland_West",
@@ -2160,8 +2160,8 @@
         "Canada",
         "Newfoundland and Labrador"
        ],
-       "s": 27212471,
-       "sha1_base64": "cIQ4IUMNfiPgtBvFVTNJG1DPSpQ="
+       "s": 27213601,
+       "sha1_base64": "XhotFvj/wZj4qRnqWCDRPD051HY="
       }
      ]
     },
@@ -2177,8 +2177,8 @@
         "Canada",
         "Northwest Territories"
        ],
-       "s": 104081925,
-       "sha1_base64": "ZSZWid4lrZeqK2CLvvT4vopk2o4="
+       "s": 104082069,
+       "sha1_base64": "IVZjKCPomMV6MM0XRQUyMSzu6G0="
       },
       {
        "id": "Canada_Northwest Territories_North",
@@ -2189,8 +2189,8 @@
         "Canada",
         "Northwest Territories"
        ],
-       "s": 321250627,
-       "sha1_base64": "/V9usOhSaFDrxtCEYSLHUmcWAS8="
+       "s": 321763694,
+       "sha1_base64": "846EUXlYt0gUltG+n/1NKR7dmfw="
       },
       {
        "id": "Canada_Northwest Territories_Yellowknife",
@@ -2201,8 +2201,8 @@
         "Canada",
         "Northwest Territories"
        ],
-       "s": 88617963,
-       "sha1_base64": "7ZnpL/AT9Is2r2UKOdIJ3Qvd/Ik="
+       "s": 88650285,
+       "sha1_base64": "0DQK8UyNiFAftMuYsIzki2Qy0tY="
       }
      ]
     },
@@ -2218,8 +2218,8 @@
         "Canada",
         "Nova Scotia"
        ],
-       "s": 71708400,
-       "sha1_base64": "VD2rvZlg1STCH5+0QKhnLJiYaRE="
+       "s": 71897555,
+       "sha1_base64": "LnaOPASB/eofaH0AKzt9b1RTaZ8="
       },
       {
        "id": "Canada_Nova Scotia_Sydney",
@@ -2231,8 +2231,8 @@
         "Nova Scotia",
         "Prince Edward Island"
        ],
-       "s": 30722808,
-       "sha1_base64": "JJmFQHCBdM76Dt1ArOveWpwoSf8="
+       "s": 30768915,
+       "sha1_base64": "SwzpOZvDO+NRv+3lasfpLoHTIVk="
       }
      ]
     },
@@ -2248,8 +2248,8 @@
         "Canada",
         "ᓄᓇᕗᑦ Nunavut"
        ],
-       "s": 384907333,
-       "sha1_base64": "Pdk2iVQE7MlzAAcgYE8AsEzbH+A="
+       "s": 384909333,
+       "sha1_base64": "tjZZjKCDUQYkXmS4WCdrMZocBNo="
       },
       {
        "id": "Canada_Nunavut_South",
@@ -2260,8 +2260,8 @@
         "Canada",
         "ᓄᓇᕗᑦ Nunavut"
        ],
-       "s": 649432032,
-       "sha1_base64": "IfKZE99Veln3WrhXmGlYs0ItFrY="
+       "s": 687780536,
+       "sha1_base64": "Yx+yzTKb6BTajcn+AroRR5gkquA="
       }
      ]
     },
@@ -2277,8 +2277,8 @@
         "Canada",
         "Ontario"
        ],
-       "s": 70813162,
-       "sha1_base64": "xHnKYT3Tv1DPpTOLT2QUmlODShY="
+       "s": 71003845,
+       "sha1_base64": "72FLbtURG9BQPZpi0jJP8jWLCHg="
       },
       {
        "id": "Canada_Ontario_Kingston",
@@ -2289,8 +2289,8 @@
         "Canada",
         "Ontario"
        ],
-       "s": 120053170,
-       "sha1_base64": "/pNiyJpx/h2D47mEqNdbSIQMXug="
+       "s": 120621005,
+       "sha1_base64": "XWPdlB60Ggk2ZZljp2njoK8qTvY="
       },
       {
        "id": "Canada_Ontario_London",
@@ -2301,8 +2301,8 @@
         "Canada",
         "Ontario"
        ],
-       "s": 95473954,
-       "sha1_base64": "6qAcD1GcjEvNFDjeP/PqoJVpmCE="
+       "s": 96744981,
+       "sha1_base64": "u71y69pI2Fp/+aHUIwRAp18IV9U="
       },
       {
        "id": "Canada_Ontario_Northeastern_Central",
@@ -2313,8 +2313,8 @@
         "Canada",
         "Ontario"
        ],
-       "s": 38725161,
-       "sha1_base64": "YKfx+Hlo9pWGIjxnVwAJnyMgh44="
+       "s": 38764972,
+       "sha1_base64": "fCy1AAqF3UDZuNQThyNt7nzWDLk="
       },
       {
        "id": "Canada_Ontario_Northeastern_North",
@@ -2327,8 +2327,8 @@
         "Ontario",
         "ᓄᓇᕗᑦ Nunavut"
        ],
-       "s": 48238309,
-       "sha1_base64": "JeisLfXbdutEwfd5FJrNYrg0XtM="
+       "s": 48241181,
+       "sha1_base64": "NEyClc3a0BfaQPisidtQ8IWuw60="
       },
       {
        "id": "Canada_Ontario_Northeastern_S",
@@ -2339,8 +2339,8 @@
         "Canada",
         "Ontario"
        ],
-       "s": 45006457,
-       "sha1_base64": "A+sLE4EP7xdlOvCCWo8zREXYwd8="
+       "s": 45111204,
+       "sha1_base64": "JdTFP+QgxHndw1V9Ig704Be0MYM="
       },
       {
        "id": "Canada_Ontario_Northeastern_SE",
@@ -2351,8 +2351,8 @@
         "Canada",
         "Ontario"
        ],
-       "s": 33511113,
-       "sha1_base64": "GHwtrtJGXDj8+oInhwEE79kk4HI="
+       "s": 33943732,
+       "sha1_base64": "564uqHiYrc8ZH0Bm/agnprHHdMU="
       },
       {
        "id": "Canada_Ontario_Northeastern_SW",
@@ -2363,8 +2363,8 @@
         "Canada",
         "Ontario"
        ],
-       "s": 50426410,
-       "sha1_base64": "cOs1ecbX2XAMXJWtjh3eaaGMHFk="
+       "s": 50486685,
+       "sha1_base64": "kJVMZPJGXaIFlnbmyIopPLh4qGI="
       },
       {
        "id": "Canada_Ontario_Northeastern_Wawa",
@@ -2375,8 +2375,8 @@
         "Canada",
         "Ontario"
        ],
-       "s": 34892408,
-       "sha1_base64": "LnGBBQNtvkoacIHbBZ4XBd7SmnA="
+       "s": 34907594,
+       "sha1_base64": "rRPGX6nFhIrOwwjp7Dx0uSQD7Zo="
       },
       {
        "id": "Canada_Ontario_Northern",
@@ -2387,8 +2387,8 @@
         "Canada",
         "Ontario"
        ],
-       "s": 52822083,
-       "sha1_base64": "0hzqMxfwZDXUg2WSeIxp0qonSj8="
+       "s": 52906174,
+       "sha1_base64": "G0+s6Xufhbx7czqwESbUVckBotk="
       },
       {
        "id": "Canada_Ontario_Northwestern",
@@ -2402,8 +2402,8 @@
         "Ontario",
         "ᓄᓇᕗᑦ Nunavut"
        ],
-       "s": 138184103,
-       "sha1_base64": "LyHmUjb7X0qgdny45jnFlFHVfKQ="
+       "s": 147457034,
+       "sha1_base64": "5t9MGjxDEph6Uj7H76pmLQPMZC0="
       },
       {
        "id": "Canada_Ontario_Toronto",
@@ -2414,8 +2414,8 @@
         "Canada",
         "Ontario"
        ],
-       "s": 138433615,
-       "sha1_base64": "+zeIXdUGiZKL2fiMGIpUQWTwXgE="
+       "s": 140668570,
+       "sha1_base64": "6p0jIDx1+v+XDZFlQN61fS3Nv8Y="
       }
      ]
     },
@@ -2428,8 +2428,8 @@
       "Canada",
       "Prince Edward Island"
      ],
-     "s": 13213079,
-     "sha1_base64": "iOgclpBeEPAhQqdKYXJR2MmpQbE="
+     "s": 13240834,
+     "sha1_base64": "SVLeUz0qrmQjlFoDtVGIabHU7Ks="
     },
     {
      "id": "Canada_Quebec",
@@ -2443,8 +2443,8 @@
         "Canada",
         "Québec"
        ],
-       "s": 90092292,
-       "sha1_base64": "W/AjXIfTE1KLJUdbxH+exR3cCAs="
+       "s": 90583063,
+       "sha1_base64": "zz5ui2bot0KeXKZcwrU40n4bIDs="
       },
       {
        "id": "Canada_Quebek_Far North",
@@ -2458,8 +2458,8 @@
         "Québec",
         "ᓄᓇᕗᑦ Nunavut"
        ],
-       "s": 508262398,
-       "sha1_base64": "wo7I8Pxln6/oBs12mGRAGWLin3Q="
+       "s": 508271385,
+       "sha1_base64": "05ZwnUO1ht11DEXSx+cXRv5A8GU="
       },
       {
        "id": "Canada_Quebek_Montreal",
@@ -2470,8 +2470,8 @@
         "Canada",
         "Québec"
        ],
-       "s": 121574053,
-       "sha1_base64": "yyqlo/KLyqix2mDoprVYNFKQt+0="
+       "s": 122866392,
+       "sha1_base64": "ngNnugotLdnS19uTeMBUrY4KjOw="
       },
       {
        "id": "Canada_Quebek_Lachute",
@@ -2482,8 +2482,8 @@
         "Canada",
         "Québec"
        ],
-       "s": 61532978,
-       "sha1_base64": "MdqJzEakGTgt4qIoYW9Djuvf12Q="
+       "s": 62059581,
+       "sha1_base64": "JR7gamMD4KmE2BlOQCtobPke1S8="
       },
       {
        "id": "Canada_Quebek_North",
@@ -2494,8 +2494,8 @@
         "Canada",
         "Québec"
        ],
-       "s": 98653045,
-       "sha1_base64": "WZ4CehL009YA6X4z3rSUj9Gu8MI="
+       "s": 98674503,
+       "sha1_base64": "yrmgZZt5fTsxHXecc9veybLj+lU="
       },
       {
        "id": "Canada_Quebek_Southeast_Rimouski",
@@ -2506,8 +2506,8 @@
         "Canada",
         "Québec"
        ],
-       "s": 41099691,
-       "sha1_base64": "Fr3Iu1N3ZuMbwLhHwgUFsDGQnxI="
+       "s": 41354206,
+       "sha1_base64": "4QzvXjR3+8qRe9LnK1BNWJH6PbA="
       },
       {
        "id": "Canada_Quebek_Southeast_Saguenay",
@@ -2518,8 +2518,8 @@
         "Canada",
         "Québec"
        ],
-       "s": 76182022,
-       "sha1_base64": "bfr1MWOwANK3wx+MQYxb/Ro8zKo="
+       "s": 76293489,
+       "sha1_base64": "DojY22uNELxl0RJzOHRBA4Xesas="
       },
       {
        "id": "Canada_Quebek_West_Chibougamau",
@@ -2530,8 +2530,8 @@
         "Canada",
         "Québec"
        ],
-       "s": 68357562,
-       "sha1_base64": "wcH3GNIE5caW9e8LZNY+5l8rT3A="
+       "s": 68382940,
+       "sha1_base64": "xT+5EUym+qs1Y1djUIVS7foTXzI="
       },
       {
        "id": "Canada_Quebek_West_Rouyn-Noranda",
@@ -2542,8 +2542,8 @@
         "Canada",
         "Québec"
        ],
-       "s": 74100603,
-       "sha1_base64": "DEldsOaPHdZf1bG+3E+yojIxPcU="
+       "s": 73989805,
+       "sha1_base64": "AluRvhnWOcDmaSiQ0t7KXcekKyU="
       }
      ]
     },
@@ -2559,8 +2559,8 @@
         "Canada",
         "Saskatchewan"
        ],
-       "s": 61871813,
-       "sha1_base64": "w0hodPmFxx9WhvaVbHaGlbzsmPI="
+       "s": 61984344,
+       "sha1_base64": "e1TCnMV5VMRCfwJE8DAoDBKIqHE="
       },
       {
        "id": "Canada_Saskatchewan_Saskatoon",
@@ -2571,8 +2571,8 @@
         "Canada",
         "Saskatchewan"
        ],
-       "s": 45013927,
-       "sha1_base64": "VKlBMIiQhInay04p8yaeWZ1fIwY="
+       "s": 45557498,
+       "sha1_base64": "+TZbcpI1L5OfOPZGfTij/omFZss="
       },
       {
        "id": "Canada_Saskatchewan_Regina",
@@ -2583,8 +2583,8 @@
         "Canada",
         "Saskatchewan"
        ],
-       "s": 56579304,
-       "sha1_base64": "T6tGZodEzrpt+nh2iFu5uhXALt0="
+       "s": 56846475,
+       "sha1_base64": "Blp1QiEvmz/s7YTPrs6e2uLxQdk="
       }
      ]
     },
@@ -2600,8 +2600,8 @@
         "Canada",
         "Yukon"
        ],
-       "s": 82231815,
-       "sha1_base64": "tYsJjHazJbJD406noMRfjYLSE2E="
+       "s": 82233231,
+       "sha1_base64": "cBZqMaPn6UV8Kn+3plPUNdDJGH4="
       },
       {
        "id": "Canada_Yukon_Whitehorse",
@@ -2612,8 +2612,8 @@
         "Canada",
         "Yukon"
        ],
-       "s": 55467548,
-       "sha1_base64": "HIXTAPe95PUgiZVJ0Oqp5sLzXBo="
+       "s": 55498254,
+       "sha1_base64": "5PzNElDg5dCGYPgkDpI9I3dWJ8E="
       }
      ]
     }
@@ -2630,8 +2630,8 @@
    "country_name_synonyms": [
     "Cabo Verde"
    ],
-   "s": 15633253,
-   "sha1_base64": "FYVVwqpCAZK6BZ6IIQMSCkdYSJk="
+   "s": 15643959,
+   "sha1_base64": "CWfmCmjw5YRqkCZDBl8ATzfjAUc="
   },
   {
    "id": "Cayman Islands",
@@ -2641,8 +2641,8 @@
    "affiliations": [
     "Cayman Islands"
    ],
-   "s": 1325694,
-   "sha1_base64": "s+TZLjj1eUNFcjh8nuclPbgc1c0="
+   "s": 1344511,
+   "sha1_base64": "+AEy0LnQnnpiSskgholFO7RCzc8="
   },
   {
    "id": "Central African Republic",
@@ -2668,8 +2668,8 @@
     "Sangha-Mbaéré",
     "Vakaga"
    ],
-   "s": 161367717,
-   "sha1_base64": "bBS2Zgi0lEwH5KfJmzWdPM4QnGA="
+   "s": 161452741,
+   "sha1_base64": "Y3MyfJTfRltYR2aWJFPVnoUMFa8="
   },
   {
    "id": "Chad",
@@ -2701,8 +2701,8 @@
     "Tibesti Region",
     "Wadi Fira Region"
    ],
-   "s": 142286655,
-   "sha1_base64": "zQCQ1+AtJGCalRs780oLkjnSndk="
+   "s": 143119401,
+   "sha1_base64": "19bxV+5qe95vOeQnjWowHebumcw="
   },
   {
    "id": "Colombia",
@@ -2727,8 +2727,8 @@
       "Santander",
       "Sucre"
      ],
-     "s": 145085638,
-     "sha1_base64": "TYlVXMG9vU64LY5wo2O0UeVbjUg="
+     "s": 146633657,
+     "sha1_base64": "00I3Gh6jwbNS+V0naHeySleaPKM="
     },
     {
      "id": "Colombia_West",
@@ -2751,8 +2751,8 @@
       "Tolima",
       "Valle del Cauca"
      ],
-     "s": 152185073,
-     "sha1_base64": "nV88bdnNLNgTQIktuY1zd+jOafo="
+     "s": 154826764,
+     "sha1_base64": "ftuUN7xvCgSx245+zIeGMtMZd6A="
     },
     {
      "id": "Colombia_East",
@@ -2772,8 +2772,8 @@
       "Vaupés",
       "Vichada"
      ],
-     "s": 77944719,
-     "sha1_base64": "0ldM+1XCD0dclMoVmu/xCvUODeU="
+     "s": 78055714,
+     "sha1_base64": "FNSZZicGGgE/Khr6InJRn0sSAew="
     }
    ]
   },
@@ -2788,8 +2788,8 @@
     "Mwali",
     "Nzwani / أنجوان"
    ],
-   "s": 5425681,
-   "sha1_base64": "o0AE18m7L3hFNysNY2NSA/yaa5Y="
+   "s": 5427603,
+   "sha1_base64": "u+kTSwABDIgWK2ML5sBh+RyeZwc="
   },
   {
    "id": "Congo-Brazzaville",
@@ -2814,8 +2814,8 @@
    "country_name_synonyms": [
     "Republic of the Congo"
    ],
-   "s": 43605644,
-   "sha1_base64": "87/131/YW0vyU0lfX094xSIs9Lc="
+   "s": 43864374,
+   "sha1_base64": "MiMC0eMMw26ARkXSgN66axoIi8o="
   },
   {
    "id": "Congo-Kinshasa",
@@ -2855,8 +2855,8 @@
       "Tshuapa",
       "Équateur"
      ],
-     "s": 335647058,
-     "sha1_base64": "d9OZJwzsHJoPWsvuyuo+MpmmxZU="
+     "s": 336103558,
+     "sha1_base64": "/UObbk7RIsA1VPTZayok0FzPCrQ="
     },
     {
      "id": "Congo-Kinshasa_Kivu",
@@ -2868,8 +2868,8 @@
       "Nord-Kivu",
       "Sud-Kivu"
      ],
-     "s": 170997574,
-     "sha1_base64": "aK+cMkfPXMGNCg4neLaA0qXfXRA="
+     "s": 170990206,
+     "sha1_base64": "hFVrqNsMWTpbPQlNS2rNRrGcpA8="
     }
    ]
   },
@@ -2881,8 +2881,8 @@
    "affiliations": [
     "Cook Islands"
    ],
-   "s": 1505683,
-   "sha1_base64": "HPWI3VcbxoPaGeWAQwGDm/IAJhA="
+   "s": 1478123,
+   "sha1_base64": "1ecid20+0v6jM1zm3HForBgmLDI="
   },
   {
    "id": "Costa Rica",
@@ -2901,8 +2901,8 @@
     "Puntarenas",
     "San José"
    ],
-   "s": 47265886,
-   "sha1_base64": "nBDvIB+D6h164qj5/7UW6ml6qS0="
+   "s": 47676401,
+   "sha1_base64": "7QTWIUp3p0fB/Z0byKz/4BCQVIY="
   },
   {
    "id": "Croatia",
@@ -2915,8 +2915,8 @@
      "affiliations": [
       "Hrvatska"
      ],
-     "s": 92299301,
-     "sha1_base64": "SojURDwhegXWqAHNS1aZ+/YDTj4="
+     "s": 92937136,
+     "sha1_base64": "FkfTP+nMNHZj4mEL93BRlyzBteo="
     },
     {
      "id": "Croatia_West",
@@ -2927,8 +2927,8 @@
       "Hrvatska",
       "Italia"
      ],
-     "s": 91722702,
-     "sha1_base64": "6duSTOX/g3ZT/Tvj6XUzmbQUWbw="
+     "s": 92132217,
+     "sha1_base64": "HOVvGa07mk2XC6omS2THgvhnx8M="
     }
    ]
   },
@@ -2954,8 +2954,8 @@
     "Santiago de Cuba",
     "Villa Clara"
    ],
-   "s": 73794489,
-   "sha1_base64": "CmPvVpJqAje3NtIzQWEqNX9EJPs="
+   "s": 74193868,
+   "sha1_base64": "6AiyKv/tpDooAtI2l75FZopWWhM="
   },
   {
    "id": "Cyprus",
@@ -2966,8 +2966,8 @@
     "British Sovereign Base Areas",
     "Κύπρος - Kıbrıs"
    ],
-   "s": 45522455,
-   "sha1_base64": "plqHsveNwYgqoPCgR7wmBEzxu94="
+   "s": 45823378,
+   "sha1_base64": "qoE+trAoG/tWREc9bpFQKi5Mn2Y="
   },
   {
    "id": "Czech Republic",
@@ -2984,8 +2984,8 @@
       "Praha",
       "Česko"
      ],
-     "s": 35873046,
-     "sha1_base64": "uOXjdaW0HogYlyxhCRxqbTbzw3Y="
+     "s": 36369457,
+     "sha1_base64": "taEDvn3nPlAMY5uXqvODuxrrjOc="
     },
     {
      "id": "Czech_Severovychod_Pardubicky kraj",
@@ -2996,8 +2996,8 @@
       "Severovýchod",
       "Česko"
      ],
-     "s": 47219274,
-     "sha1_base64": "gMy7rJcvaj/H7fQfLOSC1njhmro="
+     "s": 47531037,
+     "sha1_base64": "a0FzHZngqJpisB9KePEBscV7c+c="
     },
     {
      "id": "Czech_Karlovasky kraj",
@@ -3008,8 +3008,8 @@
       "Severozápad",
       "Česko"
      ],
-     "s": 26396299,
-     "sha1_base64": "rMHjDe+B8FdSatn/GRrfuF7/EoE="
+     "s": 26351198,
+     "sha1_base64": "WB9jWSDRaRtkgAD/x9HZkTsCWhs="
     },
     {
      "id": "Czech_Ustecky kraj",
@@ -3020,8 +3020,8 @@
       "Severozápad",
       "Česko"
      ],
-     "s": 59483355,
-     "sha1_base64": "K59Ush3l6DOHDxFGCNofWKOEAic="
+     "s": 59741366,
+     "sha1_base64": "8xPBvBRKo02is3ZoB1LGOyyt+/c="
     },
     {
      "id": "Czech_Jihozapad_Plzensky kraj",
@@ -3032,8 +3032,8 @@
       "Jihozápad",
       "Česko"
      ],
-     "s": 62187746,
-     "sha1_base64": "dGzYo0/bUyRWIsMJXkgReWnwVKw="
+     "s": 62380405,
+     "sha1_base64": "P3SxBvxeSV32QIEboapKDrdi+Zs="
     },
     {
      "id": "Czech_Severovychod_Kralovehradecky kraj",
@@ -3044,8 +3044,8 @@
       "Severovýchod",
       "Česko"
      ],
-     "s": 50045465,
-     "sha1_base64": "iMfRHF27zsbNWqO/4Pryxzuc8vs="
+     "s": 50283532,
+     "sha1_base64": "2PEePjyos/00BLX44B6+qYGhYDk="
     },
     {
      "id": "Czech_Olomoucky kraj",
@@ -3056,8 +3056,8 @@
       "Střední Morava",
       "Česko"
      ],
-     "s": 54263097,
-     "sha1_base64": "RJy23EcN/rdRprUajAY2vQ1zGpg="
+     "s": 54651412,
+     "sha1_base64": "PJYVRINu43oCyU9KSOPE8gsVYxk="
     },
     {
      "id": "Czech_Zlinsky Kraj",
@@ -3068,8 +3068,8 @@
       "Střední Morava",
       "Česko"
      ],
-     "s": 45947983,
-     "sha1_base64": "rHD+2s6m4f/4ZR7thks7eOctBmA="
+     "s": 46283330,
+     "sha1_base64": "uxASTfv6XkTnRQ0Ds0d11IWOJYU="
     },
     {
      "id": "Czech_Stredni Cechy_East",
@@ -3080,8 +3080,8 @@
       "Střední Čechy",
       "Česko"
      ],
-     "s": 65496692,
-     "sha1_base64": "MqMDk02kNrhK/JYJhRD+muTPKMY="
+     "s": 65743983,
+     "sha1_base64": "mWtO2AOkmWsNl05XJ1s/ZNbocQs="
     },
     {
      "id": "Czech_Jihozapad_Jihocesky kraj",
@@ -3092,8 +3092,8 @@
       "Jihozápad",
       "Česko"
      ],
-     "s": 81978429,
-     "sha1_base64": "MkKeLsffjq2ne6zHmCB4kfPHJ8E="
+     "s": 82448784,
+     "sha1_base64": "EP8NZWP3a3PbBgSPDVvceB4dN8A="
     },
     {
      "id": "Czech_Jihovychod_Kraj Vysocina",
@@ -3104,8 +3104,8 @@
       "Jihovýchod",
       "Česko"
      ],
-     "s": 62787386,
-     "sha1_base64": "uDuivc+JhxRVgJuXlqGFUTlJBlc="
+     "s": 63027757,
+     "sha1_base64": "UiJNZtF0oXh5jXSdLzi8FWNEBIg="
     },
     {
      "id": "Czech_Severovychod_Liberecky kraj",
@@ -3116,8 +3116,8 @@
       "Severovýchod",
       "Česko"
      ],
-     "s": 39744871,
-     "sha1_base64": "+iVJi/7j8f2x268+k0SIoVb3qhQ="
+     "s": 39892962,
+     "sha1_base64": "bsnx9cNZamXmC+zdRodrQqVhJrI="
     },
     {
      "id": "Czech_Stredni Cechy_West",
@@ -3128,8 +3128,8 @@
       "Střední Čechy",
       "Česko"
      ],
-     "s": 60544251,
-     "sha1_base64": "We6tIaILeLhtkf2AjN6L2bAmYi0="
+     "s": 60816670,
+     "sha1_base64": "I1QiZ6M9sVbxfX41j8IF+5dwY3U="
     },
     {
      "id": "Czech_Moravskoslezsko",
@@ -3140,8 +3140,8 @@
       "Moravskoslezsko",
       "Česko"
      ],
-     "s": 67839324,
-     "sha1_base64": "0vDcruzD9n4Gt3CSgJku7mWdjPk="
+     "s": 68230231,
+     "sha1_base64": "ezxsXfcebojgdSjHjeRSL5A5tC8="
     },
     {
      "id": "Czech_Jihovychod_Jihomoravsky kraj",
@@ -3152,8 +3152,8 @@
       "Jihovýchod",
       "Česko"
      ],
-     "s": 88610421,
-     "sha1_base64": "l5djPYE3OMgNmWiOl0nk3IYKt74="
+     "s": 89085872,
+     "sha1_base64": "7d4+IpE0ltEGiMGpBYt5wyK0YSU="
     }
    ]
   },
@@ -3183,8 +3183,8 @@
     "Côte d'Ivoire",
     "Ivory Coast"
    ],
-   "s": 82993748,
-   "sha1_base64": "QUGeYnQp8AgHljfsaxBHDiYGpLw="
+   "s": 83274719,
+   "sha1_base64": "lxirNPOkiWQAERRdMIGe1OqFzAY="
   },
   {
    "id": "Denmark",
@@ -3198,8 +3198,8 @@
       "Danmark",
       "Region Nordjylland"
      ],
-     "s": 55392447,
-     "sha1_base64": "jW258RA5dPzFylGzltPm785TuSo="
+     "s": 55609714,
+     "sha1_base64": "xiug5wcwXnbeD0vBluUhH3xnPKo="
     },
     {
      "id": "Denmark_Central Denmark Region",
@@ -3210,8 +3210,8 @@
       "Danmark",
       "Region Midtjylland"
      ],
-     "s": 107504515,
-     "sha1_base64": "NPbOONDpyk0WHvSdubWXle0NH6A="
+     "s": 108091510,
+     "sha1_base64": "MCLNkTpTb+UHIfscoU5sIDrlY0A="
     },
     {
      "id": "Denmark_Capital Region of Denmark",
@@ -3223,8 +3223,8 @@
       "Region Hovedstaden",
       "Territorial waters of Bornholm"
      ],
-     "s": 70981894,
-     "sha1_base64": "AxlhDNcOgOTtSMNq9OYXAEFu3wE="
+     "s": 71684033,
+     "sha1_base64": "g2WO1n8ZmPYH6UuUVsa6iXY4anA="
     },
     {
      "id": "Denmark_Region Zealand",
@@ -3235,8 +3235,8 @@
       "Danmark",
       "Region Sjælland"
      ],
-     "s": 72341650,
-     "sha1_base64": "eelFmVq4Bei+9iT6pDHRT6fZD00="
+     "s": 72678373,
+     "sha1_base64": "t2LB4eHhGw0R8hfePSp9K0mBzMo="
     },
     {
      "id": "Denmark_Region of Southern Denmark",
@@ -3247,8 +3247,8 @@
       "Danmark",
       "Region Syddanmark"
      ],
-     "s": 103200434,
-     "sha1_base64": "CgsqJ7OQ9JU2gjktHVaPABqNq8M="
+     "s": 103702837,
+     "sha1_base64": "jUFKcKPDk5hMsrTDCjchiHf0nek="
     }
    ]
   },
@@ -3266,8 +3266,8 @@
     "Obock",
     "Tadjourah"
    ],
-   "s": 12490813,
-   "sha1_base64": "x51XnGeyP43lcgOPrU1Rh6qAGX0="
+   "s": 12501295,
+   "sha1_base64": "fFOZ/VZclFFRnrJtgfXTrEnm/eE="
   },
   {
    "id": "Dominican Republic",
@@ -3309,8 +3309,8 @@
     "Sánchez Ramírez",
     "Valverde"
    ],
-   "s": 37741634,
-   "sha1_base64": "JjQQzfgJDDV90SyE8ngAQSWvw08="
+   "s": 37992309,
+   "sha1_base64": "0z07E04iA4IreXcZbURO/yXJKiM="
   },
   {
    "id": "East Timor",
@@ -3336,8 +3336,8 @@
     "Timór Loro Sa'e",
     "Viqueque"
    ],
-   "s": 21239223,
-   "sha1_base64": "qFSM6u7eQL69cW3q78pt1NoVa0Q="
+   "s": 21254321,
+   "sha1_base64": "kWTwy6yZeIUsdXgk576XDS4qLdw="
   },
   {
    "id": "Chile",
@@ -3347,8 +3347,8 @@
      "affiliations": [
       "Acuerdo de Campos de Hielo"
      ],
-     "s": 6790672,
-     "sha1_base64": "C7ssCuF4P9sYNW5OcwZpcGkrp/A="
+     "s": 6790800,
+     "sha1_base64": "T0rSkhtGorokscCJxFfeDvSjBjI="
     },
     {
      "id": "Chile_Central",
@@ -3365,8 +3365,8 @@
       "VI Región del Libertador General Bernardo O'Higgins",
       "VII Región del Maule"
      ],
-     "s": 114944373,
-     "sha1_base64": "oxpQRntsQAtgdpLmWdv6o+C0Wh4="
+     "s": 118109553,
+     "sha1_base64": "Wa2fXDpXTUJgwfAwIu14tGPoD+8="
     },
     {
      "id": "Chile_North",
@@ -3382,8 +3382,8 @@
       "V Región de Valparaíso",
       "XV Región de Arica y Parinacota"
      ],
-     "s": 82820908,
-     "sha1_base64": "5R3BY6DZzZQJwQ6yn8XsUdnxpmM="
+     "s": 83193799,
+     "sha1_base64": "I5KZxLLG/EK3CkFn+7v5UHPoKmk="
     },
     {
      "id": "Chile_South",
@@ -3399,8 +3399,8 @@
       "XII Región de Magallanes y de la Antártica Chilena",
       "XIV Región de Los Ríos"
      ],
-     "s": 229253400,
-     "sha1_base64": "FyRGjqmWtyK3odUj0CHgrRjtiSA="
+     "s": 230333355,
+     "sha1_base64": "R6MaF9UwRA0NLGyIBY/KSDS9YKM="
     }
    ]
   },
@@ -3430,8 +3430,8 @@
       "Tungurahua",
       "Zamora Chinchipe"
      ],
-     "s": 77935315,
-     "sha1_base64": "aOQVbaKJmNXHDbmPZLS43eJgHFY="
+     "s": 78983966,
+     "sha1_base64": "xYaaA+Cw/XEtypcoQn5kLPY8no4="
     },
     {
      "id": "Ecuador_West",
@@ -3458,8 +3458,8 @@
       "Santa Elena",
       "Santo Domingo de los Tsáchilas"
      ],
-     "s": 64366187,
-     "sha1_base64": "PsT/zGK+ToF9xJaSJhHiEZR5fxU="
+     "s": 64931934,
+     "sha1_base64": "ak+sUVHRfR6bW+upn12UUCR84E4="
     }
    ]
   },
@@ -3497,8 +3497,8 @@
     "‏البحيرة‎",
     "الإسكندرية"
    ],
-   "s": 298362693,
-   "sha1_base64": "r7+gdfBtx0YOmxTwsQSPUxHtTY0="
+   "s": 300141697,
+   "sha1_base64": "uRbB8RYT0N/zG+Q+Xq4yF3wj6Ws="
   },
   {
    "id": "El Salvador",
@@ -3522,8 +3522,8 @@
     "Departemento de Chalatenango",
     "El Salvador"
    ],
-   "s": 40132824,
-   "sha1_base64": "yzBkBM1cQhOOjGjHowY/ybJiDRI="
+   "s": 40351099,
+   "sha1_base64": "POx47Tkx7U4G8veougpKrPkVfxM="
   },
   {
    "id": "Equatorial Guinea",
@@ -3540,8 +3540,8 @@
     "Litoral",
     "Wele-Nzas"
    ],
-   "s": 15141696,
-   "sha1_base64": "DeginJwrCkkzPiDcvgMkAaxYngg="
+   "s": 15159370,
+   "sha1_base64": "VKjBnhNo/LF/getGtaLA7qnAAr8="
   },
   {
    "id": "Eritrea",
@@ -3557,8 +3557,8 @@
     "ዞባ ዓንሰባ",
     "ጋሽ-ባርካ"
    ],
-   "s": 31192866,
-   "sha1_base64": "4aPJJN5eC+Y0qMBVirRFJsrLnEg="
+   "s": 31267180,
+   "sha1_base64": "DuzmwiJMuhbmYWrYKp9qnxOayLc="
   },
   {
    "id": "Estonia",
@@ -3571,8 +3571,8 @@
      "affiliations": [
       "Eesti"
      ],
-     "s": 57114755,
-     "sha1_base64": "SU0hmh8bXxOEseVLHuaaSmUSGCk="
+     "s": 57553550,
+     "sha1_base64": "gvYRtzNxtyDwTOtjR8ZihVnADK8="
     },
     {
      "id": "Estonia_East",
@@ -3582,8 +3582,8 @@
      "affiliations": [
       "Eesti"
      ],
-     "s": 64120292,
-     "sha1_base64": "TormkMTZl5SQ1QvKPXRNQmEPKrs="
+     "s": 64420911,
+     "sha1_base64": "b7j8RT3nj+sXwm2b0mvTlwYy+uE="
     }
    ]
   },
@@ -3608,8 +3608,8 @@
     "Tigray",
     "ኢትዮጵያ Ethiopia"
    ],
-   "s": 172362193,
-   "sha1_base64": "tkG+oQtuMuIKi43gfK+Y5LSOEAY="
+   "s": 172639492,
+   "sha1_base64": "nZX9kpjBLWaMiL8ZAOGAkCToVMM="
   },
   {
    "id": "Faroe Islands",
@@ -3626,8 +3626,8 @@
     "Territorial waters of Faroe Islands",
     "Vága sýsla"
    ],
-   "s": 11642821,
-   "sha1_base64": "HA3GnX6bRM6ibkE/kbLEHWwacG4="
+   "s": 11663495,
+   "sha1_base64": "JDOifIFXy2qhxCOgw+mIUeWpMOc="
   },
   {
    "id": "Federated States of Micronesia",
@@ -3642,8 +3642,8 @@
     "Pohnpei",
     "Yap"
    ],
-   "s": 2902466,
-   "sha1_base64": "SkMZVlUZgF4rSp33SUjt70RnRv8="
+   "s": 2902530,
+   "sha1_base64": "8yDdk85vN6+K4u7x+c7dxVLSNr8="
   },
   {
    "id": "Fiji",
@@ -3656,8 +3656,8 @@
     "Northern",
     "Viti"
    ],
-   "s": 19810822,
-   "sha1_base64": "O9eXFAcq6S3A8jSjdSdRZT8FIe8="
+   "s": 19825656,
+   "sha1_base64": "DJ0ccM97m0miFa8rLH3WliPdqQE="
   },
   {
    "id": "Finland",
@@ -3671,8 +3671,8 @@
       "Länsi-Suomi",
       "Suomi"
      ],
-     "s": 45257048,
-     "sha1_base64": "c+ix+5dZt+F2+lBmMsuL8gpTxqo="
+     "s": 45455331,
+     "sha1_base64": "vgi0uA1GH2eZKp0qdF1PxObsSEw="
     },
     {
      "id": "Finland_Western Finland_Tampere",
@@ -3683,8 +3683,8 @@
       "Länsi-Suomi",
       "Suomi"
      ],
-     "s": 94955019,
-     "sha1_base64": "G1+5G3QwFdTbjYLcXPljSmSDCBg="
+     "s": 95536342,
+     "sha1_base64": "7GWpaeSgu430r47LWv3xJAOjbiE="
     },
     {
      "id": "Finland_Northern Finland",
@@ -3695,8 +3695,8 @@
       "Pohjois-Suomi",
       "Suomi"
      ],
-     "s": 120775222,
-     "sha1_base64": "22J1tKfG9g1+1WaLdCSkQCEt7Wk="
+     "s": 121197985,
+     "sha1_base64": "7G3QzxXHr6+9fs6N6b3JAiC4gNg="
     },
     {
      "id": "Finland_Eastern Finland_North",
@@ -3707,8 +3707,8 @@
       "Itä-Suomi",
       "Suomi"
      ],
-     "s": 124523009,
-     "sha1_base64": "pkc0IZ3gsMjUWI4yU4sIcP1e5s0="
+     "s": 124721861,
+     "sha1_base64": "F2D5rsaG3mKk4+FNs09kbcEFIEc="
     },
     {
      "id": "Finland_Eastern Finland_South",
@@ -3719,8 +3719,8 @@
       "Itä-Suomi",
       "Suomi"
      ],
-     "s": 72903235,
-     "sha1_base64": "hX1D/X5XzXdq7hMFS+5quu8XujQ="
+     "s": 73250646,
+     "sha1_base64": "i6jlc/ykwtiTHL+QxC5CU8qEcPg="
     },
     {
      "id": "Finland_Southern Finland_West",
@@ -3732,8 +3732,8 @@
       "Suomi",
       "Åland"
      ],
-     "s": 96618451,
-     "sha1_base64": "g8avbSNDPs15wVN6vaHG9XccIxQ="
+     "s": 97483510,
+     "sha1_base64": "TEg0Qqz2oKRss+msY2dQPSMxVdw="
     },
     {
      "id": "Finland_Southern Finland_Helsinki",
@@ -3744,8 +3744,8 @@
       "Etelä-Suomi",
       "Suomi"
      ],
-     "s": 121076198,
-     "sha1_base64": "rbZSZfo1v92OvY5g/TxzPV0RBlI="
+     "s": 121901361,
+     "sha1_base64": "H5l3sbTH9W0Pb3CQ72am1IJhVic="
     },
     {
      "id": "Finland_Southern Finland_Lappeenranta",
@@ -3756,8 +3756,8 @@
       "Etelä-Suomi",
       "Suomi"
      ],
-     "s": 55740178,
-     "sha1_base64": "zcLebGpVv8fknRSSW708vsYVgeo="
+     "s": 55883669,
+     "sha1_base64": "H2CnjKSBNyawVc87Q5Djfx1sY4Q="
     }
    ]
   },
@@ -3776,8 +3776,8 @@
         "Alsace-Champagne-Ardenne-Lorraine",
         "France"
        ],
-       "s": 68142300,
-       "sha1_base64": "iqZWjYDCmm/mA2hWTvFVGJ2JeoM="
+       "s": 68488455,
+       "sha1_base64": "g+LsIbMaJ4UmjObxhwhJCGnyu9g="
       },
       {
        "id": "France_Alsace_Haut-Rhin",
@@ -3788,8 +3788,8 @@
         "Alsace-Champagne-Ardenne-Lorraine",
         "France"
        ],
-       "s": 49668154,
-       "sha1_base64": "IBzy1Br33zXaYPUixgWYXMwFkHk="
+       "s": 49929445,
+       "sha1_base64": "fnM7qFjgtxWK6rHYgjKUu9Bf9f8="
       }
      ]
     },
@@ -3805,8 +3805,8 @@
         "Aquitaine-Limousin-Poitou-Charentes",
         "France"
        ],
-       "s": 55412297,
-       "sha1_base64": "TGxcoiuMfM/KP08BaZSXLRtfsSI="
+       "s": 55643260,
+       "sha1_base64": "w04/6rIwhj8iqrG7rZyWy60E1QA="
       },
       {
        "id": "France_Aquitaine_Gironde",
@@ -3817,8 +3817,8 @@
         "Aquitaine-Limousin-Poitou-Charentes",
         "France"
        ],
-       "s": 82761987,
-       "sha1_base64": "DGJ9ronlxd+gmDObgWpyWpxZ9f8="
+       "s": 83677726,
+       "sha1_base64": "qQqB31S+5MDXC6LWEiKwgGTTa/U="
       },
       {
        "id": "France_Aquitaine_Landes",
@@ -3829,8 +3829,8 @@
         "Aquitaine-Limousin-Poitou-Charentes",
         "France"
        ],
-       "s": 42689232,
-       "sha1_base64": "LDLoupHe/iDhSD6LDqSwdwDfGHI="
+       "s": 42945755,
+       "sha1_base64": "jb9XZ59tSO8a9jLE1XkcU6JiNAs="
       },
       {
        "id": "France_Aquitaine_Lot-et-Garonne",
@@ -3841,8 +3841,8 @@
         "Aquitaine-Limousin-Poitou-Charentes",
         "France"
        ],
-       "s": 38864807,
-       "sha1_base64": "VUUf+no+2bpHKaph45kUktOf5rs="
+       "s": 39080994,
+       "sha1_base64": "N7FFkOB12qP+MZ5nLsiL9EULrTo="
       },
       {
        "id": "France_Aquitaine_Pyrenees-Atlantiques",
@@ -3853,8 +3853,8 @@
         "Aquitaine-Limousin-Poitou-Charentes",
         "France"
        ],
-       "s": 69572914,
-       "sha1_base64": "slghuD/e5/RgtURxyXWhzGB29NU="
+       "s": 69976557,
+       "sha1_base64": "BULAefJweEL3TthNSyjGUDFOFG8="
       }
      ]
     },
@@ -3870,8 +3870,8 @@
         "Auvergne-Rhône-Alpes",
         "France"
        ],
-       "s": 41111152,
-       "sha1_base64": "omFoPARtqkpxWeKw0/OC32KsVvI="
+       "s": 41300099,
+       "sha1_base64": "72w5jAvorH3PZ4DE8J7dIJWa9Co="
       },
       {
        "id": "France_Auvergne_Cantal",
@@ -3882,8 +3882,8 @@
         "Auvergne-Rhône-Alpes",
         "France"
        ],
-       "s": 26884684,
-       "sha1_base64": "oU77nsW3snVIxC4/zkhnjLkp/MM="
+       "s": 26980511,
+       "sha1_base64": "bP6kXXtyvXxdKhXMtS3bynluhT4="
       },
       {
        "id": "France_Auvergne_Haute-Loire",
@@ -3894,8 +3894,8 @@
         "Auvergne-Rhône-Alpes",
         "France"
        ],
-       "s": 39348437,
-       "sha1_base64": "Uvu6zqOcvEZx2qHJwWQ+Er+MvLQ="
+       "s": 39762400,
+       "sha1_base64": "8sd359cLtyovcnDJN8VZoAfi5cw="
       },
       {
        "id": "France_Auvergne_Puy-de-Dome",
@@ -3906,8 +3906,8 @@
         "Auvergne-Rhône-Alpes",
         "France"
        ],
-       "s": 60947011,
-       "sha1_base64": "HQUMVxDEULBZlRWrA3DXFlK0CoA="
+       "s": 61307678,
+       "sha1_base64": "WJVC0i3NlKrZ95Ed7Wwu+uPxc8I="
       }
      ]
     },
@@ -3925,8 +3925,8 @@
         "Guernsey",
         "Jersey"
        ],
-       "s": 56899674,
-       "sha1_base64": "/5kLMXP99V+BI4jp0K1EwzbKUeM="
+       "s": 57076941,
+       "sha1_base64": "aI2h825dQ7Cf3yr82Ud/8HLmVPc="
       },
       {
        "id": "France_Brittany_Finistere",
@@ -3937,8 +3937,8 @@
         "Bretagne",
         "France"
        ],
-       "s": 78638506,
-       "sha1_base64": "zsAlQQm4mXXe/q7KF6ZMK5TmZQM="
+       "s": 79226742,
+       "sha1_base64": "Jzmqt/xzfidkhMfXkQgdMcENHLw="
       },
       {
        "id": "France_Brittany_Ille-et-Vilaine",
@@ -3950,8 +3950,8 @@
         "France",
         "Jersey"
        ],
-       "s": 70221938,
-       "sha1_base64": "bsf4EVu2LOXwLJvo6wx6/enlLAU="
+       "s": 70716606,
+       "sha1_base64": "sX22+QU6WsDekvOjax/n/XyI9dc="
       },
       {
        "id": "France_Brittany_Morbihan",
@@ -3962,8 +3962,8 @@
         "Bretagne",
         "France"
        ],
-       "s": 60714195,
-       "sha1_base64": "KARQRlvIolSeGEVGXGrMNUNcTCw="
+       "s": 61049374,
+       "sha1_base64": "S8QZXllqyJHxuHcT2IAClpuVvPs="
       }
      ]
     },
@@ -3979,8 +3979,8 @@
         "Bourgogne-Franche-Comté",
         "France"
        ],
-       "s": 47747594,
-       "sha1_base64": "smlYkeCACbiAe3Vm3/ckZPZtLAI="
+       "s": 47963685,
+       "sha1_base64": "YW8VNpbW/IabJHwLCXZ9QDGj2eA="
       },
       {
        "id": "France_Burgundy_Nievre",
@@ -3991,8 +3991,8 @@
         "Bourgogne-Franche-Comté",
         "France"
        ],
-       "s": 30128167,
-       "sha1_base64": "MnA+dyeZlnUNrEzBaaO7Ybj93B8="
+       "s": 30294594,
+       "sha1_base64": "927ncIIhbfT0NHC8LHxdm8KuV1A="
       },
       {
        "id": "France_Burgundy_Saone-et-Loire",
@@ -4003,8 +4003,8 @@
         "Bourgogne-Franche-Comté",
         "France"
        ],
-       "s": 100849668,
-       "sha1_base64": "nrkmx2NFkThc/d60DFjDWEHB7Hg="
+       "s": 101225255,
+       "sha1_base64": "+o5fJkh2NoFrCqkcw83wbqpvNqM="
       },
       {
        "id": "France_Burgundy_Yonne",
@@ -4015,8 +4015,8 @@
         "Bourgogne-Franche-Comté",
         "France"
        ],
-       "s": 48002106,
-       "sha1_base64": "PpLLLki9/F23Fe1xCbB8GvZmmSU="
+       "s": 48668549,
+       "sha1_base64": "aZiWz0wBnknLzlwr/OPDvmGKTMY="
       }
      ]
     },
@@ -4032,8 +4032,8 @@
         "Centre-Val de Loire",
         "France"
        ],
-       "s": 29022821,
-       "sha1_base64": "b7n9yZosPe1IPZ0UFMiv0TIIYzg="
+       "s": 29120592,
+       "sha1_base64": "Jv56pKoKEab4Q4CEOTaZ6KzvePQ="
       },
       {
        "id": "France_Centre-Val de Loire_Eure-et-Loir",
@@ -4044,8 +4044,8 @@
         "Centre-Val de Loire",
         "France"
        ],
-       "s": 31137373,
-       "sha1_base64": "N8QAQvsvhy75G1khm90uN4M9z0s="
+       "s": 31372432,
+       "sha1_base64": "qBmCH9DjUpxOVHicksz7iThhxTo="
       },
       {
        "id": "France_Centre-Val de Loire_Indre",
@@ -4056,8 +4056,8 @@
         "Centre-Val de Loire",
         "France"
        ],
-       "s": 45284615,
-       "sha1_base64": "IZ0uS3entIaO7LtWJ2aFa4pqcfI="
+       "s": 45565226,
+       "sha1_base64": "VsL/epRY6rlA82wSL3h0UGFrhoE="
       },
       {
        "id": "France_Centre-Val de Loire_Indre-et-Loire",
@@ -4068,8 +4068,8 @@
         "Centre-Val de Loire",
         "France"
        ],
-       "s": 62534371,
-       "sha1_base64": "sgua7YS7A9nLTjeuKcQCnhqesWQ="
+       "s": 63083534,
+       "sha1_base64": "jz0MYx/YBm8ehL2R/orhEsavPas="
       },
       {
        "id": "France_Centre-Val de Loire_Loir-et-Cher",
@@ -4080,8 +4080,8 @@
         "Centre-Val de Loire",
         "France"
        ],
-       "s": 42124767,
-       "sha1_base64": "7J55RL9tSZFlh4c946HejDVCZ+0="
+       "s": 42373186,
+       "sha1_base64": "ZIUyBHYivPX0Uf51HUnCqgU5dsM="
       },
       {
        "id": "France_Centre-Val de Loire_Loiret",
@@ -4092,8 +4092,8 @@
         "Centre-Val de Loire",
         "France"
        ],
-       "s": 58288672,
-       "sha1_base64": "3AKlYp8DvLKPj+KuzKpoLh/xwNQ="
+       "s": 58725691,
+       "sha1_base64": "fxcBr+hjaaVsOUuif3QHqFB9RHY="
       }
      ]
     },
@@ -4106,8 +4106,8 @@
       "Alsace-Champagne-Ardenne-Lorraine",
       "France"
      ],
-     "s": 124168893,
-     "sha1_base64": "rHecdprcnNlzoQz3D7oje6xrx+8="
+     "s": 125174600,
+     "sha1_base64": "YKM2UW3J3ThWLKWlmYuK95kvTFU="
     },
     {
      "id": "France_Corsica",
@@ -4121,8 +4121,8 @@
       "Italia",
       "Monaco"
      ],
-     "s": 34629054,
-     "sha1_base64": "VkXRBQ/WVP8Vv/74myNKKiCdMf0="
+     "s": 34960329,
+     "sha1_base64": "tqurwURHOAXQ+BTMyHOVMf3EaiU="
     },
     {
      "id": "France_Free County_North",
@@ -4133,8 +4133,8 @@
       "Bourgogne-Franche-Comté",
       "France"
      ],
-     "s": 68876587,
-     "sha1_base64": "s66JIggW9AMyhLujhlrFX1zUiAo="
+     "s": 69300006,
+     "sha1_base64": "HYKzfwMCRmSe1lfO2uSnBwHBqEg="
     },
     {
      "id": "France_Free County_South",
@@ -4145,8 +4145,8 @@
       "Bourgogne-Franche-Comté",
       "France"
      ],
-     "s": 57959915,
-     "sha1_base64": "0JFy78J7YRAaRA8UyS102xHkZuk="
+     "s": 58109286,
+     "sha1_base64": "3Fq7rVWJIFwgnYBBP5zoExRabbE="
     },
     {
      "id": "France_French Guiana",
@@ -4157,8 +4157,8 @@
       "France",
       "Guyane"
      ],
-     "s": 25341209,
-     "sha1_base64": "q4QTNhAvVUF8K2/0ukpOO/g7uhs="
+     "s": 25424500,
+     "sha1_base64": "mL4WMVera7rKkD3QsGZl7V//W0M="
     },
     {
      "id": "France_Ile-de-France",
@@ -4172,8 +4172,8 @@
         "France",
         "Île-de-France"
        ],
-       "s": 43923785,
-       "sha1_base64": "KoOXODYEkVEysgDk9tX994jvd+I="
+       "s": 44462076,
+       "sha1_base64": "rcnV1KwJZ+h6mmJ9rGvSeEz8ux0="
       },
       {
        "id": "France_Ile-de-France_Hauts-de-Seine",
@@ -4184,8 +4184,8 @@
         "France",
         "Île-de-France"
        ],
-       "s": 24683888,
-       "sha1_base64": "LOzLCz6rF23/i5U6H+W2rhUjBcM="
+       "s": 25141963,
+       "sha1_base64": "AQLRjznZjQO8Fy3wJJWgSNP+MPM="
       },
       {
        "id": "France_Ile-de-France_Paris",
@@ -4196,8 +4196,8 @@
         "France",
         "Île-de-France"
        ],
-       "s": 49561740,
-       "sha1_base64": "484veM5f/Zrm68EUzW5VxdbEL0U="
+       "s": 50210719,
+       "sha1_base64": "pp4Kvt70AgZX9la37TYIGmiTWRg="
       },
       {
        "id": "France_Ile-de-France_Seine-Saint-Denis",
@@ -4208,8 +4208,8 @@
         "France",
         "Île-de-France"
        ],
-       "s": 26143281,
-       "sha1_base64": "AWad4abyTJj9ln6lMbBi8tGOVdA="
+       "s": 26541820,
+       "sha1_base64": "ok4U6a3/iYDpMgoJDeiGc12GVLs="
       },
       {
        "id": "France_Ile-de-France_Seine-et-Marne",
@@ -4220,8 +4220,8 @@
         "France",
         "Île-de-France"
        ],
-       "s": 63170416,
-       "sha1_base64": "x2OwQkkM4V0MoPEQGCE/wAFXa54="
+       "s": 63747427,
+       "sha1_base64": "KQDKDr5tOA4tDu6XdHl3eaEKOAc="
       },
       {
        "id": "France_Ile-de-France_Val-dOise",
@@ -4232,8 +4232,8 @@
         "France",
         "Île-de-France"
        ],
-       "s": 33264231,
-       "sha1_base64": "MShToLz/8+hEPKdqgldqsCnrZVw="
+       "s": 33617498,
+       "sha1_base64": "3RuNsLPLWZz93t7lTAYhQjj6dBw="
       },
       {
        "id": "France_Ile-de-France_Val-de-Marne",
@@ -4244,8 +4244,8 @@
         "France",
         "Île-de-France"
        ],
-       "s": 26020954,
-       "sha1_base64": "rQA0/oeqzxNNnUQLQJ37TjjULNA="
+       "s": 26471717,
+       "sha1_base64": "3XKNSioWIvIsepuIme4Pki4W/r0="
       },
       {
        "id": "France_Ile-de-France_Yvelines",
@@ -4256,8 +4256,8 @@
         "France",
         "Île-de-France"
        ],
-       "s": 49409025,
-       "sha1_base64": "jmjfQMLdQ4XJ19NNnh/jT7I2cTI="
+       "s": 49937532,
+       "sha1_base64": "ZLbYWFaWyC9nhBqFqP2EPcO0sGo="
       }
      ]
     },
@@ -4273,8 +4273,8 @@
         "France",
         "Languedoc-Roussillon-Midi-Pyrénées"
        ],
-       "s": 49499193,
-       "sha1_base64": "KQMHbXBcCmgf3JQv3SWhkSEBt2Q="
+       "s": 49713868,
+       "sha1_base64": "GcScWIPGLpa9ouMv0OGmjcYIgCo="
       },
       {
        "id": "France_Languedoc-Roussillon_Gard",
@@ -4285,8 +4285,8 @@
         "France",
         "Languedoc-Roussillon-Midi-Pyrénées"
        ],
-       "s": 55162090,
-       "sha1_base64": "Zea1Ms+Tftg54uglAm0GaKkf2D0="
+       "s": 55458597,
+       "sha1_base64": "RaG2ZcL/gzs+2pGMuiBxJOe9lOg="
       },
       {
        "id": "France_Languedoc-Roussillon_Herault",
@@ -4297,8 +4297,8 @@
         "France",
         "Languedoc-Roussillon-Midi-Pyrénées"
        ],
-       "s": 79825643,
-       "sha1_base64": "uf5z6eCY3TVLQeghSCu+j9o0bBA="
+       "s": 80618206,
+       "sha1_base64": "YEk3lkdUoUp+c29qJzAJbLMsuRI="
       },
       {
        "id": "France_Languedoc-Roussillon_Lozere",
@@ -4309,8 +4309,8 @@
         "France",
         "Languedoc-Roussillon-Midi-Pyrénées"
        ],
-       "s": 24649708,
-       "sha1_base64": "dbTOr0J+sXIp3Yqh2mZdE6P331A="
+       "s": 24749543,
+       "sha1_base64": "3w9RWnjFhJh7fekRqqv8fkuUHMQ="
       },
       {
        "id": "France_Languedoc-Roussillon_Pyrenees-Orientales",
@@ -4321,8 +4321,8 @@
         "France",
         "Languedoc-Roussillon-Midi-Pyrénées"
        ],
-       "s": 44689056,
-       "sha1_base64": "eSjvBE22BhW8reI5q8SwSy+QHVM="
+       "s": 44903747,
+       "sha1_base64": "xfn33JTBle5e/EwBfaWwYFSFiR8="
       }
      ]
     },
@@ -4335,8 +4335,8 @@
       "Aquitaine-Limousin-Poitou-Charentes",
       "France"
      ],
-     "s": 106673046,
-     "sha1_base64": "OyeWAt0a+nWpDM6yqJL+kg5Io90="
+     "s": 106941081,
+     "sha1_base64": "CrIJZU7BECSEbR2cKV79Lyof8TI="
     },
     {
      "id": "France_Lorraine",
@@ -4350,8 +4350,8 @@
         "Alsace-Champagne-Ardenne-Lorraine",
         "France"
        ],
-       "s": 52648570,
-       "sha1_base64": "iWmmbbgC67rkOzIbmPt3aeYJuEo="
+       "s": 52894021,
+       "sha1_base64": "1WJR/GdiFaP2uwmkPvizuV8w/Bs="
       },
       {
        "id": "France_Lorraine_Meuse",
@@ -4362,8 +4362,8 @@
         "Alsace-Champagne-Ardenne-Lorraine",
         "France"
        ],
-       "s": 25704255,
-       "sha1_base64": "v86xQEDRy+olafeyH9hZvRkNSLA="
+       "s": 25770706,
+       "sha1_base64": "UePkVc5zI/xDauqlGp1iX9AlImk="
       },
       {
        "id": "France_Lorraine_Moselle",
@@ -4374,8 +4374,8 @@
         "Alsace-Champagne-Ardenne-Lorraine",
         "France"
        ],
-       "s": 67763347,
-       "sha1_base64": "AKPpgzYs5ga6EruuJEXkqUxPJgQ="
+       "s": 68115486,
+       "sha1_base64": "2+4pyDXvTcPQLt801HzIrjJEyZY="
       },
       {
        "id": "France_Lorraine_Vosges",
@@ -4386,8 +4386,8 @@
         "Alsace-Champagne-Ardenne-Lorraine",
         "France"
        ],
-       "s": 45839610,
-       "sha1_base64": "Q0jo6luZue9gh2qmmPW8/3esR3U="
+       "s": 45999669,
+       "sha1_base64": "lLW1rYhxET3kKVhsw0haOdaYc0w="
       }
      ]
     },
@@ -4403,8 +4403,8 @@
         "France",
         "Normandie"
        ],
-       "s": 59031283,
-       "sha1_base64": "GAAliBlaZPmm4NP5CrtqiLUrO10="
+       "s": 59668422,
+       "sha1_base64": "9xNseiclWqT5T5nAiE0f5apWmvI="
       },
       {
        "id": "France_Lower Normandy_Manche",
@@ -4416,8 +4416,8 @@
         "Jersey",
         "Normandie"
        ],
-       "s": 42113474,
-       "sha1_base64": "ZVtWQdhlFHbScMHlPBxVcCkAwQo="
+       "s": 42679869,
+       "sha1_base64": "dE5dCMDZm/Ut1FMb6ZuXGIXcCGA="
       },
       {
        "id": "France_Lower Normandy_Orne",
@@ -4428,8 +4428,8 @@
         "France",
         "Normandie"
        ],
-       "s": 32055966,
-       "sha1_base64": "t0PEDeEwUV5F6pYNW37RN+LANdg="
+       "s": 32143529,
+       "sha1_base64": "qDJqIMdWH1d06vRCbqnZqOPb11Q="
       }
      ]
     },
@@ -4445,8 +4445,8 @@
         "France",
         "Languedoc-Roussillon-Midi-Pyrénées"
        ],
-       "s": 31943126,
-       "sha1_base64": "3ZzrmOzlwt0Pea3KqSgHblo4Qik="
+       "s": 32045137,
+       "sha1_base64": "zY9ysj+SeVx42W5Z1gl7U//jWLQ="
       },
       {
        "id": "France_Midi-Pyrenees_Aveyron",
@@ -4457,8 +4457,8 @@
         "France",
         "Languedoc-Roussillon-Midi-Pyrénées"
        ],
-       "s": 58606298,
-       "sha1_base64": "9bdE+sNOLoD3V/jEysfKjcaMNa8="
+       "s": 59175325,
+       "sha1_base64": "jE7AjP8xlD0L9p9BMdhcctOvfXA="
       },
       {
        "id": "France_Midi-Pyrenees_Gers",
@@ -4469,8 +4469,8 @@
         "France",
         "Languedoc-Roussillon-Midi-Pyrénées"
        ],
-       "s": 43560569,
-       "sha1_base64": "6igL/QQw61jucxkVhjpjOxXcAwg="
+       "s": 43875188,
+       "sha1_base64": "ju9glR7pIjGBHVMjpQInlE0Iqpg="
       },
       {
        "id": "France_Midi-Pyrenees_Haute-Garonne",
@@ -4481,8 +4481,8 @@
         "France",
         "Languedoc-Roussillon-Midi-Pyrénées"
        ],
-       "s": 88892403,
-       "sha1_base64": "gDR/ymQRv7l8Lqr1woMxrS/kJ4Y="
+       "s": 89864718,
+       "sha1_base64": "2w3KOiPKMiLKUypKYfzQ6eNvFqE="
       },
       {
        "id": "France_Midi-Pyrenees_Hautes-Pyrenees",
@@ -4493,8 +4493,8 @@
         "France",
         "Languedoc-Roussillon-Midi-Pyrénées"
        ],
-       "s": 48675249,
-       "sha1_base64": "C5v2ZY/GU1AiRWCL54lN5oiuJ3A="
+       "s": 48836196,
+       "sha1_base64": "DK7HQg8igFGNoIs2K5JuotH1Zjk="
       },
       {
        "id": "France_Midi-Pyrenees_Lot",
@@ -4505,8 +4505,8 @@
         "France",
         "Languedoc-Roussillon-Midi-Pyrénées"
        ],
-       "s": 43406984,
-       "sha1_base64": "mneyIMyO8nuH4qRgJ368jNbLTUw="
+       "s": 43661627,
+       "sha1_base64": "7+oMYDpdFrllfY9xMcfVG+mjbWw="
       },
       {
        "id": "France_Midi-Pyrenees_Tarn",
@@ -4517,8 +4517,8 @@
         "France",
         "Languedoc-Roussillon-Midi-Pyrénées"
        ],
-       "s": 38889160,
-       "sha1_base64": "+y0NwMV1mzisu2i0cCgfRGHS7f0="
+       "s": 39247019,
+       "sha1_base64": "v2FwzdMm4/Q0C+3MtRpO07gSSoQ="
       },
       {
        "id": "France_Midi-Pyrenees_Tarn-et-Garonne",
@@ -4529,8 +4529,8 @@
         "France",
         "Languedoc-Roussillon-Midi-Pyrénées"
        ],
-       "s": 33974110,
-       "sha1_base64": "g10r8tGpGeT1h9I9jSR0ftO6gWs="
+       "s": 34205497,
+       "sha1_base64": "NYX0tv6iwy43pJpbJ9UU3tgYsE4="
       }
      ]
     },
@@ -4551,8 +4551,8 @@
       "France, Nouvelle-Calédonie, Île de Walpole (eaux territoriales)",
       "France, Nouvelle-Calédonie, Îles Loyauté (eaux territoriales)"
      ],
-     "s": 17014416,
-     "sha1_base64": "1gqEFFH5pSs62zbhNWtUK78dTX4="
+     "s": 17090291,
+     "sha1_base64": "3Nuqu+bnoWqCdziYYkEXlgR00zk="
     },
     {
      "id": "France_Nord-Pas-de-Calais",
@@ -4566,8 +4566,8 @@
         "France",
         "Nord-Pas-de-Calais-Picardie"
        ],
-       "s": 52247363,
-       "sha1_base64": "L1T6RVCCQzQCZmZt/nFEjncrWgo="
+       "s": 52618950,
+       "sha1_base64": "BlnQocLAG7MosuqYyOnMrDPzUyE="
       },
       {
        "id": "France_Nord-Pas-de-Calais_Lille",
@@ -4578,8 +4578,8 @@
         "France",
         "Nord-Pas-de-Calais-Picardie"
        ],
-       "s": 62116522,
-       "sha1_base64": "bVR8MK9KKHKPyS/XFGj/9hU5yf8="
+       "s": 62639557,
+       "sha1_base64": "3cpUOQLPHIaZKZBbUrBa8wJqgoA="
       },
       {
        "id": "France_Nord-Pas-de-Calais_Pas-de-Calais",
@@ -4592,8 +4592,8 @@
         "Nord-Pas-de-Calais-Picardie",
         "United Kingdom"
        ],
-       "s": 80463523,
-       "sha1_base64": "CsLaT/OVu2jDpgPqqqsrR5q4xgQ="
+       "s": 80837550,
+       "sha1_base64": "h2BHMqXSO3VD9bbp1GCvmzxN5wk="
       }
      ]
     },
@@ -4609,8 +4609,8 @@
         "France",
         "Pays de la Loire"
        ],
-       "s": 54887442,
-       "sha1_base64": "hFzeWlNgtOjwxetACbjpvl+7f5g="
+       "s": 55280221,
+       "sha1_base64": "PACtYZNIbFjwvT17vq4RrTSQGMc="
       },
       {
        "id": "France_Pays de la Loire_Loire-Atlantique_Saint-Nazaire",
@@ -4621,8 +4621,8 @@
         "France",
         "Pays de la Loire"
        ],
-       "s": 31698365,
-       "sha1_base64": "gFLpnU+td9cKKmjeRab0/PGs7fM="
+       "s": 31865088,
+       "sha1_base64": "LqaFXL6lecxPQL5TloT1abN6aYk="
       },
       {
        "id": "France_Pays de la Loire_Maine-et-Loire",
@@ -4633,8 +4633,8 @@
         "France",
         "Pays de la Loire"
        ],
-       "s": 64629299,
-       "sha1_base64": "szdOcSid/kUCVoFeqD/Ef+EC2rg="
+       "s": 64953774,
+       "sha1_base64": "w0Gjor8GKkrcKDtwl1f/MNyST9g="
       },
       {
        "id": "France_Pays de la Loire_Mayenne",
@@ -4645,8 +4645,8 @@
         "France",
         "Pays de la Loire"
        ],
-       "s": 28764550,
-       "sha1_base64": "x/NxoIey3tBKuHwzjfYGx+pxicQ="
+       "s": 28844345,
+       "sha1_base64": "qBixKkLVyJqRe7/vBkicLvXis6E="
       },
       {
        "id": "France_Pays de la Loire_Sarthe",
@@ -4657,8 +4657,8 @@
         "France",
         "Pays de la Loire"
        ],
-       "s": 45753794,
-       "sha1_base64": "jnJXSb/w5gA3eQvY4knMOcwwOso="
+       "s": 45991013,
+       "sha1_base64": "qLPeU22sy0ZKlcy+STHMfHtquNA="
       },
       {
        "id": "France_Pays de la Loire_Vendee",
@@ -4669,8 +4669,8 @@
         "France",
         "Pays de la Loire"
        ],
-       "s": 72909282,
-       "sha1_base64": "S+OWwqmoFyS6rGu5JpN0B3CQv+k="
+       "s": 73098781,
+       "sha1_base64": "GM6PVvEDZtQg0RiMgBxaUePAF0k="
       }
      ]
     },
@@ -4686,8 +4686,8 @@
         "France",
         "Nord-Pas-de-Calais-Picardie"
        ],
-       "s": 49226825,
-       "sha1_base64": "/2S7FCDcgpJTfCEz1vqt6GDX1bw="
+       "s": 49401476,
+       "sha1_base64": "j9ikyY3Nko3oqBNDpQNsHJCoYJA="
       },
       {
        "id": "France_Picardy_Oise",
@@ -4698,8 +4698,8 @@
         "France",
         "Nord-Pas-de-Calais-Picardie"
        ],
-       "s": 61730721,
-       "sha1_base64": "TqUCTUOyxYNsGyLlYZ6lqkWzDsk="
+       "s": 62032428,
+       "sha1_base64": "J+bk82AjobIoMsmNVJgHqHaevwU="
       },
       {
        "id": "France_Picardy_Somme",
@@ -4710,8 +4710,8 @@
         "France",
         "Nord-Pas-de-Calais-Picardie"
        ],
-       "s": 46621162,
-       "sha1_base64": "V3xeqFBUiVFkhSKUfsXGdLl/ROY="
+       "s": 46849005,
+       "sha1_base64": "ryXXw5mDwNrjNvzJZmd+yyfJUSw="
       }
      ]
     },
@@ -4727,8 +4727,8 @@
         "Aquitaine-Limousin-Poitou-Charentes",
         "France"
        ],
-       "s": 44377255,
-       "sha1_base64": "sQez+rbwWGcdDZt2tyQjcc0jHWc="
+       "s": 44582427,
+       "sha1_base64": "7lMorlpNwbQvx2kKDaWm0qINU8Q="
       },
       {
        "id": "France_Poitou-Charentes_Charente-Maritime",
@@ -4739,8 +4739,8 @@
         "Aquitaine-Limousin-Poitou-Charentes",
         "France"
        ],
-       "s": 73021443,
-       "sha1_base64": "uFcsNIbvm+P4WNp6fAdJGltHNaI="
+       "s": 73511086,
+       "sha1_base64": "MfX55maHWLbVp/QUoq9+2xGPXc4="
       },
       {
        "id": "France_Poitou-Charentes_Deux-Sevres",
@@ -4751,8 +4751,8 @@
         "Aquitaine-Limousin-Poitou-Charentes",
         "France"
        ],
-       "s": 57234912,
-       "sha1_base64": "eXCZB7XuYZ0XJHTQDxuIUWReWE8="
+       "s": 57405411,
+       "sha1_base64": "ztfItixaEoNOVyHjfz3QnqwI5ZI="
       },
       {
        "id": "France_Poitou-Charentes_Vienne",
@@ -4763,8 +4763,8 @@
         "Aquitaine-Limousin-Poitou-Charentes",
         "France"
        ],
-       "s": 53048497,
-       "sha1_base64": "cThwa/H3vU47GJVBKVhChEYLVE0="
+       "s": 53273020,
+       "sha1_base64": "QdQ603XOJ8WvAiApnHIOfmLiLQE="
       }
      ]
     },
@@ -4780,8 +4780,8 @@
         "France",
         "Provence-Alpes-Côte d'Azur"
        ],
-       "s": 33293184,
-       "sha1_base64": "6MHPwVEGvvFjtYgBV7Tiq3+LZtg="
+       "s": 33520915,
+       "sha1_base64": "bVG1c7t/wVBTGbVWms/MQx1UAM8="
       },
       {
        "id": "France_Provence-Alpes-Cote dAzur_Bouches-du-Rhone",
@@ -4792,8 +4792,8 @@
         "France",
         "Provence-Alpes-Côte d'Azur"
        ],
-       "s": 76902801,
-       "sha1_base64": "Iw7cRDjgTqqUXWY7p6XkVs6K85c="
+       "s": 77678964,
+       "sha1_base64": "LgSiWvLxwJaP8LgsFfz0iD7VhLs="
       },
       {
        "id": "France_Provence-Alpes-Cote dAzur_Hautes-Alpes",
@@ -4804,8 +4804,8 @@
         "France",
         "Provence-Alpes-Côte d'Azur"
        ],
-       "s": 30993175,
-       "sha1_base64": "NFY+mdKWK79mJngp+L+b4xg7I1k="
+       "s": 31282466,
+       "sha1_base64": "quU0lbdIxDawjgGUP8lEhwya5Fo="
       },
       {
        "id": "France_Provence-Alpes-Cote dAzur_Maritime Alps",
@@ -4817,8 +4817,8 @@
         "France",
         "Provence-Alpes-Côte d'Azur"
        ],
-       "s": 52964570,
-       "sha1_base64": "Trbmzp6CmqhNN2TV/qH0m/onTsc="
+       "s": 53674078,
+       "sha1_base64": "+h63DxU4SsTZ7YmBSHtRjb3IeBY="
       },
       {
        "id": "France_Provence-Alpes-Cote dAzur_Var",
@@ -4829,8 +4829,8 @@
         "France",
         "Provence-Alpes-Côte d'Azur"
        ],
-       "s": 62750970,
-       "sha1_base64": "zH6thE+IwNkN4skAg2r4RSx48Zc="
+       "s": 63200805,
+       "sha1_base64": "vGMTDdXtfNez7hd1p6y/VX9emHw="
       },
       {
        "id": "France_Provence-Alpes-Cote dAzur_Vaucluse",
@@ -4841,8 +4841,8 @@
         "France",
         "Provence-Alpes-Côte d'Azur"
        ],
-       "s": 48925402,
-       "sha1_base64": "e+qdk+CKy8jiPEW0g3xor7qNNoY="
+       "s": 49350237,
+       "sha1_base64": "Skn8xUhRzBeU/O2yDUHO7hzJdj0="
       }
      ]
     },
@@ -4858,8 +4858,8 @@
         "Auvergne-Rhône-Alpes",
         "France"
        ],
-       "s": 57074794,
-       "sha1_base64": "pyhHoBubPs8qQWpFW46wOVW2pJ4="
+       "s": 57306687,
+       "sha1_base64": "D3hvE8wFJD7Z8ujDKnoUD8aRmlU="
       },
       {
        "id": "France_Rhone-Alpes_Ardeche",
@@ -4870,8 +4870,8 @@
         "Auvergne-Rhône-Alpes",
         "France"
        ],
-       "s": 48694665,
-       "sha1_base64": "jblpMvnlUoOTtKW7p2LZ89QlvBw="
+       "s": 49082500,
+       "sha1_base64": "cmjvlA2JKN1GA3W/LEk0Xy+RWTA="
       },
       {
        "id": "France_Rhone-Alpes_Drome",
@@ -4883,8 +4883,8 @@
         "France",
         "Provence-Alpes-Côte d'Azur"
        ],
-       "s": 55669346,
-       "sha1_base64": "c54y+CjsdHJSjGOa3EfRUhMFRcg="
+       "s": 56457037,
+       "sha1_base64": "2zFbiza1nLczE8qYNWtPWI8VLPY="
       },
       {
        "id": "France_Rhone-Alpes_Haute-Savoie",
@@ -4895,8 +4895,8 @@
         "Auvergne-Rhône-Alpes",
         "France"
        ],
-       "s": 67084050,
-       "sha1_base64": "JyXf5WnOCvqcvl3Co6m9+83awfo="
+       "s": 67798053,
+       "sha1_base64": "MjCW2lMI0Fiu62iEdDB1mBCTmkY="
       },
       {
        "id": "France_Rhone-Alpes_Isere",
@@ -4907,8 +4907,8 @@
         "Auvergne-Rhône-Alpes",
         "France"
        ],
-       "s": 86558692,
-       "sha1_base64": "Yme1KExs7KWSB3K15agTanI1xxw="
+       "s": 87362743,
+       "sha1_base64": "cWs0XOFcGIEKQVawKxBD/fsxB7A="
       },
       {
        "id": "France_Rhone-Alpes_Loire",
@@ -4919,8 +4919,8 @@
         "Auvergne-Rhône-Alpes",
         "France"
        ],
-       "s": 70035208,
-       "sha1_base64": "njgIzuA8U37tchdXijNP4PUCvKE="
+       "s": 70439355,
+       "sha1_base64": "s0kCUvxWpp2G7m/vh5VPFiPNQNk="
       },
       {
        "id": "France_Rhone-Alpes_Rhone",
@@ -4931,8 +4931,8 @@
         "Auvergne-Rhône-Alpes",
         "France"
        ],
-       "s": 87846131,
-       "sha1_base64": "uZ7lVJdpQjzb4gMxXntWT9L/oVU="
+       "s": 88650742,
+       "sha1_base64": "gLeifEnq08+EDf3qBbzQl/MXoCA="
       },
       {
        "id": "France_Rhone-Alpes_Savoie",
@@ -4943,8 +4943,8 @@
         "Auvergne-Rhône-Alpes",
         "France"
        ],
-       "s": 57318459,
-       "sha1_base64": "nosKq5QgiR7S5BC+vRDt0mTtiJs="
+       "s": 57698646,
+       "sha1_base64": "YQ/WZHao9sisxzOCF/c+nd1d5Xk="
       }
      ]
     },
@@ -4968,8 +4968,8 @@
       "La Réunion",
       "Mayotte"
      ],
-     "s": 42839407,
-     "sha1_base64": "l8iBghqte3s/wB/DLxI3nD9y7Sk="
+     "s": 42982010,
+     "sha1_base64": "+qkXocTLrdDXWx7+3hXkYay0SWc="
     },
     {
      "id": "France_Upper Normandy",
@@ -4980,8 +4980,8 @@
       "France",
       "Normandie"
      ],
-     "s": 96579844,
-     "sha1_base64": "pPr5S2/JPZQNHgORyOrmfBEouik="
+     "s": 97502151,
+     "sha1_base64": "Pd6+ZzGoQ3FIKUxP2uvTR3zchfk="
     },
     {
      "id": "French Polynesia",
@@ -4999,8 +4999,8 @@
       "France, Polynésie française, Îles du Vent (eaux territoriales)",
       "Polynésie française, Îles du Vent (eaux territoriales)"
      ],
-     "s": 19316726,
-     "sha1_base64": "ARq2vIwx0AwnFfO7z5nDNSG4R0U="
+     "s": 19334728,
+     "sha1_base64": "SVeF1LJL82V0sbZJ/jhf+4hT1l4="
     },
     {
      "id": "Wallis and Futuna",
@@ -5011,8 +5011,8 @@
       "France",
       "France, Wallis-et-Futuna (eaux territoriales)"
      ],
-     "s": 967851,
-     "sha1_base64": "kmbfpcGHSomOEWW0I9PF+tjkoWo="
+     "s": 967955,
+     "sha1_base64": "ZIvJlVPlePZIgbKUAHwz9TbsiSQ="
     }
    ]
   },
@@ -5033,8 +5033,8 @@
     "Ogooué-Lolo",
     "Woleu-Ntem"
    ],
-   "s": 49517230,
-   "sha1_base64": "8NxRF7Guqlzea38s3GVCdCt6rBs="
+   "s": 50379553,
+   "sha1_base64": "3dVNdyHhqXwyYfTTsQFp+FVUGI8="
   },
   {
    "id": "Georgia Region",
@@ -5058,8 +5058,8 @@
       "აჭარის ავტონომიური რესპუბლიკა",
       "საქართველო"
      ],
-     "s": 116169740,
-     "sha1_base64": "CzzrPb8xvDEtgkT9RIqeTwXmEj0="
+     "s": 117009359,
+     "sha1_base64": "hWyFocmoyluV/B8nxhYz15Hwtj0="
     },
     {
      "id": "Abkhazia",
@@ -5071,8 +5071,8 @@
       "აფხაზეთის ავტონომიური რესპუბლიკა - Аҧсны Автономтә Республика",
       "საქართველო"
      ],
-     "s": 15919825,
-     "sha1_base64": "kSN3HEPvbkIk+g7Rjgt+VoGwhlA="
+     "s": 15919194,
+     "sha1_base64": "LtcNm+vQncZiIpw9s4s00TDFoDo="
     },
     {
      "id": "South Ossetia",
@@ -5084,8 +5084,8 @@
       "Хуссар Ирыстон - Южная Осетия",
       "საქართველო"
      ],
-     "s": 12475897,
-     "sha1_base64": "qhPYQFZiS7Z1S3OjwOG+UDCnHvc="
+     "s": 12480489,
+     "sha1_base64": "QU0qqmG6fYsTNLEj5eMYPi0rT/Q="
     }
    ]
   },
@@ -5106,8 +5106,8 @@
         "Schaffhausen",
         "Zürich"
        ],
-       "s": 139351792,
-       "sha1_base64": "MAEo7/+2z4nFtwDheA9pjbIj3Jw="
+       "s": 140031899,
+       "sha1_base64": "jSZFHPhqJWiDsjIwtUNykVXyAbc="
       },
       {
        "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Karlsruhe",
@@ -5118,8 +5118,8 @@
         "Baden-Württemberg",
         "Deutschland"
        ],
-       "s": 130510025,
-       "sha1_base64": "qJWJg0x5eoW6Utv/sCFD0jSsJV4="
+       "s": 131830908,
+       "sha1_base64": "kkMtnwRhbQfW9afGFGvqGIN8o7w="
       },
       {
        "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Stuttgart_Heilbronn",
@@ -5130,8 +5130,8 @@
         "Baden-Württemberg",
         "Deutschland"
        ],
-       "s": 57197090,
-       "sha1_base64": "zTkqOThZSqynINXMvdhBy6P4fTY="
+       "s": 57474205,
+       "sha1_base64": "5KWbE44eZ8wz1z61alSwk4hHGz4="
       },
       {
        "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Stuttgart_Stuttgart",
@@ -5142,8 +5142,8 @@
         "Baden-Württemberg",
         "Deutschland"
        ],
-       "s": 129220863,
-       "sha1_base64": "/kyWdAA7b7SQ0WcPbmrvhWJJkYE="
+       "s": 130381714,
+       "sha1_base64": "mR1ClNpYwuhdPg98Q0w5O2Z41mU="
       },
       {
        "id": "Germany_Baden-Wurttemberg_Regierungsbezirk Tubingen",
@@ -5154,8 +5154,8 @@
         "Baden-Württemberg",
         "Deutschland"
        ],
-       "s": 106661630,
-       "sha1_base64": "MNNoead1O7lh/09uCkyMi4cN1K8="
+       "s": 107294657,
+       "sha1_base64": "ru9jn5hIJFpMXEhbElbIAO0mlik="
       }
      ]
     },
@@ -5168,8 +5168,8 @@
       "Berlin",
       "Deutschland"
      ],
-     "s": 87239157,
-     "sha1_base64": "uXdcznWEw6bdGqR+wqJRao3gXos="
+     "s": 89514400,
+     "sha1_base64": "DovVzQ9l4dOd0XO6VGDeACrae7M="
     },
     {
      "id": "Germany_Brandenburg_North",
@@ -5180,8 +5180,8 @@
       "Brandenburg",
       "Deutschland"
      ],
-     "s": 92314795,
-     "sha1_base64": "0PmzbBM7SMrS266axD2fb7SnJbQ="
+     "s": 93425302,
+     "sha1_base64": "x5tAZh9WjNeVYHs9Y//1k/cm0UI="
     },
     {
      "id": "Germany_Brandenburg_South",
@@ -5192,8 +5192,8 @@
       "Brandenburg",
       "Deutschland"
      ],
-     "s": 88408655,
-     "sha1_base64": "IVaFlZTL2pJ5uPYNdJw9ZrOt4sQ="
+     "s": 89944418,
+     "sha1_base64": "kEebD0IhvmGc0uNO8ASmJ/egYP4="
     },
     {
      "id": "Germany_Free State of Bavaria",
@@ -5207,8 +5207,8 @@
         "Bayern",
         "Deutschland"
        ],
-       "s": 82281180,
-       "sha1_base64": "IlIWF8GMp121C+rshjcYbzjCOfw="
+       "s": 82668031,
+       "sha1_base64": "ZvaNdMqQVA6DelVcpWCPBsSuVW4="
       },
       {
        "id": "Germany_Free State of Bavaria_Lower Franconia",
@@ -5219,8 +5219,8 @@
         "Bayern",
         "Deutschland"
        ],
-       "s": 92831341,
-       "sha1_base64": "A08NoMD1oz1L0+jW73VdB09sidU="
+       "s": 93265976,
+       "sha1_base64": "bxwSIiRz28j6U7W6oRUV7hL0RyA="
       },
       {
        "id": "Germany_Free State of Bavaria_Middle Franconia",
@@ -5231,8 +5231,8 @@
         "Bayern",
         "Deutschland"
        ],
-       "s": 80862594,
-       "sha1_base64": "lDcqghoJzZ9NnZtL3Yd8IdA+9lE="
+       "s": 81436373,
+       "sha1_base64": "8OwDpemX2fBsTt7rt/lFLMu5b+0="
       },
       {
        "id": "Germany_Free State of Bavaria_Swabia",
@@ -5243,8 +5243,8 @@
         "Bayern",
         "Deutschland"
        ],
-       "s": 114362303,
-       "sha1_base64": "nH4jZHO2STUsZ/26YERHJLlm1D0="
+       "s": 115008066,
+       "sha1_base64": "lRWgLia3sV+4X7SzrEe0b1AwFG0="
       },
       {
        "id": "Germany_Free State of Bavaria_Upper Bavaria_East",
@@ -5255,8 +5255,8 @@
         "Bayern",
         "Deutschland"
        ],
-       "s": 80830096,
-       "sha1_base64": "Suv1pbv2tnVaHJ8x5XXuh1yFHkk="
+       "s": 81243515,
+       "sha1_base64": "n/QgoV7/5tM1pve6w8YHp+voIHA="
       },
       {
        "id": "Germany_Free State of Bavaria_Upper Bavaria_Ingolstadt",
@@ -5267,8 +5267,8 @@
         "Bayern",
         "Deutschland"
        ],
-       "s": 37527262,
-       "sha1_base64": "uchZHGcTwK3z6AGYRfX3Y6P/cgM="
+       "s": 37805209,
+       "sha1_base64": "ma9OM18QQ1+5yL1Uezb1mAYRE44="
       },
       {
        "id": "Germany_Free State of Bavaria_Upper Bavaria_Munchen",
@@ -5279,8 +5279,8 @@
         "Bayern",
         "Deutschland"
        ],
-       "s": 66137703,
-       "sha1_base64": "rO2BaVd1EWXEnSNmkwKcJat9cZI="
+       "s": 67036154,
+       "sha1_base64": "KVOQvBrMB33fQaEE8Zx+4dgVrEo="
       },
       {
        "id": "Germany_Free State of Bavaria_Upper Bavaria_South",
@@ -5291,8 +5291,8 @@
         "Bayern",
         "Deutschland"
        ],
-       "s": 34809121,
-       "sha1_base64": "f9CvEqwvi8kwqWoimiPsMtgCOps="
+       "s": 34960548,
+       "sha1_base64": "7XDamOuu3dJknuZDLXhgD2IvGLc="
       },
       {
        "id": "Germany_Free State of Bavaria_Upper Franconia",
@@ -5303,8 +5303,8 @@
         "Bayern",
         "Deutschland"
        ],
-       "s": 78996033,
-       "sha1_base64": "BqR0p4CWcLWWcU0oRi6QX9Em4wU="
+       "s": 79399300,
+       "sha1_base64": "7+/7MJgm1M2Lo7S2VV0GB2hFM2c="
       },
       {
        "id": "Germany_Free State of Bavaria_Upper Palatinate",
@@ -5315,8 +5315,8 @@
         "Bayern",
         "Deutschland"
        ],
-       "s": 75331197,
-       "sha1_base64": "ZkseXfJN1zdyBKl0/ur+14+3BBM="
+       "s": 75676296,
+       "sha1_base64": "MIDtANt2ms4GWo/OTAvdCIXedE0="
       }
      ]
     },
@@ -5329,8 +5329,8 @@
       "Deutschland",
       "Hamburg"
      ],
-     "s": 41940982,
-     "sha1_base64": "TjlI3z0oB4Sx91DhB2kgzFsQB5A="
+     "s": 42736321,
+     "sha1_base64": "GmuFiiuHwM+CF4J4HOVJTDobisM="
     },
     {
      "id": "Germany_Hesse",
@@ -5344,8 +5344,8 @@
         "Deutschland",
         "Hessen"
        ],
-       "s": 143959264,
-       "sha1_base64": "JTNwZRLUbYc1JXc09wPranEn4ck="
+       "s": 145788835,
+       "sha1_base64": "iup8WuGdcutageCkO09ycEvLIcc="
       },
       {
        "id": "Germany_Hesse_Regierungsbezirk Giessen",
@@ -5356,8 +5356,8 @@
         "Deutschland",
         "Hessen"
        ],
-       "s": 61779059,
-       "sha1_base64": "9eyz9qovcD1v1CwDmdX+buVhN+s="
+       "s": 62193174,
+       "sha1_base64": "xQ+ZfaHTbfq0So20VIpnbtoB52s="
       },
       {
        "id": "Germany_Hesse_Regierungsbezirk Kassel",
@@ -5368,8 +5368,8 @@
         "Deutschland",
         "Hessen"
        ],
-       "s": 95152950,
-       "sha1_base64": "w3DW6PC8ty0ffT9tpPVT7Ow3vc0="
+       "s": 95541433,
+       "sha1_base64": "Qu7u886rRzFH7uh4BHS4Jq3drN4="
       }
      ]
     },
@@ -5388,8 +5388,8 @@
         "Hamburg",
         "Niedersachsen"
        ],
-       "s": 66606485,
-       "sha1_base64": "pY0VVws8xY5j5ClQdqb+43bEv4I="
+       "s": 67229808,
+       "sha1_base64": "YrxIEc1yzrDVEEKwa//4m0Oxwks="
       },
       {
        "id": "Germany_Lower Saxony_Bremen_Munster",
@@ -5400,8 +5400,8 @@
         "Deutschland",
         "Niedersachsen"
        ],
-       "s": 72602516,
-       "sha1_base64": "AiHWrIS3YdJhBybvADqr+fwsQLU="
+       "s": 73113175,
+       "sha1_base64": "20GJnIIWG5Bei/RHAIT6YtsBoGo="
       },
       {
        "id": "Germany_Lower Saxony_Hannover",
@@ -5412,8 +5412,8 @@
         "Deutschland",
         "Niedersachsen"
        ],
-       "s": 76423888,
-       "sha1_base64": "CKJ8N+Uu6CGmQpLi2V9zMMT+wFA="
+       "s": 77207979,
+       "sha1_base64": "i4BPNSNyLcPKUJjjm4cxlH5sxq8="
       },
       {
        "id": "Germany_Lower Saxony_Braunschweig",
@@ -5424,8 +5424,8 @@
         "Deutschland",
         "Niedersachsen"
        ],
-       "s": 80993219,
-       "sha1_base64": "QaYeCDsK6mJvTB63JokMqFtBdoA="
+       "s": 81617942,
+       "sha1_base64": "J3QcdQS0x1aLw39H0ve9qs6eLmw="
       },
       {
        "id": "Germany_Lower Saxony_Oldenburg",
@@ -5437,8 +5437,8 @@
         "Deutschland",
         "Niedersachsen"
        ],
-       "s": 128423823,
-       "sha1_base64": "VNZspbvAASVzY5w4/r/rUAxt/FI="
+       "s": 129464314,
+       "sha1_base64": "G+xU2v32KMLl2UjSCaqD8SEHDsc="
       }
      ]
     },
@@ -5451,8 +5451,8 @@
       "Deutschland",
       "Mecklenburg-Vorpommern"
      ],
-     "s": 118547243,
-     "sha1_base64": "TRXuJBLF/sQysghazO22V+EXNYU="
+     "s": 119749662,
+     "sha1_base64": "okxZgD2AvFUvz7v7WlP02/nyZh0="
     },
     {
      "id": "Germany_North Rhine-Westphalia",
@@ -5466,8 +5466,8 @@
         "Deutschland",
         "Nordrhein-Westfalen"
        ],
-       "s": 66164852,
-       "sha1_base64": "0LAYVcumGWuRH3L6TxxXeznKxr8="
+       "s": 66586047,
+       "sha1_base64": "ckIF/bE6h+ak1tiPDv932089OcA="
       },
       {
        "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Arnsberg_Dortmund",
@@ -5478,8 +5478,8 @@
         "Deutschland",
         "Nordrhein-Westfalen"
        ],
-       "s": 94246009,
-       "sha1_base64": "s7toAZd/dPG0F7sidGM2cdTjuMQ="
+       "s": 95278700,
+       "sha1_base64": "NPKPwo/abxFbWUcyMNdS4ACl7WA="
       },
       {
        "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Detmold",
@@ -5490,8 +5490,8 @@
         "Deutschland",
         "Nordrhein-Westfalen"
        ],
-       "s": 110295028,
-       "sha1_base64": "W7IC5wbuZTJC0vfywbR7IuMmLLQ="
+       "s": 111216159,
+       "sha1_base64": "t4z9pqJfqk/M+1lvZrM2oBUF1Dg="
       },
       {
        "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Dusseldorf",
@@ -5502,8 +5502,8 @@
         "Deutschland",
         "Nordrhein-Westfalen"
        ],
-       "s": 83490553,
-       "sha1_base64": "KLDpxIx0mfv8NQ1nkBBhHd3P/rU="
+       "s": 84415660,
+       "sha1_base64": "HMBu2xYOIwlbl39z03CLe4GnN3M="
       },
       {
        "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Mulheim",
@@ -5514,8 +5514,8 @@
         "Deutschland",
         "Nordrhein-Westfalen"
        ],
-       "s": 67221363,
-       "sha1_base64": "/dGc95icShqOLQE2Xee6fMmuTX8="
+       "s": 68031614,
+       "sha1_base64": "QlQi/XSB+613rNuA05YQxJJszUs="
       },
       {
        "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Dusseldorf_Wesel",
@@ -5526,8 +5526,8 @@
         "Deutschland",
         "Nordrhein-Westfalen"
        ],
-       "s": 23259413,
-       "sha1_base64": "lCh3lyvMPLO/ZqTu+a2UmZaRuxE="
+       "s": 23390328,
+       "sha1_base64": "4TwHPTi/DCW62jrjYfk78+xfglU="
       },
       {
        "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Aachen",
@@ -5539,8 +5539,8 @@
         "Deutschland - Belgique / België / Belgien",
         "Nordrhein-Westfalen"
        ],
-       "s": 84972484,
-       "sha1_base64": "XwgZRBO5xtnteMDAHSPJwv59gG0="
+       "s": 85541871,
+       "sha1_base64": "1Jl0L4zzP+ZgZ+YPwkuuOPWAQhA="
       },
       {
        "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Koln_Koln",
@@ -5551,8 +5551,8 @@
         "Deutschland",
         "Nordrhein-Westfalen"
        ],
-       "s": 105458019,
-       "sha1_base64": "RLVxQNqpieVa6dv9+yz86+vfigU="
+       "s": 106478550,
+       "sha1_base64": "4Vmiou3tU/yJ/hCYA7xIiUVJPL8="
       },
       {
        "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Munster_Munster",
@@ -5563,8 +5563,8 @@
         "Deutschland",
         "Nordrhein-Westfalen"
        ],
-       "s": 56099562,
-       "sha1_base64": "PQPeq3f1xMGQDwGS8zZhJp0E8a4="
+       "s": 56556261,
+       "sha1_base64": "MSEEje7TzMQSgrIl7ipl0py09jA="
       },
       {
        "id": "Germany_North Rhine-Westphalia_Regierungsbezirk Munster_Recklinghausen",
@@ -5575,8 +5575,8 @@
         "Deutschland",
         "Nordrhein-Westfalen"
        ],
-       "s": 61426608,
-       "sha1_base64": "GraKxj6RIVURlaLWmCUVT0E1ntQ="
+       "s": 61895283,
+       "sha1_base64": "yA0EWNWfxmKmVhIElA5gztdTc5E="
       }
      ]
     },
@@ -5589,8 +5589,8 @@
       "Deutschland",
       "Rheinland-Pfalz"
      ],
-     "s": 129891464,
-     "sha1_base64": "NDLWcSQeCgB8Egt7d3lRHVs7GP8="
+     "s": 130569539,
+     "sha1_base64": "YsQewsBWKM8p+sLJub+cs5F6qr0="
     },
     {
      "id": "Germany_Rhineland-Palatinate_South",
@@ -5601,8 +5601,8 @@
       "Deutschland",
       "Rheinland-Pfalz"
      ],
-     "s": 108542669,
-     "sha1_base64": "o4V2D8jhJpFWgx0bQ9PLcVgnWd8="
+     "s": 109420223,
+     "sha1_base64": "Glchb5vyhDT4oWUNYCuw/YLhK/w="
     },
     {
      "id": "Germany_Saarland",
@@ -5613,8 +5613,8 @@
       "Deutschland",
       "Saarland"
      ],
-     "s": 46847690,
-     "sha1_base64": "C9CnTLVK7Ac/q7leN4XqXPKL8dc="
+     "s": 47262253,
+     "sha1_base64": "eHptmNdW8tLA/+hKWyLXO9++SLE="
     },
     {
      "id": "Germany_Saxony-Anhalt_Magdeburg",
@@ -5625,8 +5625,8 @@
       "Deutschland",
       "Sachsen-Anhalt"
      ],
-     "s": 76731965,
-     "sha1_base64": "9Zz52QMBnnTLwHYL57NxX6x5ax8="
+     "s": 77380232,
+     "sha1_base64": "iH1uXgT59qVB8EdDXSzz5mrjlkM="
     },
     {
      "id": "Germany_Saxony-Anhalt_Halle",
@@ -5637,8 +5637,8 @@
       "Deutschland",
       "Sachsen-Anhalt"
      ],
-     "s": 69218893,
-     "sha1_base64": "b+qclyk+xQKEtAAD2PzO7pZ/3yY="
+     "s": 69972800,
+     "sha1_base64": "4D0yZdza+zTYQeFoaUN94kPO9BU="
     },
     {
      "id": "Germany_Saxony_Dresden",
@@ -5649,8 +5649,8 @@
       "Deutschland",
       "Sachsen"
      ],
-     "s": 86976208,
-     "sha1_base64": "ZXLZB2MJsaM4ghr2Gk6yFyYnPNM="
+     "s": 87797451,
+     "sha1_base64": "qi29W/vzSPP0bNy+HYyg3YWrXbs="
     },
     {
      "id": "Germany_Saxony_Leipzig",
@@ -5661,8 +5661,8 @@
       "Deutschland",
       "Sachsen"
      ],
-     "s": 142601122,
-     "sha1_base64": "JpumE3cGIhPv8xcrr6/mDWW5Zlg="
+     "s": 143944805,
+     "sha1_base64": "meet34c4Jo0A2NA6SB0Njt4GTF8="
     },
     {
      "id": "Germany_Schleswig-Holstein_Kiel",
@@ -5674,8 +5674,8 @@
       "Deutschland",
       "Schleswig-Holstein"
      ],
-     "s": 71141325,
-     "sha1_base64": "2H2bxberYoa1FyLIFWCzgNyuw5M="
+     "s": 71846168,
+     "sha1_base64": "tZuXQ0DNwKsn/BmPGLRwiLrXjW4="
     },
     {
      "id": "Germany_Schleswig-Holstein_Flensburg",
@@ -5686,8 +5686,8 @@
       "Deutschland",
       "Schleswig-Holstein"
      ],
-     "s": 65624442,
-     "sha1_base64": "HWPeOVhOXyZMf6UQK1zT4xBqNd8="
+     "s": 66174157,
+     "sha1_base64": "IEw3H1/2ISMYbU3opDOF736XRno="
     },
     {
      "id": "Germany_Thuringia",
@@ -5698,8 +5698,8 @@
       "Deutschland",
       "Thüringen"
      ],
-     "s": 151860060,
-     "sha1_base64": "3ELOPcNe+t7xDFJ5R9po6CJmzsw="
+     "s": 153128175,
+     "sha1_base64": "LE5X5L7MQ619AI0x396vpfjOnow="
     }
    ]
   },
@@ -5721,8 +5721,8 @@
     "Volta Region",
     "Western Region"
    ],
-   "s": 99861810,
-   "sha1_base64": "G/JrDvbgy2cTSMrJIjKzCx2neWw="
+   "s": 100011101,
+   "sha1_base64": "EQHmy+0rL2PAKBROs1fwYAkEjQM="
   },
   {
    "id": "Gibraltar",
@@ -5734,8 +5734,8 @@
     "España",
     "Gibraltar"
    ],
-   "s": 968308,
-   "sha1_base64": "E2cMYrZ8yZmJXKGKy1q8lHIGKws="
+   "s": 971333,
+   "sha1_base64": "9i39pIdUpBIaUXckfdcMWrNPYjg="
   },
   {
    "id": "Greece",
@@ -5750,8 +5750,8 @@
       "Territorial waters of Greece - Gavdos and Gavdopoula",
       "Αποκεντρωμένη Διοίκηση Κρήτης"
      ],
-     "s": 26477435,
-     "sha1_base64": "t0fbIK3GqHe9s5DjChltupA+f2U="
+     "s": 26615526,
+     "sha1_base64": "s9FBJPoTDoWIu9mQ6wHmgvVms8c="
     },
     {
      "id": "Greece_Decentralized Administration of West Greece",
@@ -5764,8 +5764,8 @@
       "Shqipëria",
       "Αποκεντρωμένη Διοίκηση Πελοποννήσου, Δυτικής Ελλάδας και Ιονίου"
      ],
-     "s": 75553230,
-     "sha1_base64": "CAFEmD1VgkMg31lpGKpvEWP6JAE="
+     "s": 75978313,
+     "sha1_base64": "kpLR6YXPbzjSjtOKFEKGt2Z3Gww="
     },
     {
      "id": "Greece_Decentralized Administration of Aegean",
@@ -5776,8 +5776,8 @@
       "Ελλάδα",
       "Αποκεντρωμένη Διοίκηση Αιγαίου"
      ],
-     "s": 33707205,
-     "sha1_base64": "ORZlfkIdXJEX7Ld7B8GFl2sFKSs="
+     "s": 33896456,
+     "sha1_base64": "IPBhI5NSHI/LEpeiBgbXbefP0zM="
     },
     {
      "id": "Greece_Decentralized Administration of Epirus - Western Macedonia",
@@ -5788,8 +5788,8 @@
       "Ελλάδα",
       "Αποκεντρωμένη Διοίκηση Ηπείρου - Δυτικής Μακεδονίας"
      ],
-     "s": 35536646,
-     "sha1_base64": "X8ccurmZ3jMJ9Yj06IBX23lSjhI="
+     "s": 35650097,
+     "sha1_base64": "L/dI4wwyomHy2xEUGGe3YNEJHTs="
     },
     {
      "id": "Greece_Decentralized Administration of Macedonia and Thrace",
@@ -5800,8 +5800,8 @@
       "Ελλάδα",
       "Αποκεντρωμένη Διοίκηση Μακεδονίας - Θράκης"
      ],
-     "s": 72564379,
-     "sha1_base64": "Qmb66yfUiWkPiUjsB3xLY9z8S7g="
+     "s": 73119566,
+     "sha1_base64": "H35p5mqwyJcKNksQN+mApLpI8ds="
     },
     {
      "id": "Greece_Decentralized Administration of Thessaly - Central Greece",
@@ -5813,8 +5813,8 @@
       "Αποκεντρωμένη Διοίκηση Αττικής",
       "Αποκεντρωμένη Διοίκηση Θεσσαλίας - Στερεάς Ελλάδας"
      ],
-     "s": 61104691,
-     "sha1_base64": "sGapQHAO/tftqG9NPKeuD5l7NtM="
+     "s": 61405750,
+     "sha1_base64": "Sw5oIgy1VkGnA6PEkwsgzdjZojI="
     },
     {
      "id": "Greece_Decentralized Administration of Attica",
@@ -5825,8 +5825,8 @@
       "Ελλάδα",
       "Αποκεντρωμένη Διοίκηση Αττικής"
      ],
-     "s": 47870441,
-     "sha1_base64": "ofiiVaK8p4ANvBNJHT3t6Ecrf3Q="
+     "s": 48359132,
+     "sha1_base64": "DTRnmZojeJ+dFYZzVcQQ/pMwDMo="
     }
    ]
   },
@@ -5838,8 +5838,8 @@
    "affiliations": [
     "Kalaallit Nunaat"
    ],
-   "s": 49421068,
-   "sha1_base64": "ocwaDz+eHuzj5o6FINRKqSDJAZ8="
+   "s": 49483878,
+   "sha1_base64": "vE8cA7owvtVIgN5JDFebn1JC4cs="
   },
   {
    "id": "Guatemala",
@@ -5871,8 +5871,8 @@
     "Totonicapán",
     "Zacapa"
    ],
-   "s": 161499286,
-   "sha1_base64": "WMGs1rwAXB/z6T54Yp8TcMFw+xo="
+   "s": 162376641,
+   "sha1_base64": "LJBWR0/7IMjmTmAvPvFveghtdV4="
   },
   {
    "id": "Guernsey",
@@ -5905,8 +5905,8 @@
     "Selle Rocque",
     "Sark"
    ],
-   "s": 2120454,
-   "sha1_base64": "TVQaX+4t8MQ0GRZVIB5bnKHVqsI="
+   "s": 2147035,
+   "sha1_base64": "KUIkuzIQLk1unr0HU8les1C//ns="
   },
   {
    "id": "Guinea",
@@ -5924,8 +5924,8 @@
     "Région de Mamou",
     "Région de Nzérékoré"
    ],
-   "s": 98936167,
-   "sha1_base64": "Y3ZHlJWR0zmT8Bi7O6AFjVh1SGY="
+   "s": 98963289,
+   "sha1_base64": "rzg+UNhUJWFAQnv8DvLgXonl2AE="
   },
   {
    "id": "Guinea-Bissau",
@@ -5943,8 +5943,8 @@
     "Região de Quinara",
     "Região de Tombali"
    ],
-   "s": 18775679,
-   "sha1_base64": "MGp2PJp9cY8ie0tHdn3req2MRMI="
+   "s": 18778025,
+   "sha1_base64": "/7BpMfD+0ceD4jLje+PDFYUfJXg="
   },
   {
    "id": "Guyana",
@@ -5954,8 +5954,8 @@
    "affiliations": [
     "Guyana"
    ],
-   "s": 26918400,
-   "sha1_base64": "/09wjW0APPtG8Dfv73a9tVD8uSw="
+   "s": 26975642,
+   "sha1_base64": "s67pMKNbucQ9PkKghVzOkcSzWBA="
   },
   {
    "id": "Haiti",
@@ -5975,8 +5975,8 @@
     "Département du Sud",
     "Département du Sud-Est"
    ],
-   "s": 58674100,
-   "sha1_base64": "GrP3vIKGy5UrCr36biLMD87YFC0="
+   "s": 58739423,
+   "sha1_base64": "1f+ecb68a5J5GuiXgZJiFPibfH0="
   },
   {
    "id": "Honduras",
@@ -6005,8 +6005,8 @@
     "Valle",
     "Yoro"
    ],
-   "s": 78039505,
-   "sha1_base64": "eU6P7lm6/XtJm+jPZB4ErJrfdsc="
+   "s": 78341068,
+   "sha1_base64": "32v7U/cq6EWKhwub+1rMuC68FCo="
   },
   {
    "id": "Hungary",
@@ -6020,8 +6020,8 @@
       "Alföld és Észak",
       "Magyarország"
      ],
-     "s": 132789905,
-     "sha1_base64": "h59OsXbSTvOBu5Q/vX6vwEo8nQ8="
+     "s": 134481764,
+     "sha1_base64": "aS6eq2wbvKZiqwxdBjZFYo/9M/4="
     },
     {
      "id": "Hungary_Transdanubia",
@@ -6032,8 +6032,8 @@
       "Dunántúl",
       "Magyarország"
      ],
-     "s": 122861626,
-     "sha1_base64": "EUk9EEbl6OO6pf+zERAq/wI8DGE="
+     "s": 123900133,
+     "sha1_base64": "orBNCDlNoVbgW8fTGJ4b0AuWngs="
     },
     {
      "id": "Hungary_Kozep-Magyarorszag",
@@ -6044,8 +6044,8 @@
       "Közép-Magyarország",
       "Magyarország"
      ],
-     "s": 69061042,
-     "sha1_base64": "PLeUPO5ydXPbu2WX56Jwjo0BqC0="
+     "s": 69404253,
+     "sha1_base64": "JnM6T9pNorvJQceAGc4AbweGqJA="
     }
    ]
   },
@@ -6057,8 +6057,8 @@
    "affiliations": [
     "Ísland"
    ],
-   "s": 110929709,
-   "sha1_base64": "6PlimlbavdipUP0y2TXStt8chOM="
+   "s": 111039936,
+   "sha1_base64": "F52hmQIMaXFnCM64iaPyhiR4k+M="
   },
   {
    "id": "India",
@@ -6072,8 +6072,8 @@
       "Andaman and Nicobar Islands",
       "India"
      ],
-     "s": 9662399,
-     "sha1_base64": "hcViDFiKkFbX9qRri1/NRPdUOHw="
+     "s": 9664071,
+     "sha1_base64": "UWFIp3Tm8Dx+9ktBeiFVFCyb/mQ="
     },
     {
      "id": "India_Lakshadweep",
@@ -6085,7 +6085,7 @@
       "Lakshadweep"
      ],
      "s": 350534,
-     "sha1_base64": "Tix/Zi80f/f8xubzF9f2SOSl4NI="
+     "sha1_base64": "/Eg80HGnXlxE7pBCE5uFB77FztQ="
     },
     {
      "id": "India_Andhra Pradesh",
@@ -6097,8 +6097,8 @@
       "India",
       "Puducherry"
      ],
-     "s": 101696603,
-     "sha1_base64": "0AVpOWRiwr+w6Jgl4lvldZac+b4="
+     "s": 102672190,
+     "sha1_base64": "AxiebZ+nSbG2X+fF1YTpYOE/Cps="
     },
     {
      "id": "India_Gujarat",
@@ -6111,8 +6111,8 @@
       "Union Territory of Dadra & Nagar Haveli",
       "Union Territory of Damman & Diu"
      ],
-     "s": 86718177,
-     "sha1_base64": "KGK+aijpuCaW0zQwbVCfdKC2dBs="
+     "s": 87370156,
+     "sha1_base64": "8pIlMwGCKJbhoRHVye+qunnqD+w="
     },
     {
      "id": "India_Kerala",
@@ -6123,8 +6123,8 @@
       "India",
       "Kerala"
      ],
-     "s": 150616580,
-     "sha1_base64": "JIJ6zA+1ryK4J9h1IIFmChZmFn8="
+     "s": 150875447,
+     "sha1_base64": "pdHZTjaBPGTNb4rNPZh7AxQFsRs="
     },
     {
      "id": "India_Madhya Pradesh",
@@ -6135,8 +6135,8 @@
       "India",
       "Madhya Pradesh"
      ],
-     "s": 131083796,
-     "sha1_base64": "JH4aRBw/BwePAUugNCxK8LpOvbs="
+     "s": 131332671,
+     "sha1_base64": "w9eknDX5WFJ9FlNDeWHwlaKl94I="
     },
     {
      "id": "India_Rajasthan",
@@ -6147,8 +6147,8 @@
       "India",
       "Rajasthan"
      ],
-     "s": 126571827,
-     "sha1_base64": "iVljTWmd9wsl2UU/y9XxrboLBXg="
+     "s": 126859182,
+     "sha1_base64": "475e3K61rnlU4B7FEHd+zHUtSvw="
     },
     {
      "id": "India_Tamil Nadu",
@@ -6165,8 +6165,8 @@
       "Sorapattu",
       "Tamil Nadu"
      ],
-     "s": 132021021,
-     "sha1_base64": "5QC82cWc2Bgppe74eNjJcH/CZMs="
+     "s": 132757064,
+     "sha1_base64": "96zehy0n1yATSodnKkSXsNq/HOQ="
     },
     {
      "id": "India_Haryana",
@@ -6177,8 +6177,8 @@
       "Haryana",
       "India"
      ],
-     "s": 54969805,
-     "sha1_base64": "76WfZeBauzujYQ9+If0s5AKW8SI="
+     "s": 55379656,
+     "sha1_base64": "rONI3gS88TThZtYzxXsfDa2gCSU="
     },
     {
      "id": "India_Goa",
@@ -6189,8 +6189,8 @@
       "Goa",
       "India"
      ],
-     "s": 9009629,
-     "sha1_base64": "aHHmjHrTNYPYRzvpecI8jlxbdXw="
+     "s": 9126128,
+     "sha1_base64": "sYdYe36okxrkJw05WoRqsgkShAc="
     },
     {
      "id": "India_Karnataka_North",
@@ -6201,8 +6201,8 @@
       "India",
       "Karnataka"
      ],
-     "s": 61445008,
-     "sha1_base64": "A0PUV8+Otmg73lm26TCYiK82dsQ="
+     "s": 61584955,
+     "sha1_base64": "3d/seZyWRguarvFknlpd5ToFMD4="
     },
     {
      "id": "India_Karnataka_South",
@@ -6213,8 +6213,8 @@
       "India",
       "Karnataka"
      ],
-     "s": 67352321,
-     "sha1_base64": "5D7aXMee1uFRz9XYIaOeuHkgw1E="
+     "s": 68554732,
+     "sha1_base64": "y21+j6pZSn9AglGdzdu5UOPe0g8="
     },
     {
      "id": "India_Maharashtra",
@@ -6230,8 +6230,8 @@
       "Maharashtra",
       "Rangadhampetha"
      ],
-     "s": 143090840,
-     "sha1_base64": "GRHH3wa6uSKGS1rpJkGKmXCIjnU="
+     "s": 144963971,
+     "sha1_base64": "8LcX85cU2Fx4y2hMisv7otjZrWs="
     },
     {
      "id": "India_Telangana",
@@ -6242,8 +6242,8 @@
       "India",
       "Telangana"
      ],
-     "s": 94325841,
-     "sha1_base64": "PTcPG/S1aAAnIu3nyl7KpCww3gA="
+     "s": 95038700,
+     "sha1_base64": "+PsX87nsYuuEa1UbgoMXM3xziiY="
     },
     {
      "id": "India_Delhi",
@@ -6254,8 +6254,8 @@
       "Delhi",
       "India"
      ],
-     "s": 20634827,
-     "sha1_base64": "HyrO4tfsmNDXm0GSE0+JzLmxt90="
+     "s": 21312158,
+     "sha1_base64": "a+k5YqY7unmmQxCMBxCkM8UBsGs="
     },
     {
      "id": "India_Uttar Pradesh",
@@ -6266,8 +6266,8 @@
       "Uttar Pradesh",
       "India"
      ],
-     "s": 192629809,
-     "sha1_base64": "zqaGrGktnZHPjshn/Vgf6lpVdnM="
+     "s": 193276764,
+     "sha1_base64": "bvhUDKf+y/VOHL44AegM0dlQyXc="
     },
     {
      "id": "India_Odisha",
@@ -6278,8 +6278,8 @@
       "India",
       "Odisha"
      ],
-     "s": 52388147,
-     "sha1_base64": "m33NayA1Z1wt695CJqRl/VPoA6E="
+     "s": 52550078,
+     "sha1_base64": "EsnqF1Q5GUDahZ4qR1GFL+dGb10="
     },
     {
      "id": "India_Chhattisgarh",
@@ -6290,8 +6290,8 @@
       "Chhattisgarh",
       "India"
      ],
-     "s": 43242602,
-     "sha1_base64": "2KY7/qNeskO2+XAd90trJqgJFk0="
+     "s": 43378453,
+     "sha1_base64": "mERBoPuNO4TJ89e9tObWOFtc6ss="
     },
     {
      "id": "India_Jharkhand",
@@ -6302,8 +6302,8 @@
       "Jharkhand",
       "India"
      ],
-     "s": 38516835,
-     "sha1_base64": "J9IiPGE2G0xaRs23FN1JPanXJOY="
+     "s": 38597118,
+     "sha1_base64": "7P+ZGQ3k3KCSrE3XceH5Z7VXG2Q="
     },
     {
      "id": "India_Bihar",
@@ -6314,8 +6314,8 @@
       "Bihar",
       "India"
      ],
-     "s": 73625048,
-     "sha1_base64": "Il7PywsZzMWnFT1r59ztZiN3CYI="
+     "s": 73839995,
+     "sha1_base64": "mBr+z6mICj0fqUukkO5HB7aw/6o="
     },
     {
      "id": "India_Tripura",
@@ -6326,8 +6326,8 @@
       "India",
       "Tripura"
      ],
-     "s": 14309189,
-     "sha1_base64": "CBX/NwIUfvuNBbUc+uKL6kzWIME="
+     "s": 14314991,
+     "sha1_base64": "uLqp0Na7o2Pb17+uScvnGeH0w2M="
     },
     {
      "id": "India_West Bengal",
@@ -6340,8 +6340,8 @@
       "India",
       "West Bengal"
      ],
-     "s": 105643836,
-     "sha1_base64": "hn9MVqz/jH1I2JaLVteHi4adQm8="
+     "s": 106083351,
+     "sha1_base64": "hT4Bi26IlsjmU9WM/4x6Tk5S0K4="
     },
     {
      "id": "India_Sikkim",
@@ -6352,8 +6352,8 @@
       "India",
       "Sikkim"
      ],
-     "s": 12104786,
-     "sha1_base64": "2Yk6IGx7NPV8F1d1qHhiQ9c65z4="
+     "s": 12105130,
+     "sha1_base64": "/KnFGm19pfTRWOU2iEZcyLIJfdo="
     },
     {
      "id": "India_Uttarakhand",
@@ -6364,8 +6364,8 @@
       "Uttarakhand",
       "India"
      ],
-     "s": 40392355,
-     "sha1_base64": "dOGN+Q4NTLa/i0//aKvSL9x3XH0="
+     "s": 40426710,
+     "sha1_base64": "Y/fAPYiX6YExufUyAL8mHiJQTMA="
     },
     {
      "id": "India_Mizoram",
@@ -6376,8 +6376,8 @@
       "India",
       "Mizoram"
      ],
-     "s": 19322882,
-     "sha1_base64": "+1R0qxiB/jPWkv5q9DEHvpGGb8s="
+     "s": 19339362,
+     "sha1_base64": "oVGB7dpgYPnMELUrbthmab8tzq4="
     },
     {
      "id": "India_Meghalaya",
@@ -6388,8 +6388,8 @@
       "India",
       "Meghalaya"
      ],
-     "s": 14593356,
-     "sha1_base64": "fu5jD45JU4ksA4Of7cx7IonVEjU="
+     "s": 14596580,
+     "sha1_base64": "LPzaJSgfBn8lw8h1aOBvwExzdgw="
     },
     {
      "id": "India_Manipur",
@@ -6400,8 +6400,8 @@
       "India",
       "Manipur"
      ],
-     "s": 17893171,
-     "sha1_base64": "9c/0GH848nYsmsu8BNpRaXba5I4="
+     "s": 17902131,
+     "sha1_base64": "JOqQY0R5yhXZfQ7XGAZYuUjOSK8="
     },
     {
      "id": "India_Nagaland",
@@ -6412,8 +6412,8 @@
       "India",
       "Nagaland"
      ],
-     "s": 14552829,
-     "sha1_base64": "47MkXdY0EdHYeKexMLENPbhhnjE="
+     "s": 14558605,
+     "sha1_base64": "X4wbUs9k820kRAGymvH+bcbgDEM="
     },
     {
      "id": "India_Assam",
@@ -6424,8 +6424,8 @@
       "Assam",
       "India"
      ],
-     "s": 57957027,
-     "sha1_base64": "dDCvA5AZmsFewuVls8SPSnycm+U="
+     "s": 58357086,
+     "sha1_base64": "aWvMLPDgeMXg6SKnMTDXGLM++i4="
     },
     {
      "id": "India_Arunachal Pradesh",
@@ -6436,8 +6436,8 @@
       "Arunachal Pradesh",
       "India"
      ],
-     "s": 19113888,
-     "sha1_base64": "WOsPrV5XyNTdt5ph2DEpsvJeU1o="
+     "s": 19164888,
+     "sha1_base64": "elLC/ZMUwQysaZFgcoTglzZHq7k="
     },
     {
      "id": "India_Himachal Pradesh",
@@ -6448,8 +6448,8 @@
       "Himachal Pradesh",
       "India"
      ],
-     "s": 35275176,
-     "sha1_base64": "0ujhRP5BamltMUNSXU0htAZkwAs="
+     "s": 35280920,
+     "sha1_base64": "j9tvdVd6/gEzM6hi8eFUBBM6Bos="
     },
     {
      "id": "India_Jammu and Kashmir",
@@ -6460,8 +6460,8 @@
       "India",
       "Jammu and Kashmir"
      ],
-     "s": 48253059,
-     "sha1_base64": "A3rt+bUumq6Fup6xYQEMprMbTrw="
+     "s": 48282157,
+     "sha1_base64": "fXPiv/HXQpW2snMMWswlw/os3wU="
     },
     {
      "id": "India_Chandigarh",
@@ -6472,8 +6472,8 @@
       "India",
       "Union Territory of Chandīgarh"
      ],
-     "s": 1371095,
-     "sha1_base64": "rWiusdkEL6BHmTyLkVr+AAruclE="
+     "s": 1396081,
+     "sha1_base64": "FiFCvo9qhaX812oaz3r8kGfjjVg="
     },
     {
      "id": "India_Punjab",
@@ -6484,8 +6484,8 @@
       "India",
       "Punjab"
      ],
-     "s": 52454181,
-     "sha1_base64": "izrvpLxTMaiXn2ejjo2w3ZWq3IU="
+     "s": 52702896,
+     "sha1_base64": "/czaAcPMljzN4SPabS7f1tFFPSc="
     }
    ]
   },
@@ -6511,8 +6511,8 @@
       "Sulawesi Tengah",
       "Sulawesi Utara"
      ],
-     "s": 337086815,
-     "sha1_base64": "xlsalUQGoZIQVq5dcDmvdP5rX0g="
+     "s": 337588483,
+     "sha1_base64": "rOPyZaJ1iv+YLTXZs0/KCooHLIs="
     },
     {
      "id": "Indonesia_West",
@@ -6534,8 +6534,8 @@
       "Sumatera Selatan",
       "Sumatera Utara"
      ],
-     "s": 267418203,
-     "sha1_base64": "fQ5dSPbjoBF9EepBzCe2o06itZo="
+     "s": 268623986,
+     "sha1_base64": "Rvpw1GcBoPi0dvVYkkJxtVrOAng="
     },
     {
      "id": "Indonesia_Jawa Tengah",
@@ -6547,8 +6547,8 @@
       "Indonesia",
       "Jawa Tengah"
      ],
-     "s": 240901012,
-     "sha1_base64": "UqoOjqvWQgp2nsYyMvzJ40rZOO0="
+     "s": 242200207,
+     "sha1_base64": "R5+uioRtvcMB1i0iGQbqe64vrD0="
     },
     {
      "id": "Indonesia_Jawa Barat",
@@ -6561,8 +6561,8 @@
       "Indonesia",
       "Jawa Barat"
      ],
-     "s": 367375661,
-     "sha1_base64": "gfdYMWMF9vRoPnWMPZN74LRQBj0="
+     "s": 373864506,
+     "sha1_base64": "o1QuOXP69duujr007/+p3ndfA8o="
     },
     {
      "id": "Indonesia_Nusa Tenggara",
@@ -6577,8 +6577,8 @@
       "Nusa Tenggara Barat",
       "Nusa Tenggara Timur"
      ],
-     "s": 164777585,
-     "sha1_base64": "EqrEhCL/Blu/WEqnY5RAKhhRZiU="
+     "s": 165642356,
+     "sha1_base64": "tiCCFWAIv+8bBwMuf6+OY0B0LnE="
     },
     {
      "id": "Indonesia_Jawa Timur",
@@ -6589,8 +6589,8 @@
       "Indonesia",
       "Jawa Timur"
      ],
-     "s": 219657581,
-     "sha1_base64": "9M3UsP/UAS70ktgBF5AjyByTYDs="
+     "s": 221225880,
+     "sha1_base64": "O5qF9gbpQRGDQy6Pug7H9vAa5GA="
     },
     {
      "id": "Indonesia_East",
@@ -6604,8 +6604,8 @@
       "Papua Barat",
       "Papua"
      ],
-     "s": 77381180,
-     "sha1_base64": "aiiSX9pPetdvaut5zw2N857n8FM="
+     "s": 77714671,
+     "sha1_base64": "rBtLXCrQ2IFm+nnQC8aAkh2PjNs="
     }
    ]
   },
@@ -6626,8 +6626,8 @@
       "خراسان شمالی‎",
       "جمهوری اسلامی‏ايران‎"
      ],
-     "s": 102883506,
-     "sha1_base64": "bKs4kle4MAq2s9L+talfBIRW0sQ="
+     "s": 103019861,
+     "sha1_base64": "Pw0OMt3DhdXWCGGmMRxmqemICN0="
     },
     {
      "id": "Iran_South",
@@ -6650,8 +6650,8 @@
       "کرمانشاه‎",
       "‏هرمزگان‎"
      ],
-     "s": 152478478,
-     "sha1_base64": "qxUiFc9zoJv/L6rZQXwAOIGEP0w="
+     "s": 152963105,
+     "sha1_base64": "QXdx6VWt6hghoc6VngxCeAljMko="
     },
     {
      "id": "Iran_North",
@@ -6675,8 +6675,8 @@
       "کرمانشاه‎",
       "آذربایجان شرقی"
      ],
-     "s": 143449495,
-     "sha1_base64": "MULP/fzm7sU2IAyvCQD69mV4Yno="
+     "s": 143915442,
+     "sha1_base64": "Y9nodW4O1en+Z4acEeLcvmzowH4="
     }
    ]
   },
@@ -6701,8 +6701,8 @@
       "الأنبار",
       "السليمانية"
      ],
-     "s": 74096554,
-     "sha1_base64": "RbYKJgg+1l2oTR+yhsp2sd+Fp6k="
+     "s": 74245701,
+     "sha1_base64": "7Ilw/Co+qCQh4KF2xs3SNsQOpP8="
     },
     {
      "id": "Iraq_South",
@@ -6725,8 +6725,8 @@
       "الأنبار",
       "القادسية"
      ],
-     "s": 58785897,
-     "sha1_base64": "ceEw06XN6sDBOAgaiy9iikqZllg="
+     "s": 59031180,
+     "sha1_base64": "AyWmK1+3EBo52nBWNB0FD7lYmK4="
     }
    ]
   },
@@ -6740,8 +6740,8 @@
     "Scotland",
     "United Kingdom"
    ],
-   "s": 6042998,
-   "sha1_base64": "yhD+dERtLQ96xmBnGvyYltDruWM="
+   "s": 6077529,
+   "sha1_base64": "Av5KpbVYUe5Wad6+p5muia0Zeck="
   },
   {
    "id": "Israel Region",
@@ -6756,8 +6756,8 @@
       "מחוז ירושלים",
       "מדינת ישראל"
      ],
-     "s": 9790966,
-     "sha1_base64": "+HfD6DgyEscyCPoV+zZVxdZKNak="
+     "s": 9971721,
+     "sha1_base64": "sQ45aaspiOwI7vb1pc/ZoX0NaGo="
     },
     {
      "id": "Israel",
@@ -6774,8 +6774,8 @@
       "מחוז ירושלים",
       "מדינת ישראל"
      ],
-     "s": 104043981,
-     "sha1_base64": "kaEgpta9+VoLN7UlMgNPGXtRs5k="
+     "s": 105427016,
+     "sha1_base64": "jQ97NrvwxlW1AuHMTkIfPfvC1ZQ="
     }
    ]
   },
@@ -6791,8 +6791,8 @@
       "Abruzzo",
       "Italia"
      ],
-     "s": 85574468,
-     "sha1_base64": "1PAxY8bdsluqmc/JSTrO5KdmDtE="
+     "s": 87108111,
+     "sha1_base64": "BJO4AEQ+G8330MxP6QcuAFLtGVk="
     },
     {
      "id": "Italy_Aosta Valley",
@@ -6803,8 +6803,8 @@
       "Italia",
       "Valle d'Aosta/Vallée d'Aoste"
      ],
-     "s": 22848156,
-     "sha1_base64": "uC7+L53R7SHt9LabEz+smynzlG0="
+     "s": 22907863,
+     "sha1_base64": "vNUpzBECtRDPkAp8Qb50MKEt6D8="
     },
     {
      "id": "Italy_Apulia",
@@ -6820,8 +6820,8 @@
       "Italia",
       "Puglia"
      ],
-     "s": 104971597,
-     "sha1_base64": "b36MOJ+n3y/k0jTTkr7hhMOuAGg="
+     "s": 105773640,
+     "sha1_base64": "6/2uOLr5L6Bp8C9PIb+bdhP8V94="
     },
     {
      "id": "Italy_Basilicata",
@@ -6832,8 +6832,8 @@
       "Basilicata",
       "Italia"
      ],
-     "s": 40028300,
-     "sha1_base64": "1heFL0s2+HLv3WnCbtxvEOnAERk="
+     "s": 40131759,
+     "sha1_base64": "y2PDEBOy1zRMsmfz9zlSrxJqyiw="
     },
     {
      "id": "Italy_Calabria",
@@ -6846,8 +6846,8 @@
       "Isola di Dino",
       "Italia"
      ],
-     "s": 48234056,
-     "sha1_base64": "lMmxTILCRUADv8Zo4f+u8feUGOo="
+     "s": 48832507,
+     "sha1_base64": "o5wGRkn2nzicrk+V8NJJHLIBxB4="
     },
     {
      "id": "Italy_Campania",
@@ -6864,8 +6864,8 @@
       "La Castelluccia",
       "Scoglio Rovigliano"
      ],
-     "s": 85681692,
-     "sha1_base64": "qk7JmnmiZ8uY02zpegaK6bSzxxQ="
+     "s": 86349487,
+     "sha1_base64": "ZDFHs45qClEhk0gPm/N0NQpNtDQ="
     },
     {
      "id": "Italy_Emilia",
@@ -6879,8 +6879,8 @@
         "Emilia-Romagna",
         "Italia"
        ],
-       "s": 37385623,
-       "sha1_base64": "KR4CHdkVXGF2xESa5krZq85GLjc="
+       "s": 37656778,
+       "sha1_base64": "ZuFHrz4bzJbFzUWijErTzxjiqlw="
       },
       {
        "id": "Italy_Emilia-Romagna_Ferrara",
@@ -6891,8 +6891,8 @@
         "Emilia-Romagna",
         "Italia"
        ],
-       "s": 15950619,
-       "sha1_base64": "T4vTs8Qu6sDsSg/BUriCoUpQAyc="
+       "s": 16040406,
+       "sha1_base64": "zsjYSTjl0CKndIm7O3y7APKoHIw="
       },
       {
        "id": "Italy_Emilia-Romagna_Forli-Cesena",
@@ -6903,8 +6903,8 @@
         "Emilia-Romagna",
         "Italia"
        ],
-       "s": 21359141,
-       "sha1_base64": "81UYAJAhn49QrrbOEq9fq3TtdmA="
+       "s": 21397280,
+       "sha1_base64": "bt0gfwMh7PpnobKwP1+GevP/3hU="
       },
       {
        "id": "Italy_Emilia-Romagna_Modena",
@@ -6915,8 +6915,8 @@
         "Emilia-Romagna",
         "Italia"
        ],
-       "s": 28596901,
-       "sha1_base64": "3I3y2qzil1Ts2eN0inWWaOIMsSE="
+       "s": 28785064,
+       "sha1_base64": "5p2xv/+k+MALHwoxTlfeSi1J+aQ="
       },
       {
        "id": "Italy_Emilia-Romagna_Parma",
@@ -6927,8 +6927,8 @@
         "Emilia-Romagna",
         "Italia"
        ],
-       "s": 24376396,
-       "sha1_base64": "iKFFX6DrnErKL/GA7VYQDC8uuEw="
+       "s": 24458759,
+       "sha1_base64": "lzwzpEDUEY0SOGJ63AKzENZCgjM="
       },
       {
        "id": "Italy_Emilia-Romagna_Piacenza",
@@ -6939,8 +6939,8 @@
         "Emilia-Romagna",
         "Italia"
        ],
-       "s": 15113459,
-       "sha1_base64": "UL/xXL7/ChkVtd6m3Jwyt7ycjuY="
+       "s": 15147342,
+       "sha1_base64": "kNOT/n8XbBNp9/cZu5bW42QzML0="
       },
       {
        "id": "Italy_Emilia-Romagna_Ravenna",
@@ -6951,8 +6951,8 @@
         "Emilia-Romagna",
         "Italia"
        ],
-       "s": 17853803,
-       "sha1_base64": "JTP8CkqQPzGxsR1TaJ9TVQRErdE="
+       "s": 17940430,
+       "sha1_base64": "aaXngG6kqcNgk8agYh72B/dX5wQ="
       },
       {
        "id": "Italy_Emilia-Romagna_Reggio Emilia",
@@ -6963,8 +6963,8 @@
         "Emilia-Romagna",
         "Italia"
        ],
-       "s": 21810068,
-       "sha1_base64": "mpFI46avg1vLgP726i+lwm+LoMQ="
+       "s": 21920271,
+       "sha1_base64": "PvH9d0fkcdLk5MAl5Dnhzw+8Zq8="
       },
       {
        "id": "Italy_Emilia-Romagna_Rimini",
@@ -6975,8 +6975,8 @@
         "Emilia-Romagna",
         "Italia"
        ],
-       "s": 11430137,
-       "sha1_base64": "fW4xpwRceFj4tQqJ9ymZyFlPDAE="
+       "s": 11497508,
+       "sha1_base64": "C4+uxpxJXI7HvI4gHHu9F1wYGHk="
       }
      ]
     },
@@ -6992,8 +6992,8 @@
         "Friuli Venezia Giulia",
         "Italia"
        ],
-       "s": 7843895,
-       "sha1_base64": "SSNLyyhkrMEf93UU+CXqe/5Z4NA="
+       "s": 7897234,
+       "sha1_base64": "MNElf4Lfq0PcBHdeAUQfTKAULak="
       },
       {
        "id": "Italy_Friuli-Venezia Giulia_Pordenone",
@@ -7004,8 +7004,8 @@
         "Friuli Venezia Giulia",
         "Italia"
        ],
-       "s": 25938804,
-       "sha1_base64": "T3vFEBRD9BKHNCtGZE+5uJRL7Rg="
+       "s": 25999335,
+       "sha1_base64": "fLZXLvw5UDe9QVZmCO51yeDZofE="
       },
       {
        "id": "Italy_Friuli-Venezia Giulia_Trieste",
@@ -7016,8 +7016,8 @@
         "Friuli Venezia Giulia",
         "Italia"
        ],
-       "s": 8121600,
-       "sha1_base64": "JPYj0w3m10HBmtCOdlr2+U+dKzQ="
+       "s": 8215427,
+       "sha1_base64": "cQWjeWvmPw36NKhkbxk7YL+5hr8="
       },
       {
        "id": "Italy_Friuli-Venezia Giulia_Udine",
@@ -7028,8 +7028,8 @@
         "Friuli Venezia Giulia",
         "Italia"
        ],
-       "s": 54345360,
-       "sha1_base64": "Qn3w5XDlLxbCKqNuxb5bbFiQaAE="
+       "s": 54531931,
+       "sha1_base64": "rrAmtcyGHyd+jooQ2Gt8pc56QHM="
       }
      ]
     },
@@ -7051,8 +7051,8 @@
      "country_name_synonyms": [
       "Vatican City"
      ],
-     "s": 118963454,
-     "sha1_base64": "j7eOCDfCqeCmW1BfblKMGyu9gcY="
+     "s": 120182201,
+     "sha1_base64": "tv9/o5+vlzadIb+o9/NUFsPSEvA="
     },
     {
      "id": "Italy_Liguria",
@@ -7063,8 +7063,8 @@
       "Italia",
       "Liguria"
      ],
-     "s": 73180673,
-     "sha1_base64": "Trd36ml5pgN/3Uphwo5LIlBBy44="
+     "s": 73168341,
+     "sha1_base64": "qwSwzGZ0Xe/XLpa6Z9p1uNl7sFM="
     },
     {
      "id": "Italy_Lombardy",
@@ -7078,8 +7078,8 @@
         "Italia",
         "Lombardia"
        ],
-       "s": 31864142,
-       "sha1_base64": "YicSWu5yOEi+NkOmXKnaJWyUR+k="
+       "s": 32121457,
+       "sha1_base64": "1aKCozZrWwoTzjhpRq5WoizD7n4="
       },
       {
        "id": "Italy_Lombardy_Brescia",
@@ -7090,8 +7090,8 @@
         "Italia",
         "Lombardia"
        ],
-       "s": 46321125,
-       "sha1_base64": "BvHYH6p2oh6nLVYmpPcDkCqlRa8="
+       "s": 46816760,
+       "sha1_base64": "nUkuQsKf23N7HQ7wmOacX+vUtac="
       },
       {
        "id": "Italy_Lombardy_Como",
@@ -7102,8 +7102,8 @@
         "Italia",
         "Lombardia"
        ],
-       "s": 17979613,
-       "sha1_base64": "U12rS7Qk+1GsKw3N+TE5VsYlkTw="
+       "s": 18118432,
+       "sha1_base64": "73mQvowu4xzrfYEyVxBBEp7Bxkw="
       },
       {
        "id": "Italy_Lombardy_Cremona",
@@ -7114,8 +7114,8 @@
         "Italia",
         "Lombardia"
        ],
-       "s": 8809440,
-       "sha1_base64": "y1/VT17SNQbO7OWIZQKhnj5TNoc="
+       "s": 9013563,
+       "sha1_base64": "q7Z7xIRVXkktiyj2acyNFO/RL4M="
       },
       {
        "id": "Italy_Lombardy_Lecco",
@@ -7126,8 +7126,8 @@
         "Italia",
         "Lombardia"
        ],
-       "s": 13171892,
-       "sha1_base64": "rcUbf/qfAmdjYcfxP8U3hbgXgH8="
+       "s": 13272815,
+       "sha1_base64": "qn8U8ldzjWBkcajiE3SDHgO3FuU="
       },
       {
        "id": "Italy_Lombardy_Lodi",
@@ -7138,8 +7138,8 @@
         "Italia",
         "Lombardia"
        ],
-       "s": 7553703,
-       "sha1_base64": "mUFBbKJQcha8sqZhtVq+UViRXps="
+       "s": 7605226,
+       "sha1_base64": "OZ4jVxz72KxVflNO0F62j++TXY4="
       },
       {
        "id": "Italy_Lombardy_Mantua",
@@ -7150,8 +7150,8 @@
         "Italia",
         "Lombardia"
        ],
-       "s": 9782778,
-       "sha1_base64": "D2nV2ycJHj7t9kQSrz81ozVivi8="
+       "s": 9861501,
+       "sha1_base64": "JBh8sPvapRVIC8ww9t8eBXEDtTs="
       },
       {
        "id": "Italy_Lombardy_Milan",
@@ -7162,8 +7162,8 @@
         "Italia",
         "Lombardia"
        ],
-       "s": 42414297,
-       "sha1_base64": "Kkk6YKjz46NSiENs/LLCOVVF5io="
+       "s": 43180756,
+       "sha1_base64": "WuaG4JcyQWkZKtgZ86Il/EFbqcc="
       },
       {
        "id": "Italy_Lombardy_Monza and Brianza",
@@ -7174,8 +7174,8 @@
         "Italia",
         "Lombardia"
        ],
-       "s": 13120385,
-       "sha1_base64": "Qc2XhJllN7TfiuPHfwqafGRk4/0="
+       "s": 13344940,
+       "sha1_base64": "7zhMtLL7p+3n0uH0RalXZkkdAd0="
       },
       {
        "id": "Italy_Lombardy_Pavia",
@@ -7186,8 +7186,8 @@
         "Italia",
         "Lombardia"
        ],
-       "s": 33813086,
-       "sha1_base64": "eOeX+2GA1IIKbZuDsjHk/fkE/9Q="
+       "s": 34109801,
+       "sha1_base64": "4bxRoozhcomlWjsJZtqlnPS/jjM="
       },
       {
        "id": "Italy_Lombardy_Sondrio",
@@ -7198,8 +7198,8 @@
         "Italia",
         "Lombardia"
        ],
-       "s": 21113108,
-       "sha1_base64": "Tt0DvYSCxEl4piMoY7eT2ASpCiU="
+       "s": 21165703,
+       "sha1_base64": "F6wZg/OpZmW4lXMQTDSpFh8bxL4="
       },
       {
        "id": "Italy_Lombardy_Varese",
@@ -7210,8 +7210,8 @@
         "Italia",
         "Lombardia"
        ],
-       "s": 20934811,
-       "sha1_base64": "CI/7bNl+IkMeuByNAeNdBpXbSyA="
+       "s": 21196486,
+       "sha1_base64": "SN8prhJyJLYEsrJFdWtCmk+INic="
       }
      ]
     },
@@ -7224,8 +7224,8 @@
       "Italia",
       "Marche"
      ],
-     "s": 54176595,
-     "sha1_base64": "EJG0lv33Nh8jzzs/9py1zGkwYCA="
+     "s": 54583534,
+     "sha1_base64": "Ga+LtiqpHce/cFtHp/IY+0zlY1g="
     },
     {
      "id": "Italy_Molise",
@@ -7236,8 +7236,8 @@
       "Italia",
       "Molise"
      ],
-     "s": 15141489,
-     "sha1_base64": "vXzTGIo5IirTBKAQ5e88JJQGyig="
+     "s": 15211980,
+     "sha1_base64": "EADY7kMdYrxxfZ/JSOf/79NMfwM="
     },
     {
      "id": "Italy_Piemont",
@@ -7251,8 +7251,8 @@
         "Italia",
         "Piemonte"
        ],
-       "s": 27566574,
-       "sha1_base64": "v2oZLNhF1jiuM2W7Res8PzQuwyE="
+       "s": 27683281,
+       "sha1_base64": "5u/eSnSPxoT8M3ObkcnbbLL6x28="
       },
       {
        "id": "Italy_Piemont_Asti",
@@ -7263,8 +7263,8 @@
         "Italia",
         "Piemonte"
        ],
-       "s": 15456393,
-       "sha1_base64": "wsKPLrGVencL0LrrJtWOnDUcNVg="
+       "s": 15517140,
+       "sha1_base64": "cpEitUjLcd7Ta0jOydoXRn6Q908="
       },
       {
        "id": "Italy_Piemont_Biella",
@@ -7275,8 +7275,8 @@
         "Italia",
         "Piemonte"
        ],
-       "s": 13776336,
-       "sha1_base64": "WMCmJEJWmevwrabJETfRSQ64+dA="
+       "s": 13802811,
+       "sha1_base64": "yrf9pZnCrvJwkRoDBol/6CX95eg="
       },
       {
        "id": "Italy_Piemont_Cuneo",
@@ -7287,8 +7287,8 @@
         "Italia",
         "Piemonte"
        ],
-       "s": 62105730,
-       "sha1_base64": "WikNC7YQ8rMuAT5yQXjsskJkGcQ="
+       "s": 61640949,
+       "sha1_base64": "SK+asjkIN+dZoF1JFK/wPtkyT9U="
       },
       {
        "id": "Italy_Piemont_Novara",
@@ -7299,8 +7299,8 @@
         "Italia",
         "Piemonte"
        ],
-       "s": 14873330,
-       "sha1_base64": "xMvOQ2BABUTqXSxQpxymthTLc4k="
+       "s": 15122317,
+       "sha1_base64": "RoV8i6yQeNrEdY4qCqShuZsd/2c="
       },
       {
        "id": "Italy_Piemont_Torino",
@@ -7311,8 +7311,8 @@
         "Italia",
         "Piemonte"
        ],
-       "s": 71479907,
-       "sha1_base64": "pDq72WeQaJSKcXlfHbtT23H75j4="
+       "s": 72070670,
+       "sha1_base64": "FpChK1PsYhJvSo72VN1HJk+2Gg8="
       },
       {
        "id": "Italy_Piemont_Verbano-Cusio-Ossola",
@@ -7323,8 +7323,8 @@
         "Italia",
         "Piemonte"
        ],
-       "s": 20879395,
-       "sha1_base64": "42LkoEK/YGy/WDkWGamfam+kl6E="
+       "s": 20943094,
+       "sha1_base64": "qcMNL3HnJQIBXE3KkroaKlAYfSc="
       },
       {
        "id": "Italy_Piemont_Vercelli",
@@ -7335,8 +7335,8 @@
         "Italia",
         "Piemonte"
        ],
-       "s": 17426532,
-       "sha1_base64": "wimVgHZIgWQ6AyqulqPr5sL0G5I="
+       "s": 17586815,
+       "sha1_base64": "QnRTUZfYZctR298sxDHH3Ieh6Ig="
       }
      ]
     },
@@ -7359,8 +7359,8 @@
       "Sardigna/Sardegna",
       "Scoglio Il Catalano"
      ],
-     "s": 90189518,
-     "sha1_base64": "vEKg+k3/nE1QMKjPvf5b89lfKVM="
+     "s": 90762553,
+     "sha1_base64": "lQw8JbKiXyi+kDPVqGztmj0vLcM="
     },
     {
      "id": "Italy_Sicily",
@@ -7408,8 +7408,8 @@
       "Scoglio Palumbo",
       "Sicilia"
      ],
-     "s": 120853490,
-     "sha1_base64": "QvN+GCPCDO0I+fU4cuK2APKPaww="
+     "s": 122671413,
+     "sha1_base64": "eXzA3RtAbXqLpoaPLOCQ+0HGwZo="
     },
     {
      "id": "Italy_Trentino-Alto Adige Sudtirol",
@@ -7420,8 +7420,8 @@
       "Italia",
       "Trentino-Alto Adige/Südtirol"
      ],
-     "s": 108918246,
-     "sha1_base64": "uAmBYWDAVATEiX8DKSX0vbmlPag="
+     "s": 109903825,
+     "sha1_base64": "0amclpj45NE2xkgPpue+V57c5m4="
     },
     {
      "id": "Italy_Tuscany_Grosseto",
@@ -7438,8 +7438,8 @@
       "Le Scole",
       "Toscana"
      ],
-     "s": 68673220,
-     "sha1_base64": "RrwvYfnTGtmqOV3ygmN8GFAGdew="
+     "s": 69037631,
+     "sha1_base64": "/IxsltG42R2ZZz8VV0e5KC//ObI="
     },
     {
      "id": "Italy_Tuscany_Massa e Carrara",
@@ -7457,8 +7457,8 @@
       "Scoglio d'Africa",
       "Toscana"
      ],
-     "s": 124383441,
-     "sha1_base64": "OjhW/ih9dDMT7u+qT9GS6NmXJO4="
+     "s": 125340156,
+     "sha1_base64": "pdSLgaV+FyHnWb7N71WsN8jOPY8="
     },
     {
      "id": "Italy_Umbria",
@@ -7469,8 +7469,8 @@
       "Italia",
       "Umbria"
      ],
-     "s": 41379871,
-     "sha1_base64": "VmatWZci2QcB0J9gqpwqB460Z0k="
+     "s": 41568994,
+     "sha1_base64": "4m+DU/ijQIJSSFZC9JV+jZNS+aA="
     },
     {
      "id": "Italy_Veneto",
@@ -7484,8 +7484,8 @@
         "Italia",
         "Veneto"
        ],
-       "s": 28642012,
-       "sha1_base64": "YMudp815V0dMypsOdItaI7fhCdI="
+       "s": 28695615,
+       "sha1_base64": "VtlbSA1MVJxRXhBlxh7QHy4udRA="
       },
       {
        "id": "Italy_Veneto_Padova",
@@ -7496,8 +7496,8 @@
         "Italia",
         "Veneto"
        ],
-       "s": 29381780,
-       "sha1_base64": "0mD/Fv5fJ8Zw000rMAEnRXoj0Bk="
+       "s": 29648247,
+       "sha1_base64": "XCkR6MMM/O9ChvA1iG4n+AV9FoY="
       },
       {
        "id": "Italy_Veneto_Rovigo",
@@ -7508,8 +7508,8 @@
         "Italia",
         "Veneto"
        ],
-       "s": 9282170,
-       "sha1_base64": "OmRz1ecnG6/msewudrNrP8VpLfE="
+       "s": 9303637,
+       "sha1_base64": "13JV5cuu7SyBy4LvvU8k7yYM68I="
       },
       {
        "id": "Italy_Veneto_Treviso",
@@ -7520,8 +7520,8 @@
         "Italia",
         "Veneto"
        ],
-       "s": 37567272,
-       "sha1_base64": "adbCRZM1MUc4AREi6psGGTHv7ss="
+       "s": 37673907,
+       "sha1_base64": "SdKJOjKwo5LaScgL5Qlk7Q7T8cA="
       },
       {
        "id": "Italy_Veneto_Venezia",
@@ -7532,8 +7532,8 @@
         "Italia",
         "Veneto"
        ],
-       "s": 30745607,
-       "sha1_base64": "toqtbNsv9LnjLSs6jnkeWKrav6A="
+       "s": 31075002,
+       "sha1_base64": "FIAsp3s3KnCnnIWGFpLgW5E277c="
       },
       {
        "id": "Italy_Veneto_Verona",
@@ -7544,8 +7544,8 @@
         "Italia",
         "Veneto"
        ],
-       "s": 35601711,
-       "sha1_base64": "tWqiy5e8K7glPCi9Pv8n9nhljUw="
+       "s": 35898362,
+       "sha1_base64": "bLLp+1maLqhERcu/YQ4n37aLdNU="
       },
       {
        "id": "Italy_Veneto_Vicenza",
@@ -7556,8 +7556,8 @@
         "Italia",
         "Veneto"
        ],
-       "s": 38774534,
-       "sha1_base64": "fk63hqqOAsk+JAcMeZnXnbHMpP8="
+       "s": 38938041,
+       "sha1_base64": "YW46Ur/hTGTXejUBflSUj761g7A="
       }
      ]
     }
@@ -7571,8 +7571,8 @@
    "affiliations": [
     "Jamaica"
    ],
-   "s": 37404123,
-   "sha1_base64": "Y9q2l46iwFetM7Dq7quGHg3IMMQ="
+   "s": 37496206,
+   "sha1_base64": "U1/g1F/bh9xHL4XzLoa3E6EH3iA="
   },
   {
    "id": "Japan",
@@ -7590,8 +7590,8 @@
         "三重県",
         "愛知県"
        ],
-       "s": 79629943,
-       "sha1_base64": "hLq1JQ8oDTY8VRqyrWKPKUcFQ74="
+       "s": 80913682,
+       "sha1_base64": "9/0Klo1z8nZVrUoSQ9EYlL8lxZc="
       },
       {
        "id": "Japan_Chubu Region_Aichi_Toyohashi",
@@ -7602,8 +7602,8 @@
         "日本",
         "愛知県"
        ],
-       "s": 22639578,
-       "sha1_base64": "RJD6r3NWXbtpBXGfDENtYGMpFiA="
+       "s": 23006677,
+       "sha1_base64": "uX4/gioPdZtQOW/Xq+LmDEBLsn4="
       },
       {
        "id": "Japan_Chubu Region_Fukui",
@@ -7614,8 +7614,8 @@
         "日本",
         "福井県"
        ],
-       "s": 27217563,
-       "sha1_base64": "S2ISgBcqtcn54cYUNs1a34njV/w="
+       "s": 27388134,
+       "sha1_base64": "89ni13/1d1bcsny2L9C2DQ/MbF8="
       },
       {
        "id": "Japan_Chubu Region_Gifu",
@@ -7626,8 +7626,8 @@
         "日本",
         "岐阜県"
        ],
-       "s": 34523516,
-       "sha1_base64": "paBHzatz9xFAxOMRGY65qss7koU="
+       "s": 35040959,
+       "sha1_base64": "EX7U3mH1SqOp9fJ5vCikdNARxaE="
       },
       {
        "id": "Japan_Chubu Region_Ishikawa",
@@ -7638,8 +7638,8 @@
         "日本",
         "石川県"
        ],
-       "s": 28554577,
-       "sha1_base64": "z4l5OR5gdYOocbxSD8GlQ0W+TDU="
+       "s": 28786988,
+       "sha1_base64": "s+zA+f6Lh/SkbMPtmWHYg8G/j2Y="
       },
       {
        "id": "Japan_Chubu Region_Nagano",
@@ -7650,8 +7650,8 @@
         "長野県",
         "日本"
        ],
-       "s": 59384664,
-       "sha1_base64": "pziVKDRltu0lGVngz8GcXOcro7A="
+       "s": 59903355,
+       "sha1_base64": "iZyg/bDZnfOSNzlTMufg8CUidxA="
       },
       {
        "id": "Japan_Chubu Region_Niigata",
@@ -7663,8 +7663,8 @@
         "新潟県",
         "石川県"
        ],
-       "s": 48128335,
-       "sha1_base64": "PJHMc1c7hVsJYR2k4NqffWksd4o="
+       "s": 48672594,
+       "sha1_base64": "+OxFnqq2f1rnyKFOfT16eHUW4ws="
       },
       {
        "id": "Japan_Chubu Region_Shizuoka",
@@ -7675,8 +7675,8 @@
         "静岡県",
         "日本"
        ],
-       "s": 95560378,
-       "sha1_base64": "gyigUqTkl5BpcrCmZ6z6YkXTysc="
+       "s": 96250213,
+       "sha1_base64": "EX7MKjZKGlnkFaoL3eVkvDJCtE4="
       },
       {
        "id": "Japan_Chubu Region_Toyama",
@@ -7688,8 +7688,8 @@
         "富山県",
         "石川県"
        ],
-       "s": 26135538,
-       "sha1_base64": "d2y3Lml2gVdoMzRPAqN7yvgG46k="
+       "s": 26471933,
+       "sha1_base64": "EvPqz4XF7XszCBkhAcGLiZXGVmg="
       },
       {
        "id": "Japan_Chubu Region_Yamanashi",
@@ -7700,8 +7700,8 @@
         "日本",
         "山梨県"
        ],
-       "s": 24144283,
-       "sha1_base64": "xCKSkotS5R1jo8BUEsrnftMg6Bc="
+       "s": 24338102,
+       "sha1_base64": "eWjBTVL/SWXq3Re593wS9n+XzZk="
       }
      ]
     },
@@ -7717,8 +7717,8 @@
         "日本",
         "広島県"
        ],
-       "s": 67390990,
-       "sha1_base64": "DwKIoz1gLRuPl95gGOu1GWIkeIM="
+       "s": 68176257,
+       "sha1_base64": "3HacoaPqn+2OZCoR9ZzAHxg5eXI="
       },
       {
        "id": "Japan_Chugoku Region_Okayama",
@@ -7729,8 +7729,8 @@
         "日本",
         "岡山県"
        ],
-       "s": 44317440,
-       "sha1_base64": "uuShpotm4OD1u1FgpYHVuxfG2fE="
+       "s": 45695115,
+       "sha1_base64": "rtyW7pvfTlDD5J1y4/5prpXIZ/A="
       },
       {
        "id": "Japan_Chugoku Region_Shimane",
@@ -7741,8 +7741,8 @@
         "日本",
         "島根県"
        ],
-       "s": 29663260,
-       "sha1_base64": "XRI2Dghnc5CFz/5ySClyLOeHbXc="
+       "s": 29768639,
+       "sha1_base64": "Zf9tqSGWH28ExpWgL0weNl9WPOg="
       },
       {
        "id": "Japan_Chugoku Region_Tottori",
@@ -7753,8 +7753,8 @@
         "鳥取県",
         "日本"
        ],
-       "s": 26789617,
-       "sha1_base64": "g2dns/T/MMffWw2++2efmgZ7E5s="
+       "s": 26933964,
+       "sha1_base64": "Qx76yxrm4so3WPLfjwE2E6XDISY="
       },
       {
        "id": "Japan_Chugoku Region_Yamaguchi",
@@ -7765,8 +7765,8 @@
         "日本",
         "山口県"
        ],
-       "s": 29688876,
-       "sha1_base64": "WPEFMhbB/pLjdZaGrbhSEs9JUMg="
+       "s": 30410999,
+       "sha1_base64": "61wq+D5VKMInGIe8MmpX7hXsBjo="
       }
      ]
     },
@@ -7782,8 +7782,8 @@
         "日本",
         "北海道"
        ],
-       "s": 38602931,
-       "sha1_base64": "bTegnmFZK0IV2+cnWHiOx8z8qu4="
+       "s": 38725478,
+       "sha1_base64": "hQ/TIydK54l65Xe0TDNy0AqDaAY="
       },
       {
        "id": "Japan_Hokkaido Region_North",
@@ -7794,8 +7794,8 @@
         "日本",
         "北海道"
        ],
-       "s": 51658999,
-       "sha1_base64": "rQ6ezHo3pJF8pAkGqVV4mrOomNs="
+       "s": 51909970,
+       "sha1_base64": "+JQ074WYo5qR+vFf+Al7H6aMlIY="
       },
       {
        "id": "Japan_Hokkaido Region_West",
@@ -7806,8 +7806,8 @@
         "日本",
         "北海道"
        ],
-       "s": 35076412,
-       "sha1_base64": "FBA4lOnDpFp9k91PjQc6ki+k/4E="
+       "s": 35249191,
+       "sha1_base64": "NFnNY8/v5knMbS2P5qb9ved0y/I="
       },
       {
        "id": "Japan_Hokkaido Region_Sapporo",
@@ -7818,8 +7818,8 @@
         "日本",
         "北海道"
        ],
-       "s": 69499470,
-       "sha1_base64": "KGMp07Ti3LAHnErakF0WAnWICnc="
+       "s": 70015473,
+       "sha1_base64": "HP17oQMm4StHdS9KFcQG3FGfoto="
       }
      ]
     },
@@ -7837,8 +7837,8 @@
         "東京都",
         "神奈川県"
        ],
-       "s": 58900927,
-       "sha1_base64": "7JHfwxwke8kl0J3SyMWwQF7qPys="
+       "s": 59849226,
+       "sha1_base64": "o0cOcOSepkvuL1Rfx0qJ/71Ygf8="
       },
       {
        "id": "Japan_Kanto_Gunma",
@@ -7849,8 +7849,8 @@
         "日本",
         "群馬県"
        ],
-       "s": 31892620,
-       "sha1_base64": "oB0R8MfCyPYFqXDdsGWmqK3osyA="
+       "s": 32540103,
+       "sha1_base64": "KZx75AI6g6F1DPazvP1SQ9VFuIc="
       },
       {
        "id": "Japan_Kanto_Ibaraki",
@@ -7863,8 +7863,8 @@
         "千葉県",
         "福島県"
        ],
-       "s": 40691932,
-       "sha1_base64": "Bf6NDTxKL0TRyKJFsrjcdESqJgU="
+       "s": 41434247,
+       "sha1_base64": "jlQHPe2R2vdHfGmWjZb1OeNDojs="
       },
       {
        "id": "Japan_Kanto_Kanagawa",
@@ -7878,8 +7878,8 @@
         "東京都",
         "神奈川県"
        ],
-       "s": 95818345,
-       "sha1_base64": "HLlHRqboukXD1WS5G2eGLKly6N0="
+       "s": 97433476,
+       "sha1_base64": "K0cqFJUvV/901CBEUgKlEXrcOXU="
       },
       {
        "id": "Japan_Kanto_Saitama",
@@ -7890,8 +7890,8 @@
         "日本",
         "埼玉県"
        ],
-       "s": 70723076,
-       "sha1_base64": "G49OYzm87IcA3qMTetZTzDV6I44="
+       "s": 71948991,
+       "sha1_base64": "B/zjy7KpNJwBDAqeyRqp+vcaRrk="
       },
       {
        "id": "Japan_Kanto_Tochigi",
@@ -7902,8 +7902,8 @@
         "日本",
         "栃木県"
        ],
-       "s": 36101388,
-       "sha1_base64": "7Y1PJMpTBy1UsYvghfyxFFl9vyk="
+       "s": 36601591,
+       "sha1_base64": "dx9qQ5nz/+07VeonT6L7wpljp14="
       },
       {
        "id": "Japan_Kanto_Tokyo",
@@ -7915,8 +7915,8 @@
         "日本",
         "東京都"
        ],
-       "s": 115336964,
-       "sha1_base64": "fadi4vrwdaOmWFFef5XrdEC/f0c="
+       "s": 117892095,
+       "sha1_base64": "7ogSbbQsqFkvXodeXJ0YbqrItYY="
       }
      ]
     },
@@ -7933,8 +7933,8 @@
         "京都府",
         "滋賀県"
        ],
-       "s": 81400050,
-       "sha1_base64": "Ql0HzQ0i4sAQGRy/PuH5s2y9Tjo="
+       "s": 82419757,
+       "sha1_base64": "cl9WwSngf/lrjvFfNjvAXR0eZUM="
       },
       {
        "id": "Japan_Kinki Region_Mie",
@@ -7946,8 +7946,8 @@
         "三重県",
         "愛知県"
        ],
-       "s": 31946884,
-       "sha1_base64": "vC019MjlQ8P3lxne+OjLKK3Q7Q0="
+       "s": 32296143,
+       "sha1_base64": "YFNXCcu3/I+I16NBq66zb11mwQ4="
       },
       {
        "id": "Japan_Kinki Region_Nara",
@@ -7959,8 +7959,8 @@
         "奈良県",
         "和歌山県"
        ],
-       "s": 33602411,
-       "sha1_base64": "sL338qoJu1876JrLIRNWAiFlZEo="
+       "s": 33954054,
+       "sha1_base64": "34p/RxRkFnOx9bgB4o5GgWwJ0No="
       },
       {
        "id": "Japan_Kinki Region_Osaka_Osaka",
@@ -7972,8 +7972,8 @@
         "兵庫県",
         "大阪府"
        ],
-       "s": 99658874,
-       "sha1_base64": "8pKUwpZOp3A0r+H90dRXSJBzrTo="
+       "s": 101742989,
+       "sha1_base64": "EQraO1Jk5mjdhU0mpCqp5Ji0rT8="
       },
       {
        "id": "Japan_Kinki Region_Osaka_West",
@@ -7984,8 +7984,8 @@
         "日本",
         "兵庫県"
        ],
-       "s": 63939064,
-       "sha1_base64": "TIHYtaFDLH+f75F0VWsgwx4jO5I="
+       "s": 64645227,
+       "sha1_base64": "5pHG8nuM/+4g6Vy7T3dscFmAgQ4="
       },
       {
        "id": "Japan_Kinki Region_Wakayama",
@@ -7996,8 +7996,8 @@
         "日本",
         "和歌山県"
        ],
-       "s": 22554859,
-       "sha1_base64": "mG9CIOYY1rK3vndWHwBkLKLbAhM="
+       "s": 22778310,
+       "sha1_base64": "0bNUB811tjmQk1ZhRASggbnvFG0="
       }
      ]
     },
@@ -8013,8 +8013,8 @@
         "日本",
         "福岡県"
        ],
-       "s": 59994831,
-       "sha1_base64": "8gQnWFqGe7/6efKIIhc5v5aKeR4="
+       "s": 60594666,
+       "sha1_base64": "apnjFSghU9PPBalaCjYfgDSCH1U="
       },
       {
        "id": "Japan_Kyushu Region_Kagoshima",
@@ -8025,8 +8025,8 @@
         "日本",
         "鹿児島県"
        ],
-       "s": 31629388,
-       "sha1_base64": "9oLNn9sg4XmoT7/O/xP1HGVHgbA="
+       "s": 32662007,
+       "sha1_base64": "4qlehKCQTFgvE9JZY+h9KqCepfo="
       },
       {
        "id": "Japan_Kyushu Region_Kumamoto",
@@ -8037,8 +8037,8 @@
         "日本",
         "熊本県"
        ],
-       "s": 38975220,
-       "sha1_base64": "TYHYQqKc3rqaJ8aUe+TGppLxGr4="
+       "s": 39463991,
+       "sha1_base64": "MuS8/ed4eV+bXg7k1/SoqRKReFI="
       },
       {
        "id": "Japan_Kyushu Region_Miyazaki",
@@ -8049,8 +8049,8 @@
         "日本",
         "宮崎県"
        ],
-       "s": 21044082,
-       "sha1_base64": "uQWEy3LAmpyD5CxDabKqXFuFnQU="
+       "s": 21196813,
+       "sha1_base64": "IdCgTWcbkcpkgTVqP8yGclKh6C0="
       },
       {
        "id": "Japan_Kyushu Region_Nagasaki",
@@ -8061,8 +8061,8 @@
         "長崎県",
         "日本"
        ],
-       "s": 31801315,
-       "sha1_base64": "jwNQT+p8lVKvKrjTz0F1XGsLdlQ="
+       "s": 32151758,
+       "sha1_base64": "LxUeZyE+B5NfbM71Gfh3OPPeQ1s="
       },
       {
        "id": "Japan_Kyushu Region_Oita",
@@ -8073,8 +8073,8 @@
         "日本",
         "大分県"
        ],
-       "s": 27260404,
-       "sha1_base64": "xxSoJ9ijkq/cVH+wdU5Xxd1O8Iw="
+       "s": 27554847,
+       "sha1_base64": "vYHeBqFTqubJb5UDzyyfwwU3Xiw="
       },
       {
        "id": "Japan_Kyushu Region_Okinawa",
@@ -8085,8 +8085,8 @@
         "日本",
         "沖縄県"
        ],
-       "s": 23157063,
-       "sha1_base64": "l8UXGjk6Ma8Dotw6F2lf2tyNlng="
+       "s": 23461394,
+       "sha1_base64": "BXIE3lwKx6Ua7ytRhuAWStY8aJM="
       },
       {
        "id": "Japan_Kyushu Region_Saga",
@@ -8097,8 +8097,8 @@
         "日本",
         "佐賀県"
        ],
-       "s": 31671538,
-       "sha1_base64": "Q3XSJNr+FEWVrVf+UFCYcjw8X7o="
+       "s": 31794837,
+       "sha1_base64": "v0TN9UXgRmu1hYr6gab21A8/Llo="
       }
      ]
     },
@@ -8114,8 +8114,8 @@
         "日本",
         "愛媛県"
        ],
-       "s": 35492762,
-       "sha1_base64": "g9WipdSZUNDvU36XkKlt/T9Lyw4="
+       "s": 35692373,
+       "sha1_base64": "ooTzlBP6HVcvGAdhCU6b9IjaxuI="
       },
       {
        "id": "Japan_Shikoku Region_Kagawa",
@@ -8126,8 +8126,8 @@
         "香川県",
         "日本"
        ],
-       "s": 16093329,
-       "sha1_base64": "d4qZz36TMXXyWrr9CbCxlE2UDds="
+       "s": 16362316,
+       "sha1_base64": "0VVsT/xGA6+8k3/4yQaw4cGO6Po="
       },
       {
        "id": "Japan_Shikoku Region_Kochi",
@@ -8138,8 +8138,8 @@
         "高知県",
         "日本"
        ],
-       "s": 22272234,
-       "sha1_base64": "WlI8BY/qV9qfG2ZHGkeo5QchJeI="
+       "s": 22394253,
+       "sha1_base64": "Dbvgu2fOl7V0Mngd7XplIqEjPQw="
       },
       {
        "id": "Japan_Shikoku Region_Tokushima",
@@ -8150,8 +8150,8 @@
         "日本",
         "徳島県"
        ],
-       "s": 22507850,
-       "sha1_base64": "bqFoLzsZgX4sDAJqjx8dhw/W/aA="
+       "s": 22721277,
+       "sha1_base64": "/Aelfr6SjJxdH2i9dN83Wa1NN7Q="
       }
      ]
     },
@@ -8167,8 +8167,8 @@
         "日本",
         "秋田県"
        ],
-       "s": 47552126,
-       "sha1_base64": "0n0xxjPFhg0TQbcfc/mfERUtU9w="
+       "s": 47722289,
+       "sha1_base64": "jSDLS6tAiuUe5/eFyPoDbZxvuis="
       },
       {
        "id": "Japan_Tohoku_Aomori",
@@ -8179,8 +8179,8 @@
         "青森県",
         "日本"
        ],
-       "s": 33725075,
-       "sha1_base64": "UPIOlk13vY7dncuvkJTA1KIVmbo="
+       "s": 34027806,
+       "sha1_base64": "iaXPbZFI7VlKjJlOTxmyFSU+2AI="
       },
       {
        "id": "Japan_Tohoku_Fukushima",
@@ -8191,8 +8191,8 @@
         "日本",
         "福島県"
        ],
-       "s": 58245805,
-       "sha1_base64": "Znfekyydu2TEtGQbE+aygXrCPNQ="
+       "s": 58589704,
+       "sha1_base64": "s2TkPpahQzin68sN4ggYBKdpqm0="
       },
       {
        "id": "Japan_Tohoku_Iwate",
@@ -8203,8 +8203,8 @@
         "日本",
         "岩手県"
        ],
-       "s": 38565291,
-       "sha1_base64": "otQb4JxN9W52OSrRyF0nFxGaia4="
+       "s": 38863198,
+       "sha1_base64": "+fKZXw9E9Xxz5VUD07k3UkCZAAA="
       },
       {
        "id": "Japan_Tohoku_Miyagi",
@@ -8216,8 +8216,8 @@
         "宮城県",
         "福島県"
        ],
-       "s": 66114094,
-       "sha1_base64": "TfksCshYEVaxO3TxNnpRbJOWz2w="
+       "s": 66525049,
+       "sha1_base64": "lmiw/G0uiQw2y6T56vY3Q8NCNRA="
       },
       {
        "id": "Japan_Tohoku_Yamagata",
@@ -8228,8 +8228,8 @@
         "日本",
         "山形県"
        ],
-       "s": 25717187,
-       "sha1_base64": "vkDyPv/if9NEEox8I3tAJhl/98U="
+       "s": 25850694,
+       "sha1_base64": "wxsR7a/+0vQIYUwPJlqtYjKz5V4="
       }
      ]
     }
@@ -8252,8 +8252,8 @@
     "Queen's Rock",
     "The Islet"
    ],
-   "s": 2336291,
-   "sha1_base64": "rvljgmm/wRq59E4lLtTKtpGk3F4="
+   "s": 2355909,
+   "sha1_base64": "sbzjiT9AtolMVjlXUlktNIhCETk="
   },
   {
    "id": "Jordan",
@@ -8275,8 +8275,8 @@
     "Zarqa",
     "الأردن"
    ],
-   "s": 43725390,
-   "sha1_base64": "wSUh8f8UBpirQT+Mmj4FXYvRFn4="
+   "s": 43815913,
+   "sha1_base64": "whN1XrjS5b3fI8SG7x3bPa8Sk40="
   },
   {
    "id": "Kazakhstan",
@@ -8295,8 +8295,8 @@
       "Павлодарская область",
       "Карагандинская область"
      ],
-     "s": 93729787,
-     "sha1_base64": "GIhnpQzuwNnX02WdNlKAQYvUnFM="
+     "s": 94456094,
+     "sha1_base64": "eavA6+QTOV4lc/ouHK49LBe8CHs="
     },
     {
      "id": "Kazakhstan_South",
@@ -8316,8 +8316,8 @@
       "Мангистауская область",
       "Кызылординская область"
      ],
-     "s": 188353463,
-     "sha1_base64": "np+BtVahFH6MCSZRPS83BX2X4PE="
+     "s": 189394730,
+     "sha1_base64": "TlJxivw5qFlBlUfioQswSNuEnUY="
     }
    ]
   },
@@ -8376,8 +8376,8 @@
     "Wajir",
     "West Pokot"
    ],
-   "s": 364885532,
-   "sha1_base64": "BQjQ/WQ5ETN2vlUg/ZtoGB4NM6U="
+   "s": 365721600,
+   "sha1_base64": "7+K7ePTOUDEQo+1OUtlV0D+E8Tg="
   },
   {
    "id": "Kingdom of Lesotho",
@@ -8390,8 +8390,8 @@
    "country_name_synonyms": [
     "Lesotho"
    ],
-   "s": 99798759,
-   "sha1_base64": "btPmwoMinjodLYT6PgJSQLNeJts="
+   "s": 99960009,
+   "sha1_base64": "mbrlRxmXiRE53RwzZmhR8ExVGKk="
   },
   {
    "id": "Kiribati",
@@ -8401,8 +8401,8 @@
    "affiliations": [
     "Kiribati"
    ],
-   "s": 3064234,
-   "sha1_base64": "krHK4vWhoHuIVF+Xg3Cnlg0NfTQ="
+   "s": 3064228,
+   "sha1_base64": "qqM/mHM4K/vRccugrg4tUFglU8w="
   },
   {
    "id": "Kuwait",
@@ -8418,8 +8418,8 @@
     "الفروانية",
     "‏الكويت‎"
    ],
-   "s": 22227251,
-   "sha1_base64": "8fcdKwaTJO6vB8xpIP0o+GmMg5U="
+   "s": 22435054,
+   "sha1_base64": "XKK59b/gprdRSCBjZ4YflzlNCBI="
   },
   {
    "id": "Kyrgyzstan",
@@ -8440,8 +8440,8 @@
     "Чуйская область",
     "Кыргызстан"
    ],
-   "s": 81485577,
-   "sha1_base64": "k0ETc+yH8u1Ca6LehI9QcDwg7ow="
+   "s": 82058916,
+   "sha1_base64": "Xnk+kBP1Fzk1fr5WKGnEjliWl40="
   },
   {
    "id": "Laos",
@@ -8468,8 +8468,8 @@
     "ສະຫວັນນະເຂດ",
     "ນະຄອນຫຼວງວຽງຈັນ"
    ],
-   "s": 78482992,
-   "sha1_base64": "4p8MCewpxQE6aIkGFIAoXN+u0lU="
+   "s": 78600291,
+   "sha1_base64": "9Em05Pqg+N46uHKtNoAv5FcQEaU="
   },
   {
    "id": "Latvia",
@@ -8483,8 +8483,8 @@
     "Vidzeme",
     "Zemgale"
    ],
-   "s": 128168822,
-   "sha1_base64": "zYy5cxuQ1gast3J3Pte2ox1gZFQ="
+   "s": 130382049,
+   "sha1_base64": "pU/3acCtQA1ZoFfh5xaQ61A77gw="
   },
   {
    "id": "Lebanon",
@@ -8519,8 +8519,8 @@
     "قضاء البترون",
     "قضاء النبطية"
    ],
-   "s": 47126135,
-   "sha1_base64": "UDnnPZbh7xL7l/4LepOjwGHBPOw="
+   "s": 47170474,
+   "sha1_base64": "YQrbdCUBhBDdZeWRI95RtEbtl+c="
   },
   {
    "id": "Liberia",
@@ -8545,8 +8545,8 @@
     "River Gee County",
     "Sinoe County"
    ],
-   "s": 40291315,
-   "sha1_base64": "nt9ExpIH8B+qL6sS3ktRwq8Elyg="
+   "s": 40331029,
+   "sha1_base64": "jF3d6Vuf23OcOJuzXufiEdJQao4="
   },
   {
    "id": "Libya",
@@ -8578,8 +8578,8 @@
     "الواحات",
     "الزاوية"
    ],
-   "s": 152471465,
-   "sha1_base64": "jU+DReWHJMygOFkYZvEBVRrNgRw="
+   "s": 153050020,
+   "sha1_base64": "HugAwFjPpJKZHjJhviCmw5xcj0A="
   },
   {
    "id": "Liechtenstein",
@@ -8589,8 +8589,8 @@
    "affiliations": [
     "Liechtenstein"
    ],
-   "s": 3427111,
-   "sha1_base64": "Zg1rDQBOJrMLQv7zvST377WdgUU="
+   "s": 3434777,
+   "sha1_base64": "wnM0Au+WHjyfHAZX1Gyu1h7h6tA="
   },
   {
    "id": "Lithuania",
@@ -8607,8 +8607,8 @@
       "Utenos apskritis",
       "Vilniaus apskritis"
      ],
-     "s": 111233613,
-     "sha1_base64": "H/78DCmmIuREXUBEg2IvXBBE90I="
+     "s": 111723248,
+     "sha1_base64": "FE6lJjh+rD1dYpx9HugrbYO7WxA="
     },
     {
      "id": "Lithuania_West",
@@ -8624,8 +8624,8 @@
       "Tauragės apskritis",
       "Šiaulių apskritis"
      ],
-     "s": 92289140,
-     "sha1_base64": "HuEkHCSidUwl8Me0OFrWsDVVDBU="
+     "s": 92593759,
+     "sha1_base64": "ygdmXh6DanH0rM7iedDD6tWMeyo="
     }
    ]
   },
@@ -8637,8 +8637,8 @@
    "affiliations": [
     "Lëtzebuerg"
    ],
-   "s": 43983945,
-   "sha1_base64": "w8dcQNYMcZwm4h+TPKycG3ryGr4="
+   "s": 44346420,
+   "sha1_base64": "hiU+RVlAdA5IGOm3/X1nWnWjglk="
   },
   {
    "id": "Macedonia",
@@ -8659,8 +8659,8 @@
    "country_name_synonyms": [
     "North Macedonia"
    ],
-   "s": 30707364,
-   "sha1_base64": "0NcmaV/1eiGylVwhQRqR7q2udT0="
+   "s": 30856615,
+   "sha1_base64": "O/eXVowtFQhijZ25Sd34HQhi5cg="
   },
   {
    "id": "Madagascar",
@@ -8674,8 +8674,8 @@
     "Région de Sava",
     "Préfecture de police de Nosy Be"
    ],
-   "s": 394967841,
-   "sha1_base64": "9+j+Sc2xQRK0ptakt5WRgIySLPs="
+   "s": 395220797,
+   "sha1_base64": "H4gR3QksG975kXgkCaz+PANjx6I="
   },
   {
    "id": "Malawi",
@@ -8691,8 +8691,8 @@
     "Northern",
     "Southern"
    ],
-   "s": 150118457,
-   "sha1_base64": "pL5GA3dp5ixBtGXTeKSzH6hWTLk="
+   "s": 150510108,
+   "sha1_base64": "SFNyY3v2Nypc5lzToVgzXse8kbM="
   },
   {
    "id": "Malaysia",
@@ -8738,8 +8738,8 @@
     "Sarawak",
     "Singapura"
    ],
-   "s": 233141866,
-   "sha1_base64": "J0cdvkG/3NHOEVOnP2iFsmDyiAw="
+   "s": 236926022,
+   "sha1_base64": "hN5mC4iFV/yPb36TL9eqnCd5A88="
   },
   {
    "id": "Maldives",
@@ -8758,8 +8758,8 @@
     "Medhu-Uthuru Province",
     "ދިވެހިރާއްޖޭގެ ޖުމުހޫރިއްޔާ"
    ],
-   "s": 3948022,
-   "sha1_base64": "nq96MumorgVBWh6VHAkQ5WhtE08="
+   "s": 3925096,
+   "sha1_base64": "v3zPW7+jqQ2U5nSEDE0JyvhKMF0="
   },
   {
    "id": "Mali",
@@ -8778,8 +8778,8 @@
     "Ségou",
     "Tombouctou"
    ],
-   "s": 204457268,
-   "sha1_base64": "EPtweYbmWOg6kOr22lpftO16UFs="
+   "s": 204561064,
+   "sha1_base64": "YDP2LN+oSBRcCJcaEdCFM7lS4WQ="
   },
   {
    "id": "Malta",
@@ -8796,8 +8796,8 @@
     "Malta",
     "Malta"
    ],
-   "s": 8804022,
-   "sha1_base64": "wY8mSr5l5ZXt+N9JTgnoaz+t8xc="
+   "s": 8980169,
+   "sha1_base64": "yEg3UbeJhSyEgi4TOV3v6w70bx8="
   },
   {
    "id": "Marshall Islands",
@@ -8808,8 +8808,8 @@
     "Aolepān Aorōkin M̧ajeļ",
     "MH"
    ],
-   "s": 1581001,
-   "sha1_base64": "iQeTcaMH1dgXYJrnokly5FnQUM0="
+   "s": 1581481,
+   "sha1_base64": "Zqm2VleI79vwYjv9CQfyWcz7K3c="
   },
   {
    "id": "Mauritania",
@@ -8831,8 +8831,8 @@
     "إينشيري",
     "غيديماغا"
    ],
-   "s": 51371956,
-   "sha1_base64": "2sYwrKd+mySayf253LxcOWIC5L8="
+   "s": 51864030,
+   "sha1_base64": "MU/I4qZp9ZO+BYm57gZ32BdY+lU="
   },
   {
    "id": "Mauritius",
@@ -8867,8 +8867,8 @@
     "Île Deux Frères",
     "Île Frégate"
    ],
-   "s": 10530613,
-   "sha1_base64": "yxARzjszxJFBm74AXeQACYdA3Zg="
+   "s": 10570424,
+   "sha1_base64": "8uYx5sPC3Jjb5usrYyhdsFnyqkE="
   },
   {
    "id": "Mexico",
@@ -8887,8 +8887,8 @@
       "Colima",
       "Estados Unidos Mexicanos"
      ],
-     "s": 76032913,
-     "sha1_base64": "DdSKVktxQcdr3J6zXAqjIDkysNg="
+     "s": 76387836,
+     "sha1_base64": "40zEAXstgScLzVqBRIjUbZmIapY="
     },
     {
      "id": "Mexico_Central_East",
@@ -8902,8 +8902,8 @@
       "San Luis Potosí",
       "Tamaulipas"
      ],
-     "s": 75897203,
-     "sha1_base64": "wsmAVsf4PPjHi2DTDSRl2TPM4XQ="
+     "s": 77005598,
+     "sha1_base64": "lfqDgBb6rwBh2VAu29u6v9gyyZ8="
     },
     {
      "id": "Mexico_Central_West",
@@ -8920,8 +8920,8 @@
       "Sinaloa",
       "Zacatecas"
      ],
-     "s": 103859350,
-     "sha1_base64": "n/eD01OBqfMKsx+1fCDVwWGaTcE="
+     "s": 105296657,
+     "sha1_base64": "Sz3Ot0nqOcQOka3xr8I1ZU8Naz4="
     },
     {
      "id": "Mexico_East",
@@ -8939,8 +8939,8 @@
       "Veracruz de Ignacio de la Llave",
       "Yucatán"
      ],
-     "s": 80790180,
-     "sha1_base64": "wDcdnjsUVMPbRTlF4Jg1tXsdpsY="
+     "s": 81388439,
+     "sha1_base64": "yIiyFmFXjxikN3LZvIDvgdjttTo="
     },
     {
      "id": "Mexico_Mexico",
@@ -8957,8 +8957,8 @@
       "Tlaxcala",
       "Veracruz de Ignacio de la Llave"
      ],
-     "s": 191059089,
-     "sha1_base64": "lLRXyFAy6ZqvOBpbYjxgX6F3+tI="
+     "s": 194882029,
+     "sha1_base64": "z2mRHZE8Xk5TLmv0Tk8sO2kohT0="
     },
     {
      "id": "Mexico_Chihuahua",
@@ -8973,8 +8973,8 @@
       "Nuevo León",
       "Sinaloa"
      ],
-     "s": 86434170,
-     "sha1_base64": "d10UCH/PXIsW09yYxYZ2ZSavVaA="
+     "s": 86967621,
+     "sha1_base64": "Ydl6aG3yr4fbEOgjGPUqd4jzjmU="
     },
     {
      "id": "Mexico_Sonora",
@@ -8988,8 +8988,8 @@
       "Sinaloa",
       "Sonora"
      ],
-     "s": 62281257,
-     "sha1_base64": "2rUadSNmieCHUVKSGosFUzmhmqI="
+     "s": 62515252,
+     "sha1_base64": "jHTIQ7vkF6Hump18cbEzoGgXQOQ="
     },
     {
      "id": "Mexico_South",
@@ -9005,8 +9005,8 @@
       "Querétaro",
       "Veracruz de Ignacio de la Llave"
      ],
-     "s": 185822304,
-     "sha1_base64": "d4nLkx+bnEXaun/KJuq0VqwPXRQ="
+     "s": 187321915,
+     "sha1_base64": "ldh7+HOcfztRrdACf7+JYsXVvX0="
     }
    ]
   },
@@ -9020,8 +9020,8 @@
     "Moldova",
     "Приднестровье"
    ],
-   "s": 109727062,
-   "sha1_base64": "4fEp4+xA5RGuVDIHTbgOdPprrY8="
+   "s": 110423521,
+   "sha1_base64": "IUiNC5iFd/Odfew8P23ZDRgpHjg="
   },
   {
    "id": "Monaco",
@@ -9032,8 +9032,8 @@
     "France",
     "Monaco"
    ],
-   "s": 868297,
-   "sha1_base64": "7IU4zpMGktmbN9ftRcrqkvkeXyA="
+   "s": 874722,
+   "sha1_base64": "+9k2WanZQu5DpIqfbj6fDs9MonM="
   },
   {
    "id": "Mongolia",
@@ -9068,8 +9068,8 @@
     "Говьсүмбэр",
     "Өвөрхангай"
    ],
-   "s": 115637367,
-   "sha1_base64": "UI7gyUPNyziN62+nAkHQX4czaZU="
+   "s": 115940682,
+   "sha1_base64": "nO5C4G30eVh0g1rGA3CvTM+6ldM="
   },
   {
    "id": "Montenegro",
@@ -9079,8 +9079,8 @@
    "affiliations": [
     "Crna Gora"
    ],
-   "s": 35658317,
-   "sha1_base64": "q/LPcOQjYfHJW2qjSFkTZiWiMFU="
+   "s": 35853424,
+   "sha1_base64": "VG6JMpFpHb4Dy8ITgjV4pGnZSfY="
   },
   {
    "id": "Morocco",
@@ -9098,8 +9098,8 @@
       "Maroc ⵍⵎⵖⵔⵉⴱ المغرب",
       "Souss-Massa ⵙⵓⵙⵙ-ⵎⴰⵙⵙⴰ سوس-ماسة"
      ],
-     "s": 54736202,
-     "sha1_base64": "k4N2SPTBS3QgkEOLHBd9BQlc3GA="
+     "s": 54738156,
+     "sha1_base64": "UObmMHuNU8acLEmvXISv2LZj8ss="
     },
     {
      "id": "Morocco_Southern",
@@ -9115,8 +9115,8 @@
       "Oriental ⵜⴰⵏⴳⵎⵓⴹⵜ الشرقية",
       "Souss-Massa ⵙⵓⵙⵙ-ⵎⴰⵙⵙⴰ سوس-ماسة"
      ],
-     "s": 108575764,
-     "sha1_base64": "gPn4XA6ghHDczx1nI03ypN8OFcQ="
+     "s": 108684183,
+     "sha1_base64": "Jj6ZPKKhrtpIB/wDXA/Yq6+OsC4="
     },
     {
      "id": "Morocco_Doukkala-Abda",
@@ -9129,8 +9129,8 @@
       "Maroc ⵍⵎⵖⵔⵉⴱ المغرب",
       "Marrakech-Safi ⵎⵕⵕⴰⴽⵛ-ⴰⵙⴼⵉ مراكش-أسفي"
      ],
-     "s": 78593044,
-     "sha1_base64": "BGhdCbF1u9A2F/Uc7j0KPhqn8BQ="
+     "s": 78925519,
+     "sha1_base64": "w69xXTFq+4tQ6JX45IAPp+tTqhw="
     },
     {
      "id": "Morocco_Rabat-Sale-Zemmour-Zaer",
@@ -9144,8 +9144,8 @@
       "Rabat-Salé-Kénitra ⴻⵔⵔⴱⴰⵟ-ⵙⵍⴰ-ⵇⵏⵉⵟⵔⴰ الرباط-سلا-القنيطرة",
       "Tanger-Tétouan-Al Hoceima ⵟⴰⵏⵊ-ⵟⵉⵜⴰⵡⵉⵏ-ⵍⵃⵓⵙⵉⵎⴰ طنجة-تطوان-الحسيمة"
      ],
-     "s": 59359329,
-     "sha1_base64": "MF6cF/Hj2fh61lYJN/D9IOex3VA="
+     "s": 59484508,
+     "sha1_base64": "igCepLkMarW0djbyKx+N0B9gj6A="
     }
    ]
   },
@@ -9167,8 +9167,8 @@
     "Sofala",
     "Zambézia"
    ],
-   "s": 219054444,
-   "sha1_base64": "oDFUUq4vUx6+uqadjjfOvexrL7k="
+   "s": 219753095,
+   "sha1_base64": "jjEWzVly8T3w+5FBuy+3apAuYr0="
   },
   {
    "id": "Myanmar",
@@ -9193,8 +9193,8 @@
     "စစ်ကိုင်းတိုင်း (Sagaing)",
     "ပြည်ထောင်စုမြန်မာနိုင်ငံတော်‌"
    ],
-   "s": 325247888,
-   "sha1_base64": "N7Ztsun6HUdKDCn5FLSYIHxbDaM="
+   "s": 327020268,
+   "sha1_base64": "WTL86qDfeb6YaBLXPG9qMKNYX6Q="
   },
   {
    "id": "Namibia",
@@ -9226,8 +9226,8 @@
     "Zambezi Region",
     "ǁKaras Region"
    ],
-   "s": 81438242,
-   "sha1_base64": "5wV1jLJkeFQ+XHZ+LrrJJF2evkE="
+   "s": 82076549,
+   "sha1_base64": "cf7FTqKHY3ad4TPC7rFH7U0UbKY="
   },
   {
    "id": "Nauru",
@@ -9237,8 +9237,8 @@
    "affiliations": [
     "Naoero"
    ],
-   "s": 450967,
-   "sha1_base64": "njDVer5PyL1kQh5xwkc80OZSjSA="
+   "s": 451408,
+   "sha1_base64": "zK4cjOt5DONQ+VgqLWYp3b1XyWU="
   },
   {
    "id": "Nepal",
@@ -9254,8 +9254,8 @@
       "सुदुर पश्चिमाञ्चल विकास क्षेत्र",
       "पश्चिमाञ्चल विकास क्षेत्र"
      ],
-     "s": 223970124,
-     "sha1_base64": "vGLu9wV1ezpELlm379i8Q01xpLo="
+     "s": 224055094,
+     "sha1_base64": "iI/c6N/RC1Zs0HyGTnGya63aCHY="
     },
     {
      "id": "Nepal_Kathmandu",
@@ -9266,8 +9266,8 @@
       "मध्यमाञ्चल विकास क्षेत्र",
       "नेपाल"
      ],
-     "s": 51327399,
-     "sha1_base64": "ix4Au6/jGUxr3NIbxS05HHquNtY="
+     "s": 51793369,
+     "sha1_base64": "aSfwKhxyUj3//inS3J5g8rVukbU="
     },
     {
      "id": "Nepal_Madhyamanchal",
@@ -9278,8 +9278,8 @@
       "मध्यमाञ्चल विकास क्षेत्र",
       "नेपाल"
      ],
-     "s": 75908261,
-     "sha1_base64": "5+sh5VDvi2sol1C9a9N4uW8uS4k="
+     "s": 75929023,
+     "sha1_base64": "a57YyHrQWP7m1eWmTGsnHTqAJ/w="
     },
     {
      "id": "Nepal_Purwanchal",
@@ -9290,8 +9290,8 @@
       "पुर्वाञ्चल विकास क्षेत्र",
       "नेपाल"
      ],
-     "s": 112649927,
-     "sha1_base64": "5vGiUwJnE6t7s+/8bs7Qgm9IyuI="
+     "s": 112687641,
+     "sha1_base64": "F/qgA9C0RsdH+8kp7mjABJDPyig="
     }
    ]
   },
@@ -9321,8 +9321,8 @@
     "Región Autónoma de la Costa Caribe Sur",
     "Rivas"
    ],
-   "s": 61908457,
-   "sha1_base64": "7XN4LouXnIL7y8dI8og93N9K64M="
+   "s": 62271932,
+   "sha1_base64": "ucTa0kOOeNwIx1X7oN3yya67dg8="
   },
   {
    "id": "Niger",
@@ -9340,8 +9340,8 @@
     "Tillabéri",
     "Zinder"
    ],
-   "s": 114356583,
-   "sha1_base64": "ZhQZw4wXoCfQoyFxMyRUaY4GJMI="
+   "s": 114423730,
+   "sha1_base64": "qQtQR3gIRQUyTF3SMpEDvBlqKSc="
   },
   {
    "id": "Nigeria",
@@ -9382,8 +9382,8 @@
       "Rivers",
       "Taraba"
      ],
-     "s": 470529728,
-     "sha1_base64": "pdq5GfHsNGoz0TIwn+pjl7hFt7g="
+     "s": 472007044,
+     "sha1_base64": "d+rbYGo/RfjVaJScDGbFH/PuZQw="
     },
     {
      "id": "Nigeria_North",
@@ -9404,8 +9404,8 @@
       "Yobe",
       "Zamfara"
      ],
-     "s": 226028233,
-     "sha1_base64": "L8WEdoCAHKbzk7YSwNrN6zWl3nY="
+     "s": 226167236,
+     "sha1_base64": "eFX33zm7miB0UUKM93GMzK/e7l4="
     }
    ]
   },
@@ -9418,7 +9418,7 @@
     "Niuē"
    ],
    "s": 517408,
-   "sha1_base64": "nJwY6aAnvEAonMa/t4jx2EU9yNU="
+   "sha1_base64": "wjMPO7DNa9+jyOclsCt1vLKZsdg="
   },
   {
    "id": "North Korea",
@@ -9439,8 +9439,8 @@
     "평양직할시",
     "조선민주주의인민공화국"
    ],
-   "s": 97712057,
-   "sha1_base64": "kbLcDbQVxeDeC5vHZxhrYV4tsz8="
+   "s": 98288900,
+   "sha1_base64": "blc/m0hMaWcij/6FKdGzaophC+I="
   },
   {
    "id": "Norway",
@@ -9455,8 +9455,8 @@
       "Norge",
       "Troms"
      ],
-     "s": 248837843,
-     "sha1_base64": "AGdjPdRNnAAdXtN/jsSaFTWyCg8="
+     "s": 248936406,
+     "sha1_base64": "IEIBnCDSiJ4Cu9/ab5xM60ARkaM="
     },
     {
      "id": "Norway_Hordaland",
@@ -9467,8 +9467,8 @@
       "Hordaland",
       "Norge"
      ],
-     "s": 84124144,
-     "sha1_base64": "VsSDuDEI0KkLeBOQo3F4Mj61vIU="
+     "s": 84362347,
+     "sha1_base64": "SU7XEaxtdibCuuNeXOdRbFEAliQ="
     },
     {
      "id": "Norway_Nordland",
@@ -9480,8 +9480,8 @@
       "Norge",
       "Troms"
      ],
-     "s": 192639402,
-     "sha1_base64": "BVa4ckDakoeHmMOLQMfXpYdPG8g="
+     "s": 192739566,
+     "sha1_base64": "2K0Q/rqPYceIkIP26xJtRJXwvQU="
     },
     {
      "id": "Norway_Svalbard",
@@ -9492,8 +9492,8 @@
       "Norge",
       "Svalbard"
      ],
-     "s": 18019862,
-     "sha1_base64": "WYzV9o6v30Zd4Ph5CIiEudiiOjQ="
+     "s": 18036872,
+     "sha1_base64": "0lo+QdhmccJ+kkOV39CPMxXll/A="
     },
     {
      "id": "Norway_Oppland",
@@ -9504,8 +9504,8 @@
       "Norge",
       "Oppland"
      ],
-     "s": 98257363,
-     "sha1_base64": "1Y7pIW77ndeZvqNVZtwkFVM0wAE="
+     "s": 98377438,
+     "sha1_base64": "kmmUg9RWz3I5AUdJDrkOVdeWrYQ="
     },
     {
      "id": "Norway_Rogaland",
@@ -9516,8 +9516,8 @@
       "Norge",
       "Rogaland"
      ],
-     "s": 70401385,
-     "sha1_base64": "BAbqV9sVVURogOXak0aARMGcC9k="
+     "s": 70509164,
+     "sha1_base64": "rkUTAIhMvLOQaKozz1+HsTUjlYw="
     },
     {
      "id": "Norway_Hedmark",
@@ -9528,8 +9528,8 @@
       "Hedmark",
       "Norge"
      ],
-     "s": 100815970,
-     "sha1_base64": "0nwcO791r/zpD3K0y0uokEkhO6Y="
+     "s": 100923493,
+     "sha1_base64": "NDfg5LD6n4FlTh8z/7S7Fas1atQ="
     },
     {
      "id": "Norway_Jan Mayen",
@@ -9538,7 +9538,7 @@
       "Norge"
      ],
      "s": 1194081,
-     "sha1_base64": "OA/dZFJptakOK0ESLswnyrsX0uE="
+     "sha1_base64": "py6T7NoXCodmrvvp0g2GQTWLjDo="
     },
     {
      "id": "Norway_North Trondelag",
@@ -9550,8 +9550,8 @@
       "Norge",
       "Sør-Trøndelag"
      ],
-     "s": 128268822,
-     "sha1_base64": "YH9oICmCC7MqoFv8b7jm/pk8QYg="
+     "s": 128500977,
+     "sha1_base64": "Ek7Ug3CBgA4g38cBZ7W/IZ5KUsE="
     },
     {
      "id": "Norway_South Trondelag",
@@ -9562,8 +9562,8 @@
       "Norge",
       "Sør-Trøndelag"
      ],
-     "s": 79327209,
-     "sha1_base64": "Pe2L/MKbUkor/T1Jw6l00bQY0LQ="
+     "s": 79538836,
+     "sha1_base64": "5Zlgyc8GOG6eHnWafxQZe+x0/jQ="
     },
     {
      "id": "Norway_Southern",
@@ -9578,8 +9578,8 @@
       "Vest-Agder",
       "Vestfold"
      ],
-     "s": 241280783,
-     "sha1_base64": "gqiWnw14y5PCrffUHoBTtPr030I="
+     "s": 241657690,
+     "sha1_base64": "EBdSB5+2yHswXLzGzzeISluO8sU="
     },
     {
      "id": "Norway_Western",
@@ -9591,8 +9591,8 @@
       "Norge",
       "Sogn og Fjordane"
      ],
-     "s": 132407874,
-     "sha1_base64": "Zk5CD5GHaZV1FvkvipV7d71X5uY="
+     "s": 132590374,
+     "sha1_base64": "D+/6m+xs5eRnxr5hjpCwasy69wc="
     },
     {
      "id": "Norway_Central",
@@ -9605,8 +9605,8 @@
       "Norge",
       "Oslo"
      ],
-     "s": 159353398,
-     "sha1_base64": "p187MrRazgJYtaG/yMh+wzQTX48="
+     "s": 159817353,
+     "sha1_base64": "wWLsnWh+poOFOf9jlLqjraL4wbM="
     },
     {
      "id": "Norway_Bouvet Island",
@@ -9618,7 +9618,7 @@
       "Norge"
      ],
      "s": 175967,
-     "sha1_base64": "uVzgOe2BELIYvT0wbghEzg0ABuo="
+     "sha1_base64": "P81kZ08zeXPnK9bYjgfcsY9Oa3E="
     }
    ]
   },
@@ -9640,8 +9640,8 @@
     "‏سلطنة عمان‎",
     "محافظة البريمي"
    ],
-   "s": 43627872,
-   "sha1_base64": "jFHyKy6pQJY+FlwXZ74tTfiqhC0="
+   "s": 43783371,
+   "sha1_base64": "pUbHcQiV8ER2Q4+dRbhA6K3Y6ZU="
   },
   {
    "id": "Pakistan",
@@ -9659,8 +9659,8 @@
     "بلوچستان / Balochistan",
     "‏پاکستان‎"
    ],
-   "s": 242441815,
-   "sha1_base64": "P67obXWmuVaTR/84jbUpvowvftc="
+   "s": 243020554,
+   "sha1_base64": "6RLkvGCkBeIahX50VJ6zaVy3S9E="
   },
   {
    "id": "Palau",
@@ -9671,8 +9671,8 @@
     "Belau",
     "PW"
    ],
-   "s": 1618068,
-   "sha1_base64": "iHzRzthbCvvfV0XKzpgrUzRkykk="
+   "s": 1636005,
+   "sha1_base64": "oVXzArcCON6e36Zy9oGcvByLDS0="
   },
   {
    "id": "Panama",
@@ -9699,8 +9699,8 @@
     "Panamá",
     "Veraguas"
    ],
-   "s": 42325717,
-   "sha1_base64": "HRnvk6cu+H8EC4jprsUBywz5J+I="
+   "s": 42517976,
+   "sha1_base64": "qvqk2+rspoh+azIBo6Jcz3kV5gQ="
   },
   {
    "id": "Papua New Guinea",
@@ -9733,8 +9733,8 @@
     "Western",
     "Western Highlands"
    ],
-   "s": 77219790,
-   "sha1_base64": "fWZIbAXVt24NKVRztaYanYvSXas="
+   "s": 77486704,
+   "sha1_base64": "2gS3Wd8CTKCMc0/OzlVqzwALExY="
   },
   {
    "id": "Paraguay",
@@ -9764,8 +9764,8 @@
     "Presidente Hayes",
     "San Pedro"
    ],
-   "s": 98799060,
-   "sha1_base64": "X2VEjPDL0/2ToiU7uMhK6Sjh5UY="
+   "s": 99530495,
+   "sha1_base64": "heOixxajKrYucf+SrrpD3d87JQo="
   },
   {
    "id": "People's Republic of China",
@@ -9782,8 +9782,8 @@
       "中国",
       "安徽省"
      ],
-     "s": 50798814,
-     "sha1_base64": "rh+Ga5/OkOmUhKQdUeCfP8NW+yY="
+     "s": 51171818,
+     "sha1_base64": "8s4RqwkrLIaYEJQq/tBGKM2W34M="
     },
     {
      "id": "China_Chongqing",
@@ -9794,8 +9794,8 @@
       "重庆市",
       "中国"
      ],
-     "s": 46633356,
-     "sha1_base64": "Z+n6ib4OsNKDIetR08W/tuyGAGs="
+     "s": 46779695,
+     "sha1_base64": "R/yvpd6TWPT+mPXUgYvkDgbSHew="
     },
     {
      "id": "China_Fujian",
@@ -9806,8 +9806,8 @@
       "中国",
       "福建省"
      ],
-     "s": 60848638,
-     "sha1_base64": "8+o2Gdj/pseqpitvLkJgnuoWmzk="
+     "s": 61489202,
+     "sha1_base64": "7o6mFFw1dyYHKRSogN980hXryZ4="
     },
     {
      "id": "China_Gansu",
@@ -9818,8 +9818,8 @@
       "中国",
       "甘肃省"
      ],
-     "s": 111536499,
-     "sha1_base64": "HwN5vkVohmdoEPtGWHyjzUefXD0="
+     "s": 111932894,
+     "sha1_base64": "Oqj+yUPRn6oGA0rTKp79Bag2NPE="
     },
     {
      "id": "China_Guangdong",
@@ -9834,8 +9834,8 @@
      "country_name_synonyms": [
       "Hong Kong"
      ],
-     "s": 268734227,
-     "sha1_base64": "Dayw4+dyt/lRiwAwblZ83e2llik="
+     "s": 271913348,
+     "sha1_base64": "r5SozDK7JTfC3WNpg2YGKZw9m3k="
     },
     {
      "id": "China_Guangxi",
@@ -9846,8 +9846,8 @@
       "广西壮族自治区",
       "中国"
      ],
-     "s": 93116700,
-     "sha1_base64": "dJE/AiBW0nzJA/TVKvK2VjAq2Qo="
+     "s": 93609471,
+     "sha1_base64": "Bs285xhOu3tKIph4G26+lPkYc1s="
     },
     {
      "id": "China_Guizhou",
@@ -9858,8 +9858,8 @@
       "贵州省",
       "中国"
      ],
-     "s": 51141853,
-     "sha1_base64": "AjszAlFsD6/goN0Ax3GWOEG40BA="
+     "s": 51353065,
+     "sha1_base64": "Y6lIAY2SLFxTd5Rjxn3f+JKnFwg="
     },
     {
      "id": "China_Hebei",
@@ -9872,8 +9872,8 @@
       "天津市",
       "河北省"
      ],
-     "s": 138080957,
-     "sha1_base64": "AGpsaO2p1tSwHDYG70ywNmzXmpA="
+     "s": 140585600,
+     "sha1_base64": "2A06spvEzKyp2lhxHwxqOncAwq8="
     },
     {
      "id": "China_Heilongjiang",
@@ -9884,8 +9884,8 @@
       "中国",
       "黑龙江省"
      ],
-     "s": 60106454,
-     "sha1_base64": "24szDvyT8z1rjpFHptR++Ds8314="
+     "s": 60306057,
+     "sha1_base64": "PBnQcSyN7u4tL5WPbBMJGTOZt1k="
     },
     {
      "id": "China_Henan",
@@ -9896,8 +9896,8 @@
       "中国",
       "河南省"
      ],
-     "s": 66190137,
-     "sha1_base64": "M8eqN5KT2qm8/8ArytVl7SPnKr4="
+     "s": 66803916,
+     "sha1_base64": "mgY6AyAROL7Co9KlMVKZZDdsfLY="
     },
     {
      "id": "China_Hubei",
@@ -9909,8 +9909,8 @@
       "中国",
       "湖北省"
      ],
-     "s": 78656234,
-     "sha1_base64": "TrWjJGwFjBKuItiZLcH1bNvhbQE="
+     "s": 78960333,
+     "sha1_base64": "ZpH/RxevBiPR4p9JuOqQ4RBX/Yw="
     },
     {
      "id": "China_Hunan",
@@ -9921,8 +9921,8 @@
       "中国",
       "湖南省"
      ],
-     "s": 78646937,
-     "sha1_base64": "qxMPdiH4C4/ICYlf04SM1gkFgBc="
+     "s": 78942452,
+     "sha1_base64": "kOn0RGZ7MsjuIaHJPNsau7v0/Hw="
     },
     {
      "id": "China_Inner Mongolia",
@@ -9933,8 +9933,8 @@
       "中国",
       "内蒙古自治区 / Inner Mongolia"
      ],
-     "s": 86238647,
-     "sha1_base64": "1wHzWflJY3iLqwmrSuFrQoSwlGM="
+     "s": 87282674,
+     "sha1_base64": "2qmKe9PEQdfjVnQQJnU56nMa00M="
     },
     {
      "id": "China_Jiangsu",
@@ -9946,8 +9946,8 @@
       "江苏省",
       "秦山岛"
      ],
-     "s": 93376725,
-     "sha1_base64": "cvNUR/fYPcxmNYoyVSYQTSID4I4="
+     "s": 94256248,
+     "sha1_base64": "0uCWVU0IXbl6bVH90KxXFPCCZaQ="
     },
     {
      "id": "China_Jiangxi",
@@ -9958,8 +9958,8 @@
       "中国",
       "江西省"
      ],
-     "s": 67619088,
-     "sha1_base64": "Rop218UvbALZLmb2QWmhGRQlgt8="
+     "s": 67862803,
+     "sha1_base64": "CTqM+BqV2jgha06JnIaSMHgyLZ8="
     },
     {
      "id": "China_Jilin",
@@ -9970,8 +9970,8 @@
       "中国",
       "吉林省"
      ],
-     "s": 39803868,
-     "sha1_base64": "5k4ndseesTXGNTvU2z4bcibkBJ8="
+     "s": 40376447,
+     "sha1_base64": "cTUTs75TCh5rz6Xq9K1M8r5mgJw="
     },
     {
      "id": "China_Liaoning",
@@ -9982,8 +9982,8 @@
       "辽宁省",
       "中国"
      ],
-     "s": 40127205,
-     "sha1_base64": "wi8hCLt+26l5viJ9HCUeOyoOmd4="
+     "s": 40685800,
+     "sha1_base64": "FfVQWOaXi8s16tjSFEaRcuwmdGQ="
     },
     {
      "id": "China_Ningxia Hui",
@@ -9994,8 +9994,8 @@
       "宁夏回族自治区",
       "中国"
      ],
-     "s": 14833821,
-     "sha1_base64": "ZiXB+49cnkw4k+eEbKD3UBPqbiE="
+     "s": 14935821,
+     "sha1_base64": "NDBagRZQgOEAegYwQFoI7GZaAkY="
     },
     {
      "id": "China_Qinghai",
@@ -10006,8 +10006,8 @@
       "青海省",
       "中国"
      ],
-     "s": 77134702,
-     "sha1_base64": "jCDvea0iOXFHiKcOqcyYivWKgYI="
+     "s": 77739689,
+     "sha1_base64": "cKVQimAWNMUtU/uEH9mD5bDGGZM="
     },
     {
      "id": "China_Shaanxi",
@@ -10018,8 +10018,8 @@
       "陕西省",
       "中国"
      ],
-     "s": 93908473,
-     "sha1_base64": "7JarebxXiM8fxyOPjagxPpVin1A="
+     "s": 94476556,
+     "sha1_base64": "bR1SgY40UQV70ThjA/jWAC8coPA="
     },
     {
      "id": "China_Shandong",
@@ -10030,8 +10030,8 @@
       "中国",
       "山东省"
      ],
-     "s": 87135843,
-     "sha1_base64": "3DjScx5+2Gc2HUP3V/N85EWIrQQ="
+     "s": 87954246,
+     "sha1_base64": "QVwe4iDvshrets5BXAHtDK4md7I="
     },
     {
      "id": "China_Shanghai",
@@ -10043,8 +10043,8 @@
       "上海市",
       "浙江省"
      ],
-     "s": 29677700,
-     "sha1_base64": "mtgfoIQxeUSXaiejzqG+F2+IQyY="
+     "s": 30615911,
+     "sha1_base64": "c49pRsts9T4qBzaW9JWcG9HnR8c="
     },
     {
      "id": "China_Shanxi",
@@ -10055,8 +10055,8 @@
       "中国",
       "山西省"
      ],
-     "s": 53802630,
-     "sha1_base64": "tHWKOD9kqsqeb7uQgQzggPTF2pY="
+     "s": 54209705,
+     "sha1_base64": "P0CqEfbuWaR0tJK4lLMqbE0tpeo="
     },
     {
      "id": "China_Sichuan",
@@ -10067,8 +10067,8 @@
       "中国",
       "四川省"
      ],
-     "s": 204562131,
-     "sha1_base64": "keP/a6YE36WjQ1bH+tXC1VB9Q8k="
+     "s": 205325990,
+     "sha1_base64": "dwX1to7nlbayXmFXWo0xs69u3xk="
     },
     {
      "id": "China_Tibet Autonomous Region",
@@ -10079,8 +10079,8 @@
       "中国",
       "西藏自治区 (བོད་རང་སྐྱོང་ལྗོངས་)"
      ],
-     "s": 128653062,
-     "sha1_base64": "/lyUXD9J0PP8zJP7BcxKxXl4Sno="
+     "s": 129063993,
+     "sha1_base64": "+ufnFV/knmdeomYyQOz0Cng340c="
     },
     {
      "id": "China_Xinjiang",
@@ -10091,8 +10091,8 @@
       "中国",
       "新疆维吾尔自治区"
      ],
-     "s": 147710540,
-     "sha1_base64": "EqEb5am1c7Ef+5ZgghpFSq0JdIw="
+     "s": 147973863,
+     "sha1_base64": "lOtw1vxULK+WFXT/NqnzZuvwNHM="
     },
     {
      "id": "China_Yunnan",
@@ -10103,8 +10103,8 @@
       "中国",
       "云南省"
      ],
-     "s": 161306988,
-     "sha1_base64": "19zltkq9gxc2c1A15KXmtvC57wk="
+     "s": 162211351,
+     "sha1_base64": "OpYhnBPCkLaGR9gE+dfTWIJFQe4="
     },
     {
      "id": "China_Zhejiang",
@@ -10115,8 +10115,8 @@
       "中国",
       "浙江省"
      ],
-     "s": 108520525,
-     "sha1_base64": "QK3o/bN9LHcB9Lz/QJzqx4AGiVY="
+     "s": 109501600,
+     "sha1_base64": "Yaq3+T/QbNqv7+qcTCWTYGJm1vo="
     }
    ]
   },
@@ -10138,8 +10138,8 @@
       "臺北市",
       "中華民國"
      ],
-     "s": 260606301,
-     "sha1_base64": "yh/H8PiVuZb/Oqv8t4mBmGm7fQU="
+     "s": 263575201,
+     "sha1_base64": "TQJ7x3pXge+7OaX87oSxXdyeG3o="
     },
     {
      "id": "Taiwan_South",
@@ -10152,8 +10152,8 @@
       "臺中市",
       "中華民國"
      ],
-     "s": 190961429,
-     "sha1_base64": "2yy5QyzO9P0cGbz2m+N4yfJA77s="
+     "s": 193426769,
+     "sha1_base64": "cWRvwJl9xDRp45g9IkhZ9PomlrM="
     }
    ]
   },
@@ -10180,8 +10180,8 @@
       "Tumbes",
       "Ucayali"
      ],
-     "s": 164365716,
-     "sha1_base64": "qSNV23tpTUyR4ACO2xi9CJD2ctg="
+     "s": 164736703,
+     "sha1_base64": "ecq4Q3RaXiD35xhEbjquyy/tplY="
     },
     {
      "id": "Peru_Lima",
@@ -10196,8 +10196,8 @@
       "Lima",
       "Perú"
      ],
-     "s": 77777722,
-     "sha1_base64": "e8/4r6Q/9s62P5RwU1xqZwLyyDU="
+     "s": 79082685,
+     "sha1_base64": "RmrSUoEQOrDm+r/aEJ3bDudw6qs="
     },
     {
      "id": "Peru_South",
@@ -10215,8 +10215,8 @@
       "Puno",
       "Tacna"
      ],
-     "s": 135870557,
-     "sha1_base64": "IzalMVF4m1FmrS8XRXhRezzex8s="
+     "s": 136196736,
+     "sha1_base64": "hnJHTC3iTeF6FmDG7nXDPtsDNyw="
     }
    ]
   },
@@ -10262,8 +10262,8 @@
       "Zamboanga del Norte",
       "Zamboanga del Sur"
      ],
-     "s": 130217702,
-     "sha1_base64": "/iIfkPEmE6hm+Yl2fbA2ryo+cQ4="
+     "s": 130805033,
+     "sha1_base64": "3MOLEk2aArZkfghBSAcWefKTXYM="
     },
     {
      "id": "Philippines_Visayas",
@@ -10294,8 +10294,8 @@
       "Southern Leyte",
       "Sorsogon"
      ],
-     "s": 111031139,
-     "sha1_base64": "l3tW9lXAfWPkMSBhi2eGDtrvm9g="
+     "s": 111517406,
+     "sha1_base64": "4abVGVg0jMZfMF68ZnqIn8XcHcc="
     },
     {
      "id": "Philippines_Luzon_South",
@@ -10318,8 +10318,8 @@
       "Sorsogon",
       "太平島"
      ],
-     "s": 26194513,
-     "sha1_base64": "DvHbNpkt40EvNOXDKtVW+KX0nWk="
+     "s": 26230260,
+     "sha1_base64": "XaFFDd7m/PDMZPIuilMoUQgxLAs="
     },
     {
      "id": "Philippines_Luzon_Manila",
@@ -10341,8 +10341,8 @@
       "Rizal",
       "Sorsogon"
      ],
-     "s": 155456005,
-     "sha1_base64": "GiL8JGpgBfA8uQ9vXLeoUyf0oLg="
+     "s": 157993673,
+     "sha1_base64": "YI13BiGyh8FzSetivLJ0feA5x/4="
     },
     {
      "id": "Philippines_Luzon_North",
@@ -10378,8 +10378,8 @@
       "Zambales",
       "海南省"
      ],
-     "s": 184534409,
-     "sha1_base64": "WU6cHnOMmB89xRm1arpjeZnFQUQ="
+     "s": 185243124,
+     "sha1_base64": "mgr6LouN8Z2rfxbNGduZs2gZo9w="
     }
    ]
   },
@@ -10395,7 +10395,7 @@
     "Pitcairn"
    ],
    "s": 372883,
-   "sha1_base64": "j6fxZnt+nZqdRWcCdzaGf6emLQs="
+   "sha1_base64": "c5mDTJl9wRs7oXB3MVBroTG2FrM="
   },
   {
    "id": "Poland",
@@ -10410,8 +10410,8 @@
       "Territorial waters of Bornholm",
       "województwo zachodniopomorskie"
      ],
-     "s": 89427188,
-     "sha1_base64": "ovquNG9n3C8jvUQ9F+pbkMFs0/I="
+     "s": 90174007,
+     "sha1_base64": "37Y3MkbZmQQZbc8mFQyhz7mHi3c="
     },
     {
      "id": "Poland_Pomeranian Voivodeship",
@@ -10423,8 +10423,8 @@
       "Territorial waters of Bornholm",
       "województwo pomorskie"
      ],
-     "s": 106022436,
-     "sha1_base64": "4542kbvHe7AtNFZviTgrx/y2N8A="
+     "s": 107339975,
+     "sha1_base64": "TnyVHAOo5Mccb3hHyFggqm9LOS0="
     },
     {
      "id": "Poland_Podlaskie Voivodeship",
@@ -10435,8 +10435,8 @@
       "Polska",
       "województwo podlaskie"
      ],
-     "s": 72233036,
-     "sha1_base64": "OEurvYSEyKNiZEOyatN1WeillaA="
+     "s": 72603079,
+     "sha1_base64": "BaYwfw+1ay2FnY130ga4n9CIM9M="
     },
     {
      "id": "Poland_Masovian Voivodeship",
@@ -10447,8 +10447,8 @@
       "Polska",
       "województwo mazowieckie"
      ],
-     "s": 260841690,
-     "sha1_base64": "E3TPe1W9XQBvEE7C9T1EkvwTUlo="
+     "s": 265937958,
+     "sha1_base64": "IfdDUqxSzoO84mwI9es2+333Qoo="
     },
     {
      "id": "Poland_Lubusz Voivodeship",
@@ -10459,8 +10459,8 @@
       "Polska",
       "województwo lubuskie"
      ],
-     "s": 55968393,
-     "sha1_base64": "NbDlZ/8+vXOtSF1nMZJJ1OLC0Sg="
+     "s": 56388564,
+     "sha1_base64": "egYBColzqogDM37VYvUHGX2+QvI="
     },
     {
      "id": "Poland_Lublin Voivodeship",
@@ -10471,8 +10471,8 @@
       "Polska",
       "województwo lubelskie"
      ],
-     "s": 128973607,
-     "sha1_base64": "7wlL0XxAOqm23vRmV7I4tHfybSE="
+     "s": 129759658,
+     "sha1_base64": "YVM2UqRS4MHVyfeSucyFh7Blsjg="
     },
     {
      "id": "Poland_Lower Silesian Voivodeship",
@@ -10483,8 +10483,8 @@
       "Polska",
       "województwo dolnośląskie"
      ],
-     "s": 143638457,
-     "sha1_base64": "woRRHVNK6U8VupjU4nI8cIWihuE="
+     "s": 144846380,
+     "sha1_base64": "YJpGT0oDAxBl2qEbF84m5v2d/BM="
     },
     {
      "id": "Poland_Warmian-Masurian Voivodeship",
@@ -10495,8 +10495,8 @@
       "Polska",
       "województwo warmińsko-mazurskie"
      ],
-     "s": 85736989,
-     "sha1_base64": "vvdJy227wHvOFF+6e0s5DKM8+0s="
+     "s": 86200928,
+     "sha1_base64": "8a50Uo75Q6/Mc2E1UazvLz/UFPY="
     },
     {
      "id": "Poland_Lodz Voivodeship",
@@ -10507,8 +10507,8 @@
       "Polska",
       "województwo łódzkie"
      ],
-     "s": 122122838,
-     "sha1_base64": "rVGUffYCjx4vw2TFjE0Ou3CwS5Q="
+     "s": 123281281,
+     "sha1_base64": "OR2qfEk+IHfIO0XsyXu1SxZq4fI="
     },
     {
      "id": "Poland_Subcarpathian Voivodeship",
@@ -10519,8 +10519,8 @@
       "Polska",
       "województwo podkarpackie"
      ],
-     "s": 136362096,
-     "sha1_base64": "DtPBRnsIJgysXIEnvaxpIietdYk="
+     "s": 137723699,
+     "sha1_base64": "NQ3MpczRYtnl/nMcS0nvLL1NwwE="
     },
     {
      "id": "Poland_Lesser Poland Voivodeship",
@@ -10531,8 +10531,8 @@
       "Polska",
       "województwo małopolskie"
      ],
-     "s": 186178066,
-     "sha1_base64": "tK47NVgGwksCQxzM5+C1RTmpeyk="
+     "s": 187991093,
+     "sha1_base64": "43kSKv1ZiH2nEAv64ZlQTHNHL5w="
     },
     {
      "id": "Poland_Silesian Voivodeship",
@@ -10543,8 +10543,8 @@
       "Polska",
       "województwo śląskie"
      ],
-     "s": 166880881,
-     "sha1_base64": "PHg290DIKDG914ctIpDY9xmzmao="
+     "s": 168590956,
+     "sha1_base64": "0Xfy2EGBspreR2em6tFj68TsJgU="
     },
     {
      "id": "Poland_Kuyavian-Pomeranian Voivodeship",
@@ -10555,8 +10555,8 @@
       "Polska",
       "województwo kujawsko-pomorskie"
      ],
-     "s": 98769085,
-     "sha1_base64": "MkZXeUuH3CqQQLCoXM7VgoHhIu8="
+     "s": 99884912,
+     "sha1_base64": "kGQ12P0lPQWJx7UdNI1LPAkZ+5g="
     },
     {
      "id": "Poland_Greater Poland Voivodeship",
@@ -10567,8 +10567,8 @@
       "Polska",
       "województwo wielkopolskie"
      ],
-     "s": 153021584,
-     "sha1_base64": "aUHhhDE/fZHH3LU6FkwX7d0MCsA="
+     "s": 154053315,
+     "sha1_base64": "th/4WuxoitgDZzQDqHiIki3YK8g="
     },
     {
      "id": "Poland_Opole Voivodeship",
@@ -10579,8 +10579,8 @@
       "Polska",
       "województwo opolskie"
      ],
-     "s": 49250666,
-     "sha1_base64": "2W+i8bNOuXGx9lHVg8bsksOKyo4="
+     "s": 49837549,
+     "sha1_base64": "FHXwyBBWFYvIeeKCM1T0qbWre1s="
     },
     {
      "id": "Poland_Swietokrzyskie Voivodeship",
@@ -10591,8 +10591,8 @@
       "Polska",
       "województwo świętokrzyskie"
      ],
-     "s": 76954788,
-     "sha1_base64": "78e3GzK7M4T3PJHW/mcxxggIxzk="
+     "s": 77889391,
+     "sha1_base64": "9Nd4Hp0Nn04QSh/M0LmeCAcW+0A="
     }
    ]
   },
@@ -10609,8 +10609,8 @@
       "Norte",
       "Portugal"
      ],
-     "s": 105794327,
-     "sha1_base64": "UiG7bDKumYxG8H6i4BPDboV+PMY="
+     "s": 106613906,
+     "sha1_base64": "vrv+V/xk6IfRF2Ht2cl1Tj4ipwM="
     },
     {
      "id": "Portugal_South",
@@ -10624,8 +10624,8 @@
       "Lisboa",
       "Portugal"
      ],
-     "s": 149817065,
-     "sha1_base64": "4ABwh4K8Xy6gHFXYF9Q4H+2eACA="
+     "s": 151036900,
+     "sha1_base64": "IKXAwoNZTNYPR12ijcjMQKcfEzU="
     },
     {
      "id": "Portugal_Islands",
@@ -10667,8 +10667,8 @@
       "Portugal",
       "Portugal (águas territoriais)"
      ],
-     "s": 43813988,
-     "sha1_base64": "b0TkzcdGwne8T57ExENLyeHNz2g="
+     "s": 38367471,
+     "sha1_base64": "yz4EHIjZBxeJMLbgJjUiws9jDuk="
     },
     {
      "id": "Portugal_Viseu",
@@ -10680,8 +10680,8 @@
       "Norte",
       "Portugal"
      ],
-     "s": 127546223,
-     "sha1_base64": "KZB9fKUVckyJjVjG3bWbMsa2yPA="
+     "s": 128085594,
+     "sha1_base64": "DYESePdJ+N6VvEutrdgOZXlXAfo="
     }
    ]
   },
@@ -10703,8 +10703,8 @@
     "Umm Salal",
     "‏قطر‎"
    ],
-   "s": 27512100,
-   "sha1_base64": "Ogg7PbBbB1EGqusamp3T6ObeUBc="
+   "s": 28002479,
+   "sha1_base64": "v6LwhNn1sldAz2+7WawWWFz+3Vg="
   },
   {
    "id": "Republic of Kosovo",
@@ -10717,8 +10717,8 @@
    "country_name_synonyms": [
     "Kosovo"
    ],
-   "s": 36409366,
-   "sha1_base64": "PmJclfFXYdgiBPHSV0GQ6SrEjnQ="
+   "s": 36595241,
+   "sha1_base64": "Qn079RHT8XqXXtJbdqcUtAl04Pw="
   },
   {
    "id": "Romania",
@@ -10737,8 +10737,8 @@
       "Tulcea",
       "Vrancea"
      ],
-     "s": 35803128,
-     "sha1_base64": "5j5nGslJz5hdPivRFkeTWC9bSVI="
+     "s": 36064563,
+     "sha1_base64": "8/IoJUR12nG5m+Au95vKNblTnpU="
     },
     {
      "id": "Romania_Centre",
@@ -10754,8 +10754,8 @@
       "România",
       "Sibiu"
      ],
-     "s": 69955787,
-     "sha1_base64": "7iV4wWAlu95z2ThiMZylZUxMrN8="
+     "s": 70282918,
+     "sha1_base64": "MZJnGgxhVYaQczoE3qa9//DDRCU="
     },
     {
      "id": "Romania_West",
@@ -10769,8 +10769,8 @@
       "România",
       "Timiș"
      ],
-     "s": 44490167,
-     "sha1_base64": "VJPqXtKYWXyz5NETbYQINYiCv7k="
+     "s": 44690115,
+     "sha1_base64": "wv4gKp9GY0VYPcoKjlJzi64TgCI="
     },
     {
      "id": "Romania_North_West",
@@ -10786,8 +10786,8 @@
       "Satu Mare",
       "Sălaj"
      ],
-     "s": 64306108,
-     "sha1_base64": "h1BNOkAFS9IvZhXnsJdi0zjTSZQ="
+     "s": 64680663,
+     "sha1_base64": "F2kb6S+SFZxjzRwSgg+QYe26SyI="
     },
     {
      "id": "Romania_South_West",
@@ -10802,8 +10802,8 @@
       "România",
       "Vâlcea"
      ],
-     "s": 43841457,
-     "sha1_base64": "6L89nWYyM1OyT119NnGkLMaI4Do="
+     "s": 43929468,
+     "sha1_base64": "pUQtjsBl7evIchVZdD5oMrIOMUo="
     },
     {
      "id": "Romania_North_East",
@@ -10819,8 +10819,8 @@
       "Suceava",
       "Vaslui"
      ],
-     "s": 49400952,
-     "sha1_base64": "XPxDY6dekyQ3bdcdUWtVaieVkX0="
+     "s": 49686075,
+     "sha1_base64": "XiewPIYY2vk2wNlpOXz6ffU3ys8="
     },
     {
      "id": "Romania_South",
@@ -10840,8 +10840,8 @@
       "România",
       "Teleorman"
      ],
-     "s": 62913658,
-     "sha1_base64": "Yj+GuzxBJtGcXurd+oU9nToD0EY="
+     "s": 63425260,
+     "sha1_base64": "WW4mrhMSb8CqySv2Ev81Rg9ugok="
     }
    ]
   },
@@ -10861,8 +10861,8 @@
       "Україна",
       "Республика Крым"
      ],
-     "s": 54779280,
-     "sha1_base64": "/omkIat4h5PQpP4uDaHPQlirQtM="
+     "s": 55043099,
+     "sha1_base64": "wsUWQbcbD+/jyV4PTrIk/Cp/THg="
     },
     {
      "id": "Russia_Altai Krai",
@@ -10874,8 +10874,8 @@
       "Российская Федерация",
       "Алтайский край"
      ],
-     "s": 154047836,
-     "sha1_base64": "d5/xV9/FASRN0UA1Qp1b9XBSCiw="
+     "s": 154336535,
+     "sha1_base64": "KVTQTp1pPhpWAR/UrfCsuYsrRDI="
     },
     {
      "id": "Russia_Altai Republic",
@@ -10887,8 +10887,8 @@
       "Российская Федерация",
       "Республика Алтай"
      ],
-     "s": 113098300,
-     "sha1_base64": "32UM/GT8OGg1gXTKoB7Frx57kus="
+     "s": 113203272,
+     "sha1_base64": "NjdHa/0/fnlOFuvL+254kXIBWzQ="
     },
     {
      "id": "Russia_Amur Oblast",
@@ -10900,8 +10900,8 @@
       "Российская Федерация",
       "Амурская область"
      ],
-     "s": 46934764,
-     "sha1_base64": "l1WMXLnHyLSgHKY7SOJ/hYgf4ww="
+     "s": 47088495,
+     "sha1_base64": "EWv+K1QvSfqxDSASwsWT9iZvOv0="
     },
     {
      "id": "Russia_Arkhangelsk Oblast_Central",
@@ -10913,8 +10913,8 @@
       "Российская Федерация",
       "Архангельская область"
      ],
-     "s": 66462504,
-     "sha1_base64": "obvHRAk6Iz42iGdTFLj+n9xWPf4="
+     "s": 66594123,
+     "sha1_base64": "y25HBTi+dgady1poFN5Dv5AU3rA="
     },
     {
      "id": "Russia_Arkhangelsk Oblast_North",
@@ -10928,8 +10928,8 @@
       "Ненецкий автономный округ",
       "Архангельская область"
      ],
-     "s": 70143793,
-     "sha1_base64": "LmswnOY30otzTalCr/qwQXj3z3U="
+     "s": 70180244,
+     "sha1_base64": "4zKZvo/hdKJjIhn3PdEw6UqWzik="
     },
     {
      "id": "Russia_Astrakhan Oblast",
@@ -10941,8 +10941,8 @@
       "Российская Федерация",
       "Астраханская область"
      ],
-     "s": 34081755,
-     "sha1_base64": "cafY+aNN6JstWG3+uMWOVsvJI3Y="
+     "s": 34129910,
+     "sha1_base64": "xaWzwzfDpF+6BRxbdns9jJMCvhI="
     },
     {
      "id": "Russia_Bashkortostan",
@@ -10954,8 +10954,8 @@
       "Российская Федерация",
       "Башкортостан"
      ],
-     "s": 118985131,
-     "sha1_base64": "x9BOCiW8i5/fyuVMtNcFvXVnHpE="
+     "s": 119344726,
+     "sha1_base64": "rI/RgOPItuL955RRvTpLTFKpdDE="
     },
     {
      "id": "Russia_Belgorod Oblast",
@@ -10967,8 +10967,8 @@
       "Российская Федерация",
       "Белгородская область"
      ],
-     "s": 39872078,
-     "sha1_base64": "wn0zkMbd0WscKUoyKYgNPHfAxM8="
+     "s": 40055769,
+     "sha1_base64": "/QAFZsr+klcZOpc7TiiY+FOxOZY="
     },
     {
      "id": "Russia_Bryansk Oblast",
@@ -10980,8 +10980,8 @@
       "Российская Федерация",
       "Брянская область"
      ],
-     "s": 26824429,
-     "sha1_base64": "18CUDTEEejpNAmIwcQwz5pca7sI="
+     "s": 26930136,
+     "sha1_base64": "GaH11qopBfJX2PrMrfo0lBBzP9U="
     },
     {
      "id": "Russia_Buryatia",
@@ -10993,8 +10993,8 @@
       "Российская Федерация",
       "Бурятия"
      ],
-     "s": 47186061,
-     "sha1_base64": "cLNCAjc/D2REvbLTX/rGaFOe3C8="
+     "s": 47262088,
+     "sha1_base64": "Ln/1QNhMINz0E4bKzQESDaIKYKY="
     },
     {
      "id": "Russia_Chechen Republic",
@@ -11006,8 +11006,8 @@
       "Россия",
       "Российская Федерация"
      ],
-     "s": 27757098,
-     "sha1_base64": "PEtypNeBAsTTo/FpzPKjG2LICEE="
+     "s": 27795821,
+     "sha1_base64": "jVj6RrbpJ7KlSyvWh3vBb6a7PJY="
     },
     {
      "id": "Russia_Chelyabinsk Oblast",
@@ -11019,8 +11019,8 @@
       "Российская Федерация",
       "Челябинская область"
      ],
-     "s": 81224509,
-     "sha1_base64": "qzuI/vTvwP35LCkFKN40yCRolzc="
+     "s": 81948280,
+     "sha1_base64": "sj6Z6eh2fBR/7Mdx0STG0XWWqBI="
     },
     {
      "id": "Russia_Chukotka Autonomous Okrug",
@@ -11032,8 +11032,8 @@
       "Россия",
       "Российская Федерация"
      ],
-     "s": 149976349,
-     "sha1_base64": "1YSPtLv9EM2V1cQsYmY+TZ6rEnQ="
+     "s": 150121927,
+     "sha1_base64": "SrnmZF/VSrhw/ZD0dvGvDX0Dd+U="
     },
     {
      "id": "Russia_Chuvashia",
@@ -11045,8 +11045,8 @@
       "Российская Федерация",
       "Чувашия"
      ],
-     "s": 27987972,
-     "sha1_base64": "Ud9zkGSGNwi4ZS1Cy9bQZqec8mg="
+     "s": 28130975,
+     "sha1_base64": "go1XQTrCx1FM8mcllrlijudJmLs="
     },
     {
      "id": "Russia_Ingushetia",
@@ -11058,8 +11058,8 @@
       "Российская Федерация",
       "Ингушетия"
      ],
-     "s": 10133830,
-     "sha1_base64": "RleECTNkNkLSVSPLK5hpqivc6FY="
+     "s": 10147216,
+     "sha1_base64": "a/dWd9SShuBPMk3wI/3e60SUR+0="
     },
     {
      "id": "Russia_Irkutsk Oblast",
@@ -11071,8 +11071,8 @@
       "Российская Федерация",
       "Иркутская область"
      ],
-     "s": 129192530,
-     "sha1_base64": "J6HKM9GOSVHZ8Xxpee+01SveQzo="
+     "s": 129625821,
+     "sha1_base64": "XGJP8vU5krT7KwOYFVbO0ED3BSo="
     },
     {
      "id": "Russia_Ivanovo Oblast",
@@ -11084,8 +11084,8 @@
       "Россия",
       "Российская Федерация"
      ],
-     "s": 28851364,
-     "sha1_base64": "slPl07DiVZKWKw9db+0OJraWVHY="
+     "s": 28921575,
+     "sha1_base64": "lSbUY0gsfjpwS62nQLdbOugbrK8="
     },
     {
      "id": "Russia_Jewish Autonomous Oblast",
@@ -11097,8 +11097,8 @@
       "Россия",
       "Российская Федерация"
      ],
-     "s": 14433010,
-     "sha1_base64": "ju7zCjtgSBwh4E3rSZg+9YDVpk0="
+     "s": 14443900,
+     "sha1_base64": "sabgeqgI4VwQSB3z/hffriyqZe8="
     },
     {
      "id": "Russia_Kabardino-Balkaria",
@@ -11110,8 +11110,8 @@
       "Россия",
       "Российская Федерация"
      ],
-     "s": 39589060,
-     "sha1_base64": "fhcyTpova6fzn+By9LCi9Nohk8k="
+     "s": 39642391,
+     "sha1_base64": "L1NmPoH5dnCT//joJaV9MJIgpXQ="
     },
     {
      "id": "Russia_Kaliningrad Oblast",
@@ -11123,8 +11123,8 @@
       "Российская Федерация",
       "Калининградская область"
      ],
-     "s": 27477388,
-     "sha1_base64": "8us27JuVL91vfQnD8i8cCdbAd6E="
+     "s": 28083199,
+     "sha1_base64": "DwQAy5M6eJ4AYnmMcV1DAfHY6iY="
     },
     {
      "id": "Russia_Kaluga Oblast",
@@ -11136,8 +11136,8 @@
       "Российская Федерация",
       "Калужская область"
      ],
-     "s": 39447590,
-     "sha1_base64": "f1MMQvhp/Z7MFSJb6Fztj+6Cezs="
+     "s": 39733121,
+     "sha1_base64": "2bvA4kyAfGKdwmexQeMrR79Ggtw="
     },
     {
      "id": "Russia_Kamchatka Krai",
@@ -11149,8 +11149,8 @@
       "Российская Федерация",
       "Камчатский край"
      ],
-     "s": 93128541,
-     "sha1_base64": "QSpD68ujCOln0OXZiYee833XqAQ="
+     "s": 93416824,
+     "sha1_base64": "a2cQCnoBnWp3/pzyeFSQ4+MEvBo="
     },
     {
      "id": "Russia_Karachay-Cherkessia",
@@ -11162,8 +11162,8 @@
       "Россия",
       "Российская Федерация"
      ],
-     "s": 47062876,
-     "sha1_base64": "XEv+W30546ATexUDFipx+++K6jA="
+     "s": 47098999,
+     "sha1_base64": "W5EDg/4TZqoDlResT85fm1/lFp4="
     },
     {
      "id": "Russia_Kemerov Oblast",
@@ -11175,8 +11175,8 @@
       "Российская Федерация",
       "Кемеровская область"
      ],
-     "s": 44028830,
-     "sha1_base64": "ij74OK4+GhHvhUrsCe95SByV+JQ="
+     "s": 44223113,
+     "sha1_base64": "XEt0ZLKGFfaN7EhG5ehMpwSjUbM="
     },
     {
      "id": "Russia_Khabarovsk Krai",
@@ -11188,8 +11188,8 @@
       "Российская Федерация",
       "Хабаровский край"
      ],
-     "s": 178134994,
-     "sha1_base64": "RxVbEWF4uMUYMK6oetVgwRpV3fk="
+     "s": 178693725,
+     "sha1_base64": "YUgmvFu23r6MOQ59zk8QHeeyIF8="
     },
     {
      "id": "Russia_Khakassia",
@@ -11201,8 +11201,8 @@
       "Россия",
       "Российская Федерация"
      ],
-     "s": 21556955,
-     "sha1_base64": "YHPA2vbN/D2MhzS0jMIn8lvILhs="
+     "s": 21675366,
+     "sha1_base64": "SLXq/dcWsKK6Mif9WEwVueTNG0c="
     },
     {
      "id": "Russia_Kirov Oblast",
@@ -11214,8 +11214,8 @@
       "Российская Федерация",
       "Кировская область"
      ],
-     "s": 130002122,
-     "sha1_base64": "EdSgmNvR98tLhk9wk500SKI26vE="
+     "s": 130582157,
+     "sha1_base64": "WIVWRyqU8RVhfA4c3A18/W7glIM="
     },
     {
      "id": "Russia_Komi Republic",
@@ -11227,8 +11227,8 @@
       "Российская Федерация",
       "Республика Коми"
      ],
-     "s": 107373945,
-     "sha1_base64": "ywdZ8jTx3nPaWBRznjbvxv3UOeQ="
+     "s": 107541996,
+     "sha1_base64": "xoUIKuw/tzOhSkrQ9UOp+9hmrFo="
     },
     {
      "id": "Russia_Kostroma Oblast",
@@ -11240,8 +11240,8 @@
       "Российская Федерация",
       "Костромская область"
      ],
-     "s": 30955420,
-     "sha1_base64": "qz5OdezoPLRl561oSjn7Yn8eoco="
+     "s": 31014367,
+     "sha1_base64": "14xyqdEJxLSgWaNfQYMYD24JCGg="
     },
     {
      "id": "Russia_Krasnodar Krai",
@@ -11253,8 +11253,8 @@
       "Российская Федерация",
       "Краснодарский край"
      ],
-     "s": 100108940,
-     "sha1_base64": "RGC2Othuc2zmLwp9WMQve4u77+o="
+     "s": 100669431,
+     "sha1_base64": "Mcl7ZMRia4p2vv/BceoaROqEZ5M="
     },
     {
      "id": "Russia_Krasnodar Krai_Adygeya",
@@ -11267,8 +11267,8 @@
       "Российская Федерация",
       "Краснодарский край"
      ],
-     "s": 89214620,
-     "sha1_base64": "s+3DCpnikVJ1juO8BEqzC0alLjs="
+     "s": 89507671,
+     "sha1_base64": "QhA0V3RZBGRd+POFFmOETLq0f0E="
     },
     {
      "id": "Russia_Krasnoyarsk Krai_North",
@@ -11280,8 +11280,8 @@
       "Российская Федерация",
       "Красноярский край"
      ],
-     "s": 154023005,
-     "sha1_base64": "McwOtsON+VZLs++jdNe7qTUJz6U="
+     "s": 154263519,
+     "sha1_base64": "MIccMVkvzE4raADeiVb3uTWUllI="
     },
     {
      "id": "Russia_Krasnoyarsk Krai_South",
@@ -11293,8 +11293,8 @@
       "Российская Федерация",
       "Красноярский край"
      ],
-     "s": 80575474,
-     "sha1_base64": "gLxiOOWiIAiJ5SAGPy2eKWQzGOY="
+     "s": 80901798,
+     "sha1_base64": "Lz2c7f1VHG2xbWid8lh1qnSNrv0="
     },
     {
      "id": "Russia_Kurgan Oblast",
@@ -11306,8 +11306,8 @@
       "Россия",
       "Российская Федерация"
      ],
-     "s": 36258148,
-     "sha1_base64": "du4+/CRmMvELBDph/Buvj9UiYXM="
+     "s": 36304271,
+     "sha1_base64": "2D2YFvmtu5DVgNl0cLC2CV8O76c="
     },
     {
      "id": "Russia_Kursk Oblast",
@@ -11319,8 +11319,8 @@
       "Российская Федерация",
       "Курская область"
      ],
-     "s": 54280085,
-     "sha1_base64": "uwSaUPyf3Af3yuw8XmRjQKpCUJ0="
+     "s": 54378648,
+     "sha1_base64": "CkWRo32Du/6WQkvxP5if48LqEe4="
     },
     {
      "id": "Russia_Leningradskaya Oblast_Karelsky",
@@ -11332,8 +11332,8 @@
       "Российская Федерация",
       "Ленинградская область"
      ],
-     "s": 51787150,
-     "sha1_base64": "uCT5HK1SwQ2HGV6B5O+68AiDrm0="
+     "s": 52329865,
+     "sha1_base64": "B2UwVnFDDF2FqTpPlqT21QLxb84="
     },
     {
      "id": "Russia_Leningradskaya Oblast_Southeast",
@@ -11345,8 +11345,8 @@
       "Российская Федерация",
       "Ленинградская область"
      ],
-     "s": 85656948,
-     "sha1_base64": "UxQmoW9N29m2R584KRRRSLeNG8A="
+     "s": 86040951,
+     "sha1_base64": "Nvvs649NQ1vOb+PsmXzj/mDbm3U="
     },
     {
      "id": "Russia_Lipetsk Oblast",
@@ -11358,8 +11358,8 @@
       "Российская Федерация",
       "Липецкая область"
      ],
-     "s": 34634213,
-     "sha1_base64": "zHRfyN/tLBAp+GpJrqNok+vtStk="
+     "s": 34727096,
+     "sha1_base64": "w89Eafj7p3TvK7GgtHoFd8lUU5c="
     },
     {
      "id": "Russia_Magadan Oblast",
@@ -11371,8 +11371,8 @@
       "Российская Федерация",
       "Магаданская область"
      ],
-     "s": 58150691,
-     "sha1_base64": "MrWuipixrHXTLqdye5GsyshEtfk="
+     "s": 58104981,
+     "sha1_base64": "e+w1D0by3rwuEakEcBe5V2YPgPY="
     },
     {
      "id": "Russia_Mari El",
@@ -11384,8 +11384,8 @@
       "Российская Федерация",
       "Марий Эл"
      ],
-     "s": 31224699,
-     "sha1_base64": "RsrnoUzRVLI0MwTMjwXnTUCdLNI="
+     "s": 31566502,
+     "sha1_base64": "fqnkOFFeLQmAnuUrG6xhehOJXPE="
     },
     {
      "id": "Russia_Moscow Oblast_East",
@@ -11397,8 +11397,8 @@
       "Россия",
       "Российская Федерация"
      ],
-     "s": 103437936,
-     "sha1_base64": "oxxbeLZPXIqpbHCdGgX9cQNrwH8="
+     "s": 104827827,
+     "sha1_base64": "Icnlzi0Jt9XYYlPvgx3p/c6WTAI="
     },
     {
      "id": "Russia_Moscow Oblast_West",
@@ -11411,8 +11411,8 @@
       "Российская Федерация",
       "Москва"
      ],
-     "s": 70659219,
-     "sha1_base64": "CqCsxD/EGexD6N8Ru3glmpEFD6c="
+     "s": 71788918,
+     "sha1_base64": "DfCy/iOMtKsz4oO2tmvIfwSdhms="
     },
     {
      "id": "Russia_Moscow",
@@ -11425,8 +11425,8 @@
       "Российская Федерация",
       "Москва"
      ],
-     "s": 85260128,
-     "sha1_base64": "x9WaVWYypgr5hjnrkf/Q8vR0kl8="
+     "s": 87493684,
+     "sha1_base64": "mukPDq0dxiJe08ay+Igvl915D/A="
     },
     {
      "id": "Russia_Murmansk Oblast",
@@ -11438,8 +11438,8 @@
       "Россия",
       "Российская Федерация"
      ],
-     "s": 88464376,
-     "sha1_base64": "hAzqMcQ01BzPmE1zXVs5wueDtNY="
+     "s": 88707259,
+     "sha1_base64": "Ca7RVSu4iSTYSlosjyRw9gypPws="
     },
     {
      "id": "Russia_Nenets Autonomous Okrug",
@@ -11451,8 +11451,8 @@
       "Российская Федерация",
       "Ненецкий автономный округ"
      ],
-     "s": 35442890,
-     "sha1_base64": "vkrgTm79FRmviNj2+UucKvpB0m4="
+     "s": 35482364,
+     "sha1_base64": "EcFamCfSpP+XDWDenVYPv7iqjic="
     },
     {
      "id": "Russia_Nizhny Novgorod Oblast",
@@ -11464,8 +11464,8 @@
       "Российская Федерация",
       "Нижегородская область"
      ],
-     "s": 78685658,
-     "sha1_base64": "F1h33fVVeYcqwUIBXWh1SUVmfOM="
+     "s": 79074789,
+     "sha1_base64": "j8pM5FBuKqFkDdHMs3X2zNitioY="
     },
     {
      "id": "Russia_North Ossetia-Alania",
@@ -11477,8 +11477,8 @@
       "Российская Федерация",
       "Северная Осетия - Алания"
      ],
-     "s": 22296976,
-     "sha1_base64": "5QOBl0rAOIPnsaGp+7EmMNJPnPs="
+     "s": 22364851,
+     "sha1_base64": "3vPV0Jxmteha7fe5MviKQj/UTxM="
     },
     {
      "id": "Russia_Novgorod Oblast",
@@ -11490,8 +11490,8 @@
       "Российская Федерация",
       "Новгородская область"
      ],
-     "s": 33254429,
-     "sha1_base64": "mYeXOL0qDmH8gUjrsneZ5z9PpYg="
+     "s": 33383896,
+     "sha1_base64": "U6AJ+15rJ8coeU4gdOiSctnMhhs="
     },
     {
      "id": "Russia_Novosibirsk Oblast",
@@ -11503,8 +11503,8 @@
       "Российская Федерация",
       "Новосибирская область"
      ],
-     "s": 79097328,
-     "sha1_base64": "wbHTpZvIrDIXjW7xyGpOtf2G/wk="
+     "s": 79440819,
+     "sha1_base64": "lre+kJF+7rgsIU9FBm9fqUvSMhA="
     },
     {
      "id": "Russia_Omsk Oblast",
@@ -11516,8 +11516,8 @@
       "Российская Федерация",
       "Омская область"
      ],
-     "s": 68559224,
-     "sha1_base64": "RR55a2ijKs6jUO12+lWarLTfPJ8="
+     "s": 68782307,
+     "sha1_base64": "zmkTFCtmpaTRe3yIpLgWd8hohJo="
     },
     {
      "id": "Russia_Orenburg Oblast",
@@ -11529,8 +11529,8 @@
       "Российская Федерация",
       "Оренбургская область"
      ],
-     "s": 52974448,
-     "sha1_base64": "ncTNJLiY6d/oH3csWhHfKvfQffY="
+     "s": 53145771,
+     "sha1_base64": "Idcb1qCx8veZtJXxELEc0X0hr2c="
     },
     {
      "id": "Russia_Oryol Oblast",
@@ -11542,8 +11542,8 @@
       "Россия",
       "Российская Федерация"
      ],
-     "s": 21479259,
-     "sha1_base64": "qiFJ6FYBRYLIxYwkAAC+QqJIkZU="
+     "s": 21559646,
+     "sha1_base64": "Cci9p1E8JgT4rHmMhBaDlXh20D4="
     },
     {
      "id": "Russia_Penza Oblast",
@@ -11555,8 +11555,8 @@
       "Россия",
       "Российская Федерация"
      ],
-     "s": 33679884,
-     "sha1_base64": "2jHUohZ46jB8Qtw5bxkA6AWIwlA="
+     "s": 33853343,
+     "sha1_base64": "HQyZ7uLmkSegmRkC+lgEtkT2z+M="
     },
     {
      "id": "Russia_Perm Krai_North",
@@ -11568,8 +11568,8 @@
       "Российская Федерация",
       "Пермский край"
      ],
-     "s": 43297909,
-     "sha1_base64": "GaEyHB3vkX8ErKULDvkxHUBE3/o="
+     "s": 43476952,
+     "sha1_base64": "rimcs4NdZdHMU0Gr1uXlioJG5pE="
     },
     {
      "id": "Russia_Perm Krai_South",
@@ -11581,8 +11581,8 @@
       "Российская Федерация",
       "Пермский край"
      ],
-     "s": 56655539,
-     "sha1_base64": "20exjYxoQlIv70uiDn8bV/Yor48="
+     "s": 57057750,
+     "sha1_base64": "jdmZXCEhFZ/f0qx38ELxUj2a2T0="
     },
     {
      "id": "Russia_Primorsky Krai",
@@ -11594,8 +11594,8 @@
       "Российская Федерация",
       "Приморский край"
      ],
-     "s": 65507872,
-     "sha1_base64": "fKrZIkz3HuJCBhLLXjZPkhn86Qk="
+     "s": 66142635,
+     "sha1_base64": "YnfZovS5yOOE6eMDW4lVugL8+r4="
     },
     {
      "id": "Russia_Pskov Oblast",
@@ -11607,8 +11607,8 @@
       "Россия",
       "Российская Федерация"
      ],
-     "s": 57647210,
-     "sha1_base64": "V+d9LZZc2NKFnrwsFWxr8Dm8pto="
+     "s": 57906733,
+     "sha1_base64": "kxnvNNIiPE3ECw5K/9HdGB2owRk="
     },
     {
      "id": "Russia_Republic of Dagestan",
@@ -11620,8 +11620,8 @@
       "Российская Федерация",
       "Дагестан"
      ],
-     "s": 106538649,
-     "sha1_base64": "Jpo71pXHw/J5huS+ifhKiDdfniI="
+     "s": 106582284,
+     "sha1_base64": "/NEIusf4zCrlCm6Nig8eh5XW0IU="
     },
     {
      "id": "Russia_Republic of Kalmykia",
@@ -11634,8 +11634,8 @@
       "Калмыкия",
       "Астраханская область"
      ],
-     "s": 15219104,
-     "sha1_base64": "x6vMtLdjdSJbi9Zxcm6TxlcVi5s="
+     "s": 15231922,
+     "sha1_base64": "xRQyghb423Dn/ZeLqTFfqMVlFnk="
     },
     {
      "id": "Russia_Republic of Karelia_North",
@@ -11647,8 +11647,8 @@
       "Россия",
       "Российская Федерация"
      ],
-     "s": 82674126,
-     "sha1_base64": "f55gGEifqsUQTw7DefhbqxNjA3Y="
+     "s": 82721384,
+     "sha1_base64": "UqyC28MKFuXXOh4OPEUNCT6BFRA="
     },
     {
      "id": "Russia_Republic of Karelia_South",
@@ -11660,8 +11660,8 @@
       "Россия",
       "Российская Федерация"
      ],
-     "s": 78445439,
-     "sha1_base64": "to+LspjEjPiVQdytw5U+7HJUh2k="
+     "s": 78572586,
+     "sha1_base64": "mxxm5Jk4ofrk1J6aWvV8q/zhWCU="
     },
     {
      "id": "Russia_Republic of Mordovia",
@@ -11673,8 +11673,8 @@
       "Российская Федерация",
       "Мордовия"
      ],
-     "s": 33651019,
-     "sha1_base64": "APDLk5Ds1ngrgV77yxudHCJ2yLQ="
+     "s": 33705518,
+     "sha1_base64": "1J5D290FyVnHKw5WbF5xHaLrRpc="
     },
     {
      "id": "Russia_Rostov Oblast",
@@ -11686,8 +11686,8 @@
       "Россия",
       "Российская Федерация"
      ],
-     "s": 80857611,
-     "sha1_base64": "gZCPpf8SSBfe63ST4q17j5UxlRw="
+     "s": 81426182,
+     "sha1_base64": "T24Znp+jcXRWZMP6XOLzqN7tcxQ="
     },
     {
      "id": "Russia_Ryazan Oblast",
@@ -11699,8 +11699,8 @@
       "Россия",
       "Российская Федерация"
      ],
-     "s": 35640189,
-     "sha1_base64": "TnnUb1WMOY51MI7GDwwTeVnHp9Q="
+     "s": 35779176,
+     "sha1_base64": "Kj977WVJk42oTW5CxQoawxSxwkM="
     },
     {
      "id": "Russia_Saint Petersburg",
@@ -11713,8 +11713,8 @@
       "Российская Федерация",
       "Ленинградская область"
      ],
-     "s": 59474411,
-     "sha1_base64": "G+6i7ubCgICGt7a6yAZpcZ5pUDo="
+     "s": 61518750,
+     "sha1_base64": "DGoV2hEFpprQ4+pdJhr4k+p9pj0="
     },
     {
      "id": "Russia_Sakha Republic",
@@ -11726,8 +11726,8 @@
       "Российская Федерация",
       "Республика Саха (Якутия)"
      ],
-     "s": 326372392,
-     "sha1_base64": "ZMjU1OucmVdSN8otNGwwC7VSUsU="
+     "s": 326465932,
+     "sha1_base64": "RgvGch9khfSH5sW/jm6nZj9a2lg="
     },
     {
      "id": "Russia_Sakhalin Oblast",
@@ -11739,8 +11739,8 @@
       "Российская Федерация",
       "Сахалинская область"
      ],
-     "s": 51039406,
-     "sha1_base64": "YBKzG62s7DdxKtaCDY0oUyaOGho="
+     "s": 51119921,
+     "sha1_base64": "FcMpZxFlrDQY6h2Gko0/SO+cz9k="
     },
     {
      "id": "Russia_Samara Oblast",
@@ -11752,8 +11752,8 @@
       "Россия",
       "Российская Федерация"
      ],
-     "s": 55703217,
-     "sha1_base64": "cer6wH9sKDUmKy5qngBLVuM0uFI="
+     "s": 56030548,
+     "sha1_base64": "V/j6FRqj8kF5FhRGyiaagum6EiY="
     },
     {
      "id": "Russia_Saratov Oblast",
@@ -11765,8 +11765,8 @@
       "Российская Федерация",
       "Саратовская область"
      ],
-     "s": 52664920,
-     "sha1_base64": "yeqMSKuu9h52C73PIlF+1fqTrvo="
+     "s": 52885523,
+     "sha1_base64": "YpY0wnKfAt3T1oKvc1iTh49UoaQ="
     },
     {
      "id": "Russia_Smolensk Oblast",
@@ -11778,8 +11778,8 @@
       "Россия",
       "Российская Федерация"
      ],
-     "s": 45390735,
-     "sha1_base64": "zGtNn/sey/c5hOhVgjyjnmZcSVU="
+     "s": 45456010,
+     "sha1_base64": "zbCejC81sp6VGJuoFNjlfTXsxIY="
     },
     {
      "id": "Russia_Stavropol Krai",
@@ -11791,8 +11791,8 @@
       "Российская Федерация",
       "Ставропольский край"
      ],
-     "s": 40782607,
-     "sha1_base64": "VwNJhB3XsDuGXRe1PITlv2C7v/c="
+     "s": 41099634,
+     "sha1_base64": "07EchSeXKQMQBemTlwz41IS6DbQ="
     },
     {
      "id": "Russia_Sverdlovsk Oblast_Ekaterinburg",
@@ -11804,8 +11804,8 @@
       "Российская Федерация",
       "Свердловская область"
      ],
-     "s": 57149777,
-     "sha1_base64": "d709zy/8Ds19KMQjZcIp6N6WZUM="
+     "s": 57749348,
+     "sha1_base64": "W2sgTRBIRdRHh8sf7ulay3FZbU8="
     },
     {
      "id": "Russia_Sverdlovsk Oblast_North",
@@ -11817,8 +11817,8 @@
       "Российская Федерация",
       "Свердловская область"
      ],
-     "s": 62082943,
-     "sha1_base64": "RtUYniR2kEfDrtzjzvj5s4KGaAU="
+     "s": 62335018,
+     "sha1_base64": "TU7ZxFxmNAag0t49wAXLcmWHJiQ="
     },
     {
      "id": "Russia_Tambov Oblast",
@@ -11830,8 +11830,8 @@
       "Россия",
       "Российская Федерация"
      ],
-     "s": 43013574,
-     "sha1_base64": "MLMREZheSz/NFCm2OWWSxQz4bEk="
+     "s": 43117881,
+     "sha1_base64": "Nr1ZTPJ3DsNTYF2HA+t8g0M+uEg="
     },
     {
      "id": "Russia_Tatarstan",
@@ -11843,8 +11843,8 @@
       "Российская Федерация",
       "Татарстан"
      ],
-     "s": 90072092,
-     "sha1_base64": "lmi56zH35mT5cmOQpPUxbWwtvPg="
+     "s": 90935831,
+     "sha1_base64": "GE4NEHT1k5/MkUOiBRShslfK9A8="
     },
     {
      "id": "Russia_Tomsk Oblast",
@@ -11856,8 +11856,8 @@
       "Российская Федерация",
       "Томская область"
      ],
-     "s": 39775924,
-     "sha1_base64": "UwEyd9b9lfhYSHXgQDFjGagnenY="
+     "s": 39916167,
+     "sha1_base64": "AX1lgR2ET2LiOCX9azG9Cd0cx8w="
     },
     {
      "id": "Russia_Tula Oblast",
@@ -11869,8 +11869,8 @@
       "Российская Федерация",
       "Тульская область"
      ],
-     "s": 33002629,
-     "sha1_base64": "mTPMQsljqeF7KgZaH3aY8Vuy2dw="
+     "s": 33139824,
+     "sha1_base64": "rfw92ighwtAaFBmkAtAwbfgvSAY="
     },
     {
      "id": "Russia_Tuva",
@@ -11882,8 +11882,8 @@
       "Российская Федерация",
       "Тыва"
      ],
-     "s": 23771593,
-     "sha1_base64": "xz9nliJNJpi50zIR+8MgY5UF8uk="
+     "s": 23820900,
+     "sha1_base64": "NBQyyLeSptERYD93rt2yw233XM0="
     },
     {
      "id": "Russia_Tver Oblast",
@@ -11895,8 +11895,8 @@
       "Российская Федерация",
       "Тверская область"
      ],
-     "s": 76089539,
-     "sha1_base64": "B0VWI3KHdZ81ee+BpMg+XDzGk3A="
+     "s": 76362278,
+     "sha1_base64": "abEupD4xN0z153ZylaYxqm6AisU="
     },
     {
      "id": "Russia_Tyumen Oblast",
@@ -11908,8 +11908,8 @@
       "Россия",
       "Российская Федерация"
      ],
-     "s": 54950336,
-     "sha1_base64": "05UQPlYYPZYbFmcRs6iFG4L6cG4="
+     "s": 55319867,
+     "sha1_base64": "rU6Z/K3krURvJFOwoF3hOVmoDCQ="
     },
     {
      "id": "Russia_Udmurt Republic",
@@ -11921,8 +11921,8 @@
       "Российская Федерация",
       "Удмуртия"
      ],
-     "s": 50739096,
-     "sha1_base64": "ykNKwXriJdT8DBFizOUZnFiKVNM="
+     "s": 51087563,
+     "sha1_base64": "1+JfGkFSTEDAlI2MqR7jMSQm8F8="
     },
     {
      "id": "Russia_Ulyanovsk Oblast",
@@ -11934,8 +11934,8 @@
       "Российская Федерация",
       "Ульяновская область"
      ],
-     "s": 41124751,
-     "sha1_base64": "S67v7zsj7XAtampdzcsT5LOdKUY="
+     "s": 41365674,
+     "sha1_base64": "71j+l7W2q08v3uZOEVn20qL0pHc="
     },
     {
      "id": "Russia_Vladimir Oblast",
@@ -11947,8 +11947,8 @@
       "Российская Федерация",
       "Владимирская область"
      ],
-     "s": 59451771,
-     "sha1_base64": "+VwNBcd7JBJ1/5gBKtTwSBBXckQ="
+     "s": 60063334,
+     "sha1_base64": "e5+xi8QgaLCMMLwcPvaJGzuUaIs="
     },
     {
      "id": "Russia_Volgograd Oblast",
@@ -11960,8 +11960,8 @@
       "Российская Федерация",
       "Волгоградская область"
      ],
-     "s": 61977872,
-     "sha1_base64": "SDVExiXaYjrjVm7X9flMRt3Gu0E="
+     "s": 62407475,
+     "sha1_base64": "13Vzns3rghnfhgLtRPr6ya/YWbE="
     },
     {
      "id": "Russia_Vologda Oblast",
@@ -11973,8 +11973,8 @@
       "Российская Федерация",
       "Вологодская область"
      ],
-     "s": 64529242,
-     "sha1_base64": "vC51OvdY4Xi2Ql+nBJ3ycwfLc5I="
+     "s": 64735629,
+     "sha1_base64": "PNVV7p0mT/z2OU/iPI/KnxggjVs="
     },
     {
      "id": "Russia_Voronezh Oblast",
@@ -11986,8 +11986,8 @@
       "Российская Федерация",
       "Воронежская область"
      ],
-     "s": 62086833,
-     "sha1_base64": "/s4Hig/Jw0/IUCegJbs+UWZQHGc="
+     "s": 62304612,
+     "sha1_base64": "MNCa/tS2M6LnQLGMF/rpVGLXf0A="
     },
     {
      "id": "Russia_Yamalo-Nenets Autonomous Okrug",
@@ -11999,8 +11999,8 @@
       "Россия",
       "Российская Федерация"
      ],
-     "s": 42721358,
-     "sha1_base64": "Z+aWkkMnxCYGlmJzk8puc04wH74="
+     "s": 42916409,
+     "sha1_base64": "LQxoKwfU/dM0db8YLXvDWsCnxL4="
     },
     {
      "id": "Russia_Yaroslavl Oblast",
@@ -12012,8 +12012,8 @@
       "Российская Федерация",
       "Ярославская область"
      ],
-     "s": 43268390,
-     "sha1_base64": "S2nDtc2DyIgtHhg9tiqDdqcwhJA="
+     "s": 43470737,
+     "sha1_base64": "UDMC13fSGR8LdYcFgB6f+yCNWv8="
     },
     {
      "id": "Russia_Yugra_Khanty",
@@ -12025,8 +12025,8 @@
       "Россия",
       "Российская Федерация"
      ],
-     "s": 68584967,
-     "sha1_base64": "ovsPGIWfAQ/Hk4LD2d8yrdK2G2w="
+     "s": 68719978,
+     "sha1_base64": "vzFfCEST26A0QqgqTEj682F26QU="
     },
     {
      "id": "Russia_Yugra_Surgut",
@@ -12038,8 +12038,8 @@
       "Россия",
       "Российская Федерация"
      ],
-     "s": 66591255,
-     "sha1_base64": "hhTnVRcgDSNZ5Z4uo9SZIDvHs2c="
+     "s": 66913386,
+     "sha1_base64": "dgU01P1azplb8Ix5/laRkvoTprc="
     },
     {
      "id": "Russia_Zabaykalsky Krai",
@@ -12051,8 +12051,8 @@
       "Российская Федерация",
       "Забайкальский край"
      ],
-     "s": 63075028,
-     "sha1_base64": "riSbyQn8+Rl4h8wBBwiYh7HtMbU="
+     "s": 63146399,
+     "sha1_base64": "ZGrlMC8EzO/CCBg5cFp8Oo7LyV8="
     }
    ]
   },
@@ -12069,8 +12069,8 @@
     "Rwanda",
     "Umujyi wa Kigali"
    ],
-   "s": 58697485,
-   "sha1_base64": "V4f+A8NopkmLQ8hayYwYyByxnDA="
+   "s": 58920503,
+   "sha1_base64": "KW3g5A4GbwyccYCqOmV4ic7JhNs="
   },
   {
    "id": "Sahrawi Arab Democratic Republic",
@@ -12082,8 +12082,8 @@
     "Maroc ⵍⵎⵖⵔⵉⴱ المغرب",
     "RASD"
    ],
-   "s": 14777865,
-   "sha1_base64": "hW5yBFpSiMP5znNlLF303oyHZok="
+   "s": 14778299,
+   "sha1_base64": "ZroMCX8F/1Pchl3czREJXAIq9R8="
   },
   {
    "id": "Saint Helena Ascension and Tristan da Cunha",
@@ -12097,8 +12097,8 @@
     "Saint Helena, Ascension and Tristan da Cunha",
     "Tristan da Cunha"
    ],
-   "s": 1977908,
-   "sha1_base64": "DtJqpqSLQXhYtRiO85fcIlkT3zU="
+   "s": 1978500,
+   "sha1_base64": "flY/SynV1wL+BdoSIFeswROfYD0="
   },
   {
    "id": "Samoa",
@@ -12116,8 +12116,8 @@
     "American Samoa",
     "Sāmoa"
    ],
-   "s": 6968902,
-   "sha1_base64": "5G3zjWpQtR9KBp92z1Y5HyyWA74="
+   "s": 6975448,
+   "sha1_base64": "d8u32AisoQshGionVRDUIeDjyYA="
   },
   {
    "id": "San Marino",
@@ -12129,8 +12129,8 @@
     "Italia",
     "San Marino"
    ],
-   "s": 1719426,
-   "sha1_base64": "GhLhBHSM3KB0MLsItXLnrIxNbbc="
+   "s": 1722611,
+   "sha1_base64": "tsG35PhWNwpf9ou/I3pDpM789Go="
   },
   {
    "id": "Saudi Arabia",
@@ -12148,8 +12148,8 @@
       "الشرقية",
       "‏المملكة العربية السعودية‎"
      ],
-     "s": 121857019,
-     "sha1_base64": "oIWagoJi9/nsF/Pm0k1xuUo7UWc="
+     "s": 122098478,
+     "sha1_base64": "HvhIHLqQiRPNGCWKRrcy07sMV00="
     },
     {
      "id": "Saudi Arabia_North",
@@ -12167,8 +12167,8 @@
       "المدينة المنورة",
       "‏المملكة العربية السعودية‎"
      ],
-     "s": 105379098,
-     "sha1_base64": "dwX27HuK+u2PFW096EIvstj3wYM="
+     "s": 105646325,
+     "sha1_base64": "gReHuOBkyv74TuB02DQgFydP2P4="
     }
    ]
   },
@@ -12184,8 +12184,8 @@
     "Região de Cacheu",
     "Senegal"
    ],
-   "s": 103529767,
-   "sha1_base64": "oTJ4MhozCdjymXLnXNhU5r/oqh0="
+   "s": 103789602,
+   "sha1_base64": "Lqytu42JwiEUyMwwy64ql3dlNr4="
   },
   {
    "id": "Serbia",
@@ -12197,8 +12197,8 @@
     "Војводина",
     "Централна Србија"
    ],
-   "s": 233922324,
-   "sha1_base64": "NU99oErF6N0k9YuIIuMXFRdh+R0="
+   "s": 235526415,
+   "sha1_base64": "MUpfjUGaJryQGb4ZBOCoA3aty4w="
   },
   {
    "id": "Seychelles",
@@ -12208,8 +12208,8 @@
    "affiliations": [
     "Sesel"
    ],
-   "s": 3035227,
-   "sha1_base64": "Ffn4YS8e7iIlIWzSZmkTF5zz6Mg="
+   "s": 3038133,
+   "sha1_base64": "6wEVmoWzUd9B6Nm6xp59x3FExKQ="
   },
   {
    "id": "Sierra Leone",
@@ -12223,8 +12223,8 @@
     "Southern Province",
     "Western Area"
    ],
-   "s": 47088332,
-   "sha1_base64": "aQyLhde4tFpJwetpHs4grzPnZ/k="
+   "s": 47065342,
+   "sha1_base64": "m0c/dAGGxncV3/A58JKdldgZQCA="
   },
   {
    "id": "Singapore",
@@ -12236,8 +12236,8 @@
     "Malaysia",
     "Singapura"
    ],
-   "s": 29471228,
-   "sha1_base64": "ufhbt+o8BjuOfM0aY6Ep4H8wHo0="
+   "s": 30314415,
+   "sha1_base64": "3lRqVOt0NZJc95IphVq2l7G/130="
   },
   {
    "id": "Slovakia",
@@ -12251,8 +12251,8 @@
       "Prešovský kraj",
       "Slovensko"
      ],
-     "s": 54877864,
-     "sha1_base64": "Ds7q8zLxltBLDGuR/1KwzJcPw0Q="
+     "s": 55515579,
+     "sha1_base64": "O+H/QWnWL78VgEh2AqELJ+KbFTI="
     },
     {
      "id": "Slovakia_Region of Kosice",
@@ -12263,8 +12263,8 @@
       "Košický kraj",
       "Slovensko"
      ],
-     "s": 51650399,
-     "sha1_base64": "v5WsqFYyoysETe+ERPjXlVxrqo0="
+     "s": 52141674,
+     "sha1_base64": "i2GW6pHnQhbeWnFov1Cb4uPoPMk="
     },
     {
      "id": "Slovakia_Region of Banska Bystrica",
@@ -12275,8 +12275,8 @@
       "Banskobystrický kraj",
       "Slovensko"
      ],
-     "s": 66625809,
-     "sha1_base64": "w08uyfAn92WHmgHmV+KfpEsCql0="
+     "s": 66792036,
+     "sha1_base64": "POW3VMn5PL0YEE/sHA5+QPkMclQ="
     },
     {
      "id": "Slovakia_Region of Trnava",
@@ -12287,8 +12287,8 @@
       "Slovensko",
       "Trnavský kraj"
      ],
-     "s": 29268477,
-     "sha1_base64": "Qx2WykKhY8W3Ym/2sBRrmDfeDgE="
+     "s": 29460128,
+     "sha1_base64": "/DMgk6kONNByyXRw4H86F0W+DY4="
     },
     {
      "id": "Slovakia_Region of Trencin",
@@ -12299,8 +12299,8 @@
       "Slovensko",
       "Trenčiansky kraj"
      ],
-     "s": 42139239,
-     "sha1_base64": "y9WPmf8FSM4yvj4veqUFqbUBbzU="
+     "s": 42379610,
+     "sha1_base64": "ucEOUZTAB1uIfrvtN78hxmVinRM="
     },
     {
      "id": "Slovakia_Region of Nitra",
@@ -12311,8 +12311,8 @@
       "Nitriansky kraj",
       "Slovensko"
      ],
-     "s": 31341358,
-     "sha1_base64": "AorT6rwYsjkicwDoJ5AM79whBRM="
+     "s": 31528585,
+     "sha1_base64": "q1SaqXjacbjtVusXxaKYIes/dm4="
     },
     {
      "id": "Slovakia_Region of Bratislava",
@@ -12323,8 +12323,8 @@
       "Bratislavský kraj",
       "Slovensko"
      ],
-     "s": 25276741,
-     "sha1_base64": "6ZwzJLRrzh8x30+CDB8tlsgBpPA="
+     "s": 25644536,
+     "sha1_base64": "kBMWe8Sj+9Qx15zeAQhjkMXQy1A="
     },
     {
      "id": "Slovakia_Region of Zilina",
@@ -12335,8 +12335,8 @@
       "Slovensko",
       "Žilinský kraj"
      ],
-     "s": 58896872,
-     "sha1_base64": "erHPa94EHP0VAjndE5QWIXhoD60="
+     "s": 59189627,
+     "sha1_base64": "4ZHcYV3rhViA4jVBe2kS70FL9hQ="
     }
    ]
   },
@@ -12352,8 +12352,8 @@
       "Border SI-HR",
       "Slovenija"
      ],
-     "s": 177981479,
-     "sha1_base64": "6hUEBY6Wh2G7taJblu50fBCmUW0="
+     "s": 178264138,
+     "sha1_base64": "z3v4k1M6GmVWnMN26Yyj0yXEuy8="
     },
     {
      "id": "Slovenia_West",
@@ -12363,8 +12363,8 @@
      "affiliations": [
       "Slovenija"
      ],
-     "s": 131963966,
-     "sha1_base64": "ujwnoEpA3j+tYD8E0SWLm/bAHU0="
+     "s": 132368673,
+     "sha1_base64": "ykWJ/4QJzoHp3qVjZcOtKOjkXJM="
     }
    ]
   },
@@ -12386,8 +12386,8 @@
     "Temotu Province",
     "Western Province"
    ],
-   "s": 19440980,
-   "sha1_base64": "RXOR2HKzMnvan8pqyPCHlmvXnR4="
+   "s": 19448964,
+   "sha1_base64": "f1+Pl33dUhpE+IGUMDArKJp8VEQ="
   },
   {
    "id": "Somalia",
@@ -12415,8 +12415,8 @@
     "Togdheer",
     "Woqooyi Galbeed"
    ],
-   "s": 208503878,
-   "sha1_base64": "SOZ4TK/qP/jd8d7Uq1QDlBLTE5s="
+   "s": 208604510,
+   "sha1_base64": "FKp0YY9VepjVZ2b2pqqK5FLGnYc="
   },
   {
    "id": "South Africa",
@@ -12431,8 +12431,8 @@
       "South Africa",
       "Western Cape"
      ],
-     "s": 71811812,
-     "sha1_base64": "jCE/JO3LNVYCnGldxpAasUmI6Tk="
+     "s": 72736623,
+     "sha1_base64": "6chBmZre2V752okxCK9Aakr1qAI="
     },
     {
      "id": "South Africa_Gauteng",
@@ -12443,8 +12443,8 @@
       "Gauteng",
       "South Africa"
      ],
-     "s": 46921070,
-     "sha1_base64": "AAUwPwCLdKL2w2fpmBdR5SuPtQk="
+     "s": 48774321,
+     "sha1_base64": "dT0WShhQt4TfpBGn0kMcuIcZiJE="
     },
     {
      "id": "South Africa_North West",
@@ -12455,8 +12455,8 @@
       "North West",
       "South Africa"
      ],
-     "s": 30304162,
-     "sha1_base64": "VFWoe6wAuo0nK4RPlln510xeRxU="
+     "s": 30421221,
+     "sha1_base64": "7igZ8F59C1X5M9HvRtlC1MnR9pw="
     },
     {
      "id": "South Africa_Free State",
@@ -12467,8 +12467,8 @@
       "Free State",
       "South Africa"
      ],
-     "s": 32596443,
-     "sha1_base64": "Dhl/2T+CQGtpgSMBZX2qzJysps0="
+     "s": 32759462,
+     "sha1_base64": "OKmiV7PcBkCtJKalUOzH0FXaqIs="
     },
     {
      "id": "South Africa_Eastern Cape",
@@ -12479,8 +12479,8 @@
       "Eastern Cape",
       "South Africa"
      ],
-     "s": 49975189,
-     "sha1_base64": "6j4MWp9x8O7ddnU9cUayhDfvqc8="
+     "s": 50510216,
+     "sha1_base64": "gpKGtREkcsN/gI04+5/6Gt+X08M="
     },
     {
      "id": "South Africa_Northern Cape",
@@ -12491,8 +12491,8 @@
       "Northern Cape",
       "South Africa"
      ],
-     "s": 32348002,
-     "sha1_base64": "fK7/J/i7c+NH331Vyx5L/zzH9gw="
+     "s": 32689181,
+     "sha1_base64": "YaS+Pd4KB9uqGS9LGWga7bAwtwo="
     },
     {
      "id": "South Africa_Mpumalanga",
@@ -12503,8 +12503,8 @@
       "Mpumalanga",
       "South Africa"
      ],
-     "s": 37128212,
-     "sha1_base64": "QtHOtRmfKw6hT6cuVAIovgvRZGY="
+     "s": 37315287,
+     "sha1_base64": "ESoB10+ODG7fsjKrCgJQauu9oho="
     },
     {
      "id": "South Africa_Limpopo",
@@ -12515,8 +12515,8 @@
       "Limpopo",
       "South Africa"
      ],
-     "s": 33263027,
-     "sha1_base64": "zVB7aMjdhQURRR3fjDVCH6q4qbM="
+     "s": 33473342,
+     "sha1_base64": "2PIGSF2NFEBkCtfpltusbtGchdk="
     },
     {
      "id": "South Africa_KwaZulu-Natal",
@@ -12527,8 +12527,8 @@
       "KwaZulu-Natal",
       "South Africa"
      ],
-     "s": 125802139,
-     "sha1_base64": "KY4RtOwcwZOwrsN7vNlKEZDxSSQ="
+     "s": 126333366,
+     "sha1_base64": "RkRFu7wojkQk0dpNvK371Db4be8="
     }
    ]
   },
@@ -12545,7 +12545,7 @@
     "South Georgia and South Sandwich Islands"
    ],
    "s": 12384546,
-   "sha1_base64": "a66TOgEzoPCJdrYuTn8sm7uhP50="
+   "sha1_base64": "RWF1tr91ZmEkY4hL74jRqR+OSNs="
   },
   {
    "id": "South Ossetia",
@@ -12557,8 +12557,8 @@
     "Хуссар Ирыстон - Южная Осетия",
     "საქართველო"
    ],
-   "s": 12475897,
-   "sha1_base64": "qhPYQFZiS7Z1S3OjwOG+UDCnHvc="
+   "s": 12480489,
+   "sha1_base64": "QU0qqmG6fYsTNLEj5eMYPi0rT/Q="
   },
   {
    "id": "South Sudan",
@@ -12579,8 +12579,8 @@
     "Western Equatoria",
     "واراب"
    ],
-   "s": 115919879,
-   "sha1_base64": "Hg4Osmt6vmrA1ec+G+xnddRjA/M="
+   "s": 115962129,
+   "sha1_base64": "DUL2wVdyaqc06sqEo/BdbP/X6Q0="
   },
   {
    "id": "Spain",
@@ -12595,8 +12595,8 @@
       "España (mare territorial)",
       "España"
      ],
-     "s": 89916166,
-     "sha1_base64": "R125unoOXiGRrURrU5qHpBovAT8="
+     "s": 90597249,
+     "sha1_base64": "c/qUrplwt8/OSY+kSWdFxGCg344="
     },
     {
      "id": "Spain_Andalusia_Sevilla",
@@ -12607,8 +12607,8 @@
       "Andalucía",
       "España"
      ],
-     "s": 106748549,
-     "sha1_base64": "1335tkFfLV1q9leHxlnR2NpMYRo="
+     "s": 107661176,
+     "sha1_base64": "Ev+HlXaaIwPL/5XcianuExAYub0="
     },
     {
      "id": "Spain_Aragon",
@@ -12619,8 +12619,8 @@
       "Aragón",
       "España"
      ],
-     "s": 111107456,
-     "sha1_base64": "q9FqQEqMS18+x4JsyMNz8Y6IRK0="
+     "s": 111749555,
+     "sha1_base64": "ILjoggFScq9qy2R5325m1c/wqVo="
     },
     {
      "id": "Spain_Balearic Islands",
@@ -12631,8 +12631,8 @@
       "Illes Balears",
       "España"
      ],
-     "s": 47777886,
-     "sha1_base64": "upWkeUslEXqQG487v69ptKmVFWg="
+     "s": 48392297,
+     "sha1_base64": "6hn7tSa20XvCUGjw4QL8IeuxbIU="
     },
     {
      "id": "Spain_Basque Country",
@@ -12644,8 +12644,8 @@
       "España",
       "Euskadi"
      ],
-     "s": 81034957,
-     "sha1_base64": "cd5m7wRGrQNaGU4dV4C2YlaZ/5E="
+     "s": 81563912,
+     "sha1_base64": "GkGevz0nRif3bQzVWYhJGtAAzAQ="
     },
     {
      "id": "Spain_Canary Islands",
@@ -12656,8 +12656,8 @@
       "Canarias",
       "España"
      ],
-     "s": 64079593,
-     "sha1_base64": "wJHkMwO2rAV9u9zZS2ewmVWHjhY="
+     "s": 64492164,
+     "sha1_base64": "w3mqVEVdg+VugjO7kQcj8oKQyYo="
     },
     {
      "id": "Spain_Cantabria",
@@ -12668,8 +12668,8 @@
       "Cantabria",
       "España"
      ],
-     "s": 37069087,
-     "sha1_base64": "gN2OrYROus5lzODtIdnVWnueafY="
+     "s": 37322378,
+     "sha1_base64": "zn14s9vgowV3KLE9SBOEreBHZgM="
     },
     {
      "id": "Spain_Castile and Leon_West",
@@ -12680,8 +12680,8 @@
       "Castilla y León",
       "España"
      ],
-     "s": 106465336,
-     "sha1_base64": "5wQMnQD+6slPBGplA+BL7JiI/KU="
+     "s": 106807603,
+     "sha1_base64": "t97iokl2HBGSJoAuftWo0KrffiM="
     },
     {
      "id": "Spain_Castile and Leon_East",
@@ -12692,8 +12692,8 @@
       "Castilla y León",
       "España"
      ],
-     "s": 93124687,
-     "sha1_base64": "ofxxXkoHkNvgoC2G1Gl/xGrCxj8="
+     "s": 93772890,
+     "sha1_base64": "Ss1TCpXPq0mnrwcPUrzGKGfagvg="
     },
     {
      "id": "Spain_Castile-La Mancha",
@@ -12704,8 +12704,8 @@
       "Castilla-La Mancha",
       "España"
      ],
-     "s": 124871153,
-     "sha1_base64": "KLVA5FVRlSM4c63Y3zvfiRwhVQA="
+     "s": 125093748,
+     "sha1_base64": "0IhEaK5NoBKxui1KYYVM3ufZLik="
     },
     {
      "id": "Spain_Catalonia_Provincia de Barcelona",
@@ -12716,8 +12716,8 @@
       "Catalunya",
       "España"
      ],
-     "s": 137215896,
-     "sha1_base64": "KLUgig7o2cn9qThLHg2oXSdcIsE="
+     "s": 138039995,
+     "sha1_base64": "Dwoz2zWMrkBrU+8cXtXC0evgKR0="
     },
     {
      "id": "Spain_Catalonia_Provincia de Girona",
@@ -12728,8 +12728,8 @@
       "Catalunya",
       "España"
      ],
-     "s": 51730624,
-     "sha1_base64": "WPIWrWpKghC4Wmdoud+inAFsmm0="
+     "s": 51894859,
+     "sha1_base64": "cb9XuC8VIHi835u+Xl6WJbKlRzI="
     },
     {
      "id": "Spain_Catalonia_Provincia de Lleida",
@@ -12740,8 +12740,8 @@
       "Catalunya",
       "España"
      ],
-     "s": 64625618,
-     "sha1_base64": "pKPXPN2FZEGHOAApkSblOnfjIoo="
+     "s": 64837493,
+     "sha1_base64": "KVJlSCboIpRg/UWWneUp1ikJNJI="
     },
     {
      "id": "Spain_Catalonia_Provincia de Tarragona",
@@ -12752,8 +12752,8 @@
       "Catalunya",
       "España"
      ],
-     "s": 48021799,
-     "sha1_base64": "YsZ+7VZ55xXA4JQqOufD3ZBsqQk="
+     "s": 48312586,
+     "sha1_base64": "VItu+gMhYMTassPVSWK93jWyp9o="
     },
     {
      "id": "Spain_Ceuta",
@@ -12765,8 +12765,8 @@
       "España",
       "Maroc ⵍⵎⵖⵔⵉⴱ المغرب"
      ],
-     "s": 729580,
-     "sha1_base64": "XWZK9BSZIOaOwK6LgBu9raR9yfw="
+     "s": 733565,
+     "sha1_base64": "L7218XY+jPzvSfiWWIaugA8xheU="
     },
     {
      "id": "Spain_Community of Madrid",
@@ -12777,8 +12777,8 @@
       "Comunidad de Madrid",
       "España"
      ],
-     "s": 87815325,
-     "sha1_base64": "tKYR95btHM72yMxnRpqpbx4Pa3w="
+     "s": 88686896,
+     "sha1_base64": "Xt+OJ6giTxOJy5idhbOaAo7IEHk="
     },
     {
      "id": "Spain_Comunidad Foral de Navarra",
@@ -12789,8 +12789,8 @@
       "Comunidad Foral de Navarra",
       "España"
      ],
-     "s": 46460074,
-     "sha1_base64": "2WyOQj8aaCyzkfrVtL6ymjug8pY="
+     "s": 46604061,
+     "sha1_base64": "4/9d49LcjwbCEYcq0bZPGD1OdSY="
     },
     {
      "id": "Spain_Extremadura",
@@ -12801,8 +12801,8 @@
       "España",
       "Extremadura"
      ],
-     "s": 49120599,
-     "sha1_base64": "fz3I0DzW7LMCiIyyCHxi3BquXls="
+     "s": 49311666,
+     "sha1_base64": "GLJ5NbZee08H1gTLln60yAeSgNU="
     },
     {
      "id": "Spain_Galicia_North",
@@ -12813,8 +12813,8 @@
       "España",
       "Galicia"
      ],
-     "s": 71365197,
-     "sha1_base64": "elGNHJFbXYPllpEp5gsoBKqmXtA="
+     "s": 71560264,
+     "sha1_base64": "Xx4VPOU5Loj/g/y9iSmZSyfhaLY="
     },
     {
      "id": "Spain_Galicia_South",
@@ -12825,8 +12825,8 @@
       "España",
       "Galicia"
      ],
-     "s": 50891137,
-     "sha1_base64": "ELtOcDZ0cu3Ib1NOj3pv3LPae20="
+     "s": 51171509,
+     "sha1_base64": "pGuNi/T3e9XBBSXr0LHVmoX1U4M="
     },
     {
      "id": "Spain_La Rioja",
@@ -12837,8 +12837,8 @@
       "España",
       "La Rioja"
      ],
-     "s": 18626435,
-     "sha1_base64": "gEkNZ+TfRvNh0k1ZjFZPR1+6i8Y="
+     "s": 18678766,
+     "sha1_base64": "0jcul7SZUWRpap5AhRu2nHQpSGw="
     },
     {
      "id": "Spain_Melilla",
@@ -12851,8 +12851,8 @@
       "Maroc ⵍⵎⵖⵔⵉⴱ المغرب",
       "Melilla"
      ],
-     "s": 984212,
-     "sha1_base64": "OM94YRZqMIu6ezMVTRAdkQ4mr1A="
+     "s": 987605,
+     "sha1_base64": "SWVkbMM+U7jrjinGOW3cCfl/rOg="
     },
     {
      "id": "Spain_Principado de Asturias",
@@ -12863,8 +12863,8 @@
       "España",
       "Principado de Asturias"
      ],
-     "s": 39547936,
-     "sha1_base64": "TgMwPEHsPLwO4DZvnthuI2pZh/4="
+     "s": 39628419,
+     "sha1_base64": "IReLMTJ26cLDhRHnkAD5w1a0pK0="
     },
     {
      "id": "Spain_Region de Murcia",
@@ -12875,8 +12875,8 @@
       "España",
       "Región de Murcia"
      ],
-     "s": 45048742,
-     "sha1_base64": "KjtEovEb5+O+Dapk6plgys9fUXs="
+     "s": 45203665,
+     "sha1_base64": "lfUiQVhlT+BxPpbO9iEDlxvtKhs="
     },
     {
      "id": "Spain_Valencian Community",
@@ -12887,8 +12887,8 @@
       "Comunitat Valenciana",
       "España"
      ],
-     "s": 144789402,
-     "sha1_base64": "WorL7mSb2Pbw26VYhwTYmvz3P4w="
+     "s": 145749173,
+     "sha1_base64": "6N2U3GKEAOkmHFn0LG2bnaY7Wuc="
     }
    ]
   },
@@ -12908,8 +12908,8 @@
       "מחוז ירושלים",
       "מדינת ישראל"
      ],
-     "s": 9790966,
-     "sha1_base64": "+HfD6DgyEscyCPoV+zZVxdZKNak="
+     "s": 9971721,
+     "sha1_base64": "sQ45aaspiOwI7vb1pc/ZoX0NaGo="
     },
     {
      "id": "Palestine",
@@ -12921,8 +12921,8 @@
       "Area B",
       "Area C"
      ],
-     "s": 37307643,
-     "sha1_base64": "zPrNb4vz+c85TStG32pEE2a/caE="
+     "s": 37346102,
+     "sha1_base64": "Ka9/OAK1/WkBcUapu7ruath7wjc="
     }
    ]
   },
@@ -12943,8 +12943,8 @@
     "Western Province",
     "ශ්‍රී ලංකා"
    ],
-   "s": 139578529,
-   "sha1_base64": "wam0VDjDnlkjKDh3BoMIl1n3CHU="
+   "s": 139849924,
+   "sha1_base64": "SpSJ2bUMzS953TiU7nJ3WKLFpyU="
   },
   {
    "id": "Sudan",
@@ -12967,8 +12967,8 @@
       "an-Nil al-Azraq",
       "ash-Shamaliyah"
      ],
-     "s": 54654772,
-     "sha1_base64": "mJFVt2vU+fiQQ1i+MNggTgOd0tY="
+     "s": 54777271,
+     "sha1_base64": "ShIOhc6GVhzcF+oRS6s//y12zdE="
     },
     {
      "id": "Sudan_West",
@@ -12993,8 +12993,8 @@
       "ash-Shamaliyah",
       "واراب"
      ],
-     "s": 148092657,
-     "sha1_base64": "lOihn++31enCbl2jVFgPlpkBecc="
+     "s": 148570436,
+     "sha1_base64": "BVT19xLs1dzYQEMgQvt4SDX/dos="
     }
    ]
   },
@@ -13016,8 +13016,8 @@
     "Suriname",
     "Wanica"
    ],
-   "s": 32055345,
-   "sha1_base64": "yaG0GpJHtbdzUpdy8vPRee81mV0="
+   "s": 32119428,
+   "sha1_base64": "8TONY5OgylPG4pTqI4NjbAJBE+Q="
   },
   {
    "id": "Swaziland",
@@ -13034,8 +13034,8 @@
    "country_name_synonyms": [
     "Eswatini"
    ],
-   "s": 27924006,
-   "sha1_base64": "ryfwfWhNajDl5akAzWunlaE1rUk="
+   "s": 27940560,
+   "sha1_base64": "Br8MVfbXvPTE7j5x9x46dOyG4h8="
   },
   {
    "id": "Sweden",
@@ -13051,8 +13051,8 @@
       "Uppsala län",
       "Västmanlands län"
      ],
-     "s": 65402619,
-     "sha1_base64": "vG4K8232M1eoLxlz5+dGjd4eeCg="
+     "s": 65891494,
+     "sha1_base64": "c9c6CAKSUut35UQL9tOaMwI3XNc="
     },
     {
      "id": "Sweden_Stockholm",
@@ -13063,8 +13063,8 @@
       "Stockholms län",
       "Sverige"
      ],
-     "s": 66738330,
-     "sha1_base64": "s2iZ6YhYTGqVduhBU+keAXN1mEo="
+     "s": 67192205,
+     "sha1_base64": "YzZLUEsHHQjwCZqOj9ZE7GNtN1s="
     },
     {
      "id": "Sweden_Ostra Gotaland",
@@ -13081,8 +13081,8 @@
       "Sverige",
       "Territorial waters of Gotland"
      ],
-     "s": 110721726,
-     "sha1_base64": "LnhdzOWrMmMjhgmcWXo5thOcp2U="
+     "s": 111489065,
+     "sha1_base64": "8ti1LF/IEPKoubr0HaVmqob+4l8="
     },
     {
      "id": "Sweden_Norra Sverige",
@@ -13094,8 +13094,8 @@
       "Sverige",
       "Västerbottens län"
      ],
-     "s": 109248421,
-     "sha1_base64": "ylr0F7yidBZFhF0xAUSYetgCPNw="
+     "s": 109581281,
+     "sha1_base64": "141kKHAgliGM8vXmniI3aj1Oovg="
     },
     {
      "id": "Sweden_Mellannorrland",
@@ -13107,8 +13107,8 @@
       "Sverige",
       "Västernorrlands län"
      ],
-     "s": 134540979,
-     "sha1_base64": "nPhV3KaCjVET4H0N207zN0eesKU="
+     "s": 134786270,
+     "sha1_base64": "lxqKruSBf0/VlmS/+cQWlonQwZg="
     },
     {
      "id": "Sweden_Bergslagen",
@@ -13122,8 +13122,8 @@
       "Sverige",
       "Värmlands län"
      ],
-     "s": 163309102,
-     "sha1_base64": "jcnnV1XvvImPGlYP9sdrut7h1zc="
+     "s": 163809121,
+     "sha1_base64": "SenjUtqzKYkTW//BjhCx3ZQPoh4="
     },
     {
      "id": "Sweden_Vastra Gotaland",
@@ -13136,8 +13136,8 @@
       "Sverige",
       "Västra Götalands län"
      ],
-     "s": 131811934,
-     "sha1_base64": "NUMwuMDixwtuQldmGMwSFiAhGTI="
+     "s": 132652473,
+     "sha1_base64": "wvUdOTRT3buBblO8z7/jdyikFS8="
     },
     {
      "id": "Sweden_Sodra Gotaland",
@@ -13151,8 +13151,8 @@
       "Sverige",
       "Territorial waters of Bornholm"
      ],
-     "s": 59834282,
-     "sha1_base64": "tz4m98N6diyy/bCzq3nPWuo0aUI="
+     "s": 60095405,
+     "sha1_base64": "tySNRqbN5BudRUXx1AseCYm8/PY="
     }
    ]
   },
@@ -13174,8 +13174,8 @@
       "Schweiz, Suisse, Svizzera, Svizra",
       "Thurgau"
      ],
-     "s": 98639831,
-     "sha1_base64": "noSCKKoMV/WTUJx35oy8GwzccJ0="
+     "s": 99056322,
+     "sha1_base64": "xmNj+vnH7pUmsHwIgOuS+Y5TzWE="
     },
     {
      "id": "Switzerland_Central",
@@ -13191,8 +13191,8 @@
       "Uri",
       "Zug"
      ],
-     "s": 53138760,
-     "sha1_base64": "h7ct6lQLaG3q+MwxeaPDa8yI+/E="
+     "s": 53499635,
+     "sha1_base64": "W1l6fUkkNhBVSzxMpDFUyBVtk7E="
     },
     {
      "id": "Switzerland_Espace Mittelland_Bern",
@@ -13209,8 +13209,8 @@
       "Solothurn",
       "Vaud"
      ],
-     "s": 86990238,
-     "sha1_base64": "PE190KHkO0UD8b+gxq5q72sL1JI="
+     "s": 87438233,
+     "sha1_base64": "V2rhc5FFlZl+S6/myHOwXfxtu8k="
     },
     {
      "id": "Switzerland_Espace Mittelland_East",
@@ -13221,8 +13221,8 @@
       "Bern - Berne",
       "Schweiz, Suisse, Svizzera, Svizra"
      ],
-     "s": 49854007,
-     "sha1_base64": "mkLRoqex/bKwTGZsuwdnqEDlZoM="
+     "s": 50152818,
+     "sha1_base64": "yT+YUzCqrRlyIh6jKrIQS36tYlY="
     },
     {
      "id": "Switzerland_Ticino",
@@ -13233,8 +13233,8 @@
       "Schweiz, Suisse, Svizzera, Svizra",
       "Ticino"
      ],
-     "s": 30957581,
-     "sha1_base64": "QvXkNFMaIHCnZj63VfnmkHRXhqc="
+     "s": 31217697,
+     "sha1_base64": "eSQbsm/ZylhhOYDArBJBqSu3ZJ4="
     },
     {
      "id": "Switzerland_Northwestern",
@@ -13247,8 +13247,8 @@
       "Basel-Stadt",
       "Schweiz, Suisse, Svizzera, Svizra"
      ],
-     "s": 55033899,
-     "sha1_base64": "amqBi42K8qQxZrZIB9dhn2DrCLM="
+     "s": 55333798,
+     "sha1_base64": "Rcn/6EFbnVYzOVMcxXIYFFreboo="
     },
     {
      "id": "Switzerland_Lake Geneva region",
@@ -13262,8 +13262,8 @@
       "Vaud",
       "Valais - Wallis"
      ],
-     "s": 105390529,
-     "sha1_base64": "rukWAeAvatrDceT1OFSBNVcjg+M="
+     "s": 105896080,
+     "sha1_base64": "HaddiW/b49xlT8rLtiJ3prG7FQc="
     },
     {
      "id": "Switzerland_Zurich",
@@ -13274,8 +13274,8 @@
       "Schweiz, Suisse, Svizzera, Svizra",
       "Zürich"
      ],
-     "s": 61707092,
-     "sha1_base64": "/93k6o5HQNRkfD5zaaHTpPUrsJc="
+     "s": 62188839,
+     "sha1_base64": "rO9Stynecur1hgld/7HwbyXGlZc="
     }
    ]
   },
@@ -13301,8 +13301,8 @@
     "UNDOF",
     "حمص"
    ],
-   "s": 99729794,
-   "sha1_base64": "NJZ6FerbpwLel9jQOw89oxbo49o="
+   "s": 99911429,
+   "sha1_base64": "5ve0JZW28N98ttq4/WSmdd6kb+U="
   },
   {
    "id": "Sao Tome and Principe",
@@ -13314,8 +13314,8 @@
     "São Tomé Province",
     "São Tomé e Príncipe"
    ],
-   "s": 3011573,
-   "sha1_base64": "7kVzQdp574AOx9O5IAvh2wO6MCE="
+   "s": 3015479,
+   "sha1_base64": "VBmqoW9SgWTe+LDLwPtUwqPMymY="
   },
   {
    "id": "Tajikistan",
@@ -13329,8 +13329,8 @@
     "Ноҳияҳои тобеи ҷумҳурӣ",
     "Тоҷикистон"
    ],
-   "s": 81348630,
-   "sha1_base64": "HV3v6OE+I1ag8nCnWX5mxzPxqLY="
+   "s": 81432209,
+   "sha1_base64": "dMT+Im4pMGEAdPcrkbtqTBMId8c="
   },
   {
    "id": "Tanzania",
@@ -13365,8 +13365,8 @@
     "Unguja Kusini",
     "Unguja Mjini Magharibi"
    ],
-   "s": 606346328,
-   "sha1_base64": "vj3TB18xfF0C16ZnM9PhJztBCQU="
+   "s": 606758732,
+   "sha1_base64": "IBEHVr6MmygbmYi5po4uVqP19m8="
   },
   {
    "id": "Thailand",
@@ -13392,8 +13392,8 @@
       "จังหวัดเชียงใหม่",
       "จังหวัดแม่ฮ่องสอน"
      ],
-     "s": 65152780,
-     "sha1_base64": "iGXSUDF3Q+h7iv2eGiQnjrFYX8s="
+     "s": 65423615,
+     "sha1_base64": "f3cIu2f9kmaoIIJ2hmp5O3YDTQ0="
     },
     {
      "id": "Thailand_Central",
@@ -13439,8 +13439,8 @@
       "จังหวัดอำนาจเจริญ",
       "จังหวัดพระนครศรีอยุธยา"
      ],
-     "s": 127505004,
-     "sha1_base64": "VUD/0gAwO0tqg85zh39scQJQVTU="
+     "s": 128474271,
+     "sha1_base64": "fTAgLOJ/WHU43ojdLpkzD0tEjZM="
     },
     {
      "id": "Thailand_South",
@@ -13482,8 +13482,8 @@
       "จังหวัดนครศรีธรรมราช",
       "จังหวัดประจวบคีรีขันธ์"
      ],
-     "s": 165407406,
-     "sha1_base64": "tAYqogzNHDz76y+6XbdLNscxV2M="
+     "s": 166791753,
+     "sha1_base64": "j0Es+crRKmaXsaTO2PO+4+TwGT0="
     }
    ]
   },
@@ -13499,8 +13499,8 @@
    "country_name_synonyms": [
     "Bahamas"
    ],
-   "s": 14842085,
-   "sha1_base64": "NcwQ8gz7IkwSFhdEYg20m+oCVDU="
+   "s": 14882584,
+   "sha1_base64": "w7t5lKZe9hZgIf+hI3zIKxpjP1M="
   },
   {
    "id": "The Gambia",
@@ -13519,8 +13519,8 @@
     "Mansakonko",
     "Senegal"
    ],
-   "s": 16328527,
-   "sha1_base64": "FAL1odWoKtAdmlBdd+qOafLQPj8="
+   "s": 16508353,
+   "sha1_base64": "Z6DT3Zm+f2OPc4ybvT33kt4b5a0="
   },
   {
    "id": "Netherlands",
@@ -13534,8 +13534,8 @@
       "Drenthe",
       "Nederland"
      ],
-     "s": 45567726,
-     "sha1_base64": "Fo9wkEVn8Ivjlzi6ORDjEq8baY0="
+     "s": 45764761,
+     "sha1_base64": "Y1LQiwDOcYt/tdBnWOuFlNuD6j8="
     },
     {
      "id": "Netherlands_Flevoland",
@@ -13546,8 +13546,8 @@
       "Flevoland",
       "Nederland"
      ],
-     "s": 26958899,
-     "sha1_base64": "7FXxm2MEPPvireauTyZa6nk4wx8="
+     "s": 27087206,
+     "sha1_base64": "sZlwQV2fLeJht2JXOu+Dq6zwTQU="
     },
     {
      "id": "Netherlands_Friesland",
@@ -13558,8 +13558,8 @@
       "Friesland",
       "Nederland"
      ],
-     "s": 68100056,
-     "sha1_base64": "eQlBFADCwXt4euPp8HI3Ag1GT60="
+     "s": 68424203,
+     "sha1_base64": "d+YfHOk/KHqoNVlJ+wmzXiaHLho="
     },
     {
      "id": "Netherlands_Gelderland_Nijmegen",
@@ -13570,8 +13570,8 @@
       "Gelderland",
       "Nederland"
      ],
-     "s": 41518599,
-     "sha1_base64": "5UZkPz2M0eVm/gNG71RJDkfBhYs="
+     "s": 41800562,
+     "sha1_base64": "MflsoW1cA3YcJfvO1yBsFMqKNO8="
     },
     {
      "id": "Netherlands_Gelderland_North",
@@ -13582,8 +13582,8 @@
       "Gelderland",
       "Nederland"
      ],
-     "s": 70053409,
-     "sha1_base64": "xEcvo5SFJTRXVgMj9Db8BN9ib60="
+     "s": 70506804,
+     "sha1_base64": "LR9NQ6m3KisatGJqufEx3W6dmqc="
     },
     {
      "id": "Netherlands_Gelderland_Zutphen",
@@ -13594,8 +13594,8 @@
       "Gelderland",
       "Nederland"
      ],
-     "s": 28768267,
-     "sha1_base64": "4h0rZ1s0GIeNuLUUZTjfd53+wZw="
+     "s": 28883014,
+     "sha1_base64": "+AKni7i0o96DE1y1KuHaC2gRh/g="
     },
     {
      "id": "Netherlands_Groningen",
@@ -13608,8 +13608,8 @@
       "Nederland",
       "Niedersachsen"
      ],
-     "s": 43507952,
-     "sha1_base64": "e4jmMmh9bs/wo2GojquTEb7uNYw="
+     "s": 43734203,
+     "sha1_base64": "vXApA/hsHIAF11t3N6HtguNt7Io="
     },
     {
      "id": "Netherlands_Limburg",
@@ -13620,8 +13620,8 @@
       "Limburg",
       "Nederland"
      ],
-     "s": 79161769,
-     "sha1_base64": "dOFaRWePShNRmw9yv4e4GI38pyo="
+     "s": 79558220,
+     "sha1_base64": "29JavLAK/sU2vWMJy2Zi9UnthDE="
     },
     {
      "id": "Netherlands_North Brabant_Eindhoven",
@@ -13632,8 +13632,8 @@
       "Nederland",
       "Noord-Brabant"
      ],
-     "s": 63170703,
-     "sha1_base64": "npDXnG5J37PgLYQGz9zhYK5yIdE="
+     "s": 63424410,
+     "sha1_base64": "an6wQdB85Tt79wkOjD8/XfBGuBg="
     },
     {
      "id": "Netherlands_North Brabant_Roosendaal",
@@ -13644,8 +13644,8 @@
       "Nederland",
       "Noord-Brabant"
      ],
-     "s": 21071898,
-     "sha1_base64": "8lfqiKfdAT+fLWvFxx2NmbmgPQg="
+     "s": 21156197,
+     "sha1_base64": "us1fctTVa2M85iE2Sr0aKn31CyA="
     },
     {
      "id": "Netherlands_North Brabant_Tiburg",
@@ -13657,8 +13657,8 @@
       "Nederland - Belgique / België / Belgien",
       "Noord-Brabant"
      ],
-     "s": 49687998,
-     "sha1_base64": "Ac4t2MTtB3/N24ERakN7jV/RrmI="
+     "s": 49888921,
+     "sha1_base64": "bu4gyZnT45+XiUv74YeZudyAw1U="
     },
     {
      "id": "Netherlands_North Brabant_Uden",
@@ -13669,8 +13669,8 @@
       "Nederland",
       "Noord-Brabant"
      ],
-     "s": 23141881,
-     "sha1_base64": "KCO7iiPNukjDutwxfOli+frr84U="
+     "s": 23239676,
+     "sha1_base64": "pyQE3ugLMigwnZ1QCOTJhha/vYg="
     },
     {
      "id": "Netherlands_North Holland_Alkmaar",
@@ -13681,8 +13681,8 @@
       "Nederland",
       "Noord-Holland"
      ],
-     "s": 41534198,
-     "sha1_base64": "m/S51y1RwwrYh2OKAgmaNib1wH8="
+     "s": 41718841,
+     "sha1_base64": "XKnKobRRaSIhr5ULpQej3jheR4A="
     },
     {
      "id": "Netherlands_North Holland_Amsterdam",
@@ -13693,8 +13693,8 @@
       "Nederland",
       "Noord-Holland"
      ],
-     "s": 86809513,
-     "sha1_base64": "5vGuHgRpEet1fPPQ4fBmrX2MYqw="
+     "s": 87371204,
+     "sha1_base64": "YKAY4Je7PhOnTpNUjx+V0nBTjeE="
     },
     {
      "id": "Netherlands_North Holland_Zaandam",
@@ -13705,8 +13705,8 @@
       "Nederland",
       "Noord-Holland"
      ],
-     "s": 29576146,
-     "sha1_base64": "Zf0NZJPMfdbFmBOgel6Wm5fUSF0="
+     "s": 29815877,
+     "sha1_base64": "hVmkMLqCTppV5pKs9qDsot/lkFk="
     },
     {
      "id": "Netherlands_Overijssel_Enschede",
@@ -13717,8 +13717,8 @@
       "Nederland",
       "Overijssel"
      ],
-     "s": 42883238,
-     "sha1_base64": "O3N2+/nert9tL1Vlnk24y8d/ylc="
+     "s": 43076785,
+     "sha1_base64": "C0KfU9yOwcSWTVEH+SUq9SqivWc="
     },
     {
      "id": "Netherlands_Overijssel_Zwolle",
@@ -13729,8 +13729,8 @@
       "Nederland",
       "Overijssel"
      ],
-     "s": 42660703,
-     "sha1_base64": "eVKaVif8TXQ+Tn80Pp6Ybf5aKwA="
+     "s": 42828650,
+     "sha1_base64": "zgQsRu2HwSpC2QCWPkvt32HvNi8="
     },
     {
      "id": "Netherlands_South Holland_Brielle",
@@ -13741,8 +13741,8 @@
       "Nederland",
       "Zuid-Holland"
      ],
-     "s": 22596878,
-     "sha1_base64": "CF6JLdXhqxZFjg9xxw1yQUOlHls="
+     "s": 22747793,
+     "sha1_base64": "J+qV6yJkXHzf2vkxCi5qrkt7Fbc="
     },
     {
      "id": "Netherlands_South Holland_Den Haag",
@@ -13753,8 +13753,8 @@
       "Nederland",
       "Zuid-Holland"
      ],
-     "s": 67940248,
-     "sha1_base64": "7I7k7PbV/Eg76U5mADG29BxQyNs="
+     "s": 68365307,
+     "sha1_base64": "lu6IeDy1rWvvaY7EmDsmz2XsHSw="
     },
     {
      "id": "Netherlands_South Holland_Leiden",
@@ -13765,8 +13765,8 @@
       "Nederland",
       "Zuid-Holland"
      ],
-     "s": 28318099,
-     "sha1_base64": "p8nK8/fLiRmOIYd4r4S7nvXHVQA="
+     "s": 28479070,
+     "sha1_base64": "TO4d84613FQBPSi1xznswaKa4Mo="
     },
     {
      "id": "Netherlands_South Holland_Rotterdam",
@@ -13777,8 +13777,8 @@
       "Nederland",
       "Zuid-Holland"
      ],
-     "s": 66099684,
-     "sha1_base64": "0H9u2yn1SOuFaG0DepzvxtgMXeY="
+     "s": 66495767,
+     "sha1_base64": "ovHyeQj8JKnpBZU4cPmlirmzBsM="
     },
     {
      "id": "Netherlands_Utrecht_Amersfoort",
@@ -13789,8 +13789,8 @@
       "Utrecht",
       "Nederland"
      ],
-     "s": 32325245,
-     "sha1_base64": "0n9eQrkbW8/ahWJQJw+IXYyg2Q4="
+     "s": 32502384,
+     "sha1_base64": "GwDxSCqeBaiELim+KzQ7qr+haMA="
     },
     {
      "id": "Netherlands_Utrecht_Utrecht",
@@ -13801,8 +13801,8 @@
       "Utrecht",
       "Nederland"
      ],
-     "s": 39539910,
-     "sha1_base64": "/SUdd7zUBUggZ1Uq1N8kLrOwxhg="
+     "s": 39786209,
+     "sha1_base64": "fgBDCPDSmS8VpaUjCOmi2Vc5Eow="
     },
     {
      "id": "Netherlands_Zeeland",
@@ -13813,8 +13813,8 @@
       "Nederland",
       "Zeeland"
      ],
-     "s": 36895550,
-     "sha1_base64": "5yxmOXitplApRnGM93i0Kf3FfJw="
+     "s": 37057673,
+     "sha1_base64": "rhJoiBp53wD3ibe5F7hL4+ipd48="
     }
    ]
   },
@@ -13831,8 +13831,8 @@
     "Région des Savanes",
     "Togo"
    ],
-   "s": 58737323,
-   "sha1_base64": "fjZT6oUKjWgmqkEDNHdHedXn+sA="
+   "s": 58833102,
+   "sha1_base64": "v6CpmWsM4bQkjDYiaEBtgslgnZY="
   },
   {
    "id": "Tonga",
@@ -13852,8 +13852,8 @@
     "Vahe Vaini",
     "Vavaʻu"
    ],
-   "s": 4072034,
-   "sha1_base64": "YtaJxyAnigrGdBNxb0qMbwI6yx0="
+   "s": 4073882,
+   "sha1_base64": "sRQX4b1vPNhkBoAr9FOJ7u3zgnQ="
   },
   {
    "id": "Tunisia",
@@ -13887,8 +13887,8 @@
     "القيروان",
     "المنستير"
    ],
-   "s": 81789242,
-   "sha1_base64": "wFxvMjM66BnPEqlXErit+si1kCc="
+   "s": 82002654,
+   "sha1_base64": "URjQkVF1ItQAHyA8hbcnOxhWiJg="
   },
   {
    "id": "Turkey",
@@ -13909,8 +13909,8 @@
       "Osmaniye",
       "Türkiye"
      ],
-     "s": 119497803,
-     "sha1_base64": "am2lk5+SVFbGPZYoM0hSTV1b+mo="
+     "s": 119617398,
+     "sha1_base64": "edMvH7SgqTMCmlR3I1EHyiw87kc="
     },
     {
      "id": "Turkey_Southeastern Anatolia Region",
@@ -13930,8 +13930,8 @@
       "Şanlıurfa",
       "Şırnak"
      ],
-     "s": 70939687,
-     "sha1_base64": "xubg8lXifOTewcIp+RLEWHxgOBU="
+     "s": 71042450,
+     "sha1_base64": "iXJ6625asMIvis9gubs+ZX7/A+4="
     },
     {
      "id": "Turkey_Marmara Region_Istanbul",
@@ -13948,8 +13948,8 @@
       "Çanakkale",
       "İstanbul"
      ],
-     "s": 97084333,
-     "sha1_base64": "jr1sX6qNT6OgyOh5j5dqX9/PF9g="
+     "s": 97690488,
+     "sha1_base64": "FUjMFcJFRfOVuRAyh4kSecyrGyY="
     },
     {
      "id": "Turkey_Marmara Region_Bursa",
@@ -13969,8 +13969,8 @@
       "Çanakkale",
       "İstanbul"
      ],
-     "s": 78233217,
-     "sha1_base64": "B66JKP4F0GL4s+SVkw3YPVYOvFg="
+     "s": 78527644,
+     "sha1_base64": "qxIg15jlQR7TzNb85vqDqwH3/bg="
     },
     {
      "id": "Turkey_Eastern Anatolia Region",
@@ -13994,8 +13994,8 @@
       "Tunceli",
       "Türkiye"
      ],
-     "s": 62279296,
-     "sha1_base64": "48bKRQnJgVjt7jLXTly98UWMnOs="
+     "s": 62419035,
+     "sha1_base64": "2ijLL6N0xmwqQT9Dx51gQZRiftw="
     },
     {
      "id": "Turkey_Black Sea Region",
@@ -14023,8 +14023,8 @@
       "Zonguldak",
       "Çorum"
      ],
-     "s": 107186645,
-     "sha1_base64": "YDBZ1o+ZDT6oECXRUpeutazjy9g="
+     "s": 107402944,
+     "sha1_base64": "aivOInj/5vQoeJF/UzFJ8dOtYxg="
     },
     {
      "id": "Turkey_Central Anatolia Region_Ankara",
@@ -14042,8 +14042,8 @@
       "Türkiye",
       "Çankırı"
      ],
-     "s": 62899320,
-     "sha1_base64": "rc1ensJyRBAAaUZzaLfC6XinBXY="
+     "s": 63050715,
+     "sha1_base64": "31SIbkEDRTRvmSpRToNYrgDY2R8="
     },
     {
      "id": "Turkey_Central Anatolia Region_Kayseri",
@@ -14059,8 +14059,8 @@
       "Türkiye",
       "Yozgat"
      ],
-     "s": 57821565,
-     "sha1_base64": "inf/r9V/Z8P+q54zubHfliSto4s="
+     "s": 57961808,
+     "sha1_base64": "bXxeRL+xXhuoZ4YCthUmtawfAqY="
     },
     {
      "id": "Turkey_Aegean Region",
@@ -14078,8 +14078,8 @@
       "Uşak",
       "İzmir"
      ],
-     "s": 104944580,
-     "sha1_base64": "hghitfQYnX9sVi+9aqKBMT30h68="
+     "s": 105620071,
+     "sha1_base64": "P+2GhHESHXfAZYVUk2HbsjpWE4o="
     }
    ]
   },
@@ -14096,8 +14096,8 @@
     "Mary",
     "Türkmenistan"
    ],
-   "s": 38668718,
-   "sha1_base64": "W1PQQtn81BxfXsb/C2P50s4G+hU="
+   "s": 38869361,
+   "sha1_base64": "zljL6W5M3Na9SpCmfmOaeY0bXXs="
   },
   {
    "id": "Turks and Caicos Islands",
@@ -14109,8 +14109,8 @@
     "The Bahamas",
     "Turks and Caicos Islands"
    ],
-   "s": 1439293,
-   "sha1_base64": "609hnYMajj+GKPe9PIRhc5IcdMM="
+   "s": 1440638,
+   "sha1_base64": "rlChjAxqjvI3rtl+QWW9hMGt9fY="
   },
   {
    "id": "Tuvalu",
@@ -14120,8 +14120,8 @@
    "affiliations": [
     "Tuvalu"
    ],
-   "s": 521637,
-   "sha1_base64": "mutIC97PtCejDJN3mrT8FQJx/Sw="
+   "s": 521677,
+   "sha1_base64": "q3DnUvCAXUKe8vYfX4kKZ4BVFpg="
   },
   {
    "id": "Uganda",
@@ -14170,8 +14170,8 @@
     "Uganda",
     "Western Region"
    ],
-   "s": 339638360,
-   "sha1_base64": "eAiuRctllCPNThIlmNe9wV47cWY="
+   "s": 339948852,
+   "sha1_base64": "LMpatPr2h34qPUNJgK3F5PSWSPQ="
   },
   {
    "id": "Ukraine",
@@ -14185,8 +14185,8 @@
       "Черкаська область",
       "Україна"
      ],
-     "s": 44669951,
-     "sha1_base64": "ClzaHJRgYK95VAA+i2LKlvukZsg="
+     "s": 44965594,
+     "sha1_base64": "oLDqq7CCcdHIWmz5/NYVJKmqpCI="
     },
     {
      "id": "Ukraine_Chernihiv Oblast",
@@ -14197,8 +14197,8 @@
       "Україна",
       "Чернігівська область"
      ],
-     "s": 36709253,
-     "sha1_base64": "wAmvJSI/k2uCpiG6csIPb/t5XVk="
+     "s": 36774368,
+     "sha1_base64": "mnv+DgcwhWsKI3noWy6bH1IGwjo="
     },
     {
      "id": "Ukraine_Chernivtsi Oblast",
@@ -14209,8 +14209,8 @@
       "Чернівецька область",
       "Україна"
      ],
-     "s": 30197770,
-     "sha1_base64": "MZlHNH/MomnjoXO7c5kGtvVhwsI="
+     "s": 30263533,
+     "sha1_base64": "ctPZTa56q33BLgyiVClY4eInFYQ="
     },
     {
      "id": "Ukraine_Dnipropetrovsk Oblast",
@@ -14221,8 +14221,8 @@
       "Україна",
       "Дніпропетровська область"
      ],
-     "s": 62581216,
-     "sha1_base64": "Rh3yWEuEB8b8MGjmvJIgyTWR4R8="
+     "s": 63132211,
+     "sha1_base64": "t9+EjaYuR6kbJMmshC1Dde7Sq0U="
     },
     {
      "id": "Ukraine_Donetsk Oblast",
@@ -14233,8 +14233,8 @@
       "Україна",
       "Донецька область"
      ],
-     "s": 70372713,
-     "sha1_base64": "h0DQJUngM6Qms1kwkmZk6svJafE="
+     "s": 70704980,
+     "sha1_base64": "APr4kOg25zebEoUvQhV3ui0FzGI="
     },
     {
      "id": "Ukraine_Ivano-Frankivsk Oblast",
@@ -14245,8 +14245,8 @@
       "Івано-Франківська область",
       "Україна"
      ],
-     "s": 41352038,
-     "sha1_base64": "aorwpCG5NkN6V3+eeQufCmRKbuw="
+     "s": 41426961,
+     "sha1_base64": "+xENWI114FcORqvJ9wAL174C6mM="
     },
     {
      "id": "Ukraine_Kharkiv Oblast",
@@ -14257,8 +14257,8 @@
       "Харківська область",
       "Україна"
      ],
-     "s": 62396463,
-     "sha1_base64": "HAj+8Hr2TifQJQQXgcBja702f3o="
+     "s": 62885874,
+     "sha1_base64": "icbQZv4pdynkSHTODMi4k3axv9I="
     },
     {
      "id": "Ukraine_Kherson Oblast",
@@ -14269,8 +14269,8 @@
       "Херсонська область",
       "Україна"
      ],
-     "s": 22955953,
-     "sha1_base64": "YdRdyWWzOCozxElpqSJVF6Ux54I="
+     "s": 23050885,
+     "sha1_base64": "wfqXuAND6Y6L9NSiIg74RxksvOM="
     },
     {
      "id": "Ukraine_Khmelnytskyi Oblast",
@@ -14281,8 +14281,8 @@
       "Хмельницька область",
       "Україна"
      ],
-     "s": 38451371,
-     "sha1_base64": "DBsAGppDcFyWcmA5JkIhfn45zNo="
+     "s": 38569230,
+     "sha1_base64": "s7bMXZyfT3peyq6xUBQby5h91xs="
     },
     {
      "id": "Ukraine_Kirovohrad Oblast",
@@ -14293,8 +14293,8 @@
       "Україна",
       "Кіровоградська область"
      ],
-     "s": 38238619,
-     "sha1_base64": "LcnLMmhkSTl+mul8GbyksozlUxA="
+     "s": 38491558,
+     "sha1_base64": "oBeaYWHTSYkVLOKr5icu8aEGZro="
     },
     {
      "id": "Ukraine_Kyiv Oblast",
@@ -14306,8 +14306,8 @@
       "Україна",
       "Київська область"
      ],
-     "s": 84525579,
-     "sha1_base64": "HEsGHUm9R6CUGhTt4YWoKpEKiss="
+     "s": 85282038,
+     "sha1_base64": "lWfQNB71597l+ES2b6qhNM550NY="
     },
     {
      "id": "Ukraine_Luhansk Oblast",
@@ -14318,8 +14318,8 @@
       "Україна",
       "Луганська область"
      ],
-     "s": 50644277,
-     "sha1_base64": "rQoEB8KARzqeX4hcCrPImjdM3WI="
+     "s": 50752624,
+     "sha1_base64": "KmFnb6wJCJw+eZ/rpktoUEoIk3I="
     },
     {
      "id": "Ukraine_Lviv Oblast",
@@ -14330,8 +14330,8 @@
       "Львівська область",
       "Україна"
      ],
-     "s": 71271771,
-     "sha1_base64": "kKHfpYV56A/bfpXMMP19+HhK6ec="
+     "s": 71671438,
+     "sha1_base64": "UqlpRMv5IQMQfBMI/MSP/10yB0M="
     },
     {
      "id": "Ukraine_Mykolaiv Oblast",
@@ -14342,8 +14342,8 @@
       "Україна",
       "Миколаївська область"
      ],
-     "s": 35713389,
-     "sha1_base64": "y6/5qUfL88OMaphdNy2CQ2AWDLU="
+     "s": 36060368,
+     "sha1_base64": "fOHCVYs+4YLWDrnbPhWlPH2b/lU="
     },
     {
      "id": "Ukraine_Odessa Oblast",
@@ -14354,8 +14354,8 @@
       "Україна",
       "Одеська область"
      ],
-     "s": 44834128,
-     "sha1_base64": "mCmSCbijHrLTGoOY6zW9UAd19/U="
+     "s": 45242979,
+     "sha1_base64": "DfUYe3j0ipvWOgYUnA9RDKu3Kh4="
     },
     {
      "id": "Ukraine_Poltava Oblast",
@@ -14366,8 +14366,8 @@
       "Полтавська область",
       "Україна"
      ],
-     "s": 38593607,
-     "sha1_base64": "cbha1Ejj/Q4q8Pp/SWRPuITNqA0="
+     "s": 38717010,
+     "sha1_base64": "y0Y91WkQHI1vOld8/QaOy6aElfE="
     },
     {
      "id": "Ukraine_Rivne Oblast",
@@ -14378,8 +14378,8 @@
       "Рівненська область",
       "Україна"
      ],
-     "s": 30749283,
-     "sha1_base64": "1ZmG2iwpX1Yee3HsrRw247dUJiA="
+     "s": 30816734,
+     "sha1_base64": "4V8mYfX2wvwcghYi/eXwGWj9OUY="
     },
     {
      "id": "Ukraine_Sumy Oblast",
@@ -14390,8 +14390,8 @@
       "Україна",
       "Сумська область"
      ],
-     "s": 34140988,
-     "sha1_base64": "iYW6wNmqm7+RJ9NWcpW3VggQkr8="
+     "s": 34249175,
+     "sha1_base64": "hCpm/byhYNK7mV1k4raq4Izskok="
     },
     {
      "id": "Ukraine_Ternopil Oblast",
@@ -14402,8 +14402,8 @@
       "Україна",
       "Тернопільська область"
      ],
-     "s": 33568163,
-     "sha1_base64": "t3uqJB5LLm2cxRK/7NIl54pmDHM="
+     "s": 33656270,
+     "sha1_base64": "Z5hqy3zxJ7yf1kx5YpwIlun+Ypk="
     },
     {
      "id": "Ukraine_Vinnytsia Oblast",
@@ -14414,8 +14414,8 @@
       "Україна",
       "Вінницька область"
      ],
-     "s": 44878309,
-     "sha1_base64": "HTwKczFN5z2ce+3mdP1K/wM8c5c="
+     "s": 45168728,
+     "sha1_base64": "VCXn6hLrfjNaCU8280HikwZo4Rg="
     },
     {
      "id": "Ukraine_Volyn Oblast",
@@ -14426,8 +14426,8 @@
       "Україна",
       "Волинська область"
      ],
-     "s": 31634979,
-     "sha1_base64": "+H4JcATyjcUQEG1/o24WmMrivc0="
+     "s": 31761470,
+     "sha1_base64": "WJpBnaDU+dBDV8hvRTko5OxSecc="
     },
     {
      "id": "Ukraine_Zakarpattia Oblast",
@@ -14438,8 +14438,8 @@
       "Україна",
       "Закарпатська область"
      ],
-     "s": 44633328,
-     "sha1_base64": "5xPhK0CazNlXGRpNLP0hY53UgCg="
+     "s": 44914739,
+     "sha1_base64": "e4ExHqkpAZeR9pT/2ueAsEWkbYo="
     },
     {
      "id": "Ukraine_Zaporizhia Oblast",
@@ -14450,8 +14450,8 @@
       "Запорізька область",
       "Україна"
      ],
-     "s": 32611803,
-     "sha1_base64": "kjpC51IzomPL99xYzNoSdHNo6S8="
+     "s": 32611150,
+     "sha1_base64": "uADygxh/d4ms3rLzoTU651yK+G8="
     },
     {
      "id": "Ukraine_Zhytomyr Oblast",
@@ -14462,8 +14462,8 @@
       "Житомирська область",
       "Україна"
      ],
-     "s": 37680646,
-     "sha1_base64": "kwP7Ss9z8QIfjpWYGatQeXMDtbQ="
+     "s": 37851961,
+     "sha1_base64": "1cVEZKsNFbMhw32CwRhIsbqdPEE="
     },
     {
      "id": "Crimea",
@@ -14478,8 +14478,8 @@
       "Україна",
       "Республика Крым"
      ],
-     "s": 54779280,
-     "sha1_base64": "/omkIat4h5PQpP4uDaHPQlirQtM="
+     "s": 55043099,
+     "sha1_base64": "wsUWQbcbD+/jyV4PTrIk/Cp/THg="
     }
    ]
   },
@@ -14499,8 +14499,8 @@
     "الشارقة",
     "الإمارات العربيّة المتّحدة"
    ],
-   "s": 99999396,
-   "sha1_base64": "u4OY+OtVq6O0B/sPpyZPJC7BUJs="
+   "s": 101915367,
+   "sha1_base64": "heaq586H9rmue8f63d6gGzNP990="
   },
   {
    "id": "Falkland Islands",
@@ -14510,8 +14510,8 @@
    "affiliations": [
     "Falkland Islands"
    ],
-   "s": 10652285,
-   "sha1_base64": "jGhBnuhoRM9w1KCNFmtXkHd0YwI="
+   "s": 10657429,
+   "sha1_base64": "+twVsPB3Skid1/w0OIe6gGB8tIw="
   },
   {
    "id": "United Kingdom",
@@ -14524,8 +14524,8 @@
      "affiliations": [
       "British Indian Ocean Territory"
      ],
-     "s": 601095,
-     "sha1_base64": "RQgdRz0RMnG7kshEDinCuYCc20M="
+     "s": 601383,
+     "sha1_base64": "7/meSS4MpZpQHSzUimH6NlSo8iA="
     },
     {
      "id": "UK_England_East Midlands",
@@ -14536,8 +14536,8 @@
       "England",
       "United Kingdom"
      ],
-     "s": 131102422,
-     "sha1_base64": "Pi1o7DEwLxaB7cQKCOueyltvV/g="
+     "s": 132973393,
+     "sha1_base64": "RJppK87Y6ankX55WKeKsRGdX5GU="
     },
     {
      "id": "UK_England_East of England_Essex",
@@ -14548,8 +14548,8 @@
       "England",
       "United Kingdom"
      ],
-     "s": 78864003,
-     "sha1_base64": "SzD6cJiyBerEgXgnBlXSMg67V/4="
+     "s": 79960222,
+     "sha1_base64": "utAQw75aoJtFGLDyXKhFgzPFXEM="
     },
     {
      "id": "UK_England_East of England_Norfolk",
@@ -14560,8 +14560,8 @@
       "England",
       "United Kingdom"
      ],
-     "s": 94083395,
-     "sha1_base64": "Jf2TkxssSMzq6SjQw6mX5PjjVk8="
+     "s": 95214038,
+     "sha1_base64": "Y03qxpusK/ROZNg77B/E4GZL7pE="
     },
     {
      "id": "UK_England_Greater London",
@@ -14572,8 +14572,8 @@
       "England",
       "United Kingdom"
      ],
-     "s": 126577307,
-     "sha1_base64": "kL3nC+K8ze7VPc9xu/Fv13ssOBI="
+     "s": 128620070,
+     "sha1_base64": "6Et2XvlyCjOyFjjI3CQX/JlN8gE="
     },
     {
      "id": "UK_England_North East England",
@@ -14584,8 +14584,8 @@
       "England",
       "United Kingdom"
      ],
-     "s": 69323705,
-     "sha1_base64": "Krm89VfYzFkw/uu5y0csSY9Xqrk="
+     "s": 70115988,
+     "sha1_base64": "LD5tFe9dKvdFwstw5d/frDvOQ/s="
     },
     {
      "id": "UK_England_North West England_Manchester",
@@ -14596,8 +14596,8 @@
       "England",
       "United Kingdom"
      ],
-     "s": 128578821,
-     "sha1_base64": "HUpfFA1Qwl8sQg6uxjVb5cDE0DM="
+     "s": 130577584,
+     "sha1_base64": "VUjgByDa0e3GYbTqAAPQU2uxU6Y="
     },
     {
      "id": "UK_England_North West England_Lancaster",
@@ -14608,8 +14608,8 @@
       "England",
       "United Kingdom"
      ],
-     "s": 58048201,
-     "sha1_base64": "HV7M7jB0a/YURdAKdvHiEtKyIBI="
+     "s": 58774236,
+     "sha1_base64": "RCNLZ+r7D3o9y1jyOpU8VqhVGzI="
     },
     {
      "id": "UK_England_South East_Brighton",
@@ -14620,8 +14620,8 @@
       "England",
       "United Kingdom"
      ],
-     "s": 137160878,
-     "sha1_base64": "/4yVZDE7mtIsima8Y4Z4LV92hQw="
+     "s": 138876313,
+     "sha1_base64": "xrw5bvQUDNTx/UI2ix9LLlibxxE="
     },
     {
      "id": "UK_England_South East_Oxford",
@@ -14632,8 +14632,8 @@
       "England",
       "United Kingdom"
      ],
-     "s": 129364919,
-     "sha1_base64": "x9LmP5/I1f/B1gEl65CjeUS6hfs="
+     "s": 130940378,
+     "sha1_base64": "WhvARwlp1AbvPFUXVHso2x/+VDs="
     },
     {
      "id": "UK_England_South West England_Bristol",
@@ -14644,8 +14644,8 @@
       "England",
       "United Kingdom"
      ],
-     "s": 147863199,
-     "sha1_base64": "xW2ShtTevU+RDEya90nWca/I//Q="
+     "s": 149522002,
+     "sha1_base64": "VGxEkr0BA5E2BFdsJU8YA5+Ys7A="
     },
     {
      "id": "UK_England_South West England_Cornwall",
@@ -14656,8 +14656,8 @@
       "England",
       "United Kingdom"
      ],
-     "s": 84158874,
-     "sha1_base64": "MiWkfhla+2LTbdFurv+vZjAvKCs="
+     "s": 84937101,
+     "sha1_base64": "OVFO7WTMIn1dx+csD60NXhFRiwo="
     },
     {
      "id": "UK_England_West Midlands",
@@ -14668,8 +14668,8 @@
       "England",
       "United Kingdom"
      ],
-     "s": 152550992,
-     "sha1_base64": "4jNtoziTDZ7qLvvM6OELC6x/+nc="
+     "s": 154482779,
+     "sha1_base64": "aRgCd7N59mCnEg9seW/LM59AMpE="
     },
     {
      "id": "UK_England_Yorkshire and the Humber",
@@ -14680,8 +14680,8 @@
       "England",
       "United Kingdom"
      ],
-     "s": 144734535,
-     "sha1_base64": "cIlZRSSmcRQkZoa2//yfaXDXW9I="
+     "s": 146591426,
+     "sha1_base64": "gtO34egtGjec4Rx8cADtPYYPWDM="
     },
     {
      "id": "UK_Northern Ireland",
@@ -14693,8 +14693,8 @@
       "Scotland",
       "United Kingdom"
      ],
-     "s": 70428178,
-     "sha1_base64": "jKEP63jz4Ujd+3xKx++eOiieqvU="
+     "s": 71722925,
+     "sha1_base64": "NXegc3jUG2/VVNaDOu/zWPaq/HM="
     },
     {
      "id": "UK_Scotland_North",
@@ -14705,8 +14705,8 @@
       "Scotland",
       "United Kingdom"
      ],
-     "s": 177755983,
-     "sha1_base64": "KDVPxgMRyroqK0ydE/kni3GrBj4="
+     "s": 179133922,
+     "sha1_base64": "kjh/lqMirk6id8DGyVLWIAtF1Ns="
     },
     {
      "id": "UK_Scotland_South",
@@ -14718,8 +14718,8 @@
       "Scotland",
       "United Kingdom"
      ],
-     "s": 135181412,
-     "sha1_base64": "XWGUPImGnjkJpeRRTh9eGfSZ5iw="
+     "s": 136469951,
+     "sha1_base64": "8pNe0uTodUagSsZrYfMFl+pUbMg="
     },
     {
      "id": "UK_Wales",
@@ -14730,8 +14730,8 @@
       "United Kingdom",
       "Wales"
      ],
-     "s": 145324134,
-     "sha1_base64": "fme7+KRPvVb83D3bG/Gt9X/x+A8="
+     "s": 147290769,
+     "sha1_base64": "Dpn/Q8VwB03BkVkVCnC4GyEmFe4="
     }
    ]
   },
@@ -14746,8 +14746,8 @@
      "affiliations": [
       "Ireland"
      ],
-     "s": 59345968,
-     "sha1_base64": "Vdro/y/mbClDRUGs0oae9CVsyNA="
+     "s": 60217300,
+     "sha1_base64": "zQddPS1i2QDyhX4sCq2Syeqwjrs="
     },
     {
      "id": "Ireland_Leinster",
@@ -14757,8 +14757,8 @@
      "affiliations": [
       "Ireland"
      ],
-     "s": 121742541,
-     "sha1_base64": "x2xstXhSh2/5MzIkRMUasU0rp0Y="
+     "s": 123177632,
+     "sha1_base64": "sEbSP6b+Dkd+ACW/uHyDJ2JEtrI="
     },
     {
      "id": "Ireland_Munster",
@@ -14768,8 +14768,8 @@
      "affiliations": [
       "Ireland"
      ],
-     "s": 81153195,
-     "sha1_base64": "FXiSOJo7xqoJlQPj2T1w5XUeu7c="
+     "s": 81986574,
+     "sha1_base64": "MbR9qQyx9H91CFaQEKuDCQYbMDg="
     },
     {
      "id": "Ireland_Northern Counties",
@@ -14779,8 +14779,8 @@
      "affiliations": [
       "Ireland"
      ],
-     "s": 35567710,
-     "sha1_base64": "TIoh9TKJhRgJO9Jrjcxd+zrQXEk="
+     "s": 35857769,
+     "sha1_base64": "s73uL7EKbVqi/JlEeGBobGQm36I="
     }
    ]
   },
@@ -14800,8 +14800,8 @@
         "AL",
         "United States of America"
        ],
-       "s": 95534832,
-       "sha1_base64": "/NahYkHbsb+8IAMkBeoASkxQrRI="
+       "s": 96191355,
+       "sha1_base64": "N/zdGK/nicFyKzm0wPWjgvmWjlA="
       },
       {
        "id": "US_Alabama_Montgomery",
@@ -14813,8 +14813,8 @@
         "AL",
         "United States of America"
        ],
-       "s": 130746123,
-       "sha1_base64": "2qLjOqMQ/zhIIelyJDv0qatO6wc="
+       "s": 131573622,
+       "sha1_base64": "JqRStChe0jG8aW8KC6d+5uM6W98="
       }
      ]
     },
@@ -14828,8 +14828,8 @@
       "AK",
       "United States of America"
      ],
-     "s": 340904840,
-     "sha1_base64": "kepLQmoWR8nGR8qqlgx2IHKJb1Y="
+     "s": 342022748,
+     "sha1_base64": "kREtQLEoIGg3maeR72WmhYt/4Q0="
     },
     {
      "id": "Arizona",
@@ -14844,8 +14844,8 @@
         "AZ",
         "United States of America"
        ],
-       "s": 96223897,
-       "sha1_base64": "sZ386SW1yfZvckCV70HreZPxkrE="
+       "s": 96559948,
+       "sha1_base64": "+6G2vrdHOx+vSlehM/r0sRQhpQw="
       },
       {
        "id": "US_Arizona_Phoenix",
@@ -14857,8 +14857,8 @@
         "AZ",
         "United States of America"
        ],
-       "s": 185739148,
-       "sha1_base64": "gUSFecHiTyaBER49m+TgikI/ynU="
+       "s": 188929712,
+       "sha1_base64": "idz33K07/tGagJz7zE1v/2MNXik="
       },
       {
        "id": "US_Arizona_Tucson",
@@ -14870,8 +14870,8 @@
         "AZ",
         "United States of America"
        ],
-       "s": 86008943,
-       "sha1_base64": "j4kBbpixO0r61aCRyvtc/RxRb2w="
+       "s": 87058282,
+       "sha1_base64": "k3l1L69KNSXl2M/UbsMwGKU6IJA="
       }
      ]
     },
@@ -14888,8 +14888,8 @@
         "AR",
         "United States of America"
        ],
-       "s": 95864024,
-       "sha1_base64": "zwtT+SGDYlyvFPXdmgA91rRSvLc="
+       "s": 96444323,
+       "sha1_base64": "MRG4ezYUub3vC+ZpMlZc08p0clk="
       },
       {
        "id": "US_Arkansas_South",
@@ -14901,8 +14901,8 @@
         "AR",
         "United States of America"
        ],
-       "s": 62573070,
-       "sha1_base64": "pe1Ft4Ym51Lyf69e+WZEQ3Tj/Ew="
+       "s": 63059113,
+       "sha1_base64": "49mIy9f1cYHCYJGXX7NZeG9NvE8="
       }
      ]
     },
@@ -14919,8 +14919,8 @@
         "CA",
         "United States of America"
        ],
-       "s": 57750334,
-       "sha1_base64": "BbIlZMwA0S02RmBN5ij2sv4olzk="
+       "s": 58131025,
+       "sha1_base64": "I0yu3O2dsH+AmxYvtIgWDRyiswk="
       },
       {
        "id": "US_California_Bakersfield_Bakersfield",
@@ -14932,8 +14932,8 @@
         "CA",
         "United States of America"
        ],
-       "s": 58231661,
-       "sha1_base64": "ZJmBD3/TV+fC4u3WxHZxbbyEHJo="
+       "s": 58745280,
+       "sha1_base64": "h6RrM79S7dFOyEwnNq9r8J+u7i0="
       },
       {
        "id": "US_California_Bakersfield_Lancaster",
@@ -14945,8 +14945,8 @@
         "CA",
         "United States of America"
        ],
-       "s": 77263862,
-       "sha1_base64": "iuIln0cAFbj7Fqv6nMod/oeQIoA="
+       "s": 78278625,
+       "sha1_base64": "MMlv4CXapTD8We9hJsrmDkJtHHo="
       },
       {
        "id": "US_California_LA",
@@ -14958,8 +14958,8 @@
         "CA",
         "United States of America"
        ],
-       "s": 288312026,
-       "sha1_base64": "5KV4bh4QFYlrC1sEs5LjBEkYA20="
+       "s": 295046063,
+       "sha1_base64": "bpHbJMA2aAtyrgjhI4gZAu8+kog="
       },
       {
        "id": "US_California_LA North",
@@ -14971,8 +14971,8 @@
         "CA",
         "United States of America"
        ],
-       "s": 88056597,
-       "sha1_base64": "VYCVD0mB+Tx7bXU8oSeePe/xR18="
+       "s": 90390232,
+       "sha1_base64": "N5a8ONRXDKCkzvpOqeJ2DP5m9SA="
       },
       {
        "id": "US_California_Redding",
@@ -14985,8 +14985,8 @@
         "Hoopa Valley Tribe",
         "United States of America"
        ],
-       "s": 70428272,
-       "sha1_base64": "XbdIukiZsDpY2E9DvCIYMBr3Qqg="
+       "s": 70582859,
+       "sha1_base64": "tMYcIGZHAQnnW0gndZDgwte5Czo="
       },
       {
        "id": "US_California_Sacramento_Sacramento",
@@ -14998,8 +14998,8 @@
         "CA",
         "United States of America"
        ],
-       "s": 75518575,
-       "sha1_base64": "kc/VrkZW3od2Z5nSSa6edFw9e3g="
+       "s": 76800250,
+       "sha1_base64": "XFFMvJYmYS7DxwNGogHtlZHpZ8A="
       },
       {
        "id": "US_California_Sacramento_Fresno",
@@ -15011,8 +15011,8 @@
         "CA",
         "United States of America"
        ],
-       "s": 65589101,
-       "sha1_base64": "ggqcaPRcPyyzqg2IyEU/yD7/XJ4="
+       "s": 66551280,
+       "sha1_base64": "T9A3twxSWcxgqNVKWoORveyMKYo="
       },
       {
        "id": "US_California_Sacramento_Stockton",
@@ -15024,8 +15024,8 @@
         "CA",
         "United States of America"
        ],
-       "s": 81484919,
-       "sha1_base64": "uegiUGGHUfM4Ak1NhmkGBpidIZ8="
+       "s": 82659842,
+       "sha1_base64": "USCLQcO7M26xkGjfserbKaG7IHI="
       },
       {
        "id": "US_California_San Diego",
@@ -15037,8 +15037,8 @@
         "CA",
         "United States of America"
        ],
-       "s": 125291444,
-       "sha1_base64": "9lH2Endvx9FLgbtle3SCwTmlYa8="
+       "s": 127651743,
+       "sha1_base64": "QjpNIkPCXg3vK1ziTs/UdTwLmMU="
       },
       {
        "id": "US_California_Santa_Clara_Santa Cruz",
@@ -15050,8 +15050,8 @@
         "CA",
         "United States of America"
        ],
-       "s": 42368653,
-       "sha1_base64": "RnK3TaONeljpW6JBrJmhhiUEe1U="
+       "s": 42765176,
+       "sha1_base64": "JDRNafGUqvCt/O1vq0lQbVzsQhI="
       },
       {
        "id": "US_California_Santa_Clara_Palo Alto",
@@ -15063,8 +15063,8 @@
         "CA",
         "United States of America"
        ],
-       "s": 218030484,
-       "sha1_base64": "oC5cdlWRT73W7uc6zKpyP4+A7q0="
+       "s": 221770856,
+       "sha1_base64": "UqEaf/FJN9KWiJUNzUSgwoGZGpE="
       }
      ]
     },
@@ -15081,8 +15081,8 @@
         "CO",
         "United States of America"
        ],
-       "s": 105893745,
-       "sha1_base64": "GDFVWfrB3FMF7xLh1w7scZsDN3U="
+       "s": 106992884,
+       "sha1_base64": "tXThk+6V5KEFkb1j6lT2kgug4YQ="
       },
       {
        "id": "US_Colorado_Denver",
@@ -15094,8 +15094,8 @@
         "CO",
         "United States of America"
        ],
-       "s": 194309551,
-       "sha1_base64": "q1uKKYKJ5kH05duWulsCLzqJZHI="
+       "s": 197217226,
+       "sha1_base64": "n8RW29n3DHeN4a5JXvmXpx6OmcQ="
       },
       {
        "id": "US_Colorado_South",
@@ -15107,8 +15107,8 @@
         "CO",
         "United States of America"
        ],
-       "s": 96995206,
-       "sha1_base64": "yosCXVgrb8N6kw89LyVN6JC0tVY="
+       "s": 97335873,
+       "sha1_base64": "thR6HGVGeIqv87b4G8ahZ3fo9UM="
       }
      ]
     },
@@ -15122,8 +15122,8 @@
       "CT",
       "United States of America"
      ],
-     "s": 178859916,
-     "sha1_base64": "CZJnbC5KDJ90pt7XUqz9vwQ91kU="
+     "s": 180157463,
+     "sha1_base64": "oAymhkJPMnecTjH7Fj+8ulg/P0s="
     },
     {
      "id": "US_Delaware",
@@ -15135,8 +15135,8 @@
       "DE",
       "United States of America"
      ],
-     "s": 29910083,
-     "sha1_base64": "mchqX30/QvK5HCKmD8Mmq6L7IrU="
+     "s": 30286702,
+     "sha1_base64": "XxjE9LltvRnQi367dZveynbzGrE="
     },
     {
      "id": "Florida",
@@ -15151,8 +15151,8 @@
         "FL",
         "United States of America"
        ],
-       "s": 218142929,
-       "sha1_base64": "a9Udo+xBuJ5cABHe0KIpivjn4PY="
+       "s": 219409292,
+       "sha1_base64": "UgXLbPyHCDy2t7TTAThNGUHmfyM="
       },
       {
        "id": "US_Florida_Miami",
@@ -15164,8 +15164,8 @@
         "FL",
         "United States of America"
        ],
-       "s": 202829252,
-       "sha1_base64": "oHGvlPdo4gG8yB/DS6ospkHMB+U="
+       "s": 206101008,
+       "sha1_base64": "aYsL8H4UVjgIuAYFPXR+Db9UULo="
       },
       {
        "id": "US_Florida_Orlando",
@@ -15177,8 +15177,8 @@
         "FL",
         "United States of America"
        ],
-       "s": 95010537,
-       "sha1_base64": "7XCgdVacCk3a1fAnSxM89t8b2ek="
+       "s": 96529500,
+       "sha1_base64": "S2O5vq+8Y8MW9dztErMtbI984a4="
       },
       {
        "id": "US_Florida_Tampa",
@@ -15190,8 +15190,8 @@
         "FL",
         "United States of America"
        ],
-       "s": 199241966,
-       "sha1_base64": "WIy2ZJp5HIuktAtU9y1xiY9QGGw="
+       "s": 201853130,
+       "sha1_base64": "piQ22IYC6M1YkXxgzGVgfdi6+VU="
       },
       {
        "id": "US_Florida_Gainesville",
@@ -15203,8 +15203,8 @@
         "FL",
         "United States of America"
        ],
-       "s": 152036827,
-       "sha1_base64": "0p5IjTU5K9ebHEeDsXexlyN0X9Y="
+       "s": 153209406,
+       "sha1_base64": "C17YhxOcMoAbUmkN8KCkgpbUhLk="
       }
      ]
     },
@@ -15221,8 +15221,8 @@
         "GA",
         "United States of America"
        ],
-       "s": 155868565,
-       "sha1_base64": "v9/FSKighsHEGU5CBrefR1mjfGg="
+       "s": 158026880,
+       "sha1_base64": "lXeTmYjr5Hr9vhLWHqaB6xkp7Is="
       },
       {
        "id": "US_Georgia_Macon",
@@ -15234,8 +15234,8 @@
         "GA",
         "United States of America"
        ],
-       "s": 85163320,
-       "sha1_base64": "KVNmj8g3YoTr7Le9KcldeWGZPQM="
+       "s": 85717539,
+       "sha1_base64": "LEgMhxXkoiI/wRoeyHxZka6mRE4="
       },
       {
        "id": "US_Georgia_North",
@@ -15247,8 +15247,8 @@
         "GA",
         "United States of America"
        ],
-       "s": 65428687,
-       "sha1_base64": "12+nrnmktWUvZgcdyGxAyUO3R1Q="
+       "s": 65769018,
+       "sha1_base64": "ip3FcToSGgSp9FB4y4j7PEMW/9Q="
       },
       {
        "id": "US_Georgia_South",
@@ -15260,8 +15260,8 @@
         "GA",
         "United States of America"
        ],
-       "s": 91096488,
-       "sha1_base64": "O4cKTXtzkSyGkKWsyU79I//D4IU="
+       "s": 91658195,
+       "sha1_base64": "rRixD/O2NfkLe6a7zC0Y4JmwkCA="
       }
      ]
     },
@@ -15281,8 +15281,8 @@
      "country_name_synonyms": [
       "Guam"
      ],
-     "s": 5152720,
-     "sha1_base64": "/N13brqdq573Zua9oUpqzB6xGiQ="
+     "s": 5173283,
+     "sha1_base64": "vE3qnO445xYmmSXLLRhxIl7bRv8="
     },
     {
      "id": "US_Hawaii",
@@ -15294,8 +15294,8 @@
       "HI",
       "United States of America"
      ],
-     "s": 30288064,
-     "sha1_base64": "jGBtYcHUs0YzHA6alneaJTGceto="
+     "s": 30648347,
+     "sha1_base64": "KrRUHSwQIR8dJ87WDqWWigzjEXw="
     },
     {
      "id": "US_Idaho",
@@ -15310,8 +15310,8 @@
         "ID",
         "United States of America"
        ],
-       "s": 70914279,
-       "sha1_base64": "tWBmSOCx5KqWkADHp/kkyljJjVI="
+       "s": 71582938,
+       "sha1_base64": "QSXJzy1A7JBX+QE82ItP5QzBugI="
       },
       {
        "id": "US_Idaho_South",
@@ -15323,8 +15323,8 @@
         "ID",
         "United States of America"
        ],
-       "s": 79183768,
-       "sha1_base64": "i5uoPdJ8BIgiuzwR3z9pO+lv1Hk="
+       "s": 79716291,
+       "sha1_base64": "282pazUF3SfGamxfQ6jvMhgPJr0="
       }
      ]
     },
@@ -15341,8 +15341,8 @@
         "IL",
         "United States of America"
        ],
-       "s": 86101506,
-       "sha1_base64": "77hKT5gbaKJrCTAI0YWKzc7GaRk="
+       "s": 86580493,
+       "sha1_base64": "rTvYTFIDSX0I2NrDrfPrAwPVKZA="
       },
       {
        "id": "US_Illinois_Chickago",
@@ -15354,8 +15354,8 @@
         "IL",
         "United States of America"
        ],
-       "s": 114801052,
-       "sha1_base64": "vlxRmAVVsTiwEalUZ13SLbKNXlg="
+       "s": 116685367,
+       "sha1_base64": "4yTjGdpqoxGAfeTJmVXBp3DQ5Ek="
       },
       {
        "id": "US_Illinois_Elgin",
@@ -15367,8 +15367,8 @@
         "IL",
         "United States of America"
        ],
-       "s": 77109625,
-       "sha1_base64": "e89h51uNh/9dVoIvqBSCovr6URc="
+       "s": 78059028,
+       "sha1_base64": "jE6J8elOSZN+/jMhndK+1jfISRc="
       },
       {
        "id": "US_Illinois_Rockford",
@@ -15380,8 +15380,8 @@
         "IL",
         "United States of America"
        ],
-       "s": 50994548,
-       "sha1_base64": "niybJyI94EEolmm6+ujXO9eXRZQ="
+       "s": 51333967,
+       "sha1_base64": "nDQrt9hBrC+LmA/CWV1s23e9cgo="
       },
       {
        "id": "US_Illinois_Springfield",
@@ -15393,8 +15393,8 @@
         "IL",
         "United States of America"
        ],
-       "s": 102810225,
-       "sha1_base64": "epZXx8yfsw/ATYtyFuK1qRrtzts="
+       "s": 103382908,
+       "sha1_base64": "Svq4HgJSEdOaUcFGTlC4ji01aBY="
       }
      ]
     },
@@ -15411,8 +15411,8 @@
         "IN",
         "United States of America"
        ],
-       "s": 120330869,
-       "sha1_base64": "+K96J8g+uJ6vMgLxqyGLnlulaQ4="
+       "s": 121283624,
+       "sha1_base64": "hcPDxnNXGcXQIleFGDy+WfdE15o="
       },
       {
        "id": "US_Indiana_Evansville",
@@ -15424,8 +15424,8 @@
         "IN",
         "United States of America"
        ],
-       "s": 61555166,
-       "sha1_base64": "tDAsKi9EthTisrxX8SSFVZb6Ds0="
+       "s": 61890409,
+       "sha1_base64": "C2aaQNBLMZi2wfrclL8qxzGsle4="
       },
       {
        "id": "US_Indiana_Indianapolis",
@@ -15437,8 +15437,8 @@
         "IN",
         "United States of America"
        ],
-       "s": 93752879,
-       "sha1_base64": "KsEDzSDHXPyY1HIYH3GR7E2UgxM="
+       "s": 94525346,
+       "sha1_base64": "+3zdgDRfwt5yc9La8m6DC1wtQI0="
       }
      ]
     },
@@ -15455,8 +15455,8 @@
         "IA",
         "United States of America"
        ],
-       "s": 70120399,
-       "sha1_base64": "KvXAHUgwYTnpOXv0FTlBRhBOq+4="
+       "s": 70620170,
+       "sha1_base64": "EIbVyMCscan8YCj95CwSXiNSMvY="
       },
       {
        "id": "US_Iowa_Waterloo",
@@ -15468,8 +15468,8 @@
         "IA",
         "United States of America"
        ],
-       "s": 68721663,
-       "sha1_base64": "P+dq1J/Y88lMWSgruTiykLxLoFc="
+       "s": 69085874,
+       "sha1_base64": "vaedT68hDFkSrxpHz6cB3M/A7fo="
       },
       {
        "id": "US_Iowa_West",
@@ -15481,8 +15481,8 @@
         "IA",
         "United States of America"
        ],
-       "s": 69997678,
-       "sha1_base64": "Lpd9/XjENUnh9WpqttpWzL4sP1k="
+       "s": 70303505,
+       "sha1_base64": "65MltHPVmp0Pfql2N0Mk3r4kRfY="
       }
      ]
     },
@@ -15499,8 +15499,8 @@
         "KS",
         "United States of America"
        ],
-       "s": 79666543,
-       "sha1_base64": "UEtf9LC3pN7xa3/NkmvgUtZtnt0="
+       "s": 80337578,
+       "sha1_base64": "IdmZpxf4NHyL5UpkS60MG24x1m4="
       },
       {
        "id": "US_Kansas_West",
@@ -15512,8 +15512,8 @@
         "KS",
         "United States of America"
        ],
-       "s": 40936500,
-       "sha1_base64": "PrCrFl1xpdTsNfrm0wEWdiL8EgE="
+       "s": 41144023,
+       "sha1_base64": "jRG7ln7oJiTYOPl6Gwh+1ywkmXQ="
       },
       {
        "id": "US_Kansas_Wichita",
@@ -15525,8 +15525,8 @@
         "KS",
         "United States of America"
        ],
-       "s": 61595150,
-       "sha1_base64": "8L08i3ttL1B5c5FTS4D1HpxcqZM="
+       "s": 62149057,
+       "sha1_base64": "Mc3veZiTPLR/DPiMIuVuWOSjDpM="
       }
      ]
     },
@@ -15543,8 +15543,8 @@
         "KY",
         "United States of America"
        ],
-       "s": 88099328,
-       "sha1_base64": "4OVfs0jbfysjGVk+xHDKOs92yY0="
+       "s": 88462107,
+       "sha1_base64": "8IpKrDSzPhzuANPgimYc1c8NtL4="
       },
       {
        "id": "US_Kentucky_West",
@@ -15556,8 +15556,8 @@
         "KY",
         "United States of America"
        ],
-       "s": 65477982,
-       "sha1_base64": "JdpXPGmFDTMu6SM69GIj74ztC3Q="
+       "s": 65539225,
+       "sha1_base64": "3mwoeX/6A6iz0/pEE6aekEZ0ipQ="
       },
       {
        "id": "US_Kentucky_Louisville",
@@ -15569,8 +15569,8 @@
         "KY",
         "United States of America"
        ],
-       "s": 49037173,
-       "sha1_base64": "dHRLAmASHuA055Xme2xfDMaSljo="
+       "s": 49424088,
+       "sha1_base64": "VRZL1d2maNEeBfXbHW7QAsG5NSg="
       }
      ]
     },
@@ -15587,8 +15587,8 @@
         "LA",
         "United States of America"
        ],
-       "s": 86015776,
-       "sha1_base64": "veITzguQshVY7YkSjY2Auqwym88="
+       "s": 86585859,
+       "sha1_base64": "TA+Mt5QwXmsj5eJqNjNQpIIAQAs="
       },
       {
        "id": "US_Louisiana_New Orleans",
@@ -15600,8 +15600,8 @@
         "LA",
         "United States of America"
        ],
-       "s": 98595529,
-       "sha1_base64": "Pj0fvhlLVNkDZKXPGrHUH2nImVQ="
+       "s": 99495372,
+       "sha1_base64": "LeGw+hUg77hCnOn59csHYIkP/tc="
       }
      ]
     },
@@ -15615,8 +15615,8 @@
       "ME",
       "United States of America"
      ],
-     "s": 118092915,
-     "sha1_base64": "6WOfm1B+tgaSVyZPJgdh9ZQKrz4="
+     "s": 118397078,
+     "sha1_base64": "q+mNB8QsmTU07MWcGk4bAyCl3NQ="
     },
     {
      "id": "Maryland",
@@ -15631,8 +15631,8 @@
         "MD",
         "United States of America"
        ],
-       "s": 134437533,
-       "sha1_base64": "7hTJRRvoT0ZiIyPAPluV8JVgC5I="
+       "s": 135886872,
+       "sha1_base64": "Ecx0GUAR9jhpES00sJNKIKc0GNU="
       },
       {
        "id": "US_Maryland_and_DC",
@@ -15647,8 +15647,8 @@
         "MD",
         "United States of America"
        ],
-       "s": 112858211,
-       "sha1_base64": "gajyhSLk7ToHLHTKoW2PZbhlOTA="
+       "s": 114933734,
+       "sha1_base64": "0NHoAE5Tw1ibO8NTkPFlKH/491w="
       }
      ]
     },
@@ -15665,8 +15665,8 @@
         "MA",
         "United States of America"
        ],
-       "s": 89584655,
-       "sha1_base64": "+kkJPGtJVrsJ/ewnOyiajEcDzUA="
+       "s": 90425283,
+       "sha1_base64": "L6geMkkEuUZqSFEesoTZptctFR0="
       },
       {
        "id": "US_Massachusetts_Central",
@@ -15678,8 +15678,8 @@
         "MA",
         "United States of America"
        ],
-       "s": 45223292,
-       "sha1_base64": "zTSuq/mvVq9QCn6h0oXyh7sIDgY="
+       "s": 45578631,
+       "sha1_base64": "YCnIalK86Lv4zjs3z0P7VuS3AhI="
       },
       {
        "id": "US_Massachusetts_Plymouth",
@@ -15691,8 +15691,8 @@
         "MA",
         "United States of America"
        ],
-       "s": 43489539,
-       "sha1_base64": "s5zrRof1vPpsm9LQ4zlI9ytcosI="
+       "s": 43725726,
+       "sha1_base64": "666Pipj/bNQ+c3AU3IRHfumkgFw="
       },
       {
        "id": "US_Massachusetts_Southeastern",
@@ -15704,8 +15704,8 @@
         "MA",
         "United States of America"
        ],
-       "s": 21273440,
-       "sha1_base64": "INgFrEK2Vf14KJx/ZaFDbAIOBiE="
+       "s": 21347755,
+       "sha1_base64": "/k/8A5T1dDYIcJPe9Z+xrk/ueYs="
       },
       {
        "id": "US_Massachusetts_West",
@@ -15717,8 +15717,8 @@
         "MA",
         "United States of America"
        ],
-       "s": 41933468,
-       "sha1_base64": "nnL1LgD/ZH5WvF3CJSSPlcjlkNE="
+       "s": 42148695,
+       "sha1_base64": "/BsSzvcr72q2yQIgsd+TQNODoNI="
       }
      ]
     },
@@ -15735,8 +15735,8 @@
         "MI",
         "United States of America"
        ],
-       "s": 135109259,
-       "sha1_base64": "1qxxYGmCEq0FYwqjrjNdR86rejA="
+       "s": 136737374,
+       "sha1_base64": "3ej1Moom4+d4+hFB2sWVX/trkk8="
       },
       {
        "id": "US_Michigan_North",
@@ -15748,8 +15748,8 @@
         "MI",
         "United States of America"
        ],
-       "s": 51488948,
-       "sha1_base64": "pDFM3GuzygrCJTx5tGd+e6TL7FA="
+       "s": 51578719,
+       "sha1_base64": "S7EAeoK+jiHmgpl0bohIiATx6ng="
       },
       {
        "id": "US_Michigan_Grand Rapids",
@@ -15767,8 +15767,8 @@
         "MI",
         "United States of America"
        ],
-       "s": 109393225,
-       "sha1_base64": "5N5ST6dE+VohYms42h/8XNZBXGc="
+       "s": 110095548,
+       "sha1_base64": "m+Rt0Ls2acz/dMKUYIsC1NHnxTM="
       },
       {
        "id": "US_Michigan_Lansing",
@@ -15782,8 +15782,8 @@
         "MI",
         "United States of America"
        ],
-       "s": 116549708,
-       "sha1_base64": "8PhR5/R3bASRLOj8aLZT9ojyKxk="
+       "s": 117485559,
+       "sha1_base64": "SWNPJEIsl/tkKqmXwWboLslYMbE="
       }
      ]
     },
@@ -15800,8 +15800,8 @@
         "MN",
         "United States of America"
        ],
-       "s": 76141279,
-       "sha1_base64": "wYgxHw98rTK10uWfIwzhurPTkoE="
+       "s": 76339346,
+       "sha1_base64": "8PqMEl2DIIxcZZIWRkAU3Be7Rvw="
       },
       {
        "id": "US_Minnesota_Minneapolis",
@@ -15813,8 +15813,8 @@
         "MN",
         "United States of America"
        ],
-       "s": 100109376,
-       "sha1_base64": "HAT8OUp7l9gieRW+raPOhcJSj4o="
+       "s": 101010899,
+       "sha1_base64": "EJ/D4D6SikvsOeG70TOw5PIOxoI="
       },
       {
        "id": "US_Minnesota_North",
@@ -15826,8 +15826,8 @@
         "MN",
         "United States of America"
        ],
-       "s": 85724782,
-       "sha1_base64": "oY9brjeU47M0FvWxxUizdB11B0s="
+       "s": 85892441,
+       "sha1_base64": "1JJOS5v14qV9a0CSBu3XaqM8ISs="
       },
       {
        "id": "US_Minnesota_Saint Cloud",
@@ -15839,8 +15839,8 @@
         "MN",
         "United States of America"
        ],
-       "s": 68748222,
-       "sha1_base64": "iO5kBzDC8pD6UCTsUVAEMPnUFZU="
+       "s": 69091737,
+       "sha1_base64": "9K6s3CyXyKdu7m0HeQsd+Htd/Sw="
       }
      ]
     },
@@ -15857,8 +15857,8 @@
         "MS",
         "United States of America"
        ],
-       "s": 35855554,
-       "sha1_base64": "LPAtVndA8NESkVy2zkuKn2uB4l4="
+       "s": 36014885,
+       "sha1_base64": "m5lIMTeOexYtMogEGxHzkfPHQ6w="
       },
       {
        "id": "US_Mississippi_North",
@@ -15870,8 +15870,8 @@
         "MS",
         "United States of America"
        ],
-       "s": 99176896,
-       "sha1_base64": "YJK8SlO5CbwN789J7ui7tJQIwwA="
+       "s": 99638195,
+       "sha1_base64": "aA0zouo8Hv68r8dem3//InHkxfw="
       }
      ]
     },
@@ -15888,8 +15888,8 @@
         "MO",
         "United States of America"
        ],
-       "s": 34840282,
-       "sha1_base64": "UmwP8HDFsgX4e61fowJJf98wPrY="
+       "s": 34909973,
+       "sha1_base64": "7H7V0qOB5ddAQkutfycbNmKa0yg="
       },
       {
        "id": "US_Missouri_Springfield",
@@ -15901,8 +15901,8 @@
         "MO",
         "United States of America"
        ],
-       "s": 67989784,
-       "sha1_base64": "wv285XbxiIBeuJB83G9necr73AA="
+       "s": 68488979,
+       "sha1_base64": "G60il/NsWlxA4Pz5SAWsS05zuA0="
       },
       {
        "id": "US_Missouri_Kansas",
@@ -15914,8 +15914,8 @@
         "MO",
         "United States of America"
        ],
-       "s": 77840873,
-       "sha1_base64": "4Rl3w7a8Y5H3Pzx7wyHY5lKcGp0="
+       "s": 78434748,
+       "sha1_base64": "MnDZuHUSweOWCSZZiQhqkf5Ew38="
       },
       {
        "id": "US_Missouri_St Louis",
@@ -15927,8 +15927,8 @@
         "MO",
         "United States of America"
        ],
-       "s": 99854629,
-       "sha1_base64": "z0NX1KmBIP2fEepirNAzkMIXMqw="
+       "s": 100871144,
+       "sha1_base64": "dSVxjTsmsrrUPglkH2R2fHr1/aE="
       }
      ]
     },
@@ -15945,8 +15945,8 @@
         "MT",
         "United States of America"
        ],
-       "s": 69906783,
-       "sha1_base64": "gftalvOUFIzHJxh1rpB9I3UnU0s="
+       "s": 70104042,
+       "sha1_base64": "xSvkttswhBQtZbmDWdn0QkA4KoE="
       },
       {
        "id": "US_Montana_West",
@@ -15958,8 +15958,8 @@
         "MT",
         "United States of America"
        ],
-       "s": 72277136,
-       "sha1_base64": "vAVa4piH9Z9m4gOptULufaQYOS0="
+       "s": 72548259,
+       "sha1_base64": "iyiSrTtmzUT4z4DfAqLz6MU5dKQ="
       }
      ]
     },
@@ -15976,8 +15976,8 @@
         "NE",
         "United States of America"
        ],
-       "s": 68815216,
-       "sha1_base64": "lPQTdz8N5+rZrfCztisZHbMPR5c="
+       "s": 69453483,
+       "sha1_base64": "ArTMgku42+EdM8zcoP8eTeytjys="
       },
       {
        "id": "US_Nebraska_West",
@@ -15989,8 +15989,8 @@
         "NE",
         "United States of America"
        ],
-       "s": 64343159,
-       "sha1_base64": "WePXGGQpn8uvgRVvyIB6z1/eVyQ="
+       "s": 64593890,
+       "sha1_base64": "TuuLk1+81S85LFbcIy8CrzMnmpM="
       }
      ]
     },
@@ -16004,8 +16004,8 @@
       "NV",
       "United States of America"
      ],
-     "s": 153752786,
-     "sha1_base64": "xVjdBE7t4Lp4zC0pKKJmuOfO5iA="
+     "s": 154573237,
+     "sha1_base64": "VgSVUyklJHzOyyJ9Ffc4Li4vcNM="
     },
     {
      "id": "US_New Hampshire",
@@ -16017,8 +16017,8 @@
       "NH",
       "United States of America"
      ],
-     "s": 77598091,
-     "sha1_base64": "yKLEs1DzhDQe6prkFbTLw7BVI9M="
+     "s": 78564454,
+     "sha1_base64": "cMmsPr01EUOu+qGc6InRCc09lZc="
     },
     {
      "id": "New Jersey",
@@ -16033,8 +16033,8 @@
         "NJ",
         "United States of America"
        ],
-       "s": 96553331,
-       "sha1_base64": "AawC4CQ51yZOxH8fBar1q+FCk5I="
+       "s": 97878446,
+       "sha1_base64": "ZXsE3AMLdGjSotgjN4OCJm82bdc="
       },
       {
        "id": "US_New Jersey_South",
@@ -16046,8 +16046,8 @@
         "NJ",
         "United States of America"
        ],
-       "s": 108523053,
-       "sha1_base64": "Z82SkTuQnyNfqGBQFG56qmpy3wE="
+       "s": 109719128,
+       "sha1_base64": "ux7FckdhiP4q7qSmzzWrINWrLzc="
       }
      ]
     },
@@ -16064,8 +16064,8 @@
         "NM",
         "United States of America"
        ],
-       "s": 87257219,
-       "sha1_base64": "Np2aEZ7GlVMbDw+G5QFZOf5SzgI="
+       "s": 88125911,
+       "sha1_base64": "Q1x6VkjhabZen66EP9tN7lcDFLw="
       },
       {
        "id": "US_New Mexico_Roswell",
@@ -16077,8 +16077,8 @@
         "NM",
         "United States of America"
        ],
-       "s": 72701463,
-       "sha1_base64": "LucsAVcKQSKO5b29uF18+06ZIZ4="
+       "s": 73269250,
+       "sha1_base64": "B5/LxmUOl8uaMLYOl5fsw7BebYQ="
       }
      ]
     },
@@ -16096,8 +16096,8 @@
         "NY",
         "United States of America"
        ],
-       "s": 125423522,
-       "sha1_base64": "EI6fC7W982XNy/TX4/9QNLvRN8o="
+       "s": 127705981,
+       "sha1_base64": "UCnVIwZYfjq2mjqeZFC9sgfJPvI="
       },
       {
        "id": "US_New York_New York",
@@ -16111,8 +16111,8 @@
         "NY",
         "United States of America"
        ],
-       "s": 109685779,
-       "sha1_base64": "hVjxbYkBs978FaDJ2TJBP+xbQeY="
+       "s": 111979462,
+       "sha1_base64": "5WnCjb0tqnGriyZoaud1NBImqwI="
       },
       {
        "id": "US_New York_North",
@@ -16124,8 +16124,8 @@
         "NY",
         "United States of America"
        ],
-       "s": 127953931,
-       "sha1_base64": "y7gUOVsW+eAoCtoAAxLbvx3njIQ="
+       "s": 128663798,
+       "sha1_base64": "cK9ihUiK2XVDYWsOryW3DUr7fD4="
       },
       {
        "id": "US_New York_West",
@@ -16137,8 +16137,8 @@
         "NY",
         "United States of America"
        ],
-       "s": 207980453,
-       "sha1_base64": "IPRPPRy5xRAAfQdGor7Ni7N4628="
+       "s": 209320456,
+       "sha1_base64": "ZOsA/LVHH5GriDzoBR5fU1h48A8="
       }
      ]
     },
@@ -16155,8 +16155,8 @@
         "NC",
         "United States of America"
        ],
-       "s": 65500015,
-       "sha1_base64": "Ie/FqfyUJeeCaWcACTDoX5uz6tg="
+       "s": 65928210,
+       "sha1_base64": "hTyRoxzp+FGTgoPPNeoUITWB6Sw="
       },
       {
        "id": "US_North Carolina_Asheville",
@@ -16168,8 +16168,8 @@
         "NC",
         "United States of America"
        ],
-       "s": 73434160,
-       "sha1_base64": "05rZWHVo9sLrwMbi3f3wwzHxKqk="
+       "s": 73890715,
+       "sha1_base64": "h7RdLB45RC64bcPPTDgQV6oHqiE="
       },
       {
        "id": "US_North Carolina_Charlotte",
@@ -16181,8 +16181,8 @@
         "NC",
         "United States of America"
        ],
-       "s": 112442631,
-       "sha1_base64": "W2/zsTRAJ9P9DUoAMqfGWgEFzbs="
+       "s": 113529946,
+       "sha1_base64": "Rl056X4E+UwxjlfLaAKKurOTGNw="
       },
       {
        "id": "US_North Carolina_Greensboro",
@@ -16194,8 +16194,8 @@
         "NC",
         "United States of America"
        ],
-       "s": 89657519,
-       "sha1_base64": "0uLcXzXe/+P5NAJDW8PG808VyWc="
+       "s": 90555714,
+       "sha1_base64": "JI1Gc8Lk8hySfn3+kKgbff1ZlWs="
       },
       {
        "id": "US_North Carolina_Raleigh",
@@ -16207,8 +16207,8 @@
         "NC",
         "United States of America"
        ],
-       "s": 107698577,
-       "sha1_base64": "Hge+bLyu4vWtz1rYS2MqGi8TzlU="
+       "s": 108498108,
+       "sha1_base64": "s17ubGyuHbpPZzpiRBLSKWdmQIs="
       },
       {
        "id": "US_North Carolina_Wilmington",
@@ -16220,8 +16220,8 @@
         "NC",
         "United States of America"
        ],
-       "s": 66810791,
-       "sha1_base64": "PkunY6WM51CPcYv7EC9LKgUeUow="
+       "s": 67184714,
+       "sha1_base64": "blr35jY5a74Wt2RfxUkLBVSusSs="
       }
      ]
     },
@@ -16238,8 +16238,8 @@
         "ND",
         "United States of America"
        ],
-       "s": 40331345,
-       "sha1_base64": "6afNHJ/OyBETEtE2dNvzmdnoz9E="
+       "s": 40670500,
+       "sha1_base64": "emHvp+/A6QYV/PcupGTeRV+M5UU="
       },
       {
        "id": "US_North Dakota_East",
@@ -16251,8 +16251,8 @@
         "ND",
         "United States of America"
        ],
-       "s": 54947837,
-       "sha1_base64": "T0MS2JPE3AbeUabHhI33W4DmTLE="
+       "s": 55194280,
+       "sha1_base64": "xRFldv2JGUkVmuBD5bRt98RhiZQ="
       },
       {
        "id": "US_North Dakota_Minot",
@@ -16264,8 +16264,8 @@
         "ND",
         "United States of America"
        ],
-       "s": 34366330,
-       "sha1_base64": "XAGxaPWZhPPh8kgJL0fO5QyQmC8="
+       "s": 34521381,
+       "sha1_base64": "W3RwrfRRUYBVRjtsIi98hGYvcpI="
       }
      ]
     },
@@ -16282,8 +16282,8 @@
         "OH",
         "United States of America"
        ],
-       "s": 140746950,
-       "sha1_base64": "suERd0wMUCyVciPGXH3ZWsbJZmY="
+       "s": 142610289,
+       "sha1_base64": "A8pmsJEO8d4bBfyGOF0V/jqFtSA="
       },
       {
        "id": "US_Ohio_Cincinnati",
@@ -16295,8 +16295,8 @@
         "OH",
         "United States of America"
        ],
-       "s": 120693483,
-       "sha1_base64": "Wwv7F9FeT/NZzHH0Bq+1Np6oe60="
+       "s": 121827438,
+       "sha1_base64": "7LpVp4DmHRhqCulRuyio+sw3JEg="
       },
       {
        "id": "US_Ohio_Columbus",
@@ -16308,8 +16308,8 @@
         "OH",
         "United States of America"
        ],
-       "s": 93472970,
-       "sha1_base64": "44mZ/zq9EVlKWApI+PXZPQ6Y+yU="
+       "s": 94375701,
+       "sha1_base64": "AWPr8q18jCgOdnfe/n9rgsExlqk="
       },
       {
        "id": "US_Ohio_Toledo",
@@ -16321,8 +16321,8 @@
         "OH",
         "United States of America"
        ],
-       "s": 64660998,
-       "sha1_base64": "aq6YvnCcGnQbwvApxW4qE689xeA="
+       "s": 65308457,
+       "sha1_base64": "aNN/dri8IsBi94aD9DZ8FzNy2kQ="
       }
      ]
     },
@@ -16339,8 +16339,8 @@
         "OK",
         "United States of America"
        ],
-       "s": 31887003,
-       "sha1_base64": "/nMK1B4+8tqOheXYBsK/x+uK6FE="
+       "s": 32096334,
+       "sha1_base64": "VrYeCox1Vd7StKwaJzfhZj7urdo="
       },
       {
        "id": "US_Oklahoma_West",
@@ -16352,8 +16352,8 @@
         "OK",
         "United States of America"
        ],
-       "s": 32315209,
-       "sha1_base64": "ySkzu9/IEV195Wp3AJgc+s6+TUY="
+       "s": 32436396,
+       "sha1_base64": "1Kj6JNaSIkcf+0JC4HQNgzkfe0Y="
       },
       {
        "id": "US_Oklahoma_Tulsa",
@@ -16365,8 +16365,8 @@
         "OK",
         "United States of America"
        ],
-       "s": 71954830,
-       "sha1_base64": "6+7edxl9bA2nOVC/DKGbOtjVtBs="
+       "s": 72539921,
+       "sha1_base64": "hVzTTdwZYqMj5S661/d5uqPONQk="
       },
       {
        "id": "US_Oklahoma_Oklahoma",
@@ -16378,8 +16378,8 @@
         "OK",
         "United States of America"
        ],
-       "s": 65158800,
-       "sha1_base64": "21JMuDqh5GT6QbPGlunOGHBgUZ8="
+       "s": 66187995,
+       "sha1_base64": "993MpHwz9e3d/YtoxMa3Szea1uk="
       }
      ]
     },
@@ -16396,8 +16396,8 @@
         "OR",
         "United States of America"
        ],
-       "s": 84989817,
-       "sha1_base64": "vu4B0qAd3I24djz1IjNZXSJQ+v0="
+       "s": 85461916,
+       "sha1_base64": "N+9JPeq8Fc3yXJyjpzDq9rbHm2U="
       },
       {
        "id": "US_Oregon_Portland",
@@ -16409,8 +16409,8 @@
         "OR",
         "United States of America"
        ],
-       "s": 118967898,
-       "sha1_base64": "5A1F56FH0GQA9wG9yp5AaCRBeIs="
+       "s": 120292973,
+       "sha1_base64": "25E9DgwKQlrkrN8JOO/ZU28Ct2U="
       },
       {
        "id": "US_Oregon_West",
@@ -16422,8 +16422,8 @@
         "OR",
         "United States of America"
        ],
-       "s": 72670312,
-       "sha1_base64": "PFaWfwOpUDAWFvpZxwJJ9S8vtA4="
+       "s": 72879435,
+       "sha1_base64": "5EJoBXjYBFFYhS+0yhl63CKIHpY="
       }
      ]
     },
@@ -16440,8 +16440,8 @@
         "PA",
         "United States of America"
        ],
-       "s": 116637035,
-       "sha1_base64": "vP0lfRJWDXr9Pilqb3XWYW6xY3o="
+       "s": 118028582,
+       "sha1_base64": "Gdpg6Q/zzUTPmz2iQ0ZoT4xkUFQ="
       },
       {
        "id": "US_Pennsylvania_Pittsburgh",
@@ -16453,8 +16453,8 @@
         "PA",
         "United States of America"
        ],
-       "s": 115604481,
-       "sha1_base64": "VLpoT5fEmYQjI5BBK/uVbsU9lCM="
+       "s": 116402372,
+       "sha1_base64": "Et0nWp1gFWfEZvNWDfayZVUh9DM="
       },
       {
        "id": "US_Pennsylvania_Reading",
@@ -16466,8 +16466,8 @@
         "PA",
         "United States of America"
        ],
-       "s": 114139116,
-       "sha1_base64": "NboPUeaWilh+8bcbPQoWXGMOYQ8="
+       "s": 115037455,
+       "sha1_base64": "TtoHuK2pIsbUMBs2rLyUUMDCJ8k="
       },
       {
        "id": "US_Pennsylvania_Scranton",
@@ -16479,8 +16479,8 @@
         "PA",
         "United States of America"
        ],
-       "s": 99413769,
-       "sha1_base64": "EuzMarixMQljim1u9/+gwljZ5CU="
+       "s": 100254484,
+       "sha1_base64": "03sirIuAoTdBLHX4JJgO5NaGNNA="
       }
      ]
     },
@@ -16495,8 +16495,8 @@
       "República Dominicana",
       "United States of America"
      ],
-     "s": 70723986,
-     "sha1_base64": "MuFp225vo/xnKtOILpnbRe9KQBI="
+     "s": 71162365,
+     "sha1_base64": "VS0/NyyJjec7dt7o8epyL4QV8U0="
     },
     {
      "id": "US_Rhode Island",
@@ -16509,8 +16509,8 @@
       "RI",
       "United States of America"
      ],
-     "s": 43981379,
-     "sha1_base64": "vYn6RXfiBXnIVji5TbjJ8b+6Gxc="
+     "s": 44361470,
+     "sha1_base64": "GMFdLHi9L///C30P7gBxSxP4uCk="
     },
     {
      "id": "South Carolina",
@@ -16525,8 +16525,8 @@
         "SC",
         "United States of America"
        ],
-       "s": 56021588,
-       "sha1_base64": "U2xSMigGilyUmkTbaFHCLgdkdIc="
+       "s": 56535759,
+       "sha1_base64": "HxVqcPOoEAKkhYCNxooEi6QkzfA="
       },
       {
        "id": "US_South Carolina_Columbia",
@@ -16538,8 +16538,8 @@
         "SC",
         "United States of America"
        ],
-       "s": 105399176,
-       "sha1_base64": "bhQwUXn3q8ms5IVEgLs9frL/FnI="
+       "s": 106282507,
+       "sha1_base64": "IPZaG/w1LwKrARePDnFAPMSVQSw="
       },
       {
        "id": "US_South Carolina_Florence",
@@ -16551,8 +16551,8 @@
         "SC",
         "United States of America"
        ],
-       "s": 66176477,
-       "sha1_base64": "6tHnyRHwkTrKpOvnz8JqnqSEuFQ="
+       "s": 66511216,
+       "sha1_base64": "CsTdo3l7o4mICK1lmXYB4bqGwEM="
       }
      ]
     },
@@ -16566,8 +16566,8 @@
       "SD",
       "United States of America"
      ],
-     "s": 86682038,
-     "sha1_base64": "gKoUFV4o3YWf63YxI2HaBRz/vzQ="
+     "s": 87075505,
+     "sha1_base64": "MH4qbuZgjHUwmjPDN6KS5Q3Ts5w="
     },
     {
      "id": "Tennessee",
@@ -16582,8 +16582,8 @@
         "TN",
         "United States of America"
        ],
-       "s": 145265333,
-       "sha1_base64": "U+HroCJRZrhh9q5hZvryDWAUv3o="
+       "s": 146234776,
+       "sha1_base64": "kHwQ5Pdzt9m6XYuGnI3ZAOekmac="
       },
       {
        "id": "US_Tennessee_West",
@@ -16595,8 +16595,8 @@
         "TN",
         "United States of America"
        ],
-       "s": 124995036,
-       "sha1_base64": "zwRNK2PF86hKQrPEUDs8eRrTEeE="
+       "s": 126419015,
+       "sha1_base64": "Uad9rGw1EPV+fdXxUzBmQSiMLjg="
       }
      ]
     },
@@ -16613,8 +16613,8 @@
         "TX",
         "United States of America"
        ],
-       "s": 105333617,
-       "sha1_base64": "c9Kc4xr33/aGzOeLlI4NUMrVCQE="
+       "s": 106958820,
+       "sha1_base64": "ZSbKMIp7LYSsK90U0kxSTmzkD1c="
       },
       {
        "id": "US_Texas_Victoria",
@@ -16626,8 +16626,8 @@
         "TX",
         "United States of America"
        ],
-       "s": 35730866,
-       "sha1_base64": "6PzaGVNqtfhRwqt2XyX7NxWJAK4="
+       "s": 36039005,
+       "sha1_base64": "VSWMu7eKUPTp/GWNaOm4lfMGoBM="
       },
       {
        "id": "US_Texas_Dallas",
@@ -16639,8 +16639,8 @@
         "TX",
         "United States of America"
        ],
-       "s": 194266365,
-       "sha1_base64": "3Y16pADSWEedqwfGWbUnnOkErcI="
+       "s": 198383289,
+       "sha1_base64": "D0GkvxRFv7dXuKo50QoLiDUoPuE="
       },
       {
        "id": "US_Texas_Houston",
@@ -16652,8 +16652,8 @@
         "TX",
         "United States of America"
        ],
-       "s": 142271532,
-       "sha1_base64": "7reYxTMbsgavZSgQFXuG5OOGyhs="
+       "s": 145828312,
+       "sha1_base64": "Br9smmIQsQHPFqU5CKvxi6XKBv4="
       },
       {
        "id": "US_Texas_Amarillo",
@@ -16665,8 +16665,8 @@
         "TX",
         "United States of America"
        ],
-       "s": 40474635,
-       "sha1_base64": "fGUAKtBYzeSQlt/6qo8DYMLt1JE="
+       "s": 40701518,
+       "sha1_base64": "x6IpT5DALgSSIWa7wboltAOwWZQ="
       },
       {
        "id": "US_Texas_Lubbock",
@@ -16678,8 +16678,8 @@
         "TX",
         "United States of America"
        ],
-       "s": 43223973,
-       "sha1_base64": "0y5029Ke5QjioluJ9YtCfZ2+C6A="
+       "s": 43422312,
+       "sha1_base64": "uT+Ey7MTps3bJwod4HoBTf7QR9k="
       },
       {
        "id": "US_Texas_San Antonio",
@@ -16691,8 +16691,8 @@
         "TX",
         "United States of America"
        ],
-       "s": 85537696,
-       "sha1_base64": "O25xWQ4ymzB33Wl6iulJqOKJxNU="
+       "s": 88092027,
+       "sha1_base64": "yCDuoUj8i7KMxUfv0v9jPOTn/MM="
       },
       {
        "id": "US_Texas_Southwest",
@@ -16704,8 +16704,8 @@
         "TX",
         "United States of America"
        ],
-       "s": 44709346,
-       "sha1_base64": "mfM5rg8G/9TdZ+Rdht2jM9rDXbk="
+       "s": 45086717,
+       "sha1_base64": "exML9SeSY+GNcNnYjt5yn5GvVVE="
       },
       {
        "id": "US_Texas_Tyler",
@@ -16717,8 +16717,8 @@
         "TX",
         "United States of America"
        ],
-       "s": 83439464,
-       "sha1_base64": "c09voq7jT8rY5cSeaaha2tFa0OU="
+       "s": 84302843,
+       "sha1_base64": "rdwI4jG8JziZWrSw2HqhDkIDwWQ="
       },
       {
        "id": "US_Texas_Wako",
@@ -16730,8 +16730,8 @@
         "TX",
         "United States of America"
        ],
-       "s": 54502806,
-       "sha1_base64": "DKuhhlbhiPQTp4g0MHb55Y+y5o8="
+       "s": 55012345,
+       "sha1_base64": "51pKtjgdKkV7hzcfiWzkrRkMTH8="
       },
       {
        "id": "US_Texas_West",
@@ -16743,8 +16743,8 @@
         "TX",
         "United States of America"
        ],
-       "s": 69414055,
-       "sha1_base64": "k8Lx7CTeYeIZKXfmDq41xBGNz8k="
+       "s": 70321178,
+       "sha1_base64": "X7ULGZTeSZv67T3nPllnwm07cko="
       }
      ]
     },
@@ -16754,8 +16754,8 @@
       "Navassa Island",
       "United States Minor Outlying Islands"
      ],
-     "s": 805496,
-     "sha1_base64": "64HLwZ9nFL4sm23r1aZSyYc1IQo="
+     "s": 805488,
+     "sha1_base64": "xhlI/fe+ZBHGjDQDjdCtx1f7YWM="
     },
     {
      "id": "US_Utah",
@@ -16770,8 +16770,8 @@
         "Utah",
         "UT"
        ],
-       "s": 63874550,
-       "sha1_base64": "OE/9UWirJLJ2vqyH2tM1Ac5O+Ro="
+       "s": 64170017,
+       "sha1_base64": "bRaupNuOHr10e878RzQ5rupi/8c="
       },
       {
        "id": "US_Utah_North",
@@ -16783,8 +16783,8 @@
         "Utah",
         "UT"
        ],
-       "s": 128535505,
-       "sha1_base64": "gpgSzD85OlhXWMDP3TDkWuOTmqE="
+       "s": 130025684,
+       "sha1_base64": "fegiHsWJeTfM4bIoERkbNgdnJjw="
       }
      ]
     },
@@ -16798,8 +16798,8 @@
       "Vermont",
       "VT"
      ],
-     "s": 57547926,
-     "sha1_base64": "TJP39kl4AMRVWFLVzuUx+9xxleQ="
+     "s": 58301401,
+     "sha1_base64": "fNkhjwAvzlFfQsNSUwgE1oL/W6I="
     },
     {
      "id": "Virginia",
@@ -16814,8 +16814,8 @@
         "VA",
         "United States of America"
        ],
-       "s": 75370440,
-       "sha1_base64": "yXPso7XhJRAkqHhtFb8s9/6XcKc="
+       "s": 75891571,
+       "sha1_base64": "1opLhEI5b8V/+d9HbLpR661yHQs="
       },
       {
        "id": "US_Virginia_Norfolk",
@@ -16827,8 +16827,8 @@
         "VA",
         "United States of America"
        ],
-       "s": 96317301,
-       "sha1_base64": "z5QeJwzG7wfregug2pVmWWB8qbU="
+       "s": 97087808,
+       "sha1_base64": "+lagp74ovE2c5ihcXfdoEN40gDw="
       },
       {
        "id": "US_Virginia_Lynchburg",
@@ -16840,8 +16840,8 @@
         "VA",
         "United States of America"
        ],
-       "s": 105772417,
-       "sha1_base64": "c0lX/O6Y4kuwaoF9KwPDMFWY7Xg="
+       "s": 105950324,
+       "sha1_base64": "T7tLCnbB6NnnwGXRyvhLCVxO0rk="
       },
       {
        "id": "US_Virginia_Richmond",
@@ -16853,8 +16853,8 @@
         "VA",
         "United States of America"
        ],
-       "s": 72243518,
-       "sha1_base64": "5bwC1dwhTigaskNe0XXEYia4LV8="
+       "s": 72697929,
+       "sha1_base64": "wnzLsP5gzu0qOKQZ+BMm+XIKLs0="
       },
       {
        "id": "US_Virginia_Alexandria",
@@ -16866,8 +16866,8 @@
         "VA",
         "United States of America"
        ],
-       "s": 102244532,
-       "sha1_base64": "VX9ZpVNUfT9jErRfbpQEhlT5dZs="
+       "s": 103338415,
+       "sha1_base64": "BYJCs7faqtx1AP7YriSKYI0hYuQ="
       }
      ]
     },
@@ -16886,8 +16886,8 @@
         "Washington",
         "WA"
        ],
-       "s": 187940655,
-       "sha1_base64": "ehv5pHJsG+yjYM+pPMlQfMz4Slc="
+       "s": 189727947,
+       "sha1_base64": "eyVuiJOzbN0B0lMDnEVyqok3lbY="
       },
       {
        "id": "US_Washington_Seattle",
@@ -16899,8 +16899,8 @@
         "Washington",
         "WA"
        ],
-       "s": 108958389,
-       "sha1_base64": "+5Hy19FgEBb822BLL/qIAMFlr28="
+       "s": 110330608,
+       "sha1_base64": "gDYXbNprBAPNG0VD0CBIFs+uY3o="
       },
       {
        "id": "US_Washington_Yakima",
@@ -16912,8 +16912,8 @@
         "Washington",
         "WA"
        ],
-       "s": 113915492,
-       "sha1_base64": "k6ipqTncanzb8BVbFeHUT7d4384="
+       "s": 115053295,
+       "sha1_base64": "ATb6oe+KjshQzm99T/fZeNzS/xY="
       }
      ]
     },
@@ -16927,8 +16927,8 @@
       "West Virginia",
       "WV"
      ],
-     "s": 153260517,
-     "sha1_base64": "RdRPSP7kfu6HOe39M7t9y66Oho4="
+     "s": 153755896,
+     "sha1_base64": "H2gaboCkCuVdQ+J2HcG8+mPswkc="
     },
     {
      "id": "Wisconsin",
@@ -16943,8 +16943,8 @@
         "Wisconsin",
         "WI"
        ],
-       "s": 133934363,
-       "sha1_base64": "M99rm1rZBJqWlDX+ks5+slajGbg="
+       "s": 135154542,
+       "sha1_base64": "PRTdlHBIvE8cB52xow4w8ZF3HdY="
       },
       {
        "id": "US_Wisconsin_North",
@@ -16956,8 +16956,8 @@
         "Wisconsin",
         "WI"
        ],
-       "s": 61810398,
-       "sha1_base64": "U8AVxPwBThX+6F72mptcQltPwcU="
+       "s": 61995329,
+       "sha1_base64": "haRf3JgyyoskcZWkKawYAD4vBD0="
       },
       {
        "id": "US_Wisconsin_Madison",
@@ -16969,8 +16969,8 @@
         "Wisconsin",
         "WI"
        ],
-       "s": 68184910,
-       "sha1_base64": "rGCsK/upVIuB1D1Yomma9ewEzlM="
+       "s": 69358713,
+       "sha1_base64": "a1VOlyKjfT6pw71XxFqcfF7mr1A="
       },
       {
        "id": "US_Wisconsin_Eau Claire",
@@ -16982,8 +16982,8 @@
         "Wisconsin",
         "WI"
        ],
-       "s": 61458854,
-       "sha1_base64": "1nf2+xfd02uBPd5yhcH6d4RwA3U="
+       "s": 61733433,
+       "sha1_base64": "NlUcijdncmkQgwa0qoDZtgjFMvQ="
       }
      ]
     },
@@ -16997,8 +16997,8 @@
       "Wyoming",
       "WY"
      ],
-     "s": 108089426,
-     "sha1_base64": "VNrZnP9kLOCuKtBh3wfqBFqu/5g="
+     "s": 109216101,
+     "sha1_base64": "Vx1MGrzMee+4YGXtxpJuO5lpXkM="
     }
    ]
   },
@@ -17030,8 +17030,8 @@
     "Treinta y Tres",
     "Uruguay"
    ],
-   "s": 69431149,
-   "sha1_base64": "QMQZh3fCMgwpMM1P6fvuyUmTY5U="
+   "s": 70062920,
+   "sha1_base64": "qau0rXZWgNiVJSpIJ0/XkzWU5Jg="
   },
   {
    "id": "Uzbekistan",
@@ -17056,8 +17056,8 @@
     "Toshkent",
     "Xorazm Viloyati"
    ],
-   "s": 181154176,
-   "sha1_base64": "qKnUhCRzUdHoSi9nzQABYb+KpG0="
+   "s": 182211659,
+   "sha1_base64": "KHgoMNQYSq5bf+23xKQNTYupe64="
   },
   {
    "id": "Vanuatu",
@@ -17073,8 +17073,8 @@
     "Vanuatu",
     "Torba"
    ],
-   "s": 12338508,
-   "sha1_base64": "u92ZNIXZPPezxcWebG/g06EOFUs="
+   "s": 12340270,
+   "sha1_base64": "cOfCWL0fG04Z8K5steutgzUpaVo="
   },
   {
    "id": "Venezuela",
@@ -17109,8 +17109,8 @@
       "Yaracuy",
       "Zulia"
      ],
-     "s": 68916187,
-     "sha1_base64": "WjIRWl3/zlNOx+c3EAae0bK+fLY="
+     "s": 69798478,
+     "sha1_base64": "rUhYt8ijFd9nC/ZirEDJLcGYRYM="
     },
     {
      "id": "Venezuela_South",
@@ -17131,8 +17131,8 @@
       "Venezuela",
       "Zulia"
      ],
-     "s": 72649664,
-     "sha1_base64": "FoxnN3ynAZJEMMoXW6Jo/+adu7M="
+     "s": 73177195,
+     "sha1_base64": "IKdeyazgmz270QuEGComckt/lwk="
     }
    ]
   },
@@ -17207,8 +17207,8 @@
     "Tỉnh Hà Giang",
     "Việt Nam"
    ],
-   "s": 328760638,
-   "sha1_base64": "fUo9zzf9Kh15kb/HAQnTS/RyVCk="
+   "s": 329988562,
+   "sha1_base64": "WMS/025irOECfhExKWJqmzp1Ssk="
   },
   {
    "id": "Yemen",
@@ -17239,8 +17239,8 @@
     "Ḩaḑramawt",
     "اليمن"
    ],
-   "s": 93907741,
-   "sha1_base64": "p/1bJuA/P8nZh6BxpIXiZMG+/tA="
+   "s": 93938775,
+   "sha1_base64": "wCiEyptJJ6S9iwkZH/umDOj2S7I="
   },
   {
    "id": "Zambia",
@@ -17260,8 +17260,8 @@
     "Western Province",
     "Zambia"
    ],
-   "s": 238392067,
-   "sha1_base64": "M6cXH/csUokYliUVz9ytRhzxm5g="
+   "s": 238591134,
+   "sha1_base64": "4L9RIYVEqnv3ztUz/99iyoFm/EQ="
   },
   {
    "id": "Zimbabwe",
@@ -17281,16 +17281,16 @@
     "Midlands Province",
     "Zimbabwe"
    ],
-   "s": 150711961,
-   "sha1_base64": "lsMd/KADpdPqf02n2OkpPvU7+m0="
+   "s": 150842988,
+   "sha1_base64": "CeA2imA+tSIAaXywBsXCwxtjZSs="
   },
   {
    "id": "Antarctica",
    "affiliations": [
     "South Georgia and South Sandwich Islands"
    ],
-   "s": 61857087,
-   "sha1_base64": "YGTOX0O3tTeQLnUY9llaRjP5OLw="
+   "s": 61865935,
+   "sha1_base64": "GnCGud1+PlMKSaRlpN4iFma9MrQ="
   },
   {
    "id": "New Zealand",
@@ -17303,8 +17303,8 @@
      "affiliations": [
       "Tokelau"
      ],
-     "s": 425407,
-     "sha1_base64": "9AaZyxJ16CVCZ3iVFtMOnLbspPM="
+     "s": 425399,
+     "sha1_base64": "sTzWXtk3r6MPl0Nd/KLQBxPEv/Q="
     },
     {
      "id": "New Zealand North_Auckland",
@@ -17318,8 +17318,8 @@
       "Northland",
       "Waikato"
      ],
-     "s": 160323479,
-     "sha1_base64": "eUiuOwwH56auhd3XfN8lbw+iwvU="
+     "s": 161249554,
+     "sha1_base64": "Ih4w1fddS8bXRQTWT54syUUfKkM="
     },
     {
      "id": "New Zealand North_Wellington",
@@ -17334,8 +17334,8 @@
       "Taranaki",
       "Wellington"
      ],
-     "s": 114045109,
-     "sha1_base64": "grAVR9CnISj5VGl6wcY19IouOLA="
+     "s": 114647704,
+     "sha1_base64": "Q7aPlI0GNhHiZ6h7DD8F5xSnkhM="
     },
     {
      "id": "New Zealand South_Canterbury",
@@ -17351,8 +17351,8 @@
       "Tasman",
       "West Coast"
      ],
-     "s": 145808717,
-     "sha1_base64": "zcVxBe3DlhLhOExZMDc/FdNottY="
+     "s": 146312504,
+     "sha1_base64": "O6dBChnt1HxvVO/M7mqIEKi+7es="
     },
     {
      "id": "New Zealand South_Southland",
@@ -17365,8 +17365,8 @@
       "Southland",
       "West Coast"
      ],
-     "s": 91309852,
-     "sha1_base64": "9hhO1jVGaEJdoGR/3qQ2Q2CWDqg="
+     "s": 91733655,
+     "sha1_base64": "uVaWSSgiFT66gBlYI0+BibzR0m4="
     }
    ]
   },
@@ -17390,8 +17390,8 @@
       "충청남도",
       "충청북도"
      ],
-     "s": 192356800,
-     "sha1_base64": "BORkxSlByYBjWuP7sJsQJdg/Pm8="
+     "s": 194707131,
+     "sha1_base64": "CfyQb1qqkC+bzpSZlRqh1Z+yF+A="
     },
     {
      "id": "South Korea_South",
@@ -17411,8 +17411,8 @@
       "전라남도",
       "전라북도"
      ],
-     "s": 168535008,
-     "sha1_base64": "UBrZQZtDq/+/SqZxHFaNe1bUNQ8="
+     "s": 170641523,
+     "sha1_base64": "RHsNdA+mv4kgvIqZphykseiOnMw="
     }
    ]
   }

From 380981953d6b75626357adc5977848d93902e687 Mon Sep 17 00:00:00 2001
From: cquest <cquest@noreply.codeberg.org>
Date: Sun, 31 Aug 2025 18:58:17 +0200
Subject: [PATCH 301/302] More natural french sound strings

---
 data/sound-strings/fr.json/localize.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/sound-strings/fr.json/localize.json b/data/sound-strings/fr.json/localize.json
index 857a746f6..879b866ce 100644
--- a/data/sound-strings/fr.json/localize.json
+++ b/data/sound-strings/fr.json/localize.json
@@ -6,7 +6,7 @@
 "make_a_right_turn_street":"NULL",
 "make_a_sharp_right_turn":"À droite toute.",
 "make_a_sharp_right_turn_street":"NULL",
-"enter_the_roundabout":"Prenez le rond-point.",
+"enter_the_roundabout":"Au rond-point.",
 "enter_the_roundabout_street":"NULL",
 "enter_the_roundabout_street_verb":"NULL",
 "leave_the_roundabout":"Sortez du rond-point.",
@@ -43,9 +43,9 @@
 "in_800_meters":"Dans huit cents mètres",
 "in_900_meters":"Dans neuf cents mètres",
 "in_1_kilometer":"Dans un kilomètre",
-"in_1_5_kilometers":"Dans un virgule cinq kilomètre",
+"in_1_5_kilometers":"Dans un kilomètre et demi",
 "in_2_kilometers":"Dans deux kilomètres",
-"in_2_5_kilometers":"Dans deux virgule cinq kilomètres",
+"in_2_5_kilometers":"Dans deux kilomètres et demi",
 "in_3_kilometers":"Dans trois kilomètres",
 "then":"Puis",
 "dist_direction_onto_street":"%1$s %2$s %3$s %4$s",
@@ -102,7 +102,7 @@
 "in_4500_feet":"Dans quatre mille cinq cents pieds",
 "in_5000_feet":"Dans cinq mille pieds",
 "in_1_mile":"Dans un mile",
-"in_1_5_miles":"Dans un virgule cinq mile",
+"in_1_5_miles":"Dans un mile et demi",
 "in_2_miles":"Dans deux miles",
 "unknown_camera":"Radar droit devant"
 }

From 05cc660641ebf0d9c640896bcea2c40a010af8e9 Mon Sep 17 00:00:00 2001
From: Harry Bond <me@hbond.xyz>
Date: Sat, 30 Aug 2025 22:39:20 +0100
Subject: [PATCH 302/302] Release notes for second August release

Signed-off-by: Harry Bond <me@hbond.xyz>
---
 .../fdroid/play/listings/cs-CZ/release-notes.txt |  7 -------
 .../fdroid/play/listings/de-DE/release-notes.txt | 15 ++++++++-------
 .../fdroid/play/listings/en-US/release-notes.txt | 16 +++++++++-------
 .../fdroid/play/listings/es-ES/release-notes.txt | 16 +++++++++-------
 .../fdroid/play/listings/fr-FR/release-notes.txt |  9 +++++++++
 .../fdroid/play/listings/it-IT/release-notes.txt |  7 -------
 .../fdroid/play/listings/pt-BR/release-notes.txt | 15 ++++++++-------
 .../fdroid/play/listings/ru-RU/release-notes.txt | 16 +++++++++-------
 .../fdroid/play/listings/sr/release-notes.txt    |  7 -------
 9 files changed, 52 insertions(+), 56 deletions(-)
 delete mode 100644 android/app/src/fdroid/play/listings/cs-CZ/release-notes.txt
 create mode 100644 android/app/src/fdroid/play/listings/fr-FR/release-notes.txt
 delete mode 100644 android/app/src/fdroid/play/listings/it-IT/release-notes.txt
 delete mode 100644 android/app/src/fdroid/play/listings/sr/release-notes.txt

diff --git a/android/app/src/fdroid/play/listings/cs-CZ/release-notes.txt b/android/app/src/fdroid/play/listings/cs-CZ/release-notes.txt
deleted file mode 100644
index b6009257a..000000000
--- a/android/app/src/fdroid/play/listings/cs-CZ/release-notes.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-• Data OpenStreetMap k 4. 8.
-• vylepšené barvy mapy pro vodu, lesy, křoviny, různé vybavení, pěší zóny atd.
-• přidány stanice lesní stráže, krytých parkovišť pro jízdní kola, únikových her, úschoven zavazadel, partnerských pošt
-• vylepšeny výškové vrstevnice na 20 m pro některé oblíbené turistické oblasti
-• podpora více zkratek a aliasů pro vyhledávání
-• přidání ikon pro vyhledávání a záložky pro rychlé občerstvení, jízdní kola a dobíjecí stanice
-• plynulejší pohyb šipky pro určení polohy
diff --git a/android/app/src/fdroid/play/listings/de-DE/release-notes.txt b/android/app/src/fdroid/play/listings/de-DE/release-notes.txt
index 6c49d88e9..31760b19a 100644
--- a/android/app/src/fdroid/play/listings/de-DE/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/de-DE/release-notes.txt
@@ -1,7 +1,8 @@
-• OpenStreetMap-Daten vom 4. August
-• Verbesserte Farben für Wasser, Wälder, Gestrüpp, verschiedene Einrichtungen, Fussgängerbereiche etc.
-• Besucherstationen, überdachte Fahrradparkplätze, Escaperooms, Gepäckschließfächer, und Postpartner hinzugefügt
-• Konturhöhenlinien aktualisiert, bis zu 20m für beliebte Wanderregionen
-• Unterstützung für mehr Such-Abkürzungen und Synonyme
-• Such- und Lesezeichen-Symbole für Fast Food, Rad- und Lade-Stationen
-• Der Positionspfeil bewegt sich gleichmässiger
+• OpenStreetMap-Daten vom 22. August
+• Neue Geschwindigkeitsanzeige & Details aufgezeichneter Strecken
+• Besserer dunkler Modus, neue farbige Labels 
+• Anzeige wann Orte & Öffnungszeiten überprüft wurden
+• Routenplanung berücksichtigt Stoppschilder, Ampeln & bedingte Einschränkungen.
+• GPS-Peilung wird statt Kompass bevorzugt & höhere GPS-Frequenz.
+• Adressen & Notizen im OSM-Editor unterstützt.
+• Mehr Verbesserungen an UI-Elementen & Kartenstil, alle Details in den Codeberg-Versionshinweisen!
diff --git a/android/app/src/fdroid/play/listings/en-US/release-notes.txt b/android/app/src/fdroid/play/listings/en-US/release-notes.txt
index 30680de88..ac838ba47 100644
--- a/android/app/src/fdroid/play/listings/en-US/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/en-US/release-notes.txt
@@ -1,7 +1,9 @@
-• OpenStreetMap data as of August 4
-• improve map colors for water, forests, scrubs, various amenities, pedestrian areas etc.
-• add ranger stations, covered bicycle parkings, escape games, luggage lockers, post office partners
-• upgrade altitude contour lines to 20m step for some popular hiking regions
-• support more search abbreviations and aliases
-• add search and bookmark icons for fast food, bicycle and charging stations
-• more smooth position arrow movements
+• OpenStreetMap data as of August 22
+• New current speed indicator, display track info
+• Improved dark map style, added coloured labels
+• Display when places & opening hours were last checked
+• Routing now considers turns, stop signs, lights & conditional restrictions
+• Prefer GPS bearing over compass and increase location poll rate
+• Enable adding standalone addresses & notes in the editor
+• Various UI element & map style improvements
+Check our Codeberg release notes for more changes!
diff --git a/android/app/src/fdroid/play/listings/es-ES/release-notes.txt b/android/app/src/fdroid/play/listings/es-ES/release-notes.txt
index 9ea20621d..7232299c7 100644
--- a/android/app/src/fdroid/play/listings/es-ES/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/es-ES/release-notes.txt
@@ -1,7 +1,9 @@
-• Datos de OpenStreetMap a fecha 2025.08.04
-• Mejora de colores del mapa para agua, bosques, matorrales, servicios, zonas peatonales, etc.
-• Añadidas estaciones de guardabosques, aparcamientos cubiertos de bicis, juegos de escape, consignas y oficinas de correo
-• Nuevas curvas de nivel (20 m) en regiones populares para senderismo
-• Más abreviaturas y alias de búsqueda
-• Iconos de búsqueda y marcadores para comida rápida, bicicletas y estaciones de recarga
-• Más fluidez de la flecha de posición
+• Datos de OSM a 22-08-2025
+• Nuevo indicador de velocidad e información de pista
+• Modo oscuro mejorado y nombres de POI coloreados
+• Indicador de última revisión de lugares y horarios de apertura
+• Rutas mejoradas teniendo en cuenta giros, señales de STOP, semáforos y restricciones
+• Mayor precisión para determinar tu localización y sentido
+• Añade direcciones y notas con el editor
+• Otras mejoras en elementos de la interfaz y estilo del mapa
+Entra en nuestro Codeberg para más cambios!
diff --git a/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt b/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt
new file mode 100644
index 000000000..13084e62c
--- /dev/null
+++ b/android/app/src/fdroid/play/listings/fr-FR/release-notes.txt
@@ -0,0 +1,9 @@
+• Données OSM du 22 août
+• Nouvel indicateur de vitesse et détails des pistes
+• Amélioration du style sombre, ajout de labels colorées
+• Affichage de la date de dernière vérification d'un lieu
+• Support dans le routage des virages, signalisations et restrictions
+• Amélioration de la boussole et de la précision GPS
+• Support des adresses et des notes dans l'éditeur
+• Diverses améliorations d'UI et du style de la carte
+Plus d'informations sur notre Codeberg
diff --git a/android/app/src/fdroid/play/listings/it-IT/release-notes.txt b/android/app/src/fdroid/play/listings/it-IT/release-notes.txt
deleted file mode 100644
index a2a553b3a..000000000
--- a/android/app/src/fdroid/play/listings/it-IT/release-notes.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-• Dati di OpenStreetMap aggiornati al 4 Agosto
-• Migliorati i colori per acqua, foreste, servizi etc
-• Aggiunte le stazioni delle guardie forestali, i parcheggi coperti per bici, gli escape games e altri servizi
-• Aggiornato l'intervallo delle isolinee a 20 m per le zone escursionistiche più popolari
-• Aggiunto il supporto per un maggior numero di alias
-• Aggiunte le icone per i fast food, i punti di ricarica e le biciclette
-• Resi più fluidi i movimenti della freccia di posizione
diff --git a/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt b/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
index d9ed20642..a5b703092 100644
--- a/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/pt-BR/release-notes.txt
@@ -1,7 +1,8 @@
-• Dados OSM de 4/08
-• Melhoria nas cores para água, florestas, matagais, serviços, áreas de pedestres, etc.
-• Adição de guarda-florestais, estacionamentos cobertos para bicicletas, jogos de fuga, armários para bagagem e parceiros postais
-• Melhoria na precisão de curvas de nível para 20 m em algumas regiões populares
-• Suporte a mais abreviações para busca
-• Adição de ícones de pesquisa e favoritos para fast food, bicicletas e estações de recarga
-• Movimentos mais suaves para seta de posição
+• Dados OSM de 22/08
+• Novo indicador de velocidade e tela de informações de trilha
+• Melhor estilo de mapa escuro, rótulos coloridos adicionados
+• Exibição da última atualização de locais e horários de funcionamento
+• O roteamento agora considera conversões, PARE, semáforos, e restrições condicionais
+• Preferência por orientação GPS em vez de bússola e aumento da frequência de localização
+• Editor: adição de endereços e notas independentes
+• Melhorias em elementos da interface e estilo de mapa
diff --git a/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt b/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt
index 75b7bbda7..4450553c9 100644
--- a/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt
+++ b/android/app/src/fdroid/play/listings/ru-RU/release-notes.txt
@@ -1,7 +1,9 @@
-• Карты OpenStreetMap от 4 августа
-• Улучшен цвет воды, леса, кустарников, различных объектов инфраструктуры, пешеходных зон и т.д.
-• Добавлены лесничества, крытые велопарковки, квесты, камеры хранения
-• Для некоторых популярных туристических регионов добавлены линии высот 20м
-• Поддержка дополнительных поисковых сокращений и синонимов
-• Добавлены иконки меток и результатов поиска для фастфуда, велопарковок и зарядных станций
-• Более плавное движение стрелки местоположения
+• Данные 22 августа
+• Новый спидометр,информация о маршруте
+• Улучшен тёмный стиль,цветные метки
+• Время последней проверки часов работы
+• Построении маршрута учитывает повороты, знак «Стоп»,светофоры и ограничения
+• Предпочтение отдается GPS-координатам,а не компасу,увеличена частота опроса местоположения
+• Можно добавлять отдельные адреса и заметки в редакторе
+• Улучшены различные элементы пользовательского интерфейса и стиль карты
+Ознакомьтесь с примечания к релизу про изменения!
diff --git a/android/app/src/fdroid/play/listings/sr/release-notes.txt b/android/app/src/fdroid/play/listings/sr/release-notes.txt
deleted file mode 100644
index 2e2ba6dc0..000000000
--- a/android/app/src/fdroid/play/listings/sr/release-notes.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-• подаци из OpenStreetMap-а од 4. августа
-• побољшане боје на мапи за воду, шуме, жбуње, разне објекте, пешачке зоне итд.
-• додате станице ренџера, наткривена паркинг места за бицикле, escape room-ови, ормарићи за пртљаг
-• унапређене изохипсе на кораке од 20 м за популарне планинарске регионе
-• подршка за више скраћеница и алтернативних назива у претрази
-• додате иконе за претрагу и обележавање за брзу храну, бицикле и станице за пуњење
-• равномерније кретање стрелице која приказује позицију